diff --git a/.gitignore b/.gitignore
index 36882a0176..b11acc3a93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,8 +21,9 @@ objfiles.txt
 *.gcda
 *.gcov
 *.gcov.out
-lcov.info
+lcov*.info
 coverage/
+coverage-html-stamp
 *.vcproj
 *.vcxproj
 win32ver.rc
@@ -58,3 +59,4 @@ lib*.pc
 /src/test/isolation/regression.out
 /src/test/isolation/regression.diffs
 /src/test/isolation/regression.out
+/contrib/pgcrypto/rijndael.tbl
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 120c89414f..1d989ce96d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -25,7 +25,7 @@ set(POSTGRES_VERSION
   ${POSTGRES_MAJOR_VERSION}.${POSTGRES_MINOR_VERSION}.${POSTGRES_PATCH_VERSION})
 
 set(PG_VERSION "11devel")
-set(PG_VERSION_NUM 100000)
+set(PG_VERSION_NUM 110000)
 set(PACKAGE_BUGREPORT "pgsql-bugs@postgresql.org")
 
  # Offer the user the choice of overriding the installation directories
@@ -286,6 +286,15 @@ if(USE_BONJOUR)
 	endif()
 endif()
 
+option(WITH_SYSTEM_TZDATA "Define to use system tzdata information." OFF)
+if (WITH_SYSTEM_TZDATA)
+	if (EXISTS ${WITH_SYSTEM_TZDATA})
+		add_compile_options(-DSYSTEMTZDIR="${WITH_SYSTEM_TZDATA}")
+	else()
+		message(FATAL_ERROR "tzdata directory \"${WITH_SYSTEM_TZDATA}\" does not exists")
+	endif()
+endif()
+
 option(STRONG_RANDOM "Strong random number source" ON)
 option(STRONG_RANDOM_SOURCE "which random number source to use - openssl, win32, dev" OFF)
 if(STRONG_RANDOM)
@@ -691,6 +700,8 @@ if(OPENSSL_FOUND)
 	set(CMAKE_REQUIRED_INCLUDES "${CMAKE_REQUIRED_INCLUDES};${OPENSSL_INCLUDE_DIR}")
 	set(CMAKE_REQUIRED_LIBRARIES ${OPENSSL_LIBRARIES})
 	check_function_exists(SSL_get_current_compression HAVE_SSL_GET_CURRENT_COMPRESSION)
+	check_function_exists(BIO_get_data HAVE_BIO_GET_DATA)
+	check_function_exists(BIO_meth_new HAVE_BIO_METH_NEW)
 endif(OPENSSL_FOUND)
 
 if(USE_SYSTEMD)
@@ -1416,7 +1427,11 @@ add_subdirectory(contrib)
 message(STATUS "------------------")
 message(STATUS "    Conclusion")
 message(STATUS "Host tuple: ${HOST_TUPLE}")
-message(STATUS "OpenSSL: ${OPENSSL_FOUND} version: ${OPENSSL_VERSION} libs: ${OPENSSL_LIBRARIES} include: ${OPENSSL_INCLUDE_DIR}")
+if(OPENSSL_FOUND)
+	message(STATUS "OpenSSL version: ${OPENSSL_VERSION} libs: ${OPENSSL_LIBRARIES} include: ${OPENSSL_INCLUDE_DIR}")
+else()
+	message(STATUS "OpenSSL: off")
+endif()
 message(STATUS "Python: ${PYTHONINTERP_FOUND}")
 message(STATUS "PythonLibs: ${PYTHONLIBS_FOUND}")
 message(STATUS "PerlLibs: ${PERLLIBS_FOUND}")
diff --git a/COPYRIGHT b/COPYRIGHT
index c320eccac0..33e6e4842a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
 PostgreSQL Database Management System
 (formerly known as Postgres, then as Postgres95)
 
-Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 
 Portions Copyright (c) 1994, The Regents of the University of California
 
diff --git a/Makefile b/Makefile
index 4c68950e90..c400854cd3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,6 +11,10 @@
 # GNUmakefile won't exist yet, so we catch that case as well.
 
 
+# AIX make defaults to building *every* target of the first rule.  Start with
+# a single-target, empty rule to make the other targets non-default.
+all:
+
 all check install installdirs installcheck installcheck-parallel uninstall clean distclean maintainer-clean dist distcheck world check-world install-world installcheck-world:
 	@if [ ! -f GNUmakefile ] ; then \
 	   echo "You need to run the 'configure' program first. See the file"; \
diff --git a/README.md b/README.md
index 2465a6ebb4..2c158ad3a7 100644
--- a/README.md
+++ b/README.md
@@ -103,6 +103,8 @@ CMake build options
 
 **-DSTRONG_RANDOM_SOURCE** default OFF (autodetect), which random number source to use - openssl, win32, dev
 
+**-DWITH_SYSTEM_TZDATA=<dir>** default OFF, custom tzdata directory
+
 Only **MSVC** options:
 
 **-DUSE_FP_STRICT** default ON, if we use /fp:stirct compiler option we much closer to C99 standart in float part
diff --git a/cmake/CheckRestrict.cmake b/cmake/CheckRestrict.cmake
new file mode 100644
index 0000000000..f8f00c0c4f
--- /dev/null
+++ b/cmake/CheckRestrict.cmake
@@ -0,0 +1,3 @@
+CHECK_C_SOURCE_COMPILES (
+  "int test (void *restrict x); int main (void) {return 0;}"
+  HAVE_RESTRICT)
diff --git a/config/c-compiler.m4 b/config/c-compiler.m4
index 7275ea69fe..689bb7f181 100644
--- a/config/c-compiler.m4
+++ b/config/c-compiler.m4
@@ -96,9 +96,11 @@ undefine([Ac_cachevar])dnl
 # PGAC_TYPE_128BIT_INT
 # ---------------------
 # Check if __int128 is a working 128 bit integer type, and if so
-# define PG_INT128_TYPE to that typename.  This currently only detects
-# a GCC/clang extension, but support for different environments may be
-# added in the future.
+# define PG_INT128_TYPE to that typename, and define ALIGNOF_PG_INT128_TYPE
+# as its alignment requirement.
+#
+# This currently only detects a GCC/clang extension, but support for other
+# environments may be added in the future.
 #
 # For the moment we only test for support for 128bit math; support for
 # 128bit literals and snprintf is not required.
@@ -106,28 +108,61 @@ AC_DEFUN([PGAC_TYPE_128BIT_INT],
 [AC_CACHE_CHECK([for __int128], [pgac_cv__128bit_int],
 [AC_LINK_IFELSE([AC_LANG_PROGRAM([
 /*
+ * We don't actually run this test, just link it to verify that any support
+ * functions needed for __int128 are present.
+ *
  * These are globals to discourage the compiler from folding all the
  * arithmetic tests down to compile-time constants.  We do not have
- * convenient support for 64bit literals at this point...
+ * convenient support for 128bit literals at this point...
  */
 __int128 a = 48828125;
-__int128 b = 97656255;
+__int128 b = 97656250;
 ],[
 __int128 c,d;
 a = (a << 12) + 1; /* 200000000001 */
 b = (b << 12) + 5; /* 400000000005 */
-/* use the most relevant arithmetic ops */
+/* try the most relevant arithmetic ops */
 c = a * b;
 d = (c + b) / b;
-/* return different values, to prevent optimizations */
+/* must use the results, else compiler may optimize arithmetic away */
 if (d != a+1)
-  return 0;
-return 1;
+  return 1;
 ])],
 [pgac_cv__128bit_int=yes],
 [pgac_cv__128bit_int=no])])
 if test x"$pgac_cv__128bit_int" = xyes ; then
-  AC_DEFINE(PG_INT128_TYPE, __int128, [Define to the name of a signed 128-bit integer type.])
+  # Use of non-default alignment with __int128 tickles bugs in some compilers.
+  # If not cross-compiling, we can test for bugs and disable use of __int128
+  # with buggy compilers.  If cross-compiling, hope for the best.
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
+  AC_CACHE_CHECK([for __int128 alignment bug], [pgac_cv__128bit_int_bug],
+  [AC_RUN_IFELSE([AC_LANG_PROGRAM([
+/* This must match the corresponding code in c.h: */
+#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
+#define pg_attribute_aligned(a) __attribute__((aligned(a)))
+#endif
+typedef __int128 int128a
+#if defined(pg_attribute_aligned)
+pg_attribute_aligned(8)
+#endif
+;
+int128a holder;
+void pass_by_val(void *buffer, int128a par) { holder = par; }
+],[
+long int i64 = 97656225L << 12;
+int128a q;
+pass_by_val(main, (int128a) i64);
+q = (int128a) i64;
+if (q != holder)
+  return 1;
+])],
+  [pgac_cv__128bit_int_bug=ok],
+  [pgac_cv__128bit_int_bug=broken],
+  [pgac_cv__128bit_int_bug="assuming ok"])])
+  if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
+    AC_DEFINE(PG_INT128_TYPE, __int128, [Define to the name of a signed 128-bit integer type.])
+    AC_CHECK_ALIGNOF(PG_INT128_TYPE)
+  fi
 fi])# PGAC_TYPE_128BIT_INT
 
 
@@ -224,6 +259,23 @@ AC_DEFINE(HAVE__BUILTIN_TYPES_COMPATIBLE_P, 1,
 fi])# PGAC_C_TYPES_COMPATIBLE
 
 
+# PGAC_C_BUILTIN_BSWAP16
+# -------------------------
+# Check if the C compiler understands __builtin_bswap16(),
+# and define HAVE__BUILTIN_BSWAP16 if so.
+AC_DEFUN([PGAC_C_BUILTIN_BSWAP16],
+[AC_CACHE_CHECK(for __builtin_bswap16, pgac_cv__builtin_bswap16,
+[AC_COMPILE_IFELSE([AC_LANG_SOURCE(
+[static unsigned long int x = __builtin_bswap16(0xaabb);]
+)],
+[pgac_cv__builtin_bswap16=yes],
+[pgac_cv__builtin_bswap16=no])])
+if test x"$pgac_cv__builtin_bswap16" = xyes ; then
+AC_DEFINE(HAVE__BUILTIN_BSWAP16, 1,
+          [Define to 1 if your compiler understands __builtin_bswap16.])
+fi])# PGAC_C_BUILTIN_BSWAP16
+
+
 
 # PGAC_C_BUILTIN_BSWAP32
 # -------------------------
@@ -265,10 +317,15 @@ fi])# PGAC_C_BUILTIN_BSWAP64
 # -------------------------
 # Check if the C compiler understands __builtin_constant_p(),
 # and define HAVE__BUILTIN_CONSTANT_P if so.
+# We need __builtin_constant_p("string literal") to be true, but some older
+# compilers don't think that, so test for that case explicitly.
 AC_DEFUN([PGAC_C_BUILTIN_CONSTANT_P],
 [AC_CACHE_CHECK(for __builtin_constant_p, pgac_cv__builtin_constant_p,
 [AC_COMPILE_IFELSE([AC_LANG_SOURCE(
-[[static int x; static int y[__builtin_constant_p(x) ? x : 1];]]
+[[static int x;
+  static int y[__builtin_constant_p(x) ? x : 1];
+  static int z[__builtin_constant_p("string literal") ? 1 : x];
+]]
 )],
 [pgac_cv__builtin_constant_p=yes],
 [pgac_cv__builtin_constant_p=no])])
@@ -279,6 +336,34 @@ fi])# PGAC_C_BUILTIN_CONSTANT_P
 
 
 
+# PGAC_C_BUILTIN_OP_OVERFLOW
+# -------------------------
+# Check if the C compiler understands __builtin_$op_overflow(),
+# and define HAVE__BUILTIN_OP_OVERFLOW if so.
+#
+# Check for the most complicated case, 64 bit multiplication, as a
+# proxy for all of the operations.  To detect the case where the compiler
+# knows the function but library support is missing, we must link not just
+# compile, and store the results in global variables so the compiler doesn't
+# optimize away the call.
+AC_DEFUN([PGAC_C_BUILTIN_OP_OVERFLOW],
+[AC_CACHE_CHECK(for __builtin_mul_overflow, pgac_cv__builtin_op_overflow,
+[AC_LINK_IFELSE([AC_LANG_PROGRAM([
+PG_INT64_TYPE a = 1;
+PG_INT64_TYPE b = 1;
+PG_INT64_TYPE result;
+int oflo;
+],
+[oflo = __builtin_mul_overflow(a, b, &result);])],
+[pgac_cv__builtin_op_overflow=yes],
+[pgac_cv__builtin_op_overflow=no])])
+if test x"$pgac_cv__builtin_op_overflow" = xyes ; then
+AC_DEFINE(HAVE__BUILTIN_OP_OVERFLOW, 1,
+          [Define to 1 if your compiler understands __builtin_$op_overflow.])
+fi])# PGAC_C_BUILTIN_OP_OVERFLOW
+
+
+
 # PGAC_C_BUILTIN_UNREACHABLE
 # --------------------------
 # Check if the C compiler understands __builtin_unreachable(),
diff --git a/config/docbook.m4 b/config/docbook.m4
index f9307f329e..34b829eade 100644
--- a/config/docbook.m4
+++ b/config/docbook.m4
@@ -1,18 +1,18 @@
 # config/docbook.m4
 
-# PGAC_PROG_NSGMLS
-# ----------------
-AC_DEFUN([PGAC_PROG_NSGMLS],
-[PGAC_PATH_PROGS(NSGMLS, [onsgmls nsgmls])])
+# PGAC_PATH_XMLLINT
+# -----------------
+AC_DEFUN([PGAC_PATH_XMLLINT],
+[PGAC_PATH_PROGS(XMLLINT, xmllint)])
 
 
 # PGAC_CHECK_DOCBOOK(VERSION)
 # ---------------------------
 AC_DEFUN([PGAC_CHECK_DOCBOOK],
-[AC_REQUIRE([PGAC_PROG_NSGMLS])
-AC_CACHE_CHECK([for DocBook V$1], [pgac_cv_check_docbook],
-[cat >conftest.sgml <<EOF
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V$1//EN">
+[AC_REQUIRE([PGAC_PATH_XMLLINT])
+AC_CACHE_CHECK([for DocBook XML V$1], [pgac_cv_check_docbook],
+[cat >conftest.xml <<EOF
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V$1//EN" "http://www.oasis-open.org/docbook/xml/$1/docbookx.dtd">
 <book>
  <title>test</title>
  <chapter>
@@ -27,13 +27,13 @@ EOF
 
 pgac_cv_check_docbook=no
 
-if test -n "$NSGMLS"; then
-  $NSGMLS -s conftest.sgml 1>&AS_MESSAGE_LOG_FD 2>&1
+if test -n "$XMLLINT"; then
+  $XMLLINT --noout --valid conftest.xml 1>&AS_MESSAGE_LOG_FD 2>&1
   if test $? -eq 0; then
     pgac_cv_check_docbook=yes
   fi
 fi
-rm -f conftest.sgml])
+rm -f conftest.xml])
 
 have_docbook=$pgac_cv_check_docbook
 AC_SUBST([have_docbook])
diff --git a/config/perl.m4 b/config/perl.m4
index 8c21d0fb39..caefb0705e 100644
--- a/config/perl.m4
+++ b/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])
@@ -83,12 +87,19 @@ AC_DEFUN([PGAC_CHECK_PERL_EMBED_LDFLAGS],
 [AC_REQUIRE([PGAC_PATH_PERL])
 AC_MSG_CHECKING(for flags to link embedded Perl)
 if test "$PORTNAME" = "win32" ; then
-perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
-test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+	perl_lib=`basename $perl_archlibexp/CORE/perl[[5-9]]*.lib .lib`
+	if test -e "$perl_archlibexp/CORE/$perl_lib.lib"; then
+		perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+	else
+		perl_lib=`basename $perl_archlibexp/CORE/libperl[[5-9]]*.a .a | sed 's/^lib//'`
+		if test -e "$perl_archlibexp/CORE/lib$perl_lib.a"; then
+			perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+		fi
+	fi
 else
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
+	pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+	pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+	perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e ["s/ -arch [-a-zA-Z0-9_]*//g"]`
 fi
 AC_SUBST(perl_embed_ldflags)dnl
 if test -z "$perl_embed_ldflags" ; then
diff --git a/configure b/configure
index a2f9a256b4..7dcca506f8 100755
--- a/configure
+++ b/configure
@@ -11,7 +11,7 @@
 # This configure script is free software; the Free Software Foundation
 # gives unlimited permission to copy, distribute and modify it.
 #
-# Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Copyright (c) 1996-2018, PostgreSQL Global Development Group
 ## -------------------- ##
 ## M4sh Initialization. ##
 ## -------------------- ##
@@ -630,12 +630,10 @@ vpath_build
 PG_VERSION_NUM
 PROVE
 FOP
-OSX
 XSLTPROC
-XMLLINT
 DBTOEPUB
 have_docbook
-NSGMLS
+XMLLINT
 TCL_SHLIB_LD_LIBS
 TCL_SHARED_BUILD
 TCL_LIB_SPEC
@@ -821,7 +819,6 @@ enable_tap_tests
 with_blocksize
 with_segsize
 with_wal_blocksize
-with_wal_segsize
 with_CC
 enable_depend
 enable_cassert
@@ -1518,8 +1515,6 @@ Optional Packages:
   --with-segsize=SEGSIZE  set table segment size in GB [1]
   --with-wal-blocksize=BLOCKSIZE
                           set WAL block size in kB [8]
-  --with-wal-segsize=SEGSIZE
-                          set WAL segment size in MB [16]
   --with-CC=CMD           set compiler (deprecated)
   --with-icu              build with ICU support
   --with-tcl              build Tcl modules (PL/Tcl)
@@ -1640,7 +1635,7 @@ Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 
-Copyright (c) 1996-2017, PostgreSQL Global Development Group
+Copyright (c) 1996-2018, PostgreSQL Global Development Group
 _ACEOF
   exit
 fi
@@ -3733,57 +3728,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-#
-# WAL segment size
-#
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for WAL segment size" >&5
-$as_echo_n "checking for WAL segment size... " >&6; }
-
-
-
-# Check whether --with-wal-segsize was given.
-if test "${with_wal_segsize+set}" = set; then :
-  withval=$with_wal_segsize;
-  case $withval in
-    yes)
-      as_fn_error $? "argument required for --with-wal-segsize option" "$LINENO" 5
-      ;;
-    no)
-      as_fn_error $? "argument required for --with-wal-segsize option" "$LINENO" 5
-      ;;
-    *)
-      wal_segsize=$withval
-      ;;
-  esac
-
-else
-  wal_segsize=16
-fi
-
-
-case ${wal_segsize} in
-  1) ;;
-  2) ;;
-  4) ;;
-  8) ;;
- 16) ;;
- 32) ;;
- 64) ;;
- 128) ;;
- 256) ;;
- 512) ;;
- 1024) ;;
-  *) as_fn_error $? "Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64,128,256,512,1024." "$LINENO" 5
-esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: ${wal_segsize}MB" >&5
-$as_echo "${wal_segsize}MB" >&6; }
-
-
-cat >>confdefs.h <<_ACEOF
-#define XLOG_SEG_SIZE (${wal_segsize} * 1024 * 1024)
-_ACEOF
-
-
 #
 # C compiler
 #
@@ -7874,12 +7818,19 @@ $as_echo "$perl_embed_ccflags" >&6; }
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for flags to link embedded Perl" >&5
 $as_echo_n "checking for flags to link embedded Perl... " >&6; }
 if test "$PORTNAME" = "win32" ; then
-perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
-test -e "$perl_archlibexp/CORE/$perl_lib.lib" && perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+	perl_lib=`basename $perl_archlibexp/CORE/perl[5-9]*.lib .lib`
+	if test -e "$perl_archlibexp/CORE/$perl_lib.lib"; then
+		perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+	else
+		perl_lib=`basename $perl_archlibexp/CORE/libperl[5-9]*.a .a | sed 's/^lib//'`
+		if test -e "$perl_archlibexp/CORE/lib$perl_lib.a"; then
+			perl_embed_ldflags="-L$perl_archlibexp/CORE -l$perl_lib"
+		fi
+	fi
 else
-pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
-pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
-perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
+	pgac_tmp1=`$PERL -MExtUtils::Embed -e ldopts`
+	pgac_tmp2=`$PERL -MConfig -e 'print $Config{ccdlflags}'`
+	perl_embed_ldflags=`echo X"$pgac_tmp1" | sed -e "s/^X//" -e "s%$pgac_tmp2%%" -e "s/ -arch [-a-zA-Z0-9_]*//g"`
 fi
 if test -z "$perl_embed_ldflags" ; then
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
@@ -10174,12 +10125,13 @@ else
 fi
 
   fi
-  for ac_func in SSL_get_current_compression
+  for ac_func in SSL_get_current_compression X509_get_signature_nid
 do :
-  ac_fn_c_check_func "$LINENO" "SSL_get_current_compression" "ac_cv_func_SSL_get_current_compression"
-if test "x$ac_cv_func_SSL_get_current_compression" = xyes; then :
+  as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+if eval test \"x\$"$as_ac_var"\" = x"yes"; then :
   cat >>confdefs.h <<_ACEOF
-#define HAVE_SSL_GET_CURRENT_COMPRESSION 1
+#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
 _ACEOF
 
 fi
@@ -10473,6 +10425,17 @@ fi
     else
       LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
     fi
+    for ac_func in ldap_initialize
+do :
+  ac_fn_c_check_func "$LINENO" "ldap_initialize" "ac_cv_func_ldap_initialize"
+if test "x$ac_cv_func_ldap_initialize" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LDAP_INITIALIZE 1
+_ACEOF
+
+fi
+done
+
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ldap_bind in -lwldap32" >&5
 $as_echo_n "checking for ldap_bind in -lwldap32... " >&6; }
@@ -11870,6 +11833,30 @@ if test x"$pgac_cv__types_compatible" = xyes ; then
 
 $as_echo "#define HAVE__BUILTIN_TYPES_COMPATIBLE_P 1" >>confdefs.h
 
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap16" >&5
+$as_echo_n "checking for __builtin_bswap16... " >&6; }
+if ${pgac_cv__builtin_bswap16+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+static unsigned long int x = __builtin_bswap16(0xaabb);
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  pgac_cv__builtin_bswap16=yes
+else
+  pgac_cv__builtin_bswap16=no
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_bswap16" >&5
+$as_echo "$pgac_cv__builtin_bswap16" >&6; }
+if test x"$pgac_cv__builtin_bswap16" = xyes ; then
+
+$as_echo "#define HAVE__BUILTIN_BSWAP16 1" >>confdefs.h
+
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_bswap32" >&5
 $as_echo_n "checking for __builtin_bswap32... " >&6; }
@@ -11926,7 +11913,10 @@ if ${pgac_cv__builtin_constant_p+:} false; then :
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-static int x; static int y[__builtin_constant_p(x) ? x : 1];
+static int x;
+  static int y[__builtin_constant_p(x) ? x : 1];
+  static int z[__builtin_constant_p("string literal") ? 1 : x];
+
 
 _ACEOF
 if ac_fn_c_try_compile "$LINENO"; then :
@@ -12492,6 +12482,71 @@ $as_echo "#define LOCALE_T_IN_XLOCALE 1" >>confdefs.h
 
 fi
 
+# MSVC doesn't cope well with defining restrict to __restrict, the
+# spelling it understands, because it conflicts with
+# __declspec(restrict). Therefore we define pg_restrict to the
+# appropriate definition, which presumably won't conflict.
+#
+# Allow platforms with buggy compilers to force restrict to not be
+# used by setting $FORCE_DISABLE_RESTRICT=yes in the relevant
+# template.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for C/C++ restrict keyword" >&5
+$as_echo_n "checking for C/C++ restrict keyword... " >&6; }
+if ${ac_cv_c_restrict+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_cv_c_restrict=no
+   # The order here caters to the fact that C++ does not require restrict.
+   for ac_kw in __restrict __restrict__ _Restrict restrict; do
+     cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+typedef int * int_ptr;
+	int foo (int_ptr $ac_kw ip) {
+	return ip[0];
+       }
+int
+main ()
+{
+int s[1];
+	int * $ac_kw t = s;
+	t[0] = 0;
+	return foo(t)
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  ac_cv_c_restrict=$ac_kw
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+     test "$ac_cv_c_restrict" != no && break
+   done
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_c_restrict" >&5
+$as_echo "$ac_cv_c_restrict" >&6; }
+
+ case $ac_cv_c_restrict in
+   restrict) ;;
+   no) $as_echo "#define restrict /**/" >>confdefs.h
+ ;;
+   *)  cat >>confdefs.h <<_ACEOF
+#define restrict $ac_cv_c_restrict
+_ACEOF
+ ;;
+ esac
+
+if test "$ac_cv_c_restrict" = "no" -o "x$FORCE_DISABLE_RESTRICT" = "xyes"; then
+  pg_restrict=""
+else
+  pg_restrict="$ac_cv_c_restrict"
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define pg_restrict $pg_restrict
+_ACEOF
+
+
 ac_fn_c_check_type "$LINENO" "struct cmsgcred" "ac_cv_type_struct_cmsgcred" "#include <sys/socket.h>
 #include <sys/param.h>
 #ifdef HAVE_SYS_UCRED_H
@@ -13024,7 +13079,7 @@ fi
 LIBS_including_readline="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-for ac_func in cbrt clock_gettime dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l
+for ac_func in cbrt clock_gettime dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll posix_fallocate pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range utime utimes wcstombs_l
 do :
   as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
 ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
@@ -13191,6 +13246,16 @@ fi
 cat >>confdefs.h <<_ACEOF
 #define HAVE_DECL_STRLCPY $ac_have_decl
 _ACEOF
+ac_fn_c_check_decl "$LINENO" "strnlen" "ac_cv_have_decl_strnlen" "$ac_includes_default"
+if test "x$ac_cv_have_decl_strnlen" = xyes; then :
+  ac_have_decl=1
+else
+  ac_have_decl=0
+fi
+
+cat >>confdefs.h <<_ACEOF
+#define HAVE_DECL_STRNLEN $ac_have_decl
+_ACEOF
 
 # This is probably only present on macOS, but may as well check always
 ac_fn_c_check_decl "$LINENO" "F_FULLFSYNC" "ac_cv_have_decl_F_FULLFSYNC" "#include <fcntl.h>
@@ -13558,6 +13623,19 @@ esac
 
 fi
 
+ac_fn_c_check_func "$LINENO" "strnlen" "ac_cv_func_strnlen"
+if test "x$ac_cv_func_strnlen" = xyes; then :
+  $as_echo "#define HAVE_STRNLEN 1" >>confdefs.h
+
+else
+  case " $LIBOBJS " in
+  *" strnlen.$ac_objext "* ) ;;
+  *) LIBOBJS="$LIBOBJS strnlen.$ac_objext"
+ ;;
+esac
+
+fi
+
 
 
 case $host_os in
@@ -14254,24 +14332,6 @@ cat >>confdefs.h <<_ACEOF
 _ACEOF
 
 
-
-if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-#define INT64CONST(x)  x##LL
-long long int foo = INT64CONST(0x1234567890123456);
-
-_ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
-
-$as_echo "#define HAVE_LL_CONSTANTS 1" >>confdefs.h
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-
-
 # If we found "long int" is 64 bits, assume snprintf handles it.  If
 # we found we need to use "long long int", better check.  We cope with
 # snprintfs that use %lld, %qd, or %I64d as the format.  If none of these
@@ -14427,6 +14487,45 @@ esac
 
 fi
 
+# has to be down here, rather than with the other builtins, because
+# the test uses PG_INT64_TYPE.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for __builtin_mul_overflow" >&5
+$as_echo_n "checking for __builtin_mul_overflow... " >&6; }
+if ${pgac_cv__builtin_op_overflow+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+PG_INT64_TYPE a = 1;
+PG_INT64_TYPE b = 1;
+PG_INT64_TYPE result;
+int oflo;
+
+int
+main ()
+{
+oflo = __builtin_mul_overflow(a, b, &result);
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  pgac_cv__builtin_op_overflow=yes
+else
+  pgac_cv__builtin_op_overflow=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__builtin_op_overflow" >&5
+$as_echo "$pgac_cv__builtin_op_overflow" >&6; }
+if test x"$pgac_cv__builtin_op_overflow" = xyes ; then
+
+$as_echo "#define HAVE__BUILTIN_OP_OVERFLOW 1" >>confdefs.h
+
+fi
+
 # Check size of void *, size_t (enables tweaks for > 32bit address space)
 # The cast to long int works around a bug in the HP C Compiler
 # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects
@@ -14824,7 +14923,10 @@ _ACEOF
 
 # Compute maximum alignment of any basic type.
 # We assume long's alignment is at least as strong as char, short, or int;
-# but we must check long long (if it exists) and double.
+# but we must check long long (if it is being used for int64) and double.
+# Note that we intentionally do not consider any types wider than 64 bits,
+# as allowing MAXIMUM_ALIGNOF to exceed 8 would be too much of a penalty
+# for disk and memory space.
 
 MAX_ALIGNOF=$ac_cv_alignof_long
 if test $MAX_ALIGNOF -lt $ac_cv_alignof_double ; then
@@ -14884,7 +14986,7 @@ _ACEOF
 fi
 
 
-# Check for extensions offering the integer scalar type __int128.
+# Some compilers offer a 128-bit integer scalar type.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128" >&5
 $as_echo_n "checking for __int128... " >&6; }
 if ${pgac_cv__128bit_int+:} false; then :
@@ -14894,12 +14996,15 @@ else
 /* end confdefs.h.  */
 
 /*
+ * We don't actually run this test, just link it to verify that any support
+ * functions needed for __int128 are present.
+ *
  * These are globals to discourage the compiler from folding all the
  * arithmetic tests down to compile-time constants.  We do not have
- * convenient support for 64bit literals at this point...
+ * convenient support for 128bit literals at this point...
  */
 __int128 a = 48828125;
-__int128 b = 97656255;
+__int128 b = 97656250;
 
 int
 main ()
@@ -14908,13 +15013,12 @@ main ()
 __int128 c,d;
 a = (a << 12) + 1; /* 200000000001 */
 b = (b << 12) + 5; /* 400000000005 */
-/* use the most relevant arithmetic ops */
+/* try the most relevant arithmetic ops */
 c = a * b;
 d = (c + b) / b;
-/* return different values, to prevent optimizations */
+/* must use the results, else compiler may optimize arithmetic away */
 if (d != a+1)
-  return 0;
-return 1;
+  return 1;
 
   ;
   return 0;
@@ -14931,9 +15035,100 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__128bit_int" >&5
 $as_echo "$pgac_cv__128bit_int" >&6; }
 if test x"$pgac_cv__128bit_int" = xyes ; then
+  # Use of non-default alignment with __int128 tickles bugs in some compilers.
+  # If not cross-compiling, we can test for bugs and disable use of __int128
+  # with buggy compilers.  If cross-compiling, hope for the best.
+  # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=83925
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for __int128 alignment bug" >&5
+$as_echo_n "checking for __int128 alignment bug... " >&6; }
+if ${pgac_cv__128bit_int_bug+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test "$cross_compiling" = yes; then :
+  pgac_cv__128bit_int_bug="assuming ok"
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* This must match the corresponding code in c.h: */
+#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
+#define pg_attribute_aligned(a) __attribute__((aligned(a)))
+#endif
+typedef __int128 int128a
+#if defined(pg_attribute_aligned)
+pg_attribute_aligned(8)
+#endif
+;
+int128a holder;
+void pass_by_val(void *buffer, int128a par) { holder = par; }
+
+int
+main ()
+{
+
+long int i64 = 97656225L << 12;
+int128a q;
+pass_by_val(main, (int128a) i64);
+q = (int128a) i64;
+if (q != holder)
+  return 1;
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_run "$LINENO"; then :
+  pgac_cv__128bit_int_bug=ok
+else
+  pgac_cv__128bit_int_bug=broken
+fi
+rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
+  conftest.$ac_objext conftest.beam conftest.$ac_ext
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv__128bit_int_bug" >&5
+$as_echo "$pgac_cv__128bit_int_bug" >&6; }
+  if test x"$pgac_cv__128bit_int_bug" != xbroken ; then
 
 $as_echo "#define PG_INT128_TYPE __int128" >>confdefs.h
 
+    # The cast to long int works around a bug in the HP C Compiler,
+# see AC_CHECK_SIZEOF for more information.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking alignment of PG_INT128_TYPE" >&5
+$as_echo_n "checking alignment of PG_INT128_TYPE... " >&6; }
+if ${ac_cv_alignof_PG_INT128_TYPE+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_PG_INT128_TYPE"        "$ac_includes_default
+#ifndef offsetof
+# define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+#endif
+typedef struct { char x; PG_INT128_TYPE y; } ac__type_alignof_;"; then :
+
+else
+  if test "$ac_cv_type_PG_INT128_TYPE" = yes; then
+     { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error 77 "cannot compute alignment of PG_INT128_TYPE
+See \`config.log' for more details" "$LINENO" 5; }
+   else
+     ac_cv_alignof_PG_INT128_TYPE=0
+   fi
+fi
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_alignof_PG_INT128_TYPE" >&5
+$as_echo "$ac_cv_alignof_PG_INT128_TYPE" >&6; }
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define ALIGNOF_PG_INT128_TYPE $ac_cv_alignof_PG_INT128_TYPE
+_ACEOF
+
+
+  fi
 fi
 
 # Check for various atomic operations now that we have checked how to declare
@@ -16054,19 +16249,19 @@ fi
 #
 # Check for DocBook and tools
 #
-if test -z "$NSGMLS"; then
-  for ac_prog in onsgmls nsgmls
+if test -z "$XMLLINT"; then
+  for ac_prog in xmllint
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_NSGMLS+:} false; then :
+if ${ac_cv_path_XMLLINT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  case $NSGMLS in
+  case $XMLLINT in
   [\\/]* | ?:[\\/]*)
-  ac_cv_path_NSGMLS="$NSGMLS" # Let the user override the test with a path.
+  ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
   ;;
   *)
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -16076,7 +16271,7 @@ do
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
   if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_NSGMLS="$as_dir/$ac_word$ac_exec_ext"
+    ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -16087,35 +16282,35 @@ IFS=$as_save_IFS
   ;;
 esac
 fi
-NSGMLS=$ac_cv_path_NSGMLS
-if test -n "$NSGMLS"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSGMLS" >&5
-$as_echo "$NSGMLS" >&6; }
+XMLLINT=$ac_cv_path_XMLLINT
+if test -n "$XMLLINT"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+$as_echo "$XMLLINT" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
-  test -n "$NSGMLS" && break
+  test -n "$XMLLINT" && break
 done
 
 else
-  # Report the value of NSGMLS in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for NSGMLS" >&5
-$as_echo_n "checking for NSGMLS... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $NSGMLS" >&5
-$as_echo "$NSGMLS" >&6; }
+  # Report the value of XMLLINT in configure's output in all cases.
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
+$as_echo_n "checking for XMLLINT... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
+$as_echo "$XMLLINT" >&6; }
 fi
 
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook V4.2" >&5
-$as_echo_n "checking for DocBook V4.2... " >&6; }
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.2" >&5
+$as_echo_n "checking for DocBook XML V4.2... " >&6; }
 if ${pgac_cv_check_docbook+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  cat >conftest.sgml <<EOF
-<!doctype book PUBLIC "-//OASIS//DTD DocBook V4.2//EN">
+  cat >conftest.xml <<EOF
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 <book>
  <title>test</title>
  <chapter>
@@ -16130,13 +16325,13 @@ EOF
 
 pgac_cv_check_docbook=no
 
-if test -n "$NSGMLS"; then
-  $NSGMLS -s conftest.sgml 1>&5 2>&1
+if test -n "$XMLLINT"; then
+  $XMLLINT --noout --valid conftest.xml 1>&5 2>&1
   if test $? -eq 0; then
     pgac_cv_check_docbook=yes
   fi
 fi
-rm -f conftest.sgml
+rm -f conftest.xml
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_check_docbook" >&5
 $as_echo "$pgac_cv_check_docbook" >&6; }
@@ -16198,60 +16393,6 @@ $as_echo_n "checking for DBTOEPUB... " >&6; }
 $as_echo "$DBTOEPUB" >&6; }
 fi
 
-if test -z "$XMLLINT"; then
-  for ac_prog in xmllint
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_XMLLINT+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $XMLLINT in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_XMLLINT="$XMLLINT" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_XMLLINT="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-XMLLINT=$ac_cv_path_XMLLINT
-if test -n "$XMLLINT"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
-$as_echo "$XMLLINT" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$XMLLINT" && break
-done
-
-else
-  # Report the value of XMLLINT in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XMLLINT" >&5
-$as_echo_n "checking for XMLLINT... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XMLLINT" >&5
-$as_echo "$XMLLINT" >&6; }
-fi
-
 if test -z "$XSLTPROC"; then
   for ac_prog in xsltproc
 do
@@ -16306,60 +16447,6 @@ $as_echo_n "checking for XSLTPROC... " >&6; }
 $as_echo "$XSLTPROC" >&6; }
 fi
 
-if test -z "$OSX"; then
-  for ac_prog in osx sgml2xml sx
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_OSX+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  case $OSX in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_OSX="$OSX" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_OSX="$as_dir/$ac_word$ac_exec_ext"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-  ;;
-esac
-fi
-OSX=$ac_cv_path_OSX
-if test -n "$OSX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX" >&5
-$as_echo "$OSX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$OSX" && break
-done
-
-else
-  # Report the value of OSX in configure's output in all cases.
-  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OSX" >&5
-$as_echo_n "checking for OSX... " >&6; }
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $OSX" >&5
-$as_echo "$OSX" >&6; }
-fi
-
 if test -z "$FOP"; then
   for ac_prog in fop
 do
@@ -16767,7 +16854,7 @@ _ACEOF
 # awk -F is a regex on some platforms, and not on others, so make "." a tab
 PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
 tr '.' '	' |
-$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"
+$AWK '{printf "%d%04d", $1, $2}'`"
 
 cat >>confdefs.h <<_ACEOF
 #define PG_VERSION_NUM $PG_VERSION_NUM
diff --git a/configure.in b/configure.in
index e94fba5235..4d26034579 100644
--- a/configure.in
+++ b/configure.in
@@ -23,7 +23,7 @@ m4_if(m4_defn([m4_PACKAGE_VERSION]), [2.69], [], [m4_fatal([Autoconf version 2.6
 Untested combinations of 'autoconf' and PostgreSQL versions are not
 recommended.  You can remove the check from 'configure.in' but it is then
 your responsibility whether the result works or not.])])
-AC_COPYRIGHT([Copyright (c) 1996-2017, PostgreSQL Global Development Group])
+AC_COPYRIGHT([Copyright (c) 1996-2018, PostgreSQL Global Development Group])
 AC_CONFIG_SRCDIR([src/backend/access/common/heaptuple.c])
 AC_CONFIG_AUX_DIR(config)
 AC_PREFIX_DEFAULT(/usr/local/pgsql)
@@ -343,37 +343,6 @@ AC_DEFINE_UNQUOTED([XLOG_BLCKSZ], ${XLOG_BLCKSZ}, [
  Changing XLOG_BLCKSZ requires an initdb.
 ])
 
-#
-# WAL segment size
-#
-AC_MSG_CHECKING([for WAL segment size])
-PGAC_ARG_REQ(with, wal-segsize, [SEGSIZE], [set WAL segment size in MB [16]],
-             [wal_segsize=$withval],
-             [wal_segsize=16])
-case ${wal_segsize} in
-  1) ;;
-  2) ;;
-  4) ;;
-  8) ;;
- 16) ;;
- 32) ;;
- 64) ;;
- 128) ;;
- 256) ;;
- 512) ;;
- 1024) ;;
-  *) AC_MSG_ERROR([Invalid WAL segment size. Allowed values are 1,2,4,8,16,32,64,128,256,512,1024.])
-esac
-AC_MSG_RESULT([${wal_segsize}MB])
-
-AC_DEFINE_UNQUOTED([XLOG_SEG_SIZE], [(${wal_segsize} * 1024 * 1024)], [
- XLOG_SEG_SIZE is the size of a single WAL file.  This must be a power of 2
- and larger than XLOG_BLCKSZ (preferably, a great deal larger than
- XLOG_BLCKSZ).
-
- Changing XLOG_SEG_SIZE requires an initdb.
-])
-
 #
 # C compiler
 #
@@ -1092,10 +1061,10 @@ if test "$with_openssl" = yes ; then
      AC_CHECK_LIB(crypto, CRYPTO_new_ex_data, [], [AC_MSG_ERROR([library 'crypto' is required for OpenSSL])])
      AC_CHECK_LIB(ssl,    SSL_new, [], [AC_MSG_ERROR([library 'ssl' is required for OpenSSL])])
   else
-     AC_SEARCH_LIBS(CRYPTO_new_ex_data, eay32 crypto, [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
-     AC_SEARCH_LIBS(SSL_new, ssleay32 ssl, [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
+     AC_SEARCH_LIBS(CRYPTO_new_ex_data, [eay32 crypto], [], [AC_MSG_ERROR([library 'eay32' or 'crypto' is required for OpenSSL])])
+     AC_SEARCH_LIBS(SSL_new, [ssleay32 ssl], [], [AC_MSG_ERROR([library 'ssleay32' or 'ssl' is required for OpenSSL])])
   fi
-  AC_CHECK_FUNCS([SSL_get_current_compression])
+  AC_CHECK_FUNCS([SSL_get_current_compression X509_get_signature_nid])
   # Functions introduced in OpenSSL 1.1.0. We used to check for
   # OPENSSL_VERSION_NUMBER, but that didn't work with 1.1.0, because LibreSSL
   # defines OPENSSL_VERSION_NUMBER to claim version 2.0.0, even though it
@@ -1137,6 +1106,7 @@ if test "$with_ldap" = yes ; then
     else
       LDAP_LIBS_FE="-lldap $EXTRA_LDAP_LIBS"
     fi
+    AC_CHECK_FUNCS([ldap_initialize])
   else
     AC_CHECK_LIB(wldap32, ldap_bind, [], [AC_MSG_ERROR([library 'wldap32' is required for LDAP])])
     LDAP_LIBS_FE="-lwldap32"
@@ -1293,6 +1263,12 @@ fi
 
 if test "$with_bonjour" = yes ; then
   AC_CHECK_HEADER(dns_sd.h, [], [AC_MSG_ERROR([header file <dns_sd.h> is required for Bonjour])])
+dnl At some point we might add something like
+dnl AC_SEARCH_LIBS(DNSServiceRegister, dns_sd)
+dnl but right now, what that would mainly accomplish is to encourage
+dnl people to try to use the avahi implementation, which does not work.
+dnl If you want to use Apple's own Bonjour code on another platform,
+dnl just add -ldns_sd to LIBS manually.
 fi
 
 # for contrib/uuid-ossp
@@ -1337,6 +1313,7 @@ PGAC_C_FUNCNAME_SUPPORT
 PGAC_C_STATIC_ASSERT
 PGAC_C_TYPEOF
 PGAC_C_TYPES_COMPATIBLE
+PGAC_C_BUILTIN_BSWAP16
 PGAC_C_BUILTIN_BSWAP32
 PGAC_C_BUILTIN_BSWAP64
 PGAC_C_BUILTIN_CONSTANT_P
@@ -1355,6 +1332,24 @@ AC_TYPE_LONG_LONG_INT
 
 PGAC_TYPE_LOCALE_T
 
+# MSVC doesn't cope well with defining restrict to __restrict, the
+# spelling it understands, because it conflicts with
+# __declspec(restrict). Therefore we define pg_restrict to the
+# appropriate definition, which presumably won't conflict.
+#
+# Allow platforms with buggy compilers to force restrict to not be
+# used by setting $FORCE_DISABLE_RESTRICT=yes in the relevant
+# template.
+AC_C_RESTRICT
+if test "$ac_cv_c_restrict" = "no" -o "x$FORCE_DISABLE_RESTRICT" = "xyes"; then
+  pg_restrict=""
+else
+  pg_restrict="$ac_cv_c_restrict"
+fi
+AC_DEFINE_UNQUOTED([pg_restrict], [$pg_restrict],
+[Define to keyword to use for C99 restrict support, or to nothing if not
+supported])
+
 AC_CHECK_TYPES([struct cmsgcred], [], [],
 [#include <sys/socket.h>
 #include <sys/param.h>
@@ -1430,7 +1425,7 @@ PGAC_FUNC_WCSTOMBS_L
 LIBS_including_readline="$LIBS"
 LIBS=`echo "$LIBS" | sed -e 's/-ledit//g' -e 's/-lreadline//g'`
 
-AC_CHECK_FUNCS([cbrt clock_gettime dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range towlower utime utimes wcstombs wcstombs_l])
+AC_CHECK_FUNCS([cbrt clock_gettime dlopen fdatasync getifaddrs getpeerucred getrlimit mbstowcs_l memmove poll posix_fallocate pstat pthread_is_threaded_np readlink setproctitle setsid shm_open symlink sync_file_range utime utimes wcstombs_l])
 
 AC_REPLACE_FUNCS(fseeko)
 case $host_os in
@@ -1452,7 +1447,7 @@ AC_CHECK_DECLS(posix_fadvise, [], [], [#include <fcntl.h>])
 fi
 
 AC_CHECK_DECLS(fdatasync, [], [], [#include <unistd.h>])
-AC_CHECK_DECLS([strlcat, strlcpy])
+AC_CHECK_DECLS([strlcat, strlcpy, strnlen])
 # This is probably only present on macOS, but may as well check always
 AC_CHECK_DECLS(F_FULLFSYNC, [], [], [#include <fcntl.h>])
 
@@ -1544,7 +1539,7 @@ else
   AC_CHECK_FUNCS([fpclass fp_class fp_class_d class], [break])
 fi
 
-AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton mkdtemp random rint srandom strerror strlcat strlcpy])
+AC_REPLACE_FUNCS([crypt fls getopt getrusage inet_aton mkdtemp random rint srandom strerror strlcat strlcpy strnlen])
 
 case $host_os in
 
@@ -1735,18 +1730,6 @@ fi
 AC_DEFINE_UNQUOTED(PG_INT64_TYPE, $pg_int64_type,
   [Define to the name of a signed 64-bit integer type.])
 
-dnl If we need to use "long long int", figure out whether nnnLL notation works.
-
-if test x"$HAVE_LONG_LONG_INT_64" = xyes ; then
-  AC_COMPILE_IFELSE([AC_LANG_SOURCE([
-#define INT64CONST(x)  x##LL
-long long int foo = INT64CONST(0x1234567890123456);
-])],
-	[AC_DEFINE(HAVE_LL_CONSTANTS, 1, [Define to 1 if constants of type 'long long int' should have the suffix LL.])],
-	[])
-fi
-
-
 # If we found "long int" is 64 bits, assume snprintf handles it.  If
 # we found we need to use "long long int", better check.  We cope with
 # snprintfs that use %lld, %qd, or %I64d as the format.  If none of these
@@ -1788,6 +1771,10 @@ if test $pgac_need_repl_snprintf = yes; then
   AC_LIBOBJ(snprintf)
 fi
 
+# has to be down here, rather than with the other builtins, because
+# the test uses PG_INT64_TYPE.
+PGAC_C_BUILTIN_OP_OVERFLOW
+
 # Check size of void *, size_t (enables tweaks for > 32bit address space)
 AC_CHECK_SIZEOF([void *])
 AC_CHECK_SIZEOF([size_t])
@@ -1838,7 +1825,10 @@ AC_CHECK_ALIGNOF(double)
 
 # Compute maximum alignment of any basic type.
 # We assume long's alignment is at least as strong as char, short, or int;
-# but we must check long long (if it exists) and double.
+# but we must check long long (if it is being used for int64) and double.
+# Note that we intentionally do not consider any types wider than 64 bits,
+# as allowing MAXIMUM_ALIGNOF to exceed 8 would be too much of a penalty
+# for disk and memory space.
 
 MAX_ALIGNOF=$ac_cv_alignof_long
 if test $MAX_ALIGNOF -lt $ac_cv_alignof_double ; then
@@ -1855,7 +1845,7 @@ AC_DEFINE_UNQUOTED(MAXIMUM_ALIGNOF, $MAX_ALIGNOF, [Define as the maximum alignme
 AC_CHECK_TYPES([int8, uint8, int64, uint64], [], [],
 [#include <stdio.h>])
 
-# Check for extensions offering the integer scalar type __int128.
+# Some compilers offer a 128-bit integer scalar type.
 PGAC_TYPE_128BIT_INT
 
 # Check for various atomic operations now that we have checked how to declare
@@ -2106,12 +2096,10 @@ fi
 #
 # Check for DocBook and tools
 #
-PGAC_PROG_NSGMLS
+PGAC_PATH_XMLLINT
 PGAC_CHECK_DOCBOOK(4.2)
 PGAC_PATH_PROGS(DBTOEPUB, dbtoepub)
-PGAC_PATH_PROGS(XMLLINT, xmllint)
 PGAC_PATH_PROGS(XSLTPROC, xsltproc)
-PGAC_PATH_PROGS(OSX, [osx sgml2xml sx])
 PGAC_PATH_PROGS(FOP, fop)
 
 #
@@ -2205,7 +2193,7 @@ AC_DEFINE_UNQUOTED(PG_VERSION_STR,
 # awk -F is a regex on some platforms, and not on others, so make "." a tab
 [PG_VERSION_NUM="`echo "$PACKAGE_VERSION" | sed 's/[A-Za-z].*$//' |
 tr '.' '	' |
-$AWK '{printf "%d%02d%02d", $1, $2, (NF >= 3) ? $3 : 0}'`"]
+$AWK '{printf "%d%04d", $1, $2}'`"]
 AC_DEFINE_UNQUOTED(PG_VERSION_NUM, $PG_VERSION_NUM, [PostgreSQL version as a number])
 AC_SUBST(PG_VERSION_NUM)
 
diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt
index 71a2d77a79..d8e91d42ba 100644
--- a/contrib/CMakeLists.txt
+++ b/contrib/CMakeLists.txt
@@ -26,7 +26,6 @@ add_subdirectory(auto_explain)
 add_subdirectory(btree_gin)
 add_subdirectory(btree_gist)
 add_subdirectory(bloom)
-add_subdirectory(chkpass)
 add_subdirectory(citext)
 add_subdirectory(cube)
 add_subdirectory(dblink)
diff --git a/contrib/Makefile b/contrib/Makefile
index e84eb67008..8046ca4f39 100644
--- a/contrib/Makefile
+++ b/contrib/Makefile
@@ -12,7 +12,6 @@ SUBDIRS = \
 		bloom		\
 		btree_gin	\
 		btree_gist	\
-		chkpass		\
 		citext		\
 		cube		\
 		dblink		\
diff --git a/contrib/adminpack/.gitignore b/contrib/adminpack/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/adminpack/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/adminpack/Makefile b/contrib/adminpack/Makefile
index f065f84bfb..89c249bc0d 100644
--- a/contrib/adminpack/Makefile
+++ b/contrib/adminpack/Makefile
@@ -8,6 +8,8 @@ EXTENSION = adminpack
 DATA = adminpack--1.0.sql
 PGFILEDESC = "adminpack - support functions for pgAdmin"
 
+REGRESS = adminpack
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/adminpack/adminpack.c b/contrib/adminpack/adminpack.c
index f3f8e7f1e4..1785dee3a1 100644
--- a/contrib/adminpack/adminpack.c
+++ b/contrib/adminpack/adminpack.c
@@ -3,7 +3,7 @@
  * adminpack.c
  *
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * Author: Andreas Pflug <pgadmin@pse-consulting.de>
  *
@@ -319,7 +319,7 @@ pg_logdir_ls(PG_FUNCTION_ARGS)
 		if (!fctx->dirdesc)
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not read directory \"%s\": %m",
+					 errmsg("could not open directory \"%s\": %m",
 							fctx->location)));
 
 		funcctx->user_fctx = fctx;
diff --git a/contrib/adminpack/expected/adminpack.out b/contrib/adminpack/expected/adminpack.out
new file mode 100644
index 0000000000..b0d72ddab2
--- /dev/null
+++ b/contrib/adminpack/expected/adminpack.out
@@ -0,0 +1,146 @@
+CREATE EXTENSION adminpack;
+-- create new file
+SELECT pg_file_write('test_file1', 'test1', false);
+ pg_file_write 
+---------------
+             5
+(1 row)
+
+SELECT pg_read_file('test_file1');
+ pg_read_file 
+--------------
+ test1
+(1 row)
+
+-- append
+SELECT pg_file_write('test_file1', 'test1', true);
+ pg_file_write 
+---------------
+             5
+(1 row)
+
+SELECT pg_read_file('test_file1');
+ pg_read_file 
+--------------
+ test1test1
+(1 row)
+
+-- error, already exists
+SELECT pg_file_write('test_file1', 'test1', false);
+ERROR:  file "test_file1" exists
+SELECT pg_read_file('test_file1');
+ pg_read_file 
+--------------
+ test1test1
+(1 row)
+
+-- disallowed file paths
+SELECT pg_file_write('../test_file0', 'test0', false);
+ERROR:  path must be in or below the current directory
+SELECT pg_file_write('/tmp/test_file0', 'test0', false);
+ERROR:  absolute path not allowed
+SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4', false);
+ pg_file_write 
+---------------
+             5
+(1 row)
+
+SELECT pg_file_write(current_setting('data_directory') || '/../test_file4', 'test4', false);
+ERROR:  reference to parent directory ("..") not allowed
+-- rename file
+SELECT pg_file_rename('test_file1', 'test_file2');
+ pg_file_rename 
+----------------
+ t
+(1 row)
+
+SELECT pg_read_file('test_file1');  -- not there
+ERROR:  could not stat file "test_file1": No such file or directory
+SELECT pg_read_file('test_file2');
+ pg_read_file 
+--------------
+ test1test1
+(1 row)
+
+-- error
+SELECT pg_file_rename('test_file1', 'test_file2');
+WARNING:  file "test_file1" is not accessible: No such file or directory
+ pg_file_rename 
+----------------
+ f
+(1 row)
+
+-- rename file and archive
+SELECT pg_file_write('test_file3', 'test3', false);
+ pg_file_write 
+---------------
+             5
+(1 row)
+
+SELECT pg_file_rename('test_file2', 'test_file3', 'test_file3_archive');
+ pg_file_rename 
+----------------
+ t
+(1 row)
+
+SELECT pg_read_file('test_file2');  -- not there
+ERROR:  could not stat file "test_file2": No such file or directory
+SELECT pg_read_file('test_file3');
+ pg_read_file 
+--------------
+ test1test1
+(1 row)
+
+SELECT pg_read_file('test_file3_archive');
+ pg_read_file 
+--------------
+ test3
+(1 row)
+
+-- unlink
+SELECT pg_file_unlink('test_file1');  -- does not exist
+ pg_file_unlink 
+----------------
+ f
+(1 row)
+
+SELECT pg_file_unlink('test_file2');  -- does not exist
+ pg_file_unlink 
+----------------
+ f
+(1 row)
+
+SELECT pg_file_unlink('test_file3');
+ pg_file_unlink 
+----------------
+ t
+(1 row)
+
+SELECT pg_file_unlink('test_file3_archive');
+ pg_file_unlink 
+----------------
+ t
+(1 row)
+
+SELECT pg_file_unlink('test_file4');
+ pg_file_unlink 
+----------------
+ t
+(1 row)
+
+-- superuser checks
+CREATE USER regress_user1;
+SET ROLE regress_user1;
+SELECT pg_file_write('test_file0', 'test0', false);
+ERROR:  only superuser may access generic file functions
+SELECT pg_file_rename('test_file0', 'test_file0');
+ERROR:  only superuser may access generic file functions
+CONTEXT:  SQL function "pg_file_rename" statement 1
+SELECT pg_file_unlink('test_file0');
+ERROR:  only superuser may access generic file functions
+SELECT pg_logdir_ls();
+ERROR:  only superuser can list the log directory
+RESET ROLE;
+DROP USER regress_user1;
+-- no further tests for pg_logdir_ls() because it depends on the
+-- server's logging setup
diff --git a/contrib/adminpack/sql/adminpack.sql b/contrib/adminpack/sql/adminpack.sql
new file mode 100644
index 0000000000..13621bd043
--- /dev/null
+++ b/contrib/adminpack/sql/adminpack.sql
@@ -0,0 +1,60 @@
+CREATE EXTENSION adminpack;
+
+-- create new file
+SELECT pg_file_write('test_file1', 'test1', false);
+SELECT pg_read_file('test_file1');
+
+-- append
+SELECT pg_file_write('test_file1', 'test1', true);
+SELECT pg_read_file('test_file1');
+
+-- error, already exists
+SELECT pg_file_write('test_file1', 'test1', false);
+SELECT pg_read_file('test_file1');
+
+-- disallowed file paths
+SELECT pg_file_write('../test_file0', 'test0', false);
+SELECT pg_file_write('/tmp/test_file0', 'test0', false);
+SELECT pg_file_write(current_setting('data_directory') || '/test_file4', 'test4', false);
+SELECT pg_file_write(current_setting('data_directory') || '/../test_file4', 'test4', false);
+
+
+-- rename file
+SELECT pg_file_rename('test_file1', 'test_file2');
+SELECT pg_read_file('test_file1');  -- not there
+SELECT pg_read_file('test_file2');
+
+-- error
+SELECT pg_file_rename('test_file1', 'test_file2');
+
+-- rename file and archive
+SELECT pg_file_write('test_file3', 'test3', false);
+SELECT pg_file_rename('test_file2', 'test_file3', 'test_file3_archive');
+SELECT pg_read_file('test_file2');  -- not there
+SELECT pg_read_file('test_file3');
+SELECT pg_read_file('test_file3_archive');
+
+
+-- unlink
+SELECT pg_file_unlink('test_file1');  -- does not exist
+SELECT pg_file_unlink('test_file2');  -- does not exist
+SELECT pg_file_unlink('test_file3');
+SELECT pg_file_unlink('test_file3_archive');
+SELECT pg_file_unlink('test_file4');
+
+
+-- superuser checks
+CREATE USER regress_user1;
+SET ROLE regress_user1;
+
+SELECT pg_file_write('test_file0', 'test0', false);
+SELECT pg_file_rename('test_file0', 'test_file0');
+SELECT pg_file_unlink('test_file0');
+SELECT pg_logdir_ls();
+
+RESET ROLE;
+DROP USER regress_user1;
+
+
+-- no further tests for pg_logdir_ls() because it depends on the
+-- server's logging setup
diff --git a/contrib/amcheck/verify_nbtree.c b/contrib/amcheck/verify_nbtree.c
index 9ae83dc839..da518daea3 100644
--- a/contrib/amcheck/verify_nbtree.c
+++ b/contrib/amcheck/verify_nbtree.c
@@ -9,7 +9,7 @@
  * verification).
  *
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/amcheck/verify_nbtree.c
@@ -295,9 +295,7 @@ bt_check_every_level(Relation rel, bool readonly)
 	/* Create context for page */
 	state->targetcontext = AllocSetContextCreate(CurrentMemoryContext,
 												 "amcheck context",
-												 ALLOCSET_DEFAULT_MINSIZE,
-												 ALLOCSET_DEFAULT_INITSIZE,
-												 ALLOCSET_DEFAULT_MAXSIZE);
+												 ALLOCSET_DEFAULT_SIZES);
 	state->checkstrategy = GetAccessStrategy(BAS_BULKREAD);
 
 	/* Get true root block from meta-page */
@@ -1195,7 +1193,7 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum)
 
 	opaque = (BTPageOpaque) PageGetSpecialPointer(page);
 
-	if (opaque->btpo_flags & BTP_META && blocknum != BTREE_METAPAGE)
+	if (P_ISMETA(opaque) && blocknum != BTREE_METAPAGE)
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
 				 errmsg("invalid meta page found at block %u in index \"%s\"",
@@ -1206,7 +1204,7 @@ palloc_btree_page(BtreeCheckState *state, BlockNumber blocknum)
 	{
 		BTMetaPageData *metad = BTPageGetMeta(page);
 
-		if (!(opaque->btpo_flags & BTP_META) ||
+		if (!P_ISMETA(opaque) ||
 			metad->btm_magic != BTREE_MAGIC)
 			ereport(ERROR,
 					(errcode(ERRCODE_INDEX_CORRUPTED),
diff --git a/contrib/auth_delay/auth_delay.c b/contrib/auth_delay/auth_delay.c
index cd12a86b99..ad047b365f 100644
--- a/contrib/auth_delay/auth_delay.c
+++ b/contrib/auth_delay/auth_delay.c
@@ -2,7 +2,7 @@
  *
  * auth_delay.c
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		contrib/auth_delay/auth_delay.c
diff --git a/contrib/auto_explain/auto_explain.c b/contrib/auto_explain/auto_explain.c
index edcb91542a..ea4f957cfa 100644
--- a/contrib/auto_explain/auto_explain.c
+++ b/contrib/auto_explain/auto_explain.c
@@ -3,7 +3,7 @@
  * auto_explain.c
  *
  *
- * Copyright (c) 2008-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2008-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/auto_explain/auto_explain.c
@@ -78,7 +78,7 @@ _PG_init(void)
 							"Zero prints all plans. -1 turns this feature off.",
 							&auto_explain_log_min_duration,
 							-1,
-							-1, INT_MAX / 1000,
+							-1, INT_MAX,
 							PGC_SUSET,
 							GUC_UNIT_MS,
 							NULL,
diff --git a/contrib/bloom/blcost.c b/contrib/bloom/blcost.c
index ba39f627fd..fa0f17a217 100644
--- a/contrib/bloom/blcost.c
+++ b/contrib/bloom/blcost.c
@@ -3,7 +3,7 @@
  * blcost.c
  *		Cost estimate function for bloom indexes.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/blcost.c
diff --git a/contrib/bloom/blinsert.c b/contrib/bloom/blinsert.c
index 0d506e3c1a..d231e5331f 100644
--- a/contrib/bloom/blinsert.c
+++ b/contrib/bloom/blinsert.c
@@ -3,7 +3,7 @@
  * blinsert.c
  *		Bloom index build and insert functions.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/blinsert.c
@@ -135,7 +135,8 @@ blbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 
 	/* Do the heap scan */
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
-								   bloomBuildCallback, (void *) &buildstate);
+								   bloomBuildCallback, (void *) &buildstate,
+								   NULL);
 
 	/*
 	 * There are could be some items in cached page.  Flush this page if
@@ -175,7 +176,7 @@ blbuildempty(Relation index)
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, BLOOM_METAPAGE_BLKNO,
 			  (char *) metapage, true);
 	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-				BLOOM_METAPAGE_BLKNO, metapage, false);
+				BLOOM_METAPAGE_BLKNO, metapage, true);
 
 	/*
 	 * An immediate sync is required even if we xlog'd the page, because the
diff --git a/contrib/bloom/bloom.h b/contrib/bloom/bloom.h
index f3df1af781..3973ac75e8 100644
--- a/contrib/bloom/bloom.h
+++ b/contrib/bloom/bloom.h
@@ -3,7 +3,7 @@
  * bloom.h
  *	  Header for bloom index.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/bloom.h
diff --git a/contrib/bloom/blscan.c b/contrib/bloom/blscan.c
index b8fa2d0a71..0744d74de7 100644
--- a/contrib/bloom/blscan.c
+++ b/contrib/bloom/blscan.c
@@ -3,7 +3,7 @@
  * blscan.c
  *		Bloom index scan functions.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/blscan.c
diff --git a/contrib/bloom/blutils.c b/contrib/bloom/blutils.c
index f2eda67e0a..bbe7183207 100644
--- a/contrib/bloom/blutils.c
+++ b/contrib/bloom/blutils.c
@@ -3,7 +3,7 @@
  * blutils.c
  *		Bloom index utilities.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1990-1993, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/contrib/bloom/blvacuum.c b/contrib/bloom/blvacuum.c
index 2e060871b6..7530a664ab 100644
--- a/contrib/bloom/blvacuum.c
+++ b/contrib/bloom/blvacuum.c
@@ -3,7 +3,7 @@
  * blvacuum.c
  *		Bloom VACUUM functions.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/blvacuum.c
@@ -125,7 +125,7 @@ blbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 			/* Is it empty page now? */
 			if (BloomPageGetMaxOffset(page) == 0)
 				BloomPageSetDeleted(page);
-			/* Adjust pg_lower */
+			/* Adjust pd_lower */
 			((PageHeader) page)->pd_lower = (Pointer) itupPtr - page;
 			/* Finish WAL-logging */
 			GenericXLogFinish(gxlogState);
diff --git a/contrib/bloom/blvalidate.c b/contrib/bloom/blvalidate.c
index cb75d23199..7235f12307 100644
--- a/contrib/bloom/blvalidate.c
+++ b/contrib/bloom/blvalidate.c
@@ -3,7 +3,7 @@
  * blvalidate.c
  *	  Opclass validator for bloom.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/bloom/blvalidate.c
diff --git a/contrib/bloom/expected/bloom.out b/contrib/bloom/expected/bloom.out
index cbc50f757b..5ab9e34f82 100644
--- a/contrib/bloom/expected/bloom.out
+++ b/contrib/bloom/expected/bloom.out
@@ -210,3 +210,20 @@ ORDER BY 1;
  text_ops | t
 (2 rows)
 
+--
+-- relation options
+--
+DROP INDEX bloomidx;
+CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (length=7, col1=4);
+SELECT reloptions FROM pg_class WHERE oid = 'bloomidx'::regclass;
+    reloptions     
+-------------------
+ {length=7,col1=4}
+(1 row)
+
+-- check for min and max values
+\set VERBOSITY terse
+CREATE INDEX bloomidx2 ON tst USING bloom (i, t) WITH (length=0);
+ERROR:  value 0 out of bounds for option "length"
+CREATE INDEX bloomidx2 ON tst USING bloom (i, t) WITH (col1=0);
+ERROR:  value 0 out of bounds for option "col1"
diff --git a/contrib/bloom/sql/bloom.sql b/contrib/bloom/sql/bloom.sql
index 22274609f2..32755f2b1a 100644
--- a/contrib/bloom/sql/bloom.sql
+++ b/contrib/bloom/sql/bloom.sql
@@ -81,3 +81,14 @@ SELECT opcname, amvalidate(opc.oid)
 FROM pg_opclass opc JOIN pg_am am ON am.oid = opcmethod
 WHERE amname = 'bloom'
 ORDER BY 1;
+
+--
+-- relation options
+--
+DROP INDEX bloomidx;
+CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (length=7, col1=4);
+SELECT reloptions FROM pg_class WHERE oid = 'bloomidx'::regclass;
+-- check for min and max values
+\set VERBOSITY terse
+CREATE INDEX bloomidx2 ON tst USING bloom (i, t) WITH (length=0);
+CREATE INDEX bloomidx2 ON tst USING bloom (i, t) WITH (col1=0);
diff --git a/contrib/bloom/t/001_wal.pl b/contrib/bloom/t/001_wal.pl
index dbba198254..1b319c993c 100644
--- a/contrib/bloom/t/001_wal.pl
+++ b/contrib/bloom/t/001_wal.pl
@@ -32,8 +32,8 @@ sub test_index_replay
 );
 
 	# Run test queries and compare their result
-	my $master_result = $node_master->psql("postgres", $queries);
-	my $standby_result = $node_standby->psql("postgres", $queries);
+	my $master_result = $node_master->safe_psql("postgres", $queries);
+	my $standby_result = $node_standby->safe_psql("postgres", $queries);
 
 	is($master_result, $standby_result, "$test_name: query result matches");
 }
@@ -54,12 +54,12 @@ sub test_index_replay
 $node_standby->start;
 
 # Create some bloom index on master
-$node_master->psql("postgres", "CREATE EXTENSION bloom;");
-$node_master->psql("postgres", "CREATE TABLE tst (i int4, t text);");
-$node_master->psql("postgres",
+$node_master->safe_psql("postgres", "CREATE EXTENSION bloom;");
+$node_master->safe_psql("postgres", "CREATE TABLE tst (i int4, t text);");
+$node_master->safe_psql("postgres",
 "INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,100000) i;"
 );
-$node_master->psql("postgres",
+$node_master->safe_psql("postgres",
 	"CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3);");
 
 # Test that queries give same result
@@ -68,12 +68,12 @@ sub test_index_replay
 # Run 10 cycles of table modification. Run test queries after each modification.
 for my $i (1 .. 10)
 {
-	$node_master->psql("postgres", "DELETE FROM tst WHERE i = $i;");
+	$node_master->safe_psql("postgres", "DELETE FROM tst WHERE i = $i;");
 	test_index_replay("delete $i");
-	$node_master->psql("postgres", "VACUUM tst;");
+	$node_master->safe_psql("postgres", "VACUUM tst;");
 	test_index_replay("vacuum $i");
 	my ($start, $end) = (100001 + ($i - 1) * 10000, 100000 + $i * 10000);
-	$node_master->psql("postgres",
+	$node_master->safe_psql("postgres",
 "INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series($start,$end) i;"
 	);
 	test_index_replay("insert $i");
diff --git a/contrib/btree_gist/btree_bit.c b/contrib/btree_gist/btree_bit.c
index a56a2752a7..2225244ded 100644
--- a/contrib/btree_gist/btree_bit.c
+++ b/contrib/btree_gist/btree_bit.c
@@ -111,7 +111,7 @@ static const gbtree_vinfo tinfo =
 {
 	gbt_t_bit,
 	0,
-	TRUE,
+	true,
 	gbt_bitgt,
 	gbt_bitge,
 	gbt_biteq,
@@ -152,13 +152,13 @@ gbt_bit_consistent(PG_FUNCTION_ARGS)
 
 	if (GIST_LEAF(entry))
 		retval = gbt_var_consistent(&r, query, strategy, PG_GET_COLLATION(),
-									TRUE, &tinfo, fcinfo->flinfo);
+									true, &tinfo, fcinfo->flinfo);
 	else
 	{
 		bytea	   *q = gbt_bit_xfrm((bytea *) query);
 
 		retval = gbt_var_consistent(&r, q, strategy, PG_GET_COLLATION(),
-									FALSE, &tinfo, fcinfo->flinfo);
+									false, &tinfo, fcinfo->flinfo);
 	}
 	PG_RETURN_BOOL(retval);
 }
diff --git a/contrib/btree_gist/btree_bytea.c b/contrib/btree_gist/btree_bytea.c
index 00753e7f48..6b005f0157 100644
--- a/contrib/btree_gist/btree_bytea.c
+++ b/contrib/btree_gist/btree_bytea.c
@@ -75,7 +75,7 @@ static const gbtree_vinfo tinfo =
 {
 	gbt_t_bytea,
 	0,
-	TRUE,
+	true,
 	gbt_byteagt,
 	gbt_byteage,
 	gbt_byteaeq,
diff --git a/contrib/btree_gist/btree_cash.c b/contrib/btree_gist/btree_cash.c
index 81131af4dc..894d0a2665 100644
--- a/contrib/btree_gist/btree_cash.c
+++ b/contrib/btree_gist/btree_cash.c
@@ -5,6 +5,7 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
+#include "common/int.h"
 #include "utils/cash.h"
 
 typedef struct
@@ -99,15 +100,14 @@ cash_dist(PG_FUNCTION_ARGS)
 	Cash		r;
 	Cash		ra;
 
-	r = a - b;
-	ra = Abs(r);
-
-	/* Overflow check. */
-	if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a)))
+	if (pg_sub_s64_overflow(a, b, &r) ||
+		r == PG_INT64_MIN)
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("money out of range")));
 
+	ra = Abs(r);
+
 	PG_RETURN_CASH(ra);
 }
 
diff --git a/contrib/btree_gist/btree_inet.c b/contrib/btree_gist/btree_inet.c
index b5b593f77f..86c27ca955 100644
--- a/contrib/btree_gist/btree_inet.c
+++ b/contrib/btree_gist/btree_inet.c
@@ -105,7 +105,7 @@ gbt_inet_compress(PG_FUNCTION_ARGS)
 		r->upper = r->lower;
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
diff --git a/contrib/btree_gist/btree_int2.c b/contrib/btree_gist/btree_int2.c
index f343b8615f..7674e2d292 100644
--- a/contrib/btree_gist/btree_int2.c
+++ b/contrib/btree_gist/btree_int2.c
@@ -5,6 +5,7 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
+#include "common/int.h"
 
 typedef struct int16key
 {
@@ -98,15 +99,14 @@ int2_dist(PG_FUNCTION_ARGS)
 	int16		r;
 	int16		ra;
 
-	r = a - b;
-	ra = Abs(r);
-
-	/* Overflow check. */
-	if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a)))
+	if (pg_sub_s16_overflow(a, b, &r) ||
+		r == PG_INT16_MIN)
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
 
+	ra = Abs(r);
+
 	PG_RETURN_INT16(ra);
 }
 
diff --git a/contrib/btree_gist/btree_int4.c b/contrib/btree_gist/btree_int4.c
index 35bb442437..80005ab65d 100644
--- a/contrib/btree_gist/btree_int4.c
+++ b/contrib/btree_gist/btree_int4.c
@@ -5,6 +5,7 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
+#include "common/int.h"
 
 typedef struct int32key
 {
@@ -99,15 +100,14 @@ int4_dist(PG_FUNCTION_ARGS)
 	int32		r;
 	int32		ra;
 
-	r = a - b;
-	ra = Abs(r);
-
-	/* Overflow check. */
-	if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a)))
+	if (pg_sub_s32_overflow(a, b, &r) ||
+		r == PG_INT32_MIN)
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
 
+	ra = Abs(r);
+
 	PG_RETURN_INT32(ra);
 }
 
diff --git a/contrib/btree_gist/btree_int8.c b/contrib/btree_gist/btree_int8.c
index 91f2d032d1..b0fd3e1277 100644
--- a/contrib/btree_gist/btree_int8.c
+++ b/contrib/btree_gist/btree_int8.c
@@ -5,6 +5,7 @@
 
 #include "btree_gist.h"
 #include "btree_utils_num.h"
+#include "common/int.h"
 
 typedef struct int64key
 {
@@ -99,15 +100,14 @@ int8_dist(PG_FUNCTION_ARGS)
 	int64		r;
 	int64		ra;
 
-	r = a - b;
-	ra = Abs(r);
-
-	/* Overflow check. */
-	if (ra < 0 || (!SAMESIGN(a, b) && !SAMESIGN(r, a)))
+	if (pg_sub_s64_overflow(a, b, &r) ||
+		r == PG_INT64_MIN)
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
 
+	ra = Abs(r);
+
 	PG_RETURN_INT64(ra);
 }
 
diff --git a/contrib/btree_gist/btree_interval.c b/contrib/btree_gist/btree_interval.c
index 61ab478c42..3a527a75fa 100644
--- a/contrib/btree_gist/btree_interval.c
+++ b/contrib/btree_gist/btree_interval.c
@@ -169,7 +169,7 @@ gbt_intv_compress(PG_FUNCTION_ARGS)
 		}
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 
 	PG_RETURN_POINTER(retval);
@@ -201,7 +201,7 @@ gbt_intv_decompress(PG_FUNCTION_ARGS)
 
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	PG_RETURN_POINTER(retval);
 }
diff --git a/contrib/btree_gist/btree_numeric.c b/contrib/btree_gist/btree_numeric.c
index 43793d36a2..b72060cdb6 100644
--- a/contrib/btree_gist/btree_numeric.c
+++ b/contrib/btree_gist/btree_numeric.c
@@ -79,7 +79,7 @@ static const gbtree_vinfo tinfo =
 {
 	gbt_t_numeric,
 	0,
-	FALSE,
+	false,
 	gbt_numeric_gt,
 	gbt_numeric_ge,
 	gbt_numeric_eq,
diff --git a/contrib/btree_gist/btree_text.c b/contrib/btree_gist/btree_text.c
index 090c849470..8019d11281 100644
--- a/contrib/btree_gist/btree_text.c
+++ b/contrib/btree_gist/btree_text.c
@@ -80,7 +80,7 @@ static gbtree_vinfo tinfo =
 {
 	gbt_t_text,
 	0,
-	FALSE,
+	false,
 	gbt_textgt,
 	gbt_textge,
 	gbt_texteq,
@@ -128,7 +128,7 @@ gbt_bpchar_compress(PG_FUNCTION_ARGS)
 
 		gistentryinit(trim, d,
 					  entry->rel, entry->page,
-					  entry->offset, TRUE);
+					  entry->offset, true);
 		retval = gbt_var_compress(&trim, &tinfo);
 	}
 	else
@@ -171,7 +171,7 @@ Datum
 gbt_bpchar_consistent(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	void	   *query = (void *) DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(1)));
+	void	   *query = (void *) DatumGetTextP(PG_GETARG_DATUM(1));
 	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
 	/* Oid		subtype = PG_GETARG_OID(3); */
diff --git a/contrib/btree_gist/btree_time.c b/contrib/btree_gist/btree_time.c
index bb239d4986..90cf6554ea 100644
--- a/contrib/btree_gist/btree_time.c
+++ b/contrib/btree_gist/btree_time.c
@@ -183,7 +183,7 @@ gbt_timetz_compress(PG_FUNCTION_ARGS)
 		r->lower = r->upper = tmp;
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
diff --git a/contrib/btree_gist/btree_ts.c b/contrib/btree_gist/btree_ts.c
index 1582cff102..18740cad38 100644
--- a/contrib/btree_gist/btree_ts.c
+++ b/contrib/btree_gist/btree_ts.c
@@ -230,7 +230,7 @@ gbt_tstz_compress(PG_FUNCTION_ARGS)
 		r->lower = r->upper = gmt;
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
diff --git a/contrib/btree_gist/btree_utils_num.c b/contrib/btree_gist/btree_utils_num.c
index bae32c4064..29b0faf997 100644
--- a/contrib/btree_gist/btree_utils_num.c
+++ b/contrib/btree_gist/btree_utils_num.c
@@ -86,7 +86,7 @@ gbt_num_compress(GISTENTRY *entry, const gbtree_ninfo *tinfo)
 		memcpy((void *) &r[tinfo->size], leaf, tinfo->size);
 		retval = palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r), entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
@@ -150,7 +150,7 @@ gbt_num_fetch(GISTENTRY *entry, const gbtree_ninfo *tinfo)
 
 	retval = palloc(sizeof(GISTENTRY));
 	gistentryinit(*retval, datum, entry->rel, entry->page, entry->offset,
-				  FALSE);
+				  false);
 	return retval;
 }
 
@@ -184,10 +184,10 @@ gbt_num_union(GBT_NUMKEY *out, const GistEntryVector *entryvec, const gbtree_nin
 		c.lower = &cur[0];
 		c.upper = &cur[tinfo->size];
 		/* if out->lower > cur->lower, adopt cur as lower */
-		if ((*tinfo->f_gt) (o.lower, c.lower, flinfo))
+		if (tinfo->f_gt(o.lower, c.lower, flinfo))
 			memcpy((void *) o.lower, (void *) c.lower, tinfo->size);
 		/* if out->upper < cur->upper, adopt cur as upper */
-		if ((*tinfo->f_lt) (o.upper, c.upper, flinfo))
+		if (tinfo->f_lt(o.upper, c.upper, flinfo))
 			memcpy((void *) o.upper, (void *) c.upper, tinfo->size);
 	}
 
@@ -211,8 +211,8 @@ gbt_num_same(const GBT_NUMKEY *a, const GBT_NUMKEY *b, const gbtree_ninfo *tinfo
 	b2.lower = &(((GBT_NUMKEY *) b)[0]);
 	b2.upper = &(((GBT_NUMKEY *) b)[tinfo->size]);
 
-	return ((*tinfo->f_eq) (b1.lower, b2.lower, flinfo) &&
-			(*tinfo->f_eq) (b1.upper, b2.upper, flinfo));
+	return (tinfo->f_eq(b1.lower, b2.lower, flinfo) &&
+			tinfo->f_eq(b1.upper, b2.upper, flinfo));
 }
 
 
@@ -236,9 +236,9 @@ gbt_num_bin_union(Datum *u, GBT_NUMKEY *e, const gbtree_ninfo *tinfo, FmgrInfo *
 
 		ur.lower = &(((GBT_NUMKEY *) DatumGetPointer(*u))[0]);
 		ur.upper = &(((GBT_NUMKEY *) DatumGetPointer(*u))[tinfo->size]);
-		if ((*tinfo->f_gt) ((void *) ur.lower, (void *) rd.lower, flinfo))
+		if (tinfo->f_gt((void *) ur.lower, (void *) rd.lower, flinfo))
 			memcpy((void *) ur.lower, (void *) rd.lower, tinfo->size);
-		if ((*tinfo->f_lt) ((void *) ur.upper, (void *) rd.upper, flinfo))
+		if (tinfo->f_lt((void *) ur.upper, (void *) rd.upper, flinfo))
 			memcpy((void *) ur.upper, (void *) rd.upper, tinfo->size);
 	}
 }
@@ -264,39 +264,39 @@ gbt_num_consistent(const GBT_NUMKEY_R *key,
 	switch (*strategy)
 	{
 		case BTLessEqualStrategyNumber:
-			retval = (*tinfo->f_ge) (query, key->lower, flinfo);
+			retval = tinfo->f_ge(query, key->lower, flinfo);
 			break;
 		case BTLessStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_gt) (query, key->lower, flinfo);
+				retval = tinfo->f_gt(query, key->lower, flinfo);
 			else
-				retval = (*tinfo->f_ge) (query, key->lower, flinfo);
+				retval = tinfo->f_ge(query, key->lower, flinfo);
 			break;
 		case BTEqualStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_eq) (query, key->lower, flinfo);
+				retval = tinfo->f_eq(query, key->lower, flinfo);
 			else
-				retval = ((*tinfo->f_le) (key->lower, query, flinfo) &&
-						  (*tinfo->f_le) (query, key->upper, flinfo));
+				retval = (tinfo->f_le(key->lower, query, flinfo) &&
+						  tinfo->f_le(query, key->upper, flinfo));
 			break;
 		case BTGreaterStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_lt) (query, key->upper, flinfo);
+				retval = tinfo->f_lt(query, key->upper, flinfo);
 			else
-				retval = (*tinfo->f_le) (query, key->upper, flinfo);
+				retval = tinfo->f_le(query, key->upper, flinfo);
 			break;
 		case BTGreaterEqualStrategyNumber:
-			retval = (*tinfo->f_le) (query, key->upper, flinfo);
+			retval = tinfo->f_le(query, key->upper, flinfo);
 			break;
 		case BtreeGistNotEqualStrategyNumber:
-			retval = (!((*tinfo->f_eq) (query, key->lower, flinfo) &&
-						(*tinfo->f_eq) (query, key->upper, flinfo)));
+			retval = (!(tinfo->f_eq(query, key->lower, flinfo) &&
+						tinfo->f_eq(query, key->upper, flinfo)));
 			break;
 		default:
 			retval = false;
 	}
 
-	return (retval);
+	return retval;
 }
 
 
diff --git a/contrib/btree_gist/btree_utils_num.h b/contrib/btree_gist/btree_utils_num.h
index 17561fa9e4..d7945f856c 100644
--- a/contrib/btree_gist/btree_utils_num.h
+++ b/contrib/btree_gist/btree_utils_num.h
@@ -89,8 +89,6 @@ typedef struct
 
 #define GET_FLOAT_DISTANCE(t, arg1, arg2)	Abs( ((float8) *((const t *) (arg1))) - ((float8) *((const t *) (arg2))) )
 
-#define SAMESIGN(a,b)	(((a) < 0) == ((b) < 0))
-
 /*
  * check to see if a float4/8 val has underflowed or overflowed
  * borrowed from src/backend/utils/adt/float.c
diff --git a/contrib/btree_gist/btree_utils_var.c b/contrib/btree_gist/btree_utils_var.c
index 2c636ad2fa..670c879e77 100644
--- a/contrib/btree_gist/btree_utils_var.c
+++ b/contrib/btree_gist/btree_utils_var.c
@@ -37,7 +37,7 @@ Datum
 gbt_var_decompress(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
+	GBT_VARKEY *key = (GBT_VARKEY *) PG_DETOAST_DATUM(entry->key);
 
 	if (key != (GBT_VARKEY *) DatumGetPointer(entry->key))
 	{
@@ -45,7 +45,7 @@ gbt_var_decompress(PG_FUNCTION_ARGS)
 
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 
 		PG_RETURN_POINTER(retval);
 	}
@@ -109,7 +109,7 @@ gbt_var_leaf2node(GBT_VARKEY *leaf, const gbtree_vinfo *tinfo, FmgrInfo *flinfo)
 	GBT_VARKEY *out = leaf;
 
 	if (tinfo->f_l2n)
-		out = (*tinfo->f_l2n) (leaf, flinfo);
+		out = tinfo->f_l2n(leaf, flinfo);
 
 	return out;
 }
@@ -159,7 +159,7 @@ gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
 		l--;
 		i++;
 	}
-	return (ml);				/* lower == upper */
+	return ml;					/* lower == upper */
 }
 
 
@@ -169,7 +169,7 @@ gbt_var_node_cp_len(const GBT_VARKEY *node, const gbtree_vinfo *tinfo)
 static bool
 gbt_bytea_pf_match(const bytea *pf, const bytea *query, const gbtree_vinfo *tinfo)
 {
-	bool		out = FALSE;
+	bool		out = false;
 	int32		qlen = VARSIZE(query) - VARHDRSZ;
 	int32		nlen = VARSIZE(pf) - VARHDRSZ;
 
@@ -255,13 +255,13 @@ gbt_var_bin_union(Datum *u, GBT_VARKEY *e, Oid collation,
 		nr.lower = ro.lower;
 		nr.upper = ro.upper;
 
-		if ((*tinfo->f_cmp) (ro.lower, eo.lower, collation, flinfo) > 0)
+		if (tinfo->f_cmp(ro.lower, eo.lower, collation, flinfo) > 0)
 		{
 			nr.lower = eo.lower;
 			update = true;
 		}
 
-		if ((*tinfo->f_cmp) (ro.upper, eo.upper, collation, flinfo) < 0)
+		if (tinfo->f_cmp(ro.upper, eo.upper, collation, flinfo) < 0)
 		{
 			nr.upper = eo.upper;
 			update = true;
@@ -294,12 +294,12 @@ gbt_var_compress(GISTENTRY *entry, const gbtree_vinfo *tinfo)
 		retval = palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, TRUE);
+					  entry->offset, true);
 	}
 	else
 		retval = entry;
 
-	return (retval);
+	return retval;
 }
 
 
@@ -307,14 +307,14 @@ Datum
 gbt_var_fetch(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	GBT_VARKEY *key = (GBT_VARKEY *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
+	GBT_VARKEY *key = (GBT_VARKEY *) PG_DETOAST_DATUM(entry->key);
 	GBT_VARKEY_R r = gbt_var_key_readable(key);
 	GISTENTRY  *retval;
 
 	retval = palloc(sizeof(GISTENTRY));
 	gistentryinit(*retval, PointerGetDatum(r.lower),
 				  entry->rel, entry->page,
-				  entry->offset, TRUE);
+				  entry->offset, true);
 
 	PG_RETURN_POINTER(retval);
 }
@@ -371,8 +371,8 @@ gbt_var_same(Datum d1, Datum d2, Oid collation,
 	r1 = gbt_var_key_readable(t1);
 	r2 = gbt_var_key_readable(t2);
 
-	return ((*tinfo->f_cmp) (r1.lower, r2.lower, collation, flinfo) == 0 &&
-			(*tinfo->f_cmp) (r1.upper, r2.upper, collation, flinfo) == 0);
+	return (tinfo->f_cmp(r1.lower, r2.lower, collation, flinfo) == 0 &&
+			tinfo->f_cmp(r1.upper, r2.upper, collation, flinfo) == 0);
 }
 
 
@@ -400,9 +400,9 @@ gbt_var_penalty(float *res, const GISTENTRY *o, const GISTENTRY *n,
 
 	if ((VARSIZE(ok.lower) - VARHDRSZ) == 0 && (VARSIZE(ok.upper) - VARHDRSZ) == 0)
 		*res = 0.0;
-	else if (!(((*tinfo->f_cmp) (nk.lower, ok.lower, collation, flinfo) >= 0 ||
+	else if (!((tinfo->f_cmp(nk.lower, ok.lower, collation, flinfo) >= 0 ||
 				gbt_bytea_pf_match(ok.lower, nk.lower, tinfo)) &&
-			   ((*tinfo->f_cmp) (nk.upper, ok.upper, collation, flinfo) <= 0 ||
+			   (tinfo->f_cmp(nk.upper, ok.upper, collation, flinfo) <= 0 ||
 				gbt_bytea_pf_match(ok.upper, nk.upper, tinfo))))
 	{
 		Datum		d = PointerGetDatum(0);
@@ -449,9 +449,9 @@ gbt_vsrt_cmp(const void *a, const void *b, void *arg)
 	const gbt_vsrt_arg *varg = (const gbt_vsrt_arg *) arg;
 	int			res;
 
-	res = (*varg->tinfo->f_cmp) (ar.lower, br.lower, varg->collation, varg->flinfo);
+	res = varg->tinfo->f_cmp(ar.lower, br.lower, varg->collation, varg->flinfo);
 	if (res == 0)
-		return (*varg->tinfo->f_cmp) (ar.upper, br.upper, varg->collation, varg->flinfo);
+		return varg->tinfo->f_cmp(ar.upper, br.upper, varg->collation, varg->flinfo);
 
 	return res;
 }
@@ -561,53 +561,53 @@ gbt_var_consistent(GBT_VARKEY_R *key,
 				   const gbtree_vinfo *tinfo,
 				   FmgrInfo *flinfo)
 {
-	bool		retval = FALSE;
+	bool		retval = false;
 
 	switch (strategy)
 	{
 		case BTLessEqualStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_ge) (query, key->lower, collation, flinfo);
+				retval = tinfo->f_ge(query, key->lower, collation, flinfo);
 			else
-				retval = (*tinfo->f_cmp) (query, key->lower, collation, flinfo) >= 0
+				retval = tinfo->f_cmp(query, key->lower, collation, flinfo) >= 0
 					|| gbt_var_node_pf_match(key, query, tinfo);
 			break;
 		case BTLessStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_gt) (query, key->lower, collation, flinfo);
+				retval = tinfo->f_gt(query, key->lower, collation, flinfo);
 			else
-				retval = (*tinfo->f_cmp) (query, key->lower, collation, flinfo) >= 0
+				retval = tinfo->f_cmp(query, key->lower, collation, flinfo) >= 0
 					|| gbt_var_node_pf_match(key, query, tinfo);
 			break;
 		case BTEqualStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_eq) (query, key->lower, collation, flinfo);
+				retval = tinfo->f_eq(query, key->lower, collation, flinfo);
 			else
 				retval =
-					((*tinfo->f_cmp) (key->lower, query, collation, flinfo) <= 0 &&
-					 (*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0) ||
+					(tinfo->f_cmp(key->lower, query, collation, flinfo) <= 0 &&
+					 tinfo->f_cmp(query, key->upper, collation, flinfo) <= 0) ||
 					gbt_var_node_pf_match(key, query, tinfo);
 			break;
 		case BTGreaterStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_lt) (query, key->upper, collation, flinfo);
+				retval = tinfo->f_lt(query, key->upper, collation, flinfo);
 			else
-				retval = (*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0
+				retval = tinfo->f_cmp(query, key->upper, collation, flinfo) <= 0
 					|| gbt_var_node_pf_match(key, query, tinfo);
 			break;
 		case BTGreaterEqualStrategyNumber:
 			if (is_leaf)
-				retval = (*tinfo->f_le) (query, key->upper, collation, flinfo);
+				retval = tinfo->f_le(query, key->upper, collation, flinfo);
 			else
-				retval = (*tinfo->f_cmp) (query, key->upper, collation, flinfo) <= 0
+				retval = tinfo->f_cmp(query, key->upper, collation, flinfo) <= 0
 					|| gbt_var_node_pf_match(key, query, tinfo);
 			break;
 		case BtreeGistNotEqualStrategyNumber:
-			retval = !((*tinfo->f_eq) (query, key->lower, collation, flinfo) &&
-					   (*tinfo->f_eq) (query, key->upper, collation, flinfo));
+			retval = !(tinfo->f_eq(query, key->lower, collation, flinfo) &&
+					   tinfo->f_eq(query, key->upper, collation, flinfo));
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 
 	return retval;
diff --git a/contrib/btree_gist/btree_uuid.c b/contrib/btree_gist/btree_uuid.c
index ecf357d662..0b3e52fbff 100644
--- a/contrib/btree_gist/btree_uuid.c
+++ b/contrib/btree_gist/btree_uuid.c
@@ -114,7 +114,7 @@ gbt_uuid_compress(PG_FUNCTION_ARGS)
 		memcpy((void *) (r + UUID_LEN), (void *) key, UUID_LEN);
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
@@ -182,8 +182,8 @@ uuid_2_double(const pg_uuid_t *u)
 	 * machine, byte-swap each half so we can use native uint64 arithmetic.
 	 */
 #ifndef WORDS_BIGENDIAN
-	uu[0] = BSWAP64(uu[0]);
-	uu[1] = BSWAP64(uu[1]);
+	uu[0] = pg_bswap64(uu[0]);
+	uu[1] = pg_bswap64(uu[1]);
 #endif
 
 	/*
diff --git a/contrib/chkpass/CMakeLists.txt b/contrib/chkpass/CMakeLists.txt
deleted file mode 100644
index 1265b65d2a..0000000000
--- a/contrib/chkpass/CMakeLists.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-include_directories("${PROJECT_SOURCE_DIR}/src/include")
-
-set(extension_name chkpass)
-
-add_library(${extension_name} ${PLUGIN_TYPE} ${extension_name}.c)
-target_link_libraries(${extension_name} ${contrib_libs})
-if(CRYPT_LIB)
-	target_link_libraries(${extension_name} ${CRYPT_LIB})
-endif()
-set_target_properties(${extension_name} PROPERTIES PREFIX "")
-add_dependencies(${extension_name} postgres)
-if (MSVC)
-	gen_def(${extension_name})
-endif()
-if(NOT PGXS)
-	CMAKE_SET_TARGET_FOLDER(${extension_name} contrib)
-endif()
-install(TARGETS ${extension_name}
-		RUNTIME DESTINATION ${PGBINDIR}
-		LIBRARY DESTINATION ${LIBDIR})
-install(FILES ${extension_name}.control ${extension_name}--1.0.sql ${extension_name}--unpackaged--1.0.sql
-	DESTINATION ${PGSHAREDIR}/extension)
diff --git a/contrib/chkpass/Makefile b/contrib/chkpass/Makefile
deleted file mode 100644
index a2599ea239..0000000000
--- a/contrib/chkpass/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-# contrib/chkpass/Makefile
-
-MODULE_big = chkpass
-OBJS = chkpass.o $(WIN32RES)
-
-EXTENSION = chkpass
-DATA = chkpass--1.0.sql chkpass--unpackaged--1.0.sql
-PGFILEDESC = "chkpass - encrypted password data type"
-
-SHLIB_LINK = $(filter -lcrypt, $(LIBS))
-
-ifdef USE_PGXS
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-include $(PGXS)
-else
-subdir = contrib/chkpass
-top_builddir = ../..
-include $(top_builddir)/src/Makefile.global
-include $(top_srcdir)/contrib/contrib-global.mk
-endif
diff --git a/contrib/chkpass/chkpass--1.0.sql b/contrib/chkpass/chkpass--1.0.sql
deleted file mode 100644
index 406a61924c..0000000000
--- a/contrib/chkpass/chkpass--1.0.sql
+++ /dev/null
@@ -1,70 +0,0 @@
-/* contrib/chkpass/chkpass--1.0.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION chkpass" to load this file. \quit
-
---
---	Input and output functions and the type itself:
---
-
-CREATE FUNCTION chkpass_in(cstring)
-	RETURNS chkpass
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C STRICT VOLATILE;
--- Note: chkpass_in actually is volatile, because of its use of random().
--- In hindsight that was a bad idea, but there's no way to change it without
--- breaking some usage patterns.
-
-CREATE FUNCTION chkpass_out(chkpass)
-	RETURNS cstring
-	AS 'MODULE_PATHNAME'
-	LANGUAGE C STRICT IMMUTABLE;
-
-CREATE TYPE chkpass (
-	internallength = 16,
-	input = chkpass_in,
-	output = chkpass_out
-);
-
-CREATE FUNCTION raw(chkpass)
-	RETURNS text
-	AS 'MODULE_PATHNAME', 'chkpass_rout'
-	LANGUAGE C STRICT;
-
---
---	The various boolean tests:
---
-
-CREATE FUNCTION eq(chkpass, text)
-	RETURNS bool
-	AS 'MODULE_PATHNAME', 'chkpass_eq'
-	LANGUAGE C STRICT;
-
-CREATE FUNCTION ne(chkpass, text)
-	RETURNS bool
-	AS 'MODULE_PATHNAME', 'chkpass_ne'
-	LANGUAGE C STRICT;
-
---
---	Now the operators.
---
-
-CREATE OPERATOR = (
-	leftarg = chkpass,
-	rightarg = text,
-	negator = <>,
-	procedure = eq
-);
-
-CREATE OPERATOR <> (
-	leftarg = chkpass,
-	rightarg = text,
-	negator = =,
-	procedure = ne
-);
-
-COMMENT ON TYPE chkpass IS 'password type with checks';
-
---
---	eof
---
diff --git a/contrib/chkpass/chkpass--unpackaged--1.0.sql b/contrib/chkpass/chkpass--unpackaged--1.0.sql
deleted file mode 100644
index 8bdecddfa5..0000000000
--- a/contrib/chkpass/chkpass--unpackaged--1.0.sql
+++ /dev/null
@@ -1,13 +0,0 @@
-/* contrib/chkpass/chkpass--unpackaged--1.0.sql */
-
--- complain if script is sourced in psql, rather than via CREATE EXTENSION
-\echo Use "CREATE EXTENSION chkpass FROM unpackaged" to load this file. \quit
-
-ALTER EXTENSION chkpass ADD type chkpass;
-ALTER EXTENSION chkpass ADD function chkpass_in(cstring);
-ALTER EXTENSION chkpass ADD function chkpass_out(chkpass);
-ALTER EXTENSION chkpass ADD function raw(chkpass);
-ALTER EXTENSION chkpass ADD function eq(chkpass,text);
-ALTER EXTENSION chkpass ADD function ne(chkpass,text);
-ALTER EXTENSION chkpass ADD operator <>(chkpass,text);
-ALTER EXTENSION chkpass ADD operator =(chkpass,text);
diff --git a/contrib/chkpass/chkpass.c b/contrib/chkpass/chkpass.c
deleted file mode 100644
index 3803ccff9a..0000000000
--- a/contrib/chkpass/chkpass.c
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
- * PostgreSQL type definitions for chkpass
- * Written by D'Arcy J.M. Cain
- * darcy@druid.net
- * http://www.druid.net/darcy/
- *
- * contrib/chkpass/chkpass.c
- * best viewed with tabs set to 4
- */
-
-#include "postgres.h"
-
-#include <time.h>
-#include <unistd.h>
-#ifdef HAVE_CRYPT_H
-#include <crypt.h>
-#endif
-
-#include "fmgr.h"
-#include "utils/backend_random.h"
-#include "utils/builtins.h"
-
-PG_MODULE_MAGIC;
-
-/*
- * This type encrypts it's input unless the first character is a colon.
- * The output is the encrypted form with a leading colon.  The output
- * format is designed to allow dump and reload operations to work as
- * expected without doing special tricks.
- */
-
-
-/*
- * This is the internal storage format for CHKPASSs.
- * 15 is all I need but add a little buffer
- */
-
-typedef struct chkpass
-{
-	char		password[16];
-} chkpass;
-
-
-/* This function checks that the password is a good one
- * It's just a placeholder for now */
-static int
-verify_pass(const char *str)
-{
-	return 0;
-}
-
-/*
- * CHKPASS reader.
- */
-PG_FUNCTION_INFO_V1(chkpass_in);
-Datum
-chkpass_in(PG_FUNCTION_ARGS)
-{
-	char	   *str = PG_GETARG_CSTRING(0);
-	chkpass    *result;
-	char		mysalt[4];
-	char	   *crypt_output;
-	static char salt_chars[] =
-	"./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz";
-
-	/* special case to let us enter encrypted passwords */
-	if (*str == ':')
-	{
-		result = (chkpass *) palloc0(sizeof(chkpass));
-		strlcpy(result->password, str + 1, 13 + 1);
-		PG_RETURN_POINTER(result);
-	}
-
-	if (verify_pass(str) != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATA_EXCEPTION),
-				 errmsg("password \"%s\" is weak", str)));
-
-	result = (chkpass *) palloc0(sizeof(chkpass));
-
-	if (!pg_backend_random(mysalt, 2))
-		ereport(ERROR,
-				(errmsg("could not generate random salt")));
-
-	mysalt[0] = salt_chars[mysalt[0] & 0x3f];
-	mysalt[1] = salt_chars[mysalt[1] & 0x3f];
-	mysalt[2] = 0;				/* technically the terminator is not necessary
-								 * but I like to play safe */
-
-	crypt_output = crypt(str, mysalt);
-	if (crypt_output == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("crypt() failed")));
-
-	strlcpy(result->password, crypt_output, sizeof(result->password));
-
-	PG_RETURN_POINTER(result);
-}
-
-/*
- * CHKPASS output function.
- * Just like any string but we know it is max 15 (13 plus colon and terminator.)
- */
-
-PG_FUNCTION_INFO_V1(chkpass_out);
-Datum
-chkpass_out(PG_FUNCTION_ARGS)
-{
-	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
-	char	   *result;
-
-	result = (char *) palloc(16);
-	result[0] = ':';
-	strlcpy(result + 1, password->password, 15);
-
-	PG_RETURN_CSTRING(result);
-}
-
-
-/*
- * special output function that doesn't output the colon
- */
-
-PG_FUNCTION_INFO_V1(chkpass_rout);
-Datum
-chkpass_rout(PG_FUNCTION_ARGS)
-{
-	chkpass    *password = (chkpass *) PG_GETARG_POINTER(0);
-
-	PG_RETURN_TEXT_P(cstring_to_text(password->password));
-}
-
-
-/*
- * Boolean tests
- */
-
-PG_FUNCTION_INFO_V1(chkpass_eq);
-Datum
-chkpass_eq(PG_FUNCTION_ARGS)
-{
-	chkpass    *a1 = (chkpass *) PG_GETARG_POINTER(0);
-	text	   *a2 = PG_GETARG_TEXT_PP(1);
-	char		str[9];
-	char	   *crypt_output;
-
-	text_to_cstring_buffer(a2, str, sizeof(str));
-	crypt_output = crypt(str, a1->password);
-	if (crypt_output == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("crypt() failed")));
-
-	PG_RETURN_BOOL(strcmp(a1->password, crypt_output) == 0);
-}
-
-PG_FUNCTION_INFO_V1(chkpass_ne);
-Datum
-chkpass_ne(PG_FUNCTION_ARGS)
-{
-	chkpass    *a1 = (chkpass *) PG_GETARG_POINTER(0);
-	text	   *a2 = PG_GETARG_TEXT_PP(1);
-	char		str[9];
-	char	   *crypt_output;
-
-	text_to_cstring_buffer(a2, str, sizeof(str));
-	crypt_output = crypt(str, a1->password);
-	if (crypt_output == NULL)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("crypt() failed")));
-
-	PG_RETURN_BOOL(strcmp(a1->password, crypt_output) != 0);
-}
diff --git a/contrib/chkpass/chkpass.control b/contrib/chkpass/chkpass.control
deleted file mode 100644
index bd4b3d3d0d..0000000000
--- a/contrib/chkpass/chkpass.control
+++ /dev/null
@@ -1,5 +0,0 @@
-# chkpass extension
-comment = 'data type for auto-encrypted passwords'
-default_version = '1.0'
-module_pathname = '$libdir/chkpass'
-relocatable = true
diff --git a/contrib/citext/CMakeLists.txt b/contrib/citext/CMakeLists.txt
index 4d33eb6a72..e5fcfd87ec 100644
--- a/contrib/citext/CMakeLists.txt
+++ b/contrib/citext/CMakeLists.txt
@@ -18,6 +18,7 @@ install(TARGETS ${extension_name}
 install(FILES
 	${extension_name}.control
 	${extension_name}--1.4.sql
+	${extension_name}--1.4--1.5.sql
 	${extension_name}--1.3--1.4.sql
 	${extension_name}--1.2--1.3.sql
 	${extension_name}--1.1--1.2.sql
diff --git a/contrib/citext/Makefile b/contrib/citext/Makefile
index 563cd22dcc..e32a7de946 100644
--- a/contrib/citext/Makefile
+++ b/contrib/citext/Makefile
@@ -3,7 +3,8 @@
 MODULES = citext
 
 EXTENSION = citext
-DATA = citext--1.4.sql citext--1.3--1.4.sql \
+DATA = citext--1.4.sql citext--1.4--1.5.sql \
+	citext--1.3--1.4.sql \
 	citext--1.2--1.3.sql citext--1.1--1.2.sql \
 	citext--1.0--1.1.sql citext--unpackaged--1.0.sql
 PGFILEDESC = "citext - case-insensitive character string data type"
diff --git a/contrib/citext/citext--1.4--1.5.sql b/contrib/citext/citext--1.4--1.5.sql
new file mode 100644
index 0000000000..5ae522b7da
--- /dev/null
+++ b/contrib/citext/citext--1.4--1.5.sql
@@ -0,0 +1,88 @@
+/* contrib/citext/citext--1.4--1.5.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION citext UPDATE TO '1.5'" to load this file. \quit
+
+ALTER OPERATOR <= (citext, citext) SET (
+    RESTRICT   = scalarlesel,
+    JOIN       = scalarlejoinsel
+);
+
+ALTER OPERATOR >= (citext, citext) SET (
+    RESTRICT   = scalargesel,
+    JOIN       = scalargejoinsel
+);
+
+CREATE FUNCTION citext_pattern_lt( citext, citext )
+RETURNS bool
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION citext_pattern_le( citext, citext )
+RETURNS bool
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION citext_pattern_gt( citext, citext )
+RETURNS bool
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE FUNCTION citext_pattern_ge( citext, citext )
+RETURNS bool
+AS 'MODULE_PATHNAME'
+LANGUAGE C IMMUTABLE STRICT PARALLEL SAFE;
+
+CREATE OPERATOR ~<~ (
+    LEFTARG    = CITEXT,
+    RIGHTARG   = CITEXT,
+    NEGATOR    = ~>=~,
+    COMMUTATOR = ~>~,
+    PROCEDURE  = citext_pattern_lt,
+    RESTRICT   = scalarltsel,
+    JOIN       = scalarltjoinsel
+);
+
+CREATE OPERATOR ~<=~ (
+    LEFTARG    = CITEXT,
+    RIGHTARG   = CITEXT,
+    NEGATOR    = ~>~,
+    COMMUTATOR = ~>=~,
+    PROCEDURE  = citext_pattern_le,
+    RESTRICT   = scalarltsel,
+    JOIN       = scalarltjoinsel
+);
+
+CREATE OPERATOR ~>=~ (
+    LEFTARG    = CITEXT,
+    RIGHTARG   = CITEXT,
+    NEGATOR    = ~<~,
+    COMMUTATOR = ~<=~,
+    PROCEDURE  = citext_pattern_ge,
+    RESTRICT   = scalargtsel,
+    JOIN       = scalargtjoinsel
+);
+
+CREATE OPERATOR ~>~ (
+    LEFTARG    = CITEXT,
+    RIGHTARG   = CITEXT,
+    NEGATOR    = ~<=~,
+    COMMUTATOR = ~<~,
+    PROCEDURE  = citext_pattern_gt,
+    RESTRICT   = scalargtsel,
+    JOIN       = scalargtjoinsel
+);
+
+CREATE FUNCTION citext_pattern_cmp(citext, citext)
+RETURNS int4
+AS 'MODULE_PATHNAME'
+LANGUAGE C STRICT IMMUTABLE PARALLEL SAFE;
+
+CREATE OPERATOR CLASS citext_pattern_ops
+FOR TYPE CITEXT USING btree AS
+    OPERATOR    1   ~<~  (citext, citext),
+    OPERATOR    2   ~<=~ (citext, citext),
+    OPERATOR    3   =    (citext, citext),
+    OPERATOR    4   ~>=~ (citext, citext),
+    OPERATOR    5   ~>~  (citext, citext),
+    FUNCTION    1   citext_pattern_cmp(citext, citext);
diff --git a/contrib/citext/citext.c b/contrib/citext/citext.c
index 04f604b15f..2c0e48e2bc 100644
--- a/contrib/citext/citext.c
+++ b/contrib/citext/citext.c
@@ -9,9 +9,7 @@
 #include "utils/formatting.h"
 #include "utils/varlena.h"
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 
 /*
  *		====================
@@ -20,6 +18,7 @@ PG_MODULE_MAGIC;
  */
 
 static int32 citextcmp(text *left, text *right, Oid collid);
+static int32 internal_citext_pattern_cmp(text *left, text *right, Oid collid);
 
 /*
  *		=================
@@ -60,6 +59,41 @@ citextcmp(text *left, text *right, Oid collid)
 	return result;
 }
 
+/*
+ * citext_pattern_cmp()
+ * Internal character-by-character comparison function for citext strings.
+ * Returns int32 negative, zero, or positive.
+ */
+static int32
+internal_citext_pattern_cmp(text *left, text *right, Oid collid)
+{
+	char	   *lcstr,
+			   *rcstr;
+	int			llen,
+				rlen;
+	int32		result;
+
+	lcstr = str_tolower(VARDATA_ANY(left), VARSIZE_ANY_EXHDR(left), DEFAULT_COLLATION_OID);
+	rcstr = str_tolower(VARDATA_ANY(right), VARSIZE_ANY_EXHDR(right), DEFAULT_COLLATION_OID);
+
+	llen = strlen(lcstr);
+	rlen = strlen(rcstr);
+
+	result = memcmp((void *) lcstr, (void *) rcstr, Min(llen, rlen));
+	if (result == 0)
+	{
+		if (llen < rlen)
+			result = -1;
+		else if (llen > rlen)
+			result = 1;
+	}
+
+	pfree(lcstr);
+	pfree(rcstr);
+
+	return result;
+}
+
 /*
  *		==================
  *		INDEXING FUNCTIONS
@@ -83,6 +117,23 @@ citext_cmp(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(result);
 }
 
+PG_FUNCTION_INFO_V1(citext_pattern_cmp);
+
+Datum
+citext_pattern_cmp(PG_FUNCTION_ARGS)
+{
+	text	   *left = PG_GETARG_TEXT_PP(0);
+	text	   *right = PG_GETARG_TEXT_PP(1);
+	int32		result;
+
+	result = internal_citext_pattern_cmp(left, right, PG_GET_COLLATION());
+
+	PG_FREE_IF_COPY(left, 0);
+	PG_FREE_IF_COPY(right, 1);
+
+	PG_RETURN_INT32(result);
+}
+
 PG_FUNCTION_INFO_V1(citext_hash);
 
 Datum
@@ -236,6 +287,74 @@ citext_ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(result);
 }
 
+PG_FUNCTION_INFO_V1(citext_pattern_lt);
+
+Datum
+citext_pattern_lt(PG_FUNCTION_ARGS)
+{
+	text	   *left = PG_GETARG_TEXT_PP(0);
+	text	   *right = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = internal_citext_pattern_cmp(left, right, PG_GET_COLLATION()) < 0;
+
+	PG_FREE_IF_COPY(left, 0);
+	PG_FREE_IF_COPY(right, 1);
+
+	PG_RETURN_BOOL(result);
+}
+
+PG_FUNCTION_INFO_V1(citext_pattern_le);
+
+Datum
+citext_pattern_le(PG_FUNCTION_ARGS)
+{
+	text	   *left = PG_GETARG_TEXT_PP(0);
+	text	   *right = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = internal_citext_pattern_cmp(left, right, PG_GET_COLLATION()) <= 0;
+
+	PG_FREE_IF_COPY(left, 0);
+	PG_FREE_IF_COPY(right, 1);
+
+	PG_RETURN_BOOL(result);
+}
+
+PG_FUNCTION_INFO_V1(citext_pattern_gt);
+
+Datum
+citext_pattern_gt(PG_FUNCTION_ARGS)
+{
+	text	   *left = PG_GETARG_TEXT_PP(0);
+	text	   *right = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = internal_citext_pattern_cmp(left, right, PG_GET_COLLATION()) > 0;
+
+	PG_FREE_IF_COPY(left, 0);
+	PG_FREE_IF_COPY(right, 1);
+
+	PG_RETURN_BOOL(result);
+}
+
+PG_FUNCTION_INFO_V1(citext_pattern_ge);
+
+Datum
+citext_pattern_ge(PG_FUNCTION_ARGS)
+{
+	text	   *left = PG_GETARG_TEXT_PP(0);
+	text	   *right = PG_GETARG_TEXT_PP(1);
+	bool		result;
+
+	result = internal_citext_pattern_cmp(left, right, PG_GET_COLLATION()) >= 0;
+
+	PG_FREE_IF_COPY(left, 0);
+	PG_FREE_IF_COPY(right, 1);
+
+	PG_RETURN_BOOL(result);
+}
+
 /*
  *		===================
  *		AGGREGATE FUNCTIONS
diff --git a/contrib/citext/citext.control b/contrib/citext/citext.control
index 17fce4e887..4cd6e09331 100644
--- a/contrib/citext/citext.control
+++ b/contrib/citext/citext.control
@@ -1,5 +1,5 @@
 # citext extension
 comment = 'data type for case-insensitive character strings'
-default_version = '1.4'
+default_version = '1.5'
 module_pathname = '$libdir/citext'
 relocatable = true
diff --git a/contrib/citext/expected/citext.out b/contrib/citext/expected/citext.out
index 9cc94f4c1b..95373182af 100644
--- a/contrib/citext/expected/citext.out
+++ b/contrib/citext/expected/citext.out
@@ -2351,3 +2351,355 @@ SELECT * FROM citext_matview ORDER BY id;
   5 | 
 (5 rows)
 
+-- test citext_pattern_cmp() function explicitly.
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardvark'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardVark'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('B'::citext, 'a'::citext) > 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('a'::citext, 'B'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('A'::citext, 'b'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('ABCD'::citext, 'abc'::citext) > 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('ABC'::citext, 'abcd'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+-- test operator functions
+-- lt
+SELECT citext_pattern_lt('a'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('A'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('b'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_lt('B'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_lt('b'::citext, 'A'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- le
+SELECT citext_pattern_le('a'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('b'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_le('B'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_le('b'::citext, 'A'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- gt
+SELECT citext_pattern_gt('a'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('A'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('b'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_gt('B'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_gt('b'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+-- ge
+SELECT citext_pattern_ge('a'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('b'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('B'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+-- Multi-byte tests below are diabled like the sanity tests above.
+-- Uncomment to run them.
+-- Test ~<~ and ~<=~
+SELECT 'a'::citext ~<~  'B'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'b'::citext ~<~  'A'::citext AS f;
+ f 
+---
+ f
+(1 row)
+
+-- SELECT 'à'::citext ~<~  'À'::citext AS f;
+SELECT 'a'::citext ~<=~ 'B'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~<=~ 'A'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~<=~ 'À'::citext AS t;
+-- Test ~>~ and ~>=~
+SELECT 'B'::citext ~>~  'a'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'b'::citext ~>~  'A'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~>~  'À'::citext AS f;
+SELECT 'B'::citext ~>~  'b'::citext AS f;
+ f 
+---
+ f
+(1 row)
+
+SELECT 'B'::citext ~>=~ 'b'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~>=~ 'À'::citext AS t;
+-- Test implicit casting. citext casts to text, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'B'::citext ~<=~ 'a'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>~  'B'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>=~ 'B'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+-- Test implicit casting. citext casts to varchar, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'B'::citext ~<=~ 'a'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>~  'B'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>=~ 'B'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
diff --git a/contrib/citext/expected/citext_1.out b/contrib/citext/expected/citext_1.out
index d1fb1e14e0..855ec3f10b 100644
--- a/contrib/citext/expected/citext_1.out
+++ b/contrib/citext/expected/citext_1.out
@@ -2351,3 +2351,355 @@ SELECT * FROM citext_matview ORDER BY id;
   5 | 
 (5 rows)
 
+-- test citext_pattern_cmp() function explicitly.
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardvark'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardVark'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
+ zero 
+------
+    0
+(1 row)
+
+SELECT citext_pattern_cmp('B'::citext, 'a'::citext) > 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('a'::citext, 'B'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('A'::citext, 'b'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('ABCD'::citext, 'abc'::citext) > 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_cmp('ABC'::citext, 'abcd'::citext) < 0 AS true;
+ true 
+------
+ t
+(1 row)
+
+-- test operator functions
+-- lt
+SELECT citext_pattern_lt('a'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('A'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_lt('b'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_lt('B'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_lt('b'::citext, 'A'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- le
+SELECT citext_pattern_le('a'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('A'::citext, 'b'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_le('b'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_le('B'::citext, 'a'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_le('b'::citext, 'A'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+-- gt
+SELECT citext_pattern_gt('a'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('A'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_gt('b'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_gt('B'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_gt('b'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+-- ge
+SELECT citext_pattern_ge('a'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('A'::citext, 'b'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+ false 
+-------
+ f
+(1 row)
+
+SELECT citext_pattern_ge('b'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('B'::citext, 'a'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true;
+ true 
+------
+ t
+(1 row)
+
+-- Multi-byte tests below are diabled like the sanity tests above.
+-- Uncomment to run them.
+-- Test ~<~ and ~<=~
+SELECT 'a'::citext ~<~  'B'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'b'::citext ~<~  'A'::citext AS f;
+ f 
+---
+ f
+(1 row)
+
+-- SELECT 'à'::citext ~<~  'À'::citext AS f;
+SELECT 'a'::citext ~<=~ 'B'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~<=~ 'A'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~<=~ 'À'::citext AS t;
+-- Test ~>~ and ~>=~
+SELECT 'B'::citext ~>~  'a'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+SELECT 'b'::citext ~>~  'A'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~>~  'À'::citext AS f;
+SELECT 'B'::citext ~>~  'b'::citext AS f;
+ f 
+---
+ f
+(1 row)
+
+SELECT 'B'::citext ~>=~ 'b'::citext AS t;
+ t 
+---
+ t
+(1 row)
+
+-- SELECT 'à'::citext ~>=~ 'À'::citext AS t;
+-- Test implicit casting. citext casts to text, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'B'::citext ~<=~ 'a'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>~  'B'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>=~ 'B'::text AS t;  -- text wins.
+ t 
+---
+ t
+(1 row)
+
+-- Test implicit casting. citext casts to varchar, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'B'::citext ~<=~ 'a'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>~  'B'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
+SELECT 'a'::citext ~>=~ 'B'::varchar AS t;  -- varchar wins.
+ t 
+---
+ t
+(1 row)
+
diff --git a/contrib/citext/sql/citext.sql b/contrib/citext/sql/citext.sql
index f70f9ebae9..2732be436d 100644
--- a/contrib/citext/sql/citext.sql
+++ b/contrib/citext/sql/citext.sql
@@ -752,3 +752,84 @@ SELECT *
   WHERE t.id IS NULL OR m.id IS NULL;
 REFRESH MATERIALIZED VIEW CONCURRENTLY citext_matview;
 SELECT * FROM citext_matview ORDER BY id;
+
+-- test citext_pattern_cmp() function explicitly.
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardvark'::citext) AS zero;
+SELECT citext_pattern_cmp('aardvark'::citext, 'aardVark'::citext) AS zero;
+SELECT citext_pattern_cmp('AARDVARK'::citext, 'AARDVARK'::citext) AS zero;
+SELECT citext_pattern_cmp('B'::citext, 'a'::citext) > 0 AS true;
+SELECT citext_pattern_cmp('a'::citext, 'B'::citext) < 0 AS true;
+SELECT citext_pattern_cmp('A'::citext, 'b'::citext) < 0 AS true;
+SELECT citext_pattern_cmp('ABCD'::citext, 'abc'::citext) > 0 AS true;
+SELECT citext_pattern_cmp('ABC'::citext, 'abcd'::citext) < 0 AS true;
+
+-- test operator functions
+-- lt
+SELECT citext_pattern_lt('a'::citext, 'b'::citext) AS true;
+SELECT citext_pattern_lt('A'::citext, 'b'::citext) AS true;
+SELECT citext_pattern_lt('a'::citext, 'B'::citext) AS true;
+SELECT citext_pattern_lt('b'::citext, 'a'::citext) AS false;
+SELECT citext_pattern_lt('B'::citext, 'a'::citext) AS false;
+SELECT citext_pattern_lt('b'::citext, 'A'::citext) AS false;
+-- le
+SELECT citext_pattern_le('a'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_le('a'::citext, 'A'::citext) AS true;
+SELECT citext_pattern_le('A'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_le('A'::citext, 'A'::citext) AS true;
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+SELECT citext_pattern_le('A'::citext, 'b'::citext) AS true;
+SELECT citext_pattern_le('a'::citext, 'B'::citext) AS true;
+SELECT citext_pattern_le('b'::citext, 'a'::citext) AS false;
+SELECT citext_pattern_le('B'::citext, 'a'::citext) AS false;
+SELECT citext_pattern_le('b'::citext, 'A'::citext) AS false;
+-- gt
+SELECT citext_pattern_gt('a'::citext, 'b'::citext) AS false;
+SELECT citext_pattern_gt('A'::citext, 'b'::citext) AS false;
+SELECT citext_pattern_gt('a'::citext, 'B'::citext) AS false;
+SELECT citext_pattern_gt('b'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_gt('B'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_gt('b'::citext, 'A'::citext) AS true;
+-- ge
+SELECT citext_pattern_ge('a'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_ge('a'::citext, 'A'::citext) AS true;
+SELECT citext_pattern_ge('A'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_ge('A'::citext, 'A'::citext) AS true;
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+SELECT citext_pattern_ge('A'::citext, 'b'::citext) AS false;
+SELECT citext_pattern_ge('a'::citext, 'B'::citext) AS false;
+SELECT citext_pattern_ge('b'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_ge('B'::citext, 'a'::citext) AS true;
+SELECT citext_pattern_ge('b'::citext, 'A'::citext) AS true;
+
+-- Multi-byte tests below are diabled like the sanity tests above.
+-- Uncomment to run them.
+
+-- Test ~<~ and ~<=~
+SELECT 'a'::citext ~<~  'B'::citext AS t;
+SELECT 'b'::citext ~<~  'A'::citext AS f;
+-- SELECT 'à'::citext ~<~  'À'::citext AS f;
+SELECT 'a'::citext ~<=~ 'B'::citext AS t;
+SELECT 'a'::citext ~<=~ 'A'::citext AS t;
+-- SELECT 'à'::citext ~<=~ 'À'::citext AS t;
+
+-- Test ~>~ and ~>=~
+SELECT 'B'::citext ~>~  'a'::citext AS t;
+SELECT 'b'::citext ~>~  'A'::citext AS t;
+-- SELECT 'à'::citext ~>~  'À'::citext AS f;
+SELECT 'B'::citext ~>~  'b'::citext AS f;
+SELECT 'B'::citext ~>=~ 'b'::citext AS t;
+-- SELECT 'à'::citext ~>=~ 'À'::citext AS t;
+
+-- Test implicit casting. citext casts to text, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::text AS t;  -- text wins.
+SELECT 'B'::citext ~<=~ 'a'::text AS t;  -- text wins.
+
+SELECT 'a'::citext ~>~  'B'::text AS t;  -- text wins.
+SELECT 'a'::citext ~>=~ 'B'::text AS t;  -- text wins.
+
+-- Test implicit casting. citext casts to varchar, but not vice-versa.
+SELECT 'B'::citext ~<~  'a'::varchar AS t;  -- varchar wins.
+SELECT 'B'::citext ~<=~ 'a'::varchar AS t;  -- varchar wins.
+
+SELECT 'a'::citext ~>~  'B'::varchar AS t;  -- varchar wins.
+SELECT 'a'::citext ~>=~ 'B'::varchar AS t;  -- varchar wins.
diff --git a/contrib/cube/CMakeLists.txt b/contrib/cube/CMakeLists.txt
index b5d1a2b03a..c7cecd540e 100644
--- a/contrib/cube/CMakeLists.txt
+++ b/contrib/cube/CMakeLists.txt
@@ -25,6 +25,8 @@ install(TARGETS ${extension_name}
 		LIBRARY DESTINATION ${LIBDIR})
 install(FILES
 	${extension_name}.control
+	${extension_name}--1.3--1.4.sql
+	${extension_name}--1.2--1.3.sql
 	${extension_name}--1.2.sql
 	${extension_name}--1.1--1.2.sql
 	${extension_name}--1.0--1.1.sql
diff --git a/contrib/cube/Makefile b/contrib/cube/Makefile
index be7a1bc1a0..accb7d28a3 100644
--- a/contrib/cube/Makefile
+++ b/contrib/cube/Makefile
@@ -4,7 +4,8 @@ MODULE_big = cube
 OBJS= cube.o cubeparse.o $(WIN32RES)
 
 EXTENSION = cube
-DATA = cube--1.2.sql cube--1.1--1.2.sql cube--1.0--1.1.sql \
+DATA = cube--1.2.sql cube--1.2--1.3.sql cube--1.3--1.4.sql \
+	cube--1.1--1.2.sql cube--1.0--1.1.sql \
 	cube--unpackaged--1.0.sql
 PGFILEDESC = "cube - multidimensional cube data type"
 
diff --git a/contrib/cube/cube--1.2--1.3.sql b/contrib/cube/cube--1.2--1.3.sql
new file mode 100644
index 0000000000..a688f19f02
--- /dev/null
+++ b/contrib/cube/cube--1.2--1.3.sql
@@ -0,0 +1,12 @@
+/* contrib/cube/cube--1.2--1.3.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION cube UPDATE TO '1.3'" to load this file. \quit
+
+ALTER OPERATOR <= (cube, cube) SET (
+	RESTRICT = scalarlesel, JOIN = scalarlejoinsel
+);
+
+ALTER OPERATOR >= (cube, cube) SET (
+	RESTRICT = scalargesel, JOIN = scalargejoinsel
+);
diff --git a/contrib/cube/cube--1.3--1.4.sql b/contrib/cube/cube--1.3--1.4.sql
new file mode 100644
index 0000000000..869820c0c8
--- /dev/null
+++ b/contrib/cube/cube--1.3--1.4.sql
@@ -0,0 +1,45 @@
+/* contrib/cube/cube--1.3--1.4.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION cube UPDATE TO '1.4'" to load this file. \quit
+
+--
+-- Get rid of unnecessary compress and decompress support functions.
+--
+-- To be allowed to drop the opclass entry for a support function,
+-- we must change the entry's dependency type from 'internal' to 'auto',
+-- as though it were a loose member of the opfamily rather than being
+-- bound into a particular opclass.  There's no SQL command for that,
+-- so fake it with a manual update on pg_depend.
+--
+UPDATE pg_catalog.pg_depend
+SET deptype = 'a'
+WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+  AND objid =
+    (SELECT objid
+     FROM pg_catalog.pg_depend
+     WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+       AND refclassid = 'pg_catalog.pg_proc'::pg_catalog.regclass
+       AND (refobjid = 'g_cube_compress(pg_catalog.internal)'::pg_catalog.regprocedure))
+  AND refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass
+  AND deptype = 'i';
+
+ALTER OPERATOR FAMILY gist_cube_ops USING gist drop function 3 (cube);
+ALTER EXTENSION cube DROP function g_cube_compress(pg_catalog.internal);
+DROP FUNCTION g_cube_compress(pg_catalog.internal);
+
+UPDATE pg_catalog.pg_depend
+SET deptype = 'a'
+WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+  AND objid =
+    (SELECT objid
+     FROM pg_catalog.pg_depend
+     WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+       AND refclassid = 'pg_catalog.pg_proc'::pg_catalog.regclass
+       AND (refobjid = 'g_cube_decompress(pg_catalog.internal)'::pg_catalog.regprocedure))
+  AND refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass
+  AND deptype = 'i';
+
+ALTER OPERATOR FAMILY gist_cube_ops USING gist drop function 4 (cube);
+ALTER EXTENSION cube DROP function g_cube_decompress(pg_catalog.internal);
+DROP FUNCTION g_cube_decompress(pg_catalog.internal);
diff --git a/contrib/cube/cube.c b/contrib/cube/cube.c
index 149558c763..d96ca1ec1f 100644
--- a/contrib/cube/cube.c
+++ b/contrib/cube/cube.c
@@ -126,7 +126,7 @@ cube_in(PG_FUNCTION_ARGS)
 
 	cube_scanner_finish();
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 
@@ -187,7 +187,7 @@ cube_a_f8_f8(PG_FUNCTION_ARGS)
 	else
 		SET_POINT_BIT(result);
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /*
@@ -221,13 +221,13 @@ cube_a_f8(PG_FUNCTION_ARGS)
 	for (i = 0; i < dim; i++)
 		result->x[i] = dur[i];
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 Datum
 cube_subset(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *c = PG_GETARG_NDBOX(0);
+	NDBOX	   *c = PG_GETARG_NDBOX_P(0);
 	ArrayType  *idx = PG_GETARG_ARRAYTYPE_P(1);
 	NDBOX	   *result;
 	int			size,
@@ -263,13 +263,13 @@ cube_subset(PG_FUNCTION_ARGS)
 	}
 
 	PG_FREE_IF_COPY(c, 0);
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 Datum
 cube_out(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	StringInfoData buf;
 	int			dim = DIM(cube);
 	int			i;
@@ -309,14 +309,14 @@ cube_out(PG_FUNCTION_ARGS)
 /*
 ** The GiST Consistent method for boxes
 ** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
+** the predicate x op query == false, where op is the oper
 ** corresponding to strategy in the pg_amop table.
 */
 Datum
 g_cube_consistent(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	NDBOX	   *query = PG_GETARG_NDBOX(1);
+	NDBOX	   *query = PG_GETARG_NDBOX_P(1);
 	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
 	/* Oid		subtype = PG_GETARG_OID(3); */
@@ -331,10 +331,10 @@ g_cube_consistent(PG_FUNCTION_ARGS)
 	 * g_cube_leaf_consistent
 	 */
 	if (GIST_LEAF(entry))
-		res = g_cube_leaf_consistent(DatumGetNDBOX(entry->key),
+		res = g_cube_leaf_consistent(DatumGetNDBOXP(entry->key),
 									 query, strategy);
 	else
-		res = g_cube_internal_consistent(DatumGetNDBOX(entry->key),
+		res = g_cube_internal_consistent(DatumGetNDBOXP(entry->key),
 										 query, strategy);
 
 	PG_FREE_IF_COPY(query, 1);
@@ -355,7 +355,7 @@ g_cube_union(PG_FUNCTION_ARGS)
 	NDBOX	   *tmp;
 	int			i;
 
-	tmp = DatumGetNDBOX(entryvec->vector[0].key);
+	tmp = DatumGetNDBOXP(entryvec->vector[0].key);
 
 	/*
 	 * sizep = sizeof(NDBOX); -- NDBOX has variable size
@@ -365,7 +365,7 @@ g_cube_union(PG_FUNCTION_ARGS)
 	for (i = 1; i < entryvec->n; i++)
 	{
 		out = g_cube_binary_union(tmp,
-								  DatumGetNDBOX(entryvec->vector[i].key),
+								  DatumGetNDBOXP(entryvec->vector[i].key),
 								  sizep);
 		tmp = out;
 	}
@@ -388,15 +388,15 @@ Datum
 g_cube_decompress(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	NDBOX	   *key = DatumGetNDBOX(PG_DETOAST_DATUM(entry->key));
+	NDBOX	   *key = DatumGetNDBOXP(entry->key);
 
-	if (key != DatumGetNDBOX(entry->key))
+	if (key != DatumGetNDBOXP(entry->key))
 	{
 		GISTENTRY  *retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 		PG_RETURN_POINTER(retval);
 	}
 	PG_RETURN_POINTER(entry);
@@ -417,10 +417,10 @@ g_cube_penalty(PG_FUNCTION_ARGS)
 	double		tmp1,
 				tmp2;
 
-	ud = cube_union_v0(DatumGetNDBOX(origentry->key),
-					   DatumGetNDBOX(newentry->key));
+	ud = cube_union_v0(DatumGetNDBOXP(origentry->key),
+					   DatumGetNDBOXP(newentry->key));
 	rt_cube_size(ud, &tmp1);
-	rt_cube_size(DatumGetNDBOX(origentry->key), &tmp2);
+	rt_cube_size(DatumGetNDBOXP(origentry->key), &tmp2);
 	*result = (float) (tmp1 - tmp2);
 
 	PG_RETURN_FLOAT8(*result);
@@ -473,17 +473,18 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 
 	for (i = FirstOffsetNumber; i < maxoff; i = OffsetNumberNext(i))
 	{
-		datum_alpha = DatumGetNDBOX(entryvec->vector[i].key);
+		datum_alpha = DatumGetNDBOXP(entryvec->vector[i].key);
 		for (j = OffsetNumberNext(i); j <= maxoff; j = OffsetNumberNext(j))
 		{
-			datum_beta = DatumGetNDBOX(entryvec->vector[j].key);
+			datum_beta = DatumGetNDBOXP(entryvec->vector[j].key);
 
 			/* compute the wasted space by unioning these guys */
 			/* size_waste = size_union - size_inter; */
 			union_d = cube_union_v0(datum_alpha, datum_beta);
 			rt_cube_size(union_d, &size_union);
-			inter_d = DatumGetNDBOX(DirectFunctionCall2(cube_inter,
-														entryvec->vector[i].key, entryvec->vector[j].key));
+			inter_d = DatumGetNDBOXP(DirectFunctionCall2(cube_inter,
+														 entryvec->vector[i].key,
+														 entryvec->vector[j].key));
 			rt_cube_size(inter_d, &size_inter);
 			size_waste = size_union - size_inter;
 
@@ -506,10 +507,10 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 	right = v->spl_right;
 	v->spl_nright = 0;
 
-	datum_alpha = DatumGetNDBOX(entryvec->vector[seed_1].key);
+	datum_alpha = DatumGetNDBOXP(entryvec->vector[seed_1].key);
 	datum_l = cube_union_v0(datum_alpha, datum_alpha);
 	rt_cube_size(datum_l, &size_l);
-	datum_beta = DatumGetNDBOX(entryvec->vector[seed_2].key);
+	datum_beta = DatumGetNDBOXP(entryvec->vector[seed_2].key);
 	datum_r = cube_union_v0(datum_beta, datum_beta);
 	rt_cube_size(datum_r, &size_r);
 
@@ -548,7 +549,7 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 		}
 
 		/* okay, which page needs least enlargement? */
-		datum_alpha = DatumGetNDBOX(entryvec->vector[i].key);
+		datum_alpha = DatumGetNDBOXP(entryvec->vector[i].key);
 		union_dl = cube_union_v0(datum_l, datum_alpha);
 		union_dr = cube_union_v0(datum_r, datum_alpha);
 		rt_cube_size(union_dl, &size_alpha);
@@ -584,16 +585,16 @@ g_cube_picksplit(PG_FUNCTION_ARGS)
 Datum
 g_cube_same(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *b1 = PG_GETARG_NDBOX(0);
-	NDBOX	   *b2 = PG_GETARG_NDBOX(1);
+	NDBOX	   *b1 = PG_GETARG_NDBOX_P(0);
+	NDBOX	   *b2 = PG_GETARG_NDBOX_P(1);
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
 	if (cube_cmp_v0(b1, b2) == 0)
-		*result = TRUE;
+		*result = true;
 	else
-		*result = FALSE;
+		*result = false;
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /*
@@ -609,23 +610,23 @@ g_cube_leaf_consistent(NDBOX *key,
 	switch (strategy)
 	{
 		case RTOverlapStrategyNumber:
-			retval = (bool) cube_overlap_v0(key, query);
+			retval = cube_overlap_v0(key, query);
 			break;
 		case RTSameStrategyNumber:
-			retval = (bool) (cube_cmp_v0(key, query) == 0);
+			retval = (cube_cmp_v0(key, query) == 0);
 			break;
 		case RTContainsStrategyNumber:
 		case RTOldContainsStrategyNumber:
-			retval = (bool) cube_contains_v0(key, query);
+			retval = cube_contains_v0(key, query);
 			break;
 		case RTContainedByStrategyNumber:
 		case RTOldContainedByStrategyNumber:
-			retval = (bool) cube_contains_v0(query, key);
+			retval = cube_contains_v0(query, key);
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
-	return (retval);
+	return retval;
 }
 
 bool
@@ -650,9 +651,9 @@ g_cube_internal_consistent(NDBOX *key,
 			retval = (bool) cube_overlap_v0(key, query);
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
-	return (retval);
+	return retval;
 }
 
 NDBOX *
@@ -663,7 +664,7 @@ g_cube_binary_union(NDBOX *r1, NDBOX *r2, int *sizep)
 	retval = cube_union_v0(r1, r2);
 	*sizep = VARSIZE(retval);
 
-	return (retval);
+	return retval;
 }
 
 
@@ -729,29 +730,29 @@ cube_union_v0(NDBOX *a, NDBOX *b)
 		SET_POINT_BIT(result);
 	}
 
-	return (result);
+	return result;
 }
 
 Datum
 cube_union(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0);
-	NDBOX	   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0);
+	NDBOX	   *b = PG_GETARG_NDBOX_P(1);
 	NDBOX	   *res;
 
 	res = cube_union_v0(a, b);
 
 	PG_FREE_IF_COPY(a, 0);
 	PG_FREE_IF_COPY(b, 1);
-	PG_RETURN_NDBOX(res);
+	PG_RETURN_NDBOX_P(res);
 }
 
 /* cube_inter */
 Datum
 cube_inter(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0);
-	NDBOX	   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0);
+	NDBOX	   *b = PG_GETARG_NDBOX_P(1);
 	NDBOX	   *result;
 	bool		swapped = false;
 	int			i;
@@ -823,14 +824,14 @@ cube_inter(PG_FUNCTION_ARGS)
 	/*
 	 * Is it OK to return a non-null intersection for non-overlapping boxes?
 	 */
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /* cube_size */
 Datum
 cube_size(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0);
 	double		result;
 
 	rt_cube_size(a, &result);
@@ -948,8 +949,8 @@ cube_cmp_v0(NDBOX *a, NDBOX *b)
 Datum
 cube_cmp(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -963,8 +964,8 @@ cube_cmp(PG_FUNCTION_ARGS)
 Datum
 cube_eq(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -978,8 +979,8 @@ cube_eq(PG_FUNCTION_ARGS)
 Datum
 cube_ne(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -993,8 +994,8 @@ cube_ne(PG_FUNCTION_ARGS)
 Datum
 cube_lt(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -1008,8 +1009,8 @@ cube_lt(PG_FUNCTION_ARGS)
 Datum
 cube_gt(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -1023,8 +1024,8 @@ cube_gt(PG_FUNCTION_ARGS)
 Datum
 cube_le(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -1038,8 +1039,8 @@ cube_le(PG_FUNCTION_ARGS)
 Datum
 cube_ge(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	int32		res;
 
 	res = cube_cmp_v0(a, b);
@@ -1058,7 +1059,7 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
 	int			i;
 
 	if ((a == NULL) || (b == NULL))
-		return (FALSE);
+		return false;
 
 	if (DIM(a) < DIM(b))
 	{
@@ -1070,9 +1071,9 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
 		for (i = DIM(a); i < DIM(b); i++)
 		{
 			if (LL_COORD(b, i) != 0)
-				return (FALSE);
+				return false;
 			if (UR_COORD(b, i) != 0)
-				return (FALSE);
+				return false;
 		}
 	}
 
@@ -1081,20 +1082,20 @@ cube_contains_v0(NDBOX *a, NDBOX *b)
 	{
 		if (Min(LL_COORD(a, i), UR_COORD(a, i)) >
 			Min(LL_COORD(b, i), UR_COORD(b, i)))
-			return (FALSE);
+			return false;
 		if (Max(LL_COORD(a, i), UR_COORD(a, i)) <
 			Max(LL_COORD(b, i), UR_COORD(b, i)))
-			return (FALSE);
+			return false;
 	}
 
-	return (TRUE);
+	return true;
 }
 
 Datum
 cube_contains(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		res;
 
 	res = cube_contains_v0(a, b);
@@ -1109,8 +1110,8 @@ cube_contains(PG_FUNCTION_ARGS)
 Datum
 cube_contained(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		res;
 
 	res = cube_contains_v0(b, a);
@@ -1128,7 +1129,7 @@ cube_overlap_v0(NDBOX *a, NDBOX *b)
 	int			i;
 
 	if ((a == NULL) || (b == NULL))
-		return (FALSE);
+		return false;
 
 	/* swap the box pointers if needed */
 	if (DIM(a) < DIM(b))
@@ -1143,29 +1144,29 @@ cube_overlap_v0(NDBOX *a, NDBOX *b)
 	for (i = 0; i < DIM(b); i++)
 	{
 		if (Min(LL_COORD(a, i), UR_COORD(a, i)) > Max(LL_COORD(b, i), UR_COORD(b, i)))
-			return (FALSE);
+			return false;
 		if (Max(LL_COORD(a, i), UR_COORD(a, i)) < Min(LL_COORD(b, i), UR_COORD(b, i)))
-			return (FALSE);
+			return false;
 	}
 
 	/* compare to zero those dimensions in (a) absent in (b) */
 	for (i = DIM(b); i < DIM(a); i++)
 	{
 		if (Min(LL_COORD(a, i), UR_COORD(a, i)) > 0)
-			return (FALSE);
+			return false;
 		if (Max(LL_COORD(a, i), UR_COORD(a, i)) < 0)
-			return (FALSE);
+			return false;
 	}
 
-	return (TRUE);
+	return true;
 }
 
 
 Datum
 cube_overlap(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		res;
 
 	res = cube_overlap_v0(a, b);
@@ -1184,8 +1185,8 @@ cube_overlap(PG_FUNCTION_ARGS)
 Datum
 cube_distance(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		swapped = false;
 	double		d,
 				distance;
@@ -1233,8 +1234,8 @@ cube_distance(PG_FUNCTION_ARGS)
 Datum
 distance_taxicab(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		swapped = false;
 	double		distance;
 	int			i;
@@ -1277,8 +1278,8 @@ distance_taxicab(PG_FUNCTION_ARGS)
 Datum
 distance_chebyshev(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0),
-			   *b = PG_GETARG_NDBOX(1);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0),
+			   *b = PG_GETARG_NDBOX_P(1);
 	bool		swapped = false;
 	double		d,
 				distance;
@@ -1331,24 +1332,81 @@ g_cube_distance(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
-	NDBOX	   *cube = DatumGetNDBOX(entry->key);
+	NDBOX	   *cube = DatumGetNDBOXP(entry->key);
 	double		retval;
 
 	if (strategy == CubeKNNDistanceCoord)
 	{
+		/*
+		 * Handle ordering by ~> operator.  See comments of cube_coord_llur()
+		 * for details
+		 */
 		int			coord = PG_GETARG_INT32(1);
+		bool		isLeaf = GistPageIsLeaf(entry->page);
+		bool		inverse = false;
 
-		if (DIM(cube) == 0)
-			retval = 0.0;
-		else if (IS_POINT(cube))
-			retval = cube->x[(coord - 1) % DIM(cube)];
+		/* 0 is the only unsupported coordinate value */
+		if (coord == 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_ARRAY_ELEMENT_ERROR),
+					 errmsg("zero cube index is not defined")));
+
+		/* Return inversed value for negative coordinate */
+		if (coord < 0)
+		{
+			coord = -coord;
+			inverse = true;
+		}
+
+		if (coord <= 2 * DIM(cube))
+		{
+			/* dimension index */
+			int		index = (coord - 1) / 2;
+			/* whether this is upper bound (lower bound otherwise) */
+			bool	upper = ((coord - 1) % 2 == 1);
+
+			if (IS_POINT(cube))
+			{
+				retval = cube->x[index];
+			}
+			else
+			{
+				if (isLeaf)
+				{
+					/* For leaf just return required upper/lower bound */
+					if (upper)
+						retval = Max(cube->x[index], cube->x[index + DIM(cube)]);
+					else
+						retval = Min(cube->x[index], cube->x[index + DIM(cube)]);
+				}
+				else
+				{
+					/*
+					 * For non-leaf we should always return lower bound,
+					 * because even upper bound of a child in the subtree can
+					 * be as small as our lower bound.  For inversed case we
+					 * return upper bound because it becomes lower bound for
+					 * inversed value.
+					 */
+					if (!inverse)
+						retval = Min(cube->x[index], cube->x[index + DIM(cube)]);
+					else
+						retval = Max(cube->x[index], cube->x[index + DIM(cube)]);
+				}
+			}
+		}
 		else
-			retval = Min(cube->x[(coord - 1) % DIM(cube)],
-						 cube->x[(coord - 1) % DIM(cube) + DIM(cube)]);
+		{
+			retval = 0.0;
+		}
+
+		/* Inverse return value if needed */
+		if (inverse)
+			retval = -retval;
 	}
 	else
 	{
-		NDBOX	   *query = PG_GETARG_NDBOX(1);
+		NDBOX	   *query = PG_GETARG_NDBOX_P(1);
 
 		switch (strategy)
 		{
@@ -1385,14 +1443,14 @@ distance_1D(double a1, double a2, double b1, double b2)
 		return (Min(a1, a2) - Max(b1, b2));
 
 	/* the rest are all sorts of intersections */
-	return (0.0);
+	return 0.0;
 }
 
 /* Test if a box is also a point */
 Datum
 cube_is_point(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	bool		result;
 
 	result = cube_is_point_internal(cube);
@@ -1427,7 +1485,7 @@ cube_is_point_internal(NDBOX *cube)
 Datum
 cube_dim(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *c = PG_GETARG_NDBOX(0);
+	NDBOX	   *c = PG_GETARG_NDBOX_P(0);
 	int			dim = DIM(c);
 
 	PG_FREE_IF_COPY(c, 0);
@@ -1438,7 +1496,7 @@ cube_dim(PG_FUNCTION_ARGS)
 Datum
 cube_ll_coord(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *c = PG_GETARG_NDBOX(0);
+	NDBOX	   *c = PG_GETARG_NDBOX_P(0);
 	int			n = PG_GETARG_INT32(1);
 	double		result;
 
@@ -1455,7 +1513,7 @@ cube_ll_coord(PG_FUNCTION_ARGS)
 Datum
 cube_ur_coord(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *c = PG_GETARG_NDBOX(0);
+	NDBOX	   *c = PG_GETARG_NDBOX_P(0);
 	int			n = PG_GETARG_INT32(1);
 	double		result;
 
@@ -1476,7 +1534,7 @@ cube_ur_coord(PG_FUNCTION_ARGS)
 Datum
 cube_coord(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	int			coord = PG_GETARG_INT32(1);
 
 	if (coord <= 0 || coord > 2 * DIM(cube))
@@ -1491,50 +1549,91 @@ cube_coord(PG_FUNCTION_ARGS)
 }
 
 
-/*
- * This function works like cube_coord(),
- * but rearranges coordinates of corners to get cube representation
- * in the form of (lower left, upper right).
- * For historical reasons that extension allows us to create cubes in form
- * ((2,1),(1,2)) and instead of normalizing such cube to ((1,1),(2,2)) it
- * stores cube in original way. But to get cubes ordered by one of dimensions
- * directly from the index without extra sort step we need some
- * representation-independent coordinate getter. This function implements it.
+/*----
+ * This function works like cube_coord(), but rearranges coordinates in the
+ * way suitable to support coordinate ordering using KNN-GiST.  For historical
+ * reasons this extension allows us to create cubes in form ((2,1),(1,2)) and
+ * instead of normalizing such cube to ((1,1),(2,2)) it stores cube in original
+ * way.  But in order to get cubes ordered by one of dimensions from the index
+ * without explicit sort step we need this representation-independent coordinate
+ * getter.  Moreover, indexed dataset may contain cubes of different dimensions
+ * number.  Accordingly, this coordinate getter should be able to return
+ * lower/upper bound for particular dimension independently on number of cube
+ * dimensions.  Also, KNN-GiST supports only ascending sorting.  In order to
+ * support descending sorting, this function returns inverse of value when
+ * negative coordinate is given.
+ *
+ * Long story short, this function uses following meaning of coordinates:
+ * # (2 * N - 1) -- lower bound of Nth dimension,
+ * # (2 * N) -- upper bound of Nth dimension,
+ * # - (2 * N - 1) -- negative of lower bound of Nth dimension,
+ * # - (2 * N) -- negative of upper bound of Nth dimension.
+ *
+ * When given coordinate exceeds number of cube dimensions, then 0 returned
+ * (reproducing logic of GiST indexing of variable-length cubes).
  */
 Datum
 cube_coord_llur(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	int			coord = PG_GETARG_INT32(1);
+	bool		inverse = false;
+	float8		result;
 
-	if (coord <= 0 || coord > 2 * DIM(cube))
+	/* 0 is the only unsupported coordinate value */
+	if (coord == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_ARRAY_ELEMENT_ERROR),
-				 errmsg("cube index %d is out of bounds", coord)));
+				 errmsg("zero cube index is not defined")));
+
+	/* Return inversed value for negative coordinate */
+	if (coord < 0)
+	{
+		coord = -coord;
+		inverse = true;
+	}
 
-	if (coord <= DIM(cube))
+	if (coord <= 2 * DIM(cube))
 	{
+		/* dimension index */
+		int		index = (coord - 1) / 2;
+		/* whether this is upper bound (lower bound otherwise) */
+		bool	upper = ((coord - 1) % 2 == 1);
+
 		if (IS_POINT(cube))
-			PG_RETURN_FLOAT8(cube->x[coord - 1]);
+		{
+			result = cube->x[index];
+		}
 		else
-			PG_RETURN_FLOAT8(Min(cube->x[coord - 1],
-								 cube->x[coord - 1 + DIM(cube)]));
+		{
+			if (upper)
+				result = Max(cube->x[index], cube->x[index + DIM(cube)]);
+			else
+				result = Min(cube->x[index], cube->x[index + DIM(cube)]);
+		}
 	}
 	else
 	{
-		if (IS_POINT(cube))
-			PG_RETURN_FLOAT8(cube->x[(coord - 1) % DIM(cube)]);
-		else
-			PG_RETURN_FLOAT8(Max(cube->x[coord - 1],
-								 cube->x[coord - 1 - DIM(cube)]));
+		/*
+		 * Return zero if coordinate is out of bound.  That reproduces logic of
+		 * how cubes with low dimension number are expanded during GiST
+		 * indexing.
+		 */
+		result = 0.0;
 	}
+
+	/* Inverse value if needed */
+	if (inverse)
+		result = -result;
+
+	PG_RETURN_FLOAT8(result);
 }
 
 /* Increase or decrease box size by a radius in at least n dimensions. */
 Datum
 cube_enlarge(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *a = PG_GETARG_NDBOX(0);
+	NDBOX	   *a = PG_GETARG_NDBOX_P(0);
 	double		r = PG_GETARG_FLOAT8(1);
 	int32		n = PG_GETARG_INT32(2);
 	NDBOX	   *result;
@@ -1592,7 +1691,7 @@ cube_enlarge(PG_FUNCTION_ARGS)
 	}
 
 	PG_FREE_IF_COPY(a, 0);
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /* Create a one dimensional box with identical upper and lower coordinates */
@@ -1610,7 +1709,7 @@ cube_f8(PG_FUNCTION_ARGS)
 	SET_POINT_BIT(result);
 	result->x[0] = x;
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /* Create a one dimensional box */
@@ -1641,7 +1740,7 @@ cube_f8_f8(PG_FUNCTION_ARGS)
 		result->x[1] = x1;
 	}
 
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /* Add a dimension to an existing cube with the same values for the new
@@ -1649,7 +1748,7 @@ cube_f8_f8(PG_FUNCTION_ARGS)
 Datum
 cube_c_f8(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	double		x = PG_GETARG_FLOAT8(1);
 	NDBOX	   *result;
 	int			size;
@@ -1682,14 +1781,14 @@ cube_c_f8(PG_FUNCTION_ARGS)
 	}
 
 	PG_FREE_IF_COPY(cube, 0);
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
 
 /* Add a dimension to an existing cube */
 Datum
 cube_c_f8_f8(PG_FUNCTION_ARGS)
 {
-	NDBOX	   *cube = PG_GETARG_NDBOX(0);
+	NDBOX	   *cube = PG_GETARG_NDBOX_P(0);
 	double		x1 = PG_GETARG_FLOAT8(1);
 	double		x2 = PG_GETARG_FLOAT8(2);
 	NDBOX	   *result;
@@ -1723,5 +1822,5 @@ cube_c_f8_f8(PG_FUNCTION_ARGS)
 	}
 
 	PG_FREE_IF_COPY(cube, 0);
-	PG_RETURN_NDBOX(result);
+	PG_RETURN_NDBOX_P(result);
 }
diff --git a/contrib/cube/cube.control b/contrib/cube/cube.control
index b03cfa0a58..f39a838e3f 100644
--- a/contrib/cube/cube.control
+++ b/contrib/cube/cube.control
@@ -1,5 +1,5 @@
 # cube extension
 comment = 'data type for multidimensional cubes'
-default_version = '1.2'
+default_version = '1.4'
 module_pathname = '$libdir/cube'
 relocatable = true
diff --git a/contrib/cube/cubedata.h b/contrib/cube/cubedata.h
index 6e6ddfd3d7..dbe7d4f742 100644
--- a/contrib/cube/cubedata.h
+++ b/contrib/cube/cubedata.h
@@ -49,9 +49,9 @@ typedef struct NDBOX
 #define CUBE_SIZE(_dim)		(offsetof(NDBOX, x) + sizeof(double)*(_dim)*2)
 
 /* fmgr interface macros */
-#define DatumGetNDBOX(x)	((NDBOX *) PG_DETOAST_DATUM(x))
-#define PG_GETARG_NDBOX(x)	DatumGetNDBOX(PG_GETARG_DATUM(x))
-#define PG_RETURN_NDBOX(x)	PG_RETURN_POINTER(x)
+#define DatumGetNDBOXP(x)	((NDBOX *) PG_DETOAST_DATUM(x))
+#define PG_GETARG_NDBOX_P(x)	DatumGetNDBOXP(PG_GETARG_DATUM(x))
+#define PG_RETURN_NDBOX_P(x)	PG_RETURN_POINTER(x)
 
 /* GiST operator strategy numbers */
 #define CubeKNNDistanceCoord			15	/* ~> */
diff --git a/contrib/cube/cubescan.l b/contrib/cube/cubescan.l
index dada917820..bd400e3684 100644
--- a/contrib/cube/cubescan.l
+++ b/contrib/cube/cubescan.l
@@ -4,6 +4,8 @@
  * contrib/cube/cubescan.l
  */
 
+/* LCOV_EXCL_START */
+
 /* No reason to constrain amount of data slurped */
 #define YY_READ_BUF_SIZE 16777216
 
@@ -56,6 +58,8 @@ NaN          [nN][aA][nN]
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 /* result is not used, but Bison expects this signature */
 void
 yyerror(NDBOX **result, const char *message)
diff --git a/contrib/cube/expected/cube.out b/contrib/cube/expected/cube.out
index 328b3b5f5d..6378db3004 100644
--- a/contrib/cube/expected/cube.out
+++ b/contrib/cube/expected/cube.out
@@ -1532,37 +1532,41 @@ SELECT cube(array[40,50,60], array[10,20,30])~>1;
 SELECT cube(array[10,20,30], array[40,50,60])~>2;
  ?column? 
 ----------
-       20
+       40
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>2;
  ?column? 
 ----------
-       20
+       40
 (1 row)
 
 SELECT cube(array[10,20,30], array[40,50,60])~>3;
  ?column? 
 ----------
-       30
+       20
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>3;
  ?column? 
 ----------
-       30
+       20
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>0;
-ERROR:  cube index 0 is out of bounds
+ERROR:  zero cube index is not defined
 SELECT cube(array[40,50,60], array[10,20,30])~>4;
  ?column? 
 ----------
-       40
+       50
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>(-1);
-ERROR:  cube index -1 is out of bounds
+ ?column? 
+----------
+      -10
+(1 row)
+
 -- Load some example data and build the index
 --
 CREATE TABLE test_cube (c cube);
@@ -1589,159 +1593,414 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
  (2424, 160),(2424, 81)
 (5 rows)
 
--- kNN with index
+-- Test index-only scans
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Sort
+   Sort Key: c
+   ->  Index Only Scan using test_cube_ix on test_cube
+         Index Cond: (c <@ '(3000, 1000),(0, 0)'::cube)
+(4 rows)
+
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+            c            
+-------------------------
+ (337, 455),(240, 359)
+ (759, 187),(662, 163)
+ (1444, 403),(1346, 344)
+ (2424, 160),(2424, 81)
+(4 rows)
+
+RESET enable_bitmapscan;
+-- Test kNN
+INSERT INTO test_cube VALUES ('(1,1)'), ('(100000)'), ('(0, 100000)'); -- Some corner cases
+SET enable_seqscan = false;
+-- Test different metrics
 SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            |       dist       
 -------------------------+------------------
  (337, 455),(240, 359)   |                0
+ (1, 1)                  | 140.007142674936
  (759, 187),(662, 163)   |              162
  (948, 1201),(907, 1156) | 772.000647668122
  (1444, 403),(1346, 344) |              846
- (369, 1457),(278, 1409) |              909
 (5 rows)
 
 SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            | dist 
 -------------------------+------
  (337, 455),(240, 359)   |    0
+ (1, 1)                  |   99
  (759, 187),(662, 163)   |  162
  (948, 1201),(907, 1156) |  656
  (1444, 403),(1346, 344) |  846
+(5 rows)
+
+SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            | dist 
+-------------------------+------
+ (337, 455),(240, 359)   |    0
+ (759, 187),(662, 163)   |  162
+ (1, 1)                  |  198
+ (1444, 403),(1346, 344) |  846
  (369, 1457),(278, 1409) |  909
 (5 rows)
 
+-- Test sorting by coordinates
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+        3 | (54, 38679),(3, 38602)
+       15 | (83, 10271),(15, 10265)
+       64 | (122, 46832),(64, 46762)
+       92 | (167, 17214),(92, 17184)
+      107 | (161, 24465),(107, 24374)
+      120 | (162, 26040),(120, 25963)
+      138 | (154, 4019),(138, 3990)
+      175 | (259, 1850),(175, 1820)
+      179 | (207, 40886),(179, 40879)
+      204 | (288, 49588),(204, 49571)
+      226 | (270, 32616),(226, 32607)
+      235 | (318, 31489),(235, 31404)
+      240 | (337, 455),(240, 359)
+(15 rows)
+
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+       54 | (54, 38679),(3, 38602)
+       83 | (83, 10271),(15, 10265)
+      122 | (122, 46832),(64, 46762)
+      154 | (154, 4019),(138, 3990)
+      161 | (161, 24465),(107, 24374)
+      162 | (162, 26040),(120, 25963)
+      167 | (167, 17214),(92, 17184)
+      207 | (207, 40886),(179, 40879)
+      259 | (259, 1850),(175, 1820)
+      270 | (270, 29508),(264, 29440)
+      270 | (270, 32616),(226, 32607)
+      288 | (288, 49588),(204, 49571)
+      318 | (318, 31489),(235, 31404)
+(15 rows)
+
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+        6 | (30333, 50),(30273, 6)
+       43 | (43301, 75),(43227, 43)
+       51 | (19650, 142),(19630, 51)
+       81 | (2424, 160),(2424, 81)
+      108 | (3449, 171),(3354, 108)
+      109 | (18037, 155),(17941, 109)
+      114 | (28511, 208),(28479, 114)
+      118 | (19946, 217),(19941, 118)
+      139 | (16906, 191),(16816, 139)
+      163 | (759, 187),(662, 163)
+      181 | (22684, 266),(22656, 181)
+      213 | (24423, 255),(24360, 213)
+      222 | (45989, 249),(45910, 222)
+(15 rows)
+
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+       50 | (30333, 50),(30273, 6)
+       75 | (43301, 75),(43227, 43)
+      142 | (19650, 142),(19630, 51)
+      155 | (18037, 155),(17941, 109)
+      160 | (2424, 160),(2424, 81)
+      171 | (3449, 171),(3354, 108)
+      187 | (759, 187),(662, 163)
+      191 | (16906, 191),(16816, 139)
+      208 | (28511, 208),(28479, 114)
+      217 | (19946, 217),(19941, 118)
+      249 | (45989, 249),(45910, 222)
+      255 | (24423, 255),(24360, 213)
+      266 | (22684, 266),(22656, 181)
+(15 rows)
+
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -49951 | (50027, 49230),(49951, 49214)
+   -49937 | (49980, 35004),(49937, 34963)
+   -49927 | (49985, 6436),(49927, 6338)
+   -49908 | (49999, 27218),(49908, 27176)
+   -49905 | (49954, 1340),(49905, 1294)
+   -49902 | (49944, 25163),(49902, 25153)
+   -49898 | (49981, 34876),(49898, 34786)
+   -49897 | (49957, 43390),(49897, 43384)
+   -49848 | (49853, 18504),(49848, 18503)
+   -49818 | (49902, 41752),(49818, 41746)
+   -49810 | (49907, 30225),(49810, 30158)
+   -49808 | (49843, 5175),(49808, 5145)
+   -49805 | (49887, 24274),(49805, 24184)
+   -49798 | (49847, 7128),(49798, 7067)
+(15 rows)
+
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -50027 | (50027, 49230),(49951, 49214)
+   -49999 | (49999, 27218),(49908, 27176)
+   -49985 | (49985, 6436),(49927, 6338)
+   -49981 | (49981, 34876),(49898, 34786)
+   -49980 | (49980, 35004),(49937, 34963)
+   -49957 | (49957, 43390),(49897, 43384)
+   -49954 | (49954, 1340),(49905, 1294)
+   -49944 | (49944, 25163),(49902, 25153)
+   -49907 | (49907, 30225),(49810, 30158)
+   -49902 | (49902, 41752),(49818, 41746)
+   -49887 | (49887, 24274),(49805, 24184)
+   -49853 | (49853, 18504),(49848, 18503)
+   -49847 | (49847, 7128),(49798, 7067)
+   -49843 | (49843, 5175),(49808, 5145)
+(15 rows)
+
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -49992 | (30746, 50040),(30727, 49992)
+   -49987 | (36311, 50073),(36258, 49987)
+   -49934 | (3531, 49962),(3463, 49934)
+   -49915 | (17954, 49975),(17865, 49915)
+   -49914 | (2168, 50012),(2108, 49914)
+   -49913 | (31287, 49923),(31236, 49913)
+   -49885 | (21551, 49983),(21492, 49885)
+   -49878 | (43925, 49912),(43888, 49878)
+   -49849 | (19128, 49932),(19112, 49849)
+   -49844 | (38266, 49852),(38233, 49844)
+   -49836 | (14913, 49873),(14849, 49836)
+   -49834 | (37595, 49849),(37581, 49834)
+   -49830 | (46151, 49848),(46058, 49830)
+   -49818 | (29261, 49910),(29247, 49818)
+(15 rows)
+
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -50073 | (36311, 50073),(36258, 49987)
+   -50040 | (30746, 50040),(30727, 49992)
+   -50012 | (2168, 50012),(2108, 49914)
+   -49983 | (21551, 49983),(21492, 49885)
+   -49975 | (17954, 49975),(17865, 49915)
+   -49962 | (3531, 49962),(3463, 49934)
+   -49932 | (19128, 49932),(19112, 49849)
+   -49923 | (31287, 49923),(31236, 49913)
+   -49912 | (43925, 49912),(43888, 49878)
+   -49910 | (29261, 49910),(29247, 49818)
+   -49873 | (14913, 49873),(14849, 49836)
+   -49858 | (20007, 49858),(19921, 49778)
+   -49852 | (38266, 49852),(38233, 49844)
+   -49849 | (37595, 49849),(37581, 49834)
+(15 rows)
+
+-- Same queries with sequential scan (should give the same results as above)
+RESET enable_seqscan;
+SET enable_indexscan = OFF;
+SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            |       dist       
+-------------------------+------------------
+ (337, 455),(240, 359)   |                0
+ (1, 1)                  | 140.007142674936
+ (759, 187),(662, 163)   |              162
+ (948, 1201),(907, 1156) | 772.000647668122
+ (1444, 403),(1346, 344) |              846
+(5 rows)
+
+SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            | dist 
+-------------------------+------
+ (337, 455),(240, 359)   |    0
+ (1, 1)                  |   99
+ (759, 187),(662, 163)   |  162
+ (948, 1201),(907, 1156) |  656
+ (1444, 403),(1346, 344) |  846
+(5 rows)
+
 SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            | dist 
 -------------------------+------
  (337, 455),(240, 359)   |    0
  (759, 187),(662, 163)   |  162
+ (1, 1)                  |  198
  (1444, 403),(1346, 344) |  846
  (369, 1457),(278, 1409) |  909
- (948, 1201),(907, 1156) | 1063
 (5 rows)
 
--- kNN-based sorting
-SELECT * FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by 1st coordinate of lower left corner
-             c             
----------------------------
- (54, 38679),(3, 38602)
- (83, 10271),(15, 10265)
- (122, 46832),(64, 46762)
- (167, 17214),(92, 17184)
- (161, 24465),(107, 24374)
- (162, 26040),(120, 25963)
- (154, 4019),(138, 3990)
- (259, 1850),(175, 1820)
- (207, 40886),(179, 40879)
- (288, 49588),(204, 49571)
- (270, 32616),(226, 32607)
- (318, 31489),(235, 31404)
- (337, 455),(240, 359)
- (270, 29508),(264, 29440)
- (369, 1457),(278, 1409)
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+        3 | (54, 38679),(3, 38602)
+       15 | (83, 10271),(15, 10265)
+       64 | (122, 46832),(64, 46762)
+       92 | (167, 17214),(92, 17184)
+      107 | (161, 24465),(107, 24374)
+      120 | (162, 26040),(120, 25963)
+      138 | (154, 4019),(138, 3990)
+      175 | (259, 1850),(175, 1820)
+      179 | (207, 40886),(179, 40879)
+      204 | (288, 49588),(204, 49571)
+      226 | (270, 32616),(226, 32607)
+      235 | (318, 31489),(235, 31404)
+      240 | (337, 455),(240, 359)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by 2nd coordinate or upper right corner
-             c             
----------------------------
- (30333, 50),(30273, 6)
- (43301, 75),(43227, 43)
- (19650, 142),(19630, 51)
- (2424, 160),(2424, 81)
- (3449, 171),(3354, 108)
- (18037, 155),(17941, 109)
- (28511, 208),(28479, 114)
- (19946, 217),(19941, 118)
- (16906, 191),(16816, 139)
- (759, 187),(662, 163)
- (22684, 266),(22656, 181)
- (24423, 255),(24360, 213)
- (45989, 249),(45910, 222)
- (11399, 377),(11360, 294)
- (12162, 389),(12103, 309)
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+       54 | (54, 38679),(3, 38602)
+       83 | (83, 10271),(15, 10265)
+      122 | (122, 46832),(64, 46762)
+      154 | (154, 4019),(138, 3990)
+      161 | (161, 24465),(107, 24374)
+      162 | (162, 26040),(120, 25963)
+      167 | (167, 17214),(92, 17184)
+      207 | (207, 40886),(179, 40879)
+      259 | (259, 1850),(175, 1820)
+      270 | (270, 29508),(264, 29440)
+      270 | (270, 32616),(226, 32607)
+      288 | (288, 49588),(204, 49571)
+      318 | (318, 31489),(235, 31404)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>1 DESC LIMIT 15; -- descending by 1st coordinate of lower left corner
-               c               
--------------------------------
- (50027, 49230),(49951, 49214)
- (49980, 35004),(49937, 34963)
- (49985, 6436),(49927, 6338)
- (49999, 27218),(49908, 27176)
- (49954, 1340),(49905, 1294)
- (49944, 25163),(49902, 25153)
- (49981, 34876),(49898, 34786)
- (49957, 43390),(49897, 43384)
- (49853, 18504),(49848, 18503)
- (49902, 41752),(49818, 41746)
- (49907, 30225),(49810, 30158)
- (49843, 5175),(49808, 5145)
- (49887, 24274),(49805, 24184)
- (49847, 7128),(49798, 7067)
- (49820, 7990),(49771, 7967)
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+        6 | (30333, 50),(30273, 6)
+       43 | (43301, 75),(43227, 43)
+       51 | (19650, 142),(19630, 51)
+       81 | (2424, 160),(2424, 81)
+      108 | (3449, 171),(3354, 108)
+      109 | (18037, 155),(17941, 109)
+      114 | (28511, 208),(28479, 114)
+      118 | (19946, 217),(19941, 118)
+      139 | (16906, 191),(16816, 139)
+      163 | (759, 187),(662, 163)
+      181 | (22684, 266),(22656, 181)
+      213 | (24423, 255),(24360, 213)
+      222 | (45989, 249),(45910, 222)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>4 DESC LIMIT 15; -- descending by 2nd coordinate or upper right corner
-               c               
--------------------------------
- (36311, 50073),(36258, 49987)
- (30746, 50040),(30727, 49992)
- (2168, 50012),(2108, 49914)
- (21551, 49983),(21492, 49885)
- (17954, 49975),(17865, 49915)
- (3531, 49962),(3463, 49934)
- (19128, 49932),(19112, 49849)
- (31287, 49923),(31236, 49913)
- (43925, 49912),(43888, 49878)
- (29261, 49910),(29247, 49818)
- (14913, 49873),(14849, 49836)
- (20007, 49858),(19921, 49778)
- (38266, 49852),(38233, 49844)
- (37595, 49849),(37581, 49834)
- (46151, 49848),(46058, 49830)
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+       50 | (30333, 50),(30273, 6)
+       75 | (43301, 75),(43227, 43)
+      142 | (19650, 142),(19630, 51)
+      155 | (18037, 155),(17941, 109)
+      160 | (2424, 160),(2424, 81)
+      171 | (3449, 171),(3354, 108)
+      187 | (759, 187),(662, 163)
+      191 | (16906, 191),(16816, 139)
+      208 | (28511, 208),(28479, 114)
+      217 | (19946, 217),(19941, 118)
+      249 | (45989, 249),(45910, 222)
+      255 | (24423, 255),(24360, 213)
+      266 | (22684, 266),(22656, 181)
 (15 rows)
 
--- same thing for index with points
-CREATE TABLE test_point(c cube);
-INSERT INTO test_point(SELECT cube(array[c->1,c->2,c->3,c->4]) FROM test_cube);
-CREATE INDEX ON test_point USING gist(c);
-SELECT * FROM test_point ORDER BY c~>1, c~>2 LIMIT 15; -- ascending by 1st then by 2nd coordinate
-            c             
---------------------------
- (54, 38679, 3, 38602)
- (83, 10271, 15, 10265)
- (122, 46832, 64, 46762)
- (154, 4019, 138, 3990)
- (161, 24465, 107, 24374)
- (162, 26040, 120, 25963)
- (167, 17214, 92, 17184)
- (207, 40886, 179, 40879)
- (259, 1850, 175, 1820)
- (270, 29508, 264, 29440)
- (270, 32616, 226, 32607)
- (288, 49588, 204, 49571)
- (318, 31489, 235, 31404)
- (326, 18837, 285, 18817)
- (337, 455, 240, 359)
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -49951 | (50027, 49230),(49951, 49214)
+   -49937 | (49980, 35004),(49937, 34963)
+   -49927 | (49985, 6436),(49927, 6338)
+   -49908 | (49999, 27218),(49908, 27176)
+   -49905 | (49954, 1340),(49905, 1294)
+   -49902 | (49944, 25163),(49902, 25153)
+   -49898 | (49981, 34876),(49898, 34786)
+   -49897 | (49957, 43390),(49897, 43384)
+   -49848 | (49853, 18504),(49848, 18503)
+   -49818 | (49902, 41752),(49818, 41746)
+   -49810 | (49907, 30225),(49810, 30158)
+   -49808 | (49843, 5175),(49808, 5145)
+   -49805 | (49887, 24274),(49805, 24184)
+   -49798 | (49847, 7128),(49798, 7067)
+(15 rows)
+
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -50027 | (50027, 49230),(49951, 49214)
+   -49999 | (49999, 27218),(49908, 27176)
+   -49985 | (49985, 6436),(49927, 6338)
+   -49981 | (49981, 34876),(49898, 34786)
+   -49980 | (49980, 35004),(49937, 34963)
+   -49957 | (49957, 43390),(49897, 43384)
+   -49954 | (49954, 1340),(49905, 1294)
+   -49944 | (49944, 25163),(49902, 25153)
+   -49907 | (49907, 30225),(49810, 30158)
+   -49902 | (49902, 41752),(49818, 41746)
+   -49887 | (49887, 24274),(49805, 24184)
+   -49853 | (49853, 18504),(49848, 18503)
+   -49847 | (49847, 7128),(49798, 7067)
+   -49843 | (49843, 5175),(49808, 5145)
+(15 rows)
+
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -49992 | (30746, 50040),(30727, 49992)
+   -49987 | (36311, 50073),(36258, 49987)
+   -49934 | (3531, 49962),(3463, 49934)
+   -49915 | (17954, 49975),(17865, 49915)
+   -49914 | (2168, 50012),(2108, 49914)
+   -49913 | (31287, 49923),(31236, 49913)
+   -49885 | (21551, 49983),(21492, 49885)
+   -49878 | (43925, 49912),(43888, 49878)
+   -49849 | (19128, 49932),(19112, 49849)
+   -49844 | (38266, 49852),(38233, 49844)
+   -49836 | (14913, 49873),(14849, 49836)
+   -49834 | (37595, 49849),(37581, 49834)
+   -49830 | (46151, 49848),(46058, 49830)
+   -49818 | (29261, 49910),(29247, 49818)
 (15 rows)
 
-SELECT * FROM test_point ORDER BY c~>4 DESC LIMIT 15; -- descending by 1st coordinate
-              c               
-------------------------------
- (30746, 50040, 30727, 49992)
- (36311, 50073, 36258, 49987)
- (3531, 49962, 3463, 49934)
- (17954, 49975, 17865, 49915)
- (2168, 50012, 2108, 49914)
- (31287, 49923, 31236, 49913)
- (21551, 49983, 21492, 49885)
- (43925, 49912, 43888, 49878)
- (19128, 49932, 19112, 49849)
- (38266, 49852, 38233, 49844)
- (14913, 49873, 14849, 49836)
- (37595, 49849, 37581, 49834)
- (46151, 49848, 46058, 49830)
- (29261, 49910, 29247, 49818)
- (19233, 49824, 19185, 49794)
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -50073 | (36311, 50073),(36258, 49987)
+   -50040 | (30746, 50040),(30727, 49992)
+   -50012 | (2168, 50012),(2108, 49914)
+   -49983 | (21551, 49983),(21492, 49885)
+   -49975 | (17954, 49975),(17865, 49915)
+   -49962 | (3531, 49962),(3463, 49934)
+   -49932 | (19128, 49932),(19112, 49849)
+   -49923 | (31287, 49923),(31236, 49913)
+   -49912 | (43925, 49912),(43888, 49878)
+   -49910 | (29261, 49910),(29247, 49818)
+   -49873 | (14913, 49873),(14849, 49836)
+   -49858 | (20007, 49858),(19921, 49778)
+   -49852 | (38266, 49852),(38233, 49844)
+   -49849 | (37595, 49849),(37581, 49834)
 (15 rows)
 
+RESET enable_indexscan;
diff --git a/contrib/cube/expected/cube_2.out b/contrib/cube/expected/cube_2.out
index 1aa5cf2f98..75fe405c49 100644
--- a/contrib/cube/expected/cube_2.out
+++ b/contrib/cube/expected/cube_2.out
@@ -1532,37 +1532,41 @@ SELECT cube(array[40,50,60], array[10,20,30])~>1;
 SELECT cube(array[10,20,30], array[40,50,60])~>2;
  ?column? 
 ----------
-       20
+       40
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>2;
  ?column? 
 ----------
-       20
+       40
 (1 row)
 
 SELECT cube(array[10,20,30], array[40,50,60])~>3;
  ?column? 
 ----------
-       30
+       20
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>3;
  ?column? 
 ----------
-       30
+       20
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>0;
-ERROR:  cube index 0 is out of bounds
+ERROR:  zero cube index is not defined
 SELECT cube(array[40,50,60], array[10,20,30])~>4;
  ?column? 
 ----------
-       40
+       50
 (1 row)
 
 SELECT cube(array[40,50,60], array[10,20,30])~>(-1);
-ERROR:  cube index -1 is out of bounds
+ ?column? 
+----------
+      -10
+(1 row)
+
 -- Load some example data and build the index
 --
 CREATE TABLE test_cube (c cube);
@@ -1589,159 +1593,414 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
  (2424, 160),(2424, 81)
 (5 rows)
 
--- kNN with index
+-- Test index-only scans
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Sort
+   Sort Key: c
+   ->  Index Only Scan using test_cube_ix on test_cube
+         Index Cond: (c <@ '(3000, 1000),(0, 0)'::cube)
+(4 rows)
+
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+            c            
+-------------------------
+ (337, 455),(240, 359)
+ (759, 187),(662, 163)
+ (1444, 403),(1346, 344)
+ (2424, 160),(2424, 81)
+(4 rows)
+
+RESET enable_bitmapscan;
+-- Test kNN
+INSERT INTO test_cube VALUES ('(1,1)'), ('(100000)'), ('(0, 100000)'); -- Some corner cases
+SET enable_seqscan = false;
+-- Test different metrics
 SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            |       dist       
 -------------------------+------------------
  (337, 455),(240, 359)   |                0
+ (1, 1)                  | 140.007142674936
  (759, 187),(662, 163)   |              162
  (948, 1201),(907, 1156) | 772.000647668122
  (1444, 403),(1346, 344) |              846
- (369, 1457),(278, 1409) |              909
 (5 rows)
 
 SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            | dist 
 -------------------------+------
  (337, 455),(240, 359)   |    0
+ (1, 1)                  |   99
  (759, 187),(662, 163)   |  162
  (948, 1201),(907, 1156) |  656
  (1444, 403),(1346, 344) |  846
+(5 rows)
+
+SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            | dist 
+-------------------------+------
+ (337, 455),(240, 359)   |    0
+ (759, 187),(662, 163)   |  162
+ (1, 1)                  |  198
+ (1444, 403),(1346, 344) |  846
  (369, 1457),(278, 1409) |  909
 (5 rows)
 
+-- Test sorting by coordinates
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+        3 | (54, 38679),(3, 38602)
+       15 | (83, 10271),(15, 10265)
+       64 | (122, 46832),(64, 46762)
+       92 | (167, 17214),(92, 17184)
+      107 | (161, 24465),(107, 24374)
+      120 | (162, 26040),(120, 25963)
+      138 | (154, 4019),(138, 3990)
+      175 | (259, 1850),(175, 1820)
+      179 | (207, 40886),(179, 40879)
+      204 | (288, 49588),(204, 49571)
+      226 | (270, 32616),(226, 32607)
+      235 | (318, 31489),(235, 31404)
+      240 | (337, 455),(240, 359)
+(15 rows)
+
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+       54 | (54, 38679),(3, 38602)
+       83 | (83, 10271),(15, 10265)
+      122 | (122, 46832),(64, 46762)
+      154 | (154, 4019),(138, 3990)
+      161 | (161, 24465),(107, 24374)
+      162 | (162, 26040),(120, 25963)
+      167 | (167, 17214),(92, 17184)
+      207 | (207, 40886),(179, 40879)
+      259 | (259, 1850),(175, 1820)
+      270 | (270, 29508),(264, 29440)
+      270 | (270, 32616),(226, 32607)
+      288 | (288, 49588),(204, 49571)
+      318 | (318, 31489),(235, 31404)
+(15 rows)
+
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+        6 | (30333, 50),(30273, 6)
+       43 | (43301, 75),(43227, 43)
+       51 | (19650, 142),(19630, 51)
+       81 | (2424, 160),(2424, 81)
+      108 | (3449, 171),(3354, 108)
+      109 | (18037, 155),(17941, 109)
+      114 | (28511, 208),(28479, 114)
+      118 | (19946, 217),(19941, 118)
+      139 | (16906, 191),(16816, 139)
+      163 | (759, 187),(662, 163)
+      181 | (22684, 266),(22656, 181)
+      213 | (24423, 255),(24360, 213)
+      222 | (45989, 249),(45910, 222)
+(15 rows)
+
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+       50 | (30333, 50),(30273, 6)
+       75 | (43301, 75),(43227, 43)
+      142 | (19650, 142),(19630, 51)
+      155 | (18037, 155),(17941, 109)
+      160 | (2424, 160),(2424, 81)
+      171 | (3449, 171),(3354, 108)
+      187 | (759, 187),(662, 163)
+      191 | (16906, 191),(16816, 139)
+      208 | (28511, 208),(28479, 114)
+      217 | (19946, 217),(19941, 118)
+      249 | (45989, 249),(45910, 222)
+      255 | (24423, 255),(24360, 213)
+      266 | (22684, 266),(22656, 181)
+(15 rows)
+
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -49951 | (50027, 49230),(49951, 49214)
+   -49937 | (49980, 35004),(49937, 34963)
+   -49927 | (49985, 6436),(49927, 6338)
+   -49908 | (49999, 27218),(49908, 27176)
+   -49905 | (49954, 1340),(49905, 1294)
+   -49902 | (49944, 25163),(49902, 25153)
+   -49898 | (49981, 34876),(49898, 34786)
+   -49897 | (49957, 43390),(49897, 43384)
+   -49848 | (49853, 18504),(49848, 18503)
+   -49818 | (49902, 41752),(49818, 41746)
+   -49810 | (49907, 30225),(49810, 30158)
+   -49808 | (49843, 5175),(49808, 5145)
+   -49805 | (49887, 24274),(49805, 24184)
+   -49798 | (49847, 7128),(49798, 7067)
+(15 rows)
+
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -50027 | (50027, 49230),(49951, 49214)
+   -49999 | (49999, 27218),(49908, 27176)
+   -49985 | (49985, 6436),(49927, 6338)
+   -49981 | (49981, 34876),(49898, 34786)
+   -49980 | (49980, 35004),(49937, 34963)
+   -49957 | (49957, 43390),(49897, 43384)
+   -49954 | (49954, 1340),(49905, 1294)
+   -49944 | (49944, 25163),(49902, 25153)
+   -49907 | (49907, 30225),(49810, 30158)
+   -49902 | (49902, 41752),(49818, 41746)
+   -49887 | (49887, 24274),(49805, 24184)
+   -49853 | (49853, 18504),(49848, 18503)
+   -49847 | (49847, 7128),(49798, 7067)
+   -49843 | (49843, 5175),(49808, 5145)
+(15 rows)
+
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -49992 | (30746, 50040),(30727, 49992)
+   -49987 | (36311, 50073),(36258, 49987)
+   -49934 | (3531, 49962),(3463, 49934)
+   -49915 | (17954, 49975),(17865, 49915)
+   -49914 | (2168, 50012),(2108, 49914)
+   -49913 | (31287, 49923),(31236, 49913)
+   -49885 | (21551, 49983),(21492, 49885)
+   -49878 | (43925, 49912),(43888, 49878)
+   -49849 | (19128, 49932),(19112, 49849)
+   -49844 | (38266, 49852),(38233, 49844)
+   -49836 | (14913, 49873),(14849, 49836)
+   -49834 | (37595, 49849),(37581, 49834)
+   -49830 | (46151, 49848),(46058, 49830)
+   -49818 | (29261, 49910),(29247, 49818)
+(15 rows)
+
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -50073 | (36311, 50073),(36258, 49987)
+   -50040 | (30746, 50040),(30727, 49992)
+   -50012 | (2168, 50012),(2108, 49914)
+   -49983 | (21551, 49983),(21492, 49885)
+   -49975 | (17954, 49975),(17865, 49915)
+   -49962 | (3531, 49962),(3463, 49934)
+   -49932 | (19128, 49932),(19112, 49849)
+   -49923 | (31287, 49923),(31236, 49913)
+   -49912 | (43925, 49912),(43888, 49878)
+   -49910 | (29261, 49910),(29247, 49818)
+   -49873 | (14913, 49873),(14849, 49836)
+   -49858 | (20007, 49858),(19921, 49778)
+   -49852 | (38266, 49852),(38233, 49844)
+   -49849 | (37595, 49849),(37581, 49834)
+(15 rows)
+
+-- Same queries with sequential scan (should give the same results as above)
+RESET enable_seqscan;
+SET enable_indexscan = OFF;
+SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            |       dist       
+-------------------------+------------------
+ (337, 455),(240, 359)   |                0
+ (1, 1)                  | 140.007142674936
+ (759, 187),(662, 163)   |              162
+ (948, 1201),(907, 1156) | 772.000647668122
+ (1444, 403),(1346, 344) |              846
+(5 rows)
+
+SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
+            c            | dist 
+-------------------------+------
+ (337, 455),(240, 359)   |    0
+ (1, 1)                  |   99
+ (759, 187),(662, 163)   |  162
+ (948, 1201),(907, 1156) |  656
+ (1444, 403),(1346, 344) |  846
+(5 rows)
+
 SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
             c            | dist 
 -------------------------+------
  (337, 455),(240, 359)   |    0
  (759, 187),(662, 163)   |  162
+ (1, 1)                  |  198
  (1444, 403),(1346, 344) |  846
  (369, 1457),(278, 1409) |  909
- (948, 1201),(907, 1156) | 1063
 (5 rows)
 
--- kNN-based sorting
-SELECT * FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by 1st coordinate of lower left corner
-             c             
----------------------------
- (54, 38679),(3, 38602)
- (83, 10271),(15, 10265)
- (122, 46832),(64, 46762)
- (167, 17214),(92, 17184)
- (161, 24465),(107, 24374)
- (162, 26040),(120, 25963)
- (154, 4019),(138, 3990)
- (259, 1850),(175, 1820)
- (207, 40886),(179, 40879)
- (288, 49588),(204, 49571)
- (270, 32616),(226, 32607)
- (318, 31489),(235, 31404)
- (337, 455),(240, 359)
- (270, 29508),(264, 29440)
- (369, 1457),(278, 1409)
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+        3 | (54, 38679),(3, 38602)
+       15 | (83, 10271),(15, 10265)
+       64 | (122, 46832),(64, 46762)
+       92 | (167, 17214),(92, 17184)
+      107 | (161, 24465),(107, 24374)
+      120 | (162, 26040),(120, 25963)
+      138 | (154, 4019),(138, 3990)
+      175 | (259, 1850),(175, 1820)
+      179 | (207, 40886),(179, 40879)
+      204 | (288, 49588),(204, 49571)
+      226 | (270, 32616),(226, 32607)
+      235 | (318, 31489),(235, 31404)
+      240 | (337, 455),(240, 359)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by 2nd coordinate or upper right corner
-             c             
----------------------------
- (30333, 50),(30273, 6)
- (43301, 75),(43227, 43)
- (19650, 142),(19630, 51)
- (2424, 160),(2424, 81)
- (3449, 171),(3354, 108)
- (18037, 155),(17941, 109)
- (28511, 208),(28479, 114)
- (19946, 217),(19941, 118)
- (16906, 191),(16816, 139)
- (759, 187),(662, 163)
- (22684, 266),(22656, 181)
- (24423, 255),(24360, 213)
- (45989, 249),(45910, 222)
- (11399, 377),(11360, 294)
- (12162, 389),(12103, 309)
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (0, 100000)
+        1 | (1, 1)
+       54 | (54, 38679),(3, 38602)
+       83 | (83, 10271),(15, 10265)
+      122 | (122, 46832),(64, 46762)
+      154 | (154, 4019),(138, 3990)
+      161 | (161, 24465),(107, 24374)
+      162 | (162, 26040),(120, 25963)
+      167 | (167, 17214),(92, 17184)
+      207 | (207, 40886),(179, 40879)
+      259 | (259, 1850),(175, 1820)
+      270 | (270, 29508),(264, 29440)
+      270 | (270, 32616),(226, 32607)
+      288 | (288, 49588),(204, 49571)
+      318 | (318, 31489),(235, 31404)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>1 DESC LIMIT 15; -- descending by 1st coordinate of lower left corner
-               c               
--------------------------------
- (50027, 49230),(49951, 49214)
- (49980, 35004),(49937, 34963)
- (49985, 6436),(49927, 6338)
- (49999, 27218),(49908, 27176)
- (49954, 1340),(49905, 1294)
- (49944, 25163),(49902, 25153)
- (49981, 34876),(49898, 34786)
- (49957, 43390),(49897, 43384)
- (49853, 18504),(49848, 18503)
- (49902, 41752),(49818, 41746)
- (49907, 30225),(49810, 30158)
- (49843, 5175),(49808, 5145)
- (49887, 24274),(49805, 24184)
- (49847, 7128),(49798, 7067)
- (49820, 7990),(49771, 7967)
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+        6 | (30333, 50),(30273, 6)
+       43 | (43301, 75),(43227, 43)
+       51 | (19650, 142),(19630, 51)
+       81 | (2424, 160),(2424, 81)
+      108 | (3449, 171),(3354, 108)
+      109 | (18037, 155),(17941, 109)
+      114 | (28511, 208),(28479, 114)
+      118 | (19946, 217),(19941, 118)
+      139 | (16906, 191),(16816, 139)
+      163 | (759, 187),(662, 163)
+      181 | (22684, 266),(22656, 181)
+      213 | (24423, 255),(24360, 213)
+      222 | (45989, 249),(45910, 222)
 (15 rows)
 
-SELECT * FROM test_cube ORDER BY c~>4 DESC LIMIT 15; -- descending by 2nd coordinate or upper right corner
-               c               
--------------------------------
- (36311, 50073),(36258, 49987)
- (30746, 50040),(30727, 49992)
- (2168, 50012),(2108, 49914)
- (21551, 49983),(21492, 49885)
- (17954, 49975),(17865, 49915)
- (3531, 49962),(3463, 49934)
- (19128, 49932),(19112, 49849)
- (31287, 49923),(31236, 49913)
- (43925, 49912),(43888, 49878)
- (29261, 49910),(29247, 49818)
- (14913, 49873),(14849, 49836)
- (20007, 49858),(19921, 49778)
- (38266, 49852),(38233, 49844)
- (37595, 49849),(37581, 49834)
- (46151, 49848),(46058, 49830)
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+ ?column? |             c             
+----------+---------------------------
+        0 | (100000)
+        1 | (1, 1)
+       50 | (30333, 50),(30273, 6)
+       75 | (43301, 75),(43227, 43)
+      142 | (19650, 142),(19630, 51)
+      155 | (18037, 155),(17941, 109)
+      160 | (2424, 160),(2424, 81)
+      171 | (3449, 171),(3354, 108)
+      187 | (759, 187),(662, 163)
+      191 | (16906, 191),(16816, 139)
+      208 | (28511, 208),(28479, 114)
+      217 | (19946, 217),(19941, 118)
+      249 | (45989, 249),(45910, 222)
+      255 | (24423, 255),(24360, 213)
+      266 | (22684, 266),(22656, 181)
 (15 rows)
 
--- same thing for index with points
-CREATE TABLE test_point(c cube);
-INSERT INTO test_point(SELECT cube(array[c->1,c->2,c->3,c->4]) FROM test_cube);
-CREATE INDEX ON test_point USING gist(c);
-SELECT * FROM test_point ORDER BY c~>1, c~>2 LIMIT 15; -- ascending by 1st then by 2nd coordinate
-            c             
---------------------------
- (54, 38679, 3, 38602)
- (83, 10271, 15, 10265)
- (122, 46832, 64, 46762)
- (154, 4019, 138, 3990)
- (161, 24465, 107, 24374)
- (162, 26040, 120, 25963)
- (167, 17214, 92, 17184)
- (207, 40886, 179, 40879)
- (259, 1850, 175, 1820)
- (270, 29508, 264, 29440)
- (270, 32616, 226, 32607)
- (288, 49588, 204, 49571)
- (318, 31489, 235, 31404)
- (326, 18837, 285, 18817)
- (337, 455, 240, 359)
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -49951 | (50027, 49230),(49951, 49214)
+   -49937 | (49980, 35004),(49937, 34963)
+   -49927 | (49985, 6436),(49927, 6338)
+   -49908 | (49999, 27218),(49908, 27176)
+   -49905 | (49954, 1340),(49905, 1294)
+   -49902 | (49944, 25163),(49902, 25153)
+   -49898 | (49981, 34876),(49898, 34786)
+   -49897 | (49957, 43390),(49897, 43384)
+   -49848 | (49853, 18504),(49848, 18503)
+   -49818 | (49902, 41752),(49818, 41746)
+   -49810 | (49907, 30225),(49810, 30158)
+   -49808 | (49843, 5175),(49808, 5145)
+   -49805 | (49887, 24274),(49805, 24184)
+   -49798 | (49847, 7128),(49798, 7067)
+(15 rows)
+
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (100000)
+   -50027 | (50027, 49230),(49951, 49214)
+   -49999 | (49999, 27218),(49908, 27176)
+   -49985 | (49985, 6436),(49927, 6338)
+   -49981 | (49981, 34876),(49898, 34786)
+   -49980 | (49980, 35004),(49937, 34963)
+   -49957 | (49957, 43390),(49897, 43384)
+   -49954 | (49954, 1340),(49905, 1294)
+   -49944 | (49944, 25163),(49902, 25153)
+   -49907 | (49907, 30225),(49810, 30158)
+   -49902 | (49902, 41752),(49818, 41746)
+   -49887 | (49887, 24274),(49805, 24184)
+   -49853 | (49853, 18504),(49848, 18503)
+   -49847 | (49847, 7128),(49798, 7067)
+   -49843 | (49843, 5175),(49808, 5145)
+(15 rows)
+
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -49992 | (30746, 50040),(30727, 49992)
+   -49987 | (36311, 50073),(36258, 49987)
+   -49934 | (3531, 49962),(3463, 49934)
+   -49915 | (17954, 49975),(17865, 49915)
+   -49914 | (2168, 50012),(2108, 49914)
+   -49913 | (31287, 49923),(31236, 49913)
+   -49885 | (21551, 49983),(21492, 49885)
+   -49878 | (43925, 49912),(43888, 49878)
+   -49849 | (19128, 49932),(19112, 49849)
+   -49844 | (38266, 49852),(38233, 49844)
+   -49836 | (14913, 49873),(14849, 49836)
+   -49834 | (37595, 49849),(37581, 49834)
+   -49830 | (46151, 49848),(46058, 49830)
+   -49818 | (29261, 49910),(29247, 49818)
 (15 rows)
 
-SELECT * FROM test_point ORDER BY c~>4 DESC LIMIT 15; -- descending by 1st coordinate
-              c               
-------------------------------
- (30746, 50040, 30727, 49992)
- (36311, 50073, 36258, 49987)
- (3531, 49962, 3463, 49934)
- (17954, 49975, 17865, 49915)
- (2168, 50012, 2108, 49914)
- (31287, 49923, 31236, 49913)
- (21551, 49983, 21492, 49885)
- (43925, 49912, 43888, 49878)
- (19128, 49932, 19112, 49849)
- (38266, 49852, 38233, 49844)
- (14913, 49873, 14849, 49836)
- (37595, 49849, 37581, 49834)
- (46151, 49848, 46058, 49830)
- (29261, 49910, 29247, 49818)
- (19233, 49824, 19185, 49794)
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+ ?column? |               c               
+----------+-------------------------------
+  -100000 | (0, 100000)
+   -50073 | (36311, 50073),(36258, 49987)
+   -50040 | (30746, 50040),(30727, 49992)
+   -50012 | (2168, 50012),(2108, 49914)
+   -49983 | (21551, 49983),(21492, 49885)
+   -49975 | (17954, 49975),(17865, 49915)
+   -49962 | (3531, 49962),(3463, 49934)
+   -49932 | (19128, 49932),(19112, 49849)
+   -49923 | (31287, 49923),(31236, 49913)
+   -49912 | (43925, 49912),(43888, 49878)
+   -49910 | (29261, 49910),(29247, 49818)
+   -49873 | (14913, 49873),(14849, 49836)
+   -49858 | (20007, 49858),(19921, 49778)
+   -49852 | (38266, 49852),(38233, 49844)
+   -49849 | (37595, 49849),(37581, 49834)
 (15 rows)
 
+RESET enable_indexscan;
diff --git a/contrib/cube/sql/cube.sql b/contrib/cube/sql/cube.sql
index 58ea3ad811..f599e7f7c0 100644
--- a/contrib/cube/sql/cube.sql
+++ b/contrib/cube/sql/cube.sql
@@ -382,20 +382,44 @@ SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' ORDER BY c;
 -- Test sorting
 SELECT * FROM test_cube WHERE c && '(3000,1000),(0,0)' GROUP BY c ORDER BY c;
 
--- kNN with index
+-- Test index-only scans
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+SELECT c FROM test_cube WHERE c <@ '(3000,1000),(0,0)' ORDER BY c;
+RESET enable_bitmapscan;
+
+-- Test kNN
+INSERT INTO test_cube VALUES ('(1,1)'), ('(100000)'), ('(0, 100000)'); -- Some corner cases
+SET enable_seqscan = false;
+
+-- Test different metrics
 SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
 SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
 SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
 
--- kNN-based sorting
-SELECT * FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by 1st coordinate of lower left corner
-SELECT * FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by 2nd coordinate or upper right corner
-SELECT * FROM test_cube ORDER BY c~>1 DESC LIMIT 15; -- descending by 1st coordinate of lower left corner
-SELECT * FROM test_cube ORDER BY c~>4 DESC LIMIT 15; -- descending by 2nd coordinate or upper right corner
-
--- same thing for index with points
-CREATE TABLE test_point(c cube);
-INSERT INTO test_point(SELECT cube(array[c->1,c->2,c->3,c->4]) FROM test_cube);
-CREATE INDEX ON test_point USING gist(c);
-SELECT * FROM test_point ORDER BY c~>1, c~>2 LIMIT 15; -- ascending by 1st then by 2nd coordinate
-SELECT * FROM test_point ORDER BY c~>4 DESC LIMIT 15; -- descending by 1st coordinate
+-- Test sorting by coordinates
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+
+-- Same queries with sequential scan (should give the same results as above)
+RESET enable_seqscan;
+SET enable_indexscan = OFF;
+SELECT *, c <-> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <-> '(100, 100),(500, 500)'::cube LIMIT 5;
+SELECT *, c <=> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <=> '(100, 100),(500, 500)'::cube LIMIT 5;
+SELECT *, c <#> '(100, 100),(500, 500)'::cube as dist FROM test_cube ORDER BY c <#> '(100, 100),(500, 500)'::cube LIMIT 5;
+SELECT c~>1, c FROM test_cube ORDER BY c~>1 LIMIT 15; -- ascending by left bound
+SELECT c~>2, c FROM test_cube ORDER BY c~>2 LIMIT 15; -- ascending by right bound
+SELECT c~>3, c FROM test_cube ORDER BY c~>3 LIMIT 15; -- ascending by lower bound
+SELECT c~>4, c FROM test_cube ORDER BY c~>4 LIMIT 15; -- ascending by upper bound
+SELECT c~>(-1), c FROM test_cube ORDER BY c~>(-1) LIMIT 15; -- descending by left bound
+SELECT c~>(-2), c FROM test_cube ORDER BY c~>(-2) LIMIT 15; -- descending by right bound
+SELECT c~>(-3), c FROM test_cube ORDER BY c~>(-3) LIMIT 15; -- descending by lower bound
+SELECT c~>(-4), c FROM test_cube ORDER BY c~>(-4) LIMIT 15; -- descending by upper bound
+RESET enable_indexscan;
diff --git a/contrib/dblink/dblink.c b/contrib/dblink/dblink.c
index 81136b131c..ae7e24ad08 100644
--- a/contrib/dblink/dblink.c
+++ b/contrib/dblink/dblink.c
@@ -9,7 +9,7 @@
  * Shridhar Daithankar <shridhar_daithankar@persistent.co.in>
  *
  * contrib/dblink/dblink.c
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -243,7 +243,7 @@ dblink_init(void)
 		pconn = (remoteConn *) MemoryContextAlloc(TopMemoryContext, sizeof(remoteConn));
 		pconn->conn = NULL;
 		pconn->openCursorCount = 0;
-		pconn->newXactForCursor = FALSE;
+		pconn->newXactForCursor = false;
 	}
 }
 
@@ -423,7 +423,7 @@ dblink_open(PG_FUNCTION_ARGS)
 		if (PQresultStatus(res) != PGRES_COMMAND_OK)
 			dblink_res_internalerror(conn, res, "begin error");
 		PQclear(res);
-		rconn->newXactForCursor = TRUE;
+		rconn->newXactForCursor = true;
 
 		/*
 		 * Since transaction state was IDLE, we force cursor count to
@@ -523,7 +523,7 @@ dblink_close(PG_FUNCTION_ARGS)
 		/* if count is zero, commit the transaction */
 		if (rconn->openCursorCount == 0)
 		{
-			rconn->newXactForCursor = FALSE;
+			rconn->newXactForCursor = false;
 
 			res = PQexec(conn, "COMMIT");
 			if (PQresultStatus(res) != PGRES_COMMAND_OK)
@@ -2172,14 +2172,16 @@ get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 	needComma = false;
 	for (i = 0; i < natts; i++)
 	{
-		if (tupdesc->attrs[i]->attisdropped)
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+		if (att->attisdropped)
 			continue;
 
 		if (needComma)
 			appendStringInfoChar(&buf, ',');
 
 		appendStringInfoString(&buf,
-							   quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
+							   quote_ident_cstr(NameStr(att->attname)));
 		needComma = true;
 	}
 
@@ -2191,7 +2193,7 @@ get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 	needComma = false;
 	for (i = 0; i < natts; i++)
 	{
-		if (tupdesc->attrs[i]->attisdropped)
+		if (TupleDescAttr(tupdesc, i)->attisdropped)
 			continue;
 
 		if (needComma)
@@ -2215,7 +2217,7 @@ get_sql_insert(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 	}
 	appendStringInfoChar(&buf, ')');
 
-	return (buf.data);
+	return buf.data;
 }
 
 static char *
@@ -2237,12 +2239,13 @@ get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals
 	for (i = 0; i < pknumatts; i++)
 	{
 		int			pkattnum = pkattnums[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, pkattnum);
 
 		if (i > 0)
 			appendStringInfoString(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-							   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+							   quote_ident_cstr(NameStr(attr->attname)));
 
 		if (tgt_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -2251,7 +2254,7 @@ get_sql_delete(Relation rel, int *pkattnums, int pknumatts, char **tgt_pkattvals
 			appendStringInfoString(&buf, " IS NULL");
 	}
 
-	return (buf.data);
+	return buf.data;
 }
 
 static char *
@@ -2289,14 +2292,16 @@ get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 	needComma = false;
 	for (i = 0; i < natts; i++)
 	{
-		if (tupdesc->attrs[i]->attisdropped)
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+		if (attr->attisdropped)
 			continue;
 
 		if (needComma)
 			appendStringInfoString(&buf, ", ");
 
 		appendStringInfo(&buf, "%s = ",
-						 quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
+						 quote_ident_cstr(NameStr(attr->attname)));
 
 		key = get_attnum_pk_pos(pkattnums, pknumatts, i);
 
@@ -2320,12 +2325,13 @@ get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 	for (i = 0; i < pknumatts; i++)
 	{
 		int			pkattnum = pkattnums[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, pkattnum);
 
 		if (i > 0)
 			appendStringInfoString(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-							   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+							   quote_ident_cstr(NameStr(attr->attname)));
 
 		val = tgt_pkattvals[i];
 
@@ -2335,7 +2341,7 @@ get_sql_update(Relation rel, int *pkattnums, int pknumatts, char **src_pkattvals
 			appendStringInfoString(&buf, " IS NULL");
 	}
 
-	return (buf.data);
+	return buf.data;
 }
 
 /*
@@ -2409,14 +2415,16 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 
 	for (i = 0; i < natts; i++)
 	{
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
 		if (i > 0)
 			appendStringInfoString(&buf, ", ");
 
-		if (tupdesc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 			appendStringInfoString(&buf, "NULL");
 		else
 			appendStringInfoString(&buf,
-								   quote_ident_cstr(NameStr(tupdesc->attrs[i]->attname)));
+								   quote_ident_cstr(NameStr(attr->attname)));
 	}
 
 	appendStringInfo(&buf, " FROM %s WHERE ", relname);
@@ -2424,12 +2432,13 @@ get_tuple_of_interest(Relation rel, int *pkattnums, int pknumatts, char **src_pk
 	for (i = 0; i < pknumatts; i++)
 	{
 		int			pkattnum = pkattnums[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, pkattnum);
 
 		if (i > 0)
 			appendStringInfoString(&buf, " AND ");
 
 		appendStringInfoString(&buf,
-							   quote_ident_cstr(NameStr(tupdesc->attrs[pkattnum]->attname)));
+							   quote_ident_cstr(NameStr(attr->attname)));
 
 		if (src_pkattvals[i] != NULL)
 			appendStringInfo(&buf, " = %s",
@@ -2495,7 +2504,7 @@ get_rel_from_relname(text *relname_text, LOCKMODE lockmode, AclMode aclmode)
 	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
 								  aclmode);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
+		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 
 	return rel;
@@ -2540,9 +2549,9 @@ getConnectionByName(const char *name)
 											   key, HASH_FIND, NULL);
 
 	if (hentry)
-		return (hentry->rconn);
+		return hentry->rconn;
 
-	return (NULL);
+	return NULL;
 }
 
 static HTAB *
@@ -2780,7 +2789,7 @@ get_connect_string(const char *servername)
 		/* Check permissions, user must have usage on the server. */
 		aclresult = pg_foreign_server_aclcheck(serverid, userid, ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, foreign_server->servername);
+			aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, foreign_server->servername);
 
 		foreach(cell, fdw->options)
 		{
@@ -2894,7 +2903,7 @@ validate_pkattnums(Relation rel,
 		for (j = 0; j < natts; j++)
 		{
 			/* dropped columns don't count */
-			if (tupdesc->attrs[j]->attisdropped)
+			if (TupleDescAttr(tupdesc, j)->attisdropped)
 				continue;
 
 			if (++lnum == pkattnum)
diff --git a/contrib/dict_int/dict_int.c b/contrib/dict_int/dict_int.c
index 55427c4bc7..56ede37089 100644
--- a/contrib/dict_int/dict_int.c
+++ b/contrib/dict_int/dict_int.c
@@ -3,7 +3,7 @@
  * dict_int.c
  *	  Text search dictionary for integers
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/dict_int/dict_int.c
@@ -42,11 +42,11 @@ dintdict_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp(defel->defname, "MAXLEN") == 0)
+		if (strcmp(defel->defname, "maxlen") == 0)
 		{
 			d->maxlen = atoi(defGetString(defel));
 		}
-		else if (pg_strcasecmp(defel->defname, "REJECTLONG") == 0)
+		else if (strcmp(defel->defname, "rejectlong") == 0)
 		{
 			d->rejectlong = defGetBoolean(defel);
 		}
diff --git a/contrib/dict_xsyn/dict_xsyn.c b/contrib/dict_xsyn/dict_xsyn.c
index fcf541ee0f..a79ece240c 100644
--- a/contrib/dict_xsyn/dict_xsyn.c
+++ b/contrib/dict_xsyn/dict_xsyn.c
@@ -3,7 +3,7 @@
  * dict_xsyn.c
  *	  Extended synonym dictionary
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/dict_xsyn/dict_xsyn.c
@@ -70,7 +70,7 @@ compare_syn(const void *a, const void *b)
 }
 
 static void
-read_dictionary(DictSyn *d, char *filename)
+read_dictionary(DictSyn *d, const char *filename)
 {
 	char	   *real_filename = get_tsearch_config_filename(filename, "rules");
 	tsearch_readline_state trst;
@@ -157,23 +157,23 @@ dxsyn_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp(defel->defname, "MATCHORIG") == 0)
+		if (strcmp(defel->defname, "matchorig") == 0)
 		{
 			d->matchorig = defGetBoolean(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "KEEPORIG") == 0)
+		else if (strcmp(defel->defname, "keeporig") == 0)
 		{
 			d->keeporig = defGetBoolean(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "MATCHSYNONYMS") == 0)
+		else if (strcmp(defel->defname, "matchsynonyms") == 0)
 		{
 			d->matchsynonyms = defGetBoolean(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "KEEPSYNONYMS") == 0)
+		else if (strcmp(defel->defname, "keepsynonyms") == 0)
 		{
 			d->keepsynonyms = defGetBoolean(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "RULES") == 0)
+		else if (strcmp(defel->defname, "rules") == 0)
 		{
 			/* we can't read the rules before parsing all options! */
 			filename = defGetString(defel);
diff --git a/contrib/file_fdw/data/list1.csv b/contrib/file_fdw/data/list1.csv
new file mode 100644
index 0000000000..203f3b2324
--- /dev/null
+++ b/contrib/file_fdw/data/list1.csv
@@ -0,0 +1,2 @@
+1,foo
+1,bar
diff --git a/contrib/file_fdw/data/list2.bad b/contrib/file_fdw/data/list2.bad
new file mode 100644
index 0000000000..00af47f5ef
--- /dev/null
+++ b/contrib/file_fdw/data/list2.bad
@@ -0,0 +1,2 @@
+2,baz
+1,qux
diff --git a/contrib/file_fdw/data/list2.csv b/contrib/file_fdw/data/list2.csv
new file mode 100644
index 0000000000..2fb133d004
--- /dev/null
+++ b/contrib/file_fdw/data/list2.csv
@@ -0,0 +1,2 @@
+2,baz
+2,qux
diff --git a/contrib/file_fdw/file_fdw.c b/contrib/file_fdw/file_fdw.c
index 2396bd442f..cf0a3629bc 100644
--- a/contrib/file_fdw/file_fdw.c
+++ b/contrib/file_fdw/file_fdw.c
@@ -3,7 +3,7 @@
  * file_fdw.c
  *		  foreign-data wrapper for server-side flat files (or programs).
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/file_fdw/file_fdw.c
@@ -430,7 +430,7 @@ get_file_fdw_attribute_options(Oid relid)
 	/* Retrieve FDW options for all user-defined attributes. */
 	for (attnum = 1; attnum <= natts; attnum++)
 	{
-		Form_pg_attribute attr = tupleDesc->attrs[attnum - 1];
+		Form_pg_attribute attr = TupleDescAttr(tupleDesc, attnum - 1);
 		List	   *options;
 		ListCell   *lc;
 
@@ -824,7 +824,7 @@ fileIsForeignScanParallelSafe(PlannerInfo *root, RelOptInfo *rel,
  *
  * Check to see if it's useful to convert only a subset of the file's columns
  * to binary.  If so, construct a list of the column names to be converted,
- * return that at *columns, and return TRUE.  (Note that it's possible to
+ * return that at *columns, and return true.  (Note that it's possible to
  * determine that no columns need be converted, for instance with a COUNT(*)
  * query.  So we can't use returning a NIL list to indicate failure.)
  */
@@ -898,7 +898,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,
 		/* Get user attributes. */
 		if (attnum > 0)
 		{
-			Form_pg_attribute attr = tupleDesc->attrs[attnum - 1];
+			Form_pg_attribute attr = TupleDescAttr(tupleDesc, attnum - 1);
 			char	   *attname = NameStr(attr->attname);
 
 			/* Skip dropped attributes (probably shouldn't see any here). */
@@ -912,7 +912,7 @@ check_selective_binary_conversion(RelOptInfo *baserel,
 	numattrs = 0;
 	for (i = 0; i < tupleDesc->natts; i++)
 	{
-		Form_pg_attribute attr = tupleDesc->attrs[i];
+		Form_pg_attribute attr = TupleDescAttr(tupleDesc, i);
 
 		if (attr->attisdropped)
 			continue;
diff --git a/contrib/file_fdw/input/file_fdw.source b/contrib/file_fdw/input/file_fdw.source
index 685561fc2a..88cb5f294c 100644
--- a/contrib/file_fdw/input/file_fdw.source
+++ b/contrib/file_fdw/input/file_fdw.source
@@ -162,6 +162,28 @@ SELECT tableoid::regclass, * FROM agg FOR UPDATE;
 ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
 DROP TABLE agg;
 
+-- declarative partitioning tests
+SET ROLE regress_file_fdw_superuser;
+CREATE TABLE pt (a int, b text) partition by list (a);
+CREATE FOREIGN TABLE p1 partition of pt for values in (1) SERVER file_server
+OPTIONS (format 'csv', filename '@abs_srcdir@/data/list1.csv', delimiter ',');
+CREATE TABLE p2 partition of pt for values in (2);
+SELECT tableoid::regclass, * FROM pt;
+SELECT tableoid::regclass, * FROM p1;
+SELECT tableoid::regclass, * FROM p2;
+COPY pt FROM '@abs_srcdir@/data/list2.bad' with (format 'csv', delimiter ','); -- ERROR
+COPY pt FROM '@abs_srcdir@/data/list2.csv' with (format 'csv', delimiter ',');
+SELECT tableoid::regclass, * FROM pt;
+SELECT tableoid::regclass, * FROM p1;
+SELECT tableoid::regclass, * FROM p2;
+INSERT INTO pt VALUES (1, 'xyzzy'); -- ERROR
+INSERT INTO pt VALUES (2, 'xyzzy');
+UPDATE pt set a = 1 where a = 2; -- ERROR
+SELECT tableoid::regclass, * FROM pt;
+SELECT tableoid::regclass, * FROM p1;
+SELECT tableoid::regclass, * FROM p2;
+DROP TABLE pt;
+
 -- privilege tests
 SET ROLE regress_file_fdw_superuser;
 SELECT * FROM agg_text ORDER BY a;
diff --git a/contrib/file_fdw/output/file_fdw.source b/contrib/file_fdw/output/file_fdw.source
index 01e2690a82..b92392fd25 100644
--- a/contrib/file_fdw/output/file_fdw.source
+++ b/contrib/file_fdw/output/file_fdw.source
@@ -289,6 +289,89 @@ SELECT tableoid::regclass, * FROM agg FOR UPDATE;
 
 ALTER FOREIGN TABLE agg_csv NO INHERIT agg;
 DROP TABLE agg;
+-- declarative partitioning tests
+SET ROLE regress_file_fdw_superuser;
+CREATE TABLE pt (a int, b text) partition by list (a);
+CREATE FOREIGN TABLE p1 partition of pt for values in (1) SERVER file_server
+OPTIONS (format 'csv', filename '@abs_srcdir@/data/list1.csv', delimiter ',');
+CREATE TABLE p2 partition of pt for values in (2);
+SELECT tableoid::regclass, * FROM pt;
+ tableoid | a |  b  
+----------+---+-----
+ p1       | 1 | foo
+ p1       | 1 | bar
+(2 rows)
+
+SELECT tableoid::regclass, * FROM p1;
+ tableoid | a |  b  
+----------+---+-----
+ p1       | 1 | foo
+ p1       | 1 | bar
+(2 rows)
+
+SELECT tableoid::regclass, * FROM p2;
+ tableoid | a | b 
+----------+---+---
+(0 rows)
+
+COPY pt FROM '@abs_srcdir@/data/list2.bad' with (format 'csv', delimiter ','); -- ERROR
+ERROR:  cannot route inserted tuples to a foreign table
+CONTEXT:  COPY pt, line 2: "1,qux"
+COPY pt FROM '@abs_srcdir@/data/list2.csv' with (format 'csv', delimiter ',');
+SELECT tableoid::regclass, * FROM pt;
+ tableoid | a |  b  
+----------+---+-----
+ p1       | 1 | foo
+ p1       | 1 | bar
+ p2       | 2 | baz
+ p2       | 2 | qux
+(4 rows)
+
+SELECT tableoid::regclass, * FROM p1;
+ tableoid | a |  b  
+----------+---+-----
+ p1       | 1 | foo
+ p1       | 1 | bar
+(2 rows)
+
+SELECT tableoid::regclass, * FROM p2;
+ tableoid | a |  b  
+----------+---+-----
+ p2       | 2 | baz
+ p2       | 2 | qux
+(2 rows)
+
+INSERT INTO pt VALUES (1, 'xyzzy'); -- ERROR
+ERROR:  cannot route inserted tuples to a foreign table
+INSERT INTO pt VALUES (2, 'xyzzy');
+UPDATE pt set a = 1 where a = 2; -- ERROR
+ERROR:  cannot route inserted tuples to a foreign table
+SELECT tableoid::regclass, * FROM pt;
+ tableoid | a |   b   
+----------+---+-------
+ p1       | 1 | foo
+ p1       | 1 | bar
+ p2       | 2 | baz
+ p2       | 2 | qux
+ p2       | 2 | xyzzy
+(5 rows)
+
+SELECT tableoid::regclass, * FROM p1;
+ tableoid | a |  b  
+----------+---+-----
+ p1       | 1 | foo
+ p1       | 1 | bar
+(2 rows)
+
+SELECT tableoid::regclass, * FROM p2;
+ tableoid | a |   b   
+----------+---+-------
+ p2       | 2 | baz
+ p2       | 2 | qux
+ p2       | 2 | xyzzy
+(3 rows)
+
+DROP TABLE pt;
 -- privilege tests
 SET ROLE regress_file_fdw_superuser;
 SELECT * FROM agg_text ORDER BY a;
@@ -312,7 +395,7 @@ SELECT * FROM agg_text ORDER BY a;
 
 SET ROLE regress_no_priv_user;
 SELECT * FROM agg_text ORDER BY a;   -- ERROR
-ERROR:  permission denied for relation agg_text
+ERROR:  permission denied for foreign table agg_text
 SET ROLE regress_file_fdw_user;
 \t on
 EXPLAIN (VERBOSE, COSTS FALSE) SELECT * FROM agg_text WHERE a > 0;
diff --git a/contrib/fuzzystrmatch/.gitignore b/contrib/fuzzystrmatch/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/fuzzystrmatch/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/fuzzystrmatch/Makefile b/contrib/fuzzystrmatch/Makefile
index 51e215a919..bd6f5e50d1 100644
--- a/contrib/fuzzystrmatch/Makefile
+++ b/contrib/fuzzystrmatch/Makefile
@@ -8,6 +8,8 @@ DATA = fuzzystrmatch--1.1.sql fuzzystrmatch--1.0--1.1.sql \
 	fuzzystrmatch--unpackaged--1.0.sql
 PGFILEDESC = "fuzzystrmatch - similarities and distance between strings"
 
+REGRESS = fuzzystrmatch
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/fuzzystrmatch/dmetaphone.c b/contrib/fuzzystrmatch/dmetaphone.c
index 918ee0d90e..16e4c66167 100644
--- a/contrib/fuzzystrmatch/dmetaphone.c
+++ b/contrib/fuzzystrmatch/dmetaphone.c
@@ -232,7 +232,7 @@ metastring;
  */
 
 static metastring *
-NewMetaString(char *init_str)
+NewMetaString(const char *init_str)
 {
 	metastring *s;
 	char		empty_string[] = "";
@@ -375,7 +375,7 @@ StringAt(metastring *s, int start, int length,...)
 
 
 static void
-MetaphAdd(metastring *s, char *new_str)
+MetaphAdd(metastring *s, const char *new_str)
 {
 	int			add_length;
 
diff --git a/contrib/fuzzystrmatch/expected/fuzzystrmatch.out b/contrib/fuzzystrmatch/expected/fuzzystrmatch.out
new file mode 100644
index 0000000000..493c95cdfa
--- /dev/null
+++ b/contrib/fuzzystrmatch/expected/fuzzystrmatch.out
@@ -0,0 +1,67 @@
+CREATE EXTENSION fuzzystrmatch;
+SELECT soundex('hello world!');
+ soundex 
+---------
+ H464
+(1 row)
+
+SELECT soundex('Anne'), soundex('Ann'), difference('Anne', 'Ann');
+ soundex | soundex | difference 
+---------+---------+------------
+ A500    | A500    |          4
+(1 row)
+
+SELECT soundex('Anne'), soundex('Andrew'), difference('Anne', 'Andrew');
+ soundex | soundex | difference 
+---------+---------+------------
+ A500    | A536    |          2
+(1 row)
+
+SELECT soundex('Anne'), soundex('Margaret'), difference('Anne', 'Margaret');
+ soundex | soundex | difference 
+---------+---------+------------
+ A500    | M626    |          0
+(1 row)
+
+SELECT levenshtein('GUMBO', 'GAMBOL');
+ levenshtein 
+-------------
+           2
+(1 row)
+
+SELECT levenshtein('GUMBO', 'GAMBOL', 2, 1, 1);
+ levenshtein 
+-------------
+           3
+(1 row)
+
+SELECT levenshtein_less_equal('extensive', 'exhaustive', 2);
+ levenshtein_less_equal 
+------------------------
+                      3
+(1 row)
+
+SELECT levenshtein_less_equal('extensive', 'exhaustive', 4);
+ levenshtein_less_equal 
+------------------------
+                      4
+(1 row)
+
+SELECT metaphone('GUMBO', 4);
+ metaphone 
+-----------
+ KM
+(1 row)
+
+SELECT dmetaphone('gumbo');
+ dmetaphone 
+------------
+ KMP
+(1 row)
+
+SELECT dmetaphone_alt('gumbo');
+ dmetaphone_alt 
+----------------
+ KMP
+(1 row)
+
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
index ce58a6a7fc..05774658dc 100644
--- a/contrib/fuzzystrmatch/fuzzystrmatch.c
+++ b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -6,7 +6,7 @@
  * Joe Conway <mail@joeconway.com>
  *
  * contrib/fuzzystrmatch/fuzzystrmatch.c
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * metaphone()
@@ -87,25 +87,13 @@ soundex_code(char letter)
 		phoned_word		--	The final phonized word.  (We'll allocate the
 							memory.)
 	Output
-		error	--	A simple error flag, returns TRUE or FALSE
+		error	--	A simple error flag, returns true or false
 
 	NOTES:	ALL non-alpha characters are ignored, this includes whitespace,
 	although non-alpha characters will break up phonemes.
 ****************************************************************************/
 
 
-/**************************************************************************
-	my constants -- constants I like
-
-	Probably redundant.
-
-***************************************************************************/
-
-#define META_ERROR			FALSE
-#define META_SUCCESS		TRUE
-#define META_FAILURE		FALSE
-
-
 /*	I add modifications to the traditional metaphone algorithm that you
 	might find in books.  Define this if you want metaphone to behave
 	traditionally */
@@ -116,7 +104,7 @@ soundex_code(char letter)
 #define  TH		'0'
 
 static char Lookahead(char *word, int how_far);
-static int	_metaphone(char *word, int max_phonemes, char **phoned_word);
+static void _metaphone(char *word, int max_phonemes, char **phoned_word);
 
 /* Metachar.h ... little bits about characters for metaphone */
 
@@ -272,7 +260,6 @@ metaphone(PG_FUNCTION_ARGS)
 	size_t		str_i_len = strlen(str_i);
 	int			reqlen;
 	char	   *metaph;
-	int			retval;
 
 	/* return an empty string if we receive one */
 	if (!(str_i_len > 0))
@@ -296,17 +283,8 @@ metaphone(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_ZERO_LENGTH_CHARACTER_STRING),
 				 errmsg("output cannot be empty string")));
 
-
-	retval = _metaphone(str_i, reqlen, &metaph);
-	if (retval == META_SUCCESS)
-		PG_RETURN_TEXT_P(cstring_to_text(metaph));
-	else
-	{
-		/* internal error */
-		elog(ERROR, "metaphone: failure");
-		/* keep the compiler quiet */
-		PG_RETURN_NULL();
-	}
+	_metaphone(str_i, reqlen, &metaph);
+	PG_RETURN_TEXT_P(cstring_to_text(metaph));
 }
 
 
@@ -362,7 +340,7 @@ Lookahead(char *word, int how_far)
 #define Isbreak(c)	(!isalpha((unsigned char) (c)))
 
 
-static int
+static void
 _metaphone(char *word,			/* IN */
 		   int max_phonemes,
 		   char **phoned_word)	/* OUT */
@@ -404,7 +382,7 @@ _metaphone(char *word,			/* IN */
 		if (Curr_Letter == '\0')
 		{
 			End_Phoned_Word;
-			return META_SUCCESS;	/* For testing */
+			return;
 		}
 	}
 
@@ -721,7 +699,7 @@ _metaphone(char *word,			/* IN */
 
 	End_Phoned_Word;
 
-	return (META_SUCCESS);
+	return;
 }								/* END metaphone */
 
 
diff --git a/contrib/fuzzystrmatch/sql/fuzzystrmatch.sql b/contrib/fuzzystrmatch/sql/fuzzystrmatch.sql
new file mode 100644
index 0000000000..f05dc28ffb
--- /dev/null
+++ b/contrib/fuzzystrmatch/sql/fuzzystrmatch.sql
@@ -0,0 +1,21 @@
+CREATE EXTENSION fuzzystrmatch;
+
+
+SELECT soundex('hello world!');
+
+SELECT soundex('Anne'), soundex('Ann'), difference('Anne', 'Ann');
+SELECT soundex('Anne'), soundex('Andrew'), difference('Anne', 'Andrew');
+SELECT soundex('Anne'), soundex('Margaret'), difference('Anne', 'Margaret');
+
+
+SELECT levenshtein('GUMBO', 'GAMBOL');
+SELECT levenshtein('GUMBO', 'GAMBOL', 2, 1, 1);
+SELECT levenshtein_less_equal('extensive', 'exhaustive', 2);
+SELECT levenshtein_less_equal('extensive', 'exhaustive', 4);
+
+
+SELECT metaphone('GUMBO', 4);
+
+
+SELECT dmetaphone('gumbo');
+SELECT dmetaphone_alt('gumbo');
diff --git a/contrib/hstore/CMakeLists.txt b/contrib/hstore/CMakeLists.txt
index b75ff4d3ad..797cfb6a2a 100644
--- a/contrib/hstore/CMakeLists.txt
+++ b/contrib/hstore/CMakeLists.txt
@@ -31,6 +31,7 @@ install(FILES
 	${extension_name}--1.1--1.2.sql
 	${extension_name}--1.2--1.3.sql
 	${extension_name}--1.3--1.4.sql
+	${extension_name}--1.4--1.5.sql
 	${extension_name}--unpackaged--1.0.sql
 	DESTINATION ${PGSHAREDIR}/extension)
 
diff --git a/contrib/hstore/Makefile b/contrib/hstore/Makefile
index 311cc099e5..ab7fef3979 100644
--- a/contrib/hstore/Makefile
+++ b/contrib/hstore/Makefile
@@ -5,7 +5,8 @@ OBJS = hstore_io.o hstore_op.o hstore_gist.o hstore_gin.o hstore_compat.o \
 	$(WIN32RES)
 
 EXTENSION = hstore
-DATA = hstore--1.4.sql hstore--1.3--1.4.sql hstore--1.2--1.3.sql \
+DATA = hstore--1.4.sql hstore--1.4--1.5.sql \
+	hstore--1.3--1.4.sql hstore--1.2--1.3.sql \
 	hstore--1.1--1.2.sql hstore--1.0--1.1.sql \
 	hstore--unpackaged--1.0.sql
 PGFILEDESC = "hstore - key/value pair data type"
diff --git a/contrib/hstore/hstore--1.4--1.5.sql b/contrib/hstore/hstore--1.4--1.5.sql
new file mode 100644
index 0000000000..92c1832dce
--- /dev/null
+++ b/contrib/hstore/hstore--1.4--1.5.sql
@@ -0,0 +1,14 @@
+/* contrib/hstore/hstore--1.4--1.5.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION hstore UPDATE TO '1.5'" to load this file. \quit
+
+ALTER OPERATOR #<=# (hstore, hstore) SET (
+       RESTRICT = scalarlesel,
+       JOIN = scalarlejoinsel
+);
+
+ALTER OPERATOR #>=# (hstore, hstore) SET (
+       RESTRICT = scalargesel,
+       JOIN = scalargejoinsel
+);
diff --git a/contrib/hstore/hstore.control b/contrib/hstore/hstore.control
index f99a937acc..8a719475b8 100644
--- a/contrib/hstore/hstore.control
+++ b/contrib/hstore/hstore.control
@@ -1,5 +1,5 @@
 # hstore extension
 comment = 'data type for storing sets of (key, value) pairs'
-default_version = '1.4'
+default_version = '1.5'
 module_pathname = '$libdir/hstore'
 relocatable = true
diff --git a/contrib/hstore/hstore.h b/contrib/hstore/hstore.h
index c4862a82e1..bf4a565ed9 100644
--- a/contrib/hstore/hstore.h
+++ b/contrib/hstore/hstore.h
@@ -151,7 +151,7 @@ extern HStore *hstoreUpgrade(Datum orig);
 
 #define DatumGetHStoreP(d) hstoreUpgrade(d)
 
-#define PG_GETARG_HS(x) DatumGetHStoreP(PG_GETARG_DATUM(x))
+#define PG_GETARG_HSTORE_P(x) DatumGetHStoreP(PG_GETARG_DATUM(x))
 
 
 /*
diff --git a/contrib/hstore/hstore_gin.c b/contrib/hstore/hstore_gin.c
index d98fb38458..4c3a422643 100644
--- a/contrib/hstore/hstore_gin.c
+++ b/contrib/hstore/hstore_gin.c
@@ -43,7 +43,7 @@ makeitem(char *str, int len, char flag)
 Datum
 gin_extract_hstore(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
 	Datum	   *entries = NULL;
 	HEntry	   *hsent = ARRPTR(hs);
@@ -155,7 +155,7 @@ gin_consistent_hstore(PG_FUNCTION_ARGS)
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
 
-	/* HStore	   *query = PG_GETARG_HS(2); */
+	/* HStore	   *query = PG_GETARG_HSTORE_P(2); */
 	int32		nkeys = PG_GETARG_INT32(3);
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
diff --git a/contrib/hstore/hstore_gist.c b/contrib/hstore/hstore_gist.c
index f8f5934e40..6d24d2f468 100644
--- a/contrib/hstore/hstore_gist.c
+++ b/contrib/hstore/hstore_gist.c
@@ -144,7 +144,7 @@ ghstore_compress(PG_FUNCTION_ARGS)
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
 					  entry->offset,
-					  FALSE);
+					  false);
 	}
 	else if (!ISALLTRUE(DatumGetPointer(entry->key)))
 	{
@@ -166,7 +166,7 @@ ghstore_compress(PG_FUNCTION_ARGS)
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
 					  entry->offset,
-					  FALSE);
+					  false);
 	}
 
 	PG_RETURN_POINTER(retval);
@@ -518,7 +518,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 	if (strategy == HStoreContainsStrategyNumber ||
 		strategy == HStoreOldContainsStrategyNumber)
 	{
-		HStore	   *query = PG_GETARG_HS(1);
+		HStore	   *query = PG_GETARG_HSTORE_P(1);
 		HEntry	   *qe = ARRPTR(query);
 		char	   *qv = STRPTR(query);
 		int			count = HS_COUNT(query);
@@ -570,7 +570,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 				continue;
 			crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
 			if (!(GETBIT(sign, HASHVAL(crc))))
-				res = FALSE;
+				res = false;
 		}
 	}
 	else if (strategy == HStoreExistsAnyStrategyNumber)
@@ -585,7 +585,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 						  TEXTOID, -1, false, 'i',
 						  &key_datums, &key_nulls, &key_count);
 
-		res = FALSE;
+		res = false;
 
 		for (i = 0; !res && i < key_count; ++i)
 		{
@@ -595,7 +595,7 @@ ghstore_consistent(PG_FUNCTION_ARGS)
 				continue;
 			crc = crc32_sz(VARDATA(key_datums[i]), VARSIZE(key_datums[i]) - VARHDRSZ);
 			if (GETBIT(sign, HASHVAL(crc)))
-				res = TRUE;
+				res = true;
 		}
 	}
 	else
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
index e03005c923..7a741a779c 100644
--- a/contrib/hstore/hstore_io.c
+++ b/contrib/hstore/hstore_io.c
@@ -340,7 +340,8 @@ hstoreUniquePairs(Pairs *a, int32 l, int32 *buflen)
 		{
 			*buflen += res->keylen + ((res->isnull) ? 0 : res->vallen);
 			res++;
-			memcpy(res, ptr, sizeof(Pairs));
+			if (res != ptr)
+				memcpy(res, ptr, sizeof(Pairs));
 		}
 
 		ptr++;
@@ -752,6 +753,8 @@ typedef struct RecordIOData
 {
 	Oid			record_type;
 	int32		record_typmod;
+	/* this field is used only if target type is domain over composite: */
+	void	   *domain_info;	/* opaque cache for domain checks */
 	int			ncolumns;
 	ColumnIOData columns[FLEXIBLE_ARRAY_MEMBER];
 } RecordIOData;
@@ -780,9 +783,11 @@ hstore_from_record(PG_FUNCTION_ARGS)
 		Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
 
 		/*
-		 * have no tuple to look at, so the only source of type info is the
-		 * argtype. The lookup_rowtype_tupdesc call below will error out if we
-		 * don't have a known composite type oid here.
+		 * We have no tuple to look at, so the only source of type info is the
+		 * argtype --- which might be domain over composite, but we don't care
+		 * here, since we have no need to be concerned about domain
+		 * constraints.  The lookup_rowtype_tupdesc_domain call below will
+		 * error out if we don't have a known composite type oid here.
 		 */
 		tupType = argtype;
 		tupTypmod = -1;
@@ -793,12 +798,15 @@ hstore_from_record(PG_FUNCTION_ARGS)
 	{
 		rec = PG_GETARG_HEAPTUPLEHEADER(0);
 
-		/* Extract type info from the tuple itself */
+		/*
+		 * Extract type info from the tuple itself -- this will work even for
+		 * anonymous record types.
+		 */
 		tupType = HeapTupleHeaderGetTypeId(rec);
 		tupTypmod = HeapTupleHeaderGetTypMod(rec);
 	}
 
-	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+	tupdesc = lookup_rowtype_tupdesc_domain(tupType, tupTypmod, false);
 	ncolumns = tupdesc->natts;
 
 	/*
@@ -855,15 +863,16 @@ hstore_from_record(PG_FUNCTION_ARGS)
 	for (i = 0, j = 0; i < ncolumns; ++i)
 	{
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+		Oid			column_type = att->atttypid;
 		char	   *value;
 
 		/* Ignore dropped columns in datatype */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
-		pairs[j].key = NameStr(tupdesc->attrs[i]->attname);
-		pairs[j].keylen = hstoreCheckKeyLen(strlen(NameStr(tupdesc->attrs[i]->attname)));
+		pairs[j].key = NameStr(att->attname);
+		pairs[j].keylen = hstoreCheckKeyLen(strlen(NameStr(att->attname)));
 
 		if (!nulls || nulls[i])
 		{
@@ -942,9 +951,9 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 		rec = NULL;
 
 		/*
-		 * have no tuple to look at, so the only source of type info is the
-		 * argtype. The lookup_rowtype_tupdesc call below will error out if we
-		 * don't have a known composite type oid here.
+		 * We have no tuple to look at, so the only source of type info is the
+		 * argtype.  The lookup_rowtype_tupdesc_domain call below will error
+		 * out if we don't have a known composite type oid here.
 		 */
 		tupType = argtype;
 		tupTypmod = -1;
@@ -956,12 +965,15 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 		if (PG_ARGISNULL(1))
 			PG_RETURN_POINTER(rec);
 
-		/* Extract type info from the tuple itself */
+		/*
+		 * Extract type info from the tuple itself -- this will work even for
+		 * anonymous record types.
+		 */
 		tupType = HeapTupleHeaderGetTypeId(rec);
 		tupTypmod = HeapTupleHeaderGetTypMod(rec);
 	}
 
-	hs = PG_GETARG_HS(1);
+	hs = PG_GETARG_HSTORE_P(1);
 	entries = ARRPTR(hs);
 	ptr = STRPTR(hs);
 
@@ -974,7 +986,11 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 	if (HS_COUNT(hs) == 0 && rec)
 		PG_RETURN_POINTER(rec);
 
-	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+	/*
+	 * Lookup the input record's tupdesc.  For the moment, we don't worry
+	 * about whether it is a domain over composite.
+	 */
+	tupdesc = lookup_rowtype_tupdesc_domain(tupType, tupTypmod, false);
 	ncolumns = tupdesc->natts;
 
 	if (rec)
@@ -1001,6 +1017,7 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 		my_extra = (RecordIOData *) fcinfo->flinfo->fn_extra;
 		my_extra->record_type = InvalidOid;
 		my_extra->record_typmod = 0;
+		my_extra->domain_info = NULL;
 	}
 
 	if (my_extra->record_type != tupType ||
@@ -1034,21 +1051,22 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 	for (i = 0; i < ncolumns; ++i)
 	{
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+		Oid			column_type = att->atttypid;
 		char	   *value;
 		int			idx;
 		int			vallen;
 
 		/* Ignore dropped columns in datatype */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 		{
 			nulls[i] = true;
 			continue;
 		}
 
 		idx = hstoreFindKey(hs, 0,
-							NameStr(tupdesc->attrs[i]->attname),
-							strlen(NameStr(tupdesc->attrs[i]->attname)));
+							NameStr(att->attname),
+							strlen(NameStr(att->attname)));
 
 		/*
 		 * we can't just skip here if the key wasn't found since we might have
@@ -1082,7 +1100,7 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 			 */
 			values[i] = InputFunctionCall(&column_info->proc, NULL,
 										  column_info->typioparam,
-										  tupdesc->attrs[i]->atttypmod);
+										  att->atttypmod);
 			nulls[i] = true;
 		}
 		else
@@ -1094,13 +1112,24 @@ hstore_populate_record(PG_FUNCTION_ARGS)
 
 			values[i] = InputFunctionCall(&column_info->proc, value,
 										  column_info->typioparam,
-										  tupdesc->attrs[i]->atttypmod);
+										  att->atttypmod);
 			nulls[i] = false;
 		}
 	}
 
 	rettuple = heap_form_tuple(tupdesc, values, nulls);
 
+	/*
+	 * If the target type is domain over composite, all we know at this point
+	 * is that we've made a valid value of the base composite type.  Must
+	 * check domain constraints before deciding we're done.
+	 */
+	if (argtype != tupdesc->tdtypeid)
+		domain_check(HeapTupleGetDatum(rettuple), false,
+					 argtype,
+					 &my_extra->domain_info,
+					 fcinfo->flinfo->fn_mcxt);
+
 	ReleaseTupleDesc(tupdesc);
 
 	PG_RETURN_DATUM(HeapTupleGetDatum(rettuple));
@@ -1125,7 +1154,7 @@ PG_FUNCTION_INFO_V1(hstore_out);
 Datum
 hstore_out(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			buflen,
 				i;
 	int			count = HS_COUNT(in);
@@ -1196,7 +1225,7 @@ PG_FUNCTION_INFO_V1(hstore_send);
 Datum
 hstore_send(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
@@ -1205,23 +1234,23 @@ hstore_send(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 
-	pq_sendint(&buf, count, 4);
+	pq_sendint32(&buf, count);
 
 	for (i = 0; i < count; i++)
 	{
 		int32		keylen = HSTORE_KEYLEN(entries, i);
 
-		pq_sendint(&buf, keylen, 4);
+		pq_sendint32(&buf, keylen);
 		pq_sendtext(&buf, HSTORE_KEY(entries, base, i), keylen);
 		if (HSTORE_VALISNULL(entries, i))
 		{
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1);
 		}
 		else
 		{
 			int32		vallen = HSTORE_VALLEN(entries, i);
 
-			pq_sendint(&buf, vallen, 4);
+			pq_sendint32(&buf, vallen);
 			pq_sendtext(&buf, HSTORE_VAL(entries, base, i), vallen);
 		}
 	}
@@ -1242,7 +1271,7 @@ PG_FUNCTION_INFO_V1(hstore_to_json_loose);
 Datum
 hstore_to_json_loose(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
@@ -1297,7 +1326,7 @@ PG_FUNCTION_INFO_V1(hstore_to_json);
 Datum
 hstore_to_json(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
@@ -1342,7 +1371,7 @@ PG_FUNCTION_INFO_V1(hstore_to_jsonb);
 Datum
 hstore_to_jsonb(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
@@ -1385,7 +1414,7 @@ PG_FUNCTION_INFO_V1(hstore_to_jsonb_loose);
 Datum
 hstore_to_jsonb_loose(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
diff --git a/contrib/hstore/hstore_op.c b/contrib/hstore/hstore_op.c
index 612be23a74..8f9277f8da 100644
--- a/contrib/hstore/hstore_op.c
+++ b/contrib/hstore/hstore_op.c
@@ -130,7 +130,7 @@ PG_FUNCTION_INFO_V1(hstore_fetchval);
 Datum
 hstore_fetchval(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	HEntry	   *entries = ARRPTR(hs);
 	text	   *out;
@@ -151,7 +151,7 @@ PG_FUNCTION_INFO_V1(hstore_exists);
 Datum
 hstore_exists(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	int			idx = hstoreFindKey(hs, NULL,
 									VARDATA_ANY(key), VARSIZE_ANY_EXHDR(key));
@@ -164,7 +164,7 @@ PG_FUNCTION_INFO_V1(hstore_exists_any);
 Datum
 hstore_exists_any(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
 	int			nkeys;
 	Pairs	   *key_pairs = hstoreArrayToPairs(keys, &nkeys);
@@ -198,7 +198,7 @@ PG_FUNCTION_INFO_V1(hstore_exists_all);
 Datum
 hstore_exists_all(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
 	int			nkeys;
 	Pairs	   *key_pairs = hstoreArrayToPairs(keys, &nkeys);
@@ -232,7 +232,7 @@ PG_FUNCTION_INFO_V1(hstore_defined);
 Datum
 hstore_defined(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	HEntry	   *entries = ARRPTR(hs);
 	int			idx = hstoreFindKey(hs, NULL,
@@ -247,7 +247,7 @@ PG_FUNCTION_INFO_V1(hstore_delete);
 Datum
 hstore_delete(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	char	   *keyptr = VARDATA_ANY(key);
 	int			keylen = VARSIZE_ANY_EXHDR(key);
@@ -294,7 +294,7 @@ PG_FUNCTION_INFO_V1(hstore_delete_array);
 Datum
 hstore_delete_array(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	HStore	   *out = palloc(VARSIZE(hs));
 	int			hs_count = HS_COUNT(hs);
 	char	   *ps,
@@ -373,8 +373,8 @@ PG_FUNCTION_INFO_V1(hstore_delete_hstore);
 Datum
 hstore_delete_hstore(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
-	HStore	   *hs2 = PG_GETARG_HS(1);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
+	HStore	   *hs2 = PG_GETARG_HSTORE_P(1);
 	HStore	   *out = palloc(VARSIZE(hs));
 	int			hs_count = HS_COUNT(hs);
 	int			hs2_count = HS_COUNT(hs2);
@@ -473,8 +473,8 @@ PG_FUNCTION_INFO_V1(hstore_concat);
 Datum
 hstore_concat(PG_FUNCTION_ARGS)
 {
-	HStore	   *s1 = PG_GETARG_HS(0);
-	HStore	   *s2 = PG_GETARG_HS(1);
+	HStore	   *s1 = PG_GETARG_HSTORE_P(0);
+	HStore	   *s2 = PG_GETARG_HSTORE_P(1);
 	HStore	   *out = palloc(VARSIZE(s1) + VARSIZE(s2));
 	char	   *ps1,
 			   *ps2,
@@ -571,7 +571,7 @@ PG_FUNCTION_INFO_V1(hstore_slice_to_array);
 Datum
 hstore_slice_to_array(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	HEntry	   *entries = ARRPTR(hs);
 	char	   *ptr = STRPTR(hs);
 	ArrayType  *key_array = PG_GETARG_ARRAYTYPE_P(1);
@@ -634,7 +634,7 @@ PG_FUNCTION_INFO_V1(hstore_slice_to_hstore);
 Datum
 hstore_slice_to_hstore(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	HEntry	   *entries = ARRPTR(hs);
 	char	   *ptr = STRPTR(hs);
 	ArrayType  *key_array = PG_GETARG_ARRAYTYPE_P(1);
@@ -696,7 +696,7 @@ PG_FUNCTION_INFO_V1(hstore_akeys);
 Datum
 hstore_akeys(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	Datum	   *d;
 	ArrayType  *a;
 	HEntry	   *entries = ARRPTR(hs);
@@ -731,7 +731,7 @@ PG_FUNCTION_INFO_V1(hstore_avals);
 Datum
 hstore_avals(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	Datum	   *d;
 	bool	   *nulls;
 	ArrayType  *a;
@@ -827,7 +827,7 @@ PG_FUNCTION_INFO_V1(hstore_to_array);
 Datum
 hstore_to_array(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	ArrayType  *out = hstore_to_array_internal(hs, 1);
 
 	PG_RETURN_POINTER(out);
@@ -837,7 +837,7 @@ PG_FUNCTION_INFO_V1(hstore_to_matrix);
 Datum
 hstore_to_matrix(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	ArrayType  *out = hstore_to_array_internal(hs, 2);
 
 	PG_RETURN_POINTER(out);
@@ -891,7 +891,7 @@ hstore_skeys(PG_FUNCTION_ARGS)
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		hs = PG_GETARG_HS(0);
+		hs = PG_GETARG_HSTORE_P(0);
 		funcctx = SRF_FIRSTCALL_INIT();
 		setup_firstcall(funcctx, hs, NULL);
 	}
@@ -925,7 +925,7 @@ hstore_svals(PG_FUNCTION_ARGS)
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		hs = PG_GETARG_HS(0);
+		hs = PG_GETARG_HSTORE_P(0);
 		funcctx = SRF_FIRSTCALL_INIT();
 		setup_firstcall(funcctx, hs, NULL);
 	}
@@ -967,8 +967,8 @@ PG_FUNCTION_INFO_V1(hstore_contains);
 Datum
 hstore_contains(PG_FUNCTION_ARGS)
 {
-	HStore	   *val = PG_GETARG_HS(0);
-	HStore	   *tmpl = PG_GETARG_HS(1);
+	HStore	   *val = PG_GETARG_HSTORE_P(0);
+	HStore	   *tmpl = PG_GETARG_HSTORE_P(1);
 	bool		res = true;
 	HEntry	   *te = ARRPTR(tmpl);
 	char	   *tstr = STRPTR(tmpl);
@@ -1032,7 +1032,7 @@ hstore_each(PG_FUNCTION_ARGS)
 
 	if (SRF_IS_FIRSTCALL())
 	{
-		hs = PG_GETARG_HS(0);
+		hs = PG_GETARG_HSTORE_P(0);
 		funcctx = SRF_FIRSTCALL_INIT();
 		setup_firstcall(funcctx, hs, fcinfo);
 	}
@@ -1087,8 +1087,8 @@ PG_FUNCTION_INFO_V1(hstore_cmp);
 Datum
 hstore_cmp(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs1 = PG_GETARG_HS(0);
-	HStore	   *hs2 = PG_GETARG_HS(1);
+	HStore	   *hs1 = PG_GETARG_HSTORE_P(0);
+	HStore	   *hs2 = PG_GETARG_HSTORE_P(1);
 	int			hcount1 = HS_COUNT(hs1);
 	int			hcount2 = HS_COUNT(hs2);
 	int			res = 0;
@@ -1235,7 +1235,7 @@ PG_FUNCTION_INFO_V1(hstore_hash);
 Datum
 hstore_hash(PG_FUNCTION_ARGS)
 {
-	HStore	   *hs = PG_GETARG_HS(0);
+	HStore	   *hs = PG_GETARG_HSTORE_P(0);
 	Datum		hval = hash_any((unsigned char *) VARDATA(hs),
 								VARSIZE(hs) - VARHDRSZ);
 
diff --git a/contrib/hstore_plperl/hstore_plperl.c b/contrib/hstore_plperl/hstore_plperl.c
index cc46a525f6..6bc3bb37fc 100644
--- a/contrib/hstore_plperl/hstore_plperl.c
+++ b/contrib/hstore_plperl/hstore_plperl.c
@@ -68,7 +68,7 @@ Datum
 hstore_to_plperl(PG_FUNCTION_ARGS)
 {
 	dTHX;
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
diff --git a/contrib/hstore_plpython/expected/hstore_plpython.out b/contrib/hstore_plpython/expected/hstore_plpython.out
index df49cd5f37..1ab5feea93 100644
--- a/contrib/hstore_plpython/expected/hstore_plpython.out
+++ b/contrib/hstore_plpython/expected/hstore_plpython.out
@@ -68,12 +68,30 @@ AS $$
 val = [{'a': 1, 'b': 'boo', 'c': None}, {'d': 2}]
 return val
 $$;
- SELECT test2arr();
+SELECT test2arr();
                            test2arr                           
 --------------------------------------------------------------
  {"\"a\"=>\"1\", \"b\"=>\"boo\", \"c\"=>NULL","\"d\"=>\"2\""}
 (1 row)
 
+-- test python -> domain over hstore
+CREATE DOMAIN hstore_foo AS hstore CHECK(VALUE ? 'foo');
+CREATE FUNCTION test2dom(fn text) RETURNS hstore_foo
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+return {'a': 1, fn: 'boo', 'c': None}
+$$;
+SELECT test2dom('foo');
+             test2dom              
+-----------------------------------
+ "a"=>"1", "c"=>NULL, "foo"=>"boo"
+(1 row)
+
+SELECT test2dom('bar');  -- fail
+ERROR:  value for domain hstore_foo violates check constraint "hstore_foo_check"
+CONTEXT:  while creating return value
+PL/Python function "test2dom"
 -- test as part of prepare/execute
 CREATE FUNCTION test3() RETURNS void
 LANGUAGE plpythonu
diff --git a/contrib/hstore_plpython/hstore_plpython.c b/contrib/hstore_plpython/hstore_plpython.c
index b184324ebf..218e6612b1 100644
--- a/contrib/hstore_plpython/hstore_plpython.c
+++ b/contrib/hstore_plpython/hstore_plpython.c
@@ -85,7 +85,7 @@ PG_FUNCTION_INFO_V1(hstore_to_plpython);
 Datum
 hstore_to_plpython(PG_FUNCTION_ARGS)
 {
-	HStore	   *in = PG_GETARG_HS(0);
+	HStore	   *in = PG_GETARG_HSTORE_P(0);
 	int			i;
 	int			count = HS_COUNT(in);
 	char	   *base = STRPTR(in);
@@ -93,6 +93,10 @@ hstore_to_plpython(PG_FUNCTION_ARGS)
 	PyObject   *dict;
 
 	dict = PyDict_New();
+	if (!dict)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
 
 	for (i = 0; i < count; i++)
 	{
diff --git a/contrib/hstore_plpython/sql/hstore_plpython.sql b/contrib/hstore_plpython/sql/hstore_plpython.sql
index 911bbd67fe..2c54ee6aaa 100644
--- a/contrib/hstore_plpython/sql/hstore_plpython.sql
+++ b/contrib/hstore_plpython/sql/hstore_plpython.sql
@@ -60,7 +60,21 @@ val = [{'a': 1, 'b': 'boo', 'c': None}, {'d': 2}]
 return val
 $$;
 
- SELECT test2arr();
+SELECT test2arr();
+
+
+-- test python -> domain over hstore
+CREATE DOMAIN hstore_foo AS hstore CHECK(VALUE ? 'foo');
+
+CREATE FUNCTION test2dom(fn text) RETURNS hstore_foo
+LANGUAGE plpythonu
+TRANSFORM FOR TYPE hstore
+AS $$
+return {'a': 1, fn: 'boo', 'c': None}
+$$;
+
+SELECT test2dom('foo');
+SELECT test2dom('bar');  -- fail
 
 
 -- test as part of prepare/execute
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
index a18c645606..91e2a804f2 100644
--- a/contrib/intarray/_int_bool.c
+++ b/contrib/intarray/_int_bool.c
@@ -245,7 +245,7 @@ checkcondition_arr(void *checkval, ITEM *item)
 	{
 		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
 		if (*StopMiddle == item->val)
-			return (true);
+			return true;
 		else if (*StopMiddle < item->val)
 			StopLow = StopMiddle + 1;
 		else
@@ -274,7 +274,7 @@ execute(ITEM *curitem, void *checkval, bool calcnot,
 		return (*chkcond) (checkval, curitem);
 	else if (curitem->val == (int32) '!')
 	{
-		return (calcnot) ?
+		return calcnot ?
 			((execute(curitem - 1, checkval, calcnot, chkcond)) ? false : true)
 			: true;
 	}
@@ -342,7 +342,7 @@ gin_bool_consistent(QUERYTYPE *query, bool *check)
 				j = 0;
 
 	if (query->size <= 0)
-		return FALSE;
+		return false;
 
 	/*
 	 * Set up data for checkcondition_gin.  This must agree with the query
diff --git a/contrib/intarray/_int_gin.c b/contrib/intarray/_int_gin.c
index 73628bea11..7aebfec54b 100644
--- a/contrib/intarray/_int_gin.c
+++ b/contrib/intarray/_int_gin.c
@@ -116,7 +116,7 @@ ginint4_consistent(PG_FUNCTION_ARGS)
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(5);
-	bool		res = FALSE;
+	bool		res = false;
 	int32		i;
 
 	switch (strategy)
@@ -125,25 +125,25 @@ ginint4_consistent(PG_FUNCTION_ARGS)
 			/* result is not lossy */
 			*recheck = false;
 			/* at least one element in check[] is true, so result = true */
-			res = TRUE;
+			res = true;
 			break;
 		case RTContainedByStrategyNumber:
 		case RTOldContainedByStrategyNumber:
 			/* we will need recheck */
 			*recheck = true;
 			/* at least one element in check[] is true, so result = true */
-			res = TRUE;
+			res = true;
 			break;
 		case RTSameStrategyNumber:
 			/* we will need recheck */
 			*recheck = true;
 			/* Must have all elements in check[] true */
-			res = TRUE;
+			res = true;
 			for (i = 0; i < nkeys; i++)
 			{
 				if (!check[i])
 				{
-					res = FALSE;
+					res = false;
 					break;
 				}
 			}
@@ -153,12 +153,12 @@ ginint4_consistent(PG_FUNCTION_ARGS)
 			/* result is not lossy */
 			*recheck = false;
 			/* Must have all elements in check[] true */
-			res = TRUE;
+			res = true;
 			for (i = 0; i < nkeys; i++)
 			{
 				if (!check[i])
 				{
-					res = FALSE;
+					res = false;
 					break;
 				}
 			}
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
index 79521b29b0..911d18023b 100644
--- a/contrib/intarray/_int_gist.c
+++ b/contrib/intarray/_int_gist.c
@@ -27,7 +27,7 @@ PG_FUNCTION_INFO_V1(g_int_same);
 /*
 ** The GiST Consistent method for _intments
 ** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
+** the predicate x op query == false, where op is the oper
 ** corresponding to strategy in the pg_amop table.
 */
 Datum
@@ -89,7 +89,7 @@ g_int_consistent(PG_FUNCTION_ARGS)
 										   query);
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 	pfree(query);
 	PG_RETURN_BOOL(retval);
@@ -159,7 +159,7 @@ g_int_compress(PG_FUNCTION_ARGS)
 
 		retval = palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
-					  entry->rel, entry->page, entry->offset, FALSE);
+					  entry->rel, entry->page, entry->offset, false);
 
 		PG_RETURN_POINTER(retval);
 	}
@@ -206,7 +206,7 @@ g_int_compress(PG_FUNCTION_ARGS)
 		r = resize_intArrayType(r, len);
 		retval = palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
-					  entry->rel, entry->page, entry->offset, FALSE);
+					  entry->rel, entry->page, entry->offset, false);
 		PG_RETURN_POINTER(retval);
 	}
 	else
@@ -236,7 +236,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
 		{
 			retval = palloc(sizeof(GISTENTRY));
 			gistentryinit(*retval, PointerGetDatum(in),
-						  entry->rel, entry->page, entry->offset, FALSE);
+						  entry->rel, entry->page, entry->offset, false);
 			PG_RETURN_POINTER(retval);
 		}
 
@@ -251,7 +251,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
 		{
 			retval = palloc(sizeof(GISTENTRY));
 			gistentryinit(*retval, PointerGetDatum(in),
-						  entry->rel, entry->page, entry->offset, FALSE);
+						  entry->rel, entry->page, entry->offset, false);
 
 			PG_RETURN_POINTER(retval);
 		}
@@ -273,7 +273,7 @@ g_int_decompress(PG_FUNCTION_ARGS)
 		pfree(in);
 	retval = palloc(sizeof(GISTENTRY));
 	gistentryinit(*retval, PointerGetDatum(r),
-				  entry->rel, entry->page, entry->offset, FALSE);
+				  entry->rel, entry->page, entry->offset, false);
 
 	PG_RETURN_POINTER(retval);
 }
@@ -321,14 +321,14 @@ g_int_same(PG_FUNCTION_ARGS)
 		*result = false;
 		PG_RETURN_POINTER(result);
 	}
-	*result = TRUE;
+	*result = true;
 	da = ARRPTR(a);
 	db = ARRPTR(b);
 	while (n--)
 	{
 		if (*da++ != *db++)
 		{
-			*result = FALSE;
+			*result = false;
 			break;
 		}
 	}
diff --git a/contrib/intarray/_int_op.c b/contrib/intarray/_int_op.c
index 3637c4564c..fe7fcc4662 100644
--- a/contrib/intarray/_int_op.c
+++ b/contrib/intarray/_int_op.c
@@ -74,19 +74,19 @@ _int_same(PG_FUNCTION_ARGS)
 	da = ARRPTR(a);
 	db = ARRPTR(b);
 
-	result = FALSE;
+	result = false;
 
 	if (na == nb)
 	{
 		SORT(a);
 		SORT(b);
-		result = TRUE;
+		result = true;
 
 		for (n = 0; n < na; n++)
 		{
 			if (da[n] != db[n])
 			{
-				result = FALSE;
+				result = false;
 				break;
 			}
 		}
@@ -110,7 +110,7 @@ _int_overlap(PG_FUNCTION_ARGS)
 	CHECKARRVALID(a);
 	CHECKARRVALID(b);
 	if (ARRISEMPTY(a) || ARRISEMPTY(b))
-		return FALSE;
+		return false;
 
 	SORT(a);
 	SORT(b);
diff --git a/contrib/intarray/_int_selfuncs.c b/contrib/intarray/_int_selfuncs.c
index acb87d10f0..4c3f60c1dd 100644
--- a/contrib/intarray/_int_selfuncs.c
+++ b/contrib/intarray/_int_selfuncs.c
@@ -3,7 +3,7 @@
  * _int_selfuncs.c
  *	  Functions for selectivity estimation of intarray operators
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/contrib/intarray/_int_tool.c b/contrib/intarray/_int_tool.c
index 2fdfd2ec63..ee8fb64a47 100644
--- a/contrib/intarray/_int_tool.c
+++ b/contrib/intarray/_int_tool.c
@@ -40,7 +40,7 @@ inner_int_contains(ArrayType *a, ArrayType *b)
 			break;				/* db[j] is not in da */
 	}
 
-	return (n == nb) ? TRUE : FALSE;
+	return (n == nb) ? true : false;
 }
 
 /* arguments are assumed sorted */
@@ -65,12 +65,12 @@ inner_int_overlap(ArrayType *a, ArrayType *b)
 		if (da[i] < db[j])
 			i++;
 		else if (da[i] == db[j])
-			return TRUE;
+			return true;
 		else
 			j++;
 	}
 
-	return FALSE;
+	return false;
 }
 
 ArrayType *
diff --git a/contrib/intarray/_intbig_gist.c b/contrib/intarray/_intbig_gist.c
index 6dae7c91c1..de7bc82a23 100644
--- a/contrib/intarray/_intbig_gist.c
+++ b/contrib/intarray/_intbig_gist.c
@@ -168,7 +168,7 @@ g_intbig_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 
 		if (in != DatumGetArrayTypeP(entry->key))
 			pfree(in);
@@ -195,7 +195,7 @@ g_intbig_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 
 		PG_RETURN_POINTER(retval);
 	}
@@ -594,7 +594,7 @@ g_intbig_consistent(PG_FUNCTION_ARGS)
 				retval = _intbig_overlap((GISTTYPE *) DatumGetPointer(entry->key), query);
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 	PG_FREE_IF_COPY(query, 1);
 	PG_RETURN_BOOL(retval);
diff --git a/contrib/isn/CMakeLists.txt b/contrib/isn/CMakeLists.txt
index 6180d4e955..3233da7415 100644
--- a/contrib/isn/CMakeLists.txt
+++ b/contrib/isn/CMakeLists.txt
@@ -19,6 +19,7 @@ install(FILES
 	${extension_name}.control
 	${extension_name}--1.1.sql
 	${extension_name}--1.0--1.1.sql
+	${extension_name}--1.1--1.2.sql
 	${extension_name}--unpackaged--1.0.sql
 	DESTINATION ${PGSHAREDIR}/extension)
 
diff --git a/contrib/isn/Makefile b/contrib/isn/Makefile
index 9543a4b1cf..ab6b175f9a 100644
--- a/contrib/isn/Makefile
+++ b/contrib/isn/Makefile
@@ -3,7 +3,8 @@
 MODULES = isn
 
 EXTENSION = isn
-DATA = isn--1.1.sql isn--1.0--1.1.sql isn--unpackaged--1.0.sql
+DATA = isn--1.1.sql isn--1.1--1.2.sql \
+	isn--1.0--1.1.sql isn--unpackaged--1.0.sql
 PGFILEDESC = "isn - data types for international product numbering standards"
 
 REGRESS = isn
diff --git a/contrib/isn/isn--1.1--1.2.sql b/contrib/isn/isn--1.1--1.2.sql
new file mode 100644
index 0000000000..d626a5f44d
--- /dev/null
+++ b/contrib/isn/isn--1.1--1.2.sql
@@ -0,0 +1,228 @@
+/* contrib/isn/isn--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION isn UPDATE TO '1.2'" to load this file. \quit
+
+ALTER OPERATOR <= (ean13, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, isbn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, isbn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn13, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn13, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, ismn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, ismn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn13, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn13, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, issn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, issn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, isbn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, isbn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, ismn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, ismn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, issn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, issn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ean13, upc) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ean13, upc) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn13, isbn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn13, isbn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn13, isbn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn13, isbn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn, isbn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn, isbn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn, isbn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn, isbn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (isbn, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (isbn, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn13, ismn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn13, ismn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn13, ismn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn13, ismn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn, ismn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn, ismn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn, ismn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn, ismn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (ismn, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (ismn, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn13, issn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn13, issn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn13, issn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn13, issn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn13, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn13, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn, issn) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn, issn) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn, issn13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn, issn13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (issn, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (issn, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (upc, upc) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (upc, upc) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
+
+ALTER OPERATOR <= (upc, ean13) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel);
+
+ALTER OPERATOR >= (upc, ean13) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel);
diff --git a/contrib/isn/isn.c b/contrib/isn/isn.c
index 4d845b716f..897d83e0ca 100644
--- a/contrib/isn/isn.c
+++ b/contrib/isn/isn.c
@@ -4,7 +4,7 @@
  *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
  *
  * Author:	German Mendez Bravo (Kronuz)
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/isn/isn.c
@@ -26,6 +26,12 @@
 
 PG_MODULE_MAGIC;
 
+#ifdef USE_ASSERT_CHECKING
+#define ISN_DEBUG 1
+#else
+#define ISN_DEBUG 0
+#endif
+
 #define MAXEAN13LEN 18
 
 enum isn_type
@@ -36,7 +42,6 @@ enum isn_type
 static const char *const isn_names[] = {"EAN13/UPC/ISxN", "EAN13/UPC/ISxN", "EAN13", "ISBN", "ISMN", "ISSN", "UPC"};
 
 static bool g_weak = false;
-static bool g_initialized = false;
 
 
 /***********************************************************************
@@ -56,7 +61,7 @@ static bool g_initialized = false;
 /*
  * Check if the table and its index is correct (just for debugging)
  */
-#ifdef ISN_DEBUG
+pg_attribute_unused()
 static bool
 check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
 {
@@ -68,7 +73,6 @@ check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
 				y = -1,
 				i = 0,
 				j,
-				cnt = 0,
 				init = 0;
 
 	if (TABLE == NULL || TABLE_index == NULL)
@@ -131,7 +135,6 @@ check_table(const char *(*TABLE)[2], const unsigned TABLE_index[10][2])
 	elog(DEBUG1, "index %d is invalid", j);
 	return false;
 }
-#endif							/* ISN_DEBUG */
 
 /*----------------------------------------------------------
  * Formatting and conversion routines.
@@ -922,22 +925,24 @@ string2ean(const char *str, bool errorOK, ean13 *result,
  * Exported routines.
  *---------------------------------------------------------*/
 
+void		_PG_init(void);
+
 void
-initialize(void)
+_PG_init(void)
 {
-#ifdef ISN_DEBUG
-	if (!check_table(EAN13, EAN13_index))
-		elog(LOG, "EAN13 failed check");
-	if (!check_table(ISBN, ISBN_index))
-		elog(LOG, "ISBN failed check");
-	if (!check_table(ISMN, ISMN_index))
-		elog(LOG, "ISMN failed check");
-	if (!check_table(ISSN, ISSN_index))
-		elog(LOG, "ISSN failed check");
-	if (!check_table(UPC, UPC_index))
-		elog(LOG, "UPC failed check");
-#endif
-	g_initialized = true;
+	if (ISN_DEBUG)
+	{
+		if (!check_table(EAN13_range, EAN13_index))
+			elog(ERROR, "EAN13 failed check");
+		if (!check_table(ISBN_range, ISBN_index))
+			elog(ERROR, "ISBN failed check");
+		if (!check_table(ISMN_range, ISMN_index))
+			elog(ERROR, "ISMN failed check");
+		if (!check_table(ISSN_range, ISSN_index))
+			elog(ERROR, "ISSN failed check");
+		if (!check_table(UPC_range, UPC_index))
+			elog(ERROR, "UPC failed check");
+	}
 }
 
 /* isn_out
diff --git a/contrib/isn/isn.control b/contrib/isn/isn.control
index 544bd8d0bf..765dce0e0a 100644
--- a/contrib/isn/isn.control
+++ b/contrib/isn/isn.control
@@ -1,5 +1,5 @@
 # isn extension
 comment = 'data types for international product numbering standards'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/isn'
 relocatable = true
diff --git a/contrib/isn/isn.h b/contrib/isn/isn.h
index e2c8a26234..29632d8518 100644
--- a/contrib/isn/isn.h
+++ b/contrib/isn/isn.h
@@ -4,7 +4,7 @@
  *	  PostgreSQL type definitions for ISNs (ISBN, ISMN, ISSN, EAN13, UPC)
  *
  * Author:	German Mendez Bravo (Kronuz)
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/isn/isn.h
diff --git a/contrib/lo/.gitignore b/contrib/lo/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/lo/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/lo/Makefile b/contrib/lo/Makefile
index 71f0cb0d24..bd4fd6b72d 100644
--- a/contrib/lo/Makefile
+++ b/contrib/lo/Makefile
@@ -6,6 +6,8 @@ EXTENSION = lo
 DATA = lo--1.1.sql lo--1.0--1.1.sql lo--unpackaged--1.0.sql
 PGFILEDESC = "lo - management for large objects"
 
+REGRESS = lo
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/lo/expected/lo.out b/contrib/lo/expected/lo.out
new file mode 100644
index 0000000000..f7104aee3f
--- /dev/null
+++ b/contrib/lo/expected/lo.out
@@ -0,0 +1,42 @@
+CREATE EXTENSION lo;
+CREATE TABLE image (title text, raster lo);
+CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
+    FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
+SELECT lo_create(43213);
+ lo_create 
+-----------
+     43213
+(1 row)
+
+SELECT lo_create(43214);
+ lo_create 
+-----------
+     43214
+(1 row)
+
+INSERT INTO image (title, raster) VALUES ('beautiful image', 43213);
+SELECT lo_get(43213);
+ lo_get 
+--------
+ \x
+(1 row)
+
+SELECT lo_get(43214);
+ lo_get 
+--------
+ \x
+(1 row)
+
+UPDATE image SET raster = 43214 WHERE title = 'beautiful image';
+SELECT lo_get(43213);
+ERROR:  large object 43213 does not exist
+SELECT lo_get(43214);
+ lo_get 
+--------
+ \x
+(1 row)
+
+DELETE FROM image;
+SELECT lo_get(43214);
+ERROR:  large object 43214 does not exist
+DROP TABLE image;
diff --git a/contrib/lo/sql/lo.sql b/contrib/lo/sql/lo.sql
new file mode 100644
index 0000000000..34ba6f00ec
--- /dev/null
+++ b/contrib/lo/sql/lo.sql
@@ -0,0 +1,25 @@
+CREATE EXTENSION lo;
+
+CREATE TABLE image (title text, raster lo);
+
+CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
+    FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
+
+SELECT lo_create(43213);
+SELECT lo_create(43214);
+
+INSERT INTO image (title, raster) VALUES ('beautiful image', 43213);
+
+SELECT lo_get(43213);
+SELECT lo_get(43214);
+
+UPDATE image SET raster = 43214 WHERE title = 'beautiful image';
+
+SELECT lo_get(43213);
+SELECT lo_get(43214);
+
+DELETE FROM image;
+
+SELECT lo_get(43214);
+
+DROP TABLE image;
diff --git a/contrib/ltree/_ltree_gist.c b/contrib/ltree/_ltree_gist.c
index a387f5b899..28bf7ad963 100644
--- a/contrib/ltree/_ltree_gist.c
+++ b/contrib/ltree/_ltree_gist.c
@@ -100,7 +100,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else if (!LTG_ISALLTRUE(entry->key))
 	{
@@ -123,7 +123,7 @@ _ltree_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	PG_RETURN_POINTER(retval);
 }
@@ -545,7 +545,7 @@ Datum
 _ltree_consistent(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	char	   *query = (char *) DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(1)));
+	void	   *query = (void *) PG_DETOAST_DATUM(PG_GETARG_DATUM(1));
 	StrategyNumber strategy = (StrategyNumber) PG_GETARG_UINT16(2);
 
 	/* Oid		subtype = PG_GETARG_OID(3); */
diff --git a/contrib/ltree/_ltree_op.c b/contrib/ltree/_ltree_op.c
index fdf6ebb43b..9bb6bcaeff 100644
--- a/contrib/ltree/_ltree_op.c
+++ b/contrib/ltree/_ltree_op.c
@@ -71,7 +71,7 @@ Datum
 _ltree_isparent(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltree	   *query = PG_GETARG_LTREE(1);
+	ltree	   *query = PG_GETARG_LTREE_P(1);
 	bool		res = array_iterator(la, ltree_isparent, (void *) query, NULL);
 
 	PG_FREE_IF_COPY(la, 0);
@@ -92,7 +92,7 @@ Datum
 _ltree_risparent(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltree	   *query = PG_GETARG_LTREE(1);
+	ltree	   *query = PG_GETARG_LTREE_P(1);
 	bool		res = array_iterator(la, ltree_risparent, (void *) query, NULL);
 
 	PG_FREE_IF_COPY(la, 0);
@@ -113,7 +113,7 @@ Datum
 _ltq_regex(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	lquery	   *query = PG_GETARG_LQUERY(1);
+	lquery	   *query = PG_GETARG_LQUERY_P(1);
 	bool		res = array_iterator(la, ltq_regex, (void *) query, NULL);
 
 	PG_FREE_IF_COPY(la, 0);
@@ -178,7 +178,7 @@ Datum
 _ltxtq_exec(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltxtquery  *query = PG_GETARG_LTXTQUERY(1);
+	ltxtquery  *query = PG_GETARG_LTXTQUERY_P(1);
 	bool		res = array_iterator(la, ltxtq_exec, (void *) query, NULL);
 
 	PG_FREE_IF_COPY(la, 0);
@@ -200,7 +200,7 @@ Datum
 _ltree_extract_isparent(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltree	   *query = PG_GETARG_LTREE(1);
+	ltree	   *query = PG_GETARG_LTREE_P(1);
 	ltree	   *found,
 			   *item;
 
@@ -223,7 +223,7 @@ Datum
 _ltree_extract_risparent(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltree	   *query = PG_GETARG_LTREE(1);
+	ltree	   *query = PG_GETARG_LTREE_P(1);
 	ltree	   *found,
 			   *item;
 
@@ -246,7 +246,7 @@ Datum
 _ltq_extract_regex(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	lquery	   *query = PG_GETARG_LQUERY(1);
+	lquery	   *query = PG_GETARG_LQUERY_P(1);
 	ltree	   *found,
 			   *item;
 
@@ -269,7 +269,7 @@ Datum
 _ltxtq_extract_exec(PG_FUNCTION_ARGS)
 {
 	ArrayType  *la = PG_GETARG_ARRAYTYPE_P(0);
-	ltxtquery  *query = PG_GETARG_LTXTQUERY(1);
+	ltxtquery  *query = PG_GETARG_LTXTQUERY_P(1);
 	ltree	   *found,
 			   *item;
 
diff --git a/contrib/ltree/lquery_op.c b/contrib/ltree/lquery_op.c
index 229ddd0ae3..b6d2deb1af 100644
--- a/contrib/ltree/lquery_op.c
+++ b/contrib/ltree/lquery_op.c
@@ -302,8 +302,8 @@ checkCond(lquery_level *curq, int query_numlevel, ltree_level *curt, int tree_nu
 Datum
 ltq_regex(PG_FUNCTION_ARGS)
 {
-	ltree	   *tree = PG_GETARG_LTREE(0);
-	lquery	   *query = PG_GETARG_LQUERY(1);
+	ltree	   *tree = PG_GETARG_LTREE_P(0);
+	lquery	   *query = PG_GETARG_LQUERY_P(1);
 	bool		res = false;
 
 	if (query->flag & LQUERY_HASNOT)
@@ -338,7 +338,7 @@ ltq_rregex(PG_FUNCTION_ARGS)
 Datum
 lt_q_regex(PG_FUNCTION_ARGS)
 {
-	ltree	   *tree = PG_GETARG_LTREE(0);
+	ltree	   *tree = PG_GETARG_LTREE_P(0);
 	ArrayType  *_query = PG_GETARG_ARRAYTYPE_P(1);
 	lquery	   *query = (lquery *) ARR_DATA_PTR(_query);
 	bool		res = false;
diff --git a/contrib/ltree/ltree.h b/contrib/ltree/ltree.h
index fd86323ffe..e4b8c84fa6 100644
--- a/contrib/ltree/ltree.h
+++ b/contrib/ltree/ltree.h
@@ -165,12 +165,21 @@ bool compare_subnode(ltree_level *t, char *q, int len,
 ltree	   *lca_inner(ltree **a, int len);
 int			ltree_strncasecmp(const char *a, const char *b, size_t s);
 
-#define PG_GETARG_LTREE(x)	((ltree*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
-#define PG_GETARG_LTREE_COPY(x) ((ltree*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
-#define PG_GETARG_LQUERY(x) ((lquery*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
-#define PG_GETARG_LQUERY_COPY(x) ((lquery*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
-#define PG_GETARG_LTXTQUERY(x) ((ltxtquery*)DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(x))))
-#define PG_GETARG_LTXTQUERY_COPY(x) ((ltxtquery*)DatumGetPointer(PG_DETOAST_DATUM_COPY(PG_GETARG_DATUM(x))))
+/* fmgr macros for ltree objects */
+#define DatumGetLtreeP(X)			((ltree *) PG_DETOAST_DATUM(X))
+#define DatumGetLtreePCopy(X)		((ltree *) PG_DETOAST_DATUM_COPY(X))
+#define PG_GETARG_LTREE_P(n)		DatumGetLtreeP(PG_GETARG_DATUM(n))
+#define PG_GETARG_LTREE_P_COPY(n)	DatumGetLtreePCopy(PG_GETARG_DATUM(n))
+
+#define DatumGetLqueryP(X)			((lquery *) PG_DETOAST_DATUM(X))
+#define DatumGetLqueryPCopy(X)		((lquery *) PG_DETOAST_DATUM_COPY(X))
+#define PG_GETARG_LQUERY_P(n)		DatumGetLqueryP(PG_GETARG_DATUM(n))
+#define PG_GETARG_LQUERY_P_COPY(n)	DatumGetLqueryPCopy(PG_GETARG_DATUM(n))
+
+#define DatumGetLtxtqueryP(X)			((ltxtquery *) PG_DETOAST_DATUM(X))
+#define DatumGetLtxtqueryPCopy(X)		((ltxtquery *) PG_DETOAST_DATUM_COPY(X))
+#define PG_GETARG_LTXTQUERY_P(n)		DatumGetLtxtqueryP(PG_GETARG_DATUM(n))
+#define PG_GETARG_LTXTQUERY_P_COPY(n)	DatumGetLtxtqueryPCopy(PG_GETARG_DATUM(n))
 
 /* GiST support for ltree */
 
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index 70e78a672a..12aa8fff20 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -53,7 +53,7 @@ ltree_compress(PG_FUNCTION_ARGS)
 	if (entry->leafkey)
 	{							/* ltree */
 		ltree_gist *key;
-		ltree	   *val = (ltree *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
+		ltree	   *val = DatumGetLtreeP(entry->key);
 		int32		len = LTG_HDRSIZE + VARSIZE(val);
 
 		key = (ltree_gist *) palloc0(len);
@@ -64,7 +64,7 @@ ltree_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	PG_RETURN_POINTER(retval);
 }
@@ -73,7 +73,7 @@ Datum
 ltree_decompress(PG_FUNCTION_ARGS)
 {
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	ltree_gist *key = (ltree_gist *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
+	ltree_gist *key = (ltree_gist *) PG_DETOAST_DATUM(entry->key);
 
 	if (PointerGetDatum(key) != entry->key)
 	{
@@ -81,7 +81,7 @@ ltree_decompress(PG_FUNCTION_ARGS)
 
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 		PG_RETURN_POINTER(retval);
 	}
 	PG_RETURN_POINTER(entry);
@@ -621,18 +621,18 @@ ltree_consistent(PG_FUNCTION_ARGS)
 	switch (strategy)
 	{
 		case BTLessStrategyNumber:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			res = (GIST_LEAF(entry)) ?
 				(ltree_compare((ltree *) query, LTG_NODE(key)) > 0)
 				:
 				(ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0);
 			break;
 		case BTLessEqualStrategyNumber:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			res = (ltree_compare((ltree *) query, LTG_GETLNODE(key)) >= 0);
 			break;
 		case BTEqualStrategyNumber:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			if (GIST_LEAF(entry))
 				res = (ltree_compare((ltree *) query, LTG_NODE(key)) == 0);
 			else
@@ -643,25 +643,25 @@ ltree_consistent(PG_FUNCTION_ARGS)
 					);
 			break;
 		case BTGreaterEqualStrategyNumber:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			res = (ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0);
 			break;
 		case BTGreaterStrategyNumber:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			res = (GIST_LEAF(entry)) ?
 				(ltree_compare((ltree *) query, LTG_GETRNODE(key)) < 0)
 				:
 				(ltree_compare((ltree *) query, LTG_GETRNODE(key)) <= 0);
 			break;
 		case 10:
-			query = PG_GETARG_LTREE_COPY(1);
+			query = PG_GETARG_LTREE_P_COPY(1);
 			res = (GIST_LEAF(entry)) ?
 				inner_isparent((ltree *) query, LTG_NODE(key))
 				:
 				gist_isparent(key, (ltree *) query);
 			break;
 		case 11:
-			query = PG_GETARG_LTREE(1);
+			query = PG_GETARG_LTREE_P(1);
 			res = (GIST_LEAF(entry)) ?
 				inner_isparent(LTG_NODE(key), (ltree *) query)
 				:
@@ -669,7 +669,7 @@ ltree_consistent(PG_FUNCTION_ARGS)
 			break;
 		case 12:
 		case 13:
-			query = PG_GETARG_LQUERY(1);
+			query = PG_GETARG_LQUERY_P(1);
 			if (GIST_LEAF(entry))
 				res = DatumGetBool(DirectFunctionCall2(ltq_regex,
 													   PointerGetDatum(LTG_NODE(key)),
@@ -680,18 +680,18 @@ ltree_consistent(PG_FUNCTION_ARGS)
 			break;
 		case 14:
 		case 15:
-			query = PG_GETARG_LQUERY(1);
+			query = PG_GETARG_LTXTQUERY_P(1);
 			if (GIST_LEAF(entry))
 				res = DatumGetBool(DirectFunctionCall2(ltxtq_exec,
 													   PointerGetDatum(LTG_NODE(key)),
-													   PointerGetDatum((lquery *) query)
+													   PointerGetDatum((ltxtquery *) query)
 													   ));
 			else
 				res = gist_qtxt(key, (ltxtquery *) query);
 			break;
 		case 16:
 		case 17:
-			query = DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_DATUM(1)));
+			query = PG_GETARG_ARRAYTYPE_P(1);
 			if (GIST_LEAF(entry))
 				res = DatumGetBool(DirectFunctionCall2(lt_q_regex,
 													   PointerGetDatum(LTG_NODE(key)),
diff --git a/contrib/ltree/ltree_io.c b/contrib/ltree/ltree_io.c
index 34ca597a48..f54f037443 100644
--- a/contrib/ltree/ltree_io.c
+++ b/contrib/ltree/ltree_io.c
@@ -149,7 +149,7 @@ ltree_in(PG_FUNCTION_ARGS)
 Datum
 ltree_out(PG_FUNCTION_ARGS)
 {
-	ltree	   *in = PG_GETARG_LTREE(0);
+	ltree	   *in = PG_GETARG_LTREE_P(0);
 	char	   *buf,
 			   *ptr;
 	int			i;
@@ -521,7 +521,7 @@ lquery_in(PG_FUNCTION_ARGS)
 Datum
 lquery_out(PG_FUNCTION_ARGS)
 {
-	lquery	   *in = PG_GETARG_LQUERY(0);
+	lquery	   *in = PG_GETARG_LQUERY_P(0);
 	char	   *buf,
 			   *ptr;
 	int			i,
diff --git a/contrib/ltree/ltree_op.c b/contrib/ltree/ltree_op.c
index aa1e9918be..d62ca02521 100644
--- a/contrib/ltree/ltree_op.c
+++ b/contrib/ltree/ltree_op.c
@@ -67,65 +67,65 @@ ltree_compare(const ltree *a, const ltree *b)
 }
 
 #define RUNCMP						\
-ltree *a	= PG_GETARG_LTREE(0);			\
-ltree *b	= PG_GETARG_LTREE(1);			\
-int res = ltree_compare(a,b);				\
-PG_FREE_IF_COPY(a,0);					\
-PG_FREE_IF_COPY(b,1);					\
+ltree *a = PG_GETARG_LTREE_P(0);	\
+ltree *b = PG_GETARG_LTREE_P(1);	\
+int res = ltree_compare(a,b);		\
+PG_FREE_IF_COPY(a,0);				\
+PG_FREE_IF_COPY(b,1)
 
 Datum
 ltree_cmp(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_INT32(res);
+	RUNCMP;
+	PG_RETURN_INT32(res);
 }
 
 Datum
 ltree_lt(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res < 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res < 0) ? true : false);
 }
 
 Datum
 ltree_le(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res <= 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res <= 0) ? true : false);
 }
 
 Datum
 ltree_eq(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res == 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res == 0) ? true : false);
 }
 
 Datum
 ltree_ge(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res >= 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res >= 0) ? true : false);
 }
 
 Datum
 ltree_gt(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res > 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res > 0) ? true : false);
 }
 
 Datum
 ltree_ne(PG_FUNCTION_ARGS)
 {
-	RUNCMP
-		PG_RETURN_BOOL((res != 0) ? true : false);
+	RUNCMP;
+	PG_RETURN_BOOL((res != 0) ? true : false);
 }
 
 Datum
 nlevel(PG_FUNCTION_ARGS)
 {
-	ltree	   *a = PG_GETARG_LTREE(0);
+	ltree	   *a = PG_GETARG_LTREE_P(0);
 	int			res = a->numlevel;
 
 	PG_FREE_IF_COPY(a, 0);
@@ -159,8 +159,8 @@ inner_isparent(const ltree *c, const ltree *p)
 Datum
 ltree_isparent(PG_FUNCTION_ARGS)
 {
-	ltree	   *c = PG_GETARG_LTREE(1);
-	ltree	   *p = PG_GETARG_LTREE(0);
+	ltree	   *c = PG_GETARG_LTREE_P(1);
+	ltree	   *p = PG_GETARG_LTREE_P(0);
 	bool		res = inner_isparent(c, p);
 
 	PG_FREE_IF_COPY(c, 1);
@@ -171,8 +171,8 @@ ltree_isparent(PG_FUNCTION_ARGS)
 Datum
 ltree_risparent(PG_FUNCTION_ARGS)
 {
-	ltree	   *c = PG_GETARG_LTREE(0);
-	ltree	   *p = PG_GETARG_LTREE(1);
+	ltree	   *c = PG_GETARG_LTREE_P(0);
+	ltree	   *p = PG_GETARG_LTREE_P(1);
 	bool		res = inner_isparent(c, p);
 
 	PG_FREE_IF_COPY(c, 0);
@@ -223,7 +223,7 @@ inner_subltree(ltree *t, int32 startpos, int32 endpos)
 Datum
 subltree(PG_FUNCTION_ARGS)
 {
-	ltree	   *t = PG_GETARG_LTREE(0);
+	ltree	   *t = PG_GETARG_LTREE_P(0);
 	ltree	   *res = inner_subltree(t, PG_GETARG_INT32(1), PG_GETARG_INT32(2));
 
 	PG_FREE_IF_COPY(t, 0);
@@ -233,7 +233,7 @@ subltree(PG_FUNCTION_ARGS)
 Datum
 subpath(PG_FUNCTION_ARGS)
 {
-	ltree	   *t = PG_GETARG_LTREE(0);
+	ltree	   *t = PG_GETARG_LTREE_P(0);
 	int32		start = PG_GETARG_INT32(1);
 	int32		len = (fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
 	int32		end;
@@ -282,8 +282,8 @@ ltree_concat(ltree *a, ltree *b)
 Datum
 ltree_addltree(PG_FUNCTION_ARGS)
 {
-	ltree	   *a = PG_GETARG_LTREE(0);
-	ltree	   *b = PG_GETARG_LTREE(1);
+	ltree	   *a = PG_GETARG_LTREE_P(0);
+	ltree	   *b = PG_GETARG_LTREE_P(1);
 	ltree	   *r;
 
 	r = ltree_concat(a, b);
@@ -295,7 +295,7 @@ ltree_addltree(PG_FUNCTION_ARGS)
 Datum
 ltree_addtext(PG_FUNCTION_ARGS)
 {
-	ltree	   *a = PG_GETARG_LTREE(0);
+	ltree	   *a = PG_GETARG_LTREE_P(0);
 	text	   *b = PG_GETARG_TEXT_PP(1);
 	char	   *s;
 	ltree	   *r,
@@ -320,8 +320,8 @@ ltree_addtext(PG_FUNCTION_ARGS)
 Datum
 ltree_index(PG_FUNCTION_ARGS)
 {
-	ltree	   *a = PG_GETARG_LTREE(0);
-	ltree	   *b = PG_GETARG_LTREE(1);
+	ltree	   *a = PG_GETARG_LTREE_P(0);
+	ltree	   *b = PG_GETARG_LTREE_P(1);
 	int			start = (fcinfo->nargs == 3) ? PG_GETARG_INT32(2) : 0;
 	int			i,
 				j;
@@ -380,7 +380,7 @@ ltree_index(PG_FUNCTION_ARGS)
 Datum
 ltree_textadd(PG_FUNCTION_ARGS)
 {
-	ltree	   *a = PG_GETARG_LTREE(1);
+	ltree	   *a = PG_GETARG_LTREE_P(1);
 	text	   *b = PG_GETARG_TEXT_PP(0);
 	char	   *s;
 	ltree	   *r,
@@ -476,7 +476,7 @@ lca(PG_FUNCTION_ARGS)
 
 	a = (ltree **) palloc(sizeof(ltree *) * fcinfo->nargs);
 	for (i = 0; i < fcinfo->nargs; i++)
-		a[i] = PG_GETARG_LTREE(i);
+		a[i] = PG_GETARG_LTREE_P(i);
 	res = lca_inner(a, (int) fcinfo->nargs);
 	for (i = 0; i < fcinfo->nargs; i++)
 		PG_FREE_IF_COPY(a[i], i);
@@ -508,7 +508,7 @@ text2ltree(PG_FUNCTION_ARGS)
 Datum
 ltree2text(PG_FUNCTION_ARGS)
 {
-	ltree	   *in = PG_GETARG_LTREE(0);
+	ltree	   *in = PG_GETARG_LTREE_P(0);
 	char	   *ptr;
 	int			i;
 	ltree_level *curlevel;
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
index 9ca1994249..56bf39d145 100644
--- a/contrib/ltree/ltxtquery_io.c
+++ b/contrib/ltree/ltxtquery_io.c
@@ -515,7 +515,7 @@ infix(INFIX *in, bool first)
 Datum
 ltxtq_out(PG_FUNCTION_ARGS)
 {
-	ltxtquery  *query = PG_GETARG_LTXTQUERY(0);
+	ltxtquery  *query = PG_GETARG_LTXTQUERY_P(0);
 	INFIX		nrm;
 
 	if (query->size == 0)
diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
index 1428c8b478..dc0ee82bb6 100644
--- a/contrib/ltree/ltxtquery_op.c
+++ b/contrib/ltree/ltxtquery_op.c
@@ -26,7 +26,7 @@ ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void
 		return (*chkcond) (checkval, curitem);
 	else if (curitem->val == (int32) '!')
 	{
-		return (calcnot) ?
+		return calcnot ?
 			((ltree_execute(curitem + 1, checkval, calcnot, chkcond)) ? false : true)
 			: true;
 	}
@@ -86,8 +86,8 @@ checkcondition_str(void *checkval, ITEM *val)
 Datum
 ltxtq_exec(PG_FUNCTION_ARGS)
 {
-	ltree	   *val = PG_GETARG_LTREE(0);
-	ltxtquery  *query = PG_GETARG_LTXTQUERY(1);
+	ltree	   *val = PG_GETARG_LTREE_P(0);
+	ltxtquery  *query = PG_GETARG_LTXTQUERY_P(1);
 	CHKVAL		chkval;
 	bool		result;
 
diff --git a/contrib/ltree_plpython/ltree_plpython.c b/contrib/ltree_plpython/ltree_plpython.c
index bdd462a91b..e88636a0a9 100644
--- a/contrib/ltree_plpython/ltree_plpython.c
+++ b/contrib/ltree_plpython/ltree_plpython.c
@@ -40,12 +40,16 @@ PG_FUNCTION_INFO_V1(ltree_to_plpython);
 Datum
 ltree_to_plpython(PG_FUNCTION_ARGS)
 {
-	ltree	   *in = PG_GETARG_LTREE(0);
+	ltree	   *in = PG_GETARG_LTREE_P(0);
 	int			i;
 	PyObject   *list;
 	ltree_level *curlevel;
 
 	list = PyList_New(in->numlevel);
+	if (!list)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
 
 	curlevel = LTREE_FIRST(in);
 	for (i = 0; i < in->numlevel; i++)
diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c
index 8af99decad..769e527384 100644
--- a/contrib/oid2name/oid2name.c
+++ b/contrib/oid2name/oid2name.c
@@ -11,6 +11,7 @@
 
 #include "catalog/pg_class.h"
 
+#include "fe_utils/connect.h"
 #include "libpq-fe.h"
 #include "pg_getopt.h"
 
@@ -266,6 +267,7 @@ sql_conn(struct options *my_opts)
 	bool		have_password = false;
 	char		password[100];
 	bool		new_pass;
+	PGresult   *res;
 
 	/*
 	 * Start the connection.  Loop until we have a password if requested by
@@ -323,6 +325,17 @@ sql_conn(struct options *my_opts)
 		exit(1);
 	}
 
+	res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		fprintf(stderr, "oid2name: could not clear search_path: %s\n",
+				PQerrorMessage(conn));
+		PQclear(res);
+		PQfinish(conn);
+		exit(-1);
+	}
+	PQclear(res);
+
 	/* return the conn if good */
 	return conn;
 }
diff --git a/contrib/pageinspect/brinfuncs.c b/contrib/pageinspect/brinfuncs.c
index 13da7616e7..f4f0dea860 100644
--- a/contrib/pageinspect/brinfuncs.c
+++ b/contrib/pageinspect/brinfuncs.c
@@ -2,7 +2,7 @@
  * brinfuncs.c
  *		Functions to investigate BRIN indexes
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		contrib/pageinspect/brinfuncs.c
diff --git a/contrib/pageinspect/expected/page.out b/contrib/pageinspect/expected/page.out
index 8e15947a81..5edb650085 100644
--- a/contrib/pageinspect/expected/page.out
+++ b/contrib/pageinspect/expected/page.out
@@ -92,3 +92,20 @@ create table test_part1 partition of test_partitioned for values from ( 1 ) to (
 select get_raw_page('test_part1', 0); -- get farther and error about empty table
 ERROR:  block number 0 is out of range for relation "test_part1"
 drop table test_partitioned;
+-- check null bitmap alignment for table whose number of attributes is multiple of 8
+create table test8 (f1 int, f2 int, f3 int, f4 int, f5 int, f6 int, f7 int, f8 int);
+insert into test8(f1, f8) values (x'7f00007f'::int, 0);
+select t_bits, t_data from heap_page_items(get_raw_page('test8', 0));
+  t_bits  |       t_data       
+----------+--------------------
+ 10000001 | \x7f00007f00000000
+(1 row)
+
+select tuple_data_split('test8'::regclass, t_data, t_infomask, t_infomask2, t_bits)
+    from heap_page_items(get_raw_page('test8', 0));
+                      tuple_data_split                       
+-------------------------------------------------------------
+ {"\\x7f00007f",NULL,NULL,NULL,NULL,NULL,NULL,"\\x00000000"}
+(1 row)
+
+drop table test8;
diff --git a/contrib/pageinspect/fsmfuncs.c b/contrib/pageinspect/fsmfuncs.c
index 615dab8b13..86e8075845 100644
--- a/contrib/pageinspect/fsmfuncs.c
+++ b/contrib/pageinspect/fsmfuncs.c
@@ -9,7 +9,7 @@
  * there's hardly any use case for using these without superuser-rights
  * anyway.
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/pageinspect/fsmfuncs.c
diff --git a/contrib/pageinspect/ginfuncs.c b/contrib/pageinspect/ginfuncs.c
index f774495b6f..d42609c577 100644
--- a/contrib/pageinspect/ginfuncs.c
+++ b/contrib/pageinspect/ginfuncs.c
@@ -2,7 +2,7 @@
  * ginfuncs.c
  *		Functions to investigate the content of GIN indexes
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		contrib/pageinspect/ginfuncs.c
diff --git a/contrib/pageinspect/hashfuncs.c b/contrib/pageinspect/hashfuncs.c
index dbe3b6ab04..99b61b8669 100644
--- a/contrib/pageinspect/hashfuncs.c
+++ b/contrib/pageinspect/hashfuncs.c
@@ -2,7 +2,7 @@
  * hashfuncs.c
  *		Functions to investigate the content of HASH indexes
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		contrib/pageinspect/hashfuncs.c
@@ -313,10 +313,10 @@ hash_page_items(PG_FUNCTION_ARGS)
 
 		fctx = SRF_FIRSTCALL_INIT();
 
-		page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
-
 		mctx = MemoryContextSwitchTo(fctx->multi_call_memory_ctx);
 
+		page = verify_hash_page(raw_page, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+
 		uargs = palloc(sizeof(struct user_args));
 
 		uargs->page = page;
diff --git a/contrib/pageinspect/heapfuncs.c b/contrib/pageinspect/heapfuncs.c
index 72d1776a4a..7438257c5b 100644
--- a/contrib/pageinspect/heapfuncs.c
+++ b/contrib/pageinspect/heapfuncs.c
@@ -15,7 +15,7 @@
  * there's hardly any use case for using these without superuser-rights
  * anyway.
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/pageinspect/heapfuncs.c
@@ -234,7 +234,7 @@ heap_page_items(PG_FUNCTION_ARGS)
 					int			bits_len;
 
 					bits_len =
-						((tuphdr->t_infomask2 & HEAP_NATTS_MASK) / 8 + 1) * 8;
+						BITMAPLEN(HeapTupleHeaderGetNatts(tuphdr)) * BITS_PER_BYTE;
 					values[11] = CStringGetTextDatum(
 													 bits_to_text(tuphdr->t_bits, bits_len));
 				}
@@ -316,7 +316,7 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 		bool		is_null;
 		bytea	   *attr_data = NULL;
 
-		attr = tupdesc->attrs[i];
+		attr = TupleDescAttr(tupdesc, i);
 		is_null = (t_infomask & HEAP_HASNULL) && att_isnull(i, t_bits);
 
 		/*
@@ -334,7 +334,7 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 
 			if (attr->attlen == -1)
 			{
-				off = att_align_pointer(off, tupdesc->attrs[i]->attalign, -1,
+				off = att_align_pointer(off, attr->attalign, -1,
 										tupdata + off);
 
 				/*
@@ -353,7 +353,7 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 			}
 			else
 			{
-				off = att_align_nominal(off, tupdesc->attrs[i]->attalign);
+				off = att_align_nominal(off, attr->attalign);
 				len = attr->attlen;
 			}
 
@@ -371,7 +371,7 @@ tuple_data_split_internal(Oid relid, char *tupdata,
 				memcpy(VARDATA(attr_data), tupdata + off, len);
 			}
 
-			off = att_addlength_pointer(off, tupdesc->attrs[i]->attlen,
+			off = att_addlength_pointer(off, attr->attlen,
 										tupdata + off);
 		}
 
@@ -436,24 +436,19 @@ tuple_data_split(PG_FUNCTION_ARGS)
 		int			bits_str_len;
 		int			bits_len;
 
-		bits_len = (t_infomask2 & HEAP_NATTS_MASK) / 8 + 1;
+		bits_len = BITMAPLEN(t_infomask2 & HEAP_NATTS_MASK) * BITS_PER_BYTE;
 		if (!t_bits_str)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
 					 errmsg("argument of t_bits is null, but it is expected to be null and %d character long",
-							bits_len * 8)));
+							bits_len)));
 
 		bits_str_len = strlen(t_bits_str);
-		if ((bits_str_len % 8) != 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_DATA_CORRUPTED),
-					 errmsg("length of t_bits is not a multiple of eight")));
-
-		if (bits_len * 8 != bits_str_len)
+		if (bits_len != bits_str_len)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
 					 errmsg("unexpected length of t_bits %u, expected %d",
-							bits_str_len, bits_len * 8)));
+							bits_str_len, bits_len)));
 
 		/* do the conversion */
 		t_bits = text_to_bits(t_bits_str, bits_str_len);
diff --git a/contrib/pageinspect/pageinspect.h b/contrib/pageinspect/pageinspect.h
index f49cf9e892..ab7d5d66cd 100644
--- a/contrib/pageinspect/pageinspect.h
+++ b/contrib/pageinspect/pageinspect.h
@@ -3,7 +3,7 @@
  * pageinspect.h
  *	  Common functions for pageinspect.
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/pageinspect/pageinspect.h
diff --git a/contrib/pageinspect/rawpage.c b/contrib/pageinspect/rawpage.c
index e9d3131bda..3d4d4f6f93 100644
--- a/contrib/pageinspect/rawpage.c
+++ b/contrib/pageinspect/rawpage.c
@@ -5,7 +5,7 @@
  *
  * Access-method specific inspection functions are in separate files.
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/pageinspect/rawpage.c
@@ -253,7 +253,7 @@ page_header(PG_FUNCTION_ARGS)
 	lsn = PageGetLSN(page);
 
 	/* pageinspect >= 1.2 uses pg_lsn instead of text for the LSN field. */
-	if (tupdesc->attrs[0]->atttypid == TEXTOID)
+	if (TupleDescAttr(tupdesc, 0)->atttypid == TEXTOID)
 	{
 		char		lsnchar[64];
 
diff --git a/contrib/pageinspect/sql/page.sql b/contrib/pageinspect/sql/page.sql
index 493ca9b211..8f35830e06 100644
--- a/contrib/pageinspect/sql/page.sql
+++ b/contrib/pageinspect/sql/page.sql
@@ -41,3 +41,11 @@ select get_raw_page('test_partitioned', 0); -- error about partitioned table
 create table test_part1 partition of test_partitioned for values from ( 1 ) to (100);
 select get_raw_page('test_part1', 0); -- get farther and error about empty table
 drop table test_partitioned;
+
+-- check null bitmap alignment for table whose number of attributes is multiple of 8
+create table test8 (f1 int, f2 int, f3 int, f4 int, f5 int, f6 int, f7 int, f8 int);
+insert into test8(f1, f8) values (x'7f00007f'::int, 0);
+select t_bits, t_data from heap_page_items(get_raw_page('test8', 0));
+select tuple_data_split('test8'::regclass, t_data, t_infomask, t_infomask2, t_bits)
+    from heap_page_items(get_raw_page('test8', 0));
+drop table test8;
diff --git a/contrib/passwordcheck/.gitignore b/contrib/passwordcheck/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/contrib/passwordcheck/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/contrib/passwordcheck/Makefile b/contrib/passwordcheck/Makefile
index 4652aeb3d7..4da0b1417c 100644
--- a/contrib/passwordcheck/Makefile
+++ b/contrib/passwordcheck/Makefile
@@ -8,6 +8,8 @@ PGFILEDESC = "passwordcheck - strengthen user password checks"
 # PG_CPPFLAGS = -DUSE_CRACKLIB '-DCRACKLIB_DICTPATH="/usr/lib/cracklib_dict"'
 # SHLIB_LINK = -lcrack
 
+REGRESS = passwordcheck
+
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS := $(shell $(PG_CONFIG) --pgxs)
diff --git a/contrib/passwordcheck/expected/passwordcheck.out b/contrib/passwordcheck/expected/passwordcheck.out
new file mode 100644
index 0000000000..e04cda6bd9
--- /dev/null
+++ b/contrib/passwordcheck/expected/passwordcheck.out
@@ -0,0 +1,19 @@
+LOAD 'passwordcheck';
+CREATE USER regress_user1;
+-- ok
+ALTER USER regress_user1 PASSWORD 'a_nice_long_password';
+-- error: too short
+ALTER USER regress_user1 PASSWORD 'tooshrt';
+ERROR:  password is too short
+-- error: contains user name
+ALTER USER regress_user1 PASSWORD 'xyzregress_user1';
+ERROR:  password must not contain user name
+-- error: contains only letters
+ALTER USER regress_user1 PASSWORD 'alessnicelongpassword';
+ERROR:  password must contain both letters and nonletters
+-- encrypted ok (password is "secret")
+ALTER USER regress_user1 PASSWORD 'md51a44d829a20a23eac686d9f0d258af13';
+-- error: password is user name
+ALTER USER regress_user1 PASSWORD 'md5e589150ae7d28f93333afae92b36ef48';
+ERROR:  password must not equal user name
+DROP USER regress_user1;
diff --git a/contrib/passwordcheck/passwordcheck.c b/contrib/passwordcheck/passwordcheck.c
index b80fd458ad..d3d9ff3676 100644
--- a/contrib/passwordcheck/passwordcheck.c
+++ b/contrib/passwordcheck/passwordcheck.c
@@ -3,7 +3,7 @@
  * passwordcheck.c
  *
  *
- * Copyright (c) 2009-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2009-2018, PostgreSQL Global Development Group
  *
  * Author: Laurenz Albe <laurenz.albe@wien.gv.at>
  *
@@ -70,7 +70,7 @@ check_password(const char *username,
 		if (plain_crypt_verify(username, shadow_pass, username, &logdetail) == STATUS_OK)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("password must not contain user name")));
+					 errmsg("password must not equal user name")));
 	}
 	else
 	{
diff --git a/contrib/passwordcheck/sql/passwordcheck.sql b/contrib/passwordcheck/sql/passwordcheck.sql
new file mode 100644
index 0000000000..d98796ac49
--- /dev/null
+++ b/contrib/passwordcheck/sql/passwordcheck.sql
@@ -0,0 +1,23 @@
+LOAD 'passwordcheck';
+
+CREATE USER regress_user1;
+
+-- ok
+ALTER USER regress_user1 PASSWORD 'a_nice_long_password';
+
+-- error: too short
+ALTER USER regress_user1 PASSWORD 'tooshrt';
+
+-- error: contains user name
+ALTER USER regress_user1 PASSWORD 'xyzregress_user1';
+
+-- error: contains only letters
+ALTER USER regress_user1 PASSWORD 'alessnicelongpassword';
+
+-- encrypted ok (password is "secret")
+ALTER USER regress_user1 PASSWORD 'md51a44d829a20a23eac686d9f0d258af13';
+
+-- error: password is user name
+ALTER USER regress_user1 PASSWORD 'md5e589150ae7d28f93333afae92b36ef48';
+
+DROP USER regress_user1;
diff --git a/contrib/pg_prewarm/Makefile b/contrib/pg_prewarm/Makefile
index 7ad941e72b..88580d1118 100644
--- a/contrib/pg_prewarm/Makefile
+++ b/contrib/pg_prewarm/Makefile
@@ -1,10 +1,10 @@
 # contrib/pg_prewarm/Makefile
 
 MODULE_big = pg_prewarm
-OBJS = pg_prewarm.o $(WIN32RES)
+OBJS = pg_prewarm.o autoprewarm.o $(WIN32RES)
 
 EXTENSION = pg_prewarm
-DATA = pg_prewarm--1.1.sql pg_prewarm--1.0--1.1.sql
+DATA = pg_prewarm--1.1--1.2.sql pg_prewarm--1.1.sql pg_prewarm--1.0--1.1.sql
 PGFILEDESC = "pg_prewarm - preload relation data into system buffer cache"
 
 ifdef USE_PGXS
diff --git a/contrib/pg_prewarm/autoprewarm.c b/contrib/pg_prewarm/autoprewarm.c
new file mode 100644
index 0000000000..f99f9c07af
--- /dev/null
+++ b/contrib/pg_prewarm/autoprewarm.c
@@ -0,0 +1,928 @@
+/*-------------------------------------------------------------------------
+ *
+ * autoprewarm.c
+ *		Periodically dump information about the blocks present in
+ *		shared_buffers, and reload them on server restart.
+ *
+ *		Due to locking considerations, we can't actually begin prewarming
+ *		until the server reaches a consistent state.  We need the catalogs
+ *		to be consistent so that we can figure out which relation to lock,
+ *		and we need to lock the relations so that we don't try to prewarm
+ *		pages from a relation that is in the process of being dropped.
+ *
+ *		While prewarming, autoprewarm will use two workers.  There's a
+ *		master worker that reads and sorts the list of blocks to be
+ *		prewarmed and then launches a per-database worker for each
+ *		relevant database in turn.  The former keeps running after the
+ *		initial prewarm is complete to update the dump file periodically.
+ *
+ *	Copyright (c) 2016-2018, PostgreSQL Global Development Group
+ *
+ *	IDENTIFICATION
+ *		contrib/pg_prewarm/autoprewarm.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+#include <unistd.h>
+
+#include "access/heapam.h"
+#include "access/xact.h"
+#include "catalog/pg_class.h"
+#include "catalog/pg_type.h"
+#include "miscadmin.h"
+#include "pgstat.h"
+#include "postmaster/bgworker.h"
+#include "storage/buf_internals.h"
+#include "storage/dsm.h"
+#include "storage/ipc.h"
+#include "storage/latch.h"
+#include "storage/lwlock.h"
+#include "storage/proc.h"
+#include "storage/procsignal.h"
+#include "storage/shmem.h"
+#include "storage/smgr.h"
+#include "tcop/tcopprot.h"
+#include "utils/acl.h"
+#include "utils/guc.h"
+#include "utils/memutils.h"
+#include "utils/rel.h"
+#include "utils/relfilenodemap.h"
+#include "utils/resowner.h"
+
+#define AUTOPREWARM_FILE "autoprewarm.blocks"
+
+/* Metadata for each block we dump. */
+typedef struct BlockInfoRecord
+{
+	Oid			database;
+	Oid			tablespace;
+	Oid			filenode;
+	ForkNumber	forknum;
+	BlockNumber blocknum;
+} BlockInfoRecord;
+
+/* Shared state information for autoprewarm bgworker. */
+typedef struct AutoPrewarmSharedState
+{
+	LWLock		lock;			/* mutual exclusion */
+	pid_t		bgworker_pid;	/* for main bgworker */
+	pid_t		pid_using_dumpfile; /* for autoprewarm or block dump */
+
+	/* Following items are for communication with per-database worker */
+	dsm_handle	block_info_handle;
+	Oid			database;
+	int64		prewarm_start_idx;
+	int64		prewarm_stop_idx;
+	int64		prewarmed_blocks;
+} AutoPrewarmSharedState;
+
+void		_PG_init(void);
+void		autoprewarm_main(Datum main_arg);
+void		autoprewarm_database_main(Datum main_arg);
+
+PG_FUNCTION_INFO_V1(autoprewarm_start_worker);
+PG_FUNCTION_INFO_V1(autoprewarm_dump_now);
+
+static void apw_load_buffers(void);
+static int64 apw_dump_now(bool is_bgworker, bool dump_unlogged);
+static void apw_start_master_worker(void);
+static void apw_start_database_worker(void);
+static bool apw_init_shmem(void);
+static void apw_detach_shmem(int code, Datum arg);
+static int	apw_compare_blockinfo(const void *p, const void *q);
+static void apw_sigterm_handler(SIGNAL_ARGS);
+static void apw_sighup_handler(SIGNAL_ARGS);
+
+/* Flags set by signal handlers */
+static volatile sig_atomic_t got_sigterm = false;
+static volatile sig_atomic_t got_sighup = false;
+
+/* Pointer to shared-memory state. */
+static AutoPrewarmSharedState *apw_state = NULL;
+
+/* GUC variables. */
+static bool autoprewarm = true; /* start worker? */
+static int	autoprewarm_interval;	/* dump interval */
+
+/*
+ * Module load callback.
+ */
+void
+_PG_init(void)
+{
+	DefineCustomIntVariable("pg_prewarm.autoprewarm_interval",
+							"Sets the interval between dumps of shared buffers",
+							"If set to zero, time-based dumping is disabled.",
+							&autoprewarm_interval,
+							300,
+							0, INT_MAX / 1000,
+							PGC_SIGHUP,
+							GUC_UNIT_S,
+							NULL,
+							NULL,
+							NULL);
+
+	if (!process_shared_preload_libraries_in_progress)
+		return;
+
+	/* can't define PGC_POSTMASTER variable after startup */
+	DefineCustomBoolVariable("pg_prewarm.autoprewarm",
+							 "Starts the autoprewarm worker.",
+							 NULL,
+							 &autoprewarm,
+							 true,
+							 PGC_POSTMASTER,
+							 0,
+							 NULL,
+							 NULL,
+							 NULL);
+
+	EmitWarningsOnPlaceholders("pg_prewarm");
+
+	RequestAddinShmemSpace(MAXALIGN(sizeof(AutoPrewarmSharedState)));
+
+	/* Register autoprewarm worker, if enabled. */
+	if (autoprewarm)
+		apw_start_master_worker();
+}
+
+/*
+ * Main entry point for the master autoprewarm process.  Per-database workers
+ * have a separate entry point.
+ */
+void
+autoprewarm_main(Datum main_arg)
+{
+	bool		first_time = true;
+	TimestampTz last_dump_time = 0;
+
+	/* Establish signal handlers; once that's done, unblock signals. */
+	pqsignal(SIGTERM, apw_sigterm_handler);
+	pqsignal(SIGHUP, apw_sighup_handler);
+	pqsignal(SIGUSR1, procsignal_sigusr1_handler);
+	BackgroundWorkerUnblockSignals();
+
+	/* Create (if necessary) and attach to our shared memory area. */
+	if (apw_init_shmem())
+		first_time = false;
+
+	/* Set on-detach hook so that our PID will be cleared on exit. */
+	on_shmem_exit(apw_detach_shmem, 0);
+
+	/*
+	 * Store our PID in the shared memory area --- unless there's already
+	 * another worker running, in which case just exit.
+	 */
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	if (apw_state->bgworker_pid != InvalidPid)
+	{
+		LWLockRelease(&apw_state->lock);
+		ereport(LOG,
+				(errmsg("autoprewarm worker is already running under PID %d",
+						apw_state->bgworker_pid)));
+		return;
+	}
+	apw_state->bgworker_pid = MyProcPid;
+	LWLockRelease(&apw_state->lock);
+
+	/*
+	 * Preload buffers from the dump file only if we just created the shared
+	 * memory region.  Otherwise, it's either already been done or shouldn't
+	 * be done - e.g. because the old dump file has been overwritten since the
+	 * server was started.
+	 *
+	 * There's not much point in performing a dump immediately after we finish
+	 * preloading; so, if we do end up preloading, consider the last dump time
+	 * to be equal to the current time.
+	 */
+	if (first_time)
+	{
+		apw_load_buffers();
+		last_dump_time = GetCurrentTimestamp();
+	}
+
+	/* Periodically dump buffers until terminated. */
+	while (!got_sigterm)
+	{
+		int			rc;
+
+		/* In case of a SIGHUP, just reload the configuration. */
+		if (got_sighup)
+		{
+			got_sighup = false;
+			ProcessConfigFile(PGC_SIGHUP);
+		}
+
+		if (autoprewarm_interval <= 0)
+		{
+			/* We're only dumping at shutdown, so just wait forever. */
+			rc = WaitLatch(&MyProc->procLatch,
+						   WL_LATCH_SET | WL_POSTMASTER_DEATH,
+						   -1L,
+						   PG_WAIT_EXTENSION);
+		}
+		else
+		{
+			long		delay_in_ms = 0;
+			TimestampTz next_dump_time = 0;
+			long		secs = 0;
+			int			usecs = 0;
+
+			/* Compute the next dump time. */
+			next_dump_time =
+				TimestampTzPlusMilliseconds(last_dump_time,
+											autoprewarm_interval * 1000);
+			TimestampDifference(GetCurrentTimestamp(), next_dump_time,
+								&secs, &usecs);
+			delay_in_ms = secs + (usecs / 1000);
+
+			/* Perform a dump if it's time. */
+			if (delay_in_ms <= 0)
+			{
+				last_dump_time = GetCurrentTimestamp();
+				apw_dump_now(true, false);
+				continue;
+			}
+
+			/* Sleep until the next dump time. */
+			rc = WaitLatch(&MyProc->procLatch,
+						   WL_LATCH_SET | WL_TIMEOUT | WL_POSTMASTER_DEATH,
+						   delay_in_ms,
+						   PG_WAIT_EXTENSION);
+		}
+
+		/* Reset the latch, bail out if postmaster died, otherwise loop. */
+		ResetLatch(&MyProc->procLatch);
+		if (rc & WL_POSTMASTER_DEATH)
+			proc_exit(1);
+	}
+
+	/*
+	 * Dump one last time.  We assume this is probably the result of a system
+	 * shutdown, although it's possible that we've merely been terminated.
+	 */
+	apw_dump_now(true, true);
+}
+
+/*
+ * Read the dump file and launch per-database workers one at a time to
+ * prewarm the buffers found there.
+ */
+static void
+apw_load_buffers(void)
+{
+	FILE	   *file = NULL;
+	int64		num_elements,
+				i;
+	BlockInfoRecord *blkinfo;
+	dsm_segment *seg;
+
+	/*
+	 * Skip the prewarm if the dump file is in use; otherwise, prevent any
+	 * other process from writing it while we're using it.
+	 */
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	if (apw_state->pid_using_dumpfile == InvalidPid)
+		apw_state->pid_using_dumpfile = MyProcPid;
+	else
+	{
+		LWLockRelease(&apw_state->lock);
+		ereport(LOG,
+				(errmsg("skipping prewarm because block dump file is being written by PID %d",
+						apw_state->pid_using_dumpfile)));
+		return;
+	}
+	LWLockRelease(&apw_state->lock);
+
+	/*
+	 * Open the block dump file.  Exit quietly if it doesn't exist, but report
+	 * any other error.
+	 */
+	file = AllocateFile(AUTOPREWARM_FILE, "r");
+	if (!file)
+	{
+		if (errno == ENOENT)
+		{
+			LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+			apw_state->pid_using_dumpfile = InvalidPid;
+			LWLockRelease(&apw_state->lock);
+			return;				/* No file to load. */
+		}
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not read file \"%s\": %m",
+						AUTOPREWARM_FILE)));
+	}
+
+	/* First line of the file is a record count. */
+	if (fscanf(file, "<<" INT64_FORMAT ">>\n", &num_elements) != 1)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not read from file \"%s\": %m",
+						AUTOPREWARM_FILE)));
+
+	/* Allocate a dynamic shared memory segment to store the record data. */
+	seg = dsm_create(sizeof(BlockInfoRecord) * num_elements, 0);
+	blkinfo = (BlockInfoRecord *) dsm_segment_address(seg);
+
+	/* Read records, one per line. */
+	for (i = 0; i < num_elements; i++)
+	{
+		unsigned	forknum;
+
+		if (fscanf(file, "%u,%u,%u,%u,%u\n", &blkinfo[i].database,
+				   &blkinfo[i].tablespace, &blkinfo[i].filenode,
+				   &forknum, &blkinfo[i].blocknum) != 5)
+			ereport(ERROR,
+					(errmsg("autoprewarm block dump file is corrupted at line " INT64_FORMAT,
+							i + 1)));
+		blkinfo[i].forknum = forknum;
+	}
+
+	FreeFile(file);
+
+	/* Sort the blocks to be loaded. */
+	pg_qsort(blkinfo, num_elements, sizeof(BlockInfoRecord),
+			 apw_compare_blockinfo);
+
+	/* Populate shared memory state. */
+	apw_state->block_info_handle = dsm_segment_handle(seg);
+	apw_state->prewarm_start_idx = apw_state->prewarm_stop_idx = 0;
+	apw_state->prewarmed_blocks = 0;
+
+	/* Get the info position of the first block of the next database. */
+	while (apw_state->prewarm_start_idx < num_elements)
+	{
+		uint32		i = apw_state->prewarm_start_idx;
+		Oid			current_db = blkinfo[i].database;
+
+		/*
+		 * Advance the prewarm_stop_idx to the first BlockRecordInfo that does
+		 * not belong to this database.
+		 */
+		i++;
+		while (i < num_elements)
+		{
+			if (current_db != blkinfo[i].database)
+			{
+				/*
+				 * Combine BlockRecordInfos for global objects with those of
+				 * the database.
+				 */
+				if (current_db != InvalidOid)
+					break;
+				current_db = blkinfo[i].database;
+			}
+
+			i++;
+		}
+
+		/*
+		 * If we reach this point with current_db == InvalidOid, then only
+		 * BlockRecordInfos belonging to global objects exist.  We can't
+		 * prewarm without a database connection, so just bail out.
+		 */
+		if (current_db == InvalidOid)
+			break;
+
+		/* Configure stop point and database for next per-database worker. */
+		apw_state->prewarm_stop_idx = i;
+		apw_state->database = current_db;
+		Assert(apw_state->prewarm_start_idx < apw_state->prewarm_stop_idx);
+
+		/* If we've run out of free buffers, don't launch another worker. */
+		if (!have_free_buffer())
+			break;
+
+		/*
+		 * Start a per-database worker to load blocks for this database; this
+		 * function will return once the per-database worker exits.
+		 */
+		apw_start_database_worker();
+
+		/* Prepare for next database. */
+		apw_state->prewarm_start_idx = apw_state->prewarm_stop_idx;
+	}
+
+	/* Clean up. */
+	dsm_detach(seg);
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	apw_state->block_info_handle = DSM_HANDLE_INVALID;
+	apw_state->pid_using_dumpfile = InvalidPid;
+	LWLockRelease(&apw_state->lock);
+
+	/* Report our success. */
+	ereport(LOG,
+			(errmsg("autoprewarm successfully prewarmed " INT64_FORMAT
+					" of " INT64_FORMAT " previously-loaded blocks",
+					apw_state->prewarmed_blocks, num_elements)));
+}
+
+/*
+ * Prewarm all blocks for one database (and possibly also global objects, if
+ * those got grouped with this database).
+ */
+void
+autoprewarm_database_main(Datum main_arg)
+{
+	uint32		pos;
+	BlockInfoRecord *block_info;
+	Relation	rel = NULL;
+	BlockNumber nblocks = 0;
+	BlockInfoRecord *old_blk = NULL;
+	dsm_segment *seg;
+
+	/* Establish signal handlers; once that's done, unblock signals. */
+	pqsignal(SIGTERM, die);
+	BackgroundWorkerUnblockSignals();
+
+	/* Connect to correct database and get block information. */
+	apw_init_shmem();
+	seg = dsm_attach(apw_state->block_info_handle);
+	if (seg == NULL)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("could not map dynamic shared memory segment")));
+	BackgroundWorkerInitializeConnectionByOid(apw_state->database, InvalidOid);
+	block_info = (BlockInfoRecord *) dsm_segment_address(seg);
+	pos = apw_state->prewarm_start_idx;
+
+	/*
+	 * Loop until we run out of blocks to prewarm or until we run out of free
+	 * buffers.
+	 */
+	while (pos < apw_state->prewarm_stop_idx && have_free_buffer())
+	{
+		BlockInfoRecord *blk = &block_info[pos++];
+		Buffer		buf;
+
+		CHECK_FOR_INTERRUPTS();
+
+		/*
+		 * Quit if we've reached records for another database. If previous
+		 * blocks are of some global objects, then continue pre-warming.
+		 */
+		if (old_blk != NULL && old_blk->database != blk->database &&
+			old_blk->database != 0)
+			break;
+
+		/*
+		 * As soon as we encounter a block of a new relation, close the old
+		 * relation. Note that rel will be NULL if try_relation_open failed
+		 * previously; in that case, there is nothing to close.
+		 */
+		if (old_blk != NULL && old_blk->filenode != blk->filenode &&
+			rel != NULL)
+		{
+			relation_close(rel, AccessShareLock);
+			rel = NULL;
+			CommitTransactionCommand();
+		}
+
+		/*
+		 * Try to open each new relation, but only once, when we first
+		 * encounter it. If it's been dropped, skip the associated blocks.
+		 */
+		if (old_blk == NULL || old_blk->filenode != blk->filenode)
+		{
+			Oid			reloid;
+
+			Assert(rel == NULL);
+			StartTransactionCommand();
+			reloid = RelidByRelfilenode(blk->tablespace, blk->filenode);
+			if (OidIsValid(reloid))
+				rel = try_relation_open(reloid, AccessShareLock);
+
+			if (!rel)
+				CommitTransactionCommand();
+		}
+		if (!rel)
+		{
+			old_blk = blk;
+			continue;
+		}
+
+		/* Once per fork, check for fork existence and size. */
+		if (old_blk == NULL ||
+			old_blk->filenode != blk->filenode ||
+			old_blk->forknum != blk->forknum)
+		{
+			RelationOpenSmgr(rel);
+
+			/*
+			 * smgrexists is not safe for illegal forknum, hence check whether
+			 * the passed forknum is valid before using it in smgrexists.
+			 */
+			if (blk->forknum > InvalidForkNumber &&
+				blk->forknum <= MAX_FORKNUM &&
+				smgrexists(rel->rd_smgr, blk->forknum))
+				nblocks = RelationGetNumberOfBlocksInFork(rel, blk->forknum);
+			else
+				nblocks = 0;
+		}
+
+		/* Check whether blocknum is valid and within fork file size. */
+		if (blk->blocknum >= nblocks)
+		{
+			/* Move to next forknum. */
+			old_blk = blk;
+			continue;
+		}
+
+		/* Prewarm buffer. */
+		buf = ReadBufferExtended(rel, blk->forknum, blk->blocknum, RBM_NORMAL,
+								 NULL);
+		if (BufferIsValid(buf))
+		{
+			apw_state->prewarmed_blocks++;
+			ReleaseBuffer(buf);
+		}
+
+		old_blk = blk;
+	}
+
+	dsm_detach(seg);
+
+	/* Release lock on previous relation. */
+	if (rel)
+	{
+		relation_close(rel, AccessShareLock);
+		CommitTransactionCommand();
+	}
+}
+
+/*
+ * Dump information on blocks in shared buffers.  We use a text format here
+ * so that it's easy to understand and even change the file contents if
+ * necessary.
+ */
+static int64
+apw_dump_now(bool is_bgworker, bool dump_unlogged)
+{
+	uint32		i;
+	int			ret;
+	int64		num_blocks;
+	BlockInfoRecord *block_info_array;
+	BufferDesc *bufHdr;
+	FILE	   *file;
+	char		transient_dump_file_path[MAXPGPATH];
+	pid_t		pid;
+
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	pid = apw_state->pid_using_dumpfile;
+	if (apw_state->pid_using_dumpfile == InvalidPid)
+		apw_state->pid_using_dumpfile = MyProcPid;
+	LWLockRelease(&apw_state->lock);
+
+	if (pid != InvalidPid)
+	{
+		if (!is_bgworker)
+			ereport(ERROR,
+					(errmsg("could not perform block dump because dump file is being used by PID %d",
+							apw_state->pid_using_dumpfile)));
+
+		ereport(LOG,
+				(errmsg("skipping block dump because it is already being performed by PID %d",
+						apw_state->pid_using_dumpfile)));
+		return 0;
+	}
+
+	block_info_array =
+		(BlockInfoRecord *) palloc(sizeof(BlockInfoRecord) * NBuffers);
+
+	for (num_blocks = 0, i = 0; i < NBuffers; i++)
+	{
+		uint32		buf_state;
+
+		CHECK_FOR_INTERRUPTS();
+
+		bufHdr = GetBufferDescriptor(i);
+
+		/* Lock each buffer header before inspecting. */
+		buf_state = LockBufHdr(bufHdr);
+
+		/*
+		 * Unlogged tables will be automatically truncated after a crash or
+		 * unclean shutdown. In such cases we need not prewarm them. Dump them
+		 * only if requested by caller.
+		 */
+		if (buf_state & BM_TAG_VALID &&
+			((buf_state & BM_PERMANENT) || dump_unlogged))
+		{
+			block_info_array[num_blocks].database = bufHdr->tag.rnode.dbNode;
+			block_info_array[num_blocks].tablespace = bufHdr->tag.rnode.spcNode;
+			block_info_array[num_blocks].filenode = bufHdr->tag.rnode.relNode;
+			block_info_array[num_blocks].forknum = bufHdr->tag.forkNum;
+			block_info_array[num_blocks].blocknum = bufHdr->tag.blockNum;
+			++num_blocks;
+		}
+
+		UnlockBufHdr(bufHdr, buf_state);
+	}
+
+	snprintf(transient_dump_file_path, MAXPGPATH, "%s.tmp", AUTOPREWARM_FILE);
+	file = AllocateFile(transient_dump_file_path, "w");
+	if (!file)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not open file \"%s\": %m",
+						transient_dump_file_path)));
+
+	ret = fprintf(file, "<<" INT64_FORMAT ">>\n", num_blocks);
+	if (ret < 0)
+	{
+		int			save_errno = errno;
+
+		FreeFile(file);
+		unlink(transient_dump_file_path);
+		errno = save_errno;
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not write to file \"%s\" : %m",
+						transient_dump_file_path)));
+	}
+
+	for (i = 0; i < num_blocks; i++)
+	{
+		CHECK_FOR_INTERRUPTS();
+
+		ret = fprintf(file, "%u,%u,%u,%u,%u\n",
+					  block_info_array[i].database,
+					  block_info_array[i].tablespace,
+					  block_info_array[i].filenode,
+					  (uint32) block_info_array[i].forknum,
+					  block_info_array[i].blocknum);
+		if (ret < 0)
+		{
+			int			save_errno = errno;
+
+			FreeFile(file);
+			unlink(transient_dump_file_path);
+			errno = save_errno;
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not write to file \"%s\" : %m",
+							transient_dump_file_path)));
+		}
+	}
+
+	pfree(block_info_array);
+
+	/*
+	 * Rename transient_dump_file_path to AUTOPREWARM_FILE to make things
+	 * permanent.
+	 */
+	ret = FreeFile(file);
+	if (ret != 0)
+	{
+		int			save_errno = errno;
+
+		unlink(transient_dump_file_path);
+		errno = save_errno;
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not close file \"%s\" : %m",
+						transient_dump_file_path)));
+	}
+
+	(void) durable_rename(transient_dump_file_path, AUTOPREWARM_FILE, ERROR);
+	apw_state->pid_using_dumpfile = InvalidPid;
+
+	ereport(DEBUG1,
+			(errmsg("wrote block details for " INT64_FORMAT " blocks",
+					num_blocks)));
+	return num_blocks;
+}
+
+/*
+ * SQL-callable function to launch autoprewarm.
+ */
+Datum
+autoprewarm_start_worker(PG_FUNCTION_ARGS)
+{
+	pid_t		pid;
+
+	if (!autoprewarm)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("autoprewarm is disabled")));
+
+	apw_init_shmem();
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	pid = apw_state->bgworker_pid;
+	LWLockRelease(&apw_state->lock);
+
+	if (pid != InvalidPid)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("autoprewarm worker is already running under PID %d",
+						pid)));
+
+	apw_start_master_worker();
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * SQL-callable function to perform an immediate block dump.
+ */
+Datum
+autoprewarm_dump_now(PG_FUNCTION_ARGS)
+{
+	int64		num_blocks;
+
+	apw_init_shmem();
+
+	PG_ENSURE_ERROR_CLEANUP(apw_detach_shmem, 0);
+	{
+		num_blocks = apw_dump_now(false, true);
+	}
+	PG_END_ENSURE_ERROR_CLEANUP(apw_detach_shmem, 0);
+
+	PG_RETURN_INT64(num_blocks);
+}
+
+/*
+ * Allocate and initialize autoprewarm related shared memory, if not already
+ * done, and set up backend-local pointer to that state.  Returns true if an
+ * existing shared memory segment was found.
+ */
+static bool
+apw_init_shmem(void)
+{
+	bool		found;
+
+	LWLockAcquire(AddinShmemInitLock, LW_EXCLUSIVE);
+	apw_state = ShmemInitStruct("autoprewarm",
+								sizeof(AutoPrewarmSharedState),
+								&found);
+	if (!found)
+	{
+		/* First time through ... */
+		LWLockInitialize(&apw_state->lock, LWLockNewTrancheId());
+		apw_state->bgworker_pid = InvalidPid;
+		apw_state->pid_using_dumpfile = InvalidPid;
+	}
+	LWLockRelease(AddinShmemInitLock);
+
+	LWLockRegisterTranche(apw_state->lock.tranche, "autoprewarm");
+
+	return found;
+}
+
+/*
+ * Clear our PID from autoprewarm shared state.
+ */
+static void
+apw_detach_shmem(int code, Datum arg)
+{
+	LWLockAcquire(&apw_state->lock, LW_EXCLUSIVE);
+	if (apw_state->pid_using_dumpfile == MyProcPid)
+		apw_state->pid_using_dumpfile = InvalidPid;
+	if (apw_state->bgworker_pid == MyProcPid)
+		apw_state->bgworker_pid = InvalidPid;
+	LWLockRelease(&apw_state->lock);
+}
+
+/*
+ * Start autoprewarm master worker process.
+ */
+static void
+apw_start_master_worker(void)
+{
+	BackgroundWorker worker;
+	BackgroundWorkerHandle *handle;
+	BgwHandleStatus status;
+	pid_t		pid;
+
+	MemSet(&worker, 0, sizeof(BackgroundWorker));
+	worker.bgw_flags = BGWORKER_SHMEM_ACCESS;
+	worker.bgw_start_time = BgWorkerStart_ConsistentState;
+	strcpy(worker.bgw_library_name, "pg_prewarm");
+	strcpy(worker.bgw_function_name, "autoprewarm_main");
+	strcpy(worker.bgw_name, "autoprewarm master");
+	strcpy(worker.bgw_type, "autoprewarm master");
+
+	if (process_shared_preload_libraries_in_progress)
+	{
+		RegisterBackgroundWorker(&worker);
+		return;
+	}
+
+	/* must set notify PID to wait for startup */
+	worker.bgw_notify_pid = MyProcPid;
+
+	if (!RegisterDynamicBackgroundWorker(&worker, &handle))
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
+				 errmsg("could not register background process"),
+				 errhint("You may need to increase max_worker_processes.")));
+
+	status = WaitForBackgroundWorkerStartup(handle, &pid);
+	if (status != BGWH_STARTED)
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
+				 errmsg("could not start background process"),
+				 errhint("More details may be available in the server log.")));
+}
+
+/*
+ * Start autoprewarm per-database worker process.
+ */
+static void
+apw_start_database_worker(void)
+{
+	BackgroundWorker worker;
+	BackgroundWorkerHandle *handle;
+
+	MemSet(&worker, 0, sizeof(BackgroundWorker));
+	worker.bgw_flags =
+		BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION;
+	worker.bgw_start_time = BgWorkerStart_ConsistentState;
+	strcpy(worker.bgw_library_name, "pg_prewarm");
+	strcpy(worker.bgw_function_name, "autoprewarm_database_main");
+	strcpy(worker.bgw_name, "autoprewarm worker");
+	strcpy(worker.bgw_type, "autoprewarm worker");
+
+	/* must set notify PID to wait for shutdown */
+	worker.bgw_notify_pid = MyProcPid;
+
+	if (!RegisterDynamicBackgroundWorker(&worker, &handle))
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_RESOURCES),
+				 errmsg("registering dynamic bgworker autoprewarm failed"),
+				 errhint("Consider increasing configuration parameter \"max_worker_processes\".")));
+
+	/*
+	 * Ignore return value; if it fails, postmaster has died, but we have
+	 * checks for that elsewhere.
+	 */
+	WaitForBackgroundWorkerShutdown(handle);
+}
+
+/* Compare member elements to check whether they are not equal. */
+#define cmp_member_elem(fld)	\
+do { \
+	if (a->fld < b->fld)		\
+		return -1;				\
+	else if (a->fld > b->fld)	\
+		return 1;				\
+} while(0);
+
+/*
+ * apw_compare_blockinfo
+ *
+ * We depend on all records for a particular database being consecutive
+ * in the dump file; each per-database worker will preload blocks until
+ * it sees a block for some other database.  Sorting by tablespace,
+ * filenode, forknum, and blocknum isn't critical for correctness, but
+ * helps us get a sequential I/O pattern.
+ */
+static int
+apw_compare_blockinfo(const void *p, const void *q)
+{
+	BlockInfoRecord *a = (BlockInfoRecord *) p;
+	BlockInfoRecord *b = (BlockInfoRecord *) q;
+
+	cmp_member_elem(database);
+	cmp_member_elem(tablespace);
+	cmp_member_elem(filenode);
+	cmp_member_elem(forknum);
+	cmp_member_elem(blocknum);
+
+	return 0;
+}
+
+/*
+ * Signal handler for SIGTERM
+ */
+static void
+apw_sigterm_handler(SIGNAL_ARGS)
+{
+	int			save_errno = errno;
+
+	got_sigterm = true;
+
+	if (MyProc)
+		SetLatch(&MyProc->procLatch);
+
+	errno = save_errno;
+}
+
+/*
+ * Signal handler for SIGHUP
+ */
+static void
+apw_sighup_handler(SIGNAL_ARGS)
+{
+	int			save_errno = errno;
+
+	got_sighup = true;
+
+	if (MyProc)
+		SetLatch(&MyProc->procLatch);
+
+	errno = save_errno;
+}
diff --git a/contrib/pg_prewarm/pg_prewarm--1.1--1.2.sql b/contrib/pg_prewarm/pg_prewarm--1.1--1.2.sql
new file mode 100644
index 0000000000..2381c06eb9
--- /dev/null
+++ b/contrib/pg_prewarm/pg_prewarm--1.1--1.2.sql
@@ -0,0 +1,14 @@
+/* contrib/pg_prewarm/pg_prewarm--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION pg_prewarm UPDATE TO '1.2'" to load this file. \quit
+
+CREATE FUNCTION autoprewarm_start_worker()
+RETURNS VOID STRICT
+AS 'MODULE_PATHNAME', 'autoprewarm_start_worker'
+LANGUAGE C;
+
+CREATE FUNCTION autoprewarm_dump_now()
+RETURNS pg_catalog.int8 STRICT
+AS 'MODULE_PATHNAME', 'autoprewarm_dump_now'
+LANGUAGE C;
diff --git a/contrib/pg_prewarm/pg_prewarm.c b/contrib/pg_prewarm/pg_prewarm.c
index fec62b1a54..7f084462b1 100644
--- a/contrib/pg_prewarm/pg_prewarm.c
+++ b/contrib/pg_prewarm/pg_prewarm.c
@@ -3,7 +3,7 @@
  * pg_prewarm.c
  *		  prewarming utilities
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/pg_prewarm/pg_prewarm.c
@@ -107,7 +107,7 @@ pg_prewarm(PG_FUNCTION_ARGS)
 	rel = relation_open(relOid, AccessShareLock);
 	aclresult = pg_class_aclcheck(relOid, GetUserId(), ACL_SELECT);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS, get_rel_name(relOid));
+		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind), get_rel_name(relOid));
 
 	/* Check that the fork exists. */
 	RelationOpenSmgr(rel);
diff --git a/contrib/pg_prewarm/pg_prewarm.control b/contrib/pg_prewarm/pg_prewarm.control
index cf2fb92bed..40e3add481 100644
--- a/contrib/pg_prewarm/pg_prewarm.control
+++ b/contrib/pg_prewarm/pg_prewarm.control
@@ -1,5 +1,5 @@
 # pg_prewarm extension
 comment = 'prewarm relation data'
-default_version = '1.1'
+default_version = '1.2'
 module_pathname = '$libdir/pg_prewarm'
 relocatable = true
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
index d7fa2a80c6..cb785971a9 100644
--- a/contrib/pg_standby/pg_standby.c
+++ b/contrib/pg_standby/pg_standby.c
@@ -36,6 +36,8 @@
 
 const char *progname;
 
+int			WalSegSz = -1;
+
 /* Options and defaults */
 int			sleeptime = 5;		/* amount of time to sleep between file checks */
 int			waittime = -1;		/* how long we have been waiting, -1 no wait
@@ -100,6 +102,10 @@ int			nextWALFileType;
 
 struct stat stat_buf;
 
+static bool SetWALFileNameForCleanup(void);
+static bool SetWALSegSize(void);
+
+
 /* =====================================================================
  *
  *		  Customizable section
@@ -175,6 +181,35 @@ CustomizableNextWALFileReady(void)
 {
 	if (stat(WALFilePath, &stat_buf) == 0)
 	{
+		/*
+		 * If we've not seen any WAL segments, we don't know the WAL segment
+		 * size, which we need. If it looks like a WAL segment, determine size
+		 * of segments for the cluster.
+		 */
+		if (WalSegSz == -1 && IsXLogFileName(nextWALFileName))
+		{
+			if (SetWALSegSize())
+			{
+				/*
+				 * Successfully determined WAL segment size. Can compute
+				 * cleanup cutoff now.
+				 */
+				need_cleanup = SetWALFileNameForCleanup();
+				if (debug)
+				{
+					fprintf(stderr,
+							_("WAL segment size:     %d \n"), WalSegSz);
+					fprintf(stderr, "Keep archive history: ");
+
+					if (need_cleanup)
+						fprintf(stderr, "%s and later\n",
+								exclusiveCleanupFileName);
+					else
+						fprintf(stderr, "no cleanup required\n");
+				}
+			}
+		}
+
 		/*
 		 * If it's a backup file, return immediately. If it's a regular file
 		 * return only if it's the right size already.
@@ -184,7 +219,7 @@ CustomizableNextWALFileReady(void)
 			nextWALFileType = XLOG_BACKUP_LABEL;
 			return true;
 		}
-		else if (stat_buf.st_size == XLOG_SEG_SIZE)
+		else if (WalSegSz > 0 && stat_buf.st_size == WalSegSz)
 		{
 #ifdef WIN32
 
@@ -204,7 +239,7 @@ CustomizableNextWALFileReady(void)
 		/*
 		 * If still too small, wait until it is the correct size
 		 */
-		if (stat_buf.st_size > XLOG_SEG_SIZE)
+		if (WalSegSz > 0 && stat_buf.st_size > WalSegSz)
 		{
 			if (debug)
 			{
@@ -218,8 +253,6 @@ CustomizableNextWALFileReady(void)
 	return false;
 }
 
-#define MaxSegmentsPerLogFile ( 0xFFFFFFFF / XLOG_SEG_SIZE )
-
 static void
 CustomizableCleanupPriorWALFiles(void)
 {
@@ -315,6 +348,7 @@ SetWALFileNameForCleanup(void)
 	uint32		log_diff = 0,
 				seg_diff = 0;
 	bool		cleanup = false;
+	int			max_segments_per_logfile = (0xFFFFFFFF / WalSegSz);
 
 	if (restartWALFileName)
 	{
@@ -336,12 +370,12 @@ SetWALFileNameForCleanup(void)
 		sscanf(nextWALFileName, "%08X%08X%08X", &tli, &log, &seg);
 		if (tli > 0 && seg > 0)
 		{
-			log_diff = keepfiles / MaxSegmentsPerLogFile;
-			seg_diff = keepfiles % MaxSegmentsPerLogFile;
+			log_diff = keepfiles / max_segments_per_logfile;
+			seg_diff = keepfiles % max_segments_per_logfile;
 			if (seg_diff > seg)
 			{
 				log_diff++;
-				seg = MaxSegmentsPerLogFile - (seg_diff - seg);
+				seg = max_segments_per_logfile - (seg_diff - seg);
 			}
 			else
 				seg -= seg_diff;
@@ -364,6 +398,74 @@ SetWALFileNameForCleanup(void)
 	return cleanup;
 }
 
+/*
+ * Try to set the wal segment size from the WAL file specified by WALFilePath.
+ *
+ * Return true if size could be determined, false otherwise.
+ */
+static bool
+SetWALSegSize(void)
+{
+	bool		ret_val = false;
+	int			fd;
+
+	/* malloc this buffer to ensure sufficient alignment: */
+	char	   *buf = (char *) pg_malloc(XLOG_BLCKSZ);
+
+	Assert(WalSegSz == -1);
+
+	if ((fd = open(WALFilePath, O_RDWR, 0)) < 0)
+	{
+		fprintf(stderr, "%s: could not open WAL file \"%s\": %s\n",
+				progname, WALFilePath, strerror(errno));
+		pg_free(buf);
+		return false;
+	}
+
+	errno = 0;
+	if (read(fd, buf, XLOG_BLCKSZ) == XLOG_BLCKSZ)
+	{
+		XLogLongPageHeader longhdr = (XLogLongPageHeader) buf;
+
+		WalSegSz = longhdr->xlp_seg_size;
+
+		if (IsValidWalSegSize(WalSegSz))
+		{
+			/* successfully retrieved WAL segment size */
+			ret_val = true;
+		}
+		else
+			fprintf(stderr,
+					"%s: WAL segment size must be a power of two between 1MB and 1GB, but the WAL file header specifies %d bytes\n",
+					progname, WalSegSz);
+	}
+	else
+	{
+		/*
+		 * Don't complain loudly, this is to be expected for segments being
+		 * created.
+		 */
+		if (errno != 0)
+		{
+			if (debug)
+				fprintf(stderr, "could not read file \"%s\": %s\n",
+						WALFilePath, strerror(errno));
+		}
+		else
+		{
+			if (debug)
+				fprintf(stderr, "not enough data in file \"%s\"\n",
+						WALFilePath);
+		}
+	}
+
+	fflush(stderr);
+
+	close(fd);
+	pg_free(buf);
+	return ret_val;
+}
+
 /*
  * CheckForExternalTrigger()
  *
@@ -708,8 +810,6 @@ main(int argc, char **argv)
 
 	CustomizableInitialize();
 
-	need_cleanup = SetWALFileNameForCleanup();
-
 	if (debug)
 	{
 		fprintf(stderr, "Trigger file:         %s\n", triggerPath ? triggerPath : "<not set>");
@@ -721,11 +821,6 @@ main(int argc, char **argv)
 		fprintf(stderr, "Max wait interval:    %d %s\n",
 				maxwaittime, (maxwaittime > 0 ? "seconds" : "forever"));
 		fprintf(stderr, "Command for restore:  %s\n", restoreCommand);
-		fprintf(stderr, "Keep archive history: ");
-		if (need_cleanup)
-			fprintf(stderr, "%s and later\n", exclusiveCleanupFileName);
-		else
-			fprintf(stderr, "no cleanup required\n");
 		fflush(stderr);
 	}
 
diff --git a/contrib/pg_stat_statements/pg_stat_statements.c b/contrib/pg_stat_statements/pg_stat_statements.c
index fa409d72b7..928673498a 100644
--- a/contrib/pg_stat_statements/pg_stat_statements.c
+++ b/contrib/pg_stat_statements/pg_stat_statements.c
@@ -21,7 +21,7 @@
  * as the collations of Vars and, most notably, the values of constants.
  *
  * This jumble is acquired at the end of parse analysis of each query, and
- * a 32-bit hash of it is stored into the query's Query.queryId field.
+ * a 64-bit hash of it is stored into the query's Query.queryId field.
  * The server then copies this value around, making it available in plan
  * tree(s) generated from the query.  The executor can then use this value
  * to blame query costs on the proper queryId.
@@ -48,7 +48,7 @@
  * in the file to be read or written while holding only shared lock.
  *
  *
- * Copyright (c) 2008-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2008-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/pg_stat_statements/pg_stat_statements.c
@@ -95,7 +95,7 @@ PG_MODULE_MAGIC;
 #define PGSS_TEXT_FILE	PG_STAT_TMP_DIR "/pgss_query_texts.stat"
 
 /* Magic number identifying the stats file format */
-static const uint32 PGSS_FILE_HEADER = 0x20140125;
+static const uint32 PGSS_FILE_HEADER = 0x20171004;
 
 /* PostgreSQL major version number, changes in which invalidate all entries */
 static const uint32 PGSS_PG_MAJOR_VERSION = PG_VERSION_NUM / 100;
@@ -125,12 +125,17 @@ typedef enum pgssVersion
 /*
  * Hashtable key that defines the identity of a hashtable entry.  We separate
  * queries by user and by database even if they are otherwise identical.
+ *
+ * Right now, this structure contains no padding.  If you add any, make sure
+ * to teach pgss_store() to zero the padding bytes.  Otherwise, things will
+ * break, because pgss_hash is created using HASH_BLOBS, and thus tag_hash
+ * is used to hash this.
  */
 typedef struct pgssHashKey
 {
 	Oid			userid;			/* user OID */
 	Oid			dbid;			/* database OID */
-	uint32		queryid;		/* query identifier */
+	uint64		queryid;		/* query identifier */
 } pgssHashKey;
 
 /*
@@ -301,10 +306,8 @@ static void pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 					ProcessUtilityContext context, ParamListInfo params,
 					QueryEnvironment *queryEnv,
 					DestReceiver *dest, char *completionTag);
-static uint32 pgss_hash_fn(const void *key, Size keysize);
-static int	pgss_match_fn(const void *key1, const void *key2, Size keysize);
-static uint32 pgss_hash_string(const char *str, int len);
-static void pgss_store(const char *query, uint32 queryId,
+static uint64 pgss_hash_string(const char *str, int len);
+static void pgss_store(const char *query, uint64 queryId,
 		   int query_location, int query_len,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
@@ -500,12 +503,10 @@ pgss_shmem_startup(void)
 	memset(&info, 0, sizeof(info));
 	info.keysize = sizeof(pgssHashKey);
 	info.entrysize = sizeof(pgssEntry);
-	info.hash = pgss_hash_fn;
-	info.match = pgss_match_fn;
 	pgss_hash = ShmemInitHash("pg_stat_statements hash",
 							  pgss_max, pgss_max,
 							  &info,
-							  HASH_ELEM | HASH_FUNCTION | HASH_COMPARE);
+							  HASH_ELEM | HASH_BLOBS);
 
 	LWLockRelease(AddinShmemInitLock);
 
@@ -781,7 +782,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 		prev_post_parse_analyze_hook(pstate, query);
 
 	/* Assert we didn't do this already */
-	Assert(query->queryId == 0);
+	Assert(query->queryId == UINT64CONST(0));
 
 	/* Safety check... */
 	if (!pgss || !pgss_hash)
@@ -797,7 +798,7 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 	 */
 	if (query->utilityStmt)
 	{
-		query->queryId = 0;
+		query->queryId = UINT64CONST(0);
 		return;
 	}
 
@@ -812,14 +813,15 @@ pgss_post_parse_analyze(ParseState *pstate, Query *query)
 
 	/* Compute query ID and mark the Query node with it */
 	JumbleQuery(&jstate, query);
-	query->queryId = hash_any(jstate.jumble, jstate.jumble_len);
+	query->queryId =
+		DatumGetUInt64(hash_any_extended(jstate.jumble, jstate.jumble_len, 0));
 
 	/*
 	 * If we are unlucky enough to get a hash of zero, use 1 instead, to
 	 * prevent confusion with the utility-statement case.
 	 */
-	if (query->queryId == 0)
-		query->queryId = 1;
+	if (query->queryId == UINT64CONST(0))
+		query->queryId = UINT64CONST(1);
 
 	/*
 	 * If we were able to identify any ignorable constants, we immediately
@@ -855,7 +857,7 @@ pgss_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	 * counting of optimizable statements that are directly contained in
 	 * utility statements.
 	 */
-	if (pgss_enabled() && queryDesc->plannedstmt->queryId != 0)
+	if (pgss_enabled() && queryDesc->plannedstmt->queryId != UINT64CONST(0))
 	{
 		/*
 		 * Set up to track total elapsed time in ExecutorRun.  Make sure the
@@ -926,9 +928,9 @@ pgss_ExecutorFinish(QueryDesc *queryDesc)
 static void
 pgss_ExecutorEnd(QueryDesc *queryDesc)
 {
-	uint32		queryId = queryDesc->plannedstmt->queryId;
+	uint64		queryId = queryDesc->plannedstmt->queryId;
 
-	if (queryId != 0 && queryDesc->totaltime && pgss_enabled())
+	if (queryId != UINT64CONST(0) && queryDesc->totaltime && pgss_enabled())
 	{
 		/*
 		 * Make sure stats accumulation is done.  (Note: it's okay if several
@@ -1069,45 +1071,16 @@ pgss_ProcessUtility(PlannedStmt *pstmt, const char *queryString,
 	}
 }
 
-/*
- * Calculate hash value for a key
- */
-static uint32
-pgss_hash_fn(const void *key, Size keysize)
-{
-	const pgssHashKey *k = (const pgssHashKey *) key;
-
-	return hash_uint32((uint32) k->userid) ^
-		hash_uint32((uint32) k->dbid) ^
-		hash_uint32((uint32) k->queryid);
-}
-
-/*
- * Compare two keys - zero means match
- */
-static int
-pgss_match_fn(const void *key1, const void *key2, Size keysize)
-{
-	const pgssHashKey *k1 = (const pgssHashKey *) key1;
-	const pgssHashKey *k2 = (const pgssHashKey *) key2;
-
-	if (k1->userid == k2->userid &&
-		k1->dbid == k2->dbid &&
-		k1->queryid == k2->queryid)
-		return 0;
-	else
-		return 1;
-}
-
 /*
  * Given an arbitrarily long query string, produce a hash for the purposes of
  * identifying the query, without normalizing constants.  Used when hashing
  * utility statements.
  */
-static uint32
+static uint64
 pgss_hash_string(const char *str, int len)
 {
-	return hash_any((const unsigned char *) str, len);
+	return DatumGetUInt64(hash_any_extended((const unsigned char *) str,
+											len, 0));
 }
 
 /*
@@ -1121,7 +1094,7 @@ pgss_hash_string(const char *str, int len)
  * query string.  total_time, rows, bufusage are ignored in this case.
  */
 static void
-pgss_store(const char *query, uint32 queryId,
+pgss_store(const char *query, uint64 queryId,
 		   int query_location, int query_len,
 		   double total_time, uint64 rows,
 		   const BufferUsage *bufusage,
@@ -1173,7 +1146,7 @@ pgss_store(const char *query, uint32 queryId,
 	/*
 	 * For utility statements, we just hash the query string to get an ID.
 	 */
-	if (queryId == 0)
+	if (queryId == UINT64CONST(0))
 		queryId = pgss_hash_string(query, query_len);
 
 	/* Set up key for hashtable search */
@@ -1869,8 +1842,7 @@ qtext_store(const char *query, int query_len,
 	*query_offset = off;
 
 	/* Now write the data into the successfully-reserved part of the file */
-	fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDWR | O_CREAT | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDWR | O_CREAT | PG_BINARY);
 	if (fd < 0)
 		goto error;
 
@@ -1934,7 +1906,7 @@ qtext_load_file(Size *buffer_size)
 	int			fd;
 	struct stat stat;
 
-	fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(PGSS_TEXT_FILE, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 	{
 		if (errno != ENOENT)
@@ -2325,8 +2297,10 @@ AppendJumble(pgssJumbleState *jstate, const unsigned char *item, Size size)
 
 		if (jumble_len >= JUMBLE_SIZE)
 		{
-			uint32		start_hash = hash_any(jumble, JUMBLE_SIZE);
+			uint64		start_hash;
 
+			start_hash = DatumGetUInt64(hash_any_extended(jumble,
+														  JUMBLE_SIZE, 0));
 			memcpy(jumble, &start_hash, sizeof(start_hash));
 			jumble_len = sizeof(start_hash);
 		}
@@ -2631,6 +2605,7 @@ JumbleExpr(pgssJumbleState *jstate, Node *node)
 
 				APP_JUMB(acexpr->resulttype);
 				JumbleExpr(jstate, (Node *) acexpr->arg);
+				JumbleExpr(jstate, (Node *) acexpr->elemexpr);
 			}
 			break;
 		case T_ConvertRowtypeExpr:
diff --git a/contrib/pg_trgm/expected/pg_trgm.out b/contrib/pg_trgm/expected/pg_trgm.out
index c3304b0ceb..6efc54356a 100644
--- a/contrib/pg_trgm/expected/pg_trgm.out
+++ b/contrib/pg_trgm/expected/pg_trgm.out
@@ -7,6 +7,9 @@ WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid);
 --------+---------
 (0 rows)
 
+--backslash is used in tests below, installcheck will fail if
+--standard_conforming_string is off
+set standard_conforming_strings=on;
 select show_trgm('');
  show_trgm 
 -----------
diff --git a/contrib/pg_trgm/sql/pg_trgm.sql b/contrib/pg_trgm/sql/pg_trgm.sql
index fe8d0a7495..96ae542320 100644
--- a/contrib/pg_trgm/sql/pg_trgm.sql
+++ b/contrib/pg_trgm/sql/pg_trgm.sql
@@ -5,6 +5,10 @@ SELECT amname, opcname
 FROM pg_opclass opc LEFT JOIN pg_am am ON am.oid = opcmethod
 WHERE opc.oid >= 16384 AND NOT amvalidate(opc.oid);
 
+--backslash is used in tests below, installcheck will fail if
+--standard_conforming_string is off
+set standard_conforming_strings=on;
+
 select show_trgm('');
 select show_trgm('(*&^$@%@');
 select show_trgm('a b c');
diff --git a/contrib/pg_trgm/trgm_gist.c b/contrib/pg_trgm/trgm_gist.c
index ed02af875c..e55dc19a65 100644
--- a/contrib/pg_trgm/trgm_gist.c
+++ b/contrib/pg_trgm/trgm_gist.c
@@ -106,7 +106,7 @@ gtrgm_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else if (ISSIGNKEY(DatumGetPointer(entry->key)) &&
 			 !ISALLTRUE(DatumGetPointer(entry->key)))
@@ -130,7 +130,7 @@ gtrgm_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	PG_RETURN_POINTER(retval);
 }
diff --git a/contrib/pg_trgm/trgm_regexp.c b/contrib/pg_trgm/trgm_regexp.c
index 1d474e2aac..547e7c094f 100644
--- a/contrib/pg_trgm/trgm_regexp.c
+++ b/contrib/pg_trgm/trgm_regexp.c
@@ -181,7 +181,7 @@
  * 7) Mark state 3 final because state 5 of source NFA is marked as final.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -634,7 +634,7 @@ createTrgmNFAInternal(regex_t *regex, TrgmPackedGraph **graph,
  * Main entry point for evaluating a graph during index scanning.
  *
  * The check[] array is indexed by trigram number (in the array of simple
- * trigrams returned by createTrgmNFA), and holds TRUE for those trigrams
+ * trigrams returned by createTrgmNFA), and holds true for those trigrams
  * that are present in the index entry being checked.
  */
 bool
@@ -1451,7 +1451,7 @@ prefixContains(TrgmPrefix *prefix1, TrgmPrefix *prefix2)
  * Get vector of all color trigrams in graph and select which of them
  * to expand into simple trigrams.
  *
- * Returns TRUE if OK, FALSE if exhausted resource limits.
+ * Returns true if OK, false if exhausted resource limits.
  */
 static bool
 selectColorTrigrams(TrgmNFA *trgmNFA)
diff --git a/contrib/pg_visibility/pg_visibility.c b/contrib/pg_visibility/pg_visibility.c
index 2cc9575d9f..944dea66fc 100644
--- a/contrib/pg_visibility/pg_visibility.c
+++ b/contrib/pg_visibility/pg_visibility.c
@@ -3,7 +3,7 @@
  * pg_visibility.c
  *	  display visibility map information and page-level visibility bits
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  *	  contrib/pg_visibility/pg_visibility.c
  *-------------------------------------------------------------------------
diff --git a/contrib/pgcrypto/crypt-des.c b/contrib/pgcrypto/crypt-des.c
index 60bdbb0c91..ed07fc4606 100644
--- a/contrib/pgcrypto/crypt-des.c
+++ b/contrib/pgcrypto/crypt-des.c
@@ -62,13 +62,10 @@
 
 #include "postgres.h"
 #include "miscadmin.h"
+#include "port/pg_bswap.h"
 
 #include "px-crypt.h"
 
-/* for ntohl/htonl */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #define _PASSWORD_EFMT1 '_'
 
 static const char _crypt_a64[] =
@@ -206,18 +203,18 @@ static inline int
 ascii_to_bin(char ch)
 {
 	if (ch > 'z')
-		return (0);
+		return 0;
 	if (ch >= 'a')
 		return (ch - 'a' + 38);
 	if (ch > 'Z')
-		return (0);
+		return 0;
 	if (ch >= 'A')
 		return (ch - 'A' + 12);
 	if (ch > '9')
-		return (0);
+		return 0;
 	if (ch >= '.')
 		return (ch - '.');
-	return (0);
+	return 0;
 }
 
 static void
@@ -408,8 +405,8 @@ des_setkey(const char *key)
 	if (!des_initialised)
 		des_init();
 
-	rawkey0 = ntohl(*(const uint32 *) key);
-	rawkey1 = ntohl(*(const uint32 *) (key + 4));
+	rawkey0 = pg_ntoh32(*(const uint32 *) key);
+	rawkey1 = pg_ntoh32(*(const uint32 *) (key + 4));
 
 	if ((rawkey0 | rawkey1)
 		&& rawkey0 == old_rawkey0
@@ -420,7 +417,7 @@ des_setkey(const char *key)
 		 * (which is weak and has bad parity anyway) in order to simplify the
 		 * starting conditions.
 		 */
-		return (0);
+		return 0;
 	}
 	old_rawkey0 = rawkey0;
 	old_rawkey1 = rawkey1;
@@ -479,7 +476,7 @@ des_setkey(const char *key)
 			| comp_maskr[6][(t1 >> 7) & 0x7f]
 			| comp_maskr[7][t1 & 0x7f];
 	}
-	return (0);
+	return 0;
 }
 
 static int
@@ -500,7 +497,7 @@ do_des(uint32 l_in, uint32 r_in, uint32 *l_out, uint32 *r_out, int count)
 	int			round;
 
 	if (count == 0)
-		return (1);
+		return 1;
 	else if (count > 0)
 	{
 		/*
@@ -613,7 +610,7 @@ do_des(uint32 l_in, uint32 r_in, uint32 *l_out, uint32 *r_out, int count)
 		| fp_maskr[5][(r >> 16) & 0xff]
 		| fp_maskr[6][(r >> 8) & 0xff]
 		| fp_maskr[7][r & 0xff];
-	return (0);
+	return 0;
 }
 
 static int
@@ -634,20 +631,20 @@ des_cipher(const char *in, char *out, long salt, int count)
 	/* copy data to avoid assuming input is word-aligned */
 	memcpy(buffer, in, sizeof(buffer));
 
-	rawl = ntohl(buffer[0]);
-	rawr = ntohl(buffer[1]);
+	rawl = pg_ntoh32(buffer[0]);
+	rawr = pg_ntoh32(buffer[1]);
 
 	retval = do_des(rawl, rawr, &l_out, &r_out, count);
 	if (retval)
-		return (retval);
+		return retval;
 
-	buffer[0] = htonl(l_out);
-	buffer[1] = htonl(r_out);
+	buffer[0] = pg_hton32(l_out);
+	buffer[1] = pg_hton32(r_out);
 
 	/* copy data to avoid assuming output is word-aligned */
 	memcpy(out, buffer, sizeof(buffer));
 
-	return (retval);
+	return retval;
 }
 
 char *
@@ -680,7 +677,7 @@ px_crypt_des(const char *key, const char *setting)
 			key++;
 	}
 	if (des_setkey((char *) keybuf))
-		return (NULL);
+		return NULL;
 
 #ifndef DISABLE_XDES
 	if (*setting == _PASSWORD_EFMT1)
@@ -711,7 +708,7 @@ px_crypt_des(const char *key, const char *setting)
 			 * Encrypt the key with itself.
 			 */
 			if (des_cipher((char *) keybuf, (char *) keybuf, 0L, 1))
-				return (NULL);
+				return NULL;
 
 			/*
 			 * And XOR with the next 8 characters of the key.
@@ -721,7 +718,7 @@ px_crypt_des(const char *key, const char *setting)
 				*q++ ^= *key++ << 1;
 
 			if (des_setkey((char *) keybuf))
-				return (NULL);
+				return NULL;
 		}
 		StrNCpy(output, setting, 10);
 
@@ -767,7 +764,7 @@ px_crypt_des(const char *key, const char *setting)
 	 * Do it.
 	 */
 	if (do_des(0L, 0L, &r0, &r1, count))
-		return (NULL);
+		return NULL;
 
 	/*
 	 * Now encode the result...
@@ -790,5 +787,5 @@ px_crypt_des(const char *key, const char *setting)
 	*p++ = _crypt_a64[l & 0x3f];
 	*p = 0;
 
-	return (output);
+	return output;
 }
diff --git a/contrib/pgcrypto/expected/rijndael.out b/contrib/pgcrypto/expected/rijndael.out
index 14b2650c32..5366604a3d 100644
--- a/contrib/pgcrypto/expected/rijndael.out
+++ b/contrib/pgcrypto/expected/rijndael.out
@@ -1,5 +1,5 @@
 --
--- AES / Rijndael-128 cipher
+-- AES cipher (aka Rijndael-128, -192, or -256)
 --
 -- ensure consistent test output regardless of the default bytea format
 SET bytea_output TO escape;
diff --git a/contrib/pgcrypto/pgcrypto.c b/contrib/pgcrypto/pgcrypto.c
index e09f3378da..de09ececcf 100644
--- a/contrib/pgcrypto/pgcrypto.c
+++ b/contrib/pgcrypto/pgcrypto.c
@@ -47,7 +47,7 @@ PG_MODULE_MAGIC;
 /* private stuff */
 
 typedef int (*PFN) (const char *name, void **res);
-static void *find_provider(text *name, PFN pf, char *desc, int silent);
+static void *find_provider(text *name, PFN pf, const char *desc, int silent);
 
 /* SQL function: hash(bytea, text) returns bytea */
 PG_FUNCTION_INFO_V1(pg_digest);
@@ -474,7 +474,7 @@ pg_random_uuid(PG_FUNCTION_ARGS)
 static void *
 find_provider(text *name,
 			  PFN provider_lookup,
-			  char *desc, int silent)
+			  const char *desc, int silent)
 {
 	void	   *res;
 	char	   *buf;
diff --git a/contrib/pgcrypto/sql/rijndael.sql b/contrib/pgcrypto/sql/rijndael.sql
index bfbf95d39b..a9bcbf33d0 100644
--- a/contrib/pgcrypto/sql/rijndael.sql
+++ b/contrib/pgcrypto/sql/rijndael.sql
@@ -1,5 +1,5 @@
 --
--- AES / Rijndael-128 cipher
+-- AES cipher (aka Rijndael-128, -192, or -256)
 --
 -- ensure consistent test output regardless of the default bytea format
 SET bytea_output TO escape;
diff --git a/contrib/pgrowlocks/pgrowlocks.c b/contrib/pgrowlocks/pgrowlocks.c
index eabca65bd2..94e051d642 100644
--- a/contrib/pgrowlocks/pgrowlocks.c
+++ b/contrib/pgrowlocks/pgrowlocks.c
@@ -121,7 +121,7 @@ pgrowlocks(PG_FUNCTION_ARGS)
 			aclresult = is_member_of_role(GetUserId(), DEFAULT_ROLE_STAT_SCAN_TABLES) ? ACLCHECK_OK : ACLCHECK_NO_PRIV;
 
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_CLASS,
+			aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
 
 		scan = heap_beginscan(rel, GetActiveSnapshot(), 0, NULL);
diff --git a/contrib/pgstattuple/pgstatapprox.c b/contrib/pgstattuple/pgstatapprox.c
index 5bf06138a5..3cfbc08649 100644
--- a/contrib/pgstattuple/pgstatapprox.c
+++ b/contrib/pgstattuple/pgstatapprox.c
@@ -3,7 +3,7 @@
  * pgstatapprox.c
  *		  Bloat estimation functions
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/pgstattuple/pgstatapprox.c
diff --git a/contrib/pgstattuple/pgstatindex.c b/contrib/pgstattuple/pgstatindex.c
index 9365ba7e02..75317b96a2 100644
--- a/contrib/pgstattuple/pgstatindex.c
+++ b/contrib/pgstattuple/pgstatindex.c
@@ -568,7 +568,7 @@ pgstatginindex_internal(Oid relid, FunctionCallInfo fcinfo)
 	tuple = heap_form_tuple(tupleDesc, values, nulls);
 	result = HeapTupleGetDatum(tuple);
 
-	return (result);
+	return result;
 }
 
 /* ------------------------------------------------------
diff --git a/contrib/pgstattuple/pgstattuple.c b/contrib/pgstattuple/pgstattuple.c
index 7a91cc3468..7ca1bb24d2 100644
--- a/contrib/pgstattuple/pgstattuple.c
+++ b/contrib/pgstattuple/pgstattuple.c
@@ -416,7 +416,7 @@ pgstat_btree_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
 		BTPageOpaque opaque;
 
 		opaque = (BTPageOpaque) PageGetSpecialPointer(page);
-		if (opaque->btpo_flags & (BTP_DELETED | BTP_HALF_DEAD))
+		if (P_IGNORE(opaque))
 		{
 			/* recyclable page */
 			stat->free_space += BLCKSZ;
diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c
index be4ec07cf9..00c926b983 100644
--- a/contrib/postgres_fdw/connection.c
+++ b/contrib/postgres_fdw/connection.c
@@ -3,7 +3,7 @@
  * connection.c
  *		  Connection management functions for postgres_fdw
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/postgres_fdw/connection.c
@@ -75,7 +75,7 @@ static bool xact_got_connection = false;
 /* prototypes of private functions */
 static PGconn *connect_pg_server(ForeignServer *server, UserMapping *user);
 static void disconnect_pg_server(ConnCacheEntry *entry);
-static void check_conn_params(const char **keywords, const char **values);
+static void check_conn_params(const char **keywords, const char **values, UserMapping *user);
 static void configure_remote_session(PGconn *conn);
 static void do_sql_command(PGconn *conn, const char *sql);
 static void begin_remote_xact(ConnCacheEntry *entry);
@@ -261,7 +261,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
 		keywords[n] = values[n] = NULL;
 
 		/* verify connection parameters and make connection */
-		check_conn_params(keywords, values);
+		check_conn_params(keywords, values, user);
 
 		conn = PQconnectdbParams(keywords, values, false);
 		if (!conn || PQstatus(conn) != CONNECTION_OK)
@@ -276,7 +276,7 @@ connect_pg_server(ForeignServer *server, UserMapping *user)
 		 * otherwise, he's piggybacking on the postgres server's user
 		 * identity. See also dblink_security_check() in contrib/dblink.
 		 */
-		if (!superuser() && !PQconnectionUsedPassword(conn))
+		if (!superuser_arg(user->userid) && !PQconnectionUsedPassword(conn))
 			ereport(ERROR,
 					(errcode(ERRCODE_S_R_E_PROHIBITED_SQL_STATEMENT_ATTEMPTED),
 					 errmsg("password is required"),
@@ -322,12 +322,12 @@ disconnect_pg_server(ConnCacheEntry *entry)
  * contrib/dblink.)
  */
 static void
-check_conn_params(const char **keywords, const char **values)
+check_conn_params(const char **keywords, const char **values, UserMapping *user)
 {
 	int			i;
 
 	/* no check required if superuser */
-	if (superuser())
+	if (superuser_arg(user->userid))
 		return;
 
 	/* ok if params contain a non-empty password */
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 285cf1b2ee..8cd5843885 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -24,7 +24,7 @@
  * with collations that match the remote table's columns, which we can
  * consider to be user error.
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/postgres_fdw/deparse.c
@@ -132,7 +132,9 @@ static void deparseTargetList(StringInfo buf,
 				  Bitmapset *attrs_used,
 				  bool qualify_col,
 				  List **retrieved_attrs);
-static void deparseExplicitTargetList(List *tlist, List **retrieved_attrs,
+static void deparseExplicitTargetList(List *tlist,
+						  bool is_returning,
+						  List **retrieved_attrs,
 						  deparse_expr_cxt *context);
 static void deparseSubqueryTargetList(deparse_expr_cxt *context);
 static void deparseReturningList(StringInfo buf, PlannerInfo *root,
@@ -168,17 +170,19 @@ static void deparseLockingClause(deparse_expr_cxt *context);
 static void appendOrderByClause(List *pathkeys, deparse_expr_cxt *context);
 static void appendConditions(List *exprs, deparse_expr_cxt *context);
 static void deparseFromExprForRel(StringInfo buf, PlannerInfo *root,
-					  RelOptInfo *joinrel, bool use_alias, List **params_list);
+					  RelOptInfo *foreignrel, bool use_alias,
+					  Index ignore_rel, List **ignore_conds,
+					  List **params_list);
 static void deparseFromExpr(List *quals, deparse_expr_cxt *context);
 static void deparseRangeTblRef(StringInfo buf, PlannerInfo *root,
 				   RelOptInfo *foreignrel, bool make_subquery,
-				   List **params_list);
+				   Index ignore_rel, List **ignore_conds, List **params_list);
 static void deparseAggref(Aggref *node, deparse_expr_cxt *context);
 static void appendGroupByClause(List *tlist, deparse_expr_cxt *context);
 static void appendAggOrderBy(List *orderList, List *targetList,
 				 deparse_expr_cxt *context);
 static void appendFunctionName(Oid funcid, deparse_expr_cxt *context);
-static Node *deparseSortGroupClause(Index ref, List *tlist,
+static Node *deparseSortGroupClause(Index ref, List *tlist, bool force_colno,
 					   deparse_expr_cxt *context);
 
 /*
@@ -850,10 +854,12 @@ foreign_expr_walker(Node *node,
 static char *
 deparse_type_name(Oid type_oid, int32 typemod)
 {
-	if (is_builtin(type_oid))
-		return format_type_with_typemod(type_oid, typemod);
-	else
-		return format_type_with_typemod_qualified(type_oid, typemod);
+	uint8 flags = FORMAT_TYPE_TYPEMOD_GIVEN;
+
+	if (!is_builtin(type_oid))
+		flags |= FORMAT_TYPE_FORCE_QUALIFY;
+
+	return format_type_extended(type_oid, typemod, flags);
 }
 
 /*
@@ -921,7 +927,7 @@ build_tlist_to_deparse(RelOptInfo *foreignrel)
  *
  * List of columns selected is returned in retrieved_attrs.
  */
-extern void
+void
 deparseSelectStmtForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *rel,
 						List *tlist, List *remote_conds, List *pathkeys,
 						bool is_subquery, List **retrieved_attrs,
@@ -1028,7 +1034,7 @@ deparseSelectSql(List *tlist, bool is_subquery, List **retrieved_attrs,
 		 * For a join or upper relation the input tlist gives the list of
 		 * columns required to be fetched from the foreign server.
 		 */
-		deparseExplicitTargetList(tlist, retrieved_attrs, context);
+		deparseExplicitTargetList(tlist, false, retrieved_attrs, context);
 	}
 	else
 	{
@@ -1071,7 +1077,7 @@ deparseFromExpr(List *quals, deparse_expr_cxt *context)
 	appendStringInfoString(buf, " FROM ");
 	deparseFromExprForRel(buf, context->root, scanrel,
 						  (bms_num_members(scanrel->relids) > 1),
-						  context->params_list);
+						  (Index) 0, NULL, context->params_list);
 
 	/* Construct WHERE clause */
 	if (quals != NIL)
@@ -1115,7 +1121,7 @@ deparseTargetList(StringInfo buf,
 	first = true;
 	for (i = 1; i <= tupdesc->natts; i++)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[i - 1];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i - 1);
 
 		/* Ignore dropped attributes. */
 		if (attr->attisdropped)
@@ -1307,7 +1313,7 @@ appendConditions(List *exprs, deparse_expr_cxt *context)
 }
 
 /* Output join name for given join type */
-extern const char *
+const char *
 get_jointype_name(JoinType jointype)
 {
 	switch (jointype)
@@ -1340,9 +1346,14 @@ get_jointype_name(JoinType jointype)
  *
  * retrieved_attrs is the list of continuously increasing integers starting
  * from 1. It has same number of entries as tlist.
+ *
+ * This is used for both SELECT and RETURNING targetlists; the is_returning
+ * parameter is true only for a RETURNING targetlist.
  */
 static void
-deparseExplicitTargetList(List *tlist, List **retrieved_attrs,
+deparseExplicitTargetList(List *tlist,
+						  bool is_returning,
+						  List **retrieved_attrs,
 						  deparse_expr_cxt *context)
 {
 	ListCell   *lc;
@@ -1357,13 +1368,16 @@ deparseExplicitTargetList(List *tlist, List **retrieved_attrs,
 
 		if (i > 0)
 			appendStringInfoString(buf, ", ");
+		else if (is_returning)
+			appendStringInfoString(buf, " RETURNING ");
+
 		deparseExpr((Expr *) tle->expr, context);
 
 		*retrieved_attrs = lappend_int(*retrieved_attrs, i + 1);
 		i++;
 	}
 
-	if (i == 0)
+	if (i == 0 && !is_returning)
 		appendStringInfoString(buf, "NULL");
 }
 
@@ -1406,10 +1420,17 @@ deparseSubqueryTargetList(deparse_expr_cxt *context)
  * The function constructs ... JOIN ... ON ... for join relation. For a base
  * relation it just returns schema-qualified tablename, with the appropriate
  * alias if so requested.
+ *
+ * 'ignore_rel' is either zero or the RT index of a target relation.  In the
+ * latter case the function constructs FROM clause of UPDATE or USING clause
+ * of DELETE; it deparses the join relation as if the relation never contained
+ * the target relation, and creates a List of conditions to be deparsed into
+ * the top-level WHERE clause, which is returned to *ignore_conds.
  */
 static void
 deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
-					  bool use_alias, List **params_list)
+					  bool use_alias, Index ignore_rel, List **ignore_conds,
+					  List **params_list)
 {
 	PgFdwRelationInfo *fpinfo = (PgFdwRelationInfo *) foreignrel->fdw_private;
 
@@ -1417,16 +1438,89 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
 	{
 		StringInfoData join_sql_o;
 		StringInfoData join_sql_i;
+		RelOptInfo *outerrel = fpinfo->outerrel;
+		RelOptInfo *innerrel = fpinfo->innerrel;
+		bool		outerrel_is_target = false;
+		bool		innerrel_is_target = false;
+
+		if (ignore_rel > 0 && bms_is_member(ignore_rel, foreignrel->relids))
+		{
+			/*
+			 * If this is an inner join, add joinclauses to *ignore_conds and
+			 * set it to empty so that those can be deparsed into the WHERE
+			 * clause.  Note that since the target relation can never be
+			 * within the nullable side of an outer join, those could safely
+			 * be pulled up into the WHERE clause (see foreign_join_ok()).
+			 * Note also that since the target relation is only inner-joined
+			 * to any other relation in the query, all conditions in the join
+			 * tree mentioning the target relation could be deparsed into the
+			 * WHERE clause by doing this recursively.
+			 */
+			if (fpinfo->jointype == JOIN_INNER)
+			{
+				*ignore_conds = list_concat(*ignore_conds,
+											list_copy(fpinfo->joinclauses));
+				fpinfo->joinclauses = NIL;
+			}
+
+			/*
+			 * Check if either of the input relations is the target relation.
+			 */
+			if (outerrel->relid == ignore_rel)
+				outerrel_is_target = true;
+			else if (innerrel->relid == ignore_rel)
+				innerrel_is_target = true;
+		}
+
+		/* Deparse outer relation if not the target relation. */
+		if (!outerrel_is_target)
+		{
+			initStringInfo(&join_sql_o);
+			deparseRangeTblRef(&join_sql_o, root, outerrel,
+							   fpinfo->make_outerrel_subquery,
+							   ignore_rel, ignore_conds, params_list);
+
+			/*
+			 * If inner relation is the target relation, skip deparsing it.
+			 * Note that since the join of the target relation with any other
+			 * relation in the query is an inner join and can never be within
+			 * the nullable side of an outer join, the join could be
+			 * interchanged with higher-level joins (cf. identity 1 on outer
+			 * join reordering shown in src/backend/optimizer/README), which
+			 * means it's safe to skip the target-relation deparsing here.
+			 */
+			if (innerrel_is_target)
+			{
+				Assert(fpinfo->jointype == JOIN_INNER);
+				Assert(fpinfo->joinclauses == NIL);
+				appendStringInfo(buf, "%s", join_sql_o.data);
+				return;
+			}
+		}
+
+		/* Deparse inner relation if not the target relation. */
+		if (!innerrel_is_target)
+		{
+			initStringInfo(&join_sql_i);
+			deparseRangeTblRef(&join_sql_i, root, innerrel,
+							   fpinfo->make_innerrel_subquery,
+							   ignore_rel, ignore_conds, params_list);
 
-		/* Deparse outer relation */
-		initStringInfo(&join_sql_o);
-		deparseRangeTblRef(&join_sql_o, root, fpinfo->outerrel,
-						   fpinfo->make_outerrel_subquery, params_list);
+			/*
+			 * If outer relation is the target relation, skip deparsing it.
+			 * See the above note about safety.
+			 */
+			if (outerrel_is_target)
+			{
+				Assert(fpinfo->jointype == JOIN_INNER);
+				Assert(fpinfo->joinclauses == NIL);
+				appendStringInfo(buf, "%s", join_sql_i.data);
+				return;
+			}
+		}
 
-		/* Deparse inner relation */
-		initStringInfo(&join_sql_i);
-		deparseRangeTblRef(&join_sql_i, root, fpinfo->innerrel,
-						   fpinfo->make_innerrel_subquery, params_list);
+		/* Neither of the relations is the target relation. */
+		Assert(!outerrel_is_target && !innerrel_is_target);
 
 		/*
 		 * For a join relation FROM clause entry is deparsed as
@@ -1486,7 +1580,8 @@ deparseFromExprForRel(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
  */
 static void
 deparseRangeTblRef(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
-				   bool make_subquery, List **params_list)
+				   bool make_subquery, Index ignore_rel, List **ignore_conds,
+				   List **params_list)
 {
 	PgFdwRelationInfo *fpinfo = (PgFdwRelationInfo *) foreignrel->fdw_private;
 
@@ -1501,6 +1596,14 @@ deparseRangeTblRef(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
 		List	   *retrieved_attrs;
 		int			ncols;
 
+		/*
+		 * The given relation shouldn't contain the target relation, because
+		 * this should only happen for input relations for a full join, and
+		 * such relations can never contain an UPDATE/DELETE target.
+		 */
+		Assert(ignore_rel == 0 ||
+			   !bms_is_member(ignore_rel, foreignrel->relids));
+
 		/* Deparse the subquery representing the relation. */
 		appendStringInfoChar(buf, '(');
 		deparseSelectStmtForRel(buf, root, foreignrel, NIL,
@@ -1534,7 +1637,8 @@ deparseRangeTblRef(StringInfo buf, PlannerInfo *root, RelOptInfo *foreignrel,
 		}
 	}
 	else
-		deparseFromExprForRel(buf, root, foreignrel, true, params_list);
+		deparseFromExprForRel(buf, root, foreignrel, true, ignore_rel,
+							  ignore_conds, params_list);
 }
 
 /*
@@ -1645,13 +1749,23 @@ deparseUpdateSql(StringInfo buf, PlannerInfo *root,
 /*
  * deparse remote UPDATE statement
  *
- * The statement text is appended to buf, and we also create an integer List
- * of the columns being retrieved by RETURNING (if any), which is returned
- * to *retrieved_attrs.
+ * 'buf' is the output buffer to append the statement to
+ * 'rtindex' is the RT index of the associated target relation
+ * 'rel' is the relation descriptor for the target relation
+ * 'foreignrel' is the RelOptInfo for the target relation or the join relation
+ *		containing all base relations in the query
+ * 'targetlist' is the tlist of the underlying foreign-scan plan node
+ * 'targetAttrs' is the target columns of the UPDATE
+ * 'remote_conds' is the qual clauses that must be evaluated remotely
+ * '*params_list' is an output list of exprs that will become remote Params
+ * 'returningList' is the RETURNING targetlist
+ * '*retrieved_attrs' is an output list of integers of columns being retrieved
+ *		by RETURNING (if any)
  */
 void
 deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 					   Index rtindex, Relation rel,
+					   RelOptInfo *foreignrel,
 					   List *targetlist,
 					   List *targetAttrs,
 					   List *remote_conds,
@@ -1659,7 +1773,6 @@ deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 					   List *returningList,
 					   List **retrieved_attrs)
 {
-	RelOptInfo *baserel = root->simple_rel_array[rtindex];
 	deparse_expr_cxt context;
 	int			nestlevel;
 	bool		first;
@@ -1667,13 +1780,15 @@ deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 
 	/* Set up context struct for recursion */
 	context.root = root;
-	context.foreignrel = baserel;
-	context.scanrel = baserel;
+	context.foreignrel = foreignrel;
+	context.scanrel = foreignrel;
 	context.buf = buf;
 	context.params_list = params_list;
 
 	appendStringInfoString(buf, "UPDATE ");
 	deparseRelation(buf, rel);
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+		appendStringInfo(buf, " %s%d", REL_ALIAS_PREFIX, rtindex);
 	appendStringInfoString(buf, " SET ");
 
 	/* Make sure any constants in the exprs are printed portably */
@@ -1700,14 +1815,28 @@ deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 
 	reset_transmission_modes(nestlevel);
 
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+	{
+		List	   *ignore_conds = NIL;
+
+		appendStringInfo(buf, " FROM ");
+		deparseFromExprForRel(buf, root, foreignrel, true, rtindex,
+							  &ignore_conds, params_list);
+		remote_conds = list_concat(remote_conds, ignore_conds);
+	}
+
 	if (remote_conds)
 	{
 		appendStringInfoString(buf, " WHERE ");
 		appendConditions(remote_conds, &context);
 	}
 
-	deparseReturningList(buf, root, rtindex, rel, false,
-						 returningList, retrieved_attrs);
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+		deparseExplicitTargetList(returningList, true, retrieved_attrs,
+								  &context);
+	else
+		deparseReturningList(buf, root, rtindex, rel, false,
+							 returningList, retrieved_attrs);
 }
 
 /*
@@ -1735,30 +1864,49 @@ deparseDeleteSql(StringInfo buf, PlannerInfo *root,
 /*
  * deparse remote DELETE statement
  *
- * The statement text is appended to buf, and we also create an integer List
- * of the columns being retrieved by RETURNING (if any), which is returned
- * to *retrieved_attrs.
+ * 'buf' is the output buffer to append the statement to
+ * 'rtindex' is the RT index of the associated target relation
+ * 'rel' is the relation descriptor for the target relation
+ * 'foreignrel' is the RelOptInfo for the target relation or the join relation
+ *		containing all base relations in the query
+ * 'remote_conds' is the qual clauses that must be evaluated remotely
+ * '*params_list' is an output list of exprs that will become remote Params
+ * 'returningList' is the RETURNING targetlist
+ * '*retrieved_attrs' is an output list of integers of columns being retrieved
+ *		by RETURNING (if any)
  */
 void
 deparseDirectDeleteSql(StringInfo buf, PlannerInfo *root,
 					   Index rtindex, Relation rel,
+					   RelOptInfo *foreignrel,
 					   List *remote_conds,
 					   List **params_list,
 					   List *returningList,
 					   List **retrieved_attrs)
 {
-	RelOptInfo *baserel = root->simple_rel_array[rtindex];
 	deparse_expr_cxt context;
 
 	/* Set up context struct for recursion */
 	context.root = root;
-	context.foreignrel = baserel;
-	context.scanrel = baserel;
+	context.foreignrel = foreignrel;
+	context.scanrel = foreignrel;
 	context.buf = buf;
 	context.params_list = params_list;
 
 	appendStringInfoString(buf, "DELETE FROM ");
 	deparseRelation(buf, rel);
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+		appendStringInfo(buf, " %s%d", REL_ALIAS_PREFIX, rtindex);
+
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+	{
+		List	   *ignore_conds = NIL;
+
+		appendStringInfo(buf, " USING ");
+		deparseFromExprForRel(buf, root, foreignrel, true, rtindex,
+							  &ignore_conds, params_list);
+		remote_conds = list_concat(remote_conds, ignore_conds);
+	}
 
 	if (remote_conds)
 	{
@@ -1766,8 +1914,12 @@ deparseDirectDeleteSql(StringInfo buf, PlannerInfo *root,
 		appendConditions(remote_conds, &context);
 	}
 
-	deparseReturningList(buf, root, rtindex, rel, false,
-						 returningList, retrieved_attrs);
+	if (foreignrel->reloptkind == RELOPT_JOINREL)
+		deparseExplicitTargetList(returningList, true, retrieved_attrs,
+								  &context);
+	else
+		deparseReturningList(buf, root, rtindex, rel, false,
+							 returningList, retrieved_attrs);
 }
 
 /*
@@ -1851,7 +2003,7 @@ deparseAnalyzeSql(StringInfo buf, Relation rel, List **retrieved_attrs)
 	for (i = 0; i < tupdesc->natts; i++)
 	{
 		/* Ignore dropped columns. */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (TupleDescAttr(tupdesc, i)->attisdropped)
 			continue;
 
 		if (!first)
@@ -1859,7 +2011,7 @@ deparseAnalyzeSql(StringInfo buf, Relation rel, List **retrieved_attrs)
 		first = false;
 
 		/* Use attribute name or column_name option. */
-		colname = NameStr(tupdesc->attrs[i]->attname);
+		colname = NameStr(TupleDescAttr(tupdesc, i)->attname);
 		options = GetForeignColumnOptions(relid, i + 1);
 
 		foreach(lc, options)
@@ -2026,7 +2178,7 @@ deparseColumnRef(StringInfo buf, int varno, int varattno, PlannerInfo *root,
 		 * FDW option, use attribute name.
 		 */
 		if (colname == NULL)
-			colname = get_relid_attribute_name(rte->relid, varattno);
+			colname = get_attname(rte->relid, varattno, false);
 
 		if (qualify_col)
 			ADD_REL_QUALIFIER(buf, varno);
@@ -2853,7 +3005,7 @@ appendAggOrderBy(List *orderList, List *targetList, deparse_expr_cxt *context)
 		first = false;
 
 		sortexpr = deparseSortGroupClause(srt->tleSortGroupRef, targetList,
-										  context);
+										  false, context);
 		sortcoltype = exprType(sortexpr);
 		/* See whether operator is default < or > for datatype */
 		typentry = lookup_type_cache(sortcoltype,
@@ -2960,7 +3112,7 @@ appendGroupByClause(List *tlist, deparse_expr_cxt *context)
 			appendStringInfoString(buf, ", ");
 		first = false;
 
-		deparseSortGroupClause(grp->tleSortGroupRef, tlist, context);
+		deparseSortGroupClause(grp->tleSortGroupRef, tlist, true, context);
 	}
 }
 
@@ -3047,7 +3199,8 @@ appendFunctionName(Oid funcid, deparse_expr_cxt *context)
  * need not find it again.
  */
 static Node *
-deparseSortGroupClause(Index ref, List *tlist, deparse_expr_cxt *context)
+deparseSortGroupClause(Index ref, List *tlist, bool force_colno,
+					   deparse_expr_cxt *context)
 {
 	StringInfo	buf = context->buf;
 	TargetEntry *tle;
@@ -3056,7 +3209,13 @@ deparseSortGroupClause(Index ref, List *tlist, deparse_expr_cxt *context)
 	tle = get_sortgroupref_tle(ref, tlist);
 	expr = tle->expr;
 
-	if (expr && IsA(expr, Const))
+	if (force_colno)
+	{
+		/* Use column-number form when requested by caller. */
+		Assert(!tle->resjunk);
+		appendStringInfo(buf, "%d", tle->resno);
+	}
+	else if (expr && IsA(expr, Const))
 	{
 		/*
 		 * Force a typecast here so that we don't emit something like "GROUP
diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out
index c19b3318c7..08b30f83e0 100644
--- a/contrib/postgres_fdw/expected/postgres_fdw.out
+++ b/contrib/postgres_fdw/expected/postgres_fdw.out
@@ -35,6 +35,9 @@ CREATE TABLE "S 1"."T 1" (
 	c8 user_enum,
 	CONSTRAINT t1_pkey PRIMARY KEY ("C 1")
 );
+-- "S 1"."T 1" will be heavily updated below, so disable autovacuum for
+-- the table to avoid unexpected effects of that
+ALTER TABLE "S 1"."T 1" SET (autovacuum_enabled = 'false');
 CREATE TABLE "S 1"."T 2" (
 	c1 int NOT NULL,
 	c2 text,
@@ -1371,24 +1374,27 @@ SELECT t1.c1, ss.a, ss.b FROM (SELECT c1 FROM "S 1"."T 3" WHERE c1 = 50) t1 INNE
                Output: ft4.c1, ft4.*, ft5.c1, ft5.*
                Relations: (public.ft4) FULL JOIN (public.ft5)
                Remote SQL: SELECT s8.c1, s8.c2, s9.c1, s9.c2 FROM ((SELECT c1, ROW(c1, c2, c3) FROM "S 1"."T 3" WHERE ((c1 >= 50)) AND ((c1 <= 60))) s8(c1, c2) FULL JOIN (SELECT c1, ROW(c1, c2, c3) FROM "S 1"."T 4" WHERE ((c1 >= 50)) AND ((c1 <= 60))) s9(c1, c2) ON (((s8.c1 = s9.c1)))) WHERE (((s8.c1 IS NULL) OR (s8.c1 IS NOT NULL))) ORDER BY s8.c1 ASC NULLS LAST, s9.c1 ASC NULLS LAST
-               ->  Hash Full Join
+               ->  Sort
                      Output: ft4.c1, ft4.*, ft5.c1, ft5.*
-                     Hash Cond: (ft4.c1 = ft5.c1)
-                     Filter: ((ft4.c1 IS NULL) OR (ft4.c1 IS NOT NULL))
-                     ->  Foreign Scan on public.ft4
-                           Output: ft4.c1, ft4.*
-                           Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 3" WHERE ((c1 >= 50)) AND ((c1 <= 60))
-                     ->  Hash
-                           Output: ft5.c1, ft5.*
-                           ->  Foreign Scan on public.ft5
+                     Sort Key: ft4.c1, ft5.c1
+                     ->  Hash Full Join
+                           Output: ft4.c1, ft4.*, ft5.c1, ft5.*
+                           Hash Cond: (ft4.c1 = ft5.c1)
+                           Filter: ((ft4.c1 IS NULL) OR (ft4.c1 IS NOT NULL))
+                           ->  Foreign Scan on public.ft4
+                                 Output: ft4.c1, ft4.*
+                                 Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 3" WHERE ((c1 >= 50)) AND ((c1 <= 60))
+                           ->  Hash
                                  Output: ft5.c1, ft5.*
-                                 Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 4" WHERE ((c1 >= 50)) AND ((c1 <= 60))
+                                 ->  Foreign Scan on public.ft5
+                                       Output: ft5.c1, ft5.*
+                                       Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 4" WHERE ((c1 >= 50)) AND ((c1 <= 60))
          ->  Materialize
                Output: "T 3".c1, "T 3".ctid
                ->  Seq Scan on "S 1"."T 3"
                      Output: "T 3".c1, "T 3".ctid
                      Filter: ("T 3".c1 = 50)
-(25 rows)
+(28 rows)
 
 SELECT t1.c1, ss.a, ss.b FROM (SELECT c1 FROM "S 1"."T 3" WHERE c1 = 50) t1 INNER JOIN (SELECT t2.c1, t3.c1 FROM (SELECT c1 FROM ft4 WHERE c1 between 50 and 60) t2 FULL JOIN (SELECT c1 FROM ft5 WHERE c1 between 50 and 60) t3 ON (t2.c1 = t3.c1) WHERE t2.c1 IS NULL OR t2.c1 IS NOT NULL) ss(a, b) ON (TRUE) ORDER BY t1.c1, ss.a, ss.b FOR UPDATE OF t1;
  c1 | a  | b  
@@ -1701,22 +1707,25 @@ SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t
                Output: t1.c1, t2.c1, t1.c3, t1.*, t2.*
                Relations: (public.ft1 t1) INNER JOIN (public.ft2 t2)
                Remote SQL: SELECT r1."C 1", r1.c3, CASE WHEN (r1.*)::text IS NOT NULL THEN ROW(r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8) END, r2."C 1", CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1."C 1" = r2."C 1")))) ORDER BY r1.c3 ASC NULLS LAST, r1."C 1" ASC NULLS LAST FOR UPDATE OF r1
-               ->  Merge Join
+               ->  Sort
                      Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
-                     Merge Cond: (t1.c1 = t2.c1)
-                     ->  Sort
-                           Output: t1.c1, t1.c3, t1.*
-                           Sort Key: t1.c1
-                           ->  Foreign Scan on public.ft1 t1
+                     Sort Key: t1.c3, t1.c1
+                     ->  Merge Join
+                           Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
+                           Merge Cond: (t1.c1 = t2.c1)
+                           ->  Sort
                                  Output: t1.c1, t1.c3, t1.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
-                     ->  Sort
-                           Output: t2.c1, t2.*
-                           Sort Key: t2.c1
-                           ->  Foreign Scan on public.ft2 t2
+                                 Sort Key: t1.c1
+                                 ->  Foreign Scan on public.ft1 t1
+                                       Output: t1.c1, t1.c3, t1.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
+                           ->  Sort
                                  Output: t2.c1, t2.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"
-(23 rows)
+                                 Sort Key: t2.c1
+                                 ->  Foreign Scan on public.ft2 t2
+                                       Output: t2.c1, t2.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"
+(26 rows)
 
 SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10 FOR UPDATE OF t1;
  c1  | c1  
@@ -1745,22 +1754,25 @@ SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t
                Output: t1.c1, t2.c1, t1.c3, t1.*, t2.*
                Relations: (public.ft1 t1) INNER JOIN (public.ft2 t2)
                Remote SQL: SELECT r1."C 1", r1.c3, CASE WHEN (r1.*)::text IS NOT NULL THEN ROW(r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8) END, r2."C 1", CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1."C 1" = r2."C 1")))) ORDER BY r1.c3 ASC NULLS LAST, r1."C 1" ASC NULLS LAST FOR UPDATE OF r1 FOR UPDATE OF r2
-               ->  Merge Join
+               ->  Sort
                      Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
-                     Merge Cond: (t1.c1 = t2.c1)
-                     ->  Sort
-                           Output: t1.c1, t1.c3, t1.*
-                           Sort Key: t1.c1
-                           ->  Foreign Scan on public.ft1 t1
+                     Sort Key: t1.c3, t1.c1
+                     ->  Merge Join
+                           Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
+                           Merge Cond: (t1.c1 = t2.c1)
+                           ->  Sort
                                  Output: t1.c1, t1.c3, t1.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
-                     ->  Sort
-                           Output: t2.c1, t2.*
-                           Sort Key: t2.c1
-                           ->  Foreign Scan on public.ft2 t2
+                                 Sort Key: t1.c1
+                                 ->  Foreign Scan on public.ft1 t1
+                                       Output: t1.c1, t1.c3, t1.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
+                           ->  Sort
                                  Output: t2.c1, t2.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
-(23 rows)
+                                 Sort Key: t2.c1
+                                 ->  Foreign Scan on public.ft2 t2
+                                       Output: t2.c1, t2.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR UPDATE
+(26 rows)
 
 SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10 FOR UPDATE;
  c1  | c1  
@@ -1790,22 +1802,25 @@ SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t
                Output: t1.c1, t2.c1, t1.c3, t1.*, t2.*
                Relations: (public.ft1 t1) INNER JOIN (public.ft2 t2)
                Remote SQL: SELECT r1."C 1", r1.c3, CASE WHEN (r1.*)::text IS NOT NULL THEN ROW(r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8) END, r2."C 1", CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1."C 1" = r2."C 1")))) ORDER BY r1.c3 ASC NULLS LAST, r1."C 1" ASC NULLS LAST FOR SHARE OF r1
-               ->  Merge Join
+               ->  Sort
                      Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
-                     Merge Cond: (t1.c1 = t2.c1)
-                     ->  Sort
-                           Output: t1.c1, t1.c3, t1.*
-                           Sort Key: t1.c1
-                           ->  Foreign Scan on public.ft1 t1
+                     Sort Key: t1.c3, t1.c1
+                     ->  Merge Join
+                           Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
+                           Merge Cond: (t1.c1 = t2.c1)
+                           ->  Sort
                                  Output: t1.c1, t1.c3, t1.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
-                     ->  Sort
-                           Output: t2.c1, t2.*
-                           Sort Key: t2.c1
-                           ->  Foreign Scan on public.ft2 t2
+                                 Sort Key: t1.c1
+                                 ->  Foreign Scan on public.ft1 t1
+                                       Output: t1.c1, t1.c3, t1.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
+                           ->  Sort
                                  Output: t2.c1, t2.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"
-(23 rows)
+                                 Sort Key: t2.c1
+                                 ->  Foreign Scan on public.ft2 t2
+                                       Output: t2.c1, t2.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1"
+(26 rows)
 
 SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10 FOR SHARE OF t1;
  c1  | c1  
@@ -1834,22 +1849,25 @@ SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t
                Output: t1.c1, t2.c1, t1.c3, t1.*, t2.*
                Relations: (public.ft1 t1) INNER JOIN (public.ft2 t2)
                Remote SQL: SELECT r1."C 1", r1.c3, CASE WHEN (r1.*)::text IS NOT NULL THEN ROW(r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8) END, r2."C 1", CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1."C 1" = r2."C 1")))) ORDER BY r1.c3 ASC NULLS LAST, r1."C 1" ASC NULLS LAST FOR SHARE OF r1 FOR SHARE OF r2
-               ->  Merge Join
+               ->  Sort
                      Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
-                     Merge Cond: (t1.c1 = t2.c1)
-                     ->  Sort
-                           Output: t1.c1, t1.c3, t1.*
-                           Sort Key: t1.c1
-                           ->  Foreign Scan on public.ft1 t1
+                     Sort Key: t1.c3, t1.c1
+                     ->  Merge Join
+                           Output: t1.c1, t1.c3, t1.*, t2.c1, t2.*
+                           Merge Cond: (t1.c1 = t2.c1)
+                           ->  Sort
                                  Output: t1.c1, t1.c3, t1.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
-                     ->  Sort
-                           Output: t2.c1, t2.*
-                           Sort Key: t2.c1
-                           ->  Foreign Scan on public.ft2 t2
+                                 Sort Key: t1.c1
+                                 ->  Foreign Scan on public.ft1 t1
+                                       Output: t1.c1, t1.c3, t1.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
+                           ->  Sort
                                  Output: t2.c1, t2.*
-                                 Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
-(23 rows)
+                                 Sort Key: t2.c1
+                                 ->  Foreign Scan on public.ft2 t2
+                                       Output: t2.c1, t2.*
+                                       Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" FOR SHARE
+(26 rows)
 
 SELECT t1.c1, t2.c1 FROM ft1 t1 JOIN ft2 t2 ON (t1.c1 = t2.c1) ORDER BY t1.c3, t1.c1 OFFSET 100 LIMIT 10 FOR SHARE;
  c1  | c1  
@@ -2314,8 +2332,78 @@ SELECT ft5, ft5.c1, ft5.c2, ft5.c3, ft4.c1, ft4.c2 FROM ft5 left join ft4 on ft5
  (30,31,AAA030) | 30 | 31 | AAA030 | 30 | 31
 (4 rows)
 
+-- multi-way join involving multiple merge joins
+-- (this case used to have EPQ-related planning problems)
+SET enable_nestloop TO false;
+SET enable_hashjoin TO false;
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM ft1, ft2, ft4, ft5 WHERE ft1.c1 = ft2.c1 AND ft1.c2 = ft4.c1
+    AND ft1.c2 = ft5.c1 AND ft1.c1 < 100 AND ft2.c1 < 100 FOR UPDATE;
+                                                                                                                                                                                                                                                                                                                                                                                                                             QUERY PLAN                                                                                                                                                                                                                                                                                                                                                                                                                             
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ LockRows
+   Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.c1, ft4.c2, ft4.c3, ft5.c1, ft5.c2, ft5.c3, ft1.*, ft2.*, ft4.*, ft5.*
+   ->  Foreign Scan
+         Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.c1, ft4.c2, ft4.c3, ft5.c1, ft5.c2, ft5.c3, ft1.*, ft2.*, ft4.*, ft5.*
+         Relations: (((public.ft1) INNER JOIN (public.ft2)) INNER JOIN (public.ft4)) INNER JOIN (public.ft5)
+         Remote SQL: SELECT r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8, CASE WHEN (r1.*)::text IS NOT NULL THEN ROW(r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8) END, r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END, r3.c1, r3.c2, r3.c3, CASE WHEN (r3.*)::text IS NOT NULL THEN ROW(r3.c1, r3.c2, r3.c3) END, r4.c1, r4.c2, r4.c3, CASE WHEN (r4.*)::text IS NOT NULL THEN ROW(r4.c1, r4.c2, r4.c3) END FROM ((("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1."C 1" = r2."C 1")) AND ((r2."C 1" < 100)) AND ((r1."C 1" < 100)))) INNER JOIN "S 1"."T 3" r3 ON (((r1.c2 = r3.c1)))) INNER JOIN "S 1"."T 4" r4 ON (((r1.c2 = r4.c1)))) FOR UPDATE OF r1 FOR UPDATE OF r2 FOR UPDATE OF r3 FOR UPDATE OF r4
+         ->  Merge Join
+               Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*, ft4.c1, ft4.c2, ft4.c3, ft4.*, ft5.c1, ft5.c2, ft5.c3, ft5.*
+               Merge Cond: (ft1.c2 = ft5.c1)
+               ->  Merge Join
+                     Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*, ft4.c1, ft4.c2, ft4.c3, ft4.*
+                     Merge Cond: (ft1.c2 = ft4.c1)
+                     ->  Sort
+                           Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*
+                           Sort Key: ft1.c2
+                           ->  Merge Join
+                                 Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*
+                                 Merge Cond: (ft1.c1 = ft2.c1)
+                                 ->  Sort
+                                       Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*
+                                       Sort Key: ft1.c1
+                                       ->  Foreign Scan on public.ft1
+                                             Output: ft1.c1, ft1.c2, ft1.c3, ft1.c4, ft1.c5, ft1.c6, ft1.c7, ft1.c8, ft1.*
+                                             Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" WHERE (("C 1" < 100)) FOR UPDATE
+                                 ->  Materialize
+                                       Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*
+                                       ->  Foreign Scan on public.ft2
+                                             Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.*
+                                             Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" WHERE (("C 1" < 100)) ORDER BY "C 1" ASC NULLS LAST FOR UPDATE
+                     ->  Sort
+                           Output: ft4.c1, ft4.c2, ft4.c3, ft4.*
+                           Sort Key: ft4.c1
+                           ->  Foreign Scan on public.ft4
+                                 Output: ft4.c1, ft4.c2, ft4.c3, ft4.*
+                                 Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 3" FOR UPDATE
+               ->  Sort
+                     Output: ft5.c1, ft5.c2, ft5.c3, ft5.*
+                     Sort Key: ft5.c1
+                     ->  Foreign Scan on public.ft5
+                           Output: ft5.c1, ft5.c2, ft5.c3, ft5.*
+                           Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 4" FOR UPDATE
+(41 rows)
+
+SELECT * FROM ft1, ft2, ft4, ft5 WHERE ft1.c1 = ft2.c1 AND ft1.c2 = ft4.c1
+    AND ft1.c2 = ft5.c1 AND ft1.c1 < 100 AND ft2.c1 < 100 FOR UPDATE;
+ c1 | c2 |  c3   |              c4              |            c5            | c6 |     c7     | c8  | c1 | c2 |  c3   |              c4              |            c5            | c6 |     c7     | c8  | c1 | c2 |   c3   | c1 | c2 |   c3   
+----+----+-------+------------------------------+--------------------------+----+------------+-----+----+----+-------+------------------------------+--------------------------+----+------------+-----+----+----+--------+----+----+--------
+  6 |  6 | 00006 | Wed Jan 07 00:00:00 1970 PST | Wed Jan 07 00:00:00 1970 | 6  | 6          | foo |  6 |  6 | 00006 | Wed Jan 07 00:00:00 1970 PST | Wed Jan 07 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 16 |  6 | 00016 | Sat Jan 17 00:00:00 1970 PST | Sat Jan 17 00:00:00 1970 | 6  | 6          | foo | 16 |  6 | 00016 | Sat Jan 17 00:00:00 1970 PST | Sat Jan 17 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 26 |  6 | 00026 | Tue Jan 27 00:00:00 1970 PST | Tue Jan 27 00:00:00 1970 | 6  | 6          | foo | 26 |  6 | 00026 | Tue Jan 27 00:00:00 1970 PST | Tue Jan 27 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 36 |  6 | 00036 | Fri Feb 06 00:00:00 1970 PST | Fri Feb 06 00:00:00 1970 | 6  | 6          | foo | 36 |  6 | 00036 | Fri Feb 06 00:00:00 1970 PST | Fri Feb 06 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 46 |  6 | 00046 | Mon Feb 16 00:00:00 1970 PST | Mon Feb 16 00:00:00 1970 | 6  | 6          | foo | 46 |  6 | 00046 | Mon Feb 16 00:00:00 1970 PST | Mon Feb 16 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 56 |  6 | 00056 | Thu Feb 26 00:00:00 1970 PST | Thu Feb 26 00:00:00 1970 | 6  | 6          | foo | 56 |  6 | 00056 | Thu Feb 26 00:00:00 1970 PST | Thu Feb 26 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 66 |  6 | 00066 | Sun Mar 08 00:00:00 1970 PST | Sun Mar 08 00:00:00 1970 | 6  | 6          | foo | 66 |  6 | 00066 | Sun Mar 08 00:00:00 1970 PST | Sun Mar 08 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 76 |  6 | 00076 | Wed Mar 18 00:00:00 1970 PST | Wed Mar 18 00:00:00 1970 | 6  | 6          | foo | 76 |  6 | 00076 | Wed Mar 18 00:00:00 1970 PST | Wed Mar 18 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 86 |  6 | 00086 | Sat Mar 28 00:00:00 1970 PST | Sat Mar 28 00:00:00 1970 | 6  | 6          | foo | 86 |  6 | 00086 | Sat Mar 28 00:00:00 1970 PST | Sat Mar 28 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+ 96 |  6 | 00096 | Tue Apr 07 00:00:00 1970 PST | Tue Apr 07 00:00:00 1970 | 6  | 6          | foo | 96 |  6 | 00096 | Tue Apr 07 00:00:00 1970 PST | Tue Apr 07 00:00:00 1970 | 6  | 6          | foo |  6 |  7 | AAA006 |  6 |  7 | AAA006
+(10 rows)
+
+RESET enable_nestloop;
+RESET enable_hashjoin;
 -- check join pushdown in situations where multiple userids are involved
-CREATE ROLE regress_view_owner;
+CREATE ROLE regress_view_owner SUPERUSER;
 CREATE USER MAPPING FOR regress_view_owner SERVER loopback;
 GRANT SELECT ON ft4 TO regress_view_owner;
 GRANT SELECT ON ft5 TO regress_view_owner;
@@ -2462,8 +2550,8 @@ DROP ROLE regress_view_owner;
 -- Simple aggregates
 explain (verbose, costs off)
 select count(c6), sum(c1), avg(c1), min(c2), max(c1), stddev(c2), sum(c1) * (random() <= 1)::int as sum2 from ft1 where c2 < 5 group by c2 order by 1, 2;
-                                                                      QUERY PLAN                                                                       
--------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                      QUERY PLAN                                                                      
+------------------------------------------------------------------------------------------------------------------------------------------------------
  Result
    Output: (count(c6)), (sum(c1)), (avg(c1)), (min(c2)), (max(c1)), (stddev(c2)), ((sum(c1)) * ((random() <= '1'::double precision))::integer), c2
    ->  Sort
@@ -2472,7 +2560,7 @@ select count(c6), sum(c1), avg(c1), min(c2), max(c1), stddev(c2), sum(c1) * (ran
          ->  Foreign Scan
                Output: (count(c6)), (sum(c1)), (avg(c1)), (min(c2)), (max(c1)), (stddev(c2)), c2
                Relations: Aggregate on (public.ft1)
-               Remote SQL: SELECT count(c6), sum("C 1"), avg("C 1"), min(c2), max("C 1"), stddev(c2), c2 FROM "S 1"."T 1" WHERE ((c2 < 5)) GROUP BY c2
+               Remote SQL: SELECT count(c6), sum("C 1"), avg("C 1"), min(c2), max("C 1"), stddev(c2), c2 FROM "S 1"."T 1" WHERE ((c2 < 5)) GROUP BY 7
 (9 rows)
 
 select count(c6), sum(c1), avg(c1), min(c2), max(c1), stddev(c2), sum(c1) * (random() <= 1)::int as sum2 from ft1 where c2 < 5 group by c2 order by 1, 2;
@@ -2531,15 +2619,15 @@ select sum(t1.c1), count(t2.c1) from ft1 t1 inner join ft2 t2 on (t1.c1 = t2.c1)
 -- GROUP BY clause having expressions
 explain (verbose, costs off)
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
-                                           QUERY PLAN                                           
-------------------------------------------------------------------------------------------------
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
  Sort
    Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
    Sort Key: ((ft1.c2 / 2))
    ->  Foreign Scan
          Output: ((c2 / 2)), ((sum(c2) * (c2 / 2)))
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY ((c2 / 2))
+         Remote SQL: SELECT (c2 / 2), (sum(c2) * (c2 / 2)) FROM "S 1"."T 1" GROUP BY 1
 (7 rows)
 
 select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
@@ -2555,8 +2643,8 @@ select c2/2, sum(c2) * (c2/2) from ft1 group by c2/2 order by c2/2;
 -- Aggregates in subquery are pushed down.
 explain (verbose, costs off)
 select count(x.a), sum(x.a) from (select c2 a, sum(c1) b from ft1 group by c2, sqrt(c1) order by 1, 2) x;
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
  Aggregate
    Output: count(ft1.c2), sum(ft1.c2)
    ->  Sort
@@ -2565,7 +2653,7 @@ select count(x.a), sum(x.a) from (select c2 a, sum(c1) b from ft1 group by c2, s
          ->  Foreign Scan
                Output: ft1.c2, (sum(ft1.c1)), (sqrt((ft1.c1)::double precision))
                Relations: Aggregate on (public.ft1)
-               Remote SQL: SELECT c2, sum("C 1"), sqrt("C 1") FROM "S 1"."T 1" GROUP BY c2, (sqrt("C 1"))
+               Remote SQL: SELECT c2, sum("C 1"), sqrt("C 1") FROM "S 1"."T 1" GROUP BY 1, 3
 (9 rows)
 
 select count(x.a), sum(x.a) from (select c2 a, sum(c1) b from ft1 group by c2, sqrt(c1) order by 1, 2) x;
@@ -2585,7 +2673,7 @@ select c2 * (random() <= 1)::int as sum1, sum(c1) * c2 as sum2 from ft1 group by
    ->  Foreign Scan
          Output: (c2 * ((random() <= '1'::double precision))::integer), ((sum(c1) * c2)), c2
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT (sum("C 1") * c2), c2 FROM "S 1"."T 1" GROUP BY c2
+         Remote SQL: SELECT (sum("C 1") * c2), c2 FROM "S 1"."T 1" GROUP BY 2
 (7 rows)
 
 select c2 * (random() <= 1)::int as sum1, sum(c1) * c2 as sum2 from ft1 group by c2 order by 1, 2;
@@ -2622,15 +2710,15 @@ select c2 * (random() <= 1)::int as c2 from ft2 group by c2 * (random() <= 1)::i
 -- GROUP BY clause in various forms, cardinal, alias and constant expression
 explain (verbose, costs off)
 select count(c2) w, c2 x, 5 y, 7.0 z from ft1 group by 2, y, 9.0::int order by 2;
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
  Sort
    Output: (count(c2)), c2, 5, 7.0, 9
    Sort Key: ft1.c2
    ->  Foreign Scan
          Output: (count(c2)), c2, 5, 7.0, 9
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT count(c2), c2, 5, 7.0, 9 FROM "S 1"."T 1" GROUP BY c2, 5::integer, 9::integer
+         Remote SQL: SELECT count(c2), c2, 5, 7.0, 9 FROM "S 1"."T 1" GROUP BY 2, 3, 5
 (7 rows)
 
 select count(c2) w, c2 x, 5 y, 7.0 z from ft1 group by 2, y, 9.0::int order by 2;
@@ -2648,18 +2736,41 @@ select count(c2) w, c2 x, 5 y, 7.0 z from ft1 group by 2, y, 9.0::int order by 2
  100 | 9 | 5 | 7.0
 (10 rows)
 
+-- GROUP BY clause referring to same column multiple times
+-- Also, ORDER BY contains an aggregate function
+explain (verbose, costs off)
+select c2, c2 from ft1 where c2 > 6 group by 1, 2 order by sum(c1);
+                                          QUERY PLAN                                           
+-----------------------------------------------------------------------------------------------
+ Sort
+   Output: c2, c2, (sum(c1))
+   Sort Key: (sum(ft1.c1))
+   ->  Foreign Scan
+         Output: c2, c2, (sum(c1))
+         Relations: Aggregate on (public.ft1)
+         Remote SQL: SELECT c2, c2, sum("C 1") FROM "S 1"."T 1" WHERE ((c2 > 6)) GROUP BY 1, 2
+(7 rows)
+
+select c2, c2 from ft1 where c2 > 6 group by 1, 2 order by sum(c1);
+ c2 | c2 
+----+----
+  7 |  7
+  8 |  8
+  9 |  9
+(3 rows)
+
 -- Testing HAVING clause shippability
 explain (verbose, costs off)
 select c2, sum(c1) from ft2 group by c2 having avg(c1) < 500 and sum(c1) < 49800 order by c2;
-                                                               QUERY PLAN                                                               
-----------------------------------------------------------------------------------------------------------------------------------------
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (sum(c1))
    Sort Key: ft2.c2
    ->  Foreign Scan
          Output: c2, (sum(c1))
          Relations: Aggregate on (public.ft2)
-         Remote SQL: SELECT c2, sum("C 1") FROM "S 1"."T 1" GROUP BY c2 HAVING ((avg("C 1") < 500::numeric)) AND ((sum("C 1") < 49800))
+         Remote SQL: SELECT c2, sum("C 1") FROM "S 1"."T 1" GROUP BY 1 HAVING ((avg("C 1") < 500::numeric)) AND ((sum("C 1") < 49800))
 (7 rows)
 
 select c2, sum(c1) from ft2 group by c2 having avg(c1) < 500 and sum(c1) < 49800 order by c2;
@@ -2672,15 +2783,15 @@ select c2, sum(c1) from ft2 group by c2 having avg(c1) < 500 and sum(c1) < 49800
 -- Unshippable HAVING clause will be evaluated locally, and other qual in HAVING clause is pushed down
 explain (verbose, costs off)
 select count(*) from (select c5, count(c1) from ft1 group by c5, sqrt(c2) having (avg(c1) / avg(c1)) * random() <= 1 and avg(c1) < 500) x;
-                                                                   QUERY PLAN                                                                    
--------------------------------------------------------------------------------------------------------------------------------------------------
+                                                              QUERY PLAN                                                               
+---------------------------------------------------------------------------------------------------------------------------------------
  Aggregate
    Output: count(*)
    ->  Foreign Scan
          Output: ft1.c5, NULL::bigint, (sqrt((ft1.c2)::double precision))
          Filter: (((((avg(ft1.c1)) / (avg(ft1.c1))))::double precision * random()) <= '1'::double precision)
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT c5, NULL::bigint, sqrt(c2), avg("C 1") FROM "S 1"."T 1" GROUP BY c5, (sqrt(c2)) HAVING ((avg("C 1") < 500::numeric))
+         Remote SQL: SELECT c5, NULL::bigint, sqrt(c2), avg("C 1") FROM "S 1"."T 1" GROUP BY 1, 3 HAVING ((avg("C 1") < 500::numeric))
 (7 rows)
 
 select count(*) from (select c5, count(c1) from ft1 group by c5, sqrt(c2) having (avg(c1) / avg(c1)) * random() <= 1 and avg(c1) < 500) x;
@@ -2710,15 +2821,15 @@ select sum(c1) from ft1 group by c2 having avg(c1 * (random() <= 1)::int) > 100
 -- ORDER BY within aggregate, same column used to order
 explain (verbose, costs off)
 select array_agg(c1 order by c1) from ft1 where c1 < 100 group by c2 order by 1;
-                                                            QUERY PLAN                                                            
-----------------------------------------------------------------------------------------------------------------------------------
+                                                           QUERY PLAN                                                            
+---------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (array_agg(c1 ORDER BY c1)), c2
    Sort Key: (array_agg(ft1.c1 ORDER BY ft1.c1))
    ->  Foreign Scan
          Output: (array_agg(c1 ORDER BY c1)), c2
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT array_agg("C 1" ORDER BY "C 1" ASC NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" < 100)) GROUP BY c2
+         Remote SQL: SELECT array_agg("C 1" ORDER BY "C 1" ASC NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" < 100)) GROUP BY 2
 (7 rows)
 
 select array_agg(c1 order by c1) from ft1 where c1 < 100 group by c2 order by 1;
@@ -2756,15 +2867,15 @@ select array_agg(c5 order by c1 desc) from ft2 where c2 = 6 and c1 < 50;
 -- DISTINCT within aggregate
 explain (verbose, costs off)
 select array_agg(distinct (t1.c1)%5) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
-                                                                                                            QUERY PLAN                                                                                                            
-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                      QUERY PLAN                                                                                                      
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (array_agg(DISTINCT (t1.c1 % 5))), ((t2.c1 % 3))
    Sort Key: (array_agg(DISTINCT (t1.c1 % 5)))
    ->  Foreign Scan
          Output: (array_agg(DISTINCT (t1.c1 % 5))), ((t2.c1 % 3))
          Relations: Aggregate on ((public.ft4 t1) FULL JOIN (public.ft5 t2))
-         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5)), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY ((r2.c1 % 3))
+         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5)), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY 2
 (7 rows)
 
 select array_agg(distinct (t1.c1)%5) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
@@ -2777,15 +2888,15 @@ select array_agg(distinct (t1.c1)%5) from ft4 t1 full join ft5 t2 on (t1.c1 = t2
 -- DISTINCT combined with ORDER BY within aggregate
 explain (verbose, costs off)
 select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
-                                                                                                                               QUERY PLAN                                                                                                                               
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                                         QUERY PLAN                                                                                                                         
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5))), ((t2.c1 % 3))
    Sort Key: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5)))
    ->  Foreign Scan
          Output: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5))), ((t2.c1 % 3))
          Relations: Aggregate on ((public.ft4 t1) FULL JOIN (public.ft5 t2))
-         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5) ORDER BY ((r1.c1 % 5)) ASC NULLS LAST), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY ((r2.c1 % 3))
+         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5) ORDER BY ((r1.c1 % 5)) ASC NULLS LAST), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY 2
 (7 rows)
 
 select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
@@ -2797,15 +2908,15 @@ select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5) from ft4 t1 full join ft
 
 explain (verbose, costs off)
 select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5 desc nulls last) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
-                                                                                                                               QUERY PLAN                                                                                                                                
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                                         QUERY PLAN                                                                                                                          
+-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5) DESC NULLS LAST)), ((t2.c1 % 3))
    Sort Key: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5) DESC NULLS LAST))
    ->  Foreign Scan
          Output: (array_agg(DISTINCT (t1.c1 % 5) ORDER BY (t1.c1 % 5) DESC NULLS LAST)), ((t2.c1 % 3))
          Relations: Aggregate on ((public.ft4 t1) FULL JOIN (public.ft5 t2))
-         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5) ORDER BY ((r1.c1 % 5)) DESC NULLS LAST), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY ((r2.c1 % 3))
+         Remote SQL: SELECT array_agg(DISTINCT (r1.c1 % 5) ORDER BY ((r1.c1 % 5)) DESC NULLS LAST), (r2.c1 % 3) FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) WHERE (((r1.c1 < 20) OR ((r1.c1 IS NULL) AND (r2.c1 < 5)))) GROUP BY 2
 (7 rows)
 
 select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5 desc nulls last) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) where t1.c1 < 20 or (t1.c1 is null and t2.c1 < 5) group by (t2.c1)%3 order by 1;
@@ -2818,15 +2929,15 @@ select array_agg(distinct (t1.c1)%5 order by (t1.c1)%5 desc nulls last) from ft4
 -- FILTER within aggregate
 explain (verbose, costs off)
 select sum(c1) filter (where c1 < 100 and c2 > 5) from ft1 group by c2 order by 1 nulls last;
-                                                     QUERY PLAN                                                     
---------------------------------------------------------------------------------------------------------------------
+                                                    QUERY PLAN                                                     
+-------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (sum(c1) FILTER (WHERE ((c1 < 100) AND (c2 > 5)))), c2
    Sort Key: (sum(ft1.c1) FILTER (WHERE ((ft1.c1 < 100) AND (ft1.c2 > 5))))
    ->  Foreign Scan
          Output: (sum(c1) FILTER (WHERE ((c1 < 100) AND (c2 > 5)))), c2
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT sum("C 1") FILTER (WHERE (("C 1" < 100) AND (c2 > 5))), c2 FROM "S 1"."T 1" GROUP BY c2
+         Remote SQL: SELECT sum("C 1") FILTER (WHERE (("C 1" < 100) AND (c2 > 5))), c2 FROM "S 1"."T 1" GROUP BY 2
 (7 rows)
 
 select sum(c1) filter (where c1 < 100 and c2 > 5) from ft1 group by c2 order by 1 nulls last;
@@ -2847,12 +2958,12 @@ select sum(c1) filter (where c1 < 100 and c2 > 5) from ft1 group by c2 order by
 -- DISTINCT, ORDER BY and FILTER within aggregate
 explain (verbose, costs off)
 select sum(c1%3), sum(distinct c1%3 order by c1%3) filter (where c1%3 < 2), c2 from ft1 where c2 = 6 group by c2;
-                                                                                        QUERY PLAN                                                                                         
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                        QUERY PLAN                                                                                        
+------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Foreign Scan
    Output: (sum((c1 % 3))), (sum(DISTINCT (c1 % 3) ORDER BY (c1 % 3)) FILTER (WHERE ((c1 % 3) < 2))), c2
    Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT sum(("C 1" % 3)), sum(DISTINCT ("C 1" % 3) ORDER BY (("C 1" % 3)) ASC NULLS LAST) FILTER (WHERE (("C 1" % 3) < 2)), c2 FROM "S 1"."T 1" WHERE ((c2 = 6)) GROUP BY c2
+   Remote SQL: SELECT sum(("C 1" % 3)), sum(DISTINCT ("C 1" % 3) ORDER BY (("C 1" % 3)) ASC NULLS LAST) FILTER (WHERE (("C 1" % 3) < 2)), c2 FROM "S 1"."T 1" WHERE ((c2 = 6)) GROUP BY 3
 (4 rows)
 
 select sum(c1%3), sum(distinct c1%3 order by c1%3) filter (where c1%3 < 2), c2 from ft1 where c2 = 6 group by c2;
@@ -2948,15 +3059,15 @@ select sum(c2) filter (where c2 in (select c2 from ft1 where c2 < 5)) from ft1;
 -- Ordered-sets within aggregate
 explain (verbose, costs off)
 select c2, rank('10'::varchar) within group (order by c6), percentile_cont(c2/10::numeric) within group (order by c1) from ft1 where c2 < 10 group by c2 having percentile_cont(c2/10::numeric) within group (order by c1) < 500 order by c2;
-                                                                                                                                                                           QUERY PLAN                                                                                                                                                                            
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                                                                                           QUERY PLAN                                                                                                                                                                           
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (rank('10'::character varying) WITHIN GROUP (ORDER BY c6)), (percentile_cont((((c2)::numeric / '10'::numeric))::double precision) WITHIN GROUP (ORDER BY ((c1)::double precision)))
    Sort Key: ft1.c2
    ->  Foreign Scan
          Output: c2, (rank('10'::character varying) WITHIN GROUP (ORDER BY c6)), (percentile_cont((((c2)::numeric / '10'::numeric))::double precision) WITHIN GROUP (ORDER BY ((c1)::double precision)))
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT c2, rank('10'::character varying) WITHIN GROUP (ORDER BY c6 ASC NULLS LAST), percentile_cont((c2 / 10::numeric)) WITHIN GROUP (ORDER BY ("C 1") ASC NULLS LAST) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY c2 HAVING ((percentile_cont((c2 / 10::numeric)) WITHIN GROUP (ORDER BY ("C 1") ASC NULLS LAST) < 500::double precision))
+         Remote SQL: SELECT c2, rank('10'::character varying) WITHIN GROUP (ORDER BY c6 ASC NULLS LAST), percentile_cont((c2 / 10::numeric)) WITHIN GROUP (ORDER BY ("C 1") ASC NULLS LAST) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY 1 HAVING ((percentile_cont((c2 / 10::numeric)) WITHIN GROUP (ORDER BY ("C 1") ASC NULLS LAST) < 500::double precision))
 (7 rows)
 
 select c2, rank('10'::varchar) within group (order by c6), percentile_cont(c2/10::numeric) within group (order by c1) from ft1 where c2 < 10 group by c2 having percentile_cont(c2/10::numeric) within group (order by c1) < 500 order by c2;
@@ -2972,12 +3083,12 @@ select c2, rank('10'::varchar) within group (order by c6), percentile_cont(c2/10
 -- Using multiple arguments within aggregates
 explain (verbose, costs off)
 select c1, rank(c1, c2) within group (order by c1, c2) from ft1 group by c1, c2 having c1 = 6 order by 1;
-                                                                               QUERY PLAN                                                                                
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                             QUERY PLAN                                                                             
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Foreign Scan
    Output: c1, (rank(c1, c2) WITHIN GROUP (ORDER BY c1, c2)), c2
    Relations: Aggregate on (public.ft1)
-   Remote SQL: SELECT "C 1", rank("C 1", c2) WITHIN GROUP (ORDER BY "C 1" ASC NULLS LAST, c2 ASC NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" = 6)) GROUP BY "C 1", c2
+   Remote SQL: SELECT "C 1", rank("C 1", c2) WITHIN GROUP (ORDER BY "C 1" ASC NULLS LAST, c2 ASC NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" = 6)) GROUP BY 1, 3
 (4 rows)
 
 select c1, rank(c1, c2) within group (order by c1, c2) from ft1 group by c1, c2 having c1 = 6 order by 1;
@@ -3015,15 +3126,15 @@ alter server loopback options (set extensions 'postgres_fdw');
 -- Now aggregate will be pushed.  Aggregate will display VARIADIC argument.
 explain (verbose, costs off)
 select c2, least_agg(c1) from ft1 where c2 < 100 group by c2 order by c2;
-                                                       QUERY PLAN                                                       
-------------------------------------------------------------------------------------------------------------------------
+                                                      QUERY PLAN                                                       
+-----------------------------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (least_agg(VARIADIC ARRAY[c1]))
    Sort Key: ft1.c2
    ->  Foreign Scan
          Output: c2, (least_agg(VARIADIC ARRAY[c1]))
          Relations: Aggregate on (public.ft1)
-         Remote SQL: SELECT c2, public.least_agg(VARIADIC ARRAY["C 1"]) FROM "S 1"."T 1" WHERE ((c2 < 100)) GROUP BY c2
+         Remote SQL: SELECT c2, public.least_agg(VARIADIC ARRAY["C 1"]) FROM "S 1"."T 1" WHERE ((c2 < 100)) GROUP BY 1
 (7 rows)
 
 select c2, least_agg(c1) from ft1 where c2 < 100 group by c2 order by c2;
@@ -3115,12 +3226,12 @@ alter server loopback options (set extensions 'postgres_fdw');
 -- Now this will be pushed as sort operator is part of the extension.
 explain (verbose, costs off)
 select array_agg(c1 order by c1 using operator(public.<^)) from ft2 where c2 = 6 and c1 < 100 group by c2;
-                                                                           QUERY PLAN                                                                            
------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                           QUERY PLAN                                                                           
+----------------------------------------------------------------------------------------------------------------------------------------------------------------
  Foreign Scan
    Output: (array_agg(c1 ORDER BY c1 USING <^ NULLS LAST)), c2
    Relations: Aggregate on (public.ft2)
-   Remote SQL: SELECT array_agg("C 1" ORDER BY "C 1" USING OPERATOR(public.<^) NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" < 100)) AND ((c2 = 6)) GROUP BY c2
+   Remote SQL: SELECT array_agg("C 1" ORDER BY "C 1" USING OPERATOR(public.<^) NULLS LAST), c2 FROM "S 1"."T 1" WHERE (("C 1" < 100)) AND ((c2 = 6)) GROUP BY 2
 (4 rows)
 
 select array_agg(c1 order by c1 using operator(public.<^)) from ft2 where c2 = 6 and c1 < 100 group by c2;
@@ -3160,27 +3271,29 @@ drop operator public.<^(int, int);
 -- Input relation to aggregate push down hook is not safe to pushdown and thus
 -- the aggregate cannot be pushed down to foreign server.
 explain (verbose, costs off)
-select count(t1.c3) from ft1 t1, ft1 t2 where t1.c1 = postgres_fdw_abs(t1.c2);
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
+select count(t1.c3) from ft2 t1 left join ft2 t2 on (t1.c1 = random() * t2.c2);
+                                        QUERY PLAN                                         
+-------------------------------------------------------------------------------------------
  Aggregate
    Output: count(t1.c3)
-   ->  Nested Loop
+   ->  Nested Loop Left Join
          Output: t1.c3
-         ->  Foreign Scan on public.ft1 t2
-               Remote SQL: SELECT NULL FROM "S 1"."T 1"
+         Join Filter: ((t1.c1)::double precision = (random() * (t2.c2)::double precision))
+         ->  Foreign Scan on public.ft2 t1
+               Output: t1.c3, t1.c1
+               Remote SQL: SELECT "C 1", c3 FROM "S 1"."T 1"
          ->  Materialize
-               Output: t1.c3
-               ->  Foreign Scan on public.ft1 t1
-                     Output: t1.c3
-                     Remote SQL: SELECT c3 FROM "S 1"."T 1" WHERE (("C 1" = public.postgres_fdw_abs(c2)))
-(11 rows)
+               Output: t2.c2
+               ->  Foreign Scan on public.ft2 t2
+                     Output: t2.c2
+                     Remote SQL: SELECT c2 FROM "S 1"."T 1"
+(13 rows)
 
 -- Subquery in FROM clause having aggregate
 explain (verbose, costs off)
 select count(*), x.b from ft1, (select c2 a, sum(c1) b from ft1 group by c2) x where ft1.c2 = x.a group by x.b order by 1, 2;
-                                           QUERY PLAN                                           
-------------------------------------------------------------------------------------------------
+                                          QUERY PLAN                                           
+-----------------------------------------------------------------------------------------------
  Sort
    Output: (count(*)), x.b
    Sort Key: (count(*)), x.b
@@ -3201,7 +3314,7 @@ select count(*), x.b from ft1, (select c2 a, sum(c1) b from ft1 group by c2) x w
                            ->  Foreign Scan
                                  Output: ft1_1.c2, (sum(ft1_1.c1))
                                  Relations: Aggregate on (public.ft1)
-                                 Remote SQL: SELECT c2, sum("C 1") FROM "S 1"."T 1" GROUP BY c2
+                                 Remote SQL: SELECT c2, sum("C 1") FROM "S 1"."T 1" GROUP BY 1
 (21 rows)
 
 select count(*), x.b from ft1, (select c2 a, sum(c1) b from ft1 group by c2) x where ft1.c2 = x.a group by x.b order by 1, 2;
@@ -3222,15 +3335,15 @@ select count(*), x.b from ft1, (select c2 a, sum(c1) b from ft1 group by c2) x w
 -- FULL join with IS NULL check in HAVING
 explain (verbose, costs off)
 select avg(t1.c1), sum(t2.c1) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) group by t2.c1 having (avg(t1.c1) is null and sum(t2.c1) < 10) or sum(t2.c1) is null order by 1 nulls last, 2;
-                                                                                                          QUERY PLAN                                                                                                           
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                                                                        QUERY PLAN                                                                                                         
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Sort
    Output: (avg(t1.c1)), (sum(t2.c1)), t2.c1
    Sort Key: (avg(t1.c1)), (sum(t2.c1))
    ->  Foreign Scan
          Output: (avg(t1.c1)), (sum(t2.c1)), t2.c1
          Relations: Aggregate on ((public.ft4 t1) FULL JOIN (public.ft5 t2))
-         Remote SQL: SELECT avg(r1.c1), sum(r2.c1), r2.c1 FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) GROUP BY r2.c1 HAVING ((((avg(r1.c1) IS NULL) AND (sum(r2.c1) < 10)) OR (sum(r2.c1) IS NULL)))
+         Remote SQL: SELECT avg(r1.c1), sum(r2.c1), r2.c1 FROM ("S 1"."T 3" r1 FULL JOIN "S 1"."T 4" r2 ON (((r1.c1 = r2.c1)))) GROUP BY 3 HAVING ((((avg(r1.c1) IS NULL) AND (sum(r2.c1) < 10)) OR (sum(r2.c1) IS NULL)))
 (7 rows)
 
 select avg(t1.c1), sum(t2.c1) from ft4 t1 full join ft5 t2 on (t1.c1 = t2.c1) group by t2.c1 having (avg(t1.c1) is null and sum(t2.c1) < 10) or sum(t2.c1) is null order by 1 nulls last, 2;
@@ -3284,8 +3397,8 @@ select sum(c2) * (random() <= 1)::int as sum from ft1 order by 1;
 set enable_hashagg to false;
 explain (verbose, costs off)
 select c2, sum from "S 1"."T 1" t1, lateral (select sum(t2.c1 + t1."C 1") sum from ft2 t2 group by t2.c1) qry where t1.c2 * 2 = qry.sum and t1.c2 < 3 and t1."C 1" < 100 order by 1;
-                                                QUERY PLAN                                                
-----------------------------------------------------------------------------------------------------------
+                                              QUERY PLAN                                              
+------------------------------------------------------------------------------------------------------
  Sort
    Output: t1.c2, qry.sum
    Sort Key: t1.c2
@@ -3301,7 +3414,7 @@ select c2, sum from "S 1"."T 1" t1, lateral (select sum(t2.c1 + t1."C 1") sum fr
                ->  Foreign Scan
                      Output: (sum((t2.c1 + t1."C 1"))), t2.c1
                      Relations: Aggregate on (public.ft2 t2)
-                     Remote SQL: SELECT sum(("C 1" + $1::integer)), "C 1" FROM "S 1"."T 1" GROUP BY "C 1"
+                     Remote SQL: SELECT sum(("C 1" + $1::integer)), "C 1" FROM "S 1"."T 1" GROUP BY 2
 (16 rows)
 
 select c2, sum from "S 1"."T 1" t1, lateral (select sum(t2.c1 + t1."C 1") sum from ft2 t2 group by t2.c1) qry where t1.c2 * 2 = qry.sum and t1.c2 < 3 and t1."C 1" < 100 order by 1;
@@ -3447,8 +3560,8 @@ select c2, sum(c1), grouping(c2) from ft1 where c2 < 3 group by c2 order by 1 nu
 -- DISTINCT itself is not pushed down, whereas underneath aggregate is pushed
 explain (verbose, costs off)
 select distinct sum(c1)/1000 s from ft2 where c2 < 6 group by c2 order by 1;
-                                               QUERY PLAN                                               
---------------------------------------------------------------------------------------------------------
+                                              QUERY PLAN                                               
+-------------------------------------------------------------------------------------------------------
  Unique
    Output: ((sum(c1) / 1000)), c2
    ->  Sort
@@ -3457,7 +3570,7 @@ select distinct sum(c1)/1000 s from ft2 where c2 < 6 group by c2 order by 1;
          ->  Foreign Scan
                Output: ((sum(c1) / 1000)), c2
                Relations: Aggregate on (public.ft2)
-               Remote SQL: SELECT (sum("C 1") / 1000), c2 FROM "S 1"."T 1" WHERE ((c2 < 6)) GROUP BY c2
+               Remote SQL: SELECT (sum("C 1") / 1000), c2 FROM "S 1"."T 1" WHERE ((c2 < 6)) GROUP BY 2
 (9 rows)
 
 select distinct sum(c1)/1000 s from ft2 where c2 < 6 group by c2 order by 1;
@@ -3470,8 +3583,8 @@ select distinct sum(c1)/1000 s from ft2 where c2 < 6 group by c2 order by 1;
 -- WindowAgg
 explain (verbose, costs off)
 select c2, sum(c2), count(c2) over (partition by c2%2) from ft2 where c2 < 10 group by c2 order by 1;
-                                                 QUERY PLAN                                                  
--------------------------------------------------------------------------------------------------------------
+                                                 QUERY PLAN                                                 
+------------------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (sum(c2)), (count(c2) OVER (?)), ((c2 % 2))
    Sort Key: ft2.c2
@@ -3483,7 +3596,7 @@ select c2, sum(c2), count(c2) over (partition by c2%2) from ft2 where c2 < 10 gr
                ->  Foreign Scan
                      Output: c2, ((c2 % 2)), (sum(c2))
                      Relations: Aggregate on (public.ft2)
-                     Remote SQL: SELECT c2, (c2 % 2), sum(c2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY c2
+                     Remote SQL: SELECT c2, (c2 % 2), sum(c2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY 1
 (12 rows)
 
 select c2, sum(c2), count(c2) over (partition by c2%2) from ft2 where c2 < 10 group by c2 order by 1;
@@ -3503,8 +3616,8 @@ select c2, sum(c2), count(c2) over (partition by c2%2) from ft2 where c2 < 10 gr
 
 explain (verbose, costs off)
 select c2, array_agg(c2) over (partition by c2%2 order by c2 desc) from ft1 where c2 < 10 group by c2 order by 1;
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (array_agg(c2) OVER (?)), ((c2 % 2))
    Sort Key: ft1.c2
@@ -3516,7 +3629,7 @@ select c2, array_agg(c2) over (partition by c2%2 order by c2 desc) from ft1 wher
                ->  Foreign Scan
                      Output: c2, ((c2 % 2))
                      Relations: Aggregate on (public.ft1)
-                     Remote SQL: SELECT c2, (c2 % 2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY c2
+                     Remote SQL: SELECT c2, (c2 % 2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY 1
 (12 rows)
 
 select c2, array_agg(c2) over (partition by c2%2 order by c2 desc) from ft1 where c2 < 10 group by c2 order by 1;
@@ -3536,8 +3649,8 @@ select c2, array_agg(c2) over (partition by c2%2 order by c2 desc) from ft1 wher
 
 explain (verbose, costs off)
 select c2, array_agg(c2) over (partition by c2%2 order by c2 range between current row and unbounded following) from ft1 where c2 < 10 group by c2 order by 1;
-                                             QUERY PLAN                                             
-----------------------------------------------------------------------------------------------------
+                                            QUERY PLAN                                             
+---------------------------------------------------------------------------------------------------
  Sort
    Output: c2, (array_agg(c2) OVER (?)), ((c2 % 2))
    Sort Key: ft1.c2
@@ -3549,7 +3662,7 @@ select c2, array_agg(c2) over (partition by c2%2 order by c2 range between curre
                ->  Foreign Scan
                      Output: c2, ((c2 % 2))
                      Relations: Aggregate on (public.ft1)
-                     Remote SQL: SELECT c2, (c2 % 2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY c2
+                     Remote SQL: SELECT c2, (c2 % 2) FROM "S 1"."T 1" WHERE ((c2 < 10)) GROUP BY 1
 (12 rows)
 
 select c2, array_agg(c2) over (partition by c2%2 order by c2 range between current row and unbounded following) from ft1 where c2 < 10 group by c2 order by 1;
@@ -4289,27 +4402,13 @@ UPDATE ft2 SET c2 = c2 + 400, c3 = c3 || '_update7' WHERE c1 % 10 = 7 RETURNING
 
 EXPLAIN (verbose, costs off)
 UPDATE ft2 SET c2 = ft2.c2 + 500, c3 = ft2.c3 || '_update9', c7 = DEFAULT
-  FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;                               -- can't be pushed down
-                                                                                                                                                        QUERY PLAN                                                                                                                                                         
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+  FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;                               -- can be pushed down
+                                                                                                   QUERY PLAN                                                                                                    
+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
  Update on public.ft2
-   Remote SQL: UPDATE "S 1"."T 1" SET c2 = $2, c3 = $3, c7 = $4 WHERE ctid = $1
-   ->  Foreign Scan
-         Output: ft2.c1, (ft2.c2 + 500), NULL::integer, (ft2.c3 || '_update9'::text), ft2.c4, ft2.c5, ft2.c6, 'ft2       '::character(10), ft2.c8, ft2.ctid, ft1.*
-         Relations: (public.ft2) INNER JOIN (public.ft1)
-         Remote SQL: SELECT r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c8, r1.ctid, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1.c2 = r2."C 1")) AND (((r2."C 1" % 10) = 9)))) FOR UPDATE OF r1
-         ->  Hash Join
-               Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c8, ft2.ctid, ft1.*
-               Hash Cond: (ft2.c2 = ft1.c1)
-               ->  Foreign Scan on public.ft2
-                     Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c8, ft2.ctid
-                     Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c8, ctid FROM "S 1"."T 1" FOR UPDATE
-               ->  Hash
-                     Output: ft1.*, ft1.c1
-                     ->  Foreign Scan on public.ft1
-                           Output: ft1.*, ft1.c1
-                           Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" WHERE ((("C 1" % 10) = 9))
-(17 rows)
+   ->  Foreign Update
+         Remote SQL: UPDATE "S 1"."T 1" r1 SET c2 = (r1.c2 + 500), c3 = (r1.c3 || '_update9'::text), c7 = 'ft2       '::character(10) FROM "S 1"."T 1" r2 WHERE ((r1.c2 = r2."C 1")) AND (((r2."C 1" % 10) = 9))
+(3 rows)
 
 UPDATE ft2 SET c2 = ft2.c2 + 500, c3 = ft2.c3 || '_update9', c7 = DEFAULT
   FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;
@@ -4432,27 +4531,13 @@ DELETE FROM ft2 WHERE c1 % 10 = 5 RETURNING c1, c4;
 (103 rows)
 
 EXPLAIN (verbose, costs off)
-DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;                -- can't be pushed down
-                                                                                                                              QUERY PLAN                                                                                                                               
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;                -- can be pushed down
+                                                         QUERY PLAN                                                         
+----------------------------------------------------------------------------------------------------------------------------
  Delete on public.ft2
-   Remote SQL: DELETE FROM "S 1"."T 1" WHERE ctid = $1
-   ->  Foreign Scan
-         Output: ft2.ctid, ft1.*
-         Relations: (public.ft2) INNER JOIN (public.ft1)
-         Remote SQL: SELECT r1.ctid, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2."C 1", r2.c2, r2.c3, r2.c4, r2.c5, r2.c6, r2.c7, r2.c8) END FROM ("S 1"."T 1" r1 INNER JOIN "S 1"."T 1" r2 ON (((r1.c2 = r2."C 1")) AND (((r2."C 1" % 10) = 2)))) FOR UPDATE OF r1
-         ->  Hash Join
-               Output: ft2.ctid, ft1.*
-               Hash Cond: (ft2.c2 = ft1.c1)
-               ->  Foreign Scan on public.ft2
-                     Output: ft2.ctid, ft2.c2
-                     Remote SQL: SELECT c2, ctid FROM "S 1"."T 1" FOR UPDATE
-               ->  Hash
-                     Output: ft1.*, ft1.c1
-                     ->  Foreign Scan on public.ft1
-                           Output: ft1.*, ft1.c1
-                           Remote SQL: SELECT "C 1", c2, c3, c4, c5, c6, c7, c8 FROM "S 1"."T 1" WHERE ((("C 1" % 10) = 2))
-(17 rows)
+   ->  Foreign Delete
+         Remote SQL: DELETE FROM "S 1"."T 1" r1 USING "S 1"."T 1" r2 WHERE ((r1.c2 = r2."C 1")) AND (((r2."C 1" % 10) = 2))
+(3 rows)
 
 DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;
 SELECT c1,c2,c3,c4 FROM ft2 ORDER BY c1;
@@ -5328,6 +5413,195 @@ DELETE FROM ft2 WHERE c1 = 9999 RETURNING tableoid::regclass;
  ft2
 (1 row)
 
+-- Test UPDATE/DELETE with RETURNING on a three-table join
+INSERT INTO ft2 (c1,c2,c3)
+  SELECT id, id - 1200, to_char(id, 'FM00000') FROM generate_series(1201, 1300) id;
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'foo'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
+  RETURNING ft2, ft2.*, ft4, ft4.*;       -- can be pushed down
+                                                                                                                                                                          QUERY PLAN                                                                                                                                                                           
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Update on public.ft2
+   Output: ft2.*, ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.*, ft4.c1, ft4.c2, ft4.c3
+   ->  Foreign Update
+         Remote SQL: UPDATE "S 1"."T 1" r1 SET c3 = 'foo'::text FROM ("S 1"."T 3" r2 INNER JOIN "S 1"."T 4" r3 ON (TRUE)) WHERE ((r2.c1 = r3.c1)) AND ((r1.c2 = r2.c1)) AND ((r1."C 1" > 1200)) RETURNING r1."C 1", r1.c2, r1.c3, r1.c4, r1.c5, r1.c6, r1.c7, r1.c8, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.c1, r2.c2, r2.c3) END, r2.c1, r2.c2, r2.c3
+(4 rows)
+
+UPDATE ft2 SET c3 = 'foo'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
+  RETURNING ft2, ft2.*, ft4, ft4.*;
+              ft2               |  c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 |      ft4       | c1 | c2 |   c3   
+--------------------------------+------+----+-----+----+----+----+------------+----+----------------+----+----+--------
+ (1206,6,foo,,,,"ft2       ",)  | 1206 |  6 | foo |    |    |    | ft2        |    | (6,7,AAA006)   |  6 |  7 | AAA006
+ (1212,12,foo,,,,"ft2       ",) | 1212 | 12 | foo |    |    |    | ft2        |    | (12,13,AAA012) | 12 | 13 | AAA012
+ (1218,18,foo,,,,"ft2       ",) | 1218 | 18 | foo |    |    |    | ft2        |    | (18,19,AAA018) | 18 | 19 | AAA018
+ (1224,24,foo,,,,"ft2       ",) | 1224 | 24 | foo |    |    |    | ft2        |    | (24,25,AAA024) | 24 | 25 | AAA024
+ (1230,30,foo,,,,"ft2       ",) | 1230 | 30 | foo |    |    |    | ft2        |    | (30,31,AAA030) | 30 | 31 | AAA030
+ (1236,36,foo,,,,"ft2       ",) | 1236 | 36 | foo |    |    |    | ft2        |    | (36,37,AAA036) | 36 | 37 | AAA036
+ (1242,42,foo,,,,"ft2       ",) | 1242 | 42 | foo |    |    |    | ft2        |    | (42,43,AAA042) | 42 | 43 | AAA042
+ (1248,48,foo,,,,"ft2       ",) | 1248 | 48 | foo |    |    |    | ft2        |    | (48,49,AAA048) | 48 | 49 | AAA048
+ (1254,54,foo,,,,"ft2       ",) | 1254 | 54 | foo |    |    |    | ft2        |    | (54,55,AAA054) | 54 | 55 | AAA054
+ (1260,60,foo,,,,"ft2       ",) | 1260 | 60 | foo |    |    |    | ft2        |    | (60,61,AAA060) | 60 | 61 | AAA060
+ (1266,66,foo,,,,"ft2       ",) | 1266 | 66 | foo |    |    |    | ft2        |    | (66,67,AAA066) | 66 | 67 | AAA066
+ (1272,72,foo,,,,"ft2       ",) | 1272 | 72 | foo |    |    |    | ft2        |    | (72,73,AAA072) | 72 | 73 | AAA072
+ (1278,78,foo,,,,"ft2       ",) | 1278 | 78 | foo |    |    |    | ft2        |    | (78,79,AAA078) | 78 | 79 | AAA078
+ (1284,84,foo,,,,"ft2       ",) | 1284 | 84 | foo |    |    |    | ft2        |    | (84,85,AAA084) | 84 | 85 | AAA084
+ (1290,90,foo,,,,"ft2       ",) | 1290 | 90 | foo |    |    |    | ft2        |    | (90,91,AAA090) | 90 | 91 | AAA090
+ (1296,96,foo,,,,"ft2       ",) | 1296 | 96 | foo |    |    |    | ft2        |    | (96,97,AAA096) | 96 | 97 | AAA096
+(16 rows)
+
+EXPLAIN (verbose, costs off)
+DELETE FROM ft2
+  USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
+  RETURNING 100;                          -- can be pushed down
+                                                                                            QUERY PLAN                                                                                             
+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Delete on public.ft2
+   Output: 100
+   ->  Foreign Delete
+         Remote SQL: DELETE FROM "S 1"."T 1" r1 USING ("S 1"."T 3" r2 LEFT JOIN "S 1"."T 4" r3 ON (((r2.c1 = r3.c1)))) WHERE ((r1.c2 = r2.c1)) AND ((r1."C 1" > 1200)) AND (((r1."C 1" % 10) = 0))
+(4 rows)
+
+DELETE FROM ft2
+  USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
+  RETURNING 100;
+ ?column? 
+----------
+      100
+      100
+      100
+      100
+      100
+      100
+      100
+      100
+      100
+      100
+(10 rows)
+
+DELETE FROM ft2 WHERE ft2.c1 > 1200;
+-- Test UPDATE/DELETE with WHERE or JOIN/ON conditions containing
+-- user-defined operators/functions
+ALTER SERVER loopback OPTIONS (DROP extensions);
+INSERT INTO ft2 (c1,c2,c3)
+  SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
+                                                QUERY PLAN                                                
+----------------------------------------------------------------------------------------------------------
+ Update on public.ft2
+   Output: c1, c2, c3, c4, c5, c6, c7, c8
+   Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
+   ->  Foreign Scan on public.ft2
+         Output: c1, c2, NULL::integer, 'bar'::text, c4, c5, c6, c7, c8, ctid
+         Filter: (postgres_fdw_abs(ft2.c1) > 2000)
+         Remote SQL: SELECT "C 1", c2, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" FOR UPDATE
+(7 rows)
+
+UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+  c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 
+------+----+-----+----+----+----+------------+----
+ 2001 |  1 | bar |    |    |    | ft2        | 
+ 2002 |  2 | bar |    |    |    | ft2        | 
+ 2003 |  3 | bar |    |    |    | ft2        | 
+ 2004 |  4 | bar |    |    |    | ft2        | 
+ 2005 |  5 | bar |    |    |    | ft2        | 
+ 2006 |  6 | bar |    |    |    | ft2        | 
+ 2007 |  7 | bar |    |    |    | ft2        | 
+ 2008 |  8 | bar |    |    |    | ft2        | 
+ 2009 |  9 | bar |    |    |    | ft2        | 
+ 2010 |  0 | bar |    |    |    | ft2        | 
+(10 rows)
+
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'baz'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 === ft4.c1
+  RETURNING ft2.*, ft4.*, ft5.*;                                                    -- can't be pushed down
+                                                                                                                                          QUERY PLAN                                                                                                                                          
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Update on public.ft2
+   Output: ft2.c1, ft2.c2, ft2.c3, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft4.c1, ft4.c2, ft4.c3, ft5.c1, ft5.c2, ft5.c3
+   Remote SQL: UPDATE "S 1"."T 1" SET c3 = $2 WHERE ctid = $1 RETURNING "C 1", c2, c3, c4, c5, c6, c7, c8
+   ->  Nested Loop
+         Output: ft2.c1, ft2.c2, NULL::integer, 'baz'::text, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.ctid, ft4.*, ft5.*, ft4.c1, ft4.c2, ft4.c3, ft5.c1, ft5.c2, ft5.c3
+         Join Filter: (ft2.c2 === ft4.c1)
+         ->  Foreign Scan on public.ft2
+               Output: ft2.c1, ft2.c2, ft2.c4, ft2.c5, ft2.c6, ft2.c7, ft2.c8, ft2.ctid
+               Remote SQL: SELECT "C 1", c2, c4, c5, c6, c7, c8, ctid FROM "S 1"."T 1" WHERE (("C 1" > 2000)) FOR UPDATE
+         ->  Foreign Scan
+               Output: ft4.*, ft4.c1, ft4.c2, ft4.c3, ft5.*, ft5.c1, ft5.c2, ft5.c3
+               Relations: (public.ft4) INNER JOIN (public.ft5)
+               Remote SQL: SELECT CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.c1, r2.c2, r2.c3) END, r2.c1, r2.c2, r2.c3, CASE WHEN (r3.*)::text IS NOT NULL THEN ROW(r3.c1, r3.c2, r3.c3) END, r3.c1, r3.c2, r3.c3 FROM ("S 1"."T 3" r2 INNER JOIN "S 1"."T 4" r3 ON (((r2.c1 = r3.c1))))
+               ->  Hash Join
+                     Output: ft4.*, ft4.c1, ft4.c2, ft4.c3, ft5.*, ft5.c1, ft5.c2, ft5.c3
+                     Hash Cond: (ft4.c1 = ft5.c1)
+                     ->  Foreign Scan on public.ft4
+                           Output: ft4.*, ft4.c1, ft4.c2, ft4.c3
+                           Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 3"
+                     ->  Hash
+                           Output: ft5.*, ft5.c1, ft5.c2, ft5.c3
+                           ->  Foreign Scan on public.ft5
+                                 Output: ft5.*, ft5.c1, ft5.c2, ft5.c3
+                                 Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 4"
+(24 rows)
+
+UPDATE ft2 SET c3 = 'baz'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 === ft4.c1
+  RETURNING ft2.*, ft4.*, ft5.*;
+  c1  | c2 | c3  | c4 | c5 | c6 |     c7     | c8 | c1 | c2 |   c3   | c1 | c2 |   c3   
+------+----+-----+----+----+----+------------+----+----+----+--------+----+----+--------
+ 2006 |  6 | baz |    |    |    | ft2        |    |  6 |  7 | AAA006 |  6 |  7 | AAA006
+(1 row)
+
+EXPLAIN (verbose, costs off)
+DELETE FROM ft2
+  USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
+  RETURNING ft2.c1, ft2.c2, ft2.c3;       -- can't be pushed down
+                                                                                                                                                                     QUERY PLAN                                                                                                                                                                     
+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ Delete on public.ft2
+   Output: ft2.c1, ft2.c2, ft2.c3
+   Remote SQL: DELETE FROM "S 1"."T 1" WHERE ctid = $1 RETURNING "C 1", c2, c3
+   ->  Foreign Scan
+         Output: ft2.ctid, ft4.*, ft5.*
+         Filter: (ft4.c1 === ft5.c1)
+         Relations: ((public.ft2) INNER JOIN (public.ft4)) INNER JOIN (public.ft5)
+         Remote SQL: SELECT r1.ctid, CASE WHEN (r2.*)::text IS NOT NULL THEN ROW(r2.c1, r2.c2, r2.c3) END, CASE WHEN (r3.*)::text IS NOT NULL THEN ROW(r3.c1, r3.c2, r3.c3) END, r2.c1, r3.c1 FROM (("S 1"."T 1" r1 INNER JOIN "S 1"."T 3" r2 ON (((r1.c2 = r2.c1)) AND ((r1."C 1" > 2000)))) INNER JOIN "S 1"."T 4" r3 ON (TRUE)) FOR UPDATE OF r1
+         ->  Nested Loop
+               Output: ft2.ctid, ft4.*, ft5.*, ft4.c1, ft5.c1
+               ->  Nested Loop
+                     Output: ft2.ctid, ft4.*, ft4.c1
+                     Join Filter: (ft2.c2 = ft4.c1)
+                     ->  Foreign Scan on public.ft2
+                           Output: ft2.ctid, ft2.c2
+                           Remote SQL: SELECT c2, ctid FROM "S 1"."T 1" WHERE (("C 1" > 2000)) FOR UPDATE
+                     ->  Foreign Scan on public.ft4
+                           Output: ft4.*, ft4.c1
+                           Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 3"
+               ->  Foreign Scan on public.ft5
+                     Output: ft5.*, ft5.c1
+                     Remote SQL: SELECT c1, c2, c3 FROM "S 1"."T 4"
+(22 rows)
+
+DELETE FROM ft2
+  USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
+  RETURNING ft2.c1, ft2.c2, ft2.c3;
+  c1  | c2 | c3  
+------+----+-----
+ 2006 |  6 | baz
+(1 row)
+
+DELETE FROM ft2 WHERE ft2.c1 > 2000;
+ALTER SERVER loopback OPTIONS (ADD extensions 'postgres_fdw');
 -- Test that trigger on remote table works as expected
 CREATE OR REPLACE FUNCTION "S 1".F_BRTRIG() RETURNS trigger AS $$
 BEGIN
@@ -5728,6 +6002,7 @@ select c2, count(*) from "S 1"."T 1" where c2 < 500 group by 1 order by 1;
  407 |   100
 (13 rows)
 
+VACUUM ANALYZE "S 1"."T 1";
 -- Above DMLs add data with c6 as NULL in ft1, so test ORDER BY NULLS LAST and NULLs
 -- FIRST behavior here.
 -- ORDER BY DESC NULLS LAST options
@@ -7022,6 +7297,63 @@ update bar set f2 = f2 + 100 returning *;
   7 | 277
 (6 rows)
 
+-- Test that UPDATE/DELETE with inherited target works with row-level triggers
+CREATE TRIGGER trig_row_before
+BEFORE UPDATE OR DELETE ON bar2
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+CREATE TRIGGER trig_row_after
+AFTER UPDATE OR DELETE ON bar2
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+explain (verbose, costs off)
+update bar set f2 = f2 + 100;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ Update on public.bar
+   Update on public.bar
+   Foreign Update on public.bar2
+     Remote SQL: UPDATE public.loct2 SET f2 = $2 WHERE ctid = $1 RETURNING f1, f2, f3
+   ->  Seq Scan on public.bar
+         Output: bar.f1, (bar.f2 + 100), bar.ctid
+   ->  Foreign Scan on public.bar2
+         Output: bar2.f1, (bar2.f2 + 100), bar2.f3, bar2.ctid, bar2.*
+         Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 FOR UPDATE
+(9 rows)
+
+update bar set f2 = f2 + 100;
+NOTICE:  trig_row_before(23, skidoo) BEFORE ROW UPDATE ON bar2
+NOTICE:  OLD: (3,333,33),NEW: (3,433,33)
+NOTICE:  trig_row_before(23, skidoo) BEFORE ROW UPDATE ON bar2
+NOTICE:  OLD: (4,344,44),NEW: (4,444,44)
+NOTICE:  trig_row_before(23, skidoo) BEFORE ROW UPDATE ON bar2
+NOTICE:  OLD: (7,277,77),NEW: (7,377,77)
+NOTICE:  trig_row_after(23, skidoo) AFTER ROW UPDATE ON bar2
+NOTICE:  OLD: (3,333,33),NEW: (3,433,33)
+NOTICE:  trig_row_after(23, skidoo) AFTER ROW UPDATE ON bar2
+NOTICE:  OLD: (4,344,44),NEW: (4,444,44)
+NOTICE:  trig_row_after(23, skidoo) AFTER ROW UPDATE ON bar2
+NOTICE:  OLD: (7,277,77),NEW: (7,377,77)
+explain (verbose, costs off)
+delete from bar where f2 < 400;
+                                         QUERY PLAN                                          
+---------------------------------------------------------------------------------------------
+ Delete on public.bar
+   Delete on public.bar
+   Foreign Delete on public.bar2
+     Remote SQL: DELETE FROM public.loct2 WHERE ctid = $1 RETURNING f1, f2, f3
+   ->  Seq Scan on public.bar
+         Output: bar.ctid
+         Filter: (bar.f2 < 400)
+   ->  Foreign Scan on public.bar2
+         Output: bar2.ctid, bar2.*
+         Remote SQL: SELECT f1, f2, f3, ctid FROM public.loct2 WHERE ((f2 < 400)) FOR UPDATE
+(10 rows)
+
+delete from bar where f2 < 400;
+NOTICE:  trig_row_before(23, skidoo) BEFORE ROW DELETE ON bar2
+NOTICE:  OLD: (7,377,77)
+NOTICE:  trig_row_after(23, skidoo) AFTER ROW DELETE ON bar2
+NOTICE:  OLD: (7,377,77)
+-- cleanup
 drop table foo cascade;
 NOTICE:  drop cascades to foreign table foo2
 drop table bar cascade;
@@ -7346,3 +7678,163 @@ AND ftoptions @> array['fetch_size=60000'];
 (1 row)
 
 ROLLBACK;
+-- ===================================================================
+-- test partitionwise joins
+-- ===================================================================
+SET enable_partitionwise_join=on;
+CREATE TABLE fprt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE fprt1_p1 (LIKE fprt1);
+CREATE TABLE fprt1_p2 (LIKE fprt1);
+INSERT INTO fprt1_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 2) i;
+INSERT INTO fprt1_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 2) i;
+CREATE FOREIGN TABLE ftprt1_p1 PARTITION OF fprt1 FOR VALUES FROM (0) TO (250)
+	SERVER loopback OPTIONS (table_name 'fprt1_p1', use_remote_estimate 'true');
+CREATE FOREIGN TABLE ftprt1_p2 PARTITION OF fprt1 FOR VALUES FROM (250) TO (500)
+	SERVER loopback OPTIONS (TABLE_NAME 'fprt1_p2');
+ANALYZE fprt1;
+ANALYZE fprt1_p1;
+ANALYZE fprt1_p2;
+CREATE TABLE fprt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE fprt2_p1 (LIKE fprt2);
+CREATE TABLE fprt2_p2 (LIKE fprt2);
+INSERT INTO fprt2_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 3) i;
+INSERT INTO fprt2_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 3) i;
+CREATE FOREIGN TABLE ftprt2_p1 PARTITION OF fprt2 FOR VALUES FROM (0) TO (250)
+	SERVER loopback OPTIONS (table_name 'fprt2_p1', use_remote_estimate 'true');
+CREATE FOREIGN TABLE ftprt2_p2 PARTITION OF fprt2 FOR VALUES FROM (250) TO (500)
+	SERVER loopback OPTIONS (table_name 'fprt2_p2', use_remote_estimate 'true');
+ANALYZE fprt2;
+ANALYZE fprt2_p1;
+ANALYZE fprt2_p2;
+-- inner join three tables
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
+                                                     QUERY PLAN                                                     
+--------------------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t3.c
+   ->  Append
+         ->  Foreign Scan
+               Relations: ((public.ftprt1_p1 t1) INNER JOIN (public.ftprt2_p1 t2)) INNER JOIN (public.ftprt1_p1 t3)
+         ->  Foreign Scan
+               Relations: ((public.ftprt1_p2 t1) INNER JOIN (public.ftprt2_p2 t2)) INNER JOIN (public.ftprt1_p2 t3)
+(7 rows)
+
+SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
+  a  |  b  |  c   
+-----+-----+------
+   0 |   0 | 0000
+ 150 | 150 | 0003
+ 250 | 250 | 0005
+ 400 | 400 | 0008
+(4 rows)
+
+-- left outer join + nullable clasue
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t2.b,t2.c FROM fprt1 t1 LEFT JOIN (SELECT * FROM fprt2 WHERE a < 10) t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a < 10 ORDER BY 1,2,3;
+                                    QUERY PLAN                                     
+-----------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, ftprt2_p1.b, ftprt2_p1.c
+   ->  Append
+         ->  Foreign Scan
+               Relations: (public.ftprt1_p1 t1) LEFT JOIN (public.ftprt2_p1 fprt2)
+(5 rows)
+
+SELECT t1.a,t2.b,t2.c FROM fprt1 t1 LEFT JOIN (SELECT * FROM fprt2 WHERE a < 10) t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a < 10 ORDER BY 1,2,3;
+ a | b |  c   
+---+---+------
+ 0 | 0 | 0000
+ 2 |   | 
+ 4 |   | 
+ 6 | 6 | 0000
+ 8 |   | 
+(5 rows)
+
+-- with whole-row reference
+EXPLAIN (COSTS OFF)
+SELECT t1,t2 FROM fprt1 t1 JOIN fprt2 t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a % 25 =0 ORDER BY 1,2;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Sort
+   Sort Key: ((t1.*)::fprt1), ((t2.*)::fprt2)
+   ->  Append
+         ->  Foreign Scan
+               Relations: (public.ftprt1_p1 t1) INNER JOIN (public.ftprt2_p1 t2)
+         ->  Foreign Scan
+               Relations: (public.ftprt1_p2 t1) INNER JOIN (public.ftprt2_p2 t2)
+(7 rows)
+
+SELECT t1,t2 FROM fprt1 t1 JOIN fprt2 t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a % 25 =0 ORDER BY 1,2;
+       t1       |       t2       
+----------------+----------------
+ (0,0,0000)     | (0,0,0000)
+ (150,150,0003) | (150,150,0003)
+ (250,250,0005) | (250,250,0005)
+ (400,400,0008) | (400,400,0008)
+(4 rows)
+
+-- join with lateral reference
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t1.b
+   ->  Append
+         ->  Foreign Scan
+               Relations: (public.ftprt1_p1 t1) INNER JOIN (public.ftprt2_p1 t2)
+         ->  Foreign Scan
+               Relations: (public.ftprt1_p2 t1) INNER JOIN (public.ftprt2_p2 t2)
+(7 rows)
+
+SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
+  a  |  b  
+-----+-----
+   0 |   0
+ 150 | 150
+ 250 | 250
+ 400 | 400
+(4 rows)
+
+-- with PHVs, partition-wise join selected but no join pushdown
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.phv, t2.b, t2.phv FROM (SELECT 't1_phv' phv, * FROM fprt1 WHERE a % 25 = 0) t1 FULL JOIN (SELECT 't2_phv' phv, * FROM fprt2 WHERE b % 25 = 0) t2 ON (t1.a = t2.b) ORDER BY t1.a, t2.b;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Sort
+   Sort Key: ftprt1_p1.a, ftprt2_p1.b
+   ->  Result
+         ->  Append
+               ->  Hash Full Join
+                     Hash Cond: (ftprt1_p1.a = ftprt2_p1.b)
+                     ->  Foreign Scan on ftprt1_p1
+                     ->  Hash
+                           ->  Foreign Scan on ftprt2_p1
+               ->  Hash Full Join
+                     Hash Cond: (ftprt1_p2.a = ftprt2_p2.b)
+                     ->  Foreign Scan on ftprt1_p2
+                     ->  Hash
+                           ->  Foreign Scan on ftprt2_p2
+(14 rows)
+
+SELECT t1.a, t1.phv, t2.b, t2.phv FROM (SELECT 't1_phv' phv, * FROM fprt1 WHERE a % 25 = 0) t1 FULL JOIN (SELECT 't2_phv' phv, * FROM fprt2 WHERE b % 25 = 0) t2 ON (t1.a = t2.b) ORDER BY t1.a, t2.b;
+  a  |  phv   |  b  |  phv   
+-----+--------+-----+--------
+   0 | t1_phv |   0 | t2_phv
+  50 | t1_phv |     | 
+ 100 | t1_phv |     | 
+ 150 | t1_phv | 150 | t2_phv
+ 200 | t1_phv |     | 
+ 250 | t1_phv | 250 | t2_phv
+ 300 | t1_phv |     | 
+ 350 | t1_phv |     | 
+ 400 | t1_phv | 400 | t2_phv
+ 450 | t1_phv |     | 
+     |        |  75 | t2_phv
+     |        | 225 | t2_phv
+     |        | 325 | t2_phv
+     |        | 475 | t2_phv
+(14 rows)
+
+RESET enable_partitionwise_join;
diff --git a/contrib/postgres_fdw/option.c b/contrib/postgres_fdw/option.c
index 67e1c59951..082f79ae04 100644
--- a/contrib/postgres_fdw/option.c
+++ b/contrib/postgres_fdw/option.c
@@ -3,7 +3,7 @@
  * option.c
  *		  FDW option handling for postgres_fdw
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/postgres_fdw/option.c
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index d77c2a70e4..e8a0d5482a 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -3,7 +3,7 @@
  * postgres_fdw.c
  *		  Foreign-data wrapper for remote PostgreSQL servers
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/postgres_fdw/postgres_fdw.c
@@ -210,6 +210,11 @@ typedef struct PgFdwDirectModifyState
 	PGresult   *result;			/* result for query */
 	int			num_tuples;		/* # of result tuples */
 	int			next_tuple;		/* index of next one to return */
+	Relation	resultRel;		/* relcache entry for the target relation */
+	AttrNumber *attnoMap;		/* array of attnums of input user columns */
+	AttrNumber	ctidAttno;		/* attnum of input ctid column */
+	AttrNumber	oidAttno;		/* attnum of input oid column */
+	bool		hasSystemCols;	/* are there system columns of resultRel? */
 
 	/* working memory context */
 	MemoryContext temp_cxt;		/* context for per-tuple temporary data */
@@ -278,7 +283,7 @@ static void postgresGetForeignPaths(PlannerInfo *root,
 						RelOptInfo *baserel,
 						Oid foreigntableid);
 static ForeignScan *postgresGetForeignPlan(PlannerInfo *root,
-					   RelOptInfo *baserel,
+					   RelOptInfo *foreignrel,
 					   Oid foreigntableid,
 					   ForeignPath *best_path,
 					   List *tlist,
@@ -353,8 +358,8 @@ static void postgresGetForeignUpperPaths(PlannerInfo *root,
  * Helper functions
  */
 static void estimate_path_cost_size(PlannerInfo *root,
-						RelOptInfo *baserel,
-						List *join_conds,
+						RelOptInfo *foreignrel,
+						List *param_join_conds,
 						List *pathkeys,
 						double *p_rows, int *p_width,
 						Cost *p_startup_cost, Cost *p_total_cost);
@@ -376,8 +381,17 @@ static const char **convert_prep_stmt_params(PgFdwModifyState *fmstate,
 						 TupleTableSlot *slot);
 static void store_returning_result(PgFdwModifyState *fmstate,
 					   TupleTableSlot *slot, PGresult *res);
+static List *build_remote_returning(Index rtindex, Relation rel,
+					   List *returningList);
+static void rebuild_fdw_scan_tlist(ForeignScan *fscan, List *tlist);
 static void execute_dml_stmt(ForeignScanState *node);
 static TupleTableSlot *get_returning_data(ForeignScanState *node);
+static void init_returning_filter(PgFdwDirectModifyState *dmstate,
+					  List *fdw_scan_tlist,
+					  Index rtindex);
+static TupleTableSlot *apply_returning_filter(PgFdwDirectModifyState *dmstate,
+					   TupleTableSlot *slot,
+					   EState *estate);
 static void prepare_query_params(PlanState *node,
 					 List *fdw_exprs,
 					 int numParams,
@@ -1575,7 +1589,7 @@ postgresPlanForeignModify(PlannerInfo *root,
 
 		for (attnum = 1; attnum <= tupdesc->natts; attnum++)
 		{
-			Form_pg_attribute attr = tupdesc->attrs[attnum - 1];
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1);
 
 			if (!attr->attisdropped)
 				targetAttrs = lappend_int(targetAttrs, attnum);
@@ -1675,6 +1689,7 @@ postgresBeginForeignModify(ModifyTableState *mtstate,
 	Oid			typefnoid;
 	bool		isvarlena;
 	ListCell   *lc;
+	TupleDesc	tupdesc = RelationGetDescr(rel);
 
 	/*
 	 * Do nothing in EXPLAIN (no ANALYZE) case.  resultRelInfo->ri_FdwState
@@ -1719,7 +1734,7 @@ postgresBeginForeignModify(ModifyTableState *mtstate,
 
 	/* Prepare for input conversion of RETURNING results. */
 	if (fmstate->has_returning)
-		fmstate->attinmeta = TupleDescGetAttInMetadata(RelationGetDescr(rel));
+		fmstate->attinmeta = TupleDescGetAttInMetadata(tupdesc);
 
 	/* Prepare for output conversion of parameters used in prepared stmt. */
 	n_params = list_length(fmstate->target_attrs) + 1;
@@ -1748,7 +1763,7 @@ postgresBeginForeignModify(ModifyTableState *mtstate,
 		foreach(lc, fmstate->target_attrs)
 		{
 			int			attnum = lfirst_int(lc);
-			Form_pg_attribute attr = RelationGetDescr(rel)->attrs[attnum - 1];
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1);
 
 			Assert(!attr->attisdropped);
 
@@ -2143,14 +2158,15 @@ postgresPlanDirectModify(PlannerInfo *root,
 	if (subplan->qual != NIL)
 		return false;
 
-	/*
-	 * We can't handle an UPDATE or DELETE on a foreign join for now.
-	 */
-	if (fscan->scan.scanrelid == 0)
-		return false;
-
 	/* Safe to fetch data about the target foreign rel */
-	foreignrel = root->simple_rel_array[resultRelation];
+	if (fscan->scan.scanrelid == 0)
+	{
+		foreignrel = find_join_rel(root, fscan->fs_relids);
+		/* We should have a rel for this foreign join. */
+		Assert(foreignrel);
+	}
+	else
+		foreignrel = root->simple_rel_array[resultRelation];
 	rte = root->simple_rte_array[resultRelation];
 	fpinfo = (PgFdwRelationInfo *) foreignrel->fdw_private;
 
@@ -2211,8 +2227,23 @@ postgresPlanDirectModify(PlannerInfo *root,
 	 * Extract the relevant RETURNING list if any.
 	 */
 	if (plan->returningLists)
+	{
 		returningList = (List *) list_nth(plan->returningLists, subplan_index);
 
+		/*
+		 * When performing an UPDATE/DELETE .. RETURNING on a join directly,
+		 * we fetch from the foreign server any Vars specified in RETURNING
+		 * that refer not only to the target relation but to non-target
+		 * relations.  So we'll deparse them into the RETURNING clause of the
+		 * remote query; use a targetlist consisting of them instead, which
+		 * will be adjusted to be new fdw_scan_tlist of the foreign-scan plan
+		 * node below.
+		 */
+		if (fscan->scan.scanrelid == 0)
+			returningList = build_remote_returning(resultRelation, rel,
+												   returningList);
+	}
+
 	/*
 	 * Construct the SQL command string.
 	 */
@@ -2220,6 +2251,7 @@ postgresPlanDirectModify(PlannerInfo *root,
 	{
 		case CMD_UPDATE:
 			deparseDirectUpdateSql(&sql, root, resultRelation, rel,
+								   foreignrel,
 								   ((Plan *) fscan)->targetlist,
 								   targetAttrs,
 								   remote_exprs, &params_list,
@@ -2227,6 +2259,7 @@ postgresPlanDirectModify(PlannerInfo *root,
 			break;
 		case CMD_DELETE:
 			deparseDirectDeleteSql(&sql, root, resultRelation, rel,
+								   foreignrel,
 								   remote_exprs, &params_list,
 								   returningList, &retrieved_attrs);
 			break;
@@ -2254,6 +2287,19 @@ postgresPlanDirectModify(PlannerInfo *root,
 									retrieved_attrs,
 									makeInteger(plan->canSetTag));
 
+	/*
+	 * Update the foreign-join-related fields.
+	 */
+	if (fscan->scan.scanrelid == 0)
+	{
+		/* No need for the outer subplan. */
+		fscan->scan.plan.lefttree = NULL;
+
+		/* Build new fdw_scan_tlist if UPDATE/DELETE .. RETURNING. */
+		if (returningList)
+			rebuild_fdw_scan_tlist(fscan, returningList);
+	}
+
 	heap_close(rel, NoLock);
 	return true;
 }
@@ -2268,6 +2314,7 @@ postgresBeginDirectModify(ForeignScanState *node, int eflags)
 	ForeignScan *fsplan = (ForeignScan *) node->ss.ps.plan;
 	EState	   *estate = node->ss.ps.state;
 	PgFdwDirectModifyState *dmstate;
+	Index		rtindex;
 	RangeTblEntry *rte;
 	Oid			userid;
 	ForeignTable *table;
@@ -2290,11 +2337,15 @@ postgresBeginDirectModify(ForeignScanState *node, int eflags)
 	 * Identify which user to do the remote access as.  This should match what
 	 * ExecCheckRTEPerms() does.
 	 */
-	rte = rt_fetch(fsplan->scan.scanrelid, estate->es_range_table);
+	rtindex = estate->es_result_relation_info->ri_RangeTableIndex;
+	rte = rt_fetch(rtindex, estate->es_range_table);
 	userid = rte->checkAsUser ? rte->checkAsUser : GetUserId();
 
 	/* Get info about foreign table. */
-	dmstate->rel = node->ss.ss_currentRelation;
+	if (fsplan->scan.scanrelid == 0)
+		dmstate->rel = ExecOpenScanRelation(estate, rtindex, eflags);
+	else
+		dmstate->rel = node->ss.ss_currentRelation;
 	table = GetForeignTable(RelationGetRelid(dmstate->rel));
 	user = GetUserMapping(userid, table->serverid);
 
@@ -2304,6 +2355,21 @@ postgresBeginDirectModify(ForeignScanState *node, int eflags)
 	 */
 	dmstate->conn = GetConnection(user, false);
 
+	/* Update the foreign-join-related fields. */
+	if (fsplan->scan.scanrelid == 0)
+	{
+		/* Save info about foreign table. */
+		dmstate->resultRel = dmstate->rel;
+
+		/*
+		 * Set dmstate->rel to NULL to teach get_returning_data() and
+		 * make_tuple_from_result_row() that columns fetched from the remote
+		 * server are described by fdw_scan_tlist of the foreign-scan plan
+		 * node, not the tuple descriptor for the target relation.
+		 */
+		dmstate->rel = NULL;
+	}
+
 	/* Initialize state variable */
 	dmstate->num_tuples = -1;	/* -1 means not set yet */
 
@@ -2324,7 +2390,24 @@ postgresBeginDirectModify(ForeignScanState *node, int eflags)
 
 	/* Prepare for input conversion of RETURNING results. */
 	if (dmstate->has_returning)
-		dmstate->attinmeta = TupleDescGetAttInMetadata(RelationGetDescr(dmstate->rel));
+	{
+		TupleDesc	tupdesc;
+
+		if (fsplan->scan.scanrelid == 0)
+			tupdesc = node->ss.ss_ScanTupleSlot->tts_tupleDescriptor;
+		else
+			tupdesc = RelationGetDescr(dmstate->rel);
+
+		dmstate->attinmeta = TupleDescGetAttInMetadata(tupdesc);
+
+		/*
+		 * When performing an UPDATE/DELETE .. RETURNING on a join directly,
+		 * initialize a filter to extract an updated/deleted tuple from a scan
+		 * tuple.
+		 */
+		if (fsplan->scan.scanrelid == 0)
+			init_returning_filter(dmstate, fsplan->fdw_scan_tlist, rtindex);
+	}
 
 	/*
 	 * Prepare for processing of parameters used in remote query, if any.
@@ -2405,6 +2488,10 @@ postgresEndDirectModify(ForeignScanState *node)
 	ReleaseConnection(dmstate->conn);
 	dmstate->conn = NULL;
 
+	/* close the target relation. */
+	if (dmstate->resultRel)
+		ExecCloseScanRelation(dmstate->resultRel);
+
 	/* MemoryContext will be deleted automatically. */
 }
 
@@ -3271,6 +3358,136 @@ store_returning_result(PgFdwModifyState *fmstate,
 	PG_END_TRY();
 }
 
+/*
+ * build_remote_returning
+ *		Build a RETURNING targetlist of a remote query for performing an
+ *		UPDATE/DELETE .. RETURNING on a join directly
+ */
+static List *
+build_remote_returning(Index rtindex, Relation rel, List *returningList)
+{
+	bool		have_wholerow = false;
+	List	   *tlist = NIL;
+	List	   *vars;
+	ListCell   *lc;
+
+	Assert(returningList);
+
+	vars = pull_var_clause((Node *) returningList, PVC_INCLUDE_PLACEHOLDERS);
+
+	/*
+	 * If there's a whole-row reference to the target relation, then we'll
+	 * need all the columns of the relation.
+	 */
+	foreach(lc, vars)
+	{
+		Var		   *var = (Var *) lfirst(lc);
+
+		if (IsA(var, Var) &&
+			var->varno == rtindex &&
+			var->varattno == InvalidAttrNumber)
+		{
+			have_wholerow = true;
+			break;
+		}
+	}
+
+	if (have_wholerow)
+	{
+		TupleDesc	tupdesc = RelationGetDescr(rel);
+		int			i;
+
+		for (i = 1; i <= tupdesc->natts; i++)
+		{
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i - 1);
+			Var		   *var;
+
+			/* Ignore dropped attributes. */
+			if (attr->attisdropped)
+				continue;
+
+			var = makeVar(rtindex,
+						  i,
+						  attr->atttypid,
+						  attr->atttypmod,
+						  attr->attcollation,
+						  0);
+
+			tlist = lappend(tlist,
+							makeTargetEntry((Expr *) var,
+											list_length(tlist) + 1,
+											NULL,
+											false));
+		}
+	}
+
+	/* Now add any remaining columns to tlist. */
+	foreach(lc, vars)
+	{
+		Var		   *var = (Var *) lfirst(lc);
+
+		/*
+		 * No need for whole-row references to the target relation.  We don't
+		 * need system columns other than ctid and oid either, since those are
+		 * set locally.
+		 */
+		if (IsA(var, Var) &&
+			var->varno == rtindex &&
+			var->varattno <= InvalidAttrNumber &&
+			var->varattno != SelfItemPointerAttributeNumber &&
+			var->varattno != ObjectIdAttributeNumber)
+			continue;			/* don't need it */
+
+		if (tlist_member((Expr *) var, tlist))
+			continue;			/* already got it */
+
+		tlist = lappend(tlist,
+						makeTargetEntry((Expr *) var,
+										list_length(tlist) + 1,
+										NULL,
+										false));
+	}
+
+	list_free(vars);
+
+	return tlist;
+}
+
+/*
+ * rebuild_fdw_scan_tlist
+ *		Build new fdw_scan_tlist of given foreign-scan plan node from given
+ *		tlist
+ *
+ * There might be columns that the fdw_scan_tlist of the given foreign-scan
+ * plan node contains that the given tlist doesn't.  The fdw_scan_tlist would
+ * have contained resjunk columns such as 'ctid' of the target relation and
+ * 'wholerow' of non-target relations, but the tlist might not contain them,
+ * for example.  So, adjust the tlist so it contains all the columns specified
+ * in the fdw_scan_tlist; else setrefs.c will get confused.
+ */
+static void
+rebuild_fdw_scan_tlist(ForeignScan *fscan, List *tlist)
+{
+	List	   *new_tlist = tlist;
+	List	   *old_tlist = fscan->fdw_scan_tlist;
+	ListCell   *lc;
+
+	foreach(lc, old_tlist)
+	{
+		TargetEntry *tle = (TargetEntry *) lfirst(lc);
+
+		if (tlist_member(tle->expr, new_tlist))
+			continue;			/* already got it */
+
+		new_tlist = lappend(new_tlist,
+							makeTargetEntry(tle->expr,
+											list_length(new_tlist) + 1,
+											NULL,
+											false));
+	}
+	fscan->fdw_scan_tlist = new_tlist;
+}
+
 /*
  * Execute a direct UPDATE/DELETE statement.
  */
@@ -3331,6 +3548,7 @@ get_returning_data(ForeignScanState *node)
 	EState	   *estate = node->ss.ps.state;
 	ResultRelInfo *resultRelInfo = estate->es_result_relation_info;
 	TupleTableSlot *slot = node->ss.ss_ScanTupleSlot;
+	TupleTableSlot *resultSlot;
 
 	Assert(resultRelInfo->ri_projectReturning);
 
@@ -3348,7 +3566,10 @@ get_returning_data(ForeignScanState *node)
 	 * "UPDATE/DELETE .. RETURNING 1" for example.)
 	 */
 	if (!dmstate->has_returning)
+	{
 		ExecStoreAllNullTuple(slot);
+		resultSlot = slot;
+	}
 	else
 	{
 		/*
@@ -3364,7 +3585,7 @@ get_returning_data(ForeignScanState *node)
 												dmstate->rel,
 												dmstate->attinmeta,
 												dmstate->retrieved_attrs,
-												NULL,
+												node,
 												dmstate->temp_cxt);
 			ExecStoreTuple(newtup, slot, InvalidBuffer, false);
 		}
@@ -3375,15 +3596,204 @@ get_returning_data(ForeignScanState *node)
 			PG_RE_THROW();
 		}
 		PG_END_TRY();
+
+		/* Get the updated/deleted tuple. */
+		if (dmstate->rel)
+			resultSlot = slot;
+		else
+			resultSlot = apply_returning_filter(dmstate, slot, estate);
 	}
 	dmstate->next_tuple++;
 
 	/* Make slot available for evaluation of the local query RETURNING list. */
-	resultRelInfo->ri_projectReturning->pi_exprContext->ecxt_scantuple = slot;
+	resultRelInfo->ri_projectReturning->pi_exprContext->ecxt_scantuple =
+		resultSlot;
 
 	return slot;
 }
 
+/*
+ * Initialize a filter to extract an updated/deleted tuple from a scan tuple.
+ */
+static void
+init_returning_filter(PgFdwDirectModifyState *dmstate,
+					  List *fdw_scan_tlist,
+					  Index rtindex)
+{
+	TupleDesc	resultTupType = RelationGetDescr(dmstate->resultRel);
+	ListCell   *lc;
+	int			i;
+
+	/*
+	 * Calculate the mapping between the fdw_scan_tlist's entries and the
+	 * result tuple's attributes.
+	 *
+	 * The "map" is an array of indexes of the result tuple's attributes in
+	 * fdw_scan_tlist, i.e., one entry for every attribute of the result
+	 * tuple.  We store zero for any attributes that don't have the
+	 * corresponding entries in that list, marking that a NULL is needed in
+	 * the result tuple.
+	 *
+	 * Also get the indexes of the entries for ctid and oid if any.
+	 */
+	dmstate->attnoMap = (AttrNumber *)
+		palloc0(resultTupType->natts * sizeof(AttrNumber));
+
+	dmstate->ctidAttno = dmstate->oidAttno = 0;
+
+	i = 1;
+	dmstate->hasSystemCols = false;
+	foreach(lc, fdw_scan_tlist)
+	{
+		TargetEntry *tle = (TargetEntry *) lfirst(lc);
+		Var		   *var = (Var *) tle->expr;
+
+		Assert(IsA(var, Var));
+
+		/*
+		 * If the Var is a column of the target relation to be retrieved from
+		 * the foreign server, get the index of the entry.
+		 */
+		if (var->varno == rtindex &&
+			list_member_int(dmstate->retrieved_attrs, i))
+		{
+			int			attrno = var->varattno;
+
+			if (attrno < 0)
+			{
+				/*
+				 * We don't retrieve system columns other than ctid and oid.
+				 */
+				if (attrno == SelfItemPointerAttributeNumber)
+					dmstate->ctidAttno = i;
+				else if (attrno == ObjectIdAttributeNumber)
+					dmstate->oidAttno = i;
+				else
+					Assert(false);
+				dmstate->hasSystemCols = true;
+			}
+			else
+			{
+				/*
+				 * We don't retrieve whole-row references to the target
+				 * relation either.
+				 */
+				Assert(attrno > 0);
+
+				dmstate->attnoMap[attrno - 1] = i;
+			}
+		}
+		i++;
+	}
+}
+
+/*
+ * Extract and return an updated/deleted tuple from a scan tuple.
+ */
+static TupleTableSlot *
+apply_returning_filter(PgFdwDirectModifyState *dmstate,
+					   TupleTableSlot *slot,
+					   EState *estate)
+{
+	TupleDesc	resultTupType = RelationGetDescr(dmstate->resultRel);
+	TupleTableSlot *resultSlot;
+	Datum	   *values;
+	bool	   *isnull;
+	Datum	   *old_values;
+	bool	   *old_isnull;
+	int			i;
+
+	/*
+	 * Use the trigger tuple slot as a place to store the result tuple.
+	 */
+	resultSlot = estate->es_trig_tuple_slot;
+	if (resultSlot->tts_tupleDescriptor != resultTupType)
+		ExecSetSlotDescriptor(resultSlot, resultTupType);
+
+	/*
+	 * Extract all the values of the scan tuple.
+	 */
+	slot_getallattrs(slot);
+	old_values = slot->tts_values;
+	old_isnull = slot->tts_isnull;
+
+	/*
+	 * Prepare to build the result tuple.
+	 */
+	ExecClearTuple(resultSlot);
+	values = resultSlot->tts_values;
+	isnull = resultSlot->tts_isnull;
+
+	/*
+	 * Transpose data into proper fields of the result tuple.
+	 */
+	for (i = 0; i < resultTupType->natts; i++)
+	{
+		int			j = dmstate->attnoMap[i];
+
+		if (j == 0)
+		{
+			values[i] = (Datum) 0;
+			isnull[i] = true;
+		}
+		else
+		{
+			values[i] = old_values[j - 1];
+			isnull[i] = old_isnull[j - 1];
+		}
+	}
+
+	/*
+	 * Build the virtual tuple.
+	 */
+	ExecStoreVirtualTuple(resultSlot);
+
+	/*
+	 * If we have any system columns to return, install them.
+	 */
+	if (dmstate->hasSystemCols)
+	{
+		HeapTuple	resultTup = ExecMaterializeSlot(resultSlot);
+
+		/* ctid */
+		if (dmstate->ctidAttno)
+		{
+			ItemPointer ctid = NULL;
+
+			ctid = (ItemPointer) DatumGetPointer(old_values[dmstate->ctidAttno - 1]);
+			resultTup->t_self = *ctid;
+		}
+
+		/* oid */
+		if (dmstate->oidAttno)
+		{
+			Oid			oid = InvalidOid;
+
+			oid = DatumGetObjectId(old_values[dmstate->oidAttno - 1]);
+			HeapTupleSetOid(resultTup, oid);
+		}
+
+		/*
+		 * And remaining columns
+		 *
+		 * Note: since we currently don't allow the target relation to appear
+		 * on the nullable side of an outer join, any system columns wouldn't
+		 * go to NULL.
+		 *
+		 * Note: no need to care about tableoid here because it will be
+		 * initialized in ExecProcessReturning().
+		 */
+		HeapTupleHeaderSetXmin(resultTup->t_data, InvalidTransactionId);
+		HeapTupleHeaderSetXmax(resultTup->t_data, InvalidTransactionId);
+		HeapTupleHeaderSetCmin(resultTup->t_data, InvalidTransactionId);
+	}
+
+	/*
+	 * And return the result tuple.
+	 */
+	return resultSlot;
+}
+
 /*
  * Prepare for processing of parameters used in remote query.
  */
@@ -4155,7 +4565,11 @@ foreign_join_ok(PlannerInfo *root, RelOptInfo *joinrel, JoinType jointype,
 	foreach(lc, root->placeholder_list)
 	{
 		PlaceHolderInfo *phinfo = lfirst(lc);
-		Relids		relids = joinrel->relids;
+		Relids		relids;
+
+		/* PlaceHolderInfo refers to parent relids, not child relids. */
+		relids = IS_OTHER_REL(joinrel) ?
+			joinrel->top_parent_relids : joinrel->relids;
 
 		if (bms_is_subset(phinfo->ph_eval_at, relids) &&
 			bms_nonempty_difference(relids, phinfo->ph_eval_at))
@@ -4329,10 +4743,26 @@ add_paths_with_pathkeys_for_rel(PlannerInfo *root, RelOptInfo *rel,
 		Cost		startup_cost;
 		Cost		total_cost;
 		List	   *useful_pathkeys = lfirst(lc);
+		Path	   *sorted_epq_path;
 
 		estimate_path_cost_size(root, rel, NIL, useful_pathkeys,
 								&rows, &width, &startup_cost, &total_cost);
 
+		/*
+		 * The EPQ path must be at least as well sorted as the path itself,
+		 * in case it gets used as input to a mergejoin.
+		 */
+		sorted_epq_path = epq_path;
+		if (sorted_epq_path != NULL &&
+			!pathkeys_contained_in(useful_pathkeys,
+								   sorted_epq_path->pathkeys))
+			sorted_epq_path = (Path *)
+				create_sort_path(root,
+								 rel,
+								 sorted_epq_path,
+								 useful_pathkeys,
+								 -1.0);
+
 		add_path(rel, (Path *)
 				 create_foreignscan_path(root, rel,
 										 NULL,
@@ -4341,7 +4771,7 @@ add_paths_with_pathkeys_for_rel(PlannerInfo *root, RelOptInfo *rel,
 										 total_cost,
 										 useful_pathkeys,
 										 NULL,
-										 epq_path,
+										 sorted_epq_path,
 										 NIL));
 	}
 }
@@ -4497,7 +4927,6 @@ postgresGetForeignJoinPaths(PlannerInfo *root,
 	 * the path list of the joinrel, if one exists.  We must be careful to
 	 * call it before adding any ForeignPath, since the ForeignPath might
 	 * dominate the only suitable local path available.  We also do it before
-	 * reconstruct the row for EvalPlanQual(). Find an alternative local path
 	 * calling foreign_join_ok(), since that function updates fpinfo and marks
 	 * it as pushable if the join is found to be pushable.
 	 */
@@ -4591,7 +5020,7 @@ static bool
 foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 {
 	Query	   *query = root->parse;
-	PathTarget *grouping_target;
+	PathTarget *grouping_target = root->upper_targets[UPPERREL_GROUP_AGG];
 	PgFdwRelationInfo *fpinfo = (PgFdwRelationInfo *) grouped_rel->fdw_private;
 	PgFdwRelationInfo *ofpinfo;
 	List	   *aggvars;
@@ -4599,7 +5028,7 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 	int			i;
 	List	   *tlist = NIL;
 
-	/* Grouping Sets are not pushable */
+	/* We currently don't support pushing Grouping Sets. */
 	if (query->groupingSets)
 		return false;
 
@@ -4607,7 +5036,7 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 	ofpinfo = (PgFdwRelationInfo *) fpinfo->outerrel->fdw_private;
 
 	/*
-	 * If underneath input relation has any local conditions, those conditions
+	 * If underlying scan relation has any local conditions, those conditions
 	 * are required to be applied before performing aggregation.  Hence the
 	 * aggregate cannot be pushed down.
 	 */
@@ -4615,21 +5044,11 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 		return false;
 
 	/*
-	 * The targetlist expected from this node and the targetlist pushed down
-	 * to the foreign server may be different. The latter requires
-	 * sortgrouprefs to be set to push down GROUP BY clause, but should not
-	 * have those arising from ORDER BY clause. These sortgrouprefs may be
-	 * different from those in the plan's targetlist. Use a copy of path
-	 * target to record the new sortgrouprefs.
-	 */
-	grouping_target = copy_pathtarget(root->upper_targets[UPPERREL_GROUP_AGG]);
-
-	/*
-	 * Evaluate grouping targets and check whether they are safe to push down
-	 * to the foreign side.  All GROUP BY expressions will be part of the
-	 * grouping target and thus there is no need to evaluate it separately.
-	 * While doing so, add required expressions into target list which can
-	 * then be used to pass to foreign server.
+	 * Examine grouping expressions, as well as other expressions we'd need to
+	 * compute, and check whether they are safe to push down to the foreign
+	 * server.  All GROUP BY expressions will be part of the grouping target
+	 * and thus there is no need to search for them separately.  Add grouping
+	 * expressions into target list which will be passed to foreign server.
 	 */
 	i = 0;
 	foreach(lc, grouping_target->exprs)
@@ -4641,51 +5060,59 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 		/* Check whether this expression is part of GROUP BY clause */
 		if (sgref && get_sortgroupref_clause_noerr(sgref, query->groupClause))
 		{
+			TargetEntry *tle;
+
 			/*
-			 * If any of the GROUP BY expression is not shippable we can not
+			 * If any GROUP BY expression is not shippable, then we cannot
 			 * push down aggregation to the foreign server.
 			 */
 			if (!is_foreign_expr(root, grouped_rel, expr))
 				return false;
 
-			/* Pushable, add to tlist */
-			tlist = add_to_flat_tlist(tlist, list_make1(expr));
+			/*
+			 * Pushable, so add to tlist.  We need to create a TLE for this
+			 * expression and apply the sortgroupref to it.  We cannot use
+			 * add_to_flat_tlist() here because that avoids making duplicate
+			 * entries in the tlist.  If there are duplicate entries with
+			 * distinct sortgrouprefs, we have to duplicate that situation in
+			 * the output tlist.
+			 */
+			tle = makeTargetEntry(expr, list_length(tlist) + 1, NULL, false);
+			tle->ressortgroupref = sgref;
+			tlist = lappend(tlist, tle);
 		}
 		else
 		{
-			/* Check entire expression whether it is pushable or not */
+			/*
+			 * Non-grouping expression we need to compute.  Is it shippable?
+			 */
 			if (is_foreign_expr(root, grouped_rel, expr))
 			{
-				/* Pushable, add to tlist */
+				/* Yes, so add to tlist as-is; OK to suppress duplicates */
 				tlist = add_to_flat_tlist(tlist, list_make1(expr));
 			}
 			else
 			{
-				/*
-				 * If we have sortgroupref set, then it means that we have an
-				 * ORDER BY entry pointing to this expression.  Since we are
-				 * not pushing ORDER BY with GROUP BY, clear it.
-				 */
-				if (sgref)
-					grouping_target->sortgrouprefs[i] = 0;
-
-				/* Not matched exactly, pull the var with aggregates then */
+				/* Not pushable as a whole; extract its Vars and aggregates */
 				aggvars = pull_var_clause((Node *) expr,
 										  PVC_INCLUDE_AGGREGATES);
 
+				/*
+				 * If any aggregate expression is not shippable, then we
+				 * cannot push down aggregation to the foreign server.
+				 */
 				if (!is_foreign_expr(root, grouped_rel, (Expr *) aggvars))
 					return false;
 
 				/*
-				 * Add aggregates, if any, into the targetlist.  Plain var
-				 * nodes should be either same as some GROUP BY expression or
-				 * part of some GROUP BY expression. In later case, the query
-				 * cannot refer plain var nodes without the surrounding
-				 * expression.  In both the cases, they are already part of
+				 * Add aggregates, if any, into the targetlist.  Plain Vars
+				 * outside an aggregate can be ignored, because they should be
+				 * either same as some GROUP BY column or part of some GROUP
+				 * BY expression.  In either case, they are already part of
 				 * the targetlist and thus no need to add them again.  In fact
-				 * adding pulled plain var nodes in SELECT clause will cause
-				 * an error on the foreign server if they are not same as some
-				 * GROUP BY expression.
+				 * including plain Vars in the tlist when they do not match a
+				 * GROUP BY column would cause the foreign server to complain
+				 * that the shipped query is invalid.
 				 */
 				foreach(l, aggvars)
 				{
@@ -4701,7 +5128,7 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 	}
 
 	/*
-	 * Classify the pushable and non-pushable having clauses and save them in
+	 * Classify the pushable and non-pushable HAVING clauses and save them in
 	 * remote_conds and local_conds of the grouped rel's fpinfo.
 	 */
 	if (root->hasHavingQual && query->havingQual)
@@ -4771,9 +5198,6 @@ foreign_grouping_ok(PlannerInfo *root, RelOptInfo *grouped_rel)
 		}
 	}
 
-	/* Transfer any sortgroupref data to the replacement tlist */
-	apply_pathtarget_labeling_to_tlist(tlist, grouping_target);
-
 	/* Store generated targetlist */
 	fpinfo->grouped_tlist = tlist;
 
@@ -4943,11 +5367,8 @@ make_tuple_from_result_row(PGresult *res,
 		tupdesc = RelationGetDescr(rel);
 	else
 	{
-		PgFdwScanState *fdw_sstate;
-
 		Assert(fsstate);
-		fdw_sstate = (PgFdwScanState *) fsstate->fdw_state;
-		tupdesc = fdw_sstate->tupdesc;
+		tupdesc = fsstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor;
 	}
 
 	values = (Datum *) palloc0(tupdesc->natts * sizeof(Datum));
@@ -5091,9 +5512,10 @@ conversion_error_callback(void *arg)
 	{
 		/* error occurred in a scan against a foreign table */
 		TupleDesc	tupdesc = RelationGetDescr(errpos->rel);
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, errpos->cur_attno - 1);
 
 		if (errpos->cur_attno > 0 && errpos->cur_attno <= tupdesc->natts)
-			attname = NameStr(tupdesc->attrs[errpos->cur_attno - 1]->attname);
+			attname = NameStr(attr->attname);
 		else if (errpos->cur_attno == SelfItemPointerAttributeNumber)
 			attname = "ctid";
 		else if (errpos->cur_attno == ObjectIdAttributeNumber)
@@ -5114,7 +5536,7 @@ conversion_error_callback(void *arg)
 
 		/*
 		 * Target list can have Vars and expressions.  For Vars, we can get
-		 * it's relation, however for expressions we can't.  Thus for
+		 * its relation, however for expressions we can't.  Thus for
 		 * expressions, just show generic context message.
 		 */
 		if (IsA(tle->expr, Var))
@@ -5127,7 +5549,7 @@ conversion_error_callback(void *arg)
 			if (var->varattno == 0)
 				is_wholerow = true;
 			else
-				attname = get_relid_attribute_name(rte->relid, var->varattno);
+				attname = get_attname(rte->relid, var->varattno, false);
 
 			relname = get_rel_name(rte->relid);
 		}
@@ -5149,7 +5571,7 @@ conversion_error_callback(void *arg)
  * Find an equivalence class member expression, all of whose Vars, come from
  * the indicated relation.
  */
-extern Expr *
+Expr *
 find_em_expr_for_rel(EquivalenceClass *ec, RelOptInfo *rel)
 {
 	ListCell   *lc_em;
diff --git a/contrib/postgres_fdw/postgres_fdw.h b/contrib/postgres_fdw/postgres_fdw.h
index 788b003650..d37cc88b6e 100644
--- a/contrib/postgres_fdw/postgres_fdw.h
+++ b/contrib/postgres_fdw/postgres_fdw.h
@@ -3,7 +3,7 @@
  * postgres_fdw.h
  *		  Foreign-data wrapper for remote PostgreSQL servers
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/postgres_fdw/postgres_fdw.h
@@ -150,6 +150,7 @@ extern void deparseUpdateSql(StringInfo buf, PlannerInfo *root,
 				 List **retrieved_attrs);
 extern void deparseDirectUpdateSql(StringInfo buf, PlannerInfo *root,
 					   Index rtindex, Relation rel,
+					   RelOptInfo *foreignrel,
 					   List *targetlist,
 					   List *targetAttrs,
 					   List *remote_conds,
@@ -162,6 +163,7 @@ extern void deparseDeleteSql(StringInfo buf, PlannerInfo *root,
 				 List **retrieved_attrs);
 extern void deparseDirectDeleteSql(StringInfo buf, PlannerInfo *root,
 					   Index rtindex, Relation rel,
+					   RelOptInfo *foreignrel,
 					   List *remote_conds,
 					   List **params_list,
 					   List *returningList,
diff --git a/contrib/postgres_fdw/shippable.c b/contrib/postgres_fdw/shippable.c
index 2ac0873caa..7f2ed0499c 100644
--- a/contrib/postgres_fdw/shippable.c
+++ b/contrib/postgres_fdw/shippable.c
@@ -13,7 +13,7 @@
  * functions or functions using nonportable collations.  Those considerations
  * need not be accounted for here.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/postgres_fdw/shippable.c
diff --git a/contrib/postgres_fdw/sql/postgres_fdw.sql b/contrib/postgres_fdw/sql/postgres_fdw.sql
index 5f65d9d966..7f4d0dab25 100644
--- a/contrib/postgres_fdw/sql/postgres_fdw.sql
+++ b/contrib/postgres_fdw/sql/postgres_fdw.sql
@@ -39,6 +39,9 @@ CREATE TABLE "S 1"."T 1" (
 	c8 user_enum,
 	CONSTRAINT t1_pkey PRIMARY KEY ("C 1")
 );
+-- "S 1"."T 1" will be heavily updated below, so disable autovacuum for
+-- the table to avoid unexpected effects of that
+ALTER TABLE "S 1"."T 1" SET (autovacuum_enabled = 'false');
 CREATE TABLE "S 1"."T 2" (
 	c1 int NOT NULL,
 	c2 text,
@@ -559,8 +562,20 @@ EXPLAIN (VERBOSE, COSTS OFF)
 SELECT ft5, ft5.c1, ft5.c2, ft5.c3, ft4.c1, ft4.c2 FROM ft5 left join ft4 on ft5.c1 = ft4.c1 WHERE ft4.c1 BETWEEN 10 and 30 ORDER BY ft5.c1, ft4.c1;
 SELECT ft5, ft5.c1, ft5.c2, ft5.c3, ft4.c1, ft4.c2 FROM ft5 left join ft4 on ft5.c1 = ft4.c1 WHERE ft4.c1 BETWEEN 10 and 30 ORDER BY ft5.c1, ft4.c1;
 
+-- multi-way join involving multiple merge joins
+-- (this case used to have EPQ-related planning problems)
+SET enable_nestloop TO false;
+SET enable_hashjoin TO false;
+EXPLAIN (VERBOSE, COSTS OFF)
+SELECT * FROM ft1, ft2, ft4, ft5 WHERE ft1.c1 = ft2.c1 AND ft1.c2 = ft4.c1
+    AND ft1.c2 = ft5.c1 AND ft1.c1 < 100 AND ft2.c1 < 100 FOR UPDATE;
+SELECT * FROM ft1, ft2, ft4, ft5 WHERE ft1.c1 = ft2.c1 AND ft1.c2 = ft4.c1
+    AND ft1.c2 = ft5.c1 AND ft1.c1 < 100 AND ft2.c1 < 100 FOR UPDATE;
+RESET enable_nestloop;
+RESET enable_hashjoin;
+
 -- check join pushdown in situations where multiple userids are involved
-CREATE ROLE regress_view_owner;
+CREATE ROLE regress_view_owner SUPERUSER;
 CREATE USER MAPPING FOR regress_view_owner SERVER loopback;
 GRANT SELECT ON ft4 TO regress_view_owner;
 GRANT SELECT ON ft5 TO regress_view_owner;
@@ -636,6 +651,12 @@ explain (verbose, costs off)
 select count(c2) w, c2 x, 5 y, 7.0 z from ft1 group by 2, y, 9.0::int order by 2;
 select count(c2) w, c2 x, 5 y, 7.0 z from ft1 group by 2, y, 9.0::int order by 2;
 
+-- GROUP BY clause referring to same column multiple times
+-- Also, ORDER BY contains an aggregate function
+explain (verbose, costs off)
+select c2, c2 from ft1 where c2 > 6 group by 1, 2 order by sum(c1);
+select c2, c2 from ft1 where c2 > 6 group by 1, 2 order by sum(c1);
+
 -- Testing HAVING clause shippability
 explain (verbose, costs off)
 select c2, sum(c1) from ft2 group by c2 having avg(c1) < 500 and sum(c1) < 49800 order by c2;
@@ -829,7 +850,7 @@ drop operator public.<^(int, int);
 -- Input relation to aggregate push down hook is not safe to pushdown and thus
 -- the aggregate cannot be pushed down to foreign server.
 explain (verbose, costs off)
-select count(t1.c3) from ft1 t1, ft1 t2 where t1.c1 = postgres_fdw_abs(t1.c2);
+select count(t1.c3) from ft2 t1 left join ft2 t2 on (t1.c1 = random() * t2.c2);
 
 -- Subquery in FROM clause having aggregate
 explain (verbose, costs off)
@@ -1064,14 +1085,14 @@ UPDATE ft2 SET c2 = c2 + 400, c3 = c3 || '_update7' WHERE c1 % 10 = 7 RETURNING
 UPDATE ft2 SET c2 = c2 + 400, c3 = c3 || '_update7' WHERE c1 % 10 = 7 RETURNING *;
 EXPLAIN (verbose, costs off)
 UPDATE ft2 SET c2 = ft2.c2 + 500, c3 = ft2.c3 || '_update9', c7 = DEFAULT
-  FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;                               -- can't be pushed down
+  FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;                               -- can be pushed down
 UPDATE ft2 SET c2 = ft2.c2 + 500, c3 = ft2.c3 || '_update9', c7 = DEFAULT
   FROM ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 9;
 EXPLAIN (verbose, costs off)
   DELETE FROM ft2 WHERE c1 % 10 = 5 RETURNING c1, c4;                               -- can be pushed down
 DELETE FROM ft2 WHERE c1 % 10 = 5 RETURNING c1, c4;
 EXPLAIN (verbose, costs off)
-DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;                -- can't be pushed down
+DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;                -- can be pushed down
 DELETE FROM ft2 USING ft1 WHERE ft1.c1 = ft2.c2 AND ft1.c1 % 10 = 2;
 SELECT c1,c2,c3,c4 FROM ft2 ORDER BY c1;
 EXPLAIN (verbose, costs off)
@@ -1084,6 +1105,58 @@ EXPLAIN (verbose, costs off)
 DELETE FROM ft2 WHERE c1 = 9999 RETURNING tableoid::regclass;                       -- can be pushed down
 DELETE FROM ft2 WHERE c1 = 9999 RETURNING tableoid::regclass;
 
+-- Test UPDATE/DELETE with RETURNING on a three-table join
+INSERT INTO ft2 (c1,c2,c3)
+  SELECT id, id - 1200, to_char(id, 'FM00000') FROM generate_series(1201, 1300) id;
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'foo'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
+  RETURNING ft2, ft2.*, ft4, ft4.*;       -- can be pushed down
+UPDATE ft2 SET c3 = 'foo'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c2 = ft4.c1
+  RETURNING ft2, ft2.*, ft4, ft4.*;
+EXPLAIN (verbose, costs off)
+DELETE FROM ft2
+  USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
+  RETURNING 100;                          -- can be pushed down
+DELETE FROM ft2
+  USING ft4 LEFT JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 1200 AND ft2.c1 % 10 = 0 AND ft2.c2 = ft4.c1
+  RETURNING 100;
+DELETE FROM ft2 WHERE ft2.c1 > 1200;
+
+-- Test UPDATE/DELETE with WHERE or JOIN/ON conditions containing
+-- user-defined operators/functions
+ALTER SERVER loopback OPTIONS (DROP extensions);
+INSERT INTO ft2 (c1,c2,c3)
+  SELECT id, id % 10, to_char(id, 'FM00000') FROM generate_series(2001, 2010) id;
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;            -- can't be pushed down
+UPDATE ft2 SET c3 = 'bar' WHERE postgres_fdw_abs(c1) > 2000 RETURNING *;
+EXPLAIN (verbose, costs off)
+UPDATE ft2 SET c3 = 'baz'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 === ft4.c1
+  RETURNING ft2.*, ft4.*, ft5.*;                                                    -- can't be pushed down
+UPDATE ft2 SET c3 = 'baz'
+  FROM ft4 INNER JOIN ft5 ON (ft4.c1 = ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 === ft4.c1
+  RETURNING ft2.*, ft4.*, ft5.*;
+EXPLAIN (verbose, costs off)
+DELETE FROM ft2
+  USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
+  RETURNING ft2.c1, ft2.c2, ft2.c3;       -- can't be pushed down
+DELETE FROM ft2
+  USING ft4 INNER JOIN ft5 ON (ft4.c1 === ft5.c1)
+  WHERE ft2.c1 > 2000 AND ft2.c2 = ft4.c1
+  RETURNING ft2.c1, ft2.c2, ft2.c3;
+DELETE FROM ft2 WHERE ft2.c1 > 2000;
+ALTER SERVER loopback OPTIONS (ADD extensions 'postgres_fdw');
+
 -- Test that trigger on remote table works as expected
 CREATE OR REPLACE FUNCTION "S 1".F_BRTRIG() RETURNS trigger AS $$
 BEGIN
@@ -1138,6 +1211,8 @@ commit;
 select c2, count(*) from ft2 where c2 < 500 group by 1 order by 1;
 select c2, count(*) from "S 1"."T 1" where c2 < 500 group by 1 order by 1;
 
+VACUUM ANALYZE "S 1"."T 1";
+
 -- Above DMLs add data with c6 as NULL in ft1, so test ORDER BY NULLS LAST and NULLs
 -- FIRST behavior here.
 -- ORDER BY DESC NULLS LAST options
@@ -1656,6 +1731,24 @@ explain (verbose, costs off)
 update bar set f2 = f2 + 100 returning *;
 update bar set f2 = f2 + 100 returning *;
 
+-- Test that UPDATE/DELETE with inherited target works with row-level triggers
+CREATE TRIGGER trig_row_before
+BEFORE UPDATE OR DELETE ON bar2
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+
+CREATE TRIGGER trig_row_after
+AFTER UPDATE OR DELETE ON bar2
+FOR EACH ROW EXECUTE PROCEDURE trigger_data(23,'skidoo');
+
+explain (verbose, costs off)
+update bar set f2 = f2 + 100;
+update bar set f2 = f2 + 100;
+
+explain (verbose, costs off)
+delete from bar where f2 < 400;
+delete from bar where f2 < 400;
+
+-- cleanup
 drop table foo cascade;
 drop table bar cascade;
 drop table loct1;
@@ -1764,3 +1857,61 @@ WHERE ftrelid = 'table30000'::regclass
 AND ftoptions @> array['fetch_size=60000'];
 
 ROLLBACK;
+
+-- ===================================================================
+-- test partitionwise joins
+-- ===================================================================
+SET enable_partitionwise_join=on;
+
+CREATE TABLE fprt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE fprt1_p1 (LIKE fprt1);
+CREATE TABLE fprt1_p2 (LIKE fprt1);
+INSERT INTO fprt1_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 2) i;
+INSERT INTO fprt1_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 2) i;
+CREATE FOREIGN TABLE ftprt1_p1 PARTITION OF fprt1 FOR VALUES FROM (0) TO (250)
+	SERVER loopback OPTIONS (table_name 'fprt1_p1', use_remote_estimate 'true');
+CREATE FOREIGN TABLE ftprt1_p2 PARTITION OF fprt1 FOR VALUES FROM (250) TO (500)
+	SERVER loopback OPTIONS (TABLE_NAME 'fprt1_p2');
+ANALYZE fprt1;
+ANALYZE fprt1_p1;
+ANALYZE fprt1_p2;
+
+CREATE TABLE fprt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE fprt2_p1 (LIKE fprt2);
+CREATE TABLE fprt2_p2 (LIKE fprt2);
+INSERT INTO fprt2_p1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 249, 3) i;
+INSERT INTO fprt2_p2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(250, 499, 3) i;
+CREATE FOREIGN TABLE ftprt2_p1 PARTITION OF fprt2 FOR VALUES FROM (0) TO (250)
+	SERVER loopback OPTIONS (table_name 'fprt2_p1', use_remote_estimate 'true');
+CREATE FOREIGN TABLE ftprt2_p2 PARTITION OF fprt2 FOR VALUES FROM (250) TO (500)
+	SERVER loopback OPTIONS (table_name 'fprt2_p2', use_remote_estimate 'true');
+ANALYZE fprt2;
+ANALYZE fprt2_p1;
+ANALYZE fprt2_p2;
+
+-- inner join three tables
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
+SELECT t1.a,t2.b,t3.c FROM fprt1 t1 INNER JOIN fprt2 t2 ON (t1.a = t2.b) INNER JOIN fprt1 t3 ON (t2.b = t3.a) WHERE t1.a % 25 =0 ORDER BY 1,2,3;
+
+-- left outer join + nullable clasue
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t2.b,t2.c FROM fprt1 t1 LEFT JOIN (SELECT * FROM fprt2 WHERE a < 10) t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a < 10 ORDER BY 1,2,3;
+SELECT t1.a,t2.b,t2.c FROM fprt1 t1 LEFT JOIN (SELECT * FROM fprt2 WHERE a < 10) t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a < 10 ORDER BY 1,2,3;
+
+-- with whole-row reference
+EXPLAIN (COSTS OFF)
+SELECT t1,t2 FROM fprt1 t1 JOIN fprt2 t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a % 25 =0 ORDER BY 1,2;
+SELECT t1,t2 FROM fprt1 t1 JOIN fprt2 t2 ON (t1.a = t2.b and t1.b = t2.a) WHERE t1.a % 25 =0 ORDER BY 1,2;
+
+-- join with lateral reference
+EXPLAIN (COSTS OFF)
+SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
+SELECT t1.a,t1.b FROM fprt1 t1, LATERAL (SELECT t2.a, t2.b FROM fprt2 t2 WHERE t1.a = t2.b AND t1.b = t2.a) q WHERE t1.a%25 = 0 ORDER BY 1,2;
+
+-- with PHVs, partition-wise join selected but no join pushdown
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.phv, t2.b, t2.phv FROM (SELECT 't1_phv' phv, * FROM fprt1 WHERE a % 25 = 0) t1 FULL JOIN (SELECT 't2_phv' phv, * FROM fprt2 WHERE b % 25 = 0) t2 ON (t1.a = t2.b) ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.phv, t2.b, t2.phv FROM (SELECT 't1_phv' phv, * FROM fprt1 WHERE a % 25 = 0) t1 FULL JOIN (SELECT 't2_phv' phv, * FROM fprt2 WHERE b % 25 = 0) t2 ON (t1.a = t2.b) ORDER BY t1.a, t2.b;
+
+RESET enable_partitionwise_join;
diff --git a/contrib/seg/CMakeLists.txt b/contrib/seg/CMakeLists.txt
index c07a1e6718..e656298adc 100644
--- a/contrib/seg/CMakeLists.txt
+++ b/contrib/seg/CMakeLists.txt
@@ -27,6 +27,8 @@ install(FILES
 	${extension_name}.control
 	${extension_name}--1.1.sql
 	${extension_name}--1.0--1.1.sql
+	${extension_name}--1.1--1.2.sql
+	${extension_name}--1.2--1.3.sql
 	${extension_name}--unpackaged--1.0.sql
 	DESTINATION ${PGSHAREDIR}/extension)
 
diff --git a/contrib/seg/Makefile b/contrib/seg/Makefile
index c8f0f8b9a2..41270f84f6 100644
--- a/contrib/seg/Makefile
+++ b/contrib/seg/Makefile
@@ -4,7 +4,8 @@ MODULE_big = seg
 OBJS = seg.o segparse.o $(WIN32RES)
 
 EXTENSION = seg
-DATA = seg--1.1.sql seg--1.0--1.1.sql seg--unpackaged--1.0.sql
+DATA = seg--1.1.sql seg--1.1--1.2.sql seg--1.2--1.3.sql \
+	seg--1.0--1.1.sql seg--unpackaged--1.0.sql
 PGFILEDESC = "seg - line segment data type"
 
 REGRESS = seg
diff --git a/contrib/seg/expected/seg.out b/contrib/seg/expected/seg.out
index 18010c4d5c..a289dbe5f9 100644
--- a/contrib/seg/expected/seg.out
+++ b/contrib/seg/expected/seg.out
@@ -930,12 +930,40 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool;
 CREATE TABLE test_seg (s seg);
 \copy test_seg from 'data/test_seg.data'
 CREATE INDEX test_seg_ix ON test_seg USING gist (s);
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_seg
+         Recheck Cond: (s @> '1.1e1 .. 11.3'::seg)
+         ->  Bitmap Index Scan on test_seg_ix
+               Index Cond: (s @> '1.1e1 .. 11.3'::seg)
+(5 rows)
+
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+ count 
+-------
+   143
+(1 row)
+
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Aggregate
+   ->  Index Only Scan using test_seg_ix on test_seg
+         Index Cond: (s @> '1.1e1 .. 11.3'::seg)
+(3 rows)
+
 SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
  count 
 -------
    143
 (1 row)
 
+RESET enable_bitmapscan;
 -- Test sorting
 SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
         s        
diff --git a/contrib/seg/expected/seg_1.out b/contrib/seg/expected/seg_1.out
index 566ce394ed..48abb65bb0 100644
--- a/contrib/seg/expected/seg_1.out
+++ b/contrib/seg/expected/seg_1.out
@@ -930,12 +930,40 @@ SELECT '1'::seg <@ '-1 .. 1'::seg AS bool;
 CREATE TABLE test_seg (s seg);
 \copy test_seg from 'data/test_seg.data'
 CREATE INDEX test_seg_ix ON test_seg USING gist (s);
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on test_seg
+         Recheck Cond: (s @> '1.1e1 .. 11.3'::seg)
+         ->  Bitmap Index Scan on test_seg_ix
+               Index Cond: (s @> '1.1e1 .. 11.3'::seg)
+(5 rows)
+
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+ count 
+-------
+   143
+(1 row)
+
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Aggregate
+   ->  Index Only Scan using test_seg_ix on test_seg
+         Index Cond: (s @> '1.1e1 .. 11.3'::seg)
+(3 rows)
+
 SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
  count 
 -------
    143
 (1 row)
 
+RESET enable_bitmapscan;
 -- Test sorting
 SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
         s        
diff --git a/contrib/seg/seg--1.1--1.2.sql b/contrib/seg/seg--1.1--1.2.sql
new file mode 100644
index 0000000000..a6e4456f07
--- /dev/null
+++ b/contrib/seg/seg--1.1--1.2.sql
@@ -0,0 +1,14 @@
+/* contrib/seg/seg--1.1--1.2.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION seg UPDATE TO '1.2'" to load this file. \quit
+
+ALTER OPERATOR <= (seg, seg) SET (
+	RESTRICT = scalarlesel,
+	JOIN = scalarlejoinsel
+);
+
+ALTER OPERATOR >= (seg, seg) SET (
+	RESTRICT = scalargesel,
+	JOIN = scalargejoinsel
+);
diff --git a/contrib/seg/seg--1.2--1.3.sql b/contrib/seg/seg--1.2--1.3.sql
new file mode 100644
index 0000000000..cd71a300f6
--- /dev/null
+++ b/contrib/seg/seg--1.2--1.3.sql
@@ -0,0 +1,45 @@
+/* contrib/seg/seg--1.2--1.3.sql */
+
+-- complain if script is sourced in psql, rather than via ALTER EXTENSION
+\echo Use "ALTER EXTENSION seg UPDATE TO '1.3'" to load this file. \quit
+
+--
+-- Get rid of unnecessary compress and decompress support functions.
+--
+-- To be allowed to drop the opclass entry for a support function,
+-- we must change the entry's dependency type from 'internal' to 'auto',
+-- as though it were a loose member of the opfamily rather than being
+-- bound into a particular opclass.  There's no SQL command for that,
+-- so fake it with a manual update on pg_depend.
+--
+UPDATE pg_catalog.pg_depend
+SET deptype = 'a'
+WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+  AND objid =
+    (SELECT objid
+     FROM pg_catalog.pg_depend
+     WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+       AND refclassid = 'pg_catalog.pg_proc'::pg_catalog.regclass
+       AND (refobjid = 'gseg_compress(pg_catalog.internal)'::pg_catalog.regprocedure))
+  AND refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass
+  AND deptype = 'i';
+
+ALTER OPERATOR FAMILY gist_seg_ops USING gist drop function 3 (seg);
+ALTER EXTENSION seg DROP function gseg_compress(pg_catalog.internal);
+DROP function gseg_compress(pg_catalog.internal);
+
+UPDATE pg_catalog.pg_depend
+SET deptype = 'a'
+WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+  AND objid =
+    (SELECT objid
+     FROM pg_catalog.pg_depend
+     WHERE classid = 'pg_catalog.pg_amproc'::pg_catalog.regclass
+       AND refclassid = 'pg_catalog.pg_proc'::pg_catalog.regclass
+       AND (refobjid = 'gseg_decompress(pg_catalog.internal)'::pg_catalog.regprocedure))
+  AND refclassid = 'pg_catalog.pg_opclass'::pg_catalog.regclass
+  AND deptype = 'i';
+
+ALTER OPERATOR FAMILY gist_seg_ops USING gist drop function 4 (seg);
+ALTER EXTENSION seg DROP function gseg_decompress(pg_catalog.internal);
+DROP function gseg_decompress(pg_catalog.internal);
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
index 4fc18130e1..4e34fba7c7 100644
--- a/contrib/seg/seg.c
+++ b/contrib/seg/seg.c
@@ -188,7 +188,7 @@ seg_upper(PG_FUNCTION_ARGS)
 /*
 ** The GiST Consistent method for segments
 ** Should return false if for all data items x below entry,
-** the predicate x op query == FALSE, where op is the oper
+** the predicate x op query == false, where op is the oper
 ** corresponding to strategy in the pg_amop table.
 */
 Datum
@@ -413,9 +413,9 @@ gseg_same(PG_FUNCTION_ARGS)
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
 	if (DirectFunctionCall2(seg_same, PG_GETARG_DATUM(0), PG_GETARG_DATUM(1)))
-		*result = TRUE;
+		*result = true;
 	else
-		*result = FALSE;
+		*result = false;
 
 #ifdef GIST_DEBUG
 	fprintf(stderr, "same: %s\n", (*result ? "TRUE" : "FALSE"));
@@ -465,7 +465,7 @@ gseg_leaf_consistent(Datum key, Datum query, StrategyNumber strategy)
 			retval = DirectFunctionCall2(seg_contained, key, query);
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 
 	PG_RETURN_DATUM(retval);
@@ -514,7 +514,7 @@ gseg_internal_consistent(Datum key, Datum query, StrategyNumber strategy)
 				DatumGetBool(DirectFunctionCall2(seg_overlap, key, query));
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 
 	PG_RETURN_BOOL(retval);
@@ -528,7 +528,7 @@ gseg_binary_union(Datum r1, Datum r2, int *sizep)
 	retval = DirectFunctionCall2(seg_union, r1, r2);
 	*sizep = sizeof(SEG);
 
-	return (retval);
+	return retval;
 }
 
 
@@ -1040,7 +1040,7 @@ restore(char *result, float val, int n)
 
 		/* ... this is not done yet. */
 	}
-	return (strlen(result));
+	return strlen(result);
 }
 
 
@@ -1052,9 +1052,9 @@ restore(char *result, float val, int n)
  * a floating point number
  */
 int
-significant_digits(char *s)
+significant_digits(const char *s)
 {
-	char	   *p = s;
+	const char *p = s;
 	int			n,
 				c,
 				zeroes;
@@ -1080,7 +1080,7 @@ significant_digits(char *s)
 	}
 
 	if (!n)
-		return (zeroes);
+		return zeroes;
 
-	return (n);
+	return n;
 }
diff --git a/contrib/seg/seg.control b/contrib/seg/seg.control
index f210cf5e04..d697cd6c2a 100644
--- a/contrib/seg/seg.control
+++ b/contrib/seg/seg.control
@@ -1,5 +1,5 @@
 # seg extension
 comment = 'data type for representing line segments or floating-point intervals'
-default_version = '1.1'
+default_version = '1.3'
 module_pathname = '$libdir/seg'
 relocatable = true
diff --git a/contrib/seg/segdata.h b/contrib/seg/segdata.h
index cac68ee2b2..9488bf3a81 100644
--- a/contrib/seg/segdata.h
+++ b/contrib/seg/segdata.h
@@ -12,7 +12,7 @@ typedef struct SEG
 } SEG;
 
 /* in seg.c */
-extern int	significant_digits(char *str);
+extern int	significant_digits(const char *str);
 
 /* in segscan.l */
 extern int	seg_yylex(void);
diff --git a/contrib/seg/segparse.y b/contrib/seg/segparse.y
index 045ff91f3e..040cab3904 100644
--- a/contrib/seg/segparse.y
+++ b/contrib/seg/segparse.y
@@ -21,7 +21,7 @@
 #define YYMALLOC palloc
 #define YYFREE   pfree
 
-static float seg_atof(char *value);
+static float seg_atof(const char *value);
 
 static char strbuf[25] = {
 	'0', '0', '0', '0', '0',
@@ -151,7 +151,7 @@ deviation: SEGFLOAT
 
 
 static float
-seg_atof(char *value)
+seg_atof(const char *value)
 {
 	Datum datum;
 
diff --git a/contrib/seg/segscan.l b/contrib/seg/segscan.l
index 6db24fdd1f..5f6595e9eb 100644
--- a/contrib/seg/segscan.l
+++ b/contrib/seg/segscan.l
@@ -3,6 +3,8 @@
  * A scanner for EMP-style numeric ranges
  */
 
+/* LCOV_EXCL_START */
+
 /* No reason to constrain amount of data slurped */
 #define YY_READ_BUF_SIZE 16777216
 
@@ -51,6 +53,8 @@ float        ({integer}|{real})([eE]{integer})?
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 void
 yyerror(SEG *result, const char *message)
 {
diff --git a/contrib/seg/sql/seg.sql b/contrib/seg/sql/seg.sql
index aa91931474..1d7bad7c37 100644
--- a/contrib/seg/sql/seg.sql
+++ b/contrib/seg/sql/seg.sql
@@ -216,7 +216,16 @@ CREATE TABLE test_seg (s seg);
 \copy test_seg from 'data/test_seg.data'
 
 CREATE INDEX test_seg_ix ON test_seg USING gist (s);
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+
+SET enable_bitmapscan = false;
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
 SELECT count(*) FROM test_seg WHERE s @> '11..11.3';
+RESET enable_bitmapscan;
 
 -- Test sorting
 SELECT * FROM test_seg WHERE s @> '11..11.3' GROUP BY s;
diff --git a/contrib/sepgsql/database.c b/contrib/sepgsql/database.c
index 8fc5a87e00..c641ec3565 100644
--- a/contrib/sepgsql/database.c
+++ b/contrib/sepgsql/database.c
@@ -4,7 +4,7 @@
  *
  * Routines corresponding to database objects
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/dml.c b/contrib/sepgsql/dml.c
index b643720e36..c1fa320eb4 100644
--- a/contrib/sepgsql/dml.c
+++ b/contrib/sepgsql/dml.c
@@ -4,7 +4,7 @@
  *
  * Routines to handle DML permission checks
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
@@ -118,10 +118,7 @@ fixup_inherited_columns(Oid parentId, Oid childId, Bitmapset *columns)
 			continue;
 		}
 
-		attname = get_attname(parentId, attno);
-		if (!attname)
-			elog(ERROR, "cache lookup failed for attribute %d of relation %u",
-				 attno, parentId);
+		attname = get_attname(parentId, attno, false);
 		attno = get_attnum(childId, attname);
 		if (attno == InvalidAttrNumber)
 			elog(ERROR, "cache lookup failed for attribute %s of relation %u",
diff --git a/contrib/sepgsql/expected/misc.out b/contrib/sepgsql/expected/misc.out
index 98f8005a60..fdf07298bb 100644
--- a/contrib/sepgsql/expected/misc.out
+++ b/contrib/sepgsql/expected/misc.out
@@ -143,6 +143,7 @@ LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_reg
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1 column x"
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1 column y"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.textlike(pg_catalog.text,pg_catalog.text)"
+LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.int4eq(integer,integer)"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.row_number()"
  row_number | x  |                y                 
 ------------+----+----------------------------------
@@ -172,6 +173,7 @@ LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_reg
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1p_tens column p"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.textlike(pg_catalog.text,pg_catalog.text)"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.textlike(pg_catalog.text,pg_catalog.text)"
+LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.int4eq(integer,integer)"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.row_number()"
  row_number | o  |                p                 
 ------------+----+----------------------------------
@@ -194,6 +196,7 @@ LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_reg
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1p_ones column o"
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1p_ones column p"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.textlike(pg_catalog.text,pg_catalog.text)"
+LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.int4eq(integer,integer)"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.row_number()"
  row_number | o |                p                 
 ------------+---+----------------------------------
@@ -205,6 +208,7 @@ LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_reg
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1p_tens column o"
 LOG:  SELinux: allowed { select } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=unconfined_u:object_r:sepgsql_table_t:s0 tclass=db_column name="table t1p_tens column p"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.textlike(pg_catalog.text,pg_catalog.text)"
+LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.int4eq(integer,integer)"
 LOG:  SELinux: allowed { execute } scontext=unconfined_u:unconfined_r:sepgsql_regtest_superuser_t:s0-s0:c0.c255 tcontext=system_u:object_r:sepgsql_proc_exec_t:s0 tclass=db_procedure name="pg_catalog.row_number()"
  row_number | o  |                p                 
 ------------+----+----------------------------------
diff --git a/contrib/sepgsql/hooks.c b/contrib/sepgsql/hooks.c
index 5daa60c412..4249ed552c 100644
--- a/contrib/sepgsql/hooks.c
+++ b/contrib/sepgsql/hooks.c
@@ -4,7 +4,7 @@
  *
  * Entrypoints of the hooks in PostgreSQL, and dispatches the callbacks.
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/label.c b/contrib/sepgsql/label.c
index cbb9249be7..7554017923 100644
--- a/contrib/sepgsql/label.c
+++ b/contrib/sepgsql/label.c
@@ -4,7 +4,7 @@
  *
  * Routines to support SELinux labels (security context)
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/launcher b/contrib/sepgsql/launcher
index 0fc96ea0d4..45139f3750 100755
--- a/contrib/sepgsql/launcher
+++ b/contrib/sepgsql/launcher
@@ -2,7 +2,7 @@
 #
 # A wrapper script to launch psql command in regression test
 #
-# Copyright (c) 2010-2017, PostgreSQL Global Development Group
+# Copyright (c) 2010-2018, PostgreSQL Global Development Group
 #
 # -------------------------------------------------------------------------
 
diff --git a/contrib/sepgsql/proc.c b/contrib/sepgsql/proc.c
index 14faa5fac6..c6a817d7c5 100644
--- a/contrib/sepgsql/proc.c
+++ b/contrib/sepgsql/proc.c
@@ -4,7 +4,7 @@
  *
  * Routines corresponding to procedure objects
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/relation.c b/contrib/sepgsql/relation.c
index 228869a520..f0c22715aa 100644
--- a/contrib/sepgsql/relation.c
+++ b/contrib/sepgsql/relation.c
@@ -4,7 +4,7 @@
  *
  * Routines corresponding to relation/attribute objects
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/schema.c b/contrib/sepgsql/schema.c
index d418577b75..bc15a36a45 100644
--- a/contrib/sepgsql/schema.c
+++ b/contrib/sepgsql/schema.c
@@ -4,7 +4,7 @@
  *
  * Routines corresponding to schema objects
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/selinux.c b/contrib/sepgsql/selinux.c
index bf89e83dd6..47def00a46 100644
--- a/contrib/sepgsql/selinux.c
+++ b/contrib/sepgsql/selinux.c
@@ -5,7 +5,7 @@
  * Interactions between userspace and selinux in kernelspace,
  * using libselinux api.
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/sepgsql.h b/contrib/sepgsql/sepgsql.h
index d4bf0cd14a..99adfc522a 100644
--- a/contrib/sepgsql/sepgsql.h
+++ b/contrib/sepgsql/sepgsql.h
@@ -4,7 +4,7 @@
  *
  * Definitions corresponding to SE-PostgreSQL
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/sepgsql/uavc.c b/contrib/sepgsql/uavc.c
index f0915918db..ea276ee0cc 100644
--- a/contrib/sepgsql/uavc.c
+++ b/contrib/sepgsql/uavc.c
@@ -6,7 +6,7 @@
  * access control decisions recently used, and reduce number of kernel
  * invocations to avoid unnecessary performance hit.
  *
- * Copyright (c) 2011-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2011-2018, PostgreSQL Global Development Group
  *
  * -------------------------------------------------------------------------
  */
diff --git a/contrib/spi/refint.c b/contrib/spi/refint.c
index 46205c7613..b065ffa400 100644
--- a/contrib/spi/refint.c
+++ b/contrib/spi/refint.c
@@ -182,7 +182,7 @@ check_primary_key(PG_FUNCTION_ARGS)
 		pplan = SPI_prepare(sql, nkeys, argtypes);
 		if (pplan == NULL)
 			/* internal error */
-			elog(ERROR, "check_primary_key: SPI_prepare returned %d", SPI_result);
+			elog(ERROR, "check_primary_key: SPI_prepare returned %s", SPI_result_code_string(SPI_result));
 
 		/*
 		 * Remember that SPI_prepare places plan in current memory context -
@@ -395,7 +395,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 			/* this shouldn't happen! SPI_ERROR_NOOUTFUNC ? */
 			if (oldval == NULL)
 				/* internal error */
-				elog(ERROR, "check_foreign_key: SPI_getvalue returned %d", SPI_result);
+				elog(ERROR, "check_foreign_key: SPI_getvalue returned %s", SPI_result_code_string(SPI_result));
 			newval = SPI_getvalue(newtuple, tupdesc, fnumber);
 			if (newval == NULL || strcmp(oldval, newval) != 0)
 				isequal = false;
@@ -489,7 +489,6 @@ check_foreign_key(PG_FUNCTION_ARGS)
 								 " %s = %s%s%s %s ",
 								 args2[k], (is_char_type > 0) ? "'" : "",
 								 nv, (is_char_type > 0) ? "'" : "", (k < nkeys) ? ", " : "");
-						is_char_type = 0;
 					}
 					strcat(sql, " where ");
 
@@ -529,7 +528,7 @@ check_foreign_key(PG_FUNCTION_ARGS)
 			pplan = SPI_prepare(sql, nkeys, argtypes);
 			if (pplan == NULL)
 				/* internal error */
-				elog(ERROR, "check_foreign_key: SPI_prepare returned %d", SPI_result);
+				elog(ERROR, "check_foreign_key: SPI_prepare returned %s", SPI_result_code_string(SPI_result));
 
 			/*
 			 * Remember that SPI_prepare places plan in current memory context
@@ -636,5 +635,5 @@ find_plan(char *ident, EPlan **eplan, int *nplans)
 	newp->splan = NULL;
 	(*nplans)++;
 
-	return (newp);
+	return newp;
 }
diff --git a/contrib/spi/timetravel.c b/contrib/spi/timetravel.c
index f7905e20db..00f661e6b6 100644
--- a/contrib/spi/timetravel.c
+++ b/contrib/spi/timetravel.c
@@ -328,7 +328,7 @@ timetravel(PG_FUNCTION_ARGS)
 		for (i = 1; i <= natts; i++)
 		{
 			ctypes[i - 1] = SPI_gettypeid(tupdesc, i);
-			if (!(tupdesc->attrs[i - 1]->attisdropped)) /* skip dropped columns */
+			if (!(TupleDescAttr(tupdesc, i - 1)->attisdropped)) /* skip dropped columns */
 			{
 				snprintf(sql + strlen(sql), sizeof(sql) - strlen(sql), "%c$%d", separ, i);
 				separ = ',';
@@ -341,7 +341,7 @@ timetravel(PG_FUNCTION_ARGS)
 		/* Prepare plan for query */
 		pplan = SPI_prepare(sql, natts, ctypes);
 		if (pplan == NULL)
-			elog(ERROR, "timetravel (%s): SPI_prepare returned %d", relname, SPI_result);
+			elog(ERROR, "timetravel (%s): SPI_prepare returned %s", relname, SPI_result_code_string(SPI_result));
 
 		/*
 		 * Remember that SPI_prepare places plan in current memory context -
@@ -517,7 +517,7 @@ findTTStatus(char *name)
 AbsoluteTime
 currabstime()
 {
-	return (GetCurrentAbsoluteTime());
+	return GetCurrentAbsoluteTime();
 }
 */
 
@@ -549,5 +549,5 @@ find_plan(char *ident, EPlan **eplan, int *nplans)
 	newp->splan = NULL;
 	(*nplans)++;
 
-	return (newp);
+	return newp;
 }
diff --git a/contrib/start-scripts/freebsd b/contrib/start-scripts/freebsd
index c6ac8cd47a..3323237a54 100644
--- a/contrib/start-scripts/freebsd
+++ b/contrib/start-scripts/freebsd
@@ -43,7 +43,7 @@ test -x $DAEMON ||
 
 case $1 in
     start)
-	su -l $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
+	su -l $PGUSER -c "$DAEMON -D '$PGDATA' >>$PGLOG 2>&1 &"
 	echo -n ' postgresql'
 	;;
     stop)
@@ -51,7 +51,7 @@ case $1 in
 	;;
     restart)
 	su -l $PGUSER -c "$PGCTL stop -D '$PGDATA' -s"
-	su -l $PGUSER -c "$DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
+	su -l $PGUSER -c "$DAEMON -D '$PGDATA' >>$PGLOG 2>&1 &"
 	;;
     status)
 	su -l $PGUSER -c "$PGCTL status -D '$PGDATA'"
diff --git a/contrib/start-scripts/linux b/contrib/start-scripts/linux
index 44a775b030..a7757162fc 100644
--- a/contrib/start-scripts/linux
+++ b/contrib/start-scripts/linux
@@ -91,7 +91,7 @@ case $1 in
   start)
 	echo -n "Starting PostgreSQL: "
 	test -e "$PG_OOM_ADJUST_FILE" && echo "$PG_MASTER_OOM_SCORE_ADJ" > "$PG_OOM_ADJUST_FILE"
-	su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
+	su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' >>$PGLOG 2>&1 &"
 	echo "ok"
 	;;
   stop)
@@ -103,7 +103,7 @@ case $1 in
 	echo -n "Restarting PostgreSQL: "
 	su - $PGUSER -c "$PGCTL stop -D '$PGDATA' -s"
 	test -e "$PG_OOM_ADJUST_FILE" && echo "$PG_MASTER_OOM_SCORE_ADJ" > "$PG_OOM_ADJUST_FILE"
-	su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' &" >>$PGLOG 2>&1
+	su - $PGUSER -c "$DAEMON_ENV $DAEMON -D '$PGDATA' >>$PGLOG 2>&1 &"
 	echo "ok"
 	;;
   reload)
diff --git a/contrib/start-scripts/macos/README b/contrib/start-scripts/macos/README
new file mode 100644
index 0000000000..c4f2d9a270
--- /dev/null
+++ b/contrib/start-scripts/macos/README
@@ -0,0 +1,24 @@
+To make macOS automatically launch your PostgreSQL server at system start,
+do the following:
+
+1. Edit the postgres-wrapper.sh script and adjust the file path
+variables at its start to reflect where you have installed Postgres,
+if that's not /usr/local/pgsql.
+
+2. Copy the modified postgres-wrapper.sh script into some suitable
+installation directory.  It can be, but doesn't have to be, where
+you keep the Postgres executables themselves.
+
+3. Edit the org.postgresql.postgres.plist file and adjust its path
+for postgres-wrapper.sh to match what you did in step 2.  Also,
+if you plan to run the Postgres server under some user name other
+than "postgres", adjust the UserName parameter value for that.
+
+4. Copy the modified org.postgresql.postgres.plist file into
+/Library/LaunchDaemons/.  You must do this as root:
+    sudo cp org.postgresql.postgres.plist /Library/LaunchDaemons
+because the file will be ignored if it is not root-owned.
+
+At this point a reboot should launch the server.  But if you want
+to test it without rebooting, you can do
+    sudo launchctl load /Library/LaunchDaemons/org.postgresql.postgres.plist
diff --git a/contrib/start-scripts/macos/org.postgresql.postgres.plist b/contrib/start-scripts/macos/org.postgresql.postgres.plist
new file mode 100644
index 0000000000..fdbd74f27d
--- /dev/null
+++ b/contrib/start-scripts/macos/org.postgresql.postgres.plist
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Label</key>
+	<string>org.postgresql.postgres</string>
+	<key>ProgramArguments</key>
+	<array>
+		<string>/bin/sh</string>
+		<string>/usr/local/pgsql/bin/postgres-wrapper.sh</string>
+	</array>
+	<key>UserName</key>
+	<string>postgres</string>
+	<key>KeepAlive</key>
+	<true/>
+</dict>
+</plist>
diff --git a/contrib/start-scripts/macos/postgres-wrapper.sh b/contrib/start-scripts/macos/postgres-wrapper.sh
new file mode 100644
index 0000000000..3a4ebdaf0f
--- /dev/null
+++ b/contrib/start-scripts/macos/postgres-wrapper.sh
@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# PostgreSQL server start script (launched by org.postgresql.postgres.plist)
+
+# edit these as needed:
+
+# directory containing postgres executable:
+PGBINDIR="/usr/local/pgsql/bin"
+# data directory:
+PGDATA="/usr/local/pgsql/data"
+# file to receive postmaster's initial log messages:
+PGLOGFILE="${PGDATA}/pgstart.log"
+
+# (it's recommendable to enable the Postgres logging_collector feature
+# so that PGLOGFILE doesn't grow without bound)
+
+
+# set umask to ensure PGLOGFILE is not created world-readable
+umask 077
+
+# wait for networking to be up (else server may not bind to desired ports)
+/usr/sbin/ipconfig waitall
+
+# and launch the server
+exec "$PGBINDIR"/postgres -D "$PGDATA" >>"$PGLOGFILE" 2>&1
diff --git a/contrib/start-scripts/osx/PostgreSQL b/contrib/start-scripts/osx/PostgreSQL
deleted file mode 100755
index 7ff1d0e377..0000000000
--- a/contrib/start-scripts/osx/PostgreSQL
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-
-##
-# PostgreSQL RDBMS Server
-##
-
-# PostgreSQL boot time startup script for OS X. To install, change
-# the "prefix", "PGDATA", "PGUSER", and "PGLOG" variables below as
-# necessary. Next, create a new directory, "/Library/StartupItems/PostgreSQL".
-# Then copy this script and the accompanying "StartupParameters.plist" file
-# into that directory. The name of this script file *must* be the same as the
-# directory it is in. So you'll end up with these two files:
-#
-#    /Library/StartupItems/PostgreSQL/PostgreSQL
-#    /Library/StartupItems/PostgreSQL/StartupParameters.plist
-#
-# Next, add this line to the /etc/hostconfig file:
-#
-# POSTGRESQL=-YES-
-#
-# The startup bundle will now be ready to go. To prevent this script from
-# starting PostgreSQL at system startup, simply change that line in
-# /etc/hostconfig back to:
-#
-# POSTGRESQL=-NO-
-#
-# Created by David Wheeler, 2002
-
-# modified by Ray Aspeitia 12-03-2003 :
-# added log rotation script to db startup
-# modified StartupParameters.plist "Provides" parameter to make it easier to
-# start and stop with the SystemStarter utility
-
-# use the below command in order to correctly start/stop/restart PG with log rotation script:
-# SystemStarter [start|stop|restart] PostgreSQL
-
-################################################################################
-## EDIT FROM HERE
-################################################################################
-
-# Installation prefix
-prefix="/usr/local/pgsql"
-
-# Data directory
-PGDATA="/usr/local/pgsql/data"
-
-# Who to run the postmaster as, usually "postgres".  (NOT "root")
-PGUSER="postgres"
-
-# the logfile path and name (NEEDS to be writeable by PGUSER)
-PGLOG="${PGDATA}/logs/logfile"
-
-# do you want to rotate the log files, 1=true 0=false
-ROTATELOGS=1
-
-# logfile rotate in seconds
-ROTATESEC="604800"
-
-
-################################################################################
-## STOP EDITING HERE
-################################################################################
-
-# The path that is to be used for the script
-PATH="$prefix/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin"
-
-# What to use to start up the postmaster.  (If you want the script to wait
-# until the server has started, you could use "pg_ctl start" here.)
-DAEMON="$prefix/bin/postmaster"
-
-# What to use to shut down the postmaster
-PGCTL="$prefix/bin/pg_ctl"
-
-# The apache log rotation utility
-LOGUTIL="/usr/sbin/rotatelogs"
-
-. /etc/rc.common
-
-StartService () {
-    if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
-        ConsoleMessage "Starting PostgreSQL database server"
-        if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
-        else
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
-        fi
-    fi
-}
-
-StopService () {
-    ConsoleMessage "Stopping PostgreSQL database server"
-    sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s"
-}
-
-RestartService () {
-    if [ "${POSTGRESQL:=-NO-}" = "-YES-" ]; then
-        ConsoleMessage "Restarting PostgreSQL database server"
-        # should match StopService:
-        sudo -u $PGUSER sh -c "$PGCTL stop -D '${PGDATA}' -s"
-        # should match StartService:
-        if [ "${ROTATELOGS}" = "1" ]; then
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" 2>&1 | ${LOGUTIL} "${PGLOG}" ${ROTATESEC} &
-        else
-            sudo -u $PGUSER sh -c "${DAEMON} -D '${PGDATA}' &" >>"$PGLOG" 2>&1
-        fi
-    else
-        StopService
-    fi
-}
-
-RunService "$1"
diff --git a/contrib/start-scripts/osx/README b/contrib/start-scripts/osx/README
deleted file mode 100644
index 97e299f7da..0000000000
--- a/contrib/start-scripts/osx/README
+++ /dev/null
@@ -1,3 +0,0 @@
-To install execute the following:
-
-sudo /bin/sh ./install.sh
diff --git a/contrib/start-scripts/osx/StartupParameters.plist b/contrib/start-scripts/osx/StartupParameters.plist
deleted file mode 100644
index 6c788d0dda..0000000000
--- a/contrib/start-scripts/osx/StartupParameters.plist
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-    <key>Description</key>
-    <string>PostgreSQL Database Server</string>
-    <key>Messages</key>
-    <dict>
-        <key>start</key>
-        <string>Starting PostgreSQL database server</string>
-        <key>stop</key>
-        <string>Stopping PostgreSQL database server</string>
-        <key>restart</key>
-        <string>Restarting PostgreSQL database server</string>
-    </dict>
-    <key>OrderPreference</key>
-    <string>Late</string>
-    <key>Provides</key>
-    <array>
-        <string>PostgreSQL</string>
-    </array>
-    <key>Requires</key>
-    <array>
-        <string>Disks</string>
-        <string>Resolver</string>
-    </array>
-    <key>Uses</key>
-    <array>
-        <string>NFS</string>
-        <string>NetworkTime</string>
-    </array>
-</dict>
-</plist>
diff --git a/contrib/start-scripts/osx/install.sh b/contrib/start-scripts/osx/install.sh
deleted file mode 100755
index bbc5ee3926..0000000000
--- a/contrib/start-scripts/osx/install.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-sudo sh -c 'echo "POSTGRESQL=-YES-" >> /etc/hostconfig'
-sudo mkdir /Library/StartupItems/PostgreSQL
-sudo cp PostgreSQL /Library/StartupItems/PostgreSQL
-sudo cp StartupParameters.plist /Library/StartupItems/PostgreSQL
-if [ -e /Library/StartupItems/PostgreSQL/PostgreSQL ]
-then
-  echo "Startup Item Installed Successfully . . . "
-  echo "Starting PostgreSQL Server . . . "
-  SystemStarter restart PostgreSQL
-fi
diff --git a/contrib/tablefunc/tablefunc.c b/contrib/tablefunc/tablefunc.c
index 0bc8177b61..59f90dc947 100644
--- a/contrib/tablefunc/tablefunc.c
+++ b/contrib/tablefunc/tablefunc.c
@@ -10,7 +10,7 @@
  * And contributors:
  * Nabil Sayegh <postgresql@e-trolley.de>
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without a written agreement
@@ -1421,7 +1421,7 @@ build_tuplestore_recursively(char *key_fld,
  * Check expected (query runtime) tupdesc suitable for Connectby
  */
 static void
-validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial)
+validateConnectbyTupleDesc(TupleDesc td, bool show_branch, bool show_serial)
 {
 	int			serial_column = 0;
 
@@ -1431,7 +1431,7 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 	/* are there the correct number of columns */
 	if (show_branch)
 	{
-		if (tupdesc->natts != (CONNECTBY_NCOLS + serial_column))
+		if (td->natts != (CONNECTBY_NCOLS + serial_column))
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("invalid return type"),
@@ -1440,7 +1440,7 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 	}
 	else
 	{
-		if (tupdesc->natts != CONNECTBY_NCOLS_NOBRANCH + serial_column)
+		if (td->natts != CONNECTBY_NCOLS_NOBRANCH + serial_column)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("invalid return type"),
@@ -1449,14 +1449,14 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 	}
 
 	/* check that the types of the first two columns match */
-	if (tupdesc->attrs[0]->atttypid != tupdesc->attrs[1]->atttypid)
+	if (TupleDescAttr(td, 0)->atttypid != TupleDescAttr(td, 1)->atttypid)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("invalid return type"),
 				 errdetail("First two columns must be the same type.")));
 
 	/* check that the type of the third column is INT4 */
-	if (tupdesc->attrs[2]->atttypid != INT4OID)
+	if (TupleDescAttr(td, 2)->atttypid != INT4OID)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("invalid return type"),
@@ -1464,7 +1464,7 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 						   format_type_be(INT4OID))));
 
 	/* check that the type of the fourth column is TEXT if applicable */
-	if (show_branch && tupdesc->attrs[3]->atttypid != TEXTOID)
+	if (show_branch && TupleDescAttr(td, 3)->atttypid != TEXTOID)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("invalid return type"),
@@ -1472,7 +1472,8 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 						   format_type_be(TEXTOID))));
 
 	/* check that the type of the fifth column is INT4 */
-	if (show_branch && show_serial && tupdesc->attrs[4]->atttypid != INT4OID)
+	if (show_branch && show_serial &&
+		TupleDescAttr(td, 4)->atttypid != INT4OID)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("query-specified return tuple not valid for Connectby: "
@@ -1480,7 +1481,8 @@ validateConnectbyTupleDesc(TupleDesc tupdesc, bool show_branch, bool show_serial
 						format_type_be(INT4OID))));
 
 	/* check that the type of the fifth column is INT4 */
-	if (!show_branch && show_serial && tupdesc->attrs[3]->atttypid != INT4OID)
+	if (!show_branch && show_serial &&
+		TupleDescAttr(td, 3)->atttypid != INT4OID)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("query-specified return tuple not valid for Connectby: "
@@ -1514,10 +1516,10 @@ compatConnectbyTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 	 * These columns must match the result type indicated by the calling
 	 * query.
 	 */
-	ret_atttypid = ret_tupdesc->attrs[0]->atttypid;
-	sql_atttypid = sql_tupdesc->attrs[0]->atttypid;
-	ret_atttypmod = ret_tupdesc->attrs[0]->atttypmod;
-	sql_atttypmod = sql_tupdesc->attrs[0]->atttypmod;
+	ret_atttypid = TupleDescAttr(ret_tupdesc, 0)->atttypid;
+	sql_atttypid = TupleDescAttr(sql_tupdesc, 0)->atttypid;
+	ret_atttypmod = TupleDescAttr(ret_tupdesc, 0)->atttypmod;
+	sql_atttypmod = TupleDescAttr(sql_tupdesc, 0)->atttypmod;
 	if (ret_atttypid != sql_atttypid ||
 		(ret_atttypmod >= 0 && ret_atttypmod != sql_atttypmod))
 		ereport(ERROR,
@@ -1528,10 +1530,10 @@ compatConnectbyTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 						   format_type_with_typemod(ret_atttypid, ret_atttypmod),
 						   format_type_with_typemod(sql_atttypid, sql_atttypmod))));
 
-	ret_atttypid = ret_tupdesc->attrs[1]->atttypid;
-	sql_atttypid = sql_tupdesc->attrs[1]->atttypid;
-	ret_atttypmod = ret_tupdesc->attrs[1]->atttypmod;
-	sql_atttypmod = sql_tupdesc->attrs[1]->atttypmod;
+	ret_atttypid = TupleDescAttr(ret_tupdesc, 1)->atttypid;
+	sql_atttypid = TupleDescAttr(sql_tupdesc, 1)->atttypid;
+	ret_atttypmod = TupleDescAttr(ret_tupdesc, 1)->atttypmod;
+	sql_atttypmod = TupleDescAttr(sql_tupdesc, 1)->atttypmod;
 	if (ret_atttypid != sql_atttypid ||
 		(ret_atttypmod >= 0 && ret_atttypmod != sql_atttypmod))
 		ereport(ERROR,
@@ -1562,8 +1564,8 @@ compatCrosstabTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 		return false;
 
 	/* check the rowid types match */
-	ret_atttypid = ret_tupdesc->attrs[0]->atttypid;
-	sql_atttypid = sql_tupdesc->attrs[0]->atttypid;
+	ret_atttypid = TupleDescAttr(ret_tupdesc, 0)->atttypid;
+	sql_atttypid = TupleDescAttr(sql_tupdesc, 0)->atttypid;
 	if (ret_atttypid != sql_atttypid)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -1576,10 +1578,10 @@ compatCrosstabTupleDescs(TupleDesc ret_tupdesc, TupleDesc sql_tupdesc)
 	 * attribute [2] of the sql tuple should match attributes [1] to [natts]
 	 * of the return tuple
 	 */
-	sql_attr = sql_tupdesc->attrs[2];
+	sql_attr = TupleDescAttr(sql_tupdesc, 2);
 	for (i = 1; i < ret_tupdesc->natts; i++)
 	{
-		ret_attr = ret_tupdesc->attrs[i];
+		ret_attr = TupleDescAttr(ret_tupdesc, i);
 
 		if (ret_attr->atttypid != sql_attr->atttypid)
 			return false;
diff --git a/contrib/tablefunc/tablefunc.h b/contrib/tablefunc/tablefunc.h
index e88a5720fa..7d0773f82f 100644
--- a/contrib/tablefunc/tablefunc.h
+++ b/contrib/tablefunc/tablefunc.h
@@ -10,7 +10,7 @@
  * And contributors:
  * Nabil Sayegh <postgresql@e-trolley.de>
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * Permission to use, copy, modify, and distribute this software and its
  * documentation for any purpose, without fee, and without a written agreement
diff --git a/contrib/tcn/tcn.c b/contrib/tcn/tcn.c
index 0b9acbf848..41186fdd8f 100644
--- a/contrib/tcn/tcn.c
+++ b/contrib/tcn/tcn.c
@@ -3,7 +3,7 @@
  * tcn.c
  *	  triggered change notification support for PostgreSQL
  *
- * Portions Copyright (c) 2011-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2011-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -153,9 +153,10 @@ triggered_change_notification(PG_FUNCTION_ARGS)
 				for (i = 0; i < numatts; i++)
 				{
 					int			colno = index->indkey.values[i];
+					Form_pg_attribute attr = TupleDescAttr(tupdesc, colno - 1);
 
 					appendStringInfoCharMacro(payload, ',');
-					strcpy_quoted(payload, NameStr((tupdesc->attrs[colno - 1])->attname), '"');
+					strcpy_quoted(payload, NameStr(attr->attname), '"');
 					appendStringInfoCharMacro(payload, '=');
 					strcpy_quoted(payload, SPI_getvalue(trigtuple, tupdesc, colno), '\'');
 				}
diff --git a/contrib/test_decoding/expected/decoding_into_rel.out b/contrib/test_decoding/expected/decoding_into_rel.out
index be759caa31..8fd3390066 100644
--- a/contrib/test_decoding/expected/decoding_into_rel.out
+++ b/contrib/test_decoding/expected/decoding_into_rel.out
@@ -59,6 +59,31 @@ SELECT * FROM changeresult;
 
 DROP TABLE changeresult;
 DROP TABLE somechange;
+-- check calling logical decoding from pl/pgsql
+CREATE FUNCTION slot_changes_wrapper(slot_name name) RETURNS SETOF TEXT AS $$
+BEGIN
+  RETURN QUERY
+    SELECT data FROM pg_logical_slot_peek_changes(slot_name, NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+END$$ LANGUAGE plpgsql;
+SELECT * FROM slot_changes_wrapper('regression_slot');
+                                                                                          slot_changes_wrapper                                                                                          
+--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ BEGIN
+ table public.changeresult: INSERT: data[text]:'BEGIN'
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''BEGIN'''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''table public.somechange: INSERT: id[integer]:1'''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''COMMIT'''
+ table public.changeresult: INSERT: data[text]:'COMMIT'
+ table public.changeresult: INSERT: data[text]:'BEGIN'
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''BEGIN'''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''table public.changeresult: INSERT: data[text]:''''BEGIN'''''''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''table public.changeresult: INSERT: data[text]:''''table public.somechange: INSERT: id[integer]:1'''''''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''table public.changeresult: INSERT: data[text]:''''COMMIT'''''''
+ table public.changeresult: INSERT: data[text]:'table public.changeresult: INSERT: data[text]:''COMMIT'''
+ table public.changeresult: INSERT: data[text]:'COMMIT'
+ COMMIT
+(14 rows)
+
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
                                                                                                   data                                                                                                  
 --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/contrib/test_decoding/expected/permissions.out b/contrib/test_decoding/expected/permissions.out
index 7175dcd5f6..ed97f81dda 100644
--- a/contrib/test_decoding/expected/permissions.out
+++ b/contrib/test_decoding/expected/permissions.out
@@ -38,7 +38,7 @@ SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_d
 (1 row)
 
 INSERT INTO lr_test VALUES('lr_superuser_init');
-ERROR:  permission denied for relation lr_test
+ERROR:  permission denied for table lr_test
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
  data 
 ------
@@ -56,7 +56,7 @@ SET ROLE regress_lr_normal;
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 ERROR:  must be superuser or replication role to use replication slots
 INSERT INTO lr_test VALUES('lr_superuser_init');
-ERROR:  permission denied for relation lr_test
+ERROR:  permission denied for table lr_test
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 ERROR:  must be superuser or replication role to use replication slots
 SELECT pg_drop_replication_slot('regression_slot');
diff --git a/contrib/test_decoding/expected/replorigin.out b/contrib/test_decoding/expected/replorigin.out
index 76d4ea986d..8ea4ddda97 100644
--- a/contrib/test_decoding/expected/replorigin.out
+++ b/contrib/test_decoding/expected/replorigin.out
@@ -26,7 +26,14 @@ SELECT pg_replication_origin_drop('test_decoding: temp');
 (1 row)
 
 SELECT pg_replication_origin_drop('test_decoding: temp');
-ERROR:  cache lookup failed for replication origin 'test_decoding: temp'
+ERROR:  replication origin "test_decoding: temp" does not exist
+-- various failure checks for undefined slots
+select pg_replication_origin_advance('test_decoding: temp', '0/1');
+ERROR:  replication origin "test_decoding: temp" does not exist
+select pg_replication_origin_session_setup('test_decoding: temp');
+ERROR:  replication origin "test_decoding: temp" does not exist
+select pg_replication_origin_progress('test_decoding: temp', true);
+ERROR:  replication origin "test_decoding: temp" does not exist
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
  ?column? 
 ----------
diff --git a/contrib/test_decoding/expected/slot.out b/contrib/test_decoding/expected/slot.out
index 9f5f8a9b76..21e9d56f73 100644
--- a/contrib/test_decoding/expected/slot.out
+++ b/contrib/test_decoding/expected/slot.out
@@ -92,6 +92,36 @@ SELECT data FROM pg_logical_slot_get_changes('regression_slot2', NULL, NULL, 'in
  COMMIT
 (3 rows)
 
+INSERT INTO replication_example(somedata, text) VALUES (1, 4);
+INSERT INTO replication_example(somedata, text) VALUES (1, 5);
+SELECT pg_current_wal_lsn() AS wal_lsn \gset
+INSERT INTO replication_example(somedata, text) VALUES (1, 6);
+SELECT end_lsn FROM pg_replication_slot_advance('regression_slot1', :'wal_lsn') \gset
+SELECT slot_name FROM pg_replication_slot_advance('regression_slot2', pg_current_wal_lsn());
+    slot_name     
+------------------
+ regression_slot2
+(1 row)
+
+SELECT :'wal_lsn' = :'end_lsn';
+ ?column? 
+----------
+ t
+(1 row)
+
+SELECT data FROM pg_logical_slot_get_changes('regression_slot1', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+                                                  data                                                   
+---------------------------------------------------------------------------------------------------------
+ BEGIN
+ table public.replication_example: INSERT: id[integer]:6 somedata[integer]:1 text[character varying]:'6'
+ COMMIT
+(3 rows)
+
+SELECT data FROM pg_logical_slot_get_changes('regression_slot2', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+ data 
+------
+(0 rows)
+
 DROP TABLE replication_example;
 -- error
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot1', 'test_decoding', true);
diff --git a/contrib/test_decoding/sql/decoding_into_rel.sql b/contrib/test_decoding/sql/decoding_into_rel.sql
index 54670fd39e..1068cec588 100644
--- a/contrib/test_decoding/sql/decoding_into_rel.sql
+++ b/contrib/test_decoding/sql/decoding_into_rel.sql
@@ -27,5 +27,16 @@ INSERT INTO changeresult
 SELECT * FROM changeresult;
 DROP TABLE changeresult;
 DROP TABLE somechange;
+
+-- check calling logical decoding from pl/pgsql
+CREATE FUNCTION slot_changes_wrapper(slot_name name) RETURNS SETOF TEXT AS $$
+BEGIN
+  RETURN QUERY
+    SELECT data FROM pg_logical_slot_peek_changes(slot_name, NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+END$$ LANGUAGE plpgsql;
+
+SELECT * FROM slot_changes_wrapper('regression_slot');
+
 SELECT data FROM pg_logical_slot_get_changes('regression_slot', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
 SELECT 'stop' FROM pg_drop_replication_slot('regression_slot');
diff --git a/contrib/test_decoding/sql/replorigin.sql b/contrib/test_decoding/sql/replorigin.sql
index 7870f0ea32..451cd4bc3b 100644
--- a/contrib/test_decoding/sql/replorigin.sql
+++ b/contrib/test_decoding/sql/replorigin.sql
@@ -13,6 +13,11 @@ SELECT pg_replication_origin_create('test_decoding: temp');
 SELECT pg_replication_origin_drop('test_decoding: temp');
 SELECT pg_replication_origin_drop('test_decoding: temp');
 
+-- various failure checks for undefined slots
+select pg_replication_origin_advance('test_decoding: temp', '0/1');
+select pg_replication_origin_session_setup('test_decoding: temp');
+select pg_replication_origin_progress('test_decoding: temp', true);
+
 SELECT 'init' FROM pg_create_logical_replication_slot('regression_slot', 'test_decoding');
 
 -- origin tx
diff --git a/contrib/test_decoding/sql/slot.sql b/contrib/test_decoding/sql/slot.sql
index fa9561f54e..706340c1d8 100644
--- a/contrib/test_decoding/sql/slot.sql
+++ b/contrib/test_decoding/sql/slot.sql
@@ -45,6 +45,21 @@ INSERT INTO replication_example(somedata, text) VALUES (1, 3);
 SELECT data FROM pg_logical_slot_get_changes('regression_slot1', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 SELECT data FROM pg_logical_slot_get_changes('regression_slot2', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
 
+INSERT INTO replication_example(somedata, text) VALUES (1, 4);
+INSERT INTO replication_example(somedata, text) VALUES (1, 5);
+
+SELECT pg_current_wal_lsn() AS wal_lsn \gset
+
+INSERT INTO replication_example(somedata, text) VALUES (1, 6);
+
+SELECT end_lsn FROM pg_replication_slot_advance('regression_slot1', :'wal_lsn') \gset
+SELECT slot_name FROM pg_replication_slot_advance('regression_slot2', pg_current_wal_lsn());
+
+SELECT :'wal_lsn' = :'end_lsn';
+
+SELECT data FROM pg_logical_slot_get_changes('regression_slot1', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+SELECT data FROM pg_logical_slot_get_changes('regression_slot2', NULL, NULL, 'include-xids', '0', 'skip-empty-xacts', '1');
+
 DROP TABLE replication_example;
 
 -- error
diff --git a/contrib/test_decoding/test_decoding.c b/contrib/test_decoding/test_decoding.c
index a1a7c2ae0c..0f18afa852 100644
--- a/contrib/test_decoding/test_decoding.c
+++ b/contrib/test_decoding/test_decoding.c
@@ -3,7 +3,7 @@
  * test_decoding.c
  *		  example logical decoding output plugin
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  contrib/test_decoding/test_decoding.c
@@ -330,7 +330,7 @@ tuple_to_stringinfo(StringInfo s, TupleDesc tupdesc, HeapTuple tuple, bool skip_
 		Datum		origval;	/* possibly toasted Datum */
 		bool		isnull;		/* column is null? */
 
-		attr = tupdesc->attrs[natt];
+		attr = TupleDescAttr(tupdesc, natt);
 
 		/*
 		 * don't print dropped columns, we can't be sure everything is
diff --git a/contrib/tsm_system_rows/tsm_system_rows.c b/contrib/tsm_system_rows/tsm_system_rows.c
index 544458ec91..83f841f0c2 100644
--- a/contrib/tsm_system_rows/tsm_system_rows.c
+++ b/contrib/tsm_system_rows/tsm_system_rows.c
@@ -17,7 +17,7 @@
  * won't visit blocks added after the first scan, but that is fine since
  * such blocks shouldn't contain any visible tuples anyway.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/contrib/tsm_system_time/tsm_system_time.c b/contrib/tsm_system_time/tsm_system_time.c
index af8d025414..f0c220aa4a 100644
--- a/contrib/tsm_system_time/tsm_system_time.c
+++ b/contrib/tsm_system_time/tsm_system_time.c
@@ -13,7 +13,7 @@
  * However, we do what we can to reduce surprising behavior by selecting
  * the sampling pattern just once per query, much as in tsm_system_rows.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/contrib/unaccent/unaccent.c b/contrib/unaccent/unaccent.c
index e08cca1707..247c202755 100644
--- a/contrib/unaccent/unaccent.c
+++ b/contrib/unaccent/unaccent.c
@@ -3,7 +3,7 @@
  * unaccent.c
  *	  Text search unaccent dictionary
  *
- * Copyright (c) 2009-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2009-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  contrib/unaccent/unaccent.c
@@ -90,7 +90,7 @@ placeChar(TrieChar *node, const unsigned char *str, int lenstr,
  * Function converts UTF8-encoded file into current encoding.
  */
 static TrieChar *
-initTrie(char *filename)
+initTrie(const char *filename)
 {
 	TrieChar   *volatile rootTrie = NULL;
 	MemoryContext ccxt = CurrentMemoryContext;
@@ -276,7 +276,7 @@ unaccent_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp("Rules", defel->defname) == 0)
+		if (strcmp(defel->defname, "rules") == 0)
 		{
 			if (fileloaded)
 				ereport(ERROR,
diff --git a/contrib/uuid-ossp/uuid-ossp.c b/contrib/uuid-ossp/uuid-ossp.c
index db1f6b2b2f..ce96c7c64f 100644
--- a/contrib/uuid-ossp/uuid-ossp.c
+++ b/contrib/uuid-ossp/uuid-ossp.c
@@ -2,7 +2,7 @@
  *
  * UUID generation functions using the BSD, E2FS or OSSP UUID library
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * Portions Copyright (c) 2009 Andrew Gierth
  *
@@ -14,13 +14,10 @@
 #include "postgres.h"
 
 #include "fmgr.h"
+#include "port/pg_bswap.h"
 #include "utils/builtins.h"
 #include "utils/uuid.h"
 
-/* for ntohl/htonl */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 /*
  * It's possible that there's more than one uuid.h header file present.
  * We expect configure to set the HAVE_ symbol for only the one we want.
@@ -81,16 +78,16 @@ typedef struct
 
 #define UUID_TO_NETWORK(uu) \
 do { \
-	uu.time_low = htonl(uu.time_low); \
-	uu.time_mid = htons(uu.time_mid); \
-	uu.time_hi_and_version = htons(uu.time_hi_and_version); \
+	uu.time_low = pg_hton32(uu.time_low); \
+	uu.time_mid = pg_hton16(uu.time_mid); \
+	uu.time_hi_and_version = pg_hton16(uu.time_hi_and_version); \
 } while (0)
 
 #define UUID_TO_LOCAL(uu) \
 do { \
-	uu.time_low = ntohl(uu.time_low); \
-	uu.time_mid = ntohs(uu.time_mid); \
-	uu.time_hi_and_version = ntohs(uu.time_hi_and_version); \
+	uu.time_low = pg_ntoh32(uu.time_low); \
+	uu.time_mid = pg_ntoh16(uu.time_mid); \
+	uu.time_hi_and_version = pg_ntoh16(uu.time_hi_and_version); \
 } while (0)
 
 #define UUID_V3_OR_V5(uu, v) \
@@ -247,7 +244,7 @@ uuid_generate_v35_internal(int mode, pg_uuid_t *ns, text *name)
 #else							/* !HAVE_UUID_OSSP */
 
 static Datum
-uuid_generate_internal(int v, unsigned char *ns, char *ptr, int len)
+uuid_generate_internal(int v, unsigned char *ns, const char *ptr, int len)
 {
 	char		strbuf[40];
 
diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c
index a4d4553303..ab6b17c7f6 100644
--- a/contrib/vacuumlo/vacuumlo.c
+++ b/contrib/vacuumlo/vacuumlo.c
@@ -3,7 +3,7 @@
  * vacuumlo.c
  *	  This removes orphaned large objects from a database.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,6 +23,7 @@
 
 #include "catalog/pg_class.h"
 
+#include "fe_utils/connect.h"
 #include "libpq-fe.h"
 #include "pg_getopt.h"
 
@@ -140,11 +141,8 @@ vacuumlo(const char *database, const struct _param *param)
 			fprintf(stdout, "Test run: no large objects will be removed!\n");
 	}
 
-	/*
-	 * Don't get fooled by any non-system catalogs
-	 */
-	res = PQexec(conn, "SET search_path = pg_catalog");
-	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
 		fprintf(stderr, "Failed to set search_path:\n");
 		fprintf(stderr, "%s", PQerrorMessage(conn));
diff --git a/doc/src/sgml/Makefile b/doc/src/sgml/Makefile
index 8a73cc796f..f122b4187f 100644
--- a/doc/src/sgml/Makefile
+++ b/doc/src/sgml/Makefile
@@ -37,15 +37,7 @@ ifndef FOP
 FOP = $(missing) fop
 endif
 
-SGMLINCLUDE = -D . -D $(srcdir)
-
-ifndef NSGMLS
-NSGMLS = $(missing) nsgmls
-endif
-
-ifndef OSX
-OSX = $(missing) osx
-endif
+XMLINCLUDE = --path .
 
 ifndef XMLLINT
 XMLLINT = $(missing) xmllint
@@ -63,14 +55,6 @@ GENERATED_SGML = version.sgml \
 
 ALLSGML := $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml) $(GENERATED_SGML)
 
-# Enable some extra warnings
-# -wfully-tagged needed to throw a warning on missing tags
-# for older tool chains, 2007-08-31
-# Note: try "make SPFLAGS=-wxml" to catch a lot of other dubious constructs,
-# in particular < and & that haven't been made into entities.  It's far too
-# noisy to turn on by default, unfortunately.
-override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged
-
 
 ##
 ## Man pages
@@ -78,9 +62,9 @@ override SPFLAGS += -wall -wno-unused-param -wno-empty -wfully-tagged
 
 man distprep-man: man-stamp
 
-man-stamp: stylesheet-man.xsl postgres.xml
-	$(XMLLINT) --noout --valid postgres.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $^
+man-stamp: stylesheet-man.xsl postgres.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_MAN_FLAGS) $(wordlist 1,2,$^)
 	touch $@
 
 
@@ -131,28 +115,8 @@ INSTALL.html: %.html : stylesheet-text.xsl %.xml
 	$(XMLLINT) --noout --valid $*.xml
 	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $^ >$@
 
-INSTALL.xml: standalone-install.sgml installation.sgml version.sgml
-	$(OSX) $(SPFLAGS) $(SGMLINCLUDE) -x lower $(filter-out version.sgml,$^) >$@.tmp
-	$(call mangle-xml,chapter)
-
-
-##
-## SGML->XML conversion
-##
-
-# For obscure reasons, GNU make 3.81 complains about circular dependencies
-# if we try to do "make all" in a VPATH build without the explicit
-# $(srcdir) on the postgres.sgml dependency in this rule.  GNU make bug?
-postgres.xml: $(srcdir)/postgres.sgml $(ALLSGML)
-	$(OSX) $(SPFLAGS) $(SGMLINCLUDE) -x lower $< >$@.tmp
-	$(call mangle-xml,book)
-
-define mangle-xml
-$(PERL) -p -e 's/\[(aacute|acirc|aelig|agrave|amp|aring|atilde|auml|bull|copy|eacute|egrave|gt|iacute|lt|mdash|nbsp|ntilde|oacute|ocirc|oslash|ouml|pi|quot|scaron|uuml) *\]/\&\1;/gi;' \
-           -e '$$_ .= qq{<!DOCTYPE $(1) PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">\n} if $$. == 1;' \
-  <$@.tmp > $@
-rm $@.tmp
-endef
+INSTALL.xml: standalone-profile.xsl standalone-install.xml postgres.sgml $(ALLSGML)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --xinclude $(wordlist 1,2,$^) >$@
 
 
 ##
@@ -165,20 +129,20 @@ endif
 
 html: html-stamp
 
-html-stamp: stylesheet.xsl postgres.xml
-	$(XMLLINT) --noout --valid postgres.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $^
+html-stamp: stylesheet.xsl postgres.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) $(wordlist 1,2,$^)
 	cp $(srcdir)/stylesheet.css html/
 	touch $@
 
-htmlhelp: stylesheet-hh.xsl postgres.xml
-	$(XMLLINT) --noout --valid postgres.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) $^
+htmlhelp: stylesheet-hh.xsl postgres.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(wordlist 1,2,$^)
 
 # single-page HTML
-postgres.html: stylesheet-html-nochunk.xsl postgres.xml
-	$(XMLLINT) --noout --valid postgres.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $^
+postgres.html: stylesheet-html-nochunk.xsl postgres.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) $(XSLTPROC_HTML_FLAGS) -o $@ $(wordlist 1,2,$^)
 
 # single-page text
 postgres.txt: postgres.html
@@ -192,13 +156,13 @@ postgres.txt: postgres.html
 postgres.pdf:
 	$(error Invalid target;  use postgres-A4.pdf or postgres-US.pdf as targets)
 
-%-A4.fo: stylesheet-fo.xsl %.xml
-	$(XMLLINT) --noout --valid $*.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $^
+%-A4.fo: stylesheet-fo.xsl %.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --stringparam paper.type A4 -o $@ $(wordlist 1,2,$^)
 
-%-US.fo: stylesheet-fo.xsl %.xml
-	$(XMLLINT) --noout --valid $*.xml
-	$(XSLTPROC) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $^
+%-US.fo: stylesheet-fo.xsl %.sgml $(ALLSGML)
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $(word 2,$^)
+	$(XSLTPROC) $(XMLINCLUDE) $(XSLTPROCFLAGS) --stringparam paper.type USletter -o $@ $(wordlist 1,2,$^)
 
 %.pdf: %.fo
 	$(FOP) -fo $< -pdf $@
@@ -209,7 +173,7 @@ postgres.pdf:
 ##
 
 epub: postgres.epub
-postgres.epub: postgres.xml
+postgres.epub: postgres.sgml $(ALLSGML)
 	$(XMLLINT) --noout --valid $<
 	$(DBTOEPUB) $<
 
@@ -222,7 +186,8 @@ DB2X_TEXIXML = db2x_texixml
 DB2X_XSLTPROC = db2x_xsltproc
 MAKEINFO = makeinfo
 
-%.texixml: %.xml
+%.texixml: %.sgml $(ALLSGML)
+	$(XMLLINT) --noout --valid $<
 	$(DB2X_XSLTPROC) -s texi -g output-file=$(basename $@) $< -o $@
 
 %.texi: %.texixml
@@ -238,7 +203,7 @@ MAKEINFO = makeinfo
 
 # Quick syntax check without style processing
 check: postgres.sgml $(ALLSGML) check-tabs
-	$(NSGMLS) $(SPFLAGS) $(SGMLINCLUDE) -s $<
+	$(XMLLINT) $(XMLINCLUDE) --noout --valid $<
 
 
 ##
@@ -300,7 +265,7 @@ endif # sqlmansectnum != 7
 
 # tabs are harmless, but it is best to avoid them in SGML files
 check-tabs:
-	@( ! grep '	' $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml $(srcdir)/*.dsl $(srcdir)/*.xsl) ) || (echo "Tabs appear in SGML/XML files" 1>&2;  exit 1)
+	@( ! grep '	' $(wildcard $(srcdir)/*.sgml $(srcdir)/ref/*.sgml $(srcdir)/*.xsl) ) || (echo "Tabs appear in SGML/XML files" 1>&2;  exit 1)
 
 ##
 ## Clean
@@ -308,7 +273,7 @@ check-tabs:
 
 # This allows removing some files from the distribution tarballs while
 # keeping the dependencies satisfied.
-.SECONDARY: postgres.xml $(GENERATED_SGML) HTML.index
+.SECONDARY: $(GENERATED_SGML)
 .SECONDARY: INSTALL.html INSTALL.xml
 .SECONDARY: postgres-A4.fo postgres-US.fo
 
@@ -322,8 +287,6 @@ clean:
 	rm -f *.fo *.pdf
 # generated SGML files
 	rm -f $(GENERATED_SGML)
-# SGML->XML conversion
-	rm -f postgres.xml *.tmp
 # HTML Help
 	rm -f htmlhelp.hhp toc.hhc index.hhk
 # EPUB
diff --git a/doc/src/sgml/acronyms.sgml b/doc/src/sgml/acronyms.sgml
index 29f85e0846..751c46de6d 100644
--- a/doc/src/sgml/acronyms.sgml
+++ b/doc/src/sgml/acronyms.sgml
@@ -4,8 +4,8 @@
  <title>Acronyms</title>
 
  <para>
-  This is a list of acronyms commonly used in the <productname>PostgreSQL</>
-  documentation and in discussions about <productname>PostgreSQL</>.
+  This is a list of acronyms commonly used in the <productname>PostgreSQL</productname>
+  documentation and in discussions about <productname>PostgreSQL</productname>.
 
   <variablelist>
 
@@ -153,7 +153,7 @@
       <ulink
       url="http://en.wikipedia.org/wiki/Data_Definition_Language">Data
       Definition Language</ulink>, SQL commands such as <command>CREATE
-      TABLE</>, <command>ALTER USER</>
+      TABLE</command>, <command>ALTER USER</command>
      </para>
     </listitem>
    </varlistentry>
@@ -164,8 +164,8 @@
      <para>
       <ulink
       url="http://en.wikipedia.org/wiki/Data_Manipulation_Language">Data
-      Manipulation Language</ulink>, SQL commands such as <command>INSERT</>,
-      <command>UPDATE</>, <command>DELETE</>
+      Manipulation Language</ulink>, SQL commands such as <command>INSERT</command>,
+      <command>UPDATE</command>, <command>DELETE</command>
      </para>
     </listitem>
    </varlistentry>
@@ -232,7 +232,7 @@
     <term><acronym>GIN</acronym></term>
     <listitem>
      <para>
-      <link linkend="GIN">Generalized Inverted Index</link>
+      <link linkend="gin">Generalized Inverted Index</link>
      </para>
     </listitem>
    </varlistentry>
@@ -241,7 +241,7 @@
     <term><acronym>GiST</acronym></term>
     <listitem>
      <para>
-      <link linkend="GiST">Generalized Search Tree</link>
+      <link linkend="gist">Generalized Search Tree</link>
      </para>
     </listitem>
    </varlistentry>
@@ -281,7 +281,7 @@
     <listitem>
      <para>
       <link linkend="config-setting">Grand Unified Configuration</link>,
-      the <productname>PostgreSQL</> subsystem that handles server configuration
+      the <productname>PostgreSQL</productname> subsystem that handles server configuration
      </para>
     </listitem>
    </varlistentry>
@@ -369,6 +369,16 @@
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><acronym>JSON</acronym></term>
+    <listitem>
+     <para>
+      <ulink
+      url="http://json.org">JavaScript Object Notation</ulink>
+     </para>
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><acronym>LDAP</acronym></term>
     <listitem>
@@ -384,7 +394,7 @@
     <term><acronym>LSN</acronym></term>
     <listitem>
      <para>
-      Log Sequence Number, see <link linkend="datatype-pg-lsn"><type>pg_lsn</></link>
+      Log Sequence Number, see <link linkend="datatype-pg-lsn"><type>pg_lsn</type></link>
       and <link linkend="wal-internals">WAL Internals</link>.
      </para>
     </listitem>
@@ -486,7 +496,7 @@
     <term><acronym>PGSQL</acronym></term>
     <listitem>
      <para>
-      <link linkend="postgres"><productname>PostgreSQL</></link>
+      <link linkend="postgres"><productname>PostgreSQL</productname></link>
      </para>
     </listitem>
    </varlistentry>
@@ -495,7 +505,7 @@
     <term><acronym>PGXS</acronym></term>
     <listitem>
      <para>
-      <link linkend="extend-pgxs"><productname>PostgreSQL</> Extension System</link>
+      <link linkend="extend-pgxs"><productname>PostgreSQL</productname> Extension System</link>
      </para>
     </listitem>
    </varlistentry>
@@ -583,7 +593,7 @@
     <term><acronym>SP-GiST</acronym></term>
     <listitem>
      <para>
-      <link linkend="SPGiST">Space-Partitioned Generalized Search Tree</link>
+      <link linkend="spgist">Space-Partitioned Generalized Search Tree</link>
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/adminpack.sgml b/doc/src/sgml/adminpack.sgml
index fddf90c4a5..1197eefbf3 100644
--- a/doc/src/sgml/adminpack.sgml
+++ b/doc/src/sgml/adminpack.sgml
@@ -8,24 +8,24 @@
  </indexterm>
 
  <para>
-  <filename>adminpack</> provides a number of support functions which
-  <application>pgAdmin</> and other administration and management tools can
+  <filename>adminpack</filename> provides a number of support functions which
+  <application>pgAdmin</application> and other administration and management tools can
   use to provide additional functionality, such as remote management
   of server log files.
   Use of all these functions is restricted to superusers.
  </para>
 
  <para>
-  The functions shown in <xref linkend="functions-adminpack-table"> provide
+  The functions shown in <xref linkend="functions-adminpack-table"/> provide
   write access to files on the machine hosting the server.  (See also the
-  functions in <xref linkend="functions-admin-genfile-table">, which
+  functions in <xref linkend="functions-admin-genfile-table"/>, which
   provide read-only access.)
   Only files within the database cluster directory can be accessed, but
   either a relative or absolute path is allowable.
  </para>
 
  <table id="functions-adminpack-table">
-  <title><filename>adminpack</> Functions</title>
+  <title><filename>adminpack</filename> Functions</title>
   <tgroup cols="3">
    <thead>
     <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry>
@@ -58,7 +58,7 @@
      <entry><function>pg_catalog.pg_logdir_ls()</function></entry>
      <entry><type>setof record</type></entry>
      <entry>
-      List the log files in the <varname>log_directory</> directory
+      List the log files in the <varname>log_directory</varname> directory
      </entry>
     </row>
    </tbody>
@@ -69,9 +69,9 @@
   <primary>pg_file_write</primary>
  </indexterm>
  <para>
-  <function>pg_file_write</> writes the specified <parameter>data</> into
-  the file named by <parameter>filename</>.  If <parameter>append</> is
-  false, the file must not already exist.  If <parameter>append</> is true,
+  <function>pg_file_write</function> writes the specified <parameter>data</parameter> into
+  the file named by <parameter>filename</parameter>.  If <parameter>append</parameter> is
+  false, the file must not already exist.  If <parameter>append</parameter> is true,
   the file can already exist, and will be appended to if so.
   Returns the number of bytes written.
  </para>
@@ -80,15 +80,15 @@
   <primary>pg_file_rename</primary>
  </indexterm>
  <para>
-  <function>pg_file_rename</> renames a file.  If <parameter>archivename</>
-  is omitted or NULL, it simply renames <parameter>oldname</>
-  to <parameter>newname</> (which must not already exist).
-  If <parameter>archivename</> is provided, it first
-  renames <parameter>newname</> to <parameter>archivename</> (which must
-  not already exist), and then renames <parameter>oldname</>
-  to <parameter>newname</>.  In event of failure of the second rename step,
-  it will try to rename <parameter>archivename</> back
-  to <parameter>newname</> before reporting the error.
+  <function>pg_file_rename</function> renames a file.  If <parameter>archivename</parameter>
+  is omitted or NULL, it simply renames <parameter>oldname</parameter>
+  to <parameter>newname</parameter> (which must not already exist).
+  If <parameter>archivename</parameter> is provided, it first
+  renames <parameter>newname</parameter> to <parameter>archivename</parameter> (which must
+  not already exist), and then renames <parameter>oldname</parameter>
+  to <parameter>newname</parameter>.  In event of failure of the second rename step,
+  it will try to rename <parameter>archivename</parameter> back
+  to <parameter>newname</parameter> before reporting the error.
   Returns true on success, false if the source file(s) are not present or
   not writable; other cases throw errors.
  </para>
@@ -97,34 +97,34 @@
   <primary>pg_file_unlink</primary>
  </indexterm>
  <para>
-  <function>pg_file_unlink</> removes the specified file.
+  <function>pg_file_unlink</function> removes the specified file.
   Returns true on success, false if the specified file is not present
-  or the <function>unlink()</> call fails; other cases throw errors.
+  or the <function>unlink()</function> call fails; other cases throw errors.
  </para>
 
  <indexterm>
   <primary>pg_logdir_ls</primary>
  </indexterm>
  <para>
-  <function>pg_logdir_ls</> returns the start timestamps and path
-  names of all the log files in the <xref linkend="guc-log-directory">
-  directory.  The <xref linkend="guc-log-filename"> parameter must have its
-  default setting (<literal>postgresql-%Y-%m-%d_%H%M%S.log</>) to use this
+  <function>pg_logdir_ls</function> returns the start timestamps and path
+  names of all the log files in the <xref linkend="guc-log-directory"/>
+  directory.  The <xref linkend="guc-log-filename"/> parameter must have its
+  default setting (<literal>postgresql-%Y-%m-%d_%H%M%S.log</literal>) to use this
   function.
  </para>
 
  <para>
   The functions shown
-  in <xref linkend="functions-adminpack-deprecated-table"> are deprecated
+  in <xref linkend="functions-adminpack-deprecated-table"/> are deprecated
   and should not be used in new applications; instead use those shown
-  in <xref linkend="functions-admin-signal-table">
-  and <xref linkend="functions-admin-genfile-table">.  These functions are
-  provided in <filename>adminpack</> only for compatibility with old
-  versions of <application>pgAdmin</>.
+  in <xref linkend="functions-admin-signal-table"/>
+  and <xref linkend="functions-admin-genfile-table"/>.  These functions are
+  provided in <filename>adminpack</filename> only for compatibility with old
+  versions of <application>pgAdmin</application>.
  </para>
 
  <table id="functions-adminpack-deprecated-table">
-  <title>Deprecated <filename>adminpack</> Functions</title>
+  <title>Deprecated <filename>adminpack</filename> Functions</title>
   <tgroup cols="3">
    <thead>
     <row><entry>Name</entry> <entry>Return Type</entry> <entry>Description</entry>
@@ -136,22 +136,22 @@
      <entry><function>pg_catalog.pg_file_read(filename text, offset bigint, nbytes bigint)</function></entry>
      <entry><type>text</type></entry>
      <entry>
-      Alternate name for <function>pg_read_file()</>
+      Alternate name for <function>pg_read_file()</function>
      </entry>
     </row>
     <row>
      <entry><function>pg_catalog.pg_file_length(filename text)</function></entry>
      <entry><type>bigint</type></entry>
      <entry>
-      Same as <structfield>size</> column returned
-      by <function>pg_stat_file()</>
+      Same as <structfield>size</structfield> column returned
+      by <function>pg_stat_file()</function>
      </entry>
     </row>
     <row>
      <entry><function>pg_catalog.pg_logfile_rotate()</function></entry>
      <entry><type>integer</type></entry>
      <entry>
-      Alternate name for <function>pg_rotate_logfile()</>, but note that it
+      Alternate name for <function>pg_rotate_logfile()</function>, but note that it
       returns integer 0 or 1 rather than <type>boolean</type>
      </entry>
     </row>
diff --git a/doc/src/sgml/advanced.sgml b/doc/src/sgml/advanced.sgml
index f47c01987b..ae5f3fac75 100644
--- a/doc/src/sgml/advanced.sgml
+++ b/doc/src/sgml/advanced.sgml
@@ -18,12 +18,12 @@
 
    <para>
     This chapter will on occasion refer to examples found in <xref
-    linkend="tutorial-sql"> to change or improve them, so it will be
+    linkend="tutorial-sql"/> to change or improve them, so it will be
     useful to have read that chapter.  Some examples from
     this chapter can also be found in
     <filename>advanced.sql</filename> in the tutorial directory.  This
     file also contains some sample data to load, which is not
-    repeated here.  (Refer to <xref linkend="tutorial-sql-intro"> for
+    repeated here.  (Refer to <xref linkend="tutorial-sql-intro"/> for
     how to use the file.)
    </para>
   </sect1>
@@ -37,7 +37,7 @@
    </indexterm>
 
    <para>
-    Refer back to the queries in <xref linkend="tutorial-join">.
+    Refer back to the queries in <xref linkend="tutorial-join"/>.
     Suppose the combined listing of weather records and city location
     is of particular interest to your application, but you do not want
     to type the query each time you need it.  You can create a
@@ -82,7 +82,7 @@ SELECT * FROM myview;
    <para>
     Recall the <classname>weather</classname> and
     <classname>cities</classname> tables from <xref
-    linkend="tutorial-sql">.  Consider the following problem:  You
+    linkend="tutorial-sql"/>.  Consider the following problem:  You
     want to make sure that no one can insert rows in the
     <classname>weather</classname> table that do not have a matching
     entry in the <classname>cities</classname> table.  This is called
@@ -129,7 +129,7 @@ DETAIL:  Key (city)=(Berkeley) is not present in table "cities".
    <para>
     The behavior of foreign keys can be finely tuned to your
     application.  We will not go beyond this simple example in this
-    tutorial, but just refer you to <xref linkend="ddl">
+    tutorial, but just refer you to <xref linkend="ddl"/>
     for more information.  Making correct use of
     foreign keys will definitely improve the quality of your database
     applications, so you are strongly encouraged to learn about them.
@@ -145,7 +145,7 @@ DETAIL:  Key (city)=(Berkeley) is not present in table "cities".
    </indexterm>
 
    <para>
-    <firstterm>Transactions</> are a fundamental concept of all database
+    <firstterm>Transactions</firstterm> are a fundamental concept of all database
     systems.  The essential point of a transaction is that it bundles
     multiple steps into a single, all-or-nothing operation.  The intermediate
     states between the steps are not visible to other concurrent transactions,
@@ -182,8 +182,8 @@ UPDATE branches SET balance = balance + 100.00
     remain a happy customer if she was debited without Bob being credited.
     We need a guarantee that if something goes wrong partway through the
     operation, none of the steps executed so far will take effect.  Grouping
-    the updates into a <firstterm>transaction</> gives us this guarantee.
-    A transaction is said to be <firstterm>atomic</>: from the point of
+    the updates into a <firstterm>transaction</firstterm> gives us this guarantee.
+    A transaction is said to be <firstterm>atomic</firstterm>: from the point of
     view of other transactions, it either happens completely or not at all.
    </para>
 
@@ -216,9 +216,9 @@ UPDATE branches SET balance = balance + 100.00
    </para>
 
    <para>
-    In <productname>PostgreSQL</>, a transaction is set up by surrounding
+    In <productname>PostgreSQL</productname>, a transaction is set up by surrounding
     the SQL commands of the transaction with
-    <command>BEGIN</> and <command>COMMIT</> commands.  So our banking
+    <command>BEGIN</command> and <command>COMMIT</command> commands.  So our banking
     transaction would actually look like:
 
 <programlisting>
@@ -233,23 +233,23 @@ COMMIT;
    <para>
     If, partway through the transaction, we decide we do not want to
     commit (perhaps we just noticed that Alice's balance went negative),
-    we can issue the command <command>ROLLBACK</> instead of
-    <command>COMMIT</>, and all our updates so far will be canceled.
+    we can issue the command <command>ROLLBACK</command> instead of
+    <command>COMMIT</command>, and all our updates so far will be canceled.
    </para>
 
    <para>
-    <productname>PostgreSQL</> actually treats every SQL statement as being
-    executed within a transaction.  If you do not issue a <command>BEGIN</>
+    <productname>PostgreSQL</productname> actually treats every SQL statement as being
+    executed within a transaction.  If you do not issue a <command>BEGIN</command>
     command,
-    then each individual statement has an implicit <command>BEGIN</> and
-    (if successful) <command>COMMIT</> wrapped around it.  A group of
-    statements surrounded by <command>BEGIN</> and <command>COMMIT</>
-    is sometimes called a <firstterm>transaction block</>.
+    then each individual statement has an implicit <command>BEGIN</command> and
+    (if successful) <command>COMMIT</command> wrapped around it.  A group of
+    statements surrounded by <command>BEGIN</command> and <command>COMMIT</command>
+    is sometimes called a <firstterm>transaction block</firstterm>.
    </para>
 
    <note>
     <para>
-     Some client libraries issue <command>BEGIN</> and <command>COMMIT</>
+     Some client libraries issue <command>BEGIN</command> and <command>COMMIT</command>
      commands automatically, so that you might get the effect of transaction
      blocks without asking.  Check the documentation for the interface
      you are using.
@@ -258,11 +258,11 @@ COMMIT;
 
    <para>
     It's possible to control the statements in a transaction in a more
-    granular fashion through the use of <firstterm>savepoints</>.  Savepoints
+    granular fashion through the use of <firstterm>savepoints</firstterm>.  Savepoints
     allow you to selectively discard parts of the transaction, while
     committing the rest.  After defining a savepoint with
-    <command>SAVEPOINT</>, you can if needed roll back to the savepoint
-    with <command>ROLLBACK TO</>.  All the transaction's database changes
+    <command>SAVEPOINT</command>, you can if needed roll back to the savepoint
+    with <command>ROLLBACK TO</command>.  All the transaction's database changes
     between defining the savepoint and rolling back to it are discarded, but
     changes earlier than the savepoint are kept.
    </para>
@@ -308,7 +308,7 @@ COMMIT;
    <para>
     This example is, of course, oversimplified, but there's a lot of control
     possible in a transaction block through the use of savepoints.
-    Moreover, <command>ROLLBACK TO</> is the only way to regain control of a
+    Moreover, <command>ROLLBACK TO</command> is the only way to regain control of a
     transaction block that was put in aborted state by the
     system due to an error, short of rolling it back completely and starting
     again.
@@ -325,7 +325,7 @@ COMMIT;
    </indexterm>
 
    <para>
-    A <firstterm>window function</> performs a calculation across a set of
+    A <firstterm>window function</firstterm> performs a calculation across a set of
     table rows that are somehow related to the current row.  This is comparable
     to the type of calculation that can be done with an aggregate function.
     However, window functions do not cause rows to become grouped into a single
@@ -360,31 +360,31 @@ SELECT depname, empno, salary, avg(salary) OVER (PARTITION BY depname) FROM emps
 </screen>
 
     The first three output columns come directly from the table
-    <structname>empsalary</>, and there is one output row for each row in the
+    <structname>empsalary</structname>, and there is one output row for each row in the
     table.  The fourth column represents an average taken across all the table
-    rows that have the same <structfield>depname</> value as the current row.
-    (This actually is the same function as the non-window <function>avg</>
-    aggregate, but the <literal>OVER</> clause causes it to be
+    rows that have the same <structfield>depname</structfield> value as the current row.
+    (This actually is the same function as the non-window <function>avg</function>
+    aggregate, but the <literal>OVER</literal> clause causes it to be
     treated as a window function and computed across the window frame.)
    </para>
 
    <para>
-    A window function call always contains an <literal>OVER</> clause
+    A window function call always contains an <literal>OVER</literal> clause
     directly following the window function's name and argument(s).  This is what
     syntactically distinguishes it from a normal function or non-window
-    aggregate.  The <literal>OVER</> clause determines exactly how the
+    aggregate.  The <literal>OVER</literal> clause determines exactly how the
     rows of the query are split up for processing by the window function.
-    The <literal>PARTITION BY</> clause within <literal>OVER</>
+    The <literal>PARTITION BY</literal> clause within <literal>OVER</literal>
     divides the rows into groups, or partitions, that share the same
-    values of the <literal>PARTITION BY</> expression(s).  For each row,
+    values of the <literal>PARTITION BY</literal> expression(s).  For each row,
     the window function is computed across the rows that fall into the
     same partition as the current row.
    </para>
 
    <para>
     You can also control the order in which rows are processed by
-    window functions using <literal>ORDER BY</> within <literal>OVER</>.
-    (The window <literal>ORDER BY</> does not even have to match the
+    window functions using <literal>ORDER BY</literal> within <literal>OVER</literal>.
+    (The window <literal>ORDER BY</literal> does not even have to match the
     order in which the rows are output.)  Here is an example:
 
 <programlisting>
@@ -409,48 +409,48 @@ FROM empsalary;
 (10 rows)
 </screen>
 
-    As shown here, the <function>rank</> function produces a numerical rank
-    for each distinct <literal>ORDER BY</> value in the current row's
-    partition, using the order defined by the <literal>ORDER BY</> clause.
-    <function>rank</> needs no explicit parameter, because its behavior
-    is entirely determined by the <literal>OVER</> clause.
+    As shown here, the <function>rank</function> function produces a numerical rank
+    for each distinct <literal>ORDER BY</literal> value in the current row's
+    partition, using the order defined by the <literal>ORDER BY</literal> clause.
+    <function>rank</function> needs no explicit parameter, because its behavior
+    is entirely determined by the <literal>OVER</literal> clause.
    </para>
 
    <para>
     The rows considered by a window function are those of the <quote>virtual
-    table</> produced by the query's <literal>FROM</> clause as filtered by its
-    <literal>WHERE</>, <literal>GROUP BY</>, and <literal>HAVING</> clauses
+    table</quote> produced by the query's <literal>FROM</literal> clause as filtered by its
+    <literal>WHERE</literal>, <literal>GROUP BY</literal>, and <literal>HAVING</literal> clauses
     if any.  For example, a row removed because it does not meet the
-    <literal>WHERE</> condition is not seen by any window function.
+    <literal>WHERE</literal> condition is not seen by any window function.
     A query can contain multiple window functions that slice up the data
-    in different ways using different <literal>OVER</> clauses, but
+    in different ways using different <literal>OVER</literal> clauses, but
     they all act on the same collection of rows defined by this virtual table.
    </para>
 
    <para>
-    We already saw that <literal>ORDER BY</> can be omitted if the ordering
+    We already saw that <literal>ORDER BY</literal> can be omitted if the ordering
     of rows is not important.  It is also possible to omit <literal>PARTITION
-    BY</>, in which case there is a single partition containing all rows.
+    BY</literal>, in which case there is a single partition containing all rows.
    </para>
 
    <para>
     There is another important concept associated with window functions:
     for each row, there is a set of rows within its partition called its
-    <firstterm>window frame</>.  Some window functions act only
+    <firstterm>window frame</firstterm>.  Some window functions act only
     on the rows of the window frame, rather than of the whole partition.
-    By default, if <literal>ORDER BY</> is supplied then the frame consists of
+    By default, if <literal>ORDER BY</literal> is supplied then the frame consists of
     all rows from the start of the partition up through the current row, plus
     any following rows that are equal to the current row according to the
-    <literal>ORDER BY</> clause.  When <literal>ORDER BY</> is omitted the
+    <literal>ORDER BY</literal> clause.  When <literal>ORDER BY</literal> is omitted the
     default frame consists of all rows in the partition.
      <footnote>
       <para>
        There are options to define the window frame in other ways, but
        this tutorial does not cover them.  See
-       <xref linkend="syntax-window-functions"> for details.
+       <xref linkend="syntax-window-functions"/> for details.
       </para>
      </footnote>
-    Here is an example using <function>sum</>:
+    Here is an example using <function>sum</function>:
    </para>
 
 <programlisting>
@@ -474,11 +474,11 @@ SELECT salary, sum(salary) OVER () FROM empsalary;
 </screen>
 
    <para>
-    Above, since there is no <literal>ORDER BY</> in the <literal>OVER</>
+    Above, since there is no <literal>ORDER BY</literal> in the <literal>OVER</literal>
     clause, the window frame is the same as the partition, which for lack of
-    <literal>PARTITION BY</> is the whole table; in other words each sum is
+    <literal>PARTITION BY</literal> is the whole table; in other words each sum is
     taken over the whole table and so we get the same result for each output
-    row.  But if we add an <literal>ORDER BY</> clause, we get very different
+    row.  But if we add an <literal>ORDER BY</literal> clause, we get very different
     results:
    </para>
 
@@ -510,8 +510,8 @@ SELECT salary, sum(salary) OVER (ORDER BY salary) FROM empsalary;
 
    <para>
     Window functions are permitted only in the <literal>SELECT</literal> list
-    and the <literal>ORDER BY</> clause of the query. They are forbidden
-    elsewhere, such as in <literal>GROUP BY</>, <literal>HAVING</>
+    and the <literal>ORDER BY</literal> clause of the query. They are forbidden
+    elsewhere, such as in <literal>GROUP BY</literal>, <literal>HAVING</literal>
     and <literal>WHERE</literal> clauses.  This is because they logically
     execute after the processing of those clauses.  Also, window functions
     execute after non-window aggregate functions.  This means it is valid to
@@ -534,15 +534,15 @@ WHERE pos &lt; 3;
 </programlisting>
 
     The above query only shows the rows from the inner query having
-    <literal>rank</> less than 3.
+    <literal>rank</literal> less than 3.
    </para>
 
    <para>
     When a query involves multiple window functions, it is possible to write
-    out each one with a separate <literal>OVER</> clause, but this is
+    out each one with a separate <literal>OVER</literal> clause, but this is
     duplicative and error-prone if the same windowing behavior is wanted
     for several functions.  Instead, each windowing behavior can be named
-    in a <literal>WINDOW</> clause and then referenced in <literal>OVER</>.
+    in a <literal>WINDOW</literal> clause and then referenced in <literal>OVER</literal>.
     For example:
 
 <programlisting>
@@ -554,10 +554,10 @@ SELECT sum(salary) OVER w, avg(salary) OVER w
 
    <para>
     More details about window functions can be found in
-    <xref linkend="syntax-window-functions">,
-    <xref linkend="functions-window">,
-    <xref linkend="queries-window">, and the
-    <xref linkend="sql-select"> reference page.
+    <xref linkend="syntax-window-functions"/>,
+    <xref linkend="functions-window"/>,
+    <xref linkend="queries-window"/>, and the
+    <xref linkend="sql-select"/> reference page.
    </para>
   </sect1>
 
@@ -623,13 +623,13 @@ CREATE TABLE capitals (
 
    <para>
     In this case, a row of <classname>capitals</classname>
-    <firstterm>inherits</firstterm> all columns (<structfield>name</>,
-    <structfield>population</>, and <structfield>altitude</>) from its
+    <firstterm>inherits</firstterm> all columns (<structfield>name</structfield>,
+    <structfield>population</structfield>, and <structfield>altitude</structfield>) from its
     <firstterm>parent</firstterm>, <classname>cities</classname>.  The
     type of the column <structfield>name</structfield> is
     <type>text</type>, a native <productname>PostgreSQL</productname>
     type for variable length character strings.  State capitals have
-    an extra column, <structfield>state</>, that shows their state.  In
+    an extra column, <structfield>state</structfield>, that shows their state.  In
     <productname>PostgreSQL</productname>, a table can inherit from
     zero or more other tables.
    </para>
@@ -692,7 +692,7 @@ SELECT name, altitude
     <para>
      Although inheritance is frequently useful, it has not been integrated
      with unique constraints or foreign keys, which limits its usefulness.
-     See <xref linkend="ddl-inherit"> for more detail.
+     See <xref linkend="ddl-inherit"/> for more detail.
     </para>
    </note>
   </sect1>
diff --git a/doc/src/sgml/amcheck.sgml b/doc/src/sgml/amcheck.sgml
index dd71dbd679..852e260c09 100644
--- a/doc/src/sgml/amcheck.sgml
+++ b/doc/src/sgml/amcheck.sgml
@@ -8,19 +8,19 @@
  </indexterm>
 
  <para>
-  The <filename>amcheck</> module provides functions that allow you to
+  The <filename>amcheck</filename> module provides functions that allow you to
   verify the logical consistency of the structure of indexes.  If the
   structure appears to be valid, no error is raised.
  </para>
 
  <para>
-  The functions verify various <emphasis>invariants</> in the
+  The functions verify various <emphasis>invariants</emphasis> in the
   structure of the representation of particular indexes.  The
   correctness of the access method functions behind index scans and
   other important operations relies on these invariants always
   holding.  For example, certain functions verify, among other things,
-  that all B-Tree pages have items in <quote>logical</> order (e.g.,
-  for B-Tree indexes on <type>text</>, index tuples should be in
+  that all B-Tree pages have items in <quote>logical</quote> order (e.g.,
+  for B-Tree indexes on <type>text</type>, index tuples should be in
   collated lexical order).  If that particular invariant somehow fails
   to hold, we can expect binary searches on the affected page to
   incorrectly guide index scans, resulting in wrong answers to SQL
@@ -31,11 +31,11 @@
   index scans themselves, which may be user-defined operator class
   code.  For example, B-Tree index verification relies on comparisons
   made with one or more B-Tree support function 1 routines.  See <xref
-  linkend="xindex-support"> for details of operator class support
+  linkend="xindex-support"/> for details of operator class support
   functions.
  </para>
  <para>
-  <filename>amcheck</> functions may be used only by superusers.
+  <filename>amcheck</filename> functions may be used only by superusers.
  </para>
 
  <sect2>
@@ -82,7 +82,7 @@ ORDER BY c.relpages DESC LIMIT 10;
 (10 rows)
 </screen>
       This example shows a session that performs verification of every
-      catalog index in the database <quote>test</>.  Details of just
+      catalog index in the database <quote>test</quote>.  Details of just
       the 10 largest indexes verified are displayed.  Since no error
       is raised, all indexes tested appear to be logically consistent.
       Naturally, this query could easily be changed to call
@@ -90,10 +90,10 @@ ORDER BY c.relpages DESC LIMIT 10;
       database where verification is supported.
      </para>
      <para>
-      <function>bt_index_check</function> acquires an <literal>AccessShareLock</>
+      <function>bt_index_check</function> acquires an <literal>AccessShareLock</literal>
       on the target index and the heap relation it belongs to. This lock mode
       is the same lock mode acquired on relations by simple
-      <literal>SELECT</> statements.
+      <literal>SELECT</literal> statements.
       <function>bt_index_check</function> does not verify invariants
       that span child/parent relationships, nor does it verify that
       the target index is consistent with its heap relation.  When a
@@ -132,13 +132,13 @@ ORDER BY c.relpages DESC LIMIT 10;
       logical inconsistency or other problem.
      </para>
      <para>
-      A <literal>ShareLock</> is required on the target index by
+      A <literal>ShareLock</literal> is required on the target index by
       <function>bt_index_parent_check</function> (a
-      <literal>ShareLock</> is also acquired on the heap relation).
+      <literal>ShareLock</literal> is also acquired on the heap relation).
       These locks prevent concurrent data modification from
-      <command>INSERT</>, <command>UPDATE</>, and <command>DELETE</>
+      <command>INSERT</command>, <command>UPDATE</command>, and <command>DELETE</command>
       commands.  The locks also prevent the underlying relation from
-      being concurrently processed by <command>VACUUM</>, as well as
+      being concurrently processed by <command>VACUUM</command>, as well as
       all other utility commands.  Note that the function holds locks
       only while running, not for the entire transaction.
      </para>
@@ -159,13 +159,13 @@ ORDER BY c.relpages DESC LIMIT 10;
  </sect2>
 
  <sect2>
-  <title>Using <filename>amcheck</> effectively</title>
+  <title>Using <filename>amcheck</filename> effectively</title>
 
  <para>
-  <filename>amcheck</> can be effective at detecting various types of
+  <filename>amcheck</filename> can be effective at detecting various types of
   failure modes that <link
   linkend="app-initdb-data-checksums"><application>data page
-  checksums</></link> will always fail to catch.  These include:
+  checksums</application></link> will always fail to catch.  These include:
 
   <itemizedlist>
    <listitem>
@@ -176,13 +176,13 @@ ORDER BY c.relpages DESC LIMIT 10;
     <para>
      This includes issues caused by the comparison rules of operating
      system collations changing. Comparisons of datums of a collatable
-     type like <type>text</> must be immutable (just as all
+     type like <type>text</type> must be immutable (just as all
      comparisons used for B-Tree index scans must be immutable), which
      implies that operating system collation rules must never change.
      Though rare, updates to operating system collation rules can
      cause these issues. More commonly, an inconsistency in the
      collation order between a master server and a standby server is
-     implicated, possibly because the <emphasis>major</> operating
+     implicated, possibly because the <emphasis>major</emphasis> operating
      system version in use is inconsistent.  Such inconsistencies will
      generally only arise on standby servers, and so can generally
      only be detected on standby servers.
@@ -190,27 +190,27 @@ ORDER BY c.relpages DESC LIMIT 10;
     <para>
      If a problem like this arises, it may not affect each individual
      index that is ordered using an affected collation, simply because
-     <emphasis>indexed</> values might happen to have the same
+     <emphasis>indexed</emphasis> values might happen to have the same
      absolute ordering regardless of the behavioral inconsistency. See
-     <xref linkend="locale"> and <xref linkend="collation"> for
-     further details about how <productname>PostgreSQL</> uses
+     <xref linkend="locale"/> and <xref linkend="collation"/> for
+     further details about how <productname>PostgreSQL</productname> uses
      operating system locales and collations.
     </para>
    </listitem>
    <listitem>
     <para>
      Corruption caused by hypothetical undiscovered bugs in the
-     underlying <productname>PostgreSQL</> access method code or sort
+     underlying <productname>PostgreSQL</productname> access method code or sort
      code.
     </para>
     <para>
      Automatic verification of the structural integrity of indexes
      plays a role in the general testing of new or proposed
-     <productname>PostgreSQL</> features that could plausibly allow a
+     <productname>PostgreSQL</productname> features that could plausibly allow a
      logical inconsistency to be introduced.  One obvious testing
-     strategy is to call <filename>amcheck</> functions continuously
+     strategy is to call <filename>amcheck</filename> functions continuously
      when running the standard regression tests.  See <xref
-     linkend="regress-run"> for details on running the tests.
+     linkend="regress-run"/> for details on running the tests.
     </para>
    </listitem>
    <listitem>
@@ -219,12 +219,12 @@ ORDER BY c.relpages DESC LIMIT 10;
      simply not be enabled.
     </para>
     <para>
-     Note that <filename>amcheck</> examines a page as represented in some
+     Note that <filename>amcheck</filename> examines a page as represented in some
      shared memory buffer at the time of verification if there is only a
      shared buffer hit when accessing the block. Consequently,
-     <filename>amcheck</> does not necessarily examine data read from the
+     <filename>amcheck</filename> does not necessarily examine data read from the
      file system at the time of verification. Note that when checksums are
-     enabled, <filename>amcheck</> may raise an error due to a checksum
+     enabled, <filename>amcheck</filename> may raise an error due to a checksum
      failure when a corrupt block is read into a buffer.
     </para>
    </listitem>
@@ -234,7 +234,7 @@ ORDER BY c.relpages DESC LIMIT 10;
      and operating system.
     </para>
     <para>
-     <productname>PostgreSQL</> does not protect against correctable
+     <productname>PostgreSQL</productname> does not protect against correctable
      memory errors and it is assumed you will operate using RAM that
      uses industry standard Error Correcting Codes (ECC) or better
      protection.  However, ECC memory is typically only immune to
@@ -244,7 +244,7 @@ ORDER BY c.relpages DESC LIMIT 10;
     </para>
    </listitem>
   </itemizedlist>
-  In general, <filename>amcheck</> can only prove the presence of
+  In general, <filename>amcheck</filename> can only prove the presence of
   corruption; it cannot prove its absence.
  </para>
 
@@ -252,19 +252,19 @@ ORDER BY c.relpages DESC LIMIT 10;
  <sect2>
   <title>Repairing corruption</title>
  <para>
-  No error concerning corruption raised by <filename>amcheck</> should
-  ever be a false positive.  In practice, <filename>amcheck</> is more
+  No error concerning corruption raised by <filename>amcheck</filename> should
+  ever be a false positive.  In practice, <filename>amcheck</filename> is more
   likely to find software bugs than problems with hardware.
-  <filename>amcheck</> raises errors in the event of conditions that,
+  <filename>amcheck</filename> raises errors in the event of conditions that,
   by definition, should never happen, and so careful analysis of
-  <filename>amcheck</> errors is often required.
+  <filename>amcheck</filename> errors is often required.
  </para>
  <para>
   There is no general method of repairing problems that
-  <filename>amcheck</> detects.  An explanation for the root cause of
+  <filename>amcheck</filename> detects.  An explanation for the root cause of
   an invariant violation should be sought.  <xref
-  linkend="pageinspect"> may play a useful role in diagnosing
-  corruption that <filename>amcheck</> detects.  A <command>REINDEX</>
+  linkend="pageinspect"/> may play a useful role in diagnosing
+  corruption that <filename>amcheck</filename> detects.  A <command>REINDEX</command>
   may not be effective in repairing corruption.
  </para>
 
diff --git a/doc/src/sgml/arch-dev.sgml b/doc/src/sgml/arch-dev.sgml
index c835e87215..53f8049df3 100644
--- a/doc/src/sgml/arch-dev.sgml
+++ b/doc/src/sgml/arch-dev.sgml
@@ -7,7 +7,7 @@
    <title>Author</title>
    <para>
     This chapter originated as part of
-    <xref linkend="SIM98">, Stefan Simkovics'
+    <xref linkend="sim98"/>, Stefan Simkovics'
     Master's Thesis prepared at Vienna University of Technology under the direction
     of O.Univ.Prof.Dr. Georg Gottlob and Univ.Ass. Mag. Katrin Seyr.
    </para>
@@ -118,7 +118,7 @@
 
    <para>
     <productname>PostgreSQL</productname> is implemented using a
-    simple <quote>process per user</> client/server model.  In this model
+    simple <quote>process per user</quote> client/server model.  In this model
     there is one <firstterm>client process</firstterm> connected to
     exactly one <firstterm>server process</firstterm>.  As we do not
     know ahead of time how many connections will be made, we have to
@@ -136,10 +136,10 @@
    <para>
     The client process can be any program that understands the
     <productname>PostgreSQL</productname> protocol described in
-    <xref linkend="protocol">.  Many clients are based on the
-    C-language library <application>libpq</>, but several independent
+    <xref linkend="protocol"/>.  Many clients are based on the
+    C-language library <application>libpq</application>, but several independent
     implementations of the protocol exist, such as the Java
-    <application>JDBC</> driver.
+    <application>JDBC</application> driver.
    </para>
 
    <para>
@@ -184,8 +184,8 @@
      text) for valid syntax. If the syntax is correct a
      <firstterm>parse tree</firstterm> is built up and handed back;
      otherwise an error is returned. The parser and lexer are
-     implemented using the well-known Unix tools <application>bison</>
-     and <application>flex</>.
+     implemented using the well-known Unix tools <application>bison</application>
+     and <application>flex</application>.
     </para>
 
     <para>
@@ -251,7 +251,7 @@
      back by the parser as input and does the semantic interpretation needed
      to understand which tables, functions, and operators are referenced by
      the query.  The data structure that is built to represent this
-     information is called the <firstterm>query tree</>.
+     information is called the <firstterm>query tree</firstterm>.
     </para>
 
     <para>
@@ -259,10 +259,10 @@
      system catalog lookups can only be done within a transaction, and we
      do not wish to start a transaction immediately upon receiving a query
      string.  The raw parsing stage is sufficient to identify the transaction
-     control commands (<command>BEGIN</>, <command>ROLLBACK</>, etc), and
+     control commands (<command>BEGIN</command>, <command>ROLLBACK</command>, etc), and
      these can then be correctly executed without any further analysis.
      Once we know that we are dealing with an actual query (such as
-     <command>SELECT</> or <command>UPDATE</>), it is okay to
+     <command>SELECT</command> or <command>UPDATE</command>), it is okay to
      start a transaction if we're not already in one.  Only then can the
      transformation process be invoked.
     </para>
@@ -270,10 +270,10 @@
     <para>
      The query tree created by the transformation process is structurally
      similar to the raw parse tree in most places, but it has many differences
-     in detail.  For example, a <structname>FuncCall</> node in the
+     in detail.  For example, a <structname>FuncCall</structname> node in the
      parse tree represents something that looks syntactically like a function
-     call.  This might be transformed to either a <structname>FuncExpr</>
-     or <structname>Aggref</> node depending on whether the referenced
+     call.  This might be transformed to either a <structname>FuncExpr</structname>
+     or <structname>Aggref</structname> node depending on whether the referenced
      name turns out to be an ordinary function or an aggregate function.
      Also, information about the actual data types of columns and expression
      results is added to the query tree.
@@ -317,7 +317,7 @@
 
    <para>
     The query rewriter is discussed in some detail in
-    <xref linkend="rules">, so there is no need to cover it here.
+    <xref linkend="rules"/>, so there is no need to cover it here.
     We will only point out that both the input and the output of the
     rewriter are query trees, that is, there is no change in the
     representation or level of semantic detail in the trees.  Rewriting
@@ -347,17 +347,17 @@
      involving large numbers of join operations. In order to determine
      a reasonable (not necessarily optimal) query plan in a reasonable amount
      of time, <productname>PostgreSQL</productname> uses a <firstterm>Genetic
-     Query Optimizer</firstterm> (see <xref linkend="geqo">) when the number of joins
-     exceeds a threshold (see <xref linkend="guc-geqo-threshold">).
+     Query Optimizer</firstterm> (see <xref linkend="geqo"/>) when the number of joins
+     exceeds a threshold (see <xref linkend="guc-geqo-threshold"/>).
     </para>
    </note>
 
    <para>
     The planner's search procedure actually works with data structures
-    called <firstterm>paths</>, which are simply cut-down representations of
+    called <firstterm>paths</firstterm>, which are simply cut-down representations of
     plans containing only as much information as the planner needs to make
     its decisions. After the cheapest path is determined, a full-fledged
-    <firstterm>plan tree</> is built to pass to the executor.  This represents
+    <firstterm>plan tree</firstterm> is built to pass to the executor.  This represents
     the desired execution plan in sufficient detail for the executor to run it.
     In the rest of this section we'll ignore the distinction between paths
     and plans.
@@ -378,12 +378,12 @@
      <literal>relation.attribute OPR constant</literal>. If
      <literal>relation.attribute</literal> happens to match the key of the B-tree
      index and <literal>OPR</literal> is one of the operators listed in
-     the index's <firstterm>operator class</>, another plan is created using
+     the index's <firstterm>operator class</firstterm>, another plan is created using
      the B-tree index to scan the relation. If there are further indexes
      present and the restrictions in the query happen to match a key of an
      index, further plans will be considered.  Index scan plans are also
      generated for indexes that have a sort ordering that can match the
-     query's <literal>ORDER BY</> clause (if any), or a sort ordering that
+     query's <literal>ORDER BY</literal> clause (if any), or a sort ordering that
      might be useful for merge joining (see below).
     </para>
 
@@ -438,7 +438,7 @@
     </para>
 
     <para>
-     If the query uses fewer than <xref linkend="guc-geqo-threshold">
+     If the query uses fewer than <xref linkend="guc-geqo-threshold"/>
      relations, a near-exhaustive search is conducted to find the best
      join sequence.  The planner preferentially considers joins between any
      two relations for which there exist a corresponding join clause in the
@@ -454,7 +454,7 @@
     <para>
      When <varname>geqo_threshold</varname> is exceeded, the join
      sequences considered are determined by heuristics, as described
-     in <xref linkend="geqo">.  Otherwise the process is the same.
+     in <xref linkend="geqo"/>.  Otherwise the process is the same.
     </para>
 
     <para>
@@ -462,9 +462,9 @@
      the base relations, plus nested-loop, merge, or hash join nodes as
      needed, plus any auxiliary steps needed, such as sort nodes or
      aggregate-function calculation nodes.  Most of these plan node
-     types have the additional ability to do <firstterm>selection</>
+     types have the additional ability to do <firstterm>selection</firstterm>
      (discarding rows that do not meet a specified Boolean condition)
-     and <firstterm>projection</> (computation of a derived column set
+     and <firstterm>projection</firstterm> (computation of a derived column set
      based on given column values, that is, evaluation of scalar
      expressions where needed).  One of the responsibilities of the
      planner is to attach selection conditions from the
@@ -496,7 +496,7 @@
     subplan) is, let's say, a
     <literal>Sort</literal> node and again recursion is needed to obtain
     an input row.  The child node of the <literal>Sort</literal> might
-    be a <literal>SeqScan</> node, representing actual reading of a table.
+    be a <literal>SeqScan</literal> node, representing actual reading of a table.
     Execution of this node causes the executor to fetch a row from the
     table and return it up to the calling node.  The <literal>Sort</literal>
     node will repeatedly call its child to obtain all the rows to be sorted.
@@ -529,24 +529,24 @@
 
    <para>
     The executor mechanism is used to evaluate all four basic SQL query types:
-    <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>, and
-    <command>DELETE</>.  For <command>SELECT</>, the top-level executor
+    <command>SELECT</command>, <command>INSERT</command>, <command>UPDATE</command>, and
+    <command>DELETE</command>.  For <command>SELECT</command>, the top-level executor
     code only needs to send each row returned by the query plan tree off
-    to the client.  For <command>INSERT</>, each returned row is inserted
-    into the target table specified for the <command>INSERT</>.  This is
-    done in a special top-level plan node called <literal>ModifyTable</>.
+    to the client.  For <command>INSERT</command>, each returned row is inserted
+    into the target table specified for the <command>INSERT</command>.  This is
+    done in a special top-level plan node called <literal>ModifyTable</literal>.
     (A simple
-    <command>INSERT ... VALUES</> command creates a trivial plan tree
-    consisting of a single <literal>Result</> node, which computes just one
-    result row, and <literal>ModifyTable</> above it to perform the insertion.
-    But <command>INSERT ... SELECT</> can demand the full power
-    of the executor mechanism.)  For <command>UPDATE</>, the planner arranges
+    <command>INSERT ... VALUES</command> command creates a trivial plan tree
+    consisting of a single <literal>Result</literal> node, which computes just one
+    result row, and <literal>ModifyTable</literal> above it to perform the insertion.
+    But <command>INSERT ... SELECT</command> can demand the full power
+    of the executor mechanism.)  For <command>UPDATE</command>, the planner arranges
     that each computed row includes all the updated column values, plus
-    the <firstterm>TID</> (tuple ID, or row ID) of the original target row;
-    this data is fed into a <literal>ModifyTable</> node, which uses the
+    the <firstterm>TID</firstterm> (tuple ID, or row ID) of the original target row;
+    this data is fed into a <literal>ModifyTable</literal> node, which uses the
     information to create a new updated row and mark the old row deleted.
-    For <command>DELETE</>, the only column that is actually returned by the
-    plan is the TID, and the <literal>ModifyTable</> node simply uses the TID
+    For <command>DELETE</command>, the only column that is actually returned by the
+    plan is the TID, and the <literal>ModifyTable</literal> node simply uses the TID
     to visit each target row and mark it deleted.
    </para>
 
diff --git a/doc/src/sgml/array.sgml b/doc/src/sgml/array.sgml
index 58878451f0..f4d4a610ef 100644
--- a/doc/src/sgml/array.sgml
+++ b/doc/src/sgml/array.sgml
@@ -10,9 +10,8 @@
  <para>
   <productname>PostgreSQL</productname> allows columns of a table to be
   defined as variable-length multidimensional arrays. Arrays of any
-  built-in or user-defined base type, enum type, or composite type
-  can be created.
-  Arrays of domains are not yet supported.
+  built-in or user-defined base type, enum type, composite type, range type,
+  or domain can be created.
  </para>
 
  <sect2 id="arrays-declaration">
@@ -33,7 +32,7 @@ CREATE TABLE sal_emp (
 );
 </programlisting>
   As shown, an array data type is named by appending square brackets
-  (<literal>[]</>) to the data type name of the array elements.  The
+  (<literal>[]</literal>) to the data type name of the array elements.  The
   above command will create a table named
   <structname>sal_emp</structname> with a column of type
   <type>text</type> (<structfield>name</structfield>), a
@@ -70,7 +69,7 @@ CREATE TABLE tictactoe (
 
  <para>
   An alternative syntax, which conforms to the SQL standard by using
-  the keyword <literal>ARRAY</>, can be used for one-dimensional arrays.
+  the keyword <literal>ARRAY</literal>, can be used for one-dimensional arrays.
   <structfield>pay_by_quarter</structfield> could have been defined
   as:
 <programlisting>
@@ -80,7 +79,7 @@ CREATE TABLE tictactoe (
 <programlisting>
     pay_by_quarter  integer ARRAY,
 </programlisting>
-  As before, however, <productname>PostgreSQL</> does not enforce the
+  As before, however, <productname>PostgreSQL</productname> does not enforce the
   size restriction in any case.
  </para>
  </sect2>
@@ -108,8 +107,8 @@ CREATE TABLE tictactoe (
    for the type, as recorded in its <literal>pg_type</literal> entry.
    Among the standard data types provided in the
    <productname>PostgreSQL</productname> distribution, all use a comma
-   (<literal>,</>), except for type <type>box</> which uses a semicolon
-   (<literal>;</>). Each <replaceable>val</replaceable> is
+   (<literal>,</literal>), except for type <type>box</type> which uses a semicolon
+   (<literal>;</literal>). Each <replaceable>val</replaceable> is
    either a constant of the array element type, or a subarray. An example
    of an array constant is:
 <programlisting>
@@ -120,16 +119,16 @@ CREATE TABLE tictactoe (
   </para>
 
   <para>
-   To set an element of an array constant to NULL, write <literal>NULL</>
+   To set an element of an array constant to NULL, write <literal>NULL</literal>
    for the element value.  (Any upper- or lower-case variant of
-   <literal>NULL</> will do.)  If you want an actual string value
-   <quote>NULL</>, you must put double quotes around it.
+   <literal>NULL</literal> will do.)  If you want an actual string value
+   <quote>NULL</quote>, you must put double quotes around it.
   </para>
 
   <para>
    (These kinds of array constants are actually only a special case of
    the generic type constants discussed in <xref
-   linkend="sql-syntax-constants-generic">.  The constant is initially
+   linkend="sql-syntax-constants-generic"/>.  The constant is initially
    treated as a string and passed to the array input conversion
    routine.  An explicit type specification might be necessary.)
   </para>
@@ -177,7 +176,7 @@ ERROR:  multidimensional arrays must have array expressions with matching dimens
  </para>
 
  <para>
-  The <literal>ARRAY</> constructor syntax can also be used:
+  The <literal>ARRAY</literal> constructor syntax can also be used:
 <programlisting>
 INSERT INTO sal_emp
     VALUES ('Bill',
@@ -191,9 +190,9 @@ INSERT INTO sal_emp
 </programlisting>
   Notice that the array elements are ordinary SQL constants or
   expressions; for instance, string literals are single quoted, instead of
-  double quoted as they would be in an array literal.  The <literal>ARRAY</>
+  double quoted as they would be in an array literal.  The <literal>ARRAY</literal>
   constructor syntax is discussed in more detail in
-  <xref linkend="sql-syntax-array-constructors">.
+  <xref linkend="sql-syntax-array-constructors"/>.
  </para>
  </sect2>
 
@@ -223,8 +222,8 @@ SELECT name FROM sal_emp WHERE pay_by_quarter[1] &lt;&gt; pay_by_quarter[2];
   The array subscript numbers are written within square brackets.
   By default <productname>PostgreSQL</productname> uses a
   one-based numbering convention for arrays, that is,
-  an array of <replaceable>n</> elements starts with <literal>array[1]</literal> and
-  ends with <literal>array[<replaceable>n</>]</literal>.
+  an array of <replaceable>n</replaceable> elements starts with <literal>array[1]</literal> and
+  ends with <literal>array[<replaceable>n</replaceable>]</literal>.
  </para>
 
  <para>
@@ -260,8 +259,8 @@ SELECT schedule[1:2][1:1] FROM sal_emp WHERE name = 'Bill';
   If any dimension is written as a slice, i.e., contains a colon, then all
   dimensions are treated as slices.  Any dimension that has only a single
   number (no colon) is treated as being from 1
-  to the number specified.  For example, <literal>[2]</> is treated as
-  <literal>[1:2]</>, as in this example:
+  to the number specified.  For example, <literal>[2]</literal> is treated as
+  <literal>[1:2]</literal>, as in this example:
 
 <programlisting>
 SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill';
@@ -273,7 +272,7 @@ SELECT schedule[1:2][2] FROM sal_emp WHERE name = 'Bill';
 </programlisting>
 
   To avoid confusion with the non-slice case, it's best to use slice syntax
-  for all dimensions, e.g., <literal>[1:2][1:1]</>, not <literal>[2][1:1]</>.
+  for all dimensions, e.g., <literal>[1:2][1:1]</literal>, not <literal>[2][1:1]</literal>.
  </para>
 
  <para>
@@ -303,9 +302,9 @@ SELECT schedule[:][1:1] FROM sal_emp WHERE name = 'Bill';
   An array subscript expression will return null if either the array itself or
   any of the subscript expressions are null.  Also, null is returned if a
   subscript is outside the array bounds (this case does not raise an error).
-  For example, if <literal>schedule</>
-  currently has the dimensions <literal>[1:3][1:2]</> then referencing
-  <literal>schedule[3][3]</> yields NULL.  Similarly, an array reference
+  For example, if <literal>schedule</literal>
+  currently has the dimensions <literal>[1:3][1:2]</literal> then referencing
+  <literal>schedule[3][3]</literal> yields NULL.  Similarly, an array reference
   with the wrong number of subscripts yields a null rather than an error.
  </para>
 
@@ -424,16 +423,16 @@ UPDATE sal_emp SET pay_by_quarter[1:2] = '{27000,27000}'
   A stored array value can be enlarged by assigning to elements not already
   present.  Any positions between those previously present and the newly
   assigned elements will be filled with nulls.  For example, if array
-  <literal>myarray</> currently has 4 elements, it will have six
-  elements after an update that assigns to <literal>myarray[6]</>;
-  <literal>myarray[5]</> will contain null.
+  <literal>myarray</literal> currently has 4 elements, it will have six
+  elements after an update that assigns to <literal>myarray[6]</literal>;
+  <literal>myarray[5]</literal> will contain null.
   Currently, enlargement in this fashion is only allowed for one-dimensional
   arrays, not multidimensional arrays.
  </para>
 
  <para>
   Subscripted assignment allows creation of arrays that do not use one-based
-  subscripts.  For example one might assign to <literal>myarray[-2:7]</> to
+  subscripts.  For example one might assign to <literal>myarray[-2:7]</literal> to
   create an array with subscript values from -2 to 7.
  </para>
 
@@ -458,8 +457,8 @@ SELECT ARRAY[5,6] || ARRAY[[1,2],[3,4]];
  <para>
   The concatenation operator allows a single element to be pushed onto the
   beginning or end of a one-dimensional array. It also accepts two
-  <replaceable>N</>-dimensional arrays, or an <replaceable>N</>-dimensional
-  and an <replaceable>N+1</>-dimensional array.
+  <replaceable>N</replaceable>-dimensional arrays, or an <replaceable>N</replaceable>-dimensional
+  and an <replaceable>N+1</replaceable>-dimensional array.
  </para>
 
  <para>
@@ -502,10 +501,10 @@ SELECT array_dims(ARRAY[[1,2],[3,4]] || ARRAY[[5,6],[7,8],[9,0]]);
  </para>
 
  <para>
-  When an <replaceable>N</>-dimensional array is pushed onto the beginning
-  or end of an <replaceable>N+1</>-dimensional array, the result is
-  analogous to the element-array case above. Each <replaceable>N</>-dimensional
-  sub-array is essentially an element of the <replaceable>N+1</>-dimensional
+  When an <replaceable>N</replaceable>-dimensional array is pushed onto the beginning
+  or end of an <replaceable>N+1</replaceable>-dimensional array, the result is
+  analogous to the element-array case above. Each <replaceable>N</replaceable>-dimensional
+  sub-array is essentially an element of the <replaceable>N+1</replaceable>-dimensional
   array's outer dimension. For example:
 <programlisting>
 SELECT array_dims(ARRAY[1,2] || ARRAY[[3,4],[5,6]]);
@@ -588,9 +587,9 @@ SELECT array_append(ARRAY[1, 2], NULL);    -- this might have been meant
   The heuristic it uses to resolve the constant's type is to assume it's of
   the same type as the operator's other input &mdash; in this case,
   integer array.  So the concatenation operator is presumed to
-  represent <function>array_cat</>, not <function>array_append</>.  When
+  represent <function>array_cat</function>, not <function>array_append</function>.  When
   that's the wrong choice, it could be fixed by casting the constant to the
-  array's element type; but explicit use of <function>array_append</> might
+  array's element type; but explicit use of <function>array_append</function> might
   be a preferable solution.
  </para>
  </sect2>
@@ -617,7 +616,7 @@ SELECT * FROM sal_emp WHERE pay_by_quarter[1] = 10000 OR
 
   However, this quickly becomes tedious for large arrays, and is not
   helpful if the size of the array is unknown. An alternative method is
-  described in <xref linkend="functions-comparisons">. The above
+  described in <xref linkend="functions-comparisons"/>. The above
   query could be replaced by:
 
 <programlisting>
@@ -634,7 +633,7 @@ SELECT * FROM sal_emp WHERE 10000 = ALL (pay_by_quarter);
  </para>
 
  <para>
-  Alternatively, the <function>generate_subscripts</> function can be used.
+  Alternatively, the <function>generate_subscripts</function> function can be used.
   For example:
 
 <programlisting>
@@ -645,26 +644,26 @@ SELECT * FROM
  WHERE pay_by_quarter[s] = 10000;
 </programlisting>
 
-  This function is described in <xref linkend="functions-srf-subscripts">.
+  This function is described in <xref linkend="functions-srf-subscripts"/>.
  </para>
 
  <para>
-  You can also search an array using the <literal>&amp;&amp;</> operator,
+  You can also search an array using the <literal>&amp;&amp;</literal> operator,
   which checks whether the left operand overlaps with the right operand.
   For instance:
 
 <programlisting>
-SELECT * FROM sal_emp WHERE pay_by_quarter && ARRAY[10000];
+SELECT * FROM sal_emp WHERE pay_by_quarter &amp;&amp; ARRAY[10000];
 </programlisting>
 
   This and other array operators are further described in
-  <xref linkend="functions-array">.  It can be accelerated by an appropriate
-  index, as described in <xref linkend="indexes-types">.
+  <xref linkend="functions-array"/>.  It can be accelerated by an appropriate
+  index, as described in <xref linkend="indexes-types"/>.
  </para>
 
  <para>
-  You can also search for specific values in an array using the <function>array_position</>
-  and <function>array_positions</> functions. The former returns the subscript of
+  You can also search for specific values in an array using the <function>array_position</function>
+  and <function>array_positions</function> functions. The former returns the subscript of
   the first occurrence of a value in an array; the latter returns an array with the
   subscripts of all occurrences of the value in the array.  For example:
 
@@ -704,13 +703,13 @@ SELECT array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);
    The external text representation of an array value consists of items that
    are interpreted according to the I/O conversion rules for the array's
    element type, plus decoration that indicates the array structure.
-   The decoration consists of curly braces (<literal>{</> and <literal>}</>)
+   The decoration consists of curly braces (<literal>{</literal> and <literal>}</literal>)
    around the array value plus delimiter characters between adjacent items.
-   The delimiter character is usually a comma (<literal>,</>) but can be
-   something else: it is determined by the <literal>typdelim</> setting
+   The delimiter character is usually a comma (<literal>,</literal>) but can be
+   something else: it is determined by the <literal>typdelim</literal> setting
    for the array's element type.  Among the standard data types provided
    in the <productname>PostgreSQL</productname> distribution, all use a comma,
-   except for type <type>box</>, which uses a semicolon (<literal>;</>).
+   except for type <type>box</type>, which uses a semicolon (<literal>;</literal>).
    In a multidimensional array, each dimension (row, plane,
    cube, etc.) gets its own level of curly braces, and delimiters
    must be written between adjacent curly-braced entities of the same level.
@@ -720,7 +719,7 @@ SELECT array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);
    The array output routine will put double quotes around element values
    if they are empty strings, contain curly braces, delimiter characters,
    double quotes, backslashes, or white space, or match the word
-   <literal>NULL</>.  Double quotes and backslashes
+   <literal>NULL</literal>.  Double quotes and backslashes
    embedded in element values will be backslash-escaped.  For numeric
    data types it is safe to assume that double quotes will never appear, but
    for textual data types one should be prepared to cope with either the presence
@@ -732,10 +731,10 @@ SELECT array_positions(ARRAY[1, 4, 3, 1, 3, 4, 2, 1], 1);
    set to one.  To represent arrays with other lower bounds, the array
    subscript ranges can be specified explicitly before writing the
    array contents.
-   This decoration consists of square brackets (<literal>[]</>)
+   This decoration consists of square brackets (<literal>[]</literal>)
    around each array dimension's lower and upper bounds, with
-   a colon (<literal>:</>) delimiter character in between. The
-   array dimension decoration is followed by an equal sign (<literal>=</>).
+   a colon (<literal>:</literal>) delimiter character in between. The
+   array dimension decoration is followed by an equal sign (<literal>=</literal>).
    For example:
 <programlisting>
 SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2
@@ -751,23 +750,23 @@ SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2
   </para>
 
   <para>
-   If the value written for an element is <literal>NULL</> (in any case
+   If the value written for an element is <literal>NULL</literal> (in any case
    variant), the element is taken to be NULL.  The presence of any quotes
    or backslashes disables this and allows the literal string value
-   <quote>NULL</> to be entered.  Also, for backward compatibility with
-   pre-8.2 versions of <productname>PostgreSQL</>, the <xref
-   linkend="guc-array-nulls"> configuration parameter can be turned
-   <literal>off</> to suppress recognition of <literal>NULL</> as a NULL.
+   <quote>NULL</quote> to be entered.  Also, for backward compatibility with
+   pre-8.2 versions of <productname>PostgreSQL</productname>, the <xref
+   linkend="guc-array-nulls"/> configuration parameter can be turned
+   <literal>off</literal> to suppress recognition of <literal>NULL</literal> as a NULL.
   </para>
 
   <para>
    As shown previously, when writing an array value you can use double
-   quotes around any individual array element. You <emphasis>must</> do so
+   quotes around any individual array element. You <emphasis>must</emphasis> do so
    if the element value would otherwise confuse the array-value parser.
    For example, elements containing curly braces, commas (or the data type's
    delimiter character), double quotes, backslashes, or leading or trailing
    whitespace must be double-quoted.  Empty strings and strings matching the
-   word <literal>NULL</> must be quoted, too.  To put a double quote or
+   word <literal>NULL</literal> must be quoted, too.  To put a double quote or
    backslash in a quoted array element value, use escape string syntax
    and precede it with a backslash. Alternatively, you can avoid quotes and use
    backslash-escaping to protect all data characters that would otherwise
@@ -786,29 +785,29 @@ SELECT f1[1][-2][3] AS e1, f1[1][-1][5] AS e2
   <para>
    Remember that what you write in an SQL command will first be interpreted
    as a string literal, and then as an array.  This doubles the number of
-   backslashes you need.  For example, to insert a <type>text</> array
+   backslashes you need.  For example, to insert a <type>text</type> array
    value containing a backslash and a double quote, you'd need to write:
 <programlisting>
 INSERT ... VALUES (E'{"\\\\","\\""}');
 </programlisting>
    The escape string processor removes one level of backslashes, so that
-   what arrives at the array-value parser looks like <literal>{"\\","\""}</>.
-   In turn, the strings fed to the <type>text</> data type's input routine
-   become <literal>\</> and <literal>"</> respectively.  (If we were working
+   what arrives at the array-value parser looks like <literal>{"\\","\""}</literal>.
+   In turn, the strings fed to the <type>text</type> data type's input routine
+   become <literal>\</literal> and <literal>"</literal> respectively.  (If we were working
    with a data type whose input routine also treated backslashes specially,
-   <type>bytea</> for example, we might need as many as eight backslashes
+   <type>bytea</type> for example, we might need as many as eight backslashes
    in the command to get one backslash into the stored array element.)
-   Dollar quoting (see <xref linkend="sql-syntax-dollar-quoting">) can be
+   Dollar quoting (see <xref linkend="sql-syntax-dollar-quoting"/>) can be
    used to avoid the need to double backslashes.
   </para>
  </note>
 
  <tip>
   <para>
-   The <literal>ARRAY</> constructor syntax (see
-   <xref linkend="sql-syntax-array-constructors">) is often easier to work
+   The <literal>ARRAY</literal> constructor syntax (see
+   <xref linkend="sql-syntax-array-constructors"/>) is often easier to work
    with than the array-literal syntax when writing array values in SQL
-   commands. In <literal>ARRAY</>, individual element values are written the
+   commands. In <literal>ARRAY</literal>, individual element values are written the
    same way they would be written when not members of an array.
   </para>
  </tip>
diff --git a/doc/src/sgml/auth-delay.sgml b/doc/src/sgml/auth-delay.sgml
index 9a6e3e9bb4..bd3ef7128d 100644
--- a/doc/src/sgml/auth-delay.sgml
+++ b/doc/src/sgml/auth-delay.sgml
@@ -18,7 +18,7 @@
 
  <para>
   In order to function, this module must be loaded via
-  <xref linkend="guc-shared-preload-libraries"> in <filename>postgresql.conf</>.
+  <xref linkend="guc-shared-preload-libraries"/> in <filename>postgresql.conf</filename>.
  </para>
 
  <sect2>
@@ -29,7 +29,7 @@
     <term>
      <varname>auth_delay.milliseconds</varname> (<type>int</type>)
      <indexterm>
-      <primary><varname>auth_delay.milliseconds</> configuration parameter</primary>
+      <primary><varname>auth_delay.milliseconds</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -42,7 +42,7 @@
   </variablelist>
 
   <para>
-   These parameters must be set in <filename>postgresql.conf</>.
+   These parameters must be set in <filename>postgresql.conf</filename>.
    Typical usage might be:
   </para>
 
diff --git a/doc/src/sgml/auto-explain.sgml b/doc/src/sgml/auto-explain.sgml
index 38e6f50c80..08b67f2600 100644
--- a/doc/src/sgml/auto-explain.sgml
+++ b/doc/src/sgml/auto-explain.sgml
@@ -10,7 +10,7 @@
  <para>
   The <filename>auto_explain</filename> module provides a means for
   logging execution plans of slow statements automatically, without
-  having to run <xref linkend="sql-explain">
+  having to run <xref linkend="sql-explain"/>
   by hand.  This is especially helpful for tracking down un-optimized queries
   in large applications.
  </para>
@@ -24,10 +24,10 @@ LOAD 'auto_explain';
 </programlisting>
 
   (You must be superuser to do that.)  More typical usage is to preload
-  it into some or all sessions by including <literal>auto_explain</> in
-  <xref linkend="guc-session-preload-libraries"> or
-  <xref linkend="guc-shared-preload-libraries"> in
-  <filename>postgresql.conf</>.  Then you can track unexpectedly slow queries
+  it into some or all sessions by including <literal>auto_explain</literal> in
+  <xref linkend="guc-session-preload-libraries"/> or
+  <xref linkend="guc-shared-preload-libraries"/> in
+  <filename>postgresql.conf</filename>.  Then you can track unexpectedly slow queries
   no matter when they happen.  Of course there is a price in overhead for
   that.
  </para>
@@ -47,7 +47,7 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_min_duration</varname> (<type>integer</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_min_duration</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_min_duration</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -66,13 +66,13 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_analyze</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_analyze</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_analyze</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
-      <varname>auto_explain.log_analyze</varname> causes <command>EXPLAIN ANALYZE</>
-      output, rather than just <command>EXPLAIN</> output, to be printed
+      <varname>auto_explain.log_analyze</varname> causes <command>EXPLAIN ANALYZE</command>
+      output, rather than just <command>EXPLAIN</command> output, to be printed
       when an execution plan is logged. This parameter is off by default.
       Only superusers can change this setting.
      </para>
@@ -92,14 +92,14 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_buffers</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_buffers</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_buffers</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
       <varname>auto_explain.log_buffers</varname> controls whether buffer
       usage statistics are printed when an execution plan is logged; it's
-      equivalent to the <literal>BUFFERS</> option of <command>EXPLAIN</>.
+      equivalent to the <literal>BUFFERS</literal> option of <command>EXPLAIN</command>.
       This parameter has no effect
       unless <varname>auto_explain.log_analyze</varname> is enabled.
       This parameter is off by default.
@@ -112,14 +112,14 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_timing</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_timing</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_timing</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
       <varname>auto_explain.log_timing</varname> controls whether per-node
       timing information is printed when an execution plan is logged; it's
-      equivalent to the <literal>TIMING</> option of <command>EXPLAIN</>.
+      equivalent to the <literal>TIMING</literal> option of <command>EXPLAIN</command>.
       The overhead of repeatedly reading the system clock can slow down
       queries significantly on some systems, so it may be useful to set this
       parameter to off when only actual row counts, and not exact times, are
@@ -136,7 +136,7 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_triggers</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_triggers</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_triggers</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -155,14 +155,14 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_verbose</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_verbose</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_verbose</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
       <varname>auto_explain.log_verbose</varname> controls whether verbose
       details are printed when an execution plan is logged; it's
-      equivalent to the <literal>VERBOSE</> option of <command>EXPLAIN</>.
+      equivalent to the <literal>VERBOSE</literal> option of <command>EXPLAIN</command>.
       This parameter is off by default.
       Only superusers can change this setting.
      </para>
@@ -173,13 +173,13 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_format</varname> (<type>enum</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_format</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_format</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
       <varname>auto_explain.log_format</varname> selects the
-      <command>EXPLAIN</> output format to be used.
+      <command>EXPLAIN</command> output format to be used.
       The allowed values are <literal>text</literal>, <literal>xml</literal>,
       <literal>json</literal>, and <literal>yaml</literal>.  The default is text.
       Only superusers can change this setting.
@@ -191,7 +191,7 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.log_nested_statements</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>auto_explain.log_nested_statements</> configuration parameter</primary>
+      <primary><varname>auto_explain.log_nested_statements</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -208,7 +208,7 @@ LOAD 'auto_explain';
     <term>
      <varname>auto_explain.sample_rate</varname> (<type>real</type>)
      <indexterm>
-      <primary><varname>auto_explain.sample_rate</> configuration parameter</primary>
+      <primary><varname>auto_explain.sample_rate</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -224,7 +224,7 @@ LOAD 'auto_explain';
 
   <para>
    In ordinary usage, these parameters are set
-   in <filename>postgresql.conf</>, although superusers can alter them
+   in <filename>postgresql.conf</filename>, although superusers can alter them
    on-the-fly within their own sessions.
    Typical usage might be:
   </para>
diff --git a/doc/src/sgml/backup.sgml b/doc/src/sgml/backup.sgml
index 0e7c6e2051..9d8e69056f 100644
--- a/doc/src/sgml/backup.sgml
+++ b/doc/src/sgml/backup.sgml
@@ -3,10 +3,10 @@
 <chapter id="backup">
  <title>Backup and Restore</title>
 
- <indexterm zone="backup"><primary>backup</></>
+ <indexterm zone="backup"><primary>backup</primary></indexterm>
 
  <para>
-  As with everything that contains valuable data, <productname>PostgreSQL</>
+  As with everything that contains valuable data, <productname>PostgreSQL</productname>
   databases should be backed up regularly. While the procedure is
   essentially simple, it is important to have a clear understanding of
   the underlying techniques and assumptions.
@@ -14,9 +14,9 @@
 
  <para>
   There are three fundamentally different approaches to backing up
-  <productname>PostgreSQL</> data:
+  <productname>PostgreSQL</productname> data:
   <itemizedlist>
-   <listitem><para><acronym>SQL</> dump</para></listitem>
+   <listitem><para><acronym>SQL</acronym> dump</para></listitem>
    <listitem><para>File system level backup</para></listitem>
    <listitem><para>Continuous archiving</para></listitem>
   </itemizedlist>
@@ -25,30 +25,30 @@
  </para>
 
  <sect1 id="backup-dump">
-  <title><acronym>SQL</> Dump</title>
+  <title><acronym>SQL</acronym> Dump</title>
 
   <para>
    The idea behind this dump method is to generate a file with SQL
    commands that, when fed back to the server, will recreate the
    database in the same state as it was at the time of the dump.
-   <productname>PostgreSQL</> provides the utility program
-   <xref linkend="app-pgdump"> for this purpose. The basic usage of this
+   <productname>PostgreSQL</productname> provides the utility program
+   <xref linkend="app-pgdump"/> for this purpose. The basic usage of this
    command is:
 <synopsis>
 pg_dump <replaceable class="parameter">dbname</replaceable> &gt; <replaceable class="parameter">outfile</replaceable>
 </synopsis>
-   As you see, <application>pg_dump</> writes its result to the
+   As you see, <application>pg_dump</application> writes its result to the
    standard output. We will see below how this can be useful.
-   While the above command creates a text file, <application>pg_dump</>
+   While the above command creates a text file, <application>pg_dump</application>
    can create files in other formats that allow for parallelism and more
    fine-grained control of object restoration.
   </para>
 
   <para>
-   <application>pg_dump</> is a regular <productname>PostgreSQL</>
+   <application>pg_dump</application> is a regular <productname>PostgreSQL</productname>
    client application (albeit a particularly clever one). This means
    that you can perform this backup procedure from any remote host that has
-   access to the database. But remember that <application>pg_dump</>
+   access to the database. But remember that <application>pg_dump</application>
    does not operate with special permissions. In particular, it must
    have read access to all tables that you want to back up, so in order
    to back up the entire database you almost always have to run it as a
@@ -60,9 +60,9 @@ pg_dump <replaceable class="parameter">dbname</replaceable> &gt; <replaceable cl
   </para>
 
   <para>
-   To specify which database server <application>pg_dump</> should
+   To specify which database server <application>pg_dump</application> should
    contact, use the command line options <option>-h
-   <replaceable>host</></> and <option>-p <replaceable>port</></>. The
+   <replaceable>host</replaceable></option> and <option>-p <replaceable>port</replaceable></option>. The
    default host is the local host or whatever your
    <envar>PGHOST</envar> environment variable specifies. Similarly,
    the default port is indicated by the <envar>PGPORT</envar>
@@ -72,30 +72,30 @@ pg_dump <replaceable class="parameter">dbname</replaceable> &gt; <replaceable cl
   </para>
 
   <para>
-   Like any other <productname>PostgreSQL</> client application,
-   <application>pg_dump</> will by default connect with the database
+   Like any other <productname>PostgreSQL</productname> client application,
+   <application>pg_dump</application> will by default connect with the database
    user name that is equal to the current operating system user name. To override
    this, either specify the <option>-U</option> option or set the
    environment variable <envar>PGUSER</envar>. Remember that
-   <application>pg_dump</> connections are subject to the normal
+   <application>pg_dump</application> connections are subject to the normal
    client authentication mechanisms (which are described in <xref
-   linkend="client-authentication">).
+   linkend="client-authentication"/>).
   </para>
 
   <para>
-   An important advantage of <application>pg_dump</> over the other backup
-   methods described later is that <application>pg_dump</>'s output can
-   generally be re-loaded into newer versions of <productname>PostgreSQL</>,
+   An important advantage of <application>pg_dump</application> over the other backup
+   methods described later is that <application>pg_dump</application>'s output can
+   generally be re-loaded into newer versions of <productname>PostgreSQL</productname>,
    whereas file-level backups and continuous archiving are both extremely
-   server-version-specific.  <application>pg_dump</> is also the only method
+   server-version-specific.  <application>pg_dump</application> is also the only method
    that will work when transferring a database to a different machine
    architecture, such as going from a 32-bit to a 64-bit server.
   </para>
 
   <para>
-   Dumps created by <application>pg_dump</> are internally consistent,
+   Dumps created by <application>pg_dump</application> are internally consistent,
    meaning, the dump represents a snapshot of the database at the time
-   <application>pg_dump</> began running. <application>pg_dump</> does not
+   <application>pg_dump</application> began running. <application>pg_dump</application> does not
    block other operations on the database while it is working.
    (Exceptions are those operations that need to operate with an
    exclusive lock, such as most forms of <command>ALTER TABLE</command>.)
@@ -105,24 +105,24 @@ pg_dump <replaceable class="parameter">dbname</replaceable> &gt; <replaceable cl
    <title>Restoring the Dump</title>
 
    <para>
-    Text files created by <application>pg_dump</> are intended to
+    Text files created by <application>pg_dump</application> are intended to
     be read in by the <application>psql</application> program. The
     general command form to restore a dump is
 <synopsis>
 psql <replaceable class="parameter">dbname</replaceable> &lt; <replaceable class="parameter">infile</replaceable>
 </synopsis>
     where <replaceable class="parameter">infile</replaceable> is the
-    file output by the <application>pg_dump</> command. The database <replaceable
+    file output by the <application>pg_dump</application> command. The database <replaceable
     class="parameter">dbname</replaceable> will not be created by this
-    command, so you must create it yourself from <literal>template0</>
-    before executing <application>psql</> (e.g., with
+    command, so you must create it yourself from <literal>template0</literal>
+    before executing <application>psql</application> (e.g., with
     <literal>createdb -T template0 <replaceable
-    class="parameter">dbname</></literal>).  <application>psql</>
-    supports options similar to <application>pg_dump</> for specifying
+    class="parameter">dbname</replaceable></literal>).  <application>psql</application>
+    supports options similar to <application>pg_dump</application> for specifying
     the database server to connect to and the user name to use. See
-    the <xref linkend="app-psql"> reference page for more information.
+    the <xref linkend="app-psql"/> reference page for more information.
     Non-text file dumps are restored using the <xref
-    linkend="app-pgrestore"> utility.
+    linkend="app-pgrestore"/> utility.
    </para>
 
    <para>
@@ -134,10 +134,10 @@ psql <replaceable class="parameter">dbname</replaceable> &lt; <replaceable class
    </para>
 
    <para>
-    By default, the <application>psql</> script will continue to
+    By default, the <application>psql</application> script will continue to
     execute after an SQL error is encountered. You might wish to run
     <application>psql</application> with
-    the <literal>ON_ERROR_STOP</> variable set to alter that
+    the <literal>ON_ERROR_STOP</literal> variable set to alter that
     behavior and have <application>psql</application> exit with an
     exit status of 3 if an SQL error occurs:
 <programlisting>
@@ -147,8 +147,8 @@ psql --set ON_ERROR_STOP=on dbname &lt; infile
     Alternatively, you can specify that the whole dump should be
     restored as a single transaction, so the restore is either fully
     completed or fully rolled back. This mode can be specified by
-    passing the <option>-1</> or <option>--single-transaction</>
-    command-line options to <application>psql</>. When using this
+    passing the <option>-1</option> or <option>--single-transaction</option>
+    command-line options to <application>psql</application>. When using this
     mode, be aware that even a minor error can rollback a
     restore that has already run for many hours. However, that might
     still be preferable to manually cleaning up a complex database
@@ -156,79 +156,79 @@ psql --set ON_ERROR_STOP=on dbname &lt; infile
    </para>
 
    <para>
-    The ability of <application>pg_dump</> and <application>psql</> to
+    The ability of <application>pg_dump</application> and <application>psql</application> to
     write to or read from pipes makes it possible to dump a database
     directly from one server to another, for example:
 <programlisting>
-pg_dump -h <replaceable>host1</> <replaceable>dbname</> | psql -h <replaceable>host2</> <replaceable>dbname</>
+pg_dump -h <replaceable>host1</replaceable> <replaceable>dbname</replaceable> | psql -h <replaceable>host2</replaceable> <replaceable>dbname</replaceable>
 </programlisting>
    </para>
 
    <important>
     <para>
-     The dumps produced by <application>pg_dump</> are relative to
-     <literal>template0</>. This means that any languages, procedures,
-     etc. added via <literal>template1</> will also be dumped by
-     <application>pg_dump</>. As a result, when restoring, if you are
-     using a customized <literal>template1</>, you must create the
-     empty database from <literal>template0</>, as in the example
+     The dumps produced by <application>pg_dump</application> are relative to
+     <literal>template0</literal>. This means that any languages, procedures,
+     etc. added via <literal>template1</literal> will also be dumped by
+     <application>pg_dump</application>. As a result, when restoring, if you are
+     using a customized <literal>template1</literal>, you must create the
+     empty database from <literal>template0</literal>, as in the example
      above.
     </para>
    </important>
 
    <para>
     After restoring a backup, it is wise to run <xref
-    linkend="sql-analyze"> on each
+    linkend="sql-analyze"/> on each
     database so the query optimizer has useful statistics;
-    see <xref linkend="vacuum-for-statistics">
-    and <xref linkend="autovacuum"> for more information.
+    see <xref linkend="vacuum-for-statistics"/>
+    and <xref linkend="autovacuum"/> for more information.
     For more advice on how to load large amounts of data
-    into <productname>PostgreSQL</> efficiently, refer to <xref
-    linkend="populate">.
+    into <productname>PostgreSQL</productname> efficiently, refer to <xref
+    linkend="populate"/>.
    </para>
   </sect2>
 
   <sect2 id="backup-dump-all">
-   <title>Using <application>pg_dumpall</></title>
+   <title>Using <application>pg_dumpall</application></title>
 
    <para>
-    <application>pg_dump</> dumps only a single database at a time,
+    <application>pg_dump</application> dumps only a single database at a time,
     and it does not dump information about roles or tablespaces
     (because those are cluster-wide rather than per-database).
     To support convenient dumping of the entire contents of a database
-    cluster, the <xref linkend="app-pg-dumpall"> program is provided.
-    <application>pg_dumpall</> backs up each database in a given
+    cluster, the <xref linkend="app-pg-dumpall"/> program is provided.
+    <application>pg_dumpall</application> backs up each database in a given
     cluster, and also preserves cluster-wide data such as role and
     tablespace definitions. The basic usage of this command is:
 <synopsis>
-pg_dumpall &gt; <replaceable>outfile</>
+pg_dumpall &gt; <replaceable>outfile</replaceable>
 </synopsis>
-    The resulting dump can be restored with <application>psql</>:
+    The resulting dump can be restored with <application>psql</application>:
 <synopsis>
 psql -f <replaceable class="parameter">infile</replaceable> postgres
 </synopsis>
     (Actually, you can specify any existing database name to start from,
-    but if you are loading into an empty cluster then <literal>postgres</>
+    but if you are loading into an empty cluster then <literal>postgres</literal>
     should usually be used.)  It is always necessary to have
-    database superuser access when restoring a <application>pg_dumpall</>
+    database superuser access when restoring a <application>pg_dumpall</application>
     dump, as that is required to restore the role and tablespace information.
     If you use tablespaces, make sure that the tablespace paths in the
     dump are appropriate for the new installation.
    </para>
 
    <para>
-    <application>pg_dumpall</> works by emitting commands to re-create
+    <application>pg_dumpall</application> works by emitting commands to re-create
     roles, tablespaces, and empty databases, then invoking
-    <application>pg_dump</> for each database.  This means that while
+    <application>pg_dump</application> for each database.  This means that while
     each database will be internally consistent, the snapshots of
     different databases are not synchronized.
    </para>
 
    <para>
     Cluster-wide data can be dumped alone using the
-    <application>pg_dumpall</> <option>--globals-only</> option.
+    <application>pg_dumpall</application> <option>--globals-only</option> option.
     This is necessary to fully backup the cluster if running the
-    <application>pg_dump</> command on individual databases.
+    <application>pg_dump</application> command on individual databases.
    </para>
   </sect2>
 
@@ -237,8 +237,8 @@ psql -f <replaceable class="parameter">infile</replaceable> postgres
 
    <para>
     Some operating systems have maximum file size limits that cause
-    problems when creating large <application>pg_dump</> output files.
-    Fortunately, <application>pg_dump</> can write to the standard
+    problems when creating large <application>pg_dump</application> output files.
+    Fortunately, <application>pg_dump</application> can write to the standard
     output, so you can use standard Unix tools to work around this
     potential problem.  There are several possible methods:
    </para>
@@ -268,7 +268,7 @@ cat <replaceable class="parameter">filename</replaceable>.gz | gunzip | psql <re
    </formalpara>
 
    <formalpara>
-    <title>Use <command>split</>.</title>
+    <title>Use <command>split</command>.</title>
     <para>
      The <command>split</command> command
      allows you to split the output into smaller files that are
@@ -288,10 +288,10 @@ cat <replaceable class="parameter">filename</replaceable>* | psql <replaceable c
    </formalpara>
 
    <formalpara>
-    <title>Use <application>pg_dump</>'s custom dump format.</title>
+    <title>Use <application>pg_dump</application>'s custom dump format.</title>
     <para>
      If <productname>PostgreSQL</productname> was built on a system with the
-     <application>zlib</> compression library installed, the custom dump
+     <application>zlib</application> compression library installed, the custom dump
      format will compress data as it writes it to the output file. This will
      produce dump file sizes similar to using <command>gzip</command>, but it
      has the added advantage that tables can be restored selectively. The
@@ -301,25 +301,25 @@ cat <replaceable class="parameter">filename</replaceable>* | psql <replaceable c
 pg_dump -Fc <replaceable class="parameter">dbname</replaceable> &gt; <replaceable class="parameter">filename</replaceable>
 </programlisting>
 
-     A custom-format dump is not a script for <application>psql</>, but
-     instead must be restored with <application>pg_restore</>, for example:
+     A custom-format dump is not a script for <application>psql</application>, but
+     instead must be restored with <application>pg_restore</application>, for example:
 
 <programlisting>
 pg_restore -d <replaceable class="parameter">dbname</replaceable> <replaceable class="parameter">filename</replaceable>
 </programlisting>
 
-     See the <xref linkend="app-pgdump"> and <xref
-     linkend="app-pgrestore"> reference pages for details.
+     See the <xref linkend="app-pgdump"/> and <xref
+     linkend="app-pgrestore"/> reference pages for details.
     </para>
    </formalpara>
 
    <para>
-    For very large databases, you might need to combine <command>split</>
+    For very large databases, you might need to combine <command>split</command>
     with one of the other two approaches.
    </para>
 
    <formalpara>
-    <title>Use <application>pg_dump</>'s parallel dump feature.</title>
+    <title>Use <application>pg_dump</application>'s parallel dump feature.</title>
     <para>
      To speed up the dump of a large database, you can use
      <application>pg_dump</application>'s parallel mode. This will dump
@@ -344,8 +344,8 @@ pg_dump -j <replaceable class="parameter">num</replaceable> -F d -f <replaceable
 
   <para>
    An alternative backup strategy is to directly copy the files that
-   <productname>PostgreSQL</> uses to store the data in the database;
-   <xref linkend="creating-cluster"> explains where these files
+   <productname>PostgreSQL</productname> uses to store the data in the database;
+   <xref linkend="creating-cluster"/> explains where these files
    are located.  You can use whatever method you prefer
    for doing file system backups; for example:
 
@@ -356,20 +356,20 @@ tar -cf backup.tar /usr/local/pgsql/data
 
   <para>
    There are two restrictions, however, which make this method
-   impractical, or at least inferior to the <application>pg_dump</>
+   impractical, or at least inferior to the <application>pg_dump</application>
    method:
 
    <orderedlist>
     <listitem>
      <para>
-      The database server <emphasis>must</> be shut down in order to
+      The database server <emphasis>must</emphasis> be shut down in order to
       get a usable backup. Half-way measures such as disallowing all
       connections will <emphasis>not</emphasis> work
       (in part because <command>tar</command> and similar tools do not take
       an atomic snapshot of the state of the file system,
       but also because of internal buffering within the server).
       Information about stopping the server can be found in
-      <xref linkend="server-shutdown">.  Needless to say, you
+      <xref linkend="server-shutdown"/>.  Needless to say, you
       also need to shut down the server before restoring the data.
      </para>
     </listitem>
@@ -379,7 +379,7 @@ tar -cf backup.tar /usr/local/pgsql/data
       If you have dug into the details of the file system layout of the
       database, you might be tempted to try to back up or restore only certain
       individual tables or databases from their respective files or
-      directories. This will <emphasis>not</> work because the
+      directories. This will <emphasis>not</emphasis> work because the
       information contained in these files is not usable without
       the commit log files,
       <filename>pg_xact/*</filename>, which contain the commit status of
@@ -399,7 +399,7 @@ tar -cf backup.tar /usr/local/pgsql/data
    <quote>consistent snapshot</quote> of the data directory, if the
    file system supports that functionality (and you are willing to
    trust that it is implemented correctly).  The typical procedure is
-   to make a <quote>frozen snapshot</> of the volume containing the
+   to make a <quote>frozen snapshot</quote> of the volume containing the
    database, then copy the whole data directory (not just parts, see
    above) from the snapshot to a backup device, then release the frozen
    snapshot.  This will work even while the database server is running.
@@ -419,7 +419,7 @@ tar -cf backup.tar /usr/local/pgsql/data
    the volumes.  For example, if your data files and WAL log are on different
    disks, or if tablespaces are on different file systems, it might
    not be possible to use snapshot backup because the snapshots
-   <emphasis>must</> be simultaneous.
+   <emphasis>must</emphasis> be simultaneous.
    Read your file system documentation very carefully before trusting
    the consistent-snapshot technique in such situations.
   </para>
@@ -428,20 +428,20 @@ tar -cf backup.tar /usr/local/pgsql/data
    If simultaneous snapshots are not possible, one option is to shut down
    the database server long enough to establish all the frozen snapshots.
    Another option is to perform a continuous archiving base backup (<xref
-   linkend="backup-base-backup">) because such backups are immune to file
+   linkend="backup-base-backup"/>) because such backups are immune to file
    system changes during the backup.  This requires enabling continuous
    archiving just during the backup process; restore is done using
-   continuous archive recovery (<xref linkend="backup-pitr-recovery">).
+   continuous archive recovery (<xref linkend="backup-pitr-recovery"/>).
   </para>
 
   <para>
-   Another option is to use <application>rsync</> to perform a file
-   system backup.  This is done by first running <application>rsync</>
+   Another option is to use <application>rsync</application> to perform a file
+   system backup.  This is done by first running <application>rsync</application>
    while the database server is running, then shutting down the database
-   server long enough to do an <command>rsync --checksum</>.
-   (<option>--checksum</> is necessary because <command>rsync</> only
+   server long enough to do an <command>rsync --checksum</command>.
+   (<option>--checksum</option> is necessary because <command>rsync</command> only
    has file modification-time granularity of one second.)  The
-   second <application>rsync</> will be quicker than the first,
+   second <application>rsync</application> will be quicker than the first,
    because it has relatively little data to transfer, and the end result
    will be consistent because the server was down.  This method
    allows a file system backup to be performed with minimal downtime.
@@ -471,12 +471,12 @@ tar -cf backup.tar /usr/local/pgsql/data
   </indexterm>
 
   <para>
-   At all times, <productname>PostgreSQL</> maintains a
-   <firstterm>write ahead log</> (WAL) in the <filename>pg_wal/</>
+   At all times, <productname>PostgreSQL</productname> maintains a
+   <firstterm>write ahead log</firstterm> (WAL) in the <filename>pg_wal/</filename>
    subdirectory of the cluster's data directory. The log records
    every change made to the database's data files.  This log exists
    primarily for crash-safety purposes: if the system crashes, the
-   database can be restored to consistency by <quote>replaying</> the
+   database can be restored to consistency by <quote>replaying</quote> the
    log entries made since the last checkpoint.  However, the existence
    of the log makes it possible to use a third strategy for backing up
    databases: we can combine a file-system-level backup with backup of
@@ -492,7 +492,7 @@ tar -cf backup.tar /usr/local/pgsql/data
      Any internal inconsistency in the backup will be corrected by log
      replay (this is not significantly different from what happens during
      crash recovery).  So we do not need a file system snapshot capability,
-     just <application>tar</> or a similar archiving tool.
+     just <application>tar</application> or a similar archiving tool.
     </para>
    </listitem>
    <listitem>
@@ -508,7 +508,7 @@ tar -cf backup.tar /usr/local/pgsql/data
      It is not necessary to replay the WAL entries all the
      way to the end.  We could stop the replay at any point and have a
      consistent snapshot of the database as it was at that time.  Thus,
-     this technique supports <firstterm>point-in-time recovery</>: it is
+     this technique supports <firstterm>point-in-time recovery</firstterm>: it is
      possible to restore the database to its state at any time since your base
      backup was taken.
     </para>
@@ -517,7 +517,7 @@ tar -cf backup.tar /usr/local/pgsql/data
     <para>
      If we continuously feed the series of WAL files to another
      machine that has been loaded with the same base backup file, we
-     have a <firstterm>warm standby</> system: at any point we can bring up
+     have a <firstterm>warm standby</firstterm> system: at any point we can bring up
      the second machine and it will have a nearly-current copy of the
      database.
     </para>
@@ -530,7 +530,7 @@ tar -cf backup.tar /usr/local/pgsql/data
     <application>pg_dump</application> and
     <application>pg_dumpall</application> do not produce file-system-level
     backups and cannot be used as part of a continuous-archiving solution.
-    Such dumps are <emphasis>logical</> and do not contain enough
+    Such dumps are <emphasis>logical</emphasis> and do not contain enough
     information to be used by WAL replay.
    </para>
   </note>
@@ -546,10 +546,10 @@ tar -cf backup.tar /usr/local/pgsql/data
 
   <para>
    To recover successfully using continuous archiving (also called
-   <quote>online backup</> by many database vendors), you need a continuous
+   <quote>online backup</quote> by many database vendors), you need a continuous
    sequence of archived WAL files that extends back at least as far as the
    start time of your backup.  So to get started, you should set up and test
-   your procedure for archiving WAL files <emphasis>before</> you take your
+   your procedure for archiving WAL files <emphasis>before</emphasis> you take your
    first base backup.  Accordingly, we first discuss the mechanics of
    archiving WAL files.
   </para>
@@ -558,17 +558,17 @@ tar -cf backup.tar /usr/local/pgsql/data
    <title>Setting Up WAL Archiving</title>
 
    <para>
-    In an abstract sense, a running <productname>PostgreSQL</> system
+    In an abstract sense, a running <productname>PostgreSQL</productname> system
     produces an indefinitely long sequence of WAL records.  The system
     physically divides this sequence into WAL <firstterm>segment
-    files</>, which are normally 16MB apiece (although the segment size
-    can be altered when building <productname>PostgreSQL</>).  The segment
+    files</firstterm>, which are normally 16MB apiece (although the segment size
+    can be altered during <application>initdb</application>).  The segment
     files are given numeric names that reflect their position in the
     abstract WAL sequence.  When not using WAL archiving, the system
     normally creates just a few segment files and then
-    <quote>recycles</> them by renaming no-longer-needed segment files
+    <quote>recycles</quote> them by renaming no-longer-needed segment files
     to higher segment numbers.  It's assumed that segment files whose
-    contents precede the checkpoint-before-last are no longer of
+    contents precede the last checkpoint are no longer of
     interest and can be recycled.
    </para>
 
@@ -577,33 +577,33 @@ tar -cf backup.tar /usr/local/pgsql/data
     file once it is filled, and save that data somewhere before the segment
     file is recycled for reuse.  Depending on the application and the
     available hardware, there could be many different ways of <quote>saving
-    the data somewhere</>: we could copy the segment files to an NFS-mounted
+    the data somewhere</quote>: we could copy the segment files to an NFS-mounted
     directory on another machine, write them onto a tape drive (ensuring that
     you have a way of identifying the original name of each file), or batch
     them together and burn them onto CDs, or something else entirely.  To
     provide the database administrator with flexibility,
-    <productname>PostgreSQL</> tries not to make any assumptions about how
-    the archiving will be done.  Instead, <productname>PostgreSQL</> lets
+    <productname>PostgreSQL</productname> tries not to make any assumptions about how
+    the archiving will be done.  Instead, <productname>PostgreSQL</productname> lets
     the administrator specify a shell command to be executed to copy a
     completed segment file to wherever it needs to go.  The command could be
-    as simple as a <literal>cp</>, or it could invoke a complex shell
+    as simple as a <literal>cp</literal>, or it could invoke a complex shell
     script &mdash; it's all up to you.
    </para>
 
    <para>
-    To enable WAL archiving, set the <xref linkend="guc-wal-level">
-    configuration parameter to <literal>replica</> or higher,
-    <xref linkend="guc-archive-mode"> to <literal>on</>,
+    To enable WAL archiving, set the <xref linkend="guc-wal-level"/>
+    configuration parameter to <literal>replica</literal> or higher,
+    <xref linkend="guc-archive-mode"/> to <literal>on</literal>,
     and specify the shell command to use in the <xref
-    linkend="guc-archive-command"> configuration parameter.  In practice
+    linkend="guc-archive-command"/> configuration parameter.  In practice
     these settings will always be placed in the
     <filename>postgresql.conf</filename> file.
-    In <varname>archive_command</>,
-    <literal>%p</> is replaced by the path name of the file to
-    archive, while <literal>%f</> is replaced by only the file name.
+    In <varname>archive_command</varname>,
+    <literal>%p</literal> is replaced by the path name of the file to
+    archive, while <literal>%f</literal> is replaced by only the file name.
     (The path name is relative to the current working directory,
     i.e., the cluster's data directory.)
-    Use <literal>%%</> if you need to embed an actual <literal>%</>
+    Use <literal>%%</literal> if you need to embed an actual <literal>%</literal>
     character in the command.  The simplest useful command is something
     like:
 <programlisting>
@@ -611,9 +611,9 @@ archive_command = 'test ! -f /mnt/server/archivedir/%f &amp;&amp; cp %p /mnt/ser
 archive_command = 'copy "%p" "C:\\server\\archivedir\\%f"'  # Windows
 </programlisting>
     which will copy archivable WAL segments to the directory
-    <filename>/mnt/server/archivedir</>.  (This is an example, not a
+    <filename>/mnt/server/archivedir</filename>.  (This is an example, not a
     recommendation, and might not work on all platforms.)  After the
-    <literal>%p</> and <literal>%f</> parameters have been replaced,
+    <literal>%p</literal> and <literal>%f</literal> parameters have been replaced,
     the actual command executed might look like this:
 <programlisting>
 test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/00000001000000A900000065 /mnt/server/archivedir/00000001000000A900000065
@@ -623,7 +623,7 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
 
    <para>
     The archive command will be executed under the ownership of the same
-    user that the <productname>PostgreSQL</> server is running as.  Since
+    user that the <productname>PostgreSQL</productname> server is running as.  Since
     the series of WAL files being archived contains effectively everything
     in your database, you will want to be sure that the archived data is
     protected from prying eyes; for example, archive into a directory that
@@ -633,9 +633,9 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
    <para>
     It is important that the archive command return zero exit status if and
     only if it succeeds.  Upon getting a zero result,
-    <productname>PostgreSQL</> will assume that the file has been
+    <productname>PostgreSQL</productname> will assume that the file has been
     successfully archived, and will remove or recycle it.  However, a nonzero
-    status tells <productname>PostgreSQL</> that the file was not archived;
+    status tells <productname>PostgreSQL</productname> that the file was not archived;
     it will try again periodically until it succeeds.
    </para>
 
@@ -650,14 +650,14 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
    <para>
     It is advisable to test your proposed archive command to ensure that it
     indeed does not overwrite an existing file, <emphasis>and that it returns
-    nonzero status in this case</>.
+    nonzero status in this case</emphasis>.
     The example command above for Unix ensures this by including a separate
-    <command>test</> step.  On some Unix platforms, <command>cp</> has
-    switches such as <option>-i</> that can be used to do the same thing
+    <command>test</command> step.  On some Unix platforms, <command>cp</command> has
+    switches such as <option>-i</option> that can be used to do the same thing
     less verbosely, but you should not rely on these without verifying that
-    the right exit status is returned.  (In particular, GNU <command>cp</>
-    will return status zero when <option>-i</> is used and the target file
-    already exists, which is <emphasis>not</> the desired behavior.)
+    the right exit status is returned.  (In particular, GNU <command>cp</command>
+    will return status zero when <option>-i</option> is used and the target file
+    already exists, which is <emphasis>not</emphasis> the desired behavior.)
    </para>
 
    <para>
@@ -668,10 +668,10 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
     fills, nothing further can be archived until the tape is swapped.
     You should ensure that any error condition or request to a human operator
     is reported appropriately so that the situation can be
-    resolved reasonably quickly. The <filename>pg_wal/</> directory will
+    resolved reasonably quickly. The <filename>pg_wal/</filename> directory will
     continue to fill with WAL segment files until the situation is resolved.
-    (If the file system containing <filename>pg_wal/</> fills up,
-    <productname>PostgreSQL</> will do a PANIC shutdown.  No committed
+    (If the file system containing <filename>pg_wal/</filename> fills up,
+    <productname>PostgreSQL</productname> will do a PANIC shutdown.  No committed
     transactions will be lost, but the database will remain offline until
     you free some space.)
    </para>
@@ -682,7 +682,7 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
     operation continues even if the archiving process falls a little behind.
     If archiving falls significantly behind, this will increase the amount of
     data that would be lost in the event of a disaster. It will also mean that
-    the <filename>pg_wal/</> directory will contain large numbers of
+    the <filename>pg_wal/</filename> directory will contain large numbers of
     not-yet-archived segment files, which could eventually exceed available
     disk space. You are advised to monitor the archiving process to ensure that
     it is working as you intend.
@@ -692,20 +692,20 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
     In writing your archive command, you should assume that the file names to
     be archived can be up to 64 characters long and can contain any
     combination of ASCII letters, digits, and dots.  It is not necessary to
-    preserve the original relative path (<literal>%p</>) but it is necessary to
-    preserve the file name (<literal>%f</>).
+    preserve the original relative path (<literal>%p</literal>) but it is necessary to
+    preserve the file name (<literal>%f</literal>).
    </para>
 
    <para>
     Note that although WAL archiving will allow you to restore any
-    modifications made to the data in your <productname>PostgreSQL</> database,
+    modifications made to the data in your <productname>PostgreSQL</productname> database,
     it will not restore changes made to configuration files (that is,
-    <filename>postgresql.conf</>, <filename>pg_hba.conf</> and
-    <filename>pg_ident.conf</>), since those are edited manually rather
+    <filename>postgresql.conf</filename>, <filename>pg_hba.conf</filename> and
+    <filename>pg_ident.conf</filename>), since those are edited manually rather
     than through SQL operations.
     You might wish to keep the configuration files in a location that will
     be backed up by your regular file system backup procedures.  See
-    <xref linkend="runtime-config-file-locations"> for how to relocate the
+    <xref linkend="runtime-config-file-locations"/> for how to relocate the
     configuration files.
    </para>
 
@@ -715,36 +715,36 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
     where it does so), there could be a long delay between the completion
     of a transaction and its safe recording in archive storage.  To put
     a limit on how old unarchived data can be, you can set
-    <xref linkend="guc-archive-timeout"> to force the server to switch
+    <xref linkend="guc-archive-timeout"/> to force the server to switch
     to a new WAL segment file at least that often.  Note that archived
     files that are archived early due to a forced switch are still the same
     length as completely full files.  It is therefore unwise to set a very
-    short <varname>archive_timeout</> &mdash; it will bloat your archive
-    storage.  <varname>archive_timeout</> settings of a minute or so are
+    short <varname>archive_timeout</varname> &mdash; it will bloat your archive
+    storage.  <varname>archive_timeout</varname> settings of a minute or so are
     usually reasonable.
    </para>
 
    <para>
     Also, you can force a segment switch manually with
-    <function>pg_switch_wal</> if you want to ensure that a
+    <function>pg_switch_wal</function> if you want to ensure that a
     just-finished transaction is archived as soon as possible.  Other utility
     functions related to WAL management are listed in <xref
-    linkend="functions-admin-backup-table">.
+    linkend="functions-admin-backup-table"/>.
    </para>
 
    <para>
-    When <varname>wal_level</> is <literal>minimal</> some SQL commands
+    When <varname>wal_level</varname> is <literal>minimal</literal> some SQL commands
     are optimized to avoid WAL logging, as described in <xref
-    linkend="populate-pitr">.  If archiving or streaming replication were
+    linkend="populate-pitr"/>.  If archiving or streaming replication were
     turned on during execution of one of these statements, WAL would not
     contain enough information for archive recovery.  (Crash recovery is
-    unaffected.)  For this reason, <varname>wal_level</> can only be changed at
-    server start.  However, <varname>archive_command</> can be changed with a
+    unaffected.)  For this reason, <varname>wal_level</varname> can only be changed at
+    server start.  However, <varname>archive_command</varname> can be changed with a
     configuration file reload.  If you wish to temporarily stop archiving,
-    one way to do it is to set <varname>archive_command</> to the empty
-    string (<literal>''</>).
-    This will cause WAL files to accumulate in <filename>pg_wal/</> until a
-    working <varname>archive_command</> is re-established.
+    one way to do it is to set <varname>archive_command</varname> to the empty
+    string (<literal>''</literal>).
+    This will cause WAL files to accumulate in <filename>pg_wal/</filename> until a
+    working <varname>archive_command</varname> is re-established.
    </para>
   </sect2>
 
@@ -753,18 +753,18 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
 
    <para>
     The easiest way to perform a base backup is to use the
-    <xref linkend="app-pgbasebackup"> tool. It can create
+    <xref linkend="app-pgbasebackup"/> tool. It can create
     a base backup either as regular files or as a tar archive. If more
-    flexibility than <xref linkend="app-pgbasebackup"> can provide is
+    flexibility than <xref linkend="app-pgbasebackup"/> can provide is
     required, you can also make a base backup using the low level API
-    (see <xref linkend="backup-lowlevel-base-backup">).
+    (see <xref linkend="backup-lowlevel-base-backup"/>).
    </para>
 
    <para>
     It is not necessary to be concerned about the amount of time it takes
     to make a base backup. However, if you normally run the
-    server with <varname>full_page_writes</> disabled, you might notice a drop
-    in performance while the backup runs since <varname>full_page_writes</> is
+    server with <varname>full_page_writes</varname> disabled, you might notice a drop
+    in performance while the backup runs since <varname>full_page_writes</varname> is
     effectively forced on during backup mode.
    </para>
 
@@ -772,13 +772,13 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
     To make use of the backup, you will need to keep all the WAL
     segment files generated during and after the file system backup.
     To aid you in doing this, the base backup process
-    creates a <firstterm>backup history file</> that is immediately
+    creates a <firstterm>backup history file</firstterm> that is immediately
     stored into the WAL archive area. This file is named after the first
     WAL segment file that you need for the file system backup.
     For example, if the starting WAL file is
-    <literal>0000000100001234000055CD</> the backup history file will be
+    <literal>0000000100001234000055CD</literal> the backup history file will be
     named something like
-    <literal>0000000100001234000055CD.007C9330.backup</>. (The second
+    <literal>0000000100001234000055CD.007C9330.backup</literal>. (The second
     part of the file name stands for an exact position within the WAL
     file, and can ordinarily be ignored.) Once you have safely archived
     the file system backup and the WAL segment files used during the
@@ -791,7 +791,7 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
 
    <para>
     The backup history file is just a small text file. It contains the
-    label string you gave to <xref linkend="app-pgbasebackup">, as well as
+    label string you gave to <xref linkend="app-pgbasebackup"/>, as well as
     the starting and ending times and WAL segments of the backup.
     If you used the label to identify the associated dump file,
     then the archived history file is enough to tell you which dump file to
@@ -814,7 +814,7 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
    <para>
     The procedure for making a base backup using the low level
     APIs contains a few more steps than
-    the <xref linkend="app-pgbasebackup"> method, but is relatively
+    the <xref linkend="app-pgbasebackup"/> method, but is relatively
     simple. It is very important that these steps are executed in
     sequence, and that the success of a step is verified before
     proceeding to the next step.
@@ -830,7 +830,7 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
      A non-exclusive low level backup is one that allows other
      concurrent backups to be running (both those started using
      the same backup API and those started using
-     <xref linkend="app-pgbasebackup">).
+     <xref linkend="app-pgbasebackup"/>).
     </para>
     <para>
   <orderedlist>
@@ -847,39 +847,39 @@ test ! -f /mnt/server/archivedir/00000001000000A900000065 &amp;&amp; cp pg_wal/0
 <programlisting>
 SELECT pg_start_backup('label', false, false);
 </programlisting>
-     where <literal>label</> is any string you want to use to uniquely
+     where <literal>label</literal> is any string you want to use to uniquely
      identify this backup operation. The connection
-     calling <function>pg_start_backup</> must be maintained until the end of
+     calling <function>pg_start_backup</function> must be maintained until the end of
      the backup, or the backup will be automatically aborted.
     </para>
 
     <para>
-     By default, <function>pg_start_backup</> can take a long time to finish.
+     By default, <function>pg_start_backup</function> can take a long time to finish.
      This is because it performs a checkpoint, and the I/O
      required for the checkpoint will be spread out over a significant
      period of time, by default half your inter-checkpoint interval
      (see the configuration parameter
-     <xref linkend="guc-checkpoint-completion-target">).  This is
+     <xref linkend="guc-checkpoint-completion-target"/>).  This is
      usually what you want, because it minimizes the impact on query
      processing.  If you want to start the backup as soon as
-     possible, change the second parameter to <literal>true</>, which will
+     possible, change the second parameter to <literal>true</literal>, which will
      issue an immediate checkpoint using as much I/O as available.
     </para>
 
     <para>
-     The third parameter being <literal>false</> tells
-     <function>pg_start_backup</> to initiate a non-exclusive base backup.
+     The third parameter being <literal>false</literal> tells
+     <function>pg_start_backup</function> to initiate a non-exclusive base backup.
     </para>
    </listitem>
    <listitem>
     <para>
      Perform the backup, using any convenient file-system-backup tool
-     such as <application>tar</> or <application>cpio</> (not
+     such as <application>tar</application> or <application>cpio</application> (not
      <application>pg_dump</application> or
      <application>pg_dumpall</application>).  It is neither
      necessary nor desirable to stop normal operation of the database
      while you do this. See
-     <xref linkend="backup-lowlevel-base-backup-data"> for things to
+     <xref linkend="backup-lowlevel-base-backup-data"/> for things to
      consider during this backup.
     </para>
    </listitem>
@@ -889,47 +889,54 @@ SELECT pg_start_backup('label', false, false);
 <programlisting>
 SELECT * FROM pg_stop_backup(false, true);
 </programlisting>
-     This terminates the backup mode and performs an automatic switch to
-     the next WAL segment.  The reason for the switch is to arrange for
+     This terminates backup mode. On a primary, it also performs an automatic
+     switch to the next WAL segment.  On a standby, it is not possible to
+     automatically switch WAL segments, so you may wish to run
+     <function>pg_switch_wal</function> on the primary to perform a manual
+     switch. The reason for the switch is to arrange for
      the last WAL segment file written during the backup interval to be
      ready to archive.
     </para>
     <para>
-     The <function>pg_stop_backup</> will return one row with three
+     The <function>pg_stop_backup</function> will return one row with three
      values. The second of these fields should be written to a file named
-     <filename>backup_label</> in the root directory of the backup. The
+     <filename>backup_label</filename> in the root directory of the backup. The
      third field should be written to a file named
-     <filename>tablespace_map</> unless the field is empty. These files are
+     <filename>tablespace_map</filename> unless the field is empty. These files are
      vital to the backup working, and must be written without modification.
     </para>
    </listitem>
    <listitem>
     <para>
      Once the WAL segment files active during the backup are archived, you are
-     done.  The file identified by <function>pg_stop_backup</>'s first return
+     done.  The file identified by <function>pg_stop_backup</function>'s first return
      value is the last segment that is required to form a complete set of
-     backup files.  If <varname>archive_mode</> is enabled,
-     <function>pg_stop_backup</> does not return until the last segment has
+     backup files.  On a primary, if <varname>archive_mode</varname> is enabled and the
+     <literal>wait_for_archive</literal> parameter is <literal>true</literal>,
+     <function>pg_stop_backup</function> does not return until the last segment has
      been archived.
+     On a standby, <varname>archive_mode</varname> must be <literal>always</literal> in order
+     for <function>pg_stop_backup</function> to wait.
      Archiving of these files happens automatically since you have
-     already configured <varname>archive_command</>. In most cases this
+     already configured <varname>archive_command</varname>. In most cases this
      happens quickly, but you are advised to monitor your archive
      system to ensure there are no delays.
      If the archive process has fallen behind
      because of failures of the archive command, it will keep retrying
      until the archive succeeds and the backup is complete.
      If you wish to place a time limit on the execution of
-     <function>pg_stop_backup</>, set an appropriate
+     <function>pg_stop_backup</function>, set an appropriate
      <varname>statement_timeout</varname> value, but make note that if
-     <function>pg_stop_backup</> terminates because of this your backup
+     <function>pg_stop_backup</function> terminates because of this your backup
      may not be valid.
     </para>
     <para>
      If the backup process monitors and ensures that all WAL segment files
-     required for the backup are successfully archived then the second
-     parameter (which defaults to true) can be set to false to have
-     <function>pg_stop_backup</> return as soon as the stop backup record is
-     written to the WAL.  By default, <function>pg_stop_backup</> will wait
+     required for the backup are successfully archived then the
+     <literal>wait_for_archive</literal> parameter (which defaults to true) can be set
+     to false to have
+     <function>pg_stop_backup</function> return as soon as the stop backup record is
+     written to the WAL.  By default, <function>pg_stop_backup</function> will wait
      until all WAL has been archived, which can take some time.  This option
      must be used with caution: if WAL archiving is not monitored correctly
      then the backup might not include all of the WAL files and will
@@ -943,9 +950,9 @@ SELECT * FROM pg_stop_backup(false, true);
     <title>Making an exclusive low level backup</title>
     <para>
      The process for an exclusive backup is mostly the same as for a
-     non-exclusive one, but it differs in a few key steps. It does not allow
-     more than one concurrent backup to run, and there can be some issues on
-     the server if it crashes during the backup. Prior to PostgreSQL 9.6, this
+     non-exclusive one, but it differs in a few key steps. This type of backup
+     can only be taken on a primary and does not allow concurrent backups.
+     Prior to <productname>PostgreSQL</productname> 9.6, this
      was the only low-level method available, but it is now recommended that
      all users upgrade their scripts to use non-exclusive backups if possible.
     </para>
@@ -964,25 +971,25 @@ SELECT * FROM pg_stop_backup(false, true);
 <programlisting>
 SELECT pg_start_backup('label');
 </programlisting>
-     where <literal>label</> is any string you want to use to uniquely
+     where <literal>label</literal> is any string you want to use to uniquely
      identify this backup operation.
-     <function>pg_start_backup</> creates a <firstterm>backup label</> file,
-     called <filename>backup_label</>, in the cluster directory with
+     <function>pg_start_backup</function> creates a <firstterm>backup label</firstterm> file,
+     called <filename>backup_label</filename>, in the cluster directory with
      information about your backup, including the start time and label string.
-     The function also creates a <firstterm>tablespace map</> file,
-     called <filename>tablespace_map</>, in the cluster directory with
-     information about tablespace symbolic links in <filename>pg_tblspc/</> if
+     The function also creates a <firstterm>tablespace map</firstterm> file,
+     called <filename>tablespace_map</filename>, in the cluster directory with
+     information about tablespace symbolic links in <filename>pg_tblspc/</filename> if
      one or more such link is present.  Both files are critical to the
      integrity of the backup, should you need to restore from it.
     </para>
 
     <para>
-     By default, <function>pg_start_backup</> can take a long time to finish.
+     By default, <function>pg_start_backup</function> can take a long time to finish.
      This is because it performs a checkpoint, and the I/O
      required for the checkpoint will be spread out over a significant
      period of time, by default half your inter-checkpoint interval
      (see the configuration parameter
-     <xref linkend="guc-checkpoint-completion-target">).  This is
+     <xref linkend="guc-checkpoint-completion-target"/>).  This is
      usually what you want, because it minimizes the impact on query
      processing.  If you want to start the backup as soon as
      possible, use:
@@ -995,14 +1002,19 @@ SELECT pg_start_backup('label', true);
    <listitem>
     <para>
      Perform the backup, using any convenient file-system-backup tool
-     such as <application>tar</> or <application>cpio</> (not
+     such as <application>tar</application> or <application>cpio</application> (not
      <application>pg_dump</application> or
      <application>pg_dumpall</application>).  It is neither
      necessary nor desirable to stop normal operation of the database
      while you do this. See
-     <xref linkend="backup-lowlevel-base-backup-data"> for things to
+     <xref linkend="backup-lowlevel-base-backup-data"/> for things to
      consider during this backup.
     </para>
+    <para>
+      Note that if the server crashes during the backup it may not be
+      possible to restart until the <literal>backup_label</literal> file has been
+      manually deleted from the <envar>PGDATA</envar> directory.
+    </para>
    </listitem>
    <listitem>
     <para>
@@ -1012,36 +1024,31 @@ SELECT pg_start_backup('label', true);
 <programlisting>
 SELECT pg_stop_backup();
 </programlisting>
-     This function, when called on a primary, terminates the backup mode and
+     This function terminates backup mode and
      performs an automatic switch to the next WAL segment. The reason for the
      switch is to arrange for the last WAL segment written during the backup
-     interval to be ready to archive.  When called on a standby, this function
-     only terminates backup mode.  A subsequent WAL segment switch will be
-     needed in order to ensure that all WAL files needed to restore the backup
-     can be archived; if the primary does not have sufficient write activity
-     to trigger one, <function>pg_switch_wal</function> should be executed on
-     the primary.
+     interval to be ready to archive.
     </para>
    </listitem>
    <listitem>
     <para>
      Once the WAL segment files active during the backup are archived, you are
-     done.  The file identified by <function>pg_stop_backup</>'s result is
+     done.  The file identified by <function>pg_stop_backup</function>'s result is
      the last segment that is required to form a complete set of backup files.
-     If <varname>archive_mode</> is enabled,
-     <function>pg_stop_backup</> does not return until the last segment has
+     If <varname>archive_mode</varname> is enabled,
+     <function>pg_stop_backup</function> does not return until the last segment has
      been archived.
      Archiving of these files happens automatically since you have
-     already configured <varname>archive_command</>. In most cases this
+     already configured <varname>archive_command</varname>. In most cases this
      happens quickly, but you are advised to monitor your archive
      system to ensure there are no delays.
      If the archive process has fallen behind
      because of failures of the archive command, it will keep retrying
      until the archive succeeds and the backup is complete.
      If you wish to place a time limit on the execution of
-     <function>pg_stop_backup</>, set an appropriate
+     <function>pg_stop_backup</function>, set an appropriate
      <varname>statement_timeout</varname> value, but make note that if
-     <function>pg_stop_backup</> terminates because of this your backup
+     <function>pg_stop_backup</function> terminates because of this your backup
      may not be valid.
     </para>
    </listitem>
@@ -1056,21 +1063,21 @@ SELECT pg_stop_backup();
     When taking a base backup of an active database, this situation is normal
     and not an error.  However, you need to ensure that you can distinguish
     complaints of this sort from real errors.  For example, some versions
-    of <application>rsync</> return a separate exit code for
-    <quote>vanished source files</>, and you can write a driver script to
+    of <application>rsync</application> return a separate exit code for
+    <quote>vanished source files</quote>, and you can write a driver script to
     accept this exit code as a non-error case.  Also, some versions of
-    GNU <application>tar</> return an error code indistinguishable from
-    a fatal error if a file was truncated while <application>tar</> was
-    copying it.  Fortunately, GNU <application>tar</> versions 1.16 and
+    GNU <application>tar</application> return an error code indistinguishable from
+    a fatal error if a file was truncated while <application>tar</application> was
+    copying it.  Fortunately, GNU <application>tar</application> versions 1.16 and
     later exit with 1 if a file was changed during the backup,
-    and 2 for other errors.  With GNU <application>tar</> version 1.23 and
+    and 2 for other errors.  With GNU <application>tar</application> version 1.23 and
     later, you can use the warning options <literal>--warning=no-file-changed
     --warning=no-file-removed</literal> to hide the related warning messages.
    </para>
 
    <para>
     Be certain that your backup includes all of the files under
-    the database cluster directory (e.g., <filename>/usr/local/pgsql/data</>).
+    the database cluster directory (e.g., <filename>/usr/local/pgsql/data</filename>).
     If you are using tablespaces that do not reside underneath this directory,
     be careful to include them as well (and be sure that your backup
     archives symbolic links as links, otherwise the restore will corrupt
@@ -1079,21 +1086,21 @@ SELECT pg_stop_backup();
 
    <para>
     You should, however, omit from the backup the files within the
-    cluster's <filename>pg_wal/</> subdirectory.  This
+    cluster's <filename>pg_wal/</filename> subdirectory.  This
     slight adjustment is worthwhile because it reduces the risk
     of mistakes when restoring.  This is easy to arrange if
-    <filename>pg_wal/</> is a symbolic link pointing to someplace outside
+    <filename>pg_wal/</filename> is a symbolic link pointing to someplace outside
     the cluster directory, which is a common setup anyway for performance
-    reasons.  You might also want to exclude <filename>postmaster.pid</>
-    and <filename>postmaster.opts</>, which record information
-    about the running <application>postmaster</>, not about the
-    <application>postmaster</> which will eventually use this backup.
-    (These files can confuse <application>pg_ctl</>.)
+    reasons.  You might also want to exclude <filename>postmaster.pid</filename>
+    and <filename>postmaster.opts</filename>, which record information
+    about the running <application>postmaster</application>, not about the
+    <application>postmaster</application> which will eventually use this backup.
+    (These files can confuse <application>pg_ctl</application>.)
    </para>
 
    <para>
     It is often a good idea to also omit from the backup the files
-    within the cluster's <filename>pg_replslot/</> directory, so that
+    within the cluster's <filename>pg_replslot/</filename> directory, so that
     replication slots that exist on the master do not become part of the
     backup.  Otherwise, the subsequent use of the backup to create a standby
     may result in indefinite retention of WAL files on the standby, and
@@ -1107,12 +1114,12 @@ SELECT pg_stop_backup();
    </para>
 
    <para>
-    The contents of the directories <filename>pg_dynshmem/</>,
-    <filename>pg_notify/</>, <filename>pg_serial/</>,
-    <filename>pg_snapshots/</>, <filename>pg_stat_tmp/</>,
-    and <filename>pg_subtrans/</> (but not the directories themselves) can be
+    The contents of the directories <filename>pg_dynshmem/</filename>,
+    <filename>pg_notify/</filename>, <filename>pg_serial/</filename>,
+    <filename>pg_snapshots/</filename>, <filename>pg_stat_tmp/</filename>,
+    and <filename>pg_subtrans/</filename> (but not the directories themselves) can be
     omitted from the backup as they will be initialized on postmaster startup.
-    If <xref linkend="guc-stats-temp-directory"> is set and is under the data
+    If <xref linkend="guc-stats-temp-directory"/> is set and is under the data
     directory then the contents of that directory can also be omitted.
    </para>
 
@@ -1122,15 +1129,21 @@ SELECT pg_stop_backup();
     the directories will be recreated as needed.
    </para>
 
+   <para>
+    <filename>pg_internal.init</filename> files can be omitted from the
+    backup whenever a file of that name is found.  These files contain
+    relation cache data that is always rebuilt when recovering.
+   </para>
+
    <para>
     The backup label
-    file includes the label string you gave to <function>pg_start_backup</>,
-    as well as the time at which <function>pg_start_backup</> was run, and
+    file includes the label string you gave to <function>pg_start_backup</function>,
+    as well as the time at which <function>pg_start_backup</function> was run, and
     the name of the starting WAL file.  In case of confusion it is therefore
     possible to look inside a backup file and determine exactly which
     backup session the dump file came from.  The tablespace map file includes
     the symbolic link names as they exist in the directory
-    <filename>pg_tblspc/</> and the full path of each symbolic link.
+    <filename>pg_tblspc/</filename> and the full path of each symbolic link.
     These files are not merely for your information; their presence and
     contents are critical to the proper operation of the system's recovery
     process.
@@ -1139,7 +1152,7 @@ SELECT pg_stop_backup();
    <para>
     It is also possible to make a backup while the server is
     stopped.  In this case, you obviously cannot use
-    <function>pg_start_backup</> or <function>pg_stop_backup</>, and
+    <function>pg_start_backup</function> or <function>pg_stop_backup</function>, and
     you will therefore be left to your own devices to keep track of which
     backup is which and how far back the associated WAL files go.
     It is generally better to follow the continuous archiving procedure above.
@@ -1166,7 +1179,7 @@ SELECT pg_stop_backup();
      location in case you need them later. Note that this precaution will
      require that you have enough free space on your system to hold two
      copies of your existing database. If you do not have enough space,
-     you should at least save the contents of the cluster's <filename>pg_wal</>
+     you should at least save the contents of the cluster's <filename>pg_wal</filename>
      subdirectory, as it might contain logs which
      were not archived before the system went down.
     </para>
@@ -1181,17 +1194,17 @@ SELECT pg_stop_backup();
     <para>
      Restore the database files from your file system backup.  Be sure that they
      are restored with the right ownership (the database system user, not
-     <literal>root</>!) and with the right permissions.  If you are using
+     <literal>root</literal>!) and with the right permissions.  If you are using
      tablespaces,
-     you should verify that the symbolic links in <filename>pg_tblspc/</>
+     you should verify that the symbolic links in <filename>pg_tblspc/</filename>
      were correctly restored.
     </para>
    </listitem>
    <listitem>
     <para>
-     Remove any files present in <filename>pg_wal/</>; these came from the
+     Remove any files present in <filename>pg_wal/</filename>; these came from the
      file system backup and are therefore probably obsolete rather than current.
-     If you didn't archive <filename>pg_wal/</> at all, then recreate
+     If you didn't archive <filename>pg_wal/</filename> at all, then recreate
      it with proper permissions,
      being careful to ensure that you re-establish it as a symbolic link
      if you had it set up that way before.
@@ -1200,16 +1213,16 @@ SELECT pg_stop_backup();
    <listitem>
     <para>
      If you have unarchived WAL segment files that you saved in step 2,
-     copy them into <filename>pg_wal/</>.  (It is best to copy them,
+     copy them into <filename>pg_wal/</filename>.  (It is best to copy them,
      not move them, so you still have the unmodified files if a
      problem occurs and you have to start over.)
     </para>
    </listitem>
    <listitem>
     <para>
-     Create a recovery command file <filename>recovery.conf</> in the cluster
-     data directory (see <xref linkend="recovery-config">). You might
-     also want to temporarily modify <filename>pg_hba.conf</> to prevent
+     Create a recovery command file <filename>recovery.conf</filename> in the cluster
+     data directory (see <xref linkend="recovery-config"/>). You might
+     also want to temporarily modify <filename>pg_hba.conf</filename> to prevent
      ordinary users from connecting until you are sure the recovery was successful.
     </para>
    </listitem>
@@ -1220,7 +1233,7 @@ SELECT pg_stop_backup();
      recovery be terminated because of an external error, the server can
      simply be restarted and it will continue recovery.  Upon completion
      of the recovery process, the server will rename
-     <filename>recovery.conf</> to <filename>recovery.done</> (to prevent
+     <filename>recovery.conf</filename> to <filename>recovery.done</filename> (to prevent
      accidentally re-entering recovery mode later) and then
      commence normal database operations.
     </para>
@@ -1229,7 +1242,7 @@ SELECT pg_stop_backup();
     <para>
      Inspect the contents of the database to ensure you have recovered to
      the desired state.  If not, return to step 1.  If all is well,
-     allow your users to connect by restoring <filename>pg_hba.conf</> to normal.
+     allow your users to connect by restoring <filename>pg_hba.conf</filename> to normal.
     </para>
    </listitem>
   </orderedlist>
@@ -1238,32 +1251,32 @@ SELECT pg_stop_backup();
    <para>
     The key part of all this is to set up a recovery configuration file that
     describes how you want to recover and how far the recovery should
-    run.  You can use <filename>recovery.conf.sample</> (normally
-    located in the installation's <filename>share/</> directory) as a
+    run.  You can use <filename>recovery.conf.sample</filename> (normally
+    located in the installation's <filename>share/</filename> directory) as a
     prototype.  The one thing that you absolutely must specify in
-    <filename>recovery.conf</> is the <varname>restore_command</>,
-    which tells <productname>PostgreSQL</> how to retrieve archived
-    WAL file segments.  Like the <varname>archive_command</>, this is
-    a shell command string.  It can contain <literal>%f</>, which is
-    replaced by the name of the desired log file, and <literal>%p</>,
+    <filename>recovery.conf</filename> is the <varname>restore_command</varname>,
+    which tells <productname>PostgreSQL</productname> how to retrieve archived
+    WAL file segments.  Like the <varname>archive_command</varname>, this is
+    a shell command string.  It can contain <literal>%f</literal>, which is
+    replaced by the name of the desired log file, and <literal>%p</literal>,
     which is replaced by the path name to copy the log file to.
     (The path name is relative to the current working directory,
     i.e., the cluster's data directory.)
-    Write <literal>%%</> if you need to embed an actual <literal>%</>
+    Write <literal>%%</literal> if you need to embed an actual <literal>%</literal>
     character in the command.  The simplest useful command is
     something like:
 <programlisting>
 restore_command = 'cp /mnt/server/archivedir/%f %p'
 </programlisting>
     which will copy previously archived WAL segments from the directory
-    <filename>/mnt/server/archivedir</>.  Of course, you can use something
+    <filename>/mnt/server/archivedir</filename>.  Of course, you can use something
     much more complicated, perhaps even a shell script that requests the
     operator to mount an appropriate tape.
    </para>
 
    <para>
     It is important that the command return nonzero exit status on failure.
-    The command <emphasis>will</> be called requesting files that are not
+    The command <emphasis>will</emphasis> be called requesting files that are not
     present in the archive; it must return nonzero when so asked.  This is not
     an error condition.  An exception is that if the command was terminated by
     a signal (other than <systemitem>SIGTERM</systemitem>, which is used as
@@ -1275,36 +1288,36 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
    <para>
     Not all of the requested files will be WAL segment
     files; you should also expect requests for files with a suffix of
-    <literal>.backup</> or <literal>.history</>. Also be aware that
-    the base name of the <literal>%p</> path will be different from
-    <literal>%f</>; do not expect them to be interchangeable.
+    <literal>.backup</literal> or <literal>.history</literal>. Also be aware that
+    the base name of the <literal>%p</literal> path will be different from
+    <literal>%f</literal>; do not expect them to be interchangeable.
    </para>
 
    <para>
     WAL segments that cannot be found in the archive will be sought in
-    <filename>pg_wal/</>; this allows use of recent un-archived segments.
+    <filename>pg_wal/</filename>; this allows use of recent un-archived segments.
     However, segments that are available from the archive will be used in
-    preference to files in <filename>pg_wal/</>.
+    preference to files in <filename>pg_wal/</filename>.
    </para>
 
    <para>
     Normally, recovery will proceed through all available WAL segments,
     thereby restoring the database to the current point in time (or as
     close as possible given the available WAL segments).  Therefore, a normal
-    recovery will end with a <quote>file not found</> message, the exact text
+    recovery will end with a <quote>file not found</quote> message, the exact text
     of the error message depending upon your choice of
-    <varname>restore_command</>.  You may also see an error message
+    <varname>restore_command</varname>.  You may also see an error message
     at the start of recovery for a file named something like
-    <filename>00000001.history</>.  This is also normal and does not
+    <filename>00000001.history</filename>.  This is also normal and does not
     indicate a problem in simple recovery situations; see
-    <xref linkend="backup-timelines"> for discussion.
+    <xref linkend="backup-timelines"/> for discussion.
    </para>
 
    <para>
     If you want to recover to some previous point in time (say, right before
     the junior DBA dropped your main transaction table), just specify the
-    required <link linkend="recovery-target-settings">stopping point</link> in <filename>recovery.conf</>.  You can specify
-    the stop point, known as the <quote>recovery target</>, either by
+    required <link linkend="recovery-target-settings">stopping point</link> in <filename>recovery.conf</filename>.  You can specify
+    the stop point, known as the <quote>recovery target</quote>, either by
     date/time, named restore point or by completion of a specific transaction
     ID.  As of this writing only the date/time and named restore point options
     are very usable, since there are no tools to help you identify with any
@@ -1314,7 +1327,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
    <note>
      <para>
       The stop point must be after the ending time of the base backup, i.e.,
-      the end time of <function>pg_stop_backup</>.  You cannot use a base backup
+      the end time of <function>pg_stop_backup</function>.  You cannot use a base backup
       to recover to a time when that backup was in progress.  (To
       recover to such a time, you must go back to your previous base backup
       and roll forward from there.)
@@ -1325,14 +1338,14 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
     If recovery finds corrupted WAL data, recovery will
     halt at that point and the server will not start. In such a case the
     recovery process could be re-run from the beginning, specifying a
-    <quote>recovery target</> before the point of corruption so that recovery
+    <quote>recovery target</quote> before the point of corruption so that recovery
     can complete normally.
     If recovery fails for an external reason, such as a system crash or
     if the WAL archive has become inaccessible, then the recovery can simply
     be restarted and it will restart almost from where it failed.
     Recovery restart works much like checkpointing in normal operation:
     the server periodically forces all its state to disk, and then updates
-    the <filename>pg_control</> file to indicate that the already-processed
+    the <filename>pg_control</filename> file to indicate that the already-processed
     WAL data need not be scanned again.
    </para>
 
@@ -1352,7 +1365,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
     suppose you dropped a critical table at 5:15PM on Tuesday evening, but
     didn't realize your mistake until Wednesday noon.
     Unfazed, you get out your backup, restore to the point-in-time 5:14PM
-    Tuesday evening, and are up and running.  In <emphasis>this</> history of
+    Tuesday evening, and are up and running.  In <emphasis>this</emphasis> history of
     the database universe, you never dropped the table.  But suppose
     you later realize this wasn't such a great idea, and would like
     to return to sometime Wednesday morning in the original history.
@@ -1365,8 +1378,8 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
    </para>
 
    <para>
-    To deal with this problem, <productname>PostgreSQL</> has a notion
-    of <firstterm>timelines</>.  Whenever an archive recovery completes,
+    To deal with this problem, <productname>PostgreSQL</productname> has a notion
+    of <firstterm>timelines</firstterm>.  Whenever an archive recovery completes,
     a new timeline is created to identify the series of WAL records
     generated after that recovery.  The timeline
     ID number is part of WAL segment file names so a new timeline does
@@ -1377,13 +1390,13 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
     and so have to do several point-in-time recoveries by trial and error
     until you find the best place to branch off from the old history.  Without
     timelines this process would soon generate an unmanageable mess.  With
-    timelines, you can recover to <emphasis>any</> prior state, including
+    timelines, you can recover to <emphasis>any</emphasis> prior state, including
     states in timeline branches that you abandoned earlier.
    </para>
 
    <para>
-    Every time a new timeline is created, <productname>PostgreSQL</> creates
-    a <quote>timeline history</> file that shows which timeline it branched
+    Every time a new timeline is created, <productname>PostgreSQL</productname> creates
+    a <quote>timeline history</quote> file that shows which timeline it branched
     off from and when.  These history files are necessary to allow the system
     to pick the right WAL segment files when recovering from an archive that
     contains multiple timelines.  Therefore, they are archived into the WAL
@@ -1401,7 +1414,7 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
     that was current when the base backup was taken.  If you wish to recover
     into some child timeline (that is, you want to return to some state that
     was itself generated after a recovery attempt), you need to specify the
-    target timeline ID in <filename>recovery.conf</>.  You cannot recover into
+    target timeline ID in <filename>recovery.conf</filename>.  You cannot recover into
     timelines that branched off earlier than the base backup.
    </para>
   </sect2>
@@ -1417,18 +1430,18 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
      <title>Standalone Hot Backups</title>
 
      <para>
-      It is possible to use <productname>PostgreSQL</>'s backup facilities to
+      It is possible to use <productname>PostgreSQL</productname>'s backup facilities to
       produce standalone hot backups. These are backups that cannot be used
       for point-in-time recovery, yet are typically much faster to backup and
-      restore than <application>pg_dump</> dumps.  (They are also much larger
-      than <application>pg_dump</> dumps, so in some cases the speed advantage
+      restore than <application>pg_dump</application> dumps.  (They are also much larger
+      than <application>pg_dump</application> dumps, so in some cases the speed advantage
       might be negated.)
      </para>
 
      <para>
       As with base backups, the easiest way to produce a standalone
-      hot backup is to use the <xref linkend="app-pgbasebackup">
-      tool. If you include the <literal>-X</> parameter when calling
+      hot backup is to use the <xref linkend="app-pgbasebackup"/>
+      tool. If you include the <literal>-X</literal> parameter when calling
       it, all the write-ahead log required to use the backup will be
       included in the backup automatically, and no special action is
       required to restore the backup.
@@ -1438,16 +1451,16 @@ restore_command = 'cp /mnt/server/archivedir/%f %p'
       If more flexibility in copying the backup files is needed, a lower
       level process can be used for standalone hot backups as well.
       To prepare for low level standalone hot backups, make sure
-      <varname>wal_level</> is set to
-      <literal>replica</> or higher, <varname>archive_mode</> to
-      <literal>on</>, and set up an <varname>archive_command</> that performs
-      archiving only when a <emphasis>switch file</> exists.  For example:
+      <varname>wal_level</varname> is set to
+      <literal>replica</literal> or higher, <varname>archive_mode</varname> to
+      <literal>on</literal>, and set up an <varname>archive_command</varname> that performs
+      archiving only when a <emphasis>switch file</emphasis> exists.  For example:
 <programlisting>
 archive_command = 'test ! -f /var/lib/pgsql/backup_in_progress || (test ! -f /var/lib/pgsql/archive/%f &amp;&amp; cp %p /var/lib/pgsql/archive/%f)'
 </programlisting>
       This command will perform archiving when
-      <filename>/var/lib/pgsql/backup_in_progress</> exists, and otherwise
-      silently return zero exit status (allowing <productname>PostgreSQL</>
+      <filename>/var/lib/pgsql/backup_in_progress</filename> exists, and otherwise
+      silently return zero exit status (allowing <productname>PostgreSQL</productname>
       to recycle the unwanted WAL file).
      </para>
 
@@ -1462,11 +1475,11 @@ psql -c "select pg_stop_backup();"
 rm /var/lib/pgsql/backup_in_progress
 tar -rf /var/lib/pgsql/backup.tar /var/lib/pgsql/archive/
 </programlisting>
-      The switch file <filename>/var/lib/pgsql/backup_in_progress</> is
+      The switch file <filename>/var/lib/pgsql/backup_in_progress</filename> is
       created first, enabling archiving of completed WAL files to occur.
       After the backup the switch file is removed. Archived WAL files are
       then added to the backup so that both base backup and all required
-      WAL files are part of the same <application>tar</> file.
+      WAL files are part of the same <application>tar</application> file.
       Please remember to add error handling to your backup scripts.
      </para>
 
@@ -1481,7 +1494,7 @@ tar -rf /var/lib/pgsql/backup.tar /var/lib/pgsql/archive/
 <programlisting>
 archive_command = 'gzip &lt; %p &gt; /var/lib/pgsql/archive/%f'
 </programlisting>
-      You will then need to use <application>gunzip</> during recovery:
+      You will then need to use <application>gunzip</application> during recovery:
 <programlisting>
 restore_command = 'gunzip &lt; /mnt/server/archivedir/%f &gt; %p'
 </programlisting>
@@ -1494,7 +1507,7 @@ restore_command = 'gunzip &lt; /mnt/server/archivedir/%f &gt; %p'
      <para>
       Many people choose to use scripts to define their
       <varname>archive_command</varname>, so that their
-      <filename>postgresql.conf</> entry looks very simple:
+      <filename>postgresql.conf</filename> entry looks very simple:
 <programlisting>
 archive_command = 'local_backup_script.sh "%p" "%f"'
 </programlisting>
@@ -1502,7 +1515,7 @@ archive_command = 'local_backup_script.sh "%p" "%f"'
       more than a single command in the archiving process.
       This allows all complexity to be managed within the script, which
       can be written in a popular scripting language such as
-      <application>bash</> or <application>perl</>.
+      <application>bash</application> or <application>perl</application>.
      </para>
 
      <para>
@@ -1535,8 +1548,8 @@ archive_command = 'local_backup_script.sh "%p" "%f"'
      <tip>
       <para>
        When using an <varname>archive_command</varname> script, it's desirable
-       to enable <xref linkend="guc-logging-collector">.
-       Any messages written to <systemitem>stderr</> from the script will then
+       to enable <xref linkend="guc-logging-collector"/>.
+       Any messages written to <systemitem>stderr</systemitem> from the script will then
        appear in the database server log, allowing complex configurations to
        be diagnosed easily if they fail.
       </para>
@@ -1554,9 +1567,9 @@ archive_command = 'local_backup_script.sh "%p" "%f"'
   <itemizedlist>
    <listitem>
     <para>
-     If a <xref linkend="sql-createdatabase">
+     If a <xref linkend="sql-createdatabase"/>
      command is executed while a base backup is being taken, and then
-     the template database that the <command>CREATE DATABASE</> copied
+     the template database that the <command>CREATE DATABASE</command> copied
      is modified while the base backup is still in progress, it is
      possible that recovery will cause those modifications to be
      propagated into the created database as well.  This is of course
@@ -1567,7 +1580,7 @@ archive_command = 'local_backup_script.sh "%p" "%f"'
 
    <listitem>
     <para>
-     <xref linkend="sql-createtablespace">
+     <xref linkend="sql-createtablespace"/>
      commands are WAL-logged with the literal absolute path, and will
      therefore be replayed as tablespace creations with the same
      absolute path.  This might be undesirable if the log is being
@@ -1590,12 +1603,12 @@ archive_command = 'local_backup_script.sh "%p" "%f"'
     your system hardware and software, the risk of partial writes might
     be small enough to ignore, in which case you can significantly
     reduce the total volume of archived logs by turning off page
-    snapshots using the <xref linkend="guc-full-page-writes">
-    parameter.  (Read the notes and warnings in <xref linkend="wal">
+    snapshots using the <xref linkend="guc-full-page-writes"/>
+    parameter.  (Read the notes and warnings in <xref linkend="wal"/>
     before you do so.)  Turning off page snapshots does not prevent
     use of the logs for PITR operations.  An area for future
     development is to compress archived WAL data by removing
-    unnecessary page copies even when <varname>full_page_writes</> is
+    unnecessary page copies even when <varname>full_page_writes</varname> is
     on.  In the meantime, administrators might wish to reduce the number
     of page snapshots included in WAL by increasing the checkpoint
     interval parameters as much as feasible.
diff --git a/doc/src/sgml/bgworker.sgml b/doc/src/sgml/bgworker.sgml
index b422323081..e490bb8750 100644
--- a/doc/src/sgml/bgworker.sgml
+++ b/doc/src/sgml/bgworker.sgml
@@ -11,17 +11,17 @@
   PostgreSQL can be extended to run user-supplied code in separate processes.
   Such processes are started, stopped and monitored by <command>postgres</command>,
   which permits them to have a lifetime closely linked to the server's status.
-  These processes have the option to attach to <productname>PostgreSQL</>'s
+  These processes have the option to attach to <productname>PostgreSQL</productname>'s
   shared memory area and to connect to databases internally; they can also run
   multiple transactions serially, just like a regular client-connected server
-  process.  Also, by linking to <application>libpq</> they can connect to the
+  process.  Also, by linking to <application>libpq</application> they can connect to the
   server and behave like a regular client application.
  </para>
 
  <warning>
   <para>
    There are considerable robustness and security risks in using background
-   worker processes because, being written in the <literal>C</> language,
+   worker processes because, being written in the <literal>C</literal> language,
    they have unrestricted access to data.  Administrators wishing to enable
    modules that include background worker process should exercise extreme
    caution.  Only carefully audited modules should be permitted to run
@@ -31,17 +31,17 @@
 
  <para>
   Background workers can be initialized at the time that
-  <productname>PostgreSQL</> is started by including the module name in
-  <varname>shared_preload_libraries</>.  A module wishing to run a background
+  <productname>PostgreSQL</productname> is started by including the module name in
+  <varname>shared_preload_libraries</varname>.  A module wishing to run a background
   worker can register it by calling
   <function>RegisterBackgroundWorker(<type>BackgroundWorker *worker</type>)</function>
-  from its <function>_PG_init()</>.  Background workers can also be started
+  from its <function>_PG_init()</function>.  Background workers can also be started
   after the system is up and running by calling the function
   <function>RegisterDynamicBackgroundWorker(<type>BackgroundWorker
   *worker, BackgroundWorkerHandle **handle</type>)</function>.  Unlike
-  <function>RegisterBackgroundWorker</>, which can only be called from within
+  <function>RegisterBackgroundWorker</function>, which can only be called from within
   the postmaster, <function>RegisterDynamicBackgroundWorker</function> must be
-  called from a regular backend.
+  called from a regular backend, possibly another background worker.
  </para>
 
  <para>
@@ -51,6 +51,7 @@ typedef void (*bgworker_main_type)(Datum main_arg);
 typedef struct BackgroundWorker
 {
     char        bgw_name[BGW_MAXLEN];
+    char        bgw_type[BGW_MAXLEN];
     int         bgw_flags;
     BgWorkerStartTime bgw_start_time;
     int         bgw_restart_time;       /* in seconds, or BGW_NEVER_RESTART */
@@ -64,12 +65,18 @@ typedef struct BackgroundWorker
   </para>
 
   <para>
-   <structfield>bgw_name</> is a string to be used in log messages, process
-   listings and similar contexts.
+   <structfield>bgw_name</structfield> and <structfield>bgw_type</structfield> are
+   strings to be used in log messages, process listings and similar contexts.
+   <structfield>bgw_type</structfield> should be the same for all background
+   workers of the same type, so that it is possible to group such workers in a
+   process listing, for example.  <structfield>bgw_name</structfield> on the
+   other hand can contain additional information about the specific process.
+   (Typically, the string for <structfield>bgw_name</structfield> will contain
+   the type somehow, but that is not strictly required.)
   </para>
 
   <para>
-   <structfield>bgw_flags</> is a bitwise-or'd bit mask indicating the
+   <structfield>bgw_flags</structfield> is a bitwise-or'd bit mask indicating the
    capabilities that the module wants.  Possible values are:
    <variablelist>
 
@@ -107,14 +114,14 @@ typedef struct BackgroundWorker
 
   <para>
    <structfield>bgw_start_time</structfield> is the server state during which
-   <command>postgres</> should start the process; it can be one of
-   <literal>BgWorkerStart_PostmasterStart</> (start as soon as
-   <command>postgres</> itself has finished its own initialization; processes
+   <command>postgres</command> should start the process; it can be one of
+   <literal>BgWorkerStart_PostmasterStart</literal> (start as soon as
+   <command>postgres</command> itself has finished its own initialization; processes
    requesting this are not eligible for database connections),
-   <literal>BgWorkerStart_ConsistentState</> (start as soon as a consistent state
+   <literal>BgWorkerStart_ConsistentState</literal> (start as soon as a consistent state
    has been reached in a hot standby, allowing processes to connect to
    databases and run read-only queries), and
-   <literal>BgWorkerStart_RecoveryFinished</> (start as soon as the system has
+   <literal>BgWorkerStart_RecoveryFinished</literal> (start as soon as the system has
    entered normal read-write state).  Note the last two values are equivalent
    in a server that's not a hot standby.  Note that this setting only indicates
    when the processes are to be started; they do not stop when a different state
@@ -145,9 +152,9 @@ typedef struct BackgroundWorker
   </para>
 
   <para>
-   <structfield>bgw_main_arg</structfield> is the <type>Datum</> argument
+   <structfield>bgw_main_arg</structfield> is the <type>Datum</type> argument
    to the background worker main function.  This main function should take a
-   single argument of type <type>Datum</> and return <type>void</>.
+   single argument of type <type>Datum</type> and return <type>void</type>.
    <structfield>bgw_main_arg</structfield> will be passed as the argument.
    In addition, the global variable <literal>MyBgworkerEntry</literal>
    points to a copy of the <structname>BackgroundWorker</structname> structure
@@ -158,39 +165,39 @@ typedef struct BackgroundWorker
   <para>
    On Windows (and anywhere else where <literal>EXEC_BACKEND</literal> is
    defined) or in dynamic background workers it is not safe to pass a
-   <type>Datum</> by reference, only by value. If an argument is required, it
+   <type>Datum</type> by reference, only by value. If an argument is required, it
    is safest to pass an int32 or other small value and use that as an index
-   into an array allocated in shared memory. If a value like a <type>cstring</>
+   into an array allocated in shared memory. If a value like a <type>cstring</type>
    or <type>text</type> is passed then the pointer won't be valid from the
    new background worker process.
   </para>
 
   <para>
    <structfield>bgw_extra</structfield> can contain extra data to be passed
-   to the background worker.  Unlike <structfield>bgw_main_arg</>, this data
+   to the background worker.  Unlike <structfield>bgw_main_arg</structfield>, this data
    is not passed as an argument to the worker's main function, but it can be
    accessed via <literal>MyBgworkerEntry</literal>, as discussed above.
   </para>
 
   <para>
    <structfield>bgw_notify_pid</structfield> is the PID of a PostgreSQL
-   backend process to which the postmaster should send <literal>SIGUSR1</>
+   backend process to which the postmaster should send <literal>SIGUSR1</literal>
    when the process is started or exits.  It should be 0 for workers registered
    at postmaster startup time, or when the backend registering the worker does
    not wish to wait for the worker to start up.  Otherwise, it should be
-   initialized to <literal>MyProcPid</>.
+   initialized to <literal>MyProcPid</literal>.
   </para>
 
   <para>Once running, the process can connect to a database by calling
    <function>BackgroundWorkerInitializeConnection(<parameter>char *dbname</parameter>, <parameter>char *username</parameter>)</function> or
    <function>BackgroundWorkerInitializeConnectionByOid(<parameter>Oid dboid</parameter>, <parameter>Oid useroid</parameter>)</function>.
    This allows the process to run transactions and queries using the
-   <literal>SPI</literal> interface.  If <varname>dbname</> is NULL or
-   <varname>dboid</> is <literal>InvalidOid</>, the session is not connected
+   <literal>SPI</literal> interface.  If <varname>dbname</varname> is NULL or
+   <varname>dboid</varname> is <literal>InvalidOid</literal>, the session is not connected
    to any particular database, but shared catalogs can be accessed.
-   If <varname>username</> is NULL or <varname>useroid</> is
-   <literal>InvalidOid</>, the process will run as the superuser created
-   during <command>initdb</>.
+   If <varname>username</varname> is NULL or <varname>useroid</varname> is
+   <literal>InvalidOid</literal>, the process will run as the superuser created
+   during <command>initdb</command>.
    A background worker can only call one of these two functions, and only
    once.  It is not possible to switch databases.
   </para>
@@ -200,24 +207,24 @@ typedef struct BackgroundWorker
    background worker's main function, and must be unblocked by it; this is to
    allow the process to customize its signal handlers, if necessary.
    Signals can be unblocked in the new process by calling
-   <function>BackgroundWorkerUnblockSignals</> and blocked by calling
-   <function>BackgroundWorkerBlockSignals</>.
+   <function>BackgroundWorkerUnblockSignals</function> and blocked by calling
+   <function>BackgroundWorkerBlockSignals</function>.
   </para>
 
   <para>
    If <structfield>bgw_restart_time</structfield> for a background worker is
-   configured as <literal>BGW_NEVER_RESTART</>, or if it exits with an exit
-   code of 0 or is terminated by <function>TerminateBackgroundWorker</>,
+   configured as <literal>BGW_NEVER_RESTART</literal>, or if it exits with an exit
+   code of 0 or is terminated by <function>TerminateBackgroundWorker</function>,
    it will be automatically unregistered by the postmaster on exit.
    Otherwise, it will be restarted after the time period configured via
-   <structfield>bgw_restart_time</>, or immediately if the postmaster
+   <structfield>bgw_restart_time</structfield>, or immediately if the postmaster
    reinitializes the cluster due to a backend failure.  Backends which need
    to suspend execution only temporarily should use an interruptible sleep
    rather than exiting; this can be achieved by calling
    <function>WaitLatch()</function>. Make sure the
-   <literal>WL_POSTMASTER_DEATH</> flag is set when calling that function, and
+   <literal>WL_POSTMASTER_DEATH</literal> flag is set when calling that function, and
    verify the return code for a prompt exit in the emergency case that
-   <command>postgres</> itself has terminated.
+   <command>postgres</command> itself has terminated.
   </para>
 
   <para>
@@ -231,29 +238,29 @@ typedef struct BackgroundWorker
    opaque handle that can subsequently be passed to
    <function>GetBackgroundWorkerPid(<parameter>BackgroundWorkerHandle *</parameter>, <parameter>pid_t *</parameter>)</function> or
    <function>TerminateBackgroundWorker(<parameter>BackgroundWorkerHandle *</parameter>)</function>.
-   <function>GetBackgroundWorkerPid</> can be used to poll the status of the
-   worker: a return value of <literal>BGWH_NOT_YET_STARTED</> indicates that
+   <function>GetBackgroundWorkerPid</function> can be used to poll the status of the
+   worker: a return value of <literal>BGWH_NOT_YET_STARTED</literal> indicates that
    the worker has not yet been started by the postmaster;
    <literal>BGWH_STOPPED</literal> indicates that it has been started but is
    no longer running; and <literal>BGWH_STARTED</literal> indicates that it is
    currently running.  In this last case, the PID will also be returned via the
    second argument.
-   <function>TerminateBackgroundWorker</> causes the postmaster to send
-   <literal>SIGTERM</> to the worker if it is running, and to unregister it
+   <function>TerminateBackgroundWorker</function> causes the postmaster to send
+   <literal>SIGTERM</literal> to the worker if it is running, and to unregister it
    as soon as it is not.
   </para>
 
   <para>
    In some cases, a process which registers a background worker may wish to
    wait for the worker to start up.  This can be accomplished by initializing
-   <structfield>bgw_notify_pid</structfield> to <literal>MyProcPid</> and
+   <structfield>bgw_notify_pid</structfield> to <literal>MyProcPid</literal> and
    then passing the <type>BackgroundWorkerHandle *</type> obtained at
    registration time to
    <function>WaitForBackgroundWorkerStartup(<parameter>BackgroundWorkerHandle
    *handle</parameter>, <parameter>pid_t *</parameter>)</function> function.
    This function will block until the postmaster has attempted to start the
    background worker, or until the postmaster dies.  If the background runner
-   is running, the return value will <literal>BGWH_STARTED</>, and
+   is running, the return value will <literal>BGWH_STARTED</literal>, and
    the PID will be written to the provided address.  Otherwise, the return
    value will be <literal>BGWH_STOPPED</literal> or
    <literal>BGWH_POSTMASTER_DIED</literal>.
@@ -272,13 +279,13 @@ typedef struct BackgroundWorker
   </para>
 
   <para>
-   The <filename>src/test/modules/worker_spi</> module
+   The <filename>src/test/modules/worker_spi</filename> module
    contains a working example,
    which demonstrates some useful techniques.
   </para>
 
   <para>
    The maximum number of registered background workers is limited by
-   <xref linkend="guc-max-worker-processes">.
+   <xref linkend="guc-max-worker-processes"/>.
   </para>
 </chapter>
diff --git a/doc/src/sgml/biblio.sgml b/doc/src/sgml/biblio.sgml
index 5462bc38e4..4953024162 100644
--- a/doc/src/sgml/biblio.sgml
+++ b/doc/src/sgml/biblio.sgml
@@ -18,7 +18,7 @@
   <bibliodiv>
    <title><acronym>SQL</acronym> Reference Books</title>
 
-   <biblioentry id="BOWMAN01">
+   <biblioentry id="bowman01">
     <title>The Practical <acronym>SQL</acronym> Handbook</title>
     <subtitle>Using SQL Variants</subtitle>
     <edition>Fourth Edition</edition>
@@ -43,7 +43,7 @@
     <pubdate>2001</pubdate>
    </biblioentry>
 
-   <biblioentry id="DATE97">
+   <biblioentry id="date97">
     <title>A Guide to the <acronym>SQL</acronym> Standard</title>
     <subtitle>A user's guide to the standard database language <acronym>SQL</acronym></subtitle>
     <edition>Fourth Edition</edition>
@@ -64,7 +64,7 @@
     <pubdate>1997</pubdate>
    </biblioentry>
 
-   <biblioentry id="DATE04">
+   <biblioentry id="date04">
     <title>An Introduction to Database Systems</title>
     <edition>Eighth Edition</edition>
     <authorgroup>
@@ -80,7 +80,7 @@
     <pubdate>2003</pubdate>
    </biblioentry>
 
-  <biblioentry id="ELMA04">
+  <biblioentry id="elma04">
    <title>Fundamentals of Database Systems</title>
    <edition>Fourth Edition</edition>
    <authorgroup>
@@ -100,7 +100,7 @@
    <pubdate>2003</pubdate>
   </biblioentry>
 
-   <biblioentry id="MELT93">
+   <biblioentry id="melt93">
     <title>Understanding the New <acronym>SQL</acronym></title>
     <subtitle>A complete guide</subtitle>
     <authorgroup>
@@ -120,7 +120,7 @@
     <pubdate>1993</pubdate>
    </biblioentry>
 
-   <biblioentry id="ULL88">
+   <biblioentry id="ull88">
     <title>Principles of Database and Knowledge</title>
     <subtitle>Base Systems</subtitle>
     <authorgroup>
@@ -141,7 +141,7 @@
   <bibliodiv>
    <title>PostgreSQL-specific Documentation</title>
 
-   <biblioentry id="SIM98">
+   <biblioentry id="sim98">
     <title>Enhancement of the ANSI SQL Implementation of PostgreSQL</title>
     <authorgroup>
      <author>
@@ -171,7 +171,7 @@ ssimkovi@ag.or.at
     <abstract>
      <para>
       Discusses SQL history and syntax, and describes the addition of
-      <literal>INTERSECT</> and <literal>EXCEPT</> constructs into
+      <literal>INTERSECT</literal> and <literal>EXCEPT</literal> constructs into
       <productname>PostgreSQL</productname>.  Prepared as a Master's
       Thesis with the support of O. Univ. Prof. Dr. Georg Gottlob and
       Univ. Ass. Mag. Katrin Seyr at Vienna University of Technology.
@@ -185,7 +185,7 @@ ssimkovi@ag.or.at
     <pubdate>November 29, 1998</pubdate>
    </biblioentry>
 
-   <biblioentry id="YU95">
+   <biblioentry id="yu95">
     <title>The <productname>Postgres95</productname> User Manual</title>
     <authorgroup>
      <author>
@@ -204,7 +204,7 @@ ssimkovi@ag.or.at
     <pubdate>Sept. 5, 1995</pubdate>
    </biblioentry>
 
-  <biblioentry id="FONG">
+  <biblioentry id="fong">
    <title><ulink url="http://db.cs.berkeley.edu/papers/UCB-MS-zfong.pdf">The
    design and implementation of the <productname>POSTGRES</productname> query
    optimizer</ulink></title>
@@ -222,7 +222,7 @@ ssimkovi@ag.or.at
   <bibliodiv>
    <title>Proceedings and Articles</title>
 
-   <biblioentry id="OLSON93">
+   <biblioentry id="olson93">
     <title>Partial indexing in POSTGRES: research project</title>
     <authorgroup>
      <author>
@@ -238,7 +238,7 @@ ssimkovi@ag.or.at
     <pubdate>1993</pubdate>
    </biblioentry>
 
-   <biblioentry id="ONG90">
+   <biblioentry id="ong90">
    <biblioset relation="article">
     <title>A Unified Framework for Version Modeling Using Production Rules in a Database System</title>
     <authorgroup>
@@ -262,7 +262,7 @@ ssimkovi@ag.or.at
    </biblioset>
    </biblioentry>
 
-   <biblioentry id="ROWE87">
+   <biblioentry id="rowe87">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-13.pdf">The <productname>POSTGRES</productname>
     data model</ulink></title>
@@ -284,7 +284,7 @@ ssimkovi@ag.or.at
     </confgroup>
    </biblioentry>
 
-   <biblioentry id="SESHADRI95">
+   <biblioentry id="seshadri95">
    <biblioset relation="article">
     <title><ulink url="http://citeseer.ist.psu.edu/seshadri95generalized.html">Generalized
     Partial Indexes</ulink></title>
@@ -313,7 +313,7 @@ ssimkovi@ag.or.at
     <pagenums>420-7</pagenums>
    </biblioentry>
 
-   <biblioentry id="STON86">
+   <biblioentry id="ston86">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M85-95.pdf">The
     design of <productname>POSTGRES</productname></ulink></title>
@@ -335,7 +335,7 @@ ssimkovi@ag.or.at
     </confgroup>
    </biblioentry>
 
-   <biblioentry id="STON87a">
+   <biblioentry id="ston87a">
    <biblioset relation="article">
     <title>The design of the <productname>POSTGRES</productname> rules system</title>
     <authorgroup>
@@ -360,7 +360,7 @@ ssimkovi@ag.or.at
     </confgroup>
    </biblioentry>
 
-   <biblioentry id="STON87b">
+   <biblioentry id="ston87b">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M87-06.pdf">The
     design of the <productname>POSTGRES</productname> storage
@@ -379,7 +379,7 @@ ssimkovi@ag.or.at
     </confgroup>
    </biblioentry>
 
-   <biblioentry id="STON89">
+   <biblioentry id="ston89">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-82.pdf">A
     commentary on the <productname>POSTGRES</productname> rules
@@ -405,7 +405,7 @@ ssimkovi@ag.or.at
    </biblioset>
    </biblioentry>
 
-   <biblioentry id="STON89b">
+   <biblioentry id="ston89b">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M89-17.pdf">The
     case for partial indexes</ulink></title>
@@ -423,7 +423,7 @@ ssimkovi@ag.or.at
    </biblioset>
    </biblioentry>
 
-   <biblioentry id="STON90a">
+   <biblioentry id="ston90a">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-34.pdf">The
     implementation of <productname>POSTGRES</productname></ulink></title>
@@ -451,7 +451,7 @@ ssimkovi@ag.or.at
    </biblioset>
    </biblioentry>
 
-   <biblioentry id="STON90b">
+   <biblioentry id="ston90b">
    <biblioset relation="article">
     <title><ulink url="http://db.cs.berkeley.edu/papers/ERL-M90-36.pdf">On
     Rules, Procedures, Caching and Views in Database Systems</ulink></title>
diff --git a/doc/src/sgml/bki.sgml b/doc/src/sgml/bki.sgml
index af6d8d1d2a..33378b46ea 100644
--- a/doc/src/sgml/bki.sgml
+++ b/doc/src/sgml/bki.sgml
@@ -21,7 +21,7 @@
   input file used by <application>initdb</application> is created as
   part of building and installing <productname>PostgreSQL</productname>
   by a program named <filename>genbki.pl</filename>, which reads some
-  specially formatted C header files in the <filename>src/include/catalog/</>
+  specially formatted C header files in the <filename>src/include/catalog/</filename>
   directory of the source tree.  The created <acronym>BKI</acronym> file
   is called <filename>postgres.bki</filename> and is
   normally installed in the
@@ -67,13 +67,13 @@
   <variablelist>
    <varlistentry>
     <term>
-     <literal>create</>
+     <literal>create</literal>
      <replaceable class="parameter">tablename</replaceable>
      <replaceable class="parameter">tableoid</replaceable>
-     <optional><literal>bootstrap</></optional>
-     <optional><literal>shared_relation</></optional>
-     <optional><literal>without_oids</></optional>
-     <optional><literal>rowtype_oid</> <replaceable>oid</></optional>
+     <optional><literal>bootstrap</literal></optional>
+     <optional><literal>shared_relation</literal></optional>
+     <optional><literal>without_oids</literal></optional>
+     <optional><literal>rowtype_oid</literal> <replaceable>oid</replaceable></optional>
      (<replaceable class="parameter">name1</replaceable> =
      <replaceable class="parameter">type1</replaceable>
      <optional>FORCE NOT NULL | FORCE NULL </optional> <optional>,
@@ -93,7 +93,7 @@
 
      <para>
       The following column types are supported directly by
-      <filename>bootstrap.c</>: <type>bool</type>,
+      <filename>bootstrap.c</filename>: <type>bool</type>,
       <type>bytea</type>, <type>char</type> (1 byte),
       <type>name</type>, <type>int2</type>,
       <type>int4</type>, <type>regproc</type>, <type>regclass</type>,
@@ -104,31 +104,31 @@
       <type>_oid</type> (array), <type>_char</type> (array),
       <type>_aclitem</type> (array).  Although it is possible to create
       tables containing columns of other types, this cannot be done until
-      after <structname>pg_type</> has been created and filled with
+      after <structname>pg_type</structname> has been created and filled with
       appropriate entries.  (That effectively means that only these
       column types can be used in bootstrapped tables, but non-bootstrap
       catalogs can contain any built-in type.)
      </para>
 
      <para>
-      When <literal>bootstrap</> is specified,
+      When <literal>bootstrap</literal> is specified,
       the table will only be created on disk; nothing is entered into
       <structname>pg_class</structname>,
       <structname>pg_attribute</structname>, etc, for it.  Thus the
       table will not be accessible by ordinary SQL operations until
-      such entries are made the hard way (with <literal>insert</>
+      such entries are made the hard way (with <literal>insert</literal>
       commands).  This option is used for creating
       <structname>pg_class</structname> etc themselves.
      </para>
 
      <para>
-      The table is created as shared if <literal>shared_relation</> is
+      The table is created as shared if <literal>shared_relation</literal> is
       specified.
-      It will have OIDs unless <literal>without_oids</> is specified.
-      The table's row type OID (<structname>pg_type</> OID) can optionally
-      be specified via the <literal>rowtype_oid</> clause; if not specified,
-      an OID is automatically generated for it.  (The <literal>rowtype_oid</>
-      clause is useless if <literal>bootstrap</> is specified, but it can be
+      It will have OIDs unless <literal>without_oids</literal> is specified.
+      The table's row type OID (<structname>pg_type</structname> OID) can optionally
+      be specified via the <literal>rowtype_oid</literal> clause; if not specified,
+      an OID is automatically generated for it.  (The <literal>rowtype_oid</literal>
+      clause is useless if <literal>bootstrap</literal> is specified, but it can be
       provided anyway for documentation.)
      </para>
     </listitem>
@@ -136,7 +136,7 @@
 
    <varlistentry>
     <term>
-     <literal>open</> <replaceable class="parameter">tablename</replaceable>
+     <literal>open</literal> <replaceable class="parameter">tablename</replaceable>
     </term>
 
     <listitem>
@@ -150,7 +150,7 @@
 
    <varlistentry>
     <term>
-     <literal>close</> <optional><replaceable class="parameter">tablename</replaceable></optional>
+     <literal>close</literal> <optional><replaceable class="parameter">tablename</replaceable></optional>
     </term>
 
     <listitem>
@@ -163,7 +163,7 @@
 
    <varlistentry>
     <term>
-     <literal>insert</> <optional><literal>OID =</> <replaceable class="parameter">oid_value</replaceable></optional> <literal>(</> <replaceable class="parameter">value1</replaceable> <replaceable class="parameter">value2</replaceable> ... <literal>)</>
+     <literal>insert</literal> <optional><literal>OID =</literal> <replaceable class="parameter">oid_value</replaceable></optional> <literal>(</literal> <replaceable class="parameter">value1</replaceable> <replaceable class="parameter">value2</replaceable> ... <literal>)</literal>
     </term>
 
     <listitem>
@@ -188,14 +188,14 @@
 
    <varlistentry>
     <term>
-     <literal>declare</> <optional><literal>unique</></optional>
-     <literal>index</> <replaceable class="parameter">indexname</replaceable>
+     <literal>declare</literal> <optional><literal>unique</literal></optional>
+     <literal>index</literal> <replaceable class="parameter">indexname</replaceable>
      <replaceable class="parameter">indexoid</replaceable>
-     <literal>on</> <replaceable class="parameter">tablename</replaceable>
-     <literal>using</> <replaceable class="parameter">amname</replaceable>
-     <literal>(</> <replaceable class="parameter">opclass1</replaceable>
+     <literal>on</literal> <replaceable class="parameter">tablename</replaceable>
+     <literal>using</literal> <replaceable class="parameter">amname</replaceable>
+     <literal>(</literal> <replaceable class="parameter">opclass1</replaceable>
      <replaceable class="parameter">name1</replaceable>
-     <optional>, ...</optional> <literal>)</>
+     <optional>, ...</optional> <literal>)</literal>
     </term>
 
     <listitem>
@@ -220,10 +220,10 @@
 
    <varlistentry>
     <term>
-     <literal>declare toast</>
+     <literal>declare toast</literal>
      <replaceable class="parameter">toasttableoid</replaceable>
      <replaceable class="parameter">toastindexoid</replaceable>
-     <literal>on</> <replaceable class="parameter">tablename</replaceable>
+     <literal>on</literal> <replaceable class="parameter">tablename</replaceable>
     </term>
 
     <listitem>
@@ -234,14 +234,14 @@
       <replaceable class="parameter">toasttableoid</replaceable>
       and its index is assigned OID
       <replaceable class="parameter">toastindexoid</replaceable>.
-      As with <literal>declare index</>, filling of the index
+      As with <literal>declare index</literal>, filling of the index
       is postponed.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>build indices</></term>
+    <term><literal>build indices</literal></term>
 
     <listitem>
      <para>
@@ -257,17 +257,17 @@
   <title>Structure of the Bootstrap <acronym>BKI</acronym> File</title>
 
   <para>
-   The <literal>open</> command cannot be used until the tables it uses
+   The <literal>open</literal> command cannot be used until the tables it uses
    exist and have entries for the table that is to be opened.
-   (These minimum tables are <structname>pg_class</>,
-   <structname>pg_attribute</>, <structname>pg_proc</>, and
-   <structname>pg_type</>.)   To allow those tables themselves to be filled,
-   <literal>create</> with the <literal>bootstrap</> option implicitly opens
+   (These minimum tables are <structname>pg_class</structname>,
+   <structname>pg_attribute</structname>, <structname>pg_proc</structname>, and
+   <structname>pg_type</structname>.)   To allow those tables themselves to be filled,
+   <literal>create</literal> with the <literal>bootstrap</literal> option implicitly opens
    the created table for data insertion.
   </para>
 
   <para>
-   Also, the <literal>declare index</> and <literal>declare toast</>
+   Also, the <literal>declare index</literal> and <literal>declare toast</literal>
    commands cannot be used until the system catalogs they need have been
    created and filled in.
   </para>
@@ -278,17 +278,17 @@
    <orderedlist>
     <listitem>
      <para>
-      <literal>create bootstrap</> one of the critical tables
+      <literal>create bootstrap</literal> one of the critical tables
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>insert</> data describing at least the critical tables
+      <literal>insert</literal> data describing at least the critical tables
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>close</>
+      <literal>close</literal>
      </para>
     </listitem>
     <listitem>
@@ -298,22 +298,22 @@
     </listitem>
     <listitem>
      <para>
-      <literal>create</> (without <literal>bootstrap</>) a noncritical table
+      <literal>create</literal> (without <literal>bootstrap</literal>) a noncritical table
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>open</>
+      <literal>open</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>insert</> desired data
+      <literal>insert</literal> desired data
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>close</>
+      <literal>close</literal>
      </para>
     </listitem>
     <listitem>
@@ -328,7 +328,7 @@
     </listitem>
     <listitem>
      <para>
-      <literal>build indices</>
+      <literal>build indices</literal>
      </para>
     </listitem>
    </orderedlist>
diff --git a/doc/src/sgml/bloom.sgml b/doc/src/sgml/bloom.sgml
index 396348c523..e13ebf80fd 100644
--- a/doc/src/sgml/bloom.sgml
+++ b/doc/src/sgml/bloom.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  <literal>bloom</> provides an index access method based on
+  <literal>bloom</literal> provides an index access method based on
   <ulink url="http://en.wikipedia.org/wiki/Bloom_filter">Bloom filters</ulink>.
  </para>
 
@@ -42,29 +42,29 @@
   <title>Parameters</title>
 
   <para>
-   A <literal>bloom</> index accepts the following parameters in its
-   <literal>WITH</> clause:
+   A <literal>bloom</literal> index accepts the following parameters in its
+   <literal>WITH</literal> clause:
   </para>
 
    <variablelist>
    <varlistentry>
-    <term><literal>length</></term>
+    <term><literal>length</literal></term>
     <listitem>
      <para>
       Length of each signature (index entry) in bits. The default
-      is <literal>80</> bits and maximum is <literal>4096</>.
+      is <literal>80</literal> bits and maximum is <literal>4096</literal>.
      </para>
     </listitem>
    </varlistentry>
    </variablelist>
    <variablelist>
    <varlistentry>
-    <term><literal>col1 &mdash; col32</></term>
+    <term><literal>col1 &mdash; col32</literal></term>
     <listitem>
      <para>
       Number of bits generated for each index column. Each parameter's name
       refers to the number of the index column that it controls.  The default
-      is <literal>2</> bits and maximum is <literal>4095</>.  Parameters for
+      is <literal>2</literal> bits and maximum is <literal>4095</literal>.  Parameters for
       index columns not actually used are ignored.
      </para>
     </listitem>
@@ -87,8 +87,8 @@ CREATE INDEX bloomidx ON tbloom USING bloom (i1,i2,i3)
   <para>
    The index is created with a signature length of 80 bits, with attributes
    i1 and i2 mapped to 2 bits, and attribute i3 mapped to 4 bits.  We could
-   have omitted the <literal>length</>, <literal>col1</>,
-   and <literal>col2</> specifications since those have the default values.
+   have omitted the <literal>length</literal>, <literal>col1</literal>,
+   and <literal>col2</literal> specifications since those have the default values.
   </para>
 
   <para>
@@ -175,7 +175,7 @@ CREATE INDEX
    Note the relatively large number of false positives: 2439 rows were
    selected to be visited in the heap, but none actually matched the
    query.  We could reduce that by specifying a larger signature length.
-   In this example, creating the index with <literal>length=200</>
+   In this example, creating the index with <literal>length=200</literal>
    reduced the number of false positives to 55; but it doubled the index size
    (to 306 MB) and ended up being slower for this query (125 ms overall).
   </para>
@@ -213,7 +213,7 @@ CREATE INDEX
   <para>
    An operator class for bloom indexes requires only a hash function for the
    indexed data type and an equality operator for searching. This example
-   shows the operator class definition for the <type>text</> data type:
+   shows the operator class definition for the <type>text</type> data type:
   </para>
 
 <programlisting>
@@ -230,7 +230,7 @@ DEFAULT FOR TYPE text USING bloom AS
    <itemizedlist>
     <listitem>
      <para>
-      Only operator classes for <type>int4</> and <type>text</> are
+      Only operator classes for <type>int4</type> and <type>text</type> are
       included with the module.
      </para>
     </listitem>
diff --git a/doc/src/sgml/brin.sgml b/doc/src/sgml/brin.sgml
index 8dcc29925b..23c0e05ed6 100644
--- a/doc/src/sgml/brin.sgml
+++ b/doc/src/sgml/brin.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/brin.sgml -->
 
-<chapter id="BRIN">
+<chapter id="brin">
 <title>BRIN Indexes</title>
 
    <indexterm>
@@ -16,7 +16,7 @@
   <acronym>BRIN</acronym> is designed for handling very large tables
   in which certain columns have some natural correlation with their
   physical location within the table.
-  A <firstterm>block range</> is a group of pages that are physically
+  A <firstterm>block range</firstterm> is a group of pages that are physically
   adjacent in the table; for each block range, some summary info is stored
   by the index.
   For example, a table storing a store's sale orders might have
@@ -29,7 +29,7 @@
  <para>
   <acronym>BRIN</acronym> indexes can satisfy queries via regular bitmap
   index scans, and will return all tuples in all pages within each range if
-  the summary info stored by the index is <firstterm>consistent</> with the
+  the summary info stored by the index is <firstterm>consistent</firstterm> with the
   query conditions.
   The query executor is in charge of rechecking these tuples and discarding
   those that do not match the query conditions &mdash; in other words, these
@@ -51,9 +51,9 @@
 
  <para>
   The size of the block range is determined at index creation time by
-  the <literal>pages_per_range</> storage parameter.  The number of index
+  the <literal>pages_per_range</literal> storage parameter.  The number of index
   entries will be equal to the size of the relation in pages divided by
-  the selected value for <literal>pages_per_range</>.  Therefore, the smaller
+  the selected value for <literal>pages_per_range</literal>.  Therefore, the smaller
   the number, the larger the index becomes (because of the need to
   store more index entries), but at the same time the summary data stored can
   be more precise and more data blocks can be skipped during an index scan.
@@ -95,13 +95,13 @@
  <para>
   The core <productname>PostgreSQL</productname> distribution
   includes the <acronym>BRIN</acronym> operator classes shown in
-  <xref linkend="brin-builtin-opclasses-table">.
+  <xref linkend="brin-builtin-opclasses-table"/>.
  </para>
 
  <para>
-  The <firstterm>minmax</>
+  The <firstterm>minmax</firstterm>
   operator classes store the minimum and the maximum values appearing
-  in the indexed column within the range.  The <firstterm>inclusion</>
+  in the indexed column within the range.  The <firstterm>inclusion</firstterm>
   operator classes store a value which includes the values in the indexed
   column within the range.
  </para>
@@ -162,21 +162,21 @@
      </entry>
     </row>
     <row>
-     <entry><literal>box_inclusion_ops</></entry>
+     <entry><literal>box_inclusion_ops</literal></entry>
      <entry><type>box</type></entry>
      <entry>
-      <literal>&lt;&lt;</>
-      <literal>&amp;&lt;</>
-      <literal>&amp;&amp;</>
-      <literal>&amp;&gt;</>
-      <literal>&gt;&gt;</>
-      <literal>~=</>
-      <literal>@&gt;</>
-      <literal>&lt;@</>
-      <literal>&amp;&lt;|</>
-      <literal>&lt;&lt;|</>
+      <literal>&lt;&lt;</literal>
+      <literal>&amp;&lt;</literal>
+      <literal>&amp;&amp;</literal>
+      <literal>&amp;&gt;</literal>
+      <literal>&gt;&gt;</literal>
+      <literal>~=</literal>
+      <literal>@&gt;</literal>
+      <literal>&lt;@</literal>
+      <literal>&amp;&lt;|</literal>
+      <literal>&lt;&lt;|</literal>
       <literal>|&gt;&gt;</literal>
-      <literal>|&amp;&gt;</>
+      <literal>|&amp;&gt;</literal>
      </entry>
     </row>
     <row>
@@ -249,11 +249,11 @@
      <entry><literal>network_inclusion_ops</literal></entry>
      <entry><type>inet</type></entry>
      <entry>
-      <literal>&amp;&amp;</>
-      <literal>&gt;&gt;=</>
+      <literal>&amp;&amp;</literal>
+      <literal>&gt;&gt;=</literal>
       <literal>&lt;&lt;=</literal>
       <literal>=</literal>
-      <literal>&gt;&gt;</>
+      <literal>&gt;&gt;</literal>
       <literal>&lt;&lt;</literal>
      </entry>
     </row>
@@ -346,18 +346,18 @@
      </entry>
     </row>
     <row>
-     <entry><literal>range_inclusion_ops</></entry>
+     <entry><literal>range_inclusion_ops</literal></entry>
      <entry><type>any range type</type></entry>
      <entry>
-      <literal>&lt;&lt;</>
-      <literal>&amp;&lt;</>
-      <literal>&amp;&amp;</>
-      <literal>&amp;&gt;</>
-      <literal>&gt;&gt;</>
-      <literal>@&gt;</>
-      <literal>&lt;@</>
-      <literal>-|-</>
-      <literal>=</>
+      <literal>&lt;&lt;</literal>
+      <literal>&amp;&lt;</literal>
+      <literal>&amp;&amp;</literal>
+      <literal>&amp;&gt;</literal>
+      <literal>&gt;&gt;</literal>
+      <literal>@&gt;</literal>
+      <literal>&lt;@</literal>
+      <literal>-|-</literal>
+      <literal>=</literal>
       <literal>&lt;</literal>
       <literal>&lt;=</literal>
       <literal>=</literal>
@@ -505,11 +505,11 @@
 
   <variablelist>
    <varlistentry>
-    <term><function>BrinOpcInfo *opcInfo(Oid type_oid)</></term>
+    <term><function>BrinOpcInfo *opcInfo(Oid type_oid)</function></term>
     <listitem>
      <para>
       Returns internal information about the indexed columns' summary data.
-      The return value must point to a palloc'd <structname>BrinOpcInfo</>,
+      The return value must point to a palloc'd <structname>BrinOpcInfo</structname>,
       which has this definition:
 <programlisting>
 typedef struct BrinOpcInfo
@@ -524,7 +524,7 @@ typedef struct BrinOpcInfo
     TypeCacheEntry *oi_typcache[FLEXIBLE_ARRAY_MEMBER];
 } BrinOpcInfo;
 </programlisting>
-      <structname>BrinOpcInfo</>.<structfield>oi_opaque</> can be used by the
+      <structname>BrinOpcInfo</structname>.<structfield>oi_opaque</structfield> can be used by the
       operator class routines to pass information between support procedures
       during an index scan.
      </para>
@@ -590,7 +590,7 @@ typedef struct BrinOpcInfo
   To write an operator class for a data type that implements a totally
   ordered set, it is possible to use the minmax support procedures
   alongside the corresponding operators, as shown in
-  <xref linkend="brin-extensibility-minmax-table">.
+  <xref linkend="brin-extensibility-minmax-table"/>.
   All operator class members (procedures and operators) are mandatory.
  </para>
 
@@ -648,7 +648,7 @@ typedef struct BrinOpcInfo
   To write an operator class for a complex data type which has values
   included within another type, it's possible to use the inclusion support
   procedures alongside the corresponding operators, as shown
-  in <xref linkend="brin-extensibility-inclusion-table">.  It requires
+  in <xref linkend="brin-extensibility-inclusion-table"/>.  It requires
   only a single additional function, which can be written in any language.
   More functions can be defined for additional functionality.  All operators
   are optional.  Some operators require other operators, as shown as
@@ -797,8 +797,8 @@ typedef struct BrinOpcInfo
     It should accept two arguments with the same data type as the operator class,
     and return the union of them.  The inclusion operator class can store union
     values with different data types if it is defined with the
-    <literal>STORAGE</> parameter.  The return value of the union
-    function should match the <literal>STORAGE</> data type.
+    <literal>STORAGE</literal> parameter.  The return value of the union
+    function should match the <literal>STORAGE</literal> data type.
  </para>
 
  <para>
@@ -821,13 +821,13 @@ typedef struct BrinOpcInfo
     additional data types to be supported by defining extra sets
     of operators.  Inclusion operator class operator strategies are dependent
     on another operator strategy as shown in
-    <xref linkend="brin-extensibility-inclusion-table">, or the same
+    <xref linkend="brin-extensibility-inclusion-table"/>, or the same
     operator strategy as themselves.  They require the dependency
-    operator to be defined with the <literal>STORAGE</> data type as the
+    operator to be defined with the <literal>STORAGE</literal> data type as the
     left-hand-side argument and the other supported data type to be the
     right-hand-side argument of the supported operator.  See
-    <literal>float4_minmax_ops</> as an example of minmax, and
-    <literal>box_inclusion_ops</> as an example of inclusion.
+    <literal>float4_minmax_ops</literal> as an example of minmax, and
+    <literal>box_inclusion_ops</literal> as an example of inclusion.
  </para>
 </sect1>
 </chapter>
diff --git a/doc/src/sgml/btree-gin.sgml b/doc/src/sgml/btree-gin.sgml
index 375e7ec4be..e491fa76e7 100644
--- a/doc/src/sgml/btree-gin.sgml
+++ b/doc/src/sgml/btree-gin.sgml
@@ -8,16 +8,16 @@
  </indexterm>
 
  <para>
-  <filename>btree_gin</> provides sample GIN operator classes that
+  <filename>btree_gin</filename> provides sample GIN operator classes that
   implement B-tree equivalent behavior for the data types
-  <type>int2</>, <type>int4</>, <type>int8</>, <type>float4</>,
-  <type>float8</>, <type>timestamp with time zone</>,
-  <type>timestamp without time zone</>, <type>time with time zone</>,
-  <type>time without time zone</>, <type>date</>, <type>interval</>,
-  <type>oid</>, <type>money</>, <type>"char"</>,
-  <type>varchar</>, <type>text</>, <type>bytea</>, <type>bit</>,
-  <type>varbit</>, <type>macaddr</>, <type>macaddr8</>, <type>inet</>,
-  <type>cidr</>, and all <type>enum</> types.
+  <type>int2</type>, <type>int4</type>, <type>int8</type>, <type>float4</type>,
+  <type>float8</type>, <type>timestamp with time zone</type>,
+  <type>timestamp without time zone</type>, <type>time with time zone</type>,
+  <type>time without time zone</type>, <type>date</type>, <type>interval</type>,
+  <type>oid</type>, <type>money</type>, <type>"char"</type>,
+  <type>varchar</type>, <type>text</type>, <type>bytea</type>, <type>bit</type>,
+  <type>varbit</type>, <type>macaddr</type>, <type>macaddr8</type>, <type>inet</type>,
+  <type>cidr</type>, and all <type>enum</type> types.
  </para>
 
  <para>
diff --git a/doc/src/sgml/btree-gist.sgml b/doc/src/sgml/btree-gist.sgml
index f3c639c2f3..774442feee 100644
--- a/doc/src/sgml/btree-gist.sgml
+++ b/doc/src/sgml/btree-gist.sgml
@@ -8,16 +8,16 @@
  </indexterm>
 
  <para>
-  <filename>btree_gist</> provides GiST index operator classes that
+  <filename>btree_gist</filename> provides GiST index operator classes that
   implement B-tree equivalent behavior for the data types
-  <type>int2</>, <type>int4</>, <type>int8</>, <type>float4</>,
-  <type>float8</>, <type>numeric</>, <type>timestamp with time zone</>,
-  <type>timestamp without time zone</>, <type>time with time zone</>,
-  <type>time without time zone</>, <type>date</>, <type>interval</>,
-  <type>oid</>, <type>money</>, <type>char</>,
-  <type>varchar</>, <type>text</>, <type>bytea</>, <type>bit</>,
-  <type>varbit</>, <type>macaddr</>, <type>macaddr8</>, <type>inet</>,
-  <type>cidr</>, <type>uuid</>, and all <type>enum</> types.
+  <type>int2</type>, <type>int4</type>, <type>int8</type>, <type>float4</type>,
+  <type>float8</type>, <type>numeric</type>, <type>timestamp with time zone</type>,
+  <type>timestamp without time zone</type>, <type>time with time zone</type>,
+  <type>time without time zone</type>, <type>date</type>, <type>interval</type>,
+  <type>oid</type>, <type>money</type>, <type>char</type>,
+  <type>varchar</type>, <type>text</type>, <type>bytea</type>, <type>bit</type>,
+  <type>varbit</type>, <type>macaddr</type>, <type>macaddr8</type>, <type>inet</type>,
+  <type>cidr</type>, <type>uuid</type>, and all <type>enum</type> types.
  </para>
 
  <para>
@@ -33,23 +33,23 @@
  </para>
 
  <para>
-  In addition to the typical B-tree search operators, <filename>btree_gist</>
+  In addition to the typical B-tree search operators, <filename>btree_gist</filename>
   also provides index support for <literal>&lt;&gt;</literal> (<quote>not
   equals</quote>). This may be useful in combination with an
-  <link linkend="SQL-CREATETABLE-EXCLUDE">exclusion constraint</link>,
+  <link linkend="sql-createtable-exclude">exclusion constraint</link>,
   as described below.
  </para>
 
  <para>
   Also, for data types for which there is a natural distance metric,
-  <filename>btree_gist</> defines a distance operator <literal>&lt;-&gt;</>,
+  <filename>btree_gist</filename> defines a distance operator <literal>&lt;-&gt;</literal>,
   and provides GiST index support for nearest-neighbor searches using
   this operator.  Distance operators are provided for
-  <type>int2</>, <type>int4</>, <type>int8</>, <type>float4</>,
-  <type>float8</>, <type>timestamp with time zone</>,
-  <type>timestamp without time zone</>,
-  <type>time without time zone</>, <type>date</>, <type>interval</>,
-  <type>oid</>, and <type>money</>.
+  <type>int2</type>, <type>int4</type>, <type>int8</type>, <type>float4</type>,
+  <type>float8</type>, <type>timestamp with time zone</type>,
+  <type>timestamp without time zone</type>,
+  <type>time without time zone</type>, <type>date</type>, <type>interval</type>,
+  <type>oid</type>, and <type>money</type>.
  </para>
 
  <sect2>
@@ -70,7 +70,7 @@ SELECT *, a &lt;-&gt; 42 AS dist FROM test ORDER BY a &lt;-&gt; 42 LIMIT 10;
 </programlisting>
 
   <para>
-   Use an <link linkend="SQL-CREATETABLE-EXCLUDE">exclusion
+   Use an <link linkend="sql-createtable-exclude">exclusion
    constraint</link> to enforce the rule that a cage at a zoo
    can contain only one kind of animal:
   </para>
diff --git a/doc/src/sgml/btree.sgml b/doc/src/sgml/btree.sgml
new file mode 100644
index 0000000000..10abf90189
--- /dev/null
+++ b/doc/src/sgml/btree.sgml
@@ -0,0 +1,446 @@
+<!-- doc/src/sgml/btree.sgml -->
+
+<chapter id="btree">
+<title>B-Tree Indexes</title>
+
+   <indexterm>
+    <primary>index</primary>
+    <secondary>B-Tree</secondary>
+   </indexterm>
+
+<sect1 id="btree-intro">
+ <title>Introduction</title>
+
+ <para>
+  <productname>PostgreSQL</productname> includes an implementation of the
+  standard <acronym>btree</acronym> (multi-way binary tree) index data
+  structure.  Any data type that can be sorted into a well-defined linear
+  order can be indexed by a btree index.  The only limitation is that an
+  index entry cannot exceed approximately one-third of a page (after TOAST
+  compression, if applicable).
+ </para>
+
+ <para>
+  Because each btree operator class imposes a sort order on its data type,
+  btree operator classes (or, really, operator families) have come to be
+  used as <productname>PostgreSQL</productname>'s general representation
+  and understanding of sorting semantics.  Therefore, they've acquired
+  some features that go beyond what would be needed just to support btree
+  indexes, and parts of the system that are quite distant from the
+  btree AM make use of them.
+ </para>
+
+</sect1>
+
+<sect1 id="btree-behavior">
+ <title>Behavior of B-Tree Operator Classes</title>
+
+ <para>
+  As shown in <xref linkend="xindex-btree-strat-table"/>, a btree operator
+  class must provide five comparison operators,
+  <literal>&lt;</literal>,
+  <literal>&lt;=</literal>,
+  <literal>=</literal>,
+  <literal>&gt;=</literal> and
+  <literal>&gt;</literal>.
+  One might expect that <literal>&lt;&gt;</literal> should also be part of
+  the operator class, but it is not, because it would almost never be
+  useful to use a <literal>&lt;&gt;</literal> WHERE clause in an index
+  search.  (For some purposes, the planner treats <literal>&lt;&gt;</literal>
+  as associated with a btree operator class; but it finds that operator via
+  the <literal>=</literal> operator's negator link, rather than
+  from <structname>pg_amop</structname>.)
+ </para>
+
+ <para>
+  When several data types share near-identical sorting semantics, their
+  operator classes can be grouped into an operator family.  Doing so is
+  advantageous because it allows the planner to make deductions about
+  cross-type comparisons.  Each operator class within the family should
+  contain the single-type operators (and associated support functions)
+  for its input data type, while cross-type comparison operators and
+  support functions are <quote>loose</quote> in the family.  It is
+  recommendable that a complete set of cross-type operators be included
+  in the family, thus ensuring that the planner can represent any
+  comparison conditions that it deduces from transitivity.
+ </para>
+
+ <para>
+  There are some basic assumptions that a btree operator family must
+  satisfy:
+ </para>
+
+ <itemizedlist>
+  <listitem>
+   <para>
+    An <literal>=</literal> operator must be an equivalence relation; that
+    is, for all non-null values <replaceable>A</replaceable>,
+    <replaceable>B</replaceable>, <replaceable>C</replaceable> of the
+    data type:
+
+    <itemizedlist>
+     <listitem>
+      <para>
+       <replaceable>A</replaceable> <literal>=</literal>
+       <replaceable>A</replaceable> is true
+       (<firstterm>reflexive law</firstterm>)
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       if <replaceable>A</replaceable> <literal>=</literal>
+       <replaceable>B</replaceable>,
+       then <replaceable>B</replaceable> <literal>=</literal>
+       <replaceable>A</replaceable>
+       (<firstterm>symmetric law</firstterm>)
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       if <replaceable>A</replaceable> <literal>=</literal>
+       <replaceable>B</replaceable> and <replaceable>B</replaceable>
+       <literal>=</literal> <replaceable>C</replaceable>,
+       then <replaceable>A</replaceable> <literal>=</literal>
+       <replaceable>C</replaceable>
+       (<firstterm>transitive law</firstterm>)
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    A <literal>&lt;</literal> operator must be a strong ordering relation;
+    that is, for all non-null values <replaceable>A</replaceable>,
+    <replaceable>B</replaceable>, <replaceable>C</replaceable>:
+
+    <itemizedlist>
+     <listitem>
+      <para>
+       <replaceable>A</replaceable> <literal>&lt;</literal>
+       <replaceable>A</replaceable> is false
+       (<firstterm>irreflexive law</firstterm>)
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       if <replaceable>A</replaceable> <literal>&lt;</literal>
+       <replaceable>B</replaceable>
+       and <replaceable>B</replaceable> <literal>&lt;</literal>
+       <replaceable>C</replaceable>,
+       then <replaceable>A</replaceable> <literal>&lt;</literal>
+       <replaceable>C</replaceable>
+       (<firstterm>transitive law</firstterm>)
+      </para>
+     </listitem>
+    </itemizedlist>
+   </para>
+  </listitem>
+
+  <listitem>
+   <para>
+    Furthermore, the ordering is total; that is, for all non-null
+    values <replaceable>A</replaceable>, <replaceable>B</replaceable>:
+
+    <itemizedlist>
+     <listitem>
+      <para>
+       exactly one of <replaceable>A</replaceable> <literal>&lt;</literal>
+       <replaceable>B</replaceable>, <replaceable>A</replaceable>
+       <literal>=</literal> <replaceable>B</replaceable>, and
+       <replaceable>B</replaceable> <literal>&lt;</literal>
+       <replaceable>A</replaceable> is true
+       (<firstterm>trichotomy law</firstterm>)
+      </para>
+     </listitem>
+    </itemizedlist>
+
+    (The trichotomy law justifies the definition of the comparison support
+    function, of course.)
+   </para>
+  </listitem>
+ </itemizedlist>
+
+ <para>
+  The other three operators are defined in terms of <literal>=</literal>
+  and <literal>&lt;</literal> in the obvious way, and must act consistently
+  with them.
+ </para>
+
+ <para>
+  For an operator family supporting multiple data types, the above laws must
+  hold when <replaceable>A</replaceable>, <replaceable>B</replaceable>,
+  <replaceable>C</replaceable> are taken from any data types in the family.
+  The transitive laws are the trickiest to ensure, as in cross-type
+  situations they represent statements that the behaviors of two or three
+  different operators are consistent.
+  As an example, it would not work to put <type>float8</type>
+  and <type>numeric</type> into the same operator family, at least not with
+  the current semantics that <type>numeric</type> values are converted
+  to <type>float8</type> for comparison to a <type>float8</type>.  Because
+  of the limited accuracy of <type>float8</type>, this means there are
+  distinct <type>numeric</type> values that will compare equal to the
+  same <type>float8</type> value, and thus the transitive law would fail.
+ </para>
+
+ <para>
+  Another requirement for a multiple-data-type family is that any implicit
+  or binary-coercion casts that are defined between data types included in
+  the operator family must not change the associated sort ordering.
+ </para>
+
+ <para>
+  It should be fairly clear why a btree index requires these laws to hold
+  within a single data type: without them there is no ordering to arrange
+  the keys with.  Also, index searches using a comparison key of a
+  different data type require comparisons to behave sanely across two
+  data types.  The extensions to three or more data types within a family
+  are not strictly required by the btree index mechanism itself, but the
+  planner relies on them for optimization purposes.
+ </para>
+
+</sect1>
+
+<sect1 id="btree-support-funcs">
+ <title>B-Tree Support Functions</title>
+
+ <para>
+  As shown in <xref linkend="xindex-btree-support-table"/>, btree defines
+  one required and two optional support functions.
+ </para>
+
+ <para>
+  For each combination of data types that a btree operator family provides
+  comparison operators for, it must provide a comparison support function,
+  registered in <structname>pg_amproc</structname> with support function
+  number 1 and
+  <structfield>amproclefttype</structfield>/<structfield>amprocrighttype</structfield>
+  equal to the left and right data types for the comparison (i.e., the
+  same data types that the matching operators are registered with
+  in <structname>pg_amop</structname>).
+  The comparison function must take two non-null values
+  <replaceable>A</replaceable> and <replaceable>B</replaceable> and
+  return an <type>int32</type> value that
+  is <literal>&lt;</literal> <literal>0</literal>, <literal>0</literal>,
+  or <literal>&gt;</literal> <literal>0</literal>
+  when <replaceable>A</replaceable> <literal>&lt;</literal>
+  <replaceable>B</replaceable>, <replaceable>A</replaceable>
+  <literal>=</literal> <replaceable>B</replaceable>,
+  or <replaceable>A</replaceable> <literal>&gt;</literal>
+  <replaceable>B</replaceable>, respectively.  The function must not
+  return <literal>INT_MIN</literal> for the <replaceable>A</replaceable>
+  <literal>&lt;</literal> <replaceable>B</replaceable> case,
+  since the value may be negated before being tested for sign.  A null
+  result is disallowed, too.
+  See <filename>src/backend/access/nbtree/nbtcompare.c</filename> for
+  examples.
+ </para>
+
+ <para>
+  If the compared values are of a collatable data type, the appropriate
+  collation OID will be passed to the comparison support function, using
+  the standard <function>PG_GET_COLLATION()</function> mechanism.
+ </para>
+
+ <para>
+  Optionally, a btree operator family may provide <firstterm>sort
+  support</firstterm> function(s), registered under support function number
+  2.  These functions allow implementing comparisons for sorting purposes
+  in a more efficient way than naively calling the comparison support
+  function.  The APIs involved in this are defined in
+  <filename>src/include/utils/sortsupport.h</filename>.
+ </para>
+
+ <indexterm>
+  <primary>in_range support functions</primary>
+ </indexterm>
+
+ <indexterm>
+  <primary>support functions</primary>
+  <secondary>in_range</secondary>
+ </indexterm>
+
+ <para>
+  Optionally, a btree operator family may
+  provide <firstterm>in_range</firstterm> support function(s), registered
+  under support function number 3.  These are not used during btree index
+  operations; rather, they extend the semantics of the operator family so
+  that it can support window clauses containing
+  the <literal>RANGE</literal> <replaceable>offset</replaceable>
+  <literal>PRECEDING</literal>
+  and <literal>RANGE</literal> <replaceable>offset</replaceable>
+  <literal>FOLLOWING</literal> frame bound types (see
+  <xref linkend="syntax-window-functions"/>).  Fundamentally, the extra
+  information provided is how to add or subtract
+  an <replaceable>offset</replaceable> value in a way that is compatible
+  with the family's data ordering.
+ </para>
+
+ <para>
+  An <function>in_range</function> function must have the signature
+<synopsis>
+in_range(<replaceable>val</replaceable> type1, <replaceable>base</replaceable> type1, <replaceable>offset</replaceable> type2, <replaceable>sub</replaceable> bool, <replaceable>less</replaceable> bool)
+returns bool
+</synopsis>
+  <replaceable>val</replaceable> and <replaceable>base</replaceable> must be
+  of the same type, which is one of the types supported by the operator
+  family (i.e., a type for which it provides an ordering).
+  However, <replaceable>offset</replaceable> could be of a different type,
+  which might be one otherwise unsupported by the family.  An example is
+  that the built-in <literal>time_ops</literal> family provides
+  an <function>in_range</function> function that
+  has <replaceable>offset</replaceable> of type <type>interval</type>.
+  A family can provide <function>in_range</function> functions for any of
+  its supported types and one or more <replaceable>offset</replaceable>
+  types.  Each <function>in_range</function> function should be entered
+  in <structname>pg_amproc</structname>
+  with <structfield>amproclefttype</structfield> equal to <type>type1</type>
+  and <structfield>amprocrighttype</structfield> equal to <type>type2</type>.
+ </para>
+
+ <para>
+  The essential semantics of an <function>in_range</function> function
+  depend on the two boolean flag parameters.  It should add or
+  subtract <replaceable>base</replaceable>
+  and <replaceable>offset</replaceable>, then
+  compare <replaceable>val</replaceable> to the result, as follows:
+  <itemizedlist>
+   <listitem>
+    <para>
+     if <literal>!</literal><replaceable>sub</replaceable> and
+     <literal>!</literal><replaceable>less</replaceable>,
+     return <replaceable>val</replaceable> <literal>&gt;=</literal>
+     (<replaceable>base</replaceable> <literal>+</literal>
+     <replaceable>offset</replaceable>)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     if <literal>!</literal><replaceable>sub</replaceable>
+     and <replaceable>less</replaceable>,
+     return <replaceable>val</replaceable> <literal>&lt;=</literal>
+     (<replaceable>base</replaceable> <literal>+</literal>
+     <replaceable>offset</replaceable>)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     if <replaceable>sub</replaceable>
+     and <literal>!</literal><replaceable>less</replaceable>,
+     return <replaceable>val</replaceable> <literal>&gt;=</literal>
+     (<replaceable>base</replaceable> <literal>-</literal>
+     <replaceable>offset</replaceable>)
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     if <replaceable>sub</replaceable> and <replaceable>less</replaceable>,
+     return <replaceable>val</replaceable> <literal>&lt;=</literal>
+     (<replaceable>base</replaceable> <literal>-</literal>
+     <replaceable>offset</replaceable>)
+    </para>
+   </listitem>
+  </itemizedlist>
+  Before doing so, the function should check the sign
+  of <replaceable>offset</replaceable>: if it is less than zero, raise
+  error <literal>ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE</literal> (22013)
+  with error text like <quote>invalid preceding or following size in window
+  function</quote>.  (This is required by the SQL standard, although
+  nonstandard operator families might perhaps choose to ignore this
+  restriction, since there seems to be little semantic necessity for it.)
+  This requirement is delegated to the <function>in_range</function>
+  function so that the core code needn't understand what <quote>less than
+  zero</quote> means for a particular data type.
+ </para>
+
+ <para>
+  An additional expectation is that <function>in_range</function> functions
+  should, if practical, avoid throwing an error
+  if <replaceable>base</replaceable> <literal>+</literal>
+  <replaceable>offset</replaceable>
+  or <replaceable>base</replaceable> <literal>-</literal>
+  <replaceable>offset</replaceable> would overflow.
+  The correct comparison result can be determined even if that value would
+  be out of the data type's range.  Note that if the data type includes
+  concepts such as <quote>infinity</quote> or <quote>NaN</quote>, extra care
+  may be needed to ensure that <function>in_range</function>'s results agree
+  with the normal sort order of the operator family.
+ </para>
+
+ <para>
+  The results of the <function>in_range</function> function must be
+  consistent with the sort ordering imposed by the operator family.
+  To be precise, given any fixed values of <replaceable>offset</replaceable>
+  and <replaceable>sub</replaceable>, then:
+  <itemizedlist>
+   <listitem>
+    <para>
+     If <function>in_range</function> with <replaceable>less</replaceable> =
+     true is true for some <replaceable>val1</replaceable>
+     and <replaceable>base</replaceable>, it must be true for
+     every <replaceable>val2</replaceable> <literal>&lt;=</literal>
+     <replaceable>val1</replaceable> with the
+     same <replaceable>base</replaceable>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If <function>in_range</function> with <replaceable>less</replaceable> =
+     true is false for some <replaceable>val1</replaceable>
+     and <replaceable>base</replaceable>, it must be false for
+     every <replaceable>val2</replaceable> <literal>&gt;=</literal>
+     <replaceable>val1</replaceable> with the
+     same <replaceable>base</replaceable>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If <function>in_range</function> with <replaceable>less</replaceable> =
+     true is true for some <replaceable>val</replaceable>
+     and <replaceable>base1</replaceable>, it must be true for
+     every <replaceable>base2</replaceable> <literal>&gt;=</literal>
+     <replaceable>base1</replaceable> with the
+     same <replaceable>val</replaceable>.
+    </para>
+   </listitem>
+   <listitem>
+    <para>
+     If <function>in_range</function> with <replaceable>less</replaceable> =
+     true is false for some <replaceable>val</replaceable>
+     and <replaceable>base1</replaceable>, it must be false for
+     every <replaceable>base2</replaceable> <literal>&lt;=</literal>
+     <replaceable>base1</replaceable> with the
+     same <replaceable>val</replaceable>.
+    </para>
+   </listitem>
+  </itemizedlist>
+  Analogous statements with inverted conditions hold
+  when <replaceable>less</replaceable> = false.
+ </para>
+
+ <para>
+  If the type being ordered (<type>type1</type>) is collatable,
+  the appropriate collation OID will be passed to
+  the <function>in_range</function> function, using the standard
+  PG_GET_COLLATION() mechanism.
+ </para>
+
+ <para>
+  <function>in_range</function> functions need not handle NULL inputs, and
+  typically will be marked strict.
+ </para>
+
+</sect1>
+
+<sect1 id="btree-implementation">
+ <title>Implementation</title>
+
+  <para>
+   An introduction to the btree index implementation can be found in
+   <filename>src/backend/access/nbtree/README</filename>.
+  </para>
+
+</sect1>
+
+</chapter>
diff --git a/doc/src/sgml/catalogs.sgml b/doc/src/sgml/catalogs.sgml
index ef7054cf26..71e20f2740 100644
--- a/doc/src/sgml/catalogs.sgml
+++ b/doc/src/sgml/catalogs.sgml
@@ -27,7 +27,7 @@
   <title>Overview</title>
 
   <para>
-   <xref linkend="catalog-table"> lists the system catalogs.
+   <xref linkend="catalog-table"/> lists the system catalogs.
    More detailed documentation of each catalog follows below.
   </para>
 
@@ -387,7 +387,7 @@
   </para>
 
   <table>
-   <title><structname>pg_aggregate</> Columns</title>
+   <title><structname>pg_aggregate</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -410,9 +410,9 @@
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>Aggregate kind:
-       <literal>n</literal> for <quote>normal</> aggregates,
-       <literal>o</literal> for <quote>ordered-set</> aggregates, or
-       <literal>h</literal> for <quote>hypothetical-set</> aggregates
+       <literal>n</literal> for <quote>normal</quote> aggregates,
+       <literal>o</literal> for <quote>ordered-set</quote> aggregates, or
+       <literal>h</literal> for <quote>hypothetical-set</quote> aggregates
       </entry>
      </row>
      <row>
@@ -421,7 +421,7 @@
       <entry></entry>
       <entry>Number of direct (non-aggregated) arguments of an ordered-set or
        hypothetical-set aggregate, counting a variadic array as one argument.
-       If equal to <structfield>pronargs</>, the aggregate must be variadic
+       If equal to <structfield>pronargs</structfield>, the aggregate must be variadic
        and the variadic array describes the aggregated arguments as well as
        the final direct arguments.
        Always zero for normal aggregates.</entry>
@@ -486,6 +486,26 @@
       <entry></entry>
       <entry>True to pass extra dummy arguments to <structfield>aggmfinalfn</structfield></entry>
      </row>
+     <row>
+      <entry><structfield>aggfinalmodify</structfield></entry>
+      <entry><type>char</type></entry>
+      <entry></entry>
+      <entry>Whether <structfield>aggfinalfn</structfield> modifies the
+       transition state value:
+       <literal>r</literal> if it is read-only,
+       <literal>s</literal> if the <structfield>aggtransfn</structfield>
+       cannot be applied after the <structfield>aggfinalfn</structfield>, or
+       <literal>w</literal> if it writes on the value
+      </entry>
+     </row>
+     <row>
+      <entry><structfield>aggmfinalmodify</structfield></entry>
+      <entry><type>char</type></entry>
+      <entry></entry>
+      <entry>Like <structfield>aggfinalmodify</structfield>, but for
+       the <structfield>aggmfinalfn</structfield>
+      </entry>
+     </row>
      <row>
       <entry><structfield>aggsortop</structfield></entry>
       <entry><type>oid</type></entry>
@@ -547,8 +567,8 @@
 
   <para>
    New aggregate functions are registered with the <xref
-   linkend="sql-createaggregate">
-   command.  See <xref linkend="xaggr"> for more information about
+   linkend="sql-createaggregate"/>
+   command.  See <xref linkend="xaggr"/> for more information about
    writing aggregate functions and the meaning of the transition
    functions, etc.
   </para>
@@ -568,11 +588,11 @@
    relation access methods.  There is one row for each access method supported
    by the system.
    Currently, only indexes have access methods.  The requirements for index
-   access methods are discussed in detail in <xref linkend="indexam">.
+   access methods are discussed in detail in <xref linkend="indexam"/>.
   </para>
 
   <table>
-   <title><structname>pg_am</> Columns</title>
+   <title><structname>pg_am</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -624,12 +644,12 @@
 
   <note>
    <para>
-    Before <productname>PostgreSQL</> 9.6, <structname>pg_am</structname>
+    Before <productname>PostgreSQL</productname> 9.6, <structname>pg_am</structname>
     contained many additional columns representing properties of index access
     methods.  That data is now only directly visible at the C code level.
     However, <function>pg_index_column_has_property()</function> and related
     functions have been added to allow SQL queries to inspect index access
-    method properties; see <xref linkend="functions-info-catalog-table">.
+    method properties; see <xref linkend="functions-info-catalog-table"/>.
    </para>
   </note>
 
@@ -647,8 +667,8 @@
    The catalog <structname>pg_amop</structname> stores information about
    operators associated with access method operator families.  There is one
    row for each operator that is a member of an operator family.  A family
-   member can be either a <firstterm>search</> operator or an
-   <firstterm>ordering</> operator.  An operator
+   member can be either a <firstterm>search</firstterm> operator or an
+   <firstterm>ordering</firstterm> operator.  An operator
    can appear in more than one family, but cannot appear in more than one
    search position nor more than one ordering position within a family.
    (It is allowed, though unlikely, for an operator to be used for both
@@ -656,7 +676,7 @@
   </para>
 
   <table>
-   <title><structname>pg_amop</> Columns</title>
+   <title><structname>pg_amop</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -708,8 +728,8 @@
       <entry><structfield>amoppurpose</structfield></entry>
       <entry><type>char</type></entry>
       <entry></entry>
-      <entry>Operator purpose, either <literal>s</> for search or
-       <literal>o</> for ordering</entry>
+      <entry>Operator purpose, either <literal>s</literal> for search or
+       <literal>o</literal> for ordering</entry>
      </row>
 
      <row>
@@ -739,26 +759,26 @@
   </table>
 
   <para>
-   A <quote>search</> operator entry indicates that an index of this operator
+   A <quote>search</quote> operator entry indicates that an index of this operator
    family can be searched to find all rows satisfying
-   <literal>WHERE</>
-   <replaceable>indexed_column</>
-   <replaceable>operator</>
-   <replaceable>constant</>.
+   <literal>WHERE</literal>
+   <replaceable>indexed_column</replaceable>
+   <replaceable>operator</replaceable>
+   <replaceable>constant</replaceable>.
    Obviously, such an operator must return <type>boolean</type>, and its left-hand input
    type must match the index's column data type.
   </para>
 
   <para>
-   An <quote>ordering</> operator entry indicates that an index of this
+   An <quote>ordering</quote> operator entry indicates that an index of this
    operator family can be scanned to return rows in the order represented by
-   <literal>ORDER BY</>
-   <replaceable>indexed_column</>
-   <replaceable>operator</>
-   <replaceable>constant</>.
+   <literal>ORDER BY</literal>
+   <replaceable>indexed_column</replaceable>
+   <replaceable>operator</replaceable>
+   <replaceable>constant</replaceable>.
    Such an operator could return any sortable data type, though again
    its left-hand input type must match the index's column data type.
-   The exact semantics of the <literal>ORDER BY</> are specified by the
+   The exact semantics of the <literal>ORDER BY</literal> are specified by the
    <structfield>amopsortfamily</structfield> column, which must reference
    a B-tree operator family for the operator's result type.
   </para>
@@ -767,19 +787,19 @@
    <para>
     At present, it's assumed that the sort order for an ordering operator
     is the default for the referenced operator family, i.e., <literal>ASC NULLS
-    LAST</>.  This might someday be relaxed by adding additional columns
+    LAST</literal>.  This might someday be relaxed by adding additional columns
     to specify sort options explicitly.
    </para>
   </note>
 
   <para>
-   An entry's <structfield>amopmethod</> must match the
-   <structname>opfmethod</> of its containing operator family (including
-   <structfield>amopmethod</> here is an intentional denormalization of the
+   An entry's <structfield>amopmethod</structfield> must match the
+   <structname>opfmethod</structname> of its containing operator family (including
+   <structfield>amopmethod</structfield> here is an intentional denormalization of the
    catalog structure for performance reasons).  Also,
-   <structfield>amoplefttype</> and <structfield>amoprighttype</> must match
-   the <structfield>oprleft</> and <structfield>oprright</> fields of the
-   referenced <structname>pg_operator</> entry.
+   <structfield>amoplefttype</structfield> and <structfield>amoprighttype</structfield> must match
+   the <structfield>oprleft</structfield> and <structfield>oprright</structfield> fields of the
+   referenced <structname>pg_operator</structname> entry.
   </para>
 
  </sect1>
@@ -860,14 +880,14 @@
 
   <para>
    The usual interpretation of the
-   <structfield>amproclefttype</> and <structfield>amprocrighttype</> fields
+   <structfield>amproclefttype</structfield> and <structfield>amprocrighttype</structfield> fields
    is that they identify the left and right input types of the operator(s)
    that a particular support procedure supports.  For some access methods
    these match the input data type(s) of the support procedure itself, for
-   others not.  There is a notion of <quote>default</> support procedures for
-   an index, which are those with <structfield>amproclefttype</> and
-   <structfield>amprocrighttype</> both equal to the index operator class's
-   <structfield>opcintype</>.
+   others not.  There is a notion of <quote>default</quote> support procedures for
+   an index, which are those with <structfield>amproclefttype</structfield> and
+   <structfield>amprocrighttype</structfield> both equal to the index operator class's
+   <structfield>opcintype</structfield>.
   </para>
 
  </sect1>
@@ -889,7 +909,7 @@
   </para>
 
   <table>
-   <title><structname>pg_attrdef</> Columns</title>
+   <title><structname>pg_attrdef</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -944,7 +964,7 @@
     The <structfield>adsrc</structfield> field is historical, and is best
     not used, because it does not track outside changes that might affect
     the representation of the default value.  Reverse-compiling the
-    <structfield>adbin</structfield> field (with <function>pg_get_expr</> for
+    <structfield>adbin</structfield> field (with <function>pg_get_expr</function> for
     example) is a better way to display the default value.
    </para>
 
@@ -973,7 +993,7 @@
   </para>
 
   <table>
-   <title><structname>pg_attribute</> Columns</title>
+   <title><structname>pg_attribute</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -1014,7 +1034,7 @@
       <entry>
        <structfield>attstattarget</structfield> controls the level of detail
        of statistics accumulated for this column by
-       <xref linkend="sql-analyze">.
+       <xref linkend="sql-analyze"/>.
        A zero value indicates that no statistics should be collected.
        A negative value says to use the system default statistics target.
        The exact meaning of positive values is data type-dependent.
@@ -1052,7 +1072,7 @@
       <entry>
        Number of dimensions, if the column is an array type; otherwise 0.
        (Presently, the number of dimensions of an array is not enforced,
-       so any nonzero value effectively means <quote>it's an array</>.)
+       so any nonzero value effectively means <quote>it's an array</quote>.)
       </entry>
      </row>
 
@@ -1076,7 +1096,7 @@
        supplied at table creation time (for example, the maximum
        length of a <type>varchar</type> column).  It is passed to
        type-specific input functions and length coercion functions.
-       The value will generally be -1 for types that do not need <structfield>atttypmod</>.
+       The value will generally be -1 for types that do not need <structfield>atttypmod</structfield>.
       </entry>
      </row>
 
@@ -1085,7 +1105,7 @@
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       A copy of <literal>pg_type.typbyval</> of this column's type
+       A copy of <literal>pg_type.typbyval</literal> of this column's type
       </entry>
      </row>
 
@@ -1094,7 +1114,7 @@
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Normally a copy of <literal>pg_type.typstorage</> of this
+       Normally a copy of <literal>pg_type.typstorage</literal> of this
        column's type.  For TOAST-able data types, this can be altered
        after column creation to control storage policy.
       </entry>
@@ -1105,7 +1125,7 @@
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       A copy of <literal>pg_type.typalign</> of this column's type
+       A copy of <literal>pg_type.typalign</literal> of this column's type
       </entry>
      </row>
 
@@ -1196,7 +1216,7 @@
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Attribute-level options, as <quote>keyword=value</> strings
+       Attribute-level options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
 
@@ -1205,7 +1225,7 @@
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Attribute-level foreign data wrapper options, as <quote>keyword=value</> strings
+       Attribute-level foreign data wrapper options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
 
@@ -1217,9 +1237,9 @@
    In a dropped column's <structname>pg_attribute</structname> entry,
    <structfield>atttypid</structfield> is reset to zero, but
    <structfield>attlen</structfield> and the other fields copied from
-   <structname>pg_type</> are still valid.  This arrangement is needed
+   <structname>pg_type</structname> are still valid.  This arrangement is needed
    to cope with the situation where the dropped column's data type was
-   later dropped, and so there is no <structname>pg_type</> row anymore.
+   later dropped, and so there is no <structname>pg_type</structname> row anymore.
    <structfield>attlen</structfield> and the other fields can be used
    to interpret the contents of a row of the table.
   </para>
@@ -1236,9 +1256,9 @@
   <para>
    The catalog <structname>pg_authid</structname> contains information about
    database authorization identifiers (roles).  A role subsumes the concepts
-   of <quote>users</> and <quote>groups</>.  A user is essentially just a
-   role with the <structfield>rolcanlogin</> flag set.  Any role (with or
-   without <structfield>rolcanlogin</>) can have other roles as members; see
+   of <quote>users</quote> and <quote>groups</quote>.  A user is essentially just a
+   role with the <structfield>rolcanlogin</structfield> flag set.  Any role (with or
+   without <structfield>rolcanlogin</structfield>) can have other roles as members; see
    <link linkend="catalog-pg-auth-members"><structname>pg_auth_members</structname></link>.
   </para>
 
@@ -1250,7 +1270,7 @@
   </para>
 
   <para>
-   <xref linkend="user-manag"> contains detailed information about user and
+   <xref linkend="user-manag"/> contains detailed information about user and
    privilege management.
   </para>
 
@@ -1263,7 +1283,7 @@
   </para>
 
   <table>
-   <title><structname>pg_authid</> Columns</title>
+   <title><structname>pg_authid</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -1336,7 +1356,7 @@
       <entry><type>bool</type></entry>
       <entry>
        Role bypasses every row level security policy, see
-       <xref linkend="ddl-rowsecurity"> for more information.
+       <xref linkend="ddl-rowsecurity"/> for more information.
       </entry>
      </row>
 
@@ -1370,20 +1390,20 @@
 
   <para>
    For an MD5 encrypted password, <structfield>rolpassword</structfield>
-   column will begin with the string <literal>md5</> followed by a
+   column will begin with the string <literal>md5</literal> followed by a
    32-character hexadecimal MD5 hash. The MD5 hash will be of the user's
    password concatenated to their user name. For example, if user
-   <literal>joe</> has password <literal>xyzzy</>, <productname>PostgreSQL</>
-   will store the md5 hash of <literal>xyzzyjoe</>.
+   <literal>joe</literal> has password <literal>xyzzy</literal>, <productname>PostgreSQL</productname>
+   will store the md5 hash of <literal>xyzzyjoe</literal>.
   </para>
 
   <para>
    If the password is encrypted with SCRAM-SHA-256, it has the format:
 <synopsis>
-SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;</>$<replaceable>&lt;StoredKey&gt;</>:<replaceable>&lt;ServerKey&gt;</>
+SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</replaceable>:<replaceable>&lt;salt&gt;</replaceable>$<replaceable>&lt;StoredKey&gt;</replaceable>:<replaceable>&lt;ServerKey&gt;</replaceable>
 </synopsis>
-   where <replaceable>salt</>, <replaceable>StoredKey</> and
-   <replaceable>ServerKey</> are in Base64 encoded format. This format is
+   where <replaceable>salt</replaceable>, <replaceable>StoredKey</replaceable> and
+   <replaceable>ServerKey</replaceable> are in Base64 encoded format. This format is
    the same as that specified by RFC 5803.
   </para>
 
@@ -1415,7 +1435,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_auth_members</> Columns</title>
+   <title><structname>pg_auth_members</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -1439,7 +1459,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>member</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>.oid</literal></entry>
-      <entry>ID of a role that is a member of <structfield>roleid</></entry>
+      <entry>ID of a role that is a member of <structfield>roleid</structfield></entry>
      </row>
 
      <row>
@@ -1453,8 +1473,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>admin_option</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>True if <structfield>member</> can grant membership in
-       <structfield>roleid</> to others</entry>
+      <entry>True if <structfield>member</structfield> can grant membership in
+       <structfield>roleid</structfield> to others</entry>
      </row>
     </tbody>
    </tgroup>
@@ -1481,14 +1501,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    cannot be deduced from some generic rule.  For example, casting between a
    domain and its base type is not explicitly represented in
    <structname>pg_cast</structname>.  Another important exception is that
-   <quote>automatic I/O conversion casts</>, those performed using a data
-   type's own I/O functions to convert to or from <type>text</> or other
+   <quote>automatic I/O conversion casts</quote>, those performed using a data
+   type's own I/O functions to convert to or from <type>text</type> or other
    string types, are not explicitly represented in
    <structname>pg_cast</structname>.
   </para>
 
   <table>
-   <title><structname>pg_cast</> Columns</title>
+   <title><structname>pg_cast</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -1538,11 +1558,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Indicates what contexts the cast can be invoked in.
-       <literal>e</> means only as an explicit cast (using
-       <literal>CAST</> or <literal>::</> syntax).
-       <literal>a</> means implicitly in assignment
+       <literal>e</literal> means only as an explicit cast (using
+       <literal>CAST</literal> or <literal>::</literal> syntax).
+       <literal>a</literal> means implicitly in assignment
        to a target column, as well as explicitly.
-       <literal>i</> means implicitly in expressions, as well as the
+       <literal>i</literal> means implicitly in expressions, as well as the
        other cases.
       </entry>
      </row>
@@ -1552,9 +1572,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Indicates how the cast is performed.
-       <literal>f</> means that the function specified in the <structfield>castfunc</> field is used.
-       <literal>i</> means that the input/output functions are used.
-       <literal>b</> means that the types are binary-coercible, thus no conversion is required.
+       <literal>f</literal> means that the function specified in the <structfield>castfunc</structfield> field is used.
+       <literal>i</literal> means that the input/output functions are used.
+       <literal>b</literal> means that the types are binary-coercible, thus no conversion is required.
       </entry>
      </row>
     </tbody>
@@ -1566,18 +1586,18 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    always take the cast source type as their first argument type, and
    return the cast destination type as their result type.  A cast
    function can have up to three arguments.  The second argument,
-   if present, must be type <type>integer</>; it receives the type
+   if present, must be type <type>integer</type>; it receives the type
    modifier associated with the destination type, or -1
    if there is none.  The third argument,
-   if present, must be type <type>boolean</>; it receives <literal>true</>
-   if the cast is an explicit cast, <literal>false</> otherwise.
+   if present, must be type <type>boolean</type>; it receives <literal>true</literal>
+   if the cast is an explicit cast, <literal>false</literal> otherwise.
   </para>
 
   <para>
    It is legitimate to create a <structname>pg_cast</structname> entry
    in which the source and target types are the same, if the associated
    function takes more than one argument.  Such entries represent
-   <quote>length coercion functions</> that coerce values of the type
+   <quote>length coercion functions</quote> that coerce values of the type
    to be legal for a particular type modifier value.
   </para>
 
@@ -1604,14 +1624,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    table.  This includes indexes (but see also
    <structname>pg_index</structname>), sequences (but see also
    <structname>pg_sequence</structname>), views, materialized
-   views, composite types, and TOAST tables; see <structfield>relkind</>.
+   views, composite types, and TOAST tables; see <structfield>relkind</structfield>.
    Below, when we mean all of these
    kinds of objects we speak of <quote>relations</quote>.  Not all
    columns are meaningful for all relation types.
   </para>
 
   <table>
-   <title><structname>pg_class</> Columns</title>
+   <title><structname>pg_class</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -1653,7 +1673,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
       <entry>
        The OID of the data type that corresponds to this table's row type,
-       if any (zero for indexes, which have no <structname>pg_type</> entry)
+       if any (zero for indexes, which have no <structname>pg_type</structname> entry)
       </entry>
      </row>
 
@@ -1686,7 +1706,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>oid</type></entry>
       <entry></entry>
       <entry>Name of the on-disk file of this relation; zero means this
-       is a <quote>mapped</> relation whose disk file name is determined
+       is a <quote>mapped</quote> relation whose disk file name is determined
        by low-level state</entry>
      </row>
 
@@ -1775,8 +1795,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       <literal>p</> = permanent table, <literal>u</> = unlogged table,
-       <literal>t</> = temporary table
+       <literal>p</literal> = permanent table, <literal>u</literal> = unlogged table,
+       <literal>t</literal> = temporary table
       </entry>
      </row>
 
@@ -1785,15 +1805,15 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       <literal>r</> = ordinary table,
-       <literal>i</> = index,
-       <literal>S</> = sequence,
-       <literal>t</> = TOAST table,
-       <literal>v</> = view,
-       <literal>m</> = materialized view,
-       <literal>c</> = composite type,
-       <literal>f</> = foreign table,
-       <literal>p</> = partitioned table
+       <literal>r</literal> = ordinary table,
+       <literal>i</literal> = index,
+       <literal>S</literal> = sequence,
+       <literal>t</literal> = TOAST table,
+       <literal>v</literal> = view,
+       <literal>m</literal> = materialized view,
+       <literal>c</literal> = composite type,
+       <literal>f</literal> = foreign table,
+       <literal>p</literal> = partitioned table
       </entry>
      </row>
 
@@ -1814,7 +1834,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>int2</type></entry>
       <entry></entry>
       <entry>
-       Number of <literal>CHECK</> constraints on the table; see
+       Number of <literal>CHECK</literal> constraints on the table; see
        <link linkend="catalog-pg-constraint"><structname>pg_constraint</structname></link> catalog
       </entry>
      </row>
@@ -1897,11 +1917,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Columns used to form <quote>replica identity</> for rows:
-       <literal>d</> = default (primary key, if any),
-       <literal>n</> = nothing,
-       <literal>f</> = all columns
-       <literal>i</> = index with <structfield>indisreplident</structfield> set, or default
+       Columns used to form <quote>replica identity</quote> for rows:
+       <literal>d</literal> = default (primary key, if any),
+       <literal>n</literal> = nothing,
+       <literal>f</literal> = all columns
+       <literal>i</literal> = index with <structfield>indisreplident</structfield> set, or default
       </entry>
      </row>
 
@@ -1918,9 +1938,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        All transaction IDs before this one have been replaced with a permanent
-       (<quote>frozen</>) transaction ID in this table.  This is used to track
+       (<quote>frozen</quote>) transaction ID in this table.  This is used to track
        whether the table needs to be vacuumed in order to prevent transaction
-       ID wraparound or to allow <literal>pg_xact</> to be shrunk.  Zero
+       ID wraparound or to allow <literal>pg_xact</literal> to be shrunk.  Zero
        (<symbol>InvalidTransactionId</symbol>) if the relation is not a table.
       </entry>
      </row>
@@ -1933,7 +1953,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        All multixact IDs before this one have been replaced by a
        transaction ID in this table.  This is used to track
        whether the table needs to be vacuumed in order to prevent multixact ID
-       wraparound or to allow <literal>pg_multixact</> to be shrunk.  Zero
+       wraparound or to allow <literal>pg_multixact</literal> to be shrunk.  Zero
        (<symbol>InvalidMultiXactId</symbol>) if the relation is not a table.
       </entry>
      </row>
@@ -1944,8 +1964,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -1955,7 +1975,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Access-method-specific options, as <quote>keyword=value</> strings
+       Access-method-specific options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
 
@@ -1973,13 +1993,13 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   Several of the Boolean flags in <structname>pg_class</> are maintained
+   Several of the Boolean flags in <structname>pg_class</structname> are maintained
    lazily: they are guaranteed to be true if that's the correct state, but
    may not be reset to false immediately when the condition is no longer
-   true.  For example, <structfield>relhasindex</> is set by
+   true.  For example, <structfield>relhasindex</structfield> is set by
    <command>CREATE INDEX</command>, but it is never cleared by
    <command>DROP INDEX</command>.  Instead, <command>VACUUM</command> clears
-   <structfield>relhasindex</> if it finds the table has no indexes.  This
+   <structfield>relhasindex</structfield> if it finds the table has no indexes.  This
    arrangement avoids race conditions and improves concurrency.
   </para>
  </sect1>
@@ -1995,11 +2015,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    The catalog <structname>pg_collation</structname> describes the
    available collations, which are essentially mappings from an SQL
    name to operating system locale categories.
-   See <xref linkend="collation"> for more information.
+   See <xref linkend="collation"/> for more information.
   </para>
 
   <table>
-   <title><structname>pg_collation</> Columns</title>
+   <title><structname>pg_collation</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2062,14 +2082,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>collcollate</structfield></entry>
       <entry><type>name</type></entry>
       <entry></entry>
-      <entry><symbol>LC_COLLATE</> for this collation object</entry>
+      <entry><symbol>LC_COLLATE</symbol> for this collation object</entry>
      </row>
 
      <row>
       <entry><structfield>collctype</structfield></entry>
       <entry><type>name</type></entry>
       <entry></entry>
-      <entry><symbol>LC_CTYPE</> for this collation object</entry>
+      <entry><symbol>LC_CTYPE</symbol> for this collation object</entry>
      </row>
 
      <row>
@@ -2087,27 +2107,27 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   Note that the unique key on this catalog is (<structfield>collname</>,
-   <structfield>collencoding</>, <structfield>collnamespace</>) not just
-   (<structfield>collname</>, <structfield>collnamespace</>).
+   Note that the unique key on this catalog is (<structfield>collname</structfield>,
+   <structfield>collencoding</structfield>, <structfield>collnamespace</structfield>) not just
+   (<structfield>collname</structfield>, <structfield>collnamespace</structfield>).
    <productname>PostgreSQL</productname> generally ignores all
-   collations that do not have <structfield>collencoding</> equal to
+   collations that do not have <structfield>collencoding</structfield> equal to
    either the current database's encoding or -1, and creation of new entries
-   with the same name as an entry with <structfield>collencoding</> = -1
+   with the same name as an entry with <structfield>collencoding</structfield> = -1
    is forbidden.  Therefore it is sufficient to use a qualified SQL name
-   (<replaceable>schema</>.<replaceable>name</>) to identify a collation,
+   (<replaceable>schema</replaceable>.<replaceable>name</replaceable>) to identify a collation,
    even though this is not unique according to the catalog definition.
    The reason for defining the catalog this way is that
-   <application>initdb</> fills it in at cluster initialization time with
+   <application>initdb</application> fills it in at cluster initialization time with
    entries for all locales available on the system, so it must be able to
    hold entries for all encodings that might ever be used in the cluster.
   </para>
 
   <para>
-   In the <literal>template0</> database, it could be useful to create
+   In the <literal>template0</literal> database, it could be useful to create
    collations whose encoding does not match the database encoding,
    since they could match the encodings of databases later cloned from
-   <literal>template0</>.  This would currently have to be done manually.
+   <literal>template0</literal>.  This would currently have to be done manually.
   </para>
  </sect1>
 
@@ -2123,13 +2143,13 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    key, unique, foreign key, and exclusion constraints on tables.
    (Column constraints are not treated specially.  Every column constraint is
    equivalent to some table constraint.)
-   Not-null constraints are represented in the <structname>pg_attribute</>
+   Not-null constraints are represented in the <structname>pg_attribute</structname>
    catalog, not here.
   </para>
 
   <para>
    User-defined constraint triggers (created with <command>CREATE CONSTRAINT
-   TRIGGER</>) also give rise to an entry in this table.
+   TRIGGER</command>) also give rise to an entry in this table.
   </para>
 
   <para>
@@ -2137,7 +2157,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_constraint</> Columns</title>
+   <title><structname>pg_constraint</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2178,12 +2198,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-        <literal>c</> = check constraint,
-        <literal>f</> = foreign key constraint,
-        <literal>p</> = primary key constraint,
-        <literal>u</> = unique constraint,
-        <literal>t</> = constraint trigger,
-        <literal>x</> = exclusion constraint
+        <literal>c</literal> = check constraint,
+        <literal>f</literal> = foreign key constraint,
+        <literal>p</literal> = primary key constraint,
+        <literal>u</literal> = unique constraint,
+        <literal>t</literal> = constraint trigger,
+        <literal>x</literal> = exclusion constraint
       </entry>
      </row>
 
@@ -2243,11 +2263,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>Foreign key update action code:
-            <literal>a</> = no action,
-            <literal>r</> = restrict,
-            <literal>c</> = cascade,
-            <literal>n</> = set null,
-            <literal>d</> = set default
+            <literal>a</literal> = no action,
+            <literal>r</literal> = restrict,
+            <literal>c</literal> = cascade,
+            <literal>n</literal> = set null,
+            <literal>d</literal> = set default
           </entry>
      </row>
 
@@ -2256,11 +2276,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>Foreign key deletion action code:
-            <literal>a</> = no action,
-            <literal>r</> = restrict,
-            <literal>c</> = cascade,
-            <literal>n</> = set null,
-            <literal>d</> = set default
+            <literal>a</literal> = no action,
+            <literal>r</literal> = restrict,
+            <literal>c</literal> = cascade,
+            <literal>n</literal> = set null,
+            <literal>d</literal> = set default
           </entry>
      </row>
 
@@ -2269,9 +2289,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>Foreign key match type:
-            <literal>f</> = full,
-            <literal>p</> = partial,
-            <literal>s</> = simple
+            <literal>f</literal> = full,
+            <literal>p</literal> = partial,
+            <literal>s</literal> = simple
           </entry>
      </row>
 
@@ -2309,7 +2329,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
      <row>
       <entry><structfield>conkey</structfield></entry>
       <entry><type>int2[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</></entry>
+      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
       <entry>If a table constraint (including foreign keys, but not constraint
        triggers), list of the constrained columns</entry>
      </row>
@@ -2317,35 +2337,35 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
      <row>
       <entry><structfield>confkey</structfield></entry>
       <entry><type>int2[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</></entry>
+      <entry><literal><link linkend="catalog-pg-attribute"><structname>pg_attribute</structname></link>.attnum</literal></entry>
       <entry>If a foreign key, list of the referenced columns</entry>
      </row>
 
      <row>
       <entry><structfield>conpfeqop</structfield></entry>
       <entry><type>oid[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</></entry>
+      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</literal></entry>
       <entry>If a foreign key, list of the equality operators for PK = FK comparisons</entry>
      </row>
 
      <row>
       <entry><structfield>conppeqop</structfield></entry>
       <entry><type>oid[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</></entry>
+      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</literal></entry>
       <entry>If a foreign key, list of the equality operators for PK = PK comparisons</entry>
      </row>
 
      <row>
       <entry><structfield>conffeqop</structfield></entry>
       <entry><type>oid[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</></entry>
+      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</literal></entry>
       <entry>If a foreign key, list of the equality operators for FK = FK comparisons</entry>
      </row>
 
      <row>
       <entry><structfield>conexclop</structfield></entry>
       <entry><type>oid[]</type></entry>
-      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</></entry>
+      <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</literal></entry>
       <entry>If an exclusion constraint, list of the per-column exclusion operators</entry>
      </row>
 
@@ -2372,7 +2392,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    For other cases, a zero appears in <structfield>conkey</structfield>
    and the associated index must be consulted to discover the expression
    that is constrained.  (<structfield>conkey</structfield> thus has the
-   same contents as <structname>pg_index</>.<structfield>indkey</> for the
+   same contents as <structname>pg_index</structname>.<structfield>indkey</structfield> for the
    index.)
   </para>
 
@@ -2380,7 +2400,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    <para>
     <structfield>consrc</structfield> is not updated when referenced objects
     change; for example, it won't track renaming of columns.  Rather than
-    relying on this field, it's best to use <function>pg_get_constraintdef()</>
+    relying on this field, it's best to use <function>pg_get_constraintdef()</function>
     to extract the definition of a check constraint.
    </para>
   </note>
@@ -2404,12 +2424,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    The catalog <structname>pg_conversion</structname> describes
-   encoding conversion procedures.  See <xref linkend="sql-createconversion">
+   encoding conversion procedures.  See <xref linkend="sql-createconversion"/>
    for more information.
   </para>
 
   <table>
-   <title><structname>pg_conversion</> Columns</title>
+   <title><structname>pg_conversion</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2496,8 +2516,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_database</structname> stores information about
    the available databases.  Databases are created with the <xref
-   linkend="sql-createdatabase"> command.
-   Consult <xref linkend="managing-databases"> for details about the meaning
+   linkend="sql-createdatabase"/> command.
+   Consult <xref linkend="managing-databases"/> for details about the meaning
    of some of the parameters.
   </para>
 
@@ -2509,7 +2529,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_database</> Columns</title>
+   <title><structname>pg_database</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2572,7 +2592,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        If true, then this database can be cloned by
-       any user with <literal>CREATEDB</> privileges;
+       any user with <literal>CREATEDB</literal> privileges;
        if false, then only superusers or the owner of
        the database can clone it.
       </entry>
@@ -2584,7 +2604,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        If false then no one can connect to this database.  This is
-       used to protect the <literal>template0</> database from being altered.
+       used to protect the <literal>template0</literal> database from being altered.
       </entry>
      </row>
 
@@ -2614,11 +2634,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        All transaction IDs before this one have been replaced with a permanent
-       (<quote>frozen</>) transaction ID in this database.  This is used to
+       (<quote>frozen</quote>) transaction ID in this database.  This is used to
        track whether the database needs to be vacuumed in order to prevent
-       transaction ID wraparound or to allow <literal>pg_xact</> to be shrunk.
+       transaction ID wraparound or to allow <literal>pg_xact</literal> to be shrunk.
        It is the minimum of the per-table
-       <structname>pg_class</>.<structfield>relfrozenxid</> values.
+       <structname>pg_class</structname>.<structfield>relfrozenxid</structfield> values.
       </entry>
      </row>
 
@@ -2630,9 +2650,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        All multixact IDs before this one have been replaced with a
        transaction ID in this database.  This is used to
        track whether the database needs to be vacuumed in order to prevent
-       multixact ID wraparound or to allow <literal>pg_multixact</> to be shrunk.
+       multixact ID wraparound or to allow <literal>pg_multixact</literal> to be shrunk.
        It is the minimum of the per-table
-       <structname>pg_class</>.<structfield>relminmxid</> values.
+       <structname>pg_class</structname>.<structfield>relminmxid</structfield> values.
       </entry>
      </row>
 
@@ -2643,7 +2663,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>
        The default tablespace for the database.
        Within this database, all tables for which
-       <structname>pg_class</>.<structfield>reltablespace</> is zero
+       <structname>pg_class</structname>.<structfield>reltablespace</structfield> is zero
        will be stored in this tablespace; in particular, all the non-shared
        system catalogs will be there.
       </entry>
@@ -2655,8 +2675,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -2687,7 +2707,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_db_role_setting</> Columns</title>
+   <title><structname>pg_db_role_setting</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2734,12 +2754,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_default_acl</> stores initial
+   The catalog <structname>pg_default_acl</structname> stores initial
    privileges to be assigned to newly created objects.
   </para>
 
   <table>
-   <title><structname>pg_default_acl</> Columns</title>
+   <title><structname>pg_default_acl</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2780,10 +2800,10 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Type of object this entry is for:
-       <literal>r</> = relation (table, view),
-       <literal>S</> = sequence,
-       <literal>f</> = function,
-       <literal>T</> = type
+       <literal>r</literal> = relation (table, view),
+       <literal>S</literal> = sequence,
+       <literal>f</literal> = function,
+       <literal>T</literal> = type
       </entry>
      </row>
 
@@ -2800,21 +2820,21 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   A <structname>pg_default_acl</> entry shows the initial privileges to
+   A <structname>pg_default_acl</structname> entry shows the initial privileges to
    be assigned to an object belonging to the indicated user.  There are
-   currently two types of entry: <quote>global</> entries with
-   <structfield>defaclnamespace</> = 0, and <quote>per-schema</> entries
+   currently two types of entry: <quote>global</quote> entries with
+   <structfield>defaclnamespace</structfield> = 0, and <quote>per-schema</quote> entries
    that reference a particular schema.  If a global entry is present then
-   it <emphasis>overrides</> the normal hard-wired default privileges
+   it <emphasis>overrides</emphasis> the normal hard-wired default privileges
    for the object type.  A per-schema entry, if present, represents privileges
-   to be <emphasis>added to</> the global or hard-wired default privileges.
+   to be <emphasis>added to</emphasis> the global or hard-wired default privileges.
   </para>
 
   <para>
    Note that when an ACL entry in another catalog is null, it is taken
    to represent the hard-wired default privileges for its object,
-   <emphasis>not</> whatever might be in <structname>pg_default_acl</>
-   at the moment.  <structname>pg_default_acl</> is only consulted during
+   <emphasis>not</emphasis> whatever might be in <structname>pg_default_acl</structname>
+   at the moment.  <structname>pg_default_acl</structname> is only consulted during
    object creation.
   </para>
 
@@ -2831,9 +2851,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_depend</structname> records the dependency
    relationships between database objects.  This information allows
-   <command>DROP</> commands to find which other objects must be dropped
-   by <command>DROP CASCADE</> or prevent dropping in the <command>DROP
-   RESTRICT</> case.
+   <command>DROP</command> commands to find which other objects must be dropped
+   by <command>DROP CASCADE</command> or prevent dropping in the <command>DROP
+   RESTRICT</command> case.
   </para>
 
   <para>
@@ -2843,7 +2863,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_depend</> Columns</title>
+   <title><structname>pg_depend</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -2876,7 +2896,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a table column, this is the column number (the
-       <structfield>objid</> and <structfield>classid</> refer to the
+       <structfield>objid</structfield> and <structfield>classid</structfield> refer to the
        table itself).  For all other object types, this column is
        zero.
       </entry>
@@ -2902,7 +2922,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a table column, this is the column number (the
-       <structfield>refobjid</> and <structfield>refclassid</> refer
+       <structfield>refobjid</structfield> and <structfield>refclassid</structfield> refer
        to the table itself).  For all other object types, this column
        is zero.
       </entry>
@@ -2925,17 +2945,17 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    In all cases, a <structname>pg_depend</structname> entry indicates that the
    referenced object cannot be dropped without also dropping the dependent
    object.  However, there are several subflavors identified by
-   <structfield>deptype</>:
+   <structfield>deptype</structfield>:
 
    <variablelist>
     <varlistentry>
-     <term><symbol>DEPENDENCY_NORMAL</> (<literal>n</>)</term>
+     <term><symbol>DEPENDENCY_NORMAL</symbol> (<literal>n</literal>)</term>
      <listitem>
       <para>
        A normal relationship between separately-created objects.  The
        dependent object can be dropped without affecting the
        referenced object.  The referenced object can only be dropped
-       by specifying <literal>CASCADE</>, in which case the dependent
+       by specifying <literal>CASCADE</literal>, in which case the dependent
        object is dropped, too.  Example: a table column has a normal
        dependency on its data type.
       </para>
@@ -2943,12 +2963,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>DEPENDENCY_AUTO</> (<literal>a</>)</term>
+     <term><symbol>DEPENDENCY_AUTO</symbol> (<literal>a</literal>)</term>
      <listitem>
       <para>
        The dependent object can be dropped separately from the
        referenced object, and should be automatically dropped
-       (regardless of <literal>RESTRICT</> or <literal>CASCADE</>
+       (regardless of <literal>RESTRICT</literal> or <literal>CASCADE</literal>
        mode) if the referenced object is dropped.  Example: a named
        constraint on a table is made autodependent on the table, so
        that it will go away if the table is dropped.
@@ -2957,41 +2977,64 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>DEPENDENCY_INTERNAL</> (<literal>i</>)</term>
+     <term><symbol>DEPENDENCY_INTERNAL</symbol> (<literal>i</literal>)</term>
      <listitem>
       <para>
        The dependent object was created as part of creation of the
        referenced object, and is really just a part of its internal
-       implementation.  A <command>DROP</> of the dependent object
+       implementation.  A <command>DROP</command> of the dependent object
        will be disallowed outright (we'll tell the user to issue a
-       <command>DROP</> against the referenced object, instead).  A
-       <command>DROP</> of the referenced object will be propagated
+       <command>DROP</command> against the referenced object, instead).  A
+       <command>DROP</command> of the referenced object will be propagated
        through to drop the dependent object whether
-       <command>CASCADE</> is specified or not.  Example: a trigger
+       <command>CASCADE</command> is specified or not.  Example: a trigger
        that's created to enforce a foreign-key constraint is made
        internally dependent on the constraint's
-       <structname>pg_constraint</> entry.
+       <structname>pg_constraint</structname> entry.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><symbol>DEPENDENCY_INTERNAL_AUTO</symbol> (<literal>I</literal>)</term>
+     <listitem>
+      <para>
+       The dependent object was created as part of creation of the
+       referenced object, and is really just a part of its internal
+       implementation.  A <command>DROP</command> of the dependent object
+       will be disallowed outright (we'll tell the user to issue a
+       <command>DROP</command> against the referenced object, instead).
+       While a regular internal dependency will prevent
+       the dependent object from being dropped while any such dependencies
+       remain, <literal>DEPENDENCY_INTERNAL_AUTO</literal> will allow such
+       a drop as long as the object can be found by following any of such
+       dependencies.
+       Example: an index on a partition is made internal-auto-dependent on
+       both the partition itself as well as on the index on the parent
+       partitioned table; so the partition index is dropped together with
+       either the partition it indexes, or with the parent index it is
+       attached to.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>DEPENDENCY_EXTENSION</> (<literal>e</>)</term>
+     <term><symbol>DEPENDENCY_EXTENSION</symbol> (<literal>e</literal>)</term>
      <listitem>
       <para>
-       The dependent object is a member of the <firstterm>extension</> that is
+       The dependent object is a member of the <firstterm>extension</firstterm> that is
        the referenced object (see
        <link linkend="catalog-pg-extension"><structname>pg_extension</structname></link>).
        The dependent object can be dropped only via
-       <command>DROP EXTENSION</> on the referenced object.  Functionally
+       <command>DROP EXTENSION</command> on the referenced object.  Functionally
        this dependency type acts the same as an internal dependency, but
-       it's kept separate for clarity and to simplify <application>pg_dump</>.
+       it's kept separate for clarity and to simplify <application>pg_dump</application>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>DEPENDENCY_AUTO_EXTENSION</> (<literal>x</>)</term>
+     <term><symbol>DEPENDENCY_AUTO_EXTENSION</symbol> (<literal>x</literal>)</term>
      <listitem>
       <para>
        The dependent object is not a member of the extension that is the
@@ -3004,7 +3047,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>DEPENDENCY_PIN</> (<literal>p</>)</term>
+     <term><symbol>DEPENDENCY_PIN</symbol> (<literal>p</literal>)</term>
      <listitem>
       <para>
        There is no dependent object; this type of entry is a signal
@@ -3031,9 +3074,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_description</> stores optional descriptions
+   The catalog <structname>pg_description</structname> stores optional descriptions
    (comments) for each database object.  Descriptions can be manipulated
-   with the <xref linkend="sql-comment"> command and viewed with
+   with the <xref linkend="sql-comment"/> command and viewed with
    <application>psql</application>'s <literal>\d</literal> commands.
    Descriptions of many built-in system objects are provided in the initial
    contents of <structname>pg_description</structname>.
@@ -3046,7 +3089,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_description</> Columns</title>
+   <title><structname>pg_description</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3079,7 +3122,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a comment on a table column, this is the column number (the
-       <structfield>objoid</> and <structfield>classoid</> refer to
+       <structfield>objoid</structfield> and <structfield>classoid</structfield> refer to
        the table itself).  For all other object types, this column is
        zero.
       </entry>
@@ -3113,7 +3156,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_enum</> Columns</title>
+   <title><structname>pg_enum</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3137,7 +3180,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>enumtypid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_type</> entry owning this enum value</entry>
+      <entry>The OID of the <structname>pg_type</structname> entry owning this enum value</entry>
      </row>
 
      <row>
@@ -3171,7 +3214,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    When an enum type is created, its members are assigned sort-order
-   positions 1..<replaceable>n</>.  But members added later might be given
+   positions 1..<replaceable>n</replaceable>.  But members added later might be given
    negative or fractional values of <structfield>enumsortorder</structfield>.
    The only requirement on these values is that they be correctly
    ordered and unique within each enum type.
@@ -3188,11 +3231,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    The catalog <structname>pg_event_trigger</structname> stores event triggers.
-   See <xref linkend="event-triggers"> for more information.
+   See <xref linkend="event-triggers"/> for more information.
   </para>
 
   <table>
-   <title><structname>pg_event_trigger</> Columns</title>
+   <title><structname>pg_event_trigger</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3238,12 +3281,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Controls in which <xref linkend="guc-session-replication-role"> modes
+       Controls in which <xref linkend="guc-session-replication-role"/> modes
        the event trigger fires.
-       <literal>O</> = trigger fires in <quote>origin</> and <quote>local</> modes,
-       <literal>D</> = trigger is disabled,
-       <literal>R</> = trigger fires in <quote>replica</> mode,
-       <literal>A</> = trigger fires always.
+       <literal>O</literal> = trigger fires in <quote>origin</quote> and <quote>local</quote> modes,
+       <literal>D</literal> = trigger is disabled,
+       <literal>R</literal> = trigger fires in <quote>replica</quote> mode,
+       <literal>A</literal> = trigger fires always.
       </entry>
      </row>
 
@@ -3271,12 +3314,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    The catalog <structname>pg_extension</structname> stores information
-   about the installed extensions.  See <xref linkend="extend-extensions">
+   about the installed extensions.  See <xref linkend="extend-extensions"/>
    for details about extensions.
   </para>
 
   <table>
-   <title><structname>pg_extension</> Columns</title>
+   <title><structname>pg_extension</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3335,16 +3378,16 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>extconfig</structfield></entry>
       <entry><type>oid[]</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>Array of <type>regclass</> OIDs for the extension's configuration
-       table(s), or <literal>NULL</> if none</entry>
+      <entry>Array of <type>regclass</type> OIDs for the extension's configuration
+       table(s), or <literal>NULL</literal> if none</entry>
      </row>
 
      <row>
       <entry><structfield>extcondition</structfield></entry>
       <entry><type>text[]</type></entry>
       <entry></entry>
-      <entry>Array of <literal>WHERE</>-clause filter conditions for the
-       extension's configuration table(s), or <literal>NULL</> if none</entry>
+      <entry>Array of <literal>WHERE</literal>-clause filter conditions for the
+       extension's configuration table(s), or <literal>NULL</literal> if none</entry>
      </row>
 
     </tbody>
@@ -3352,7 +3395,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   Note that unlike most catalogs with a <quote>namespace</> column,
+   Note that unlike most catalogs with a <quote>namespace</quote> column,
    <structfield>extnamespace</structfield> is not meant to imply
    that the extension belongs to that schema.  Extension names are never
    schema-qualified.  Rather, <structfield>extnamespace</structfield>
@@ -3379,7 +3422,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_foreign_data_wrapper</> Columns</title>
+   <title><structname>pg_foreign_data_wrapper</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3443,8 +3486,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -3454,7 +3497,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Foreign-data wrapper specific options, as <quote>keyword=value</> strings
+       Foreign-data wrapper specific options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -3478,7 +3521,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_foreign_server</> Columns</title>
+   <title><structname>pg_foreign_server</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3539,8 +3582,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -3550,7 +3593,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Foreign server specific options, as <quote>keyword=value</> strings
+       Foreign server specific options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -3576,7 +3619,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_foreign_table</> Columns</title>
+   <title><structname>pg_foreign_table</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3593,7 +3636,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>ftrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>OID of the <structname>pg_class</> entry for this foreign table</entry>
+      <entry>OID of the <structname>pg_class</structname> entry for this foreign table</entry>
      </row>
 
      <row>
@@ -3608,7 +3651,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Foreign table options, as <quote>keyword=value</> strings
+       Foreign table options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -3631,7 +3674,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_index</> Columns</title>
+   <title><structname>pg_index</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3648,14 +3691,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>indexrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_class</> entry for this index</entry>
+      <entry>The OID of the <structname>pg_class</structname> entry for this index</entry>
      </row>
 
      <row>
       <entry><structfield>indrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_class</> entry for the table this index is for</entry>
+      <entry>The OID of the <structname>pg_class</structname> entry for the table this index is for</entry>
      </row>
 
      <row>
@@ -3678,7 +3721,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>If true, this index represents the primary key of the table
-      (<structfield>indisunique</> should always be true when this is true)</entry>
+      (<structfield>indisunique</structfield> should always be true when this is true)</entry>
      </row>
 
      <row>
@@ -3694,7 +3737,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>If true, the uniqueness check is enforced immediately on
        insertion
-       (irrelevant if <structfield>indisunique</> is not true)</entry>
+       (irrelevant if <structfield>indisunique</structfield> is not true)</entry>
      </row>
 
      <row>
@@ -3711,7 +3754,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>
        If true, the index is currently valid for queries.  False means the
        index is possibly incomplete: it must still be modified by
-       <command>INSERT</>/<command>UPDATE</> operations, but it cannot safely
+       <command>INSERT</command>/<command>UPDATE</command> operations, but it cannot safely
        be used for queries. If it is unique, the uniqueness property is not
        guaranteed true either.
       </entry>
@@ -3722,8 +3765,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       If true, queries must not use the index until the <structfield>xmin</>
-       of this <structname>pg_index</> row is below their <symbol>TransactionXmin</symbol>
+       If true, queries must not use the index until the <structfield>xmin</structfield>
+       of this <structname>pg_index</structname> row is below their <symbol>TransactionXmin</symbol>
        event horizon, because the table may contain broken HOT chains with
        incompatible rows that they can see
       </entry>
@@ -3735,7 +3778,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        If true, the index is currently ready for inserts.  False means the
-       index must be ignored by <command>INSERT</>/<command>UPDATE</>
+       index must be ignored by <command>INSERT</command>/<command>UPDATE</command>
        operations.
       </entry>
      </row>
@@ -3755,9 +3798,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>
-       If true this index has been chosen as <quote>replica identity</>
+       If true this index has been chosen as <quote>replica identity</quote>
        using <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX
-       ...</>
+       ...</command>
       </entry>
      </row>
 
@@ -3816,7 +3859,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        Expression trees (in <function>nodeToString()</function>
        representation) for index attributes that are not simple column
        references.  This is a list with one element for each zero
-       entry in <structfield>indkey</>.  Null if all index attributes
+       entry in <structfield>indkey</structfield>.  Null if all index attributes
        are simple references.
       </entry>
      </row>
@@ -3846,14 +3889,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_inherits</> records information about
+   The catalog <structname>pg_inherits</structname> records information about
    table inheritance hierarchies.  There is one entry for each direct
-   child table in the database.  (Indirect inheritance can be determined
+   parent-child table relationship in the database.  (Indirect inheritance can be determined
    by following chains of entries.)
   </para>
 
   <table>
-   <title><structname>pg_inherits</> Columns</title>
+   <title><structname>pg_inherits</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3908,7 +3951,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_init_privs</> records information about
+   The catalog <structname>pg_init_privs</structname> records information about
    the initial privileges of objects in the system.  There is one entry
    for each object in the database which has a non-default (non-NULL)
    initial set of privileges.
@@ -3916,7 +3959,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    Objects can have initial privileges either by having those privileges set
-   when the system is initialized (by <application>initdb</>) or when the
+   when the system is initialized (by <application>initdb</application>) or when the
    object is created during a <command>CREATE EXTENSION</command> and the
    extension script sets initial privileges using the <command>GRANT</command>
    system.  Note that the system will automatically handle recording of the
@@ -3924,12 +3967,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    only use the <command>GRANT</command> and <command>REVOKE</command>
    statements in their script to have the privileges recorded.  The
    <literal>privtype</literal> column indicates if the initial privilege was
-   set by <application>initdb</> or during a
+   set by <application>initdb</application> or during a
    <command>CREATE EXTENSION</command> command.
   </para>
 
   <para>
-   Objects which have initial privileges set by <application>initdb</> will
+   Objects which have initial privileges set by <application>initdb</application> will
    have entries where <literal>privtype</literal> is
    <literal>'i'</literal>, while objects which have initial privileges set
    by <command>CREATE EXTENSION</command> will have entries where
@@ -3937,7 +3980,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_init_privs</> Columns</title>
+   <title><structname>pg_init_privs</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -3970,7 +4013,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a table column, this is the column number (the
-       <structfield>objoid</> and <structfield>classoid</> refer to the
+       <structfield>objoid</structfield> and <structfield>classoid</structfield> refer to the
        table itself).  For all other object types, this column is
        zero.
       </entry>
@@ -3991,8 +4034,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        The initial access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -4014,12 +4057,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_language</structname> registers
    languages in which you can write functions or stored procedures.
-   See <xref linkend="sql-createlanguage">
-   and <xref linkend="xplang"> for more information about language handlers.
+   See <xref linkend="sql-createlanguage"/>
+   and <xref linkend="xplang"/> for more information about language handlers.
   </para>
 
   <table>
-   <title><structname>pg_language</> Columns</title>
+   <title><structname>pg_language</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4096,8 +4139,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
       <entry>
        This references a function that is responsible for executing
-       <quote>inline</> anonymous code blocks
-       (<xref linkend="sql-do"> blocks).
+       <quote>inline</quote> anonymous code blocks
+       (<xref linkend="sql-do"/> blocks).
        Zero if inline blocks are not supported.
       </entry>
      </row>
@@ -4119,8 +4162,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -4142,24 +4185,24 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    The catalog <structname>pg_largeobject</structname> holds the data making up
    <quote>large objects</quote>.  A large object is identified by an OID
    assigned when it is created.  Each large object is broken into
-   segments or <quote>pages</> small enough to be conveniently stored as rows
+   segments or <quote>pages</quote> small enough to be conveniently stored as rows
    in <structname>pg_largeobject</structname>.
-   The amount of data per page is defined to be <symbol>LOBLKSIZE</> (which is currently
-   <literal>BLCKSZ/4</>, or typically 2 kB).
+   The amount of data per page is defined to be <symbol>LOBLKSIZE</symbol> (which is currently
+   <literal>BLCKSZ/4</literal>, or typically 2 kB).
   </para>
 
   <para>
-   Prior to <productname>PostgreSQL</> 9.0, there was no permission structure
+   Prior to <productname>PostgreSQL</productname> 9.0, there was no permission structure
    associated with large objects.  As a result,
    <structname>pg_largeobject</structname> was publicly readable and could be
    used to obtain the OIDs (and contents) of all large objects in the system.
    This is no longer the case; use
-   <link linkend="catalog-pg-largeobject-metadata"><structname>pg_largeobject_metadata</></link>
+   <link linkend="catalog-pg-largeobject-metadata"><structname>pg_largeobject_metadata</structname></link>
    to obtain a list of large object OIDs.
   </para>
 
   <table>
-   <title><structname>pg_largeobject</> Columns</title>
+   <title><structname>pg_largeobject</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4193,7 +4236,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Actual data stored in the large object.
-       This will never be more than <symbol>LOBLKSIZE</> bytes and might be less.
+       This will never be more than <symbol>LOBLKSIZE</symbol> bytes and might be less.
       </entry>
      </row>
     </tbody>
@@ -4203,9 +4246,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    Each row of <structname>pg_largeobject</structname> holds data
    for one page of a large object, beginning at
-   byte offset (<literal>pageno * LOBLKSIZE</>) within the object.  The implementation
+   byte offset (<literal>pageno * LOBLKSIZE</literal>) within the object.  The implementation
    allows sparse storage: pages might be missing, and might be shorter than
-   <literal>LOBLKSIZE</> bytes even if they are not the last page of the object.
+   <literal>LOBLKSIZE</literal> bytes even if they are not the last page of the object.
    Missing regions within a large object read as zeroes.
   </para>
 
@@ -4222,11 +4265,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    The catalog <structname>pg_largeobject_metadata</structname>
    holds metadata associated with large objects.  The actual large object
    data is stored in
-   <link linkend="catalog-pg-largeobject"><structname>pg_largeobject</></link>.
+   <link linkend="catalog-pg-largeobject"><structname>pg_largeobject</structname></link>.
   </para>
 
   <table>
-   <title><structname>pg_largeobject_metadata</> Columns</title>
+   <title><structname>pg_largeobject_metadata</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4259,8 +4302,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -4279,14 +4322,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_namespace</> stores namespaces.
+   The catalog <structname>pg_namespace</structname> stores namespaces.
    A namespace is the structure underlying SQL schemas: each namespace
    can have a separate collection of relations, types, etc. without name
    conflicts.
   </para>
 
   <table>
-   <title><structname>pg_namespace</> Columns</title>
+   <title><structname>pg_namespace</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4326,8 +4369,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -4357,11 +4400,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <para>
-   Operator classes are described at length in <xref linkend="xindex">.
+   Operator classes are described at length in <xref linkend="xindex"/>.
   </para>
 
   <table>
-   <title><structname>pg_opclass</> Columns</title>
+   <title><structname>pg_opclass</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4427,14 +4470,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>opcdefault</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>True if this operator class is the default for <structfield>opcintype</></entry>
+      <entry>True if this operator class is the default for <structfield>opcintype</structfield></entry>
      </row>
 
      <row>
       <entry><structfield>opckeytype</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
-      <entry>Type of data stored in index, or zero if same as <structfield>opcintype</></entry>
+      <entry>Type of data stored in index, or zero if same as <structfield>opcintype</structfield></entry>
      </row>
 
     </tbody>
@@ -4442,11 +4485,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   An operator class's <structfield>opcmethod</> must match the
-   <structname>opfmethod</> of its containing operator family.
+   An operator class's <structfield>opcmethod</structfield> must match the
+   <structname>opfmethod</structname> of its containing operator family.
    Also, there must be no more than one <structname>pg_opclass</structname>
-   row having <structname>opcdefault</> true for any given combination of
-   <structname>opcmethod</> and <structname>opcintype</>.
+   row having <structname>opcdefault</structname> true for any given combination of
+   <structname>opcmethod</structname> and <structname>opcintype</structname>.
   </para>
 
  </sect1>
@@ -4460,13 +4503,13 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_operator</> stores information about operators.
-   See <xref linkend="sql-createoperator">
-   and <xref linkend="xoper"> for more information.
+   The catalog <structname>pg_operator</structname> stores information about operators.
+   See <xref linkend="sql-createoperator"/>
+   and <xref linkend="xoper"/> for more information.
   </para>
 
   <table>
-   <title><structname>pg_operator</> Columns</title>
+   <title><structname>pg_operator</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4514,8 +4557,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       <literal>b</> = infix (<quote>both</quote>), <literal>l</> = prefix
-       (<quote>left</quote>), <literal>r</> = postfix (<quote>right</quote>)
+       <literal>b</literal> = infix (<quote>both</quote>), <literal>l</literal> = prefix
+       (<quote>left</quote>), <literal>r</literal> = postfix (<quote>right</quote>)
       </entry>
      </row>
 
@@ -4612,18 +4655,18 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    Each operator family is a collection of operators and associated
    support routines that implement the semantics specified for a particular
    index access method.  Furthermore, the operators in a family are all
-   <quote>compatible</>, in a way that is specified by the access method.
+   <quote>compatible</quote>, in a way that is specified by the access method.
    The operator family concept allows cross-data-type operators to be used
    with indexes and to be reasoned about using knowledge of access method
    semantics.
   </para>
 
   <para>
-   Operator families are described at length in <xref linkend="xindex">.
+   Operator families are described at length in <xref linkend="xindex"/>.
   </para>
 
   <table>
-   <title><structname>pg_opfamily</> Columns</title>
+   <title><structname>pg_opfamily</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4700,7 +4743,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_partitioned_table</> Columns</title>
+   <title><structname>pg_partitioned_table</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -4718,7 +4761,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>partrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_class</> entry for this partitioned table</entry>
+      <entry>The OID of the <structname>pg_class</structname> entry for this partitioned table</entry>
      </row>
 
      <row>
@@ -4726,8 +4769,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Partitioning strategy; <literal>l</> = list partitioned table,
-       <literal>r</> = range partitioned table
+       Partitioning strategy; <literal>l</literal> = list partitioned table,
+       <literal>r</literal> = range partitioned table
       </entry>
      </row>
 
@@ -4738,6 +4781,17 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>The number of columns in partition key</entry>
      </row>
 
+     <row>
+      <entry><structfield>partdefid</structfield></entry>
+      <entry><type>oid</type></entry>
+      <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
+      <entry>
+       The OID of the <structname>pg_class</structname> entry for the default partition
+       of this partitioned table, or zero if this partitioned table does not
+       have a default partition.
+     </entry>
+     </row>
+
      <row>
       <entry><structfield>partattrs</structfield></entry>
       <entry><type>int2vector</type></entry>
@@ -4782,7 +4836,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        Expression trees (in <function>nodeToString()</function>
        representation) for partition key columns that are not simple column
        references.  This is a list with one element for each zero
-       entry in <structfield>partattrs</>.  Null if all partition key columns
+       entry in <structfield>partattrs</structfield>.  Null if all partition key columns
        are simple references.
       </entry>
      </row>
@@ -4802,9 +4856,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    The catalog <structname>pg_pltemplate</structname> stores
-   <quote>template</> information for procedural languages.
+   <quote>template</quote> information for procedural languages.
    A template for a language allows the language to be created in a
-   particular database by a simple <command>CREATE LANGUAGE</> command,
+   particular database by a simple <command>CREATE LANGUAGE</command> command,
    with no need to specify implementation details.
   </para>
 
@@ -4817,7 +4871,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_pltemplate</> Columns</title>
+   <title><structname>pg_pltemplate</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -4890,7 +4944,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <note>
    <para>
-    It is likely that <structname>pg_pltemplate</> will be removed in some
+    It is likely that <structname>pg_pltemplate</structname> will be removed in some
     future release of <productname>PostgreSQL</productname>, in favor of
     keeping this knowledge about procedural languages in their respective
     extension installation scripts.
@@ -4913,7 +4967,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    command that it applies to (possibly all commands), the roles that it
    applies to, the expression to be added as a security-barrier
    qualification to queries that include the table, and the expression
-   to be added as a <literal>WITH CHECK</> option for queries that attempt to
+   to be added as a <literal>WITH CHECK</literal> option for queries that attempt to
    add new records to the table.
   </para>
 
@@ -4951,11 +5005,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>The command type to which the policy is applied:
-       <literal>r</> for <command>SELECT</>,
-       <literal>a</> for <command>INSERT</>,
-       <literal>w</> for <command>UPDATE</>,
-       <literal>d</> for <command>DELETE</>,
-       or <literal>*</> for all</entry>
+       <literal>r</literal> for <command>SELECT</command>,
+       <literal>a</literal> for <command>INSERT</command>,
+       <literal>w</literal> for <command>UPDATE</command>,
+       <literal>d</literal> for <command>DELETE</command>,
+       or <literal>*</literal> for all</entry>
      </row>
 
      <row>
@@ -4992,8 +5046,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <note>
    <para>
-    Policies stored in <structname>pg_policy</> are applied only when
-    <structname>pg_class</>.<structfield>relrowsecurity</> is set for
+    Policies stored in <structname>pg_policy</structname> are applied only when
+    <structname>pg_class</structname>.<structfield>relrowsecurity</structfield> is set for
     their table.
    </para>
   </note>
@@ -5008,9 +5062,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </indexterm>
 
   <para>
-   The catalog <structname>pg_proc</> stores information about functions (or procedures).
-   See <xref linkend="sql-createfunction">
-   and <xref linkend="xfunc"> for more information.
+   The catalog <structname>pg_proc</structname> stores information about functions (or procedures).
+   See <xref linkend="sql-createfunction"/>
+   and <xref linkend="xfunc"/> for more information.
   </para>
 
   <para>
@@ -5020,7 +5074,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_proc</> Columns</title>
+   <title><structname>pg_proc</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5075,7 +5129,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>float4</type></entry>
       <entry></entry>
       <entry>Estimated execution cost (in units of
-       <xref linkend="guc-cpu-operator-cost">); if <structfield>proretset</>,
+       <xref linkend="guc-cpu-operator-cost"/>); if <structfield>proretset</structfield>,
        this is cost per row returned</entry>
      </row>
 
@@ -5083,7 +5137,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>prorows</structfield></entry>
       <entry><type>float4</type></entry>
       <entry></entry>
-      <entry>Estimated number of result rows (zero if not <structfield>proretset</>)</entry>
+      <entry>Estimated number of result rows (zero if not <structfield>proretset</structfield>)</entry>
      </row>
 
      <row>
@@ -5099,7 +5153,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>regproc</type></entry>
       <entry><literal><link linkend="catalog-pg-proc"><structname>pg_proc</structname></link>.oid</literal></entry>
       <entry>Calls to this function can be simplified by this other function
-       (see <xref linkend="xfunc-transform-functions">)</entry>
+       (see <xref linkend="xfunc-transform-functions"/>)</entry>
      </row>
 
      <row>
@@ -5120,7 +5174,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>prosecdef</structfield></entry>
       <entry><type>bool</type></entry>
       <entry></entry>
-      <entry>Function is a security definer (i.e., a <quote>setuid</>
+      <entry>Function is a security definer (i.e., a <quote>setuid</quote>
       function)</entry>
      </row>
 
@@ -5164,11 +5218,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        <structfield>provolatile</structfield> tells whether the function's
        result depends only on its input arguments, or is affected by outside
        factors.
-       It is <literal>i</literal> for <quote>immutable</> functions,
+       It is <literal>i</literal> for <quote>immutable</quote> functions,
        which always deliver the same result for the same inputs.
-       It is <literal>s</literal> for <quote>stable</> functions,
+       It is <literal>s</literal> for <quote>stable</quote> functions,
        whose results (for fixed inputs) do not change within a scan.
-       It is <literal>v</literal> for <quote>volatile</> functions,
+       It is <literal>v</literal> for <quote>volatile</quote> functions,
        whose results might change at any time.  (Use <literal>v</literal> also
        for functions with side-effects, so that calls to them cannot get
        optimized away.)
@@ -5210,7 +5264,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>prorettype</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-type"><structname>pg_type</structname></link>.oid</literal></entry>
-      <entry>Data type of the return value</entry>
+      <entry>Data type of the return value, or null for a procedure</entry>
      </row>
 
      <row>
@@ -5220,7 +5274,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>
        An array with the data types of the function arguments.  This includes
        only input arguments (including <literal>INOUT</literal> and
-       <literal>VARIADIC</> arguments), and thus represents
+       <literal>VARIADIC</literal> arguments), and thus represents
        the call signature of the function.
       </entry>
      </row>
@@ -5235,7 +5289,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        <literal>INOUT</literal> arguments); however, if all the
        arguments are <literal>IN</literal> arguments, this field will be null.
        Note that subscripting is 1-based, whereas for historical reasons
-       <structfield>proargtypes</> is subscripted from 0.
+       <structfield>proargtypes</structfield> is subscripted from 0.
       </entry>
      </row>
 
@@ -5245,15 +5299,15 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
         An array with the modes of the function arguments, encoded as
-        <literal>i</literal> for <literal>IN</> arguments,
-        <literal>o</literal> for <literal>OUT</> arguments,
-        <literal>b</literal> for <literal>INOUT</> arguments,
-        <literal>v</literal> for <literal>VARIADIC</> arguments,
-        <literal>t</literal> for <literal>TABLE</> arguments.
+        <literal>i</literal> for <literal>IN</literal> arguments,
+        <literal>o</literal> for <literal>OUT</literal> arguments,
+        <literal>b</literal> for <literal>INOUT</literal> arguments,
+        <literal>v</literal> for <literal>VARIADIC</literal> arguments,
+        <literal>t</literal> for <literal>TABLE</literal> arguments.
         If all the arguments are <literal>IN</literal> arguments,
         this field will be null.
         Note that subscripts correspond to positions of
-        <structfield>proallargtypes</> not <structfield>proargtypes</>.
+        <structfield>proallargtypes</structfield> not <structfield>proargtypes</structfield>.
       </entry>
      </row>
 
@@ -5266,7 +5320,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
         Arguments without a name are set to empty strings in the array.
         If none of the arguments have a name, this field will be null.
         Note that subscripts correspond to positions of
-        <structfield>proallargtypes</> not <structfield>proargtypes</>.
+        <structfield>proallargtypes</structfield> not <structfield>proargtypes</structfield>.
       </entry>
      </row>
 
@@ -5277,9 +5331,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>
        Expression trees (in <function>nodeToString()</function> representation)
        for default values.  This is a list with
-       <structfield>pronargdefaults</> elements, corresponding to the last
-       <replaceable>N</> <emphasis>input</> arguments (i.e., the last
-       <replaceable>N</> <structfield>proargtypes</> positions).
+       <structfield>pronargdefaults</structfield> elements, corresponding to the last
+       <replaceable>N</replaceable> <emphasis>input</emphasis> arguments (i.e., the last
+       <replaceable>N</replaceable> <structfield>proargtypes</structfield> positions).
        If none of the arguments have defaults, this field will be null.
       </entry>
      </row>
@@ -5328,8 +5382,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -5359,7 +5413,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_publication</structname> contains all
    publications created in the database.  For more on publications see
-   <xref linkend="logical-replication-publication">.
+   <xref linkend="logical-replication-publication"/>.
   </para>
 
   <table>
@@ -5385,7 +5439,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
      <row>
       <entry><structfield>pubname</structfield></entry>
-      <entry><type>Name</type></entry>
+      <entry><type>name</type></entry>
       <entry></entry>
       <entry>Name of the publication</entry>
      </row>
@@ -5444,7 +5498,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_publication_rel</structname> contains the
    mapping between relations and publications in the database.  This is a
-   many-to-many mapping.  See also <xref linkend="view-pg-publication-tables">
+   many-to-many mapping.  See also <xref linkend="view-pg-publication-tables"/>
    for a more user-friendly view of this information.
   </para>
 
@@ -5494,7 +5548,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_range</> Columns</title>
+   <title><structname>pg_range</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5555,10 +5609,10 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   <structfield>rngsubopc</> (plus <structfield>rngcollation</>, if the
+   <structfield>rngsubopc</structfield> (plus <structfield>rngcollation</structfield>, if the
    element type is collatable) determines the sort ordering used by the range
-   type.  <structfield>rngcanonical</> is used when the element type is
-   discrete.  <structfield>rngsubdiff</> is optional but should be supplied to
+   type.  <structfield>rngcanonical</structfield> is used when the element type is
+   discrete.  <structfield>rngsubdiff</structfield> is optional but should be supplied to
    improve performance of GiST indexes on the range type.
   </para>
 
@@ -5574,7 +5628,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The <structname>pg_replication_origin</structname> catalog contains
    all replication origins created.  For more on replication origins
-   see <xref linkend="replication-origins">.
+   see <xref linkend="replication-origins"/>.
   </para>
 
   <table>
@@ -5624,7 +5678,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_rewrite</> Columns</title>
+   <title><structname>pg_rewrite</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5663,9 +5717,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Event type that the rule is for: 1 = <command>SELECT</>, 2 =
-       <command>UPDATE</>, 3 = <command>INSERT</>, 4 =
-       <command>DELETE</>
+       Event type that the rule is for: 1 = <command>SELECT</command>, 2 =
+       <command>UPDATE</command>, 3 = <command>INSERT</command>, 4 =
+       <command>DELETE</command>
       </entry>
      </row>
 
@@ -5674,12 +5728,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Controls in which <xref linkend="guc-session-replication-role"> modes
+       Controls in which <xref linkend="guc-session-replication-role"/> modes
        the rule fires.
-       <literal>O</> = rule fires in <quote>origin</> and <quote>local</> modes,
-       <literal>D</> = rule is disabled,
-       <literal>R</> = rule fires in <quote>replica</> mode,
-       <literal>A</> = rule fires always.
+       <literal>O</literal> = rule fires in <quote>origin</quote> and <quote>local</quote> modes,
+       <literal>D</literal> = rule is disabled,
+       <literal>R</literal> = rule fires in <quote>replica</quote> mode,
+       <literal>A</literal> = rule fires always.
       </entry>
      </row>
 
@@ -5734,8 +5788,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_seclabel</structname> stores security
    labels on database objects.  Security labels can be manipulated
-   with the <xref linkend="sql-security-label"> command.  For an easier
-   way to view security labels, see <xref linkend="view-pg-seclabels">.
+   with the <xref linkend="sql-security-label"/> command.  For an easier
+   way to view security labels, see <xref linkend="view-pg-seclabels"/>.
   </para>
 
   <para>
@@ -5778,7 +5832,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a security label on a table column, this is the column number (the
-       <structfield>objoid</> and <structfield>classoid</> refer to
+       <structfield>objoid</structfield> and <structfield>classoid</structfield> refer to
        the table itself).  For all other object types, this column is
        zero.
       </entry>
@@ -5816,7 +5870,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_sequence</> Columns</title>
+   <title><structname>pg_sequence</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5833,7 +5887,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>seqrelid</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-class"><structname>pg_class</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_class</> entry for this sequence</entry>
+      <entry>The OID of the <structname>pg_class</structname> entry for this sequence</entry>
      </row>
 
      <row>
@@ -5918,7 +5972,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_shdepend</> Columns</title>
+   <title><structname>pg_shdepend</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -5959,7 +6013,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        For a table column, this is the column number (the
-       <structfield>objid</> and <structfield>classid</> refer to the
+       <structfield>objid</structfield> and <structfield>classid</structfield> refer to the
        table itself).  For all other object types, this column is zero.
       </entry>
      </row>
@@ -5996,11 +6050,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    In all cases, a <structname>pg_shdepend</structname> entry indicates that
    the referenced object cannot be dropped without also dropping the dependent
    object.  However, there are several subflavors identified by
-   <structfield>deptype</>:
+   <structfield>deptype</structfield>:
 
    <variablelist>
     <varlistentry>
-     <term><symbol>SHARED_DEPENDENCY_OWNER</> (<literal>o</>)</term>
+     <term><symbol>SHARED_DEPENDENCY_OWNER</symbol> (<literal>o</literal>)</term>
      <listitem>
       <para>
        The referenced object (which must be a role) is the owner of the
@@ -6010,20 +6064,20 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>SHARED_DEPENDENCY_ACL</> (<literal>a</>)</term>
+     <term><symbol>SHARED_DEPENDENCY_ACL</symbol> (<literal>a</literal>)</term>
      <listitem>
       <para>
        The referenced object (which must be a role) is mentioned in the
        ACL (access control list, i.e., privileges list) of the
-       dependent object.  (A <symbol>SHARED_DEPENDENCY_ACL</> entry is
+       dependent object.  (A <symbol>SHARED_DEPENDENCY_ACL</symbol> entry is
        not made for the owner of the object, since the owner will have
-       a <symbol>SHARED_DEPENDENCY_OWNER</> entry anyway.)
+       a <symbol>SHARED_DEPENDENCY_OWNER</symbol> entry anyway.)
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>SHARED_DEPENDENCY_POLICY</> (<literal>r</>)</term>
+     <term><symbol>SHARED_DEPENDENCY_POLICY</symbol> (<literal>r</literal>)</term>
      <listitem>
       <para>
        The referenced object (which must be a role) is mentioned as the
@@ -6033,7 +6087,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     </varlistentry>
 
     <varlistentry>
-     <term><symbol>SHARED_DEPENDENCY_PIN</> (<literal>p</>)</term>
+     <term><symbol>SHARED_DEPENDENCY_PIN</symbol> (<literal>p</literal>)</term>
      <listitem>
       <para>
        There is no dependent object; this type of entry is a signal
@@ -6062,7 +6116,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_shdescription</structname> stores optional
    descriptions (comments) for shared database objects.  Descriptions can be
-   manipulated with the <xref linkend="sql-comment"> command and viewed with
+   manipulated with the <xref linkend="sql-comment"/> command and viewed with
    <application>psql</application>'s <literal>\d</literal> commands.
   </para>
 
@@ -6080,7 +6134,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_shdescription</> Columns</title>
+   <title><structname>pg_shdescription</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6129,8 +6183,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_shseclabel</structname> stores security
    labels on shared database objects.  Security labels can be manipulated
-   with the <xref linkend="sql-security-label"> command.  For an easier
-   way to view security labels, see <xref linkend="view-pg-seclabels">.
+   with the <xref linkend="sql-security-label"/> command.  For an easier
+   way to view security labels, see <xref linkend="view-pg-seclabels"/>.
   </para>
 
   <para>
@@ -6197,23 +6251,23 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_statistic</structname> stores
    statistical data about the contents of the database.  Entries are
-   created by <xref linkend="sql-analyze">
+   created by <xref linkend="sql-analyze"/>
    and subsequently used by the query planner.  Note that all the
    statistical data is inherently approximate, even assuming that it
    is up-to-date.
   </para>
 
   <para>
-   Normally there is one entry, with <structfield>stainherit</> =
-   <literal>false</>, for each table column that has been analyzed.
+   Normally there is one entry, with <structfield>stainherit</structfield> =
+   <literal>false</literal>, for each table column that has been analyzed.
    If the table has inheritance children, a second entry with
-   <structfield>stainherit</> = <literal>true</> is also created.  This row
+   <structfield>stainherit</structfield> = <literal>true</literal> is also created.  This row
    represents the column's statistics over the inheritance tree, i.e.,
    statistics for the data you'd see with
-   <literal>SELECT <replaceable>column</> FROM <replaceable>table</>*</literal>,
-   whereas the <structfield>stainherit</> = <literal>false</> row represents
+   <literal>SELECT <replaceable>column</replaceable> FROM <replaceable>table</replaceable>*</literal>,
+   whereas the <structfield>stainherit</structfield> = <literal>false</literal> row represents
    the results of
-   <literal>SELECT <replaceable>column</> FROM ONLY <replaceable>table</></literal>.
+   <literal>SELECT <replaceable>column</replaceable> FROM ONLY <replaceable>table</replaceable></literal>.
   </para>
 
   <para>
@@ -6223,7 +6277,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    references the index.  No entry is made for an ordinary non-expression
    index column, however, since it would be redundant with the entry
    for the underlying table column.  Currently, entries for index expressions
-   always have <structfield>stainherit</> = <literal>false</>.
+   always have <structfield>stainherit</structfield> = <literal>false</literal>.
   </para>
 
   <para>
@@ -6250,7 +6304,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_statistic</> Columns</title>
+   <title><structname>pg_statistic</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6308,56 +6362,56 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       A value less than zero is the negative of a multiplier for the number
       of rows in the table; for example, a column in which about 80% of the
       values are nonnull and each nonnull value appears about twice on
-      average could be represented by <structfield>stadistinct</> = -0.4.
+      average could be represented by <structfield>stadistinct</structfield> = -0.4.
       A zero value means the number of distinct values is unknown.
       </entry>
      </row>
 
      <row>
-      <entry><structfield>stakind<replaceable>N</></structfield></entry>
+      <entry><structfield>stakind<replaceable>N</replaceable></structfield></entry>
       <entry><type>int2</type></entry>
       <entry></entry>
       <entry>
        A code number indicating the kind of statistics stored in the
-       <replaceable>N</>th <quote>slot</quote> of the
+       <replaceable>N</replaceable>th <quote>slot</quote> of the
        <structname>pg_statistic</structname> row.
       </entry>
      </row>
 
      <row>
-      <entry><structfield>staop<replaceable>N</></structfield></entry>
+      <entry><structfield>staop<replaceable>N</replaceable></structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-operator"><structname>pg_operator</structname></link>.oid</literal></entry>
       <entry>
        An operator used to derive the statistics stored in the
-       <replaceable>N</>th <quote>slot</quote>.  For example, a
+       <replaceable>N</replaceable>th <quote>slot</quote>.  For example, a
        histogram slot would show the <literal>&lt;</literal> operator
        that defines the sort order of the data.
       </entry>
      </row>
 
      <row>
-      <entry><structfield>stanumbers<replaceable>N</></structfield></entry>
+      <entry><structfield>stanumbers<replaceable>N</replaceable></structfield></entry>
       <entry><type>float4[]</type></entry>
       <entry></entry>
       <entry>
        Numerical statistics of the appropriate kind for the
-       <replaceable>N</>th <quote>slot</quote>, or null if the slot
+       <replaceable>N</replaceable>th <quote>slot</quote>, or null if the slot
        kind does not involve numerical values
       </entry>
      </row>
 
      <row>
-      <entry><structfield>stavalues<replaceable>N</></structfield></entry>
+      <entry><structfield>stavalues<replaceable>N</replaceable></structfield></entry>
       <entry><type>anyarray</type></entry>
       <entry></entry>
       <entry>
        Column data values of the appropriate kind for the
-       <replaceable>N</>th <quote>slot</quote>, or null if the slot
+       <replaceable>N</replaceable>th <quote>slot</quote>, or null if the slot
        kind does not store any data values.  Each array's element
        values are actually of the specific column's data type, or a related
        type such as an array's element type, so there is no way to define
-       these columns' type more specifically than <type>anyarray</>.
+       these columns' type more specifically than <type>anyarray</type>.
       </entry>
      </row>
     </tbody>
@@ -6376,12 +6430,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_statistic_ext</structname>
    holds extended planner statistics.
-   Each row in this catalog corresponds to a <firstterm>statistics object</>
-   created with <xref linkend="sql-createstatistics">.
+   Each row in this catalog corresponds to a <firstterm>statistics object</firstterm>
+   created with <xref linkend="sql-createstatistics"/>.
   </para>
 
   <table>
-   <title><structname>pg_statistic_ext</> Columns</title>
+   <title><structname>pg_statistic_ext</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6442,7 +6496,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char[]</type></entry>
       <entry></entry>
       <entry>
-        An array containing codes for the enabled statistic types;
+        An array containing codes for the enabled statistic kinds;
         valid values are:
         <literal>d</literal> for n-distinct statistics,
         <literal>f</literal> for functional dependency statistics
@@ -6454,7 +6508,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>pg_ndistinct</type></entry>
       <entry></entry>
       <entry>
-       N-distinct counts, serialized as <structname>pg_ndistinct</> type
+       N-distinct counts, serialized as <structname>pg_ndistinct</structname> type
       </entry>
      </row>
 
@@ -6464,7 +6518,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Functional dependency statistics, serialized
-       as <structname>pg_dependencies</> type
+       as <structname>pg_dependencies</structname> type
       </entry>
      </row>
 
@@ -6476,7 +6530,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    The <structfield>stxkind</structfield> field is filled at creation of the
    statistics object, indicating which statistic type(s) are desired.
    The fields after it are initially NULL and are filled only when the
-   corresponding statistic has been computed by <command>ANALYZE</>.
+   corresponding statistic has been computed by <command>ANALYZE</command>.
   </para>
  </sect1>
 
@@ -6490,7 +6544,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_subscription</structname> contains all existing
    logical replication subscriptions.  For more information about logical
-   replication see <xref linkend="logical-replication">.
+   replication see <xref linkend="logical-replication"/>.
   </para>
 
   <para>
@@ -6585,7 +6639,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>Array of subscribed publication names. These reference the
        publications on the publisher server. For more on publications
-       see <xref linkend="logical-replication-publication">.
+       see <xref linkend="logical-replication-publication"/>.
       </entry>
      </row>
     </tbody>
@@ -6646,10 +6700,10 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        State code:
-       <literal>i</> = initialize,
-       <literal>d</> = data is being copied,
-       <literal>s</> = synchronized,
-       <literal>r</> = ready (normal replication)
+       <literal>i</literal> = initialize,
+       <literal>d</literal> = data is being copied,
+       <literal>s</literal> = synchronized,
+       <literal>r</literal> = ready (normal replication)
       </entry>
      </row>
 
@@ -6658,7 +6712,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>pg_lsn</type></entry>
       <entry></entry>
       <entry>
-       End LSN for <literal>s</> and <literal>r</> states.
+       End LSN for <literal>s</literal> and <literal>r</literal> states.
       </entry>
      </row>
     </tbody>
@@ -6687,7 +6741,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_tablespace</> Columns</title>
+   <title><structname>pg_tablespace</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6727,8 +6781,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -6738,7 +6792,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       Tablespace-level options, as <quote>keyword=value</> strings
+       Tablespace-level options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -6757,11 +6811,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_transform</structname> stores information about
    transforms, which are a mechanism to adapt data types to procedural
-   languages.  See <xref linkend="sql-createtransform"> for more information.
+   languages.  See <xref linkend="sql-createtransform"/> for more information.
   </para>
 
   <table>
-   <title><structname>pg_transform</> Columns</title>
+   <title><structname>pg_transform</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6825,12 +6879,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_trigger</structname> stores triggers on tables
    and views.
-   See <xref linkend="sql-createtrigger">
+   See <xref linkend="sql-createtrigger"/>
    for more information.
   </para>
 
   <table>
-   <title><structname>pg_trigger</> Columns</title>
+   <title><structname>pg_trigger</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -6883,12 +6937,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>char</type></entry>
       <entry></entry>
       <entry>
-       Controls in which <xref linkend="guc-session-replication-role"> modes
+       Controls in which <xref linkend="guc-session-replication-role"/> modes
        the trigger fires.
-       <literal>O</> = trigger fires in <quote>origin</> and <quote>local</> modes,
-       <literal>D</> = trigger is disabled,
-       <literal>R</> = trigger fires in <quote>replica</> mode,
-       <literal>A</> = trigger fires always.
+       <literal>O</literal> = trigger fires in <quote>origin</quote> and <quote>local</quote> modes,
+       <literal>D</literal> = trigger is disabled,
+       <literal>R</literal> = trigger fires in <quote>replica</quote> mode,
+       <literal>A</literal> = trigger fires always.
       </entry>
      </row>
 
@@ -6897,7 +6951,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>bool</type></entry>
       <entry></entry>
       <entry>True if trigger is internally generated (usually, to enforce
-       the constraint identified by <structfield>tgconstraint</>)</entry>
+       the constraint identified by <structfield>tgconstraint</structfield>)</entry>
      </row>
 
      <row>
@@ -6919,7 +6973,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>tgconstraint</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-constraint"><structname>pg_constraint</structname></link>.oid</literal></entry>
-      <entry>The <structname>pg_constraint</> entry associated with the trigger, if any</entry>
+      <entry>The <structname>pg_constraint</structname> entry associated with the trigger, if any</entry>
      </row>
 
      <row>
@@ -6963,7 +7017,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>pg_node_tree</type></entry>
       <entry></entry>
       <entry>Expression tree (in <function>nodeToString()</function>
-       representation) for the trigger's <literal>WHEN</> condition, or null
+       representation) for the trigger's <literal>WHEN</literal> condition, or null
        if none</entry>
      </row>
 
@@ -6971,7 +7025,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>tgoldtable</structfield></entry>
       <entry><type>name</type></entry>
       <entry></entry>
-      <entry><literal>REFERENCING</> clause name for <literal>OLD TABLE</>,
+      <entry><literal>REFERENCING</literal> clause name for <literal>OLD TABLE</literal>,
        or null if none</entry>
      </row>
 
@@ -6979,7 +7033,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>tgnewtable</structfield></entry>
       <entry><type>name</type></entry>
       <entry></entry>
-      <entry><literal>REFERENCING</> clause name for <literal>NEW TABLE</>,
+      <entry><literal>REFERENCING</literal> clause name for <literal>NEW TABLE</literal>,
        or null if none</entry>
      </row>
     </tbody>
@@ -6988,18 +7042,18 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    Currently, column-specific triggering is supported only for
-   <literal>UPDATE</> events, and so <structfield>tgattr</> is relevant
+   <literal>UPDATE</literal> events, and so <structfield>tgattr</structfield> is relevant
    only for that event type.  <structfield>tgtype</structfield> might
    contain bits for other event types as well, but those are presumed
-   to be table-wide regardless of what is in <structfield>tgattr</>.
+   to be table-wide regardless of what is in <structfield>tgattr</structfield>.
   </para>
 
   <note>
    <para>
-    When <structfield>tgconstraint</> is nonzero,
-    <structfield>tgconstrrelid</>, <structfield>tgconstrindid</>,
-    <structfield>tgdeferrable</>, and <structfield>tginitdeferred</> are
-    largely redundant with the referenced <structname>pg_constraint</> entry.
+    When <structfield>tgconstraint</structfield> is nonzero,
+    <structfield>tgconstrrelid</structfield>, <structfield>tgconstrindid</structfield>,
+    <structfield>tgdeferrable</structfield>, and <structfield>tginitdeferred</structfield> are
+    largely redundant with the referenced <structname>pg_constraint</structname> entry.
     However, it is possible for a non-deferrable trigger to be associated
     with a deferrable constraint: foreign key constraints can have some
     deferrable and some non-deferrable triggers.
@@ -7035,11 +7089,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    <productname>PostgreSQL</productname>'s text search features are
-   described at length in <xref linkend="textsearch">.
+   described at length in <xref linkend="textsearch"/>.
   </para>
 
   <table>
-   <title><structname>pg_ts_config</> Columns</title>
+   <title><structname>pg_ts_config</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7110,11 +7164,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    <productname>PostgreSQL</productname>'s text search features are
-   described at length in <xref linkend="textsearch">.
+   described at length in <xref linkend="textsearch"/>.
   </para>
 
   <table>
-   <title><structname>pg_ts_config_map</> Columns</title>
+   <title><structname>pg_ts_config_map</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7131,7 +7185,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>mapcfg</structfield></entry>
       <entry><type>oid</type></entry>
       <entry><literal><link linkend="catalog-pg-ts-config"><structname>pg_ts_config</structname></link>.oid</literal></entry>
-      <entry>The OID of the <structname>pg_ts_config</> entry owning this map entry</entry>
+      <entry>The OID of the <structname>pg_ts_config</structname> entry owning this map entry</entry>
      </row>
 
      <row>
@@ -7146,7 +7200,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>integer</type></entry>
       <entry></entry>
       <entry>Order in which to consult this entry (lower
-       <structfield>mapseqno</>s first)</entry>
+       <structfield>mapseqno</structfield>s first)</entry>
      </row>
 
      <row>
@@ -7175,17 +7229,17 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    needed; the dictionary itself provides values for the user-settable
    parameters supported by the template.  This division of labor allows
    dictionaries to be created by unprivileged users.  The parameters
-   are specified by a text string <structfield>dictinitoption</>,
+   are specified by a text string <structfield>dictinitoption</structfield>,
    whose format and meaning vary depending on the template.
   </para>
 
   <para>
    <productname>PostgreSQL</productname>'s text search features are
-   described at length in <xref linkend="textsearch">.
+   described at length in <xref linkend="textsearch"/>.
   </para>
 
   <table>
-   <title><structname>pg_ts_dict</> Columns</title>
+   <title><structname>pg_ts_dict</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7264,11 +7318,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    <productname>PostgreSQL</productname>'s text search features are
-   described at length in <xref linkend="textsearch">.
+   described at length in <xref linkend="textsearch"/>.
   </para>
 
   <table>
-   <title><structname>pg_ts_parser</> Columns</title>
+   <title><structname>pg_ts_parser</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7361,11 +7415,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    <productname>PostgreSQL</productname>'s text search features are
-   described at length in <xref linkend="textsearch">.
+   described at length in <xref linkend="textsearch"/>.
   </para>
 
   <table>
-   <title><structname>pg_ts_template</> Columns</title>
+   <title><structname>pg_ts_template</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7430,16 +7484,16 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The catalog <structname>pg_type</structname> stores information about data
    types.  Base types and enum types (scalar types) are created with
-   <xref linkend="sql-createtype">, and
+   <xref linkend="sql-createtype"/>, and
    domains with
-   <xref linkend="sql-createdomain">.
+   <xref linkend="sql-createdomain"/>.
    A composite type is automatically created for each table in the database, to
    represent the row structure of the table.  It is also possible to create
    composite types with <command>CREATE TYPE AS</command>.
   </para>
 
   <table>
-   <title><structname>pg_type</> Columns</title>
+   <title><structname>pg_type</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7490,7 +7544,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        For a fixed-size type, <structfield>typlen</structfield> is the number
        of bytes in the internal representation of the type.  But for a
        variable-length type, <structfield>typlen</structfield> is negative.
-       -1 indicates a <quote>varlena</> type (one that has a length word),
+       -1 indicates a <quote>varlena</quote> type (one that has a length word),
        -2 indicates a null-terminated C string.
       </entry>
      </row>
@@ -7535,8 +7589,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry>
        <structfield>typcategory</structfield> is an arbitrary classification
        of data types that is used by the parser to determine which implicit
-       casts should be <quote>preferred</>.
-       See <xref linkend="catalog-typcategory-table">.
+       casts should be <quote>preferred</quote>.
+       See <xref linkend="catalog-typcategory-table"/>.
       </entry>
      </row>
 
@@ -7680,7 +7734,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        <structfield>typalign</structfield> is the alignment required
        when storing a value of this type.  It applies to storage on
        disk as well as most representations of the value inside
-       <productname>PostgreSQL</>.
+       <productname>PostgreSQL</productname>.
        When multiple values are stored consecutively, such
        as in the representation of a complete row on disk, padding is
        inserted before a datum of this type so that it begins on the
@@ -7692,16 +7746,16 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        Possible values are:
        <itemizedlist>
         <listitem>
-         <para><literal>c</> = <type>char</type> alignment, i.e., no alignment needed.</para>
+         <para><literal>c</literal> = <type>char</type> alignment, i.e., no alignment needed.</para>
         </listitem>
         <listitem>
-         <para><literal>s</> = <type>short</type> alignment (2 bytes on most machines).</para>
+         <para><literal>s</literal> = <type>short</type> alignment (2 bytes on most machines).</para>
         </listitem>
         <listitem>
-         <para><literal>i</> = <type>int</type> alignment (4 bytes on most machines).</para>
+         <para><literal>i</literal> = <type>int</type> alignment (4 bytes on most machines).</para>
         </listitem>
         <listitem>
-         <para><literal>d</> = <type>double</type> alignment (8 bytes on many machines, but by no means all).</para>
+         <para><literal>d</literal> = <type>double</type> alignment (8 bytes on many machines, but by no means all).</para>
         </listitem>
        </itemizedlist>
       </para><note>
@@ -7726,24 +7780,24 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
        Possible values are
        <itemizedlist>
         <listitem>
-         <para><literal>p</>: Value must always be stored plain.</para>
+         <para><literal>p</literal>: Value must always be stored plain.</para>
         </listitem>
         <listitem>
          <para>
-          <literal>e</>: Value can be stored in a <quote>secondary</quote>
+          <literal>e</literal>: Value can be stored in a <quote>secondary</quote>
           relation (if relation has one, see
           <literal>pg_class.reltoastrelid</literal>).
          </para>
         </listitem>
         <listitem>
-         <para><literal>m</>: Value can be stored compressed inline.</para>
+         <para><literal>m</literal>: Value can be stored compressed inline.</para>
         </listitem>
         <listitem>
-         <para><literal>x</>: Value can be stored compressed inline or stored in <quote>secondary</quote> storage.</para>
+         <para><literal>x</literal>: Value can be stored compressed inline or stored in <quote>secondary</quote> storage.</para>
         </listitem>
        </itemizedlist>
-       Note that <literal>m</> columns can also be moved out to secondary
-       storage, but only as a last resort (<literal>e</> and <literal>x</> columns are
+       Note that <literal>m</literal> columns can also be moved out to secondary
+       storage, but only as a last resort (<literal>e</literal> and <literal>x</literal> columns are
        moved first).
       </para></entry>
      </row>
@@ -7774,9 +7828,9 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>int4</type></entry>
       <entry></entry>
       <entry><para>
-       Domains use <structfield>typtypmod</structfield> to record the <literal>typmod</>
+       Domains use <structfield>typtypmod</structfield> to record the <literal>typmod</literal>
        to be applied to their base type (-1 if base type does not use a
-       <literal>typmod</>).  -1 if this type is not a domain.
+       <literal>typmod</literal>).  -1 if this type is not a domain.
       </para></entry>
      </row>
 
@@ -7786,7 +7840,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry><para>
        <structfield>typndims</structfield> is the number of array dimensions
-       for a domain over an array (that is, <structfield>typbasetype</> is
+       for a domain over an array (that is, <structfield>typbasetype</structfield> is
        an array type).
        Zero for types other than domains over array types.
        </para></entry>
@@ -7811,7 +7865,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>pg_node_tree</type></entry>
       <entry></entry>
       <entry><para>
-       If <structfield>typdefaultbin</> is not null, it is the
+       If <structfield>typdefaultbin</structfield> is not null, it is the
        <function>nodeToString()</function>
        representation of a default expression for the type.  This is
        only used for domains.
@@ -7823,12 +7877,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text</type></entry>
       <entry></entry>
       <entry><para>
-       <structfield>typdefault</> is null if the type has no associated
-       default value. If <structfield>typdefaultbin</> is not null,
-       <structfield>typdefault</> must contain a human-readable version of the
-       default expression represented by <structfield>typdefaultbin</>.  If
-       <structfield>typdefaultbin</> is null and <structfield>typdefault</> is
-       not, then <structfield>typdefault</> is the external representation of
+       <structfield>typdefault</structfield> is null if the type has no associated
+       default value. If <structfield>typdefaultbin</structfield> is not null,
+       <structfield>typdefault</structfield> must contain a human-readable version of the
+       default expression represented by <structfield>typdefaultbin</structfield>.  If
+       <structfield>typdefaultbin</structfield> is null and <structfield>typdefault</structfield> is
+       not, then <structfield>typdefault</structfield> is the external representation of
        the type's default value, which can be fed to the type's input
        converter to produce a constant.
       </para></entry>
@@ -7840,8 +7894,8 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Access privileges; see
-       <xref linkend="sql-grant"> and
-       <xref linkend="sql-revoke">
+       <xref linkend="sql-grant"/> and
+       <xref linkend="sql-revoke"/>
        for details
       </entry>
      </row>
@@ -7850,14 +7904,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </table>
 
   <para>
-   <xref linkend="catalog-typcategory-table"> lists the system-defined values
-   of <structfield>typcategory</>.  Any future additions to this list will
+   <xref linkend="catalog-typcategory-table"/> lists the system-defined values
+   of <structfield>typcategory</structfield>.  Any future additions to this list will
    also be upper-case ASCII letters.  All other ASCII characters are reserved
    for user-defined categories.
   </para>
 
   <table id="catalog-typcategory-table">
-   <title><structfield>typcategory</> Codes</title>
+   <title><structfield>typcategory</structfield> Codes</title>
 
    <tgroup cols="2">
     <thead>
@@ -7926,7 +7980,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
      </row>
      <row>
       <entry><literal>X</literal></entry>
-      <entry><type>unknown</> type</entry>
+      <entry><type>unknown</type> type</entry>
      </row>
     </tbody>
    </tgroup>
@@ -7951,7 +8005,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_user_mapping</> Columns</title>
+   <title><structname>pg_user_mapping</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -7992,7 +8046,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       User mapping specific options, as <quote>keyword=value</> strings
+       User mapping specific options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -8012,7 +8066,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <para>
-   The information schema (<xref linkend="information-schema">) provides
+   The information schema (<xref linkend="information-schema"/>) provides
    an alternative set of views which overlap the functionality of the system
    views.  Since the information schema is SQL-standard whereas the views
    described here are <productname>PostgreSQL</productname>-specific,
@@ -8021,11 +8075,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <para>
-   <xref linkend="view-table"> lists the system views described here.
+   <xref linkend="view-table"/> lists the system views described here.
    More detailed documentation of each view follows below.
    There are some additional views that provide access to the results of
    the statistics collector; they are described in <xref
-   linkend="monitoring-stats-views-table">.
+   linkend="monitoring-stats-views-table"/>.
   </para>
 
   <para>
@@ -8210,7 +8264,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_available_extensions</> Columns</title>
+   <title><structname>pg_available_extensions</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -8272,7 +8326,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_available_extension_versions</> Columns</title>
+   <title><structname>pg_available_extension_versions</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -8354,11 +8408,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The view <structname>pg_config</structname> describes the
    compile-time configuration parameters of the currently installed
-   version of <productname>PostgreSQL</>. It is intended, for example, to
+   version of <productname>PostgreSQL</productname>. It is intended, for example, to
    be used by software packages that want to interface to
-   <productname>PostgreSQL</> to facilitate finding the required header
+   <productname>PostgreSQL</productname> to facilitate finding the required header
    files and libraries. It provides the same basic information as the
-   <xref linkend="app-pgconfig"> <productname>PostgreSQL</> client
+   <xref linkend="app-pgconfig"/> <productname>PostgreSQL</productname> client
    application.
   </para>
 
@@ -8368,7 +8422,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_config</> Columns</title>
+   <title><structname>pg_config</structname> Columns</title>
    <tgroup cols="3">
     <thead>
      <row>
@@ -8409,7 +8463,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    <itemizedlist>
     <listitem>
      <para>
-      via the <xref linkend="sql-declare">
+      via the <xref linkend="sql-declare"/>
       statement in SQL
      </para>
     </listitem>
@@ -8417,14 +8471,14 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     <listitem>
      <para>
       via the Bind message in the frontend/backend protocol, as
-      described in <xref linkend="protocol-flow-ext-query">
+      described in <xref linkend="protocol-flow-ext-query"/>
      </para>
     </listitem>
 
     <listitem>
      <para>
       via the Server Programming Interface (SPI), as described in
-      <xref linkend="spi-interface">
+      <xref linkend="spi-interface"/>
      </para>
     </listitem>
    </itemizedlist>
@@ -8439,15 +8493,15 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    <note>
     <para>
      Cursors are used internally to implement some of the components
-     of <productname>PostgreSQL</>, such as procedural languages.
-     Therefore, the <structname>pg_cursors</> view might include cursors
+     of <productname>PostgreSQL</productname>, such as procedural languages.
+     Therefore, the <structname>pg_cursors</structname> view might include cursors
      that have not been explicitly created by the user.
     </para>
    </note>
   </para>
 
   <table>
-   <title><structname>pg_cursors</> Columns</title>
+   <title><structname>pg_cursors</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -8495,7 +8549,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><structfield>is_scrollable</structfield></entry>
       <entry><type>boolean</type></entry>
       <entry>
-       <literal>true</> if the cursor is scrollable (that is, it
+       <literal>true</literal> if the cursor is scrollable (that is, it
        allows rows to be retrieved in a nonsequential manner);
        <literal>false</literal> otherwise
        </entry>
@@ -8526,16 +8580,16 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The view <structname>pg_file_settings</structname> provides a summary of
    the contents of the server's configuration file(s).  A row appears in
-   this view for each <quote>name = value</> entry appearing in the files,
+   this view for each <quote>name = value</quote> entry appearing in the files,
    with annotations indicating whether the value could be applied
    successfully.  Additional row(s) may appear for problems not linked to
-   a <quote>name = value</> entry, such as syntax errors in the files.
+   a <quote>name = value</quote> entry, such as syntax errors in the files.
   </para>
 
   <para>
    This view is helpful for checking whether planned changes in the
    configuration files will work, or for diagnosing a previous failure.
-   Note that this view reports on the <emphasis>current</> contents of the
+   Note that this view reports on the <emphasis>current</emphasis> contents of the
    files, not on what was last applied by the server.  (The
    <link linkend="view-pg-settings"><structname>pg_settings</structname></link>
    view is usually sufficient to determine that.)
@@ -8547,7 +8601,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_file_settings</> Columns</title>
+   <title><structname>pg_file_settings</structname> Columns</title>
 
   <tgroup cols="3">
    <thead>
@@ -8573,7 +8627,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
     <row>
      <entry><structfield>seqno</structfield></entry>
      <entry><structfield>integer</structfield></entry>
-     <entry>Order in which the entries are processed (1..<replaceable>n</>)</entry>
+     <entry>Order in which the entries are processed (1..<replaceable>n</replaceable>)</entry>
     </row>
     <row>
      <entry><structfield>name</structfield></entry>
@@ -8603,21 +8657,21 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    If the configuration file contains syntax errors or invalid parameter
    names, the server will not attempt to apply any settings from it, and
-   therefore all the <structfield>applied</> fields will read as false.
+   therefore all the <structfield>applied</structfield> fields will read as false.
    In such a case there will be one or more rows with
    non-null <structfield>error</structfield> fields indicating the
    problem(s).  Otherwise, individual settings will be applied if possible.
    If an individual setting cannot be applied (e.g., invalid value, or the
    setting cannot be changed after server start) it will have an appropriate
    message in the <structfield>error</structfield> field.  Another way that
-   an entry might have <structfield>applied</> = false is that it is
+   an entry might have <structfield>applied</structfield> = false is that it is
    overridden by a later entry for the same parameter name; this case is not
    considered an error so nothing appears in
    the <structfield>error</structfield> field.
   </para>
 
   <para>
-   See <xref linkend="config-setting"> for more information about the various
+   See <xref linkend="config-setting"/> for more information about the various
    ways to change run-time parameters.
   </para>
 
@@ -8635,12 +8689,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    compatibility: it emulates a catalog that existed in
    <productname>PostgreSQL</productname> before version 8.1.
    It shows the names and members of all roles that are marked as not
-   <structfield>rolcanlogin</>, which is an approximation to the set
+   <structfield>rolcanlogin</structfield>, which is an approximation to the set
    of roles that are being used as groups.
   </para>
 
   <table>
-   <title><structname>pg_group</> Columns</title>
+   <title><structname>pg_group</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -8689,7 +8743,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The view <structname>pg_hba_file_rules</structname> provides a summary of
    the contents of the client authentication configuration
-   file, <filename>pg_hba.conf</>.  A row appears in this view for each
+   file, <filename>pg_hba.conf</filename>.  A row appears in this view for each
    non-empty, non-comment line in the file, with annotations indicating
    whether the rule could be applied successfully.
   </para>
@@ -8697,7 +8751,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    This view can be helpful for checking whether planned changes in the
    authentication configuration file will work, or for diagnosing a previous
-   failure.  Note that this view reports on the <emphasis>current</> contents
+   failure.  Note that this view reports on the <emphasis>current</emphasis> contents
    of the file, not on what was last loaded by the server.
   </para>
 
@@ -8707,7 +8761,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_hba_file_rules</> Columns</title>
+   <title><structname>pg_hba_file_rules</structname> Columns</title>
 
   <tgroup cols="3">
    <thead>
@@ -8722,7 +8776,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
      <entry><structfield>line_number</structfield></entry>
      <entry><structfield>integer</structfield></entry>
      <entry>
-      Line number of this rule in <filename>pg_hba.conf</>
+      Line number of this rule in <filename>pg_hba.conf</filename>
      </entry>
     </row>
     <row>
@@ -8778,11 +8832,11 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
 
   <para>
    Usually, a row reflecting an incorrect entry will have values for only
-   the <structfield>line_number</> and <structfield>error</> fields.
+   the <structfield>line_number</structfield> and <structfield>error</structfield> fields.
   </para>
 
   <para>
-   See <xref linkend="client-authentication"> for more information about
+   See <xref linkend="client-authentication"/> for more information about
    client authentication configuration.
   </para>
  </sect1>
@@ -8800,7 +8854,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   </para>
 
   <table>
-   <title><structname>pg_indexes</> Columns</title>
+   <title><structname>pg_indexes</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -8859,7 +8913,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
   <para>
    The view <structname>pg_locks</structname> provides access to
    information about the locks held by active processes within the
-   database server.  See <xref linkend="mvcc"> for more discussion
+   database server.  See <xref linkend="mvcc"/> for more discussion
    of locking.
   </para>
 
@@ -8881,12 +8935,12 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    in the same way as in <structname>pg_description</structname> or
    <structname>pg_depend</structname>).  Also, the right to extend a
    relation is represented as a separate lockable object.
-   Also, <quote>advisory</> locks can be taken on numbers that have
+   Also, <quote>advisory</quote> locks can be taken on numbers that have
    user-defined meanings.
   </para>
 
   <table>
-   <title><structname>pg_locks</> Columns</title>
+   <title><structname>pg_locks</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -8904,15 +8958,15 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Type of the lockable object:
-       <literal>relation</>,
-       <literal>extend</>,
-       <literal>page</>,
-       <literal>tuple</>,
-       <literal>transactionid</>,
-       <literal>virtualxid</>,
-       <literal>object</>,
-       <literal>userlock</>, or
-       <literal>advisory</>
+       <literal>relation</literal>,
+       <literal>extend</literal>,
+       <literal>page</literal>,
+       <literal>tuple</literal>,
+       <literal>transactionid</literal>,
+       <literal>virtualxid</literal>,
+       <literal>object</literal>,
+       <literal>userlock</literal>, or
+       <literal>advisory</literal>
       </entry>
      </row>
      <row>
@@ -8994,7 +9048,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry></entry>
       <entry>
        Column number targeted by the lock (the
-       <structfield>classid</> and <structfield>objid</> refer to the
+       <structfield>classid</structfield> and <structfield>objid</structfield> refer to the
        table itself),
        or zero if the target is some other general database object,
        or null if the target is not a general database object
@@ -9022,7 +9076,7 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
       <entry><type>text</type></entry>
       <entry></entry>
       <entry>Name of the lock mode held or desired by this process (see <xref
-      linkend="locking-tables"> and <xref linkend="xact-serializable">)</entry>
+      linkend="locking-tables"/> and <xref linkend="xact-serializable"/>)</entry>
      </row>
      <row>
       <entry><structfield>granted</structfield></entry>
@@ -9076,23 +9130,23 @@ SCRAM-SHA-256$<replaceable>&lt;iteration count&gt;</>:<replaceable>&lt;salt&gt;<
    Advisory locks can be acquired on keys consisting of either a single
    <type>bigint</type> value or two integer values.
    A <type>bigint</type> key is displayed with its
-   high-order half in the <structfield>classid</> column, its low-order half
-   in the <structfield>objid</> column, and <structfield>objsubid</> equal
+   high-order half in the <structfield>classid</structfield> column, its low-order half
+   in the <structfield>objid</structfield> column, and <structfield>objsubid</structfield> equal
    to 1. The original <type>bigint</type> value can be reassembled with the
    expression <literal>(classid::bigint &lt;&lt; 32) |
    objid::bigint</literal>. Integer keys are displayed with the
    first key in the
-   <structfield>classid</> column, the second key in the <structfield>objid</>
-   column, and <structfield>objsubid</> equal to 2.  The actual meaning of
+   <structfield>classid</structfield> column, the second key in the <structfield>objid</structfield>
+   column, and <structfield>objsubid</structfield> equal to 2.  The actual meaning of
    the keys is up to the user.  Advisory locks are local to each database,
-   so the <structfield>database</> column is meaningful for an advisory lock.
+   so the <structfield>database</structfield> column is meaningful for an advisory lock.
   </para>
 
   <para>
    <structname>pg_locks</structname> provides a global view of all locks
    in the database cluster, not only those relevant to the current database.
    Although its <structfield>relation</structfield> column can be joined
-   against <structname>pg_class</>.<structfield>oid</> to identify locked
+   against <structname>pg_class</structname>.<structfield>oid</structfield> to identify locked
    relations, this will only work correctly for relations in the current
    database (those for which the <structfield>database</structfield> column
    is either the current database's OID or zero).
@@ -9110,7 +9164,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_stat_activity psa
     ON pl.pid = psa.pid;
 </programlisting>
    Also, if you are using prepared transactions, the
-   <structfield>virtualtransaction</> column can be joined to the
+   <structfield>virtualtransaction</structfield> column can be joined to the
    <structfield>transaction</structfield> column of the <link
    linkend="view-pg-prepared-xacts"><structname>pg_prepared_xacts</structname></link>
    view to get more information on prepared transactions that hold locks.
@@ -9132,8 +9186,8 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    information about which processes are ahead of which others in lock wait
    queues, nor information about which processes are parallel workers running
    on behalf of which other client sessions.  It is better to use
-   the <function>pg_blocking_pids()</> function
-   (see <xref linkend="functions-info-session-table">) to identify which
+   the <function>pg_blocking_pids()</function> function
+   (see <xref linkend="functions-info-session-table"/>) to identify which
    process(es) a waiting process is blocked behind.
   </para>
 
@@ -9141,10 +9195,10 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    The <structname>pg_locks</structname> view displays data from both the
    regular lock manager and the predicate lock manager, which are
    separate systems; in addition, the regular lock manager subdivides its
-   locks into regular and <firstterm>fast-path</> locks.
+   locks into regular and <firstterm>fast-path</firstterm> locks.
    This data is not guaranteed to be entirely consistent.
    When the view is queried,
-   data on fast-path locks (with <structfield>fastpath</> = <literal>true</>)
+   data on fast-path locks (with <structfield>fastpath</structfield> = <literal>true</literal>)
    is gathered from each backend one at a time, without freezing the state of
    the entire lock manager, so it is possible for locks to be taken or
    released while information is gathered.  Note, however, that these locks are
@@ -9187,7 +9241,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_matviews</> Columns</title>
+   <title><structname>pg_matviews</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -9260,7 +9314,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_policies</> Columns</title>
+   <title><structname>pg_policies</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -9338,7 +9392,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   <para>
    The <structname>pg_prepared_statements</structname> view displays
    all the prepared statements that are available in the current
-   session. See <xref linkend="sql-prepare"> for more information about prepared
+   session. See <xref linkend="sql-prepare"/> for more information about prepared
    statements.
   </para>
 
@@ -9346,11 +9400,11 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    <structname>pg_prepared_statements</structname> contains one row
    for each prepared statement. Rows are added to the view when a new
    prepared statement is created and removed when a prepared statement
-   is released (for example, via the <xref linkend="sql-deallocate"> command).
+   is released (for example, via the <xref linkend="sql-deallocate"/> command).
   </para>
 
   <table>
-   <title><structname>pg_prepared_statements</> Columns</title>
+   <title><structname>pg_prepared_statements</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -9426,7 +9480,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   <para>
    The view <structname>pg_prepared_xacts</structname> displays
    information about transactions that are currently prepared for two-phase
-   commit (see <xref linkend="sql-prepare-transaction"> for details).
+   commit (see <xref linkend="sql-prepare-transaction"/> for details).
   </para>
 
   <para>
@@ -9436,7 +9490,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_prepared_xacts</> Columns</title>
+   <title><structname>pg_prepared_xacts</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -9570,7 +9624,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    The <structname>pg_replication_origin_status</structname> view
    contains information about how far replay for a certain origin has
    progressed.  For more on replication origins
-   see <xref linkend="replication-origins">.
+   see <xref linkend="replication-origins"/>.
   </para>
 
   <table>
@@ -9639,7 +9693,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
 
   <para>
    For more on replication slots,
-   see <xref linkend="streaming-replication-slots"> and <xref linkend="logicaldecoding">.
+   see <xref linkend="streaming-replication-slots"/> and <xref linkend="logicaldecoding"/>.
   </para>
 
   <table>
@@ -9675,7 +9729,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry><structfield>slot_type</structfield></entry>
       <entry><type>text</type></entry>
       <entry></entry>
-      <entry>The slot type - <literal>physical</> or <literal>logical</></entry>
+      <entry>The slot type - <literal>physical</literal> or <literal>logical</literal></entry>
      </row>
 
      <row>
@@ -9756,7 +9810,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry></entry>
       <entry>The address (<literal>LSN</literal>) up to which the logical
       slot's consumer has confirmed receiving data. Data older than this is
-      not available anymore. <literal>NULL</> for physical slots.
+      not available anymore. <literal>NULL</literal> for physical slots.
       </entry>
      </row>
 
@@ -9786,7 +9840,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_roles</> Columns</title>
+   <title><structname>pg_roles</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -9869,7 +9923,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry><structfield>rolpassword</structfield></entry>
       <entry><type>text</type></entry>
       <entry></entry>
-      <entry>Not the password (always reads as <literal>********</>)</entry>
+      <entry>Not the password (always reads as <literal>********</literal>)</entry>
      </row>
 
      <row>
@@ -9886,7 +9940,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry></entry>
       <entry>
        Role bypasses every row level security policy, see
-       <xref linkend="ddl-rowsecurity"> for more information.
+       <xref linkend="ddl-rowsecurity"/> for more information.
       </entry>
      </row>
 
@@ -9922,7 +9976,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_rules</> Columns</title>
+   <title><structname>pg_rules</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -9963,9 +10017,9 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </table>
 
   <para>
-   The <structname>pg_rules</> view excludes the <literal>ON SELECT</> rules
+   The <structname>pg_rules</structname> view excludes the <literal>ON SELECT</literal> rules
    of views and materialized views; those can be seen in
-   <structname>pg_views</> and <structname>pg_matviews</>.
+   <structname>pg_views</structname> and <structname>pg_matviews</structname>.
   </para>
 
  </sect1>
@@ -9980,11 +10034,11 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   <para>
    The view <structname>pg_seclabels</structname> provides information about
    security labels.  It as an easier-to-query version of the
-   <link linkend="catalog-pg-seclabel"><structname>pg_seclabel</></> catalog.
+   <link linkend="catalog-pg-seclabel"><structname>pg_seclabel</structname></link> catalog.
   </para>
 
   <table>
-   <title><structname>pg_seclabels</> Columns</title>
+   <title><structname>pg_seclabels</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -10014,7 +10068,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry></entry>
       <entry>
        For a security label on a table column, this is the column number (the
-       <structfield>objoid</> and <structfield>classoid</> refer to
+       <structfield>objoid</structfield> and <structfield>classoid</structfield> refer to
        the table itself).  For all other object types, this column is
        zero.
       </entry>
@@ -10074,7 +10128,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_sequences</> Columns</title>
+   <title><structname>pg_sequences</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -10172,15 +10226,15 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   <para>
    The view <structname>pg_settings</structname> provides access to
    run-time parameters of the server.  It is essentially an alternative
-   interface to the <xref linkend="sql-show">
-   and <xref linkend="sql-set"> commands.
+   interface to the <xref linkend="sql-show"/>
+   and <xref linkend="sql-set"/> commands.
    It also provides access to some facts about each parameter that are
-   not directly available from <command>SHOW</>, such as minimum and
+   not directly available from <command>SHOW</command>, such as minimum and
    maximum values.
   </para>
 
   <table>
-   <title><structname>pg_settings</> Columns</title>
+   <title><structname>pg_settings</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -10229,8 +10283,8 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
      <row>
       <entry><structfield>vartype</structfield></entry>
       <entry><type>text</type></entry>
-      <entry>Parameter type (<literal>bool</>, <literal>enum</>,
-       <literal>integer</>, <literal>real</>, or <literal>string</>)
+      <entry>Parameter type (<literal>bool</literal>, <literal>enum</literal>,
+       <literal>integer</literal>, <literal>real</literal>, or <literal>string</literal>)
       </entry>
      </row>
      <row>
@@ -10275,7 +10329,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       values set from sources other than configuration files, or when
       examined by a user who is neither a superuser or a member of
       <literal>pg_read_all_settings</literal>); helpful when using
-      <literal>include</> directives in configuration files</entry>
+      <literal>include</literal> directives in configuration files</entry>
      </row>
      <row>
       <entry><structfield>sourceline</structfield></entry>
@@ -10353,7 +10407,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       Changes to these settings can be made in
       <filename>postgresql.conf</filename> without restarting the server.
       They can also be set for a particular session in the connection request
-      packet (for example, via <application>libpq</>'s <literal>PGOPTIONS</>
+      packet (for example, via <application>libpq</application>'s <literal>PGOPTIONS</literal>
       environment variable), but only if the connecting user is a superuser.
       However, these settings never change in a session after it is started.
       If you change them in <filename>postgresql.conf</filename>, send a
@@ -10371,7 +10425,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       Changes to these settings can be made in
       <filename>postgresql.conf</filename> without restarting the server.
       They can also be set for a particular session in the connection request
-      packet (for example, via <application>libpq</>'s <literal>PGOPTIONS</>
+      packet (for example, via <application>libpq</application>'s <literal>PGOPTIONS</literal>
       environment variable); any user can make such a change for their session.
       However, these settings never change in a session after it is started.
       If you change them in <filename>postgresql.conf</filename>, send a
@@ -10387,10 +10441,10 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
     <listitem>
      <para>
       These settings can be set from <filename>postgresql.conf</filename>,
-      or within a session via the <command>SET</> command; but only superusers
-      can change them via <command>SET</>.  Changes in
+      or within a session via the <command>SET</command> command; but only superusers
+      can change them via <command>SET</command>.  Changes in
       <filename>postgresql.conf</filename> will affect existing sessions
-      only if no session-local value has been established with <command>SET</>.
+      only if no session-local value has been established with <command>SET</command>.
      </para>
     </listitem>
    </varlistentry>
@@ -10400,17 +10454,17 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
     <listitem>
      <para>
       These settings can be set from <filename>postgresql.conf</filename>,
-      or within a session via the <command>SET</> command.  Any user is
+      or within a session via the <command>SET</command> command.  Any user is
       allowed to change their session-local value.  Changes in
       <filename>postgresql.conf</filename> will affect existing sessions
-      only if no session-local value has been established with <command>SET</>.
+      only if no session-local value has been established with <command>SET</command>.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
 
   <para>
-   See <xref linkend="config-setting"> for more information about the various
+   See <xref linkend="config-setting"/> for more information about the various
    ways to change these parameters.
   </para>
 
@@ -10418,7 +10472,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    The <structname>pg_settings</structname> view cannot be inserted into or
    deleted from, but it can be updated.  An <command>UPDATE</command> applied
    to a row of <structname>pg_settings</structname> is equivalent to executing
-   the <xref linkend="sql-set"> command on that named
+   the <xref linkend="sql-set"/> command on that named
    parameter. The change only affects the value used by the current
    session. If an <command>UPDATE</command> is issued within a transaction
    that is later aborted, the effects of the <command>UPDATE</command> command
@@ -10442,7 +10496,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    compatibility: it emulates a catalog that existed in
    <productname>PostgreSQL</productname> before version 8.1.
    It shows properties of all roles that are marked as
-   <structfield>rolcanlogin</> in
+   <structfield>rolcanlogin</structfield> in
    <link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>.
   </para>
 
@@ -10455,7 +10509,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_shadow</> Columns</title>
+   <title><structname>pg_shadow</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -10512,7 +10566,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry></entry>
       <entry>
        User bypasses every row level security policy, see
-       <xref linkend="ddl-rowsecurity"> for more information.
+       <xref linkend="ddl-rowsecurity"/> for more information.
       </entry>
      </row>
 
@@ -10569,7 +10623,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_stats</> Columns</title>
+   <title><structname>pg_stats</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -10632,7 +10686,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
        If greater than zero, the estimated number of distinct values in the
        column.  If less than zero, the negative of the number of distinct
        values divided by the number of rows.  (The negated form is used when
-       <command>ANALYZE</> believes that the number of distinct values is
+       <command>ANALYZE</command> believes that the number of distinct values is
        likely to increase as the table grows; the positive form is used when
        the column seems to have a fixed number of possible values.)  For
        example, -1 indicates a unique column in which the number of distinct
@@ -10668,10 +10722,10 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry>
        A list of values that divide the column's values into groups of
        approximately equal population.  The values in
-       <structfield>most_common_vals</>, if present, are omitted from this
+       <structfield>most_common_vals</structfield>, if present, are omitted from this
        histogram calculation.  (This column is null if the column data type
-       does not have a <literal>&lt;</> operator or if the
-       <structfield>most_common_vals</> list accounts for the entire
+       does not have a <literal>&lt;</literal> operator or if the
+       <structfield>most_common_vals</structfield> list accounts for the entire
        population.)
       </entry>
      </row>
@@ -10686,7 +10740,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
        When the value is near -1 or +1, an index scan on the column will
        be estimated to be cheaper than when it is near zero, due to reduction
        of random access to the disk.  (This column is null if the column data
-       type does not have a <literal>&lt;</> operator.)
+       type does not have a <literal>&lt;</literal> operator.)
       </entry>
      </row>
 
@@ -10730,9 +10784,9 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
 
   <para>
    The maximum number of entries in the array fields can be controlled on a
-   column-by-column basis using the <command>ALTER TABLE SET STATISTICS</>
+   column-by-column basis using the <command>ALTER TABLE SET STATISTICS</command>
    command, or globally by setting the
-   <xref linkend="guc-default-statistics-target"> run-time parameter.
+   <xref linkend="guc-default-statistics-target"/> run-time parameter.
   </para>
 
  </sect1>
@@ -10750,7 +10804,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_tables</> Columns</title>
+   <title><structname>pg_tables</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -10827,11 +10881,11 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    The view <structname>pg_timezone_abbrevs</structname> provides a list
    of time zone abbreviations that are currently recognized by the datetime
    input routines.  The contents of this view change when the
-   <xref linkend="guc-timezone-abbreviations"> run-time parameter is modified.
+   <xref linkend="guc-timezone-abbreviations"/> run-time parameter is modified.
   </para>
 
   <table>
-   <title><structname>pg_timezone_abbrevs</> Columns</title>
+   <title><structname>pg_timezone_abbrevs</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -10864,7 +10918,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   <para>
    While most timezone abbreviations represent fixed offsets from UTC,
    there are some that have historically varied in value
-   (see <xref linkend="datetime-config-files"> for more information).
+   (see <xref linkend="datetime-config-files"/> for more information).
    In such cases this view presents their current meaning.
   </para>
 
@@ -10879,7 +10933,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
 
   <para>
    The view <structname>pg_timezone_names</structname> provides a list
-   of time zone names that are recognized by <command>SET TIMEZONE</>,
+   of time zone names that are recognized by <command>SET TIMEZONE</command>,
    along with their associated abbreviations, UTC offsets,
    and daylight-savings status.  (Technically,
    <productname>PostgreSQL</productname> does not use UTC because leap
@@ -10888,11 +10942,11 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
    linkend="view-pg-timezone-abbrevs"><structname>pg_timezone_abbrevs</structname></link>, many of these names imply a set of daylight-savings transition
    date rules.  Therefore, the associated information changes across local DST
    boundaries.  The displayed information is computed based on the current
-   value of <function>CURRENT_TIMESTAMP</>.
+   value of <function>CURRENT_TIMESTAMP</function>.
   </para>
 
   <table>
-   <title><structname>pg_timezone_names</> Columns</title>
+   <title><structname>pg_timezone_names</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -10945,7 +10999,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_user</> Columns</title>
+   <title><structname>pg_user</structname> Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -10994,14 +11048,14 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry><type>bool</type></entry>
       <entry>
        User bypasses every row level security policy, see
-       <xref linkend="ddl-rowsecurity"> for more information.
+       <xref linkend="ddl-rowsecurity"/> for more information.
       </entry>
      </row>
 
      <row>
       <entry><structfield>passwd</structfield></entry>
       <entry><type>text</type></entry>
-      <entry>Not the password (always reads as <literal>********</>)</entry>
+      <entry>Not the password (always reads as <literal>********</literal>)</entry>
      </row>
 
      <row>
@@ -11038,7 +11092,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_user_mappings</> Columns</title>
+   <title><structname>pg_user_mappings</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -11095,7 +11149,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
       <entry><type>text[]</type></entry>
       <entry></entry>
       <entry>
-       User mapping specific options, as <quote>keyword=value</> strings
+       User mapping specific options, as <quote>keyword=value</quote> strings
       </entry>
      </row>
     </tbody>
@@ -11110,12 +11164,12 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
     <listitem>
      <para>
       current user is the user being mapped, and owns the server or
-      holds <literal>USAGE</> privilege on it
+      holds <literal>USAGE</literal> privilege on it
      </para>
     </listitem>
     <listitem>
      <para>
-      current user is the server owner and mapping is for <literal>PUBLIC</>
+      current user is the server owner and mapping is for <literal>PUBLIC</literal>
      </para>
     </listitem>
     <listitem>
@@ -11142,7 +11196,7 @@ SELECT * FROM pg_locks pl LEFT JOIN pg_prepared_xacts ppx
   </para>
 
   <table>
-   <title><structname>pg_views</> Columns</title>
+   <title><structname>pg_views</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 48ecfc5f48..dc3fd34a62 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -15,8 +15,8 @@
       Using the locale features of the operating system to provide
       locale-specific collation order, number formatting, translated
       messages, and other aspects.
-      This is covered in <xref linkend="locale"> and
-      <xref linkend="collation">.
+      This is covered in <xref linkend="locale"/> and
+      <xref linkend="collation"/>.
      </para>
     </listitem>
 
@@ -25,7 +25,7 @@
       Providing a number of different character sets to support storing text
       in all kinds of languages, and providing character set translation
       between client and server.
-      This is covered in <xref linkend="multibyte">.
+      This is covered in <xref linkend="multibyte"/>.
      </para>
     </listitem>
    </itemizedlist>
@@ -35,12 +35,12 @@
  <sect1 id="locale">
   <title>Locale Support</title>
 
-  <indexterm zone="locale"><primary>locale</></>
+  <indexterm zone="locale"><primary>locale</primary></indexterm>
 
   <para>
-   <firstterm>Locale</> support refers to an application respecting
+   <firstterm>Locale</firstterm> support refers to an application respecting
    cultural preferences regarding alphabets, sorting, number
-   formatting, etc.  <productname>PostgreSQL</> uses the standard ISO
+   formatting, etc.  <productname>PostgreSQL</productname> uses the standard ISO
    C and <acronym>POSIX</acronym> locale facilities provided by the server operating
    system.  For additional information refer to the documentation of your
    system.
@@ -67,14 +67,14 @@ initdb --locale=sv_SE
 
    <para>
     This example for Unix systems sets the locale to Swedish
-    (<literal>sv</>) as spoken
-    in Sweden (<literal>SE</>).  Other possibilities might include
-    <literal>en_US</> (U.S. English) and <literal>fr_CA</> (French
+    (<literal>sv</literal>) as spoken
+    in Sweden (<literal>SE</literal>).  Other possibilities might include
+    <literal>en_US</literal> (U.S. English) and <literal>fr_CA</literal> (French
     Canadian).  If more than one character set can be used for a
     locale then the specifications can take the form
-    <replaceable>language_territory.codeset</>.  For example,
-    <literal>fr_BE.UTF-8</> represents the French language (fr) as
-    spoken in Belgium (BE), with a <acronym>UTF-8</> character set
+    <replaceable>language_territory.codeset</replaceable>.  For example,
+    <literal>fr_BE.UTF-8</literal> represents the French language (fr) as
+    spoken in Belgium (BE), with a <acronym>UTF-8</acronym> character set
     encoding.
    </para>
 
@@ -82,9 +82,9 @@ initdb --locale=sv_SE
     What locales are available on your
     system under what names depends on what was provided by the operating
     system vendor and what was installed.  On most Unix systems, the command
-    <literal>locale -a</> will provide a list of available locales.
-    Windows uses more verbose locale names, such as <literal>German_Germany</>
-    or <literal>Swedish_Sweden.1252</>, but the principles are the same.
+    <literal>locale -a</literal> will provide a list of available locales.
+    Windows uses more verbose locale names, such as <literal>German_Germany</literal>
+    or <literal>Swedish_Sweden.1252</literal>, but the principles are the same.
    </para>
 
    <para>
@@ -97,28 +97,28 @@ initdb --locale=sv_SE
      <tgroup cols="2">
       <tbody>
        <row>
-        <entry><envar>LC_COLLATE</></>
-        <entry>String sort order</>
+        <entry><envar>LC_COLLATE</envar></entry>
+        <entry>String sort order</entry>
        </row>
        <row>
-        <entry><envar>LC_CTYPE</></>
-        <entry>Character classification (What is a letter? Its upper-case equivalent?)</>
+        <entry><envar>LC_CTYPE</envar></entry>
+        <entry>Character classification (What is a letter? Its upper-case equivalent?)</entry>
        </row>
        <row>
-        <entry><envar>LC_MESSAGES</></>
-        <entry>Language of messages</>
+        <entry><envar>LC_MESSAGES</envar></entry>
+        <entry>Language of messages</entry>
        </row>
        <row>
-        <entry><envar>LC_MONETARY</></>
-        <entry>Formatting of currency amounts</>
+        <entry><envar>LC_MONETARY</envar></entry>
+        <entry>Formatting of currency amounts</entry>
        </row>
        <row>
-        <entry><envar>LC_NUMERIC</></>
-        <entry>Formatting of numbers</>
+        <entry><envar>LC_NUMERIC</envar></entry>
+        <entry>Formatting of numbers</entry>
        </row>
        <row>
-        <entry><envar>LC_TIME</></>
-        <entry>Formatting of dates and times</>
+        <entry><envar>LC_TIME</envar></entry>
+        <entry>Formatting of dates and times</entry>
        </row>
       </tbody>
      </tgroup>
@@ -133,8 +133,8 @@ initdb --locale=sv_SE
 
    <para>
     If you want the system to behave as if it had no locale support,
-    use the special locale name <literal>C</>, or equivalently
-    <literal>POSIX</>.
+    use the special locale name <literal>C</literal>, or equivalently
+    <literal>POSIX</literal>.
    </para>
 
    <para>
@@ -146,7 +146,7 @@ initdb --locale=sv_SE
     the sort order of indexes, so they must be kept fixed, or indexes on
     text columns would become corrupt.
     (But you can alleviate this restriction using collations, as discussed
-    in <xref linkend="collation">.)
+    in <xref linkend="collation"/>.)
     The default values for these
     categories are determined when <command>initdb</command> is run, and
     those values are used when new databases are created, unless
@@ -157,7 +157,7 @@ initdb --locale=sv_SE
     The other locale categories can be changed whenever desired
     by setting the server configuration parameters
     that have the same name as the locale categories (see <xref
-    linkend="runtime-config-client-format"> for details).  The values
+    linkend="runtime-config-client-format"/> for details).  The values
     that are chosen by <command>initdb</command> are actually only written
     into the configuration file <filename>postgresql.conf</filename> to
     serve as defaults when the server is started.  If you remove these
@@ -192,14 +192,14 @@ initdb --locale=sv_SE
      settings for the purpose of setting the language of messages.  If
      in doubt, please refer to the documentation of your operating
      system, in particular the documentation about
-     <application>gettext</>.
+     <application>gettext</application>.
     </para>
    </note>
 
    <para>
     To enable messages to be translated to the user's preferred language,
     <acronym>NLS</acronym> must have been selected at build time
-    (<literal>configure --enable-nls</>).  All other locale support is
+    (<literal>configure --enable-nls</literal>).  All other locale support is
     built in automatically.
    </para>
   </sect2>
@@ -213,64 +213,64 @@ initdb --locale=sv_SE
     <itemizedlist>
      <listitem>
       <para>
-       Sort order in queries using <literal>ORDER BY</> or the standard
+       Sort order in queries using <literal>ORDER BY</literal> or the standard
        comparison operators on textual data
-       <indexterm><primary>ORDER BY</><secondary>and locales</></indexterm>
+       <indexterm><primary>ORDER BY</primary><secondary>and locales</secondary></indexterm>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The <function>upper</>, <function>lower</>, and <function>initcap</>
+       The <function>upper</function>, <function>lower</function>, and <function>initcap</function>
        functions
-       <indexterm><primary>upper</><secondary>and locales</></indexterm>
-       <indexterm><primary>lower</><secondary>and locales</></indexterm>
+       <indexterm><primary>upper</primary><secondary>and locales</secondary></indexterm>
+       <indexterm><primary>lower</primary><secondary>and locales</secondary></indexterm>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Pattern matching operators (<literal>LIKE</>, <literal>SIMILAR TO</>,
+       Pattern matching operators (<literal>LIKE</literal>, <literal>SIMILAR TO</literal>,
        and POSIX-style regular expressions); locales affect both case
        insensitive matching and the classification of characters by
        character-class regular expressions
-       <indexterm><primary>LIKE</><secondary>and locales</></indexterm>
-       <indexterm><primary>regular expressions</><secondary>and locales</></indexterm>
+       <indexterm><primary>LIKE</primary><secondary>and locales</secondary></indexterm>
+       <indexterm><primary>regular expressions</primary><secondary>and locales</secondary></indexterm>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The <function>to_char</> family of functions
-       <indexterm><primary>to_char</><secondary>and locales</></indexterm>
+       The <function>to_char</function> family of functions
+       <indexterm><primary>to_char</primary><secondary>and locales</secondary></indexterm>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The ability to use indexes with <literal>LIKE</> clauses
+       The ability to use indexes with <literal>LIKE</literal> clauses
       </para>
      </listitem>
     </itemizedlist>
    </para>
 
    <para>
-    The drawback of using locales other than <literal>C</> or
-    <literal>POSIX</> in <productname>PostgreSQL</> is its performance
+    The drawback of using locales other than <literal>C</literal> or
+    <literal>POSIX</literal> in <productname>PostgreSQL</productname> is its performance
     impact. It slows character handling and prevents ordinary indexes
-    from being used by <literal>LIKE</>. For this reason use locales
+    from being used by <literal>LIKE</literal>. For this reason use locales
     only if you actually need them.
    </para>
 
    <para>
-    As a workaround to allow <productname>PostgreSQL</> to use indexes
-    with <literal>LIKE</> clauses under a non-C locale, several custom
+    As a workaround to allow <productname>PostgreSQL</productname> to use indexes
+    with <literal>LIKE</literal> clauses under a non-C locale, several custom
     operator classes exist. These allow the creation of an index that
     performs a strict character-by-character comparison, ignoring
-    locale comparison rules. Refer to <xref linkend="indexes-opclass">
+    locale comparison rules. Refer to <xref linkend="indexes-opclass"/>
     for more information.  Another approach is to create indexes using
-    the <literal>C</> collation, as discussed in
-    <xref linkend="collation">.
+    the <literal>C</literal> collation, as discussed in
+    <xref linkend="collation"/>.
    </para>
   </sect2>
 
@@ -286,20 +286,20 @@ initdb --locale=sv_SE
    </para>
 
    <para>
-    Check that <productname>PostgreSQL</> is actually using the locale
-    that you think it is.  The <envar>LC_COLLATE</> and <envar>LC_CTYPE</>
+    Check that <productname>PostgreSQL</productname> is actually using the locale
+    that you think it is.  The <envar>LC_COLLATE</envar> and <envar>LC_CTYPE</envar>
     settings are determined when a database is created, and cannot be
     changed except by creating a new database.  Other locale
-    settings including <envar>LC_MESSAGES</> and <envar>LC_MONETARY</>
+    settings including <envar>LC_MESSAGES</envar> and <envar>LC_MONETARY</envar>
     are initially determined by the environment the server is started
     in, but can be changed on-the-fly.  You can check the active locale
-    settings using the <command>SHOW</> command.
+    settings using the <command>SHOW</command> command.
    </para>
 
    <para>
-    The directory <filename>src/test/locale</> in the source
+    The directory <filename>src/test/locale</filename> in the source
     distribution contains a test suite for
-    <productname>PostgreSQL</>'s locale support.
+    <productname>PostgreSQL</productname>'s locale support.
    </para>
 
    <para>
@@ -313,10 +313,10 @@ initdb --locale=sv_SE
    <para>
     Maintaining catalogs of message translations requires the on-going
     efforts of many volunteers that want to see
-    <productname>PostgreSQL</> speak their preferred language well.
+    <productname>PostgreSQL</productname> speak their preferred language well.
     If messages in your language are currently not available or not fully
     translated, your assistance would be appreciated.  If you want to
-    help, refer to <xref linkend="nls"> or write to the developers'
+    help, refer to <xref linkend="nls"/> or write to the developers'
     mailing list.
    </para>
   </sect2>
@@ -326,7 +326,7 @@ initdb --locale=sv_SE
  <sect1 id="collation">
   <title>Collation Support</title>
 
-  <indexterm zone="collation"><primary>collation</></>
+  <indexterm zone="collation"><primary>collation</primary></indexterm>
 
   <para>
    The collation feature allows specifying the sort order and character
@@ -370,9 +370,9 @@ initdb --locale=sv_SE
     function or operator call is derived from the arguments, as described
     below.  In addition to comparison operators, collations are taken into
     account by functions that convert between lower and upper case
-    letters, such as <function>lower</>, <function>upper</>, and
-    <function>initcap</>; by pattern matching operators; and by
-    <function>to_char</> and related functions.
+    letters, such as <function>lower</function>, <function>upper</function>, and
+    <function>initcap</function>; by pattern matching operators; and by
+    <function>to_char</function> and related functions.
    </para>
 
    <para>
@@ -452,7 +452,7 @@ SELECT a &lt; ('foo' COLLATE "fr_FR") FROM test1;
 SELECT a &lt; b FROM test1;
 </programlisting>
     the parser cannot determine which collation to apply, since the
-    <structfield>a</> and <structfield>b</> columns have conflicting
+    <structfield>a</structfield> and <structfield>b</structfield> columns have conflicting
     implicit collations.  Since the <literal>&lt;</literal> operator
     does need to know which collation to use, this will result in an
     error.  The error can be resolved by attaching an explicit collation
@@ -468,7 +468,7 @@ SELECT a COLLATE "de_DE" &lt; b FROM test1;
 <programlisting>
 SELECT a || b FROM test1;
 </programlisting>
-    does not result in an error, because the <literal>||</> operator
+    does not result in an error, because the <literal>||</literal> operator
     does not care about collations: its result is the same regardless
     of the collation.
    </para>
@@ -486,8 +486,8 @@ SELECT * FROM test1 ORDER BY a || 'foo';
 <programlisting>
 SELECT * FROM test1 ORDER BY a || b;
 </programlisting>
-    results in an error, because even though the <literal>||</> operator
-    doesn't need to know a collation, the <literal>ORDER BY</> clause does.
+    results in an error, because even though the <literal>||</literal> operator
+    doesn't need to know a collation, the <literal>ORDER BY</literal> clause does.
     As before, the conflict can be resolved with an explicit collation
     specifier:
 <programlisting>
@@ -508,14 +508,14 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
     operating system C library.  These are the locales that most tools
     provided by the operating system use.  Another provider
     is <literal>icu</literal>, which uses the external
-    ICU<indexterm><primary>ICU</></> library.  ICU locales can only be
+    ICU<indexterm><primary>ICU</primary></indexterm> library.  ICU locales can only be
     used if support for ICU was configured when PostgreSQL was built.
    </para>
 
    <para>
     A collation object provided by <literal>libc</literal> maps to a
     combination of <symbol>LC_COLLATE</symbol> and <symbol>LC_CTYPE</symbol>
-    settings.  (As
+    settings, as accepted by the <literal>setlocale()</literal> system library call.  (As
     the name would suggest, the main purpose of a collation is to set
     <symbol>LC_COLLATE</symbol>, which controls the sort order.  But
     it is rarely necessary in practice to have an
@@ -524,7 +524,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
     these under one concept than to create another infrastructure for
     setting <symbol>LC_CTYPE</symbol> per expression.)  Also,
     a <literal>libc</literal> collation
-    is tied to a character set encoding (see <xref linkend="multibyte">).
+    is tied to a character set encoding (see <xref linkend="multibyte"/>).
     The same collation name may exist for different encodings.
    </para>
 
@@ -541,14 +541,14 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
     <title>Standard Collations</title>
 
    <para>
-    On all platforms, the collations named <literal>default</>,
-    <literal>C</>, and <literal>POSIX</> are available.  Additional
+    On all platforms, the collations named <literal>default</literal>,
+    <literal>C</literal>, and <literal>POSIX</literal> are available.  Additional
     collations may be available depending on operating system support.
-    The <literal>default</> collation selects the <symbol>LC_COLLATE</symbol>
+    The <literal>default</literal> collation selects the <symbol>LC_COLLATE</symbol>
     and <symbol>LC_CTYPE</symbol> values specified at database creation time.
-    The <literal>C</> and <literal>POSIX</> collations both specify
-    <quote>traditional C</> behavior, in which only the ASCII letters
-    <quote><literal>A</></quote> through <quote><literal>Z</></quote>
+    The <literal>C</literal> and <literal>POSIX</literal> collations both specify
+    <quote>traditional C</quote> behavior, in which only the ASCII letters
+    <quote><literal>A</literal></quote> through <quote><literal>Z</literal></quote>
     are treated as letters, and sorting is done strictly by character
     code byte values.
    </para>
@@ -565,7 +565,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
 
    <para>
     If the operating system provides support for using multiple locales
-    within a single program (<function>newlocale</> and related functions),
+    within a single program (<function>newlocale</function> and related functions),
     or if support for ICU is configured,
     then when a database cluster is initialized, <command>initdb</command>
     populates the system catalog <literal>pg_collation</literal> with
@@ -605,7 +605,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
     for <symbol>LC_COLLATE</symbol> and <symbol>LC_CTYPE</symbol>, or if new
     locales are installed in the operating system after the database system
     was initialized, then a new collation may be created using
-    the <xref linkend="sql-createcollation"> command.
+    the <xref linkend="sql-createcollation"/> command.
     New operating system locales can also be imported en masse using
     the <link linkend="functions-admin-collation"><function>pg_import_system_collations()</function></link> function.
    </para>
@@ -618,8 +618,8 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
     within a given database even though it would not be unique globally.
     Use of the stripped collation names is recommended, since it will
     make one less thing you need to change if you decide to change to
-    another database encoding.  Note however that the <literal>default</>,
-    <literal>C</>, and <literal>POSIX</> collations can be used regardless of
+    another database encoding.  Note however that the <literal>default</literal>,
+    <literal>C</literal>, and <literal>POSIX</literal> collations can be used regardless of
     the database encoding.
    </para>
 
@@ -630,7 +630,7 @@ SELECT * FROM test1 ORDER BY a || b COLLATE "fr_FR";
 <programlisting>
 SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
 </programlisting>
-    will draw an error even though the <literal>C</> and <literal>POSIX</>
+    will draw an error even though the <literal>C</literal> and <literal>POSIX</literal>
     collations have identical behaviors.  Mixing stripped and non-stripped
     collation names is therefore not recommended.
    </para>
@@ -640,22 +640,19 @@ SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
    <title>ICU collations</title>
 
    <para>
-    Collations provided by ICU are created with names in BCP 47 language tag
+    With ICU, it is not sensible to enumerate all possible locale names.  ICU
+    uses a particular naming system for locales, but there are many more ways
+    to name a locale than there are actually distinct locales.
+    <command>initdb</command> uses the ICU APIs to extract a set of distinct
+    locales to populate the initial set of collations.  Collations provided by
+    ICU are created in the SQL environment with names in BCP 47 language tag
     format, with a <quote>private use</quote>
     extension <literal>-x-icu</literal> appended, to distinguish them from
-    libc locales.  So <literal>de-x-icu</literal> would be an example name.
+    libc locales.
    </para>
 
    <para>
-    With ICU, it is not sensible to enumerate all possible locale names.  ICU
-    uses a particular naming system for locales, but there are many more ways
-    to name a locale than there are actually distinct locales.  (In fact, any
-    string will be accepted as a locale name.)
-    See <ulink url="http://userguide.icu-project.org/locale"></ulink> for
-    information on ICU locale naming.  <command>initdb</command> uses the ICU
-    APIs to extract a set of locales with distinct collation rules to populate
-    the initial set of collations.  Here are some example collations that
-    might be created:
+    Here are some example collations that might be created:
 
     <variablelist>
      <varlistentry>
@@ -665,31 +662,18 @@ SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><literal>de-u-co-phonebk-x-icu</literal></term>
-      <listitem>
-       <para>German collation, phone book variant</para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><literal>de-AT-x-icu</literal></term>
       <listitem>
        <para>German collation for Austria, default variant</para>
        <para>
-        (As of this writing, there is no,
-        say, <literal>de-DE-x-icu</literal> or <literal>de-CH-x-icu</literal>,
-        because those are equivalent to <literal>de-x-icu</literal>.)
+        (There are also, say, <literal>de-DE-x-icu</literal>
+        or <literal>de-CH-x-icu</literal>, but as of this writing, they are
+        equivalent to <literal>de-x-icu</literal>.)
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><literal>de-AT-u-co-phonebk-x-icu</literal></term>
-      <listitem>
-       <para>German collation for Austria, phone book variant</para>
-      </listitem>
-     </varlistentry>
      <varlistentry>
       <term><literal>und-x-icu</literal> (for <quote>undefined</quote>)</term>
       <listitem>
@@ -707,16 +691,187 @@ SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
     database encoding is one of these, ICU collation entries
     in <literal>pg_collation</literal> are ignored.  Attempting to use one
     will draw an error along the lines of <quote>collation "de-x-icu" for
-    encoding "WIN874" does not exist</>.
+    encoding "WIN874" does not exist</quote>.
+   </para>
+  </sect4>
+  </sect3>
+
+  <sect3 id="collation-create">
+   <title>Creating New Collation Objects</title>
+
+   <para>
+    If the standard and predefined collations are not sufficient, users can
+    create their own collation objects using the SQL
+    command <xref linkend="sql-createcollation"/>.
+   </para>
+
+   <para>
+    The standard and predefined collations are in the
+    schema <literal>pg_catalog</literal>, like all predefined objects.
+    User-defined collations should be created in user schemas.  This also
+    ensures that they are saved by <command>pg_dump</command>.
    </para>
+
+   <sect4>
+    <title>libc collations</title>
+
+    <para>
+     New libc collations can be created like this:
+<programlisting>
+CREATE COLLATION german (provider = libc, locale = 'de_DE');
+</programlisting>
+     The exact values that are acceptable for the <literal>locale</literal>
+     clause in this command depend on the operating system.  On Unix-like
+     systems, the command <literal>locale -a</literal> will show a list.
+    </para>
+
+    <para>
+     Since the predefined libc collations already include all collations
+     defined in the operating system when the database instance is
+     initialized, it is not often necessary to manually create new ones.
+     Reasons might be if a different naming system is desired (in which case
+     see also <xref linkend="collation-copy"/>) or if the operating system has
+     been upgraded to provide new locale definitions (in which case see
+     also <link linkend="functions-admin-collation"><function>pg_import_system_collations()</function></link>).
+    </para>
    </sect4>
-   </sect3>
 
-   <sect3>
+   <sect4>
+    <title>ICU collations</title>
+
+   <para>
+    ICU allows collations to be customized beyond the basic language+country
+    set that is preloaded by <command>initdb</command>.  Users are encouraged
+    to define their own collation objects that make use of these facilities to
+    suit the sorting behavior to their requirements.
+    See <ulink url="http://userguide.icu-project.org/locale"></ulink>
+    and <ulink url="http://userguide.icu-project.org/collation/api"></ulink> for
+    information on ICU locale naming.  The set of acceptable names and
+    attributes depends on the particular ICU version.
+   </para>
+
+   <para>
+    Here are some examples:
+
+    <variablelist>
+     <varlistentry>
+      <term><literal>CREATE COLLATION "de-u-co-phonebk-x-icu" (provider = icu, locale = 'de-u-co-phonebk');</literal></term>
+      <term><literal>CREATE COLLATION "de-u-co-phonebk-x-icu" (provider = icu, locale = 'de@collation=phonebook');</literal></term>
+      <listitem>
+       <para>German collation with phone book collation type</para>
+       <para>
+        The first example selects the ICU locale using a <quote>language
+        tag</quote> per BCP 47.  The second example uses the traditional
+        ICU-specific locale syntax.  The first style is preferred going
+        forward, but it is not supported by older ICU versions.
+       </para>
+       <para>
+        Note that you can name the collation objects in the SQL environment
+        anything you want.  In this example, we follow the naming style that
+        the predefined collations use, which in turn also follow BCP 47, but
+        that is not required for user-defined collations.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><literal>CREATE COLLATION "und-u-co-emoji-x-icu" (provider = icu, locale = 'und-u-co-emoji');</literal></term>
+      <term><literal>CREATE COLLATION "und-u-co-emoji-x-icu" (provider = icu, locale = '@collation=emoji');</literal></term>
+      <listitem>
+       <para>
+        Root collation with Emoji collation type, per Unicode Technical Standard #51
+       </para>
+       <para>
+        Observe how in the traditional ICU locale naming system, the root
+        locale is selected by an empty string.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><literal>CREATE COLLATION digitslast (provider = icu, locale = 'en-u-kr-latn-digit');</literal></term>
+      <term><literal>CREATE COLLATION digitslast (provider = icu, locale = 'en@colReorder=latn-digit');</literal></term>
+      <listitem>
+       <para>
+        Sort digits after Latin letters.  (The default is digits before letters.)
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><literal>CREATE COLLATION upperfirst (provider = icu, locale = 'en-u-kf-upper');</literal></term>
+      <term><literal>CREATE COLLATION upperfirst (provider = icu, locale = 'en@colCaseFirst=upper');</literal></term>
+      <listitem>
+       <para>
+        Sort upper-case letters before lower-case letters.  (The default is
+        lower-case letters first.)
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><literal>CREATE COLLATION special (provider = icu, locale = 'en-u-kf-upper-kr-latn-digit');</literal></term>
+      <term><literal>CREATE COLLATION special (provider = icu, locale = 'en@colCaseFirst=upper;colReorder=latn-digit');</literal></term>
+      <listitem>
+       <para>
+        Combines both of the above options.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><literal>CREATE COLLATION numeric (provider = icu, locale = 'en-u-kn-true');</literal></term>
+      <term><literal>CREATE COLLATION numeric (provider = icu, locale = 'en@colNumeric=yes');</literal></term>
+      <listitem>
+       <para>
+        Numeric ordering, sorts sequences of digits by their numeric value,
+        for example: <literal>A-21</literal> &lt; <literal>A-123</literal>
+        (also known as natural sort).
+       </para>
+      </listitem>
+     </varlistentry>
+    </variablelist>
+
+    See <ulink url="http://unicode.org/reports/tr35/tr35-collation.html">Unicode
+    Technical Standard #35</ulink>
+    and <ulink url="https://tools.ietf.org/html/bcp47">BCP 47</ulink> for
+    details.  The list of possible collation types (<literal>co</literal>
+    subtag) can be found in
+    the <ulink url="http://www.unicode.org/repos/cldr/trunk/common/bcp47/collation.xml">CLDR
+    repository</ulink>.
+    The <ulink url="https://ssl.icu-project.org/icu-bin/locexp">ICU Locale
+    Explorer</ulink> can be used to check the details of a particular locale
+    definition.  The examples using the <literal>k*</literal> subtags require
+    at least ICU version 54.
+   </para>
+
+   <para>
+    Note that while this system allows creating collations that <quote>ignore
+    case</quote> or <quote>ignore accents</quote> or similar (using
+    the <literal>ks</literal> key), PostgreSQL does not at the moment allow
+    such collations to act in a truly case- or accent-insensitive manner.  Any
+    strings that compare equal according to the collation but are not
+    byte-wise equal will be sorted according to their byte values.
+   </para>
+
+   <note>
+    <para>
+     By design, ICU will accept almost any string as a locale name and match
+     it to the closest locale it can provide, using the fallback procedure
+     described in its documentation.  Thus, there will be no direct feedback
+     if a collation specification is composed using features that the given
+     ICU installation does not actually support.  It is therefore recommended
+     to create application-level test cases to check that the collation
+     definitions satisfy one's requirements.
+    </para>
+   </note>
+   </sect4>
+
+   <sect4 id="collation-copy">
    <title>Copying Collations</title>
 
    <para>
-    The command <xref linkend="sql-createcollation"> can also be used to
+    The command <xref linkend="sql-createcollation"/> can also be used to
     create a new collation from an existing collation, which can be useful to
     be able to use operating-system-independent collation names in
     applications, create compatibility names, or use an ICU-provided collation
@@ -724,16 +879,9 @@ SELECT a COLLATE "C" &lt; b COLLATE "POSIX" FROM test1;
 <programlisting>
 CREATE COLLATION german FROM "de_DE";
 CREATE COLLATION french FROM "fr-x-icu";
-CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
 </programlisting>
    </para>
-
-   <para>
-    The standard and predefined collations are in the
-    schema <literal>pg_catalog</literal>, like all predefined objects.
-    User-defined collations should be created in user schemas.  This also
-    ensures that they are saved by <command>pg_dump</command>.
-   </para>
+   </sect4>
    </sect3>
   </sect2>
  </sect1>
@@ -741,30 +889,30 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
  <sect1 id="multibyte">
   <title>Character Set Support</title>
 
-  <indexterm zone="multibyte"><primary>character set</></>
+  <indexterm zone="multibyte"><primary>character set</primary></indexterm>
 
   <para>
    The character set support in <productname>PostgreSQL</productname>
    allows you to store text in a variety of character sets (also called
    encodings), including
    single-byte character sets such as the ISO 8859 series and
-   multiple-byte character sets such as <acronym>EUC</> (Extended Unix
+   multiple-byte character sets such as <acronym>EUC</acronym> (Extended Unix
    Code), UTF-8, and Mule internal code.  All supported character sets
    can be used transparently by clients, but a few are not supported
    for use within the server (that is, as a server-side encoding).
    The default character set is selected while
    initializing your <productname>PostgreSQL</productname> database
-   cluster using <command>initdb</>.  It can be overridden when you
+   cluster using <command>initdb</command>.  It can be overridden when you
    create a database, so you can have multiple
    databases each with a different character set.
   </para>
 
   <para>
    An important restriction, however, is that each database's character set
-   must be compatible with the database's <envar>LC_CTYPE</> (character
-   classification) and <envar>LC_COLLATE</> (string sort order) locale
-   settings. For <literal>C</> or
-   <literal>POSIX</> locale, any character set is allowed, but for other
+   must be compatible with the database's <envar>LC_CTYPE</envar> (character
+   classification) and <envar>LC_COLLATE</envar> (string sort order) locale
+   settings. For <literal>C</literal> or
+   <literal>POSIX</literal> locale, any character set is allowed, but for other
    libc-provided locales there is only one character set that will work
    correctly.
    (On Windows, however, UTF-8 encoding can be used with any locale.)
@@ -776,7 +924,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
     <title>Supported Character Sets</title>
 
     <para>
-     <xref linkend="charset-table"> shows the character sets available
+     <xref linkend="charset-table"/> shows the character sets available
      for use in <productname>PostgreSQL</productname>.
     </para>
 
@@ -806,7 +954,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>No</entry>
          <entry>No</entry>
          <entry>1-2</entry>
-         <entry><literal>WIN950</>, <literal>Windows950</></entry>
+         <entry><literal>WIN950</literal>, <literal>Windows950</literal></entry>
         </row>
         <row>
          <entry><literal>EUC_CN</literal></entry>
@@ -869,11 +1017,11 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>No</entry>
          <entry>No</entry>
          <entry>1-2</entry>
-         <entry><literal>WIN936</>, <literal>Windows936</></entry>
+         <entry><literal>WIN936</literal>, <literal>Windows936</literal></entry>
         </row>
         <row>
          <entry><literal>ISO_8859_5</literal></entry>
-         <entry>ISO 8859-5, <acronym>ECMA</> 113</entry>
+         <entry>ISO 8859-5, <acronym>ECMA</acronym> 113</entry>
          <entry>Latin/Cyrillic</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
@@ -882,7 +1030,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         </row>
         <row>
          <entry><literal>ISO_8859_6</literal></entry>
-         <entry>ISO 8859-6, <acronym>ECMA</> 114</entry>
+         <entry>ISO 8859-6, <acronym>ECMA</acronym> 114</entry>
          <entry>Latin/Arabic</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
@@ -891,7 +1039,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         </row>
         <row>
          <entry><literal>ISO_8859_7</literal></entry>
-         <entry>ISO 8859-7, <acronym>ECMA</> 118</entry>
+         <entry>ISO 8859-7, <acronym>ECMA</acronym> 118</entry>
          <entry>Latin/Greek</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
@@ -900,7 +1048,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         </row>
         <row>
          <entry><literal>ISO_8859_8</literal></entry>
-         <entry>ISO 8859-8, <acronym>ECMA</> 121</entry>
+         <entry>ISO 8859-8, <acronym>ECMA</acronym> 121</entry>
          <entry>Latin/Hebrew</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
@@ -909,7 +1057,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         </row>
         <row>
          <entry><literal>JOHAB</literal></entry>
-         <entry><acronym>JOHAB</></entry>
+         <entry><acronym>JOHAB</acronym></entry>
          <entry>Korean (Hangul)</entry>
          <entry>No</entry>
          <entry>No</entry>
@@ -923,7 +1071,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>KOI8</></entry>
+         <entry><literal>KOI8</literal></entry>
         </row>
         <row>
          <entry><literal>KOI8U</literal></entry>
@@ -936,57 +1084,57 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         </row>
         <row>
          <entry><literal>LATIN1</literal></entry>
-         <entry>ISO 8859-1, <acronym>ECMA</> 94</entry>
+         <entry>ISO 8859-1, <acronym>ECMA</acronym> 94</entry>
          <entry>Western European</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO88591</></entry>
+         <entry><literal>ISO88591</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN2</literal></entry>
-         <entry>ISO 8859-2, <acronym>ECMA</> 94</entry>
+         <entry>ISO 8859-2, <acronym>ECMA</acronym> 94</entry>
          <entry>Central European</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO88592</></entry>
+         <entry><literal>ISO88592</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN3</literal></entry>
-         <entry>ISO 8859-3, <acronym>ECMA</> 94</entry>
+         <entry>ISO 8859-3, <acronym>ECMA</acronym> 94</entry>
          <entry>South European</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO88593</></entry>
+         <entry><literal>ISO88593</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN4</literal></entry>
-         <entry>ISO 8859-4, <acronym>ECMA</> 94</entry>
+         <entry>ISO 8859-4, <acronym>ECMA</acronym> 94</entry>
          <entry>North European</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO88594</></entry>
+         <entry><literal>ISO88594</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN5</literal></entry>
-         <entry>ISO 8859-9, <acronym>ECMA</> 128</entry>
+         <entry>ISO 8859-9, <acronym>ECMA</acronym> 128</entry>
          <entry>Turkish</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO88599</></entry>
+         <entry><literal>ISO88599</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN6</literal></entry>
-         <entry>ISO 8859-10, <acronym>ECMA</> 144</entry>
+         <entry>ISO 8859-10, <acronym>ECMA</acronym> 144</entry>
          <entry>Nordic</entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO885910</></entry>
+         <entry><literal>ISO885910</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN7</literal></entry>
@@ -995,7 +1143,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO885913</></entry>
+         <entry><literal>ISO885913</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN8</literal></entry>
@@ -1004,7 +1152,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO885914</></entry>
+         <entry><literal>ISO885914</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN9</literal></entry>
@@ -1013,16 +1161,16 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ISO885915</></entry>
+         <entry><literal>ISO885915</literal></entry>
         </row>
         <row>
          <entry><literal>LATIN10</literal></entry>
-         <entry>ISO 8859-16, <acronym>ASRO</> SR 14111</entry>
+         <entry>ISO 8859-16, <acronym>ASRO</acronym> SR 14111</entry>
          <entry>Romanian</entry>
          <entry>Yes</entry>
          <entry>No</entry>
          <entry>1</entry>
-         <entry><literal>ISO885916</></entry>
+         <entry><literal>ISO885916</literal></entry>
         </row>
         <row>
          <entry><literal>MULE_INTERNAL</literal></entry>
@@ -1040,7 +1188,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>No</entry>
          <entry>No</entry>
          <entry>1-2</entry>
-         <entry><literal>Mskanji</>, <literal>ShiftJIS</>, <literal>WIN932</>, <literal>Windows932</></entry>
+         <entry><literal>Mskanji</literal>, <literal>ShiftJIS</literal>, <literal>WIN932</literal>, <literal>Windows932</literal></entry>
         </row>
         <row>
          <entry><literal>SHIFT_JIS_2004</literal></entry>
@@ -1054,7 +1202,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
         <row>
          <entry><literal>SQL_ASCII</literal></entry>
          <entry>unspecified (see text)</entry>
-         <entry><emphasis>any</></entry>
+         <entry><emphasis>any</emphasis></entry>
          <entry>Yes</entry>
          <entry>No</entry>
          <entry>1</entry>
@@ -1067,16 +1215,16 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>No</entry>
          <entry>No</entry>
          <entry>1-2</entry>
-         <entry><literal>WIN949</>, <literal>Windows949</></entry>
+         <entry><literal>WIN949</literal>, <literal>Windows949</literal></entry>
         </row>
         <row>
          <entry><literal>UTF8</literal></entry>
          <entry>Unicode, 8-bit</entry>
-         <entry><emphasis>all</></entry>
+         <entry><emphasis>all</emphasis></entry>
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1-4</entry>
-         <entry><literal>Unicode</></entry>
+         <entry><literal>Unicode</literal></entry>
         </row>
         <row>
          <entry><literal>WIN866</literal></entry>
@@ -1085,7 +1233,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ALT</></entry>
+         <entry><literal>ALT</literal></entry>
         </row>
         <row>
          <entry><literal>WIN874</literal></entry>
@@ -1112,7 +1260,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>WIN</></entry>
+         <entry><literal>WIN</literal></entry>
         </row>
         <row>
          <entry><literal>WIN1252</literal></entry>
@@ -1175,30 +1323,30 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
          <entry>Yes</entry>
          <entry>Yes</entry>
          <entry>1</entry>
-         <entry><literal>ABC</>, <literal>TCVN</>, <literal>TCVN5712</>, <literal>VSCII</></entry>
+         <entry><literal>ABC</literal>, <literal>TCVN</literal>, <literal>TCVN5712</literal>, <literal>VSCII</literal></entry>
         </row>
        </tbody>
       </tgroup>
      </table>
 
      <para>
-      Not all client <acronym>API</>s support all the listed character sets. For example, the
-      <productname>PostgreSQL</>
-      JDBC driver does not support <literal>MULE_INTERNAL</>, <literal>LATIN6</>,
-      <literal>LATIN8</>, and <literal>LATIN10</>.
+      Not all client <acronym>API</acronym>s support all the listed character sets. For example, the
+      <productname>PostgreSQL</productname>
+      JDBC driver does not support <literal>MULE_INTERNAL</literal>, <literal>LATIN6</literal>,
+      <literal>LATIN8</literal>, and <literal>LATIN10</literal>.
      </para>
 
      <para>
-      The <literal>SQL_ASCII</> setting behaves considerably differently
+      The <literal>SQL_ASCII</literal> setting behaves considerably differently
       from the other settings.  When the server character set is
-      <literal>SQL_ASCII</>, the server interprets byte values 0-127
+      <literal>SQL_ASCII</literal>, the server interprets byte values 0-127
       according to the ASCII standard, while byte values 128-255 are taken
       as uninterpreted characters.  No encoding conversion will be done when
-      the setting is <literal>SQL_ASCII</>.  Thus, this setting is not so
+      the setting is <literal>SQL_ASCII</literal>.  Thus, this setting is not so
       much a declaration that a specific encoding is in use, as a declaration
       of ignorance about the encoding.  In most cases, if you are
       working with any non-ASCII data, it is unwise to use the
-      <literal>SQL_ASCII</> setting because
+      <literal>SQL_ASCII</literal> setting because
       <productname>PostgreSQL</productname> will be unable to help you by
       converting or validating non-ASCII characters.
      </para>
@@ -1208,7 +1356,7 @@ CREATE COLLATION "de-DE-x-icu" FROM "de-x-icu";
     <title>Setting the Character Set</title>
 
     <para>
-     <command>initdb</> defines the default character set (encoding)
+     <command>initdb</command> defines the default character set (encoding)
      for a <productname>PostgreSQL</productname> cluster. For example,
 
 <screen>
@@ -1219,8 +1367,8 @@ initdb -E EUC_JP
      <literal>EUC_JP</literal> (Extended Unix Code for Japanese).  You
      can use <option>--encoding</option> instead of
      <option>-E</option> if you prefer longer option strings.
-     If no <option>-E</> or <option>--encoding</option> option is
-     given, <command>initdb</> attempts to determine the appropriate
+     If no <option>-E</option> or <option>--encoding</option> option is
+     given, <command>initdb</command> attempts to determine the appropriate
      encoding to use based on the specified or default locale.
     </para>
 
@@ -1240,11 +1388,11 @@ createdb -E EUC_KR -T template0 --lc-collate=ko_KR.euckr --lc-ctype=ko_KR.euckr
 CREATE DATABASE korean WITH ENCODING 'EUC_KR' LC_COLLATE='ko_KR.euckr' LC_CTYPE='ko_KR.euckr' TEMPLATE=template0;
 </programlisting>
 
-     Notice that the above commands specify copying the <literal>template0</>
+     Notice that the above commands specify copying the <literal>template0</literal>
      database.  When copying any other database, the encoding and locale
      settings cannot be changed from those of the source database, because
      that might result in corrupt data.  For more information see
-     <xref linkend="manage-ag-templatedbs">.
+     <xref linkend="manage-ag-templatedbs"/>.
     </para>
 
     <para>
@@ -1272,7 +1420,7 @@ $ <userinput>psql -l</userinput>
     <important>
      <para>
       On most modern operating systems, <productname>PostgreSQL</productname>
-      can determine which character set is implied by the <envar>LC_CTYPE</>
+      can determine which character set is implied by the <envar>LC_CTYPE</envar>
       setting, and it will enforce that only the matching database encoding is
       used.  On older systems it is your responsibility to ensure that you use
       the encoding expected by the locale you have selected.  A mistake in
@@ -1282,9 +1430,9 @@ $ <userinput>psql -l</userinput>
 
      <para>
       <productname>PostgreSQL</productname> will allow superusers to create
-      databases with <literal>SQL_ASCII</> encoding even when
-      <envar>LC_CTYPE</> is not <literal>C</> or <literal>POSIX</>.  As noted
-      above, <literal>SQL_ASCII</> does not enforce that the data stored in
+      databases with <literal>SQL_ASCII</literal> encoding even when
+      <envar>LC_CTYPE</envar> is not <literal>C</literal> or <literal>POSIX</literal>.  As noted
+      above, <literal>SQL_ASCII</literal> does not enforce that the data stored in
       the database has any particular encoding, and so this choice poses risks
       of locale-dependent misbehavior.  Using this combination of settings is
       deprecated and may someday be forbidden altogether.
@@ -1299,9 +1447,9 @@ $ <userinput>psql -l</userinput>
      <productname>PostgreSQL</productname> supports automatic
      character set conversion between server and client for certain
      character set combinations. The conversion information is stored in the
-     <literal>pg_conversion</> system catalog.  <productname>PostgreSQL</>
+     <literal>pg_conversion</literal> system catalog.  <productname>PostgreSQL</productname>
      comes with some predefined conversions, as shown in <xref
-     linkend="multibyte-translation-table">. You can create a new
+     linkend="multibyte-translation-table"/>. You can create a new
      conversion using the SQL command <command>CREATE CONVERSION</command>.
     </para>
 
@@ -1615,7 +1763,7 @@ $ <userinput>psql -l</userinput>
 
       <listitem>
        <para>
-        <application>libpq</> (<xref linkend="libpq-control">) has functions to control the client encoding.
+        <application>libpq</application> (<xref linkend="libpq-control"/>) has functions to control the client encoding.
        </para>
       </listitem>
 
@@ -1626,14 +1774,14 @@ $ <userinput>psql -l</userinput>
         Setting the client encoding can be done with this SQL command:
 
 <programlisting>
-SET CLIENT_ENCODING TO '<replaceable>value</>';
+SET CLIENT_ENCODING TO '<replaceable>value</replaceable>';
 </programlisting>
 
         Also you can use the standard SQL syntax <literal>SET NAMES</literal>
         for this purpose:
 
 <programlisting>
-SET NAMES '<replaceable>value</>';
+SET NAMES '<replaceable>value</replaceable>';
 </programlisting>
 
         To query the current client encoding:
@@ -1664,8 +1812,8 @@ RESET client_encoding;
       <listitem>
       <para>
        Using the configuration variable <xref
-       linkend="guc-client-encoding">. If the
-       <varname>client_encoding</> variable is set, that client
+       linkend="guc-client-encoding"/>. If the
+       <varname>client_encoding</varname> variable is set, that client
        encoding is automatically selected when a connection to the
        server is made.  (This can subsequently be overridden using any
        of the other methods mentioned above.)
@@ -1684,9 +1832,9 @@ RESET client_encoding;
     </para>
 
     <para>
-     If the client character set is defined as <literal>SQL_ASCII</>,
+     If the client character set is defined as <literal>SQL_ASCII</literal>,
      encoding conversion is disabled, regardless of the server's character
-     set.  Just as for the server, use of <literal>SQL_ASCII</> is unwise
+     set.  Just as for the server, use of <literal>SQL_ASCII</literal> is unwise
      unless you are working with all-ASCII data.
     </para>
    </sect2>
diff --git a/doc/src/sgml/chkpass.sgml b/doc/src/sgml/chkpass.sgml
deleted file mode 100644
index 9f682d8981..0000000000
--- a/doc/src/sgml/chkpass.sgml
+++ /dev/null
@@ -1,95 +0,0 @@
-<!-- doc/src/sgml/chkpass.sgml -->
-
-<sect1 id="chkpass" xreflabel="chkpass">
- <title>chkpass</title>
-
- <indexterm zone="chkpass">
-  <primary>chkpass</primary>
- </indexterm>
-
- <para>
-  This module implements a data type <type>chkpass</> that is
-  designed for storing encrypted passwords.
-  Each password is automatically converted to encrypted form upon entry,
-  and is always stored encrypted.  To compare, simply compare against a clear
-  text password and the comparison function will encrypt it before comparing.
- </para>
-
- <para>
-  There are provisions in the code to report an error if the password is
-  determined to be easily crackable.  However, this is currently just
-  a stub that does nothing.
- </para>
-
- <para>
-  If you precede an input string with a colon, it is assumed to be an
-  already-encrypted password, and is stored without further encryption.
-  This allows entry of previously-encrypted passwords.
- </para>
-
- <para>
-  On output, a colon is prepended.  This makes it possible to dump and reload
-  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_PostgreSQL</> module.
- </para>
-
- <para>
-  The encryption uses the standard Unix function <function>crypt()</>,
-  and so it suffers
-  from all the usual limitations of that function; notably that only the
-  first eight characters of a password are considered.
- </para>
-
- <para>
-  Note that the <type>chkpass</type> data type is not indexable.
-  <!--
-  I haven't worried about making this type indexable.  I doubt that anyone
-  would ever need to sort a file in order of encrypted password.
-  -->
- </para>
-
- <para>
-  Sample usage:
- </para>
-
-<programlisting>
-test=# create table test (p chkpass);
-CREATE TABLE
-test=# insert into test values ('hello');
-INSERT 0 1
-test=# select * from test;
-       p
-----------------
- :dVGkpXdOrE3ko
-(1 row)
-
-test=# select raw(p) from test;
-      raw
----------------
- dVGkpXdOrE3ko
-(1 row)
-
-test=# select p = 'hello' from test;
- ?column?
-----------
- t
-(1 row)
-
-test=# select p = 'goodbye' from test;
- ?column?
-----------
- f
-(1 row)
-</programlisting>
-
- <sect2>
-  <title>Author</title>
-
-  <para>
-   D'Arcy J.M. Cain (<email>darcy@druid.net</email>)
-  </para>
- </sect2>
-
-</sect1>
diff --git a/doc/src/sgml/citext.sgml b/doc/src/sgml/citext.sgml
index 9b4c68f7d4..b1fe7101b2 100644
--- a/doc/src/sgml/citext.sgml
+++ b/doc/src/sgml/citext.sgml
@@ -8,10 +8,10 @@
  </indexterm>
 
  <para>
-  The <filename>citext</> module provides a case-insensitive
-  character string type, <type>citext</>. Essentially, it internally calls
-  <function>lower</> when comparing values. Otherwise, it behaves almost
-  exactly like <type>text</>.
+  The <filename>citext</filename> module provides a case-insensitive
+  character string type, <type>citext</type>. Essentially, it internally calls
+  <function>lower</function> when comparing values. Otherwise, it behaves almost
+  exactly like <type>text</type>.
  </para>
 
  <sect2>
@@ -19,7 +19,7 @@
 
   <para>
    The standard approach to doing case-insensitive matches
-   in <productname>PostgreSQL</> has been to use the <function>lower</>
+   in <productname>PostgreSQL</productname> has been to use the <function>lower</function>
    function when comparing values, for example
 
 <programlisting>
@@ -35,19 +35,19 @@ SELECT * FROM tab WHERE lower(col) = LOWER(?);
     <listitem>
      <para>
       It makes your SQL statements verbose, and you always have to remember to
-      use <function>lower</> on both the column and the query value.
+      use <function>lower</function> on both the column and the query value.
      </para>
     </listitem>
     <listitem>
      <para>
       It won't use an index, unless you create a functional index using
-      <function>lower</>.
+      <function>lower</function>.
      </para>
     </listitem>
     <listitem>
      <para>
-      If you declare a column as <literal>UNIQUE</> or <literal>PRIMARY
-      KEY</>, the implicitly generated index is case-sensitive.  So it's
+      If you declare a column as <literal>UNIQUE</literal> or <literal>PRIMARY
+      KEY</literal>, the implicitly generated index is case-sensitive.  So it's
       useless for case-insensitive searches, and it won't enforce
       uniqueness case-insensitively.
      </para>
@@ -55,13 +55,13 @@ SELECT * FROM tab WHERE lower(col) = LOWER(?);
    </itemizedlist>
 
    <para>
-    The <type>citext</> data type allows you to eliminate calls
-    to <function>lower</> in SQL queries, and allows a primary key to
-    be case-insensitive. <type>citext</> is locale-aware, just
-    like <type>text</>, which means that the matching of upper case and
+    The <type>citext</type> data type allows you to eliminate calls
+    to <function>lower</function> in SQL queries, and allows a primary key to
+    be case-insensitive. <type>citext</type> is locale-aware, just
+    like <type>text</type>, which means that the matching of upper case and
     lower case characters is dependent on the rules of
-    the database's <literal>LC_CTYPE</> setting. Again, this behavior is
-    identical to the use of <function>lower</> in queries. But because it's
+    the database's <literal>LC_CTYPE</literal> setting. Again, this behavior is
+    identical to the use of <function>lower</function> in queries. But because it's
     done transparently by the data type, you don't have to remember to do
     anything special in your queries.
    </para>
@@ -80,18 +80,18 @@ CREATE TABLE users (
     pass TEXT   NOT NULL
 );
 
-INSERT INTO users VALUES ( 'larry',  md5(random()::text) );
-INSERT INTO users VALUES ( 'Tom',    md5(random()::text) );
-INSERT INTO users VALUES ( 'Damian', md5(random()::text) );
-INSERT INTO users VALUES ( 'NEAL',   md5(random()::text) );
-INSERT INTO users VALUES ( 'Bj&oslash;rn',  md5(random()::text) );
+INSERT INTO users VALUES ( 'larry',  sha256(random()::text::bytea) );
+INSERT INTO users VALUES ( 'Tom',    sha256(random()::text::bytea) );
+INSERT INTO users VALUES ( 'Damian', sha256(random()::text::bytea) );
+INSERT INTO users VALUES ( 'NEAL',   sha256(random()::text::bytea) );
+INSERT INTO users VALUES ( 'Bj&oslash;rn',  sha256(random()::text::bytea) );
 
 SELECT * FROM users WHERE nick = 'Larry';
 </programlisting>
 
-   The <command>SELECT</> statement will return one tuple, even though
-   the <structfield>nick</> column was set to <literal>larry</> and the query
-   was for <literal>Larry</>.
+   The <command>SELECT</command> statement will return one tuple, even though
+   the <structfield>nick</structfield> column was set to <literal>larry</literal> and the query
+   was for <literal>Larry</literal>.
   </para>
  </sect2>
 
@@ -99,82 +99,82 @@ SELECT * FROM users WHERE nick = 'Larry';
   <title>String Comparison Behavior</title>
 
   <para>
-   <type>citext</> performs comparisons by converting each string to lower
-   case (as though <function>lower</> were called) and then comparing the
+   <type>citext</type> performs comparisons by converting each string to lower
+   case (as though <function>lower</function> were called) and then comparing the
    results normally.  Thus, for example, two strings are considered equal
-   if <function>lower</> would produce identical results for them.
+   if <function>lower</function> would produce identical results for them.
   </para>
 
   <para>
    In order to emulate a case-insensitive collation as closely as possible,
-   there are <type>citext</>-specific versions of a number of string-processing
+   there are <type>citext</type>-specific versions of a number of string-processing
    operators and functions.  So, for example, the regular expression
-   operators <literal>~</> and <literal>~*</> exhibit the same behavior when
-   applied to <type>citext</>: they both match case-insensitively.
+   operators <literal>~</literal> and <literal>~*</literal> exhibit the same behavior when
+   applied to <type>citext</type>: they both match case-insensitively.
    The same is true
-   for <literal>!~</> and <literal>!~*</>, as well as for the
-   <literal>LIKE</> operators <literal>~~</> and <literal>~~*</>, and
-   <literal>!~~</> and <literal>!~~*</>. If you'd like to match
-   case-sensitively, you can cast the operator's arguments to <type>text</>.
+   for <literal>!~</literal> and <literal>!~*</literal>, as well as for the
+   <literal>LIKE</literal> operators <literal>~~</literal> and <literal>~~*</literal>, and
+   <literal>!~~</literal> and <literal>!~~*</literal>. If you'd like to match
+   case-sensitively, you can cast the operator's arguments to <type>text</type>.
   </para>
 
   <para>
    Similarly, all of the following functions perform matching
-   case-insensitively if their arguments are <type>citext</>:
+   case-insensitively if their arguments are <type>citext</type>:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-      <function>regexp_match()</>
+      <function>regexp_match()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>regexp_matches()</>
+      <function>regexp_matches()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>regexp_replace()</>
+      <function>regexp_replace()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>regexp_split_to_array()</>
+      <function>regexp_split_to_array()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>regexp_split_to_table()</>
+      <function>regexp_split_to_table()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>replace()</>
+      <function>replace()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>split_part()</>
+      <function>split_part()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>strpos()</>
+      <function>strpos()</function>
     </para>
    </listitem>
    <listitem>
     <para>
-      <function>translate()</>
+      <function>translate()</function>
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
    For the regexp functions, if you want to match case-sensitively, you can
-   specify the <quote>c</> flag to force a case-sensitive match.  Otherwise,
-   you must cast to <type>text</> before using one of these functions if
+   specify the <quote>c</quote> flag to force a case-sensitive match.  Otherwise,
+   you must cast to <type>text</type> before using one of these functions if
    you want case-sensitive behavior.
   </para>
 
@@ -186,13 +186,13 @@ SELECT * FROM users WHERE nick = 'Larry';
    <itemizedlist>
     <listitem>
      <para>
-      <type>citext</>'s case-folding behavior depends on
-      the <literal>LC_CTYPE</> setting of your database. How it compares
+      <type>citext</type>'s case-folding behavior depends on
+      the <literal>LC_CTYPE</literal> setting of your database. How it compares
       values is therefore determined when the database is created.
       It is not truly
       case-insensitive in the terms defined by the Unicode standard.
       Effectively, what this means is that, as long as you're happy with your
-      collation, you should be happy with <type>citext</>'s comparisons. But
+      collation, you should be happy with <type>citext</type>'s comparisons. But
       if you have data in different languages stored in your database, users
       of one language may find their query results are not as expected if the
       collation is for another language.
@@ -201,38 +201,38 @@ SELECT * FROM users WHERE nick = 'Larry';
 
     <listitem>
      <para>
-      As of <productname>PostgreSQL</> 9.1, you can attach a
-      <literal>COLLATE</> specification to <type>citext</> columns or data
-      values.  Currently, <type>citext</> operators will honor a non-default
-      <literal>COLLATE</> specification while comparing case-folded strings,
+      As of <productname>PostgreSQL</productname> 9.1, you can attach a
+      <literal>COLLATE</literal> specification to <type>citext</type> columns or data
+      values.  Currently, <type>citext</type> operators will honor a non-default
+      <literal>COLLATE</literal> specification while comparing case-folded strings,
       but the initial folding to lower case is always done according to the
-      database's <literal>LC_CTYPE</> setting (that is, as though
-      <literal>COLLATE "default"</> were given).  This may be changed in a
-      future release so that both steps follow the input <literal>COLLATE</>
+      database's <literal>LC_CTYPE</literal> setting (that is, as though
+      <literal>COLLATE "default"</literal> were given).  This may be changed in a
+      future release so that both steps follow the input <literal>COLLATE</literal>
       specification.
      </para>
     </listitem>
 
     <listitem>
      <para>
-       <type>citext</> is not as efficient as <type>text</> because the
+       <type>citext</type> is not as efficient as <type>text</type> because the
        operator functions and the B-tree comparison functions must make copies
        of the data and convert it to lower case for comparisons. It is,
-       however, slightly more efficient than using <function>lower</> to get
+       however, slightly more efficient than using <function>lower</function> to get
        case-insensitive matching.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <type>citext</> doesn't help much if you need data to compare
+      <type>citext</type> doesn't help much if you need data to compare
       case-sensitively in some contexts and case-insensitively in other
-      contexts.  The standard answer is to use the <type>text</> type and
-      manually use the <function>lower</> function when you need to compare
+      contexts.  The standard answer is to use the <type>text</type> type and
+      manually use the <function>lower</function> function when you need to compare
       case-insensitively; this works all right if case-insensitive comparison
       is needed only infrequently.  If you need case-insensitive behavior most
       of the time and case-sensitive infrequently, consider storing the data
-      as <type>citext</> and explicitly casting the column to <type>text</>
+      as <type>citext</type> and explicitly casting the column to <type>text</type>
       when you want case-sensitive comparison.  In either situation, you will
       need two indexes if you want both types of searches to be fast.
     </para>
@@ -240,9 +240,9 @@ SELECT * FROM users WHERE nick = 'Larry';
 
     <listitem>
      <para>
-      The schema containing the <type>citext</> operators must be
-      in the current <varname>search_path</> (typically <literal>public</>);
-      if it is not, the normal case-sensitive <type>text</> operators
+      The schema containing the <type>citext</type> operators must be
+      in the current <varname>search_path</varname> (typically <literal>public</literal>);
+      if it is not, the normal case-sensitive <type>text</type> operators
       will be invoked instead.
     </para>
     </listitem>
@@ -257,7 +257,7 @@ SELECT * FROM users WHERE nick = 'Larry';
   </para>
 
   <para>
-    Inspired by the original <type>citext</> module by Donald Fraser.
+    Inspired by the original <type>citext</type> module by Donald Fraser.
   </para>
 
  </sect2>
diff --git a/doc/src/sgml/client-auth.sgml b/doc/src/sgml/client-auth.sgml
index 819db811b2..53832d08e2 100644
--- a/doc/src/sgml/client-auth.sgml
+++ b/doc/src/sgml/client-auth.sgml
@@ -13,17 +13,17 @@
   wants to connect as, much the same way one logs into a Unix computer
   as a particular user. Within the SQL environment the active database
   user name determines access privileges to database objects &mdash; see
-  <xref linkend="user-manag"> for more information. Therefore, it is
+  <xref linkend="user-manag"/> for more information. Therefore, it is
   essential to restrict which database users can connect.
  </para>
 
  <note>
   <para>
-   As explained in <xref linkend="user-manag">,
+   As explained in <xref linkend="user-manag"/>,
    <productname>PostgreSQL</productname> actually does privilege
-   management in terms of <quote>roles</>.  In this chapter, we
-   consistently use <firstterm>database user</> to mean <quote>role with the
-   <literal>LOGIN</> privilege</quote>.
+   management in terms of <quote>roles</quote>.  In this chapter, we
+   consistently use <firstterm>database user</firstterm> to mean <quote>role with the
+   <literal>LOGIN</literal> privilege</quote>.
   </para>
  </note>
 
@@ -66,11 +66,11 @@
    which traditionally is named
    <filename>pg_hba.conf</filename> and is stored in the database
    cluster's data directory.
-   (<acronym>HBA</> stands for host-based authentication.) A default
+   (<acronym>HBA</acronym> stands for host-based authentication.) A default
    <filename>pg_hba.conf</filename> file is installed when the data
    directory is initialized by <command>initdb</command>.  It is
    possible to place the authentication configuration file elsewhere,
-   however; see the <xref linkend="guc-hba-file"> configuration parameter.
+   however; see the <xref linkend="guc-hba-file"/> configuration parameter.
   </para>
 
   <para>
@@ -82,7 +82,7 @@
    up of a number of fields which are separated by spaces and/or tabs.
    Fields can contain white space if the field value is double-quoted.
    Quoting one of the keywords in a database, user, or address field (e.g.,
-   <literal>all</> or <literal>replication</>) makes the word lose its special
+   <literal>all</literal> or <literal>replication</literal>) makes the word lose its special
    meaning, and just match a database, user, or host with that name.
   </para>
 
@@ -92,8 +92,8 @@
    and the authentication method to be used for connections matching
    these parameters. The first record with a matching connection type,
    client address, requested database, and user name is used to perform
-   authentication. There is no <quote>fall-through</> or
-   <quote>backup</>: if one record is chosen and the authentication
+   authentication. There is no <quote>fall-through</quote> or
+   <quote>backup</quote>: if one record is chosen and the authentication
    fails, subsequent records are not considered. If no record matches,
    access is denied.
   </para>
@@ -136,9 +136,9 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
       <para>
        Remote TCP/IP connections will not be possible unless
        the server is started with an appropriate value for the
-       <xref linkend="guc-listen-addresses"> configuration parameter,
+       <xref linkend="guc-listen-addresses"/> configuration parameter,
        since the default behavior is to listen for TCP/IP connections
-       only on the local loopback address <literal>localhost</>.
+       only on the local loopback address <literal>localhost</literal>.
       </para>
      </note>
      </listitem>
@@ -157,8 +157,8 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
        To make use of this option the server must be built with
        <acronym>SSL</acronym> support. Furthermore,
        <acronym>SSL</acronym> must be enabled
-       by setting the <xref linkend="guc-ssl"> configuration parameter (see
-       <xref linkend="ssl-tcp"> for more information).
+       by setting the <xref linkend="guc-ssl"/> configuration parameter (see
+       <xref linkend="ssl-tcp"/> for more information).
        Otherwise, the <literal>hostssl</literal> record is ignored except for
        logging a warning that it cannot match any connections.
       </para>
@@ -169,7 +169,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
      <term><literal>hostnossl</literal></term>
      <listitem>
       <para>
-       This record type has the opposite behavior of <literal>hostssl</>;
+       This record type has the opposite behavior of <literal>hostssl</literal>;
        it only matches connection attempts made over
        TCP/IP that do not use <acronym>SSL</acronym>.
       </para>
@@ -182,24 +182,24 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
       <para>
        Specifies which database name(s) this record matches.  The value
        <literal>all</literal> specifies that it matches all databases.
-       The value <literal>sameuser</> specifies that the record
+       The value <literal>sameuser</literal> specifies that the record
        matches if the requested database has the same name as the
-       requested user.  The value <literal>samerole</> specifies that
+       requested user.  The value <literal>samerole</literal> specifies that
        the requested user must be a member of the role with the same
-       name as the requested database.  (<literal>samegroup</> is an
-       obsolete but still accepted spelling of <literal>samerole</>.)
+       name as the requested database.  (<literal>samegroup</literal> is an
+       obsolete but still accepted spelling of <literal>samerole</literal>.)
        Superusers are not considered to be members of a role for the
-       purposes of <literal>samerole</> unless they are explicitly
+       purposes of <literal>samerole</literal> unless they are explicitly
        members of the role, directly or indirectly, and not just by
        virtue of being a superuser.
-       The value <literal>replication</> specifies that the record
+       The value <literal>replication</literal> specifies that the record
        matches if a physical replication connection is requested (note that
        replication connections do not specify any particular database).
        Otherwise, this is the name of
        a specific <productname>PostgreSQL</productname> database.
        Multiple database names can be supplied by separating them with
        commas.  A separate file containing database names can be specified by
-       preceding the file name with <literal>@</>.
+       preceding the file name with <literal>@</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -211,18 +211,18 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
        Specifies which database user name(s) this record
        matches. The value <literal>all</literal> specifies that it
        matches all users.  Otherwise, this is either the name of a specific
-       database user, or a group name preceded by <literal>+</>.
+       database user, or a group name preceded by <literal>+</literal>.
        (Recall that there is no real distinction between users and groups
-       in <productname>PostgreSQL</>; a <literal>+</> mark really means
+       in <productname>PostgreSQL</productname>; a <literal>+</literal> mark really means
        <quote>match any of the roles that are directly or indirectly members
-       of this role</>, while a name without a <literal>+</> mark matches
+       of this role</quote>, while a name without a <literal>+</literal> mark matches
        only that specific role.) For this purpose, a superuser is only
        considered to be a member of a role if they are explicitly a member
        of the role, directly or indirectly, and not just by virtue of
        being a superuser.
        Multiple user names can be supplied by separating them with commas.
        A separate file containing user names can be specified by preceding the
-       file name with <literal>@</>.
+       file name with <literal>@</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -239,7 +239,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
       <para>
        An IP address range is specified using standard numeric notation
        for the range's starting address, then a slash (<literal>/</literal>)
-       and a <acronym>CIDR</> mask length.  The mask
+       and a <acronym>CIDR</acronym> mask length.  The mask
        length indicates the number of high-order bits of the client
        IP address that must match.  Bits to the right of this should
        be zero in the given IP address.
@@ -317,10 +317,10 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
 
       <para>
        This field only applies to <literal>host</literal>,
-       <literal>hostssl</literal>, and <literal>hostnossl</> records.
+       <literal>hostssl</literal>, and <literal>hostnossl</literal> records.
       </para>
 
-      <sidebar>
+      <note>
        <para>
         Users sometimes wonder why host names are handled
         in this seemingly complicated way, with two name resolutions
@@ -350,7 +350,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
         implementations of host name-based access control, such as the
         Apache HTTP Server and TCP Wrappers.
        </para>
-      </sidebar>
+      </note>
      </listitem>
     </varlistentry>
 
@@ -360,17 +360,17 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
      <listitem>
       <para>
        These two fields can be used as an alternative to the
-       <replaceable>IP-address</><literal>/</><replaceable>mask-length</>
+       <replaceable>IP-address</replaceable><literal>/</literal><replaceable>mask-length</replaceable>
        notation.  Instead of
        specifying the mask length, the actual mask is specified in a
-       separate column. For example, <literal>255.0.0.0</> represents an IPv4
-       CIDR mask length of 8, and <literal>255.255.255.255</> represents a
+       separate column. For example, <literal>255.0.0.0</literal> represents an IPv4
+       CIDR mask length of 8, and <literal>255.255.255.255</literal> represents a
        CIDR mask length of 32.
       </para>
 
       <para>
        These fields only apply to <literal>host</literal>,
-       <literal>hostssl</literal>, and <literal>hostnossl</> records.
+       <literal>hostssl</literal>, and <literal>hostnossl</literal> records.
       </para>
      </listitem>
     </varlistentry>
@@ -381,11 +381,11 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
       <para>
        Specifies the authentication method to use when a connection matches
        this record. The possible choices are summarized here; details
-       are in <xref linkend="auth-methods">.
+       are in <xref linkend="auth-methods"/>.
 
        <variablelist>
         <varlistentry>
-         <term><literal>trust</></term>
+         <term><literal>trust</literal></term>
          <listitem>
          <para>
           Allow the connection unconditionally. This method
@@ -393,18 +393,18 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
           <productname>PostgreSQL</productname> database server to login as
           any <productname>PostgreSQL</productname> user they wish,
           without the need for a password or any other authentication.  See <xref
-          linkend="auth-trust"> for details.
+          linkend="auth-trust"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>reject</></term>
+        <term><literal>reject</literal></term>
         <listitem>
          <para>
           Reject the connection unconditionally. This is useful for
-          <quote>filtering out</> certain hosts from a group, for example a
-          <literal>reject</> line could block a specific host from connecting,
+          <quote>filtering out</quote> certain hosts from a group, for example a
+          <literal>reject</literal> line could block a specific host from connecting,
           while a later line allows the remaining hosts in a specific
           network to connect.
          </para>
@@ -412,63 +412,63 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>scram-sha-256</></term>
+        <term><literal>scram-sha-256</literal></term>
         <listitem>
          <para>
           Perform SCRAM-SHA-256 authentication to verify the user's
-          password. See <xref linkend="auth-password"> for details.
+          password. See <xref linkend="auth-password"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>md5</></term>
+        <term><literal>md5</literal></term>
         <listitem>
          <para>
           Perform SCRAM-SHA-256 or MD5 authentication to verify the
-          user's password. See <xref linkend="auth-password">
+          user's password. See <xref linkend="auth-password"/>
           for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>password</></term>
+        <term><literal>password</literal></term>
         <listitem>
          <para>
           Require the client to supply an unencrypted password for
           authentication.
           Since the password is sent in clear text over the
           network, this should not be used on untrusted networks.
-          See <xref linkend="auth-password"> for details.
+          See <xref linkend="auth-password"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>gss</></term>
+        <term><literal>gss</literal></term>
         <listitem>
          <para>
           Use GSSAPI to authenticate the user. This is only
           available for TCP/IP connections. See <xref
-          linkend="gssapi-auth"> for details.
+          linkend="gssapi-auth"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>sspi</></term>
+        <term><literal>sspi</literal></term>
         <listitem>
          <para>
           Use SSPI to authenticate the user. This is only
           available on Windows. See <xref
-          linkend="sspi-auth"> for details.
+          linkend="sspi-auth"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>ident</></term>
+        <term><literal>ident</literal></term>
         <listitem>
          <para>
           Obtain the operating system user name of the client
@@ -477,70 +477,70 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
           Ident authentication can only be used on TCP/IP
           connections. When specified for local connections, peer
           authentication will be used instead.
-          See <xref linkend="auth-ident"> for details.
+          See <xref linkend="auth-ident"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>peer</></term>
+        <term><literal>peer</literal></term>
         <listitem>
          <para>
           Obtain the client's operating system user name from the operating
           system and check if it matches the requested database user name.
           This is only available for local connections.
-          See <xref linkend="auth-peer"> for details.
+          See <xref linkend="auth-peer"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>ldap</></term>
+        <term><literal>ldap</literal></term>
         <listitem>
          <para>
-          Authenticate using an <acronym>LDAP</> server. See <xref
-          linkend="auth-ldap"> for details.
+          Authenticate using an <acronym>LDAP</acronym> server. See <xref
+          linkend="auth-ldap"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>radius</></term>
+        <term><literal>radius</literal></term>
         <listitem>
          <para>
           Authenticate using a RADIUS server. See <xref
-          linkend="auth-radius"> for details.
+          linkend="auth-radius"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>cert</></term>
+        <term><literal>cert</literal></term>
         <listitem>
          <para>
           Authenticate using SSL client certificates. See
-          <xref linkend="auth-cert"> for details.
+          <xref linkend="auth-cert"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>pam</></term>
+        <term><literal>pam</literal></term>
         <listitem>
          <para>
           Authenticate using the Pluggable Authentication Modules
           (PAM) service provided by the operating system.  See <xref
-          linkend="auth-pam"> for details.
+          linkend="auth-pam"/> for details.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>bsd</></term>
+        <term><literal>bsd</literal></term>
         <listitem>
          <para>
           Authenticate using the BSD Authentication service provided by the
-          operating system. See <xref linkend="auth-bsd"> for details.
+          operating system. See <xref linkend="auth-bsd"/> for details.
          </para>
         </listitem>
        </varlistentry>
@@ -554,17 +554,17 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
      <term><replaceable>auth-options</replaceable></term>
      <listitem>
       <para>
-       After the <replaceable>auth-method</> field, there can be field(s) of
-       the form <replaceable>name</><literal>=</><replaceable>value</> that
+       After the <replaceable>auth-method</replaceable> field, there can be field(s) of
+       the form <replaceable>name</replaceable><literal>=</literal><replaceable>value</replaceable> that
        specify options for the authentication method. Details about which
        options are available for which authentication methods appear below.
       </para>
 
       <para>
        In addition to the method-specific options listed below, there is one
-       method-independent authentication option <literal>clientcert</>, which
-       can be specified in any <literal>hostssl</> record.  When set
-       to <literal>1</>, this option requires the client to present a valid
+       method-independent authentication option <literal>clientcert</literal>, which
+       can be specified in any <literal>hostssl</literal> record.  When set
+       to <literal>1</literal>, this option requires the client to present a valid
        (trusted) SSL certificate, in addition to the other requirements of the
        authentication method.
       </para>
@@ -574,11 +574,11 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
   </para>
 
   <para>
-   Files included by <literal>@</> constructs are read as lists of names,
+   Files included by <literal>@</literal> constructs are read as lists of names,
    which can be separated by either whitespace or commas.  Comments are
    introduced by <literal>#</literal>, just as in
-   <filename>pg_hba.conf</filename>, and nested <literal>@</> constructs are
-   allowed.  Unless the file name following <literal>@</> is an absolute
+   <filename>pg_hba.conf</filename>, and nested <literal>@</literal> constructs are
+   allowed.  Unless the file name following <literal>@</literal> is an absolute
    path, it is taken to be relative to the directory containing the
    referencing file.
   </para>
@@ -589,10 +589,10 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
    significant. Typically, earlier records will have tight connection
    match parameters and weaker authentication methods, while later
    records will have looser match parameters and stronger authentication
-   methods. For example, one might wish to use <literal>trust</>
+   methods. For example, one might wish to use <literal>trust</literal>
    authentication for local TCP/IP connections but require a password for
    remote TCP/IP connections. In this case a record specifying
-   <literal>trust</> authentication for connections from 127.0.0.1 would
+   <literal>trust</literal> authentication for connections from 127.0.0.1 would
    appear before a record specifying password authentication for a wider
    range of allowed client IP addresses.
   </para>
@@ -603,7 +603,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
    <systemitem>SIGHUP</systemitem><indexterm><primary>SIGHUP</primary></indexterm>
    signal. If you edit the file on an
    active system, you will need to signal the postmaster
-   (using <literal>pg_ctl reload</> or <literal>kill -HUP</>) to make it
+   (using <literal>pg_ctl reload</literal> or <literal>kill -HUP</literal>) to make it
    re-read the file.
   </para>
 
@@ -618,7 +618,7 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
   <para>
    The system view
    <link linkend="view-pg-hba-file-rules"><structname>pg_hba_file_rules</structname></link>
-   can be helpful for pre-testing changes to the <filename>pg_hba.conf</>
+   can be helpful for pre-testing changes to the <filename>pg_hba.conf</filename>
    file, or for diagnosing problems if loading of the file did not have the
    desired effects.  Rows in the view with
    non-null <structfield>error</structfield> fields indicate problems in the
@@ -629,16 +629,16 @@ hostnossl  <replaceable>database</replaceable>  <replaceable>user</replaceable>
    <para>
     To connect to a particular database, a user must not only pass the
     <filename>pg_hba.conf</filename> checks, but must have the
-    <literal>CONNECT</> privilege for the database.  If you wish to
+    <literal>CONNECT</literal> privilege for the database.  If you wish to
     restrict which users can connect to which databases, it's usually
-    easier to control this by granting/revoking <literal>CONNECT</> privilege
+    easier to control this by granting/revoking <literal>CONNECT</literal> privilege
     than to put the rules in <filename>pg_hba.conf</filename> entries.
    </para>
   </tip>
 
   <para>
    Some examples of <filename>pg_hba.conf</filename> entries are shown in
-   <xref linkend="example-pg-hba.conf">. See the next section for details on the
+   <xref linkend="example-pg-hba.conf"/>. See the next section for details on the
    different authentication methods.
   </para>
 
@@ -760,21 +760,21 @@ local   db1,db2,@demodbs  all                                   md5
 
   <para>
    User name maps are defined in the ident map file, which by default is named
-   <filename>pg_ident.conf</><indexterm><primary>pg_ident.conf</primary></indexterm>
+   <filename>pg_ident.conf</filename><indexterm><primary>pg_ident.conf</primary></indexterm>
    and is stored in the
    cluster's data directory.  (It is possible to place the map file
-   elsewhere, however; see the <xref linkend="guc-ident-file">
+   elsewhere, however; see the <xref linkend="guc-ident-file"/>
    configuration parameter.)
    The ident map file contains lines of the general form:
 <synopsis>
-<replaceable>map-name</> <replaceable>system-username</> <replaceable>database-username</>
+<replaceable>map-name</replaceable> <replaceable>system-username</replaceable> <replaceable>database-username</replaceable>
 </synopsis>
    Comments and whitespace are handled in the same way as in
-   <filename>pg_hba.conf</>.  The
-   <replaceable>map-name</> is an arbitrary name that will be used to
+   <filename>pg_hba.conf</filename>.  The
+   <replaceable>map-name</replaceable> is an arbitrary name that will be used to
    refer to this mapping in <filename>pg_hba.conf</filename>. The other
    two fields specify an operating system user name and a matching
-   database user name. The same <replaceable>map-name</> can be
+   database user name. The same <replaceable>map-name</replaceable> can be
    used repeatedly to specify multiple user-mappings within a single map.
   </para>
   <para>
@@ -788,13 +788,13 @@ local   db1,db2,@demodbs  all                                   md5
    user has requested to connect as.
   </para>
   <para>
-   If the <replaceable>system-username</> field starts with a slash (<literal>/</>),
+   If the <replaceable>system-username</replaceable> field starts with a slash (<literal>/</literal>),
    the remainder of the field is treated as a regular expression.
-   (See <xref linkend="posix-syntax-details"> for details of
-   <productname>PostgreSQL</>'s regular expression syntax.)  The regular
+   (See <xref linkend="posix-syntax-details"/> for details of
+   <productname>PostgreSQL</productname>'s regular expression syntax.)  The regular
    expression can include a single capture, or parenthesized subexpression,
-   which can then be referenced in the <replaceable>database-username</>
-   field as <literal>\1</> (backslash-one).  This allows the mapping of
+   which can then be referenced in the <replaceable>database-username</replaceable>
+   field as <literal>\1</literal> (backslash-one).  This allows the mapping of
    multiple user names in a single line, which is particularly useful for
    simple syntax substitutions.  For example, these entries
 <programlisting>
@@ -802,14 +802,14 @@ mymap   /^(.*)@mydomain\.com$      \1
 mymap   /^(.*)@otherdomain\.com$   guest
 </programlisting>
    will remove the domain part for users with system user names that end with
-   <literal>@mydomain.com</>, and allow any user whose system name ends with
-   <literal>@otherdomain.com</> to log in as <literal>guest</>.
+   <literal>@mydomain.com</literal>, and allow any user whose system name ends with
+   <literal>@otherdomain.com</literal> to log in as <literal>guest</literal>.
   </para>
 
   <tip>
    <para>
     Keep in mind that by default, a regular expression can match just part of
-    a string.  It's usually wise to use <literal>^</> and <literal>$</>, as
+    a string.  It's usually wise to use <literal>^</literal> and <literal>$</literal>, as
     shown in the above example, to force the match to be to the entire
     system user name.
    </para>
@@ -821,28 +821,28 @@ mymap   /^(.*)@otherdomain\.com$   guest
    <systemitem>SIGHUP</systemitem><indexterm><primary>SIGHUP</primary></indexterm>
    signal. If you edit the file on an
    active system, you will need to signal the postmaster
-   (using <literal>pg_ctl reload</> or <literal>kill -HUP</>) to make it
+   (using <literal>pg_ctl reload</literal> or <literal>kill -HUP</literal>) to make it
    re-read the file.
   </para>
 
   <para>
    A <filename>pg_ident.conf</filename> file that could be used in
-   conjunction with the <filename>pg_hba.conf</> file in <xref
-   linkend="example-pg-hba.conf"> is shown in <xref
-   linkend="example-pg-ident.conf">. In this example, anyone
+   conjunction with the <filename>pg_hba.conf</filename> file in <xref
+   linkend="example-pg-hba.conf"/> is shown in <xref
+   linkend="example-pg-ident.conf"/>. In this example, anyone
    logged in to a machine on the 192.168 network that does not have the
-   operating system user name <literal>bryanh</>, <literal>ann</>, or
-   <literal>robert</> would not be granted access. Unix user
-   <literal>robert</> would only be allowed access when he tries to
-   connect as <productname>PostgreSQL</> user <literal>bob</>, not
-   as <literal>robert</> or anyone else. <literal>ann</> would
-   only be allowed to connect as <literal>ann</>. User
-   <literal>bryanh</> would be allowed to connect as either
-   <literal>bryanh</> or as <literal>guest1</>.
+   operating system user name <literal>bryanh</literal>, <literal>ann</literal>, or
+   <literal>robert</literal> would not be granted access. Unix user
+   <literal>robert</literal> would only be allowed access when he tries to
+   connect as <productname>PostgreSQL</productname> user <literal>bob</literal>, not
+   as <literal>robert</literal> or anyone else. <literal>ann</literal> would
+   only be allowed to connect as <literal>ann</literal>. User
+   <literal>bryanh</literal> would be allowed to connect as either
+   <literal>bryanh</literal> or as <literal>guest1</literal>.
   </para>
 
   <example id="example-pg-ident.conf">
-   <title>An Example <filename>pg_ident.conf</> File</title>
+   <title>An Example <filename>pg_ident.conf</filename> File</title>
 <programlisting>
 # MAPNAME       SYSTEM-USERNAME         PG-USERNAME
 
@@ -866,26 +866,26 @@ omicron         bryanh                  guest1
    <title>Trust Authentication</title>
 
    <para>
-    When <literal>trust</> authentication is specified,
+    When <literal>trust</literal> authentication is specified,
     <productname>PostgreSQL</productname> assumes that anyone who can
     connect to the server is authorized to access the database with
     whatever database user name they specify (even superuser names).
-    Of course, restrictions made in the <literal>database</> and
-    <literal>user</> columns still apply.
+    Of course, restrictions made in the <literal>database</literal> and
+    <literal>user</literal> columns still apply.
     This method should only be used when there is adequate
     operating-system-level protection on connections to the server.
    </para>
 
    <para>
-    <literal>trust</> authentication is appropriate and very
+    <literal>trust</literal> authentication is appropriate and very
     convenient for local connections on a single-user workstation.  It
-    is usually <emphasis>not</> appropriate by itself on a multiuser
-    machine.  However, you might be able to use <literal>trust</> even
+    is usually <emphasis>not</emphasis> appropriate by itself on a multiuser
+    machine.  However, you might be able to use <literal>trust</literal> even
     on a multiuser machine, if you restrict access to the server's
     Unix-domain socket file using file-system permissions.  To do this, set the
     <varname>unix_socket_permissions</varname> (and possibly
     <varname>unix_socket_group</varname>) configuration parameters as
-    described in <xref linkend="runtime-config-connection">.  Or you
+    described in <xref linkend="runtime-config-connection"/>.  Or you
     could set the <varname>unix_socket_directories</varname>
     configuration parameter to place the socket file in a suitably
     restricted directory.
@@ -895,17 +895,17 @@ omicron         bryanh                  guest1
     Setting file-system permissions only helps for Unix-socket connections.
     Local TCP/IP connections are not restricted by file-system permissions.
     Therefore, if you want to use file-system permissions for local security,
-    remove the <literal>host ... 127.0.0.1 ...</> line from
-    <filename>pg_hba.conf</>, or change it to a
-    non-<literal>trust</> authentication method.
+    remove the <literal>host ... 127.0.0.1 ...</literal> line from
+    <filename>pg_hba.conf</filename>, or change it to a
+    non-<literal>trust</literal> authentication method.
    </para>
 
    <para>
-    <literal>trust</> authentication is only suitable for TCP/IP connections
+    <literal>trust</literal> authentication is only suitable for TCP/IP connections
     if you trust every user on every machine that is allowed to connect
-    to the server by the <filename>pg_hba.conf</> lines that specify
-    <literal>trust</>.  It is seldom reasonable to use <literal>trust</>
-    for any TCP/IP connections other than those from <systemitem>localhost</> (127.0.0.1).
+    to the server by the <filename>pg_hba.conf</filename> lines that specify
+    <literal>trust</literal>.  It is seldom reasonable to use <literal>trust</literal>
+    for any TCP/IP connections other than those from <systemitem>localhost</systemitem> (127.0.0.1).
    </para>
 
   </sect2>
@@ -914,7 +914,10 @@ omicron         bryanh                  guest1
    <title>Password Authentication</title>
 
    <indexterm>
-    <primary>MD5</>
+    <primary>MD5</primary>
+   </indexterm>
+   <indexterm>
+    <primary>SCRAM</primary>
    </indexterm>
    <indexterm>
     <primary>password</primary>
@@ -922,53 +925,119 @@ omicron         bryanh                  guest1
    </indexterm>
 
    <para>
-    The password-based authentication methods are <literal>scram-sha-256</>,
-    <literal>md5</>, and <literal>password</>. These methods operate
-    similarly except for the way that the password is sent across the
+    There are several password-based authentication methods.  These methods
+    operate similarly but differ in how the users' passwords are stored on the
+    server and how the password provided by a client is sent across the
     connection.
    </para>
 
-   <para>
-    Plain <literal>password</> sends the password in clear-text, and is
-    therefore vulnerable to password <quote>sniffing</> attacks. It should
-    always be avoided if possible. If the connection is protected by SSL
-    encryption then <literal>password</> can be used safely, though.
-    (Though SSL certificate authentication might be a better choice if one
-    is depending on using SSL).
-   </para>
+   <variablelist>
+    <varlistentry>
+     <term><literal>scram-sha-256</literal></term>
+     <listitem>
+      <para>
+       The method <literal>scram-sha-256</literal> performs SCRAM-SHA-256
+       authentication, as described in
+       <ulink url="https://tools.ietf.org/html/rfc7677">RFC 7677</ulink>.  It
+       is a challenge-response scheme that prevents password sniffing on
+       untrusted connections and supports storing passwords on the server in a
+       cryptographically hashed form that is thought to be secure.
+      </para>
 
+      <para>
+       This is the most secure of the currently provided methods, but it is
+       not supported by older client libraries.
+      </para>
+     </listitem>
+    </varlistentry>
 
-   <para>
-    <literal>scram-sha-256</> performs SCRAM-SHA-256 authentication, as
-    described in
-    <ulink url="https://tools.ietf.org/html/rfc5802">RFC5802</ulink>. It
-    is a challenge-response scheme, that prevents password sniffing on
-    untrusted connections. It is more secure than the <literal>md5</>
-    method, but might not be supported by older clients.
-   </para>
+    <varlistentry>
+     <term><literal>md5</literal></term>
+     <listitem>
+      <para>
+       The method <literal>md5</literal> uses a custom less secure challenge-response
+       mechanism.  It prevents password sniffing and avoids storing passwords
+       on the server in plain text but provides no protection if an attacker
+       manages to steal the password hash from the server.  Also, the MD5 hash
+       algorithm is nowadays no longer considered secure against determined
+       attacks.
+      </para>
 
-   <para>
-    <literal>md5</> allows falling back to a less secure challenge-response
-    mechanism for those users with an MD5 hashed password.
-    The fallback mechanism also prevents password sniffing, but provides no
-    protection if an attacker manages to steal the password hash from the
-    server, and it cannot be used with the <xref
-    linkend="guc-db-user-namespace"> feature. For all other users,
-    <literal>md5</> works the same as <literal>scram-sha-256</>.
-   </para>
+      <para>
+       The <literal>md5</literal> method cannot be used with
+       the <xref linkend="guc-db-user-namespace"/> feature.
+      </para>
+
+      <para>
+       To ease transition from the <literal>md5</literal> method to the newer
+       SCRAM method, if <literal>md5</literal> is specified as a method
+       in <filename>pg_hba.conf</filename> but the user's password on the
+       server is encrypted for SCRAM (see below), then SCRAM-based
+       authentication will automatically be chosen instead.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal>password</literal></term>
+     <listitem>
+      <para>
+       The method <literal>password</literal> sends the password in clear-text and is
+       therefore vulnerable to password <quote>sniffing</quote> attacks. It should
+       always be avoided if possible. If the connection is protected by SSL
+       encryption then <literal>password</literal> can be used safely, though.
+       (Though SSL certificate authentication might be a better choice if one
+       is depending on using SSL).
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
 
    <para>
     <productname>PostgreSQL</productname> database passwords are
     separate from operating system user passwords. The password for
-    each database user is stored in the <literal>pg_authid</> system
+    each database user is stored in the <literal>pg_authid</literal> system
     catalog. Passwords can be managed with the SQL commands
-    <xref linkend="sql-createuser"> and
-    <xref linkend="sql-alterrole">,
-    e.g., <userinput>CREATE USER foo WITH PASSWORD 'secret'</userinput>.
+    <xref linkend="sql-createrole"/> and
+    <xref linkend="sql-alterrole"/>,
+    e.g., <userinput>CREATE ROLE foo WITH LOGIN PASSWORD 'secret'</userinput>,
+    or the <application>psql</application>
+    command <literal>\password</literal>.
     If no password has been set up for a user, the stored password
     is null and password authentication will always fail for that user.
    </para>
 
+   <para>
+    The availability of the different password-based authentication methods
+    depends on how a user's password on the server is encrypted (or hashed,
+    more accurately).  This is controlled by the configuration
+    parameter <xref linkend="guc-password-encryption"/> at the time the
+    password is set.  If a password was encrypted using
+    the <literal>scram-sha-256</literal> setting, then it can be used for the
+    authentication methods <literal>scram-sha-256</literal>
+    and <literal>password</literal> (but password transmission will be in
+    plain text in the latter case).  The authentication method
+    specification <literal>md5</literal> will automatically switch to using
+    the <literal>scram-sha-256</literal> method in this case, as explained
+    above, so it will also work.  If a password was encrypted using
+    the <literal>md5</literal> setting, then it can be used only for
+    the <literal>md5</literal> and <literal>password</literal> authentication
+    method specifications (again, with the password transmitted in plain text
+    in the latter case).  (Previous PostgreSQL releases supported storing the
+    password on the server in plain text.  This is no longer possible.)  To
+    check the currently stored password hashes, see the system
+    catalog <literal>pg_authid</literal>.
+   </para>
+
+   <para>
+    To upgrade an existing installation from <literal>md5</literal>
+    to <literal>scram-sha-256</literal>, after having ensured that all client
+    libraries in use are new enough to support SCRAM,
+    set <literal>password_encryption = 'scram-sha-256'</literal>
+    in <filename>postgresql.conf</filename>, make all users set new passwords,
+    and change the authentication method specifications
+    in <filename>pg_hba.conf</filename> to <literal>scram-sha-256</literal>.
+   </para>
   </sect2>
 
   <sect2 id="gssapi-auth">
@@ -991,21 +1060,21 @@ omicron         bryanh                  guest1
    </para>
 
    <para>
-    GSSAPI support has to be enabled when <productname>PostgreSQL</> is built;
-    see <xref linkend="installation"> for more information.
+    GSSAPI support has to be enabled when <productname>PostgreSQL</productname> is built;
+    see <xref linkend="installation"/> for more information.
    </para>
 
    <para>
     When <productname>GSSAPI</productname> uses
     <productname>Kerberos</productname>, it uses a standard principal
     in the format
-    <literal><replaceable>servicename</>/<replaceable>hostname</>@<replaceable>realm</></literal>.
+    <literal><replaceable>servicename</replaceable>/<replaceable>hostname</replaceable>@<replaceable>realm</replaceable></literal>.
     The PostgreSQL server will accept any principal that is included in the keytab used by
     the server, but care needs to be taken to specify the correct principal details when
-    making the connection from the client using the <literal>krbsrvname</> connection parameter. (See
-    also <xref linkend="libpq-paramkeywords">.) The installation default can be
+    making the connection from the client using the <literal>krbsrvname</literal> connection parameter. (See
+    also <xref linkend="libpq-paramkeywords"/>.) The installation default can be
     changed from the default <literal>postgres</literal> at build time using
-    <literal>./configure --with-krb-srvnam=</><replaceable>whatever</>.
+    <literal>./configure --with-krb-srvnam=</literal><replaceable>whatever</replaceable>.
     In most environments,
     this parameter never needs to be changed.
     Some Kerberos implementations might require a different service name,
@@ -1013,42 +1082,42 @@ omicron         bryanh                  guest1
     to be in upper case (<literal>POSTGRES</literal>).
    </para>
    <para>
-    <replaceable>hostname</> is the fully qualified host name of the
+    <replaceable>hostname</replaceable> is the fully qualified host name of the
     server machine. The service principal's realm is the preferred realm
     of the server machine.
    </para>
 
    <para>
-    Client principals can be mapped to different <productname>PostgreSQL</>
-    database user names with <filename>pg_ident.conf</>.  For example,
-    <literal>pgusername@realm</> could be mapped to just <literal>pgusername</>.
-    Alternatively, you can use the full <literal>username@realm</> principal as
-    the role name in <productname>PostgreSQL</> without any mapping.
+    Client principals can be mapped to different <productname>PostgreSQL</productname>
+    database user names with <filename>pg_ident.conf</filename>.  For example,
+    <literal>pgusername@realm</literal> could be mapped to just <literal>pgusername</literal>.
+    Alternatively, you can use the full <literal>username@realm</literal> principal as
+    the role name in <productname>PostgreSQL</productname> without any mapping.
    </para>
 
    <para>
-    <productname>PostgreSQL</> also supports a parameter to strip the realm from
+    <productname>PostgreSQL</productname> also supports a parameter to strip the realm from
     the principal.  This method is supported for backwards compatibility and is
     strongly discouraged as it is then impossible to distinguish different users
     with the same user name but coming from different realms.  To enable this,
-    set <literal>include_realm</> to 0.  For simple single-realm
+    set <literal>include_realm</literal> to 0.  For simple single-realm
     installations, doing that combined with setting the
-    <literal>krb_realm</> parameter (which checks that the principal's realm
+    <literal>krb_realm</literal> parameter (which checks that the principal's realm
     matches exactly what is in the <literal>krb_realm</literal> parameter)
     is still secure; but this is a
     less capable approach compared to specifying an explicit mapping in
-    <filename>pg_ident.conf</>.
+    <filename>pg_ident.conf</filename>.
    </para>
 
    <para>
     Make sure that your server keytab file is readable (and preferably
     only readable, not writable) by the <productname>PostgreSQL</productname>
-    server account.  (See also <xref linkend="postgres-user">.) The location
+    server account.  (See also <xref linkend="postgres-user"/>.) The location
     of the key file is specified by the <xref
-    linkend="guc-krb-server-keyfile"> configuration
+    linkend="guc-krb-server-keyfile"/> configuration
     parameter. The default is
-    <filename>/usr/local/pgsql/etc/krb5.keytab</> (or whatever
-    directory was specified as <varname>sysconfdir</> at build time).
+    <filename>/usr/local/pgsql/etc/krb5.keytab</filename> (or whatever
+    directory was specified as <varname>sysconfdir</varname> at build time).
     For security reasons, it is recommended to use a separate keytab
     just for the <productname>PostgreSQL</productname> server rather
     than opening up permissions on the system keytab file.
@@ -1058,18 +1127,18 @@ omicron         bryanh                  guest1
     Kerberos documentation for details. The following example is
    for MIT-compatible Kerberos 5 implementations:
 <screen>
-<prompt>kadmin% </><userinput>ank -randkey postgres/server.my.domain.org</>
-<prompt>kadmin% </><userinput>ktadd -k krb5.keytab postgres/server.my.domain.org</>
+<prompt>kadmin% </prompt><userinput>ank -randkey postgres/server.my.domain.org</userinput>
+<prompt>kadmin% </prompt><userinput>ktadd -k krb5.keytab postgres/server.my.domain.org</userinput>
 </screen>
    </para>
 
    <para>
     When connecting to the database make sure you have a ticket for a
     principal matching the requested database user name. For example, for
-    database user name <literal>fred</>, principal
-    <literal>fred@EXAMPLE.COM</> would be able to connect. To also allow
-    principal <literal>fred/users.example.com@EXAMPLE.COM</>, use a user name
-    map, as described in <xref linkend="auth-username-maps">.
+    database user name <literal>fred</literal>, principal
+    <literal>fred@EXAMPLE.COM</literal> would be able to connect. To also allow
+    principal <literal>fred/users.example.com@EXAMPLE.COM</literal>, use a user name
+    map, as described in <xref linkend="auth-username-maps"/>.
    </para>
 
    <para>
@@ -1081,13 +1150,13 @@ omicron         bryanh                  guest1
        <para>
         If set to 0, the realm name from the authenticated user principal is
         stripped off before being passed through the user name mapping
-        (<xref linkend="auth-username-maps">). This is discouraged and is
+        (<xref linkend="auth-username-maps"/>). This is discouraged and is
         primarily available for backwards compatibility, as it is not secure
         in multi-realm environments unless <literal>krb_realm</literal> is
         also used.  It is recommended to
         leave <literal>include_realm</literal> set to the default (1) and to
-        provide an explicit mapping in <filename>pg_ident.conf</> to convert
-        principal names to <productname>PostgreSQL</> user names.
+        provide an explicit mapping in <filename>pg_ident.conf</filename> to convert
+        principal names to <productname>PostgreSQL</productname> user names.
        </para>
       </listitem>
      </varlistentry>
@@ -1097,7 +1166,7 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.  For a GSSAPI/Kerberos
+        <xref linkend="auth-username-maps"/> for details.  For a GSSAPI/Kerberos
         principal, such as <literal>username@EXAMPLE.COM</literal> (or, less
         commonly, <literal>username/hostbased@EXAMPLE.COM</literal>), the
         user name used for mapping is
@@ -1148,7 +1217,7 @@ omicron         bryanh                  guest1
    <para>
     When using <productname>Kerberos</productname> authentication,
     <productname>SSPI</productname> works the same way
-    <productname>GSSAPI</productname> does; see <xref linkend="gssapi-auth">
+    <productname>GSSAPI</productname> does; see <xref linkend="gssapi-auth"/>
     for details.
    </para>
 
@@ -1162,13 +1231,13 @@ omicron         bryanh                  guest1
        <para>
         If set to 0, the realm name from the authenticated user principal is
         stripped off before being passed through the user name mapping
-        (<xref linkend="auth-username-maps">). This is discouraged and is
+        (<xref linkend="auth-username-maps"/>). This is discouraged and is
         primarily available for backwards compatibility, as it is not secure
         in multi-realm environments unless <literal>krb_realm</literal> is
         also used.  It is recommended to
         leave <literal>include_realm</literal> set to the default (1) and to
-        provide an explicit mapping in <filename>pg_ident.conf</> to convert
-        principal names to <productname>PostgreSQL</> user names.
+        provide an explicit mapping in <filename>pg_ident.conf</filename> to convert
+        principal names to <productname>PostgreSQL</productname> user names.
        </para>
       </listitem>
      </varlistentry>
@@ -1201,9 +1270,9 @@ omicron         bryanh                  guest1
         By default, these two names are identical for new user accounts.
        </para>
        <para>
-        Note that <application>libpq</> uses the SAM-compatible name if no
+        Note that <application>libpq</application> uses the SAM-compatible name if no
         explicit user name is specified. If you use
-        <application>libpq</> or a driver based on it, you should
+        <application>libpq</application> or a driver based on it, you should
         leave this option disabled or explicitly specify user name in the
         connection string.
        </para>
@@ -1215,7 +1284,7 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.  For a SSPI/Kerberos
+        <xref linkend="auth-username-maps"/> for details.  For a SSPI/Kerberos
         principal, such as <literal>username@EXAMPLE.COM</literal> (or, less
         commonly, <literal>username/hostbased@EXAMPLE.COM</literal>), the
         user name used for mapping is
@@ -1260,7 +1329,7 @@ omicron         bryanh                  guest1
    <note>
     <para>
      When ident is specified for a local (non-TCP/IP) connection,
-     peer authentication (see <xref linkend="auth-peer">) will be
+     peer authentication (see <xref linkend="auth-peer"/>) will be
      used instead.
     </para>
    </note>
@@ -1273,7 +1342,7 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.
+        <xref linkend="auth-username-maps"/> for details.
        </para>
       </listitem>
      </varlistentry>
@@ -1288,8 +1357,8 @@ omicron         bryanh                  guest1
     is to answer questions like <quote>What user initiated the
     connection that goes out of your port <replaceable>X</replaceable>
     and connects to my port <replaceable>Y</replaceable>?</quote>.
-    Since <productname>PostgreSQL</> knows both <replaceable>X</> and
-    <replaceable>Y</> when a physical connection is established, it
+    Since <productname>PostgreSQL</productname> knows both <replaceable>X</replaceable> and
+    <replaceable>Y</replaceable> when a physical connection is established, it
     can interrogate the ident server on the host of the connecting
     client and can theoretically determine the operating system user
     for any given connection.
@@ -1317,9 +1386,9 @@ omicron         bryanh                  guest1
    <para>
     Some ident servers have a nonstandard option that causes the returned
     user name to be encrypted, using a key that only the originating
-    machine's administrator knows.  This option <emphasis>must not</> be
-    used when using the ident server with <productname>PostgreSQL</>,
-    since <productname>PostgreSQL</> does not have any way to decrypt the
+    machine's administrator knows.  This option <emphasis>must not</emphasis> be
+    used when using the ident server with <productname>PostgreSQL</productname>,
+    since <productname>PostgreSQL</productname> does not have any way to decrypt the
     returned string to determine the actual user name.
    </para>
   </sect2>
@@ -1346,7 +1415,7 @@ omicron         bryanh                  guest1
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.
+        <xref linkend="auth-username-maps"/> for details.
        </para>
       </listitem>
      </varlistentry>
@@ -1355,11 +1424,11 @@ omicron         bryanh                  guest1
 
    <para>
     Peer authentication is only available on operating systems providing
-    the <function>getpeereid()</> function, the <symbol>SO_PEERCRED</symbol>
+    the <function>getpeereid()</function> function, the <symbol>SO_PEERCRED</symbol>
     socket parameter, or similar mechanisms.  Currently that includes
-    <systemitem class="osname">Linux</>,
-    most flavors of <systemitem class="osname">BSD</> including
-    <systemitem class="osname">macOS</>,
+    <systemitem class="osname">Linux</systemitem>,
+    most flavors of <systemitem class="osname">BSD</systemitem> including
+    <systemitem class="osname">macOS</systemitem>,
     and <systemitem class="osname">Solaris</systemitem>.
    </para>
 
@@ -1385,23 +1454,23 @@ omicron         bryanh                  guest1
     LDAP authentication can operate in two modes. In the first mode,
     which we will call the simple bind mode,
     the server will bind to the distinguished name constructed as
-    <replaceable>prefix</> <replaceable>username</> <replaceable>suffix</>.
-    Typically, the <replaceable>prefix</> parameter is used to specify
-    <literal>cn=</>, or <replaceable>DOMAIN</><literal>\</> in an Active
-    Directory environment.  <replaceable>suffix</> is used to specify the
+    <replaceable>prefix</replaceable> <replaceable>username</replaceable> <replaceable>suffix</replaceable>.
+    Typically, the <replaceable>prefix</replaceable> parameter is used to specify
+    <literal>cn=</literal>, or <replaceable>DOMAIN</replaceable><literal>\</literal> in an Active
+    Directory environment.  <replaceable>suffix</replaceable> is used to specify the
     remaining part of the DN in a non-Active Directory environment.
    </para>
 
    <para>
     In the second mode, which we will call the search+bind mode,
     the server first binds to the LDAP directory with
-    a fixed user name and password, specified with <replaceable>ldapbinddn</>
-    and <replaceable>ldapbindpasswd</>, and performs a search for the user trying
+    a fixed user name and password, specified with <replaceable>ldapbinddn</replaceable>
+    and <replaceable>ldapbindpasswd</replaceable>, and performs a search for the user trying
     to log in to the database. If no user and password is configured, an
     anonymous bind will be attempted to the directory. The search will be
-    performed over the subtree at <replaceable>ldapbasedn</>, and will try to
+    performed over the subtree at <replaceable>ldapbasedn</replaceable>, and will try to
     do an exact match of the attribute specified in
-    <replaceable>ldapsearchattribute</>.
+    <replaceable>ldapsearchattribute</replaceable>.
     Once the user has been found in
     this search, the server disconnects and re-binds to the directory as
     this user, using the password specified by the client, to verify that the
@@ -1433,19 +1502,40 @@ omicron         bryanh                  guest1
        </para>
       </listitem>
      </varlistentry>
+     <varlistentry>
+      <term><literal>ldapscheme</literal></term>
+      <listitem>
+       <para>
+        Set to <literal>ldaps</literal> to use LDAPS.  This is a non-standard
+        way of using LDAP over SSL, supported by some LDAP server
+        implementations.  See also the <literal>ldaptls</literal> option for
+        an alternative.
+       </para>
+      </listitem>
+     </varlistentry>
      <varlistentry>
       <term><literal>ldaptls</literal></term>
       <listitem>
        <para>
-        Set to 1 to make the connection between PostgreSQL and the
-        LDAP server use TLS encryption. Note that this only encrypts
-        the traffic to the LDAP server &mdash; the connection to the client
-        will still be unencrypted unless SSL is used.
+        Set to 1 to make the connection between PostgreSQL and the LDAP server
+        use TLS encryption.  This uses the <literal>StartTLS</literal>
+        operation per RFC 4513.  See also the <literal>ldapscheme</literal>
+        option for an alternative.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
+   </para>
 
+   <para>
+    Note that using <literal>ldapscheme</literal> or
+    <literal>ldaptls</literal> only encrypts the traffic between the
+    PostgreSQL server and the LDAP server.  The connection between the
+    PostgreSQL server and the PostgreSQL client will still be unencrypted
+    unless SSL is used there as well.
+   </para>
+
+   <para>
     The following options are used in simple bind mode only:
     <variablelist>
      <varlistentry>
@@ -1467,7 +1557,9 @@ omicron         bryanh                  guest1
       </listitem>
      </varlistentry>
     </variablelist>
+   </para>
 
+   <para>
     The following options are used in search+bind mode only:
     <variablelist>
      <varlistentry>
@@ -1503,7 +1595,18 @@ omicron         bryanh                  guest1
         <para>
          Attribute to match against the user name in the search when doing
          search+bind authentication.  If no attribute is specified, the
-         <literal>uid</> attribute will be used.
+         <literal>uid</literal> attribute will be used.
+        </para>
+       </listitem>
+      </varlistentry>
+      <varlistentry>
+       <term><literal>ldapsearchfilter</literal></term>
+       <listitem>
+        <para>
+         The search filter to use when doing search+bind authentication.
+         Occurrences of <literal>$username</literal> will be replaced with the
+         user name.  This allows for more flexible search filters than
+         <literal>ldapsearchattribute</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -1514,26 +1617,33 @@ omicron         bryanh                  guest1
          An RFC 4516 LDAP URL.  This is an alternative way to write some of the
          other LDAP options in a more compact and standard form.  The format is
 <synopsis>
-ldap://<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/<replaceable>basedn</replaceable>[?[<replaceable>attribute</replaceable>][?[<replaceable>scope</replaceable>]]]
+ldap[s]://<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/<replaceable>basedn</replaceable>[?[<replaceable>attribute</replaceable>][?[<replaceable>scope</replaceable>][?[<replaceable>filter</replaceable>]]]]
 </synopsis>
          <replaceable>scope</replaceable> must be one
          of <literal>base</literal>, <literal>one</literal>, <literal>sub</literal>,
-         typically the latter.  Only one attribute is used, and some other
-         components of standard LDAP URLs such as filters and extensions are
-         not supported.
+         typically the last.  (The default is <literal>base</literal>, which
+         is normally not useful in this application.)  <replaceable>attribute</replaceable> can
+         nominate a single attribute, in which case it is used as a value for
+         <literal>ldapsearchattribute</literal>.  If
+         <replaceable>attribute</replaceable> is empty then
+         <replaceable>filter</replaceable> can be used as a value for
+         <literal>ldapsearchfilter</literal>.
         </para>
 
         <para>
-         For non-anonymous binds, <literal>ldapbinddn</literal>
-         and <literal>ldapbindpasswd</literal> must be specified as separate
-         options.
+         The URL scheme <literal>ldaps</literal> chooses the LDAPS method for
+         making LDAP connections over SSL, equivalent to using
+         <literal>ldapscheme=ldaps</literal>.  To use encrypted LDAP
+         connections using the <literal>StartTLS</literal> operation, use the
+         normal URL scheme <literal>ldap</literal> and specify the
+         <literal>ldaptls</literal> option in addition to
+         <literal>ldapurl</literal>.
         </para>
 
         <para>
-         To use encrypted LDAP connections, the <literal>ldaptls</literal>
-         option has to be used in addition to <literal>ldapurl</literal>.
-         The <literal>ldaps</literal> URL scheme (direct SSL connection) is not
-         supported.
+         For non-anonymous binds, <literal>ldapbinddn</literal>
+         and <literal>ldapbindpasswd</literal> must be specified as separate
+         options.
         </para>
 
         <para>
@@ -1549,6 +1659,17 @@ ldap://<replaceable>host</replaceable>[:<replaceable>port</replaceable>]/<replac
     for search+bind.
    </para>
 
+   <para>
+    When using search+bind mode, the search can be performed using a single
+    attribute specified with <literal>ldapsearchattribute</literal>, or using
+    a custom search filter specified with
+    <literal>ldapsearchfilter</literal>.
+    Specifying <literal>ldapsearchattribute=foo</literal> is equivalent to
+    specifying <literal>ldapsearchfilter="(foo=$username)"</literal>.  If neither
+    option is specified the default is
+    <literal>ldapsearchattribute=uid</literal>.
+   </para>
+
    <para>
     Here is an example for a simple-bind LDAP configuration:
 <programlisting>
@@ -1584,6 +1705,16 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
     same URL format, so it will be easier to share the configuration.
    </para>
 
+   <para>
+    Here is an example for a search+bind configuration that uses
+    <literal>ldapsearchfilter</literal> instead of
+    <literal>ldapsearchattribute</literal> to allow authentication by
+    user ID or email address:
+<programlisting>
+host ... ldap ldapserver=ldap.example.net ldapbasedn="dc=example, dc=net" ldapsearchfilter="(|(uid=$username)(mail=$username))"
+</programlisting>
+   </para>
+
    <tip>
     <para>
      Since LDAP often uses commas and spaces to separate the different
@@ -1614,11 +1745,11 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
     When using RADIUS authentication, an Access Request message will be sent
     to the configured RADIUS server. This request will be of type
     <literal>Authenticate Only</literal>, and include parameters for
-    <literal>user name</>, <literal>password</> (encrypted) and
-    <literal>NAS Identifier</>. The request will be encrypted using
+    <literal>user name</literal>, <literal>password</literal> (encrypted) and
+    <literal>NAS Identifier</literal>. The request will be encrypted using
     a secret shared with the server. The RADIUS server will respond to
-    this server with either <literal>Access Accept</> or
-    <literal>Access Reject</>. There is no support for RADIUS accounting.
+    this server with either <literal>Access Accept</literal> or
+    <literal>Access Reject</literal>. There is no support for RADIUS accounting.
    </para>
 
    <para>
@@ -1657,8 +1788,8 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
          <note>
          <para>
           The encryption vector used will only be cryptographically
-          strong if <productname>PostgreSQL</> is built with support for
-          <productname>OpenSSL</>. In other cases, the transmission to the
+          strong if <productname>PostgreSQL</productname> is built with support for
+          <productname>OpenSSL</productname>. In other cases, the transmission to the
           RADIUS server should only be considered obfuscated, not secured, and
           external security measures should be applied if necessary.
          </para>
@@ -1672,7 +1803,7 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
        <listitem>
         <para>
          The port number on the RADIUS servers to connect to. If no port
-         is specified, the default port <literal>1812</> will be used.
+         is specified, the default port <literal>1812</literal> will be used.
         </para>
        </listitem>
       </varlistentry>
@@ -1681,12 +1812,12 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
        <term><literal>radiusidentifiers</literal></term>
        <listitem>
         <para>
-         The string used as <literal>NAS Identifier</> in the RADIUS
+         The string used as <literal>NAS Identifier</literal> in the RADIUS
          requests. This parameter can be used as a second parameter
          identifying for example which database user the user is attempting
          to authenticate as, which can be used for policy matching on
          the RADIUS server. If no identifier is specified, the default
-         <literal>postgresql</> will be used.
+         <literal>postgresql</literal> will be used.
         </para>
        </listitem>
       </varlistentry>
@@ -1723,7 +1854,7 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
       <listitem>
        <para>
         Allows for mapping between system and database user names. See
-        <xref linkend="auth-username-maps"> for details.
+        <xref linkend="auth-username-maps"/> for details.
        </para>
       </listitem>
      </varlistentry>
@@ -1731,11 +1862,11 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
    </para>
 
    <para>
-    In a <filename>pg_hba.conf</> record specifying certificate
-    authentication, the authentication option <literal>clientcert</> is
-    assumed to be <literal>1</>, and it cannot be turned off since a client
-    certificate is necessary for this method.  What the <literal>cert</>
-    method adds to the basic <literal>clientcert</> certificate validity test
+    In a <filename>pg_hba.conf</filename> record specifying certificate
+    authentication, the authentication option <literal>clientcert</literal> is
+    assumed to be <literal>1</literal>, and it cannot be turned off since a client
+    certificate is necessary for this method.  What the <literal>cert</literal>
+    method adds to the basic <literal>clientcert</literal> certificate validity test
     is a check that the <literal>cn</literal> attribute matches the database
     user name.
    </para>
@@ -1758,7 +1889,7 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
     exist in the database before PAM can be used for authentication.  For more
     information about PAM, please read the
     <ulink url="http://www.kernel.org/pub/linux/libs/pam/">
-    <productname>Linux-PAM</> Page</ulink>.
+    <productname>Linux-PAM</productname> Page</ulink>.
    </para>
 
    <para>
@@ -1791,7 +1922,7 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
 
    <note>
     <para>
-     If PAM is set up to read <filename>/etc/shadow</>, authentication
+     If PAM is set up to read <filename>/etc/shadow</filename>, authentication
      will fail because the PostgreSQL server is started by a non-root
      user.  However, this is not an issue when PAM is configured to use
      LDAP or other authentication methods.
@@ -1817,11 +1948,11 @@ host ... ldap ldapurl="ldap://ldap.example.net/dc=example,dc=net?uid?sub"
    </para>
 
    <para>
-    BSD Authentication in <productname>PostgreSQL</> uses
+    BSD Authentication in <productname>PostgreSQL</productname> uses
     the <literal>auth-postgresql</literal> login type and authenticates with
     the <literal>postgresql</literal> login class if that's defined
     in <filename>login.conf</filename>. By default that login class does not
-    exist, and <productname>PostgreSQL</> will use the default login class.
+    exist, and <productname>PostgreSQL</productname> will use the default login class.
    </para>
 
    <note>
diff --git a/doc/src/sgml/config.sgml b/doc/src/sgml/config.sgml
index 2b6255ed95..00fc364c0a 100644
--- a/doc/src/sgml/config.sgml
+++ b/doc/src/sgml/config.sgml
@@ -70,9 +70,9 @@
        (typically eight kilobytes), milliseconds, seconds, or minutes.
        An unadorned numeric value for one of these settings will use the
        setting's default unit, which can be learned from
-       <structname>pg_settings</>.<structfield>unit</>.
+       <structname>pg_settings</structname>.<structfield>unit</structfield>.
        For convenience, settings can be given with a unit specified explicitly,
-       for example <literal>'120 ms'</> for a time value, and they will be
+       for example <literal>'120 ms'</literal> for a time value, and they will be
        converted to whatever the parameter's actual unit is.  Note that the
        value must be written as a string (with quotes) to use this feature.
        The unit name is case-sensitive, and there can be whitespace between
@@ -105,7 +105,7 @@
        Enumerated-type parameters are written in the same way as string
        parameters, but are restricted to have one of a limited set of
        values.  The values allowable for such a parameter can be found from
-       <structname>pg_settings</>.<structfield>enumvals</>.
+       <structname>pg_settings</structname>.<structfield>enumvals</structfield>.
        Enum parameter values are case-insensitive.
       </para>
      </listitem>
@@ -117,7 +117,7 @@
 
     <para>
      The most fundamental way to set these parameters is to edit the file
-     <filename>postgresql.conf</><indexterm><primary>postgresql.conf</></>,
+     <filename>postgresql.conf</filename><indexterm><primary>postgresql.conf</primary></indexterm>,
      which is normally kept in the data directory.  A default copy is
      installed when the database cluster directory is initialized.
      An example of what this file might look like is:
@@ -150,8 +150,8 @@ shared_buffers = 128MB
       <primary>SIGHUP</primary>
      </indexterm>
      The configuration file is reread whenever the main server process
-     receives a <systemitem>SIGHUP</> signal; this signal is most easily
-     sent by running <literal>pg_ctl reload</> from the command line or by
+     receives a <systemitem>SIGHUP</systemitem> signal; this signal is most easily
+     sent by running <literal>pg_ctl reload</literal> from the command line or by
      calling the SQL function <function>pg_reload_conf()</function>. The main
      server process also propagates this signal to all currently running
      server processes, so that existing sessions also adopt the new values
@@ -161,26 +161,26 @@ shared_buffers = 128MB
      can only be set at server start; any changes to their entries in the
      configuration file will be ignored until the server is restarted.
      Invalid parameter settings in the configuration file are likewise
-     ignored (but logged) during <systemitem>SIGHUP</> processing.
+     ignored (but logged) during <systemitem>SIGHUP</systemitem> processing.
     </para>
 
     <para>
-     In addition to <filename>postgresql.conf</>,
+     In addition to <filename>postgresql.conf</filename>,
      a <productname>PostgreSQL</productname> data directory contains a file
-     <filename>postgresql.auto.conf</><indexterm><primary>postgresql.auto.conf</></>,
-     which has the same format as <filename>postgresql.conf</> but should
+     <filename>postgresql.auto.conf</filename><indexterm><primary>postgresql.auto.conf</primary></indexterm>,
+     which has the same format as <filename>postgresql.conf</filename> but should
      never be edited manually.  This file holds settings provided through
-     the <xref linkend="SQL-ALTERSYSTEM"> command.  This file is automatically
-     read whenever <filename>postgresql.conf</> is, and its settings take
-     effect in the same way.  Settings in <filename>postgresql.auto.conf</>
-     override those in <filename>postgresql.conf</>.
+     the <xref linkend="sql-altersystem"/> command.  This file is automatically
+     read whenever <filename>postgresql.conf</filename> is, and its settings take
+     effect in the same way.  Settings in <filename>postgresql.auto.conf</filename>
+     override those in <filename>postgresql.conf</filename>.
     </para>
 
     <para>
      The system view
      <link linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link>
      can be helpful for pre-testing changes to the configuration file, or for
-     diagnosing problems if a <systemitem>SIGHUP</> signal did not have the
+     diagnosing problems if a <systemitem>SIGHUP</systemitem> signal did not have the
      desired effects.
     </para>
    </sect2>
@@ -191,9 +191,9 @@ shared_buffers = 128MB
      <para>
       <productname>PostgreSQL</productname> provides three SQL
       commands to establish configuration defaults.
-      The already-mentioned <xref linkend="SQL-ALTERSYSTEM"> command
+      The already-mentioned <xref linkend="sql-altersystem"/> command
       provides a SQL-accessible means of changing global defaults; it is
-      functionally equivalent to editing <filename>postgresql.conf</>.
+      functionally equivalent to editing <filename>postgresql.conf</filename>.
       In addition, there are two commands that allow setting of defaults
       on a per-database or per-role basis:
      </para>
@@ -201,21 +201,21 @@ shared_buffers = 128MB
      <itemizedlist>
      <listitem>
       <para>
-       The <xref linkend="sql-alterdatabase"> command allows global
+       The <xref linkend="sql-alterdatabase"/> command allows global
        settings to be overridden on a per-database basis.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The <xref linkend="sql-alterrole"> command allows both global and
+       The <xref linkend="sql-alterrole"/> command allows both global and
        per-database settings to be overridden with user-specific values.
       </para>
      </listitem>
     </itemizedlist>
 
      <para>
-      Values set with <command>ALTER DATABASE</> and <command>ALTER ROLE</>
+      Values set with <command>ALTER DATABASE</command> and <command>ALTER ROLE</command>
       are applied only when starting a fresh database session.  They
       override values obtained from the configuration files or server
       command line, and constitute defaults for the rest of the session.
@@ -224,7 +224,7 @@ shared_buffers = 128MB
     </para>
 
      <para>
-      Once a client is connected to the database, <productname>PostgreSQL</>
+      Once a client is connected to the database, <productname>PostgreSQL</productname>
       provides two additional SQL commands (and equivalent functions) to
       interact with session-local configuration settings:
     </para>
@@ -232,7 +232,7 @@ shared_buffers = 128MB
     <itemizedlist>
      <listitem>
      <para>
-      The <xref linkend="SQL-SHOW"> command allows inspection of the
+      The <xref linkend="sql-show"/> command allows inspection of the
       current value of all parameters.  The corresponding function is
       <function>current_setting(setting_name text)</function>.
      </para>
@@ -240,7 +240,7 @@ shared_buffers = 128MB
 
      <listitem>
       <para>
-       The <xref linkend="SQL-SET"> command allows modification of the
+       The <xref linkend="sql-set"/> command allows modification of the
        current value of those parameters that can be set locally to a
        session; it has no effect on other sessions.
        The corresponding function is
@@ -251,14 +251,14 @@ shared_buffers = 128MB
 
     <para>
      In addition, the system view <link
-     linkend="view-pg-settings"><structname>pg_settings</></> can be
+     linkend="view-pg-settings"><structname>pg_settings</structname></link> can be
      used to view and change session-local values:
     </para>
 
     <itemizedlist>
      <listitem>
       <para>
-       Querying this view is similar to using <command>SHOW ALL</> but
+       Querying this view is similar to using <command>SHOW ALL</command> but
        provides more detail.  It is also more flexible, since it's possible
        to specify filter conditions or join against other relations.
       </para>
@@ -266,9 +266,9 @@ shared_buffers = 128MB
 
      <listitem>
       <para>
-       Using <xref linkend="SQL-UPDATE"> on this view, specifically
-       updating the <structname>setting</> column, is the equivalent
-       of issuing <command>SET</> commands.  For example, the equivalent of
+       Using <xref linkend="sql-update"/> on this view, specifically
+       updating the <structname>setting</structname> column, is the equivalent
+       of issuing <command>SET</command> commands.  For example, the equivalent of
 <programlisting>
 SET configuration_parameter TO DEFAULT;
 </programlisting>
@@ -289,7 +289,7 @@ UPDATE pg_settings SET setting = reset_val WHERE name = 'configuration_parameter
       In addition to setting global defaults or attaching
       overrides at the database or role level, you can pass settings to
       <productname>PostgreSQL</productname> via shell facilities.
-      Both the server and <application>libpq</> client library
+      Both the server and <application>libpq</application> client library
       accept parameter values via the shell.
      </para>
 
@@ -298,26 +298,26 @@ UPDATE pg_settings SET setting = reset_val WHERE name = 'configuration_parameter
       <para>
        During server startup, parameter settings can be
        passed to the <command>postgres</command> command via the
-       <option>-c</> command-line parameter.  For example,
+       <option>-c</option> command-line parameter.  For example,
 <programlisting>
 postgres -c log_connections=yes -c log_destination='syslog'
 </programlisting>
        Settings provided in this way override those set via
-       <filename>postgresql.conf</> or <command>ALTER SYSTEM</>,
+       <filename>postgresql.conf</filename> or <command>ALTER SYSTEM</command>,
        so they cannot be changed globally without restarting the server.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When starting a client session via <application>libpq</>,
+      When starting a client session via <application>libpq</application>,
       parameter settings can be
       specified using the <envar>PGOPTIONS</envar> environment variable.
       Settings established in this way constitute defaults for the life
       of the session, but do not affect other sessions.
       For historical reasons, the format of <envar>PGOPTIONS</envar> is
       similar to that used when launching the <command>postgres</command>
-      command; specifically, the <option>-c</> flag must be specified.
+      command; specifically, the <option>-c</option> flag must be specified.
       For example,
 <programlisting>
 env PGOPTIONS="-c geqo=off -c statement_timeout=5min" psql
@@ -338,20 +338,20 @@ env PGOPTIONS="-c geqo=off -c statement_timeout=5min" psql
     <title>Managing Configuration File Contents</title>
 
      <para>
-      <productname>PostgreSQL</> provides several features for breaking
-      down complex <filename>postgresql.conf</> files into sub-files.
+      <productname>PostgreSQL</productname> provides several features for breaking
+      down complex <filename>postgresql.conf</filename> files into sub-files.
       These features are especially useful when managing multiple servers
       with related, but not identical, configurations.
      </para>
 
      <para>
       <indexterm>
-       <primary><literal>include</></primary>
+       <primary><literal>include</literal></primary>
        <secondary>in configuration file</secondary>
       </indexterm>
       In addition to individual parameter settings,
-      the <filename>postgresql.conf</> file can contain <firstterm>include
-      directives</>, which specify another file to read and process as if
+      the <filename>postgresql.conf</filename> file can contain <firstterm>include
+      directives</firstterm>, which specify another file to read and process as if
       it were inserted into the configuration file at this point.  This
       feature allows a configuration file to be divided into physically
       separate parts.  Include directives simply look like:
@@ -365,23 +365,23 @@ include 'filename'
 
      <para>
       <indexterm>
-       <primary><literal>include_if_exists</></primary>
+       <primary><literal>include_if_exists</literal></primary>
        <secondary>in configuration file</secondary>
       </indexterm>
-      There is also an <literal>include_if_exists</> directive, which acts
-      the same as the <literal>include</> directive, except
+      There is also an <literal>include_if_exists</literal> directive, which acts
+      the same as the <literal>include</literal> directive, except
       when the referenced file does not exist or cannot be read.  A regular
-      <literal>include</> will consider this an error condition, but
-      <literal>include_if_exists</> merely logs a message and continues
+      <literal>include</literal> will consider this an error condition, but
+      <literal>include_if_exists</literal> merely logs a message and continues
       processing the referencing configuration file.
      </para>
 
      <para>
       <indexterm>
-       <primary><literal>include_dir</></primary>
+       <primary><literal>include_dir</literal></primary>
        <secondary>in configuration file</secondary>
       </indexterm>
-      The <filename>postgresql.conf</> file can also contain
+      The <filename>postgresql.conf</filename> file can also contain
       <literal>include_dir</literal> directives, which specify an entire
       directory of configuration files to include.  These look like
 <programlisting>
@@ -401,36 +401,36 @@ include_dir 'directory'
      <para>
       Include files or directories can be used to logically separate portions
       of the database configuration, rather than having a single large
-      <filename>postgresql.conf</> file.  Consider a company that has two
+      <filename>postgresql.conf</filename> file.  Consider a company that has two
       database servers, each with a different amount of memory.  There are
       likely elements of the configuration both will share, for things such
       as logging.  But memory-related parameters on the server will vary
       between the two.  And there might be server specific customizations,
       too.  One way to manage this situation is to break the custom
       configuration changes for your site into three files.  You could add
-      this to the end of your <filename>postgresql.conf</> file to include
+      this to the end of your <filename>postgresql.conf</filename> file to include
       them:
 <programlisting>
 include 'shared.conf'
 include 'memory.conf'
 include 'server.conf'
 </programlisting>
-      All systems would have the same <filename>shared.conf</>.  Each
+      All systems would have the same <filename>shared.conf</filename>.  Each
       server with a particular amount of memory could share the
-      same <filename>memory.conf</>; you might have one for all servers
+      same <filename>memory.conf</filename>; you might have one for all servers
       with 8GB of RAM, another for those having 16GB.  And
-      finally <filename>server.conf</> could have truly server-specific
+      finally <filename>server.conf</filename> could have truly server-specific
       configuration information in it.
      </para>
 
      <para>
       Another possibility is to create a configuration file directory and
-      put this information into files there. For example, a <filename>conf.d</>
-      directory could be referenced at the end of <filename>postgresql.conf</>:
+      put this information into files there. For example, a <filename>conf.d</filename>
+      directory could be referenced at the end of <filename>postgresql.conf</filename>:
 <programlisting>
 include_dir 'conf.d'
 </programlisting>
-      Then you could name the files in the <filename>conf.d</> directory
+      Then you could name the files in the <filename>conf.d</filename> directory
       like this:
 <programlisting>
 00shared.conf
@@ -441,8 +441,8 @@ include_dir 'conf.d'
        files will be loaded.  This is important because only the last
        setting encountered for a particular parameter while the server is
        reading configuration files will be used.  In this example,
-       something set in <filename>conf.d/02server.conf</> would override a
-       value set in <filename>conf.d/01memory.conf</>.
+       something set in <filename>conf.d/02server.conf</filename> would override a
+       value set in <filename>conf.d/01memory.conf</filename>.
      </para>
 
      <para>
@@ -470,7 +470,7 @@ include_dir 'conf.d'
       already mentioned, <productname>PostgreSQL</productname> uses
       two other manually-edited configuration files, which control
       client authentication (their use is discussed in <xref
-      linkend="client-authentication">).  By default, all three
+      linkend="client-authentication"/>).  By default, all three
       configuration files are stored in the database cluster's data
       directory.  The parameters described in this section allow the
       configuration files to be placed elsewhere.  (Doing so can ease
@@ -483,7 +483,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-data-directory" xreflabel="data_directory">
       <term><varname>data_directory</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>data_directory</> configuration parameter</primary>
+       <primary><varname>data_directory</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -497,13 +497,13 @@ include_dir 'conf.d'
      <varlistentry id="guc-config-file" xreflabel="config_file">
       <term><varname>config_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>config_file</> configuration parameter</primary>
+       <primary><varname>config_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
          Specifies the main server configuration file
-         (customarily called <filename>postgresql.conf</>).
+         (customarily called <filename>postgresql.conf</filename>).
          This parameter can only be set on the <command>postgres</command> command line.
        </para>
       </listitem>
@@ -512,13 +512,13 @@ include_dir 'conf.d'
      <varlistentry id="guc-hba-file" xreflabel="hba_file">
       <term><varname>hba_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>hba_file</> configuration parameter</primary>
+       <primary><varname>hba_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
          Specifies the configuration file for host-based authentication
-         (customarily called <filename>pg_hba.conf</>).
+         (customarily called <filename>pg_hba.conf</filename>).
          This parameter can only be set at server start.
        </para>
       </listitem>
@@ -527,15 +527,15 @@ include_dir 'conf.d'
      <varlistentry id="guc-ident-file" xreflabel="ident_file">
       <term><varname>ident_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ident_file</> configuration parameter</primary>
+       <primary><varname>ident_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
          Specifies the configuration file for user name mapping
-         (customarily called <filename>pg_ident.conf</>).
+         (customarily called <filename>pg_ident.conf</filename>).
          This parameter can only be set at server start.
-         See also <xref linkend="auth-username-maps">.
+         See also <xref linkend="auth-username-maps"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -543,7 +543,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-external-pid-file" xreflabel="external_pid_file">
       <term><varname>external_pid_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>external_pid_file</> configuration parameter</primary>
+       <primary><varname>external_pid_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -569,10 +569,10 @@ include_dir 'conf.d'
       data directory, the <command>postgres</command> <option>-D</option>
       command-line option or <envar>PGDATA</envar> environment variable
       must point to the directory containing the configuration files,
-      and the <varname>data_directory</> parameter must be set in
+      and the <varname>data_directory</varname> parameter must be set in
       <filename>postgresql.conf</filename> (or on the command line) to show
       where the data directory is actually located.  Notice that
-      <varname>data_directory</> overrides <option>-D</option> and
+      <varname>data_directory</varname> overrides <option>-D</option> and
       <envar>PGDATA</envar> for the location
       of the data directory, but not for the location of the configuration
       files.
@@ -580,12 +580,12 @@ include_dir 'conf.d'
 
      <para>
       If you wish, you can specify the configuration file names and locations
-      individually using the parameters <varname>config_file</>,
-      <varname>hba_file</> and/or <varname>ident_file</>.
-      <varname>config_file</> can only be specified on the
+      individually using the parameters <varname>config_file</varname>,
+      <varname>hba_file</varname> and/or <varname>ident_file</varname>.
+      <varname>config_file</varname> can only be specified on the
       <command>postgres</command> command line, but the others can be
       set within the main configuration file.  If all three parameters plus
-      <varname>data_directory</> are explicitly set, then it is not necessary
+      <varname>data_directory</varname> are explicitly set, then it is not necessary
       to specify <option>-D</option> or <envar>PGDATA</envar>.
      </para>
 
@@ -607,7 +607,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-listen-addresses" xreflabel="listen_addresses">
       <term><varname>listen_addresses</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>listen_addresses</> configuration parameter</primary>
+       <primary><varname>listen_addresses</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -615,17 +615,17 @@ include_dir 'conf.d'
          Specifies the TCP/IP address(es) on which the server is
          to listen for connections from client applications.
          The value takes the form of a comma-separated list of host names
-         and/or numeric IP addresses.  The special entry <literal>*</>
+         and/or numeric IP addresses.  The special entry <literal>*</literal>
          corresponds to all available IP interfaces.  The entry
-         <literal>0.0.0.0</> allows listening for all IPv4 addresses and
-         <literal>::</> allows listening for all IPv6 addresses.
+         <literal>0.0.0.0</literal> allows listening for all IPv4 addresses and
+         <literal>::</literal> allows listening for all IPv6 addresses.
          If the list is empty, the server does not listen on any IP interface
          at all, in which case only Unix-domain sockets can be used to connect
          to it.
-         The default value is <systemitem class="systemname">localhost</>,
-         which allows only local TCP/IP <quote>loopback</> connections to be
+         The default value is <systemitem class="systemname">localhost</systemitem>,
+         which allows only local TCP/IP <quote>loopback</quote> connections to be
          made.  While client authentication (<xref
-         linkend="client-authentication">) allows fine-grained control
+         linkend="client-authentication"/>) allows fine-grained control
          over who can access the server, <varname>listen_addresses</varname>
          controls which interfaces accept connection attempts, which
          can help prevent repeated malicious connection requests on
@@ -638,7 +638,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-port" xreflabel="port">
       <term><varname>port</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>port</> configuration parameter</primary>
+       <primary><varname>port</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -653,7 +653,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-max-connections" xreflabel="max_connections">
       <term><varname>max_connections</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_connections</> configuration parameter</primary>
+       <primary><varname>max_connections</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -661,7 +661,7 @@ include_dir 'conf.d'
         Determines the maximum number of concurrent connections to the
         database server. The default is typically 100 connections, but
         might be less if your kernel settings will not support it (as
-        determined during <application>initdb</>).  This parameter can
+        determined during <application>initdb</application>).  This parameter can
         only be set at server start.
        </para>
 
@@ -678,17 +678,17 @@ include_dir 'conf.d'
       <term><varname>superuser_reserved_connections</varname>
       (<type>integer</type>)
       <indexterm>
-       <primary><varname>superuser_reserved_connections</> configuration parameter</primary>
+       <primary><varname>superuser_reserved_connections</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Determines the number of connection <quote>slots</quote> that
-        are reserved for connections by <productname>PostgreSQL</>
-        superusers.  At most <xref linkend="guc-max-connections">
+        are reserved for connections by <productname>PostgreSQL</productname>
+        superusers.  At most <xref linkend="guc-max-connections"/>
         connections can ever be active simultaneously.  Whenever the
         number of active concurrent connections is at least
-        <varname>max_connections</> minus
+        <varname>max_connections</varname> minus
         <varname>superuser_reserved_connections</varname>, new
         connections will be accepted only for superusers, and no
         new replication connections will be accepted.
@@ -705,7 +705,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-unix-socket-directories" xreflabel="unix_socket_directories">
       <term><varname>unix_socket_directories</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>unix_socket_directories</> configuration parameter</primary>
+       <primary><varname>unix_socket_directories</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -726,10 +726,10 @@ include_dir 'conf.d'
 
        <para>
         In addition to the socket file itself, which is named
-        <literal>.s.PGSQL.<replaceable>nnnn</></literal> where
-        <replaceable>nnnn</> is the server's port number, an ordinary file
-        named <literal>.s.PGSQL.<replaceable>nnnn</>.lock</literal> will be
-        created in each of the <varname>unix_socket_directories</> directories.
+        <literal>.s.PGSQL.<replaceable>nnnn</replaceable></literal> where
+        <replaceable>nnnn</replaceable> is the server's port number, an ordinary file
+        named <literal>.s.PGSQL.<replaceable>nnnn</replaceable>.lock</literal> will be
+        created in each of the <varname>unix_socket_directories</varname> directories.
         Neither file should ever be removed manually.
        </para>
 
@@ -743,7 +743,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-unix-socket-group" xreflabel="unix_socket_group">
       <term><varname>unix_socket_group</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>unix_socket_group</> configuration parameter</primary>
+       <primary><varname>unix_socket_group</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -768,7 +768,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-unix-socket-permissions" xreflabel="unix_socket_permissions">
       <term><varname>unix_socket_permissions</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>unix_socket_permissions</> configuration parameter</primary>
+       <primary><varname>unix_socket_permissions</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -794,7 +794,7 @@ include_dir 'conf.d'
 
        <para>
         This access control mechanism is independent of the one
-        described in <xref linkend="client-authentication">.
+        described in <xref linkend="client-authentication"/>.
        </para>
 
        <para>
@@ -804,7 +804,7 @@ include_dir 'conf.d'
        <para>
         This parameter is irrelevant on systems, notably Solaris as of Solaris
         10, that ignore socket permissions entirely.  There, one can achieve a
-        similar effect by pointing <varname>unix_socket_directories</> to a
+        similar effect by pointing <varname>unix_socket_directories</varname> to a
         directory having search permission limited to the desired audience.
         This parameter is also irrelevant on Windows, which does not have
         Unix-domain sockets.
@@ -815,7 +815,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-bonjour" xreflabel="bonjour">
       <term><varname>bonjour</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>bonjour</> configuration parameter</primary>
+       <primary><varname>bonjour</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -830,14 +830,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-bonjour-name" xreflabel="bonjour_name">
       <term><varname>bonjour_name</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>bonjour_name</> configuration parameter</primary>
+       <primary><varname>bonjour_name</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the <productname>Bonjour</productname> service
         name.  The computer name is used if this parameter is set to the
-        empty string <literal>''</> (which is the default).  This parameter is
+        empty string <literal>''</literal> (which is the default).  This parameter is
         ignored if the server was not compiled with
         <productname>Bonjour</productname> support.
         This parameter can only be set at server start.
@@ -848,7 +848,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-tcp-keepalives-idle" xreflabel="tcp_keepalives_idle">
       <term><varname>tcp_keepalives_idle</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>tcp_keepalives_idle</> configuration parameter</primary>
+       <primary><varname>tcp_keepalives_idle</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -857,7 +857,7 @@ include_dir 'conf.d'
         should send a keepalive message to the client.  A value of 0 uses
         the system default.
         This parameter is supported only on systems that support
-        <symbol>TCP_KEEPIDLE</> or an equivalent socket option, and on
+        <symbol>TCP_KEEPIDLE</symbol> or an equivalent socket option, and on
         Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
@@ -874,7 +874,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-tcp-keepalives-interval" xreflabel="tcp_keepalives_interval">
       <term><varname>tcp_keepalives_interval</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>tcp_keepalives_interval</> configuration parameter</primary>
+       <primary><varname>tcp_keepalives_interval</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -883,7 +883,7 @@ include_dir 'conf.d'
         that is not acknowledged by the client should be retransmitted.
         A value of 0 uses the system default.
         This parameter is supported only on systems that support
-        <symbol>TCP_KEEPINTVL</> or an equivalent socket option, and on
+        <symbol>TCP_KEEPINTVL</symbol> or an equivalent socket option, and on
         Windows; on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
@@ -900,7 +900,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-tcp-keepalives-count" xreflabel="tcp_keepalives_count">
       <term><varname>tcp_keepalives_count</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>tcp_keepalives_count</> configuration parameter</primary>
+       <primary><varname>tcp_keepalives_count</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -909,7 +909,7 @@ include_dir 'conf.d'
         the server's connection to the client is considered dead.
         A value of 0 uses the system default.
         This parameter is supported only on systems that support
-        <symbol>TCP_KEEPCNT</> or an equivalent socket option;
+        <symbol>TCP_KEEPCNT</symbol> or an equivalent socket option;
         on other systems, it must be zero.
         In sessions connected via a Unix-domain socket, this parameter is
         ignored and always reads as zero.
@@ -924,16 +924,17 @@ include_dir 'conf.d'
 
      </variablelist>
      </sect2>
-     <sect2 id="runtime-config-connection-security">
-     <title>Security and Authentication</title>
+
+     <sect2 id="runtime-config-connection-authentication">
+     <title>Authentication</title>
 
      <variablelist>
      <varlistentry id="guc-authentication-timeout" xreflabel="authentication_timeout">
       <term><varname>authentication_timeout</varname> (<type>integer</type>)
-      <indexterm><primary>timeout</><secondary>client authentication</></indexterm>
-      <indexterm><primary>client authentication</><secondary>timeout during</></indexterm>
+      <indexterm><primary>timeout</primary><secondary>client authentication</secondary></indexterm>
+      <indexterm><primary>client authentication</primary><secondary>timeout during</secondary></indexterm>
       <indexterm>
-       <primary><varname>authentication_timeout</> configuration parameter</primary>
+       <primary><varname>authentication_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
 
@@ -943,26 +944,142 @@ include_dir 'conf.d'
         would-be client has not completed the authentication protocol in
         this much time, the server closes the connection. This prevents
         hung clients from occupying a connection indefinitely.
-        The default is one minute (<literal>1m</>).
-        This parameter can only be set in the <filename>postgresql.conf</>
+        The default is one minute (<literal>1m</literal>).
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
 
+     <varlistentry id="guc-password-encryption" xreflabel="password_encryption">
+      <term><varname>password_encryption</varname> (<type>enum</type>)
+      <indexterm>
+       <primary><varname>password_encryption</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        When a password is specified in <xref linkend="sql-createrole"/> or
+        <xref linkend="sql-alterrole"/>, this parameter determines the algorithm
+        to use to encrypt the password. The default value is <literal>md5</literal>,
+        which stores the password as an MD5 hash (<literal>on</literal> is also
+        accepted, as alias for <literal>md5</literal>). Setting this parameter to
+        <literal>scram-sha-256</literal> will encrypt the password with SCRAM-SHA-256.
+       </para>
+       <para>
+        Note that older clients might lack support for the SCRAM authentication
+        mechanism, and hence not work with passwords encrypted with
+        SCRAM-SHA-256.  See <xref linkend="auth-password"/> for more details.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-krb-server-keyfile" xreflabel="krb_server_keyfile">
+      <term><varname>krb_server_keyfile</varname> (<type>string</type>)
+      <indexterm>
+       <primary><varname>krb_server_keyfile</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Sets the location of the Kerberos server key file. See
+        <xref linkend="gssapi-auth"/>
+        for details. This parameter can only be set in the
+        <filename>postgresql.conf</filename> file or on the server command line.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
+      <term><varname>krb_caseins_users</varname> (<type>boolean</type>)
+      <indexterm>
+       <primary><varname>krb_caseins_users</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Sets whether GSSAPI user names should be treated
+        case-insensitively.
+        The default is <literal>off</literal> (case sensitive). This parameter can only be
+        set in the <filename>postgresql.conf</filename> file or on the server command line.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace">
+      <term><varname>db_user_namespace</varname> (<type>boolean</type>)
+      <indexterm>
+       <primary><varname>db_user_namespace</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        This parameter enables per-database user names.  It is off by default.
+        This parameter can only be set in the <filename>postgresql.conf</filename>
+        file or on the server command line.
+       </para>
+
+       <para>
+        If this is on, you should create users as <replaceable>username@dbname</replaceable>.
+        When <replaceable>username</replaceable> is passed by a connecting client,
+        <literal>@</literal> and the database name are appended to the user
+        name and that database-specific user name is looked up by the
+        server. Note that when you create users with names containing
+        <literal>@</literal> within the SQL environment, you will need to
+        quote the user name.
+       </para>
+
+       <para>
+        With this parameter enabled, you can still create ordinary global
+        users.  Simply append <literal>@</literal> when specifying the user
+        name in the client, e.g. <literal>joe@</literal>.  The <literal>@</literal>
+        will be stripped off before the user name is looked up by the
+        server.
+       </para>
+
+       <para>
+        <varname>db_user_namespace</varname> causes the client's and
+        server's user name representation to differ.
+        Authentication checks are always done with the server's user name
+        so authentication methods must be configured for the
+        server's user name, not the client's.  Because
+        <literal>md5</literal> uses the user name as salt on both the
+        client and server, <literal>md5</literal> cannot be used with
+        <varname>db_user_namespace</varname>.
+       </para>
+
+       <note>
+        <para>
+         This feature is intended as a temporary measure until a
+         complete solution is found.  At that time, this option will
+         be removed.
+        </para>
+       </note>
+      </listitem>
+     </varlistentry>
+     </variablelist>
+     </sect2>
+
+     <sect2 id="runtime-config-connection-ssl">
+     <title>SSL</title>
+
+     <para>
+      See <xref linkend="ssl-tcp"/> for more information about setting up SSL.
+     </para>
+
+     <variablelist>
      <varlistentry id="guc-ssl" xreflabel="ssl">
       <term><varname>ssl</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>ssl</> configuration parameter</primary>
+       <primary><varname>ssl</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Enables <acronym>SSL</> connections. Please read
-        <xref linkend="ssl-tcp"> before using this.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        Enables <acronym>SSL</acronym> connections.
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
-        The default is <literal>off</>.
+        The default is <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -970,7 +1087,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-ca-file" xreflabel="ssl_ca_file">
       <term><varname>ssl_ca_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_ca_file</> configuration parameter</primary>
+       <primary><varname>ssl_ca_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -978,29 +1095,25 @@ include_dir 'conf.d'
         Specifies the name of the file containing the SSL server certificate
         authority (CA).
         Relative paths are relative to the data directory.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         The default is empty, meaning no CA file is loaded,
         and client certificate verification is not performed.
        </para>
-       <para>
-        In previous releases of PostgreSQL, the name of this file was
-        hard-coded as <filename>root.crt</filename>.
-       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry id="guc-ssl-cert-file" xreflabel="ssl_cert_file">
       <term><varname>ssl_cert_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_cert_file</> configuration parameter</primary>
+       <primary><varname>ssl_cert_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server certificate.
         Relative paths are relative to the data directory.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         The default is <filename>server.crt</filename>.
        </para>
@@ -1010,7 +1123,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-crl-file" xreflabel="ssl_crl_file">
       <term><varname>ssl_crl_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_crl_file</> configuration parameter</primary>
+       <primary><varname>ssl_crl_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -1018,28 +1131,24 @@ include_dir 'conf.d'
         Specifies the name of the file containing the SSL server certificate
         revocation list (CRL).
         Relative paths are relative to the data directory.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         The default is empty, meaning no CRL file is loaded.
        </para>
-       <para>
-        In previous releases of PostgreSQL, the name of this file was
-        hard-coded as <filename>root.crl</filename>.
-       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry id="guc-ssl-key-file" xreflabel="ssl_key_file">
       <term><varname>ssl_key_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_key_file</> configuration parameter</primary>
+       <primary><varname>ssl_key_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the name of the file containing the SSL server private key.
         Relative paths are relative to the data directory.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         The default is <filename>server.key</filename>.
        </para>
@@ -1049,19 +1158,19 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-ciphers" xreflabel="ssl_ciphers">
       <term><varname>ssl_ciphers</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_ciphers</> configuration parameter</primary>
+       <primary><varname>ssl_ciphers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Specifies a list of <acronym>SSL</> cipher suites that are allowed to be
+        Specifies a list of <acronym>SSL</acronym> cipher suites that are allowed to be
         used on secure connections.  See
-        the <citerefentry><refentrytitle>ciphers</></citerefentry> manual page
-        in the <application>OpenSSL</> package for the syntax of this setting
+        the <citerefentry><refentrytitle>ciphers</refentrytitle></citerefentry> manual page
+        in the <application>OpenSSL</application> package for the syntax of this setting
         and a list of supported values.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
-        The default value is <literal>HIGH:MEDIUM:+3DES:!aNULL</>.  The
+        The default value is <literal>HIGH:MEDIUM:+3DES:!aNULL</literal>.  The
         default is usually a reasonable choice unless you have specific
         security requirements.
        </para>
@@ -1073,7 +1182,7 @@ include_dir 'conf.d'
           <term><literal>HIGH</literal></term>
           <listitem>
            <para>
-            Cipher suites that use ciphers from <literal>HIGH</> group (e.g.,
+            Cipher suites that use ciphers from <literal>HIGH</literal> group (e.g.,
             AES, Camellia, 3DES)
            </para>
           </listitem>
@@ -1083,7 +1192,7 @@ include_dir 'conf.d'
           <term><literal>MEDIUM</literal></term>
           <listitem>
            <para>
-            Cipher suites that use ciphers from <literal>MEDIUM</> group
+            Cipher suites that use ciphers from <literal>MEDIUM</literal> group
             (e.g., RC4, SEED)
            </para>
           </listitem>
@@ -1093,11 +1202,11 @@ include_dir 'conf.d'
           <term><literal>+3DES</literal></term>
           <listitem>
            <para>
-            The OpenSSL default order for <literal>HIGH</> is problematic
+            The OpenSSL default order for <literal>HIGH</literal> is problematic
             because it orders 3DES higher than AES128.  This is wrong because
             3DES offers less security than AES128, and it is also much
-            slower.  <literal>+3DES</> reorders it after all other
-            <literal>HIGH</> and <literal>MEDIUM</> ciphers.
+            slower.  <literal>+3DES</literal> reorders it after all other
+            <literal>HIGH</literal> and <literal>MEDIUM</literal> ciphers.
            </para>
           </listitem>
          </varlistentry>
@@ -1119,7 +1228,7 @@ include_dir 'conf.d'
         Available cipher suite details will vary across OpenSSL versions.  Use
         the command
         <literal>openssl ciphers -v 'HIGH:MEDIUM:+3DES:!aNULL'</literal> to
-        see actual details for the currently installed <application>OpenSSL</>
+        see actual details for the currently installed <application>OpenSSL</application>
         version.  Note that this list is filtered at run time based on the
         server key type.
        </para>
@@ -1129,16 +1238,16 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-prefer-server-ciphers" xreflabel="ssl_prefer_server_ciphers">
       <term><varname>ssl_prefer_server_ciphers</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>ssl_prefer_server_ciphers</> configuration parameter</primary>
+       <primary><varname>ssl_prefer_server_ciphers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies whether to use the server's SSL cipher preferences, rather
         than the client's.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
-        The default is <literal>true</>.
+        The default is <literal>true</literal>.
        </para>
 
        <para>
@@ -1154,51 +1263,28 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-ecdh-curve" xreflabel="ssl_ecdh_curve">
       <term><varname>ssl_ecdh_curve</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_ecdh_curve</> configuration parameter</primary>
+       <primary><varname>ssl_ecdh_curve</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Specifies the name of the curve to use in <acronym>ECDH</> key
+        Specifies the name of the curve to use in <acronym>ECDH</acronym> key
         exchange.  It needs to be supported by all clients that connect.
         It does not need to be the same curve used by the server's Elliptic
         Curve key.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
-        The default is <literal>prime256v1</>.
+        The default is <literal>prime256v1</literal>.
        </para>
 
        <para>
         OpenSSL names for the most common curves are:
-        <literal>prime256v1</> (NIST P-256),
-        <literal>secp384r1</> (NIST P-384),
-        <literal>secp521r1</> (NIST P-521).
+        <literal>prime256v1</literal> (NIST P-256),
+        <literal>secp384r1</literal> (NIST P-384),
+        <literal>secp521r1</literal> (NIST P-521).
         The full list of available curves can be shown with the command
         <command>openssl ecparam -list_curves</command>.  Not all of them
-        are usable in <acronym>TLS</> though.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry id="guc-password-encryption" xreflabel="password_encryption">
-      <term><varname>password_encryption</varname> (<type>enum</type>)
-      <indexterm>
-       <primary><varname>password_encryption</> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        When a password is specified in <xref linkend="sql-createrole"> or
-        <xref linkend="sql-alterrole">, this parameter determines the algorithm
-        to use to encrypt the password. The default value is <literal>md5</>,
-        which stores the password as an MD5 hash (<literal>on</> is also
-        accepted, as alias for <literal>md5</>). Setting this parameter to
-        <literal>scram-sha-256</> will encrypt the password with SCRAM-SHA-256.
-       </para>
-       <para>
-        Note that older clients might lack support for the SCRAM authentication
-        mechanism, and hence not work with passwords encrypted with
-        SCRAM-SHA-256.
+        are usable in <acronym>TLS</acronym> though.
        </para>
       </listitem>
      </varlistentry>
@@ -1206,7 +1292,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-ssl-dh-params-file" xreflabel="ssl_dh_params_file">
       <term><varname>ssl_dh_params_file</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>ssl_dh_params_file</> configuration parameter</primary>
+       <primary><varname>ssl_dh_params_file</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -1221,96 +1307,11 @@ include_dir 'conf.d'
        </para>
 
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
-
-     <varlistentry id="guc-krb-server-keyfile" xreflabel="krb_server_keyfile">
-      <term><varname>krb_server_keyfile</varname> (<type>string</type>)
-      <indexterm>
-       <primary><varname>krb_server_keyfile</> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        Sets the location of the Kerberos server key file. See
-        <xref linkend="gssapi-auth">
-        for details. This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry id="guc-krb-caseins-users" xreflabel="krb_caseins_users">
-      <term><varname>krb_caseins_users</varname> (<type>boolean</type>)
-      <indexterm>
-       <primary><varname>krb_caseins_users</varname> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        Sets whether GSSAPI user names should be treated
-        case-insensitively.
-        The default is <literal>off</> (case sensitive). This parameter can only be
-        set in the <filename>postgresql.conf</> file or on the server command line.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry id="guc-db-user-namespace" xreflabel="db_user_namespace">
-      <term><varname>db_user_namespace</varname> (<type>boolean</type>)
-      <indexterm>
-       <primary><varname>db_user_namespace</> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        This parameter enables per-database user names.  It is off by default.
-        This parameter can only be set in the <filename>postgresql.conf</>
-        file or on the server command line.
-       </para>
-
-       <para>
-        If this is on, you should create users as <replaceable>username@dbname</>.
-        When <replaceable>username</> is passed by a connecting client,
-        <literal>@</> and the database name are appended to the user
-        name and that database-specific user name is looked up by the
-        server. Note that when you create users with names containing
-        <literal>@</> within the SQL environment, you will need to
-        quote the user name.
-       </para>
-
-       <para>
-        With this parameter enabled, you can still create ordinary global
-        users.  Simply append <literal>@</> when specifying the user
-        name in the client, e.g. <literal>joe@</>.  The <literal>@</>
-        will be stripped off before the user name is looked up by the
-        server.
-       </para>
-
-       <para>
-        <varname>db_user_namespace</> causes the client's and
-        server's user name representation to differ.
-        Authentication checks are always done with the server's user name
-        so authentication methods must be configured for the
-        server's user name, not the client's.  Because
-        <literal>md5</> uses the user name as salt on both the
-        client and server, <literal>md5</> cannot be used with
-        <varname>db_user_namespace</>.
-       </para>
-
-       <note>
-        <para>
-         This feature is intended as a temporary measure until a
-         complete solution is found.  At that time, this option will
-         be removed.
-        </para>
-       </note>
-      </listitem>
-     </varlistentry>
-
     </variablelist>
     </sect2>
    </sect1>
@@ -1325,15 +1326,15 @@ include_dir 'conf.d'
      <varlistentry id="guc-shared-buffers" xreflabel="shared_buffers">
       <term><varname>shared_buffers</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>shared_buffers</> configuration parameter</primary>
+       <primary><varname>shared_buffers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the amount of memory the database server uses for shared
         memory buffers.  The default is typically 128 megabytes
-        (<literal>128MB</>), but might be less if your kernel settings will
-        not support it (as determined during <application>initdb</>).
+        (<literal>128MB</literal>), but might be less if your kernel settings will
+        not support it (as determined during <application>initdb</application>).
         This setting must be at least 128 kilobytes.  (Non-default
         values of <symbol>BLCKSZ</symbol> change the minimum.)  However,
         settings significantly higher than the minimum are usually needed
@@ -1366,33 +1367,58 @@ include_dir 'conf.d'
      <varlistentry id="guc-huge-pages" xreflabel="huge_pages">
       <term><varname>huge_pages</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>huge_pages</> configuration parameter</primary>
+       <primary><varname>huge_pages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Enables/disables the use of huge memory pages. Valid values are
-        <literal>try</literal> (the default), <literal>on</literal>,
-        and <literal>off</literal>.
+        Controls whether huge pages are requested for the main shared memory
+        area. Valid values are <literal>try</literal> (the default),
+        <literal>on</literal>, and <literal>off</literal>.  With
+        <varname>huge_pages</varname> set to <literal>try</literal>, the
+        server will try to request huge pages, but fall back to the default if
+        that fails. With <literal>on</literal>, failure to request huge pages
+        will prevent the server from starting up. With <literal>off</literal>,
+        huge pages will not be requested.
        </para>
 
        <para>
-        At present, this feature is supported only on Linux. The setting is
-        ignored on other systems when set to <literal>try</literal>.
+        At present, this setting is supported only on Linux and Windows. The
+        setting is ignored on other systems when set to
+        <literal>try</literal>.
        </para>
 
        <para>
         The use of huge pages results in smaller page tables and less CPU time
-        spent on memory management, increasing performance. For more details,
-        see <xref linkend="linux-huge-pages">.
+        spent on memory management, increasing performance. For more details about
+        using huge pages on Linux, see <xref linkend="linux-huge-pages"/>.
+       </para>
+
+       <para>
+        Huge pages are known as large pages on Windows.  To use them, you need to
+        assign the user right Lock Pages in Memory to the Windows user account
+        that runs <productname>PostgreSQL</productname>.
+        You can use Windows Group Policy tool (gpedit.msc) to assign the user right
+        Lock Pages in Memory.
+        To start the database server on the command prompt as a standalone process,
+        not as a Windows service, the command prompt must be run as an administrator or
+        User Access Control (UAC) must be disabled. When the UAC is enabled, the normal
+        command prompt revokes the user right Lock Pages in Memory when started.
        </para>
 
        <para>
-        With <varname>huge_pages</varname> set to <literal>try</literal>,
-        the server will try to use huge pages, but fall back to using
-        normal allocation if that fails. With <literal>on</literal>, failure
-        to use huge pages will prevent the server from starting up. With
-        <literal>off</literal>, huge pages will not be used.
+        Note that this setting only affects the main shared memory area.
+        Operating systems such as Linux, FreeBSD, and Illumos can also use
+        huge pages (also known as <quote>super</quote> pages or
+        <quote>large</quote> pages) automatically for normal memory
+        allocation, without an explicit request from
+        <productname>PostgreSQL</productname>. On Linux, this is called
+        <quote>transparent huge pages</quote><indexterm><primary>transparent
+        huge pages</primary></indexterm> (THP). That feature has been known to
+        cause performance degradation with
+        <productname>PostgreSQL</productname> for some users on some Linux
+        versions, so its use is currently discouraged (unlike explicit use of
+        <varname>huge_pages</varname>).
        </para>
       </listitem>
      </varlistentry>
@@ -1400,7 +1426,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-temp-buffers" xreflabel="temp_buffers">
       <term><varname>temp_buffers</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>temp_buffers</> configuration parameter</primary>
+       <primary><varname>temp_buffers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -1408,7 +1434,7 @@ include_dir 'conf.d'
         Sets the maximum number of temporary buffers used by each database
         session.  These are session-local buffers used only for access to
         temporary tables.  The default is eight megabytes
-        (<literal>8MB</>).  The setting can be changed within individual
+        (<literal>8MB</literal>).  The setting can be changed within individual
         sessions, but only before the first use of temporary tables
         within the session; subsequent attempts to change the value will
         have no effect on that session.
@@ -1416,10 +1442,10 @@ include_dir 'conf.d'
 
        <para>
         A session will allocate temporary buffers as needed up to the limit
-        given by <varname>temp_buffers</>.  The cost of setting a large
+        given by <varname>temp_buffers</varname>.  The cost of setting a large
         value in sessions that do not actually need many temporary
         buffers is only a buffer descriptor, or about 64 bytes, per
-        increment in <varname>temp_buffers</>.  However if a buffer is
+        increment in <varname>temp_buffers</varname>.  However if a buffer is
         actually used an additional 8192 bytes will be consumed for it
         (or in general, <symbol>BLCKSZ</symbol> bytes).
        </para>
@@ -1429,14 +1455,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-max-prepared-transactions" xreflabel="max_prepared_transactions">
       <term><varname>max_prepared_transactions</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_prepared_transactions</> configuration parameter</primary>
+       <primary><varname>max_prepared_transactions</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the maximum number of transactions that can be in the
-        <quote>prepared</> state simultaneously (see <xref
-        linkend="sql-prepare-transaction">).
+        <quote>prepared</quote> state simultaneously (see <xref
+        linkend="sql-prepare-transaction"/>).
         Setting this parameter to zero (which is the default)
         disables the prepared-transaction feature.
         This parameter can only be set at server start.
@@ -1447,7 +1473,7 @@ include_dir 'conf.d'
         should be set to zero to prevent accidental creation of prepared
         transactions.  If you are using prepared transactions, you will
         probably want <varname>max_prepared_transactions</varname> to be at
-        least as large as <xref linkend="guc-max-connections">, so that every
+        least as large as <xref linkend="guc-max-connections"/>, so that every
         session can have a prepared transaction pending.
        </para>
 
@@ -1462,14 +1488,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-work-mem" xreflabel="work_mem">
       <term><varname>work_mem</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>work_mem</> configuration parameter</primary>
+       <primary><varname>work_mem</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the amount of memory to be used by internal sort operations
         and hash tables before writing to temporary disk files. The value
-        defaults to four megabytes (<literal>4MB</>).
+        defaults to four megabytes (<literal>4MB</literal>).
         Note that for a complex query, several sort or hash operations might be
         running in parallel; each operation will be allowed to use as much memory
         as this value specifies before it starts to write data into temporary
@@ -1477,10 +1503,10 @@ include_dir 'conf.d'
         concurrently.  Therefore, the total memory used could be many
         times the value of <varname>work_mem</varname>; it is necessary to
         keep this fact in mind when choosing the value. Sort operations are
-        used for <literal>ORDER BY</>, <literal>DISTINCT</>, and
+        used for <literal>ORDER BY</literal>, <literal>DISTINCT</literal>, and
         merge joins.
         Hash tables are used in hash joins, hash-based aggregation, and
-        hash-based processing of <literal>IN</> subqueries.
+        hash-based processing of <literal>IN</literal> subqueries.
        </para>
       </listitem>
      </varlistentry>
@@ -1488,15 +1514,15 @@ include_dir 'conf.d'
      <varlistentry id="guc-maintenance-work-mem" xreflabel="maintenance_work_mem">
       <term><varname>maintenance_work_mem</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>maintenance_work_mem</> configuration parameter</primary>
+       <primary><varname>maintenance_work_mem</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the maximum amount of memory to be used by maintenance
         operations, such as <command>VACUUM</command>, <command>CREATE
-        INDEX</>, and <command>ALTER TABLE ADD FOREIGN KEY</>.  It defaults
-        to 64 megabytes (<literal>64MB</>).  Since only one of these
+        INDEX</command>, and <command>ALTER TABLE ADD FOREIGN KEY</command>.  It defaults
+        to 64 megabytes (<literal>64MB</literal>).  Since only one of these
         operations can be executed at a time by a database session, and
         an installation normally doesn't have many of them running
         concurrently, it's safe to set this value significantly larger
@@ -1505,49 +1531,10 @@ include_dir 'conf.d'
        </para>
        <para>
         Note that when autovacuum runs, up to
-        <xref linkend="guc-autovacuum-max-workers"> times this memory
+        <xref linkend="guc-autovacuum-max-workers"/> times this memory
         may be allocated, so be careful not to set the default value
         too high.  It may be useful to control for this by separately
-        setting <xref linkend="guc-autovacuum-work-mem">.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry id="guc-replacement-sort-tuples" xreflabel="replacement_sort_tuples">
-      <term><varname>replacement_sort_tuples</varname> (<type>integer</type>)
-      <indexterm>
-       <primary><varname>replacement_sort_tuples</> configuration parameter</primary>
-      </indexterm>
-      </term>
-      <listitem>
-       <para>
-        When the number of tuples to be sorted is smaller than this number,
-        a sort will produce its first output run using replacement selection
-        rather than quicksort.  This may be useful in memory-constrained
-        environments where tuples that are input into larger sort operations
-        have a strong physical-to-logical correlation.  Note that this does
-        not include input tuples with an <emphasis>inverse</emphasis>
-        correlation.  It is possible for the replacement selection algorithm
-        to generate one long run that requires no merging, where use of the
-        default strategy would result in many runs that must be merged
-        to produce a final sorted output.  This may allow sort
-        operations to complete sooner.
-       </para>
-       <para>
-        The default is 150,000 tuples.  Note that higher values are typically
-        not much more effective, and may be counter-productive, since the
-        priority queue is sensitive to the size of available CPU cache, whereas
-        the default strategy sorts runs using a <firstterm>cache
-        oblivious</firstterm> algorithm.  This property allows the default sort
-        strategy to automatically and transparently make effective use
-        of available CPU cache.
-       </para>
-       <para>
-        Setting <varname>maintenance_work_mem</varname> to its default
-        value usually prevents utility command external sorts (e.g.,
-        sorts used by <command>CREATE INDEX</> to build B-Tree
-        indexes) from ever using replacement selection sort, unless the
-        input tuples are quite wide.
+        setting <xref linkend="guc-autovacuum-work-mem"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -1555,14 +1542,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-autovacuum-work-mem" xreflabel="autovacuum_work_mem">
       <term><varname>autovacuum_work_mem</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_work_mem</> configuration parameter</primary>
+       <primary><varname>autovacuum_work_mem</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the maximum amount of memory to be used by each
         autovacuum worker process.  It defaults to -1, indicating that
-        the value of <xref linkend="guc-maintenance-work-mem"> should
+        the value of <xref linkend="guc-maintenance-work-mem"/> should
         be used instead.  The setting has no effect on the behavior of
         <command>VACUUM</command> when run in other contexts.
        </para>
@@ -1572,26 +1559,26 @@ include_dir 'conf.d'
      <varlistentry id="guc-max-stack-depth" xreflabel="max_stack_depth">
       <term><varname>max_stack_depth</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_stack_depth</> configuration parameter</primary>
+       <primary><varname>max_stack_depth</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the maximum safe depth of the server's execution stack.
         The ideal setting for this parameter is the actual stack size limit
-        enforced by the kernel (as set by <literal>ulimit -s</> or local
+        enforced by the kernel (as set by <literal>ulimit -s</literal> or local
         equivalent), less a safety margin of a megabyte or so.  The safety
         margin is needed because the stack depth is not checked in every
         routine in the server, but only in key potentially-recursive routines
         such as expression evaluation.  The default setting is two
-        megabytes (<literal>2MB</>), which is conservatively small and
+        megabytes (<literal>2MB</literal>), which is conservatively small and
         unlikely to risk crashes.  However, it might be too small to allow
         execution of complex functions.  Only superusers can change this
         setting.
        </para>
 
        <para>
-        Setting <varname>max_stack_depth</> higher than
+        Setting <varname>max_stack_depth</varname> higher than
         the actual kernel limit will mean that a runaway recursive function
         can crash an individual backend process.  On platforms where
         <productname>PostgreSQL</productname> can determine the kernel limit,
@@ -1605,25 +1592,25 @@ include_dir 'conf.d'
      <varlistentry id="guc-dynamic-shared-memory-type" xreflabel="dynamic_shared_memory_type">
       <term><varname>dynamic_shared_memory_type</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>dynamic_shared_memory_type</> configuration parameter</primary>
+       <primary><varname>dynamic_shared_memory_type</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the dynamic shared memory implementation that the server
-        should use.  Possible values are <literal>posix</> (for POSIX shared
-        memory allocated using <literal>shm_open</>), <literal>sysv</literal>
-        (for System V shared memory allocated via <literal>shmget</>),
-        <literal>windows</> (for Windows shared memory), <literal>mmap</>
+        should use.  Possible values are <literal>posix</literal> (for POSIX shared
+        memory allocated using <literal>shm_open</literal>), <literal>sysv</literal>
+        (for System V shared memory allocated via <literal>shmget</literal>),
+        <literal>windows</literal> (for Windows shared memory), <literal>mmap</literal>
         (to simulate shared memory using memory-mapped files stored in the
-        data directory), and <literal>none</> (to disable this feature).
+        data directory), and <literal>none</literal> (to disable this feature).
         Not all values are supported on all platforms; the first supported
         option is the default for that platform.  The use of the
-        <literal>mmap</> option, which is not the default on any platform,
+        <literal>mmap</literal> option, which is not the default on any platform,
         is generally discouraged because the operating system may write
         modified pages back to disk repeatedly, increasing system I/O load;
         however, it may be useful for debugging, when the
-        <literal>pg_dynshmem</> directory is stored on a RAM disk, or when
+        <literal>pg_dynshmem</literal> directory is stored on a RAM disk, or when
         other shared memory facilities are not available.
        </para>
       </listitem>
@@ -1639,7 +1626,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-temp-file-limit" xreflabel="temp_file_limit">
       <term><varname>temp_file_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>temp_file_limit</> configuration parameter</primary>
+       <primary><varname>temp_file_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -1648,13 +1635,13 @@ include_dir 'conf.d'
         for temporary files, such as sort and hash temporary files, or the
         storage file for a held cursor.  A transaction attempting to exceed
         this limit will be canceled.
-        The value is specified in kilobytes, and <literal>-1</> (the
+        The value is specified in kilobytes, and <literal>-1</literal> (the
         default) means no limit.
         Only superusers can change this setting.
        </para>
        <para>
         This setting constrains the total space used at any instant by all
-        temporary files used by a given <productname>PostgreSQL</> process.
+        temporary files used by a given <productname>PostgreSQL</productname> process.
         It should be noted that disk space used for explicit temporary
         tables, as opposed to temporary files used behind-the-scenes in query
         execution, does <emphasis>not</emphasis> count against this limit.
@@ -1672,7 +1659,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-max-files-per-process" xreflabel="max_files_per_process">
       <term><varname>max_files_per_process</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_files_per_process</> configuration parameter</primary>
+       <primary><varname>max_files_per_process</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -1684,7 +1671,7 @@ include_dir 'conf.d'
         allow individual processes to open many more files than the system
         can actually support if many processes all try to open
         that many files. If you find yourself seeing <quote>Too many open
-        files</> failures, try reducing this setting.
+        files</quote> failures, try reducing this setting.
         This parameter can only be set at server start.
        </para>
       </listitem>
@@ -1696,8 +1683,8 @@ include_dir 'conf.d'
      <title>Cost-based Vacuum Delay</title>
 
      <para>
-      During the execution of <xref linkend="sql-vacuum">
-      and <xref linkend="sql-analyze">
+      During the execution of <xref linkend="sql-vacuum"/>
+      and <xref linkend="sql-analyze"/>
       commands, the system maintains an
       internal counter that keeps track of the estimated cost of the
       various I/O operations that are performed.  When the accumulated
@@ -1731,7 +1718,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-vacuum-cost-delay" xreflabel="vacuum_cost_delay">
        <term><varname>vacuum_cost_delay</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>vacuum_cost_delay</> configuration parameter</primary>
+        <primary><varname>vacuum_cost_delay</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1749,7 +1736,7 @@ include_dir 'conf.d'
 
         <para>
          When using cost-based vacuuming, appropriate values for
-         <varname>vacuum_cost_delay</> are usually quite small, perhaps
+         <varname>vacuum_cost_delay</varname> are usually quite small, perhaps
          10 or 20 milliseconds.  Adjusting vacuum's resource consumption
          is best done by changing the other vacuum cost parameters.
         </para>
@@ -1759,7 +1746,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-vacuum-cost-page-hit" xreflabel="vacuum_cost_page_hit">
        <term><varname>vacuum_cost_page_hit</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>vacuum_cost_page_hit</> configuration parameter</primary>
+        <primary><varname>vacuum_cost_page_hit</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1775,7 +1762,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-vacuum-cost-page-miss" xreflabel="vacuum_cost_page_miss">
        <term><varname>vacuum_cost_page_miss</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>vacuum_cost_page_miss</> configuration parameter</primary>
+        <primary><varname>vacuum_cost_page_miss</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1791,7 +1778,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-vacuum-cost-page-dirty" xreflabel="vacuum_cost_page_dirty">
        <term><varname>vacuum_cost_page_dirty</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>vacuum_cost_page_dirty</> configuration parameter</primary>
+        <primary><varname>vacuum_cost_page_dirty</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1807,7 +1794,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-vacuum-cost-limit" xreflabel="vacuum_cost_limit">
        <term><varname>vacuum_cost_limit</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>vacuum_cost_limit</> configuration parameter</primary>
+        <primary><varname>vacuum_cost_limit</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1839,8 +1826,8 @@ include_dir 'conf.d'
 
      <para>
       There is a separate server
-      process called the <firstterm>background writer</>, whose function
-      is to issue writes of <quote>dirty</> (new or modified) shared
+      process called the <firstterm>background writer</firstterm>, whose function
+      is to issue writes of <quote>dirty</quote> (new or modified) shared
       buffers.  It writes shared buffers so server processes handling
       user queries seldom or never need to wait for a write to occur.
       However, the background writer does cause a net overall
@@ -1855,7 +1842,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-bgwriter-delay" xreflabel="bgwriter_delay">
        <term><varname>bgwriter_delay</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>bgwriter_delay</> configuration parameter</primary>
+        <primary><varname>bgwriter_delay</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1863,16 +1850,16 @@ include_dir 'conf.d'
          Specifies the delay between activity rounds for the
          background writer.  In each round the writer issues writes
          for some number of dirty buffers (controllable by the
-         following parameters).  It then sleeps for <varname>bgwriter_delay</>
+         following parameters).  It then sleeps for <varname>bgwriter_delay</varname>
          milliseconds, and repeats.  When there are no dirty buffers in the
          buffer pool, though, it goes into a longer sleep regardless of
-         <varname>bgwriter_delay</>.  The default value is 200
-         milliseconds (<literal>200ms</>). Note that on many systems, the
+         <varname>bgwriter_delay</varname>.  The default value is 200
+         milliseconds (<literal>200ms</literal>). Note that on many systems, the
          effective resolution of sleep delays is 10 milliseconds; setting
-         <varname>bgwriter_delay</> to a value that is not a multiple of 10
+         <varname>bgwriter_delay</varname> to a value that is not a multiple of 10
          might have the same results as setting it to the next higher multiple
          of 10.  This parameter can only be set in the
-         <filename>postgresql.conf</> file or on the server command line.
+         <filename>postgresql.conf</filename> file or on the server command line.
         </para>
        </listitem>
       </varlistentry>
@@ -1880,7 +1867,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-bgwriter-lru-maxpages" xreflabel="bgwriter_lru_maxpages">
        <term><varname>bgwriter_lru_maxpages</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>bgwriter_lru_maxpages</> configuration parameter</primary>
+        <primary><varname>bgwriter_lru_maxpages</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1890,7 +1877,7 @@ include_dir 'conf.d'
          background writing.  (Note that checkpoints, which are managed by
          a separate, dedicated auxiliary process, are unaffected.)
          The default value is 100 buffers.
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
         </para>
        </listitem>
@@ -1899,7 +1886,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-bgwriter-lru-multiplier" xreflabel="bgwriter_lru_multiplier">
        <term><varname>bgwriter_lru_multiplier</varname> (<type>floating point</type>)
        <indexterm>
-        <primary><varname>bgwriter_lru_multiplier</> configuration parameter</primary>
+        <primary><varname>bgwriter_lru_multiplier</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1907,18 +1894,18 @@ include_dir 'conf.d'
          The number of dirty buffers written in each round is based on the
          number of new buffers that have been needed by server processes
          during recent rounds.  The average recent need is multiplied by
-         <varname>bgwriter_lru_multiplier</> to arrive at an estimate of the
+         <varname>bgwriter_lru_multiplier</varname> to arrive at an estimate of the
          number of buffers that will be needed during the next round.  Dirty
          buffers are written until there are that many clean, reusable buffers
-         available.  (However, no more than <varname>bgwriter_lru_maxpages</>
+         available.  (However, no more than <varname>bgwriter_lru_maxpages</varname>
          buffers will be written per round.)
-         Thus, a setting of 1.0 represents a <quote>just in time</> policy
+         Thus, a setting of 1.0 represents a <quote>just in time</quote> policy
          of writing exactly the number of buffers predicted to be needed.
          Larger values provide some cushion against spikes in demand,
          while smaller values intentionally leave writes to be done by
          server processes.
          The default is 2.0.
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
         </para>
        </listitem>
@@ -1927,7 +1914,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-bgwriter-flush-after" xreflabel="bgwriter_flush_after">
        <term><varname>bgwriter_flush_after</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>bgwriter_flush_after</> configuration parameter</primary>
+        <primary><varname>bgwriter_flush_after</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -1940,14 +1927,14 @@ include_dir 'conf.d'
          the OS writes data back in larger batches in the background.  Often
          that will result in greatly reduced transaction latency, but there
          also are some cases, especially with workloads that are bigger than
-         <xref linkend="guc-shared-buffers">, but smaller than the OS's page
+         <xref linkend="guc-shared-buffers"/>, but smaller than the OS's page
          cache, where performance might degrade.  This setting may have no
          effect on some platforms.  The valid range is between
          <literal>0</literal>, which disables forced writeback, and
-         <literal>2MB</literal>.  The default is <literal>512kB</> on Linux,
-         <literal>0</> elsewhere.  (If <symbol>BLCKSZ</symbol> is not 8kB,
+         <literal>2MB</literal>.  The default is <literal>512kB</literal> on Linux,
+         <literal>0</literal> elsewhere.  (If <symbol>BLCKSZ</symbol> is not 8kB,
          the default and maximum values scale proportionally to it.)
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
         </para>
        </listitem>
@@ -1970,15 +1957,15 @@ include_dir 'conf.d'
       <varlistentry id="guc-effective-io-concurrency" xreflabel="effective_io_concurrency">
        <term><varname>effective_io_concurrency</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>effective_io_concurrency</> configuration parameter</primary>
+        <primary><varname>effective_io_concurrency</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
         <para>
          Sets the number of concurrent disk I/O operations that
-         <productname>PostgreSQL</> expects can be executed
+         <productname>PostgreSQL</productname> expects can be executed
          simultaneously.  Raising this value will increase the number of I/O
-         operations that any individual <productname>PostgreSQL</> session
+         operations that any individual <productname>PostgreSQL</productname> session
          attempts to initiate in parallel.  The allowed range is 1 to 1000,
          or zero to disable issuance of asynchronous I/O requests. Currently,
          this setting only affects bitmap heap scans.
@@ -1998,7 +1985,7 @@ include_dir 'conf.d'
         </para>
 
         <para>
-         Asynchronous I/O depends on an effective <function>posix_fadvise</>
+         Asynchronous I/O depends on an effective <function>posix_fadvise</function>
          function, which some operating systems lack.  If the function is not
          present then setting this parameter to anything but zero will result
          in an error.  On some operating systems (e.g., Solaris), the function
@@ -2009,7 +1996,7 @@ include_dir 'conf.d'
          The default is 1 on supported systems, otherwise 0.  This value can
          be overridden for tables in a particular tablespace by setting the
          tablespace parameter of the same name (see
-         <xref linkend="sql-altertablespace">).
+         <xref linkend="sql-altertablespace"/>).
         </para>
        </listitem>
       </varlistentry>
@@ -2017,7 +2004,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-max-worker-processes" xreflabel="max_worker_processes">
        <term><varname>max_worker_processes</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>max_worker_processes</> configuration parameter</primary>
+        <primary><varname>max_worker_processes</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -2035,8 +2022,9 @@ include_dir 'conf.d'
 
         <para>
          When changing this value, consider also adjusting
-         <xref linkend="guc-max-parallel-workers"> and
-         <xref linkend="guc-max-parallel-workers-per-gather">.
+         <xref linkend="guc-max-parallel-workers"/>,
+         <xref linkend="guc-max-parallel-workers-maintenance"/>, and
+         <xref linkend="guc-max-parallel-workers-per-gather"/>.
         </para>
        </listitem>
       </varlistentry>
@@ -2044,7 +2032,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-max-parallel-workers-per-gather" xreflabel="max_parallel_workers_per_gather">
        <term><varname>max_parallel_workers_per_gather</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>max_parallel_workers_per_gather</> configuration parameter</primary>
+        <primary><varname>max_parallel_workers_per_gather</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -2052,8 +2040,8 @@ include_dir 'conf.d'
          Sets the maximum number of workers that can be started by a single
          <literal>Gather</literal> or <literal>Gather Merge</literal> node.
          Parallel workers are taken from the pool of processes established by
-         <xref linkend="guc-max-worker-processes">, limited by
-         <xref linkend="guc-max-parallel-workers">.  Note that the requested
+         <xref linkend="guc-max-worker-processes"/>, limited by
+         <xref linkend="guc-max-parallel-workers"/>.  Note that the requested
          number of workers may not actually be available at run time.  If this
          occurs, the plan will run with fewer workers than expected, which may
          be inefficient.  The default value is 2.  Setting this value to 0
@@ -2067,8 +2055,8 @@ include_dir 'conf.d'
          system as an additional user session.  This should be taken into
          account when choosing a value for this setting, as well as when
          configuring other settings that control resource utilization, such
-         as <xref linkend="guc-work-mem">.  Resource limits such as
-         <varname>work_mem</> are applied individually to each worker,
+         as <xref linkend="guc-work-mem"/>.  Resource limits such as
+         <varname>work_mem</varname> are applied individually to each worker,
          which means the total utilization may be much higher across all
          processes than it would normally be for any single process.
          For example, a parallel query using 4 workers may use up to 5 times
@@ -2078,7 +2066,45 @@ include_dir 'conf.d'
 
         <para>
          For more information on parallel query, see
-         <xref linkend="parallel-query">.
+         <xref linkend="parallel-query"/>.
+        </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry id="guc-max-parallel-workers-maintenance" xreflabel="max_parallel_maintenance_workers">
+       <term><varname>max_parallel_maintenance_workers</varname> (<type>integer</type>)
+       <indexterm>
+        <primary><varname>max_parallel_maintenance_workers</varname> configuration parameter</primary>
+       </indexterm>
+       </term>
+       <listitem>
+        <para>
+         Sets the maximum number of parallel workers that can be
+         started by a single utility command.  Currently, the only
+         parallel utility command that supports the use of parallel
+         workers is <command>CREATE INDEX</command>, and only when
+         building a B-tree index.  Parallel workers are taken from the
+         pool of processes established by <xref
+         linkend="guc-max-worker-processes"/>, limited by <xref
+         linkend="guc-max-parallel-workers"/>.  Note that the requested
+         number of workers may not actually be available at runtime.
+         If this occurs, the utility operation will run with fewer
+         workers than expected.  The default value is 2.  Setting this
+         value to 0 disables the use of parallel workers by utility
+         commands.
+        </para>
+
+        <para>
+         Note that parallel utility commands should not consume
+         substantially more memory than equivalent non-parallel
+         operations.  This strategy differs from that of parallel
+         query, where resource limits generally apply per worker
+         process.  Parallel utility commands treat the resource limit
+         <varname>maintenance_work_mem</varname> as a limit to be applied to
+         the entire utility command, regardless of the number of
+         parallel worker processes.  However, parallel utility
+         commands may still consume substantially more CPU resources
+         and I/O bandwidth.
         </para>
        </listitem>
       </varlistentry>
@@ -2086,17 +2112,18 @@ include_dir 'conf.d'
       <varlistentry id="guc-max-parallel-workers" xreflabel="max_parallel_workers">
        <term><varname>max_parallel_workers</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>max_parallel_workers</> configuration parameter</primary>
+        <primary><varname>max_parallel_workers</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
         <para>
          Sets the maximum number of workers that the system can support for
-         parallel queries.  The default value is 8.  When increasing or
+         parallel operations.  The default value is 8.  When increasing or
          decreasing this value, consider also adjusting
-         <xref linkend="guc-max-parallel-workers-per-gather">.
+         <xref linkend="guc-max-parallel-workers-maintenance"/> and
+         <xref linkend="guc-max-parallel-workers-per-gather"/>.
          Also, note that a setting for this value which is higher than
-         <xref linkend="guc-max-worker-processes"> will have no effect,
+         <xref linkend="guc-max-worker-processes"/> will have no effect,
          since parallel workers are taken from the pool of worker processes
          established by that setting.
         </para>
@@ -2106,7 +2133,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-backend-flush-after" xreflabel="backend_flush_after">
        <term><varname>backend_flush_after</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>backend_flush_after</> configuration parameter</primary>
+        <primary><varname>backend_flush_after</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -2119,11 +2146,11 @@ include_dir 'conf.d'
          checkpoint, or when the OS writes data back in larger batches in the
          background.  Often that will result in greatly reduced transaction
          latency, but there also are some cases, especially with workloads
-         that are bigger than <xref linkend="guc-shared-buffers">, but smaller
+         that are bigger than <xref linkend="guc-shared-buffers"/>, but smaller
          than the OS's page cache, where performance might degrade.  This
          setting may have no effect on some platforms.  The valid range is
          between <literal>0</literal>, which disables forced writeback,
-         and <literal>2MB</literal>.  The default is <literal>0</>, i.e., no
+         and <literal>2MB</literal>.  The default is <literal>0</literal>, i.e., no
          forced writeback.  (If <symbol>BLCKSZ</symbol> is not 8kB,
          the maximum value scales proportionally to it.)
         </para>
@@ -2133,13 +2160,13 @@ include_dir 'conf.d'
       <varlistentry id="guc-old-snapshot-threshold" xreflabel="old_snapshot_threshold">
        <term><varname>old_snapshot_threshold</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>old_snapshot_threshold</> configuration parameter</primary>
+        <primary><varname>old_snapshot_threshold</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
         <para>
          Sets the minimum time that a snapshot can be used without risk of a
-         <literal>snapshot too old</> error occurring when using the snapshot.
+         <literal>snapshot too old</literal> error occurring when using the snapshot.
          This parameter can only be set at server start.
         </para>
 
@@ -2154,12 +2181,12 @@ include_dir 'conf.d'
         </para>
 
         <para>
-         A value of <literal>-1</> disables this feature, and is the default.
+         A value of <literal>-1</literal> disables this feature, and is the default.
          Useful values for production work probably range from a small number
          of hours to a few days.  The setting will be coerced to a granularity
-         of minutes, and small numbers (such as <literal>0</> or
-         <literal>1min</>) are only allowed because they may sometimes be
-         useful for testing.  While a setting as high as <literal>60d</> is
+         of minutes, and small numbers (such as <literal>0</literal> or
+         <literal>1min</literal>) are only allowed because they may sometimes be
+         useful for testing.  While a setting as high as <literal>60d</literal> is
          allowed, please note that in many workloads extreme bloat or
          transaction ID wraparound may occur in much shorter time frames.
         </para>
@@ -2167,10 +2194,10 @@ include_dir 'conf.d'
         <para>
          When this feature is enabled, freed space at the end of a relation
          cannot be released to the operating system, since that could remove
-         information needed to detect the <literal>snapshot too old</>
+         information needed to detect the <literal>snapshot too old</literal>
          condition.  All space allocated to a relation remains associated with
          that relation for reuse only within that relation unless explicitly
-         freed (for example, with <command>VACUUM FULL</>).
+         freed (for example, with <command>VACUUM FULL</command>).
         </para>
 
         <para>
@@ -2182,7 +2209,7 @@ include_dir 'conf.d'
          Some tables cannot safely be vacuumed early, and so will not be
          affected by this setting, such as system catalogs.  For such tables
          this setting will neither reduce bloat nor create a possibility
-         of a <literal>snapshot too old</> error on scanning.
+         of a <literal>snapshot too old</literal> error on scanning.
         </para>
        </listitem>
       </varlistentry>
@@ -2195,7 +2222,7 @@ include_dir 'conf.d'
 
    <para>
     For additional information on tuning these settings,
-    see <xref linkend="wal-configuration">.
+    see <xref linkend="wal-configuration"/>.
    </para>
 
     <sect2 id="runtime-config-wal-settings">
@@ -2205,45 +2232,45 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-level" xreflabel="wal_level">
       <term><varname>wal_level</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>wal_level</> configuration parameter</primary>
+       <primary><varname>wal_level</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        <varname>wal_level</> determines how much information is written to
-        the WAL. The default value is <literal>replica</>, which writes enough
+        <varname>wal_level</varname> determines how much information is written to
+        the WAL. The default value is <literal>replica</literal>, which writes enough
         data to support WAL archiving and replication, including running
-        read-only queries on a standby server. <literal>minimal</> removes all
+        read-only queries on a standby server. <literal>minimal</literal> removes all
         logging except the information required to recover from a crash or
         immediate shutdown.  Finally,
-        <literal>logical</> adds information necessary to support logical
+        <literal>logical</literal> adds information necessary to support logical
         decoding.  Each level includes the information logged at all lower
         levels.  This parameter can only be set at server start.
        </para>
        <para>
-        In <literal>minimal</> level, WAL-logging of some bulk
+        In <literal>minimal</literal> level, WAL-logging of some bulk
         operations can be safely skipped, which can make those
-        operations much faster (see <xref linkend="populate-pitr">).
+        operations much faster (see <xref linkend="populate-pitr"/>).
         Operations in which this optimization can be applied include:
         <simplelist>
-         <member><command>CREATE TABLE AS</></member>
-         <member><command>CREATE INDEX</></member>
-         <member><command>CLUSTER</></member>
-         <member><command>COPY</> into tables that were created or truncated in the same
+         <member><command>CREATE TABLE AS</command></member>
+         <member><command>CREATE INDEX</command></member>
+         <member><command>CLUSTER</command></member>
+         <member><command>COPY</command> into tables that were created or truncated in the same
          transaction</member>
         </simplelist>
         But minimal WAL does not contain enough information to reconstruct the
-        data from a base backup and the WAL logs, so <literal>replica</> or
+        data from a base backup and the WAL logs, so <literal>replica</literal> or
         higher must be used to enable WAL archiving
-        (<xref linkend="guc-archive-mode">) and streaming replication.
+        (<xref linkend="guc-archive-mode"/>) and streaming replication.
        </para>
        <para>
-        In <literal>logical</> level, the same information is logged as
-        with <literal>replica</>, plus information needed to allow
+        In <literal>logical</literal> level, the same information is logged as
+        with <literal>replica</literal>, plus information needed to allow
         extracting logical change sets from the WAL. Using a level of
-        <literal>logical</> will increase the WAL volume, particularly if many
+        <literal>logical</literal> will increase the WAL volume, particularly if many
         tables are configured for <literal>REPLICA IDENTITY FULL</literal> and
-        many <command>UPDATE</> and <command>DELETE</> statements are
+        many <command>UPDATE</command> and <command>DELETE</command> statements are
         executed.
        </para>
        <para>
@@ -2257,15 +2284,15 @@ include_dir 'conf.d'
      <varlistentry id="guc-fsync" xreflabel="fsync">
       <term><varname>fsync</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>fsync</> configuration parameter</primary>
+       <primary><varname>fsync</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        If this parameter is on, the <productname>PostgreSQL</> server
+        If this parameter is on, the <productname>PostgreSQL</productname> server
         will try to make sure that updates are physically written to
-        disk, by issuing <function>fsync()</> system calls or various
-        equivalent methods (see <xref linkend="guc-wal-sync-method">).
+        disk, by issuing <function>fsync()</function> system calls or various
+        equivalent methods (see <xref linkend="guc-wal-sync-method"/>).
         This ensures that the database cluster can recover to a
         consistent state after an operating system or hardware crash.
        </para>
@@ -2296,22 +2323,22 @@ include_dir 'conf.d'
         off to on, it is necessary to force all modified buffers in the
         kernel to durable storage.  This can be done while the cluster
         is shutdown or while <varname>fsync</varname> is on by running <command>initdb
-        --sync-only</command>, running <command>sync</>, unmounting the
+        --sync-only</command>, running <command>sync</command>, unmounting the
         file system, or rebooting the server.
        </para>
 
        <para>
-        In many situations, turning off <xref linkend="guc-synchronous-commit">
+        In many situations, turning off <xref linkend="guc-synchronous-commit"/>
         for noncritical transactions can provide much of the potential
         performance benefit of turning off <varname>fsync</varname>, without
         the attendant risks of data corruption.
        </para>
 
        <para>
-        <varname>fsync</varname> can only be set in the <filename>postgresql.conf</>
+        <varname>fsync</varname> can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         If you turn this parameter off, also consider turning off
-        <xref linkend="guc-full-page-writes">.
+        <xref linkend="guc-full-page-writes"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -2319,60 +2346,60 @@ include_dir 'conf.d'
      <varlistentry id="guc-synchronous-commit" xreflabel="synchronous_commit">
       <term><varname>synchronous_commit</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>synchronous_commit</> configuration parameter</primary>
+       <primary><varname>synchronous_commit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies whether transaction commit will wait for WAL records
-        to be written to disk before the command returns a <quote>success</>
-        indication to the client.  Valid values are <literal>on</>,
-        <literal>remote_apply</>, <literal>remote_write</>, <literal>local</>,
-        and <literal>off</>.  The default, and safe, setting
-        is <literal>on</>.  When <literal>off</>, there can be a delay between
+        to be written to disk before the command returns a <quote>success</quote>
+        indication to the client.  Valid values are <literal>on</literal>,
+        <literal>remote_apply</literal>, <literal>remote_write</literal>, <literal>local</literal>,
+        and <literal>off</literal>.  The default, and safe, setting
+        is <literal>on</literal>.  When <literal>off</literal>, there can be a delay between
         when success is reported to the client and when the transaction is
         really guaranteed to be safe against a server crash.  (The maximum
-        delay is three times <xref linkend="guc-wal-writer-delay">.)  Unlike
-        <xref linkend="guc-fsync">, setting this parameter to <literal>off</>
+        delay is three times <xref linkend="guc-wal-writer-delay"/>.)  Unlike
+        <xref linkend="guc-fsync"/>, setting this parameter to <literal>off</literal>
         does not create any risk of database inconsistency: an operating
         system or database crash might
         result in some recent allegedly-committed transactions being lost, but
         the database state will be just the same as if those transactions had
-        been aborted cleanly.  So, turning <varname>synchronous_commit</> off
+        been aborted cleanly.  So, turning <varname>synchronous_commit</varname> off
         can be a useful alternative when performance is more important than
         exact certainty about the durability of a transaction.  For more
-        discussion see <xref linkend="wal-async-commit">.
+        discussion see <xref linkend="wal-async-commit"/>.
        </para>
        <para>
-        If <xref linkend="guc-synchronous-standby-names"> is non-empty, this
+        If <xref linkend="guc-synchronous-standby-names"/> is non-empty, this
         parameter also controls whether or not transaction commits will wait
         for their WAL records to be replicated to the standby server(s).
-        When set to <literal>on</>, commits will wait until replies
+        When set to <literal>on</literal>, commits will wait until replies
         from the current synchronous standby(s) indicate they have received
         the commit record of the transaction and flushed it to disk.  This
         ensures the transaction will not be lost unless both the primary and
         all synchronous standbys suffer corruption of their database storage.
-        When set to <literal>remote_apply</>, commits will wait until replies
+        When set to <literal>remote_apply</literal>, commits will wait until replies
         from the current synchronous standby(s) indicate they have received the
         commit record of the transaction and applied it, so that it has become
         visible to queries on the standby(s).
-        When set to <literal>remote_write</>, commits will wait until replies
+        When set to <literal>remote_write</literal>, commits will wait until replies
         from the current synchronous standby(s) indicate they have
         received the commit record of the transaction and written it out to
         their operating system. This setting is sufficient to
         ensure data preservation even if a standby instance of
-        <productname>PostgreSQL</> were to crash, but not if the standby
+        <productname>PostgreSQL</productname> were to crash, but not if the standby
         suffers an operating-system-level crash, since the data has not
         necessarily reached stable storage on the standby.
-        Finally, the setting <literal>local</> causes commits to wait for
+        Finally, the setting <literal>local</literal> causes commits to wait for
         local flush to disk, but not for replication.  This is not usually
         desirable when synchronous replication is in use, but is provided for
         completeness.
        </para>
        <para>
-        If <varname>synchronous_standby_names</> is empty, the settings
-        <literal>on</>, <literal>remote_apply</>, <literal>remote_write</>
-        and <literal>local</> all provide the same synchronization level:
+        If <varname>synchronous_standby_names</varname> is empty, the settings
+        <literal>on</literal>, <literal>remote_apply</literal>, <literal>remote_write</literal>
+        and <literal>local</literal> all provide the same synchronization level:
         transaction commits only wait for local flush to disk.
        </para>
        <para>
@@ -2382,7 +2409,7 @@ include_dir 'conf.d'
         transactions commit synchronously and others asynchronously.
         For example, to make a single multistatement transaction commit
         asynchronously when the default is the opposite, issue <command>SET
-        LOCAL synchronous_commit TO OFF</> within the transaction.
+        LOCAL synchronous_commit TO OFF</command> within the transaction.
        </para>
       </listitem>
      </varlistentry>
@@ -2390,7 +2417,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-sync-method" xreflabel="wal_sync_method">
       <term><varname>wal_sync_method</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>wal_sync_method</> configuration parameter</primary>
+       <primary><varname>wal_sync_method</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -2403,41 +2430,41 @@ include_dir 'conf.d'
        <itemizedlist>
         <listitem>
         <para>
-         <literal>open_datasync</> (write WAL files with <function>open()</> option <symbol>O_DSYNC</>)
+         <literal>open_datasync</literal> (write WAL files with <function>open()</function> option <symbol>O_DSYNC</symbol>)
         </para>
         </listitem>
         <listitem>
         <para>
-         <literal>fdatasync</> (call <function>fdatasync()</> at each commit)
+         <literal>fdatasync</literal> (call <function>fdatasync()</function> at each commit)
         </para>
         </listitem>
         <listitem>
         <para>
-         <literal>fsync</> (call <function>fsync()</> at each commit)
+         <literal>fsync</literal> (call <function>fsync()</function> at each commit)
         </para>
         </listitem>
         <listitem>
         <para>
-         <literal>fsync_writethrough</> (call <function>fsync()</> at each commit, forcing write-through of any disk write cache)
+         <literal>fsync_writethrough</literal> (call <function>fsync()</function> at each commit, forcing write-through of any disk write cache)
         </para>
         </listitem>
         <listitem>
         <para>
-         <literal>open_sync</> (write WAL files with <function>open()</> option <symbol>O_SYNC</>)
+         <literal>open_sync</literal> (write WAL files with <function>open()</function> option <symbol>O_SYNC</symbol>)
         </para>
         </listitem>
        </itemizedlist>
        <para>
-        The <literal>open_</>* options also use <literal>O_DIRECT</> if available.
+        The <literal>open_</literal>* options also use <literal>O_DIRECT</literal> if available.
         Not all of these choices are available on all platforms.
         The default is the first method in the above list that is supported
-        by the platform, except that <literal>fdatasync</> is the default on
+        by the platform, except that <literal>fdatasync</literal> is the default on
         Linux.  The default is not necessarily ideal; it might be
         necessary to change this setting or other aspects of your system
         configuration in order to create a crash-safe configuration or
         achieve optimal performance.
-        These aspects are discussed in <xref linkend="wal-reliability">.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        These aspects are discussed in <xref linkend="wal-reliability"/>.
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2446,12 +2473,12 @@ include_dir 'conf.d'
      <varlistentry id="guc-full-page-writes" xreflabel="full_page_writes">
       <term><varname>full_page_writes</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>full_page_writes</> configuration parameter</primary>
+       <primary><varname>full_page_writes</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When this parameter is on, the <productname>PostgreSQL</> server
+        When this parameter is on, the <productname>PostgreSQL</productname> server
         writes the entire content of each disk page to WAL during the
         first modification of that page after a checkpoint.
         This is needed because
@@ -2479,13 +2506,13 @@ include_dir 'conf.d'
        <para>
         Turning off this parameter does not affect use of
         WAL archiving for point-in-time recovery (PITR)
-        (see <xref linkend="continuous-archiving">).
+        (see <xref linkend="continuous-archiving"/>).
        </para>
 
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
-        The default is <literal>on</>.
+        The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -2493,12 +2520,12 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-log-hints" xreflabel="wal_log_hints">
       <term><varname>wal_log_hints</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>wal_log_hints</> configuration parameter</primary>
+       <primary><varname>wal_log_hints</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When this parameter is <literal>on</>, the <productname>PostgreSQL</>
+        When this parameter is <literal>on</literal>, the <productname>PostgreSQL</productname>
         server writes the entire content of each disk page to WAL during the
         first modification of that page after a checkpoint, even for
         non-critical modifications of so-called hint bits.
@@ -2512,7 +2539,7 @@ include_dir 'conf.d'
        </para>
 
        <para>
-        This parameter can only be set at server start. The default value is <literal>off</>.
+        This parameter can only be set at server start. The default value is <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -2520,16 +2547,16 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-compression" xreflabel="wal_compression">
       <term><varname>wal_compression</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>wal_compression</> configuration parameter</primary>
+       <primary><varname>wal_compression</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When this parameter is <literal>on</>, the <productname>PostgreSQL</>
+        When this parameter is <literal>on</literal>, the <productname>PostgreSQL</productname>
         server compresses a full page image written to WAL when
-        <xref linkend="guc-full-page-writes"> is on or during a base backup.
+        <xref linkend="guc-full-page-writes"/> is on or during a base backup.
         A compressed page image will be decompressed during WAL replay.
-        The default value is <literal>off</>.
+        The default value is <literal>off</literal>.
         Only superusers can change this setting.
        </para>
 
@@ -2545,14 +2572,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-buffers" xreflabel="wal_buffers">
       <term><varname>wal_buffers</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_buffers</> configuration parameter</primary>
+       <primary><varname>wal_buffers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         The amount of shared memory used for WAL data that has not yet been
         written to disk.  The default setting of -1 selects a size equal to
-        1/32nd (about 3%) of <xref linkend="guc-shared-buffers">, but not less
+        1/32nd (about 3%) of <xref linkend="guc-shared-buffers"/>, but not less
         than <literal>64kB</literal> nor more than the size of one WAL
         segment, typically <literal>16MB</literal>.  This value can be set
         manually if the automatic choice is too large or too small,
@@ -2577,24 +2604,24 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-writer-delay" xreflabel="wal_writer_delay">
       <term><varname>wal_writer_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_writer_delay</> configuration parameter</primary>
+       <primary><varname>wal_writer_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
       <para>
         Specifies how often the WAL writer flushes WAL. After flushing WAL it
-        sleeps for <varname>wal_writer_delay</> milliseconds, unless woken up
+        sleeps for <varname>wal_writer_delay</varname> milliseconds, unless woken up
         by an asynchronously committing transaction. If the last flush
-        happened less than <varname>wal_writer_delay</> milliseconds ago and
-        less than <varname>wal_writer_flush_after</> bytes of WAL have been
+        happened less than <varname>wal_writer_delay</varname> milliseconds ago and
+        less than <varname>wal_writer_flush_after</varname> bytes of WAL have been
         produced since, then WAL is only written to the operating system, not
         flushed to disk.
-        The default value is 200 milliseconds (<literal>200ms</>).  Note that
+        The default value is 200 milliseconds (<literal>200ms</literal>).  Note that
         on many systems, the effective resolution of sleep delays is 10
-        milliseconds; setting <varname>wal_writer_delay</> to a value that is
+        milliseconds; setting <varname>wal_writer_delay</varname> to a value that is
         not a multiple of 10 might have the same results as setting it to the
         next higher multiple of 10. This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
@@ -2602,19 +2629,19 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-writer-flush-after" xreflabel="wal_writer_flush_after">
       <term><varname>wal_writer_flush_after</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_writer_flush_after</> configuration parameter</primary>
+       <primary><varname>wal_writer_flush_after</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
       <para>
         Specifies how often the WAL writer flushes WAL. If the last flush
-        happened less than <varname>wal_writer_delay</> milliseconds ago and
-        less than <varname>wal_writer_flush_after</> bytes of WAL have been
+        happened less than <varname>wal_writer_delay</varname> milliseconds ago and
+        less than <varname>wal_writer_flush_after</varname> bytes of WAL have been
         produced since, then WAL is only written to the operating system, not
-        flushed to disk.  If <varname>wal_writer_flush_after</> is set
-        to <literal>0</> then WAL data is flushed immediately.  The default is
+        flushed to disk.  If <varname>wal_writer_flush_after</varname> is set
+        to <literal>0</literal> then WAL data is flushed immediately.  The default is
         <literal>1MB</literal>. This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
@@ -2622,7 +2649,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-commit-delay" xreflabel="commit_delay">
       <term><varname>commit_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>commit_delay</> configuration parameter</primary>
+       <primary><varname>commit_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -2639,15 +2666,15 @@ include_dir 'conf.d'
         <varname>commit_siblings</varname> other transactions are active
         when a flush is about to be initiated.  Also, no delays are
         performed if <varname>fsync</varname> is disabled.
-        The default <varname>commit_delay</> is zero (no delay).
+        The default <varname>commit_delay</varname> is zero (no delay).
         Only superusers can change this setting.
        </para>
        <para>
-        In <productname>PostgreSQL</> releases prior to 9.3,
+        In <productname>PostgreSQL</productname> releases prior to 9.3,
         <varname>commit_delay</varname> behaved differently and was much
         less effective: it affected only commits, rather than all WAL flushes,
         and waited for the entire configured delay even if the WAL flush
-        was completed sooner.  Beginning in <productname>PostgreSQL</> 9.3,
+        was completed sooner.  Beginning in <productname>PostgreSQL</productname> 9.3,
         the first process that becomes ready to flush waits for the configured
         interval, while subsequent processes wait only until the leader
         completes the flush operation.
@@ -2658,13 +2685,13 @@ include_dir 'conf.d'
      <varlistentry id="guc-commit-siblings" xreflabel="commit_siblings">
       <term><varname>commit_siblings</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>commit_siblings</> configuration parameter</primary>
+       <primary><varname>commit_siblings</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Minimum number of concurrent open transactions to require
-        before performing the <varname>commit_delay</> delay. A larger
+        before performing the <varname>commit_delay</varname> delay. A larger
         value makes it more probable that at least one other
         transaction will become ready to commit during the delay
         interval. The default is five transactions.
@@ -2681,17 +2708,17 @@ include_dir 'conf.d'
      <varlistentry id="guc-checkpoint-timeout" xreflabel="checkpoint_timeout">
       <term><varname>checkpoint_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>checkpoint_timeout</> configuration parameter</primary>
+       <primary><varname>checkpoint_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Maximum time between automatic WAL checkpoints, in seconds.
         The valid range is between 30 seconds and one day.
-        The default is five minutes (<literal>5min</>).
+        The default is five minutes (<literal>5min</literal>).
         Increasing this parameter can increase the amount of time needed
         for crash recovery.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2700,14 +2727,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-checkpoint-completion-target" xreflabel="checkpoint_completion_target">
       <term><varname>checkpoint_completion_target</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>checkpoint_completion_target</> configuration parameter</primary>
+       <primary><varname>checkpoint_completion_target</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the target of checkpoint completion, as a fraction of
         total time between checkpoints. The default is 0.5.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2716,7 +2743,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-checkpoint-flush-after" xreflabel="checkpoint_flush_after">
       <term><varname>checkpoint_flush_after</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>checkpoint_flush_after</> configuration parameter</primary>
+       <primary><varname>checkpoint_flush_after</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -2729,14 +2756,14 @@ include_dir 'conf.d'
         checkpoint, or when the OS writes data back in larger batches in the
         background.  Often that will result in greatly reduced transaction
         latency, but there also are some cases, especially with workloads
-        that are bigger than <xref linkend="guc-shared-buffers">, but smaller
+        that are bigger than <xref linkend="guc-shared-buffers"/>, but smaller
         than the OS's page cache, where performance might degrade.  This
         setting may have no effect on some platforms.  The valid range is
         between <literal>0</literal>, which disables forced writeback,
-        and <literal>2MB</literal>.  The default is <literal>256kB</> on
-        Linux, <literal>0</> elsewhere.  (If <symbol>BLCKSZ</symbol> is not
+        and <literal>2MB</literal>.  The default is <literal>256kB</literal> on
+        Linux, <literal>0</literal> elsewhere.  (If <symbol>BLCKSZ</symbol> is not
         8kB, the default and maximum values scale proportionally to it.)
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2745,7 +2772,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-checkpoint-warning" xreflabel="checkpoint_warning">
       <term><varname>checkpoint_warning</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>checkpoint_warning</> configuration parameter</primary>
+       <primary><varname>checkpoint_warning</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -2753,11 +2780,11 @@ include_dir 'conf.d'
         Write a message to the server log if checkpoints caused by
         the filling of checkpoint segment files happen closer together
         than this many seconds (which suggests that
-        <varname>max_wal_size</> ought to be raised).  The default is
-        30 seconds (<literal>30s</>).  Zero disables the warning.
+        <varname>max_wal_size</varname> ought to be raised).  The default is
+        30 seconds (<literal>30s</literal>).  Zero disables the warning.
         No warnings will be generated if <varname>checkpoint_timeout</varname>
         is less than <varname>checkpoint_warning</varname>.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2766,19 +2793,19 @@ include_dir 'conf.d'
      <varlistentry id="guc-max-wal-size" xreflabel="max_wal_size">
       <term><varname>max_wal_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_wal_size</> configuration parameter</primary>
+       <primary><varname>max_wal_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Maximum size to let the WAL grow to between automatic WAL
         checkpoints. This is a soft limit; WAL size can exceed
-        <varname>max_wal_size</> under special circumstances, like
-        under heavy load, a failing <varname>archive_command</>, or a high
-        <varname>wal_keep_segments</> setting. The default is 1 GB.
+        <varname>max_wal_size</varname> under special circumstances, like
+        under heavy load, a failing <varname>archive_command</varname>, or a high
+        <varname>wal_keep_segments</varname> setting. The default is 1 GB.
         Increasing this parameter can increase the amount of time needed for
         crash recovery.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2787,7 +2814,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-min-wal-size" xreflabel="min_wal_size">
       <term><varname>min_wal_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>min_wal_size</> configuration parameter</primary>
+       <primary><varname>min_wal_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -2797,7 +2824,7 @@ include_dir 'conf.d'
         This can be used to ensure that enough WAL space is reserved to
         handle spikes in WAL usage, for example when running large batch
         jobs. The default is 80 MB.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -2812,29 +2839,29 @@ include_dir 'conf.d'
      <varlistentry id="guc-archive-mode" xreflabel="archive_mode">
       <term><varname>archive_mode</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>archive_mode</> configuration parameter</primary>
+       <primary><varname>archive_mode</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When <varname>archive_mode</> is enabled, completed WAL segments
+        When <varname>archive_mode</varname> is enabled, completed WAL segments
         are sent to archive storage by setting
-        <xref linkend="guc-archive-command">. In addition to <literal>off</>,
-        to disable, there are two modes: <literal>on</>, and
-        <literal>always</>. During normal operation, there is no
-        difference between the two modes, but when set to <literal>always</>
+        <xref linkend="guc-archive-command"/>. In addition to <literal>off</literal>,
+        to disable, there are two modes: <literal>on</literal>, and
+        <literal>always</literal>. During normal operation, there is no
+        difference between the two modes, but when set to <literal>always</literal>
         the WAL archiver is enabled also during archive recovery or standby
-        mode. In <literal>always</> mode, all files restored from the archive
+        mode. In <literal>always</literal> mode, all files restored from the archive
         or streamed with streaming replication will be archived (again). See
-        <xref linkend="continuous-archiving-in-standby"> for details.
+        <xref linkend="continuous-archiving-in-standby"/> for details.
        </para>
        <para>
-        <varname>archive_mode</> and <varname>archive_command</> are
-        separate variables so that <varname>archive_command</> can be
+        <varname>archive_mode</varname> and <varname>archive_command</varname> are
+        separate variables so that <varname>archive_command</varname> can be
         changed without leaving archiving mode.
         This parameter can only be set at server start.
-        <varname>archive_mode</> cannot be enabled when
-        <varname>wal_level</> is set to <literal>minimal</>.
+        <varname>archive_mode</varname> cannot be enabled when
+        <varname>wal_level</varname> is set to <literal>minimal</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -2842,32 +2869,32 @@ include_dir 'conf.d'
      <varlistentry id="guc-archive-command" xreflabel="archive_command">
       <term><varname>archive_command</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>archive_command</> configuration parameter</primary>
+       <primary><varname>archive_command</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         The local shell command to execute to archive a completed WAL file
-        segment.  Any <literal>%p</> in the string is
+        segment.  Any <literal>%p</literal> in the string is
         replaced by the path name of the file to archive, and any
-        <literal>%f</> is replaced by only the file name.
+        <literal>%f</literal> is replaced by only the file name.
         (The path name is relative to the working directory of the server,
         i.e., the cluster's data directory.)
-        Use <literal>%%</> to embed an actual <literal>%</> character in the
+        Use <literal>%%</literal> to embed an actual <literal>%</literal> character in the
         command.  It is important for the command to return a zero
         exit status only if it succeeds. For more information see
-        <xref linkend="backup-archiving-wal">.
+        <xref linkend="backup-archiving-wal"/>.
        </para>
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.  It is ignored unless
-        <varname>archive_mode</> was enabled at server start.
-        If <varname>archive_command</> is an empty string (the default) while
-        <varname>archive_mode</> is enabled, WAL archiving is temporarily
+        <varname>archive_mode</varname> was enabled at server start.
+        If <varname>archive_command</varname> is an empty string (the default) while
+        <varname>archive_mode</varname> is enabled, WAL archiving is temporarily
         disabled, but the server continues to accumulate WAL segment files in
         the expectation that a command will soon be provided.  Setting
-        <varname>archive_command</> to a command that does nothing but
-        return true, e.g. <literal>/bin/true</> (<literal>REM</> on
+        <varname>archive_command</varname> to a command that does nothing but
+        return true, e.g. <literal>/bin/true</literal> (<literal>REM</literal> on
         Windows), effectively disables
         archiving, but also breaks the chain of WAL files needed for
         archive recovery, so it should only be used in unusual circumstances.
@@ -2878,17 +2905,17 @@ include_dir 'conf.d'
      <varlistentry id="guc-archive-timeout" xreflabel="archive_timeout">
       <term><varname>archive_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>archive_timeout</> configuration parameter</primary>
+       <primary><varname>archive_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        The <xref linkend="guc-archive-command"> is only invoked for
+        The <xref linkend="guc-archive-command"/> is only invoked for
         completed WAL segments. Hence, if your server generates little WAL
         traffic (or has slack periods where it does so), there could be a
         long delay between the completion of a transaction and its safe
         recording in archive storage.  To limit how old unarchived
-        data can be, you can set <varname>archive_timeout</> to force the
+        data can be, you can set <varname>archive_timeout</varname> to force the
         server to switch to a new WAL segment file periodically.  When this
         parameter is greater than zero, the server will switch to a new
         segment file whenever this many seconds have elapsed since the last
@@ -2897,13 +2924,13 @@ include_dir 'conf.d'
         no database activity).  Note that archived files that are closed
         early due to a forced switch are still the same length as completely
         full files.  Therefore, it is unwise to use a very short
-        <varname>archive_timeout</> &mdash; it will bloat your archive
-        storage.  <varname>archive_timeout</> settings of a minute or so are
+        <varname>archive_timeout</varname> &mdash; it will bloat your archive
+        storage.  <varname>archive_timeout</varname> settings of a minute or so are
         usually reasonable.  You should consider using streaming replication,
         instead of archiving, if you want data to be copied off the master
         server more quickly than that.
         This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
@@ -2918,11 +2945,11 @@ include_dir 'conf.d'
 
     <para>
      These settings control the behavior of the built-in
-     <firstterm>streaming replication</> feature (see
-     <xref linkend="streaming-replication">).  Servers will be either a
+     <firstterm>streaming replication</firstterm> feature (see
+     <xref linkend="streaming-replication"/>).  Servers will be either a
      Master or a Standby server.  Masters can send data, while Standby(s)
      are always receivers of replicated data.  When cascading replication
-     (see <xref linkend="cascading-replication">) is used, Standby server(s)
+     (see <xref linkend="cascading-replication"/>) is used, Standby server(s)
      can also be senders, as well as receivers.
      Parameters are mainly for Sending and Standby servers, though some
      parameters have meaning only on the Master server.  Settings may vary
@@ -2945,7 +2972,7 @@ include_dir 'conf.d'
       <varlistentry id="guc-max-wal-senders" xreflabel="max_wal_senders">
        <term><varname>max_wal_senders</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>max_wal_senders</> configuration parameter</primary>
+        <primary><varname>max_wal_senders</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
@@ -2956,13 +2983,13 @@ include_dir 'conf.d'
         processes). The default is 10. The value 0 means replication is
         disabled. WAL sender processes count towards the total number
         of connections, so the parameter cannot be set higher than
-        <xref linkend="guc-max-connections">.  Abrupt streaming client
+        <xref linkend="guc-max-connections"/>.  Abrupt streaming client
         disconnection might cause an orphaned connection slot until
         a timeout is reached, so this parameter should be set slightly
         higher than the maximum number of expected clients so disconnected
         clients can immediately reconnect.  This parameter can only
-        be set at server start. <varname>wal_level</> must be set to
-        <literal>replica</> or higher to allow connections from standby
+        be set at server start. <varname>wal_level</varname> must be set to
+        <literal>replica</literal> or higher to allow connections from standby
         servers.
        </para>
        </listitem>
@@ -2971,13 +2998,13 @@ include_dir 'conf.d'
       <varlistentry id="guc-max-replication-slots" xreflabel="max_replication_slots">
        <term><varname>max_replication_slots</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>max_replication_slots</> configuration parameter</primary>
+        <primary><varname>max_replication_slots</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
         <para>
          Specifies the maximum number of replication slots
-         (see <xref linkend="streaming-replication-slots">) that the server
+         (see <xref linkend="streaming-replication-slots"/>) that the server
          can support. The default is 10.  This parameter can only be set at
          server start.
          <varname>wal_level</varname> must be set
@@ -2991,17 +3018,17 @@ include_dir 'conf.d'
       <varlistentry id="guc-wal-keep-segments" xreflabel="wal_keep_segments">
        <term><varname>wal_keep_segments</varname> (<type>integer</type>)
        <indexterm>
-        <primary><varname>wal_keep_segments</> configuration parameter</primary>
+        <primary><varname>wal_keep_segments</varname> configuration parameter</primary>
        </indexterm>
        </term>
        <listitem>
        <para>
         Specifies the minimum number of past log file segments kept in the
-        <filename>pg_wal</>
+        <filename>pg_wal</filename>
         directory, in case a standby server needs to fetch them for streaming
         replication. Each segment is normally 16 megabytes. If a standby
         server connected to the sending server falls behind by more than
-        <varname>wal_keep_segments</> segments, the sending server might remove
+        <varname>wal_keep_segments</varname> segments, the sending server might remove
         a WAL segment still needed by the standby, in which case the
         replication connection will be terminated.  Downstream connections
         will also eventually fail as a result.  (However, the standby
@@ -3011,15 +3038,15 @@ include_dir 'conf.d'
 
        <para>
         This sets only the minimum number of segments retained in
-        <filename>pg_wal</>; the system might need to retain more segments
+        <filename>pg_wal</filename>; the system might need to retain more segments
         for WAL archival or to recover from a checkpoint. If
-        <varname>wal_keep_segments</> is zero (the default), the system
+        <varname>wal_keep_segments</varname> is zero (the default), the system
         doesn't keep any extra segments for standby purposes, so the number
         of old WAL segments available to standby servers is a function of
         the location of the previous checkpoint and status of WAL
         archiving.
         This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
        </para>
        </listitem>
       </varlistentry>
@@ -3027,7 +3054,7 @@ include_dir 'conf.d'
      <varlistentry id="guc-wal-sender-timeout" xreflabel="wal_sender_timeout">
       <term><varname>wal_sender_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_sender_timeout</> configuration parameter</primary>
+       <primary><varname>wal_sender_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3037,7 +3064,7 @@ include_dir 'conf.d'
         the sending server to detect a standby crash or network outage.
         A value of zero disables the timeout mechanism.  This parameter
         can only be set in
-        the <filename>postgresql.conf</> file or on the server command line.
+        the <filename>postgresql.conf</filename> file or on the server command line.
         The default value is 60 seconds.
        </para>
       </listitem>
@@ -3046,13 +3073,13 @@ include_dir 'conf.d'
      <varlistentry id="guc-track-commit-timestamp" xreflabel="track_commit_timestamp">
       <term><varname>track_commit_timestamp</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>track_commit_timestamp</> configuration parameter</primary>
+       <primary><varname>track_commit_timestamp</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Record commit time of transactions. This parameter
-        can only be set in <filename>postgresql.conf</> file or on the server
+        can only be set in <filename>postgresql.conf</filename> file or on the server
         command line. The default value is <literal>off</literal>.
        </para>
       </listitem>
@@ -3068,9 +3095,9 @@ include_dir 'conf.d'
       These parameters can be set on the master/primary server that is
       to send replication data to one or more standby servers.
       Note that in addition to these parameters,
-      <xref linkend="guc-wal-level"> must be set appropriately on the master
+      <xref linkend="guc-wal-level"/> must be set appropriately on the master
       server, and optionally WAL archiving can be enabled as
-      well (see <xref linkend="runtime-config-wal-archiving">).
+      well (see <xref linkend="runtime-config-wal-archiving"/>).
       The values of these parameters on standby servers are irrelevant,
       although you may wish to set them there in preparation for the
       possibility of a standby becoming the master.
@@ -3081,14 +3108,14 @@ include_dir 'conf.d'
      <varlistentry id="guc-synchronous-standby-names" xreflabel="synchronous_standby_names">
       <term><varname>synchronous_standby_names</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>synchronous_standby_names</> configuration parameter</primary>
+       <primary><varname>synchronous_standby_names</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies a list of standby servers that can support
-        <firstterm>synchronous replication</>, as described in
-        <xref linkend="synchronous-replication">.
+        <firstterm>synchronous replication</firstterm>, as described in
+        <xref linkend="synchronous-replication"/>.
         There will be one or more active synchronous standbys;
         transactions waiting for commit will be allowed to proceed after
         these standby servers confirm receipt of their data.
@@ -3097,15 +3124,15 @@ include_dir 'conf.d'
         that are both currently connected and streaming data in real-time
         (as shown by a state of <literal>streaming</literal> in the
         <link linkend="monitoring-stats-views-table">
-        <literal>pg_stat_replication</></link> view).
+        <literal>pg_stat_replication</literal></link> view).
         Specifying more than one synchronous standby can allow for very high
         availability and protection against data loss.
        </para>
        <para>
         The name of a standby server for this purpose is the
-        <varname>application_name</> setting of the standby, as set in the
+        <varname>application_name</varname> setting of the standby, as set in the
         standby's connection information.  In case of a physical replication
-        standby, this should be set in the <varname>primary_conninfo</>
+        standby, this should be set in the <varname>primary_conninfo</varname>
         setting in <filename>recovery.conf</filename>; the default
         is <literal>walreceiver</literal>.  For logical replication, this can
         be set in the connection information of the subscription, and it
@@ -3125,54 +3152,54 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         wait for replies from,
         and <replaceable class="parameter">standby_name</replaceable>
         is the name of a standby server.
-        <literal>FIRST</> and <literal>ANY</> specify the method to choose
+        <literal>FIRST</literal> and <literal>ANY</literal> specify the method to choose
         synchronous standbys from the listed servers.
        </para>
        <para>
-        The keyword <literal>FIRST</>, coupled with
+        The keyword <literal>FIRST</literal>, coupled with
         <replaceable class="parameter">num_sync</replaceable>, specifies a
         priority-based synchronous replication and makes transaction commits
         wait until their WAL records are replicated to
         <replaceable class="parameter">num_sync</replaceable> synchronous
         standbys chosen based on their priorities. For example, a setting of
-        <literal>FIRST 3 (s1, s2, s3, s4)</> will cause each commit to wait for
+        <literal>FIRST 3 (s1, s2, s3, s4)</literal> will cause each commit to wait for
         replies from three higher-priority standbys chosen from standby servers
-        <literal>s1</>, <literal>s2</>, <literal>s3</> and <literal>s4</>.
+        <literal>s1</literal>, <literal>s2</literal>, <literal>s3</literal> and <literal>s4</literal>.
         The standbys whose names appear earlier in the list are given higher
         priority and will be considered as synchronous. Other standby servers
         appearing later in this list represent potential synchronous standbys.
         If any of the current synchronous standbys disconnects for whatever
         reason, it will be replaced immediately with the next-highest-priority
-        standby. The keyword <literal>FIRST</> is optional.
+        standby. The keyword <literal>FIRST</literal> is optional.
        </para>
        <para>
-        The keyword <literal>ANY</>, coupled with
+        The keyword <literal>ANY</literal>, coupled with
         <replaceable class="parameter">num_sync</replaceable>, specifies a
         quorum-based synchronous replication and makes transaction commits
-        wait until their WAL records are replicated to <emphasis>at least</>
+        wait until their WAL records are replicated to <emphasis>at least</emphasis>
         <replaceable class="parameter">num_sync</replaceable> listed standbys.
-        For example, a setting of <literal>ANY 3 (s1, s2, s3, s4)</> will cause
+        For example, a setting of <literal>ANY 3 (s1, s2, s3, s4)</literal> will cause
         each commit to proceed as soon as at least any three standbys of
-        <literal>s1</>, <literal>s2</>, <literal>s3</> and <literal>s4</>
+        <literal>s1</literal>, <literal>s2</literal>, <literal>s3</literal> and <literal>s4</literal>
         reply.
        </para>
        <para>
-        <literal>FIRST</> and <literal>ANY</> are case-insensitive. If these
+        <literal>FIRST</literal> and <literal>ANY</literal> are case-insensitive. If these
         keywords are used as the name of a standby server,
         its <replaceable class="parameter">standby_name</replaceable> must
         be double-quoted.
        </para>
        <para>
-        The third syntax was used before <productname>PostgreSQL</>
+        The third syntax was used before <productname>PostgreSQL</productname>
         version 9.6 and is still supported. It's the same as the first syntax
-        with <literal>FIRST</> and
+        with <literal>FIRST</literal> and
         <replaceable class="parameter">num_sync</replaceable> equal to 1.
-        For example, <literal>FIRST 1 (s1, s2)</> and <literal>s1, s2</> have
-        the same meaning: either <literal>s1</> or <literal>s2</> is chosen
+        For example, <literal>FIRST 1 (s1, s2)</literal> and <literal>s1, s2</literal> have
+        the same meaning: either <literal>s1</literal> or <literal>s2</literal> is chosen
         as a synchronous standby.
        </para>
        <para>
-        The special entry <literal>*</> matches any standby name.
+        The special entry <literal>*</literal> matches any standby name.
        </para>
        <para>
         There is no mechanism to enforce uniqueness of standby names.  In case
@@ -3183,7 +3210,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         <para>
          Each <replaceable class="parameter">standby_name</replaceable>
          should have the form of a valid SQL identifier, unless it
-         is <literal>*</>.  You can use double-quoting if necessary.  But note
+         is <literal>*</literal>.  You can use double-quoting if necessary.  But note
          that <replaceable class="parameter">standby_name</replaceable>s are
          compared to standby application names case-insensitively, whether
          double-quoted or not.
@@ -3195,11 +3222,11 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         replication.  This is the default configuration.  Even when
         synchronous replication is enabled, individual transactions can be
         configured not to wait for replication by setting the
-        <xref linkend="guc-synchronous-commit"> parameter to
-        <literal>local</> or <literal>off</>.
+        <xref linkend="guc-synchronous-commit"/> parameter to
+        <literal>local</literal> or <literal>off</literal>.
        </para>
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -3208,33 +3235,33 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-vacuum-defer-cleanup-age" xreflabel="vacuum_defer_cleanup_age">
       <term><varname>vacuum_defer_cleanup_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>vacuum_defer_cleanup_age</> configuration parameter</primary>
+       <primary><varname>vacuum_defer_cleanup_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Specifies the number of transactions by which <command>VACUUM</> and
-        <acronym>HOT</> updates will defer cleanup of dead row versions. The
+        Specifies the number of transactions by which <command>VACUUM</command> and
+        <acronym>HOT</acronym> updates will defer cleanup of dead row versions. The
         default is zero transactions, meaning that dead row versions can be
         removed as soon as possible, that is, as soon as they are no longer
         visible to any open transaction.  You may wish to set this to a
         non-zero value on a primary server that is supporting hot standby
-        servers, as described in <xref linkend="hot-standby">.  This allows
+        servers, as described in <xref linkend="hot-standby"/>.  This allows
         more time for queries on the standby to complete without incurring
         conflicts due to early cleanup of rows.  However, since the value
         is measured in terms of number of write transactions occurring on the
         primary server, it is difficult to predict just how much additional
         grace time will be made available to standby queries.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
        <para>
-        You should also consider setting <varname>hot_standby_feedback</>
+        You should also consider setting <varname>hot_standby_feedback</varname>
         on standby server(s) as an alternative to using this parameter.
        </para>
        <para>
         This does not prevent cleanup of dead rows which have reached the age
-        specified by <varname>old_snapshot_threshold</>.
+        specified by <varname>old_snapshot_threshold</varname>.
        </para>
       </listitem>
      </varlistentry>
@@ -3256,13 +3283,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-hot-standby" xreflabel="hot_standby">
       <term><varname>hot_standby</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>hot_standby</> configuration parameter</primary>
+       <primary><varname>hot_standby</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies whether or not you can connect and run queries during
-        recovery, as described in <xref linkend="hot-standby">.
+        recovery, as described in <xref linkend="hot-standby"/>.
         The default value is <literal>on</literal>.
         This parameter can only be set at server start. It only has effect
         during archive recovery or in standby mode.
@@ -3273,7 +3300,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-max-standby-archive-delay" xreflabel="max_standby_archive_delay">
       <term><varname>max_standby_archive_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_standby_archive_delay</> configuration parameter</primary>
+       <primary><varname>max_standby_archive_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3281,17 +3308,17 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         When Hot Standby is active, this parameter determines how long the
         standby server should wait before canceling standby queries that
         conflict with about-to-be-applied WAL entries, as described in
-        <xref linkend="hot-standby-conflict">.
-        <varname>max_standby_archive_delay</> applies when WAL data is
+        <xref linkend="hot-standby-conflict"/>.
+        <varname>max_standby_archive_delay</varname> applies when WAL data is
         being read from WAL archive (and is therefore not current).
         The default is 30 seconds. Units are milliseconds if not specified.
         A value of -1 allows the standby to wait forever for conflicting
         queries to complete.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
        <para>
-        Note that <varname>max_standby_archive_delay</> is not the same as the
+        Note that <varname>max_standby_archive_delay</varname> is not the same as the
         maximum length of time a query can run before cancellation; rather it
         is the maximum total time allowed to apply any one WAL segment's data.
         Thus, if one query has resulted in significant delay earlier in the
@@ -3304,7 +3331,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-max-standby-streaming-delay" xreflabel="max_standby_streaming_delay">
       <term><varname>max_standby_streaming_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_standby_streaming_delay</> configuration parameter</primary>
+       <primary><varname>max_standby_streaming_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3312,17 +3339,17 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         When Hot Standby is active, this parameter determines how long the
         standby server should wait before canceling standby queries that
         conflict with about-to-be-applied WAL entries, as described in
-        <xref linkend="hot-standby-conflict">.
-        <varname>max_standby_streaming_delay</> applies when WAL data is
+        <xref linkend="hot-standby-conflict"/>.
+        <varname>max_standby_streaming_delay</varname> applies when WAL data is
         being received via streaming replication.
         The default is 30 seconds. Units are milliseconds if not specified.
         A value of -1 allows the standby to wait forever for conflicting
         queries to complete.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
        <para>
-        Note that <varname>max_standby_streaming_delay</> is not the same as
+        Note that <varname>max_standby_streaming_delay</varname> is not the same as
         the maximum length of time a query can run before cancellation; rather
         it is the maximum total time allowed to apply WAL data once it has
         been received from the primary server.  Thus, if one query has
@@ -3336,7 +3363,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-wal-receiver-status-interval" xreflabel="wal_receiver_status_interval">
       <term><varname>wal_receiver_status_interval</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_receiver_status_interval</> configuration parameter</primary>
+       <primary><varname>wal_receiver_status_interval</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3345,7 +3372,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        process on the standby to send information about replication progress
        to the primary or upstream standby, where it can be seen using the
        <link linkend="monitoring-stats-views-table">
-       <literal>pg_stat_replication</></link> view.  The standby will report
+       <literal>pg_stat_replication</literal></link> view.  The standby will report
        the last write-ahead log location it has written, the last position it
        has flushed to disk, and the last position it has applied.
        This parameter's
@@ -3354,7 +3381,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        often as specified by this parameter.  Thus, the apply position may
        lag slightly behind the true position.  Setting this parameter to zero
        disables status updates completely.  This parameter can only be set in
-       the <filename>postgresql.conf</> file or on the server command line.
+       the <filename>postgresql.conf</filename> file or on the server command line.
        The default value is 10 seconds.
       </para>
       </listitem>
@@ -3363,7 +3390,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-hot-standby-feedback" xreflabel="hot_standby_feedback">
       <term><varname>hot_standby_feedback</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>hot_standby_feedback</> configuration parameter</primary>
+       <primary><varname>hot_standby_feedback</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3374,9 +3401,9 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         be used to eliminate query cancels caused by cleanup records, but
         can cause database bloat on the primary for some workloads.
         Feedback messages will not be sent more frequently than once per
-        <varname>wal_receiver_status_interval</>. The default value is
+        <varname>wal_receiver_status_interval</varname>. The default value is
         <literal>off</literal>. This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
        </para>
        <para>
         If cascaded replication is in use the feedback is passed upstream
@@ -3385,10 +3412,10 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        </para>
        <para>
         This setting does not override the behavior of
-        <varname>old_snapshot_threshold</> on the primary; a snapshot on the
+        <varname>old_snapshot_threshold</varname> on the primary; a snapshot on the
         standby which exceeds the primary's age threshold can become invalid,
         resulting in cancellation of transactions on the standby.  This is
-        because <varname>old_snapshot_threshold</> is intended to provide an
+        because <varname>old_snapshot_threshold</varname> is intended to provide an
         absolute limit on the time which dead rows can contribute to bloat,
         which would otherwise be violated because of the configuration of a
         standby.
@@ -3399,7 +3426,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-wal-receiver-timeout" xreflabel="wal_receiver_timeout">
       <term><varname>wal_receiver_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_receiver_timeout</> configuration parameter</primary>
+       <primary><varname>wal_receiver_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3410,7 +3437,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         outage.
         A value of zero disables the timeout mechanism.  This parameter
         can only be set in
-        the <filename>postgresql.conf</> file or on the server command line.
+        the <filename>postgresql.conf</filename> file or on the server command line.
         The default value is 60 seconds.
        </para>
       </listitem>
@@ -3419,16 +3446,16 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-wal-retrieve-retry-interval" xreflabel="wal_retrieve_retry_interval">
       <term><varname>wal_retrieve_retry_interval</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_retrieve_retry_interval</> configuration parameter</primary>
+       <primary><varname>wal_retrieve_retry_interval</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specify how long the standby server should wait when WAL data is not
         available from any sources (streaming replication,
-        local <filename>pg_wal</> or WAL archive) before retrying to
+        local <filename>pg_wal</filename> or WAL archive) before retrying to
         retrieve WAL data.  This parameter can only be set in the
-        <filename>postgresql.conf</> file or on the server command line.
+        <filename>postgresql.conf</filename> file or on the server command line.
         The default value is 5 seconds. Units are milliseconds if not specified.
        </para>
        <para>
@@ -3457,7 +3484,8 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      </para>
 
      <para>
-      Note that <varname>wal_receiver_timeout</varname> and
+      Note that <varname>wal_receiver_timeout</varname>,
+      <varname>wal_receiver_status_interval</varname> and
       <varname>wal_retrieve_retry_interval</varname> configuration parameters
       affect the logical replication workers as well.
      </para>
@@ -3467,7 +3495,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-max-logical-replication-workers" xreflabel="max_logical_replication_workers">
       <term><varname>max_logical_replication_workers</varname> (<type>int</type>)
       <indexterm>
-       <primary><varname>max_logical_replication_workers</> configuration parameter</primary>
+       <primary><varname>max_logical_replication_workers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3488,7 +3516,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-max-sync-workers-per-subscription" xreflabel="max_sync_workers_per_subscription">
       <term><varname>max_sync_workers_per_subscription</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_sync_workers_per_subscription</> configuration parameter</primary>
+       <primary><varname>max_sync_workers_per_subscription</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3525,15 +3553,15 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        These configuration parameters provide a crude method of
        influencing the query plans chosen by the query optimizer. If
        the default plan chosen by the optimizer for a particular query
-       is not optimal, a <emphasis>temporary</> solution is to use one
+       is not optimal, a <emphasis>temporary</emphasis> solution is to use one
        of these configuration parameters to force the optimizer to
        choose a different plan.
        Better ways to improve the quality of the
        plans chosen by the optimizer include adjusting the planner cost
-       constants (see <xref linkend="runtime-config-query-constants">),
-       running <xref linkend="sql-analyze"> manually, increasing
+       constants (see <xref linkend="runtime-config-query-constants"/>),
+       running <xref linkend="sql-analyze"/> manually, increasing
        the value of the <xref
-       linkend="guc-default-statistics-target"> configuration parameter,
+       linkend="guc-default-statistics-target"/> configuration parameter,
        and increasing the amount of statistics collected for
        specific columns using <command>ALTER TABLE SET
        STATISTICS</command>.
@@ -3546,13 +3574,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        <primary>bitmap scan</primary>
       </indexterm>
       <indexterm>
-       <primary><varname>enable_bitmapscan</> configuration parameter</primary>
+       <primary><varname>enable_bitmapscan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of bitmap-scan plan
-        types. The default is <literal>on</>.
+        types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3560,13 +3588,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-gathermerge" xreflabel="enable_gathermerge">
       <term><varname>enable_gathermerge</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_gathermerge</> configuration parameter</primary>
+       <primary><varname>enable_gathermerge</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of gather
-        merge plan types. The default is <literal>on</>.
+        merge plan types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3574,13 +3602,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-hashagg" xreflabel="enable_hashagg">
       <term><varname>enable_hashagg</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_hashagg</> configuration parameter</primary>
+       <primary><varname>enable_hashagg</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of hashed
-        aggregation plan types. The default is <literal>on</>.
+        aggregation plan types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3588,13 +3616,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-hashjoin" xreflabel="enable_hashjoin">
       <term><varname>enable_hashjoin</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_hashjoin</> configuration parameter</primary>
+       <primary><varname>enable_hashjoin</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of hash-join plan
-        types. The default is <literal>on</>.
+        types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3605,13 +3633,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        <primary>index scan</primary>
       </indexterm>
       <indexterm>
-       <primary><varname>enable_indexscan</> configuration parameter</primary>
+       <primary><varname>enable_indexscan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of index-scan plan
-        types. The default is <literal>on</>.
+        types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3619,14 +3647,14 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-indexonlyscan" xreflabel="enable_indexonlyscan">
       <term><varname>enable_indexonlyscan</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_indexonlyscan</> configuration parameter</primary>
+       <primary><varname>enable_indexonlyscan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of index-only-scan plan
-        types (see <xref linkend="indexes-index-only-scans">).
-        The default is <literal>on</>.
+        types (see <xref linkend="indexes-index-only-scans"/>).
+        The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3634,7 +3662,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-material" xreflabel="enable_material">
       <term><varname>enable_material</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_material</> configuration parameter</primary>
+       <primary><varname>enable_material</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3643,7 +3671,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         It is impossible to suppress materialization entirely,
         but turning this variable off prevents the planner from inserting
         materialize nodes except in cases where it is required for correctness.
-        The default is <literal>on</>.
+        The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3651,13 +3679,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-mergejoin" xreflabel="enable_mergejoin">
       <term><varname>enable_mergejoin</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_mergejoin</> configuration parameter</primary>
+       <primary><varname>enable_mergejoin</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables or disables the query planner's use of merge-join plan
-        types. The default is <literal>on</>.
+        types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3665,7 +3693,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-nestloop" xreflabel="enable_nestloop">
       <term><varname>enable_nestloop</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_nestloop</> configuration parameter</primary>
+       <primary><varname>enable_nestloop</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3674,7 +3702,56 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         plans. It is impossible to suppress nested-loop joins entirely,
         but turning this variable off discourages the planner from using
         one if there are other methods available. The default is
-        <literal>on</>.
+        <literal>on</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-enable-parallel-append" xreflabel="enable_parallel_append">
+      <term><varname>enable_parallel_append</varname> (<type>boolean</type>)
+      <indexterm>
+       <primary><varname>enable_parallel_append</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Enables or disables the query planner's use of parallel-aware
+        append plan types. The default is <literal>on</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-enable-parallel-hash" xreflabel="enable_parallel_hash">
+      <term><varname>enable_parallel_hash</varname> (<type>boolean</type>)
+       <indexterm>
+        <primary><varname>enable_parallel_hash</varname> configuration parameter</primary>
+       </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Enables or disables the query planner's use of hash-join plan
+        types with parallel hash. Has no effect if hash-join plans are not
+        also enabled. The default is <literal>on</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-enable-partitionwise-join" xreflabel="enable_partitionwise_join">
+      <term><varname>enable_partitionwise_join</varname> (<type>boolean</type>)
+      <indexterm>
+       <primary><varname>enable_partitionwise_join</varname> configuration parameter</primary>
+      </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Enables or disables the query planner's use of partitionwise join,
+        which allows a join between partitioned tables to be performed by
+        joining the matching partitions.  Partitionwise join currently applies
+        only when the join conditions include all the partition keys, which
+        must be of the same data type and have exactly matching sets of child
+        partitions.  Because partitionwise join planning can use significantly
+        more CPU time and memory during planning, the default is
+        <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3685,7 +3762,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        <primary>sequential scan</primary>
       </indexterm>
       <indexterm>
-       <primary><varname>enable_seqscan</> configuration parameter</primary>
+       <primary><varname>enable_seqscan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3694,7 +3771,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         plan types. It is impossible to suppress sequential scans
         entirely, but turning this variable off discourages the planner
         from using one if there are other methods available. The
-        default is <literal>on</>.
+        default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3702,7 +3779,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-sort" xreflabel="enable_sort">
       <term><varname>enable_sort</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_sort</> configuration parameter</primary>
+       <primary><varname>enable_sort</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3711,7 +3788,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         steps. It is impossible to suppress explicit sorts entirely,
         but turning this variable off discourages the planner from
         using one if there are other methods available. The default
-        is <literal>on</>.
+        is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3719,13 +3796,13 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-enable-tidscan" xreflabel="enable_tidscan">
       <term><varname>enable_tidscan</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>enable_tidscan</> configuration parameter</primary>
+       <primary><varname>enable_tidscan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Enables or disables the query planner's use of <acronym>TID</>
-        scan plan types. The default is <literal>on</>.
+        Enables or disables the query planner's use of <acronym>TID</acronym>
+        scan plan types. The default is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -3736,12 +3813,12 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <title>Planner Cost Constants</title>
 
     <para>
-     The <firstterm>cost</> variables described in this section are measured
+     The <firstterm>cost</firstterm> variables described in this section are measured
      on an arbitrary scale.  Only their relative values matter, hence
      scaling them all up or down by the same factor will result in no change
      in the planner's choices.  By default, these cost variables are based on
      the cost of sequential page fetches; that is,
-     <varname>seq_page_cost</> is conventionally set to <literal>1.0</>
+     <varname>seq_page_cost</varname> is conventionally set to <literal>1.0</literal>
      and the other cost variables are set with reference to that.  But
      you can use a different scale if you prefer, such as actual execution
      times in milliseconds on a particular machine.
@@ -3762,7 +3839,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-seq-page-cost" xreflabel="seq_page_cost">
       <term><varname>seq_page_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>seq_page_cost</> configuration parameter</primary>
+       <primary><varname>seq_page_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3771,7 +3848,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         that is part of a series of sequential fetches.  The default is 1.0.
         This value can be overridden for tables and indexes in a particular
         tablespace by setting the tablespace parameter of the same name
-        (see <xref linkend="sql-altertablespace">).
+        (see <xref linkend="sql-altertablespace"/>).
        </para>
       </listitem>
      </varlistentry>
@@ -3779,7 +3856,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-random-page-cost" xreflabel="random_page_cost">
       <term><varname>random_page_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>random_page_cost</> configuration parameter</primary>
+       <primary><varname>random_page_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3788,11 +3865,11 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         non-sequentially-fetched disk page.  The default is 4.0.
         This value can be overridden for tables and indexes in a particular
         tablespace by setting the tablespace parameter of the same name
-        (see <xref linkend="sql-altertablespace">).
+        (see <xref linkend="sql-altertablespace"/>).
        </para>
 
        <para>
-        Reducing this value relative to <varname>seq_page_cost</>
+        Reducing this value relative to <varname>seq_page_cost</varname>
         will cause the system to prefer index scans; raising it will
         make index scans look relatively more expensive.  You can raise
         or lower both values together to change the importance of disk I/O
@@ -3822,8 +3899,8 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
 
        <tip>
         <para>
-         Although the system will let you set <varname>random_page_cost</> to
-         less than <varname>seq_page_cost</>, it is not physically sensible
+         Although the system will let you set <varname>random_page_cost</varname> to
+         less than <varname>seq_page_cost</varname>, it is not physically sensible
          to do so.  However, setting them equal makes sense if the database
          is entirely cached in RAM, since in that case there is no penalty
          for touching pages out of sequence.  Also, in a heavily-cached
@@ -3838,7 +3915,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-cpu-tuple-cost" xreflabel="cpu_tuple_cost">
       <term><varname>cpu_tuple_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>cpu_tuple_cost</> configuration parameter</primary>
+       <primary><varname>cpu_tuple_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3853,7 +3930,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-cpu-index-tuple-cost" xreflabel="cpu_index_tuple_cost">
       <term><varname>cpu_index_tuple_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>cpu_index_tuple_cost</> configuration parameter</primary>
+       <primary><varname>cpu_index_tuple_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3868,7 +3945,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-cpu-operator-cost" xreflabel="cpu_operator_cost">
       <term><varname>cpu_operator_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>cpu_operator_cost</> configuration parameter</primary>
+       <primary><varname>cpu_operator_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3883,7 +3960,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-parallel-setup-cost" xreflabel="parallel_setup_cost">
       <term><varname>parallel_setup_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>parallel_setup_cost</> configuration parameter</primary>
+       <primary><varname>parallel_setup_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3898,7 +3975,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-parallel-tuple-cost" xreflabel="parallel_tuple_cost">
       <term><varname>parallel_tuple_cost</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>parallel_tuple_cost</> configuration parameter</primary>
+       <primary><varname>parallel_tuple_cost</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3913,7 +3990,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-min-parallel-table-scan-size" xreflabel="min_parallel_table_scan_size">
       <term><varname>min_parallel_table_scan_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>min_parallel_table_scan_size</> configuration parameter</primary>
+       <primary><varname>min_parallel_table_scan_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3923,7 +4000,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         the amount of table data scanned is always equal to the size of the
         table, but when indexes are used the amount of table data
         scanned will normally be less.  The default is 8
-        megabytes (<literal>8MB</>).
+        megabytes (<literal>8MB</literal>).
        </para>
       </listitem>
      </varlistentry>
@@ -3931,7 +4008,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-min-parallel-index-scan-size" xreflabel="min_parallel_index_scan_size">
       <term><varname>min_parallel_index_scan_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>min_parallel_index_scan_size</> configuration parameter</primary>
+       <primary><varname>min_parallel_index_scan_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3940,7 +4017,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         for a parallel scan to be considered.  Note that a parallel index scan
         typically won't touch the entire index; it is the number of pages
         which the planner believes will actually be touched by the scan which
-        is relevant.  The default is 512 kilobytes (<literal>512kB</>).
+        is relevant.  The default is 512 kilobytes (<literal>512kB</literal>).
        </para>
       </listitem>
      </varlistentry>
@@ -3948,7 +4025,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-effective-cache-size" xreflabel="effective_cache_size">
       <term><varname>effective_cache_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>effective_cache_size</> configuration parameter</primary>
+       <primary><varname>effective_cache_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -3969,7 +4046,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
         does it reserve kernel disk cache; it is used only for estimation
         purposes.  The system also does not assume data remains in
         the disk cache between queries.  The default is 4 gigabytes
-        (<literal>4GB</>).
+        (<literal>4GB</literal>).
        </para>
       </listitem>
      </varlistentry>
@@ -3986,7 +4063,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
       complex queries (those joining many relations), at the cost of producing
       plans that are sometimes inferior to those found by the normal
       exhaustive-search algorithm.
-      For more information see <xref linkend="geqo">.
+      For more information see <xref linkend="geqo"/>.
      </para>
 
      <variablelist>
@@ -4001,7 +4078,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        <see>genetic query optimization</see>
       </indexterm>
       <indexterm>
-       <primary><varname>geqo</> configuration parameter</primary>
+       <primary><varname>geqo</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4017,14 +4094,14 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-threshold" xreflabel="geqo_threshold">
       <term><varname>geqo_threshold</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>geqo_threshold</> configuration parameter</primary>
+       <primary><varname>geqo_threshold</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Use genetic query optimization to plan queries with at least
-        this many <literal>FROM</> items involved. (Note that a
-        <literal>FULL OUTER JOIN</> construct counts as only one <literal>FROM</>
+        this many <literal>FROM</literal> items involved. (Note that a
+        <literal>FULL OUTER JOIN</literal> construct counts as only one <literal>FROM</literal>
         item.) The default is 12. For simpler queries it is usually best
         to use the regular, exhaustive-search planner, but for queries with
         many tables the exhaustive search takes too long, often
@@ -4038,7 +4115,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-effort" xreflabel="geqo_effort">
       <term><varname>geqo_effort</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>geqo_effort</> configuration parameter</primary>
+       <primary><varname>geqo_effort</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4064,7 +4141,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-pool-size" xreflabel="geqo_pool_size">
       <term><varname>geqo_pool_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>geqo_pool_size</> configuration parameter</primary>
+       <primary><varname>geqo_pool_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4082,7 +4159,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-generations" xreflabel="geqo_generations">
       <term><varname>geqo_generations</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>geqo_generations</> configuration parameter</primary>
+       <primary><varname>geqo_generations</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4100,7 +4177,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-selection-bias" xreflabel="geqo_selection_bias">
       <term><varname>geqo_selection_bias</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>geqo_selection_bias</> configuration parameter</primary>
+       <primary><varname>geqo_selection_bias</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4115,7 +4192,7 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-geqo-seed" xreflabel="geqo_seed">
       <term><varname>geqo_seed</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>geqo_seed</> configuration parameter</primary>
+       <primary><varname>geqo_seed</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4139,18 +4216,18 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
      <varlistentry id="guc-default-statistics-target" xreflabel="default_statistics_target">
       <term><varname>default_statistics_target</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>default_statistics_target</> configuration parameter</primary>
+       <primary><varname>default_statistics_target</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the default statistics target for table columns without
         a column-specific target set via <command>ALTER TABLE
-        SET STATISTICS</>.  Larger values increase the time needed to
-        do <command>ANALYZE</>, but might improve the quality of the
+        SET STATISTICS</command>.  Larger values increase the time needed to
+        do <command>ANALYZE</command>, but might improve the quality of the
         planner's estimates. The default is 100. For more information
-        on the use of statistics by the <productname>PostgreSQL</>
-        query planner, refer to <xref linkend="planner-stats">.
+        on the use of statistics by the <productname>PostgreSQL</productname>
+        query planner, refer to <xref linkend="planner-stats"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -4161,26 +4238,26 @@ ANY <replaceable class="parameter">num_sync</replaceable> ( <replaceable class="
        <primary>constraint exclusion</primary>
       </indexterm>
       <indexterm>
-       <primary><varname>constraint_exclusion</> configuration parameter</primary>
+       <primary><varname>constraint_exclusion</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls the query planner's use of table constraints to
         optimize queries.
-        The allowed values of <varname>constraint_exclusion</> are
-        <literal>on</> (examine constraints for all tables),
-        <literal>off</> (never examine constraints), and
-        <literal>partition</> (examine constraints only for inheritance child
-        tables and <literal>UNION ALL</> subqueries).
-        <literal>partition</> is the default setting.
+        The allowed values of <varname>constraint_exclusion</varname> are
+        <literal>on</literal> (examine constraints for all tables),
+        <literal>off</literal> (never examine constraints), and
+        <literal>partition</literal> (examine constraints only for inheritance child
+        tables and <literal>UNION ALL</literal> subqueries).
+        <literal>partition</literal> is the default setting.
         It is often used with inheritance and partitioned tables to
         improve performance.
       </para>
 
        <para>
         When this parameter allows it for a particular table, the planner
-        compares query conditions with the table's <literal>CHECK</>
+        compares query conditions with the table's <literal>CHECK</literal>
         constraints, and omits scanning tables for which the conditions
         contradict the constraints.  For example:
 
@@ -4192,8 +4269,8 @@ CREATE TABLE child2000(check (key between 2000 and 2999)) INHERITS(parent);
 SELECT * FROM parent WHERE key = 2400;
 </programlisting>
 
-        With constraint exclusion enabled, this <command>SELECT</>
-        will not scan <structname>child1000</> at all, improving performance.
+        With constraint exclusion enabled, this <command>SELECT</command>
+        will not scan <structname>child1000</structname> at all, improving performance.
        </para>
 
        <para>
@@ -4206,7 +4283,7 @@ SELECT * FROM parent WHERE key = 2400;
        </para>
 
        <para>
-        Refer to <xref linkend="ddl-partitioning-constraint-exclusion"> for
+        Refer to <xref linkend="ddl-partitioning-constraint-exclusion"/> for
         more information on using constraint exclusion and partitioning.
        </para>
       </listitem>
@@ -4215,14 +4292,14 @@ SELECT * FROM parent WHERE key = 2400;
      <varlistentry id="guc-cursor-tuple-fraction" xreflabel="cursor_tuple_fraction">
       <term><varname>cursor_tuple_fraction</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>cursor_tuple_fraction</> configuration parameter</primary>
+       <primary><varname>cursor_tuple_fraction</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the planner's estimate of the fraction of a cursor's rows that
         will be retrieved.  The default is 0.1.  Smaller values of this
-        setting bias the planner towards using <quote>fast start</> plans
+        setting bias the planner towards using <quote>fast start</quote> plans
         for cursors, which will retrieve the first few rows quickly while
         perhaps taking a long time to fetch all rows.  Larger values
         put more emphasis on the total estimated time.  At the maximum
@@ -4236,7 +4313,7 @@ SELECT * FROM parent WHERE key = 2400;
      <varlistentry id="guc-from-collapse-limit" xreflabel="from_collapse_limit">
       <term><varname>from_collapse_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>from_collapse_limit</> configuration parameter</primary>
+       <primary><varname>from_collapse_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4245,13 +4322,13 @@ SELECT * FROM parent WHERE key = 2400;
         resulting <literal>FROM</literal> list would have no more than
         this many items.  Smaller values reduce planning time but might
         yield inferior query plans.  The default is eight.
-        For more information see <xref linkend="explicit-joins">.
+        For more information see <xref linkend="explicit-joins"/>.
        </para>
 
        <para>
-        Setting this value to <xref linkend="guc-geqo-threshold"> or more
+        Setting this value to <xref linkend="guc-geqo-threshold"/> or more
         may trigger use of the GEQO planner, resulting in non-optimal
-        plans.  See <xref linkend="runtime-config-query-geqo">.
+        plans.  See <xref linkend="runtime-config-query-geqo"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -4259,14 +4336,14 @@ SELECT * FROM parent WHERE key = 2400;
      <varlistentry id="guc-join-collapse-limit" xreflabel="join_collapse_limit">
       <term><varname>join_collapse_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>join_collapse_limit</> configuration parameter</primary>
+       <primary><varname>join_collapse_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        The planner will rewrite explicit <literal>JOIN</>
-        constructs (except <literal>FULL JOIN</>s) into lists of
-        <literal>FROM</> items whenever a list of no more than this many items
+        The planner will rewrite explicit <literal>JOIN</literal>
+        constructs (except <literal>FULL JOIN</literal>s) into lists of
+        <literal>FROM</literal> items whenever a list of no more than this many items
         would result.  Smaller values reduce planning time but might
         yield inferior query plans.
        </para>
@@ -4275,19 +4352,45 @@ SELECT * FROM parent WHERE key = 2400;
         By default, this variable is set the same as
         <varname>from_collapse_limit</varname>, which is appropriate
         for most uses. Setting it to 1 prevents any reordering of
-        explicit <literal>JOIN</>s. Thus, the explicit join order
+        explicit <literal>JOIN</literal>s. Thus, the explicit join order
         specified in the query will be the actual order in which the
         relations are joined. Because the query planner does not always choose
         the optimal join order, advanced users can elect to
         temporarily set this variable to 1, and then specify the join
         order they desire explicitly.
-        For more information see <xref linkend="explicit-joins">.
+        For more information see <xref linkend="explicit-joins"/>.
        </para>
 
        <para>
-        Setting this value to <xref linkend="guc-geqo-threshold"> or more
+        Setting this value to <xref linkend="guc-geqo-threshold"/> or more
         may trigger use of the GEQO planner, resulting in non-optimal
-        plans.  See <xref linkend="runtime-config-query-geqo">.
+        plans.  See <xref linkend="runtime-config-query-geqo"/>.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry id="guc-parallel-leader-participation" xreflabel="parallel_leader_participation">
+      <term>
+       <varname>parallel_leader_participation</varname> (<type>boolean</type>)
+       <indexterm>
+        <primary>
+         <varname>parallel_leader_participation</varname> configuration
+         parameter
+        </primary>
+       </indexterm>
+      </term>
+      <listitem>
+       <para>
+        Allows the leader process to execute the query plan under
+        <literal>Gather</literal> and <literal>Gather Merge</literal> nodes
+        instead of waiting for worker processes.  The default is
+        <literal>on</literal>.  Setting this value to <literal>off</literal>
+        reduces the likelihood that workers will become blocked because the
+        leader is not reading tuples fast enough, but requires the leader
+        process to wait for worker processes to start up before the first
+        tuples can be produced.  The degree to which the leader can help or
+        hinder performance depends on the plan type, number of workers and
+        query duration.
        </para>
       </listitem>
      </varlistentry>
@@ -4295,24 +4398,24 @@ SELECT * FROM parent WHERE key = 2400;
      <varlistentry id="guc-force-parallel-mode" xreflabel="force_parallel_mode">
       <term><varname>force_parallel_mode</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>force_parallel_mode</> configuration parameter</primary>
+       <primary><varname>force_parallel_mode</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Allows the use of parallel queries for testing purposes even in cases
         where no performance benefit is expected.
-        The allowed values of <varname>force_parallel_mode</> are
-        <literal>off</> (use parallel mode only when it is expected to improve
-        performance), <literal>on</> (force parallel query for all queries
-        for which it is thought to be safe), and <literal>regress</> (like
-        <literal>on</>, but with additional behavior changes as explained
+        The allowed values of <varname>force_parallel_mode</varname> are
+        <literal>off</literal> (use parallel mode only when it is expected to improve
+        performance), <literal>on</literal> (force parallel query for all queries
+        for which it is thought to be safe), and <literal>regress</literal> (like
+        <literal>on</literal>, but with additional behavior changes as explained
         below).
        </para>
 
        <para>
-        More specifically, setting this value to <literal>on</> will add
-        a <literal>Gather</> node to the top of any query plan for which this
+        More specifically, setting this value to <literal>on</literal> will add
+        a <literal>Gather</literal> node to the top of any query plan for which this
         appears to be safe, so that the query runs inside of a parallel worker.
         Even when a parallel worker is not available or cannot be used,
         operations such as starting a subtransaction that would be prohibited
@@ -4324,15 +4427,15 @@ SELECT * FROM parent WHERE key = 2400;
        </para>
 
        <para>
-        Setting this value to <literal>regress</> has all of the same effects
-        as setting it to <literal>on</> plus some additional effects that are
+        Setting this value to <literal>regress</literal> has all of the same effects
+        as setting it to <literal>on</literal> plus some additional effects that are
         intended to facilitate automated regression testing.  Normally,
         messages from a parallel worker include a context line indicating that,
-        but a setting of <literal>regress</> suppresses this line so that the
+        but a setting of <literal>regress</literal> suppresses this line so that the
         output is the same as in non-parallel execution.  Also,
-        the <literal>Gather</> nodes added to plans by this setting are hidden
-        in <literal>EXPLAIN</> output so that the output matches what
-        would be obtained if this setting were turned <literal>off</>.
+        the <literal>Gather</literal> nodes added to plans by this setting are hidden
+        in <literal>EXPLAIN</literal> output so that the output matches what
+        would be obtained if this setting were turned <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -4365,7 +4468,7 @@ SELECT * FROM parent WHERE key = 2400;
      <varlistentry id="guc-log-destination" xreflabel="log_destination">
       <term><varname>log_destination</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>log_destination</> configuration parameter</primary>
+       <primary><varname>log_destination</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4378,22 +4481,22 @@ SELECT * FROM parent WHERE key = 2400;
          parameter to a list of desired log destinations separated by
          commas. The default is to log to <systemitem>stderr</systemitem>
          only.
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
        </para>
        <para>
-        If <systemitem>csvlog</> is included in <varname>log_destination</>,
+        If <systemitem>csvlog</systemitem> is included in <varname>log_destination</varname>,
         log entries are output in <quote>comma separated
-        value</> (<acronym>CSV</>) format, which is convenient for
+        value</quote> (<acronym>CSV</acronym>) format, which is convenient for
         loading logs into programs.
-        See <xref linkend="runtime-config-logging-csvlog"> for details.
-        <xref linkend="guc-logging-collector"> must be enabled to generate
+        See <xref linkend="runtime-config-logging-csvlog"/> for details.
+        <xref linkend="guc-logging-collector"/> must be enabled to generate
         CSV-format log output.
        </para>
        <para>
         When either <systemitem>stderr</systemitem> or
         <systemitem>csvlog</systemitem> are included, the file
-        <filename>current_logfiles</> is created to record the location
+        <filename>current_logfiles</filename> is created to record the location
         of the log file(s) currently in use by the logging collector and the
         associated logging destination. This provides a convenient way to
         find the logs currently in use by the instance. Here is an example of
@@ -4405,10 +4508,10 @@ csvlog log/postgresql.csv
 
         <filename>current_logfiles</filename> is recreated when a new log file
         is created as an effect of rotation, and
-        when <varname>log_destination</> is reloaded.  It is removed when
+        when <varname>log_destination</varname> is reloaded.  It is removed when
         neither <systemitem>stderr</systemitem>
         nor <systemitem>csvlog</systemitem> are included
-        in <varname>log_destination</>, and when the logging collector is
+        in <varname>log_destination</varname>, and when the logging collector is
         disabled.
        </para>
 
@@ -4417,10 +4520,10 @@ csvlog log/postgresql.csv
          On most Unix systems, you will need to alter the configuration of
          your system's <application>syslog</application> daemon in order
          to make use of the <systemitem>syslog</systemitem> option for
-         <varname>log_destination</>.  <productname>PostgreSQL</productname>
+         <varname>log_destination</varname>.  <productname>PostgreSQL</productname>
          can log to <application>syslog</application> facilities
-         <literal>LOCAL0</> through <literal>LOCAL7</> (see <xref
-         linkend="guc-syslog-facility">), but the default
+         <literal>LOCAL0</literal> through <literal>LOCAL7</literal> (see <xref
+         linkend="guc-syslog-facility"/>), but the default
          <application>syslog</application> configuration on most platforms
          will discard all such messages.  You will need to add something like:
 <programlisting>
@@ -4431,11 +4534,11 @@ local0.*    /var/log/postgresql
         </para>
         <para>
          On Windows, when you use the <literal>eventlog</literal>
-         option for <varname>log_destination</>, you should
+         option for <varname>log_destination</varname>, you should
          register an event source and its library with the operating
          system so that the Windows Event Viewer can display event
          log messages cleanly.
-         See <xref linkend="event-log-registration"> for details.
+         See <xref linkend="event-log-registration"/> for details.
         </para>
        </note>
       </listitem>
@@ -4444,27 +4547,27 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-logging-collector" xreflabel="logging_collector">
       <term><varname>logging_collector</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>logging_collector</> configuration parameter</primary>
+       <primary><varname>logging_collector</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-         This parameter enables the <firstterm>logging collector</>, which
+         This parameter enables the <firstterm>logging collector</firstterm>, which
          is a background process that captures log messages
-         sent to <systemitem>stderr</> and redirects them into log files.
+         sent to <systemitem>stderr</systemitem> and redirects them into log files.
          This approach is often more useful than
-         logging to <application>syslog</>, since some types of messages
-         might not appear in <application>syslog</> output.  (One common
+         logging to <application>syslog</application>, since some types of messages
+         might not appear in <application>syslog</application> output.  (One common
          example is dynamic-linker failure messages; another is error messages
-         produced by scripts such as <varname>archive_command</>.)
+         produced by scripts such as <varname>archive_command</varname>.)
          This parameter can only be set at server start.
        </para>
 
        <note>
         <para>
-         It is possible to log to <systemitem>stderr</> without using the
+         It is possible to log to <systemitem>stderr</systemitem> without using the
          logging collector; the log messages will just go to wherever the
-         server's <systemitem>stderr</> is directed.  However, that method is
+         server's <systemitem>stderr</systemitem> is directed.  However, that method is
          only suitable for low log volumes, since it provides no convenient
          way to rotate log files.  Also, on some platforms not using the
          logging collector can result in lost or garbled log output, because
@@ -4478,7 +4581,7 @@ local0.*    /var/log/postgresql
           The logging collector is designed to never lose messages.  This means
           that in case of extremely high load, server processes could be
           blocked while trying to send additional log messages when the
-          collector has fallen behind.  In contrast, <application>syslog</>
+          collector has fallen behind.  In contrast, <application>syslog</application>
           prefers to drop messages if it cannot write them, which means it
           may fail to log some messages in such cases but it will not block
           the rest of the system.
@@ -4491,16 +4594,16 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-directory" xreflabel="log_directory">
       <term><varname>log_directory</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>log_directory</> configuration parameter</primary>
+       <primary><varname>log_directory</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When <varname>logging_collector</> is enabled,
+        When <varname>logging_collector</varname> is enabled,
         this parameter determines the directory in which log files will be created.
         It can be specified as an absolute path, or relative to the
         cluster data directory.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
         The default is <literal>log</literal>.
        </para>
@@ -4510,7 +4613,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-filename" xreflabel="log_filename">
       <term><varname>log_filename</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>log_filename</> configuration parameter</primary>
+       <primary><varname>log_filename</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4522,7 +4625,7 @@ local0.*    /var/log/postgresql
         file names.  (Note that if there are
         any time-zone-dependent <literal>%</literal>-escapes, the computation
         is done in the zone specified
-        by <xref linkend="guc-log-timezone">.)
+        by <xref linkend="guc-log-timezone"/>.)
         The supported <literal>%</literal>-escapes are similar to those
         listed in the Open Group's <ulink
         url="http://pubs.opengroup.org/onlinepubs/009695399/functions/strftime.html">strftime
@@ -4541,14 +4644,14 @@ local0.*    /var/log/postgresql
         longer the case.
        </para>
        <para>
-        If CSV-format output is enabled in <varname>log_destination</>,
-        <literal>.csv</> will be appended to the timestamped
+        If CSV-format output is enabled in <varname>log_destination</varname>,
+        <literal>.csv</literal> will be appended to the timestamped
         log file name to create the file name for CSV-format output.
-        (If <varname>log_filename</> ends in <literal>.log</>, the suffix is
+        (If <varname>log_filename</varname> ends in <literal>.log</literal>, the suffix is
         replaced instead.)
        </para>
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4557,7 +4660,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-file-mode" xreflabel="log_file_mode">
       <term><varname>log_file_mode</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_file_mode</> configuration parameter</primary>
+       <primary><varname>log_file_mode</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4572,17 +4675,17 @@ local0.*    /var/log/postgresql
         must start with a <literal>0</literal> (zero).)
        </para>
        <para>
-        The default permissions are <literal>0600</>, meaning only the
+        The default permissions are <literal>0600</literal>, meaning only the
         server owner can read or write the log files.  The other commonly
-        useful setting is <literal>0640</>, allowing members of the owner's
+        useful setting is <literal>0640</literal>, allowing members of the owner's
         group to read the files.  Note however that to make use of such a
-        setting, you'll need to alter <xref linkend="guc-log-directory"> to
+        setting, you'll need to alter <xref linkend="guc-log-directory"/> to
         store the files somewhere outside the cluster data directory.  In
         any case, it's unwise to make the log files world-readable, since
         they might contain sensitive data.
        </para>
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4591,7 +4694,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-rotation-age" xreflabel="log_rotation_age">
       <term><varname>log_rotation_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_rotation_age</> configuration parameter</primary>
+       <primary><varname>log_rotation_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4601,7 +4704,7 @@ local0.*    /var/log/postgresql
         After this many minutes have elapsed, a new log file will
         be created.  Set to zero to disable time-based creation of
         new log files.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4610,7 +4713,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-rotation-size" xreflabel="log_rotation_size">
       <term><varname>log_rotation_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_rotation_size</> configuration parameter</primary>
+       <primary><varname>log_rotation_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4620,7 +4723,7 @@ local0.*    /var/log/postgresql
         After this many kilobytes have been emitted into a log file,
         a new log file will be created.  Set to zero to disable size-based
         creation of new log files.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4629,7 +4732,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-truncate-on-rotation" xreflabel="log_truncate_on_rotation">
       <term><varname>log_truncate_on_rotation</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_truncate_on_rotation</> configuration parameter</primary>
+       <primary><varname>log_truncate_on_rotation</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4644,7 +4747,7 @@ local0.*    /var/log/postgresql
         a <varname>log_filename</varname> like <literal>postgresql-%H.log</literal>
         would result in generating twenty-four hourly log files and then
         cyclically overwriting them.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
        <para>
@@ -4662,7 +4765,7 @@ local0.*    /var/log/postgresql
         <varname>log_truncate_on_rotation</varname> to <literal>on</literal>,
         <varname>log_rotation_age</varname> to <literal>60</literal>, and
         <varname>log_rotation_size</varname> to <literal>1000000</literal>.
-        Including <literal>%M</> in <varname>log_filename</varname> allows
+        Including <literal>%M</literal> in <varname>log_filename</varname> allows
         any size-driven rotations that might occur to select a file name
         different from the hour's initial file name.
        </para>
@@ -4672,21 +4775,21 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-syslog-facility" xreflabel="syslog_facility">
       <term><varname>syslog_facility</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>syslog_facility</> configuration parameter</primary>
+       <primary><varname>syslog_facility</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When logging to <application>syslog</> is enabled, this parameter
+        When logging to <application>syslog</application> is enabled, this parameter
         determines the <application>syslog</application>
         <quote>facility</quote> to be used.  You can choose
-        from <literal>LOCAL0</>, <literal>LOCAL1</>,
-        <literal>LOCAL2</>, <literal>LOCAL3</>, <literal>LOCAL4</>,
-        <literal>LOCAL5</>, <literal>LOCAL6</>, <literal>LOCAL7</>;
-        the default is <literal>LOCAL0</>. See also the
+        from <literal>LOCAL0</literal>, <literal>LOCAL1</literal>,
+        <literal>LOCAL2</literal>, <literal>LOCAL3</literal>, <literal>LOCAL4</literal>,
+        <literal>LOCAL5</literal>, <literal>LOCAL6</literal>, <literal>LOCAL7</literal>;
+        the default is <literal>LOCAL0</literal>. See also the
         documentation of your system's
         <application>syslog</application> daemon.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4695,17 +4798,17 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-syslog-ident" xreflabel="syslog_ident">
       <term><varname>syslog_ident</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>syslog_ident</> configuration parameter</primary>
+       <primary><varname>syslog_ident</varname> configuration parameter</primary>
       </indexterm>
       </term>
        <listitem>
         <para>
-         When logging to <application>syslog</> is enabled, this parameter
+         When logging to <application>syslog</application> is enabled, this parameter
          determines the program name used to identify
          <productname>PostgreSQL</productname> messages in
          <application>syslog</application> logs. The default is
          <literal>postgres</literal>.
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
         </para>
        </listitem>
@@ -4714,7 +4817,7 @@ local0.*    /var/log/postgresql
       <varlistentry id="guc-syslog-sequence-numbers" xreflabel="syslog_sequence_numbers">
        <term><varname>syslog_sequence_numbers</varname> (<type>boolean</type>)
         <indexterm>
-         <primary><varname>syslog_sequence_numbers</> configuration parameter</primary>
+         <primary><varname>syslog_sequence_numbers</varname> configuration parameter</primary>
         </indexterm>
        </term>
 
@@ -4733,7 +4836,7 @@ local0.*    /var/log/postgresql
         </para>
 
         <para>
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line.
         </para>
       </listitem>
@@ -4742,12 +4845,12 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-syslog-split-messages" xreflabel="syslog_split_messages">
       <term><varname>syslog_split_messages</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>syslog_split_messages</> configuration parameter</primary>
+       <primary><varname>syslog_split_messages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When logging to <application>syslog</> is enabled, this parameter
+        When logging to <application>syslog</application> is enabled, this parameter
         determines how messages are delivered to syslog.  When on (the
         default), messages are split by lines, and long lines are split so
         that they will fit into 1024 bytes, which is a typical size limit for
@@ -4766,7 +4869,7 @@ local0.*    /var/log/postgresql
        </para>
 
        <para>
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4775,16 +4878,16 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-event-source" xreflabel="event_source">
       <term><varname>event_source</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>event_source</> configuration parameter</primary>
+       <primary><varname>event_source</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When logging to <application>event log</> is enabled, this parameter
+        When logging to <application>event log</application> is enabled, this parameter
         determines the program name used to identify
         <productname>PostgreSQL</productname> messages in
         the log. The default is <literal>PostgreSQL</literal>.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -4800,21 +4903,21 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-client-min-messages" xreflabel="client_min_messages">
       <term><varname>client_min_messages</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>client_min_messages</> configuration parameter</primary>
+       <primary><varname>client_min_messages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls which message levels are sent to the client.
-        Valid values are <literal>DEBUG5</>,
-        <literal>DEBUG4</>, <literal>DEBUG3</>, <literal>DEBUG2</>,
-        <literal>DEBUG1</>, <literal>LOG</>, <literal>NOTICE</>,
-        <literal>WARNING</>, <literal>ERROR</>, <literal>FATAL</>,
-        and <literal>PANIC</>.  Each level
+        Valid values are <literal>DEBUG5</literal>,
+        <literal>DEBUG4</literal>, <literal>DEBUG3</literal>, <literal>DEBUG2</literal>,
+        <literal>DEBUG1</literal>, <literal>LOG</literal>, <literal>NOTICE</literal>,
+        <literal>WARNING</literal>, <literal>ERROR</literal>, <literal>FATAL</literal>,
+        and <literal>PANIC</literal>.  Each level
         includes all the levels that follow it.  The later the level,
         the fewer messages are sent.  The default is
-        <literal>NOTICE</>.  Note that <literal>LOG</> has a different
-        rank here than in <varname>log_min_messages</>.
+        <literal>NOTICE</literal>.  Note that <literal>LOG</literal> has a different
+        rank here than in <varname>log_min_messages</varname>.
        </para>
       </listitem>
      </varlistentry>
@@ -4822,21 +4925,21 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-min-messages" xreflabel="log_min_messages">
       <term><varname>log_min_messages</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>log_min_messages</> configuration parameter</primary>
+       <primary><varname>log_min_messages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls which message levels are written to the server log.
-        Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
-        <literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG1</>,
-        <literal>INFO</>, <literal>NOTICE</>, <literal>WARNING</>,
-        <literal>ERROR</>, <literal>LOG</>, <literal>FATAL</>, and
-        <literal>PANIC</>.  Each level includes all the levels that
+        Valid values are <literal>DEBUG5</literal>, <literal>DEBUG4</literal>,
+        <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, <literal>DEBUG1</literal>,
+        <literal>INFO</literal>, <literal>NOTICE</literal>, <literal>WARNING</literal>,
+        <literal>ERROR</literal>, <literal>LOG</literal>, <literal>FATAL</literal>, and
+        <literal>PANIC</literal>.  Each level includes all the levels that
         follow it.  The later the level, the fewer messages are sent
-        to the log.  The default is <literal>WARNING</>.  Note that
-        <literal>LOG</> has a different rank here than in
-        <varname>client_min_messages</>.
+        to the log.  The default is <literal>WARNING</literal>.  Note that
+        <literal>LOG</literal> has a different rank here than in
+        <varname>client_min_messages</varname>.
         Only superusers can change this setting.
        </para>
       </listitem>
@@ -4845,7 +4948,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-min-error-statement" xreflabel="log_min_error_statement">
       <term><varname>log_min_error_statement</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>log_min_error_statement</> configuration parameter</primary>
+       <primary><varname>log_min_error_statement</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -4873,7 +4976,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-min-duration-statement" xreflabel="log_min_duration_statement">
       <term><varname>log_min_duration_statement</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_min_duration_statement</> configuration parameter</primary>
+       <primary><varname>log_min_duration_statement</varname> configuration parameter</primary>
       </indexterm>
       </term>
        <listitem>
@@ -4897,13 +5000,13 @@ local0.*    /var/log/postgresql
        <note>
         <para>
          When using this option together with
-         <xref linkend="guc-log-statement">,
+         <xref linkend="guc-log-statement"/>,
          the text of statements that are logged because of
-         <varname>log_statement</> will not be repeated in the
+         <varname>log_statement</varname> will not be repeated in the
          duration log message.
-         If you are not using <application>syslog</>, it is recommended
+         If you are not using <application>syslog</application>, it is recommended
          that you log the PID or session ID using
-         <xref linkend="guc-log-line-prefix">
+         <xref linkend="guc-log-line-prefix"/>
          so that you can link the statement message to the later
          duration message using the process ID or session ID.
         </para>
@@ -4914,8 +5017,8 @@ local0.*    /var/log/postgresql
      </variablelist>
 
     <para>
-     <xref linkend="runtime-config-severity-levels"> explains the message
-     severity levels used by <productname>PostgreSQL</>.  If logging output
+     <xref linkend="runtime-config-severity-levels"/> explains the message
+     severity levels used by <productname>PostgreSQL</productname>.  If logging output
      is sent to <systemitem>syslog</systemitem> or Windows'
      <systemitem>eventlog</systemitem>, the severity levels are translated
      as shown in the table.
@@ -4928,73 +5031,73 @@ local0.*    /var/log/postgresql
        <row>
         <entry>Severity</entry>
         <entry>Usage</entry>
-        <entry><systemitem>syslog</></entry>
-        <entry><systemitem>eventlog</></entry>
+        <entry><systemitem>syslog</systemitem></entry>
+        <entry><systemitem>eventlog</systemitem></entry>
        </row>
       </thead>
 
       <tbody>
        <row>
-        <entry><literal>DEBUG1..DEBUG5</></entry>
+        <entry><literal>DEBUG1..DEBUG5</literal></entry>
         <entry>Provides successively-more-detailed information for use by
          developers.</entry>
-        <entry><literal>DEBUG</></entry>
-        <entry><literal>INFORMATION</></entry>
+        <entry><literal>DEBUG</literal></entry>
+        <entry><literal>INFORMATION</literal></entry>
        </row>
 
        <row>
-        <entry><literal>INFO</></entry>
+        <entry><literal>INFO</literal></entry>
         <entry>Provides information implicitly requested by the user,
-         e.g., output from <command>VACUUM VERBOSE</>.</entry>
-        <entry><literal>INFO</></entry>
-        <entry><literal>INFORMATION</></entry>
+         e.g., output from <command>VACUUM VERBOSE</command>.</entry>
+        <entry><literal>INFO</literal></entry>
+        <entry><literal>INFORMATION</literal></entry>
        </row>
 
        <row>
-        <entry><literal>NOTICE</></entry>
+        <entry><literal>NOTICE</literal></entry>
         <entry>Provides information that might be helpful to users, e.g.,
          notice of truncation of long identifiers.</entry>
-        <entry><literal>NOTICE</></entry>
-        <entry><literal>INFORMATION</></entry>
+        <entry><literal>NOTICE</literal></entry>
+        <entry><literal>INFORMATION</literal></entry>
        </row>
 
        <row>
-        <entry><literal>WARNING</></entry>
-        <entry>Provides warnings of likely problems, e.g., <command>COMMIT</>
+        <entry><literal>WARNING</literal></entry>
+        <entry>Provides warnings of likely problems, e.g., <command>COMMIT</command>
          outside a transaction block.</entry>
-        <entry><literal>NOTICE</></entry>
-        <entry><literal>WARNING</></entry>
+        <entry><literal>NOTICE</literal></entry>
+        <entry><literal>WARNING</literal></entry>
        </row>
 
        <row>
-        <entry><literal>ERROR</></entry>
+        <entry><literal>ERROR</literal></entry>
         <entry>Reports an error that caused the current command to
          abort.</entry>
-        <entry><literal>WARNING</></entry>
-        <entry><literal>ERROR</></entry>
+        <entry><literal>WARNING</literal></entry>
+        <entry><literal>ERROR</literal></entry>
        </row>
 
        <row>
-        <entry><literal>LOG</></entry>
+        <entry><literal>LOG</literal></entry>
         <entry>Reports information of interest to administrators, e.g.,
          checkpoint activity.</entry>
-        <entry><literal>INFO</></entry>
-        <entry><literal>INFORMATION</></entry>
+        <entry><literal>INFO</literal></entry>
+        <entry><literal>INFORMATION</literal></entry>
        </row>
 
        <row>
-        <entry><literal>FATAL</></entry>
+        <entry><literal>FATAL</literal></entry>
         <entry>Reports an error that caused the current session to
          abort.</entry>
-        <entry><literal>ERR</></entry>
-        <entry><literal>ERROR</></entry>
+        <entry><literal>ERR</literal></entry>
+        <entry><literal>ERROR</literal></entry>
        </row>
 
        <row>
-        <entry><literal>PANIC</></entry>
+        <entry><literal>PANIC</literal></entry>
         <entry>Reports an error that caused all database sessions to abort.</entry>
-        <entry><literal>CRIT</></entry>
-        <entry><literal>ERROR</></entry>
+        <entry><literal>CRIT</literal></entry>
+        <entry><literal>ERROR</literal></entry>
        </row>
       </tbody>
      </tgroup>
@@ -5009,17 +5112,17 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-application-name" xreflabel="application_name">
       <term><varname>application_name</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>application_name</> configuration parameter</primary>
+       <primary><varname>application_name</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         The <varname>application_name</varname> can be any string of less than
-        <symbol>NAMEDATALEN</> characters (64 characters in a standard build).
+        <symbol>NAMEDATALEN</symbol> characters (64 characters in a standard build).
         It is typically set by an application upon connection to the server.
-        The name will be displayed in the <structname>pg_stat_activity</> view
+        The name will be displayed in the <structname>pg_stat_activity</structname> view
         and included in CSV log entries.  It can also be included in regular
-        log entries via the <xref linkend="guc-log-line-prefix"> parameter.
+        log entries via the <xref linkend="guc-log-line-prefix"/> parameter.
         Only printable ASCII characters may be used in the
         <varname>application_name</varname> value. Other characters will be
         replaced with question marks (<literal>?</literal>).
@@ -5030,17 +5133,17 @@ local0.*    /var/log/postgresql
      <varlistentry>
       <term><varname>debug_print_parse</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_print_parse</> configuration parameter</primary>
+       <primary><varname>debug_print_parse</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <term><varname>debug_print_rewritten</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_print_rewritten</> configuration parameter</primary>
+       <primary><varname>debug_print_rewritten</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <term><varname>debug_print_plan</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_print_plan</> configuration parameter</primary>
+       <primary><varname>debug_print_plan</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5048,11 +5151,11 @@ local0.*    /var/log/postgresql
         These parameters enable various debugging output to be emitted.
         When set, they print the resulting parse tree, the query rewriter
         output, or the execution plan for each executed query.
-        These messages are emitted at <literal>LOG</> message level, so by
+        These messages are emitted at <literal>LOG</literal> message level, so by
         default they will appear in the server log but will not be sent to the
         client.  You can change that by adjusting
-        <xref linkend="guc-client-min-messages"> and/or
-        <xref linkend="guc-log-min-messages">.
+        <xref linkend="guc-client-min-messages"/> and/or
+        <xref linkend="guc-log-min-messages"/>.
         These parameters are off by default.
        </para>
       </listitem>
@@ -5061,7 +5164,7 @@ local0.*    /var/log/postgresql
      <varlistentry>
       <term><varname>debug_pretty_print</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_pretty_print</> configuration parameter</primary>
+       <primary><varname>debug_pretty_print</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5070,7 +5173,7 @@ local0.*    /var/log/postgresql
         produced by <varname>debug_print_parse</varname>,
         <varname>debug_print_rewritten</varname>, or
         <varname>debug_print_plan</varname>.  This results in more readable
-        but much longer output than the <quote>compact</> format used when
+        but much longer output than the <quote>compact</quote> format used when
         it is off.  It is on by default.
        </para>
       </listitem>
@@ -5079,7 +5182,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-checkpoints" xreflabel="log_checkpoints">
       <term><varname>log_checkpoints</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_checkpoints</> configuration parameter</primary>
+       <primary><varname>log_checkpoints</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5087,7 +5190,7 @@ local0.*    /var/log/postgresql
         Causes checkpoints and restartpoints to be logged in the server log.
         Some statistics are included in the log messages, including the number
         of buffers written and the time spent writing them.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line. The default is off.
        </para>
       </listitem>
@@ -5096,7 +5199,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-connections" xreflabel="log_connections">
       <term><varname>log_connections</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_connections</> configuration parameter</primary>
+       <primary><varname>log_connections</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5105,14 +5208,14 @@ local0.*    /var/log/postgresql
         as well as successful completion of client authentication.
         Only superusers can change this parameter at session start,
         and it cannot be changed at all within a session.
-        The default is <literal>off</>.
+        The default is <literal>off</literal>.
        </para>
 
        <note>
         <para>
-         Some client programs, like <application>psql</>, attempt
+         Some client programs, like <application>psql</application>, attempt
          to connect twice while determining if a password is required, so
-         duplicate <quote>connection received</> messages do not
+         duplicate <quote>connection received</quote> messages do not
          necessarily indicate a problem.
         </para>
        </note>
@@ -5122,7 +5225,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-disconnections" xreflabel="log_disconnections">
       <term><varname>log_disconnections</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_disconnections</> configuration parameter</primary>
+       <primary><varname>log_disconnections</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5132,7 +5235,7 @@ local0.*    /var/log/postgresql
         plus the duration of the session.
         Only superusers can change this parameter at session start,
         and it cannot be changed at all within a session.
-        The default is <literal>off</>.
+        The default is <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -5141,13 +5244,13 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-duration" xreflabel="log_duration">
       <term><varname>log_duration</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_duration</> configuration parameter</primary>
+       <primary><varname>log_duration</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Causes the duration of every completed statement to be logged.
-        The default is <literal>off</>.
+        The default is <literal>off</literal>.
         Only superusers can change this setting.
        </para>
 
@@ -5159,11 +5262,11 @@ local0.*    /var/log/postgresql
        <note>
         <para>
          The difference between setting this option and setting
-         <xref linkend="guc-log-min-duration-statement"> to zero is that
-         exceeding <varname>log_min_duration_statement</> forces the text of
+         <xref linkend="guc-log-min-duration-statement"/> to zero is that
+         exceeding <varname>log_min_duration_statement</varname> forces the text of
          the query to be logged, but this option doesn't.  Thus, if
-         <varname>log_duration</> is <literal>on</> and
-         <varname>log_min_duration_statement</> has a positive value, all
+         <varname>log_duration</varname> is <literal>on</literal> and
+         <varname>log_min_duration_statement</varname> has a positive value, all
          durations are logged but the query text is included only for
          statements exceeding the threshold.  This behavior can be useful for
          gathering statistics in high-load installations.
@@ -5175,19 +5278,19 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-error-verbosity" xreflabel="log_error_verbosity">
       <term><varname>log_error_verbosity</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>log_error_verbosity</> configuration parameter</primary>
+       <primary><varname>log_error_verbosity</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls the amount of detail written in the server log for each
-        message that is logged.  Valid values are <literal>TERSE</>,
-        <literal>DEFAULT</>, and <literal>VERBOSE</>, each adding more
-        fields to displayed messages.  <literal>TERSE</> excludes
-        the logging of <literal>DETAIL</>, <literal>HINT</>,
-        <literal>QUERY</>, and <literal>CONTEXT</> error information.
-        <literal>VERBOSE</> output includes the <symbol>SQLSTATE</> error
-        code (see also <xref linkend="errcodes-appendix">) and the source code file name, function name,
+        message that is logged.  Valid values are <literal>TERSE</literal>,
+        <literal>DEFAULT</literal>, and <literal>VERBOSE</literal>, each adding more
+        fields to displayed messages.  <literal>TERSE</literal> excludes
+        the logging of <literal>DETAIL</literal>, <literal>HINT</literal>,
+        <literal>QUERY</literal>, and <literal>CONTEXT</literal> error information.
+        <literal>VERBOSE</literal> output includes the <symbol>SQLSTATE</symbol> error
+        code (see also <xref linkend="errcodes-appendix"/>) and the source code file name, function name,
         and line number that generated the error.
         Only superusers can change this setting.
        </para>
@@ -5197,7 +5300,7 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-hostname" xreflabel="log_hostname">
       <term><varname>log_hostname</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_hostname</> configuration parameter</primary>
+       <primary><varname>log_hostname</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5206,7 +5309,7 @@ local0.*    /var/log/postgresql
         connecting host. Turning this parameter on causes logging of the
         host name as well.  Note that depending on your host name resolution
         setup this might impose a non-negligible performance penalty.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -5215,14 +5318,14 @@ local0.*    /var/log/postgresql
      <varlistentry id="guc-log-line-prefix" xreflabel="log_line_prefix">
       <term><varname>log_line_prefix</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>log_line_prefix</> configuration parameter</primary>
+       <primary><varname>log_line_prefix</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-         This is a <function>printf</>-style string that is output at the
+         This is a <function>printf</function>-style string that is output at the
          beginning of each log line.
-         <literal>%</> characters begin <quote>escape sequences</>
+         <literal>%</literal> characters begin <quote>escape sequences</quote>
          that are replaced with status information as outlined below.
          Unrecognized escapes are ignored. Other
          characters are copied straight to the log line. Some escapes are
@@ -5234,9 +5337,9 @@ local0.*    /var/log/postgresql
          right with spaces to give it a minimum width, whereas a positive
          value will pad on the left. Padding can be useful to aid human
          readability in log files.
-         This parameter can only be set in the <filename>postgresql.conf</>
+         This parameter can only be set in the <filename>postgresql.conf</filename>
          file or on the server command line. The default is
-         <literal>'%m [%p] '</> which logs a time stamp and the process ID.
+         <literal>'%m [%p] '</literal> which logs a time stamp and the process ID.
 
          <informaltable>
           <tgroup cols="3">
@@ -5337,19 +5440,19 @@ local0.*    /var/log/postgresql
             </row>
             <row>
              <entry><literal>%%</literal></entry>
-             <entry>Literal <literal>%</></entry>
+             <entry>Literal <literal>%</literal></entry>
              <entry>no</entry>
             </row>
            </tbody>
           </tgroup>
          </informaltable>
 
-         The <literal>%c</> escape prints a quasi-unique session identifier,
+         The <literal>%c</literal> escape prints a quasi-unique session identifier,
          consisting of two 4-byte hexadecimal numbers (without leading zeros)
          separated by a dot.  The numbers are the process start time and the
-         process ID, so <literal>%c</> can also be used as a space saving way
+         process ID, so <literal>%c</literal> can also be used as a space saving way
          of printing those items.  For example, to generate the session
-         identifier from <literal>pg_stat_activity</>, use this query:
+         identifier from <literal>pg_stat_activity</literal>, use this query:
 <programlisting>
 SELECT to_hex(trunc(EXTRACT(EPOCH FROM backend_start))::integer) || '.' ||
        to_hex(pid)
@@ -5360,7 +5463,7 @@ FROM pg_stat_activity;
 
        <tip>
         <para>
-         If you set a nonempty value for <varname>log_line_prefix</>,
+         If you set a nonempty value for <varname>log_line_prefix</varname>,
          you should usually make its last character be a space, to provide
          visual separation from the rest of the log line.  A punctuation
          character can be used too.
@@ -5369,15 +5472,15 @@ FROM pg_stat_activity;
 
        <tip>
         <para>
-         <application>Syslog</> produces its own
+         <application>Syslog</application> produces its own
          time stamp and process ID information, so you probably do not want to
-         include those escapes if you are logging to <application>syslog</>.
+         include those escapes if you are logging to <application>syslog</application>.
         </para>
        </tip>
 
        <tip>
         <para>
-         The <literal>%q</> escape is useful when including information that is
+         The <literal>%q</literal> escape is useful when including information that is
          only available in session (backend) context like user or database
          name.  For example:
 <programlisting>
@@ -5391,15 +5494,15 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <varlistentry id="guc-log-lock-waits" xreflabel="log_lock_waits">
       <term><varname>log_lock_waits</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_lock_waits</> configuration parameter</primary>
+       <primary><varname>log_lock_waits</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls whether a log message is produced when a session waits
-        longer than <xref linkend="guc-deadlock-timeout"> to acquire a
+        longer than <xref linkend="guc-deadlock-timeout"/> to acquire a
         lock.  This is useful in determining if lock waits are causing
-        poor performance.  The default is <literal>off</>.
+        poor performance.  The default is <literal>off</literal>.
         Only superusers can change this setting.
        </para>
       </listitem>
@@ -5408,22 +5511,22 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <varlistentry id="guc-log-statement" xreflabel="log_statement">
       <term><varname>log_statement</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>log_statement</> configuration parameter</primary>
+       <primary><varname>log_statement</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls which SQL statements are logged. Valid values are
-        <literal>none</> (off), <literal>ddl</>, <literal>mod</>, and
-        <literal>all</> (all statements). <literal>ddl</> logs all data definition
-        statements, such as <command>CREATE</>, <command>ALTER</>, and
-        <command>DROP</> statements. <literal>mod</> logs all
-        <literal>ddl</> statements, plus data-modifying statements
-        such as <command>INSERT</>,
-        <command>UPDATE</>, <command>DELETE</>, <command>TRUNCATE</>,
-        and <command>COPY FROM</>.
-        <command>PREPARE</>, <command>EXECUTE</>, and
-        <command>EXPLAIN ANALYZE</> statements are also logged if their
+        <literal>none</literal> (off), <literal>ddl</literal>, <literal>mod</literal>, and
+        <literal>all</literal> (all statements). <literal>ddl</literal> logs all data definition
+        statements, such as <command>CREATE</command>, <command>ALTER</command>, and
+        <command>DROP</command> statements. <literal>mod</literal> logs all
+        <literal>ddl</literal> statements, plus data-modifying statements
+        such as <command>INSERT</command>,
+        <command>UPDATE</command>, <command>DELETE</command>, <command>TRUNCATE</command>,
+        and <command>COPY FROM</command>.
+        <command>PREPARE</command>, <command>EXECUTE</command>, and
+        <command>EXPLAIN ANALYZE</command> statements are also logged if their
         contained command is of an appropriate type.  For clients using
         extended query protocol, logging occurs when an Execute message
         is received, and values of the Bind parameters are included
@@ -5431,20 +5534,20 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
        </para>
 
        <para>
-        The default is <literal>none</>. Only superusers can change this
+        The default is <literal>none</literal>. Only superusers can change this
         setting.
        </para>
 
        <note>
         <para>
          Statements that contain simple syntax errors are not logged
-         even by the <varname>log_statement</> = <literal>all</> setting,
+         even by the <varname>log_statement</varname> = <literal>all</literal> setting,
          because the log message is emitted only after basic parsing has
          been done to determine the statement type.  In the case of extended
          query protocol, this setting likewise does not log statements that
          fail before the Execute phase (i.e., during parse analysis or
-         planning).  Set <varname>log_min_error_statement</> to
-         <literal>ERROR</> (or lower) to log such statements.
+         planning).  Set <varname>log_min_error_statement</varname> to
+         <literal>ERROR</literal> (or lower) to log such statements.
         </para>
        </note>
       </listitem>
@@ -5453,14 +5556,14 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <varlistentry id="guc-log-replication-commands" xreflabel="log_replication_commands">
       <term><varname>log_replication_commands</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_replication_commands</> configuration parameter</primary>
+       <primary><varname>log_replication_commands</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Causes each replication command to be logged in the server log.
-        See <xref linkend="protocol-replication"> for more information about
-        replication command. The default value is <literal>off</>.
+        See <xref linkend="protocol-replication"/> for more information about
+        replication command. The default value is <literal>off</literal>.
         Only superusers can change this setting.
        </para>
       </listitem>
@@ -5469,7 +5572,7 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <varlistentry id="guc-log-temp-files" xreflabel="log_temp_files">
       <term><varname>log_temp_files</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_temp_files</> configuration parameter</primary>
+       <primary><varname>log_temp_files</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5490,19 +5593,19 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <varlistentry id="guc-log-timezone" xreflabel="log_timezone">
       <term><varname>log_timezone</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>log_timezone</> configuration parameter</primary>
+       <primary><varname>log_timezone</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the time zone used for timestamps written in the server log.
-        Unlike <xref linkend="guc-timezone">, this value is cluster-wide,
+        Unlike <xref linkend="guc-timezone"/>, this value is cluster-wide,
         so that all sessions will report timestamps consistently.
-        The built-in default is <literal>GMT</>, but that is typically
-        overridden in <filename>postgresql.conf</>; <application>initdb</>
+        The built-in default is <literal>GMT</literal>, but that is typically
+        overridden in <filename>postgresql.conf</filename>; <application>initdb</application>
         will install a setting there corresponding to its system environment.
-        See <xref linkend="datatype-timezones"> for more information.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        See <xref linkend="datatype-timezones"/> for more information.
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -5514,10 +5617,10 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
      <title>Using CSV-Format Log Output</title>
 
        <para>
-        Including <literal>csvlog</> in the <varname>log_destination</> list
+        Including <literal>csvlog</literal> in the <varname>log_destination</varname> list
         provides a convenient way to import log files into a database table.
         This option emits log lines in comma-separated-values
-        (<acronym>CSV</>) format,
+        (<acronym>CSV</acronym>) format,
         with these columns:
         time stamp with milliseconds,
         user name,
@@ -5539,10 +5642,10 @@ log_line_prefix = '%m [%p] %q%u@%d/%a '
         character count of the error position therein,
         error context,
         user query that led to the error (if any and enabled by
-        <varname>log_min_error_statement</>),
+        <varname>log_min_error_statement</varname>),
         character count of the error position therein,
         location of the error in the PostgreSQL source code
-        (if <varname>log_error_verbosity</> is set to <literal>verbose</>),
+        (if <varname>log_error_verbosity</varname> is set to <literal>verbose</literal>),
         and application name.
         Here is a sample table definition for storing CSV-format log output:
 
@@ -5578,7 +5681,7 @@ CREATE TABLE postgres_log
        </para>
 
        <para>
-        To import a log file into this table, use the <command>COPY FROM</>
+        To import a log file into this table, use the <command>COPY FROM</command>
         command:
 
 <programlisting>
@@ -5594,7 +5697,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
          <listitem>
            <para>
             Set <varname>log_filename</varname> and
-            <varname>log_rotation_age</> to provide a consistent,
+            <varname>log_rotation_age</varname> to provide a consistent,
             predictable naming scheme for your log files.  This lets you
             predict what the file name will be and know when an individual log
             file is complete and therefore ready to be imported.
@@ -5611,7 +5714,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
         <listitem>
           <para>
-           Set <varname>log_truncate_on_rotation</varname> to <literal>on</> so
+           Set <varname>log_truncate_on_rotation</varname> to <literal>on</literal> so
            that old log data isn't mixed with the new in the same file.
           </para>
         </listitem>
@@ -5620,14 +5723,14 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
           <para>
            The table definition above includes a primary key specification.
            This is useful to protect against accidentally importing the same
-           information twice.  The <command>COPY</> command commits all of the
+           information twice.  The <command>COPY</command> command commits all of the
            data it imports at one time, so any error will cause the entire
            import to fail.  If you import a partial log file and later import
            the file again when it is complete, the primary key violation will
            cause the import to fail.  Wait until the log is complete and
            closed before importing.  This procedure will also protect against
            accidentally importing a partial line that hasn't been completely
-           written, which would also cause <command>COPY</> to fail.
+           written, which would also cause <command>COPY</command> to fail.
           </para>
         </listitem>
         </orderedlist>
@@ -5640,26 +5743,26 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
     <para>
      These settings control how process titles of server processes are
      modified.  Process titles are typically viewed using programs like
-     <application>ps</> or, on Windows, <application>Process Explorer</>.
-     See <xref linkend="monitoring-ps"> for details.
+     <application>ps</application> or, on Windows, <application>Process Explorer</application>.
+     See <xref linkend="monitoring-ps"/> for details.
     </para>
 
     <variablelist>
      <varlistentry id="guc-cluster-name" xreflabel="cluster_name">
       <term><varname>cluster_name</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>cluster_name</> configuration parameter</primary>
+       <primary><varname>cluster_name</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the cluster name that appears in the process title for all
         server processes in this cluster. The name can be any string of less
-        than <symbol>NAMEDATALEN</> characters (64 characters in a standard
+        than <symbol>NAMEDATALEN</symbol> characters (64 characters in a standard
         build). Only printable ASCII characters may be used in the
         <varname>cluster_name</varname> value. Other characters will be
         replaced with question marks (<literal>?</literal>).  No name is shown
-        if this parameter is set to the empty string <literal>''</> (which is
+        if this parameter is set to the empty string <literal>''</literal> (which is
         the default). This parameter can only be set at server start.
        </para>
       </listitem>
@@ -5668,15 +5771,15 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-update-process-title" xreflabel="update_process_title">
       <term><varname>update_process_title</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>update_process_title</> configuration parameter</primary>
+       <primary><varname>update_process_title</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables updating of the process title every time a new SQL command
         is received by the server.
-        This setting defaults to <literal>on</> on most platforms, but it
-        defaults to <literal>off</> on Windows due to that platform's larger
+        This setting defaults to <literal>on</literal> on most platforms, but it
+        defaults to <literal>off</literal> on Windows due to that platform's larger
         overhead for updating the process title.
         Only superusers can change this setting.
        </para>
@@ -5697,7 +5800,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       When statistics collection is enabled, the data that is produced can be
       accessed via the <structname>pg_stat</structname> and
       <structname>pg_statio</structname> family of system views.
-      Refer to <xref linkend="monitoring"> for more information.
+      Refer to <xref linkend="monitoring"/> for more information.
      </para>
 
      <variablelist>
@@ -5705,7 +5808,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-track-activities" xreflabel="track_activities">
       <term><varname>track_activities</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>track_activities</> configuration parameter</primary>
+       <primary><varname>track_activities</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5725,14 +5828,14 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-track-activity-query-size" xreflabel="track_activity_query_size">
       <term><varname>track_activity_query_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>track_activity_query_size</> configuration parameter</primary>
+       <primary><varname>track_activity_query_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
        Specifies the number of bytes reserved to track the currently
        executing command for each active session, for the
-       <structname>pg_stat_activity</>.<structfield>query</> field.
+       <structname>pg_stat_activity</structname>.<structfield>query</structfield> field.
        The default value is 1024. This parameter can only be set at server
        start.
        </para>
@@ -5742,7 +5845,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-track-counts" xreflabel="track_counts">
       <term><varname>track_counts</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>track_counts</> configuration parameter</primary>
+       <primary><varname>track_counts</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5758,7 +5861,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-track-io-timing" xreflabel="track_io_timing">
       <term><varname>track_io_timing</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>track_io_timing</> configuration parameter</primary>
+       <primary><varname>track_io_timing</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5766,12 +5869,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Enables timing of database I/O calls.  This parameter is off by
         default, because it will repeatedly query the operating system for
         the current time, which may cause significant overhead on some
-        platforms.  You can use the <xref linkend="pgtesttiming"> tool to
+        platforms.  You can use the <xref linkend="pgtesttiming"/> tool to
         measure the overhead of timing on your system.
         I/O timing information is
-        displayed in <xref linkend="pg-stat-database-view">, in the output of
-        <xref linkend="sql-explain"> when the <literal>BUFFERS</> option is
-        used, and by <xref linkend="pgstatstatements">.  Only superusers can
+        displayed in <xref linkend="pg-stat-database-view"/>, in the output of
+        <xref linkend="sql-explain"/> when the <literal>BUFFERS</literal> option is
+        used, and by <xref linkend="pgstatstatements"/>.  Only superusers can
         change this setting.
        </para>
       </listitem>
@@ -5780,7 +5883,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-track-functions" xreflabel="track_functions">
       <term><varname>track_functions</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>track_functions</> configuration parameter</primary>
+       <primary><varname>track_functions</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5794,7 +5897,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
        <note>
         <para>
-         SQL-language functions that are simple enough to be <quote>inlined</>
+         SQL-language functions that are simple enough to be <quote>inlined</quote>
          into the calling query will not be tracked, regardless of this
          setting.
         </para>
@@ -5805,7 +5908,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-stats-temp-directory" xreflabel="stats_temp_directory">
       <term><varname>stats_temp_directory</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>stats_temp_directory</> configuration parameter</primary>
+       <primary><varname>stats_temp_directory</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5815,7 +5918,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         is <filename>pg_stat_tmp</filename>. Pointing this at a RAM-based
         file system will decrease physical I/O requirements and can lead to
         improved performance.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -5831,29 +5934,29 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry>
       <term><varname>log_statement_stats</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_statement_stats</> configuration parameter</primary>
+       <primary><varname>log_statement_stats</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <term><varname>log_parser_stats</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_parser_stats</> configuration parameter</primary>
+       <primary><varname>log_parser_stats</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <term><varname>log_planner_stats</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_planner_stats</> configuration parameter</primary>
+       <primary><varname>log_planner_stats</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <term><varname>log_executor_stats</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_executor_stats</> configuration parameter</primary>
+       <primary><varname>log_executor_stats</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         For each query, output performance statistics of the respective
         module to the server log. This is a crude profiling
-        instrument, similar to the Unix <function>getrusage()</> operating
+        instrument, similar to the Unix <function>getrusage()</function> operating
         system facility.  <varname>log_statement_stats</varname> reports total
         statement statistics, while the others report per-module statistics.
         <varname>log_statement_stats</varname> cannot be enabled together with
@@ -5877,11 +5980,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
     </indexterm>
 
      <para>
-      These settings control the behavior of the <firstterm>autovacuum</>
-      feature.  Refer to <xref linkend="autovacuum"> for more information.
+      These settings control the behavior of the <firstterm>autovacuum</firstterm>
+      feature.  Refer to <xref linkend="autovacuum"/> for more information.
       Note that many of these settings can be overridden on a per-table
       basis; see <xref linkend="sql-createtable-storage-parameters"
-      endterm="sql-createtable-storage-parameters-title">.
+      endterm="sql-createtable-storage-parameters-title"/>.
      </para>
 
     <variablelist>
@@ -5889,16 +5992,16 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum" xreflabel="autovacuum">
       <term><varname>autovacuum</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>autovacuum</> configuration parameter</primary>
+       <primary><varname>autovacuum</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Controls whether the server should run the
         autovacuum launcher daemon.  This is on by default; however,
-        <xref linkend="guc-track-counts"> must also be enabled for
+        <xref linkend="guc-track-counts"/> must also be enabled for
         autovacuum to work.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line; however, autovacuuming can be
         disabled for individual tables by changing table storage parameters.
        </para>
@@ -5906,7 +6009,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Note that even when this parameter is disabled, the system
         will launch autovacuum processes if necessary to
         prevent transaction ID wraparound.  See <xref
-        linkend="vacuum-for-wraparound"> for more information.
+        linkend="vacuum-for-wraparound"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -5914,7 +6017,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-log-autovacuum-min-duration" xreflabel="log_autovacuum_min_duration">
       <term><varname>log_autovacuum_min_duration</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>log_autovacuum_min_duration</> configuration parameter</primary>
+       <primary><varname>log_autovacuum_min_duration</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5926,10 +6029,10 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         <literal>250ms</literal> then all automatic vacuums and analyzes that run
         250ms or longer will be logged.  In addition, when this parameter is
         set to any value other than <literal>-1</literal>, a message will be
-        logged if an autovacuum action is skipped due to the existence of a
-        conflicting lock.  Enabling this parameter can be helpful
+        logged if an autovacuum action is skipped due to a conflicting lock or a
+        concurrently dropped relation.  Enabling this parameter can be helpful
         in tracking autovacuum activity.  This parameter can only be set in
-        the <filename>postgresql.conf</> file or on the server command line;
+        the <filename>postgresql.conf</filename> file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
        </para>
@@ -5939,7 +6042,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-max-workers" xreflabel="autovacuum_max_workers">
       <term><varname>autovacuum_max_workers</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_max_workers</> configuration parameter</primary>
+       <primary><varname>autovacuum_max_workers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -5954,17 +6057,17 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-naptime" xreflabel="autovacuum_naptime">
       <term><varname>autovacuum_naptime</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_naptime</> configuration parameter</primary>
+       <primary><varname>autovacuum_naptime</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the minimum delay between autovacuum runs on any given
         database.  In each round the daemon examines the
-        database and issues <command>VACUUM</> and <command>ANALYZE</> commands
+        database and issues <command>VACUUM</command> and <command>ANALYZE</command> commands
         as needed for tables in that database.  The delay is measured
-        in seconds, and the default is one minute (<literal>1min</>).
-        This parameter can only be set in the <filename>postgresql.conf</>
+        in seconds, and the default is one minute (<literal>1min</literal>).
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -5973,15 +6076,15 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-vacuum-threshold" xreflabel="autovacuum_vacuum_threshold">
       <term><varname>autovacuum_vacuum_threshold</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_vacuum_threshold</> configuration parameter</primary>
+       <primary><varname>autovacuum_vacuum_threshold</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the minimum number of updated or deleted tuples needed
-        to trigger a <command>VACUUM</> in any one table.
+        to trigger a <command>VACUUM</command> in any one table.
         The default is 50 tuples.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -5992,15 +6095,15 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-analyze-threshold" xreflabel="autovacuum_analyze_threshold">
       <term><varname>autovacuum_analyze_threshold</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_analyze_threshold</> configuration parameter</primary>
+       <primary><varname>autovacuum_analyze_threshold</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the minimum number of inserted, updated or deleted tuples
-        needed to trigger an <command>ANALYZE</> in any one table.
+        needed to trigger an <command>ANALYZE</command> in any one table.
         The default is 50 tuples.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -6011,16 +6114,16 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-vacuum-scale-factor" xreflabel="autovacuum_vacuum_scale_factor">
       <term><varname>autovacuum_vacuum_scale_factor</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>autovacuum_vacuum_scale_factor</> configuration parameter</primary>
+       <primary><varname>autovacuum_vacuum_scale_factor</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies a fraction of the table size to add to
         <varname>autovacuum_vacuum_threshold</varname>
-        when deciding whether to trigger a <command>VACUUM</>.
+        when deciding whether to trigger a <command>VACUUM</command>.
         The default is 0.2 (20% of table size).
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -6031,16 +6134,16 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-analyze-scale-factor" xreflabel="autovacuum_analyze_scale_factor">
       <term><varname>autovacuum_analyze_scale_factor</varname> (<type>floating point</type>)
       <indexterm>
-       <primary><varname>autovacuum_analyze_scale_factor</> configuration parameter</primary>
+       <primary><varname>autovacuum_analyze_scale_factor</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies a fraction of the table size to add to
         <varname>autovacuum_analyze_threshold</varname>
-        when deciding whether to trigger an <command>ANALYZE</>.
+        when deciding whether to trigger an <command>ANALYZE</command>.
         The default is 0.1 (10% of table size).
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -6051,14 +6154,14 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-freeze-max-age" xreflabel="autovacuum_freeze_max_age">
       <term><varname>autovacuum_freeze_max_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_freeze_max_age</> configuration parameter</primary>
+       <primary><varname>autovacuum_freeze_max_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the maximum age (in transactions) that a table's
-        <structname>pg_class</>.<structfield>relfrozenxid</> field can
-        attain before a <command>VACUUM</> operation is forced
+        <structname>pg_class</structname>.<structfield>relfrozenxid</structfield> field can
+        attain before a <command>VACUUM</command> operation is forced
         to prevent transaction ID wraparound within the table.
         Note that the system will launch autovacuum processes to
         prevent wraparound even when autovacuum is otherwise disabled.
@@ -6066,12 +6169,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
        <para>
         Vacuum also allows removal of old files from the
-        <filename>pg_xact</> subdirectory, which is why the default
+        <filename>pg_xact</filename> subdirectory, which is why the default
         is a relatively low 200 million transactions.
         This parameter can only be set at server start, but the setting
         can be reduced for individual tables by
         changing table storage parameters.
-        For more information see <xref linkend="vacuum-for-wraparound">.
+        For more information see <xref linkend="vacuum-for-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6085,8 +6188,8 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
       <listitem>
        <para>
         Specifies the maximum age (in multixacts) that a table's
-        <structname>pg_class</>.<structfield>relminmxid</> field can
-        attain before a <command>VACUUM</> operation is forced to
+        <structname>pg_class</structname>.<structfield>relminmxid</structfield> field can
+        attain before a <command>VACUUM</command> operation is forced to
         prevent multixact ID wraparound within the table.
         Note that the system will launch autovacuum processes to
         prevent wraparound even when autovacuum is otherwise disabled.
@@ -6094,12 +6197,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
        <para>
         Vacuuming multixacts also allows removal of old files from the
-        <filename>pg_multixact/members</> and <filename>pg_multixact/offsets</>
+        <filename>pg_multixact/members</filename> and <filename>pg_multixact/offsets</filename>
         subdirectories, which is why the default is a relatively low
         400 million multixacts.
         This parameter can only be set at server start, but the setting can
         be reduced for individual tables by changing table storage parameters.
-        For more information see <xref linkend="vacuum-for-multixact-wraparound">.
+        For more information see <xref linkend="vacuum-for-multixact-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6107,16 +6210,16 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-vacuum-cost-delay" xreflabel="autovacuum_vacuum_cost_delay">
       <term><varname>autovacuum_vacuum_cost_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_vacuum_cost_delay</> configuration parameter</primary>
+       <primary><varname>autovacuum_vacuum_cost_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the cost delay value that will be used in automatic
-        <command>VACUUM</> operations.  If -1 is specified, the regular
-        <xref linkend="guc-vacuum-cost-delay"> value will be used.
+        <command>VACUUM</command> operations.  If -1 is specified, the regular
+        <xref linkend="guc-vacuum-cost-delay"/> value will be used.
         The default value is 20 milliseconds.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -6127,19 +6230,19 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-autovacuum-vacuum-cost-limit" xreflabel="autovacuum_vacuum_cost_limit">
       <term><varname>autovacuum_vacuum_cost_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>autovacuum_vacuum_cost_limit</> configuration parameter</primary>
+       <primary><varname>autovacuum_vacuum_cost_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies the cost limit value that will be used in automatic
-        <command>VACUUM</> operations.  If -1 is specified (which is the
+        <command>VACUUM</command> operations.  If -1 is specified (which is the
         default), the regular
-        <xref linkend="guc-vacuum-cost-limit"> value will be used.  Note that
+        <xref linkend="guc-vacuum-cost-limit"/> value will be used.  Note that
         the value is distributed proportionally among the running autovacuum
         workers, if there is more than one, so that the sum of the limits for
         each worker does not exceed the value of this variable.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line;
         but the setting can be overridden for individual tables by
         changing table storage parameters.
@@ -6160,9 +6263,9 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-search-path" xreflabel="search_path">
       <term><varname>search_path</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>search_path</> configuration parameter</primary>
+       <primary><varname>search_path</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>path</><secondary>for schemas</></>
+      <indexterm><primary>path</primary><secondary>for schemas</secondary></indexterm>
       </term>
       <listitem>
        <para>
@@ -6178,32 +6281,32 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <para>
         The value for <varname>search_path</varname> must be a comma-separated
         list of schema names.  Any name that is not an existing schema, or is
-        a schema for which the user does not have <literal>USAGE</>
+        a schema for which the user does not have <literal>USAGE</literal>
         permission, is silently ignored.
        </para>
 
        <para>
         If one of the list items is the special name
         <literal>$user</literal>, then the schema having the name returned by
-        <function>SESSION_USER</> is substituted, if there is such a schema
-        and the user has <literal>USAGE</> permission for it.
+        <function>SESSION_USER</function> is substituted, if there is such a schema
+        and the user has <literal>USAGE</literal> permission for it.
         (If not, <literal>$user</literal> is ignored.)
        </para>
 
        <para>
-        The system catalog schema, <literal>pg_catalog</>, is always
+        The system catalog schema, <literal>pg_catalog</literal>, is always
         searched, whether it is mentioned in the path or not.  If it is
         mentioned in the path then it will be searched in the specified
-        order.  If <literal>pg_catalog</> is not in the path then it will
-        be searched <emphasis>before</> searching any of the path items.
+        order.  If <literal>pg_catalog</literal> is not in the path then it will
+        be searched <emphasis>before</emphasis> searching any of the path items.
        </para>
 
        <para>
         Likewise, the current session's temporary-table schema,
-        <literal>pg_temp_<replaceable>nnn</></>, is always searched if it
+        <literal>pg_temp_<replaceable>nnn</replaceable></literal>, is always searched if it
         exists.  It can be explicitly listed in the path by using the
-        alias <literal>pg_temp</><indexterm><primary>pg_temp</></>.  If it is not listed in the path then
-        it is searched first (even before <literal>pg_catalog</>).  However,
+        alias <literal>pg_temp</literal><indexterm><primary>pg_temp</primary></indexterm>.  If it is not listed in the path then
+        it is searched first (even before <literal>pg_catalog</literal>).  However,
         the temporary schema is only searched for relation (table, view,
         sequence, etc) and data type names.  It is never searched for
         function or operator names.
@@ -6220,51 +6323,55 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         The default value for this parameter is
         <literal>"$user", public</literal>.
         This setting supports shared use of a database (where no users
-        have private schemas, and all share use of <literal>public</>),
+        have private schemas, and all share use of <literal>public</literal>),
         private per-user schemas, and combinations of these.  Other
         effects can be obtained by altering the default search path
         setting, either globally or per-user.
        </para>
 
+       <para>
+        For more information on schema handling, see
+        <xref linkend="ddl-schemas"/>.  In particular, the default
+        configuration is suitable only when the database has a single user or
+        a few mutually-trusting users.
+       </para>
+
        <para>
         The current effective value of the search path can be examined
         via the <acronym>SQL</acronym> function
-        <function>current_schemas</>
-        (see <xref linkend="functions-info">).
+        <function>current_schemas</function>
+        (see <xref linkend="functions-info"/>).
         This is not quite the same as
         examining the value of <varname>search_path</varname>, since
-        <function>current_schemas</> shows how the items
+        <function>current_schemas</function> shows how the items
         appearing in <varname>search_path</varname> were resolved.
        </para>
 
-       <para>
-        For more information on schema handling, see <xref linkend="ddl-schemas">.
-       </para>
       </listitem>
      </varlistentry>
 
      <varlistentry id="guc-row-security" xreflabel="row_security">
       <term><varname>row_security</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>row_security</> configuration parameter</primary>
+       <primary><varname>row_security</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This variable controls whether to raise an error in lieu of applying a
-        row security policy.  When set to <literal>on</>, policies apply
-        normally.  When set to <literal>off</>, queries fail which would
-        otherwise apply at least one policy.  The default is <literal>on</>.
-        Change to <literal>off</> where limited row visibility could cause
-        incorrect results; for example, <application>pg_dump</> makes that
+        row security policy.  When set to <literal>on</literal>, policies apply
+        normally.  When set to <literal>off</literal>, queries fail which would
+        otherwise apply at least one policy.  The default is <literal>on</literal>.
+        Change to <literal>off</literal> where limited row visibility could cause
+        incorrect results; for example, <application>pg_dump</application> makes that
         change by default.  This variable has no effect on roles which bypass
         every row security policy, to wit, superusers and roles with
-        the <literal>BYPASSRLS</> attribute.
+        the <literal>BYPASSRLS</literal> attribute.
        </para>
 
        <para>
         For more information on row security policies,
-        see <xref linkend="SQL-CREATEPOLICY">.
+        see <xref linkend="sql-createpolicy"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6272,14 +6379,14 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-default-tablespace" xreflabel="default_tablespace">
       <term><varname>default_tablespace</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>default_tablespace</> configuration parameter</primary>
+       <primary><varname>default_tablespace</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>tablespace</><secondary>default</></>
+      <indexterm><primary>tablespace</primary><secondary>default</secondary></indexterm>
       </term>
       <listitem>
        <para>
         This variable specifies the default tablespace in which to create
-        objects (tables and indexes) when a <command>CREATE</> command does
+        objects (tables and indexes) when a <command>CREATE</command> command does
         not explicitly specify a tablespace.
        </para>
 
@@ -6287,15 +6394,15 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         The value is either the name of a tablespace, or an empty string
         to specify using the default tablespace of the current database.
         If the value does not match the name of any existing tablespace,
-        <productname>PostgreSQL</> will automatically use the default
+        <productname>PostgreSQL</productname> will automatically use the default
         tablespace of the current database.  If a nondefault tablespace
-        is specified, the user must have <literal>CREATE</> privilege
+        is specified, the user must have <literal>CREATE</literal> privilege
         for it, or creation attempts will fail.
        </para>
 
        <para>
         This variable is not used for temporary tables; for them,
-        <xref linkend="guc-temp-tablespaces"> is consulted instead.
+        <xref linkend="guc-temp-tablespaces"/> is consulted instead.
        </para>
 
        <para>
@@ -6306,7 +6413,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
 
        <para>
         For more information on tablespaces,
-        see <xref linkend="manage-ag-tablespaces">.
+        see <xref linkend="manage-ag-tablespaces"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6314,38 +6421,38 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-temp-tablespaces" xreflabel="temp_tablespaces">
       <term><varname>temp_tablespaces</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>temp_tablespaces</> configuration parameter</primary>
+       <primary><varname>temp_tablespaces</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>tablespace</><secondary>temporary</></>
+      <indexterm><primary>tablespace</primary><secondary>temporary</secondary></indexterm>
       </term>
       <listitem>
        <para>
         This variable specifies tablespaces in which to create temporary
         objects (temp tables and indexes on temp tables) when a
-        <command>CREATE</> command does not explicitly specify a tablespace.
+        <command>CREATE</command> command does not explicitly specify a tablespace.
         Temporary files for purposes such as sorting large data sets
         are also created in these tablespaces.
        </para>
 
        <para>
         The value is a list of names of tablespaces.  When there is more than
-        one name in the list, <productname>PostgreSQL</> chooses a random
+        one name in the list, <productname>PostgreSQL</productname> chooses a random
         member of the list each time a temporary object is to be created;
         except that within a transaction, successively created temporary
         objects are placed in successive tablespaces from the list.
         If the selected element of the list is an empty string,
-        <productname>PostgreSQL</> will automatically use the default
+        <productname>PostgreSQL</productname> will automatically use the default
         tablespace of the current database instead.
        </para>
 
        <para>
-        When <varname>temp_tablespaces</> is set interactively, specifying a
+        When <varname>temp_tablespaces</varname> is set interactively, specifying a
         nonexistent tablespace is an error, as is specifying a tablespace for
-        which the user does not have <literal>CREATE</> privilege.  However,
+        which the user does not have <literal>CREATE</literal> privilege.  However,
         when using a previously set value, nonexistent tablespaces are
         ignored, as are tablespaces for which the user lacks
-        <literal>CREATE</> privilege.  In particular, this rule applies when
-        using a value set in <filename>postgresql.conf</>.
+        <literal>CREATE</literal> privilege.  In particular, this rule applies when
+        using a value set in <filename>postgresql.conf</filename>.
        </para>
 
        <para>
@@ -6355,7 +6462,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        </para>
 
        <para>
-        See also <xref linkend="guc-default-tablespace">.
+        See also <xref linkend="guc-default-tablespace"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6363,18 +6470,18 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-check-function-bodies" xreflabel="check_function_bodies">
       <term><varname>check_function_bodies</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>check_function_bodies</> configuration parameter</primary>
+       <primary><varname>check_function_bodies</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        This parameter is normally on. When set to <literal>off</>, it
+        This parameter is normally on. When set to <literal>off</literal>, it
         disables validation of the function body string during <xref
-        linkend="sql-createfunction">.  Disabling validation avoids side
+        linkend="sql-createfunction"/>.  Disabling validation avoids side
         effects of the validation process and avoids false positives due
         to problems such as forward references.  Set this parameter
-        to <literal>off</> before loading functions on behalf of other
-        users; <application>pg_dump</> does so automatically.
+        to <literal>off</literal> before loading functions on behalf of other
+        users; <application>pg_dump</application> does so automatically.
        </para>
       </listitem>
      </varlistentry>
@@ -6386,7 +6493,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <secondary>setting default</secondary>
       </indexterm>
       <indexterm>
-       <primary><varname>default_transaction_isolation</> configuration parameter</primary>
+       <primary><varname>default_transaction_isolation</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6400,8 +6507,8 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        </para>
 
        <para>
-        Consult <xref linkend="mvcc"> and <xref
-        linkend="sql-set-transaction"> for more information.
+        Consult <xref linkend="mvcc"/> and <xref
+        linkend="sql-set-transaction"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6413,18 +6520,18 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <secondary>setting default</secondary>
       </indexterm>
       <indexterm>
-       <primary><varname>default_transaction_read_only</> configuration parameter</primary>
+       <primary><varname>default_transaction_read_only</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         A read-only SQL transaction cannot alter non-temporary tables.
         This parameter controls the default read-only status of each new
-        transaction. The default is <literal>off</> (read/write).
+        transaction. The default is <literal>off</literal> (read/write).
        </para>
 
        <para>
-        Consult <xref linkend="sql-set-transaction"> for more information.
+        Consult <xref linkend="sql-set-transaction"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6436,12 +6543,12 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        <secondary>setting default</secondary>
       </indexterm>
       <indexterm>
-       <primary><varname>default_transaction_deferrable</> configuration parameter</primary>
+       <primary><varname>default_transaction_deferrable</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When running at the <literal>serializable</> isolation level,
+        When running at the <literal>serializable</literal> isolation level,
         a deferrable read-only SQL transaction may be delayed before
         it is allowed to proceed.  However, once it begins executing
         it does not incur any of the overhead required to ensure
@@ -6454,11 +6561,11 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         This parameter controls the default deferrable status of each
         new transaction.  It currently has no effect on read-write
         transactions or those operating at isolation levels lower
-        than <literal>serializable</>. The default is <literal>off</>.
+        than <literal>serializable</literal>. The default is <literal>off</literal>.
        </para>
 
        <para>
-        Consult <xref linkend="sql-set-transaction"> for more information.
+        Consult <xref linkend="sql-set-transaction"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6467,7 +6574,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-session-replication-role" xreflabel="session_replication_role">
       <term><varname>session_replication_role</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>session_replication_role</> configuration parameter</primary>
+       <primary><varname>session_replication_role</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6475,10 +6582,32 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Controls firing of replication-related triggers and rules for the
         current session.  Setting this variable requires
         superuser privilege and results in discarding any previously cached
-        query plans.  Possible values are <literal>origin</> (the default),
-        <literal>replica</> and <literal>local</>.
-        See <xref linkend="sql-altertable"> for
-        more information.
+        query plans.  Possible values are <literal>origin</literal> (the default),
+        <literal>replica</literal> and <literal>local</literal>.
+       </para>
+
+       <para>
+        The intended use of this setting is that logical replication systems
+        set it to <literal>replica</literal> when they are applying replicated
+        changes.  The effect of that will be that triggers and rules (that
+        have not been altered from their default configuration) will not fire
+        on the replica.  See the <xref linkend="sql-altertable"/> clauses
+        <literal>ENABLE TRIGGER</literal> and <literal>ENABLE RULE</literal>
+        for more information.
+       </para>
+
+       <para>
+        PostgreSQL treats the settings <literal>origin</literal> and
+        <literal>local</literal> the same internally.  Third-party replication
+        systems may use these two values for their internal purposes, for
+        example using <literal>local</literal> to designate a session whose
+        changes should not be replicated.
+       </para>
+
+       <para>
+        Since foreign keys are implemented as triggers, setting this parameter
+        to <literal>replica</literal> also disables all foreign key checks,
+        which can leave data in an inconsistent state if improperly used.
        </para>
       </listitem>
      </varlistentry>
@@ -6486,21 +6615,21 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-statement-timeout" xreflabel="statement_timeout">
       <term><varname>statement_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>statement_timeout</> configuration parameter</primary>
+       <primary><varname>statement_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Abort any statement that takes more than the specified number of
         milliseconds, starting from the time the command arrives at the server
-        from the client.  If <varname>log_min_error_statement</> is set to
-        <literal>ERROR</> or lower, the statement that timed out will also be
+        from the client.  If <varname>log_min_error_statement</varname> is set to
+        <literal>ERROR</literal> or lower, the statement that timed out will also be
         logged.  A value of zero (the default) turns this off.
        </para>
 
        <para>
-        Setting <varname>statement_timeout</> in
-        <filename>postgresql.conf</> is not recommended because it would
+        Setting <varname>statement_timeout</varname> in
+        <filename>postgresql.conf</filename> is not recommended because it would
         affect all sessions.
        </para>
       </listitem>
@@ -6509,7 +6638,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-lock-timeout" xreflabel="lock_timeout">
       <term><varname>lock_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>lock_timeout</> configuration parameter</primary>
+       <primary><varname>lock_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6518,24 +6647,24 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         milliseconds while attempting to acquire a lock on a table, index,
         row, or other database object.  The time limit applies separately to
         each lock acquisition attempt.  The limit applies both to explicit
-        locking requests (such as <command>LOCK TABLE</>, or <command>SELECT
-        FOR UPDATE</> without <literal>NOWAIT</>) and to implicitly-acquired
-        locks.  If <varname>log_min_error_statement</> is set to
-        <literal>ERROR</> or lower, the statement that timed out will be
+        locking requests (such as <command>LOCK TABLE</command>, or <command>SELECT
+        FOR UPDATE</command> without <literal>NOWAIT</literal>) and to implicitly-acquired
+        locks.  If <varname>log_min_error_statement</varname> is set to
+        <literal>ERROR</literal> or lower, the statement that timed out will be
         logged.  A value of zero (the default) turns this off.
        </para>
 
        <para>
-        Unlike <varname>statement_timeout</>, this timeout can only occur
-        while waiting for locks.  Note that if <varname>statement_timeout</>
-        is nonzero, it is rather pointless to set <varname>lock_timeout</> to
+        Unlike <varname>statement_timeout</varname>, this timeout can only occur
+        while waiting for locks.  Note that if <varname>statement_timeout</varname>
+        is nonzero, it is rather pointless to set <varname>lock_timeout</varname> to
         the same or larger value, since the statement timeout would always
         trigger first.
        </para>
 
        <para>
-        Setting <varname>lock_timeout</> in
-        <filename>postgresql.conf</> is not recommended because it would
+        Setting <varname>lock_timeout</varname> in
+        <filename>postgresql.conf</filename> is not recommended because it would
         affect all sessions.
        </para>
       </listitem>
@@ -6544,7 +6673,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-idle-in-transaction-session-timeout" xreflabel="idle_in_transaction_session_timeout">
       <term><varname>idle_in_transaction_session_timeout</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>idle_in_transaction_session_timeout</> configuration parameter</primary>
+       <primary><varname>idle_in_transaction_session_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6553,7 +6682,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
        longer than the specified duration in milliseconds. This allows any
        locks held by that session to be released and the connection slot to be reused;
        it also allows tuples visible only to this transaction to be vacuumed.  See
-       <xref linkend="routine-vacuuming"> for more details about this.
+       <xref linkend="routine-vacuuming"/> for more details about this.
        </para>
        <para>
        The default value of 0 disables this feature.
@@ -6564,24 +6693,24 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-vacuum-freeze-table-age" xreflabel="vacuum_freeze_table_age">
       <term><varname>vacuum_freeze_table_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>vacuum_freeze_table_age</> configuration parameter</primary>
+       <primary><varname>vacuum_freeze_table_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        <command>VACUUM</> performs an aggressive scan if the table's
-        <structname>pg_class</>.<structfield>relfrozenxid</> field has reached
+        <command>VACUUM</command> performs an aggressive scan if the table's
+        <structname>pg_class</structname>.<structfield>relfrozenxid</structfield> field has reached
         the age specified by this setting.  An aggressive scan differs from
-        a regular <command>VACUUM</> in that it visits every page that might
+        a regular <command>VACUUM</command> in that it visits every page that might
         contain unfrozen XIDs or MXIDs, not just those that might contain dead
         tuples.  The default is 150 million transactions.  Although users can
-        set this value anywhere from zero to two billions, <command>VACUUM</>
+        set this value anywhere from zero to two billions, <command>VACUUM</command>
         will silently limit the effective value to 95% of
-        <xref linkend="guc-autovacuum-freeze-max-age">, so that a
-        periodical manual <command>VACUUM</> has a chance to run before an
+        <xref linkend="guc-autovacuum-freeze-max-age"/>, so that a
+        periodical manual <command>VACUUM</command> has a chance to run before an
         anti-wraparound autovacuum is launched for the table. For more
         information see
-        <xref linkend="vacuum-for-wraparound">.
+        <xref linkend="vacuum-for-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6589,21 +6718,21 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-vacuum-freeze-min-age" xreflabel="vacuum_freeze_min_age">
       <term><varname>vacuum_freeze_min_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>vacuum_freeze_min_age</> configuration parameter</primary>
+       <primary><varname>vacuum_freeze_min_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Specifies the cutoff age (in transactions) that <command>VACUUM</>
+        Specifies the cutoff age (in transactions) that <command>VACUUM</command>
         should use to decide whether to freeze row versions
         while scanning a table.
         The default is 50 million transactions.  Although
         users can set this value anywhere from zero to one billion,
-        <command>VACUUM</> will silently limit the effective value to half
-        the value of <xref linkend="guc-autovacuum-freeze-max-age">, so
+        <command>VACUUM</command> will silently limit the effective value to half
+        the value of <xref linkend="guc-autovacuum-freeze-max-age"/>, so
         that there is not an unreasonably short time between forced
         autovacuums.  For more information see <xref
-        linkend="vacuum-for-wraparound">.
+        linkend="vacuum-for-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6611,23 +6740,23 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-vacuum-multixact-freeze-table-age" xreflabel="vacuum_multixact_freeze_table_age">
       <term><varname>vacuum_multixact_freeze_table_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>vacuum_multixact_freeze_table_age</> configuration parameter</primary>
+       <primary><varname>vacuum_multixact_freeze_table_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        <command>VACUUM</> performs an aggressive scan if the table's
-        <structname>pg_class</>.<structfield>relminmxid</> field has reached
+        <command>VACUUM</command> performs an aggressive scan if the table's
+        <structname>pg_class</structname>.<structfield>relminmxid</structfield> field has reached
         the age specified by this setting.  An aggressive scan differs from
-        a regular <command>VACUUM</> in that it visits every page that might
+        a regular <command>VACUUM</command> in that it visits every page that might
         contain unfrozen XIDs or MXIDs, not just those that might contain dead
         tuples.  The default is 150 million multixacts.
         Although users can set this value anywhere from zero to two billions,
-        <command>VACUUM</> will silently limit the effective value to 95% of
-        <xref linkend="guc-autovacuum-multixact-freeze-max-age">, so that a
-        periodical manual <command>VACUUM</> has a chance to run before an
+        <command>VACUUM</command> will silently limit the effective value to 95% of
+        <xref linkend="guc-autovacuum-multixact-freeze-max-age"/>, so that a
+        periodical manual <command>VACUUM</command> has a chance to run before an
         anti-wraparound is launched for the table.
-        For more information see <xref linkend="vacuum-for-multixact-wraparound">.
+        For more information see <xref linkend="vacuum-for-multixact-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6635,21 +6764,21 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-vacuum-multixact-freeze-min-age" xreflabel="vacuum_multixact_freeze_min_age">
       <term><varname>vacuum_multixact_freeze_min_age</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>vacuum_multixact_freeze_min_age</> configuration parameter</primary>
+       <primary><varname>vacuum_multixact_freeze_min_age</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Specifies the cutoff age (in multixacts) that <command>VACUUM</>
+        Specifies the cutoff age (in multixacts) that <command>VACUUM</command>
         should use to decide whether to replace multixact IDs with a newer
         transaction ID or multixact ID while scanning a table.  The default
         is 5 million multixacts.
         Although users can set this value anywhere from zero to one billion,
-        <command>VACUUM</> will silently limit the effective value to half
-        the value of <xref linkend="guc-autovacuum-multixact-freeze-max-age">,
+        <command>VACUUM</command> will silently limit the effective value to half
+        the value of <xref linkend="guc-autovacuum-multixact-freeze-max-age"/>,
         so that there is not an unreasonably short time between forced
         autovacuums.
-        For more information see <xref linkend="vacuum-for-multixact-wraparound">.
+        For more information see <xref linkend="vacuum-for-multixact-wraparound"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6657,7 +6786,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-bytea-output" xreflabel="bytea_output">
       <term><varname>bytea_output</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>bytea_output</> configuration parameter</primary>
+       <primary><varname>bytea_output</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6665,7 +6794,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Sets the output format for values of type <type>bytea</type>.
         Valid values are <literal>hex</literal> (the default)
         and <literal>escape</literal> (the traditional PostgreSQL
-        format).  See <xref linkend="datatype-binary"> for more
+        format).  See <xref linkend="datatype-binary"/> for more
         information.  The <type>bytea</type> type always
         accepts both formats on input, regardless of this setting.
        </para>
@@ -6675,7 +6804,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-xmlbinary" xreflabel="xmlbinary">
       <term><varname>xmlbinary</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>xmlbinary</> configuration parameter</primary>
+       <primary><varname>xmlbinary</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6687,7 +6816,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         <literal>base64</literal> and <literal>hex</literal>, which
         are both defined in the XML Schema standard.  The default is
         <literal>base64</literal>.  For further information about
-        XML-related functions, see <xref linkend="functions-xml">.
+        XML-related functions, see <xref linkend="functions-xml"/>.
        </para>
 
        <para>
@@ -6703,10 +6832,10 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
      <varlistentry id="guc-xmloption" xreflabel="xmloption">
       <term><varname>xmloption</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>xmloption</> configuration parameter</primary>
+       <primary><varname>xmloption</varname> configuration parameter</primary>
       </indexterm>
       <indexterm>
-       <primary><varname>SET XML OPTION</></primary>
+       <primary><varname>SET XML OPTION</varname></primary>
       </indexterm>
       <indexterm>
        <primary>XML option</primary>
@@ -6717,7 +6846,7 @@ COPY postgres_log FROM '/full/path/to/logfile.csv' WITH csv;
         Sets whether <literal>DOCUMENT</literal> or
         <literal>CONTENT</literal> is implicit when converting between
         XML and character string values.  See <xref
-        linkend="datatype-xml"> for a description of this.  Valid
+        linkend="datatype-xml"/> for a description of this.  Valid
         values are <literal>DOCUMENT</literal> and
         <literal>CONTENT</literal>.  The default is
         <literal>CONTENT</literal>.
@@ -6736,19 +6865,19 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-gin-pending-list-limit" xreflabel="gin_pending_list_limit">
       <term><varname>gin_pending_list_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>gin_pending_list_limit</> configuration parameter</primary>
+       <primary><varname>gin_pending_list_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the maximum size of the GIN pending list which is used
-        when <literal>fastupdate</> is enabled. If the list grows
+        when <literal>fastupdate</literal> is enabled. If the list grows
         larger than this maximum size, it is cleaned up by moving
         the entries in it to the main GIN data structure in bulk.
-        The default is four megabytes (<literal>4MB</>). This setting
+        The default is four megabytes (<literal>4MB</literal>). This setting
         can be overridden for individual GIN indexes by changing
         index storage parameters.
-         See <xref linkend="gin-fast-update"> and <xref linkend="gin-tips">
+         See <xref linkend="gin-fast-update"/> and <xref linkend="gin-tips"/>
          for more information.
        </para>
       </listitem>
@@ -6764,7 +6893,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-datestyle" xreflabel="DateStyle">
       <term><varname>DateStyle</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>DateStyle</> configuration parameter</primary>
+       <primary><varname>DateStyle</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6772,16 +6901,16 @@ SET XML OPTION { DOCUMENT | CONTENT };
         Sets the display format for date and time values, as well as the
         rules for interpreting ambiguous date input values. For
         historical reasons, this variable contains two independent
-        components: the output format specification (<literal>ISO</>,
-        <literal>Postgres</>, <literal>SQL</>, or <literal>German</>)
+        components: the output format specification (<literal>ISO</literal>,
+        <literal>Postgres</literal>, <literal>SQL</literal>, or <literal>German</literal>)
         and the input/output specification for year/month/day ordering
-        (<literal>DMY</>, <literal>MDY</>, or <literal>YMD</>). These
-        can be set separately or together. The keywords <literal>Euro</>
-        and <literal>European</> are synonyms for <literal>DMY</>; the
-        keywords <literal>US</>, <literal>NonEuro</>, and
-        <literal>NonEuropean</> are synonyms for <literal>MDY</>. See
-        <xref linkend="datatype-datetime"> for more information. The
-        built-in default is <literal>ISO, MDY</>, but
+        (<literal>DMY</literal>, <literal>MDY</literal>, or <literal>YMD</literal>). These
+        can be set separately or together. The keywords <literal>Euro</literal>
+        and <literal>European</literal> are synonyms for <literal>DMY</literal>; the
+        keywords <literal>US</literal>, <literal>NonEuro</literal>, and
+        <literal>NonEuropean</literal> are synonyms for <literal>MDY</literal>. See
+        <xref linkend="datatype-datetime"/> for more information. The
+        built-in default is <literal>ISO, MDY</literal>, but
         <application>initdb</application> will initialize the
         configuration file with a setting that corresponds to the
         behavior of the chosen <varname>lc_time</varname> locale.
@@ -6792,30 +6921,30 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-intervalstyle" xreflabel="IntervalStyle">
       <term><varname>IntervalStyle</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>IntervalStyle</> configuration parameter</primary>
+       <primary><varname>IntervalStyle</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the display format for interval values.
-        The value <literal>sql_standard</> will produce
+        The value <literal>sql_standard</literal> will produce
         output matching <acronym>SQL</acronym> standard interval literals.
-        The value <literal>postgres</> (which is the default) will produce
-        output matching <productname>PostgreSQL</> releases prior to 8.4
-        when the <xref linkend="guc-datestyle">
-        parameter was set to <literal>ISO</>.
-        The value <literal>postgres_verbose</> will produce output
-        matching <productname>PostgreSQL</> releases prior to 8.4
-        when the <varname>DateStyle</>
-        parameter was set to non-<literal>ISO</> output.
-        The value <literal>iso_8601</> will produce output matching the time
-        interval <quote>format with designators</> defined in section
+        The value <literal>postgres</literal> (which is the default) will produce
+        output matching <productname>PostgreSQL</productname> releases prior to 8.4
+        when the <xref linkend="guc-datestyle"/>
+        parameter was set to <literal>ISO</literal>.
+        The value <literal>postgres_verbose</literal> will produce output
+        matching <productname>PostgreSQL</productname> releases prior to 8.4
+        when the <varname>DateStyle</varname>
+        parameter was set to non-<literal>ISO</literal> output.
+        The value <literal>iso_8601</literal> will produce output matching the time
+        interval <quote>format with designators</quote> defined in section
         4.4.3.2 of ISO 8601.
        </para>
        <para>
-        The <varname>IntervalStyle</> parameter also affects the
+        The <varname>IntervalStyle</varname> parameter also affects the
         interpretation of ambiguous interval input.  See
-        <xref linkend="datatype-interval-input"> for more information.
+        <xref linkend="datatype-interval-input"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6823,17 +6952,17 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-timezone" xreflabel="TimeZone">
       <term><varname>TimeZone</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>TimeZone</> configuration parameter</primary>
+       <primary><varname>TimeZone</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>time zone</></>
+      <indexterm><primary>time zone</primary></indexterm>
       </term>
       <listitem>
        <para>
         Sets the time zone for displaying and interpreting time stamps.
-        The built-in default is <literal>GMT</>, but that is typically
-        overridden in <filename>postgresql.conf</>; <application>initdb</>
+        The built-in default is <literal>GMT</literal>, but that is typically
+        overridden in <filename>postgresql.conf</filename>; <application>initdb</application>
         will install a setting there corresponding to its system environment.
-        See <xref linkend="datatype-timezones"> for more information.
+        See <xref linkend="datatype-timezones"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6841,18 +6970,18 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-timezone-abbreviations" xreflabel="timezone_abbreviations">
       <term><varname>timezone_abbreviations</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>timezone_abbreviations</> configuration parameter</primary>
+       <primary><varname>timezone_abbreviations</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>time zone names</></>
+      <indexterm><primary>time zone names</primary></indexterm>
       </term>
       <listitem>
        <para>
         Sets the collection of time zone abbreviations that will be accepted
-        by the server for datetime input.  The default is <literal>'Default'</>,
+        by the server for datetime input.  The default is <literal>'Default'</literal>,
         which is a collection that works in most of the world; there are
         also <literal>'Australia'</literal> and <literal>'India'</literal>,
         and other collections can be defined for a particular installation.
-        See <xref linkend="datetime-config-files"> for more information.
+        See <xref linkend="datetime-config-files"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -6867,20 +6996,20 @@ SET XML OPTION { DOCUMENT | CONTENT };
        <secondary>display</secondary>
       </indexterm>
       <indexterm>
-       <primary><varname>extra_float_digits</> configuration parameter</primary>
+       <primary><varname>extra_float_digits</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This parameter adjusts the number of digits displayed for
-        floating-point values, including <type>float4</>, <type>float8</>,
+        floating-point values, including <type>float4</type>, <type>float8</type>,
         and geometric data types.  The parameter value is added to the
-        standard number of digits (<literal>FLT_DIG</> or <literal>DBL_DIG</>
+        standard number of digits (<literal>FLT_DIG</literal> or <literal>DBL_DIG</literal>
         as appropriate).  The value can be set as high as 3, to include
         partially-significant digits; this is especially useful for dumping
         float data that needs to be restored exactly.  Or it can be set
         negative to suppress unwanted digits.
-        See also <xref linkend="datatype-float">.
+        See also <xref linkend="datatype-float"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6888,16 +7017,16 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-client-encoding" xreflabel="client_encoding">
       <term><varname>client_encoding</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>client_encoding</> configuration parameter</primary>
+       <primary><varname>client_encoding</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>character set</></>
+      <indexterm><primary>character set</primary></indexterm>
       </term>
       <listitem>
        <para>
         Sets the client-side encoding (character set).
         The default is to use the database encoding.
         The character sets supported by the <productname>PostgreSQL</productname>
-        server are described in <xref linkend="multibyte-charset-supported">.
+        server are described in <xref linkend="multibyte-charset-supported"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -6905,13 +7034,13 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-lc-messages" xreflabel="lc_messages">
       <term><varname>lc_messages</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_messages</> configuration parameter</primary>
+       <primary><varname>lc_messages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Sets the language in which messages are displayed.  Acceptable
-        values are system-dependent; see <xref linkend="locale"> for
+        values are system-dependent; see <xref linkend="locale"/> for
         more information.  If this variable is set to the empty string
         (which is the default) then the value is inherited from the
         execution environment of the server in a system-dependent way.
@@ -6937,7 +7066,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-lc-monetary" xreflabel="lc_monetary">
       <term><varname>lc_monetary</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_monetary</> configuration parameter</primary>
+       <primary><varname>lc_monetary</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6945,7 +7074,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         Sets the locale to use for formatting monetary amounts, for
         example with the <function>to_char</function> family of
         functions.  Acceptable values are system-dependent; see <xref
-        linkend="locale"> for more information.  If this variable is
+        linkend="locale"/> for more information.  If this variable is
         set to the empty string (which is the default) then the value
         is inherited from the execution environment of the server in a
         system-dependent way.
@@ -6956,7 +7085,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-lc-numeric" xreflabel="lc_numeric">
       <term><varname>lc_numeric</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_numeric</> configuration parameter</primary>
+       <primary><varname>lc_numeric</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6964,7 +7093,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         Sets the locale to use for formatting numbers, for example
         with the <function>to_char</function> family of
         functions. Acceptable values are system-dependent; see <xref
-        linkend="locale"> for more information.  If this variable is
+        linkend="locale"/> for more information.  If this variable is
         set to the empty string (which is the default) then the value
         is inherited from the execution environment of the server in a
         system-dependent way.
@@ -6975,7 +7104,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-lc-time" xreflabel="lc_time">
       <term><varname>lc_time</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_time</> configuration parameter</primary>
+       <primary><varname>lc_time</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -6983,7 +7112,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         Sets the locale to use for formatting dates and times, for example
         with the <function>to_char</function> family of
         functions. Acceptable values are system-dependent; see <xref
-        linkend="locale"> for more information.  If this variable is
+        linkend="locale"/> for more information.  If this variable is
         set to the empty string (which is the default) then the value
         is inherited from the execution environment of the server in a
         system-dependent way.
@@ -6994,7 +7123,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-default-text-search-config" xreflabel="default_text_search_config">
       <term><varname>default_text_search_config</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>default_text_search_config</> configuration parameter</primary>
+       <primary><varname>default_text_search_config</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7002,8 +7131,8 @@ SET XML OPTION { DOCUMENT | CONTENT };
         Selects the text search configuration that is used by those variants
         of the text search functions that do not have an explicit argument
         specifying the configuration.
-        See <xref linkend="textsearch"> for further information.
-        The built-in default is <literal>pg_catalog.simple</>, but
+        See <xref linkend="textsearch"/> for further information.
+        The built-in default is <literal>pg_catalog.simple</literal>, but
         <application>initdb</application> will initialize the
         configuration file with a setting that corresponds to the
         chosen <varname>lc_ctype</varname> locale, if a configuration
@@ -7024,8 +7153,8 @@ SET XML OPTION { DOCUMENT | CONTENT };
       server, in order to load additional functionality or achieve performance
       benefits.  For example, a setting of
       <literal>'$libdir/mylib'</literal> would cause
-      <literal>mylib.so</> (or on some platforms,
-      <literal>mylib.sl</>) to be preloaded from the installation's standard
+      <literal>mylib.so</literal> (or on some platforms,
+      <literal>mylib.sl</literal>) to be preloaded from the installation's standard
       library directory.  The differences between the settings are when they
       take effect and what privileges are required to change them.
      </para>
@@ -7034,14 +7163,14 @@ SET XML OPTION { DOCUMENT | CONTENT };
       <productname>PostgreSQL</productname> procedural language libraries can
       be preloaded in this way, typically by using the
       syntax <literal>'$libdir/plXXX'</literal> where
-      <literal>XXX</literal> is <literal>pgsql</>, <literal>perl</>,
-      <literal>tcl</>, or <literal>python</>.
+      <literal>XXX</literal> is <literal>pgsql</literal>, <literal>perl</literal>,
+      <literal>tcl</literal>, or <literal>python</literal>.
      </para>
 
      <para>
       Only shared libraries specifically intended to be used with PostgreSQL
       can be loaded this way.  Every PostgreSQL-supported library has
-      a <quote>magic block</> that is checked to guarantee compatibility.  For
+      a <quote>magic block</quote> that is checked to guarantee compatibility.  For
       this reason, non-PostgreSQL libraries cannot be loaded in this way.  You
       might be able to use operating-system facilities such
       as <envar>LD_PRELOAD</envar> for that.
@@ -7056,10 +7185,10 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-local-preload-libraries" xreflabel="local_preload_libraries">
       <term><varname>local_preload_libraries</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>local_preload_libraries</> configuration parameter</primary>
+       <primary><varname>local_preload_libraries</varname> configuration parameter</primary>
       </indexterm>
       <indexterm>
-       <primary><filename>$libdir/plugins</></primary>
+       <primary><filename>$libdir/plugins</filename></primary>
       </indexterm>
       </term>
       <listitem>
@@ -7067,7 +7196,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         This variable specifies one or more shared libraries that are to be
         preloaded at connection start.
         It contains a comma-separated list of library names, where each name
-        is interpreted as for the <xref linkend="SQL-LOAD"> command.
+        is interpreted as for the <xref linkend="sql-load"/> command.
         Whitespace between entries is ignored; surround a library name with
         double quotes if you need to include whitespace or commas in the name.
         The parameter value only takes effect at the start of the connection.
@@ -7078,10 +7207,10 @@ SET XML OPTION { DOCUMENT | CONTENT };
        <para>
         This option can be set by any user.  Because of that, the libraries
         that can be loaded are restricted to those appearing in the
-        <filename>plugins</> subdirectory of the installation's
+        <filename>plugins</filename> subdirectory of the installation's
         standard library directory.  (It is the database administrator's
-        responsibility to ensure that only <quote>safe</> libraries
-        are installed there.)  Entries in <varname>local_preload_libraries</>
+        responsibility to ensure that only <quote>safe</quote> libraries
+        are installed there.)  Entries in <varname>local_preload_libraries</varname>
         can specify this directory explicitly, for example
         <literal>$libdir/plugins/mylib</literal>, or just specify
         the library name &mdash; <literal>mylib</literal> would have
@@ -7091,17 +7220,17 @@ SET XML OPTION { DOCUMENT | CONTENT };
        <para>
         The intent of this feature is to allow unprivileged users to load
         debugging or performance-measurement libraries into specific sessions
-        without requiring an explicit <command>LOAD</> command.  To that end,
+        without requiring an explicit <command>LOAD</command> command.  To that end,
         it would be typical to set this parameter using
         the <envar>PGOPTIONS</envar> environment variable on the client or by
         using
-        <command>ALTER ROLE SET</>.
+        <command>ALTER ROLE SET</command>.
        </para>
 
        <para>
         However, unless a module is specifically designed to be used in this way by
         non-superusers, this is usually not the right setting to use.  Look
-        at <xref linkend="guc-session-preload-libraries"> instead.
+        at <xref linkend="guc-session-preload-libraries"/> instead.
        </para>
       </listitem>
      </varlistentry>
@@ -7110,7 +7239,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-session-preload-libraries" xreflabel="session_preload_libraries">
       <term><varname>session_preload_libraries</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>session_preload_libraries</> configuration parameter</primary>
+       <primary><varname>session_preload_libraries</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7118,7 +7247,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         This variable specifies one or more shared libraries that are to be
         preloaded at connection start.
         It contains a comma-separated list of library names, where each name
-        is interpreted as for the <xref linkend="SQL-LOAD"> command.
+        is interpreted as for the <xref linkend="sql-load"/> command.
         Whitespace between entries is ignored; surround a library name with
         double quotes if you need to include whitespace or commas in the name.
         The parameter value only takes effect at the start of the connection.
@@ -7131,17 +7260,17 @@ SET XML OPTION { DOCUMENT | CONTENT };
         The intent of this feature is to allow debugging or
         performance-measurement libraries to be loaded into specific sessions
         without an explicit
-        <command>LOAD</> command being given.  For
-        example, <xref linkend="auto-explain"> could be enabled for all
+        <command>LOAD</command> command being given.  For
+        example, <xref linkend="auto-explain"/> could be enabled for all
         sessions under a given user name by setting this parameter
-        with <command>ALTER ROLE SET</>.  Also, this parameter can be changed
+        with <command>ALTER ROLE SET</command>.  Also, this parameter can be changed
         without restarting the server (but changes only take effect when a new
         session is started), so it is easier to add new modules this way, even
         if they should apply to all sessions.
        </para>
 
        <para>
-        Unlike <xref linkend="guc-shared-preload-libraries">, there is no large
+        Unlike <xref linkend="guc-shared-preload-libraries"/>, there is no large
         performance advantage to loading a library at session start rather than
         when it is first used.  There is some advantage, however, when
         connection pooling is used.
@@ -7152,7 +7281,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-shared-preload-libraries" xreflabel="shared_preload_libraries">
       <term><varname>shared_preload_libraries</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>shared_preload_libraries</> configuration parameter</primary>
+       <primary><varname>shared_preload_libraries</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7160,7 +7289,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         This variable specifies one or more shared libraries to be preloaded at
         server start.
         It contains a comma-separated list of library names, where each name
-        is interpreted as for the <xref linkend="SQL-LOAD"> command.
+        is interpreted as for the <xref linkend="sql-load"/> command.
         Whitespace between entries is ignored; surround a library name with
         double quotes if you need to include whitespace or commas in the name.
         This parameter can only be set at server start.  If a specified
@@ -7183,7 +7312,7 @@ SET XML OPTION { DOCUMENT | CONTENT };
         parameter is recommended only for libraries that will be used in most
         sessions.  Also, changing this parameter requires a server restart, so
         this is not the right setting to use for short-term debugging tasks,
-        say.  Use <xref linkend="guc-session-preload-libraries"> for that
+        say.  Use <xref linkend="guc-session-preload-libraries"/> for that
         instead.
        </para>
 
@@ -7209,9 +7338,9 @@ SET XML OPTION { DOCUMENT | CONTENT };
      <varlistentry id="guc-dynamic-library-path" xreflabel="dynamic_library_path">
       <term><varname>dynamic_library_path</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>dynamic_library_path</> configuration parameter</primary>
+       <primary><varname>dynamic_library_path</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>dynamic loading</></>
+      <indexterm><primary>dynamic loading</primary></indexterm>
       </term>
       <listitem>
        <para>
@@ -7263,13 +7392,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-gin-fuzzy-search-limit" xreflabel="gin_fuzzy_search_limit">
       <term><varname>gin_fuzzy_search_limit</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>gin_fuzzy_search_limit</> configuration parameter</primary>
+       <primary><varname>gin_fuzzy_search_limit</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Soft upper limit of the size of the set returned by GIN index scans. For more
-        information see <xref linkend="gin-tips">.
+        information see <xref linkend="gin-tips"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -7294,7 +7423,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        <secondary>deadlock</secondary>
       </indexterm>
       <indexterm>
-       <primary><varname>deadlock_timeout</> configuration parameter</primary>
+       <primary><varname>deadlock_timeout</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7307,7 +7436,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         just wait on the lock for a while before checking for a
         deadlock. Increasing this value reduces the amount of time
         wasted in needless deadlock checks, but slows down reporting of
-        real deadlock errors. The default is one second (<literal>1s</>),
+        real deadlock errors. The default is one second (<literal>1s</literal>),
         which is probably about the smallest value you would want in
         practice. On a heavily loaded server you might want to raise it.
         Ideally the setting should exceed your typical transaction time,
@@ -7317,7 +7446,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        </para>
 
        <para>
-        When <xref linkend="guc-log-lock-waits"> is set,
+        When <xref linkend="guc-log-lock-waits"/> is set,
         this parameter also determines the length of time to wait before
         a log message is issued about the lock wait.  If you are trying
         to investigate locking delays you might want to set a shorter than
@@ -7329,20 +7458,20 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-locks-per-transaction" xreflabel="max_locks_per_transaction">
       <term><varname>max_locks_per_transaction</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_locks_per_transaction</> configuration parameter</primary>
+       <primary><varname>max_locks_per_transaction</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         The shared lock table tracks locks on
         <varname>max_locks_per_transaction</varname> * (<xref
-        linkend="guc-max-connections"> + <xref
-        linkend="guc-max-prepared-transactions">) objects (e.g.,  tables);
+        linkend="guc-max-connections"/> + <xref
+        linkend="guc-max-prepared-transactions"/>) objects (e.g.,  tables);
         hence, no more than this many distinct objects can be locked at
         any one time.  This parameter controls the average number of object
         locks allocated for each transaction;  individual transactions
         can lock more objects as long as the locks of all transactions
-        fit in the lock table.  This is <emphasis>not</> the number of
+        fit in the lock table.  This is <emphasis>not</emphasis> the number of
         rows that can be locked; that value is unlimited.  The default,
         64, has historically proven sufficient, but you might need to
         raise this value if you have queries that touch many different
@@ -7361,20 +7490,20 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-pred-locks-per-transaction" xreflabel="max_pred_locks_per_transaction">
       <term><varname>max_pred_locks_per_transaction</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_pred_locks_per_transaction</> configuration parameter</primary>
+       <primary><varname>max_pred_locks_per_transaction</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         The shared predicate lock table tracks locks on
         <varname>max_pred_locks_per_transaction</varname> * (<xref
-        linkend="guc-max-connections"> + <xref
-        linkend="guc-max-prepared-transactions">) objects (e.g., tables);
+        linkend="guc-max-connections"/> + <xref
+        linkend="guc-max-prepared-transactions"/>) objects (e.g., tables);
         hence, no more than this many distinct objects can be locked at
         any one time.  This parameter controls the average number of object
         locks allocated for each transaction;  individual transactions
         can lock more objects as long as the locks of all transactions
-        fit in the lock table.  This is <emphasis>not</> the number of
+        fit in the lock table.  This is <emphasis>not</emphasis> the number of
         rows that can be locked; that value is unlimited.  The default,
         64, has generally been sufficient in testing, but you might need to
         raise this value if you have clients that touch many different
@@ -7387,7 +7516,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-pred-locks-per-relation" xreflabel="max_pred_locks_per_relation">
       <term><varname>max_pred_locks_per_relation</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_pred_locks_per_relation</> configuration parameter</primary>
+       <primary><varname>max_pred_locks_per_relation</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7396,10 +7525,10 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         predicate-locked before the lock is promoted to covering the whole
         relation.  Values greater than or equal to zero mean an absolute
         limit, while negative values
-        mean <xref linkend="guc-max-pred-locks-per-transaction"> divided by
+        mean <xref linkend="guc-max-pred-locks-per-transaction"/> divided by
         the absolute value of this setting.  The default is -2, which keeps
-        the behavior from previous versions of <productname>PostgreSQL</>.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        the behavior from previous versions of <productname>PostgreSQL</productname>.
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -7408,7 +7537,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-pred-locks-per-page" xreflabel="max_pred_locks_per_page">
       <term><varname>max_pred_locks_per_page</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_pred_locks_per_page</> configuration parameter</primary>
+       <primary><varname>max_pred_locks_per_page</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7416,7 +7545,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         This controls how many rows on a single page can be predicate-locked
         before the lock is promoted to covering the whole page.  The default
         is 2.  This parameter can only be set in
-        the <filename>postgresql.conf</> file or on the server command line.
+        the <filename>postgresql.conf</filename> file or on the server command line.
        </para>
       </listitem>
      </varlistentry>
@@ -7435,62 +7564,62 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-array-nulls" xreflabel="array_nulls">
       <term><varname>array_nulls</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>array_nulls</> configuration parameter</primary>
+       <primary><varname>array_nulls</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This controls whether the array input parser recognizes
-        unquoted <literal>NULL</> as specifying a null array element.
-        By default, this is <literal>on</>, allowing array values containing
-        null values to be entered.  However, <productname>PostgreSQL</> versions
+        unquoted <literal>NULL</literal> as specifying a null array element.
+        By default, this is <literal>on</literal>, allowing array values containing
+        null values to be entered.  However, <productname>PostgreSQL</productname> versions
         before 8.2 did not support null values in arrays, and therefore would
-        treat <literal>NULL</> as specifying a normal array element with
-        the string value <quote>NULL</>.  For backward compatibility with
+        treat <literal>NULL</literal> as specifying a normal array element with
+        the string value <quote>NULL</quote>.  For backward compatibility with
         applications that require the old behavior, this variable can be
-        turned <literal>off</>.
+        turned <literal>off</literal>.
        </para>
 
        <para>
         Note that it is possible to create array values containing null values
-        even when this variable is <literal>off</>.
+        even when this variable is <literal>off</literal>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry id="guc-backslash-quote" xreflabel="backslash_quote">
       <term><varname>backslash_quote</varname> (<type>enum</type>)
-      <indexterm><primary>strings</><secondary>backslash quotes</></>
+      <indexterm><primary>strings</primary><secondary>backslash quotes</secondary></indexterm>
       <indexterm>
-       <primary><varname>backslash_quote</> configuration parameter</primary>
+       <primary><varname>backslash_quote</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This controls whether a quote mark can be represented by
-        <literal>\'</> in a string literal.  The preferred, SQL-standard way
-        to represent a quote mark is by doubling it (<literal>''</>) but
-        <productname>PostgreSQL</> has historically also accepted
-        <literal>\'</>. However, use of <literal>\'</> creates security risks
+        <literal>\'</literal> in a string literal.  The preferred, SQL-standard way
+        to represent a quote mark is by doubling it (<literal>''</literal>) but
+        <productname>PostgreSQL</productname> has historically also accepted
+        <literal>\'</literal>. However, use of <literal>\'</literal> creates security risks
         because in some client character set encodings, there are multibyte
         characters in which the last byte is numerically equivalent to ASCII
-        <literal>\</>.  If client-side code does escaping incorrectly then a
+        <literal>\</literal>.  If client-side code does escaping incorrectly then a
         SQL-injection attack is possible.  This risk can be prevented by
         making the server reject queries in which a quote mark appears to be
         escaped by a backslash.
-        The allowed values of <varname>backslash_quote</> are
-        <literal>on</> (allow <literal>\'</> always),
-        <literal>off</> (reject always), and
-        <literal>safe_encoding</> (allow only if client encoding does not
-        allow ASCII <literal>\</> within a multibyte character).
-        <literal>safe_encoding</> is the default setting.
+        The allowed values of <varname>backslash_quote</varname> are
+        <literal>on</literal> (allow <literal>\'</literal> always),
+        <literal>off</literal> (reject always), and
+        <literal>safe_encoding</literal> (allow only if client encoding does not
+        allow ASCII <literal>\</literal> within a multibyte character).
+        <literal>safe_encoding</literal> is the default setting.
        </para>
 
        <para>
-        Note that in a standard-conforming string literal, <literal>\</> just
-        means <literal>\</> anyway.  This parameter only affects the handling of
+        Note that in a standard-conforming string literal, <literal>\</literal> just
+        means <literal>\</literal> anyway.  This parameter only affects the handling of
         non-standard-conforming literals, including
-        escape string syntax (<literal>E'...'</>).
+        escape string syntax (<literal>E'...'</literal>).
        </para>
       </listitem>
      </varlistentry>
@@ -7498,7 +7627,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-default-with-oids" xreflabel="default_with_oids">
       <term><varname>default_with_oids</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>default_with_oids</> configuration parameter</primary>
+       <primary><varname>default_with_oids</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7508,9 +7637,9 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         newly-created tables, if neither <literal>WITH OIDS</literal>
         nor <literal>WITHOUT OIDS</literal> is specified. It also
         determines whether OIDs will be included in tables created by
-        <command>SELECT INTO</command>. The parameter is <literal>off</>
-        by default; in <productname>PostgreSQL</> 8.0 and earlier, it
-        was <literal>on</> by default.
+        <command>SELECT INTO</command>. The parameter is <literal>off</literal>
+        by default; in <productname>PostgreSQL</productname> 8.0 and earlier, it
+        was <literal>on</literal> by default.
        </para>
 
        <para>
@@ -7526,21 +7655,21 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
 
      <varlistentry id="guc-escape-string-warning" xreflabel="escape_string_warning">
       <term><varname>escape_string_warning</varname> (<type>boolean</type>)
-      <indexterm><primary>strings</><secondary>escape warning</></>
+      <indexterm><primary>strings</primary><secondary>escape warning</secondary></indexterm>
       <indexterm>
-       <primary><varname>escape_string_warning</> configuration parameter</primary>
+       <primary><varname>escape_string_warning</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When on, a warning is issued if a backslash (<literal>\</>)
-        appears in an ordinary string literal (<literal>'...'</>
+        When on, a warning is issued if a backslash (<literal>\</literal>)
+        appears in an ordinary string literal (<literal>'...'</literal>
         syntax) and <varname>standard_conforming_strings</varname> is off.
-        The default is <literal>on</>.
+        The default is <literal>on</literal>.
        </para>
        <para>
         Applications that wish to use backslash as escape should be
-        modified to use escape string syntax (<literal>E'...'</>),
+        modified to use escape string syntax (<literal>E'...'</literal>),
         because the default behavior of ordinary strings is now to treat
         backslash as an ordinary character, per SQL standard.  This variable
         can be enabled to help locate code that needs to be changed.
@@ -7551,25 +7680,22 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-lo-compat-privileges" xreflabel="lo_compat_privileges">
       <term><varname>lo_compat_privileges</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>lo_compat_privileges</> configuration parameter</primary>
+       <primary><varname>lo_compat_privileges</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        In <productname>PostgreSQL</> releases prior to 9.0, large objects
+        In <productname>PostgreSQL</productname> releases prior to 9.0, large objects
         did not have access privileges and were, therefore, always readable
-        and writable by all users.  Setting this variable to <literal>on</>
+        and writable by all users.  Setting this variable to <literal>on</literal>
         disables the new privilege checks, for compatibility with prior
-        releases.  The default is <literal>off</>.
+        releases.  The default is <literal>off</literal>.
         Only superusers can change this setting.
        </para>
        <para>
         Setting this variable does not disable all security checks related to
         large objects &mdash; only those for which the default behavior has
-        changed in <productname>PostgreSQL</> 9.0.
-        For example, <literal>lo_import()</literal> and
-        <literal>lo_export()</literal> need superuser privileges regardless
-        of this setting.
+        changed in <productname>PostgreSQL</productname> 9.0.
        </para>
       </listitem>
      </varlistentry>
@@ -7577,22 +7703,22 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-operator-precedence-warning" xreflabel="operator_precedence_warning">
       <term><varname>operator_precedence_warning</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>operator_precedence_warning</> configuration parameter</primary>
+       <primary><varname>operator_precedence_warning</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         When on, the parser will emit a warning for any construct that might
-        have changed meanings since <productname>PostgreSQL</> 9.4 as a result
+        have changed meanings since <productname>PostgreSQL</productname> 9.4 as a result
         of changes in operator precedence.  This is useful for auditing
         applications to see if precedence changes have broken anything; but it
         is not meant to be kept turned on in production, since it will warn
         about some perfectly valid, standard-compliant SQL code.
-        The default is <literal>off</>.
+        The default is <literal>off</literal>.
        </para>
 
        <para>
-        See <xref linkend="sql-precedence"> for more information.
+        See <xref linkend="sql-precedence"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -7600,40 +7726,40 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
     <varlistentry id="guc-quote-all-identifiers" xreflabel="quote-all-identifiers">
       <term><varname>quote_all_identifiers</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>quote_all_identifiers</> configuration parameter</primary>
+       <primary><varname>quote_all_identifiers</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         When the database generates SQL, force all identifiers to be quoted,
         even if they are not (currently) keywords.  This will affect the
-        output of <command>EXPLAIN</> as well as the results of functions
-        like <function>pg_get_viewdef</>.  See also the
+        output of <command>EXPLAIN</command> as well as the results of functions
+        like <function>pg_get_viewdef</function>.  See also the
         <option>--quote-all-identifiers</option> option of
-        <xref linkend="app-pgdump"> and <xref linkend="app-pg-dumpall">.
+        <xref linkend="app-pgdump"/> and <xref linkend="app-pg-dumpall"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry id="guc-standard-conforming-strings" xreflabel="standard_conforming_strings">
       <term><varname>standard_conforming_strings</varname> (<type>boolean</type>)
-      <indexterm><primary>strings</><secondary>standard conforming</></>
+      <indexterm><primary>strings</primary><secondary>standard conforming</secondary></indexterm>
       <indexterm>
-       <primary><varname>standard_conforming_strings</> configuration parameter</primary>
+       <primary><varname>standard_conforming_strings</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This controls whether ordinary string literals
-        (<literal>'...'</>) treat backslashes literally, as specified in
+        (<literal>'...'</literal>) treat backslashes literally, as specified in
         the SQL standard.
         Beginning in <productname>PostgreSQL</productname> 9.1, the default is
-        <literal>on</> (prior releases defaulted to <literal>off</>).
+        <literal>on</literal> (prior releases defaulted to <literal>off</literal>).
         Applications can check this
         parameter to determine how string literals will be processed.
         The presence of this parameter can also be taken as an indication
-        that the escape string syntax (<literal>E'...'</>) is supported.
-        Escape string syntax (<xref linkend="sql-syntax-strings-escape">)
+        that the escape string syntax (<literal>E'...'</literal>) is supported.
+        Escape string syntax (<xref linkend="sql-syntax-strings-escape"/>)
         should be used if an application desires
         backslashes to be treated as escape characters.
        </para>
@@ -7643,7 +7769,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-synchronize-seqscans" xreflabel="synchronize_seqscans">
       <term><varname>synchronize_seqscans</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>synchronize_seqscans</> configuration parameter</primary>
+       <primary><varname>synchronize_seqscans</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7652,13 +7778,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         other, so that concurrent scans read the same block at about the
         same time and hence share the I/O workload.  When this is enabled,
         a scan might start in the middle of the table and then <quote>wrap
-        around</> the end to cover all rows, so as to synchronize with the
+        around</quote> the end to cover all rows, so as to synchronize with the
         activity of scans already in progress.  This can result in
         unpredictable changes in the row ordering returned by queries that
-        have no <literal>ORDER BY</> clause.  Setting this parameter to
-        <literal>off</> ensures the pre-8.3 behavior in which a sequential
+        have no <literal>ORDER BY</literal> clause.  Setting this parameter to
+        <literal>off</literal> ensures the pre-8.3 behavior in which a sequential
         scan always starts from the beginning of the table.  The default
-        is <literal>on</>.
+        is <literal>on</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -7672,31 +7798,31 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
 
      <varlistentry id="guc-transform-null-equals" xreflabel="transform_null_equals">
       <term><varname>transform_null_equals</varname> (<type>boolean</type>)
-      <indexterm><primary>IS NULL</></>
+      <indexterm><primary>IS NULL</primary></indexterm>
       <indexterm>
-       <primary><varname>transform_null_equals</> configuration parameter</primary>
+       <primary><varname>transform_null_equals</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When on, expressions of the form <literal><replaceable>expr</> =
+        When on, expressions of the form <literal><replaceable>expr</replaceable> =
         NULL</literal> (or <literal>NULL =
-        <replaceable>expr</></literal>) are treated as
-        <literal><replaceable>expr</> IS NULL</literal>, that is, they
-        return true if <replaceable>expr</> evaluates to the null value,
+        <replaceable>expr</replaceable></literal>) are treated as
+        <literal><replaceable>expr</replaceable> IS NULL</literal>, that is, they
+        return true if <replaceable>expr</replaceable> evaluates to the null value,
         and false otherwise. The correct SQL-spec-compliant behavior of
-        <literal><replaceable>expr</> = NULL</literal> is to always
+        <literal><replaceable>expr</replaceable> = NULL</literal> is to always
         return null (unknown). Therefore this parameter defaults to
-        <literal>off</>.
+        <literal>off</literal>.
        </para>
 
        <para>
         However, filtered forms in <productname>Microsoft
         Access</productname> generate queries that appear to use
-        <literal><replaceable>expr</> = NULL</literal> to test for
+        <literal><replaceable>expr</replaceable> = NULL</literal> to test for
         null values, so if you use that interface to access the database you
         might want to turn this option on.  Since expressions of the
-        form <literal><replaceable>expr</> = NULL</literal> always
+        form <literal><replaceable>expr</replaceable> = NULL</literal> always
         return the null value (using the SQL standard interpretation), they are not
         very useful and do not appear often in normal applications so
         this option does little harm in practice.  But new users are
@@ -7705,7 +7831,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        </para>
 
        <para>
-        Note that this option only affects the exact form <literal>= NULL</>,
+        Note that this option only affects the exact form <literal>= NULL</literal>,
         not other comparison operators or other expressions
         that are computationally equivalent to some expression
         involving the equals operator (such as <literal>IN</literal>).
@@ -7713,7 +7839,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
        </para>
 
        <para>
-        Refer to <xref linkend="functions-comparison"> for related information.
+        Refer to <xref linkend="functions-comparison"/> for related information.
        </para>
       </listitem>
      </varlistentry>
@@ -7730,7 +7856,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-exit-on-error" xreflabel="exit_on_error">
       <term><varname>exit_on_error</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>exit_on_error</> configuration parameter</primary>
+       <primary><varname>exit_on_error</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7745,16 +7871,16 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-restart-after-crash" xreflabel="restart_after_crash">
       <term><varname>restart_after_crash</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>restart_after_crash</> configuration parameter</primary>
+       <primary><varname>restart_after_crash</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        When set to true, which is the default, <productname>PostgreSQL</>
+        When set to true, which is the default, <productname>PostgreSQL</productname>
         will automatically reinitialize after a backend crash.  Leaving this
         value set to true is normally the best way to maximize the availability
         of the database.  However, in some circumstances, such as when
-        <productname>PostgreSQL</> is being invoked by clusterware, it may be
+        <productname>PostgreSQL</productname> is being invoked by clusterware, it may be
         useful to disable the restart so that the clusterware can gain
         control and take any actions it deems appropriate.
        </para>
@@ -7769,10 +7895,10 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
     <title>Preset Options</title>
 
     <para>
-     The following <quote>parameters</> are read-only, and are determined
+     The following <quote>parameters</quote> are read-only, and are determined
      when <productname>PostgreSQL</productname> is compiled or when it is
      installed. As such, they have been excluded from the sample
-     <filename>postgresql.conf</> file.  These options report
+     <filename>postgresql.conf</filename> file.  These options report
      various aspects of <productname>PostgreSQL</productname> behavior
      that might be of interest to certain applications, particularly
      administrative front-ends.
@@ -7783,17 +7909,17 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-block-size" xreflabel="block_size">
       <term><varname>block_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>block_size</> configuration parameter</primary>
+       <primary><varname>block_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the size of a disk block.  It is determined by the value
-        of <literal>BLCKSZ</> when building the server. The default
+        of <literal>BLCKSZ</literal> when building the server. The default
         value is 8192 bytes.  The meaning of some configuration
-        variables (such as <xref linkend="guc-shared-buffers">) is
+        variables (such as <xref linkend="guc-shared-buffers"/>) is
         influenced by <varname>block_size</varname>. See <xref
-        linkend="runtime-config-resource"> for information.
+        linkend="runtime-config-resource"/> for information.
        </para>
       </listitem>
      </varlistentry>
@@ -7801,13 +7927,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-data-checksums" xreflabel="data_checksums">
       <term><varname>data_checksums</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>data_checksums</> configuration parameter</primary>
+       <primary><varname>data_checksums</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports whether data checksums are enabled for this cluster.
-        See <xref linkend="app-initdb-data-checksums"> for more information.
+        See <xref linkend="app-initdb-data-checksums"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -7815,7 +7941,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-debug-assertions" xreflabel="debug_assertions">
       <term><varname>debug_assertions</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_assertions</> configuration parameter</primary>
+       <primary><varname>debug_assertions</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -7835,13 +7961,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-integer-datetimes" xreflabel="integer_datetimes">
       <term><varname>integer_datetimes</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>integer_datetimes</> configuration parameter</primary>
+       <primary><varname>integer_datetimes</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Reports whether <productname>PostgreSQL</> was built with support for
-        64-bit-integer dates and times.  As of <productname>PostgreSQL</> 10,
+        Reports whether <productname>PostgreSQL</productname> was built with support for
+        64-bit-integer dates and times.  As of <productname>PostgreSQL</productname> 10,
         this is always <literal>on</literal>.
        </para>
       </listitem>
@@ -7850,13 +7976,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-lc-collate" xreflabel="lc_collate">
       <term><varname>lc_collate</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_collate</> configuration parameter</primary>
+       <primary><varname>lc_collate</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the locale in which sorting of textual data is done.
-        See <xref linkend="locale"> for more information.
+        See <xref linkend="locale"/> for more information.
         This value is determined when a database is created.
        </para>
       </listitem>
@@ -7865,13 +7991,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-lc-ctype" xreflabel="lc_ctype">
       <term><varname>lc_ctype</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>lc_ctype</> configuration parameter</primary>
+       <primary><varname>lc_ctype</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the locale that determines character classifications.
-        See <xref linkend="locale"> for more information.
+        See <xref linkend="locale"/> for more information.
         This value is determined when a database is created.
         Ordinarily this will be the same as <varname>lc_collate</varname>,
         but for special applications it might be set differently.
@@ -7882,13 +8008,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-function-args" xreflabel="max_function_args">
       <term><varname>max_function_args</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_function_args</> configuration parameter</primary>
+       <primary><varname>max_function_args</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the maximum number of function arguments. It is determined by
-        the value of <literal>FUNC_MAX_ARGS</> when building the server. The
+        the value of <literal>FUNC_MAX_ARGS</literal> when building the server. The
         default value is 100 arguments.
        </para>
       </listitem>
@@ -7897,14 +8023,14 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-identifier-length" xreflabel="max_identifier_length">
       <term><varname>max_identifier_length</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_identifier_length</> configuration parameter</primary>
+       <primary><varname>max_identifier_length</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the maximum identifier length. It is determined as one
-        less than the value of <literal>NAMEDATALEN</> when building
-        the server. The default value of <literal>NAMEDATALEN</> is
+        less than the value of <literal>NAMEDATALEN</literal> when building
+        the server. The default value of <literal>NAMEDATALEN</literal> is
         64; therefore the default
         <varname>max_identifier_length</varname> is 63 bytes, which
         can be less than 63 characters when using multibyte encodings.
@@ -7915,13 +8041,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-max-index-keys" xreflabel="max_index_keys">
       <term><varname>max_index_keys</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>max_index_keys</> configuration parameter</primary>
+       <primary><varname>max_index_keys</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the maximum number of index keys. It is determined by
-        the value of <literal>INDEX_MAX_KEYS</> when building the server. The
+        the value of <literal>INDEX_MAX_KEYS</literal> when building the server. The
         default value is 32 keys.
        </para>
       </listitem>
@@ -7930,16 +8056,16 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-segment-size" xreflabel="segment_size">
       <term><varname>segment_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>segment_size</> configuration parameter</primary>
+       <primary><varname>segment_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the number of blocks (pages) that can be stored within a file
-        segment.  It is determined by the value of <literal>RELSEG_SIZE</>
+        segment.  It is determined by the value of <literal>RELSEG_SIZE</literal>
         when building the server.  The maximum size of a segment file in bytes
-        is equal to <varname>segment_size</> multiplied by
-        <varname>block_size</>; by default this is 1GB.
+        is equal to <varname>segment_size</varname> multiplied by
+        <varname>block_size</varname>; by default this is 1GB.
        </para>
       </listitem>
      </varlistentry>
@@ -7947,16 +8073,16 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-server-encoding" xreflabel="server_encoding">
       <term><varname>server_encoding</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>server_encoding</> configuration parameter</primary>
+       <primary><varname>server_encoding</varname> configuration parameter</primary>
       </indexterm>
-      <indexterm><primary>character set</></>
+      <indexterm><primary>character set</primary></indexterm>
       </term>
       <listitem>
        <para>
         Reports the database encoding (character set).
         It is determined when the database is created.  Ordinarily,
         clients need only be concerned with the value of <xref
-        linkend="guc-client-encoding">.
+        linkend="guc-client-encoding"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -7964,13 +8090,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-server-version" xreflabel="server_version">
       <term><varname>server_version</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>server_version</> configuration parameter</primary>
+       <primary><varname>server_version</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the version number of the server. It is determined by the
-        value of <literal>PG_VERSION</> when building the server.
+        value of <literal>PG_VERSION</literal> when building the server.
        </para>
       </listitem>
      </varlistentry>
@@ -7978,13 +8104,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-server-version-num" xreflabel="server_version_num">
       <term><varname>server_version_num</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>server_version_num</> configuration parameter</primary>
+       <primary><varname>server_version_num</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the version number of the server as an integer. It is determined
-        by the value of <literal>PG_VERSION_NUM</> when building the server.
+        by the value of <literal>PG_VERSION_NUM</literal> when building the server.
        </para>
       </listitem>
      </varlistentry>
@@ -7992,13 +8118,13 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-wal-block-size" xreflabel="wal_block_size">
       <term><varname>wal_block_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_block_size</> configuration parameter</primary>
+       <primary><varname>wal_block_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the size of a WAL disk block.  It is determined by the value
-        of <literal>XLOG_BLCKSZ</> when building the server. The default value
+        of <literal>XLOG_BLCKSZ</literal> when building the server. The default value
         is 8192 bytes.
        </para>
       </listitem>
@@ -8007,15 +8133,15 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-wal-segment-size" xreflabel="wal_segment_size">
       <term><varname>wal_segment_size</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>wal_segment_size</> configuration parameter</primary>
+       <primary><varname>wal_segment_size</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Reports the number of blocks (pages) in a WAL segment file.
         The total size of a WAL segment file in bytes is equal to
-        <varname>wal_segment_size</> multiplied by <varname>wal_block_size</>;
-        by default this is 16MB.  See <xref linkend="wal-configuration"> for
+        <varname>wal_segment_size</varname> multiplied by <varname>wal_block_size</varname>;
+        by default this is 16MB.  See <xref linkend="wal-configuration"/> for
         more information.
        </para>
       </listitem>
@@ -8037,12 +8163,12 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
     <para>
      Custom options have two-part names: an extension name, then a dot, then
      the parameter name proper, much like qualified names in SQL.  An example
-     is <literal>plpgsql.variable_conflict</>.
+     is <literal>plpgsql.variable_conflict</literal>.
     </para>
 
     <para>
      Because custom options may need to be set in processes that have not
-     loaded the relevant extension module, <productname>PostgreSQL</>
+     loaded the relevant extension module, <productname>PostgreSQL</productname>
      will accept a setting for any two-part parameter name.  Such variables
      are treated as placeholders and have no function until the module that
      defines them is loaded. When an extension module is loaded, it will add
@@ -8061,7 +8187,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      to assist with recovery of severely damaged databases.  There
      should be no reason to use them on a production database.
      As such, they have been excluded from the sample
-     <filename>postgresql.conf</> file.  Note that many of these
+     <filename>postgresql.conf</filename> file.  Note that many of these
      parameters require special source compilation flags to work at all.
     </para>
 
@@ -8100,7 +8226,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-post-auth-delay" xreflabel="post_auth_delay">
       <term><varname>post_auth_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>post_auth_delay</> configuration parameter</primary>
+       <primary><varname>post_auth_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8117,7 +8243,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-pre-auth-delay" xreflabel="pre_auth_delay">
       <term><varname>pre_auth_delay</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>pre_auth_delay</> configuration parameter</primary>
+       <primary><varname>pre_auth_delay</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8127,7 +8253,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
         authentication procedure.  This is intended to give developers an
         opportunity to attach to the server process with a debugger to
         trace down misbehavior in authentication.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -8136,15 +8262,15 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-trace-notify" xreflabel="trace_notify">
       <term><varname>trace_notify</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>trace_notify</> configuration parameter</primary>
+       <primary><varname>trace_notify</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Generates a great amount of debugging output for the
         <command>LISTEN</command> and <command>NOTIFY</command>
-        commands.  <xref linkend="guc-client-min-messages"> or
-        <xref linkend="guc-log-min-messages"> must be
+        commands.  <xref linkend="guc-client-min-messages"/> or
+        <xref linkend="guc-log-min-messages"/> must be
         <literal>DEBUG1</literal> or lower to send this output to the
         client or server logs, respectively.
        </para>
@@ -8154,24 +8280,24 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-trace-recovery-messages" xreflabel="trace_recovery_messages">
       <term><varname>trace_recovery_messages</varname> (<type>enum</type>)
       <indexterm>
-       <primary><varname>trace_recovery_messages</> configuration parameter</primary>
+       <primary><varname>trace_recovery_messages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Enables logging of recovery-related debugging output that otherwise
         would not be logged. This parameter allows the user to override the
-        normal setting of <xref linkend="guc-log-min-messages">, but only for
+        normal setting of <xref linkend="guc-log-min-messages"/>, but only for
         specific messages. This is intended for use in debugging Hot Standby.
-        Valid values are <literal>DEBUG5</>, <literal>DEBUG4</>,
-        <literal>DEBUG3</>, <literal>DEBUG2</>, <literal>DEBUG1</>, and
-        <literal>LOG</>.  The default, <literal>LOG</>, does not affect
+        Valid values are <literal>DEBUG5</literal>, <literal>DEBUG4</literal>,
+        <literal>DEBUG3</literal>, <literal>DEBUG2</literal>, <literal>DEBUG1</literal>, and
+        <literal>LOG</literal>.  The default, <literal>LOG</literal>, does not affect
         logging decisions at all.  The other values cause recovery-related
         debug messages of that priority or higher to be logged as though they
-        had <literal>LOG</> priority; for common settings of
-        <varname>log_min_messages</> this results in unconditionally sending
+        had <literal>LOG</literal> priority; for common settings of
+        <varname>log_min_messages</varname> this results in unconditionally sending
         them to the server log.
-        This parameter can only be set in the <filename>postgresql.conf</>
+        This parameter can only be set in the <filename>postgresql.conf</filename>
         file or on the server command line.
        </para>
       </listitem>
@@ -8180,7 +8306,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry id="guc-trace-sort" xreflabel="trace_sort">
       <term><varname>trace_sort</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>trace_sort</> configuration parameter</primary>
+       <primary><varname>trace_sort</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8196,7 +8322,7 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
      <varlistentry>
       <term><varname>trace_locks</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>trace_locks</> configuration parameter</primary>
+       <primary><varname>trace_locks</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8237,7 +8363,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>trace_lwlocks</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>trace_lwlocks</> configuration parameter</primary>
+       <primary><varname>trace_lwlocks</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8257,7 +8383,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>trace_userlocks</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>trace_userlocks</> configuration parameter</primary>
+       <primary><varname>trace_userlocks</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8276,7 +8402,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>trace_lock_oidmin</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>trace_lock_oidmin</> configuration parameter</primary>
+       <primary><varname>trace_lock_oidmin</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8295,7 +8421,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>trace_lock_table</varname> (<type>integer</type>)
       <indexterm>
-       <primary><varname>trace_lock_table</> configuration parameter</primary>
+       <primary><varname>trace_lock_table</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8313,7 +8439,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>debug_deadlocks</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>debug_deadlocks</> configuration parameter</primary>
+       <primary><varname>debug_deadlocks</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8332,7 +8458,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry>
       <term><varname>log_btree_build_stats</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>log_btree_build_stats</> configuration parameter</primary>
+       <primary><varname>log_btree_build_stats</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8351,7 +8477,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry id="guc-wal-consistency-checking" xreflabel="wal_consistency_checking">
       <term><varname>wal_consistency_checking</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>wal_consistency_checking</> configuration parameter</primary>
+       <primary><varname>wal_consistency_checking</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8371,10 +8497,10 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
         the feature.  It can be set to <literal>all</literal> to check all
         records, or to a comma-separated list of resource managers to check
         only records originating from those resource managers.  Currently,
-        the supported resource managers are <literal>heap</>,
-        <literal>heap2</>, <literal>btree</>, <literal>hash</>,
-        <literal>gin</>, <literal>gist</>, <literal>sequence</>,
-        <literal>spgist</>, <literal>brin</>, and <literal>generic</>. Only
+        the supported resource managers are <literal>heap</literal>,
+        <literal>heap2</literal>, <literal>btree</literal>, <literal>hash</literal>,
+        <literal>gin</literal>, <literal>gist</literal>, <literal>sequence</literal>,
+        <literal>spgist</literal>, <literal>brin</literal>, and <literal>generic</literal>. Only
         superusers can change this setting.
        </para>
       </listitem>
@@ -8383,7 +8509,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
      <varlistentry id="guc-wal-debug" xreflabel="wal_debug">
       <term><varname>wal_debug</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>wal_debug</> configuration parameter</primary>
+       <primary><varname>wal_debug</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -8399,24 +8525,24 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
     <varlistentry id="guc-ignore-checksum-failure" xreflabel="ignore_checksum_failure">
       <term><varname>ignore_checksum_failure</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>ignore_checksum_failure</> configuration parameter</primary>
+       <primary><varname>ignore_checksum_failure</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
-        Only has effect if <xref linkend="app-initdb-data-checksums"> are enabled.
+        Only has effect if <xref linkend="app-initdb-data-checksums"/> are enabled.
        </para>
        <para>
         Detection of a checksum failure during a read normally causes
-        <productname>PostgreSQL</> to report an error, aborting the current
-        transaction.  Setting <varname>ignore_checksum_failure</> to on causes
+        <productname>PostgreSQL</productname> to report an error, aborting the current
+        transaction.  Setting <varname>ignore_checksum_failure</varname> to on causes
         the system to ignore the failure (but still report a warning), and
         continue processing.  This behavior may <emphasis>cause crashes, propagate
-        or hide corruption, or other serious problems</>.  However, it may allow
+        or hide corruption, or other serious problems</emphasis>.  However, it may allow
         you to get past the error and retrieve undamaged tuples that might still be
         present in the table if the block header is still sane. If the header is
         corrupt an error will be reported even if this option is enabled. The
-        default setting is <literal>off</>, and it can only be changed by a superuser.
+        default setting is <literal>off</literal>, and it can only be changed by a superuser.
        </para>
       </listitem>
      </varlistentry>
@@ -8424,16 +8550,16 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
     <varlistentry id="guc-zero-damaged-pages" xreflabel="zero_damaged_pages">
       <term><varname>zero_damaged_pages</varname> (<type>boolean</type>)
       <indexterm>
-       <primary><varname>zero_damaged_pages</> configuration parameter</primary>
+       <primary><varname>zero_damaged_pages</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Detection of a damaged page header normally causes
-        <productname>PostgreSQL</> to report an error, aborting the current
-        transaction.  Setting <varname>zero_damaged_pages</> to on causes
+        <productname>PostgreSQL</productname> to report an error, aborting the current
+        transaction.  Setting <varname>zero_damaged_pages</varname> to on causes
         the system to instead report a warning, zero out the damaged
-        page in memory, and continue processing.  This behavior <emphasis>will destroy data</>,
+        page in memory, and continue processing.  This behavior <emphasis>will destroy data</emphasis>,
         namely all the rows on the damaged page.  However, it does allow you to get
         past the error and retrieve rows from any undamaged pages that might
         be present in the table.  It is useful for recovering data if
@@ -8442,7 +8568,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
         data from the damaged pages of a table.  Zeroed-out pages are not
         forced to disk so it is recommended to recreate the table or
         the index before turning this parameter off again.  The
-        default setting is <literal>off</>, and it can only be changed
+        default setting is <literal>off</literal>, and it can only be changed
         by a superuser.
        </para>
       </listitem>
@@ -8455,7 +8581,7 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
    <para>
     For convenience there are also single letter command-line option
     switches available for some parameters.  They are described in
-    <xref linkend="runtime-config-short-table">.  Some of these
+    <xref linkend="runtime-config-short-table"/>.  Some of these
     options exist for historical reasons, and their presence as a
     single-letter option does not necessarily indicate an endorsement
     to use the option heavily.
@@ -8474,15 +8600,15 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
       <tbody>
        <row>
         <entry><option>-B <replaceable>x</replaceable></option></entry>
-        <entry><literal>shared_buffers = <replaceable>x</replaceable></></entry>
+        <entry><literal>shared_buffers = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-d <replaceable>x</replaceable></option></entry>
-        <entry><literal>log_min_messages = DEBUG<replaceable>x</replaceable></></entry>
+        <entry><literal>log_min_messages = DEBUG<replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-e</option></entry>
-        <entry><literal>datestyle = euro</></entry>
+        <entry><literal>datestyle = euro</literal></entry>
        </row>
        <row>
         <entry>
@@ -8491,69 +8617,69 @@ LOG:  CleanUpLock: deleting: lock(0xb7acd844) id(24688,24696,0,0,0,1)
           <option>-fs</option>, <option>-ft</option>
          </entry>
          <entry>
-          <literal>enable_bitmapscan = off</>,
-          <literal>enable_hashjoin = off</>,
-          <literal>enable_indexscan = off</>,
-          <literal>enable_mergejoin = off</>,
-          <literal>enable_nestloop = off</>,
-          <literal>enable_indexonlyscan = off</>,
-          <literal>enable_seqscan = off</>,
-          <literal>enable_tidscan = off</>
+          <literal>enable_bitmapscan = off</literal>,
+          <literal>enable_hashjoin = off</literal>,
+          <literal>enable_indexscan = off</literal>,
+          <literal>enable_mergejoin = off</literal>,
+          <literal>enable_nestloop = off</literal>,
+          <literal>enable_indexonlyscan = off</literal>,
+          <literal>enable_seqscan = off</literal>,
+          <literal>enable_tidscan = off</literal>
          </entry>
        </row>
        <row>
         <entry><option>-F</option></entry>
-        <entry><literal>fsync = off</></entry>
+        <entry><literal>fsync = off</literal></entry>
        </row>
        <row>
         <entry><option>-h <replaceable>x</replaceable></option></entry>
-        <entry><literal>listen_addresses = <replaceable>x</replaceable></></entry>
+        <entry><literal>listen_addresses = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-i</option></entry>
-        <entry><literal>listen_addresses = '*'</></entry>
+        <entry><literal>listen_addresses = '*'</literal></entry>
        </row>
        <row>
         <entry><option>-k <replaceable>x</replaceable></option></entry>
-        <entry><literal>unix_socket_directories = <replaceable>x</replaceable></></entry>
+        <entry><literal>unix_socket_directories = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-l</option></entry>
-        <entry><literal>ssl = on</></entry>
+        <entry><literal>ssl = on</literal></entry>
        </row>
        <row>
         <entry><option>-N <replaceable>x</replaceable></option></entry>
-        <entry><literal>max_connections = <replaceable>x</replaceable></></entry>
+        <entry><literal>max_connections = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-O</option></entry>
-        <entry><literal>allow_system_table_mods = on</></entry>
+        <entry><literal>allow_system_table_mods = on</literal></entry>
        </row>
        <row>
         <entry><option>-p <replaceable>x</replaceable></option></entry>
-        <entry><literal>port = <replaceable>x</replaceable></></entry>
+        <entry><literal>port = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-P</option></entry>
-        <entry><literal>ignore_system_indexes = on</></entry>
+        <entry><literal>ignore_system_indexes = on</literal></entry>
        </row>
        <row>
         <entry><option>-s</option></entry>
-        <entry><literal>log_statement_stats = on</></entry>
+        <entry><literal>log_statement_stats = on</literal></entry>
        </row>
        <row>
         <entry><option>-S <replaceable>x</replaceable></option></entry>
-        <entry><literal>work_mem = <replaceable>x</replaceable></></entry>
+        <entry><literal>work_mem = <replaceable>x</replaceable></literal></entry>
        </row>
        <row>
         <entry><option>-tpa</option>, <option>-tpl</option>, <option>-te</option></entry>
-        <entry><literal>log_parser_stats = on</>,
-        <literal>log_planner_stats = on</>,
-        <literal>log_executor_stats = on</></entry>
+        <entry><literal>log_parser_stats = on</literal>,
+        <literal>log_planner_stats = on</literal>,
+        <literal>log_executor_stats = on</literal></entry>
        </row>
        <row>
         <entry><option>-W <replaceable>x</replaceable></option></entry>
-        <entry><literal>post_auth_delay = <replaceable>x</replaceable></></entry>
+        <entry><literal>post_auth_delay = <replaceable>x</replaceable></literal></entry>
        </row>
       </tbody>
      </tgroup>
diff --git a/doc/src/sgml/contacts.sgml b/doc/src/sgml/contacts.sgml
deleted file mode 100644
index 308eb418a5..0000000000
--- a/doc/src/sgml/contacts.sgml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!-- doc/src/sgml/contacts.sgml -->
-
-<appendix label="B" id="contacts">
-<title>Contacts</title>
-
-<!--
-<para>
-Support for <productname>PostgreSQL</productname> comes primarily from
-this printed documentation, the web-based mailing list archives,
-and the mailing lists themselves.
-</para>
-
-<sect1 id="mailing-list">
-<title>Mailing Lists</title>
-
-<para>
-Refer to the introduction in this manual or to the
-<productname>PostgreSQL</productname>
-<ulink url="https://www.postgresql.org">web page</ulink>
-for subscription information to the no-cost mailing lists.
-</para>
-
-<sect1 id="people">
-<title>People</title>
--->
-</appendix>
diff --git a/doc/src/sgml/contrib-spi.sgml b/doc/src/sgml/contrib-spi.sgml
index 3287c18d27..844ea161c4 100644
--- a/doc/src/sgml/contrib-spi.sgml
+++ b/doc/src/sgml/contrib-spi.sgml
@@ -9,8 +9,10 @@
  </indexterm>
 
  <para>
-  The <application>spi</> module provides several workable examples
-  of using SPI and triggers.  While these functions are of some value in
+  The <application>spi</application> module provides several workable examples
+  of using the <link linkend="spi">Server Programming Interface</link>
+  (<acronym>SPI</acronym>) and triggers.  While these functions are of
+  some value in
   their own right, they are even more useful as examples to modify for
   your own purposes.  The functions are general enough to be used
   with any table, but you have to specify table and field names (as described
@@ -26,15 +28,15 @@
   <title>refint &mdash; Functions for Implementing Referential Integrity</title>
 
   <para>
-   <function>check_primary_key()</> and
-   <function>check_foreign_key()</> are used to check foreign key constraints.
+   <function>check_primary_key()</function> and
+   <function>check_foreign_key()</function> are used to check foreign key constraints.
    (This functionality is long since superseded by the built-in foreign
    key mechanism, of course, but the module is still useful as an example.)
   </para>
 
   <para>
-   <function>check_primary_key()</> checks the referencing table.
-   To use, create a <literal>BEFORE INSERT OR UPDATE</> trigger using this
+   <function>check_primary_key()</function> checks the referencing table.
+   To use, create a <literal>BEFORE INSERT OR UPDATE</literal> trigger using this
    function on a table referencing another table. Specify as the trigger
    arguments: the referencing table's column name(s) which form the foreign
    key, the referenced table name, and the column names in the referenced table
@@ -43,14 +45,14 @@
   </para>
 
   <para>
-   <function>check_foreign_key()</> checks the referenced table.
-   To use, create a <literal>BEFORE DELETE OR UPDATE</> trigger using this
+   <function>check_foreign_key()</function> checks the referenced table.
+   To use, create a <literal>BEFORE DELETE OR UPDATE</literal> trigger using this
    function on a table referenced by other table(s).  Specify as the trigger
    arguments: the number of referencing tables for which the function has to
    perform checking, the action if a referencing key is found
-   (<literal>cascade</> &mdash; to delete the referencing row,
-   <literal>restrict</> &mdash; to abort transaction if referencing keys
-   exist, <literal>setnull</> &mdash; to set referencing key fields to null),
+   (<literal>cascade</literal> &mdash; to delete the referencing row,
+   <literal>restrict</literal> &mdash; to abort transaction if referencing keys
+   exist, <literal>setnull</literal> &mdash; to set referencing key fields to null),
    the triggered table's column names which form the primary/unique key, then
    the referencing table name and column names (repeated for as many
    referencing tables as were specified by first argument).  Note that the
@@ -59,7 +61,7 @@
   </para>
 
   <para>
-   There are examples in <filename>refint.example</>.
+   There are examples in <filename>refint.example</filename>.
   </para>
  </sect2>
 
@@ -67,10 +69,10 @@
   <title>timetravel &mdash; Functions for Implementing Time Travel</title>
 
   <para>
-   Long ago, <productname>PostgreSQL</> had a built-in time travel feature
+   Long ago, <productname>PostgreSQL</productname> had a built-in time travel feature
    that kept the insert and delete times for each tuple.  This can be
    emulated using these functions.  To use these functions,
-   you must add to a table two columns of <type>abstime</> type to store
+   you must add to a table two columns of <type>abstime</type> type to store
    the date when a tuple was inserted (start_date) and changed/deleted
    (stop_date):
 
@@ -89,7 +91,7 @@ CREATE TABLE mytab (
 
   <para>
    When a new row is inserted, start_date should normally be set to
-   current time, and stop_date to <literal>infinity</>.  The trigger
+   current time, and stop_date to <literal>infinity</literal>.  The trigger
    will automatically substitute these values if the inserted data
    contains nulls in these columns.  Generally, inserting explicit
    non-null data in these columns should only be done when re-loading
@@ -97,7 +99,7 @@ CREATE TABLE mytab (
   </para>
 
   <para>
-   Tuples with stop_date equal to <literal>infinity</> are <quote>valid
+   Tuples with stop_date equal to <literal>infinity</literal> are <quote>valid
    now</quote>, and can be modified.  Tuples with a finite stop_date cannot
    be modified anymore &mdash; the trigger will prevent it.  (If you need
    to do that, you can turn off time travel as shown below.)
@@ -107,7 +109,7 @@ CREATE TABLE mytab (
    For a modifiable row, on update only the stop_date in the tuple being
    updated will be changed (to current time) and a new tuple with the modified
    data will be inserted.  Start_date in this new tuple will be set to current
-   time and stop_date to <literal>infinity</>.
+   time and stop_date to <literal>infinity</literal>.
   </para>
 
   <para>
@@ -117,29 +119,29 @@ CREATE TABLE mytab (
 
   <para>
    To query for tuples <quote>valid now</quote>, include
-   <literal>stop_date = 'infinity'</> in the query's WHERE condition.
+   <literal>stop_date = 'infinity'</literal> in the query's WHERE condition.
    (You might wish to incorporate that in a view.)  Similarly, you can
    query for tuples valid at any past time with suitable conditions on
    start_date and stop_date.
   </para>
 
   <para>
-   <function>timetravel()</> is the general trigger function that supports
-   this behavior.  Create a <literal>BEFORE INSERT OR UPDATE OR DELETE</>
+   <function>timetravel()</function> is the general trigger function that supports
+   this behavior.  Create a <literal>BEFORE INSERT OR UPDATE OR DELETE</literal>
    trigger using this function on each time-traveled table. Specify two
    trigger arguments: the actual
    names of the start_date and stop_date columns.
    Optionally, you can specify one to three more arguments, which must refer
-   to columns of type <type>text</>.  The trigger will store the name of
+   to columns of type <type>text</type>.  The trigger will store the name of
    the current user into the first of these columns during INSERT, the
    second column during UPDATE, and the third during DELETE.
   </para>
 
   <para>
-   <function>set_timetravel()</> allows you to turn time-travel on or off for
+   <function>set_timetravel()</function> allows you to turn time-travel on or off for
    a table.
-   <literal>set_timetravel('mytab', 1)</> will turn TT ON for table <literal>mytab</>.
-   <literal>set_timetravel('mytab', 0)</> will turn TT OFF for table <literal>mytab</>.
+   <literal>set_timetravel('mytab', 1)</literal> will turn TT ON for table <literal>mytab</literal>.
+   <literal>set_timetravel('mytab', 0)</literal> will turn TT OFF for table <literal>mytab</literal>.
    In both cases the old status is reported.  While TT is off, you can modify
    the start_date and stop_date columns freely.  Note that the on/off status
    is local to the current database session &mdash; fresh sessions will
@@ -147,12 +149,12 @@ CREATE TABLE mytab (
   </para>
 
   <para>
-   <function>get_timetravel()</> returns the TT state for a table without
+   <function>get_timetravel()</function> returns the TT state for a table without
    changing it.
   </para>
 
   <para>
-   There is an example in <filename>timetravel.example</>.
+   There is an example in <filename>timetravel.example</filename>.
   </para>
  </sect2>
 
@@ -160,17 +162,17 @@ CREATE TABLE mytab (
   <title>autoinc &mdash; Functions for Autoincrementing Fields</title>
 
   <para>
-   <function>autoinc()</> is a trigger that stores the next value of
+   <function>autoinc()</function> is a trigger that stores the next value of
    a sequence into an integer field.  This has some overlap with the
-   built-in <quote>serial column</> feature, but it is not the same:
-   <function>autoinc()</> will override attempts to substitute a
+   built-in <quote>serial column</quote> feature, but it is not the same:
+   <function>autoinc()</function> will override attempts to substitute a
    different field value during inserts, and optionally it can be
    used to increment the field during updates, too.
   </para>
 
   <para>
-   To use, create a <literal>BEFORE INSERT</> (or optionally <literal>BEFORE
-   INSERT OR UPDATE</>) trigger using this function.  Specify two
+   To use, create a <literal>BEFORE INSERT</literal> (or optionally <literal>BEFORE
+   INSERT OR UPDATE</literal>) trigger using this function.  Specify two
    trigger arguments: the name of the integer column to be modified,
    and the name of the sequence object that will supply values.
    (Actually, you can specify any number of pairs of such names, if
@@ -178,7 +180,7 @@ CREATE TABLE mytab (
   </para>
 
   <para>
-   There is an example in <filename>autoinc.example</>.
+   There is an example in <filename>autoinc.example</filename>.
   </para>
 
  </sect2>
@@ -187,19 +189,19 @@ CREATE TABLE mytab (
   <title>insert_username &mdash; Functions for Tracking Who Changed a Table</title>
 
   <para>
-   <function>insert_username()</> is a trigger that stores the current
+   <function>insert_username()</function> is a trigger that stores the current
    user's name into a text field.  This can be useful for tracking
    who last modified a particular row within a table.
   </para>
 
   <para>
-   To use, create a <literal>BEFORE INSERT</> and/or <literal>UPDATE</>
+   To use, create a <literal>BEFORE INSERT</literal> and/or <literal>UPDATE</literal>
    trigger using this function.  Specify a single trigger
    argument: the name of the text column to be modified.
   </para>
 
   <para>
-   There is an example in <filename>insert_username.example</>.
+   There is an example in <filename>insert_username.example</filename>.
   </para>
 
  </sect2>
@@ -208,21 +210,21 @@ CREATE TABLE mytab (
   <title>moddatetime &mdash; Functions for Tracking Last Modification Time</title>
 
   <para>
-   <function>moddatetime()</> is a trigger that stores the current
-   time into a <type>timestamp</> field.  This can be useful for tracking
+   <function>moddatetime()</function> is a trigger that stores the current
+   time into a <type>timestamp</type> field.  This can be useful for tracking
    the last modification time of a particular row within a table.
   </para>
 
   <para>
-   To use, create a <literal>BEFORE UPDATE</>
+   To use, create a <literal>BEFORE UPDATE</literal>
    trigger using this function.  Specify a single trigger
    argument: the name of the column to be modified.
-   The column must be of type <type>timestamp</> or <type>timestamp with
-   time zone</>.
+   The column must be of type <type>timestamp</type> or <type>timestamp with
+   time zone</type>.
   </para>
 
   <para>
-   There is an example in <filename>moddatetime.example</>.
+   There is an example in <filename>moddatetime.example</filename>.
   </para>
 
  </sect2>
diff --git a/doc/src/sgml/contrib.sgml b/doc/src/sgml/contrib.sgml
index eaaa36cb87..b626a345f3 100644
--- a/doc/src/sgml/contrib.sgml
+++ b/doc/src/sgml/contrib.sgml
@@ -6,7 +6,7 @@
  <para>
   This appendix and the next one contain information regarding the modules that
   can be found in the <literal>contrib</literal> directory of the
-  <productname>PostgreSQL</> distribution.
+  <productname>PostgreSQL</productname> distribution.
   These include porting tools, analysis utilities,
   and plug-in features that are not part of the core PostgreSQL system,
   mainly because they address a limited audience or are too experimental
@@ -16,14 +16,14 @@
 
  <para>
   This appendix covers extensions and other server plug-in modules found in
-  <literal>contrib</literal>.  <xref linkend="contrib-prog"> covers utility
+  <literal>contrib</literal>.  <xref linkend="contrib-prog"/> covers utility
   programs.
  </para>
 
  <para>
   When building from the source distribution, these components are not built
   automatically, unless you build the "world" target
-  (see <xref linkend="build">).
+  (see <xref linkend="build"/>).
   You can build and install all of them by running:
 <screen>
 <userinput>make</userinput>
@@ -41,64 +41,64 @@
 <screen>
 <userinput>make installcheck</userinput>
 </screen>
-  once you have a <productname>PostgreSQL</> server running.
+  once you have a <productname>PostgreSQL</productname> server running.
  </para>
 
  <para>
-  If you are using a pre-packaged version of <productname>PostgreSQL</>,
+  If you are using a pre-packaged version of <productname>PostgreSQL</productname>,
   these modules are typically made available as a separate subpackage,
-  such as <literal>postgresql-contrib</>.
+  such as <literal>postgresql-contrib</literal>.
  </para>
 
  <para>
   Many modules supply new user-defined functions, operators, or types.
   To make use of one of these modules, after you have installed the code
   you need to register the new SQL objects in the database system.
-  In <productname>PostgreSQL</> 9.1 and later, this is done by executing
-  a <xref linkend="sql-createextension"> command.  In a fresh database,
+  In <productname>PostgreSQL</productname> 9.1 and later, this is done by executing
+  a <xref linkend="sql-createextension"/> command.  In a fresh database,
   you can simply do
 
 <programlisting>
-CREATE EXTENSION <replaceable>module_name</>;
+CREATE EXTENSION <replaceable>module_name</replaceable>;
 </programlisting>
 
   This command must be run by a database superuser.  This registers the
   new SQL objects in the current database only, so you need to run this
   command in each database that you want
   the module's facilities to be available in.  Alternatively, run it in
-  database <literal>template1</> so that the extension will be copied into
+  database <literal>template1</literal> so that the extension will be copied into
   subsequently-created databases by default.
  </para>
 
  <para>
   Many modules allow you to install their objects in a schema of your
   choice.  To do that, add <literal>SCHEMA
-  <replaceable>schema_name</></literal> to the <command>CREATE EXTENSION</>
+  <replaceable>schema_name</replaceable></literal> to the <command>CREATE EXTENSION</command>
   command.  By default, the objects will be placed in your current creation
-  target schema, typically <literal>public</>.
+  target schema, which in turn defaults to <literal>public</literal>.
  </para>
 
  <para>
   If your database was brought forward by dump and reload from a pre-9.1
-  version of <productname>PostgreSQL</>, and you had been using the pre-9.1
+  version of <productname>PostgreSQL</productname>, and you had been using the pre-9.1
   version of the module in it, you should instead do
 
 <programlisting>
-CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
+CREATE EXTENSION <replaceable>module_name</replaceable> FROM unpackaged;
 </programlisting>
 
   This will update the pre-9.1 objects of the module into a proper
-  <firstterm>extension</> object.  Future updates to the module will be
-  managed by <xref linkend="sql-alterextension">.
+  <firstterm>extension</firstterm> object.  Future updates to the module will be
+  managed by <xref linkend="sql-alterextension"/>.
   For more information about extension updates, see
-  <xref linkend="extend-extensions">.
+  <xref linkend="extend-extensions"/>.
  </para>
 
  <para>
   Note, however, that some of these modules are not <quote>extensions</quote>
   in this sense, but are loaded into the server in some other way, for instance
   by way of
-  <xref linkend="guc-shared-preload-libraries">.  See the documentation of each
+  <xref linkend="guc-shared-preload-libraries"/>.  See the documentation of each
   module for details.
  </para>
 
@@ -109,7 +109,6 @@ CREATE EXTENSION <replaceable>module_name</> FROM unpackaged;
  &bloom;
  &btree-gin;
  &btree-gist;
- &chkpass;
  &citext;
  &cube;
  &dblink;
@@ -164,7 +163,7 @@ pages.
  <para>
   This appendix and the previous one contain information regarding the modules that
   can be found in the <literal>contrib</literal> directory of the
-  <productname>PostgreSQL</> distribution.  See <xref linkend="contrib"> for
+  <productname>PostgreSQL</productname> distribution.  See <xref linkend="contrib"/> for
   more information about the <literal>contrib</literal> section in general and
   server extensions and plug-ins found in <literal>contrib</literal>
   specifically.
@@ -185,7 +184,7 @@ pages.
    This section covers <productname>PostgreSQL</productname> client
    applications in <literal>contrib</literal>.  They can be run from anywhere,
    independent of where the database server resides.  See
-   also <xref linkend="reference-client"> for information about client
+   also <xref linkend="reference-client"/> for information about client
    applications that part of the core <productname>PostgreSQL</productname>
    distribution.
   </para>
@@ -201,7 +200,7 @@ pages.
    This section covers <productname>PostgreSQL</productname> server-related
    applications in <literal>contrib</literal>.  They are typically run on the
    host where the database server resides.  See also <xref
-   linkend="reference-server"> for information about server applications that
+   linkend="reference-server"/> for information about server applications that
    part of the core <productname>PostgreSQL</productname> distribution.
   </para>
 
diff --git a/doc/src/sgml/cube.sgml b/doc/src/sgml/cube.sgml
index 1ffc40f1a5..e010305d84 100644
--- a/doc/src/sgml/cube.sgml
+++ b/doc/src/sgml/cube.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  This module implements a data type <type>cube</> for
+  This module implements a data type <type>cube</type> for
   representing multidimensional cubes.
  </para>
 
@@ -16,9 +16,9 @@
   <title>Syntax</title>
 
   <para>
-   <xref linkend="cube-repr-table"> shows the valid external
-   representations for the <type>cube</>
-   type.  <replaceable>x</>, <replaceable>y</>, etc. denote
+   <xref linkend="cube-repr-table"/> shows the valid external
+   representations for the <type>cube</type>
+   type.  <replaceable>x</replaceable>, <replaceable>y</replaceable>, etc. denote
    floating-point numbers.
   </para>
 
@@ -34,43 +34,43 @@
 
     <tbody>
      <row>
-      <entry><literal><replaceable>x</></literal></entry>
+      <entry><literal><replaceable>x</replaceable></literal></entry>
       <entry>A one-dimensional point
        (or, zero-length one-dimensional interval)
       </entry>
      </row>
      <row>
-      <entry><literal>(<replaceable>x</>)</literal></entry>
+      <entry><literal>(<replaceable>x</replaceable>)</literal></entry>
       <entry>Same as above</entry>
      </row>
      <row>
-      <entry><literal><replaceable>x1</>,<replaceable>x2</>,...,<replaceable>xn</></literal></entry>
+      <entry><literal><replaceable>x1</replaceable>,<replaceable>x2</replaceable>,...,<replaceable>xn</replaceable></literal></entry>
       <entry>A point in n-dimensional space, represented internally as a
       zero-volume cube
       </entry>
      </row>
      <row>
-      <entry><literal>(<replaceable>x1</>,<replaceable>x2</>,...,<replaceable>xn</>)</literal></entry>
+      <entry><literal>(<replaceable>x1</replaceable>,<replaceable>x2</replaceable>,...,<replaceable>xn</replaceable>)</literal></entry>
       <entry>Same as above</entry>
      </row>
      <row>
-      <entry><literal>(<replaceable>x</>),(<replaceable>y</>)</literal></entry>
-      <entry>A one-dimensional interval starting at <replaceable>x</> and ending at <replaceable>y</> or vice versa; the
+      <entry><literal>(<replaceable>x</replaceable>),(<replaceable>y</replaceable>)</literal></entry>
+      <entry>A one-dimensional interval starting at <replaceable>x</replaceable> and ending at <replaceable>y</replaceable> or vice versa; the
        order does not matter
       </entry>
      </row>
      <row>
-      <entry><literal>[(<replaceable>x</>),(<replaceable>y</>)]</literal></entry>
+      <entry><literal>[(<replaceable>x</replaceable>),(<replaceable>y</replaceable>)]</literal></entry>
       <entry>Same as above</entry>
      </row>
      <row>
-      <entry><literal>(<replaceable>x1</>,...,<replaceable>xn</>),(<replaceable>y1</>,...,<replaceable>yn</>)</literal></entry>
+      <entry><literal>(<replaceable>x1</replaceable>,...,<replaceable>xn</replaceable>),(<replaceable>y1</replaceable>,...,<replaceable>yn</replaceable>)</literal></entry>
       <entry>An n-dimensional cube represented by a pair of its diagonally
        opposite corners
       </entry>
      </row>
      <row>
-      <entry><literal>[(<replaceable>x1</>,...,<replaceable>xn</>),(<replaceable>y1</>,...,<replaceable>yn</>)]</literal></entry>
+      <entry><literal>[(<replaceable>x1</replaceable>,...,<replaceable>xn</replaceable>),(<replaceable>y1</replaceable>,...,<replaceable>yn</replaceable>)]</literal></entry>
       <entry>Same as above</entry>
      </row>
     </tbody>
@@ -79,17 +79,17 @@
 
   <para>
    It does not matter which order the opposite corners of a cube are
-   entered in.  The <type>cube</> functions
+   entered in.  The <type>cube</type> functions
    automatically swap values if needed to create a uniform
-   <quote>lower left &mdash; upper right</> internal representation.
-   When the corners coincide, <type>cube</> stores only one corner
-   along with an <quote>is point</> flag to avoid wasting space.
+   <quote>lower left &mdash; upper right</quote> internal representation.
+   When the corners coincide, <type>cube</type> stores only one corner
+   along with an <quote>is point</quote> flag to avoid wasting space.
   </para>
 
   <para>
    White space is ignored on input, so
-   <literal>[(<replaceable>x</>),(<replaceable>y</>)]</literal> is the same as
-   <literal>[ ( <replaceable>x</> ), ( <replaceable>y</> ) ]</literal>.
+   <literal>[(<replaceable>x</replaceable>),(<replaceable>y</replaceable>)]</literal> is the same as
+   <literal>[ ( <replaceable>x</replaceable> ), ( <replaceable>y</replaceable> ) ]</literal>.
   </para>
  </sect2>
 
@@ -106,8 +106,8 @@
   <title>Usage</title>
 
   <para>
-   <xref linkend="cube-operators-table"> shows the operators provided for
-   type <type>cube</>.
+   <xref linkend="cube-operators-table"/> shows the operators provided for
+   type <type>cube</type>.
   </para>
 
   <table id="cube-operators-table">
@@ -123,91 +123,93 @@
 
     <tbody>
      <row>
-      <entry><literal>a = b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a = b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cubes a and b are identical.</entry>
      </row>
 
      <row>
-      <entry><literal>a &amp;&amp; b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &amp;&amp; b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cubes a and b overlap.</entry>
      </row>
 
      <row>
-      <entry><literal>a @&gt; b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a @&gt; b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a contains the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;@ b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &lt;@ b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is contained in the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt; b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &lt; b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is less than the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;= b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &lt;= b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is less than or equal to the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &gt; b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &gt; b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is greater than the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &gt;= b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &gt;= b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is greater than or equal to the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;&gt; b</></entry>
-      <entry><type>boolean</></entry>
+      <entry><literal>a &lt;&gt; b</literal></entry>
+      <entry><type>boolean</type></entry>
       <entry>The cube a is not equal to the cube b.</entry>
      </row>
 
      <row>
-      <entry><literal>a -&gt; n</></entry>
-      <entry><type>float8</></entry>
-      <entry>Get <replaceable>n</>-th coordinate of cube (counting from 1).</entry>
+      <entry><literal>a -&gt; n</literal></entry>
+      <entry><type>float8</type></entry>
+      <entry>Get <replaceable>n</replaceable>-th coordinate of cube (counting from 1).</entry>
      </row>
 
      <row>
-      <entry><literal>a ~&gt; n</></entry>
-      <entry><type>float8</></entry>
+      <entry><literal>a ~&gt; n</literal></entry>
+      <entry><type>float8</type></entry>
       <entry>
-        Get <replaceable>n</>-th coordinate in <quote>normalized</> cube
-        representation, in which the coordinates have been rearranged into
-        the form <quote>lower left &mdash; upper right</>; that is, the
-        smaller endpoint along each dimension appears first.
+        Get <replaceable>n</replaceable>-th coordinate of cube in following way:
+        n = 2 * k - 1 means lower bound of <replaceable>k</replaceable>-th
+        dimension, n = 2 * k means upper bound of
+        <replaceable>k</replaceable>-th dimension.  Negative
+        <replaceable>n</replaceable> denotes inversed value of corresponding
+        positive coordinate.  This operator is designed for KNN-GiST support.
       </entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;-&gt; b</></entry>
-      <entry><type>float8</></entry>
+      <entry><literal>a &lt;-&gt; b</literal></entry>
+      <entry><type>float8</type></entry>
       <entry>Euclidean distance between a and b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;#&gt; b</></entry>
-      <entry><type>float8</></entry>
+      <entry><literal>a &lt;#&gt; b</literal></entry>
+      <entry><type>float8</type></entry>
       <entry>Taxicab (L-1 metric) distance between a and b.</entry>
      </row>
 
      <row>
-      <entry><literal>a &lt;=&gt; b</></entry>
-      <entry><type>float8</></entry>
+      <entry><literal>a &lt;=&gt; b</literal></entry>
+      <entry><type>float8</type></entry>
       <entry>Chebyshev (L-inf metric) distance between a and b.</entry>
      </row>
 
@@ -216,35 +218,35 @@
   </table>
 
   <para>
-   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
-   respectively called <literal>@</> and <literal>~</>.  These names are still available, but are
+   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were
+   respectively called <literal>@</literal> and <literal>~</literal>.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
    data types!)
   </para>
 
   <para>
-   The scalar ordering operators (<literal>&lt;</>, <literal>&gt;=</>, etc)
+   The scalar ordering operators (<literal>&lt;</literal>, <literal>&gt;=</literal>, etc)
    do not make a lot of sense for any practical purpose but sorting.  These
    operators first compare the first coordinates, and if those are equal,
    compare the second coordinates, etc.  They exist mainly to support the
-   b-tree index operator class for <type>cube</>, which can be useful for
-   example if you would like a UNIQUE constraint on a <type>cube</> column.
+   b-tree index operator class for <type>cube</type>, which can be useful for
+   example if you would like a UNIQUE constraint on a <type>cube</type> column.
   </para>
 
   <para>
-   The <filename>cube</> module also provides a GiST index operator class for
-   <type>cube</> values.
-   A <type>cube</> GiST index can be used to search for values using the
-   <literal>=</>, <literal>&amp;&amp;</>, <literal>@&gt;</>, and
-   <literal>&lt;@</> operators in <literal>WHERE</> clauses.
+   The <filename>cube</filename> module also provides a GiST index operator class for
+   <type>cube</type> values.
+   A <type>cube</type> GiST index can be used to search for values using the
+   <literal>=</literal>, <literal>&amp;&amp;</literal>, <literal>@&gt;</literal>, and
+   <literal>&lt;@</literal> operators in <literal>WHERE</literal> clauses.
   </para>
 
   <para>
-   In addition, a <type>cube</> GiST index can be used to find nearest
+   In addition, a <type>cube</type> GiST index can be used to find nearest
    neighbors using the metric operators
-   <literal>&lt;-&gt;</>, <literal>&lt;#&gt;</>, and
-   <literal>&lt;=&gt;</> in <literal>ORDER BY</> clauses.
+   <literal>&lt;-&gt;</literal>, <literal>&lt;#&gt;</literal>, and
+   <literal>&lt;=&gt;</literal> in <literal>ORDER BY</literal> clauses.
    For example, the nearest neighbor of the 3-D point (0.5, 0.5, 0.5)
    could be found efficiently with:
 <programlisting>
@@ -253,7 +255,7 @@ SELECT c FROM test ORDER BY c &lt;-&gt; cube(array[0.5,0.5,0.5]) LIMIT 1;
   </para>
 
   <para>
-   The <literal>~&gt;</> operator can also be used in this way to
+   The <literal>~&gt;</literal> operator can also be used in this way to
    efficiently retrieve the first few values sorted by a selected coordinate.
    For example, to get the first few cubes ordered by the first coordinate
    (lower left corner) ascending one could use the following query:
@@ -268,7 +270,7 @@ SELECT c FROM test ORDER BY c ~&gt; 3 DESC LIMIT 5;
   </para>
 
   <para>
-   <xref linkend="cube-functions-table"> shows the available functions.
+   <xref linkend="cube-functions-table"/> shows the available functions.
   </para>
 
   <table id="cube-functions-table">
@@ -365,7 +367,7 @@ SELECT c FROM test ORDER BY c ~&gt; 3 DESC LIMIT 5;
      <row>
       <entry><literal>cube_ll_coord(cube, integer)</literal></entry>
       <entry><type>float8</type></entry>
-      <entry>Returns the <replaceable>n</>-th coordinate value for the lower
+      <entry>Returns the <replaceable>n</replaceable>-th coordinate value for the lower
        left corner of the cube.
       </entry>
       <entry>
@@ -376,7 +378,7 @@ SELECT c FROM test ORDER BY c ~&gt; 3 DESC LIMIT 5;
     <row>
       <entry><literal>cube_ur_coord(cube, integer)</literal></entry>
       <entry><type>float8</type></entry>
-      <entry>Returns the <replaceable>n</>-th coordinate value for the
+      <entry>Returns the <replaceable>n</replaceable>-th coordinate value for the
        upper right corner of the cube.
       </entry>
       <entry>
@@ -412,9 +414,9 @@ SELECT c FROM test ORDER BY c ~&gt; 3 DESC LIMIT 5;
        desired.
       </entry>
       <entry>
-       <literal>cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[2]) == '(3),(7)'</>
+       <literal>cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[2]) == '(3),(7)'</literal>
        <literal>cube_subset(cube('(1,3,5),(6,7,8)'), ARRAY[3,2,1,1]) ==
-        '(5,3,1,1),(8,7,6,6)'</>
+        '(5,3,1,1),(8,7,6,6)'</literal>
       </entry>
      </row>
 
@@ -440,24 +442,24 @@ SELECT c FROM test ORDER BY c ~&gt; 3 DESC LIMIT 5;
       <entry><literal>cube_enlarge(c cube, r double, n integer)</literal></entry>
       <entry><type>cube</type></entry>
       <entry>Increases the size of the cube by the specified
-       radius <replaceable>r</> in at least <replaceable>n</> dimensions.
+       radius <replaceable>r</replaceable> in at least <replaceable>n</replaceable> dimensions.
        If the radius is negative the cube is shrunk instead.
-       All defined dimensions are changed by the radius <replaceable>r</>.
-       Lower-left coordinates are decreased by <replaceable>r</> and
-       upper-right coordinates are increased by <replaceable>r</>.  If a
+       All defined dimensions are changed by the radius <replaceable>r</replaceable>.
+       Lower-left coordinates are decreased by <replaceable>r</replaceable> and
+       upper-right coordinates are increased by <replaceable>r</replaceable>.  If a
        lower-left coordinate is increased to more than the corresponding
-       upper-right coordinate (this can only happen when <replaceable>r</>
+       upper-right coordinate (this can only happen when <replaceable>r</replaceable>
        &lt; 0) than both coordinates are set to their average.
-       If <replaceable>n</> is greater than the number of defined dimensions
-       and the cube is being enlarged (<replaceable>r</> &gt; 0), then extra
-       dimensions are added to make <replaceable>n</> altogether;
+       If <replaceable>n</replaceable> is greater than the number of defined dimensions
+       and the cube is being enlarged (<replaceable>r</replaceable> &gt; 0), then extra
+       dimensions are added to make <replaceable>n</replaceable> altogether;
        0 is used as the initial value for the extra coordinates.
        This function is useful for creating bounding boxes around a point for
        searching for nearby points.
       </entry>
       <entry>
        <literal>cube_enlarge('(1,2),(3,4)', 0.5, 3) ==
-        '(0.5,1.5,-0.5),(3.5,4.5,0.5)'</>
+        '(0.5,1.5,-0.5),(3.5,4.5,0.5)'</literal>
       </entry>
      </row>
     </tbody>
@@ -523,13 +525,13 @@ t
   <title>Notes</title>
 
   <para>
-   For examples of usage, see the regression test <filename>sql/cube.sql</>.
+   For examples of usage, see the regression test <filename>sql/cube.sql</filename>.
   </para>
 
   <para>
    To make it harder for people to break things, there
    is a limit of 100 on the number of dimensions of cubes. This is set
-   in <filename>cubedata.h</> if you need something bigger.
+   in <filename>cubedata.h</filename> if you need something bigger.
   </para>
  </sect2>
 
diff --git a/doc/src/sgml/custom-scan.sgml b/doc/src/sgml/custom-scan.sgml
index 6159c3a24e..24631f5f40 100644
--- a/doc/src/sgml/custom-scan.sgml
+++ b/doc/src/sgml/custom-scan.sgml
@@ -9,9 +9,9 @@
  </indexterm>
 
  <para>
-  <productname>PostgreSQL</> supports a set of experimental facilities which
+  <productname>PostgreSQL</productname> supports a set of experimental facilities which
   are intended to allow extension modules to add new scan types to the system.
-  Unlike a <link linkend="fdwhandler">foreign data wrapper</>, which is only
+  Unlike a <link linkend="fdwhandler">foreign data wrapper</link>, which is only
   responsible for knowing how to scan its own foreign tables, a custom scan
   provider can provide an alternative method of scanning any relation in the
   system.  Typically, the motivation for writing a custom scan provider will
@@ -51,9 +51,9 @@ extern PGDLLIMPORT set_rel_pathlist_hook_type set_rel_pathlist_hook;
   <para>
     Although this hook function can be used to examine, modify, or remove
     paths generated by the core system, a custom scan provider will typically
-    confine itself to generating <structname>CustomPath</> objects and adding
-    them to <literal>rel</> using <function>add_path</>.  The custom scan
-    provider is responsible for initializing the <structname>CustomPath</>
+    confine itself to generating <structname>CustomPath</structname> objects and adding
+    them to <literal>rel</literal> using <function>add_path</function>.  The custom scan
+    provider is responsible for initializing the <structname>CustomPath</structname>
     object, which is declared like this:
 <programlisting>
 typedef struct CustomPath
@@ -68,22 +68,22 @@ typedef struct CustomPath
   </para>
 
   <para>
-    <structfield>path</> must be initialized as for any other path, including
+    <structfield>path</structfield> must be initialized as for any other path, including
     the row-count estimate, start and total cost, and sort ordering provided
-    by this path.  <structfield>flags</> is a bit mask, which should include
-    <literal>CUSTOMPATH_SUPPORT_BACKWARD_SCAN</> if the custom path can support
-    a backward scan and <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</> if it
+    by this path.  <structfield>flags</structfield> is a bit mask, which should include
+    <literal>CUSTOMPATH_SUPPORT_BACKWARD_SCAN</literal> if the custom path can support
+    a backward scan and <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</literal> if it
     can support mark and restore.  Both capabilities are optional.
-    An optional <structfield>custom_paths</> is a list of <structname>Path</>
+    An optional <structfield>custom_paths</structfield> is a list of <structname>Path</structname>
     nodes used by this custom-path node; these will be transformed into
-    <structname>Plan</> nodes by planner.
-    <structfield>custom_private</> can be used to store the custom path's
+    <structname>Plan</structname> nodes by planner.
+    <structfield>custom_private</structfield> can be used to store the custom path's
     private data.  Private data should be stored in a form that can be handled
-    by <literal>nodeToString</>, so that debugging routines that attempt to
-    print the custom path will work as designed.  <structfield>methods</> must
+    by <literal>nodeToString</literal>, so that debugging routines that attempt to
+    print the custom path will work as designed.  <structfield>methods</structfield> must
     point to a (usually statically allocated) object implementing the required
     custom path methods, of which there is currently only one.  The
-    <structfield>LibraryName</> and <structfield>SymbolName</> fields must also
+    <structfield>LibraryName</structfield> and <structfield>SymbolName</structfield> fields must also
     be initialized so that the dynamic loader can resolve them to locate the
     method table.
   </para>
@@ -93,7 +93,7 @@ typedef struct CustomPath
    relations, such a path must produce the same output as would normally be
    produced by the join it replaces.  To do this, the join provider should
    set the following hook, and then within the hook function,
-   create <structname>CustomPath</> path(s) for the join relation.
+   create <structname>CustomPath</structname> path(s) for the join relation.
 <programlisting>
 typedef void (*set_join_pathlist_hook_type) (PlannerInfo *root,
                                              RelOptInfo *joinrel,
@@ -122,8 +122,8 @@ Plan *(*PlanCustomPath) (PlannerInfo *root,
                          List *custom_plans);
 </programlisting>
     Convert a custom path to a finished plan.  The return value will generally
-    be a <literal>CustomScan</> object, which the callback must allocate and
-    initialize.  See <xref linkend="custom-scan-plan"> for more details.
+    be a <literal>CustomScan</literal> object, which the callback must allocate and
+    initialize.  See <xref linkend="custom-scan-plan"/> for more details.
    </para>
   </sect2>
  </sect1>
@@ -150,45 +150,45 @@ typedef struct CustomScan
   </para>
 
   <para>
-    <structfield>scan</> must be initialized as for any other scan, including
+    <structfield>scan</structfield> must be initialized as for any other scan, including
     estimated costs, target lists, qualifications, and so on.
-    <structfield>flags</> is a bit mask with the same meaning as in
-    <structname>CustomPath</>.
-    <structfield>custom_plans</> can be used to store child
-    <structname>Plan</> nodes.
-    <structfield>custom_exprs</> should be used to
+    <structfield>flags</structfield> is a bit mask with the same meaning as in
+    <structname>CustomPath</structname>.
+    <structfield>custom_plans</structfield> can be used to store child
+    <structname>Plan</structname> nodes.
+    <structfield>custom_exprs</structfield> should be used to
     store expression trees that will need to be fixed up by
-    <filename>setrefs.c</> and <filename>subselect.c</>, while
-    <structfield>custom_private</> should be used to store other private data
+    <filename>setrefs.c</filename> and <filename>subselect.c</filename>, while
+    <structfield>custom_private</structfield> should be used to store other private data
     that is only used by the custom scan provider itself.
-    <structfield>custom_scan_tlist</> can be NIL when scanning a base
+    <structfield>custom_scan_tlist</structfield> can be NIL when scanning a base
     relation, indicating that the custom scan returns scan tuples that match
     the base relation's row type.  Otherwise it is a target list describing
-    the actual scan tuples.  <structfield>custom_scan_tlist</> must be
+    the actual scan tuples.  <structfield>custom_scan_tlist</structfield> must be
     provided for joins, and could be provided for scans if the custom scan
     provider can compute some non-Var expressions.
-    <structfield>custom_relids</> is set by the core code to the set of
+    <structfield>custom_relids</structfield> is set by the core code to the set of
     relations (range table indexes) that this scan node handles; except when
     this scan is replacing a join, it will have only one member.
-    <structfield>methods</> must point to a (usually statically allocated)
+    <structfield>methods</structfield> must point to a (usually statically allocated)
     object implementing the required custom scan methods, which are further
     detailed below.
   </para>
 
   <para>
-   When a <structname>CustomScan</> scans a single relation,
-   <structfield>scan.scanrelid</> must be the range table index of the table
-   to be scanned.  When it replaces a join, <structfield>scan.scanrelid</>
+   When a <structname>CustomScan</structname> scans a single relation,
+   <structfield>scan.scanrelid</structfield> must be the range table index of the table
+   to be scanned.  When it replaces a join, <structfield>scan.scanrelid</structfield>
    should be zero.
   </para>
 
   <para>
-   Plan trees must be able to be duplicated using <function>copyObject</>,
-   so all the data stored within the <quote>custom</> fields must consist of
+   Plan trees must be able to be duplicated using <function>copyObject</function>,
+   so all the data stored within the <quote>custom</quote> fields must consist of
    nodes that that function can handle.  Furthermore, custom scan providers
    cannot substitute a larger structure that embeds
-   a <structname>CustomScan</> for the structure itself, as would be possible
-   for a <structname>CustomPath</> or <structname>CustomScanState</>.
+   a <structname>CustomScan</structname> for the structure itself, as would be possible
+   for a <structname>CustomPath</structname> or <structname>CustomScanState</structname>.
   </para>
 
   <sect2 id="custom-scan-plan-callbacks">
@@ -197,14 +197,14 @@ typedef struct CustomScan
 <programlisting>
 Node *(*CreateCustomScanState) (CustomScan *cscan);
 </programlisting>
-    Allocate a <structname>CustomScanState</> for this
-    <structname>CustomScan</>.  The actual allocation will often be larger than
-    required for an ordinary <structname>CustomScanState</>, because many
+    Allocate a <structname>CustomScanState</structname> for this
+    <structname>CustomScan</structname>.  The actual allocation will often be larger than
+    required for an ordinary <structname>CustomScanState</structname>, because many
     providers will wish to embed that as the first field of a larger structure.
-    The value returned must have the node tag and <structfield>methods</>
+    The value returned must have the node tag and <structfield>methods</structfield>
     set appropriately, but other fields should be left as zeroes at this
-    stage; after <function>ExecInitCustomScan</> performs basic initialization,
-    the <function>BeginCustomScan</> callback will be invoked to give the
+    stage; after <function>ExecInitCustomScan</function> performs basic initialization,
+    the <function>BeginCustomScan</function> callback will be invoked to give the
     custom scan provider a chance to do whatever else is needed.
    </para>
   </sect2>
@@ -214,8 +214,8 @@ Node *(*CreateCustomScanState) (CustomScan *cscan);
   <title>Executing Custom Scans</title>
 
   <para>
-   When a <structfield>CustomScan</> is executed, its execution state is
-   represented by a <structfield>CustomScanState</>, which is declared as
+   When a <structfield>CustomScan</structfield> is executed, its execution state is
+   represented by a <structfield>CustomScanState</structfield>, which is declared as
    follows:
 <programlisting>
 typedef struct CustomScanState
@@ -228,15 +228,15 @@ typedef struct CustomScanState
   </para>
 
   <para>
-   <structfield>ss</> is initialized as for any other scan state,
+   <structfield>ss</structfield> is initialized as for any other scan state,
    except that if the scan is for a join rather than a base relation,
-   <literal>ss.ss_currentRelation</> is left NULL.
-   <structfield>flags</> is a bit mask with the same meaning as in
-   <structname>CustomPath</> and <structname>CustomScan</>.
-   <structfield>methods</> must point to a (usually statically allocated)
+   <literal>ss.ss_currentRelation</literal> is left NULL.
+   <structfield>flags</structfield> is a bit mask with the same meaning as in
+   <structname>CustomPath</structname> and <structname>CustomScan</structname>.
+   <structfield>methods</structfield> must point to a (usually statically allocated)
    object implementing the required custom scan state methods, which are
-   further detailed below.  Typically, a <structname>CustomScanState</>, which
-   need not support <function>copyObject</>, will actually be a larger
+   further detailed below.  Typically, a <structname>CustomScanState</structname>, which
+   need not support <function>copyObject</function>, will actually be a larger
    structure embedding the above as its first member.
   </para>
 
@@ -249,8 +249,8 @@ void (*BeginCustomScan) (CustomScanState *node,
                          EState *estate,
                          int eflags);
 </programlisting>
-    Complete initialization of the supplied <structname>CustomScanState</>.
-    Standard fields have been initialized by <function>ExecInitCustomScan</>,
+    Complete initialization of the supplied <structname>CustomScanState</structname>.
+    Standard fields have been initialized by <function>ExecInitCustomScan</function>,
     but any private fields should be initialized here.
    </para>
 
@@ -259,16 +259,16 @@ void (*BeginCustomScan) (CustomScanState *node,
 TupleTableSlot *(*ExecCustomScan) (CustomScanState *node);
 </programlisting>
     Fetch the next scan tuple.  If any tuples remain, it should fill
-    <literal>ps_ResultTupleSlot</> with the next tuple in the current scan
+    <literal>ps_ResultTupleSlot</literal> with the next tuple in the current scan
     direction, and then return the tuple slot.  If not,
-    <literal>NULL</> or an empty slot should be returned.
+    <literal>NULL</literal> or an empty slot should be returned.
    </para>
 
    <para>
 <programlisting>
 void (*EndCustomScan) (CustomScanState *node);
 </programlisting>
-    Clean up any private data associated with the <literal>CustomScanState</>.
+    Clean up any private data associated with the <literal>CustomScanState</literal>.
     This method is required, but it does not need to do anything if there is
     no associated data or it will be cleaned up automatically.
    </para>
@@ -286,9 +286,9 @@ void (*ReScanCustomScan) (CustomScanState *node);
 void (*MarkPosCustomScan) (CustomScanState *node);
 </programlisting>
     Save the current scan position so that it can subsequently be restored
-    by the <function>RestrPosCustomScan</> callback.  This callback is
+    by the <function>RestrPosCustomScan</function> callback.  This callback is
     optional, and need only be supplied if the
-    <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</> flag is set.
+    <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</literal> flag is set.
    </para>
 
    <para>
@@ -296,9 +296,9 @@ void (*MarkPosCustomScan) (CustomScanState *node);
 void (*RestrPosCustomScan) (CustomScanState *node);
 </programlisting>
     Restore the previous scan position as saved by the
-    <function>MarkPosCustomScan</> callback.  This callback is optional,
+    <function>MarkPosCustomScan</function> callback.  This callback is optional,
     and need only be supplied if the
-    <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</> flag is set.
+    <literal>CUSTOMPATH_SUPPORT_MARK_RESTORE</literal> flag is set.
    </para>
 
    <para>
@@ -320,22 +320,39 @@ void (*InitializeDSMCustomScan) (CustomScanState *node,
                                  void *coordinate);
 </programlisting>
     Initialize the dynamic shared memory that will be required for parallel
-    operation; <literal>coordinate</> points to an amount of allocated space
-    equal to the return value of <function>EstimateDSMCustomScan</>.
+    operation.  <literal>coordinate</literal> points to a shared memory area of
+    size equal to the return value of <function>EstimateDSMCustomScan</function>.
     This callback is optional, and need only be supplied if this custom
     scan provider supports parallel execution.
    </para>
 
    <para>
 <programlisting>
+void (*ReInitializeDSMCustomScan) (CustomScanState *node,
+                                   ParallelContext *pcxt,
+                                   void *coordinate);
+</programlisting>
+    Re-initialize the dynamic shared memory required for parallel operation
+    when the custom-scan plan node is about to be re-scanned.
+    This callback is optional, and need only be supplied if this custom
+    scan provider supports parallel execution.
+    Recommended practice is that this callback reset only shared state,
+    while the <function>ReScanCustomScan</function> callback resets only local
+    state.  Currently, this callback will be called
+    before <function>ReScanCustomScan</function>, but it's best not to rely on
+    that ordering.
+   </para>
+
+   <para>
+<programlisting>
 void (*InitializeWorkerCustomScan) (CustomScanState *node,
                                     shm_toc *toc,
                                     void *coordinate);
 </programlisting>
-    Initialize a parallel worker's custom state based on the shared state
-    set up in the leader by <literal>InitializeDSMCustomScan</>.
-    This callback is optional, and needs only be supplied if this
-    custom path supports parallel execution.
+    Initialize a parallel worker's local state based on the shared state
+    set up by the leader during <function>InitializeDSMCustomScan</function>.
+    This callback is optional, and need only be supplied if this custom
+    scan provider supports parallel execution.
    </para>
 
    <para>
@@ -344,7 +361,7 @@ void (*ShutdownCustomScan) (CustomScanState *node);
 </programlisting>
     Release resources when it is anticipated the node will not be executed
     to completion.  This is not called in all cases; sometimes,
-    <literal>EndCustomScan</> may be called without this function having
+    <literal>EndCustomScan</literal> may be called without this function having
     been called first.  Since the DSM segment used by parallel query is
     destroyed just after this callback is invoked, custom scan providers that
     wish to take some action before the DSM segment goes away should implement
@@ -357,9 +374,9 @@ void (*ExplainCustomScan) (CustomScanState *node,
                            List *ancestors,
                            ExplainState *es);
 </programlisting>
-    Output additional information for <command>EXPLAIN</> of a custom-scan
+    Output additional information for <command>EXPLAIN</command> of a custom-scan
     plan node.  This callback is optional.  Common data stored in the
-    <structname>ScanState</>, such as the target list and scan relation, will
+    <structname>ScanState</structname>, such as the target list and scan relation, will
     be shown even without this callback, but the callback allows the display
     of additional, private state.
    </para>
diff --git a/doc/src/sgml/datatype.sgml b/doc/src/sgml/datatype.sgml
index 5f881a0b74..9aa9b28f3e 100644
--- a/doc/src/sgml/datatype.sgml
+++ b/doc/src/sgml/datatype.sgml
@@ -16,11 +16,11 @@
    <productname>PostgreSQL</productname> has a rich set of native data
    types available to users.  Users can add new types to
    <productname>PostgreSQL</productname> using the <xref
-   linkend="sql-createtype"> command.
+   linkend="sql-createtype"/> command.
   </para>
 
   <para>
-   <xref linkend="datatype-table"> shows all the built-in general-purpose data
+   <xref linkend="datatype-table"/> shows all the built-in general-purpose data
    types. Most of the alternative names listed in the
    <quote>Aliases</quote> column are the names used internally by
    <productname>PostgreSQL</productname> for historical reasons.  In
@@ -79,7 +79,7 @@
       <row>
        <entry><type>bytea</type></entry>
        <entry></entry>
-       <entry>binary data (<quote>byte array</>)</entry>
+       <entry>binary data (<quote>byte array</quote>)</entry>
       </row>
 
       <row>
@@ -336,7 +336,7 @@
    <para>
     Numeric types consist of two-, four-, and eight-byte integers,
     four- and eight-byte floating-point numbers, and selectable-precision
-    decimals.  <xref linkend="datatype-numeric-table"> lists the
+    decimals.  <xref linkend="datatype-numeric-table"/> lists the
     available types.
    </para>
 
@@ -354,45 +354,45 @@
 
       <tbody>
        <row>
-        <entry><type>smallint</></entry>
+        <entry><type>smallint</type></entry>
         <entry>2 bytes</entry>
         <entry>small-range integer</entry>
         <entry>-32768 to +32767</entry>
        </row>
        <row>
-        <entry><type>integer</></entry>
+        <entry><type>integer</type></entry>
         <entry>4 bytes</entry>
         <entry>typical choice for integer</entry>
         <entry>-2147483648 to +2147483647</entry>
        </row>
        <row>
-        <entry><type>bigint</></entry>
+        <entry><type>bigint</type></entry>
         <entry>8 bytes</entry>
         <entry>large-range integer</entry>
         <entry>-9223372036854775808 to +9223372036854775807</entry>
        </row>
 
        <row>
-        <entry><type>decimal</></entry>
+        <entry><type>decimal</type></entry>
         <entry>variable</entry>
         <entry>user-specified precision, exact</entry>
         <entry>up to 131072 digits before the decimal point; up to 16383 digits after the decimal point</entry>
        </row>
        <row>
-        <entry><type>numeric</></entry>
+        <entry><type>numeric</type></entry>
         <entry>variable</entry>
         <entry>user-specified precision, exact</entry>
         <entry>up to 131072 digits before the decimal point; up to 16383 digits after the decimal point</entry>
        </row>
 
        <row>
-        <entry><type>real</></entry>
+        <entry><type>real</type></entry>
         <entry>4 bytes</entry>
         <entry>variable-precision, inexact</entry>
         <entry>6 decimal digits precision</entry>
        </row>
        <row>
-        <entry><type>double precision</></entry>
+        <entry><type>double precision</type></entry>
         <entry>8 bytes</entry>
         <entry>variable-precision, inexact</entry>
         <entry>15 decimal digits precision</entry>
@@ -406,7 +406,7 @@
        </row>
 
        <row>
-        <entry><type>serial</></entry>
+        <entry><type>serial</type></entry>
         <entry>4 bytes</entry>
         <entry>autoincrementing integer</entry>
         <entry>1 to 2147483647</entry>
@@ -424,9 +424,9 @@
 
    <para>
     The syntax of constants for the numeric types is described in
-    <xref linkend="sql-syntax-constants">.  The numeric types have a
+    <xref linkend="sql-syntax-constants"/>.  The numeric types have a
     full set of corresponding arithmetic operators and
-    functions. Refer to <xref linkend="functions"> for more
+    functions. Refer to <xref linkend="functions"/> for more
     information.  The following sections describe the types in detail.
    </para>
 
@@ -559,7 +559,7 @@ NUMERIC
       The maximum allowed precision when explicitly specified in the
       type declaration is 1000; <type>NUMERIC</type> without a specified
       precision is subject to the limits described in <xref
-      linkend="datatype-numeric-table">.
+      linkend="datatype-numeric-table"/>.
      </para>
     </note>
 
@@ -574,9 +574,9 @@ NUMERIC
     <para>
      Numeric values are physically stored without any extra leading or
      trailing zeroes.  Thus, the declared precision and scale of a column
-     are maximums, not fixed allocations.  (In this sense the <type>numeric</>
-     type is more akin to <type>varchar(<replaceable>n</>)</type>
-     than to <type>char(<replaceable>n</>)</type>.)  The actual storage
+     are maximums, not fixed allocations.  (In this sense the <type>numeric</type>
+     type is more akin to <type>varchar(<replaceable>n</replaceable>)</type>
+     than to <type>char(<replaceable>n</replaceable>)</type>.)  The actual storage
      requirement is two bytes for each group of four decimal digits,
      plus three to eight bytes overhead.
     </para>
@@ -593,22 +593,22 @@ NUMERIC
 
     <para>
      In addition to ordinary numeric values, the <type>numeric</type>
-     type allows the special value <literal>NaN</>, meaning
-     <quote>not-a-number</quote>.  Any operation on <literal>NaN</>
-     yields another <literal>NaN</>.  When writing this value
+     type allows the special value <literal>NaN</literal>, meaning
+     <quote>not-a-number</quote>.  Any operation on <literal>NaN</literal>
+     yields another <literal>NaN</literal>.  When writing this value
      as a constant in an SQL command, you must put quotes around it,
-     for example <literal>UPDATE table SET x = 'NaN'</>.  On input,
-     the string <literal>NaN</> is recognized in a case-insensitive manner.
+     for example <literal>UPDATE table SET x = 'NaN'</literal>.  On input,
+     the string <literal>NaN</literal> is recognized in a case-insensitive manner.
     </para>
 
     <note>
      <para>
-      In most implementations of the <quote>not-a-number</> concept,
-      <literal>NaN</> is not considered equal to any other numeric
-      value (including <literal>NaN</>).  In order to allow
-      <type>numeric</> values to be sorted and used in tree-based
-      indexes, <productname>PostgreSQL</> treats <literal>NaN</>
-      values as equal, and greater than all non-<literal>NaN</>
+      In most implementations of the <quote>not-a-number</quote> concept,
+      <literal>NaN</literal> is not considered equal to any other numeric
+      value (including <literal>NaN</literal>).  In order to allow
+      <type>numeric</type> values to be sorted and used in tree-based
+      indexes, <productname>PostgreSQL</productname> treats <literal>NaN</literal>
+      values as equal, and greater than all non-<literal>NaN</literal>
       values.
      </para>
     </note>
@@ -728,7 +728,7 @@ FROM generate_series(-3.5, 3.5, 1) as x;
 
     <note>
      <para>
-      The <xref linkend="guc-extra-float-digits"> setting controls the
+      The <xref linkend="guc-extra-float-digits"/> setting controls the
       number of extra significant digits included when a floating point
       value is converted to text for output.  With the default value of
       <literal>0</literal>, the output is the same on every platform
@@ -756,18 +756,18 @@ FROM generate_series(-3.5, 3.5, 1) as x;
      floating-point arithmetic does not follow IEEE 754, these values
      will probably not work as expected.)  When writing these values
      as constants in an SQL command, you must put quotes around them,
-     for example <literal>UPDATE table SET x = '-Infinity'</>.  On input,
+     for example <literal>UPDATE table SET x = '-Infinity'</literal>.  On input,
      these strings are recognized in a case-insensitive manner.
     </para>
 
     <note>
      <para>
-      IEEE754 specifies that <literal>NaN</> should not compare equal
-      to any other floating-point value (including <literal>NaN</>).
+      IEEE754 specifies that <literal>NaN</literal> should not compare equal
+      to any other floating-point value (including <literal>NaN</literal>).
       In order to allow floating-point values to be sorted and used
-      in tree-based indexes, <productname>PostgreSQL</> treats
-      <literal>NaN</> values as equal, and greater than all
-      non-<literal>NaN</> values.
+      in tree-based indexes, <productname>PostgreSQL</productname> treats
+      <literal>NaN</literal> values as equal, and greater than all
+      non-<literal>NaN</literal> values.
      </para>
     </note>
 
@@ -776,7 +776,7 @@ FROM generate_series(-3.5, 3.5, 1) as x;
      notations <type>float</type> and
      <type>float(<replaceable>p</replaceable>)</type> for specifying
      inexact numeric types.  Here, <replaceable>p</replaceable> specifies
-     the minimum acceptable precision in <emphasis>binary</> digits.
+     the minimum acceptable precision in <emphasis>binary</emphasis> digits.
      <productname>PostgreSQL</productname> accepts
      <type>float(1)</type> to <type>float(24)</type> as selecting the
      <type>real</type> type, while
@@ -837,6 +837,14 @@ FROM generate_series(-3.5, 3.5, 1) as x;
      <secondary>and serial type</secondary>
     </indexterm>
 
+    <note>
+     <para>
+      This section describes a PostgreSQL-specific way to create an
+      autoincrementing column.  Another way is to use the SQL-standard
+      identity column feature, described at <xref linkend="sql-createtable"/>.
+     </para>
+    </note>
+
     <para>
      The data types <type>smallserial</type>, <type>serial</type> and
      <type>bigserial</type> are not true types, but merely
@@ -862,12 +870,12 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
 </programlisting>
 
      Thus, we have created an integer column and arranged for its default
-     values to be assigned from a sequence generator.  A <literal>NOT NULL</>
+     values to be assigned from a sequence generator.  A <literal>NOT NULL</literal>
      constraint is applied to ensure that a null value cannot be
      inserted.  (In most cases you would also want to attach a
-     <literal>UNIQUE</> or <literal>PRIMARY KEY</> constraint to prevent
+     <literal>UNIQUE</literal> or <literal>PRIMARY KEY</literal> constraint to prevent
      duplicate values from being inserted by accident, but this is
-     not automatic.)  Lastly, the sequence is marked as <quote>owned by</>
+     not automatic.)  Lastly, the sequence is marked as <quote>owned by</quote>
      the column, so that it will be dropped if the column or table is dropped.
     </para>
 
@@ -880,7 +888,7 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
         from the sequence is still "used up" even if a row containing that
         value is never successfully inserted into the table column.  This
         may happen, for example, if the inserting transaction rolls back.
-        See <literal>nextval()</literal> in <xref linkend="functions-sequence">
+        See <literal>nextval()</literal> in <xref linkend="functions-sequence"/>
         for details.
       </para>
     </note>
@@ -900,7 +908,7 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
      names <type>bigserial</type> and <type>serial8</type> work
      the same way, except that they create a <type>bigint</type>
      column.  <type>bigserial</type> should be used if you anticipate
-     the use of more than 2<superscript>31</> identifiers over the
+     the use of more than 2<superscript>31</superscript> identifiers over the
      lifetime of the table. The type names <type>smallserial</type> and
      <type>serial2</type> also work the same way, except that they
      create a <type>smallint</type> column.
@@ -921,8 +929,8 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
    <para>
     The <type>money</type> type stores a currency amount with a fixed
     fractional precision; see <xref
-    linkend="datatype-money-table">.  The fractional precision is
-    determined by the database's <xref linkend="guc-lc-monetary"> setting.
+    linkend="datatype-money-table"/>.  The fractional precision is
+    determined by the database's <xref linkend="guc-lc-monetary"/> setting.
     The range shown in the table assumes there are two fractional digits.
     Input is accepted in a variety of formats, including integer and
     floating-point literals, as well as typical
@@ -954,9 +962,9 @@ ALTER SEQUENCE <replaceable class="parameter">tablename</replaceable>_<replaceab
 
    <para>
     Since the output of this data type is locale-sensitive, it might not
-    work to load <type>money</> data into a database that has a different
-    setting of <varname>lc_monetary</>.  To avoid problems, before
-    restoring a dump into a new database make sure <varname>lc_monetary</> has
+    work to load <type>money</type> data into a database that has a different
+    setting of <varname>lc_monetary</varname>.  To avoid problems, before
+    restoring a dump into a new database make sure <varname>lc_monetary</varname> has
     the same or equivalent value as in the database that was dumped.
    </para>
 
@@ -986,7 +994,7 @@ SELECT '52093.89'::money::numeric::float8;
     Division of a <type>money</type> value by an integer value is performed
     with truncation of the fractional part towards zero.  To get a rounded
     result, divide by a floating-point value, or cast the <type>money</type>
-    value to <type>numeric</> before dividing and back to <type>money</type>
+    value to <type>numeric</type> before dividing and back to <type>money</type>
     afterwards.  (The latter is preferable to avoid risking precision loss.)
     When a <type>money</type> value is divided by another <type>money</type>
     value, the result is <type>double precision</type> (i.e., a pure number,
@@ -1039,11 +1047,11 @@ SELECT '52093.89'::money::numeric::float8;
       </thead>
       <tbody>
        <row>
-        <entry><type>character varying(<replaceable>n</>)</type>, <type>varchar(<replaceable>n</>)</type></entry>
+        <entry><type>character varying(<replaceable>n</replaceable>)</type>, <type>varchar(<replaceable>n</replaceable>)</type></entry>
         <entry>variable-length with limit</entry>
        </row>
        <row>
-        <entry><type>character(<replaceable>n</>)</type>, <type>char(<replaceable>n</>)</type></entry>
+        <entry><type>character(<replaceable>n</replaceable>)</type>, <type>char(<replaceable>n</replaceable>)</type></entry>
         <entry>fixed-length, blank padded</entry>
        </row>
        <row>
@@ -1055,17 +1063,17 @@ SELECT '52093.89'::money::numeric::float8;
     </table>
 
    <para>
-    <xref linkend="datatype-character-table"> shows the
+    <xref linkend="datatype-character-table"/> shows the
     general-purpose character types available in
     <productname>PostgreSQL</productname>.
    </para>
 
    <para>
     <acronym>SQL</acronym> defines two primary character types:
-    <type>character varying(<replaceable>n</>)</type> and
-    <type>character(<replaceable>n</>)</type>, where <replaceable>n</>
+    <type>character varying(<replaceable>n</replaceable>)</type> and
+    <type>character(<replaceable>n</replaceable>)</type>, where <replaceable>n</replaceable>
     is a positive integer.  Both of these types can store strings up to
-    <replaceable>n</> characters (not bytes) in length.  An attempt to store a
+    <replaceable>n</replaceable> characters (not bytes) in length.  An attempt to store a
     longer string into a column of these types will result in an
     error, unless the excess characters are all spaces, in which case
     the string will be truncated to the maximum length. (This somewhat
@@ -1079,22 +1087,22 @@ SELECT '52093.89'::money::numeric::float8;
 
    <para>
     If one explicitly casts a value to <type>character
-    varying(<replaceable>n</>)</type> or
-    <type>character(<replaceable>n</>)</type>, then an over-length
-    value will be truncated to <replaceable>n</> characters without
+    varying(<replaceable>n</replaceable>)</type> or
+    <type>character(<replaceable>n</replaceable>)</type>, then an over-length
+    value will be truncated to <replaceable>n</replaceable> characters without
     raising an error. (This too is required by the
     <acronym>SQL</acronym> standard.)
    </para>
 
    <para>
-    The notations <type>varchar(<replaceable>n</>)</type> and
-    <type>char(<replaceable>n</>)</type> are aliases for <type>character
-    varying(<replaceable>n</>)</type> and
-    <type>character(<replaceable>n</>)</type>, respectively.
+    The notations <type>varchar(<replaceable>n</replaceable>)</type> and
+    <type>char(<replaceable>n</replaceable>)</type> are aliases for <type>character
+    varying(<replaceable>n</replaceable>)</type> and
+    <type>character(<replaceable>n</replaceable>)</type>, respectively.
     <type>character</type> without length specifier is equivalent to
     <type>character(1)</type>. If <type>character varying</type> is used
     without length specifier, the type accepts strings of any size. The
-    latter is a <productname>PostgreSQL</> extension.
+    latter is a <productname>PostgreSQL</productname> extension.
    </para>
 
    <para>
@@ -1107,19 +1115,19 @@ SELECT '52093.89'::money::numeric::float8;
 
    <para>
     Values of type <type>character</type> are physically padded
-    with spaces to the specified width <replaceable>n</>, and are
+    with spaces to the specified width <replaceable>n</replaceable>, and are
     stored and displayed that way.  However, trailing spaces are treated as
     semantically insignificant and disregarded when comparing two values
     of type <type>character</type>.  In collations where whitespace
     is significant, this behavior can produce unexpected results;
     for example <command>SELECT 'a '::CHAR(2) collate "C" &lt;
-    E'a\n'::CHAR(2)</command> returns true, even though <literal>C</>
+    E'a\n'::CHAR(2)</command> returns true, even though <literal>C</literal>
     locale would consider a space to be greater than a newline.
     Trailing spaces are removed when converting a <type>character</type> value
     to one of the other string types.  Note that trailing spaces
-    <emphasis>are</> semantically significant in
+    <emphasis>are</emphasis> semantically significant in
     <type>character varying</type> and <type>text</type> values, and
-    when using pattern matching, that is <literal>LIKE</> and
+    when using pattern matching, that is <literal>LIKE</literal> and
     regular expressions.
    </para>
 
@@ -1132,7 +1140,7 @@ SELECT '52093.89'::money::numeric::float8;
     stored in background tables so that they do not interfere with rapid
     access to shorter column values. In any case, the longest
     possible character string that can be stored is about 1 GB. (The
-    maximum value that will be allowed for <replaceable>n</> in the data
+    maximum value that will be allowed for <replaceable>n</replaceable> in the data
     type declaration is less than that. It wouldn't be useful to
     change this because with multibyte character encodings the number of
     characters and bytes can be quite different. If you desire to
@@ -1147,10 +1155,10 @@ SELECT '52093.89'::money::numeric::float8;
      apart from increased storage space when using the blank-padded
      type, and a few extra CPU cycles to check the length when storing into
      a length-constrained column.  While
-     <type>character(<replaceable>n</>)</type> has performance
+     <type>character(<replaceable>n</replaceable>)</type> has performance
      advantages in some other database systems, there is no such advantage in
      <productname>PostgreSQL</productname>; in fact
-     <type>character(<replaceable>n</>)</type> is usually the slowest of
+     <type>character(<replaceable>n</replaceable>)</type> is usually the slowest of
      the three because of its additional storage costs.  In most situations
      <type>text</type> or <type>character varying</type> should be used
      instead.
@@ -1158,12 +1166,12 @@ SELECT '52093.89'::money::numeric::float8;
    </tip>
 
    <para>
-    Refer to <xref linkend="sql-syntax-strings"> for information about
-    the syntax of string literals, and to <xref linkend="functions">
+    Refer to <xref linkend="sql-syntax-strings"/> for information about
+    the syntax of string literals, and to <xref linkend="functions"/>
     for information about available operators and functions. The
     database character set determines the character set used to store
     textual values; for more information on character set support,
-    refer to <xref linkend="multibyte">.
+    refer to <xref linkend="multibyte"/>.
    </para>
 
    <example>
@@ -1172,7 +1180,7 @@ SELECT '52093.89'::money::numeric::float8;
 <programlisting>
 CREATE TABLE test1 (a character(4));
 INSERT INTO test1 VALUES ('ok');
-SELECT a, char_length(a) FROM test1; -- <co id="co.datatype-char">
+SELECT a, char_length(a) FROM test1; -- <co id="co.datatype-char"/>
 <computeroutput>
   a   | char_length
 ------+-------------
@@ -1198,7 +1206,7 @@ SELECT b, char_length(b) FROM test2;
      <callout arearefs="co.datatype-char">
       <para>
        The <function>char_length</function> function is discussed in
-       <xref linkend="functions-string">.
+       <xref linkend="functions-string"/>.
       </para>
      </callout>
     </calloutlist>
@@ -1207,12 +1215,12 @@ SELECT b, char_length(b) FROM test2;
    <para>
     There are two other fixed-length character types in
     <productname>PostgreSQL</productname>, shown in <xref
-    linkend="datatype-character-special-table">. The <type>name</type>
+    linkend="datatype-character-special-table"/>. The <type>name</type>
     type exists <emphasis>only</emphasis> for the storage of identifiers
     in the internal system catalogs and is not intended for use by the general user. Its
     length is currently defined as 64 bytes (63 usable characters plus
     terminator) but should be referenced using the constant
-    <symbol>NAMEDATALEN</symbol> in <literal>C</> source code.
+    <symbol>NAMEDATALEN</symbol> in <literal>C</literal> source code.
     The length is set at compile time (and
     is therefore adjustable for special uses); the default maximum
     length might change in a future release. The type <type>"char"</type>
@@ -1261,7 +1269,7 @@ SELECT b, char_length(b) FROM test2;
 
    <para>
     The <type>bytea</type> data type allows storage of binary strings;
-    see <xref linkend="datatype-binary-table">.
+    see <xref linkend="datatype-binary-table"/>.
    </para>
 
    <table id="datatype-binary-table">
@@ -1296,7 +1304,7 @@ SELECT b, char_length(b) FROM test2;
     Second, operations on binary strings process the actual bytes,
     whereas the processing of character strings depends on locale settings.
     In short, binary strings are appropriate for storing data that the
-    programmer thinks of as <quote>raw bytes</>, whereas character
+    programmer thinks of as <quote>raw bytes</quote>, whereas character
     strings are appropriate for storing text.
    </para>
 
@@ -1305,7 +1313,7 @@ SELECT b, char_length(b) FROM test2;
     input and output: <productname>PostgreSQL</productname>'s historical
     <quote>escape</quote> format, and <quote>hex</quote> format.  Both
     of these are always accepted on input.  The output format depends
-    on the configuration parameter <xref linkend="guc-bytea-output">;
+    on the configuration parameter <xref linkend="guc-bytea-output"/>;
     the default is hex.  (Note that the hex format was introduced in
     <productname>PostgreSQL</productname> 9.0; earlier versions and some
     tools don't understand it.)
@@ -1320,10 +1328,10 @@ SELECT b, char_length(b) FROM test2;
    </para>
 
   <sect2>
-   <title><type>bytea</> Hex Format</title>
+   <title><type>bytea</type> Hex Format</title>
 
    <para>
-    The <quote>hex</> format encodes binary data as 2 hexadecimal digits
+    The <quote>hex</quote> format encodes binary data as 2 hexadecimal digits
     per byte, most significant nibble first.  The entire string is
     preceded by the sequence <literal>\x</literal> (to distinguish it
     from the escape format).  In some contexts, the initial backslash may
@@ -1347,7 +1355,7 @@ SELECT E'\\xDEADBEEF';
   </sect2>
 
   <sect2>
-   <title><type>bytea</> Escape Format</title>
+   <title><type>bytea</type> Escape Format</title>
 
    <para>
     The <quote>escape</quote> format is the traditional
@@ -1376,13 +1384,13 @@ SELECT E'\\xDEADBEEF';
     literal using escape string syntax).
     Backslash itself (octet value 92) can alternatively be represented by
     double backslashes.
-    <xref linkend="datatype-binary-sqlesc">
+    <xref linkend="datatype-binary-sqlesc"/>
     shows the characters that must be escaped, and gives the alternative
     escape sequences where applicable.
    </para>
 
    <table id="datatype-binary-sqlesc">
-    <title><type>bytea</> Literal Escaped Octets</title>
+    <title><type>bytea</type> Literal Escaped Octets</title>
     <tgroup cols="5">
      <thead>
       <row>
@@ -1422,7 +1430,7 @@ SELECT E'\\xDEADBEEF';
       <row>
        <entry>0 to 31 and 127 to 255</entry>
        <entry><quote>non-printable</quote> octets</entry>
-       <entry><literal>E'\\<replaceable>xxx'</></literal> (octal value)</entry>
+       <entry><literal>E'\\<replaceable>xxx'</replaceable></literal> (octal value)</entry>
        <entry><literal>SELECT E'\\001'::bytea;</literal></entry>
        <entry><literal>\001</literal></entry>
       </row>
@@ -1435,14 +1443,14 @@ SELECT E'\\xDEADBEEF';
     The requirement to escape <emphasis>non-printable</emphasis> octets
     varies depending on locale settings. In some instances you can get away
     with leaving them unescaped. Note that the result in each of the examples
-    in <xref linkend="datatype-binary-sqlesc"> was exactly one octet in
+    in <xref linkend="datatype-binary-sqlesc"/> was exactly one octet in
     length, even though the output representation is sometimes
     more than one character.
    </para>
 
    <para>
     The reason multiple backslashes are required, as shown
-    in <xref linkend="datatype-binary-sqlesc">, is that an input
+    in <xref linkend="datatype-binary-sqlesc"/>, is that an input
     string written as a string literal must pass through two parse
     phases in the <productname>PostgreSQL</productname> server.
     The first backslash of each pair is interpreted as an escape
@@ -1459,7 +1467,7 @@ SELECT E'\\xDEADBEEF';
     to a single octet with a decimal value of 1.  Note that the
     single-quote character is not treated specially by <type>bytea</type>,
     so it follows the normal rules for string literals.  (See also
-    <xref linkend="sql-syntax-strings">.)
+    <xref linkend="sql-syntax-strings"/>.)
    </para>
 
    <para>
@@ -1469,11 +1477,11 @@ SELECT E'\\xDEADBEEF';
     Most <quote>printable</quote> octets are represented by their standard
     representation in the client character set. The octet with decimal
     value 92 (backslash) is doubled in the output.
-    Details are in <xref linkend="datatype-binary-resesc">.
+    Details are in <xref linkend="datatype-binary-resesc"/>.
    </para>
 
    <table id="datatype-binary-resesc">
-    <title><type>bytea</> Output Escaped Octets</title>
+    <title><type>bytea</type> Output Escaped Octets</title>
     <tgroup cols="5">
      <thead>
       <row>
@@ -1498,7 +1506,7 @@ SELECT E'\\xDEADBEEF';
       <row>
        <entry>0 to 31 and 127 to 255</entry>
        <entry><quote>non-printable</quote> octets</entry>
-       <entry><literal>\<replaceable>xxx</></literal> (octal value)</entry>
+       <entry><literal>\<replaceable>xxx</replaceable></literal> (octal value)</entry>
        <entry><literal>SELECT E'\\001'::bytea;</literal></entry>
        <entry><literal>\001</literal></entry>
       </row>
@@ -1516,7 +1524,7 @@ SELECT E'\\xDEADBEEF';
    </table>
 
    <para>
-    Depending on the front end to <productname>PostgreSQL</> you use,
+    Depending on the front end to <productname>PostgreSQL</productname> you use,
     you might have additional work to do in terms of escaping and
     unescaping <type>bytea</type> strings. For example, you might also
     have to escape line feeds and carriage returns if your interface
@@ -1563,12 +1571,12 @@ SELECT E'\\xDEADBEEF';
    <para>
     <productname>PostgreSQL</productname> supports the full set of
     <acronym>SQL</acronym> date and time types, shown in <xref
-    linkend="datatype-datetime-table">.  The operations available
+    linkend="datatype-datetime-table"/>.  The operations available
     on these data types are described in
-    <xref linkend="functions-datetime">.
+    <xref linkend="functions-datetime"/>.
     Dates are counted according to the Gregorian calendar, even in
     years before that calendar was introduced (see <xref
-    linkend="datetime-units-history"> for more information).
+    linkend="datetime-units-history"/> for more information).
    </para>
 
     <table id="datatype-datetime-table">
@@ -1677,7 +1685,7 @@ MINUTE TO SECOND
 </literallayout>
     Note that if both <replaceable>fields</replaceable> and
     <replaceable>p</replaceable> are specified, the
-    <replaceable>fields</replaceable> must include <literal>SECOND</>,
+    <replaceable>fields</replaceable> must include <literal>SECOND</literal>,
     since the precision applies only to the seconds.
    </para>
 
@@ -1708,17 +1716,17 @@ MINUTE TO SECOND
      traditional <productname>POSTGRES</productname>, and others.
      For some formats, ordering of day, month, and year in date input is
      ambiguous and there is support for specifying the expected
-     ordering of these fields.  Set the <xref linkend="guc-datestyle"> parameter
-     to <literal>MDY</> to select month-day-year interpretation,
-     <literal>DMY</> to select day-month-year interpretation, or
-     <literal>YMD</> to select year-month-day interpretation.
+     ordering of these fields.  Set the <xref linkend="guc-datestyle"/> parameter
+     to <literal>MDY</literal> to select month-day-year interpretation,
+     <literal>DMY</literal> to select day-month-year interpretation, or
+     <literal>YMD</literal> to select year-month-day interpretation.
     </para>
 
     <para>
      <productname>PostgreSQL</productname> is more flexible in
      handling date/time input than the
      <acronym>SQL</acronym> standard requires.
-     See <xref linkend="datetime-appendix">
+     See <xref linkend="datetime-appendix"/>
      for the exact parsing rules of date/time input and for the
      recognized text fields including months, days of the week, and
      time zones.
@@ -1727,7 +1735,7 @@ MINUTE TO SECOND
     <para>
      Remember that any date or time literal input needs to be enclosed
      in single quotes, like text strings.  Refer to
-     <xref linkend="sql-syntax-constants-generic"> for more
+     <xref linkend="sql-syntax-constants-generic"/> for more
      information.
      <acronym>SQL</acronym> requires the following syntax
 <synopsis>
@@ -1751,7 +1759,7 @@ MINUTE TO SECOND
     </indexterm>
 
     <para>
-     <xref linkend="datatype-datetime-date-table"> shows some possible
+     <xref linkend="datatype-datetime-date-table"/> shows some possible
      inputs for the <type>date</type> type.
     </para>
 
@@ -1776,19 +1784,19 @@ MINUTE TO SECOND
         </row>
         <row>
          <entry>1/8/1999</entry>
-         <entry>January 8 in <literal>MDY</> mode;
-          August 1 in <literal>DMY</> mode</entry>
+         <entry>January 8 in <literal>MDY</literal> mode;
+          August 1 in <literal>DMY</literal> mode</entry>
         </row>
         <row>
          <entry>1/18/1999</entry>
-         <entry>January 18 in <literal>MDY</> mode;
+         <entry>January 18 in <literal>MDY</literal> mode;
           rejected in other modes</entry>
         </row>
         <row>
          <entry>01/02/03</entry>
-         <entry>January 2, 2003 in <literal>MDY</> mode;
-          February 1, 2003 in <literal>DMY</> mode;
-          February 3, 2001 in <literal>YMD</> mode
+         <entry>January 2, 2003 in <literal>MDY</literal> mode;
+          February 1, 2003 in <literal>DMY</literal> mode;
+          February 3, 2001 in <literal>YMD</literal> mode
          </entry>
         </row>
         <row>
@@ -1805,15 +1813,15 @@ MINUTE TO SECOND
         </row>
         <row>
          <entry>99-Jan-08</entry>
-         <entry>January 8 in <literal>YMD</> mode, else error</entry>
+         <entry>January 8 in <literal>YMD</literal> mode, else error</entry>
         </row>
         <row>
          <entry>08-Jan-99</entry>
-         <entry>January 8, except error in <literal>YMD</> mode</entry>
+         <entry>January 8, except error in <literal>YMD</literal> mode</entry>
         </row>
         <row>
          <entry>Jan-08-99</entry>
-         <entry>January 8, except error in <literal>YMD</> mode</entry>
+         <entry>January 8, except error in <literal>YMD</literal> mode</entry>
         </row>
         <row>
          <entry>19990108</entry>
@@ -1864,8 +1872,8 @@ MINUTE TO SECOND
      <para>
       Valid input for these types consists of a time of day followed
       by an optional time zone. (See <xref
-      linkend="datatype-datetime-time-table">
-      and <xref linkend="datatype-timezone-table">.)  If a time zone is
+      linkend="datatype-datetime-time-table"/>
+      and <xref linkend="datatype-timezone-table"/>.)  If a time zone is
       specified in the input for <type>time without time zone</type>,
       it is silently ignored. You can also specify a date but it will
       be ignored, except when you use a time zone name that involves a
@@ -1985,7 +1993,7 @@ MINUTE TO SECOND
       </table>
 
      <para>
-     Refer to <xref linkend="datatype-timezones"> for more information on how
+     Refer to <xref linkend="datatype-timezones"/> for more information on how
      to specify time zones.
     </para>
     </sect3>
@@ -2062,29 +2070,29 @@ January 8 04:05:06 1999 PST
       For <type>timestamp with time zone</type>, the internally stored
       value is always in UTC (Universal
       Coordinated Time, traditionally known as Greenwich Mean Time,
-      <acronym>GMT</>).  An input value that has an explicit
+      <acronym>GMT</acronym>).  An input value that has an explicit
       time zone specified is converted to UTC using the appropriate offset
       for that time zone.  If no time zone is stated in the input string,
       then it is assumed to be in the time zone indicated by the system's
-      <xref linkend="guc-timezone"> parameter, and is converted to UTC using the
-      offset for the <varname>timezone</> zone.
+      <xref linkend="guc-timezone"/> parameter, and is converted to UTC using the
+      offset for the <varname>timezone</varname> zone.
      </para>
 
      <para>
       When a <type>timestamp with time
       zone</type> value is output, it is always converted from UTC to the
-      current <varname>timezone</> zone, and displayed as local time in that
+      current <varname>timezone</varname> zone, and displayed as local time in that
       zone.  To see the time in another time zone, either change
-      <varname>timezone</> or use the <literal>AT TIME ZONE</> construct
-      (see <xref linkend="functions-datetime-zoneconvert">).
+      <varname>timezone</varname> or use the <literal>AT TIME ZONE</literal> construct
+      (see <xref linkend="functions-datetime-zoneconvert"/>).
      </para>
 
      <para>
       Conversions between <type>timestamp without time zone</type> and
       <type>timestamp with time zone</type> normally assume that the
       <type>timestamp without time zone</type> value should be taken or given
-      as <varname>timezone</> local time.  A different time zone can
-      be specified for the conversion using <literal>AT TIME ZONE</>.
+      as <varname>timezone</varname> local time.  A different time zone can
+      be specified for the conversion using <literal>AT TIME ZONE</literal>.
      </para>
     </sect3>
 
@@ -2104,12 +2112,12 @@ January 8 04:05:06 1999 PST
      <para>
       <productname>PostgreSQL</productname> supports several
       special date/time input values for convenience, as shown in <xref
-      linkend="datatype-datetime-special-table">.  The values
+      linkend="datatype-datetime-special-table"/>.  The values
       <literal>infinity</literal> and <literal>-infinity</literal>
       are specially represented inside the system and will be displayed
       unchanged; but the others are simply notational shorthands
       that will be converted to ordinary date/time values when read.
-      (In particular, <literal>now</> and related strings are converted
+      (In particular, <literal>now</literal> and related strings are converted
       to a specific time value as soon as they are read.)
       All of these values need to be enclosed in single quotes when used
       as constants in SQL commands.
@@ -2178,8 +2186,8 @@ January 8 04:05:06 1999 PST
       <literal>CURRENT_TIMESTAMP</literal>, <literal>LOCALTIME</literal>,
       <literal>LOCALTIMESTAMP</literal>.  The latter four accept an
       optional subsecond precision specification.  (See <xref
-      linkend="functions-datetime-current">.)  Note that these are
-      SQL functions and are <emphasis>not</> recognized in data input strings.
+      linkend="functions-datetime-current"/>.)  Note that these are
+      SQL functions and are <emphasis>not</emphasis> recognized in data input strings.
      </para>
 
     </sect3>
@@ -2203,18 +2211,18 @@ January 8 04:05:06 1999 PST
     <para>
      The output format of the date/time types can be set to one of the four
      styles ISO 8601,
-     <acronym>SQL</acronym> (Ingres), traditional <productname>POSTGRES</>
-     (Unix <application>date</> format), or
+     <acronym>SQL</acronym> (Ingres), traditional <productname>POSTGRES</productname>
+     (Unix <application>date</application> format), or
      German.  The default
      is the <acronym>ISO</acronym> format.  (The
      <acronym>SQL</acronym> standard requires the use of the ISO 8601
      format.  The name of the <quote>SQL</quote> output format is a
      historical accident.)  <xref
-     linkend="datatype-datetime-output-table"> shows examples of each
+     linkend="datatype-datetime-output-table"/> shows examples of each
      output style.  The output of the <type>date</type> and
      <type>time</type> types is generally only the date or time part
      in accordance with the given examples.  However, the
-     <productname>POSTGRES</> style outputs date-only values in
+     <productname>POSTGRES</productname> style outputs date-only values in
      <acronym>ISO</acronym> format.
     </para>
 
@@ -2255,9 +2263,9 @@ January 8 04:05:06 1999 PST
 
     <note>
      <para>
-      ISO 8601 specifies the use of uppercase letter <literal>T</> to separate
-      the date and time.  <productname>PostgreSQL</> accepts that format on
-      input, but on output it uses a space rather than <literal>T</>, as shown
+      ISO 8601 specifies the use of uppercase letter <literal>T</literal> to separate
+      the date and time.  <productname>PostgreSQL</productname> accepts that format on
+      input, but on output it uses a space rather than <literal>T</literal>, as shown
       above.  This is for readability and for consistency with RFC 3339 as
       well as some other database systems.
      </para>
@@ -2267,9 +2275,9 @@ January 8 04:05:06 1999 PST
      In the <acronym>SQL</acronym> and POSTGRES styles, day appears before
      month if DMY field ordering has been specified, otherwise month appears
      before day.
-     (See <xref linkend="datatype-datetime-input">
+     (See <xref linkend="datatype-datetime-input"/>
      for how this setting also affects interpretation of input values.)
-     <xref linkend="datatype-datetime-output2-table"> shows examples.
+     <xref linkend="datatype-datetime-output2-table"/> shows examples.
     </para>
 
      <table id="datatype-datetime-output2-table">
@@ -2284,17 +2292,17 @@ January 8 04:05:06 1999 PST
        </thead>
        <tbody>
         <row>
-         <entry><literal>SQL, DMY</></entry>
+         <entry><literal>SQL, DMY</literal></entry>
          <entry><replaceable>day</replaceable>/<replaceable>month</replaceable>/<replaceable>year</replaceable></entry>
          <entry><literal>17/12/1997 15:37:16.00 CET</literal></entry>
         </row>
         <row>
-         <entry><literal>SQL, MDY</></entry>
+         <entry><literal>SQL, MDY</literal></entry>
          <entry><replaceable>month</replaceable>/<replaceable>day</replaceable>/<replaceable>year</replaceable></entry>
          <entry><literal>12/17/1997 07:37:16.00 PST</literal></entry>
         </row>
         <row>
-         <entry><literal>Postgres, DMY</></entry>
+         <entry><literal>Postgres, DMY</literal></entry>
          <entry><replaceable>day</replaceable>/<replaceable>month</replaceable>/<replaceable>year</replaceable></entry>
          <entry><literal>Wed 17 Dec 07:37:16 1997 PST</literal></entry>
         </row>
@@ -2305,7 +2313,7 @@ January 8 04:05:06 1999 PST
     <para>
      The date/time style can be selected by the user using the
      <command>SET datestyle</command> command, the <xref
-     linkend="guc-datestyle"> parameter in the
+     linkend="guc-datestyle"/> parameter in the
      <filename>postgresql.conf</filename> configuration file, or the
      <envar>PGDATESTYLE</envar> environment variable on the server or
      client.
@@ -2313,7 +2321,7 @@ January 8 04:05:06 1999 PST
 
     <para>
      The formatting function <function>to_char</function>
-     (see <xref linkend="functions-formatting">) is also available as
+     (see <xref linkend="functions-formatting"/>) is also available as
      a more flexible way to format date/time output.
     </para>
    </sect2>
@@ -2360,7 +2368,7 @@ January 8 04:05:06 1999 PST
       <listitem>
        <para>
         The default time zone is specified as a constant numeric offset
-        from <acronym>UTC</>. It is therefore impossible to adapt to
+        from <acronym>UTC</acronym>. It is therefore impossible to adapt to
         daylight-saving time when doing date/time arithmetic across
         <acronym>DST</acronym> boundaries.
        </para>
@@ -2372,7 +2380,7 @@ January 8 04:05:06 1999 PST
     <para>
      To address these difficulties, we recommend using date/time types
      that contain both date and time when using time zones. We
-     do <emphasis>not</> recommend using the type <type>time with
+     do <emphasis>not</emphasis> recommend using the type <type>time with
      time zone</type> (though it is supported by
      <productname>PostgreSQL</productname> for legacy applications and
      for compliance with the <acronym>SQL</acronym> standard).
@@ -2383,7 +2391,7 @@ January 8 04:05:06 1999 PST
     <para>
      All timezone-aware dates and times are stored internally in
      <acronym>UTC</acronym>.  They are converted to local time
-     in the zone specified by the <xref linkend="guc-timezone"> configuration
+     in the zone specified by the <xref linkend="guc-timezone"/> configuration
      parameter before being displayed to the client.
     </para>
 
@@ -2393,10 +2401,10 @@ January 8 04:05:06 1999 PST
      <itemizedlist>
       <listitem>
        <para>
-        A full time zone name, for example <literal>America/New_York</>.
+        A full time zone name, for example <literal>America/New_York</literal>.
         The recognized time zone names are listed in the
         <literal>pg_timezone_names</literal> view (see <xref
-        linkend="view-pg-timezone-names">).
+        linkend="view-pg-timezone-names"/>).
         <productname>PostgreSQL</productname> uses the widely-used IANA
         time zone data for this purpose, so the same time zone
         names are also recognized by much other software.
@@ -2404,16 +2412,16 @@ January 8 04:05:06 1999 PST
       </listitem>
       <listitem>
        <para>
-        A time zone abbreviation, for example <literal>PST</>.  Such a
+        A time zone abbreviation, for example <literal>PST</literal>.  Such a
         specification merely defines a particular offset from UTC, in
         contrast to full time zone names which can imply a set of daylight
         savings transition-date rules as well.  The recognized abbreviations
-        are listed in the <literal>pg_timezone_abbrevs</> view (see <xref
-        linkend="view-pg-timezone-abbrevs">).  You cannot set the
-        configuration parameters <xref linkend="guc-timezone"> or
-        <xref linkend="guc-log-timezone"> to a time
+        are listed in the <literal>pg_timezone_abbrevs</literal> view (see <xref
+        linkend="view-pg-timezone-abbrevs"/>).  You cannot set the
+        configuration parameters <xref linkend="guc-timezone"/> or
+        <xref linkend="guc-log-timezone"/> to a time
         zone abbreviation, but you can use abbreviations in
-        date/time input values and with the <literal>AT TIME ZONE</>
+        date/time input values and with the <literal>AT TIME ZONE</literal>
         operator.
        </para>
       </listitem>
@@ -2421,25 +2429,25 @@ January 8 04:05:06 1999 PST
        <para>
         In addition to the timezone names and abbreviations,
         <productname>PostgreSQL</productname> will accept POSIX-style time zone
-        specifications of the form <replaceable>STD</><replaceable>offset</> or
-        <replaceable>STD</><replaceable>offset</><replaceable>DST</>, where
-        <replaceable>STD</> is a zone abbreviation, <replaceable>offset</> is a
-        numeric offset in hours west from UTC, and <replaceable>DST</> is an
+        specifications of the form <replaceable>STD</replaceable><replaceable>offset</replaceable> or
+        <replaceable>STD</replaceable><replaceable>offset</replaceable><replaceable>DST</replaceable>, where
+        <replaceable>STD</replaceable> is a zone abbreviation, <replaceable>offset</replaceable> is a
+        numeric offset in hours west from UTC, and <replaceable>DST</replaceable> is an
         optional daylight-savings zone abbreviation, assumed to stand for one
-        hour ahead of the given offset. For example, if <literal>EST5EDT</>
+        hour ahead of the given offset. For example, if <literal>EST5EDT</literal>
         were not already a recognized zone name, it would be accepted and would
         be functionally equivalent to United States East Coast time.  In this
         syntax, a zone abbreviation can be a string of letters, or an
-        arbitrary string surrounded by angle brackets (<literal>&lt;&gt;</>).
+        arbitrary string surrounded by angle brackets (<literal>&lt;&gt;</literal>).
         When a daylight-savings zone abbreviation is present,
         it is assumed to be used
         according to the same daylight-savings transition rules used in the
-        IANA time zone database's <filename>posixrules</> entry.
+        IANA time zone database's <filename>posixrules</filename> entry.
         In a standard <productname>PostgreSQL</productname> installation,
-        <filename>posixrules</> is the same as <literal>US/Eastern</>, so
+        <filename>posixrules</filename> is the same as <literal>US/Eastern</literal>, so
         that POSIX-style time zone specifications follow USA daylight-savings
         rules.  If needed, you can adjust this behavior by replacing the
-        <filename>posixrules</> file.
+        <filename>posixrules</filename> file.
        </para>
       </listitem>
      </itemizedlist>
@@ -2448,10 +2456,10 @@ January 8 04:05:06 1999 PST
      and full names: abbreviations represent a specific offset from UTC,
      whereas many of the full names imply a local daylight-savings time
      rule, and so have two possible UTC offsets.  As an example,
-     <literal>2014-06-04 12:00 America/New_York</> represents noon local
+     <literal>2014-06-04 12:00 America/New_York</literal> represents noon local
      time in New York, which for this particular date was Eastern Daylight
-     Time (UTC-4).  So <literal>2014-06-04 12:00 EDT</> specifies that
-     same time instant.  But <literal>2014-06-04 12:00 EST</> specifies
+     Time (UTC-4).  So <literal>2014-06-04 12:00 EDT</literal> specifies that
+     same time instant.  But <literal>2014-06-04 12:00 EST</literal> specifies
      noon Eastern Standard Time (UTC-5), regardless of whether daylight
      savings was nominally in effect on that date.
     </para>
@@ -2459,10 +2467,10 @@ January 8 04:05:06 1999 PST
     <para>
      To complicate matters, some jurisdictions have used the same timezone
      abbreviation to mean different UTC offsets at different times; for
-     example, in Moscow <literal>MSK</> has meant UTC+3 in some years and
-     UTC+4 in others.  <application>PostgreSQL</> interprets such
+     example, in Moscow <literal>MSK</literal> has meant UTC+3 in some years and
+     UTC+4 in others.  <application>PostgreSQL</application> interprets such
      abbreviations according to whatever they meant (or had most recently
-     meant) on the specified date; but, as with the <literal>EST</> example
+     meant) on the specified date; but, as with the <literal>EST</literal> example
      above, this is not necessarily the same as local civil time on that date.
     </para>
 
@@ -2470,18 +2478,18 @@ January 8 04:05:06 1999 PST
      One should be wary that the POSIX-style time zone feature can
      lead to silently accepting bogus input, since there is no check on the
      reasonableness of the zone abbreviations.  For example, <literal>SET
-     TIMEZONE TO FOOBAR0</> will work, leaving the system effectively using
+     TIMEZONE TO FOOBAR0</literal> will work, leaving the system effectively using
      a rather peculiar abbreviation for UTC.
      Another issue to keep in mind is that in POSIX time zone names,
-     positive offsets are used for locations <emphasis>west</> of Greenwich.
+     positive offsets are used for locations <emphasis>west</emphasis> of Greenwich.
      Everywhere else, <productname>PostgreSQL</productname> follows the
-     ISO-8601 convention that positive timezone offsets are <emphasis>east</>
+     ISO-8601 convention that positive timezone offsets are <emphasis>east</emphasis>
      of Greenwich.
     </para>
 
     <para>
      In all cases, timezone names and abbreviations are recognized
-     case-insensitively.  (This is a change from <productname>PostgreSQL</>
+     case-insensitively.  (This is a change from <productname>PostgreSQL</productname>
      versions prior to 8.2, which were case-sensitive in some contexts but
      not others.)
     </para>
@@ -2489,15 +2497,15 @@ January 8 04:05:06 1999 PST
     <para>
      Neither timezone names nor abbreviations are hard-wired into the server;
      they are obtained from configuration files stored under
-     <filename>.../share/timezone/</> and <filename>.../share/timezonesets/</>
+     <filename>.../share/timezone/</filename> and <filename>.../share/timezonesets/</filename>
      of the installation directory
-     (see <xref linkend="datetime-config-files">).
+     (see <xref linkend="datetime-config-files"/>).
     </para>
 
     <para>
-     The <xref linkend="guc-timezone"> configuration parameter can
-     be set in the file <filename>postgresql.conf</>, or in any of the
-     other standard ways described in <xref linkend="runtime-config">.
+     The <xref linkend="guc-timezone"/> configuration parameter can
+     be set in the file <filename>postgresql.conf</filename>, or in any of the
+     other standard ways described in <xref linkend="runtime-config"/>.
      There are also some special ways to set it:
 
      <itemizedlist>
@@ -2505,7 +2513,7 @@ January 8 04:05:06 1999 PST
        <para>
         The <acronym>SQL</acronym> command <command>SET TIME ZONE</command>
         sets the time zone for the session.  This is an alternative spelling
-        of <command>SET TIMEZONE TO</> with a more SQL-spec-compatible syntax.
+        of <command>SET TIMEZONE TO</command> with a more SQL-spec-compatible syntax.
        </para>
       </listitem>
 
@@ -2533,52 +2541,52 @@ January 8 04:05:06 1999 PST
       verbose syntax:
 
 <synopsis>
-<optional>@</> <replaceable>quantity</> <replaceable>unit</> <optional><replaceable>quantity</> <replaceable>unit</>...</> <optional><replaceable>direction</></optional>
+<optional>@</optional> <replaceable>quantity</replaceable> <replaceable>unit</replaceable> <optional><replaceable>quantity</replaceable> <replaceable>unit</replaceable>...</optional> <optional><replaceable>direction</replaceable></optional>
 </synopsis>
 
-     where <replaceable>quantity</> is a number (possibly signed);
-     <replaceable>unit</> is <literal>microsecond</literal>,
+     where <replaceable>quantity</replaceable> is a number (possibly signed);
+     <replaceable>unit</replaceable> is <literal>microsecond</literal>,
      <literal>millisecond</literal>, <literal>second</literal>,
      <literal>minute</literal>, <literal>hour</literal>, <literal>day</literal>,
      <literal>week</literal>, <literal>month</literal>, <literal>year</literal>,
      <literal>decade</literal>, <literal>century</literal>, <literal>millennium</literal>,
      or abbreviations or plurals of these units;
-     <replaceable>direction</> can be <literal>ago</literal> or
-     empty.  The at sign (<literal>@</>) is optional noise.  The amounts
+     <replaceable>direction</replaceable> can be <literal>ago</literal> or
+     empty.  The at sign (<literal>@</literal>) is optional noise.  The amounts
      of the different units are implicitly added with appropriate
      sign accounting.  <literal>ago</literal> negates all the fields.
      This syntax is also used for interval output, if
-     <xref linkend="guc-intervalstyle"> is set to
-     <literal>postgres_verbose</>.
+     <xref linkend="guc-intervalstyle"/> is set to
+     <literal>postgres_verbose</literal>.
     </para>
 
     <para>
      Quantities of days, hours, minutes, and seconds can be specified without
-     explicit unit markings.  For example, <literal>'1 12:59:10'</> is read
-     the same as <literal>'1 day 12 hours 59 min 10 sec'</>.  Also,
+     explicit unit markings.  For example, <literal>'1 12:59:10'</literal> is read
+     the same as <literal>'1 day 12 hours 59 min 10 sec'</literal>.  Also,
      a combination of years and months can be specified with a dash;
-     for example <literal>'200-10'</> is read the same as <literal>'200 years
-     10 months'</>.  (These shorter forms are in fact the only ones allowed
+     for example <literal>'200-10'</literal> is read the same as <literal>'200 years
+     10 months'</literal>.  (These shorter forms are in fact the only ones allowed
      by the <acronym>SQL</acronym> standard, and are used for output when
-     <varname>IntervalStyle</> is set to <literal>sql_standard</literal>.)
+     <varname>IntervalStyle</varname> is set to <literal>sql_standard</literal>.)
     </para>
 
     <para>
      Interval values can also be written as ISO 8601 time intervals, using
-     either the <quote>format with designators</> of the standard's section
-     4.4.3.2 or the <quote>alternative format</> of section 4.4.3.3.  The
+     either the <quote>format with designators</quote> of the standard's section
+     4.4.3.2 or the <quote>alternative format</quote> of section 4.4.3.3.  The
      format with designators looks like this:
 <synopsis>
-P <replaceable>quantity</> <replaceable>unit</> <optional> <replaceable>quantity</> <replaceable>unit</> ...</optional> <optional> T <optional> <replaceable>quantity</> <replaceable>unit</> ...</optional></optional>
+P <replaceable>quantity</replaceable> <replaceable>unit</replaceable> <optional> <replaceable>quantity</replaceable> <replaceable>unit</replaceable> ...</optional> <optional> T <optional> <replaceable>quantity</replaceable> <replaceable>unit</replaceable> ...</optional></optional>
 </synopsis>
-      The string must start with a <literal>P</>, and may include a
-      <literal>T</> that introduces the time-of-day units.  The
+      The string must start with a <literal>P</literal>, and may include a
+      <literal>T</literal> that introduces the time-of-day units.  The
       available unit abbreviations are given in <xref
-      linkend="datatype-interval-iso8601-units">.  Units may be
+      linkend="datatype-interval-iso8601-units"/>.  Units may be
       omitted, and may be specified in any order, but units smaller than
-      a day must appear after <literal>T</>.  In particular, the meaning of
-      <literal>M</> depends on whether it is before or after
-      <literal>T</>.
+      a day must appear after <literal>T</literal>.  In particular, the meaning of
+      <literal>M</literal> depends on whether it is before or after
+      <literal>T</literal>.
      </para>
 
      <table id="datatype-interval-iso8601-units">
@@ -2626,51 +2634,51 @@ P <replaceable>quantity</> <replaceable>unit</> <optional> <replaceable>quantity
      <para>
       In the alternative format:
 <synopsis>
-P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> </optional> <optional> T <replaceable>hours</>:<replaceable>minutes</>:<replaceable>seconds</> </optional>
+P <optional> <replaceable>years</replaceable>-<replaceable>months</replaceable>-<replaceable>days</replaceable> </optional> <optional> T <replaceable>hours</replaceable>:<replaceable>minutes</replaceable>:<replaceable>seconds</replaceable> </optional>
 </synopsis>
       the string must begin with <literal>P</literal>, and a
-      <literal>T</> separates the date and time parts of the interval.
+      <literal>T</literal> separates the date and time parts of the interval.
       The values are given as numbers similar to ISO 8601 dates.
     </para>
 
     <para>
-     When writing an interval constant with a <replaceable>fields</>
+     When writing an interval constant with a <replaceable>fields</replaceable>
      specification, or when assigning a string to an interval column that was
-     defined with a <replaceable>fields</> specification, the interpretation of
-     unmarked quantities depends on the <replaceable>fields</>.  For
-     example <literal>INTERVAL '1' YEAR</> is read as 1 year, whereas
-     <literal>INTERVAL '1'</> means 1 second.  Also, field values
-     <quote>to the right</> of the least significant field allowed by the
-     <replaceable>fields</> specification are silently discarded.  For
-     example, writing <literal>INTERVAL '1 day 2:03:04' HOUR TO MINUTE</>
+     defined with a <replaceable>fields</replaceable> specification, the interpretation of
+     unmarked quantities depends on the <replaceable>fields</replaceable>.  For
+     example <literal>INTERVAL '1' YEAR</literal> is read as 1 year, whereas
+     <literal>INTERVAL '1'</literal> means 1 second.  Also, field values
+     <quote>to the right</quote> of the least significant field allowed by the
+     <replaceable>fields</replaceable> specification are silently discarded.  For
+     example, writing <literal>INTERVAL '1 day 2:03:04' HOUR TO MINUTE</literal>
      results in dropping the seconds field, but not the day field.
     </para>
 
     <para>
-     According to the <acronym>SQL</> standard all fields of an interval
+     According to the <acronym>SQL</acronym> standard all fields of an interval
      value must have the same sign, so a leading negative sign applies to all
      fields; for example the negative sign in the interval literal
-     <literal>'-1 2:03:04'</> applies to both the days and hour/minute/second
-     parts.  <productname>PostgreSQL</> allows the fields to have different
+     <literal>'-1 2:03:04'</literal> applies to both the days and hour/minute/second
+     parts.  <productname>PostgreSQL</productname> allows the fields to have different
      signs, and traditionally treats each field in the textual representation
      as independently signed, so that the hour/minute/second part is
-     considered positive in this example.  If <varname>IntervalStyle</> is
+     considered positive in this example.  If <varname>IntervalStyle</varname> is
      set to <literal>sql_standard</literal> then a leading sign is considered
      to apply to all fields (but only if no additional signs appear).
-     Otherwise the traditional <productname>PostgreSQL</> interpretation is
+     Otherwise the traditional <productname>PostgreSQL</productname> interpretation is
      used.  To avoid ambiguity, it's recommended to attach an explicit sign
      to each field if any field is negative.
     </para>
 
     <para>
-     Internally <type>interval</> values are stored as months, days,
+     Internally <type>interval</type> values are stored as months, days,
      and seconds. This is done because the number of days in a month
      varies, and a day can have 23 or 25 hours if a daylight savings
      time adjustment is involved.  The months and days fields are integers
      while the seconds field can store fractions.  Because intervals are
-     usually created from constant strings or <type>timestamp</> subtraction,
+     usually created from constant strings or <type>timestamp</type> subtraction,
      this storage method works well in most cases. Functions
-     <function>justify_days</> and <function>justify_hours</> are
+     <function>justify_days</function> and <function>justify_hours</function> are
      available for adjusting days and hours that overflow their normal
      ranges.
     </para>
@@ -2678,18 +2686,18 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
     <para>
      In the verbose input format, and in some fields of the more compact
      input formats, field values can have fractional parts; for example
-     <literal>'1.5 week'</> or <literal>'01:02:03.45'</>.  Such input is
+     <literal>'1.5 week'</literal> or <literal>'01:02:03.45'</literal>.  Such input is
      converted to the appropriate number of months, days, and seconds
      for storage.  When this would result in a fractional number of
      months or days, the fraction is added to the lower-order fields
      using the conversion factors 1 month = 30 days and 1 day = 24 hours.
-     For example, <literal>'1.5 month'</> becomes 1 month and 15 days.
+     For example, <literal>'1.5 month'</literal> becomes 1 month and 15 days.
      Only seconds will ever be shown as fractional on output.
     </para>
 
     <para>
-     <xref linkend="datatype-interval-input-examples"> shows some examples
-     of valid <type>interval</> input.
+     <xref linkend="datatype-interval-input-examples"/> shows some examples
+     of valid <type>interval</type> input.
     </para>
 
      <table id="datatype-interval-input-examples">
@@ -2716,11 +2724,11 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
         </row>
         <row>
          <entry>P1Y2M3DT4H5M6S</entry>
-         <entry>ISO 8601 <quote>format with designators</>: same meaning as above</entry>
+         <entry>ISO 8601 <quote>format with designators</quote>: same meaning as above</entry>
         </row>
         <row>
          <entry>P0001-02-03T04:05:06</entry>
-         <entry>ISO 8601 <quote>alternative format</>: same meaning as above</entry>
+         <entry>ISO 8601 <quote>alternative format</quote>: same meaning as above</entry>
         </row>
        </tbody>
       </tgroup>
@@ -2739,16 +2747,16 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
 
     <para>
      The output format of the interval type can be set to one of the
-     four styles <literal>sql_standard</>, <literal>postgres</>,
-     <literal>postgres_verbose</>, or <literal>iso_8601</>,
+     four styles <literal>sql_standard</literal>, <literal>postgres</literal>,
+     <literal>postgres_verbose</literal>, or <literal>iso_8601</literal>,
      using the command <literal>SET intervalstyle</literal>.
-     The default is the <literal>postgres</> format.
-     <xref linkend="interval-style-output-table"> shows examples of each
+     The default is the <literal>postgres</literal> format.
+     <xref linkend="interval-style-output-table"/> shows examples of each
      output style.
     </para>
 
     <para>
-     The <literal>sql_standard</> style produces output that conforms to
+     The <literal>sql_standard</literal> style produces output that conforms to
      the SQL standard's specification for interval literal strings, if
      the interval value meets the standard's restrictions (either year-month
      only or day-time only, with no mixing of positive
@@ -2758,20 +2766,20 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
     </para>
 
     <para>
-     The output of the <literal>postgres</> style matches the output of
-     <productname>PostgreSQL</> releases prior to 8.4 when the
-     <xref linkend="guc-datestyle"> parameter was set to <literal>ISO</>.
+     The output of the <literal>postgres</literal> style matches the output of
+     <productname>PostgreSQL</productname> releases prior to 8.4 when the
+     <xref linkend="guc-datestyle"/> parameter was set to <literal>ISO</literal>.
     </para>
 
     <para>
-     The output of the <literal>postgres_verbose</> style matches the output of
-     <productname>PostgreSQL</> releases prior to 8.4 when the
-     <varname>DateStyle</> parameter was set to non-<literal>ISO</> output.
+     The output of the <literal>postgres_verbose</literal> style matches the output of
+     <productname>PostgreSQL</productname> releases prior to 8.4 when the
+     <varname>DateStyle</varname> parameter was set to non-<literal>ISO</literal> output.
     </para>
 
     <para>
-     The output of the <literal>iso_8601</> style matches the <quote>format
-     with designators</> described in section 4.4.3.2 of the
+     The output of the <literal>iso_8601</literal> style matches the <quote>format
+     with designators</quote> described in section 4.4.3.2 of the
      ISO 8601 standard.
     </para>
 
@@ -2788,25 +2796,25 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
         </thead>
         <tbody>
          <row>
-          <entry><literal>sql_standard</></entry>
+          <entry><literal>sql_standard</literal></entry>
           <entry>1-2</entry>
           <entry>3 4:05:06</entry>
           <entry>-1-2 +3 -4:05:06</entry>
          </row>
          <row>
-          <entry><literal>postgres</></entry>
+          <entry><literal>postgres</literal></entry>
           <entry>1 year 2 mons</entry>
           <entry>3 days 04:05:06</entry>
           <entry>-1 year -2 mons +3 days -04:05:06</entry>
          </row>
          <row>
-          <entry><literal>postgres_verbose</></entry>
+          <entry><literal>postgres_verbose</literal></entry>
           <entry>@ 1 year 2 mons</entry>
           <entry>@ 3 days 4 hours 5 mins 6 secs</entry>
           <entry>@ 1 year 2 mons -3 days 4 hours 5 mins 6 secs ago</entry>
          </row>
          <row>
-          <entry><literal>iso_8601</></entry>
+          <entry><literal>iso_8601</literal></entry>
           <entry>P1Y2M</entry>
           <entry>P3DT4H5M6S</entry>
           <entry>P-1Y-2M3DT-4H-5M-6S</entry>
@@ -2838,7 +2846,7 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
    <para>
     <productname>PostgreSQL</productname> provides the
     standard <acronym>SQL</acronym> type <type>boolean</type>;
-    see <xref linkend="datatype-boolean-table">.
+    see <xref linkend="datatype-boolean-table"/>.
     The <type>boolean</type> type can have several states:
     <quote>true</quote>, <quote>false</quote>, and a third state,
     <quote>unknown</quote>, which is represented by the
@@ -2894,7 +2902,7 @@ P <optional> <replaceable>years</>-<replaceable>months</>-<replaceable>days</> <
    </para>
 
    <para>
-    <xref linkend="datatype-boolean-example"> shows that
+    <xref linkend="datatype-boolean-example"/> shows that
     <type>boolean</type> values are output using the letters
     <literal>t</literal> and <literal>f</literal>.
    </para>
@@ -2946,7 +2954,7 @@ SELECT * FROM test1 WHERE a;
 
     <para>
      Enum types are created using the <xref
-     linkend="sql-createtype"> command,
+     linkend="sql-createtype"/> command,
      for example:
 
 <programlisting>
@@ -3079,7 +3087,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 
    <para>
     Geometric data types represent two-dimensional spatial
-    objects. <xref linkend="datatype-geo-table"> shows the geometric
+    objects. <xref linkend="datatype-geo-table"/> shows the geometric
     types available in <productname>PostgreSQL</productname>.
    </para>
 
@@ -3150,7 +3158,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
    <para>
     A rich set of functions and operators is available to perform various geometric
     operations such as scaling, translation, rotation, and determining
-    intersections.  They are explained in <xref linkend="functions-geometry">.
+    intersections.  They are explained in <xref linkend="functions-geometry"/>.
    </para>
 
    <sect2>
@@ -3170,7 +3178,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
   <replaceable>x</replaceable> , <replaceable>y</replaceable>
 </synopsis>
 
-     where <replaceable>x</> and <replaceable>y</> are the respective
+     where <replaceable>x</replaceable> and <replaceable>y</replaceable> are the respective
      coordinates, as floating-point numbers.
     </para>
 
@@ -3188,8 +3196,8 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 
     <para>
      Lines are represented by the linear
-     equation <replaceable>A</>x + <replaceable>B</>y + <replaceable>C</> = 0,
-     where <replaceable>A</> and <replaceable>B</> are not both zero.  Values
+     equation <replaceable>A</replaceable>x + <replaceable>B</replaceable>y + <replaceable>C</replaceable> = 0,
+     where <replaceable>A</replaceable> and <replaceable>B</replaceable> are not both zero.  Values
      of type <type>line</type> are input and output in the following form:
 <synopsis>
 { <replaceable>A</replaceable>, <replaceable>B</replaceable>, <replaceable>C</replaceable> }
@@ -3316,8 +3324,8 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 </synopsis>
 
      where the points are the end points of the line segments
-     comprising the path.  Square brackets (<literal>[]</>) indicate
-     an open path, while parentheses (<literal>()</>) indicate a
+     comprising the path.  Square brackets (<literal>[]</literal>) indicate
+     an open path, while parentheses (<literal>()</literal>) indicate a
      closed path.  When the outermost parentheses are omitted, as
      in the third through fifth syntaxes, a closed path is assumed.
     </para>
@@ -3380,7 +3388,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 </synopsis>
 
      where
-     <literal>(<replaceable>x</replaceable>,<replaceable>y</replaceable>)</>
+     <literal>(<replaceable>x</replaceable>,<replaceable>y</replaceable>)</literal>
      is the center point and <replaceable>r</replaceable> is the radius of the
      circle.
     </para>
@@ -3401,12 +3409,12 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
    </indexterm>
 
    <para>
-    <productname>PostgreSQL</> offers data types to store IPv4, IPv6, and MAC
-    addresses, as shown in <xref linkend="datatype-net-types-table">.  It
+    <productname>PostgreSQL</productname> offers data types to store IPv4, IPv6, and MAC
+    addresses, as shown in <xref linkend="datatype-net-types-table"/>.  It
     is better to use these types instead of plain text types to store
     network addresses, because
     these types offer input error checking and specialized
-    operators and functions (see <xref linkend="functions-net">).
+    operators and functions (see <xref linkend="functions-net"/>).
    </para>
 
     <table tocentry="1" id="datatype-net-types-table">
@@ -3495,7 +3503,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
    </sect2>
 
    <sect2 id="datatype-cidr">
-    <title><type>cidr</></title>
+    <title><type>cidr</type></title>
 
     <indexterm>
      <primary>cidr</primary>
@@ -3506,11 +3514,11 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
      Input and output formats follow Classless Internet Domain Routing
      conventions.
      The format for specifying networks is <replaceable
-     class="parameter">address/y</> where <replaceable
-     class="parameter">address</> is the network represented as an
+     class="parameter">address/y</replaceable> where <replaceable
+     class="parameter">address</replaceable> is the network represented as an
      IPv4 or IPv6 address, and <replaceable
-     class="parameter">y</> is the number of bits in the netmask.  If
-     <replaceable class="parameter">y</> is omitted, it is calculated
+     class="parameter">y</replaceable> is the number of bits in the netmask.  If
+     <replaceable class="parameter">y</replaceable> is omitted, it is calculated
      using assumptions from the older classful network numbering system, except
      it will be at least large enough to include all of the octets
      written in the input.  It is an error to specify a network address
@@ -3518,11 +3526,11 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
     </para>
 
     <para>
-     <xref linkend="datatype-net-cidr-table"> shows some examples.
+     <xref linkend="datatype-net-cidr-table"/> shows some examples.
     </para>
 
      <table id="datatype-net-cidr-table">
-      <title><type>cidr</> Type Input Examples</title>
+      <title><type>cidr</type> Type Input Examples</title>
       <tgroup cols="3">
        <thead>
         <row>
@@ -3631,8 +3639,8 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
       <tip>
         <para>
         If you do not like the output format for <type>inet</type> or
-        <type>cidr</type> values, try the functions <function>host</>,
-        <function>text</>, and <function>abbrev</>.
+        <type>cidr</type> values, try the functions <function>host</function>,
+        <function>text</function>, and <function>abbrev</function>.
         </para>
       </tip>
    </sect2>
@@ -3650,24 +3658,24 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
     </indexterm>
 
     <para>
-     The <type>macaddr</> type stores MAC addresses, known for example
+     The <type>macaddr</type> type stores MAC addresses, known for example
      from Ethernet card hardware addresses (although MAC addresses are
      used for other purposes as well).  Input is accepted in the
      following formats:
 
      <simplelist>
-      <member><literal>'08:00:2b:01:02:03'</></member>
-      <member><literal>'08-00-2b-01-02-03'</></member>
-      <member><literal>'08002b:010203'</></member>
-      <member><literal>'08002b-010203'</></member>
-      <member><literal>'0800.2b01.0203'</></member>
-      <member><literal>'0800-2b01-0203'</></member>
-      <member><literal>'08002b010203'</></member>
+      <member><literal>'08:00:2b:01:02:03'</literal></member>
+      <member><literal>'08-00-2b-01-02-03'</literal></member>
+      <member><literal>'08002b:010203'</literal></member>
+      <member><literal>'08002b-010203'</literal></member>
+      <member><literal>'0800.2b01.0203'</literal></member>
+      <member><literal>'0800-2b01-0203'</literal></member>
+      <member><literal>'08002b010203'</literal></member>
      </simplelist>
 
      These examples would all specify the same address.  Upper and
      lower case is accepted for the digits
-     <literal>a</> through <literal>f</>.  Output is always in the
+     <literal>a</literal> through <literal>f</literal>.  Output is always in the
      first of the forms shown.
     </para>
 
@@ -3700,7 +3708,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
     </indexterm>
 
     <para>
-     The <type>macaddr8</> type stores MAC addresses in EUI-64
+     The <type>macaddr8</type> type stores MAC addresses in EUI-64
      format, known for example from Ethernet card hardware addresses
      (although MAC addresses are used for other purposes as well).
      This type can accept both 6 and 8 byte length MAC addresses
@@ -3710,31 +3718,31 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 
      Note that IPv6 uses a modified EUI-64 format where the 7th bit
      should be set to one after the conversion from EUI-48.  The
-     function <function>macaddr8_set7bit</> is provided to make this
+     function <function>macaddr8_set7bit</function> is provided to make this
      change.
 
      Generally speaking, any input which is comprised of pairs of hex
      digits (on byte boundaries), optionally separated consistently by
-     one of <literal>':'</>, <literal>'-'</> or <literal>'.'</>, is
+     one of <literal>':'</literal>, <literal>'-'</literal> or <literal>'.'</literal>, is
      accepted.  The number of hex digits must be either 16 (8 bytes) or
      12 (6 bytes).  Leading and trailing whitespace is ignored.
 
      The following are examples of input formats that are accepted:
 
      <simplelist>
-      <member><literal>'08:00:2b:01:02:03:04:05'</></member>
-      <member><literal>'08-00-2b-01-02-03-04-05'</></member>
-      <member><literal>'08002b:0102030405'</></member>
-      <member><literal>'08002b-0102030405'</></member>
-      <member><literal>'0800.2b01.0203.0405'</></member>
-      <member><literal>'0800-2b01-0203-0405'</></member>
-      <member><literal>'08002b01:02030405'</></member>
-      <member><literal>'08002b0102030405'</></member>
+      <member><literal>'08:00:2b:01:02:03:04:05'</literal></member>
+      <member><literal>'08-00-2b-01-02-03-04-05'</literal></member>
+      <member><literal>'08002b:0102030405'</literal></member>
+      <member><literal>'08002b-0102030405'</literal></member>
+      <member><literal>'0800.2b01.0203.0405'</literal></member>
+      <member><literal>'0800-2b01-0203-0405'</literal></member>
+      <member><literal>'08002b01:02030405'</literal></member>
+      <member><literal>'08002b0102030405'</literal></member>
      </simplelist>
 
      These examples would all specify the same address.  Upper and
      lower case is accepted for the digits
-     <literal>a</> through <literal>f</>.  Output is always in the
+     <literal>a</literal> through <literal>f</literal>.  Output is always in the
      first of the forms shown.
 
      The last six input formats that are mentioned above are not part
@@ -3742,7 +3750,7 @@ SELECT person.name, holidays.num_weeks FROM person, holidays
 
      To convert a traditional 48 bit MAC address in EUI-48 format to
      modified EUI-64 format to be included as the host portion of an
-     IPv6 address, use <function>macaddr8_set7bit</> as shown:
+     IPv6 address, use <function>macaddr8_set7bit</function> as shown:
 
 <programlisting>
 SELECT macaddr8_set7bit('08:00:2b:01:02:03');
@@ -3790,21 +3798,21 @@ SELECT macaddr8_set7bit('08:00:2b:01:02:03');
    <note>
     <para>
      If one explicitly casts a bit-string value to
-     <type>bit(<replaceable>n</>)</type>, it will be truncated or
-     zero-padded on the right to be exactly <replaceable>n</> bits,
+     <type>bit(<replaceable>n</replaceable>)</type>, it will be truncated or
+     zero-padded on the right to be exactly <replaceable>n</replaceable> bits,
      without raising an error.  Similarly,
      if one explicitly casts a bit-string value to
-     <type>bit varying(<replaceable>n</>)</type>, it will be truncated
-     on the right if it is more than <replaceable>n</> bits.
+     <type>bit varying(<replaceable>n</replaceable>)</type>, it will be truncated
+     on the right if it is more than <replaceable>n</replaceable> bits.
     </para>
    </note>
 
    <para>
     Refer to <xref
-    linkend="sql-syntax-bit-strings"> for information about the syntax
+    linkend="sql-syntax-bit-strings"/> for information about the syntax
     of bit string constants.  Bit-logical operators and string
     manipulation functions are available; see <xref
-    linkend="functions-bitstring">.
+    linkend="functions-bitstring"/>.
    </para>
 
    <example>
@@ -3832,7 +3840,7 @@ SELECT * FROM test;
     A bit string value requires 1 byte for each group of 8 bits, plus
     5 or 8 bytes overhead depending on the length of the string
     (but long values may be compressed or moved out-of-line, as explained
-    in <xref linkend="datatype-character"> for character strings).
+    in <xref linkend="datatype-character"/> for character strings).
    </para>
   </sect1>
 
@@ -3852,13 +3860,13 @@ SELECT * FROM test;
    <para>
     <productname>PostgreSQL</productname> provides two data types that
     are designed to support full text search, which is the activity of
-    searching through a collection of natural-language <firstterm>documents</>
-    to locate those that best match a <firstterm>query</>.
+    searching through a collection of natural-language <firstterm>documents</firstterm>
+    to locate those that best match a <firstterm>query</firstterm>.
     The <type>tsvector</type> type represents a document in a form optimized
     for text search; the <type>tsquery</type> type similarly represents
     a text query.
-    <xref linkend="textsearch"> provides a detailed explanation of this
-    facility, and <xref linkend="functions-textsearch"> summarizes the
+    <xref linkend="textsearch"/> provides a detailed explanation of this
+    facility, and <xref linkend="functions-textsearch"/> summarizes the
     related functions and operators.
    </para>
 
@@ -3871,9 +3879,9 @@ SELECT * FROM test;
 
     <para>
      A <type>tsvector</type> value is a sorted list of distinct
-     <firstterm>lexemes</>, which are words that have been
-     <firstterm>normalized</> to merge different variants of the same word
-     (see <xref linkend="textsearch"> for details).  Sorting and
+     <firstterm>lexemes</firstterm>, which are words that have been
+     <firstterm>normalized</firstterm> to merge different variants of the same word
+     (see <xref linkend="textsearch"/> for details).  Sorting and
      duplicate-elimination are done automatically during input, as shown in
      this example:
 
@@ -3905,7 +3913,7 @@ SELECT $$the lexeme 'Joe''s' contains a quote$$::tsvector;
  'Joe''s' 'a' 'contains' 'lexeme' 'quote' 'the'
 </programlisting>
 
-     Optionally, integer <firstterm>positions</>
+     Optionally, integer <firstterm>positions</firstterm>
      can be attached to lexemes:
 
 <programlisting>
@@ -3924,7 +3932,7 @@ SELECT 'a:1 fat:2 cat:3 sat:4 on:5 a:6 mat:7 and:8 ate:9 a:10 fat:11 rat:12'::ts
 
     <para>
      Lexemes that have positions can further be labeled with a
-     <firstterm>weight</>, which can be <literal>A</literal>,
+     <firstterm>weight</firstterm>, which can be <literal>A</literal>,
      <literal>B</literal>, <literal>C</literal>, or <literal>D</literal>.
      <literal>D</literal> is the default and hence is not shown on output:
 
@@ -3957,7 +3965,7 @@ SELECT 'The Fat Rats'::tsvector;
      For most English-text-searching applications the above words would
      be considered non-normalized, but <type>tsvector</type> doesn't care.
      Raw document text should usually be passed through
-     <function>to_tsvector</> to normalize the words appropriately
+     <function>to_tsvector</function> to normalize the words appropriately
      for searching:
 
 <programlisting>
@@ -3967,7 +3975,7 @@ SELECT to_tsvector('english', 'The Fat Rats');
  'fat':2 'rat':3
 </programlisting>
 
-     Again, see <xref linkend="textsearch"> for more detail.
+     Again, see <xref linkend="textsearch"/> for more detail.
     </para>
 
    </sect2>
@@ -3983,17 +3991,17 @@ SELECT to_tsvector('english', 'The Fat Rats');
      A <type>tsquery</type> value stores lexemes that are to be
      searched for, and can combine them using the Boolean operators
      <literal>&amp;</literal> (AND), <literal>|</literal> (OR), and
-     <literal>!</> (NOT), as well as the phrase search operator
-     <literal>&lt;-&gt;</> (FOLLOWED BY).  There is also a variant
-     <literal>&lt;<replaceable>N</>&gt;</literal> of the FOLLOWED BY
-     operator, where <replaceable>N</> is an integer constant that
+     <literal>!</literal> (NOT), as well as the phrase search operator
+     <literal>&lt;-&gt;</literal> (FOLLOWED BY).  There is also a variant
+     <literal>&lt;<replaceable>N</replaceable>&gt;</literal> of the FOLLOWED BY
+     operator, where <replaceable>N</replaceable> is an integer constant that
      specifies the distance between the two lexemes being searched
-     for.  <literal>&lt;-&gt;</> is equivalent to <literal>&lt;1&gt;</>.
+     for.  <literal>&lt;-&gt;</literal> is equivalent to <literal>&lt;1&gt;</literal>.
     </para>
 
     <para>
      Parentheses can be used to enforce grouping of these operators.
-     In the absence of parentheses, <literal>!</> (NOT) binds most tightly,
+     In the absence of parentheses, <literal>!</literal> (NOT) binds most tightly,
      <literal>&lt;-&gt;</literal> (FOLLOWED BY) next most tightly, then
      <literal>&amp;</literal> (AND), with <literal>|</literal> (OR) binding
      the least tightly.
@@ -4023,7 +4031,7 @@ SELECT 'fat &amp; rat &amp; ! cat'::tsquery;
     <para>
      Optionally, lexemes in a <type>tsquery</type> can be labeled with
      one or more weight letters, which restricts them to match only
-     <type>tsvector</> lexemes with one of those weights:
+     <type>tsvector</type> lexemes with one of those weights:
 
 <programlisting>
 SELECT 'fat:ab &amp; cat'::tsquery;
@@ -4034,7 +4042,7 @@ SELECT 'fat:ab &amp; cat'::tsquery;
     </para>
 
     <para>
-     Also, lexemes in a <type>tsquery</type> can be labeled with <literal>*</>
+     Also, lexemes in a <type>tsquery</type> can be labeled with <literal>*</literal>
      to specify prefix matching:
 <programlisting>
 SELECT 'super:*'::tsquery;
@@ -4042,15 +4050,15 @@ SELECT 'super:*'::tsquery;
 -----------
  'super':*
 </programlisting>
-     This query will match any word in a <type>tsvector</> that begins
-     with <quote>super</>.
+     This query will match any word in a <type>tsvector</type> that begins
+     with <quote>super</quote>.
     </para>
 
     <para>
      Quoting rules for lexemes are the same as described previously for
-     lexemes in <type>tsvector</>; and, as with <type>tsvector</>,
+     lexemes in <type>tsvector</type>; and, as with <type>tsvector</type>,
      any required normalization of words must be done before converting
-     to the <type>tsquery</> type.  The <function>to_tsquery</>
+     to the <type>tsquery</type> type.  The <function>to_tsquery</function>
      function is convenient for performing such normalization:
 
 <programlisting>
@@ -4060,7 +4068,7 @@ SELECT to_tsquery('Fat:ab &amp; Cats');
  'fat':AB &amp; 'cat'
 </programlisting>
 
-     Note that <function>to_tsquery</> will process prefixes in the same way
+     Note that <function>to_tsquery</function> will process prefixes in the same way
      as other words, which means this comparison returns true:
 
 <programlisting>
@@ -4069,14 +4077,14 @@ SELECT to_tsvector( 'postgraduate' ) @@ to_tsquery( 'postgres:*' );
 ----------
  t
 </programlisting>
-     because <literal>postgres</> gets stemmed to <literal>postgr</>:
+     because <literal>postgres</literal> gets stemmed to <literal>postgr</literal>:
 <programlisting>
 SELECT to_tsvector( 'postgraduate' ), to_tsquery( 'postgres:*' );
   to_tsvector  | to_tsquery
 ---------------+------------
  'postgradu':1 | 'postgr':*
 </programlisting>
-     which will match the stemmed form of <literal>postgraduate</>.
+     which will match the stemmed form of <literal>postgraduate</literal>.
     </para>
 
    </sect2>
@@ -4132,9 +4140,9 @@ a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11
     functions for UUIDs, but the core database does not include any
     function for generating UUIDs, because no single algorithm is well
     suited for every application.  The <xref
-    linkend="uuid-ossp"> module
+    linkend="uuid-ossp"/> module
     provides functions that implement several standard algorithms.
-    The <xref linkend="pgcrypto"> module also provides a generation
+    The <xref linkend="pgcrypto"/> module also provides a generation
     function for random UUIDs.
     Alternatively, UUIDs could be generated by client applications or
     other libraries invoked through a server-side function.
@@ -4142,7 +4150,7 @@ a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11
   </sect1>
 
   <sect1 id="datatype-xml">
-   <title><acronym>XML</> Type</title>
+   <title><acronym>XML</acronym> Type</title>
 
    <indexterm zone="datatype-xml">
     <primary>XML</primary>
@@ -4153,9 +4161,9 @@ a0ee-bc99-9c0b-4ef8-bb6d-6bb9-bd38-0a11
     advantage over storing XML data in a <type>text</type> field is that it
     checks the input values for well-formedness, and there are support
     functions to perform type-safe operations on it; see <xref
-    linkend="functions-xml">.  Use of this data type requires the
+    linkend="functions-xml"/>.  Use of this data type requires the
     installation to have been built with <command>configure
-    --with-libxml</>.
+    --with-libxml</command>.
    </para>
 
    <para>
@@ -4259,7 +4267,7 @@ SET xmloption TO { DOCUMENT | CONTENT };
     results to the client (which is the normal mode), PostgreSQL
     converts all character data passed between the client and the
     server and vice versa to the character encoding of the respective
-    end; see <xref linkend="multibyte">.  This includes string
+    end; see <xref linkend="multibyte"/>.  This includes string
     representations of XML values, such as in the above examples.
     This would ordinarily mean that encoding declarations contained in
     XML data can become invalid as the character data is converted
@@ -4303,7 +4311,7 @@ SET xmloption TO { DOCUMENT | CONTENT };
     <para>
      Some XML-related functions may not work at all on non-ASCII data
      when the server encoding is not UTF-8.  This is known to be an
-     issue for <function>xmltable()</> and <function>xpath()</> in particular.
+     issue for <function>xmltable()</function> and <function>xpath()</function> in particular.
     </para>
    </caution>
    </sect2>
@@ -4351,6 +4359,59 @@ SET xmloption TO { DOCUMENT | CONTENT };
 
   &rangetypes;
 
+  <sect1 id="domains">
+   <title>Domain Types</title>
+
+   <indexterm zone="domains">
+    <primary>domain</primary>
+   </indexterm>
+
+   <indexterm zone="domains">
+    <primary>data type</primary>
+    <secondary>domain</secondary>
+   </indexterm>
+
+   <para>
+    A <firstterm>domain</firstterm> is a user-defined data type that is
+    based on another <firstterm>underlying type</firstterm>.  Optionally,
+    it can have constraints that restrict its valid values to a subset of
+    what the underlying type would allow.  Otherwise it behaves like the
+    underlying type &mdash; for example, any operator or function that
+    can be applied to the underlying type will work on the domain type.
+    The underlying type can be any built-in or user-defined base type,
+    enum type, array type, composite type, range type, or another domain.
+   </para>
+
+   <para>
+    For example, we could create a domain over integers that accepts only
+    positive integers:
+<programlisting>
+CREATE DOMAIN posint AS integer CHECK (VALUE &gt; 0);
+CREATE TABLE mytable (id posint);
+INSERT INTO mytable VALUES(1);   -- works
+INSERT INTO mytable VALUES(-1);  -- fails
+</programlisting>
+   </para>
+
+   <para>
+    When an operator or function of the underlying type is applied to a
+    domain value, the domain is automatically down-cast to the underlying
+    type.  Thus, for example, the result of <literal>mytable.id - 1</literal>
+    is considered to be of type <type>integer</type> not <type>posint</type>.
+    We could write <literal>(mytable.id - 1)::posint</literal> to cast the
+    result back to <type>posint</type>, causing the domain's constraints
+    to be rechecked.  In this case, that would result in an error if the
+    expression had been applied to an <structfield>id</structfield> value of
+    1.  Assigning a value of the underlying type to a field or variable of
+    the domain type is allowed without writing an explicit cast, but the
+    domain's constraints will be checked.
+   </para>
+
+   <para>
+    For additional information see <xref linkend="sql-createdomain"/>.
+   </para>
+  </sect1>
+
   <sect1 id="datatype-oid">
    <title>Object Identifier Types</title>
 
@@ -4412,18 +4473,18 @@ SET xmloption TO { DOCUMENT | CONTENT };
     <productname>PostgreSQL</productname> as primary keys for various
     system tables.  OIDs are not added to user-created tables, unless
     <literal>WITH OIDS</literal> is specified when the table is
-    created, or the <xref linkend="guc-default-with-oids">
-    configuration variable is enabled.  Type <type>oid</> represents
+    created, or the <xref linkend="guc-default-with-oids"/>
+    configuration variable is enabled.  Type <type>oid</type> represents
     an object identifier.  There are also several alias types for
-    <type>oid</>: <type>regproc</>, <type>regprocedure</>,
-    <type>regoper</>, <type>regoperator</>, <type>regclass</>,
-    <type>regtype</>, <type>regrole</>, <type>regnamespace</>,
-    <type>regconfig</>, and <type>regdictionary</>.
-    <xref linkend="datatype-oid-table"> shows an overview.
+    <type>oid</type>: <type>regproc</type>, <type>regprocedure</type>,
+    <type>regoper</type>, <type>regoperator</type>, <type>regclass</type>,
+    <type>regtype</type>, <type>regrole</type>, <type>regnamespace</type>,
+    <type>regconfig</type>, and <type>regdictionary</type>.
+    <xref linkend="datatype-oid-table"/> shows an overview.
    </para>
 
    <para>
-    The <type>oid</> type is currently implemented as an unsigned
+    The <type>oid</type> type is currently implemented as an unsigned
     four-byte integer.  Therefore, it is not large enough to provide
     database-wide uniqueness in large databases, or even in large
     individual tables.  So, using a user-created table's OID column as
@@ -4432,7 +4493,7 @@ SET xmloption TO { DOCUMENT | CONTENT };
    </para>
 
    <para>
-    The <type>oid</> type itself has few operations beyond comparison.
+    The <type>oid</type> type itself has few operations beyond comparison.
     It can be cast to integer, however, and then manipulated using the
     standard integer operators.  (Beware of possible
     signed-versus-unsigned confusion if you do this.)
@@ -4442,10 +4503,10 @@ SET xmloption TO { DOCUMENT | CONTENT };
     The OID alias types have no operations of their own except
     for specialized input and output routines.  These routines are able
     to accept and display symbolic names for system objects, rather than
-    the raw numeric value that type <type>oid</> would use.  The alias
+    the raw numeric value that type <type>oid</type> would use.  The alias
     types allow simplified lookup of OID values for objects.  For example,
-    to examine the <structname>pg_attribute</> rows related to a table
-    <literal>mytable</>, one could write:
+    to examine the <structname>pg_attribute</structname> rows related to a table
+    <literal>mytable</literal>, one could write:
 <programlisting>
 SELECT * FROM pg_attribute WHERE attrelid = 'mytable'::regclass;
 </programlisting>
@@ -4457,11 +4518,11 @@ SELECT * FROM pg_attribute
     While that doesn't look all that bad by itself, it's still oversimplified.
     A far more complicated sub-select would be needed to
     select the right OID if there are multiple tables named
-    <literal>mytable</> in different schemas.
-    The <type>regclass</> input converter handles the table lookup according
-    to the schema path setting, and so it does the <quote>right thing</>
+    <literal>mytable</literal> in different schemas.
+    The <type>regclass</type> input converter handles the table lookup according
+    to the schema path setting, and so it does the <quote>right thing</quote>
     automatically.  Similarly, casting a table's OID to
-    <type>regclass</> is handy for symbolic display of a numeric OID.
+    <type>regclass</type> is handy for symbolic display of a numeric OID.
    </para>
 
     <table id="datatype-oid-table">
@@ -4479,80 +4540,80 @@ SELECT * FROM pg_attribute
       <tbody>
 
        <row>
-        <entry><type>oid</></entry>
+        <entry><type>oid</type></entry>
         <entry>any</entry>
         <entry>numeric object identifier</entry>
-        <entry><literal>564182</></entry>
+        <entry><literal>564182</literal></entry>
        </row>
 
        <row>
-        <entry><type>regproc</></entry>
-        <entry><structname>pg_proc</></entry>
+        <entry><type>regproc</type></entry>
+        <entry><structname>pg_proc</structname></entry>
         <entry>function name</entry>
-        <entry><literal>sum</></entry>
+        <entry><literal>sum</literal></entry>
        </row>
 
        <row>
-        <entry><type>regprocedure</></entry>
-        <entry><structname>pg_proc</></entry>
+        <entry><type>regprocedure</type></entry>
+        <entry><structname>pg_proc</structname></entry>
         <entry>function with argument types</entry>
-        <entry><literal>sum(int4)</></entry>
+        <entry><literal>sum(int4)</literal></entry>
        </row>
 
        <row>
-        <entry><type>regoper</></entry>
-        <entry><structname>pg_operator</></entry>
+        <entry><type>regoper</type></entry>
+        <entry><structname>pg_operator</structname></entry>
         <entry>operator name</entry>
-        <entry><literal>+</></entry>
+        <entry><literal>+</literal></entry>
        </row>
 
        <row>
-        <entry><type>regoperator</></entry>
-        <entry><structname>pg_operator</></entry>
+        <entry><type>regoperator</type></entry>
+        <entry><structname>pg_operator</structname></entry>
         <entry>operator with argument types</entry>
-        <entry><literal>*(integer,integer)</> or <literal>-(NONE,integer)</></entry>
+        <entry><literal>*(integer,integer)</literal> or <literal>-(NONE,integer)</literal></entry>
        </row>
 
        <row>
-        <entry><type>regclass</></entry>
-        <entry><structname>pg_class</></entry>
+        <entry><type>regclass</type></entry>
+        <entry><structname>pg_class</structname></entry>
         <entry>relation name</entry>
-        <entry><literal>pg_type</></entry>
+        <entry><literal>pg_type</literal></entry>
        </row>
 
        <row>
-        <entry><type>regtype</></entry>
-        <entry><structname>pg_type</></entry>
+        <entry><type>regtype</type></entry>
+        <entry><structname>pg_type</structname></entry>
         <entry>data type name</entry>
-        <entry><literal>integer</></entry>
+        <entry><literal>integer</literal></entry>
        </row>
 
        <row>
-        <entry><type>regrole</></entry>
-        <entry><structname>pg_authid</></entry>
+        <entry><type>regrole</type></entry>
+        <entry><structname>pg_authid</structname></entry>
         <entry>role name</entry>
-        <entry><literal>smithee</></entry>
+        <entry><literal>smithee</literal></entry>
        </row>
 
        <row>
-        <entry><type>regnamespace</></entry>
-        <entry><structname>pg_namespace</></entry>
+        <entry><type>regnamespace</type></entry>
+        <entry><structname>pg_namespace</structname></entry>
         <entry>namespace name</entry>
-        <entry><literal>pg_catalog</></entry>
+        <entry><literal>pg_catalog</literal></entry>
        </row>
 
        <row>
-        <entry><type>regconfig</></entry>
-        <entry><structname>pg_ts_config</></entry>
+        <entry><type>regconfig</type></entry>
+        <entry><structname>pg_ts_config</structname></entry>
         <entry>text search configuration</entry>
-        <entry><literal>english</></entry>
+        <entry><literal>english</literal></entry>
        </row>
 
        <row>
-        <entry><type>regdictionary</></entry>
-        <entry><structname>pg_ts_dict</></entry>
+        <entry><type>regdictionary</type></entry>
+        <entry><structname>pg_ts_dict</structname></entry>
         <entry>text search dictionary</entry>
-        <entry><literal>simple</></entry>
+        <entry><literal>simple</literal></entry>
        </row>
       </tbody>
      </tgroup>
@@ -4563,11 +4624,11 @@ SELECT * FROM pg_attribute
     schema-qualified names, and will
     display schema-qualified names on output if the object would not
     be found in the current search path without being qualified.
-    The <type>regproc</> and <type>regoper</> alias types will only
+    The <type>regproc</type> and <type>regoper</type> alias types will only
     accept input names that are unique (not overloaded), so they are
-    of limited use; for most uses <type>regprocedure</> or
-    <type>regoperator</> are more appropriate.  For <type>regoperator</>,
-    unary operators are identified by writing <literal>NONE</> for the unused
+    of limited use; for most uses <type>regprocedure</type> or
+    <type>regoperator</type> are more appropriate.  For <type>regoperator</type>,
+    unary operators are identified by writing <literal>NONE</literal> for the unused
     operand.
    </para>
 
@@ -4577,12 +4638,12 @@ SELECT * FROM pg_attribute
     constant of one of these types appears in a stored expression
     (such as a column default expression or view), it creates a dependency
     on the referenced object.  For example, if a column has a default
-    expression <literal>nextval('my_seq'::regclass)</>,
+    expression <literal>nextval('my_seq'::regclass)</literal>,
     <productname>PostgreSQL</productname>
     understands that the default expression depends on the sequence
-    <literal>my_seq</>; the system will not let the sequence be dropped
+    <literal>my_seq</literal>; the system will not let the sequence be dropped
     without first removing the default expression.
-    <type>regrole</> is the only exception for the property. Constants of this
+    <type>regrole</type> is the only exception for the property. Constants of this
     type are not allowed in such expressions.
    </para>
 
@@ -4595,28 +4656,28 @@ SELECT * FROM pg_attribute
    </note>
 
    <para>
-    Another identifier type used by the system is <type>xid</>, or transaction
-    (abbreviated <abbrev>xact</>) identifier.  This is the data type of the system columns
-    <structfield>xmin</> and <structfield>xmax</>.  Transaction identifiers are 32-bit quantities.
+    Another identifier type used by the system is <type>xid</type>, or transaction
+    (abbreviated <abbrev>xact</abbrev>) identifier.  This is the data type of the system columns
+    <structfield>xmin</structfield> and <structfield>xmax</structfield>.  Transaction identifiers are 32-bit quantities.
    </para>
 
    <para>
-    A third identifier type used by the system is <type>cid</>, or
+    A third identifier type used by the system is <type>cid</type>, or
     command identifier.  This is the data type of the system columns
-    <structfield>cmin</> and <structfield>cmax</>. Command identifiers are also 32-bit quantities.
+    <structfield>cmin</structfield> and <structfield>cmax</structfield>. Command identifiers are also 32-bit quantities.
    </para>
 
    <para>
-    A final identifier type used by the system is <type>tid</>, or tuple
+    A final identifier type used by the system is <type>tid</type>, or tuple
     identifier (row identifier).  This is the data type of the system column
-    <structfield>ctid</>.  A tuple ID is a pair
+    <structfield>ctid</structfield>.  A tuple ID is a pair
     (block number, tuple index within block) that identifies the
     physical location of the row within its table.
    </para>
 
    <para>
     (The system columns are further explained in <xref
-    linkend="ddl-system-columns">.)
+    linkend="ddl-system-columns"/>.)
    </para>
   </sect1>
 
@@ -4638,7 +4699,7 @@ SELECT * FROM pg_attribute
     Internally, an LSN is a 64-bit integer, representing a byte position in
     the write-ahead log stream.  It is printed as two hexadecimal numbers of
     up to 8 digits each, separated by a slash; for example,
-    <literal>16/B374D848</>.  The <type>pg_lsn</type> type supports the
+    <literal>16/B374D848</literal>.  The <type>pg_lsn</type> type supports the
     standard comparison operators, like <literal>=</literal> and
     <literal>&gt;</literal>.  Two LSNs can be subtracted using the
     <literal>-</literal> operator; the result is the number of bytes separating
@@ -4728,13 +4789,13 @@ SELECT * FROM pg_attribute
    <para>
     The <productname>PostgreSQL</productname> type system contains a
     number of special-purpose entries that are collectively called
-    <firstterm>pseudo-types</>.  A pseudo-type cannot be used as a
+    <firstterm>pseudo-types</firstterm>.  A pseudo-type cannot be used as a
     column data type, but it can be used to declare a function's
     argument or result type.  Each of the available pseudo-types is
     useful in situations where a function's behavior does not
     correspond to simply taking or returning a value of a specific
     <acronym>SQL</acronym> data type.  <xref
-    linkend="datatype-pseudotypes-table"> lists the existing
+    linkend="datatype-pseudotypes-table"/> lists the existing
     pseudo-types.
    </para>
 
@@ -4750,106 +4811,106 @@ SELECT * FROM pg_attribute
 
       <tbody>
        <row>
-        <entry><type>any</></entry>
+        <entry><type>any</type></entry>
         <entry>Indicates that a function accepts any input data type.</entry>
        </row>
 
        <row>
-        <entry><type>anyelement</></entry>
+        <entry><type>anyelement</type></entry>
         <entry>Indicates that a function accepts any data type
-        (see <xref linkend="extend-types-polymorphic">).</entry>
+        (see <xref linkend="extend-types-polymorphic"/>).</entry>
        </row>
 
        <row>
-        <entry><type>anyarray</></entry>
+        <entry><type>anyarray</type></entry>
         <entry>Indicates that a function accepts any array data type
-        (see <xref linkend="extend-types-polymorphic">).</entry>
+        (see <xref linkend="extend-types-polymorphic"/>).</entry>
        </row>
 
        <row>
-        <entry><type>anynonarray</></entry>
+        <entry><type>anynonarray</type></entry>
         <entry>Indicates that a function accepts any non-array data type
-        (see <xref linkend="extend-types-polymorphic">).</entry>
+        (see <xref linkend="extend-types-polymorphic"/>).</entry>
        </row>
 
        <row>
-        <entry><type>anyenum</></entry>
+        <entry><type>anyenum</type></entry>
         <entry>Indicates that a function accepts any enum data type
-        (see <xref linkend="extend-types-polymorphic"> and
-        <xref linkend="datatype-enum">).</entry>
+        (see <xref linkend="extend-types-polymorphic"/> and
+        <xref linkend="datatype-enum"/>).</entry>
        </row>
 
        <row>
-        <entry><type>anyrange</></entry>
+        <entry><type>anyrange</type></entry>
         <entry>Indicates that a function accepts any range data type
-        (see <xref linkend="extend-types-polymorphic"> and
-        <xref linkend="rangetypes">).</entry>
+        (see <xref linkend="extend-types-polymorphic"/> and
+        <xref linkend="rangetypes"/>).</entry>
        </row>
 
        <row>
-        <entry><type>cstring</></entry>
+        <entry><type>cstring</type></entry>
         <entry>Indicates that a function accepts or returns a null-terminated C string.</entry>
        </row>
 
        <row>
-        <entry><type>internal</></entry>
+        <entry><type>internal</type></entry>
         <entry>Indicates that a function accepts or returns a server-internal
         data type.</entry>
        </row>
 
        <row>
-        <entry><type>language_handler</></entry>
-        <entry>A procedural language call handler is declared to return <type>language_handler</>.</entry>
+        <entry><type>language_handler</type></entry>
+        <entry>A procedural language call handler is declared to return <type>language_handler</type>.</entry>
        </row>
 
        <row>
-        <entry><type>fdw_handler</></entry>
-        <entry>A foreign-data wrapper handler is declared to return <type>fdw_handler</>.</entry>
+        <entry><type>fdw_handler</type></entry>
+        <entry>A foreign-data wrapper handler is declared to return <type>fdw_handler</type>.</entry>
        </row>
 
        <row>
-        <entry><type>index_am_handler</></entry>
-        <entry>An index access method handler is declared to return <type>index_am_handler</>.</entry>
+        <entry><type>index_am_handler</type></entry>
+        <entry>An index access method handler is declared to return <type>index_am_handler</type>.</entry>
        </row>
 
        <row>
-        <entry><type>tsm_handler</></entry>
-        <entry>A tablesample method handler is declared to return <type>tsm_handler</>.</entry>
+        <entry><type>tsm_handler</type></entry>
+        <entry>A tablesample method handler is declared to return <type>tsm_handler</type>.</entry>
        </row>
 
        <row>
-        <entry><type>record</></entry>
+        <entry><type>record</type></entry>
         <entry>Identifies a function taking or returning an unspecified row type.</entry>
        </row>
 
        <row>
-        <entry><type>trigger</></entry>
-        <entry>A trigger function is declared to return <type>trigger.</></entry>
+        <entry><type>trigger</type></entry>
+        <entry>A trigger function is declared to return <type>trigger.</type></entry>
        </row>
 
        <row>
-        <entry><type>event_trigger</></entry>
-        <entry>An event trigger function is declared to return <type>event_trigger.</></entry>
+        <entry><type>event_trigger</type></entry>
+        <entry>An event trigger function is declared to return <type>event_trigger.</type></entry>
        </row>
 
        <row>
-        <entry><type>pg_ddl_command</></entry>
+        <entry><type>pg_ddl_command</type></entry>
         <entry>Identifies a representation of DDL commands that is available to event triggers.</entry>
        </row>
 
        <row>
-        <entry><type>void</></entry>
+        <entry><type>void</type></entry>
         <entry>Indicates that a function returns no value.</entry>
        </row>
 
        <row>
-        <entry><type>unknown</></entry>
+        <entry><type>unknown</type></entry>
         <entry>Identifies a not-yet-resolved type, e.g. of an undecorated
          string literal.</entry>
        </row>
 
        <row>
-        <entry><type>opaque</></entry>
+        <entry><type>opaque</type></entry>
         <entry>An obsolete type name that formerly served many of the above
          purposes.</entry>
        </row>
@@ -4868,24 +4929,24 @@ SELECT * FROM pg_attribute
     Functions coded in procedural languages can use pseudo-types only as
     allowed by their implementation languages.  At present most procedural
     languages forbid use of a pseudo-type as an argument type, and allow
-    only <type>void</> and <type>record</> as a result type (plus
-    <type>trigger</> or <type>event_trigger</> when the function is used
+    only <type>void</type> and <type>record</type> as a result type (plus
+    <type>trigger</type> or <type>event_trigger</type> when the function is used
     as a trigger or event trigger).  Some also
-    support polymorphic functions using the types <type>anyelement</>,
-    <type>anyarray</>, <type>anynonarray</>, <type>anyenum</>, and
-    <type>anyrange</>.
+    support polymorphic functions using the types <type>anyelement</type>,
+    <type>anyarray</type>, <type>anynonarray</type>, <type>anyenum</type>, and
+    <type>anyrange</type>.
    </para>
 
    <para>
-    The <type>internal</> pseudo-type is used to declare functions
+    The <type>internal</type> pseudo-type is used to declare functions
     that are meant only to be called internally by the database
     system, and not by direct invocation in an <acronym>SQL</acronym>
-    query.  If a function has at least one <type>internal</>-type
+    query.  If a function has at least one <type>internal</type>-type
     argument then it cannot be called from <acronym>SQL</acronym>.  To
     preserve the type safety of this restriction it is important to
     follow this coding rule: do not create any function that is
-    declared to return <type>internal</> unless it has at least one
-    <type>internal</> argument.
+    declared to return <type>internal</type> unless it has at least one
+    <type>internal</type> argument.
    </para>
 
   </sect1>
diff --git a/doc/src/sgml/datetime.sgml b/doc/src/sgml/datetime.sgml
index ef9139f9e3..d269aa4cc5 100644
--- a/doc/src/sgml/datetime.sgml
+++ b/doc/src/sgml/datetime.sgml
@@ -37,18 +37,18 @@
      <substeps>
       <step>
        <para>
-        If the numeric token contains a colon (<literal>:</>), this is
+        If the numeric token contains a colon (<literal>:</literal>), this is
         a time string. Include all subsequent digits and colons.
        </para>
       </step>
 
       <step>
        <para>
-        If the numeric token contains a dash (<literal>-</>), slash
-        (<literal>/</>), or two or more dots (<literal>.</>), this is
+        If the numeric token contains a dash (<literal>-</literal>), slash
+        (<literal>/</literal>), or two or more dots (<literal>.</literal>), this is
         a date string which might have a text month.  If a date token has
         already been seen, it is instead interpreted as a time zone
-        name (e.g., <literal>America/New_York</>).
+        name (e.g., <literal>America/New_York</literal>).
        </para>
       </step>
 
@@ -63,8 +63,8 @@
 
       <step>
        <para>
-        If the token starts with a plus (<literal>+</>) or minus
-        (<literal>-</>), then it is either a numeric time zone or a special
+        If the token starts with a plus (<literal>+</literal>) or minus
+        (<literal>-</literal>), then it is either a numeric time zone or a special
         field.
        </para>
       </step>
@@ -114,7 +114,7 @@
         and if no other date fields have been previously read, then interpret
         as a <quote>concatenated date</quote> (e.g.,
         <literal>19990118</literal> or <literal>990118</literal>).
-        The interpretation is <literal>YYYYMMDD</> or <literal>YYMMDD</>.
+        The interpretation is <literal>YYYYMMDD</literal> or <literal>YYMMDD</literal>.
        </para>
       </step>
 
@@ -128,7 +128,7 @@
       <step>
        <para>
         If four or six digits and a year has already been read, then
-        interpret as a time (<literal>HHMM</> or <literal>HHMMSS</>).
+        interpret as a time (<literal>HHMM</literal> or <literal>HHMMSS</literal>).
        </para>
       </step>
 
@@ -143,7 +143,7 @@
       <step>
        <para>
         Otherwise the date field ordering is assumed to follow the
-        <varname>DateStyle</> setting: mm-dd-yy, dd-mm-yy, or yy-mm-dd.
+        <varname>DateStyle</varname> setting: mm-dd-yy, dd-mm-yy, or yy-mm-dd.
         Throw an error if a month or day field is found to be out of range.
        </para>
       </step>
@@ -167,7 +167,7 @@
       <tip>
        <para>
         Gregorian years AD 1-99 can be entered by using 4 digits with leading
-        zeros (e.g., <literal>0099</> is AD 99).
+        zeros (e.g., <literal>0099</literal> is AD 99).
        </para>
       </tip>
      </para>
@@ -180,7 +180,7 @@
    <title>Date/Time Key Words</title>
 
    <para>
-    <xref linkend="datetime-month-table"> shows the tokens that are
+    <xref linkend="datetime-month-table"/> shows the tokens that are
     recognized as names of months.
    </para>
 
@@ -247,7 +247,7 @@
     </table>
 
     <para>
-     <xref linkend="datetime-dow-table"> shows the tokens that are
+     <xref linkend="datetime-dow-table"/> shows the tokens that are
      recognized as names of days of the week.
     </para>
 
@@ -294,7 +294,7 @@
      </table>
 
    <para>
-    <xref linkend="datetime-mod-table"> shows the tokens that serve
+    <xref linkend="datetime-mod-table"/> shows the tokens that serve
     various modifier purposes.
    </para>
 
@@ -317,7 +317,7 @@
         <entry>Ignored</entry>
        </row>
        <row>
-        <entry><literal>JULIAN</>, <literal>JD</>, <literal>J</></entry>
+        <entry><literal>JULIAN</literal>, <literal>JD</literal>, <literal>J</literal></entry>
         <entry>Next field is Julian Date</entry>
        </row>
        <row>
@@ -349,28 +349,28 @@
     Since timezone abbreviations are not well standardized,
     <productname>PostgreSQL</productname> provides a means to customize
     the set of abbreviations accepted by the server.  The
-    <xref linkend="guc-timezone-abbreviations"> run-time parameter
+    <xref linkend="guc-timezone-abbreviations"/> run-time parameter
     determines the active set of abbreviations.  While this parameter
     can be altered by any database user, the possible values for it
     are under the control of the database administrator &mdash; they
     are in fact names of configuration files stored in
-    <filename>.../share/timezonesets/</> of the installation directory.
+    <filename>.../share/timezonesets/</filename> of the installation directory.
     By adding or altering files in that directory, the administrator
     can set local policy for timezone abbreviations.
    </para>
 
    <para>
-    <varname>timezone_abbreviations</> can be set to any file name
-    found in <filename>.../share/timezonesets/</>, if the file's name
+    <varname>timezone_abbreviations</varname> can be set to any file name
+    found in <filename>.../share/timezonesets/</filename>, if the file's name
     is entirely alphabetic.  (The prohibition against non-alphabetic
-    characters in <varname>timezone_abbreviations</> prevents reading
+    characters in <varname>timezone_abbreviations</varname> prevents reading
     files outside the intended directory, as well as reading editor
     backup files and other extraneous files.)
    </para>
 
    <para>
     A timezone abbreviation file can contain blank lines and comments
-    beginning with <literal>#</>.  Non-comment lines must have one of
+    beginning with <literal>#</literal>.  Non-comment lines must have one of
     these formats:
 
 <synopsis>
@@ -388,12 +388,12 @@
     the equivalent offset in seconds from UTC, positive being east from
     Greenwich and negative being west.  For example, -18000 would be five
     hours west of Greenwich, or North American east coast standard time.
-    <literal>D</> indicates that the zone name represents local
+    <literal>D</literal> indicates that the zone name represents local
     daylight-savings time rather than standard time.
    </para>
 
    <para>
-    Alternatively, a <replaceable>time_zone_name</> can be given, referencing
+    Alternatively, a <replaceable>time_zone_name</replaceable> can be given, referencing
     a zone name defined in the IANA timezone database.  The zone's definition
     is consulted to see whether the abbreviation is or has been in use in
     that zone, and if so, the appropriate meaning is used &mdash; that is,
@@ -417,34 +417,34 @@
    </tip>
 
    <para>
-    The <literal>@INCLUDE</> syntax allows inclusion of another file in the
-    <filename>.../share/timezonesets/</> directory.  Inclusion can be nested,
+    The <literal>@INCLUDE</literal> syntax allows inclusion of another file in the
+    <filename>.../share/timezonesets/</filename> directory.  Inclusion can be nested,
     to a limited depth.
    </para>
 
    <para>
-    The <literal>@OVERRIDE</> syntax indicates that subsequent entries in the
+    The <literal>@OVERRIDE</literal> syntax indicates that subsequent entries in the
     file can override previous entries (typically, entries obtained from
     included files).  Without this, conflicting definitions of the same
     timezone abbreviation are considered an error.
    </para>
 
    <para>
-    In an unmodified installation, the file <filename>Default</> contains
+    In an unmodified installation, the file <filename>Default</filename> contains
     all the non-conflicting time zone abbreviations for most of the world.
-    Additional files <filename>Australia</> and <filename>India</> are
+    Additional files <filename>Australia</filename> and <filename>India</filename> are
     provided for those regions: these files first include the
-    <literal>Default</> file and then add or modify abbreviations as needed.
+    <literal>Default</literal> file and then add or modify abbreviations as needed.
    </para>
 
    <para>
     For reference purposes, a standard installation also contains files
-    <filename>Africa.txt</>, <filename>America.txt</>, etc, containing
+    <filename>Africa.txt</filename>, <filename>America.txt</filename>, etc, containing
     information about every time zone abbreviation known to be in use
     according to the IANA timezone database.  The zone name
     definitions found in these files can be copied and pasted into a custom
     configuration file as needed.  Note that these files cannot be directly
-    referenced as <varname>timezone_abbreviations</> settings, because of
+    referenced as <varname>timezone_abbreviations</varname> settings, because of
     the dot embedded in their names.
    </para>
 
@@ -460,16 +460,16 @@
     <para>
      Time zone abbreviations defined in the configuration file override
      non-timezone meanings built into <productname>PostgreSQL</productname>.
-     For example, the <filename>Australia</> configuration file defines
-     <literal>SAT</> (for South Australian Standard Time).  When this
-     file is active, <literal>SAT</> will not be recognized as an abbreviation
+     For example, the <filename>Australia</filename> configuration file defines
+     <literal>SAT</literal> (for South Australian Standard Time).  When this
+     file is active, <literal>SAT</literal> will not be recognized as an abbreviation
      for Saturday.
     </para>
    </caution>
 
    <caution>
     <para>
-     If you modify files in <filename>.../share/timezonesets/</>,
+     If you modify files in <filename>.../share/timezonesets/</filename>,
      it is up to you to make backups &mdash; a normal database dump
      will not include this directory.
     </para>
@@ -492,10 +492,10 @@
    <quote>datetime literal</quote>, the <quote>datetime
    values</quote> are constrained by the natural rules for dates and
    times according to the Gregorian calendar</quote>.
-   <productname>PostgreSQL</> follows the SQL
+   <productname>PostgreSQL</productname> follows the SQL
    standard's lead by counting dates exclusively in the Gregorian
    calendar, even for years before that calendar was in use.
-   This rule is known as the <firstterm>proleptic Gregorian calendar</>.
+   This rule is known as the <firstterm>proleptic Gregorian calendar</firstterm>.
   </para>
 
   <para>
@@ -569,7 +569,7 @@ $ <userinput>cal 9 1752</userinput>
    dominions, not other places.
    Since it would be difficult and confusing to try to track the actual
    calendars that were in use in various places at various times,
-   <productname>PostgreSQL</> does not try, but rather follows the Gregorian
+   <productname>PostgreSQL</productname> does not try, but rather follows the Gregorian
    calendar rules for all dates, even though this method is not historically
    accurate.
   </para>
@@ -597,7 +597,7 @@ $ <userinput>cal 9 1752</userinput>
    and probably takes its name from Scaliger's father,
    the Italian scholar Julius Caesar Scaliger (1484-1558).
    In the Julian Date system, each day has a sequential number, starting
-   from JD 0 (which is sometimes called <emphasis>the</> Julian Date).
+   from JD 0 (which is sometimes called <emphasis>the</emphasis> Julian Date).
    JD 0 corresponds to 1 January 4713 BC in the Julian calendar, or
    24 November 4714 BC in the Gregorian calendar.  Julian Date counting
    is most often used by astronomers for labeling their nightly observations,
@@ -607,10 +607,10 @@ $ <userinput>cal 9 1752</userinput>
   </para>
 
   <para>
-   Although <productname>PostgreSQL</> supports Julian Date notation for
+   Although <productname>PostgreSQL</productname> supports Julian Date notation for
    input and output of dates (and also uses Julian dates for some internal
    datetime calculations), it does not observe the nicety of having dates
-   run from noon to noon.  <productname>PostgreSQL</> treats a Julian Date
+   run from noon to noon.  <productname>PostgreSQL</productname> treats a Julian Date
    as running from midnight to midnight.
   </para>
 
diff --git a/doc/src/sgml/dblink.sgml b/doc/src/sgml/dblink.sgml
index f19c6b19f5..87e14ea093 100644
--- a/doc/src/sgml/dblink.sgml
+++ b/doc/src/sgml/dblink.sgml
@@ -8,17 +8,17 @@
  </indexterm>
 
  <para>
-  <filename>dblink</> is a module that supports connections to
-  other <productname>PostgreSQL</> databases from within a database
+  <filename>dblink</filename> is a module that supports connections to
+  other <productname>PostgreSQL</productname> databases from within a database
   session.
  </para>
 
  <para>
-  See also <xref linkend="postgres-fdw">, which provides roughly the same
+  See also <xref linkend="postgres-fdw"/>, which provides roughly the same
   functionality using a more modern and standards-compliant infrastructure.
  </para>
 
- <refentry id="CONTRIB-DBLINK-CONNECT">
+ <refentry id="contrib-dblink-connect">
   <indexterm>
    <primary>dblink_connect</primary>
   </indexterm>
@@ -44,9 +44,9 @@ dblink_connect(text connname, text connstr) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_connect()</> establishes a connection to a remote
-    <productname>PostgreSQL</> database.  The server and database to
-    be contacted are identified through a standard <application>libpq</>
+    <function>dblink_connect()</function> establishes a connection to a remote
+    <productname>PostgreSQL</productname> database.  The server and database to
+    be contacted are identified through a standard <application>libpq</application>
     connection string.  Optionally, a name can be assigned to the
     connection.  Multiple named connections can be open at once, but
     only one unnamed connection is permitted at a time.  The connection
@@ -58,8 +58,8 @@ dblink_connect(text connname, text connstr) returns text
     server.  It is recommended to use the foreign-data wrapper
     <literal>dblink_fdw</literal> when defining the foreign
     server.  See the example below, as well as
-    <xref linkend="sql-createserver"> and
-    <xref linkend="sql-createusermapping">.
+    <xref linkend="sql-createserver"/> and
+    <xref linkend="sql-createusermapping"/>.
    </para>
 
   </refsect1>
@@ -81,10 +81,10 @@ dblink_connect(text connname, text connstr) returns text
     <varlistentry>
      <term><parameter>connstr</parameter></term>
      <listitem>
-      <para><application>libpq</>-style connection info string, for example
+      <para><application>libpq</application>-style connection info string, for example
        <literal>hostaddr=127.0.0.1 port=5432 dbname=mydb user=postgres
-       password=mypasswd</>.
-       For details see <xref linkend="libpq-connstring">.
+       password=mypasswd options=-csearch_path=</literal>.
+       For details see <xref linkend="libpq-connstring"/>.
        Alternatively, the name of a foreign server.
       </para>
      </listitem>
@@ -96,7 +96,7 @@ dblink_connect(text connname, text connstr) returns text
    <title>Return Value</title>
 
    <para>
-    Returns status, which is always <literal>OK</> (since any error
+    Returns status, which is always <literal>OK</literal> (since any error
     causes the function to throw an error instead of returning).
    </para>
   </refsect1>
@@ -105,15 +105,26 @@ dblink_connect(text connname, text connstr) returns text
    <title>Notes</title>
 
    <para>
-    Only superusers may use <function>dblink_connect</> to create
+    If untrusted users have access to a database that has not adopted a
+    <link linkend="ddl-schemas-patterns">secure schema usage pattern</link>,
+    begin each session by removing publicly-writable schemas from
+    <varname>search_path</varname>.  One could, for example,
+    add <literal>options=-csearch_path=</literal> to
+    <parameter>connstr</parameter>.  This consideration is not specific
+    to <filename>dblink</filename>; it applies to every interface for
+    executing arbitrary SQL commands.
+   </para>
+
+   <para>
+    Only superusers may use <function>dblink_connect</function> to create
     non-password-authenticated connections.  If non-superusers need this
-    capability, use <function>dblink_connect_u</> instead.
+    capability, use <function>dblink_connect_u</function> instead.
    </para>
 
    <para>
     It is unwise to choose connection names that contain equal signs,
     as this opens a risk of confusion with connection info strings
-    in other <filename>dblink</> functions.
+    in other <filename>dblink</filename> functions.
    </para>
   </refsect1>
 
@@ -121,13 +132,13 @@ dblink_connect(text connname, text connstr) returns text
    <title>Examples</title>
 
 <screen>
-SELECT dblink_connect('dbname=postgres');
+SELECT dblink_connect('dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
 (1 row)
 
-SELECT dblink_connect('myconn', 'dbname=postgres');
+SELECT dblink_connect('myconn', 'dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -182,7 +193,7 @@ DROP SERVER fdtest;
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-CONNECT-U">
+ <refentry id="contrib-dblink-connect-u">
   <indexterm>
    <primary>dblink_connect_u</primary>
   </indexterm>
@@ -208,8 +219,8 @@ dblink_connect_u(text connname, text connstr) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_connect_u()</> is identical to
-    <function>dblink_connect()</>, except that it will allow non-superusers
+    <function>dblink_connect_u()</function> is identical to
+    <function>dblink_connect()</function>, except that it will allow non-superusers
     to connect using any authentication method.
    </para>
 
@@ -217,29 +228,29 @@ dblink_connect_u(text connname, text connstr) returns text
     If the remote server selects an authentication method that does not
     involve a password, then impersonation and subsequent escalation of
     privileges can occur, because the session will appear to have
-    originated from the user as which the local <productname>PostgreSQL</>
+    originated from the user as which the local <productname>PostgreSQL</productname>
     server runs.  Also, even if the remote server does demand a password,
     it is possible for the password to be supplied from the server
-    environment, such as a <filename>~/.pgpass</> file belonging to the
+    environment, such as a <filename>~/.pgpass</filename> file belonging to the
     server's user.  This opens not only a risk of impersonation, but the
     possibility of exposing a password to an untrustworthy remote server.
-    Therefore, <function>dblink_connect_u()</> is initially
-    installed with all privileges revoked from <literal>PUBLIC</>,
+    Therefore, <function>dblink_connect_u()</function> is initially
+    installed with all privileges revoked from <literal>PUBLIC</literal>,
     making it un-callable except by superusers.  In some situations
-    it may be appropriate to grant <literal>EXECUTE</> permission for
-    <function>dblink_connect_u()</> to specific users who are considered
+    it may be appropriate to grant <literal>EXECUTE</literal> permission for
+    <function>dblink_connect_u()</function> to specific users who are considered
     trustworthy, but this should be done with care.  It is also recommended
-    that any <filename>~/.pgpass</> file belonging to the server's user
-    <emphasis>not</> contain any records specifying a wildcard host name.
+    that any <filename>~/.pgpass</filename> file belonging to the server's user
+    <emphasis>not</emphasis> contain any records specifying a wildcard host name.
    </para>
 
    <para>
-    For further details see <function>dblink_connect()</>.
+    For further details see <function>dblink_connect()</function>.
    </para>
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-DISCONNECT">
+ <refentry id="contrib-dblink-disconnect">
   <indexterm>
    <primary>dblink_disconnect</primary>
   </indexterm>
@@ -265,8 +276,8 @@ dblink_disconnect(text connname) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_disconnect()</> closes a connection previously opened
-    by <function>dblink_connect()</>.  The form with no arguments closes
+    <function>dblink_disconnect()</function> closes a connection previously opened
+    by <function>dblink_connect()</function>.  The form with no arguments closes
     an unnamed connection.
    </para>
   </refsect1>
@@ -290,7 +301,7 @@ dblink_disconnect(text connname) returns text
    <title>Return Value</title>
 
    <para>
-    Returns status, which is always <literal>OK</> (since any error
+    Returns status, which is always <literal>OK</literal> (since any error
     causes the function to throw an error instead of returning).
    </para>
   </refsect1>
@@ -314,7 +325,7 @@ SELECT dblink_disconnect('myconn');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-FUNCTION">
+ <refentry id="contrib-dblink-function">
   <indexterm>
    <primary>dblink</primary>
   </indexterm>
@@ -341,15 +352,15 @@ dblink(text sql [, bool fail_on_error]) returns setof record
    <title>Description</title>
 
    <para>
-    <function>dblink</> executes a query (usually a <command>SELECT</>,
+    <function>dblink</function> executes a query (usually a <command>SELECT</command>,
     but it can be any SQL statement that returns rows) in a remote database.
    </para>
 
    <para>
-    When two <type>text</> arguments are given, the first one is first
+    When two <type>text</type> arguments are given, the first one is first
     looked up as a persistent connection's name; if found, the command
     is executed on that connection.  If not found, the first argument
-    is treated as a connection info string as for <function>dblink_connect</>,
+    is treated as a connection info string as for <function>dblink_connect</function>,
     and the indicated connection is made just for the duration of this command.
    </para>
   </refsect1>
@@ -373,7 +384,7 @@ dblink(text sql [, bool fail_on_error]) returns setof record
      <listitem>
       <para>
        A connection info string, as previously described for
-       <function>dblink_connect</>.
+       <function>dblink_connect</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -383,7 +394,7 @@ dblink(text sql [, bool fail_on_error]) returns setof record
      <listitem>
       <para>
        The SQL query that you wish to execute in the remote database,
-       for example <literal>select * from foo</>.
+       for example <literal>select * from foo</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -407,34 +418,35 @@ dblink(text sql [, bool fail_on_error]) returns setof record
 
    <para>
     The function returns the row(s) produced by the query.  Since
-    <function>dblink</> can be used with any query, it is declared
-    to return <type>record</>, rather than specifying any particular
+    <function>dblink</function> can be used with any query, it is declared
+    to return <type>record</type>, rather than specifying any particular
     set of columns.  This means that you must specify the expected
     set of columns in the calling query &mdash; otherwise
-    <productname>PostgreSQL</> would not know what to expect.
+    <productname>PostgreSQL</productname> would not know what to expect.
     Here is an example:
 
 <programlisting>
 SELECT *
-    FROM dblink('dbname=mydb', 'select proname, prosrc from pg_proc')
+    FROM dblink('dbname=mydb options=-csearch_path=',
+                'select proname, prosrc from pg_proc')
       AS t1(proname name, prosrc text)
     WHERE proname LIKE 'bytea%';
 </programlisting>
 
-    The <quote>alias</> part of the <literal>FROM</> clause must
+    The <quote>alias</quote> part of the <literal>FROM</literal> clause must
     specify the column names and types that the function will return.
     (Specifying column names in an alias is actually standard SQL
-    syntax, but specifying column types is a <productname>PostgreSQL</>
+    syntax, but specifying column types is a <productname>PostgreSQL</productname>
     extension.)  This allows the system to understand what
-    <literal>*</> should expand to, and what <structname>proname</>
-    in the <literal>WHERE</> clause refers to, in advance of trying
+    <literal>*</literal> should expand to, and what <structname>proname</structname>
+    in the <literal>WHERE</literal> clause refers to, in advance of trying
     to execute the function.  At run time, an error will be thrown
     if the actual query result from the remote database does not
-    have the same number of columns shown in the <literal>FROM</> clause.
-    The column names need not match, however, and <function>dblink</>
+    have the same number of columns shown in the <literal>FROM</literal> clause.
+    The column names need not match, however, and <function>dblink</function>
     does not insist on exact type matches either.  It will succeed
     so long as the returned data strings are valid input for the
-    column type declared in the <literal>FROM</> clause.
+    column type declared in the <literal>FROM</literal> clause.
    </para>
   </refsect1>
 
@@ -442,7 +454,7 @@ SELECT *
    <title>Notes</title>
 
    <para>
-    A convenient way to use <function>dblink</> with predetermined
+    A convenient way to use <function>dblink</function> with predetermined
     queries is to create a view.
     This allows the column type information to be buried in the view,
     instead of having to spell it out in every query.  For example,
@@ -450,7 +462,8 @@ SELECT *
 <programlisting>
 CREATE VIEW myremote_pg_proc AS
   SELECT *
-    FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
+    FROM dblink('dbname=postgres options=-csearch_path=',
+                'select proname, prosrc from pg_proc')
     AS t1(proname name, prosrc text);
 
 SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%';
@@ -461,7 +474,8 @@ SELECT * FROM myremote_pg_proc WHERE proname LIKE 'bytea%';
    <title>Examples</title>
 
 <screen>
-SELECT * FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
+SELECT * FROM dblink('dbname=postgres options=-csearch_path=',
+                     'select proname, prosrc from pg_proc')
   AS t1(proname name, prosrc text) WHERE proname LIKE 'bytea%';
   proname   |   prosrc
 ------------+------------
@@ -479,7 +493,7 @@ SELECT * FROM dblink('dbname=postgres', 'select proname, prosrc from pg_proc')
  byteaout   | byteaout
 (12 rows)
 
-SELECT dblink_connect('dbname=postgres');
+SELECT dblink_connect('dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -503,7 +517,7 @@ SELECT * FROM dblink('select proname, prosrc from pg_proc')
  byteaout   | byteaout
 (12 rows)
 
-SELECT dblink_connect('myconn', 'dbname=regression');
+SELECT dblink_connect('myconn', 'dbname=regression options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -532,7 +546,7 @@ SELECT * FROM dblink('myconn', 'select proname, prosrc from pg_proc')
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-EXEC">
+ <refentry id="contrib-dblink-exec">
   <indexterm>
    <primary>dblink_exec</primary>
   </indexterm>
@@ -559,15 +573,15 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_exec</> executes a command (that is, any SQL statement
+    <function>dblink_exec</function> executes a command (that is, any SQL statement
     that doesn't return rows) in a remote database.
    </para>
 
    <para>
-    When two <type>text</> arguments are given, the first one is first
+    When two <type>text</type> arguments are given, the first one is first
     looked up as a persistent connection's name; if found, the command
     is executed on that connection.  If not found, the first argument
-    is treated as a connection info string as for <function>dblink_connect</>,
+    is treated as a connection info string as for <function>dblink_connect</function>,
     and the indicated connection is made just for the duration of this command.
    </para>
   </refsect1>
@@ -591,7 +605,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
      <listitem>
       <para>
        A connection info string, as previously described for
-       <function>dblink_connect</>.
+       <function>dblink_connect</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -602,7 +616,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
       <para>
        The SQL command that you wish to execute in the remote database,
        for example
-       <literal>insert into foo values(0,'a','{"a0","b0","c0"}')</>.
+       <literal>insert into foo values(0,'a','{"a0","b0","c0"}')</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -614,7 +628,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
        If true (the default when omitted) then an error thrown on the
        remote side of the connection causes an error to also be thrown
        locally. If false, the remote error is locally reported as a NOTICE,
-       and the function's return value is set to <literal>ERROR</>.
+       and the function's return value is set to <literal>ERROR</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -625,7 +639,7 @@ dblink_exec(text sql [, bool fail_on_error]) returns text
    <title>Return Value</title>
 
    <para>
-    Returns status, either the command's status string or <literal>ERROR</>.
+    Returns status, either the command's status string or <literal>ERROR</literal>.
    </para>
   </refsect1>
 
@@ -669,7 +683,7 @@ DETAIL:  ERROR:  null value in column "relnamespace" violates not-null constrain
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-OPEN">
+ <refentry id="contrib-dblink-open">
   <indexterm>
    <primary>dblink_open</primary>
   </indexterm>
@@ -695,9 +709,9 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
    <title>Description</title>
 
    <para>
-    <function>dblink_open()</> opens a cursor in a remote database.
+    <function>dblink_open()</function> opens a cursor in a remote database.
     The cursor can subsequently be manipulated with
-    <function>dblink_fetch()</> and <function>dblink_close()</>.
+    <function>dblink_fetch()</function> and <function>dblink_close()</function>.
    </para>
   </refsect1>
 
@@ -728,8 +742,8 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
      <term><parameter>sql</parameter></term>
      <listitem>
       <para>
-       The <command>SELECT</> statement that you wish to execute in the remote
-       database, for example <literal>select * from pg_class</>.
+       The <command>SELECT</command> statement that you wish to execute in the remote
+       database, for example <literal>select * from pg_class</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -741,7 +755,7 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
        If true (the default when omitted) then an error thrown on the
        remote side of the connection causes an error to also be thrown
        locally. If false, the remote error is locally reported as a NOTICE,
-       and the function's return value is set to <literal>ERROR</>.
+       and the function's return value is set to <literal>ERROR</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -752,7 +766,7 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
    <title>Return Value</title>
 
    <para>
-    Returns status, either <literal>OK</> or <literal>ERROR</>.
+    Returns status, either <literal>OK</literal> or <literal>ERROR</literal>.
    </para>
   </refsect1>
 
@@ -761,16 +775,16 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
 
    <para>
     Since a cursor can only persist within a transaction,
-    <function>dblink_open</> starts an explicit transaction block
-    (<command>BEGIN</>) on the remote side, if the remote side was
+    <function>dblink_open</function> starts an explicit transaction block
+    (<command>BEGIN</command>) on the remote side, if the remote side was
     not already within a transaction.  This transaction will be
-    closed again when the matching <function>dblink_close</> is
+    closed again when the matching <function>dblink_close</function> is
     executed.  Note that if
-    you use <function>dblink_exec</> to change data between
-    <function>dblink_open</> and <function>dblink_close</>,
-    and then an error occurs or you use <function>dblink_disconnect</> before
-    <function>dblink_close</>, your change <emphasis>will be
-    lost</> because the transaction will be aborted.
+    you use <function>dblink_exec</function> to change data between
+    <function>dblink_open</function> and <function>dblink_close</function>,
+    and then an error occurs or you use <function>dblink_disconnect</function> before
+    <function>dblink_close</function>, your change <emphasis>will be
+    lost</emphasis> because the transaction will be aborted.
    </para>
   </refsect1>
 
@@ -778,7 +792,7 @@ dblink_open(text connname, text cursorname, text sql [, bool fail_on_error]) ret
    <title>Examples</title>
 
 <screen>
-SELECT dblink_connect('dbname=postgres');
+SELECT dblink_connect('dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -793,7 +807,7 @@ SELECT dblink_open('foo', 'select proname, prosrc from pg_proc');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-FETCH">
+ <refentry id="contrib-dblink-fetch">
   <indexterm>
    <primary>dblink_fetch</primary>
   </indexterm>
@@ -819,8 +833,8 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
    <title>Description</title>
 
    <para>
-    <function>dblink_fetch</> fetches rows from a cursor previously
-    established by <function>dblink_open</>.
+    <function>dblink_fetch</function> fetches rows from a cursor previously
+    established by <function>dblink_open</function>.
    </para>
   </refsect1>
 
@@ -851,7 +865,7 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
      <term><parameter>howmany</parameter></term>
      <listitem>
       <para>
-       The maximum number of rows to retrieve. The next <parameter>howmany</>
+       The maximum number of rows to retrieve. The next <parameter>howmany</parameter>
        rows are fetched, starting at the current cursor position, moving
        forward. Once the cursor has reached its end, no more rows are produced.
       </para>
@@ -878,7 +892,7 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
    <para>
     The function returns the row(s) fetched from the cursor.  To use this
     function, you will need to specify the expected set of columns,
-    as previously discussed for <function>dblink</>.
+    as previously discussed for <function>dblink</function>.
    </para>
   </refsect1>
 
@@ -887,11 +901,11 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
 
    <para>
     On a mismatch between the number of return columns specified in the
-    <literal>FROM</> clause, and the actual number of columns returned by the
+    <literal>FROM</literal> clause, and the actual number of columns returned by the
     remote cursor, an error will be thrown. In this event, the remote cursor
     is still advanced by as many rows as it would have been if the error had
     not occurred.  The same is true for any other error occurring in the local
-    query after the remote <command>FETCH</> has been done.
+    query after the remote <command>FETCH</command> has been done.
    </para>
   </refsect1>
 
@@ -899,7 +913,7 @@ dblink_fetch(text connname, text cursorname, int howmany [, bool fail_on_error])
    <title>Examples</title>
 
 <screen>
-SELECT dblink_connect('dbname=postgres');
+SELECT dblink_connect('dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -946,7 +960,7 @@ SELECT * FROM dblink_fetch('foo', 5) AS (funcname name, source text);
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-CLOSE">
+ <refentry id="contrib-dblink-close">
   <indexterm>
    <primary>dblink_close</primary>
   </indexterm>
@@ -972,8 +986,8 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_close</> closes a cursor previously opened with
-    <function>dblink_open</>.
+    <function>dblink_close</function> closes a cursor previously opened with
+    <function>dblink_open</function>.
    </para>
   </refsect1>
 
@@ -1007,7 +1021,7 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
        If true (the default when omitted) then an error thrown on the
        remote side of the connection causes an error to also be thrown
        locally. If false, the remote error is locally reported as a NOTICE,
-       and the function's return value is set to <literal>ERROR</>.
+       and the function's return value is set to <literal>ERROR</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1018,7 +1032,7 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
    <title>Return Value</title>
 
    <para>
-    Returns status, either <literal>OK</> or <literal>ERROR</>.
+    Returns status, either <literal>OK</literal> or <literal>ERROR</literal>.
    </para>
   </refsect1>
 
@@ -1026,9 +1040,9 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
    <title>Notes</title>
 
    <para>
-    If <function>dblink_open</> started an explicit transaction block,
+    If <function>dblink_open</function> started an explicit transaction block,
     and this is the last remaining open cursor in this connection,
-    <function>dblink_close</> will issue the matching <command>COMMIT</>.
+    <function>dblink_close</function> will issue the matching <command>COMMIT</command>.
    </para>
   </refsect1>
 
@@ -1036,7 +1050,7 @@ dblink_close(text connname, text cursorname [, bool fail_on_error]) returns text
    <title>Examples</title>
 
 <screen>
-SELECT dblink_connect('dbname=postgres');
+SELECT dblink_connect('dbname=postgres options=-csearch_path=');
  dblink_connect
 ----------------
  OK
@@ -1057,7 +1071,7 @@ SELECT dblink_close('foo');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-GET-CONNECTIONS">
+ <refentry id="contrib-dblink-get-connections">
   <indexterm>
    <primary>dblink_get_connections</primary>
   </indexterm>
@@ -1082,8 +1096,8 @@ dblink_get_connections() returns text[]
    <title>Description</title>
 
    <para>
-    <function>dblink_get_connections</> returns an array of the names
-    of all open named <filename>dblink</> connections.
+    <function>dblink_get_connections</function> returns an array of the names
+    of all open named <filename>dblink</filename> connections.
    </para>
   </refsect1>
 
@@ -1102,7 +1116,7 @@ SELECT dblink_get_connections();
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-ERROR-MESSAGE">
+ <refentry id="contrib-dblink-error-message">
   <indexterm>
    <primary>dblink_error_message</primary>
   </indexterm>
@@ -1127,7 +1141,7 @@ dblink_error_message(text connname) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_error_message</> fetches the most recent remote
+    <function>dblink_error_message</function> fetches the most recent remote
     error message for a given connection.
    </para>
   </refsect1>
@@ -1165,7 +1179,7 @@ SELECT dblink_error_message('dtest1');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-SEND-QUERY">
+ <refentry id="contrib-dblink-send-query">
   <indexterm>
    <primary>dblink_send_query</primary>
   </indexterm>
@@ -1190,7 +1204,7 @@ dblink_send_query(text connname, text sql) returns int
    <title>Description</title>
 
    <para>
-    <function>dblink_send_query</> sends a query to be executed
+    <function>dblink_send_query</function> sends a query to be executed
     asynchronously, that is, without immediately waiting for the result.
     There must not be an async query already in progress on the
     connection.
@@ -1198,10 +1212,10 @@ dblink_send_query(text connname, text sql) returns int
 
    <para>
     After successfully dispatching an async query, completion status
-    can be checked with <function>dblink_is_busy</>, and the results
-    are ultimately collected with <function>dblink_get_result</>.
+    can be checked with <function>dblink_is_busy</function>, and the results
+    are ultimately collected with <function>dblink_get_result</function>.
     It is also possible to attempt to cancel an active async query
-    using <function>dblink_cancel_query</>.
+    using <function>dblink_cancel_query</function>.
    </para>
   </refsect1>
 
@@ -1223,7 +1237,7 @@ dblink_send_query(text connname, text sql) returns int
      <listitem>
       <para>
        The SQL statement that you wish to execute in the remote database,
-       for example <literal>select * from pg_class</>.
+       for example <literal>select * from pg_class</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1247,7 +1261,7 @@ SELECT dblink_send_query('dtest1', 'SELECT * FROM foo WHERE f1 &lt; 3');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-IS-BUSY">
+ <refentry id="contrib-dblink-is-busy">
   <indexterm>
    <primary>dblink_is_busy</primary>
   </indexterm>
@@ -1272,7 +1286,7 @@ dblink_is_busy(text connname) returns int
    <title>Description</title>
 
    <para>
-    <function>dblink_is_busy</> tests whether an async query is in progress.
+    <function>dblink_is_busy</function> tests whether an async query is in progress.
    </para>
   </refsect1>
 
@@ -1297,7 +1311,7 @@ dblink_is_busy(text connname) returns int
    <para>
     Returns 1 if connection is busy, 0 if it is not busy.
     If this function returns 0, it is guaranteed that
-    <function>dblink_get_result</> will not block.
+    <function>dblink_get_result</function> will not block.
    </para>
   </refsect1>
 
@@ -1310,7 +1324,7 @@ SELECT dblink_is_busy('dtest1');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-GET-NOTIFY">
+ <refentry id="contrib-dblink-get-notify">
   <indexterm>
    <primary>dblink_get_notify</primary>
   </indexterm>
@@ -1336,11 +1350,11 @@ dblink_get_notify(text connname) returns setof (notify_name text, be_pid int, ex
    <title>Description</title>
 
    <para>
-    <function>dblink_get_notify</> retrieves notifications on either
+    <function>dblink_get_notify</function> retrieves notifications on either
     the unnamed connection, or on a named connection if specified.
-    To receive notifications via dblink, <function>LISTEN</> must
-    first be issued, using <function>dblink_exec</>.
-    For details see <xref linkend="sql-listen"> and <xref linkend="sql-notify">.
+    To receive notifications via dblink, <function>LISTEN</function> must
+    first be issued, using <function>dblink_exec</function>.
+    For details see <xref linkend="sql-listen"/> and <xref linkend="sql-notify"/>.
    </para>
 
   </refsect1>
@@ -1392,7 +1406,7 @@ SELECT * FROM dblink_get_notify();
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-GET-RESULT">
+ <refentry id="contrib-dblink-get-result">
   <indexterm>
    <primary>dblink_get_result</primary>
   </indexterm>
@@ -1417,9 +1431,9 @@ dblink_get_result(text connname [, bool fail_on_error]) returns setof record
    <title>Description</title>
 
    <para>
-    <function>dblink_get_result</> collects the results of an
-    asynchronous query previously sent with <function>dblink_send_query</>.
-    If the query is not already completed, <function>dblink_get_result</>
+    <function>dblink_get_result</function> collects the results of an
+    asynchronous query previously sent with <function>dblink_send_query</function>.
+    If the query is not already completed, <function>dblink_get_result</function>
     will wait until it is.
    </para>
   </refsect1>
@@ -1458,14 +1472,14 @@ dblink_get_result(text connname [, bool fail_on_error]) returns setof record
     For an async query (that is, a SQL statement returning rows),
     the function returns the row(s) produced by the query.  To use this
     function, you will need to specify the expected set of columns,
-    as previously discussed for <function>dblink</>.
+    as previously discussed for <function>dblink</function>.
    </para>
 
    <para>
     For an async command (that is, a SQL statement not returning rows),
     the function returns a single row with a single text column containing
     the command's status string.  It is still necessary to specify that
-    the result will have a single text column in the calling <literal>FROM</>
+    the result will have a single text column in the calling <literal>FROM</literal>
     clause.
    </para>
   </refsect1>
@@ -1474,22 +1488,22 @@ dblink_get_result(text connname [, bool fail_on_error]) returns setof record
    <title>Notes</title>
 
    <para>
-    This function <emphasis>must</> be called if
-    <function>dblink_send_query</> returned 1.
+    This function <emphasis>must</emphasis> be called if
+    <function>dblink_send_query</function> returned 1.
     It must be called once for each query
     sent, and one additional time to obtain an empty set result,
     before the connection can be used again.
    </para>
 
    <para>
-    When using <function>dblink_send_query</> and
-    <function>dblink_get_result</>, <application>dblink</> fetches the entire
+    When using <function>dblink_send_query</function> and
+    <function>dblink_get_result</function>, <application>dblink</application> fetches the entire
     remote query result before returning any of it to the local query
     processor.  If the query returns a large number of rows, this can result
     in transient memory bloat in the local session.  It may be better to open
-    such a query as a cursor with <function>dblink_open</> and then fetch a
+    such a query as a cursor with <function>dblink_open</function> and then fetch a
     manageable number of rows at a time.  Alternatively, use plain
-    <function>dblink()</>, which avoids memory bloat by spooling large result
+    <function>dblink()</function>, which avoids memory bloat by spooling large result
     sets to disk.
    </para>
   </refsect1>
@@ -1556,7 +1570,7 @@ contrib_regression=# SELECT * FROM dblink_get_result('dtest1') AS t1(f1 int, f2
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-CANCEL-QUERY">
+ <refentry id="contrib-dblink-cancel-query">
   <indexterm>
    <primary>dblink_cancel_query</primary>
   </indexterm>
@@ -1581,13 +1595,13 @@ dblink_cancel_query(text connname) returns text
    <title>Description</title>
 
    <para>
-    <function>dblink_cancel_query</> attempts to cancel any query that
+    <function>dblink_cancel_query</function> attempts to cancel any query that
     is in progress on the named connection.  Note that this is not
     certain to succeed (since, for example, the remote query might
     already have finished).  A cancel request simply improves the
     odds that the query will fail soon.  You must still complete the
     normal query protocol, for example by calling
-    <function>dblink_get_result</>.
+    <function>dblink_get_result</function>.
    </para>
   </refsect1>
 
@@ -1610,7 +1624,7 @@ dblink_cancel_query(text connname) returns text
    <title>Return Value</title>
 
    <para>
-    Returns <literal>OK</> if the cancel request has been sent, or
+    Returns <literal>OK</literal> if the cancel request has been sent, or
     the text of an error message on failure.
    </para>
   </refsect1>
@@ -1624,7 +1638,7 @@ SELECT dblink_cancel_query('dtest1');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-GET-PKEY">
+ <refentry id="contrib-dblink-get-pkey">
   <indexterm>
    <primary>dblink_get_pkey</primary>
   </indexterm>
@@ -1651,7 +1665,7 @@ dblink_get_pkey(text relname) returns setof dblink_pkey_results
    <title>Description</title>
 
    <para>
-    <function>dblink_get_pkey</> provides information about the primary
+    <function>dblink_get_pkey</function> provides information about the primary
     key of a relation in the local database.  This is sometimes useful
     in generating queries to be sent to remote databases.
    </para>
@@ -1665,10 +1679,10 @@ dblink_get_pkey(text relname) returns setof dblink_pkey_results
      <term><parameter>relname</parameter></term>
      <listitem>
       <para>
-       Name of a local relation, for example <literal>foo</> or
-       <literal>myschema.mytab</>.  Include double quotes if the
+       Name of a local relation, for example <literal>foo</literal> or
+       <literal>myschema.mytab</literal>.  Include double quotes if the
        name is mixed-case or contains special characters, for
-       example <literal>"FooBar"</>; without quotes, the string
+       example <literal>"FooBar"</literal>; without quotes, the string
        will be folded to lower case.
       </para>
      </listitem>
@@ -1687,7 +1701,7 @@ dblink_get_pkey(text relname) returns setof dblink_pkey_results
 CREATE TYPE dblink_pkey_results AS (position int, colname text);
 </programlisting>
 
-    The <literal>position</> column simply runs from 1 to <replaceable>N</>;
+    The <literal>position</literal> column simply runs from 1 to <replaceable>N</replaceable>;
     it is the number of the field within the primary key, not the number
     within the table's columns.
    </para>
@@ -1716,7 +1730,7 @@ SELECT * FROM dblink_get_pkey('foobar');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-BUILD-SQL-INSERT">
+ <refentry id="contrib-dblink-build-sql-insert">
   <indexterm>
    <primary>dblink_build_sql_insert</primary>
   </indexterm>
@@ -1748,10 +1762,10 @@ dblink_build_sql_insert(text relname,
    <title>Description</title>
 
    <para>
-    <function>dblink_build_sql_insert</> can be useful in doing selective
+    <function>dblink_build_sql_insert</function> can be useful in doing selective
     replication of a local table to a remote database.  It selects a row
     from the local table based on primary key, and then builds a SQL
-    <command>INSERT</> command that will duplicate that row, but with
+    <command>INSERT</command> command that will duplicate that row, but with
     the primary key values replaced by the values in the last argument.
     (To make an exact copy of the row, just specify the same values for
     the last two arguments.)
@@ -1766,10 +1780,10 @@ dblink_build_sql_insert(text relname,
      <term><parameter>relname</parameter></term>
      <listitem>
       <para>
-       Name of a local relation, for example <literal>foo</> or
-       <literal>myschema.mytab</>.  Include double quotes if the
+       Name of a local relation, for example <literal>foo</literal> or
+       <literal>myschema.mytab</literal>.  Include double quotes if the
        name is mixed-case or contains special characters, for
-       example <literal>"FooBar"</>; without quotes, the string
+       example <literal>"FooBar"</literal>; without quotes, the string
        will be folded to lower case.
       </para>
      </listitem>
@@ -1780,7 +1794,7 @@ dblink_build_sql_insert(text relname,
      <listitem>
       <para>
        Attribute numbers (1-based) of the primary key fields,
-       for example <literal>1 2</>.
+       for example <literal>1 2</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1811,7 +1825,7 @@ dblink_build_sql_insert(text relname,
      <listitem>
       <para>
        Values of the primary key fields to be placed in the resulting
-       <command>INSERT</> command.  Each field is represented in text form.
+       <command>INSERT</command> command.  Each field is represented in text form.
       </para>
      </listitem>
     </varlistentry>
@@ -1828,10 +1842,10 @@ dblink_build_sql_insert(text relname,
    <title>Notes</title>
 
    <para>
-    As of <productname>PostgreSQL</> 9.0, the attribute numbers in
+    As of <productname>PostgreSQL</productname> 9.0, the attribute numbers in
     <parameter>primary_key_attnums</parameter> are interpreted as logical
     column numbers, corresponding to the column's position in
-    <literal>SELECT * FROM relname</>.  Previous versions interpreted the
+    <literal>SELECT * FROM relname</literal>.  Previous versions interpreted the
     numbers as physical column positions.  There is a difference if any
     column(s) to the left of the indicated column have been dropped during
     the lifetime of the table.
@@ -1851,7 +1865,7 @@ SELECT dblink_build_sql_insert('foo', '1 2', 2, '{"1", "a"}', '{"1", "b''a"}');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-BUILD-SQL-DELETE">
+ <refentry id="contrib-dblink-build-sql-delete">
   <indexterm>
    <primary>dblink_build_sql_delete</primary>
   </indexterm>
@@ -1881,9 +1895,9 @@ dblink_build_sql_delete(text relname,
    <title>Description</title>
 
    <para>
-    <function>dblink_build_sql_delete</> can be useful in doing selective
+    <function>dblink_build_sql_delete</function> can be useful in doing selective
     replication of a local table to a remote database.  It builds a SQL
-    <command>DELETE</> command that will delete the row with the given
+    <command>DELETE</command> command that will delete the row with the given
     primary key values.
    </para>
   </refsect1>
@@ -1896,10 +1910,10 @@ dblink_build_sql_delete(text relname,
      <term><parameter>relname</parameter></term>
      <listitem>
       <para>
-       Name of a local relation, for example <literal>foo</> or
-       <literal>myschema.mytab</>.  Include double quotes if the
+       Name of a local relation, for example <literal>foo</literal> or
+       <literal>myschema.mytab</literal>.  Include double quotes if the
        name is mixed-case or contains special characters, for
-       example <literal>"FooBar"</>; without quotes, the string
+       example <literal>"FooBar"</literal>; without quotes, the string
        will be folded to lower case.
       </para>
      </listitem>
@@ -1910,7 +1924,7 @@ dblink_build_sql_delete(text relname,
      <listitem>
       <para>
        Attribute numbers (1-based) of the primary key fields,
-       for example <literal>1 2</>.
+       for example <literal>1 2</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -1929,7 +1943,7 @@ dblink_build_sql_delete(text relname,
      <listitem>
       <para>
        Values of the primary key fields to be used in the resulting
-       <command>DELETE</> command.  Each field is represented in text form.
+       <command>DELETE</command> command.  Each field is represented in text form.
       </para>
      </listitem>
     </varlistentry>
@@ -1946,10 +1960,10 @@ dblink_build_sql_delete(text relname,
    <title>Notes</title>
 
    <para>
-    As of <productname>PostgreSQL</> 9.0, the attribute numbers in
+    As of <productname>PostgreSQL</productname> 9.0, the attribute numbers in
     <parameter>primary_key_attnums</parameter> are interpreted as logical
     column numbers, corresponding to the column's position in
-    <literal>SELECT * FROM relname</>.  Previous versions interpreted the
+    <literal>SELECT * FROM relname</literal>.  Previous versions interpreted the
     numbers as physical column positions.  There is a difference if any
     column(s) to the left of the indicated column have been dropped during
     the lifetime of the table.
@@ -1969,7 +1983,7 @@ SELECT dblink_build_sql_delete('"MyFoo"', '1 2', 2, '{"1", "b"}');
   </refsect1>
  </refentry>
 
- <refentry id="CONTRIB-DBLINK-BUILD-SQL-UPDATE">
+ <refentry id="contrib-dblink-build-sql-update">
   <indexterm>
    <primary>dblink_build_sql_update</primary>
   </indexterm>
@@ -2000,15 +2014,15 @@ dblink_build_sql_update(text relname,
    <title>Description</title>
 
    <para>
-    <function>dblink_build_sql_update</> can be useful in doing selective
+    <function>dblink_build_sql_update</function> can be useful in doing selective
     replication of a local table to a remote database.  It selects a row
     from the local table based on primary key, and then builds a SQL
-    <command>UPDATE</> command that will duplicate that row, but with
+    <command>UPDATE</command> command that will duplicate that row, but with
     the primary key values replaced by the values in the last argument.
     (To make an exact copy of the row, just specify the same values for
-    the last two arguments.)  The <command>UPDATE</> command always assigns
+    the last two arguments.)  The <command>UPDATE</command> command always assigns
     all fields of the row &mdash; the main difference between this and
-    <function>dblink_build_sql_insert</> is that it's assumed that
+    <function>dblink_build_sql_insert</function> is that it's assumed that
     the target row already exists in the remote table.
    </para>
   </refsect1>
@@ -2021,10 +2035,10 @@ dblink_build_sql_update(text relname,
      <term><parameter>relname</parameter></term>
      <listitem>
       <para>
-       Name of a local relation, for example <literal>foo</> or
-       <literal>myschema.mytab</>.  Include double quotes if the
+       Name of a local relation, for example <literal>foo</literal> or
+       <literal>myschema.mytab</literal>.  Include double quotes if the
        name is mixed-case or contains special characters, for
-       example <literal>"FooBar"</>; without quotes, the string
+       example <literal>"FooBar"</literal>; without quotes, the string
        will be folded to lower case.
       </para>
      </listitem>
@@ -2035,7 +2049,7 @@ dblink_build_sql_update(text relname,
      <listitem>
       <para>
        Attribute numbers (1-based) of the primary key fields,
-       for example <literal>1 2</>.
+       for example <literal>1 2</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -2066,7 +2080,7 @@ dblink_build_sql_update(text relname,
      <listitem>
       <para>
        Values of the primary key fields to be placed in the resulting
-       <command>UPDATE</> command.  Each field is represented in text form.
+       <command>UPDATE</command> command.  Each field is represented in text form.
       </para>
      </listitem>
     </varlistentry>
@@ -2083,10 +2097,10 @@ dblink_build_sql_update(text relname,
    <title>Notes</title>
 
    <para>
-    As of <productname>PostgreSQL</> 9.0, the attribute numbers in
+    As of <productname>PostgreSQL</productname> 9.0, the attribute numbers in
     <parameter>primary_key_attnums</parameter> are interpreted as logical
     column numbers, corresponding to the column's position in
-    <literal>SELECT * FROM relname</>.  Previous versions interpreted the
+    <literal>SELECT * FROM relname</literal>.  Previous versions interpreted the
     numbers as physical column positions.  There is a difference if any
     column(s) to the left of the indicated column have been dropped during
     the lifetime of the table.
diff --git a/doc/src/sgml/ddl.sgml b/doc/src/sgml/ddl.sgml
index b05a9c2150..2b879ead4b 100644
--- a/doc/src/sgml/ddl.sgml
+++ b/doc/src/sgml/ddl.sgml
@@ -39,7 +39,7 @@
    SQL does not make any guarantees about the order of the rows in a
    table.  When a table is read, the rows will appear in an unspecified order,
    unless sorting is explicitly requested.  This is covered in <xref
-   linkend="queries">.  Furthermore, SQL does not assign unique
+   linkend="queries"/>.  Furthermore, SQL does not assign unique
    identifiers to rows, so it is possible to have several completely
    identical rows in a table.  This is a consequence of the
    mathematical model that underlies SQL but is usually not desirable.
@@ -64,7 +64,7 @@
    built-in data types that fit many applications.  Users can also
    define their own data types.  Most built-in data types have obvious
    names and semantics, so we defer a detailed explanation to <xref
-   linkend="datatype">.  Some of the frequently used data types are
+   linkend="datatype"/>.  Some of the frequently used data types are
    <type>integer</type> for whole numbers, <type>numeric</type> for
    possibly fractional numbers, <type>text</type> for character
    strings, <type>date</type> for dates, <type>time</type> for
@@ -79,7 +79,7 @@
 
   <para>
    To create a table, you use the aptly named <xref
-   linkend="sql-createtable"> command.
+   linkend="sql-createtable"/> command.
    In this command you specify at least a name for the new table, the
    names of the columns and the data type of each column.  For
    example:
@@ -95,7 +95,7 @@ CREATE TABLE my_first_table (
    <type>text</type>; the second column has the name
    <literal>second_column</literal> and the type <type>integer</type>.
    The table and column names follow the identifier syntax explained
-   in <xref linkend="sql-syntax-identifiers">.  The type names are
+   in <xref linkend="sql-syntax-identifiers"/>.  The type names are
    usually also identifiers, but there are some exceptions.  Note that the
    column list is comma-separated and surrounded by parentheses.
   </para>
@@ -139,7 +139,7 @@ CREATE TABLE products (
 
   <para>
    If you no longer need a table, you can remove it using the <xref
-   linkend="sql-droptable"> command.
+   linkend="sql-droptable"/> command.
    For example:
 <programlisting>
 DROP TABLE my_first_table;
@@ -149,13 +149,13 @@ DROP TABLE products;
    Nevertheless, it is common in SQL script files to unconditionally
    try to drop each table before creating it, ignoring any error
    messages, so that the script works whether or not the table exists.
-   (If you like, you can use the <literal>DROP TABLE IF EXISTS</> variant
+   (If you like, you can use the <literal>DROP TABLE IF EXISTS</literal> variant
    to avoid the error messages, but this is not standard SQL.)
   </para>
 
   <para>
    If you need to modify a table that already exists, see <xref
-   linkend="ddl-alter"> later in this chapter.
+   linkend="ddl-alter"/> later in this chapter.
   </para>
 
   <para>
@@ -163,7 +163,7 @@ DROP TABLE products;
    tables.  The remainder of this chapter is concerned with adding
    features to the table definition to ensure data integrity,
    security, or convenience.  If you are eager to fill your tables with
-   data now you can skip ahead to <xref linkend="dml"> and read the
+   data now you can skip ahead to <xref linkend="dml"/> and read the
    rest of this chapter later.
   </para>
  </sect1>
@@ -181,7 +181,7 @@ DROP TABLE products;
    columns will be filled with their respective default values.  A
    data manipulation command can also request explicitly that a column
    be set to its default value, without having to know what that value is.
-   (Details about data manipulation commands are in <xref linkend="dml">.)
+   (Details about data manipulation commands are in <xref linkend="dml"/>.)
   </para>
 
   <para>
@@ -207,9 +207,9 @@ CREATE TABLE products (
    The default value can be an expression, which will be
    evaluated whenever the default value is inserted
    (<emphasis>not</emphasis> when the table is created).  A common example
-   is for a <type>timestamp</type> column to have a default of <literal>CURRENT_TIMESTAMP</>,
+   is for a <type>timestamp</type> column to have a default of <literal>CURRENT_TIMESTAMP</literal>,
    so that it gets set to the time of row insertion.  Another common
-   example is generating a <quote>serial number</> for each row.
+   example is generating a <quote>serial number</quote> for each row.
    In <productname>PostgreSQL</productname> this is typically done by
    something like:
 <programlisting>
@@ -218,9 +218,9 @@ CREATE TABLE products (
     ...
 );
 </programlisting>
-   where the <literal>nextval()</> function supplies successive values
-   from a <firstterm>sequence object</> (see <xref
-   linkend="functions-sequence">). This arrangement is sufficiently common
+   where the <literal>nextval()</literal> function supplies successive values
+   from a <firstterm>sequence object</firstterm> (see <xref
+   linkend="functions-sequence"/>). This arrangement is sufficiently common
    that there's a special shorthand for it:
 <programlisting>
 CREATE TABLE products (
@@ -228,8 +228,8 @@ CREATE TABLE products (
     ...
 );
 </programlisting>
-   The <literal>SERIAL</> shorthand is discussed further in <xref
-   linkend="datatype-serial">.
+   The <literal>SERIAL</literal> shorthand is discussed further in <xref
+   linkend="datatype-serial"/>.
   </para>
  </sect1>
 
@@ -385,7 +385,7 @@ CREATE TABLE products (
     CHECK (price &gt; 0),
     discounted_price numeric,
     CHECK (discounted_price &gt; 0),
-    <emphasis>CONSTRAINT valid_discount</> CHECK (price &gt; discounted_price)
+    <emphasis>CONSTRAINT valid_discount</emphasis> CHECK (price &gt; discounted_price)
 );
 </programlisting>
    </para>
@@ -623,7 +623,7 @@ CREATE TABLE example (
    <para>
     Adding a primary key will automatically create a unique B-tree index
     on the column or group of columns listed in the primary key, and will
-    force the column(s) to be marked <literal>NOT NULL</>.
+    force the column(s) to be marked <literal>NOT NULL</literal>.
    </para>
 
    <para>
@@ -828,7 +828,7 @@ CREATE TABLE order_items (
     (The essential difference between these two choices is that
     <literal>NO ACTION</literal> allows the check to be deferred until
     later in the transaction, whereas <literal>RESTRICT</literal> does not.)
-    <literal>CASCADE</> specifies that when a referenced row is deleted,
+    <literal>CASCADE</literal> specifies that when a referenced row is deleted,
     row(s) referencing it should be automatically deleted as well.
     There are two other options:
     <literal>SET NULL</literal> and <literal>SET DEFAULT</literal>.
@@ -845,19 +845,19 @@ CREATE TABLE order_items (
     Analogous to <literal>ON DELETE</literal> there is also
     <literal>ON UPDATE</literal> which is invoked when a referenced
     column is changed (updated).  The possible actions are the same.
-    In this case, <literal>CASCADE</> means that the updated values of the
+    In this case, <literal>CASCADE</literal> means that the updated values of the
     referenced column(s) should be copied into the referencing row(s).
    </para>
 
    <para>
     Normally, a referencing row need not satisfy the foreign key constraint
-    if any of its referencing columns are null.  If <literal>MATCH FULL</>
+    if any of its referencing columns are null.  If <literal>MATCH FULL</literal>
     is added to the foreign key declaration, a referencing row escapes
     satisfying the constraint only if all its referencing columns are null
     (so a mix of null and non-null values is guaranteed to fail a
-    <literal>MATCH FULL</> constraint).  If you don't want referencing rows
+    <literal>MATCH FULL</literal> constraint).  If you don't want referencing rows
     to be able to avoid satisfying the foreign key constraint, declare the
-    referencing column(s) as <literal>NOT NULL</>.
+    referencing column(s) as <literal>NOT NULL</literal>.
    </para>
 
    <para>
@@ -876,9 +876,9 @@ CREATE TABLE order_items (
 
    <para>
     More information about updating and deleting data is in <xref
-    linkend="dml">.  Also see the description of foreign key constraint
+    linkend="dml"/>.  Also see the description of foreign key constraint
     syntax in the reference documentation for
-    <xref linkend="sql-createtable">.
+    <xref linkend="sql-createtable"/>.
    </para>
   </sect2>
 
@@ -908,8 +908,8 @@ CREATE TABLE circles (
    </para>
 
    <para>
-    See also <link linkend="SQL-CREATETABLE-EXCLUDE"><command>CREATE
-    TABLE ... CONSTRAINT ... EXCLUDE</></link> for details.
+    See also <link linkend="sql-createtable-exclude"><command>CREATE
+    TABLE ... CONSTRAINT ... EXCLUDE</command></link> for details.
    </para>
 
    <para>
@@ -923,7 +923,7 @@ CREATE TABLE circles (
   <title>System Columns</title>
 
   <para>
-   Every table has several <firstterm>system columns</> that are
+   Every table has several <firstterm>system columns</firstterm> that are
    implicitly defined by the system.  Therefore, these names cannot be
    used as names of user-defined columns.  (Note that these
    restrictions are separate from whether the name is a key word or
@@ -939,7 +939,7 @@ CREATE TABLE circles (
 
   <variablelist>
    <varlistentry>
-    <term><structfield>oid</></term>
+    <term><structfield>oid</structfield></term>
     <listitem>
      <para>
       <indexterm>
@@ -948,16 +948,16 @@ CREATE TABLE circles (
       </indexterm>
       The object identifier (object ID) of a row. This column is only
       present if the table was created using <literal>WITH
-      OIDS</literal>, or if the <xref linkend="guc-default-with-oids">
+      OIDS</literal>, or if the <xref linkend="guc-default-with-oids"/>
       configuration variable was set at the time. This column is of type
       <type>oid</type> (same name as the column); see <xref
-      linkend="datatype-oid"> for more information about the type.
+      linkend="datatype-oid"/> for more information about the type.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>tableoid</></term>
+    <term><structfield>tableoid</structfield></term>
     <listitem>
      <indexterm>
       <primary>tableoid</primary>
@@ -966,7 +966,7 @@ CREATE TABLE circles (
      <para>
       The OID of the table containing this row.  This column is
       particularly handy for queries that select from inheritance
-      hierarchies (see <xref linkend="ddl-inherit">), since without it,
+      hierarchies (see <xref linkend="ddl-inherit"/>), since without it,
       it's difficult to tell which individual table a row came from.  The
       <structfield>tableoid</structfield> can be joined against the
       <structfield>oid</structfield> column of
@@ -976,7 +976,7 @@ CREATE TABLE circles (
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>xmin</></term>
+    <term><structfield>xmin</structfield></term>
     <listitem>
      <indexterm>
       <primary>xmin</primary>
@@ -992,7 +992,7 @@ CREATE TABLE circles (
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>cmin</></term>
+    <term><structfield>cmin</structfield></term>
     <listitem>
      <indexterm>
       <primary>cmin</primary>
@@ -1006,7 +1006,7 @@ CREATE TABLE circles (
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>xmax</></term>
+    <term><structfield>xmax</structfield></term>
     <listitem>
      <indexterm>
       <primary>xmax</primary>
@@ -1023,7 +1023,7 @@ CREATE TABLE circles (
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>cmax</></term>
+    <term><structfield>cmax</structfield></term>
     <listitem>
      <indexterm>
       <primary>cmax</primary>
@@ -1036,7 +1036,7 @@ CREATE TABLE circles (
    </varlistentry>
 
    <varlistentry>
-    <term><structfield>ctid</></term>
+    <term><structfield>ctid</structfield></term>
     <listitem>
      <indexterm>
       <primary>ctid</primary>
@@ -1047,7 +1047,7 @@ CREATE TABLE circles (
       although the <structfield>ctid</structfield> can be used to
       locate the row version very quickly, a row's
       <structfield>ctid</structfield> will change if it is
-      updated or moved by <command>VACUUM FULL</>.  Therefore
+      updated or moved by <command>VACUUM FULL</command>.  Therefore
       <structfield>ctid</structfield> is useless as a long-term row
       identifier.  The OID, or even better a user-defined serial
       number, should be used to identify logical rows.
@@ -1074,7 +1074,7 @@ CREATE TABLE circles (
        a unique constraint (or unique index) exists, the system takes
        care not to generate an OID matching an already-existing row.
        (Of course, this is only possible if the table contains fewer
-       than 2<superscript>32</> (4 billion) rows, and in practice the
+       than 2<superscript>32</superscript> (4 billion) rows, and in practice the
        table size had better be much less than that, or performance
        might suffer.)
       </para>
@@ -1082,7 +1082,7 @@ CREATE TABLE circles (
      <listitem>
       <para>
        OIDs should never be assumed to be unique across tables; use
-       the combination of <structfield>tableoid</> and row OID if you
+       the combination of <structfield>tableoid</structfield> and row OID if you
        need a database-wide identifier.
       </para>
      </listitem>
@@ -1090,7 +1090,7 @@ CREATE TABLE circles (
       <para>
        Of course, the tables in question must be created <literal>WITH
        OIDS</literal>.  As of <productname>PostgreSQL</productname> 8.1,
-       <literal>WITHOUT OIDS</> is the default.
+       <literal>WITHOUT OIDS</literal> is the default.
       </para>
      </listitem>
     </itemizedlist>
@@ -1100,14 +1100,14 @@ CREATE TABLE circles (
     Transaction identifiers are also 32-bit quantities.  In a
     long-lived database it is possible for transaction IDs to wrap
     around.  This is not a fatal problem given appropriate maintenance
-    procedures; see <xref linkend="maintenance"> for details.  It is
+    procedures; see <xref linkend="maintenance"/> for details.  It is
     unwise, however, to depend on the uniqueness of transaction IDs
     over the long term (more than one billion transactions).
    </para>
 
    <para>
     Command identifiers are also 32-bit quantities.  This creates a hard limit
-    of 2<superscript>32</> (4 billion) <acronym>SQL</acronym> commands
+    of 2<superscript>32</superscript> (4 billion) <acronym>SQL</acronym> commands
     within a single transaction.  In practice this limit is not a
     problem &mdash; note that the limit is on the number of
     <acronym>SQL</acronym> commands, not the number of rows processed.
@@ -1167,7 +1167,7 @@ CREATE TABLE circles (
    </itemizedlist>
 
    All these actions are performed using the
-   <xref linkend="sql-altertable">
+   <xref linkend="sql-altertable"/>
    command, whose reference page contains details beyond those given
    here.
   </para>
@@ -1186,7 +1186,7 @@ CREATE TABLE circles (
 ALTER TABLE products ADD COLUMN description text;
 </programlisting>
     The new column is initially filled with whatever default
-    value is given (null if you don't specify a <literal>DEFAULT</> clause).
+    value is given (null if you don't specify a <literal>DEFAULT</literal> clause).
    </para>
 
    <para>
@@ -1196,9 +1196,9 @@ ALTER TABLE products ADD COLUMN description text;
 ALTER TABLE products ADD COLUMN description text CHECK (description &lt;&gt; '');
 </programlisting>
     In fact all the options that can be applied to a column description
-    in <command>CREATE TABLE</> can be used here.  Keep in mind however
+    in <command>CREATE TABLE</command> can be used here.  Keep in mind however
     that the default value must satisfy the given constraints, or the
-    <literal>ADD</> will fail.  Alternatively, you can add
+    <literal>ADD</literal> will fail.  Alternatively, you can add
     constraints later (see below) after you've filled in the new column
     correctly.
    </para>
@@ -1210,7 +1210,7 @@ ALTER TABLE products ADD COLUMN description text CHECK (description &lt;&gt; '')
     specified, <productname>PostgreSQL</productname> is able to avoid
     the physical update.  So if you intend to fill the column with
     mostly nondefault values, it's best to add the column with no default,
-    insert the correct values using <command>UPDATE</>, and then add any
+    insert the correct values using <command>UPDATE</command>, and then add any
     desired default as described below.
    </para>
   </tip>
@@ -1234,11 +1234,11 @@ ALTER TABLE products DROP COLUMN description;
     foreign key constraint of another table,
     <productname>PostgreSQL</productname> will not silently drop that
     constraint.  You can authorize dropping everything that depends on
-    the column by adding <literal>CASCADE</>:
+    the column by adding <literal>CASCADE</literal>:
 <programlisting>
 ALTER TABLE products DROP COLUMN description CASCADE;
 </programlisting>
-    See <xref linkend="ddl-depend"> for a description of the general
+    See <xref linkend="ddl-depend"/> for a description of the general
     mechanism behind this.
    </para>
   </sect2>
@@ -1290,13 +1290,13 @@ ALTER TABLE products ALTER COLUMN product_no SET NOT NULL;
 <programlisting>
 ALTER TABLE products DROP CONSTRAINT some_name;
 </programlisting>
-    (If you are dealing with a generated constraint name like <literal>$2</>,
+    (If you are dealing with a generated constraint name like <literal>$2</literal>,
     don't forget that you'll need to double-quote it to make it a valid
     identifier.)
    </para>
 
    <para>
-    As with dropping a column, you need to add <literal>CASCADE</> if you
+    As with dropping a column, you need to add <literal>CASCADE</literal> if you
     want to drop a constraint that something else depends on.  An example
     is that a foreign key constraint depends on a unique or primary key
     constraint on the referenced column(s).
@@ -1326,7 +1326,7 @@ ALTER TABLE products ALTER COLUMN product_no DROP NOT NULL;
 ALTER TABLE products ALTER COLUMN price SET DEFAULT 7.77;
 </programlisting>
     Note that this doesn't affect any existing rows in the table, it
-    just changes the default for future <command>INSERT</> commands.
+    just changes the default for future <command>INSERT</command> commands.
    </para>
 
    <para>
@@ -1356,12 +1356,12 @@ ALTER TABLE products ALTER COLUMN price TYPE numeric(10,2);
 </programlisting>
     This will succeed only if each existing entry in the column can be
     converted to the new type by an implicit cast.  If a more complex
-    conversion is needed, you can add a <literal>USING</> clause that
+    conversion is needed, you can add a <literal>USING</literal> clause that
     specifies how to compute the new values from the old.
    </para>
 
    <para>
-    <productname>PostgreSQL</> will attempt to convert the column's
+    <productname>PostgreSQL</productname> will attempt to convert the column's
     default value (if any) to the new type, as well as any constraints
     that involve the column.  But these conversions might fail, or might
     produce surprising results.  It's often best to drop any constraints
@@ -1437,16 +1437,16 @@ ALTER TABLE products RENAME TO items;
   </para>
 
   <para>
-   There are different kinds of privileges: <literal>SELECT</>,
-   <literal>INSERT</>, <literal>UPDATE</>, <literal>DELETE</>,
-   <literal>TRUNCATE</>, <literal>REFERENCES</>, <literal>TRIGGER</>,
-   <literal>CREATE</>, <literal>CONNECT</>, <literal>TEMPORARY</>,
-   <literal>EXECUTE</>, and <literal>USAGE</>.
+   There are different kinds of privileges: <literal>SELECT</literal>,
+   <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>,
+   <literal>TRUNCATE</literal>, <literal>REFERENCES</literal>, <literal>TRIGGER</literal>,
+   <literal>CREATE</literal>, <literal>CONNECT</literal>, <literal>TEMPORARY</literal>,
+   <literal>EXECUTE</literal>, and <literal>USAGE</literal>.
    The privileges applicable to a particular
    object vary depending on the object's type (table, function, etc).
    For complete information on the different types of privileges
    supported by <productname>PostgreSQL</productname>, refer to the
-   <xref linkend="sql-grant"> reference
+   <xref linkend="sql-grant"/> reference
    page.  The following sections and chapters will also show you how
    those privileges are used.
   </para>
@@ -1459,7 +1459,7 @@ ALTER TABLE products RENAME TO items;
   <para>
    An object can be assigned to a new owner with an <command>ALTER</command>
    command of the appropriate kind for the object, e.g. <xref
-   linkend="sql-altertable">.  Superusers can always do
+   linkend="sql-altertable"/>.  Superusers can always do
    this; ordinary roles can only do it if they are both the current owner
    of the object (or a member of the owning role) and a member of the new
    owning role.
@@ -1480,9 +1480,9 @@ GRANT UPDATE ON accounts TO joe;
   <para>
    The special <quote>role</quote> name <literal>PUBLIC</literal> can
    be used to grant a privilege to every role on the system.  Also,
-   <quote>group</> roles can be set up to help manage privileges when
+   <quote>group</quote> roles can be set up to help manage privileges when
    there are many users of a database &mdash; for details see
-   <xref linkend="user-manag">.
+   <xref linkend="user-manag"/>.
   </para>
 
   <para>
@@ -1492,7 +1492,7 @@ GRANT UPDATE ON accounts TO joe;
 REVOKE ALL ON accounts FROM PUBLIC;
 </programlisting>
    The special privileges of the object owner (i.e., the right to do
-   <command>DROP</>, <command>GRANT</>, <command>REVOKE</>, etc.)
+   <command>DROP</command>, <command>GRANT</command>, <command>REVOKE</command>, etc.)
    are always implicit in being the owner,
    and cannot be granted or revoked.  But the object owner can choose
    to revoke their own ordinary privileges, for example to make a
@@ -1502,12 +1502,12 @@ REVOKE ALL ON accounts FROM PUBLIC;
   <para>
    Ordinarily, only the object's owner (or a superuser) can grant or
    revoke privileges on an object.  However, it is possible to grant a
-   privilege <quote>with grant option</>, which gives the recipient
+   privilege <quote>with grant option</quote>, which gives the recipient
    the right to grant it in turn to others.  If the grant option is
    subsequently revoked then all who received the privilege from that
    recipient (directly or through a chain of grants) will lose the
-   privilege.  For details see the <xref linkend="sql-grant"> and
-   <xref linkend="sql-revoke"> reference pages.
+   privilege.  For details see the <xref linkend="sql-grant"/> and
+   <xref linkend="sql-revoke"/> reference pages.
   </para>
  </sect1>
 
@@ -1524,11 +1524,11 @@ REVOKE ALL ON accounts FROM PUBLIC;
 
   <para>
    In addition to the SQL-standard <link linkend="ddl-priv">privilege
-   system</link> available through <xref linkend="sql-grant">,
-   tables can have <firstterm>row security policies</> that restrict,
+   system</link> available through <xref linkend="sql-grant"/>,
+   tables can have <firstterm>row security policies</firstterm> that restrict,
    on a per-user basis, which rows can be returned by normal queries
    or inserted, updated, or deleted by data modification commands.
-   This feature is also known as <firstterm>Row-Level Security</>.
+   This feature is also known as <firstterm>Row-Level Security</firstterm>.
    By default, tables do not have any policies, so that if a user has
    access privileges to a table according to the SQL privilege system,
    all rows within it are equally available for querying or updating.
@@ -1537,20 +1537,20 @@ REVOKE ALL ON accounts FROM PUBLIC;
   <para>
    When row security is enabled on a table (with
    <link linkend="sql-altertable">ALTER TABLE ... ENABLE ROW LEVEL
-   SECURITY</>), all normal access to the table for selecting rows or
+   SECURITY</link>), all normal access to the table for selecting rows or
    modifying rows must be allowed by a row security policy.  (However, the
    table's owner is typically not subject to row security policies.)  If no
    policy exists for the table, a default-deny policy is used, meaning that
    no rows are visible or can be modified.  Operations that apply to the
-   whole table, such as <command>TRUNCATE</> and <literal>REFERENCES</>,
+   whole table, such as <command>TRUNCATE</command> and <literal>REFERENCES</literal>,
    are not subject to row security.
   </para>
 
   <para>
    Row security policies can be specific to commands, or to roles, or to
    both.  A policy can be specified to apply to <literal>ALL</literal>
-   commands, or to <literal>SELECT</>, <literal>INSERT</>, <literal>UPDATE</>,
-   or <literal>DELETE</>.  Multiple roles can be assigned to a given
+   commands, or to <literal>SELECT</literal>, <literal>INSERT</literal>, <literal>UPDATE</literal>,
+   or <literal>DELETE</literal>.  Multiple roles can be assigned to a given
    policy, and normal role membership and inheritance rules apply.
   </para>
 
@@ -1562,7 +1562,7 @@ REVOKE ALL ON accounts FROM PUBLIC;
    rule are <literal>leakproof</literal> functions, which are guaranteed to
    not leak information; the optimizer may choose to apply such functions
    ahead of the row-security check.)  Rows for which the expression does
-   not return <literal>true</> will not be processed.  Separate expressions
+   not return <literal>true</literal> will not be processed.  Separate expressions
    may be specified to provide independent control over the rows which are
    visible and the rows which are allowed to be modified.  Policy
    expressions are run as part of the query and with the privileges of the
@@ -1571,11 +1571,11 @@ REVOKE ALL ON accounts FROM PUBLIC;
   </para>
 
   <para>
-   Superusers and roles with the <literal>BYPASSRLS</> attribute always
+   Superusers and roles with the <literal>BYPASSRLS</literal> attribute always
    bypass the row security system when accessing a table.  Table owners
    normally bypass row security as well, though a table owner can choose to
    be subject to row security with <link linkend="sql-altertable">ALTER
-   TABLE ... FORCE ROW LEVEL SECURITY</>.
+   TABLE ... FORCE ROW LEVEL SECURITY</link>.
   </para>
 
   <para>
@@ -1584,11 +1584,11 @@ REVOKE ALL ON accounts FROM PUBLIC;
   </para>
 
   <para>
-   Policies are created using the <xref linkend="sql-createpolicy">
-   command, altered using the <xref linkend="sql-alterpolicy"> command,
-   and dropped using the <xref linkend="sql-droppolicy"> command.  To
+   Policies are created using the <xref linkend="sql-createpolicy"/>
+   command, altered using the <xref linkend="sql-alterpolicy"/> command,
+   and dropped using the <xref linkend="sql-droppolicy"/> command.  To
    enable and disable row security for a given table, use the
-   <xref linkend="sql-altertable"> command.
+   <xref linkend="sql-altertable"/> command.
   </para>
 
   <para>
@@ -1609,8 +1609,8 @@ REVOKE ALL ON accounts FROM PUBLIC;
 
   <para>
    As a simple example, here is how to create a policy on
-   the <literal>account</> relation to allow only members of
-   the <literal>managers</> role to access rows, and only rows of their
+   the <literal>account</literal> relation to allow only members of
+   the <literal>managers</literal> role to access rows, and only rows of their
    accounts:
   </para>
 
@@ -1627,7 +1627,7 @@ CREATE POLICY account_managers ON accounts TO managers
    If no role is specified, or the special user name
    <literal>PUBLIC</literal> is used, then the policy applies to all
    users on the system.  To allow all users to access their own row in
-   a <literal>users</> table, a simple policy can be used:
+   a <literal>users</literal> table, a simple policy can be used:
   </para>
 
 <programlisting>
@@ -1637,9 +1637,9 @@ CREATE POLICY user_policy ON users
 
   <para>
    To use a different policy for rows that are being added to the table
-   compared to those rows that are visible, the <literal>WITH CHECK</>
+   compared to those rows that are visible, the <literal>WITH CHECK</literal>
    clause can be used.  This policy would allow all users to view all rows
-   in the <literal>users</> table, but only modify their own:
+   in the <literal>users</literal> table, but only modify their own:
   </para>
 
 <programlisting>
@@ -1649,7 +1649,7 @@ CREATE POLICY user_policy ON users
 </programlisting>
 
   <para>
-   Row security can also be disabled with the <command>ALTER TABLE</>
+   Row security can also be disabled with the <command>ALTER TABLE</command>
    command.  Disabling row security does not remove any policies that are
    defined on the table; they are simply ignored.  Then all rows in the
    table are visible and modifiable, subject to the standard SQL privileges
@@ -1658,7 +1658,7 @@ CREATE POLICY user_policy ON users
 
   <para>
    Below is a larger example of how this feature can be used in production
-   environments.  The table <literal>passwd</> emulates a Unix password
+   environments.  The table <literal>passwd</literal> emulates a Unix password
    file:
   </para>
 
@@ -1820,7 +1820,7 @@ UPDATE 0
    Referential integrity checks, such as unique or primary key constraints
    and foreign key references, always bypass row security to ensure that
    data integrity is maintained.  Care must be taken when developing
-   schemas and row level policies to avoid <quote>covert channel</> leaks of
+   schemas and row level policies to avoid <quote>covert channel</quote> leaks of
    information through such referential integrity checks.
   </para>
 
@@ -1829,8 +1829,8 @@ UPDATE 0
    not being applied.  For example, when taking a backup, it could be
    disastrous if row security silently caused some rows to be omitted
    from the backup.  In such a situation, you can set the
-   <xref linkend="guc-row-security"> configuration parameter
-   to <literal>off</>.  This does not in itself bypass row security;
+   <xref linkend="guc-row-security"/> configuration parameter
+   to <literal>off</literal>.  This does not in itself bypass row security;
    what it does is throw an error if any query's results would get filtered
    by a policy.  The reason for the error can then be investigated and
    fixed.
@@ -1842,7 +1842,7 @@ UPDATE 0
    best-performing case; when possible, it's best to design row security
    applications to work this way.  If it is necessary to consult other rows
    or other tables to make a policy decision, that can be accomplished using
-   sub-<command>SELECT</>s, or functions that contain <command>SELECT</>s,
+   sub-<command>SELECT</command>s, or functions that contain <command>SELECT</command>s,
    in the policy expressions.  Be aware however that such accesses can
    create race conditions that could allow information leakage if care is
    not taken.  As an example, consider the following table design:
@@ -1896,8 +1896,8 @@ GRANT ALL ON information TO public;
 </programlisting>
 
   <para>
-   Now suppose that <literal>alice</> wishes to change the <quote>slightly
-   secret</> information, but decides that <literal>mallory</> should not
+   Now suppose that <literal>alice</literal> wishes to change the <quote>slightly
+   secret</quote> information, but decides that <literal>mallory</literal> should not
    be trusted with the new content of that row, so she does:
   </para>
 
@@ -1909,36 +1909,36 @@ COMMIT;
 </programlisting>
 
   <para>
-   That looks safe; there is no window wherein <literal>mallory</> should be
-   able to see the <quote>secret from mallory</> string.  However, there is
-   a race condition here.  If <literal>mallory</> is concurrently doing,
+   That looks safe; there is no window wherein <literal>mallory</literal> should be
+   able to see the <quote>secret from mallory</quote> string.  However, there is
+   a race condition here.  If <literal>mallory</literal> is concurrently doing,
    say,
 <programlisting>
 SELECT * FROM information WHERE group_id = 2 FOR UPDATE;
 </programlisting>
-   and her transaction is in <literal>READ COMMITTED</> mode, it is possible
-   for her to see <quote>secret from mallory</>.  That happens if her
-   transaction reaches the <structname>information</> row just
-   after <literal>alice</>'s does.  It blocks waiting
-   for <literal>alice</>'s transaction to commit, then fetches the updated
-   row contents thanks to the <literal>FOR UPDATE</> clause.  However, it
-   does <emphasis>not</> fetch an updated row for the
-   implicit <command>SELECT</> from <structname>users</>, because that
-   sub-<command>SELECT</> did not have <literal>FOR UPDATE</>; instead
-   the <structname>users</> row is read with the snapshot taken at the start
+   and her transaction is in <literal>READ COMMITTED</literal> mode, it is possible
+   for her to see <quote>secret from mallory</quote>.  That happens if her
+   transaction reaches the <structname>information</structname> row just
+   after <literal>alice</literal>'s does.  It blocks waiting
+   for <literal>alice</literal>'s transaction to commit, then fetches the updated
+   row contents thanks to the <literal>FOR UPDATE</literal> clause.  However, it
+   does <emphasis>not</emphasis> fetch an updated row for the
+   implicit <command>SELECT</command> from <structname>users</structname>, because that
+   sub-<command>SELECT</command> did not have <literal>FOR UPDATE</literal>; instead
+   the <structname>users</structname> row is read with the snapshot taken at the start
    of the query.  Therefore, the policy expression tests the old value
-   of <literal>mallory</>'s privilege level and allows her to see the
+   of <literal>mallory</literal>'s privilege level and allows her to see the
    updated row.
   </para>
 
   <para>
    There are several ways around this problem.  One simple answer is to use
-   <literal>SELECT ... FOR SHARE</> in sub-<command>SELECT</>s in row
-   security policies.  However, that requires granting <literal>UPDATE</>
-   privilege on the referenced table (here <structname>users</>) to the
+   <literal>SELECT ... FOR SHARE</literal> in sub-<command>SELECT</command>s in row
+   security policies.  However, that requires granting <literal>UPDATE</literal>
+   privilege on the referenced table (here <structname>users</structname>) to the
    affected users, which might be undesirable.  (But another row security
    policy could be applied to prevent them from actually exercising that
-   privilege; or the sub-<command>SELECT</> could be embedded into a security
+   privilege; or the sub-<command>SELECT</command> could be embedded into a security
    definer function.)  Also, heavy concurrent use of row share locks on the
    referenced table could pose a performance problem, especially if updates
    of it are frequent.  Another solution, practical if updates of the
@@ -1951,8 +1951,8 @@ SELECT * FROM information WHERE group_id = 2 FOR UPDATE;
   </para>
 
   <para>
-   For additional details see <xref linkend="sql-createpolicy">
-   and <xref linkend="sql-altertable">.
+   For additional details see <xref linkend="sql-createpolicy"/>
+   and <xref linkend="sql-altertable"/>.
   </para>
 
  </sect1>
@@ -1977,19 +1977,19 @@ SELECT * FROM information WHERE group_id = 2 FOR UPDATE;
    <para>
     Users of a cluster do not necessarily have the privilege to access every
     database in the cluster.  Sharing of user names means that there
-    cannot be different users named, say, <literal>joe</> in two databases
+    cannot be different users named, say, <literal>joe</literal> in two databases
     in the same cluster; but the system can be configured to allow
-    <literal>joe</> access to only some of the databases.
+    <literal>joe</literal> access to only some of the databases.
    </para>
   </note>
 
   <para>
-   A database contains one or more named <firstterm>schemas</>, which
+   A database contains one or more named <firstterm>schemas</firstterm>, which
    in turn contain tables.  Schemas also contain other kinds of named
    objects, including data types, functions, and operators.  The same
    object name can be used in different schemas without conflict; for
-   example, both <literal>schema1</> and <literal>myschema</> can
-   contain tables named <literal>mytable</>.  Unlike databases,
+   example, both <literal>schema1</literal> and <literal>myschema</literal> can
+   contain tables named <literal>mytable</literal>.  Unlike databases,
    schemas are not rigidly separated: a user can access objects in any
    of the schemas in the database they are connected to, if they have
    privileges to do so.
@@ -2034,7 +2034,7 @@ SELECT * FROM information WHERE group_id = 2 FOR UPDATE;
    </indexterm>
 
    <para>
-    To create a schema, use the <xref linkend="sql-createschema">
+    To create a schema, use the <xref linkend="sql-createschema"/>
     command.  Give the schema a name
     of your choice.  For example:
 <programlisting>
@@ -2053,10 +2053,10 @@ CREATE SCHEMA myschema;
 
    <para>
     To create or access objects in a schema, write a
-    <firstterm>qualified name</> consisting of the schema name and
+    <firstterm>qualified name</firstterm> consisting of the schema name and
     table name separated by a dot:
 <synopsis>
-<replaceable>schema</><literal>.</><replaceable>table</>
+<replaceable>schema</replaceable><literal>.</literal><replaceable>table</replaceable>
 </synopsis>
     This works anywhere a table name is expected, including the table
     modification commands and the data access commands discussed in
@@ -2068,10 +2068,10 @@ CREATE SCHEMA myschema;
    <para>
     Actually, the even more general syntax
 <synopsis>
-<replaceable>database</><literal>.</><replaceable>schema</><literal>.</><replaceable>table</>
+<replaceable>database</replaceable><literal>.</literal><replaceable>schema</replaceable><literal>.</literal><replaceable>table</replaceable>
 </synopsis>
     can be used too, but at present this is just for <foreignphrase>pro
-    forma</> compliance with the SQL standard.  If you write a database name,
+    forma</foreignphrase> compliance with the SQL standard.  If you write a database name,
     it must be the same as the database you are connected to.
    </para>
 
@@ -2099,7 +2099,7 @@ DROP SCHEMA myschema;
 <programlisting>
 DROP SCHEMA myschema CASCADE;
 </programlisting>
-    See <xref linkend="ddl-depend"> for a description of the general
+    See <xref linkend="ddl-depend"/> for a description of the general
     mechanism behind this.
    </para>
 
@@ -2112,11 +2112,11 @@ CREATE SCHEMA <replaceable>schema_name</replaceable> AUTHORIZATION <replaceable>
 </programlisting>
     You can even omit the schema name, in which case the schema name
     will be the same as the user name.  See <xref
-    linkend="ddl-schemas-patterns"> for how this can be useful.
+    linkend="ddl-schemas-patterns"/> for how this can be useful.
    </para>
 
    <para>
-    Schema names beginning with <literal>pg_</> are reserved for
+    Schema names beginning with <literal>pg_</literal> are reserved for
     system purposes and cannot be created by users.
    </para>
   </sect2>
@@ -2163,15 +2163,29 @@ CREATE TABLE public.products ( ... );
    <para>
     Qualified names are tedious to write, and it's often best not to
     wire a particular schema name into applications anyway.  Therefore
-    tables are often referred to by <firstterm>unqualified names</>,
+    tables are often referred to by <firstterm>unqualified names</firstterm>,
     which consist of just the table name.  The system determines which table
-    is meant by following a <firstterm>search path</>, which is a list
+    is meant by following a <firstterm>search path</firstterm>, which is a list
     of schemas to look in.  The first matching table in the search path
     is taken to be the one wanted.  If there is no match in the search
     path, an error is reported, even if matching table names exist
     in other schemas in the database.
    </para>
 
+  <para>
+    The ability to create like-named objects in different schemas complicates
+    writing a query that references precisely the same objects every time.  It
+    also opens up the potential for users to change the behavior of other
+    users' queries, maliciously or accidentally.  Due to the prevalence of
+    unqualified names in queries and their use
+    in <productname>PostgreSQL</productname> internals, adding a schema
+    to <varname>search_path</varname> effectively trusts all users having
+    <literal>CREATE</literal> privilege on that schema.  When you run an
+    ordinary query, a malicious user able to create objects in a schema of
+    your search path can take control and execute arbitrary SQL functions as
+    though you executed them.
+   </para>
+
    <indexterm>
     <primary>schema</primary>
     <secondary>current</secondary>
@@ -2180,7 +2194,7 @@ CREATE TABLE public.products ( ... );
    <para>
     The first schema named in the search path is called the current schema.
     Aside from being the first schema searched, it is also the schema in
-    which new tables will be created if the <command>CREATE TABLE</>
+    which new tables will be created if the <command>CREATE TABLE</command>
     command does not specify a schema name.
    </para>
 
@@ -2242,7 +2256,7 @@ SET search_path TO myschema;
    </para>
 
    <para>
-    See also <xref linkend="functions-info"> for other ways to manipulate
+    See also <xref linkend="functions-info"/> for other ways to manipulate
     the schema search path.
    </para>
 
@@ -2253,7 +2267,7 @@ SET search_path TO myschema;
     need to write a qualified operator name in an expression, there is a
     special provision: you must write
 <synopsis>
-<literal>OPERATOR(</><replaceable>schema</><literal>.</><replaceable>operator</><literal>)</>
+<literal>OPERATOR(</literal><replaceable>schema</replaceable><literal>.</literal><replaceable>operator</replaceable><literal>)</literal>
 </synopsis>
     This is needed to avoid syntactic ambiguity.  An example is:
 <programlisting>
@@ -2288,8 +2302,9 @@ SELECT 3 OPERATOR(pg_catalog.+) 4;
     the schema
     <literal>public</literal>.  This allows all users that are able to
     connect to a given database to create objects in its
-    <literal>public</literal> schema.  If you do
-    not want to allow that, you can revoke that privilege:
+    <literal>public</literal> schema.
+    Some <link linkend="ddl-schemas-patterns">usage patterns</link> call for
+    revoking that privilege:
 <programlisting>
 REVOKE CREATE ON SCHEMA public FROM PUBLIC;
 </programlisting>
@@ -2297,7 +2312,7 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
     <quote>public</quote> means <quote>every user</quote>.  In the
     first sense it is an identifier, in the second sense it is a
     key word, hence the different capitalization; recall the
-    guidelines from <xref linkend="sql-syntax-identifiers">.)
+    guidelines from <xref linkend="sql-syntax-identifiers"/>.)
    </para>
   </sect2>
 
@@ -2310,28 +2325,28 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
    </indexterm>
 
    <para>
-    In addition to <literal>public</> and user-created schemas, each
-    database contains a <literal>pg_catalog</> schema, which contains
+    In addition to <literal>public</literal> and user-created schemas, each
+    database contains a <literal>pg_catalog</literal> schema, which contains
     the system tables and all the built-in data types, functions, and
-    operators.  <literal>pg_catalog</> is always effectively part of
+    operators.  <literal>pg_catalog</literal> is always effectively part of
     the search path.  If it is not named explicitly in the path then
-    it is implicitly searched <emphasis>before</> searching the path's
+    it is implicitly searched <emphasis>before</emphasis> searching the path's
     schemas.  This ensures that built-in names will always be
     findable.  However, you can explicitly place
-    <literal>pg_catalog</> at the end of your search path if you
+    <literal>pg_catalog</literal> at the end of your search path if you
     prefer to have user-defined names override built-in names.
    </para>
 
    <para>
-    Since system table names begin with <literal>pg_</>, it is best to
+    Since system table names begin with <literal>pg_</literal>, it is best to
     avoid such names to ensure that you won't suffer a conflict if some
     future version defines a system table named the same as your
     table.  (With the default search path, an unqualified reference to
     your table name would then be resolved as the system table instead.)
     System tables will continue to follow the convention of having
-    names beginning with <literal>pg_</>, so that they will not
+    names beginning with <literal>pg_</literal>, so that they will not
     conflict with unqualified user-table names so long as users avoid
-    the <literal>pg_</> prefix.
+    the <literal>pg_</literal> prefix.
    </para>
   </sect2>
 
@@ -2339,50 +2354,75 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
    <title>Usage Patterns</title>
 
    <para>
-    Schemas can be used to organize your data in many ways.  There are
-    a few usage patterns that are recommended and are easily supported by
-    the default configuration:
+    Schemas can be used to organize your data in many ways.  There are a few
+    usage patterns easily supported by the default configuration, only one of
+    which suffices when database users mistrust other database users:
     <itemizedlist>
      <listitem>
+      <!-- "DROP SCHEMA public" is inferior to this REVOKE, because pg_dump
+           doesn't preserve that DROP. -->
       <para>
-       If you do not create any schemas then all users access the
-       public schema implicitly.  This simulates the situation where
-       schemas are not available at all.  This setup is mainly
-       recommended when there is only a single user or a few cooperating
-       users in a database.  This setup also allows smooth transition
-       from the non-schema-aware world.
+       Constrain ordinary users to user-private schemas.  To implement this,
+       issue <literal>REVOKE CREATE ON SCHEMA public FROM PUBLIC</literal>,
+       and create a schema for each user with the same name as that user.  If
+       affected users had logged in before this, consider auditing the public
+       schema for objects named like objects in
+       schema <literal>pg_catalog</literal>.  Recall that the default search
+       path starts with <literal>$user</literal>, which resolves to the user
+       name.  Therefore, if each user has a separate schema, they access their
+       own schemas by default.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       You can create a schema for each user with the same name as
-       that user.  Recall that the default search path starts with
-       <literal>$user</literal>, which resolves to the user name.
-       Therefore, if each user has a separate schema, they access their
-       own schemas by default.
+       Remove the public schema from each user's default search path
+       using <literal>ALTER ROLE <replaceable>user</replaceable> SET
+       search_path = "$user"</literal>.  Everyone retains the ability to
+       create objects in the public schema, but only qualified names will
+       choose those objects.  A user holding the <literal>CREATEROLE</literal>
+       privilege can undo this setting and issue arbitrary queries under the
+       identity of users relying on the setting.  If you
+       grant <literal>CREATEROLE</literal> to users not warranting this
+       almost-superuser ability, use the first pattern instead.
       </para>
+     </listitem>
 
+     <listitem>
       <para>
-       If you use this setup then you might also want to revoke access
-       to the public schema (or drop it altogether), so users are
-       truly constrained to their own schemas.
+       Remove the public schema from <varname>search_path</varname> in
+       <link linkend="config-setting-configuration-file"><filename>postgresql.conf</filename></link>.
+       The ensuing user experience matches the previous pattern.  In addition
+       to that pattern's implications for <literal>CREATEROLE</literal>, this
+       trusts database owners the same way.  If you assign
+       the <literal>CREATEROLE</literal>
+       privilege, <literal>CREATEDB</literal> privilege or individual database
+       ownership to users not warranting almost-superuser access, use the
+       first pattern instead.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       To install shared applications (tables to be used by everyone,
-       additional functions provided by third parties, etc.), put them
-       into separate schemas.  Remember to grant appropriate
-       privileges to allow the other users to access them.  Users can
-       then refer to these additional objects by qualifying the names
-       with a schema name, or they can put the additional schemas into
-       their search path, as they choose.
+       Keep the default.  All users access the public schema implicitly.  This
+       simulates the situation where schemas are not available at all, giving
+       a smooth transition from the non-schema-aware world.  However, any user
+       can issue arbitrary queries under the identity of any user not electing
+       to protect itself individually.  This pattern is acceptable only when
+       the database has a single user or a few mutually-trusting users.
       </para>
      </listitem>
     </itemizedlist>
    </para>
+
+   <para>
+    For any pattern, to install shared applications (tables to be used by
+    everyone, additional functions provided by third parties, etc.), put them
+    into separate schemas.  Remember to grant appropriate privileges to allow
+    the other users to access them.  Users can then refer to these additional
+    objects by qualifying the names with a schema name, or they can put the
+    additional schemas into their search path, as they choose.
+   </para>
   </sect2>
 
   <sect2 id="ddl-schemas-portability">
@@ -2397,15 +2437,15 @@ REVOKE CREATE ON SCHEMA public FROM PUBLIC;
     implements only the basic schema support specified in the
     standard.  Therefore, many users consider qualified names to
     really consist of
-    <literal><replaceable>user_name</>.<replaceable>table_name</></literal>.
+    <literal><replaceable>user_name</replaceable>.<replaceable>table_name</replaceable></literal>.
     This is how <productname>PostgreSQL</productname> will effectively
     behave if you create a per-user schema for every user.
    </para>
 
    <para>
-    Also, there is no concept of a <literal>public</> schema in the
+    Also, there is no concept of a <literal>public</literal> schema in the
     SQL standard.  For maximum conformance to the standard, you should
-    not use (perhaps even remove) the <literal>public</> schema.
+    not use the <literal>public</literal> schema.
    </para>
 
    <para>
@@ -2461,9 +2501,9 @@ CREATE TABLE capitals (
 ) INHERITS (cities);
 </programlisting>
 
-   In this case, the <structname>capitals</> table <firstterm>inherits</>
-   all the columns of its parent table, <structname>cities</>. State
-   capitals also have an extra column, <structfield>state</>, that shows
+   In this case, the <structname>capitals</structname> table <firstterm>inherits</firstterm>
+   all the columns of its parent table, <structname>cities</structname>. State
+   capitals also have an extra column, <structfield>state</structfield>, that shows
    their state.
   </para>
 
@@ -2483,7 +2523,7 @@ SELECT name, altitude
 </programlisting>
 
    Given the sample data from the <productname>PostgreSQL</productname>
-   tutorial (see <xref linkend="tutorial-sql-intro">), this returns:
+   tutorial (see <xref linkend="tutorial-sql-intro"/>), this returns:
 
 <programlisting>
    name    | altitude
@@ -2521,7 +2561,7 @@ SELECT name, altitude
   </para>
 
   <para>
-   You can also write the table name with a trailing <literal>*</>
+   You can also write the table name with a trailing <literal>*</literal>
    to explicitly specify that descendant tables are included:
 
 <programlisting>
@@ -2530,7 +2570,7 @@ SELECT name, altitude
     WHERE altitude &gt; 500;
 </programlisting>
 
-   Writing <literal>*</> is not necessary, since this behavior is always
+   Writing <literal>*</literal> is not necessary, since this behavior is always
    the default.  However, this syntax is still supported for
    compatibility with older releases where the default could be changed.
   </para>
@@ -2559,7 +2599,7 @@ WHERE c.altitude &gt; 500;
 
    (If you try to reproduce this example, you will probably get
    different numeric OIDs.)  By doing a join with
-   <structname>pg_class</> you can see the actual table names:
+   <structname>pg_class</structname> you can see the actual table names:
 
 <programlisting>
 SELECT p.relname, c.name, c.altitude
@@ -2579,7 +2619,7 @@ WHERE c.altitude &gt; 500 AND c.tableoid = p.oid;
   </para>
 
   <para>
-   Another way to get the same effect is to use the <type>regclass</>
+   Another way to get the same effect is to use the <type>regclass</type>
    alias type, which will print the table OID symbolically:
 
 <programlisting>
@@ -2602,16 +2642,16 @@ VALUES ('Albany', NULL, NULL, 'NY');
    <structname>capitals</structname> table, but this does not happen:
    <command>INSERT</command> always inserts into exactly the table
    specified.  In some cases it is possible to redirect the insertion
-   using a rule (see <xref linkend="rules">).  However that does not
-   help for the above case because the <structname>cities</> table
-   does not contain the column <structfield>state</>, and so the
+   using a rule (see <xref linkend="rules"/>).  However that does not
+   help for the above case because the <structname>cities</structname> table
+   does not contain the column <structfield>state</structfield>, and so the
    command will be rejected before the rule can be applied.
   </para>
 
   <para>
    All check constraints and not-null constraints on a parent table are
    automatically inherited by its children, unless explicitly specified
-   otherwise with <literal>NO INHERIT</> clauses.  Other types of constraints
+   otherwise with <literal>NO INHERIT</literal> clauses.  Other types of constraints
    (unique, primary key, and foreign key constraints) are not inherited.
   </para>
 
@@ -2620,7 +2660,7 @@ VALUES ('Albany', NULL, NULL, 'NY');
    the union of the columns defined by the parent tables.  Any columns
    declared in the child table's definition are added to these.  If the
    same column name appears in multiple parent tables, or in both a parent
-   table and the child's definition, then these columns are <quote>merged</>
+   table and the child's definition, then these columns are <quote>merged</quote>
    so that there is only one such column in the child table.  To be merged,
    columns must have the same data types, else an error is raised.
    Inheritable check constraints and not-null constraints are merged in a
@@ -2632,20 +2672,20 @@ VALUES ('Albany', NULL, NULL, 'NY');
 
   <para>
    Table inheritance is typically established when the child table is
-   created, using the <literal>INHERITS</> clause of the
-   <xref linkend="sql-createtable">
+   created, using the <literal>INHERITS</literal> clause of the
+   <xref linkend="sql-createtable"/>
    statement.
    Alternatively, a table which is already defined in a compatible way can
    have a new parent relationship added, using the <literal>INHERIT</literal>
-   variant of <xref linkend="sql-altertable">.
+   variant of <xref linkend="sql-altertable"/>.
    To do this the new child table must already include columns with
    the same names and types as the columns of the parent. It must also include
    check constraints with the same names and check expressions as those of the
    parent. Similarly an inheritance link can be removed from a child using the
-   <literal>NO INHERIT</literal> variant of <command>ALTER TABLE</>.
+   <literal>NO INHERIT</literal> variant of <command>ALTER TABLE</command>.
    Dynamically adding and removing inheritance links like this can be useful
    when the inheritance relationship is being used for table
-   partitioning (see <xref linkend="ddl-partitioning">).
+   partitioning (see <xref linkend="ddl-partitioning"/>).
   </para>
 
   <para>
@@ -2665,11 +2705,11 @@ VALUES ('Albany', NULL, NULL, 'NY');
    if they are inherited
    from any parent tables. If you wish to remove a table and all of its
    descendants, one easy way is to drop the parent table with the
-   <literal>CASCADE</literal> option (see <xref linkend="ddl-depend">).
+   <literal>CASCADE</literal> option (see <xref linkend="ddl-depend"/>).
   </para>
 
   <para>
-   <xref linkend="sql-altertable"> will
+   <xref linkend="sql-altertable"/> will
    propagate any changes in column data definitions and check
    constraints down the inheritance hierarchy.  Again, dropping
    columns that are depended on by other tables is only possible when using
@@ -2680,14 +2720,14 @@ VALUES ('Albany', NULL, NULL, 'NY');
 
   <para>
    Inherited queries perform access permission checks on the parent table
-   only.  Thus, for example, granting <literal>UPDATE</> permission on
-   the <structname>cities</> table implies permission to update rows in
+   only.  Thus, for example, granting <literal>UPDATE</literal> permission on
+   the <structname>cities</structname> table implies permission to update rows in
    the <structname>capitals</structname> table as well, when they are
-   accessed through <structname>cities</>.  This preserves the appearance
+   accessed through <structname>cities</structname>.  This preserves the appearance
    that the data is (also) in the parent table.  But
    the <structname>capitals</structname> table could not be updated directly
    without an additional grant.  In a similar way, the parent table's row
-   security policies (see <xref linkend="ddl-rowsecurity">) are applied to
+   security policies (see <xref linkend="ddl-rowsecurity"/>) are applied to
    rows coming from child tables during an inherited query.  A child table's
    policies, if any, are applied only when it is the table explicitly named
    in the query; and in that case, any policies attached to its parent(s) are
@@ -2695,7 +2735,7 @@ VALUES ('Albany', NULL, NULL, 'NY');
   </para>
 
   <para>
-   Foreign tables (see <xref linkend="ddl-foreign-data">) can also
+   Foreign tables (see <xref linkend="ddl-foreign-data"/>) can also
    be part of inheritance hierarchies, either as parent or child
    tables, just as regular tables can be.  If a foreign table is part
    of an inheritance hierarchy then any operations not supported by
@@ -2719,7 +2759,7 @@ VALUES ('Albany', NULL, NULL, 'NY');
    typically only work on individual, physical tables and do not
    support recursing over inheritance hierarchies.  The respective
    behavior of each individual command is documented in its reference
-   page (<xref linkend="sql-commands">).
+   page (<xref linkend="sql-commands"/>).
   </para>
 
   <para>
@@ -2732,33 +2772,33 @@ VALUES ('Albany', NULL, NULL, 'NY');
    <itemizedlist>
     <listitem>
      <para>
-      If we declared <structname>cities</>.<structfield>name</> to be
-      <literal>UNIQUE</> or a <literal>PRIMARY KEY</>, this would not stop the
-      <structname>capitals</> table from having rows with names duplicating
-      rows in <structname>cities</>.  And those duplicate rows would by
-      default show up in queries from <structname>cities</>.  In fact, by
-      default <structname>capitals</> would have no unique constraint at all,
+      If we declared <structname>cities</structname>.<structfield>name</structfield> to be
+      <literal>UNIQUE</literal> or a <literal>PRIMARY KEY</literal>, this would not stop the
+      <structname>capitals</structname> table from having rows with names duplicating
+      rows in <structname>cities</structname>.  And those duplicate rows would by
+      default show up in queries from <structname>cities</structname>.  In fact, by
+      default <structname>capitals</structname> would have no unique constraint at all,
       and so could contain multiple rows with the same name.
-      You could add a unique constraint to <structname>capitals</>, but this
-      would not prevent duplication compared to <structname>cities</>.
+      You could add a unique constraint to <structname>capitals</structname>, but this
+      would not prevent duplication compared to <structname>cities</structname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Similarly, if we were to specify that
-      <structname>cities</>.<structfield>name</> <literal>REFERENCES</> some
+      <structname>cities</structname>.<structfield>name</structfield> <literal>REFERENCES</literal> some
       other table, this constraint would not automatically propagate to
-      <structname>capitals</>.  In this case you could work around it by
-      manually adding the same <literal>REFERENCES</> constraint to
-      <structname>capitals</>.
+      <structname>capitals</structname>.  In this case you could work around it by
+      manually adding the same <literal>REFERENCES</literal> constraint to
+      <structname>capitals</structname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Specifying that another table's column <literal>REFERENCES
-      cities(name)</> would allow the other table to contain city names, but
+      cities(name)</literal> would allow the other table to contain city names, but
       not capital names.  There is no good workaround for this case.
      </para>
     </listitem>
@@ -2825,10 +2865,10 @@ VALUES ('Albany', NULL, NULL, 'NY');
       <para>
        Bulk loads and deletes can be accomplished by adding or removing
        partitions, if that requirement is planned into the partitioning design.
-       Doing <command>ALTER TABLE DETACH PARTITION</> or dropping an individual
-       partition using <command>DROP TABLE</> is far faster than a bulk
+       Doing <command>ALTER TABLE DETACH PARTITION</command> or dropping an individual
+       partition using <command>DROP TABLE</command> is far faster than a bulk
        operation.  These commands also entirely avoid the
-       <command>VACUUM</command> overhead caused by a bulk <command>DELETE</>.
+       <command>VACUUM</command> overhead caused by a bulk <command>DELETE</command>.
       </para>
      </listitem>
 
@@ -2875,6 +2915,19 @@ VALUES ('Albany', NULL, NULL, 'NY');
         </para>
        </listitem>
       </varlistentry>
+
+      <varlistentry>
+       <term>Hash Partitioning</term>
+
+       <listitem>
+        <para>
+         The table is partitioned by specifying a modulus and a remainder for
+         each partition. Each partition will hold the rows for which the hash
+         value of the partition key divided by the specified modulus will
+         produce the specified remainder.
+        </para>
+       </listitem>
+      </varlistentry>
      </variablelist>
 
      If your application needs to use other forms of partitioning not listed
@@ -2901,9 +2954,8 @@ VALUES ('Albany', NULL, NULL, 'NY');
     All rows inserted into a partitioned table will be routed to one of the
     <firstterm>partitions</firstterm> based on the value of the partition
     key.  Each partition has a subset of the data defined by its
-    <firstterm>partition bounds</firstterm>.  Currently supported
-    partitioning methods include range and list, where each partition is
-    assigned a range of keys and a list of keys, respectively.
+    <firstterm>partition bounds</firstterm>.  The currently supported
+    partitioning methods are range, list, and hash.
    </para>
 
    <para>
@@ -2911,7 +2963,7 @@ VALUES ('Albany', NULL, NULL, 'NY');
     called <firstterm>sub-partitioning</firstterm>.  Partitions may have their
     own indexes, constraints and default values, distinct from those of other
     partitions.  Indexes must be created separately for each partition.  See
-    <xref linkend="sql-createtable"> for more details on creating partitioned
+    <xref linkend="sql-createtable"/> for more details on creating partitioned
     tables and partitions.
    </para>
 
@@ -2920,8 +2972,8 @@ VALUES ('Albany', NULL, NULL, 'NY');
     vice versa.  However, it is possible to add a regular or partitioned table
     containing data as a partition of a partitioned table, or remove a
     partition from a partitioned table turning it into a standalone table;
-    see <xref linkend="sql-altertable"> to learn more about the
-    <command>ATTACH PARTITION</> and <command>DETACH PARTITION</>
+    see <xref linkend="sql-altertable"/> to learn more about the
+    <command>ATTACH PARTITION</command> and <command>DETACH PARTITION</command>
     sub-commands.
    </para>
 
@@ -2936,7 +2988,7 @@ VALUES ('Albany', NULL, NULL, 'NY');
     inheritance with regular tables.  Since a partition hierarchy consisting
     of the partitioned table and its partitions is still an inheritance
     hierarchy, all the normal rules of inheritance apply as described in
-    <xref linkend="ddl-inherit"> with some exceptions, most notably:
+    <xref linkend="ddl-inherit"/> with some exceptions, most notably:
 
     <itemizedlist>
      <listitem>
@@ -2968,9 +3020,9 @@ VALUES ('Albany', NULL, NULL, 'NY');
       <para>
        Partitions cannot have columns that are not present in the parent.  It
        is neither possible to specify columns when creating partitions with
-       <command>CREATE TABLE</> nor is it possible to add columns to
-       partitions after-the-fact using <command>ALTER TABLE</>.  Tables may be
-       added as a partition with <command>ALTER TABLE ... ATTACH PARTITION</>
+       <command>CREATE TABLE</command> nor is it possible to add columns to
+       partitions after-the-fact using <command>ALTER TABLE</command>.  Tables may be
+       added as a partition with <command>ALTER TABLE ... ATTACH PARTITION</command>
        only if their columns exactly match the parent, including any
        <literal>oid</literal> column.
       </para>
@@ -2987,12 +3039,17 @@ VALUES ('Albany', NULL, NULL, 'NY');
 
    <para>
     Partitions can also be foreign tables
-    (see <xref linkend="sql-createforeigntable">),
+    (see <xref linkend="sql-createforeigntable"/>),
     although these have some limitations that normal tables do not.  For
     example, data inserted into the partitioned table is not routed to
     foreign table partitions.
    </para>
 
+   <para>
+    Updating the partition key of a row might cause it to be moved into a
+    different partition where this row satisfies its partition constraint.
+   </para>
+
    <sect3 id="ddl-partitioning-declarative-example">
     <title>Example</title>
 
@@ -3049,7 +3106,7 @@ CREATE TABLE measurement (
        accessing the partitioned table will have to scan fewer partitions if
        the conditions involve some or all of these columns.
        For example, consider a table range partitioned using columns
-       <structfield>lastname</> and <structfield>firstname</> (in that order)
+       <structfield>lastname</structfield> and <structfield>firstname</structfield> (in that order)
        as the partition key.
       </para>
      </listitem>
@@ -3061,13 +3118,13 @@ CREATE TABLE measurement (
        parent.  Note that specifying bounds such that the new partition's
        values will overlap with those in one or more existing partitions will
        cause an error.  Inserting data into the parent table that does not map
-       to one of the existing partitions will cause an error; appropriate
+       to one of the existing partitions will cause an error; an appropriate
        partition must be added manually.
       </para>
 
       <para>
        Partitions thus created are in every way normal
-       <productname>PostgreSQL</>
+       <productname>PostgreSQL</productname>
        tables (or, possibly, foreign tables).  It is possible to specify a
        tablespace and storage parameters for each partition separately.
       </para>
@@ -3080,14 +3137,14 @@ CREATE TABLE measurement (
 
 <programlisting>
 CREATE TABLE measurement_y2006m02 PARTITION OF measurement
-    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01')
+    FOR VALUES FROM ('2006-02-01') TO ('2006-03-01');
 
 CREATE TABLE measurement_y2006m03 PARTITION OF measurement
-    FOR VALUES FROM ('2006-03-01') TO ('2006-04-01')
+    FOR VALUES FROM ('2006-03-01') TO ('2006-04-01');
 
 ...
 CREATE TABLE measurement_y2007m11 PARTITION OF measurement
-    FOR VALUES FROM ('2007-11-01') TO ('2007-12-01')
+    FOR VALUES FROM ('2007-11-01') TO ('2007-12-01');
 
 CREATE TABLE measurement_y2007m12 PARTITION OF measurement
     FOR VALUES FROM ('2007-12-01') TO ('2008-01-01')
@@ -3095,8 +3152,8 @@ CREATE TABLE measurement_y2007m12 PARTITION OF measurement
 
 CREATE TABLE measurement_y2008m01 PARTITION OF measurement
     FOR VALUES FROM ('2008-01-01') TO ('2008-02-01')
-    TABLESPACE fasttablespace
-    WITH (parallel_workers = 4);
+    WITH (parallel_workers = 4)
+    TABLESPACE fasttablespace;
 </programlisting>
       </para>
 
@@ -3111,12 +3168,12 @@ CREATE TABLE measurement_y2006m02 PARTITION OF measurement
     PARTITION BY RANGE (peaktemp);
 </programlisting>
 
-       After creating partitions of <structname>measurement_y2006m02</>,
-       any data inserted into <structname>measurement</> that is mapped to
-       <structname>measurement_y2006m02</> (or data that is directly inserted
-       into <structname>measurement_y2006m02</>, provided it satisfies its
+       After creating partitions of <structname>measurement_y2006m02</structname>,
+       any data inserted into <structname>measurement</structname> that is mapped to
+       <structname>measurement_y2006m02</structname> (or data that is directly inserted
+       into <structname>measurement_y2006m02</structname>, provided it satisfies its
        partition constraint) will be further redirected to one of its
-       partitions based on the <structfield>peaktemp</> column.  The partition
+       partitions based on the <structfield>peaktemp</structfield> column.  The partition
        key specified may overlap with the parent's partition key, although
        care should be taken when specifying the bounds of a sub-partition
        such that the set of data it accepts constitutes a subset of what
@@ -3128,26 +3185,22 @@ CREATE TABLE measurement_y2006m02 PARTITION OF measurement
      <listitem>
       <para>
        Create an index on the key column(s), as well as any other indexes you
-       might want for every partition.  (The key index is not strictly
-       necessary, but in most scenarios it is helpful.  If you intend the key
-       values to be unique then you should always create a unique or
-       primary-key constraint for each partition.)
+       might want, on the partitioned table. (The key index is not strictly
+       necessary, but in most scenarios it is helpful.)
+       This automatically creates
+       one index on each partition, and any partitions you create or attach
+       later will also contain the index.
 
 <programlisting>
-CREATE INDEX ON measurement_y2006m02 (logdate);
-CREATE INDEX ON measurement_y2006m03 (logdate);
-...
-CREATE INDEX ON measurement_y2007m11 (logdate);
-CREATE INDEX ON measurement_y2007m12 (logdate);
-CREATE INDEX ON measurement_y2008m01 (logdate);
+CREATE INDEX ON measurement (logdate);
 </programlisting>
       </para>
      </listitem>
 
       <listitem>
        <para>
-        Ensure that the <xref linkend="guc-constraint-exclusion">
-        configuration parameter is not disabled in <filename>postgresql.conf</>.
+        Ensure that the <xref linkend="guc-constraint-exclusion"/>
+        configuration parameter is not disabled in <filename>postgresql.conf</filename>.
         If it is, queries will not be optimized as desired.
        </para>
       </listitem>
@@ -3197,7 +3250,7 @@ ALTER TABLE measurement DETACH PARTITION measurement_y2006m02;
 
      This allows further operations to be performed on the data before
      it is dropped. For example, this is often a useful time to back up
-     the data using <command>COPY</>, <application>pg_dump</>, or
+     the data using <command>COPY</command>, <application>pg_dump</application>, or
      similar tools. It might also be a useful time to aggregate data
      into smaller formats, perform other data manipulations, or run
      reports.
@@ -3236,14 +3289,14 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
     </para>
 
     <para>
-     Before running the <command>ATTACH PARTITION</> command, it is
-     recommended to create a <literal>CHECK</> constraint on the table to
+     Before running the <command>ATTACH PARTITION</command> command, it is
+     recommended to create a <literal>CHECK</literal> constraint on the table to
      be attached describing the desired partition constraint.  That way,
      the system will be able to skip the scan to validate the implicit
      partition constraint. Without such a constraint, the table will be
      scanned to validate the partition constraint while holding an
      <literal>ACCESS EXCLUSIVE</literal> lock on the parent table.
-     One may then drop the constraint after <command>ATTACH PARTITION</>
+     One may then drop the constraint after <command>ATTACH PARTITION</command>
      is finished, because it is no longer necessary.
     </para>
    </sect3>
@@ -3256,18 +3309,15 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
     <itemizedlist>
      <listitem>
       <para>
-       There is no facility available to create the matching indexes on all
-       partitions automatically.  Indexes must be added to each partition with
-       separate commands.  This also means that there is no way to create a
-       primary key, unique constraint, or exclusion constraint spanning all
-       partitions; it is only possible to constrain each leaf partition
-       individually.
+       There is no way to create a
+       exclusion constraint spanning all partitions; it is only possible
+       to constrain each leaf partition individually.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Since primary keys are not supported on partitioned tables, foreign
+       While primary keys are supported on partitioned tables, foreign
        keys referencing partitioned tables are not supported, nor are foreign
        key references from a partitioned table to some other table.
       </para>
@@ -3276,18 +3326,36 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
      <listitem>
       <para>
        Using the <literal>ON CONFLICT</literal> clause with partitioned tables
-       will cause an error, because unique or exclusion constraints can only be
-       created on individual partitions.  There is no support for enforcing
-       uniqueness (or an exclusion constraint) across an entire partitioning
-       hierarchy.
+       will cause an error if the conflict target is specified (see
+       <xref linkend="sql-on-conflict" /> for more details on how the clause
+       works).  Therefore, it is not possible to specify
+       <literal>DO UPDATE</literal> as the alternative action, because
+       specifying the conflict target is mandatory in that case.  On the other
+       hand, specifying <literal>DO NOTHING</literal> as the alternative action
+       works fine provided the conflict target is not specified.  In that case,
+       unique constraints (or exclusion constraints) of the individual leaf
+       partitions are considered.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       An <command>UPDATE</> that causes a row to move from one partition to
-       another fails, because the new value of the row fails to satisfy the
-       implicit partition constraint of the original partition.
+       When an <command>UPDATE</command> causes a row to move from one
+       partition to another, there is a chance that another concurrent
+       <command>UPDATE</command> or <command>DELETE</command> misses this row.
+       Suppose session 1 is performing an <command>UPDATE</command> on a
+       partition key, and meanwhile a concurrent session 2 for which this row
+       is visible performs an <command>UPDATE</command> or
+       <command>DELETE</command> operation on this row. Session 2 can silently
+       miss the row if the row is deleted from the partition due to session
+       1's activity.  In such case, session 2's
+       <command>UPDATE</command> or <command>DELETE</command>, being unaware of
+       the row movement thinks that the row has just been deleted and concludes
+       that there is nothing to be done for this row. In the usual case where
+       the table is not partitioned, or where there is no row movement,
+       session 2 would have identified the newly updated row and carried out
+       the <command>UPDATE</command>/<command>DELETE</command> on this new row
+       version.
       </para>
      </listitem>
 
@@ -3328,11 +3396,11 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
 
       <listitem>
        <para>
-        Declarative partitioning only supports list and range partitioning,
-        whereas table inheritance allows data to be divided in a manner of
-        the user's choosing.  (Note, however, that if constraint exclusion is
-        unable to prune partitions effectively, query performance will be very
-        poor.)
+        Declarative partitioning only supports range, list and hash
+        partitioning, whereas table inheritance allows data to be divided in a
+        manner of the user's choosing.  (Note, however, that if constraint
+        exclusion is unable to prune partitions effectively, query performance
+        will be very poor.)
        </para>
       </listitem>
 
@@ -3376,7 +3444,7 @@ ALTER TABLE measurement ATTACH PARTITION measurement_y2008m02
          the master table.  Normally, these tables will not add any columns
          to the set inherited from the master.  Just as with declarative
          partitioning, these partitions are in every way normal
-         <productname>PostgreSQL</> tables (or foreign tables).
+         <productname>PostgreSQL</productname> tables (or foreign tables).
         </para>
 
         <para>
@@ -3460,7 +3528,7 @@ CREATE INDEX measurement_y2008m01_logdate ON measurement_y2008m01 (logdate);
        <listitem>
         <para>
          We want our application to be able to say <literal>INSERT INTO
-         measurement ...</> and have the data be redirected into the
+         measurement ...</literal> and have the data be redirected into the
          appropriate partition table.  We can arrange that by attaching
          a suitable trigger function to the master table.
          If data will be added only to the latest partition, we can
@@ -3567,9 +3635,9 @@ DO INSTEAD
         </para>
 
         <para>
-         Be aware that <command>COPY</> ignores rules.  If you want to
-         use <command>COPY</> to insert data, you'll need to copy into the
-         correct partition table rather than into the master. <command>COPY</>
+         Be aware that <command>COPY</command> ignores rules.  If you want to
+         use <command>COPY</command> to insert data, you'll need to copy into the
+         correct partition table rather than into the master. <command>COPY</command>
          does fire triggers, so you can use it normally if you use the trigger
          approach.
         </para>
@@ -3583,9 +3651,9 @@ DO INSTEAD
 
        <listitem>
         <para>
-         Ensure that the <xref linkend="guc-constraint-exclusion">
+         Ensure that the <xref linkend="guc-constraint-exclusion"/>
          configuration parameter is not disabled in
-         <filename>postgresql.conf</>.
+         <filename>postgresql.conf</filename>.
          If it is, queries will not be optimized as desired.
         </para>
        </listitem>
@@ -3666,8 +3734,8 @@ ALTER TABLE measurement_y2008m02 INHERIT measurement;
        <para>
         The schemes shown here assume that the partition key column(s)
         of a row never change, or at least do not change enough to require
-        it to move to another partition.  An <command>UPDATE</> that attempts
-        to do that will fail because of the <literal>CHECK</> constraints.
+        it to move to another partition.  An <command>UPDATE</command> that attempts
+        to do that will fail because of the <literal>CHECK</literal> constraints.
         If you need to handle such cases, you can put suitable update triggers
         on the partition tables, but it makes management of the structure
         much more complicated.
@@ -3688,8 +3756,8 @@ ANALYZE measurement;
 
       <listitem>
        <para>
-        <command>INSERT</command> statements with <literal>ON CONFLICT</>
-        clauses are unlikely to work as expected, as the <literal>ON CONFLICT</>
+        <command>INSERT</command> statements with <literal>ON CONFLICT</literal>
+        clauses are unlikely to work as expected, as the <literal>ON CONFLICT</literal>
         action is only taken in case of unique violations on the specified
         target relation, not its child relations.
        </para>
@@ -3717,7 +3785,7 @@ ANALYZE measurement;
    </indexterm>
 
    <para>
-    <firstterm>Constraint exclusion</> is a query optimization technique
+    <firstterm>Constraint exclusion</firstterm> is a query optimization technique
     that improves performance for partitioned tables defined in the
     fashion described above (both declaratively partitioned tables and those
     implemented using inheritance).  As an example:
@@ -3728,17 +3796,17 @@ SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
 </programlisting>
 
     Without constraint exclusion, the above query would scan each of
-    the partitions of the <structname>measurement</> table. With constraint
+    the partitions of the <structname>measurement</structname> table. With constraint
     exclusion enabled, the planner will examine the constraints of each
     partition and try to prove that the partition need not
     be scanned because it could not contain any rows meeting the query's
-    <literal>WHERE</> clause.  When the planner can prove this, it
+    <literal>WHERE</literal> clause.  When the planner can prove this, it
     excludes the partition from the query plan.
    </para>
 
    <para>
-    You can use the <command>EXPLAIN</> command to show the difference
-    between a plan with <varname>constraint_exclusion</> on and a plan
+    You can use the <command>EXPLAIN</command> command to show the difference
+    between a plan with <varname>constraint_exclusion</varname> on and a plan
     with it off.  A typical unoptimized plan for this type of table setup is:
 
 <programlisting>
@@ -3783,7 +3851,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
    </para>
 
    <para>
-    Note that constraint exclusion is driven only by <literal>CHECK</>
+    Note that constraint exclusion is driven only by <literal>CHECK</literal>
     constraints, not by the presence of indexes.  Therefore it isn't
     necessary to define indexes on the key columns.  Whether an index
     needs to be created for a given partition depends on whether you
@@ -3794,12 +3862,12 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
 
    <para>
     The default (and recommended) setting of
-    <xref linkend="guc-constraint-exclusion"> is actually neither
-    <literal>on</> nor <literal>off</>, but an intermediate setting
-    called <literal>partition</>, which causes the technique to be
+    <xref linkend="guc-constraint-exclusion"/> is actually neither
+    <literal>on</literal> nor <literal>off</literal>, but an intermediate setting
+    called <literal>partition</literal>, which causes the technique to be
     applied only to queries that are likely to be working on partitioned
-    tables.  The <literal>on</> setting causes the planner to examine
-    <literal>CHECK</> constraints in all queries, even simple ones that
+    tables.  The <literal>on</literal> setting causes the planner to examine
+    <literal>CHECK</literal> constraints in all queries, even simple ones that
     are unlikely to benefit.
    </para>
 
@@ -3810,7 +3878,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
    <itemizedlist>
     <listitem>
      <para>
-      Constraint exclusion only works when the query's <literal>WHERE</>
+      Constraint exclusion only works when the query's <literal>WHERE</literal>
       clause contains constants (or externally supplied parameters).
       For example, a comparison against a non-immutable function such as
       <function>CURRENT_TIMESTAMP</function> cannot be optimized, since the
@@ -3867,7 +3935,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
     <productname>PostgreSQL</productname> implements portions of the SQL/MED
     specification, allowing you to access data that resides outside
     PostgreSQL using regular SQL queries.  Such data is referred to as
-    <firstterm>foreign data</>.  (Note that this usage is not to be confused
+    <firstterm>foreign data</firstterm>.  (Note that this usage is not to be confused
     with foreign keys, which are a type of constraint within the database.)
    </para>
 
@@ -3876,15 +3944,15 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
     <firstterm>foreign data wrapper</firstterm>. A foreign data wrapper is a
     library that can communicate with an external data source, hiding the
     details of connecting to the data source and obtaining data from it.
-    There are some foreign data wrappers available as <filename>contrib</>
-    modules; see <xref linkend="contrib">.  Other kinds of foreign data
+    There are some foreign data wrappers available as <filename>contrib</filename>
+    modules; see <xref linkend="contrib"/>.  Other kinds of foreign data
     wrappers might be found as third party products.  If none of the existing
     foreign data wrappers suit your needs, you can write your own; see <xref
-    linkend="fdwhandler">.
+    linkend="fdwhandler"/>.
    </para>
 
    <para>
-    To access foreign data, you need to create a <firstterm>foreign server</>
+    To access foreign data, you need to create a <firstterm>foreign server</firstterm>
     object, which defines how to connect to a particular external data source
     according to the set of options used by its supporting foreign data
     wrapper. Then you need to create one or more <firstterm>foreign
@@ -3899,18 +3967,18 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
    <para>
     Accessing remote data may require authenticating to the external
     data source.  This information can be provided by a
-    <firstterm>user mapping</>, which can provide additional data
+    <firstterm>user mapping</firstterm>, which can provide additional data
     such as user names and passwords based
     on the current <productname>PostgreSQL</productname> role.
    </para>
 
    <para>
     For additional information, see
-    <xref linkend="sql-createforeigndatawrapper">,
-    <xref linkend="sql-createserver">,
-    <xref linkend="sql-createusermapping">,
-    <xref linkend="sql-createforeigntable">, and
-    <xref linkend="sql-importforeignschema">.
+    <xref linkend="sql-createforeigndatawrapper"/>,
+    <xref linkend="sql-createserver"/>,
+    <xref linkend="sql-createusermapping"/>,
+    <xref linkend="sql-createforeigntable"/>, and
+    <xref linkend="sql-importforeignschema"/>.
    </para>
  </sect1>
 
@@ -3935,7 +4003,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
 
    <listitem>
     <para>
-     Functions and operators
+     Functions, procedures, and operators
     </para>
    </listitem>
 
@@ -3954,7 +4022,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
 
   <para>
    Detailed information on
-   these topics appears in <xref linkend="server-programming">.
+   these topics appears in <xref linkend="server-programming"/>.
   </para>
  </sect1>
 
@@ -3984,7 +4052,7 @@ EXPLAIN SELECT count(*) FROM measurement WHERE logdate &gt;= DATE '2008-01-01';
    <productname>PostgreSQL</productname> makes sure that you cannot
    drop objects that other objects still depend on.  For example,
    attempting to drop the products table we considered in <xref
-   linkend="ddl-constraints-fk">, with the orders table depending on
+   linkend="ddl-constraints-fk"/>, with the orders table depending on
    it, would result in an error message like this:
 <screen>
 DROP TABLE products;
@@ -4002,13 +4070,13 @@ DROP TABLE products CASCADE;
    that depend on them, recursively.  In this case, it doesn't remove
    the orders table, it only removes the foreign key constraint.
    It stops there because nothing depends on the foreign key constraint.
-   (If you want to check what <command>DROP ... CASCADE</> will do,
-   run <command>DROP</> without <literal>CASCADE</> and read the
-   <literal>DETAIL</> output.)
+   (If you want to check what <command>DROP ... CASCADE</command> will do,
+   run <command>DROP</command> without <literal>CASCADE</literal> and read the
+   <literal>DETAIL</literal> output.)
   </para>
 
   <para>
-   Almost all <command>DROP</> commands in <productname>PostgreSQL</> support
+   Almost all <command>DROP</command> commands in <productname>PostgreSQL</productname> support
    specifying <literal>CASCADE</literal>.  Of course, the nature of
    the possible dependencies varies with the type of the object.  You
    can also write <literal>RESTRICT</literal> instead of
@@ -4020,7 +4088,7 @@ DROP TABLE products CASCADE;
    <para>
     According to the SQL standard, specifying either
     <literal>RESTRICT</literal> or <literal>CASCADE</literal> is
-    required in a <command>DROP</> command.  No database system actually
+    required in a <command>DROP</command> command.  No database system actually
     enforces that rule, but whether the default behavior
     is <literal>RESTRICT</literal> or <literal>CASCADE</literal> varies
     across systems.
@@ -4028,18 +4096,18 @@ DROP TABLE products CASCADE;
   </note>
 
   <para>
-   If a <command>DROP</> command lists multiple
+   If a <command>DROP</command> command lists multiple
    objects, <literal>CASCADE</literal> is only required when there are
    dependencies outside the specified group.  For example, when saying
    <literal>DROP TABLE tab1, tab2</literal> the existence of a foreign
-   key referencing <literal>tab1</> from <literal>tab2</> would not mean
+   key referencing <literal>tab1</literal> from <literal>tab2</literal> would not mean
    that <literal>CASCADE</literal> is needed to succeed.
   </para>
 
   <para>
    For user-defined functions, <productname>PostgreSQL</productname> tracks
    dependencies associated with a function's externally-visible properties,
-   such as its argument and result types, but <emphasis>not</> dependencies
+   such as its argument and result types, but <emphasis>not</emphasis> dependencies
    that could only be known by examining the function body.  As an example,
    consider this situation:
 
@@ -4054,13 +4122,13 @@ CREATE FUNCTION get_color_note (rainbow) RETURNS text AS
   LANGUAGE SQL;
 </programlisting>
 
-   (See <xref linkend="xfunc-sql"> for an explanation of SQL-language
+   (See <xref linkend="xfunc-sql"/> for an explanation of SQL-language
    functions.)  <productname>PostgreSQL</productname> will be aware that
-   the <function>get_color_note</> function depends on the <type>rainbow</>
+   the <function>get_color_note</function> function depends on the <type>rainbow</type>
    type: dropping the type would force dropping the function, because its
-   argument type would no longer be defined.  But <productname>PostgreSQL</>
-   will not consider <function>get_color_note</> to depend on
-   the <structname>my_colors</> table, and so will not drop the function if
+   argument type would no longer be defined.  But <productname>PostgreSQL</productname>
+   will not consider <function>get_color_note</function> to depend on
+   the <structname>my_colors</structname> table, and so will not drop the function if
    the table is dropped.  While there are disadvantages to this approach,
    there are also benefits.  The function is still valid in some sense if the
    table is missing, though executing it would cause an error; creating a new
diff --git a/doc/src/sgml/dfunc.sgml b/doc/src/sgml/dfunc.sgml
index 23af270e32..dfefa9e686 100644
--- a/doc/src/sgml/dfunc.sgml
+++ b/doc/src/sgml/dfunc.sgml
@@ -9,7 +9,7 @@
   C, they must be compiled and linked in a special way to produce a
   file that can be dynamically loaded by the server.  To be precise, a
   <firstterm>shared library</firstterm> needs to be
-  created.<indexterm><primary>shared library</></indexterm>
+  created.<indexterm><primary>shared library</primary></indexterm>
 
  </para>
 
@@ -30,7 +30,7 @@
   executables: first the source files are compiled into object files,
   then the object files are linked together.  The object files need to
   be created as <firstterm>position-independent code</firstterm>
-  (<acronym>PIC</acronym>),<indexterm><primary>PIC</></> which
+  (<acronym>PIC</acronym>),<indexterm><primary>PIC</primary></indexterm> which
   conceptually means that they can be placed at an arbitrary location
   in memory when they are loaded by the executable.  (Object files
   intended for executables are usually not compiled that way.)  The
@@ -57,8 +57,8 @@
   <variablelist>
    <varlistentry>
     <term>
-     <systemitem class="osname">FreeBSD</>
-     <indexterm><primary>FreeBSD</><secondary>shared library</></>
+     <systemitem class="osname">FreeBSD</systemitem>
+     <indexterm><primary>FreeBSD</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -70,15 +70,15 @@ gcc -fPIC -c foo.c
 gcc -shared -o foo.so foo.o
 </programlisting>
       This is applicable as of version 3.0 of
-      <systemitem class="osname">FreeBSD</>.
+      <systemitem class="osname">FreeBSD</systemitem>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
     <term>
-     <systemitem class="osname">HP-UX</>
-     <indexterm><primary>HP-UX</><secondary>shared library</></>
+     <systemitem class="osname">HP-UX</systemitem>
+     <indexterm><primary>HP-UX</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -97,7 +97,7 @@ gcc -fPIC -c foo.c
 <programlisting>
 ld -b -o foo.sl foo.o
 </programlisting>
-      <systemitem class="osname">HP-UX</> uses the extension
+      <systemitem class="osname">HP-UX</systemitem> uses the extension
       <filename>.sl</filename> for shared libraries, unlike most other
       systems.
      </para>
@@ -106,8 +106,8 @@ ld -b -o foo.sl foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">Linux</>
-     <indexterm><primary>Linux</><secondary>shared library</></>
+     <systemitem class="osname">Linux</systemitem>
+     <indexterm><primary>Linux</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -125,8 +125,8 @@ cc -shared -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">macOS</>
-     <indexterm><primary>macOS</><secondary>shared library</></>
+     <systemitem class="osname">macOS</systemitem>
+     <indexterm><primary>macOS</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -141,8 +141,8 @@ cc -bundle -flat_namespace -undefined suppress -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">NetBSD</>
-     <indexterm><primary>NetBSD</><secondary>shared library</></>
+     <systemitem class="osname">NetBSD</systemitem>
+     <indexterm><primary>NetBSD</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -161,8 +161,8 @@ gcc -shared -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">OpenBSD</>
-     <indexterm><primary>OpenBSD</><secondary>shared library</></>
+     <systemitem class="osname">OpenBSD</systemitem>
+     <indexterm><primary>OpenBSD</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
@@ -179,17 +179,17 @@ ld -Bshareable -o foo.so foo.o
 
    <varlistentry>
     <term>
-     <systemitem class="osname">Solaris</>
-     <indexterm><primary>Solaris</><secondary>shared library</></>
+     <systemitem class="osname">Solaris</systemitem>
+     <indexterm><primary>Solaris</primary><secondary>shared library</secondary></indexterm>
     </term>
     <listitem>
      <para>
       The compiler flag to create <acronym>PIC</acronym> is
       <option>-KPIC</option> with the Sun compiler and
-      <option>-fPIC</option> with <application>GCC</>.  To
+      <option>-fPIC</option> with <application>GCC</application>.  To
       link shared libraries, the compiler option is
       <option>-G</option> with either compiler or alternatively
-      <option>-shared</option> with <application>GCC</>.
+      <option>-shared</option> with <application>GCC</application>.
 <programlisting>
 cc -KPIC -c foo.c
 cc -G -o foo.so foo.o
@@ -226,7 +226,7 @@ gcc -G -o foo.so foo.o
  </para>
 
  <para>
-  Refer back to <xref linkend="xfunc-c-dynload"> about where the
+  Refer back to <xref linkend="xfunc-c-dynload"/> about where the
   server expects to find the shared library files.
  </para>
 
diff --git a/doc/src/sgml/dict-int.sgml b/doc/src/sgml/dict-int.sgml
index d49f3e2a3a..c15cbd0e4d 100644
--- a/doc/src/sgml/dict-int.sgml
+++ b/doc/src/sgml/dict-int.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  <filename>dict_int</> is an example of an add-on dictionary template
+  <filename>dict_int</filename> is an example of an add-on dictionary template
   for full-text search.  The motivation for this example dictionary is to
   control the indexing of integers (signed and unsigned), allowing such
   numbers to be indexed while preventing excessive growth in the number of
@@ -25,17 +25,17 @@
   <itemizedlist>
    <listitem>
     <para>
-     The <literal>maxlen</> parameter specifies the maximum number of
+     The <literal>maxlen</literal> parameter specifies the maximum number of
      digits allowed in an integer word.  The default value is 6.
     </para>
    </listitem>
    <listitem>
     <para>
-     The <literal>rejectlong</> parameter specifies whether an overlength
-     integer should be truncated or ignored.  If <literal>rejectlong</> is
-     <literal>false</> (the default), the dictionary returns the first
-     <literal>maxlen</> digits of the integer. If <literal>rejectlong</> is
-     <literal>true</>, the dictionary treats an overlength integer as a stop
+     The <literal>rejectlong</literal> parameter specifies whether an overlength
+     integer should be truncated or ignored.  If <literal>rejectlong</literal> is
+     <literal>false</literal> (the default), the dictionary returns the first
+     <literal>maxlen</literal> digits of the integer. If <literal>rejectlong</literal> is
+     <literal>true</literal>, the dictionary treats an overlength integer as a stop
      word, so that it will not be indexed.  Note that this also means that
      such an integer cannot be searched for.
     </para>
@@ -47,8 +47,8 @@
   <title>Usage</title>
 
   <para>
-   Installing the <literal>dict_int</> extension creates a text search
-   template <literal>intdict_template</> and a dictionary <literal>intdict</>
+   Installing the <literal>dict_int</literal> extension creates a text search
+   template <literal>intdict_template</literal> and a dictionary <literal>intdict</literal>
    based on it, with the default parameters.  You can alter the
    parameters, for example
 
@@ -71,7 +71,7 @@ mydb# select ts_lexize('intdict', '12345678');
 </programlisting>
 
    but real-world usage will involve including it in a text search
-   configuration as described in <xref linkend="textsearch">.
+   configuration as described in <xref linkend="textsearch"/>.
    That might look like this:
 
 <programlisting>
diff --git a/doc/src/sgml/dict-xsyn.sgml b/doc/src/sgml/dict-xsyn.sgml
index 42362ffbc8..256aff7c58 100644
--- a/doc/src/sgml/dict-xsyn.sgml
+++ b/doc/src/sgml/dict-xsyn.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  <filename>dict_xsyn</> (Extended Synonym Dictionary) is an example of an
+  <filename>dict_xsyn</filename> (Extended Synonym Dictionary) is an example of an
   add-on dictionary template for full-text search.  This dictionary type
   replaces words with groups of their synonyms, and so makes it possible to
   search for a word using any of its synonyms.
@@ -18,41 +18,41 @@
   <title>Configuration</title>
 
   <para>
-   A <literal>dict_xsyn</> dictionary accepts the following options:
+   A <literal>dict_xsyn</literal> dictionary accepts the following options:
   </para>
   <itemizedlist>
    <listitem>
     <para>
-     <literal>matchorig</> controls whether the original word is accepted by
-     the dictionary. Default is <literal>true</>.
+     <literal>matchorig</literal> controls whether the original word is accepted by
+     the dictionary. Default is <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>matchsynonyms</> controls whether the synonyms are
-     accepted by the dictionary. Default is <literal>false</>.
+     <literal>matchsynonyms</literal> controls whether the synonyms are
+     accepted by the dictionary. Default is <literal>false</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>keeporig</> controls whether the original word is included in
-     the dictionary's output. Default is <literal>true</>.
+     <literal>keeporig</literal> controls whether the original word is included in
+     the dictionary's output. Default is <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>keepsynonyms</> controls whether the synonyms are included in
-     the dictionary's output. Default is <literal>true</>.
+     <literal>keepsynonyms</literal> controls whether the synonyms are included in
+     the dictionary's output. Default is <literal>true</literal>.
     </para>
    </listitem>
    <listitem>
     <para>
-     <literal>rules</> is the base name of the file containing the list of
+     <literal>rules</literal> is the base name of the file containing the list of
      synonyms.  This file must be stored in
-     <filename>$SHAREDIR/tsearch_data/</> (where <literal>$SHAREDIR</> means
-     the <productname>PostgreSQL</> installation's shared-data directory).
-     Its name must end in <literal>.rules</> (which is not to be included in
-     the <literal>rules</> parameter).
+     <filename>$SHAREDIR/tsearch_data/</filename> (where <literal>$SHAREDIR</literal> means
+     the <productname>PostgreSQL</productname> installation's shared-data directory).
+     Its name must end in <literal>.rules</literal> (which is not to be included in
+     the <literal>rules</literal> parameter).
     </para>
    </listitem>
   </itemizedlist>
@@ -71,15 +71,15 @@ word syn1 syn2 syn3
    </listitem>
    <listitem>
     <para>
-     The sharp (<literal>#</>) sign is a comment delimiter. It may appear at
+     The sharp (<literal>#</literal>) sign is a comment delimiter. It may appear at
      any position in a line.  The rest of the line will be skipped.
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   Look at <filename>xsyn_sample.rules</>, which is installed in
-   <filename>$SHAREDIR/tsearch_data/</>, for an example.
+   Look at <filename>xsyn_sample.rules</filename>, which is installed in
+   <filename>$SHAREDIR/tsearch_data/</filename>, for an example.
   </para>
  </sect2>
 
@@ -87,8 +87,8 @@ word syn1 syn2 syn3
   <title>Usage</title>
 
   <para>
-   Installing the <literal>dict_xsyn</> extension creates a text search
-   template <literal>xsyn_template</> and a dictionary <literal>xsyn</>
+   Installing the <literal>dict_xsyn</literal> extension creates a text search
+   template <literal>xsyn_template</literal> and a dictionary <literal>xsyn</literal>
    based on it, with default parameters.  You can alter the
    parameters, for example
 
@@ -135,7 +135,7 @@ mydb=# SELECT ts_lexize('xsyn', 'syn1');
 </programlisting>
 
    Real-world usage will involve including it in a text search
-   configuration as described in <xref linkend="textsearch">.
+   configuration as described in <xref linkend="textsearch"/>.
    That might look like this:
 
 <programlisting>
diff --git a/doc/src/sgml/diskusage.sgml b/doc/src/sgml/diskusage.sgml
index 461deb9dba..3708e5f3d8 100644
--- a/doc/src/sgml/diskusage.sgml
+++ b/doc/src/sgml/diskusage.sgml
@@ -5,7 +5,7 @@
 
  <para>
   This chapter discusses how to monitor the disk usage of a
-  <productname>PostgreSQL</> database system.
+  <productname>PostgreSQL</productname> database system.
  </para>
 
  <sect1 id="disk-usage">
@@ -18,20 +18,20 @@
   <para>
    Each table has a primary heap disk file where most of the data is
    stored. If the table has any columns with potentially-wide values,
-   there also might be a <acronym>TOAST</> file associated with the table,
+   there also might be a <acronym>TOAST</acronym> file associated with the table,
    which is used to store values too wide to fit comfortably in the main
-   table (see <xref linkend="storage-toast">).  There will be one valid index
-   on the <acronym>TOAST</> table, if present. There also might be indexes
+   table (see <xref linkend="storage-toast"/>).  There will be one valid index
+   on the <acronym>TOAST</acronym> table, if present. There also might be indexes
    associated with the base table.  Each table and index is stored in a
    separate disk file &mdash; possibly more than one file, if the file would
    exceed one gigabyte.  Naming conventions for these files are described
-   in <xref linkend="storage-file-layout">.
+   in <xref linkend="storage-file-layout"/>.
   </para>
 
   <para>
    You can monitor disk space in three ways:
-   using the SQL functions listed in <xref linkend="functions-admin-dbsize">,
-   using the <xref linkend="oid2name"> module, or
+   using the SQL functions listed in <xref linkend="functions-admin-dbsize"/>,
+   using the <xref linkend="oid2name"/> module, or
    using manual inspection of the system catalogs.
    The SQL functions are the easiest to use and are generally recommended.
    The remainder of this section shows how to do it by inspection of the
@@ -39,7 +39,7 @@
   </para>
 
   <para>
-   Using <application>psql</> on a recently vacuumed or analyzed database,
+   Using <application>psql</application> on a recently vacuumed or analyzed database,
    you can issue queries to see the disk usage of any table:
 <programlisting>
 SELECT pg_relation_filepath(oid), relpages FROM pg_class WHERE relname = 'customer';
@@ -49,14 +49,14 @@ SELECT pg_relation_filepath(oid), relpages FROM pg_class WHERE relname = 'custom
  base/16384/16806     |       60
 (1 row)
 </programlisting>
-   Each page is typically 8 kilobytes. (Remember, <structfield>relpages</>
-   is only updated by <command>VACUUM</>, <command>ANALYZE</>, and
-   a few DDL commands such as <command>CREATE INDEX</>.)  The file path name
+   Each page is typically 8 kilobytes. (Remember, <structfield>relpages</structfield>
+   is only updated by <command>VACUUM</command>, <command>ANALYZE</command>, and
+   a few DDL commands such as <command>CREATE INDEX</command>.)  The file path name
    is of interest if you want to examine the table's disk file directly.
   </para>
 
   <para>
-   To show the space used by <acronym>TOAST</> tables, use a query
+   To show the space used by <acronym>TOAST</acronym> tables, use a query
    like the following:
 <programlisting>
 SELECT relname, relpages
@@ -124,7 +124,7 @@ ORDER BY relpages DESC;
    If you cannot free up additional space on the disk by deleting
    other things, you can move some of the database files to other file
    systems by making use of tablespaces. See <xref
-   linkend="manage-ag-tablespaces"> for more information about that.
+   linkend="manage-ag-tablespaces"/> for more information about that.
   </para>
 
   <tip>
diff --git a/doc/src/sgml/dml.sgml b/doc/src/sgml/dml.sgml
index 071cdb610f..1e05c84fd1 100644
--- a/doc/src/sgml/dml.sgml
+++ b/doc/src/sgml/dml.sgml
@@ -33,10 +33,10 @@
   </para>
 
   <para>
-   To create a new row, use the <xref linkend="sql-insert">
+   To create a new row, use the <xref linkend="sql-insert"/>
    command.  The command requires the
    table name and column values.  For
-   example, consider the products table from <xref linkend="ddl">:
+   example, consider the products table from <xref linkend="ddl"/>:
 <programlisting>
 CREATE TABLE products (
     product_no integer,
@@ -107,16 +107,16 @@ INSERT INTO products (product_no, name, price)
     WHERE release_date = 'today';
 </programlisting>
    This provides the full power of the SQL query mechanism (<xref
-   linkend="queries">) for computing the rows to be inserted.
+   linkend="queries"/>) for computing the rows to be inserted.
   </para>
 
   <tip>
    <para>
     When inserting a lot of data at the same time, considering using
-    the <xref linkend="sql-copy"> command.
-    It is not as flexible as the <xref linkend="sql-insert">
+    the <xref linkend="sql-copy"/> command.
+    It is not as flexible as the <xref linkend="sql-insert"/>
     command, but is more efficient. Refer
-    to <xref linkend="populate"> for more information on improving
+    to <xref linkend="populate"/> for more information on improving
     bulk loading performance.
    </para>
   </tip>
@@ -141,7 +141,7 @@ INSERT INTO products (product_no, name, price)
   </para>
 
   <para>
-   To update existing rows, use the <xref linkend="sql-update">
+   To update existing rows, use the <xref linkend="sql-update"/>
    command.  This requires
    three pieces of information:
    <orderedlist spacing="compact">
@@ -160,7 +160,7 @@ INSERT INTO products (product_no, name, price)
   </para>
 
   <para>
-   Recall from <xref linkend="ddl"> that SQL does not, in general,
+   Recall from <xref linkend="ddl"/> that SQL does not, in general,
    provide a unique identifier for rows.  Therefore it is not
    always possible to directly specify which row to update.
    Instead, you specify which conditions a row must meet in order to
@@ -203,7 +203,7 @@ UPDATE products SET price = price * 1.10;
    this does not create any ambiguity.  Of course, the
    <literal>WHERE</literal> condition does
    not have to be an equality test.  Many other operators are
-   available (see <xref linkend="functions">).  But the expression
+   available (see <xref linkend="functions"/>).  But the expression
    needs to evaluate to a Boolean result.
   </para>
 
@@ -243,7 +243,7 @@ UPDATE mytable SET a = 5, b = 3, c = 1 WHERE a &gt; 0;
   </para>
 
   <para>
-   You use the <xref linkend="sql-delete">
+   You use the <xref linkend="sql-delete"/>
    command to remove rows; the syntax is very similar to the
    <command>UPDATE</command> command.  For instance, to remove all
    rows from the products table that have a price of 10, use:
@@ -285,42 +285,42 @@ DELETE FROM products;
 
   <para>
    Sometimes it is useful to obtain data from modified rows while they are
-   being manipulated.  The <command>INSERT</>, <command>UPDATE</>,
-   and <command>DELETE</> commands all have an
-   optional <literal>RETURNING</> clause that supports this.  Use
-   of <literal>RETURNING</> avoids performing an extra database query to
+   being manipulated.  The <command>INSERT</command>, <command>UPDATE</command>,
+   and <command>DELETE</command> commands all have an
+   optional <literal>RETURNING</literal> clause that supports this.  Use
+   of <literal>RETURNING</literal> avoids performing an extra database query to
    collect the data, and is especially valuable when it would otherwise be
    difficult to identify the modified rows reliably.
   </para>
 
   <para>
-   The allowed contents of a <literal>RETURNING</> clause are the same as
-   a <command>SELECT</> command's output list
-   (see <xref linkend="queries-select-lists">).  It can contain column
+   The allowed contents of a <literal>RETURNING</literal> clause are the same as
+   a <command>SELECT</command> command's output list
+   (see <xref linkend="queries-select-lists"/>).  It can contain column
    names of the command's target table, or value expressions using those
-   columns.  A common shorthand is <literal>RETURNING *</>, which selects
+   columns.  A common shorthand is <literal>RETURNING *</literal>, which selects
    all columns of the target table in order.
   </para>
 
   <para>
-   In an <command>INSERT</>, the data available to <literal>RETURNING</> is
+   In an <command>INSERT</command>, the data available to <literal>RETURNING</literal> is
    the row as it was inserted.  This is not so useful in trivial inserts,
    since it would just repeat the data provided by the client.  But it can
    be very handy when relying on computed default values.  For example,
-   when using a <link linkend="datatype-serial"><type>serial</></link>
-   column to provide unique identifiers, <literal>RETURNING</> can return
+   when using a <link linkend="datatype-serial"><type>serial</type></link>
+   column to provide unique identifiers, <literal>RETURNING</literal> can return
    the ID assigned to a new row:
 <programlisting>
 CREATE TABLE users (firstname text, lastname text, id serial primary key);
 
 INSERT INTO users (firstname, lastname) VALUES ('Joe', 'Cool') RETURNING id;
 </programlisting>
-   The <literal>RETURNING</> clause is also very useful
-   with <literal>INSERT ... SELECT</>.
+   The <literal>RETURNING</literal> clause is also very useful
+   with <literal>INSERT ... SELECT</literal>.
   </para>
 
   <para>
-   In an <command>UPDATE</>, the data available to <literal>RETURNING</> is
+   In an <command>UPDATE</command>, the data available to <literal>RETURNING</literal> is
    the new content of the modified row.  For example:
 <programlisting>
 UPDATE products SET price = price * 1.10
@@ -330,7 +330,7 @@ UPDATE products SET price = price * 1.10
   </para>
 
   <para>
-   In a <command>DELETE</>, the data available to <literal>RETURNING</> is
+   In a <command>DELETE</command>, the data available to <literal>RETURNING</literal> is
    the content of the deleted row.  For example:
 <programlisting>
 DELETE FROM products
@@ -340,10 +340,10 @@ DELETE FROM products
   </para>
 
   <para>
-   If there are triggers (<xref linkend="triggers">) on the target table,
-   the data available to <literal>RETURNING</> is the row as modified by
+   If there are triggers (<xref linkend="triggers"/>) on the target table,
+   the data available to <literal>RETURNING</literal> is the row as modified by
    the triggers.  Thus, inspecting columns computed by triggers is another
-   common use-case for <literal>RETURNING</>.
+   common use-case for <literal>RETURNING</literal>.
   </para>
 
  </sect1>
diff --git a/doc/src/sgml/docguide.sgml b/doc/src/sgml/docguide.sgml
index ff58a17335..b4338e0e73 100644
--- a/doc/src/sgml/docguide.sgml
+++ b/doc/src/sgml/docguide.sgml
@@ -47,23 +47,11 @@
   <para>
    The documentation sources are written in
    <firstterm>DocBook</firstterm>, which is a markup language
-   superficially similar to <acronym>HTML</acronym>.  Both of these
-   languages are applications of the <firstterm>Standard Generalized
-   Markup Language</firstterm>, <acronym>SGML</acronym>, which is
-   essentially a language for describing other languages.  In what
-   follows, the terms DocBook and <acronym>SGML</acronym> are both
+   defined in <acronym>XML</acronym>.  In what
+   follows, the terms DocBook and <acronym>XML</acronym> are both
    used, but technically they are not interchangeable.
   </para>
 
-  <note>
-   <para>
-    The PostgreSQL documentation is currently being transitioned from DocBook
-    SGML and DSSSL style sheets to DocBook XML and XSLT style sheets.  Be
-    careful to look at the instructions relating to the PostgreSQL version you
-    are dealing with, as the procedures and required tools will change.
-   </para>
-  </note>
-
   <para>
   <productname>DocBook</productname> allows an author to specify the
    structure and content of a technical document without worrying
@@ -97,19 +85,8 @@
       <para>
        This is the definition of DocBook itself.  We currently use version
        4.2; you cannot use later or earlier versions.  You need
-       the <acronym>SGML</acronym> and the <acronym>XML</acronym> variant of
-       the DocBook DTD of the same version.  These will usually be in separate
-       packages.
-      </para>
-     </listitem>
-    </varlistentry>
-
-    <varlistentry>
-     <term><ulink url="http://www.oasis-open.org/cover/ISOEnts.zip">ISO 8879 character entities</ulink></term>
-     <listitem>
-      <para>
-       These are required by DocBook SGML but are distributed separately
-       because they are maintained by ISO.
+       the <acronym>XML</acronym> variant of the DocBook DTD, not
+       the <acronym>SGML</acronym> variant.
       </para>
      </listitem>
     </varlistentry>
@@ -130,17 +107,6 @@
      </listitem>
     </varlistentry>
 
-    <varlistentry>
-     <term><ulink url="http://openjade.sourceforge.net">OpenSP</ulink></term>
-     <listitem>
-      <para>
-       This is the base package of <acronym>SGML</acronym> processing.  Note
-       that we no longer need OpenJade, the <acronym>DSSSL</acronym>
-       processor, only the OpenSP package for converting SGML to XML.
-      </para>
-     </listitem>
-    </varlistentry>
-
     <varlistentry>
      <term><ulink url="http://xmlsoft.org/">Libxml2</ulink> for <command>xmllint</command></term>
      <listitem>
@@ -201,7 +167,7 @@
    <para>
     To install the required packages, use:
 <programlisting>
-yum install docbook-dtds docbook-style-xsl fop libxslt opensp
+yum install docbook-dtds docbook-style-xsl fop libxslt
 </programlisting>
    </para>
   </sect2>
@@ -209,41 +175,10 @@ yum install docbook-dtds docbook-style-xsl fop libxslt opensp
   <sect2>
    <title>Installation on FreeBSD</title>
 
-   <para>
-    The FreeBSD Documentation Project is itself a heavy user of
-    DocBook, so it comes as no surprise that there is a full set of
-    <quote>ports</quote> of the documentation tools available on
-    FreeBSD.  The following ports need to be installed to build the
-    documentation on FreeBSD.
-    <itemizedlist>
-     <listitem>
-      <para><filename>textproc/docbook-sgml</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/docbook-xml</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/docbook-xsl</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/dsssl-docbook-modular</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/libxslt</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/fop</filename></para>
-     </listitem>
-     <listitem>
-      <para><filename>textproc/opensp</filename></para>
-     </listitem>
-    </itemizedlist>
-   </para>
-
    <para>
     To install the required packages with <command>pkg</command>, use:
 <programlisting>
-pkg install docbook-sgml docbook-xml docbook-xsl fop libxslt opensp
+pkg install docbook-xml docbook-xsl fop libxslt
 </programlisting>
    </para>
 
@@ -268,7 +203,7 @@ pkg install docbook-sgml docbook-xml docbook-xsl fop libxslt opensp
     available for <productname>Debian GNU/Linux</productname>.
     To install, simply use:
 <programlisting>
-apt-get install docbook docbook-xml docbook-xsl fop libxml2-utils opensp xsltproc
+apt-get install docbook-xml docbook-xsl fop libxml2-utils xsltproc
 </programlisting>
    </para>
   </sect2>
@@ -277,117 +212,21 @@ apt-get install docbook docbook-xml docbook-xsl fop libxml2-utils opensp xsltpro
    <title>macOS</title>
 
    <para>
-    If you use MacPorts, the following will get you set up:
-<programlisting>
-sudo port install docbook-sgml-4.2 docbook-xml-4.2 docbook-xsl fop libxslt opensp
-</programlisting>
+    On macOS, you can build the HTML and man documentation without installing
+    anything extra.  If you want to build PDFs or want to install a local copy
+    of DocBook, you can get those from your preferred package manager.
    </para>
-  </sect2>
-
-  <sect2>
-   <title>Manual Installation from Source</title>
 
    <para>
-    The manual installation process of the DocBook tools is somewhat
-    complex, so if you have pre-built packages available, use them.
-    We describe here only a standard setup, with reasonably standard
-    installation paths, and no <quote>fancy</quote> features.  For
-    details, you should study the documentation of the respective
-    package, and read <acronym>SGML</acronym> introductory material.
-   </para>
-
-   <sect3>
-    <title>Installing OpenSP</title>
-
-    <para>
-     The installation of OpenSP offers a GNU-style
-     <literal>./configure; make; make install</literal> build process.
-     Details can be found in the OpenSP source distribution. In a nutshell:
-<synopsis>
-./configure --enable-default-catalog=/usr/local/etc/sgml/catalog
-make
-make install
-</synopsis>
-     Be sure to remember where you put the <quote>default catalog</quote>; you
-     will need it below.  You can also leave it off, but then you will have to
-     set the environment variable <envar>SGML_CATALOG_FILES</envar> to point
-     to the file whenever you use any programs from OpenSP later on.  (This
-     method is also an option if OpenSP is already installed and you want to
-     install the rest of the toolchain locally.)
-    </para>
-   </sect3>
-
-   <sect3>
-    <title>Installing the <productname>DocBook</productname> <acronym>DTD</acronym> Kit</title>
-
-    <procedure>
-     <step>
-      <para>
-       Obtain the <ulink url="http://www.docbook.org/sgml/4.2/docbook-4.2.zip">
-       DocBook V4.2 distribution</ulink>.
-      </para>
-     </step>
-
-     <step>
-      <para>
-       Create the directory
-       <filename>/usr/local/share/sgml/docbook-4.2</filename> and change
-       to it. (The exact location is irrelevant, but this one is
-       reasonable within the layout we are following here.)
-<screen>
-<prompt>$ </prompt><userinput>mkdir /usr/local/share/sgml/docbook-4.2</userinput>
-<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
-</screen>
-      </para>
-     </step>
-
-     <step>
-      <para>
-       Unpack the archive:
-<screen>
-<prompt>$ </prompt><userinput>unzip -a ...../docbook-4.2.zip</userinput>
-</screen>
-       (The archive will unpack its files into the current directory.)
-      </para>
-     </step>
-
-     <step>
-      <para>
-       Edit the file
-       <filename>/usr/local/share/sgml/catalog</filename> (or whatever
-       you told jade during installation) and put a line like this
-       into it:
+    If you use MacPorts, the following will get you set up:
 <programlisting>
-CATALOG "docbook-4.2/docbook.cat"
+sudo port install docbook-xml-4.2 docbook-xsl fop
 </programlisting>
-      </para>
-     </step>
-
-     <step>
-      <para>
-       Download the <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip">
-       ISO 8879 character entities archive</ulink>, unpack it, and put the
-       files in the same directory you put the DocBook files in:
-<screen>
-<prompt>$ </prompt><userinput>cd /usr/local/share/sgml/docbook-4.2</userinput>
-<prompt>$ </prompt><userinput>unzip ...../ISOEnts.zip</userinput>
-</screen>
-      </para>
-     </step>
-
-     <step>
-      <para>
-       Run the following command in the directory with the DocBook and ISO files:
+    If you use Homebrew, use this:
 <programlisting>
-perl -pi -e 's/iso-(.*).gml/ISO\1/g' docbook.cat
+brew install docbook docbook-xsl fop
 </programlisting>
-       (This fixes a mixup between the names used in the DocBook
-       catalog file and the actual names of the ISO character entity
-       files.)
-      </para>
-     </step>
-    </procedure>
-   </sect3>
+   </para>
   </sect2>
 
   <sect2 id="docguide-toolsets-configure">
@@ -400,26 +239,14 @@ perl -pi -e 's/iso-(.*).gml/ISO\1/g' docbook.cat
    Check the output near the end of the run, it should look something
    like this:
 <screen>
-<computeroutput>
-checking for onsgmls... onsgmls
-checking for DocBook V4.2... yes
-checking for dbtoepub... dbtoepub
 checking for xmllint... xmllint
+checking for DocBook XML V4.2... yes
+checking for dbtoepub... dbtoepub
 checking for xsltproc... xsltproc
-checking for osx... osx
 checking for fop... fop
-</computeroutput>
 </screen>
-   If neither <filename>onsgmls</filename> nor
-   <filename>nsgmls</filename> were found then some of the following tests
-   will be skipped.  <filename>nsgmls</filename> is part of the OpenSP
-   package.  You can pass the environment variable
-   <envar>NSGMLS</envar> to configure to point
-   to the programs if they are not found automatically.  If
-   <quote>DocBook V4.2</quote> was not found then you did not install
-   the DocBook DTD kit in a place where OpenSP can find it, or you have
-   not set up the catalog files correctly.  See the installation hints
-   above.
+   If <filename>xmllint</filename> was not found then some of the following
+   tests will be skipped.
   </para>
 
   </sect2>
@@ -449,7 +276,7 @@ checking for fop... fop
 
    <para>
     To produce HTML documentation with the stylesheet used on <ulink
-    url="https://www.postgresql.org/docs/current">postgresql.org</> instead of the
+    url="https://www.postgresql.org/docs/current">postgresql.org</ulink> instead of the
     default simple style use:
 <screen>
 <prompt>doc/src/sgml$ </prompt><userinput>make STYLE=website html</userinput>
@@ -464,9 +291,7 @@ checking for fop... fop
    We use the DocBook XSL stylesheets to
    convert <productname>DocBook</productname>
    <sgmltag>refentry</sgmltag> pages to *roff output suitable for man
-   pages.  The man pages are also distributed as a tar archive,
-   similar to the <acronym>HTML</acronym> version.  To create the man
-   pages, use the commands:
+   pages.  To create the man pages, use the command:
 <screen>
 <prompt>doc/src/sgml$ </prompt><userinput>make man</userinput>
 </screen>
@@ -511,11 +336,11 @@ checking for fop... fop
     file <filename>~/.foprc</filename>, for example:
 <programlisting>
 # FOP binary distribution
-FOP_OPTS='-Xmx1000m'
+FOP_OPTS='-Xmx1500m'
 # Debian
-JAVA_ARGS='-Xmx1000m'
+JAVA_ARGS='-Xmx1500m'
 # Red Hat
-ADDITIONAL_FLAGS='-Xmx1000m'
+ADDITIONAL_FLAGS='-Xmx1500m'
 </programlisting>
     There is a minimum amount of memory that is required, and to some extent
     more memory appears to make things a bit faster.  On systems with very
@@ -536,7 +361,7 @@ ADDITIONAL_FLAGS='-Xmx1000m'
     The installation instructions are also distributed as plain text,
     in case they are needed in a situation where better reading tools
     are not available.  The <filename>INSTALL</filename> file
-    corresponds to <xref linkend="installation">, with some minor
+    corresponds to <xref linkend="installation"/>, with some minor
     changes to account for the different context.  To recreate the
     file, change to the directory <filename>doc/src/sgml</filename>
     and enter <userinput>make INSTALL</userinput>.
diff --git a/doc/src/sgml/earthdistance.sgml b/doc/src/sgml/earthdistance.sgml
index 6dedc4a5f4..1f3ea6aa6e 100644
--- a/doc/src/sgml/earthdistance.sgml
+++ b/doc/src/sgml/earthdistance.sgml
@@ -8,18 +8,18 @@
  </indexterm>
 
  <para>
-  The <filename>earthdistance</> module provides two different approaches to
+  The <filename>earthdistance</filename> module provides two different approaches to
   calculating great circle distances on the surface of the Earth. The one
-  described first depends on the <filename>cube</> module (which
-  <emphasis>must</> be installed before <filename>earthdistance</> can be
-  installed). The second one is based on the built-in <type>point</> data type,
+  described first depends on the <filename>cube</filename> module (which
+  <emphasis>must</emphasis> be installed before <filename>earthdistance</filename> can be
+  installed). The second one is based on the built-in <type>point</type> data type,
   using longitude and latitude for the coordinates.
  </para>
 
  <para>
   In this module, the Earth is assumed to be perfectly spherical.
   (If that's too inaccurate for you, you might want to look at the
-  <application><ulink url="http://postgis.net/">PostGIS</ulink></>
+  <application><ulink url="http://postgis.net/">PostGIS</ulink></application>
   project.)
  </para>
 
@@ -29,13 +29,13 @@
   <para>
    Data is stored in cubes that are points (both corners are the same) using 3
    coordinates representing the x, y, and z distance from the center of the
-   Earth.  A domain <type>earth</> over <type>cube</> is provided, which
+   Earth.  A domain <type>earth</type> over <type>cube</type> is provided, which
    includes constraint checks that the value meets these restrictions and
    is reasonably close to the actual surface of the Earth.
   </para>
 
   <para>
-   The radius of the Earth is obtained from the <function>earth()</>
+   The radius of the Earth is obtained from the <function>earth()</function>
    function. It is given in meters. But by changing this one function you can
    change the module to use some other units, or to use a different value of
    the radius that you feel is more appropriate.
@@ -43,8 +43,8 @@
 
   <para>
    This package has applications to astronomical databases as well.
-   Astronomers will probably want to change <function>earth()</> to return a
-   radius of <literal>180/pi()</> so that distances are in degrees.
+   Astronomers will probably want to change <function>earth()</function> to return a
+   radius of <literal>180/pi()</literal> so that distances are in degrees.
   </para>
 
   <para>
@@ -56,7 +56,7 @@
 
   <para>
    The provided functions are shown
-   in <xref linkend="earthdistance-cube-functions">.
+   in <xref linkend="earthdistance-cube-functions"/>.
   </para>
 
   <table id="earthdistance-cube-functions">
@@ -123,11 +123,11 @@
       <entry><function>earth_box(earth, float8)</function><indexterm><primary>earth_box</primary></indexterm></entry>
       <entry><type>cube</type></entry>
       <entry>Returns a box suitable for an indexed search using the cube
-       <literal>@&gt;</>
+       <literal>@&gt;</literal>
        operator for points within a given great circle distance of a location.
        Some points in this box are further than the specified great circle
        distance from the location, so a second check using
-       <function>earth_distance</> should be included in the query.
+       <function>earth_distance</function> should be included in the query.
       </entry>
      </row>
     </tbody>
@@ -141,7 +141,7 @@
 
   <para>
    The second part of the module relies on representing Earth locations as
-   values of type <type>point</>, in which the first component is taken to
+   values of type <type>point</type>, in which the first component is taken to
    represent longitude in degrees, and the second component is taken to
    represent latitude in degrees.  Points are taken as (longitude, latitude)
    and not vice versa because longitude is closer to the intuitive idea of
@@ -150,7 +150,7 @@
 
   <para>
    A single operator is provided, shown
-   in <xref linkend="earthdistance-point-operators">.
+   in <xref linkend="earthdistance-point-operators"/>.
   </para>
 
   <table id="earthdistance-point-operators">
@@ -165,7 +165,7 @@
     </thead>
     <tbody>
      <row>
-      <entry><type>point</> <literal>&lt;@&gt;</literal> <type>point</></entry>
+      <entry><type>point</type> <literal>&lt;@&gt;</literal> <type>point</type></entry>
       <entry><type>float8</type></entry>
       <entry>Gives the distance in statute miles between
        two points on the Earth's surface.
@@ -176,15 +176,15 @@
   </table>
 
   <para>
-   Note that unlike the <type>cube</>-based part of the module, units
-   are hardwired here: changing the <function>earth()</> function will
+   Note that unlike the <type>cube</type>-based part of the module, units
+   are hardwired here: changing the <function>earth()</function> function will
    not affect the results of this operator.
   </para>
 
   <para>
    One disadvantage of the longitude/latitude representation is that
    you need to be careful about the edge conditions near the poles
-   and near +/- 180 degrees of longitude.  The <type>cube</>-based
+   and near +/- 180 degrees of longitude.  The <type>cube</type>-based
    representation avoids these discontinuities.
   </para>
 
diff --git a/doc/src/sgml/ecpg.sgml b/doc/src/sgml/ecpg.sgml
index f13a0e999f..98b6840520 100644
--- a/doc/src/sgml/ecpg.sgml
+++ b/doc/src/sgml/ecpg.sgml
@@ -31,7 +31,7 @@
    specially marked sections.  To build the program, the source code (<filename>*.pgc</filename>)
    is first passed through the embedded SQL preprocessor, which converts it
    to an ordinary C program (<filename>*.c</filename>), and afterwards it can be processed by a C
-   compiler.  (For details about the compiling and linking see <xref linkend="ecpg-process">).
+   compiler.  (For details about the compiling and linking see <xref linkend="ecpg-process"/>).
    Converted ECPG applications call functions in the libpq library
    through the embedded SQL library (ecpglib), and communicate with
    the PostgreSQL server using the normal frontend-backend protocol.
@@ -46,7 +46,7 @@
    correctness.  Third, embedded <acronym>SQL</acronym> in C is
    specified in the <acronym>SQL</acronym> standard and supported by
    many other <acronym>SQL</acronym> database systems.  The
-   <productname>PostgreSQL</> implementation is designed to match this
+   <productname>PostgreSQL</productname> implementation is designed to match this
    standard as much as possible, and it is usually possible to port
    embedded <acronym>SQL</acronym> programs written for other SQL
    databases to <productname>PostgreSQL</productname> with relative
@@ -97,19 +97,19 @@ EXEC SQL CONNECT TO <replaceable>target</replaceable> <optional>AS <replaceable>
    <itemizedlist>
     <listitem>
      <simpara>
-      <literal><replaceable>dbname</><optional>@<replaceable>hostname</></optional><optional>:<replaceable>port</></optional></literal>
+      <literal><replaceable>dbname</replaceable><optional>@<replaceable>hostname</replaceable></optional><optional>:<replaceable>port</replaceable></optional></literal>
      </simpara>
     </listitem>
 
     <listitem>
      <simpara>
-      <literal>tcp:postgresql://<replaceable>hostname</><optional>:<replaceable>port</></optional><optional>/<replaceable>dbname</></optional><optional>?<replaceable>options</></optional></literal>
+      <literal>tcp:postgresql://<replaceable>hostname</replaceable><optional>:<replaceable>port</replaceable></optional><optional>/<replaceable>dbname</replaceable></optional><optional>?<replaceable>options</replaceable></optional></literal>
      </simpara>
     </listitem>
 
     <listitem>
      <simpara>
-      <literal>unix:postgresql://<replaceable>hostname</><optional>:<replaceable>port</></optional><optional>/<replaceable>dbname</></optional><optional>?<replaceable>options</></optional></literal>
+      <literal>unix:postgresql://<replaceable>hostname</replaceable><optional>:<replaceable>port</replaceable></optional><optional>/<replaceable>dbname</replaceable></optional><optional>?<replaceable>options</replaceable></optional></literal>
      </simpara>
     </listitem>
 
@@ -186,6 +186,18 @@ EXEC SQL CONNECT TO <replaceable>target</replaceable> <optional>AS <replaceable>
    chapter).
   </para>
 
+  <para>
+   If untrusted users have access to a database that has not adopted a
+   <link linkend="ddl-schemas-patterns">secure schema usage pattern</link>,
+   begin each session by removing publicly-writable schemas
+   from <varname>search_path</varname>.  For example,
+   add <literal>options=-csearch_path=</literal>
+   to <literal><replaceable>options</replaceable></literal>, or
+   issue <literal>EXEC SQL SELECT pg_catalog.set_config('search_path', '',
+   false);</literal> after connecting.  This consideration is not specific to
+   ECPG; it applies to every interface for executing arbitrary SQL commands.
+  </para>
+
   <para>
    Here are some examples of <command>CONNECT</command> statements:
 <programlisting>
@@ -266,8 +278,11 @@ int
 main()
 {
     EXEC SQL CONNECT TO testdb1 AS con1 USER testuser;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL CONNECT TO testdb2 AS con2 USER testuser;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL CONNECT TO testdb3 AS con3 USER testuser;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     /* This query would be executed in the last opened database "testdb3". */
     EXEC SQL SELECT current_database() INTO :dbname;
@@ -397,9 +412,9 @@ EXEC SQL COMMIT;
    row can also be executed using
    <literal>EXEC SQL</literal> directly.  To handle result sets with
    multiple rows, an application has to use a cursor;
-   see <xref linkend="ecpg-cursors"> below.  (As a special case, an
+   see <xref linkend="ecpg-cursors"/> below.  (As a special case, an
    application can fetch multiple rows at once into an array host
-   variable; see <xref linkend="ecpg-variables-arrays">.)
+   variable; see <xref linkend="ecpg-variables-arrays"/>.)
   </para>
 
   <para>
@@ -422,7 +437,7 @@ EXEC SQL SHOW search_path INTO :var;
    <literal>:<replaceable>something</replaceable></literal> are
    <firstterm>host variables</firstterm>, that is, they refer to
    variables in the C program.  They are explained in <xref
-   linkend="ecpg-variables">.
+   linkend="ecpg-variables"/>.
   </para>
   </sect2>
 
@@ -452,8 +467,8 @@ EXEC SQL COMMIT;
 
   <para>
    For more details about declaration of the cursor,
-   see <xref linkend="ecpg-sql-declare">, and
-   see <xref linkend="sql-fetch"> for <literal>FETCH</literal> command
+   see <xref linkend="ecpg-sql-declare"/>, and
+   see <xref linkend="sql-fetch"/> for <literal>FETCH</literal> command
    details.
   </para>
 
@@ -475,9 +490,9 @@ EXEC SQL COMMIT;
    In the default mode, statements are committed only when
    <command>EXEC SQL COMMIT</command> is issued. The embedded SQL
    interface also supports autocommit of transactions (similar to
-   <application>psql</>'s default behavior) via the <option>-t</option>
+   <application>psql</application>'s default behavior) via the <option>-t</option>
    command-line option to <command>ecpg</command> (see <xref
-   linkend="app-ecpg">) or via the <literal>EXEC SQL SET AUTOCOMMIT TO
+   linkend="app-ecpg"/>) or via the <literal>EXEC SQL SET AUTOCOMMIT TO
    ON</literal> statement. In autocommit mode, each command is
    automatically committed unless it is inside an explicit transaction
    block. This mode can be explicitly turned off using <literal>EXEC
@@ -507,7 +522,7 @@ EXEC SQL COMMIT;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>EXEC SQL PREPARE TRANSACTION </literal><replaceable class="PARAMETER">transaction_id</></term>
+      <term><literal>EXEC SQL PREPARE TRANSACTION </literal><replaceable class="parameter">transaction_id</replaceable></term>
       <listitem>
        <para>
         Prepare the current transaction for two-phase commit.
@@ -516,7 +531,7 @@ EXEC SQL COMMIT;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>EXEC SQL COMMIT PREPARED </literal><replaceable class="PARAMETER">transaction_id</></term>
+      <term><literal>EXEC SQL COMMIT PREPARED </literal><replaceable class="parameter">transaction_id</replaceable></term>
       <listitem>
        <para>
         Commit a transaction that is in prepared state.
@@ -525,7 +540,7 @@ EXEC SQL COMMIT;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>EXEC SQL ROLLBACK PREPARED </literal><replaceable class="PARAMETER">transaction_id</></term>
+      <term><literal>EXEC SQL ROLLBACK PREPARED </literal><replaceable class="parameter">transaction_id</replaceable></term>
       <listitem>
        <para>
         Roll back a transaction that is in prepared state.
@@ -617,8 +632,8 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
 
    <para>
     For more details about <literal>PREPARE</literal>,
-    see <xref linkend="ecpg-sql-prepare">. Also
-    see <xref linkend="ecpg-dynamic"> for more details about using
+    see <xref linkend="ecpg-sql-prepare"/>. Also
+    see <xref linkend="ecpg-dynamic"/> for more details about using
     placeholders and input parameters.
    </para>
   </sect2>
@@ -628,7 +643,7 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
   <title>Using Host Variables</title>
 
   <para>
-   In <xref linkend="ecpg-commands"> you saw how you can execute SQL
+   In <xref linkend="ecpg-commands"/> you saw how you can execute SQL
    statements from an embedded SQL program.  Some of those statements
    only used fixed values and did not provide a way to insert
    user-supplied values into statements or have the program process
@@ -646,7 +661,7 @@ EXEC SQL DEALLOCATE PREPARE <replaceable>name</replaceable>;
   <para>
    Another way to exchange values between PostgreSQL backends and ECPG
    applications is the use of SQL descriptors, described
-   in <xref linkend="ecpg-descriptors">.
+   in <xref linkend="ecpg-descriptors"/>.
   </para>
 
   <sect2 id="ecpg-variables-overview">
@@ -720,7 +735,7 @@ EXEC SQL int i = 4;
 
    <para>
     The definition of a structure or union also must be listed inside
-    a <literal>DECLARE</> section. Otherwise the preprocessor cannot
+    a <literal>DECLARE</literal> section. Otherwise the preprocessor cannot
     handle these types since it does not know the definition.
    </para>
   </sect2>
@@ -812,11 +827,11 @@ do
     directly.  Other PostgreSQL data types, such
     as <type>timestamp</type> and <type>numeric</type> can only be
     accessed through special library functions; see
-    <xref linkend="ecpg-special-types">.
+    <xref linkend="ecpg-special-types"/>.
    </para>
 
    <para>
-    <xref linkend="ecpg-datatype-hostvars-table"> shows which PostgreSQL
+    <xref linkend="ecpg-datatype-hostvars-table"/> shows which PostgreSQL
     data types correspond to which C data types.  When you wish to
     send or receive a value of a given PostgreSQL data type, you
     should declare a C variable of the corresponding C data type in
@@ -851,12 +866,12 @@ do
 
       <row>
        <entry><type>decimal</type></entry>
-       <entry><type>decimal</type><footnote id="ecpg-datatype-table-fn"><para>This type can only be accessed through special library functions; see <xref linkend="ecpg-special-types">.</para></footnote></entry>
+       <entry><type>decimal</type><footnote id="ecpg-datatype-table-fn"><para>This type can only be accessed through special library functions; see <xref linkend="ecpg-special-types"/>.</para></footnote></entry>
       </row>
 
       <row>
        <entry><type>numeric</type></entry>
-       <entry><type>numeric</type><footnoteref linkend="ecpg-datatype-table-fn"></entry>
+       <entry><type>numeric</type><footnoteref linkend="ecpg-datatype-table-fn"/></entry>
       </row>
 
       <row>
@@ -890,8 +905,8 @@ do
       </row>
 
       <row>
-       <entry><type>character(<replaceable>n</>)</type>, <type>varchar(<replaceable>n</>)</type>, <type>text</type></entry>
-       <entry><type>char[<replaceable>n</>+1]</type>, <type>VARCHAR[<replaceable>n</>+1]</type><footnote><para>declared in <filename>ecpglib.h</filename></para></footnote></entry>
+       <entry><type>character(<replaceable>n</replaceable>)</type>, <type>varchar(<replaceable>n</replaceable>)</type>, <type>text</type></entry>
+       <entry><type>char[<replaceable>n</replaceable>+1]</type>, <type>VARCHAR[<replaceable>n</replaceable>+1]</type><footnote><para>declared in <filename>ecpglib.h</filename></para></footnote></entry>
       </row>
 
       <row>
@@ -901,17 +916,17 @@ do
 
       <row>
        <entry><type>timestamp</type></entry>
-       <entry><type>timestamp</type><footnoteref linkend="ecpg-datatype-table-fn"></entry>
+       <entry><type>timestamp</type><footnoteref linkend="ecpg-datatype-table-fn"/></entry>
       </row>
 
       <row>
        <entry><type>interval</type></entry>
-       <entry><type>interval</type><footnoteref linkend="ecpg-datatype-table-fn"></entry>
+       <entry><type>interval</type><footnoteref linkend="ecpg-datatype-table-fn"/></entry>
       </row>
 
       <row>
        <entry><type>date</type></entry>
-       <entry><type>date</type><footnoteref linkend="ecpg-datatype-table-fn"></entry>
+       <entry><type>date</type><footnoteref linkend="ecpg-datatype-table-fn"/></entry>
       </row>
 
       <row>
@@ -955,7 +970,7 @@ EXEC SQL END DECLARE SECTION;
      The other way is using the <type>VARCHAR</type> type, which is a
      special type provided by ECPG.  The definition on an array of
      type <type>VARCHAR</type> is converted into a
-     named <type>struct</> for every variable. A declaration like:
+     named <type>struct</type> for every variable. A declaration like:
 <programlisting>
 VARCHAR var[180];
 </programlisting>
@@ -994,15 +1009,15 @@ struct varchar_var { int len; char arr[180]; } var;
      ECPG contains some special types that help you to interact easily
      with some special data types from the PostgreSQL server. In
      particular, it has implemented support for the
-     <type>numeric</>, <type>decimal</type>, <type>date</>, <type>timestamp</>,
-     and <type>interval</> types.  These data types cannot usefully be
+     <type>numeric</type>, <type>decimal</type>, <type>date</type>, <type>timestamp</type>,
+     and <type>interval</type> types.  These data types cannot usefully be
      mapped to primitive host variable types (such
-     as <type>int</>, <type>long long int</type>,
+     as <type>int</type>, <type>long long int</type>,
      or <type>char[]</type>), because they have a complex internal
      structure.  Applications deal with these types by declaring host
      variables in special types and accessing them using functions in
      the pgtypes library.  The pgtypes library, described in detail
-     in <xref linkend="ecpg-pgtypes"> contains basic functions to deal
+     in <xref linkend="ecpg-pgtypes"/> contains basic functions to deal
      with those types, such that you do not need to send a query to
      the SQL server just for adding an interval to a time stamp for
      example.
@@ -1011,7 +1026,7 @@ struct varchar_var { int len; char arr[180]; } var;
     <para>
      The follow subsections describe these special data types. For
      more details about pgtypes library functions,
-     see <xref linkend="ecpg-pgtypes">.
+     see <xref linkend="ecpg-pgtypes"/>.
     </para>
 
     <sect4>
@@ -1062,7 +1077,7 @@ ts = 2010-06-27 18:03:56.949343
       program has to include <filename>pgtypes_date.h</filename>, declare a host variable
       as the date type and convert a DATE value into a text form using
       <function>PGTYPESdate_to_asc()</function> function. For more details about the
-      pgtypes library functions, see <xref linkend="ecpg-pgtypes">.
+      pgtypes library functions, see <xref linkend="ecpg-pgtypes"/>.
      </para>
     </sect4>
 
@@ -1093,6 +1108,7 @@ EXEC SQL BEGIN DECLARE SECTION;
 EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO testdb;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     in = PGTYPESinterval_new();
     EXEC SQL SELECT '1 min'::interval INTO :in;
@@ -1117,7 +1133,7 @@ EXEC SQL END DECLARE SECTION;
       allocating some memory space on the heap, and accessing the
       variable using the pgtypes library functions.  For more details
       about the pgtypes library functions,
-      see <xref linkend="ecpg-pgtypes">.
+      see <xref linkend="ecpg-pgtypes"/>.
      </para>
 
      <para>
@@ -1147,6 +1163,7 @@ EXEC SQL BEGIN DECLARE SECTION;
 EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO testdb;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     num = PGTYPESnumeric_new();
     dec = PGTYPESdecimal_new();
@@ -1193,7 +1210,7 @@ EXEC SQL END DECLARE SECTION;
       There are two use cases for arrays as host variables.  The first
       is a way to store some text string in <type>char[]</type>
       or <type>VARCHAR[]</type>, as
-      explained in <xref linkend="ecpg-char">.  The second use case is to
+      explained in <xref linkend="ecpg-char"/>.  The second use case is to
       retrieve multiple rows from a query result without using a
       cursor.  Without an array, to process a query result consisting
       of multiple rows, it is required to use a cursor and
@@ -1221,6 +1238,7 @@ EXEC SQL END DECLARE SECTION;
     memset(dbid, 0, sizeof(int) * 8);
 
     EXEC SQL CONNECT TO testdb;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     /* Retrieve multiple rows into arrays at once. */
     EXEC SQL SELECT oid,datname INTO :dbid, :dbname FROM pg_database;
@@ -1378,7 +1396,7 @@ EXEC SQL TYPE serial_t IS long;
      <para>
       You can declare pointers to the most common types. Note however
       that you cannot use pointers as target variables of queries
-      without auto-allocation. See <xref linkend="ecpg-descriptors">
+      without auto-allocation. See <xref linkend="ecpg-descriptors"/>
       for more information on auto-allocation.
      </para>
 
@@ -1520,7 +1538,7 @@ while (1)
      Another workaround is to store arrays in their external string
      representation in host variables of type <type>char[]</type>
      or <type>VARCHAR[]</type>.  For more details about this
-     representation, see <xref linkend="arrays-input">.  Note that
+     representation, see <xref linkend="arrays-input"/>.  Note that
      this means that the array cannot be accessed naturally as an
      array in the host program (without further processing that parses
      the text representation).
@@ -1578,7 +1596,7 @@ EXEC SQL CLOSE cur1;
      To enhance this example, the host variables to store values in
      the <command>FETCH</command> command can be gathered into one
      structure.  For more details about the host variable in the
-     structure form, see <xref linkend="ecpg-variables-struct">.
+     structure form, see <xref linkend="ecpg-variables-struct"/>.
      To switch to the structure, the example can be modified as below.
      The two host variables, <varname>intval</varname>
      and <varname>textval</varname>, become members of
@@ -1659,12 +1677,12 @@ while (1)
 
     <para>
      Here is an example using the data type <type>complex</type> from
-     the example in <xref linkend="xtypes">.  The external string
+     the example in <xref linkend="xtypes"/>.  The external string
      representation of that type is <literal>(%lf,%lf)</literal>,
      which is defined in the
      functions <function>complex_in()</function>
      and <function>complex_out()</function> functions
-     in <xref linkend="xtypes">.  The following example inserts the
+     in <xref linkend="xtypes"/>.  The following example inserts the
      complex type values <literal>(1,1)</literal>
      and <literal>(3,3)</literal> into the
      columns <literal>a</literal> and <literal>b</literal>, and select
@@ -1875,7 +1893,7 @@ EXEC SQL EXECUTE mystmt INTO :v1, :v2, :v3 USING 37;
    <para>
     If a query is expected to return more than one result row, a
     cursor should be used, as in the following example.
-    (See <xref linkend="ecpg-cursors"> for more details about the
+    (See <xref linkend="ecpg-cursors"/> for more details about the
     cursor.)
 <programlisting>
 EXEC SQL BEGIN DECLARE SECTION;
@@ -1887,6 +1905,7 @@ char *stmt = "SELECT u.usename as dbaname, d.datname "
 EXEC SQL END DECLARE SECTION;
 
 EXEC SQL CONNECT TO testdb AS con1 USER testuser;
+EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
 EXEC SQL PREPARE stmt1 FROM :stmt;
 
@@ -1941,11 +1960,11 @@ free(out);
    <title>The numeric Type</title>
    <para>
     The numeric type offers to do calculations with arbitrary precision. See
-    <xref linkend="datatype-numeric"> for the equivalent type in the
-    <productname>PostgreSQL</> server. Because of the arbitrary precision this
+    <xref linkend="datatype-numeric"/> for the equivalent type in the
+    <productname>PostgreSQL</productname> server. Because of the arbitrary precision this
     variable needs to be able to expand and shrink dynamically. That's why you
     can only create numeric variables on the heap, by means of the
-    <function>PGTYPESnumeric_new</> and <function>PGTYPESnumeric_free</>
+    <function>PGTYPESnumeric_new</function> and <function>PGTYPESnumeric_free</function>
     functions. The decimal type, which is similar but limited in precision,
     can be created on the stack as well as on the heap.
    </para>
@@ -2092,17 +2111,17 @@ int PGTYPESnumeric_cmp(numeric *var1, numeric *var2)
        <itemizedlist>
         <listitem>
          <para>
-          1, if <literal>var1</> is bigger than <literal>var2</>
+          1, if <literal>var1</literal> is bigger than <literal>var2</literal>
          </para>
         </listitem>
         <listitem>
          <para>
-          -1, if <literal>var1</> is smaller than <literal>var2</>
+          -1, if <literal>var1</literal> is smaller than <literal>var2</literal>
          </para>
         </listitem>
         <listitem>
          <para>
-          0, if <literal>var1</> and <literal>var2</> are equal
+          0, if <literal>var1</literal> and <literal>var2</literal> are equal
          </para>
         </listitem>
        </itemizedlist>
@@ -2119,7 +2138,7 @@ int PGTYPESnumeric_cmp(numeric *var1, numeric *var2)
 int PGTYPESnumeric_from_int(signed int int_val, numeric *var);
 </synopsis>
        This function accepts a variable of type signed int and stores it
-       in the numeric variable <literal>var</>. Upon success, 0 is returned and
+       in the numeric variable <literal>var</literal>. Upon success, 0 is returned and
        -1 in case of a failure.
       </para>
      </listitem>
@@ -2134,7 +2153,7 @@ int PGTYPESnumeric_from_int(signed int int_val, numeric *var);
 int PGTYPESnumeric_from_long(signed long int long_val, numeric *var);
 </synopsis>
        This function accepts a variable of type signed long int and stores it
-       in the numeric variable <literal>var</>. Upon success, 0 is returned and
+       in the numeric variable <literal>var</literal>. Upon success, 0 is returned and
        -1 in case of a failure.
       </para>
      </listitem>
@@ -2149,7 +2168,7 @@ int PGTYPESnumeric_from_long(signed long int long_val, numeric *var);
 int PGTYPESnumeric_copy(numeric *src, numeric *dst);
 </synopsis>
        This function copies over the value of the variable that
-       <literal>src</literal> points to into the variable that <literal>dst</>
+       <literal>src</literal> points to into the variable that <literal>dst</literal>
        points to. It returns 0 on success and -1 if an error occurs.
       </para>
      </listitem>
@@ -2164,7 +2183,7 @@ int PGTYPESnumeric_copy(numeric *src, numeric *dst);
 int  PGTYPESnumeric_from_double(double d, numeric *dst);
 </synopsis>
        This function accepts a variable of type double and stores the result
-       in the variable that <literal>dst</> points to. It returns 0 on success
+       in the variable that <literal>dst</literal> points to. It returns 0 on success
        and -1 if an error occurs.
       </para>
      </listitem>
@@ -2179,10 +2198,10 @@ int  PGTYPESnumeric_from_double(double d, numeric *dst);
 int PGTYPESnumeric_to_double(numeric *nv, double *dp)
 </synopsis>
        The function converts the numeric value from the variable that
-       <literal>nv</> points to into the double variable that <literal>dp</> points
+       <literal>nv</literal> points to into the double variable that <literal>dp</literal> points
        to. It returns 0 on success and -1 if an error occurs, including
-       overflow. On overflow, the global variable <literal>errno</> will be set
-       to <literal>PGTYPES_NUM_OVERFLOW</> additionally.
+       overflow. On overflow, the global variable <literal>errno</literal> will be set
+       to <literal>PGTYPES_NUM_OVERFLOW</literal> additionally.
       </para>
      </listitem>
     </varlistentry>
@@ -2196,10 +2215,10 @@ int PGTYPESnumeric_to_double(numeric *nv, double *dp)
 int PGTYPESnumeric_to_int(numeric *nv, int *ip);
 </synopsis>
        The function converts the numeric value from the variable that
-       <literal>nv</> points to into the integer variable that <literal>ip</>
+       <literal>nv</literal> points to into the integer variable that <literal>ip</literal>
        points to. It returns 0 on success and -1 if an error occurs, including
-       overflow. On overflow, the global variable <literal>errno</> will be set
-       to <literal>PGTYPES_NUM_OVERFLOW</> additionally.
+       overflow. On overflow, the global variable <literal>errno</literal> will be set
+       to <literal>PGTYPES_NUM_OVERFLOW</literal> additionally.
       </para>
      </listitem>
     </varlistentry>
@@ -2213,10 +2232,10 @@ int PGTYPESnumeric_to_int(numeric *nv, int *ip);
 int PGTYPESnumeric_to_long(numeric *nv, long *lp);
 </synopsis>
        The function converts the numeric value from the variable that
-       <literal>nv</> points to into the long integer variable that
-       <literal>lp</> points to. It returns 0 on success and -1 if an error
+       <literal>nv</literal> points to into the long integer variable that
+       <literal>lp</literal> points to. It returns 0 on success and -1 if an error
        occurs, including overflow. On overflow, the global variable
-       <literal>errno</> will be set to <literal>PGTYPES_NUM_OVERFLOW</>
+       <literal>errno</literal> will be set to <literal>PGTYPES_NUM_OVERFLOW</literal>
        additionally.
       </para>
      </listitem>
@@ -2231,10 +2250,10 @@ int PGTYPESnumeric_to_long(numeric *nv, long *lp);
 int PGTYPESnumeric_to_decimal(numeric *src, decimal *dst);
 </synopsis>
        The function converts the numeric value from the variable that
-       <literal>src</> points to into the decimal variable that
-       <literal>dst</> points to. It returns 0 on success and -1 if an error
+       <literal>src</literal> points to into the decimal variable that
+       <literal>dst</literal> points to. It returns 0 on success and -1 if an error
        occurs, including overflow. On overflow, the global variable
-       <literal>errno</> will be set to <literal>PGTYPES_NUM_OVERFLOW</>
+       <literal>errno</literal> will be set to <literal>PGTYPES_NUM_OVERFLOW</literal>
        additionally.
       </para>
      </listitem>
@@ -2249,8 +2268,8 @@ int PGTYPESnumeric_to_decimal(numeric *src, decimal *dst);
 int PGTYPESnumeric_from_decimal(decimal *src, numeric *dst);
 </synopsis>
        The function converts the decimal value from the variable that
-       <literal>src</> points to into the numeric variable that
-       <literal>dst</> points to. It returns 0 on success and -1 if an error
+       <literal>src</literal> points to into the numeric variable that
+       <literal>dst</literal> points to. It returns 0 on success and -1 if an error
        occurs. Since the decimal type is implemented as a limited version of
        the numeric type, overflow cannot occur with this conversion.
       </para>
@@ -2264,13 +2283,13 @@ int PGTYPESnumeric_from_decimal(decimal *src, numeric *dst);
    <title>The date Type</title>
    <para>
     The date type in C enables your programs to deal with data of the SQL type
-    date. See <xref linkend="datatype-datetime"> for the equivalent type in the
-    <productname>PostgreSQL</> server.
+    date. See <xref linkend="datatype-datetime"/> for the equivalent type in the
+    <productname>PostgreSQL</productname> server.
    </para>
    <para>
     The following functions can be used to work with the date type:
     <variablelist>
-     <varlistentry id="PGTYPESdatefromtimestamp">
+     <varlistentry id="pgtypesdatefromtimestamp">
       <term><function>PGTYPESdate_from_timestamp</function></term>
       <listitem>
        <para>
@@ -2284,7 +2303,7 @@ date PGTYPESdate_from_timestamp(timestamp dt);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatefromasc">
+     <varlistentry id="pgtypesdatefromasc">
       <term><function>PGTYPESdate_from_asc</function></term>
       <listitem>
        <para>
@@ -2292,8 +2311,8 @@ date PGTYPESdate_from_timestamp(timestamp dt);
 <synopsis>
 date PGTYPESdate_from_asc(char *str, char **endptr);
 </synopsis>
-        The function receives a C char* string <literal>str</> and a pointer to
-        a C char* string <literal>endptr</>. At the moment ECPG always parses
+        The function receives a C char* string <literal>str</literal> and a pointer to
+        a C char* string <literal>endptr</literal>. At the moment ECPG always parses
         the complete string and so it currently does not support to store the
         address of the first invalid character in <literal>*endptr</literal>.
         You can safely set <literal>endptr</literal> to NULL.
@@ -2303,7 +2322,7 @@ date PGTYPESdate_from_asc(char *str, char **endptr);
         currently no variable to change that within ECPG.
        </para>
        <para>
-        <xref linkend="ecpg-pgtypesdate-from-asc-table"> shows the allowed input formats.
+        <xref linkend="ecpg-pgtypesdate-from-asc-table"/> shows the allowed input formats.
        </para>
         <table id="ecpg-pgtypesdate-from-asc-table">
          <title>Valid Input Formats for <function>PGTYPESdate_from_asc</function></title>
@@ -2389,7 +2408,7 @@ date PGTYPESdate_from_asc(char *str, char **endptr);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatetoasc">
+     <varlistentry id="pgtypesdatetoasc">
       <term><function>PGTYPESdate_to_asc</function></term>
       <listitem>
        <para>
@@ -2397,14 +2416,14 @@ date PGTYPESdate_from_asc(char *str, char **endptr);
 <synopsis>
 char *PGTYPESdate_to_asc(date dDate);
 </synopsis>
-        The function receives the date <literal>dDate</> as its only parameter.
-        It will output the date in the form <literal>1999-01-18</>, i.e., in the
-        <literal>YYYY-MM-DD</> format.
+        The function receives the date <literal>dDate</literal> as its only parameter.
+        It will output the date in the form <literal>1999-01-18</literal>, i.e., in the
+        <literal>YYYY-MM-DD</literal> format.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatejulmdy">
+     <varlistentry id="pgtypesdatejulmdy">
       <term><function>PGTYPESdate_julmdy</function></term>
       <listitem>
        <para>
@@ -2414,16 +2433,16 @@ char *PGTYPESdate_to_asc(date dDate);
 void PGTYPESdate_julmdy(date d, int *mdy);
 </synopsis>
        <!-- almost same description as for rjulmdy() -->
-        The function receives the date <literal>d</> and a pointer to an array
-        of 3 integer values <literal>mdy</>. The variable name indicates
-        the sequential order: <literal>mdy[0]</> will be set to contain the
-        number of the month, <literal>mdy[1]</> will be set to the value of the
-        day and <literal>mdy[2]</> will contain the year.
+        The function receives the date <literal>d</literal> and a pointer to an array
+        of 3 integer values <literal>mdy</literal>. The variable name indicates
+        the sequential order: <literal>mdy[0]</literal> will be set to contain the
+        number of the month, <literal>mdy[1]</literal> will be set to the value of the
+        day and <literal>mdy[2]</literal> will contain the year.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatemdyjul">
+     <varlistentry id="pgtypesdatemdyjul">
       <term><function>PGTYPESdate_mdyjul</function></term>
       <listitem>
        <para>
@@ -2432,14 +2451,14 @@ void PGTYPESdate_julmdy(date d, int *mdy);
 <synopsis>
 void PGTYPESdate_mdyjul(int *mdy, date *jdate);
 </synopsis>
-        The function receives the array of the 3 integers (<literal>mdy</>) as
+        The function receives the array of the 3 integers (<literal>mdy</literal>) as
         its first argument and as its second argument a pointer to a variable
         of type date that should hold the result of the operation.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatedayofweek">
+     <varlistentry id="pgtypesdatedayofweek">
       <term><function>PGTYPESdate_dayofweek</function></term>
       <listitem>
        <para>
@@ -2447,7 +2466,7 @@ void PGTYPESdate_mdyjul(int *mdy, date *jdate);
 <synopsis>
 int PGTYPESdate_dayofweek(date d);
 </synopsis>
-        The function receives the date variable <literal>d</> as its only
+        The function receives the date variable <literal>d</literal> as its only
         argument and returns an integer that indicates the day of the week for
         this date.
         <itemizedlist>
@@ -2491,7 +2510,7 @@ int PGTYPESdate_dayofweek(date d);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatetoday">
+     <varlistentry id="pgtypesdatetoday">
       <term><function>PGTYPESdate_today</function></term>
       <listitem>
        <para>
@@ -2499,13 +2518,13 @@ int PGTYPESdate_dayofweek(date d);
 <synopsis>
 void PGTYPESdate_today(date *d);
 </synopsis>
-        The function receives a pointer to a date variable (<literal>d</>)
+        The function receives a pointer to a date variable (<literal>d</literal>)
         that it sets to the current date.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatefmtasc">
+     <varlistentry id="pgtypesdatefmtasc">
       <term><function>PGTYPESdate_fmt_asc</function></term>
       <listitem>
        <para>
@@ -2514,9 +2533,9 @@ void PGTYPESdate_today(date *d);
 <synopsis>
 int PGTYPESdate_fmt_asc(date dDate, char *fmtstring, char *outbuf);
 </synopsis>
-        The function receives the date to convert (<literal>dDate</>), the
-        format mask (<literal>fmtstring</>) and the string that will hold the
-        textual representation of the date (<literal>outbuf</>).
+        The function receives the date to convert (<literal>dDate</literal>), the
+        format mask (<literal>fmtstring</literal>) and the string that will hold the
+        textual representation of the date (<literal>outbuf</literal>).
        </para>
        <para>
         On success, 0 is returned and a negative value if an error occurred.
@@ -2558,7 +2577,7 @@ int PGTYPESdate_fmt_asc(date dDate, char *fmtstring, char *outbuf);
         All other characters are copied 1:1 to the output string.
        </para>
        <para>
-        <xref linkend="ecpg-pgtypesdate-fmt-asc-example-table"> indicates a few possible formats. This will give
+        <xref linkend="ecpg-pgtypesdate-fmt-asc-example-table"/> indicates a few possible formats. This will give
         you an idea of how to use this function. All output lines are based on
         the same date: November 23, 1959.
        </para>
@@ -2626,7 +2645,7 @@ int PGTYPESdate_fmt_asc(date dDate, char *fmtstring, char *outbuf);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESdatedefmtasc">
+     <varlistentry id="pgtypesdatedefmtasc">
       <term><function>PGTYPESdate_defmt_asc</function></term>
       <listitem>
        <para>
@@ -2637,9 +2656,9 @@ int PGTYPESdate_defmt_asc(date *d, char *fmt, char *str);
 </synopsis>
         <!-- same description as rdefmtdate -->
         The function receives a pointer to the date value that should hold the
-        result of the operation (<literal>d</>), the format mask to use for
-        parsing the date (<literal>fmt</>) and the C char* string containing
-        the textual representation of the date (<literal>str</>). The textual
+        result of the operation (<literal>d</literal>), the format mask to use for
+        parsing the date (<literal>fmt</literal>) and the C char* string containing
+        the textual representation of the date (<literal>str</literal>). The textual
         representation is expected to match the format mask. However you do not
         need to have a 1:1 mapping of the string to the format mask. The
         function only analyzes the sequential order and looks for the literals
@@ -2649,7 +2668,7 @@ int PGTYPESdate_defmt_asc(date *d, char *fmt, char *str);
         day.
        </para>
        <para>
-        <xref linkend="ecpg-rdefmtdate-example-table"> indicates a few possible formats. This will give
+        <xref linkend="ecpg-rdefmtdate-example-table"/> indicates a few possible formats. This will give
         you an idea of how to use this function.
        </para>
         <table id="ecpg-rdefmtdate-example-table">
@@ -2741,13 +2760,13 @@ int PGTYPESdate_defmt_asc(date *d, char *fmt, char *str);
    <title>The timestamp Type</title>
    <para>
     The timestamp type in C enables your programs to deal with data of the SQL
-    type timestamp. See <xref linkend="datatype-datetime"> for the equivalent
-    type in the <productname>PostgreSQL</> server.
+    type timestamp. See <xref linkend="datatype-datetime"/> for the equivalent
+    type in the <productname>PostgreSQL</productname> server.
    </para>
    <para>
     The following functions can be used to work with the timestamp type:
     <variablelist>
-     <varlistentry id="PGTYPEStimestampfromasc">
+     <varlistentry id="pgtypestimestampfromasc">
       <term><function>PGTYPEStimestamp_from_asc</function></term>
       <listitem>
        <para>
@@ -2756,8 +2775,8 @@ int PGTYPESdate_defmt_asc(date *d, char *fmt, char *str);
 <synopsis>
 timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr);
 </synopsis>
-        The function receives the string to parse (<literal>str</>) and a
-        pointer to a C char* (<literal>endptr</>).
+        The function receives the string to parse (<literal>str</literal>) and a
+        pointer to a C char* (<literal>endptr</literal>).
         At the moment ECPG always parses
         the complete string and so it currently does not support to store the
         address of the first invalid character in <literal>*endptr</literal>.
@@ -2765,19 +2784,19 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr);
        </para>
        <para>
         The function returns the parsed timestamp on success. On error,
-        <literal>PGTYPESInvalidTimestamp</literal> is returned and <varname>errno</> is
-        set to <literal>PGTYPES_TS_BAD_TIMESTAMP</>. See <xref linkend="PGTYPESInvalidTimestamp"> for important notes on this value.
+        <literal>PGTYPESInvalidTimestamp</literal> is returned and <varname>errno</varname> is
+        set to <literal>PGTYPES_TS_BAD_TIMESTAMP</literal>. See <xref linkend="pgtypesinvalidtimestamp"/> for important notes on this value.
        </para>
        <para>
         In general, the input string can contain any combination of an allowed
         date specification, a whitespace character and an allowed time
         specification. Note that time zones are not supported by ECPG. It can
         parse them but does not apply any calculation as the
-        <productname>PostgreSQL</> server does for example. Timezone
+        <productname>PostgreSQL</productname> server does for example. Timezone
         specifiers are silently discarded.
        </para>
        <para>
-        <xref linkend="ecpg-pgtypestimestamp-from-asc-example-table"> contains a few examples for input strings.
+        <xref linkend="ecpg-pgtypestimestamp-from-asc-example-table"/> contains a few examples for input strings.
        </para>
         <table id="ecpg-pgtypestimestamp-from-asc-example-table">
          <title>Valid Input Formats for <function>PGTYPEStimestamp_from_asc</function></title>
@@ -2811,7 +2830,7 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestamptoasc">
+     <varlistentry id="pgtypestimestamptoasc">
       <term><function>PGTYPEStimestamp_to_asc</function></term>
       <listitem>
        <para>
@@ -2819,14 +2838,14 @@ timestamp PGTYPEStimestamp_from_asc(char *str, char **endptr);
 <synopsis>
 char *PGTYPEStimestamp_to_asc(timestamp tstamp);
 </synopsis>
-        The function receives the timestamp <literal>tstamp</> as
+        The function receives the timestamp <literal>tstamp</literal> as
         its only argument and returns an allocated string that contains the
         textual representation of the timestamp.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampcurrent">
+     <varlistentry id="pgtypestimestampcurrent">
       <term><function>PGTYPEStimestamp_current</function></term>
       <listitem>
        <para>
@@ -2835,12 +2854,12 @@ char *PGTYPEStimestamp_to_asc(timestamp tstamp);
 void PGTYPEStimestamp_current(timestamp *ts);
 </synopsis>
         The function retrieves the current timestamp and saves it into the
-        timestamp variable that <literal>ts</> points to.
+        timestamp variable that <literal>ts</literal> points to.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampfmtasc">
+     <varlistentry id="pgtypestimestampfmtasc">
       <term><function>PGTYPEStimestamp_fmt_asc</function></term>
       <listitem>
        <para>
@@ -2849,8 +2868,8 @@ void PGTYPEStimestamp_current(timestamp *ts);
 int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmtstr);
 </synopsis>
         The function receives a pointer to the timestamp to convert as its
-        first argument (<literal>ts</>), a pointer to the output buffer
-        (<literal>output</>), the maximal length that has been allocated for
+        first argument (<literal>ts</literal>), a pointer to the output buffer
+        (<literal>output</literal>), the maximal length that has been allocated for
         the output buffer (<literal>str_len</literal>) and the format mask to
         use for the conversion (<literal>fmtstr</literal>).
        </para>
@@ -2861,7 +2880,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt
        <para>
         You can use the following format specifiers for the format mask. The
         format specifiers are the same ones that are used in the
-        <function>strftime</> function in <productname>libc</productname>. Any
+        <function>strftime</function> function in <productname>libc</productname>. Any
         non-format specifier will be copied into the output buffer.
         <!-- This is from the FreeBSD man page:
              http://www.freebsd.org/cgi/man.cgi?query=strftime&apropos=0&sektion=3&manpath=FreeBSD+7.0-current&format=html
@@ -3175,7 +3194,7 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampsub">
+     <varlistentry id="pgtypestimestampsub">
       <term><function>PGTYPEStimestamp_sub</function></term>
       <listitem>
        <para>
@@ -3184,9 +3203,9 @@ int PGTYPEStimestamp_fmt_asc(timestamp *ts, char *output, int str_len, char *fmt
 <synopsis>
 int PGTYPEStimestamp_sub(timestamp *ts1, timestamp *ts2, interval *iv);
 </synopsis>
-        The function will subtract the timestamp variable that <literal>ts2</>
-        points to from the timestamp variable that <literal>ts1</> points to
-        and will store the result in the interval variable that <literal>iv</>
+        The function will subtract the timestamp variable that <literal>ts2</literal>
+        points to from the timestamp variable that <literal>ts1</literal> points to
+        and will store the result in the interval variable that <literal>iv</literal>
         points to.
        </para>
        <para>
@@ -3196,7 +3215,7 @@ int PGTYPEStimestamp_sub(timestamp *ts1, timestamp *ts2, interval *iv);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampdefmtasc">
+     <varlistentry id="pgtypestimestampdefmtasc">
       <term><function>PGTYPEStimestamp_defmt_asc</function></term>
       <listitem>
        <para>
@@ -3206,24 +3225,24 @@ int PGTYPEStimestamp_sub(timestamp *ts1, timestamp *ts2, interval *iv);
 int PGTYPEStimestamp_defmt_asc(char *str, char *fmt, timestamp *d);
 </synopsis>
         The function receives the textual representation of a timestamp in the
-        variable <literal>str</> as well as the formatting mask to use in the
-        variable <literal>fmt</>. The result will be stored in the variable
-        that <literal>d</> points to.
+        variable <literal>str</literal> as well as the formatting mask to use in the
+        variable <literal>fmt</literal>. The result will be stored in the variable
+        that <literal>d</literal> points to.
        </para>
        <para>
-        If the formatting mask <literal>fmt</> is NULL, the function will fall
+        If the formatting mask <literal>fmt</literal> is NULL, the function will fall
         back to the default formatting mask which is <literal>%Y-%m-%d
         %H:%M:%S</literal>.
        </para>
        <para>
         This is the reverse function to <xref
-        linkend="PGTYPEStimestampfmtasc">.  See the documentation there in
+        linkend="pgtypestimestampfmtasc"/>.  See the documentation there in
         order to find out about the possible formatting mask entries.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampaddinterval">
+     <varlistentry id="pgtypestimestampaddinterval">
       <term><function>PGTYPEStimestamp_add_interval</function></term>
       <listitem>
        <para>
@@ -3231,10 +3250,10 @@ int PGTYPEStimestamp_defmt_asc(char *str, char *fmt, timestamp *d);
 <synopsis>
 int PGTYPEStimestamp_add_interval(timestamp *tin, interval *span, timestamp *tout);
 </synopsis>
-        The function receives a pointer to a timestamp variable <literal>tin</>
-        and a pointer to an interval variable <literal>span</>. It adds the
+        The function receives a pointer to a timestamp variable <literal>tin</literal>
+        and a pointer to an interval variable <literal>span</literal>. It adds the
         interval to the timestamp and saves the resulting timestamp in the
-        variable that <literal>tout</> points to.
+        variable that <literal>tout</literal> points to.
        </para>
        <para>
         Upon success, the function returns 0 and a negative value if an
@@ -3243,7 +3262,7 @@ int PGTYPEStimestamp_add_interval(timestamp *tin, interval *span, timestamp *tou
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPEStimestampsubinterval">
+     <varlistentry id="pgtypestimestampsubinterval">
       <term><function>PGTYPEStimestamp_sub_interval</function></term>
       <listitem>
        <para>
@@ -3251,9 +3270,9 @@ int PGTYPEStimestamp_add_interval(timestamp *tin, interval *span, timestamp *tou
 <synopsis>
 int PGTYPEStimestamp_sub_interval(timestamp *tin, interval *span, timestamp *tout);
 </synopsis>
-        The function subtracts the interval variable that <literal>span</>
-        points to from the timestamp variable that <literal>tin</> points to
-        and saves the result into the variable that <literal>tout</> points
+        The function subtracts the interval variable that <literal>span</literal>
+        points to from the timestamp variable that <literal>tin</literal> points to
+        and saves the result into the variable that <literal>tout</literal> points
         to.
        </para>
        <para>
@@ -3270,14 +3289,14 @@ int PGTYPEStimestamp_sub_interval(timestamp *tin, interval *span, timestamp *tou
    <title>The interval Type</title>
    <para>
     The interval type in C enables your programs to deal with data of the SQL
-    type interval. See <xref linkend="datatype-datetime"> for the equivalent
-    type in the <productname>PostgreSQL</> server.
+    type interval. See <xref linkend="datatype-datetime"/> for the equivalent
+    type in the <productname>PostgreSQL</productname> server.
    </para>
    <para>
     The following functions can be used to work with the interval type:
     <variablelist>
 
-     <varlistentry id="PGTYPESintervalnew">
+     <varlistentry id="pgtypesintervalnew">
       <term><function>PGTYPESinterval_new</function></term>
       <listitem>
        <para>
@@ -3289,7 +3308,7 @@ interval *PGTYPESinterval_new(void);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESintervalfree">
+     <varlistentry id="pgtypesintervalfree">
       <term><function>PGTYPESinterval_free</function></term>
       <listitem>
        <para>
@@ -3301,7 +3320,7 @@ void PGTYPESinterval_new(interval *intvl);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESintervalfromasc">
+     <varlistentry id="pgtypesintervalfromasc">
       <term><function>PGTYPESinterval_from_asc</function></term>
       <listitem>
        <para>
@@ -3309,7 +3328,7 @@ void PGTYPESinterval_new(interval *intvl);
 <synopsis>
 interval *PGTYPESinterval_from_asc(char *str, char **endptr);
 </synopsis>
-        The function parses the input string <literal>str</> and returns a
+        The function parses the input string <literal>str</literal> and returns a
         pointer to an allocated interval variable.
         At the moment ECPG always parses
         the complete string and so it currently does not support to store the
@@ -3319,7 +3338,7 @@ interval *PGTYPESinterval_from_asc(char *str, char **endptr);
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESintervaltoasc">
+     <varlistentry id="pgtypesintervaltoasc">
       <term><function>PGTYPESinterval_to_asc</function></term>
       <listitem>
        <para>
@@ -3327,14 +3346,14 @@ interval *PGTYPESinterval_from_asc(char *str, char **endptr);
 <synopsis>
 char *PGTYPESinterval_to_asc(interval *span);
 </synopsis>
-        The function converts the interval variable that <literal>span</>
+        The function converts the interval variable that <literal>span</literal>
         points to into a C char*. The output looks like this example:
         <literal>@ 1 day 12 hours 59 mins 10 secs</literal>.
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="PGTYPESintervalcopy">
+     <varlistentry id="pgtypesintervalcopy">
       <term><function>PGTYPESinterval_copy</function></term>
       <listitem>
        <para>
@@ -3342,8 +3361,8 @@ char *PGTYPESinterval_to_asc(interval *span);
 <synopsis>
 int PGTYPESinterval_copy(interval *intvlsrc, interval *intvldest);
 </synopsis>
-        The function copies the interval variable that <literal>intvlsrc</>
-        points to into the variable that <literal>intvldest</> points to. Note
+        The function copies the interval variable that <literal>intvlsrc</literal>
+        points to into the variable that <literal>intvldest</literal> points to. Note
         that you need to allocate the memory for the destination variable
         before.
        </para>
@@ -3360,15 +3379,15 @@ int PGTYPESinterval_copy(interval *intvlsrc, interval *intvldest);
      a maximum precision of 30 significant digits. In contrast to the numeric
      type which can be created on the heap only, the decimal type can be
      created either on the stack or on the heap (by means of the functions
-     <function>PGTYPESdecimal_new</> and
-     <function>PGTYPESdecimal_free</>).
+     <function>PGTYPESdecimal_new</function> and
+     <function>PGTYPESdecimal_free</function>).
      There are a lot of other functions that deal with the decimal type in the
      <productname>Informix</productname> compatibility mode described in <xref
-     linkend="ecpg-informix-compat">.
+     linkend="ecpg-informix-compat"/>.
    </para>
    <para>
     The following functions can be used to work with the decimal type and are
-    not only contained in the <literal>libcompat</> library.
+    not only contained in the <literal>libcompat</literal> library.
     <variablelist>
      <varlistentry>
       <term><function>PGTYPESdecimal_new</function></term>
@@ -3543,20 +3562,20 @@ void PGTYPESdecimal_free(decimal *var);
     <title>Special Constants of pgtypeslib</title>
    <para>
     <variablelist>
-     <varlistentry id="PGTYPESInvalidTimestamp">
+     <varlistentry id="pgtypesinvalidtimestamp">
       <term><literal>PGTYPESInvalidTimestamp</literal></term>
       <listitem>
        <para>
         A value of type timestamp representing an invalid time stamp. This is
-        returned by the function <function>PGTYPEStimestamp_from_asc</> on
+        returned by the function <function>PGTYPEStimestamp_from_asc</function> on
         parse error.
         Note that due to the internal representation of the <type>timestamp</type> data type,
         <literal>PGTYPESInvalidTimestamp</literal> is also a valid timestamp at
-        the same time. It is set to <literal>1899-12-31 23:59:59</>. In order
+        the same time. It is set to <literal>1899-12-31 23:59:59</literal>. In order
         to detect errors, make sure that your application does not only test
         for <literal>PGTYPESInvalidTimestamp</literal> but also for
-        <literal>errno != 0</> after each call to
-        <function>PGTYPEStimestamp_from_asc</>.
+        <literal>errno != 0</literal> after each call to
+        <function>PGTYPEStimestamp_from_asc</function>.
        </para>
       </listitem>
      </varlistentry>
@@ -3632,7 +3651,7 @@ EXEC SQL DESCRIBE stmt1 INTO SQL DESCRIPTOR mydesc;
     so using <literal>DESCRIPTOR</literal> and <literal>SQL DESCRIPTOR</literal>
     produced named SQL Descriptor Areas. Now it is mandatory, omitting
     the <literal>SQL</literal> keyword produces SQLDA Descriptor Areas,
-    see <xref linkend="ecpg-sqlda-descriptors">.
+    see <xref linkend="ecpg-sqlda-descriptors"/>.
    </para>
 
    <para>
@@ -3853,7 +3872,7 @@ EXEC SQL FETCH 3 FROM mycursor INTO DESCRIPTOR mysqlda;
 </programlisting>
     Note that the <literal>SQL</literal> keyword is omitted. The paragraphs about
     the use cases of the <literal>INTO</literal> and <literal>USING</literal>
-    keywords in <xref linkend="ecpg-named-descriptors"> also apply here with an addition.
+    keywords in <xref linkend="ecpg-named-descriptors"/> also apply here with an addition.
     In a <command>DESCRIBE</command> statement the <literal>DESCRIPTOR</literal>
     keyword can be completely omitted if the <literal>INTO</literal> keyword is used:
 <programlisting>
@@ -3927,7 +3946,7 @@ typedef struct sqlda_struct sqlda_t;
 
     <variablelist>
      <varlistentry>
-      <term><literal>sqldaid</></term>
+      <term><literal>sqldaid</literal></term>
       <listitem>
        <para>
         It contains the literal string <literal>"SQLDA  "</literal>.
@@ -3936,7 +3955,7 @@ typedef struct sqlda_struct sqlda_t;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>sqldabc</></term>
+      <term><literal>sqldabc</literal></term>
       <listitem>
        <para>
         It contains the size of the allocated space in bytes.
@@ -3945,7 +3964,7 @@ typedef struct sqlda_struct sqlda_t;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>sqln</></term>
+      <term><literal>sqln</literal></term>
       <listitem>
        <para>
         It contains the number of input parameters for a parameterized query in
@@ -3960,7 +3979,7 @@ typedef struct sqlda_struct sqlda_t;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>sqld</></term>
+      <term><literal>sqld</literal></term>
       <listitem>
        <para>
         It contains the number of fields in a result set.
@@ -3969,17 +3988,17 @@ typedef struct sqlda_struct sqlda_t;
      </varlistentry>
 
      <varlistentry>
-      <term><literal>desc_next</></term>
+      <term><literal>desc_next</literal></term>
       <listitem>
        <para>
         If the query returns more than one record, multiple linked
-        SQLDA structures are returned, and <literal>desc_next</> holds
+        SQLDA structures are returned, and <literal>desc_next</literal> holds
         a pointer to the next entry in the list.
        </para>
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><literal>sqlvar</></term>
+      <term><literal>sqlvar</literal></term>
       <listitem>
        <para>
         This is the array of the columns in the result set.
@@ -4015,7 +4034,7 @@ typedef struct sqlvar_struct sqlvar_t;
 
         <variablelist>
          <varlistentry>
-         <term><literal>sqltype</></term>
+         <term><literal>sqltype</literal></term>
           <listitem>
            <para>
             Contains the type identifier of the field. For values,
@@ -4025,7 +4044,7 @@ typedef struct sqlvar_struct sqlvar_t;
          </varlistentry>
 
          <varlistentry>
-         <term><literal>sqllen</></term>
+         <term><literal>sqllen</literal></term>
           <listitem>
            <para>
             Contains the binary length of the field. e.g. 4 bytes for <type>ECPGt_int</type>.
@@ -4034,17 +4053,17 @@ typedef struct sqlvar_struct sqlvar_t;
          </varlistentry>
 
          <varlistentry>
-         <term><literal>sqldata</></term>
+         <term><literal>sqldata</literal></term>
           <listitem>
            <para>
             Points to the data.  The format of the data is described
-            in <xref linkend="ecpg-variables-type-mapping">.
+            in <xref linkend="ecpg-variables-type-mapping"/>.
            </para>
           </listitem>
          </varlistentry>
 
          <varlistentry>
-         <term><literal>sqlind</></term>
+         <term><literal>sqlind</literal></term>
           <listitem>
            <para>
             Points to the null indicator.  0 means not null, -1 means
@@ -4054,7 +4073,7 @@ typedef struct sqlvar_struct sqlvar_t;
          </varlistentry>
 
          <varlistentry>
-         <term><literal>sqlname</></term>
+         <term><literal>sqlname</literal></term>
           <listitem>
            <para>
             The name of the field.
@@ -4084,7 +4103,7 @@ struct sqlname
       The meaning of the fields is:
             <variablelist>
              <varlistentry>
-              <term><literal>length</></term>
+              <term><literal>length</literal></term>
                <listitem>
                 <para>
                  Contains the length of the field name.
@@ -4092,7 +4111,7 @@ struct sqlname
                </listitem>
               </varlistentry>
              <varlistentry>
-              <term><literal>data</></term>
+              <term><literal>data</literal></term>
                <listitem>
                 <para>
                  Contains the actual field name.
@@ -4113,10 +4132,10 @@ struct sqlname
       SQLDA are:
      </para>
      <step><simpara>Declare an <type>sqlda_t</type> structure to receive the result set.</simpara></step>
-     <step><simpara>Execute <command>FETCH</>/<command>EXECUTE</>/<command>DESCRIBE</> commands to process a query specifying the declared SQLDA.</simpara></step>
-     <step><simpara>Check the number of records in the result set by looking at <structfield>sqln</>, a member of the <type>sqlda_t</type> structure.</simpara></step>
-     <step><simpara>Get the values of each column from <literal>sqlvar[0]</>, <literal>sqlvar[1]</>, etc., members of the <type>sqlda_t</type> structure.</simpara></step>
-     <step><simpara>Go to next row (<type>sqlda_t</type> structure) by following the <structfield>desc_next</> pointer, a member of the <type>sqlda_t</type> structure.</simpara></step>
+     <step><simpara>Execute <command>FETCH</command>/<command>EXECUTE</command>/<command>DESCRIBE</command> commands to process a query specifying the declared SQLDA.</simpara></step>
+     <step><simpara>Check the number of records in the result set by looking at <structfield>sqln</structfield>, a member of the <type>sqlda_t</type> structure.</simpara></step>
+     <step><simpara>Get the values of each column from <literal>sqlvar[0]</literal>, <literal>sqlvar[1]</literal>, etc., members of the <type>sqlda_t</type> structure.</simpara></step>
+     <step><simpara>Go to next row (<type>sqlda_t</type> structure) by following the <structfield>desc_next</structfield> pointer, a member of the <type>sqlda_t</type> structure.</simpara></step>
      <step><simpara>Repeat above as you need.</simpara></step>
     </procedure>
 
@@ -4133,7 +4152,7 @@ sqlda_t *sqlda1;
 
     <para>
      Next, specify the SQLDA in a command.  This is
-     a <command>FETCH</> command example.
+     a <command>FETCH</command> command example.
 <programlisting>
 EXEC SQL FETCH NEXT FROM cur1 INTO DESCRIPTOR sqlda1;
 </programlisting>
@@ -4168,10 +4187,10 @@ for (i = 0; i &lt; cur_sqlda->sqld; i++)
     </para>
 
     <para>
-     To get a column value, check the <structfield>sqltype</> value,
+     To get a column value, check the <structfield>sqltype</structfield> value,
      a member of the <type>sqlvar_t</type> structure.  Then, switch
      to an appropriate way, depending on the column type, to copy
-     data from the <structfield>sqlvar</> field to a host variable.
+     data from the <structfield>sqlvar</structfield> field to a host variable.
 <programlisting>
 char var_buf[1024];
 
@@ -4225,7 +4244,7 @@ EXEC SQL PREPARE stmt1 FROM :query;
 
     <para>
      Next, allocate memory for an SQLDA, and set the number of input
-     parameters in <structfield>sqln</>, a member variable of
+     parameters in <structfield>sqln</structfield>, a member variable of
      the <type>sqlda_t</type> structure.  When two or more input
      parameters are required for the prepared query, the application
      has to allocate additional memory space which is calculated by
@@ -4317,6 +4336,7 @@ main(void)
     EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO testdb AS con1 USER testuser;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     EXEC SQL PREPARE stmt1 FROM :query;
     EXEC SQL DECLARE cur1 CURSOR FOR stmt1;
@@ -4386,8 +4406,8 @@ main(void)
 
     <para>
      Read each columns in the first record.  The number of columns is
-     stored in <structfield>sqld</>, the actual data of the first
-     column is stored in <literal>sqlvar[0]</>, both members of
+     stored in <structfield>sqld</structfield>, the actual data of the first
+     column is stored in <literal>sqlvar[0]</literal>, both members of
      the <type>sqlda_t</type> structure.
 
 <programlisting>
@@ -4404,9 +4424,9 @@ main(void)
     </para>
 
     <para>
-     Now, the column data is stored in the variable <varname>v</>.
+     Now, the column data is stored in the variable <varname>v</varname>.
      Copy every datum into host variables, looking
-     at <literal>v.sqltype</> for the type of the column.
+     at <literal>v.sqltype</literal> for the type of the column.
 <programlisting>
             switch (v.sqltype) {
                 int intval;
@@ -4447,7 +4467,7 @@ main(void)
 
     <para>
      The whole program is shown
-     in <xref linkend="ecpg-sqlda-example-example">.
+     in <xref linkend="ecpg-sqlda-example-example"/>.
     </para>
 
     <example id="ecpg-sqlda-example-example">
@@ -4478,6 +4498,7 @@ main(void)
     EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO uptimedb AS con1 USER uptime;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     EXEC SQL PREPARE stmt1 FROM :query;
     EXEC SQL DECLARE cur1 CURSOR FOR stmt1;
@@ -4762,12 +4783,25 @@ EXEC SQL WHENEVER <replaceable>condition</replaceable> <replaceable>action</repl
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><literal>DO CONTINUE</literal></term>
+      <listitem>
+       <para>
+        Execute the C statement <literal>continue</literal>.  This should
+        only be used in loops statements.  if executed, will cause the flow 
+        of control to return to the top of the loop.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><literal>CALL <replaceable>name</replaceable> (<replaceable>args</replaceable>)</literal></term>
       <term><literal>DO <replaceable>name</replaceable> (<replaceable>args</replaceable>)</literal></term>
       <listitem>
        <para>
-        Call the specified C functions with the specified arguments.
+        Call the specified C functions with the specified arguments.  (This
+        use is different from the meaning of <literal>CALL</literal>
+        and <literal>DO</literal> in the normal PostgreSQL grammar.)
        </para>
       </listitem>
      </varlistentry>
@@ -4936,7 +4970,7 @@ struct
    </para>
 
    <para>
-    Here is one example that combines the use of <literal>WHENEVER</>
+    Here is one example that combines the use of <literal>WHENEVER</literal>
     and <varname>sqlca</varname>, printing out the contents
     of <varname>sqlca</varname> when an error occurs.  This is perhaps
     useful for debugging or prototyping applications, before
@@ -5005,7 +5039,7 @@ sqlstate: 42P01
     <literal>SQLSTATE</literal> error codes; therefore a high degree
     of consistency can be achieved by using this error code scheme
     throughout all applications.  For further information see
-    <xref linkend="errcodes-appendix">.
+    <xref linkend="errcodes-appendix"/>.
    </para>
 
    <para>
@@ -5026,7 +5060,7 @@ sqlstate: 42P01
     <literal>SQLSTATE</literal> is also listed.  There is, however, no
     one-to-one or one-to-many mapping between the two schemes (indeed
     it is many-to-many), so you should consult the global
-    <literal>SQLSTATE</literal> listing in <xref linkend="errcodes-appendix">
+    <literal>SQLSTATE</literal> listing in <xref linkend="errcodes-appendix"/>
     in each case.
    </para>
 
@@ -5216,8 +5250,8 @@ while (1)
      <listitem>
       <para>
        This means the host variable is of type <type>bool</type> and
-       the datum in the database is neither <literal>'t'</> nor
-       <literal>'f'</>.  (SQLSTATE 42804)
+       the datum in the database is neither <literal>'t'</literal> nor
+       <literal>'f'</literal>.  (SQLSTATE 42804)
       </para>
      </listitem>
     </varlistentry>
@@ -5264,8 +5298,6 @@ while (1)
      </listitem>
     </varlistentry>
 
-<![IGNORE[
-    <!-- disabled by #if 0 in ecpglib -->
     <varlistentry>
      <term>-216 (<symbol>ECPG_ARRAY_INSERT</symbol>)</term>
      <listitem>
@@ -5275,7 +5307,6 @@ while (1)
       </para>
      </listitem>
     </varlistentry>
-]]>
 
     <varlistentry>
      <term>-220 (<symbol>ECPG_NO_CONN</symbol>)</term>
@@ -5430,8 +5461,8 @@ while (1)
      </listitem>
     </varlistentry>
 
-<![IGNORE[
     <!-- currently not used by the code -->
+<!--
     <varlistentry>
      <term>-600 (<symbol>ECPG_WARNING_UNRECOGNIZED</symbol>)</term>
      <listitem>
@@ -5450,7 +5481,7 @@ while (1)
       </para>
      </listitem>
     </varlistentry>
-]]>
+-->
 
     <varlistentry>
      <term>-602 (<symbol>ECPG_WARNING_UNKNOWN_PORTAL</symbol>)</term>
@@ -5567,8 +5598,8 @@ EXEC SQL INCLUDE "<replaceable>filename</replaceable>";
     Similar to the directive <literal>#define</literal> that is known from C,
     embedded SQL has a similar concept:
 <programlisting>
-EXEC SQL DEFINE <replaceable>name</>;
-EXEC SQL DEFINE <replaceable>name</> <replaceable>value</>;
+EXEC SQL DEFINE <replaceable>name</replaceable>;
+EXEC SQL DEFINE <replaceable>name</replaceable> <replaceable>value</replaceable>;
 </programlisting>
     So you can define a name:
 <programlisting>
@@ -5579,7 +5610,7 @@ EXEC SQL DEFINE HAVE_FEATURE;
 EXEC SQL DEFINE MYNUMBER 12;
 EXEC SQL DEFINE MYSTRING 'abc';
 </programlisting>
-    Use <literal>undef</> to remove a previous definition:
+    Use <literal>undef</literal> to remove a previous definition:
 <programlisting>
 EXEC SQL UNDEF MYNUMBER;
 </programlisting>
@@ -5589,15 +5620,15 @@ EXEC SQL UNDEF MYNUMBER;
     Of course you can continue to use the C versions <literal>#define</literal>
     and <literal>#undef</literal> in your embedded SQL program. The difference
     is where your defined values get evaluated. If you use <literal>EXEC SQL
-    DEFINE</> then the <command>ecpg</> preprocessor evaluates the defines and substitutes
+    DEFINE</literal> then the <command>ecpg</command> preprocessor evaluates the defines and substitutes
     the values. For example if you write:
 <programlisting>
 EXEC SQL DEFINE MYNUMBER 12;
 ...
 EXEC SQL UPDATE Tbl SET col = MYNUMBER;
 </programlisting>
-    then <command>ecpg</> will already do the substitution and your C compiler will never
-    see any name or identifier <literal>MYNUMBER</>. Note that you cannot use
+    then <command>ecpg</command> will already do the substitution and your C compiler will never
+    see any name or identifier <literal>MYNUMBER</literal>. Note that you cannot use
     <literal>#define</literal> for a constant that you are going to use in an
     embedded SQL query because in this case the embedded SQL precompiler is not
     able to see this declaration.
@@ -5611,23 +5642,23 @@ EXEC SQL UPDATE Tbl SET col = MYNUMBER;
 
    <variablelist>
     <varlistentry>
-     <term><literal>EXEC SQL ifdef <replaceable>name</>;</literal></term>
+     <term><literal>EXEC SQL ifdef <replaceable>name</replaceable>;</literal></term>
      <listitem>
      <para>
-      Checks a <replaceable>name</> and processes subsequent lines if
-      <replaceable>name</> has been created with <literal>EXEC SQL define
-      <replaceable>name</></literal>.
+      Checks a <replaceable>name</replaceable> and processes subsequent lines if
+      <replaceable>name</replaceable> has been created with <literal>EXEC SQL define
+      <replaceable>name</replaceable></literal>.
      </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>EXEC SQL ifndef <replaceable>name</>;</literal></term>
+     <term><literal>EXEC SQL ifndef <replaceable>name</replaceable>;</literal></term>
      <listitem>
      <para>
-      Checks a <replaceable>name</> and processes subsequent lines if
-      <replaceable>name</> has <emphasis>not</emphasis> been created with
-      <literal>EXEC SQL define <replaceable>name</></literal>.
+      Checks a <replaceable>name</replaceable> and processes subsequent lines if
+      <replaceable>name</replaceable> has <emphasis>not</emphasis> been created with
+      <literal>EXEC SQL define <replaceable>name</replaceable></literal>.
      </para>
      </listitem>
     </varlistentry>
@@ -5637,19 +5668,19 @@ EXEC SQL UPDATE Tbl SET col = MYNUMBER;
      <listitem>
      <para>
       Starts processing an alternative section to a section introduced by
-      either <literal>EXEC SQL ifdef <replaceable>name</></literal> or
-      <literal>EXEC SQL ifndef <replaceable>name</></literal>.
+      either <literal>EXEC SQL ifdef <replaceable>name</replaceable></literal> or
+      <literal>EXEC SQL ifndef <replaceable>name</replaceable></literal>.
      </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>EXEC SQL elif <replaceable>name</>;</literal></term>
+     <term><literal>EXEC SQL elif <replaceable>name</replaceable>;</literal></term>
      <listitem>
      <para>
-      Checks <replaceable>name</> and starts an alternative section if
-      <replaceable>name</> has been created with <literal>EXEC SQL define
-      <replaceable>name</></literal>.
+      Checks <replaceable>name</replaceable> and starts an alternative section if
+      <replaceable>name</replaceable> has been created with <literal>EXEC SQL define
+      <replaceable>name</replaceable></literal>.
      </para>
      </listitem>
     </varlistentry>
@@ -5699,7 +5730,7 @@ EXEC SQL endif;
 
   <para>
    The preprocessor program is called <filename>ecpg</filename> and is
-   included in a normal <productname>PostgreSQL</> installation.
+   included in a normal <productname>PostgreSQL</productname> installation.
    Embedded SQL programs are typically named with an extension
    <filename>.pgc</filename>.  If you have a program file called
    <filename>prog1.pgc</filename>, you can preprocess it by simply
@@ -5719,8 +5750,8 @@ ecpg prog1.pgc
 cc -c prog1.c
 </programlisting>
    The generated C source files include header files from the
-   <productname>PostgreSQL</> installation, so if you installed
-   <productname>PostgreSQL</> in a location that is not searched by
+   <productname>PostgreSQL</productname> installation, so if you installed
+   <productname>PostgreSQL</productname> in a location that is not searched by
    default, you have to add an option such as
    <literal>-I/usr/local/pgsql/include</literal> to the compilation
    command line.
@@ -5759,7 +5790,7 @@ ECPG = ecpg
 
   <para>
    The complete syntax of the <command>ecpg</command> command is
-   detailed in <xref linkend="app-ecpg">.
+   detailed in <xref linkend="app-ecpg"/>.
   </para>
 
   <para>
@@ -5795,10 +5826,10 @@ ECPG = ecpg
     </para>
     <note>
     <para>
-    On Windows, if the <application>ecpg</> libraries and an application are
+    On Windows, if the <application>ecpg</application> libraries and an application are
     compiled with different flags, this function call will crash the
     application because the internal representation of the
-    <literal>FILE</> pointers differ.  Specifically,
+    <literal>FILE</literal> pointers differ.  Specifically,
     multithreaded/single-threaded, release/debug, and static/dynamic
     flags should be the same for the library and all applications using
     that library.
@@ -5827,7 +5858,7 @@ ECPG = ecpg
      <para>
        <function>ECPGtransactionStatus(const char *<replaceable>connection_name</replaceable>)</function>
        returns the current transaction status of the given connection identified by <replaceable>connection_name</replaceable>.
-       See <xref linkend="libpq-status"> and libpq's <function>PQtransactionStatus()</function> for details about the returned status codes.
+       See <xref linkend="libpq-status"/> and libpq's <function>PQtransactionStatus()</function> for details about the returned status codes.
      </para>
    </listitem>
 
@@ -5836,7 +5867,7 @@ ECPG = ecpg
      <function>ECPGstatus(int <replaceable>lineno</replaceable>,
      const char* <replaceable>connection_name</replaceable>)</function>
      returns true if you are connected to a database and false if not.
-     <replaceable>connection_name</replaceable> can be <literal>NULL</>
+     <replaceable>connection_name</replaceable> can be <literal>NULL</literal>
      if a single connection is being used.
     </para>
    </listitem>
@@ -5859,8 +5890,8 @@ ECPG = ecpg
 
   <para>
    For more details about the <function>ECPGget_PGconn()</function>, see
-   <xref linkend="ecpg-library">.  For information about the large
-   object function interface, see <xref linkend="largeObjects">.
+   <xref linkend="ecpg-library"/>.  For information about the large
+   object function interface, see <xref linkend="largeobjects"/>.
   </para>
 
   <para>
@@ -5870,7 +5901,7 @@ ECPG = ecpg
   </para>
 
   <para>
-   <xref linkend="ecpg-lo-example"> shows an example program that
+   <xref linkend="ecpg-lo-example"/> shows an example program that
    illustrates how to create, write, and read a large object in an
    ECPG application.
   </para>
@@ -5899,6 +5930,7 @@ main(void)
     memset(buf, 1, buflen);
 
     EXEC SQL CONNECT TO testdb AS con1;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     conn = ECPGget_PGconn("con1");
     printf("conn = %p\n", conn);
@@ -5989,7 +6021,7 @@ main(void)
    A safe way to use the embedded SQL code in a C++ application is
    hiding the ECPG calls in a C module, which the C++ application code
    calls into to access the database, and linking that together with
-   the rest of the C++ code.  See <xref linkend="ecpg-cpp-and-c">
+   the rest of the C++ code.  See <xref linkend="ecpg-cpp-and-c"/>
    about that.
   </para>
 
@@ -6028,6 +6060,7 @@ class TestCpp
 TestCpp::TestCpp()
 {
     EXEC SQL CONNECT TO testdb1;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 }
 
 void Test::test()
@@ -6107,6 +6140,7 @@ void
 db_connect()
 {
     EXEC SQL CONNECT TO testdb1;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 }
 
 void
@@ -6209,10 +6243,10 @@ main(void)
 
    <para>
     To build the application, proceed as follows.  Convert
-    <filename>test_mod.pgc</> into <filename>test_mod.c</> by
+    <filename>test_mod.pgc</filename> into <filename>test_mod.c</filename> by
     running <command>ecpg</command>, and generate
-    <filename>test_mod.o</> by compiling
-    <filename>test_mod.c</> with the C compiler:
+    <filename>test_mod.o</filename> by compiling
+    <filename>test_mod.c</filename> with the C compiler:
 <programlisting>
 ecpg -o test_mod.c test_mod.pgc
 cc -c test_mod.c -o test_mod.o
@@ -6220,16 +6254,16 @@ cc -c test_mod.c -o test_mod.o
    </para>
 
    <para>
-    Next, generate <filename>test_cpp.o</> by compiling
-    <filename>test_cpp.cpp</> with the C++ compiler:
+    Next, generate <filename>test_cpp.o</filename> by compiling
+    <filename>test_cpp.cpp</filename> with the C++ compiler:
 <programlisting>
 c++ -c test_cpp.cpp -o test_cpp.o
 </programlisting>
    </para>
 
    <para>
-    Finally, link these object files, <filename>test_cpp.o</>
-    and <filename>test_mod.o</>, into one executable, using the C++
+    Finally, link these object files, <filename>test_cpp.o</filename>
+    and <filename>test_mod.o</filename>, into one executable, using the C++
     compiler driver:
 <programlisting>
 c++ test_cpp.o test_mod.o -lecpg -o test_cpp
@@ -6244,7 +6278,7 @@ c++ test_cpp.o test_mod.o -lecpg -o test_cpp
   <para>
    This section describes all SQL commands that are specific to
    embedded SQL.  Also refer to the SQL commands listed
-   in <xref linkend="sql-commands">, which can also be used in
+   in <xref linkend="sql-commands"/>, which can also be used in
    embedded SQL, unless stated otherwise.
   </para>
 
@@ -6256,7 +6290,7 @@ c++ test_cpp.o test_mod.o -lecpg -o test_cpp
 
    <refsynopsisdiv>
 <synopsis>
-ALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable>
+ALLOCATE DESCRIPTOR <replaceable class="parameter">name</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -6280,7 +6314,7 @@ ALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         A name of SQL descriptor, case sensitive.  This can be an SQL
@@ -6312,9 +6346,9 @@ EXEC SQL ALLOCATE DESCRIPTOR mydesc;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-deallocate-descriptor"></member>
-     <member><xref linkend="ecpg-sql-get-descriptor"></member>
-     <member><xref linkend="ecpg-sql-set-descriptor"></member>
+     <member><xref linkend="ecpg-sql-deallocate-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-get-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-set-descriptor"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6348,10 +6382,10 @@ DATABASE <replaceable>connection_target</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">connection_target</replaceable></term>
+      <term><replaceable class="parameter">connection_target</replaceable></term>
       <listitem>
        <para>
-        <replaceable class="PARAMETER">connection_target</replaceable>
+        <replaceable class="parameter">connection_target</replaceable>
         specifies the target server of the connection on one of
         several forms.
 
@@ -6408,7 +6442,7 @@ DATABASE <replaceable>connection_target</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">connection_object</replaceable></term>
+      <term><replaceable class="parameter">connection_object</replaceable></term>
       <listitem>
        <para>
         An optional identifier for the connection, so that it can be
@@ -6419,7 +6453,7 @@ DATABASE <replaceable>connection_target</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">connection_user</replaceable></term>
+      <term><replaceable class="parameter">connection_user</replaceable></term>
       <listitem>
        <para>
         The user name for the database connection.
@@ -6500,12 +6534,14 @@ EXEC SQL END DECLARE SECTION;
     ECPGdebug(1, stderr);
 
     EXEC SQL CONNECT TO :dbname USER :user;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL SELECT version() INTO :ver;
     EXEC SQL DISCONNECT;
 
     printf("version: %s\n", ver);
 
     EXEC SQL CONNECT TO :connection USER :user;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL SELECT version() INTO :ver;
     EXEC SQL DISCONNECT;
 
@@ -6531,8 +6567,8 @@ EXEC SQL END DECLARE SECTION;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-disconnect"></member>
-     <member><xref linkend="ecpg-sql-set-connection"></member>
+     <member><xref linkend="ecpg-sql-disconnect"/></member>
+     <member><xref linkend="ecpg-sql-set-connection"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6545,7 +6581,7 @@ EXEC SQL END DECLARE SECTION;
 
    <refsynopsisdiv>
 <synopsis>
-DEALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable>
+DEALLOCATE DESCRIPTOR <replaceable class="parameter">name</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -6563,7 +6599,7 @@ DEALLOCATE DESCRIPTOR <replaceable class="PARAMETER">name</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name of the descriptor which is going to be deallocated.
@@ -6596,9 +6632,9 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-allocate-descriptor"></member>
-     <member><xref linkend="ecpg-sql-get-descriptor"></member>
-     <member><xref linkend="ecpg-sql-set-descriptor"></member>
+     <member><xref linkend="ecpg-sql-allocate-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-get-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-set-descriptor"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6611,8 +6647,8 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc;
 
    <refsynopsisdiv>
 <synopsis>
-DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="PARAMETER">prepared_name</replaceable>
-DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="PARAMETER">query</replaceable>
+DECLARE <replaceable class="parameter">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">prepared_name</replaceable>
+DECLARE <replaceable class="parameter">cursor_name</replaceable> [ BINARY ] [ INSENSITIVE ] [ [ NO ] SCROLL ] CURSOR [ { WITH | WITHOUT } HOLD ] FOR <replaceable class="parameter">query</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -6637,7 +6673,7 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN
     <variablelist>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+      <term><replaceable class="parameter">cursor_name</replaceable></term>
       <listitem>
        <para>
         A cursor name, case sensitive.  This can be an SQL identifier
@@ -6647,7 +6683,7 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">prepared_name</replaceable></term>
+      <term><replaceable class="parameter">prepared_name</replaceable></term>
       <listitem>
        <para>
         The name of a prepared query, either as an SQL identifier or a
@@ -6660,8 +6696,8 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN
       <term><replaceable class="parameter">query</replaceable></term>
       <listitem>
        <para>
-        A <xref linkend="sql-select"> or
-        <xref linkend="sql-values"> command which will provide the
+        A <xref linkend="sql-select"/> or
+        <xref linkend="sql-values"/> command which will provide the
         rows to be returned by the cursor.
        </para>
       </listitem>
@@ -6670,7 +6706,7 @@ DECLARE <replaceable class="PARAMETER">cursor_name</replaceable> [ BINARY ] [ IN
 
     <para>
      For the meaning of the cursor options,
-     see <xref linkend="sql-declare">.
+     see <xref linkend="sql-declare"/>.
     </para>
    </refsect1>
 
@@ -6707,9 +6743,9 @@ EXEC SQL DECLARE cur1 CURSOR FOR stmt1;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-open"></member>
-     <member><xref linkend="sql-close"></member>
-     <member><xref linkend="sql-declare"></member>
+     <member><xref linkend="ecpg-sql-open"/></member>
+     <member><xref linkend="sql-close"/></member>
+     <member><xref linkend="sql-declare"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6722,9 +6758,9 @@ EXEC SQL DECLARE cur1 CURSOR FOR stmt1;
 
    <refsynopsisdiv>
 <synopsis>
-DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> USING [ SQL ] DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable>
-DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> INTO [ SQL ] DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable>
-DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> INTO <replaceable class="PARAMETER">sqlda_name</replaceable>
+DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> USING [ SQL ] DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable>
+DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> INTO [ SQL ] DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable>
+DESCRIBE [ OUTPUT ] <replaceable class="parameter">prepared_name</replaceable> INTO <replaceable class="parameter">sqlda_name</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -6743,7 +6779,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">prepared_name</replaceable></term>
+      <term><replaceable class="parameter">prepared_name</replaceable></term>
       <listitem>
        <para>
         The name of a prepared statement.  This can be an SQL
@@ -6753,7 +6789,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_name</replaceable></term>
+      <term><replaceable class="parameter">descriptor_name</replaceable></term>
       <listitem>
        <para>
         A descriptor name. It is case sensitive.  It can be an SQL
@@ -6763,7 +6799,7 @@ DESCRIBE [ OUTPUT ] <replaceable class="PARAMETER">prepared_name</replaceable> I
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">sqlda_name</replaceable></term>
+      <term><replaceable class="parameter">sqlda_name</replaceable></term>
       <listitem>
        <para>
         The name of an SQLDA variable.
@@ -6797,8 +6833,8 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-allocate-descriptor"></member>
-     <member><xref linkend="ecpg-sql-get-descriptor"></member>
+     <member><xref linkend="ecpg-sql-allocate-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-get-descriptor"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6811,7 +6847,7 @@ EXEC SQL DEALLOCATE DESCRIPTOR mydesc;
 
    <refsynopsisdiv>
 <synopsis>
-DISCONNECT <replaceable class="PARAMETER">connection_name</replaceable>
+DISCONNECT <replaceable class="parameter">connection_name</replaceable>
 DISCONNECT [ CURRENT ]
 DISCONNECT DEFAULT
 DISCONNECT ALL
@@ -6832,7 +6868,7 @@ DISCONNECT ALL
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">connection_name</replaceable></term>
+      <term><replaceable class="parameter">connection_name</replaceable></term>
       <listitem>
        <para>
         A database connection name established by
@@ -6907,8 +6943,8 @@ main(void)
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-connect"></member>
-     <member><xref linkend="ecpg-sql-set-connection"></member>
+     <member><xref linkend="ecpg-sql-connect"/></member>
+     <member><xref linkend="ecpg-sql-set-connection"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -6921,7 +6957,7 @@ main(void)
 
    <refsynopsisdiv>
 <synopsis>
-EXECUTE IMMEDIATE <replaceable class="PARAMETER">string</replaceable>
+EXECUTE IMMEDIATE <replaceable class="parameter">string</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -6940,7 +6976,7 @@ EXECUTE IMMEDIATE <replaceable class="PARAMETER">string</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">string</replaceable></term>
+      <term><replaceable class="parameter">string</replaceable></term>
       <listitem>
        <para>
         A literal C string or a host variable containing the SQL
@@ -6982,8 +7018,8 @@ EXEC SQL EXECUTE IMMEDIATE :command;
 
    <refsynopsisdiv>
 <synopsis>
-GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> <replaceable class="PARAMETER">:cvariable</replaceable> = <replaceable class="PARAMETER">descriptor_header_item</replaceable> [, ... ]
-GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALUE <replaceable class="PARAMETER">column_number</replaceable> <replaceable class="PARAMETER">:cvariable</replaceable> = <replaceable class="PARAMETER">descriptor_item</replaceable> [, ... ]
+GET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> <replaceable class="parameter">:cvariable</replaceable> = <replaceable class="parameter">descriptor_header_item</replaceable> [, ... ]
+GET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> VALUE <replaceable class="parameter">column_number</replaceable> <replaceable class="parameter">:cvariable</replaceable> = <replaceable class="parameter">descriptor_item</replaceable> [, ... ]
 </synopsis>
    </refsynopsisdiv>
 
@@ -7014,7 +7050,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_name</replaceable></term>
+      <term><replaceable class="parameter">descriptor_name</replaceable></term>
       <listitem>
        <para>
         A descriptor name.
@@ -7023,7 +7059,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_header_item</replaceable></term>
+      <term><replaceable class="parameter">descriptor_header_item</replaceable></term>
       <listitem>
        <para>
         A token identifying which header information item to retrieve.
@@ -7034,7 +7070,7 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">column_number</replaceable></term>
+      <term><replaceable class="parameter">column_number</replaceable></term>
       <listitem>
        <para>
         The number of the column about which information is to be
@@ -7044,18 +7080,18 @@ GET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_item</replaceable></term>
+      <term><replaceable class="parameter">descriptor_item</replaceable></term>
       <listitem>
        <para>
         A token identifying which item of information about a column
-        to retrieve.  See <xref linkend="ecpg-named-descriptors"> for
+        to retrieve.  See <xref linkend="ecpg-named-descriptors"/> for
         a list of supported items.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">cvariable</replaceable></term>
+      <term><replaceable class="parameter">cvariable</replaceable></term>
       <listitem>
        <para>
         A host variable that will receive the data retrieved from the
@@ -7093,7 +7129,7 @@ EXEC SQL GET DESCRIPTOR d VALUE 2 :d_data = DATA;
 
     <para>
      Here is an example for a whole procedure of
-     executing <literal>SELECT current_database();</> and showing the number of
+     executing <literal>SELECT current_database();</literal> and showing the number of
      columns, the column data length, and the column data:
 <programlisting>
 int
@@ -7106,6 +7142,7 @@ EXEC SQL BEGIN DECLARE SECTION;
 EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO testdb AS con1 USER testuser;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL ALLOCATE DESCRIPTOR d;
 
     /* Declare, open a cursor, and assign a descriptor to the cursor  */
@@ -7156,8 +7193,8 @@ d_data                  = testdb
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-allocate-descriptor"></member>
-     <member><xref linkend="ecpg-sql-set-descriptor"></member>
+     <member><xref linkend="ecpg-sql-allocate-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-set-descriptor"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -7170,9 +7207,9 @@ d_data                  = testdb
 
    <refsynopsisdiv>
 <synopsis>
-OPEN <replaceable class="PARAMETER">cursor_name</replaceable>
-OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING <replaceable class="PARAMETER">value</replaceable> [, ... ]
-OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable>
+OPEN <replaceable class="parameter">cursor_name</replaceable>
+OPEN <replaceable class="parameter">cursor_name</replaceable> USING <replaceable class="parameter">value</replaceable> [, ... ]
+OPEN <replaceable class="parameter">cursor_name</replaceable> USING SQL DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -7194,7 +7231,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+      <term><replaceable class="parameter">cursor_name</replaceable></term>
       <listitem>
        <para>
         The name of the cursor to be opened.  This can be an SQL
@@ -7204,7 +7241,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">value</replaceable></term>
+      <term><replaceable class="parameter">value</replaceable></term>
       <listitem>
        <para>
         A value to be bound to a placeholder in the cursor.  This can
@@ -7215,7 +7252,7 @@ OPEN <replaceable class="PARAMETER">cursor_name</replaceable> USING SQL DESCRIPT
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_name</replaceable></term>
+      <term><replaceable class="parameter">descriptor_name</replaceable></term>
       <listitem>
        <para>
         The name of a descriptor containing values to be bound to the
@@ -7250,8 +7287,8 @@ EXEC SQL OPEN :curname1;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-declare"></member>
-     <member><xref linkend="sql-close"></member>
+     <member><xref linkend="ecpg-sql-declare"/></member>
+     <member><xref linkend="sql-close"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -7264,7 +7301,7 @@ EXEC SQL OPEN :curname1;
 
    <refsynopsisdiv>
 <synopsis>
-PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable class="PARAMETER">string</replaceable>
+PREPARE <replaceable class="parameter">name</replaceable> FROM <replaceable class="parameter">string</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -7274,8 +7311,8 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable clas
     <para>
      <command>PREPARE</command> prepares a statement dynamically
      specified as a string for execution.  This is different from the
-     direct SQL statement <xref linkend="sql-prepare">, which can also
-     be used in embedded programs.  The <xref linkend="sql-execute">
+     direct SQL statement <xref linkend="sql-prepare"/>, which can also
+     be used in embedded programs.  The <xref linkend="sql-execute"/>
      command is used to execute either kind of prepared statement.
     </para>
    </refsect1>
@@ -7285,7 +7322,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable clas
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">prepared_name</replaceable></term>
+      <term><replaceable class="parameter">prepared_name</replaceable></term>
       <listitem>
        <para>
         An identifier for the prepared query.
@@ -7294,7 +7331,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> FROM <replaceable clas
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">string</replaceable></term>
+      <term><replaceable class="parameter">string</replaceable></term>
       <listitem>
        <para>
         A literal C string or a host variable containing a preparable
@@ -7330,7 +7367,7 @@ EXEC SQL EXECUTE foo USING SQL DESCRIPTOR indesc INTO SQL DESCRIPTOR outdesc;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="sql-execute"></member>
+     <member><xref linkend="sql-execute"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -7377,7 +7414,7 @@ SET AUTOCOMMIT { = | TO } { ON | OFF }
 
    <refsynopsisdiv>
 <synopsis>
-SET CONNECTION [ TO | = ] <replaceable class="PARAMETER">connection_name</replaceable>
+SET CONNECTION [ TO | = ] <replaceable class="parameter">connection_name</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -7396,7 +7433,7 @@ SET CONNECTION [ TO | = ] <replaceable class="PARAMETER">connection_name</replac
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">connection_name</replaceable></term>
+      <term><replaceable class="parameter">connection_name</replaceable></term>
       <listitem>
        <para>
         A database connection name established by
@@ -7437,8 +7474,8 @@ EXEC SQL SET CONNECTION = con1;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-connect"></member>
-     <member><xref linkend="ecpg-sql-disconnect"></member>
+     <member><xref linkend="ecpg-sql-connect"/></member>
+     <member><xref linkend="ecpg-sql-disconnect"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -7451,8 +7488,8 @@ EXEC SQL SET CONNECTION = con1;
 
    <refsynopsisdiv>
 <synopsis>
-SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> <replaceable class="PARAMETER">descriptor_header_item</replaceable> = <replaceable>value</replaceable> [, ... ]
-SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALUE <replaceable class="PARAMETER">number</replaceable> <replaceable class="PARAMETER">descriptor_item</replaceable> = <replaceable>value</replaceable> [, ...]
+SET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> <replaceable class="parameter">descriptor_header_item</replaceable> = <replaceable>value</replaceable> [, ... ]
+SET DESCRIPTOR <replaceable class="parameter">descriptor_name</replaceable> VALUE <replaceable class="parameter">number</replaceable> <replaceable class="parameter">descriptor_item</replaceable> = <replaceable>value</replaceable> [, ...]
 </synopsis>
    </refsynopsisdiv>
 
@@ -7478,7 +7515,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_name</replaceable></term>
+      <term><replaceable class="parameter">descriptor_name</replaceable></term>
       <listitem>
        <para>
         A descriptor name.
@@ -7487,7 +7524,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_header_item</replaceable></term>
+      <term><replaceable class="parameter">descriptor_header_item</replaceable></term>
       <listitem>
        <para>
         A token identifying which header information item to set.
@@ -7498,7 +7535,7 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">number</replaceable></term>
+      <term><replaceable class="parameter">number</replaceable></term>
       <listitem>
        <para>
         The number of the descriptor item to set.  The count starts at
@@ -7508,18 +7545,18 @@ SET DESCRIPTOR <replaceable class="PARAMETER">descriptor_name</replaceable> VALU
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">descriptor_item</replaceable></term>
+      <term><replaceable class="parameter">descriptor_item</replaceable></term>
       <listitem>
        <para>
         A token identifying which item of information to set in the
-        descriptor.  See <xref linkend="ecpg-named-descriptors"> for a
+        descriptor.  See <xref linkend="ecpg-named-descriptors"/> for a
         list of supported items.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">value</replaceable></term>
+      <term><replaceable class="parameter">value</replaceable></term>
       <listitem>
        <para>
         A value to store into the descriptor item.  This can be an SQL
@@ -7553,8 +7590,8 @@ EXEC SQL SET DESCRIPTOR indesc VALUE 2 INDICATOR = :val2null, DATA = :val2;
     <title>See Also</title>
 
     <simplelist type="inline">
-     <member><xref linkend="ecpg-sql-allocate-descriptor"></member>
-     <member><xref linkend="ecpg-sql-get-descriptor"></member>
+     <member><xref linkend="ecpg-sql-allocate-descriptor"/></member>
+     <member><xref linkend="ecpg-sql-get-descriptor"/></member>
     </simplelist>
    </refsect1>
   </refentry>
@@ -7567,7 +7604,7 @@ EXEC SQL SET DESCRIPTOR indesc VALUE 2 INDICATOR = :val2null, DATA = :val2;
 
    <refsynopsisdiv>
 <synopsis>
-TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable class="PARAMETER">ctype</replaceable>
+TYPE <replaceable class="parameter">type_name</replaceable> IS <replaceable class="parameter">ctype</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -7591,7 +7628,7 @@ TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable clas
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">type_name</replaceable></term>
+      <term><replaceable class="parameter">type_name</replaceable></term>
       <listitem>
        <para>
         The name for the new type.  It must be a valid C type name.
@@ -7600,7 +7637,7 @@ TYPE <replaceable class="PARAMETER">type_name</replaceable> IS <replaceable clas
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">ctype</replaceable></term>
+      <term><replaceable class="parameter">ctype</replaceable></term>
       <listitem>
        <para>
         A C type specification.
@@ -7663,6 +7700,7 @@ EXEC SQL BEGIN DECLARE SECTION;
 EXEC SQL END DECLARE SECTION;
 
     EXEC SQL CONNECT TO testdb AS con1;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
 
     EXEC SQL SELECT current_database(), 256 INTO :t:t_ind LIMIT 1;
 
@@ -7724,7 +7762,7 @@ VAR <replaceable>varname</replaceable> IS <replaceable>ctype</replaceable>
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">varname</replaceable></term>
+      <term><replaceable class="parameter">varname</replaceable></term>
       <listitem>
        <para>
         A C variable name.
@@ -7733,7 +7771,7 @@ VAR <replaceable>varname</replaceable> IS <replaceable>ctype</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">ctype</replaceable></term>
+      <term><replaceable class="parameter">ctype</replaceable></term>
       <listitem>
        <para>
         A C type specification.
@@ -7771,7 +7809,7 @@ EXEC SQL VAR a IS int;
 
    <refsynopsisdiv>
 <synopsis>
-WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="PARAMETER">action</replaceable>
+WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="parameter">action</replaceable>
 </synopsis>
    </refsynopsisdiv>
 
@@ -7788,7 +7826,7 @@ WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="PARAMETER">ac
     <title>Parameters</title>
 
     <para>
-     See <xref linkend="ecpg-whenever"> for a description of the
+     See <xref linkend="ecpg-whenever"/> for a description of the
      parameters.
     </para>
    </refsect1>
@@ -7799,6 +7837,7 @@ WHENEVER { NOT FOUND | SQLERROR | SQLWARNING } <replaceable class="PARAMETER">ac
 <programlisting>
 EXEC SQL WHENEVER NOT FOUND CONTINUE;
 EXEC SQL WHENEVER NOT FOUND DO BREAK;
+EXEC SQL WHENEVER NOT FOUND DO CONTINUE;
 EXEC SQL WHENEVER SQLWARNING SQLPRINT;
 EXEC SQL WHENEVER SQLWARNING DO warn();
 EXEC SQL WHENEVER SQLERROR sqlprint;
@@ -7818,6 +7857,7 @@ int
 main(void)
 {
     EXEC SQL CONNECT TO testdb AS con1;
+    EXEC SQL SELECT pg_catalog.set_config('search_path', '', false); EXEC SQL COMMIT;
     EXEC SQL ALLOCATE DESCRIPTOR d;
     EXEC SQL DECLARE cur CURSOR FOR SELECT current_database(), 'hoge', 256;
     EXEC SQL OPEN cur;
@@ -7857,10 +7897,10 @@ main(void)
  <sect1 id="ecpg-informix-compat">
   <title><productname>Informix</productname> Compatibility Mode</title>
   <para>
-   <command>ecpg</command> can be run in a so-called <firstterm>Informix compatibility mode</>. If
+   <command>ecpg</command> can be run in a so-called <firstterm>Informix compatibility mode</firstterm>. If
    this mode is active, it tries to behave as if it were the <productname>Informix</productname>
    precompiler for <productname>Informix</productname> E/SQL. Generally spoken this will allow you to use
-   the dollar sign instead of the <literal>EXEC SQL</> primitive to introduce
+   the dollar sign instead of the <literal>EXEC SQL</literal> primitive to introduce
    embedded SQL commands:
 <programlisting>
 $int j = 3;
@@ -7882,11 +7922,11 @@ $COMMIT;
   </note>
 
   <para>
-   There are two compatibility modes: <literal>INFORMIX</>, <literal>INFORMIX_SE</>
+   There are two compatibility modes: <literal>INFORMIX</literal>, <literal>INFORMIX_SE</literal>
   </para>
   <para>
    When linking programs that use this compatibility mode, remember to link
-   against <literal>libcompat</> that is shipped with ECPG.
+   against <literal>libcompat</literal> that is shipped with ECPG.
   </para>
   <para>
    Besides the previously explained syntactic sugar, the <productname>Informix</productname> compatibility
@@ -7904,7 +7944,7 @@ $COMMIT;
    no drop-in replacement if you are using <productname>Informix</productname> at the moment. Moreover,
    some of the data types are different. For example,
    <productname>PostgreSQL's</productname> datetime and interval types do not
-   know about ranges like for example <literal>YEAR TO MINUTE</> so you won't
+   know about ranges like for example <literal>YEAR TO MINUTE</literal> so you won't
    find support in ECPG for that either.
   </para>
 
@@ -7929,11 +7969,11 @@ EXEC SQL FETCH MYCUR INTO :userid;
    <para>
     <variablelist>
      <varlistentry>
-      <term><literal>CLOSE DATABASE</></term>
+      <term><literal>CLOSE DATABASE</literal></term>
       <listitem>
        <para>
         This statement closes the current connection. In fact, this is a
-        synonym for ECPG's <literal>DISCONNECT CURRENT</>:
+        synonym for ECPG's <literal>DISCONNECT CURRENT</literal>:
 <programlisting>
 $CLOSE DATABASE;                /* close the current connection */
 EXEC SQL CLOSE DATABASE;
@@ -7942,12 +7982,12 @@ EXEC SQL CLOSE DATABASE;
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><literal>FREE cursor_name</></term>
+      <term><literal>FREE cursor_name</literal></term>
       <listitem>
        <para>
         Due to the differences how ECPG works compared to Informix's ESQL/C (i.e. which steps
         are purely grammar transformations and which steps rely on the underlying run-time library)
-        there is no <literal>FREE cursor_name</> statement in ECPG. This is because in ECPG,
+        there is no <literal>FREE cursor_name</literal> statement in ECPG. This is because in ECPG,
         <literal>DECLARE CURSOR</literal> doesn't translate to a function call into
         the run-time library that uses to the cursor name. This means that there's no run-time
         bookkeeping of SQL cursors in the ECPG run-time library, only in the PostgreSQL server.
@@ -7955,10 +7995,10 @@ EXEC SQL CLOSE DATABASE;
       </listitem>
      </varlistentry>
      <varlistentry>
-      <term><literal>FREE statement_name</></term>
+      <term><literal>FREE statement_name</literal></term>
       <listitem>
        <para>
-        <literal>FREE statement_name</> is a synonym for <literal>DEALLOCATE PREPARE statement_name</>.
+        <literal>FREE statement_name</literal> is a synonym for <literal>DEALLOCATE PREPARE statement_name</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -7970,7 +8010,7 @@ EXEC SQL CLOSE DATABASE;
    <title>Informix-compatible SQLDA Descriptor Areas</title>
    <para>
     Informix-compatible mode supports a different structure than the one described in
-    <xref linkend="ecpg-sqlda-descriptors">. See below:
+    <xref linkend="ecpg-sqlda-descriptors"/>. See below:
 <programlisting>
 struct sqlvar_compat
 {
@@ -8015,16 +8055,16 @@ typedef struct sqlda_compat     sqlda_t;
     <variablelist>
 
      <varlistentry>
-     <term><literal>sqld</></term>
+     <term><literal>sqld</literal></term>
       <listitem>
        <para>
-        The number of fields in the <literal>SQLDA</> descriptor.
+        The number of fields in the <literal>SQLDA</literal> descriptor.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlvar</></term>
+     <term><literal>sqlvar</literal></term>
       <listitem>
        <para>
         Pointer to the per-field properties.
@@ -8033,7 +8073,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>desc_name</></term>
+     <term><literal>desc_name</literal></term>
       <listitem>
        <para>
         Unused, filled with zero-bytes.
@@ -8042,7 +8082,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>desc_occ</></term>
+     <term><literal>desc_occ</literal></term>
       <listitem>
        <para>
         Size of the allocated structure.
@@ -8051,7 +8091,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>desc_next</></term>
+     <term><literal>desc_next</literal></term>
       <listitem>
        <para>
         Pointer to the next SQLDA structure if the result set contains more than one record.
@@ -8060,7 +8100,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>reserved</></term>
+     <term><literal>reserved</literal></term>
       <listitem>
        <para>
         Unused pointer, contains NULL. Kept for Informix-compatibility.
@@ -8075,7 +8115,7 @@ typedef struct sqlda_compat     sqlda_t;
     <variablelist>
 
      <varlistentry>
-     <term><literal>sqltype</></term>
+     <term><literal>sqltype</literal></term>
       <listitem>
        <para>
         Type of the field. Constants are in <literal>sqltypes.h</literal>
@@ -8084,7 +8124,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqllen</></term>
+     <term><literal>sqllen</literal></term>
       <listitem>
        <para>
         Length of the field data.
@@ -8093,7 +8133,7 @@ typedef struct sqlda_compat     sqlda_t;
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqldata</></term>
+     <term><literal>sqldata</literal></term>
       <listitem>
        <para>
         Pointer to the field data. The pointer is of <literal>char *</literal> type,
@@ -8114,7 +8154,7 @@ switch (sqldata->sqlvar[i].sqltype)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlind</></term>
+     <term><literal>sqlind</literal></term>
       <listitem>
        <para>
         Pointer to the NULL indicator. If returned by DESCRIBE or FETCH then it's always a valid pointer.
@@ -8130,7 +8170,7 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlname</></term>
+     <term><literal>sqlname</literal></term>
       <listitem>
        <para>
         Name of the field. 0-terminated string.
@@ -8139,16 +8179,16 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlformat</></term>
+     <term><literal>sqlformat</literal></term>
       <listitem>
        <para>
-        Reserved in Informix, value of <function>PQfformat()</> for the field.
+        Reserved in Informix, value of <function>PQfformat()</function> for the field.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlitype</></term>
+     <term><literal>sqlitype</literal></term>
       <listitem>
        <para>
         Type of the NULL indicator data. It's always SQLSMINT when returning data from the server.
@@ -8159,7 +8199,7 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlilen</></term>
+     <term><literal>sqlilen</literal></term>
       <listitem>
        <para>
         Length of the NULL indicator data.
@@ -8168,23 +8208,23 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlxid</></term>
+     <term><literal>sqlxid</literal></term>
       <listitem>
        <para>
-        Extended type of the field, result of <function>PQftype()</>.
+        Extended type of the field, result of <function>PQftype()</function>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqltypename</></term>
-     <term><literal>sqltypelen</></term>
-     <term><literal>sqlownerlen</></term>
-     <term><literal>sqlsourcetype</></term>
-     <term><literal>sqlownername</></term>
-     <term><literal>sqlsourceid</></term>
-     <term><literal>sqlflags</></term>
-     <term><literal>sqlreserved</></term>
+     <term><literal>sqltypename</literal></term>
+     <term><literal>sqltypelen</literal></term>
+     <term><literal>sqlownerlen</literal></term>
+     <term><literal>sqlsourcetype</literal></term>
+     <term><literal>sqlownername</literal></term>
+     <term><literal>sqlsourceid</literal></term>
+     <term><literal>sqlflags</literal></term>
+     <term><literal>sqlreserved</literal></term>
       <listitem>
        <para>
         Unused.
@@ -8193,7 +8233,7 @@ if (*(int2 *)sqldata->sqlvar[i].sqlind != 0)
      </varlistentry>
 
      <varlistentry>
-     <term><literal>sqlilongdata</></term>
+     <term><literal>sqlilongdata</literal></term>
       <listitem>
        <para>
         It equals to <literal>sqldata</literal> if <literal>sqllen</literal> is larger than 32kB.
@@ -8238,7 +8278,7 @@ EXEC SQL INCLUDE sqlda.h;
     free(sqlda); /* The main structure is all to be free(),
                   * sqlda and sqlda-&gt;sqlvar is in one allocated area */
 </programlisting>
-    For more information, see the <literal>sqlda.h</> header and the
+    For more information, see the <literal>sqlda.h</literal> header and the
     <literal>src/interfaces/ecpg/test/compat_informix/sqlda.pgc</literal> regression test.
    </para>
   </sect2>
@@ -8248,7 +8288,7 @@ EXEC SQL INCLUDE sqlda.h;
    <para>
     <variablelist>
      <varlistentry>
-      <term><function>decadd</></term>
+      <term><function>decadd</function></term>
       <listitem>
        <para>
         Add two decimal type values.
@@ -8256,19 +8296,19 @@ EXEC SQL INCLUDE sqlda.h;
 int decadd(decimal *arg1, decimal *arg2, decimal *sum);
 </synopsis>
         The function receives a pointer to the first operand of type decimal
-        (<literal>arg1</>), a pointer to the second operand of type decimal
-        (<literal>arg2</>) and a pointer to a value of type decimal that will
-        contain the sum (<literal>sum</>). On success, the function returns 0.
-        <symbol>ECPG_INFORMIX_NUM_OVERFLOW</> is returned in case of overflow and
-        <symbol>ECPG_INFORMIX_NUM_UNDERFLOW</> in case of underflow. -1 is returned for
-        other failures and <varname>errno</> is set to the respective <varname>errno</> number of the
+        (<literal>arg1</literal>), a pointer to the second operand of type decimal
+        (<literal>arg2</literal>) and a pointer to a value of type decimal that will
+        contain the sum (<literal>sum</literal>). On success, the function returns 0.
+        <symbol>ECPG_INFORMIX_NUM_OVERFLOW</symbol> is returned in case of overflow and
+        <symbol>ECPG_INFORMIX_NUM_UNDERFLOW</symbol> in case of underflow. -1 is returned for
+        other failures and <varname>errno</varname> is set to the respective <varname>errno</varname> number of the
         pgtypeslib.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccmp</></term>
+      <term><function>deccmp</function></term>
       <listitem>
        <para>
         Compare two variables of type decimal.
@@ -8276,25 +8316,25 @@ int decadd(decimal *arg1, decimal *arg2, decimal *sum);
 int deccmp(decimal *arg1, decimal *arg2);
 </synopsis>
         The function receives a pointer to the first decimal value
-        (<literal>arg1</>), a pointer to the second decimal value
-        (<literal>arg2</>) and returns an integer value that indicates which is
+        (<literal>arg1</literal>), a pointer to the second decimal value
+        (<literal>arg2</literal>) and returns an integer value that indicates which is
         the bigger value.
         <itemizedlist>
          <listitem>
           <para>
-           1, if the value that <literal>arg1</> points to is bigger than the
-           value that <literal>var2</> points to
+           1, if the value that <literal>arg1</literal> points to is bigger than the
+           value that <literal>var2</literal> points to
           </para>
          </listitem>
          <listitem>
           <para>
-           -1, if the value that <literal>arg1</> points to is smaller than the
-           value that <literal>arg2</> points to </para>
+           -1, if the value that <literal>arg1</literal> points to is smaller than the
+           value that <literal>arg2</literal> points to </para>
          </listitem>
          <listitem>
           <para>
-           0, if the value that <literal>arg1</> points to and the value that
-           <literal>arg2</> points to are equal
+           0, if the value that <literal>arg1</literal> points to and the value that
+           <literal>arg2</literal> points to are equal
           </para>
          </listitem>
         </itemizedlist>
@@ -8303,7 +8343,7 @@ int deccmp(decimal *arg1, decimal *arg2);
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccopy</></term>
+      <term><function>deccopy</function></term>
       <listitem>
        <para>
         Copy a decimal value.
@@ -8311,15 +8351,15 @@ int deccmp(decimal *arg1, decimal *arg2);
 void deccopy(decimal *src, decimal *target);
 </synopsis>
         The function receives a pointer to the decimal value that should be
-        copied as the first argument (<literal>src</>) and a pointer to the
-        target structure of type decimal (<literal>target</>) as the second
+        copied as the first argument (<literal>src</literal>) and a pointer to the
+        target structure of type decimal (<literal>target</literal>) as the second
         argument.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccvasc</></term>
+      <term><function>deccvasc</function></term>
       <listitem>
        <para>
         Convert a value from its ASCII representation into a decimal type.
@@ -8327,8 +8367,8 @@ void deccopy(decimal *src, decimal *target);
 int deccvasc(char *cp, int len, decimal *np);
 </synopsis>
         The function receives a pointer to string that contains the string
-        representation of the number to be converted (<literal>cp</>) as well
-        as its length <literal>len</>. <literal>np</> is a pointer to the
+        representation of the number to be converted (<literal>cp</literal>) as well
+        as its length <literal>len</literal>. <literal>np</literal> is a pointer to the
         decimal value that saves the result of the operation.
        </para>
        <para>
@@ -8341,18 +8381,18 @@ int deccvasc(char *cp, int len, decimal *np);
        </para>
        <para>
         The function returns 0 on success. If overflow or underflow occurred,
-        <literal>ECPG_INFORMIX_NUM_OVERFLOW</> or
-        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</> is returned. If the ASCII
+        <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal> or
+        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</literal> is returned. If the ASCII
         representation could not be parsed,
-        <literal>ECPG_INFORMIX_BAD_NUMERIC</> is returned or
-        <literal>ECPG_INFORMIX_BAD_EXPONENT</> if this problem occurred while
+        <literal>ECPG_INFORMIX_BAD_NUMERIC</literal> is returned or
+        <literal>ECPG_INFORMIX_BAD_EXPONENT</literal> if this problem occurred while
         parsing the exponent.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccvdbl</></term>
+      <term><function>deccvdbl</function></term>
       <listitem>
        <para>
         Convert a value of type double to a value of type decimal.
@@ -8360,8 +8400,8 @@ int deccvasc(char *cp, int len, decimal *np);
 int deccvdbl(double dbl, decimal *np);
 </synopsis>
         The function receives the variable of type double that should be
-        converted as its first argument (<literal>dbl</>). As the second
-        argument (<literal>np</>), the function receives a pointer to the
+        converted as its first argument (<literal>dbl</literal>). As the second
+        argument (<literal>np</literal>), the function receives a pointer to the
         decimal variable that should hold the result of the operation.
        </para>
        <para>
@@ -8372,7 +8412,7 @@ int deccvdbl(double dbl, decimal *np);
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccvint</></term>
+      <term><function>deccvint</function></term>
       <listitem>
        <para>
         Convert a value of type int to a value of type decimal.
@@ -8380,8 +8420,8 @@ int deccvdbl(double dbl, decimal *np);
 int deccvint(int in, decimal *np);
 </synopsis>
         The function receives the variable of type int that should be
-        converted as its first argument (<literal>in</>). As the second
-        argument (<literal>np</>), the function receives a pointer to the
+        converted as its first argument (<literal>in</literal>). As the second
+        argument (<literal>np</literal>), the function receives a pointer to the
         decimal variable that should hold the result of the operation.
        </para>
        <para>
@@ -8392,7 +8432,7 @@ int deccvint(int in, decimal *np);
      </varlistentry>
 
      <varlistentry>
-      <term><function>deccvlong</></term>
+      <term><function>deccvlong</function></term>
       <listitem>
        <para>
         Convert a value of type long to a value of type decimal.
@@ -8400,8 +8440,8 @@ int deccvint(int in, decimal *np);
 int deccvlong(long lng, decimal *np);
 </synopsis>
         The function receives the variable of type long that should be
-        converted as its first argument (<literal>lng</>). As the second
-        argument (<literal>np</>), the function receives a pointer to the
+        converted as its first argument (<literal>lng</literal>). As the second
+        argument (<literal>np</literal>), the function receives a pointer to the
         decimal variable that should hold the result of the operation.
        </para>
        <para>
@@ -8412,7 +8452,7 @@ int deccvlong(long lng, decimal *np);
      </varlistentry>
 
      <varlistentry>
-      <term><function>decdiv</></term>
+      <term><function>decdiv</function></term>
       <listitem>
        <para>
         Divide two variables of type decimal.
@@ -8420,15 +8460,15 @@ int deccvlong(long lng, decimal *np);
 int decdiv(decimal *n1, decimal *n2, decimal *result);
 </synopsis>
         The function receives pointers to the variables that are the first
-        (<literal>n1</>) and the second (<literal>n2</>) operands and
-        calculates <literal>n1</>/<literal>n2</>. <literal>result</> is a
+        (<literal>n1</literal>) and the second (<literal>n2</literal>) operands and
+        calculates <literal>n1</literal>/<literal>n2</literal>. <literal>result</literal> is a
         pointer to the variable that should hold the result of the operation.
        </para>
        <para>
         On success, 0 is returned and a negative value if the division fails.
         If overflow or underflow occurred, the function returns
-        <literal>ECPG_INFORMIX_NUM_OVERFLOW</> or
-        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</> respectively. If an attempt to
+        <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal> or
+        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</literal> respectively. If an attempt to
         divide by zero is observed, the function returns
         <literal>ECPG_INFORMIX_DIVIDE_ZERO</literal>.
        </para>
@@ -8436,7 +8476,7 @@ int decdiv(decimal *n1, decimal *n2, decimal *result);
      </varlistentry>
 
      <varlistentry>
-      <term><function>decmul</></term>
+      <term><function>decmul</function></term>
       <listitem>
        <para>
         Multiply two decimal values.
@@ -8444,21 +8484,21 @@ int decdiv(decimal *n1, decimal *n2, decimal *result);
 int decmul(decimal *n1, decimal *n2, decimal *result);
 </synopsis>
         The function receives pointers to the variables that are the first
-        (<literal>n1</>) and the second (<literal>n2</>) operands and
-        calculates <literal>n1</>*<literal>n2</>. <literal>result</> is a
+        (<literal>n1</literal>) and the second (<literal>n2</literal>) operands and
+        calculates <literal>n1</literal>*<literal>n2</literal>. <literal>result</literal> is a
         pointer to the variable that should hold the result of the operation.
        </para>
        <para>
         On success, 0 is returned and a negative value if the multiplication
         fails. If overflow or underflow occurred, the function returns
-        <literal>ECPG_INFORMIX_NUM_OVERFLOW</> or
-        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</> respectively.
+        <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal> or
+        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</literal> respectively.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>decsub</></term>
+      <term><function>decsub</function></term>
       <listitem>
        <para>
         Subtract one decimal value from another.
@@ -8466,21 +8506,21 @@ int decmul(decimal *n1, decimal *n2, decimal *result);
 int decsub(decimal *n1, decimal *n2, decimal *result);
 </synopsis>
         The function receives pointers to the variables that are the first
-        (<literal>n1</>) and the second (<literal>n2</>) operands and
-        calculates <literal>n1</>-<literal>n2</>. <literal>result</> is a
+        (<literal>n1</literal>) and the second (<literal>n2</literal>) operands and
+        calculates <literal>n1</literal>-<literal>n2</literal>. <literal>result</literal> is a
         pointer to the variable that should hold the result of the operation.
        </para>
        <para>
         On success, 0 is returned and a negative value if the subtraction
         fails. If overflow or underflow occurred, the function returns
-        <literal>ECPG_INFORMIX_NUM_OVERFLOW</> or
-        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</> respectively.
+        <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal> or
+        <literal>ECPG_INFORMIX_NUM_UNDERFLOW</literal> respectively.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dectoasc</></term>
+      <term><function>dectoasc</function></term>
       <listitem>
        <para>
         Convert a variable of type decimal to its ASCII representation in a C
@@ -8489,28 +8529,28 @@ int decsub(decimal *n1, decimal *n2, decimal *result);
 int dectoasc(decimal *np, char *cp, int len, int right)
 </synopsis>
         The function receives a pointer to a variable of type decimal
-        (<literal>np</>) that it converts to its textual representation.
-        <literal>cp</> is the buffer that should hold the result of the
-        operation. The parameter <literal>right</> specifies, how many digits
+        (<literal>np</literal>) that it converts to its textual representation.
+        <literal>cp</literal> is the buffer that should hold the result of the
+        operation. The parameter <literal>right</literal> specifies, how many digits
         right of the decimal point should be included in the output. The result
         will be rounded to this number of decimal digits. Setting
-        <literal>right</> to -1 indicates that all available decimal digits
+        <literal>right</literal> to -1 indicates that all available decimal digits
         should be included in the output. If the length of the output buffer,
-        which is indicated by <literal>len</> is not sufficient to hold the
+        which is indicated by <literal>len</literal> is not sufficient to hold the
         textual representation including the trailing zero byte, only a
-        single <literal>*</> character is stored in the result and -1 is
+        single <literal>*</literal> character is stored in the result and -1 is
         returned.
        </para>
        <para>
-        The function returns either -1 if the buffer <literal>cp</> was too
-        small or <literal>ECPG_INFORMIX_OUT_OF_MEMORY</> if memory was
+        The function returns either -1 if the buffer <literal>cp</literal> was too
+        small or <literal>ECPG_INFORMIX_OUT_OF_MEMORY</literal> if memory was
         exhausted.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dectodbl</></term>
+      <term><function>dectodbl</function></term>
       <listitem>
        <para>
         Convert a variable of type decimal to a double.
@@ -8518,8 +8558,8 @@ int dectoasc(decimal *np, char *cp, int len, int right)
 int dectodbl(decimal *np, double *dblp);
 </synopsis>
         The function receives a pointer to the decimal value to convert
-        (<literal>np</>) and a pointer to the double variable that
-        should hold the result of the operation (<literal>dblp</>).
+        (<literal>np</literal>) and a pointer to the double variable that
+        should hold the result of the operation (<literal>dblp</literal>).
        </para>
        <para>
         On success, 0 is returned and a negative value if the conversion
@@ -8529,7 +8569,7 @@ int dectodbl(decimal *np, double *dblp);
      </varlistentry>
 
      <varlistentry>
-      <term><function>dectoint</></term>
+      <term><function>dectoint</function></term>
       <listitem>
        <para>
         Convert a variable to type decimal to an integer.
@@ -8537,25 +8577,25 @@ int dectodbl(decimal *np, double *dblp);
 int dectoint(decimal *np, int *ip);
 </synopsis>
         The function receives a pointer to the decimal value to convert
-        (<literal>np</>) and a pointer to the integer variable that
-        should hold the result of the operation (<literal>ip</>).
+        (<literal>np</literal>) and a pointer to the integer variable that
+        should hold the result of the operation (<literal>ip</literal>).
        </para>
        <para>
         On success, 0 is returned and a negative value if the conversion
-        failed. If an overflow occurred, <literal>ECPG_INFORMIX_NUM_OVERFLOW</>
+        failed. If an overflow occurred, <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal>
         is returned.
        </para>
        <para>
         Note that the ECPG implementation differs from the <productname>Informix</productname>
         implementation. <productname>Informix</productname> limits an integer to the range from -32767 to
         32767, while the limits in the ECPG implementation depend on the
-        architecture (<literal>-INT_MAX .. INT_MAX</>).
+        architecture (<literal>-INT_MAX .. INT_MAX</literal>).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dectolong</></term>
+      <term><function>dectolong</function></term>
       <listitem>
        <para>
         Convert a variable to type decimal to a long integer.
@@ -8563,12 +8603,12 @@ int dectoint(decimal *np, int *ip);
 int dectolong(decimal *np, long *lngp);
 </synopsis>
         The function receives a pointer to the decimal value to convert
-        (<literal>np</>) and a pointer to the long variable that
-        should hold the result of the operation (<literal>lngp</>).
+        (<literal>np</literal>) and a pointer to the long variable that
+        should hold the result of the operation (<literal>lngp</literal>).
        </para>
        <para>
         On success, 0 is returned and a negative value if the conversion
-        failed. If an overflow occurred, <literal>ECPG_INFORMIX_NUM_OVERFLOW</>
+        failed. If an overflow occurred, <literal>ECPG_INFORMIX_NUM_OVERFLOW</literal>
         is returned.
        </para>
        <para>
@@ -8576,13 +8616,13 @@ int dectolong(decimal *np, long *lngp);
         implementation. <productname>Informix</productname> limits a long integer to the range from
         -2,147,483,647 to 2,147,483,647, while the limits in the ECPG
         implementation depend on the architecture (<literal>-LONG_MAX ..
-        LONG_MAX</>).
+        LONG_MAX</literal>).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rdatestr</></term>
+      <term><function>rdatestr</function></term>
       <listitem>
        <para>
         Converts a date to a C char* string.
@@ -8590,8 +8630,8 @@ int dectolong(decimal *np, long *lngp);
 int rdatestr(date d, char *str);
 </synopsis>
         The function receives two arguments, the first one is the date to
-        convert (<literal>d</>) and the second one is a pointer to the target
-        string. The output format is always <literal>yyyy-mm-dd</>, so you need
+        convert (<literal>d</literal>) and the second one is a pointer to the target
+        string. The output format is always <literal>yyyy-mm-dd</literal>, so you need
         to allocate at least 11 bytes (including the zero-byte terminator) for the
         string.
        </para>
@@ -8609,7 +8649,7 @@ int rdatestr(date d, char *str);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rstrdate</></term>
+      <term><function>rstrdate</function></term>
       <listitem>
        <para>
         Parse the textual representation of a date.
@@ -8617,41 +8657,41 @@ int rdatestr(date d, char *str);
 int rstrdate(char *str, date *d);
 </synopsis>
         The function receives the textual representation of the date to convert
-        (<literal>str</>) and a pointer to a variable of type date
-        (<literal>d</>). This function does not allow you to specify a format
+        (<literal>str</literal>) and a pointer to a variable of type date
+        (<literal>d</literal>). This function does not allow you to specify a format
         mask. It uses the default format mask of <productname>Informix</productname> which is
-        <literal>mm/dd/yyyy</>. Internally, this function is implemented by
-        means of <function>rdefmtdate</>. Therefore, <function>rstrdate</> is
+        <literal>mm/dd/yyyy</literal>. Internally, this function is implemented by
+        means of <function>rdefmtdate</function>. Therefore, <function>rstrdate</function> is
         not faster and if you have the choice you should opt for
-        <function>rdefmtdate</> which allows you to specify the format mask
+        <function>rdefmtdate</function> which allows you to specify the format mask
         explicitly.
        </para>
        <para>
-        The function returns the same values as <function>rdefmtdate</>.
+        The function returns the same values as <function>rdefmtdate</function>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rtoday</></term>
+      <term><function>rtoday</function></term>
       <listitem>
        <para>
         Get the current date.
 <synopsis>
 void rtoday(date *d);
 </synopsis>
-        The function receives a pointer to a date variable (<literal>d</>)
+        The function receives a pointer to a date variable (<literal>d</literal>)
         that it sets to the current date.
        </para>
        <para>
-        Internally this function uses the <xref linkend="PGTYPESdatetoday">
+        Internally this function uses the <xref linkend="pgtypesdatetoday"/>
         function.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rjulmdy</></term>
+      <term><function>rjulmdy</function></term>
       <listitem>
        <para>
         Extract the values for the day, the month and the year from a variable
@@ -8659,24 +8699,24 @@ void rtoday(date *d);
 <synopsis>
 int rjulmdy(date d, short mdy[3]);
 </synopsis>
-        The function receives the date <literal>d</> and a pointer to an array
-        of 3 short integer values <literal>mdy</>. The variable name indicates
-        the sequential order: <literal>mdy[0]</> will be set to contain the
-        number of the month, <literal>mdy[1]</> will be set to the value of the
-        day and <literal>mdy[2]</> will contain the year.
+        The function receives the date <literal>d</literal> and a pointer to an array
+        of 3 short integer values <literal>mdy</literal>. The variable name indicates
+        the sequential order: <literal>mdy[0]</literal> will be set to contain the
+        number of the month, <literal>mdy[1]</literal> will be set to the value of the
+        day and <literal>mdy[2]</literal> will contain the year.
        </para>
        <para>
         The function always returns 0 at the moment.
        </para>
        <para>
-        Internally the function uses the <xref linkend="PGTYPESdatejulmdy">
+        Internally the function uses the <xref linkend="pgtypesdatejulmdy"/>
         function.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rdefmtdate</></term>
+      <term><function>rdefmtdate</function></term>
       <listitem>
        <para>
         Use a format mask to convert a character string to a value of type
@@ -8685,9 +8725,9 @@ int rjulmdy(date d, short mdy[3]);
 int rdefmtdate(date *d, char *fmt, char *str);
 </synopsis>
         The function receives a pointer to the date value that should hold the
-        result of the operation (<literal>d</>), the format mask to use for
-        parsing the date (<literal>fmt</>) and the C char* string containing
-        the textual representation of the date (<literal>str</>). The textual
+        result of the operation (<literal>d</literal>), the format mask to use for
+        parsing the date (<literal>fmt</literal>) and the C char* string containing
+        the textual representation of the date (<literal>str</literal>). The textual
         representation is expected to match the format mask. However you do not
         need to have a 1:1 mapping of the string to the format mask. The
         function only analyzes the sequential order and looks for the literals
@@ -8706,32 +8746,32 @@ int rdefmtdate(date *d, char *fmt, char *str);
          </listitem>
          <listitem>
           <para>
-           <literal>ECPG_INFORMIX_ENOSHORTDATE</> - The date does not contain
+           <literal>ECPG_INFORMIX_ENOSHORTDATE</literal> - The date does not contain
            delimiters between day, month and year. In this case the input
            string must be exactly 6 or 8 bytes long but isn't.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>ECPG_INFORMIX_ENOTDMY</> - The format string did not
+           <literal>ECPG_INFORMIX_ENOTDMY</literal> - The format string did not
            correctly indicate the sequential order of year, month and day.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>ECPG_INFORMIX_BAD_DAY</> - The input string does not
+           <literal>ECPG_INFORMIX_BAD_DAY</literal> - The input string does not
            contain a valid day.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>ECPG_INFORMIX_BAD_MONTH</> - The input string does not
+           <literal>ECPG_INFORMIX_BAD_MONTH</literal> - The input string does not
            contain a valid month.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>ECPG_INFORMIX_BAD_YEAR</> - The input string does not
+           <literal>ECPG_INFORMIX_BAD_YEAR</literal> - The input string does not
            contain a valid year.
           </para>
          </listitem>
@@ -8739,14 +8779,14 @@ int rdefmtdate(date *d, char *fmt, char *str);
        </para>
        <para>
         Internally this function is implemented to use the <xref
-        linkend="PGTYPESdatedefmtasc"> function. See the reference there for a
+        linkend="pgtypesdatedefmtasc"/> function. See the reference there for a
         table of example input.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rfmtdate</></term>
+      <term><function>rfmtdate</function></term>
       <listitem>
        <para>
         Convert a variable of type date to its textual representation using a
@@ -8754,22 +8794,22 @@ int rdefmtdate(date *d, char *fmt, char *str);
 <synopsis>
 int rfmtdate(date d, char *fmt, char *str);
 </synopsis>
-        The function receives the date to convert (<literal>d</>), the format
-        mask (<literal>fmt</>) and the string that will hold the textual
-        representation of the date (<literal>str</>).
+        The function receives the date to convert (<literal>d</literal>), the format
+        mask (<literal>fmt</literal>) and the string that will hold the textual
+        representation of the date (<literal>str</literal>).
        </para>
        <para>
         On success, 0 is returned and a negative value if an error occurred.
        </para>
        <para>
-        Internally this function uses the <xref linkend="PGTYPESdatefmtasc">
+        Internally this function uses the <xref linkend="pgtypesdatefmtasc"/>
         function, see the reference there for examples.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rmdyjul</></term>
+      <term><function>rmdyjul</function></term>
       <listitem>
        <para>
         Create a date value from an array of 3 short integers that specify the
@@ -8778,7 +8818,7 @@ int rfmtdate(date d, char *fmt, char *str);
 int rmdyjul(short mdy[3], date *d);
 </synopsis>
         The function receives the array of the 3 short integers
-        (<literal>mdy</>) and a pointer to a variable of type date that should
+        (<literal>mdy</literal>) and a pointer to a variable of type date that should
         hold the result of the operation.
        </para>
        <para>
@@ -8786,20 +8826,20 @@ int rmdyjul(short mdy[3], date *d);
        </para>
        <para>
         Internally the function is implemented to use the function <xref
-        linkend="PGTYPESdatemdyjul">.
+        linkend="pgtypesdatemdyjul"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>rdayofweek</></term>
+      <term><function>rdayofweek</function></term>
       <listitem>
        <para>
         Return a number representing the day of the week for a date value.
 <synopsis>
 int rdayofweek(date d);
 </synopsis>
-        The function receives the date variable <literal>d</> as its only
+        The function receives the date variable <literal>d</literal> as its only
         argument and returns an integer that indicates the day of the week for
         this date.
         <itemizedlist>
@@ -8842,13 +8882,13 @@ int rdayofweek(date d);
        </para>
        <para>
         Internally the function is implemented to use the function <xref
-        linkend="PGTYPESdatedayofweek">.
+        linkend="pgtypesdatedayofweek"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dtcurrent</></term>
+      <term><function>dtcurrent</function></term>
       <listitem>
        <para>
         Retrieve the current timestamp.
@@ -8856,13 +8896,13 @@ int rdayofweek(date d);
 void dtcurrent(timestamp *ts);
 </synopsis>
         The function retrieves the current timestamp and saves it into the
-        timestamp variable that <literal>ts</> points to.
+        timestamp variable that <literal>ts</literal> points to.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dtcvasc</></term>
+      <term><function>dtcvasc</function></term>
       <listitem>
        <para>
         Parses a timestamp from its textual representation
@@ -8870,9 +8910,9 @@ void dtcurrent(timestamp *ts);
 <synopsis>
 int dtcvasc(char *str, timestamp *ts);
 </synopsis>
-        The function receives the string to parse (<literal>str</>) and a
+        The function receives the string to parse (<literal>str</literal>) and a
         pointer to the timestamp variable that should hold the result of the
-        operation (<literal>ts</>).
+        operation (<literal>ts</literal>).
        </para>
        <para>
         The function returns 0 on success and a negative value in case of
@@ -8880,14 +8920,14 @@ int dtcvasc(char *str, timestamp *ts);
        </para>
        <para>
         Internally this function uses the <xref
-        linkend="PGTYPEStimestampfromasc"> function. See the reference there
+        linkend="pgtypestimestampfromasc"/> function. See the reference there
         for a table with example inputs.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>dtcvfmtasc</></term>
+      <term><function>dtcvfmtasc</function></term>
       <listitem>
        <para>
         Parses a timestamp from its textual representation
@@ -8895,14 +8935,14 @@ int dtcvasc(char *str, timestamp *ts);
 <synopsis>
 dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue)
 </synopsis>
-        The function receives the string to parse (<literal>inbuf</>), the
-        format mask to use (<literal>fmtstr</>) and a pointer to the timestamp
+        The function receives the string to parse (<literal>inbuf</literal>), the
+        format mask to use (<literal>fmtstr</literal>) and a pointer to the timestamp
         variable that should hold the result of the operation
-        (<literal>dtvalue</>).
+        (<literal>dtvalue</literal>).
        </para>
        <para>
         This function is implemented by means of the <xref
-        linkend="PGTYPEStimestampdefmtasc"> function. See the documentation
+        linkend="pgtypestimestampdefmtasc"/> function. See the documentation
         there for a list of format specifiers that can be used.
        </para>
        <para>
@@ -8913,7 +8953,7 @@ dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue)
      </varlistentry>
 
      <varlistentry>
-      <term><function>dtsub</></term>
+      <term><function>dtsub</function></term>
       <listitem>
        <para>
         Subtract one timestamp from another and return a variable of type
@@ -8921,9 +8961,9 @@ dtcvfmtasc(char *inbuf, char *fmtstr, timestamp *dtvalue)
 <synopsis>
 int dtsub(timestamp *ts1, timestamp *ts2, interval *iv);
 </synopsis>
-        The function will subtract the timestamp variable that <literal>ts2</>
-        points to from the timestamp variable that <literal>ts1</> points to
-        and will store the result in the interval variable that <literal>iv</>
+        The function will subtract the timestamp variable that <literal>ts2</literal>
+        points to from the timestamp variable that <literal>ts1</literal> points to
+        and will store the result in the interval variable that <literal>iv</literal>
         points to.
        </para>
        <para>
@@ -8934,7 +8974,7 @@ int dtsub(timestamp *ts1, timestamp *ts2, interval *iv);
      </varlistentry>
 
      <varlistentry>
-      <term><function>dttoasc</></term>
+      <term><function>dttoasc</function></term>
       <listitem>
        <para>
         Convert a timestamp variable to a C char* string.
@@ -8942,8 +8982,8 @@ int dtsub(timestamp *ts1, timestamp *ts2, interval *iv);
 int dttoasc(timestamp *ts, char *output);
 </synopsis>
         The function receives a pointer to the timestamp variable to convert
-        (<literal>ts</>) and the string that should hold the result of the
-        operation (<literal>output</>). It converts <literal>ts</> to its
+        (<literal>ts</literal>) and the string that should hold the result of the
+        operation (<literal>output</literal>). It converts <literal>ts</literal> to its
         textual representation according to the SQL standard, which is
         be <literal>YYYY-MM-DD HH:MM:SS</literal>.
        </para>
@@ -8955,7 +8995,7 @@ int dttoasc(timestamp *ts, char *output);
      </varlistentry>
 
      <varlistentry>
-      <term><function>dttofmtasc</></term>
+      <term><function>dttofmtasc</function></term>
       <listitem>
        <para>
         Convert a timestamp variable to a C char* using a format mask.
@@ -8963,8 +9003,8 @@ int dttoasc(timestamp *ts, char *output);
 int dttofmtasc(timestamp *ts, char *output, int str_len, char *fmtstr);
 </synopsis>
         The function receives a pointer to the timestamp to convert as its
-        first argument (<literal>ts</>), a pointer to the output buffer
-        (<literal>output</>), the maximal length that has been allocated for
+        first argument (<literal>ts</literal>), a pointer to the output buffer
+        (<literal>output</literal>), the maximal length that has been allocated for
         the output buffer (<literal>str_len</literal>) and the format mask to
         use for the conversion (<literal>fmtstr</literal>).
        </para>
@@ -8974,14 +9014,14 @@ int dttofmtasc(timestamp *ts, char *output, int str_len, char *fmtstr);
        </para>
        <para>
         Internally, this function uses the <xref
-        linkend="PGTYPEStimestampfmtasc"> function. See the reference there for
+        linkend="pgtypestimestampfmtasc"/> function. See the reference there for
         information on what format mask specifiers can be used.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>intoasc</></term>
+      <term><function>intoasc</function></term>
       <listitem>
        <para>
         Convert an interval variable to a C char* string.
@@ -8989,8 +9029,8 @@ int dttofmtasc(timestamp *ts, char *output, int str_len, char *fmtstr);
 int intoasc(interval *i, char *str);
 </synopsis>
         The function receives a pointer to the interval variable to convert
-        (<literal>i</>) and the string that should hold the result of the
-        operation (<literal>str</>). It converts <literal>i</> to its
+        (<literal>i</literal>) and the string that should hold the result of the
+        operation (<literal>str</literal>). It converts <literal>i</literal> to its
         textual representation according to the SQL standard, which is
         be <literal>YYYY-MM-DD HH:MM:SS</literal>.
        </para>
@@ -9002,7 +9042,7 @@ int intoasc(interval *i, char *str);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rfmtlong</></term>
+      <term><function>rfmtlong</function></term>
       <listitem>
        <para>
         Convert a long integer value to its textual representation using a
@@ -9010,9 +9050,9 @@ int intoasc(interval *i, char *str);
 <synopsis>
 int rfmtlong(long lng_val, char *fmt, char *outbuf);
 </synopsis>
-        The function receives the long value <literal>lng_val</>, the format
-        mask <literal>fmt</> and a pointer to the output buffer
-        <literal>outbuf</>. It converts the long value according to the format
+        The function receives the long value <literal>lng_val</literal>, the format
+        mask <literal>fmt</literal> and a pointer to the output buffer
+        <literal>outbuf</literal>. It converts the long value according to the format
         mask to its textual representation.
        </para>
        <para>
@@ -9088,7 +9128,7 @@ int rfmtlong(long lng_val, char *fmt, char *outbuf);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rupshift</></term>
+      <term><function>rupshift</function></term>
       <listitem>
        <para>
         Convert a string to upper case.
@@ -9102,7 +9142,7 @@ void rupshift(char *str);
      </varlistentry>
 
      <varlistentry>
-      <term><function>byleng</></term>
+      <term><function>byleng</function></term>
       <listitem>
        <para>
         Return the number of characters in a string without counting trailing
@@ -9111,15 +9151,15 @@ void rupshift(char *str);
 int byleng(char *str, int len);
 </synopsis>
         The function expects a fixed-length string as its first argument
-        (<literal>str</>) and its length as its second argument
-        (<literal>len</>). It returns the number of significant characters,
+        (<literal>str</literal>) and its length as its second argument
+        (<literal>len</literal>). It returns the number of significant characters,
         that is the length of the string without trailing blanks.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>ldchar</></term>
+      <term><function>ldchar</function></term>
       <listitem>
        <para>
         Copy a fixed-length string into a null-terminated string.
@@ -9127,10 +9167,10 @@ int byleng(char *str, int len);
 void ldchar(char *src, int len, char *dest);
 </synopsis>
         The function receives the fixed-length string to copy
-        (<literal>src</>), its length (<literal>len</>) and a pointer to the
-        destination memory (<literal>dest</>). Note that you need to reserve at
-        least <literal>len+1</> bytes for the string that <literal>dest</>
-        points to. The function copies at most <literal>len</> bytes to the new
+        (<literal>src</literal>), its length (<literal>len</literal>) and a pointer to the
+        destination memory (<literal>dest</literal>). Note that you need to reserve at
+        least <literal>len+1</literal> bytes for the string that <literal>dest</literal>
+        points to. The function copies at most <literal>len</literal> bytes to the new
         location (less if the source string has trailing blanks) and adds the
         null-terminator.
        </para>
@@ -9138,7 +9178,7 @@ void ldchar(char *src, int len, char *dest);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rgetmsg</></term>
+      <term><function>rgetmsg</function></term>
       <listitem>
        <para>
 <synopsis>
@@ -9150,7 +9190,7 @@ int rgetmsg(int msgnum, char *s, int maxsize);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rtypalign</></term>
+      <term><function>rtypalign</function></term>
       <listitem>
        <para>
 <synopsis>
@@ -9162,7 +9202,7 @@ int rtypalign(int offset, int type);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rtypmsize</></term>
+      <term><function>rtypmsize</function></term>
       <listitem>
        <para>
 <synopsis>
@@ -9174,7 +9214,7 @@ int rtypmsize(int type, int len);
      </varlistentry>
 
      <varlistentry>
-      <term><function>rtypwidth</></term>
+      <term><function>rtypwidth</function></term>
       <listitem>
        <para>
 <synopsis>
@@ -9186,7 +9226,7 @@ int rtypwidth(int sqltype, int sqllen);
      </varlistentry>
 
      <varlistentry id="rsetnull">
-      <term><function>rsetnull</></term>
+      <term><function>rsetnull</function></term>
       <listitem>
        <para>
         Set a variable to NULL.
@@ -9270,17 +9310,17 @@ rsetnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><function>risnull</></term>
+      <term><function>risnull</function></term>
       <listitem>
        <para>
         Test if a variable is NULL.
 <synopsis>
 int risnull(int t, char *ptr);
 </synopsis>
-        The function receives the type of the variable to test (<literal>t</>)
-        as well a pointer to this variable (<literal>ptr</>). Note that the
+        The function receives the type of the variable to test (<literal>t</literal>)
+        as well a pointer to this variable (<literal>ptr</literal>). Note that the
         latter needs to be cast to a char*. See the function <xref
-        linkend="rsetnull"> for a list of possible variable types.
+        linkend="rsetnull"/> for a list of possible variable types.
        </para>
        <para>
         Here is an example of how to use this function:
@@ -9312,7 +9352,7 @@ risnull(CINTTYPE, (char *) &i);
     values.
     <variablelist>
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_NUM_OVERFLOW</></term>
+      <term><literal>ECPG_INFORMIX_NUM_OVERFLOW</literal></term>
       <listitem>
        <para>
         Functions return this value if an overflow occurred in a
@@ -9323,7 +9363,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_NUM_UNDERFLOW</></term>
+      <term><literal>ECPG_INFORMIX_NUM_UNDERFLOW</literal></term>
       <listitem>
        <para>
         Functions return this value if an underflow occurred in a calculation.
@@ -9333,7 +9373,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_DIVIDE_ZERO</></term>
+      <term><literal>ECPG_INFORMIX_DIVIDE_ZERO</literal></term>
       <listitem>
        <para>
         Functions return this value if an attempt to divide by zero is
@@ -9343,7 +9383,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_YEAR</></term>
+      <term><literal>ECPG_INFORMIX_BAD_YEAR</literal></term>
       <listitem>
        <para>
         Functions return this value if a bad value for a year was found while
@@ -9354,7 +9394,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_MONTH</></term>
+      <term><literal>ECPG_INFORMIX_BAD_MONTH</literal></term>
       <listitem>
        <para>
         Functions return this value if a bad value for a month was found while
@@ -9365,7 +9405,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_DAY</></term>
+      <term><literal>ECPG_INFORMIX_BAD_DAY</literal></term>
       <listitem>
        <para>
         Functions return this value if a bad value for a day was found while
@@ -9376,7 +9416,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_ENOSHORTDATE</></term>
+      <term><literal>ECPG_INFORMIX_ENOSHORTDATE</literal></term>
       <listitem>
        <para>
         Functions return this value if a parsing routine needs a short date
@@ -9387,7 +9427,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_DATE_CONVERT</></term>
+      <term><literal>ECPG_INFORMIX_DATE_CONVERT</literal></term>
       <listitem>
        <para>
         Functions return this value if an error occurred during date
@@ -9398,7 +9438,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_OUT_OF_MEMORY</></term>
+      <term><literal>ECPG_INFORMIX_OUT_OF_MEMORY</literal></term>
       <listitem>
        <para>
         Functions return this value if memory was exhausted during
@@ -9409,18 +9449,18 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_ENOTDMY</></term>
+      <term><literal>ECPG_INFORMIX_ENOTDMY</literal></term>
       <listitem>
        <para>
         Functions return this value if a parsing routine was supposed to get a
-        format mask (like <literal>mmddyy</>) but not all fields were listed
+        format mask (like <literal>mmddyy</literal>) but not all fields were listed
         correctly. Internally it is defined as -1212 (the <productname>Informix</productname> definition).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_NUMERIC</></term>
+      <term><literal>ECPG_INFORMIX_BAD_NUMERIC</literal></term>
       <listitem>
        <para>
         Functions return this value either if a parsing routine cannot parse
@@ -9433,7 +9473,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_EXPONENT</></term>
+      <term><literal>ECPG_INFORMIX_BAD_EXPONENT</literal></term>
       <listitem>
        <para>
         Functions return this value if a parsing routine cannot parse
@@ -9444,7 +9484,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_BAD_DATE</></term>
+      <term><literal>ECPG_INFORMIX_BAD_DATE</literal></term>
       <listitem>
        <para>
         Functions return this value if a parsing routine cannot parse
@@ -9455,7 +9495,7 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ECPG_INFORMIX_EXTRA_CHARS</></term>
+      <term><literal>ECPG_INFORMIX_EXTRA_CHARS</literal></term>
       <listitem>
        <para>
         Functions return this value if a parsing routine is passed extra
@@ -9498,7 +9538,7 @@ risnull(CINTTYPE, (char *) &i);
     Variable substitution occurs when a symbol starts with a colon
     (<literal>:</literal>). The variable with that name is looked up
     among the variables that were previously declared within a
-    <literal>EXEC SQL DECLARE</> section.
+    <literal>EXEC SQL DECLARE</literal> section.
    </para>
 
    <para>
@@ -9546,10 +9586,10 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
      <varlistentry>
-      <term><parameter>ECPGt_EOIT</></term>
+      <term><parameter>ECPGt_EOIT</parameter></term>
       <listitem>
        <para>
-        An <type>enum</> telling that there are no more input
+        An <type>enum</type> telling that there are no more input
         variables.
        </para>
       </listitem>
@@ -9566,10 +9606,10 @@ risnull(CINTTYPE, (char *) &i);
      </varlistentry>
 
       <varlistentry>
-       <term><parameter>ECPGt_EORT</></term>
+       <term><parameter>ECPGt_EORT</parameter></term>
        <listitem>
        <para>
-        An <type>enum</> telling that there are no more variables.
+        An <type>enum</type> telling that there are no more variables.
        </para>
       </listitem>
      </varlistentry>
@@ -9651,7 +9691,7 @@ risnull(CINTTYPE, (char *) &i);
 EXEC SQL OPEN <replaceable>cursor</replaceable>;
 </programlisting>
     is not copied to the output. Instead, the cursor's
-    <command>DECLARE</> command is used at the position of the <command>OPEN</> command
+    <command>DECLARE</command> command is used at the position of the <command>OPEN</command> command
     because it indeed opens the cursor.
    </para>
 
diff --git a/doc/src/sgml/errcodes.sgml b/doc/src/sgml/errcodes.sgml
index 40b4191c10..6fd16f643e 100644
--- a/doc/src/sgml/errcodes.sgml
+++ b/doc/src/sgml/errcodes.sgml
@@ -11,13 +11,13 @@
  <para>
   All messages emitted by the <productname>PostgreSQL</productname>
   server are assigned five-character error codes that follow the SQL
-  standard's conventions for <quote>SQLSTATE</> codes.  Applications
+  standard's conventions for <quote>SQLSTATE</quote> codes.  Applications
   that need to know which error condition has occurred should usually
   test the error code, rather than looking at the textual error
   message.  The error codes are less likely to change across
-  <productname>PostgreSQL</> releases, and also are not subject to
+  <productname>PostgreSQL</productname> releases, and also are not subject to
   change due to localization of error messages. Note that some, but
-  not all, of the error codes produced by <productname>PostgreSQL</>
+  not all, of the error codes produced by <productname>PostgreSQL</productname>
   are defined by the SQL standard; some additional error codes for
   conditions not defined by the standard have been invented or
   borrowed from other databases.
@@ -32,20 +32,20 @@
  </para>
 
  <para>
-  <xref linkend="errcodes-table"> lists all the error codes defined in
+  <xref linkend="errcodes-table"/> lists all the error codes defined in
   <productname>PostgreSQL</productname> &version;.  (Some are not actually
   used at present, but are defined by the SQL standard.)
   The error classes are also shown.  For each error class there is a
-  <quote>standard</> error code having the last three characters
-  <literal>000</>.  This code is used only for error conditions that fall
+  <quote>standard</quote> error code having the last three characters
+  <literal>000</literal>.  This code is used only for error conditions that fall
   within the class but do not have any more-specific code assigned.
  </para>
 
  <para>
   The symbol shown in the column <quote>Condition Name</quote> is
-  the condition name to use in <application>PL/pgSQL</>.  Condition
+  the condition name to use in <application>PL/pgSQL</application>.  Condition
   names can be written in either upper or lower case.  (Note that
-  <application>PL/pgSQL</> does not recognize warning, as opposed to error,
+  <application>PL/pgSQL</application> does not recognize warning, as opposed to error,
   condition names; those are classes 00, 01, and 02.)
  </para>
 
@@ -53,10 +53,10 @@
   For some types of errors, the server reports the name of a database object
   (a table, table column, data type, or constraint) associated with the error;
   for example, the name of the unique constraint that caused a
-  <symbol>unique_violation</> error.  Such names are supplied in separate
+  <symbol>unique_violation</symbol> error.  Such names are supplied in separate
   fields of the error report message so that applications need not try to
   extract them from the possibly-localized human-readable text of the message.
-  As of <productname>PostgreSQL</> 9.3, complete coverage for this feature
+  As of <productname>PostgreSQL</productname> 9.3, complete coverage for this feature
   exists only for errors in SQLSTATE class 23 (integrity constraint
   violation), but this is likely to be expanded in future.
  </para>
@@ -66,9 +66,9 @@
  <title><productname>PostgreSQL</productname> Error Codes</title>
 
  <tgroup cols="2">
-  <colspec colnum="1" colname="errorcode">
-  <colspec colnum="2" colname="condname">
-  <spanspec namest="errorcode" nameend="condname" spanname="span12">
+  <colspec colnum="1" colname="errorcode"/>
+  <colspec colnum="2" colname="condname"/>
+  <spanspec namest="errorcode" nameend="condname" spanname="span12"/>
 
   <thead>
    <row>
diff --git a/doc/src/sgml/event-trigger.sgml b/doc/src/sgml/event-trigger.sgml
index 3ed14f08c0..0a8860490a 100644
--- a/doc/src/sgml/event-trigger.sgml
+++ b/doc/src/sgml/event-trigger.sgml
@@ -8,8 +8,8 @@
   </indexterm>
 
   <para>
-   To supplement the trigger mechanism discussed in <xref linkend="triggers">,
-   <productname>PostgreSQL</> also provides event triggers.  Unlike regular
+   To supplement the trigger mechanism discussed in <xref linkend="triggers"/>,
+   <productname>PostgreSQL</productname> also provides event triggers.  Unlike regular
    triggers, which are attached to a single table and capture only DML events,
    event triggers are global to a particular database and are capable of
    capturing DDL events.
@@ -28,67 +28,67 @@
      An event trigger fires whenever the event with which it is associated
      occurs in the database in which it is defined. Currently, the only
      supported events are
-     <literal>ddl_command_start</>,
-     <literal>ddl_command_end</>,
-     <literal>table_rewrite</>
-     and <literal>sql_drop</>.
+     <literal>ddl_command_start</literal>,
+     <literal>ddl_command_end</literal>,
+     <literal>table_rewrite</literal>
+     and <literal>sql_drop</literal>.
      Support for additional events may be added in future releases.
    </para>
 
    <para>
-     The <literal>ddl_command_start</> event occurs just before the
-     execution of a <literal>CREATE</>, <literal>ALTER</>, <literal>DROP</>,
-     <literal>SECURITY LABEL</>,
-     <literal>COMMENT</>, <literal>GRANT</> or <literal>REVOKE</>
+     The <literal>ddl_command_start</literal> event occurs just before the
+     execution of a <literal>CREATE</literal>, <literal>ALTER</literal>, <literal>DROP</literal>,
+     <literal>SECURITY LABEL</literal>,
+     <literal>COMMENT</literal>, <literal>GRANT</literal> or <literal>REVOKE</literal>
      command.  No check whether the affected object exists or doesn't exist is
      performed before the event trigger fires.
      As an exception, however, this event does not occur for
      DDL commands targeting shared objects &mdash; databases, roles, and tablespaces
      &mdash; or for commands targeting event triggers themselves.  The event trigger
      mechanism does not support these object types.
-     <literal>ddl_command_start</> also occurs just before the execution of a
+     <literal>ddl_command_start</literal> also occurs just before the execution of a
      <literal>SELECT INTO</literal> command, since this is equivalent to
      <literal>CREATE TABLE AS</literal>.
    </para>
 
    <para>
-    The <literal>ddl_command_end</> event occurs just after the execution of
-    this same set of commands.  To obtain more details on the <acronym>DDL</>
+    The <literal>ddl_command_end</literal> event occurs just after the execution of
+    this same set of commands.  To obtain more details on the <acronym>DDL</acronym>
     operations that took place, use the set-returning function
-    <literal>pg_event_trigger_ddl_commands()</> from the
-    <literal>ddl_command_end</> event trigger code (see
-    <xref linkend="functions-event-triggers">).  Note that the trigger fires
+    <literal>pg_event_trigger_ddl_commands()</literal> from the
+    <literal>ddl_command_end</literal> event trigger code (see
+    <xref linkend="functions-event-triggers"/>).  Note that the trigger fires
     after the actions have taken place (but before the transaction commits),
     and thus the system catalogs can be read as already changed.
    </para>
 
    <para>
-    The <literal>sql_drop</> event occurs just before the
-    <literal>ddl_command_end</> event trigger for any operation that drops
+    The <literal>sql_drop</literal> event occurs just before the
+    <literal>ddl_command_end</literal> event trigger for any operation that drops
     database objects.  To list the objects that have been dropped, use the
-    set-returning function <literal>pg_event_trigger_dropped_objects()</> from the
-    <literal>sql_drop</> event trigger code (see
-    <xref linkend="functions-event-triggers">). Note that
+    set-returning function <literal>pg_event_trigger_dropped_objects()</literal> from the
+    <literal>sql_drop</literal> event trigger code (see
+    <xref linkend="functions-event-triggers"/>). Note that
     the trigger is executed after the objects have been deleted from the
     system catalogs, so it's not possible to look them up anymore.
    </para>
 
    <para>
-    The <literal>table_rewrite</> event occurs just before a table is
-    rewritten by some actions of the commands <literal>ALTER TABLE</> and
-    <literal>ALTER TYPE</>.  While other
+    The <literal>table_rewrite</literal> event occurs just before a table is
+    rewritten by some actions of the commands <literal>ALTER TABLE</literal> and
+    <literal>ALTER TYPE</literal>.  While other
     control statements are available to rewrite a table,
     like <literal>CLUSTER</literal> and <literal>VACUUM</literal>,
-    the <literal>table_rewrite</> event is not triggered by them.
+    the <literal>table_rewrite</literal> event is not triggered by them.
    </para>
 
    <para>
      Event triggers (like other functions) cannot be executed in an aborted
      transaction.  Thus, if a DDL command fails with an error, any associated
-     <literal>ddl_command_end</> triggers will not be executed.  Conversely,
-     if a <literal>ddl_command_start</> trigger fails with an error, no
+     <literal>ddl_command_end</literal> triggers will not be executed.  Conversely,
+     if a <literal>ddl_command_start</literal> trigger fails with an error, no
      further event triggers will fire, and no attempt will be made to execute
-     the command itself.  Similarly, if a <literal>ddl_command_end</> trigger
+     the command itself.  Similarly, if a <literal>ddl_command_end</literal> trigger
      fails with an error, the effects of the DDL statement will be rolled
      back, just as they would be in any other case where the containing
      transaction aborts.
@@ -96,11 +96,11 @@
 
    <para>
      For a complete list of commands supported by the event trigger mechanism,
-     see <xref linkend="event-trigger-matrix">.
+     see <xref linkend="event-trigger-matrix"/>.
    </para>
 
    <para>
-     Event triggers are created using the command <xref linkend="sql-createeventtrigger">.
+     Event triggers are created using the command <xref linkend="sql-createeventtrigger"/>.
      In order to create an event trigger, you must first create a function with
      the special return type <literal>event_trigger</literal>.  This function
      need not (and may not) return a value; the return type serves merely as
@@ -125,7 +125,7 @@
    <title>Event Trigger Firing Matrix</title>
 
    <para>
-     <xref linkend="event-trigger-by-command-tag"> lists all commands
+     <xref linkend="event-trigger-by-command-tag"/> lists all commands
      for which event triggers are supported.
    </para>
 
@@ -503,6 +503,14 @@
         <entry align="center"><literal>-</literal></entry>
         <entry align="center"></entry>
        </row>
+       <row>
+        <entry align="left"><literal>CREATE STATISTICS</literal></entry>
+        <entry align="center"><literal>X</literal></entry>
+        <entry align="center"><literal>X</literal></entry>
+        <entry align="center"><literal>-</literal></entry>
+        <entry align="center"><literal>-</literal></entry>
+        <entry align="center"></entry>
+       </row>
        <row>
         <entry align="left"><literal>CREATE TABLE</literal></entry>
         <entry align="center"><literal>X</literal></entry>
@@ -565,6 +573,7 @@
         <entry align="center"><literal>X</literal></entry>
         <entry align="center"><literal>-</literal></entry>
         <entry align="center"><literal>-</literal></entry>
+        <entry align="center"></entry>
        </row>
        <row>
         <entry align="left"><literal>CREATE USER MAPPING</literal></entry>
@@ -742,6 +751,14 @@
         <entry align="center"><literal>-</literal></entry>
         <entry align="center"></entry>
        </row>
+       <row>
+        <entry align="left"><literal>DROP STATISTICS</literal></entry>
+        <entry align="center"><literal>X</literal></entry>
+        <entry align="center"><literal>X</literal></entry>
+        <entry align="center"><literal>X</literal></entry>
+        <entry align="center"><literal>-</literal></entry>
+        <entry align="center"></entry>
+       </row>
        <row>
         <entry align="left"><literal>DROP TABLE</literal></entry>
         <entry align="center"><literal>X</literal></entry>
@@ -878,14 +895,14 @@
    </para>
 
    <para>
-    Event trigger functions must use the <quote>version 1</> function
+    Event trigger functions must use the <quote>version 1</quote> function
     manager interface.
    </para>
 
    <para>
     When a function is called by the event trigger manager, it is not passed
-    any normal arguments, but it is passed a <quote>context</> pointer
-    pointing to a <structname>EventTriggerData</> structure. C functions can
+    any normal arguments, but it is passed a <quote>context</quote> pointer
+    pointing to a <structname>EventTriggerData</structname> structure. C functions can
     check whether they were called from the event trigger manager or not by
     executing the macro:
 <programlisting>
@@ -896,10 +913,10 @@ CALLED_AS_EVENT_TRIGGER(fcinfo)
 ((fcinfo)-&gt;context != NULL &amp;&amp; IsA((fcinfo)-&gt;context, EventTriggerData))
 </programlisting>
     If this returns true, then it is safe to cast
-    <literal>fcinfo-&gt;context</> to type <literal>EventTriggerData
+    <literal>fcinfo-&gt;context</literal> to type <literal>EventTriggerData
     *</literal> and make use of the pointed-to
-    <structname>EventTriggerData</> structure.  The function must
-    <emphasis>not</emphasis> alter the <structname>EventTriggerData</>
+    <structname>EventTriggerData</structname> structure.  The function must
+    <emphasis>not</emphasis> alter the <structname>EventTriggerData</structname>
     structure or any of the data it points to.
    </para>
 
@@ -921,7 +938,7 @@ typedef struct EventTriggerData
 
     <variablelist>
      <varlistentry>
-      <term><structfield>type</></term>
+      <term><structfield>type</structfield></term>
       <listitem>
        <para>
         Always <literal>T_EventTriggerData</literal>.
@@ -930,20 +947,20 @@ typedef struct EventTriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>event</></term>
+      <term><structfield>event</structfield></term>
       <listitem>
        <para>
         Describes the event for which the function is called, one of
         <literal>"ddl_command_start"</literal>, <literal>"ddl_command_end"</literal>,
         <literal>"sql_drop"</literal>, <literal>"table_rewrite"</literal>.
-        See <xref linkend="event-trigger-definition"> for the meaning of these
+        See <xref linkend="event-trigger-definition"/> for the meaning of these
         events.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>parsetree</></term>
+      <term><structfield>parsetree</structfield></term>
       <listitem>
        <para>
         A pointer to the parse tree of the command.  Check the PostgreSQL
@@ -954,7 +971,7 @@ typedef struct EventTriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tag</></term>
+      <term><structfield>tag</structfield></term>
       <listitem>
        <para>
         The command tag associated with the event for which the event trigger
@@ -966,8 +983,8 @@ typedef struct EventTriggerData
    </para>
 
    <para>
-    An event trigger function must return a <symbol>NULL</> pointer
-    (<emphasis>not</> an SQL null value, that is, do not
+    An event trigger function must return a <symbol>NULL</symbol> pointer
+    (<emphasis>not</emphasis> an SQL null value, that is, do not
     set <parameter>isNull</parameter> true).
    </para>
   </sect1>
@@ -982,11 +999,11 @@ typedef struct EventTriggerData
    </para>
 
    <para>
-    The function <function>noddl</> raises an exception each time it is called.
+    The function <function>noddl</function> raises an exception each time it is called.
     The event trigger definition associated the function with
     the <literal>ddl_command_start</literal> event.  The effect is that all DDL
     commands (with the exceptions mentioned
-    in <xref linkend="event-trigger-definition">) are prevented from running.
+    in <xref linkend="event-trigger-definition"/>) are prevented from running.
    </para>
 
    <para>
@@ -1020,7 +1037,7 @@ noddl(PG_FUNCTION_ARGS)
    </para>
 
    <para>
-    After you have compiled the source code (see <xref linkend="dfunc">),
+    After you have compiled the source code (see <xref linkend="dfunc"/>),
     declare the function and the triggers:
 <programlisting>
 CREATE FUNCTION noddl() RETURNS event_trigger
@@ -1067,7 +1084,7 @@ COMMIT;
    <title>A Table Rewrite Event Trigger Example</title>
 
    <para>
-    Thanks to the <literal>table_rewrite</> event, it is possible to implement
+    Thanks to the <literal>table_rewrite</literal> event, it is possible to implement
     a table rewriting policy only allowing the rewrite in maintenance windows.
    </para>
 
diff --git a/doc/src/sgml/extend.sgml b/doc/src/sgml/extend.sgml
index b96ef389a2..6c043cdd02 100644
--- a/doc/src/sgml/extend.sgml
+++ b/doc/src/sgml/extend.sgml
@@ -15,32 +15,32 @@
    <itemizedlist spacing="compact" mark="bullet">
     <listitem>
      <para>
-      functions (starting in <xref linkend="xfunc">)
+      functions (starting in <xref linkend="xfunc"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      aggregates (starting in <xref linkend="xaggr">)
+      aggregates (starting in <xref linkend="xaggr"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      data types (starting in <xref linkend="xtypes">)
+      data types (starting in <xref linkend="xtypes"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      operators (starting in <xref linkend="xoper">)
+      operators (starting in <xref linkend="xoper"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      operator classes for indexes (starting in <xref linkend="xindex">)
+      operator classes for indexes (starting in <xref linkend="xindex"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      packages of related objects (starting in <xref linkend="extend-extensions">)
+      packages of related objects (starting in <xref linkend="extend-extensions"/>)
      </para>
     </listitem>
    </itemizedlist>
@@ -106,42 +106,77 @@
     <secondary>composite</secondary>
    </indexterm>
 
+   <indexterm zone="extend-type-system">
+    <primary>container type</primary>
+   </indexterm>
+
+   <indexterm zone="extend-type-system">
+    <primary>data type</primary>
+    <secondary>container</secondary>
+   </indexterm>
+
    <para>
-    <productname>PostgreSQL</productname> data types are divided into base
-    types, composite types, domains, and pseudo-types.
+    <productname>PostgreSQL</productname> data types can be divided into base
+    types, container types, domains, and pseudo-types.
    </para>
 
    <sect2>
     <title>Base Types</title>
 
     <para>
-     Base types are those, like <type>int4</type>, that are
-     implemented below the level of the <acronym>SQL</> language
+     Base types are those, like <type>integer</type>, that are
+     implemented below the level of the <acronym>SQL</acronym> language
      (typically in a low-level language such as C).  They generally
      correspond to what are often known as abstract data types.
      <productname>PostgreSQL</productname> can only operate on such
      types through functions provided by the user and only understands
      the behavior of such types to the extent that the user describes
-     them.  Base types are further subdivided into scalar and array
-     types.  For each scalar type, a corresponding array type is
-     automatically created that can hold variable-size arrays of that
-     scalar type.
+     them.
+     The built-in base types are described in <xref linkend="datatype"/>.
+    </para>
+
+    <para>
+     Enumerated (enum) types can be considered as a subcategory of base
+     types.  The main difference is that they can be created using
+     just <acronym>SQL</acronym> commands, without any low-level programming.
+     Refer to <xref linkend="datatype-enum"/> for more information.
     </para>
    </sect2>
 
    <sect2>
-    <title>Composite Types</title>
+    <title>Container Types</title>
+
+    <para>
+     <productname>PostgreSQL</productname> has three kinds
+     of <quote>container</quote> types, which are types that contain multiple
+     values of other types.  These are arrays, composites, and ranges.
+    </para>
+
+    <para>
+     Arrays can hold multiple values that are all of the same type.  An array
+     type is automatically created for each base type, composite type, range
+     type, and domain type.  But there are no arrays of arrays.  So far as
+     the type system is concerned, multi-dimensional arrays are the same as
+     one-dimensional arrays.  Refer to <xref linkend="arrays"/> for more
+     information.
+    </para>
 
     <para>
      Composite types, or row types, are created whenever the user
      creates a table. It is also possible to use <xref
-     linkend="sql-createtype"> to
-     define a <quote>stand-alone</> composite type with no associated
+     linkend="sql-createtype"/> to
+     define a <quote>stand-alone</quote> composite type with no associated
      table.  A composite type is simply a list of types with
      associated field names.  A value of a composite type is a row or
-     record of field values.  The user can access the component fields
-     from <acronym>SQL</> queries. Refer to <xref linkend="rowtypes">
-     for more information on composite types.
+     record of field values.  Refer to <xref linkend="rowtypes"/>
+     for more information.
+    </para>
+
+    <para>
+     A range type can hold two values of the same type, which are the lower
+     and upper bounds of the range.  Range types are user-created, although
+     a few built-in ones exist.  Refer to <xref linkend="rangetypes"/>
+     for more information.
     </para>
    </sect2>
 
@@ -149,16 +184,12 @@
     <title>Domains</title>
 
     <para>
-     A domain is based on a particular base type and for many purposes
-     is interchangeable with its base type.  However, a domain can
-     have constraints that restrict its valid values to a subset of
-     what the underlying base type would allow.
-    </para>
-
-    <para>
-     Domains can be created using the <acronym>SQL</> command
-     <xref linkend="sql-createdomain">.
-     Their creation and use is not discussed in this chapter.
+     A domain is based on a particular underlying type and for many purposes
+     is interchangeable with its underlying type.  However, a domain can have
+     constraints that restrict its valid values to a subset of what the
+     underlying type would allow.  Domains are created using
+     the <acronym>SQL</acronym> command <xref linkend="sql-createdomain"/>.
+     Refer to <xref linkend="domains"/> for more information.
     </para>
    </sect2>
 
@@ -166,12 +197,12 @@
     <title>Pseudo-Types</title>
 
     <para>
-     There are a few <quote>pseudo-types</> for special purposes.
-     Pseudo-types cannot appear as columns of tables or attributes of
-     composite types, but they can be used to declare the argument and
+     There are a few <quote>pseudo-types</quote> for special purposes.
+     Pseudo-types cannot appear as columns of tables or components of
+     container types, but they can be used to declare the argument and
      result types of functions.  This provides a mechanism within the
      type system to identify special classes of functions.  <xref
-     linkend="datatype-pseudotypes-table"> lists the existing
+     linkend="datatype-pseudotypes-table"/> lists the existing
      pseudo-types.
     </para>
    </sect2>
@@ -188,7 +219,7 @@
    </indexterm>
 
    <indexterm zone="extend-types-polymorphic">
-    <primary>type</primary>
+    <primary>data type</primary>
     <secondary>polymorphic</secondary>
    </indexterm>
 
@@ -198,12 +229,12 @@
    </indexterm>
 
     <para>
-     Five pseudo-types of special interest are <type>anyelement</>,
-     <type>anyarray</>, <type>anynonarray</>, <type>anyenum</>,
-     and <type>anyrange</>,
-     which are collectively called <firstterm>polymorphic types</>.
+     Five pseudo-types of special interest are <type>anyelement</type>,
+     <type>anyarray</type>, <type>anynonarray</type>, <type>anyenum</type>,
+     and <type>anyrange</type>,
+     which are collectively called <firstterm>polymorphic types</firstterm>.
      Any function declared using these types is said to be
-     a <firstterm>polymorphic function</>.  A polymorphic function can
+     a <firstterm>polymorphic function</firstterm>.  A polymorphic function can
      operate on many different data types, with the specific data type(s)
      being determined by the data types actually passed to it in a particular
      call.
@@ -228,10 +259,10 @@
      and others declared <type>anyelement</type>, the actual range type in
      the <type>anyrange</type> positions must be a range whose subtype is
      the same type appearing in the <type>anyelement</type> positions.
-     <type>anynonarray</> is treated exactly the same as <type>anyelement</>,
+     <type>anynonarray</type> is treated exactly the same as <type>anyelement</type>,
      but adds the additional constraint that the actual type must not be
      an array type.
-     <type>anyenum</> is treated exactly the same as <type>anyelement</>,
+     <type>anyenum</type> is treated exactly the same as <type>anyelement</type>,
      but adds the additional constraint that the actual type must
      be an enum type.
     </para>
@@ -240,7 +271,7 @@
      Thus, when more than one argument position is declared with a polymorphic
      type, the net effect is that only certain combinations of actual argument
      types are allowed.  For example, a function declared as
-     <literal>equal(anyelement, anyelement)</> will take any two input values,
+     <literal>equal(anyelement, anyelement)</literal> will take any two input values,
      so long as they are of the same data type.
     </para>
 
@@ -251,30 +282,30 @@
      result type for that call.  For example, if there were not already
      an array subscripting mechanism, one could define a function that
      implements subscripting as <literal>subscript(anyarray, integer)
-     returns anyelement</>.  This declaration constrains the actual first
+     returns anyelement</literal>.  This declaration constrains the actual first
      argument to be an array type, and allows the parser to infer the correct
      result type from the actual first argument's type.  Another example
-     is that a function declared as <literal>f(anyarray) returns anyenum</>
+     is that a function declared as <literal>f(anyarray) returns anyenum</literal>
      will only accept arrays of enum types.
     </para>
 
     <para>
-     Note that <type>anynonarray</> and <type>anyenum</> do not represent
+     Note that <type>anynonarray</type> and <type>anyenum</type> do not represent
      separate type variables; they are the same type as
      <type>anyelement</type>, just with an additional constraint.  For
-     example, declaring a function as <literal>f(anyelement, anyenum)</>
-     is equivalent to declaring it as <literal>f(anyenum, anyenum)</>:
+     example, declaring a function as <literal>f(anyelement, anyenum)</literal>
+     is equivalent to declaring it as <literal>f(anyenum, anyenum)</literal>:
      both actual arguments have to be the same enum type.
     </para>
 
     <para>
      A variadic function (one taking a variable number of arguments, as in
-     <xref linkend="xfunc-sql-variadic-functions">) can be
+     <xref linkend="xfunc-sql-variadic-functions"/>) can be
      polymorphic: this is accomplished by declaring its last parameter as
-     <literal>VARIADIC</> <type>anyarray</>.  For purposes of argument
+     <literal>VARIADIC</literal> <type>anyarray</type>.  For purposes of argument
      matching and determining the actual result type, such a function behaves
      the same as if you had written the appropriate number of
-     <type>anynonarray</> parameters.
+     <type>anynonarray</type> parameters.
     </para>
    </sect2>
   </sect1>
@@ -294,32 +325,32 @@
    </indexterm>
 
    <para>
-    A useful extension to <productname>PostgreSQL</> typically includes
+    A useful extension to <productname>PostgreSQL</productname> typically includes
     multiple SQL objects; for example, a new data type will require new
     functions, new operators, and probably new index operator classes.
     It is helpful to collect all these objects into a single package
-    to simplify database management.  <productname>PostgreSQL</> calls
-    such a package an <firstterm>extension</>.  To define an extension,
-    you need at least a <firstterm>script file</> that contains the
-    <acronym>SQL</> commands to create the extension's objects, and a
-    <firstterm>control file</> that specifies a few basic properties
+    to simplify database management.  <productname>PostgreSQL</productname> calls
+    such a package an <firstterm>extension</firstterm>.  To define an extension,
+    you need at least a <firstterm>script file</firstterm> that contains the
+    <acronym>SQL</acronym> commands to create the extension's objects, and a
+    <firstterm>control file</firstterm> that specifies a few basic properties
     of the extension itself.  If the extension includes C code, there
     will typically also be a shared library file into which the C code
     has been built.  Once you have these files, a simple
-    <xref linkend="sql-createextension"> command loads the objects into
+    <xref linkend="sql-createextension"/> command loads the objects into
     your database.
    </para>
 
    <para>
     The main advantage of using an extension, rather than just running the
-    <acronym>SQL</> script to load a bunch of <quote>loose</> objects
-    into your database, is that <productname>PostgreSQL</> will then
+    <acronym>SQL</acronym> script to load a bunch of <quote>loose</quote> objects
+    into your database, is that <productname>PostgreSQL</productname> will then
     understand that the objects of the extension go together.  You can
-    drop all the objects with a single <xref linkend="sql-dropextension">
-    command (no need to maintain a separate <quote>uninstall</> script).
-    Even more useful, <application>pg_dump</> knows that it should not
+    drop all the objects with a single <xref linkend="sql-dropextension"/>
+    command (no need to maintain a separate <quote>uninstall</quote> script).
+    Even more useful, <application>pg_dump</application> knows that it should not
     dump the individual member objects of the extension &mdash; it will
-    just include a <command>CREATE EXTENSION</> command in dumps, instead.
+    just include a <command>CREATE EXTENSION</command> command in dumps, instead.
     This vastly simplifies migration to a new version of the extension
     that might contain more or different objects than the old version.
     Note however that you must have the extension's control, script, and
@@ -327,15 +358,15 @@
    </para>
 
    <para>
-    <productname>PostgreSQL</> will not let you drop an individual object
+    <productname>PostgreSQL</productname> will not let you drop an individual object
     contained in an extension, except by dropping the whole extension.
     Also, while you can change the definition of an extension member object
     (for example, via <command>CREATE OR REPLACE FUNCTION</command> for a
     function), bear in mind that the modified definition will not be dumped
-    by <application>pg_dump</>.  Such a change is usually only sensible if
+    by <application>pg_dump</application>.  Such a change is usually only sensible if
     you concurrently make the same change in the extension's script file.
     (But there are special provisions for tables containing configuration
-    data; see <xref linkend="extend-extensions-config-tables">.)
+    data; see <xref linkend="extend-extensions-config-tables"/>.)
     In production situations, it's generally better to create an extension
     update script to perform changes to extension member objects.
    </para>
@@ -346,19 +377,19 @@
     statements.  The final set of privileges for each object (if any are set)
     will be stored in the
     <link linkend="catalog-pg-init-privs"><structname>pg_init_privs</structname></link>
-    system catalog.  When <application>pg_dump</> is used, the
-    <command>CREATE EXTENSION</> command will be included in the dump, followed
+    system catalog.  When <application>pg_dump</application> is used, the
+    <command>CREATE EXTENSION</command> command will be included in the dump, followed
     by the set of <command>GRANT</command> and <command>REVOKE</command>
     statements necessary to set the privileges on the objects to what they were
     at the time the dump was taken.
    </para>
 
    <para>
-    <productname>PostgreSQL</> does not currently support extension scripts
+    <productname>PostgreSQL</productname> does not currently support extension scripts
     issuing <command>CREATE POLICY</command> or <command>SECURITY LABEL</command>
     statements.  These are expected to be set after the extension has been
     created.  All RLS policies and security labels on extension objects will be
-    included in dumps created by <application>pg_dump</>.
+    included in dumps created by <application>pg_dump</application>.
    </para>
 
    <para>
@@ -366,15 +397,15 @@
     scripts that adjust the definitions of the SQL objects contained in an
     extension.  For example, if version 1.1 of an extension adds one function
     and changes the body of another function compared to 1.0, the extension
-    author can provide an <firstterm>update script</> that makes just those
-    two changes.  The <command>ALTER EXTENSION UPDATE</> command can then
+    author can provide an <firstterm>update script</firstterm> that makes just those
+    two changes.  The <command>ALTER EXTENSION UPDATE</command> command can then
     be used to apply these changes and track which version of the extension
     is actually installed in a given database.
    </para>
 
    <para>
     The kinds of SQL objects that can be members of an extension are shown in
-    the description of <xref linkend="sql-alterextension">.  Notably, objects
+    the description of <xref linkend="sql-alterextension"/>.  Notably, objects
     that are database-cluster-wide, such as databases, roles, and tablespaces,
     cannot be extension members since an extension is only known within one
     database.  (Although an extension script is not prohibited from creating
@@ -384,7 +415,7 @@
     considered members of the extension.
     Another important point is that schemas can belong to extensions, but not
     vice versa: an extension as such has an unqualified name and does not
-    exist <quote>within</> any schema.  The extension's member objects,
+    exist <quote>within</quote> any schema.  The extension's member objects,
     however, will belong to schemas whenever appropriate for their object
     types.  It may or may not be appropriate for an extension to own the
     schema(s) its member objects are within.
@@ -399,6 +430,32 @@
     dropping the whole extension.
    </para>
 
+   <sect2 id="extend-extensions-style">
+    <title>Defining Extension Objects</title>
+
+    <!-- XXX It's not enough to use qualified names, because one might write a
+         qualified name to an object that itself uses unqualified names.  Many
+         information_schema functions have that defect, for example.  However,
+         that's a defect in the referenced object, and relatively few queries
+         will be affected.  Also, we direct applications to secure search_path
+         when connecting to an untrusted database; if applications do that,
+         they are immune to known attacks even if some extension refers to a
+         defective object.  Therefore, guide extension authors as though core
+         PostgreSQL contained no such defect. -->
+    <para>
+     Widely-distributed extensions should assume little about the database
+     they occupy.  In particular, unless you issued <literal>SET search_path =
+     pg_temp</literal>, assume each unqualified name could resolve to an
+     object that a malicious user has defined.  Beware of constructs that
+     depend on <varname>search_path</varname> implicitly: <token>IN</token>
+     and <literal>CASE <replaceable>expression</replaceable> WHEN</literal>
+     always select an operator using the search path.  In their place, use
+     <literal>OPERATOR(<replaceable>schema</replaceable>.=) ANY</literal>
+     and <literal>CASE WHEN <replaceable>expression</replaceable></literal>.
+    </para>
+
+   </sect2>
+
    <sect2>
     <title>Extension Files</title>
 
@@ -407,25 +464,25 @@
    </indexterm>
 
     <para>
-     The <xref linkend="sql-createextension"> command relies on a control
+     The <xref linkend="sql-createextension"/> command relies on a control
      file for each extension, which must be named the same as the extension
-     with a suffix of <literal>.control</>, and must be placed in the
+     with a suffix of <literal>.control</literal>, and must be placed in the
      installation's <literal>SHAREDIR/extension</literal> directory.  There
-     must also be at least one <acronym>SQL</> script file, which follows the
+     must also be at least one <acronym>SQL</acronym> script file, which follows the
      naming pattern
-     <literal><replaceable>extension</>--<replaceable>version</>.sql</literal>
-     (for example, <literal>foo--1.0.sql</> for version <literal>1.0</> of
-     extension <literal>foo</>).  By default, the script file(s) are also
+     <literal><replaceable>extension</replaceable>--<replaceable>version</replaceable>.sql</literal>
+     (for example, <literal>foo--1.0.sql</literal> for version <literal>1.0</literal> of
+     extension <literal>foo</literal>).  By default, the script file(s) are also
      placed in the <literal>SHAREDIR/extension</literal> directory; but the
      control file can specify a different directory for the script file(s).
     </para>
 
     <para>
      The file format for an extension control file is the same as for the
-     <filename>postgresql.conf</> file, namely a list of
-     <replaceable>parameter_name</> <literal>=</> <replaceable>value</>
+     <filename>postgresql.conf</filename> file, namely a list of
+     <replaceable>parameter_name</replaceable> <literal>=</literal> <replaceable>value</replaceable>
      assignments, one per line.  Blank lines and comments introduced by
-     <literal>#</> are allowed.  Be sure to quote any value that is not
+     <literal>#</literal> are allowed.  Be sure to quote any value that is not
      a single word or number.
     </para>
 
@@ -438,11 +495,11 @@
       <term><varname>directory</varname> (<type>string</type>)</term>
       <listitem>
        <para>
-        The directory containing the extension's <acronym>SQL</> script
+        The directory containing the extension's <acronym>SQL</acronym> script
         file(s).  Unless an absolute path is given, the name is relative to
         the installation's <literal>SHAREDIR</literal> directory.  The
         default behavior is equivalent to specifying
-        <literal>directory = 'extension'</>.
+        <literal>directory = 'extension'</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -452,9 +509,9 @@
       <listitem>
        <para>
         The default version of the extension (the one that will be installed
-        if no version is specified in <command>CREATE EXTENSION</>).  Although
-        this can be omitted, that will result in <command>CREATE EXTENSION</>
-        failing if no <literal>VERSION</> option appears, so you generally
+        if no version is specified in <command>CREATE EXTENSION</command>).  Although
+        this can be omitted, that will result in <command>CREATE EXTENSION</command>
+        failing if no <literal>VERSION</literal> option appears, so you generally
         don't want to do that.
        </para>
       </listitem>
@@ -468,7 +525,7 @@
         when initially creating an extension, but not during extension updates
         (since that might override user-added comments).  Alternatively,
         the extension's comment can be set by writing
-        a <xref linkend="sql-comment"> command in the script file.
+        a <xref linkend="sql-comment"/> command in the script file.
        </para>
       </listitem>
      </varlistentry>
@@ -489,11 +546,11 @@
       <listitem>
        <para>
         The value of this parameter will be substituted for each occurrence
-        of <literal>MODULE_PATHNAME</> in the script file(s).  If it is not
+        of <literal>MODULE_PATHNAME</literal> in the script file(s).  If it is not
         set, no substitution is made.  Typically, this is set to
-        <literal>$libdir/<replaceable>shared_library_name</></literal> and
-        then <literal>MODULE_PATHNAME</> is used in <command>CREATE
-        FUNCTION</> commands for C-language functions, so that the script
+        <literal>$libdir/<replaceable>shared_library_name</replaceable></literal> and
+        then <literal>MODULE_PATHNAME</literal> is used in <command>CREATE
+        FUNCTION</command> commands for C-language functions, so that the script
         files do not need to hard-wire the name of the shared library.
        </para>
       </listitem>
@@ -514,9 +571,9 @@
       <term><varname>superuser</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
-        If this parameter is <literal>true</> (which is the default),
+        If this parameter is <literal>true</literal> (which is the default),
         only superusers can create the extension or update it to a new
-        version.  If it is set to <literal>false</>, just the privileges
+        version.  If it is set to <literal>false</literal>, just the privileges
         required to execute the commands in the installation or update script
         are required.
        </para>
@@ -527,11 +584,11 @@
       <term><varname>relocatable</varname> (<type>boolean</type>)</term>
       <listitem>
        <para>
-        An extension is <firstterm>relocatable</> if it is possible to move
+        An extension is <firstterm>relocatable</firstterm> if it is possible to move
         its contained objects into a different schema after initial creation
-        of the extension.  The default is <literal>false</>, i.e. the
+        of the extension.  The default is <literal>false</literal>, i.e. the
         extension is not relocatable.
-        See <xref linkend="extend-extensions-relocation"> for more information.
+        See <xref linkend="extend-extensions-relocation"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -545,7 +602,7 @@
         and not any other.
         The <varname>schema</varname> parameter is consulted only when
         initially creating an extension, not during extension updates.
-        See <xref linkend="extend-extensions-relocation"> for more information.
+        See <xref linkend="extend-extensions-relocation"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -553,45 +610,45 @@
 
     <para>
      In addition to the primary control file
-     <literal><replaceable>extension</>.control</literal>,
+     <literal><replaceable>extension</replaceable>.control</literal>,
      an extension can have secondary control files named in the style
-     <literal><replaceable>extension</>--<replaceable>version</>.control</literal>.
+     <literal><replaceable>extension</replaceable>--<replaceable>version</replaceable>.control</literal>.
      If supplied, these must be located in the script file directory.
      Secondary control files follow the same format as the primary control
      file.  Any parameters set in a secondary control file override the
      primary control file when installing or updating to that version of
-     the extension.  However, the parameters <varname>directory</> and
-     <varname>default_version</> cannot be set in a secondary control file.
+     the extension.  However, the parameters <varname>directory</varname> and
+     <varname>default_version</varname> cannot be set in a secondary control file.
     </para>
 
     <para>
-     An extension's <acronym>SQL</> script files can contain any SQL commands,
-     except for transaction control commands (<command>BEGIN</>,
-     <command>COMMIT</>, etc) and commands that cannot be executed inside a
-     transaction block (such as <command>VACUUM</>).  This is because the
+     An extension's <acronym>SQL</acronym> script files can contain any SQL commands,
+     except for transaction control commands (<command>BEGIN</command>,
+     <command>COMMIT</command>, etc) and commands that cannot be executed inside a
+     transaction block (such as <command>VACUUM</command>).  This is because the
      script files are implicitly executed within a transaction block.
     </para>
 
     <para>
-     An extension's <acronym>SQL</> script files can also contain lines
-     beginning with <literal>\echo</>, which will be ignored (treated as
+     An extension's <acronym>SQL</acronym> script files can also contain lines
+     beginning with <literal>\echo</literal>, which will be ignored (treated as
      comments) by the extension mechanism.  This provision is commonly used
-     to throw an error if the script file is fed to <application>psql</>
-     rather than being loaded via <command>CREATE EXTENSION</> (see example
-     script in <xref linkend="extend-extensions-example">).
+     to throw an error if the script file is fed to <application>psql</application>
+     rather than being loaded via <command>CREATE EXTENSION</command> (see example
+     script in <xref linkend="extend-extensions-example"/>).
      Without that, users might accidentally load the
-     extension's contents as <quote>loose</> objects rather than as an
+     extension's contents as <quote>loose</quote> objects rather than as an
      extension, a state of affairs that's a bit tedious to recover from.
     </para>
 
     <para>
      While the script files can contain any characters allowed by the specified
      encoding, control files should contain only plain ASCII, because there
-     is no way for <productname>PostgreSQL</> to know what encoding a
+     is no way for <productname>PostgreSQL</productname> to know what encoding a
      control file is in.  In practice this is only an issue if you want to
      use non-ASCII characters in the extension's comment.  Recommended
-     practice in that case is to not use the control file <varname>comment</>
-     parameter, but instead use <command>COMMENT ON EXTENSION</>
+     practice in that case is to not use the control file <varname>comment</varname>
+     parameter, but instead use <command>COMMENT ON EXTENSION</command>
      within a script file to set the comment.
     </para>
 
@@ -611,14 +668,14 @@
       <para>
        A fully relocatable extension can be moved into another schema
        at any time, even after it's been loaded into a database.
-       This is done with the <command>ALTER EXTENSION SET SCHEMA</>
+       This is done with the <command>ALTER EXTENSION SET SCHEMA</command>
        command, which automatically renames all the member objects into
        the new schema.  Normally, this is only possible if the extension
        contains no internal assumptions about what schema any of its
        objects are in.  Also, the extension's objects must all be in one
        schema to begin with (ignoring objects that do not belong to any
        schema, such as procedural languages).  Mark a fully relocatable
-       extension by setting <literal>relocatable = true</> in its control
+       extension by setting <literal>relocatable = true</literal> in its control
        file.
       </para>
      </listitem>
@@ -628,26 +685,26 @@
        An extension might be relocatable during installation but not
        afterwards.  This is typically the case if the extension's script
        file needs to reference the target schema explicitly, for example
-       in setting <literal>search_path</> properties for SQL functions.
-       For such an extension, set <literal>relocatable = false</> in its
-       control file, and use <literal>@extschema@</> to refer to the target
+       in setting <literal>search_path</literal> properties for SQL functions.
+       For such an extension, set <literal>relocatable = false</literal> in its
+       control file, and use <literal>@extschema@</literal> to refer to the target
        schema in the script file.  All occurrences of this string will be
        replaced by the actual target schema's name before the script is
        executed.  The user can set the target schema using the
-       <literal>SCHEMA</> option of <command>CREATE EXTENSION</>.
+       <literal>SCHEMA</literal> option of <command>CREATE EXTENSION</command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        If the extension does not support relocation at all, set
-       <literal>relocatable = false</> in its control file, and also set
-       <literal>schema</> to the name of the intended target schema.  This
-       will prevent use of the <literal>SCHEMA</> option of <command>CREATE
-       EXTENSION</>, unless it specifies the same schema named in the control
+       <literal>relocatable = false</literal> in its control file, and also set
+       <literal>schema</literal> to the name of the intended target schema.  This
+       will prevent use of the <literal>SCHEMA</literal> option of <command>CREATE
+       EXTENSION</command>, unless it specifies the same schema named in the control
        file.  This choice is typically necessary if the extension contains
        internal assumptions about schema names that can't be replaced by
-       uses of <literal>@extschema@</>.  The <literal>@extschema@</>
+       uses of <literal>@extschema@</literal>.  The <literal>@extschema@</literal>
        substitution mechanism is available in this case too, although it is
        of limited use since the schema name is determined by the control file.
       </para>
@@ -656,24 +713,24 @@
 
     <para>
      In all cases, the script file will be executed with
-     <xref linkend="guc-search-path"> initially set to point to the target
-     schema; that is, <command>CREATE EXTENSION</> does the equivalent of
+     <xref linkend="guc-search-path"/> initially set to point to the target
+     schema; that is, <command>CREATE EXTENSION</command> does the equivalent of
      this:
 <programlisting>
 SET LOCAL search_path TO @extschema@;
 </programlisting>
      This allows the objects created by the script file to go into the target
-     schema.  The script file can change <varname>search_path</> if it wishes,
-     but that is generally undesirable.  <varname>search_path</> is restored
-     to its previous setting upon completion of <command>CREATE EXTENSION</>.
+     schema.  The script file can change <varname>search_path</varname> if it wishes,
+     but that is generally undesirable.  <varname>search_path</varname> is restored
+     to its previous setting upon completion of <command>CREATE EXTENSION</command>.
     </para>
 
     <para>
-     The target schema is determined by the <varname>schema</> parameter in
-     the control file if that is given, otherwise by the <literal>SCHEMA</>
-     option of <command>CREATE EXTENSION</> if that is given, otherwise the
+     The target schema is determined by the <varname>schema</varname> parameter in
+     the control file if that is given, otherwise by the <literal>SCHEMA</literal>
+     option of <command>CREATE EXTENSION</command> if that is given, otherwise the
      current default object creation schema (the first one in the caller's
-     <varname>search_path</>).  When the control file <varname>schema</>
+     <varname>search_path</varname>).  When the control file <varname>schema</varname>
      parameter is used, the target schema will be created if it doesn't
      already exist, but in the other two cases it must already exist.
     </para>
@@ -681,7 +738,7 @@ SET LOCAL search_path TO @extschema@;
     <para>
      If any prerequisite extensions are listed in <varname>requires</varname>
      in the control file, their target schemas are appended to the initial
-     setting of <varname>search_path</>.  This allows their objects to be
+     setting of <varname>search_path</varname>.  This allows their objects to be
      visible to the new extension's script file.
     </para>
 
@@ -690,7 +747,7 @@ SET LOCAL search_path TO @extschema@;
      multiple schemas, it is usually desirable to place all the objects meant
      for external use into a single schema, which is considered the extension's
      target schema.  Such an arrangement works conveniently with the default
-     setting of <varname>search_path</> during creation of dependent
+     setting of <varname>search_path</varname> during creation of dependent
      extensions.
     </para>
    </sect2>
@@ -703,7 +760,7 @@ SET LOCAL search_path TO @extschema@;
      might be added or changed by the user after installation of the
      extension.  Ordinarily, if a table is part of an extension, neither
      the table's definition nor its content will be dumped by
-     <application>pg_dump</>.  But that behavior is undesirable for a
+     <application>pg_dump</application>.  But that behavior is undesirable for a
      configuration table; any data changes made by the user need to be
      included in dumps, or the extension will behave differently after a dump
      and reload.
@@ -716,9 +773,9 @@ SET LOCAL search_path TO @extschema@;
     <para>
      To solve this problem, an extension's script file can mark a table
      or a sequence it has created as a configuration relation, which will
-     cause <application>pg_dump</> to include the table's or the sequence's
+     cause <application>pg_dump</application> to include the table's or the sequence's
      contents (not its definition) in dumps.  To do that, call the function
-     <function>pg_extension_config_dump(regclass, text)</> after creating the
+     <function>pg_extension_config_dump(regclass, text)</function> after creating the
      table or the sequence, for example
 <programlisting>
 CREATE TABLE my_config (key text, value text);
@@ -728,30 +785,30 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', '');
 SELECT pg_catalog.pg_extension_config_dump('my_config_seq', '');
 </programlisting>
      Any number of tables or sequences can be marked this way. Sequences
-     associated with <type>serial</> or <type>bigserial</> columns can
+     associated with <type>serial</type> or <type>bigserial</type> columns can
      be marked as well.
     </para>
 
     <para>
-     When the second argument of <function>pg_extension_config_dump</> is
+     When the second argument of <function>pg_extension_config_dump</function> is
      an empty string, the entire contents of the table are dumped by
-     <application>pg_dump</>.  This is usually only correct if the table
+     <application>pg_dump</application>.  This is usually only correct if the table
      is initially empty as created by the extension script.  If there is
      a mixture of initial data and user-provided data in the table,
-     the second argument of <function>pg_extension_config_dump</> provides
-     a <literal>WHERE</> condition that selects the data to be dumped.
+     the second argument of <function>pg_extension_config_dump</function> provides
+     a <literal>WHERE</literal> condition that selects the data to be dumped.
      For example, you might do
 <programlisting>
 CREATE TABLE my_config (key text, value text, standard_entry boolean);
 
 SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entry');
 </programlisting>
-     and then make sure that <structfield>standard_entry</> is true only
+     and then make sure that <structfield>standard_entry</structfield> is true only
      in the rows created by the extension's script.
     </para>
 
     <para>
-     For sequences, the second argument of <function>pg_extension_config_dump</>
+     For sequences, the second argument of <function>pg_extension_config_dump</function>
      has no effect.
     </para>
 
@@ -763,10 +820,10 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
 
     <para>
      You can alter the filter condition associated with a configuration table
-     by calling <function>pg_extension_config_dump</> again.  (This would
+     by calling <function>pg_extension_config_dump</function> again.  (This would
      typically be useful in an extension update script.)  The only way to mark
      a table as no longer a configuration table is to dissociate it from the
-     extension with <command>ALTER EXTENSION ... DROP TABLE</>.
+     extension with <command>ALTER EXTENSION ... DROP TABLE</command>.
     </para>
 
     <para>
@@ -781,7 +838,7 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
     </para>
 
     <para>
-     Sequences associated with <type>serial</> or <type>bigserial</> columns
+     Sequences associated with <type>serial</type> or <type>bigserial</type> columns
      need to be directly marked to dump their state. Marking their parent
      relation is not enough for this purpose.
     </para>
@@ -797,20 +854,20 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
      each released version of the extension's installation script.
      In addition, if you want users to be able to update their databases
      dynamically from one version to the next, you should provide
-     <firstterm>update scripts</> that make the necessary changes to go from
+     <firstterm>update scripts</firstterm> that make the necessary changes to go from
      one version to the next.  Update scripts have names following the pattern
-     <literal><replaceable>extension</>--<replaceable>oldversion</>--<replaceable>newversion</>.sql</literal>
-     (for example, <literal>foo--1.0--1.1.sql</> contains the commands to modify
-     version <literal>1.0</> of extension <literal>foo</> into version
-     <literal>1.1</>).
+     <literal><replaceable>extension</replaceable>--<replaceable>oldversion</replaceable>--<replaceable>newversion</replaceable>.sql</literal>
+     (for example, <literal>foo--1.0--1.1.sql</literal> contains the commands to modify
+     version <literal>1.0</literal> of extension <literal>foo</literal> into version
+     <literal>1.1</literal>).
     </para>
 
     <para>
      Given that a suitable update script is available, the command
-     <command>ALTER EXTENSION UPDATE</> will update an installed extension
+     <command>ALTER EXTENSION UPDATE</command> will update an installed extension
      to the specified new version.  The update script is run in the same
-     environment that <command>CREATE EXTENSION</> provides for installation
-     scripts: in particular, <varname>search_path</> is set up in the same
+     environment that <command>CREATE EXTENSION</command> provides for installation
+     scripts: in particular, <varname>search_path</varname> is set up in the same
      way, and any new objects created by the script are automatically added
      to the extension.  Also, if the script chooses to drop extension member
      objects, they are automatically dissociated from the extension.
@@ -824,56 +881,56 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
 
     <para>
      The update mechanism can be used to solve an important special case:
-     converting a <quote>loose</> collection of objects into an extension.
+     converting a <quote>loose</quote> collection of objects into an extension.
      Before the extension mechanism was added to
      <productname>PostgreSQL</productname> (in 9.1), many people wrote
      extension modules that simply created assorted unpackaged objects.
      Given an existing database containing such objects, how can we convert
      the objects into a properly packaged extension?  Dropping them and then
-     doing a plain <command>CREATE EXTENSION</> is one way, but it's not
+     doing a plain <command>CREATE EXTENSION</command> is one way, but it's not
      desirable if the objects have dependencies (for example, if there are
      table columns of a data type created by the extension).  The way to fix
      this situation is to create an empty extension, then use <command>ALTER
-     EXTENSION ADD</> to attach each pre-existing object to the extension,
+     EXTENSION ADD</command> to attach each pre-existing object to the extension,
      then finally create any new objects that are in the current extension
      version but were not in the unpackaged release.  <command>CREATE
-     EXTENSION</> supports this case with its <literal>FROM</> <replaceable
-     class="parameter">old_version</> option, which causes it to not run the
+     EXTENSION</command> supports this case with its <literal>FROM</literal> <replaceable
+     class="parameter">old_version</replaceable> option, which causes it to not run the
      normal installation script for the target version, but instead the update
      script named
-     <literal><replaceable>extension</>--<replaceable>old_version</>--<replaceable>target_version</>.sql</literal>.
+     <literal><replaceable>extension</replaceable>--<replaceable>old_version</replaceable>--<replaceable>target_version</replaceable>.sql</literal>.
      The choice of the dummy version name to use as <replaceable
-     class="parameter">old_version</> is up to the extension author, though
-     <literal>unpackaged</> is a common convention.  If you have multiple
+     class="parameter">old_version</replaceable> is up to the extension author, though
+     <literal>unpackaged</literal> is a common convention.  If you have multiple
      prior versions you need to be able to update into extension style, use
      multiple dummy version names to identify them.
     </para>
 
     <para>
-     <command>ALTER EXTENSION</> is able to execute sequences of update
+     <command>ALTER EXTENSION</command> is able to execute sequences of update
      script files to achieve a requested update.  For example, if only
-     <literal>foo--1.0--1.1.sql</> and <literal>foo--1.1--2.0.sql</> are
-     available, <command>ALTER EXTENSION</> will apply them in sequence if an
-     update to version <literal>2.0</> is requested when <literal>1.0</> is
+     <literal>foo--1.0--1.1.sql</literal> and <literal>foo--1.1--2.0.sql</literal> are
+     available, <command>ALTER EXTENSION</command> will apply them in sequence if an
+     update to version <literal>2.0</literal> is requested when <literal>1.0</literal> is
      currently installed.
     </para>
 
     <para>
-     <productname>PostgreSQL</> doesn't assume anything about the properties
-     of version names: for example, it does not know whether <literal>1.1</>
-     follows <literal>1.0</>.  It just matches up the available version names
+     <productname>PostgreSQL</productname> doesn't assume anything about the properties
+     of version names: for example, it does not know whether <literal>1.1</literal>
+     follows <literal>1.0</literal>.  It just matches up the available version names
      and follows the path that requires applying the fewest update scripts.
      (A version name can actually be any string that doesn't contain
-     <literal>--</> or leading or trailing <literal>-</>.)
+     <literal>--</literal> or leading or trailing <literal>-</literal>.)
     </para>
 
     <para>
-     Sometimes it is useful to provide <quote>downgrade</> scripts, for
-     example <literal>foo--1.1--1.0.sql</> to allow reverting the changes
-     associated with version <literal>1.1</>.  If you do that, be careful
+     Sometimes it is useful to provide <quote>downgrade</quote> scripts, for
+     example <literal>foo--1.1--1.0.sql</literal> to allow reverting the changes
+     associated with version <literal>1.1</literal>.  If you do that, be careful
      of the possibility that a downgrade script might unexpectedly
      get applied because it yields a shorter path.  The risky case is where
-     there is a <quote>fast path</> update script that jumps ahead several
+     there is a <quote>fast path</quote> update script that jumps ahead several
      versions as well as a downgrade script to the fast path's start point.
      It might take fewer steps to apply the downgrade and then the fast
      path than to move ahead one version at a time.  If the downgrade script
@@ -883,14 +940,14 @@ SELECT pg_catalog.pg_extension_config_dump('my_config', 'WHERE NOT standard_entr
     <para>
      To check for unexpected update paths, use this command:
 <programlisting>
-SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</>');
+SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</replaceable>');
 </programlisting>
      This shows each pair of distinct known version names for the specified
      extension, together with the update path sequence that would be taken to
-     get from the source version to the target version, or <literal>NULL</> if
+     get from the source version to the target version, or <literal>NULL</literal> if
      there is no available update path.  The path is shown in textual form
-     with <literal>--</> separators.  You can use
-     <literal>regexp_split_to_array(path,'--')</> if you prefer an array
+     with <literal>--</literal> separators.  You can use
+     <literal>regexp_split_to_array(path,'--')</literal> if you prefer an array
      format.
     </para>
    </sect2>
@@ -901,24 +958,24 @@ SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</>');
     <para>
      An extension that has been around for awhile will probably exist in
      several versions, for which the author will need to write update scripts.
-     For example, if you have released a <literal>foo</> extension in
-     versions <literal>1.0</>, <literal>1.1</>, and <literal>1.2</>, there
-     should be update scripts <filename>foo--1.0--1.1.sql</>
-     and <filename>foo--1.1--1.2.sql</>.
-     Before <productname>PostgreSQL</> 10, it was necessary to also create
-     new script files <filename>foo--1.1.sql</> and <filename>foo--1.2.sql</>
+     For example, if you have released a <literal>foo</literal> extension in
+     versions <literal>1.0</literal>, <literal>1.1</literal>, and <literal>1.2</literal>, there
+     should be update scripts <filename>foo--1.0--1.1.sql</filename>
+     and <filename>foo--1.1--1.2.sql</filename>.
+     Before <productname>PostgreSQL</productname> 10, it was necessary to also create
+     new script files <filename>foo--1.1.sql</filename> and <filename>foo--1.2.sql</filename>
      that directly build the newer extension versions, or else the newer
      versions could not be installed directly, only by
-     installing <literal>1.0</> and then updating.  That was tedious and
+     installing <literal>1.0</literal> and then updating.  That was tedious and
      duplicative, but now it's unnecessary, because <command>CREATE
-     EXTENSION</> can follow update chains automatically.
+     EXTENSION</command> can follow update chains automatically.
      For example, if only the script
-     files <filename>foo--1.0.sql</>, <filename>foo--1.0--1.1.sql</>,
-     and <filename>foo--1.1--1.2.sql</> are available then a request to
-     install version <literal>1.2</> is honored by running those three
+     files <filename>foo--1.0.sql</filename>, <filename>foo--1.0--1.1.sql</filename>,
+     and <filename>foo--1.1--1.2.sql</filename> are available then a request to
+     install version <literal>1.2</literal> is honored by running those three
      scripts in sequence.  The processing is the same as if you'd first
-     installed <literal>1.0</> and then updated to <literal>1.2</>.
-     (As with <command>ALTER EXTENSION UPDATE</>, if multiple pathways are
+     installed <literal>1.0</literal> and then updated to <literal>1.2</literal>.
+     (As with <command>ALTER EXTENSION UPDATE</command>, if multiple pathways are
      available then the shortest is preferred.)  Arranging an extension's
      script files in this style can reduce the amount of maintenance effort
      needed to produce small updates.
@@ -929,10 +986,10 @@ SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</>');
      maintained in this style, keep in mind that each version needs a control
      file even if it has no stand-alone installation script, as that control
      file will determine how the implicit update to that version is performed.
-     For example, if <filename>foo--1.0.control</> specifies <literal>requires
-     = 'bar'</> but <literal>foo</>'s other control files do not, the
-     extension's dependency on <literal>bar</> will be dropped when updating
-     from <literal>1.0</> to another version.
+     For example, if <filename>foo--1.0.control</filename> specifies <literal>requires
+     = 'bar'</literal> but <literal>foo</literal>'s other control files do not, the
+     extension's dependency on <literal>bar</literal> will be dropped when updating
+     from <literal>1.0</literal> to another version.
     </para>
    </sect2>
 
@@ -940,55 +997,55 @@ SELECT * FROM pg_extension_update_paths('<replaceable>extension_name</>');
     <title>Extension Example</title>
 
     <para>
-     Here is a complete example of an <acronym>SQL</>-only
+     Here is a complete example of an <acronym>SQL</acronym>-only
      extension, a two-element composite type that can store any type of value
-     in its slots, which are named <quote>k</> and <quote>v</>.  Non-text
+     in its slots, which are named <quote>k</quote> and <quote>v</quote>.  Non-text
      values are automatically coerced to text for storage.
     </para>
 
     <para>
-     The script file <filename>pair--1.0.sql</> looks like this:
+     The script file <filename>pair--1.0.sql</filename> looks like this:
 
 <programlisting><![CDATA[
 -- complain if script is sourced in psql, rather than via CREATE EXTENSION
 \echo Use "CREATE EXTENSION pair" to load this file. \quit
 
-CREATE TYPE pair AS ( k text, v text );
-
-CREATE OR REPLACE FUNCTION pair(anyelement, text)
-RETURNS pair LANGUAGE SQL AS 'SELECT ROW($1, $2)::pair';
+CREATE TYPE pair AS ( k pg_catalog.text, v pg_catalog.text );
 
-CREATE OR REPLACE FUNCTION pair(text, anyelement)
-RETURNS pair LANGUAGE SQL AS 'SELECT ROW($1, $2)::pair';
+CREATE OR REPLACE FUNCTION pair(pg_catalog.text, pg_catalog.text)
+RETURNS pair LANGUAGE SQL AS 'SELECT ROW($1, $2)::@extschema@.pair;';
 
-CREATE OR REPLACE FUNCTION pair(anyelement, anyelement)
-RETURNS pair LANGUAGE SQL AS 'SELECT ROW($1, $2)::pair';
+CREATE OPERATOR ~> (LEFTARG = pg_catalog.text,
+                    RIGHTARG = pg_catalog.text, PROCEDURE = pair);
 
-CREATE OR REPLACE FUNCTION pair(text, text)
-RETURNS pair LANGUAGE SQL AS 'SELECT ROW($1, $2)::pair;';
+-- "SET search_path" is easy to get right, but qualified names perform better.
+CREATE OR REPLACE FUNCTION lower(pair)
+RETURNS pair LANGUAGE SQL
+AS 'SELECT ROW(lower($1.k), lower($1.v))::@extschema@.pair;'
+SET search_path = pg_temp;
 
-CREATE OPERATOR ~> (LEFTARG = text, RIGHTARG = anyelement, PROCEDURE = pair);
-CREATE OPERATOR ~> (LEFTARG = anyelement, RIGHTARG = text, PROCEDURE = pair);
-CREATE OPERATOR ~> (LEFTARG = anyelement, RIGHTARG = anyelement, PROCEDURE = pair);
-CREATE OPERATOR ~> (LEFTARG = text, RIGHTARG = text, PROCEDURE = pair);
+CREATE OR REPLACE FUNCTION pair_concat(pair, pair)
+RETURNS pair LANGUAGE SQL
+AS 'SELECT ROW($1.k OPERATOR(pg_catalog.||) $2.k,
+               $1.v OPERATOR(pg_catalog.||) $2.v)::@extschema@.pair;';
 ]]>
 </programlisting>
     </para>
 
     <para>
-     The control file <filename>pair.control</> looks like this:
+     The control file <filename>pair.control</filename> looks like this:
 
 <programlisting>
 # pair extension
 comment = 'A key/value pair data type'
 default_version = '1.0'
-relocatable = true
+relocatable = false
 </programlisting>
     </para>
 
     <para>
      While you hardly need a makefile to install these two files into the
-     correct directory, you could use a <filename>Makefile</> containing this:
+     correct directory, you could use a <filename>Makefile</filename> containing this:
 
 <programlisting>
 EXTENSION = pair
@@ -1000,14 +1057,14 @@ include $(PGXS)
 </programlisting>
 
      This makefile relies on <acronym>PGXS</acronym>, which is described
-     in <xref linkend="extend-pgxs">.  The command <literal>make install</>
+     in <xref linkend="extend-pgxs"/>.  The command <literal>make install</literal>
      will install the control and script files into the correct
-     directory as reported by <application>pg_config</>.
+     directory as reported by <application>pg_config</application>.
     </para>
 
     <para>
      Once the files are installed, use the
-     <xref linkend="sql-createextension"> command to load the objects into
+     <xref linkend="sql-createextension"/> command to load the objects into
      any particular database.
     </para>
    </sect2>
@@ -1022,16 +1079,16 @@ include $(PGXS)
 
    <para>
     If you are thinking about distributing your
-    <productname>PostgreSQL</> extension modules, setting up a
+    <productname>PostgreSQL</productname> extension modules, setting up a
     portable build system for them can be fairly difficult.  Therefore
-    the <productname>PostgreSQL</> installation provides a build
+    the <productname>PostgreSQL</productname> installation provides a build
     infrastructure for extensions, called <acronym>PGXS</acronym>, so
     that simple extension modules can be built simply against an
     already installed server.  <acronym>PGXS</acronym> is mainly intended
     for extensions that include C code, although it can be used for
     pure-SQL extensions too.  Note that <acronym>PGXS</acronym> is not
     intended to be a universal build system framework that can be used
-    to build any software interfacing to <productname>PostgreSQL</>;
+    to build any software interfacing to <productname>PostgreSQL</productname>;
     it simply automates common build rules for simple server extension
     modules.  For more complicated packages, you might need to write your
     own build system.
@@ -1115,7 +1172,7 @@ include $(PGXS)
       <term><varname>MODULEDIR</varname></term>
       <listitem>
        <para>
-        subdirectory of <literal><replaceable>prefix</>/share</literal>
+        subdirectory of <literal><replaceable>prefix</replaceable>/share</literal>
         into which DATA and DOCS files should be installed
         (if not set, default is <literal>extension</literal> if
         <varname>EXTENSION</varname> is set,
@@ -1198,7 +1255,7 @@ include $(PGXS)
       <term><varname>REGRESS_OPTS</varname></term>
       <listitem>
        <para>
-        additional switches to pass to <application>pg_regress</>
+        additional switches to pass to <application>pg_regress</application>
        </para>
       </listitem>
      </varlistentry>
@@ -1252,10 +1309,10 @@ include $(PGXS)
       <term><varname>PG_CONFIG</varname></term>
       <listitem>
        <para>
-        path to <application>pg_config</> program for the
+        path to <application>pg_config</application> program for the
         <productname>PostgreSQL</productname> installation to build against
-        (typically just <literal>pg_config</> to use the first one in your
-        <varname>PATH</>)
+        (typically just <literal>pg_config</literal> to use the first one in your
+        <varname>PATH</varname>)
        </para>
       </listitem>
      </varlistentry>
@@ -1270,7 +1327,7 @@ include $(PGXS)
     compiled and installed for the
     <productname>PostgreSQL</productname> installation that
     corresponds to the first <command>pg_config</command> program
-    found in your <varname>PATH</>.  You can use a different installation by
+    found in your <varname>PATH</varname>.  You can use a different installation by
     setting <varname>PG_CONFIG</varname> to point to its
     <command>pg_config</command> program, either within the makefile
     or on the <literal>make</literal> command line.
@@ -1293,7 +1350,7 @@ make -f /path/to/extension/source/tree/Makefile install
    <para>
     Alternatively, you can set up a directory for a VPATH build in a similar
     way to how it is done for the core code. One way to do this is using the
-    core script <filename>config/prep_buildtree</>. Once this has been done
+    core script <filename>config/prep_buildtree</filename>. Once this has been done
     you can build by setting the <literal>make</literal> variable
     <varname>VPATH</varname> like this:
 <programlisting>
@@ -1304,18 +1361,18 @@ make VPATH=/path/to/extension/source/tree install
    </para>
 
    <para>
-    The scripts listed in the <varname>REGRESS</> variable are used for
+    The scripts listed in the <varname>REGRESS</varname> variable are used for
     regression testing of your module, which can be invoked by <literal>make
-    installcheck</literal> after doing <literal>make install</>.  For this to
+    installcheck</literal> after doing <literal>make install</literal>.  For this to
     work you must have a running <productname>PostgreSQL</productname> server.
-    The script files listed in <varname>REGRESS</> must appear in a
+    The script files listed in <varname>REGRESS</varname> must appear in a
     subdirectory named <literal>sql/</literal> in your extension's directory.
     These files must have extension <literal>.sql</literal>, which must not be
     included in the <varname>REGRESS</varname> list in the makefile.  For each
     test there should also be a file containing the expected output in a
     subdirectory named <literal>expected/</literal>, with the same stem and
     extension <literal>.out</literal>.  <literal>make installcheck</literal>
-    executes each test script with <application>psql</>, and compares the
+    executes each test script with <application>psql</application>, and compares the
     resulting output to the matching expected file.  Any differences will be
     written to the file <literal>regression.diffs</literal> in <command>diff
     -c</command> format.  Note that trying to run a test that is missing its
diff --git a/doc/src/sgml/external-projects.sgml b/doc/src/sgml/external-projects.sgml
index 82eaf4a355..89147817ec 100644
--- a/doc/src/sgml/external-projects.sgml
+++ b/doc/src/sgml/external-projects.sgml
@@ -40,9 +40,9 @@
    </itemizedlist>
 
    All other language interfaces are external projects and are distributed
-   separately. <xref linkend="language-interface-table"> includes a list of
+   separately. <xref linkend="language-interface-table"/> includes a list of
    some of these projects. Note that some of these packages might not be
-   released under the same license as <productname>PostgreSQL</>. For more
+   released under the same license as <productname>PostgreSQL</productname>. For more
    information on each language interface, including licensing terms, refer to
    its website and documentation.
   </para>
@@ -145,8 +145,8 @@
 
   <para>
    There are several administration tools available for
-   <productname>PostgreSQL</>. The most popular is
-   <application><ulink url="http://www.pgadmin.org/">pgAdmin III</ulink></>,
+   <productname>PostgreSQL</productname>. The most popular is
+   <application><ulink url="http://www.pgadmin.org/">pgAdmin III</ulink></application>,
    and there are several commercially available ones as well.
   </para>
  </sect1>
@@ -170,9 +170,9 @@
   <para>
    In addition, there are a number of procedural languages that are developed
    and maintained outside the core <productname>PostgreSQL</productname>
-   distribution. <xref linkend="pl-language-table"> lists some of these
+   distribution. <xref linkend="pl-language-table"/> lists some of these
    packages. Note that some of these projects might not be released under the same
-   license as <productname>PostgreSQL</>. For more information on each
+   license as <productname>PostgreSQL</productname>. For more information on each
    procedural language, including licensing information, refer to its website
    and documentation.
   </para>
@@ -233,17 +233,17 @@
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</> is designed to be easily extensible. For
+   <productname>PostgreSQL</productname> is designed to be easily extensible. For
    this reason, extensions loaded into the database can function
    just like features that are built in. The
-   <filename>contrib/</> directory shipped with the source code
+   <filename>contrib/</filename> directory shipped with the source code
    contains several extensions, which are described in
-   <xref linkend="contrib">.  Other extensions are developed
+   <xref linkend="contrib"/>.  Other extensions are developed
    independently, like <application><ulink
-   url="http://postgis.net/">PostGIS</ulink></>.  Even
-   <productname>PostgreSQL</> replication solutions can be developed
+   url="http://postgis.net/">PostGIS</ulink></application>.  Even
+   <productname>PostgreSQL</productname> replication solutions can be developed
    externally. For example, <application> <ulink
-   url="http://www.slony.info">Slony-I</ulink></> is a popular
+   url="http://www.slony.info">Slony-I</ulink></application> is a popular
    master/standby replication solution that is developed independently
    from the core project.
   </para>
diff --git a/doc/src/sgml/fdwhandler.sgml b/doc/src/sgml/fdwhandler.sgml
index dbeaab555d..0ed3a47233 100644
--- a/doc/src/sgml/fdwhandler.sgml
+++ b/doc/src/sgml/fdwhandler.sgml
@@ -21,8 +21,8 @@
    <para>
     The foreign data wrappers included in the standard distribution are good
     references when trying to write your own.  Look into the
-    <filename>contrib</> subdirectory of the source tree.
-    The <xref linkend="sql-createforeigndatawrapper"> reference page also has
+    <filename>contrib</filename> subdirectory of the source tree.
+    The <xref linkend="sql-createforeigndatawrapper"/> reference page also has
     some useful details.
    </para>
 
@@ -43,7 +43,7 @@
      a validator function. Both functions must be written in a compiled
      language such as C, using the version-1 interface.
      For details on C language calling conventions and dynamic loading,
-     see <xref linkend="xfunc-c">.
+     see <xref linkend="xfunc-c"/>.
     </para>
 
     <para>
@@ -57,7 +57,7 @@
      returning the special pseudo-type <type>fdw_handler</type>.  The
      callback functions are plain C functions and are not visible or
      callable at the SQL level.  The callback functions are described in
-     <xref linkend="fdw-callbacks">.
+     <xref linkend="fdw-callbacks"/>.
     </para>
 
     <para>
@@ -70,10 +70,10 @@
      representing the type of object the options are associated with (in
      the form of the OID of the system catalog the object would be stored
      in, either
-     <literal>ForeignDataWrapperRelationId</>,
-     <literal>ForeignServerRelationId</>,
-     <literal>UserMappingRelationId</>,
-     or <literal>ForeignTableRelationId</>).
+     <literal>ForeignDataWrapperRelationId</literal>,
+     <literal>ForeignServerRelationId</literal>,
+     <literal>UserMappingRelationId</literal>,
+     or <literal>ForeignTableRelationId</literal>).
      If no validator function is supplied, options are not checked at object
      creation time or object alteration time.
     </para>
@@ -84,14 +84,14 @@
     <title>Foreign Data Wrapper Callback Routines</title>
 
     <para>
-     The FDW handler function returns a palloc'd <structname>FdwRoutine</>
+     The FDW handler function returns a palloc'd <structname>FdwRoutine</structname>
      struct containing pointers to the callback functions described below.
      The scan-related functions are required, the rest are optional.
     </para>
 
     <para>
-     The <structname>FdwRoutine</> struct type is declared in
-     <filename>src/include/foreign/fdwapi.h</>, which see for additional
+     The <structname>FdwRoutine</structname> struct type is declared in
+     <filename>src/include/foreign/fdwapi.h</filename>, which see for additional
      details.
     </para>
 
@@ -101,152 +101,152 @@
     <para>
 <programlisting>
 void
-GetForeignRelSize (PlannerInfo *root,
-                   RelOptInfo *baserel,
-                   Oid foreigntableid);
+GetForeignRelSize(PlannerInfo *root,
+                  RelOptInfo *baserel,
+                  Oid foreigntableid);
 </programlisting>
 
      Obtain relation size estimates for a foreign table.  This is called
      at the beginning of planning for a query that scans a foreign table.
-     <literal>root</> is the planner's global information about the query;
-     <literal>baserel</> is the planner's information about this table; and
-     <literal>foreigntableid</> is the <structname>pg_class</> OID of the
-     foreign table.  (<literal>foreigntableid</> could be obtained from the
+     <literal>root</literal> is the planner's global information about the query;
+     <literal>baserel</literal> is the planner's information about this table; and
+     <literal>foreigntableid</literal> is the <structname>pg_class</structname> OID of the
+     foreign table.  (<literal>foreigntableid</literal> could be obtained from the
      planner data structures, but it's passed explicitly to save effort.)
     </para>
 
     <para>
-     This function should update <literal>baserel-&gt;rows</> to be the
+     This function should update <literal>baserel-&gt;rows</literal> to be the
      expected number of rows returned by the table scan, after accounting for
      the filtering done by the restriction quals.  The initial value of
-     <literal>baserel-&gt;rows</> is just a constant default estimate, which
+     <literal>baserel-&gt;rows</literal> is just a constant default estimate, which
      should be replaced if at all possible.  The function may also choose to
-     update <literal>baserel-&gt;width</> if it can compute a better estimate
+     update <literal>baserel-&gt;width</literal> if it can compute a better estimate
      of the average result row width.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
 
     <para>
 <programlisting>
 void
-GetForeignPaths (PlannerInfo *root,
-                 RelOptInfo *baserel,
-                 Oid foreigntableid);
+GetForeignPaths(PlannerInfo *root,
+                RelOptInfo *baserel,
+                Oid foreigntableid);
 </programlisting>
 
      Create possible access paths for a scan on a foreign table.
      This is called during query planning.
-     The parameters are the same as for <function>GetForeignRelSize</>,
+     The parameters are the same as for <function>GetForeignRelSize</function>,
      which has already been called.
     </para>
 
     <para>
      This function must generate at least one access path
-     (<structname>ForeignPath</> node) for a scan on the foreign table and
-     must call <function>add_path</> to add each such path to
-     <literal>baserel-&gt;pathlist</>.  It's recommended to use
-     <function>create_foreignscan_path</> to build the
-     <structname>ForeignPath</> nodes.  The function can generate multiple
-     access paths, e.g., a path which has valid <literal>pathkeys</> to
+     (<structname>ForeignPath</structname> node) for a scan on the foreign table and
+     must call <function>add_path</function> to add each such path to
+     <literal>baserel-&gt;pathlist</literal>.  It's recommended to use
+     <function>create_foreignscan_path</function> to build the
+     <structname>ForeignPath</structname> nodes.  The function can generate multiple
+     access paths, e.g., a path which has valid <literal>pathkeys</literal> to
      represent a pre-sorted result.  Each access path must contain cost
      estimates, and can contain any FDW-private information that is needed to
      identify the specific scan method intended.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
 
     <para>
 <programlisting>
 ForeignScan *
-GetForeignPlan (PlannerInfo *root,
-                RelOptInfo *baserel,
-                Oid foreigntableid,
-                ForeignPath *best_path,
-                List *tlist,
-                List *scan_clauses,
-                Plan *outer_plan);
+GetForeignPlan(PlannerInfo *root,
+               RelOptInfo *baserel,
+               Oid foreigntableid,
+               ForeignPath *best_path,
+               List *tlist,
+               List *scan_clauses,
+               Plan *outer_plan);
 </programlisting>
 
-     Create a <structname>ForeignScan</> plan node from the selected foreign
+     Create a <structname>ForeignScan</structname> plan node from the selected foreign
      access path.  This is called at the end of query planning.
-     The parameters are as for <function>GetForeignRelSize</>, plus
-     the selected <structname>ForeignPath</> (previously produced by
-     <function>GetForeignPaths</>, <function>GetForeignJoinPaths</>,
-     or <function>GetForeignUpperPaths</>),
+     The parameters are as for <function>GetForeignRelSize</function>, plus
+     the selected <structname>ForeignPath</structname> (previously produced by
+     <function>GetForeignPaths</function>, <function>GetForeignJoinPaths</function>,
+     or <function>GetForeignUpperPaths</function>),
      the target list to be emitted by the plan node,
      the restriction clauses to be enforced by the plan node,
-     and the outer subplan of the <structname>ForeignScan</>,
-     which is used for rechecks performed by <function>RecheckForeignScan</>.
+     and the outer subplan of the <structname>ForeignScan</structname>,
+     which is used for rechecks performed by <function>RecheckForeignScan</function>.
      (If the path is for a join rather than a base
-     relation, <literal>foreigntableid</> is <literal>InvalidOid</>.)
+     relation, <literal>foreigntableid</literal> is <literal>InvalidOid</literal>.)
     </para>
 
     <para>
-     This function must create and return a <structname>ForeignScan</> plan
-     node; it's recommended to use <function>make_foreignscan</> to build the
-     <structname>ForeignScan</> node.
+     This function must create and return a <structname>ForeignScan</structname> plan
+     node; it's recommended to use <function>make_foreignscan</function> to build the
+     <structname>ForeignScan</structname> node.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
 
     <para>
 <programlisting>
 void
-BeginForeignScan (ForeignScanState *node,
-                  int eflags);
+BeginForeignScan(ForeignScanState *node,
+                 int eflags);
 </programlisting>
 
      Begin executing a foreign scan. This is called during executor startup.
      It should perform any initialization needed before the scan can start,
      but not start executing the actual scan (that should be done upon the
-     first call to <function>IterateForeignScan</>).
-     The <structname>ForeignScanState</> node has already been created, but
-     its <structfield>fdw_state</> field is still NULL.  Information about
+     first call to <function>IterateForeignScan</function>).
+     The <structname>ForeignScanState</structname> node has already been created, but
+     its <structfield>fdw_state</structfield> field is still NULL.  Information about
      the table to scan is accessible through the
-     <structname>ForeignScanState</> node (in particular, from the underlying
-     <structname>ForeignScan</> plan node, which contains any FDW-private
-     information provided by <function>GetForeignPlan</>).
-     <literal>eflags</> contains flag bits describing the executor's
+     <structname>ForeignScanState</structname> node (in particular, from the underlying
+     <structname>ForeignScan</structname> plan node, which contains any FDW-private
+     information provided by <function>GetForeignPlan</function>).
+     <literal>eflags</literal> contains flag bits describing the executor's
      operating mode for this plan node.
     </para>
 
     <para>
-     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</> is
+     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</literal> is
      true, this function should not perform any externally-visible actions;
      it should only do the minimum required to make the node state valid
-     for <function>ExplainForeignScan</> and <function>EndForeignScan</>.
+     for <function>ExplainForeignScan</function> and <function>EndForeignScan</function>.
     </para>
 
     <para>
 <programlisting>
 TupleTableSlot *
-IterateForeignScan (ForeignScanState *node);
+IterateForeignScan(ForeignScanState *node);
 </programlisting>
 
      Fetch one row from the foreign source, returning it in a tuple table slot
-     (the node's <structfield>ScanTupleSlot</> should be used for this
+     (the node's <structfield>ScanTupleSlot</structfield> should be used for this
      purpose).  Return NULL if no more rows are available.  The tuple table
      slot infrastructure allows either a physical or virtual tuple to be
      returned; in most cases the latter choice is preferable from a
      performance standpoint.  Note that this is called in a short-lived memory
      context that will be reset between invocations.  Create a memory context
-     in <function>BeginForeignScan</> if you need longer-lived storage, or use
-     the <structfield>es_query_cxt</> of the node's <structname>EState</>.
+     in <function>BeginForeignScan</function> if you need longer-lived storage, or use
+     the <structfield>es_query_cxt</structfield> of the node's <structname>EState</structname>.
     </para>
 
     <para>
-     The rows returned must match the <structfield>fdw_scan_tlist</> target
+     The rows returned must match the <structfield>fdw_scan_tlist</structfield> target
      list if one was supplied, otherwise they must match the row type of the
      foreign table being scanned.  If you choose to optimize away fetching
      columns that are not needed, you should insert nulls in those column
-     positions, or else generate a <structfield>fdw_scan_tlist</> list with
+     positions, or else generate a <structfield>fdw_scan_tlist</structfield> list with
      those columns omitted.
     </para>
 
@@ -264,7 +264,7 @@ IterateForeignScan (ForeignScanState *node);
     <para>
 <programlisting>
 void
-ReScanForeignScan (ForeignScanState *node);
+ReScanForeignScan(ForeignScanState *node);
 </programlisting>
 
      Restart the scan from the beginning.  Note that any parameters the
@@ -275,7 +275,7 @@ ReScanForeignScan (ForeignScanState *node);
     <para>
 <programlisting>
 void
-EndForeignScan (ForeignScanState *node);
+EndForeignScan(ForeignScanState *node);
 </programlisting>
 
      End the scan and release resources.  It is normally not important
@@ -297,21 +297,21 @@ EndForeignScan (ForeignScanState *node);
     <para>
 <programlisting>
 void
-GetForeignJoinPaths (PlannerInfo *root,
-                     RelOptInfo *joinrel,
-                     RelOptInfo *outerrel,
-                     RelOptInfo *innerrel,
-                     JoinType jointype,
-                     JoinPathExtraData *extra);
+GetForeignJoinPaths(PlannerInfo *root,
+                    RelOptInfo *joinrel,
+                    RelOptInfo *outerrel,
+                    RelOptInfo *innerrel,
+                    JoinType jointype,
+                    JoinPathExtraData *extra);
 </programlisting>
      Create possible access paths for a join of two (or more) foreign tables
      that all belong to the same foreign server.  This optional
      function is called during query planning.  As
-     with <function>GetForeignPaths</>, this function should
-     generate <structname>ForeignPath</> path(s) for the
-     supplied <literal>joinrel</>, and call <function>add_path</> to add these
+     with <function>GetForeignPaths</function>, this function should
+     generate <structname>ForeignPath</structname> path(s) for the
+     supplied <literal>joinrel</literal>, and call <function>add_path</function> to add these
      paths to the set of paths considered for the join.  But unlike
-     <function>GetForeignPaths</>, it is not necessary that this function
+     <function>GetForeignPaths</function>, it is not necessary that this function
      succeed in creating at least one path, since paths involving local
      joining are always possible.
     </para>
@@ -323,25 +323,25 @@ GetForeignJoinPaths (PlannerInfo *root,
     </para>
 
     <para>
-     If a <structname>ForeignPath</> path is chosen for the join, it will
+     If a <structname>ForeignPath</structname> path is chosen for the join, it will
      represent the entire join process; paths generated for the component
      tables and subsidiary joins will not be used.  Subsequent processing of
      the join path proceeds much as it does for a path scanning a single
-     foreign table.  One difference is that the <structfield>scanrelid</> of
-     the resulting <structname>ForeignScan</> plan node should be set to zero,
+     foreign table.  One difference is that the <structfield>scanrelid</structfield> of
+     the resulting <structname>ForeignScan</structname> plan node should be set to zero,
      since there is no single relation that it represents; instead,
-     the <structfield>fs_relids</> field of the <structname>ForeignScan</>
+     the <structfield>fs_relids</structfield> field of the <structname>ForeignScan</structname>
      node represents the set of relations that were joined.  (The latter field
      is set up automatically by the core planner code, and need not be filled
      by the FDW.)  Another difference is that, because the column list for a
      remote join cannot be found from the system catalogs, the FDW must
-     fill <structfield>fdw_scan_tlist</> with an appropriate list
-     of <structfield>TargetEntry</> nodes, representing the set of columns
+     fill <structfield>fdw_scan_tlist</structfield> with an appropriate list
+     of <structfield>TargetEntry</structfield> nodes, representing the set of columns
      it will supply at run time in the tuples it returns.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
    </sect2>
 
@@ -356,39 +356,39 @@ GetForeignJoinPaths (PlannerInfo *root,
     <para>
 <programlisting>
 void
-GetForeignUpperPaths (PlannerInfo *root,
-                      UpperRelationKind stage,
-                      RelOptInfo *input_rel,
-                      RelOptInfo *output_rel);
+GetForeignUpperPaths(PlannerInfo *root,
+                     UpperRelationKind stage,
+                     RelOptInfo *input_rel,
+                     RelOptInfo *output_rel);
 </programlisting>
-     Create possible access paths for <firstterm>upper relation</> processing,
+     Create possible access paths for <firstterm>upper relation</firstterm> processing,
      which is the planner's term for all post-scan/join query processing, such
      as aggregation, window functions, sorting, and table updates.  This
      optional function is called during query planning.  Currently, it is
      called only if all base relation(s) involved in the query belong to the
-     same FDW.  This function should generate <structname>ForeignPath</>
+     same FDW.  This function should generate <structname>ForeignPath</structname>
      path(s) for any post-scan/join processing that the FDW knows how to
-     perform remotely, and call <function>add_path</> to add these paths to
-     the indicated upper relation.  As with <function>GetForeignJoinPaths</>,
+     perform remotely, and call <function>add_path</function> to add these paths to
+     the indicated upper relation.  As with <function>GetForeignJoinPaths</function>,
      it is not necessary that this function succeed in creating any paths,
      since paths involving local processing are always possible.
     </para>
 
     <para>
-     The <literal>stage</> parameter identifies which post-scan/join step is
-     currently being considered.  <literal>output_rel</> is the upper relation
+     The <literal>stage</literal> parameter identifies which post-scan/join step is
+     currently being considered.  <literal>output_rel</literal> is the upper relation
      that should receive paths representing computation of this step,
-     and <literal>input_rel</> is the relation representing the input to this
-     step.  (Note that <structname>ForeignPath</> paths added
-     to <literal>output_rel</> would typically not have any direct dependency
-     on paths of the <literal>input_rel</>, since their processing is expected
+     and <literal>input_rel</literal> is the relation representing the input to this
+     step.  (Note that <structname>ForeignPath</structname> paths added
+     to <literal>output_rel</literal> would typically not have any direct dependency
+     on paths of the <literal>input_rel</literal>, since their processing is expected
      to be done externally.  However, examining paths previously generated for
      the previous processing step can be useful to avoid redundant planning
      work.)
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
    </sect2>
 
@@ -404,155 +404,158 @@ GetForeignUpperPaths (PlannerInfo *root,
     <para>
 <programlisting>
 void
-AddForeignUpdateTargets (Query *parsetree,
-                         RangeTblEntry *target_rte,
-                         Relation target_relation);
+AddForeignUpdateTargets(Query *parsetree,
+                        RangeTblEntry *target_rte,
+                        Relation target_relation);
 </programlisting>
 
-     <command>UPDATE</> and <command>DELETE</> operations are performed
+     <command>UPDATE</command> and <command>DELETE</command> operations are performed
      against rows previously fetched by the table-scanning functions.  The
      FDW may need extra information, such as a row ID or the values of
      primary-key columns, to ensure that it can identify the exact row to
      update or delete.  To support that, this function can add extra hidden,
-     or <quote>junk</>, target columns to the list of columns that are to be
-     retrieved from the foreign table during an <command>UPDATE</> or
-     <command>DELETE</>.
+     or <quote>junk</quote>, target columns to the list of columns that are to be
+     retrieved from the foreign table during an <command>UPDATE</command> or
+     <command>DELETE</command>.
     </para>
 
     <para>
-     To do that, add <structname>TargetEntry</> items to
-     <literal>parsetree-&gt;targetList</>, containing expressions for the
+     To do that, add <structname>TargetEntry</structname> items to
+     <literal>parsetree-&gt;targetList</literal>, containing expressions for the
      extra values to be fetched.  Each such entry must be marked
-     <structfield>resjunk</> = <literal>true</>, and must have a distinct
-     <structfield>resname</> that will identify it at execution time.
-     Avoid using names matching <literal>ctid<replaceable>N</></literal>,
+     <structfield>resjunk</structfield> = <literal>true</literal>, and must have a distinct
+     <structfield>resname</structfield> that will identify it at execution time.
+     Avoid using names matching <literal>ctid<replaceable>N</replaceable></literal>,
      <literal>wholerow</literal>, or
-     <literal>wholerow<replaceable>N</></literal>, as the core system can
+     <literal>wholerow<replaceable>N</replaceable></literal>, as the core system can
      generate junk columns of these names.
+     If the extra expressions are more complex than simple Vars, they
+     must be run through <function>eval_const_expressions</function>
+     before adding them to the targetlist.
     </para>
 
     <para>
-     This function is called in the rewriter, not the planner, so the
-     information available is a bit different from that available to the
+     Although this function is called during planning, the
+     information provided is a bit different from that available to other
      planning routines.
-     <literal>parsetree</> is the parse tree for the <command>UPDATE</> or
-     <command>DELETE</> command, while <literal>target_rte</> and
-     <literal>target_relation</> describe the target foreign table.
+     <literal>parsetree</literal> is the parse tree for the <command>UPDATE</command> or
+     <command>DELETE</command> command, while <literal>target_rte</literal> and
+     <literal>target_relation</literal> describe the target foreign table.
     </para>
 
     <para>
-     If the <function>AddForeignUpdateTargets</> pointer is set to
-     <literal>NULL</>, no extra target expressions are added.
-     (This will make it impossible to implement <command>DELETE</>
-     operations, though <command>UPDATE</> may still be feasible if the FDW
+     If the <function>AddForeignUpdateTargets</function> pointer is set to
+     <literal>NULL</literal>, no extra target expressions are added.
+     (This will make it impossible to implement <command>DELETE</command>
+     operations, though <command>UPDATE</command> may still be feasible if the FDW
      relies on an unchanging primary key to identify rows.)
     </para>
 
     <para>
 <programlisting>
 List *
-PlanForeignModify (PlannerInfo *root,
-                   ModifyTable *plan,
-                   Index resultRelation,
-                   int subplan_index);
+PlanForeignModify(PlannerInfo *root,
+                  ModifyTable *plan,
+                  Index resultRelation,
+                  int subplan_index);
 </programlisting>
 
      Perform any additional planning actions needed for an insert, update, or
      delete on a foreign table.  This function generates the FDW-private
-     information that will be attached to the <structname>ModifyTable</> plan
+     information that will be attached to the <structname>ModifyTable</structname> plan
      node that performs the update action.  This private information must
-     have the form of a <literal>List</>, and will be delivered to
-     <function>BeginForeignModify</> during the execution stage.
+     have the form of a <literal>List</literal>, and will be delivered to
+     <function>BeginForeignModify</function> during the execution stage.
     </para>
 
     <para>
-     <literal>root</> is the planner's global information about the query.
-     <literal>plan</> is the <structname>ModifyTable</> plan node, which is
-     complete except for the <structfield>fdwPrivLists</> field.
-     <literal>resultRelation</> identifies the target foreign table by its
-     range table index.  <literal>subplan_index</> identifies which target of
-     the <structname>ModifyTable</> plan node this is, counting from zero;
-     use this if you want to index into <literal>plan-&gt;plans</> or other
-     substructure of the <literal>plan</> node.
+     <literal>root</literal> is the planner's global information about the query.
+     <literal>plan</literal> is the <structname>ModifyTable</structname> plan node, which is
+     complete except for the <structfield>fdwPrivLists</structfield> field.
+     <literal>resultRelation</literal> identifies the target foreign table by its
+     range table index.  <literal>subplan_index</literal> identifies which target of
+     the <structname>ModifyTable</structname> plan node this is, counting from zero;
+     use this if you want to index into <literal>plan-&gt;plans</literal> or other
+     substructure of the <literal>plan</literal> node.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
 
     <para>
-     If the <function>PlanForeignModify</> pointer is set to
-     <literal>NULL</>, no additional plan-time actions are taken, and the
-     <literal>fdw_private</> list delivered to
-     <function>BeginForeignModify</> will be NIL.
+     If the <function>PlanForeignModify</function> pointer is set to
+     <literal>NULL</literal>, no additional plan-time actions are taken, and the
+     <literal>fdw_private</literal> list delivered to
+     <function>BeginForeignModify</function> will be NIL.
     </para>
 
     <para>
 <programlisting>
 void
-BeginForeignModify (ModifyTableState *mtstate,
-                    ResultRelInfo *rinfo,
-                    List *fdw_private,
-                    int subplan_index,
-                    int eflags);
+BeginForeignModify(ModifyTableState *mtstate,
+                   ResultRelInfo *rinfo,
+                   List *fdw_private,
+                   int subplan_index,
+                   int eflags);
 </programlisting>
 
      Begin executing a foreign table modification operation.  This routine is
      called during executor startup.  It should perform any initialization
      needed prior to the actual table modifications.  Subsequently,
-     <function>ExecForeignInsert</>, <function>ExecForeignUpdate</> or
-     <function>ExecForeignDelete</> will be called for each tuple to be
+     <function>ExecForeignInsert</function>, <function>ExecForeignUpdate</function> or
+     <function>ExecForeignDelete</function> will be called for each tuple to be
      inserted, updated, or deleted.
     </para>
 
     <para>
-     <literal>mtstate</> is the overall state of the
-     <structname>ModifyTable</> plan node being executed; global data about
+     <literal>mtstate</literal> is the overall state of the
+     <structname>ModifyTable</structname> plan node being executed; global data about
      the plan and execution state is available via this structure.
-     <literal>rinfo</> is the <structname>ResultRelInfo</> struct describing
-     the target foreign table.  (The <structfield>ri_FdwState</> field of
-     <structname>ResultRelInfo</> is available for the FDW to store any
+     <literal>rinfo</literal> is the <structname>ResultRelInfo</structname> struct describing
+     the target foreign table.  (The <structfield>ri_FdwState</structfield> field of
+     <structname>ResultRelInfo</structname> is available for the FDW to store any
      private state it needs for this operation.)
-     <literal>fdw_private</> contains the private data generated by
-     <function>PlanForeignModify</>, if any.
-     <literal>subplan_index</> identifies which target of
-     the <structname>ModifyTable</> plan node this is.
-     <literal>eflags</> contains flag bits describing the executor's
+     <literal>fdw_private</literal> contains the private data generated by
+     <function>PlanForeignModify</function>, if any.
+     <literal>subplan_index</literal> identifies which target of
+     the <structname>ModifyTable</structname> plan node this is.
+     <literal>eflags</literal> contains flag bits describing the executor's
      operating mode for this plan node.
     </para>
 
     <para>
-     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</> is
+     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</literal> is
      true, this function should not perform any externally-visible actions;
      it should only do the minimum required to make the node state valid
-     for <function>ExplainForeignModify</> and <function>EndForeignModify</>.
+     for <function>ExplainForeignModify</function> and <function>EndForeignModify</function>.
     </para>
 
     <para>
-     If the <function>BeginForeignModify</> pointer is set to
-     <literal>NULL</>, no action is taken during executor startup.
+     If the <function>BeginForeignModify</function> pointer is set to
+     <literal>NULL</literal>, no action is taken during executor startup.
     </para>
 
     <para>
 <programlisting>
 TupleTableSlot *
-ExecForeignInsert (EState *estate,
-                   ResultRelInfo *rinfo,
-                   TupleTableSlot *slot,
-                   TupleTableSlot *planSlot);
+ExecForeignInsert(EState *estate,
+                  ResultRelInfo *rinfo,
+                  TupleTableSlot *slot,
+                  TupleTableSlot *planSlot);
 </programlisting>
 
      Insert one tuple into the foreign table.
-     <literal>estate</> is global execution state for the query.
-     <literal>rinfo</> is the <structname>ResultRelInfo</> struct describing
+     <literal>estate</literal> is global execution state for the query.
+     <literal>rinfo</literal> is the <structname>ResultRelInfo</structname> struct describing
      the target foreign table.
-     <literal>slot</> contains the tuple to be inserted; it will match the
+     <literal>slot</literal> contains the tuple to be inserted; it will match the
      row-type definition of the foreign table.
-     <literal>planSlot</> contains the tuple that was generated by the
-     <structname>ModifyTable</> plan node's subplan; it differs from
-     <literal>slot</> in possibly containing additional <quote>junk</>
-     columns.  (The <literal>planSlot</> is typically of little interest
-     for <command>INSERT</> cases, but is provided for completeness.)
+     <literal>planSlot</literal> contains the tuple that was generated by the
+     <structname>ModifyTable</structname> plan node's subplan; it differs from
+     <literal>slot</literal> in possibly containing additional <quote>junk</quote>
+     columns.  (The <literal>planSlot</literal> is typically of little interest
+     for <command>INSERT</command> cases, but is provided for completeness.)
     </para>
 
     <para>
@@ -560,45 +563,45 @@ ExecForeignInsert (EState *estate,
      inserted (this might differ from the data supplied, for example as a
      result of trigger actions), or NULL if no row was actually inserted
      (again, typically as a result of triggers).  The passed-in
-     <literal>slot</> can be re-used for this purpose.
+     <literal>slot</literal> can be re-used for this purpose.
     </para>
 
     <para>
-     The data in the returned slot is used only if the <command>INSERT</>
-     query has a <literal>RETURNING</> clause or the foreign table has
-     an <literal>AFTER ROW</> trigger.  Triggers require all columns, but the
+     The data in the returned slot is used only if the <command>INSERT</command>
+     query has a <literal>RETURNING</literal> clause or the foreign table has
+     an <literal>AFTER ROW</literal> trigger.  Triggers require all columns, but the
      FDW could choose to optimize away returning some or all columns depending
-     on the contents of the <literal>RETURNING</> clause.  Regardless, some
+     on the contents of the <literal>RETURNING</literal> clause.  Regardless, some
      slot must be returned to indicate success, or the query's reported row
      count will be wrong.
     </para>
 
     <para>
-     If the <function>ExecForeignInsert</> pointer is set to
-     <literal>NULL</>, attempts to insert into the foreign table will fail
+     If the <function>ExecForeignInsert</function> pointer is set to
+     <literal>NULL</literal>, attempts to insert into the foreign table will fail
      with an error message.
     </para>
 
     <para>
 <programlisting>
 TupleTableSlot *
-ExecForeignUpdate (EState *estate,
-                   ResultRelInfo *rinfo,
-                   TupleTableSlot *slot,
-                   TupleTableSlot *planSlot);
+ExecForeignUpdate(EState *estate,
+                  ResultRelInfo *rinfo,
+                  TupleTableSlot *slot,
+                  TupleTableSlot *planSlot);
 </programlisting>
 
      Update one tuple in the foreign table.
-     <literal>estate</> is global execution state for the query.
-     <literal>rinfo</> is the <structname>ResultRelInfo</> struct describing
+     <literal>estate</literal> is global execution state for the query.
+     <literal>rinfo</literal> is the <structname>ResultRelInfo</structname> struct describing
      the target foreign table.
-     <literal>slot</> contains the new data for the tuple; it will match the
+     <literal>slot</literal> contains the new data for the tuple; it will match the
      row-type definition of the foreign table.
-     <literal>planSlot</> contains the tuple that was generated by the
-     <structname>ModifyTable</> plan node's subplan; it differs from
-     <literal>slot</> in possibly containing additional <quote>junk</>
+     <literal>planSlot</literal> contains the tuple that was generated by the
+     <structname>ModifyTable</structname> plan node's subplan; it differs from
+     <literal>slot</literal> in possibly containing additional <quote>junk</quote>
      columns.  In particular, any junk columns that were requested by
-     <function>AddForeignUpdateTargets</> will be available from this slot.
+     <function>AddForeignUpdateTargets</function> will be available from this slot.
     </para>
 
     <para>
@@ -606,74 +609,74 @@ ExecForeignUpdate (EState *estate,
      updated (this might differ from the data supplied, for example as a
      result of trigger actions), or NULL if no row was actually updated
      (again, typically as a result of triggers).  The passed-in
-     <literal>slot</> can be re-used for this purpose.
+     <literal>slot</literal> can be re-used for this purpose.
     </para>
 
     <para>
-     The data in the returned slot is used only if the <command>UPDATE</>
-     query has a <literal>RETURNING</> clause or the foreign table has
-     an <literal>AFTER ROW</> trigger.  Triggers require all columns, but the
+     The data in the returned slot is used only if the <command>UPDATE</command>
+     query has a <literal>RETURNING</literal> clause or the foreign table has
+     an <literal>AFTER ROW</literal> trigger.  Triggers require all columns, but the
      FDW could choose to optimize away returning some or all columns depending
-     on the contents of the <literal>RETURNING</> clause.  Regardless, some
+     on the contents of the <literal>RETURNING</literal> clause.  Regardless, some
      slot must be returned to indicate success, or the query's reported row
      count will be wrong.
     </para>
 
     <para>
-     If the <function>ExecForeignUpdate</> pointer is set to
-     <literal>NULL</>, attempts to update the foreign table will fail
+     If the <function>ExecForeignUpdate</function> pointer is set to
+     <literal>NULL</literal>, attempts to update the foreign table will fail
      with an error message.
     </para>
 
     <para>
 <programlisting>
 TupleTableSlot *
-ExecForeignDelete (EState *estate,
-                   ResultRelInfo *rinfo,
-                   TupleTableSlot *slot,
-                   TupleTableSlot *planSlot);
+ExecForeignDelete(EState *estate,
+                  ResultRelInfo *rinfo,
+                  TupleTableSlot *slot,
+                  TupleTableSlot *planSlot);
 </programlisting>
 
      Delete one tuple from the foreign table.
-     <literal>estate</> is global execution state for the query.
-     <literal>rinfo</> is the <structname>ResultRelInfo</> struct describing
+     <literal>estate</literal> is global execution state for the query.
+     <literal>rinfo</literal> is the <structname>ResultRelInfo</structname> struct describing
      the target foreign table.
-     <literal>slot</> contains nothing useful upon call, but can be used to
+     <literal>slot</literal> contains nothing useful upon call, but can be used to
      hold the returned tuple.
-     <literal>planSlot</> contains the tuple that was generated by the
-     <structname>ModifyTable</> plan node's subplan; in particular, it will
+     <literal>planSlot</literal> contains the tuple that was generated by the
+     <structname>ModifyTable</structname> plan node's subplan; in particular, it will
      carry any junk columns that were requested by
-     <function>AddForeignUpdateTargets</>.  The junk column(s) must be used
+     <function>AddForeignUpdateTargets</function>.  The junk column(s) must be used
      to identify the tuple to be deleted.
     </para>
 
     <para>
      The return value is either a slot containing the row that was deleted,
      or NULL if no row was deleted (typically as a result of triggers).  The
-     passed-in <literal>slot</> can be used to hold the tuple to be returned.
+     passed-in <literal>slot</literal> can be used to hold the tuple to be returned.
     </para>
 
     <para>
-     The data in the returned slot is used only if the <command>DELETE</>
-     query has a <literal>RETURNING</> clause or the foreign table has
-     an <literal>AFTER ROW</> trigger.  Triggers require all columns, but the
+     The data in the returned slot is used only if the <command>DELETE</command>
+     query has a <literal>RETURNING</literal> clause or the foreign table has
+     an <literal>AFTER ROW</literal> trigger.  Triggers require all columns, but the
      FDW could choose to optimize away returning some or all columns depending
-     on the contents of the <literal>RETURNING</> clause.  Regardless, some
+     on the contents of the <literal>RETURNING</literal> clause.  Regardless, some
      slot must be returned to indicate success, or the query's reported row
      count will be wrong.
     </para>
 
     <para>
-     If the <function>ExecForeignDelete</> pointer is set to
-     <literal>NULL</>, attempts to delete from the foreign table will fail
+     If the <function>ExecForeignDelete</function> pointer is set to
+     <literal>NULL</literal>, attempts to delete from the foreign table will fail
      with an error message.
     </para>
 
     <para>
 <programlisting>
 void
-EndForeignModify (EState *estate,
-                  ResultRelInfo *rinfo);
+EndForeignModify(EState *estate,
+                 ResultRelInfo *rinfo);
 </programlisting>
 
      End the table update and release resources.  It is normally not important
@@ -682,35 +685,35 @@ EndForeignModify (EState *estate,
     </para>
 
     <para>
-     If the <function>EndForeignModify</> pointer is set to
-     <literal>NULL</>, no action is taken during executor shutdown.
+     If the <function>EndForeignModify</function> pointer is set to
+     <literal>NULL</literal>, no action is taken during executor shutdown.
     </para>
 
     <para>
 <programlisting>
 int
-IsForeignRelUpdatable (Relation rel);
+IsForeignRelUpdatable(Relation rel);
 </programlisting>
 
      Report which update operations the specified foreign table supports.
      The return value should be a bit mask of rule event numbers indicating
      which operations are supported by the foreign table, using the
-     <literal>CmdType</> enumeration; that is,
-     <literal>(1 << CMD_UPDATE) = 4</> for <command>UPDATE</>,
-     <literal>(1 << CMD_INSERT) = 8</> for <command>INSERT</>, and
-     <literal>(1 << CMD_DELETE) = 16</> for <command>DELETE</>.
+     <literal>CmdType</literal> enumeration; that is,
+     <literal>(1 &lt;&lt; CMD_UPDATE) = 4</literal> for <command>UPDATE</command>,
+     <literal>(1 &lt;&lt; CMD_INSERT) = 8</literal> for <command>INSERT</command>, and
+     <literal>(1 &lt;&lt; CMD_DELETE) = 16</literal> for <command>DELETE</command>.
     </para>
 
     <para>
-     If the <function>IsForeignRelUpdatable</> pointer is set to
-     <literal>NULL</>, foreign tables are assumed to be insertable, updatable,
-     or deletable if the FDW provides <function>ExecForeignInsert</>,
-     <function>ExecForeignUpdate</>, or <function>ExecForeignDelete</>
+     If the <function>IsForeignRelUpdatable</function> pointer is set to
+     <literal>NULL</literal>, foreign tables are assumed to be insertable, updatable,
+     or deletable if the FDW provides <function>ExecForeignInsert</function>,
+     <function>ExecForeignUpdate</function>, or <function>ExecForeignDelete</function>
      respectively.  This function is only needed if the FDW supports some
      tables that are updatable and some that are not.  (Even then, it's
      permissible to throw an error in the execution routine instead of
      checking in this function.  However, this function is used to determine
-     updatability for display in the <literal>information_schema</> views.)
+     updatability for display in the <literal>information_schema</literal> views.)
     </para>
 
     <para>
@@ -729,129 +732,129 @@ IsForeignRelUpdatable (Relation rel);
     <para>
 <programlisting>
 bool
-PlanDirectModify (PlannerInfo *root,
-                  ModifyTable *plan,
-                  Index resultRelation,
-                  int subplan_index);
+PlanDirectModify(PlannerInfo *root,
+                 ModifyTable *plan,
+                 Index resultRelation,
+                 int subplan_index);
 </programlisting>
 
      Decide whether it is safe to execute a direct modification
-     on the remote server.  If so, return <literal>true</> after performing
-     planning actions needed for that.  Otherwise, return <literal>false</>.
+     on the remote server.  If so, return <literal>true</literal> after performing
+     planning actions needed for that.  Otherwise, return <literal>false</literal>.
      This optional function is called during query planning.
-     If this function succeeds, <function>BeginDirectModify</>,
-     <function>IterateDirectModify</> and <function>EndDirectModify</> will
+     If this function succeeds, <function>BeginDirectModify</function>,
+     <function>IterateDirectModify</function> and <function>EndDirectModify</function> will
      be called at the execution stage, instead.  Otherwise, the table
      modification will be executed using the table-updating functions
      described above.
-     The parameters are the same as for <function>PlanForeignModify</>.
+     The parameters are the same as for <function>PlanForeignModify</function>.
     </para>
 
     <para>
      To execute the direct modification on the remote server, this function
-     must rewrite the target subplan with a <structname>ForeignScan</> plan
+     must rewrite the target subplan with a <structname>ForeignScan</structname> plan
      node that executes the direct modification on the remote server.  The
-     <structfield>operation</> field of the <structname>ForeignScan</> must
-     be set to the <literal>CmdType</> enumeration appropriately; that is,
-     <literal>CMD_UPDATE</> for <command>UPDATE</>,
-     <literal>CMD_INSERT</> for <command>INSERT</>, and
-     <literal>CMD_DELETE</> for <command>DELETE</>.
+     <structfield>operation</structfield> field of the <structname>ForeignScan</structname> must
+     be set to the <literal>CmdType</literal> enumeration appropriately; that is,
+     <literal>CMD_UPDATE</literal> for <command>UPDATE</command>,
+     <literal>CMD_INSERT</literal> for <command>INSERT</command>, and
+     <literal>CMD_DELETE</literal> for <command>DELETE</command>.
     </para>
 
     <para>
-     See <xref linkend="fdw-planning"> for additional information.
+     See <xref linkend="fdw-planning"/> for additional information.
     </para>
 
     <para>
-     If the <function>PlanDirectModify</> pointer is set to
-     <literal>NULL</>, no attempts to execute a direct modification on the
+     If the <function>PlanDirectModify</function> pointer is set to
+     <literal>NULL</literal>, no attempts to execute a direct modification on the
      remote server are taken.
     </para>
 
     <para>
 <programlisting>
 void
-BeginDirectModify (ForeignScanState *node,
-                   int eflags);
+BeginDirectModify(ForeignScanState *node,
+                  int eflags);
 </programlisting>
 
      Prepare to execute a direct modification on the remote server.
      This is called during executor startup.  It should perform any
      initialization needed prior to the direct modification (that should be
-     done upon the first call to <function>IterateDirectModify</>).
-     The <structname>ForeignScanState</> node has already been created, but
-     its <structfield>fdw_state</> field is still NULL.  Information about
+     done upon the first call to <function>IterateDirectModify</function>).
+     The <structname>ForeignScanState</structname> node has already been created, but
+     its <structfield>fdw_state</structfield> field is still NULL.  Information about
      the table to modify is accessible through the
-     <structname>ForeignScanState</> node (in particular, from the underlying
-     <structname>ForeignScan</> plan node, which contains any FDW-private
-     information provided by <function>PlanDirectModify</>).
-     <literal>eflags</> contains flag bits describing the executor's
+     <structname>ForeignScanState</structname> node (in particular, from the underlying
+     <structname>ForeignScan</structname> plan node, which contains any FDW-private
+     information provided by <function>PlanDirectModify</function>).
+     <literal>eflags</literal> contains flag bits describing the executor's
      operating mode for this plan node.
     </para>
 
     <para>
-     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</> is
+     Note that when <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</literal> is
      true, this function should not perform any externally-visible actions;
      it should only do the minimum required to make the node state valid
-     for <function>ExplainDirectModify</> and <function>EndDirectModify</>.
+     for <function>ExplainDirectModify</function> and <function>EndDirectModify</function>.
     </para>
 
     <para>
-     If the <function>BeginDirectModify</> pointer is set to
-     <literal>NULL</>, no attempts to execute a direct modification on the
+     If the <function>BeginDirectModify</function> pointer is set to
+     <literal>NULL</literal>, no attempts to execute a direct modification on the
      remote server are taken.
     </para>
 
     <para>
 <programlisting>
 TupleTableSlot *
-IterateDirectModify (ForeignScanState *node);
+IterateDirectModify(ForeignScanState *node);
 </programlisting>
 
-     When the <command>INSERT</>, <command>UPDATE</> or <command>DELETE</>
-     query doesn't have a <literal>RETURNING</> clause, just return NULL
+     When the <command>INSERT</command>, <command>UPDATE</command> or <command>DELETE</command>
+     query doesn't have a <literal>RETURNING</literal> clause, just return NULL
      after a direct modification on the remote server.
      When the query has the clause, fetch one result containing the data
-     needed for the <literal>RETURNING</> calculation, returning it in a
-     tuple table slot (the node's <structfield>ScanTupleSlot</> should be
+     needed for the <literal>RETURNING</literal> calculation, returning it in a
+     tuple table slot (the node's <structfield>ScanTupleSlot</structfield> should be
      used for this purpose).  The data that was actually inserted, updated
      or deleted must be stored in the
-     <literal>es_result_relation_info-&gt;ri_projectReturning-&gt;pi_exprContext-&gt;ecxt_scantuple</>
-     of the node's <structname>EState</>.
+     <literal>es_result_relation_info-&gt;ri_projectReturning-&gt;pi_exprContext-&gt;ecxt_scantuple</literal>
+     of the node's <structname>EState</structname>.
      Return NULL if no more rows are available.
      Note that this is called in a short-lived memory context that will be
      reset between invocations.  Create a memory context in
-     <function>BeginDirectModify</> if you need longer-lived storage, or use
-     the <structfield>es_query_cxt</> of the node's <structname>EState</>.
+     <function>BeginDirectModify</function> if you need longer-lived storage, or use
+     the <structfield>es_query_cxt</structfield> of the node's <structname>EState</structname>.
     </para>
 
     <para>
-     The rows returned must match the <structfield>fdw_scan_tlist</> target
+     The rows returned must match the <structfield>fdw_scan_tlist</structfield> target
      list if one was supplied, otherwise they must match the row type of the
      foreign table being updated.  If you choose to optimize away fetching
-     columns that are not needed for the <literal>RETURNING</> calculation,
+     columns that are not needed for the <literal>RETURNING</literal> calculation,
      you should insert nulls in those column positions, or else generate a
-     <structfield>fdw_scan_tlist</> list with those columns omitted.
+     <structfield>fdw_scan_tlist</structfield> list with those columns omitted.
     </para>
 
     <para>
      Whether the query has the clause or not, the query's reported row count
      must be incremented by the FDW itself.  When the query doesn't have the
      clause, the FDW must also increment the row count for the
-     <structname>ForeignScanState</> node in the <command>EXPLAIN ANALYZE</>
+     <structname>ForeignScanState</structname> node in the <command>EXPLAIN ANALYZE</command>
      case.
     </para>
 
     <para>
-     If the <function>IterateDirectModify</> pointer is set to
-     <literal>NULL</>, no attempts to execute a direct modification on the
+     If the <function>IterateDirectModify</function> pointer is set to
+     <literal>NULL</literal>, no attempts to execute a direct modification on the
      remote server are taken.
     </para>
 
     <para>
 <programlisting>
 void
-EndDirectModify (ForeignScanState *node);
+EndDirectModify(ForeignScanState *node);
 </programlisting>
 
      Clean up following a direct modification on the remote server.  It is
@@ -860,8 +863,8 @@ EndDirectModify (ForeignScanState *node);
     </para>
 
     <para>
-     If the <function>EndDirectModify</> pointer is set to
-     <literal>NULL</>, no attempts to execute a direct modification on the
+     If the <function>EndDirectModify</function> pointer is set to
+     <literal>NULL</literal>, no attempts to execute a direct modification on the
      remote server are taken.
     </para>
 
@@ -871,117 +874,118 @@ EndDirectModify (ForeignScanState *node);
     <title>FDW Routines For Row Locking</title>
 
     <para>
-     If an FDW wishes to support <firstterm>late row locking</> (as described
-     in <xref linkend="fdw-row-locking">), it must provide the following
+     If an FDW wishes to support <firstterm>late row locking</firstterm> (as described
+     in <xref linkend="fdw-row-locking"/>), it must provide the following
      callback functions:
     </para>
 
     <para>
 <programlisting>
 RowMarkType
-GetForeignRowMarkType (RangeTblEntry *rte,
-                       LockClauseStrength strength);
+GetForeignRowMarkType(RangeTblEntry *rte,
+                      LockClauseStrength strength);
 </programlisting>
 
      Report which row-marking option to use for a foreign table.
-     <literal>rte</> is the <structname>RangeTblEntry</> node for the table
-     and <literal>strength</> describes the lock strength requested by the
-     relevant <literal>FOR UPDATE/SHARE</> clause, if any.  The result must be
-     a member of the <literal>RowMarkType</> enum type.
+     <literal>rte</literal> is the <structname>RangeTblEntry</structname> node for the table
+     and <literal>strength</literal> describes the lock strength requested by the
+     relevant <literal>FOR UPDATE/SHARE</literal> clause, if any.  The result must be
+     a member of the <literal>RowMarkType</literal> enum type.
     </para>
 
     <para>
      This function is called during query planning for each foreign table that
-     appears in an <command>UPDATE</>, <command>DELETE</>, or <command>SELECT
-     FOR UPDATE/SHARE</> query and is not the target of <command>UPDATE</>
-     or <command>DELETE</>.
+     appears in an <command>UPDATE</command>, <command>DELETE</command>, or <command>SELECT
+     FOR UPDATE/SHARE</command> query and is not the target of <command>UPDATE</command>
+     or <command>DELETE</command>.
     </para>
 
     <para>
-     If the <function>GetForeignRowMarkType</> pointer is set to
-     <literal>NULL</>, the <literal>ROW_MARK_COPY</> option is always used.
-     (This implies that <function>RefetchForeignRow</> will never be called,
+     If the <function>GetForeignRowMarkType</function> pointer is set to
+     <literal>NULL</literal>, the <literal>ROW_MARK_COPY</literal> option is always used.
+     (This implies that <function>RefetchForeignRow</function> will never be called,
      so it need not be provided either.)
     </para>
 
     <para>
-     See <xref linkend="fdw-row-locking"> for more information.
+     See <xref linkend="fdw-row-locking"/> for more information.
     </para>
 
     <para>
 <programlisting>
 HeapTuple
-RefetchForeignRow (EState *estate,
-                   ExecRowMark *erm,
-                   Datum rowid,
-                   bool *updated);
+RefetchForeignRow(EState *estate,
+                  ExecRowMark *erm,
+                  Datum rowid,
+                  bool *updated);
 </programlisting>
 
      Re-fetch one tuple from the foreign table, after locking it if required.
-     <literal>estate</> is global execution state for the query.
-     <literal>erm</> is the <structname>ExecRowMark</> struct describing
+     <literal>estate</literal> is global execution state for the query.
+     <literal>erm</literal> is the <structname>ExecRowMark</structname> struct describing
      the target foreign table and the row lock type (if any) to acquire.
-     <literal>rowid</> identifies the tuple to be fetched.
-     <literal>updated</> is an output parameter.
+     <literal>rowid</literal> identifies the tuple to be fetched.
+     <literal>updated</literal> is an output parameter.
     </para>
 
     <para>
      This function should return a palloc'ed copy of the fetched tuple,
-     or <literal>NULL</> if the row lock couldn't be obtained.  The row lock
-     type to acquire is defined by <literal>erm-&gt;markType</>, which is the
-     value previously returned by <function>GetForeignRowMarkType</>.
-     (<literal>ROW_MARK_REFERENCE</> means to just re-fetch the tuple without
-     acquiring any lock, and <literal>ROW_MARK_COPY</> will never be seen by
+     or <literal>NULL</literal> if the row lock couldn't be obtained.  The row lock
+     type to acquire is defined by <literal>erm-&gt;markType</literal>, which is the
+     value previously returned by <function>GetForeignRowMarkType</function>.
+     (<literal>ROW_MARK_REFERENCE</literal> means to just re-fetch the tuple without
+     acquiring any lock, and <literal>ROW_MARK_COPY</literal> will never be seen by
      this routine.)
     </para>
 
     <para>
-     In addition, <literal>*updated</> should be set to <literal>true</>
+     In addition, <literal>*updated</literal> should be set to <literal>true</literal>
      if what was fetched was an updated version of the tuple rather than
      the same version previously obtained.  (If the FDW cannot be sure about
-     this, always returning <literal>true</> is recommended.)
+     this, always returning <literal>true</literal> is recommended.)
     </para>
 
     <para>
      Note that by default, failure to acquire a row lock should result in
-     raising an error; a <literal>NULL</> return is only appropriate if
-     the <literal>SKIP LOCKED</> option is specified
-     by <literal>erm-&gt;waitPolicy</>.
+     raising an error; a <literal>NULL</literal> return is only appropriate if
+     the <literal>SKIP LOCKED</literal> option is specified
+     by <literal>erm-&gt;waitPolicy</literal>.
     </para>
 
     <para>
-     The <literal>rowid</> is the <structfield>ctid</> value previously read
-     for the row to be re-fetched.  Although the <literal>rowid</> value is
-     passed as a <type>Datum</>, it can currently only be a <type>tid</>.  The
+     The <literal>rowid</literal> is the <structfield>ctid</structfield> value previously read
+     for the row to be re-fetched.  Although the <literal>rowid</literal> value is
+     passed as a <type>Datum</type>, it can currently only be a <type>tid</type>.  The
      function API is chosen in hopes that it may be possible to allow other
      data types for row IDs in future.
     </para>
 
     <para>
-     If the <function>RefetchForeignRow</> pointer is set to
-     <literal>NULL</>, attempts to re-fetch rows will fail
+     If the <function>RefetchForeignRow</function> pointer is set to
+     <literal>NULL</literal>, attempts to re-fetch rows will fail
      with an error message.
     </para>
 
     <para>
-     See <xref linkend="fdw-row-locking"> for more information.
+     See <xref linkend="fdw-row-locking"/> for more information.
     </para>
 
     <para>
 <programlisting>
 bool
-RecheckForeignScan (ForeignScanState *node, TupleTableSlot *slot);
+RecheckForeignScan(ForeignScanState *node,
+                   TupleTableSlot *slot);
 </programlisting>
      Recheck that a previously-returned tuple still matches the relevant
      scan and join qualifiers, and possibly provide a modified version of
      the tuple.  For foreign data wrappers which do not perform join pushdown,
-     it will typically be more convenient to set this to <literal>NULL</> and
+     it will typically be more convenient to set this to <literal>NULL</literal> and
      instead set <structfield>fdw_recheck_quals</structfield> appropriately.
      When outer joins are pushed down, however, it isn't sufficient to
      reapply the checks relevant to all the base tables to the result tuple,
      even if all needed attributes are present, because failure to match some
      qualifier might result in some attributes going to NULL, rather than in
-     no tuple being returned.  <literal>RecheckForeignScan</> can recheck
+     no tuple being returned.  <literal>RecheckForeignScan</literal> can recheck
      qualifiers and return true if they are still satisfied and false
      otherwise, but it can also store a replacement tuple into the supplied
      slot.
@@ -991,13 +995,13 @@ RecheckForeignScan (ForeignScanState *node, TupleTableSlot *slot);
      To implement join pushdown, a foreign data wrapper will typically
      construct an alternative local join plan which is used only for
      rechecks; this will become the outer subplan of the
-     <literal>ForeignScan</>.  When a recheck is required, this subplan
+     <literal>ForeignScan</literal>.  When a recheck is required, this subplan
      can be executed and the resulting tuple can be stored in the slot.
      This plan need not be efficient since no base table will return more
      than one row; for example, it may implement all joins as nested loops.
-     The function <literal>GetExistingLocalJoinPath</> may be used to search
+     The function <literal>GetExistingLocalJoinPath</literal> may be used to search
      existing paths for a suitable local join path, which can be used as the
-     alternative local join plan.  <literal>GetExistingLocalJoinPath</>
+     alternative local join plan.  <literal>GetExistingLocalJoinPath</literal>
      searches for an unparameterized path in the path list of the specified
      join relation.  (If it does not find such a path, it returns NULL, in
      which case a foreign data wrapper may build the local path by itself or
@@ -1006,182 +1010,184 @@ RecheckForeignScan (ForeignScanState *node, TupleTableSlot *slot);
    </sect2>
 
    <sect2 id="fdw-callbacks-explain">
-    <title>FDW Routines for <command>EXPLAIN</></title>
+    <title>FDW Routines for <command>EXPLAIN</command></title>
 
     <para>
 <programlisting>
 void
-ExplainForeignScan (ForeignScanState *node,
-                    ExplainState *es);
+ExplainForeignScan(ForeignScanState *node,
+                   ExplainState *es);
 </programlisting>
 
-     Print additional <command>EXPLAIN</> output for a foreign table scan.
-     This function can call <function>ExplainPropertyText</> and
-     related functions to add fields to the <command>EXPLAIN</> output.
-     The flag fields in <literal>es</> can be used to determine what to
-     print, and the state of the <structname>ForeignScanState</> node
+     Print additional <command>EXPLAIN</command> output for a foreign table scan.
+     This function can call <function>ExplainPropertyText</function> and
+     related functions to add fields to the <command>EXPLAIN</command> output.
+     The flag fields in <literal>es</literal> can be used to determine what to
+     print, and the state of the <structname>ForeignScanState</structname> node
      can be inspected to provide run-time statistics in the <command>EXPLAIN
-     ANALYZE</> case.
+     ANALYZE</command> case.
     </para>
 
     <para>
-     If the <function>ExplainForeignScan</> pointer is set to
-     <literal>NULL</>, no additional information is printed during
-     <command>EXPLAIN</>.
+     If the <function>ExplainForeignScan</function> pointer is set to
+     <literal>NULL</literal>, no additional information is printed during
+     <command>EXPLAIN</command>.
     </para>
 
     <para>
 <programlisting>
 void
-ExplainForeignModify (ModifyTableState *mtstate,
-                      ResultRelInfo *rinfo,
-                      List *fdw_private,
-                      int subplan_index,
-                      struct ExplainState *es);
+ExplainForeignModify(ModifyTableState *mtstate,
+                     ResultRelInfo *rinfo,
+                     List *fdw_private,
+                     int subplan_index,
+                     struct ExplainState *es);
 </programlisting>
 
-     Print additional <command>EXPLAIN</> output for a foreign table update.
-     This function can call <function>ExplainPropertyText</> and
-     related functions to add fields to the <command>EXPLAIN</> output.
-     The flag fields in <literal>es</> can be used to determine what to
-     print, and the state of the <structname>ModifyTableState</> node
+     Print additional <command>EXPLAIN</command> output for a foreign table update.
+     This function can call <function>ExplainPropertyText</function> and
+     related functions to add fields to the <command>EXPLAIN</command> output.
+     The flag fields in <literal>es</literal> can be used to determine what to
+     print, and the state of the <structname>ModifyTableState</structname> node
      can be inspected to provide run-time statistics in the <command>EXPLAIN
-     ANALYZE</> case.  The first four arguments are the same as for
-     <function>BeginForeignModify</>.
+     ANALYZE</command> case.  The first four arguments are the same as for
+     <function>BeginForeignModify</function>.
     </para>
 
     <para>
-     If the <function>ExplainForeignModify</> pointer is set to
-     <literal>NULL</>, no additional information is printed during
-     <command>EXPLAIN</>.
+     If the <function>ExplainForeignModify</function> pointer is set to
+     <literal>NULL</literal>, no additional information is printed during
+     <command>EXPLAIN</command>.
     </para>
 
     <para>
 <programlisting>
 void
-ExplainDirectModify (ForeignScanState *node,
-                     ExplainState *es);
+ExplainDirectModify(ForeignScanState *node,
+                    ExplainState *es);
 </programlisting>
 
-     Print additional <command>EXPLAIN</> output for a direct modification
+     Print additional <command>EXPLAIN</command> output for a direct modification
      on the remote server.
-     This function can call <function>ExplainPropertyText</> and
-     related functions to add fields to the <command>EXPLAIN</> output.
-     The flag fields in <literal>es</> can be used to determine what to
-     print, and the state of the <structname>ForeignScanState</> node
+     This function can call <function>ExplainPropertyText</function> and
+     related functions to add fields to the <command>EXPLAIN</command> output.
+     The flag fields in <literal>es</literal> can be used to determine what to
+     print, and the state of the <structname>ForeignScanState</structname> node
      can be inspected to provide run-time statistics in the <command>EXPLAIN
-     ANALYZE</> case.
+     ANALYZE</command> case.
     </para>
 
     <para>
-     If the <function>ExplainDirectModify</> pointer is set to
-     <literal>NULL</>, no additional information is printed during
-     <command>EXPLAIN</>.
+     If the <function>ExplainDirectModify</function> pointer is set to
+     <literal>NULL</literal>, no additional information is printed during
+     <command>EXPLAIN</command>.
     </para>
 
    </sect2>
 
    <sect2 id="fdw-callbacks-analyze">
-    <title>FDW Routines for <command>ANALYZE</></title>
+    <title>FDW Routines for <command>ANALYZE</command></title>
 
     <para>
 <programlisting>
 bool
-AnalyzeForeignTable (Relation relation,
-                     AcquireSampleRowsFunc *func,
-                     BlockNumber *totalpages);
+AnalyzeForeignTable(Relation relation,
+                    AcquireSampleRowsFunc *func,
+                    BlockNumber *totalpages);
 </programlisting>
 
-     This function is called when <xref linkend="sql-analyze"> is executed on
+     This function is called when <xref linkend="sql-analyze"/> is executed on
      a foreign table.  If the FDW can collect statistics for this
-     foreign table, it should return <literal>true</>, and provide a pointer
+     foreign table, it should return <literal>true</literal>, and provide a pointer
      to a function that will collect sample rows from the table in
-     <parameter>func</>, plus the estimated size of the table in pages in
-     <parameter>totalpages</>.  Otherwise, return <literal>false</>.
+     <parameter>func</parameter>, plus the estimated size of the table in pages in
+     <parameter>totalpages</parameter>.  Otherwise, return <literal>false</literal>.
     </para>
 
     <para>
      If the FDW does not support collecting statistics for any tables, the
-     <function>AnalyzeForeignTable</> pointer can be set to <literal>NULL</>.
+     <function>AnalyzeForeignTable</function> pointer can be set to <literal>NULL</literal>.
     </para>
 
     <para>
      If provided, the sample collection function must have the signature
 <programlisting>
 int
-AcquireSampleRowsFunc (Relation relation, int elevel,
-                       HeapTuple *rows, int targrows,
-                       double *totalrows,
-                       double *totaldeadrows);
+AcquireSampleRowsFunc(Relation relation,
+                      int elevel,
+                      HeapTuple *rows,
+                      int targrows,
+                      double *totalrows,
+                      double *totaldeadrows);
 </programlisting>
 
-     A random sample of up to <parameter>targrows</> rows should be collected
-     from the table and stored into the caller-provided <parameter>rows</>
+     A random sample of up to <parameter>targrows</parameter> rows should be collected
+     from the table and stored into the caller-provided <parameter>rows</parameter>
      array.  The actual number of rows collected must be returned.  In
      addition, store estimates of the total numbers of live and dead rows in
-     the table into the output parameters <parameter>totalrows</> and
-     <parameter>totaldeadrows</>.  (Set <parameter>totaldeadrows</> to zero
+     the table into the output parameters <parameter>totalrows</parameter> and
+     <parameter>totaldeadrows</parameter>.  (Set <parameter>totaldeadrows</parameter> to zero
      if the FDW does not have any concept of dead rows.)
     </para>
 
    </sect2>
 
    <sect2 id="fdw-callbacks-import">
-    <title>FDW Routines For <command>IMPORT FOREIGN SCHEMA</></title>
+    <title>FDW Routines For <command>IMPORT FOREIGN SCHEMA</command></title>
 
     <para>
 <programlisting>
 List *
-ImportForeignSchema (ImportForeignSchemaStmt *stmt, Oid serverOid);
+ImportForeignSchema(ImportForeignSchemaStmt *stmt, Oid serverOid);
 </programlisting>
 
      Obtain a list of foreign table creation commands.  This function is
-     called when executing <xref linkend="sql-importforeignschema">, and is
+     called when executing <xref linkend="sql-importforeignschema"/>, and is
      passed the parse tree for that statement, as well as the OID of the
      foreign server to use.  It should return a list of C strings, each of
-     which must contain a <xref linkend="sql-createforeigntable"> command.
+     which must contain a <xref linkend="sql-createforeigntable"/> command.
      These strings will be parsed and executed by the core server.
     </para>
 
     <para>
-     Within the <structname>ImportForeignSchemaStmt</> struct,
-     <structfield>remote_schema</> is the name of the remote schema from
+     Within the <structname>ImportForeignSchemaStmt</structname> struct,
+     <structfield>remote_schema</structfield> is the name of the remote schema from
      which tables are to be imported.
-     <structfield>list_type</> identifies how to filter table names:
-     <literal>FDW_IMPORT_SCHEMA_ALL</> means that all tables in the remote
-     schema should be imported (in this case <structfield>table_list</> is
-     empty), <literal>FDW_IMPORT_SCHEMA_LIMIT_TO</> means to include only
-     tables listed in <structfield>table_list</>,
-     and <literal>FDW_IMPORT_SCHEMA_EXCEPT</> means to exclude the tables
-     listed in <structfield>table_list</>.
-     <structfield>options</> is a list of options used for the import process.
+     <structfield>list_type</structfield> identifies how to filter table names:
+     <literal>FDW_IMPORT_SCHEMA_ALL</literal> means that all tables in the remote
+     schema should be imported (in this case <structfield>table_list</structfield> is
+     empty), <literal>FDW_IMPORT_SCHEMA_LIMIT_TO</literal> means to include only
+     tables listed in <structfield>table_list</structfield>,
+     and <literal>FDW_IMPORT_SCHEMA_EXCEPT</literal> means to exclude the tables
+     listed in <structfield>table_list</structfield>.
+     <structfield>options</structfield> is a list of options used for the import process.
      The meanings of the options are up to the FDW.
      For example, an FDW could use an option to define whether the
-     <literal>NOT NULL</> attributes of columns should be imported.
+     <literal>NOT NULL</literal> attributes of columns should be imported.
      These options need not have anything to do with those supported by the
      FDW as database object options.
     </para>
 
     <para>
-     The FDW may ignore the <structfield>local_schema</> field of
-     the <structname>ImportForeignSchemaStmt</>, because the core server
+     The FDW may ignore the <structfield>local_schema</structfield> field of
+     the <structname>ImportForeignSchemaStmt</structname>, because the core server
      will automatically insert that name into the parsed <command>CREATE
-     FOREIGN TABLE</> commands.
+     FOREIGN TABLE</command> commands.
     </para>
 
     <para>
      The FDW does not have to concern itself with implementing the filtering
-     specified by <structfield>list_type</> and <structfield>table_list</>,
+     specified by <structfield>list_type</structfield> and <structfield>table_list</structfield>,
      either, as the core server will automatically skip any returned commands
      for tables excluded according to those options.  However, it's often
      useful to avoid the work of creating commands for excluded tables in the
-     first place.  The function <function>IsImportableForeignTable()</> may be
+     first place.  The function <function>IsImportableForeignTable()</function> may be
      useful to test whether a given foreign-table name will pass the filter.
     </para>
 
     <para>
      If the FDW does not support importing table definitions, the
-     <function>ImportForeignSchema</> pointer can be set to <literal>NULL</>.
+     <function>ImportForeignSchema</function> pointer can be set to <literal>NULL</literal>.
     </para>
 
    </sect2>
@@ -1189,14 +1195,14 @@ ImportForeignSchema (ImportForeignSchemaStmt *stmt, Oid serverOid);
    <sect2 id="fdw-callbacks-parallel">
     <title>FDW Routines for Parallel Execution</title>
     <para>
-     A <structname>ForeignScan</> node can, optionally, support parallel
-     execution.  A parallel <structname>ForeignScan</> will be executed
-     in multiple processes and should return each row only once across
+     A <structname>ForeignScan</structname> node can, optionally, support parallel
+     execution.  A parallel <structname>ForeignScan</structname> will be executed
+     in multiple processes and must return each row exactly once across
      all cooperating processes.  To do this, processes can coordinate through
-     fixed size chunks of dynamic shared memory.  This shared memory is not
-     guaranteed to be mapped at the same address in every process, so pointers
-     may not be used.  The following callbacks are all optional in general,
-     but required if parallel execution is to be supported.
+     fixed-size chunks of dynamic shared memory.  This shared memory is not
+     guaranteed to be mapped at the same address in every process, so it
+     must not contain pointers.  The following functions are all optional,
+     but most are required if parallel execution is to be supported.
     </para>
 
     <para>
@@ -1215,7 +1221,7 @@ IsForeignScanParallelSafe(PlannerInfo *root, RelOptInfo *rel,
     </para>
 
     <para>
-    If this callback is not defined, it is assumed that the scan must take
+    If this function is not defined, it is assumed that the scan must take
     place within the parallel leader.  Note that returning true does not mean
     that the scan itself can be done in parallel, only that the scan can be
     performed within a parallel worker.  Therefore, it can be useful to define
@@ -1230,6 +1236,9 @@ EstimateDSMForeignScan(ForeignScanState *node, ParallelContext *pcxt);
     Estimate the amount of dynamic shared memory that will be required
     for parallel operation.  This may be higher than the amount that will
     actually be used, but it must not be lower.  The return value is in bytes.
+    This function is optional, and can be omitted if not needed; but if it
+    is omitted, the next three functions must be omitted as well, because
+    no shared memory will be allocated for the FDW's use.
     </para>
 
     <para>
@@ -1239,8 +1248,25 @@ InitializeDSMForeignScan(ForeignScanState *node, ParallelContext *pcxt,
                          void *coordinate);
 </programlisting>
     Initialize the dynamic shared memory that will be required for parallel
-    operation; <literal>coordinate</> points to an amount of allocated space
-    equal to the return value of <function>EstimateDSMForeignScan</>.
+    operation.  <literal>coordinate</literal> points to a shared memory area of
+    size equal to the return value of <function>EstimateDSMForeignScan</function>.
+    This function is optional, and can be omitted if not needed.
+   </para>
+
+    <para>
+<programlisting>
+void
+ReInitializeDSMForeignScan(ForeignScanState *node, ParallelContext *pcxt,
+                           void *coordinate);
+</programlisting>
+    Re-initialize the dynamic shared memory required for parallel operation
+    when the foreign-scan plan node is about to be re-scanned.
+    This function is optional, and can be omitted if not needed.
+    Recommended practice is that this function reset only shared state,
+    while the <function>ReScanForeignScan</function> function resets only local
+    state.  Currently, this function will be called
+    before <function>ReScanForeignScan</function>, but it's best not to rely on
+    that ordering.
    </para>
 
    <para>
@@ -1249,10 +1275,9 @@ void
 InitializeWorkerForeignScan(ForeignScanState *node, shm_toc *toc,
                             void *coordinate);
 </programlisting>
-    Initialize a parallel worker's custom state based on the shared state
-    set up in the leader by <literal>InitializeDSMForeignScan</>.
-    This callback is optional, and needs only be supplied if this
-    custom path supports parallel execution.
+    Initialize a parallel worker's local state based on the shared state
+    set up by the leader during <function>InitializeDSMForeignScan</function>.
+    This function is optional, and can be omitted if not needed.
    </para>
 
    <para>
@@ -1262,7 +1287,7 @@ ShutdownForeignScan(ForeignScanState *node);
 </programlisting>
     Release resources when it is anticipated the node will not be executed
     to completion.  This is not called in all cases; sometimes,
-    <literal>EndForeignScan</> may be called without this function having
+    <literal>EndForeignScan</literal> may be called without this function having
     been called first.  Since the DSM segment used by parallel query is
     destroyed just after this callback is invoked, foreign data wrappers that
     wish to take some action before the DSM segment goes away should implement
@@ -1270,6 +1295,26 @@ ShutdownForeignScan(ForeignScanState *node);
    </para>
    </sect2>
 
+   <sect2 id="fdw-callbacks-reparameterize-paths">
+    <title>FDW Routines For reparameterization of paths</title>
+
+    <para>
+<programlisting>
+List *
+ReparameterizeForeignPathByChild(PlannerInfo *root, List *fdw_private,
+                                 RelOptInfo *child_rel);
+</programlisting>
+    This function is called while converting a path parameterized by the
+    top-most parent of the given child relation <literal>child_rel</literal> to be
+    parameterized by the child relation. The function is used to reparameterize
+    any paths or translate any expression nodes saved in the given
+    <literal>fdw_private</literal> member of a <structname>ForeignPath</structname>. The
+    callback may use <literal>reparameterize_path_by_child</literal>,
+    <literal>adjust_appendrel_attrs</literal> or
+    <literal>adjust_appendrel_attrs_multilevel</literal> as required.
+    </para>
+   </sect2>
+
    </sect1>
 
    <sect1 id="fdw-helpers">
@@ -1318,7 +1363,7 @@ GetUserMapping(Oid userid, Oid serverid);
      This function returns a <structname>UserMapping</structname> object for
      the user mapping of the given role on the given server.  (If there is no
      mapping for the specific user, it will return the mapping for
-     <literal>PUBLIC</>, or throw error if there is none.)  A
+     <literal>PUBLIC</literal>, or throw error if there is none.)  A
      <structname>UserMapping</structname> object contains properties of the
      user mapping (see <filename>foreign/foreign.h</filename> for details).
     </para>
@@ -1381,25 +1426,25 @@ GetForeignServerByName(const char *name, bool missing_ok);
     <title>Foreign Data Wrapper Query Planning</title>
 
     <para>
-     The FDW callback functions <function>GetForeignRelSize</>,
-     <function>GetForeignPaths</>, <function>GetForeignPlan</>,
-     <function>PlanForeignModify</>, <function>GetForeignJoinPaths</>,
-     <function>GetForeignUpperPaths</>, and <function>PlanDirectModify</>
-     must fit into the workings of the <productname>PostgreSQL</> planner.
+     The FDW callback functions <function>GetForeignRelSize</function>,
+     <function>GetForeignPaths</function>, <function>GetForeignPlan</function>,
+     <function>PlanForeignModify</function>, <function>GetForeignJoinPaths</function>,
+     <function>GetForeignUpperPaths</function>, and <function>PlanDirectModify</function>
+     must fit into the workings of the <productname>PostgreSQL</productname> planner.
      Here are some notes about what they must do.
     </para>
 
     <para>
-     The information in <literal>root</> and <literal>baserel</> can be used
+     The information in <literal>root</literal> and <literal>baserel</literal> can be used
      to reduce the amount of information that has to be fetched from the
      foreign table (and therefore reduce the cost).
-     <literal>baserel-&gt;baserestrictinfo</> is particularly interesting, as
-     it contains restriction quals (<literal>WHERE</> clauses) that should be
+     <literal>baserel-&gt;baserestrictinfo</literal> is particularly interesting, as
+     it contains restriction quals (<literal>WHERE</literal> clauses) that should be
      used to filter the rows to be fetched.  (The FDW itself is not required
      to enforce these quals, as the core executor can check them instead.)
-     <literal>baserel-&gt;reltarget-&gt;exprs</> can be used to determine which
+     <literal>baserel-&gt;reltarget-&gt;exprs</literal> can be used to determine which
      columns need to be fetched; but note that it only lists columns that
-     have to be emitted by the <structname>ForeignScan</> plan node, not
+     have to be emitted by the <structname>ForeignScan</structname> plan node, not
      columns that are used in qual evaluation but not output by the query.
     </para>
 
@@ -1410,49 +1455,49 @@ GetForeignServerByName(const char *name, bool missing_ok);
     </para>
 
     <para>
-     <literal>baserel-&gt;fdw_private</> is a <type>void</> pointer that is
+     <literal>baserel-&gt;fdw_private</literal> is a <type>void</type> pointer that is
      available for FDW planning functions to store information relevant to
      the particular foreign table.  The core planner does not touch it except
-     to initialize it to NULL when the <literal>RelOptInfo</> node is created.
+     to initialize it to NULL when the <literal>RelOptInfo</literal> node is created.
      It is useful for passing information forward from
-     <function>GetForeignRelSize</> to <function>GetForeignPaths</> and/or
-     <function>GetForeignPaths</> to <function>GetForeignPlan</>, thereby
+     <function>GetForeignRelSize</function> to <function>GetForeignPaths</function> and/or
+     <function>GetForeignPaths</function> to <function>GetForeignPlan</function>, thereby
      avoiding recalculation.
     </para>
 
     <para>
-     <function>GetForeignPaths</> can identify the meaning of different
+     <function>GetForeignPaths</function> can identify the meaning of different
      access paths by storing private information in the
-     <structfield>fdw_private</> field of <structname>ForeignPath</> nodes.
-     <structfield>fdw_private</> is declared as a <type>List</> pointer, but
+     <structfield>fdw_private</structfield> field of <structname>ForeignPath</structname> nodes.
+     <structfield>fdw_private</structfield> is declared as a <type>List</type> pointer, but
      could actually contain anything since the core planner does not touch
      it.  However, best practice is to use a representation that's dumpable
-     by <function>nodeToString</>, for use with debugging support available
+     by <function>nodeToString</function>, for use with debugging support available
      in the backend.
     </para>
 
     <para>
-     <function>GetForeignPlan</> can examine the <structfield>fdw_private</>
-     field of the selected <structname>ForeignPath</> node, and can generate
-     <structfield>fdw_exprs</> and <structfield>fdw_private</> lists to be
-     placed in the <structname>ForeignScan</> plan node, where they will be
+     <function>GetForeignPlan</function> can examine the <structfield>fdw_private</structfield>
+     field of the selected <structname>ForeignPath</structname> node, and can generate
+     <structfield>fdw_exprs</structfield> and <structfield>fdw_private</structfield> lists to be
+     placed in the <structname>ForeignScan</structname> plan node, where they will be
      available at execution time.  Both of these lists must be
-     represented in a form that <function>copyObject</> knows how to copy.
-     The <structfield>fdw_private</> list has no other restrictions and is
+     represented in a form that <function>copyObject</function> knows how to copy.
+     The <structfield>fdw_private</structfield> list has no other restrictions and is
      not interpreted by the core backend in any way.  The
-     <structfield>fdw_exprs</> list, if not NIL, is expected to contain
+     <structfield>fdw_exprs</structfield> list, if not NIL, is expected to contain
      expression trees that are intended to be executed at run time.  These
      trees will undergo post-processing by the planner to make them fully
      executable.
     </para>
 
     <para>
-     In <function>GetForeignPlan</>, generally the passed-in target list can
-     be copied into the plan node as-is.  The passed <literal>scan_clauses</> list
-     contains the same clauses as <literal>baserel-&gt;baserestrictinfo</>,
+     In <function>GetForeignPlan</function>, generally the passed-in target list can
+     be copied into the plan node as-is.  The passed <literal>scan_clauses</literal> list
+     contains the same clauses as <literal>baserel-&gt;baserestrictinfo</literal>,
      but may be re-ordered for better execution efficiency.  In simple cases
-     the FDW can just strip <structname>RestrictInfo</> nodes from the
-     <literal>scan_clauses</> list (using <function>extract_actual_clauses</>) and put
+     the FDW can just strip <structname>RestrictInfo</structname> nodes from the
+     <literal>scan_clauses</literal> list (using <function>extract_actual_clauses</function>) and put
      all the clauses into the plan node's qual list, which means that all the
      clauses will be checked by the executor at run time.  More complex FDWs
      may be able to check some of the clauses internally, in which case those
@@ -1462,54 +1507,54 @@ GetForeignServerByName(const char *name, bool missing_ok);
 
     <para>
      As an example, the FDW might identify some restriction clauses of the
-     form <replaceable>foreign_variable</> <literal>=</>
-     <replaceable>sub_expression</>, which it determines can be executed on
+     form <replaceable>foreign_variable</replaceable> <literal>=</literal>
+     <replaceable>sub_expression</replaceable>, which it determines can be executed on
      the remote server given the locally-evaluated value of the
-     <replaceable>sub_expression</>.  The actual identification of such a
-     clause should happen during <function>GetForeignPaths</>, since it would
+     <replaceable>sub_expression</replaceable>.  The actual identification of such a
+     clause should happen during <function>GetForeignPaths</function>, since it would
      affect the cost estimate for the path.  The path's
-     <structfield>fdw_private</> field would probably include a pointer to
-     the identified clause's <structname>RestrictInfo</> node.  Then
-     <function>GetForeignPlan</> would remove that clause from <literal>scan_clauses</>,
-     but add the <replaceable>sub_expression</> to <structfield>fdw_exprs</>
+     <structfield>fdw_private</structfield> field would probably include a pointer to
+     the identified clause's <structname>RestrictInfo</structname> node.  Then
+     <function>GetForeignPlan</function> would remove that clause from <literal>scan_clauses</literal>,
+     but add the <replaceable>sub_expression</replaceable> to <structfield>fdw_exprs</structfield>
      to ensure that it gets massaged into executable form.  It would probably
      also put control information into the plan node's
-     <structfield>fdw_private</> field to tell the execution functions what
+     <structfield>fdw_private</structfield> field to tell the execution functions what
      to do at run time.  The query transmitted to the remote server would
-     involve something like <literal>WHERE <replaceable>foreign_variable</> =
+     involve something like <literal>WHERE <replaceable>foreign_variable</replaceable> =
      $1</literal>, with the parameter value obtained at run time from
-     evaluation of the <structfield>fdw_exprs</> expression tree.
+     evaluation of the <structfield>fdw_exprs</structfield> expression tree.
     </para>
 
     <para>
      Any clauses removed from the plan node's qual list must instead be added
-     to <literal>fdw_recheck_quals</> or rechecked by
-     <literal>RecheckForeignScan</> in order to ensure correct behavior
-     at the <literal>READ COMMITTED</> isolation level.  When a concurrent
+     to <literal>fdw_recheck_quals</literal> or rechecked by
+     <literal>RecheckForeignScan</literal> in order to ensure correct behavior
+     at the <literal>READ COMMITTED</literal> isolation level.  When a concurrent
      update occurs for some other table involved in the query, the executor
      may need to verify that all of the original quals are still satisfied for
      the tuple, possibly against a different set of parameter values.  Using
-     <literal>fdw_recheck_quals</> is typically easier than implementing checks
-     inside <literal>RecheckForeignScan</>, but this method will be
+     <literal>fdw_recheck_quals</literal> is typically easier than implementing checks
+     inside <literal>RecheckForeignScan</literal>, but this method will be
      insufficient when outer joins have been pushed down, since the join tuples
      in that case might have some fields go to NULL without rejecting the
      tuple entirely.
     </para>
 
     <para>
-     Another <structname>ForeignScan</> field that can be filled by FDWs
-     is <structfield>fdw_scan_tlist</>, which describes the tuples returned by
+     Another <structname>ForeignScan</structname> field that can be filled by FDWs
+     is <structfield>fdw_scan_tlist</structfield>, which describes the tuples returned by
      the FDW for this plan node.  For simple foreign table scans this can be
-     set to <literal>NIL</>, implying that the returned tuples have the
+     set to <literal>NIL</literal>, implying that the returned tuples have the
      row type declared for the foreign table.  A non-<symbol>NIL</symbol> value must be a
-     target list (list of <structname>TargetEntry</>s) containing Vars and/or
+     target list (list of <structname>TargetEntry</structname>s) containing Vars and/or
      expressions representing the returned columns.  This might be used, for
      example, to show that the FDW has omitted some columns that it noticed
      won't be needed for the query.  Also, if the FDW can compute expressions
      used by the query more cheaply than can be done locally, it could add
-     those expressions to <structfield>fdw_scan_tlist</>.  Note that join
-     plans (created from paths made by <function>GetForeignJoinPaths</>) must
-     always supply <structfield>fdw_scan_tlist</> to describe the set of
+     those expressions to <structfield>fdw_scan_tlist</structfield>.  Note that join
+     plans (created from paths made by <function>GetForeignJoinPaths</function>) must
+     always supply <structfield>fdw_scan_tlist</structfield> to describe the set of
      columns they will return.
     </para>
 
@@ -1517,87 +1562,87 @@ GetForeignServerByName(const char *name, bool missing_ok);
      The FDW should always construct at least one path that depends only on
      the table's restriction clauses.  In join queries, it might also choose
      to construct path(s) that depend on join clauses, for example
-     <replaceable>foreign_variable</> <literal>=</>
-     <replaceable>local_variable</>.  Such clauses will not be found in
-     <literal>baserel-&gt;baserestrictinfo</> but must be sought in the
+     <replaceable>foreign_variable</replaceable> <literal>=</literal>
+     <replaceable>local_variable</replaceable>.  Such clauses will not be found in
+     <literal>baserel-&gt;baserestrictinfo</literal> but must be sought in the
      relation's join lists.  A path using such a clause is called a
-     <quote>parameterized path</>.  It must identify the other relations
+     <quote>parameterized path</quote>.  It must identify the other relations
      used in the selected join clause(s) with a suitable value of
-     <literal>param_info</>; use <function>get_baserel_parampathinfo</>
-     to compute that value.  In <function>GetForeignPlan</>, the
-     <replaceable>local_variable</> portion of the join clause would be added
-     to <structfield>fdw_exprs</>, and then at run time the case works the
+     <literal>param_info</literal>; use <function>get_baserel_parampathinfo</function>
+     to compute that value.  In <function>GetForeignPlan</function>, the
+     <replaceable>local_variable</replaceable> portion of the join clause would be added
+     to <structfield>fdw_exprs</structfield>, and then at run time the case works the
      same as for an ordinary restriction clause.
     </para>
 
     <para>
-     If an FDW supports remote joins, <function>GetForeignJoinPaths</> should
-     produce <structname>ForeignPath</>s for potential remote joins in much
-     the same way as <function>GetForeignPaths</> works for base tables.
+     If an FDW supports remote joins, <function>GetForeignJoinPaths</function> should
+     produce <structname>ForeignPath</structname>s for potential remote joins in much
+     the same way as <function>GetForeignPaths</function> works for base tables.
      Information about the intended join can be passed forward
-     to <function>GetForeignPlan</> in the same ways described above.
-     However, <structfield>baserestrictinfo</> is not relevant for join
+     to <function>GetForeignPlan</function> in the same ways described above.
+     However, <structfield>baserestrictinfo</structfield> is not relevant for join
      relations; instead, the relevant join clauses for a particular join are
-     passed to <function>GetForeignJoinPaths</> as a separate parameter
-     (<literal>extra-&gt;restrictlist</>).
+     passed to <function>GetForeignJoinPaths</function> as a separate parameter
+     (<literal>extra-&gt;restrictlist</literal>).
     </para>
 
     <para>
      An FDW might additionally support direct execution of some plan actions
      that are above the level of scans and joins, such as grouping or
      aggregation.  To offer such options, the FDW should generate paths and
-     insert them into the appropriate <firstterm>upper relation</>.  For
+     insert them into the appropriate <firstterm>upper relation</firstterm>.  For
      example, a path representing remote aggregation should be inserted into
-     the <literal>UPPERREL_GROUP_AGG</> relation, using <function>add_path</>.
+     the <literal>UPPERREL_GROUP_AGG</literal> relation, using <function>add_path</function>.
      This path will be compared on a cost basis with local aggregation
      performed by reading a simple scan path for the foreign relation (note
      that such a path must also be supplied, else there will be an error at
      plan time).  If the remote-aggregation path wins, which it usually would,
      it will be converted into a plan in the usual way, by
-     calling <function>GetForeignPlan</>.  The recommended place to generate
-     such paths is in the <function>GetForeignUpperPaths</>
+     calling <function>GetForeignPlan</function>.  The recommended place to generate
+     such paths is in the <function>GetForeignUpperPaths</function>
      callback function, which is called for each upper relation (i.e., each
      post-scan/join processing step), if all the base relations of the query
      come from the same FDW.
     </para>
 
     <para>
-     <function>PlanForeignModify</> and the other callbacks described in
-     <xref linkend="fdw-callbacks-update"> are designed around the assumption
+     <function>PlanForeignModify</function> and the other callbacks described in
+     <xref linkend="fdw-callbacks-update"/> are designed around the assumption
      that the foreign relation will be scanned in the usual way and then
-     individual row updates will be driven by a local <literal>ModifyTable</>
+     individual row updates will be driven by a local <literal>ModifyTable</literal>
      plan node.  This approach is necessary for the general case where an
      update requires reading local tables as well as foreign tables.
      However, if the operation could be executed entirely by the foreign
      server, the FDW could generate a path representing that and insert it
-     into the <literal>UPPERREL_FINAL</> upper relation, where it would
-     compete against the <literal>ModifyTable</> approach.  This approach
-     could also be used to implement remote <literal>SELECT FOR UPDATE</>,
+     into the <literal>UPPERREL_FINAL</literal> upper relation, where it would
+     compete against the <literal>ModifyTable</literal> approach.  This approach
+     could also be used to implement remote <literal>SELECT FOR UPDATE</literal>,
      rather than using the row locking callbacks described in
-     <xref linkend="fdw-callbacks-row-locking">.  Keep in mind that a path
-     inserted into <literal>UPPERREL_FINAL</> is responsible for
-     implementing <emphasis>all</> behavior of the query.
+     <xref linkend="fdw-callbacks-row-locking"/>.  Keep in mind that a path
+     inserted into <literal>UPPERREL_FINAL</literal> is responsible for
+     implementing <emphasis>all</emphasis> behavior of the query.
     </para>
 
     <para>
-     When planning an <command>UPDATE</> or <command>DELETE</>,
-     <function>PlanForeignModify</> and <function>PlanDirectModify</>
-     can look up the <structname>RelOptInfo</>
+     When planning an <command>UPDATE</command> or <command>DELETE</command>,
+     <function>PlanForeignModify</function> and <function>PlanDirectModify</function>
+     can look up the <structname>RelOptInfo</structname>
      struct for the foreign table and make use of the
-     <literal>baserel-&gt;fdw_private</> data previously created by the
-     scan-planning functions.  However, in <command>INSERT</> the target
-     table is not scanned so there is no <structname>RelOptInfo</> for it.
-     The <structname>List</> returned by <function>PlanForeignModify</> has
-     the same restrictions as the <structfield>fdw_private</> list of a
-     <structname>ForeignScan</> plan node, that is it must contain only
-     structures that <function>copyObject</> knows how to copy.
+     <literal>baserel-&gt;fdw_private</literal> data previously created by the
+     scan-planning functions.  However, in <command>INSERT</command> the target
+     table is not scanned so there is no <structname>RelOptInfo</structname> for it.
+     The <structname>List</structname> returned by <function>PlanForeignModify</function> has
+     the same restrictions as the <structfield>fdw_private</structfield> list of a
+     <structname>ForeignScan</structname> plan node, that is it must contain only
+     structures that <function>copyObject</function> knows how to copy.
     </para>
 
     <para>
-     <command>INSERT</> with an <literal>ON CONFLICT</> clause does not
+     <command>INSERT</command> with an <literal>ON CONFLICT</literal> clause does not
      support specifying the conflict target, as unique constraints or
      exclusion constraints on remote tables are not locally known. This
-     in turn implies that <literal>ON CONFLICT DO UPDATE</> is not supported,
+     in turn implies that <literal>ON CONFLICT DO UPDATE</literal> is not supported,
      since the specification is mandatory there.
     </para>
 
@@ -1611,13 +1656,13 @@ GetForeignServerByName(const char *name, bool missing_ok);
      individual rows to prevent concurrent updates of those rows, it is
      usually worthwhile for the FDW to perform row-level locking with as
      close an approximation as practical to the semantics used in
-     ordinary <productname>PostgreSQL</> tables.  There are multiple
+     ordinary <productname>PostgreSQL</productname> tables.  There are multiple
      considerations involved in this.
     </para>
 
     <para>
      One key decision to be made is whether to perform <firstterm>early
-     locking</> or <firstterm>late locking</>.  In early locking, a row is
+     locking</firstterm> or <firstterm>late locking</firstterm>.  In early locking, a row is
      locked when it is first retrieved from the underlying store, while in
      late locking, the row is locked only when it is known that it needs to
      be locked.  (The difference arises because some rows may be discarded by
@@ -1627,25 +1672,25 @@ GetForeignServerByName(const char *name, bool missing_ok);
      concurrency or even unexpected deadlocks.  Also, late locking is only
      possible if the row to be locked can be uniquely re-identified later.
      Preferably the row identifier should identify a specific version of the
-     row, as <productname>PostgreSQL</> TIDs do.
+     row, as <productname>PostgreSQL</productname> TIDs do.
     </para>
 
     <para>
-     By default, <productname>PostgreSQL</> ignores locking considerations
+     By default, <productname>PostgreSQL</productname> ignores locking considerations
      when interfacing to FDWs, but an FDW can perform early locking without
      any explicit support from the core code.  The API functions described
-     in <xref linkend="fdw-callbacks-row-locking">, which were added
-     in <productname>PostgreSQL</> 9.5, allow an FDW to use late locking if
+     in <xref linkend="fdw-callbacks-row-locking"/>, which were added
+     in <productname>PostgreSQL</productname> 9.5, allow an FDW to use late locking if
      it wishes.
     </para>
 
     <para>
-     An additional consideration is that in <literal>READ COMMITTED</>
-     isolation mode, <productname>PostgreSQL</> may need to re-check
+     An additional consideration is that in <literal>READ COMMITTED</literal>
+     isolation mode, <productname>PostgreSQL</productname> may need to re-check
      restriction and join conditions against an updated version of some
      target tuple.  Rechecking join conditions requires re-obtaining copies
      of the non-target rows that were previously joined to the target tuple.
-     When working with standard <productname>PostgreSQL</> tables, this is
+     When working with standard <productname>PostgreSQL</productname> tables, this is
      done by including the TIDs of the non-target tables in the column list
      projected through the join, and then re-fetching non-target rows when
      required.  This approach keeps the join data set compact, but it
@@ -1660,56 +1705,56 @@ GetForeignServerByName(const char *name, bool missing_ok);
     </para>
 
     <para>
-     For an <command>UPDATE</> or <command>DELETE</> on a foreign table, it
-     is recommended that the <literal>ForeignScan</> operation on the target
+     For an <command>UPDATE</command> or <command>DELETE</command> on a foreign table, it
+     is recommended that the <literal>ForeignScan</literal> operation on the target
      table perform early locking on the rows that it fetches, perhaps via the
-     equivalent of <command>SELECT FOR UPDATE</>.  An FDW can detect whether
-     a table is an <command>UPDATE</>/<command>DELETE</> target at plan time
-     by comparing its relid to <literal>root-&gt;parse-&gt;resultRelation</>,
-     or at execution time by using <function>ExecRelationIsTargetRelation()</>.
+     equivalent of <command>SELECT FOR UPDATE</command>.  An FDW can detect whether
+     a table is an <command>UPDATE</command>/<command>DELETE</command> target at plan time
+     by comparing its relid to <literal>root-&gt;parse-&gt;resultRelation</literal>,
+     or at execution time by using <function>ExecRelationIsTargetRelation()</function>.
      An alternative possibility is to perform late locking within the
-     <function>ExecForeignUpdate</> or <function>ExecForeignDelete</>
+     <function>ExecForeignUpdate</function> or <function>ExecForeignDelete</function>
      callback, but no special support is provided for this.
     </para>
 
     <para>
      For foreign tables that are specified to be locked by a <command>SELECT
-     FOR UPDATE/SHARE</> command, the <literal>ForeignScan</> operation can
+     FOR UPDATE/SHARE</command> command, the <literal>ForeignScan</literal> operation can
      again perform early locking by fetching tuples with the equivalent
-     of <command>SELECT FOR UPDATE/SHARE</>.  To perform late locking
+     of <command>SELECT FOR UPDATE/SHARE</command>.  To perform late locking
      instead, provide the callback functions defined
-     in <xref linkend="fdw-callbacks-row-locking">.
-     In <function>GetForeignRowMarkType</>, select rowmark option
-     <literal>ROW_MARK_EXCLUSIVE</>, <literal>ROW_MARK_NOKEYEXCLUSIVE</>,
-     <literal>ROW_MARK_SHARE</>, or <literal>ROW_MARK_KEYSHARE</> depending
+     in <xref linkend="fdw-callbacks-row-locking"/>.
+     In <function>GetForeignRowMarkType</function>, select rowmark option
+     <literal>ROW_MARK_EXCLUSIVE</literal>, <literal>ROW_MARK_NOKEYEXCLUSIVE</literal>,
+     <literal>ROW_MARK_SHARE</literal>, or <literal>ROW_MARK_KEYSHARE</literal> depending
      on the requested lock strength.  (The core code will act the same
      regardless of which of these four options you choose.)
      Elsewhere, you can detect whether a foreign table was specified to be
-     locked by this type of command by using <function>get_plan_rowmark</> at
-     plan time, or <function>ExecFindRowMark</> at execution time; you must
+     locked by this type of command by using <function>get_plan_rowmark</function> at
+     plan time, or <function>ExecFindRowMark</function> at execution time; you must
      check not only whether a non-null rowmark struct is returned, but that
-     its <structfield>strength</> field is not <literal>LCS_NONE</>.
+     its <structfield>strength</structfield> field is not <literal>LCS_NONE</literal>.
     </para>
 
     <para>
-     Lastly, for foreign tables that are used in an <command>UPDATE</>,
-     <command>DELETE</> or <command>SELECT FOR UPDATE/SHARE</> command but
+     Lastly, for foreign tables that are used in an <command>UPDATE</command>,
+     <command>DELETE</command> or <command>SELECT FOR UPDATE/SHARE</command> command but
      are not specified to be row-locked, you can override the default choice
-     to copy entire rows by having <function>GetForeignRowMarkType</> select
-     option <literal>ROW_MARK_REFERENCE</> when it sees lock strength
-     <literal>LCS_NONE</>.  This will cause <function>RefetchForeignRow</> to
-     be called with that value for <structfield>markType</>; it should then
+     to copy entire rows by having <function>GetForeignRowMarkType</function> select
+     option <literal>ROW_MARK_REFERENCE</literal> when it sees lock strength
+     <literal>LCS_NONE</literal>.  This will cause <function>RefetchForeignRow</function> to
+     be called with that value for <structfield>markType</structfield>; it should then
      re-fetch the row without acquiring any new lock.  (If you have
-     a <function>GetForeignRowMarkType</> function but don't wish to re-fetch
-     unlocked rows, select option <literal>ROW_MARK_COPY</>
-     for <literal>LCS_NONE</>.)
+     a <function>GetForeignRowMarkType</function> function but don't wish to re-fetch
+     unlocked rows, select option <literal>ROW_MARK_COPY</literal>
+     for <literal>LCS_NONE</literal>.)
     </para>
 
     <para>
-     See <filename>src/include/nodes/lockoptions.h</>, the comments
-     for <type>RowMarkType</> and <type>PlanRowMark</>
-     in <filename>src/include/nodes/plannodes.h</>, and the comments for
-     <type>ExecRowMark</> in <filename>src/include/nodes/execnodes.h</> for
+     See <filename>src/include/nodes/lockoptions.h</filename>, the comments
+     for <type>RowMarkType</type> and <type>PlanRowMark</type>
+     in <filename>src/include/nodes/plannodes.h</filename>, and the comments for
+     <type>ExecRowMark</type> in <filename>src/include/nodes/execnodes.h</filename> for
      additional information.
     </para>
 
diff --git a/doc/src/sgml/file-fdw.sgml b/doc/src/sgml/file-fdw.sgml
index 74941a6f1e..e2598a07da 100644
--- a/doc/src/sgml/file-fdw.sgml
+++ b/doc/src/sgml/file-fdw.sgml
@@ -8,12 +8,12 @@
  </indexterm>
 
  <para>
-  The <filename>file_fdw</> module provides the foreign-data wrapper
+  The <filename>file_fdw</filename> module provides the foreign-data wrapper
   <function>file_fdw</function>, which can be used to access data
   files in the server's file system, or to execute programs on the server
   and read their output.  The data file or program output must be in a format
   that can be read by <command>COPY FROM</command>;
-  see <xref linkend="sql-copy"> for details.
+  see <xref linkend="sql-copy"/> for details.
   Access to data files is currently read-only.
  </para>
 
@@ -41,7 +41,7 @@
    <listitem>
     <para>
      Specifies the command to be executed.  The standard output of this
-     command will be read as though <command>COPY FROM PROGRAM</> were used.
+     command will be read as though <command>COPY FROM PROGRAM</command> were used.
      Either <literal>program</literal> or <literal>filename</literal> must be
      specified, but not both.
     </para>
@@ -54,7 +54,7 @@
    <listitem>
     <para>
      Specifies the data format,
-     the same as <command>COPY</>'s <literal>FORMAT</literal> option.
+     the same as <command>COPY</command>'s <literal>FORMAT</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -65,7 +65,7 @@
    <listitem>
     <para>
      Specifies whether the data has a header line,
-     the same as <command>COPY</>'s <literal>HEADER</literal> option.
+     the same as <command>COPY</command>'s <literal>HEADER</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -76,7 +76,7 @@
    <listitem>
     <para>
      Specifies the data delimiter character,
-     the same as <command>COPY</>'s <literal>DELIMITER</literal> option.
+     the same as <command>COPY</command>'s <literal>DELIMITER</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -87,7 +87,7 @@
    <listitem>
     <para>
      Specifies the data quote character,
-     the same as <command>COPY</>'s <literal>QUOTE</literal> option.
+     the same as <command>COPY</command>'s <literal>QUOTE</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -98,7 +98,7 @@
    <listitem>
     <para>
      Specifies the data escape character,
-     the same as <command>COPY</>'s <literal>ESCAPE</literal> option.
+     the same as <command>COPY</command>'s <literal>ESCAPE</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -109,7 +109,7 @@
    <listitem>
     <para>
      Specifies the data null string,
-     the same as <command>COPY</>'s <literal>NULL</literal> option.
+     the same as <command>COPY</command>'s <literal>NULL</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -120,7 +120,7 @@
    <listitem>
     <para>
      Specifies the data encoding,
-     the same as <command>COPY</>'s <literal>ENCODING</literal> option.
+     the same as <command>COPY</command>'s <literal>ENCODING</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -128,10 +128,10 @@
  </variablelist>
 
  <para>
-  Note that while <command>COPY</> allows options such as <literal>HEADER</>
+  Note that while <command>COPY</command> allows options such as <literal>HEADER</literal>
   to be specified without a corresponding value, the foreign table option
   syntax requires a value to be present in all cases.  To activate
-  <command>COPY</> options typically written without a value, you can pass
+  <command>COPY</command> options typically written without a value, you can pass
   the value TRUE, since all such options are Booleans.
  </para>
 
@@ -150,7 +150,7 @@
      This is a Boolean option.  If true, it specifies that values of the
      column should not be matched against the null string (that is, the
      table-level <literal>null</literal> option).  This has the same effect
-     as listing the column in <command>COPY</>'s
+     as listing the column in <command>COPY</command>'s
      <literal>FORCE_NOT_NULL</literal> option.
     </para>
    </listitem>
@@ -162,11 +162,11 @@
    <listitem>
     <para>
      This is a Boolean option.  If true, it specifies that values of the
-     column which match the null string are returned as <literal>NULL</>
+     column which match the null string are returned as <literal>NULL</literal>
      even if the value is quoted. Without this option, only unquoted
-     values matching the null string are returned as <literal>NULL</>.
+     values matching the null string are returned as <literal>NULL</literal>.
      This has the same effect  as listing the column in
-     <command>COPY</>'s <literal>FORCE_NULL</literal> option.
+     <command>COPY</command>'s <literal>FORCE_NULL</literal> option.
     </para>
    </listitem>
   </varlistentry>
@@ -174,14 +174,14 @@
  </variablelist>
 
  <para>
-  <command>COPY</>'s <literal>OIDS</literal> and
+  <command>COPY</command>'s <literal>OIDS</literal> and
   <literal>FORCE_QUOTE</literal> options are currently not supported by
-  <literal>file_fdw</>.
+  <literal>file_fdw</literal>.
  </para>
 
  <para>
   These options can only be specified for a foreign table or its columns, not
-  in the options of the <literal>file_fdw</> foreign-data wrapper, nor in the
+  in the options of the <literal>file_fdw</literal> foreign-data wrapper, nor in the
   options of a server or user mapping using the wrapper.
  </para>
 
@@ -193,7 +193,7 @@
  </para>
 
  <para>
-  When specifying the <literal>program</> option, keep in mind that the option
+  When specifying the <literal>program</literal> option, keep in mind that the option
   string is executed by the shell.  If you need to pass any arguments to the
   command that come from an untrusted source, you must be careful to strip or
   escape any characters that might have special meaning to the shell.
@@ -202,9 +202,9 @@
  </para>
 
  <para>
-  For a foreign table using <literal>file_fdw</>, <command>EXPLAIN</> shows
+  For a foreign table using <literal>file_fdw</literal>, <command>EXPLAIN</command> shows
   the name of the file to be read or program to be run.
-  For a file, unless <literal>COSTS OFF</> is
+  For a file, unless <literal>COSTS OFF</literal> is
   specified, the file size (in bytes) is shown as well.
  </para>
 
@@ -212,10 +212,10 @@
  <title id="csvlog-fdw">Create a Foreign Table for PostgreSQL CSV Logs</title>
 
   <para>
-   One of the obvious uses for <literal>file_fdw</> is to make
+   One of the obvious uses for <literal>file_fdw</literal> is to make
    the PostgreSQL activity log available as a table for querying.  To
    do this, first you must be logging to a CSV file, which here we
-   will call <literal>pglog.csv</>.  First, install <literal>file_fdw</>
+   will call <literal>pglog.csv</literal>.  First, install <literal>file_fdw</literal>
    as an extension:
   </para>
 
@@ -233,7 +233,7 @@ CREATE SERVER pglog FOREIGN DATA WRAPPER file_fdw;
 
   <para>
    Now you are ready to create the foreign data table.  Using the
-   <command>CREATE FOREIGN TABLE</> command, you will need to define
+   <command>CREATE FOREIGN TABLE</command> command, you will need to define
    the columns for the table, the CSV file name, and its format:
 
 <programlisting>
diff --git a/doc/src/sgml/filelist.sgml b/doc/src/sgml/filelist.sgml
index b914086009..732b8ab7d0 100644
--- a/doc/src/sgml/filelist.sgml
+++ b/doc/src/sgml/filelist.sgml
@@ -83,6 +83,7 @@
 <!ENTITY bki        SYSTEM "bki.sgml">
 <!ENTITY catalogs   SYSTEM "catalogs.sgml">
 <!ENTITY geqo       SYSTEM "geqo.sgml">
+<!ENTITY btree      SYSTEM "btree.sgml">
 <!ENTITY gist       SYSTEM "gist.sgml">
 <!ENTITY spgist     SYSTEM "spgist.sgml">
 <!ENTITY gin        SYSTEM "gin.sgml">
@@ -110,7 +111,6 @@
 <!ENTITY bloom           SYSTEM "bloom.sgml">
 <!ENTITY btree-gin       SYSTEM "btree-gin.sgml">
 <!ENTITY btree-gist      SYSTEM "btree-gist.sgml">
-<!ENTITY chkpass         SYSTEM "chkpass.sgml">
 <!ENTITY citext          SYSTEM "citext.sgml">
 <!ENTITY cube            SYSTEM "cube.sgml">
 <!ENTITY dblink          SYSTEM "dblink.sgml">
@@ -157,7 +157,6 @@
 <!ENTITY xml2            SYSTEM "xml2.sgml">
 
 <!-- appendixes -->
-<!ENTITY contacts   SYSTEM "contacts.sgml">
 <!ENTITY datetime   SYSTEM "datetime.sgml">
 <!ENTITY docguide   SYSTEM "docguide.sgml">
 <!ENTITY errcodes   SYSTEM "errcodes.sgml">
@@ -191,12 +190,3 @@
 
 <!-- back matter -->
 <!ENTITY biblio     SYSTEM "biblio.sgml">
-
-<!--
- Some parts of the documentation are also source for some plain-text
- files used during installation.  To selectively ignore or include
- some parts (e.g., external xref's) when generating these files we use
- these parameter entities.  See also standalone-install.sgml.
- -->
-<!ENTITY % standalone-ignore  "INCLUDE">
-<!ENTITY % standalone-include "IGNORE">
diff --git a/doc/src/sgml/func.sgml b/doc/src/sgml/func.sgml
index b43ec30a4e..2f59af25a6 100644
--- a/doc/src/sgml/func.sgml
+++ b/doc/src/sgml/func.sgml
@@ -15,7 +15,7 @@
    <productname>PostgreSQL</productname> provides a large number of
    functions and operators for the built-in data types.  Users can also
    define their own functions and operators, as described in
-   <xref linkend="server-programming">.  The
+   <xref linkend="server-programming"/>.  The
    <application>psql</application> commands <command>\df</command> and
    <command>\do</command> can be used to list all
    available functions and operators, respectively.
@@ -77,13 +77,13 @@
     </indexterm>
 
     <simplelist>
-     <member><literal>AND</></member>
-     <member><literal>OR</></member>
-     <member><literal>NOT</></member>
+     <member><literal>AND</literal></member>
+     <member><literal>OR</literal></member>
+     <member><literal>NOT</literal></member>
     </simplelist>
 
     <acronym>SQL</acronym> uses a three-valued logic system with true,
-    false, and <literal>null</>, which represents <quote>unknown</quote>.
+    false, and <literal>null</literal>, which represents <quote>unknown</quote>.
     Observe the following truth tables:
 
     <informaltable>
@@ -176,7 +176,7 @@
     The operators <literal>AND</literal> and <literal>OR</literal> are
     commutative, that is, you can switch the left and right operand
     without affecting the result.  But see <xref
-    linkend="syntax-express-eval"> for more information about the
+    linkend="syntax-express-eval"/> for more information about the
     order of evaluation of subexpressions.
    </para>
   </sect1>
@@ -191,7 +191,7 @@
 
    <para>
     The usual comparison operators are available, as shown in <xref
-    linkend="functions-comparison-op-table">.
+    linkend="functions-comparison-op-table"/>.
    </para>
 
    <table id="functions-comparison-op-table">
@@ -258,7 +258,7 @@
 
    <para>
     There are also some comparison predicates, as shown in <xref
-    linkend="functions-comparison-pred-table">.  These behave much like
+    linkend="functions-comparison-pred-table"/>.  These behave much like
     operators, but have special syntax mandated by the SQL standard.
    </para>
 
@@ -274,82 +274,82 @@
 
      <tbody>
       <row>
-       <entry> <replaceable>a</> <literal>BETWEEN</> <replaceable>x</> <literal>AND</> <replaceable>y</> </entry>
+       <entry> <replaceable>a</replaceable> <literal>BETWEEN</literal> <replaceable>x</replaceable> <literal>AND</literal> <replaceable>y</replaceable> </entry>
        <entry>between</entry>
       </row>
 
       <row>
-       <entry> <replaceable>a</> <literal>NOT BETWEEN</> <replaceable>x</> <literal>AND</> <replaceable>y</> </entry>
+       <entry> <replaceable>a</replaceable> <literal>NOT BETWEEN</literal> <replaceable>x</replaceable> <literal>AND</literal> <replaceable>y</replaceable> </entry>
        <entry>not between</entry>
       </row>
 
       <row>
-       <entry> <replaceable>a</> <literal>BETWEEN SYMMETRIC</> <replaceable>x</> <literal>AND</> <replaceable>y</> </entry>
+       <entry> <replaceable>a</replaceable> <literal>BETWEEN SYMMETRIC</literal> <replaceable>x</replaceable> <literal>AND</literal> <replaceable>y</replaceable> </entry>
        <entry>between, after sorting the comparison values</entry>
       </row>
 
       <row>
-       <entry> <replaceable>a</> <literal>NOT BETWEEN SYMMETRIC</> <replaceable>x</> <literal>AND</> <replaceable>y</> </entry>
+       <entry> <replaceable>a</replaceable> <literal>NOT BETWEEN SYMMETRIC</literal> <replaceable>x</replaceable> <literal>AND</literal> <replaceable>y</replaceable> </entry>
        <entry>not between, after sorting the comparison values</entry>
       </row>
 
       <row>
-       <entry> <replaceable>a</> <literal>IS DISTINCT FROM</> <replaceable>b</> </entry>
+       <entry> <replaceable>a</replaceable> <literal>IS DISTINCT FROM</literal> <replaceable>b</replaceable> </entry>
        <entry>not equal, treating null like an ordinary value</entry>
       </row>
 
       <row>
-       <entry><replaceable>a</> <literal>IS NOT DISTINCT FROM</> <replaceable>b</></entry>
+       <entry><replaceable>a</replaceable> <literal>IS NOT DISTINCT FROM</literal> <replaceable>b</replaceable></entry>
        <entry>equal, treating null like an ordinary value</entry>
       </row>
 
       <row>
-       <entry> <replaceable>expression</> <literal>IS NULL</> </entry>
+       <entry> <replaceable>expression</replaceable> <literal>IS NULL</literal> </entry>
        <entry>is null</entry>
       </row>
 
       <row>
-       <entry> <replaceable>expression</> <literal>IS NOT NULL</> </entry>
+       <entry> <replaceable>expression</replaceable> <literal>IS NOT NULL</literal> </entry>
        <entry>is not null</entry>
       </row>
 
       <row>
-       <entry> <replaceable>expression</> <literal>ISNULL</> </entry>
+       <entry> <replaceable>expression</replaceable> <literal>ISNULL</literal> </entry>
        <entry>is null (nonstandard syntax)</entry>
       </row>
 
       <row>
-       <entry> <replaceable>expression</> <literal>NOTNULL</> </entry>
+       <entry> <replaceable>expression</replaceable> <literal>NOTNULL</literal> </entry>
        <entry>is not null (nonstandard syntax)</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS TRUE</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS TRUE</literal> </entry>
        <entry>is true</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS NOT TRUE</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS NOT TRUE</literal> </entry>
        <entry>is false or unknown</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS FALSE</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS FALSE</literal> </entry>
        <entry>is false</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS NOT FALSE</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS NOT FALSE</literal> </entry>
        <entry>is true or unknown</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS UNKNOWN</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS UNKNOWN</literal> </entry>
        <entry>is unknown</entry>
       </row>
 
       <row>
-       <entry> <replaceable>boolean_expression</> <literal>IS NOT UNKNOWN</> </entry>
+       <entry> <replaceable>boolean_expression</replaceable> <literal>IS NOT UNKNOWN</literal> </entry>
        <entry>is true or false</entry>
       </row>
      </tbody>
@@ -381,9 +381,9 @@
     <indexterm>
      <primary>BETWEEN SYMMETRIC</primary>
     </indexterm>
-    <literal>BETWEEN SYMMETRIC</> is like <literal>BETWEEN</>
+    <literal>BETWEEN SYMMETRIC</literal> is like <literal>BETWEEN</literal>
     except there is no requirement that the argument to the left of
-    <literal>AND</> be less than or equal to the argument on the right.
+    <literal>AND</literal> be less than or equal to the argument on the right.
     If it is not, those two arguments are automatically swapped, so that
     a nonempty range is always implied.
    </para>
@@ -395,23 +395,23 @@
     <indexterm>
      <primary>IS NOT DISTINCT FROM</primary>
     </indexterm>
-    Ordinary comparison operators yield null (signifying <quote>unknown</>),
+    Ordinary comparison operators yield null (signifying <quote>unknown</quote>),
     not true or false, when either input is null.  For example,
-    <literal>7 = NULL</> yields null, as does <literal>7 &lt;&gt; NULL</>.  When
+    <literal>7 = NULL</literal> yields null, as does <literal>7 &lt;&gt; NULL</literal>.  When
     this behavior is not suitable, use the
-    <literal>IS <optional> NOT </> DISTINCT FROM</literal> predicates:
+    <literal>IS <optional> NOT </optional> DISTINCT FROM</literal> predicates:
 <synopsis>
 <replaceable>a</replaceable> IS DISTINCT FROM <replaceable>b</replaceable>
 <replaceable>a</replaceable> IS NOT DISTINCT FROM <replaceable>b</replaceable>
 </synopsis>
     For non-null inputs, <literal>IS DISTINCT FROM</literal> is
-    the same as the <literal>&lt;&gt;</> operator.  However, if both
+    the same as the <literal>&lt;&gt;</literal> operator.  However, if both
     inputs are null it returns false, and if only one input is
     null it returns true.  Similarly, <literal>IS NOT DISTINCT
     FROM</literal> is identical to <literal>=</literal> for non-null
     inputs, but it returns true when both inputs are null, and false when only
     one input is null. Thus, these predicates effectively act as though null
-    were a normal data value, rather than <quote>unknown</>.
+    were a normal data value, rather than <quote>unknown</quote>.
    </para>
 
    <para>
@@ -443,8 +443,8 @@
    <para>
     Do <emphasis>not</emphasis> write
     <literal><replaceable>expression</replaceable> = NULL</literal>
-    because <literal>NULL</> is not <quote>equal to</quote>
-    <literal>NULL</>.  (The null value represents an unknown value,
+    because <literal>NULL</literal> is not <quote>equal to</quote>
+    <literal>NULL</literal>.  (The null value represents an unknown value,
     and it is not known whether two unknown values are equal.)
    </para>
 
@@ -455,7 +455,7 @@
     returns true if <replaceable>expression</replaceable> evaluates to
     the null value.  It is highly recommended that these applications
     be modified to comply with the SQL standard. However, if that
-    cannot be done the <xref linkend="guc-transform-null-equals">
+    cannot be done the <xref linkend="guc-transform-null-equals"/>
     configuration variable is available. If it is enabled,
     <productname>PostgreSQL</productname> will convert <literal>x =
     NULL</literal> clauses to <literal>x IS NULL</literal>.
@@ -464,16 +464,16 @@
 
    <para>
     If the <replaceable>expression</replaceable> is row-valued, then
-    <literal>IS NULL</> is true when the row expression itself is null
+    <literal>IS NULL</literal> is true when the row expression itself is null
     or when all the row's fields are null, while
-    <literal>IS NOT NULL</> is true when the row expression itself is non-null
+    <literal>IS NOT NULL</literal> is true when the row expression itself is non-null
     and all the row's fields are non-null.  Because of this behavior,
-    <literal>IS NULL</> and <literal>IS NOT NULL</> do not always return
+    <literal>IS NULL</literal> and <literal>IS NOT NULL</literal> do not always return
     inverse results for row-valued expressions; in particular, a row-valued
     expression that contains both null and non-null fields will return false
     for both tests.  In some cases, it may be preferable to
-    write <replaceable>row</replaceable> <literal>IS DISTINCT FROM NULL</>
-    or <replaceable>row</replaceable> <literal>IS NOT DISTINCT FROM NULL</>,
+    write <replaceable>row</replaceable> <literal>IS DISTINCT FROM NULL</literal>
+    or <replaceable>row</replaceable> <literal>IS NOT DISTINCT FROM NULL</literal>,
     which will simply check whether the overall row value is null without any
     additional tests on the row fields.
    </para>
@@ -508,8 +508,8 @@
 </synopsis>
     These will always return true or false, never a null value, even when the
     operand is null.
-    A null input is treated as the logical value <quote>unknown</>.
-    Notice that <literal>IS UNKNOWN</> and <literal>IS NOT UNKNOWN</> are
+    A null input is treated as the logical value <quote>unknown</quote>.
+    Notice that <literal>IS UNKNOWN</literal> and <literal>IS NOT UNKNOWN</literal> are
     effectively the same as <literal>IS NULL</literal> and
     <literal>IS NOT NULL</literal>, respectively, except that the input
     expression must be of Boolean type.
@@ -536,7 +536,7 @@
 
    <para>
     Some comparison-related functions are also available, as shown in <xref
-    linkend="functions-comparison-func-table">.
+    linkend="functions-comparison-func-table"/>.
    </para>
 
   <table id="functions-comparison-func-table">
@@ -591,7 +591,7 @@
    </para>
 
    <para>
-    <xref linkend="functions-math-op-table"> shows the available mathematical operators.
+    <xref linkend="functions-math-op-table"/> shows the available mathematical operators.
    </para>
 
    <table id="functions-math-op-table">
@@ -736,11 +736,11 @@
     the others are available for all numeric data types.  The bitwise
     operators are also available for the bit
     string types <type>bit</type> and <type>bit varying</type>, as
-    shown in <xref linkend="functions-bit-string-op-table">.
+    shown in <xref linkend="functions-bit-string-op-table"/>.
    </para>
 
   <para>
-   <xref linkend="functions-math-func-table"> shows the available
+   <xref linkend="functions-math-func-table"/> shows the available
    mathematical functions.  In the table, <literal>dp</literal>
    indicates <type>double precision</type>.  Many of these functions
    are provided in multiple forms with different argument types.
@@ -835,10 +835,10 @@
         <indexterm>
          <primary>div</primary>
         </indexterm>
-        <literal><function>div(<parameter>y</parameter> <type>numeric</>,
-         <parameter>x</parameter> <type>numeric</>)</function></literal>
+        <literal><function>div(<parameter>y</parameter> <type>numeric</type>,
+         <parameter>x</parameter> <type>numeric</type>)</function></literal>
        </entry>
-       <entry><type>numeric</></entry>
+       <entry><type>numeric</type></entry>
        <entry>integer quotient of <parameter>y</parameter>/<parameter>x</parameter></entry>
        <entry><literal>div(9,4)</literal></entry>
        <entry><literal>2</literal></entry>
@@ -941,7 +941,7 @@
         <parameter>b</parameter> <type>dp</type>)</function></literal>
        </entry>
        <entry><type>dp</type></entry>
-       <entry><parameter>a</> raised to the power of <parameter>b</parameter></entry>
+       <entry><parameter>a</parameter> raised to the power of <parameter>b</parameter></entry>
        <entry><literal>power(9.0, 3.0)</literal></entry>
        <entry><literal>729</literal></entry>
       </row>
@@ -950,7 +950,7 @@
        <entry><literal><function>power(<parameter>a</parameter> <type>numeric</type>,
         <parameter>b</parameter> <type>numeric</type>)</function></literal></entry>
        <entry><type>numeric</type></entry>
-       <entry><parameter>a</> raised to the power of <parameter>b</parameter></entry>
+       <entry><parameter>a</parameter> raised to the power of <parameter>b</parameter></entry>
        <entry><literal>power(9.0, 3.0)</literal></entry>
        <entry><literal>729</literal></entry>
       </row>
@@ -1056,10 +1056,10 @@
         </indexterm>
         <literal><function>width_bucket(<parameter>operand</parameter> <type>dp</type>, <parameter>b1</parameter> <type>dp</type>, <parameter>b2</parameter> <type>dp</type>, <parameter>count</parameter> <type>int</type>)</function></literal></entry>
        <entry><type>int</type></entry>
-       <entry>return the bucket number to which <parameter>operand</> would
-       be assigned in a histogram having <parameter>count</> equal-width
-       buckets spanning the range <parameter>b1</> to <parameter>b2</>;
-       returns <literal>0</> or <literal><parameter>count</>+1</literal> for
+       <entry>return the bucket number to which <parameter>operand</parameter> would
+       be assigned in a histogram having <parameter>count</parameter> equal-width
+       buckets spanning the range <parameter>b1</parameter> to <parameter>b2</parameter>;
+       returns <literal>0</literal> or <literal><parameter>count</parameter>+1</literal> for
        an input outside the range</entry>
        <entry><literal>width_bucket(5.35, 0.024, 10.06, 5)</literal></entry>
        <entry><literal>3</literal></entry>
@@ -1068,10 +1068,10 @@
       <row>
        <entry><literal><function>width_bucket(<parameter>operand</parameter> <type>numeric</type>, <parameter>b1</parameter> <type>numeric</type>, <parameter>b2</parameter> <type>numeric</type>, <parameter>count</parameter> <type>int</type>)</function></literal></entry>
        <entry><type>int</type></entry>
-       <entry>return the bucket number to which <parameter>operand</> would
-       be assigned in a histogram having <parameter>count</> equal-width
-       buckets spanning the range <parameter>b1</> to <parameter>b2</>;
-       returns <literal>0</> or <literal><parameter>count</>+1</literal> for
+       <entry>return the bucket number to which <parameter>operand</parameter> would
+       be assigned in a histogram having <parameter>count</parameter> equal-width
+       buckets spanning the range <parameter>b1</parameter> to <parameter>b2</parameter>;
+       returns <literal>0</literal> or <literal><parameter>count</parameter>+1</literal> for
        an input outside the range</entry>
        <entry><literal>width_bucket(5.35, 0.024, 10.06, 5)</literal></entry>
        <entry><literal>3</literal></entry>
@@ -1080,10 +1080,10 @@
       <row>
        <entry><literal><function>width_bucket(<parameter>operand</parameter> <type>anyelement</type>, <parameter>thresholds</parameter> <type>anyarray</type>)</function></literal></entry>
        <entry><type>int</type></entry>
-       <entry>return the bucket number to which <parameter>operand</> would
+       <entry>return the bucket number to which <parameter>operand</parameter> would
        be assigned given an array listing the lower bounds of the buckets;
-       returns <literal>0</> for an input less than the first lower bound;
-       the <parameter>thresholds</> array <emphasis>must be sorted</>,
+       returns <literal>0</literal> for an input less than the first lower bound;
+       the <parameter>thresholds</parameter> array <emphasis>must be sorted</emphasis>,
        smallest first, or unexpected results will be obtained</entry>
        <entry><literal>width_bucket(now(), array['yesterday', 'today', 'tomorrow']::timestamptz[])</literal></entry>
        <entry><literal>2</literal></entry>
@@ -1093,7 +1093,7 @@
    </table>
 
   <para>
-    <xref linkend="functions-math-random-table"> shows functions for
+    <xref linkend="functions-math-random-table"/> shows functions for
     generating random numbers.
   </para>
 
@@ -1139,11 +1139,11 @@
    The characteristics of the values returned by
    <literal><function>random()</function></literal> depend
    on the system implementation. It is not suitable for cryptographic
-   applications; see <xref linkend="pgcrypto"> module for an alternative.
+   applications; see <xref linkend="pgcrypto"/> module for an alternative.
    </para>
 
   <para>
-   Finally, <xref linkend="functions-math-trig-table"> shows the
+   Finally, <xref linkend="functions-math-trig-table"/> shows the
    available trigonometric functions.  All trigonometric functions
    take arguments and return values of type <type>double
    precision</type>.  Each of the trigonometric functions comes in
@@ -1303,7 +1303,7 @@
     and <literal><function>degrees()</function></literal> shown earlier.
     However, using the degree-based trigonometric functions is preferred,
     as that way avoids round-off error for special cases such
-    as <literal>sind(30)</>.
+    as <literal>sind(30)</literal>.
    </para>
   </note>
 
@@ -1328,10 +1328,10 @@
     <acronym>SQL</acronym> defines some string functions that use
     key words, rather than commas, to separate
     arguments.  Details are in
-    <xref linkend="functions-string-sql">.
-    <productname>PostgreSQL</> also provides versions of these functions
+    <xref linkend="functions-string-sql"/>.
+    <productname>PostgreSQL</productname> also provides versions of these functions
     that use the regular function invocation syntax
-    (see <xref linkend="functions-string-other">).
+    (see <xref linkend="functions-string-other"/>).
    </para>
 
    <note>
@@ -1339,12 +1339,12 @@
      Before <productname>PostgreSQL</productname> 8.3, these functions would
      silently accept values of several non-string data types as well, due to
      the presence of implicit coercions from those data types to
-     <type>text</>.  Those coercions have been removed because they frequently
+     <type>text</type>.  Those coercions have been removed because they frequently
      caused surprising behaviors.  However, the string concatenation operator
-     (<literal>||</>) still accepts non-string input, so long as at least one
+     (<literal>||</literal>) still accepts non-string input, so long as at least one
      input is of a string type, as shown in <xref
-     linkend="functions-string-sql">.  For other cases, insert an explicit
-     coercion to <type>text</> if you need to duplicate the previous behavior.
+     linkend="functions-string-sql"/>.  For other cases, insert an explicit
+     coercion to <type>text</type> if you need to duplicate the previous behavior.
     </para>
    </note>
 
@@ -1504,7 +1504,7 @@
        <entry><type>text</type></entry>
        <entry>
         Extract substring matching POSIX regular expression. See
-        <xref linkend="functions-matching"> for more information on pattern
+        <xref linkend="functions-matching"/> for more information on pattern
         matching.
        </entry>
        <entry><literal>substring('Thomas' from '...$')</literal></entry>
@@ -1516,7 +1516,7 @@
        <entry><type>text</type></entry>
        <entry>
         Extract substring matching <acronym>SQL</acronym> regular expression.
-        See <xref linkend="functions-matching"> for more information on
+        See <xref linkend="functions-matching"/> for more information on
         pattern matching.
        </entry>
        <entry><literal>substring('Thomas' from '%#"o_a#"_' for '#')</literal></entry>
@@ -1536,7 +1536,7 @@
        <entry>
         Remove the longest string containing only characters from
         <parameter>characters</parameter> (a space by default) from the
-        start, end, or both ends (<literal>both</> is the default)
+        start, end, or both ends (<literal>both</literal> is the default)
         of <parameter>string</parameter>
        </entry>
        <entry><literal>trim(both 'xyz' from 'yxTomxx')</literal></entry>
@@ -1553,7 +1553,7 @@
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Non-standard syntax for <function>trim()</>
+        Non-standard syntax for <function>trim()</function>
        </entry>
        <entry><literal>trim(both from 'yxTomxx', 'xyz')</literal></entry>
        <entry><literal>Tom</literal></entry>
@@ -1577,8 +1577,8 @@
 
    <para>
     Additional string manipulation functions are available and are
-    listed in <xref linkend="functions-string-other">.  Some of them are used internally to implement the
-    <acronym>SQL</acronym>-standard string functions listed in <xref linkend="functions-string-sql">.
+    listed in <xref linkend="functions-string-other"/>.  Some of them are used internally to implement the
+    <acronym>SQL</acronym>-standard string functions listed in <xref linkend="functions-string-sql"/>.
    </para>
 
    <table id="functions-string-other">
@@ -1702,7 +1702,7 @@
         <parameter>string</parameter> must be valid in this encoding.
         Conversions can be defined by <command>CREATE CONVERSION</command>.
         Also there are some predefined conversions. See <xref
-        linkend="conversion-names"> for available conversions.
+        linkend="conversion-names"/> for available conversions.
        </entry>
        <entry><literal>convert('text_in_utf8', 'UTF8', 'LATIN1')</literal></entry>
        <entry><literal>text_in_utf8</literal> represented in Latin-1
@@ -1753,8 +1753,8 @@
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
-        Decode binary data from textual representation in <parameter>string</>.
-        Options for <parameter>format</> are same as in <function>encode</>.
+        Decode binary data from textual representation in <parameter>string</parameter>.
+        Options for <parameter>format</parameter> are same as in <function>encode</function>.
        </entry>
        <entry><literal>decode('MTIzAAE=', 'base64')</literal></entry>
        <entry><literal>\x3132330001</literal></entry>
@@ -1771,9 +1771,9 @@
        <entry><type>text</type></entry>
        <entry>
         Encode binary data into a textual representation.  Supported
-        formats are: <literal>base64</>, <literal>hex</>, <literal>escape</>.
-        <literal>escape</> converts zero bytes and high-bit-set bytes to
-        octal sequences (<literal>\</><replaceable>nnn</>) and
+        formats are: <literal>base64</literal>, <literal>hex</literal>, <literal>escape</literal>.
+        <literal>escape</literal> converts zero bytes and high-bit-set bytes to
+        octal sequences (<literal>\</literal><replaceable>nnn</replaceable>) and
         doubles backslashes.
        </entry>
        <entry><literal>encode(E'123\\000\\001', 'base64')</literal></entry>
@@ -1791,8 +1791,8 @@
        <entry><type>text</type></entry>
        <entry>
          Format arguments according to a format string.
-         This function is similar to the C function <function>sprintf</>.
-         See <xref linkend="functions-string-format">.
+         This function is similar to the C function <function>sprintf</function>.
+         See <xref linkend="functions-string-format"/>.
        </entry>
        <entry><literal>format('Hello %s, %1$s', 'World')</literal></entry>
        <entry><literal>Hello World, World</literal></entry>
@@ -1825,8 +1825,8 @@
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Return first <replaceable>n</> characters in the string. When <replaceable>n</>
-        is negative, return all but last |<replaceable>n</>| characters.
+        Return first <replaceable>n</replaceable> characters in the string. When <replaceable>n</replaceable>
+        is negative, return all but last |<replaceable>n</replaceable>| characters.
         </entry>
        <entry><literal>left('abcde', 2)</literal></entry>
        <entry><literal>ab</literal></entry>
@@ -1929,11 +1929,11 @@
         Split <parameter>qualified_identifier</parameter> into an array of
         identifiers, removing any quoting of individual identifiers.  By
         default, extra characters after the last identifier are considered an
-        error; but if the second parameter is <literal>false</>, then such
+        error; but if the second parameter is <literal>false</literal>, then such
         extra characters are ignored. (This behavior is useful for parsing
         names for objects like functions.) Note that this function does not
         truncate over-length identifiers. If you want truncation you can cast
-        the result to <type>name[]</>.
+        the result to <type>name[]</type>.
        </entry>
        <entry><literal>parse_ident('"SomeSchema".someTable')</literal></entry>
        <entry><literal>{SomeSchema,sometable}</literal></entry>
@@ -1968,7 +1968,7 @@
         Quotes are added only if necessary (i.e., if the string contains
         non-identifier characters or would be case-folded).
         Embedded quotes are properly doubled.
-        See also <xref linkend="plpgsql-quote-literal-example">.
+        See also <xref linkend="plpgsql-quote-literal-example"/>.
        </entry>
        <entry><literal>quote_ident('Foo bar')</literal></entry>
        <entry><literal>"Foo bar"</literal></entry>
@@ -1989,7 +1989,7 @@
         Note that <function>quote_literal</function> returns null on null
         input; if the argument might be null,
         <function>quote_nullable</function> is often more suitable.
-        See also <xref linkend="plpgsql-quote-literal-example">.
+        See also <xref linkend="plpgsql-quote-literal-example"/>.
        </entry>
        <entry><literal>quote_literal(E'O\'Reilly')</literal></entry>
        <entry><literal>'O''Reilly'</literal></entry>
@@ -2017,9 +2017,9 @@
        <entry>
         Return the given string suitably quoted to be used as a string literal
         in an <acronym>SQL</acronym> statement string; or, if the argument
-        is null, return <literal>NULL</>.
+        is null, return <literal>NULL</literal>.
         Embedded single-quotes and backslashes are properly doubled.
-        See also <xref linkend="plpgsql-quote-literal-example">.
+        See also <xref linkend="plpgsql-quote-literal-example"/>.
        </entry>
        <entry><literal>quote_nullable(NULL)</literal></entry>
        <entry><literal>NULL</literal></entry>
@@ -2030,7 +2030,7 @@
        <entry><type>text</type></entry>
        <entry>
         Coerce the given value to text and then quote it as a literal;
-        or, if the argument is null, return <literal>NULL</>.
+        or, if the argument is null, return <literal>NULL</literal>.
         Embedded single-quotes and backslashes are properly doubled.
        </entry>
        <entry><literal>quote_nullable(42.5)</literal></entry>
@@ -2048,7 +2048,7 @@
        <entry>
         Return captured substring(s) resulting from the first match of a POSIX
         regular expression to the <parameter>string</parameter>. See
-        <xref linkend="functions-posix-regexp"> for more information.
+        <xref linkend="functions-posix-regexp"/> for more information.
        </entry>
        <entry><literal>regexp_match('foobarbequebaz', '(bar)(beque)')</literal></entry>
        <entry><literal>{bar,beque}</literal></entry>
@@ -2065,7 +2065,7 @@
        <entry>
         Return captured substring(s) resulting from matching a POSIX regular
         expression to the <parameter>string</parameter>. See
-        <xref linkend="functions-posix-regexp"> for more information.
+        <xref linkend="functions-posix-regexp"/> for more information.
        </entry>
        <entry><literal>regexp_matches('foobarbequebaz', 'ba.', 'g')</literal></entry>
        <entry><literal>{bar}</literal><para><literal>{baz}</literal></para> (2 rows)</entry>
@@ -2081,7 +2081,7 @@
        <entry><type>text</type></entry>
        <entry>
         Replace substring(s) matching a POSIX regular expression. See
-        <xref linkend="functions-posix-regexp"> for more information.
+        <xref linkend="functions-posix-regexp"/> for more information.
        </entry>
        <entry><literal>regexp_replace('Thomas', '.[mN]a.', 'M')</literal></entry>
        <entry><literal>ThM</literal></entry>
@@ -2097,7 +2097,7 @@
        <entry><type>text[]</type></entry>
        <entry>
         Split <parameter>string</parameter> using a POSIX regular expression as
-        the delimiter.  See <xref linkend="functions-posix-regexp"> for more
+        the delimiter.  See <xref linkend="functions-posix-regexp"/> for more
         information.
        </entry>
        <entry><literal>regexp_split_to_array('hello world', E'\\s+')</literal></entry>
@@ -2114,7 +2114,7 @@
        <entry><type>setof text</type></entry>
        <entry>
         Split <parameter>string</parameter> using a POSIX regular expression as
-        the delimiter.  See <xref linkend="functions-posix-regexp"> for more
+        the delimiter.  See <xref linkend="functions-posix-regexp"/> for more
         information.
        </entry>
        <entry><literal>regexp_split_to_table('hello world', E'\\s+')</literal></entry>
@@ -2177,8 +2177,8 @@
        </entry>
        <entry><type>text</type></entry>
        <entry>
-        Return last <replaceable>n</> characters in the string. When <replaceable>n</>
-        is negative, return all but first |<replaceable>n</>| characters.
+        Return last <replaceable>n</replaceable> characters in the string. When <replaceable>n</replaceable>
+        is negative, return all but first |<replaceable>n</replaceable>| characters.
        </entry>
        <entry><literal>right('abcde', 2)</literal></entry>
        <entry><literal>de</literal></entry>
@@ -2285,8 +2285,8 @@
        <entry><type>text</type></entry>
        <entry>
        Convert <parameter>string</parameter> to <acronym>ASCII</acronym> from another encoding
-       (only supports conversion from  <literal>LATIN1</>, <literal>LATIN2</>, <literal>LATIN9</>,
-       and <literal>WIN1250</> encodings)
+       (only supports conversion from  <literal>LATIN1</literal>, <literal>LATIN2</literal>, <literal>LATIN9</literal>,
+       and <literal>WIN1250</literal> encodings)
        </entry>
        <entry><literal>to_ascii('Karel')</literal></entry>
        <entry><literal>Karel</literal></entry>
@@ -2339,7 +2339,7 @@
     <function>format</function> functions are variadic, so it is possible to
     pass the values to be concatenated or formatted as an array marked with
     the <literal>VARIADIC</literal> keyword (see <xref
-    linkend="xfunc-sql-variadic-functions">).  The array's elements are
+    linkend="xfunc-sql-variadic-functions"/>).  The array's elements are
     treated as if they were separate ordinary arguments to the function.
     If the variadic array argument is NULL, <function>concat</function>
     and <function>concat_ws</function> return NULL, but
@@ -2348,7 +2348,7 @@
 
    <para>
    See also the aggregate function <function>string_agg</function> in
-   <xref linkend="functions-aggregate">.
+   <xref linkend="functions-aggregate"/>.
    </para>
 
    <table id="conversion-names">
@@ -3154,30 +3154,30 @@
     </indexterm>
 
     <para>
-     The function <function>format</> produces output formatted according to
+     The function <function>format</function> produces output formatted according to
      a format string, in a style similar to the C function
-     <function>sprintf</>.
+     <function>sprintf</function>.
     </para>
 
     <para>
 <synopsis>
-<function>format</>(<parameter>formatstr</> <type>text</> [, <parameter>formatarg</> <type>"any"</> [, ...] ])
+<function>format</function>(<parameter>formatstr</parameter> <type>text</type> [, <parameter>formatarg</parameter> <type>"any"</type> [, ...] ])
 </synopsis>
-     <replaceable>formatstr</> is a format string that specifies how the
+     <replaceable>formatstr</replaceable> is a format string that specifies how the
      result should be formatted.  Text in the format string is copied
-     directly to the result, except where <firstterm>format specifiers</> are
+     directly to the result, except where <firstterm>format specifiers</firstterm> are
      used.  Format specifiers act as placeholders in the string, defining how
      subsequent function arguments should be formatted and inserted into the
-     result.  Each <replaceable>formatarg</> argument is converted to text
+     result.  Each <replaceable>formatarg</replaceable> argument is converted to text
      according to the usual output rules for its data type, and then formatted
      and inserted into the result string according to the format specifier(s).
     </para>
 
     <para>
-     Format specifiers are introduced by a <literal>%</> character and have
+     Format specifiers are introduced by a <literal>%</literal> character and have
      the form
 <synopsis>
-%[<replaceable>position</>][<replaceable>flags</>][<replaceable>width</>]<replaceable>type</>
+%[<replaceable>position</replaceable>][<replaceable>flags</replaceable>][<replaceable>width</replaceable>]<replaceable>type</replaceable>
 </synopsis>
      where the component fields are:
 
@@ -3186,10 +3186,10 @@
        <term><replaceable>position</replaceable> (optional)</term>
        <listitem>
         <para>
-         A string of the form <literal><replaceable>n</>$</> where
-         <replaceable>n</> is the index of the argument to print.
+         A string of the form <literal><replaceable>n</replaceable>$</literal> where
+         <replaceable>n</replaceable> is the index of the argument to print.
          Index 1 means the first argument after
-         <replaceable>formatstr</>.  If the <replaceable>position</> is
+         <replaceable>formatstr</replaceable>.  If the <replaceable>position</replaceable> is
          omitted, the default is to use the next argument in sequence.
         </para>
        </listitem>
@@ -3201,8 +3201,8 @@
         <para>
          Additional options controlling how the format specifier's output is
          formatted.  Currently the only supported flag is a minus sign
-         (<literal>-</>) which will cause the format specifier's output to be
-         left-justified.  This has no effect unless the <replaceable>width</>
+         (<literal>-</literal>) which will cause the format specifier's output to be
+         left-justified.  This has no effect unless the <replaceable>width</replaceable>
          field is also specified.
         </para>
        </listitem>
@@ -3212,23 +3212,23 @@
        <term><replaceable>width</replaceable> (optional)</term>
        <listitem>
         <para>
-         Specifies the <emphasis>minimum</> number of characters to use to
+         Specifies the <emphasis>minimum</emphasis> number of characters to use to
          display the format specifier's output.  The output is padded on the
-         left or right (depending on the <literal>-</> flag) with spaces as
+         left or right (depending on the <literal>-</literal> flag) with spaces as
          needed to fill the width.  A too-small width does not cause
          truncation of the output, but is simply ignored.  The width may be
          specified using any of the following: a positive integer; an
-         asterisk (<literal>*</>) to use the next function argument as the
-         width; or a string of the form <literal>*<replaceable>n</>$</> to
-         use the <replaceable>n</>th function argument as the width.
+         asterisk (<literal>*</literal>) to use the next function argument as the
+         width; or a string of the form <literal>*<replaceable>n</replaceable>$</literal> to
+         use the <replaceable>n</replaceable>th function argument as the width.
         </para>
 
         <para>
          If the width comes from a function argument, that argument is
          consumed before the argument that is used for the format specifier's
          value.  If the width argument is negative, the result is left
-         aligned (as if the <literal>-</> flag had been specified) within a
-         field of length <function>abs</>(<replaceable>width</replaceable>).
+         aligned (as if the <literal>-</literal> flag had been specified) within a
+         field of length <function>abs</function>(<replaceable>width</replaceable>).
         </para>
        </listitem>
       </varlistentry>
@@ -3251,13 +3251,13 @@
             <literal>I</literal> treats the argument value as an SQL
             identifier, double-quoting it if necessary.
             It is an error for the value to be null (equivalent to
-            <function>quote_ident</>).
+            <function>quote_ident</function>).
            </para>
           </listitem>
           <listitem>
            <para>
             <literal>L</literal> quotes the argument value as an SQL literal.
-            A null value is displayed as the string <literal>NULL</>, without
+            A null value is displayed as the string <literal>NULL</literal>, without
             quotes (equivalent to <function>quote_nullable</function>).
            </para>
           </listitem>
@@ -3270,7 +3270,7 @@
 
     <para>
      In addition to the format specifiers described above, the special sequence
-     <literal>%%</> may be used to output a literal <literal>%</> character.
+     <literal>%%</literal> may be used to output a literal <literal>%</literal> character.
     </para>
 
     <para>
@@ -3281,7 +3281,7 @@ SELECT format('Hello %s', 'World');
 <lineannotation>Result: </lineannotation><computeroutput>Hello World</computeroutput>
 
 SELECT format('Testing %s, %s, %s, %%', 'one', 'two', 'three');
-<lineannotation>Result: </><computeroutput>Testing one, two, three, %</>
+<lineannotation>Result: </lineannotation><computeroutput>Testing one, two, three, %</computeroutput>
 
 SELECT format('INSERT INTO %I VALUES(%L)', 'Foo bar', E'O\'Reilly');
 <lineannotation>Result: </lineannotation><computeroutput>INSERT INTO "Foo bar" VALUES('O''Reilly')</computeroutput>
@@ -3293,65 +3293,65 @@ SELECT format('INSERT INTO %I VALUES(%L)', 'locations', E'C:\\Program Files');
 
     <para>
      Here are examples using <replaceable>width</replaceable> fields
-     and the <literal>-</> flag:
+     and the <literal>-</literal> flag:
 
 <screen>
 SELECT format('|%10s|', 'foo');
-<lineannotation>Result: </><computeroutput>|       foo|</>
+<lineannotation>Result: </lineannotation><computeroutput>|       foo|</computeroutput>
 
 SELECT format('|%-10s|', 'foo');
-<lineannotation>Result: </><computeroutput>|foo       |</>
+<lineannotation>Result: </lineannotation><computeroutput>|foo       |</computeroutput>
 
 SELECT format('|%*s|', 10, 'foo');
-<lineannotation>Result: </><computeroutput>|       foo|</>
+<lineannotation>Result: </lineannotation><computeroutput>|       foo|</computeroutput>
 
 SELECT format('|%*s|', -10, 'foo');
-<lineannotation>Result: </><computeroutput>|foo       |</>
+<lineannotation>Result: </lineannotation><computeroutput>|foo       |</computeroutput>
 
 SELECT format('|%-*s|', 10, 'foo');
-<lineannotation>Result: </><computeroutput>|foo       |</>
+<lineannotation>Result: </lineannotation><computeroutput>|foo       |</computeroutput>
 
 SELECT format('|%-*s|', -10, 'foo');
-<lineannotation>Result: </><computeroutput>|foo       |</>
+<lineannotation>Result: </lineannotation><computeroutput>|foo       |</computeroutput>
 </screen>
     </para>
 
     <para>
-     These examples show use of <replaceable>position</> fields:
+     These examples show use of <replaceable>position</replaceable> fields:
 
 <screen>
 SELECT format('Testing %3$s, %2$s, %1$s', 'one', 'two', 'three');
-<lineannotation>Result: </><computeroutput>Testing three, two, one</>
+<lineannotation>Result: </lineannotation><computeroutput>Testing three, two, one</computeroutput>
 
 SELECT format('|%*2$s|', 'foo', 10, 'bar');
-<lineannotation>Result: </><computeroutput>|       bar|</>
+<lineannotation>Result: </lineannotation><computeroutput>|       bar|</computeroutput>
 
 SELECT format('|%1$*2$s|', 'foo', 10, 'bar');
-<lineannotation>Result: </><computeroutput>|       foo|</>
+<lineannotation>Result: </lineannotation><computeroutput>|       foo|</computeroutput>
 </screen>
     </para>
 
     <para>
-     Unlike the standard C function <function>sprintf</>,
-     <productname>PostgreSQL</>'s <function>format</> function allows format
-     specifiers with and without <replaceable>position</> fields to be mixed
+     Unlike the standard C function <function>sprintf</function>,
+     <productname>PostgreSQL</productname>'s <function>format</function> function allows format
+     specifiers with and without <replaceable>position</replaceable> fields to be mixed
      in the same format string.  A format specifier without a
-     <replaceable>position</> field always uses the next argument after the
+     <replaceable>position</replaceable> field always uses the next argument after the
      last argument consumed.
-     In addition, the <function>format</> function does not require all
+     In addition, the <function>format</function> function does not require all
      function arguments to be used in the format string.
      For example:
 
 <screen>
 SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
-<lineannotation>Result: </><computeroutput>Testing three, two, three</>
+<lineannotation>Result: </lineannotation><computeroutput>Testing three, two, three</computeroutput>
 </screen>
     </para>
 
     <para>
-     The <literal>%I</> and <literal>%L</> format specifiers are particularly
+     The <literal>%I</literal> and <literal>%L</literal> format specifiers are particularly
      useful for safely constructing dynamic SQL statements.  See
-     <xref linkend="plpgsql-quote-literal-example">.
+     <xref linkend="plpgsql-quote-literal-example"/>.
     </para>
    </sect2>
 
@@ -3375,16 +3375,16 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
     <acronym>SQL</acronym> defines some string functions that use
     key words, rather than commas, to separate
     arguments.  Details are in
-    <xref linkend="functions-binarystring-sql">.
-    <productname>PostgreSQL</> also provides versions of these functions
+    <xref linkend="functions-binarystring-sql"/>.
+    <productname>PostgreSQL</productname> also provides versions of these functions
     that use the regular function invocation syntax
-    (see <xref linkend="functions-binarystring-other">).
+    (see <xref linkend="functions-binarystring-other"/>).
    </para>
 
    <note>
     <para>
      The sample results shown on this page assume that the server parameter
-     <link linkend="guc-bytea-output"><varname>bytea_output</></link> is set
+     <link linkend="guc-bytea-output"><varname>bytea_output</varname></link> is set
      to <literal>escape</literal> (the traditional PostgreSQL format).
     </para>
    </note>
@@ -3498,10 +3498,10 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
 
    <para>
     Additional binary string manipulation functions are available and
-    are listed in <xref linkend="functions-binarystring-other">.  Some
+    are listed in <xref linkend="functions-binarystring-other"/>.  Some
     of them are used internally to implement the
     <acronym>SQL</acronym>-standard string functions listed in <xref
-    linkend="functions-binarystring-sql">.
+    linkend="functions-binarystring-sql"/>.
    </para>
 
    <table id="functions-binarystring-other">
@@ -3546,8 +3546,8 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
       </entry>
       <entry><type>bytea</type></entry>
       <entry>
-       Decode binary data from textual representation in <parameter>string</>.
-       Options for <parameter>format</> are same as in <function>encode</>.
+       Decode binary data from textual representation in <parameter>string</parameter>.
+       Options for <parameter>format</parameter> are same as in <function>encode</function>.
       </entry>
       <entry><literal>decode(E'123\\000456', 'escape')</literal></entry>
       <entry><literal>123\000456</literal></entry>
@@ -3564,9 +3564,9 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
       <entry><type>text</type></entry>
       <entry>
        Encode binary data into a textual representation.  Supported
-       formats are: <literal>base64</>, <literal>hex</>, <literal>escape</>.
-       <literal>escape</> converts zero bytes and high-bit-set bytes to
-       octal sequences (<literal>\</><replaceable>nnn</>) and
+       formats are: <literal>base64</literal>, <literal>hex</literal>, <literal>escape</literal>.
+       <literal>escape</literal> converts zero bytes and high-bit-set bytes to
+       octal sequences (<literal>\</literal><replaceable>nnn</replaceable>) and
        doubles backslashes.
       </entry>
       <entry><literal>encode(E'123\\000456'::bytea, 'escape')</literal></entry>
@@ -3640,7 +3640,7 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
        returning the result in hexadecimal
       </entry>
       <entry><literal>md5(E'Th\\000omas'::bytea)</literal></entry>
-      <entry><literal>8ab2d3c9689aaf18 b4958c334c82d8b1</literal></entry>
+      <entry><literal>8ab2d3c9689aaf18&#x200B;b4958c334c82d8b1</literal></entry>
      </row>
 
       <row>
@@ -3649,7 +3649,7 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
          <primary>set_bit</primary>
         </indexterm>
         <literal><function>set_bit(<parameter>string</parameter>,
-        <parameter>offset</parameter>, <parameter>newvalue</>)</function></literal>
+        <parameter>offset</parameter>, <parameter>newvalue</parameter>)</function></literal>
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
@@ -3665,7 +3665,7 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
          <primary>set_byte</primary>
         </indexterm>
         <literal><function>set_byte(<parameter>string</parameter>,
-        <parameter>offset</parameter>, <parameter>newvalue</>)</function></literal>
+        <parameter>offset</parameter>, <parameter>newvalue</parameter>)</function></literal>
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
@@ -3674,22 +3674,91 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
        <entry><literal>set_byte(E'Th\\000omas'::bytea, 4, 64)</literal></entry>
        <entry><literal>Th\000o@as</literal></entry>
       </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>sha224</primary>
+        </indexterm>
+        <literal><function>sha224(<type>bytea</type>)</function></literal>
+       </entry>
+       <entry><type>bytea</type></entry>
+       <entry>
+        SHA-224 hash
+       </entry>
+       <entry><literal>sha224('abc')</literal></entry>
+       <entry><literal>\x23097d223405d8228642a477bda2&#x200B;55b32aadbce4bda0b3f7e36c9da7</literal></entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>sha256</primary>
+        </indexterm>
+        <literal><function>sha256(<type>bytea</type>)</function></literal>
+       </entry>
+       <entry><type>bytea</type></entry>
+       <entry>
+        SHA-256 hash
+       </entry>
+       <entry><literal>sha256('abc')</literal></entry>
+       <entry><literal>\xba7816bf8f01cfea414140de5dae2223&#x200B;b00361a396177a9cb410ff61f20015ad</literal></entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>sha384</primary>
+        </indexterm>
+        <literal><function>sha384(<type>bytea</type>)</function></literal>
+       </entry>
+       <entry><type>bytea</type></entry>
+       <entry>
+        SHA-384 hash
+       </entry>
+       <entry><literal>sha384('abc')</literal></entry>
+       <entry><literal>\xcb00753f45a35e8bb5a03d699ac65007&#x200B;272c32ab0eded1631a8b605a43ff5bed&#x200B;8086072ba1e7cc2358baeca134c825a7</literal></entry>
+      </row>
+
+      <row>
+       <entry>
+        <indexterm>
+         <primary>sha512</primary>
+        </indexterm>
+        <literal><function>sha512(<type>bytea</type>)</function></literal>
+       </entry>
+       <entry><type>bytea</type></entry>
+       <entry>
+        SHA-512 hash
+       </entry>
+       <entry><literal>sha512('abc')</literal></entry>
+       <entry><literal>\xddaf35a193617abacc417349ae204131&#x200B;12e6fa4e89a97ea20a9eeee64b55d39a&#x200B;2192992a274fc1a836ba3c23a3feebbd&#x200B;454d4423643ce80e2a9ac94fa54ca49f</literal></entry>
+      </row>
     </tbody>
    </tgroup>
   </table>
 
   <para>
-   <function>get_byte</> and <function>set_byte</> number the first byte
+   <function>get_byte</function> and <function>set_byte</function> number the first byte
    of a binary string as byte 0.
-   <function>get_bit</> and <function>set_bit</> number bits from the
+   <function>get_bit</function> and <function>set_bit</function> number bits from the
    right within each byte; for example bit 0 is the least significant bit of
    the first byte, and bit 15 is the most significant bit of the second byte.
   </para>
 
+  <para>
+   Note that for historic reasons, the function <function>md5</function>
+   returns a hex-encoded value of type <type>text</type> whereas the SHA-2
+   functions return type <type>bytea</type>.  Use the functions
+   <function>encode</function> and <function>decode</function> to convert
+   between the two, for example <literal>encode(sha256('abc'),
+   'hex')</literal> to get a hex-encoded text representation.
+  </para>
+
   <para>
    See also the aggregate function <function>string_agg</function> in
-   <xref linkend="functions-aggregate"> and the large object functions
-   in <xref linkend="lo-funcs">.
+   <xref linkend="functions-aggregate"/> and the large object functions
+   in <xref linkend="lo-funcs"/>.
   </para>
  </sect1>
 
@@ -3707,7 +3776,7 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
     manipulating bit strings, that is values of the types
     <type>bit</type> and <type>bit varying</type>.  Aside from the
     usual comparison operators, the operators
-    shown in <xref linkend="functions-bit-string-op-table"> can be used.
+    shown in <xref linkend="functions-bit-string-op-table"/> can be used.
     Bit string operands of <literal>&amp;</literal>, <literal>|</literal>,
     and <literal>#</literal> must be of equal length.  When bit
     shifting, the original length of the string is preserved, as shown
@@ -3802,7 +3871,7 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
 
    <para>
     In addition, it is possible to cast integral values to and from type
-    <type>bit</>.
+    <type>bit</type>.
     Some examples:
 <programlisting>
 44::bit(10)                    <lineannotation>0000101100</lineannotation>
@@ -3810,15 +3879,15 @@ SELECT format('Testing %3$s, %2$s, %s', 'one', 'two', 'three');
 cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
 '1110'::bit(4)::integer        <lineannotation>14</lineannotation>
 </programlisting>
-    Note that casting to just <quote>bit</> means casting to
-    <literal>bit(1)</>, and so will deliver only the least significant
+    Note that casting to just <quote>bit</quote> means casting to
+    <literal>bit(1)</literal>, and so will deliver only the least significant
     bit of the integer.
    </para>
 
     <note>
      <para>
-      Casting an integer to <type>bit(n)</> copies the rightmost
-      <literal>n</> bits.  Casting an integer to a bit string width wider
+      Casting an integer to <type>bit(n)</type> copies the rightmost
+      <literal>n</literal> bits.  Casting an integer to a bit string width wider
       than the integer itself will sign-extend on the left.
      </para>
     </note>
@@ -3840,7 +3909,7 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
     more recent <function>SIMILAR TO</function> operator (added in
     SQL:1999), and <acronym>POSIX</acronym>-style regular
     expressions.  Aside from the basic <quote>does this string match
-    this pattern?</> operators, functions are available to extract
+    this pattern?</quote> operators, functions are available to extract
     or replace matching substrings and to split a string at matching
     locations.
    </para>
@@ -3935,9 +4004,9 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
 
    <note>
     <para>
-     If you have <xref linkend="guc-standard-conforming-strings"> turned off,
+     If you have <xref linkend="guc-standard-conforming-strings"/> turned off,
      any backslashes you write in literal string constants will need to be
-     doubled.  See <xref linkend="sql-syntax-strings"> for more information.
+     doubled.  See <xref linkend="sql-syntax-strings"/> for more information.
     </para>
    </note>
 
@@ -4004,9 +4073,9 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
     can match any part of the string.
     Also like
     <function>LIKE</function>, <function>SIMILAR TO</function> uses
-    <literal>_</> and <literal>%</> as wildcard characters denoting
+    <literal>_</literal> and <literal>%</literal> as wildcard characters denoting
     any single character and any string, respectively (these are
-    comparable to <literal>.</> and <literal>.*</> in POSIX regular
+    comparable to <literal>.</literal> and <literal>.*</literal> in POSIX regular
     expressions).
    </para>
 
@@ -4041,21 +4110,21 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
     </listitem>
     <listitem>
      <para>
-      <literal>{</><replaceable>m</><literal>}</literal> denotes repetition
-      of the previous item exactly <replaceable>m</> times.
+      <literal>{</literal><replaceable>m</replaceable><literal>}</literal> denotes repetition
+      of the previous item exactly <replaceable>m</replaceable> times.
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>{</><replaceable>m</><literal>,}</literal> denotes repetition
-      of the previous item <replaceable>m</> or more times.
+      <literal>{</literal><replaceable>m</replaceable><literal>,}</literal> denotes repetition
+      of the previous item <replaceable>m</replaceable> or more times.
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}</>
-      denotes repetition of the previous item at least <replaceable>m</> and
-      not more than <replaceable>n</> times.
+      <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}</literal>
+      denotes repetition of the previous item at least <replaceable>m</replaceable> and
+      not more than <replaceable>n</replaceable> times.
      </para>
     </listitem>
     <listitem>
@@ -4072,14 +4141,14 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
     </listitem>
    </itemizedlist>
 
-    Notice that the period (<literal>.</>) is not a metacharacter
-    for <function>SIMILAR TO</>.
+    Notice that the period (<literal>.</literal>) is not a metacharacter
+    for <function>SIMILAR TO</function>.
    </para>
 
    <para>
-    As with <function>LIKE</>, a backslash disables the special meaning
+    As with <function>LIKE</function>, a backslash disables the special meaning
     of any of these metacharacters; or a different escape character can
-    be specified with <literal>ESCAPE</>.
+    be specified with <literal>ESCAPE</literal>.
    </para>
 
    <para>
@@ -4093,23 +4162,23 @@ cast(-44 as bit(12))           <lineannotation>111111010100</lineannotation>
    </para>
 
    <para>
-    The <function>substring</> function with three parameters,
+    The <function>substring</function> function with three parameters,
     <function>substring(<replaceable>string</replaceable> from
     <replaceable>pattern</replaceable> for
     <replaceable>escape-character</replaceable>)</function>, provides
     extraction of a substring that matches an SQL
-    regular expression pattern.  As with <literal>SIMILAR TO</>, the
+    regular expression pattern.  As with <literal>SIMILAR TO</literal>, the
     specified pattern must match the entire data string, or else the
     function fails and returns null.  To indicate the part of the
     pattern that should be returned on success, the pattern must contain
     two occurrences of the escape character followed by a double quote
-    (<literal>"</>). <!-- " font-lock sanity -->
+    (<literal>"</literal>). <!-- " font-lock sanity -->
     The text matching the portion of the pattern
     between these markers is returned.
    </para>
 
    <para>
-    Some examples, with <literal>#&quot;</> delimiting the return string:
+    Some examples, with <literal>#&quot;</literal> delimiting the return string:
 <programlisting>
 substring('foobar' from '%#"o_b#"%' for '#')   <lineannotation>oob</lineannotation>
 substring('foobar' from '#"o_b#"%' for '#')    <lineannotation>NULL</lineannotation>
@@ -4144,7 +4213,7 @@ substring('foobar' from '#"o_b#"%' for '#')    <lineannotation>NULL</lineannotat
    </indexterm>
 
    <para>
-    <xref linkend="functions-posix-table"> lists the available
+    <xref linkend="functions-posix-table"/> lists the available
     operators for pattern matching using POSIX regular expressions.
    </para>
 
@@ -4191,7 +4260,7 @@ substring('foobar' from '#"o_b#"%' for '#')    <lineannotation>NULL</lineannotat
     <para>
      <acronym>POSIX</acronym> regular expressions provide a more
      powerful means for pattern matching than the <function>LIKE</function> and
-     <function>SIMILAR TO</> operators.
+     <function>SIMILAR TO</function> operators.
      Many Unix tools such as <command>egrep</command>,
      <command>sed</command>, or <command>awk</command> use a pattern
      matching language that is similar to the one described here.
@@ -4228,7 +4297,7 @@ substring('foobar' from '#"o_b#"%' for '#')    <lineannotation>NULL</lineannotat
     </para>
 
     <para>
-     The <function>substring</> function with two parameters,
+     The <function>substring</function> function with two parameters,
      <function>substring(<replaceable>string</replaceable> from
      <replaceable>pattern</replaceable>)</function>, provides extraction of a
      substring
@@ -4253,31 +4322,31 @@ substring('foobar' from 'o(.)b')   <lineannotation>o</lineannotation>
    </para>
 
     <para>
-     The <function>regexp_replace</> function provides substitution of
+     The <function>regexp_replace</function> function provides substitution of
      new text for substrings that match POSIX regular expression patterns.
      It has the syntax
-     <function>regexp_replace</function>(<replaceable>source</>,
-     <replaceable>pattern</>, <replaceable>replacement</>
-     <optional>, <replaceable>flags</> </optional>).
-     The <replaceable>source</> string is returned unchanged if
-     there is no match to the <replaceable>pattern</>.  If there is a
-     match, the <replaceable>source</> string is returned with the
-     <replaceable>replacement</> string substituted for the matching
-     substring.  The <replaceable>replacement</> string can contain
-     <literal>\</><replaceable>n</>, where <replaceable>n</> is 1
+     <function>regexp_replace</function>(<replaceable>source</replaceable>,
+     <replaceable>pattern</replaceable>, <replaceable>replacement</replaceable>
+     <optional>, <replaceable>flags</replaceable> </optional>).
+     The <replaceable>source</replaceable> string is returned unchanged if
+     there is no match to the <replaceable>pattern</replaceable>.  If there is a
+     match, the <replaceable>source</replaceable> string is returned with the
+     <replaceable>replacement</replaceable> string substituted for the matching
+     substring.  The <replaceable>replacement</replaceable> string can contain
+     <literal>\</literal><replaceable>n</replaceable>, where <replaceable>n</replaceable> is 1
      through 9, to indicate that the source substring matching the
-     <replaceable>n</>'th parenthesized subexpression of the pattern should be
-     inserted, and it can contain <literal>\&amp;</> to indicate that the
+     <replaceable>n</replaceable>'th parenthesized subexpression of the pattern should be
+     inserted, and it can contain <literal>\&amp;</literal> to indicate that the
      substring matching the entire pattern should be inserted.  Write
-     <literal>\\</> if you need to put a literal backslash in the replacement
+     <literal>\\</literal> if you need to put a literal backslash in the replacement
      text.
-     The <replaceable>flags</> parameter is an optional text
+     The <replaceable>flags</replaceable> parameter is an optional text
      string containing zero or more single-letter flags that change the
-     function's behavior.  Flag <literal>i</> specifies case-insensitive
-     matching, while flag <literal>g</> specifies replacement of each matching
+     function's behavior.  Flag <literal>i</literal> specifies case-insensitive
+     matching, while flag <literal>g</literal> specifies replacement of each matching
      substring rather than only the first one.  Supported flags (though
-     not <literal>g</>) are
-     described in <xref linkend="posix-embedded-options-table">.
+     not <literal>g</literal>) are
+     described in <xref linkend="posix-embedded-options-table"/>.
     </para>
 
    <para>
@@ -4293,25 +4362,25 @@ regexp_replace('foobarbaz', 'b(..)', E'X\\1Y', 'g')
    </para>
 
     <para>
-     The <function>regexp_match</> function returns a text array of
+     The <function>regexp_match</function> function returns a text array of
      captured substring(s) resulting from the first match of a POSIX
      regular expression pattern to a string.  It has the syntax
-     <function>regexp_match</function>(<replaceable>string</>,
-     <replaceable>pattern</> <optional>, <replaceable>flags</> </optional>).
-     If there is no match, the result is <literal>NULL</>.
-     If a match is found, and the <replaceable>pattern</> contains no
+     <function>regexp_match</function>(<replaceable>string</replaceable>,
+     <replaceable>pattern</replaceable> <optional>, <replaceable>flags</replaceable> </optional>).
+     If there is no match, the result is <literal>NULL</literal>.
+     If a match is found, and the <replaceable>pattern</replaceable> contains no
      parenthesized subexpressions, then the result is a single-element text
      array containing the substring matching the whole pattern.
-     If a match is found, and the <replaceable>pattern</> contains
+     If a match is found, and the <replaceable>pattern</replaceable> contains
      parenthesized subexpressions, then the result is a text array
-     whose <replaceable>n</>'th element is the substring matching
-     the <replaceable>n</>'th parenthesized subexpression of
-     the <replaceable>pattern</> (not counting <quote>non-capturing</>
+     whose <replaceable>n</replaceable>'th element is the substring matching
+     the <replaceable>n</replaceable>'th parenthesized subexpression of
+     the <replaceable>pattern</replaceable> (not counting <quote>non-capturing</quote>
      parentheses; see below for details).
-     The <replaceable>flags</> parameter is an optional text string
+     The <replaceable>flags</replaceable> parameter is an optional text string
      containing zero or more single-letter flags that change the function's
      behavior.  Supported flags are described
-     in <xref linkend="posix-embedded-options-table">.
+     in <xref linkend="posix-embedded-options-table"/>.
     </para>
 
    <para>
@@ -4330,7 +4399,7 @@ SELECT regexp_match('foobarbequebaz', '(bar)(beque)');
 (1 row)
 </programlisting>
     In the common case where you just want the whole matching substring
-    or <literal>NULL</> for no match, write something like
+    or <literal>NULL</literal> for no match, write something like
 <programlisting>
 SELECT (regexp_match('foobarbequebaz', 'bar.*que'))[1];
  regexp_match
@@ -4341,20 +4410,20 @@ SELECT (regexp_match('foobarbequebaz', 'bar.*que'))[1];
    </para>
 
     <para>
-     The <function>regexp_matches</> function returns a set of text arrays
+     The <function>regexp_matches</function> function returns a set of text arrays
      of captured substring(s) resulting from matching a POSIX regular
      expression pattern to a string.  It has the same syntax as
      <function>regexp_match</function>.
      This function returns no rows if there is no match, one row if there is
-     a match and the <literal>g</> flag is not given, or <replaceable>N</>
-     rows if there are <replaceable>N</> matches and the <literal>g</> flag
+     a match and the <literal>g</literal> flag is not given, or <replaceable>N</replaceable>
+     rows if there are <replaceable>N</replaceable> matches and the <literal>g</literal> flag
      is given.  Each returned row is a text array containing the whole
      matched substring or the substrings matching parenthesized
-     subexpressions of the <replaceable>pattern</>, just as described above
+     subexpressions of the <replaceable>pattern</replaceable>, just as described above
      for <function>regexp_match</function>.
-     <function>regexp_matches</> accepts all the flags shown
-     in <xref linkend="posix-embedded-options-table">, plus
-     the <literal>g</> flag which commands it to return all matches, not
+     <function>regexp_matches</function> accepts all the flags shown
+     in <xref linkend="posix-embedded-options-table"/>, plus
+     the <literal>g</literal> flag which commands it to return all matches, not
      just the first one.
     </para>
 
@@ -4377,46 +4446,46 @@ SELECT regexp_matches('foobarbequebazilbarfbonk', '(b[^b]+)(b[^b]+)', 'g');
 
    <tip>
     <para>
-     In most cases <function>regexp_matches()</> should be used with
-     the <literal>g</> flag, since if you only want the first match, it's
-     easier and more efficient to use <function>regexp_match()</>.
-     However, <function>regexp_match()</> only exists
-     in <productname>PostgreSQL</> version 10 and up.  When working in older
-     versions, a common trick is to place a <function>regexp_matches()</>
+     In most cases <function>regexp_matches()</function> should be used with
+     the <literal>g</literal> flag, since if you only want the first match, it's
+     easier and more efficient to use <function>regexp_match()</function>.
+     However, <function>regexp_match()</function> only exists
+     in <productname>PostgreSQL</productname> version 10 and up.  When working in older
+     versions, a common trick is to place a <function>regexp_matches()</function>
      call in a sub-select, for example:
 <programlisting>
 SELECT col1, (SELECT regexp_matches(col2, '(bar)(beque)')) FROM tab;
 </programlisting>
-     This produces a text array if there's a match, or <literal>NULL</> if
-     not, the same as <function>regexp_match()</> would do.  Without the
+     This produces a text array if there's a match, or <literal>NULL</literal> if
+     not, the same as <function>regexp_match()</function> would do.  Without the
      sub-select, this query would produce no output at all for table rows
      without a match, which is typically not the desired behavior.
     </para>
    </tip>
 
     <para>
-     The <function>regexp_split_to_table</> function splits a string using a POSIX
+     The <function>regexp_split_to_table</function> function splits a string using a POSIX
      regular expression pattern as a delimiter.  It has the syntax
-     <function>regexp_split_to_table</function>(<replaceable>string</>, <replaceable>pattern</>
-     <optional>, <replaceable>flags</> </optional>).
-     If there is no match to the <replaceable>pattern</>, the function returns the
-     <replaceable>string</>.  If there is at least one match, for each match it returns
+     <function>regexp_split_to_table</function>(<replaceable>string</replaceable>, <replaceable>pattern</replaceable>
+     <optional>, <replaceable>flags</replaceable> </optional>).
+     If there is no match to the <replaceable>pattern</replaceable>, the function returns the
+     <replaceable>string</replaceable>.  If there is at least one match, for each match it returns
      the text from the end of the last match (or the beginning of the string)
      to the beginning of the match.  When there are no more matches, it
      returns the text from the end of the last match to the end of the string.
-     The <replaceable>flags</> parameter is an optional text string containing
+     The <replaceable>flags</replaceable> parameter is an optional text string containing
      zero or more single-letter flags that change the function's behavior.
      <function>regexp_split_to_table</function> supports the flags described in
-     <xref linkend="posix-embedded-options-table">.
+     <xref linkend="posix-embedded-options-table"/>.
     </para>
 
     <para>
-     The <function>regexp_split_to_array</> function behaves the same as
-     <function>regexp_split_to_table</>, except that <function>regexp_split_to_array</>
-     returns its result as an array of <type>text</>.  It has the syntax
-     <function>regexp_split_to_array</function>(<replaceable>string</>, <replaceable>pattern</>
-     <optional>, <replaceable>flags</> </optional>).
-     The parameters are the same as for <function>regexp_split_to_table</>.
+     The <function>regexp_split_to_array</function> function behaves the same as
+     <function>regexp_split_to_table</function>, except that <function>regexp_split_to_array</function>
+     returns its result as an array of <type>text</type>.  It has the syntax
+     <function>regexp_split_to_array</function>(<replaceable>string</replaceable>, <replaceable>pattern</replaceable>
+     <optional>, <replaceable>flags</replaceable> </optional>).
+     The parameters are the same as for <function>regexp_split_to_table</function>.
     </para>
 
    <para>
@@ -4471,8 +4540,8 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     zero-length matches that occur at the start or end of the string
     or immediately after a previous match.  This is contrary to the strict
     definition of regexp matching that is implemented by
-    <function>regexp_match</> and
-    <function>regexp_matches</>, but is usually the most convenient behavior
+    <function>regexp_match</function> and
+    <function>regexp_matches</function>, but is usually the most convenient behavior
     in practice.  Other software systems such as Perl use similar definitions.
    </para>
 
@@ -4491,16 +4560,16 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
    <para>
     Regular expressions (<acronym>RE</acronym>s), as defined in
     <acronym>POSIX</acronym> 1003.2, come in two forms:
-    <firstterm>extended</> <acronym>RE</acronym>s or <acronym>ERE</>s
+    <firstterm>extended</firstterm> <acronym>RE</acronym>s or <acronym>ERE</acronym>s
     (roughly those of <command>egrep</command>), and
-    <firstterm>basic</> <acronym>RE</acronym>s or <acronym>BRE</>s
+    <firstterm>basic</firstterm> <acronym>RE</acronym>s or <acronym>BRE</acronym>s
     (roughly those of <command>ed</command>).
     <productname>PostgreSQL</productname> supports both forms, and
     also implements some extensions
     that are not in the POSIX standard, but have become widely used
     due to their availability in programming languages such as Perl and Tcl.
     <acronym>RE</acronym>s using these non-POSIX extensions are called
-    <firstterm>advanced</> <acronym>RE</acronym>s or <acronym>ARE</>s
+    <firstterm>advanced</firstterm> <acronym>RE</acronym>s or <acronym>ARE</acronym>s
     in this documentation.  AREs are almost an exact superset of EREs,
     but BREs have several notational incompatibilities (as well as being
     much more limited).
@@ -4510,10 +4579,10 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
    <note>
     <para>
-     <productname>PostgreSQL</> always initially presumes that a regular
+     <productname>PostgreSQL</productname> always initially presumes that a regular
      expression follows the ARE rules.  However, the more limited ERE or
-     BRE rules can be chosen by prepending an <firstterm>embedded option</>
-     to the RE pattern, as described in <xref linkend="posix-metasyntax">.
+     BRE rules can be chosen by prepending an <firstterm>embedded option</firstterm>
+     to the RE pattern, as described in <xref linkend="posix-metasyntax"/>.
      This can be useful for compatibility with applications that expect
      exactly the <acronym>POSIX</acronym> 1003.2 rules.
     </para>
@@ -4527,29 +4596,29 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
    </para>
 
    <para>
-    A branch is zero or more <firstterm>quantified atoms</> or
-    <firstterm>constraints</>, concatenated.
+    A branch is zero or more <firstterm>quantified atoms</firstterm> or
+    <firstterm>constraints</firstterm>, concatenated.
     It matches a match for the first, followed by a match for the second, etc;
     an empty branch matches the empty string.
    </para>
 
    <para>
-    A quantified atom is an <firstterm>atom</> possibly followed
-    by a single <firstterm>quantifier</>.
+    A quantified atom is an <firstterm>atom</firstterm> possibly followed
+    by a single <firstterm>quantifier</firstterm>.
     Without a quantifier, it matches a match for the atom.
     With a quantifier, it can match some number of matches of the atom.
     An <firstterm>atom</firstterm> can be any of the possibilities
-    shown in <xref linkend="posix-atoms-table">.
+    shown in <xref linkend="posix-atoms-table"/>.
     The possible quantifiers and their meanings are shown in
-    <xref linkend="posix-quantifiers-table">.
+    <xref linkend="posix-quantifiers-table"/>.
    </para>
 
    <para>
-    A <firstterm>constraint</> matches an empty string, but matches only when
+    A <firstterm>constraint</firstterm> matches an empty string, but matches only when
     specific conditions are met.  A constraint can be used where an atom
     could be used, except it cannot be followed by a quantifier.
     The simple constraints are shown in
-    <xref linkend="posix-constraints-table">;
+    <xref linkend="posix-constraints-table"/>;
     some more constraints are described later.
    </para>
 
@@ -4567,57 +4636,57 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>(</><replaceable>re</><literal>)</> </entry>
-       <entry> (where <replaceable>re</> is any regular expression)
+       <entry> <literal>(</literal><replaceable>re</replaceable><literal>)</literal> </entry>
+       <entry> (where <replaceable>re</replaceable> is any regular expression)
        matches a match for
-       <replaceable>re</>, with the match noted for possible reporting </entry>
+       <replaceable>re</replaceable>, with the match noted for possible reporting </entry>
        </row>
 
        <row>
-       <entry> <literal>(?:</><replaceable>re</><literal>)</> </entry>
+       <entry> <literal>(?:</literal><replaceable>re</replaceable><literal>)</literal> </entry>
        <entry> as above, but the match is not noted for reporting
-       (a <quote>non-capturing</> set of parentheses)
+       (a <quote>non-capturing</quote> set of parentheses)
        (AREs only) </entry>
        </row>
 
        <row>
-       <entry> <literal>.</> </entry>
+       <entry> <literal>.</literal> </entry>
        <entry> matches any single character </entry>
        </row>
 
        <row>
-       <entry> <literal>[</><replaceable>chars</><literal>]</> </entry>
-       <entry> a <firstterm>bracket expression</>,
-       matching any one of the <replaceable>chars</> (see
-       <xref linkend="posix-bracket-expressions"> for more detail) </entry>
+       <entry> <literal>[</literal><replaceable>chars</replaceable><literal>]</literal> </entry>
+       <entry> a <firstterm>bracket expression</firstterm>,
+       matching any one of the <replaceable>chars</replaceable> (see
+       <xref linkend="posix-bracket-expressions"/> for more detail) </entry>
        </row>
 
        <row>
-       <entry> <literal>\</><replaceable>k</> </entry>
-       <entry> (where <replaceable>k</> is a non-alphanumeric character)
+       <entry> <literal>\</literal><replaceable>k</replaceable> </entry>
+       <entry> (where <replaceable>k</replaceable> is a non-alphanumeric character)
        matches that character taken as an ordinary character,
-       e.g., <literal>\\</> matches a backslash character </entry>
+       e.g., <literal>\\</literal> matches a backslash character </entry>
        </row>
 
        <row>
-       <entry> <literal>\</><replaceable>c</> </entry>
-       <entry> where <replaceable>c</> is alphanumeric
+       <entry> <literal>\</literal><replaceable>c</replaceable> </entry>
+       <entry> where <replaceable>c</replaceable> is alphanumeric
        (possibly followed by other characters)
-       is an <firstterm>escape</>, see <xref linkend="posix-escape-sequences">
-       (AREs only; in EREs and BREs, this matches <replaceable>c</>) </entry>
+       is an <firstterm>escape</firstterm>, see <xref linkend="posix-escape-sequences"/>
+       (AREs only; in EREs and BREs, this matches <replaceable>c</replaceable>) </entry>
        </row>
 
        <row>
-       <entry> <literal>{</> </entry>
+       <entry> <literal>{</literal> </entry>
        <entry> when followed by a character other than a digit,
-       matches the left-brace character <literal>{</>;
+       matches the left-brace character <literal>{</literal>;
        when followed by a digit, it is the beginning of a
-       <replaceable>bound</> (see below) </entry>
+       <replaceable>bound</replaceable> (see below) </entry>
        </row>
 
        <row>
-       <entry> <replaceable>x</> </entry>
-       <entry> where <replaceable>x</> is a single character with no other
+       <entry> <replaceable>x</replaceable> </entry>
+       <entry> where <replaceable>x</replaceable> is a single character with no other
        significance, matches that character </entry>
        </row>
       </tbody>
@@ -4625,14 +4694,14 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     </table>
 
    <para>
-    An RE cannot end with a backslash (<literal>\</>).
+    An RE cannot end with a backslash (<literal>\</literal>).
    </para>
 
    <note>
     <para>
-     If you have <xref linkend="guc-standard-conforming-strings"> turned off,
+     If you have <xref linkend="guc-standard-conforming-strings"/> turned off,
      any backslashes you write in literal string constants will need to be
-     doubled.  See <xref linkend="sql-syntax-strings"> for more information.
+     doubled.  See <xref linkend="sql-syntax-strings"/> for more information.
     </para>
    </note>
 
@@ -4649,91 +4718,91 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>*</> </entry>
+       <entry> <literal>*</literal> </entry>
        <entry> a sequence of 0 or more matches of the atom </entry>
        </row>
 
        <row>
-       <entry> <literal>+</> </entry>
+       <entry> <literal>+</literal> </entry>
        <entry> a sequence of 1 or more matches of the atom </entry>
        </row>
 
        <row>
-       <entry> <literal>?</> </entry>
+       <entry> <literal>?</literal> </entry>
        <entry> a sequence of 0 or 1 matches of the atom </entry>
        </row>
 
        <row>
-       <entry> <literal>{</><replaceable>m</><literal>}</> </entry>
-       <entry> a sequence of exactly <replaceable>m</> matches of the atom </entry>
+       <entry> <literal>{</literal><replaceable>m</replaceable><literal>}</literal> </entry>
+       <entry> a sequence of exactly <replaceable>m</replaceable> matches of the atom </entry>
        </row>
 
        <row>
-       <entry> <literal>{</><replaceable>m</><literal>,}</> </entry>
-       <entry> a sequence of <replaceable>m</> or more matches of the atom </entry>
+       <entry> <literal>{</literal><replaceable>m</replaceable><literal>,}</literal> </entry>
+       <entry> a sequence of <replaceable>m</replaceable> or more matches of the atom </entry>
        </row>
 
        <row>
        <entry>
-       <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}</> </entry>
-       <entry> a sequence of <replaceable>m</> through <replaceable>n</>
-       (inclusive) matches of the atom; <replaceable>m</> cannot exceed
-       <replaceable>n</> </entry>
+       <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}</literal> </entry>
+       <entry> a sequence of <replaceable>m</replaceable> through <replaceable>n</replaceable>
+       (inclusive) matches of the atom; <replaceable>m</replaceable> cannot exceed
+       <replaceable>n</replaceable> </entry>
        </row>
 
        <row>
-       <entry> <literal>*?</> </entry>
-       <entry> non-greedy version of <literal>*</> </entry>
+       <entry> <literal>*?</literal> </entry>
+       <entry> non-greedy version of <literal>*</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>+?</> </entry>
-       <entry> non-greedy version of <literal>+</> </entry>
+       <entry> <literal>+?</literal> </entry>
+       <entry> non-greedy version of <literal>+</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>??</> </entry>
-       <entry> non-greedy version of <literal>?</> </entry>
+       <entry> <literal>??</literal> </entry>
+       <entry> non-greedy version of <literal>?</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>{</><replaceable>m</><literal>}?</> </entry>
-       <entry> non-greedy version of <literal>{</><replaceable>m</><literal>}</> </entry>
+       <entry> <literal>{</literal><replaceable>m</replaceable><literal>}?</literal> </entry>
+       <entry> non-greedy version of <literal>{</literal><replaceable>m</replaceable><literal>}</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>{</><replaceable>m</><literal>,}?</> </entry>
-       <entry> non-greedy version of <literal>{</><replaceable>m</><literal>,}</> </entry>
+       <entry> <literal>{</literal><replaceable>m</replaceable><literal>,}?</literal> </entry>
+       <entry> non-greedy version of <literal>{</literal><replaceable>m</replaceable><literal>,}</literal> </entry>
        </row>
 
        <row>
        <entry>
-       <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}?</> </entry>
-       <entry> non-greedy version of <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}</> </entry>
+       <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}?</literal> </entry>
+       <entry> non-greedy version of <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}</literal> </entry>
        </row>
       </tbody>
      </tgroup>
     </table>
 
    <para>
-    The forms using <literal>{</><replaceable>...</><literal>}</>
-    are known as <firstterm>bounds</>.
-    The numbers <replaceable>m</> and <replaceable>n</> within a bound are
+    The forms using <literal>{</literal><replaceable>...</replaceable><literal>}</literal>
+    are known as <firstterm>bounds</firstterm>.
+    The numbers <replaceable>m</replaceable> and <replaceable>n</replaceable> within a bound are
     unsigned decimal integers with permissible values from 0 to 255 inclusive.
    </para>
 
     <para>
-     <firstterm>Non-greedy</> quantifiers (available in AREs only) match the
-     same possibilities as their corresponding normal (<firstterm>greedy</>)
+     <firstterm>Non-greedy</firstterm> quantifiers (available in AREs only) match the
+     same possibilities as their corresponding normal (<firstterm>greedy</firstterm>)
      counterparts, but prefer the smallest number rather than the largest
      number of matches.
-     See <xref linkend="posix-matching-rules"> for more detail.
+     See <xref linkend="posix-matching-rules"/> for more detail.
    </para>
 
    <note>
     <para>
      A quantifier cannot immediately follow another quantifier, e.g.,
-     <literal>**</> is invalid.
+     <literal>**</literal> is invalid.
      A quantifier cannot
      begin an expression or subexpression or follow
      <literal>^</literal> or <literal>|</literal>.
@@ -4753,40 +4822,40 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>^</> </entry>
+       <entry> <literal>^</literal> </entry>
        <entry> matches at the beginning of the string </entry>
        </row>
 
        <row>
-       <entry> <literal>$</> </entry>
+       <entry> <literal>$</literal> </entry>
        <entry> matches at the end of the string </entry>
        </row>
 
        <row>
-       <entry> <literal>(?=</><replaceable>re</><literal>)</> </entry>
-       <entry> <firstterm>positive lookahead</> matches at any point
-       where a substring matching <replaceable>re</> begins
+       <entry> <literal>(?=</literal><replaceable>re</replaceable><literal>)</literal> </entry>
+       <entry> <firstterm>positive lookahead</firstterm> matches at any point
+       where a substring matching <replaceable>re</replaceable> begins
        (AREs only) </entry>
        </row>
 
        <row>
-       <entry> <literal>(?!</><replaceable>re</><literal>)</> </entry>
-       <entry> <firstterm>negative lookahead</> matches at any point
-       where no substring matching <replaceable>re</> begins
+       <entry> <literal>(?!</literal><replaceable>re</replaceable><literal>)</literal> </entry>
+       <entry> <firstterm>negative lookahead</firstterm> matches at any point
+       where no substring matching <replaceable>re</replaceable> begins
        (AREs only) </entry>
        </row>
 
        <row>
-       <entry> <literal>(?&lt;=</><replaceable>re</><literal>)</> </entry>
-       <entry> <firstterm>positive lookbehind</> matches at any point
-       where a substring matching <replaceable>re</> ends
+       <entry> <literal>(?&lt;=</literal><replaceable>re</replaceable><literal>)</literal> </entry>
+       <entry> <firstterm>positive lookbehind</firstterm> matches at any point
+       where a substring matching <replaceable>re</replaceable> ends
        (AREs only) </entry>
        </row>
 
        <row>
-       <entry> <literal>(?&lt;!</><replaceable>re</><literal>)</> </entry>
-       <entry> <firstterm>negative lookbehind</> matches at any point
-       where no substring matching <replaceable>re</> ends
+       <entry> <literal>(?&lt;!</literal><replaceable>re</replaceable><literal>)</literal> </entry>
+       <entry> <firstterm>negative lookbehind</firstterm> matches at any point
+       where no substring matching <replaceable>re</replaceable> ends
        (AREs only) </entry>
        </row>
       </tbody>
@@ -4795,7 +4864,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
    <para>
     Lookahead and lookbehind constraints cannot contain <firstterm>back
-    references</> (see <xref linkend="posix-escape-sequences">),
+    references</firstterm> (see <xref linkend="posix-escape-sequences"/>),
     and all parentheses within them are considered non-capturing.
    </para>
    </sect3>
@@ -4808,7 +4877,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     characters enclosed in <literal>[]</literal>.  It normally matches
     any single character from the list (but see below).  If the list
     begins with <literal>^</literal>, it matches any single character
-    <emphasis>not</> from the rest of the list.
+    <emphasis>not</emphasis> from the rest of the list.
     If two characters
     in the list are separated by <literal>-</literal>, this is
     shorthand for the full range of characters between those two
@@ -4853,7 +4922,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
    <note>
     <para>
-     <productname>PostgreSQL</> currently does not support multi-character collating
+     <productname>PostgreSQL</productname> currently does not support multi-character collating
      elements. This information describes possible future behavior.
     </para>
    </note>
@@ -4861,7 +4930,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
    <para>
     Within a bracket expression, a collating element enclosed in
     <literal>[=</literal> and <literal>=]</literal> is an <firstterm>equivalence
-    class</>, standing for the sequences of characters of all collating
+    class</firstterm>, standing for the sequences of characters of all collating
     elements equivalent to that one, including itself.  (If there are
     no other equivalent collating elements, the treatment is as if the
     enclosing delimiters were <literal>[.</literal> and
@@ -4896,7 +4965,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     matching empty strings at the beginning
     and end of a word respectively.  A word is defined as a sequence
     of word characters that is neither preceded nor followed by word
-    characters.  A word character is an <literal>alnum</> character (as
+    characters.  A word character is an <literal>alnum</literal> character (as
     defined by
     <citerefentry><refentrytitle>ctype</refentrytitle><manvolnum>3</manvolnum></citerefentry>)
     or an underscore.  This is an extension, compatible with but not
@@ -4911,44 +4980,44 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     <title>Regular Expression Escapes</title>
 
    <para>
-    <firstterm>Escapes</> are special sequences beginning with <literal>\</>
+    <firstterm>Escapes</firstterm> are special sequences beginning with <literal>\</literal>
     followed by an alphanumeric character. Escapes come in several varieties:
     character entry, class shorthands, constraint escapes, and back references.
-    A <literal>\</> followed by an alphanumeric character but not constituting
+    A <literal>\</literal> followed by an alphanumeric character but not constituting
     a valid escape is illegal in AREs.
     In EREs, there are no escapes: outside a bracket expression,
-    a <literal>\</> followed by an alphanumeric character merely stands for
+    a <literal>\</literal> followed by an alphanumeric character merely stands for
     that character as an ordinary character, and inside a bracket expression,
-    <literal>\</> is an ordinary character.
+    <literal>\</literal> is an ordinary character.
     (The latter is the one actual incompatibility between EREs and AREs.)
    </para>
 
    <para>
-    <firstterm>Character-entry escapes</> exist to make it easier to specify
+    <firstterm>Character-entry escapes</firstterm> exist to make it easier to specify
     non-printing and other inconvenient characters in REs.  They are
-    shown in <xref linkend="posix-character-entry-escapes-table">.
+    shown in <xref linkend="posix-character-entry-escapes-table"/>.
    </para>
 
    <para>
-    <firstterm>Class-shorthand escapes</> provide shorthands for certain
+    <firstterm>Class-shorthand escapes</firstterm> provide shorthands for certain
     commonly-used character classes.  They are
-    shown in <xref linkend="posix-class-shorthand-escapes-table">.
+    shown in <xref linkend="posix-class-shorthand-escapes-table"/>.
    </para>
 
    <para>
-    A <firstterm>constraint escape</> is a constraint,
+    A <firstterm>constraint escape</firstterm> is a constraint,
     matching the empty string if specific conditions are met,
     written as an escape.  They are
-    shown in <xref linkend="posix-constraint-escapes-table">.
+    shown in <xref linkend="posix-constraint-escapes-table"/>.
    </para>
 
    <para>
-    A <firstterm>back reference</> (<literal>\</><replaceable>n</>) matches the
+    A <firstterm>back reference</firstterm> (<literal>\</literal><replaceable>n</replaceable>) matches the
     same string matched by the previous parenthesized subexpression specified
-    by the number <replaceable>n</>
-    (see <xref linkend="posix-constraint-backref-table">).  For example,
-    <literal>([bc])\1</> matches <literal>bb</> or <literal>cc</>
-    but not <literal>bc</> or <literal>cb</>.
+    by the number <replaceable>n</replaceable>
+    (see <xref linkend="posix-constraint-backref-table"/>).  For example,
+    <literal>([bc])\1</literal> matches <literal>bb</literal> or <literal>cc</literal>
+    but not <literal>bc</literal> or <literal>cb</literal>.
     The subexpression must entirely precede the back reference in the RE.
     Subexpressions are numbered in the order of their leading parentheses.
     Non-capturing parentheses do not define subexpressions.
@@ -4967,122 +5036,122 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>\a</> </entry>
+       <entry> <literal>\a</literal> </entry>
        <entry> alert (bell) character, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\b</> </entry>
+       <entry> <literal>\b</literal> </entry>
        <entry> backspace, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\B</> </entry>
-       <entry> synonym for backslash (<literal>\</>) to help reduce the need for backslash
+       <entry> <literal>\B</literal> </entry>
+       <entry> synonym for backslash (<literal>\</literal>) to help reduce the need for backslash
        doubling </entry>
        </row>
 
        <row>
-       <entry> <literal>\c</><replaceable>X</> </entry>
-       <entry> (where <replaceable>X</> is any character) the character whose
+       <entry> <literal>\c</literal><replaceable>X</replaceable> </entry>
+       <entry> (where <replaceable>X</replaceable> is any character) the character whose
        low-order 5 bits are the same as those of
-       <replaceable>X</>, and whose other bits are all zero </entry>
+       <replaceable>X</replaceable>, and whose other bits are all zero </entry>
        </row>
 
        <row>
-       <entry> <literal>\e</> </entry>
+       <entry> <literal>\e</literal> </entry>
        <entry> the character whose collating-sequence name
-       is <literal>ESC</>,
-       or failing that, the character with octal value <literal>033</> </entry>
+       is <literal>ESC</literal>,
+       or failing that, the character with octal value <literal>033</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>\f</> </entry>
+       <entry> <literal>\f</literal> </entry>
        <entry> form feed, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\n</> </entry>
+       <entry> <literal>\n</literal> </entry>
        <entry> newline, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\r</> </entry>
+       <entry> <literal>\r</literal> </entry>
        <entry> carriage return, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\t</> </entry>
+       <entry> <literal>\t</literal> </entry>
        <entry> horizontal tab, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\u</><replaceable>wxyz</> </entry>
-       <entry> (where <replaceable>wxyz</> is exactly four hexadecimal digits)
+       <entry> <literal>\u</literal><replaceable>wxyz</replaceable> </entry>
+       <entry> (where <replaceable>wxyz</replaceable> is exactly four hexadecimal digits)
        the character whose hexadecimal value is
-       <literal>0x</><replaceable>wxyz</>
+       <literal>0x</literal><replaceable>wxyz</replaceable>
        </entry>
        </row>
 
        <row>
-       <entry> <literal>\U</><replaceable>stuvwxyz</> </entry>
-       <entry> (where <replaceable>stuvwxyz</> is exactly eight hexadecimal
+       <entry> <literal>\U</literal><replaceable>stuvwxyz</replaceable> </entry>
+       <entry> (where <replaceable>stuvwxyz</replaceable> is exactly eight hexadecimal
        digits)
        the character whose hexadecimal value is
-       <literal>0x</><replaceable>stuvwxyz</>
+       <literal>0x</literal><replaceable>stuvwxyz</replaceable>
        </entry>
        </row>
 
        <row>
-       <entry> <literal>\v</> </entry>
+       <entry> <literal>\v</literal> </entry>
        <entry> vertical tab, as in C </entry>
        </row>
 
        <row>
-       <entry> <literal>\x</><replaceable>hhh</> </entry>
-       <entry> (where <replaceable>hhh</> is any sequence of hexadecimal
+       <entry> <literal>\x</literal><replaceable>hhh</replaceable> </entry>
+       <entry> (where <replaceable>hhh</replaceable> is any sequence of hexadecimal
        digits)
        the character whose hexadecimal value is
-       <literal>0x</><replaceable>hhh</>
+       <literal>0x</literal><replaceable>hhh</replaceable>
        (a single character no matter how many hexadecimal digits are used)
        </entry>
        </row>
 
        <row>
-       <entry> <literal>\0</> </entry>
-       <entry> the character whose value is <literal>0</> (the null byte)</entry>
+       <entry> <literal>\0</literal> </entry>
+       <entry> the character whose value is <literal>0</literal> (the null byte)</entry>
        </row>
 
        <row>
-       <entry> <literal>\</><replaceable>xy</> </entry>
-       <entry> (where <replaceable>xy</> is exactly two octal digits,
-       and is not a <firstterm>back reference</>)
+       <entry> <literal>\</literal><replaceable>xy</replaceable> </entry>
+       <entry> (where <replaceable>xy</replaceable> is exactly two octal digits,
+       and is not a <firstterm>back reference</firstterm>)
        the character whose octal value is
-       <literal>0</><replaceable>xy</> </entry>
+       <literal>0</literal><replaceable>xy</replaceable> </entry>
        </row>
 
        <row>
-       <entry> <literal>\</><replaceable>xyz</> </entry>
-       <entry> (where <replaceable>xyz</> is exactly three octal digits,
-       and is not a <firstterm>back reference</>)
+       <entry> <literal>\</literal><replaceable>xyz</replaceable> </entry>
+       <entry> (where <replaceable>xyz</replaceable> is exactly three octal digits,
+       and is not a <firstterm>back reference</firstterm>)
        the character whose octal value is
-       <literal>0</><replaceable>xyz</> </entry>
+       <literal>0</literal><replaceable>xyz</replaceable> </entry>
        </row>
       </tbody>
      </tgroup>
     </table>
 
    <para>
-    Hexadecimal digits are <literal>0</>-<literal>9</>,
-    <literal>a</>-<literal>f</>, and <literal>A</>-<literal>F</>.
-    Octal digits are <literal>0</>-<literal>7</>.
+    Hexadecimal digits are <literal>0</literal>-<literal>9</literal>,
+    <literal>a</literal>-<literal>f</literal>, and <literal>A</literal>-<literal>F</literal>.
+    Octal digits are <literal>0</literal>-<literal>7</literal>.
    </para>
 
    <para>
     Numeric character-entry escapes specifying values outside the ASCII range
     (0-127) have meanings dependent on the database encoding.  When the
     encoding is UTF-8, escape values are equivalent to Unicode code points,
-    for example <literal>\u1234</> means the character <literal>U+1234</>.
+    for example <literal>\u1234</literal> means the character <literal>U+1234</literal>.
     For other multibyte encodings, character-entry escapes usually just
     specify the concatenation of the byte values for the character.  If the
     escape value does not correspond to any legal character in the database
@@ -5091,8 +5160,8 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
    <para>
     The character-entry escapes are always taken as ordinary characters.
-    For example, <literal>\135</> is <literal>]</> in ASCII, but
-    <literal>\135</> does not terminate a bracket expression.
+    For example, <literal>\135</literal> is <literal>]</literal> in ASCII, but
+    <literal>\135</literal> does not terminate a bracket expression.
    </para>
 
    <table id="posix-class-shorthand-escapes-table">
@@ -5108,34 +5177,34 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>\d</> </entry>
-       <entry> <literal>[[:digit:]]</> </entry>
+       <entry> <literal>\d</literal> </entry>
+       <entry> <literal>[[:digit:]]</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>\s</> </entry>
-       <entry> <literal>[[:space:]]</> </entry>
+       <entry> <literal>\s</literal> </entry>
+       <entry> <literal>[[:space:]]</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>\w</> </entry>
-       <entry> <literal>[[:alnum:]_]</>
+       <entry> <literal>\w</literal> </entry>
+       <entry> <literal>[[:alnum:]_]</literal>
        (note underscore is included) </entry>
        </row>
 
        <row>
-       <entry> <literal>\D</> </entry>
-       <entry> <literal>[^[:digit:]]</> </entry>
+       <entry> <literal>\D</literal> </entry>
+       <entry> <literal>[^[:digit:]]</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>\S</> </entry>
-       <entry> <literal>[^[:space:]]</> </entry>
+       <entry> <literal>\S</literal> </entry>
+       <entry> <literal>[^[:space:]]</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>\W</> </entry>
-       <entry> <literal>[^[:alnum:]_]</>
+       <entry> <literal>\W</literal> </entry>
+       <entry> <literal>[^[:alnum:]_]</literal>
        (note underscore is included) </entry>
        </row>
       </tbody>
@@ -5143,13 +5212,13 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     </table>
 
    <para>
-    Within bracket expressions, <literal>\d</>, <literal>\s</>,
-    and <literal>\w</> lose their outer brackets,
-    and <literal>\D</>, <literal>\S</>, and <literal>\W</> are illegal.
-    (So, for example, <literal>[a-c\d]</> is equivalent to
-    <literal>[a-c[:digit:]]</>.
-    Also, <literal>[a-c\D]</>, which is equivalent to
-    <literal>[a-c^[:digit:]]</>, is illegal.)
+    Within bracket expressions, <literal>\d</literal>, <literal>\s</literal>,
+    and <literal>\w</literal> lose their outer brackets,
+    and <literal>\D</literal>, <literal>\S</literal>, and <literal>\W</literal> are illegal.
+    (So, for example, <literal>[a-c\d]</literal> is equivalent to
+    <literal>[a-c[:digit:]]</literal>.
+    Also, <literal>[a-c\D]</literal>, which is equivalent to
+    <literal>[a-c^[:digit:]]</literal>, is illegal.)
    </para>
 
    <table id="posix-constraint-escapes-table">
@@ -5165,38 +5234,38 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>\A</> </entry>
+       <entry> <literal>\A</literal> </entry>
        <entry> matches only at the beginning of the string
-       (see <xref linkend="posix-matching-rules"> for how this differs from
-       <literal>^</>) </entry>
+       (see <xref linkend="posix-matching-rules"/> for how this differs from
+       <literal>^</literal>) </entry>
        </row>
 
        <row>
-       <entry> <literal>\m</> </entry>
+       <entry> <literal>\m</literal> </entry>
        <entry> matches only at the beginning of a word </entry>
        </row>
 
        <row>
-       <entry> <literal>\M</> </entry>
+       <entry> <literal>\M</literal> </entry>
        <entry> matches only at the end of a word </entry>
        </row>
 
        <row>
-       <entry> <literal>\y</> </entry>
+       <entry> <literal>\y</literal> </entry>
        <entry> matches only at the beginning or end of a word </entry>
        </row>
 
        <row>
-       <entry> <literal>\Y</> </entry>
+       <entry> <literal>\Y</literal> </entry>
        <entry> matches only at a point that is not the beginning or end of a
        word </entry>
        </row>
 
        <row>
-       <entry> <literal>\Z</> </entry>
+       <entry> <literal>\Z</literal> </entry>
        <entry> matches only at the end of the string
-       (see <xref linkend="posix-matching-rules"> for how this differs from
-       <literal>$</>) </entry>
+       (see <xref linkend="posix-matching-rules"/> for how this differs from
+       <literal>$</literal>) </entry>
        </row>
       </tbody>
      </tgroup>
@@ -5204,7 +5273,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
    <para>
     A word is defined as in the specification of
-    <literal>[[:&lt;:]]</> and <literal>[[:&gt;:]]</> above.
+    <literal>[[:&lt;:]]</literal> and <literal>[[:&gt;:]]</literal> above.
     Constraint escapes are illegal within bracket expressions.
    </para>
 
@@ -5221,18 +5290,18 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>\</><replaceable>m</> </entry>
-       <entry> (where <replaceable>m</> is a nonzero digit)
-       a back reference to the <replaceable>m</>'th subexpression </entry>
+       <entry> <literal>\</literal><replaceable>m</replaceable> </entry>
+       <entry> (where <replaceable>m</replaceable> is a nonzero digit)
+       a back reference to the <replaceable>m</replaceable>'th subexpression </entry>
        </row>
 
        <row>
-       <entry> <literal>\</><replaceable>mnn</> </entry>
-       <entry> (where <replaceable>m</> is a nonzero digit, and
-       <replaceable>nn</> is some more digits, and the decimal value
-       <replaceable>mnn</> is not greater than the number of closing capturing
+       <entry> <literal>\</literal><replaceable>mnn</replaceable> </entry>
+       <entry> (where <replaceable>m</replaceable> is a nonzero digit, and
+       <replaceable>nn</replaceable> is some more digits, and the decimal value
+       <replaceable>mnn</replaceable> is not greater than the number of closing capturing
        parentheses seen so far)
-       a back reference to the <replaceable>mnn</>'th subexpression </entry>
+       a back reference to the <replaceable>mnn</replaceable>'th subexpression </entry>
        </row>
       </tbody>
      </tgroup>
@@ -5263,29 +5332,29 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
    </para>
 
    <para>
-    An RE can begin with one of two special <firstterm>director</> prefixes.
-    If an RE begins with <literal>***:</>,
+    An RE can begin with one of two special <firstterm>director</firstterm> prefixes.
+    If an RE begins with <literal>***:</literal>,
     the rest of the RE is taken as an ARE.  (This normally has no effect in
-    <productname>PostgreSQL</>, since REs are assumed to be AREs;
+    <productname>PostgreSQL</productname>, since REs are assumed to be AREs;
     but it does have an effect if ERE or BRE mode had been specified by
-    the <replaceable>flags</> parameter to a regex function.)
-    If an RE begins with <literal>***=</>,
+    the <replaceable>flags</replaceable> parameter to a regex function.)
+    If an RE begins with <literal>***=</literal>,
     the rest of the RE is taken to be a literal string,
     with all characters considered ordinary characters.
    </para>
 
    <para>
-    An ARE can begin with <firstterm>embedded options</>:
-    a sequence <literal>(?</><replaceable>xyz</><literal>)</>
-    (where <replaceable>xyz</> is one or more alphabetic characters)
+    An ARE can begin with <firstterm>embedded options</firstterm>:
+    a sequence <literal>(?</literal><replaceable>xyz</replaceable><literal>)</literal>
+    (where <replaceable>xyz</replaceable> is one or more alphabetic characters)
     specifies options affecting the rest of the RE.
     These options override any previously determined options &mdash;
     in particular, they can override the case-sensitivity behavior implied by
-    a regex operator, or the <replaceable>flags</> parameter to a regex
+    a regex operator, or the <replaceable>flags</replaceable> parameter to a regex
     function.
     The available option letters are
-    shown in <xref linkend="posix-embedded-options-table">.
-    Note that these same option letters are used in the <replaceable>flags</>
+    shown in <xref linkend="posix-embedded-options-table"/>.
+    Note that these same option letters are used in the <replaceable>flags</replaceable>
     parameters of regex functions.
    </para>
 
@@ -5302,67 +5371,67 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
 
       <tbody>
        <row>
-       <entry> <literal>b</> </entry>
+       <entry> <literal>b</literal> </entry>
        <entry> rest of RE is a BRE </entry>
        </row>
 
        <row>
-       <entry> <literal>c</> </entry>
+       <entry> <literal>c</literal> </entry>
        <entry> case-sensitive matching (overrides operator type) </entry>
        </row>
 
        <row>
-       <entry> <literal>e</> </entry>
+       <entry> <literal>e</literal> </entry>
        <entry> rest of RE is an ERE </entry>
        </row>
 
        <row>
-       <entry> <literal>i</> </entry>
+       <entry> <literal>i</literal> </entry>
        <entry> case-insensitive matching (see
-       <xref linkend="posix-matching-rules">) (overrides operator type) </entry>
+       <xref linkend="posix-matching-rules"/>) (overrides operator type) </entry>
        </row>
 
        <row>
-       <entry> <literal>m</> </entry>
-       <entry> historical synonym for <literal>n</> </entry>
+       <entry> <literal>m</literal> </entry>
+       <entry> historical synonym for <literal>n</literal> </entry>
        </row>
 
        <row>
-       <entry> <literal>n</> </entry>
+       <entry> <literal>n</literal> </entry>
        <entry> newline-sensitive matching (see
-       <xref linkend="posix-matching-rules">) </entry>
+       <xref linkend="posix-matching-rules"/>) </entry>
        </row>
 
        <row>
-       <entry> <literal>p</> </entry>
+       <entry> <literal>p</literal> </entry>
        <entry> partial newline-sensitive matching (see
-       <xref linkend="posix-matching-rules">) </entry>
+       <xref linkend="posix-matching-rules"/>) </entry>
        </row>
 
        <row>
-       <entry> <literal>q</> </entry>
-       <entry> rest of RE is a literal (<quote>quoted</>) string, all ordinary
+       <entry> <literal>q</literal> </entry>
+       <entry> rest of RE is a literal (<quote>quoted</quote>) string, all ordinary
        characters </entry>
        </row>
 
        <row>
-       <entry> <literal>s</> </entry>
+       <entry> <literal>s</literal> </entry>
        <entry> non-newline-sensitive matching (default) </entry>
        </row>
 
        <row>
-       <entry> <literal>t</> </entry>
+       <entry> <literal>t</literal> </entry>
        <entry> tight syntax (default; see below) </entry>
        </row>
 
        <row>
-       <entry> <literal>w</> </entry>
-       <entry> inverse partial newline-sensitive (<quote>weird</>) matching
-       (see <xref linkend="posix-matching-rules">) </entry>
+       <entry> <literal>w</literal> </entry>
+       <entry> inverse partial newline-sensitive (<quote>weird</quote>) matching
+       (see <xref linkend="posix-matching-rules"/>) </entry>
        </row>
 
        <row>
-       <entry> <literal>x</> </entry>
+       <entry> <literal>x</literal> </entry>
        <entry> expanded syntax (see below) </entry>
        </row>
       </tbody>
@@ -5370,18 +5439,18 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     </table>
 
    <para>
-    Embedded options take effect at the <literal>)</> terminating the sequence.
+    Embedded options take effect at the <literal>)</literal> terminating the sequence.
     They can appear only at the start of an ARE (after the
-    <literal>***:</> director if any).
+    <literal>***:</literal> director if any).
    </para>
 
    <para>
-    In addition to the usual (<firstterm>tight</>) RE syntax, in which all
-    characters are significant, there is an <firstterm>expanded</> syntax,
-    available by specifying the embedded <literal>x</> option.
+    In addition to the usual (<firstterm>tight</firstterm>) RE syntax, in which all
+    characters are significant, there is an <firstterm>expanded</firstterm> syntax,
+    available by specifying the embedded <literal>x</literal> option.
     In the expanded syntax,
     white-space characters in the RE are ignored, as are
-    all characters between a <literal>#</>
+    all characters between a <literal>#</literal>
     and the following newline (or the end of the RE).  This
     permits paragraphing and commenting a complex RE.
     There are three exceptions to that basic rule:
@@ -5389,41 +5458,41 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     <itemizedlist>
      <listitem>
       <para>
-       a white-space character or <literal>#</> preceded by <literal>\</> is
+       a white-space character or <literal>#</literal> preceded by <literal>\</literal> is
        retained
       </para>
      </listitem>
      <listitem>
       <para>
-       white space or <literal>#</> within a bracket expression is retained
+       white space or <literal>#</literal> within a bracket expression is retained
       </para>
      </listitem>
      <listitem>
       <para>
        white space and comments cannot appear within multi-character symbols,
-       such as <literal>(?:</>
+       such as <literal>(?:</literal>
       </para>
      </listitem>
     </itemizedlist>
 
     For this purpose, white-space characters are blank, tab, newline, and
-    any character that belongs to the <replaceable>space</> character class.
+    any character that belongs to the <replaceable>space</replaceable> character class.
    </para>
 
    <para>
     Finally, in an ARE, outside bracket expressions, the sequence
-    <literal>(?#</><replaceable>ttt</><literal>)</>
-    (where <replaceable>ttt</> is any text not containing a <literal>)</>)
+    <literal>(?#</literal><replaceable>ttt</replaceable><literal>)</literal>
+    (where <replaceable>ttt</replaceable> is any text not containing a <literal>)</literal>)
     is a comment, completely ignored.
     Again, this is not allowed between the characters of
-    multi-character symbols, like <literal>(?:</>.
+    multi-character symbols, like <literal>(?:</literal>.
     Such comments are more a historical artifact than a useful facility,
     and their use is deprecated; use the expanded syntax instead.
    </para>
 
    <para>
-    <emphasis>None</> of these metasyntax extensions is available if
-    an initial <literal>***=</> director
+    <emphasis>None</emphasis> of these metasyntax extensions is available if
+    an initial <literal>***=</literal> director
     has specified that the user's input be treated as a literal string
     rather than as an RE.
    </para>
@@ -5437,8 +5506,8 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     string, the RE matches the one starting earliest in the string.
     If the RE could match more than one substring starting at that point,
     either the longest possible match or the shortest possible match will
-    be taken, depending on whether the RE is <firstterm>greedy</> or
-    <firstterm>non-greedy</>.
+    be taken, depending on whether the RE is <firstterm>greedy</firstterm> or
+    <firstterm>non-greedy</firstterm>.
    </para>
 
    <para>
@@ -5458,39 +5527,39 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
      <listitem>
       <para>
        A quantified atom with a fixed-repetition quantifier
-       (<literal>{</><replaceable>m</><literal>}</>
+       (<literal>{</literal><replaceable>m</replaceable><literal>}</literal>
        or
-       <literal>{</><replaceable>m</><literal>}?</>)
+       <literal>{</literal><replaceable>m</replaceable><literal>}?</literal>)
        has the same greediness (possibly none) as the atom itself.
       </para>
      </listitem>
      <listitem>
       <para>
        A quantified atom with other normal quantifiers (including
-       <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}</>
-       with <replaceable>m</> equal to <replaceable>n</>)
+       <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}</literal>
+       with <replaceable>m</replaceable> equal to <replaceable>n</replaceable>)
        is greedy (prefers longest match).
       </para>
      </listitem>
      <listitem>
       <para>
        A quantified atom with a non-greedy quantifier (including
-       <literal>{</><replaceable>m</><literal>,</><replaceable>n</><literal>}?</>
-       with <replaceable>m</> equal to <replaceable>n</>)
+       <literal>{</literal><replaceable>m</replaceable><literal>,</literal><replaceable>n</replaceable><literal>}?</literal>
+       with <replaceable>m</replaceable> equal to <replaceable>n</replaceable>)
        is non-greedy (prefers shortest match).
       </para>
      </listitem>
      <listitem>
       <para>
        A branch &mdash; that is, an RE that has no top-level
-       <literal>|</> operator &mdash; has the same greediness as the first
+       <literal>|</literal> operator &mdash; has the same greediness as the first
        quantified atom in it that has a greediness attribute.
       </para>
      </listitem>
      <listitem>
       <para>
        An RE consisting of two or more branches connected by the
-       <literal>|</> operator is always greedy.
+       <literal>|</literal> operator is always greedy.
       </para>
      </listitem>
     </itemizedlist>
@@ -5501,7 +5570,7 @@ SELECT foo FROM regexp_split_to_table('the quick brown fox', E'\\s*') AS foo;
     quantified atoms, but with branches and entire REs that contain quantified
     atoms.  What that means is that the matching is done in such a way that
     the branch, or whole RE, matches the longest or shortest possible
-    substring <emphasis>as a whole</>.  Once the length of the entire match
+    substring <emphasis>as a whole</emphasis>.  Once the length of the entire match
     is determined, the part of it that matches any particular subexpression
     is determined on the basis of the greediness attribute of that
     subexpression, with subexpressions starting earlier in the RE taking
@@ -5516,16 +5585,16 @@ SELECT SUBSTRING('XY1234Z', 'Y*([0-9]{1,3})');
 SELECT SUBSTRING('XY1234Z', 'Y*?([0-9]{1,3})');
 <lineannotation>Result: </lineannotation><computeroutput>1</computeroutput>
 </screen>
-    In the first case, the RE as a whole is greedy because <literal>Y*</>
-    is greedy.  It can match beginning at the <literal>Y</>, and it matches
-    the longest possible string starting there, i.e., <literal>Y123</>.
-    The output is the parenthesized part of that, or <literal>123</>.
-    In the second case, the RE as a whole is non-greedy because <literal>Y*?</>
-    is non-greedy.  It can match beginning at the <literal>Y</>, and it matches
-    the shortest possible string starting there, i.e., <literal>Y1</>.
-    The subexpression <literal>[0-9]{1,3}</> is greedy but it cannot change
+    In the first case, the RE as a whole is greedy because <literal>Y*</literal>
+    is greedy.  It can match beginning at the <literal>Y</literal>, and it matches
+    the longest possible string starting there, i.e., <literal>Y123</literal>.
+    The output is the parenthesized part of that, or <literal>123</literal>.
+    In the second case, the RE as a whole is non-greedy because <literal>Y*?</literal>
+    is non-greedy.  It can match beginning at the <literal>Y</literal>, and it matches
+    the shortest possible string starting there, i.e., <literal>Y1</literal>.
+    The subexpression <literal>[0-9]{1,3}</literal> is greedy but it cannot change
     the decision as to the overall match length; so it is forced to match
-    just <literal>1</>.
+    just <literal>1</literal>.
    </para>
 
    <para>
@@ -5533,11 +5602,11 @@ SELECT SUBSTRING('XY1234Z', 'Y*?([0-9]{1,3})');
     the total match length is either as long as possible or as short as
     possible, according to the attribute assigned to the whole RE.  The
     attributes assigned to the subexpressions only affect how much of that
-    match they are allowed to <quote>eat</> relative to each other.
+    match they are allowed to <quote>eat</quote> relative to each other.
    </para>
 
    <para>
-    The quantifiers <literal>{1,1}</> and <literal>{1,1}?</>
+    The quantifiers <literal>{1,1}</literal> and <literal>{1,1}?</literal>
     can be used to force greediness or non-greediness, respectively,
     on a subexpression or a whole RE.
     This is useful when you need the whole RE to have a greediness attribute
@@ -5549,8 +5618,8 @@ SELECT SUBSTRING('XY1234Z', 'Y*?([0-9]{1,3})');
 SELECT regexp_match('abc01234xyz', '(.*)(\d+)(.*)');
 <lineannotation>Result: </lineannotation><computeroutput>{abc0123,4,xyz}</computeroutput>
 </screen>
-    That didn't work: the first <literal>.*</> is greedy so
-    it <quote>eats</> as much as it can, leaving the <literal>\d+</> to
+    That didn't work: the first <literal>.*</literal> is greedy so
+    it <quote>eats</quote> as much as it can, leaving the <literal>\d+</literal> to
     match at the last possible place, the last digit.  We might try to fix
     that by making it non-greedy:
 <screen>
@@ -5573,14 +5642,14 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     match lengths are measured in characters, not collating elements.
     An empty string is considered longer than no match at all.
     For example:
-    <literal>bb*</>
-    matches the three middle characters of <literal>abbbc</>;
-    <literal>(week|wee)(night|knights)</>
-    matches all ten characters of <literal>weeknights</>;
-    when <literal>(.*).*</>
-    is matched against <literal>abc</> the parenthesized subexpression
+    <literal>bb*</literal>
+    matches the three middle characters of <literal>abbbc</literal>;
+    <literal>(week|wee)(night|knights)</literal>
+    matches all ten characters of <literal>weeknights</literal>;
+    when <literal>(.*).*</literal>
+    is matched against <literal>abc</literal> the parenthesized subexpression
     matches all three characters; and when
-    <literal>(a*)*</> is matched against <literal>bc</>
+    <literal>(a*)*</literal> is matched against <literal>bc</literal>
     both the whole RE and the parenthesized
     subexpression match an empty string.
    </para>
@@ -5592,38 +5661,38 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     When an alphabetic that exists in multiple cases appears as an
     ordinary character outside a bracket expression, it is effectively
     transformed into a bracket expression containing both cases,
-    e.g., <literal>x</> becomes <literal>[xX]</>.
+    e.g., <literal>x</literal> becomes <literal>[xX]</literal>.
     When it appears inside a bracket expression, all case counterparts
     of it are added to the bracket expression, e.g.,
-    <literal>[x]</> becomes <literal>[xX]</>
-    and <literal>[^x]</> becomes <literal>[^xX]</>.
+    <literal>[x]</literal> becomes <literal>[xX]</literal>
+    and <literal>[^x]</literal> becomes <literal>[^xX]</literal>.
    </para>
 
    <para>
-    If newline-sensitive matching is specified, <literal>.</>
-    and bracket expressions using <literal>^</>
+    If newline-sensitive matching is specified, <literal>.</literal>
+    and bracket expressions using <literal>^</literal>
     will never match the newline character
     (so that matches will never cross newlines unless the RE
     explicitly arranges it)
-    and <literal>^</> and <literal>$</>
+    and <literal>^</literal> and <literal>$</literal>
     will match the empty string after and before a newline
     respectively, in addition to matching at beginning and end of string
     respectively.
-    But the ARE escapes <literal>\A</> and <literal>\Z</>
-    continue to match beginning or end of string <emphasis>only</>.
+    But the ARE escapes <literal>\A</literal> and <literal>\Z</literal>
+    continue to match beginning or end of string <emphasis>only</emphasis>.
    </para>
 
    <para>
     If partial newline-sensitive matching is specified,
-    this affects <literal>.</> and bracket expressions
-    as with newline-sensitive matching, but not <literal>^</>
-    and <literal>$</>.
+    this affects <literal>.</literal> and bracket expressions
+    as with newline-sensitive matching, but not <literal>^</literal>
+    and <literal>$</literal>.
    </para>
 
    <para>
     If inverse partial newline-sensitive matching is specified,
-    this affects <literal>^</> and <literal>$</>
-    as with newline-sensitive matching, but not <literal>.</>
+    this affects <literal>^</literal> and <literal>$</literal>
+    as with newline-sensitive matching, but not <literal>.</literal>
     and bracket expressions.
     This isn't very useful but is provided for symmetry.
    </para>
@@ -5642,18 +5711,18 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
 
    <para>
     The only feature of AREs that is actually incompatible with
-    POSIX EREs is that <literal>\</> does not lose its special
+    POSIX EREs is that <literal>\</literal> does not lose its special
     significance inside bracket expressions.
     All other ARE features use syntax which is illegal or has
     undefined or unspecified effects in POSIX EREs;
-    the <literal>***</> syntax of directors likewise is outside the POSIX
+    the <literal>***</literal> syntax of directors likewise is outside the POSIX
     syntax for both BREs and EREs.
    </para>
 
    <para>
     Many of the ARE extensions are borrowed from Perl, but some have
     been changed to clean them up, and a few Perl extensions are not present.
-    Incompatibilities of note include <literal>\b</>, <literal>\B</>,
+    Incompatibilities of note include <literal>\b</literal>, <literal>\B</literal>,
     the lack of special treatment for a trailing newline,
     the addition of complemented bracket expressions to the things
     affected by newline-sensitive matching,
@@ -5664,12 +5733,12 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
 
    <para>
     Two significant incompatibilities exist between AREs and the ERE syntax
-    recognized by pre-7.4 releases of <productname>PostgreSQL</>:
+    recognized by pre-7.4 releases of <productname>PostgreSQL</productname>:
 
     <itemizedlist>
      <listitem>
       <para>
-       In AREs, <literal>\</> followed by an alphanumeric character is either
+       In AREs, <literal>\</literal> followed by an alphanumeric character is either
        an escape or an error, while in previous releases, it was just another
        way of writing the alphanumeric.
        This should not be much of a problem because there was no reason to
@@ -5678,9 +5747,9 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
      </listitem>
      <listitem>
       <para>
-       In AREs, <literal>\</> remains a special character within
-       <literal>[]</>, so a literal <literal>\</> within a bracket
-       expression must be written <literal>\\</>.
+       In AREs, <literal>\</literal> remains a special character within
+       <literal>[]</literal>, so a literal <literal>\</literal> within a bracket
+       expression must be written <literal>\\</literal>.
       </para>
      </listitem>
     </itemizedlist>
@@ -5692,27 +5761,27 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
 
    <para>
     BREs differ from EREs in several respects.
-    In BREs, <literal>|</>, <literal>+</>, and <literal>?</>
+    In BREs, <literal>|</literal>, <literal>+</literal>, and <literal>?</literal>
     are ordinary characters and there is no equivalent
     for their functionality.
     The delimiters for bounds are
-    <literal>\{</> and <literal>\}</>,
-    with <literal>{</> and <literal>}</>
+    <literal>\{</literal> and <literal>\}</literal>,
+    with <literal>{</literal> and <literal>}</literal>
     by themselves ordinary characters.
     The parentheses for nested subexpressions are
-    <literal>\(</> and <literal>\)</>,
-    with <literal>(</> and <literal>)</> by themselves ordinary characters.
-    <literal>^</> is an ordinary character except at the beginning of the
+    <literal>\(</literal> and <literal>\)</literal>,
+    with <literal>(</literal> and <literal>)</literal> by themselves ordinary characters.
+    <literal>^</literal> is an ordinary character except at the beginning of the
     RE or the beginning of a parenthesized subexpression,
-    <literal>$</> is an ordinary character except at the end of the
+    <literal>$</literal> is an ordinary character except at the end of the
     RE or the end of a parenthesized subexpression,
-    and <literal>*</> is an ordinary character if it appears at the beginning
+    and <literal>*</literal> is an ordinary character if it appears at the beginning
     of the RE or the beginning of a parenthesized subexpression
-    (after a possible leading <literal>^</>).
+    (after a possible leading <literal>^</literal>).
     Finally, single-digit back references are available, and
-    <literal>\&lt;</> and <literal>\&gt;</>
+    <literal>\&lt;</literal> and <literal>\&gt;</literal>
     are synonyms for
-    <literal>[[:&lt;:]]</> and <literal>[[:&gt;:]]</>
+    <literal>[[:&lt;:]]</literal> and <literal>[[:&gt;:]]</literal>
     respectively; no other escapes are available in BREs.
    </para>
    </sect3>
@@ -5735,7 +5804,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     provide a powerful set of tools for converting various data types
     (date/time, integer, floating point, numeric) to formatted strings
     and for converting from formatted strings to specific data types.
-    <xref linkend="functions-formatting-table"> lists them.
+    <xref linkend="functions-formatting-table"/> lists them.
     These functions all follow a common calling convention: the first
     argument is the value to be formatted and the second argument is a
     template that defines the output or input format.
@@ -5829,7 +5898,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
    <note>
     <para>
      There is also a single-argument <function>to_timestamp</function>
-     function; see <xref linkend="functions-datetime-table">.
+     function; see <xref linkend="functions-datetime-table"/>.
     </para>
    </note>
 
@@ -5839,22 +5908,25 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
      exist to handle input formats that cannot be converted by
      simple casting.  For most standard date/time formats, simply casting the
      source string to the required data type works, and is much easier.
-     Similarly, <function>to_number</> is unnecessary for standard numeric
+     Similarly, <function>to_number</function> is unnecessary for standard numeric
      representations.
     </para>
    </tip>
 
    <para>
-    In a <function>to_char</> output template string, there are certain
+    In a <function>to_char</function> output template string, there are certain
     patterns that are recognized and replaced with appropriately-formatted
     data based on the given value.  Any text that is not a template pattern is
     simply copied verbatim.  Similarly, in an input template string (for the
     other functions), template patterns identify the values to be supplied by
-    the input data string.
+    the input data string.  If there are characters in the template string
+    that are not template patterns, the corresponding characters in the input
+    data string are simply skipped over (whether or not they are equal to the
+    template string characters).
    </para>
 
   <para>
-   <xref linkend="functions-formatting-datetime-table"> shows the
+   <xref linkend="functions-formatting-datetime-table"/> shows the
    template patterns available for formatting date and time values.
   </para>
 
@@ -6022,11 +6094,11 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        </row>
        <row>
         <entry><literal>D</literal></entry>
-        <entry>day of the week, Sunday (<literal>1</>) to Saturday (<literal>7</>)</entry>
+        <entry>day of the week, Sunday (<literal>1</literal>) to Saturday (<literal>7</literal>)</entry>
        </row>
        <row>
         <entry><literal>ID</literal></entry>
-        <entry>ISO 8601 day of the week, Monday (<literal>1</>) to Sunday (<literal>7</>)</entry>
+        <entry>ISO 8601 day of the week, Monday (<literal>1</literal>) to Sunday (<literal>7</literal>)</entry>
        </row>
        <row>
         <entry><literal>W</literal></entry>
@@ -6063,17 +6135,25 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        <row>
         <entry><literal>TZ</literal></entry>
         <entry>upper case time-zone abbreviation
-         (only supported in <function>to_char</>)</entry>
+         (only supported in <function>to_char</function>)</entry>
        </row>
        <row>
         <entry><literal>tz</literal></entry>
         <entry>lower case time-zone abbreviation
-         (only supported in <function>to_char</>)</entry>
+         (only supported in <function>to_char</function>)</entry>
+       </row>
+       <row>
+       <entry><literal>TZH</literal></entry>
+        <entry>time-zone hours</entry>
+       </row>
+       <row>
+       <entry><literal>TZM</literal></entry>
+        <entry>time-zone minutes</entry>
        </row>
        <row>
         <entry><literal>OF</literal></entry>
         <entry>time-zone offset from UTC
-         (only supported in <function>to_char</>)</entry>
+         (only supported in <function>to_char</function>)</entry>
        </row>
       </tbody>
      </tgroup>
@@ -6084,7 +6164,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     behavior.  For example, <literal>FMMonth</literal>
     is the <literal>Month</literal> pattern with the
     <literal>FM</literal> modifier.
-    <xref linkend="functions-formatting-datetimemod-table"> shows the
+    <xref linkend="functions-formatting-datetimemod-table"/> shows the
     modifier patterns for date/time formatting.
    </para>
 
@@ -6107,12 +6187,12 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        <row>
         <entry><literal>TH</literal> suffix</entry>
         <entry>upper case ordinal number suffix</entry>
-        <entry><literal>DDTH</literal>, e.g., <literal>12TH</></entry>
+        <entry><literal>DDTH</literal>, e.g., <literal>12TH</literal></entry>
        </row>
        <row>
         <entry><literal>th</literal> suffix</entry>
         <entry>lower case ordinal number suffix</entry>
-        <entry><literal>DDth</literal>, e.g., <literal>12th</></entry>
+        <entry><literal>DDth</literal>, e.g., <literal>12th</literal></entry>
        </row>
        <row>
         <entry><literal>FX</literal> prefix</entry>
@@ -6122,7 +6202,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        <row>
         <entry><literal>TM</literal> prefix</entry>
         <entry>translation mode (print localized day and month names based on
-         <xref linkend="guc-lc-time">)</entry>
+         <xref linkend="guc-lc-time"/>)</entry>
         <entry><literal>TMMonth</literal></entry>
        </row>
        <row>
@@ -6153,7 +6233,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
      <listitem>
       <para>
        <literal>TM</literal> does not include trailing blanks.
-       <function>to_timestamp</> and <function>to_date</> ignore
+       <function>to_timestamp</function> and <function>to_date</function> ignore
        the <literal>TM</literal> modifier.
       </para>
      </listitem>
@@ -6176,13 +6256,15 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        Ordinary text is allowed in <function>to_char</function>
        templates and will be output literally.  You can put a substring
        in double quotes to force it to be interpreted as literal text
-       even if it contains pattern key words.  For example, in
+       even if it contains template patterns.  For example, in
        <literal>'"Hello Year "YYYY'</literal>, the <literal>YYYY</literal>
        will be replaced by the year data, but the single <literal>Y</literal> in <literal>Year</literal>
-       will not be.  In <function>to_date</>, <function>to_number</>,
-       and <function>to_timestamp</>, double-quoted strings skip the number of
-       input characters contained in the string, e.g. <literal>"XX"</>
-       skips two input characters.
+       will not be.
+       In <function>to_date</function>, <function>to_number</function>,
+       and <function>to_timestamp</function>, literal text and double-quoted
+       strings result in skipping the number of characters contained in the
+       string; for example <literal>"XX"</literal> skips two input characters
+       (whether or not they are <literal>XX</literal>).
       </para>
      </listitem>
 
@@ -6191,6 +6273,11 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        If you want to have a double quote in the output you must
        precede it with a backslash, for example <literal>'\"YYYY
        Month\"'</literal>. <!-- "" font-lock sanity :-) -->
+       Backslashes are not otherwise special outside of double-quoted
+       strings.  Within a double-quoted string, a backslash causes the
+       next character to be taken literally, whatever it is (but this
+       has no special effect unless the next character is a double quote
+       or another backslash).
       </para>
      </listitem>
 
@@ -6198,9 +6285,9 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
       <para>
        In <function>to_timestamp</function> and <function>to_date</function>,
        if the year format specification is less than four digits, e.g.
-       <literal>YYY</>, and the supplied year is less than four digits,
+       <literal>YYY</literal>, and the supplied year is less than four digits,
        the year will be adjusted to be nearest to the year 2020, e.g.
-       <literal>95</> becomes 1995.
+       <literal>95</literal> becomes 1995.
       </para>
      </listitem>
 
@@ -6269,7 +6356,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        Attempting to enter a date using a mixture of ISO 8601 week-numbering
        fields and Gregorian date fields is nonsensical, and will cause an
        error.  In the context of an ISO 8601 week-numbering year, the
-       concept of a <quote>month</> or <quote>day of month</> has no
+       concept of a <quote>month</quote> or <quote>day of month</quote> has no
        meaning.  In the context of a Gregorian year, the ISO week has no
        meaning.
       </para>
@@ -6278,10 +6365,10 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         While <function>to_date</function> will reject a mixture of
         Gregorian and ISO week-numbering date
         fields, <function>to_char</function> will not, since output format
-        specifications like <literal>YYYY-MM-DD (IYYY-IDDD)</> can be
-        useful.  But avoid writing something like <literal>IYYY-MM-DD</>;
+        specifications like <literal>YYYY-MM-DD (IYYY-IDDD)</literal> can be
+        useful.  But avoid writing something like <literal>IYYY-MM-DD</literal>;
         that would yield surprising results near the start of the year.
-        (See <xref linkend="functions-datetime-extract"> for more
+        (See <xref linkend="functions-datetime-extract"/> for more
         information.)
        </para>
       </caution>
@@ -6323,11 +6410,11 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
 
      <listitem>
       <para>
-        <function>to_char(interval)</function> formats <literal>HH</> and
-        <literal>HH12</> as shown on a 12-hour clock, for example zero hours
-        and 36 hours both output as <literal>12</>, while <literal>HH24</>
+        <function>to_char(interval)</function> formats <literal>HH</literal> and
+        <literal>HH12</literal> as shown on a 12-hour clock, for example zero hours
+        and 36 hours both output as <literal>12</literal>, while <literal>HH24</literal>
         outputs the full hour value, which can exceed 23 in
-        an <type>interval</> value.
+        an <type>interval</type> value.
       </para>
      </listitem>
 
@@ -6335,7 +6422,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
    </para>
 
   <para>
-   <xref linkend="functions-formatting-numeric-table"> shows the
+   <xref linkend="functions-formatting-numeric-table"/> shows the
    template patterns available for formatting numeric values.
   </para>
 
@@ -6351,11 +6438,11 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
       <tbody>
        <row>
         <entry><literal>9</literal></entry>
-        <entry>value with the specified number of digits</entry>
+        <entry>digit position (can be dropped if insignificant)</entry>
        </row>
        <row>
         <entry><literal>0</literal></entry>
-        <entry>value with leading zeros</entry>
+        <entry>digit position (will not be dropped, even if insignificant)</entry>
        </row>
        <row>
         <entry><literal>.</literal> (period)</entry>
@@ -6363,7 +6450,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        </row>
        <row>
         <entry><literal>,</literal> (comma)</entry>
-        <entry>group (thousand) separator</entry>
+        <entry>group (thousands) separator</entry>
        </row>
        <row>
         <entry><literal>PR</literal></entry>
@@ -6421,6 +6508,39 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     Usage notes for numeric formatting:
 
     <itemizedlist>
+     <listitem>
+      <para>
+       <literal>0</literal> specifies a digit position that will always be printed,
+       even if it contains a leading/trailing zero.  <literal>9</literal> also
+       specifies a digit position, but if it is a leading zero then it will
+       be replaced by a space, while if it is a trailing zero and fill mode
+       is specified then it will be deleted.  (For <function>to_number()</function>,
+       these two pattern characters are equivalent.)
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       The pattern characters <literal>S</literal>, <literal>L</literal>, <literal>D</literal>,
+       and <literal>G</literal> represent the sign, currency symbol, decimal point,
+       and thousands separator characters defined by the current locale
+       (see <xref linkend="guc-lc-monetary"/>
+       and <xref linkend="guc-lc-numeric"/>).  The pattern characters period
+       and comma represent those exact characters, with the meanings of
+       decimal point and thousands separator, regardless of locale.
+      </para>
+     </listitem>
+
+     <listitem>
+      <para>
+       If no explicit provision is made for a sign
+       in <function>to_char()</function>'s pattern, one column will be reserved for
+       the sign, and it will be anchored to (appear just left of) the
+       number.  If <literal>S</literal> appears just left of some <literal>9</literal>'s,
+       it will likewise be anchored to the number.
+      </para>
+     </listitem>
+
      <listitem>
       <para>
        A sign formatted using <literal>SG</literal>, <literal>PL</literal>, or
@@ -6428,18 +6548,10 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        the number; for example,
        <literal>to_char(-12, 'MI9999')</literal> produces <literal>'-&nbsp;&nbsp;12'</literal>
        but <literal>to_char(-12, 'S9999')</literal> produces <literal>'&nbsp;&nbsp;-12'</literal>.
-       The Oracle implementation does not allow the use of
+       (The Oracle implementation does not allow the use of
        <literal>MI</literal> before <literal>9</literal>, but rather
        requires that <literal>9</literal> precede
-       <literal>MI</literal>.
-      </para>
-     </listitem>
-
-     <listitem>
-      <para>
-       <literal>9</literal> results in a value with the same number of
-       digits as there are <literal>9</literal>s. If a digit is
-       not available it outputs a space.
+       <literal>MI</literal>.)
       </para>
      </listitem>
 
@@ -6458,6 +6570,17 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
       </para>
      </listitem>
 
+     <listitem>
+      <para>
+       In <function>to_number</function>, if non-data template patterns such
+       as <literal>L</literal> or <literal>TH</literal> are used, the
+       corresponding number of input characters are skipped, whether or not
+       they match the template pattern, unless they are data characters
+       (that is, digits, sign, decimal point, or comma).  For
+       example, <literal>TH</literal> would skip two non-data characters.
+      </para>
+     </listitem>
+
      <listitem>
       <para>
        <literal>V</literal> with <function>to_char</function>
@@ -6486,10 +6609,10 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
 
    <para>
     Certain modifiers can be applied to any template pattern to alter its
-    behavior.  For example, <literal>FM9999</literal>
-    is the <literal>9999</literal> pattern with the
+    behavior.  For example, <literal>FM99.99</literal>
+    is the <literal>99.99</literal> pattern with the
     <literal>FM</literal> modifier.
-    <xref linkend="functions-formatting-numericmod-table"> shows the
+    <xref linkend="functions-formatting-numericmod-table"/> shows the
     modifier patterns for numeric formatting.
    </para>
 
@@ -6506,8 +6629,8 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
       <tbody>
        <row>
         <entry><literal>FM</literal> prefix</entry>
-        <entry>fill mode (suppress leading zeroes and padding blanks)</entry>
-        <entry><literal>FM9999</literal></entry>
+        <entry>fill mode (suppress trailing zeroes and padding blanks)</entry>
+        <entry><literal>FM99.99</literal></entry>
        </row>
        <row>
         <entry><literal>TH</literal> suffix</entry>
@@ -6524,7 +6647,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     </table>
 
   <para>
-   <xref linkend="functions-formatting-examples-table"> shows some
+   <xref linkend="functions-formatting-examples-table"/> shows some
    examples of the use of the <function>to_char</function> function.
   </para>
 
@@ -6554,6 +6677,10 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         <entry><literal>to_char(-0.1, 'FM9.99')</literal></entry>
         <entry><literal>'-.1'</literal></entry>
        </row>
+       <row>
+        <entry><literal>to_char(-0.1, 'FM90.99')</literal></entry>
+        <entry><literal>'-0.1'</literal></entry>
+       </row>
        <row>
         <entry><literal>to_char(0.1, '0.9')</literal></entry>
         <entry><literal>'&nbsp;0.1'</literal></entry>
@@ -6697,15 +6824,15 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
    <title>Date/Time Functions and Operators</title>
 
   <para>
-   <xref linkend="functions-datetime-table"> shows the available
+   <xref linkend="functions-datetime-table"/> shows the available
    functions for date/time value processing, with details appearing in
    the following subsections.  <xref
-   linkend="operators-datetime-table"> illustrates the behaviors of
+   linkend="operators-datetime-table"/> illustrates the behaviors of
    the basic arithmetic operators (<literal>+</literal>,
    <literal>*</literal>, etc.).  For formatting functions, refer to
-   <xref linkend="functions-formatting">.  You should be familiar with
+   <xref linkend="functions-formatting"/>.  You should be familiar with
    the background information on date/time data types from <xref
-   linkend="datatype-datetime">.
+   linkend="datatype-datetime"/>.
   </para>
 
   <para>
@@ -6713,7 +6840,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
    inputs actually come in two variants: one that takes <type>time with time zone</type> or <type>timestamp
    with time zone</type>, and one that takes <type>time without time zone</type> or <type>timestamp without time zone</type>.
    For brevity, these variants are not shown separately.  Also, the
-   <literal>+</> and <literal>*</> operators come in commutative pairs (for
+   <literal>+</literal> and <literal>*</literal> operators come in commutative pairs (for
    example both date + integer and integer + date); we show only one of each
    such pair.
   </para>
@@ -6870,7 +6997,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
          <literal><function>age(<type>timestamp</type>, <type>timestamp</type>)</function></literal>
         </entry>
         <entry><type>interval</type></entry>
-        <entry>Subtract arguments, producing a <quote>symbolic</> result that
+        <entry>Subtract arguments, producing a <quote>symbolic</quote> result that
         uses years and months, rather than just days</entry>
         <entry><literal>age(timestamp '2001-04-10', timestamp '1957-06-13')</literal></entry>
         <entry><literal>43 years 9 mons 27 days</literal></entry>
@@ -6893,7 +7020,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp with time zone</type></entry>
         <entry>Current date and time (changes during statement execution);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -6908,7 +7035,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>date</type></entry>
         <entry>Current date;
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -6923,7 +7050,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>time with time zone</type></entry>
         <entry>Current time of day;
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -6938,7 +7065,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp with time zone</type></entry>
         <entry>Current date and time (start of current transaction);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -6953,7 +7080,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>double precision</type></entry>
         <entry>Get subfield (equivalent to <function>extract</function>);
-         see <xref linkend="functions-datetime-extract">
+         see <xref linkend="functions-datetime-extract"/>
         </entry>
         <entry><literal>date_part('hour', timestamp '2001-02-16 20:38:40')</literal></entry>
         <entry><literal>20</literal></entry>
@@ -6963,7 +7090,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         <entry><literal><function>date_part(<type>text</type>, <type>interval</type>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>Get subfield (equivalent to
-         <function>extract</function>); see <xref linkend="functions-datetime-extract">
+         <function>extract</function>); see <xref linkend="functions-datetime-extract"/>
         </entry>
         <entry><literal>date_part('month', interval '2 years 3 months')</literal></entry>
         <entry><literal>3</literal></entry>
@@ -6977,7 +7104,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
          <literal><function>date_trunc(<type>text</type>, <type>timestamp</type>)</function></literal>
         </entry>
         <entry><type>timestamp</type></entry>
-        <entry>Truncate to specified precision; see also <xref linkend="functions-datetime-trunc">
+        <entry>Truncate to specified precision; see also <xref linkend="functions-datetime-trunc"/>
         </entry>
         <entry><literal>date_trunc('hour', timestamp '2001-02-16 20:38:40')</literal></entry>
         <entry><literal>2001-02-16 20:00:00</literal></entry>
@@ -6986,7 +7113,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
        <row>
         <entry><literal><function>date_trunc(<type>text</type>, <type>interval</type>)</function></literal></entry>
         <entry><type>interval</type></entry>
-        <entry>Truncate to specified precision; see also <xref linkend="functions-datetime-trunc">
+        <entry>Truncate to specified precision; see also <xref linkend="functions-datetime-trunc"/>
         </entry>
         <entry><literal>date_trunc('hour', interval '2 days 3 hours 40 minutes')</literal></entry>
         <entry><literal>2 days 03:00:00</literal></entry>
@@ -7001,7 +7128,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
          <type>timestamp</type>)</literal>
         </entry>
         <entry><type>double precision</type></entry>
-        <entry>Get subfield; see <xref linkend="functions-datetime-extract">
+        <entry>Get subfield; see <xref linkend="functions-datetime-extract"/>
         </entry>
         <entry><literal>extract(hour from timestamp '2001-02-16 20:38:40')</literal></entry>
         <entry><literal>20</literal></entry>
@@ -7011,7 +7138,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         <entry><literal><function>extract</function>(<parameter>field</parameter> from
          <type>interval</type>)</literal></entry>
         <entry><type>double precision</type></entry>
-        <entry>Get subfield; see <xref linkend="functions-datetime-extract">
+        <entry>Get subfield; see <xref linkend="functions-datetime-extract"/>
         </entry>
         <entry><literal>extract(month from interval '2 years 3 months')</literal></entry>
         <entry><literal>3</literal></entry>
@@ -7080,7 +7207,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
          <literal><function>justify_interval(<type>interval</type>)</function></literal>
         </entry>
         <entry><type>interval</type></entry>
-        <entry>Adjust interval using <function>justify_days</> and <function>justify_hours</>, with additional sign adjustments</entry>
+        <entry>Adjust interval using <function>justify_days</function> and <function>justify_hours</function>, with additional sign adjustments</entry>
         <entry><literal>justify_interval(interval '1 mon -1 hour')</literal></entry>
         <entry><literal>29 days 23:00:00</literal></entry>
        </row>
@@ -7094,7 +7221,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>time</type></entry>
         <entry>Current time of day;
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7109,7 +7236,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp</type></entry>
         <entry>Current date and time (start of current transaction);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7243,7 +7370,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp with time zone</type></entry>
         <entry>Current date and time (start of current transaction);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7258,7 +7385,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp with time zone</type></entry>
         <entry>Current date and time (start of current statement);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7273,8 +7400,8 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>text</type></entry>
         <entry>Current date and time
-         (like <function>clock_timestamp</>, but as a <type>text</> string);
-         see <xref linkend="functions-datetime-current">
+         (like <function>clock_timestamp</function>, but as a <type>text</type> string);
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7289,7 +7416,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
         </entry>
         <entry><type>timestamp with time zone</type></entry>
         <entry>Current date and time (start of current transaction);
-         see <xref linkend="functions-datetime-current">
+         see <xref linkend="functions-datetime-current"/>
         </entry>
         <entry></entry>
         <entry></entry>
@@ -7315,7 +7442,7 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     <indexterm>
       <primary>OVERLAPS</primary>
     </indexterm>
-    In addition to these functions, the SQL <literal>OVERLAPS</> operator is
+    In addition to these functions, the SQL <literal>OVERLAPS</literal> operator is
     supported:
 <synopsis>
 (<replaceable>start1</replaceable>, <replaceable>end1</replaceable>) OVERLAPS (<replaceable>start2</replaceable>, <replaceable>end2</replaceable>)
@@ -7326,11 +7453,11 @@ SELECT regexp_match('abc01234xyz', '(?:(.*?)(\d+)(.*)){1,1}');
     can be specified as pairs of dates, times, or time stamps; or as
     a date, time, or time stamp followed by an interval.  When a pair
     of values is provided, either the start or the end can be written
-    first; <literal>OVERLAPS</> automatically takes the earlier value
+    first; <literal>OVERLAPS</literal> automatically takes the earlier value
     of the pair as the start.  Each time period is considered to
-    represent the half-open interval <replaceable>start</> <literal>&lt;=</>
-    <replaceable>time</> <literal>&lt;</> <replaceable>end</>, unless
-    <replaceable>start</> and <replaceable>end</> are equal in which case it
+    represent the half-open interval <replaceable>start</replaceable> <literal>&lt;=</literal>
+    <replaceable>time</replaceable> <literal>&lt;</literal> <replaceable>end</replaceable>, unless
+    <replaceable>start</replaceable> and <replaceable>end</replaceable> are equal in which case it
     represents that single time instant.  This means for instance that two
     time periods with only an endpoint in common do not overlap.
    </para>
@@ -7369,31 +7496,31 @@ SELECT (DATE '2001-10-30', DATE '2001-10-30') OVERLAPS
   </para>
 
   <para>
-   Note there can be ambiguity in the <literal>months</> field returned by
-   <function>age</> because different months have different numbers of
-   days.  <productname>PostgreSQL</>'s approach uses the month from the
+   Note there can be ambiguity in the <literal>months</literal> field returned by
+   <function>age</function> because different months have different numbers of
+   days.  <productname>PostgreSQL</productname>'s approach uses the month from the
    earlier of the two dates when calculating partial months.  For example,
-   <literal>age('2004-06-01', '2004-04-30')</> uses April to yield
-   <literal>1 mon 1 day</>, while using May would yield <literal>1 mon 2
-   days</> because May has 31 days, while April has only 30.
+   <literal>age('2004-06-01', '2004-04-30')</literal> uses April to yield
+   <literal>1 mon 1 day</literal>, while using May would yield <literal>1 mon 2
+   days</literal> because May has 31 days, while April has only 30.
   </para>
 
   <para>
    Subtraction of dates and timestamps can also be complex.  One conceptually
    simple way to perform subtraction is to convert each value to a number
-   of seconds using <literal>EXTRACT(EPOCH FROM ...)</>, then subtract the
+   of seconds using <literal>EXTRACT(EPOCH FROM ...)</literal>, then subtract the
    results; this produces the
-   number of <emphasis>seconds</> between the two values.  This will adjust
+   number of <emphasis>seconds</emphasis> between the two values.  This will adjust
    for the number of days in each month, timezone changes, and daylight
    saving time adjustments.  Subtraction of date or timestamp
-   values with the <quote><literal>-</></quote> operator
+   values with the <quote><literal>-</literal></quote> operator
    returns the number of days (24-hours) and hours/minutes/seconds
-   between the values, making the same adjustments.  The <function>age</>
+   between the values, making the same adjustments.  The <function>age</function>
    function returns years, months, days, and hours/minutes/seconds,
    performing field-by-field subtraction and then adjusting for negative
    field values.  The following queries illustrate the differences in these
    approaches.  The sample results were produced with <literal>timezone
-   = 'US/Eastern'</>; there is a daylight saving time change between the
+   = 'US/Eastern'</literal>; there is a daylight saving time change between the
    two dates used:
   </para>
 
@@ -7505,8 +7632,8 @@ SELECT EXTRACT(DECADE FROM TIMESTAMP '2001-02-16 20:38:40');
       <term><literal>dow</literal></term>
       <listitem>
        <para>
-        The day of the week as Sunday (<literal>0</>) to
-        Saturday (<literal>6</>)
+        The day of the week as Sunday (<literal>0</literal>) to
+        Saturday (<literal>6</literal>)
        </para>
 
 <screen>
@@ -7558,7 +7685,7 @@ SELECT EXTRACT(EPOCH FROM INTERVAL '5 days 3 hours');
 
        <para>
         You can convert an epoch value back to a time stamp
-        with <function>to_timestamp</>:
+        with <function>to_timestamp</function>:
        </para>
 <screen>
 SELECT to_timestamp(982384720.12);
@@ -7585,8 +7712,8 @@ SELECT EXTRACT(HOUR FROM TIMESTAMP '2001-02-16 20:38:40');
       <term><literal>isodow</literal></term>
       <listitem>
        <para>
-        The day of the week as Monday (<literal>1</>) to
-        Sunday (<literal>7</>)
+        The day of the week as Monday (<literal>1</literal>) to
+        Sunday (<literal>7</literal>)
        </para>
 
 <screen>
@@ -7594,8 +7721,8 @@ SELECT EXTRACT(ISODOW FROM TIMESTAMP '2001-02-18 20:38:40');
 <lineannotation>Result: </lineannotation><computeroutput>7</computeroutput>
 </screen>
        <para>
-        This is identical to <literal>dow</> except for Sunday.  This
-        matches the <acronym>ISO</> 8601 day of the week numbering.
+        This is identical to <literal>dow</literal> except for Sunday.  This
+        matches the <acronym>ISO</acronym> 8601 day of the week numbering.
        </para>
 
       </listitem>
@@ -7790,11 +7917,11 @@ SELECT EXTRACT(SECOND FROM TIME '17:12:28.5');
         In the ISO week-numbering system, it is possible for early-January
         dates to be part of the 52nd or 53rd week of the previous year, and for
         late-December dates to be part of the first week of the next year.
-        For example, <literal>2005-01-01</> is part of the 53rd week of year
-        2004, and <literal>2006-01-01</> is part of the 52nd week of year
-        2005, while <literal>2012-12-31</> is part of the first week of 2013.
-        It's recommended to use the <literal>isoyear</> field together with
-        <literal>week</> to get consistent results.
+        For example, <literal>2005-01-01</literal> is part of the 53rd week of year
+        2004, and <literal>2006-01-01</literal> is part of the 52nd week of year
+        2005, while <literal>2012-12-31</literal> is part of the first week of 2013.
+        It's recommended to use the <literal>isoyear</literal> field together with
+        <literal>week</literal> to get consistent results.
        </para>
 
 <screen>
@@ -7808,8 +7935,8 @@ SELECT EXTRACT(WEEK FROM TIMESTAMP '2001-02-16 20:38:40');
       <term><literal>year</literal></term>
       <listitem>
        <para>
-        The year field.  Keep in mind there is no <literal>0 AD</>, so subtracting
-        <literal>BC</> years from <literal>AD</> years should be done with care.
+        The year field.  Keep in mind there is no <literal>0 AD</literal>, so subtracting
+        <literal>BC</literal> years from <literal>AD</literal> years should be done with care.
        </para>
 
 <screen>
@@ -7824,11 +7951,11 @@ SELECT EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40');
 
    <note>
     <para>
-     When the input value is +/-Infinity, <function>extract</> returns
-     +/-Infinity for monotonically-increasing fields (<literal>epoch</>,
-     <literal>julian</>, <literal>year</>, <literal>isoyear</>,
-     <literal>decade</>, <literal>century</>, and <literal>millennium</>).
-     For other fields, NULL is returned.  <productname>PostgreSQL</>
+     When the input value is +/-Infinity, <function>extract</function> returns
+     +/-Infinity for monotonically-increasing fields (<literal>epoch</literal>,
+     <literal>julian</literal>, <literal>year</literal>, <literal>isoyear</literal>,
+     <literal>decade</literal>, <literal>century</literal>, and <literal>millennium</literal>).
+     For other fields, NULL is returned.  <productname>PostgreSQL</productname>
      versions before 9.6 returned zero for all cases of infinite input.
     </para>
    </note>
@@ -7836,7 +7963,7 @@ SELECT EXTRACT(YEAR FROM TIMESTAMP '2001-02-16 20:38:40');
    <para>
     The <function>extract</function> function is primarily intended
     for computational processing.  For formatting date/time values for
-    display, see <xref linkend="functions-formatting">.
+    display, see <xref linkend="functions-formatting"/>.
    </para>
 
    <para>
@@ -7879,13 +8006,13 @@ SELECT date_part('hour', INTERVAL '4 hours 3 minutes');
 date_trunc('<replaceable>field</replaceable>', <replaceable>source</replaceable>)
 </synopsis>
     <replaceable>source</replaceable> is a value expression of type
-    <type>timestamp</type> or <type>interval</>.
+    <type>timestamp</type> or <type>interval</type>.
     (Values of type <type>date</type> and
     <type>time</type> are cast automatically to <type>timestamp</type> or
-    <type>interval</>, respectively.)
+    <type>interval</type>, respectively.)
     <replaceable>field</replaceable> selects to which precision to
     truncate the input value.  The return value is of type
-    <type>timestamp</type> or <type>interval</>
+    <type>timestamp</type> or <type>interval</type>
     with all fields that are less significant than the
     selected one set to zero (or one, for day and month).
    </para>
@@ -7936,7 +8063,7 @@ SELECT date_trunc('year', TIMESTAMP '2001-02-16 20:38:40');
    <para>
     The <literal>AT TIME ZONE</literal> construct allows conversions
     of time stamps to different time zones.  <xref
-    linkend="functions-datetime-zoneconvert-table"> shows its
+    linkend="functions-datetime-zoneconvert-table"/> shows its
     variants.
    </para>
 
@@ -7954,42 +8081,42 @@ SELECT date_trunc('year', TIMESTAMP '2001-02-16 20:38:40');
       <tbody>
        <row>
         <entry>
-         <literal><type>timestamp without time zone</type> AT TIME ZONE <replaceable>zone</></literal>
+         <literal><type>timestamp without time zone</type> AT TIME ZONE <replaceable>zone</replaceable></literal>
         </entry>
         <entry><type>timestamp with time zone</type></entry>
-        <entry>Treat given time stamp <emphasis>without time zone</> as located in the specified time zone</entry>
+        <entry>Treat given time stamp <emphasis>without time zone</emphasis> as located in the specified time zone</entry>
        </row>
 
        <row>
         <entry>
-         <literal><type>timestamp with time zone</type> AT TIME ZONE <replaceable>zone</></literal>
+         <literal><type>timestamp with time zone</type> AT TIME ZONE <replaceable>zone</replaceable></literal>
         </entry>
         <entry><type>timestamp without time zone</type></entry>
-        <entry>Convert given time stamp <emphasis>with time zone</> to the new time
+        <entry>Convert given time stamp <emphasis>with time zone</emphasis> to the new time
         zone, with no time zone designation</entry>
        </row>
 
        <row>
         <entry>
-         <literal><type>time with time zone</type> AT TIME ZONE <replaceable>zone</></literal>
+         <literal><type>time with time zone</type> AT TIME ZONE <replaceable>zone</replaceable></literal>
         </entry>
         <entry><type>time with time zone</type></entry>
-        <entry>Convert given time <emphasis>with time zone</> to the new time zone</entry>
+        <entry>Convert given time <emphasis>with time zone</emphasis> to the new time zone</entry>
        </row>
       </tbody>
      </tgroup>
     </table>
 
    <para>
-    In these expressions, the desired time zone <replaceable>zone</> can be
+    In these expressions, the desired time zone <replaceable>zone</replaceable> can be
     specified either as a text string (e.g., <literal>'PST'</literal>)
     or as an interval (e.g., <literal>INTERVAL '-08:00'</literal>).
     In the text case, a time zone name can be specified in any of the ways
-    described in <xref linkend="datatype-timezones">.
+    described in <xref linkend="datatype-timezones"/>.
    </para>
 
    <para>
-    Examples (assuming the local time zone is <literal>PST8PDT</>):
+    Examples (assuming the local time zone is <literal>PST8PDT</literal>):
 <screen>
 SELECT TIMESTAMP '2001-02-16 20:38:40' AT TIME ZONE 'MST';
 <lineannotation>Result: </lineannotation><computeroutput>2001-02-16 19:38:40-08</computeroutput>
@@ -8003,10 +8130,10 @@ SELECT TIMESTAMP WITH TIME ZONE '2001-02-16 20:38:40-05' AT TIME ZONE 'MST';
    </para>
 
    <para>
-    The function <literal><function>timezone</function>(<replaceable>zone</>,
-    <replaceable>timestamp</>)</literal> is equivalent to the SQL-conforming construct
-    <literal><replaceable>timestamp</> AT TIME ZONE
-    <replaceable>zone</></literal>.
+    The function <literal><function>timezone</function>(<replaceable>zone</replaceable>,
+    <replaceable>timestamp</replaceable>)</literal> is equivalent to the SQL-conforming construct
+    <literal><replaceable>timestamp</replaceable> AT TIME ZONE
+    <replaceable>zone</replaceable></literal>.
    </para>
   </sect2>
 
@@ -8111,23 +8238,23 @@ now()
    </para>
 
    <para>
-    <function>transaction_timestamp()</> is equivalent to
+    <function>transaction_timestamp()</function> is equivalent to
     <function>CURRENT_TIMESTAMP</function>, but is named to clearly reflect
     what it returns.
-    <function>statement_timestamp()</> returns the start time of the current
+    <function>statement_timestamp()</function> returns the start time of the current
     statement (more specifically, the time of receipt of the latest command
     message from the client).
-    <function>statement_timestamp()</> and <function>transaction_timestamp()</>
+    <function>statement_timestamp()</function> and <function>transaction_timestamp()</function>
     return the same value during the first command of a transaction, but might
     differ during subsequent commands.
-    <function>clock_timestamp()</> returns the actual current time, and
+    <function>clock_timestamp()</function> returns the actual current time, and
     therefore its value changes even within a single SQL command.
-    <function>timeofday()</> is a historical
+    <function>timeofday()</function> is a historical
     <productname>PostgreSQL</productname> function.  Like
-    <function>clock_timestamp()</>, it returns the actual current time,
-    but as a formatted <type>text</> string rather than a <type>timestamp
-    with time zone</> value.
-    <function>now()</> is a traditional <productname>PostgreSQL</productname>
+    <function>clock_timestamp()</function>, it returns the actual current time,
+    but as a formatted <type>text</type> string rather than a <type>timestamp
+    with time zone</type> value.
+    <function>now()</function> is a traditional <productname>PostgreSQL</productname>
     equivalent to <function>transaction_timestamp()</function>.
    </para>
 
@@ -8145,7 +8272,7 @@ SELECT TIMESTAMP 'now';  -- incorrect for use with DEFAULT
 
     <tip>
      <para>
-      You do not want to use the third form when specifying a <literal>DEFAULT</>
+      You do not want to use the third form when specifying a <literal>DEFAULT</literal>
       clause while creating a table.  The system will convert <literal>now</literal>
       to a <type>timestamp</type> as soon as the constant is parsed, so that when
       the default value is needed,
@@ -8181,16 +8308,16 @@ SELECT TIMESTAMP 'now';  -- incorrect for use with DEFAULT
     process:
 <synopsis>
 pg_sleep(<replaceable>seconds</replaceable>)
-pg_sleep_for(<type>interval</>)
-pg_sleep_until(<type>timestamp with time zone</>)
+pg_sleep_for(<type>interval</type>)
+pg_sleep_until(<type>timestamp with time zone</type>)
 </synopsis>
 
     <function>pg_sleep</function> makes the current session's process
     sleep until <replaceable>seconds</replaceable> seconds have
     elapsed.  <replaceable>seconds</replaceable> is a value of type
-    <type>double precision</>, so fractional-second delays can be specified.
+    <type>double precision</type>, so fractional-second delays can be specified.
     <function>pg_sleep_for</function> is a convenience function for larger
-    sleep times specified as an <type>interval</>.
+    sleep times specified as an <type>interval</type>.
     <function>pg_sleep_until</function> is a convenience function for when
     a specific wake-up time is desired.
     For example:
@@ -8229,10 +8356,10 @@ SELECT pg_sleep_until('tomorrow 03:00');
   <title>Enum Support Functions</title>
 
   <para>
-   For enum types (described in <xref linkend="datatype-enum">),
+   For enum types (described in <xref linkend="datatype-enum"/>),
    there are several functions that allow cleaner programming without
    hard-coding particular values of an enum type.
-   These are listed in <xref linkend="functions-enum-table">. The examples
+   These are listed in <xref linkend="functions-enum-table"/>. The examples
    assume an enum type created as:
 
 <programlisting>
@@ -8312,7 +8439,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    </table>
 
    <para>
-    Notice that except for the two-argument form of <function>enum_range</>,
+    Notice that except for the two-argument form of <function>enum_range</function>,
     these functions disregard the specific value passed to them; they care
     only about its declared data type.  Either null or a specific value of
     the type can be passed, with the same result.  It is more common to
@@ -8329,20 +8456,20 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
     <type>lseg</type>, <type>line</type>, <type>path</type>,
     <type>polygon</type>, and <type>circle</type> have a large set of
     native support functions and operators, shown in <xref
-    linkend="functions-geometry-op-table">, <xref
-    linkend="functions-geometry-func-table">, and <xref
-    linkend="functions-geometry-conv-table">.
+    linkend="functions-geometry-op-table"/>, <xref
+    linkend="functions-geometry-func-table"/>, and <xref
+    linkend="functions-geometry-conv-table"/>.
    </para>
 
    <caution>
     <para>
-     Note that the <quote>same as</> operator, <literal>~=</>, represents
+     Note that the <quote>same as</quote> operator, <literal>~=</literal>, represents
      the usual notion of equality for the <type>point</type>,
      <type>box</type>, <type>polygon</type>, and <type>circle</type> types.
-     Some of these types also have an <literal>=</> operator, but
-     <literal>=</> compares
-     for equal <emphasis>areas</> only.  The other scalar comparison operators
-     (<literal>&lt;=</> and so on) likewise compare areas for these types.
+     Some of these types also have an <literal>=</literal> operator, but
+     <literal>=</literal> compares
+     for equal <emphasis>areas</emphasis> only.  The other scalar comparison operators
+     (<literal>&lt;=</literal> and so on) likewise compare areas for these types.
     </para>
    </caution>
 
@@ -8519,8 +8646,8 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    <note>
     <para>
      Before <productname>PostgreSQL</productname> 8.2, the containment
-     operators <literal>@&gt;</> and <literal>&lt;@</> were respectively
-     called <literal>~</> and <literal>@</>.  These names are still
+     operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were respectively
+     called <literal>~</literal> and <literal>@</literal>.  These names are still
      available, but are deprecated and will eventually be removed.
     </para>
    </note>
@@ -8575,76 +8702,67 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
       </thead>
       <tbody>
        <row>
-        <entry><literal><function>area(<replaceable>object</>)</function></literal></entry>
+        <entry><literal><function>area(<replaceable>object</replaceable>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>area</entry>
         <entry><literal>area(box '((0,0),(1,1))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>center(<replaceable>object</>)</function></literal></entry>
+        <entry><literal><function>center(<replaceable>object</replaceable>)</function></literal></entry>
         <entry><type>point</type></entry>
         <entry>center</entry>
         <entry><literal>center(box '((0,0),(1,2))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>diameter(<type>circle</>)</function></literal></entry>
+        <entry><literal><function>diameter(<type>circle</type>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>diameter of circle</entry>
         <entry><literal>diameter(circle '((0,0),2.0)')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>height(<type>box</>)</function></literal></entry>
+        <entry><literal><function>height(<type>box</type>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>vertical size of box</entry>
         <entry><literal>height(box '((0,0),(1,1))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>isclosed(<type>path</>)</function></literal></entry>
+        <entry><literal><function>isclosed(<type>path</type>)</function></literal></entry>
         <entry><type>boolean</type></entry>
         <entry>a closed path?</entry>
         <entry><literal>isclosed(path '((0,0),(1,1),(2,0))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>isopen(<type>path</>)</function></literal></entry>
+        <entry><literal><function>isopen(<type>path</type>)</function></literal></entry>
         <entry><type>boolean</type></entry>
         <entry>an open path?</entry>
         <entry><literal>isopen(path '[(0,0),(1,1),(2,0)]')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>length(<replaceable>object</>)</function></literal></entry>
+        <entry><literal><function>length(<replaceable>object</replaceable>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>length</entry>
         <entry><literal>length(path '((-1,0),(1,0))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>npoints(<type>path</>)</function></literal></entry>
+        <entry><literal><function>npoints(<type>path</type>)</function></literal></entry>
         <entry><type>int</type></entry>
         <entry>number of points</entry>
         <entry><literal>npoints(path '[(0,0),(1,1),(2,0)]')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>npoints(<type>polygon</>)</function></literal></entry>
+        <entry><literal><function>npoints(<type>polygon</type>)</function></literal></entry>
         <entry><type>int</type></entry>
         <entry>number of points</entry>
         <entry><literal>npoints(polygon '((1,1),(0,0))')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>pclose(<type>path</>)</function></literal></entry>
+        <entry><literal><function>pclose(<type>path</type>)</function></literal></entry>
         <entry><type>path</type></entry>
         <entry>convert path to closed</entry>
         <entry><literal>pclose(path '[(0,0),(1,1),(2,0)]')</literal></entry>
        </row>
-<![IGNORE[
-<!-- Not defined by this name. Implements the intersection operator '#' -->
-       <row>
-        <entry><literal><function>point(<type>lseg</>, <type>lseg</>)</function></literal></entry>
-        <entry><type>point</type></entry>
-        <entry>intersection</entry>
-        <entry><literal>point(lseg '((-1,0),(1,0))',lseg '((-2,-2),(2,2))')</literal></entry>
-       </row>
-]]>
        <row>
-        <entry><literal><function>popen(<type>path</>)</function></literal></entry>
+        <entry><literal><function>popen(<type>path</type>)</function></literal></entry>
         <entry><type>path</type></entry>
         <entry>convert path to open</entry>
         <entry><literal>popen(path '((0,0),(1,1),(2,0))')</literal></entry>
@@ -8656,7 +8774,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>radius(circle '((0,0),2.0)')</literal></entry>
        </row>
        <row>
-        <entry><literal><function>width(<type>box</>)</function></literal></entry>
+        <entry><literal><function>width(<type>box</type>)</function></literal></entry>
         <entry><type>double precision</type></entry>
         <entry>horizontal size of box</entry>
         <entry><literal>width(box '((0,0),(1,1))')</literal></entry>
@@ -8839,13 +8957,13 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    </table>
 
     <para>
-     It is possible to access the two component numbers of a <type>point</>
+     It is possible to access the two component numbers of a <type>point</type>
      as though the point were an array with indexes 0 and 1.  For example, if
-     <literal>t.p</> is a <type>point</> column then
-     <literal>SELECT p[0] FROM t</> retrieves the X coordinate and
-     <literal>UPDATE t SET p[1] = ...</> changes the Y coordinate.
-     In the same way, a value of type <type>box</> or <type>lseg</> can be treated
-     as an array of two <type>point</> values.
+     <literal>t.p</literal> is a <type>point</type> column then
+     <literal>SELECT p[0] FROM t</literal> retrieves the X coordinate and
+     <literal>UPDATE t SET p[1] = ...</literal> changes the Y coordinate.
+     In the same way, a value of type <type>box</type> or <type>lseg</type> can be treated
+     as an array of two <type>point</type> values.
     </para>
 
     <para>
@@ -8871,7 +8989,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
   <title>Network Address Functions and Operators</title>
 
   <para>
-   <xref linkend="cidr-inet-operators-table"> shows the operators
+   <xref linkend="cidr-inet-operators-table"/> shows the operators
    available for the <type>cidr</type> and <type>inet</type> types.
    The operators <literal>&lt;&lt;</literal>,
    <literal>&lt;&lt;=</literal>, <literal>&gt;&gt;</literal>,
@@ -8983,7 +9101,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
     </table>
 
   <para>
-   <xref linkend="cidr-inet-functions-table"> shows the functions
+   <xref linkend="cidr-inet-functions-table"/> shows the functions
    available for use with the <type>cidr</type> and <type>inet</type>
    types.  The <function>abbrev</function>, <function>host</function>,
    and <function>text</function>
@@ -9168,23 +9286,23 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
     </table>
 
   <para>
-   Any <type>cidr</> value can be cast to <type>inet</> implicitly
+   Any <type>cidr</type> value can be cast to <type>inet</type> implicitly
    or explicitly; therefore, the functions shown above as operating on
-   <type>inet</> also work on <type>cidr</> values.  (Where there are
-   separate functions for <type>inet</> and <type>cidr</>, it is because
+   <type>inet</type> also work on <type>cidr</type> values.  (Where there are
+   separate functions for <type>inet</type> and <type>cidr</type>, it is because
    the behavior should be different for the two cases.)
-   Also, it is permitted to cast an <type>inet</> value to <type>cidr</>.
+   Also, it is permitted to cast an <type>inet</type> value to <type>cidr</type>.
    When this is done, any bits to the right of the netmask are silently zeroed
-   to create a valid <type>cidr</> value.
+   to create a valid <type>cidr</type> value.
    In addition,
-   you can cast a text value to <type>inet</> or <type>cidr</>
+   you can cast a text value to <type>inet</type> or <type>cidr</type>
    using normal casting syntax: for example,
-   <literal>inet(<replaceable>expression</>)</literal> or
-   <literal><replaceable>colname</>::cidr</literal>.
+   <literal>inet(<replaceable>expression</replaceable>)</literal> or
+   <literal><replaceable>colname</replaceable>::cidr</literal>.
   </para>
 
   <para>
-   <xref linkend="macaddr-functions-table"> shows the functions
+   <xref linkend="macaddr-functions-table"/> shows the functions
    available for use with the <type>macaddr</type> type.  The function
    <literal><function>trunc(<type>macaddr</type>)</function></literal> returns a MAC
    address with the last 3 bytes set to zero.  This can be used to
@@ -9229,7 +9347,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    </para>
 
    <para>
-   <xref linkend="macaddr8-functions-table"> shows the functions
+   <xref linkend="macaddr8-functions-table"/> shows the functions
    available for use with the <type>macaddr8</type> type.  The function
    <literal><function>trunc(<type>macaddr8</type>)</function></literal> returns a MAC
    address with the last 5 bytes set to zero.  This can be used to
@@ -9301,11 +9419,11 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
    </indexterm>
 
   <para>
-   <xref linkend="textsearch-operators-table">,
-   <xref linkend="textsearch-functions-table"> and
-   <xref linkend="textsearch-functions-debug-table">
+   <xref linkend="textsearch-operators-table"/>,
+   <xref linkend="textsearch-functions-table"/> and
+   <xref linkend="textsearch-functions-debug-table"/>
    summarize the functions and operators that are provided
-   for full text searching.  See <xref linkend="textsearch"> for a detailed
+   for full text searching.  See <xref linkend="textsearch"/> for a detailed
    explanation of <productname>PostgreSQL</productname>'s text search
    facility.
   </para>
@@ -9325,64 +9443,64 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
       <tbody>
        <row>
         <entry> <literal>@@</literal> </entry>
-        <entry><type>boolean</></entry>
-        <entry><type>tsvector</> matches <type>tsquery</> ?</entry>
+        <entry><type>boolean</type></entry>
+        <entry><type>tsvector</type> matches <type>tsquery</type> ?</entry>
         <entry><literal>to_tsvector('fat cats ate rats') @@ to_tsquery('cat &amp; rat')</literal></entry>
         <entry><literal>t</literal></entry>
        </row>
        <row>
         <entry> <literal>@@@</literal> </entry>
-        <entry><type>boolean</></entry>
-        <entry>deprecated synonym for <literal>@@</></entry>
+        <entry><type>boolean</type></entry>
+        <entry>deprecated synonym for <literal>@@</literal></entry>
         <entry><literal>to_tsvector('fat cats ate rats') @@@ to_tsquery('cat &amp; rat')</literal></entry>
         <entry><literal>t</literal></entry>
        </row>
        <row>
         <entry> <literal>||</literal> </entry>
-        <entry><type>tsvector</></entry>
-        <entry>concatenate <type>tsvector</>s</entry>
+        <entry><type>tsvector</type></entry>
+        <entry>concatenate <type>tsvector</type>s</entry>
         <entry><literal>'a:1 b:2'::tsvector || 'c:1 d:2 b:3'::tsvector</literal></entry>
         <entry><literal>'a':1 'b':2,5 'c':3 'd':4</literal></entry>
        </row>
        <row>
         <entry> <literal>&amp;&amp;</literal> </entry>
-        <entry><type>tsquery</></entry>
-        <entry>AND <type>tsquery</>s together</entry>
+        <entry><type>tsquery</type></entry>
+        <entry>AND <type>tsquery</type>s together</entry>
         <entry><literal>'fat | rat'::tsquery &amp;&amp; 'cat'::tsquery</literal></entry>
         <entry><literal>( 'fat' | 'rat' ) &amp; 'cat'</literal></entry>
        </row>
        <row>
         <entry> <literal>||</literal> </entry>
-        <entry><type>tsquery</></entry>
-        <entry>OR <type>tsquery</>s together</entry>
+        <entry><type>tsquery</type></entry>
+        <entry>OR <type>tsquery</type>s together</entry>
         <entry><literal>'fat | rat'::tsquery || 'cat'::tsquery</literal></entry>
         <entry><literal>( 'fat' | 'rat' ) | 'cat'</literal></entry>
        </row>
        <row>
         <entry> <literal>!!</literal> </entry>
-        <entry><type>tsquery</></entry>
-        <entry>negate a <type>tsquery</></entry>
+        <entry><type>tsquery</type></entry>
+        <entry>negate a <type>tsquery</type></entry>
         <entry><literal>!! 'cat'::tsquery</literal></entry>
         <entry><literal>!'cat'</literal></entry>
        </row>
        <row>
         <entry> <literal>&lt;-&gt;</literal> </entry>
-        <entry><type>tsquery</></entry>
-        <entry><type>tsquery</> followed by <type>tsquery</></entry>
+        <entry><type>tsquery</type></entry>
+        <entry><type>tsquery</type> followed by <type>tsquery</type></entry>
         <entry><literal>to_tsquery('fat') &lt;-&gt; to_tsquery('rat')</literal></entry>
         <entry><literal>'fat' &lt;-&gt; 'rat'</literal></entry>
        </row>
        <row>
         <entry> <literal>@&gt;</literal> </entry>
-        <entry><type>boolean</></entry>
-        <entry><type>tsquery</> contains another ?</entry>
+        <entry><type>boolean</type></entry>
+        <entry><type>tsquery</type> contains another ?</entry>
         <entry><literal>'cat'::tsquery @&gt; 'cat &amp; rat'::tsquery</literal></entry>
         <entry><literal>f</literal></entry>
        </row>
        <row>
         <entry> <literal>&lt;@</literal> </entry>
-        <entry><type>boolean</></entry>
-        <entry><type>tsquery</> is contained in ?</entry>
+        <entry><type>boolean</type></entry>
+        <entry><type>tsquery</type> is contained in ?</entry>
         <entry><literal>'cat'::tsquery &lt;@ 'cat &amp; rat'::tsquery</literal></entry>
         <entry><literal>t</literal></entry>
        </row>
@@ -9392,15 +9510,15 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
 
     <note>
      <para>
-      The <type>tsquery</> containment operators consider only the lexemes
+      The <type>tsquery</type> containment operators consider only the lexemes
       listed in the two queries, ignoring the combining operators.
      </para>
     </note>
 
     <para>
      In addition to the operators shown in the table, the ordinary B-tree
-     comparison operators (<literal>=</>, <literal>&lt;</>, etc) are defined
-     for types <type>tsvector</> and <type>tsquery</>.  These are not very
+     comparison operators (<literal>=</literal>, <literal>&lt;</literal>, etc) are defined
+     for types <type>tsvector</type> and <type>tsquery</type>.  These are not very
      useful for text searching but allow, for example, unique indexes to be
      built on columns of these types.
     </para>
@@ -9423,7 +9541,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>array_to_tsvector</primary>
          </indexterm>
-         <literal><function>array_to_tsvector(<type>text[]</>)</function></literal>
+         <literal><function>array_to_tsvector(<type>text[]</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
         <entry>convert array of lexemes to <type>tsvector</type></entry>
@@ -9447,10 +9565,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>length</primary>
          </indexterm>
-         <literal><function>length(<type>tsvector</>)</function></literal>
+         <literal><function>length(<type>tsvector</type>)</function></literal>
         </entry>
         <entry><type>integer</type></entry>
-        <entry>number of lexemes in <type>tsvector</></entry>
+        <entry>number of lexemes in <type>tsvector</type></entry>
         <entry><literal>length('fat:2,4 cat:3 rat:5A'::tsvector)</literal></entry>
         <entry><literal>3</literal></entry>
        </row>
@@ -9459,10 +9577,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>numnode</primary>
          </indexterm>
-         <literal><function>numnode(<type>tsquery</>)</function></literal>
+         <literal><function>numnode(<type>tsquery</type>)</function></literal>
         </entry>
         <entry><type>integer</type></entry>
-        <entry>number of lexemes plus operators in <type>tsquery</></entry>
+        <entry>number of lexemes plus operators in <type>tsquery</type></entry>
         <entry><literal> numnode('(fat &amp; rat) | cat'::tsquery)</literal></entry>
         <entry><literal>5</literal></entry>
        </row>
@@ -9471,10 +9589,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>plainto_tsquery</primary>
          </indexterm>
-         <literal><function>plainto_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal>
+         <literal><function>plainto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type> , </optional> <replaceable class="parameter">query</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>produce <type>tsquery</> ignoring punctuation</entry>
+        <entry>produce <type>tsquery</type> ignoring punctuation</entry>
         <entry><literal>plainto_tsquery('english', 'The Fat Rats')</literal></entry>
         <entry><literal>'fat' &amp; 'rat'</literal></entry>
        </row>
@@ -9483,10 +9601,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>phraseto_tsquery</primary>
          </indexterm>
-         <literal><function>phraseto_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal>
+         <literal><function>phraseto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type> , </optional> <replaceable class="parameter">query</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>produce <type>tsquery</> that searches for a phrase,
+        <entry>produce <type>tsquery</type> that searches for a phrase,
          ignoring punctuation</entry>
         <entry><literal>phraseto_tsquery('english', 'The Fat Rats')</literal></entry>
         <entry><literal>'fat' &lt;-&gt; 'rat'</literal></entry>
@@ -9496,10 +9614,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>querytree</primary>
          </indexterm>
-         <literal><function>querytree(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>)</function></literal>
+         <literal><function>querytree(<replaceable class="parameter">query</replaceable> <type>tsquery</type>)</function></literal>
         </entry>
         <entry><type>text</type></entry>
-        <entry>get indexable part of a <type>tsquery</></entry>
+        <entry>get indexable part of a <type>tsquery</type></entry>
         <entry><literal>querytree('foo &amp; ! bar'::tsquery)</literal></entry>
         <entry><literal>'foo'</literal></entry>
        </row>
@@ -9508,10 +9626,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>setweight</primary>
          </indexterm>
-         <literal><function>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>)</function></literal>
+         <literal><function>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">weight</replaceable> <type>"char"</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>assign <replaceable class="PARAMETER">weight</replaceable> to each element of <replaceable class="PARAMETER">vector</replaceable></entry>
+        <entry>assign <replaceable class="parameter">weight</replaceable> to each element of <replaceable class="parameter">vector</replaceable></entry>
         <entry><literal>setweight('fat:2,4 cat:3 rat:5B'::tsvector, 'A')</literal></entry>
         <entry><literal>'cat':3A 'fat':2A,4A 'rat':5A</literal></entry>
        </row>
@@ -9521,10 +9639,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
           <primary>setweight</primary>
           <secondary>setweight for specific lexeme(s)</secondary>
          </indexterm>
-         <literal><function>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>, <replaceable class="PARAMETER">lexemes</replaceable> <type>text[]</>)</function></literal>
+         <literal><function>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">weight</replaceable> <type>"char"</type>, <replaceable class="parameter">lexemes</replaceable> <type>text[]</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>assign <replaceable class="PARAMETER">weight</replaceable> to elements of <replaceable class="PARAMETER">vector</replaceable> that are listed in <replaceable class="PARAMETER">lexemes</replaceable></entry>
+        <entry>assign <replaceable class="parameter">weight</replaceable> to elements of <replaceable class="parameter">vector</replaceable> that are listed in <replaceable class="parameter">lexemes</replaceable></entry>
         <entry><literal>setweight('fat:2,4 cat:3 rat:5B'::tsvector, 'A', '{cat,rat}')</literal></entry>
         <entry><literal>'cat':3A 'fat':2,4 'rat':5A</literal></entry>
        </row>
@@ -9533,10 +9651,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>strip</primary>
          </indexterm>
-         <literal><function>strip(<type>tsvector</>)</function></literal>
+         <literal><function>strip(<type>tsvector</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>remove positions and weights from <type>tsvector</></entry>
+        <entry>remove positions and weights from <type>tsvector</type></entry>
         <entry><literal>strip('fat:2,4 cat:3 rat:5A'::tsvector)</literal></entry>
         <entry><literal>'cat' 'fat' 'rat'</literal></entry>
        </row>
@@ -9545,10 +9663,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>to_tsquery</primary>
          </indexterm>
-         <literal><function>to_tsquery(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">query</> <type>text</type>)</function></literal>
+         <literal><function>to_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type> , </optional> <replaceable class="parameter">query</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>normalize words and convert to <type>tsquery</></entry>
+        <entry>normalize words and convert to <type>tsquery</type></entry>
         <entry><literal>to_tsquery('english', 'The &amp; Fat &amp; Rats')</literal></entry>
         <entry><literal>'fat' &amp; 'rat'</literal></entry>
        </row>
@@ -9557,21 +9675,21 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>to_tsvector</primary>
          </indexterm>
-         <literal><function>to_tsvector(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">document</> <type>text</type>)</function></literal>
+         <literal><function>to_tsvector(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type> , </optional> <replaceable class="parameter">document</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>reduce document text to <type>tsvector</></entry>
+        <entry>reduce document text to <type>tsvector</type></entry>
         <entry><literal>to_tsvector('english', 'The Fat Rats')</literal></entry>
         <entry><literal>'fat':2 'rat':3</literal></entry>
        </row>
        <row>
         <entry>
-         <literal><function>to_tsvector(<optional> <replaceable class="PARAMETER">config</> <type>regconfig</> , </optional> <replaceable class="PARAMETER">document</> <type>json(b)</type>)</function></literal>
+         <literal><function>to_tsvector(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type> , </optional> <replaceable class="parameter">document</replaceable> <type>json(b)</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
         <entry>
-          reduce each string value in the document to a <type>tsvector</>, and then
-          concatenate those in document order to produce a single <type>tsvector</>
+          reduce each string value in the document to a <type>tsvector</type>, and then
+          concatenate those in document order to produce a single <type>tsvector</type>
         </entry>
         <entry><literal>to_tsvector('english', '{"a": "The Fat Rats"}'::json)</literal></entry>
         <entry><literal>'fat':2 'rat':3</literal></entry>
@@ -9581,20 +9699,20 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_delete</primary>
          </indexterm>
-         <literal><function>ts_delete(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">lexeme</replaceable> <type>text</>)</function></literal>
+         <literal><function>ts_delete(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">lexeme</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>remove given <replaceable class="PARAMETER">lexeme</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry>
+        <entry>remove given <replaceable class="parameter">lexeme</replaceable> from <replaceable class="parameter">vector</replaceable></entry>
         <entry><literal>ts_delete('fat:2,4 cat:3 rat:5A'::tsvector, 'fat')</literal></entry>
         <entry><literal>'cat':3 'rat':5A</literal></entry>
        </row>
        <row>
         <entry>
          <!-- previous indexterm entry covers this too -->
-         <literal><function>ts_delete(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">lexemes</replaceable> <type>text[]</>)</function></literal>
+         <literal><function>ts_delete(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">lexemes</replaceable> <type>text[]</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>remove any occurrence of lexemes in <replaceable class="PARAMETER">lexemes</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry>
+        <entry>remove any occurrence of lexemes in <replaceable class="parameter">lexemes</replaceable> from <replaceable class="parameter">vector</replaceable></entry>
         <entry><literal>ts_delete('fat:2,4 cat:3 rat:5A'::tsvector, ARRAY['fat','rat'])</literal></entry>
         <entry><literal>'cat':3</literal></entry>
        </row>
@@ -9603,10 +9721,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_filter</primary>
          </indexterm>
-         <literal><function>ts_filter(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weights</replaceable> <type>"char"[]</>)</function></literal>
+         <literal><function>ts_filter(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">weights</replaceable> <type>"char"[]</type>)</function></literal>
         </entry>
         <entry><type>tsvector</type></entry>
-        <entry>select only elements with given <replaceable class="PARAMETER">weights</replaceable> from <replaceable class="PARAMETER">vector</replaceable></entry>
+        <entry>select only elements with given <replaceable class="parameter">weights</replaceable> from <replaceable class="parameter">vector</replaceable></entry>
         <entry><literal>ts_filter('fat:2,4 cat:3b rat:5A'::tsvector, '{a,b}')</literal></entry>
         <entry><literal>'cat':3B 'rat':5A</literal></entry>
        </row>
@@ -9615,7 +9733,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_headline</primary>
          </indexterm>
-         <literal><function>ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>)</function></literal>
+         <literal><function>ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>text</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">options</replaceable> <type>text</type> </optional>)</function></literal>
         </entry>
         <entry><type>text</type></entry>
         <entry>display a query match</entry>
@@ -9624,7 +9742,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
        </row>
        <row>
         <entry>
-         <literal><function>ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>json(b)</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>)</function></literal>
+         <literal><function>ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>json(b)</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">options</replaceable> <type>text</type> </optional>)</function></literal>
         </entry>
         <entry><type>text</type></entry>
         <entry>display a query match</entry>
@@ -9636,7 +9754,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_rank</primary>
          </indexterm>
-         <literal><function>ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>)</function></literal>
+         <literal><function>ts_rank(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</type>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</type> </optional>)</function></literal>
         </entry>
         <entry><type>float4</type></entry>
         <entry>rank document for query</entry>
@@ -9648,7 +9766,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_rank_cd</primary>
          </indexterm>
-         <literal><function>ts_rank_cd(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>)</function></literal>
+         <literal><function>ts_rank_cd(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</type>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</type> </optional>)</function></literal>
         </entry>
         <entry><type>float4</type></entry>
         <entry>rank document for query using cover density</entry>
@@ -9660,18 +9778,18 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_rewrite</primary>
          </indexterm>
-         <literal><function>ts_rewrite(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">target</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">substitute</replaceable> <type>tsquery</>)</function></literal>
+         <literal><function>ts_rewrite(<replaceable class="parameter">query</replaceable> <type>tsquery</type>, <replaceable class="parameter">target</replaceable> <type>tsquery</type>, <replaceable class="parameter">substitute</replaceable> <type>tsquery</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>replace <replaceable>target</> with <replaceable>substitute</>
+        <entry>replace <replaceable>target</replaceable> with <replaceable>substitute</replaceable>
          within query</entry>
         <entry><literal>ts_rewrite('a &amp; b'::tsquery, 'a'::tsquery, 'foo|bar'::tsquery)</literal></entry>
         <entry><literal>'b' &amp; ( 'foo' | 'bar' )</literal></entry>
        </row>
        <row>
-        <entry><literal><function>ts_rewrite(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">select</replaceable> <type>text</>)</function></literal></entry>
+        <entry><literal><function>ts_rewrite(<replaceable class="parameter">query</replaceable> <type>tsquery</type>, <replaceable class="parameter">select</replaceable> <type>text</type>)</function></literal></entry>
         <entry><type>tsquery</type></entry>
-        <entry>replace using targets and substitutes from a <command>SELECT</> command</entry>
+        <entry>replace using targets and substitutes from a <command>SELECT</command> command</entry>
         <entry><literal>SELECT ts_rewrite('a &amp; b'::tsquery, 'SELECT t,s FROM aliases')</literal></entry>
         <entry><literal>'b' &amp; ( 'foo' | 'bar' )</literal></entry>
        </row>
@@ -9680,22 +9798,22 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>tsquery_phrase</primary>
          </indexterm>
-         <literal><function>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</>)</function></literal>
+         <literal><function>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</type>, <replaceable class="parameter">query2</replaceable> <type>tsquery</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>make query that searches for <replaceable>query1</> followed
-         by <replaceable>query2</> (same as <literal>&lt;-&gt;</>
+        <entry>make query that searches for <replaceable>query1</replaceable> followed
+         by <replaceable>query2</replaceable> (same as <literal>&lt;-&gt;</literal>
          operator)</entry>
         <entry><literal>tsquery_phrase(to_tsquery('fat'), to_tsquery('cat'))</literal></entry>
         <entry><literal>'fat' &lt;-&gt; 'cat'</literal></entry>
        </row>
        <row>
         <entry>
-         <literal><function>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">distance</replaceable> <type>integer</>)</function></literal>
+         <literal><function>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</type>, <replaceable class="parameter">query2</replaceable> <type>tsquery</type>, <replaceable class="parameter">distance</replaceable> <type>integer</type>)</function></literal>
         </entry>
         <entry><type>tsquery</type></entry>
-        <entry>make query that searches for <replaceable>query1</> followed by
-         <replaceable>query2</> at distance <replaceable>distance</></entry>
+        <entry>make query that searches for <replaceable>query1</replaceable> followed by
+         <replaceable>query2</replaceable> at distance <replaceable>distance</replaceable></entry>
         <entry><literal>tsquery_phrase(to_tsquery('fat'), to_tsquery('cat'), 10)</literal></entry>
         <entry><literal>'fat' &lt;10&gt; 'cat'</literal></entry>
        </row>
@@ -9704,10 +9822,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>tsvector_to_array</primary>
          </indexterm>
-         <literal><function>tsvector_to_array(<type>tsvector</>)</function></literal>
+         <literal><function>tsvector_to_array(<type>tsvector</type>)</function></literal>
         </entry>
         <entry><type>text[]</type></entry>
-        <entry>convert <type>tsvector</> to array of lexemes</entry>
+        <entry>convert <type>tsvector</type> to array of lexemes</entry>
         <entry><literal>tsvector_to_array('fat:2,4 cat:3 rat:5A'::tsvector)</literal></entry>
         <entry><literal>{cat,fat,rat}</literal></entry>
        </row>
@@ -9719,7 +9837,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <literal><function>tsvector_update_trigger()</function></literal>
         </entry>
         <entry><type>trigger</type></entry>
-        <entry>trigger function for automatic <type>tsvector</> column update</entry>
+        <entry>trigger function for automatic <type>tsvector</type> column update</entry>
         <entry><literal>CREATE TRIGGER ... tsvector_update_trigger(tsvcol, 'pg_catalog.swedish', title, body)</literal></entry>
         <entry><literal></literal></entry>
        </row>
@@ -9731,7 +9849,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <literal><function>tsvector_update_trigger_column()</function></literal>
         </entry>
         <entry><type>trigger</type></entry>
-        <entry>trigger function for automatic <type>tsvector</> column update</entry>
+        <entry>trigger function for automatic <type>tsvector</type> column update</entry>
         <entry><literal>CREATE TRIGGER ... tsvector_update_trigger_column(tsvcol, configcol, title, body)</literal></entry>
         <entry><literal></literal></entry>
        </row>
@@ -9741,7 +9859,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
           <primary>unnest</primary>
           <secondary>for tsvector</secondary>
          </indexterm>
-         <literal><function>unnest(<type>tsvector</>, OUT <replaceable class="PARAMETER">lexeme</> <type>text</>, OUT <replaceable class="PARAMETER">positions</> <type>smallint[]</>, OUT <replaceable class="PARAMETER">weights</> <type>text</>)</function></literal>
+         <literal><function>unnest(<type>tsvector</type>, OUT <replaceable class="parameter">lexeme</replaceable> <type>text</type>, OUT <replaceable class="parameter">positions</replaceable> <type>smallint[]</type>, OUT <replaceable class="parameter">weights</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>setof record</type></entry>
         <entry>expand a <type>tsvector</type> to a set of rows</entry>
@@ -9754,16 +9872,16 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
 
   <note>
    <para>
-    All the text search functions that accept an optional <type>regconfig</>
+    All the text search functions that accept an optional <type>regconfig</type>
     argument will use the configuration specified by
-    <xref linkend="guc-default-text-search-config">
+    <xref linkend="guc-default-text-search-config"/>
     when that argument is omitted.
    </para>
   </note>
 
   <para>
    The functions in
-   <xref linkend="textsearch-functions-debug-table">
+   <xref linkend="textsearch-functions-debug-table"/>
    are listed separately because they are not usually used in everyday text
    searching operations.  They are helpful for development and debugging
    of new text search configurations.
@@ -9787,7 +9905,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_debug</primary>
          </indexterm>
-         <literal><function>ts_debug(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>, OUT <replaceable class="PARAMETER">token</> <type>text</>, OUT <replaceable class="PARAMETER">dictionaries</> <type>regdictionary[]</>, OUT <replaceable class="PARAMETER">dictionary</> <type>regdictionary</>, OUT <replaceable class="PARAMETER">lexemes</> <type>text[]</>)</function></literal>
+         <literal><function>ts_debug(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>text</type>, OUT <replaceable class="parameter">alias</replaceable> <type>text</type>, OUT <replaceable class="parameter">description</replaceable> <type>text</type>, OUT <replaceable class="parameter">token</replaceable> <type>text</type>, OUT <replaceable class="parameter">dictionaries</replaceable> <type>regdictionary[]</type>, OUT <replaceable class="parameter">dictionary</replaceable> <type>regdictionary</type>, OUT <replaceable class="parameter">lexemes</replaceable> <type>text[]</type>)</function></literal>
         </entry>
         <entry><type>setof record</type></entry>
         <entry>test a configuration</entry>
@@ -9799,7 +9917,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_lexize</primary>
          </indexterm>
-         <literal><function>ts_lexize(<replaceable class="PARAMETER">dict</replaceable> <type>regdictionary</>, <replaceable class="PARAMETER">token</replaceable> <type>text</>)</function></literal>
+         <literal><function>ts_lexize(<replaceable class="parameter">dict</replaceable> <type>regdictionary</type>, <replaceable class="parameter">token</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>text[]</type></entry>
         <entry>test a dictionary</entry>
@@ -9811,7 +9929,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_parse</primary>
          </indexterm>
-         <literal><function>ts_parse(<replaceable class="PARAMETER">parser_name</replaceable> <type>text</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>)</function></literal>
+         <literal><function>ts_parse(<replaceable class="parameter">parser_name</replaceable> <type>text</type>, <replaceable class="parameter">document</replaceable> <type>text</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">token</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>setof record</type></entry>
         <entry>test a parser</entry>
@@ -9819,7 +9937,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>(1,foo) ...</literal></entry>
        </row>
        <row>
-        <entry><literal><function>ts_parse(<replaceable class="PARAMETER">parser_oid</replaceable> <type>oid</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>)</function></literal></entry>
+        <entry><literal><function>ts_parse(<replaceable class="parameter">parser_oid</replaceable> <type>oid</type>, <replaceable class="parameter">document</replaceable> <type>text</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">token</replaceable> <type>text</type>)</function></literal></entry>
         <entry><type>setof record</type></entry>
         <entry>test a parser</entry>
         <entry><literal>ts_parse(3722, 'foo - bar')</literal></entry>
@@ -9830,7 +9948,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_token_type</primary>
          </indexterm>
-         <literal><function>ts_token_type(<replaceable class="PARAMETER">parser_name</> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>)</function></literal>
+         <literal><function>ts_token_type(<replaceable class="parameter">parser_name</replaceable> <type>text</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">alias</replaceable> <type>text</type>, OUT <replaceable class="parameter">description</replaceable> <type>text</type>)</function></literal>
         </entry>
         <entry><type>setof record</type></entry>
         <entry>get token types defined by parser</entry>
@@ -9838,7 +9956,7 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
         <entry><literal>(1,asciiword,"Word, all ASCII") ...</literal></entry>
        </row>
        <row>
-        <entry><literal><function>ts_token_type(<replaceable class="PARAMETER">parser_oid</> <type>oid</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>)</function></literal></entry>
+        <entry><literal><function>ts_token_type(<replaceable class="parameter">parser_oid</replaceable> <type>oid</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">alias</replaceable> <type>text</type>, OUT <replaceable class="parameter">description</replaceable> <type>text</type>)</function></literal></entry>
         <entry><type>setof record</type></entry>
         <entry>get token types defined by parser</entry>
         <entry><literal>ts_token_type(3722)</literal></entry>
@@ -9849,10 +9967,10 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
          <indexterm>
           <primary>ts_stat</primary>
          </indexterm>
-         <literal><function>ts_stat(<replaceable class="PARAMETER">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="PARAMETER">weights</replaceable> <type>text</>, </optional> OUT <replaceable class="PARAMETER">word</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">ndoc</replaceable> <type>integer</>, OUT <replaceable class="PARAMETER">nentry</replaceable> <type>integer</>)</function></literal>
+         <literal><function>ts_stat(<replaceable class="parameter">sqlquery</replaceable> <type>text</type>, <optional> <replaceable class="parameter">weights</replaceable> <type>text</type>, </optional> OUT <replaceable class="parameter">word</replaceable> <type>text</type>, OUT <replaceable class="parameter">ndoc</replaceable> <type>integer</type>, OUT <replaceable class="parameter">nentry</replaceable> <type>integer</type>)</function></literal>
         </entry>
         <entry><type>setof record</type></entry>
-        <entry>get statistics of a <type>tsvector</> column</entry>
+        <entry>get statistics of a <type>tsvector</type> column</entry>
         <entry><literal>ts_stat('SELECT vector from apod')</literal></entry>
         <entry><literal>(foo,10,15) ...</literal></entry>
        </row>
@@ -9869,12 +9987,12 @@ CREATE TYPE rainbow AS ENUM ('red', 'orange', 'yellow', 'green', 'blue', 'purple
   <para>
    The functions and function-like expressions described in this
    section operate on values of type <type>xml</type>.  Check <xref
-   linkend="datatype-xml"> for information about the <type>xml</type>
+   linkend="datatype-xml"/> for information about the <type>xml</type>
    type.  The function-like expressions <function>xmlparse</function>
    and <function>xmlserialize</function> for converting to and from
    type <type>xml</type> are not repeated here.  Use of most of these
    functions requires the installation to have been built
-   with <command>configure --with-libxml</>.
+   with <command>configure --with-libxml</command>.
   </para>
 
   <sect2 id="functions-producing-xml">
@@ -10066,7 +10184,7 @@ SELECT xmlelement(name foo, xmlattributes('xyz' as bar),
      and &amp; will be converted to entities.  Binary data (data type
      <type>bytea</type>) will be represented in base64 or hex
      encoding, depending on the setting of the configuration parameter
-     <xref linkend="guc-xmlbinary">.  The particular behavior for
+     <xref linkend="guc-xmlbinary"/>.  The particular behavior for
      individual data types is expected to evolve in order to align the
      SQL and PostgreSQL data types with the XML Schema specification,
      at which point a more precise description will appear.
@@ -10208,7 +10326,7 @@ SELECT xmlroot(xmlparse(document '<?xml version="1.1"?><content>abc</content>'),
      input values to the aggregate function call,
      much like <function>xmlconcat</function> does, except that concatenation
      occurs across rows rather than across expressions in a single row.
-     See <xref linkend="functions-aggregate"> for additional information
+     See <xref linkend="functions-aggregate"/> for additional information
      about aggregate functions.
     </para>
 
@@ -10226,9 +10344,9 @@ SELECT xmlagg(x) FROM test;
     </para>
 
     <para>
-     To determine the order of the concatenation, an <literal>ORDER BY</>
+     To determine the order of the concatenation, an <literal>ORDER BY</literal>
      clause may be added to the aggregate call as described in
-     <xref linkend="syntax-aggregates">. For example:
+     <xref linkend="syntax-aggregates"/>. For example:
 
 <screen><![CDATA[
 SELECT xmlagg(x ORDER BY y DESC) FROM test;
@@ -10276,7 +10394,7 @@ SELECT xmlagg(x) FROM (SELECT * FROM test ORDER BY y DESC) AS tab;
      The expression <literal>IS DOCUMENT</literal> returns true if the
      argument XML value is a proper XML document, false if it is not
      (that is, it is a content fragment), or null if the argument is
-     null.  See <xref linkend="datatype-xml"> about the difference
+     null.  See <xref linkend="datatype-xml"/> about the difference
      between documents and content fragments.
     </para>
    </sect3>
@@ -10345,18 +10463,18 @@ SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Tor
 </synopsis>
 
     <para>
-     These functions check whether a <type>text</> string is well-formed XML,
+     These functions check whether a <type>text</type> string is well-formed XML,
      returning a Boolean result.
      <function>xml_is_well_formed_document</function> checks for a well-formed
      document, while <function>xml_is_well_formed_content</function> checks
      for well-formed content.  <function>xml_is_well_formed</function> does
-     the former if the <xref linkend="guc-xmloption"> configuration
-     parameter is set to <literal>DOCUMENT</>, or the latter if it is set to
-     <literal>CONTENT</>.  This means that
+     the former if the <xref linkend="guc-xmloption"/> configuration
+     parameter is set to <literal>DOCUMENT</literal>, or the latter if it is set to
+     <literal>CONTENT</literal>.  This means that
      <function>xml_is_well_formed</function> is useful for seeing whether
-     a simple cast to type <type>xml</> will succeed, whereas the other two
+     a simple cast to type <type>xml</type> will succeed, whereas the other two
      functions are useful for seeing whether the corresponding variants of
-     <function>XMLPARSE</> will succeed.
+     <function>XMLPARSE</function> will succeed.
     </para>
 
     <para>
@@ -10426,7 +10544,7 @@ SELECT xml_is_well_formed_document('<pg:foo xmlns:pg="http://postgresql.org/stuf
 
     <para>
      The function <function>xpath</function> evaluates the XPath
-     expression <replaceable>xpath</replaceable> (a <type>text</> value)
+     expression <replaceable>xpath</replaceable> (a <type>text</type> value)
      against the XML value
      <replaceable>xml</replaceable>.  It returns an array of XML values
      corresponding to the node set produced by the XPath expression.
@@ -10441,14 +10559,14 @@ SELECT xml_is_well_formed_document('<pg:foo xmlns:pg="http://postgresql.org/stuf
 
     <para>
      The optional third argument of the function is an array of namespace
-     mappings.  This array should be a two-dimensional <type>text</> array with
+     mappings.  This array should be a two-dimensional <type>text</type> array with
      the length of the second axis being equal to 2 (i.e., it should be an
      array of arrays, each of which consists of exactly 2 elements).
      The first element of each array entry is the namespace name (alias), the
      second the namespace URI. It is not required that aliases provided in
      this array be the same as those being used in the XML document itself (in
      other words, both in the XML document and in the <function>xpath</function>
-     function context, aliases are <emphasis>local</>).
+     function context, aliases are <emphasis>local</emphasis>).
     </para>
 
     <para>
@@ -10494,7 +10612,7 @@ SELECT xpath('//mydefns:b/text()', '<a xmlns="http://example.com"><b>test</b></a
      of the <function>xpath</function> function.  Instead of returning the
      individual XML values that satisfy the XPath, this function returns a
      Boolean indicating whether the query was satisfied or not.  This
-     function is equivalent to the standard <literal>XMLEXISTS</> predicate,
+     function is equivalent to the standard <literal>XMLEXISTS</literal> predicate,
      except that it also offers support for a namespace mapping argument.
     </para>
 
@@ -10540,21 +10658,21 @@ SELECT xpath_exists('/my:a/text()', '<my:a xmlns:my="http://example.com">test</m
     </para>
 
     <para>
-     The optional <literal>XMLNAMESPACES</> clause is a comma-separated
+     The optional <literal>XMLNAMESPACES</literal> clause is a comma-separated
      list of namespaces.  It specifies the XML namespaces used in
      the document and their aliases. A default namespace specification
      is not currently supported.
     </para>
 
     <para>
-     The required <replaceable>row_expression</> argument is an XPath
+     The required <replaceable>row_expression</replaceable> argument is an XPath
      expression that is evaluated against the supplied XML document to
      obtain an ordered sequence of XML nodes. This sequence is what
-     <function>xmltable</> transforms into output rows.
+     <function>xmltable</function> transforms into output rows.
     </para>
 
     <para>
-     <replaceable>document_expression</> provides the XML document to
+     <replaceable>document_expression</replaceable> provides the XML document to
      operate on.
      The <literal>BY REF</literal> clauses have no effect in PostgreSQL,
      but are allowed for SQL conformance and compatibility with other
@@ -10566,9 +10684,9 @@ SELECT xpath_exists('/my:a/text()', '<my:a xmlns:my="http://example.com">test</m
     <para>
      The mandatory <literal>COLUMNS</literal> clause specifies the list
      of columns in the output table.
-     If the <literal>COLUMNS</> clause is omitted, the rows in the result
-     set contain a single column of type <literal>xml</> containing the
-     data matched by <replaceable>row_expression</>.
+     If the <literal>COLUMNS</literal> clause is omitted, the rows in the result
+     set contain a single column of type <literal>xml</literal> containing the
+     data matched by <replaceable>row_expression</replaceable>.
      If <literal>COLUMNS</literal> is specified, each entry describes a
      single column.
      See the syntax summary above for the format.
@@ -10584,10 +10702,10 @@ SELECT xpath_exists('/my:a/text()', '<my:a xmlns:my="http://example.com">test</m
     </para>
 
     <para>
-     The <literal>column_expression</> for a column is an XPath expression
+     The <literal>column_expression</literal> for a column is an XPath expression
      that is evaluated for each row, relative to the result of the
-     <replaceable>row_expression</>, to find the value of the column.
-     If no <literal>column_expression</> is given, then the column name
+     <replaceable>row_expression</replaceable>, to find the value of the column.
+     If no <literal>column_expression</literal> is given, then the column name
      is used as an implicit path.
     </para>
 
@@ -10595,55 +10713,55 @@ SELECT xpath_exists('/my:a/text()', '<my:a xmlns:my="http://example.com">test</m
      If a column's XPath expression returns multiple elements, an error
      is raised.
      If the expression matches an empty tag, the result is an
-     empty string (not <literal>NULL</>).
-     Any <literal>xsi:nil</> attributes are ignored.
+     empty string (not <literal>NULL</literal>).
+     Any <literal>xsi:nil</literal> attributes are ignored.
     </para>
 
     <para>
-     The text body of the XML matched by the <replaceable>column_expression</>
+     The text body of the XML matched by the <replaceable>column_expression</replaceable>
      is used as the column value. Multiple <literal>text()</literal> nodes
      within an element are concatenated in order. Any child elements,
      processing instructions, and comments are ignored, but the text contents
      of child elements are concatenated to the result.
-     Note that the whitespace-only <literal>text()</> node between two non-text
-     elements is preserved, and that leading whitespace on a <literal>text()</>
+     Note that the whitespace-only <literal>text()</literal> node between two non-text
+     elements is preserved, and that leading whitespace on a <literal>text()</literal>
      node is not flattened.
     </para>
 
     <para>
      If the path expression does not match for a given row but
-     <replaceable>default_expression</> is specified, the value resulting
+     <replaceable>default_expression</replaceable> is specified, the value resulting
      from evaluating that expression is used.
-     If no <literal>DEFAULT</> clause is given for the column,
-     the field will be set to <literal>NULL</>.
-     It is possible for a <replaceable>default_expression</> to reference
+     If no <literal>DEFAULT</literal> clause is given for the column,
+     the field will be set to <literal>NULL</literal>.
+     It is possible for a <replaceable>default_expression</replaceable> to reference
      the value of output columns that appear prior to it in the column list,
      so the default of one column may be based on the value of another
      column.
     </para>
 
     <para>
-     Columns may be marked <literal>NOT NULL</>. If the
-     <replaceable>column_expression</> for a <literal>NOT NULL</> column
-     does not match anything and there is no <literal>DEFAULT</> or the
-     <replaceable>default_expression</> also evaluates to null, an error
+     Columns may be marked <literal>NOT NULL</literal>. If the
+     <replaceable>column_expression</replaceable> for a <literal>NOT NULL</literal> column
+     does not match anything and there is no <literal>DEFAULT</literal> or the
+     <replaceable>default_expression</replaceable> also evaluates to null, an error
      is reported.
     </para>
 
     <para>
-     Unlike regular PostgreSQL functions, <replaceable>column_expression</>
-     and <replaceable>default_expression</> are not evaluated to a simple
+     Unlike regular PostgreSQL functions, <replaceable>column_expression</replaceable>
+     and <replaceable>default_expression</replaceable> are not evaluated to a simple
      value before calling the function.
-     <replaceable>column_expression</> is normally evaluated
-     exactly once per input row, and <replaceable>default_expression</>
+     <replaceable>column_expression</replaceable> is normally evaluated
+     exactly once per input row, and <replaceable>default_expression</replaceable>
      is evaluated each time a default is needed for a field.
      If the expression qualifies as stable or immutable the repeat
      evaluation may be skipped.
-     Effectively <function>xmltable</> behaves more like a subquery than a
+     Effectively <function>xmltable</function> behaves more like a subquery than a
      function call.
      This means that you can usefully use volatile functions like
-     <function>nextval</> in <replaceable>default_expression</>, and
-     <replaceable>column_expression</> may depend on other parts of the
+     <function>nextval</function> in <replaceable>default_expression</replaceable>, and
+     <replaceable>column_expression</replaceable> may depend on other parts of the
      XML document.
     </para>
 
@@ -10934,7 +11052,7 @@ table2-mapping
 
    <para>
     As an example of using the output produced by these functions,
-    <xref linkend="xslt-xml-html"> shows an XSLT stylesheet that
+    <xref linkend="xslt-xml-html"/> shows an XSLT stylesheet that
     converts the output of
     <function>table_to_xml_and_xmlschema</function> to an HTML
     document containing a tabular rendition of the table data.  In a
@@ -11003,13 +11121,13 @@ table2-mapping
   </indexterm>
 
    <para>
-   <xref linkend="functions-json-op-table"> shows the operators that
+   <xref linkend="functions-json-op-table"/> shows the operators that
    are available for use with the two JSON data types (see <xref
-   linkend="datatype-json">).
+   linkend="datatype-json"/>).
   </para>
 
   <table id="functions-json-op-table">
-     <title><type>json</> and <type>jsonb</> Operators</title>
+     <title><type>json</type> and <type>jsonb</type> Operators</title>
      <tgroup cols="5">
       <thead>
        <row>
@@ -11039,14 +11157,14 @@ table2-mapping
         <row>
         <entry><literal>-&gt;&gt;</literal></entry>
         <entry><type>int</type></entry>
-        <entry>Get JSON array element as <type>text</></entry>
+        <entry>Get JSON array element as <type>text</type></entry>
         <entry><literal>'[1,2,3]'::json-&gt;&gt;2</literal></entry>
         <entry><literal>3</literal></entry>
        </row>
        <row>
         <entry><literal>-&gt;&gt;</literal></entry>
         <entry><type>text</type></entry>
-        <entry>Get JSON object field as <type>text</></entry>
+        <entry>Get JSON object field as <type>text</type></entry>
         <entry><literal>'{"a":1,"b":2}'::json-&gt;&gt;'b'</literal></entry>
         <entry><literal>2</literal></entry>
        </row>
@@ -11060,7 +11178,7 @@ table2-mapping
        <row>
         <entry><literal>#&gt;&gt;</literal></entry>
         <entry><type>text[]</type></entry>
-        <entry>Get JSON object at specified path as <type>text</></entry>
+        <entry>Get JSON object at specified path as <type>text</type></entry>
         <entry><literal>'{"a":[1,2,3],"b":[4,5,6]}'::json#&gt;&gt;'{a,2}'</literal></entry>
         <entry><literal>3</literal></entry>
        </row>
@@ -11075,7 +11193,7 @@ table2-mapping
     The field/element/path extraction operators
     return the same type as their left-hand input (either <type>json</type>
     or <type>jsonb</type>), except for those specified as
-    returning <type>text</>, which coerce the value to text.
+    returning <type>text</type>, which coerce the value to text.
     The field/element/path extraction operators return NULL, rather than
     failing, if the JSON input does not have the right structure to match
     the request; for example if no such element exists.  The
@@ -11086,23 +11204,23 @@ table2-mapping
   </note>
   <para>
    The standard comparison operators shown in  <xref
-   linkend="functions-comparison-op-table"> are available for
+   linkend="functions-comparison-op-table"/> are available for
    <type>jsonb</type>, but not for <type>json</type>. They follow the
    ordering rules for B-tree operations outlined at <xref
-   linkend="json-indexing">.
+   linkend="json-indexing"/>.
   </para>
   <para>
    Some further operators also exist only for <type>jsonb</type>, as shown
-   in <xref linkend="functions-jsonb-op-table">.
+   in <xref linkend="functions-jsonb-op-table"/>.
    Many of these operators can be indexed by
-   <type>jsonb</> operator classes.  For a full description of
-   <type>jsonb</> containment and existence semantics, see <xref
-   linkend="json-containment">.  <xref linkend="json-indexing">
+   <type>jsonb</type> operator classes.  For a full description of
+   <type>jsonb</type> containment and existence semantics, see <xref
+   linkend="json-containment"/>.  <xref linkend="json-indexing"/>
    describes how these operators can be used to effectively index
-   <type>jsonb</> data.
+   <type>jsonb</type> data.
   </para>
   <table id="functions-jsonb-op-table">
-     <title>Additional <type>jsonb</> Operators</title>
+     <title>Additional <type>jsonb</type> Operators</title>
      <tgroup cols="4">
       <thead>
        <row>
@@ -11191,7 +11309,7 @@ table2-mapping
 
   <note>
    <para>
-    The <literal>||</> operator concatenates the elements at the top level of
+    The <literal>||</literal> operator concatenates the elements at the top level of
     each of its operands. It does not operate recursively. For example, if
     both operands are objects with a common key field name, the value of the
     field in the result will just be the value from the right hand operand.
@@ -11199,10 +11317,10 @@ table2-mapping
   </note>
 
   <para>
-   <xref linkend="functions-json-creation-table"> shows the functions that are
+   <xref linkend="functions-json-creation-table"/> shows the functions that are
    available for creating <type>json</type> and <type>jsonb</type> values.
-   (There are no equivalent functions for <type>jsonb</>, of the <literal>row_to_json</>
-   and <literal>array_to_json</> functions. However, the <literal>to_jsonb</>
+   (There are no equivalent functions for <type>jsonb</type>, of the <literal>row_to_json</literal>
+   and <literal>array_to_json</literal> functions. However, the <literal>to_jsonb</literal>
    function supplies much the same functionality as these functions would.)
   </para>
 
@@ -11254,14 +11372,14 @@ table2-mapping
           </para><para><literal>to_jsonb(anyelement)</literal>
        </para></entry>
        <entry>
-         Returns the value as <type>json</> or <type>jsonb</>.
+         Returns the value as <type>json</type> or <type>jsonb</type>.
          Arrays and composites are converted
          (recursively) to arrays and objects; otherwise, if there is a cast
          from the type to <type>json</type>, the cast function will be used to
          perform the conversion; otherwise, a scalar value is produced.
          For any scalar type other than a number, a Boolean, or a null value,
          the text representation will be used, in such a fashion that it is a
-         valid <type>json</> or <type>jsonb</> value.
+         valid <type>json</type> or <type>jsonb</type> value.
        </entry>
        <entry><literal>to_json('Fred said "Hi."'::text)</literal></entry>
        <entry><literal>"Fred said \"Hi.\""</literal></entry>
@@ -11323,8 +11441,8 @@ table2-mapping
          such that each inner array has exactly two elements, which
          are taken as a key/value pair.
        </entry>
-       <entry><para><literal>json_object('{a, 1, b, "def", c, 3.5}')</></para>
-        <para><literal>json_object('{{a, 1},{b, "def"},{c, 3.5}}')</></para></entry>
+       <entry><para><literal>json_object('{a, 1, b, "def", c, 3.5}')</literal></para>
+        <para><literal>json_object('{{a, 1},{b, "def"},{c, 3.5}}')</literal></para></entry>
        <entry><literal>{"a": "1", "b": "def", "c": "3.5"}</literal></entry>
       </row>
       <row>
@@ -11332,7 +11450,7 @@ table2-mapping
           </para><para><literal>jsonb_object(keys text[], values text[])</literal>
        </para></entry>
        <entry>
-         This form of <function>json_object</> takes keys and values pairwise from two separate
+         This form of <function>json_object</function> takes keys and values pairwise from two separate
          arrays. In all other respects it is identical to the one-argument form.
        </entry>
        <entry><literal>json_object('{a, b}', '{1,2}')</literal></entry>
@@ -11344,16 +11462,16 @@ table2-mapping
 
   <note>
     <para>
-     <function>array_to_json</> and <function>row_to_json</> have the same
-     behavior as <function>to_json</> except for offering a pretty-printing
-     option.  The behavior described for <function>to_json</> likewise applies
+     <function>array_to_json</function> and <function>row_to_json</function> have the same
+     behavior as <function>to_json</function> except for offering a pretty-printing
+     option.  The behavior described for <function>to_json</function> likewise applies
      to each individual value converted by the other JSON creation functions.
     </para>
   </note>
 
   <note>
     <para>
-     The <xref linkend="hstore"> extension has a cast
+     The <xref linkend="hstore"/> extension has a cast
      from <type>hstore</type> to <type>json</type>, so that
      <type>hstore</type> values converted via the JSON creation functions
      will be represented as JSON objects, not as primitive string values.
@@ -11361,7 +11479,7 @@ table2-mapping
   </note>
 
   <para>
-   <xref linkend="functions-json-processing-table"> shows the functions that
+   <xref linkend="functions-json-processing-table"/> shows the functions that
    are available for processing <type>json</type> and <type>jsonb</type> values.
   </para>
 
@@ -11510,7 +11628,7 @@ table2-mapping
        <entry><type>setof key text, value text</type></entry>
        <entry>
          Expands the outermost JSON object into a set of key/value pairs. The
-         returned values will be of type <type>text</>.
+         returned values will be of type <type>text</type>.
        </entry>
        <entry><literal>select * from json_each_text('{"a":"foo", "b":"bar"}')</literal></entry>
        <entry>
@@ -11542,7 +11660,7 @@ table2-mapping
        <entry><type>text</type></entry>
        <entry>
          Returns JSON value pointed to by <replaceable>path_elems</replaceable>
-         as <type>text</>
+         as <type>text</type>
          (equivalent to <literal>#&gt;&gt;</literal> operator).
        </entry>
        <entry><literal>json_extract_path_text('{"f2":{"f3":1},"f4":{"f5":99,"f6":"foo"}}','f4', 'f6')</literal></entry>
@@ -11573,7 +11691,7 @@ table2-mapping
        <entry><type>anyelement</type></entry>
        <entry>
          Expands the object in <replaceable>from_json</replaceable> to a row
-         whose columns match the record type defined by <replaceable>base</>
+         whose columns match the record type defined by <replaceable>base</replaceable>
          (see note below).
        </entry>
        <entry><literal>select * from json_populate_record(null::myrowtype, '{"a": 1, "b": ["2", "a b"], "c": {"d": 4, "e": "a  b c"}}')</literal></entry>
@@ -11593,7 +11711,7 @@ table2-mapping
        <entry>
          Expands the outermost array of objects
          in <replaceable>from_json</replaceable> to a set of rows whose
-         columns match the record type defined by <replaceable>base</> (see
+         columns match the record type defined by <replaceable>base</replaceable> (see
          note below).
        </entry>
        <entry><literal>select * from json_populate_recordset(null::myrowtype, '[{"a":1,"b":2},{"a":3,"b":4}]')</literal></entry>
@@ -11633,7 +11751,7 @@ table2-mapping
        </para></entry>
        <entry><type>setof text</type></entry>
        <entry>
-         Expands a JSON array to a set of <type>text</> values.
+         Expands a JSON array to a set of <type>text</type> values.
        </entry>
        <entry><literal>select * from json_array_elements_text('["foo", "bar"]')</literal></entry>
        <entry>
@@ -11653,8 +11771,8 @@ table2-mapping
        <entry>
          Returns the type of the outermost JSON value as a text string.
          Possible types are
-         <literal>object</>, <literal>array</>, <literal>string</>, <literal>number</>,
-         <literal>boolean</>, and <literal>null</>.
+         <literal>object</literal>, <literal>array</literal>, <literal>string</literal>, <literal>number</literal>,
+         <literal>boolean</literal>, and <literal>null</literal>.
        </entry>
        <entry><literal>json_typeof('-123.4')</literal></entry>
        <entry><literal>number</literal></entry>
@@ -11666,8 +11784,8 @@ table2-mapping
        <entry><type>record</type></entry>
        <entry>
          Builds an arbitrary record from a JSON object (see note below).  As
-         with all functions returning <type>record</>, the caller must
-         explicitly define the structure of the record with an <literal>AS</>
+         with all functions returning <type>record</type>, the caller must
+         explicitly define the structure of the record with an <literal>AS</literal>
          clause.
        </entry>
        <entry><literal>select * from json_to_record('{"a":1,"b":[1,2,3],"c":[1,2,3],"e":"bar","r": {"a": 123, "b": "a b c"}}') as x(a int, b text, c int[], d text, r myrowtype) </literal></entry>
@@ -11686,9 +11804,9 @@ table2-mapping
        <entry><type>setof record</type></entry>
        <entry>
          Builds an arbitrary set of records from a JSON array of objects (see
-         note below).  As with all functions returning <type>record</>, the
+         note below).  As with all functions returning <type>record</type>, the
          caller must explicitly define the structure of the record with
-         an <literal>AS</> clause.
+         an <literal>AS</literal> clause.
        </entry>
        <entry><literal>select * from json_to_recordset('[{"a":1,"b":"foo"},{"a":"2","c":"bar"}]') as x(a int, b text);</literal></entry>
        <entry>
@@ -11723,7 +11841,7 @@ table2-mapping
          replaced by <replaceable>new_value</replaceable>, or with
          <replaceable>new_value</replaceable> added if
          <replaceable>create_missing</replaceable> is true ( default is
-         <literal>true</>) and the item
+         <literal>true</literal>) and the item
          designated by <replaceable>path</replaceable> does not exist.
          As with the path orientated operators, negative integers that
          appear in <replaceable>path</replaceable> count from the end
@@ -11750,7 +11868,7 @@ table2-mapping
          <replaceable>path</replaceable> is in a JSONB array,
          <replaceable>new_value</replaceable> will be inserted before target or
          after if <replaceable>insert_after</replaceable> is true (default is
-         <literal>false</>). If <replaceable>target</replaceable> section
+         <literal>false</literal>). If <replaceable>target</replaceable> section
          designated by <replaceable>path</replaceable> is in JSONB object,
          <replaceable>new_value</replaceable> will be inserted only if
          <replaceable>target</replaceable> does not exist. As with the path
@@ -11800,17 +11918,17 @@ table2-mapping
     <para>
       Many of these functions and operators will convert Unicode escapes in
       JSON strings to the appropriate single character.  This is a non-issue
-      if the input is type <type>jsonb</>, because the conversion was already
-      done; but for <type>json</> input, this may result in throwing an error,
-      as noted in <xref linkend="datatype-json">.
+      if the input is type <type>jsonb</type>, because the conversion was already
+      done; but for <type>json</type> input, this may result in throwing an error,
+      as noted in <xref linkend="datatype-json"/>.
     </para>
   </note>
 
   <note>
     <para>
-      In <function>json_populate_record</>, <function>json_populate_recordset</>,
-      <function>json_to_record</> and <function>json_to_recordset</>,
-      type coercion from the JSON is <quote>best effort</> and may not result
+      In <function>json_populate_record</function>, <function>json_populate_recordset</function>,
+      <function>json_to_record</function> and <function>json_to_recordset</function>,
+      type coercion from the JSON is <quote>best effort</quote> and may not result
       in desired values for some types.  JSON keys are matched to
       identical column names in the target row type.  JSON fields that do not
       appear in the target row type will be omitted from the output, and
@@ -11820,18 +11938,18 @@ table2-mapping
 
   <note>
     <para>
-      All the items of the <literal>path</> parameter of <literal>jsonb_set</>
-      as well as <literal>jsonb_insert</> except the last item must be present
-      in the <literal>target</>. If <literal>create_missing</> is false, all
-      items of the <literal>path</> parameter of <literal>jsonb_set</> must be
-      present. If these conditions are not met the <literal>target</> is
+      All the items of the <literal>path</literal> parameter of <literal>jsonb_set</literal>
+      as well as <literal>jsonb_insert</literal> except the last item must be present
+      in the <literal>target</literal>. If <literal>create_missing</literal> is false, all
+      items of the <literal>path</literal> parameter of <literal>jsonb_set</literal> must be
+      present. If these conditions are not met the <literal>target</literal> is
       returned unchanged.
     </para>
     <para>
       If the last path item is an object key, it will be created if it
       is absent and given the new value. If the last path item is an array
       index, if it is positive the item to set is found by counting from
-      the left, and if negative by counting from the right - <literal>-1</>
+      the left, and if negative by counting from the right - <literal>-1</literal>
       designates the rightmost element, and so on.
       If the item is out of the range -array_length .. array_length -1,
       and create_missing is true, the new value is added at the beginning
@@ -11842,31 +11960,31 @@ table2-mapping
 
   <note>
     <para>
-      The <literal>json_typeof</> function's <literal>null</> return value
+      The <literal>json_typeof</literal> function's <literal>null</literal> return value
       should not be confused with a SQL NULL.  While
-      calling <literal>json_typeof('null'::json)</> will
-      return <literal>null</>, calling <literal>json_typeof(NULL::json)</>
+      calling <literal>json_typeof('null'::json)</literal> will
+      return <literal>null</literal>, calling <literal>json_typeof(NULL::json)</literal>
       will return a SQL NULL.
     </para>
   </note>
 
   <note>
     <para>
-      If the argument to <literal>json_strip_nulls</> contains duplicate
+      If the argument to <literal>json_strip_nulls</literal> contains duplicate
       field names in any object, the result could be semantically somewhat
       different, depending on the order in which they occur. This is not an
-      issue for <literal>jsonb_strip_nulls</> since <type>jsonb</type> values never have
+      issue for <literal>jsonb_strip_nulls</literal> since <type>jsonb</type> values never have
       duplicate object field names.
     </para>
   </note>
 
   <para>
-    See also <xref linkend="functions-aggregate"> for the aggregate
+    See also <xref linkend="functions-aggregate"/> for the aggregate
     function <function>json_agg</function> which aggregates record
     values as JSON, and the aggregate function
     <function>json_object_agg</function> which aggregates pairs of values
     into a JSON object, and their <type>jsonb</type> equivalents,
-    <function>jsonb_agg</> and <function>jsonb_object_agg</>.
+    <function>jsonb_agg</function> and <function>jsonb_object_agg</function>.
   </para>
 
  </sect1>
@@ -11894,10 +12012,10 @@ table2-mapping
    This section describes functions for operating on <firstterm>sequence
    objects</firstterm>, also called sequence generators or just sequences.
    Sequence objects are special single-row tables created with <xref
-   linkend="sql-createsequence">.
+   linkend="sql-createsequence"/>.
    Sequence objects are commonly used to generate unique identifiers
    for rows of a table.  The sequence functions, listed in <xref
-   linkend="functions-sequence-table">, provide simple, multiuser-safe
+   linkend="functions-sequence-table"/>, provide simple, multiuser-safe
    methods for obtaining successive sequence values from sequence
    objects.
   </para>
@@ -11943,52 +12061,52 @@ table2-mapping
 
   <para>
    The sequence to be operated on by a sequence function is specified by
-   a <type>regclass</> argument, which is simply the OID of the sequence in the
-   <structname>pg_class</> system catalog.  You do not have to look up the
-   OID by hand, however, since the <type>regclass</> data type's input
+   a <type>regclass</type> argument, which is simply the OID of the sequence in the
+   <structname>pg_class</structname> system catalog.  You do not have to look up the
+   OID by hand, however, since the <type>regclass</type> data type's input
    converter will do the work for you.  Just write the sequence name enclosed
    in single quotes so that it looks like a literal constant.  For
    compatibility with the handling of ordinary
    <acronym>SQL</acronym> names, the string will be converted to lower case
    unless it contains double quotes around the sequence name.  Thus:
 <programlisting>
-nextval('foo')      <lineannotation>operates on sequence <literal>foo</literal></>
-nextval('FOO')      <lineannotation>operates on sequence <literal>foo</literal></>
-nextval('"Foo"')    <lineannotation>operates on sequence <literal>Foo</literal></>
+nextval('foo')      <lineannotation>operates on sequence <literal>foo</literal></lineannotation>
+nextval('FOO')      <lineannotation>operates on sequence <literal>foo</literal></lineannotation>
+nextval('"Foo"')    <lineannotation>operates on sequence <literal>Foo</literal></lineannotation>
 </programlisting>
    The sequence name can be schema-qualified if necessary:
 <programlisting>
-nextval('myschema.foo')     <lineannotation>operates on <literal>myschema.foo</literal></>
+nextval('myschema.foo')     <lineannotation>operates on <literal>myschema.foo</literal></lineannotation>
 nextval('"myschema".foo')   <lineannotation>same as above</lineannotation>
-nextval('foo')              <lineannotation>searches search path for <literal>foo</literal></>
+nextval('foo')              <lineannotation>searches search path for <literal>foo</literal></lineannotation>
 </programlisting>
-   See <xref linkend="datatype-oid"> for more information about
-   <type>regclass</>.
+   See <xref linkend="datatype-oid"/> for more information about
+   <type>regclass</type>.
   </para>
 
   <note>
    <para>
     Before <productname>PostgreSQL</productname> 8.1, the arguments of the
-    sequence functions were of type <type>text</>, not <type>regclass</>, and
+    sequence functions were of type <type>text</type>, not <type>regclass</type>, and
     the above-described conversion from a text string to an OID value would
     happen at run time during each call.  For backward compatibility, this
     facility still exists, but internally it is now handled as an implicit
-    coercion from <type>text</> to <type>regclass</> before the function is
+    coercion from <type>text</type> to <type>regclass</type> before the function is
     invoked.
    </para>
 
    <para>
     When you write the argument of a sequence function as an unadorned
-    literal string, it becomes a constant of type <type>regclass</>.
+    literal string, it becomes a constant of type <type>regclass</type>.
     Since this is really just an OID, it will track the originally
     identified sequence despite later renaming, schema reassignment,
-    etc.  This <quote>early binding</> behavior is usually desirable for
+    etc.  This <quote>early binding</quote> behavior is usually desirable for
     sequence references in column defaults and views.  But sometimes you might
-    want <quote>late binding</> where the sequence reference is resolved
+    want <quote>late binding</quote> where the sequence reference is resolved
     at run time.  To get late-binding behavior, force the constant to be
-    stored as a <type>text</> constant instead of <type>regclass</>:
+    stored as a <type>text</type> constant instead of <type>regclass</type>:
 <programlisting>
-nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at runtime</>
+nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at runtime</lineannotation>
 </programlisting>
     Note that late binding was the only behavior supported in
     <productname>PostgreSQL</productname> releases before 8.1, so you
@@ -12020,7 +12138,7 @@ nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at
         If a sequence object has been created with default parameters,
         successive <function>nextval</function> calls will return successive
         values beginning with 1.  Other behaviors can be obtained by using
-        special parameters in the <xref linkend="sql-createsequence"> command;
+        special parameters in the <xref linkend="sql-createsequence"/> command;
         see its command reference page for more information.
        </para>
 
@@ -12031,14 +12149,14 @@ nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at
          rolled back; that is, once a value has been fetched it is considered
          used and will not be returned again.  This is true even if the
          surrounding transaction later aborts, or if the calling query ends
-         up not using the value.  For example an <command>INSERT</> with
-         an <literal>ON CONFLICT</> clause will compute the to-be-inserted
+         up not using the value.  For example an <command>INSERT</command> with
+         an <literal>ON CONFLICT</literal> clause will compute the to-be-inserted
          tuple, including doing any required <function>nextval</function>
          calls, before detecting any conflict that would cause it to follow
-         the <literal>ON CONFLICT</> rule instead.  Such cases will leave
+         the <literal>ON CONFLICT</literal> rule instead.  Such cases will leave
          unused <quote>holes</quote> in the sequence of assigned values.
-         Thus, <productname>PostgreSQL</> sequence objects <emphasis>cannot
-         be used to obtain <quote>gapless</> sequences</emphasis>.
+         Thus, <productname>PostgreSQL</productname> sequence objects <emphasis>cannot
+         be used to obtain <quote>gapless</quote> sequences</emphasis>.
         </para>
        </important>
 
@@ -12074,7 +12192,7 @@ nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at
       <listitem>
        <para>
         Return the value most recently returned by
-        <function>nextval</> in the current session. This function is
+        <function>nextval</function> in the current session. This function is
         identical to <function>currval</function>, except that instead
         of taking the sequence name as an argument it refers to whichever
         sequence <function>nextval</function> was most recently applied to
@@ -12099,20 +12217,20 @@ nextval('foo'::text)      <lineannotation><literal>foo</literal> is looked up at
         specified value and sets its <literal>is_called</literal> field to
         <literal>true</literal>, meaning that the next
         <function>nextval</function> will advance the sequence before
-        returning a value.  The value reported by <function>currval</> is
+        returning a value.  The value reported by <function>currval</function> is
         also set to the specified value.  In the three-parameter form,
         <literal>is_called</literal> can be set to either <literal>true</literal>
-        or <literal>false</literal>.  <literal>true</> has the same effect as
+        or <literal>false</literal>.  <literal>true</literal> has the same effect as
         the two-parameter form. If it is set to <literal>false</literal>, the
         next <function>nextval</function> will return exactly the specified
         value, and sequence advancement commences with the following
         <function>nextval</function>.  Furthermore, the value reported by
-        <function>currval</> is not changed in this case.  For example,
+        <function>currval</function> is not changed in this case.  For example,
 
 <screen>
-SELECT setval('foo', 42);           <lineannotation>Next <function>nextval</> will return 43</lineannotation>
+SELECT setval('foo', 42);           <lineannotation>Next <function>nextval</function> will return 43</lineannotation>
 SELECT setval('foo', 42, true);     <lineannotation>Same as above</lineannotation>
-SELECT setval('foo', 42, false);    <lineannotation>Next <function>nextval</> will return 42</lineannotation>
+SELECT setval('foo', 42, false);    <lineannotation>Next <function>nextval</function> will return 42</lineannotation>
 </screen>
 
         The result returned by <function>setval</function> is just the value of its
@@ -12163,7 +12281,7 @@ SELECT setval('foo', 42, false);    <lineannotation>Next <function>nextval</> wi
   </tip>
 
   <sect2 id="functions-case">
-   <title><literal>CASE</></title>
+   <title><literal>CASE</literal></title>
 
   <para>
    The <acronym>SQL</acronym> <token>CASE</token> expression is a
@@ -12186,7 +12304,7 @@ END
    condition's result is not true, any subsequent <token>WHEN</token> clauses
    are examined in the same manner.  If no <token>WHEN</token>
    <replaceable>condition</replaceable> yields true, the value of the
-   <token>CASE</> expression is the <replaceable>result</replaceable> of the
+   <token>CASE</token> expression is the <replaceable>result</replaceable> of the
    <token>ELSE</token> clause.  If the <token>ELSE</token> clause is
    omitted and no condition is true, the result is null.
   </para>
@@ -12221,11 +12339,11 @@ SELECT a,
   <para>
    The data types of all the <replaceable>result</replaceable>
    expressions must be convertible to a single output type.
-   See <xref linkend="typeconv-union-case"> for more details.
+   See <xref linkend="typeconv-union-case"/> for more details.
   </para>
 
   <para>
-   There is a <quote>simple</> form of <token>CASE</token> expression
+   There is a <quote>simple</quote> form of <token>CASE</token> expression
    that is a variant of the general form above:
 
 <synopsis>
@@ -12275,11 +12393,11 @@ SELECT ... WHERE CASE WHEN x &lt;&gt; 0 THEN y/x &gt; 1.5 ELSE false END;
 
    <note>
     <para>
-     As described in <xref linkend="syntax-express-eval">, there are various
+     As described in <xref linkend="syntax-express-eval"/>, there are various
      situations in which subexpressions of an expression are evaluated at
      different times, so that the principle that <quote><token>CASE</token>
      evaluates only necessary subexpressions</quote> is not ironclad.  For
-     example a constant <literal>1/0</> subexpression will usually result in
+     example a constant <literal>1/0</literal> subexpression will usually result in
      a division-by-zero failure at planning time, even if it's within
      a <token>CASE</token> arm that would never be entered at run time.
     </para>
@@ -12287,7 +12405,7 @@ SELECT ... WHERE CASE WHEN x &lt;&gt; 0 THEN y/x &gt; 1.5 ELSE false END;
   </sect2>
 
   <sect2 id="functions-coalesce-nvl-ifnull">
-   <title><literal>COALESCE</></title>
+   <title><literal>COALESCE</literal></title>
 
   <indexterm>
    <primary>COALESCE</primary>
@@ -12313,8 +12431,8 @@ SELECT ... WHERE CASE WHEN x &lt;&gt; 0 THEN y/x &gt; 1.5 ELSE false END;
 <programlisting>
 SELECT COALESCE(description, short_description, '(none)') ...
 </programlisting>
-   This returns <varname>description</> if it is not null, otherwise
-   <varname>short_description</> if it is not null, otherwise <literal>(none)</>.
+   This returns <varname>description</varname> if it is not null, otherwise
+   <varname>short_description</varname> if it is not null, otherwise <literal>(none)</literal>.
   </para>
 
    <para>
@@ -12322,13 +12440,13 @@ SELECT COALESCE(description, short_description, '(none)') ...
     evaluates the arguments that are needed to determine the result;
     that is, arguments to the right of the first non-null argument are
     not evaluated.  This SQL-standard function provides capabilities similar
-    to <function>NVL</> and <function>IFNULL</>, which are used in some other
+    to <function>NVL</function> and <function>IFNULL</function>, which are used in some other
     database systems.
    </para>
   </sect2>
 
   <sect2 id="functions-nullif">
-   <title><literal>NULLIF</></title>
+   <title><literal>NULLIF</literal></title>
 
   <indexterm>
    <primary>NULLIF</primary>
@@ -12349,7 +12467,7 @@ SELECT NULLIF(value, '(none)') ...
 </programlisting>
   </para>
   <para>
-   In this example, if <literal>value</literal> is <literal>(none)</>,
+   In this example, if <literal>value</literal> is <literal>(none)</literal>,
    null is returned, otherwise the value of <literal>value</literal>
    is returned.
   </para>
@@ -12374,17 +12492,17 @@ SELECT NULLIF(value, '(none)') ...
 </synopsis>
 
    <para>
-    The <function>GREATEST</> and <function>LEAST</> functions select the
+    The <function>GREATEST</function> and <function>LEAST</function> functions select the
     largest or smallest value from a list of any number of expressions.
     The expressions must all be convertible to a common data type, which
     will be the type of the result
-    (see <xref linkend="typeconv-union-case"> for details).  NULL values
+    (see <xref linkend="typeconv-union-case"/> for details).  NULL values
     in the list are ignored.  The result will be NULL only if all the
     expressions evaluate to NULL.
    </para>
 
    <para>
-    Note that <function>GREATEST</> and <function>LEAST</> are not in
+    Note that <function>GREATEST</function> and <function>LEAST</function> are not in
     the SQL standard, but are a common extension.  Some other databases
     make them return NULL if any argument is NULL, rather than only when
     all are NULL.
@@ -12396,7 +12514,7 @@ SELECT NULLIF(value, '(none)') ...
   <title>Array Functions and Operators</title>
 
   <para>
-   <xref linkend="array-operators-table"> shows the operators
+   <xref linkend="array-operators-table"/> shows the operators
    available for array types.
   </para>
 
@@ -12514,20 +12632,20 @@ SELECT NULLIF(value, '(none)') ...
    If the contents of two arrays are equal but the dimensionality is
    different, the first difference in the dimensionality information
    determines the sort order.  (This is a change from versions of
-   <productname>PostgreSQL</> prior to 8.2: older versions would claim
+   <productname>PostgreSQL</productname> prior to 8.2: older versions would claim
    that two arrays with the same contents were equal, even if the
    number of dimensions or subscript ranges were different.)
   </para>
 
   <para>
-   See <xref linkend="arrays"> for more details about array operator
-   behavior.  See <xref linkend="indexes-types"> for more details about
+   See <xref linkend="arrays"/> for more details about array operator
+   behavior.  See <xref linkend="indexes-types"/> for more details about
    which operators support indexed operations.
   </para>
 
   <para>
-   <xref linkend="array-functions-table"> shows the functions
-   available for use with array types. See <xref linkend="arrays">
+   <xref linkend="array-functions-table"/> shows the functions
+   available for use with array types. See <xref linkend="arrays"/>
    for more information  and examples of the use of these functions.
   </para>
 
@@ -12802,7 +12920,7 @@ SELECT NULLIF(value, '(none)') ...
         <entry><type>setof anyelement, anyelement [, ...]</type></entry>
         <entry>expand multiple arrays (possibly of different types) to a set
          of rows.  This is only allowed in the FROM clause; see
-         <xref linkend="queries-tablefunctions"></entry>
+         <xref linkend="queries-tablefunctions"/></entry>
         <entry><literal>unnest(ARRAY[1,2],ARRAY['foo','bar','baz'])</literal></entry>
         <entry><literallayout class="monospaced">1    foo
 2    bar
@@ -12813,7 +12931,7 @@ NULL baz</literallayout>(3 rows)</entry>
     </table>
 
    <para>
-    In <function>array_position</function> and <function>array_positions</>,
+    In <function>array_position</function> and <function>array_positions</function>,
     each array element is compared to the searched value using
     <literal>IS NOT DISTINCT FROM</literal> semantics.
    </para>
@@ -12848,8 +12966,8 @@ NULL baz</literallayout>(3 rows)</entry>
 
    <note>
     <para>
-     There are two differences in the behavior of <function>string_to_array</>
-     from pre-9.1 versions of <productname>PostgreSQL</>.
+     There are two differences in the behavior of <function>string_to_array</function>
+     from pre-9.1 versions of <productname>PostgreSQL</productname>.
      First, it will return an empty (zero-element) array rather than NULL when
      the input string is of zero length.  Second, if the delimiter string is
      NULL, the function splits the input into individual characters, rather
@@ -12858,7 +12976,7 @@ NULL baz</literallayout>(3 rows)</entry>
    </note>
 
    <para>
-    See also <xref linkend="functions-aggregate"> about the aggregate
+    See also <xref linkend="functions-aggregate"/> about the aggregate
     function <function>array_agg</function> for use with arrays.
    </para>
   </sect1>
@@ -12867,11 +12985,11 @@ NULL baz</literallayout>(3 rows)</entry>
   <title>Range Functions and Operators</title>
 
   <para>
-   See <xref linkend="rangetypes"> for an overview of range types.
+   See <xref linkend="rangetypes"/> for an overview of range types.
   </para>
 
   <para>
-   <xref linkend="range-operators-table"> shows the operators
+   <xref linkend="range-operators-table"/> shows the operators
    available for range types.
   </para>
 
@@ -13046,7 +13164,7 @@ NULL baz</literallayout>(3 rows)</entry>
   </para>
 
   <para>
-   <xref linkend="range-functions-table"> shows the functions
+   <xref linkend="range-functions-table"/> shows the functions
    available for use with range types.
   </para>
 
@@ -13178,7 +13296,7 @@ NULL baz</literallayout>(3 rows)</entry>
     </table>
 
   <para>
-   The <function>lower</> and  <function>upper</> functions return null
+   The <function>lower</function> and  <function>upper</function> functions return null
    if the range is empty or the requested bound is infinite.
    The <function>lower_inc</function>, <function>upper_inc</function>,
    <function>lower_inf</function>, and <function>upper_inf</function>
@@ -13197,18 +13315,18 @@ NULL baz</literallayout>(3 rows)</entry>
   <para>
    <firstterm>Aggregate functions</firstterm> compute a single result
    from a set of input values.  The built-in general-purpose aggregate
-   functions are listed in <xref linkend="functions-aggregate-table">
+   functions are listed in <xref linkend="functions-aggregate-table"/>
    and statistical aggregates in <xref
-   linkend="functions-aggregate-statistics-table">.
+   linkend="functions-aggregate-statistics-table"/>.
    The built-in within-group ordered-set aggregate functions
-   are listed in <xref linkend="functions-orderedset-table">
+   are listed in <xref linkend="functions-orderedset-table"/>
    while the built-in within-group hypothetical-set ones are in <xref
-   linkend="functions-hypothetical-table">.  Grouping operations,
+   linkend="functions-hypothetical-table"/>.  Grouping operations,
    which are closely related to aggregate functions, are listed in
-   <xref linkend="functions-grouping-table">.
+   <xref linkend="functions-grouping-table"/>.
    The special syntax considerations for aggregate
-   functions are explained in <xref linkend="syntax-aggregates">.
-   Consult <xref linkend="tutorial-agg"> for additional introductory
+   functions are explained in <xref linkend="syntax-aggregates"/>.
+   Consult <xref linkend="tutorial-agg"/> for additional introductory
    information.
   </para>
 
@@ -13530,7 +13648,7 @@ NULL baz</literallayout>(3 rows)</entry>
        <type>smallint</type>, <type>int</type>,
        <type>bigint</type>, <type>real</type>, <type>double
        precision</type>, <type>numeric</type>,
-       <type>interval</type>, or <type>money</>
+       <type>interval</type>, or <type>money</type>
       </entry>
       <entry>
        <type>bigint</type> for <type>smallint</type> or
@@ -13556,7 +13674,7 @@ NULL baz</literallayout>(3 rows)</entry>
        <type>xml</type>
       </entry>
       <entry>No</entry>
-      <entry>concatenation of XML values (see also <xref linkend="functions-xml-xmlagg">)</entry>
+      <entry>concatenation of XML values (see also <xref linkend="functions-xml-xmlagg"/>)</entry>
      </row>
     </tbody>
    </tgroup>
@@ -13627,8 +13745,8 @@ SELECT count(*) FROM sometable;
    aggregate functions, produce meaningfully different result values
    depending on the order of the input values.  This ordering is
    unspecified by default, but can be controlled by writing an
-   <literal>ORDER BY</> clause within the aggregate call, as shown in
-   <xref linkend="syntax-aggregates">.
+   <literal>ORDER BY</literal> clause within the aggregate call, as shown in
+   <xref linkend="syntax-aggregates"/>.
    Alternatively, supplying the input values from a sorted subquery
    will usually work.  For example:
 
@@ -13642,7 +13760,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
   </para>
 
   <para>
-   <xref linkend="functions-aggregate-statistics-table"> shows
+   <xref linkend="functions-aggregate-statistics-table"/> shows
    aggregate functions typically used in statistical analysis.
    (These are separated out merely to avoid cluttering the listing
    of more-commonly-used aggregates.)  Where the description mentions
@@ -14061,10 +14179,10 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
   </table>
 
   <para>
-   <xref linkend="functions-orderedset-table"> shows some
-   aggregate functions that use the <firstterm>ordered-set aggregate</>
+   <xref linkend="functions-orderedset-table"/> shows some
+   aggregate functions that use the <firstterm>ordered-set aggregate</firstterm>
    syntax.  These functions are sometimes referred to as <quote>inverse
-   distribution</> functions.
+   distribution</quote> functions.
   </para>
 
   <indexterm>
@@ -14211,7 +14329,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
   </table>
 
   <para>
-   All the aggregates listed in <xref linkend="functions-orderedset-table">
+   All the aggregates listed in <xref linkend="functions-orderedset-table"/>
    ignore null values in their sorted input.  For those that take
    a <replaceable>fraction</replaceable> parameter, the fraction value must be
    between 0 and 1; an error is thrown if not.  However, a null fraction value
@@ -14225,11 +14343,11 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
 
   <para>
    Each of the aggregates listed in
-   <xref linkend="functions-hypothetical-table"> is associated with a
+   <xref linkend="functions-hypothetical-table"/> is associated with a
    window function of the same name defined in
-   <xref linkend="functions-window">.  In each case, the aggregate result
+   <xref linkend="functions-window"/>.  In each case, the aggregate result
    is the value that the associated window function would have
-   returned for the <quote>hypothetical</> row constructed from
+   returned for the <quote>hypothetical</quote> row constructed from
    <replaceable>args</replaceable>, if such a row had been added to the sorted
    group of rows computed from the <replaceable>sorted_args</replaceable>.
   </para>
@@ -14260,10 +14378,10 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <function>rank(<replaceable class="parameter">args</replaceable>) WITHIN GROUP (ORDER BY <replaceable class="parameter">sorted_args</replaceable>)</function>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
        <type>bigint</type>
@@ -14283,10 +14401,10 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <function>dense_rank(<replaceable class="parameter">args</replaceable>) WITHIN GROUP (ORDER BY <replaceable class="parameter">sorted_args</replaceable>)</function>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
        <type>bigint</type>
@@ -14306,10 +14424,10 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <function>percent_rank(<replaceable class="parameter">args</replaceable>) WITHIN GROUP (ORDER BY <replaceable class="parameter">sorted_args</replaceable>)</function>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
        <type>double precision</type>
@@ -14329,10 +14447,10 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <function>cume_dist(<replaceable class="parameter">args</replaceable>) WITHIN GROUP (ORDER BY <replaceable class="parameter">sorted_args</replaceable>)</function>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
-       <literal>VARIADIC</> <type>"any"</type>
+       <literal>VARIADIC</literal> <type>"any"</type>
       </entry>
       <entry>
        <type>double precision</type>
@@ -14340,7 +14458,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
       <entry>No</entry>
       <entry>
        relative rank of the hypothetical row, ranging from
-       1/<replaceable>N</> to 1
+       1/<replaceable>N</replaceable> to 1
       </entry>
      </row>
 
@@ -14354,7 +14472,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
    the aggregated arguments given in <replaceable>sorted_args</replaceable>.
    Unlike most built-in aggregates, these aggregates are not strict, that is
    they do not drop input rows containing nulls.  Null values sort according
-   to the rule specified in the <literal>ORDER BY</> clause.
+   to the rule specified in the <literal>ORDER BY</literal> clause.
   </para>
 
   <table id="functions-grouping-table">
@@ -14392,15 +14510,15 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
 
    <para>
     Grouping operations are used in conjunction with grouping sets (see
-    <xref linkend="queries-grouping-sets">) to distinguish result rows.  The
-    arguments to the <literal>GROUPING</> operation are not actually evaluated,
-    but they must match exactly expressions given in the <literal>GROUP BY</>
+    <xref linkend="queries-grouping-sets"/>) to distinguish result rows.  The
+    arguments to the <literal>GROUPING</literal> operation are not actually evaluated,
+    but they must match exactly expressions given in the <literal>GROUP BY</literal>
     clause of the associated query level.  Bits are assigned with the rightmost
     argument being the least-significant bit; each bit is 0 if the corresponding
     expression is included in the grouping criteria of the grouping set generating
     the result row, and 1 if it is not.  For example:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM items_sold;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM items_sold;</userinput>
  make  | model | sales
 -------+-------+-------
  Foo   | GT    |  10
@@ -14409,7 +14527,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
  Bar   | Sport |  5
 (4 rows)
 
-<prompt>=&gt;</> <userinput>SELECT make, model, GROUPING(make,model), sum(sales) FROM items_sold GROUP BY ROLLUP(make,model);</>
+<prompt>=&gt;</prompt> <userinput>SELECT make, model, GROUPING(make,model), sum(sales) FROM items_sold GROUP BY ROLLUP(make,model);</userinput>
  make  | model | grouping | sum
 -------+-------+----------+-----
  Foo   | GT    |        0 | 10
@@ -14436,16 +14554,16 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
   <para>
    <firstterm>Window functions</firstterm> provide the ability to perform
    calculations across sets of rows that are related to the current query
-   row.  See <xref linkend="tutorial-window"> for an introduction to this
-   feature, and <xref linkend="syntax-window-functions"> for syntax
+   row.  See <xref linkend="tutorial-window"/> for an introduction to this
+   feature, and <xref linkend="syntax-window-functions"/> for syntax
    details.
   </para>
 
   <para>
    The built-in window functions are listed in
-   <xref linkend="functions-window-table">.  Note that these functions
-   <emphasis>must</> be invoked using window function syntax, i.e., an
-   <literal>OVER</> clause is required.
+   <xref linkend="functions-window-table"/>.  Note that these functions
+   <emphasis>must</emphasis> be invoked using window function syntax, i.e., an
+   <literal>OVER</literal> clause is required.
   </para>
 
   <para>
@@ -14453,8 +14571,8 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
    general-purpose or statistical
    aggregate (i.e., not ordered-set or hypothetical-set aggregates)
    can be used as a window function; see
-   <xref linkend="functions-aggregate"> for a list of the built-in aggregates.
-   Aggregate functions act as window functions only when an <literal>OVER</>
+   <xref linkend="functions-aggregate"/> for a list of the built-in aggregates.
+   Aggregate functions act as window functions only when an <literal>OVER</literal>
    clause follows the call; otherwise they act as non-window aggregates
    and return a single row for the entire set.
   </para>
@@ -14495,7 +14613,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
       <entry>
        <type>bigint</type>
       </entry>
-      <entry>rank of the current row with gaps; same as <function>row_number</> of its first peer</entry>
+      <entry>rank of the current row with gaps; same as <function>row_number</function> of its first peer</entry>
      </row>
 
      <row>
@@ -14521,7 +14639,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
       <entry>
        <type>double precision</type>
       </entry>
-      <entry>relative rank of the current row: (<function>rank</> - 1) / (total partition rows - 1)</entry>
+      <entry>relative rank of the current row: (<function>rank</function> - 1) / (total partition rows - 1)</entry>
      </row>
 
      <row>
@@ -14542,7 +14660,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <indexterm>
         <primary>ntile</primary>
        </indexterm>
-       <function>ntile(<replaceable class="parameter">num_buckets</replaceable> <type>integer</>)</function>
+       <function>ntile(<replaceable class="parameter">num_buckets</replaceable> <type>integer</type>)</function>
       </entry>
       <entry>
        <type>integer</type>
@@ -14557,9 +14675,9 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
         <primary>lag</primary>
        </indexterm>
        <function>
-         lag(<replaceable class="parameter">value</replaceable> <type>anyelement</>
-             [, <replaceable class="parameter">offset</replaceable> <type>integer</>
-             [, <replaceable class="parameter">default</replaceable> <type>anyelement</> ]])
+         lag(<replaceable class="parameter">value</replaceable> <type>anyelement</type>
+             [, <replaceable class="parameter">offset</replaceable> <type>integer</type>
+             [, <replaceable class="parameter">default</replaceable> <type>anyelement</type> ]])
        </function>
       </entry>
       <entry>
@@ -14586,9 +14704,9 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
         <primary>lead</primary>
        </indexterm>
        <function>
-         lead(<replaceable class="parameter">value</replaceable> <type>anyelement</>
-              [, <replaceable class="parameter">offset</replaceable> <type>integer</>
-              [, <replaceable class="parameter">default</replaceable> <type>anyelement</> ]])
+         lead(<replaceable class="parameter">value</replaceable> <type>anyelement</type>
+              [, <replaceable class="parameter">offset</replaceable> <type>integer</type>
+              [, <replaceable class="parameter">default</replaceable> <type>anyelement</type> ]])
        </function>
       </entry>
       <entry>
@@ -14614,7 +14732,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <indexterm>
         <primary>first_value</primary>
        </indexterm>
-       <function>first_value(<replaceable class="parameter">value</replaceable> <type>any</>)</function>
+       <function>first_value(<replaceable class="parameter">value</replaceable> <type>any</type>)</function>
       </entry>
       <entry>
        <type>same type as <replaceable class="parameter">value</replaceable></type>
@@ -14630,7 +14748,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
        <indexterm>
         <primary>last_value</primary>
        </indexterm>
-       <function>last_value(<replaceable class="parameter">value</replaceable> <type>any</>)</function>
+       <function>last_value(<replaceable class="parameter">value</replaceable> <type>any</type>)</function>
       </entry>
       <entry>
        <type>same type as <replaceable class="parameter">value</replaceable></type>
@@ -14647,7 +14765,7 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
         <primary>nth_value</primary>
        </indexterm>
        <function>
-         nth_value(<replaceable class="parameter">value</replaceable> <type>any</>, <replaceable class="parameter">nth</replaceable> <type>integer</>)
+         nth_value(<replaceable class="parameter">value</replaceable> <type>any</type>, <replaceable class="parameter">nth</replaceable> <type>integer</type>)
        </function>
       </entry>
       <entry>
@@ -14665,58 +14783,59 @@ SELECT xmlagg(x) FROM (SELECT x FROM test ORDER BY y DESC) AS tab;
 
   <para>
    All of the functions listed in
-   <xref linkend="functions-window-table"> depend on the sort ordering
-   specified by the <literal>ORDER BY</> clause of the associated window
+   <xref linkend="functions-window-table"/> depend on the sort ordering
+   specified by the <literal>ORDER BY</literal> clause of the associated window
    definition.  Rows that are not distinct when considering only the
-   <literal>ORDER BY</> columns are said to be <firstterm>peers</>.
-   The four ranking functions (including <function>cume_dist</>) are
+   <literal>ORDER BY</literal> columns are said to be <firstterm>peers</firstterm>.
+   The four ranking functions (including <function>cume_dist</function>) are
    defined so that they give the same answer for all peer rows.
   </para>
 
   <para>
-   Note that <function>first_value</>, <function>last_value</>, and
-   <function>nth_value</> consider only the rows within the <quote>window
-   frame</>, which by default contains the rows from the start of the
+   Note that <function>first_value</function>, <function>last_value</function>, and
+   <function>nth_value</function> consider only the rows within the <quote>window
+   frame</quote>, which by default contains the rows from the start of the
    partition through the last peer of the current row.  This is
-   likely to give unhelpful results for <function>last_value</> and
-   sometimes also <function>nth_value</>.  You can redefine the frame by
-   adding a suitable frame specification (<literal>RANGE</> or
-   <literal>ROWS</>) to the <literal>OVER</> clause.
-   See <xref linkend="syntax-window-functions"> for more information
+   likely to give unhelpful results for <function>last_value</function> and
+   sometimes also <function>nth_value</function>.  You can redefine the frame by
+   adding a suitable frame specification (<literal>RANGE</literal>,
+   <literal>ROWS</literal> or <literal>GROUPS</literal>) to
+   the <literal>OVER</literal> clause.
+   See <xref linkend="syntax-window-functions"/> for more information
    about frame specifications.
   </para>
 
   <para>
    When an aggregate function is used as a window function, it aggregates
    over the rows within the current row's window frame.
-   An aggregate used with <literal>ORDER BY</> and the default window frame
-   definition produces a <quote>running sum</> type of behavior, which may or
+   An aggregate used with <literal>ORDER BY</literal> and the default window frame
+   definition produces a <quote>running sum</quote> type of behavior, which may or
    may not be what's wanted.  To obtain
-   aggregation over the whole partition, omit <literal>ORDER BY</> or use
-   <literal>ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING</>.
+   aggregation over the whole partition, omit <literal>ORDER BY</literal> or use
+   <literal>ROWS BETWEEN UNBOUNDED PRECEDING AND UNBOUNDED FOLLOWING</literal>.
    Other frame specifications can be used to obtain other effects.
   </para>
 
   <note>
    <para>
-    The SQL standard defines a <literal>RESPECT NULLS</> or
-    <literal>IGNORE NULLS</> option for <function>lead</>, <function>lag</>,
-    <function>first_value</>, <function>last_value</>, and
-    <function>nth_value</>.  This is not implemented in
+    The SQL standard defines a <literal>RESPECT NULLS</literal> or
+    <literal>IGNORE NULLS</literal> option for <function>lead</function>, <function>lag</function>,
+    <function>first_value</function>, <function>last_value</function>, and
+    <function>nth_value</function>.  This is not implemented in
     <productname>PostgreSQL</productname>: the behavior is always the
-    same as the standard's default, namely <literal>RESPECT NULLS</>.
-    Likewise, the standard's <literal>FROM FIRST</> or <literal>FROM LAST</>
-    option for <function>nth_value</> is not implemented: only the
-    default <literal>FROM FIRST</> behavior is supported.  (You can achieve
-    the result of <literal>FROM LAST</> by reversing the <literal>ORDER BY</>
+    same as the standard's default, namely <literal>RESPECT NULLS</literal>.
+    Likewise, the standard's <literal>FROM FIRST</literal> or <literal>FROM LAST</literal>
+    option for <function>nth_value</function> is not implemented: only the
+    default <literal>FROM FIRST</literal> behavior is supported.  (You can achieve
+    the result of <literal>FROM LAST</literal> by reversing the <literal>ORDER BY</literal>
     ordering.)
    </para>
   </note>
 
   <para>
-   <function>cume_dist</> computes the fraction of partition rows that
+   <function>cume_dist</function> computes the fraction of partition rows that
    are less than or equal to the current row and its peers, while
-   <function>percent_rank</> computes the fraction of partition rows that
+   <function>percent_rank</function> computes the fraction of partition rows that
    are less than the current row, assuming the current row does not exist
    in the partition.
   </para>
@@ -14769,12 +14888,12 @@ EXISTS (<replaceable>subquery</replaceable>)
 </synopsis>
 
   <para>
-   The argument of <token>EXISTS</token> is an arbitrary <command>SELECT</> statement,
+   The argument of <token>EXISTS</token> is an arbitrary <command>SELECT</command> statement,
    or <firstterm>subquery</firstterm>.  The
    subquery is evaluated to determine whether it returns any rows.
    If it returns at least one row, the result of <token>EXISTS</token> is
-   <quote>true</>; if the subquery returns no rows, the result of <token>EXISTS</token>
-   is <quote>false</>.
+   <quote>true</quote>; if the subquery returns no rows, the result of <token>EXISTS</token>
+   is <quote>false</quote>.
   </para>
 
   <para>
@@ -14794,15 +14913,15 @@ EXISTS (<replaceable>subquery</replaceable>)
    Since the result depends only on whether any rows are returned,
    and not on the contents of those rows, the output list of the
    subquery is normally unimportant.  A common coding convention is
-   to write all <literal>EXISTS</> tests in the form
+   to write all <literal>EXISTS</literal> tests in the form
    <literal>EXISTS(SELECT 1 WHERE ...)</literal>.  There are exceptions to
    this rule however, such as subqueries that use <token>INTERSECT</token>.
   </para>
 
   <para>
-   This simple example is like an inner join on <literal>col2</>, but
-   it produces at most one output row for each <literal>tab1</> row,
-   even if there are several matching <literal>tab2</> rows:
+   This simple example is like an inner join on <literal>col2</literal>, but
+   it produces at most one output row for each <literal>tab1</literal> row,
+   even if there are several matching <literal>tab2</literal> rows:
 <screen>
 SELECT col1
 FROM tab1
@@ -14822,8 +14941,8 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
    The right-hand side is a parenthesized
    subquery, which must return exactly one column.  The left-hand expression
    is evaluated and compared to each row of the subquery result.
-   The result of <token>IN</token> is <quote>true</> if any equal subquery row is found.
-   The result is <quote>false</> if no equal row is found (including the
+   The result of <token>IN</token> is <quote>true</quote> if any equal subquery row is found.
+   The result is <quote>false</quote> if no equal row is found (including the
    case where the subquery returns no rows).
   </para>
 
@@ -14846,13 +14965,13 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
 
   <para>
    The left-hand side of this form of <token>IN</token> is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The right-hand side is a parenthesized
    subquery, which must return exactly as many columns as there are
    expressions in the left-hand row.  The left-hand expressions are
    evaluated and compared row-wise to each row of the subquery result.
-   The result of <token>IN</token> is <quote>true</> if any equal subquery row is found.
-   The result is <quote>false</> if no equal row is found (including the
+   The result of <token>IN</token> is <quote>true</quote> if any equal subquery row is found.
+   The result is <quote>false</quote> if no equal row is found (including the
    case where the subquery returns no rows).
   </para>
 
@@ -14878,9 +14997,9 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
    The right-hand side is a parenthesized
    subquery, which must return exactly one column.  The left-hand expression
    is evaluated and compared to each row of the subquery result.
-   The result of <token>NOT IN</token> is <quote>true</> if only unequal subquery rows
+   The result of <token>NOT IN</token> is <quote>true</quote> if only unequal subquery rows
    are found (including the case where the subquery returns no rows).
-   The result is <quote>false</> if any equal row is found.
+   The result is <quote>false</quote> if any equal row is found.
   </para>
 
   <para>
@@ -14902,14 +15021,14 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
 
   <para>
    The left-hand side of this form of <token>NOT IN</token> is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The right-hand side is a parenthesized
    subquery, which must return exactly as many columns as there are
    expressions in the left-hand row.  The left-hand expressions are
    evaluated and compared row-wise to each row of the subquery result.
-   The result of <token>NOT IN</token> is <quote>true</> if only unequal subquery rows
+   The result of <token>NOT IN</token> is <quote>true</quote> if only unequal subquery rows
    are found (including the case where the subquery returns no rows).
-   The result is <quote>false</> if any equal row is found.
+   The result is <quote>false</quote> if any equal row is found.
   </para>
 
   <para>
@@ -14937,8 +15056,8 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
    is evaluated and compared to each row of the subquery result using the
    given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
-   The result of <token>ANY</token> is <quote>true</> if any true result is obtained.
-   The result is <quote>false</> if no true result is found (including the
+   The result of <token>ANY</token> is <quote>true</quote> if any true result is obtained.
+   The result is <quote>false</quote> if no true result is found (including the
    case where the subquery returns no rows).
   </para>
 
@@ -14961,21 +15080,21 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
   </para>
 
 <synopsis>
-<replaceable>row_constructor</replaceable> <replaceable>operator</> ANY (<replaceable>subquery</replaceable>)
-<replaceable>row_constructor</replaceable> <replaceable>operator</> SOME (<replaceable>subquery</replaceable>)
+<replaceable>row_constructor</replaceable> <replaceable>operator</replaceable> ANY (<replaceable>subquery</replaceable>)
+<replaceable>row_constructor</replaceable> <replaceable>operator</replaceable> SOME (<replaceable>subquery</replaceable>)
 </synopsis>
 
   <para>
    The left-hand side of this form of <token>ANY</token> is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The right-hand side is a parenthesized
    subquery, which must return exactly as many columns as there are
    expressions in the left-hand row.  The left-hand expressions are
    evaluated and compared row-wise to each row of the subquery result,
    using the given <replaceable>operator</replaceable>.
-   The result of <token>ANY</token> is <quote>true</> if the comparison
+   The result of <token>ANY</token> is <quote>true</quote> if the comparison
    returns true for any subquery row.
-   The result is <quote>false</> if the comparison returns false for every
+   The result is <quote>false</quote> if the comparison returns false for every
    subquery row (including the case where the subquery returns no
    rows).
    The result is NULL if the comparison does not return true for any row,
@@ -14983,7 +15102,7 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
   </para>
 
   <para>
-   See <xref linkend="row-wise-comparison"> for details about the meaning
+   See <xref linkend="row-wise-comparison"/> for details about the meaning
    of a row constructor comparison.
   </para>
   </sect2>
@@ -15001,9 +15120,9 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
    is evaluated and compared to each row of the subquery result using the
    given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
-   The result of <token>ALL</token> is <quote>true</> if all rows yield true
+   The result of <token>ALL</token> is <quote>true</quote> if all rows yield true
    (including the case where the subquery returns no rows).
-   The result is <quote>false</> if any false result is found.
+   The result is <quote>false</quote> if any false result is found.
    The result is NULL if the comparison does not return false for any row,
    and it returns NULL for at least one row.
   </para>
@@ -15023,23 +15142,23 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
 
   <para>
    The left-hand side of this form of <token>ALL</token> is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The right-hand side is a parenthesized
    subquery, which must return exactly as many columns as there are
    expressions in the left-hand row.  The left-hand expressions are
    evaluated and compared row-wise to each row of the subquery result,
    using the given <replaceable>operator</replaceable>.
-   The result of <token>ALL</token> is <quote>true</> if the comparison
+   The result of <token>ALL</token> is <quote>true</quote> if the comparison
    returns true for all subquery rows (including the
    case where the subquery returns no rows).
-   The result is <quote>false</> if the comparison returns false for any
+   The result is <quote>false</quote> if the comparison returns false for any
    subquery row.
    The result is NULL if the comparison does not return false for any
    subquery row, and it returns NULL for at least one row.
   </para>
 
   <para>
-   See <xref linkend="row-wise-comparison"> for details about the meaning
+   See <xref linkend="row-wise-comparison"/> for details about the meaning
    of a row constructor comparison.
   </para>
   </sect2>
@@ -15058,7 +15177,7 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
 
   <para>
    The left-hand side is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The right-hand side is a parenthesized subquery, which must return exactly
    as many columns as there are expressions in the left-hand row. Furthermore,
    the subquery cannot return more than one row.  (If it returns zero rows,
@@ -15067,7 +15186,7 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
   </para>
 
   <para>
-   See <xref linkend="row-wise-comparison"> for details about the meaning
+   See <xref linkend="row-wise-comparison"/> for details about the meaning
    of a row constructor comparison.
   </para>
   </sect2>
@@ -15145,7 +15264,7 @@ WHERE EXISTS (SELECT 1 FROM tab2 WHERE col2 = tab1.col2);
 
   <para>
    The right-hand side is a parenthesized list
-   of scalar expressions.  The result is <quote>true</> if the left-hand expression's
+   of scalar expressions.  The result is <quote>true</quote> if the left-hand expression's
    result is equal to any of the right-hand expressions.  This is a shorthand
    notation for
 
@@ -15223,8 +15342,8 @@ AND
    is evaluated and compared to each element of the array using the
    given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
-   The result of <token>ANY</token> is <quote>true</> if any true result is obtained.
-   The result is <quote>false</> if no true result is found (including the
+   The result of <token>ANY</token> is <quote>true</quote> if any true result is obtained.
+   The result is <quote>false</quote> if no true result is found (including the
    case where the array has zero elements).
   </para>
 
@@ -15259,9 +15378,9 @@ AND
    is evaluated and compared to each element of the array using the
    given <replaceable>operator</replaceable>, which must yield a Boolean
    result.
-   The result of <token>ALL</token> is <quote>true</> if all comparisons yield true
+   The result of <token>ALL</token> is <quote>true</quote> if all comparisons yield true
    (including the case where the array has zero elements).
-   The result is <quote>false</> if any false result is found.
+   The result is <quote>false</quote> if any false result is found.
   </para>
 
   <para>
@@ -15286,16 +15405,16 @@ AND
 
   <para>
    Each side is a row constructor,
-   as described in <xref linkend="sql-syntax-row-constructors">.
+   as described in <xref linkend="sql-syntax-row-constructors"/>.
    The two row values must have the same number of fields.
    Each side is evaluated and they are compared row-wise.  Row constructor
    comparisons are allowed when the <replaceable>operator</replaceable> is
-   <literal>=</>,
-   <literal>&lt;&gt;</>,
-   <literal>&lt;</>,
-   <literal>&lt;=</>,
-   <literal>&gt;</> or
-   <literal>&gt;=</>.
+   <literal>=</literal>,
+   <literal>&lt;&gt;</literal>,
+   <literal>&lt;</literal>,
+   <literal>&lt;=</literal>,
+   <literal>&gt;</literal> or
+   <literal>&gt;=</literal>.
    Every row element must be of a type which has a default B-tree operator
    class or the attempted comparison may generate an error.
   </para>
@@ -15308,7 +15427,7 @@ AND
   </note>
 
   <para>
-   The <literal>=</> and <literal>&lt;&gt;</> cases work slightly differently
+   The <literal>=</literal> and <literal>&lt;&gt;</literal> cases work slightly differently
    from the others.  Two rows are considered
    equal if all their corresponding members are non-null and equal; the rows
    are unequal if any corresponding members are non-null and unequal;
@@ -15316,13 +15435,13 @@ AND
   </para>
 
   <para>
-   For the <literal>&lt;</>, <literal>&lt;=</>, <literal>&gt;</> and
-   <literal>&gt;=</> cases, the row elements are compared left-to-right,
+   For the <literal>&lt;</literal>, <literal>&lt;=</literal>, <literal>&gt;</literal> and
+   <literal>&gt;=</literal> cases, the row elements are compared left-to-right,
    stopping as soon as an unequal or null pair of elements is found.
    If either of this pair of elements is null, the result of the
    row comparison is unknown (null); otherwise comparison of this pair
    of elements determines the result.  For example,
-   <literal>ROW(1,2,NULL) &lt; ROW(1,3,0)</>
+   <literal>ROW(1,2,NULL) &lt; ROW(1,3,0)</literal>
    yields true, not null, because the third pair of elements are not
    considered.
   </para>
@@ -15330,13 +15449,13 @@ AND
   <note>
    <para>
     Prior to <productname>PostgreSQL</productname> 8.2, the
-    <literal>&lt;</>, <literal>&lt;=</>, <literal>&gt;</> and <literal>&gt;=</>
+    <literal>&lt;</literal>, <literal>&lt;=</literal>, <literal>&gt;</literal> and <literal>&gt;=</literal>
     cases were not handled per SQL specification.  A comparison like
-    <literal>ROW(a,b) &lt; ROW(c,d)</>
+    <literal>ROW(a,b) &lt; ROW(c,d)</literal>
     was implemented as
-    <literal>a &lt; c AND b &lt; d</>
+    <literal>a &lt; c AND b &lt; d</literal>
     whereas the correct behavior is equivalent to
-    <literal>a &lt; c OR (a = c AND b &lt; d)</>.
+    <literal>a &lt; c OR (a = c AND b &lt; d)</literal>.
    </para>
   </note>
 
@@ -15378,8 +15497,8 @@ AND
    result depends on comparing two NULL values or a NULL and a non-NULL.
    <productname>PostgreSQL</productname> does this only when comparing the
    results of two row constructors (as in
-   <xref linkend="row-wise-comparison">) or comparing a row constructor
-   to the output of a subquery (as in <xref linkend="functions-subquery">).
+   <xref linkend="row-wise-comparison"/>) or comparing a row constructor
+   to the output of a subquery (as in <xref linkend="functions-subquery"/>).
    In other contexts where two composite-type values are compared, two
    NULL field values are considered equal, and a NULL is considered larger
    than a non-NULL.  This is necessary in order to have consistent sorting
@@ -15389,30 +15508,30 @@ AND
   <para>
    Each side is evaluated and they are compared row-wise.  Composite type
    comparisons are allowed when the <replaceable>operator</replaceable> is
-   <literal>=</>,
-   <literal>&lt;&gt;</>,
-   <literal>&lt;</>,
-   <literal>&lt;=</>,
-   <literal>&gt;</> or
-   <literal>&gt;=</>,
+   <literal>=</literal>,
+   <literal>&lt;&gt;</literal>,
+   <literal>&lt;</literal>,
+   <literal>&lt;=</literal>,
+   <literal>&gt;</literal> or
+   <literal>&gt;=</literal>,
    or has semantics similar to one of these.  (To be specific, an operator
    can be a row comparison operator if it is a member of a B-tree operator
-   class, or is the negator of the <literal>=</> member of a B-tree operator
+   class, or is the negator of the <literal>=</literal> member of a B-tree operator
    class.)  The default behavior of the above operators is the same as for
    <literal>IS [ NOT ] DISTINCT FROM</literal> for row constructors (see
-   <xref linkend="row-wise-comparison">).
+   <xref linkend="row-wise-comparison"/>).
   </para>
 
   <para>
    To support matching of rows which include elements without a default
    B-tree operator class, the following operators are defined for composite
    type comparison:
-   <literal>*=</>,
-   <literal>*&lt;&gt;</>,
-   <literal>*&lt;</>,
-   <literal>*&lt;=</>,
-   <literal>*&gt;</>, and
-   <literal>*&gt;=</>.
+   <literal>*=</literal>,
+   <literal>*&lt;&gt;</literal>,
+   <literal>*&lt;</literal>,
+   <literal>*&lt;=</literal>,
+   <literal>*&gt;</literal>, and
+   <literal>*&gt;=</literal>.
    These operators compare the internal binary representation of the two
    rows.  Two rows might have a different binary representation even
    though comparisons of the two rows with the equality operator is true.
@@ -15440,10 +15559,10 @@ AND
   <para>
    This section describes functions that possibly return more than one row.
    The most widely used functions in this class are series generating
-   functions, as detailed in <xref linkend="functions-srf-series"> and
-   <xref linkend="functions-srf-subscripts">.  Other, more specialized
+   functions, as detailed in <xref linkend="functions-srf-series"/> and
+   <xref linkend="functions-srf-subscripts"/>.  Other, more specialized
    set-returning functions are described elsewhere in this manual.
-   See <xref linkend="queries-tablefunctions"> for ways to combine multiple
+   See <xref linkend="queries-tablefunctions"/> for ways to combine multiple
    set-returning functions.
   </para>
 
@@ -15481,7 +15600,7 @@ AND
      </row>
 
      <row>
-      <entry><literal><function>generate_series(<parameter>start</parameter>, <parameter>stop</parameter>, <parameter>step</parameter> <type>interval</>)</function></literal></entry>
+      <entry><literal><function>generate_series(<parameter>start</parameter>, <parameter>stop</parameter>, <parameter>step</parameter> <type>interval</type>)</function></literal></entry>
       <entry><type>timestamp</type> or <type>timestamp with time zone</type></entry>
       <entry><type>setof timestamp</type> or <type>setof timestamp with time zone</type> (same as argument type)</entry>
       <entry>
@@ -15596,7 +15715,7 @@ SELECT * FROM generate_series('2008-03-01 00:00'::timestamp,
   </indexterm>
 
   <para>
-   <function>generate_subscripts</> is a convenience function that generates
+   <function>generate_subscripts</function> is a convenience function that generates
    the set of valid subscripts for the specified dimension of the given
    array.
    Zero rows are returned for arrays that do not have the requested dimension,
@@ -15661,7 +15780,7 @@ SELECT * FROM unnest2(ARRAY[[1,2],[3,4]]);
    by <literal>WITH ORDINALITY</literal>, a <type>bigint</type> column is
    appended to the output which starts from 1 and increments by 1 for each row
    of the function's output.  This is most useful in the case of set returning
-   functions such as <function>unnest()</>.
+   functions such as <function>unnest()</function>.
 
 <programlisting>
 -- set returning function WITH ORDINALITY
@@ -15697,14 +15816,14 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
   <title>System Information Functions</title>
 
   <para>
-   <xref linkend="functions-info-session-table"> shows several
+   <xref linkend="functions-info-session-table"/> shows several
    functions that extract session and system information.
   </para>
 
   <para>
    In addition to the functions listed in this section, there are a number of
    functions related to the statistics system that also provide system
-   information. See <xref linkend="monitoring-stats-views"> for more
+   information. See <xref linkend="monitoring-stats-views"/> for more
    information.
   </para>
 
@@ -15805,7 +15924,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
       </row>
 
       <row>
-       <entry><literal><function>pg_current_logfile(<optional><type>text</></optional>)</function></literal></entry>
+       <entry><literal><function>pg_current_logfile(<optional><type>text</type></optional>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>Primary log file name, or log in the requested format,
        currently in use by the logging collector</entry>
@@ -15850,7 +15969,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
       <row>
        <entry><literal><function>pg_trigger_depth()</function></literal></entry>
        <entry><type>int</type></entry>
-       <entry>current nesting level of <productname>PostgreSQL</> triggers
+       <entry>current nesting level of <productname>PostgreSQL</productname> triggers
        (0 if not called, directly or indirectly, from inside a trigger)</entry>
       </row>
 
@@ -15869,7 +15988,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
       <row>
        <entry><literal><function>version()</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry><productname>PostgreSQL</> version information. See also <xref linkend="guc-server-version-num"> for a machine-readable version.</entry>
+       <entry><productname>PostgreSQL</productname> version information. See also <xref linkend="guc-server-version-num"/> for a machine-readable version.</entry>
       </row>
      </tbody>
     </tgroup>
@@ -15947,11 +16066,11 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
    <para>
     The <function>session_user</function> is normally the user who initiated
     the current database connection; but superusers can change this setting
-    with <xref linkend="sql-set-session-authorization">.
+    with <xref linkend="sql-set-session-authorization"/>.
     The <function>current_user</function> is the user identifier
     that is applicable for permission checking. Normally it is equal
     to the session user, but it can be changed with
-    <xref linkend="sql-set-role">.
+    <xref linkend="sql-set-role"/>.
     It also changes during the execution of
     functions with the attribute <literal>SECURITY DEFINER</literal>.
     In Unix parlance, the session user is the <quote>real user</quote> and
@@ -15959,7 +16078,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
     <function>current_role</function> and <function>user</function> are
     synonyms for <function>current_user</function>.  (The SQL standard draws
     a distinction between <function>current_role</function>
-    and <function>current_user</function>, but <productname>PostgreSQL</>
+    and <function>current_user</function>, but <productname>PostgreSQL</productname>
     does not, since it unifies users and roles into a single kind of entity.)
    </para>
 
@@ -15970,7 +16089,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
     other named objects that are created without specifying a target schema.
     <function>current_schemas(boolean)</function> returns an array of the names of all
     schemas presently in the search path.  The Boolean option determines whether or not
-    implicitly included system schemas such as <literal>pg_catalog</> are included in the
+    implicitly included system schemas such as <literal>pg_catalog</literal> are included in the
     returned search path.
    </para>
 
@@ -15978,7 +16097,7 @@ SELECT * FROM pg_ls_dir('.') WITH ORDINALITY AS t(ls,n);
     <para>
      The search path can be altered at run time.  The command is:
 <programlisting>
-SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ...</optional>
+SET search_path TO <replaceable>schema</replaceable> <optional>, <replaceable>schema</replaceable>, ...</optional>
 </programlisting>
     </para>
    </note>
@@ -16023,7 +16142,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     waiting for a lock that would conflict with the blocked process's lock
     request and is ahead of it in the wait queue (soft block).  When using
     parallel queries the result always lists client-visible process IDs (that
-    is, <function>pg_backend_pid</> results) even if the actual lock is held
+    is, <function>pg_backend_pid</function> results) even if the actual lock is held
     or awaited by a child worker process.  As a result of that, there may be
     duplicated PIDs in the result.  Also note that when a prepared transaction
     holds a conflicting lock, it will be represented by a zero process ID in
@@ -16070,20 +16189,20 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
    <para>
     <function>pg_current_logfile</function> returns, as <type>text</type>,
     the path of the log file(s) currently in use by the logging collector.
-    The path includes the <xref linkend="guc-log-directory"> directory
+    The path includes the <xref linkend="guc-log-directory"/> directory
     and the log file name.  Log collection must be enabled or the return value
     is <literal>NULL</literal>.  When multiple log files exist, each in a
     different format, <function>pg_current_logfile</function> called
     without arguments returns the path of the file having the first format
-    found in the ordered list: <systemitem>stderr</>, <systemitem>csvlog</>.
+    found in the ordered list: <systemitem>stderr</systemitem>, <systemitem>csvlog</systemitem>.
     <literal>NULL</literal> is returned when no log file has any of these
     formats.  To request a specific file format supply, as <type>text</type>,
-    either <systemitem>csvlog</> or <systemitem>stderr</> as the value of the
+    either <systemitem>csvlog</systemitem> or <systemitem>stderr</systemitem> as the value of the
     optional parameter. The return value is <literal>NULL</literal> when the
     log format requested is not a configured
-    <xref linkend="guc-log-destination">.  The
+    <xref linkend="guc-log-destination"/>.  The
     <function>pg_current_logfiles</function> reflects the contents of the
-    <filename>current_logfiles</> file.
+    <filename>current_logfiles</filename> file.
    </para>
 
    <indexterm>
@@ -16119,7 +16238,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     fraction of the total available space for notifications currently
     occupied by notifications that are waiting to be processed, as a
     <type>double</type> in the range 0-1.
-    See <xref linkend="sql-listen"> and <xref linkend="sql-notify">
+    See <xref linkend="sql-listen"/> and <xref linkend="sql-notify"/>
     for more information.
    </para>
 
@@ -16145,7 +16264,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     running a <literal>SERIALIZABLE</literal> transaction blocks
     a <literal>SERIALIZABLE READ ONLY DEFERRABLE</literal> transaction from
     acquiring a snapshot until the latter determines that it is safe to avoid
-    taking any predicate locks.  See <xref linkend="xact-serializable"> for
+    taking any predicate locks.  See <xref linkend="xact-serializable"/> for
     more information about serializable and deferrable transactions.  Frequent
     calls to this function could have some impact on database performance,
     because it needs access to the predicate lock manager's shared
@@ -16159,10 +16278,10 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
    <para>
     <function>version</function> returns a string describing the
     <productname>PostgreSQL</productname> server's version. You can also
-    get this information from <xref linkend="guc-server-version"> or
-    for a machine-readable version, <xref linkend="guc-server-version-num">.
+    get this information from <xref linkend="guc-server-version"/> or
+    for a machine-readable version, <xref linkend="guc-server-version-num"/>.
     Software developers should use <literal>server_version_num</literal>
-    (available since 8.2) or <xref linkend="libpq-pqserverversion"> instead
+    (available since 8.2) or <xref linkend="libpq-pqserverversion"/> instead
     of parsing the text version.
    </para>
 
@@ -16172,9 +16291,9 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
   </indexterm>
 
   <para>
-   <xref linkend="functions-info-access-table"> lists functions that
+   <xref linkend="functions-info-access-table"/> lists functions that
    allow the user to query object access privileges programmatically.
-   See <xref linkend="ddl-priv"> for more information about
+   See <xref linkend="ddl-priv"/> for more information about
    privileges.
   </para>
 
@@ -16440,7 +16559,7 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     <function>has_table_privilege</function> checks whether a user
     can access a table in a particular way.  The user can be
     specified by name, by OID (<literal>pg_authid.oid</literal>),
-    <literal>public</> to indicate the PUBLIC pseudo-role, or if the argument is
+    <literal>public</literal> to indicate the PUBLIC pseudo-role, or if the argument is
     omitted
     <function>current_user</function> is assumed.  The table can be specified
     by name or by OID.  (Thus, there are actually six variants of
@@ -16450,12 +16569,12 @@ SET search_path TO <replaceable>schema</> <optional>, <replaceable>schema</>, ..
     The desired access privilege type
     is specified by a text string, which must evaluate to one of the
     values <literal>SELECT</literal>, <literal>INSERT</literal>,
-    <literal>UPDATE</literal>, <literal>DELETE</literal>, <literal>TRUNCATE</>,
+    <literal>UPDATE</literal>, <literal>DELETE</literal>, <literal>TRUNCATE</literal>,
     <literal>REFERENCES</literal>, or <literal>TRIGGER</literal>.  Optionally,
-    <literal>WITH GRANT OPTION</> can be added to a privilege type to test
+    <literal>WITH GRANT OPTION</literal> can be added to a privilege type to test
     whether the privilege is held with grant option.  Also, multiple privilege
     types can be listed separated by commas, in which case the result will
-    be <literal>true</> if any of the listed privileges is held.
+    be <literal>true</literal> if any of the listed privileges is held.
     (Case of the privilege string is not significant, and extra whitespace
     is allowed between but not within privilege names.)
     Some examples:
@@ -16479,7 +16598,7 @@ SELECT has_table_privilege('joe', 'mytable', 'INSERT, SELECT WITH GRANT OPTION')
     <function>has_any_column_privilege</function> checks whether a user can
     access any column of a table in a particular way.
     Its argument possibilities
-    are analogous to <function>has_table_privilege</>,
+    are analogous to <function>has_table_privilege</function>,
     except that the desired access privilege type must evaluate to some
     combination of
     <literal>SELECT</literal>,
@@ -16488,8 +16607,8 @@ SELECT has_table_privilege('joe', 'mytable', 'INSERT, SELECT WITH GRANT OPTION')
     <literal>REFERENCES</literal>.  Note that having any of these privileges
     at the table level implicitly grants it for each column of the table,
     so <function>has_any_column_privilege</function> will always return
-    <literal>true</> if <function>has_table_privilege</> does for the same
-    arguments.  But <function>has_any_column_privilege</> also succeeds if
+    <literal>true</literal> if <function>has_table_privilege</function> does for the same
+    arguments.  But <function>has_any_column_privilege</function> also succeeds if
     there is a column-level grant of the privilege for at least one column.
    </para>
 
@@ -16527,8 +16646,8 @@ SELECT has_table_privilege('joe', 'mytable', 'INSERT, SELECT WITH GRANT OPTION')
     Its argument possibilities
     are analogous to <function>has_table_privilege</function>.
     When specifying a function by a text string rather than by OID,
-    the allowed input is the same as for the <type>regprocedure</> data type
-    (see <xref linkend="datatype-oid">).
+    the allowed input is the same as for the <type>regprocedure</type> data type
+    (see <xref linkend="datatype-oid"/>).
     The desired access privilege type must evaluate to
     <literal>EXECUTE</literal>.
     An example is:
@@ -16589,8 +16708,8 @@ SELECT has_function_privilege('joeuser', 'myfunc(int, text)', 'execute');
     Its argument possibilities
     are analogous to <function>has_table_privilege</function>.
     When specifying a type by a text string rather than by OID,
-    the allowed input is the same as for the <type>regtype</> data type
-    (see <xref linkend="datatype-oid">).
+    the allowed input is the same as for the <type>regtype</type> data type
+    (see <xref linkend="datatype-oid"/>).
     The desired access privilege type must evaluate to
     <literal>USAGE</literal>.
    </para>
@@ -16600,14 +16719,14 @@ SELECT has_function_privilege('joeuser', 'myfunc(int, text)', 'execute');
     can access a role in a particular way.
     Its argument possibilities
     are analogous to <function>has_table_privilege</function>,
-    except that <literal>public</> is not allowed as a user name.
+    except that <literal>public</literal> is not allowed as a user name.
     The desired access privilege type must evaluate to some combination of
     <literal>MEMBER</literal> or
     <literal>USAGE</literal>.
     <literal>MEMBER</literal> denotes direct or indirect membership in
-    the role (that is, the right to do <command>SET ROLE</>), while
+    the role (that is, the right to do <command>SET ROLE</command>), while
     <literal>USAGE</literal> denotes whether the privileges of the role
-    are immediately available without doing <command>SET ROLE</>.
+    are immediately available without doing <command>SET ROLE</command>.
    </para>
 
    <para>
@@ -16618,8 +16737,8 @@ SELECT has_function_privilege('joeuser', 'myfunc(int, text)', 'execute');
    </para>
 
   <para>
-   <xref linkend="functions-info-schema-table"> shows functions that
-   determine whether a certain object is <firstterm>visible</> in the
+   <xref linkend="functions-info-schema-table"/> shows functions that
+   determine whether a certain object is <firstterm>visible</firstterm> in the
    current schema search path.
    For example, a table is said to be visible if its
    containing schema is in the search path and no table of the same
@@ -16770,19 +16889,21 @@ SELECT relname FROM pg_class WHERE pg_table_is_visible(oid);
     Each function performs the visibility check for one type of database
     object.  Note that <function>pg_table_is_visible</function> can also be used
     with views, materialized views, indexes, sequences and foreign tables;
+    <function>pg_function_is_visible</function> can also be used with
+    procedures and aggregates;
     <function>pg_type_is_visible</function> can also be used with domains.
     For functions and operators, an object in
     the search path is visible if there is no object of the same name
-    <emphasis>and argument data type(s)</> earlier in the path.  For operator
+    <emphasis>and argument data type(s)</emphasis> earlier in the path.  For operator
     classes, both name and associated index access method are considered.
    </para>
 
    <para>
     All these functions require object OIDs to identify the object to be
     checked.  If you want to test an object by name, it is convenient to use
-    the OID alias types (<type>regclass</>, <type>regtype</>,
-    <type>regprocedure</>, <type>regoperator</>, <type>regconfig</>,
-    or <type>regdictionary</>),
+    the OID alias types (<type>regclass</type>, <type>regtype</type>,
+    <type>regprocedure</type>, <type>regoperator</type>, <type>regconfig</type>,
+    or <type>regdictionary</type>),
     for example:
 <programlisting>
 SELECT pg_type_is_visible('myschema.widget'::regtype);
@@ -16916,7 +17037,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
    </indexterm>
 
   <para>
-   <xref linkend="functions-info-catalog-table"> lists functions that
+   <xref linkend="functions-info-catalog-table"/> lists functions that
    extract information from the system catalogs.
   </para>
 
@@ -16929,7 +17050,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
 
      <tbody>
       <row>
-       <entry><literal><function>format_type(<parameter>type_oid</parameter>, <parameter>typemod</>)</function></literal></entry>
+       <entry><literal><function>format_type(<parameter>type_oid</parameter>, <parameter>typemod</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>get SQL name of a data type</entry>
       </row>
@@ -16939,18 +17060,18 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
        <entry>get definition of a constraint</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_constraintdef(<parameter>constraint_oid</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_constraintdef(<parameter>constraint_oid</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>get definition of a constraint</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_expr(<parameter>pg_node_tree</parameter>, <parameter>relation_oid</>)</function></literal></entry>
+       <entry><literal><function>pg_get_expr(<parameter>pg_node_tree</parameter>, <parameter>relation_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>decompile internal form of an expression, assuming that any Vars
        in it refer to the relation indicated by the second parameter</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_expr(<parameter>pg_node_tree</parameter>, <parameter>relation_oid</>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_expr(<parameter>pg_node_tree</parameter>, <parameter>relation_oid</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>decompile internal form of an expression, assuming that any Vars
        in it refer to the relation indicated by the second parameter</entry>
@@ -16958,34 +17079,34 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
       <row>
        <entry><literal><function>pg_get_functiondef(<parameter>func_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get definition of a function</entry>
+       <entry>get definition of a function or procedure</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_function_arguments(<parameter>func_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get argument list of function's definition (with default values)</entry>
+       <entry>get argument list of function's or procedure's definition (with default values)</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_function_identity_arguments(<parameter>func_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get argument list to identify a function (without default values)</entry>
+       <entry>get argument list to identify a function or procedure (without default values)</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_function_result(<parameter>func_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <literal>RETURNS</> clause for function</entry>
+       <entry>get <literal>RETURNS</literal> clause for function (returns null for a procedure)</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_indexdef(<parameter>index_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE INDEX</> command for index</entry>
+       <entry>get <command>CREATE INDEX</command> command for index</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_indexdef(<parameter>index_oid</parameter>, <parameter>column_no</>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_indexdef(<parameter>index_oid</parameter>, <parameter>column_no</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE INDEX</> command for index,
+       <entry>get <command>CREATE INDEX</command> command for index,
        or definition of just one index column when
-       <parameter>column_no</> is not zero</entry>
+       <parameter>column_no</parameter> is not zero</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_keywords()</function></literal></entry>
@@ -16995,33 +17116,32 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
       <row>
        <entry><literal><function>pg_get_ruledef(<parameter>rule_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE RULE</> command for rule</entry>
+       <entry>get <command>CREATE RULE</command> command for rule</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_ruledef(<parameter>rule_oid</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_ruledef(<parameter>rule_oid</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE RULE</> command for rule</entry>
+       <entry>get <command>CREATE RULE</command> command for rule</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_serial_sequence(<parameter>table_name</parameter>, <parameter>column_name</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get name of the sequence that a <type>serial</type>, <type>smallserial</type> or <type>bigserial</type> column
-       uses</entry>
+       <entry>get name of the sequence that a serial or identity column uses</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_statisticsobjdef(<parameter>statobj_oid</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE STATISTICS</> command for extended statistics object</entry>
+       <entry>get <command>CREATE STATISTICS</command> command for extended statistics object</entry>
       </row>
       <row>
        <entry><function>pg_get_triggerdef</function>(<parameter>trigger_oid</parameter>)</entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE [ CONSTRAINT ] TRIGGER</> command for trigger</entry>
+       <entry>get <command>CREATE [ CONSTRAINT ] TRIGGER</command> command for trigger</entry>
       </row>
       <row>
-       <entry><function>pg_get_triggerdef</function>(<parameter>trigger_oid</parameter>, <parameter>pretty_bool</>)</entry>
+       <entry><function>pg_get_triggerdef</function>(<parameter>trigger_oid</parameter>, <parameter>pretty_bool</parameter>)</entry>
        <entry><type>text</type></entry>
-       <entry>get <command>CREATE [ CONSTRAINT ] TRIGGER</> command for trigger</entry>
+       <entry>get <command>CREATE [ CONSTRAINT ] TRIGGER</command> command for trigger</entry>
       </row>
       <row>
        <entry><literal><function>pg_get_userbyid(<parameter>role_oid</parameter>)</function></literal></entry>
@@ -17034,7 +17154,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
        <entry>get underlying <command>SELECT</command> command for view or materialized view (<emphasis>deprecated</emphasis>)</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_viewdef(<parameter>view_name</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_viewdef(<parameter>view_name</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>get underlying <command>SELECT</command> command for view or materialized view (<emphasis>deprecated</emphasis>)</entry>
       </row>
@@ -17044,29 +17164,29 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
        <entry>get underlying <command>SELECT</command> command for view or materialized view</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>pretty_bool</>)</function></literal></entry>
+       <entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>pretty_bool</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>get underlying <command>SELECT</command> command for view or materialized view</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>wrap_column_int</>)</function></literal></entry>
+       <entry><literal><function>pg_get_viewdef(<parameter>view_oid</parameter>, <parameter>wrap_column_int</parameter>)</function></literal></entry>
        <entry><type>text</type></entry>
        <entry>get underlying <command>SELECT</command> command for view or
               materialized view; lines with fields are wrapped to specified
               number of columns, pretty-printing is implied</entry>
       </row>
       <row>
-       <entry><literal><function>pg_index_column_has_property(<parameter>index_oid</parameter>, <parameter>column_no</>, <parameter>prop_name</>)</function></literal></entry>
+       <entry><literal><function>pg_index_column_has_property(<parameter>index_oid</parameter>, <parameter>column_no</parameter>, <parameter>prop_name</parameter>)</function></literal></entry>
        <entry><type>boolean</type></entry>
        <entry>test whether an index column has a specified property</entry>
       </row>
       <row>
-       <entry><literal><function>pg_index_has_property(<parameter>index_oid</parameter>, <parameter>prop_name</>)</function></literal></entry>
+       <entry><literal><function>pg_index_has_property(<parameter>index_oid</parameter>, <parameter>prop_name</parameter>)</function></literal></entry>
        <entry><type>boolean</type></entry>
        <entry>test whether an index has a specified property</entry>
       </row>
       <row>
-       <entry><literal><function>pg_indexam_has_property(<parameter>am_oid</parameter>, <parameter>prop_name</>)</function></literal></entry>
+       <entry><literal><function>pg_indexam_has_property(<parameter>am_oid</parameter>, <parameter>prop_name</parameter>)</function></literal></entry>
        <entry><type>boolean</type></entry>
        <entry>test whether an index access method has a specified property</entry>
       </row>
@@ -17147,11 +17267,11 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
 
   <para>
    <function>pg_get_keywords</function> returns a set of records describing
-   the SQL keywords recognized by the server. The <structfield>word</> column
-   contains the keyword.  The <structfield>catcode</> column contains a
-   category code: <literal>U</> for unreserved, <literal>C</> for column name,
-   <literal>T</> for type or function name, or <literal>R</> for reserved.
-   The <structfield>catdesc</> column contains a possibly-localized string
+   the SQL keywords recognized by the server. The <structfield>word</structfield> column
+   contains the keyword.  The <structfield>catcode</structfield> column contains a
+   category code: <literal>U</literal> for unreserved, <literal>C</literal> for column name,
+   <literal>T</literal> for type or function name, or <literal>R</literal> for reserved.
+   The <structfield>catdesc</structfield> column contains a possibly-localized string
    describing the category.
   </para>
 
@@ -17168,45 +17288,53 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
    catalogs.  If the expression might contain Vars, specify the OID of the
    relation they refer to as the second parameter; if no Vars are expected,
    zero is sufficient. <function>pg_get_viewdef</function> reconstructs the
-   <command>SELECT</> query that defines a view. Most of these functions come
-   in two variants, one of which can optionally <quote>pretty-print</> the
+   <command>SELECT</command> query that defines a view. Most of these functions come
+   in two variants, one of which can optionally <quote>pretty-print</quote> the
    result.  The pretty-printed format is more readable, but the default format
    is more likely to be interpreted the same way by future versions of
-   <productname>PostgreSQL</>; avoid using pretty-printed output for dump
-   purposes.  Passing <literal>false</> for the pretty-print parameter yields
+   <productname>PostgreSQL</productname>; avoid using pretty-printed output for dump
+   purposes.  Passing <literal>false</literal> for the pretty-print parameter yields
    the same result as the variant that does not have the parameter at all.
   </para>
 
   <para>
-   <function>pg_get_functiondef</> returns a complete
-   <command>CREATE OR REPLACE FUNCTION</> statement for a function.
+   <function>pg_get_functiondef</function> returns a complete
+   <command>CREATE OR REPLACE FUNCTION</command> statement for a function.
    <function>pg_get_function_arguments</function> returns the argument list
    of a function, in the form it would need to appear in within
-   <command>CREATE FUNCTION</>.
+   <command>CREATE FUNCTION</command>.
    <function>pg_get_function_result</function> similarly returns the
-   appropriate <literal>RETURNS</> clause for the function.
+   appropriate <literal>RETURNS</literal> clause for the function.
    <function>pg_get_function_identity_arguments</function> returns the
    argument list necessary to identify a function, in the form it
-   would need to appear in within <command>ALTER FUNCTION</>, for
+   would need to appear in within <command>ALTER FUNCTION</command>, for
    instance.  This form omits default values.
   </para>
 
   <para>
    <function>pg_get_serial_sequence</function> returns the name of the
    sequence associated with a column, or NULL if no sequence is associated
-   with the column.  The first input parameter is a table name with
-   optional schema, and the second parameter is a column name.  Because
-   the first parameter is potentially a schema and table, it is not treated
-   as a double-quoted identifier, meaning it is lower cased by default,
-   while the second parameter, being just a column name, is treated as
-   double-quoted and has its case preserved.  The function returns a value
-   suitably formatted for passing to sequence functions (see <xref
-   linkend="functions-sequence">).  This association can be modified or
-   removed with <command>ALTER SEQUENCE OWNED BY</>.  (The function
-   probably should have been called
-   <function>pg_get_owned_sequence</function>; its current name reflects the fact
-   that it's typically used with <type>serial</> or <type>bigserial</>
-   columns.)
+   with the column.  If the column is an identity column, the associated
+   sequence is the sequence internally created for the identity column.  For
+   columns created using one of the serial types
+   (<type>serial</type>, <type>smallserial</type>, <type>bigserial</type>), it
+   is the sequence created for that serial column definition.  In the latter
+   case, this association can be modified or removed with <command>ALTER
+   SEQUENCE OWNED BY</command>.  (The function probably should have been called
+   <function>pg_get_owned_sequence</function>; its current name reflects the
+   fact that it has typically been used with <type>serial</type>
+   or <type>bigserial</type> columns.)  The first input parameter is a table name
+   with optional schema, and the second parameter is a column name.  Because
+   the first parameter is potentially a schema and table, it is not treated as
+   a double-quoted identifier, meaning it is lower cased by default, while the
+   second parameter, being just a column name, is treated as double-quoted and
+   has its case preserved.  The function returns a value suitably formatted
+   for passing to sequence functions
+   (see <xref linkend="functions-sequence"/>).  A typical use is in reading the
+   current value of a sequence for an identity or serial column, for example:
+<programlisting>
+SELECT currval(pg_get_serial_sequence('sometable', 'id'));
+</programlisting>
   </para>
 
   <para>
@@ -17222,9 +17350,9 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
    property. <literal>NULL</literal> is returned if the property name is not
    known or does not apply to the particular object, or if the OID or column
    number does not identify a valid object.  Refer to
-   <xref linkend="functions-info-index-column-props"> for column properties,
-   <xref linkend="functions-info-index-props"> for index properties, and
-   <xref linkend="functions-info-indexam-props"> for access method properties.
+   <xref linkend="functions-info-index-column-props"/> for column properties,
+   <xref linkend="functions-info-index-props"/> for index properties, and
+   <xref linkend="functions-info-indexam-props"/> for access method properties.
    (Note that extension access methods can define additional property names
    for their indexes.)
   </para>
@@ -17263,8 +17391,8 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
      </row>
      <row>
       <entry><literal>distance_orderable</literal></entry>
-      <entry>Can the column be scanned in order by a <quote>distance</>
-      operator, for example <literal>ORDER BY col &lt;-&gt; constant</> ?
+      <entry>Can the column be scanned in order by a <quote>distance</quote>
+      operator, for example <literal>ORDER BY col &lt;-&gt; constant</literal> ?
       </entry>
      </row>
      <row>
@@ -17274,14 +17402,14 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
      </row>
      <row>
       <entry><literal>search_array</literal></entry>
-      <entry>Does the column natively support <literal>col = ANY(array)</>
+      <entry>Does the column natively support <literal>col = ANY(array)</literal>
       searches?
       </entry>
      </row>
      <row>
       <entry><literal>search_nulls</literal></entry>
-      <entry>Does the column support <literal>IS NULL</> and
-      <literal>IS NOT NULL</> searches?
+      <entry>Does the column support <literal>IS NULL</literal> and
+      <literal>IS NOT NULL</literal> searches?
       </entry>
      </row>
     </tbody>
@@ -17297,7 +17425,7 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
     <tbody>
      <row>
       <entry><literal>clusterable</literal></entry>
-      <entry>Can the index be used in a <literal>CLUSTER</> command?
+      <entry>Can the index be used in a <literal>CLUSTER</literal> command?
       </entry>
      </row>
      <row>
@@ -17328,9 +17456,9 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
     <tbody>
      <row>
       <entry><literal>can_order</literal></entry>
-      <entry>Does the access method support <literal>ASC</>,
-      <literal>DESC</> and related keywords in
-      <literal>CREATE INDEX</>?
+      <entry>Does the access method support <literal>ASC</literal>,
+      <literal>DESC</literal> and related keywords in
+      <literal>CREATE INDEX</literal>?
       </entry>
      </row>
      <row>
@@ -17355,9 +17483,9 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
   <para>
    <function>pg_options_to_table</function> returns the set of storage
    option name/value pairs
-   (<replaceable>option_name</>/<replaceable>option_value</>) when passed
-   <structname>pg_class</>.<structfield>reloptions</> or
-   <structname>pg_attribute</>.<structfield>attoptions</>.
+   (<replaceable>option_name</replaceable>/<replaceable>option_value</replaceable>) when passed
+   <structname>pg_class</structname>.<structfield>reloptions</structfield> or
+   <structname>pg_attribute</structname>.<structfield>attoptions</structfield>.
   </para>
 
   <para>
@@ -17367,15 +17495,15 @@ SELECT pg_type_is_visible('myschema.widget'::regtype);
    empty and cannot be dropped. To display the specific objects populating the
    tablespace, you will need to connect to the databases identified by
    <function>pg_tablespace_databases</function> and query their
-   <structname>pg_class</> catalogs.
+   <structname>pg_class</structname> catalogs.
   </para>
 
   <para>
    <function>pg_typeof</function> returns the OID of the data type of the
    value that is passed to it.  This can be helpful for troubleshooting or
    dynamically constructing SQL queries.  The function is declared as
-   returning <type>regtype</>, which is an OID alias type (see
-   <xref linkend="datatype-oid">); this means that it is the same as an
+   returning <type>regtype</type>, which is an OID alias type (see
+   <xref linkend="datatype-oid"/>); this means that it is the same as an
    OID for comparison purposes but displays as a type name.  For example:
 <programlisting>
 SELECT pg_typeof(33);
@@ -17420,10 +17548,10 @@ SELECT collation for ('foo' COLLATE "de_DE");
    <function>to_regoperator</function>, <function>to_regtype</function>,
    <function>to_regnamespace</function>, and <function>to_regrole</function>
    functions translate relation, function, operator, type, schema, and role
-   names (given as <type>text</>) to objects of
-   type <type>regclass</>, <type>regproc</>, <type>regprocedure</type>,
-   <type>regoper</>, <type>regoperator</type>, <type>regtype</>,
-   <type>regnamespace</>, and <type>regrole</>
+   names (given as <type>text</type>) to objects of
+   type <type>regclass</type>, <type>regproc</type>, <type>regprocedure</type>,
+   <type>regoper</type>, <type>regoperator</type>, <type>regtype</type>,
+   <type>regnamespace</type>, and <type>regrole</type>
    respectively.  These functions differ from a cast from
    text in that they don't accept a numeric OID, and that they return null
    rather than throwing an error if the name is not found (or, for
@@ -17448,7 +17576,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </indexterm>
 
   <para>
-   <xref linkend="functions-info-object-table"> lists functions related to
+   <xref linkend="functions-info-object-table"/> lists functions related to
    database object identification and addressing.
   </para>
 
@@ -17466,18 +17594,18 @@ SELECT collation for ('foo' COLLATE "de_DE");
        <entry>get description of a database object</entry>
       </row>
       <row>
-       <entry><literal><function>pg_identify_object(<parameter>catalog_id</parameter> <type>oid</>, <parameter>object_id</parameter> <type>oid</>, <parameter>object_sub_id</parameter> <type>integer</>)</function></literal></entry>
-       <entry><parameter>type</> <type>text</>, <parameter>schema</> <type>text</>, <parameter>name</> <type>text</>, <parameter>identity</> <type>text</></entry>
+       <entry><literal><function>pg_identify_object(<parameter>catalog_id</parameter> <type>oid</type>, <parameter>object_id</parameter> <type>oid</type>, <parameter>object_sub_id</parameter> <type>integer</type>)</function></literal></entry>
+       <entry><parameter>type</parameter> <type>text</type>, <parameter>schema</parameter> <type>text</type>, <parameter>name</parameter> <type>text</type>, <parameter>identity</parameter> <type>text</type></entry>
        <entry>get identity of a database object</entry>
       </row>
       <row>
-       <entry><literal><function>pg_identify_object_as_address(<parameter>catalog_id</parameter> <type>oid</>, <parameter>object_id</parameter> <type>oid</>, <parameter>object_sub_id</parameter> <type>integer</>)</function></literal></entry>
-       <entry><parameter>type</> <type>text</>, <parameter>name</> <type>text[]</>, <parameter>args</> <type>text[]</></entry>
+       <entry><literal><function>pg_identify_object_as_address(<parameter>catalog_id</parameter> <type>oid</type>, <parameter>object_id</parameter> <type>oid</type>, <parameter>object_sub_id</parameter> <type>integer</type>)</function></literal></entry>
+       <entry><parameter>type</parameter> <type>text</type>, <parameter>name</parameter> <type>text[]</type>, <parameter>args</parameter> <type>text[]</type></entry>
        <entry>get external representation of a database object's address</entry>
       </row>
       <row>
-       <entry><literal><function>pg_get_object_address(<parameter>type</parameter> <type>text</>, <parameter>name</parameter> <type>text[]</>, <parameter>args</parameter> <type>text[]</>)</function></literal></entry>
-       <entry><parameter>catalog_id</> <type>oid</>, <parameter>object_id</> <type>oid</>, <parameter>object_sub_id</> <type>int32</></entry>
+       <entry><literal><function>pg_get_object_address(<parameter>type</parameter> <type>text</type>, <parameter>name</parameter> <type>text[]</type>, <parameter>args</parameter> <type>text[]</type>)</function></literal></entry>
+       <entry><parameter>catalog_id</parameter> <type>oid</type>, <parameter>object_id</parameter> <type>oid</type>, <parameter>object_sub_id</parameter> <type>int32</type></entry>
        <entry>get address of a database object, from its external representation</entry>
       </row>
      </tbody>
@@ -17498,13 +17626,13 @@ SELECT collation for ('foo' COLLATE "de_DE");
    to uniquely identify the database object specified by catalog OID, object OID and a
    (possibly zero) sub-object ID.  This information is intended to be machine-readable,
    and is never translated.
-   <parameter>type</> identifies the type of database object;
-   <parameter>schema</> is the schema name that the object belongs in, or
-   <literal>NULL</> for object types that do not belong to schemas;
-   <parameter>name</> is the name of the object, quoted if necessary, only
+   <parameter>type</parameter> identifies the type of database object;
+   <parameter>schema</parameter> is the schema name that the object belongs in, or
+   <literal>NULL</literal> for object types that do not belong to schemas;
+   <parameter>name</parameter> is the name of the object, quoted if necessary, only
    present if it can be used (alongside schema name, if pertinent) as a unique
-   identifier of the object, otherwise <literal>NULL</>;
-   <parameter>identity</> is the complete object identity, with the precise format
+   identifier of the object, otherwise <literal>NULL</literal>;
+   <parameter>identity</parameter> is the complete object identity, with the precise format
    depending on object type, and each part within the format being
    schema-qualified and quoted as necessary.
   </para>
@@ -17515,10 +17643,10 @@ SELECT collation for ('foo' COLLATE "de_DE");
    catalog OID, object OID and a (possibly zero) sub-object ID.  The returned
    information is independent of the current server, that is, it could be used
    to identify an identically named object in another server.
-   <parameter>type</> identifies the type of database object;
-   <parameter>name</> and <parameter>args</> are text arrays that together
+   <parameter>type</parameter> identifies the type of database object;
+   <parameter>name</parameter> and <parameter>args</parameter> are text arrays that together
    form a reference to the object.  These three columns can be passed to
-   <function>pg_get_object_address</> to obtain the internal address
+   <function>pg_get_object_address</function> to obtain the internal address
    of the object.
    This function is the inverse of <function>pg_get_object_address</function>.
   </para>
@@ -17527,13 +17655,13 @@ SELECT collation for ('foo' COLLATE "de_DE");
    <function>pg_get_object_address</function> returns a row containing enough
    information to uniquely identify the database object specified by its
    type and object name and argument arrays.  The returned values are the
-   ones that would be used in system catalogs such as <structname>pg_depend</>
+   ones that would be used in system catalogs such as <structname>pg_depend</structname>
    and can be passed to other system functions such as
-   <function>pg_identify_object</> or <function>pg_describe_object</>.
-   <parameter>catalog_id</> is the OID of the system catalog containing the
+   <function>pg_identify_object</function> or <function>pg_describe_object</function>.
+   <parameter>catalog_id</parameter> is the OID of the system catalog containing the
    object;
-   <parameter>object_id</> is the OID of the object itself, and
-   <parameter>object_sub_id</> is the object sub-ID, or zero if none.
+   <parameter>object_id</parameter> is the OID of the object itself, and
+   <parameter>object_sub_id</parameter> is the object sub-ID, or zero if none.
    This function is the inverse of <function>pg_identify_object_as_address</function>.
   </para>
 
@@ -17555,8 +17683,8 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </indexterm>
 
    <para>
-    The functions shown in <xref linkend="functions-info-comment-table">
-    extract comments previously stored with the <xref linkend="sql-comment">
+    The functions shown in <xref linkend="functions-info-comment-table"/>
+    extract comments previously stored with the <xref linkend="sql-comment"/>
     command.  A null value is returned if no
     comment could be found for the specified parameters.
    </para>
@@ -17653,7 +17781,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </indexterm>
 
    <para>
-    The functions shown in <xref linkend="functions-txid-snapshot">
+    The functions shown in <xref linkend="functions-txid-snapshot"/>
     provide server transaction information in an exportable form.  The main
     use of these functions is to determine which transactions were committed
     between two snapshots.
@@ -17712,14 +17840,14 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    The internal transaction ID type (<type>xid</>) is 32 bits wide and
+    The internal transaction ID type (<type>xid</type>) is 32 bits wide and
     wraps around every 4 billion transactions.  However, these functions
-    export a 64-bit format that is extended with an <quote>epoch</> counter
+    export a 64-bit format that is extended with an <quote>epoch</quote> counter
     so it will not wrap around during the life of an installation.
     The data type used by these functions, <type>txid_snapshot</type>,
     stores information about transaction ID
     visibility at a particular moment in time.  Its components are
-    described in <xref linkend="functions-txid-snapshot-parts">.
+    described in <xref linkend="functions-txid-snapshot-parts"/>.
    </para>
 
    <table id="functions-txid-snapshot-parts">
@@ -17755,9 +17883,9 @@ SELECT collation for ('foo' COLLATE "de_DE");
        <entry><type>xip_list</type></entry>
        <entry>
         Active txids at the time of the snapshot.  The list
-        includes only those active txids between <literal>xmin</>
-        and <literal>xmax</>; there might be active txids higher
-        than <literal>xmax</>.  A txid that is <literal>xmin &lt;= txid &lt;
+        includes only those active txids between <literal>xmin</literal>
+        and <literal>xmax</literal>; there might be active txids higher
+        than <literal>xmax</literal>.  A txid that is <literal>xmin &lt;= txid &lt;
         xmax</literal> and not in this list was already completed
         at the time of the snapshot, and thus either visible or
         dead according to its commit status.  The list does not
@@ -17770,36 +17898,36 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    <type>txid_snapshot</>'s textual representation is
-    <literal><replaceable>xmin</>:<replaceable>xmax</>:<replaceable>xip_list</></literal>.
+    <type>txid_snapshot</type>'s textual representation is
+    <literal><replaceable>xmin</replaceable>:<replaceable>xmax</replaceable>:<replaceable>xip_list</replaceable></literal>.
     For example <literal>10:20:10,14,15</literal> means
     <literal>xmin=10, xmax=20, xip_list=10, 14, 15</literal>.
    </para>
 
    <para>
-    <function>txid_status(bigint)</> reports the commit status of a recent
+    <function>txid_status(bigint)</function> reports the commit status of a recent
     transaction.  Applications may use it to determine whether a transaction
     committed or aborted when the application and database server become
     disconnected while a <literal>COMMIT</literal> is in progress.
     The status of a transaction will be reported as either
-    <literal>in progress</>,
-    <literal>committed</>, or <literal>aborted</>, provided that the
+    <literal>in progress</literal>,
+    <literal>committed</literal>, or <literal>aborted</literal>, provided that the
     transaction is recent enough that the system retains the commit status
     of that transaction.  If is old enough that no references to that
     transaction survive in the system and the commit status information has
     been discarded, this function will return NULL.  Note that prepared
-    transactions are reported as <literal>in progress</>; applications must
+    transactions are reported as <literal>in progress</literal>; applications must
     check <link
-    linkend="view-pg-prepared-xacts"><literal>pg_prepared_xacts</></> if they
+    linkend="view-pg-prepared-xacts"><literal>pg_prepared_xacts</literal></link> if they
     need to determine whether the txid is a prepared transaction.
    </para>
 
    <para>
-    The functions shown in <xref linkend="functions-commit-timestamp">
+    The functions shown in <xref linkend="functions-commit-timestamp"/>
     provide information about transactions that have been already committed.
     These functions mainly provide information about when the transactions
     were committed. They only provide useful data when
-    <xref linkend="guc-track-commit-timestamp"> configuration option is enabled
+    <xref linkend="guc-track-commit-timestamp"/> configuration option is enabled
     and only for transactions that were committed after it was enabled.
    </para>
 
@@ -17825,7 +17953,7 @@ SELECT collation for ('foo' COLLATE "de_DE");
         <indexterm><primary>pg_last_committed_xact</primary></indexterm>
         <literal><function>pg_last_committed_xact()</function></literal>
        </entry>
-       <entry><parameter>xid</> <type>xid</>, <parameter>timestamp</> <type>timestamp with time zone</></entry>
+       <entry><parameter>xid</parameter> <type>xid</type>, <parameter>timestamp</parameter> <type>timestamp with time zone</type></entry>
        <entry>get transaction ID and commit timestamp of latest committed transaction</entry>
       </row>
      </tbody>
@@ -17833,13 +17961,13 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    The functions shown in <xref linkend="functions-controldata">
-    print information initialized during <command>initdb</>, such
+    The functions shown in <xref linkend="functions-controldata"/>
+    print information initialized during <command>initdb</command>, such
     as the catalog version. They also show information about write-ahead
     logging and checkpoint processing. This information is cluster-wide,
     and not specific to any one database. They provide most of the same
     information, from the same source, as
-    <xref linkend="APP-PGCONTROLDATA">, although in a form better suited
+    <xref linkend="app-pgcontroldata"/>, although in a form better suited
     to <acronym>SQL</acronym> functions.
    </para>
 
@@ -17900,12 +18028,12 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    <function>pg_control_checkpoint</> returns a record, shown in
-    <xref linkend="functions-pg-control-checkpoint">
+    <function>pg_control_checkpoint</function> returns a record, shown in
+    <xref linkend="functions-pg-control-checkpoint"/>
    </para>
 
    <table id="functions-pg-control-checkpoint">
-    <title><function>pg_control_checkpoint</> Columns</title>
+    <title><function>pg_control_checkpoint</function> Columns</title>
     <tgroup cols="2">
      <thead>
       <row>
@@ -17921,11 +18049,6 @@ SELECT collation for ('foo' COLLATE "de_DE");
        <entry><type>pg_lsn</type></entry>
       </row>
 
-      <row>
-       <entry><literal>prior_lsn</literal></entry>
-       <entry><type>pg_lsn</type></entry>
-      </row>
-
       <row>
        <entry><literal>redo_lsn</literal></entry>
        <entry><type>pg_lsn</type></entry>
@@ -18016,12 +18139,12 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    <function>pg_control_system</> returns a record, shown in
-    <xref linkend="functions-pg-control-system">
+    <function>pg_control_system</function> returns a record, shown in
+    <xref linkend="functions-pg-control-system"/>
    </para>
 
    <table id="functions-pg-control-system">
-    <title><function>pg_control_system</> Columns</title>
+    <title><function>pg_control_system</function> Columns</title>
     <tgroup cols="2">
      <thead>
       <row>
@@ -18057,12 +18180,12 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    <function>pg_control_init</> returns a record, shown in
-    <xref linkend="functions-pg-control-init">
+    <function>pg_control_init</function> returns a record, shown in
+    <xref linkend="functions-pg-control-init"/>
    </para>
 
    <table id="functions-pg-control-init">
-    <title><function>pg_control_init</> Columns</title>
+    <title><function>pg_control_init</function> Columns</title>
     <tgroup cols="2">
      <thead>
       <row>
@@ -18138,12 +18261,12 @@ SELECT collation for ('foo' COLLATE "de_DE");
    </table>
 
    <para>
-    <function>pg_control_recovery</> returns a record, shown in
-    <xref linkend="functions-pg-control-recovery">
+    <function>pg_control_recovery</function> returns a record, shown in
+    <xref linkend="functions-pg-control-recovery"/>
    </para>
 
    <table id="functions-pg-control-recovery">
-    <title><function>pg_control_recovery</> Columns</title>
+    <title><function>pg_control_recovery</function> Columns</title>
     <tgroup cols="2">
      <thead>
       <row>
@@ -18190,14 +18313,14 @@ SELECT collation for ('foo' COLLATE "de_DE");
 
    <para>
     The functions described in this section are used to control and
-    monitor a <productname>PostgreSQL</> installation.
+    monitor a <productname>PostgreSQL</productname> installation.
    </para>
 
   <sect2 id="functions-admin-set">
    <title>Configuration Settings Functions</title>
 
    <para>
-    <xref linkend="functions-admin-set-table"> shows the functions
+    <xref linkend="functions-admin-set-table"/> shows the functions
     available to query and alter run-time configuration parameters.
    </para>
 
@@ -18313,7 +18436,7 @@ SELECT set_config('log_statement_stats', 'off', false);
 
    <para>
     The functions shown in <xref
-    linkend="functions-admin-signal-table"> send control signals to
+    linkend="functions-admin-signal-table"/> send control signals to
     other server processes.  Use of these functions is restricted to
     superusers by default but access may be granted to others using
     <command>GRANT</command>, with noted exceptions.
@@ -18330,7 +18453,7 @@ SELECT set_config('log_statement_stats', 'off', false);
      <tbody>
       <row>
        <entry>
-        <literal><function>pg_cancel_backend(<parameter>pid</parameter> <type>int</>)</function></literal>
+        <literal><function>pg_cancel_backend(<parameter>pid</parameter> <type>int</type>)</function></literal>
         </entry>
        <entry><type>boolean</type></entry>
        <entry>Cancel a backend's current query.  This is also allowed if the
@@ -18355,7 +18478,7 @@ SELECT set_config('log_statement_stats', 'off', false);
       </row>
       <row>
        <entry>
-        <literal><function>pg_terminate_backend(<parameter>pid</parameter> <type>int</>)</function></literal>
+        <literal><function>pg_terminate_backend(<parameter>pid</parameter> <type>int</type>)</function></literal>
         </entry>
        <entry><type>boolean</type></entry>
        <entry>Terminate a backend.  This is also allowed if the calling role
@@ -18374,28 +18497,28 @@ SELECT set_config('log_statement_stats', 'off', false);
    </para>
 
    <para>
-    <function>pg_cancel_backend</> and <function>pg_terminate_backend</>
-    send signals (<systemitem>SIGINT</> or <systemitem>SIGTERM</>
+    <function>pg_cancel_backend</function> and <function>pg_terminate_backend</function>
+    send signals (<systemitem>SIGINT</systemitem> or <systemitem>SIGTERM</systemitem>
     respectively) to backend processes identified by process ID.
     The process ID of an active backend can be found from
     the <structfield>pid</structfield> column of the
     <structname>pg_stat_activity</structname> view, or by listing the
     <command>postgres</command> processes on the server (using
-    <application>ps</> on Unix or the <application>Task
-    Manager</> on <productname>Windows</>).
+    <application>ps</application> on Unix or the <application>Task
+    Manager</application> on <productname>Windows</productname>).
     The role of an active backend can be found from the
     <structfield>usename</structfield> column of the
     <structname>pg_stat_activity</structname> view.
    </para>
 
    <para>
-    <function>pg_reload_conf</> sends a <systemitem>SIGHUP</> signal
+    <function>pg_reload_conf</function> sends a <systemitem>SIGHUP</systemitem> signal
     to the server, causing configuration files
     to be reloaded by all server processes.
    </para>
 
    <para>
-    <function>pg_rotate_logfile</> signals the log-file manager to switch
+    <function>pg_rotate_logfile</function> signals the log-file manager to switch
     to a new output file immediately.  This works only when the built-in
     log collector is running, since otherwise there is no log-file manager
     subprocess.
@@ -18448,7 +18571,7 @@ SELECT set_config('log_statement_stats', 'off', false);
 
    <para>
     The functions shown in <xref
-    linkend="functions-admin-backup-table"> assist in making on-line backups.
+    linkend="functions-admin-backup-table"/> assist in making on-line backups.
     These functions cannot be executed during recovery (except
     <function>pg_is_in_backup</function>, <function>pg_backup_start_time</function>
     and <function>pg_wal_lsn_diff</function>).
@@ -18465,7 +18588,7 @@ SELECT set_config('log_statement_stats', 'off', false);
      <tbody>
       <row>
        <entry>
-        <literal><function>pg_create_restore_point(<parameter>name</> <type>text</>)</function></literal>
+        <literal><function>pg_create_restore_point(<parameter>name</parameter> <type>text</type>)</function></literal>
         </entry>
        <entry><type>pg_lsn</type></entry>
        <entry>Create a named point for performing restore (restricted to superusers by default, but other users can be granted EXECUTE to run the function)</entry>
@@ -18493,7 +18616,7 @@ SELECT set_config('log_statement_stats', 'off', false);
       </row>
       <row>
        <entry>
-        <literal><function>pg_start_backup(<parameter>label</> <type>text</> <optional>, <parameter>fast</> <type>boolean</> <optional>, <parameter>exclusive</> <type>boolean</> </optional></optional>)</function></literal>
+        <literal><function>pg_start_backup(<parameter>label</parameter> <type>text</type> <optional>, <parameter>fast</parameter> <type>boolean</type> <optional>, <parameter>exclusive</parameter> <type>boolean</type> </optional></optional>)</function></literal>
         </entry>
        <entry><type>pg_lsn</type></entry>
        <entry>Prepare for performing on-line backup (restricted to superusers by default, but other users can be granted EXECUTE to run the function)</entry>
@@ -18507,7 +18630,7 @@ SELECT set_config('log_statement_stats', 'off', false);
       </row>
       <row>
        <entry>
-        <literal><function>pg_stop_backup(<parameter>exclusive</> <type>boolean</> <optional>, <parameter>wait_for_archive</> <type>boolean</> </optional>)</function></literal>
+        <literal><function>pg_stop_backup(<parameter>exclusive</parameter> <type>boolean</type> <optional>, <parameter>wait_for_archive</parameter> <type>boolean</type> </optional>)</function></literal>
         </entry>
        <entry><type>setof record</type></entry>
        <entry>Finish performing exclusive or non-exclusive on-line backup (restricted to superusers by default, but other users can be granted EXECUTE to run the function)</entry>
@@ -18535,23 +18658,23 @@ SELECT set_config('log_statement_stats', 'off', false);
       </row>
       <row>
        <entry>
-        <literal><function>pg_walfile_name(<parameter>lsn</> <type>pg_lsn</>)</function></literal>
+        <literal><function>pg_walfile_name(<parameter>lsn</parameter> <type>pg_lsn</type>)</function></literal>
         </entry>
        <entry><type>text</type></entry>
        <entry>Convert write-ahead log location to file name</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_walfile_name_offset(<parameter>lsn</> <type>pg_lsn</>)</function></literal>
+        <literal><function>pg_walfile_name_offset(<parameter>lsn</parameter> <type>pg_lsn</type>)</function></literal>
         </entry>
-       <entry><type>text</>, <type>integer</></entry>
+       <entry><type>text</type>, <type>integer</type></entry>
        <entry>Convert write-ahead log location to file name and decimal byte offset within file</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_wal_lsn_diff(<parameter>lsn</> <type>pg_lsn</>, <parameter>lsn</> <type>pg_lsn</>)</function></literal>
+        <literal><function>pg_wal_lsn_diff(<parameter>lsn</parameter> <type>pg_lsn</type>, <parameter>lsn</parameter> <type>pg_lsn</type>)</function></literal>
        </entry>
-       <entry><type>numeric</></entry>
+       <entry><type>numeric</type></entry>
        <entry>Calculate the difference between two write-ahead log locations</entry>
       </row>
      </tbody>
@@ -18559,17 +18682,17 @@ SELECT set_config('log_statement_stats', 'off', false);
    </table>
 
    <para>
-    <function>pg_start_backup</> accepts an arbitrary user-defined label for
+    <function>pg_start_backup</function> accepts an arbitrary user-defined label for
     the backup.  (Typically this would be the name under which the backup dump
     file will be stored.) When used in exclusive mode, the function writes a
-    backup label file (<filename>backup_label</>) and, if there are any links
-    in the <filename>pg_tblspc/</> directory, a tablespace map file
-    (<filename>tablespace_map</>) into the database cluster's data directory,
+    backup label file (<filename>backup_label</filename>) and, if there are any links
+    in the <filename>pg_tblspc/</filename> directory, a tablespace map file
+    (<filename>tablespace_map</filename>) into the database cluster's data directory,
     performs a checkpoint, and then returns the backup's starting write-ahead
     log location as text.  The user can ignore this result value, but it is
     provided in case it is useful. When used in non-exclusive mode, the
     contents of these files are instead returned by the
-    <function>pg_stop_backup</> function, and should be written to the backup
+    <function>pg_stop_backup</function> function, and should be written to the backup
     by the caller.
 
 <programlisting>
@@ -18579,36 +18702,37 @@ postgres=# select pg_start_backup('label_goes_here');
  0/D4445B8
 (1 row)
 </programlisting>
-    There is an optional second parameter of type <type>boolean</type>.  If <literal>true</>,
-    it specifies executing <function>pg_start_backup</> as quickly as
+    There is an optional second parameter of type <type>boolean</type>.  If <literal>true</literal>,
+    it specifies executing <function>pg_start_backup</function> as quickly as
     possible.  This forces an immediate checkpoint which will cause a
     spike in I/O operations, slowing any concurrently executing queries.
    </para>
 
    <para>
-    In an exclusive backup, <function>pg_stop_backup</> removes the label file
-    and, if it exists, the <filename>tablespace_map</> file created by
-    <function>pg_start_backup</>. In a non-exclusive backup, the contents of
-    the <filename>backup_label</> and <filename>tablespace_map</> are returned
+    In an exclusive backup, <function>pg_stop_backup</function> removes the label file
+    and, if it exists, the <filename>tablespace_map</filename> file created by
+    <function>pg_start_backup</function>. In a non-exclusive backup, the contents of
+    the <filename>backup_label</filename> and <filename>tablespace_map</filename> are returned
     in the result of the function, and should be written to files in the
     backup (and not in the data directory).  There is an optional second
-    parameter of type <type>boolean</type>.  If false, the <function>pg_stop_backup</>
+    parameter of type <type>boolean</type>.  If false, the <function>pg_stop_backup</function>
     will return immediately after the backup is completed without waiting for
     WAL to be archived.  This behavior is only useful for backup
     software which independently monitors WAL archiving. Otherwise, WAL
     required to make the backup consistent might be missing and make the backup
-    useless.  When this parameter is set to true, <function>pg_stop_backup</>
+    useless.  When this parameter is set to true, <function>pg_stop_backup</function>
     will wait for WAL to be archived when archiving is enabled; on the standby,
-    this means that it will wait only when <varname>archive_mode = always</>.
+    this means that it will wait only when <varname>archive_mode = always</varname>.
     If write activity on the primary is low, it may be useful to run
-    <function>pg_switch_wal</> on the primary in order to trigger
+    <function>pg_switch_wal</function> on the primary in order to trigger
     an immediate segment switch.
    </para>
 
    <para>
-    The function also creates a backup history file in the write-ahead log
+    When executed on a primary, the function also creates a backup history file
+    in the write-ahead log
     archive area. The history file includes the label given to
-    <function>pg_start_backup</>, the starting and ending write-ahead log locations for
+    <function>pg_start_backup</function>, the starting and ending write-ahead log locations for
     the backup, and the starting and ending times of the backup.  The return
     value is the backup's ending write-ahead log location (which again
     can be ignored).  After recording the ending location, the current
@@ -18618,30 +18742,30 @@ postgres=# select pg_start_backup('label_goes_here');
    </para>
 
    <para>
-    <function>pg_switch_wal</> moves to the next write-ahead log file, allowing the
+    <function>pg_switch_wal</function> moves to the next write-ahead log file, allowing the
     current file to be archived (assuming you are using continuous archiving).
     The return value is the ending write-ahead log location + 1 within the just-completed write-ahead log file.
     If there has been no write-ahead log activity since the last write-ahead log switch,
-    <function>pg_switch_wal</> does nothing and returns the start location
+    <function>pg_switch_wal</function> does nothing and returns the start location
     of the write-ahead log file currently in use.
    </para>
 
    <para>
-    <function>pg_create_restore_point</> creates a named write-ahead log
+    <function>pg_create_restore_point</function> creates a named write-ahead log
     record that can be used as recovery target, and returns the corresponding
     write-ahead log location.  The given name can then be used with
-    <xref linkend="recovery-target-name"> to specify the point up to which
+    <xref linkend="recovery-target-name"/> to specify the point up to which
     recovery will proceed.  Avoid creating multiple restore points with the
     same name, since recovery will stop at the first one whose name matches
     the recovery target.
    </para>
 
    <para>
-    <function>pg_current_wal_lsn</> displays the current write-ahead log write
+    <function>pg_current_wal_lsn</function> displays the current write-ahead log write
     location in the same format used by the above functions.  Similarly,
-    <function>pg_current_wal_insert_lsn</> displays the current write-ahead log
-    insertion location and <function>pg_current_wal_flush_lsn</> displays the
-    current write-ahead log flush location. The insertion location is the <quote>logical</>
+    <function>pg_current_wal_insert_lsn</function> displays the current write-ahead log
+    insertion location and <function>pg_current_wal_flush_lsn</function> displays the
+    current write-ahead log flush location. The insertion location is the <quote>logical</quote>
     end of the write-ahead log at any instant, while the write location is the end of
     what has actually been written out from the server's internal buffers and flush
     location is the location guaranteed to be written to durable storage. The write
@@ -18653,7 +18777,7 @@ postgres=# select pg_start_backup('label_goes_here');
    </para>
 
    <para>
-    You can use <function>pg_walfile_name_offset</> to extract the
+    You can use <function>pg_walfile_name_offset</function> to extract the
     corresponding write-ahead log file name and byte offset from the results of any of the
     above functions.  For example:
 <programlisting>
@@ -18663,7 +18787,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
  00000001000000000000000D |     4039624
 (1 row)
 </programlisting>
-    Similarly, <function>pg_walfile_name</> extracts just the write-ahead log file name.
+    Similarly, <function>pg_walfile_name</function> extracts just the write-ahead log file name.
     When the given write-ahead log location is exactly at a write-ahead log file boundary, both
     these functions return the name of the preceding write-ahead log file.
     This is usually the desired behavior for managing write-ahead log archiving
@@ -18672,15 +18796,15 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </para>
 
    <para>
-    <function>pg_wal_lsn_diff</> calculates the difference in bytes
+    <function>pg_wal_lsn_diff</function> calculates the difference in bytes
     between two write-ahead log locations. It can be used with
     <structname>pg_stat_replication</structname> or some functions shown in
-    <xref linkend="functions-admin-backup-table"> to get the replication lag.
+    <xref linkend="functions-admin-backup-table"/> to get the replication lag.
    </para>
 
    <para>
     For details about proper usage of these functions, see
-    <xref linkend="continuous-archiving">.
+    <xref linkend="continuous-archiving"/>.
    </para>
 
   </sect2>
@@ -18703,7 +18827,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
 
    <para>
     The functions shown in <xref
-    linkend="functions-recovery-info-table"> provide information
+    linkend="functions-recovery-info-table"/> provide information
     about the current status of the standby.
     These functions may be executed both during recovery and in normal running.
    </para>
@@ -18784,7 +18908,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
 
    <para>
     The functions shown in <xref
-    linkend="functions-recovery-control-table"> control the progress of recovery.
+    linkend="functions-recovery-control-table"/> control the progress of recovery.
     These functions may be executed only during recovery.
    </para>
 
@@ -18850,21 +18974,21 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </indexterm>
 
    <para>
-    <productname>PostgreSQL</> allows database sessions to synchronize their
-    snapshots. A <firstterm>snapshot</> determines which data is visible to the
+    <productname>PostgreSQL</productname> allows database sessions to synchronize their
+    snapshots. A <firstterm>snapshot</firstterm> determines which data is visible to the
     transaction that is using the snapshot. Synchronized snapshots are
     necessary when two or more sessions need to see identical content in the
     database. If two sessions just start their transactions independently,
     there is always a possibility that some third transaction commits
-    between the executions of the two <command>START TRANSACTION</> commands,
+    between the executions of the two <command>START TRANSACTION</command> commands,
     so that one session sees the effects of that transaction and the other
     does not.
    </para>
 
    <para>
-    To solve this problem, <productname>PostgreSQL</> allows a transaction to
-    <firstterm>export</> the snapshot it is using.  As long as the exporting
-    transaction remains open, other transactions can <firstterm>import</> its
+    To solve this problem, <productname>PostgreSQL</productname> allows a transaction to
+    <firstterm>export</firstterm> the snapshot it is using.  As long as the exporting
+    transaction remains open, other transactions can <firstterm>import</firstterm> its
     snapshot, and thereby be guaranteed that they see exactly the same view
     of the database that the first transaction sees.  But note that any
     database changes made by any one of these transactions remain invisible
@@ -18874,9 +18998,9 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </para>
 
    <para>
-    Snapshots are exported with the <function>pg_export_snapshot</> function,
-    shown in <xref linkend="functions-snapshot-synchronization-table">, and
-    imported with the <xref linkend="sql-set-transaction"> command.
+    Snapshots are exported with the <function>pg_export_snapshot</function> function,
+    shown in <xref linkend="functions-snapshot-synchronization-table"/>, and
+    imported with the <xref linkend="sql-set-transaction"/> command.
    </para>
 
    <table id="functions-snapshot-synchronization-table">
@@ -18900,20 +19024,20 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </table>
 
    <para>
-    The function <function>pg_export_snapshot</> saves the current snapshot
-    and returns a <type>text</> string identifying the snapshot.  This string
+    The function <function>pg_export_snapshot</function> saves the current snapshot
+    and returns a <type>text</type> string identifying the snapshot.  This string
     must be passed (outside the database) to clients that want to import the
     snapshot.  The snapshot is available for import only until the end of the
     transaction that exported it.  A transaction can export more than one
     snapshot, if needed.  Note that doing so is only useful in <literal>READ
-    COMMITTED</> transactions, since in <literal>REPEATABLE READ</> and
+    COMMITTED</literal> transactions, since in <literal>REPEATABLE READ</literal> and
     higher isolation levels, transactions use the same snapshot throughout
     their lifetime.  Once a transaction has exported any snapshots, it cannot
-    be prepared with <xref linkend="sql-prepare-transaction">.
+    be prepared with <xref linkend="sql-prepare-transaction"/>.
    </para>
 
    <para>
-    See  <xref linkend="sql-set-transaction"> for details of how to use an
+    See  <xref linkend="sql-set-transaction"/> for details of how to use an
     exported snapshot.
    </para>
   </sect2>
@@ -18923,25 +19047,25 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
 
    <para>
     The functions shown
-    in <xref linkend="functions-replication-table"> are for
+    in <xref linkend="functions-replication-table"/> are for
     controlling and interacting with replication features.
-    See <xref linkend="streaming-replication">,
-    <xref linkend="streaming-replication-slots">, and
-    <xref linkend="replication-origins">
+    See <xref linkend="streaming-replication"/>,
+    <xref linkend="streaming-replication-slots"/>, and
+    <xref linkend="replication-origins"/>
     for information about the underlying features.  Use of these
     functions is restricted to superusers.
    </para>
 
    <para>
     Many of these functions have equivalent commands in the replication
-    protocol; see <xref linkend="protocol-replication">.
+    protocol; see <xref linkend="protocol-replication"/>.
    </para>
 
    <para>
     The functions described in
-    <xref linkend="functions-admin-backup">,
-    <xref linkend="functions-recovery-control">, and
-    <xref linkend="functions-snapshot-synchronization">
+    <xref linkend="functions-admin-backup"/>,
+    <xref linkend="functions-recovery-control"/>, and
+    <xref linkend="functions-snapshot-synchronization"/>
     are also relevant for replication.
    </para>
 
@@ -18961,7 +19085,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <indexterm>
          <primary>pg_create_physical_replication_slot</primary>
         </indexterm>
-        <literal><function>pg_create_physical_replication_slot(<parameter>slot_name</parameter> <type>name</type> <optional>, <parameter>immediately_reserve</> <type>boolean</>, <parameter>temporary</> <type>boolean</></optional>)</function></literal>
+        <literal><function>pg_create_physical_replication_slot(<parameter>slot_name</parameter> <type>name</type> <optional>, <parameter>immediately_reserve</parameter> <type>boolean</type>, <parameter>temporary</parameter> <type>boolean</type></optional>)</function></literal>
        </entry>
        <entry>
         (<parameter>slot_name</parameter> <type>name</type>, <parameter>lsn</parameter> <type>pg_lsn</type>)
@@ -18969,13 +19093,13 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry>
         Creates a new physical replication slot named
         <parameter>slot_name</parameter>. The optional second parameter,
-        when <literal>true</>, specifies that the <acronym>LSN</> for this
+        when <literal>true</literal>, specifies that the <acronym>LSN</acronym> for this
         replication slot be reserved immediately; otherwise
-        the <acronym>LSN</> is reserved on first connection from a streaming
+        the <acronym>LSN</acronym> is reserved on first connection from a streaming
         replication client. Streaming changes from a physical slot is only
         possible with the streaming-replication protocol &mdash;
-        see <xref linkend="protocol-replication">. The optional third
-        parameter, <parameter>temporary</>, when set to true, specifies that
+        see <xref linkend="protocol-replication"/>. The optional third
+        parameter, <parameter>temporary</parameter>, when set to true, specifies that
         the slot should not be permanently stored to disk and is only meant
         for use by current session. Temporary slots are also
         released upon any error. This function corresponds
@@ -18996,7 +19120,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry>
         Drops the physical or logical replication slot
         named <parameter>slot_name</parameter>. Same as replication protocol
-        command <literal>DROP_REPLICATION_SLOT</>. For logical slots, this must
+        command <literal>DROP_REPLICATION_SLOT</literal>. For logical slots, this must
         be called when connected to the same database the slot was created on.
        </entry>
       </row>
@@ -19006,7 +19130,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <indexterm>
          <primary>pg_create_logical_replication_slot</primary>
         </indexterm>
-        <literal><function>pg_create_logical_replication_slot(<parameter>slot_name</parameter> <type>name</type>, <parameter>plugin</parameter> <type>name</type> <optional>, <parameter>temporary</> <type>boolean</></optional>)</function></literal>
+        <literal><function>pg_create_logical_replication_slot(<parameter>slot_name</parameter> <type>name</type>, <parameter>plugin</parameter> <type>name</type> <optional>, <parameter>temporary</parameter> <type>boolean</type></optional>)</function></literal>
        </entry>
        <entry>
         (<parameter>slot_name</parameter> <type>name</type>, <parameter>lsn</parameter> <type>pg_lsn</type>)
@@ -19015,7 +19139,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         Creates a new logical (decoding) replication slot named
         <parameter>slot_name</parameter> using the output plugin
         <parameter>plugin</parameter>. The optional third
-        parameter, <parameter>temporary</>, when set to true, specifies that
+        parameter, <parameter>temporary</parameter>, when set to true, specifies that
         the slot should not be permanently stored to disk and is only meant
         for use by current session. Temporary slots are also
         released upon any error. A call to this function has the same
@@ -19037,9 +19161,9 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry>
         Returns changes in the slot <parameter>slot_name</parameter>, starting
         from the point at which since changes have been consumed last.  If
-        <parameter>upto_lsn</> and <parameter>upto_nchanges</> are NULL,
+        <parameter>upto_lsn</parameter> and <parameter>upto_nchanges</parameter> are NULL,
         logical decoding will continue until end of WAL.  If
-        <parameter>upto_lsn</> is non-NULL, decoding will include only
+        <parameter>upto_lsn</parameter> is non-NULL, decoding will include only
         those transactions which commit prior to the specified LSN.  If
         <parameter>upto_nchanges</parameter> is non-NULL, decoding will
         stop when the number of rows produced by decoding exceeds
@@ -19103,6 +19227,25 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        </entry>
       </row>
 
+      <row>
+       <entry>
+        <indexterm>
+         <primary>pg_replication_slot_advance</primary>
+        </indexterm>
+        <literal><function>pg_replication_slot_advance(<parameter>slot_name</parameter> <type>name</type>, <parameter>upto_lsn</parameter> <type>pg_lsn</type>)</function></literal>
+       </entry>
+       <entry>
+        (<parameter>slot_name</parameter> <type>name</type>, <parameter>end_lsn</parameter> <type>pg_lsn</type>)
+        <type>bool</type>
+       </entry>
+       <entry>
+        Advances the current confirmed position of a replication slot named
+        <parameter>slot_name</parameter>. The slot will not be moved backwards,
+        and it will not be moved beyond the current insert location.  Returns
+        name of the slot and real position to which it was advanced to.
+       </entry>
+      </row>
+
       <row>
        <entry id="pg-replication-origin-create">
         <indexterm>
@@ -19127,7 +19270,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal><function>pg_replication_origin_drop(<parameter>node_name</parameter> <type>text</type>)</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Delete a previously created replication origin, including any
@@ -19159,7 +19302,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal><function>pg_replication_origin_session_setup(<parameter>node_name</parameter> <type>text</type>)</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Mark the current session as replaying from the given
@@ -19177,7 +19320,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal><function>pg_replication_origin_session_reset()</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Cancel the effects
@@ -19226,7 +19369,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal><function>pg_replication_origin_xact_setup(<parameter>origin_lsn</parameter> <type>pg_lsn</type>, <parameter>origin_timestamp</parameter> <type>timestamptz</type>)</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Mark the current transaction as replaying a transaction that has
@@ -19245,7 +19388,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal><function>pg_replication_origin_xact_reset()</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Cancel the effects of
@@ -19261,7 +19404,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
         <literal>pg_replication_origin_advance<function>(<parameter>node_name</parameter> <type>text</type>, <parameter>lsn</parameter> <type>pg_lsn</type>)</function></literal>
        </entry>
        <entry>
-        <type>void</>
+        <type>void</type>
        </entry>
        <entry>
         Set replication progress for the given node to the given
@@ -19342,7 +19485,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    <title>Database Object Management Functions</title>
 
    <para>
-    The functions shown in <xref linkend="functions-admin-dbsize"> calculate
+    The functions shown in <xref linkend="functions-admin-dbsize"/> calculate
     the disk space usage of database objects.
    </para>
 
@@ -19418,7 +19561,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry><type>bigint</type></entry>
        <entry>
         Disk space used by the specified fork (<literal>'main'</literal>,
-        <literal>'fsm'</literal>, <literal>'vm'</>, or <literal>'init'</>)
+        <literal>'fsm'</literal>, <literal>'vm'</literal>, or <literal>'init'</literal>)
         of the specified table or index
        </entry>
       </row>
@@ -19491,7 +19634,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry><type>bigint</type></entry>
        <entry>
         Total disk space used by the specified table,
-        including all indexes and <acronym>TOAST</> data
+        including all indexes and <acronym>TOAST</acronym> data
        </entry>
       </row>
      </tbody>
@@ -19499,48 +19642,48 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </table>
 
    <para>
-    <function>pg_column_size</> shows the space used to store any individual
+    <function>pg_column_size</function> shows the space used to store any individual
     data value.
    </para>
 
    <para>
-    <function>pg_total_relation_size</> accepts the OID or name of a
+    <function>pg_total_relation_size</function> accepts the OID or name of a
     table or toast table, and returns the total on-disk space used for
     that table, including all associated indexes.  This function is
     equivalent to <function>pg_table_size</function>
-    <literal>+</> <function>pg_indexes_size</function>.
+    <literal>+</literal> <function>pg_indexes_size</function>.
    </para>
 
    <para>
-    <function>pg_table_size</> accepts the OID or name of a table and
+    <function>pg_table_size</function> accepts the OID or name of a table and
     returns the disk space needed for that table, exclusive of indexes.
     (TOAST space, free space map, and visibility map are included.)
    </para>
 
    <para>
-    <function>pg_indexes_size</> accepts the OID or name of a table and
+    <function>pg_indexes_size</function> accepts the OID or name of a table and
     returns the total disk space used by all the indexes attached to that
     table.
    </para>
 
    <para>
-    <function>pg_database_size</function> and <function>pg_tablespace_size</>
+    <function>pg_database_size</function> and <function>pg_tablespace_size</function>
     accept the OID or name of a database or tablespace, and return the total
     disk space used therein.  To use <function>pg_database_size</function>,
-    you must have <literal>CONNECT</> permission on the specified database
-    (which is granted by default), or be a member of the <literal>pg_read_all_stats</>
-    role. To use <function>pg_tablespace_size</>, you must have
-    <literal>CREATE</> permission on the specified tablespace, or be a member
-    of the <literal>pg_read_all_stats</> role unless it is the default tablespace for
+    you must have <literal>CONNECT</literal> permission on the specified database
+    (which is granted by default), or be a member of the <literal>pg_read_all_stats</literal>
+    role. To use <function>pg_tablespace_size</function>, you must have
+    <literal>CREATE</literal> permission on the specified tablespace, or be a member
+    of the <literal>pg_read_all_stats</literal> role unless it is the default tablespace for
     the current database.
    </para>
 
    <para>
-    <function>pg_relation_size</> accepts the OID or name of a table, index
+    <function>pg_relation_size</function> accepts the OID or name of a table, index
     or toast table, and returns the on-disk size in bytes of one fork of
     that relation.  (Note that for most purposes it is more convenient to
-    use the higher-level functions <function>pg_total_relation_size</>
-    or <function>pg_table_size</>, which sum the sizes of all forks.)
+    use the higher-level functions <function>pg_total_relation_size</function>
+    or <function>pg_table_size</function>, which sum the sizes of all forks.)
     With one argument, it returns the size of the main data fork of the
     relation.  The second argument can be provided to specify which fork
     to examine:
@@ -19554,13 +19697,13 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
      <listitem>
       <para>
        <literal>'fsm'</literal> returns the size of the Free Space Map
-       (see <xref linkend="storage-fsm">) associated with the relation.
+       (see <xref linkend="storage-fsm"/>) associated with the relation.
       </para>
      </listitem>
      <listitem>
       <para>
        <literal>'vm'</literal> returns the size of the Visibility Map
-       (see <xref linkend="storage-vm">) associated with the relation.
+       (see <xref linkend="storage-vm"/>) associated with the relation.
       </para>
      </listitem>
      <listitem>
@@ -19573,13 +19716,13 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </para>
 
    <para>
-    <function>pg_size_pretty</> can be used to format the result of one of
+    <function>pg_size_pretty</function> can be used to format the result of one of
     the other functions in a human-readable way, using bytes, kB, MB, GB or TB
     as appropriate.
    </para>
 
    <para>
-    <function>pg_size_bytes</> can be used to get the size in bytes from a
+    <function>pg_size_bytes</function> can be used to get the size in bytes from a
     string in human-readable format. The input may have units of bytes, kB,
     MB, GB or TB, and is parsed case-insensitively. If no units are specified,
     bytes are assumed.
@@ -19588,17 +19731,17 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    <note>
     <para>
      The units kB, MB, GB and TB used by the functions
-     <function>pg_size_pretty</> and <function>pg_size_bytes</> are defined
+     <function>pg_size_pretty</function> and <function>pg_size_bytes</function> are defined
      using powers of 2 rather than powers of 10, so 1kB is 1024 bytes, 1MB is
-     1024<superscript>2</> = 1048576 bytes, and so on.
+     1024<superscript>2</superscript> = 1048576 bytes, and so on.
     </para>
    </note>
 
    <para>
     The functions above that operate on tables or indexes accept a
-    <type>regclass</> argument, which is simply the OID of the table or index
-    in the <structname>pg_class</> system catalog.  You do not have to look up
-    the OID by hand, however, since the <type>regclass</> data type's input
+    <type>regclass</type> argument, which is simply the OID of the table or index
+    in the <structname>pg_class</structname> system catalog.  You do not have to look up
+    the OID by hand, however, since the <type>regclass</type> data type's input
     converter will do the work for you.  Just write the table name enclosed in
     single quotes so that it looks like a literal constant.  For compatibility
     with the handling of ordinary <acronym>SQL</acronym> names, the string
@@ -19612,7 +19755,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </para>
 
    <para>
-    The functions shown in <xref linkend="functions-admin-dblocation"> assist
+    The functions shown in <xref linkend="functions-admin-dblocation"/> assist
     in identifying the specific disk files associated with database objects.
    </para>
 
@@ -19667,33 +19810,33 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </table>
 
    <para>
-    <function>pg_relation_filenode</> accepts the OID or name of a table,
-    index, sequence, or toast table, and returns the <quote>filenode</> number
+    <function>pg_relation_filenode</function> accepts the OID or name of a table,
+    index, sequence, or toast table, and returns the <quote>filenode</quote> number
     currently assigned to it.  The filenode is the base component of the file
-    name(s) used for the relation (see <xref linkend="storage-file-layout">
+    name(s) used for the relation (see <xref linkend="storage-file-layout"/>
     for more information).  For most tables the result is the same as
-    <structname>pg_class</>.<structfield>relfilenode</>, but for certain
-    system catalogs <structfield>relfilenode</> is zero and this function must
+    <structname>pg_class</structname>.<structfield>relfilenode</structfield>, but for certain
+    system catalogs <structfield>relfilenode</structfield> is zero and this function must
     be used to get the correct value.  The function returns NULL if passed
     a relation that does not have storage, such as a view.
    </para>
 
    <para>
-    <function>pg_relation_filepath</> is similar to
-    <function>pg_relation_filenode</>, but it returns the entire file path name
-    (relative to the database cluster's data directory <varname>PGDATA</>) of
+    <function>pg_relation_filepath</function> is similar to
+    <function>pg_relation_filenode</function>, but it returns the entire file path name
+    (relative to the database cluster's data directory <varname>PGDATA</varname>) of
     the relation.
    </para>
 
    <para>
-    <function>pg_filenode_relation</> is the reverse of
-    <function>pg_relation_filenode</>. Given a <quote>tablespace</> OID and
-    a <quote>filenode</>, it returns the associated relation's OID. For a table
+    <function>pg_filenode_relation</function> is the reverse of
+    <function>pg_relation_filenode</function>. Given a <quote>tablespace</quote> OID and
+    a <quote>filenode</quote>, it returns the associated relation's OID. For a table
     in the database's default tablespace, the tablespace can be specified as 0.
    </para>
 
    <para>
-    <xref linkend="functions-admin-collation"> lists functions used to manage
+    <xref linkend="functions-admin-collation"/> lists functions used to manage
     collations.
    </para>
 
@@ -19708,7 +19851,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
       <row>
        <entry>
         <indexterm><primary>pg_collation_actual_version</primary></indexterm>
-        <literal><function>pg_collation_actual_version(<type>oid</>)</function></literal>
+        <literal><function>pg_collation_actual_version(<type>oid</type>)</function></literal>
        </entry>
        <entry><type>text</type></entry>
        <entry>Return actual version of collation from operating system</entry>
@@ -19716,7 +19859,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
       <row>
        <entry>
         <indexterm><primary>pg_import_system_collations</primary></indexterm>
-        <literal><function>pg_import_system_collations(<parameter>schema</> <type>regnamespace</>)</function></literal>
+        <literal><function>pg_import_system_collations(<parameter>schema</parameter> <type>regnamespace</type>)</function></literal>
        </entry>
        <entry><type>integer</type></entry>
        <entry>Import operating system collations</entry>
@@ -19731,15 +19874,15 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
     operating system.  If this is different from the value
     in <literal>pg_collation.collversion</literal>, then objects depending on
     the collation might need to be rebuilt.  See also
-    <xref linkend="sql-altercollation">.
+    <xref linkend="sql-altercollation"/>.
    </para>
 
    <para>
-    <function>pg_import_system_collations</> adds collations to the system
+    <function>pg_import_system_collations</function> adds collations to the system
     catalog <literal>pg_collation</literal> based on all the
     locales it finds in the operating system.  This is
     what <command>initdb</command> uses;
-    see <xref linkend="collation-managing"> for more details.  If additional
+    see <xref linkend="collation-managing"/> for more details.  If additional
     locales are installed into the operating system later on, this function
     can be run again to add collations for the new locales.  Locales that
     match existing entries in <literal>pg_collation</literal> will be skipped.
@@ -19773,7 +19916,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </indexterm>
 
    <para>
-    <xref linkend="functions-admin-index-table"> shows the functions
+    <xref linkend="functions-admin-index-table"/> shows the functions
     available for index maintenance tasks.
     These functions cannot be executed during recovery.
     Use of these functions is restricted to superusers and the owner
@@ -19790,28 +19933,28 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
      <tbody>
       <row>
        <entry>
-        <literal><function>brin_summarize_new_values(<parameter>index</> <type>regclass</>)</function></literal>
+        <literal><function>brin_summarize_new_values(<parameter>index</parameter> <type>regclass</type>)</function></literal>
        </entry>
        <entry><type>integer</type></entry>
        <entry>summarize page ranges not already summarized</entry>
       </row>
       <row>
        <entry>
-        <literal><function>brin_summarize_range(<parameter>index</> <type>regclass</>, <parameter>blockNumber</> <type>bigint</type>)</function></literal>
+        <literal><function>brin_summarize_range(<parameter>index</parameter> <type>regclass</type>, <parameter>blockNumber</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>integer</type></entry>
        <entry>summarize the page range covering the given block, if not already summarized</entry>
       </row>
       <row>
        <entry>
-        <literal><function>brin_desummarize_range(<parameter>index</> <type>regclass</>, <parameter>blockNumber</> <type>bigint</type>)</function></literal>
+        <literal><function>brin_desummarize_range(<parameter>index</parameter> <type>regclass</type>, <parameter>blockNumber</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>integer</type></entry>
        <entry>de-summarize the page range covering the given block, if summarized</entry>
       </row>
       <row>
        <entry>
-        <literal><function>gin_clean_pending_list(<parameter>index</> <type>regclass</>)</function></literal>
+        <literal><function>gin_clean_pending_list(<parameter>index</parameter> <type>regclass</type>)</function></literal>
        </entry>
        <entry><type>bigint</type></entry>
        <entry>move GIN pending list entries into main index structure</entry>
@@ -19821,25 +19964,25 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </table>
 
    <para>
-    <function>brin_summarize_new_values</> accepts the OID or name of a
+    <function>brin_summarize_new_values</function> accepts the OID or name of a
     BRIN index and inspects the index to find page ranges in the base table
     that are not currently summarized by the index; for any such range
     it creates a new summary index tuple by scanning the table pages.
     It returns the number of new page range summaries that were inserted
-    into the index.  <function>brin_summarize_range</> does the same, except
+    into the index.  <function>brin_summarize_range</function> does the same, except
     it only summarizes the range that covers the given block number.
    </para>
 
    <para>
-    <function>gin_clean_pending_list</> accepts the OID or name of
+    <function>gin_clean_pending_list</function> accepts the OID or name of
     a GIN index and cleans up the pending list of the specified index
     by moving entries in it to the main GIN data structure in bulk.
     It returns the number of pages removed from the pending list.
     Note that if the argument is a GIN index built with
-    the <literal>fastupdate</> option disabled, no cleanup happens and the
+    the <literal>fastupdate</literal> option disabled, no cleanup happens and the
     return value is 0, because the index doesn't have a pending list.
-    Please see <xref linkend="gin-fast-update"> and <xref linkend="gin-tips">
-    for details of the pending list and <literal>fastupdate</> option.
+    Please see <xref linkend="gin-fast-update"/> and <xref linkend="gin-tips"/>
+    for details of the pending list and <literal>fastupdate</literal> option.
    </para>
 
   </sect2>
@@ -19849,11 +19992,11 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
 
    <para>
     The functions shown in <xref
-    linkend="functions-admin-genfile-table"> provide native access to
+    linkend="functions-admin-genfile-table"/> provide native access to
     files on the machine hosting the server. Only files within the
-    database cluster directory and the <varname>log_directory</> can be
+    database cluster directory and the <varname>log_directory</varname> can be
     accessed.  Use a relative path for files in the cluster directory,
-    and a path matching the <varname>log_directory</> configuration setting
+    and a path matching the <varname>log_directory</varname> configuration setting
     for log files.  Use of these functions is restricted to superusers
     except where stated otherwise.
    </para>
@@ -19869,7 +20012,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
      <tbody>
       <row>
        <entry>
-        <literal><function>pg_ls_dir(<parameter>dirname</> <type>text</> [, <parameter>missing_ok</> <type>boolean</>, <parameter>include_dot_dirs</> <type>boolean</>])</function></literal>
+        <literal><function>pg_ls_dir(<parameter>dirname</parameter> <type>text</type> [, <parameter>missing_ok</parameter> <type>boolean</type>, <parameter>include_dot_dirs</parameter> <type>boolean</type>])</function></literal>
        </entry>
        <entry><type>setof text</type></entry>
        <entry>
@@ -19883,7 +20026,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry><type>setof record</type></entry>
        <entry>
         List the name, size, and last modification time of files in the log
-        directory. Access is granted to members of the <literal>pg_monitor</>
+        directory. Access is granted to members of the <literal>pg_monitor</literal>
         role and may be granted to other non-superuser roles.
        </entry>
       </row>
@@ -19894,13 +20037,13 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
        <entry><type>setof record</type></entry>
        <entry>
         List the name, size, and last modification time of files in the WAL
-        directory. Access is granted to members of the <literal>pg_monitor</>
+        directory. Access is granted to members of the <literal>pg_monitor</literal>
         role and may be granted to other non-superuser roles.
        </entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_read_file(<parameter>filename</> <type>text</> [, <parameter>offset</> <type>bigint</>, <parameter>length</> <type>bigint</> [, <parameter>missing_ok</> <type>boolean</>] ])</function></literal>
+        <literal><function>pg_read_file(<parameter>filename</parameter> <type>text</type> [, <parameter>offset</parameter> <type>bigint</type>, <parameter>length</parameter> <type>bigint</type> [, <parameter>missing_ok</parameter> <type>boolean</type>] ])</function></literal>
        </entry>
        <entry><type>text</type></entry>
        <entry>
@@ -19909,7 +20052,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
       </row>
       <row>
        <entry>
-        <literal><function>pg_read_binary_file(<parameter>filename</> <type>text</> [, <parameter>offset</> <type>bigint</>, <parameter>length</> <type>bigint</> [, <parameter>missing_ok</> <type>boolean</>] ])</function></literal>
+        <literal><function>pg_read_binary_file(<parameter>filename</parameter> <type>text</type> [, <parameter>offset</parameter> <type>bigint</type>, <parameter>length</parameter> <type>bigint</type> [, <parameter>missing_ok</parameter> <type>boolean</type>] ])</function></literal>
        </entry>
        <entry><type>bytea</type></entry>
        <entry>
@@ -19918,7 +20061,7 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
       </row>
       <row>
        <entry>
-        <literal><function>pg_stat_file(<parameter>filename</> <type>text</>[, <parameter>missing_ok</> <type>boolean</type>])</function></literal>
+        <literal><function>pg_stat_file(<parameter>filename</parameter> <type>text</type>[, <parameter>missing_ok</parameter> <type>boolean</type>])</function></literal>
        </entry>
        <entry><type>record</type></entry>
        <entry>
@@ -19930,23 +20073,23 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
    </table>
 
    <para>
-    Some of these functions take an optional <parameter>missing_ok</> parameter,
+    Some of these functions take an optional <parameter>missing_ok</parameter> parameter,
     which specifies the behavior when the file or directory does not exist.
     If <literal>true</literal>, the function returns NULL (except
-    <function>pg_ls_dir</>, which returns an empty result set). If
-    <literal>false</>, an error is raised. The default is <literal>false</>.
+    <function>pg_ls_dir</function>, which returns an empty result set). If
+    <literal>false</literal>, an error is raised. The default is <literal>false</literal>.
    </para>
 
    <indexterm>
     <primary>pg_ls_dir</primary>
    </indexterm>
    <para>
-    <function>pg_ls_dir</> returns the names of all files (and directories
+    <function>pg_ls_dir</function> returns the names of all files (and directories
     and other special files) in the specified directory. The <parameter>
-    include_dot_dirs</> indicates whether <quote>.</> and <quote>..</> are
+    include_dot_dirs</parameter> indicates whether <quote>.</quote> and <quote>..</quote> are
     included in the result set. The default is to exclude them
-    (<literal>false</>), but including them can be useful when
-    <parameter>missing_ok</> is <literal>true</literal>, to distinguish an
+    (<literal>false</literal>), but including them can be useful when
+    <parameter>missing_ok</parameter> is <literal>true</literal>, to distinguish an
     empty directory from an non-existent directory.
    </para>
 
@@ -19954,9 +20097,9 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
     <primary>pg_ls_logdir</primary>
    </indexterm>
    <para>
-    <function>pg_ls_logdir</> returns the name, size, and last modified time
+    <function>pg_ls_logdir</function> returns the name, size, and last modified time
     (mtime) of each file in the log directory. By default, only superusers
-    and members of the <literal>pg_monitor</> role can use this function.
+    and members of the <literal>pg_monitor</literal> role can use this function.
     Access may be granted to others using <command>GRANT</command>.
    </para>
 
@@ -19964,9 +20107,9 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
     <primary>pg_ls_waldir</primary>
    </indexterm>
    <para>
-    <function>pg_ls_waldir</> returns the name, size, and last modified time
+    <function>pg_ls_waldir</function> returns the name, size, and last modified time
     (mtime) of each file in the write ahead log (WAL) directory. By
-    default only superusers and members of the <literal>pg_monitor</> role
+    default only superusers and members of the <literal>pg_monitor</literal> role
     can use this function. Access may be granted to others using
     <command>GRANT</command>.
    </para>
@@ -19975,11 +20118,11 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
     <primary>pg_read_file</primary>
    </indexterm>
    <para>
-    <function>pg_read_file</> returns part of a text file, starting
-    at the given <parameter>offset</>, returning at most <parameter>length</>
-    bytes (less if the end of file is reached first).  If <parameter>offset</>
+    <function>pg_read_file</function> returns part of a text file, starting
+    at the given <parameter>offset</parameter>, returning at most <parameter>length</parameter>
+    bytes (less if the end of file is reached first).  If <parameter>offset</parameter>
     is negative, it is relative to the end of the file.
-    If <parameter>offset</> and <parameter>length</> are omitted, the entire
+    If <parameter>offset</parameter> and <parameter>length</parameter> are omitted, the entire
     file is returned.  The bytes read from the file are interpreted as a string
     in the server encoding; an error is thrown if they are not valid in that
     encoding.
@@ -19989,10 +20132,10 @@ postgres=# SELECT * FROM pg_walfile_name_offset(pg_stop_backup());
     <primary>pg_read_binary_file</primary>
    </indexterm>
    <para>
-    <function>pg_read_binary_file</> is similar to
-    <function>pg_read_file</>, except that the result is a <type>bytea</type> value;
+    <function>pg_read_binary_file</function> is similar to
+    <function>pg_read_file</function>, except that the result is a <type>bytea</type> value;
     accordingly, no encoding checks are performed.
-    In combination with the <function>convert_from</> function, this function
+    In combination with the <function>convert_from</function> function, this function
     can be used to read a file in a specified encoding:
 <programlisting>
 SELECT convert_from(pg_read_binary_file('file_in_utf8.txt'), 'UTF8');
@@ -20003,7 +20146,7 @@ SELECT convert_from(pg_read_binary_file('file_in_utf8.txt'), 'UTF8');
     <primary>pg_stat_file</primary>
    </indexterm>
    <para>
-    <function>pg_stat_file</> returns a record containing the file
+    <function>pg_stat_file</function> returns a record containing the file
     size, last accessed time stamp, last modified time stamp,
     last file status change time stamp (Unix platforms only),
     file creation time stamp (Windows only), and a <type>boolean</type>
@@ -20020,9 +20163,9 @@ SELECT (pg_stat_file('filename')).modification;
    <title>Advisory Lock Functions</title>
 
    <para>
-    The functions shown in <xref linkend="functions-advisory-locks-table">
+    The functions shown in <xref linkend="functions-advisory-locks-table"/>
     manage advisory locks.  For details about proper use of these functions,
-    see <xref linkend="advisory-locks">.
+    see <xref linkend="advisory-locks"/>.
    </para>
 
    <table id="functions-advisory-locks-table">
@@ -20036,42 +20179,42 @@ SELECT (pg_stat_file('filename')).modification;
      <tbody>
       <row>
        <entry>
-        <literal><function>pg_advisory_lock(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_lock(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain exclusive session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_lock(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_lock(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain exclusive session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_lock_shared(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_lock_shared(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain shared session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_lock_shared(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_lock_shared(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain shared session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_unlock(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_unlock(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Release an exclusive session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_unlock(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_unlock(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Release an exclusive session level advisory lock</entry>
@@ -20085,98 +20228,98 @@ SELECT (pg_stat_file('filename')).modification;
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_unlock_shared(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_unlock_shared(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Release a shared session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_unlock_shared(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_unlock_shared(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Release a shared session level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_xact_lock(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_xact_lock(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain exclusive transaction level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_xact_lock(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_xact_lock(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain exclusive transaction level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_xact_lock_shared(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_advisory_xact_lock_shared(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain shared transaction level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_advisory_xact_lock_shared(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_advisory_xact_lock_shared(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>void</type></entry>
        <entry>Obtain shared transaction level advisory lock</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_lock(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_try_advisory_lock(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain exclusive session level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_lock(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_try_advisory_lock(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain exclusive session level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_lock_shared(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_try_advisory_lock_shared(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain shared session level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_lock_shared(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_try_advisory_lock_shared(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain shared session level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_xact_lock(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_try_advisory_xact_lock(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain exclusive transaction level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_xact_lock(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_try_advisory_xact_lock(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain exclusive transaction level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_xact_lock_shared(<parameter>key</> <type>bigint</>)</function></literal>
+        <literal><function>pg_try_advisory_xact_lock_shared(<parameter>key</parameter> <type>bigint</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain shared transaction level advisory lock if available</entry>
       </row>
       <row>
        <entry>
-        <literal><function>pg_try_advisory_xact_lock_shared(<parameter>key1</> <type>int</>, <parameter>key2</> <type>int</>)</function></literal>
+        <literal><function>pg_try_advisory_xact_lock_shared(<parameter>key1</parameter> <type>int</type>, <parameter>key2</parameter> <type>int</type>)</function></literal>
        </entry>
        <entry><type>boolean</type></entry>
        <entry>Obtain shared transaction level advisory lock if available</entry>
@@ -20189,7 +20332,7 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_lock</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_lock</> locks an application-defined resource,
+    <function>pg_advisory_lock</function> locks an application-defined resource,
     which can be identified either by a single 64-bit key value or two
     32-bit key values (note that these two key spaces do not overlap).
     If another session already holds a lock on the same resource identifier,
@@ -20203,8 +20346,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_lock_shared</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_lock_shared</> works the same as
-    <function>pg_advisory_lock</>,
+    <function>pg_advisory_lock_shared</function> works the same as
+    <function>pg_advisory_lock</function>,
     except the lock can be shared with other sessions requesting shared locks.
     Only would-be exclusive lockers are locked out.
    </para>
@@ -20213,10 +20356,10 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_try_advisory_lock</primary>
    </indexterm>
    <para>
-    <function>pg_try_advisory_lock</> is similar to
-    <function>pg_advisory_lock</>, except the function will not wait for the
+    <function>pg_try_advisory_lock</function> is similar to
+    <function>pg_advisory_lock</function>, except the function will not wait for the
     lock to become available.  It will either obtain the lock immediately and
-    return <literal>true</>, or return <literal>false</> if the lock cannot be
+    return <literal>true</literal>, or return <literal>false</literal> if the lock cannot be
     acquired immediately.
    </para>
 
@@ -20224,8 +20367,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_try_advisory_lock_shared</primary>
    </indexterm>
    <para>
-    <function>pg_try_advisory_lock_shared</> works the same as
-    <function>pg_try_advisory_lock</>, except it attempts to acquire
+    <function>pg_try_advisory_lock_shared</function> works the same as
+    <function>pg_try_advisory_lock</function>, except it attempts to acquire
     a shared rather than an exclusive lock.
    </para>
 
@@ -20233,10 +20376,10 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_unlock</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_unlock</> will release a previously-acquired
+    <function>pg_advisory_unlock</function> will release a previously-acquired
     exclusive session level advisory lock.  It
-    returns <literal>true</> if the lock is successfully released.
-    If the lock was not held, it will return <literal>false</>,
+    returns <literal>true</literal> if the lock is successfully released.
+    If the lock was not held, it will return <literal>false</literal>,
     and in addition, an SQL warning will be reported by the server.
    </para>
 
@@ -20244,8 +20387,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_unlock_shared</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_unlock_shared</> works the same as
-    <function>pg_advisory_unlock</>,
+    <function>pg_advisory_unlock_shared</function> works the same as
+    <function>pg_advisory_unlock</function>,
     except it releases a shared session level advisory lock.
    </para>
 
@@ -20253,7 +20396,7 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_unlock_all</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_unlock_all</> will release all session level advisory
+    <function>pg_advisory_unlock_all</function> will release all session level advisory
     locks held by the current session.  (This function is implicitly invoked
     at session end, even if the client disconnects ungracefully.)
    </para>
@@ -20262,8 +20405,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_xact_lock</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_xact_lock</> works the same as
-    <function>pg_advisory_lock</>, except the lock is automatically released
+    <function>pg_advisory_xact_lock</function> works the same as
+    <function>pg_advisory_lock</function>, except the lock is automatically released
     at the end of the current transaction and cannot be released explicitly.
    </para>
 
@@ -20271,8 +20414,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_advisory_xact_lock_shared</primary>
    </indexterm>
    <para>
-    <function>pg_advisory_xact_lock_shared</> works the same as
-    <function>pg_advisory_lock_shared</>, except the lock is automatically released
+    <function>pg_advisory_xact_lock_shared</function> works the same as
+    <function>pg_advisory_lock_shared</function>, except the lock is automatically released
     at the end of the current transaction and cannot be released explicitly.
    </para>
 
@@ -20280,8 +20423,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_try_advisory_xact_lock</primary>
    </indexterm>
    <para>
-    <function>pg_try_advisory_xact_lock</> works the same as
-    <function>pg_try_advisory_lock</>, except the lock, if acquired,
+    <function>pg_try_advisory_xact_lock</function> works the same as
+    <function>pg_try_advisory_lock</function>, except the lock, if acquired,
     is automatically released at the end of the current transaction and
     cannot be released explicitly.
    </para>
@@ -20290,8 +20433,8 @@ SELECT (pg_stat_file('filename')).modification;
     <primary>pg_try_advisory_xact_lock_shared</primary>
    </indexterm>
    <para>
-    <function>pg_try_advisory_xact_lock_shared</> works the same as
-    <function>pg_try_advisory_lock_shared</>, except the lock, if acquired,
+    <function>pg_try_advisory_xact_lock_shared</function> works the same as
+    <function>pg_try_advisory_lock_shared</function>, except the lock, if acquired,
     is automatically released at the end of the current transaction and
     cannot be released explicitly.
    </para>
@@ -20308,8 +20451,8 @@ SELECT (pg_stat_file('filename')).modification;
    </indexterm>
 
    <para>
-      Currently <productname>PostgreSQL</> provides one built in trigger
-      function, <function>suppress_redundant_updates_trigger</>,
+      Currently <productname>PostgreSQL</productname> provides one built in trigger
+      function, <function>suppress_redundant_updates_trigger</function>,
       which will prevent any update
       that does not actually change the data in the row from taking place, in
       contrast to the normal behavior which always performs the update
@@ -20326,7 +20469,7 @@ SELECT (pg_stat_file('filename')).modification;
       However, detecting such situations in client code is not
       always easy, or even possible, and writing expressions to detect
       them can be error-prone. An alternative is to use
-      <function>suppress_redundant_updates_trigger</>, which will skip
+      <function>suppress_redundant_updates_trigger</function>, which will skip
       updates that don't change the data. You should use this with care,
       however. The trigger takes a small but non-trivial time for each record,
       so if most of the records affected by an update are actually changed,
@@ -20334,7 +20477,7 @@ SELECT (pg_stat_file('filename')).modification;
     </para>
 
     <para>
-      The <function>suppress_redundant_updates_trigger</> function can be
+      The <function>suppress_redundant_updates_trigger</function> function can be
       added to a table like this:
 <programlisting>
 CREATE TRIGGER z_min_update
@@ -20348,7 +20491,7 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
     </para>
     <para>
        For more information about creating triggers, see
-        <xref linkend="SQL-CREATETRIGGER">.
+        <xref linkend="sql-createtrigger"/>.
     </para>
   </sect1>
 
@@ -20356,13 +20499,13 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
    <title>Event Trigger Functions</title>
 
    <para>
-    <productname>PostgreSQL</> provides these helper functions
+    <productname>PostgreSQL</productname> provides these helper functions
     to retrieve information from event triggers.
    </para>
 
    <para>
     For more information about event triggers,
-    see <xref linkend="event-triggers">.
+    see <xref linkend="event-triggers"/>.
    </para>
 
   <sect2 id="pg-event-trigger-ddl-command-end-functions">
@@ -20373,12 +20516,12 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
    </indexterm>
 
    <para>
-    <function>pg_event_trigger_ddl_commands</> returns a list of
+    <function>pg_event_trigger_ddl_commands</function> returns a list of
     <acronym>DDL</acronym> commands executed by each user action,
     when invoked in a function attached to a
-    <literal>ddl_command_end</> event trigger.  If called in any other
+    <literal>ddl_command_end</literal> event trigger.  If called in any other
     context, an error is raised.
-    <function>pg_event_trigger_ddl_commands</> returns one row for each
+    <function>pg_event_trigger_ddl_commands</function> returns one row for each
     base command executed; some commands that are a single SQL sentence
     may return more than one row.  This function returns the following
     columns:
@@ -20423,7 +20566,7 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
         <entry><literal>schema_name</literal></entry>
         <entry><type>text</type></entry>
         <entry>
-         Name of the schema the object belongs in, if any; otherwise <literal>NULL</>.
+         Name of the schema the object belongs in, if any; otherwise <literal>NULL</literal>.
          No quoting is applied.
         </entry>
        </row>
@@ -20464,11 +20607,11 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
    </indexterm>
 
    <para>
-    <function>pg_event_trigger_dropped_objects</> returns a list of all objects
-    dropped by the command in whose <literal>sql_drop</> event it is called.
+    <function>pg_event_trigger_dropped_objects</function> returns a list of all objects
+    dropped by the command in whose <literal>sql_drop</literal> event it is called.
     If called in any other context,
-    <function>pg_event_trigger_dropped_objects</> raises an error.
-    <function>pg_event_trigger_dropped_objects</> returns the following columns:
+    <function>pg_event_trigger_dropped_objects</function> raises an error.
+    <function>pg_event_trigger_dropped_objects</function> returns the following columns:
 
     <informaltable>
      <tgroup cols="3">
@@ -20525,7 +20668,7 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
         <entry><literal>schema_name</literal></entry>
         <entry><type>text</type></entry>
         <entry>
-         Name of the schema the object belonged in, if any; otherwise <literal>NULL</>.
+         Name of the schema the object belonged in, if any; otherwise <literal>NULL</literal>.
          No quoting is applied.
         </entry>
        </row>
@@ -20534,7 +20677,7 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
         <entry><type>text</type></entry>
         <entry>
          Name of the object, if the combination of schema and name can be
-         used as a unique identifier for the object; otherwise <literal>NULL</>.
+         used as a unique identifier for the object; otherwise <literal>NULL</literal>.
          No quoting is applied, and name is never schema-qualified.
         </entry>
        </row>
@@ -20570,7 +20713,7 @@ FOR EACH ROW EXECUTE PROCEDURE suppress_redundant_updates_trigger();
    </para>
 
    <para>
-    The <function>pg_event_trigger_dropped_objects</> function can be used
+    The <function>pg_event_trigger_dropped_objects</function> function can be used
     in an event trigger like this:
 <programlisting>
 CREATE FUNCTION test_event_trigger_for_drops()
@@ -20601,9 +20744,9 @@ CREATE EVENT TRIGGER test_event_trigger_for_drops
 
    <para>
     The functions shown in
-    <xref linkend="functions-event-trigger-table-rewrite">
+    <xref linkend="functions-event-trigger-table-rewrite"/>
     provide information about a table for which a
-    <literal>table_rewrite</> event has just been called.
+    <literal>table_rewrite</literal> event has just been called.
     If called in any other context, an error is raised.
    </para>
 
@@ -20640,7 +20783,7 @@ CREATE EVENT TRIGGER test_event_trigger_for_drops
    </table>
 
    <para>
-    The <function>pg_event_trigger_table_rewrite_oid</> function can be used
+    The <function>pg_event_trigger_table_rewrite_oid</function> function can be used
     in an event trigger like this:
 <programlisting>
 CREATE FUNCTION test_event_trigger_table_rewrite_oid()
diff --git a/doc/src/sgml/fuzzystrmatch.sgml b/doc/src/sgml/fuzzystrmatch.sgml
index feb06861da..373ac4891d 100644
--- a/doc/src/sgml/fuzzystrmatch.sgml
+++ b/doc/src/sgml/fuzzystrmatch.sgml
@@ -8,14 +8,14 @@
  </indexterm>
 
  <para>
-  The <filename>fuzzystrmatch</> module provides several
+  The <filename>fuzzystrmatch</filename> module provides several
   functions to determine similarities and distance between strings.
  </para>
 
  <caution>
   <para>
-   At present, the <function>soundex</>, <function>metaphone</>,
-   <function>dmetaphone</>, and <function>dmetaphone_alt</> functions do
+   At present, the <function>soundex</function>, <function>metaphone</function>,
+   <function>dmetaphone</function>, and <function>dmetaphone_alt</function> functions do
    not work well with multibyte encodings (such as UTF-8).
   </para>
  </caution>
@@ -31,7 +31,7 @@
   </para>
 
   <para>
-   The <filename>fuzzystrmatch</> module provides two functions
+   The <filename>fuzzystrmatch</filename> module provides two functions
    for working with Soundex codes:
   </para>
 
@@ -49,12 +49,12 @@ difference(text, text) returns int
 </synopsis>
 
   <para>
-   The <function>soundex</> function converts a string to its Soundex code.
-   The <function>difference</> function converts two strings to their Soundex
+   The <function>soundex</function> function converts a string to its Soundex code.
+   The <function>difference</function> function converts two strings to their Soundex
    codes and then reports the number of matching code positions.  Since
    Soundex codes have four characters, the result ranges from zero to four,
    with zero being no match and four being an exact match.  (Thus, the
-   function is misnamed &mdash; <function>similarity</> would have been
+   function is misnamed &mdash; <function>similarity</function> would have been
    a better name.)
   </para>
 
@@ -115,10 +115,10 @@ levenshtein_less_equal(text source, text target, int max_d) returns int
   <para>
    <function>levenshtein_less_equal</function> is an accelerated version of the
    Levenshtein function for use when only small distances are of interest.
-   If the actual distance is less than or equal to <literal>max_d</>,
+   If the actual distance is less than or equal to <literal>max_d</literal>,
    then <function>levenshtein_less_equal</function> returns the correct
-   distance; otherwise it returns some value greater than <literal>max_d</>.
-   If <literal>max_d</> is negative then the behavior is the same as
+   distance; otherwise it returns some value greater than <literal>max_d</literal>.
+   If <literal>max_d</literal> is negative then the behavior is the same as
    <function>levenshtein</function>.
   </para>
 
@@ -133,19 +133,19 @@ test=# SELECT levenshtein('GUMBO', 'GAMBOL');
            2
 (1 row)
 
-test=# SELECT levenshtein('GUMBO', 'GAMBOL', 2,1,1);
+test=# SELECT levenshtein('GUMBO', 'GAMBOL', 2, 1, 1);
  levenshtein
 -------------
            3
 (1 row)
 
-test=# SELECT levenshtein_less_equal('extensive', 'exhaustive',2);
+test=# SELECT levenshtein_less_equal('extensive', 'exhaustive', 2);
  levenshtein_less_equal
 ------------------------
                       3
 (1 row)
 
-test=# SELECT levenshtein_less_equal('extensive', 'exhaustive',4);
+test=# SELECT levenshtein_less_equal('extensive', 'exhaustive', 4);
  levenshtein_less_equal
 ------------------------
                       4
@@ -198,9 +198,9 @@ test=# SELECT metaphone('GUMBO', 4);
   <title>Double Metaphone</title>
 
   <para>
-   The Double Metaphone system computes two <quote>sounds like</> strings
-   for a given input string &mdash; a <quote>primary</> and an
-   <quote>alternate</>.  In most cases they are the same, but for non-English
+   The Double Metaphone system computes two <quote>sounds like</quote> strings
+   for a given input string &mdash; a <quote>primary</quote> and an
+   <quote>alternate</quote>.  In most cases they are the same, but for non-English
    names especially they can be a bit different, depending on pronunciation.
    These functions compute the primary and alternate codes:
   </para>
@@ -227,7 +227,7 @@ dmetaphone_alt(text source) returns text
   </para>
 
 <screen>
-test=# select dmetaphone('gumbo');
+test=# SELECT dmetaphone('gumbo');
  dmetaphone
 ------------
  KMP
diff --git a/doc/src/sgml/generate-errcodes-table.pl b/doc/src/sgml/generate-errcodes-table.pl
index 01fc6166bf..ebec43159e 100644
--- a/doc/src/sgml/generate-errcodes-table.pl
+++ b/doc/src/sgml/generate-errcodes-table.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate the errcodes-table.sgml file from errcodes.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
@@ -30,12 +30,12 @@
 		s/-/&mdash;/;
 
 		# Wrap PostgreSQL in <productname/>
-		s/PostgreSQL/<productname>PostgreSQL<\/>/g;
+		s/PostgreSQL/<productname>PostgreSQL<\/productname>/g;
 
 		print "\n\n";
 		print "<row>\n";
 		print "<entry spanname=\"span12\">";
-		print "<emphasis role=\"bold\">$_</></entry>\n";
+		print "<emphasis role=\"bold\">$_</emphasis></entry>\n";
 		print "</row>\n";
 
 		next;
diff --git a/doc/src/sgml/generic-wal.sgml b/doc/src/sgml/generic-wal.sgml
index dfa78c5ca2..7a0284994c 100644
--- a/doc/src/sgml/generic-wal.sgml
+++ b/doc/src/sgml/generic-wal.sgml
@@ -13,8 +13,8 @@
 
   <para>
    The API for constructing generic WAL records is defined in
-   <filename>access/generic_xlog.h</> and implemented
-   in <filename>access/transam/generic_xlog.c</>.
+   <filename>access/generic_xlog.h</filename> and implemented
+   in <filename>access/transam/generic_xlog.c</filename>.
   </para>
 
   <para>
@@ -24,24 +24,24 @@
    <orderedlist>
     <listitem>
      <para>
-      <function>state = GenericXLogStart(relation)</> &mdash; start
+      <function>state = GenericXLogStart(relation)</function> &mdash; start
       construction of a generic WAL record for the given relation.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <function>page = GenericXLogRegisterBuffer(state, buffer, flags)</>
+      <function>page = GenericXLogRegisterBuffer(state, buffer, flags)</function>
       &mdash; register a buffer to be modified within the current generic WAL
       record.  This function returns a pointer to a temporary copy of the
       buffer's page, where modifications should be made.  (Do not modify the
       buffer's contents directly.)  The third argument is a bit mask of flags
       applicable to the operation.  Currently the only such flag is
-      <literal>GENERIC_XLOG_FULL_IMAGE</>, which indicates that a full-page
+      <literal>GENERIC_XLOG_FULL_IMAGE</literal>, which indicates that a full-page
       image rather than a delta update should be included in the WAL record.
       Typically this flag would be set if the page is new or has been
       rewritten completely.
-      <function>GenericXLogRegisterBuffer</> can be repeated if the
+      <function>GenericXLogRegisterBuffer</function> can be repeated if the
       WAL-logged action needs to modify multiple pages.
      </para>
     </listitem>
@@ -54,7 +54,7 @@
 
     <listitem>
      <para>
-      <function>GenericXLogFinish(state)</> &mdash; apply the changes to
+      <function>GenericXLogFinish(state)</function> &mdash; apply the changes to
       the buffers and emit the generic WAL record.
      </para>
     </listitem>
@@ -63,7 +63,7 @@
 
   <para>
    WAL record construction can be canceled between any of the above steps by
-   calling <function>GenericXLogAbort(state)</>.  This will discard all
+   calling <function>GenericXLogAbort(state)</function>.  This will discard all
    changes to the page image copies.
   </para>
 
@@ -75,13 +75,13 @@
     <listitem>
      <para>
       No direct modifications of buffers are allowed!  All modifications must
-      be done in copies acquired from <function>GenericXLogRegisterBuffer()</>.
+      be done in copies acquired from <function>GenericXLogRegisterBuffer()</function>.
       In other words, code that makes generic WAL records should never call
-      <function>BufferGetPage()</> for itself.  However, it remains the
+      <function>BufferGetPage()</function> for itself.  However, it remains the
       caller's responsibility to pin/unpin and lock/unlock the buffers at
       appropriate times.  Exclusive lock must be held on each target buffer
-      from before <function>GenericXLogRegisterBuffer()</> until after
-      <function>GenericXLogFinish()</>.
+      from before <function>GenericXLogRegisterBuffer()</function> until after
+      <function>GenericXLogFinish()</function>.
      </para>
     </listitem>
 
@@ -97,7 +97,7 @@
     <listitem>
      <para>
       The maximum number of buffers that can be registered for a generic WAL
-      record is <literal>MAX_GENERIC_XLOG_PAGES</>.  An error will be thrown
+      record is <literal>MAX_GENERIC_XLOG_PAGES</literal>.  An error will be thrown
       if this limit is exceeded.
      </para>
     </listitem>
@@ -106,26 +106,26 @@
      <para>
       Generic WAL assumes that the pages to be modified have standard
       layout, and in particular that there is no useful data between
-      <structfield>pd_lower</> and <structfield>pd_upper</>.
+      <structfield>pd_lower</structfield> and <structfield>pd_upper</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Since you are modifying copies of buffer
-      pages, <function>GenericXLogStart()</> does not start a critical
+      pages, <function>GenericXLogStart()</function> does not start a critical
       section.  Thus, you can safely do memory allocation, error throwing,
-      etc. between <function>GenericXLogStart()</> and
-      <function>GenericXLogFinish()</>.  The only actual critical section is
-      present inside <function>GenericXLogFinish()</>.  There is no need to
-      worry about calling  <function>GenericXLogAbort()</> during an error
+      etc. between <function>GenericXLogStart()</function> and
+      <function>GenericXLogFinish()</function>.  The only actual critical section is
+      present inside <function>GenericXLogFinish()</function>.  There is no need to
+      worry about calling  <function>GenericXLogAbort()</function> during an error
       exit, either.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <function>GenericXLogFinish()</> takes care of marking buffers dirty
+      <function>GenericXLogFinish()</function> takes care of marking buffers dirty
       and setting their LSNs.  You do not need to do this explicitly.
      </para>
     </listitem>
@@ -148,7 +148,7 @@
 
     <listitem>
      <para>
-      If <literal>GENERIC_XLOG_FULL_IMAGE</> is not specified for a
+      If <literal>GENERIC_XLOG_FULL_IMAGE</literal> is not specified for a
       registered buffer, the generic WAL record contains a delta between
       the old and the new page images.  This delta is based on byte-by-byte
       comparison.  This is not very compact for the case of moving data
diff --git a/doc/src/sgml/geqo.sgml b/doc/src/sgml/geqo.sgml
index e0f8adcd6e..5120dfbb42 100644
--- a/doc/src/sgml/geqo.sgml
+++ b/doc/src/sgml/geqo.sgml
@@ -88,7 +88,7 @@
    </para>
 
    <para>
-    According to the <systemitem class="resource">comp.ai.genetic</> <acronym>FAQ</acronym> it cannot be stressed too
+    According to the <systemitem class="resource">comp.ai.genetic</systemitem> <acronym>FAQ</acronym> it cannot be stressed too
     strongly that a <acronym>GA</acronym> is not a pure random search for a solution to a
     problem. A <acronym>GA</acronym> uses stochastic processes, but the result is distinctly
     non-random (better than random).
@@ -222,7 +222,7 @@
     are considered; and all the initially-determined relation scan plans
     are available.  The estimated cost is the cheapest of these
     possibilities.)  Join sequences with lower estimated cost are considered
-    <quote>more fit</> than those with higher cost.  The genetic algorithm
+    <quote>more fit</quote> than those with higher cost.  The genetic algorithm
     discards the least fit candidates.  Then new candidates are generated
     by combining genes of more-fit candidates &mdash; that is, by using
     randomly-chosen portions of known low-cost join sequences to create
@@ -235,20 +235,20 @@
    <para>
     This process is inherently nondeterministic, because of the randomized
     choices made during both the initial population selection and subsequent
-    <quote>mutation</> of the best candidates.  To avoid surprising changes
+    <quote>mutation</quote> of the best candidates.  To avoid surprising changes
     of the selected plan, each run of the GEQO algorithm restarts its
-    random number generator with the current <xref linkend="guc-geqo-seed">
-    parameter setting.  As long as <varname>geqo_seed</> and the other
+    random number generator with the current <xref linkend="guc-geqo-seed"/>
+    parameter setting.  As long as <varname>geqo_seed</varname> and the other
     GEQO parameters are kept fixed, the same plan will be generated for a
     given query (and other planner inputs such as statistics).  To experiment
-    with different search paths, try changing <varname>geqo_seed</>.
+    with different search paths, try changing <varname>geqo_seed</varname>.
    </para>
 
   </sect2>
 
   <sect2 id="geqo-future">
    <title>Future Implementation Tasks for
-    <productname>PostgreSQL</> <acronym>GEQO</acronym></title>
+    <productname>PostgreSQL</productname> <acronym>GEQO</acronym></title>
 
      <para>
       Work is still needed to improve the genetic algorithm parameter
@@ -320,13 +320,13 @@
 
     <listitem>
      <para>
-      <xref linkend="ELMA04">
+      <xref linkend="elma04"/>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <xref linkend="FONG">
+      <xref linkend="fong"/>
      </para>
     </listitem>
    </itemizedlist>
diff --git a/doc/src/sgml/gin.sgml b/doc/src/sgml/gin.sgml
index 7c2321ec3c..cc7cd1ed2c 100644
--- a/doc/src/sgml/gin.sgml
+++ b/doc/src/sgml/gin.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/gin.sgml -->
 
-<chapter id="GIN">
+<chapter id="gin">
 <title>GIN Indexes</title>
 
    <indexterm>
@@ -21,15 +21,15 @@
  </para>
 
  <para>
-  We use the word <firstterm>item</> to refer to a composite value that
-  is to be indexed, and the word <firstterm>key</> to refer to an element
+  We use the word <firstterm>item</firstterm> to refer to a composite value that
+  is to be indexed, and the word <firstterm>key</firstterm> to refer to an element
   value.  <acronym>GIN</acronym> always stores and searches for keys,
   not item values per se.
  </para>
 
  <para>
   A <acronym>GIN</acronym> index stores a set of (key, posting list) pairs,
-  where a <firstterm>posting list</> is a set of row IDs in which the key
+  where a <firstterm>posting list</firstterm> is a set of row IDs in which the key
   occurs.  The same row ID can appear in multiple posting lists, since
   an item can contain more than one key.  Each key value is stored only
   once, so a <acronym>GIN</acronym> index is very compact for cases
@@ -66,10 +66,10 @@
  <title>Built-in Operator Classes</title>
 
  <para>
-  The core <productname>PostgreSQL</> distribution
+  The core <productname>PostgreSQL</productname> distribution
   includes the <acronym>GIN</acronym> operator classes shown in
-  <xref linkend="gin-builtin-opclasses-table">.
-  (Some of the optional modules described in <xref linkend="contrib">
+  <xref linkend="gin-builtin-opclasses-table"/>.
+  (Some of the optional modules described in <xref linkend="contrib"/>
   provide additional <acronym>GIN</acronym> operator classes.)
  </para>
 
@@ -85,38 +85,38 @@
     </thead>
     <tbody>
      <row>
-      <entry><literal>array_ops</></entry>
-      <entry><type>anyarray</></entry>
+      <entry><literal>array_ops</literal></entry>
+      <entry><type>anyarray</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&lt;@</>
-       <literal>=</>
-       <literal>@&gt;</>
+       <literal>&amp;&amp;</literal>
+       <literal>&lt;@</literal>
+       <literal>=</literal>
+       <literal>@&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>jsonb_ops</></entry>
-      <entry><type>jsonb</></entry>
+      <entry><literal>jsonb_ops</literal></entry>
+      <entry><type>jsonb</type></entry>
       <entry>
-       <literal>?</>
-       <literal>?&amp;</>
-       <literal>?|</>
-       <literal>@&gt;</>
+       <literal>?</literal>
+       <literal>?&amp;</literal>
+       <literal>?|</literal>
+       <literal>@&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>jsonb_path_ops</></entry>
-      <entry><type>jsonb</></entry>
+      <entry><literal>jsonb_path_ops</literal></entry>
+      <entry><type>jsonb</type></entry>
       <entry>
-       <literal>@&gt;</>
+       <literal>@&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>tsvector_ops</></entry>
-      <entry><type>tsvector</></entry>
+      <entry><literal>tsvector_ops</literal></entry>
+      <entry><type>tsvector</type></entry>
       <entry>
-       <literal>@@</>
-       <literal>@@@</>
+       <literal>@@</literal>
+       <literal>@@@</literal>
       </entry>
      </row>
     </tbody>
@@ -124,10 +124,10 @@
   </table>
 
  <para>
-  Of the two operator classes for type <type>jsonb</>, <literal>jsonb_ops</>
-  is the default.  <literal>jsonb_path_ops</> supports fewer operators but
+  Of the two operator classes for type <type>jsonb</type>, <literal>jsonb_ops</literal>
+  is the default.  <literal>jsonb_path_ops</literal> supports fewer operators but
   offers better performance for those operators.
-  See <xref linkend="json-indexing"> for details.
+  See <xref linkend="json-indexing"/> for details.
  </para>
 
 </sect1>
@@ -157,15 +157,15 @@
   <variablelist>
     <varlistentry>
      <term><function>Datum *extractValue(Datum itemValue, int32 *nkeys,
-        bool **nullFlags)</></term>
+        bool **nullFlags)</function></term>
      <listitem>
       <para>
        Returns a palloc'd array of keys given an item to be indexed.  The
-       number of returned keys must be stored into <literal>*nkeys</>.
+       number of returned keys must be stored into <literal>*nkeys</literal>.
        If any of the keys can be null, also palloc an array of
-       <literal>*nkeys</> <type>bool</type> fields, store its address at
-       <literal>*nullFlags</>, and set these null flags as needed.
-       <literal>*nullFlags</> can be left <symbol>NULL</symbol> (its initial value)
+       <literal>*nkeys</literal> <type>bool</type> fields, store its address at
+       <literal>*nullFlags</literal>, and set these null flags as needed.
+       <literal>*nullFlags</literal> can be left <symbol>NULL</symbol> (its initial value)
        if all keys are non-null.
        The return value can be <symbol>NULL</symbol> if the item contains no keys.
       </para>
@@ -175,40 +175,40 @@
     <varlistentry>
      <term><function>Datum *extractQuery(Datum query, int32 *nkeys,
         StrategyNumber n, bool **pmatch, Pointer **extra_data,
-        bool **nullFlags, int32 *searchMode)</></term>
+        bool **nullFlags, int32 *searchMode)</function></term>
      <listitem>
       <para>
        Returns a palloc'd array of keys given a value to be queried; that is,
-       <literal>query</> is the value on the right-hand side of an
+       <literal>query</literal> is the value on the right-hand side of an
        indexable operator whose left-hand side is the indexed column.
-       <literal>n</> is the strategy number of the operator within the
-       operator class (see <xref linkend="xindex-strategies">).
-       Often, <function>extractQuery</> will need
-       to consult <literal>n</> to determine the data type of
-       <literal>query</> and the method it should use to extract key values.
-       The number of returned keys must be stored into <literal>*nkeys</>.
+       <literal>n</literal> is the strategy number of the operator within the
+       operator class (see <xref linkend="xindex-strategies"/>).
+       Often, <function>extractQuery</function> will need
+       to consult <literal>n</literal> to determine the data type of
+       <literal>query</literal> and the method it should use to extract key values.
+       The number of returned keys must be stored into <literal>*nkeys</literal>.
        If any of the keys can be null, also palloc an array of
-       <literal>*nkeys</> <type>bool</type> fields, store its address at
-       <literal>*nullFlags</>, and set these null flags as needed.
-       <literal>*nullFlags</> can be left <symbol>NULL</symbol> (its initial value)
+       <literal>*nkeys</literal> <type>bool</type> fields, store its address at
+       <literal>*nullFlags</literal>, and set these null flags as needed.
+       <literal>*nullFlags</literal> can be left <symbol>NULL</symbol> (its initial value)
        if all keys are non-null.
-       The return value can be <symbol>NULL</symbol> if the <literal>query</> contains no keys.
+       The return value can be <symbol>NULL</symbol> if the <literal>query</literal> contains no keys.
       </para>
 
       <para>
-       <literal>searchMode</> is an output argument that allows
-       <function>extractQuery</> to specify details about how the search
+       <literal>searchMode</literal> is an output argument that allows
+       <function>extractQuery</function> to specify details about how the search
        will be done.
-       If <literal>*searchMode</> is set to
-       <literal>GIN_SEARCH_MODE_DEFAULT</> (which is the value it is
+       If <literal>*searchMode</literal> is set to
+       <literal>GIN_SEARCH_MODE_DEFAULT</literal> (which is the value it is
        initialized to before call), only items that match at least one of
        the returned keys are considered candidate matches.
-       If <literal>*searchMode</> is set to
-       <literal>GIN_SEARCH_MODE_INCLUDE_EMPTY</>, then in addition to items
+       If <literal>*searchMode</literal> is set to
+       <literal>GIN_SEARCH_MODE_INCLUDE_EMPTY</literal>, then in addition to items
        containing at least one matching key, items that contain no keys at
        all are considered candidate matches.  (This mode is useful for
        implementing is-subset-of operators, for example.)
-       If <literal>*searchMode</> is set to <literal>GIN_SEARCH_MODE_ALL</>,
+       If <literal>*searchMode</literal> is set to <literal>GIN_SEARCH_MODE_ALL</literal>,
        then all non-null items in the index are considered candidate
        matches, whether they match any of the returned keys or not.  (This
        mode is much slower than the other two choices, since it requires
@@ -217,33 +217,33 @@
        in most cases is probably not a good candidate for a GIN operator
        class.)
        The symbols to use for setting this mode are defined in
-       <filename>access/gin.h</>.
+       <filename>access/gin.h</filename>.
       </para>
 
       <para>
-       <literal>pmatch</> is an output argument for use when partial match
-       is supported.  To use it, <function>extractQuery</> must allocate
-       an array of <literal>*nkeys</> booleans and store its address at
-       <literal>*pmatch</>.  Each element of the array should be set to TRUE
-       if the corresponding key requires partial match, FALSE if not.
-       If <literal>*pmatch</> is set to <symbol>NULL</symbol> then GIN assumes partial match
+       <literal>pmatch</literal> is an output argument for use when partial match
+       is supported.  To use it, <function>extractQuery</function> must allocate
+       an array of <literal>*nkeys</literal> bools and store its address at
+       <literal>*pmatch</literal>.  Each element of the array should be set to true
+       if the corresponding key requires partial match, false if not.
+       If <literal>*pmatch</literal> is set to <symbol>NULL</symbol> then GIN assumes partial match
        is not required.  The variable is initialized to <symbol>NULL</symbol> before call,
        so this argument can simply be ignored by operator classes that do
        not support partial match.
       </para>
 
       <para>
-       <literal>extra_data</> is an output argument that allows
-       <function>extractQuery</> to pass additional data to the
-       <function>consistent</> and <function>comparePartial</> methods.
-       To use it, <function>extractQuery</> must allocate
-       an array of <literal>*nkeys</> pointers and store its address at
-       <literal>*extra_data</>, then store whatever it wants to into the
+       <literal>extra_data</literal> is an output argument that allows
+       <function>extractQuery</function> to pass additional data to the
+       <function>consistent</function> and <function>comparePartial</function> methods.
+       To use it, <function>extractQuery</function> must allocate
+       an array of <literal>*nkeys</literal> pointers and store its address at
+       <literal>*extra_data</literal>, then store whatever it wants to into the
        individual pointers.  The variable is initialized to <symbol>NULL</symbol> before
        call, so this argument can simply be ignored by operator classes that
-       do not require extra data.  If <literal>*extra_data</> is set, the
-       whole array is passed to the <function>consistent</> method, and
-       the appropriate element to the <function>comparePartial</> method.
+       do not require extra data.  If <literal>*extra_data</literal> is set, the
+       whole array is passed to the <function>consistent</function> method, and
+       the appropriate element to the <function>comparePartial</function> method.
       </para>
 
      </listitem>
@@ -251,10 +251,10 @@
   </variablelist>
 
   An operator class must also provide a function to check if an indexed item
-  matches the query. It comes in two flavors, a boolean <function>consistent</>
-  function, and a ternary <function>triConsistent</> function.
-  <function>triConsistent</> covers the functionality of both, so providing
-  <function>triConsistent</> alone is sufficient. However, if the boolean
+  matches the query. It comes in two flavors, a boolean <function>consistent</function>
+  function, and a ternary <function>triConsistent</function> function.
+  <function>triConsistent</function> covers the functionality of both, so providing
+  <function>triConsistent</function> alone is sufficient. However, if the boolean
   variant is significantly cheaper to calculate, it can be advantageous to
   provide both.  If only the boolean variant is provided, some optimizations
   that depend on refuting index items before fetching all the keys are
@@ -264,48 +264,48 @@
     <varlistentry>
      <term><function>bool consistent(bool check[], StrategyNumber n, Datum query,
         int32 nkeys, Pointer extra_data[], bool *recheck,
-        Datum queryKeys[], bool nullFlags[])</></term>
+        Datum queryKeys[], bool nullFlags[])</function></term>
      <listitem>
       <para>
-       Returns TRUE if an indexed item satisfies the query operator with
-       strategy number <literal>n</> (or might satisfy it, if the recheck
+       Returns true if an indexed item satisfies the query operator with
+       strategy number <literal>n</literal> (or might satisfy it, if the recheck
        indication is returned).  This function does not have direct access
        to the indexed item's value, since <acronym>GIN</acronym> does not
        store items explicitly.  Rather, what is available is knowledge
        about which key values extracted from the query appear in a given
-       indexed item.  The <literal>check</> array has length
-       <literal>nkeys</>, which is the same as the number of keys previously
-       returned by <function>extractQuery</> for this <literal>query</> datum.
+       indexed item.  The <literal>check</literal> array has length
+       <literal>nkeys</literal>, which is the same as the number of keys previously
+       returned by <function>extractQuery</function> for this <literal>query</literal> datum.
        Each element of the
-       <literal>check</> array is TRUE if the indexed item contains the
-       corresponding query key, i.e., if (check[i] == TRUE) the i-th key of the
-       <function>extractQuery</> result array is present in the indexed item.
-       The original <literal>query</> datum is
-       passed in case the <function>consistent</> method needs to consult it,
-       and so are the <literal>queryKeys[]</> and <literal>nullFlags[]</>
-       arrays previously returned by <function>extractQuery</>.
-       <literal>extra_data</> is the extra-data array returned by
-       <function>extractQuery</>, or <symbol>NULL</symbol> if none.
+       <literal>check</literal> array is true if the indexed item contains the
+       corresponding query key, i.e., if (check[i] == true) the i-th key of the
+       <function>extractQuery</function> result array is present in the indexed item.
+       The original <literal>query</literal> datum is
+       passed in case the <function>consistent</function> method needs to consult it,
+       and so are the <literal>queryKeys[]</literal> and <literal>nullFlags[]</literal>
+       arrays previously returned by <function>extractQuery</function>.
+       <literal>extra_data</literal> is the extra-data array returned by
+       <function>extractQuery</function>, or <symbol>NULL</symbol> if none.
       </para>
 
       <para>
-       When <function>extractQuery</> returns a null key in
-       <literal>queryKeys[]</>, the corresponding <literal>check[]</> element
-       is TRUE if the indexed item contains a null key; that is, the
-       semantics of <literal>check[]</> are like <literal>IS NOT DISTINCT
-       FROM</>.  The <function>consistent</> function can examine the
-       corresponding <literal>nullFlags[]</> element if it needs to tell
+       When <function>extractQuery</function> returns a null key in
+       <literal>queryKeys[]</literal>, the corresponding <literal>check[]</literal> element
+       is true if the indexed item contains a null key; that is, the
+       semantics of <literal>check[]</literal> are like <literal>IS NOT DISTINCT
+       FROM</literal>.  The <function>consistent</function> function can examine the
+       corresponding <literal>nullFlags[]</literal> element if it needs to tell
        the difference between a regular value match and a null match.
       </para>
 
       <para>
-       On success, <literal>*recheck</> should be set to TRUE if the heap
-       tuple needs to be rechecked against the query operator, or FALSE if
-       the index test is exact.  That is, a FALSE return value guarantees
-       that the heap tuple does not match the query; a TRUE return value with
-       <literal>*recheck</> set to FALSE guarantees that the heap tuple does
-       match the query; and a TRUE return value with
-       <literal>*recheck</> set to TRUE means that the heap tuple might match
+       On success, <literal>*recheck</literal> should be set to true if the heap
+       tuple needs to be rechecked against the query operator, or false if
+       the index test is exact.  That is, a false return value guarantees
+       that the heap tuple does not match the query; a true return value with
+       <literal>*recheck</literal> set to false guarantees that the heap tuple does
+       match the query; and a true return value with
+       <literal>*recheck</literal> set to true means that the heap tuple might match
        the query, so it needs to be fetched and rechecked by evaluating the
        query operator directly against the originally indexed item.
       </para>
@@ -315,30 +315,30 @@
     <varlistentry>
      <term><function>GinTernaryValue triConsistent(GinTernaryValue check[], StrategyNumber n, Datum query,
         int32 nkeys, Pointer extra_data[],
-        Datum queryKeys[], bool nullFlags[])</></term>
+        Datum queryKeys[], bool nullFlags[])</function></term>
      <listitem>
       <para>
-       <function>triConsistent</> is similar to <function>consistent</>,
-       but instead of booleans in the <literal>check</> vector, there are
+       <function>triConsistent</function> is similar to <function>consistent</function>,
+       but instead of booleans in the <literal>check</literal> vector, there are
        three possible values for each
-       key: <literal>GIN_TRUE</>, <literal>GIN_FALSE</> and
-       <literal>GIN_MAYBE</>. <literal>GIN_FALSE</> and <literal>GIN_TRUE</>
+       key: <literal>GIN_TRUE</literal>, <literal>GIN_FALSE</literal> and
+       <literal>GIN_MAYBE</literal>. <literal>GIN_FALSE</literal> and <literal>GIN_TRUE</literal>
        have the same meaning as regular boolean values, while
-       <literal>GIN_MAYBE</> means that the presence of that key is not known.
-       When <literal>GIN_MAYBE</> values are present, the function should only
-       return <literal>GIN_TRUE</> if the item certainly matches whether or
+       <literal>GIN_MAYBE</literal> means that the presence of that key is not known.
+       When <literal>GIN_MAYBE</literal> values are present, the function should only
+       return <literal>GIN_TRUE</literal> if the item certainly matches whether or
        not the index item contains the corresponding query keys. Likewise, the
-       function must return <literal>GIN_FALSE</> only if the item certainly
-       does not match, whether or not it contains the <literal>GIN_MAYBE</>
-       keys. If the result depends on the <literal>GIN_MAYBE</> entries, i.e.,
+       function must return <literal>GIN_FALSE</literal> only if the item certainly
+       does not match, whether or not it contains the <literal>GIN_MAYBE</literal>
+       keys. If the result depends on the <literal>GIN_MAYBE</literal> entries, i.e.,
        the match cannot be confirmed or refuted based on the known query keys,
-       the function must return <literal>GIN_MAYBE</>.
+       the function must return <literal>GIN_MAYBE</literal>.
       </para>
       <para>
-       When there are no <literal>GIN_MAYBE</> values in the <literal>check</>
-       vector, a <literal>GIN_MAYBE</> return value is the equivalent of
-       setting the <literal>recheck</> flag in the
-       boolean <function>consistent</> function.
+       When there are no <literal>GIN_MAYBE</literal> values in the <literal>check</literal>
+       vector, a <literal>GIN_MAYBE</literal> return value is the equivalent of
+       setting the <literal>recheck</literal> flag in the
+       boolean <function>consistent</function> function.
       </para>
      </listitem>
     </varlistentry>
@@ -352,7 +352,7 @@
 
   <variablelist>
     <varlistentry>
-     <term><function>int compare(Datum a, Datum b)</></term>
+     <term><function>int compare(Datum a, Datum b)</function></term>
      <listitem>
       <para>
        Compares two keys (not indexed items!) and returns an integer less than
@@ -364,13 +364,13 @@
     </varlistentry>
   </variablelist>
 
-  Alternatively, if the operator class does not provide a <function>compare</>
+  Alternatively, if the operator class does not provide a <function>compare</function>
   method, GIN will look up the default btree operator class for the index
   key data type, and use its comparison function.  It is recommended to
   specify the comparison function in a GIN operator class that is meant for
   just one data type, as looking up the btree operator class costs a few
   cycles.  However, polymorphic GIN operator classes (such
-  as <literal>array_ops</>) typically cannot specify a single comparison
+  as <literal>array_ops</literal>) typically cannot specify a single comparison
   function.
  </para>
 
@@ -381,7 +381,7 @@
   <variablelist>
     <varlistentry>
      <term><function>int comparePartial(Datum partial_key, Datum key, StrategyNumber n,
-                              Pointer extra_data)</></term>
+                              Pointer extra_data)</function></term>
      <listitem>
       <para>
        Compare a partial-match query key to an index key.  Returns an integer
@@ -389,11 +389,11 @@
        does not match the query, but the index scan should continue; zero
        means that the index key does match the query; greater than zero
        indicates that the index scan should stop because no more matches
-       are possible.  The strategy number <literal>n</> of the operator
+       are possible.  The strategy number <literal>n</literal> of the operator
        that generated the partial match query is provided, in case its
        semantics are needed to determine when to end the scan.  Also,
-       <literal>extra_data</> is the corresponding element of the extra-data
-       array made by <function>extractQuery</>, or <symbol>NULL</symbol> if none.
+       <literal>extra_data</literal> is the corresponding element of the extra-data
+       array made by <function>extractQuery</function>, or <symbol>NULL</symbol> if none.
        Null keys are never passed to this function.
       </para>
      </listitem>
@@ -402,25 +402,25 @@
  </para>
 
  <para>
-  To support <quote>partial match</> queries, an operator class must
-  provide the <function>comparePartial</> method, and its
-  <function>extractQuery</> method must set the <literal>pmatch</>
+  To support <quote>partial match</quote> queries, an operator class must
+  provide the <function>comparePartial</function> method, and its
+  <function>extractQuery</function> method must set the <literal>pmatch</literal>
   parameter when a partial-match query is encountered.  See
-  <xref linkend="gin-partial-match"> for details.
+  <xref linkend="gin-partial-match"/> for details.
  </para>
 
  <para>
-  The actual data types of the various <literal>Datum</> values mentioned
+  The actual data types of the various <literal>Datum</literal> values mentioned
   above vary depending on the operator class.  The item values passed to
-  <function>extractValue</> are always of the operator class's input type, and
-  all key values must be of the class's <literal>STORAGE</> type.  The type of
-  the <literal>query</> argument passed to <function>extractQuery</>,
-  <function>consistent</> and <function>triConsistent</> is whatever is the
+  <function>extractValue</function> are always of the operator class's input type, and
+  all key values must be of the class's <literal>STORAGE</literal> type.  The type of
+  the <literal>query</literal> argument passed to <function>extractQuery</function>,
+  <function>consistent</function> and <function>triConsistent</function> is whatever is the
   right-hand input type of the class member operator identified by the
   strategy number.  This need not be the same as the indexed type, so long as
   key values of the correct type can be extracted from it.  However, it is
   recommended that the SQL declarations of these three support functions use
-  the opclass's indexed data type for the <literal>query</> argument, even
+  the opclass's indexed data type for the <literal>query</literal> argument, even
   though the actual type might be something else depending on the operator.
  </para>
 
@@ -434,8 +434,8 @@
   constructed over keys, where each key is an element of one or more indexed
   items (a member of an array, for example) and where each tuple in a leaf
   page contains either a pointer to a B-tree of heap pointers (a
-  <quote>posting tree</>), or a simple list of heap pointers (a <quote>posting
-  list</>) when the list is small enough to fit into a single index tuple along
+  <quote>posting tree</quote>), or a simple list of heap pointers (a <quote>posting
+  list</quote>) when the list is small enough to fit into a single index tuple along
   with the key value.
  </para>
 
@@ -443,7 +443,7 @@
   As of <productname>PostgreSQL</productname> 9.1, null key values can be
   included in the index.  Also, placeholder nulls are included in the index
   for indexed items that are null or contain no keys according to
-  <function>extractValue</>.  This allows searches that should find empty
+  <function>extractValue</function>.  This allows searches that should find empty
   items to do so.
  </para>
 
@@ -461,12 +461,12 @@
    intrinsic nature of inverted indexes: inserting or updating one heap row
    can cause many inserts into the index (one for each key extracted
    from the indexed item). As of <productname>PostgreSQL</productname> 8.4,
-   <acronym>GIN</> is capable of postponing much of this work by inserting
+   <acronym>GIN</acronym> is capable of postponing much of this work by inserting
    new tuples into a temporary, unsorted list of pending entries.
    When the table is vacuumed or autoanalyzed, or when
    <function>gin_clean_pending_list</function> function is called, or if the
    pending list becomes larger than
-   <xref linkend="guc-gin-pending-list-limit">, the entries are moved to the
+   <xref linkend="guc-gin-pending-list-limit"/>, the entries are moved to the
    main <acronym>GIN</acronym> data structure using the same bulk insert
    techniques used during initial index creation.  This greatly improves
    <acronym>GIN</acronym> index update speed, even counting the additional
@@ -479,7 +479,7 @@
    of pending entries in addition to searching the regular index, and so
    a large list of pending entries will slow searches significantly.
    Another disadvantage is that, while most updates are fast, an update
-   that causes the pending list to become <quote>too large</> will incur an
+   that causes the pending list to become <quote>too large</quote> will incur an
    immediate cleanup cycle and thus be much slower than other updates.
    Proper use of autovacuum can minimize both of these problems.
   </para>
@@ -488,7 +488,7 @@
    If consistent response time is more important than update speed,
    use of pending entries can be disabled by turning off the
    <literal>fastupdate</literal> storage parameter for a
-   <acronym>GIN</acronym> index.  See <xref linkend="sql-createindex">
+   <acronym>GIN</acronym> index.  See <xref linkend="sql-createindex"/>
    for details.
   </para>
  </sect2>
@@ -497,15 +497,15 @@
   <title>Partial Match Algorithm</title>
 
   <para>
-   GIN can support <quote>partial match</> queries, in which the query
+   GIN can support <quote>partial match</quote> queries, in which the query
    does not determine an exact match for one or more keys, but the possible
    matches fall within a reasonably narrow range of key values (within the
-   key sorting order determined by the <function>compare</> support method).
-   The <function>extractQuery</> method, instead of returning a key value
+   key sorting order determined by the <function>compare</function> support method).
+   The <function>extractQuery</function> method, instead of returning a key value
    to be matched exactly, returns a key value that is the lower bound of
-   the range to be searched, and sets the <literal>pmatch</> flag true.
-   The key range is then scanned using the <function>comparePartial</>
-   method.  <function>comparePartial</> must return zero for a matching
+   the range to be searched, and sets the <literal>pmatch</literal> flag true.
+   The key range is then scanned using the <function>comparePartial</function>
+   method.  <function>comparePartial</function> must return zero for a matching
    index key, less than zero for a non-match that is still within the range
    to be searched, or greater than zero if the index key is past the range
    that could match.
@@ -531,40 +531,40 @@
     <para>
      As of <productname>PostgreSQL</productname> 8.4, this advice is less
      necessary since delayed indexing is used (see <xref
-     linkend="gin-fast-update"> for details).  But for very large updates
+     linkend="gin-fast-update"/> for details).  But for very large updates
      it may still be best to drop and recreate the index.
     </para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><xref linkend="guc-maintenance-work-mem"></term>
+   <term><xref linkend="guc-maintenance-work-mem"/></term>
    <listitem>
     <para>
      Build time for a <acronym>GIN</acronym> index is very sensitive to
-     the <varname>maintenance_work_mem</> setting; it doesn't pay to
+     the <varname>maintenance_work_mem</varname> setting; it doesn't pay to
      skimp on work memory during index creation.
     </para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><xref linkend="guc-gin-pending-list-limit"></term>
+   <term><xref linkend="guc-gin-pending-list-limit"/></term>
    <listitem>
     <para>
      During a series of insertions into an existing <acronym>GIN</acronym>
-     index that has <literal>fastupdate</> enabled, the system will clean up
+     index that has <literal>fastupdate</literal> enabled, the system will clean up
      the pending-entry list whenever the list grows larger than
-     <varname>gin_pending_list_limit</>. To avoid fluctuations in observed
+     <varname>gin_pending_list_limit</varname>. To avoid fluctuations in observed
      response time, it's desirable to have pending-list cleanup occur in the
      background (i.e., via autovacuum).  Foreground cleanup operations
-     can be avoided by increasing <varname>gin_pending_list_limit</>
+     can be avoided by increasing <varname>gin_pending_list_limit</varname>
      or making autovacuum more aggressive.
      However, enlarging the threshold of the cleanup operation means that
      if a foreground cleanup does occur, it will take even longer.
     </para>
     <para>
-     <varname>gin_pending_list_limit</> can be overridden for individual
+     <varname>gin_pending_list_limit</varname> can be overridden for individual
      GIN indexes by changing storage parameters, and which allows each
      GIN index to have its own cleanup threshold.
      For example, it's possible to increase the threshold only for the GIN
@@ -574,7 +574,7 @@
   </varlistentry>
 
   <varlistentry>
-   <term><xref linkend="guc-gin-fuzzy-search-limit"></term>
+   <term><xref linkend="guc-gin-fuzzy-search-limit"/></term>
    <listitem>
     <para>
      The primary goal of developing <acronym>GIN</acronym> indexes was
@@ -616,7 +616,7 @@
 
  <para>
   <acronym>GIN</acronym> assumes that indexable operators are strict.  This
-  means that <function>extractValue</> will not be called at all on a null
+  means that <function>extractValue</function> will not be called at all on a null
   item value (instead, a placeholder index entry is created automatically),
   and <function>extractQuery</function> will not be called on a null query
   value either (instead, the query is presumed to be unsatisfiable).  Note
@@ -629,36 +629,36 @@
  <title>Examples</title>
 
  <para>
-  The core <productname>PostgreSQL</> distribution
+  The core <productname>PostgreSQL</productname> distribution
   includes the <acronym>GIN</acronym> operator classes previously shown in
-  <xref linkend="gin-builtin-opclasses-table">.
-  The following <filename>contrib</> modules also contain
+  <xref linkend="gin-builtin-opclasses-table"/>.
+  The following <filename>contrib</filename> modules also contain
   <acronym>GIN</acronym> operator classes:
 
  <variablelist>
   <varlistentry>
-   <term><filename>btree_gin</></term>
+   <term><filename>btree_gin</filename></term>
    <listitem>
     <para>B-tree equivalent functionality for several data types</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>hstore</></term>
+   <term><filename>hstore</filename></term>
    <listitem>
     <para>Module for storing (key, value) pairs</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>intarray</></term>
+   <term><filename>intarray</filename></term>
    <listitem>
     <para>Enhanced support for <type>int[]</type></para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>pg_trgm</></term>
+   <term><filename>pg_trgm</filename></term>
    <listitem>
     <para>Text similarity using trigram matching</para>
    </listitem>
diff --git a/doc/src/sgml/gist.sgml b/doc/src/sgml/gist.sgml
index b3cc347e5c..44a3b2c03c 100644
--- a/doc/src/sgml/gist.sgml
+++ b/doc/src/sgml/gist.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/gist.sgml -->
 
-<chapter id="GiST">
+<chapter id="gist">
 <title>GiST Indexes</title>
 
    <indexterm>
@@ -44,10 +44,10 @@
  <title>Built-in Operator Classes</title>
 
  <para>
-  The core <productname>PostgreSQL</> distribution
+  The core <productname>PostgreSQL</productname> distribution
   includes the <acronym>GiST</acronym> operator classes shown in
-  <xref linkend="gist-builtin-opclasses-table">.
-  (Some of the optional modules described in <xref linkend="contrib">
+  <xref linkend="gist-builtin-opclasses-table"/>.
+  (Some of the optional modules described in <xref linkend="contrib"/>
   provide additional <acronym>GiST</acronym> operator classes.)
  </para>
 
@@ -64,142 +64,142 @@
     </thead>
     <tbody>
      <row>
-      <entry><literal>box_ops</></entry>
-      <entry><type>box</></entry>
+      <entry><literal>box_ops</literal></entry>
+      <entry><type>box</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&gt;</>
-       <literal>&amp;&lt;</>
-       <literal>&amp;&lt;|</>
-       <literal>&gt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;&lt;|</>
-       <literal>&lt;@</>
-       <literal>@&gt;</>
-       <literal>@</>
-       <literal>|&amp;&gt;</>
-       <literal>|&gt;&gt;</>
-       <literal>~</>
-       <literal>~=</>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;&lt;|</literal>
+       <literal>&lt;@</literal>
+       <literal>@&gt;</literal>
+       <literal>@</literal>
+       <literal>|&amp;&gt;</literal>
+       <literal>|&gt;&gt;</literal>
+       <literal>~</literal>
+       <literal>~=</literal>
       </entry>
       <entry>
       </entry>
      </row>
      <row>
-      <entry><literal>circle_ops</></entry>
-      <entry><type>circle</></entry>
+      <entry><literal>circle_ops</literal></entry>
+      <entry><type>circle</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&gt;</>
-       <literal>&amp;&lt;</>
-       <literal>&amp;&lt;|</>
-       <literal>&gt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;&lt;|</>
-       <literal>&lt;@</>
-       <literal>@&gt;</>
-       <literal>@</>
-       <literal>|&amp;&gt;</>
-       <literal>|&gt;&gt;</>
-       <literal>~</>
-       <literal>~=</>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;&lt;|</literal>
+       <literal>&lt;@</literal>
+       <literal>@&gt;</literal>
+       <literal>@</literal>
+       <literal>|&amp;&gt;</literal>
+       <literal>|&gt;&gt;</literal>
+       <literal>~</literal>
+       <literal>~=</literal>
       </entry>
       <entry>
-       <literal>&lt;-&gt;</>
+       <literal>&lt;-&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>inet_ops</></entry>
-      <entry><type>inet</>, <type>cidr</></entry>
+      <entry><literal>inet_ops</literal></entry>
+      <entry><type>inet</type>, <type>cidr</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&gt;&gt;</>
-       <literal>&gt;&gt;=</>
-       <literal>&gt;</>
-       <literal>&gt;=</>
-       <literal>&lt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;&lt;=</>
-       <literal>&lt;</>
-       <literal>&lt;=</>
-       <literal>=</>
+       <literal>&amp;&amp;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&gt;&gt;=</literal>
+       <literal>&gt;</literal>
+       <literal>&gt;=</literal>
+       <literal>&lt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;&lt;=</literal>
+       <literal>&lt;</literal>
+       <literal>&lt;=</literal>
+       <literal>=</literal>
       </entry>
       <entry>
       </entry>
      </row>
      <row>
-      <entry><literal>point_ops</></entry>
-      <entry><type>point</></entry>
+      <entry><literal>point_ops</literal></entry>
+      <entry><type>point</type></entry>
       <entry>
-       <literal>&gt;&gt;</>
-       <literal>&gt;^</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;@</>
-       <literal>&lt;@</>
-       <literal>&lt;@</>
-       <literal>&lt;^</>
-       <literal>~=</>
+       <literal>&gt;&gt;</literal>
+       <literal>&gt;^</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&lt;@</literal>
+       <literal>&lt;@</literal>
+       <literal>&lt;^</literal>
+       <literal>~=</literal>
       </entry>
       <entry>
-       <literal>&lt;-&gt;</>
+       <literal>&lt;-&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>poly_ops</></entry>
-      <entry><type>polygon</></entry>
+      <entry><literal>poly_ops</literal></entry>
+      <entry><type>polygon</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&gt;</>
-       <literal>&amp;&lt;</>
-       <literal>&amp;&lt;|</>
-       <literal>&gt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;&lt;|</>
-       <literal>&lt;@</>
-       <literal>@&gt;</>
-       <literal>@</>
-       <literal>|&amp;&gt;</>
-       <literal>|&gt;&gt;</>
-       <literal>~</>
-       <literal>~=</>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;&lt;|</literal>
+       <literal>&lt;@</literal>
+       <literal>@&gt;</literal>
+       <literal>@</literal>
+       <literal>|&amp;&gt;</literal>
+       <literal>|&gt;&gt;</literal>
+       <literal>~</literal>
+       <literal>~=</literal>
       </entry>
       <entry>
-       <literal>&lt;-&gt;</>
+       <literal>&lt;-&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>range_ops</></entry>
+      <entry><literal>range_ops</literal></entry>
       <entry>any range type</entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&gt;</>
-       <literal>&amp;&lt;</>
-       <literal>&gt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;@</>
-       <literal>-|-</>
-       <literal>=</>
-       <literal>@&gt;</>
-       <literal>@&gt;</>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;@</literal>
+       <literal>-|-</literal>
+       <literal>=</literal>
+       <literal>@&gt;</literal>
+       <literal>@&gt;</literal>
       </entry>
       <entry>
       </entry>
      </row>
      <row>
-      <entry><literal>tsquery_ops</></entry>
-      <entry><type>tsquery</></entry>
+      <entry><literal>tsquery_ops</literal></entry>
+      <entry><type>tsquery</type></entry>
       <entry>
-       <literal>&lt;@</>
-       <literal>@&gt;</>
+       <literal>&lt;@</literal>
+       <literal>@&gt;</literal>
       </entry>
       <entry>
       </entry>
      </row>
      <row>
-      <entry><literal>tsvector_ops</></entry>
-      <entry><type>tsvector</></entry>
+      <entry><literal>tsvector_ops</literal></entry>
+      <entry><type>tsvector</type></entry>
       <entry>
-       <literal>@@</>
+       <literal>@@</literal>
       </entry>
       <entry>
       </entry>
@@ -209,9 +209,9 @@
   </table>
 
  <para>
-  For historical reasons, the <literal>inet_ops</> operator class is
-  not the default class for types <type>inet</> and <type>cidr</>.
-  To use it, mention the class name in <command>CREATE INDEX</>,
+  For historical reasons, the <literal>inet_ops</literal> operator class is
+  not the default class for types <type>inet</type> and <type>cidr</type>.
+  To use it, mention the class name in <command>CREATE INDEX</command>,
   for example
 <programlisting>
 CREATE INDEX ON my_table USING GIST (my_inet_column inet_ops);
@@ -267,55 +267,56 @@ CREATE INDEX ON my_table USING GIST (my_inet_column inet_ops);
   </para>
 
  <para>
-   There are seven methods that an index operator class for
-   <acronym>GiST</acronym> must provide, and two that are optional.
+   There are five methods that an index operator class for
+   <acronym>GiST</acronym> must provide, and four that are optional.
    Correctness of the index is ensured
-   by proper implementation of the <function>same</>, <function>consistent</>
-   and <function>union</> methods, while efficiency (size and speed) of the
-   index will depend on the <function>penalty</> and <function>picksplit</>
+   by proper implementation of the <function>same</function>, <function>consistent</function>
+   and <function>union</function> methods, while efficiency (size and speed) of the
+   index will depend on the <function>penalty</function> and <function>picksplit</function>
    methods.
-   The remaining two basic methods are <function>compress</> and
-   <function>decompress</>, which allow an index to have internal tree data of
+   Two optional methods are <function>compress</function> and
+   <function>decompress</function>, which allow an index to have internal tree data of
    a different type than the data it indexes. The leaves are to be of the
    indexed data type, while the other tree nodes can be of any C struct (but
-   you still have to follow <productname>PostgreSQL</> data type rules here,
-   see about <literal>varlena</> for variable sized data). If the tree's
-   internal data type exists at the SQL level, the <literal>STORAGE</> option
-   of the <command>CREATE OPERATOR CLASS</> command can be used.
-   The optional eighth method is <function>distance</>, which is needed
+   you still have to follow <productname>PostgreSQL</productname> data type rules here,
+   see about <literal>varlena</literal> for variable sized data). If the tree's
+   internal data type exists at the SQL level, the <literal>STORAGE</literal> option
+   of the <command>CREATE OPERATOR CLASS</command> command can be used.
+   The optional eighth method is <function>distance</function>, which is needed
    if the operator class wishes to support ordered scans (nearest-neighbor
-   searches). The optional ninth method <function>fetch</> is needed if the
-   operator class wishes to support index-only scans.
+   searches). The optional ninth method <function>fetch</function> is needed if the
+   operator class wishes to support index-only scans, except when the
+   <function>compress</function> method is omitted.
  </para>
 
  <variablelist>
     <varlistentry>
-     <term><function>consistent</></term>
+     <term><function>consistent</function></term>
      <listitem>
       <para>
-       Given an index entry <literal>p</> and a query value <literal>q</>,
+       Given an index entry <literal>p</literal> and a query value <literal>q</literal>,
        this function determines whether the index entry is
-       <quote>consistent</> with the query; that is, could the predicate
-       <quote><replaceable>indexed_column</>
-       <replaceable>indexable_operator</> <literal>q</></quote> be true for
+       <quote>consistent</quote> with the query; that is, could the predicate
+       <quote><replaceable>indexed_column</replaceable>
+       <replaceable>indexable_operator</replaceable> <literal>q</literal></quote> be true for
        any row represented by the index entry?  For a leaf index entry this is
        equivalent to testing the indexable condition, while for an internal
        tree node this determines whether it is necessary to scan the subtree
        of the index represented by the tree node.  When the result is
-       <literal>true</>, a <literal>recheck</> flag must also be returned.
+       <literal>true</literal>, a <literal>recheck</literal> flag must also be returned.
        This indicates whether the predicate is certainly true or only possibly
-       true.  If <literal>recheck</> = <literal>false</> then the index has
-       tested the predicate condition exactly, whereas if <literal>recheck</>
-       = <literal>true</> the row is only a candidate match.  In that case the
+       true.  If <literal>recheck</literal> = <literal>false</literal> then the index has
+       tested the predicate condition exactly, whereas if <literal>recheck</literal>
+       = <literal>true</literal> the row is only a candidate match.  In that case the
        system will automatically evaluate the
-       <replaceable>indexable_operator</> against the actual row value to see
+       <replaceable>indexable_operator</replaceable> against the actual row value to see
        if it is really a match.  This convention allows
        <acronym>GiST</acronym> to support both lossless and lossy index
        structures.
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_consistent(internal, data_type, smallint, oid, internal)
@@ -355,23 +356,23 @@ my_consistent(PG_FUNCTION_ARGS)
 }
 </programlisting>
 
-       Here, <varname>key</> is an element in the index and <varname>query</>
-       the value being looked up in the index. The <literal>StrategyNumber</>
+       Here, <varname>key</varname> is an element in the index and <varname>query</varname>
+       the value being looked up in the index. The <literal>StrategyNumber</literal>
        parameter indicates which operator of your operator class is being
        applied &mdash; it matches one of the operator numbers in the
-       <command>CREATE OPERATOR CLASS</> command.
+       <command>CREATE OPERATOR CLASS</command> command.
       </para>
 
       <para>
        Depending on which operators you have included in the class, the data
-       type of <varname>query</> could vary with the operator, since it will
+       type of <varname>query</varname> could vary with the operator, since it will
        be whatever type is on the righthand side of the operator, which might
        be different from the indexed data type appearing on the lefthand side.
        (The above code skeleton assumes that only one type is possible; if
-       not, fetching the <varname>query</> argument value would have to depend
+       not, fetching the <varname>query</varname> argument value would have to depend
        on the operator.)  It is recommended that the SQL declaration of
-       the <function>consistent</> function use the opclass's indexed data
-       type for the <varname>query</> argument, even though the actual type
+       the <function>consistent</function> function use the opclass's indexed data
+       type for the <varname>query</varname> argument, even though the actual type
        might be something else depending on the operator.
       </para>
 
@@ -379,7 +380,7 @@ my_consistent(PG_FUNCTION_ARGS)
     </varlistentry>
 
     <varlistentry>
-     <term><function>union</></term>
+     <term><function>union</function></term>
      <listitem>
       <para>
        This method consolidates information in the tree.  Given a set of
@@ -388,7 +389,7 @@ my_consistent(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_union(internal, internal)
@@ -438,42 +439,44 @@ my_union(PG_FUNCTION_ARGS)
 
       <para>
         As you can see, in this skeleton we're dealing with a data type
-        where <literal>union(X, Y, Z) = union(union(X, Y), Z)</>. It's easy
+        where <literal>union(X, Y, Z) = union(union(X, Y), Z)</literal>. It's easy
         enough to support data types where this is not the case, by
         implementing the proper union algorithm in this
-        <acronym>GiST</> support method.
+        <acronym>GiST</acronym> support method.
       </para>
 
       <para>
-        The result of the <function>union</> function must be a value of the
+        The result of the <function>union</function> function must be a value of the
         index's storage type, whatever that is (it might or might not be
-        different from the indexed column's type).  The <function>union</>
-        function should return a pointer to newly <function>palloc()</>ed
+        different from the indexed column's type).  The <function>union</function>
+        function should return a pointer to newly <function>palloc()</function>ed
         memory. You can't just return the input value as-is, even if there is
         no type change.
       </para>
 
       <para>
-       As shown above, the <function>union</> function's
-       first <type>internal</> argument is actually
-       a <structname>GistEntryVector</> pointer.  The second argument is a
+       As shown above, the <function>union</function> function's
+       first <type>internal</type> argument is actually
+       a <structname>GistEntryVector</structname> pointer.  The second argument is a
        pointer to an integer variable, which can be ignored.  (It used to be
-       required that the <function>union</> function store the size of its
+       required that the <function>union</function> function store the size of its
        result value into that variable, but this is no longer necessary.)
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>compress</></term>
+     <term><function>compress</function></term>
      <listitem>
       <para>
-       Converts the data item into a format suitable for physical storage in
+       Converts a data item into a format suitable for physical storage in
        an index page.
+       If the <function>compress</function> method is omitted, data items are stored
+       in the index without modification.
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_compress(internal)
@@ -516,7 +519,7 @@ my_compress(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-       You have to adapt <replaceable>compressed_data_type</> to the specific
+       You have to adapt <replaceable>compressed_data_type</replaceable> to the specific
        type you're converting to in order to compress your leaf nodes, of
        course.
       </para>
@@ -524,16 +527,24 @@ my_compress(PG_FUNCTION_ARGS)
     </varlistentry>
 
     <varlistentry>
-     <term><function>decompress</></term>
+     <term><function>decompress</function></term>
      <listitem>
       <para>
-       The reverse of the <function>compress</function> method.  Converts the
-       index representation of the data item into a format that can be
-       manipulated by the other GiST methods in the operator class.
+       Converts the stored representation of a data item into a format that
+       can be manipulated by the other GiST methods in the operator class.
+       If the <function>decompress</function> method is omitted, it is assumed that
+       the other GiST methods can work directly on the stored data format.
+       (<function>decompress</function> is not necessarily the reverse of
+       the <function>compress</function> method; in particular,
+       if <function>compress</function> is lossy then it's impossible
+       for <function>decompress</function> to exactly reconstruct the original
+       data.  <function>decompress</function> is not necessarily equivalent
+       to <function>fetch</function>, either, since the other GiST methods might not
+       require full reconstruction of the data.)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_decompress(internal)
@@ -555,13 +566,14 @@ my_decompress(PG_FUNCTION_ARGS)
 </programlisting>
 
         The above skeleton is suitable for the case where no decompression
-        is needed.
+        is needed.  (But, of course, omitting the method altogether is even
+        easier, and is recommended in such cases.)
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>penalty</></term>
+     <term><function>penalty</function></term>
      <listitem>
       <para>
        Returns a value indicating the <quote>cost</quote> of inserting the new
@@ -572,7 +584,7 @@ my_decompress(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_penalty(internal, internal, internal)
@@ -600,15 +612,15 @@ my_penalty(PG_FUNCTION_ARGS)
 }
 </programlisting>
 
-        For historical reasons, the <function>penalty</> function doesn't
-        just return a <type>float</> result; instead it has to store the value
+        For historical reasons, the <function>penalty</function> function doesn't
+        just return a <type>float</type> result; instead it has to store the value
         at the location indicated by the third argument.  The return
         value per se is ignored, though it's conventional to pass back the
         address of that argument.
       </para>
 
       <para>
-        The <function>penalty</> function is crucial to good performance of
+        The <function>penalty</function> function is crucial to good performance of
         the index. It'll get used at insertion time to determine which branch
         to follow when choosing where to add the new entry in the tree. At
         query time, the more balanced the index, the quicker the lookup.
@@ -617,7 +629,7 @@ my_penalty(PG_FUNCTION_ARGS)
     </varlistentry>
 
     <varlistentry>
-     <term><function>picksplit</></term>
+     <term><function>picksplit</function></term>
      <listitem>
       <para>
        When an index page split is necessary, this function decides which
@@ -626,7 +638,7 @@ my_penalty(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_picksplit(internal, internal)
@@ -713,33 +725,33 @@ my_picksplit(PG_FUNCTION_ARGS)
 }
 </programlisting>
 
-       Notice that the <function>picksplit</> function's result is delivered
-       by modifying the passed-in <structname>v</> structure.  The return
+       Notice that the <function>picksplit</function> function's result is delivered
+       by modifying the passed-in <structname>v</structname> structure.  The return
        value per se is ignored, though it's conventional to pass back the
-       address of <structname>v</>.
+       address of <structname>v</structname>.
       </para>
 
       <para>
-        Like <function>penalty</>, the <function>picksplit</> function
+        Like <function>penalty</function>, the <function>picksplit</function> function
         is crucial to good performance of the index.  Designing suitable
-        <function>penalty</> and <function>picksplit</> implementations
+        <function>penalty</function> and <function>picksplit</function> implementations
         is where the challenge of implementing well-performing
-        <acronym>GiST</> indexes lies.
+        <acronym>GiST</acronym> indexes lies.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>same</></term>
+     <term><function>same</function></term>
      <listitem>
       <para>
        Returns true if two index entries are identical, false otherwise.
-       (An <quote>index entry</> is a value of the index's storage type,
+       (An <quote>index entry</quote> is a value of the index's storage type,
        not necessarily the original indexed column's type.)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_same(storage_type, storage_type, internal)
@@ -765,7 +777,7 @@ my_same(PG_FUNCTION_ARGS)
 }
 </programlisting>
 
-        For historical reasons, the <function>same</> function doesn't
+        For historical reasons, the <function>same</function> function doesn't
         just return a Boolean result; instead it has to store the flag
         at the location indicated by the third argument.  The return
         value per se is ignored, though it's conventional to pass back the
@@ -775,15 +787,15 @@ my_same(PG_FUNCTION_ARGS)
     </varlistentry>
 
     <varlistentry>
-     <term><function>distance</></term>
+     <term><function>distance</function></term>
      <listitem>
       <para>
-       Given an index entry <literal>p</> and a query value <literal>q</>,
+       Given an index entry <literal>p</literal> and a query value <literal>q</literal>,
        this function determines the index entry's
-       <quote>distance</> from the query value.  This function must be
+       <quote>distance</quote> from the query value.  This function must be
        supplied if the operator class contains any ordering operators.
        A query using the ordering operator will be implemented by returning
-       index entries with the smallest <quote>distance</> values first,
+       index entries with the smallest <quote>distance</quote> values first,
        so the results must be consistent with the operator's semantics.
        For a leaf index entry the result just represents the distance to
        the index entry; for an internal tree node, the result must be the
@@ -791,7 +803,7 @@ my_same(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_distance(internal, data_type, smallint, oid, internal)
@@ -824,8 +836,8 @@ my_distance(PG_FUNCTION_ARGS)
 }
 </programlisting>
 
-       The arguments to the <function>distance</> function are identical to
-       the arguments of the <function>consistent</> function.
+       The arguments to the <function>distance</function> function are identical to
+       the arguments of the <function>consistent</function> function.
       </para>
 
       <para>
@@ -835,31 +847,31 @@ my_distance(PG_FUNCTION_ARGS)
        geometric applications.  For an internal tree node, the distance
        returned must not be greater than the distance to any of the child
        nodes. If the returned distance is not exact, the function must set
-       <literal>*recheck</> to true. (This is not necessary for internal tree
+       <literal>*recheck</literal> to true. (This is not necessary for internal tree
        nodes; for them, the calculation is always assumed to be inexact.) In
        this case the executor will calculate the accurate distance after
        fetching the tuple from the heap, and reorder the tuples if necessary.
       </para>
 
       <para>
-       If the distance function returns <literal>*recheck = true</> for any
+       If the distance function returns <literal>*recheck = true</literal> for any
        leaf node, the original ordering operator's return type must
-       be <type>float8</> or <type>float4</>, and the distance function's
+       be <type>float8</type> or <type>float4</type>, and the distance function's
        result values must be comparable to those of the original ordering
        operator, since the executor will sort using both distance function
        results and recalculated ordering-operator results.  Otherwise, the
-       distance function's result values can be any finite <type>float8</>
+       distance function's result values can be any finite <type>float8</type>
        values, so long as the relative order of the result values matches the
        order returned by the ordering operator.  (Infinity and minus infinity
        are used internally to handle cases such as nulls, so it is not
-       recommended that <function>distance</> functions return these values.)
+       recommended that <function>distance</function> functions return these values.)
       </para>
 
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>fetch</></term>
+     <term><function>fetch</function></term>
      <listitem>
       <para>
        Converts the compressed index representation of a data item into the
@@ -868,7 +880,7 @@ my_distance(PG_FUNCTION_ARGS)
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION my_fetch(internal)
@@ -877,13 +889,15 @@ AS 'MODULE_PATHNAME'
 LANGUAGE C STRICT;
 </programlisting>
 
-        The argument is a pointer to a <structname>GISTENTRY</> struct. On
-        entry, its <structfield>key</> field contains a non-NULL leaf datum in
-        compressed form. The return value is another <structname>GISTENTRY</>
-        struct, whose <structfield>key</> field contains the same datum in its
+        The argument is a pointer to a <structname>GISTENTRY</structname> struct. On
+        entry, its <structfield>key</structfield> field contains a non-NULL leaf datum in
+        compressed form. The return value is another <structname>GISTENTRY</structname>
+        struct, whose <structfield>key</structfield> field contains the same datum in its
         original, uncompressed form. If the opclass's compress function does
-        nothing for leaf entries, the <function>fetch</> method can return the
-        argument as-is.
+        nothing for leaf entries, the <function>fetch</function> method can return the
+        argument as-is.  Or, if the opclass does not have a compress function,
+        the <function>fetch</function> method can be omitted as well, since it would
+        necessarily be a no-op.
        </para>
 
        <para>
@@ -919,7 +933,7 @@ my_fetch(PG_FUNCTION_ARGS)
       <para>
        If the compress method is lossy for leaf entries, the operator class
        cannot support index-only scans, and must not define
-       a <function>fetch</> function.
+       a <function>fetch</function> function.
       </para>
 
      </listitem>
@@ -928,15 +942,15 @@ my_fetch(PG_FUNCTION_ARGS)
 
   <para>
    All the GiST support methods are normally called in short-lived memory
-   contexts; that is, <varname>CurrentMemoryContext</> will get reset after
+   contexts; that is, <varname>CurrentMemoryContext</varname> will get reset after
    each tuple is processed.  It is therefore not very important to worry about
    pfree'ing everything you palloc.  However, in some cases it's useful for a
    support method to cache data across repeated calls.  To do that, allocate
-   the longer-lived data in <literal>fcinfo-&gt;flinfo-&gt;fn_mcxt</>, and
-   keep a pointer to it in <literal>fcinfo-&gt;flinfo-&gt;fn_extra</>.  Such
+   the longer-lived data in <literal>fcinfo-&gt;flinfo-&gt;fn_mcxt</literal>, and
+   keep a pointer to it in <literal>fcinfo-&gt;flinfo-&gt;fn_extra</literal>.  Such
    data will survive for the life of the index operation (e.g., a single GiST
    index scan, index build, or index tuple insertion).  Be careful to pfree
-   the previous value when replacing a <literal>fn_extra</> value, or the leak
+   the previous value when replacing a <literal>fn_extra</literal> value, or the leak
    will accumulate for the duration of the operation.
   </para>
 
@@ -960,7 +974,7 @@ my_fetch(PG_FUNCTION_ARGS)
   </para>
 
   <para>
-   However, buffering index build needs to call the <function>penalty</>
+   However, buffering index build needs to call the <function>penalty</function>
    function more often, which consumes some extra CPU resources. Also, the
    buffers used in the buffering build need temporary disk space, up to
    the size of the resulting index. Buffering can also influence the quality
@@ -971,7 +985,7 @@ my_fetch(PG_FUNCTION_ARGS)
 
   <para>
    By default, a GiST index build switches to the buffering method when the
-   index size reaches <xref linkend="guc-effective-cache-size">. It can
+   index size reaches <xref linkend="guc-effective-cache-size"/>. It can
    be manually turned on or off by the <literal>buffering</literal> parameter
    to the CREATE INDEX command. The default behavior is good for most cases,
    but turning buffering off might speed up the build somewhat if the input
@@ -988,57 +1002,57 @@ my_fetch(PG_FUNCTION_ARGS)
   The <productname>PostgreSQL</productname> source distribution includes
   several examples of index methods implemented using
   <acronym>GiST</acronym>.  The core system currently provides text search
-  support (indexing for <type>tsvector</> and <type>tsquery</>) as well as
+  support (indexing for <type>tsvector</type> and <type>tsquery</type>) as well as
   R-Tree equivalent functionality for some of the built-in geometric data types
-  (see <filename>src/backend/access/gist/gistproc.c</>).  The following
-  <filename>contrib</> modules also contain <acronym>GiST</acronym>
+  (see <filename>src/backend/access/gist/gistproc.c</filename>).  The following
+  <filename>contrib</filename> modules also contain <acronym>GiST</acronym>
   operator classes:
 
  <variablelist>
   <varlistentry>
-   <term><filename>btree_gist</></term>
+   <term><filename>btree_gist</filename></term>
    <listitem>
     <para>B-tree equivalent functionality for several data types</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>cube</></term>
+   <term><filename>cube</filename></term>
    <listitem>
     <para>Indexing for multidimensional cubes</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>hstore</></term>
+   <term><filename>hstore</filename></term>
    <listitem>
     <para>Module for storing (key, value) pairs</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>intarray</></term>
+   <term><filename>intarray</filename></term>
    <listitem>
     <para>RD-Tree for one-dimensional array of int4 values</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>ltree</></term>
+   <term><filename>ltree</filename></term>
    <listitem>
     <para>Indexing for tree-like structures</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>pg_trgm</></term>
+   <term><filename>pg_trgm</filename></term>
    <listitem>
     <para>Text similarity using trigram matching</para>
    </listitem>
   </varlistentry>
 
   <varlistentry>
-   <term><filename>seg</></term>
+   <term><filename>seg</filename></term>
    <listitem>
     <para>Indexing for <quote>float ranges</quote></para>
    </listitem>
diff --git a/doc/src/sgml/high-availability.sgml b/doc/src/sgml/high-availability.sgml
index 1a152cf118..46bf198a2a 100644
--- a/doc/src/sgml/high-availability.sgml
+++ b/doc/src/sgml/high-availability.sgml
@@ -3,12 +3,12 @@
 <chapter id="high-availability">
  <title>High Availability, Load Balancing, and Replication</title>
 
- <indexterm><primary>high availability</></>
- <indexterm><primary>failover</></>
- <indexterm><primary>replication</></>
- <indexterm><primary>load balancing</></>
- <indexterm><primary>clustering</></>
- <indexterm><primary>data partitioning</></>
+ <indexterm><primary>high availability</primary></indexterm>
+ <indexterm><primary>failover</primary></indexterm>
+ <indexterm><primary>replication</primary></indexterm>
+ <indexterm><primary>load balancing</primary></indexterm>
+ <indexterm><primary>clustering</primary></indexterm>
+ <indexterm><primary>data partitioning</primary></indexterm>
 
  <para>
   Database servers can work together to allow a second server to
@@ -38,12 +38,12 @@
  <para>
   Some solutions deal with synchronization by allowing only one
   server to modify the data.  Servers that can modify data are
-  called read/write, <firstterm>master</> or <firstterm>primary</> servers.
-  Servers that track changes in the master are called <firstterm>standby</>
-  or <firstterm>secondary</> servers. A standby server that cannot be connected
+  called read/write, <firstterm>master</firstterm> or <firstterm>primary</firstterm> servers.
+  Servers that track changes in the master are called <firstterm>standby</firstterm>
+  or <firstterm>secondary</firstterm> servers. A standby server that cannot be connected
   to until it is promoted to a master server is called a <firstterm>warm
-  standby</> server, and one that can accept connections and serves read-only
-  queries is called a <firstterm>hot standby</> server.
+  standby</firstterm> server, and one that can accept connections and serves read-only
+  queries is called a <firstterm>hot standby</firstterm> server.
  </para>
 
  <para>
@@ -99,8 +99,8 @@
     <para>
      Shared hardware functionality is common in network storage devices.
      Using a network file system is also possible, though care must be
-     taken that the file system has full <acronym>POSIX</> behavior (see <xref
-     linkend="creating-cluster-nfs">).  One significant limitation of this
+     taken that the file system has full <acronym>POSIX</acronym> behavior (see <xref
+     linkend="creating-cluster-nfs"/>).  One significant limitation of this
      method is that if the shared disk array fails or becomes corrupt, the
      primary and standby servers are both nonfunctional.  Another issue is
      that the standby server should never access the shared storage while
@@ -121,7 +121,7 @@
      the mirroring must be done in a way that ensures the standby server
      has a consistent copy of the file system &mdash; specifically, writes
      to the standby must be done in the same order as those on the master.
-     <productname>DRBD</> is a popular file system replication solution
+     <productname>DRBD</productname> is a popular file system replication solution
      for Linux.
     </para>
 
@@ -143,7 +143,7 @@ protocol to make nodes agree on a serializable transactional order.
 
     <para>
      Warm and hot standby servers can be kept current by reading a
-     stream of write-ahead log (<acronym>WAL</>)
+     stream of write-ahead log (<acronym>WAL</acronym>)
      records.  If the main server fails, the standby contains
      almost all of the data of the main server, and can be quickly
      made the new master database server.  This can be synchronous or
@@ -151,9 +151,9 @@ protocol to make nodes agree on a serializable transactional order.
     </para>
     <para>
      A standby server can be implemented using file-based log shipping
-     (<xref linkend="warm-standby">) or streaming replication (see
-     <xref linkend="streaming-replication">), or a combination of both. For
-     information on hot standby, see <xref linkend="hot-standby">.
+     (<xref linkend="warm-standby"/>) or streaming replication (see
+     <xref linkend="streaming-replication"/>), or a combination of both. For
+     information on hot standby, see <xref linkend="hot-standby"/>.
     </para>
    </listitem>
   </varlistentry>
@@ -169,8 +169,8 @@ protocol to make nodes agree on a serializable transactional order.
      individual tables to be replicated.  Logical replication doesn't require
      a particular server to be designated as a master or a replica but allows
      data to flow in multiple directions.  For more information on logical
-     replication, see <xref linkend="logical-replication">.  Through the
-     logical decoding interface (<xref linkend="logicaldecoding">),
+     replication, see <xref linkend="logical-replication"/>.  Through the
+     logical decoding interface (<xref linkend="logicaldecoding"/>),
      third-party extensions can also provide similar functionality.
     </para>
    </listitem>
@@ -189,7 +189,7 @@ protocol to make nodes agree on a serializable transactional order.
     </para>
 
     <para>
-     <productname>Slony-I</> is an example of this type of replication, with per-table
+     <productname>Slony-I</productname> is an example of this type of replication, with per-table
      granularity, and support for multiple standby servers.  Because it
      updates the standby server asynchronously (in batches), there is
      possible data loss during fail over.
@@ -212,7 +212,7 @@ protocol to make nodes agree on a serializable transactional order.
 
     <para>
      If queries are simply broadcast unmodified, functions like
-     <function>random()</>, <function>CURRENT_TIMESTAMP</>, and
+     <function>random()</function>, <function>CURRENT_TIMESTAMP</function>, and
      sequences can have different values on different servers.
      This is because each server operates independently, and because
      SQL queries are broadcast (and not actual modified rows).  If
@@ -224,9 +224,9 @@ protocol to make nodes agree on a serializable transactional order.
      standby servers via master-standby replication, not by the replication
      middleware.  Care must also be taken that all
      transactions either commit or abort on all servers, perhaps
-     using two-phase commit (<xref linkend="sql-prepare-transaction">
-     and <xref linkend="sql-commit-prepared">).
-     <productname>Pgpool-II</> and <productname>Continuent Tungsten</>
+     using two-phase commit (<xref linkend="sql-prepare-transaction"/>
+     and <xref linkend="sql-commit-prepared"/>).
+     <productname>Pgpool-II</productname> and <productname>Continuent Tungsten</productname>
      are examples of this type of replication.
     </para>
    </listitem>
@@ -266,14 +266,14 @@ protocol to make nodes agree on a serializable transactional order.
      there is no need to partition workloads between master and
      standby servers, and because the data changes are sent from one
      server to another, there is no problem with non-deterministic
-     functions like <function>random()</>.
+     functions like <function>random()</function>.
     </para>
 
     <para>
-     <productname>PostgreSQL</> does not offer this type of replication,
-     though <productname>PostgreSQL</> two-phase commit (<xref
-     linkend="sql-prepare-transaction"> and <xref
-     linkend="sql-commit-prepared">)
+     <productname>PostgreSQL</productname> does not offer this type of replication,
+     though <productname>PostgreSQL</productname> two-phase commit (<xref
+     linkend="sql-prepare-transaction"/> and <xref
+     linkend="sql-commit-prepared"/>)
      can be used to implement this in application code or middleware.
     </para>
    </listitem>
@@ -284,8 +284,8 @@ protocol to make nodes agree on a serializable transactional order.
    <listitem>
 
     <para>
-     Because <productname>PostgreSQL</> is open source and easily
-     extended, a number of companies have taken <productname>PostgreSQL</>
+     Because <productname>PostgreSQL</productname> is open source and easily
+     extended, a number of companies have taken <productname>PostgreSQL</productname>
      and created commercial closed-source solutions with unique
      failover, replication, and load balancing capabilities.
     </para>
@@ -295,13 +295,13 @@ protocol to make nodes agree on a serializable transactional order.
  </variablelist>
 
  <para>
-  <xref linkend="high-availability-matrix"> summarizes
+  <xref linkend="high-availability-matrix"/> summarizes
   the capabilities of the various solutions listed above.
  </para>
 
  <table id="high-availability-matrix">
   <title>High Availability, Load Balancing, and Replication Feature Matrix</title>
-  <tgroup cols="8">
+  <tgroup cols="9">
    <thead>
     <row>
      <entry>Feature</entry>
@@ -475,9 +475,9 @@ protocol to make nodes agree on a serializable transactional order.
      concurrently on a single query.  It is usually accomplished by
      splitting the data among servers and having each server execute its
      part of the query and return results to a central server where they
-     are combined and returned to the user.  <productname>Pgpool-II</>
+     are combined and returned to the user.  <productname>Pgpool-II</productname>
      has this capability.  Also, this can be implemented using the
-     <productname>PL/Proxy</> tool set.
+     <productname>PL/Proxy</productname> tool set.
     </para>
 
    </listitem>
@@ -494,10 +494,10 @@ protocol to make nodes agree on a serializable transactional order.
 
   <para>
    Continuous archiving can be used to create a <firstterm>high
-   availability</> (HA) cluster configuration with one or more
-   <firstterm>standby servers</> ready to take over operations if the
+   availability</firstterm> (HA) cluster configuration with one or more
+   <firstterm>standby servers</firstterm> ready to take over operations if the
    primary server fails. This capability is widely referred to as
-   <firstterm>warm standby</> or <firstterm>log shipping</>.
+   <firstterm>warm standby</firstterm> or <firstterm>log shipping</firstterm>.
   </para>
 
   <para>
@@ -513,7 +513,7 @@ protocol to make nodes agree on a serializable transactional order.
 
   <para>
    Directly moving WAL records from one database server to another
-   is typically described as log shipping. <productname>PostgreSQL</>
+   is typically described as log shipping. <productname>PostgreSQL</productname>
    implements file-based log shipping by transferring WAL records
    one file (WAL segment) at a time. WAL files (16MB) can be
    shipped easily and cheaply over any distance, whether it be to an
@@ -522,7 +522,7 @@ protocol to make nodes agree on a serializable transactional order.
    varies according to the transaction rate of the primary server.
    Record-based log shipping is more granular and streams WAL changes
    incrementally over a network connection (see <xref
-   linkend="streaming-replication">).
+   linkend="streaming-replication"/>).
   </para>
 
   <para>
@@ -534,7 +534,7 @@ protocol to make nodes agree on a serializable transactional order.
    <varname>archive_timeout</varname> parameter, which can be set as low
    as a few seconds.  However such a low setting will
    substantially increase the bandwidth required for file shipping.
-   Streaming replication (see <xref linkend="streaming-replication">)
+   Streaming replication (see <xref linkend="streaming-replication"/>)
    allows a much smaller window of data loss.
   </para>
 
@@ -547,7 +547,7 @@ protocol to make nodes agree on a serializable transactional order.
    rollforward will take considerably longer, so that technique only
    offers a solution for disaster recovery, not high availability.
    A standby server can also be used for read-only queries, in which case
-   it is called a Hot Standby server. See <xref linkend="hot-standby"> for
+   it is called a Hot Standby server. See <xref linkend="hot-standby"/> for
    more information.
   </para>
 
@@ -585,7 +585,7 @@ protocol to make nodes agree on a serializable transactional order.
     associated with tablespaces will be passed across unmodified, so both
     primary and standby servers must have the same mount paths for
     tablespaces if that feature is used.  Keep in mind that if
-    <xref linkend="sql-createtablespace">
+    <xref linkend="sql-createtablespace"/>
     is executed on the primary, any new mount point needed for it must
     be created on the primary and all standby servers before the command
     is executed. Hardware need not be exactly the same, but experience shows
@@ -597,7 +597,7 @@ protocol to make nodes agree on a serializable transactional order.
 
    <para>
     In general, log shipping between servers running different major
-    <productname>PostgreSQL</> release
+    <productname>PostgreSQL</productname> release
     levels is not possible. It is the policy of the PostgreSQL Global
     Development Group not to make changes to disk formats during minor release
     upgrades, so it is likely that running different minor release levels
@@ -618,35 +618,35 @@ protocol to make nodes agree on a serializable transactional order.
    <para>
     In standby mode, the server continuously applies WAL received from the
     master server. The standby server can read WAL from a WAL archive
-    (see <xref linkend="restore-command">) or directly from the master
+    (see <xref linkend="restore-command"/>) or directly from the master
     over a TCP connection (streaming replication). The standby server will
     also attempt to restore any WAL found in the standby cluster's
-    <filename>pg_wal</> directory. That typically happens after a server
+    <filename>pg_wal</filename> directory. That typically happens after a server
     restart, when the standby replays again WAL that was streamed from the
     master before the restart, but you can also manually copy files to
-    <filename>pg_wal</> at any time to have them replayed.
+    <filename>pg_wal</filename> at any time to have them replayed.
    </para>
 
    <para>
     At startup, the standby begins by restoring all WAL available in the
-    archive location, calling <varname>restore_command</>. Once it
-    reaches the end of WAL available there and <varname>restore_command</>
-    fails, it tries to restore any WAL available in the <filename>pg_wal</> directory.
+    archive location, calling <varname>restore_command</varname>. Once it
+    reaches the end of WAL available there and <varname>restore_command</varname>
+    fails, it tries to restore any WAL available in the <filename>pg_wal</filename> directory.
     If that fails, and streaming replication has been configured, the
     standby tries to connect to the primary server and start streaming WAL
-    from the last valid record found in archive or <filename>pg_wal</>. If that fails
+    from the last valid record found in archive or <filename>pg_wal</filename>. If that fails
     or streaming replication is not configured, or if the connection is
     later disconnected, the standby goes back to step 1 and tries to
     restore the file from the archive again. This loop of retries from the
-    archive, <filename>pg_wal</>, and via streaming replication goes on until the server
+    archive, <filename>pg_wal</filename>, and via streaming replication goes on until the server
     is stopped or failover is triggered by a trigger file.
    </para>
 
    <para>
     Standby mode is exited and the server switches to normal operation
-    when <command>pg_ctl promote</> is run or a trigger file is found
-    (<varname>trigger_file</>). Before failover,
-    any WAL immediately available in the archive or in <filename>pg_wal</> will be
+    when <command>pg_ctl promote</command> is run or a trigger file is found
+    (<varname>trigger_file</varname>). Before failover,
+    any WAL immediately available in the archive or in <filename>pg_wal</filename> will be
     restored, but no attempt is made to connect to the master.
    </para>
   </sect2>
@@ -657,7 +657,7 @@ protocol to make nodes agree on a serializable transactional order.
    <para>
     Set up continuous archiving on the primary to an archive directory
     accessible from the standby, as described
-    in <xref linkend="continuous-archiving">. The archive location should be
+    in <xref linkend="continuous-archiving"/>. The archive location should be
     accessible from the standby even when the master is down, i.e. it should
     reside on the standby server itself or another trusted server, not on
     the master server.
@@ -667,8 +667,8 @@ protocol to make nodes agree on a serializable transactional order.
     If you want to use streaming replication, set up authentication on the
     primary server to allow replication connections from the standby
     server(s); that is, create a role and provide a suitable entry or
-    entries in <filename>pg_hba.conf</> with the database field set to
-    <literal>replication</>.  Also ensure <varname>max_wal_senders</> is set
+    entries in <filename>pg_hba.conf</filename> with the database field set to
+    <literal>replication</literal>.  Also ensure <varname>max_wal_senders</varname> is set
     to a sufficiently large value in the configuration file of the primary
     server. If replication slots will be used,
     ensure that <varname>max_replication_slots</varname> is set sufficiently
@@ -676,7 +676,7 @@ protocol to make nodes agree on a serializable transactional order.
    </para>
 
    <para>
-    Take a base backup as described in <xref linkend="backup-base-backup">
+    Take a base backup as described in <xref linkend="backup-base-backup"/>
     to bootstrap the standby server.
    </para>
   </sect2>
@@ -686,33 +686,33 @@ protocol to make nodes agree on a serializable transactional order.
 
    <para>
     To set up the standby server, restore the base backup taken from primary
-    server (see <xref linkend="backup-pitr-recovery">). Create a recovery
-    command file <filename>recovery.conf</> in the standby's cluster data
-    directory, and turn on <varname>standby_mode</>. Set
-    <varname>restore_command</> to a simple command to copy files from
+    server (see <xref linkend="backup-pitr-recovery"/>). Create a recovery
+    command file <filename>recovery.conf</filename> in the standby's cluster data
+    directory, and turn on <varname>standby_mode</varname>. Set
+    <varname>restore_command</varname> to a simple command to copy files from
     the WAL archive. If you plan to have multiple standby servers for high
-    availability purposes, set <varname>recovery_target_timeline</> to
-    <literal>latest</>, to make the standby server follow the timeline change
+    availability purposes, set <varname>recovery_target_timeline</varname> to
+    <literal>latest</literal>, to make the standby server follow the timeline change
     that occurs at failover to another standby.
    </para>
 
    <note>
      <para>
      Do not use pg_standby or similar tools with the built-in standby mode
-     described here. <varname>restore_command</> should return immediately
+     described here. <varname>restore_command</varname> should return immediately
      if the file does not exist; the server will retry the command again if
-     necessary. See <xref linkend="log-shipping-alternative">
+     necessary. See <xref linkend="log-shipping-alternative"/>
      for using tools like pg_standby.
     </para>
    </note>
 
    <para>
      If you want to use streaming replication, fill in
-     <varname>primary_conninfo</> with a libpq connection string, including
+     <varname>primary_conninfo</varname> with a libpq connection string, including
      the host name (or IP address) and any additional details needed to
      connect to the primary server. If the primary needs a password for
      authentication, the password needs to be specified in
-     <varname>primary_conninfo</> as well.
+     <varname>primary_conninfo</varname> as well.
    </para>
 
    <para>
@@ -724,18 +724,18 @@ protocol to make nodes agree on a serializable transactional order.
 
    <para>
     If you're using a WAL archive, its size can be minimized using the <xref
-    linkend="archive-cleanup-command"> parameter to remove files that are no
+    linkend="archive-cleanup-command"/> parameter to remove files that are no
     longer required by the standby server.
-    The <application>pg_archivecleanup</> utility is designed specifically to
-    be used with <varname>archive_cleanup_command</> in typical single-standby
-    configurations, see <xref linkend="pgarchivecleanup">.
+    The <application>pg_archivecleanup</application> utility is designed specifically to
+    be used with <varname>archive_cleanup_command</varname> in typical single-standby
+    configurations, see <xref linkend="pgarchivecleanup"/>.
     Note however, that if you're using the archive for backup purposes, you
     need to retain files needed to recover from at least the latest base
     backup, even if they're no longer needed by the standby.
    </para>
 
    <para>
-    A simple example of a <filename>recovery.conf</> is:
+    A simple example of a <filename>recovery.conf</filename> is:
 <programlisting>
 standby_mode = 'on'
 primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
@@ -746,7 +746,7 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
 
    <para>
     You can have any number of standby servers, but if you use streaming
-    replication, make sure you set <varname>max_wal_senders</> high enough in
+    replication, make sure you set <varname>max_wal_senders</varname> high enough in
     the primary to allow them to be connected simultaneously.
    </para>
 
@@ -768,12 +768,12 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
 
    <para>
     Streaming replication is asynchronous by default
-    (see <xref linkend="synchronous-replication">), in which case there is
+    (see <xref linkend="synchronous-replication"/>), in which case there is
     a small delay between committing a transaction in the primary and the
     changes becoming visible in the standby. This delay is however much
     smaller than with file-based log shipping, typically under one second
     assuming the standby is powerful enough to keep up with the load. With
-    streaming replication, <varname>archive_timeout</> is not required to
+    streaming replication, <varname>archive_timeout</varname> is not required to
     reduce the data loss window.
    </para>
 
@@ -782,7 +782,7 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
     archiving, the server might recycle old WAL segments before the standby
     has received them.  If this occurs, the standby will need to be
     reinitialized from a new base backup.  You can avoid this by setting
-    <varname>wal_keep_segments</> to a value large enough to ensure that
+    <varname>wal_keep_segments</varname> to a value large enough to ensure that
     WAL segments are not recycled too early, or by configuring a replication
     slot for the standby.  If you set up a WAL archive that's accessible from
     the standby, these solutions are not required, since the standby can
@@ -791,31 +791,31 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
 
    <para>
     To use streaming replication, set up a file-based log-shipping standby
-    server as described in <xref linkend="warm-standby">. The step that
+    server as described in <xref linkend="warm-standby"/>. The step that
     turns a file-based log-shipping standby into streaming replication
-    standby is setting <varname>primary_conninfo</> setting in the
-    <filename>recovery.conf</> file to point to the primary server. Set
-    <xref linkend="guc-listen-addresses"> and authentication options
-    (see <filename>pg_hba.conf</>) on the primary so that the standby server
-    can connect to the <literal>replication</> pseudo-database on the primary
-    server (see <xref linkend="streaming-replication-authentication">).
+    standby is setting <varname>primary_conninfo</varname> setting in the
+    <filename>recovery.conf</filename> file to point to the primary server. Set
+    <xref linkend="guc-listen-addresses"/> and authentication options
+    (see <filename>pg_hba.conf</filename>) on the primary so that the standby server
+    can connect to the <literal>replication</literal> pseudo-database on the primary
+    server (see <xref linkend="streaming-replication-authentication"/>).
    </para>
 
    <para>
     On systems that support the keepalive socket option, setting
-    <xref linkend="guc-tcp-keepalives-idle">,
-    <xref linkend="guc-tcp-keepalives-interval"> and
-    <xref linkend="guc-tcp-keepalives-count"> helps the primary promptly
+    <xref linkend="guc-tcp-keepalives-idle"/>,
+    <xref linkend="guc-tcp-keepalives-interval"/> and
+    <xref linkend="guc-tcp-keepalives-count"/> helps the primary promptly
     notice a broken connection.
    </para>
 
    <para>
     Set the maximum number of concurrent connections from the standby servers
-    (see <xref linkend="guc-max-wal-senders"> for details).
+    (see <xref linkend="guc-max-wal-senders"/> for details).
    </para>
 
    <para>
-    When the standby is started and <varname>primary_conninfo</> is set
+    When the standby is started and <varname>primary_conninfo</varname> is set
     correctly, the standby will connect to the primary after replaying all
     WAL files available in the archive. If the connection is established
     successfully, you will see a walreceiver process in the standby, and
@@ -829,20 +829,20 @@ archive_cleanup_command = 'pg_archivecleanup /path/to/archive %r'
      so that only trusted users can read the WAL stream, because it is
      easy to extract privileged information from it.  Standby servers must
      authenticate to the primary as a superuser or an account that has the
-     <literal>REPLICATION</> privilege. It is recommended to create a
-     dedicated user account with <literal>REPLICATION</> and <literal>LOGIN</>
-     privileges for replication. While <literal>REPLICATION</> privilege gives
+     <literal>REPLICATION</literal> privilege. It is recommended to create a
+     dedicated user account with <literal>REPLICATION</literal> and <literal>LOGIN</literal>
+     privileges for replication. While <literal>REPLICATION</literal> privilege gives
      very high permissions, it does not allow the user to modify any data on
-     the primary system, which the <literal>SUPERUSER</> privilege does.
+     the primary system, which the <literal>SUPERUSER</literal> privilege does.
     </para>
 
     <para>
      Client authentication for replication is controlled by a
-     <filename>pg_hba.conf</> record specifying <literal>replication</> in the
-     <replaceable>database</> field. For example, if the standby is running on
-     host IP <literal>192.168.1.100</> and the account name for replication
-     is <literal>foo</>, the administrator can add the following line to the
-     <filename>pg_hba.conf</> file on the primary:
+     <filename>pg_hba.conf</filename> record specifying <literal>replication</literal> in the
+     <replaceable>database</replaceable> field. For example, if the standby is running on
+     host IP <literal>192.168.1.100</literal> and the account name for replication
+     is <literal>foo</literal>, the administrator can add the following line to the
+     <filename>pg_hba.conf</filename> file on the primary:
 
 <programlisting>
 # Allow the user "foo" from host 192.168.1.100 to connect to the primary
@@ -854,14 +854,14 @@ host    replication     foo             192.168.1.100/32        md5
     </para>
     <para>
      The host name and port number of the primary, connection user name,
-     and password are specified in the <filename>recovery.conf</> file.
-     The password can also be set in the <filename>~/.pgpass</> file on the
-     standby (specify <literal>replication</> in the <replaceable>database</>
+     and password are specified in the <filename>recovery.conf</filename> file.
+     The password can also be set in the <filename>~/.pgpass</filename> file on the
+     standby (specify <literal>replication</literal> in the <replaceable>database</replaceable>
      field).
-     For example, if the primary is running on host IP <literal>192.168.1.50</>,
+     For example, if the primary is running on host IP <literal>192.168.1.50</literal>,
      port <literal>5432</literal>, the account name for replication is
-     <literal>foo</>, and the password is <literal>foopass</>, the administrator
-     can add the following line to the <filename>recovery.conf</> file on the
+     <literal>foo</literal>, and the password is <literal>foopass</literal>, the administrator
+     can add the following line to the <filename>recovery.conf</filename> file on the
      standby:
 
 <programlisting>
@@ -880,24 +880,30 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
      standby. You can calculate this lag by comparing the current WAL write
      location on the primary with the last WAL location received by the
      standby. These locations can be retrieved using
-     <function>pg_current_wal_lsn</> on the primary and
-     <function>pg_last_wal_receive_lsn</> on the standby,
-     respectively (see <xref linkend="functions-admin-backup-table"> and
-     <xref linkend="functions-recovery-info-table"> for details).
+     <function>pg_current_wal_lsn</function> on the primary and
+     <function>pg_last_wal_receive_lsn</function> on the standby,
+     respectively (see <xref linkend="functions-admin-backup-table"/> and
+     <xref linkend="functions-recovery-info-table"/> for details).
      The last WAL receive location in the standby is also displayed in the
      process status of the WAL receiver process, displayed using the
-     <command>ps</> command (see <xref linkend="monitoring-ps"> for details).
+     <command>ps</command> command (see <xref linkend="monitoring-ps"/> for details).
     </para>
     <para>
      You can retrieve a list of WAL sender processes via the
-     <link linkend="monitoring-stats-views-table">
-     <literal>pg_stat_replication</></link> view. Large differences between
-     <function>pg_current_wal_lsn</> and the view's <literal>sent_lsn</> field
+     <xref linkend="pg-stat-replication-view"/> view. Large differences between
+     <function>pg_current_wal_lsn</function> and the view's <literal>sent_lsn</literal> field
      might indicate that the master server is under heavy load, while
-     differences between <literal>sent_lsn</> and
-     <function>pg_last_wal_receive_lsn</> on the standby might indicate
+     differences between <literal>sent_lsn</literal> and
+     <function>pg_last_wal_receive_lsn</function> on the standby might indicate
      network delay, or that the standby is under heavy load.
     </para>
+    <para>
+     On a hot standby, the status of the WAL receiver process can be retrieved
+     via the <xref linkend="pg-stat-wal-receiver-view"/> view.  A large
+     difference between <function>pg_last_wal_replay_lsn</function> and the
+     view's <literal>received_lsn</literal> indicates that WAL is being
+     received faster than it can be replayed.
+    </para>
    </sect3>
   </sect2>
 
@@ -911,23 +917,23 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
     Replication slots provide an automated way to ensure that the master does
     not remove WAL segments until they have been received by all standbys,
     and that the master does not remove rows which could cause a
-    <link linkend="hot-standby-conflict">recovery conflict</> even when the
+    <link linkend="hot-standby-conflict">recovery conflict</link> even when the
     standby is disconnected.
    </para>
    <para>
     In lieu of using replication slots, it is possible to prevent the removal
-    of old WAL segments using <xref linkend="guc-wal-keep-segments">, or by
+    of old WAL segments using <xref linkend="guc-wal-keep-segments"/>, or by
     storing the segments in an archive using
-    <xref linkend="guc-archive-command">.
+    <xref linkend="guc-archive-command"/>.
     However, these methods often result in retaining more WAL segments than
     required, whereas replication slots retain only the number of segments
     known to be needed.  An advantage of these methods is that they bound
-    the space requirement for <literal>pg_wal</>; there is currently no way
+    the space requirement for <literal>pg_wal</literal>; there is currently no way
     to do this using replication slots.
    </para>
    <para>
-    Similarly, <xref linkend="guc-hot-standby-feedback">
-    and <xref linkend="guc-vacuum-defer-cleanup-age"> provide protection against
+    Similarly, <xref linkend="guc-hot-standby-feedback"/>
+    and <xref linkend="guc-vacuum-defer-cleanup-age"/> provide protection against
     relevant rows being removed by vacuum, but the former provides no
     protection during any time period when the standby is not connected,
     and the latter often needs to be set to a high value to provide adequate
@@ -946,8 +952,8 @@ primary_conninfo = 'host=192.168.1.50 port=5432 user=foo password=foopass'
     </para>
     <para>
      Slots can be created and dropped either via the streaming replication
-     protocol (see <xref linkend="protocol-replication">) or via SQL
-     functions (see <xref linkend="functions-replication">).
+     protocol (see <xref linkend="protocol-replication"/>) or via SQL
+     functions (see <xref linkend="functions-replication"/>).
     </para>
    </sect3>
    <sect3 id="streaming-replication-slots-config">
@@ -966,8 +972,8 @@ postgres=# SELECT * FROM pg_replication_slots;
  node_a_slot | physical  |        |          | f      |      |             |
 (1 row)
 </programlisting>
-     To configure the standby to use this slot, <varname>primary_slot_name</>
-     should be configured in the standby's <filename>recovery.conf</>.
+     To configure the standby to use this slot, <varname>primary_slot_name</varname>
+     should be configured in the standby's <filename>recovery.conf</filename>.
      Here is a simple example:
 <programlisting>
 standby_mode = 'on'
@@ -1011,7 +1017,7 @@ primary_slot_name = 'node_a_slot'
 
    <para>
     Cascading replication is currently asynchronous. Synchronous replication
-    (see <xref linkend="synchronous-replication">) settings have no effect on
+    (see <xref linkend="synchronous-replication"/>) settings have no effect on
     cascading replication at present.
    </para>
 
@@ -1022,16 +1028,16 @@ primary_slot_name = 'node_a_slot'
    <para>
     If an upstream standby server is promoted to become new master, downstream
     servers will continue to stream from the new master if
-    <varname>recovery_target_timeline</> is set to <literal>'latest'</>.
+    <varname>recovery_target_timeline</varname> is set to <literal>'latest'</literal>.
    </para>
 
    <para>
     To use cascading replication, set up the cascading standby so that it can
     accept replication connections (that is, set
-    <xref linkend="guc-max-wal-senders"> and <xref linkend="guc-hot-standby">,
+    <xref linkend="guc-max-wal-senders"/> and <xref linkend="guc-hot-standby"/>,
     and configure
     <link linkend="auth-pg-hba-conf">host-based authentication</link>).
-    You will also need to set <varname>primary_conninfo</> in the downstream
+    You will also need to set <varname>primary_conninfo</varname> in the downstream
     standby to point to the cascading standby.
    </para>
   </sect2>
@@ -1044,7 +1050,7 @@ primary_slot_name = 'node_a_slot'
    </indexterm>
 
    <para>
-    <productname>PostgreSQL</> streaming replication is asynchronous by
+    <productname>PostgreSQL</productname> streaming replication is asynchronous by
     default. If the primary server
     crashes then some transactions that were committed may not have been
     replicated to the standby server, causing data loss. The amount
@@ -1058,8 +1064,8 @@ primary_slot_name = 'node_a_slot'
     standby servers. This extends that standard level of durability
     offered by a transaction commit. This level of protection is referred
     to as 2-safe replication in computer science theory, and group-1-safe
-    (group-safe and 1-safe) when <varname>synchronous_commit</> is set to
-    <literal>remote_write</>.
+    (group-safe and 1-safe) when <varname>synchronous_commit</varname> is set to
+    <literal>remote_write</literal>.
    </para>
 
    <para>
@@ -1103,15 +1109,15 @@ primary_slot_name = 'node_a_slot'
    <para>
     Once streaming replication has been configured, configuring synchronous
     replication requires only one additional configuration step:
-    <xref linkend="guc-synchronous-standby-names"> must be set to
-    a non-empty value.  <varname>synchronous_commit</> must also be set to
-    <literal>on</>, but since this is the default value, typically no change is
-    required.  (See <xref linkend="runtime-config-wal-settings"> and
-    <xref linkend="runtime-config-replication-master">.)
+    <xref linkend="guc-synchronous-standby-names"/> must be set to
+    a non-empty value.  <varname>synchronous_commit</varname> must also be set to
+    <literal>on</literal>, but since this is the default value, typically no change is
+    required.  (See <xref linkend="runtime-config-wal-settings"/> and
+    <xref linkend="runtime-config-replication-master"/>.)
     This configuration will cause each commit to wait for
     confirmation that the standby has written the commit record to durable
     storage.
-    <varname>synchronous_commit</> can be set by individual
+    <varname>synchronous_commit</varname> can be set by individual
     users, so it can be configured in the configuration file, for particular
     users or databases, or dynamically by applications, in order to control
     the durability guarantee on a per-transaction basis.
@@ -1121,12 +1127,12 @@ primary_slot_name = 'node_a_slot'
     After a commit record has been written to disk on the primary, the
     WAL record is then sent to the standby. The standby sends reply
     messages each time a new batch of WAL data is written to disk, unless
-    <varname>wal_receiver_status_interval</> is set to zero on the standby.
-    In the case that <varname>synchronous_commit</> is set to
-    <literal>remote_apply</>, the standby sends reply messages when the commit
+    <varname>wal_receiver_status_interval</varname> is set to zero on the standby.
+    In the case that <varname>synchronous_commit</varname> is set to
+    <literal>remote_apply</literal>, the standby sends reply messages when the commit
     record is replayed, making the transaction visible.
     If the standby is chosen as a synchronous standby, according to the setting
-    of <varname>synchronous_standby_names</> on the primary, the reply
+    of <varname>synchronous_standby_names</varname> on the primary, the reply
     messages from that standby will be considered along with those from other
     synchronous standbys to decide when to release transactions waiting for
     confirmation that the commit record has been received. These parameters
@@ -1138,13 +1144,13 @@ primary_slot_name = 'node_a_slot'
    </para>
 
    <para>
-    Setting <varname>synchronous_commit</> to <literal>remote_write</> will
+    Setting <varname>synchronous_commit</varname> to <literal>remote_write</literal> will
     cause each commit to wait for confirmation that the standby has received
     the commit record and written it out to its own operating system, but not
     for the data to be flushed to disk on the standby.  This
-    setting provides a weaker guarantee of durability than <literal>on</>
+    setting provides a weaker guarantee of durability than <literal>on</literal>
     does: the standby could lose the data in the event of an operating system
-    crash, though not a <productname>PostgreSQL</> crash.
+    crash, though not a <productname>PostgreSQL</productname> crash.
     However, it's a useful setting in practice
     because it can decrease the response time for the transaction.
     Data loss could only occur if both the primary and the standby crash and
@@ -1152,7 +1158,7 @@ primary_slot_name = 'node_a_slot'
    </para>
 
    <para>
-    Setting <varname>synchronous_commit</> to <literal>remote_apply</> will
+    Setting <varname>synchronous_commit</varname> to <literal>remote_apply</literal> will
     cause each commit to wait until the current synchronous standbys report
     that they have replayed the transaction, making it visible to user
     queries.  In simple cases, this allows for load balancing with causal
@@ -1176,12 +1182,12 @@ primary_slot_name = 'node_a_slot'
     transactions will wait until all the standby servers which are considered
     as synchronous confirm receipt of their data. The number of synchronous
     standbys that transactions must wait for replies from is specified in
-    <varname>synchronous_standby_names</>. This parameter also specifies
-    a list of standby names and the method (<literal>FIRST</> and
-    <literal>ANY</>) to choose synchronous standbys from the listed ones.
+    <varname>synchronous_standby_names</varname>. This parameter also specifies
+    a list of standby names and the method (<literal>FIRST</literal> and
+    <literal>ANY</literal>) to choose synchronous standbys from the listed ones.
    </para>
    <para>
-    The method <literal>FIRST</> specifies a priority-based synchronous
+    The method <literal>FIRST</literal> specifies a priority-based synchronous
     replication and makes transaction commits wait until their WAL records are
     replicated to the requested number of synchronous standbys chosen based on
     their priorities. The standbys whose names appear earlier in the list are
@@ -1192,36 +1198,36 @@ primary_slot_name = 'node_a_slot'
     next-highest-priority standby.
    </para>
    <para>
-    An example of <varname>synchronous_standby_names</> for
+    An example of <varname>synchronous_standby_names</varname> for
     a priority-based multiple synchronous standbys is:
 <programlisting>
 synchronous_standby_names = 'FIRST 2 (s1, s2, s3)'
 </programlisting>
-    In this example, if four standby servers <literal>s1</>, <literal>s2</>,
-    <literal>s3</> and <literal>s4</> are running, the two standbys
-    <literal>s1</> and <literal>s2</> will be chosen as synchronous standbys
+    In this example, if four standby servers <literal>s1</literal>, <literal>s2</literal>,
+    <literal>s3</literal> and <literal>s4</literal> are running, the two standbys
+    <literal>s1</literal> and <literal>s2</literal> will be chosen as synchronous standbys
     because their names appear early in the list of standby names.
-    <literal>s3</> is a potential synchronous standby and will take over
-    the role of synchronous standby when either of <literal>s1</> or
-    <literal>s2</> fails. <literal>s4</> is an asynchronous standby since
+    <literal>s3</literal> is a potential synchronous standby and will take over
+    the role of synchronous standby when either of <literal>s1</literal> or
+    <literal>s2</literal> fails. <literal>s4</literal> is an asynchronous standby since
     its name is not in the list.
    </para>
    <para>
-    The method <literal>ANY</> specifies a quorum-based synchronous
+    The method <literal>ANY</literal> specifies a quorum-based synchronous
     replication and makes transaction commits wait until their WAL records
-    are replicated to <emphasis>at least</> the requested number of
+    are replicated to <emphasis>at least</emphasis> the requested number of
     synchronous standbys in the list.
    </para>
    <para>
-    An example of <varname>synchronous_standby_names</> for
+    An example of <varname>synchronous_standby_names</varname> for
     a quorum-based multiple synchronous standbys is:
 <programlisting>
 synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
 </programlisting>
-    In this example, if four standby servers <literal>s1</>, <literal>s2</>,
-    <literal>s3</> and <literal>s4</> are running, transaction commits will
-    wait for replies from at least any two standbys of <literal>s1</>,
-    <literal>s2</> and <literal>s3</>. <literal>s4</> is an asynchronous
+    In this example, if four standby servers <literal>s1</literal>, <literal>s2</literal>,
+    <literal>s3</literal> and <literal>s4</literal> are running, transaction commits will
+    wait for replies from at least any two standbys of <literal>s1</literal>,
+    <literal>s2</literal> and <literal>s3</literal>. <literal>s4</literal> is an asynchronous
     standby since its name is not in the list.
    </para>
    <para>
@@ -1243,7 +1249,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
    </para>
 
    <para>
-    <productname>PostgreSQL</> allows the application developer
+    <productname>PostgreSQL</productname> allows the application developer
     to specify the durability level required via replication. This can be
     specified for the system overall, though it can also be specified for
     specific users or connections, or even individual transactions.
@@ -1275,10 +1281,10 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     <title>Planning for High Availability</title>
 
    <para>
-    <varname>synchronous_standby_names</> specifies the number and
+    <varname>synchronous_standby_names</varname> specifies the number and
     names of synchronous standbys that transaction commits made when
-    <varname>synchronous_commit</> is set to <literal>on</>,
-    <literal>remote_apply</> or <literal>remote_write</> will wait for
+    <varname>synchronous_commit</varname> is set to <literal>on</literal>,
+    <literal>remote_apply</literal> or <literal>remote_write</literal> will wait for
     responses from. Such transaction commits may never be completed
     if any one of synchronous standbys should crash.
    </para>
@@ -1286,7 +1292,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
    <para>
     The best solution for high availability is to ensure you keep as many
     synchronous standbys as requested. This can be achieved by naming multiple
-    potential synchronous standbys using <varname>synchronous_standby_names</>.
+    potential synchronous standbys using <varname>synchronous_standby_names</varname>.
    </para>
 
    <para>
@@ -1305,14 +1311,14 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
 
    <para>
     When a standby first attaches to the primary, it will not yet be properly
-    synchronized. This is described as <literal>catchup</> mode. Once
+    synchronized. This is described as <literal>catchup</literal> mode. Once
     the lag between standby and primary reaches zero for the first time
-    we move to real-time <literal>streaming</> state.
+    we move to real-time <literal>streaming</literal> state.
     The catch-up duration may be long immediately after the standby has
     been created. If the standby is shut down, then the catch-up period
     will increase according to the length of time the standby has been down.
     The standby is only able to become a synchronous standby
-    once it has reached <literal>streaming</> state.
+    once it has reached <literal>streaming</literal> state.
     This state can be viewed using
     the <structname>pg_stat_replication</structname> view.
    </para>
@@ -1334,7 +1340,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     If you really cannot keep as many synchronous standbys as requested
     then you should decrease the number of synchronous standbys that
     transaction commits must wait for responses from
-    in <varname>synchronous_standby_names</> (or disable it) and
+    in <varname>synchronous_standby_names</varname> (or disable it) and
     reload the configuration file on the primary server.
    </para>
 
@@ -1347,7 +1353,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     If you need to re-create a standby server while transactions are
     waiting, make sure that the commands pg_start_backup() and
     pg_stop_backup() are run in a session with
-    <varname>synchronous_commit</> = <literal>off</>, otherwise those
+    <varname>synchronous_commit</varname> = <literal>off</literal>, otherwise those
     requests will wait forever for the standby to appear.
    </para>
 
@@ -1381,7 +1387,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
    </para>
 
    <para>
-     If <varname>archive_mode</varname> is set to <literal>on</>, the
+     If <varname>archive_mode</varname> is set to <literal>on</literal>, the
      archiver is not enabled during recovery or standby mode. If the standby
      server is promoted, it will start archiving after the promotion, but
      will not archive any WAL it did not generate itself. To get a complete
@@ -1415,7 +1421,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     If the primary server fails and the standby server becomes the
     new primary, and then the old primary restarts, you must have
     a mechanism for informing the old primary that it is no longer the primary. This is
-    sometimes known as <acronym>STONITH</> (Shoot The Other Node In The Head), which is
+    sometimes known as <acronym>STONITH</acronym> (Shoot The Other Node In The Head), which is
     necessary to avoid situations where both systems think they are the
     primary, which will lead to confusion and ultimately data loss.
    </para>
@@ -1445,7 +1451,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     and might stay down.  To return to normal operation, a standby server
     must be recreated,
     either on the former primary system when it comes up, or on a third,
-    possibly new, system. The <xref linkend="app-pgrewind"> utility can be
+    possibly new, system. The <xref linkend="app-pgrewind"/> utility can be
     used to speed up this process on large clusters.
     Once complete, the primary and standby can be
     considered to have switched roles. Some people choose to use a third
@@ -1466,10 +1472,10 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
 
    <para>
     To trigger failover of a log-shipping standby server,
-    run <command>pg_ctl promote</> or create a trigger
-    file with the file name and path specified by the <varname>trigger_file</>
-    setting in <filename>recovery.conf</>. If you're planning to use
-    <command>pg_ctl promote</> to fail over, <varname>trigger_file</> is
+    run <command>pg_ctl promote</command> or create a trigger
+    file with the file name and path specified by the <varname>trigger_file</varname>
+    setting in <filename>recovery.conf</filename>. If you're planning to use
+    <command>pg_ctl promote</command> to fail over, <varname>trigger_file</varname> is
     not required. If you're setting up the reporting servers that are
     only used to offload read-only queries from the primary, not for high
     availability purposes, you don't need to promote it.
@@ -1481,11 +1487,11 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
 
    <para>
     An alternative to the built-in standby mode described in the previous
-    sections is to use a <varname>restore_command</> that polls the archive location.
+    sections is to use a <varname>restore_command</varname> that polls the archive location.
     This was the only option available in versions 8.4 and below. In this
-    setup, set <varname>standby_mode</> off, because you are implementing
+    setup, set <varname>standby_mode</varname> off, because you are implementing
     the polling required for standby operation yourself. See the
-    <xref linkend="pgstandby"> module for a reference
+    <xref linkend="pgstandby"/> module for a reference
     implementation of this.
    </para>
 
@@ -1494,7 +1500,7 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
     time, so if you use the standby server for queries (see Hot Standby),
     there is a delay between an action in the master and when the
     action becomes visible in the standby, corresponding the time it takes
-    to fill up the WAL file. <varname>archive_timeout</> can be used to make that delay
+    to fill up the WAL file. <varname>archive_timeout</varname> can be used to make that delay
     shorter. Also note that you can't combine streaming replication with
     this method.
    </para>
@@ -1511,25 +1517,25 @@ synchronous_standby_names = 'ANY 2 (s1, s2, s3)'
 
    <para>
     The magic that makes the two loosely coupled servers work together is
-    simply a <varname>restore_command</> used on the standby that,
+    simply a <varname>restore_command</varname> used on the standby that,
     when asked for the next WAL file, waits for it to become available from
-    the primary. The <varname>restore_command</> is specified in the
-    <filename>recovery.conf</> file on the standby server. Normal recovery
+    the primary. The <varname>restore_command</varname> is specified in the
+    <filename>recovery.conf</filename> file on the standby server. Normal recovery
     processing would request a file from the WAL archive, reporting failure
     if the file was unavailable.  For standby processing it is normal for
     the next WAL file to be unavailable, so the standby must wait for
-    it to appear. For files ending in <literal>.backup</> or
-    <literal>.history</> there is no need to wait, and a non-zero return
-    code must be returned. A waiting <varname>restore_command</> can be
+    it to appear. For files ending in <literal>.backup</literal> or
+    <literal>.history</literal> there is no need to wait, and a non-zero return
+    code must be returned. A waiting <varname>restore_command</varname> can be
     written as a custom script that loops after polling for the existence of
     the next WAL file. There must also be some way to trigger failover, which
-    should interrupt the <varname>restore_command</>, break the loop and
+    should interrupt the <varname>restore_command</varname>, break the loop and
     return a file-not-found error to the standby server. This ends recovery
     and the standby will then come up as a normal server.
    </para>
 
    <para>
-    Pseudocode for a suitable <varname>restore_command</> is:
+    Pseudocode for a suitable <varname>restore_command</varname> is:
 <programlisting>
 triggered = false;
 while (!NextWALFileReady() &amp;&amp; !triggered)
@@ -1544,8 +1550,8 @@ if (!triggered)
    </para>
 
    <para>
-    A working example of a waiting <varname>restore_command</> is provided
-    in the <xref linkend="pgstandby"> module. It
+    A working example of a waiting <varname>restore_command</varname> is provided
+    in the <xref linkend="pgstandby"/> module. It
     should be used as a reference on how to correctly implement the logic
     described above. It can also be extended as needed to support specific
     configurations and environments.
@@ -1553,14 +1559,14 @@ if (!triggered)
 
    <para>
     The method for triggering failover is an important part of planning
-    and design. One potential option is the <varname>restore_command</>
+    and design. One potential option is the <varname>restore_command</varname>
     command.  It is executed once for each WAL file, but the process
-    running the <varname>restore_command</> is created and dies for
+    running the <varname>restore_command</varname> is created and dies for
     each file, so there is no daemon or server process, and
     signals or a signal handler cannot be used. Therefore, the
-    <varname>restore_command</> is not suitable to trigger failover.
+    <varname>restore_command</varname> is not suitable to trigger failover.
     It is possible to use a simple timeout facility, especially if
-    used in conjunction with a known <varname>archive_timeout</>
+    used in conjunction with a known <varname>archive_timeout</varname>
     setting on the primary. However, this is somewhat error prone
     since a network problem or busy primary server might be sufficient
     to initiate failover. A notification mechanism such as the explicit
@@ -1579,32 +1585,32 @@ if (!triggered)
       <para>
        Set up primary and standby systems as nearly identical as
        possible, including two identical copies of
-       <productname>PostgreSQL</> at the same release level.
+       <productname>PostgreSQL</productname> at the same release level.
       </para>
      </listitem>
      <listitem>
       <para>
        Set up continuous archiving from the primary to a WAL archive
        directory on the standby server. Ensure that
-       <xref linkend="guc-archive-mode">,
-       <xref linkend="guc-archive-command"> and
-       <xref linkend="guc-archive-timeout">
+       <xref linkend="guc-archive-mode"/>,
+       <xref linkend="guc-archive-command"/> and
+       <xref linkend="guc-archive-timeout"/>
        are set appropriately on the primary
-       (see <xref linkend="backup-archiving-wal">).
+       (see <xref linkend="backup-archiving-wal"/>).
       </para>
      </listitem>
      <listitem>
       <para>
        Make a base backup of the primary server (see <xref
-       linkend="backup-base-backup">), and load this data onto the standby.
+       linkend="backup-base-backup"/>), and load this data onto the standby.
       </para>
      </listitem>
      <listitem>
       <para>
        Begin recovery on the standby server from the local WAL
-       archive, using a <filename>recovery.conf</> that specifies a
-       <varname>restore_command</> that waits as described
-       previously (see <xref linkend="backup-pitr-recovery">).
+       archive, using a <filename>recovery.conf</filename> that specifies a
+       <varname>restore_command</varname> that waits as described
+       previously (see <xref linkend="backup-pitr-recovery"/>).
       </para>
      </listitem>
     </orderedlist>
@@ -1637,8 +1643,8 @@ if (!triggered)
    </para>
 
    <para>
-    An external program can call the <function>pg_walfile_name_offset()</>
-    function (see <xref linkend="functions-admin">)
+    An external program can call the <function>pg_walfile_name_offset()</function>
+    function (see <xref linkend="functions-admin"/>)
     to find out the file name and the exact byte offset within it of
     the current end of WAL.  It can then access the WAL file directly
     and copy the data from the last known end of WAL through the current end
@@ -1646,18 +1652,18 @@ if (!triggered)
     loss is the polling cycle time of the copying program, which can be very
     small, and there is no wasted bandwidth from forcing partially-used
     segment files to be archived.  Note that the standby servers'
-    <varname>restore_command</> scripts can only deal with whole WAL files,
+    <varname>restore_command</varname> scripts can only deal with whole WAL files,
     so the incrementally copied data is not ordinarily made available to
     the standby servers.  It is of use only when the primary dies &mdash;
     then the last partial WAL file is fed to the standby before allowing
     it to come up.  The correct implementation of this process requires
-    cooperation of the <varname>restore_command</> script with the data
+    cooperation of the <varname>restore_command</varname> script with the data
     copying program.
    </para>
 
    <para>
-    Starting with <productname>PostgreSQL</> version 9.0, you can use
-    streaming replication (see <xref linkend="streaming-replication">) to
+    Starting with <productname>PostgreSQL</productname> version 9.0, you can use
+    streaming replication (see <xref linkend="streaming-replication"/>) to
     achieve the same benefits with less effort.
    </para>
   </sect2>
@@ -1691,7 +1697,7 @@ if (!triggered)
    <title>User's Overview</title>
 
    <para>
-    When the <xref linkend="guc-hot-standby"> parameter is set to true on a
+    When the <xref linkend="guc-hot-standby"/> parameter is set to true on a
     standby server, it will begin accepting connections once the recovery has
     brought the system to a consistent state.  All such connections are
     strictly read-only; not even temporary tables may be written.
@@ -1707,7 +1713,7 @@ if (!triggered)
     made by that transaction will be visible to any new snapshots taken on
     the standby.  Snapshots may be taken at the start of each query or at the
     start of each transaction, depending on the current transaction isolation
-    level.  For more details, see <xref linkend="transaction-iso">.
+    level.  For more details, see <xref linkend="transaction-iso"/>.
    </para>
 
    <para>
@@ -1716,17 +1722,17 @@ if (!triggered)
     <itemizedlist>
      <listitem>
       <para>
-       Query access - <command>SELECT</>, <command>COPY TO</>
+       Query access - <command>SELECT</command>, <command>COPY TO</command>
       </para>
      </listitem>
      <listitem>
       <para>
-       Cursor commands - <command>DECLARE</>, <command>FETCH</>, <command>CLOSE</>
+       Cursor commands - <command>DECLARE</command>, <command>FETCH</command>, <command>CLOSE</command>
       </para>
      </listitem>
      <listitem>
       <para>
-       Parameters - <command>SHOW</>, <command>SET</>, <command>RESET</>
+       Parameters - <command>SHOW</command>, <command>SET</command>, <command>RESET</command>
       </para>
      </listitem>
      <listitem>
@@ -1735,17 +1741,17 @@ if (!triggered)
         <itemizedlist>
          <listitem>
           <para>
-           <command>BEGIN</>, <command>END</>, <command>ABORT</>, <command>START TRANSACTION</>
+           <command>BEGIN</command>, <command>END</command>, <command>ABORT</command>, <command>START TRANSACTION</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>SAVEPOINT</>, <command>RELEASE</>, <command>ROLLBACK TO SAVEPOINT</>
+           <command>SAVEPOINT</command>, <command>RELEASE</command>, <command>ROLLBACK TO SAVEPOINT</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>EXCEPTION</> blocks and other internal subtransactions
+           <command>EXCEPTION</command> blocks and other internal subtransactions
           </para>
          </listitem>
         </itemizedlist>
@@ -1753,19 +1759,19 @@ if (!triggered)
      </listitem>
      <listitem>
       <para>
-       <command>LOCK TABLE</>, though only when explicitly in one of these modes:
-       <literal>ACCESS SHARE</>, <literal>ROW SHARE</> or <literal>ROW EXCLUSIVE</>.
+       <command>LOCK TABLE</command>, though only when explicitly in one of these modes:
+       <literal>ACCESS SHARE</literal>, <literal>ROW SHARE</literal> or <literal>ROW EXCLUSIVE</literal>.
       </para>
      </listitem>
      <listitem>
       <para>
-       Plans and resources - <command>PREPARE</>, <command>EXECUTE</>,
-       <command>DEALLOCATE</>, <command>DISCARD</>
+       Plans and resources - <command>PREPARE</command>, <command>EXECUTE</command>,
+       <command>DEALLOCATE</command>, <command>DISCARD</command>
       </para>
      </listitem>
      <listitem>
       <para>
-       Plugins and extensions - <command>LOAD</>
+       Plugins and extensions - <command>LOAD</command>
       </para>
      </listitem>
     </itemizedlist>
@@ -1779,9 +1785,9 @@ if (!triggered)
     <itemizedlist>
      <listitem>
       <para>
-       Data Manipulation Language (DML) - <command>INSERT</>,
-       <command>UPDATE</>, <command>DELETE</>, <command>COPY FROM</>,
-       <command>TRUNCATE</>.
+       Data Manipulation Language (DML) - <command>INSERT</command>,
+       <command>UPDATE</command>, <command>DELETE</command>, <command>COPY FROM</command>,
+       <command>TRUNCATE</command>.
        Note that there are no allowed actions that result in a trigger
        being executed during recovery.  This restriction applies even to
        temporary tables, because table rows cannot be read or written without
@@ -1791,31 +1797,31 @@ if (!triggered)
      </listitem>
      <listitem>
       <para>
-       Data Definition Language (DDL) - <command>CREATE</>,
-       <command>DROP</>, <command>ALTER</>, <command>COMMENT</>.
+       Data Definition Language (DDL) - <command>CREATE</command>,
+       <command>DROP</command>, <command>ALTER</command>, <command>COMMENT</command>.
        This restriction applies even to temporary tables, because carrying
        out these operations would require updating the system catalog tables.
       </para>
      </listitem>
      <listitem>
       <para>
-       <command>SELECT ... FOR SHARE | UPDATE</>, because row locks cannot be
+       <command>SELECT ... FOR SHARE | UPDATE</command>, because row locks cannot be
        taken without updating the underlying data files.
       </para>
      </listitem>
      <listitem>
       <para>
-       Rules on <command>SELECT</> statements that generate DML commands.
+       Rules on <command>SELECT</command> statements that generate DML commands.
       </para>
      </listitem>
      <listitem>
       <para>
-       <command>LOCK</> that explicitly requests a mode higher than <literal>ROW EXCLUSIVE MODE</>.
+       <command>LOCK</command> that explicitly requests a mode higher than <literal>ROW EXCLUSIVE MODE</literal>.
       </para>
      </listitem>
      <listitem>
       <para>
-       <command>LOCK</> in short default form, since it requests <literal>ACCESS EXCLUSIVE MODE</>.
+       <command>LOCK</command> in short default form, since it requests <literal>ACCESS EXCLUSIVE MODE</literal>.
       </para>
      </listitem>
      <listitem>
@@ -1824,19 +1830,19 @@ if (!triggered)
         <itemizedlist>
          <listitem>
           <para>
-            <command>BEGIN READ WRITE</>,
-            <command>START TRANSACTION READ WRITE</>
+            <command>BEGIN READ WRITE</command>,
+            <command>START TRANSACTION READ WRITE</command>
           </para>
          </listitem>
          <listitem>
           <para>
-            <command>SET TRANSACTION READ WRITE</>,
-            <command>SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE</>
+            <command>SET TRANSACTION READ WRITE</command>,
+            <command>SET SESSION CHARACTERISTICS AS TRANSACTION READ WRITE</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>SET transaction_read_only = off</>
+           <command>SET transaction_read_only = off</command>
           </para>
          </listitem>
         </itemizedlist>
@@ -1844,35 +1850,35 @@ if (!triggered)
      </listitem>
      <listitem>
       <para>
-       Two-phase commit commands - <command>PREPARE TRANSACTION</>,
-       <command>COMMIT PREPARED</>, <command>ROLLBACK PREPARED</>
+       Two-phase commit commands - <command>PREPARE TRANSACTION</command>,
+       <command>COMMIT PREPARED</command>, <command>ROLLBACK PREPARED</command>
        because even read-only transactions need to write WAL in the
        prepare phase (the first phase of two phase commit).
       </para>
      </listitem>
      <listitem>
       <para>
-       Sequence updates - <function>nextval()</>, <function>setval()</>
+       Sequence updates - <function>nextval()</function>, <function>setval()</function>
       </para>
      </listitem>
      <listitem>
       <para>
-       <command>LISTEN</>, <command>UNLISTEN</>, <command>NOTIFY</>
+       <command>LISTEN</command>, <command>UNLISTEN</command>, <command>NOTIFY</command>
       </para>
      </listitem>
     </itemizedlist>
    </para>
 
    <para>
-    In normal operation, <quote>read-only</> transactions are allowed to
-    use <command>LISTEN</>, <command>UNLISTEN</>, and
-    <command>NOTIFY</>, so Hot Standby sessions operate under slightly tighter
+    In normal operation, <quote>read-only</quote> transactions are allowed to
+    use <command>LISTEN</command>, <command>UNLISTEN</command>, and
+    <command>NOTIFY</command>, so Hot Standby sessions operate under slightly tighter
     restrictions than ordinary read-only sessions.  It is possible that some
     of these restrictions might be loosened in a future release.
    </para>
 
    <para>
-    During hot standby, the parameter <varname>transaction_read_only</> is always
+    During hot standby, the parameter <varname>transaction_read_only</varname> is always
     true and may not be changed.  But as long as no attempt is made to modify
     the database, connections during hot standby will act much like any other
     database connection.  If failover or switchover occurs, the database will
@@ -1884,8 +1890,8 @@ if (!triggered)
 
    <para>
     Users will be able to tell whether their session is read-only by
-    issuing <command>SHOW transaction_read_only</>.  In addition, a set of
-    functions (<xref linkend="functions-recovery-info-table">) allow users to
+    issuing <command>SHOW transaction_read_only</command>.  In addition, a set of
+    functions (<xref linkend="functions-recovery-info-table"/>) allow users to
     access information about the standby server. These allow you to write
     programs that are aware of the current state of the database. These
     can be used to monitor the progress of recovery, or to allow you to
@@ -1907,7 +1913,7 @@ if (!triggered)
 
    <para>
     There are also additional types of conflict that can occur with Hot Standby.
-    These conflicts are <emphasis>hard conflicts</> in the sense that queries
+    These conflicts are <emphasis>hard conflicts</emphasis> in the sense that queries
     might need to be canceled and, in some cases, sessions disconnected to resolve them.
     The user is provided with several ways to handle these
     conflicts. Conflict cases include:
@@ -1916,7 +1922,7 @@ if (!triggered)
        <listitem>
         <para>
          Access Exclusive locks taken on the primary server, including both
-         explicit <command>LOCK</> commands and various <acronym>DDL</>
+         explicit <command>LOCK</command> commands and various <acronym>DDL</acronym>
          actions, conflict with table accesses in standby queries.
         </para>
        </listitem>
@@ -1935,7 +1941,7 @@ if (!triggered)
        <listitem>
         <para>
          Application of a vacuum cleanup record from WAL conflicts with
-         standby transactions whose snapshots can still <quote>see</> any of
+         standby transactions whose snapshots can still <quote>see</quote> any of
          the rows to be removed.
         </para>
        </listitem>
@@ -1962,31 +1968,31 @@ if (!triggered)
 
    <para>
     An example of the problem situation is an administrator on the primary
-    server running <command>DROP TABLE</> on a table that is currently being
+    server running <command>DROP TABLE</command> on a table that is currently being
     queried on the standby server.  Clearly the standby query cannot continue
-    if the <command>DROP TABLE</> is applied on the standby. If this situation
-    occurred on the primary, the <command>DROP TABLE</> would wait until the
-    other query had finished. But when <command>DROP TABLE</> is run on the
+    if the <command>DROP TABLE</command> is applied on the standby. If this situation
+    occurred on the primary, the <command>DROP TABLE</command> would wait until the
+    other query had finished. But when <command>DROP TABLE</command> is run on the
     primary, the primary doesn't have information about what queries are
     running on the standby, so it will not wait for any such standby
     queries. The WAL change records come through to the standby while the
     standby query is still running, causing a conflict.  The standby server
     must either delay application of the WAL records (and everything after
     them, too) or else cancel the conflicting query so that the <command>DROP
-    TABLE</> can be applied.
+    TABLE</command> can be applied.
    </para>
 
    <para>
     When a conflicting query is short, it's typically desirable to allow it to
     complete by delaying WAL application for a little bit; but a long delay in
     WAL application is usually not desirable.  So the cancel mechanism has
-    parameters, <xref linkend="guc-max-standby-archive-delay"> and <xref
-    linkend="guc-max-standby-streaming-delay">, that define the maximum
+    parameters, <xref linkend="guc-max-standby-archive-delay"/> and <xref
+    linkend="guc-max-standby-streaming-delay"/>, that define the maximum
     allowed delay in WAL application.  Conflicting queries will be canceled
     once it has taken longer than the relevant delay setting to apply any
     newly-received WAL data.  There are two parameters so that different delay
     values can be specified for the case of reading WAL data from an archive
-    (i.e., initial recovery from a base backup or <quote>catching up</> a
+    (i.e., initial recovery from a base backup or <quote>catching up</quote> a
     standby server that has fallen far behind) versus reading WAL data via
     streaming replication.
    </para>
@@ -2003,10 +2009,10 @@ if (!triggered)
    </para>
 
    <para>
-    Once the delay specified by <varname>max_standby_archive_delay</> or
-    <varname>max_standby_streaming_delay</> has been exceeded, conflicting
+    Once the delay specified by <varname>max_standby_archive_delay</varname> or
+    <varname>max_standby_streaming_delay</varname> has been exceeded, conflicting
     queries will be canceled.  This usually results just in a cancellation
-    error, although in the case of replaying a <command>DROP DATABASE</>
+    error, although in the case of replaying a <command>DROP DATABASE</command>
     the entire conflicting session will be terminated.  Also, if the conflict
     is over a lock held by an idle transaction, the conflicting session is
     terminated (this behavior might change in the future).
@@ -2030,7 +2036,7 @@ if (!triggered)
 
    <para>
     The most common reason for conflict between standby queries and WAL replay
-    is <quote>early cleanup</>.  Normally, <productname>PostgreSQL</> allows
+    is <quote>early cleanup</quote>.  Normally, <productname>PostgreSQL</productname> allows
     cleanup of old row versions when there are no transactions that need to
     see them to ensure correct visibility of data according to MVCC rules.
     However, this rule can only be applied for transactions executing on the
@@ -2041,7 +2047,7 @@ if (!triggered)
    <para>
     Experienced users should note that both row version cleanup and row version
     freezing will potentially conflict with standby queries. Running a manual
-    <command>VACUUM FREEZE</> is likely to cause conflicts even on tables with
+    <command>VACUUM FREEZE</command> is likely to cause conflicts even on tables with
     no updated or deleted rows.
    </para>
 
@@ -2049,15 +2055,15 @@ if (!triggered)
     Users should be clear that tables that are regularly and heavily updated
     on the primary server will quickly cause cancellation of longer running
     queries on the standby. In such cases the setting of a finite value for
-    <varname>max_standby_archive_delay</> or
-    <varname>max_standby_streaming_delay</> can be considered similar to
-    setting <varname>statement_timeout</>.
+    <varname>max_standby_archive_delay</varname> or
+    <varname>max_standby_streaming_delay</varname> can be considered similar to
+    setting <varname>statement_timeout</varname>.
    </para>
 
    <para>
     Remedial possibilities exist if the number of standby-query cancellations
     is found to be unacceptable.  The first option is to set the parameter
-    <varname>hot_standby_feedback</>, which prevents <command>VACUUM</> from
+    <varname>hot_standby_feedback</varname>, which prevents <command>VACUUM</command> from
     removing recently-dead rows and so cleanup conflicts do not occur.
     If you do this, you
     should note that this will delay cleanup of dead rows on the primary,
@@ -2067,29 +2073,29 @@ if (!triggered)
     off-loading execution onto the standby.
     If standby servers connect and disconnect frequently, you
     might want to make adjustments to handle the period when
-    <varname>hot_standby_feedback</> feedback is not being provided.
-    For example, consider increasing <varname>max_standby_archive_delay</>
+    <varname>hot_standby_feedback</varname> feedback is not being provided.
+    For example, consider increasing <varname>max_standby_archive_delay</varname>
     so that queries are not rapidly canceled by conflicts in WAL archive
     files during disconnected periods.  You should also consider increasing
-    <varname>max_standby_streaming_delay</> to avoid rapid cancellations
+    <varname>max_standby_streaming_delay</varname> to avoid rapid cancellations
     by newly-arrived streaming WAL entries after reconnection.
    </para>
 
    <para>
-    Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age">
+    Another option is to increase <xref linkend="guc-vacuum-defer-cleanup-age"/>
     on the primary server, so that dead rows will not be cleaned up as quickly
     as they normally would be.  This will allow more time for queries to
     execute before they are canceled on the standby, without having to set
-    a high <varname>max_standby_streaming_delay</>.  However it is
+    a high <varname>max_standby_streaming_delay</varname>.  However it is
     difficult to guarantee any specific execution-time window with this
-    approach, since <varname>vacuum_defer_cleanup_age</> is measured in
+    approach, since <varname>vacuum_defer_cleanup_age</varname> is measured in
     transactions executed on the primary server.
    </para>
 
    <para>
     The number of query cancels and the reason for them can be viewed using
-    the <structname>pg_stat_database_conflicts</> system view on the standby
-    server. The <structname>pg_stat_database</> system view also contains
+    the <structname>pg_stat_database_conflicts</structname> system view on the standby
+    server. The <structname>pg_stat_database</structname> system view also contains
     summary information.
    </para>
   </sect2>
@@ -2098,8 +2104,8 @@ if (!triggered)
    <title>Administrator's Overview</title>
 
    <para>
-    If <varname>hot_standby</> is <literal>on</> in <filename>postgresql.conf</>
-    (the default value) and there is a <filename>recovery.conf</>
+    If <varname>hot_standby</varname> is <literal>on</literal> in <filename>postgresql.conf</filename>
+    (the default value) and there is a <filename>recovery.conf</filename>
     file present, the server will run in Hot Standby mode.
     However, it may take some time for Hot Standby connections to be allowed,
     because the server will not accept connections until it has completed
@@ -2120,8 +2126,8 @@ LOG:  database system is ready to accept read only connections
 
     Consistency information is recorded once per checkpoint on the primary.
     It is not possible to enable hot standby when reading WAL
-    written during a period when <varname>wal_level</> was not set to
-    <literal>replica</> or <literal>logical</> on the primary.  Reaching
+    written during a period when <varname>wal_level</varname> was not set to
+    <literal>replica</literal> or <literal>logical</literal> on the primary.  Reaching
     a consistent state can also be delayed in the presence of both of these
     conditions:
 
@@ -2140,14 +2146,19 @@ LOG:  database system is ready to accept read only connections
 
     If you are running file-based log shipping ("warm standby"), you might need
     to wait until the next WAL file arrives, which could be as long as the
-    <varname>archive_timeout</> setting on the primary.
+    <varname>archive_timeout</varname> setting on the primary.
    </para>
 
    <para>
     The setting of some parameters on the standby will need reconfiguration
     if they have been changed on the primary. For these parameters,
     the value on the standby must
-    be equal to or greater than the value on the primary. If these parameters
+    be equal to or greater than the value on the primary.
+    Therefore, if you want to increase these values, you should do so on all
+    standby servers first, before applying the changes to the primary server.
+    Conversely, if you want to decrease these values, you should do so on the
+    primary server first, before applying the changes to all standby servers.
+    If these parameters
     are not set high enough then the standby will refuse to start.
     Higher values can then be supplied and the server
     restarted to begin recovery again.  These parameters are:
@@ -2155,22 +2166,22 @@ LOG:  database system is ready to accept read only connections
       <itemizedlist>
        <listitem>
         <para>
-         <varname>max_connections</>
+         <varname>max_connections</varname>
         </para>
        </listitem>
        <listitem>
         <para>
-         <varname>max_prepared_transactions</>
+         <varname>max_prepared_transactions</varname>
         </para>
        </listitem>
        <listitem>
         <para>
-         <varname>max_locks_per_transaction</>
+         <varname>max_locks_per_transaction</varname>
         </para>
        </listitem>
        <listitem>
         <para>
-         <varname>max_worker_processes</>
+         <varname>max_worker_processes</varname>
         </para>
        </listitem>
       </itemizedlist>
@@ -2178,8 +2189,8 @@ LOG:  database system is ready to accept read only connections
 
    <para>
     It is important that the administrator select appropriate settings for
-    <xref linkend="guc-max-standby-archive-delay"> and <xref
-    linkend="guc-max-standby-streaming-delay">.  The best choices vary
+    <xref linkend="guc-max-standby-archive-delay"/> and <xref
+    linkend="guc-max-standby-streaming-delay"/>.  The best choices vary
     depending on business priorities.  For example if the server is primarily
     tasked as a High Availability server, then you will want low delay
     settings, perhaps even zero, though that is a very aggressive setting. If
@@ -2209,19 +2220,19 @@ LOG:  database system is ready to accept read only connections
       <itemizedlist>
        <listitem>
         <para>
-         Data Definition Language (DDL) - e.g. <command>CREATE INDEX</>
+         Data Definition Language (DDL) - e.g. <command>CREATE INDEX</command>
         </para>
        </listitem>
        <listitem>
         <para>
-         Privilege and Ownership - <command>GRANT</>, <command>REVOKE</>,
-         <command>REASSIGN</>
+         Privilege and Ownership - <command>GRANT</command>, <command>REVOKE</command>,
+         <command>REASSIGN</command>
         </para>
        </listitem>
        <listitem>
         <para>
-         Maintenance commands - <command>ANALYZE</>, <command>VACUUM</>,
-         <command>CLUSTER</>, <command>REINDEX</>
+         Maintenance commands - <command>ANALYZE</command>, <command>VACUUM</command>,
+         <command>CLUSTER</command>, <command>REINDEX</command>
         </para>
        </listitem>
       </itemizedlist>
@@ -2241,14 +2252,14 @@ LOG:  database system is ready to accept read only connections
    </para>
 
    <para>
-    <function>pg_cancel_backend()</>
-    and <function>pg_terminate_backend()</> will work on user backends,
+    <function>pg_cancel_backend()</function>
+    and <function>pg_terminate_backend()</function> will work on user backends,
     but not the Startup process, which performs
     recovery. <structname>pg_stat_activity</structname> does not show
     recovering transactions as active. As a result,
     <structname>pg_prepared_xacts</structname> is always empty during
     recovery. If you wish to resolve in-doubt prepared transactions, view
-    <literal>pg_prepared_xacts</> on the primary and issue commands to
+    <literal>pg_prepared_xacts</literal> on the primary and issue commands to
     resolve transactions there or resolve them after the end of recovery.
    </para>
 
@@ -2256,17 +2267,17 @@ LOG:  database system is ready to accept read only connections
     <structname>pg_locks</structname> will show locks held by backends,
     as normal. <structname>pg_locks</structname> also shows
     a virtual transaction managed by the Startup process that owns all
-    <literal>AccessExclusiveLocks</> held by transactions being replayed by recovery.
+    <literal>AccessExclusiveLocks</literal> held by transactions being replayed by recovery.
     Note that the Startup process does not acquire locks to
-    make database changes, and thus locks other than <literal>AccessExclusiveLocks</>
+    make database changes, and thus locks other than <literal>AccessExclusiveLocks</literal>
     do not show in <structname>pg_locks</structname> for the Startup
     process; they are just presumed to exist.
    </para>
 
    <para>
-    The <productname>Nagios</> plugin <productname>check_pgsql</> will
+    The <productname>Nagios</productname> plugin <productname>check_pgsql</productname> will
     work, because the simple information it checks for exists.
-    The <productname>check_postgres</> monitoring script will also work,
+    The <productname>check_postgres</productname> monitoring script will also work,
     though some reported values could give different or confusing results.
     For example, last vacuum time will not be maintained, since no
     vacuum occurs on the standby.  Vacuums running on the primary
@@ -2275,11 +2286,11 @@ LOG:  database system is ready to accept read only connections
 
    <para>
     WAL file control commands will not work during recovery,
-    e.g. <function>pg_start_backup</>, <function>pg_switch_wal</> etc.
+    e.g. <function>pg_start_backup</function>, <function>pg_switch_wal</function> etc.
    </para>
 
    <para>
-    Dynamically loadable modules work, including <structname>pg_stat_statements</>.
+    Dynamically loadable modules work, including <structname>pg_stat_statements</structname>.
    </para>
 
    <para>
@@ -2292,8 +2303,8 @@ LOG:  database system is ready to accept read only connections
    </para>
 
    <para>
-    Trigger-based replication systems such as <productname>Slony</>,
-    <productname>Londiste</> and <productname>Bucardo</> won't run on the
+    Trigger-based replication systems such as <productname>Slony</productname>,
+    <productname>Londiste</productname> and <productname>Bucardo</productname> won't run on the
     standby at all, though they will run happily on the primary server as
     long as the changes are not sent to standby servers to be applied.
     WAL replay is not trigger-based so you cannot relay from the
@@ -2302,7 +2313,7 @@ LOG:  database system is ready to accept read only connections
    </para>
 
    <para>
-    New OIDs cannot be assigned, though some <acronym>UUID</> generators may still
+    New OIDs cannot be assigned, though some <acronym>UUID</acronym> generators may still
     work as long as they do not rely on writing new status to the database.
    </para>
 
@@ -2314,32 +2325,32 @@ LOG:  database system is ready to accept read only connections
    </para>
 
    <para>
-    <command>DROP TABLESPACE</> can only succeed if the tablespace is empty.
+    <command>DROP TABLESPACE</command> can only succeed if the tablespace is empty.
     Some standby users may be actively using the tablespace via their
-    <varname>temp_tablespaces</> parameter. If there are temporary files in the
+    <varname>temp_tablespaces</varname> parameter. If there are temporary files in the
     tablespace, all active queries are canceled to ensure that temporary
     files are removed, so the tablespace can be removed and WAL replay
     can continue.
    </para>
 
    <para>
-    Running <command>DROP DATABASE</> or <command>ALTER DATABASE ... SET
-    TABLESPACE</> on the primary
+    Running <command>DROP DATABASE</command> or <command>ALTER DATABASE ... SET
+    TABLESPACE</command> on the primary
     will generate a WAL entry that will cause all users connected to that
     database on the standby to be forcibly disconnected. This action occurs
     immediately, whatever the setting of
-    <varname>max_standby_streaming_delay</>. Note that
-    <command>ALTER DATABASE ... RENAME</> does not disconnect users, which
+    <varname>max_standby_streaming_delay</varname>. Note that
+    <command>ALTER DATABASE ... RENAME</command> does not disconnect users, which
     in most cases will go unnoticed, though might in some cases cause a
     program confusion if it depends in some way upon database name.
    </para>
 
    <para>
-    In normal (non-recovery) mode, if you issue <command>DROP USER</> or <command>DROP ROLE</>
+    In normal (non-recovery) mode, if you issue <command>DROP USER</command> or <command>DROP ROLE</command>
     for a role with login capability while that user is still connected then
     nothing happens to the connected user - they remain connected. The user cannot
     reconnect however. This behavior applies in recovery also, so a
-    <command>DROP USER</> on the primary does not disconnect that user on the standby.
+    <command>DROP USER</command> on the primary does not disconnect that user on the standby.
    </para>
 
    <para>
@@ -2361,7 +2372,7 @@ LOG:  database system is ready to accept read only connections
     restartpoints (similar to checkpoints on the primary) and normal block
     cleaning activities. This can include updates of the hint bit
     information stored on the standby server.
-    The <command>CHECKPOINT</> command is accepted during recovery,
+    The <command>CHECKPOINT</command> command is accepted during recovery,
     though it performs a restartpoint rather than a new checkpoint.
    </para>
   </sect2>
@@ -2371,23 +2382,23 @@ LOG:  database system is ready to accept read only connections
 
    <para>
     Various parameters have been mentioned above in
-    <xref linkend="hot-standby-conflict"> and
-    <xref linkend="hot-standby-admin">.
+    <xref linkend="hot-standby-conflict"/> and
+    <xref linkend="hot-standby-admin"/>.
    </para>
 
    <para>
-    On the primary, parameters <xref linkend="guc-wal-level"> and
-    <xref linkend="guc-vacuum-defer-cleanup-age"> can be used.
-    <xref linkend="guc-max-standby-archive-delay"> and
-    <xref linkend="guc-max-standby-streaming-delay"> have no effect if set on
+    On the primary, parameters <xref linkend="guc-wal-level"/> and
+    <xref linkend="guc-vacuum-defer-cleanup-age"/> can be used.
+    <xref linkend="guc-max-standby-archive-delay"/> and
+    <xref linkend="guc-max-standby-streaming-delay"/> have no effect if set on
     the primary.
    </para>
 
    <para>
-    On the standby, parameters <xref linkend="guc-hot-standby">,
-    <xref linkend="guc-max-standby-archive-delay"> and
-    <xref linkend="guc-max-standby-streaming-delay"> can be used.
-    <xref linkend="guc-vacuum-defer-cleanup-age"> has no effect
+    On the standby, parameters <xref linkend="guc-hot-standby"/>,
+    <xref linkend="guc-max-standby-archive-delay"/> and
+    <xref linkend="guc-max-standby-streaming-delay"/> can be used.
+    <xref linkend="guc-vacuum-defer-cleanup-age"/> has no effect
     as long as the server remains in standby mode, though it will
     become relevant if the standby becomes primary.
    </para>
@@ -2427,22 +2438,22 @@ LOG:  database system is ready to accept read only connections
    </listitem>
    <listitem>
     <para>
-     At the end of recovery, <literal>AccessExclusiveLocks</> held by prepared transactions
+     At the end of recovery, <literal>AccessExclusiveLocks</literal> held by prepared transactions
      will require twice the normal number of lock table entries. If you plan
      on running either a large number of concurrent prepared transactions
-     that normally take <literal>AccessExclusiveLocks</>, or you plan on having one
-     large transaction that takes many <literal>AccessExclusiveLocks</>, you are
-     advised to select a larger value of <varname>max_locks_per_transaction</>,
+     that normally take <literal>AccessExclusiveLocks</literal>, or you plan on having one
+     large transaction that takes many <literal>AccessExclusiveLocks</literal>, you are
+     advised to select a larger value of <varname>max_locks_per_transaction</varname>,
      perhaps as much as twice the value of the parameter on
      the primary server. You need not consider this at all if
-     your setting of <varname>max_prepared_transactions</> is 0.
+     your setting of <varname>max_prepared_transactions</varname> is 0.
     </para>
    </listitem>
    <listitem>
     <para>
      The Serializable transaction isolation level is not yet available in hot
-     standby.  (See <xref linkend="xact-serializable"> and
-     <xref linkend="serializable-consistency"> for details.)
+     standby.  (See <xref linkend="xact-serializable"/> and
+     <xref linkend="serializable-consistency"/> for details.)
      An attempt to set a transaction to the serializable isolation level in
      hot standby mode will generate an error.
     </para>
diff --git a/doc/src/sgml/history.sgml b/doc/src/sgml/history.sgml
index a7f4b701ea..59bfdb6055 100644
--- a/doc/src/sgml/history.sgml
+++ b/doc/src/sgml/history.sgml
@@ -31,12 +31,12 @@
    Office (<acronym>ARO</acronym>), the National Science Foundation
    (<acronym>NSF</acronym>), and ESL, Inc.  The implementation of
    <productname>POSTGRES</productname> began in 1986.  The initial
-   concepts for the system were presented in <xref linkend="STON86">,
+   concepts for the system were presented in <xref linkend="ston86"/>,
    and the definition of the initial data model appeared in <xref
-   linkend="ROWE87">.  The design of the rule system at that time was
-   described in <xref linkend="STON87a">.  The rationale and
+   linkend="rowe87"/>.  The design of the rule system at that time was
+   described in <xref linkend="ston87a"/>.  The rationale and
    architecture of the storage manager were detailed in <xref
-   linkend="STON87b">.
+   linkend="ston87b"/>.
   </para>
 
   <para>
@@ -44,10 +44,10 @@
    releases since then.  The first <quote>demoware</quote> system
    became operational in 1987 and was shown at the 1988
    <acronym>ACM-SIGMOD</acronym> Conference.  Version 1, described in
-   <xref linkend="STON90a">, was released to a few external users in
+   <xref linkend="ston90a"/>, was released to a few external users in
    June 1989.  In response to a critique of the first rule system
-   (<xref linkend="STON89">), the rule system was redesigned (<xref
-   linkend="STON90b">), and Version 2 was released in June 1990 with
+   (<xref linkend="ston89"/>), the rule system was redesigned (<xref
+   linkend="ston90b"/>), and Version 2 was released in June 1990 with
    the new rule system.  Version 3 appeared in 1991 and added support
    for multiple storage managers, an improved query executor, and a
    rewritten rule system.  For the most part, subsequent releases
@@ -132,7 +132,7 @@
       (<application>psql</application>) was provided for interactive
       SQL queries, which used <acronym>GNU</acronym>
       <application>Readline</application>.  This largely superseded
-      the old <application>monitor</> program.
+      the old <application>monitor</application> program.
      </para>
     </listitem>
 
@@ -215,8 +215,8 @@
   </para>
 
   <para>
-   Details about what has happened in <productname>PostgreSQL</> since
-   then can be found in <xref linkend="release">.
+   Details about what has happened in <productname>PostgreSQL</productname> since
+   then can be found in <xref linkend="release"/>.
   </para>
  </sect2>
 </sect1>
diff --git a/doc/src/sgml/hstore.sgml b/doc/src/sgml/hstore.sgml
index db5d4409a6..94ccd1201e 100644
--- a/doc/src/sgml/hstore.sgml
+++ b/doc/src/sgml/hstore.sgml
@@ -8,21 +8,21 @@
  </indexterm>
 
  <para>
-  This module implements the <type>hstore</> data type for storing sets of
-  key/value pairs within a single <productname>PostgreSQL</> value.
+  This module implements the <type>hstore</type> data type for storing sets of
+  key/value pairs within a single <productname>PostgreSQL</productname> value.
   This can be useful in various scenarios, such as rows with many attributes
   that are rarely examined, or semi-structured data.  Keys and values are
   simply text strings.
  </para>
 
  <sect2>
-  <title><type>hstore</> External Representation</title>
+  <title><type>hstore</type> External Representation</title>
 
   <para>
 
-   The text representation of an <type>hstore</>, used for input and output,
-   includes zero or more <replaceable>key</> <literal>=&gt;</>
-   <replaceable>value</> pairs separated by commas. Some examples:
+   The text representation of an <type>hstore</type>, used for input and output,
+   includes zero or more <replaceable>key</replaceable> <literal>=&gt;</literal>
+   <replaceable>value</replaceable> pairs separated by commas. Some examples:
 
 <synopsis>
 k =&gt; v
@@ -31,15 +31,15 @@ foo =&gt; bar, baz =&gt; whatever
 </synopsis>
 
    The order of the pairs is not significant (and may not be reproduced on
-   output). Whitespace between pairs or around the <literal>=&gt;</> sign is
+   output). Whitespace between pairs or around the <literal>=&gt;</literal> sign is
    ignored. Double-quote keys and values that include whitespace, commas,
-   <literal>=</>s or <literal>&gt;</>s. To include a double quote or a
+   <literal>=</literal>s or <literal>&gt;</literal>s. To include a double quote or a
    backslash in a key or value, escape it with a backslash.
   </para>
 
   <para>
-   Each key in an <type>hstore</> is unique. If you declare an <type>hstore</>
-   with duplicate keys, only one will be stored in the <type>hstore</> and
+   Each key in an <type>hstore</type> is unique. If you declare an <type>hstore</type>
+   with duplicate keys, only one will be stored in the <type>hstore</type> and
    there is no guarantee as to which will be kept:
 
 <programlisting>
@@ -51,26 +51,26 @@ SELECT 'a=&gt;1,a=&gt;2'::hstore;
   </para>
 
   <para>
-   A value (but not a key) can be an SQL <literal>NULL</>. For example:
+   A value (but not a key) can be an SQL <literal>NULL</literal>. For example:
 
 <programlisting>
 key =&gt; NULL
 </programlisting>
 
-   The <literal>NULL</> keyword is case-insensitive. Double-quote the
-   <literal>NULL</> to treat it as the ordinary string <quote>NULL</quote>.
+   The <literal>NULL</literal> keyword is case-insensitive. Double-quote the
+   <literal>NULL</literal> to treat it as the ordinary string <quote>NULL</quote>.
   </para>
 
   <note>
   <para>
-   Keep in mind that the <type>hstore</> text format, when used for input,
-   applies <emphasis>before</> any required quoting or escaping. If you are
-   passing an <type>hstore</> literal via a parameter, then no additional
+   Keep in mind that the <type>hstore</type> text format, when used for input,
+   applies <emphasis>before</emphasis> any required quoting or escaping. If you are
+   passing an <type>hstore</type> literal via a parameter, then no additional
    processing is needed. But if you're passing it as a quoted literal
    constant, then any single-quote characters and (depending on the setting of
-   the <varname>standard_conforming_strings</> configuration parameter)
+   the <varname>standard_conforming_strings</varname> configuration parameter)
    backslash characters need to be escaped correctly. See
-   <xref linkend="sql-syntax-strings"> for more on the handling of string
+   <xref linkend="sql-syntax-strings"/> for more on the handling of string
    constants.
   </para>
   </note>
@@ -83,16 +83,16 @@ key =&gt; NULL
  </sect2>
 
  <sect2>
-  <title><type>hstore</> Operators and Functions</title>
+  <title><type>hstore</type> Operators and Functions</title>
 
   <para>
    The operators provided by the <literal>hstore</literal> module are
-   shown in <xref linkend="hstore-op-table">, the functions
-   in <xref linkend="hstore-func-table">.
+   shown in <xref linkend="hstore-op-table"/>, the functions
+   in <xref linkend="hstore-func-table"/>.
   </para>
 
   <table id="hstore-op-table">
-   <title><type>hstore</> Operators</title>
+   <title><type>hstore</type> Operators</title>
 
    <tgroup cols="4">
     <thead>
@@ -106,99 +106,99 @@ key =&gt; NULL
 
     <tbody>
      <row>
-      <entry><type>hstore</> <literal>-&gt;</> <type>text</></entry>
-      <entry>get value for key (<literal>NULL</> if not present)</entry>
+      <entry><type>hstore</type> <literal>-&gt;</literal> <type>text</type></entry>
+      <entry>get value for key (<literal>NULL</literal> if not present)</entry>
       <entry><literal>'a=&gt;x, b=&gt;y'::hstore -&gt; 'a'</literal></entry>
       <entry><literal>x</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>-&gt;</> <type>text[]</></entry>
-      <entry>get values for keys (<literal>NULL</> if not present)</entry>
+      <entry><type>hstore</type> <literal>-&gt;</literal> <type>text[]</type></entry>
+      <entry>get values for keys (<literal>NULL</literal> if not present)</entry>
       <entry><literal>'a=&gt;x, b=&gt;y, c=&gt;z'::hstore -&gt; ARRAY['c','a']</literal></entry>
       <entry><literal>{"z","x"}</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>||</> <type>hstore</></entry>
-      <entry>concatenate <type>hstore</>s</entry>
+      <entry><type>hstore</type> <literal>||</literal> <type>hstore</type></entry>
+      <entry>concatenate <type>hstore</type>s</entry>
       <entry><literal>'a=&gt;b, c=&gt;d'::hstore || 'c=&gt;x, d=&gt;q'::hstore</literal></entry>
       <entry><literal>"a"=&gt;"b", "c"=&gt;"x", "d"=&gt;"q"</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>?</> <type>text</></entry>
-      <entry>does <type>hstore</> contain key?</entry>
+      <entry><type>hstore</type> <literal>?</literal> <type>text</type></entry>
+      <entry>does <type>hstore</type> contain key?</entry>
       <entry><literal>'a=&gt;1'::hstore ? 'a'</literal></entry>
       <entry><literal>t</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>?&amp;</> <type>text[]</></entry>
-      <entry>does <type>hstore</> contain all specified keys?</entry>
+      <entry><type>hstore</type> <literal>?&amp;</literal> <type>text[]</type></entry>
+      <entry>does <type>hstore</type> contain all specified keys?</entry>
       <entry><literal>'a=&gt;1,b=&gt;2'::hstore ?&amp; ARRAY['a','b']</literal></entry>
       <entry><literal>t</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>?|</> <type>text[]</></entry>
-      <entry>does <type>hstore</> contain any of the specified keys?</entry>
+      <entry><type>hstore</type> <literal>?|</literal> <type>text[]</type></entry>
+      <entry>does <type>hstore</type> contain any of the specified keys?</entry>
       <entry><literal>'a=&gt;1,b=&gt;2'::hstore ?| ARRAY['b','c']</literal></entry>
       <entry><literal>t</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>@&gt;</> <type>hstore</></entry>
+      <entry><type>hstore</type> <literal>@&gt;</literal> <type>hstore</type></entry>
       <entry>does left operand contain right?</entry>
       <entry><literal>'a=&gt;b, b=&gt;1, c=&gt;NULL'::hstore @&gt; 'b=&gt;1'</literal></entry>
       <entry><literal>t</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>&lt;@</> <type>hstore</></entry>
+      <entry><type>hstore</type> <literal>&lt;@</literal> <type>hstore</type></entry>
       <entry>is left operand contained in right?</entry>
       <entry><literal>'a=&gt;c'::hstore &lt;@ 'a=&gt;b, b=&gt;1, c=&gt;NULL'</literal></entry>
       <entry><literal>f</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>-</> <type>text</></entry>
+      <entry><type>hstore</type> <literal>-</literal> <type>text</type></entry>
       <entry>delete key from left operand</entry>
       <entry><literal>'a=&gt;1, b=&gt;2, c=&gt;3'::hstore - 'b'::text</literal></entry>
       <entry><literal>"a"=&gt;"1", "c"=&gt;"3"</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>-</> <type>text[]</></entry>
+      <entry><type>hstore</type> <literal>-</literal> <type>text[]</type></entry>
       <entry>delete keys from left operand</entry>
       <entry><literal>'a=&gt;1, b=&gt;2, c=&gt;3'::hstore - ARRAY['a','b']</literal></entry>
       <entry><literal>"c"=&gt;"3"</literal></entry>
      </row>
 
      <row>
-      <entry><type>hstore</> <literal>-</> <type>hstore</></entry>
+      <entry><type>hstore</type> <literal>-</literal> <type>hstore</type></entry>
       <entry>delete matching pairs from left operand</entry>
       <entry><literal>'a=&gt;1, b=&gt;2, c=&gt;3'::hstore - 'a=&gt;4, b=&gt;2'::hstore</literal></entry>
       <entry><literal>"a"=&gt;"1", "c"=&gt;"3"</literal></entry>
      </row>
 
      <row>
-      <entry><type>record</> <literal>#=</> <type>hstore</></entry>
-      <entry>replace fields in <type>record</> with matching values from <type>hstore</></entry>
+      <entry><type>record</type> <literal>#=</literal> <type>hstore</type></entry>
+      <entry>replace fields in <type>record</type> with matching values from <type>hstore</type></entry>
       <entry>see Examples section</entry>
       <entry></entry>
      </row>
 
      <row>
-      <entry><literal>%%</> <type>hstore</></entry>
-      <entry>convert <type>hstore</> to array of alternating keys and values</entry>
+      <entry><literal>%%</literal> <type>hstore</type></entry>
+      <entry>convert <type>hstore</type> to array of alternating keys and values</entry>
       <entry><literal>%% 'a=&gt;foo, b=&gt;bar'::hstore</literal></entry>
       <entry><literal>{a,foo,b,bar}</literal></entry>
      </row>
 
      <row>
-      <entry><literal>%#</> <type>hstore</></entry>
-      <entry>convert <type>hstore</> to two-dimensional key/value array</entry>
+      <entry><literal>%#</literal> <type>hstore</type></entry>
+      <entry>convert <type>hstore</type> to two-dimensional key/value array</entry>
       <entry><literal>%# 'a=&gt;foo, b=&gt;bar'::hstore</literal></entry>
       <entry><literal>{{a,foo},{b,bar}}</literal></entry>
      </row>
@@ -209,8 +209,8 @@ key =&gt; NULL
 
   <note>
   <para>
-   Prior to PostgreSQL 8.2, the containment operators <literal>@&gt;</>
-   and <literal>&lt;@</> were called <literal>@</> and <literal>~</>,
+   Prior to PostgreSQL 8.2, the containment operators <literal>@&gt;</literal>
+   and <literal>&lt;@</literal> were called <literal>@</literal> and <literal>~</literal>,
    respectively. These names are still available, but are deprecated and will
    eventually be removed. Notice that the old names are reversed from the
    convention formerly followed by the core geometric data types!
@@ -218,7 +218,7 @@ key =&gt; NULL
   </note>
 
   <table id="hstore-func-table">
-   <title><type>hstore</> Functions</title>
+   <title><type>hstore</type> Functions</title>
 
    <tgroup cols="5">
     <thead>
@@ -235,7 +235,7 @@ key =&gt; NULL
      <row>
       <entry><function>hstore(record)</function><indexterm><primary>hstore</primary></indexterm></entry>
       <entry><type>hstore</type></entry>
-      <entry>construct an <type>hstore</> from a record or row</entry>
+      <entry>construct an <type>hstore</type> from a record or row</entry>
       <entry><literal>hstore(ROW(1,2))</literal></entry>
       <entry><literal>f1=&gt;1,f2=&gt;2</literal></entry>
      </row>
@@ -243,7 +243,7 @@ key =&gt; NULL
      <row>
       <entry><function>hstore(text[])</function></entry>
       <entry><type>hstore</type></entry>
-      <entry>construct an <type>hstore</> from an array, which may be either
+      <entry>construct an <type>hstore</type> from an array, which may be either
        a key/value array, or a two-dimensional array</entry>
       <entry><literal>hstore(ARRAY['a','1','b','2']) || hstore(ARRAY[['c','3'],['d','4']])</literal></entry>
       <entry><literal>a=&gt;1, b=&gt;2, c=&gt;3, d=&gt;4</literal></entry>
@@ -252,7 +252,7 @@ key =&gt; NULL
      <row>
       <entry><function>hstore(text[], text[])</function></entry>
       <entry><type>hstore</type></entry>
-      <entry>construct an <type>hstore</> from separate key and value arrays</entry>
+      <entry>construct an <type>hstore</type> from separate key and value arrays</entry>
       <entry><literal>hstore(ARRAY['a','b'], ARRAY['1','2'])</literal></entry>
       <entry><literal>"a"=&gt;"1","b"=&gt;"2"</literal></entry>
      </row>
@@ -260,7 +260,7 @@ key =&gt; NULL
      <row>
       <entry><function>hstore(text, text)</function></entry>
       <entry><type>hstore</type></entry>
-      <entry>make single-item <type>hstore</></entry>
+      <entry>make single-item <type>hstore</type></entry>
       <entry><literal>hstore('a', 'b')</literal></entry>
       <entry><literal>"a"=&gt;"b"</literal></entry>
      </row>
@@ -268,7 +268,7 @@ key =&gt; NULL
      <row>
       <entry><function>akeys(hstore)</function><indexterm><primary>akeys</primary></indexterm></entry>
       <entry><type>text[]</type></entry>
-      <entry>get <type>hstore</>'s keys as an array</entry>
+      <entry>get <type>hstore</type>'s keys as an array</entry>
       <entry><literal>akeys('a=&gt;1,b=&gt;2')</literal></entry>
       <entry><literal>{a,b}</literal></entry>
      </row>
@@ -276,7 +276,7 @@ key =&gt; NULL
      <row>
       <entry><function>skeys(hstore)</function><indexterm><primary>skeys</primary></indexterm></entry>
       <entry><type>setof text</type></entry>
-      <entry>get <type>hstore</>'s keys as a set</entry>
+      <entry>get <type>hstore</type>'s keys as a set</entry>
       <entry><literal>skeys('a=&gt;1,b=&gt;2')</literal></entry>
       <entry>
 <programlisting>
@@ -288,7 +288,7 @@ b
      <row>
       <entry><function>avals(hstore)</function><indexterm><primary>avals</primary></indexterm></entry>
       <entry><type>text[]</type></entry>
-      <entry>get <type>hstore</>'s values as an array</entry>
+      <entry>get <type>hstore</type>'s values as an array</entry>
       <entry><literal>avals('a=&gt;1,b=&gt;2')</literal></entry>
       <entry><literal>{1,2}</literal></entry>
      </row>
@@ -296,7 +296,7 @@ b
      <row>
       <entry><function>svals(hstore)</function><indexterm><primary>svals</primary></indexterm></entry>
       <entry><type>setof text</type></entry>
-      <entry>get <type>hstore</>'s values as a set</entry>
+      <entry>get <type>hstore</type>'s values as a set</entry>
       <entry><literal>svals('a=&gt;1,b=&gt;2')</literal></entry>
       <entry>
 <programlisting>
@@ -308,7 +308,7 @@ b
      <row>
       <entry><function>hstore_to_array(hstore)</function><indexterm><primary>hstore_to_array</primary></indexterm></entry>
       <entry><type>text[]</type></entry>
-      <entry>get <type>hstore</>'s keys and values as an array of alternating
+      <entry>get <type>hstore</type>'s keys and values as an array of alternating
        keys and values</entry>
       <entry><literal>hstore_to_array('a=&gt;1,b=&gt;2')</literal></entry>
       <entry><literal>{a,1,b,2}</literal></entry>
@@ -317,7 +317,7 @@ b
      <row>
       <entry><function>hstore_to_matrix(hstore)</function><indexterm><primary>hstore_to_matrix</primary></indexterm></entry>
       <entry><type>text[]</type></entry>
-      <entry>get <type>hstore</>'s keys and values as a two-dimensional array</entry>
+      <entry>get <type>hstore</type>'s keys and values as a two-dimensional array</entry>
       <entry><literal>hstore_to_matrix('a=&gt;1,b=&gt;2')</literal></entry>
       <entry><literal>{{a,1},{b,2}}</literal></entry>
      </row>
@@ -359,7 +359,7 @@ b
      <row>
       <entry><function>slice(hstore, text[])</function><indexterm><primary>slice</primary></indexterm></entry>
       <entry><type>hstore</type></entry>
-      <entry>extract a subset of an <type>hstore</></entry>
+      <entry>extract a subset of an <type>hstore</type></entry>
       <entry><literal>slice('a=&gt;1,b=&gt;2,c=&gt;3'::hstore, ARRAY['b','c','x'])</literal></entry>
       <entry><literal>"b"=&gt;"2", "c"=&gt;"3"</literal></entry>
      </row>
@@ -367,7 +367,7 @@ b
      <row>
       <entry><function>each(hstore)</function><indexterm><primary>each</primary></indexterm></entry>
       <entry><type>setof(key text, value text)</type></entry>
-      <entry>get <type>hstore</>'s keys and values as a set</entry>
+      <entry>get <type>hstore</type>'s keys and values as a set</entry>
       <entry><literal>select * from each('a=&gt;1,b=&gt;2')</literal></entry>
       <entry>
 <programlisting>
@@ -381,7 +381,7 @@ b
      <row>
       <entry><function>exist(hstore,text)</function><indexterm><primary>exist</primary></indexterm></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>hstore</> contain key?</entry>
+      <entry>does <type>hstore</type> contain key?</entry>
       <entry><literal>exist('a=&gt;1','a')</literal></entry>
       <entry><literal>t</literal></entry>
      </row>
@@ -389,7 +389,7 @@ b
      <row>
       <entry><function>defined(hstore,text)</function><indexterm><primary>defined</primary></indexterm></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>hstore</> contain non-<literal>NULL</> value for key?</entry>
+      <entry>does <type>hstore</type> contain non-<literal>NULL</literal> value for key?</entry>
       <entry><literal>defined('a=&gt;NULL','a')</literal></entry>
       <entry><literal>f</literal></entry>
      </row>
@@ -421,7 +421,7 @@ b
      <row>
       <entry><function>populate_record(record,hstore)</function><indexterm><primary>populate_record</primary></indexterm></entry>
       <entry><type>record</type></entry>
-      <entry>replace fields in <type>record</> with matching values from <type>hstore</></entry>
+      <entry>replace fields in <type>record</type> with matching values from <type>hstore</type></entry>
       <entry>see Examples section</entry>
       <entry></entry>
      </row>
@@ -442,7 +442,7 @@ b
   <note>
    <para>
     The function <function>populate_record</function> is actually declared
-    with <type>anyelement</>, not <type>record</>, as its first argument,
+    with <type>anyelement</type>, not <type>record</type>, as its first argument,
     but it will reject non-record types with a run-time error.
    </para>
   </note>
@@ -452,8 +452,8 @@ b
   <title>Indexes</title>
 
   <para>
-   <type>hstore</> has GiST and GIN index support for the <literal>@&gt;</>,
-   <literal>?</>, <literal>?&amp;</> and <literal>?|</> operators. For example:
+   <type>hstore</type> has GiST and GIN index support for the <literal>@&gt;</literal>,
+   <literal>?</literal>, <literal>?&amp;</literal> and <literal>?|</literal> operators. For example:
   </para>
 <programlisting>
 CREATE INDEX hidx ON testhstore USING GIST (h);
@@ -462,12 +462,12 @@ CREATE INDEX hidx ON testhstore USING GIN (h);
 </programlisting>
 
   <para>
-   <type>hstore</> also supports <type>btree</> or <type>hash</> indexes for
-   the <literal>=</> operator. This allows <type>hstore</> columns to be
-   declared <literal>UNIQUE</>, or to be used in <literal>GROUP BY</>,
-   <literal>ORDER BY</> or <literal>DISTINCT</> expressions. The sort ordering
-   for <type>hstore</> values is not particularly useful, but these indexes
-   may be useful for equivalence lookups. Create indexes for <literal>=</>
+   <type>hstore</type> also supports <type>btree</type> or <type>hash</type> indexes for
+   the <literal>=</literal> operator. This allows <type>hstore</type> columns to be
+   declared <literal>UNIQUE</literal>, or to be used in <literal>GROUP BY</literal>,
+   <literal>ORDER BY</literal> or <literal>DISTINCT</literal> expressions. The sort ordering
+   for <type>hstore</type> values is not particularly useful, but these indexes
+   may be useful for equivalence lookups. Create indexes for <literal>=</literal>
    comparisons as follows:
   </para>
 <programlisting>
@@ -495,7 +495,7 @@ UPDATE tab SET h = delete(h, 'k1');
   </para>
 
   <para>
-   Convert a <type>record</> to an <type>hstore</>:
+   Convert a <type>record</type> to an <type>hstore</type>:
 <programlisting>
 CREATE TABLE test (col1 integer, col2 text, col3 text);
 INSERT INTO test VALUES (123, 'foo', 'bar');
@@ -509,7 +509,7 @@ SELECT hstore(t) FROM test AS t;
   </para>
 
   <para>
-   Convert an <type>hstore</> to a predefined <type>record</> type:
+   Convert an <type>hstore</type> to a predefined <type>record</type> type:
 <programlisting>
 CREATE TABLE test (col1 integer, col2 text, col3 text);
 
@@ -523,7 +523,7 @@ SELECT * FROM populate_record(null::test,
   </para>
 
   <para>
-   Modify an existing record using the values from an <type>hstore</>:
+   Modify an existing record using the values from an <type>hstore</type>:
 <programlisting>
 CREATE TABLE test (col1 integer, col2 text, col3 text);
 INSERT INTO test VALUES (123, 'foo', 'bar');
@@ -541,7 +541,7 @@ SELECT (r).* FROM (SELECT t #= '"col3"=&gt;"baz"' AS r FROM test t) s;
   <title>Statistics</title>
 
   <para>
-   The <type>hstore</> type, because of its intrinsic liberality, could
+   The <type>hstore</type> type, because of its intrinsic liberality, could
    contain a lot of different keys. Checking for valid keys is the task of the
    application. The following examples demonstrate several techniques for
    checking keys and obtaining statistics.
@@ -588,7 +588,7 @@ SELECT key, count(*) FROM
   <title>Compatibility</title>
 
   <para>
-   As of PostgreSQL 9.0, <type>hstore</> uses a different internal
+   As of PostgreSQL 9.0, <type>hstore</type> uses a different internal
    representation than previous versions. This presents no obstacle for
    dump/restore upgrades since the text representation (used in the dump) is
    unchanged.
@@ -599,7 +599,7 @@ SELECT key, count(*) FROM
    having the new code recognize old-format data. This will entail a slight
    performance penalty when processing data that has not yet been modified by
    the new code. It is possible to force an upgrade of all values in a table
-   column by doing an <literal>UPDATE</> statement as follows:
+   column by doing an <literal>UPDATE</literal> statement as follows:
 <programlisting>
 UPDATE tablename SET hstorecol = hstorecol || '';
 </programlisting>
@@ -610,7 +610,7 @@ UPDATE tablename SET hstorecol = hstorecol || '';
 <programlisting>
 ALTER TABLE tablename ALTER hstorecol TYPE hstore USING hstorecol || '';
 </programlisting>
-   The <command>ALTER TABLE</> method requires an exclusive lock on the table,
+   The <command>ALTER TABLE</command> method requires an exclusive lock on the table,
    but does not result in bloating the table with old row versions.
   </para>
 
@@ -629,7 +629,7 @@ ALTER TABLE tablename ALTER hstorecol TYPE hstore USING hstorecol || '';
    extensions for PL/Python are
    called <literal>hstore_plpythonu</literal>, <literal>hstore_plpython2u</literal>,
    and <literal>hstore_plpython3u</literal>
-   (see <xref linkend="plpython-python23"> for the PL/Python naming
+   (see <xref linkend="plpython-python23"/> for the PL/Python naming
    convention).  If you use them, <type>hstore</type> values are mapped to
    Python dictionaries.
   </para>
diff --git a/doc/src/sgml/indexam.sgml b/doc/src/sgml/indexam.sgml
index ac512588e2..a7f6c8dc6a 100644
--- a/doc/src/sgml/indexam.sgml
+++ b/doc/src/sgml/indexam.sgml
@@ -6,32 +6,32 @@
   <para>
    This chapter defines the interface between the core
    <productname>PostgreSQL</productname> system and <firstterm>index access
-   methods</>, which manage individual index types.  The core system
+   methods</firstterm>, which manage individual index types.  The core system
    knows nothing about indexes beyond what is specified here, so it is
    possible to develop entirely new index types by writing add-on code.
   </para>
 
   <para>
    All indexes in <productname>PostgreSQL</productname> are what are known
-   technically as <firstterm>secondary indexes</>; that is, the index is
+   technically as <firstterm>secondary indexes</firstterm>; that is, the index is
    physically separate from the table file that it describes.  Each index
-   is stored as its own physical <firstterm>relation</> and so is described
-   by an entry in the <structname>pg_class</> catalog.  The contents of an
+   is stored as its own physical <firstterm>relation</firstterm> and so is described
+   by an entry in the <structname>pg_class</structname> catalog.  The contents of an
    index are entirely under the control of its index access method.  In
    practice, all index access methods divide indexes into standard-size
    pages so that they can use the regular storage manager and buffer manager
    to access the index contents.  (All the existing index access methods
    furthermore use the standard page layout described in <xref
-   linkend="storage-page-layout">, and most use the same format for index
+   linkend="storage-page-layout"/>, and most use the same format for index
    tuple headers; but these decisions are not forced on an access method.)
   </para>
 
   <para>
    An index is effectively a mapping from some data key values to
-   <firstterm>tuple identifiers</>, or <acronym>TIDs</>, of row versions
+   <firstterm>tuple identifiers</firstterm>, or <acronym>TIDs</acronym>, of row versions
    (tuples) in the index's parent table.  A TID consists of a
    block number and an item number within that block (see <xref
-   linkend="storage-page-layout">).  This is sufficient
+   linkend="storage-page-layout"/>).  This is sufficient
    information to fetch a particular row version from the table.
    Indexes are not directly aware that under MVCC, there might be multiple
    extant versions of the same logical row; to an index, each tuple is
@@ -50,28 +50,28 @@
    Each index access method is described by a row in the
    <link linkend="catalog-pg-am"><structname>pg_am</structname></link>
    system catalog.  The <structname>pg_am</structname> entry
-   specifies a name and a <firstterm>handler function</> for the access
+   specifies a name and a <firstterm>handler function</firstterm> for the access
    method.  These entries can be created and deleted using the
-   <xref linkend="sql-create-access-method"> and
-   <xref linkend="sql-drop-access-method"> SQL commands.
+   <xref linkend="sql-create-access-method"/> and
+   <xref linkend="sql-drop-access-method"/> SQL commands.
   </para>
 
   <para>
    An index access method handler function must be declared to accept a
-   single argument of type <type>internal</> and to return the
-   pseudo-type <type>index_am_handler</>.  The argument is a dummy value that
+   single argument of type <type>internal</type> and to return the
+   pseudo-type <type>index_am_handler</type>.  The argument is a dummy value that
    simply serves to prevent handler functions from being called directly from
    SQL commands.  The result of the function must be a palloc'd struct of
    type <structname>IndexAmRoutine</structname>, which contains everything
    that the core code needs to know to make use of the index access method.
    The <structname>IndexAmRoutine</structname> struct, also called the access
-   method's <firstterm>API struct</>, includes fields specifying assorted
+   method's <firstterm>API struct</firstterm>, includes fields specifying assorted
    fixed properties of the access method, such as whether it can support
    multicolumn indexes.  More importantly, it contains pointers to support
    functions for the access method, which do all of the real work to access
    indexes.  These support functions are plain C functions and are not
    visible or callable at the SQL level.  The support functions are described
-   in <xref linkend="index-functions">.
+   in <xref linkend="index-functions"/>.
   </para>
 
   <para>
@@ -144,8 +144,8 @@ typedef struct IndexAmRoutine
 
   <para>
    To be useful, an index access method must also have one or more
-   <firstterm>operator families</> and
-   <firstterm>operator classes</> defined in
+   <firstterm>operator families</firstterm> and
+   <firstterm>operator classes</firstterm> defined in
    <link linkend="catalog-pg-opfamily"><structname>pg_opfamily</structname></link>,
    <link linkend="catalog-pg-opclass"><structname>pg_opclass</structname></link>,
    <link linkend="catalog-pg-amop"><structname>pg_amop</structname></link>, and
@@ -153,7 +153,7 @@ typedef struct IndexAmRoutine
    These entries allow the planner
    to determine what kinds of query qualifications can be used with
    indexes of this access method.  Operator families and classes are described
-   in <xref linkend="xindex">, which is prerequisite material for reading
+   in <xref linkend="xindex"/>, which is prerequisite material for reading
    this chapter.
   </para>
 
@@ -170,14 +170,14 @@ typedef struct IndexAmRoutine
    key values come from (it is always handed precomputed key values) but it
    will be very interested in the operator class information in
    <structname>pg_index</structname>.  Both of these catalog entries can be
-   accessed as part of the <structname>Relation</> data structure that is
+   accessed as part of the <structname>Relation</structname> data structure that is
    passed to all operations on the index.
   </para>
 
   <para>
-   Some of the flag fields of <structname>IndexAmRoutine</> have nonobvious
+   Some of the flag fields of <structname>IndexAmRoutine</structname> have nonobvious
    implications.  The requirements of <structfield>amcanunique</structfield>
-   are discussed in <xref linkend="index-unique-checks">.
+   are discussed in <xref linkend="index-unique-checks"/>.
    The <structfield>amcanmulticol</structfield> flag asserts that the
    access method supports multicolumn indexes, while
    <structfield>amoptionalkey</structfield> asserts that it allows scans
@@ -185,7 +185,7 @@ typedef struct IndexAmRoutine
    When <structfield>amcanmulticol</structfield> is false,
    <structfield>amoptionalkey</structfield> essentially says whether the
    access method supports full-index scans without any restriction clause.
-   Access methods that support multiple index columns <emphasis>must</>
+   Access methods that support multiple index columns <emphasis>must</emphasis>
    support scans that omit restrictions on any or all of the columns after
    the first; however they are permitted to require some restriction to
    appear for the first index column, and this is signaled by setting
@@ -201,17 +201,17 @@ typedef struct IndexAmRoutine
    indexes that have <structfield>amoptionalkey</structfield> true must
    index nulls, since the planner might decide to use such an index
    with no scan keys at all.  A related restriction is that an index
-   access method that supports multiple index columns <emphasis>must</>
+   access method that supports multiple index columns <emphasis>must</emphasis>
    support indexing null values in columns after the first, because the planner
    will assume the index can be used for queries that do not restrict
    these columns.  For example, consider an index on (a,b) and a query with
    <literal>WHERE a = 4</literal>.  The system will assume the index can be
    used to scan for rows with <literal>a = 4</literal>, which is wrong if the
-   index omits rows where <literal>b</> is null.
+   index omits rows where <literal>b</literal> is null.
    It is, however, OK to omit rows where the first indexed column is null.
    An index access method that does index nulls may also set
    <structfield>amsearchnulls</structfield>, indicating that it supports
-   <literal>IS NULL</> and <literal>IS NOT NULL</> clauses as search
+   <literal>IS NULL</literal> and <literal>IS NOT NULL</literal> clauses as search
    conditions.
   </para>
 
@@ -235,8 +235,8 @@ ambuild (Relation heapRelation,
    Build a new index.  The index relation has been physically created,
    but is empty.  It must be filled in with whatever fixed data the
    access method requires, plus entries for all tuples already existing
-   in the table.  Ordinarily the <function>ambuild</> function will call
-   <function>IndexBuildHeapScan()</> to scan the table for existing tuples
+   in the table.  Ordinarily the <function>ambuild</function> function will call
+   <function>IndexBuildHeapScan()</function> to scan the table for existing tuples
    and compute the keys that need to be inserted into the index.
    The function must return a palloc'd struct containing statistics about
    the new index.
@@ -264,30 +264,30 @@ aminsert (Relation indexRelation,
           IndexUniqueCheck checkUnique,
           IndexInfo *indexInfo);
 </programlisting>
-   Insert a new tuple into an existing index.  The <literal>values</> and
-   <literal>isnull</> arrays give the key values to be indexed, and
-   <literal>heap_tid</> is the TID to be indexed.
+   Insert a new tuple into an existing index.  The <literal>values</literal> and
+   <literal>isnull</literal> arrays give the key values to be indexed, and
+   <literal>heap_tid</literal> is the TID to be indexed.
    If the access method supports unique indexes (its
-   <structfield>amcanunique</> flag is true) then
-   <literal>checkUnique</> indicates the type of uniqueness check to
+   <structfield>amcanunique</structfield> flag is true) then
+   <literal>checkUnique</literal> indicates the type of uniqueness check to
    perform.  This varies depending on whether the unique constraint is
-   deferrable; see <xref linkend="index-unique-checks"> for details.
-   Normally the access method only needs the <literal>heapRelation</>
+   deferrable; see <xref linkend="index-unique-checks"/> for details.
+   Normally the access method only needs the <literal>heapRelation</literal>
    parameter when performing uniqueness checking (since then it will have to
    look into the heap to verify tuple liveness).
   </para>
 
   <para>
    The function's Boolean result value is significant only when
-   <literal>checkUnique</> is <literal>UNIQUE_CHECK_PARTIAL</>.
-   In this case a TRUE result means the new entry is known unique, whereas
-   FALSE means it might be non-unique (and a deferred uniqueness check must
-   be scheduled).  For other cases a constant FALSE result is recommended.
+   <literal>checkUnique</literal> is <literal>UNIQUE_CHECK_PARTIAL</literal>.
+   In this case a true result means the new entry is known unique, whereas
+   false means it might be non-unique (and a deferred uniqueness check must
+   be scheduled).  For other cases a constant false result is recommended.
   </para>
 
   <para>
    Some indexes might not index all tuples.  If the tuple is not to be
-   indexed, <function>aminsert</> should just return without doing anything.
+   indexed, <function>aminsert</function> should just return without doing anything.
   </para>
 
   <para>
@@ -306,26 +306,26 @@ ambulkdelete (IndexVacuumInfo *info,
               IndexBulkDeleteCallback callback,
               void *callback_state);
 </programlisting>
-   Delete tuple(s) from the index.  This is a <quote>bulk delete</> operation
+   Delete tuple(s) from the index.  This is a <quote>bulk delete</quote> operation
    that is intended to be implemented by scanning the whole index and checking
    each entry to see if it should be deleted.
-   The passed-in <literal>callback</> function must be called, in the style
-   <literal>callback(<replaceable>TID</>, callback_state) returns bool</literal>,
+   The passed-in <literal>callback</literal> function must be called, in the style
+   <literal>callback(<replaceable>TID</replaceable>, callback_state) returns bool</literal>,
    to determine whether any particular index entry, as identified by its
    referenced TID, is to be deleted.  Must return either NULL or a palloc'd
    struct containing statistics about the effects of the deletion operation.
    It is OK to return NULL if no information needs to be passed on to
-   <function>amvacuumcleanup</>.
+   <function>amvacuumcleanup</function>.
   </para>
 
   <para>
-   Because of limited <varname>maintenance_work_mem</>,
-   <function>ambulkdelete</> might need to be called more than once when many
-   tuples are to be deleted.  The <literal>stats</> argument is the result
+   Because of limited <varname>maintenance_work_mem</varname>,
+   <function>ambulkdelete</function> might need to be called more than once when many
+   tuples are to be deleted.  The <literal>stats</literal> argument is the result
    of the previous call for this index (it is NULL for the first call within a
-   <command>VACUUM</> operation).  This allows the AM to accumulate statistics
-   across the whole operation.  Typically, <function>ambulkdelete</> will
-   modify and return the same struct if the passed <literal>stats</> is not
+   <command>VACUUM</command> operation).  This allows the AM to accumulate statistics
+   across the whole operation.  Typically, <function>ambulkdelete</function> will
+   modify and return the same struct if the passed <literal>stats</literal> is not
    null.
   </para>
 
@@ -336,14 +336,14 @@ amvacuumcleanup (IndexVacuumInfo *info,
                  IndexBulkDeleteResult *stats);
 </programlisting>
    Clean up after a <command>VACUUM</command> operation (zero or more
-   <function>ambulkdelete</> calls).  This does not have to do anything
+   <function>ambulkdelete</function> calls).  This does not have to do anything
    beyond returning index statistics, but it might perform bulk cleanup
-   such as reclaiming empty index pages.  <literal>stats</> is whatever the
-   last <function>ambulkdelete</> call returned, or NULL if
-   <function>ambulkdelete</> was not called because no tuples needed to be
+   such as reclaiming empty index pages.  <literal>stats</literal> is whatever the
+   last <function>ambulkdelete</function> call returned, or NULL if
+   <function>ambulkdelete</function> was not called because no tuples needed to be
    deleted.  If the result is not NULL it must be a palloc'd struct.
-   The statistics it contains will be used to update <structname>pg_class</>,
-   and will be reported by <command>VACUUM</> if <literal>VERBOSE</> is given.
+   The statistics it contains will be used to update <structname>pg_class</structname>,
+   and will be reported by <command>VACUUM</command> if <literal>VERBOSE</literal> is given.
    It is OK to return NULL if the index was not changed at all during the
    <command>VACUUM</command> operation, but otherwise correct stats should
    be returned.
@@ -351,8 +351,8 @@ amvacuumcleanup (IndexVacuumInfo *info,
 
   <para>
    As of <productname>PostgreSQL</productname> 8.4,
-   <function>amvacuumcleanup</> will also be called at completion of an
-   <command>ANALYZE</> operation.  In this case <literal>stats</> is always
+   <function>amvacuumcleanup</function> will also be called at completion of an
+   <command>ANALYZE</command> operation.  In this case <literal>stats</literal> is always
    NULL and any return value will be ignored.  This case can be distinguished
    by checking <literal>info-&gt;analyze_only</literal>.  It is recommended
    that the access method do nothing except post-insert cleanup in such a
@@ -365,12 +365,12 @@ bool
 amcanreturn (Relation indexRelation, int attno);
 </programlisting>
    Check whether the index can support <link
-   linkend="indexes-index-only-scans"><firstterm>index-only scans</></link> on
+   linkend="indexes-index-only-scans"><firstterm>index-only scans</firstterm></link> on
    the given column, by returning the indexed column values for an index entry
    in the form of an <structname>IndexTuple</structname>.  The attribute number
-   is 1-based, i.e. the first column's attno is 1. Returns TRUE if supported,
-   else FALSE.  If the access method does not support index-only scans at all,
-   the <structfield>amcanreturn</> field in its <structname>IndexAmRoutine</>
+   is 1-based, i.e. the first column's attno is 1. Returns true if supported,
+   else false.  If the access method does not support index-only scans at all,
+   the <structfield>amcanreturn</structfield> field in its <structname>IndexAmRoutine</structname>
    struct can be set to NULL.
   </para>
 
@@ -386,7 +386,7 @@ amcostestimate (PlannerInfo *root,
                 double *indexCorrelation);
 </programlisting>
    Estimate the costs of an index scan.  This function is described fully
-   in <xref linkend="index-cost-estimation">, below.
+   in <xref linkend="index-cost-estimation"/>, below.
   </para>
 
   <para>
@@ -397,18 +397,18 @@ amoptions (ArrayType *reloptions,
 </programlisting>
    Parse and validate the reloptions array for an index.  This is called only
    when a non-null reloptions array exists for the index.
-   <parameter>reloptions</> is a <type>text</> array containing entries of the
-   form <replaceable>name</><literal>=</><replaceable>value</>.
-   The function should construct a <type>bytea</> value, which will be copied
-   into the <structfield>rd_options</> field of the index's relcache entry.
-   The data contents of the <type>bytea</> value are open for the access
+   <parameter>reloptions</parameter> is a <type>text</type> array containing entries of the
+   form <replaceable>name</replaceable><literal>=</literal><replaceable>value</replaceable>.
+   The function should construct a <type>bytea</type> value, which will be copied
+   into the <structfield>rd_options</structfield> field of the index's relcache entry.
+   The data contents of the <type>bytea</type> value are open for the access
    method to define; most of the standard access methods use struct
-   <structname>StdRdOptions</>.
-   When <parameter>validate</> is true, the function should report a suitable
+   <structname>StdRdOptions</structname>.
+   When <parameter>validate</parameter> is true, the function should report a suitable
    error message if any of the options are unrecognized or have invalid
-   values; when <parameter>validate</> is false, invalid entries should be
-   silently ignored.  (<parameter>validate</> is false when loading options
-   already stored in <structname>pg_catalog</>; an invalid entry could only
+   values; when <parameter>validate</parameter> is false, invalid entries should be
+   silently ignored.  (<parameter>validate</parameter> is false when loading options
+   already stored in <structname>pg_catalog</structname>; an invalid entry could only
    be found if the access method has changed its rules for options, and in
    that case ignoring obsolete entries is appropriate.)
    It is OK to return NULL if default behavior is wanted.
@@ -421,44 +421,44 @@ amproperty (Oid index_oid, int attno,
             IndexAMProperty prop, const char *propname,
             bool *res, bool *isnull);
 </programlisting>
-   The <function>amproperty</> method allows index access methods to override
+   The <function>amproperty</function> method allows index access methods to override
    the default behavior of <function>pg_index_column_has_property</function>
    and related functions.
    If the access method does not have any special behavior for index property
-   inquiries, the <structfield>amproperty</> field in
-   its <structname>IndexAmRoutine</> struct can be set to NULL.
-   Otherwise, the <function>amproperty</> method will be called with
-   <parameter>index_oid</> and <parameter>attno</> both zero for
+   inquiries, the <structfield>amproperty</structfield> field in
+   its <structname>IndexAmRoutine</structname> struct can be set to NULL.
+   Otherwise, the <function>amproperty</function> method will be called with
+   <parameter>index_oid</parameter> and <parameter>attno</parameter> both zero for
    <function>pg_indexam_has_property</function> calls,
-   or with <parameter>index_oid</> valid and <parameter>attno</> zero for
+   or with <parameter>index_oid</parameter> valid and <parameter>attno</parameter> zero for
    <function>pg_index_has_property</function> calls,
-   or with <parameter>index_oid</> valid and <parameter>attno</> greater than
+   or with <parameter>index_oid</parameter> valid and <parameter>attno</parameter> greater than
    zero for <function>pg_index_column_has_property</function> calls.
-   <parameter>prop</> is an enum value identifying the property being tested,
-   while <parameter>propname</> is the original property name string.
+   <parameter>prop</parameter> is an enum value identifying the property being tested,
+   while <parameter>propname</parameter> is the original property name string.
    If the core code does not recognize the property name
-   then <parameter>prop</> is <literal>AMPROP_UNKNOWN</>.
+   then <parameter>prop</parameter> is <literal>AMPROP_UNKNOWN</literal>.
    Access methods can define custom property names by
-   checking <parameter>propname</> for a match (use <function>pg_strcasecmp</>
+   checking <parameter>propname</parameter> for a match (use <function>pg_strcasecmp</function>
    to match, for consistency with the core code); for names known to the core
-   code, it's better to inspect <parameter>prop</>.
-   If the <structfield>amproperty</> method returns <literal>true</> then
-   it has determined the property test result: it must set <literal>*res</>
-   to the boolean value to return, or set <literal>*isnull</>
-   to <literal>true</> to return a NULL.  (Both of the referenced variables
-   are initialized to <literal>false</> before the call.)
-   If the <structfield>amproperty</> method returns <literal>false</> then
+   code, it's better to inspect <parameter>prop</parameter>.
+   If the <structfield>amproperty</structfield> method returns <literal>true</literal> then
+   it has determined the property test result: it must set <literal>*res</literal>
+   to the boolean value to return, or set <literal>*isnull</literal>
+   to <literal>true</literal> to return a NULL.  (Both of the referenced variables
+   are initialized to <literal>false</literal> before the call.)
+   If the <structfield>amproperty</structfield> method returns <literal>false</literal> then
    the core code will proceed with its normal logic for determining the
    property test result.
   </para>
 
   <para>
    Access methods that support ordering operators should
-   implement <literal>AMPROP_DISTANCE_ORDERABLE</> property testing, as the
+   implement <literal>AMPROP_DISTANCE_ORDERABLE</literal> property testing, as the
    core code does not know how to do that and will return NULL.  It may
-   also be advantageous to implement <literal>AMPROP_RETURNABLE</> testing,
+   also be advantageous to implement <literal>AMPROP_RETURNABLE</literal> testing,
    if that can be done more cheaply than by opening the index and calling
-   <structfield>amcanreturn</>, which is the core code's default behavior.
+   <structfield>amcanreturn</structfield>, which is the core code's default behavior.
    The default behavior should be satisfactory for all other standard
    properties.
   </para>
@@ -471,18 +471,18 @@ amvalidate (Oid opclassoid);
    Validate the catalog entries for the specified operator class, so far as
    the access method can reasonably do that.  For example, this might include
    testing that all required support functions are provided.
-   The <function>amvalidate</> function must return false if the opclass is
-   invalid.  Problems should be reported with <function>ereport</> messages.
+   The <function>amvalidate</function> function must return false if the opclass is
+   invalid.  Problems should be reported with <function>ereport</function> messages.
   </para>
 
 
   <para>
    The purpose of an index, of course, is to support scans for tuples matching
-   an indexable <literal>WHERE</> condition, often called a
-   <firstterm>qualifier</> or <firstterm>scan key</>.  The semantics of
-   index scanning are described more fully in <xref linkend="index-scanning">,
-   below.  An index access method can support <quote>plain</> index scans,
-   <quote>bitmap</> index scans, or both.  The scan-related functions that an
+   an indexable <literal>WHERE</literal> condition, often called a
+   <firstterm>qualifier</firstterm> or <firstterm>scan key</firstterm>.  The semantics of
+   index scanning are described more fully in <xref linkend="index-scanning"/>,
+   below.  An index access method can support <quote>plain</quote> index scans,
+   <quote>bitmap</quote> index scans, or both.  The scan-related functions that an
    index access method must or may provide are:
   </para>
 
@@ -493,17 +493,17 @@ ambeginscan (Relation indexRelation,
              int nkeys,
              int norderbys);
 </programlisting>
-   Prepare for an index scan.  The <literal>nkeys</> and <literal>norderbys</>
+   Prepare for an index scan.  The <literal>nkeys</literal> and <literal>norderbys</literal>
    parameters indicate the number of quals and ordering operators that will be
    used in the scan; these may be useful for space allocation purposes.
    Note that the actual values of the scan keys aren't provided yet.
    The result must be a palloc'd struct.
    For implementation reasons the index access method
-   <emphasis>must</> create this struct by calling
-   <function>RelationGetIndexScan()</>.  In most cases
-   <function>ambeginscan</> does little beyond making that call and perhaps
+   <emphasis>must</emphasis> create this struct by calling
+   <function>RelationGetIndexScan()</function>.  In most cases
+   <function>ambeginscan</function> does little beyond making that call and perhaps
    acquiring locks;
-   the interesting parts of index-scan startup are in <function>amrescan</>.
+   the interesting parts of index-scan startup are in <function>amrescan</function>.
   </para>
 
   <para>
@@ -516,10 +516,10 @@ amrescan (IndexScanDesc scan,
           int norderbys);
 </programlisting>
    Start or restart an index scan, possibly with new scan keys.  (To restart
-   using previously-passed keys, NULL is passed for <literal>keys</> and/or
-   <literal>orderbys</>.)  Note that it is not allowed for
+   using previously-passed keys, NULL is passed for <literal>keys</literal> and/or
+   <literal>orderbys</literal>.)  Note that it is not allowed for
    the number of keys or order-by operators to be larger than
-   what was passed to <function>ambeginscan</>.  In practice the restart
+   what was passed to <function>ambeginscan</function>.  In practice the restart
    feature is used when a new outer tuple is selected by a nested-loop join
    and so a new key comparison value is needed, but the scan key structure
    remains the same.
@@ -532,44 +532,44 @@ amgettuple (IndexScanDesc scan,
             ScanDirection direction);
 </programlisting>
    Fetch the next tuple in the given scan, moving in the given
-   direction (forward or backward in the index).  Returns TRUE if a tuple was
-   obtained, FALSE if no matching tuples remain.  In the TRUE case the tuple
-   TID is stored into the <literal>scan</> structure.  Note that
-   <quote>success</> means only that the index contains an entry that matches
+   direction (forward or backward in the index).  Returns true if a tuple was
+   obtained, false if no matching tuples remain.  In the true case the tuple
+   TID is stored into the <literal>scan</literal> structure.  Note that
+   <quote>success</quote> means only that the index contains an entry that matches
    the scan keys, not that the tuple necessarily still exists in the heap or
-   will pass the caller's snapshot test.  On success, <function>amgettuple</>
-   must also set <literal>scan-&gt;xs_recheck</> to TRUE or FALSE.
-   FALSE means it is certain that the index entry matches the scan keys.
-   TRUE means this is not certain, and the conditions represented by the
+   will pass the caller's snapshot test.  On success, <function>amgettuple</function>
+   must also set <literal>scan-&gt;xs_recheck</literal> to true or false.
+   False means it is certain that the index entry matches the scan keys.
+   true means this is not certain, and the conditions represented by the
    scan keys must be rechecked against the heap tuple after fetching it.
-   This provision supports <quote>lossy</> index operators.
+   This provision supports <quote>lossy</quote> index operators.
    Note that rechecking will extend only to the scan conditions; a partial
-   index predicate (if any) is never rechecked by <function>amgettuple</>
+   index predicate (if any) is never rechecked by <function>amgettuple</function>
    callers.
   </para>
 
   <para>
    If the index supports <link linkend="indexes-index-only-scans">index-only
-   scans</link> (i.e., <function>amcanreturn</function> returns TRUE for it),
-   then on success the AM must also check <literal>scan-&gt;xs_want_itup</>,
+   scans</link> (i.e., <function>amcanreturn</function> returns true for it),
+   then on success the AM must also check <literal>scan-&gt;xs_want_itup</literal>,
    and if that is true it must return the originally indexed data for the
    index entry.  The data can be returned in the form of an
-   <structname>IndexTuple</> pointer stored at <literal>scan-&gt;xs_itup</>,
-   with tuple descriptor <literal>scan-&gt;xs_itupdesc</>; or in the form of
-   a <structname>HeapTuple</> pointer stored at <literal>scan-&gt;xs_hitup</>,
-   with tuple descriptor <literal>scan-&gt;xs_hitupdesc</>.  (The latter
+   <structname>IndexTuple</structname> pointer stored at <literal>scan-&gt;xs_itup</literal>,
+   with tuple descriptor <literal>scan-&gt;xs_itupdesc</literal>; or in the form of
+   a <structname>HeapTuple</structname> pointer stored at <literal>scan-&gt;xs_hitup</literal>,
+   with tuple descriptor <literal>scan-&gt;xs_hitupdesc</literal>.  (The latter
    format should be used when reconstructing data that might possibly not fit
-   into an IndexTuple.)  In either case,
+   into an <structname>IndexTuple</structname>.)  In either case,
    management of the data referenced by the pointer is the access method's
    responsibility.  The data must remain good at least until the next
-   <function>amgettuple</>, <function>amrescan</>, or <function>amendscan</>
+   <function>amgettuple</function>, <function>amrescan</function>, or <function>amendscan</function>
    call for the scan.
   </para>
 
   <para>
-   The <function>amgettuple</> function need only be provided if the access
-   method supports <quote>plain</> index scans.  If it doesn't, the
-   <structfield>amgettuple</> field in its <structname>IndexAmRoutine</>
+   The <function>amgettuple</function> function need only be provided if the access
+   method supports <quote>plain</quote> index scans.  If it doesn't, the
+   <structfield>amgettuple</structfield> field in its <structname>IndexAmRoutine</structname>
    struct must be set to NULL.
   </para>
 
@@ -583,24 +583,24 @@ amgetbitmap (IndexScanDesc scan,
    <type>TIDBitmap</type> (that is, OR the set of tuple IDs into whatever set is already
    in the bitmap).  The number of tuples fetched is returned (this might be
    just an approximate count, for instance some AMs do not detect duplicates).
-   While inserting tuple IDs into the bitmap, <function>amgetbitmap</> can
+   While inserting tuple IDs into the bitmap, <function>amgetbitmap</function> can
    indicate that rechecking of the scan conditions is required for specific
-   tuple IDs.  This is analogous to the <literal>xs_recheck</> output parameter
-   of <function>amgettuple</>.  Note: in the current implementation, support
+   tuple IDs.  This is analogous to the <literal>xs_recheck</literal> output parameter
+   of <function>amgettuple</function>.  Note: in the current implementation, support
    for this feature is conflated with support for lossy storage of the bitmap
    itself, and therefore callers recheck both the scan conditions and the
    partial index predicate (if any) for recheckable tuples.  That might not
    always be true, however.
-   <function>amgetbitmap</> and
-   <function>amgettuple</> cannot be used in the same index scan; there
-   are other restrictions too when using <function>amgetbitmap</>, as explained
-   in <xref linkend="index-scanning">.
+   <function>amgetbitmap</function> and
+   <function>amgettuple</function> cannot be used in the same index scan; there
+   are other restrictions too when using <function>amgetbitmap</function>, as explained
+   in <xref linkend="index-scanning"/>.
   </para>
 
   <para>
-   The <function>amgetbitmap</> function need only be provided if the access
-   method supports <quote>bitmap</> index scans.  If it doesn't, the
-   <structfield>amgetbitmap</> field in its <structname>IndexAmRoutine</>
+   The <function>amgetbitmap</function> function need only be provided if the access
+   method supports <quote>bitmap</quote> index scans.  If it doesn't, the
+   <structfield>amgetbitmap</structfield> field in its <structname>IndexAmRoutine</structname>
    struct must be set to NULL.
   </para>
 
@@ -609,7 +609,7 @@ amgetbitmap (IndexScanDesc scan,
 void
 amendscan (IndexScanDesc scan);
 </programlisting>
-   End a scan and release resources.  The <literal>scan</> struct itself
+   End a scan and release resources.  The <literal>scan</literal> struct itself
    should not be freed, but any locks or pins taken internally by the
    access method must be released.
   </para>
@@ -624,9 +624,9 @@ ammarkpos (IndexScanDesc scan);
   </para>
 
   <para>
-   The <function>ammarkpos</> function need only be provided if the access
+   The <function>ammarkpos</function> function need only be provided if the access
    method supports ordered scans.  If it doesn't,
-   the <structfield>ammarkpos</> field in its <structname>IndexAmRoutine</>
+   the <structfield>ammarkpos</structfield> field in its <structname>IndexAmRoutine</structname>
    struct may be set to NULL.
   </para>
 
@@ -639,15 +639,15 @@ amrestrpos (IndexScanDesc scan);
   </para>
 
   <para>
-   The <function>amrestrpos</> function need only be provided if the access
+   The <function>amrestrpos</function> function need only be provided if the access
    method supports ordered scans.  If it doesn't,
-   the <structfield>amrestrpos</> field in its <structname>IndexAmRoutine</>
+   the <structfield>amrestrpos</structfield> field in its <structname>IndexAmRoutine</structname>
    struct may be set to NULL.
   </para>
 
   <para>
    In addition to supporting ordinary index scans, some types of index
-   may wish to support <firstterm>parallel index scans</>, which allow
+   may wish to support <firstterm>parallel index scans</firstterm>, which allow
    multiple backends to cooperate in performing an index scan.  The
    index access method should arrange things so that each cooperating
    process returns a subset of the tuples that would be performed by
@@ -668,7 +668,7 @@ amestimateparallelscan (void);
    Estimate and return the number of bytes of dynamic shared memory which
    the access method will be needed to perform a parallel scan.  (This number
    is in addition to, not in lieu of, the amount of space needed for
-   AM-independent data in <structname>ParallelIndexScanDescData</>.)
+   AM-independent data in <structname>ParallelIndexScanDescData</structname>.)
   </para>
 
   <para>
@@ -683,9 +683,9 @@ void
 aminitparallelscan (void *target);
 </programlisting>
    This function will be called to initialize dynamic shared memory at the
-   beginning of a parallel scan.  <parameter>target</> will point to at least
+   beginning of a parallel scan.  <parameter>target</parameter> will point to at least
    the number of bytes previously returned by
-   <function>amestimateparallelscan</>, and this function may use that
+   <function>amestimateparallelscan</function>, and this function may use that
    amount of space to store whatever data it wishes.
   </para>
 
@@ -702,7 +702,7 @@ amparallelrescan (IndexScanDesc scan);
 </programlisting>
    This function, if implemented, will be called when a parallel index scan
    must be restarted.  It should reset any shared state set up by
-   <function>aminitparallelscan</> such that the scan will be restarted from
+   <function>aminitparallelscan</function> such that the scan will be restarted from
    the beginning.
   </para>
 
@@ -714,16 +714,16 @@ amparallelrescan (IndexScanDesc scan);
   <para>
    In an index scan, the index access method is responsible for regurgitating
    the TIDs of all the tuples it has been told about that match the
-   <firstterm>scan keys</>.  The access method is <emphasis>not</> involved in
+   <firstterm>scan keys</firstterm>.  The access method is <emphasis>not</emphasis> involved in
    actually fetching those tuples from the index's parent table, nor in
    determining whether they pass the scan's time qualification test or other
    conditions.
   </para>
 
   <para>
-   A scan key is the internal representation of a <literal>WHERE</> clause of
-   the form <replaceable>index_key</> <replaceable>operator</>
-   <replaceable>constant</>, where the index key is one of the columns of the
+   A scan key is the internal representation of a <literal>WHERE</literal> clause of
+   the form <replaceable>index_key</replaceable> <replaceable>operator</replaceable>
+   <replaceable>constant</replaceable>, where the index key is one of the columns of the
    index and the operator is one of the members of the operator family
    associated with that index column.  An index scan has zero or more scan
    keys, which are implicitly ANDed &mdash; the returned tuples are expected
@@ -731,7 +731,7 @@ amparallelrescan (IndexScanDesc scan);
   </para>
 
   <para>
-   The access method can report that the index is <firstterm>lossy</>, or
+   The access method can report that the index is <firstterm>lossy</firstterm>, or
    requires rechecks, for a particular query.  This implies that the index
    scan will return all the entries that pass the scan key, plus possibly
    additional entries that do not.  The core system's index-scan machinery
@@ -743,16 +743,16 @@ amparallelrescan (IndexScanDesc scan);
   <para>
    Note that it is entirely up to the access method to ensure that it
    correctly finds all and only the entries passing all the given scan keys.
-   Also, the core system will simply hand off all the <literal>WHERE</>
+   Also, the core system will simply hand off all the <literal>WHERE</literal>
    clauses that match the index keys and operator families, without any
    semantic analysis to determine whether they are redundant or
    contradictory.  As an example, given
-   <literal>WHERE x &gt; 4 AND x &gt; 14</> where <literal>x</> is a b-tree
-   indexed column, it is left to the b-tree <function>amrescan</> function
+   <literal>WHERE x &gt; 4 AND x &gt; 14</literal> where <literal>x</literal> is a b-tree
+   indexed column, it is left to the b-tree <function>amrescan</function> function
    to realize that the first scan key is redundant and can be discarded.
-   The extent of preprocessing needed during <function>amrescan</> will
+   The extent of preprocessing needed during <function>amrescan</function> will
    depend on the extent to which the index access method needs to reduce
-   the scan keys to a <quote>normalized</> form.
+   the scan keys to a <quote>normalized</quote> form.
   </para>
 
   <para>
@@ -765,7 +765,7 @@ amparallelrescan (IndexScanDesc scan);
       <para>
        Access methods that always return entries in the natural ordering
        of their data (such as btree) should set
-       <structfield>amcanorder</> to true.
+       <structfield>amcanorder</structfield> to true.
        Currently, such access methods must use btree-compatible strategy
        numbers for their equality and ordering operators.
       </para>
@@ -773,11 +773,11 @@ amparallelrescan (IndexScanDesc scan);
      <listitem>
       <para>
        Access methods that support ordering operators should set
-       <structfield>amcanorderbyop</> to true.
+       <structfield>amcanorderbyop</structfield> to true.
        This indicates that the index is capable of returning entries in
-       an order satisfying <literal>ORDER BY</> <replaceable>index_key</>
-       <replaceable>operator</> <replaceable>constant</>.  Scan modifiers
-       of that form can be passed to <function>amrescan</> as described
+       an order satisfying <literal>ORDER BY</literal> <replaceable>index_key</replaceable>
+       <replaceable>operator</replaceable> <replaceable>constant</replaceable>.  Scan modifiers
+       of that form can be passed to <function>amrescan</function> as described
        previously.
       </para>
      </listitem>
@@ -785,29 +785,29 @@ amparallelrescan (IndexScanDesc scan);
   </para>
 
   <para>
-   The <function>amgettuple</> function has a <literal>direction</> argument,
-   which can be either <literal>ForwardScanDirection</> (the normal case)
-   or  <literal>BackwardScanDirection</>.  If the first call after
-   <function>amrescan</> specifies <literal>BackwardScanDirection</>, then the
+   The <function>amgettuple</function> function has a <literal>direction</literal> argument,
+   which can be either <literal>ForwardScanDirection</literal> (the normal case)
+   or  <literal>BackwardScanDirection</literal>.  If the first call after
+   <function>amrescan</function> specifies <literal>BackwardScanDirection</literal>, then the
    set of matching index entries is to be scanned back-to-front rather than in
-   the normal front-to-back direction, so <function>amgettuple</> must return
+   the normal front-to-back direction, so <function>amgettuple</function> must return
    the last matching tuple in the index, rather than the first one as it
    normally would.  (This will only occur for access
-   methods that set <structfield>amcanorder</> to true.)  After the
-   first call, <function>amgettuple</> must be prepared to advance the scan in
+   methods that set <structfield>amcanorder</structfield> to true.)  After the
+   first call, <function>amgettuple</function> must be prepared to advance the scan in
    either direction from the most recently returned entry.  (But if
-   <structfield>amcanbackward</> is false, all subsequent
+   <structfield>amcanbackward</structfield> is false, all subsequent
    calls will have the same direction as the first one.)
   </para>
 
   <para>
-   Access methods that support ordered scans must support <quote>marking</> a
+   Access methods that support ordered scans must support <quote>marking</quote> a
    position in a scan and later returning to the marked position.  The same
    position might be restored multiple times.  However, only one position need
-   be remembered per scan; a new <function>ammarkpos</> call overrides the
+   be remembered per scan; a new <function>ammarkpos</function> call overrides the
    previously marked position.  An access method that does not support ordered
-   scans need not provide <function>ammarkpos</> and <function>amrestrpos</>
-   functions in <structname>IndexAmRoutine</>; set those pointers to NULL
+   scans need not provide <function>ammarkpos</function> and <function>amrestrpos</function>
+   functions in <structname>IndexAmRoutine</structname>; set those pointers to NULL
    instead.
   </para>
 
@@ -835,29 +835,29 @@ amparallelrescan (IndexScanDesc scan);
   </para>
 
   <para>
-   Instead of using <function>amgettuple</>, an index scan can be done with
-   <function>amgetbitmap</> to fetch all tuples in one call.  This can be
-   noticeably more efficient than <function>amgettuple</> because it allows
+   Instead of using <function>amgettuple</function>, an index scan can be done with
+   <function>amgetbitmap</function> to fetch all tuples in one call.  This can be
+   noticeably more efficient than <function>amgettuple</function> because it allows
    avoiding lock/unlock cycles within the access method.  In principle
-   <function>amgetbitmap</> should have the same effects as repeated
-   <function>amgettuple</> calls, but we impose several restrictions to
-   simplify matters.  First of all, <function>amgetbitmap</> returns all
+   <function>amgetbitmap</function> should have the same effects as repeated
+   <function>amgettuple</function> calls, but we impose several restrictions to
+   simplify matters.  First of all, <function>amgetbitmap</function> returns all
    tuples at once and marking or restoring scan positions isn't
    supported. Secondly, the tuples are returned in a bitmap which doesn't
-   have any specific ordering, which is why <function>amgetbitmap</> doesn't
-   take a <literal>direction</> argument.  (Ordering operators will never be
+   have any specific ordering, which is why <function>amgetbitmap</function> doesn't
+   take a <literal>direction</literal> argument.  (Ordering operators will never be
    supplied for such a scan, either.)
    Also, there is no provision for index-only scans with
-   <function>amgetbitmap</>, since there is no way to return the contents of
+   <function>amgetbitmap</function>, since there is no way to return the contents of
    index tuples.
-   Finally, <function>amgetbitmap</>
+   Finally, <function>amgetbitmap</function>
    does not guarantee any locking of the returned tuples, with implications
-   spelled out in <xref linkend="index-locking">.
+   spelled out in <xref linkend="index-locking"/>.
   </para>
 
   <para>
    Note that it is permitted for an access method to implement only
-   <function>amgetbitmap</> and not <function>amgettuple</>, or vice versa,
+   <function>amgetbitmap</function> and not <function>amgettuple</function>, or vice versa,
    if its internal implementation is unsuited to one API or the other.
   </para>
 
@@ -870,26 +870,26 @@ amparallelrescan (IndexScanDesc scan);
    Index access methods must handle concurrent updates
    of the index by multiple processes.
    The core <productname>PostgreSQL</productname> system obtains
-   <literal>AccessShareLock</> on the index during an index scan, and
-   <literal>RowExclusiveLock</> when updating the index (including plain
-   <command>VACUUM</>).  Since these lock types do not conflict, the access
+   <literal>AccessShareLock</literal> on the index during an index scan, and
+   <literal>RowExclusiveLock</literal> when updating the index (including plain
+   <command>VACUUM</command>).  Since these lock types do not conflict, the access
    method is responsible for handling any fine-grained locking it might need.
    An exclusive lock on the index as a whole will be taken only during index
-   creation, destruction, or <command>REINDEX</>.
+   creation, destruction, or <command>REINDEX</command>.
   </para>
 
   <para>
    Building an index type that supports concurrent updates usually requires
    extensive and subtle analysis of the required behavior.  For the b-tree
    and hash index types, you can read about the design decisions involved in
-   <filename>src/backend/access/nbtree/README</> and
-   <filename>src/backend/access/hash/README</>.
+   <filename>src/backend/access/nbtree/README</filename> and
+   <filename>src/backend/access/hash/README</filename>.
   </para>
 
   <para>
    Aside from the index's own internal consistency requirements, concurrent
    updates create issues about consistency between the parent table (the
-   <firstterm>heap</>) and the index.  Because
+   <firstterm>heap</firstterm>) and the index.  Because
    <productname>PostgreSQL</productname> separates accesses
    and updates of the heap from those of the index, there are windows in
    which the index might be inconsistent with the heap.  We handle this problem
@@ -901,12 +901,12 @@ amparallelrescan (IndexScanDesc scan);
        A new heap entry is made before making its index entries.  (Therefore
        a concurrent index scan is likely to fail to see the heap entry.
        This is okay because the index reader would be uninterested in an
-       uncommitted row anyway.  But see <xref linkend="index-unique-checks">.)
+       uncommitted row anyway.  But see <xref linkend="index-unique-checks"/>.)
       </para>
      </listitem>
      <listitem>
       <para>
-       When a heap entry is to be deleted (by <command>VACUUM</>), all its
+       When a heap entry is to be deleted (by <command>VACUUM</command>), all its
        index entries must be removed first.
       </para>
      </listitem>
@@ -914,7 +914,7 @@ amparallelrescan (IndexScanDesc scan);
       <para>
        An index scan must maintain a pin
        on the index page holding the item last returned by
-       <function>amgettuple</>, and <function>ambulkdelete</> cannot delete
+       <function>amgettuple</function>, and <function>ambulkdelete</function> cannot delete
        entries from pages that are pinned by other backends.  The need
        for this rule is explained below.
       </para>
@@ -922,33 +922,33 @@ amparallelrescan (IndexScanDesc scan);
     </itemizedlist>
 
    Without the third rule, it is possible for an index reader to
-   see an index entry just before it is removed by <command>VACUUM</>, and
+   see an index entry just before it is removed by <command>VACUUM</command>, and
    then to arrive at the corresponding heap entry after that was removed by
-   <command>VACUUM</>.
+   <command>VACUUM</command>.
    This creates no serious problems if that item
    number is still unused when the reader reaches it, since an empty
-   item slot will be ignored by <function>heap_fetch()</>.  But what if a
+   item slot will be ignored by <function>heap_fetch()</function>.  But what if a
    third backend has already re-used the item slot for something else?
    When using an MVCC-compliant snapshot, there is no problem because
    the new occupant of the slot is certain to be too new to pass the
    snapshot test.  However, with a non-MVCC-compliant snapshot (such as
-   <literal>SnapshotAny</>), it would be possible to accept and return
+   <literal>SnapshotAny</literal>), it would be possible to accept and return
    a row that does not in fact match the scan keys.  We could defend
    against this scenario by requiring the scan keys to be rechecked
    against the heap row in all cases, but that is too expensive.  Instead,
    we use a pin on an index page as a proxy to indicate that the reader
-   might still be <quote>in flight</> from the index entry to the matching
-   heap entry.  Making <function>ambulkdelete</> block on such a pin ensures
-   that <command>VACUUM</> cannot delete the heap entry before the reader
+   might still be <quote>in flight</quote> from the index entry to the matching
+   heap entry.  Making <function>ambulkdelete</function> block on such a pin ensures
+   that <command>VACUUM</command> cannot delete the heap entry before the reader
    is done with it.  This solution costs little in run time, and adds blocking
    overhead only in the rare cases where there actually is a conflict.
   </para>
 
   <para>
-   This solution requires that index scans be <quote>synchronous</>: we have
+   This solution requires that index scans be <quote>synchronous</quote>: we have
    to fetch each heap tuple immediately after scanning the corresponding index
    entry.  This is expensive for a number of reasons.  An
-   <quote>asynchronous</> scan in which we collect many TIDs from the index,
+   <quote>asynchronous</quote> scan in which we collect many TIDs from the index,
    and only visit the heap tuples sometime later, requires much less index
    locking overhead and can allow a more efficient heap access pattern.
    Per the above analysis, we must use the synchronous approach for
@@ -957,13 +957,13 @@ amparallelrescan (IndexScanDesc scan);
   </para>
 
   <para>
-   In an <function>amgetbitmap</> index scan, the access method does not
+   In an <function>amgetbitmap</function> index scan, the access method does not
    keep an index pin on any of the returned tuples.  Therefore
    it is only safe to use such scans with MVCC-compliant snapshots.
   </para>
 
   <para>
-   When the <structfield>ampredlocks</> flag is not set, any scan using that
+   When the <structfield>ampredlocks</structfield> flag is not set, any scan using that
    index access method within a serializable transaction will acquire a
    nonblocking predicate lock on the full index.  This will generate a
    read-write conflict with the insert of any tuple into that index by a
@@ -982,9 +982,9 @@ amparallelrescan (IndexScanDesc scan);
 
   <para>
    <productname>PostgreSQL</productname> enforces SQL uniqueness constraints
-   using <firstterm>unique indexes</>, which are indexes that disallow
+   using <firstterm>unique indexes</firstterm>, which are indexes that disallow
    multiple entries with identical keys.  An access method that supports this
-   feature sets <structfield>amcanunique</> true.
+   feature sets <structfield>amcanunique</structfield> true.
    (At present, only b-tree supports it.)
   </para>
 
@@ -1032,7 +1032,7 @@ amparallelrescan (IndexScanDesc scan);
    no violation should be reported.  (This case cannot occur during the
    ordinary scenario of inserting a row that's just been created by
    the current transaction.  It can happen during
-   <command>CREATE UNIQUE INDEX CONCURRENTLY</>, however.)
+   <command>CREATE UNIQUE INDEX CONCURRENTLY</command>, however.)
   </para>
 
   <para>
@@ -1057,33 +1057,33 @@ amparallelrescan (IndexScanDesc scan);
    are done.  Otherwise, we schedule a recheck to occur when it is time to
    enforce the constraint.  If, at the time of the recheck, both the inserted
    tuple and some other tuple with the same key are live, then the error
-   must be reported.  (Note that for this purpose, <quote>live</> actually
-   means <quote>any tuple in the index entry's HOT chain is live</>.)
-   To implement this, the <function>aminsert</> function is passed a
-   <literal>checkUnique</> parameter having one of the following values:
+   must be reported.  (Note that for this purpose, <quote>live</quote> actually
+   means <quote>any tuple in the index entry's HOT chain is live</quote>.)
+   To implement this, the <function>aminsert</function> function is passed a
+   <literal>checkUnique</literal> parameter having one of the following values:
 
     <itemizedlist>
      <listitem>
       <para>
-       <literal>UNIQUE_CHECK_NO</> indicates that no uniqueness checking
+       <literal>UNIQUE_CHECK_NO</literal> indicates that no uniqueness checking
        should be done (this is not a unique index).
       </para>
      </listitem>
      <listitem>
       <para>
-       <literal>UNIQUE_CHECK_YES</> indicates that this is a non-deferrable
+       <literal>UNIQUE_CHECK_YES</literal> indicates that this is a non-deferrable
        unique index, and the uniqueness check must be done immediately, as
        described above.
       </para>
      </listitem>
      <listitem>
       <para>
-       <literal>UNIQUE_CHECK_PARTIAL</> indicates that the unique
+       <literal>UNIQUE_CHECK_PARTIAL</literal> indicates that the unique
        constraint is deferrable. <productname>PostgreSQL</productname>
        will use this mode to insert each row's index entry.  The access
        method must allow duplicate entries into the index, and report any
-       potential duplicates by returning FALSE from <function>aminsert</>.
-       For each row for which FALSE is returned, a deferred recheck will
+       potential duplicates by returning false from <function>aminsert</function>.
+       For each row for which false is returned, a deferred recheck will
        be scheduled.
       </para>
 
@@ -1098,21 +1098,21 @@ amparallelrescan (IndexScanDesc scan);
      </listitem>
      <listitem>
       <para>
-       <literal>UNIQUE_CHECK_EXISTING</> indicates that this is a deferred
+       <literal>UNIQUE_CHECK_EXISTING</literal> indicates that this is a deferred
        recheck of a row that was reported as a potential uniqueness violation.
-       Although this is implemented by calling <function>aminsert</>, the
-       access method must <emphasis>not</> insert a new index entry in this
+       Although this is implemented by calling <function>aminsert</function>, the
+       access method must <emphasis>not</emphasis> insert a new index entry in this
        case.  The index entry is already present.  Rather, the access method
        must check to see if there is another live index entry.  If so, and
        if the target row is also still live, report error.
       </para>
 
       <para>
-       It is recommended that in a <literal>UNIQUE_CHECK_EXISTING</> call,
+       It is recommended that in a <literal>UNIQUE_CHECK_EXISTING</literal> call,
        the access method further verify that the target row actually does
        have an existing entry in the index, and report error if not.  This
        is a good idea because the index tuple values passed to
-       <function>aminsert</> will have been recomputed.  If the index
+       <function>aminsert</function> will have been recomputed.  If the index
        definition involves functions that are not really immutable, we
        might be checking the wrong area of the index.  Checking that the
        target row is found in the recheck verifies that we are scanning
@@ -1128,20 +1128,20 @@ amparallelrescan (IndexScanDesc scan);
   <title>Index Cost Estimation Functions</title>
 
   <para>
-   The <function>amcostestimate</> function is given information describing
+   The <function>amcostestimate</function> function is given information describing
    a possible index scan, including lists of WHERE and ORDER BY clauses that
    have been determined to be usable with the index.  It must return estimates
    of the cost of accessing the index and the selectivity of the WHERE
    clauses (that is, the fraction of parent-table rows that will be
    retrieved during the index scan).  For simple cases, nearly all the
    work of the cost estimator can be done by calling standard routines
-   in the optimizer; the point of having an <function>amcostestimate</> function is
+   in the optimizer; the point of having an <function>amcostestimate</function> function is
    to allow index access methods to provide index-type-specific knowledge,
    in case it is possible to improve on the standard estimates.
   </para>
 
   <para>
-   Each <function>amcostestimate</> function must have the signature:
+   Each <function>amcostestimate</function> function must have the signature:
 
 <programlisting>
 void
@@ -1158,7 +1158,7 @@ amcostestimate (PlannerInfo *root,
 
    <variablelist>
     <varlistentry>
-     <term><parameter>root</></term>
+     <term><parameter>root</parameter></term>
      <listitem>
       <para>
        The planner's information about the query being processed.
@@ -1167,7 +1167,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term><parameter>path</></term>
+     <term><parameter>path</parameter></term>
      <listitem>
       <para>
        The index access path being considered.  All fields except cost and
@@ -1177,14 +1177,14 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term><parameter>loop_count</></term>
+     <term><parameter>loop_count</parameter></term>
      <listitem>
       <para>
        The number of repetitions of the index scan that should be factored
        into the cost estimates.  This will typically be greater than one when
        considering a parameterized scan for use in the inside of a nestloop
        join.  Note that the cost estimates should still be for just one scan;
-       a larger <parameter>loop_count</> means that it may be appropriate
+       a larger <parameter>loop_count</parameter> means that it may be appropriate
        to allow for some caching effects across multiple scans.
       </para>
      </listitem>
@@ -1197,7 +1197,7 @@ amcostestimate (PlannerInfo *root,
 
    <variablelist>
     <varlistentry>
-     <term><parameter>*indexStartupCost</></term>
+     <term><parameter>*indexStartupCost</parameter></term>
      <listitem>
       <para>
        Set to cost of index start-up processing
@@ -1206,7 +1206,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term><parameter>*indexTotalCost</></term>
+     <term><parameter>*indexTotalCost</parameter></term>
      <listitem>
       <para>
        Set to total cost of index processing
@@ -1215,7 +1215,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term><parameter>*indexSelectivity</></term>
+     <term><parameter>*indexSelectivity</parameter></term>
      <listitem>
       <para>
        Set to index selectivity
@@ -1224,7 +1224,7 @@ amcostestimate (PlannerInfo *root,
     </varlistentry>
 
     <varlistentry>
-     <term><parameter>*indexCorrelation</></term>
+     <term><parameter>*indexCorrelation</parameter></term>
      <listitem>
       <para>
        Set to correlation coefficient between index scan order and
@@ -1244,17 +1244,17 @@ amcostestimate (PlannerInfo *root,
   <para>
    The index access costs should be computed using the parameters used by
    <filename>src/backend/optimizer/path/costsize.c</filename>: a sequential
-   disk block fetch has cost <varname>seq_page_cost</>, a nonsequential fetch
-   has cost <varname>random_page_cost</>, and the cost of processing one index
-   row should usually be taken as <varname>cpu_index_tuple_cost</>.  In
-   addition, an appropriate multiple of <varname>cpu_operator_cost</> should
+   disk block fetch has cost <varname>seq_page_cost</varname>, a nonsequential fetch
+   has cost <varname>random_page_cost</varname>, and the cost of processing one index
+   row should usually be taken as <varname>cpu_index_tuple_cost</varname>.  In
+   addition, an appropriate multiple of <varname>cpu_operator_cost</varname> should
    be charged for any comparison operators invoked during index processing
    (especially evaluation of the indexquals themselves).
   </para>
 
   <para>
    The access costs should include all disk and CPU costs associated with
-   scanning the index itself, but <emphasis>not</> the costs of retrieving or
+   scanning the index itself, but <emphasis>not</emphasis> the costs of retrieving or
    processing the parent-table rows that are identified by the index.
   </para>
 
@@ -1266,21 +1266,21 @@ amcostestimate (PlannerInfo *root,
   </para>
 
   <para>
-   The <parameter>indexSelectivity</> should be set to the estimated fraction of the parent
+   The <parameter>indexSelectivity</parameter> should be set to the estimated fraction of the parent
    table rows that will be retrieved during the index scan.  In the case
    of a lossy query, this will typically be higher than the fraction of
    rows that actually pass the given qual conditions.
   </para>
 
   <para>
-   The <parameter>indexCorrelation</> should be set to the correlation (ranging between
+   The <parameter>indexCorrelation</parameter> should be set to the correlation (ranging between
    -1.0 and 1.0) between the index order and the table order.  This is used
    to adjust the estimate for the cost of fetching rows from the parent
    table.
   </para>
 
   <para>
-   When <parameter>loop_count</> is greater than one, the returned numbers
+   When <parameter>loop_count</parameter> is greater than one, the returned numbers
    should be averages expected for any one scan of the index.
   </para>
 
@@ -1307,17 +1307,17 @@ amcostestimate (PlannerInfo *root,
    <step>
     <para>
      Estimate the number of index rows that will be visited during the
-     scan.  For many index types this is the same as <parameter>indexSelectivity</> times
+     scan.  For many index types this is the same as <parameter>indexSelectivity</parameter> times
      the number of rows in the index, but it might be more.  (Note that the
      index's size in pages and rows is available from the
-     <literal>path-&gt;indexinfo</> struct.)
+     <literal>path-&gt;indexinfo</literal> struct.)
     </para>
    </step>
 
    <step>
     <para>
      Estimate the number of index pages that will be retrieved during the scan.
-     This might be just <parameter>indexSelectivity</> times the index's size in pages.
+     This might be just <parameter>indexSelectivity</parameter> times the index's size in pages.
     </para>
    </step>
 
diff --git a/doc/src/sgml/indices.sgml b/doc/src/sgml/indices.sgml
index e40750e8ec..0818196e76 100644
--- a/doc/src/sgml/indices.sgml
+++ b/doc/src/sgml/indices.sgml
@@ -77,7 +77,7 @@ CREATE INDEX test1_id_index ON test1 (id);
    than a sequential table scan.  But you might have to run the
    <command>ANALYZE</command> command regularly to update
    statistics to allow the query planner to make educated decisions.
-   See <xref linkend="performance-tips"> for information about
+   See <xref linkend="performance-tips"/> for information about
    how to find out whether an index is used and when and why the
    planner might choose <emphasis>not</emphasis> to use an index.
   </para>
@@ -98,8 +98,8 @@ CREATE INDEX test1_id_index ON test1 (id);
    In production environments this is often unacceptable.
    It is possible to allow writes to occur in parallel with index
    creation, but there are several caveats to be aware of &mdash;
-   for more information see <xref linkend="SQL-CREATEINDEX-CONCURRENTLY"
-   endterm="SQL-CREATEINDEX-CONCURRENTLY-title">.
+   for more information see <xref linkend="sql-createindex-concurrently"
+   endterm="sql-createindex-concurrently-title"/>.
   </para>
 
   <para>
@@ -147,21 +147,21 @@ CREATE INDEX test1_id_index ON test1 (id);
    </simplelist>
 
    Constructs equivalent to combinations of these operators, such as
-   <literal>BETWEEN</> and <literal>IN</>, can also be implemented with
-   a B-tree index search.  Also, an <literal>IS NULL</> or <literal>IS NOT
-   NULL</> condition on an index column can be used with a B-tree index.
+   <literal>BETWEEN</literal> and <literal>IN</literal>, can also be implemented with
+   a B-tree index search.  Also, an <literal>IS NULL</literal> or <literal>IS NOT
+   NULL</literal> condition on an index column can be used with a B-tree index.
   </para>
 
   <para>
    The optimizer can also use a B-tree index for queries involving the
-   pattern matching operators <literal>LIKE</> and <literal>~</literal>
+   pattern matching operators <literal>LIKE</literal> and <literal>~</literal>
    <emphasis>if</emphasis> the pattern is a constant and is anchored to
    the beginning of the string &mdash; for example, <literal>col LIKE
    'foo%'</literal> or <literal>col ~ '^foo'</literal>, but not
    <literal>col LIKE '%bar'</literal>. However, if your database does not
    use the C locale you will need to create the index with a special
    operator class to support indexing of pattern-matching queries; see
-   <xref linkend="indexes-opclass"> below. It is also possible to use
+   <xref linkend="indexes-opclass"/> below. It is also possible to use
    B-tree indexes for <literal>ILIKE</literal> and
    <literal>~*</literal>, but only if the pattern starts with
    non-alphabetic characters, i.e., characters that are not affected by
@@ -206,7 +206,7 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
    within which many different indexing strategies can be implemented.
    Accordingly, the particular operators with which a GiST index can be
    used vary depending on the indexing strategy (the <firstterm>operator
-   class</>).  As an example, the standard distribution of
+   class</firstterm>).  As an example, the standard distribution of
    <productname>PostgreSQL</productname> includes GiST operator classes
    for several two-dimensional geometric data types, which support indexed
    queries using these operators:
@@ -226,17 +226,17 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
     <member><literal>&amp;&amp;</literal></member>
    </simplelist>
 
-   (See <xref linkend="functions-geometry"> for the meaning of
+   (See <xref linkend="functions-geometry"/> for the meaning of
    these operators.)
    The GiST operator classes included in the standard distribution are
-   documented in <xref linkend="gist-builtin-opclasses-table">.
+   documented in <xref linkend="gist-builtin-opclasses-table"/>.
    Many other GiST operator
-   classes are available in the <literal>contrib</> collection or as separate
-   projects.  For more information see <xref linkend="GiST">.
+   classes are available in the <literal>contrib</literal> collection or as separate
+   projects.  For more information see <xref linkend="gist"/>.
   </para>
 
   <para>
-   GiST indexes are also capable of optimizing <quote>nearest-neighbor</>
+   GiST indexes are also capable of optimizing <quote>nearest-neighbor</quote>
    searches, such as
 <programlisting><![CDATA[
 SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
@@ -244,8 +244,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 </programlisting>
    which finds the ten places closest to a given target point.  The ability
    to do this is again dependent on the particular operator class being used.
-   In <xref linkend="gist-builtin-opclasses-table">, operators that can be
-   used in this way are listed in the column <quote>Ordering Operators</>.
+   In <xref linkend="gist-builtin-opclasses-table"/>, operators that can be
+   used in this way are listed in the column <quote>Ordering Operators</quote>.
   </para>
 
   <para>
@@ -274,11 +274,11 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     <member><literal>&gt;^</literal></member>
    </simplelist>
 
-   (See <xref linkend="functions-geometry"> for the meaning of
+   (See <xref linkend="functions-geometry"/> for the meaning of
    these operators.)
    The SP-GiST operator classes included in the standard distribution are
-   documented in <xref linkend="spgist-builtin-opclasses-table">.
-   For more information see <xref linkend="SPGiST">.
+   documented in <xref linkend="spgist-builtin-opclasses-table"/>.
+   For more information see <xref linkend="spgist"/>.
   </para>
 
   <para>
@@ -290,7 +290,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     <primary>GIN</primary>
     <see>index</see>
    </indexterm>
-   GIN indexes are <quote>inverted indexes</> which are appropriate for
+   GIN indexes are <quote>inverted indexes</quote> which are appropriate for
    data values that contain multiple component values, such as arrays.  An
    inverted index contains a separate entry for each component value, and
    can efficiently handle queries that test for the presence of specific
@@ -313,13 +313,13 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     <member><literal>&amp;&amp;</literal></member>
    </simplelist>
 
-   (See <xref linkend="functions-array"> for the meaning of
+   (See <xref linkend="functions-array"/> for the meaning of
    these operators.)
    The GIN operator classes included in the standard distribution are
-   documented in <xref linkend="gin-builtin-opclasses-table">.
+   documented in <xref linkend="gin-builtin-opclasses-table"/>.
    Many other GIN operator
-   classes are available in the <literal>contrib</> collection or as separate
-   projects.  For more information see <xref linkend="GIN">.
+   classes are available in the <literal>contrib</literal> collection or as separate
+   projects.  For more information see <xref linkend="gin"/>.
   </para>
 
   <para>
@@ -351,8 +351,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
    </simplelist>
 
    The BRIN operator classes included in the standard distribution are
-   documented in <xref linkend="brin-builtin-opclasses-table">.
-   For more information see <xref linkend="BRIN">.
+   documented in <xref linkend="brin-builtin-opclasses-table"/>.
+   For more information see <xref linkend="brin"/>.
   </para>
  </sect1>
 
@@ -407,13 +407,13 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
    are checked in the index, so they save visits to the table proper, but
    they do not reduce the portion of the index that has to be scanned.
    For example, given an index on <literal>(a, b, c)</literal> and a
-   query condition <literal>WHERE a = 5 AND b &gt;= 42 AND c &lt; 77</>,
+   query condition <literal>WHERE a = 5 AND b &gt;= 42 AND c &lt; 77</literal>,
    the index would have to be scanned from the first entry with
-   <literal>a</> = 5 and <literal>b</> = 42 up through the last entry with
-   <literal>a</> = 5.  Index entries with <literal>c</> &gt;= 77 would be
+   <literal>a</literal> = 5 and <literal>b</literal> = 42 up through the last entry with
+   <literal>a</literal> = 5.  Index entries with <literal>c</literal> &gt;= 77 would be
    skipped, but they'd still have to be scanned through.
    This index could in principle be used for queries that have constraints
-   on <literal>b</> and/or <literal>c</> with no constraint on <literal>a</>
+   on <literal>b</literal> and/or <literal>c</literal> with no constraint on <literal>a</literal>
    &mdash; but the entire index would have to be scanned, so in most cases
    the planner would prefer a sequential table scan over using the index.
   </para>
@@ -454,25 +454,25 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
    an index on a single column is sufficient and saves space and time.
    Indexes with more than three columns are unlikely to be helpful
    unless the usage of the table is extremely stylized.  See also
-   <xref linkend="indexes-bitmap-scans"> and
-   <xref linkend="indexes-index-only-scans"> for some discussion of the
+   <xref linkend="indexes-bitmap-scans"/> and
+   <xref linkend="indexes-index-only-scans"/> for some discussion of the
    merits of different index configurations.
   </para>
  </sect1>
 
 
  <sect1 id="indexes-ordering">
-  <title>Indexes and <literal>ORDER BY</></title>
+  <title>Indexes and <literal>ORDER BY</literal></title>
 
   <indexterm zone="indexes-ordering">
    <primary>index</primary>
-   <secondary>and <literal>ORDER BY</></secondary>
+   <secondary>and <literal>ORDER BY</literal></secondary>
   </indexterm>
 
   <para>
    In addition to simply finding the rows to be returned by a query,
    an index may be able to deliver them in a specific sorted order.
-   This allows a query's <literal>ORDER BY</> specification to be honored
+   This allows a query's <literal>ORDER BY</literal> specification to be honored
    without a separate sorting step.  Of the index types currently
    supported by <productname>PostgreSQL</productname>, only B-tree
    can produce sorted output &mdash; the other index types return
@@ -480,7 +480,7 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
   </para>
 
   <para>
-   The planner will consider satisfying an <literal>ORDER BY</> specification
+   The planner will consider satisfying an <literal>ORDER BY</literal> specification
    either by scanning an available index that matches the specification,
    or by scanning the table in physical order and doing an explicit
    sort.  For a query that requires scanning a large fraction of the
@@ -488,50 +488,50 @@ CREATE INDEX test2_mm_idx ON test2 (major, minor);
    because it requires
    less disk I/O due to following a sequential access pattern.  Indexes are
    more useful when only a few rows need be fetched.  An important
-   special case is <literal>ORDER BY</> in combination with
-   <literal>LIMIT</> <replaceable>n</>: an explicit sort will have to process
-   all the data to identify the first <replaceable>n</> rows, but if there is
-   an index matching the <literal>ORDER BY</>, the first <replaceable>n</>
+   special case is <literal>ORDER BY</literal> in combination with
+   <literal>LIMIT</literal> <replaceable>n</replaceable>: an explicit sort will have to process
+   all the data to identify the first <replaceable>n</replaceable> rows, but if there is
+   an index matching the <literal>ORDER BY</literal>, the first <replaceable>n</replaceable>
    rows can be retrieved directly, without scanning the remainder at all.
   </para>
 
   <para>
    By default, B-tree indexes store their entries in ascending order
    with nulls last.  This means that a forward scan of an index on
-   column <literal>x</> produces output satisfying <literal>ORDER BY x</>
-   (or more verbosely, <literal>ORDER BY x ASC NULLS LAST</>).  The
+   column <literal>x</literal> produces output satisfying <literal>ORDER BY x</literal>
+   (or more verbosely, <literal>ORDER BY x ASC NULLS LAST</literal>).  The
    index can also be scanned backward, producing output satisfying
-   <literal>ORDER BY x DESC</>
-   (or more verbosely, <literal>ORDER BY x DESC NULLS FIRST</>, since
-   <literal>NULLS FIRST</> is the default for <literal>ORDER BY DESC</>).
+   <literal>ORDER BY x DESC</literal>
+   (or more verbosely, <literal>ORDER BY x DESC NULLS FIRST</literal>, since
+   <literal>NULLS FIRST</literal> is the default for <literal>ORDER BY DESC</literal>).
   </para>
 
   <para>
    You can adjust the ordering of a B-tree index by including the
-   options <literal>ASC</>, <literal>DESC</>, <literal>NULLS FIRST</>,
-   and/or <literal>NULLS LAST</> when creating the index; for example:
+   options <literal>ASC</literal>, <literal>DESC</literal>, <literal>NULLS FIRST</literal>,
+   and/or <literal>NULLS LAST</literal> when creating the index; for example:
 <programlisting>
 CREATE INDEX test2_info_nulls_low ON test2 (info NULLS FIRST);
 CREATE INDEX test3_desc_index ON test3 (id DESC NULLS LAST);
 </programlisting>
    An index stored in ascending order with nulls first can satisfy
-   either <literal>ORDER BY x ASC NULLS FIRST</> or
-   <literal>ORDER BY x DESC NULLS LAST</> depending on which direction
+   either <literal>ORDER BY x ASC NULLS FIRST</literal> or
+   <literal>ORDER BY x DESC NULLS LAST</literal> depending on which direction
    it is scanned in.
   </para>
 
   <para>
    You might wonder why bother providing all four options, when two
    options together with the possibility of backward scan would cover
-   all the variants of <literal>ORDER BY</>.  In single-column indexes
+   all the variants of <literal>ORDER BY</literal>.  In single-column indexes
    the options are indeed redundant, but in multicolumn indexes they can be
-   useful.  Consider a two-column index on <literal>(x, y)</>: this can
-   satisfy <literal>ORDER BY x, y</> if we scan forward, or
-   <literal>ORDER BY x DESC, y DESC</> if we scan backward.
+   useful.  Consider a two-column index on <literal>(x, y)</literal>: this can
+   satisfy <literal>ORDER BY x, y</literal> if we scan forward, or
+   <literal>ORDER BY x DESC, y DESC</literal> if we scan backward.
    But it might be that the application frequently needs to use
-   <literal>ORDER BY x ASC, y DESC</>.  There is no way to get that
+   <literal>ORDER BY x ASC, y DESC</literal>.  There is no way to get that
    ordering from a plain index, but it is possible if the index is defined
-   as <literal>(x ASC, y DESC)</> or <literal>(x DESC, y ASC)</>.
+   as <literal>(x ASC, y DESC)</literal> or <literal>(x DESC, y ASC)</literal>.
   </para>
 
   <para>
@@ -559,38 +559,38 @@ CREATE INDEX test3_desc_index ON test3 (id DESC NULLS LAST);
   <para>
    A single index scan can only use query clauses that use the index's
    columns with operators of its operator class and are joined with
-   <literal>AND</>.  For example, given an index on <literal>(a, b)</literal>
-   a query condition like <literal>WHERE a = 5 AND b = 6</> could
-   use the index, but a query like <literal>WHERE a = 5 OR b = 6</> could not
+   <literal>AND</literal>.  For example, given an index on <literal>(a, b)</literal>
+   a query condition like <literal>WHERE a = 5 AND b = 6</literal> could
+   use the index, but a query like <literal>WHERE a = 5 OR b = 6</literal> could not
    directly use the index.
   </para>
 
   <para>
    Fortunately,
-   <productname>PostgreSQL</> has the ability to combine multiple indexes
+   <productname>PostgreSQL</productname> has the ability to combine multiple indexes
    (including multiple uses of the same index) to handle cases that cannot
-   be implemented by single index scans.  The system can form <literal>AND</>
-   and <literal>OR</> conditions across several index scans.  For example,
-   a query like <literal>WHERE x = 42 OR x = 47 OR x = 53 OR x = 99</>
-   could be broken down into four separate scans of an index on <literal>x</>,
+   be implemented by single index scans.  The system can form <literal>AND</literal>
+   and <literal>OR</literal> conditions across several index scans.  For example,
+   a query like <literal>WHERE x = 42 OR x = 47 OR x = 53 OR x = 99</literal>
+   could be broken down into four separate scans of an index on <literal>x</literal>,
    each scan using one of the query clauses.  The results of these scans are
    then ORed together to produce the result.  Another example is that if we
-   have separate indexes on <literal>x</> and <literal>y</>, one possible
-   implementation of a query like <literal>WHERE x = 5 AND y = 6</> is to
+   have separate indexes on <literal>x</literal> and <literal>y</literal>, one possible
+   implementation of a query like <literal>WHERE x = 5 AND y = 6</literal> is to
    use each index with the appropriate query clause and then AND together
    the index results to identify the result rows.
   </para>
 
   <para>
    To combine multiple indexes, the system scans each needed index and
-   prepares a <firstterm>bitmap</> in memory giving the locations of
+   prepares a <firstterm>bitmap</firstterm> in memory giving the locations of
    table rows that are reported as matching that index's conditions.
    The bitmaps are then ANDed and ORed together as needed by the query.
    Finally, the actual table rows are visited and returned.  The table rows
    are visited in physical order, because that is how the bitmap is laid
    out; this means that any ordering of the original indexes is lost, and
    so a separate sort step will be needed if the query has an <literal>ORDER
-   BY</> clause.  For this reason, and because each additional index scan
+   BY</literal> clause.  For this reason, and because each additional index scan
    adds extra time, the planner will sometimes choose to use a simple index
    scan even though additional indexes are available that could have been
    used as well.
@@ -603,19 +603,19 @@ CREATE INDEX test3_desc_index ON test3 (id DESC NULLS LAST);
    indexes are best, but sometimes it's better to create separate indexes
    and rely on the index-combination feature.  For example, if your
    workload includes a mix of queries that sometimes involve only column
-   <literal>x</>, sometimes only column <literal>y</>, and sometimes both
+   <literal>x</literal>, sometimes only column <literal>y</literal>, and sometimes both
    columns, you might choose to create two separate indexes on
-   <literal>x</> and <literal>y</>, relying on index combination to
+   <literal>x</literal> and <literal>y</literal>, relying on index combination to
    process the queries that use both columns.  You could also create a
-   multicolumn index on <literal>(x, y)</>.  This index would typically be
+   multicolumn index on <literal>(x, y)</literal>.  This index would typically be
    more efficient than index combination for queries involving both
-   columns, but as discussed in <xref linkend="indexes-multicolumn">, it
-   would be almost useless for queries involving only <literal>y</>, so it
+   columns, but as discussed in <xref linkend="indexes-multicolumn"/>, it
+   would be almost useless for queries involving only <literal>y</literal>, so it
    should not be the only index.  A combination of the multicolumn index
-   and a separate index on <literal>y</> would serve reasonably well.  For
-   queries involving only <literal>x</>, the multicolumn index could be
+   and a separate index on <literal>y</literal> would serve reasonably well.  For
+   queries involving only <literal>x</literal>, the multicolumn index could be
    used, though it would be larger and hence slower than an index on
-   <literal>x</> alone.  The last alternative is to create all three
+   <literal>x</literal> alone.  The last alternative is to create all three
    indexes, but this is probably only reasonable if the table is searched
    much more often than it is updated and all three types of query are
    common.  If one of the types of query is much less common than the
@@ -698,9 +698,9 @@ CREATE INDEX test1_lower_col1_idx ON test1 (lower(col1));
   </para>
 
   <para>
-   If we were to declare this index <literal>UNIQUE</>, it would prevent
-   creation of rows whose <literal>col1</> values differ only in case,
-   as well as rows whose <literal>col1</> values are actually identical.
+   If we were to declare this index <literal>UNIQUE</literal>, it would prevent
+   creation of rows whose <literal>col1</literal> values differ only in case,
+   as well as rows whose <literal>col1</literal> values are actually identical.
    Thus, indexes on expressions can be used to enforce constraints that
    are not definable as simple unique constraints.
   </para>
@@ -717,7 +717,7 @@ CREATE INDEX people_names ON people ((first_name || ' ' || last_name));
   </para>
 
   <para>
-   The syntax of the <command>CREATE INDEX</> command normally requires
+   The syntax of the <command>CREATE INDEX</command> command normally requires
    writing parentheses around index expressions, as shown in the second
    example.  The parentheses can be omitted when the expression is just
    a function call, as in the first example.
@@ -727,9 +727,9 @@ CREATE INDEX people_names ON people ((first_name || ' ' || last_name));
    Index expressions are relatively expensive to maintain, because the
    derived expression(s) must be computed for each row upon insertion
    and whenever it is updated.  However, the index expressions are
-   <emphasis>not</> recomputed during an indexed search, since they are
+   <emphasis>not</emphasis> recomputed during an indexed search, since they are
    already stored in the index.  In both examples above, the system
-   sees the query as just <literal>WHERE indexedcolumn = 'constant'</>
+   sees the query as just <literal>WHERE indexedcolumn = 'constant'</literal>
    and so the speed of the search is equivalent to any other simple index
    query.  Thus, indexes on expressions are useful when retrieval speed
    is more important than insertion and update speed.
@@ -762,7 +762,7 @@ CREATE INDEX people_names ON people ((first_name || ' ' || last_name));
    index at all.  This reduces the size of the index, which will speed
    up those queries that do use the index.  It will also speed up many table
    update operations because the index does not need to be
-   updated in all cases.  <xref linkend="indexes-partial-ex1"> shows a
+   updated in all cases.  <xref linkend="indexes-partial-ex1"/> shows a
    possible application of this idea.
   </para>
 
@@ -827,7 +827,7 @@ WHERE client_ip = inet '192.168.100.23';
    Another possible use for a partial index is to exclude values from the
    index that the
    typical query workload is not interested in; this is shown in <xref
-   linkend="indexes-partial-ex2">.  This results in the same
+   linkend="indexes-partial-ex2"/>.  This results in the same
    advantages as listed above, but it prevents the
    <quote>uninteresting</quote> values from being accessed via that
    index, even if an index scan might be profitable in that
@@ -856,12 +856,12 @@ CREATE INDEX orders_unbilled_index ON orders (order_nr)
 SELECT * FROM orders WHERE billed is not true AND order_nr &lt; 10000;
 </programlisting>
     However, the index can also be used in queries that do not involve
-    <structfield>order_nr</> at all, e.g.:
+    <structfield>order_nr</structfield> at all, e.g.:
 <programlisting>
 SELECT * FROM orders WHERE billed is not true AND amount &gt; 5000.00;
 </programlisting>
     This is not as efficient as a partial index on the
-    <structfield>amount</> column would be, since the system has to
+    <structfield>amount</structfield> column would be, since the system has to
     scan the entire index.  Yet, if there are relatively few unbilled
     orders, using this partial index just to find the unbilled orders
     could be a win.
@@ -878,7 +878,7 @@ SELECT * FROM orders WHERE order_nr = 3501;
   </example>
 
   <para>
-   <xref linkend="indexes-partial-ex2"> also illustrates that the
+   <xref linkend="indexes-partial-ex2"/> also illustrates that the
    indexed column and the column used in the predicate do not need to
    match.  <productname>PostgreSQL</productname> supports partial
    indexes with arbitrary predicates, so long as only columns of the
@@ -886,7 +886,7 @@ SELECT * FROM orders WHERE order_nr = 3501;
    predicate must match the conditions used in the queries that
    are supposed to benefit from the index.  To be precise, a partial
    index can be used in a query only if the system can recognize that
-   the <literal>WHERE</> condition of the query mathematically implies
+   the <literal>WHERE</literal> condition of the query mathematically implies
    the predicate of the index.
    <productname>PostgreSQL</productname> does not have a sophisticated
    theorem prover that can recognize mathematically equivalent
@@ -896,7 +896,7 @@ SELECT * FROM orders WHERE order_nr = 3501;
    The system can recognize simple inequality implications, for example
    <quote>x &lt; 1</quote> implies <quote>x &lt; 2</quote>; otherwise
    the predicate condition must exactly match part of the query's
-   <literal>WHERE</> condition
+   <literal>WHERE</literal> condition
    or the index will not be recognized as usable. Matching takes
    place at query planning time, not at run time. As a result,
    parameterized query clauses do not work with a partial index. For
@@ -909,7 +909,7 @@ SELECT * FROM orders WHERE order_nr = 3501;
    A third possible use for partial indexes does not require the
    index to be used in queries at all.  The idea here is to create
    a unique index over a subset of a table, as in <xref
-   linkend="indexes-partial-ex3">.  This enforces uniqueness
+   linkend="indexes-partial-ex3"/>.  This enforces uniqueness
    among the rows that satisfy the index predicate, without constraining
    those that do not.
   </para>
@@ -919,9 +919,9 @@ SELECT * FROM orders WHERE order_nr = 3501;
 
    <para>
     Suppose that we have a table describing test outcomes.  We wish
-    to ensure that there is only one <quote>successful</> entry for
+    to ensure that there is only one <quote>successful</quote> entry for
     a given subject and target combination, but there might be any number of
-    <quote>unsuccessful</> entries.  Here is one way to do it:
+    <quote>unsuccessful</quote> entries.  Here is one way to do it:
 <programlisting>
 CREATE TABLE tests (
     subject text,
@@ -944,7 +944,7 @@ CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
    distributions might cause the system to use an index when it really
    should not.  In that case the index can be set up so that it is not
    available for the offending query.  Normally,
-   <productname>PostgreSQL</> makes reasonable choices about index
+   <productname>PostgreSQL</productname> makes reasonable choices about index
    usage (e.g., it avoids them when retrieving common values, so the
    earlier example really only saves index size, it is not required to
    avoid index usage), and grossly incorrect plan choices are cause
@@ -956,14 +956,14 @@ CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
    know at least as much as the query planner knows, in particular you
    know when an index might be profitable.  Forming this knowledge
    requires experience and understanding of how indexes in
-   <productname>PostgreSQL</> work.  In most cases, the advantage of a
+   <productname>PostgreSQL</productname> work.  In most cases, the advantage of a
    partial index over a regular index will be minimal.
   </para>
 
   <para>
    More information about partial indexes can be found in <xref
-   linkend="STON89b">, <xref linkend="OLSON93">, and <xref
-   linkend="SESHADRI95">.
+   linkend="ston89b"/>, <xref linkend="olson93"/>, and <xref
+   linkend="seshadri95"/>.
   </para>
  </sect1>
 
@@ -998,8 +998,8 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
    the proper class when making an index.  The operator class determines
    the basic sort ordering (which can then be modified by adding sort options
    <literal>COLLATE</literal>,
-   <literal>ASC</>/<literal>DESC</> and/or
-   <literal>NULLS FIRST</>/<literal>NULLS LAST</>).
+   <literal>ASC</literal>/<literal>DESC</literal> and/or
+   <literal>NULLS FIRST</literal>/<literal>NULLS LAST</literal>).
   </para>
 
   <para>
@@ -1025,8 +1025,8 @@ CREATE INDEX <replaceable>name</replaceable> ON <replaceable>table</replaceable>
 CREATE INDEX test_index ON test_table (col varchar_pattern_ops);
 </programlisting>
       Note that you should also create an index with the default operator
-      class if you want queries involving ordinary <literal>&lt;</>,
-      <literal>&lt;=</>, <literal>&gt;</>, or <literal>&gt;=</> comparisons
+      class if you want queries involving ordinary <literal>&lt;</literal>,
+      <literal>&lt;=</literal>, <literal>&gt;</literal>, or <literal>&gt;=</literal> comparisons
       to use an index.  Such queries cannot use the
       <literal><replaceable>xxx</replaceable>_pattern_ops</literal>
       operator classes.  (Ordinary equality comparisons can use these
@@ -1057,7 +1057,7 @@ SELECT am.amname AS index_method,
 
   <para>
    An operator class is actually just a subset of a larger structure called an
-   <firstterm>operator family</>.  In cases where several data types have
+   <firstterm>operator family</firstterm>.  In cases where several data types have
    similar behaviors, it is frequently useful to define cross-data-type
    operators and allow these to work with indexes.  To do this, the operator
    classes for each of the types must be grouped into the same operator
@@ -1147,24 +1147,24 @@ CREATE INDEX test1c_content_y_index ON test1c (content COLLATE "y");
   </indexterm>
 
   <para>
-   All indexes in <productname>PostgreSQL</> are <firstterm>secondary</>
+   All indexes in <productname>PostgreSQL</productname> are <firstterm>secondary</firstterm>
    indexes, meaning that each index is stored separately from the table's
-   main data area (which is called the table's <firstterm>heap</>
-   in <productname>PostgreSQL</> terminology).  This means that in an
+   main data area (which is called the table's <firstterm>heap</firstterm>
+   in <productname>PostgreSQL</productname> terminology).  This means that in an
    ordinary index scan, each row retrieval requires fetching data from both
    the index and the heap.  Furthermore, while the index entries that match a
-   given indexable <literal>WHERE</> condition are usually close together in
+   given indexable <literal>WHERE</literal> condition are usually close together in
    the index, the table rows they reference might be anywhere in the heap.
    The heap-access portion of an index scan thus involves a lot of random
    access into the heap, which can be slow, particularly on traditional
-   rotating media.  (As described in <xref linkend="indexes-bitmap-scans">,
+   rotating media.  (As described in <xref linkend="indexes-bitmap-scans"/>,
    bitmap scans try to alleviate this cost by doing the heap accesses in
    sorted order, but that only goes so far.)
   </para>
 
   <para>
-   To solve this performance problem, <productname>PostgreSQL</>
-   supports <firstterm>index-only scans</>, which can answer queries from an
+   To solve this performance problem, <productname>PostgreSQL</productname>
+   supports <firstterm>index-only scans</firstterm>, which can answer queries from an
    index alone without any heap access.  The basic idea is to return values
    directly out of each index entry instead of consulting the associated heap
    entry.  There are two fundamental restrictions on when this method can be
@@ -1187,8 +1187,8 @@ CREATE INDEX test1c_content_y_index ON test1c (content COLLATE "y");
     <listitem>
      <para>
       The query must reference only columns stored in the index.  For
-      example, given an index on columns <literal>x</> and <literal>y</> of a
-      table that also has a column <literal>z</>, these queries could use
+      example, given an index on columns <literal>x</literal> and <literal>y</literal> of a
+      table that also has a column <literal>z</literal>, these queries could use
       index-only scans:
 <programlisting>
 SELECT x, y FROM tab WHERE x = 'key';
@@ -1210,17 +1210,17 @@ SELECT x FROM tab WHERE x = 'key' AND z &lt; 42;
    If these two fundamental requirements are met, then all the data values
    required by the query are available from the index, so an index-only scan
    is physically possible.  But there is an additional requirement for any
-   table scan in <productname>PostgreSQL</>: it must verify that each
-   retrieved row be <quote>visible</> to the query's MVCC snapshot, as
-   discussed in <xref linkend="mvcc">.  Visibility information is not stored
+   table scan in <productname>PostgreSQL</productname>: it must verify that each
+   retrieved row be <quote>visible</quote> to the query's MVCC snapshot, as
+   discussed in <xref linkend="mvcc"/>.  Visibility information is not stored
    in index entries, only in heap entries; so at first glance it would seem
    that every row retrieval would require a heap access anyway.  And this is
    indeed the case, if the table row has been modified recently.  However,
    for seldom-changing data there is a way around this
-   problem.  <productname>PostgreSQL</> tracks, for each page in a table's
+   problem.  <productname>PostgreSQL</productname> tracks, for each page in a table's
    heap, whether all rows stored in that page are old enough to be visible to
    all current and future transactions.  This information is stored in a bit
-   in the table's <firstterm>visibility map</>.  An index-only scan, after
+   in the table's <firstterm>visibility map</firstterm>.  An index-only scan, after
    finding a candidate index entry, checks the visibility map bit for the
    corresponding heap page.  If it's set, the row is known visible and so the
    data can be returned with no further work.  If it's not set, the heap
@@ -1243,53 +1243,53 @@ SELECT x FROM tab WHERE x = 'key' AND z &lt; 42;
   <para>
    To make effective use of the index-only scan feature, you might choose to
    create indexes in which only the leading columns are meant to
-   match <literal>WHERE</> clauses, while the trailing columns
-   hold <quote>payload</> data to be returned by a query.  For example, if
+   match <literal>WHERE</literal> clauses, while the trailing columns
+   hold <quote>payload</quote> data to be returned by a query.  For example, if
    you commonly run queries like
 <programlisting>
 SELECT y FROM tab WHERE x = 'key';
 </programlisting>
    the traditional approach to speeding up such queries would be to create an
-   index on <literal>x</> only.  However, an index on <literal>(x, y)</>
+   index on <literal>x</literal> only.  However, an index on <literal>(x, y)</literal>
    would offer the possibility of implementing this query as an index-only
    scan.  As previously discussed, such an index would be larger and hence
-   more expensive than an index on <literal>x</> alone, so this is attractive
+   more expensive than an index on <literal>x</literal> alone, so this is attractive
    only if the table is known to be mostly static.  Note it's important that
-   the index be declared on <literal>(x, y)</> not <literal>(y, x)</>, as for
+   the index be declared on <literal>(x, y)</literal> not <literal>(y, x)</literal>, as for
    most index types (particularly B-trees) searches that do not constrain the
    leading index columns are not very efficient.
   </para>
 
   <para>
    In principle, index-only scans can be used with expression indexes.
-   For example, given an index on <literal>f(x)</> where <literal>x</> is a
+   For example, given an index on <literal>f(x)</literal> where <literal>x</literal> is a
    table column, it should be possible to execute
 <programlisting>
 SELECT f(x) FROM tab WHERE f(x) &lt; 1;
 </programlisting>
-   as an index-only scan; and this is very attractive if <literal>f()</> is
-   an expensive-to-compute function.  However, <productname>PostgreSQL</>'s
+   as an index-only scan; and this is very attractive if <literal>f()</literal> is
+   an expensive-to-compute function.  However, <productname>PostgreSQL</productname>'s
    planner is currently not very smart about such cases.  It considers a
    query to be potentially executable by index-only scan only when
-   all <emphasis>columns</> needed by the query are available from the index.
-   In this example, <literal>x</> is not needed except in the
-   context <literal>f(x)</>, but the planner does not notice that and
+   all <emphasis>columns</emphasis> needed by the query are available from the index.
+   In this example, <literal>x</literal> is not needed except in the
+   context <literal>f(x)</literal>, but the planner does not notice that and
    concludes that an index-only scan is not possible.  If an index-only scan
    seems sufficiently worthwhile, this can be worked around by declaring the
-   index to be on <literal>(f(x), x)</>, where the second column is not
+   index to be on <literal>(f(x), x)</literal>, where the second column is not
    expected to be used in practice but is just there to convince the planner
    that an index-only scan is possible.  An additional caveat, if the goal is
-   to avoid recalculating <literal>f(x)</>, is that the planner won't
-   necessarily match uses of <literal>f(x)</> that aren't in
-   indexable <literal>WHERE</> clauses to the index column.  It will usually
+   to avoid recalculating <literal>f(x)</literal>, is that the planner won't
+   necessarily match uses of <literal>f(x)</literal> that aren't in
+   indexable <literal>WHERE</literal> clauses to the index column.  It will usually
    get this right in simple queries such as shown above, but not in queries
    that involve joins.  These deficiencies may be remedied in future versions
-   of <productname>PostgreSQL</>.
+   of <productname>PostgreSQL</productname>.
   </para>
 
   <para>
    Partial indexes also have interesting interactions with index-only scans.
-   Consider the partial index shown in <xref linkend="indexes-partial-ex3">:
+   Consider the partial index shown in <xref linkend="indexes-partial-ex3"/>:
 <programlisting>
 CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
     WHERE success;
@@ -1299,13 +1299,13 @@ CREATE UNIQUE INDEX tests_success_constraint ON tests (subject, target)
 <programlisting>
 SELECT target FROM tests WHERE subject = 'some-subject' AND success;
 </programlisting>
-   But there's a problem: the <literal>WHERE</> clause refers
-   to <literal>success</> which is not available as a result column of the
+   But there's a problem: the <literal>WHERE</literal> clause refers
+   to <literal>success</literal> which is not available as a result column of the
    index.  Nonetheless, an index-only scan is possible because the plan does
-   not need to recheck that part of the <literal>WHERE</> clause at run time:
-   all entries found in the index necessarily have <literal>success = true</>
+   not need to recheck that part of the <literal>WHERE</literal> clause at run time:
+   all entries found in the index necessarily have <literal>success = true</literal>
    so this need not be explicitly checked in the
-   plan.  <productname>PostgreSQL</> versions 9.6 and later will recognize
+   plan.  <productname>PostgreSQL</productname> versions 9.6 and later will recognize
    such cases and allow index-only scans to be generated, but older versions
    will not.
   </para>
@@ -1321,15 +1321,15 @@ SELECT target FROM tests WHERE subject = 'some-subject' AND success;
   </indexterm>
 
   <para>
-   Although indexes in <productname>PostgreSQL</> do not need
+   Although indexes in <productname>PostgreSQL</productname> do not need
    maintenance or tuning, it is still important to check
    which indexes are actually used by the real-life query workload.
    Examining index usage for an individual query is done with the
-   <xref linkend="sql-explain">
+   <xref linkend="sql-explain"/>
    command; its application for this purpose is
-   illustrated in <xref linkend="using-explain">.
+   illustrated in <xref linkend="using-explain"/>.
    It is also possible to gather overall statistics about index usage
-   in a running server, as described in <xref linkend="monitoring-stats">.
+   in a running server, as described in <xref linkend="monitoring-stats"/>.
   </para>
 
   <para>
@@ -1343,7 +1343,7 @@ SELECT target FROM tests WHERE subject = 'some-subject' AND success;
   <itemizedlist>
    <listitem>
     <para>
-     Always run <xref linkend="sql-analyze">
+     Always run <xref linkend="sql-analyze"/>
      first.  This command
      collects statistics about the distribution of the values in the
      table.  This information is required to estimate the number of rows
@@ -1353,8 +1353,8 @@ SELECT target FROM tests WHERE subject = 'some-subject' AND success;
      almost certain to be inaccurate.  Examining an application's
      index usage without having run <command>ANALYZE</command> is
      therefore a lost cause.
-     See <xref linkend="vacuum-for-statistics">
-     and <xref linkend="autovacuum"> for more information.
+     See <xref linkend="vacuum-for-statistics"/>
+     and <xref linkend="autovacuum"/> for more information.
     </para>
    </listitem>
 
@@ -1386,10 +1386,10 @@ SELECT target FROM tests WHERE subject = 'some-subject' AND success;
     <para>
      When indexes are not used, it can be useful for testing to force
      their use.  There are run-time parameters that can turn off
-     various plan types (see <xref linkend="runtime-config-query-enable">).
+     various plan types (see <xref linkend="runtime-config-query-enable"/>).
      For instance, turning off sequential scans
-     (<varname>enable_seqscan</>) and nested-loop joins
-     (<varname>enable_nestloop</>), which are the most basic plans,
+     (<varname>enable_seqscan</varname>) and nested-loop joins
+     (<varname>enable_nestloop</varname>), which are the most basic plans,
      will force the system to use a different plan.  If the system
      still chooses a sequential scan or nested-loop join then there is
      probably a more fundamental reason why the index is not being
@@ -1417,18 +1417,18 @@ SELECT target FROM tests WHERE subject = 'some-subject' AND success;
      per-row costs of each plan node times the selectivity estimate of
      the plan node.  The costs estimated for the plan nodes can be adjusted
      via run-time parameters (described in <xref
-     linkend="runtime-config-query-constants">).
+     linkend="runtime-config-query-constants"/>).
      An inaccurate selectivity estimate is due to
      insufficient statistics.  It might be possible to improve this by
      tuning the statistics-gathering parameters (see
-     <xref linkend="sql-altertable">).
+     <xref linkend="sql-altertable"/>).
     </para>
 
     <para>
      If you do not succeed in adjusting the costs to be more
      appropriate, then you might have to resort to forcing index usage
      explicitly.  You might also want to contact the
-     <productname>PostgreSQL</> developers to examine the issue.
+     <productname>PostgreSQL</productname> developers to examine the issue.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/src/sgml/info.sgml b/doc/src/sgml/info.sgml
index 233ba0e668..6b9f1b5d81 100644
--- a/doc/src/sgml/info.sgml
+++ b/doc/src/sgml/info.sgml
@@ -15,9 +15,9 @@
      <para>
       The <productname>PostgreSQL</productname> <ulink
       url="https://wiki.postgresql.org">wiki</ulink> contains the project's <ulink
-      url="https://wiki.postgresql.org/wiki/Frequently_Asked_Questions">FAQ</>
+      url="https://wiki.postgresql.org/wiki/Frequently_Asked_Questions">FAQ</ulink>
       (Frequently Asked Questions) list, <ulink
-      url="https://wiki.postgresql.org/wiki/Todo">TODO</> list, and
+      url="https://wiki.postgresql.org/wiki/Todo">TODO</ulink> list, and
       detailed information about many more topics.
      </para>
     </listitem>
@@ -42,7 +42,7 @@
      <para>
       The mailing lists are a good place to have your questions
       answered, to share experiences with other users, and to contact
-      the developers.  Consult the <productname>PostgreSQL</> web site
+      the developers.  Consult the <productname>PostgreSQL</productname> web site
       for details.
      </para>
     </listitem>
diff --git a/doc/src/sgml/information_schema.sgml b/doc/src/sgml/information_schema.sgml
index e07ff35bca..09ef2827f2 100644
--- a/doc/src/sgml/information_schema.sgml
+++ b/doc/src/sgml/information_schema.sgml
@@ -35,12 +35,12 @@
 
   <para>
    This problem can appear when querying information schema views such
-   as <literal>check_constraint_routine_usage</>,
-   <literal>check_constraints</>, <literal>domain_constraints</>, and
-   <literal>referential_constraints</>.  Some other views have similar
+   as <literal>check_constraint_routine_usage</literal>,
+   <literal>check_constraints</literal>, <literal>domain_constraints</literal>, and
+   <literal>referential_constraints</literal>.  Some other views have similar
    issues but contain the table name to help distinguish duplicate
-   rows, e.g., <literal>constraint_column_usage</>,
-   <literal>constraint_table_usage</>, <literal>table_constraints</>.
+   rows, e.g., <literal>constraint_column_usage</literal>,
+   <literal>constraint_table_usage</literal>, <literal>table_constraints</literal>.
   </para>
  </note>
 
@@ -384,19 +384,19 @@
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -535,25 +535,25 @@
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -572,14 +572,14 @@
      <row>
       <entry><literal>is_derived_reference_attribute</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
     </tbody>
    </tgroup>
   </table>
 
   <para>
-   See also under <xref linkend="infoschema-columns">, a similarly
+   See also under <xref linkend="infoschema-columns"/>, a similarly
    structured view, for further information on some of the columns.
   </para>
  </sect1>
@@ -776,7 +776,7 @@
       <entry><literal>sql_identifier</literal></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
     </tbody>
@@ -895,7 +895,7 @@
    identifies which character set the available collations are
    applicable to.  In PostgreSQL, there is only one character set per
    database (see explanation
-   in <xref linkend="infoschema-character-sets">), so this view does
+   in <xref linkend="infoschema-character-sets"/>), so this view does
    not provide much useful information.
   </para>
 
@@ -1178,7 +1178,7 @@
    that use data types owned by a currently enabled role.  Note that in
    <productname>PostgreSQL</productname>, built-in data types behave
    like user-defined types, so they are included here as well.  See
-   also <xref linkend="infoschema-columns"> for details.
+   also <xref linkend="infoschema-columns"/> for details.
   </para>
 
   <table>
@@ -1256,7 +1256,7 @@
   <para>
    The view <literal>columns</literal> contains information about all
    table columns (or view columns) in the database.  System columns
-   (<literal>oid</>, etc.) are not included.  Only those columns are
+   (<literal>oid</literal>, etc.) are not included.  Only those columns are
    shown that the current user has access to (by way of being the
    owner or having some privilege).
   </para>
@@ -1441,19 +1441,19 @@
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -1540,25 +1540,25 @@
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -1577,7 +1577,7 @@
      <row>
       <entry><literal>is_self_referencing</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -1648,13 +1648,13 @@
      <row>
       <entry><literal>is_generated</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>generation_expression</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -2152,19 +2152,19 @@
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -2300,25 +2300,25 @@
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -2442,31 +2442,31 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>character_maximum_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_octet_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -2501,37 +2501,37 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision_radix</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_scale</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>datetime_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to array element data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -2569,25 +2569,25 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -3134,7 +3134,7 @@ ORDER BY c.ordinal_position;
       <entry><type>sql_identifier</type></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
 
@@ -3160,13 +3160,13 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>is_result</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>as_locator</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -3191,85 +3191,85 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>character_maximum_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_octet_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision_radix</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_scale</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>datetime_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to parameter data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -3301,25 +3301,25 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -3594,7 +3594,7 @@ ORDER BY c.ordinal_position;
       <entry><type>sql_identifier</type></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
 
@@ -3930,7 +3930,7 @@ ORDER BY c.ordinal_position;
       <entry><type>sql_identifier</type></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
 
@@ -3972,8 +3972,8 @@ ORDER BY c.ordinal_position;
   <title><literal>routines</literal></title>
 
   <para>
-   The view <literal>routines</literal> contains all functions in the
-   current database.  Only those functions are shown that the current
+   The view <literal>routines</literal> contains all functions and procedures in the
+   current database.  Only those functions and procedures are shown that the current
    user has access to (by way of being the owner or having some
    privilege).
   </para>
@@ -4037,45 +4037,45 @@ ORDER BY c.ordinal_position;
       <entry><literal>routine_type</literal></entry>
       <entry><type>character_data</type></entry>
       <entry>
-       Always <literal>FUNCTION</literal> (In the future there might
-       be other types of routines.)
+       <literal>FUNCTION</literal> for a
+       function, <literal>PROCEDURE</literal> for a procedure
       </entry>
      </row>
 
      <row>
       <entry><literal>module_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>module_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>module_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>udt_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>udt_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>udt_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4087,92 +4087,92 @@ ORDER BY c.ordinal_position;
        the view <literal>element_types</literal>), else
        <literal>USER-DEFINED</literal> (in that case, the type is
        identified in <literal>type_udt_name</literal> and associated
-       columns).
+       columns).  Null for a procedure.
       </entry>
      </row>
 
      <row>
       <entry><literal>character_maximum_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_octet_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision_radix</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_scale</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>datetime_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</></entry>
+      <entry>Always null, since this information is not applied to return data types in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4180,7 +4180,7 @@ ORDER BY c.ordinal_position;
       <entry><type>sql_identifier</type></entry>
       <entry>
        Name of the database that the return data type of the function
-       is defined in (always the current database)
+       is defined in (always the current database).  Null for a procedure.
       </entry>
      </row>
 
@@ -4189,7 +4189,7 @@ ORDER BY c.ordinal_position;
       <entry><type>sql_identifier</type></entry>
       <entry>
        Name of the schema that the return data type of the function is
-       defined in
+       defined in.  Null for a procedure.
       </entry>
      </row>
 
@@ -4197,32 +4197,32 @@ ORDER BY c.ordinal_position;
       <entry><literal>type_udt_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
       <entry>
-       Name of the return data type of the function
+       Name of the return data type of the function.  Null for a procedure.
       </entry>
      </row>
 
      <row>
       <entry><literal>scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</></entry>
+      <entry>Always null, because arrays always have unlimited maximum cardinality in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4283,7 +4283,7 @@ ORDER BY c.ordinal_position;
       <entry><type>character_data</type></entry>
       <entry>
        Always <literal>GENERAL</literal> (The SQL standard defines
-       other parameter styles, which are not available in <productname>PostgreSQL</>.)
+       other parameter styles, which are not available in <productname>PostgreSQL</productname>.)
       </entry>
      </row>
 
@@ -4294,7 +4294,7 @@ ORDER BY c.ordinal_position;
        If the function is declared immutable (called deterministic in
        the SQL standard), then <literal>YES</literal>, else
        <literal>NO</literal>.  (You cannot query the other volatility
-       levels available in <productname>PostgreSQL</> through the information schema.)
+       levels available in <productname>PostgreSQL</productname> through the information schema.)
       </entry>
      </row>
 
@@ -4304,7 +4304,7 @@ ORDER BY c.ordinal_position;
       <entry>
        Always <literal>MODIFIES</literal>, meaning that the function
        possibly modifies SQL data.  This information is not useful for
-       <productname>PostgreSQL</>.
+       <productname>PostgreSQL</productname>.
       </entry>
      </row>
 
@@ -4314,14 +4314,14 @@ ORDER BY c.ordinal_position;
       <entry>
        If the function automatically returns null if any of its
        arguments are null, then <literal>YES</literal>, else
-       <literal>NO</literal>.
+       <literal>NO</literal>.  Null for a procedure.
       </entry>
      </row>
 
      <row>
       <entry><literal>sql_path</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4330,26 +4330,26 @@ ORDER BY c.ordinal_position;
       <entry>
        Always <literal>YES</literal> (The opposite would be a method
        of a user-defined type, which is a feature not available in
-       <productname>PostgreSQL</>.)
+       <productname>PostgreSQL</productname>.)
       </entry>
      </row>
 
      <row>
       <entry><literal>max_dynamic_result_sets</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>is_user_defined_cast</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>is_implicitly_invocable</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4366,43 +4366,43 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>to_sql_specific_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>to_sql_specific_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>to_sql_specific_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>as_locator</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>created</literal></entry>
       <entry><type>time_stamp</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>last_altered</literal></entry>
       <entry><type>time_stamp</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>new_savepoint_level</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -4411,152 +4411,152 @@ ORDER BY c.ordinal_position;
       <entry>
        Currently always <literal>NO</literal>.  The alternative
        <literal>YES</literal> applies to a feature not available in
-       <productname>PostgreSQL</>.
+       <productname>PostgreSQL</productname>.
       </entry>
      </row>
 
      <row>
       <entry><literal>result_cast_from_data_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_as_locator</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_char_max_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_char_octet_length</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_char_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_char_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_char_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_numeric_precision_radix</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_numeric_scale</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_datetime_precision</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_interval_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_interval_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_type_udt_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_type_udt_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_type_udt_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_scope_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_scope_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_scope_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_maximum_cardinality</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>result_cast_dtd_identifier</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
     </tbody>
    </tgroup>
@@ -4606,25 +4606,25 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>default_character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>default_character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>default_character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>sql_path</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
     </tbody>
    </tgroup>
@@ -4762,7 +4762,7 @@ ORDER BY c.ordinal_position;
    The table <literal>sql_features</literal> contains information
    about which formal features defined in the SQL standard are
    supported by <productname>PostgreSQL</productname>.  This is the
-   same information that is presented in <xref linkend="features">.
+   same information that is presented in <xref linkend="features"/>.
    There you can also find some additional background information.
   </para>
 
@@ -4808,7 +4808,7 @@ ORDER BY c.ordinal_position;
       <entry><type>yes_or_no</type></entry>
       <entry>
        <literal>YES</literal> if the feature is fully supported by the
-       current version of <productname>PostgreSQL</>, <literal>NO</literal> if not
+       current version of <productname>PostgreSQL</productname>, <literal>NO</literal> if not
       </entry>
      </row>
 
@@ -4816,7 +4816,7 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_verified_by</literal></entry>
       <entry><type>character_data</type></entry>
       <entry>
-       Always null, since the <productname>PostgreSQL</> development group does not
+       Always null, since the <productname>PostgreSQL</productname> development group does not
        perform formal testing of feature conformance
       </entry>
      </row>
@@ -4982,7 +4982,7 @@ ORDER BY c.ordinal_position;
       <entry><type>character_data</type></entry>
       <entry>
        The programming language, if the binding style is
-       <literal>EMBEDDED</literal>, else null.  <productname>PostgreSQL</> only
+       <literal>EMBEDDED</literal>, else null.  <productname>PostgreSQL</productname> only
        supports the language C.
       </entry>
      </row>
@@ -4998,7 +4998,7 @@ ORDER BY c.ordinal_position;
    The table <literal>sql_packages</literal> contains information
    about which feature packages defined in the SQL standard are
    supported by <productname>PostgreSQL</productname>.  Refer to <xref
-   linkend="features"> for background information on feature packages.
+   linkend="features"/> for background information on feature packages.
   </para>
 
   <table>
@@ -5031,7 +5031,7 @@ ORDER BY c.ordinal_position;
       <entry><type>yes_or_no</type></entry>
       <entry>
        <literal>YES</literal> if the package is fully supported by the
-       current version of <productname>PostgreSQL</>, <literal>NO</literal> if not
+       current version of <productname>PostgreSQL</productname>, <literal>NO</literal> if not
       </entry>
      </row>
 
@@ -5039,7 +5039,7 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_verified_by</literal></entry>
       <entry><type>character_data</type></entry>
       <entry>
-       Always null, since the <productname>PostgreSQL</> development group does not
+       Always null, since the <productname>PostgreSQL</productname> development group does not
        perform formal testing of feature conformance
       </entry>
      </row>
@@ -5093,7 +5093,7 @@ ORDER BY c.ordinal_position;
       <entry><type>yes_or_no</type></entry>
       <entry>
        <literal>YES</literal> if the part is fully supported by the
-       current version of <productname>PostgreSQL</>,
+       current version of <productname>PostgreSQL</productname>,
        <literal>NO</literal> if not
       </entry>
      </row>
@@ -5102,7 +5102,7 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_verified_by</literal></entry>
       <entry><type>character_data</type></entry>
       <entry>
-       Always null, since the <productname>PostgreSQL</> development group does not
+       Always null, since the <productname>PostgreSQL</productname> development group does not
        perform formal testing of feature conformance
       </entry>
      </row>
@@ -5182,7 +5182,7 @@ ORDER BY c.ordinal_position;
   <para>
    The table <literal>sql_sizing_profiles</literal> contains
    information about the <literal>sql_sizing</literal> values that are
-   required by various profiles of the SQL standard.  <productname>PostgreSQL</> does
+   required by various profiles of the SQL standard.  <productname>PostgreSQL</productname> does
    not track any SQL profiles, so this table is empty.
   </para>
 
@@ -5317,6 +5317,13 @@ ORDER BY c.ordinal_position;
       <entry><type>yes_or_no</type></entry>
       <entry><literal>YES</literal> if the constraint is deferrable and initially deferred, <literal>NO</literal> if not</entry>
      </row>
+     <row>
+      <entry><literal>enforced</literal></entry>
+      <entry><type>yes_or_no</type></entry>
+      <entry>Applies to a feature not available in
+      <productname>PostgreSQL</productname> (currently always
+      <literal>YES</literal>)</entry>
+     </row>
     </tbody>
    </tgroup>
   </table>
@@ -5465,13 +5472,13 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>self_referencing_column_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>reference_generation</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -5586,7 +5593,7 @@ ORDER BY c.ordinal_position;
       <entry><literal>sql_identifier</literal></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
 
@@ -5761,7 +5768,14 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>action_order</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Not yet implemented</entry>
+      <entry>
+       Firing order among triggers on the same table having the same
+       <literal>event_manipulation</literal>,
+       <literal>action_timing</literal>, and
+       <literal>action_orientation</literal>.  In
+       <productname>PostgreSQL</productname>, triggers are fired in name
+       order, so this column reflects that.
+      </entry>
      </row>
 
      <row>
@@ -5806,31 +5820,31 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>action_reference_old_table</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Name of the <quote>old</quote> transition table, or null if none</entry>
      </row>
 
      <row>
       <entry><literal>action_reference_new_table</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Name of the <quote>new</quote> transition table, or null if none</entry>
      </row>
 
      <row>
       <entry><literal>action_reference_old_row</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>action_reference_new_row</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>created</literal></entry>
       <entry><type>time_stamp</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
     </tbody>
    </tgroup>
@@ -5864,7 +5878,7 @@ ORDER BY c.ordinal_position;
 
   <note>
    <para>
-    Prior to <productname>PostgreSQL</> 9.1, this view's columns
+    Prior to <productname>PostgreSQL</productname> 9.1, this view's columns
     <structfield>action_timing</structfield>,
     <structfield>action_reference_old_table</structfield>,
     <structfield>action_reference_new_table</structfield>,
@@ -5891,9 +5905,9 @@ ORDER BY c.ordinal_position;
    <literal>USAGE</literal> privileges granted on user-defined types to a
    currently enabled role or by a currently enabled role.  There is one row for
    each combination of type, grantor, and grantee.  This view shows only
-   composite types (see under <xref linkend="infoschema-user-defined-types">
+   composite types (see under <xref linkend="infoschema-user-defined-types"/>
    for why); see
-   <xref linkend="infoschema-usage-privileges"> for domain privileges.
+   <xref linkend="infoschema-usage-privileges"/> for domain privileges.
   </para>
 
   <table>
@@ -6068,7 +6082,7 @@ ORDER BY c.ordinal_position;
    differentiate between these.  Other user-defined types such as base
    types and enums, which are <productname>PostgreSQL</productname>
    extensions, are not shown here.  For domains,
-   see <xref linkend="infoschema-domains"> instead.
+   see <xref linkend="infoschema-domains"/> instead.
   </para>
 
   <table>
@@ -6113,151 +6127,151 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>is_instantiable</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>is_final</literal></entry>
       <entry><type>yes_or_no</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ordering_form</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ordering_category</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ordering_routine_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ordering_routine_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ordering_routine_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>reference_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>data_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_maximum_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_octet_length</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>character_set_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_catalog</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_schema</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>collation_name</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_precision_radix</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>numeric_scale</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>datetime_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_type</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>interval_precision</literal></entry>
       <entry><type>cardinal_number</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>source_dtd_identifier</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
       <entry><literal>ref_dtd_identifier</literal></entry>
       <entry><type>sql_identifier</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
     </tbody>
    </tgroup>
@@ -6522,7 +6536,7 @@ ORDER BY c.ordinal_position;
       <entry><literal>sql_identifier</literal></entry>
       <entry>
        The <quote>specific name</quote> of the function.  See <xref
-       linkend="infoschema-routines"> for more information.
+       linkend="infoschema-routines"/> for more information.
       </entry>
      </row>
     </tbody>
@@ -6660,7 +6674,7 @@ ORDER BY c.ordinal_position;
      <row>
       <entry><literal>check_option</literal></entry>
       <entry><type>character_data</type></entry>
-      <entry>Applies to a feature not available in <productname>PostgreSQL</></entry>
+      <entry>Applies to a feature not available in <productname>PostgreSQL</productname></entry>
      </row>
 
      <row>
@@ -6686,8 +6700,8 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_trigger_updatable</literal></entry>
       <entry><type>yes_or_no</type></entry>
       <entry>
-       <literal>YES</> if the view has an <literal>INSTEAD OF</>
-       <command>UPDATE</> trigger defined on it, <literal>NO</> if not
+       <literal>YES</literal> if the view has an <literal>INSTEAD OF</literal>
+       <command>UPDATE</command> trigger defined on it, <literal>NO</literal> if not
       </entry>
      </row>
 
@@ -6695,8 +6709,8 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_trigger_deletable</literal></entry>
       <entry><type>yes_or_no</type></entry>
       <entry>
-       <literal>YES</> if the view has an <literal>INSTEAD OF</>
-       <command>DELETE</> trigger defined on it, <literal>NO</> if not
+       <literal>YES</literal> if the view has an <literal>INSTEAD OF</literal>
+       <command>DELETE</command> trigger defined on it, <literal>NO</literal> if not
       </entry>
      </row>
 
@@ -6704,8 +6718,8 @@ ORDER BY c.ordinal_position;
       <entry><literal>is_trigger_insertable_into</literal></entry>
       <entry><type>yes_or_no</type></entry>
       <entry>
-       <literal>YES</> if the view has an <literal>INSTEAD OF</>
-       <command>INSERT</> trigger defined on it, <literal>NO</> if not
+       <literal>YES</literal> if the view has an <literal>INSTEAD OF</literal>
+       <command>INSERT</command> trigger defined on it, <literal>NO</literal> if not
       </entry>
      </row>
     </tbody>
diff --git a/doc/src/sgml/install-windows.sgml b/doc/src/sgml/install-windows.sgml
index 1861e7e2f7..99e9c7b78e 100644
--- a/doc/src/sgml/install-windows.sgml
+++ b/doc/src/sgml/install-windows.sgml
@@ -19,10 +19,10 @@
  <para>
   There are several different ways of building PostgreSQL on
   <productname>Windows</productname>. The simplest way to build with
-  Microsoft tools is to install <productname>Visual Studio Express 2015
+  Microsoft tools is to install <productname>Visual Studio Express 2017
   for Windows Desktop</productname> and use the included
   compiler. It is also possible to build with the full
-  <productname>Microsoft Visual C++ 2005 to 2015</productname>.
+  <productname>Microsoft Visual C++ 2005 to 2017</productname>.
   In some cases that requires the installation of the
   <productname>Windows SDK</productname> in addition to the compiler.
  </para>
@@ -37,8 +37,8 @@
  <para>
   Building using <productname>MinGW</productname> or
   <productname>Cygwin</productname> uses the normal build system, see
-  <xref linkend="installation"> and the specific notes in
-  <xref linkend="installation-notes-mingw"> and <xref linkend="installation-notes-cygwin">.
+  <xref linkend="installation"/> and the specific notes in
+  <xref linkend="installation-notes-mingw"/> and <xref linkend="installation-notes-cygwin"/>.
   To produce native 64 bit binaries in these environments, use the tools from
   <productname>MinGW-w64</productname>. These tools can also be used to
   cross-compile for 32 bit and 64 bit <productname>Windows</productname>
@@ -69,26 +69,28 @@
   <productname>Visual Studio Express</productname> or some versions of the
   <productname>Microsoft Windows SDK</productname>. If you do not already have a
   <productname>Visual Studio</productname> environment set up, the easiest
-  ways are to use the compilers from <productname>Visual Studio Express 2015
+  ways are to use the compilers from <productname>Visual Studio Express 2017
   for Windows Desktop</productname> or those in the <productname>Windows SDK
-  7.1</productname>, which are both free downloads from Microsoft.
+  8.1</productname>, which are both free downloads from Microsoft.
  </para>
 
  <para>
   Both 32-bit and 64-bit builds are possible with the Microsoft Compiler suite.
   32-bit PostgreSQL builds are possible with
   <productname>Visual Studio 2005</productname> to
-  <productname>Visual Studio 2015</productname> (including Express editions),
-  as well as standalone Windows SDK releases 6.0 to 7.1.
+  <productname>Visual Studio 2017</productname> (including Express editions),
+  as well as standalone Windows SDK releases 6.0 to 8.1.
   64-bit PostgreSQL builds are supported with
-  <productname>Microsoft Windows SDK</productname> version 6.0a to 7.1 or
+  <productname>Microsoft Windows SDK</productname> version 6.0a to 8.1 or
   <productname>Visual Studio 2008</productname> and above. Compilation
   is supported down to <productname>Windows XP</productname> and
-  <productname>Windows Server 2003</> when building with
-  <productname>Visual Studio 2005</> to
+  <productname>Windows Server 2003</productname> when building with
+  <productname>Visual Studio 2005</productname> to
   <productname>Visual Studio 2013</productname>. Building with
   <productname>Visual Studio 2015</productname> is supported down to
-  <productname>Windows Vista</> and <productname>Windows Server 2008</>.
+  <productname>Windows Vista</productname> and <productname>Windows Server 2008</productname>.
+   Building with <productname>Visual Studio 2017</productname> is supported
+   down to <productname>Windows 7 SP1</productname> and <productname>Windows Server 2008 R2 SP1</productname>.
  </para>
 
  <para>
@@ -161,7 +163,7 @@ $ENV{MSBFLAGS}="/m";
       <productname>Microsoft Windows SDK</productname> it
       is recommended that you upgrade to the latest version (currently
       version 7.1), available for download from
-      <ulink url="https://www.microsoft.com/download"></>.
+      <ulink url="https://www.microsoft.com/download"></ulink>.
      </para>
      <para>
       You must always include the
@@ -180,7 +182,7 @@ $ENV{MSBFLAGS}="/m";
       ActiveState Perl is required to run the build generation scripts. MinGW
       or Cygwin Perl will not work. It must also be present in the PATH.
       Binaries can be downloaded from
-      <ulink url="http://www.activestate.com"></>
+      <ulink url="http://www.activestate.com"></ulink>
       (Note: version 5.8.3 or later is required,
       the free Standard Distribution is sufficient).
      </para></listitem>
@@ -217,7 +219,7 @@ $ENV{MSBFLAGS}="/m";
      <para>
       Both <productname>Bison</productname> and <productname>Flex</productname>
       are included in the <productname>msys</productname> tool suite, available
-      from <ulink url="http://www.mingw.org/wiki/MSYS"></> as part of the
+      from <ulink url="http://www.mingw.org/wiki/MSYS"></ulink> as part of the
       <productname>MinGW</productname> compiler suite.
      </para>
 
@@ -257,7 +259,7 @@ $ENV{MSBFLAGS}="/m";
      <term><productname>Diff</productname></term>
      <listitem><para>
       Diff is required to run the regression tests, and can be downloaded
-      from <ulink url="http://gnuwin32.sourceforge.net"></>.
+      from <ulink url="http://gnuwin32.sourceforge.net"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -265,7 +267,7 @@ $ENV{MSBFLAGS}="/m";
      <term><productname>Gettext</productname></term>
      <listitem><para>
       Gettext is required to build with NLS support, and can be downloaded
-      from <ulink url="http://gnuwin32.sourceforge.net"></>. Note that binaries,
+      from <ulink url="http://gnuwin32.sourceforge.net"></ulink>. Note that binaries,
       dependencies and developer files are all needed.
      </para></listitem>
     </varlistentry>
@@ -275,7 +277,7 @@ $ENV{MSBFLAGS}="/m";
      <listitem><para>
       Required for GSSAPI authentication support. MIT Kerberos can be
       downloaded from
-      <ulink url="http://web.mit.edu/Kerberos/dist/index.html"></>.
+      <ulink url="http://web.mit.edu/Kerberos/dist/index.html"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -284,8 +286,8 @@ $ENV{MSBFLAGS}="/m";
       <productname>libxslt</productname></term>
      <listitem><para>
       Required for XML support. Binaries can be downloaded from
-      <ulink url="http://zlatkovic.com/pub/libxml"></> or source from
-      <ulink url="http://xmlsoft.org"></>. Note that libxml2 requires iconv,
+      <ulink url="http://zlatkovic.com/pub/libxml"></ulink> or source from
+      <ulink url="http://xmlsoft.org"></ulink>. Note that libxml2 requires iconv,
       which is available from the same download location.
      </para></listitem>
     </varlistentry>
@@ -294,8 +296,8 @@ $ENV{MSBFLAGS}="/m";
      <term><productname>openssl</productname></term>
      <listitem><para>
       Required for SSL support. Binaries can be downloaded from
-      <ulink url="http://www.slproweb.com/products/Win32OpenSSL.html"></>
-      or source from <ulink url="http://www.openssl.org"></>.
+      <ulink url="http://www.slproweb.com/products/Win32OpenSSL.html"></ulink>
+      or source from <ulink url="http://www.openssl.org"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -304,7 +306,7 @@ $ENV{MSBFLAGS}="/m";
      <listitem><para>
       Required for UUID-OSSP support (contrib only). Source can be
       downloaded from
-      <ulink url="http://www.ossp.org/pkg/lib/uuid/"></>.
+      <ulink url="http://www.ossp.org/pkg/lib/uuid/"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -312,7 +314,7 @@ $ENV{MSBFLAGS}="/m";
      <term><productname>Python</productname></term>
      <listitem><para>
       Required for building <application>PL/Python</application>. Binaries can
-      be downloaded from <ulink url="http://www.python.org"></>.
+      be downloaded from <ulink url="http://www.python.org"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -321,7 +323,7 @@ $ENV{MSBFLAGS}="/m";
      <listitem><para>
       Required for compression support in <application>pg_dump</application>
       and <application>pg_restore</application>. Binaries can be downloaded
-      from <ulink url="http://www.zlib.net"></>.
+      from <ulink url="http://www.zlib.net"></ulink>.
      </para></listitem>
     </varlistentry>
 
@@ -345,8 +347,8 @@ $ENV{MSBFLAGS}="/m";
   </para>
 
   <para>
-   To use a server-side third party library such as <productname>python</> or
-   <productname>openssl</>, this library <emphasis>must</emphasis> also be
+   To use a server-side third party library such as <productname>python</productname> or
+   <productname>openssl</productname>, this library <emphasis>must</emphasis> also be
    64-bit. There is no support for loading a 32-bit library in a 64-bit
    server. Several of the third party libraries that PostgreSQL supports may
    only be available in 32-bit versions, in which case they cannot be used with
@@ -455,25 +457,25 @@ $ENV{CONFIG}="Debug";
 </screen>
 
    For more information about the regression tests, see
-   <xref linkend="regress">.
+   <xref linkend="regress"/>.
   </para>
 
   <para>
    Running the regression tests on client programs, with
-   <command>vcregress bincheck</>, or on recovery tests, with
-   <command>vcregress recoverycheck</>, requires an additional Perl module
+   <command>vcregress bincheck</command>, or on recovery tests, with
+   <command>vcregress recoverycheck</command>, requires an additional Perl module
    to be installed:
    <variablelist>
     <varlistentry>
      <term><productname>IPC::Run</productname></term>
      <listitem><para>
-      As of this writing, <literal>IPC::Run</> is not included in the
+      As of this writing, <literal>IPC::Run</literal> is not included in the
       ActiveState Perl installation, nor in the ActiveState Perl Package
       Manager (PPM) library. To install, download the
-      <filename>IPC-Run-&lt;version&gt;.tar.gz</> source archive from CPAN,
-      at <ulink url="http://search.cpan.org/dist/IPC-Run/"></>, and
-      uncompress. Edit the <filename>buildenv.pl</> file, and add a PERL5LIB
-      variable to point to the <filename>lib</> subdirectory from the
+      <filename>IPC-Run-&lt;version&gt;.tar.gz</filename> source archive from CPAN,
+      at <ulink url="http://search.cpan.org/dist/IPC-Run/"></ulink>, and
+      uncompress. Edit the <filename>buildenv.pl</filename> file, and add a PERL5LIB
+      variable to point to the <filename>lib</filename> subdirectory from the
       extracted archive. For example:
 <programlisting>
 $ENV{PERL5LIB}=$ENV{PERL5LIB} . ';c:\IPC-Run-0.94\lib';
@@ -496,7 +498,7 @@ $ENV{PERL5LIB}=$ENV{PERL5LIB} . ';c:\IPC-Run-0.94\lib';
      <term>OpenJade 1.3.1-2</term>
      <listitem><para>
       Download from
-      <ulink url="http://sourceforge.net/projects/openjade/files/openjade/1.3.1/openjade-1_3_1-2-bin.zip/download"></>
+      <ulink url="http://sourceforge.net/projects/openjade/files/openjade/1.3.1/openjade-1_3_1-2-bin.zip/download"></ulink>
       and uncompress in the subdirectory <filename>openjade-1.3.1</filename>.
      </para></listitem>
     </varlistentry>
@@ -505,7 +507,7 @@ $ENV{PERL5LIB}=$ENV{PERL5LIB} . ';c:\IPC-Run-0.94\lib';
      <term>DocBook DTD 4.2</term>
      <listitem><para>
       Download from
-      <ulink url="http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip"></>
+      <ulink url="http://www.oasis-open.org/docbook/sgml/4.2/docbook-4.2.zip"></ulink>
       and uncompress in the subdirectory <filename>docbook</filename>.
      </para></listitem>
     </varlistentry>
@@ -514,7 +516,7 @@ $ENV{PERL5LIB}=$ENV{PERL5LIB} . ';c:\IPC-Run-0.94\lib';
      <term>ISO character entities</term>
      <listitem><para>
       Download from
-      <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip"></> and
+      <ulink url="http://www.oasis-open.org/cover/ISOEnts.zip"></ulink> and
       uncompress in the subdirectory <filename>docbook</filename>.
      </para></listitem>
     </varlistentry>
diff --git a/doc/src/sgml/installation.sgml b/doc/src/sgml/installation.sgml
index 12866b4bf7..141494c651 100644
--- a/doc/src/sgml/installation.sgml
+++ b/doc/src/sgml/installation.sgml
@@ -1,28 +1,25 @@
 <!-- doc/src/sgml/installation.sgml -->
 <!--
 
-Use </link> not just </> so INSTALL.html can be created without links
-to the main documentation.  Don't use <xref>; or if you must, wrap it
-in a standalone-ignore clause.
+The standalone version has some portions that are different from the version
+that is integrated into the full documentation set, in particular as regards
+links, so that INSTALL.html can be created without links to the main
+documentation.  See standalone-profile.xsl for details.
 
 -->
 
 <chapter id="installation">
- <title><![%standalone-include[<productname>PostgreSQL</>]]>
-  Installation from Source Code</title>
+ <title>Installation from Source Code</title>
 
  <indexterm zone="installation">
   <primary>installation</primary>
  </indexterm>
 
  <para>
-  This <![%standalone-include;[document]]>
-  <![%standalone-ignore;[chapter]]> describes the installation of
+  This chapter describes the installation of
   <productname>PostgreSQL</productname> using the source code
   distribution.  (If you are installing a pre-packaged distribution,
-  such as an RPM or Debian package, ignore this
-  <![%standalone-include;[document]]>
-  <![%standalone-ignore;[chapter]]>
+  such as an RPM or Debian package, ignore this chapter
   and read the packager's instructions instead.)
  </para>
 
@@ -45,8 +42,7 @@ su - postgres
 /usr/local/pgsql/bin/psql test
 </synopsis>
    The long version is the rest of this
-   <![%standalone-include;[document.]]>
-   <![%standalone-ignore;[chapter.]]>
+   <phrase>chapter</phrase>.
   </para>
  </sect1>
 
@@ -56,17 +52,17 @@ su - postgres
 
   <para>
    In general, a modern Unix-compatible platform should be able to run
-   <productname>PostgreSQL</>.
+   <productname>PostgreSQL</productname>.
    The platforms that had received specific testing at the
-   time of release are listed in <xref linkend="supported-platforms">
-   below. In the <filename>doc</> subdirectory of the distribution
-   there are several platform-specific <acronym>FAQ</> documents you
+   time of release are listed in <xref linkend="supported-platforms"/>
+   below. In the <filename>doc</filename> subdirectory of the distribution
+   there are several platform-specific <acronym>FAQ</acronym> documents you
    might wish to consult if you are having trouble.
   </para>
 
   <para>
    The following software packages are required for building
-   <productname>PostgreSQL</>:
+   <productname>PostgreSQL</productname>:
 
    <itemizedlist>
     <listitem>
@@ -75,9 +71,9 @@ su - postgres
        <primary>make</primary>
       </indexterm>
 
-      <acronym>GNU</> <application>make</> version 3.80 or newer is required; other
-      <application>make</> programs or older <acronym>GNU</> <application>make</> versions will <emphasis>not</> work.
-      (<acronym>GNU</> <application>make</> is sometimes installed under
+      <acronym>GNU</acronym> <application>make</application> version 3.80 or newer is required; other
+      <application>make</application> programs or older <acronym>GNU</acronym> <application>make</application> versions will <emphasis>not</emphasis> work.
+      (<acronym>GNU</acronym> <application>make</application> is sometimes installed under
       the name <filename>gmake</filename>.)  To test for <acronym>GNU</acronym>
       <application>make</application> enter:
 <screen>
@@ -88,19 +84,19 @@ su - postgres
 
     <listitem>
      <para>
-      You need an <acronym>ISO</>/<acronym>ANSI</> C compiler (at least
+      You need an <acronym>ISO</acronym>/<acronym>ANSI</acronym> C compiler (at least
       C89-compliant). Recent
-      versions of <productname>GCC</> are recommended, but
-      <productname>PostgreSQL</> is known to build using a wide variety
+      versions of <productname>GCC</productname> are recommended, but
+      <productname>PostgreSQL</productname> is known to build using a wide variety
       of compilers from different vendors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <application>tar</> is required to unpack the source
+      <application>tar</application> is required to unpack the source
       distribution, in addition to either
-      <application>gzip</> or <application>bzip2</>.
+      <application>gzip</application> or <application>bzip2</application>.
      </para>
     </listitem>
 
@@ -113,23 +109,23 @@ su - postgres
        <primary>libedit</primary>
       </indexterm>
 
-      The <acronym>GNU</> <productname>Readline</> library is used by
+      The <acronym>GNU</acronym> <productname>Readline</productname> library is used by
       default.  It allows <application>psql</application> (the
       PostgreSQL command line SQL interpreter) to remember each
       command you type, and allows you to use arrow keys to recall and
       edit previous commands.  This is very helpful and is strongly
       recommended.  If you don't want to use it then you must specify
       the <option>--without-readline</option> option to
-      <filename>configure</>. As an alternative, you can often use the
+      <filename>configure</filename>. As an alternative, you can often use the
       BSD-licensed <filename>libedit</filename> library, originally
       developed on <productname>NetBSD</productname>. The
       <filename>libedit</filename> library is
       GNU <productname>Readline</productname>-compatible and is used if
       <filename>libreadline</filename> is not found, or if
       <option>--with-libedit-preferred</option> is used as an
-      option to <filename>configure</>. If you are using a package-based
+      option to <filename>configure</filename>. If you are using a package-based
       Linux distribution, be aware that you need both the
-      <literal>readline</> and <literal>readline-devel</> packages, if
+      <literal>readline</literal> and <literal>readline-devel</literal> packages, if
       those are separate in your distribution.
      </para>
     </listitem>
@@ -144,8 +140,8 @@ su - postgres
       used by default. If you don't want to use it then you must
       specify the <option>--without-zlib</option> option to
       <filename>configure</filename>. Using this option disables
-      support for compressed archives in <application>pg_dump</> and
-      <application>pg_restore</>.
+      support for compressed archives in <application>pg_dump</application> and
+      <application>pg_restore</application>.
      </para>
     </listitem>
    </itemizedlist>
@@ -183,22 +179,21 @@ su - postgres
       If you intend to make more than incidental use of
       <application>PL/Perl</application>, you should ensure that the
       <productname>Perl</productname> installation was built with the
-      <literal>usemultiplicity</> option enabled (<literal>perl -V</>
+      <literal>usemultiplicity</literal> option enabled (<literal>perl -V</literal>
       will show whether this is the case).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      To build the <application>PL/Python</> server programming
+      To build the <application>PL/Python</application> server programming
       language, you need a <productname>Python</productname>
       installation with the header files and
       the <application>distutils</application> module.  The minimum
       required version is <productname>Python</productname> 2.4.
       <productname>Python 3</productname> is supported if it's
       version 3.1 or later; but see
-      <![%standalone-include[the <application>PL/Python</> documentation]]>
-      <![%standalone-ignore[<xref linkend="plpython-python23">]]>
+      <xref linkend="plpython-python23"/>
       when using Python 3.
      </para>
 
@@ -214,15 +209,15 @@ su - postgres
       find a shared <filename>libpython</filename>.  That might mean that you
       either have to install additional packages or rebuild (part of) your
       <productname>Python</productname> installation to provide this shared
-      library.  When building from source, run <productname>Python</>'s
-      configure with the <literal>--enable-shared</> flag.
+      library.  When building from source, run <productname>Python</productname>'s
+      configure with the <literal>--enable-shared</literal> flag.
      </para>
     </listitem>
 
     <listitem>
      <para>
       To build the <application>PL/Tcl</application>
-      procedural language, you of course need a <productname>Tcl</>
+      procedural language, you of course need a <productname>Tcl</productname>
       installation.  The minimum required version is
       <productname>Tcl</productname> 8.4.
      </para>
@@ -233,13 +228,13 @@ su - postgres
       To enable Native Language Support (<acronym>NLS</acronym>), that
       is, the ability to display a program's messages in a language
       other than English, you need an implementation of the
-      <application>Gettext</> <acronym>API</acronym>.  Some operating
+      <application>Gettext</application> <acronym>API</acronym>.  Some operating
       systems have this built-in (e.g., <systemitem
-      class="osname">Linux</>, <systemitem class="osname">NetBSD</>,
-      <systemitem class="osname">Solaris</>), for other systems you
+      class="osname">Linux</systemitem>, <systemitem class="osname">NetBSD</systemitem>,
+      <systemitem class="osname">Solaris</systemitem>), for other systems you
       can download an add-on package from <ulink
       url="http://www.gnu.org/software/gettext/"></ulink>.
-      If you are using the <application>Gettext</> implementation in
+      If you are using the <application>Gettext</application> implementation in
       the <acronym>GNU</acronym> C library then you will additionally
       need the <productname>GNU Gettext</productname> package for some
       utility programs.  For any of the other implementations you will
@@ -249,7 +244,7 @@ su - postgres
 
     <listitem>
      <para>
-      You need <productname>OpenSSL</>, if you want to support
+      You need <productname>OpenSSL</productname>, if you want to support
       encrypted client connections. The minimum required version is
       0.9.8.
      </para>
@@ -257,8 +252,8 @@ su - postgres
 
     <listitem>
      <para>
-      You need <application>Kerberos</>, <productname>OpenLDAP</>,
-      and/or <application>PAM</>, if you want to support authentication
+      You need <application>Kerberos</application>, <productname>OpenLDAP</productname>,
+      and/or <application>PAM</application>, if you want to support authentication
       using those services.
      </para>
     </listitem>
@@ -267,9 +262,7 @@ su - postgres
      <para>
       To build the <productname>PostgreSQL</productname> documentation,
       there is a separate set of requirements; see
-      <![%standalone-ignore;[<xref linkend="docguide-toolsets">.]]>
-      <![%standalone-include;[the main documentation's appendix on
-      documentation.]]>
+      <xref linkend="docguide-toolsets"/>.
      </para>
     </listitem>
    </itemizedlist>
@@ -296,12 +289,12 @@ su - postgres
        <primary>yacc</primary>
       </indexterm>
 
-      GNU <application>Flex</> and <application>Bison</>
+      <application>Flex</application> and <application>Bison</application>
       are needed to build from a Git checkout, or if you changed the actual
       scanner and parser definition files. If you need them, be sure
-      to get <application>Flex</> 2.5.31 or later and
-      <application>Bison</> 1.875 or later. Other <application>lex</>
-      and <application>yacc</> programs cannot be used.
+      to get <application>Flex</application> 2.5.31 or later and
+      <application>Bison</application> 1.875 or later. Other <application>lex</application>
+      and <application>yacc</application> programs cannot be used.
      </para>
     </listitem>
     <listitem>
@@ -310,10 +303,10 @@ su - postgres
        <primary>perl</primary>
       </indexterm>
 
-      <application>Perl</> 5.8.3 or later is needed to build from a Git checkout,
+      <application>Perl</application> 5.8.3 or later is needed to build from a Git checkout,
       or if you changed the input files for any of the build steps that
       use Perl scripts.  If building on Windows you will need
-      <application>Perl</> in any case.  <application>Perl</application> is
+      <application>Perl</application> in any case.  <application>Perl</application> is
       also required to run some test suites.
      </para>
     </listitem>
@@ -323,7 +316,7 @@ su - postgres
   <para>
    If you need to get a <acronym>GNU</acronym> package, you can find
    it at your local <acronym>GNU</acronym> mirror site (see <ulink
-   url="http://www.gnu.org/order/ftp.html"></>
+   url="http://www.gnu.org/order/ftp.html"></ulink>
    for a list) or at <ulink
    url="ftp://ftp.gnu.org/gnu/"></ulink>.
   </para>
@@ -340,12 +333,11 @@ su - postgres
   </para>
  </sect1>
 
-<![%standalone-ignore;[
  <sect1 id="install-getsource">
   <title>Getting The Source</title>
 
   <para>
-   The <productname>PostgreSQL</> &version; sources can be obtained from the
+   The <productname>PostgreSQL</productname> &version; sources can be obtained from the
    download section of our
    website: <ulink url="https://www.postgresql.org/download/"></ulink>.  You
    should get a file named <filename>postgresql-&version;.tar.gz</filename>
@@ -359,17 +351,16 @@ su - postgres
    have the <filename>.bz2</filename> file.)
    This will create a directory
    <filename>postgresql-&version;</filename> under the current directory
-   with the <productname>PostgreSQL</> sources.
+   with the <productname>PostgreSQL</productname> sources.
    Change into that directory for the rest
    of the installation procedure.
   </para>
 
   <para>
    You can also get the source directly from the version control repository, see
-   <xref linkend="sourcerepo">.
+   <xref linkend="sourcerepo"/>.
   </para>
  </sect1>
-]]>
 
  <sect1 id="install-procedure">
   <title>Installation Procedure</title>
@@ -386,7 +377,7 @@ su - postgres
    <para>
     The first step of the installation procedure is to configure the
     source tree for your system and choose the options you would like.
-    This is done by running the <filename>configure</> script. For a
+    This is done by running the <filename>configure</filename> script. For a
     default installation simply enter:
 <screen>
 <userinput>./configure</userinput>
@@ -412,7 +403,7 @@ su - postgres
     The default configuration will build the server and utilities, as
     well as all client applications and interfaces that require only a
     C compiler. All files will be installed under
-    <filename>/usr/local/pgsql</> by default.
+    <filename>/usr/local/pgsql</filename> by default.
    </para>
 
    <para>
@@ -422,14 +413,14 @@ su - postgres
 
      <variablelist>
       <varlistentry>
-       <term><option>--prefix=<replaceable>PREFIX</></option></term>
+       <term><option>--prefix=<replaceable>PREFIX</replaceable></option></term>
        <listitem>
         <para>
-         Install all files under the directory <replaceable>PREFIX</>
+         Install all files under the directory <replaceable>PREFIX</replaceable>
          instead of <filename>/usr/local/pgsql</filename>. The actual
          files will be installed into various subdirectories; no files
          will ever be installed directly into the
-         <replaceable>PREFIX</> directory.
+         <replaceable>PREFIX</replaceable> directory.
         </para>
 
         <para>
@@ -437,13 +428,13 @@ su - postgres
          individual subdirectories with the following options. However,
          if you leave these with their defaults, the installation will be
          relocatable, meaning you can move the directory after
-         installation. (The <literal>man</> and <literal>doc</>
+         installation. (The <literal>man</literal> and <literal>doc</literal>
          locations are not affected by this.)
         </para>
 
         <para>
          For relocatable installs, you might want to use
-         <filename>configure</filename>'s <literal>--disable-rpath</>
+         <filename>configure</filename>'s <literal>--disable-rpath</literal>
          option.  Also, you will need to tell the operating system how
          to find the shared libraries.
         </para>
@@ -451,15 +442,15 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
-       <term><option>--exec-prefix=<replaceable>EXEC-PREFIX</></option></term>
+       <term><option>--exec-prefix=<replaceable>EXEC-PREFIX</replaceable></option></term>
        <listitem>
         <para>
          You can install architecture-dependent files under a
-         different prefix, <replaceable>EXEC-PREFIX</>, than what
-         <replaceable>PREFIX</> was set to. This can be useful to
+         different prefix, <replaceable>EXEC-PREFIX</replaceable>, than what
+         <replaceable>PREFIX</replaceable> was set to. This can be useful to
          share architecture-independent files between hosts. If you
-         omit this, then <replaceable>EXEC-PREFIX</> is set equal to
-         <replaceable>PREFIX</> and both architecture-dependent and
+         omit this, then <replaceable>EXEC-PREFIX</replaceable> is set equal to
+         <replaceable>PREFIX</replaceable> and both architecture-dependent and
          independent files will be installed under the same tree,
          which is probably what you want.
         </para>
@@ -467,114 +458,114 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
-       <term><option>--bindir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--bindir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Specifies the directory for executable programs. The default
-         is <filename><replaceable>EXEC-PREFIX</>/bin</>, which
-         normally means <filename>/usr/local/pgsql/bin</>.
+         is <filename><replaceable>EXEC-PREFIX</replaceable>/bin</filename>, which
+         normally means <filename>/usr/local/pgsql/bin</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--sysconfdir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--sysconfdir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the directory for various configuration files,
-         <filename><replaceable>PREFIX</>/etc</> by default.
+         <filename><replaceable>PREFIX</replaceable>/etc</filename> by default.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--libdir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--libdir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the location to install libraries and dynamically loadable
          modules. The default is
-         <filename><replaceable>EXEC-PREFIX</>/lib</>.
+         <filename><replaceable>EXEC-PREFIX</replaceable>/lib</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--includedir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--includedir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the directory for installing C and C++ header files. The
-         default is <filename><replaceable>PREFIX</>/include</>.
+         default is <filename><replaceable>PREFIX</replaceable>/include</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--datarootdir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--datarootdir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the root directory for various types of read-only data
          files.  This only sets the default for some of the following
          options.  The default is
-         <filename><replaceable>PREFIX</>/share</>.
+         <filename><replaceable>PREFIX</replaceable>/share</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--datadir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--datadir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the directory for read-only data files used by the
          installed programs. The default is
-         <filename><replaceable>DATAROOTDIR</></>. Note that this has
+         <filename><replaceable>DATAROOTDIR</replaceable></filename>. Note that this has
          nothing to do with where your database files will be placed.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--localedir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--localedir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the directory for installing locale data, in particular
          message translation catalog files.  The default is
-         <filename><replaceable>DATAROOTDIR</>/locale</>.
+         <filename><replaceable>DATAROOTDIR</replaceable>/locale</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--mandir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--mandir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
-         The man pages that come with <productname>PostgreSQL</> will be installed under
+         The man pages that come with <productname>PostgreSQL</productname> will be installed under
          this directory, in their respective
-         <filename>man<replaceable>x</></> subdirectories.
-         The default is <filename><replaceable>DATAROOTDIR</>/man</>.
+         <filename>man<replaceable>x</replaceable></filename> subdirectories.
+         The default is <filename><replaceable>DATAROOTDIR</replaceable>/man</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--docdir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--docdir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          Sets the root directory for installing documentation files,
-         except <quote>man</> pages.  This only sets the default for
+         except <quote>man</quote> pages.  This only sets the default for
          the following options.  The default value for this option is
-         <filename><replaceable>DATAROOTDIR</>/doc/postgresql</>.
+         <filename><replaceable>DATAROOTDIR</replaceable>/doc/postgresql</filename>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--htmldir=<replaceable>DIRECTORY</></option></term>
+       <term><option>--htmldir=<replaceable>DIRECTORY</replaceable></option></term>
        <listitem>
         <para>
          The HTML-formatted documentation for
          <productname>PostgreSQL</productname> will be installed under
          this directory.  The default is
-         <filename><replaceable>DATAROOTDIR</></>.
+         <filename><replaceable>DATAROOTDIR</replaceable></filename>.
         </para>
        </listitem>
       </varlistentry>
@@ -583,15 +574,15 @@ su - postgres
      <note>
       <para>
        Care has been taken to make it possible to install
-       <productname>PostgreSQL</> into shared installation locations
+       <productname>PostgreSQL</productname> into shared installation locations
        (such as <filename>/usr/local/include</filename>) without
        interfering with the namespace of the rest of the system. First,
        the string <quote><literal>/postgresql</literal></quote> is
        automatically appended to <varname>datadir</varname>,
        <varname>sysconfdir</varname>, and <varname>docdir</varname>,
        unless the fully expanded directory name already contains the
-       string <quote><literal>postgres</></quote> or
-       <quote><literal>pgsql</></quote>. For example, if you choose
+       string <quote><literal>postgres</literal></quote> or
+       <quote><literal>pgsql</literal></quote>. For example, if you choose
        <filename>/usr/local</filename> as prefix, the documentation will
        be installed in <filename>/usr/local/doc/postgresql</filename>,
        but if the prefix is <filename>/opt/postgres</filename>, then it
@@ -611,10 +602,10 @@ su - postgres
     <para>
      <variablelist>
       <varlistentry>
-       <term><option>--with-extra-version=<replaceable>STRING</></option></term>
+       <term><option>--with-extra-version=<replaceable>STRING</replaceable></option></term>
        <listitem>
         <para>
-         Append <replaceable>STRING</> to the PostgreSQL version number.  You
+         Append <replaceable>STRING</replaceable> to the PostgreSQL version number.  You
          can use this, for example, to mark binaries built from unreleased Git
          snapshots or containing custom patches with an extra version string
          such as a <command>git describe</command> identifier or a
@@ -624,35 +615,35 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
-       <term><option>--with-includes=<replaceable>DIRECTORIES</></option></term>
+       <term><option>--with-includes=<replaceable>DIRECTORIES</replaceable></option></term>
        <listitem>
         <para>
-         <replaceable>DIRECTORIES</> is a colon-separated list of
+         <replaceable>DIRECTORIES</replaceable> is a colon-separated list of
          directories that will be added to the list the compiler
          searches for header files. If you have optional packages
-         (such as GNU <application>Readline</>) installed in a non-standard
+         (such as GNU <application>Readline</application>) installed in a non-standard
          location,
          you have to use this option and probably also the corresponding
-         <option>--with-libraries</> option.
+         <option>--with-libraries</option> option.
         </para>
         <para>
-         Example: <literal>--with-includes=/opt/gnu/include:/usr/sup/include</>.
+         Example: <literal>--with-includes=/opt/gnu/include:/usr/sup/include</literal>.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--with-libraries=<replaceable>DIRECTORIES</></option></term>
+       <term><option>--with-libraries=<replaceable>DIRECTORIES</replaceable></option></term>
        <listitem>
         <para>
-         <replaceable>DIRECTORIES</> is a colon-separated list of
+         <replaceable>DIRECTORIES</replaceable> is a colon-separated list of
          directories to search for libraries. You will probably have
          to use this option (and the corresponding
-         <option>--with-includes</> option) if you have packages
+         <option>--with-includes</option> option) if you have packages
          installed in non-standard locations.
         </para>
         <para>
-         Example: <literal>--with-libraries=/opt/gnu/lib:/usr/sup/lib</>.
+         Example: <literal>--with-libraries=/opt/gnu/lib:/usr/sup/lib</literal>.
         </para>
        </listitem>
       </varlistentry>
@@ -666,7 +657,7 @@ su - postgres
          language other than English.
          <replaceable>LANGUAGES</replaceable> is an optional space-separated
          list of codes of the languages that you want supported, for
-         example <literal>--enable-nls='de fr'</>.  (The intersection
+         example <literal>--enable-nls='de fr'</literal>.  (The intersection
          between your list and the set of actually provided
          translations will be computed automatically.)  If you do not
          specify a list, then all available translations are
@@ -675,22 +666,22 @@ su - postgres
 
         <para>
          To use this option, you will need an implementation of the
-         <application>Gettext</> API; see above.
+         <application>Gettext</application> API; see above.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><option>--with-pgport=<replaceable>NUMBER</></option></term>
+       <term><option>--with-pgport=<replaceable>NUMBER</replaceable></option></term>
        <listitem>
         <para>
-         Set <replaceable>NUMBER</> as the default port number for
+         Set <replaceable>NUMBER</replaceable> as the default port number for
          server and clients. The default is 5432. The port can always
          be changed later on, but if you specify it here then both
          server and clients will have the same default compiled in,
          which can be very convenient.  Usually the only good reason
          to select a non-default value is if you intend to run multiple
-         <productname>PostgreSQL</> servers on the same machine.
+         <productname>PostgreSQL</productname> servers on the same machine.
         </para>
        </listitem>
       </varlistentry>
@@ -699,7 +690,7 @@ su - postgres
        <term><option>--with-perl</option></term>
        <listitem>
         <para>
-         Build the <application>PL/Perl</> server-side language.
+         Build the <application>PL/Perl</application> server-side language.
         </para>
        </listitem>
       </varlistentry>
@@ -708,7 +699,7 @@ su - postgres
        <term><option>--with-python</option></term>
        <listitem>
         <para>
-         Build the <application>PL/Python</> server-side language.
+         Build the <application>PL/Python</application> server-side language.
         </para>
        </listitem>
       </varlistentry>
@@ -717,7 +708,7 @@ su - postgres
        <term><option>--with-tcl</option></term>
        <listitem>
         <para>
-         Build the <application>PL/Tcl</> server-side language.
+         Build the <application>PL/Tcl</application> server-side language.
         </para>
        </listitem>
       </varlistentry>
@@ -743,10 +734,10 @@ su - postgres
          Build with support for GSSAPI authentication. On many
          systems, the GSSAPI (usually a part of the Kerberos installation)
          system is not installed in a location
-         that is searched by default (e.g., <filename>/usr/include</>,
-         <filename>/usr/lib</>), so you must use the options
-         <option>--with-includes</> and <option>--with-libraries</> in
-         addition to this option.  <filename>configure</> will check
+         that is searched by default (e.g., <filename>/usr/include</filename>,
+         <filename>/usr/lib</filename>), so you must use the options
+         <option>--with-includes</option> and <option>--with-libraries</option> in
+         addition to this option.  <filename>configure</filename> will check
          for the required header files and libraries to make sure that
          your GSSAPI installation is sufficient before proceeding.
         </para>
@@ -754,7 +745,7 @@ su - postgres
       </varlistentry>
 
       <varlistentry>
-       <term><option>--with-krb-srvnam=<replaceable>NAME</></option></term>
+       <term><option>--with-krb-srvnam=<replaceable>NAME</replaceable></option></term>
        <listitem>
         <para>
          The default name of the Kerberos service principal used
@@ -772,7 +763,7 @@ su - postgres
        <listitem>
         <para>
          Build with support for
-         the <productname>ICU</productname><indexterm><primary>ICU</></>
+         the <productname>ICU</productname><indexterm><primary>ICU</primary></indexterm>
          library.  This requires the <productname>ICU4C</productname> package
          to be installed.  The minimum required version
          of <productname>ICU4C</productname> is currently 4.2.
@@ -780,7 +771,7 @@ su - postgres
 
         <para>
          By default,
-         <productname>pkg-config</productname><indexterm><primary>pkg-config</></>
+         <productname>pkg-config</productname><indexterm><primary>pkg-config</primary></indexterm>
          will be used to find the required compilation options.  This is
          supported for <productname>ICU4C</productname> version 4.6 and later.
          For older versions, or if <productname>pkg-config</productname> is
@@ -807,11 +798,11 @@ su - postgres
        </term>
        <listitem>
         <para>
-         Build with support for <acronym>SSL</> (encrypted)
-         connections. This requires the <productname>OpenSSL</>
-         package to be installed.  <filename>configure</> will check
+         Build with support for <acronym>SSL</acronym> (encrypted)
+         connections. This requires the <productname>OpenSSL</productname>
+         package to be installed.  <filename>configure</filename> will check
          for the required header files and libraries to make sure that
-         your <productname>OpenSSL</> installation is sufficient
+         your <productname>OpenSSL</productname> installation is sufficient
          before proceeding.
         </para>
        </listitem>
@@ -821,7 +812,7 @@ su - postgres
        <term><option>--with-pam</option></term>
        <listitem>
         <para>
-         Build with <acronym>PAM</><indexterm><primary>PAM</></>
+         Build with <acronym>PAM</acronym><indexterm><primary>PAM</primary></indexterm>
          (Pluggable Authentication Modules) support.
         </para>
        </listitem>
@@ -842,16 +833,15 @@ su - postgres
        <term><option>--with-ldap</option></term>
        <listitem>
         <para>
-         Build with <acronym>LDAP</><indexterm><primary>LDAP</></>
+         Build with <acronym>LDAP</acronym><indexterm><primary>LDAP</primary></indexterm>
          support for authentication and connection parameter lookup (see
-         <![%standalone-include[the documentation about client authentication
-         and libpq]]><![%standalone-ignore[<xref linkend="libpq-ldap"> and
-         <xref linkend="auth-ldap">]]> for more information). On Unix,
-         this requires the <productname>OpenLDAP</> package to be
-         installed. On Windows, the default <productname>WinLDAP</>
-         library is used.  <filename>configure</> will check for the required
+         <phrase id="install-ldap-links"><xref linkend="libpq-ldap"/> and
+         <xref linkend="auth-ldap"/></phrase> for more information). On Unix,
+         this requires the <productname>OpenLDAP</productname> package to be
+         installed. On Windows, the default <productname>WinLDAP</productname>
+         library is used.  <filename>configure</filename> will check for the required
          header files and libraries to make sure that your
-         <productname>OpenLDAP</> installation is sufficient before
+         <productname>OpenLDAP</productname> installation is sufficient before
          proceeding.
         </para>
        </listitem>
@@ -865,8 +855,8 @@ su - postgres
          for <application>systemd</application><indexterm><primary>systemd</primary></indexterm>
          service notifications.  This improves integration if the server binary
          is started under <application>systemd</application> but has no impact
-         otherwise<![%standalone-ignore[; see <xref linkend="server-start"> for more
-         information]]>.  <application>libsystemd</application> and the
+         otherwise<phrase condition="standalone-ignore">; see <xref linkend="server-start"/> for more
+         information</phrase>.  <application>libsystemd</application> and the
          associated header files need to be installed to be able to use this
          option.
         </para>
@@ -877,8 +867,8 @@ su - postgres
        <term><option>--without-readline</option></term>
        <listitem>
         <para>
-         Prevents use of the <application>Readline</> library
-         (and <application>libedit</> as well).  This option disables
+         Prevents use of the <application>Readline</application> library
+         (and <application>libedit</application> as well).  This option disables
          command-line editing and history in
          <application>psql</application>, so it is not recommended.
         </para>
@@ -889,10 +879,10 @@ su - postgres
        <term><option>--with-libedit-preferred</option></term>
        <listitem>
         <para>
-         Favors the use of the BSD-licensed <application>libedit</> library
-         rather than GPL-licensed <application>Readline</>.  This option
+         Favors the use of the BSD-licensed <application>libedit</application> library
+         rather than GPL-licensed <application>Readline</application>.  This option
          is significant only if you have both libraries installed; the
-         default in that case is to use <application>Readline</>.
+         default in that case is to use <application>Readline</application>.
         </para>
        </listitem>
       </varlistentry>
@@ -911,8 +901,7 @@ su - postgres
        <term><option>--with-uuid=<replaceable>LIBRARY</replaceable></option></term>
        <listitem>
         <para>
-         Build the <![%standalone-include[uuid-ossp]]>
-         <![%standalone-ignore[<xref linkend="uuid-ossp">]]> module
+         Build the <xref linkend="uuid-ossp"/> module
          (which provides functions to generate UUIDs), using the specified
          UUID library.<indexterm><primary>UUID</primary></indexterm>
          <replaceable>LIBRARY</replaceable> must be one of:
@@ -920,21 +909,21 @@ su - postgres
         <itemizedlist>
          <listitem>
           <para>
-           <option>bsd</> to use the UUID functions found in FreeBSD, NetBSD,
+           <option>bsd</option> to use the UUID functions found in FreeBSD, NetBSD,
            and some other BSD-derived systems
           </para>
          </listitem>
          <listitem>
           <para>
-           <option>e2fs</> to use the UUID library created by
-           the <literal>e2fsprogs</> project; this library is present in most
+           <option>e2fs</option> to use the UUID library created by
+           the <literal>e2fsprogs</literal> project; this library is present in most
            Linux systems and in macOS, and can be obtained for other
            platforms as well
           </para>
          </listitem>
          <listitem>
           <para>
-           <option>ossp</> to use the <ulink
+           <option>ossp</option> to use the <ulink
            url="http://www.ossp.org/pkg/lib/uuid/">OSSP UUID library</ulink>
           </para>
          </listitem>
@@ -979,9 +968,8 @@ su - postgres
        <listitem>
         <para>
          Use libxslt when building the
-         <![%standalone-include[xml2]]>
-         <![%standalone-ignore[<xref linkend="xml2">]]>
-         module.  <application>xml2</> relies on this library
+         <xref linkend="xml2"/>
+         module.  <application>xml2</application> relies on this library
          to perform XSL transformations of XML.
         </para>
        </listitem>
@@ -991,13 +979,13 @@ su - postgres
        <term><option>--disable-float4-byval</option></term>
        <listitem>
         <para>
-         Disable passing float4 values <quote>by value</>, causing them
-         to be passed <quote>by reference</> instead.  This option costs
+         Disable passing float4 values <quote>by value</quote>, causing them
+         to be passed <quote>by reference</quote> instead.  This option costs
          performance, but may be needed for compatibility with old
          user-defined functions that are written in C and use the
-         <quote>version 0</> calling convention.  A better long-term
+         <quote>version 0</quote> calling convention.  A better long-term
          solution is to update any such functions to use the
-         <quote>version 1</> calling convention.
+         <quote>version 1</quote> calling convention.
         </para>
        </listitem>
       </varlistentry>
@@ -1006,17 +994,17 @@ su - postgres
        <term><option>--disable-float8-byval</option></term>
        <listitem>
         <para>
-         Disable passing float8 values <quote>by value</>, causing them
-         to be passed <quote>by reference</> instead.  This option costs
+         Disable passing float8 values <quote>by value</quote>, causing them
+         to be passed <quote>by reference</quote> instead.  This option costs
          performance, but may be needed for compatibility with old
          user-defined functions that are written in C and use the
-         <quote>version 0</> calling convention.  A better long-term
+         <quote>version 0</quote> calling convention.  A better long-term
          solution is to update any such functions to use the
-         <quote>version 1</> calling convention.
+         <quote>version 1</quote> calling convention.
          Note that this option affects not only float8, but also int8 and some
          related types such as timestamp.
-         On 32-bit platforms, <option>--disable-float8-byval</> is the default
-         and it is not allowed to select <option>--enable-float8-byval</>.
+         On 32-bit platforms, <option>--disable-float8-byval</option> is the default
+         and it is not allowed to select <option>--enable-float8-byval</option>.
         </para>
        </listitem>
       </varlistentry>
@@ -1025,17 +1013,17 @@ su - postgres
        <term><option>--with-segsize=<replaceable>SEGSIZE</replaceable></option></term>
        <listitem>
         <para>
-         Set the <firstterm>segment size</>, in gigabytes.  Large tables are
+         Set the <firstterm>segment size</firstterm>, in gigabytes.  Large tables are
          divided into multiple operating-system files, each of size equal
          to the segment size.  This avoids problems with file size limits
          that exist on many platforms.  The default segment size, 1 gigabyte,
          is safe on all supported platforms.  If your operating system has
-         <quote>largefile</> support (which most do, nowadays), you can use
+         <quote>largefile</quote> support (which most do, nowadays), you can use
          a larger segment size.  This can be helpful to reduce the number of
          file descriptors consumed when working with very large tables.
          But be careful not to select a value larger than is supported
          by your platform and the file systems you intend to use.  Other
-         tools you might wish to use, such as <application>tar</>, could
+         tools you might wish to use, such as <application>tar</application>, could
          also set limits on the usable file size.
          It is recommended, though not absolutely required, that this value
          be a power of 2.
@@ -1048,7 +1036,7 @@ su - postgres
        <term><option>--with-blocksize=<replaceable>BLOCKSIZE</replaceable></option></term>
        <listitem>
         <para>
-         Set the <firstterm>block size</>, in kilobytes.  This is the unit
+         Set the <firstterm>block size</firstterm>, in kilobytes.  This is the unit
          of storage and I/O within tables.  The default, 8 kilobytes,
          is suitable for most situations; but other values may be useful
          in special cases.
@@ -1058,25 +1046,11 @@ su - postgres
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-       <term><option>--with-wal-segsize=<replaceable>SEGSIZE</replaceable></option></term>
-       <listitem>
-        <para>
-         Set the <firstterm>WAL segment size</>, in megabytes.  This is
-         the size of each individual file in the WAL log.  It may be useful
-         to adjust this size to control the granularity of WAL log shipping.
-         The default size is 16 megabytes.
-         The value must be a power of 2 between 1 and 1024 (megabytes).
-         Note that changing this value requires an initdb.
-        </para>
-       </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term><option>--with-wal-blocksize=<replaceable>BLOCKSIZE</replaceable></option></term>
        <listitem>
         <para>
-         Set the <firstterm>WAL block size</>, in kilobytes.  This is the unit
+         Set the <firstterm>WAL block size</firstterm>, in kilobytes.  This is the unit
          of storage and I/O within the WAL log.  The default, 8 kilobytes,
          is suitable for most situations; but other values may be useful
          in special cases.
@@ -1090,14 +1064,14 @@ su - postgres
        <term><option>--disable-spinlocks</option></term>
        <listitem>
         <para>
-         Allow the build to succeed even if <productname>PostgreSQL</>
+         Allow the build to succeed even if <productname>PostgreSQL</productname>
          has no CPU spinlock support for the platform.  The lack of
          spinlock support will result in poor performance; therefore,
          this option should only be used if the build aborts and
          informs you that the platform lacks spinlock support. If this
-         option is required to build <productname>PostgreSQL</> on
+         option is required to build <productname>PostgreSQL</productname> on
          your platform, please report the problem to the
-         <productname>PostgreSQL</> developers.
+         <productname>PostgreSQL</productname> developers.
         </para>
        </listitem>
       </varlistentry>
@@ -1106,12 +1080,11 @@ su - postgres
        <term><option>--disable-strong-random</option></term>
        <listitem>
         <para>
-         Allow the build to succeed even if <productname>PostgreSQL</>
+         Allow the build to succeed even if <productname>PostgreSQL</productname>
          has no support for strong random numbers on the platform.
          A source of random numbers is needed for some authentication
          protocols, as well as some routines in the
-         <![%standalone-include[pgcrypto]]>
-         <![%standalone-ignore[<xref linkend="pgcrypto">]]>
+         <xref linkend="pgcrypto"/>
          module. <option>--disable-strong-random</option> disables functionality that
          requires cryptographically strong random numbers, and substitutes
          a weak pseudo-random-number-generator for the generation of
@@ -1141,7 +1114,7 @@ su - postgres
        </term>
        <listitem>
         <para>
-         <productname>PostgreSQL</> includes its own time zone database,
+         <productname>PostgreSQL</productname> includes its own time zone database,
          which it requires for date and time operations.  This time zone
          database is in fact compatible with the IANA time zone
          database provided by many operating systems such as FreeBSD,
@@ -1155,7 +1128,7 @@ su - postgres
          installation routine will not detect mismatching or erroneous time
          zone data.  If you use this option, you are advised to run the
          regression tests to verify that the time zone data you have
-         pointed to works correctly with <productname>PostgreSQL</>.
+         pointed to works correctly with <productname>PostgreSQL</productname>.
         </para>
 
         <indexterm><primary>cross compilation</primary></indexterm>
@@ -1180,7 +1153,7 @@ su - postgres
          <indexterm>
           <primary>zlib</primary>
          </indexterm>
-         Prevents use of the <application>Zlib</> library.  This disables
+         Prevents use of the <application>Zlib</application> library.  This disables
          support for compressed archives in <application>pg_dump</application>
          and <application>pg_restore</application>.
          This option is only intended for those rare systems where this
@@ -1215,8 +1188,8 @@ su - postgres
          code coverage testing instrumentation.  When run, they
          generate files in the build directory with code coverage
          metrics.
-         <![%standalone-ignore[See <xref linkend="regress-coverage">
-         for more information.]]> This option is for use only with GCC
+         <phrase condition="standalone-ignore">See <xref linkend="regress-coverage"/>
+         for more information.</phrase> This option is for use only with GCC
          and when doing development work.
         </para>
        </listitem>
@@ -1228,7 +1201,7 @@ su - postgres
         <para>
          If using GCC, all programs and libraries are compiled so they
          can be profiled.  On backend exit, a subdirectory will be created
-         that contains the <filename>gmon.out</> file for use in profiling.
+         that contains the <filename>gmon.out</filename> file for use in profiling.
          This option is for use only with GCC and when doing development work.
         </para>
        </listitem>
@@ -1238,8 +1211,8 @@ su - postgres
        <term><option>--enable-cassert</option></term>
        <listitem>
         <para>
-         Enables <firstterm>assertion</> checks in the server, which test for
-         many <quote>cannot happen</> conditions.  This is invaluable for
+         Enables <firstterm>assertion</firstterm> checks in the server, which test for
+         many <quote>cannot happen</quote> conditions.  This is invaluable for
          code development purposes, but the tests can slow down the
          server significantly.
          Also, having the tests turned on won't necessarily enhance the
@@ -1276,8 +1249,8 @@ su - postgres
          </indexterm>
          Compiles <productname>PostgreSQL</productname> with support for the
          dynamic tracing tool DTrace.
-         <![%standalone-ignore[See <xref linkend="dynamic-trace">
-         for more information.]]>
+         <phrase condition="standalone-ignore">See <xref linkend="dynamic-trace"/>
+         for more information.</phrase>
         </para>
 
         <para>
@@ -1293,7 +1266,7 @@ su - postgres
          can be specified in the environment variable
          <envar>DTRACEFLAGS</envar>.  On Solaris,
          to include DTrace support in a 64-bit binary, you must specify
-         <literal>DTRACEFLAGS="-64"</> to configure.  For example,
+         <literal>DTRACEFLAGS="-64"</literal> to configure.  For example,
          using the GCC compiler:
 <screen>
 ./configure CC='gcc -m64' --enable-dtrace DTRACEFLAGS='-64' ...
@@ -1312,7 +1285,7 @@ su - postgres
         <para>
          Enable tests using the Perl TAP tools.  This requires a Perl
          installation and the Perl module <literal>IPC::Run</literal>.
-         <![%standalone-ignore;[See <xref linkend="regress-tap"> for more information.]]>
+         <phrase condition="standalone-ignore">See <xref linkend="regress-tap"/> for more information.</phrase>
         </para>
        </listitem>
       </varlistentry>
@@ -1322,10 +1295,10 @@ su - postgres
     <para>
      If you prefer a C compiler different from the one
      <filename>configure</filename> picks, you can set the
-     environment variable <envar>CC</> to the program of your choice.
+     environment variable <envar>CC</envar> to the program of your choice.
      By default, <filename>configure</filename> will pick
      <filename>gcc</filename> if available, else the platform's
-     default (usually <filename>cc</>).  Similarly, you can override the
+     default (usually <filename>cc</filename>).  Similarly, you can override the
      default compiler flags if needed with the <envar>CFLAGS</envar> variable.
     </para>
 
@@ -1333,7 +1306,7 @@ su - postgres
      You can specify environment variables on the
      <filename>configure</filename> command line, for example:
 <screen>
-<userinput>./configure CC=/opt/bin/gcc CFLAGS='-O2 -pipe'</>
+<userinput>./configure CC=/opt/bin/gcc CFLAGS='-O2 -pipe'</userinput>
 </screen>
     </para>
 
@@ -1469,9 +1442,7 @@ su - postgres
          whether Python 2 or 3 is specified here (or otherwise
          implicitly chosen) determines which variant of the PL/Python
          language becomes available.  See
-         <![%standalone-include[the <application>PL/Python</>
-         documentation]]>
-         <![%standalone-ignore[<xref linkend="plpython-python23">]]>
+         <xref linkend="plpython-python23"/>
          for more information.
         </para>
        </listitem>
@@ -1502,51 +1473,51 @@ su - postgres
 
     <para>
      Sometimes it is useful to add compiler flags after-the-fact to the set
-     that were chosen by <filename>configure</>.  An important example is
-     that <application>gcc</>'s <option>-Werror</> option cannot be included
-     in the <envar>CFLAGS</envar> passed to <filename>configure</>, because
-     it will break many of <filename>configure</>'s built-in tests.  To add
+     that were chosen by <filename>configure</filename>.  An important example is
+     that <application>gcc</application>'s <option>-Werror</option> option cannot be included
+     in the <envar>CFLAGS</envar> passed to <filename>configure</filename>, because
+     it will break many of <filename>configure</filename>'s built-in tests.  To add
      such flags, include them in the <envar>COPT</envar> environment variable
-     while running <filename>make</>.  The contents of <envar>COPT</envar>
+     while running <filename>make</filename>.  The contents of <envar>COPT</envar>
      are added to both the <envar>CFLAGS</envar> and <envar>LDFLAGS</envar>
-     options set up by <filename>configure</>.  For example, you could do
+     options set up by <filename>configure</filename>.  For example, you could do
 <screen>
-<userinput>make COPT='-Werror'</>
+<userinput>make COPT='-Werror'</userinput>
 </screen>
      or
 <screen>
-<userinput>export COPT='-Werror'</>
-<userinput>make</>
+<userinput>export COPT='-Werror'</userinput>
+<userinput>make</userinput>
 </screen>
     </para>
 
     <note>
      <para>
       When developing code inside the server, it is recommended to
-      use the configure options <option>--enable-cassert</> (which
-      turns on many run-time error checks) and <option>--enable-debug</>
+      use the configure options <option>--enable-cassert</option> (which
+      turns on many run-time error checks) and <option>--enable-debug</option>
       (which improves the usefulness of debugging tools).
      </para>
 
      <para>
       If using GCC, it is best to build with an optimization level of
-      at least <option>-O1</>, because using no optimization
-      (<option>-O0</>) disables some important compiler warnings (such
+      at least <option>-O1</option>, because using no optimization
+      (<option>-O0</option>) disables some important compiler warnings (such
       as the use of uninitialized variables).  However, non-zero
       optimization levels can complicate debugging because stepping
       through compiled code will usually not match up one-to-one with
       source code lines.  If you get confused while trying to debug
       optimized code, recompile the specific files of interest with
-      <option>-O0</>.  An easy way to do this is by passing an option
-      to <application>make</>: <command>make PROFILE=-O0 file.o</>.
+      <option>-O0</option>.  An easy way to do this is by passing an option
+      to <application>make</application>: <command>make PROFILE=-O0 file.o</command>.
      </para>
 
      <para>
-      The <envar>COPT</> and <envar>PROFILE</> environment variables are
-      actually handled identically by the <productname>PostgreSQL</>
+      The <envar>COPT</envar> and <envar>PROFILE</envar> environment variables are
+      actually handled identically by the <productname>PostgreSQL</productname>
       makefiles.  Which to use is a matter of preference, but a common habit
-      among developers is to use <envar>PROFILE</> for one-time flag
-      adjustments, while <envar>COPT</> might be kept set all the time.
+      among developers is to use <envar>PROFILE</envar> for one-time flag
+      adjustments, while <envar>COPT</envar> might be kept set all the time.
      </para>
     </note>
    </step>
@@ -1559,7 +1530,7 @@ su - postgres
 <screen>
 <userinput>make</userinput>
 </screen>
-    (Remember to use <acronym>GNU</> <application>make</>.) The build
+    (Remember to use <acronym>GNU</acronym> <application>make</application>.) The build
     will take a few minutes depending on your
     hardware. The last line displayed should be:
 <screen>
@@ -1591,17 +1562,14 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
    <para>
     If you want to test the newly built server before you install it,
     you can run the regression tests at this point. The regression
-    tests are a test suite to verify that <productname>PostgreSQL</>
+    tests are a test suite to verify that <productname>PostgreSQL</productname>
     runs on your machine in the way the developers expected it
     to. Type:
 <screen>
 <userinput>make check</userinput>
 </screen>
     (This won't work as root; do it as an unprivileged user.)
-    <![%standalone-include[The file
-    <filename>src/test/regress/README</> and the
-    documentation contain]]>
-    <![%standalone-ignore[<xref linkend="regress"> contains]]>
+    See <xref linkend="regress"/> for
     detailed information about interpreting the test results. You can
     repeat this test at any later time by issuing the same command.
    </para>
@@ -1613,20 +1581,19 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
    <note>
     <para>
      If you are upgrading an existing system be sure to read
-     <![%standalone-include[the documentation,]]>
-     <![%standalone-ignore[<xref linkend="upgrading">]]>
+     <xref linkend="upgrading"/>,
      which has instructions about upgrading a
      cluster.
     </para>
    </note>
 
    <para>
-    To install <productname>PostgreSQL</> enter:
+    To install <productname>PostgreSQL</productname> enter:
 <screen>
 <userinput>make install</userinput>
 </screen>
     This will install files into the directories that were specified
-    in <xref linkend="configure">. Make sure that you have appropriate
+    in <xref linkend="configure"/>. Make sure that you have appropriate
     permissions to write into that area. Normally you need to do this
     step as root. Alternatively, you can create the target
     directories in advance and arrange for appropriate permissions to
@@ -1665,8 +1632,8 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
     The standard installation provides all the header files needed for client
     application development as well as for server-side program
     development, such as custom functions or data types written in C.
-    (Prior to <productname>PostgreSQL</> 8.0, a separate <literal>make
-    install-all-headers</> command was needed for the latter, but this
+    (Prior to <productname>PostgreSQL</productname> 8.0, a separate <literal>make
+    install-all-headers</literal> command was needed for the latter, but this
     step has been folded into the standard install.)
    </para>
 
@@ -1676,12 +1643,12 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
      If you want to install only the client applications and
      interface libraries, then you can use these commands:
 <screen>
-<userinput>make -C src/bin install</>
-<userinput>make -C src/include install</>
-<userinput>make -C src/interfaces install</>
-<userinput>make -C doc install</>
+<userinput>make -C src/bin install</userinput>
+<userinput>make -C src/include install</userinput>
+<userinput>make -C src/interfaces install</userinput>
+<userinput>make -C doc install</userinput>
 </screen>
-    <filename>src/bin</> has a few binaries for server-only use,
+    <filename>src/bin</filename> has a few binaries for server-only use,
     but they are small.
     </para>
    </formalpara>
@@ -1692,7 +1659,7 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
    <title>Uninstallation:</title>
    <para>
     To undo the installation use the command <command>make
-    uninstall</>. However, this will not remove any created directories.
+    uninstall</command>. However, this will not remove any created directories.
    </para>
   </formalpara>
 
@@ -1702,10 +1669,10 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
    <para>
     After the installation you can free disk space by removing the built
     files from the source tree with the command <command>make
-    clean</>. This will preserve the files made by the <command>configure</command>
-    program, so that you can rebuild everything with <command>make</>
+    clean</command>. This will preserve the files made by the <command>configure</command>
+    program, so that you can rebuild everything with <command>make</command>
     later on. To reset the source tree to the state in which it was
-    distributed, use <command>make distclean</>. If you are going to
+    distributed, use <command>make distclean</command>. If you are going to
     build for several platforms within the same source tree you must do
     this and re-configure for each platform.  (Alternatively, use
     a separate build tree for each platform, so that the source tree
@@ -1714,10 +1681,10 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
   </formalpara>
 
   <para>
-   If you perform a build and then discover that your <command>configure</>
-   options were wrong, or if you change anything that <command>configure</>
+   If you perform a build and then discover that your <command>configure</command>
+   options were wrong, or if you change anything that <command>configure</command>
    investigates (for example, software upgrades), then it's a good
-   idea to do <command>make distclean</> before reconfiguring and
+   idea to do <command>make distclean</command> before reconfiguring and
    rebuilding.  Without this, your changes in configuration choices
    might not propagate everywhere they need to.
   </para>
@@ -1738,31 +1705,31 @@ PostgreSQL, contrib, and documentation successfully made. Ready to install.
     you need to tell the system how to find the newly installed
     shared libraries.  The systems on which this is
     <emphasis>not</emphasis> necessary include
-    <systemitem class="osname">FreeBSD</>,
-    <systemitem class="osname">HP-UX</>,
-    <systemitem class="osname">Linux</>,
-    <systemitem class="osname">NetBSD</>, <systemitem
-    class="osname">OpenBSD</>, and
-    <systemitem class="osname">Solaris</>.
+    <systemitem class="osname">FreeBSD</systemitem>,
+    <systemitem class="osname">HP-UX</systemitem>,
+    <systemitem class="osname">Linux</systemitem>,
+    <systemitem class="osname">NetBSD</systemitem>, <systemitem
+    class="osname">OpenBSD</systemitem>, and
+    <systemitem class="osname">Solaris</systemitem>.
    </para>
 
    <para>
     The method to set the shared library search path varies between
     platforms, but the most widely-used method is to set the
-    environment variable <envar>LD_LIBRARY_PATH</> like so: In Bourne
-    shells (<command>sh</>, <command>ksh</>, <command>bash</>, <command>zsh</>):
+    environment variable <envar>LD_LIBRARY_PATH</envar> like so: In Bourne
+    shells (<command>sh</command>, <command>ksh</command>, <command>bash</command>, <command>zsh</command>):
 <programlisting>
 LD_LIBRARY_PATH=/usr/local/pgsql/lib
 export LD_LIBRARY_PATH
 </programlisting>
-    or in <command>csh</> or <command>tcsh</>:
+    or in <command>csh</command> or <command>tcsh</command>:
 <programlisting>
 setenv LD_LIBRARY_PATH /usr/local/pgsql/lib
 </programlisting>
-    Replace <literal>/usr/local/pgsql/lib</> with whatever you set
-    <option><literal>--libdir</></> to in <xref linkend="configure">.
+    Replace <literal>/usr/local/pgsql/lib</literal> with whatever you set
+    <option><literal>--libdir</literal></option> to in <xref linkend="configure"/>.
     You should put these commands into a shell start-up file such as
-    <filename>/etc/profile</> or <filename>~/.bash_profile</>.  Some
+    <filename>/etc/profile</filename> or <filename>~/.bash_profile</filename>.  Some
     good information about the caveats associated with this method can
     be found at <ulink
     url="http://xahlee.org/UnixResource_dir/_/ldpath.html"></ulink>.
@@ -1796,17 +1763,17 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
     <indexterm>
      <primary>ldconfig</primary>
     </indexterm>
-    If you are on <systemitem class="osname">Linux</> and you have root
+    If you are on <systemitem class="osname">Linux</systemitem> and you have root
     access, you can run:
 <programlisting>
 /sbin/ldconfig /usr/local/pgsql/lib
 </programlisting>
     (or equivalent directory) after installation to enable the
     run-time linker to find the shared libraries faster.  Refer to the
-    manual page of <command>ldconfig</> for more information.  On
-    <systemitem class="osname">FreeBSD</>, <systemitem
-    class="osname">NetBSD</>, and <systemitem
-    class="osname">OpenBSD</> the command is:
+    manual page of <command>ldconfig</command> for more information.  On
+    <systemitem class="osname">FreeBSD</systemitem>, <systemitem
+    class="osname">NetBSD</systemitem>, and <systemitem
+    class="osname">OpenBSD</systemitem> the command is:
 <programlisting>
 /sbin/ldconfig -m /usr/local/pgsql/lib
 </programlisting>
@@ -1823,24 +1790,24 @@ libpq.so.2.1: cannot open shared object file: No such file or directory
    </indexterm>
 
    <para>
-    If you installed into <filename>/usr/local/pgsql</> or some other
+    If you installed into <filename>/usr/local/pgsql</filename> or some other
     location that is not searched for programs by default, you should
-    add <filename>/usr/local/pgsql/bin</> (or whatever you set
-    <option><literal>--bindir</></> to in <xref linkend="configure">)
-    into your <envar>PATH</>.  Strictly speaking, this is not
-    necessary, but it will make the use of <productname>PostgreSQL</>
+    add <filename>/usr/local/pgsql/bin</filename> (or whatever you set
+    <option><literal>--bindir</literal></option> to in <xref linkend="configure"/>)
+    into your <envar>PATH</envar>.  Strictly speaking, this is not
+    necessary, but it will make the use of <productname>PostgreSQL</productname>
     much more convenient.
    </para>
 
    <para>
     To do this, add the following to your shell start-up file, such as
-    <filename>~/.bash_profile</> (or <filename>/etc/profile</>, if you
+    <filename>~/.bash_profile</filename> (or <filename>/etc/profile</filename>, if you
     want it to affect all users):
 <programlisting>
 PATH=/usr/local/pgsql/bin:$PATH
 export PATH
 </programlisting>
-    If you are using <command>csh</> or <command>tcsh</>, then use this command:
+    If you are using <command>csh</command> or <command>tcsh</command>, then use this command:
 <programlisting>
 set path = ( /usr/local/pgsql/bin $path )
 </programlisting>
@@ -1850,7 +1817,7 @@ set path = ( /usr/local/pgsql/bin $path )
     <indexterm>
      <primary><envar>MANPATH</envar></primary>
     </indexterm>
-    To enable your system to find the <application>man</>
+    To enable your system to find the <application>man</application>
     documentation, you need to add lines like the following to a
     shell start-up file unless you installed into a location that is
     searched by default:
@@ -1861,197 +1828,36 @@ export MANPATH
    </para>
 
    <para>
-    The environment variables <envar>PGHOST</> and <envar>PGPORT</>
+    The environment variables <envar>PGHOST</envar> and <envar>PGPORT</envar>
     specify to client applications the host and port of the database
     server, overriding the compiled-in defaults. If you are going to
     run client applications remotely then it is convenient if every
-    user that plans to use the database sets <envar>PGHOST</>.  This
+    user that plans to use the database sets <envar>PGHOST</envar>.  This
     is not required, however; the settings can be communicated via command
     line options to most client programs.
    </para>
   </sect2>
  </sect1>
 
-
-<![%standalone-include;[
- <sect1 id="install-getting-started">
-  <title>Getting Started</title>
-
-  <para>
-   The following is a quick summary of how to get <productname>PostgreSQL</> up and
-   running once installed. The main documentation contains more information.
-  </para>
-
-  <procedure>
-   <step>
-    <para>
-     Create a user account for the <productname>PostgreSQL</>
-     server. This is the user the server will run as. For production
-     use you should create a separate, unprivileged account
-     (<quote>postgres</> is commonly used). If you do not have root
-     access or just want to play around, your own user account is
-     enough, but running the server as root is a security risk and
-     will not work.
-<screen>
-<userinput>adduser postgres</>
-</screen>
-    </para>
-   </step>
-
-   <step>
-    <para>
-     Create a database installation with the <command>initdb</>
-     command. To run <command>initdb</> you must be logged in to your
-     <productname>PostgreSQL</> server account. It will not work as
-     root.
-<screen>
-root# <userinput>mkdir /usr/local/pgsql/data</>
-root# <userinput>chown postgres /usr/local/pgsql/data</>
-root# <userinput>su - postgres</>
-postgres$ <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</>
-</screen>
-    </para>
-
-    <para>
-     The <option>-D</> option specifies the location where the data
-     will be stored. You can use any path you want, it does not have
-     to be under the installation directory. Just make sure that the
-     server account can write to the directory (or create it, if it
-     doesn't already exist) before starting <command>initdb</>, as
-     illustrated here.
-    </para>
-   </step>
-
-   <step>
-    <para>
-     At this point, if you did not use the <command>initdb</> <literal>-A</>
-     option, you might want to modify <filename>pg_hba.conf</> to control
-     local access to the server before you start it.  The default is to
-     trust all local users.
-    </para>
-   </step>
-
-   <step>
-    <para>
-     The previous <command>initdb</> step should have told you how to
-     start up the database server. Do so now. The command should look
-     something like:
-<programlisting>
-/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data
-</programlisting>
-     This will start the server in the foreground. To put the server
-     in the background use something like:
-<programlisting>
-nohup /usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data \
-    &lt;/dev/null &gt;&gt;server.log 2&gt;&amp;1 &lt;/dev/null &amp;
-</programlisting>
-    </para>
-
-    <para>
-     To stop a server running in the background you can type:
-<programlisting>
-kill `cat /usr/local/pgsql/data/postmaster.pid`
-</programlisting>
-    </para>
-   </step>
-
-   <step>
-    <para>
-     Create a database:
-<screen>
-<userinput>createdb testdb</>
-</screen>
-     Then enter:
-<screen>
-<userinput>psql testdb</>
-</screen>
-     to connect to that database. At the prompt you can enter SQL
-     commands and start experimenting.
-    </para>
-   </step>
-  </procedure>
- </sect1>
-
- <sect1 id="install-whatnow">
-  <title>What Now?</title>
-
-  <para>
-   <itemizedlist>
-    <listitem>
-     <para>
-      The <productname>PostgreSQL</> distribution contains a
-      comprehensive documentation set, which you should read sometime.
-      After installation, the documentation can be accessed by
-      pointing your browser to
-      <filename>/usr/local/pgsql/doc/html/index.html</>, unless you
-      changed the installation directories.
-     </para>
-
-     <para>
-      The first few chapters of the main documentation are the Tutorial,
-      which should be your first reading if you are completely new to
-      <acronym>SQL</> databases.  If you are familiar with database
-      concepts then you want to proceed with part on server
-      administration, which contains information about how to set up
-      the database server, database users, and authentication.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Usually, you will want to modify your computer so that it will
-      automatically start the database server whenever it boots. Some
-      suggestions for this are in the documentation.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      Run the regression tests against the installed server (using
-      <command>make installcheck</command>). If you didn't run the
-      tests before installation, you should definitely do it now. This
-      is also explained in the documentation.
-     </para>
-    </listitem>
-
-    <listitem>
-     <para>
-      By default, <productname>PostgreSQL</> is configured to run on
-      minimal hardware.  This allows it to start up with almost any
-      hardware configuration. The default configuration is, however,
-      not designed for optimum performance. To achieve optimum
-      performance, several server parameters must be adjusted, the two
-      most common being <varname>shared_buffers</varname> and
-      <varname>work_mem</varname>.
-      Other parameters mentioned in the documentation also affect
-      performance.
-     </para>
-    </listitem>
-   </itemizedlist>
-  </para>
- </sect1>
-]]>
-
-
  <sect1 id="supported-platforms">
   <title>Supported Platforms</title>
 
   <para>
    A platform (that is, a CPU architecture and operating system combination)
-   is considered supported by the <productname>PostgreSQL</> development
+   is considered supported by the <productname>PostgreSQL</productname> development
    community if the code contains provisions to work on that platform and
    it has recently been verified to build and pass its regression tests
    on that platform.  Currently, most testing of platform compatibility
    is done automatically by test machines in the
    <ulink url="https://buildfarm.postgresql.org/">PostgreSQL Build Farm</ulink>.
-   If you are interested in using <productname>PostgreSQL</> on a platform
+   If you are interested in using <productname>PostgreSQL</productname> on a platform
    that is not represented in the build farm, but on which the code works
    or can be made to work, you are strongly encouraged to set up a build
    farm member machine so that continued compatibility can be assured.
   </para>
 
   <para>
-   In general, <productname>PostgreSQL</> can be expected to work on
+   In general, <productname>PostgreSQL</productname> can be expected to work on
    these CPU architectures: x86, x86_64, IA64, PowerPC,
    PowerPC 64, S/390, S/390x, Sparc, Sparc 64, ARM, MIPS, MIPSEL,
    and PA-RISC.  Code support exists for M68K, M32R, and VAX, but these
@@ -2061,13 +1867,13 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
   </para>
 
   <para>
-   <productname>PostgreSQL</> can be expected to work on these operating
+   <productname>PostgreSQL</productname> can be expected to work on these operating
    systems: Linux (all recent distributions), Windows (Win2000 SP4 and later),
    FreeBSD, OpenBSD, NetBSD, macOS, AIX, HP/UX, and Solaris.
    Other Unix-like systems may also work but are not currently
    being tested.  In most cases, all CPU architectures supported by
    a given operating system will work.  Look in
-   <xref linkend="installation-platform-notes"> below to see if
+   <xref linkend="installation-platform-notes"/> below to see if
    there is information
    specific to your operating system, particularly if using an older system.
   </para>
@@ -2076,7 +1882,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
    If you have installation problems on a platform that is known
    to be supported according to recent build farm results, please report
    it to <email>pgsql-bugs@postgresql.org</email>.  If you are interested
-   in porting <productname>PostgreSQL</> to a new platform,
+   in porting <productname>PostgreSQL</productname> to a new platform,
    <email>pgsql-hackers@postgresql.org</email> is the appropriate place
    to discuss that.
   </para>
@@ -2089,10 +1895,8 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
    This section documents additional platform-specific issues
    regarding the installation and setup of PostgreSQL.  Be sure to
    read the installation instructions, and in
-   particular <xref linkend="install-requirements"> as well.  Also,
-   check <![%standalone-include[the
-   file <filename>src/test/regress/README</> and the documentation]]>
-   <![%standalone-ignore[<xref linkend="regress">]]> regarding the
+   particular <xref linkend="install-requirements"/> as well.  Also,
+   check <xref linkend="regress"/> regarding the
    interpretation of regression test results.
   </para>
 
@@ -2158,7 +1962,7 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
    <para>
     Use the following <command>configure</command> flags in addition
     to your own if you have installed Readline or libz in
-    <literal>/usr/local</>:
+    <literal>/usr/local</literal>:
     <literal>--with-includes=/usr/local/include
     --with-libraries=/usr/local/lib</literal>.
    </para>
@@ -2211,9 +2015,9 @@ kill `cat /usr/local/pgsql/data/postmaster.pid`
     <title>Internet Address Issues</title>
 
     <para>
-     PostgreSQL relies on the system's <function>getaddrinfo</> function
-     to parse IP addresses in <varname>listen_addresses</>,
-     <filename>pg_hba.conf</>, etc.  Older versions of AIX have assorted
+     PostgreSQL relies on the system's <function>getaddrinfo</function> function
+     to parse IP addresses in <varname>listen_addresses</varname>,
+     <filename>pg_hba.conf</filename>, etc.  Older versions of AIX have assorted
      bugs in this function.  If you have problems related to these settings,
      updating to the appropriate AIX fix level shown above
      should take care of it.
@@ -2359,7 +2163,7 @@ ERROR:  could not load library "/opt/dbs/pgsql/lib/plperl.so": Bad address
     <command>xlc</command> might differ.)  If you omit the export of
     <envar>OBJECT_MODE</envar>, your build may fail with linker errors.  When
     <envar>OBJECT_MODE</envar> is set, it tells AIX's build utilities
-    such as <command>ar</>, <command>as</>, and <command>ld</> what
+    such as <command>ar</command>, <command>as</command>, and <command>ld</command> what
     type of objects to default to handling.
     </para>
 
@@ -2443,7 +2247,7 @@ ERROR:  could not load library "/opt/dbs/pgsql/lib/plperl.so": Bad address
    <para>
     PostgreSQL can be built using Cygwin, a Linux-like environment for
     Windows, but that method is inferior to the native Windows build
-    <![%standalone-ignore[(see <xref linkend="install-windows">)]]> and
+    <phrase condition="standalone-ignore">(see <xref linkend="install-windows"/>)</phrase> and
     running a server under Cygwin is no longer recommended.
    </para>
 
@@ -2567,17 +2371,13 @@ PHSS_30966  s700_800 ld(1) and linker tools cumulative patch
     On general principles you should be current on libc and ld/dld
     patches, as well as compiler patches if you are using HP's C
     compiler.  See HP's support sites such
-    as <ulink url="http://itrc.hp.com"></ulink> and
-    <ulink url="ftp://us-ffs.external.hp.com/"></ulink> for free
+    as <ulink url="ftp://us-ffs.external.hp.com/"></ulink> for free
     copies of their latest patches.
    </para>
 
    <para>
     If you are building on a PA-RISC 2.0 machine and want to have
-    64-bit binaries using GCC, you must use GCC 64-bit version. GCC
-    binaries for HP-UX PA-RISC and Itanium are available from
-    <ulink url="http://www.hp.com/go/gcc"></ulink>.  Don't forget to
-    get and install binutils at the same time.
+    64-bit binaries using GCC, you must use a GCC 64-bit version.
    </para>
 
    <para>
@@ -2641,8 +2441,7 @@ PHSS_30849  s700_800 u2comp/be/plugin library Patch
     Microsoft's <productname>Visual C++</productname> compiler suite.
     The MinGW build variant uses the normal build system described in
     this chapter; the Visual C++ build works completely differently
-    and is described in <![%standalone-include[the
-    documentation]]><![%standalone-ignore[<xref linkend="install-windows">]]>.
+    and is described in <xref linkend="install-windows"/>.
     It is a fully native build and uses no additional software like
     MinGW.  A ready-made installer is available on the main
     PostgreSQL web site.
@@ -2680,10 +2479,10 @@ PHSS_30849  s700_800 u2comp/be/plugin library Patch
 
     <para>
      If PostgreSQL on Windows crashes, it has the ability to generate
-     <productname>minidumps</> that can be used to track down the cause
+     <productname>minidumps</productname> that can be used to track down the cause
      for the crash, similar to core dumps on Unix. These dumps can be
-     read using the <productname>Windows Debugger Tools</> or using
-     <productname>Visual Studio</>. To enable the generation of dumps
+     read using the <productname>Windows Debugger Tools</productname> or using
+     <productname>Visual Studio</productname>. To enable the generation of dumps
      on Windows, create a subdirectory named <filename>crashdumps</filename>
      inside the cluster data directory. The dumps will then be written
      into this directory with a unique name based on the identifier of
@@ -2746,7 +2545,7 @@ PHSS_30849  s700_800 u2comp/be/plugin library Patch
 configure ... LDFLAGS="-R /usr/sfw/lib:/opt/sfw/lib:/usr/local/lib"
 </programlisting>
      See
-     the <citerefentry><refentrytitle>ld</><manvolnum>1</></citerefentry>
+     the <citerefentry><refentrytitle>ld</refentrytitle><manvolnum>1</manvolnum></citerefentry>
      man page for more information.
     </para>
    </sect3>
@@ -2803,11 +2602,8 @@ LIBOBJS = snprintf.o
     <title>Using DTrace for Tracing PostgreSQL</title>
 
     <para>
-     Yes, using DTrace is possible.  See <![%standalone-include[the
-     documentation]]>
-     <![%standalone-ignore[<xref linkend="dynamic-trace">]]> for further
-     information.  You can also find more information in this
-     article: <ulink url="https://blogs.oracle.com/robertlor/entry/user_level_dtrace_probes_in"></ulink>.
+     Yes, using DTrace is possible.  See <xref linkend="dynamic-trace"/> for
+     further information.
     </para>
 
     <para>
diff --git a/doc/src/sgml/intagg.sgml b/doc/src/sgml/intagg.sgml
index 669c901764..c410f64f3e 100644
--- a/doc/src/sgml/intagg.sgml
+++ b/doc/src/sgml/intagg.sgml
@@ -28,10 +28,10 @@
 
  <para>
   The aggregator is an aggregate function
-  <function>int_array_aggregate(integer)</>
+  <function>int_array_aggregate(integer)</function>
   that produces an integer array
   containing exactly the integers it is fed.
-  This is a wrapper around <function>array_agg</>,
+  This is a wrapper around <function>array_agg</function>,
   which does the same thing for any array type.
  </para>
 
@@ -41,10 +41,10 @@
 
  <para>
   The enumerator is a function
-  <function>int_array_enum(integer[])</>
-  that returns <type>setof integer</>.  It is essentially the reverse
+  <function>int_array_enum(integer[])</function>
+  that returns <type>setof integer</type>.  It is essentially the reverse
   operation of the aggregator: given an array of integers, expand it
-  into a set of rows.  This is a wrapper around <function>unnest</>,
+  into a set of rows.  This is a wrapper around <function>unnest</function>,
   which does the same thing for any array type.
  </para>
 
@@ -67,7 +67,7 @@ CREATE TABLE one_to_many(left INT REFERENCES left, right INT REFERENCES right);
 
 <programlisting>
 SELECT right.* from right JOIN one_to_many ON (right.id = one_to_many.right)
-  WHERE one_to_many.left = <replaceable>item</>;
+  WHERE one_to_many.left = <replaceable>item</replaceable>;
 </programlisting>
 
   This will return all the items in the right hand table for an entry
@@ -76,7 +76,7 @@ SELECT right.* from right JOIN one_to_many ON (right.id = one_to_many.right)
 
  <para>
   Now, this methodology can be cumbersome with a very large number of
-  entries in the <structname>one_to_many</> table.  Often,
+  entries in the <structname>one_to_many</structname> table.  Often,
   a join like this would result in an index scan
   and a fetch for each right hand entry in the table for a particular
   left hand entry. If you have a very dynamic system, there is not much you
@@ -95,30 +95,30 @@ CREATE TABLE summary AS
   the array; that's why there is an array enumerator.  You can do
 
 <programlisting>
-SELECT left, int_array_enum(right) FROM summary WHERE left = <replaceable>item</>;
+SELECT left, int_array_enum(right) FROM summary WHERE left = <replaceable>item</replaceable>;
 </programlisting>
 
-  The above query using <function>int_array_enum</> produces the same results
+  The above query using <function>int_array_enum</function> produces the same results
   as
 
 <programlisting>
-SELECT left, right FROM one_to_many WHERE left = <replaceable>item</>;
+SELECT left, right FROM one_to_many WHERE left = <replaceable>item</replaceable>;
 </programlisting>
 
   The difference is that the query against the summary table has to get
   only one row from the table, whereas the direct query against
-  <structname>one_to_many</> must index scan and fetch a row for each entry.
+  <structname>one_to_many</structname> must index scan and fetch a row for each entry.
  </para>
 
  <para>
-  On one system, an <command>EXPLAIN</> showed a query with a cost of 8488 was
+  On one system, an <command>EXPLAIN</command> showed a query with a cost of 8488 was
   reduced to a cost of 329.  The original query was a join involving the
-  <structname>one_to_many</> table, which was replaced by:
+  <structname>one_to_many</structname> table, which was replaced by:
 
 <programlisting>
 SELECT right, count(right) FROM
   ( SELECT left, int_array_enum(right) AS right
-    FROM summary JOIN (SELECT left FROM left_table WHERE left = <replaceable>item</>) AS lefts
+    FROM summary JOIN (SELECT left FROM left_table WHERE left = <replaceable>item</replaceable>) AS lefts
          ON (summary.left = lefts.left)
   ) AS list
   GROUP BY right
diff --git a/doc/src/sgml/intarray.sgml b/doc/src/sgml/intarray.sgml
index ccb1fdecea..b633cf3677 100644
--- a/doc/src/sgml/intarray.sgml
+++ b/doc/src/sgml/intarray.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>intarray</> module provides a number of useful functions
+  The <filename>intarray</filename> module provides a number of useful functions
   and operators for manipulating null-free arrays of integers.
   There is also support for indexed searches using some of the operators.
  </para>
@@ -25,16 +25,16 @@
  </para>
 
  <sect2>
-  <title><filename>intarray</> Functions and Operators</title>
+  <title><filename>intarray</filename> Functions and Operators</title>
 
   <para>
    The functions provided by the <filename>intarray</filename> module
-   are shown in <xref linkend="intarray-func-table">, the operators
-   in <xref linkend="intarray-op-table">.
+   are shown in <xref linkend="intarray-func-table"/>, the operators
+   in <xref linkend="intarray-op-table"/>.
   </para>
 
   <table id="intarray-func-table">
-   <title><filename>intarray</> Functions</title>
+   <title><filename>intarray</filename> Functions</title>
 
    <tgroup cols="5">
     <thead>
@@ -59,7 +59,7 @@
      <row>
       <entry><function>sort(int[], text dir)</function><indexterm><primary>sort</primary></indexterm></entry>
       <entry><type>int[]</type></entry>
-      <entry>sort array &mdash; <parameter>dir</> must be <literal>asc</> or <literal>desc</></entry>
+      <entry>sort array &mdash; <parameter>dir</parameter> must be <literal>asc</literal> or <literal>desc</literal></entry>
       <entry><literal>sort('{1,2,3}'::int[], 'desc')</literal></entry>
       <entry><literal>{3,2,1}</literal></entry>
      </row>
@@ -99,7 +99,7 @@
      <row>
       <entry><function>idx(int[], int item)</function><indexterm><primary>idx</primary></indexterm></entry>
       <entry><type>int</type></entry>
-      <entry>index of first element matching <parameter>item</> (0 if none)</entry>
+      <entry>index of first element matching <parameter>item</parameter> (0 if none)</entry>
       <entry><literal>idx(array[11,22,33,22,11], 22)</literal></entry>
       <entry><literal>2</literal></entry>
      </row>
@@ -107,7 +107,7 @@
      <row>
       <entry><function>subarray(int[], int start, int len)</function><indexterm><primary>subarray</primary></indexterm></entry>
       <entry><type>int[]</type></entry>
-      <entry>portion of array starting at position <parameter>start</>, <parameter>len</> elements</entry>
+      <entry>portion of array starting at position <parameter>start</parameter>, <parameter>len</parameter> elements</entry>
       <entry><literal>subarray('{1,2,3,2,1}'::int[], 2, 3)</literal></entry>
       <entry><literal>{2,3,2}</literal></entry>
      </row>
@@ -115,7 +115,7 @@
      <row>
       <entry><function>subarray(int[], int start)</function></entry>
       <entry><type>int[]</type></entry>
-      <entry>portion of array starting at position <parameter>start</></entry>
+      <entry>portion of array starting at position <parameter>start</parameter></entry>
       <entry><literal>subarray('{1,2,3,2,1}'::int[], 2)</literal></entry>
       <entry><literal>{2,3,2,1}</literal></entry>
      </row>
@@ -133,7 +133,7 @@
   </table>
 
   <table id="intarray-op-table">
-   <title><filename>intarray</> Operators</title>
+   <title><filename>intarray</filename> Operators</title>
 
    <tgroup cols="3">
     <thead>
@@ -148,17 +148,17 @@
      <row>
       <entry><literal>int[] &amp;&amp; int[]</literal></entry>
       <entry><type>boolean</type></entry>
-      <entry>overlap &mdash; <literal>true</> if arrays have at least one common element</entry>
+      <entry>overlap &mdash; <literal>true</literal> if arrays have at least one common element</entry>
      </row>
      <row>
       <entry><literal>int[] @&gt; int[]</literal></entry>
       <entry><type>boolean</type></entry>
-      <entry>contains &mdash; <literal>true</> if left array contains right array</entry>
+      <entry>contains &mdash; <literal>true</literal> if left array contains right array</entry>
      </row>
      <row>
       <entry><literal>int[] &lt;@ int[]</literal></entry>
       <entry><type>boolean</type></entry>
-      <entry>contained &mdash; <literal>true</> if left array is contained in right array</entry>
+      <entry>contained &mdash; <literal>true</literal> if left array is contained in right array</entry>
      </row>
      <row>
       <entry><literal># int[]</literal></entry>
@@ -168,7 +168,7 @@
      <row>
       <entry><literal>int[] # int</literal></entry>
       <entry><type>int</type></entry>
-      <entry>index (same as <function>idx</> function)</entry>
+      <entry>index (same as <function>idx</function> function)</entry>
      </row>
      <row>
       <entry><literal>int[] + int</literal></entry>
@@ -208,28 +208,28 @@
      <row>
       <entry><literal>int[] @@ query_int</literal></entry>
       <entry><type>boolean</type></entry>
-      <entry><literal>true</> if array satisfies query (see below)</entry>
+      <entry><literal>true</literal> if array satisfies query (see below)</entry>
      </row>
      <row>
       <entry><literal>query_int ~~ int[]</literal></entry>
       <entry><type>boolean</type></entry>
-      <entry><literal>true</> if array satisfies query (commutator of <literal>@@</>)</entry>
+      <entry><literal>true</literal> if array satisfies query (commutator of <literal>@@</literal>)</entry>
      </row>
     </tbody>
    </tgroup>
   </table>
 
   <para>
-   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and
-   <literal>&lt;@</> were respectively called <literal>@</> and <literal>~</>.
+   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and
+   <literal>&lt;@</literal> were respectively called <literal>@</literal> and <literal>~</literal>.
    These names are still available, but are deprecated and will eventually be
    retired.  Notice that the old names are reversed from the convention
    formerly followed by the core geometric data types!)
   </para>
 
   <para>
-   The operators <literal>&amp;&amp;</>, <literal>@&gt;</> and
-   <literal>&lt;@</> are equivalent to <productname>PostgreSQL</>'s built-in
+   The operators <literal>&amp;&amp;</literal>, <literal>@&gt;</literal> and
+   <literal>&lt;@</literal> are equivalent to <productname>PostgreSQL</productname>'s built-in
    operators of the same names, except that they work only on integer arrays
    that do not contain nulls, while the built-in operators work for any array
    type.  This restriction makes them faster than the built-in operators
@@ -237,14 +237,14 @@
   </para>
 
   <para>
-   The <literal>@@</> and <literal>~~</> operators test whether an array
-   satisfies a <firstterm>query</>, which is expressed as a value of a
-   specialized data type <type>query_int</>.  A <firstterm>query</>
+   The <literal>@@</literal> and <literal>~~</literal> operators test whether an array
+   satisfies a <firstterm>query</firstterm>, which is expressed as a value of a
+   specialized data type <type>query_int</type>.  A <firstterm>query</firstterm>
    consists of integer values that are checked against the elements of
-   the array, possibly combined using the operators <literal>&amp;</>
-   (AND), <literal>|</> (OR), and <literal>!</> (NOT).  Parentheses
+   the array, possibly combined using the operators <literal>&amp;</literal>
+   (AND), <literal>|</literal> (OR), and <literal>!</literal> (NOT).  Parentheses
    can be used as needed.  For example,
-   the query <literal>1&amp;(2|3)</> matches arrays that contain 1
+   the query <literal>1&amp;(2|3)</literal> matches arrays that contain 1
    and also contain either 2 or 3.
   </para>
  </sect2>
@@ -253,16 +253,16 @@
   <title>Index Support</title>
 
   <para>
-   <filename>intarray</> provides index support for the
-   <literal>&amp;&amp;</>, <literal>@&gt;</>, <literal>&lt;@</>,
-   and <literal>@@</> operators, as well as regular array equality.
+   <filename>intarray</filename> provides index support for the
+   <literal>&amp;&amp;</literal>, <literal>@&gt;</literal>, <literal>&lt;@</literal>,
+   and <literal>@@</literal> operators, as well as regular array equality.
   </para>
 
   <para>
    Two GiST index operator classes are provided:
-   <literal>gist__int_ops</> (used by default) is suitable for
+   <literal>gist__int_ops</literal> (used by default) is suitable for
    small- to medium-size data sets, while
-   <literal>gist__intbig_ops</> uses a larger signature and is more
+   <literal>gist__intbig_ops</literal> uses a larger signature and is more
    suitable for indexing large data sets (i.e., columns containing
    a large number of distinct array values).
    The implementation uses an RD-tree data structure with
@@ -271,7 +271,7 @@
 
   <para>
    There is also a non-default GIN operator class
-   <literal>gin__int_ops</> supporting the same operators.
+   <literal>gin__int_ops</literal> supporting the same operators.
   </para>
 
   <para>
@@ -284,7 +284,7 @@
   <title>Example</title>
 
 <programlisting>
--- a message can be in one or more <quote>sections</>
+-- a message can be in one or more <quote>sections</quote>
 CREATE TABLE message (mid INT PRIMARY KEY, sections INT[], ...);
 
 -- create specialized index
@@ -305,9 +305,9 @@ SELECT message.mid FROM message WHERE message.sections @@ '1&amp;2'::query_int;
   <title>Benchmark</title>
 
   <para>
-   The source directory <filename>contrib/intarray/bench</> contains a
+   The source directory <filename>contrib/intarray/bench</filename> contains a
    benchmark test suite, which can be run against an installed
-   <productname>PostgreSQL</> server.  (It also requires <filename>DBD::Pg</>
+   <productname>PostgreSQL</productname> server.  (It also requires <filename>DBD::Pg</filename>
    to be installed.)  To run:
   </para>
 
@@ -320,7 +320,7 @@ psql -c "CREATE EXTENSION intarray" TEST
 </programlisting>
 
   <para>
-   The <filename>bench.pl</> script has numerous options, which
+   The <filename>bench.pl</filename> script has numerous options, which
    are displayed when it is run without any arguments.
   </para>
  </sect2>
diff --git a/doc/src/sgml/intro.sgml b/doc/src/sgml/intro.sgml
index f0dba6f56f..3038826311 100644
--- a/doc/src/sgml/intro.sgml
+++ b/doc/src/sgml/intro.sgml
@@ -23,22 +23,22 @@
   <itemizedlist>
    <listitem>
     <para>
-     <xref linkend="tutorial"> is an informal introduction for new users.
+     <xref linkend="tutorial"/> is an informal introduction for new users.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     <xref linkend="sql"> documents the <acronym>SQL</acronym> query
+     <xref linkend="sql"/> documents the <acronym>SQL</acronym> query
      language environment, including data types and functions, as well
      as user-level performance tuning.  Every
-     <productname>PostgreSQL</> user should read this.
+     <productname>PostgreSQL</productname> user should read this.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     <xref linkend="admin"> describes the installation and
+     <xref linkend="admin"/> describes the installation and
      administration of the server.  Everyone who runs a
      <productname>PostgreSQL</productname> server, be it for private
      use or for others, should read this part.
@@ -47,7 +47,7 @@
 
    <listitem>
     <para>
-     <xref linkend="client-interfaces"> describes the programming
+     <xref linkend="client-interfaces"/> describes the programming
      interfaces for <productname>PostgreSQL</productname> client
      programs.
     </para>
@@ -56,7 +56,7 @@
 
    <listitem>
     <para>
-     <xref linkend="server-programming"> contains information for
+     <xref linkend="server-programming"/> contains information for
      advanced users about the extensibility capabilities of the
      server.  Topics include user-defined data types and
      functions.
@@ -65,7 +65,7 @@
 
    <listitem>
     <para>
-     <xref linkend="reference"> contains reference information about
+     <xref linkend="reference"/> contains reference information about
      SQL commands, client and server programs.  This part supports
      the other parts with structured information sorted by command or
      program.
@@ -74,8 +74,8 @@
 
    <listitem>
     <para>
-     <xref linkend="internals"> contains assorted information that might be of
-     use to <productname>PostgreSQL</> developers.
+     <xref linkend="internals"/> contains assorted information that might be of
+     use to <productname>PostgreSQL</productname> developers.
     </para>
    </listitem>
   </itemizedlist>
diff --git a/doc/src/sgml/isn.sgml b/doc/src/sgml/isn.sgml
index c1da702df6..34d37ede01 100644
--- a/doc/src/sgml/isn.sgml
+++ b/doc/src/sgml/isn.sgml
@@ -25,7 +25,7 @@
   <title>Data Types</title>
 
   <para>
-   <xref linkend="isn-datatypes"> shows the data types provided by
+   <xref linkend="isn-datatypes"/> shows the data types provided by
    the <filename>isn</filename> module.
   </para>
 
@@ -123,7 +123,7 @@
    </listitem>
    <listitem>
     <para>UPC numbers are a subset of the EAN13 numbers (they are basically
-    EAN13 without the first <literal>0</> digit).</para>
+    EAN13 without the first <literal>0</literal> digit).</para>
    </listitem>
    <listitem>
     <para>All UPC, ISBN, ISMN and ISSN numbers can be represented as EAN13
@@ -139,7 +139,7 @@
   </para>
 
   <para>
-   The <type>ISBN</>, <type>ISMN</>, and <type>ISSN</> types will display the
+   The <type>ISBN</type>, <type>ISMN</type>, and <type>ISSN</type> types will display the
    short version of the number (ISxN 10) whenever it's possible, and will show
    ISxN 13 format for numbers that do not fit in the short version.
    The <type>EAN13</type>, <type>ISBN13</type>, <type>ISMN13</type> and
@@ -152,7 +152,7 @@
   <title>Casts</title>
 
   <para>
-   The <filename>isn</> module provides the following pairs of type casts:
+   The <filename>isn</filename> module provides the following pairs of type casts:
   </para>
 
   <itemizedlist>
@@ -209,7 +209,7 @@
   </itemizedlist>
 
   <para>
-   When casting from <type>EAN13</> to another type, there is a run-time
+   When casting from <type>EAN13</type> to another type, there is a run-time
    check that the value is within the domain of the other type, and an error
    is thrown if not.  The other casts are simply relabelings that will
    always succeed.
@@ -220,15 +220,15 @@
   <title>Functions and Operators</title>
 
   <para>
-   The <filename>isn</> module provides the standard comparison operators,
+   The <filename>isn</filename> module provides the standard comparison operators,
    plus B-tree and hash indexing support for all these data types.  In
-   addition there are several specialized functions; shown in <xref linkend="isn-functions">.
+   addition there are several specialized functions; shown in <xref linkend="isn-functions"/>.
    In this table,
-   <type>isn</> means any one of the module's data types.
+   <type>isn</type> means any one of the module's data types.
   </para>
 
   <table id="isn-functions">
-   <title><filename>isn</> Functions</title>
+   <title><filename>isn</filename> Functions</title>
    <tgroup cols="3">
     <thead>
      <row>
@@ -285,21 +285,21 @@
   <para>
    When you insert invalid numbers in a table using the weak mode, the number
    will be inserted with the corrected check digit, but it will be displayed
-   with an exclamation mark (<literal>!</>) at the end, for example
-   <literal>0-11-000322-5!</>.  This invalid marker can be checked with
-   the <function>is_valid</> function and cleared with the
-   <function>make_valid</> function.
+   with an exclamation mark (<literal>!</literal>) at the end, for example
+   <literal>0-11-000322-5!</literal>.  This invalid marker can be checked with
+   the <function>is_valid</function> function and cleared with the
+   <function>make_valid</function> function.
   </para>
 
   <para>
    You can also force the insertion of invalid numbers even when not in the
-   weak mode, by appending the <literal>!</> character at the end of the
+   weak mode, by appending the <literal>!</literal> character at the end of the
    number.
   </para>
 
   <para>
    Another special feature is that during input, you can write
-   <literal>?</> in place of the check digit, and the correct check digit
+   <literal>?</literal> in place of the check digit, and the correct check digit
    will be inserted automatically.
   </para>
  </sect2>
@@ -384,7 +384,7 @@ SELECT isbn13(id) FROM test;
 
   <para>
    This module was inspired by Garrett A. Wollman's
-   <filename>isbn_issn</> code.
+   <filename>isbn_issn</filename> code.
   </para>
  </sect2>
 
diff --git a/doc/src/sgml/json.sgml b/doc/src/sgml/json.sgml
index 3cf78d6394..731b469613 100644
--- a/doc/src/sgml/json.sgml
+++ b/doc/src/sgml/json.sgml
@@ -1,7 +1,7 @@
 <!-- doc/src/sgml/json.sgml -->
 
 <sect1 id="datatype-json">
- <title><acronym>JSON</> Types</title>
+ <title><acronym>JSON</acronym> Types</title>
 
  <indexterm zone="datatype-json">
   <primary>JSON</primary>
@@ -13,34 +13,34 @@
 
  <para>
   JSON data types are for storing JSON (JavaScript Object Notation)
-  data, as specified in <ulink url="http://rfc7159.net/rfc7159">RFC
+  data, as specified in <ulink url="https://tools.ietf.org/html/rfc7159">RFC
   7159</ulink>. Such data can also be stored as <type>text</type>, but
   the JSON data types have the advantage of enforcing that each
   stored value is valid according to the JSON rules.  There are also
   assorted JSON-specific functions and operators available for data stored
-  in these data types; see <xref linkend="functions-json">.
+  in these data types; see <xref linkend="functions-json"/>.
  </para>
 
  <para>
-  There are two JSON data types: <type>json</> and <type>jsonb</>.
-  They accept <emphasis>almost</> identical sets of values as
+  There are two JSON data types: <type>json</type> and <type>jsonb</type>.
+  They accept <emphasis>almost</emphasis> identical sets of values as
   input.  The major practical difference is one of efficiency.  The
-  <type>json</> data type stores an exact copy of the input text,
+  <type>json</type> data type stores an exact copy of the input text,
   which processing functions must reparse on each execution; while
-  <type>jsonb</> data is stored in a decomposed binary format that
+  <type>jsonb</type> data is stored in a decomposed binary format that
   makes it slightly slower to input due to added conversion
   overhead, but significantly faster to process, since no reparsing
-  is needed.  <type>jsonb</> also supports indexing, which can be a
+  is needed.  <type>jsonb</type> also supports indexing, which can be a
   significant advantage.
  </para>
 
  <para>
-  Because the <type>json</> type stores an exact copy of the input text, it
+  Because the <type>json</type> type stores an exact copy of the input text, it
   will preserve semantically-insignificant white space between tokens, as
   well as the order of keys within JSON objects. Also, if a JSON object
   within the value contains the same key more than once, all the key/value
   pairs are kept.  (The processing functions consider the last value as the
-  operative one.)  By contrast, <type>jsonb</> does not preserve white
+  operative one.)  By contrast, <type>jsonb</type> does not preserve white
   space, does not preserve the order of object keys, and does not keep
   duplicate object keys.  If duplicate keys are specified in the input,
   only the last value is kept.
@@ -48,7 +48,7 @@
 
  <para>
   In general, most applications should prefer to store JSON data as
-  <type>jsonb</>, unless there are quite specialized needs, such as
+  <type>jsonb</type>, unless there are quite specialized needs, such as
   legacy assumptions about ordering of object keys.
  </para>
 
@@ -64,15 +64,15 @@
 
  <para>
   RFC 7159 permits JSON strings to contain Unicode escape sequences
-  denoted by <literal>\u<replaceable>XXXX</></literal>.  In the input
-  function for the <type>json</> type, Unicode escapes are allowed
+  denoted by <literal>\u<replaceable>XXXX</replaceable></literal>.  In the input
+  function for the <type>json</type> type, Unicode escapes are allowed
   regardless of the database encoding, and are checked only for syntactic
-  correctness (that is, that four hex digits follow <literal>\u</>).
-  However, the input function for <type>jsonb</> is stricter: it disallows
-  Unicode escapes for non-ASCII characters (those above <literal>U+007F</>)
-  unless the database encoding is UTF8.  The <type>jsonb</> type also
-  rejects <literal>\u0000</> (because that cannot be represented in
-  <productname>PostgreSQL</productname>'s <type>text</> type), and it insists
+  correctness (that is, that four hex digits follow <literal>\u</literal>).
+  However, the input function for <type>jsonb</type> is stricter: it disallows
+  Unicode escapes for non-ASCII characters (those above <literal>U+007F</literal>)
+  unless the database encoding is UTF8.  The <type>jsonb</type> type also
+  rejects <literal>\u0000</literal> (because that cannot be represented in
+  <productname>PostgreSQL</productname>'s <type>text</type> type), and it insists
   that any use of Unicode surrogate pairs to designate characters outside
   the Unicode Basic Multilingual Plane be correct.  Valid Unicode escapes
   are converted to the equivalent ASCII or UTF8 character for storage;
@@ -82,10 +82,10 @@
  <note>
   <para>
    Many of the JSON processing functions described
-   in <xref linkend="functions-json"> will convert Unicode escapes to
+   in <xref linkend="functions-json"/> will convert Unicode escapes to
    regular characters, and will therefore throw the same types of errors
-   just described even if their input is of type <type>json</>
-   not <type>jsonb</>. The fact that the <type>json</> input function does
+   just described even if their input is of type <type>json</type>
+   not <type>jsonb</type>. The fact that the <type>json</type> input function does
    not make these checks may be considered a historical artifact, although
    it does allow for simple storage (without processing) of JSON Unicode
    escapes in a non-UTF8 database encoding.  In general, it is best to
@@ -95,22 +95,22 @@
  </note>
 
  <para>
-  When converting textual JSON input into <type>jsonb</>, the primitive
-  types described by <acronym>RFC</> 7159 are effectively mapped onto
+  When converting textual JSON input into <type>jsonb</type>, the primitive
+  types described by <acronym>RFC</acronym> 7159 are effectively mapped onto
   native <productname>PostgreSQL</productname> types, as shown
-  in <xref linkend="json-type-mapping-table">.
+  in <xref linkend="json-type-mapping-table"/>.
   Therefore, there are some minor additional constraints on what
   constitutes valid <type>jsonb</type> data that do not apply to
   the <type>json</type> type, nor to JSON in the abstract, corresponding
   to limits on what can be represented by the underlying data type.
-  Notably, <type>jsonb</> will reject numbers that are outside the
-  range of the <productname>PostgreSQL</productname> <type>numeric</> data
-  type, while <type>json</> will not.  Such implementation-defined
-  restrictions are permitted by <acronym>RFC</> 7159.  However, in
+  Notably, <type>jsonb</type> will reject numbers that are outside the
+  range of the <productname>PostgreSQL</productname> <type>numeric</type> data
+  type, while <type>json</type> will not.  Such implementation-defined
+  restrictions are permitted by <acronym>RFC</acronym> 7159.  However, in
   practice such problems are far more likely to occur in other
-  implementations, as it is common to represent JSON's <type>number</>
+  implementations, as it is common to represent JSON's <type>number</type>
   primitive type as IEEE 754 double precision floating point
-  (which <acronym>RFC</> 7159 explicitly anticipates and allows for).
+  (which <acronym>RFC</acronym> 7159 explicitly anticipates and allows for).
   When using JSON as an interchange format with such systems, the danger
   of losing numeric precision compared to data originally stored
   by <productname>PostgreSQL</productname> should be considered.
@@ -134,23 +134,23 @@
       </thead>
       <tbody>
        <row>
-        <entry><type>string</></entry>
-        <entry><type>text</></entry>
-        <entry><literal>\u0000</> is disallowed, as are non-ASCII Unicode
+        <entry><type>string</type></entry>
+        <entry><type>text</type></entry>
+        <entry><literal>\u0000</literal> is disallowed, as are non-ASCII Unicode
          escapes if database encoding is not UTF8</entry>
        </row>
        <row>
-        <entry><type>number</></entry>
-        <entry><type>numeric</></entry>
+        <entry><type>number</type></entry>
+        <entry><type>numeric</type></entry>
         <entry><literal>NaN</literal> and <literal>infinity</literal> values are disallowed</entry>
        </row>
        <row>
-        <entry><type>boolean</></entry>
-        <entry><type>boolean</></entry>
+        <entry><type>boolean</type></entry>
+        <entry><type>boolean</type></entry>
         <entry>Only lowercase <literal>true</literal> and <literal>false</literal> spellings are accepted</entry>
        </row>
        <row>
-        <entry><type>null</></entry>
+        <entry><type>null</type></entry>
         <entry>(none)</entry>
         <entry>SQL <literal>NULL</literal> is a different concept</entry>
        </row>
@@ -162,10 +162,10 @@
   <title>JSON Input and Output Syntax</title>
   <para>
    The input/output syntax for the JSON data types is as specified in
-   <acronym>RFC</> 7159.
+   <acronym>RFC</acronym> 7159.
   </para>
   <para>
-   The following are all valid <type>json</> (or <type>jsonb</>) expressions:
+   The following are all valid <type>json</type> (or <type>jsonb</type>) expressions:
 <programlisting>
 -- Simple scalar/primitive value
 -- Primitive values can be numbers, quoted strings, true, false, or null
@@ -185,8 +185,8 @@ SELECT '{"foo": [true, "bar"], "tags": {"a": 1, "b": null}}'::json;
 
   <para>
    As previously stated, when a JSON value is input and then printed without
-   any additional processing, <type>json</> outputs the same text that was
-   input, while <type>jsonb</> does not preserve semantically-insignificant
+   any additional processing, <type>json</type> outputs the same text that was
+   input, while <type>jsonb</type> does not preserve semantically-insignificant
    details such as whitespace.  For example, note the differences here:
 <programlisting>
 SELECT '{"bar": "baz", "balance": 7.77, "active":false}'::json;
@@ -202,9 +202,9 @@ SELECT '{"bar": "baz", "balance": 7.77, "active":false}'::jsonb;
 (1 row)
 </programlisting>
    One semantically-insignificant detail worth noting is that
-   in <type>jsonb</>, numbers will be printed according to the behavior of the
-   underlying <type>numeric</> type.  In practice this means that numbers
-   entered with <literal>E</> notation will be printed without it, for
+   in <type>jsonb</type>, numbers will be printed according to the behavior of the
+   underlying <type>numeric</type> type.  In practice this means that numbers
+   entered with <literal>E</literal> notation will be printed without it, for
    example:
 <programlisting>
 SELECT '{"reading": 1.230e-5}'::json, '{"reading": 1.230e-5}'::jsonb;
@@ -213,7 +213,7 @@ SELECT '{"reading": 1.230e-5}'::json, '{"reading": 1.230e-5}'::jsonb;
  {"reading": 1.230e-5} | {"reading": 0.00001230}
 (1 row)
 </programlisting>
-   However, <type>jsonb</> will preserve trailing fractional zeroes, as seen
+   However, <type>jsonb</type> will preserve trailing fractional zeroes, as seen
    in this example, even though those are semantically insignificant for
    purposes such as equality checks.
   </para>
@@ -231,7 +231,7 @@ SELECT '{"reading": 1.230e-5}'::json, '{"reading": 1.230e-5}'::jsonb;
    have a somewhat fixed structure.  The structure is typically
    unenforced (though enforcing some business rules declaratively is
    possible), but having a predictable structure makes it easier to write
-   queries that usefully summarize a set of <quote>documents</> (datums)
+   queries that usefully summarize a set of <quote>documents</quote> (datums)
    in a table.
   </para>
   <para>
@@ -249,7 +249,7 @@ SELECT '{"reading": 1.230e-5}'::json, '{"reading": 1.230e-5}'::jsonb;
  </sect2>
 
  <sect2 id="json-containment">
-  <title><type>jsonb</> Containment and Existence</title>
+  <title><type>jsonb</type> Containment and Existence</title>
   <indexterm>
     <primary>jsonb</primary>
     <secondary>containment</secondary>
@@ -259,10 +259,10 @@ SELECT '{"reading": 1.230e-5}'::json, '{"reading": 1.230e-5}'::jsonb;
     <secondary>existence</secondary>
   </indexterm>
   <para>
-    Testing <firstterm>containment</> is an important capability of
-    <type>jsonb</>.  There is no parallel set of facilities for the
-    <type>json</> type.  Containment tests whether
-    one <type>jsonb</> document has contained within it another one.
+    Testing <firstterm>containment</firstterm> is an important capability of
+    <type>jsonb</type>.  There is no parallel set of facilities for the
+    <type>json</type> type.  Containment tests whether
+    one <type>jsonb</type> document has contained within it another one.
     These examples return true except as noted:
   </para>
 <programlisting>
@@ -282,7 +282,7 @@ SELECT '[1, 2, 3]'::jsonb @&gt; '[1, 2, 2]'::jsonb;
 -- within the object on the left side:
 SELECT '{"product": "PostgreSQL", "version": 9.4, "jsonb": true}'::jsonb @&gt; '{"version": 9.4}'::jsonb;
 
--- The array on the right side is <emphasis>not</> considered contained within the
+-- The array on the right side is <emphasis>not</emphasis> considered contained within the
 -- array on the left, even though a similar array is nested within it:
 SELECT '[1, 2, [1, 3]]'::jsonb @&gt; '[1, 3]'::jsonb;  -- yields false
 
@@ -319,10 +319,10 @@ SELECT '"bar"'::jsonb @&gt; '["bar"]'::jsonb;  -- yields false
 </programlisting>
 
   <para>
-    <type>jsonb</> also has an <firstterm>existence</> operator, which is
+    <type>jsonb</type> also has an <firstterm>existence</firstterm> operator, which is
     a variation on the theme of containment: it tests whether a string
-    (given as a <type>text</> value) appears as an object key or array
-    element at the top level of the <type>jsonb</> value.
+    (given as a <type>text</type> value) appears as an object key or array
+    element at the top level of the <type>jsonb</type> value.
     These examples return true except as noted:
   </para>
 <programlisting>
@@ -353,11 +353,11 @@ SELECT '"foo"'::jsonb ? 'foo';
    <para>
     Because JSON containment is nested, an appropriate query can skip
     explicit selection of sub-objects.  As an example, suppose that we have
-    a <structfield>doc</> column containing objects at the top level, with
-    most objects containing <literal>tags</> fields that contain arrays of
+    a <structfield>doc</structfield> column containing objects at the top level, with
+    most objects containing <literal>tags</literal> fields that contain arrays of
     sub-objects.  This query finds entries in which sub-objects containing
-    both <literal>"term":"paris"</> and <literal>"term":"food"</> appear,
-    while ignoring any such keys outside the <literal>tags</> array:
+    both <literal>"term":"paris"</literal> and <literal>"term":"food"</literal> appear,
+    while ignoring any such keys outside the <literal>tags</literal> array:
 <programlisting>
 SELECT doc-&gt;'site_name' FROM websites
   WHERE doc @&gt; '{"tags":[{"term":"paris"}, {"term":"food"}]}';
@@ -380,12 +380,12 @@ SELECT doc-&gt;'site_name' FROM websites
   <para>
     The various containment and existence operators, along with all other
     JSON operators and functions are documented
-    in <xref linkend="functions-json">.
+    in <xref linkend="functions-json"/>.
   </para>
  </sect2>
 
  <sect2 id="json-indexing">
-  <title><type>jsonb</> Indexing</title>
+  <title><type>jsonb</type> Indexing</title>
   <indexterm>
     <primary>jsonb</primary>
     <secondary>indexes on</secondary>
@@ -394,23 +394,23 @@ SELECT doc-&gt;'site_name' FROM websites
   <para>
     GIN indexes can be used to efficiently search for
     keys or key/value pairs occurring within a large number of
-    <type>jsonb</> documents (datums).
-    Two GIN <quote>operator classes</> are provided, offering different
+    <type>jsonb</type> documents (datums).
+    Two GIN <quote>operator classes</quote> are provided, offering different
     performance and flexibility trade-offs.
   </para>
   <para>
-    The default GIN operator class for <type>jsonb</> supports queries with
-    top-level key-exists operators <literal>?</>, <literal>?&amp;</>
-    and <literal>?|</> operators and path/value-exists operator
-    <literal>@&gt;</>.
+    The default GIN operator class for <type>jsonb</type> supports queries with
+    top-level key-exists operators <literal>?</literal>, <literal>?&amp;</literal>
+    and <literal>?|</literal> operators and path/value-exists operator
+    <literal>@&gt;</literal>.
     (For details of the semantics that these operators
-    implement, see <xref linkend="functions-jsonb-op-table">.)
+    implement, see <xref linkend="functions-jsonb-op-table"/>.)
     An example of creating an index with this operator class is:
 <programlisting>
 CREATE INDEX idxgin ON api USING GIN (jdoc);
 </programlisting>
-    The non-default GIN operator class <literal>jsonb_path_ops</>
-    supports indexing the <literal>@&gt;</> operator only.
+    The non-default GIN operator class <literal>jsonb_path_ops</literal>
+    supports indexing the <literal>@&gt;</literal> operator only.
     An example of creating an index with this operator class is:
 <programlisting>
 CREATE INDEX idxginp ON api USING GIN (jdoc jsonb_path_ops);
@@ -438,8 +438,8 @@ CREATE INDEX idxginp ON api USING GIN (jdoc jsonb_path_ops);
     ]
 }
 </programlisting>
-    We store these documents in a table named <structname>api</>,
-    in a <type>jsonb</> column named <structfield>jdoc</>.
+    We store these documents in a table named <structname>api</structname>,
+    in a <type>jsonb</type> column named <structfield>jdoc</structfield>.
     If a GIN index is created on this column,
     queries like the following can make use of the index:
 <programlisting>
@@ -447,25 +447,25 @@ CREATE INDEX idxginp ON api USING GIN (jdoc jsonb_path_ops);
 SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"company": "Magnafone"}';
 </programlisting>
     However, the index could not be used for queries like the
-    following, because though the operator <literal>?</> is indexable,
-    it is not applied directly to the indexed column <structfield>jdoc</>:
+    following, because though the operator <literal>?</literal> is indexable,
+    it is not applied directly to the indexed column <structfield>jdoc</structfield>:
 <programlisting>
 -- Find documents in which the key "tags" contains key or array element "qui"
 SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc -&gt; 'tags' ? 'qui';
 </programlisting>
     Still, with appropriate use of expression indexes, the above
     query can use an index.  If querying for particular items within
-    the <literal>"tags"</> key is common, defining an index like this
+    the <literal>"tags"</literal> key is common, defining an index like this
     may be worthwhile:
 <programlisting>
 CREATE INDEX idxgintags ON api USING GIN ((jdoc -&gt; 'tags'));
 </programlisting>
-    Now, the <literal>WHERE</> clause <literal>jdoc -&gt; 'tags' ? 'qui'</>
+    Now, the <literal>WHERE</literal> clause <literal>jdoc -&gt; 'tags' ? 'qui'</literal>
     will be recognized as an application of the indexable
-    operator <literal>?</> to the indexed
-    expression <literal>jdoc -&gt; 'tags'</>.
+    operator <literal>?</literal> to the indexed
+    expression <literal>jdoc -&gt; 'tags'</literal>.
     (More information on expression indexes can be found in <xref
-    linkend="indexes-expressional">.)
+    linkend="indexes-expressional"/>.)
   </para>
   <para>
     Another approach to querying is to exploit containment, for example:
@@ -473,11 +473,11 @@ CREATE INDEX idxgintags ON api USING GIN ((jdoc -&gt; 'tags'));
 -- Find documents in which the key "tags" contains array element "qui"
 SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"tags": ["qui"]}';
 </programlisting>
-    A simple GIN index on the <structfield>jdoc</> column can support this
+    A simple GIN index on the <structfield>jdoc</structfield> column can support this
     query.  But note that such an index will store copies of every key and
-    value in the <structfield>jdoc</> column, whereas the expression index
+    value in the <structfield>jdoc</structfield> column, whereas the expression index
     of the previous example stores only data found under
-    the <literal>tags</> key.  While the simple-index approach is far more
+    the <literal>tags</literal> key.  While the simple-index approach is far more
     flexible (since it supports queries about any key), targeted expression
     indexes are likely to be smaller and faster to search than a simple
     index.
@@ -485,7 +485,7 @@ SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"tags": ["qu
 
   <para>
     Although the <literal>jsonb_path_ops</literal> operator class supports
-    only queries with the <literal>@&gt;</> operator, it has notable
+    only queries with the <literal>@&gt;</literal> operator, it has notable
     performance advantages over the default operator
     class <literal>jsonb_ops</literal>.  A <literal>jsonb_path_ops</literal>
     index is usually much smaller than a <literal>jsonb_ops</literal>
@@ -503,7 +503,7 @@ SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"tags": ["qu
     data.
     <footnote>
      <para>
-      For this purpose, the term <quote>value</> includes array elements,
+      For this purpose, the term <quote>value</quote> includes array elements,
       though JSON terminology sometimes considers array elements distinct
       from values within objects.
      </para>
@@ -511,13 +511,13 @@ SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"tags": ["qu
     Basically, each <literal>jsonb_path_ops</literal> index item is
     a hash of the value and the key(s) leading to it; for example to index
     <literal>{"foo": {"bar": "baz"}}</literal>, a single index item would
-    be created incorporating all three of <literal>foo</>, <literal>bar</>,
-    and <literal>baz</> into the hash value.  Thus a containment query
+    be created incorporating all three of <literal>foo</literal>, <literal>bar</literal>,
+    and <literal>baz</literal> into the hash value.  Thus a containment query
     looking for this structure would result in an extremely specific index
-    search; but there is no way at all to find out whether <literal>foo</>
+    search; but there is no way at all to find out whether <literal>foo</literal>
     appears as a key.  On the other hand, a <literal>jsonb_ops</literal>
-    index would create three index items representing <literal>foo</>,
-    <literal>bar</>, and <literal>baz</> separately; then to do the
+    index would create three index items representing <literal>foo</literal>,
+    <literal>bar</literal>, and <literal>baz</literal> separately; then to do the
     containment query, it would look for rows containing all three of
     these items.  While GIN indexes can perform such an AND search fairly
     efficiently, it will still be less specific and slower than the
@@ -531,15 +531,15 @@ SELECT jdoc-&gt;'guid', jdoc-&gt;'name' FROM api WHERE jdoc @&gt; '{"tags": ["qu
     that it produces no index entries for JSON structures not containing
     any values, such as <literal>{"a": {}}</literal>.  If a search for
     documents containing such a structure is requested, it will require a
-    full-index scan, which is quite slow.  <literal>jsonb_path_ops</> is
+    full-index scan, which is quite slow.  <literal>jsonb_path_ops</literal> is
     therefore ill-suited for applications that often perform such searches.
   </para>
 
   <para>
-    <type>jsonb</> also supports <literal>btree</> and <literal>hash</>
+    <type>jsonb</type> also supports <literal>btree</literal> and <literal>hash</literal>
     indexes.  These are usually useful only if it's important to check
     equality of complete JSON documents.
-    The <literal>btree</> ordering for <type>jsonb</> datums is seldom
+    The <literal>btree</literal> ordering for <type>jsonb</type> datums is seldom
     of great interest, but for completeness it is:
 <synopsis>
 <replaceable>Object</replaceable> > <replaceable>Array</replaceable> > <replaceable>Boolean</replaceable> > <replaceable>Number</replaceable> > <replaceable>String</replaceable> > <replaceable>Null</replaceable>
diff --git a/doc/src/sgml/keywords.sgml b/doc/src/sgml/keywords.sgml
index 01bc9b47b1..2dba7adedf 100644
--- a/doc/src/sgml/keywords.sgml
+++ b/doc/src/sgml/keywords.sgml
@@ -9,10 +9,10 @@
  </indexterm>
 
  <para>
-  <xref linkend="keywords-table"> lists all tokens that are key words
+  <xref linkend="keywords-table"/> lists all tokens that are key words
   in the SQL standard and in <productname>PostgreSQL</productname>
   &version;.  Background information can be found in <xref
-  linkend="sql-syntax-identifiers">.
+  linkend="sql-syntax-identifiers"/>.
   (For space reasons, only the latest two versions of the SQL standard, and
   SQL-92 for historical comparison, are included.  The differences between
   those and the other intermediate standard versions are small.)
@@ -45,7 +45,7 @@
  </para>
 
  <para>
-  In <xref linkend="keywords-table"> in the column for
+  In <xref linkend="keywords-table"/> in the column for
   <productname>PostgreSQL</productname> we classify as
   <quote>non-reserved</quote> those key words that are explicitly
   known to the parser but are allowed as column or table names.
@@ -69,7 +69,7 @@
 
  <para>
   It is important to understand before studying <xref
-  linkend="keywords-table"> that the fact that a key word is not
+  linkend="keywords-table"/> that the fact that a key word is not
   reserved in <productname>PostgreSQL</productname> does not mean that
   the feature related to the word is not implemented.  Conversely, the
   presence of a key word does not indicate the existence of a feature.
diff --git a/doc/src/sgml/legal.sgml b/doc/src/sgml/legal.sgml
index 67ef88b2ff..fd5cda30b7 100644
--- a/doc/src/sgml/legal.sgml
+++ b/doc/src/sgml/legal.sgml
@@ -1,9 +1,9 @@
 <!-- doc/src/sgml/legal.sgml -->
 
-<date>2017</date>
+<date>2018</date>
 
 <copyright>
- <year>1996-2017</year>
+ <year>1996-2018</year>
  <holder>The PostgreSQL Global Development Group</holder>
 </copyright>
 
@@ -11,7 +11,7 @@
  <title>Legal Notice</title>
 
  <para>
-  <productname>PostgreSQL</productname> is Copyright &copy; 1996-2017
+  <productname>PostgreSQL</productname> is Copyright &copy; 1996-2018
   by the PostgreSQL Global Development Group.
  </para>
 
diff --git a/doc/src/sgml/libpq.sgml b/doc/src/sgml/libpq.sgml
index ad5e9b95b4..2a8e1f2e07 100644
--- a/doc/src/sgml/libpq.sgml
+++ b/doc/src/sgml/libpq.sgml
@@ -13,27 +13,27 @@
 
  <para>
   <application>libpq</application> is the <acronym>C</acronym>
-  application programmer's interface to <productname>PostgreSQL</>.
-  <application>libpq</> is a set of library functions that allow
-  client programs to pass queries to the <productname>PostgreSQL</>
+  application programmer's interface to <productname>PostgreSQL</productname>.
+  <application>libpq</application> is a set of library functions that allow
+  client programs to pass queries to the <productname>PostgreSQL</productname>
   backend server and to receive the results of these queries.
  </para>
 
  <para>
-  <application>libpq</> is also the underlying engine for several
-  other <productname>PostgreSQL</> application interfaces, including
-  those written for C++, Perl, Python, Tcl and <application>ECPG</>.
-  So some aspects of <application>libpq</>'s behavior will be
+  <application>libpq</application> is also the underlying engine for several
+  other <productname>PostgreSQL</productname> application interfaces, including
+  those written for C++, Perl, Python, Tcl and <application>ECPG</application>.
+  So some aspects of <application>libpq</application>'s behavior will be
   important to you if you use one of those packages.  In particular,
-  <xref linkend="libpq-envars">,
-  <xref linkend="libpq-pgpass"> and
-  <xref linkend="libpq-ssl">
+  <xref linkend="libpq-envars"/>,
+  <xref linkend="libpq-pgpass"/> and
+  <xref linkend="libpq-ssl"/>
   describe behavior that is visible to the user of any application
-  that uses <application>libpq</>.
+  that uses <application>libpq</application>.
  </para>
 
  <para>
-  Some short programs are included at the end of this chapter (<xref linkend="libpq-example">) to show how
+  Some short programs are included at the end of this chapter (<xref linkend="libpq-example"/>) to show how
   to write programs that use <application>libpq</application>.  There are also several
   complete examples of <application>libpq</application> applications in the
   directory <filename>src/test/examples</filename> in the source code distribution.
@@ -42,7 +42,7 @@
  <para>
   Client programs that use <application>libpq</application> must
   include the header file
-  <filename>libpq-fe.h</filename><indexterm><primary>libpq-fe.h</></>
+  <filename>libpq-fe.h</filename><indexterm><primary>libpq-fe.h</primary></indexterm>
   and must link with the <application>libpq</application> library.
  </para>
 
@@ -55,22 +55,38 @@
    application program can have several backend connections open at
    one time.  (One reason to do that is to access more than one
    database.)  Each connection is represented by a
-   <structname>PGconn</><indexterm><primary>PGconn</></> object, which
-   is obtained from the function <function>PQconnectdb</>,
-   <function>PQconnectdbParams</>, or
-   <function>PQsetdbLogin</>.  Note that these functions will always
+   <structname>PGconn</structname><indexterm><primary>PGconn</primary></indexterm> object, which
+   is obtained from the function <function>PQconnectdb</function>,
+   <function>PQconnectdbParams</function>, or
+   <function>PQsetdbLogin</function>.  Note that these functions will always
    return a non-null object pointer, unless perhaps there is too
-   little memory even to allocate the <structname>PGconn</> object.
-   The <function>PQstatus</> function should be called to check
+   little memory even to allocate the <structname>PGconn</structname> object.
+   The <function>PQstatus</function> function should be called to check
    the return value for a successful connection before queries are sent
    via the connection object.
 
+   <warning>
+    <para>
+     If untrusted users have access to a database that has not adopted a
+     <link linkend="ddl-schemas-patterns">secure schema usage pattern</link>,
+     begin each session by removing publicly-writable schemas from
+     <varname>search_path</varname>.  One can set parameter key
+     word <literal>options</literal> to
+     value <literal>-csearch_path=</literal>.  Alternately, one can
+     issue <literal>PQexec(<replaceable>conn</replaceable>, "SELECT
+     pg_catalog.set_config('search_path', '', false)")</literal> after
+     connecting.  This consideration is not specific
+     to <application>libpq</application>; it applies to every interface for
+     executing arbitrary SQL commands.
+    </para>
+   </warning>
+
    <warning>
     <para>
      On Unix, forking a process with open libpq connections can lead to
      unpredictable results because the parent and child processes share
      the same sockets and operating system resources.  For this reason,
-     such usage is not recommended, though doing an <function>exec</> from
+     such usage is not recommended, though doing an <function>exec</function> from
      the child process to load a new executable is safe.
     </para>
    </warning>
@@ -79,20 +95,20 @@
     <para>
      On Windows, there is a way to improve performance if a single
      database connection is repeatedly started and shutdown.  Internally,
-     libpq calls <function>WSAStartup()</> and <function>WSACleanup()</> for connection startup
-     and shutdown, respectively.  <function>WSAStartup()</> increments an internal
-     Windows library reference count which is decremented by <function>WSACleanup()</>.
-     When the reference count is just one, calling <function>WSACleanup()</> frees
+     libpq calls <function>WSAStartup()</function> and <function>WSACleanup()</function> for connection startup
+     and shutdown, respectively.  <function>WSAStartup()</function> increments an internal
+     Windows library reference count which is decremented by <function>WSACleanup()</function>.
+     When the reference count is just one, calling <function>WSACleanup()</function> frees
      all resources and all DLLs are unloaded.  This is an expensive
      operation.  To avoid this, an application can manually call
-     <function>WSAStartup()</> so resources will not be freed when the last database
+     <function>WSAStartup()</function> so resources will not be freed when the last database
      connection is closed.
     </para>
    </note>
 
    <variablelist>
     <varlistentry id="libpq-pqconnectdbparams">
-     <term><function>PQconnectdbParams</function><indexterm><primary>PQconnectdbParams</></></term>
+     <term><function>PQconnectdbParams</function><indexterm><primary>PQconnectdbParams</primary></indexterm></term>
      <listitem>
       <para>
        Makes a new connection to the database server.
@@ -109,16 +125,16 @@ PGconn *PQconnectdbParams(const char * const *keywords,
        from two <symbol>NULL</symbol>-terminated arrays. The first,
        <literal>keywords</literal>, is defined as an array of strings, each one
        being a key word. The second, <literal>values</literal>, gives the value
-       for each key word. Unlike <function>PQsetdbLogin</> below, the parameter
+       for each key word. Unlike <function>PQsetdbLogin</function> below, the parameter
        set can be extended without changing the function signature, so use of
-       this function (or its nonblocking analogs <function>PQconnectStartParams</>
+       this function (or its nonblocking analogs <function>PQconnectStartParams</function>
        and <function>PQconnectPoll</function>) is preferred for new application
        programming.
       </para>
 
       <para>
        The currently recognized parameter key words are listed in
-       <xref linkend="libpq-paramkeywords">.
+       <xref linkend="libpq-paramkeywords"/>.
       </para>
 
       <para>
@@ -128,7 +144,7 @@ PGconn *PQconnectdbParams(const char * const *keywords,
        <parameter>dbname</parameter> is expanded this way, any subsequent
        <parameter>dbname</parameter> value is processed as plain database name. More
        details on the possible connection string formats appear in
-       <xref linkend="libpq-connstring">.
+       <xref linkend="libpq-connstring"/>.
       </para>
 
       <para>
@@ -140,7 +156,7 @@ PGconn *PQconnectdbParams(const char * const *keywords,
 
       <para>
        If  any  parameter is <symbol>NULL</symbol> or an empty string, the corresponding
-       environment variable (see <xref linkend="libpq-envars">) is checked.
+       environment variable (see <xref linkend="libpq-envars"/>) is checked.
        If the  environment  variable is not set either, then the indicated
        built-in defaults are used.
       </para>
@@ -157,7 +173,7 @@ PGconn *PQconnectdbParams(const char * const *keywords,
     </varlistentry>
 
     <varlistentry id="libpq-pqconnectdb">
-     <term><function>PQconnectdb</function><indexterm><primary>PQconnectdb</></></term>
+     <term><function>PQconnectdb</function><indexterm><primary>PQconnectdb</primary></indexterm></term>
      <listitem>
       <para>
        Makes a new connection to the database server.
@@ -176,7 +192,7 @@ PGconn *PQconnectdb(const char *conninfo);
        The passed string can be empty to use all default parameters, or it can
        contain one or more parameter settings separated by whitespace,
        or it can contain a <acronym>URI</acronym>.
-       See <xref linkend="libpq-connstring"> for details.
+       See <xref linkend="libpq-connstring"/> for details.
      </para>
 
 
@@ -184,7 +200,7 @@ PGconn *PQconnectdb(const char *conninfo);
     </varlistentry>
 
     <varlistentry id="libpq-pqsetdblogin">
-     <term><function>PQsetdbLogin</function><indexterm><primary>PQsetdbLogin</></></term>
+     <term><function>PQsetdbLogin</function><indexterm><primary>PQsetdbLogin</primary></indexterm></term>
      <listitem>
       <para>
        Makes a new connection to the database server.
@@ -211,13 +227,13 @@ PGconn *PQsetdbLogin(const char *pghost,
         an <symbol>=</symbol> sign or has a valid connection <acronym>URI</acronym> prefix, it
         is taken as a <parameter>conninfo</parameter> string in exactly the same way as
         if it had been passed to <function>PQconnectdb</function>, and the remaining
-        parameters are then applied as specified for <function>PQconnectdbParams</>.
+        parameters are then applied as specified for <function>PQconnectdbParams</function>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqsetdb">
-     <term><function>PQsetdb</function><indexterm><primary>PQsetdb</></></term>
+     <term><function>PQsetdb</function><indexterm><primary>PQsetdb</primary></indexterm></term>
      <listitem>
       <para>
    Makes a new connection to the database server.
@@ -232,16 +248,16 @@ PGconn *PQsetdb(char *pghost,
 
      <para>
       This is a macro that calls <function>PQsetdbLogin</function> with null pointers
-      for the <parameter>login</> and <parameter>pwd</> parameters.  It is provided
+      for the <parameter>login</parameter> and <parameter>pwd</parameter> parameters.  It is provided
       for backward compatibility with very old programs.
      </para>
      </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqconnectstartparams">
-     <term><function>PQconnectStartParams</function><indexterm><primary>PQconnectStartParams</></></term>
-     <term><function>PQconnectStart</function><indexterm><primary>PQconnectStart</></></term>
-     <term><function>PQconnectPoll</function><indexterm><primary>PQconnectPoll</></></term>
+     <term><function>PQconnectStartParams</function><indexterm><primary>PQconnectStartParams</primary></indexterm></term>
+     <term><function>PQconnectStart</function><indexterm><primary>PQconnectStart</primary></indexterm></term>
+     <term><function>PQconnectPoll</function><indexterm><primary>PQconnectPoll</primary></indexterm></term>
      <listitem>
       <para>
        <indexterm><primary>nonblocking connection</primary></indexterm>
@@ -263,7 +279,7 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
        that your application's thread of execution is not blocked on remote I/O
        whilst doing so. The point of this approach is that the waits for I/O to
        complete can occur in the application's main loop, rather than down inside
-       <function>PQconnectdbParams</> or <function>PQconnectdb</>, and so the
+       <function>PQconnectdbParams</function> or <function>PQconnectdb</function>, and so the
        application can manage this operation in parallel with other activities.
       </para>
 
@@ -287,9 +303,9 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
        <itemizedlist>
         <listitem>
          <para>
-          The <literal>hostaddr</> and <literal>host</> parameters are used appropriately to ensure that
+          The <literal>hostaddr</literal> and <literal>host</literal> parameters are used appropriately to ensure that
           name and reverse name queries are not made. See the documentation of
-          these parameters in <xref linkend="libpq-paramkeywords"> for details.
+          these parameters in <xref linkend="libpq-paramkeywords"/> for details.
          </para>
         </listitem>
 
@@ -310,27 +326,27 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
       </para>
 
       <para>
-       Note: use of <function>PQconnectStartParams</> is analogous to
-       <function>PQconnectStart</> shown below.
+       Note: use of <function>PQconnectStartParams</function> is analogous to
+       <function>PQconnectStart</function> shown below.
       </para>
 
       <para>
-       To begin a nonblocking connection request, call <literal>conn = PQconnectStart("<replaceable>connection_info_string</>")</literal>.
-       If <varname>conn</varname> is null, then <application>libpq</> has been unable to allocate a new <structname>PGconn</>
-       structure. Otherwise, a valid <structname>PGconn</> pointer is returned (though not yet
+       To begin a nonblocking connection request, call <literal>conn = PQconnectStart("<replaceable>connection_info_string</replaceable>")</literal>.
+       If <varname>conn</varname> is null, then <application>libpq</application> has been unable to allocate a new <structname>PGconn</structname>
+       structure. Otherwise, a valid <structname>PGconn</structname> pointer is returned (though not yet
        representing a valid connection to the database). On return from
        <function>PQconnectStart</function>, call <literal>status = PQstatus(conn)</literal>. If <varname>status</varname> equals
        <symbol>CONNECTION_BAD</symbol>, <function>PQconnectStart</function> has failed.
       </para>
 
       <para>
-       If <function>PQconnectStart</> succeeds, the next stage is to poll
-       <application>libpq</> so that it can proceed with the connection sequence.
+       If <function>PQconnectStart</function> succeeds, the next stage is to poll
+       <application>libpq</application> so that it can proceed with the connection sequence.
        Use <function>PQsocket(conn)</function> to obtain the descriptor of the
        socket underlying the database connection.
        Loop thus: If <function>PQconnectPoll(conn)</function> last returned
        <symbol>PGRES_POLLING_READING</symbol>, wait until the socket is ready to
-       read (as indicated by <function>select()</>, <function>poll()</>, or
+       read (as indicated by <function>select()</function>, <function>poll()</function>, or
        similar system function).
        Then call <function>PQconnectPoll(conn)</function> again.
        Conversely, if <function>PQconnectPoll(conn)</function> last returned
@@ -348,10 +364,10 @@ PostgresPollingStatusType PQconnectPoll(PGconn *conn);
 
       <para>
        At any time during connection, the status of the connection can be
-       checked by calling <function>PQstatus</>. If this call returns <symbol>CONNECTION_BAD</>, then the
-       connection procedure has failed; if the call returns <function>CONNECTION_OK</>, then the
+       checked by calling <function>PQstatus</function>. If this call returns <symbol>CONNECTION_BAD</symbol>, then the
+       connection procedure has failed; if the call returns <function>CONNECTION_OK</function>, then the
        connection is ready.  Both of these states are equally detectable
-       from the return value of <function>PQconnectPoll</>, described above. Other states might also occur
+       from the return value of <function>PQconnectPoll</function>, described above. Other states might also occur
        during (and only during) an asynchronous connection procedure. These
        indicate the current stage of the connection procedure and might be useful
        to provide feedback to the user for example. These statuses are:
@@ -472,7 +488,7 @@ switch(PQstatus(conn))
     </varlistentry>
 
     <varlistentry id="libpq-pqconndefaults">
-     <term><function>PQconndefaults</function><indexterm><primary>PQconndefaults</></></term>
+     <term><function>PQconndefaults</function><indexterm><primary>PQconndefaults</primary></indexterm></term>
      <listitem>
       <para>
        Returns the default connection options.
@@ -501,7 +517,7 @@ typedef struct
        all possible <function>PQconnectdb</function> options and their
        current default values.  The return value points to an array of
        <structname>PQconninfoOption</structname> structures, which ends
-       with an entry having a null <structfield>keyword</> pointer.  The
+       with an entry having a null <structfield>keyword</structfield> pointer.  The
        null pointer is returned if memory could not be allocated. Note that
        the current default values (<structfield>val</structfield> fields)
        will depend on environment variables and other context.  A
@@ -519,7 +535,7 @@ typedef struct
     </varlistentry>
 
     <varlistentry id="libpq-pqconninfo">
-     <term><function>PQconninfo</function><indexterm><primary>PQconninfo</></></term>
+     <term><function>PQconninfo</function><indexterm><primary>PQconninfo</primary></indexterm></term>
      <listitem>
       <para>
        Returns the connection options used by a live connection.
@@ -533,7 +549,7 @@ PQconninfoOption *PQconninfo(PGconn *conn);
        all possible <function>PQconnectdb</function> options and the
        values that were used to connect to the server. The return
        value points to an array of <structname>PQconninfoOption</structname>
-       structures, which ends with an entry having a null <structfield>keyword</>
+       structures, which ends with an entry having a null <structfield>keyword</structfield>
        pointer. All notes above for <function>PQconndefaults</function> also
        apply to the result of <function>PQconninfo</function>.
       </para>
@@ -543,7 +559,7 @@ PQconninfoOption *PQconninfo(PGconn *conn);
 
 
     <varlistentry id="libpq-pqconninfoparse">
-     <term><function>PQconninfoParse</function><indexterm><primary>PQconninfoParse</></></term>
+     <term><function>PQconninfoParse</function><indexterm><primary>PQconninfoParse</primary></indexterm></term>
      <listitem>
       <para>
        Returns parsed connection options from the provided connection string.
@@ -555,12 +571,12 @@ PQconninfoOption *PQconninfoParse(const char *conninfo, char **errmsg);
 
       <para>
        Parses a connection string and returns the resulting options as an
-       array; or returns <symbol>NULL</> if there is a problem with the connection
+       array; or returns <symbol>NULL</symbol> if there is a problem with the connection
        string.  This function can be used to extract
        the <function>PQconnectdb</function> options in the provided
        connection string.  The return value points to an array of
        <structname>PQconninfoOption</structname> structures, which ends
-       with an entry having a null <structfield>keyword</> pointer.
+       with an entry having a null <structfield>keyword</structfield> pointer.
       </para>
 
       <para>
@@ -571,10 +587,10 @@ PQconninfoOption *PQconninfoParse(const char *conninfo, char **errmsg);
       </para>
 
       <para>
-       If <literal>errmsg</> is not <symbol>NULL</>, then <literal>*errmsg</> is set
-       to <symbol>NULL</> on success, else to a <function>malloc</>'d error string explaining
-       the problem.  (It is also possible for <literal>*errmsg</> to be
-       set to <symbol>NULL</> and the function to return <symbol>NULL</>;
+       If <literal>errmsg</literal> is not <symbol>NULL</symbol>, then <literal>*errmsg</literal> is set
+       to <symbol>NULL</symbol> on success, else to a <function>malloc</function>'d error string explaining
+       the problem.  (It is also possible for <literal>*errmsg</literal> to be
+       set to <symbol>NULL</symbol> and the function to return <symbol>NULL</symbol>;
        this indicates an out-of-memory condition.)
       </para>
 
@@ -582,15 +598,15 @@ PQconninfoOption *PQconninfoParse(const char *conninfo, char **errmsg);
        After processing the options array, free it by passing it to
        <function>PQconninfoFree</function>.  If this is not done, some memory
        is leaked for each call to <function>PQconninfoParse</function>.
-       Conversely, if an error occurs and <literal>errmsg</> is not <symbol>NULL</>,
-       be sure to free the error string using <function>PQfreemem</>.
+       Conversely, if an error occurs and <literal>errmsg</literal> is not <symbol>NULL</symbol>,
+       be sure to free the error string using <function>PQfreemem</function>.
       </para>
 
    </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqfinish">
-     <term><function>PQfinish</function><indexterm><primary>PQfinish</></></term>
+     <term><function>PQfinish</function><indexterm><primary>PQfinish</primary></indexterm></term>
      <listitem>
       <para>
        Closes  the  connection to the server.  Also frees
@@ -604,14 +620,14 @@ void PQfinish(PGconn *conn);
        Note that even if the server connection attempt fails (as
        indicated by <function>PQstatus</function>), the application should call <function>PQfinish</function>
        to free the memory used by the <structname>PGconn</structname> object.
-       The <structname>PGconn</> pointer must not be used again after
+       The <structname>PGconn</structname> pointer must not be used again after
        <function>PQfinish</function> has been called.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqreset">
-     <term><function>PQreset</function><indexterm><primary>PQreset</></></term>
+     <term><function>PQreset</function><indexterm><primary>PQreset</primary></indexterm></term>
      <listitem>
       <para>
        Resets the communication channel to the server.
@@ -631,8 +647,8 @@ void PQreset(PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqresetstart">
-     <term><function>PQresetStart</function><indexterm><primary>PQresetStart</></></term>
-     <term><function>PQresetPoll</function><indexterm><primary>PQresetPoll</></></term>
+     <term><function>PQresetStart</function><indexterm><primary>PQresetStart</primary></indexterm></term>
+     <term><function>PQresetPoll</function><indexterm><primary>PQresetPoll</primary></indexterm></term>
      <listitem>
       <para>
        Reset the communication channel to the server, in a nonblocking manner.
@@ -650,8 +666,8 @@ PostgresPollingStatusType PQresetPoll(PGconn *conn);
        parameters previously used. This can be useful for error recovery if a
        working connection is lost. They differ from <function>PQreset</function> (above) in that they
        act in a nonblocking manner. These functions suffer from the same
-       restrictions as <function>PQconnectStartParams</>, <function>PQconnectStart</>
-       and <function>PQconnectPoll</>.
+       restrictions as <function>PQconnectStartParams</function>, <function>PQconnectStart</function>
+       and <function>PQconnectPoll</function>.
       </para>
 
       <para>
@@ -665,12 +681,12 @@ PostgresPollingStatusType PQresetPoll(PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqpingparams">
-     <term><function>PQpingParams</function><indexterm><primary>PQpingParams</></></term>
+     <term><function>PQpingParams</function><indexterm><primary>PQpingParams</primary></indexterm></term>
      <listitem>
       <para>
        <function>PQpingParams</function> reports the status of the
        server.  It accepts connection parameters identical to those of
-       <function>PQconnectdbParams</>, described above.  It is not
+       <function>PQconnectdbParams</function>, described above.  It is not
        necessary to supply correct user name, password, or database name
        values to obtain the server status; however, if incorrect values
        are provided, the server will log a failed connection attempt.
@@ -734,12 +750,12 @@ PGPing PQpingParams(const char * const *keywords,
     </varlistentry>
 
     <varlistentry id="libpq-pqping">
-     <term><function>PQping</function><indexterm><primary>PQping</></></term>
+     <term><function>PQping</function><indexterm><primary>PQping</primary></indexterm></term>
      <listitem>
       <para>
        <function>PQping</function> reports the status of the
        server.  It accepts connection parameters identical to those of
-       <function>PQconnectdb</>, described above.  It is not
+       <function>PQconnectdb</function>, described above.  It is not
        necessary to supply correct user name, password, or database name
        values to obtain the server status; however, if incorrect values
        are provided, the server will log a failed connection attempt.
@@ -750,7 +766,7 @@ PGPing PQping(const char *conninfo);
       </para>
 
       <para>
-       The return values are the same as for <function>PQpingParams</>.
+       The return values are the same as for <function>PQpingParams</function>.
       </para>
 
      </listitem>
@@ -771,11 +787,11 @@ PGPing PQping(const char *conninfo);
    </indexterm>
 
    <para>
-    Several <application>libpq</> functions parse a user-specified string to obtain
+    Several <application>libpq</application> functions parse a user-specified string to obtain
     connection parameters.  There are two accepted formats for these strings:
     plain <literal>keyword = value</literal> strings
     and URIs.  URIs generally follow
-    <ulink url="http://www.ietf.org/rfc/rfc3986.txt">RFC
+    <ulink url="https://tools.ietf.org/html/rfc3986">RFC
     3986</ulink>, except that multi-host connection strings are allowed
     as further described below.
    </para>
@@ -802,7 +818,7 @@ host=localhost port=5432 dbname=mydb connect_timeout=10
 
    <para>
     The recognized parameter key words are listed in <xref
-    linkend="libpq-paramkeywords">.
+    linkend="libpq-paramkeywords"/>.
    </para>
    </sect3>
 
@@ -840,12 +856,14 @@ postgresql:///mydb?host=localhost&amp;port=5433
 
    <para>
     Percent-encoding may be used to include symbols with special meaning in any
-    of the <acronym>URI</acronym> parts.
+    of the <acronym>URI</acronym> parts, e.g. replace <literal>=</literal> with
+    <literal>%3D</literal>.
+
    </para>
 
    <para>
     Any connection parameters not corresponding to key words listed in <xref
-    linkend="libpq-paramkeywords"> are ignored and a warning message about them
+    linkend="libpq-paramkeywords"/> are ignored and a warning message about them
     is sent to <filename>stderr</filename>.
    </para>
 
@@ -865,7 +883,7 @@ postgresql://[2001:db8::1234]/database
 
    <para>
     The host component is interpreted as described for the parameter <xref
-    linkend="libpq-connect-host">.  In particular, a Unix-domain socket
+    linkend="libpq-connect-host"/>.  In particular, a Unix-domain socket
     connection is chosen if the host part is either empty or starts with a
     slash, otherwise a TCP/IP connection is initiated.  Note, however, that the
     slash is a reserved character in the hierarchical part of the URI.  So, to
@@ -893,18 +911,18 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
 
      <para>
        It is possible to specify multiple hosts to connect to, so that they are
-       tried in the given order. In the Keyword/Value format, the <literal>host</>,
-       <literal>hostaddr</>, and <literal>port</> options accept a comma-separated
+       tried in the given order. In the Keyword/Value format, the <literal>host</literal>,
+       <literal>hostaddr</literal>, and <literal>port</literal> options accept a comma-separated
        list of values. The same number of elements must be given in each option, such
-       that e.g. the first <literal>hostaddr</> corresponds to the first host name,
-       the second <literal>hostaddr</> corresponds to the second host name, and so
+       that e.g. the first <literal>hostaddr</literal> corresponds to the first host name,
+       the second <literal>hostaddr</literal> corresponds to the second host name, and so
        forth. As an exception, if only one <literal>port</literal> is specified, it
        applies to all the hosts.
      </para>
 
      <para>
-       In the connection URI format, you can list multiple <literal>host:port</> pairs
-       separated by commas, in the <literal>host</> component of the URI. In either
+       In the connection URI format, you can list multiple <literal>host:port</literal> pairs
+       separated by commas, in the <literal>host</literal> component of the URI. In either
        format, a single hostname can also translate to multiple network addresses. A
        common example of this is a host that has both an IPv4 and an IPv6 address.
      </para>
@@ -937,22 +955,22 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <term><literal>host</literal></term>
       <listitem>
        <para>
-        Name of host to connect to.<indexterm><primary>host name</></>
+        Name of host to connect to.<indexterm><primary>host name</primary></indexterm>
         If a host name begins with a slash, it specifies Unix-domain
         communication rather than TCP/IP communication; the value is the
         name of the directory in which the socket file is stored.  If
         multiple host names are specified, each will be tried in turn in
         the order given.  The default behavior when <literal>host</literal> is
         not specified is to connect to a Unix-domain
-        socket<indexterm><primary>Unix domain socket</></> in
+        socket<indexterm><primary>Unix domain socket</primary></indexterm> in
         <filename>/tmp</filename> (or whatever socket directory was specified
-        when <productname>PostgreSQL</> was built). On machines without
-        Unix-domain sockets, the default is to connect to <literal>localhost</>.
+        when <productname>PostgreSQL</productname> was built). On machines without
+        Unix-domain sockets, the default is to connect to <literal>localhost</literal>.
        </para>
        <para>
         A comma-separated list of host names is also accepted, in which case
         each host name in the list is tried in order. See
-        <xref linkend="libpq-multiple-hosts"> for details.
+        <xref linkend="libpq-multiple-hosts"/> for details.
        </para>
       </listitem>
      </varlistentry>
@@ -962,61 +980,61 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <listitem>
        <para>
         Numeric IP address of host to connect to.  This should be in the
-        standard IPv4 address format, e.g., <literal>172.28.40.9</>.  If
+        standard IPv4 address format, e.g., <literal>172.28.40.9</literal>.  If
         your machine supports IPv6, you can also use those addresses.
         TCP/IP communication is
         always used when a nonempty string is specified for this parameter.
        </para>
 
        <para>
-        Using <literal>hostaddr</> instead of <literal>host</> allows the
+        Using <literal>hostaddr</literal> instead of <literal>host</literal> allows the
         application to avoid a host name look-up, which might be important
         in applications with time constraints. However, a host name is
         required for GSSAPI or SSPI authentication
-        methods, as well as for <literal>verify-full</> SSL
+        methods, as well as for <literal>verify-full</literal> SSL
         certificate verification.  The following rules are used:
         <itemizedlist>
          <listitem>
           <para>
-           If <literal>host</> is specified without <literal>hostaddr</>,
+           If <literal>host</literal> is specified without <literal>hostaddr</literal>,
            a host name lookup occurs.
           </para>
          </listitem>
          <listitem>
           <para>
-           If <literal>hostaddr</> is specified without <literal>host</>,
-           the value for <literal>hostaddr</> gives the server network address.
+           If <literal>hostaddr</literal> is specified without <literal>host</literal>,
+           the value for <literal>hostaddr</literal> gives the server network address.
            The connection attempt will fail if the authentication
            method requires a host name.
           </para>
          </listitem>
          <listitem>
           <para>
-           If both <literal>host</> and <literal>hostaddr</> are specified,
-           the value for <literal>hostaddr</> gives the server network address.
-           The value for <literal>host</> is ignored unless the
+           If both <literal>host</literal> and <literal>hostaddr</literal> are specified,
+           the value for <literal>hostaddr</literal> gives the server network address.
+           The value for <literal>host</literal> is ignored unless the
            authentication method requires it, in which case it will be
            used as the host name.
           </para>
          </listitem>
         </itemizedlist>
-        Note that authentication is likely to fail if <literal>host</>
-        is not the name of the server at network address <literal>hostaddr</>.
-        Also, note that <literal>host</> rather than <literal>hostaddr</>
+        Note that authentication is likely to fail if <literal>host</literal>
+        is not the name of the server at network address <literal>hostaddr</literal>.
+        Also, note that <literal>host</literal> rather than <literal>hostaddr</literal>
         is used to identify the connection in a password file (see
-        <xref linkend="libpq-pgpass">).
+        <xref linkend="libpq-pgpass"/>).
        </para>
 
        <para>
-        A comma-separated list of <literal>hostaddrs</> is also accepted, in
-        which case each host in the list is tried in order. See
-        <xref linkend="libpq-multiple-hosts"> for details.
+        A comma-separated list of <literal>hostaddr</literal> values is also
+        accepted, in which case each host in the list is tried in order. See
+        <xref linkend="libpq-multiple-hosts"/> for details.
        </para>
        <para>
         Without either a host name or host address,
         <application>libpq</application> will connect using a
         local Unix-domain socket; or on machines without Unix-domain
-        sockets, it will attempt to connect to <literal>localhost</>.
+        sockets, it will attempt to connect to <literal>localhost</literal>.
        </para>
        </listitem>
       </varlistentry>
@@ -1027,9 +1045,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
        <para>
         Port number to connect to at the server host, or socket file
         name extension for Unix-domain
-        connections.<indexterm><primary>port</></>
+        connections.<indexterm><primary>port</primary></indexterm>
         If multiple hosts were given in the <literal>host</literal> or
-        <literal>hostaddr</> parameters, this parameter may specify a list
+        <literal>hostaddr</literal> parameters, this parameter may specify a list
         of ports of equal length, or it may specify a single port number to
         be used for all hosts.
        </para>
@@ -1042,7 +1060,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <para>
        The database name.  Defaults to be the same as the user name.
        In certain contexts, the value is checked for extended
-       formats; see <xref linkend="libpq-connstring"> for more details on
+       formats; see <xref linkend="libpq-connstring"/> for more details on
        those.
       </para>
       </listitem>
@@ -1073,9 +1091,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <listitem>
       <para>
        Specifies the name of the file used to store passwords
-       (see <xref linkend="libpq-pgpass">).
+       (see <xref linkend="libpq-pgpass"/>).
        Defaults to <filename>~/.pgpass</filename>, or
-       <filename>%APPDATA%\postgresql\pgpass.conf</> on Microsoft Windows.
+       <filename>%APPDATA%\postgresql\pgpass.conf</filename> on Microsoft Windows.
        (No error is reported if this file does not exist.)
       </para>
       </listitem>
@@ -1089,7 +1107,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
        string). Zero or not specified means wait indefinitely.  It is not
        recommended to use a timeout of less than 2 seconds.
        This timeout applies separately to each connection attempt.
-       For example, if you specify two hosts and <literal>connect_timeout</>
+       For example, if you specify two hosts and <literal>connect_timeout</literal>
        is 5, each host will time out if no connection is made within 5
        seconds, so the total time spent waiting for a connection might be
        up to 10 seconds.
@@ -1117,13 +1135,13 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <listitem>
        <para>
         Specifies command-line options to send to the server at connection
-        start.  For example, setting this to <literal>-c geqo=off</> sets the
-        session's value of the <varname>geqo</> parameter to
-        <literal>off</>.  Spaces within this string are considered to
+        start.  For example, setting this to <literal>-c geqo=off</literal> sets the
+        session's value of the <varname>geqo</varname> parameter to
+        <literal>off</literal>.  Spaces within this string are considered to
         separate command-line arguments, unless escaped with a backslash
-        (<literal>\</>); write <literal>\\</> to represent a literal
+        (<literal>\</literal>); write <literal>\\</literal> to represent a literal
         backslash.  For a detailed discussion of the available
-        options, consult <xref linkend="runtime-config">.
+        options, consult <xref linkend="runtime-config"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -1132,7 +1150,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <term><literal>application_name</literal></term>
       <listitem>
        <para>
-        Specifies a value for the <xref linkend="guc-application-name">
+        Specifies a value for the <xref linkend="guc-application-name"/>
         configuration parameter.
        </para>
       </listitem>
@@ -1143,9 +1161,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <listitem>
        <para>
         Specifies a fallback value for the <xref
-        linkend="guc-application-name"> configuration parameter.
+        linkend="guc-application-name"/> configuration parameter.
         This value will be used if no value has been given for
-        <literal>application_name</> via a connection parameter or the
+        <literal>application_name</literal> via a connection parameter or the
         <envar>PGAPPNAME</envar> environment variable.  Specifying
         a fallback name is useful in generic utility programs that
         wish to set a default application name but allow it to be
@@ -1174,7 +1192,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         send a keepalive message to the server.  A value of zero uses the
         system default. This parameter is ignored for connections made via a
         Unix-domain socket, or if keepalives are disabled.
-        It is only supported on systems where <symbol>TCP_KEEPIDLE</> or
+        It is only supported on systems where <symbol>TCP_KEEPIDLE</symbol> or
         an equivalent socket option is available, and on Windows; on other
         systems, it has no effect.
        </para>
@@ -1189,7 +1207,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         that is not acknowledged by the server should be retransmitted.  A
         value of zero uses the system default. This parameter is ignored for
         connections made via a Unix-domain socket, or if keepalives are disabled.
-        It is only supported on systems where <symbol>TCP_KEEPINTVL</> or
+        It is only supported on systems where <symbol>TCP_KEEPINTVL</symbol> or
         an equivalent socket option is available, and on Windows; on other
         systems, it has no effect.
        </para>
@@ -1204,7 +1222,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         client's connection to the server is considered dead.  A value of
         zero uses the system default. This parameter is ignored for
         connections made via a Unix-domain socket, or if keepalives are disabled.
-        It is only supported on systems where <symbol>TCP_KEEPCNT</> or
+        It is only supported on systems where <symbol>TCP_KEEPCNT</symbol> or
         an equivalent socket option is available; on other systems, it has no
         effect.
        </para>
@@ -1220,12 +1238,36 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       </listitem>
      </varlistentry>
 
+     <varlistentry id="libpq-scram-channel-binding" xreflabel="scram_channel_binding">
+      <term><literal>scram_channel_binding</literal></term>
+      <listitem>
+       <para>
+        Specifies the channel binding type to use with SCRAM authentication.
+        The list of channel binding types supported by server are listed in
+        <xref linkend="sasl-authentication"/>.  An empty value specifies that
+        the client will not use channel binding.  The default value is
+        <literal>tls-unique</literal>.
+       </para>
+
+       <para>
+        Channel binding is only supported on SSL connections.  If the
+        connection is not using SSL, then this setting is ignored.
+       </para>
+
+       <para>
+        This parameter is mainly intended for protocol testing.  In normal
+        use, there should not be a need to choose a channel binding type other
+        than the default one.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry id="libpq-connect-sslmode" xreflabel="sslmode">
       <term><literal>sslmode</literal></term>
       <listitem>
        <para>
         This option determines whether or with what priority a secure
-        <acronym>SSL</> TCP/IP connection will be negotiated with the
+        <acronym>SSL</acronym> TCP/IP connection will be negotiated with the
         server. There are six modes:
 
         <variablelist>
@@ -1233,7 +1275,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>disable</literal></term>
           <listitem>
            <para>
-            only try a non-<acronym>SSL</> connection
+            only try a non-<acronym>SSL</acronym> connection
            </para>
           </listitem>
          </varlistentry>
@@ -1242,8 +1284,8 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>allow</literal></term>
           <listitem>
            <para>
-            first try a non-<acronym>SSL</> connection; if that
-            fails, try an <acronym>SSL</> connection
+            first try a non-<acronym>SSL</acronym> connection; if that
+            fails, try an <acronym>SSL</acronym> connection
            </para>
           </listitem>
          </varlistentry>
@@ -1252,8 +1294,8 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>prefer</literal> (default)</term>
           <listitem>
            <para>
-            first try an <acronym>SSL</> connection; if that fails,
-            try a non-<acronym>SSL</> connection
+            first try an <acronym>SSL</acronym> connection; if that fails,
+            try a non-<acronym>SSL</acronym> connection
            </para>
           </listitem>
          </varlistentry>
@@ -1262,7 +1304,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>require</literal></term>
           <listitem>
            <para>
-            only try an <acronym>SSL</> connection. If a root CA
+            only try an <acronym>SSL</acronym> connection. If a root CA
             file is present, verify the certificate in the same way as
             if <literal>verify-ca</literal> was specified
            </para>
@@ -1273,9 +1315,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>verify-ca</literal></term>
           <listitem>
            <para>
-            only try an <acronym>SSL</> connection, and verify that
+            only try an <acronym>SSL</acronym> connection, and verify that
             the server certificate is issued by a trusted
-            certificate authority (<acronym>CA</>)
+            certificate authority (<acronym>CA</acronym>)
            </para>
           </listitem>
          </varlistentry>
@@ -1284,30 +1326,30 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
           <term><literal>verify-full</literal></term>
           <listitem>
            <para>
-            only try an <acronym>SSL</> connection, verify that the
+            only try an <acronym>SSL</acronym> connection, verify that the
             server certificate is issued by a
-            trusted <acronym>CA</> and that the requested server host name
+            trusted <acronym>CA</acronym> and that the requested server host name
             matches that in the certificate
            </para>
           </listitem>
          </varlistentry>
         </variablelist>
 
-        See <xref linkend="libpq-ssl"> for a detailed description of how
+        See <xref linkend="libpq-ssl"/> for a detailed description of how
         these options work.
        </para>
 
        <para>
-        <literal>sslmode</> is ignored for Unix domain socket
+        <literal>sslmode</literal> is ignored for Unix domain socket
         communication.
-        If <productname>PostgreSQL</> is compiled without SSL support,
-        using options <literal>require</>, <literal>verify-ca</>, or
-        <literal>verify-full</> will cause an error, while
-        options <literal>allow</> and <literal>prefer</> will be
-        accepted but <application>libpq</> will not actually attempt
-        an <acronym>SSL</>
-        connection.<indexterm><primary>SSL</><secondary
-        sortas="libpq">with libpq</></indexterm>
+        If <productname>PostgreSQL</productname> is compiled without SSL support,
+        using options <literal>require</literal>, <literal>verify-ca</literal>, or
+        <literal>verify-full</literal> will cause an error, while
+        options <literal>allow</literal> and <literal>prefer</literal> will be
+        accepted but <application>libpq</application> will not actually attempt
+        an <acronym>SSL</acronym>
+        connection.<indexterm><primary>SSL</primary><secondary
+        sortas="libpq">with libpq</secondary></indexterm>
        </para>
       </listitem>
      </varlistentry>
@@ -1316,20 +1358,20 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <term><literal>requiressl</literal></term>
       <listitem>
        <para>
-        This option is deprecated in favor of the <literal>sslmode</>
+        This option is deprecated in favor of the <literal>sslmode</literal>
         setting.
        </para>
 
        <para>
         If set to 1, an <acronym>SSL</acronym> connection to the server
-        is required (this is equivalent to <literal>sslmode</>
-        <literal>require</>).  <application>libpq</> will then refuse
+        is required (this is equivalent to <literal>sslmode</literal>
+        <literal>require</literal>).  <application>libpq</application> will then refuse
         to connect if the server does not accept an
         <acronym>SSL</acronym> connection.  If set to 0 (default),
-        <application>libpq</> will negotiate the connection type with
-        the server (equivalent to <literal>sslmode</>
-        <literal>prefer</>).  This option is only available if
-        <productname>PostgreSQL</> is compiled with SSL support.
+        <application>libpq</application> will negotiate the connection type with
+        the server (equivalent to <literal>sslmode</literal>
+        <literal>prefer</literal>).  This option is only available if
+        <productname>PostgreSQL</productname> is compiled with SSL support.
        </para>
       </listitem>
      </varlistentry>
@@ -1341,9 +1383,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         If set to 1 (default), data sent over SSL connections will be
         compressed.
         If set to 0, compression will be disabled (this requires
-        <productname>OpenSSL</> 1.0.0 or later).
+        <productname>OpenSSL</productname> 1.0.0 or later).
         This parameter is ignored if a connection without SSL is made,
-        or if the version of <productname>OpenSSL</> used does not support
+        or if the version of <productname>OpenSSL</productname> used does not support
         it.
        </para>
        <para>
@@ -1361,7 +1403,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
        <para>
         This parameter specifies the file name of the client SSL
         certificate, replacing the default
-        <filename>~/.postgresql/postgresql.crt</>.
+        <filename>~/.postgresql/postgresql.crt</filename>.
         This parameter is ignored if an SSL connection is not made.
        </para>
       </listitem>
@@ -1374,9 +1416,9 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         This parameter specifies the location for the secret key used for
         the client certificate. It can either specify a file name that will
         be used instead of the default
-        <filename>~/.postgresql/postgresql.key</>, or it can specify a key
-        obtained from an external <quote>engine</> (engines are
-        <productname>OpenSSL</> loadable modules).  An external engine
+        <filename>~/.postgresql/postgresql.key</filename>, or it can specify a key
+        obtained from an external <quote>engine</quote> (engines are
+        <productname>OpenSSL</productname> loadable modules).  An external engine
         specification should consist of a colon-separated engine name and
         an engine-specific key identifier.  This parameter is ignored if an
         SSL connection is not made.
@@ -1389,10 +1431,10 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
       <listitem>
        <para>
         This parameter specifies the name of a file containing SSL
-        certificate authority (<acronym>CA</>) certificate(s).
+        certificate authority (<acronym>CA</acronym>) certificate(s).
         If the file exists, the server's certificate will be verified
         to be signed by one of these authorities.  The default is
-        <filename>~/.postgresql/root.crt</>.
+        <filename>~/.postgresql/root.crt</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -1405,7 +1447,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         revocation list (CRL).  Certificates listed in this file, if it
         exists, will be rejected while attempting to authenticate the
         server's certificate.  The default is
-        <filename>~/.postgresql/root.crl</>.
+        <filename>~/.postgresql/root.crl</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -1427,8 +1469,8 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         any user could start a server listening there.  Use this parameter
         to ensure that you are connected to a server run by a trusted user.)
         This option is only supported on platforms for which the
-        <literal>peer</> authentication method is implemented; see
-        <xref linkend="auth-peer">.
+        <literal>peer</literal> authentication method is implemented; see
+        <xref linkend="auth-peer"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -1440,7 +1482,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         Kerberos service name to use when authenticating with GSSAPI.
         This must match the service name specified in the server
         configuration for Kerberos authentication to succeed. (See also
-        <xref linkend="gssapi-auth">.)
+        <xref linkend="gssapi-auth"/>.)
        </para>
       </listitem>
      </varlistentry>
@@ -1463,7 +1505,7 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         Service name to use for additional parameters.  It specifies a service
         name in <filename>pg_service.conf</filename> that holds additional connection parameters.
         This allows applications to specify only a service name so connection parameters
-        can be centrally maintained. See <xref linkend="libpq-pgservice">.
+        can be centrally maintained. See <xref linkend="libpq-pgservice"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -1476,11 +1518,11 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
         connection in which read-write transactions are accepted by default
         is considered acceptable.  The query
         <literal>SHOW transaction_read_only</literal> will be sent upon any
-        successful connection; if it returns <literal>on</>, the connection
+        successful connection; if it returns <literal>on</literal>, the connection
         will be closed.  If multiple hosts were specified in the connection
         string, any remaining servers will be tried just as if the connection
         attempt had failed.  The default value of this parameter,
-        <literal>any</>, regards all connections as acceptable.
+        <literal>any</literal>, regards all connections as acceptable.
       </para>
       </listitem>
     </varlistentry>
@@ -1499,13 +1541,13 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
 
   <tip>
    <para>
-    <indexterm><primary>libpq-fe.h</></>
-    <indexterm><primary>libpq-int.h</></>
+    <indexterm><primary>libpq-fe.h</primary></indexterm>
+    <indexterm><primary>libpq-int.h</primary></indexterm>
     <application>libpq</application> application programmers should be careful to
     maintain the <structname>PGconn</structname> abstraction.  Use the accessor
     functions described below to get at the contents of <structname>PGconn</structname>.
     Reference to internal <structname>PGconn</structname> fields using
-    <filename>libpq-int.h</> is not recommended because they are subject to change
+    <filename>libpq-int.h</filename> is not recommended because they are subject to change
     in the future.
    </para>
   </tip>
@@ -1513,10 +1555,10 @@ postgresql://%2Fvar%2Flib%2Fpostgresql/dbname
   <para>
    The following functions return parameter values established at connection.
    These values are fixed for the life of the connection.  If a multi-host
-   connection string is used, the values of <function>PQhost</>,
-   <function>PQport</>, and <function>PQpass</> can change if a new connection
-   is established using the same <structname>PGconn</> object.  Other values
-   are fixed for the lifetime of the <structname>PGconn</> object.
+   connection string is used, the values of <function>PQhost</function>,
+   <function>PQport</function>, and <function>PQpass</function> can change if a new connection
+   is established using the same <structname>PGconn</structname> object.  Other values
+   are fixed for the lifetime of the <structname>PGconn</structname> object.
 
    <variablelist>
     <varlistentry id="libpq-pqdb">
@@ -1587,7 +1629,7 @@ char *PQpass(const PGconn *conn);
        This can be a host name, an IP address, or a directory path if the
        connection is via Unix socket.  (The path case can be distinguished
        because it will always be an absolute path, beginning
-       with <literal>/</>.)
+       with <literal>/</literal>.)
 <synopsis>
 char *PQhost(const PGconn *conn);
 </synopsis>
@@ -1658,7 +1700,7 @@ char *PQoptions(const PGconn *conn);
 
   <para>
    The following functions return status data that can change as operations
-   are executed on the <structname>PGconn</> object.
+   are executed on the <structname>PGconn</structname> object.
 
    <variablelist>
     <varlistentry id="libpq-pqstatus">
@@ -1693,8 +1735,8 @@ ConnStatusType PQstatus(const PGconn *conn);
       </para>
 
       <para>
-       See the entry for <function>PQconnectStartParams</>, <function>PQconnectStart</>
-       and <function>PQconnectPoll</> with regards to other status codes that
+       See the entry for <function>PQconnectStartParams</function>, <function>PQconnectStart</function>
+       and <function>PQconnectPoll</function> with regards to other status codes that
        might be returned.
       </para>
      </listitem>
@@ -1745,62 +1787,62 @@ const char *PQparameterStatus(const PGconn *conn, const char *paramName);
 
        Certain parameter values are reported by the server automatically at
        connection startup or whenever their values change.
-       <function>PQparameterStatus</> can be used to interrogate these settings.
+       <function>PQparameterStatus</function> can be used to interrogate these settings.
        It returns the current value of a parameter if known, or <symbol>NULL</symbol>
        if the parameter is not known.
       </para>
 
       <para>
        Parameters reported as of the current release include
-       <varname>server_version</>,
-       <varname>server_encoding</>,
-       <varname>client_encoding</>,
-       <varname>application_name</>,
-       <varname>is_superuser</>,
-       <varname>session_authorization</>,
-       <varname>DateStyle</>,
-       <varname>IntervalStyle</>,
-       <varname>TimeZone</>,
-       <varname>integer_datetimes</>, and
-       <varname>standard_conforming_strings</>.
-       (<varname>server_encoding</>, <varname>TimeZone</>, and
-       <varname>integer_datetimes</> were not reported by releases before 8.0;
-       <varname>standard_conforming_strings</> was not reported by releases
+       <varname>server_version</varname>,
+       <varname>server_encoding</varname>,
+       <varname>client_encoding</varname>,
+       <varname>application_name</varname>,
+       <varname>is_superuser</varname>,
+       <varname>session_authorization</varname>,
+       <varname>DateStyle</varname>,
+       <varname>IntervalStyle</varname>,
+       <varname>TimeZone</varname>,
+       <varname>integer_datetimes</varname>, and
+       <varname>standard_conforming_strings</varname>.
+       (<varname>server_encoding</varname>, <varname>TimeZone</varname>, and
+       <varname>integer_datetimes</varname> were not reported by releases before 8.0;
+       <varname>standard_conforming_strings</varname> was not reported by releases
        before 8.1;
-       <varname>IntervalStyle</> was not reported by releases before 8.4;
-       <varname>application_name</> was not reported by releases before 9.0.)
+       <varname>IntervalStyle</varname> was not reported by releases before 8.4;
+       <varname>application_name</varname> was not reported by releases before 9.0.)
        Note that
-       <varname>server_version</>,
-       <varname>server_encoding</> and
-       <varname>integer_datetimes</>
+       <varname>server_version</varname>,
+       <varname>server_encoding</varname> and
+       <varname>integer_datetimes</varname>
        cannot change after startup.
       </para>
 
       <para>
        Pre-3.0-protocol servers do not report parameter settings, but
-       <application>libpq</> includes logic to obtain values for
-       <varname>server_version</> and <varname>client_encoding</> anyway.
-       Applications are encouraged to use <function>PQparameterStatus</>
-       rather than <foreignphrase>ad hoc</> code to determine these values.
+       <application>libpq</application> includes logic to obtain values for
+       <varname>server_version</varname> and <varname>client_encoding</varname> anyway.
+       Applications are encouraged to use <function>PQparameterStatus</function>
+       rather than <foreignphrase>ad hoc</foreignphrase> code to determine these values.
        (Beware however that on a pre-3.0 connection, changing
-       <varname>client_encoding</> via <command>SET</> after connection
-       startup will not be reflected by <function>PQparameterStatus</>.)
-       For <varname>server_version</>, see also
-       <function>PQserverVersion</>, which returns the information in a
+       <varname>client_encoding</varname> via <command>SET</command> after connection
+       startup will not be reflected by <function>PQparameterStatus</function>.)
+       For <varname>server_version</varname>, see also
+       <function>PQserverVersion</function>, which returns the information in a
        numeric form that is much easier to compare against.
       </para>
 
       <para>
-       If no value for <varname>standard_conforming_strings</> is reported,
-       applications can assume it is <literal>off</>, that is, backslashes
+       If no value for <varname>standard_conforming_strings</varname> is reported,
+       applications can assume it is <literal>off</literal>, that is, backslashes
        are treated as escapes in string literals.  Also, the presence of
        this parameter can be taken as an indication that the escape string
-       syntax (<literal>E'...'</>) is accepted.
+       syntax (<literal>E'...'</literal>) is accepted.
       </para>
 
       <para>
-       Although the returned pointer is declared <literal>const</>, it in fact
-       points to mutable storage associated with the <literal>PGconn</> structure.
+       Although the returned pointer is declared <literal>const</literal>, it in fact
+       points to mutable storage associated with the <literal>PGconn</literal> structure.
        It is unwise to assume the pointer will remain valid across queries.
       </para>
      </listitem>
@@ -1827,7 +1869,7 @@ int PQprotocolVersion(const PGconn *conn);
        not change after connection startup is complete, but it could
        theoretically change during a connection reset.  The 3.0 protocol
        will normally be used when communicating with
-       <productname>PostgreSQL</> 7.4 or later servers; pre-7.4 servers
+       <productname>PostgreSQL</productname> 7.4 or later servers; pre-7.4 servers
        support only protocol 2.0.  (Protocol 1.0 is obsolete and not
        supported by <application>libpq</application>.)
       </para>
@@ -1860,17 +1902,17 @@ int PQserverVersion(const PGconn *conn);
       </para>
 
       <para>
-       Prior to major version 10, <productname>PostgreSQL</> used
+       Prior to major version 10, <productname>PostgreSQL</productname> used
        three-part version numbers in which the first two parts together
        represented the major version.  For those
-       versions, <function>PQserverVersion</> uses two digits for each
+       versions, <function>PQserverVersion</function> uses two digits for each
        part; for example version 9.1.5 will be returned as 90105, and
        version 9.2.0 will be returned as 90200.
       </para>
 
       <para>
        Therefore, for purposes of determining feature compatibility,
-       applications should divide the result of <function>PQserverVersion</>
+       applications should divide the result of <function>PQserverVersion</function>
        by 100 not 10000 to determine a logical major version number.
        In all release series, only the last two digits differ between
        minor releases (bug-fix releases).
@@ -1888,7 +1930,7 @@ int PQserverVersion(const PGconn *conn);
 
      <listitem>
       <para>
-       <indexterm><primary>error message</></> Returns the error message
+       <indexterm><primary>error message</primary></indexterm> Returns the error message
        most recently generated by an operation on the connection.
 
 <synopsis>
@@ -1898,22 +1940,22 @@ char *PQerrorMessage(const PGconn *conn);
       </para>
 
       <para>
-       Nearly all <application>libpq</> functions will set a message for
+       Nearly all <application>libpq</application> functions will set a message for
        <function>PQerrorMessage</function> if they fail.  Note that by
        <application>libpq</application> convention, a nonempty
        <function>PQerrorMessage</function> result can consist of multiple lines,
        and will include a trailing newline. The caller should not free
        the result directly. It will be freed when the associated
-       <structname>PGconn</> handle is passed to
+       <structname>PGconn</structname> handle is passed to
        <function>PQfinish</function>.  The result string should not be
        expected to remain the same across operations on the
-       <literal>PGconn</> structure.
+       <literal>PGconn</literal> structure.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqsocket">
-     <term><function>PQsocket</function><indexterm><primary>PQsocket</></></term>
+     <term><function>PQsocket</function><indexterm><primary>PQsocket</primary></indexterm></term>
      <listitem>
       <para>
        Obtains the file descriptor number of the connection socket to
@@ -1931,13 +1973,13 @@ int PQsocket(const PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqbackendpid">
-     <term><function>PQbackendPID</function><indexterm><primary>PQbackendPID</></></term>
+     <term><function>PQbackendPID</function><indexterm><primary>PQbackendPID</primary></indexterm></term>
      <listitem>
       <para>
        Returns the process <acronym>ID</acronym> (PID)<indexterm>
-        <primary>PID</>
-        <secondary>determining PID of server process</>
-        <tertiary>in libpq</>
+        <primary>PID</primary>
+        <secondary>determining PID of server process</secondary>
+        <tertiary>in libpq</tertiary>
        </indexterm>
        of the backend process handling this connection.
 
@@ -1958,7 +2000,7 @@ int PQbackendPID(const PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqconnectionneedspassword">
-     <term><function>PQconnectionNeedsPassword</function><indexterm><primary>PQconnectionNeedsPassword</></></term>
+     <term><function>PQconnectionNeedsPassword</function><indexterm><primary>PQconnectionNeedsPassword</primary></indexterm></term>
      <listitem>
       <para>
        Returns true (1) if the connection authentication method
@@ -1978,7 +2020,7 @@ int PQconnectionNeedsPassword(const PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqconnectionusedpassword">
-     <term><function>PQconnectionUsedPassword</function><indexterm><primary>PQconnectionUsedPassword</></></term>
+     <term><function>PQconnectionUsedPassword</function><indexterm><primary>PQconnectionUsedPassword</primary></indexterm></term>
      <listitem>
       <para>
        Returns true (1) if the connection authentication method
@@ -2004,7 +2046,7 @@ int PQconnectionUsedPassword(const PGconn *conn);
 
     <variablelist>
     <varlistentry id="libpq-pqsslinuse">
-     <term><function>PQsslInUse</function><indexterm><primary>PQsslInUse</></></term>
+     <term><function>PQsslInUse</function><indexterm><primary>PQsslInUse</primary></indexterm></term>
      <listitem>
       <para>
         Returns true (1) if the connection uses SSL, false (0) if not.
@@ -2018,7 +2060,7 @@ int PQsslInUse(const PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqsslattribute">
-     <term><function>PQsslAttribute</function><indexterm><primary>PQsslAttribute</></></term>
+     <term><function>PQsslAttribute</function><indexterm><primary>PQsslAttribute</primary></indexterm></term>
      <listitem>
       <para>
         Returns SSL-related information about the connection.
@@ -2091,7 +2133,7 @@ const char *PQsslAttribute(const PGconn *conn, const char *attribute_name);
     </varlistentry>
 
     <varlistentry id="libpq-pqsslattributenames">
-     <term><function>PQsslAttributeNames</function><indexterm><primary>PQsslAttributeNames</></></term>
+     <term><function>PQsslAttributeNames</function><indexterm><primary>PQsslAttributeNames</primary></indexterm></term>
      <listitem>
       <para>
        Return an array of SSL attribute names available. The array is terminated by a NULL pointer.
@@ -2103,7 +2145,7 @@ const char * const * PQsslAttributeNames(const PGconn *conn);
     </varlistentry>
 
     <varlistentry id="libpq-pqsslstruct">
-     <term><function>PQsslStruct</function><indexterm><primary>PQsslStruct</></></term>
+     <term><function>PQsslStruct</function><indexterm><primary>PQsslStruct</primary></indexterm></term>
      <listitem>
       <para>
        Return a pointer to an SSL-implementation-specific object describing
@@ -2137,17 +2179,17 @@ void *PQsslStruct(const PGconn *conn, const char *struct_name);
       </para>
       <para>
        This structure can be used to verify encryption levels, check server
-       certificates, and more. Refer to the <productname>OpenSSL</>
+       certificates, and more. Refer to the <productname>OpenSSL</productname>
        documentation for information about this structure.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry id="libpq-pqgetssl">
-     <term><function>PQgetssl</function><indexterm><primary>PQgetssl</></></term>
+     <term><function>PQgetssl</function><indexterm><primary>PQgetssl</primary></indexterm></term>
      <listitem>
       <para>
-       <indexterm><primary>SSL</><secondary sortas="libpq">in libpq</secondary></indexterm>
+       <indexterm><primary>SSL</primary><secondary sortas="libpq">in libpq</secondary></indexterm>
        Returns the SSL structure used in the connection, or null
        if SSL is not in use.
 
@@ -2161,8 +2203,8 @@ void *PQgetssl(const PGconn *conn);
        not be used in new applications, because the returned struct is
        specific to OpenSSL and will not be available if another SSL
        implementation is used. To check if a connection uses SSL, call
-       <function>PQsslInUse</> instead, and for more details about the
-       connection, use <function>PQsslAttribute</>.
+       <function>PQsslInUse</function> instead, and for more details about the
+       connection, use <function>PQsslAttribute</function>.
       </para>
      </listitem>
     </varlistentry>
@@ -2207,7 +2249,7 @@ PGresult *PQexec(PGconn *conn, const char *command);
         Returns a <structname>PGresult</structname> pointer or possibly a null
         pointer.  A non-null pointer will generally be returned except in
         out-of-memory conditions or serious errors such as inability to send
-        the command to the server.  The <function>PQresultStatus</> function
+        the command to the server.  The <function>PQresultStatus</function> function
         should be called to check the return value for any errors (including
         the value of a null pointer, in which case it will return
         <symbol>PGRES_FATAL_ERROR</symbol>).  Use
@@ -2220,10 +2262,12 @@ PGresult *PQexec(PGconn *conn, const char *command);
 
     The command string can include multiple SQL commands
     (separated by semicolons).  Multiple queries sent in a single
-    <function>PQexec</> call are processed in a single transaction, unless
+    <function>PQexec</function> call are processed in a single transaction, unless
     there are explicit <command>BEGIN</command>/<command>COMMIT</command>
     commands included in the query string to divide it into multiple
-    transactions.  Note however that the returned
+    transactions.  (See <xref linkend="protocol-flow-multi-statement"/>
+    for more details about how the server handles multi-query strings.)
+    Note however that the returned
     <structname>PGresult</structname> structure describes only the result
     of the last command executed from the string.  Should one of the
     commands fail, processing of the string stops with it and the returned
@@ -2259,10 +2303,10 @@ PGresult *PQexecParams(PGconn *conn,
        </para>
 
        <para>
-        <function>PQexecParams</> is like <function>PQexec</>, but offers additional
+        <function>PQexecParams</function> is like <function>PQexec</function>, but offers additional
         functionality: parameter values can be specified separately from the command
         string proper, and query results can be requested in either text or binary
-        format.  <function>PQexecParams</> is supported only in protocol 3.0 and later
+        format.  <function>PQexecParams</function> is supported only in protocol 3.0 and later
         connections; it will fail when using protocol 2.0.
        </para>
 
@@ -2285,8 +2329,8 @@ PGresult *PQexecParams(PGconn *conn,
           <listitem>
            <para>
             The SQL command string to be executed. If parameters are used,
-            they are referred to in the command string as <literal>$1</>,
-            <literal>$2</>, etc.
+            they are referred to in the command string as <literal>$1</literal>,
+            <literal>$2</literal>, etc.
            </para>
           </listitem>
          </varlistentry>
@@ -2296,9 +2340,9 @@ PGresult *PQexecParams(PGconn *conn,
           <listitem>
            <para>
             The number of parameters supplied; it is the length of the arrays
-            <parameter>paramTypes[]</>, <parameter>paramValues[]</>,
-            <parameter>paramLengths[]</>, and <parameter>paramFormats[]</>. (The
-            array pointers can be <symbol>NULL</symbol> when <parameter>nParams</>
+            <parameter>paramTypes[]</parameter>, <parameter>paramValues[]</parameter>,
+            <parameter>paramLengths[]</parameter>, and <parameter>paramFormats[]</parameter>. (The
+            array pointers can be <symbol>NULL</symbol> when <parameter>nParams</parameter>
             is zero.)
            </para>
           </listitem>
@@ -2309,7 +2353,7 @@ PGresult *PQexecParams(PGconn *conn,
           <listitem>
            <para>
             Specifies, by OID, the data types to be assigned to the
-            parameter symbols.  If <parameter>paramTypes</> is
+            parameter symbols.  If <parameter>paramTypes</parameter> is
             <symbol>NULL</symbol>, or any particular element in the array
             is zero, the server infers a data type for the parameter symbol
             in the same way it would do for an untyped literal string.
@@ -2355,11 +2399,11 @@ PGresult *PQexecParams(PGconn *conn,
             Values passed in binary format require knowledge of
             the internal representation expected by the backend.
             For example, integers must be passed in network byte
-            order.  Passing <type>numeric</> values requires
+            order.  Passing <type>numeric</type> values requires
             knowledge of the server storage format, as implemented
             in
-            <filename>src/backend/utils/adt/numeric.c::numeric_send()</> and
-            <filename>src/backend/utils/adt/numeric.c::numeric_recv()</>.
+            <filename>src/backend/utils/adt/numeric.c::numeric_send()</filename> and
+            <filename>src/backend/utils/adt/numeric.c::numeric_recv()</filename>.
            </para>
           </listitem>
          </varlistentry>
@@ -2383,14 +2427,14 @@ PGresult *PQexecParams(PGconn *conn,
    </para>
 
    <para>
-    The primary advantage of <function>PQexecParams</> over
-    <function>PQexec</> is that parameter values can be separated from the
+    The primary advantage of <function>PQexecParams</function> over
+    <function>PQexec</function> is that parameter values can be separated from the
     command string, thus avoiding the need for tedious and error-prone
     quoting and escaping.
    </para>
 
    <para>
-    Unlike <function>PQexec</>, <function>PQexecParams</> allows at most
+    Unlike <function>PQexec</function>, <function>PQexecParams</function> allows at most
     one SQL command in the given string.  (There can be semicolons in it,
     but not more than one nonempty command.)  This is a limitation of the
     underlying protocol, but has some usefulness as an extra defense against
@@ -2408,8 +2452,8 @@ PGresult *PQexecParams(PGconn *conn,
 <programlisting>
 SELECT * FROM mytable WHERE x = $1::bigint;
 </programlisting>
-     This forces parameter <literal>$1</> to be treated as <type>bigint</>, whereas
-     by default it would be assigned the same type as <literal>x</>.  Forcing the
+     This forces parameter <literal>$1</literal> to be treated as <type>bigint</type>, whereas
+     by default it would be assigned the same type as <literal>x</literal>.  Forcing the
      parameter type decision, either this way or by specifying a numeric type OID,
      is strongly recommended when sending parameter values in binary format, because
      binary format has less redundancy than text format and so there is less chance
@@ -2440,40 +2484,40 @@ PGresult *PQprepare(PGconn *conn,
        </para>
 
        <para>
-        <function>PQprepare</> creates a prepared statement for later
-        execution with <function>PQexecPrepared</>.  This feature allows
+        <function>PQprepare</function> creates a prepared statement for later
+        execution with <function>PQexecPrepared</function>.  This feature allows
         commands to be executed repeatedly without being parsed and
-        planned each time;  see <xref linkend="SQL-PREPARE"> for details.
-        <function>PQprepare</> is supported only in protocol 3.0 and later
+        planned each time;  see <xref linkend="sql-prepare"/> for details.
+        <function>PQprepare</function> is supported only in protocol 3.0 and later
         connections; it will fail when using protocol 2.0.
        </para>
 
        <para>
         The function creates a prepared statement named
-        <parameter>stmtName</> from the <parameter>query</> string, which
-        must contain a single SQL command.  <parameter>stmtName</> can be
-        <literal>""</> to create an unnamed statement, in which case any
+        <parameter>stmtName</parameter> from the <parameter>query</parameter> string, which
+        must contain a single SQL command.  <parameter>stmtName</parameter> can be
+        <literal>""</literal> to create an unnamed statement, in which case any
         pre-existing unnamed statement is automatically replaced; otherwise
         it is an error if the statement name is already defined in the
         current session.  If any parameters are used, they are referred
-        to in the query as <literal>$1</>, <literal>$2</>, etc.
-        <parameter>nParams</> is the number of parameters for which types
-        are pre-specified in the array <parameter>paramTypes[]</>.  (The
+        to in the query as <literal>$1</literal>, <literal>$2</literal>, etc.
+        <parameter>nParams</parameter> is the number of parameters for which types
+        are pre-specified in the array <parameter>paramTypes[]</parameter>.  (The
         array pointer can be <symbol>NULL</symbol> when
-        <parameter>nParams</> is zero.) <parameter>paramTypes[]</>
+        <parameter>nParams</parameter> is zero.) <parameter>paramTypes[]</parameter>
         specifies, by OID, the data types to be assigned to the parameter
-        symbols.  If <parameter>paramTypes</> is <symbol>NULL</symbol>,
+        symbols.  If <parameter>paramTypes</parameter> is <symbol>NULL</symbol>,
         or any particular element in the array is zero, the server assigns
         a data type to the parameter symbol in the same way it would do
         for an untyped literal string.  Also, the query can use parameter
-        symbols with numbers higher than <parameter>nParams</>; data types
+        symbols with numbers higher than <parameter>nParams</parameter>; data types
         will be inferred for these symbols as well.  (See
         <function>PQdescribePrepared</function> for a means to find out
         what data types were inferred.)
        </para>
 
        <para>
-        As with <function>PQexec</>, the result is normally a
+        As with <function>PQexec</function>, the result is normally a
         <structname>PGresult</structname> object whose contents indicate
         server-side success or failure.  A null result indicates
         out-of-memory or inability to send the command at all.  Use
@@ -2484,11 +2528,11 @@ PGresult *PQprepare(PGconn *conn,
      </varlistentry>
     </variablelist>
 
-    Prepared statements for use with <function>PQexecPrepared</> can also
-    be created by executing SQL <xref linkend="sql-prepare">
-    statements.  Also, although there is no <application>libpq</>
+    Prepared statements for use with <function>PQexecPrepared</function> can also
+    be created by executing SQL <xref linkend="sql-prepare"/>
+    statements.  Also, although there is no <application>libpq</application>
     function for deleting a prepared statement, the SQL <xref
-    linkend="sql-deallocate"> statement
+    linkend="sql-deallocate"/> statement
     can be used for that purpose.
    </para>
 
@@ -2518,21 +2562,21 @@ PGresult *PQexecPrepared(PGconn *conn,
        </para>
 
        <para>
-        <function>PQexecPrepared</> is like <function>PQexecParams</>,
+        <function>PQexecPrepared</function> is like <function>PQexecParams</function>,
         but the command to be executed is specified by naming a
         previously-prepared statement, instead of giving a query string.
         This feature allows commands that will be used repeatedly to be
         parsed and planned just once, rather than each time they are
         executed.  The statement must have been prepared previously in
-        the current session.  <function>PQexecPrepared</> is supported
+        the current session.  <function>PQexecPrepared</function> is supported
         only in protocol 3.0 and later connections; it will fail when
         using protocol 2.0.
        </para>
 
        <para>
-        The parameters are identical to <function>PQexecParams</>, except that the
+        The parameters are identical to <function>PQexecParams</function>, except that the
         name of a prepared statement is given instead of a query string, and the
-        <parameter>paramTypes[]</> parameter is not present (it is not needed since
+        <parameter>paramTypes[]</parameter> parameter is not present (it is not needed since
         the prepared statement's parameter types were determined when it was created).
        </para>
       </listitem>
@@ -2556,20 +2600,20 @@ PGresult *PQdescribePrepared(PGconn *conn, const char *stmtName);
        </para>
 
        <para>
-        <function>PQdescribePrepared</> allows an application to obtain
+        <function>PQdescribePrepared</function> allows an application to obtain
         information about a previously prepared statement.
-        <function>PQdescribePrepared</> is supported only in protocol 3.0
+        <function>PQdescribePrepared</function> is supported only in protocol 3.0
         and later connections; it will fail when using protocol 2.0.
        </para>
 
        <para>
-        <parameter>stmtName</> can be <literal>""</> or <symbol>NULL</> to reference
+        <parameter>stmtName</parameter> can be <literal>""</literal> or <symbol>NULL</symbol> to reference
         the unnamed statement, otherwise it must be the name of an existing
-        prepared statement.  On success, a <structname>PGresult</> with
+        prepared statement.  On success, a <structname>PGresult</structname> with
         status <literal>PGRES_COMMAND_OK</literal> is returned.  The
         functions <function>PQnparams</function> and
         <function>PQparamtype</function> can be applied to this
-        <structname>PGresult</> to obtain information about the parameters
+        <structname>PGresult</structname> to obtain information about the parameters
         of the prepared statement, and the functions
         <function>PQnfields</function>, <function>PQfname</function>,
         <function>PQftype</function>, etc provide information about the
@@ -2596,23 +2640,23 @@ PGresult *PQdescribePortal(PGconn *conn, const char *portalName);
        </para>
 
        <para>
-        <function>PQdescribePortal</> allows an application to obtain
+        <function>PQdescribePortal</function> allows an application to obtain
         information about a previously created portal.
-        (<application>libpq</> does not provide any direct access to
+        (<application>libpq</application> does not provide any direct access to
         portals, but you can use this function to inspect the properties
-        of a cursor created with a <command>DECLARE CURSOR</> SQL command.)
-        <function>PQdescribePortal</> is supported only in protocol 3.0
+        of a cursor created with a <command>DECLARE CURSOR</command> SQL command.)
+        <function>PQdescribePortal</function> is supported only in protocol 3.0
         and later connections; it will fail when using protocol 2.0.
        </para>
 
        <para>
-        <parameter>portalName</> can be <literal>""</> or <symbol>NULL</> to reference
+        <parameter>portalName</parameter> can be <literal>""</literal> or <symbol>NULL</symbol> to reference
         the unnamed portal, otherwise it must be the name of an existing
-        portal.  On success, a <structname>PGresult</> with status
+        portal.  On success, a <structname>PGresult</structname> with status
         <literal>PGRES_COMMAND_OK</literal> is returned.  The functions
         <function>PQnfields</function>, <function>PQfname</function>,
         <function>PQftype</function>, etc can be applied to the
-        <structname>PGresult</> to obtain information about the result
+        <structname>PGresult</structname> to obtain information about the result
         columns (if any) of the portal.
        </para>
       </listitem>
@@ -2621,7 +2665,7 @@ PGresult *PQdescribePortal(PGconn *conn, const char *portalName);
    </para>
 
    <para>
-    The <structname>PGresult</structname><indexterm><primary>PGresult</></>
+    The <structname>PGresult</structname><indexterm><primary>PGresult</primary></indexterm>
     structure encapsulates the result returned by the server.
     <application>libpq</application> application programmers should be
     careful to maintain the <structname>PGresult</structname> abstraction.
@@ -2674,7 +2718,7 @@ ExecStatusType PQresultStatus(const PGresult *res);
           <listitem>
            <para>
             Successful completion of a command returning data (such as
-            a <command>SELECT</> or <command>SHOW</>).
+            a <command>SELECT</command> or <command>SHOW</command>).
            </para>
           </listitem>
          </varlistentry>
@@ -2739,10 +2783,10 @@ ExecStatusType PQresultStatus(const PGresult *res);
           <term><literal>PGRES_SINGLE_TUPLE</literal></term>
           <listitem>
            <para>
-            The <structname>PGresult</> contains a single result tuple
+            The <structname>PGresult</structname> contains a single result tuple
             from the current command.  This status occurs only when
             single-row mode has been selected for the query
-            (see <xref linkend="libpq-single-row-mode">).
+            (see <xref linkend="libpq-single-row-mode"/>).
            </para>
           </listitem>
          </varlistentry>
@@ -2766,7 +2810,7 @@ ExecStatusType PQresultStatus(const PGresult *res);
         never be returned directly by <function>PQexec</function> or other
         query execution functions; results of this kind are instead passed
         to the notice processor (see <xref
-        linkend="libpq-notice-processing">).
+        linkend="libpq-notice-processing"/>).
        </para>
       </listitem>
      </varlistentry>
@@ -2782,7 +2826,7 @@ ExecStatusType PQresultStatus(const PGresult *res);
       <listitem>
        <para>
         Converts the enumerated type returned by
-        <function>PQresultStatus</> into a string constant describing the
+        <function>PQresultStatus</function> into a string constant describing the
         status code. The caller should not free the result.
 
 <synopsis>
@@ -2809,7 +2853,7 @@ char *PQresultErrorMessage(const PGresult *res);
 </synopsis>
         If there was an error, the returned string will include a trailing
         newline.  The caller should not free the result directly. It will
-        be freed when the associated <structname>PGresult</> handle is
+        be freed when the associated <structname>PGresult</structname> handle is
         passed to <function>PQclear</function>.
        </para>
 
@@ -2841,7 +2885,7 @@ char *PQresultErrorMessage(const PGresult *res);
       <listitem>
        <para>
         Returns a reformatted version of the error message associated with
-        a <structname>PGresult</> object.
+        a <structname>PGresult</structname> object.
 <synopsis>
 char *PQresultVerboseErrorMessage(const PGresult *res,
                                   PGVerbosity verbosity,
@@ -2853,17 +2897,17 @@ char *PQresultVerboseErrorMessage(const PGresult *res,
         by computing the message that would have been produced
         by <function>PQresultErrorMessage</function> if the specified
         verbosity settings had been in effect for the connection when the
-        given <structname>PGresult</> was generated.  If
-        the <structname>PGresult</> is not an error result,
-        <quote>PGresult is not an error result</> is reported instead.
+        given <structname>PGresult</structname> was generated.  If
+        the <structname>PGresult</structname> is not an error result,
+        <quote>PGresult is not an error result</quote> is reported instead.
         The returned string includes a trailing newline.
        </para>
 
        <para>
         Unlike most other functions for extracting data from
-        a <structname>PGresult</>, the result of this function is a freshly
+        a <structname>PGresult</structname>, the result of this function is a freshly
         allocated string.  The caller must free it
-        using <function>PQfreemem()</> when the string is no longer needed.
+        using <function>PQfreemem()</function> when the string is no longer needed.
        </para>
 
        <para>
@@ -2873,20 +2917,20 @@ char *PQresultVerboseErrorMessage(const PGresult *res,
      </varlistentry>
 
      <varlistentry id="libpq-pqresulterrorfield">
-      <term><function>PQresultErrorField</function><indexterm><primary>PQresultErrorField</></></term>
+      <term><function>PQresultErrorField</function><indexterm><primary>PQresultErrorField</primary></indexterm></term>
       <listitem>
        <para>
         Returns an individual field of an error report.
 <synopsis>
 char *PQresultErrorField(const PGresult *res, int fieldcode);
 </synopsis>
-        <parameter>fieldcode</> is an error field identifier; see the symbols
+        <parameter>fieldcode</parameter> is an error field identifier; see the symbols
         listed below.  <symbol>NULL</symbol> is returned if the
         <structname>PGresult</structname> is not an error or warning result,
         or does not include the specified field.  Field values will normally
         not include a trailing newline. The caller should not free the
         result directly. It will be freed when the
-        associated <structname>PGresult</> handle is passed to
+        associated <structname>PGresult</structname> handle is passed to
         <function>PQclear</function>.
        </para>
 
@@ -2894,29 +2938,29 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
         The following field codes are available:
         <variablelist>
          <varlistentry id="libpq-pg-diag-severity">
-          <term><symbol>PG_DIAG_SEVERITY</></term>
+          <term><symbol>PG_DIAG_SEVERITY</symbol></term>
           <listitem>
            <para>
-            The severity; the field contents are <literal>ERROR</>,
-            <literal>FATAL</>, or <literal>PANIC</> (in an error message),
-            or <literal>WARNING</>, <literal>NOTICE</>, <literal>DEBUG</>,
-            <literal>INFO</>, or <literal>LOG</> (in a notice message), or
+            The severity; the field contents are <literal>ERROR</literal>,
+            <literal>FATAL</literal>, or <literal>PANIC</literal> (in an error message),
+            or <literal>WARNING</literal>, <literal>NOTICE</literal>, <literal>DEBUG</literal>,
+            <literal>INFO</literal>, or <literal>LOG</literal> (in a notice message), or
             a localized translation of one of these.  Always present.
            </para>
           </listitem>
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-severity-nonlocalized">
-          <term><symbol>PG_DIAG_SEVERITY_NONLOCALIZED</></term>
+          <term><symbol>PG_DIAG_SEVERITY_NONLOCALIZED</symbol></term>
           <listitem>
            <para>
-            The severity; the field contents are <literal>ERROR</>,
-            <literal>FATAL</>, or <literal>PANIC</> (in an error message),
-            or <literal>WARNING</>, <literal>NOTICE</>, <literal>DEBUG</>,
-            <literal>INFO</>, or <literal>LOG</> (in a notice message).
-            This is identical to the <symbol>PG_DIAG_SEVERITY</> field except
+            The severity; the field contents are <literal>ERROR</literal>,
+            <literal>FATAL</literal>, or <literal>PANIC</literal> (in an error message),
+            or <literal>WARNING</literal>, <literal>NOTICE</literal>, <literal>DEBUG</literal>,
+            <literal>INFO</literal>, or <literal>LOG</literal> (in a notice message).
+            This is identical to the <symbol>PG_DIAG_SEVERITY</symbol> field except
             that the contents are never localized.  This is present only in
-            reports generated by <productname>PostgreSQL</> versions 9.6
+            reports generated by <productname>PostgreSQL</productname> versions 9.6
             and later.
            </para>
           </listitem>
@@ -2924,7 +2968,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
 
          <varlistentry id="libpq-pg-diag-sqlstate">
           <term>
-           <symbol>PG_DIAG_SQLSTATE</>
+           <symbol>PG_DIAG_SQLSTATE</symbol>
           <indexterm>
            <primary>error codes</primary>
            <secondary>libpq</secondary>
@@ -2937,14 +2981,14 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
             front-end applications to perform specific operations (such
             as error handling) in response to a particular database error.
             For a list of the possible SQLSTATE codes, see <xref
-            linkend="errcodes-appendix">. This field is not localizable,
+            linkend="errcodes-appendix"/>. This field is not localizable,
             and is always present.
            </para>
           </listitem>
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-message-primary">
-          <term><symbol>PG_DIAG_MESSAGE_PRIMARY</></term>
+          <term><symbol>PG_DIAG_MESSAGE_PRIMARY</symbol></term>
           <listitem>
            <para>
             The primary human-readable error message (typically one line).
@@ -2954,7 +2998,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-message-detail">
-          <term><symbol>PG_DIAG_MESSAGE_DETAIL</></term>
+          <term><symbol>PG_DIAG_MESSAGE_DETAIL</symbol></term>
           <listitem>
            <para>
             Detail: an optional secondary error message carrying more
@@ -2964,7 +3008,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-message-hint">
-          <term><symbol>PG_DIAG_MESSAGE_HINT</></term>
+          <term><symbol>PG_DIAG_MESSAGE_HINT</symbol></term>
           <listitem>
            <para>
             Hint: an optional suggestion what to do about the problem.
@@ -2976,7 +3020,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-statement-position">
-          <term><symbol>PG_DIAG_STATEMENT_POSITION</></term>
+          <term><symbol>PG_DIAG_STATEMENT_POSITION</symbol></term>
           <listitem>
            <para>
             A string containing a decimal integer indicating an error cursor
@@ -2988,21 +3032,21 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-internal-position">
-          <term><symbol>PG_DIAG_INTERNAL_POSITION</></term>
+          <term><symbol>PG_DIAG_INTERNAL_POSITION</symbol></term>
           <listitem>
            <para>
             This is defined the same as the
-            <symbol>PG_DIAG_STATEMENT_POSITION</> field, but it is used
+            <symbol>PG_DIAG_STATEMENT_POSITION</symbol> field, but it is used
             when the cursor position refers to an internally generated
             command rather than the one submitted by the client.  The
-            <symbol>PG_DIAG_INTERNAL_QUERY</> field will always appear when
+            <symbol>PG_DIAG_INTERNAL_QUERY</symbol> field will always appear when
             this field appears.
            </para>
           </listitem>
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-internal-query">
-          <term><symbol>PG_DIAG_INTERNAL_QUERY</></term>
+          <term><symbol>PG_DIAG_INTERNAL_QUERY</symbol></term>
           <listitem>
            <para>
             The text of a failed internally-generated command.  This could
@@ -3012,7 +3056,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-context">
-          <term><symbol>PG_DIAG_CONTEXT</></term>
+          <term><symbol>PG_DIAG_CONTEXT</symbol></term>
           <listitem>
            <para>
             An indication of the context in which the error occurred.
@@ -3024,7 +3068,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-schema-name">
-          <term><symbol>PG_DIAG_SCHEMA_NAME</></term>
+          <term><symbol>PG_DIAG_SCHEMA_NAME</symbol></term>
           <listitem>
            <para>
             If the error was associated with a specific database object,
@@ -3034,7 +3078,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-table-name">
-          <term><symbol>PG_DIAG_TABLE_NAME</></term>
+          <term><symbol>PG_DIAG_TABLE_NAME</symbol></term>
           <listitem>
            <para>
             If the error was associated with a specific table, the name of the
@@ -3045,7 +3089,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-column-name">
-          <term><symbol>PG_DIAG_COLUMN_NAME</></term>
+          <term><symbol>PG_DIAG_COLUMN_NAME</symbol></term>
           <listitem>
            <para>
             If the error was associated with a specific table column, the name
@@ -3056,7 +3100,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-datatype-name">
-          <term><symbol>PG_DIAG_DATATYPE_NAME</></term>
+          <term><symbol>PG_DIAG_DATATYPE_NAME</symbol></term>
           <listitem>
            <para>
             If the error was associated with a specific data type, the name of
@@ -3067,7 +3111,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-constraint-name">
-          <term><symbol>PG_DIAG_CONSTRAINT_NAME</></term>
+          <term><symbol>PG_DIAG_CONSTRAINT_NAME</symbol></term>
           <listitem>
            <para>
             If the error was associated with a specific constraint, the name
@@ -3080,7 +3124,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-source-file">
-          <term><symbol>PG_DIAG_SOURCE_FILE</></term>
+          <term><symbol>PG_DIAG_SOURCE_FILE</symbol></term>
           <listitem>
            <para>
             The file name of the source-code location where the error was
@@ -3090,7 +3134,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-source-line">
-          <term><symbol>PG_DIAG_SOURCE_LINE</></term>
+          <term><symbol>PG_DIAG_SOURCE_LINE</symbol></term>
           <listitem>
            <para>
             The line number of the source-code location where the error
@@ -3100,7 +3144,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
          </varlistentry>
 
          <varlistentry id="libpq-pg-diag-source-function">
-          <term><symbol>PG_DIAG_SOURCE_FUNCTION</></term>
+          <term><symbol>PG_DIAG_SOURCE_FUNCTION</symbol></term>
           <listitem>
            <para>
             The name of the source-code function reporting the error.
@@ -3114,7 +3158,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
         <para>
          The fields for schema name, table name, column name, data type name,
          and constraint name are supplied only for a limited number of error
-         types; see <xref linkend="errcodes-appendix">.  Do not assume that
+         types; see <xref linkend="errcodes-appendix"/>.  Do not assume that
          the presence of any of these fields guarantees the presence of
          another field.  Core error sources observe the interrelationships
          noted above, but user-defined functions may use these fields in other
@@ -3147,7 +3191,7 @@ char *PQresultErrorField(const PGresult *res, int fieldcode);
      </varlistentry>
 
      <varlistentry id="libpq-pqclear">
-      <term><function>PQclear</function><indexterm><primary>PQclear</></></term>
+      <term><function>PQclear</function><indexterm><primary>PQclear</primary></indexterm></term>
       <listitem>
        <para>
         Frees  the  storage  associated with a
@@ -3180,7 +3224,7 @@ void PQclear(PGresult *res);
     These functions are used to extract information from a
     <structname>PGresult</structname> object that represents a successful
     query result (that is, one that has status
-    <literal>PGRES_TUPLES_OK</literal> or <literal>PGRES_SINGLE_TUPLE</>).
+    <literal>PGRES_TUPLES_OK</literal> or <literal>PGRES_SINGLE_TUPLE</literal>).
     They can also be used to extract
     information from a successful Describe operation: a Describe's result
     has all the same column information that actual execution of the query
@@ -3199,9 +3243,10 @@ void PQclear(PGresult *res);
 
      <listitem>
       <para>
-       Returns the number of rows (tuples) in the query result.  Because
-       it returns an integer result, large result sets might overflow the
-       return value on 32-bit operating systems.
+       Returns the number of rows (tuples) in the query result.
+       (Note that <structname>PGresult</structname> objects are limited to no more
+       than <literal>INT_MAX</literal> rows, so an <type>int</type> result is
+       sufficient.)
 
 <synopsis>
 int PQntuples(const PGresult *res);
@@ -3244,7 +3289,7 @@ int PQnfields(const PGresult *res);
        Returns the column name associated with the given column number.
        Column numbers start at 0. The caller should not free the result
        directly. It will be freed when the associated
-       <structname>PGresult</> handle is passed to
+       <structname>PGresult</structname> handle is passed to
        <function>PQclear</function>.
 <synopsis>
 char *PQfname(const PGresult *res,
@@ -3318,7 +3363,7 @@ Oid PQftable(const PGresult *res,
       </para>
 
       <para>
-       <literal>InvalidOid</> is returned if the column number is out of range,
+       <literal>InvalidOid</literal> is returned if the column number is out of range,
        or if the specified column is not a simple reference to a table column,
        or when using pre-3.0 protocol.
        You can query the system table <literal>pg_class</literal> to determine
@@ -3437,7 +3482,7 @@ int PQfmod(const PGresult *res,
       <para>
        The interpretation of modifier values is type-specific; they
        typically indicate precision or size limits.  The value -1 is
-       used to indicate <quote>no information available</>.  Most data
+       used to indicate <quote>no information available</quote>.  Most data
        types do not use modifiers, in which case the value is always
        -1.
       </para>
@@ -3463,7 +3508,7 @@ int PQfsize(const PGresult *res,
       </para>
 
       <para>
-       <function>PQfsize</> returns the space allocated for this column
+       <function>PQfsize</function> returns the space allocated for this column
        in a database row, in other words the size of the server's
        internal representation of the data type.  (Accordingly, it is
        not really very useful to clients.) A negative value indicates
@@ -3482,7 +3527,7 @@ int PQfsize(const PGresult *res,
 
      <listitem>
       <para>
-       Returns 1 if the <structname>PGresult</> contains binary data
+       Returns 1 if the <structname>PGresult</structname> contains binary data
        and 0 if it contains text data.
 <synopsis>
 int PQbinaryTuples(const PGresult *res);
@@ -3491,10 +3536,10 @@ int PQbinaryTuples(const PGresult *res);
 
       <para>
        This function is deprecated (except for its use in connection with
-       <command>COPY</>), because it is possible for a single
-       <structname>PGresult</> to contain text data in some columns and
-       binary data in others.  <function>PQfformat</> is preferred.
-       <function>PQbinaryTuples</> returns 1 only if all columns of the
+       <command>COPY</command>), because it is possible for a single
+       <structname>PGresult</structname> to contain text data in some columns and
+       binary data in others.  <function>PQfformat</function> is preferred.
+       <function>PQbinaryTuples</function> returns 1 only if all columns of the
        result are binary (format 1).
       </para>
      </listitem>
@@ -3513,7 +3558,7 @@ int PQbinaryTuples(const PGresult *res);
        Returns a single field value of one row of a
        <structname>PGresult</structname>.  Row and column numbers start
        at 0.  The caller should not free the result directly.  It will
-       be freed when the associated <structname>PGresult</> handle is
+       be freed when the associated <structname>PGresult</structname> handle is
        passed to <function>PQclear</function>.
 <synopsis>
 char *PQgetvalue(const PGresult *res,
@@ -3527,7 +3572,7 @@ char *PQgetvalue(const PGresult *res,
        <function>PQgetvalue</function> is a null-terminated character
        string  representation of the field value.  For data in binary
        format, the value is in the binary representation determined by
-       the data type's <function>typsend</> and <function>typreceive</>
+       the data type's <function>typsend</function> and <function>typreceive</function>
        functions.  (The value is actually followed by a zero byte in
        this case too, but that is not ordinarily useful, since the
        value is likely to contain embedded nulls.)
@@ -3535,7 +3580,7 @@ char *PQgetvalue(const PGresult *res,
 
       <para>
        An empty string is returned if the field value is null.  See
-       <function>PQgetisnull</> to distinguish null values from
+       <function>PQgetisnull</function> to distinguish null values from
        empty-string values.
       </para>
 
@@ -3604,8 +3649,8 @@ int PQgetlength(const PGresult *res,
        This is the actual data length for the particular data value,
        that is, the size of the object pointed to by
        <function>PQgetvalue</function>.  For text data format this is
-       the same as <function>strlen()</>.  For binary format this is
-       essential information.  Note that one should <emphasis>not</>
+       the same as <function>strlen()</function>.  For binary format this is
+       essential information.  Note that one should <emphasis>not</emphasis>
        rely on <function>PQfsize</function> to obtain the actual data
        length.
       </para>
@@ -3630,7 +3675,7 @@ int PQnparams(const PGresult *res);
 
       <para>
        This function is only useful when inspecting the result of
-       <function>PQdescribePrepared</>.  For other types of queries it
+       <function>PQdescribePrepared</function>.  For other types of queries it
        will return zero.
       </para>
      </listitem>
@@ -3655,7 +3700,7 @@ Oid PQparamtype(const PGresult *res, int param_number);
 
       <para>
        This function is only useful when inspecting the result of
-       <function>PQdescribePrepared</>.  For other types of queries it
+       <function>PQdescribePrepared</function>.  For other types of queries it
        will return zero.
       </para>
      </listitem>
@@ -3733,7 +3778,7 @@ char *PQcmdStatus(PGresult *res);
        Commonly this is just the name of the command, but it might include
        additional data such as the number of rows processed. The caller
        should not free the result directly. It will be freed when the
-       associated <structname>PGresult</> handle is passed to
+       associated <structname>PGresult</structname> handle is passed to
        <function>PQclear</function>.
       </para>
      </listitem>
@@ -3757,17 +3802,17 @@ char *PQcmdTuples(PGresult *res);
 
       <para>
        This function returns a string containing the number of rows
-       affected by the <acronym>SQL</> statement that generated the
-       <structname>PGresult</>. This function can only be used following
-       the execution of a <command>SELECT</>, <command>CREATE TABLE AS</>,
-       <command>INSERT</>, <command>UPDATE</>, <command>DELETE</>,
-       <command>MOVE</>, <command>FETCH</>, or <command>COPY</> statement,
-       or an <command>EXECUTE</> of a prepared query that contains an
-       <command>INSERT</>, <command>UPDATE</>, or <command>DELETE</> statement.
-       If the command that generated the <structname>PGresult</> was anything
-       else, <function>PQcmdTuples</> returns an empty string. The caller
+       affected by the <acronym>SQL</acronym> statement that generated the
+       <structname>PGresult</structname>. This function can only be used following
+       the execution of a <command>SELECT</command>, <command>CREATE TABLE AS</command>,
+       <command>INSERT</command>, <command>UPDATE</command>, <command>DELETE</command>,
+       <command>MOVE</command>, <command>FETCH</command>, or <command>COPY</command> statement,
+       or an <command>EXECUTE</command> of a prepared query that contains an
+       <command>INSERT</command>, <command>UPDATE</command>, or <command>DELETE</command> statement.
+       If the command that generated the <structname>PGresult</structname> was anything
+       else, <function>PQcmdTuples</function> returns an empty string. The caller
        should not free the return value directly. It will be freed when
-       the associated <structname>PGresult</> handle is passed to
+       the associated <structname>PGresult</structname> handle is passed to
        <function>PQclear</function>.
       </para>
      </listitem>
@@ -3783,14 +3828,14 @@ char *PQcmdTuples(PGresult *res);
 
      <listitem>
       <para>
-       Returns the OID<indexterm><primary>OID</><secondary>in libpq</></>
-       of the inserted row, if the <acronym>SQL</> command was an
-       <command>INSERT</> that inserted exactly one row into a table that
-       has OIDs, or a <command>EXECUTE</> of a prepared query containing
-       a suitable <command>INSERT</> statement.  Otherwise, this function
+       Returns the OID<indexterm><primary>OID</primary><secondary>in libpq</secondary></indexterm>
+       of the inserted row, if the <acronym>SQL</acronym> command was an
+       <command>INSERT</command> that inserted exactly one row into a table that
+       has OIDs, or a <command>EXECUTE</command> of a prepared query containing
+       a suitable <command>INSERT</command> statement.  Otherwise, this function
        returns <literal>InvalidOid</literal>. This function will also
        return <literal>InvalidOid</literal> if the table affected by the
-       <command>INSERT</> statement does not contain OIDs.
+       <command>INSERT</command> statement does not contain OIDs.
 <synopsis>
 Oid PQoidValue(const PGresult *res);
 </synopsis>
@@ -3853,19 +3898,19 @@ char *PQescapeLiteral(PGconn *conn, const char *str, size_t length);
       values as literal constants in SQL commands.  Certain characters
       (such as quotes and backslashes) must be escaped to prevent them
       from being interpreted specially by the SQL parser.
-      <function>PQescapeLiteral</> performs this operation.
+      <function>PQescapeLiteral</function> performs this operation.
      </para>
 
      <para>
-      <function>PQescapeLiteral</> returns an escaped version of the
+      <function>PQescapeLiteral</function> returns an escaped version of the
       <parameter>str</parameter> parameter in memory allocated with
-      <function>malloc()</>.  This memory should be freed using
-      <function>PQfreemem()</> when the result is no longer needed.
+      <function>malloc()</function>.  This memory should be freed using
+      <function>PQfreemem()</function> when the result is no longer needed.
       A terminating zero byte is not required, and should not be
-      counted in <parameter>length</>.  (If a terminating zero byte is found
-      before <parameter>length</> bytes are processed,
-      <function>PQescapeLiteral</> stops at the zero; the behavior is
-      thus rather like <function>strncpy</>.) The
+      counted in <parameter>length</parameter>.  (If a terminating zero byte is found
+      before <parameter>length</parameter> bytes are processed,
+      <function>PQescapeLiteral</function> stops at the zero; the behavior is
+      thus rather like <function>strncpy</function>.) The
       return string has all special characters replaced so that they can
       be properly processed by the <productname>PostgreSQL</productname>
       string literal parser.  A terminating zero byte is also added.  The
@@ -3874,8 +3919,8 @@ char *PQescapeLiteral(PGconn *conn, const char *str, size_t length);
      </para>
 
      <para>
-      On error, <function>PQescapeLiteral</> returns <symbol>NULL</> and a suitable
-      message is stored in the <parameter>conn</> object.
+      On error, <function>PQescapeLiteral</function> returns <symbol>NULL</symbol> and a suitable
+      message is stored in the <parameter>conn</parameter> object.
      </para>
 
      <tip>
@@ -3883,14 +3928,14 @@ char *PQescapeLiteral(PGconn *conn, const char *str, size_t length);
        It is especially important to do proper escaping when handling
        strings that were received from an untrustworthy source.
        Otherwise there is a security risk: you are vulnerable to
-       <quote>SQL injection</> attacks wherein unwanted SQL commands are
+       <quote>SQL injection</quote> attacks wherein unwanted SQL commands are
        fed to your database.
       </para>
      </tip>
 
      <para>
       Note that it is not necessary nor correct to do escaping when a data
-      value is passed as a separate parameter in <function>PQexecParams</> or
+      value is passed as a separate parameter in <function>PQexecParams</function> or
       its sibling routines.
      </para>
      </listitem>
@@ -3921,15 +3966,15 @@ char *PQescapeIdentifier(PGconn *conn, const char *str, size_t length);
      </para>
 
      <para>
-      <function>PQescapeIdentifier</> returns a version of the
+      <function>PQescapeIdentifier</function> returns a version of the
       <parameter>str</parameter> parameter escaped as an SQL identifier
-      in memory allocated with <function>malloc()</>.  This memory must be
-      freed using <function>PQfreemem()</> when the result is no longer
+      in memory allocated with <function>malloc()</function>.  This memory must be
+      freed using <function>PQfreemem()</function> when the result is no longer
       needed.  A terminating zero byte is not required, and should not be
-      counted in <parameter>length</>.  (If a terminating zero byte is found
-      before <parameter>length</> bytes are processed,
-      <function>PQescapeIdentifier</> stops at the zero; the behavior is
-      thus rather like <function>strncpy</>.) The
+      counted in <parameter>length</parameter>.  (If a terminating zero byte is found
+      before <parameter>length</parameter> bytes are processed,
+      <function>PQescapeIdentifier</function> stops at the zero; the behavior is
+      thus rather like <function>strncpy</function>.) The
       return string has all special characters replaced so that it
       will be properly processed as an SQL identifier.  A terminating zero byte
       is also added.  The return string will also be surrounded by double
@@ -3937,8 +3982,8 @@ char *PQescapeIdentifier(PGconn *conn, const char *str, size_t length);
      </para>
 
      <para>
-      On error, <function>PQescapeIdentifier</> returns <symbol>NULL</> and a suitable
-      message is stored in the <parameter>conn</> object.
+      On error, <function>PQescapeIdentifier</function> returns <symbol>NULL</symbol> and a suitable
+      message is stored in the <parameter>conn</parameter> object.
      </para>
 
      <tip>
@@ -3969,39 +4014,39 @@ size_t PQescapeStringConn(PGconn *conn,
      </para>
 
      <para>
-      <function>PQescapeStringConn</> escapes string literals, much like
-      <function>PQescapeLiteral</>.  Unlike <function>PQescapeLiteral</>,
+      <function>PQescapeStringConn</function> escapes string literals, much like
+      <function>PQescapeLiteral</function>.  Unlike <function>PQescapeLiteral</function>,
       the caller is responsible for providing an appropriately sized buffer.
-      Furthermore, <function>PQescapeStringConn</> does not generate the
-      single quotes that must surround <productname>PostgreSQL</> string
+      Furthermore, <function>PQescapeStringConn</function> does not generate the
+      single quotes that must surround <productname>PostgreSQL</productname> string
       literals; they should be provided in the SQL command that the
-      result is inserted into.  The parameter <parameter>from</> points to
+      result is inserted into.  The parameter <parameter>from</parameter> points to
       the first character of the string that is to be escaped, and the
-      <parameter>length</> parameter gives the number of bytes in this
+      <parameter>length</parameter> parameter gives the number of bytes in this
       string.  A terminating zero byte is not required, and should not be
-      counted in <parameter>length</>.  (If a terminating zero byte is found
-      before <parameter>length</> bytes are processed,
-      <function>PQescapeStringConn</> stops at the zero; the behavior is
-      thus rather like <function>strncpy</>.) <parameter>to</> shall point
+      counted in <parameter>length</parameter>.  (If a terminating zero byte is found
+      before <parameter>length</parameter> bytes are processed,
+      <function>PQescapeStringConn</function> stops at the zero; the behavior is
+      thus rather like <function>strncpy</function>.) <parameter>to</parameter> shall point
       to a buffer that is able to hold at least one more byte than twice
-      the value of <parameter>length</>, otherwise the behavior is undefined.
-      Behavior is likewise undefined if the <parameter>to</> and
-      <parameter>from</> strings overlap.
+      the value of <parameter>length</parameter>, otherwise the behavior is undefined.
+      Behavior is likewise undefined if the <parameter>to</parameter> and
+      <parameter>from</parameter> strings overlap.
      </para>
 
      <para>
-      If the <parameter>error</> parameter is not <symbol>NULL</>, then
-      <literal>*error</> is set to zero on success, nonzero on error.
+      If the <parameter>error</parameter> parameter is not <symbol>NULL</symbol>, then
+      <literal>*error</literal> is set to zero on success, nonzero on error.
       Presently the only possible error conditions involve invalid multibyte
       encoding in the source string.  The output string is still generated
       on error, but it can be expected that the server will reject it as
       malformed.  On error, a suitable message is stored in the
-      <parameter>conn</> object, whether or not <parameter>error</> is <symbol>NULL</>.
+      <parameter>conn</parameter> object, whether or not <parameter>error</parameter> is <symbol>NULL</symbol>.
      </para>
 
      <para>
-      <function>PQescapeStringConn</> returns the number of bytes written
-      to <parameter>to</>, not including the terminating zero byte.
+      <function>PQescapeStringConn</function> returns the number of bytes written
+      to <parameter>to</parameter>, not including the terminating zero byte.
      </para>
      </listitem>
     </varlistentry>
@@ -4016,30 +4061,30 @@ size_t PQescapeStringConn(PGconn *conn,
 
      <listitem>
      <para>
-       <function>PQescapeString</> is an older, deprecated version of
-       <function>PQescapeStringConn</>.
+       <function>PQescapeString</function> is an older, deprecated version of
+       <function>PQescapeStringConn</function>.
 <synopsis>
 size_t PQescapeString (char *to, const char *from, size_t length);
 </synopsis>
      </para>
 
      <para>
-      The only difference from <function>PQescapeStringConn</> is that
-      <function>PQescapeString</> does not take <structname>PGconn</>
-      or <parameter>error</> parameters.
+      The only difference from <function>PQescapeStringConn</function> is that
+      <function>PQescapeString</function> does not take <structname>PGconn</structname>
+      or <parameter>error</parameter> parameters.
       Because of this, it cannot adjust its behavior depending on the
       connection properties (such as character encoding) and therefore
-      <emphasis>it might give the wrong results</>.  Also, it has no way
+      <emphasis>it might give the wrong results</emphasis>.  Also, it has no way
       to report error conditions.
      </para>
 
      <para>
-      <function>PQescapeString</> can be used safely in
-      client programs that work with only one <productname>PostgreSQL</>
+      <function>PQescapeString</function> can be used safely in
+      client programs that work with only one <productname>PostgreSQL</productname>
       connection at a time (in this case it can find out what it needs to
-      know <quote>behind the scenes</>).  In other contexts it is a security
+      know <quote>behind the scenes</quote>).  In other contexts it is a security
       hazard and should be avoided in favor of
-      <function>PQescapeStringConn</>.
+      <function>PQescapeStringConn</function>.
      </para>
      </listitem>
     </varlistentry>
@@ -4070,7 +4115,7 @@ unsigned char *PQescapeByteaConn(PGconn *conn,
        <type>bytea</type> literal in an <acronym>SQL</acronym> statement.
        <function>PQescapeByteaConn</function> escapes bytes using
        either hex encoding or backslash escaping.  See <xref
-       linkend="datatype-binary"> for more information.
+       linkend="datatype-binary"/> for more information.
       </para>
 
       <para>
@@ -4085,10 +4130,10 @@ unsigned char *PQescapeByteaConn(PGconn *conn,
       </para>
 
       <para>
-       <function>PQescapeByteaConn</> returns an escaped version of the
+       <function>PQescapeByteaConn</function> returns an escaped version of the
        <parameter>from</parameter> parameter binary string in memory
-       allocated with <function>malloc()</>.  This memory should be freed using
-       <function>PQfreemem()</> when the result is no longer needed.  The
+       allocated with <function>malloc()</function>.  This memory should be freed using
+       <function>PQfreemem()</function> when the result is no longer needed.  The
        return string has all special characters replaced so that they can
        be properly processed by the <productname>PostgreSQL</productname>
        string literal parser, and the <type>bytea</type> input function. A
@@ -4099,7 +4144,7 @@ unsigned char *PQescapeByteaConn(PGconn *conn,
 
       <para>
        On error, a null pointer is returned, and a suitable error message
-       is stored in the <parameter>conn</> object.  Currently, the only
+       is stored in the <parameter>conn</parameter> object.  Currently, the only
        possible error is insufficient memory for the result string.
       </para>
      </listitem>
@@ -4115,8 +4160,8 @@ unsigned char *PQescapeByteaConn(PGconn *conn,
 
      <listitem>
       <para>
-       <function>PQescapeBytea</> is an older, deprecated version of
-       <function>PQescapeByteaConn</>.
+       <function>PQescapeBytea</function> is an older, deprecated version of
+       <function>PQescapeByteaConn</function>.
 <synopsis>
 unsigned char *PQescapeBytea(const unsigned char *from,
                              size_t from_length,
@@ -4125,15 +4170,15 @@ unsigned char *PQescapeBytea(const unsigned char *from,
       </para>
 
       <para>
-       The only difference from <function>PQescapeByteaConn</> is that
-       <function>PQescapeBytea</> does not take a <structname>PGconn</>
-       parameter.  Because of this, <function>PQescapeBytea</> can
+       The only difference from <function>PQescapeByteaConn</function> is that
+       <function>PQescapeBytea</function> does not take a <structname>PGconn</structname>
+       parameter.  Because of this, <function>PQescapeBytea</function> can
        only be used safely in client programs that use a single
-       <productname>PostgreSQL</> connection at a time (in this case
+       <productname>PostgreSQL</productname> connection at a time (in this case
        it can find out what it needs to know <quote>behind the
-       scenes</>).  It <emphasis>might give the wrong results</> if
+       scenes</quote>).  It <emphasis>might give the wrong results</emphasis> if
        used in programs that use multiple database connections (use
-       <function>PQescapeByteaConn</> in such cases).
+       <function>PQescapeByteaConn</function> in such cases).
       </para>
      </listitem>
     </varlistentry>
@@ -4164,17 +4209,17 @@ unsigned char *PQunescapeBytea(const unsigned char *from, size_t *to_length);
        to a <type>bytea</type> column. <function>PQunescapeBytea</function>
        converts this string representation into its binary representation.
        It returns a pointer to a buffer allocated with
-       <function>malloc()</function>, or <symbol>NULL</> on error, and puts the size of
+       <function>malloc()</function>, or <symbol>NULL</symbol> on error, and puts the size of
        the buffer in <parameter>to_length</parameter>. The result must be
-       freed using <function>PQfreemem</> when it is no longer needed.
+       freed using <function>PQfreemem</function> when it is no longer needed.
       </para>
 
       <para>
        This conversion is not exactly the inverse of
        <function>PQescapeBytea</function>, because the string is not expected
-       to be <quote>escaped</> when received from <function>PQgetvalue</function>.
+       to be <quote>escaped</quote> when received from <function>PQgetvalue</function>.
        In particular this means there is no need for string quoting considerations,
-       and so no need for a <structname>PGconn</> parameter.
+       and so no need for a <structname>PGconn</structname> parameter.
       </para>
      </listitem>
     </varlistentry>
@@ -4268,7 +4313,7 @@ unsigned char *PQunescapeBytea(const unsigned char *from, size_t *to_length);
       <para>
        Submits a command to the server without waiting for the result(s).
        1 is returned if the command was successfully dispatched and 0 if
-       not (in which case, use <function>PQerrorMessage</> to get more
+       not (in which case, use <function>PQerrorMessage</function> to get more
        information about the failure).
 <synopsis>
 int PQsendQuery(PGconn *conn, const char *command);
@@ -4318,7 +4363,7 @@ int PQsendQueryParams(PGconn *conn,
 
     <varlistentry id="libpq-pqsendprepare">
      <term>
-      <function>PQsendPrepare</>
+      <function>PQsendPrepare</function>
       <indexterm>
        <primary>PQsendPrepare</primary>
       </indexterm>
@@ -4336,7 +4381,7 @@ int PQsendPrepare(PGconn *conn,
                   const Oid *paramTypes);
 </synopsis>
 
-       This is an asynchronous version of <function>PQprepare</>: it
+       This is an asynchronous version of <function>PQprepare</function>: it
        returns 1 if it was able to dispatch the request, and 0 if not.
        After a successful call, call <function>PQgetResult</function> to
        determine whether the server successfully created the prepared
@@ -4383,7 +4428,7 @@ int PQsendQueryPrepared(PGconn *conn,
 
     <varlistentry id="libpq-pqsenddescribeprepared">
      <term>
-      <function>PQsendDescribePrepared</>
+      <function>PQsendDescribePrepared</function>
       <indexterm>
        <primary>PQsendDescribePrepared</primary>
       </indexterm>
@@ -4397,7 +4442,7 @@ int PQsendQueryPrepared(PGconn *conn,
 int PQsendDescribePrepared(PGconn *conn, const char *stmtName);
 </synopsis>
 
-       This is an asynchronous version of <function>PQdescribePrepared</>:
+       This is an asynchronous version of <function>PQdescribePrepared</function>:
        it returns 1 if it was able to dispatch the request, and 0 if not.
        After a successful call, call <function>PQgetResult</function> to
        obtain the results.  The function's parameters are handled
@@ -4410,7 +4455,7 @@ int PQsendDescribePrepared(PGconn *conn, const char *stmtName);
 
     <varlistentry id="libpq-pqsenddescribeportal">
      <term>
-      <function>PQsendDescribePortal</>
+      <function>PQsendDescribePortal</function>
       <indexterm>
        <primary>PQsendDescribePortal</primary>
       </indexterm>
@@ -4424,7 +4469,7 @@ int PQsendDescribePrepared(PGconn *conn, const char *stmtName);
 int PQsendDescribePortal(PGconn *conn, const char *portalName);
 </synopsis>
 
-       This is an asynchronous version of <function>PQdescribePortal</>:
+       This is an asynchronous version of <function>PQdescribePortal</function>:
        it returns 1 if it was able to dispatch the request, and 0 if not.
        After a successful call, call <function>PQgetResult</function> to
        obtain the results.  The function's parameters are handled
@@ -4467,7 +4512,7 @@ PGresult *PQgetResult(PGconn *conn);
        <function>PQgetResult</function> will just return a null pointer
        at once.) Each non-null result from
        <function>PQgetResult</function> should be processed using the
-       same <structname>PGresult</> accessor functions previously
+       same <structname>PGresult</structname> accessor functions previously
        described.  Don't forget to free each result object with
        <function>PQclear</function> when done with it.  Note that
        <function>PQgetResult</function> will block only if a command is
@@ -4479,7 +4524,7 @@ PGresult *PQgetResult(PGconn *conn);
        <para>
         Even when <function>PQresultStatus</function> indicates a fatal
         error, <function>PQgetResult</function> should be called until it
-        returns a null pointer, to allow <application>libpq</> to
+        returns a null pointer, to allow <application>libpq</application> to
         process the error information completely.
        </para>
       </note>
@@ -4503,7 +4548,7 @@ PGresult *PQgetResult(PGconn *conn);
    Another frequently-desired feature that can be obtained with
    <function>PQsendQuery</function> and <function>PQgetResult</function>
    is retrieving large query results a row at a time.  This is discussed
-   in <xref linkend="libpq-single-row-mode">.
+   in <xref linkend="libpq-single-row-mode"/>.
   </para>
 
   <para>
@@ -4584,7 +4629,7 @@ int PQisBusy(PGconn *conn);
 
   <para>
    A typical application using these functions will have a main loop that
-   uses <function>select()</function> or <function>poll()</> to wait for
+   uses <function>select()</function> or <function>poll()</function> to wait for
    all the conditions that it must respond to.  One of the conditions
    will be input available from the server, which in terms of
    <function>select()</function> means readable data on the file
@@ -4594,15 +4639,15 @@ int PQisBusy(PGconn *conn);
    call <function>PQisBusy</function>, followed by
    <function>PQgetResult</function> if <function>PQisBusy</function>
    returns false (0).  It can also call <function>PQnotifies</function>
-   to detect <command>NOTIFY</> messages (see <xref
-   linkend="libpq-notify">).
+   to detect <command>NOTIFY</command> messages (see <xref
+   linkend="libpq-notify"/>).
   </para>
 
   <para>
    A client that uses
    <function>PQsendQuery</function>/<function>PQgetResult</function>
    can also attempt to cancel a command that is still being processed
-   by the server; see <xref linkend="libpq-cancel">.  But regardless of
+   by the server; see <xref linkend="libpq-cancel"/>.  But regardless of
    the return value of <function>PQcancel</function>, the application
    must continue with the normal result-reading sequence using
    <function>PQgetResult</function>.  A successful cancellation will
@@ -4732,12 +4777,12 @@ int PQflush(PGconn *conn);
   </indexterm>
 
   <para>
-   Ordinarily, <application>libpq</> collects a SQL command's
+   Ordinarily, <application>libpq</application> collects a SQL command's
    entire result and returns it to the application as a single
    <structname>PGresult</structname>.  This can be unworkable for commands
    that return a large number of rows.  For such cases, applications can use
    <function>PQsendQuery</function> and <function>PQgetResult</function> in
-   <firstterm>single-row mode</>.  In this mode, the result row(s) are
+   <firstterm>single-row mode</firstterm>.  In this mode, the result row(s) are
    returned to the application one at a time, as they are received from the
    server.
   </para>
@@ -4748,7 +4793,7 @@ int PQflush(PGconn *conn);
    (or a sibling function).  This mode selection is effective only for the
    currently executing query.  Then call <function>PQgetResult</function>
    repeatedly, until it returns null, as documented in <xref
-   linkend="libpq-async">.  If the query returns any rows, they are returned
+   linkend="libpq-async"/>.  If the query returns any rows, they are returned
    as individual <structname>PGresult</structname> objects, which look like
    normal query results except for having status code
    <literal>PGRES_SINGLE_TUPLE</literal> instead of
@@ -4802,7 +4847,7 @@ int PQsetSingleRowMode(PGconn *conn);
    <para>
     While processing a query, the server may return some rows and then
     encounter an error, causing the query to be aborted.  Ordinarily,
-    <application>libpq</> discards any such rows and reports only the
+    <application>libpq</application> discards any such rows and reports only the
     error.  But in single-row mode, those rows will have already been
     returned to the application.  Hence, the application will see some
     <literal>PGRES_SINGLE_TUPLE</literal> <structname>PGresult</structname>
@@ -4848,10 +4893,10 @@ PGcancel *PQgetCancel(PGconn *conn);
 
       <para>
        <function>PQgetCancel</function> creates a
-       <structname>PGcancel</><indexterm><primary>PGcancel</></> object
-       given a <structname>PGconn</> connection object.  It will return
-       <symbol>NULL</> if the given <parameter>conn</> is <symbol>NULL</> or an invalid
-       connection.  The <structname>PGcancel</> object is an opaque
+       <structname>PGcancel</structname><indexterm><primary>PGcancel</primary></indexterm> object
+       given a <structname>PGconn</structname> connection object.  It will return
+       <symbol>NULL</symbol> if the given <parameter>conn</parameter> is <symbol>NULL</symbol> or an invalid
+       connection.  The <structname>PGcancel</structname> object is an opaque
        structure that is not meant to be accessed directly by the
        application; it can only be passed to <function>PQcancel</function>
        or <function>PQfreeCancel</function>.
@@ -4900,9 +4945,9 @@ int PQcancel(PGcancel *cancel, char *errbuf, int errbufsize);
 
       <para>
        The return value is 1 if the cancel request was successfully
-       dispatched and 0 if not.  If not, <parameter>errbuf</> is filled
-       with an explanatory error message.  <parameter>errbuf</>
-       must be a char array of size <parameter>errbufsize</> (the
+       dispatched and 0 if not.  If not, <parameter>errbuf</parameter> is filled
+       with an explanatory error message.  <parameter>errbuf</parameter>
+       must be a char array of size <parameter>errbufsize</parameter> (the
        recommended size is 256 bytes).
       </para>
 
@@ -4917,11 +4962,11 @@ int PQcancel(PGcancel *cancel, char *errbuf, int errbufsize);
 
       <para>
        <function>PQcancel</function> can safely be invoked from a signal
-       handler, if the <parameter>errbuf</> is a local variable in the
-       signal handler.  The <structname>PGcancel</> object is read-only
+       handler, if the <parameter>errbuf</parameter> is a local variable in the
+       signal handler.  The <structname>PGcancel</structname> object is read-only
        as far as <function>PQcancel</function> is concerned, so it can
        also be invoked from a thread that is separate from the one
-       manipulating the <structname>PGconn</> object.
+       manipulating the <structname>PGconn</structname> object.
       </para>
      </listitem>
     </varlistentry>
@@ -4948,12 +4993,12 @@ int PQrequestCancel(PGconn *conn);
       <para>
        Requests that the server abandon processing of the current
        command.  It operates directly on the
-       <structname>PGconn</> object, and in case of failure stores the
-       error message in the <structname>PGconn</> object (whence it can
+       <structname>PGconn</structname> object, and in case of failure stores the
+       error message in the <structname>PGconn</structname> object (whence it can
        be retrieved by <function>PQerrorMessage</function>).  Although
        the functionality is the same, this approach creates hazards for
        multiple-thread programs and signal handlers, since it is possible
-       that overwriting the <structname>PGconn</>'s error message will
+       that overwriting the <structname>PGconn</structname>'s error message will
        mess up the operation currently in progress on the connection.
       </para>
      </listitem>
@@ -4986,7 +5031,7 @@ int PQrequestCancel(PGconn *conn);
   </tip>
 
   <para>
-   The function <function>PQfn</function><indexterm><primary>PQfn</></>
+   The function <function>PQfn</function><indexterm><primary>PQfn</primary></indexterm>
    requests execution of a server function via the fast-path interface:
 <synopsis>
 PGresult *PQfn(PGconn *conn,
@@ -5011,19 +5056,19 @@ typedef struct
   </para>
 
   <para>
-   The <parameter>fnid</> argument is the OID of the function to be
-   executed.  <parameter>args</> and <parameter>nargs</> define the
+   The <parameter>fnid</parameter> argument is the OID of the function to be
+   executed.  <parameter>args</parameter> and <parameter>nargs</parameter> define the
    parameters to be passed to the function; they must match the declared
-   function argument list.  When the <parameter>isint</> field of a
-   parameter structure is true, the <parameter>u.integer</> value is sent
+   function argument list.  When the <parameter>isint</parameter> field of a
+   parameter structure is true, the <parameter>u.integer</parameter> value is sent
    to the server as an integer of the indicated length (this must be
-   2 or 4 bytes); proper byte-swapping occurs.  When <parameter>isint</>
-   is false, the indicated number of bytes at <parameter>*u.ptr</> are
+   2 or 4 bytes); proper byte-swapping occurs.  When <parameter>isint</parameter>
+   is false, the indicated number of bytes at <parameter>*u.ptr</parameter> are
    sent with no processing; the data must be in the format expected by
    the server for binary transmission of the function's argument data
-   type.  (The declaration of <parameter>u.ptr</> as being of
-   type <type>int *</> is historical; it would be better to consider
-   it <type>void *</>.)
+   type.  (The declaration of <parameter>u.ptr</parameter> as being of
+   type <type>int *</type> is historical; it would be better to consider
+   it <type>void *</type>.)
    <parameter>result_buf</parameter> points to the buffer in which to place
    the function's return value.  The caller must have allocated sufficient
    space to store the return value.  (There is no check!) The actual result
@@ -5031,14 +5076,14 @@ typedef struct
    <parameter>result_len</parameter>.  If a 2- or 4-byte integer result
    is expected, set <parameter>result_is_int</parameter> to 1, otherwise
    set it to 0.  Setting <parameter>result_is_int</parameter> to 1 causes
-   <application>libpq</> to byte-swap the value if necessary, so that it
+   <application>libpq</application> to byte-swap the value if necessary, so that it
    is delivered as a proper <type>int</type> value for the client machine;
-   note that a 4-byte integer is delivered into <parameter>*result_buf</>
+   note that a 4-byte integer is delivered into <parameter>*result_buf</parameter>
    for either allowed result size.
-   When <parameter>result_is_int</> is 0, the binary-format byte string
+   When <parameter>result_is_int</parameter> is 0, the binary-format byte string
    sent by the server is returned unmodified. (In this case it's better
    to consider <parameter>result_buf</parameter> as being of
-   type <type>void *</>.)
+   type <type>void *</type>.)
   </para>
 
   <para>
@@ -5072,7 +5117,7 @@ typedef struct
    can stop listening with the <command>UNLISTEN</command> command).  All
    sessions listening on a particular channel will be notified
    asynchronously when a <command>NOTIFY</command> command with that
-   channel name is executed by any session. A <quote>payload</> string can
+   channel name is executed by any session. A <quote>payload</quote> string can
    be passed to communicate additional data to the listeners.
   </para>
 
@@ -5082,14 +5127,14 @@ typedef struct
    and <command>NOTIFY</command> commands as
    ordinary SQL commands.  The arrival of <command>NOTIFY</command>
    messages can subsequently be detected by calling
-   <function>PQnotifies</function>.<indexterm><primary>PQnotifies</></>
+   <function>PQnotifies</function>.<indexterm><primary>PQnotifies</primary></indexterm>
   </para>
 
   <para>
    The function <function>PQnotifies</function> returns the next notification
    from a list of unhandled notification messages received from the server.
    It returns a null pointer if there are no pending notifications.  Once a
-   notification is returned from <function>PQnotifies</>, it is considered
+   notification is returned from <function>PQnotifies</function>, it is considered
    handled and will be removed from the list of notifications.
 
 <synopsis>
@@ -5114,7 +5159,7 @@ typedef struct pgNotify
   </para>
 
   <para>
-   <xref linkend="libpq-example-2"> gives a sample program that illustrates
+   <xref linkend="libpq-example-2"/> gives a sample program that illustrates
    the use of asynchronous notification.
   </para>
 
@@ -5123,14 +5168,14 @@ typedef struct pgNotify
    server; it just returns messages previously absorbed by another
    <application>libpq</application> function.  In prior releases of
    <application>libpq</application>, the only way to ensure timely receipt
-   of <command>NOTIFY</> messages was to constantly submit commands, even
+   of <command>NOTIFY</command> messages was to constantly submit commands, even
    empty ones, and then check <function>PQnotifies</function> after each
    <function>PQexec</function>.  While this still works, it is deprecated
    as a waste of processing power.
   </para>
 
   <para>
-   A better way to check for <command>NOTIFY</> messages when you have no
+   A better way to check for <command>NOTIFY</command> messages when you have no
    useful commands to execute is to call
    <function>PQconsumeInput</function>, then check
    <function>PQnotifies</function>.  You can use
@@ -5168,12 +5213,12 @@ typedef struct pgNotify
    The overall process is that the application first issues the SQL
    <command>COPY</command> command via <function>PQexec</function> or one
    of the equivalent functions.  The response to this (if there is no
-   error in the command) will be a <structname>PGresult</> object bearing
+   error in the command) will be a <structname>PGresult</structname> object bearing
    a status code of <literal>PGRES_COPY_OUT</literal> or
    <literal>PGRES_COPY_IN</literal> (depending on the specified copy
    direction).  The application should then use the functions of this
    section to receive or transmit data rows.  When the data transfer is
-   complete, another <structname>PGresult</> object is returned to indicate
+   complete, another <structname>PGresult</structname> object is returned to indicate
    success or failure of the transfer.  Its status will be
    <literal>PGRES_COMMAND_OK</literal> for success or
    <literal>PGRES_FATAL_ERROR</literal> if some problem was encountered.
@@ -5187,8 +5232,8 @@ typedef struct pgNotify
    If a <command>COPY</command> command is issued via
    <function>PQexec</function> in a string that could contain additional
    commands, the application must continue fetching results via
-   <function>PQgetResult</> after completing the <command>COPY</command>
-   sequence.  Only when <function>PQgetResult</> returns
+   <function>PQgetResult</function> after completing the <command>COPY</command>
+   sequence.  Only when <function>PQgetResult</function> returns
    <symbol>NULL</symbol> is it certain that the <function>PQexec</function>
    command string is done and it is safe to issue more commands.
   </para>
@@ -5201,7 +5246,7 @@ typedef struct pgNotify
   </para>
 
   <para>
-   A <structname>PGresult</> object bearing one of these status values
+   A <structname>PGresult</structname> object bearing one of these status values
    carries some additional data about the <command>COPY</command> operation
    that is starting.  This additional data is available using functions
    that are also used in connection with query results:
@@ -5237,7 +5282,7 @@ typedef struct pgNotify
        0 indicates the overall copy format is textual (rows separated by
        newlines, columns separated by separator characters, etc).  1
        indicates the overall copy format is binary.  See <xref
-       linkend="sql-copy"> for more information.
+       linkend="sql-copy"/> for more information.
       </para>
      </listitem>
     </varlistentry>
@@ -5257,7 +5302,7 @@ typedef struct pgNotify
        each column of the copy operation.  The per-column format codes
        will always be zero when the overall copy format is textual, but
        the binary format can support both text and binary columns.
-       (However, as of the current implementation of <command>COPY</>,
+       (However, as of the current implementation of <command>COPY</command>,
        only binary columns appear in a binary copy; so the per-column
        formats always match the overall format at present.)
       </para>
@@ -5278,8 +5323,8 @@ typedef struct pgNotify
 
    <para>
     These functions are used to send data during <literal>COPY FROM
-    STDIN</>.  They will fail if called when the connection is not in
-    <literal>COPY_IN</> state.
+    STDIN</literal>.  They will fail if called when the connection is not in
+    <literal>COPY_IN</literal> state.
    </para>
 
    <variablelist>
@@ -5293,7 +5338,7 @@ typedef struct pgNotify
 
      <listitem>
       <para>
-       Sends data to the server during <literal>COPY_IN</> state.
+       Sends data to the server during <literal>COPY_IN</literal> state.
 <synopsis>
 int PQputCopyData(PGconn *conn,
                   const char *buffer,
@@ -5303,7 +5348,7 @@ int PQputCopyData(PGconn *conn,
 
       <para>
        Transmits the <command>COPY</command> data in the specified
-       <parameter>buffer</>, of length <parameter>nbytes</>, to the server.
+       <parameter>buffer</parameter>, of length <parameter>nbytes</parameter>, to the server.
        The result is 1 if the data was queued, zero if it was not queued
        because of full buffers (this will only happen in nonblocking mode),
        or -1 if an error occurred.
@@ -5317,7 +5362,7 @@ int PQputCopyData(PGconn *conn,
        into buffer loads of any convenient size.  Buffer-load boundaries
        have no semantic significance when sending.  The contents of the
        data stream must match the data format expected by the
-       <command>COPY</> command; see <xref linkend="sql-copy"> for details.
+       <command>COPY</command> command; see <xref linkend="sql-copy"/> for details.
       </para>
      </listitem>
     </varlistentry>
@@ -5332,7 +5377,7 @@ int PQputCopyData(PGconn *conn,
 
      <listitem>
       <para>
-       Sends end-of-data indication to the server during <literal>COPY_IN</> state.
+       Sends end-of-data indication to the server during <literal>COPY_IN</literal> state.
 <synopsis>
 int PQputCopyEnd(PGconn *conn,
                  const char *errormsg);
@@ -5340,14 +5385,14 @@ int PQputCopyEnd(PGconn *conn,
       </para>
 
       <para>
-       Ends the <literal>COPY_IN</> operation successfully if
-       <parameter>errormsg</> is <symbol>NULL</symbol>.  If
-       <parameter>errormsg</> is not <symbol>NULL</symbol> then the
-       <command>COPY</> is forced to fail, with the string pointed to by
-       <parameter>errormsg</> used as the error message.  (One should not
+       Ends the <literal>COPY_IN</literal> operation successfully if
+       <parameter>errormsg</parameter> is <symbol>NULL</symbol>.  If
+       <parameter>errormsg</parameter> is not <symbol>NULL</symbol> then the
+       <command>COPY</command> is forced to fail, with the string pointed to by
+       <parameter>errormsg</parameter> used as the error message.  (One should not
        assume that this exact error message will come back from the server,
        however, as the server might have already failed the
-       <command>COPY</> for its own reasons.  Also note that the option
+       <command>COPY</command> for its own reasons.  Also note that the option
        to force failure does not work when using pre-3.0-protocol
        connections.)
       </para>
@@ -5357,19 +5402,19 @@ int PQputCopyEnd(PGconn *conn,
        nonblocking mode, this may only indicate that the termination
        message was successfully queued.  (In nonblocking mode, to be
        certain that the data has been sent, you should next wait for
-       write-ready and call <function>PQflush</>, repeating until it
+       write-ready and call <function>PQflush</function>, repeating until it
        returns zero.)  Zero indicates that the function could not queue
        the termination message because of full buffers; this will only
        happen in nonblocking mode.  (In this case, wait for
-       write-ready and try the <function>PQputCopyEnd</> call
+       write-ready and try the <function>PQputCopyEnd</function> call
        again.)  If a hard error occurs, -1 is returned; you can use
        <function>PQerrorMessage</function> to retrieve details.
       </para>
 
       <para>
-       After successfully calling <function>PQputCopyEnd</>, call
-       <function>PQgetResult</> to obtain the final result status of the
-       <command>COPY</> command.  One can wait for this result to be
+       After successfully calling <function>PQputCopyEnd</function>, call
+       <function>PQgetResult</function> to obtain the final result status of the
+       <command>COPY</command> command.  One can wait for this result to be
        available in the usual way.  Then return to normal operation.
       </para>
      </listitem>
@@ -5383,8 +5428,8 @@ int PQputCopyEnd(PGconn *conn,
 
    <para>
     These functions are used to receive data during <literal>COPY TO
-    STDOUT</>.  They will fail if called when the connection is not in
-    <literal>COPY_OUT</> state.
+    STDOUT</literal>.  They will fail if called when the connection is not in
+    <literal>COPY_OUT</literal> state.
    </para>
 
    <variablelist>
@@ -5398,7 +5443,7 @@ int PQputCopyEnd(PGconn *conn,
 
      <listitem>
       <para>
-       Receives data from the server during <literal>COPY_OUT</> state.
+       Receives data from the server during <literal>COPY_OUT</literal> state.
 <synopsis>
 int PQgetCopyData(PGconn *conn,
                   char **buffer,
@@ -5411,11 +5456,11 @@ int PQgetCopyData(PGconn *conn,
        <command>COPY</command>.  Data is always returned one data row at
        a time; if only a partial row is available, it is not returned.
        Successful return of a data row involves allocating a chunk of
-       memory to hold the data.  The <parameter>buffer</> parameter must
-       be non-<symbol>NULL</symbol>.  <parameter>*buffer</> is set to
+       memory to hold the data.  The <parameter>buffer</parameter> parameter must
+       be non-<symbol>NULL</symbol>.  <parameter>*buffer</parameter> is set to
        point to the allocated memory, or to <symbol>NULL</symbol> in cases
        where no buffer is returned.  A non-<symbol>NULL</symbol> result
-       buffer should be freed using <function>PQfreemem</> when no longer
+       buffer should be freed using <function>PQfreemem</function> when no longer
        needed.
       </para>
 
@@ -5426,26 +5471,26 @@ int PQgetCopyData(PGconn *conn,
        probably only useful for textual <command>COPY</command>.  A result
        of zero indicates that the <command>COPY</command> is still in
        progress, but no row is yet available (this is only possible when
-       <parameter>async</> is true).  A result of -1 indicates that the
+       <parameter>async</parameter> is true).  A result of -1 indicates that the
        <command>COPY</command> is done.  A result of -2 indicates that an
-       error occurred (consult <function>PQerrorMessage</> for the reason).
+       error occurred (consult <function>PQerrorMessage</function> for the reason).
       </para>
 
       <para>
-       When <parameter>async</> is true (not zero),
-       <function>PQgetCopyData</> will not block waiting for input; it
+       When <parameter>async</parameter> is true (not zero),
+       <function>PQgetCopyData</function> will not block waiting for input; it
        will return zero if the <command>COPY</command> is still in progress
        but no complete row is available.  (In this case wait for read-ready
-       and then call <function>PQconsumeInput</> before calling
-       <function>PQgetCopyData</> again.)  When <parameter>async</> is
-       false (zero), <function>PQgetCopyData</> will block until data is
+       and then call <function>PQconsumeInput</function> before calling
+       <function>PQgetCopyData</function> again.)  When <parameter>async</parameter> is
+       false (zero), <function>PQgetCopyData</function> will block until data is
        available or the operation completes.
       </para>
 
       <para>
-       After <function>PQgetCopyData</> returns -1, call
-       <function>PQgetResult</> to obtain the final result status of the
-       <command>COPY</> command.  One can wait for this result to be
+       After <function>PQgetCopyData</function> returns -1, call
+       <function>PQgetResult</function> to obtain the final result status of the
+       <command>COPY</command> command.  One can wait for this result to be
        available in the usual way.  Then return to normal operation.
       </para>
      </listitem>
@@ -5458,7 +5503,7 @@ int PQgetCopyData(PGconn *conn,
    <title>Obsolete Functions for <command>COPY</command></title>
 
    <para>
-    These functions represent older methods of handling <command>COPY</>.
+    These functions represent older methods of handling <command>COPY</command>.
     Although they still work, they are deprecated due to poor error handling,
     inconvenient methods of detecting end-of-data, and lack of support for binary
     or nonblocking transfers.
@@ -5476,7 +5521,7 @@ int PQgetCopyData(PGconn *conn,
      <listitem>
       <para>
        Reads  a  newline-terminated  line  of  characters (transmitted
-       by the server) into a buffer string of size <parameter>length</>.
+       by the server) into a buffer string of size <parameter>length</parameter>.
 <synopsis>
 int PQgetline(PGconn *conn,
               char *buffer,
@@ -5485,7 +5530,7 @@ int PQgetline(PGconn *conn,
       </para>
 
       <para>
-       This function copies up to <parameter>length</>-1 characters into
+       This function copies up to <parameter>length</parameter>-1 characters into
        the buffer and converts the terminating newline into a zero byte.
        <function>PQgetline</function> returns <symbol>EOF</symbol> at the
        end of input, 0 if the entire line has been read, and 1 if the
@@ -5496,7 +5541,7 @@ int PQgetline(PGconn *conn,
        of  the  two characters  <literal>\.</literal>, which  indicates
        that the server has finished sending the results  of  the
        <command>COPY</command> command.  If  the  application might receive
-       lines that are more than <parameter>length</>-1  characters  long,
+       lines that are more than <parameter>length</parameter>-1  characters  long,
        care is needed to be sure it recognizes the <literal>\.</literal>
        line correctly (and does not, for example, mistake the end of a
        long data line for a terminator line).
@@ -5540,7 +5585,7 @@ int PQgetlineAsync(PGconn *conn,
 
       <para>
        On each call, <function>PQgetlineAsync</function> will return data if a
-       complete data row is available in <application>libpq</>'s input buffer.
+       complete data row is available in <application>libpq</application>'s input buffer.
        Otherwise, no data is returned until the rest of the row arrives.
        The function returns -1 if the end-of-copy-data marker has been recognized,
        or 0 if no data is available, or a positive number giving the number of
@@ -5554,7 +5599,7 @@ int PQgetlineAsync(PGconn *conn,
        the caller is too small to hold a row sent by the server, then a partial
        data row will be returned.  With textual data this can be detected by testing
        whether the last returned byte is <literal>\n</literal> or not.  (In a binary
-       <command>COPY</>, actual parsing of the <command>COPY</> data format will be needed to make the
+       <command>COPY</command>, actual parsing of the <command>COPY</command> data format will be needed to make the
        equivalent determination.)
        The returned string is not null-terminated.  (If you want to add a
        terminating null, be sure to pass a <parameter>bufsize</parameter> one smaller
@@ -5595,7 +5640,7 @@ int PQputline(PGconn *conn,
         Before <productname>PostgreSQL</productname> protocol 3.0, it was necessary
         for the application to explicitly send the two characters
         <literal>\.</literal> as a final line to indicate to the server that it had
-        finished sending <command>COPY</> data.  While this still works, it is deprecated and the
+        finished sending <command>COPY</command> data.  While this still works, it is deprecated and the
         special meaning of <literal>\.</literal> can be expected to be removed in a
         future release.  It is sufficient to call <function>PQendcopy</function> after
         having sent the actual data.
@@ -5691,7 +5736,7 @@ int PQendcopy(PGconn *conn);
   <title>Control Functions</title>
 
   <para>
-   These functions control miscellaneous details of <application>libpq</>'s
+   These functions control miscellaneous details of <application>libpq</application>'s
    behavior.
   </para>
 
@@ -5742,7 +5787,7 @@ int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<re
       and <replaceable>encoding</replaceable> is the encoding you want to
       use. If the function successfully sets the encoding, it returns 0,
       otherwise -1. The current encoding for this connection can be
-      determined by using <function>PQclientEncoding</>.
+      determined by using <function>PQclientEncoding</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -5758,7 +5803,7 @@ int PQsetClientEncoding(PGconn *<replaceable>conn</replaceable>, const char *<re
     <listitem>
      <para>
       Determines the verbosity of messages returned by
-      <function>PQerrorMessage</> and <function>PQresultErrorMessage</>.
+      <function>PQerrorMessage</function> and <function>PQresultErrorMessage</function>.
 <synopsis>
 typedef enum
 {
@@ -5770,15 +5815,15 @@ typedef enum
 PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
 </synopsis>
 
-      <function>PQsetErrorVerbosity</> sets the verbosity mode, returning
-      the connection's previous setting.  In <firstterm>TERSE</> mode,
+      <function>PQsetErrorVerbosity</function> sets the verbosity mode, returning
+      the connection's previous setting.  In <firstterm>TERSE</firstterm> mode,
       returned messages include severity, primary text, and position only;
       this will normally fit on a single line.  The default mode produces
       messages that include the above plus any detail, hint, or context
-      fields (these might span multiple lines).  The <firstterm>VERBOSE</>
+      fields (these might span multiple lines).  The <firstterm>VERBOSE</firstterm>
       mode includes all available fields.  Changing the verbosity does not
       affect the messages available from already-existing
-      <structname>PGresult</> objects, only subsequently-created ones.
+      <structname>PGresult</structname> objects, only subsequently-created ones.
       (But see <function>PQresultVerboseErrorMessage</function> if you
       want to print a previous error with a different verbosity.)
      </para>
@@ -5795,9 +5840,9 @@ PGVerbosity PQsetErrorVerbosity(PGconn *conn, PGVerbosity verbosity);
 
     <listitem>
      <para>
-      Determines the handling of <literal>CONTEXT</> fields in messages
-      returned by <function>PQerrorMessage</>
-      and <function>PQresultErrorMessage</>.
+      Determines the handling of <literal>CONTEXT</literal> fields in messages
+      returned by <function>PQerrorMessage</function>
+      and <function>PQresultErrorMessage</function>.
 <synopsis>
 typedef enum
 {
@@ -5809,17 +5854,17 @@ typedef enum
 PGContextVisibility PQsetErrorContextVisibility(PGconn *conn, PGContextVisibility show_context);
 </synopsis>
 
-      <function>PQsetErrorContextVisibility</> sets the context display mode,
+      <function>PQsetErrorContextVisibility</function> sets the context display mode,
       returning the connection's previous setting.  This mode controls
       whether the <literal>CONTEXT</literal> field is included in messages
-      (unless the verbosity setting is <firstterm>TERSE</>, in which
-      case <literal>CONTEXT</> is never shown).  The <firstterm>NEVER</> mode
-      never includes <literal>CONTEXT</>, while <firstterm>ALWAYS</> always
-      includes it if available.  In <firstterm>ERRORS</> mode (the
-      default), <literal>CONTEXT</> fields are included only for error
+      (unless the verbosity setting is <firstterm>TERSE</firstterm>, in which
+      case <literal>CONTEXT</literal> is never shown).  The <firstterm>NEVER</firstterm> mode
+      never includes <literal>CONTEXT</literal>, while <firstterm>ALWAYS</firstterm> always
+      includes it if available.  In <firstterm>ERRORS</firstterm> mode (the
+      default), <literal>CONTEXT</literal> fields are included only for error
       messages, not for notices and warnings.  Changing this mode does not
       affect the messages available from
-      already-existing <structname>PGresult</> objects, only
+      already-existing <structname>PGresult</structname> objects, only
       subsequently-created ones.
       (But see <function>PQresultVerboseErrorMessage</function> if you
       want to print a previous error with a different display mode.)
@@ -5845,9 +5890,9 @@ void PQtrace(PGconn *conn, FILE *stream);
 
      <note>
       <para>
-       On Windows, if the <application>libpq</> library and an application are
+       On Windows, if the <application>libpq</application> library and an application are
        compiled with different flags, this function call will crash the
-       application because the internal representation of the <literal>FILE</>
+       application because the internal representation of the <literal>FILE</literal>
        pointers differ.  Specifically, multithreaded/single-threaded,
        release/debug, and static/dynamic flags should be the same for the
        library and all applications using that library.
@@ -5896,25 +5941,25 @@ void PQuntrace(PGconn *conn);
 
     <listitem>
      <para>
-      Frees memory allocated by <application>libpq</>.
+      Frees memory allocated by <application>libpq</application>.
 <synopsis>
 void PQfreemem(void *ptr);
 </synopsis>
      </para>
 
      <para>
-      Frees memory allocated by <application>libpq</>, particularly
+      Frees memory allocated by <application>libpq</application>, particularly
       <function>PQescapeByteaConn</function>,
       <function>PQescapeBytea</function>,
       <function>PQunescapeBytea</function>,
       and <function>PQnotifies</function>.
       It is particularly important that this function, rather than
-      <function>free()</>, be used on Microsoft Windows.  This is because
+      <function>free()</function>, be used on Microsoft Windows.  This is because
       allocating memory in a DLL and releasing it in the application works
       only if multithreaded/single-threaded, release/debug, and static/dynamic
       flags are the same for the DLL and the application.  On non-Microsoft
       Windows platforms, this function is the same as the standard library
-      function <function>free()</>.
+      function <function>free()</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -5930,7 +5975,7 @@ void PQfreemem(void *ptr);
     <listitem>
      <para>
       Frees the data structures allocated by
-      <function>PQconndefaults</> or <function>PQconninfoParse</>.
+      <function>PQconndefaults</function> or <function>PQconninfoParse</function>.
 <synopsis>
 void PQconninfoFree(PQconninfoOption *connOptions);
 </synopsis>
@@ -5953,44 +5998,44 @@ void PQconninfoFree(PQconninfoOption *connOptions);
 
     <listitem>
      <para>
-      Prepares the encrypted form of a <productname>PostgreSQL</> password.
+      Prepares the encrypted form of a <productname>PostgreSQL</productname> password.
 <synopsis>
 char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user, const char *algorithm);
 </synopsis>
       This function is intended to be used by client applications that
       wish to send commands like <literal>ALTER USER joe PASSWORD
-      'pwd'</>.  It is good practice not to send the original cleartext
+      'pwd'</literal>.  It is good practice not to send the original cleartext
       password in such a command, because it might be exposed in command
       logs, activity displays, and so on.  Instead, use this function to
       convert the password to encrypted form before it is sent.
      </para>
 
      <para>
-      The <parameter>passwd</> and <parameter>user</> arguments
+      The <parameter>passwd</parameter> and <parameter>user</parameter> arguments
       are the cleartext password, and the SQL name of the user it is for.
-      <parameter>algorithm</> specifies the encryption algorithm
+      <parameter>algorithm</parameter> specifies the encryption algorithm
       to use to encrypt the password. Currently supported algorithms are
-      <literal>md5</> and <literal>scram-sha-256</> (<literal>on</> and
-      <literal>off</> are also accepted as aliases for <literal>md5</>, for
+      <literal>md5</literal> and <literal>scram-sha-256</literal> (<literal>on</literal> and
+      <literal>off</literal> are also accepted as aliases for <literal>md5</literal>, for
       compatibility with older server versions). Note that support for
-      <literal>scram-sha-256</> was introduced in <productname>PostgreSQL</>
+      <literal>scram-sha-256</literal> was introduced in <productname>PostgreSQL</productname>
       version 10, and will not work correctly with older server versions. If
-      <parameter>algorithm</> is <symbol>NULL</>, this function will query
+      <parameter>algorithm</parameter> is <symbol>NULL</symbol>, this function will query
       the server for the current value of the
-      <xref linkend="guc-password-encryption"> setting. That can block, and
+      <xref linkend="guc-password-encryption"/> setting. That can block, and
       will fail if the current transaction is aborted, or if the connection
       is busy executing another query. If you wish to use the default
       algorithm for the server but want to avoid blocking, query
-      <varname>password_encryption</> yourself before calling
-      <function>PQencryptPasswordConn</>, and pass that value as the
-      <parameter>algorithm</>.
+      <varname>password_encryption</varname> yourself before calling
+      <function>PQencryptPasswordConn</function>, and pass that value as the
+      <parameter>algorithm</parameter>.
      </para>
 
      <para>
-      The return value is a string allocated by <function>malloc</>.
+      The return value is a string allocated by <function>malloc</function>.
       The caller can assume the string doesn't contain any special characters
-      that would require escaping.  Use <function>PQfreemem</> to free the
-      result when done with it. On error, returns <symbol>NULL</>, and
+      that would require escaping.  Use <function>PQfreemem</function> to free the
+      result when done with it. On error, returns <symbol>NULL</symbol>, and
       a suitable message is stored in the connection object.
      </para>
 
@@ -6007,14 +6052,14 @@ char *PQencryptPasswordConn(PGconn *conn, const char *passwd, const char *user,
 
     <listitem>
      <para>
-      Prepares the md5-encrypted form of a <productname>PostgreSQL</> password.
+      Prepares the md5-encrypted form of a <productname>PostgreSQL</productname> password.
 <synopsis>
 char *PQencryptPassword(const char *passwd, const char *user);
 </synopsis>
-      <function>PQencryptPassword</> is an older, deprecated version of
-      <function>PQencryptPasswodConn</>. The difference is that
-      <function>PQencryptPassword</> does not
-      require a connection object, and <literal>md5</> is always used as the
+      <function>PQencryptPassword</function> is an older, deprecated version of
+      <function>PQencryptPasswodConn</function>. The difference is that
+      <function>PQencryptPassword</function> does not
+      require a connection object, and <literal>md5</literal> is always used as the
       encryption algorithm.
      </para>
     </listitem>
@@ -6037,18 +6082,18 @@ PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status);
      </para>
 
      <para>
-      This is <application>libpq</>'s internal function to allocate and
+      This is <application>libpq</application>'s internal function to allocate and
       initialize an empty <structname>PGresult</structname> object.  This
-      function returns <symbol>NULL</> if memory could not be allocated. It is
+      function returns <symbol>NULL</symbol> if memory could not be allocated. It is
       exported because some applications find it useful to generate result
       objects (particularly objects with error status) themselves.  If
-      <parameter>conn</parameter> is not null and <parameter>status</>
+      <parameter>conn</parameter> is not null and <parameter>status</parameter>
       indicates an error, the current error message of the specified
       connection is copied into the <structname>PGresult</structname>.
       Also, if <parameter>conn</parameter> is not null, any event procedures
       registered in the connection are copied into the
       <structname>PGresult</structname>.  (They do not get
-      <literal>PGEVT_RESULTCREATE</> calls, but see
+      <literal>PGEVT_RESULTCREATE</literal> calls, but see
       <function>PQfireResultCreateEvents</function>.)
       Note that <function>PQclear</function> should eventually be called
       on the object, just as with a <structname>PGresult</structname>
@@ -6067,7 +6112,7 @@ PGresult *PQmakeEmptyPGresult(PGconn *conn, ExecStatusType status);
     <listitem>
      <para>
       Fires a <literal>PGEVT_RESULTCREATE</literal> event (see <xref
-      linkend="libpq-events">) for each event procedure registered in the
+      linkend="libpq-events"/>) for each event procedure registered in the
       <structname>PGresult</structname> object.  Returns non-zero for success,
       zero if any event procedure fails.
 
@@ -6077,14 +6122,14 @@ int PQfireResultCreateEvents(PGconn *conn, PGresult *res);
      </para>
 
      <para>
-      The <literal>conn</> argument is passed through to event procedures
-      but not used directly.  It can be <symbol>NULL</> if the event
+      The <literal>conn</literal> argument is passed through to event procedures
+      but not used directly.  It can be <symbol>NULL</symbol> if the event
       procedures won't use it.
      </para>
 
      <para>
       Event procedures that have already received a
-      <literal>PGEVT_RESULTCREATE</> or <literal>PGEVT_RESULTCOPY</> event
+      <literal>PGEVT_RESULTCREATE</literal> or <literal>PGEVT_RESULTCOPY</literal> event
       for this object are not fired again.
      </para>
 
@@ -6110,7 +6155,7 @@ int PQfireResultCreateEvents(PGconn *conn, PGresult *res);
       Makes a copy of a <structname>PGresult</structname> object.  The copy is
       not linked to the source result in any way and
       <function>PQclear</function> must be called when the copy is no longer
-      needed.  If the function fails, <symbol>NULL</> is returned.
+      needed.  If the function fails, <symbol>NULL</symbol> is returned.
 
 <synopsis>
 PGresult *PQcopyResult(const PGresult *src, int flags);
@@ -6154,7 +6199,7 @@ int PQsetResultAttrs(PGresult *res, int numAttributes, PGresAttDesc *attDescs);
 
      <para>
       The provided <parameter>attDescs</parameter> are copied into the result.
-      If the <parameter>attDescs</parameter> pointer is <symbol>NULL</> or
+      If the <parameter>attDescs</parameter> pointer is <symbol>NULL</symbol> or
       <parameter>numAttributes</parameter> is less than one, the request is
       ignored and the function succeeds.  If <parameter>res</parameter>
       already contains attributes, the function will fail.  If the function
@@ -6188,7 +6233,7 @@ int PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len);
       field of any existing tuple can be modified in any order.  If a value at
       <parameter>field_num</parameter> already exists, it will be overwritten.
       If <parameter>len</parameter> is -1 or
-      <parameter>value</parameter> is <symbol>NULL</>, the field value
+      <parameter>value</parameter> is <symbol>NULL</symbol>, the field value
       will be set to an SQL null value.  The
       <parameter>value</parameter> is copied into the result's private storage,
       thus is no longer needed after the function
@@ -6217,9 +6262,9 @@ void *PQresultAlloc(PGresult *res, size_t nBytes);
      <para>
       Any memory allocated with this function will be freed when
       <parameter>res</parameter> is cleared.  If the function fails,
-      the return value is <symbol>NULL</>.  The result is
+      the return value is <symbol>NULL</symbol>.  The result is
       guaranteed to be adequately aligned for any type of data,
-      just as for <function>malloc</>.
+      just as for <function>malloc</function>.
      </para>
     </listitem>
    </varlistentry>
@@ -6235,7 +6280,7 @@ void *PQresultAlloc(PGresult *res, size_t nBytes);
 
     <listitem>
      <para>
-      Return the version of <productname>libpq</> that is being used.
+      Return the version of <productname>libpq</productname> that is being used.
 <synopsis>
 int PQlibVersion(void);
 </synopsis>
@@ -6246,7 +6291,7 @@ int PQlibVersion(void);
       run time, whether specific functionality is available in the currently
       loaded version of libpq. The function can be used, for example,
       to determine which connection options are available in
-      <function>PQconnectdb</>.
+      <function>PQconnectdb</function>.
      </para>
 
      <para>
@@ -6257,17 +6302,17 @@ int PQlibVersion(void);
      </para>
 
      <para>
-      Prior to major version 10, <productname>PostgreSQL</> used
+      Prior to major version 10, <productname>PostgreSQL</productname> used
       three-part version numbers in which the first two parts together
       represented the major version.  For those
-      versions, <function>PQlibVersion</> uses two digits for each
+      versions, <function>PQlibVersion</function> uses two digits for each
       part; for example version 9.1.5 will be returned as 90105, and
       version 9.2.0 will be returned as 90200.
      </para>
 
      <para>
       Therefore, for purposes of determining feature compatibility,
-      applications should divide the result of <function>PQlibVersion</>
+      applications should divide the result of <function>PQlibVersion</function>
       by 100 not 10000 to determine a logical major version number.
       In all release series, only the last two digits differ between
       minor releases (bug-fix releases).
@@ -6275,7 +6320,7 @@ int PQlibVersion(void);
 
      <note>
       <para>
-       This function appeared in <productname>PostgreSQL</> version 9.1, so
+       This function appeared in <productname>PostgreSQL</productname> version 9.1, so
        it cannot be used to detect required functionality in earlier
        versions, since calling it will create a link dependency
        on version 9.1 or later.
@@ -6317,12 +6362,12 @@ int PQlibVersion(void);
 
   <para>
    The function <function>PQsetNoticeReceiver</function>
-   <indexterm><primary>notice receiver</></>
-   <indexterm><primary>PQsetNoticeReceiver</></> sets or
+   <indexterm><primary>notice receiver</primary></indexterm>
+   <indexterm><primary>PQsetNoticeReceiver</primary></indexterm> sets or
    examines the current notice receiver for a connection object.
    Similarly, <function>PQsetNoticeProcessor</function>
-   <indexterm><primary>notice processor</></>
-   <indexterm><primary>PQsetNoticeProcessor</></> sets or
+   <indexterm><primary>notice processor</primary></indexterm>
+   <indexterm><primary>PQsetNoticeProcessor</primary></indexterm> sets or
    examines the current notice processor.
 
 <synopsis>
@@ -6353,9 +6398,9 @@ PQsetNoticeProcessor(PGconn *conn,
    receiver function is called.  It is passed the message in the form of
    a <symbol>PGRES_NONFATAL_ERROR</symbol>
    <structname>PGresult</structname>.  (This allows the receiver to extract
-   individual fields using <function>PQresultErrorField</>, or obtain a
-   complete preformatted message using <function>PQresultErrorMessage</>
-   or <function>PQresultVerboseErrorMessage</>.)  The same
+   individual fields using <function>PQresultErrorField</function>, or obtain a
+   complete preformatted message using <function>PQresultErrorMessage</function>
+   or <function>PQresultVerboseErrorMessage</function>.)  The same
    void pointer passed to <function>PQsetNoticeReceiver</function> is also
    passed.  (This pointer can be used to access application-specific state
    if needed.)
@@ -6363,7 +6408,7 @@ PQsetNoticeProcessor(PGconn *conn,
 
   <para>
    The default notice receiver simply extracts the message (using
-   <function>PQresultErrorMessage</>) and passes it to the notice
+   <function>PQresultErrorMessage</function>) and passes it to the notice
    processor.
   </para>
 
@@ -6389,10 +6434,10 @@ defaultNoticeProcessor(void *arg, const char *message)
   <para>
    Once you have set a notice receiver or processor, you should expect
    that that function could be called as long as either the
-   <structname>PGconn</> object or <structname>PGresult</> objects made
-   from it exist.  At creation of a <structname>PGresult</>, the
-   <structname>PGconn</>'s current notice handling pointers are copied
-   into the <structname>PGresult</> for possible use by functions like
+   <structname>PGconn</structname> object or <structname>PGresult</structname> objects made
+   from it exist.  At creation of a <structname>PGresult</structname>, the
+   <structname>PGconn</structname>'s current notice handling pointers are copied
+   into the <structname>PGresult</structname> for possible use by functions like
    <function>PQgetvalue</function>.
   </para>
 
@@ -6414,21 +6459,21 @@ defaultNoticeProcessor(void *arg, const char *message)
 
   <para>
    Each registered event handler is associated with two pieces of data,
-   known to <application>libpq</application> only as opaque <literal>void *</>
-   pointers.  There is a <firstterm>passthrough</> pointer that is provided
+   known to <application>libpq</application> only as opaque <literal>void *</literal>
+   pointers.  There is a <firstterm>passthrough</firstterm> pointer that is provided
    by the application when the event handler is registered with a
-   <structname>PGconn</>.  The passthrough pointer never changes for the
-   life of the <structname>PGconn</> and all <structname>PGresult</>s
+   <structname>PGconn</structname>.  The passthrough pointer never changes for the
+   life of the <structname>PGconn</structname> and all <structname>PGresult</structname>s
    generated from it; so if used, it must point to long-lived data.
-   In addition there is an <firstterm>instance data</> pointer, which starts
-   out <symbol>NULL</> in every <structname>PGconn</> and <structname>PGresult</>.
+   In addition there is an <firstterm>instance data</firstterm> pointer, which starts
+   out <symbol>NULL</symbol> in every <structname>PGconn</structname> and <structname>PGresult</structname>.
    This pointer can be manipulated using the
    <function>PQinstanceData</function>,
    <function>PQsetInstanceData</function>,
    <function>PQresultInstanceData</function> and
    <function>PQsetResultInstanceData</function> functions.  Note that
-   unlike the passthrough pointer, instance data of a <structname>PGconn</>
-   is not automatically inherited by <structname>PGresult</>s created from
+   unlike the passthrough pointer, instance data of a <structname>PGconn</structname>
+   is not automatically inherited by <structname>PGresult</structname>s created from
    it.  <application>libpq</application> does not know what passthrough
    and instance data pointers point to (if anything) and will never attempt
    to free them &mdash; that is the responsibility of the event handler.
@@ -6438,7 +6483,7 @@ defaultNoticeProcessor(void *arg, const char *message)
    <title>Event Types</title>
 
    <para>
-    The enum <literal>PGEventId</> names the types of events handled by
+    The enum <literal>PGEventId</literal> names the types of events handled by
     the event system.  All its values have names beginning with
     <literal>PGEVT</literal>.  For each event type, there is a corresponding
     event info structure that carries the parameters passed to the event
@@ -6502,8 +6547,8 @@ typedef struct
        <structname>PGconn</structname> was just reset, all event data remains
        unchanged.  This event should be used to reset/reload/requery any
        associated <literal>instanceData</literal>.  Note that even if the
-       event procedure fails to process <literal>PGEVT_CONNRESET</>, it will
-       still receive a <literal>PGEVT_CONNDESTROY</> event when the connection
+       event procedure fails to process <literal>PGEVT_CONNRESET</literal>, it will
+       still receive a <literal>PGEVT_CONNDESTROY</literal> event when the connection
        is closed.
       </para>
      </listitem>
@@ -6563,7 +6608,7 @@ typedef struct
        <literal>instanceData</literal> that needs to be associated with the
        result.  If the event procedure fails, the result will be cleared and
        the failure will be propagated.  The event procedure must not try to
-       <function>PQclear</> the result object for itself.  When returning a
+       <function>PQclear</function> the result object for itself.  When returning a
        failure code, all cleanup must be performed as no
        <literal>PGEVT_RESULTDESTROY</literal> event will be sent.
       </para>
@@ -6670,7 +6715,7 @@ int eventproc(PGEventId evtId, void *evtInfo, void *passThrough)
 
       <para>
        A particular event procedure can be registered only once in any
-       <structname>PGconn</>.  This is because the address of the procedure
+       <structname>PGconn</structname>.  This is because the address of the procedure
        is used as a lookup key to identify the associated instance data.
       </para>
 
@@ -6679,9 +6724,9 @@ int eventproc(PGEventId evtId, void *evtInfo, void *passThrough)
         On Windows, functions can have two different addresses: one visible
         from outside a DLL and another visible from inside the DLL.  One
         should be careful that only one of these addresses is used with
-        <application>libpq</>'s event-procedure functions, else confusion will
+        <application>libpq</application>'s event-procedure functions, else confusion will
         result.  The simplest rule for writing code that will work is to
-        ensure that event procedures are declared <literal>static</>.  If the
+        ensure that event procedures are declared <literal>static</literal>.  If the
         procedure's address must be available outside its own source file,
         expose a separate function to return the address.
        </para>
@@ -6715,7 +6760,7 @@ int PQregisterEventProc(PGconn *conn, PGEventProc proc,
 
       <para>
        An event procedure must be registered once on each
-       <structname>PGconn</> you want to receive events about.  There is no
+       <structname>PGconn</structname> you want to receive events about.  There is no
        limit, other than memory, on the number of event procedures that
        can be registered with a connection.  The function returns a non-zero
        value if it succeeds and zero if it fails.
@@ -6726,11 +6771,11 @@ int PQregisterEventProc(PGconn *conn, PGEventProc proc,
        event is fired.  Its memory address is also used to lookup
        <literal>instanceData</literal>.  The <parameter>name</parameter>
        argument is used to refer to the event procedure in error messages.
-       This value cannot be <symbol>NULL</> or a zero-length string.  The name string is
-       copied into the <structname>PGconn</>, so what is passed need not be
+       This value cannot be <symbol>NULL</symbol> or a zero-length string.  The name string is
+       copied into the <structname>PGconn</structname>, so what is passed need not be
        long-lived.  The <parameter>passThrough</parameter> pointer is passed
        to the <parameter>proc</parameter> whenever an event occurs. This
-       argument can be <symbol>NULL</>.
+       argument can be <symbol>NULL</symbol>.
       </para>
      </listitem>
     </varlistentry>
@@ -6744,11 +6789,11 @@ int PQregisterEventProc(PGconn *conn, PGEventProc proc,
      </term>
      <listitem>
       <para>
-       Sets the connection <parameter>conn</>'s <literal>instanceData</>
-       for procedure <parameter>proc</> to <parameter>data</>.  This
+       Sets the connection <parameter>conn</parameter>'s <literal>instanceData</literal>
+       for procedure <parameter>proc</parameter> to <parameter>data</parameter>.  This
        returns non-zero for success and zero for failure.  (Failure is
-       only possible if <parameter>proc</> has not been properly
-       registered in <parameter>conn</>.)
+       only possible if <parameter>proc</parameter> has not been properly
+       registered in <parameter>conn</parameter>.)
 
 <synopsis>
 int PQsetInstanceData(PGconn *conn, PGEventProc proc, void *data);
@@ -6767,8 +6812,8 @@ int PQsetInstanceData(PGconn *conn, PGEventProc proc, void *data);
      <listitem>
       <para>
        Returns the
-       connection <parameter>conn</>'s <literal>instanceData</literal>
-       associated with procedure <parameter>proc</>,
+       connection <parameter>conn</parameter>'s <literal>instanceData</literal>
+       associated with procedure <parameter>proc</parameter>,
        or <symbol>NULL</symbol> if there is none.
 
 <synopsis>
@@ -6787,10 +6832,10 @@ void *PQinstanceData(const PGconn *conn, PGEventProc proc);
      </term>
      <listitem>
       <para>
-       Sets the result's <literal>instanceData</>
-       for <parameter>proc</> to <parameter>data</>.  This returns
+       Sets the result's <literal>instanceData</literal>
+       for <parameter>proc</parameter> to <parameter>data</parameter>.  This returns
        non-zero for success and zero for failure.  (Failure is only
-       possible if <parameter>proc</> has not been properly registered
+       possible if <parameter>proc</parameter> has not been properly registered
        in the result.)
 
 <synopsis>
@@ -6809,7 +6854,7 @@ int PQresultSetInstanceData(PGresult *res, PGEventProc proc, void *data);
      </term>
      <listitem>
       <para>
-       Returns the result's <literal>instanceData</> associated with <parameter>proc</>, or <symbol>NULL</>
+       Returns the result's <literal>instanceData</literal> associated with <parameter>proc</parameter>, or <symbol>NULL</symbol>
        if there is none.
 
 <synopsis>
@@ -6849,7 +6894,8 @@ main(void)
 {
     mydata *data;
     PGresult *res;
-    PGconn *conn = PQconnectdb("dbname = postgres");
+    PGconn *conn =
+        PQconnectdb("dbname=postgres options=-csearch_path=");
 
     if (PQstatus(conn) != CONNECTION_OK)
     {
@@ -6965,12 +7011,12 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
             break;
         }
 
-        /* unknown event ID, just return TRUE. */
+        /* unknown event ID, just return true. */
         default:
             break;
     }
 
-    return TRUE; /* event processing succeeded */
+    return true; /* event processing succeeded */
 }
 ]]>
 </programlisting>
@@ -6987,8 +7033,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
   <para>
    The following environment variables can be used to select default
    connection parameter values, which will be used by
-   <function>PQconnectdb</>, <function>PQsetdbLogin</> and
-   <function>PQsetdb</> if no value is directly specified by the calling
+   <function>PQconnectdb</function>, <function>PQsetdbLogin</function> and
+   <function>PQsetdb</function> if no value is directly specified by the calling
    code.  These are useful to avoid hard-coding database connection
    information into simple client applications, for example.
 
@@ -6999,7 +7045,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGHOST</envar></primary>
       </indexterm>
       <envar>PGHOST</envar> behaves the same as the <xref
-      linkend="libpq-connect-host"> connection parameter.
+      linkend="libpq-connect-host"/> connection parameter.
      </para>
     </listitem>
 
@@ -7009,7 +7055,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGHOSTADDR</envar></primary>
       </indexterm>
       <envar>PGHOSTADDR</envar> behaves the same as the <xref
-      linkend="libpq-connect-hostaddr"> connection parameter.
+      linkend="libpq-connect-hostaddr"/> connection parameter.
       This can be set instead of or in addition to <envar>PGHOST</envar>
       to avoid DNS lookup overhead.
      </para>
@@ -7021,7 +7067,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGPORT</envar></primary>
       </indexterm>
       <envar>PGPORT</envar> behaves the same as the <xref
-      linkend="libpq-connect-port"> connection parameter.
+      linkend="libpq-connect-port"/> connection parameter.
      </para>
     </listitem>
 
@@ -7031,7 +7077,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGDATABASE</envar></primary>
       </indexterm>
       <envar>PGDATABASE</envar> behaves the same as the <xref
-      linkend="libpq-connect-dbname"> connection parameter.
+      linkend="libpq-connect-dbname"/> connection parameter.
       </para>
     </listitem>
 
@@ -7041,7 +7087,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGUSER</envar></primary>
       </indexterm>
       <envar>PGUSER</envar> behaves the same as the <xref
-      linkend="libpq-connect-user"> connection parameter.
+      linkend="libpq-connect-user"/> connection parameter.
      </para>
     </listitem>
 
@@ -7051,12 +7097,12 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGPASSWORD</envar></primary>
       </indexterm>
       <envar>PGPASSWORD</envar> behaves the same as the <xref
-      linkend="libpq-connect-password"> connection parameter.
+      linkend="libpq-connect-password"/> connection parameter.
       Use of this environment variable
       is not recommended for security reasons, as some operating systems
       allow non-root users to see process environment variables via
-      <application>ps</>; instead consider using a password file
-      (see <xref linkend="libpq-pgpass">).
+      <application>ps</application>; instead consider using a password file
+      (see <xref linkend="libpq-pgpass"/>).
      </para>
     </listitem>
 
@@ -7066,7 +7112,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGPASSFILE</envar></primary>
       </indexterm>
       <envar>PGPASSFILE</envar> behaves the same as the <xref
-      linkend="libpq-connect-passfile"> connection parameter.
+      linkend="libpq-connect-passfile"/> connection parameter.
      </para>
     </listitem>
 
@@ -7076,7 +7122,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSERVICE</envar></primary>
       </indexterm>
       <envar>PGSERVICE</envar> behaves the same as the <xref
-      linkend="libpq-connect-service"> connection parameter.
+      linkend="libpq-connect-service"/> connection parameter.
      </para>
     </listitem>
 
@@ -7087,8 +7133,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
       </indexterm>
       <envar>PGSERVICEFILE</envar> specifies the name of the per-user
       connection service file.  If not set, it defaults
-      to <filename>~/.pg_service.conf</>
-      (see <xref linkend="libpq-pgservice">).
+      to <filename>~/.pg_service.conf</filename>
+      (see <xref linkend="libpq-pgservice"/>).
      </para>
     </listitem>
 
@@ -7098,7 +7144,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGOPTIONS</envar></primary>
       </indexterm>
       <envar>PGOPTIONS</envar> behaves the same as the <xref
-      linkend="libpq-connect-options"> connection parameter.
+      linkend="libpq-connect-options"/> connection parameter.
      </para>
     </listitem>
 
@@ -7108,7 +7154,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGAPPNAME</envar></primary>
       </indexterm>
       <envar>PGAPPNAME</envar> behaves the same as the <xref
-      linkend="libpq-connect-application-name"> connection parameter.
+      linkend="libpq-connect-application-name"/> connection parameter.
      </para>
     </listitem>
 
@@ -7118,7 +7164,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLMODE</envar></primary>
       </indexterm>
       <envar>PGSSLMODE</envar> behaves the same as the <xref
-      linkend="libpq-connect-sslmode"> connection parameter.
+      linkend="libpq-connect-sslmode"/> connection parameter.
      </para>
     </listitem>
 
@@ -7128,7 +7174,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGREQUIRESSL</envar></primary>
       </indexterm>
       <envar>PGREQUIRESSL</envar> behaves the same as the <xref
-      linkend="libpq-connect-requiressl"> connection parameter.
+      linkend="libpq-connect-requiressl"/> connection parameter.
       This environment variable is deprecated in favor of the
       <envar>PGSSLMODE</envar> variable; setting both variables suppresses the
       effect of this one.
@@ -7141,7 +7187,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLCOMPRESSION</envar></primary>
       </indexterm>
       <envar>PGSSLCOMPRESSION</envar> behaves the same as the <xref
-      linkend="libpq-connect-sslcompression"> connection parameter.
+      linkend="libpq-connect-sslcompression"/> connection parameter.
      </para>
     </listitem>
 
@@ -7151,7 +7197,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLCERT</envar></primary>
       </indexterm>
       <envar>PGSSLCERT</envar> behaves the same as the <xref
-      linkend="libpq-connect-sslcert"> connection parameter.
+      linkend="libpq-connect-sslcert"/> connection parameter.
      </para>
     </listitem>
 
@@ -7161,7 +7207,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLKEY</envar></primary>
       </indexterm>
       <envar>PGSSLKEY</envar> behaves the same as the <xref
-      linkend="libpq-connect-sslkey"> connection parameter.
+      linkend="libpq-connect-sslkey"/> connection parameter.
      </para>
     </listitem>
 
@@ -7171,7 +7217,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLROOTCERT</envar></primary>
       </indexterm>
       <envar>PGSSLROOTCERT</envar>  behaves the same as the <xref
-      linkend="libpq-connect-sslrootcert"> connection parameter.
+      linkend="libpq-connect-sslrootcert"/> connection parameter.
      </para>
     </listitem>
 
@@ -7181,7 +7227,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSSLCRL</envar></primary>
       </indexterm>
       <envar>PGSSLCRL</envar>  behaves the same as the <xref
-      linkend="libpq-connect-sslcrl"> connection parameter.
+      linkend="libpq-connect-sslcrl"/> connection parameter.
      </para>
     </listitem>
 
@@ -7191,7 +7237,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGREQUIREPEER</envar></primary>
       </indexterm>
       <envar>PGREQUIREPEER</envar> behaves the same as the <xref
-      linkend="libpq-connect-requirepeer"> connection parameter.
+      linkend="libpq-connect-requirepeer"/> connection parameter.
      </para>
     </listitem>
 
@@ -7201,7 +7247,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGKRBSRVNAME</envar></primary>
       </indexterm>
       <envar>PGKRBSRVNAME</envar>  behaves the same as the <xref
-      linkend="libpq-connect-krbsrvname"> connection parameter.
+      linkend="libpq-connect-krbsrvname"/> connection parameter.
      </para>
     </listitem>
 
@@ -7211,7 +7257,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGGSSLIB</envar></primary>
       </indexterm>
       <envar>PGGSSLIB</envar> behaves the same as the <xref
-      linkend="libpq-connect-gsslib"> connection parameter.
+      linkend="libpq-connect-gsslib"/> connection parameter.
      </para>
     </listitem>
 
@@ -7221,7 +7267,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGCONNECT_TIMEOUT</envar></primary>
       </indexterm>
       <envar>PGCONNECT_TIMEOUT</envar>  behaves the same as the <xref
-      linkend="libpq-connect-connect-timeout"> connection parameter.
+      linkend="libpq-connect-connect-timeout"/> connection parameter.
      </para>
     </listitem>
 
@@ -7231,7 +7277,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGCLIENTENCODING</envar></primary>
       </indexterm>
       <envar>PGCLIENTENCODING</envar> behaves the same as the <xref
-      linkend="libpq-connect-client-encoding"> connection parameter.
+      linkend="libpq-connect-client-encoding"/> connection parameter.
      </para>
     </listitem>
 
@@ -7241,7 +7287,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGTARGETSESSIONATTRS</envar></primary>
       </indexterm>
       <envar>PGTARGETSESSIONATTRS</envar> behaves the same as the <xref
-      linkend="libpq-connect-target-session-attrs"> connection parameter.
+      linkend="libpq-connect-target-session-attrs"/> connection parameter.
      </para>
     </listitem>
    </itemizedlist>
@@ -7250,8 +7296,8 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
   <para>
    The following environment variables can be used to specify default
    behavior for each <productname>PostgreSQL</productname> session.  (See
-   also the <xref linkend="sql-alterrole">
-   and <xref linkend="sql-alterdatabase">
+   also the <xref linkend="sql-alterrole"/>
+   and <xref linkend="sql-alterdatabase"/>
    commands for ways to set default behavior on a per-user or per-database
    basis.)
 
@@ -7288,7 +7334,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
     </listitem>
    </itemizedlist>
 
-   Refer to the <acronym>SQL</acronym> command <xref linkend="sql-set">
+   Refer to the <acronym>SQL</acronym> command <xref linkend="sql-set"/>
    for information on correct values for these
    environment variables.
   </para>
@@ -7304,7 +7350,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGSYSCONFDIR</envar></primary>
       </indexterm>
       <envar>PGSYSCONFDIR</envar> sets the directory containing the
-      <filename>pg_service.conf</> file and in a future version
+      <filename>pg_service.conf</filename> file and in a future version
       possibly other system-wide configuration files.
      </para>
     </listitem>
@@ -7315,7 +7361,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
        <primary><envar>PGLOCALEDIR</envar></primary>
       </indexterm>
       <envar>PGLOCALEDIR</envar> sets the directory containing the
-      <literal>locale</> files for message localization.
+      <literal>locale</literal> files for message localization.
      </para>
     </listitem>
    </itemizedlist>
@@ -7339,11 +7385,11 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
    contain passwords to
    be used if the connection requires a password (and no password has been
    specified  otherwise). On Microsoft Windows the file is named
-   <filename>%APPDATA%\postgresql\pgpass.conf</> (where
-   <filename>%APPDATA%</> refers to the Application Data subdirectory in
+   <filename>%APPDATA%\postgresql\pgpass.conf</filename> (where
+   <filename>%APPDATA%</filename> refers to the Application Data subdirectory in
    the user's profile).
    Alternatively, a password file can be specified
-   using the connection parameter <xref linkend="libpq-connect-passfile">
+   using the connection parameter <xref linkend="libpq-connect-passfile"/>
    or the environment variable <envar>PGPASSFILE</envar>.
   </para>
 
@@ -7353,19 +7399,19 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
 <replaceable>hostname</replaceable>:<replaceable>port</replaceable>:<replaceable>database</replaceable>:<replaceable>username</replaceable>:<replaceable>password</replaceable>
 </synopsis>
    (You can add a reminder comment to the file by copying the line above and
-   preceding it with <literal>#</>.)
+   preceding it with <literal>#</literal>.)
    Each of the first four fields can be a literal value, or
    <literal>*</literal>, which matches anything.  The password field from
    the first line that matches the current connection parameters will be
    used.  (Therefore, put more-specific entries first when you are using
    wildcards.) If an entry needs to contain <literal>:</literal> or
    <literal>\</literal>, escape this character with <literal>\</literal>.
-   A host name of <literal>localhost</> matches both TCP (host name
-   <literal>localhost</>) and Unix domain socket (<literal>pghost</> empty
+   A host name of <literal>localhost</literal> matches both TCP (host name
+   <literal>localhost</literal>) and Unix domain socket (<literal>pghost</literal> empty
    or the default socket directory) connections coming from the local
-   machine. In a standby server, a database name of <literal>replication</>
+   machine. In a standby server, a database name of <literal>replication</literal>
    matches streaming replication connections made to the master server.
-   The <literal>database</> field is of limited usefulness because
+   The <literal>database</literal> field is of limited usefulness because
    users have the same password for all databases in the same cluster.
   </para>
 
@@ -7417,7 +7463,7 @@ myEventProc(PGEventId evtId, void *evtInfo, void *passThrough)
   <para>
    The file uses an <quote>INI file</quote> format where the section
    name is the service name and the parameters are connection
-   parameters; see <xref linkend="libpq-paramkeywords"> for a list.  For
+   parameters; see <xref linkend="libpq-paramkeywords"/> for a list.  For
    example:
 <programlisting>
 # comment
@@ -7451,7 +7497,7 @@ user=admin
   <para>
    LDAP connection parameter lookup uses the connection service file
    <filename>pg_service.conf</filename> (see <xref
-   linkend="libpq-pgservice">).  A line in a
+   linkend="libpq-pgservice"/>).  A line in a
    <filename>pg_service.conf</filename> stanza that starts with
    <literal>ldap://</literal> will be recognized as an LDAP URL and an
    LDAP query will be performed. The result must be a list of
@@ -7521,17 +7567,17 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</> has native support for using <acronym>SSL</>
+   <productname>PostgreSQL</productname> has native support for using <acronym>SSL</acronym>
    connections to encrypt client/server communications for increased
-   security. See <xref linkend="ssl-tcp"> for details about the server-side
-   <acronym>SSL</> functionality.
+   security. See <xref linkend="ssl-tcp"/> for details about the server-side
+   <acronym>SSL</acronym> functionality.
   </para>
 
   <para>
    <application>libpq</application> reads the system-wide
    <productname>OpenSSL</productname> configuration file. By default, this
    file is named <filename>openssl.cnf</filename> and is located in the
-   directory reported by <literal>openssl version -d</>.  This default
+   directory reported by <literal>openssl version -d</literal>.  This default
    can be overridden by setting environment variable
    <envar>OPENSSL_CONF</envar> to the name of the desired configuration
    file.
@@ -7541,44 +7587,63 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   <title>Client Verification of Server Certificates</title>
 
   <para>
-   By default, <productname>PostgreSQL</> will not perform any verification of
+   By default, <productname>PostgreSQL</productname> will not perform any verification of
    the server certificate. This means that it is possible to spoof the server
    identity (for example by modifying a DNS record or by taking over the server
    IP address) without the client knowing. In order to prevent spoofing,
-   <acronym>SSL</> certificate verification must be used.
+   the client must be able to verify the server's identity via a chain of
+   trust.  A chain of trust is established by placing a root (self-signed)
+   certificate authority (<acronym>CA</acronym>) certificate on one
+   computer and a leaf certificate <emphasis>signed</emphasis> by the
+   root certificate on another computer.  It is also possible to use an
+   <quote>intermediate</quote> certificate which is signed by the root
+   certificate and signs leaf certificates.
+  </para>
+
+  <para>
+   To allow the client to verify the identity of the server, place a root
+   certificate on the client and a leaf certificate signed by the root
+   certificate on the server.  To allow the server to verify the identity
+   of the client, place a root certificate on the server and a leaf
+   certificate signed by the root certificate on the client.  One or more
+   intermediate certificates (usually stored with the leaf certificate)
+   can also be used to link the leaf certificate to the root certificate.
   </para>
 
   <para>
-   If the parameter <literal>sslmode</> is set to <literal>verify-ca</>,
+   Once a chain of trust has been established, there are two ways for
+   the client to validate the leaf certificate sent by the server.
+   If the parameter <literal>sslmode</literal> is set to <literal>verify-ca</literal>,
    libpq will verify that the server is trustworthy by checking the
-   certificate chain up to a trusted certificate authority
-   (<acronym>CA</>). If <literal>sslmode</> is set to <literal>verify-full</>,
-   libpq will <emphasis>also</> verify that the server host name matches its
-   certificate. The SSL connection will fail if the server certificate cannot
-   be verified. <literal>verify-full</> is recommended in most
+   certificate chain up to the root certificate stored on the client.
+   If <literal>sslmode</literal> is set to <literal>verify-full</literal>,
+   libpq will <emphasis>also</emphasis> verify that the server host
+   name matches the name stored in the server certificate. The
+   SSL connection will fail if the server certificate cannot be
+   verified. <literal>verify-full</literal> is recommended in most
    security-sensitive environments.
   </para>
 
   <para>
-   In <literal>verify-full</> mode, the host name is matched against the
+   In <literal>verify-full</literal> mode, the host name is matched against the
    certificate's Subject Alternative Name attribute(s), or against the
    Common Name attribute if no Subject Alternative Name of type <literal>dNSName</literal> is
    present.  If the certificate's name attribute starts with an asterisk
-   (<literal>*</>), the asterisk will be treated as
-   a wildcard, which will match all characters <emphasis>except</> a dot
-   (<literal>.</>). This means the certificate will not match subdomains.
+   (<literal>*</literal>), the asterisk will be treated as
+   a wildcard, which will match all characters <emphasis>except</emphasis> a dot
+   (<literal>.</literal>). This means the certificate will not match subdomains.
    If the connection is made using an IP address instead of a host name, the
    IP address will be matched (without doing any DNS lookups).
   </para>
 
   <para>
-   To allow server certificate verification, the certificate(s) of one or more
-   trusted <acronym>CA</>s must be
-   placed in the file <filename>~/.postgresql/root.crt</> in the user's home
-   directory. If intermediate <acronym>CA</>s appear in
-   <filename>root.crt</filename>, the file must also contain certificate
-   chains to their root <acronym>CA</>s. (On Microsoft Windows the file is named
-   <filename>%APPDATA%\postgresql\root.crt</filename>.)
+   To allow server certificate verification, one or more root certificates
+   must be placed in the file <filename>~/.postgresql/root.crt</filename>
+   in the user's home directory.  (On Microsoft Windows the file is named
+   <filename>%APPDATA%\postgresql\root.crt</filename>.)  Intermediate
+   certificates should also be added to the file if they are needed to link
+   the certificate chain sent by the server to the root certificates
+   stored on the client.
   </para>
 
   <para>
@@ -7591,8 +7656,8 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   <para>
    The location of the root certificate file and the CRL can be changed by
    setting
-   the connection parameters <literal>sslrootcert</> and <literal>sslcrl</>
-   or the environment variables <envar>PGSSLROOTCERT</> and <envar>PGSSLCRL</>.
+   the connection parameters <literal>sslrootcert</literal> and <literal>sslcrl</literal>
+   or the environment variables <envar>PGSSLROOTCERT</envar> and <envar>PGSSLCRL</envar>.
   </para>
 
   <note>
@@ -7612,12 +7677,13 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   <title>Client Certificates</title>
 
   <para>
-   If the server requests a trusted client certificate,
-   <application>libpq</application> will send the certificate stored in
-   file <filename>~/.postgresql/postgresql.crt</> in the user's home
-   directory.  The certificate must be signed by one of the certificate
-   authorities (<acronym>CA</acronym>) trusted by the server.  A matching
-   private key file <filename>~/.postgresql/postgresql.key</> must also
+   If the server attempts to verify the identity of the
+   client by requesting the client's leaf certificate,
+   <application>libpq</application> will send the certificates stored in
+   file <filename>~/.postgresql/postgresql.crt</filename> in the user's home
+   directory.  The certificates must chain to the root certificate trusted
+   by the server.  A matching
+   private key file <filename>~/.postgresql/postgresql.key</filename> must also
    be present. The private
    key file must not allow any access to world or group; achieve this by the
    command <command>chmod 0600 ~/.postgresql/postgresql.key</command>.
@@ -7626,35 +7692,29 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
    <filename>%APPDATA%\postgresql\postgresql.key</filename>, and there
    is no special permissions check since the directory is presumed secure.
    The location of the certificate and key files can be overridden by the
-   connection parameters <literal>sslcert</> and <literal>sslkey</> or the
-   environment variables <envar>PGSSLCERT</> and <envar>PGSSLKEY</>.
+   connection parameters <literal>sslcert</literal> and <literal>sslkey</literal> or the
+   environment variables <envar>PGSSLCERT</envar> and <envar>PGSSLKEY</envar>.
   </para>
 
   <para>
-   In some cases, the client certificate might be signed by an
-   <quote>intermediate</> certificate authority, rather than one that is
-   directly trusted by the server.  To use such a certificate, append the
-   certificate of the signing authority to the <filename>postgresql.crt</>
-   file, then its parent authority's certificate, and so on up to a certificate
-   authority, <quote>root</> or <quote>intermediate</>, that is trusted by
-   the server, i.e. signed by a certificate in the server's
-   <filename>root.crt</filename> file.
+   The first certificate in <filename>postgresql.crt</filename> must be the
+   client's certificate because it must match the client's private key.
+   <quote>Intermediate</quote> certificates can be optionally appended
+   to the file &mdash; doing so avoids requiring storage of intermediate
+   certificates on the server (<xref linkend="guc-ssl-ca-file"/>).
   </para>
 
   <para>
-   Note that the client's <filename>~/.postgresql/root.crt</> lists the top-level CAs
-   that are considered trusted for signing server certificates.  In principle it need
-   not list the CA that signed the client's certificate, though in most cases
-   that CA would also be trusted for server certificates.
+   For instructions on creating certificates, see <xref
+   linkend="ssl-certificate-creation"/>.
   </para>
-
  </sect2>
 
  <sect2 id="libpq-ssl-protection">
   <title>Protection Provided in Different Modes</title>
 
   <para>
-   The different values for the <literal>sslmode</> parameter provide different
+   The different values for the <literal>sslmode</literal> parameter provide different
    levels of protection. SSL can provide
    protection against three types of attacks:
 
@@ -7664,23 +7724,23 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      <listitem>
       <para>If a third party can examine the network traffic between the
        client and the server, it can read both connection information (including
-       the user name and password) and the data that is passed. <acronym>SSL</>
+       the user name and password) and the data that is passed. <acronym>SSL</acronym>
        uses encryption to prevent this.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term>Man in the middle (<acronym>MITM</>)</term>
+     <term>Man in the middle (<acronym>MITM</acronym>)</term>
      <listitem>
       <para>If a third party can modify the data while passing between the
        client and server, it can pretend to be the server and therefore see and
-       modify data <emphasis>even if it is encrypted</>. The third party can then
+       modify data <emphasis>even if it is encrypted</emphasis>. The third party can then
        forward the connection information and data to the original server,
        making it impossible to detect this attack. Common vectors to do this
        include DNS poisoning and address hijacking, whereby the client is directed
        to a different server than intended. There are also several other
-       attack methods that can accomplish this. <acronym>SSL</> uses certificate
+       attack methods that can accomplish this. <acronym>SSL</acronym> uses certificate
        verification to prevent this, by authenticating the server to the client.
       </para>
      </listitem>
@@ -7691,7 +7751,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      <listitem>
       <para>If a third party can pretend to be an authorized client, it can
        simply access data it should not have access to. Typically this can
-       happen through insecure password management. <acronym>SSL</> uses
+       happen through insecure password management. <acronym>SSL</acronym> uses
        client certificates to prevent this, by making sure that only holders
        of valid certificates can access the server.
       </para>
@@ -7702,15 +7762,15 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
 
   <para>
    For a connection to be known secure, SSL usage must be configured
-   on <emphasis>both the client and the server</> before the connection
+   on <emphasis>both the client and the server</emphasis> before the connection
    is made. If it is only configured on the server, the client may end up
    sending sensitive information (e.g. passwords) before
    it knows that the server requires high security. In libpq, secure
    connections can be ensured
-   by setting the <literal>sslmode</> parameter to <literal>verify-full</> or
-   <literal>verify-ca</>, and providing the system with a root certificate to
-   verify against. This is analogous to using an <literal>https</>
-   <acronym>URL</> for encrypted web browsing.
+   by setting the <literal>sslmode</literal> parameter to <literal>verify-full</literal> or
+   <literal>verify-ca</literal>, and providing the system with a root certificate to
+   verify against. This is analogous to using an <literal>https</literal>
+   <acronym>URL</acronym> for encrypted web browsing.
   </para>
 
   <para>
@@ -7721,10 +7781,10 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   </para>
 
   <para>
-   All <acronym>SSL</> options carry overhead in the form of encryption and
+   All <acronym>SSL</acronym> options carry overhead in the form of encryption and
    key-exchange, so there is a trade-off that has to be made between performance
-   and security. <xref linkend="libpq-ssl-sslmode-statements">
-   illustrates the risks the different <literal>sslmode</> values
+   and security. <xref linkend="libpq-ssl-sslmode-statements"/>
+   illustrates the risks the different <literal>sslmode</literal> values
    protect against, and what statement they make about security and overhead.
   </para>
 
@@ -7733,16 +7793,16 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
    <tgroup cols="4">
     <thead>
      <row>
-      <entry><literal>sslmode</></entry>
+      <entry><literal>sslmode</literal></entry>
       <entry>Eavesdropping protection</entry>
-      <entry><acronym>MITM</> protection</entry>
+      <entry><acronym>MITM</acronym> protection</entry>
       <entry>Statement</entry>
      </row>
     </thead>
 
     <tbody>
      <row>
-      <entry><literal>disable</></entry>
+      <entry><literal>disable</literal></entry>
       <entry>No</entry>
       <entry>No</entry>
       <entry>I don't care about security, and I don't want to pay the overhead
@@ -7751,7 +7811,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      </row>
 
      <row>
-      <entry><literal>allow</></entry>
+      <entry><literal>allow</literal></entry>
       <entry>Maybe</entry>
       <entry>No</entry>
       <entry>I don't care about security, but I will pay the overhead of
@@ -7760,7 +7820,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      </row>
 
      <row>
-      <entry><literal>prefer</></entry>
+      <entry><literal>prefer</literal></entry>
       <entry>Maybe</entry>
       <entry>No</entry>
       <entry>I don't care about encryption, but I wish to pay the overhead of
@@ -7769,7 +7829,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      </row>
 
      <row>
-      <entry><literal>require</></entry>
+      <entry><literal>require</literal></entry>
       <entry>Yes</entry>
       <entry>No</entry>
       <entry>I want my data to be encrypted, and I accept the overhead. I trust
@@ -7778,16 +7838,16 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
      </row>
 
      <row>
-      <entry><literal>verify-ca</></entry>
+      <entry><literal>verify-ca</literal></entry>
       <entry>Yes</entry>
-      <entry><literal>Depends on CA</>-policy</entry>
+      <entry><literal>Depends on CA</literal>-policy</entry>
       <entry>I want my data encrypted, and I accept the overhead. I want to be
        sure that I connect to a server that I trust.
       </entry>
      </row>
 
      <row>
-      <entry><literal>verify-full</></entry>
+      <entry><literal>verify-full</literal></entry>
        <entry>Yes</entry>
        <entry>Yes</entry>
        <entry>I want my data encrypted, and I accept the overhead. I want to be
@@ -7801,17 +7861,17 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   </table>
 
   <para>
-   The difference between <literal>verify-ca</> and <literal>verify-full</>
-   depends on the policy of the root <acronym>CA</>. If a public
-   <acronym>CA</> is used, <literal>verify-ca</> allows connections to a server
-   that <emphasis>somebody else</> may have registered with the <acronym>CA</>.
-   In this case, <literal>verify-full</> should always be used. If
-   a local <acronym>CA</> is used, or even a self-signed certificate, using
-   <literal>verify-ca</> often provides enough protection.
+   The difference between <literal>verify-ca</literal> and <literal>verify-full</literal>
+   depends on the policy of the root <acronym>CA</acronym>. If a public
+   <acronym>CA</acronym> is used, <literal>verify-ca</literal> allows connections to a server
+   that <emphasis>somebody else</emphasis> may have registered with the <acronym>CA</acronym>.
+   In this case, <literal>verify-full</literal> should always be used. If
+   a local <acronym>CA</acronym> is used, or even a self-signed certificate, using
+   <literal>verify-ca</literal> often provides enough protection.
   </para>
 
   <para>
-   The default value for <literal>sslmode</> is <literal>prefer</>. As is shown
+   The default value for <literal>sslmode</literal> is <literal>prefer</literal>. As is shown
    in the table, this makes no sense from a security point of view, and it only
    promises performance overhead if possible. It is only provided as the default
    for backward compatibility, and is not recommended in secure deployments.
@@ -7823,7 +7883,7 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   <title>SSL Client File Usage</title>
 
   <para>
-   <xref linkend="libpq-ssl-file-usage"> summarizes the files that are
+   <xref linkend="libpq-ssl-file-usage"/> summarizes the files that are
    relevant to the SSL setup on the client.
   </para>
 
@@ -7841,27 +7901,27 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
     <tbody>
 
      <row>
-      <entry><filename>~/.postgresql/postgresql.crt</></entry>
+      <entry><filename>~/.postgresql/postgresql.crt</filename></entry>
       <entry>client certificate</entry>
       <entry>requested by server</entry>
      </row>
 
      <row>
-      <entry><filename>~/.postgresql/postgresql.key</></entry>
+      <entry><filename>~/.postgresql/postgresql.key</filename></entry>
       <entry>client private key</entry>
       <entry>proves client certificate sent by owner; does not indicate
       certificate owner is trustworthy</entry>
      </row>
 
      <row>
-      <entry><filename>~/.postgresql/root.crt</></entry>
+      <entry><filename>~/.postgresql/root.crt</filename></entry>
       <entry>trusted certificate authorities</entry>
       <entry>checks that server certificate is signed by a trusted certificate
       authority</entry>
      </row>
 
      <row>
-      <entry><filename>~/.postgresql/root.crl</></entry>
+      <entry><filename>~/.postgresql/root.crl</filename></entry>
       <entry>certificates revoked by certificate authorities</entry>
       <entry>server certificate must not be on this list</entry>
      </row>
@@ -7875,11 +7935,11 @@ ldap://ldap.acme.com/cn=dbserver,cn=hosts?pgconnectinfo?base?(objectclass=*)
   <title>SSL Library Initialization</title>
 
   <para>
-   If your application initializes <literal>libssl</> and/or
-   <literal>libcrypto</> libraries and <application>libpq</application>
-   is built with <acronym>SSL</> support, you should call
-   <function>PQinitOpenSSL</> to tell <application>libpq</application>
-   that the <literal>libssl</> and/or <literal>libcrypto</> libraries
+   If your application initializes <literal>libssl</literal> and/or
+   <literal>libcrypto</literal> libraries and <application>libpq</application>
+   is built with <acronym>SSL</acronym> support, you should call
+   <function>PQinitOpenSSL</function> to tell <application>libpq</application>
+   that the <literal>libssl</literal> and/or <literal>libcrypto</literal> libraries
    have been initialized by your application, so that
    <application>libpq</application> will not also initialize those libraries.
    <!-- If this URL changes replace it with a URL to www.archive.org. -->
@@ -7907,18 +7967,18 @@ void PQinitOpenSSL(int do_ssl, int do_crypto);
       </para>
 
       <para>
-       When <parameter>do_ssl</> is non-zero, <application>libpq</application>
-       will initialize the <application>OpenSSL</> library before first
-       opening a database connection.  When <parameter>do_crypto</> is
-       non-zero, the <literal>libcrypto</> library will be initialized.  By
-       default (if <function>PQinitOpenSSL</> is not called), both libraries
+       When <parameter>do_ssl</parameter> is non-zero, <application>libpq</application>
+       will initialize the <application>OpenSSL</application> library before first
+       opening a database connection.  When <parameter>do_crypto</parameter> is
+       non-zero, the <literal>libcrypto</literal> library will be initialized.  By
+       default (if <function>PQinitOpenSSL</function> is not called), both libraries
        are initialized.  When SSL support is not compiled in, this function is
        present but does nothing.
       </para>
 
       <para>
-       If your application uses and initializes either <application>OpenSSL</>
-       or its underlying <literal>libcrypto</> library, you <emphasis>must</>
+       If your application uses and initializes either <application>OpenSSL</application>
+       or its underlying <literal>libcrypto</literal> library, you <emphasis>must</emphasis>
        call this function with zeroes for the appropriate parameter(s)
        before first opening a database connection.  Also be sure that you
        have done that initialization before opening a database connection.
@@ -7944,15 +8004,15 @@ void PQinitSSL(int do_ssl);
 
       <para>
        This function is equivalent to
-       <literal>PQinitOpenSSL(do_ssl, do_ssl)</>.
+       <literal>PQinitOpenSSL(do_ssl, do_ssl)</literal>.
        It is sufficient for applications that initialize both or neither
-       of <application>OpenSSL</> and <literal>libcrypto</>.
+       of <application>OpenSSL</application> and <literal>libcrypto</literal>.
       </para>
 
       <para>
-       <function>PQinitSSL</> has been present since
-       <productname>PostgreSQL</> 8.0, while <function>PQinitOpenSSL</>
-       was added in <productname>PostgreSQL</> 8.4, so <function>PQinitSSL</>
+       <function>PQinitSSL</function> has been present since
+       <productname>PostgreSQL</productname> 8.0, while <function>PQinitOpenSSL</function>
+       was added in <productname>PostgreSQL</productname> 8.4, so <function>PQinitSSL</function>
        might be preferable for applications that need to work with older
        versions of <application>libpq</application>.
       </para>
@@ -7979,8 +8039,8 @@ void PQinitSSL(int do_ssl);
    options when you compile your application code.  Refer to your
    system's documentation for information about how to build
    thread-enabled applications, or look in
-   <filename>src/Makefile.global</filename> for <literal>PTHREAD_CFLAGS</>
-   and <literal>PTHREAD_LIBS</>.  This function allows the querying of
+   <filename>src/Makefile.global</filename> for <literal>PTHREAD_CFLAGS</literal>
+   and <literal>PTHREAD_LIBS</literal>.  This function allows the querying of
    <application>libpq</application>'s thread-safe status:
   </para>
 
@@ -8012,18 +8072,18 @@ int PQisthreadsafe();
 
   <para>
    One thread restriction is that no two threads attempt to manipulate
-   the same <structname>PGconn</> object at the same time. In particular,
+   the same <structname>PGconn</structname> object at the same time. In particular,
    you cannot issue concurrent commands from different threads through
    the same connection object. (If you need to run concurrent commands,
    use multiple connections.)
   </para>
 
   <para>
-   <structname>PGresult</> objects are normally read-only after creation,
+   <structname>PGresult</structname> objects are normally read-only after creation,
    and so can be passed around freely between threads.  However, if you use
-   any of the <structname>PGresult</>-modifying functions described in
-   <xref linkend="libpq-misc"> or <xref linkend="libpq-events">, it's up
-   to you to avoid concurrent operations on the same <structname>PGresult</>,
+   any of the <structname>PGresult</structname>-modifying functions described in
+   <xref linkend="libpq-misc"/> or <xref linkend="libpq-events"/>, it's up
+   to you to avoid concurrent operations on the same <structname>PGresult</structname>,
    too.
   </para>
 
@@ -8040,14 +8100,14 @@ int PQisthreadsafe();
    If you are using Kerberos inside your application (in addition to inside
    <application>libpq</application>), you will need to do locking around
    Kerberos calls because Kerberos functions are not thread-safe.  See
-   function <function>PQregisterThreadLock</> in the
+   function <function>PQregisterThreadLock</function> in the
    <application>libpq</application> source code for a way to do cooperative
    locking between <application>libpq</application> and your application.
   </para>
 
   <para>
    If you experience problems with threaded applications, run the program
-   in <filename>src/tools/thread</> to see if your platform has
+   in <filename>src/tools/thread</filename> to see if your platform has
    thread-unsafe functions.  This program is run by
    <filename>configure</filename>, but for binary distributions your
    library might not match the library used to build the binaries.
@@ -8090,7 +8150,7 @@ foo.c:95: `PGRES_TUPLES_OK' undeclared (first use in this function)
 
     <listitem>
      <para>
-      Point your compiler to the directory where the <productname>PostgreSQL</> header
+      Point your compiler to the directory where the <productname>PostgreSQL</productname> header
       files were installed, by supplying the
       <literal>-I<replaceable>directory</replaceable></literal> option
       to your compiler.  (In some cases the compiler will look into
@@ -8111,8 +8171,8 @@ CPPFLAGS += -I/usr/local/pgsql/include
       If there is any chance that your program might be compiled by
       other users then you should not hardcode the directory location
       like that.  Instead, you can run the utility
-      <command>pg_config</command><indexterm><primary>pg_config</><secondary
-      sortas="libpq">with libpq</></> to find out where the header
+      <command>pg_config</command><indexterm><primary>pg_config</primary><secondary
+      sortas="libpq">with libpq</secondary></indexterm> to find out where the header
       files are on the local system:
 <screen>
 <prompt>$</prompt> pg_config --includedir
@@ -8213,13 +8273,16 @@ testlibpq.o(.text+0xa4): undefined reference to `PQerrorMessage'
 <programlisting>
 <![CDATA[
 /*
+ * src/test/examples/testlibpq.c
+ *
+ *
  * testlibpq.c
  *
  *      Test the C version of libpq, the PostgreSQL frontend library.
  */
 #include <stdio.h>
 #include <stdlib.h>
-#include <libpq-fe.h>
+#include "libpq-fe.h"
 
 static void
 exit_nicely(PGconn *conn)
@@ -8259,6 +8322,22 @@ main(int argc, char **argv)
         exit_nicely(conn);
     }
 
+    /* Set always-secure search path, so malicous users can't take control. */
+    res = PQexec(conn,
+                 "SELECT pg_catalog.set_config('search_path', '', false)");
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+        PQclear(res);
+        exit_nicely(conn);
+    }
+
+    /*
+     * Should PQclear PGresult whenever it is no longer needed to avoid memory
+     * leaks
+     */
+    PQclear(res);
+
     /*
      * Our test case here involves using a cursor, for which we must be inside
      * a transaction block.  We could do the whole thing with a single
@@ -8274,11 +8353,6 @@ main(int argc, char **argv)
         PQclear(res);
         exit_nicely(conn);
     }
-
-    /*
-     * Should PQclear PGresult whenever it is no longer needed to avoid memory
-     * leaks
-     */
     PQclear(res);
 
     /*
@@ -8340,6 +8414,9 @@ main(int argc, char **argv)
 <programlisting>
 <![CDATA[
 /*
+ * src/test/examples/testlibpq2.c
+ *
+ *
  * testlibpq2.c
  *      Test of the asynchronous notification interface
  *
@@ -8351,16 +8428,16 @@ main(int argc, char **argv)
  * populate a database with the following commands
  * (provided in src/test/examples/testlibpq2.sql):
  *
+ *   CREATE SCHEMA TESTLIBPQ2;
+ *   SET search_path = TESTLIBPQ2;
  *   CREATE TABLE TBL1 (i int4);
- *
  *   CREATE TABLE TBL2 (i int4);
- *
  *   CREATE RULE r1 AS ON INSERT TO TBL1 DO
  *     (INSERT INTO TBL2 VALUES (new.i); NOTIFY TBL2);
  *
- * and do this four times:
+ * Start this program, then from psql do this four times:
  *
- *   INSERT INTO TBL1 VALUES (10);
+ *   INSERT INTO TESTLIBPQ2.TBL1 VALUES (10);
  */
 
 #ifdef WIN32
@@ -8372,6 +8449,10 @@ main(int argc, char **argv)
 #include <errno.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#ifdef HAVE_SYS_SELECT_H
+#include <sys/select.h>
+#endif
+
 #include "libpq-fe.h"
 
 static void
@@ -8411,6 +8492,22 @@ main(int argc, char **argv)
         exit_nicely(conn);
     }
 
+    /* Set always-secure search path, so malicous users can't take control. */
+    res = PQexec(conn,
+                 "SELECT pg_catalog.set_config('search_path', '', false)");
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+        PQclear(res);
+        exit_nicely(conn);
+    }
+
+    /*
+     * Should PQclear PGresult whenever it is no longer needed to avoid memory
+     * leaks
+     */
+    PQclear(res);
+
     /*
      * Issue LISTEN command to enable notifications from the rule's NOTIFY.
      */
@@ -8421,11 +8518,6 @@ main(int argc, char **argv)
         PQclear(res);
         exit_nicely(conn);
     }
-
-    /*
-     * should PQclear PGresult whenever it is no longer needed to avoid memory
-     * leaks
-     */
     PQclear(res);
 
     /* Quit after four notifies are received. */
@@ -8483,14 +8575,18 @@ main(int argc, char **argv)
 <programlisting>
 <![CDATA[
 /*
+ * src/test/examples/testlibpq3.c
+ *
+ *
  * testlibpq3.c
  *      Test out-of-line parameters and binary I/O.
  *
  * Before running this, populate a database with the following commands
  * (provided in src/test/examples/testlibpq3.sql):
  *
+ * CREATE SCHEMA testlibpq3;
+ * SET search_path = testlibpq3;
  * CREATE TABLE test1 (i int4, t text, b bytea);
- *
  * INSERT INTO test1 values (1, 'joe''s place', '\\000\\001\\002\\003\\004');
  * INSERT INTO test1 values (2, 'ho there', '\\004\\003\\002\\001\\000');
  *
@@ -8622,6 +8718,16 @@ main(int argc, char **argv)
         exit_nicely(conn);
     }
 
+    /* Set always-secure search path, so malicous users can't take control. */
+    res = PQexec(conn, "SET search_path = testlibpq3");
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+        PQclear(res);
+        exit_nicely(conn);
+    }
+    PQclear(res);
+
     /*
      * The point of this program is to illustrate use of PQexecParams() with
      * out-of-line parameters, as well as binary transmission of data.
diff --git a/doc/src/sgml/lo.sgml b/doc/src/sgml/lo.sgml
index cd4ed6030b..ab8d192bc1 100644
--- a/doc/src/sgml/lo.sgml
+++ b/doc/src/sgml/lo.sgml
@@ -8,9 +8,9 @@
  </indexterm>
 
  <para>
-  The <filename>lo</> module provides support for managing Large Objects
-  (also called LOs or BLOBs).  This includes a data type <type>lo</>
-  and a trigger <function>lo_manage</>.
+  The <filename>lo</filename> module provides support for managing Large Objects
+  (also called LOs or BLOBs).  This includes a data type <type>lo</type>
+  and a trigger <function>lo_manage</function>.
  </para>
 
  <sect2>
@@ -24,7 +24,7 @@
   </para>
 
   <para>
-   As <productname>PostgreSQL</> stands, this doesn't occur.  Large objects
+   As <productname>PostgreSQL</productname> stands, this doesn't occur.  Large objects
    are treated as objects in their own right; a table entry can reference a
    large object by OID, but there can be multiple table entries referencing
    the same large object OID, so the system doesn't delete the large object
@@ -32,30 +32,30 @@
   </para>
 
   <para>
-   Now this is fine for <productname>PostgreSQL</>-specific applications, but
+   Now this is fine for <productname>PostgreSQL</productname>-specific applications, but
    standard code using JDBC or ODBC won't delete the objects, resulting in
    orphan objects &mdash; objects that are not referenced by anything, and
    simply occupy disk space.
   </para>
 
   <para>
-   The <filename>lo</> module allows fixing this by attaching a trigger
+   The <filename>lo</filename> module allows fixing this by attaching a trigger
    to tables that contain LO reference columns.  The trigger essentially just
-   does a <function>lo_unlink</> whenever you delete or modify a value
+   does a <function>lo_unlink</function> whenever you delete or modify a value
    referencing a large object.  When you use this trigger, you are assuming
    that there is only one database reference to any large object that is
    referenced in a trigger-controlled column!
   </para>
 
   <para>
-   The module also provides a data type <type>lo</>, which is really just
-   a domain of the <type>oid</> type.  This is useful for differentiating
+   The module also provides a data type <type>lo</type>, which is really just
+   a domain of the <type>oid</type> type.  This is useful for differentiating
    database columns that hold large object references from those that are
-   OIDs of other things.  You don't have to use the <type>lo</> type to
+   OIDs of other things.  You don't have to use the <type>lo</type> type to
    use the trigger, but it may be convenient to use it to keep track of which
    columns in your database represent large objects that you are managing with
    the trigger.  It is also rumored that the ODBC driver gets confused if you
-   don't use <type>lo</> for BLOB columns.
+   don't use <type>lo</type> for BLOB columns.
   </para>
  </sect2>
 
@@ -67,7 +67,7 @@
   </para>
 
 <programlisting>
-CREATE TABLE image (title TEXT, raster lo);
+CREATE TABLE image (title text, raster lo);
 
 CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
     FOR EACH ROW EXECUTE PROCEDURE lo_manage(raster);
@@ -75,11 +75,11 @@ CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
 
   <para>
    For each column that will contain unique references to large objects,
-   create a <literal>BEFORE UPDATE OR DELETE</> trigger, and give the column
+   create a <literal>BEFORE UPDATE OR DELETE</literal> trigger, and give the column
    name as the sole trigger argument.  You can also restrict the trigger
    to only execute on updates to the column by using <literal>BEFORE UPDATE
    OF</literal> <replaceable class="parameter">column_name</replaceable>.
-   If you need multiple <type>lo</>
+   If you need multiple <type>lo</type>
    columns in the same table, create a separate trigger for each one,
    remembering to give a different name to each trigger on the same table.
   </para>
@@ -93,18 +93,18 @@ CREATE TRIGGER t_raster BEFORE UPDATE OR DELETE ON image
     <para>
      Dropping a table will still orphan any objects it contains, as the trigger
      is not executed.  You can avoid this by preceding the <command>DROP
-     TABLE</> with <command>DELETE FROM <replaceable>table</></command>.
+     TABLE</command> with <command>DELETE FROM <replaceable>table</replaceable></command>.
     </para>
 
     <para>
-     <command>TRUNCATE</> has the same hazard.
+     <command>TRUNCATE</command> has the same hazard.
     </para>
 
     <para>
      If you already have, or suspect you have, orphaned large objects, see the
-     <xref linkend="vacuumlo"> module to help
-     you clean them up.  It's a good idea to run <application>vacuumlo</>
-     occasionally as a back-stop to the <function>lo_manage</> trigger.
+     <xref linkend="vacuumlo"/> module to help
+     you clean them up.  It's a good idea to run <application>vacuumlo</application>
+     occasionally as a back-stop to the <function>lo_manage</function> trigger.
     </para>
    </listitem>
 
diff --git a/doc/src/sgml/lobj.sgml b/doc/src/sgml/lobj.sgml
index 7757e1e441..771795ae66 100644
--- a/doc/src/sgml/lobj.sgml
+++ b/doc/src/sgml/lobj.sgml
@@ -1,13 +1,13 @@
 <!-- doc/src/sgml/lobj.sgml -->
 
- <chapter id="largeObjects">
+ <chapter id="largeobjects">
   <title>Large Objects</title>
 
-  <indexterm zone="largeobjects"><primary>large object</></>
-  <indexterm><primary>BLOB</><see>large object</></>
+  <indexterm zone="largeobjects"><primary>large object</primary></indexterm>
+  <indexterm><primary>BLOB</primary><see>large object</see></indexterm>
 
    <para>
-    <productname>PostgreSQL</productname> has a <firstterm>large object</>
+    <productname>PostgreSQL</productname> has a <firstterm>large object</firstterm>
     facility, which provides stream-style access to user data that is stored
     in a special large-object structure.  Streaming access is useful
     when working with data values that are too large to manipulate
@@ -76,15 +76,15 @@
     of 1000000 bytes worth of storage; only of chunks covering the range of
     data bytes actually written.  A read operation will, however, read out
     zeroes for any unallocated locations preceding the last existing chunk.
-    This corresponds to the common behavior of <quote>sparsely allocated</>
+    This corresponds to the common behavior of <quote>sparsely allocated</quote>
     files in <acronym>Unix</acronym> file systems.
    </para>
 
    <para>
-    As of <productname>PostgreSQL</> 9.0, large objects have an owner
+    As of <productname>PostgreSQL</productname> 9.0, large objects have an owner
     and a set of access permissions, which can be managed using
-    <xref linkend="sql-grant"> and
-    <xref linkend="sql-revoke">.
+    <xref linkend="sql-grant"/> and
+    <xref linkend="sql-revoke"/>.
     <literal>SELECT</literal> privileges are required to read a large
     object, and
     <literal>UPDATE</literal> privileges are required to write or
@@ -92,7 +92,7 @@
     Only the large object's owner (or a database superuser) can delete,
     comment on, or change the owner of a large object.
     To adjust this behavior for compatibility with prior releases, see the
-    <xref linkend="guc-lo-compat-privileges"> run-time parameter.
+    <xref linkend="guc-lo-compat-privileges"/> run-time parameter.
    </para>
   </sect1>
 
@@ -101,7 +101,7 @@
 
    <para>
     This section describes the facilities that
-    <productname>PostgreSQL</productname>'s <application>libpq</>
+    <productname>PostgreSQL</productname>'s <application>libpq</application>
     client interface library provides for accessing large objects.
     The <productname>PostgreSQL</productname> large object interface is
     modeled after the <acronym>Unix</acronym> file-system interface, with
@@ -121,7 +121,7 @@
     If an error occurs while executing any one of these functions, the
     function will return an otherwise-impossible value, typically 0 or -1.
     A message describing the error is stored in the connection object and
-    can be retrieved with <function>PQerrorMessage</>.
+    can be retrieved with <function>PQerrorMessage</function>.
    </para>
 
    <para>
@@ -134,7 +134,7 @@
     <title>Creating a Large Object</title>
 
     <para>
-     <indexterm><primary>lo_creat</></>
+     <indexterm><primary>lo_creat</primary></indexterm>
      The function
 <synopsis>
 Oid lo_creat(PGconn *conn, int mode);
@@ -147,7 +147,7 @@ Oid lo_creat(PGconn *conn, int mode);
      ignored as of <productname>PostgreSQL</productname> 8.1; however, for
      backward compatibility with earlier releases it is best to
      set it to <symbol>INV_READ</symbol>, <symbol>INV_WRITE</symbol>,
-     or <symbol>INV_READ</symbol> <literal>|</> <symbol>INV_WRITE</symbol>.
+     or <symbol>INV_READ</symbol> <literal>|</literal> <symbol>INV_WRITE</symbol>.
      (These symbolic constants are defined
      in the header file <filename>libpq/libpq-fs.h</filename>.)
     </para>
@@ -160,7 +160,7 @@ inv_oid = lo_creat(conn, INV_READ|INV_WRITE);
     </para>
 
     <para>
-     <indexterm><primary>lo_create</></>
+     <indexterm><primary>lo_create</primary></indexterm>
      The function
 <synopsis>
 Oid lo_create(PGconn *conn, Oid lobjId);
@@ -169,14 +169,14 @@ Oid lo_create(PGconn *conn, Oid lobjId);
      specified by <replaceable class="parameter">lobjId</replaceable>;
      if so, failure occurs if that OID is already in use for some large
      object.  If <replaceable class="parameter">lobjId</replaceable>
-     is <symbol>InvalidOid</symbol> (zero) then <function>lo_create</> assigns an unused
-     OID (this is the same behavior as <function>lo_creat</>).
+     is <symbol>InvalidOid</symbol> (zero) then <function>lo_create</function> assigns an unused
+     OID (this is the same behavior as <function>lo_creat</function>).
      The return value is the OID that was assigned to the new large object,
      or <symbol>InvalidOid</symbol> (zero) on failure.
     </para>
 
     <para>
-     <function>lo_create</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_create</function> is new as of <productname>PostgreSQL</productname>
      8.1; if this function is run against an older server version, it will
      fail and return <symbol>InvalidOid</symbol>.
     </para>
@@ -193,7 +193,7 @@ inv_oid = lo_create(conn, desired_oid);
     <title>Importing a Large Object</title>
 
     <para>
-     <indexterm><primary>lo_import</></>
+     <indexterm><primary>lo_import</primary></indexterm>
      To import an operating system file as a large object, call
 <synopsis>
 Oid lo_import(PGconn *conn, const char *filename);
@@ -209,7 +209,7 @@ Oid lo_import(PGconn *conn, const char *filename);
     </para>
 
     <para>
-     <indexterm><primary>lo_import_with_oid</></>
+     <indexterm><primary>lo_import_with_oid</primary></indexterm>
      The function
 <synopsis>
 Oid lo_import_with_oid(PGconn *conn, const char *filename, Oid lobjId);
@@ -218,14 +218,14 @@ Oid lo_import_with_oid(PGconn *conn, const char *filename, Oid lobjId);
      specified by <replaceable class="parameter">lobjId</replaceable>;
      if so, failure occurs if that OID is already in use for some large
      object.  If <replaceable class="parameter">lobjId</replaceable>
-     is <symbol>InvalidOid</symbol> (zero) then <function>lo_import_with_oid</> assigns an unused
-     OID (this is the same behavior as <function>lo_import</>).
+     is <symbol>InvalidOid</symbol> (zero) then <function>lo_import_with_oid</function> assigns an unused
+     OID (this is the same behavior as <function>lo_import</function>).
      The return value is the OID that was assigned to the new large object,
      or <symbol>InvalidOid</symbol> (zero) on failure.
     </para>
 
     <para>
-     <function>lo_import_with_oid</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_import_with_oid</function> is new as of <productname>PostgreSQL</productname>
      8.4 and uses <function>lo_create</function> internally which is new in 8.1; if this function is run against 8.0 or before, it will
      fail and return <symbol>InvalidOid</symbol>.
     </para>
@@ -235,7 +235,7 @@ Oid lo_import_with_oid(PGconn *conn, const char *filename, Oid lobjId);
     <title>Exporting a Large Object</title>
 
     <para>
-     <indexterm><primary>lo_export</></>
+     <indexterm><primary>lo_export</primary></indexterm>
      To export a large object
      into an operating system file, call
 <synopsis>
@@ -253,14 +253,14 @@ int lo_export(PGconn *conn, Oid lobjId, const char *filename);
     <title>Opening an Existing Large Object</title>
 
     <para>
-     <indexterm><primary>lo_open</></>
+     <indexterm><primary>lo_open</primary></indexterm>
      To open an existing large object for reading or writing, call
 <synopsis>
 int lo_open(PGconn *conn, Oid lobjId, int mode);
 </synopsis>
      The <parameter>lobjId</parameter> argument specifies the OID of the large
      object to open.   The <parameter>mode</parameter> bits control whether the
-     object is opened for reading (<symbol>INV_READ</>), writing
+     object is opened for reading (<symbol>INV_READ</symbol>), writing
      (<symbol>INV_WRITE</symbol>), or both.
      (These symbolic constants are defined
      in the header file <filename>libpq/libpq-fs.h</filename>.)
@@ -277,19 +277,31 @@ int lo_open(PGconn *conn, Oid lobjId, int mode);
 
     <para>
      The server currently does not distinguish between modes
-     <symbol>INV_WRITE</symbol> and <symbol>INV_READ</> <literal>|</>
+     <symbol>INV_WRITE</symbol> and <symbol>INV_READ</symbol> <literal>|</literal>
      <symbol>INV_WRITE</symbol>: you are allowed to read from the descriptor
      in either case.  However there is a significant difference between
-     these modes and <symbol>INV_READ</> alone: with <symbol>INV_READ</>
+     these modes and <symbol>INV_READ</symbol> alone: with <symbol>INV_READ</symbol>
      you cannot write on the descriptor, and the data read from it will
      reflect the contents of the large object at the time of the transaction
-     snapshot that was active when <function>lo_open</> was executed,
+     snapshot that was active when <function>lo_open</function> was executed,
      regardless of later writes by this or other transactions.  Reading
      from a descriptor opened with <symbol>INV_WRITE</symbol> returns
      data that reflects all writes of other committed transactions as well
      as writes of the current transaction.  This is similar to the behavior
-     of <literal>REPEATABLE READ</> versus <literal>READ COMMITTED</> transaction
-     modes for ordinary SQL <command>SELECT</> commands.
+     of <literal>REPEATABLE READ</literal> versus <literal>READ COMMITTED</literal> transaction
+     modes for ordinary SQL <command>SELECT</command> commands.
+    </para>
+
+    <para>
+     <function>lo_open</function> will fail if <literal>SELECT</literal>
+     privilege is not available for the large object, or
+     if <symbol>INV_WRITE</symbol> is specified and <literal>UPDATE</literal>
+     privilege is not available.
+     (Prior to <productname>PostgreSQL</productname> 11, these privilege
+     checks were instead performed at the first actual read or write call
+     using the descriptor.)
+     These privilege checks can be disabled with the
+     <xref linkend="guc-lo-compat-privileges"/> run-time parameter.
     </para>
 
     <para>
@@ -304,14 +316,14 @@ inv_fd = lo_open(conn, inv_oid, INV_READ|INV_WRITE);
 <title>Writing Data to a Large Object</title>
 
 <para>
-     <indexterm><primary>lo_write</></>
+     <indexterm><primary>lo_write</primary></indexterm>
      The function
 <synopsis>
 int lo_write(PGconn *conn, int fd, const char *buf, size_t len);
 </synopsis>
      writes <parameter>len</parameter> bytes from <parameter>buf</parameter>
      (which must be of size <parameter>len</parameter>) to large object
-     descriptor <parameter>fd</>.  The <parameter>fd</parameter> argument must
+     descriptor <parameter>fd</parameter>.  The <parameter>fd</parameter> argument must
      have been returned by a previous <function>lo_open</function>.  The
      number of bytes actually written is returned (in the current
      implementation, this will always equal <parameter>len</parameter> unless
@@ -320,8 +332,8 @@ int lo_write(PGconn *conn, int fd, const char *buf, size_t len);
 
 <para>
      Although the <parameter>len</parameter> parameter is declared as
-     <type>size_t</>, this function will reject length values larger than
-     <literal>INT_MAX</>.  In practice, it's best to transfer data in chunks
+     <type>size_t</type>, this function will reject length values larger than
+     <literal>INT_MAX</literal>.  In practice, it's best to transfer data in chunks
      of at most a few megabytes anyway.
 </para>
 </sect2>
@@ -330,7 +342,7 @@ int lo_write(PGconn *conn, int fd, const char *buf, size_t len);
 <title>Reading Data from a Large Object</title>
 
 <para>
-     <indexterm><primary>lo_read</></>
+     <indexterm><primary>lo_read</primary></indexterm>
      The function
 <synopsis>
 int lo_read(PGconn *conn, int fd, char *buf, size_t len);
@@ -347,8 +359,8 @@ int lo_read(PGconn *conn, int fd, char *buf, size_t len);
 
 <para>
      Although the <parameter>len</parameter> parameter is declared as
-     <type>size_t</>, this function will reject length values larger than
-     <literal>INT_MAX</>.  In practice, it's best to transfer data in chunks
+     <type>size_t</type>, this function will reject length values larger than
+     <literal>INT_MAX</literal>.  In practice, it's best to transfer data in chunks
      of at most a few megabytes anyway.
 </para>
 </sect2>
@@ -357,7 +369,7 @@ int lo_read(PGconn *conn, int fd, char *buf, size_t len);
 <title>Seeking in a Large Object</title>
 
 <para>
-     <indexterm><primary>lo_lseek</></>
+     <indexterm><primary>lo_lseek</primary></indexterm>
      To change the current read or write location associated with a
      large object descriptor, call
 <synopsis>
@@ -365,16 +377,16 @@ int lo_lseek(PGconn *conn, int fd, int offset, int whence);
 </synopsis>
      This function moves the
      current location pointer for the large object descriptor identified by
-     <parameter>fd</> to the new location specified by
-     <parameter>offset</>.  The valid values for <parameter>whence</>
-     are <symbol>SEEK_SET</> (seek from object start),
-     <symbol>SEEK_CUR</> (seek from current position), and
-     <symbol>SEEK_END</> (seek from object end).  The return value is
+     <parameter>fd</parameter> to the new location specified by
+     <parameter>offset</parameter>.  The valid values for <parameter>whence</parameter>
+     are <symbol>SEEK_SET</symbol> (seek from object start),
+     <symbol>SEEK_CUR</symbol> (seek from current position), and
+     <symbol>SEEK_END</symbol> (seek from object end).  The return value is
      the new location pointer, or -1 on error.
 </para>
 
 <para>
-     <indexterm><primary>lo_lseek64</></>
+     <indexterm><primary>lo_lseek64</primary></indexterm>
      When dealing with large objects that might exceed 2GB in size,
      instead use
 <synopsis>
@@ -382,14 +394,14 @@ pg_int64 lo_lseek64(PGconn *conn, int fd, pg_int64 offset, int whence);
 </synopsis>
      This function has the same behavior
      as <function>lo_lseek</function>, but it can accept an
-     <parameter>offset</> larger than 2GB and/or deliver a result larger
+     <parameter>offset</parameter> larger than 2GB and/or deliver a result larger
      than 2GB.
      Note that <function>lo_lseek</function> will fail if the new location
      pointer would be greater than 2GB.
 </para>
 
 <para>
-     <function>lo_lseek64</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_lseek64</function> is new as of <productname>PostgreSQL</productname>
      9.3.  If this function is run against an older server version, it will
      fail and return -1.
 </para>
@@ -400,7 +412,7 @@ pg_int64 lo_lseek64(PGconn *conn, int fd, pg_int64 offset, int whence);
 <title>Obtaining the Seek Position of a Large Object</title>
 
 <para>
-     <indexterm><primary>lo_tell</></>
+     <indexterm><primary>lo_tell</primary></indexterm>
      To obtain the current read or write location of a large object descriptor,
      call
 <synopsis>
@@ -410,7 +422,7 @@ int lo_tell(PGconn *conn, int fd);
 </para>
 
 <para>
-     <indexterm><primary>lo_tell64</></>
+     <indexterm><primary>lo_tell64</primary></indexterm>
      When dealing with large objects that might exceed 2GB in size,
      instead use
 <synopsis>
@@ -424,7 +436,7 @@ pg_int64 lo_tell64(PGconn *conn, int fd);
 </para>
 
 <para>
-     <function>lo_tell64</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_tell64</function> is new as of <productname>PostgreSQL</productname>
      9.3.  If this function is run against an older server version, it will
      fail and return -1.
 </para>
@@ -434,15 +446,15 @@ pg_int64 lo_tell64(PGconn *conn, int fd);
 <title>Truncating a Large Object</title>
 
 <para>
-     <indexterm><primary>lo_truncate</></>
+     <indexterm><primary>lo_truncate</primary></indexterm>
      To truncate a large object to a given length, call
 <synopsis>
 int lo_truncate(PGcon *conn, int fd, size_t len);
 </synopsis>
      This function truncates the large object
-     descriptor <parameter>fd</> to length <parameter>len</>.  The
+     descriptor <parameter>fd</parameter> to length <parameter>len</parameter>.  The
      <parameter>fd</parameter> argument must have been returned by a
-     previous <function>lo_open</function>.  If <parameter>len</> is
+     previous <function>lo_open</function>.  If <parameter>len</parameter> is
      greater than the large object's current length, the large object
      is extended to the specified length with null bytes ('\0').
      On success, <function>lo_truncate</function> returns
@@ -456,12 +468,12 @@ int lo_truncate(PGcon *conn, int fd, size_t len);
 
 <para>
      Although the <parameter>len</parameter> parameter is declared as
-     <type>size_t</>, <function>lo_truncate</function> will reject length
-     values larger than <literal>INT_MAX</>.
+     <type>size_t</type>, <function>lo_truncate</function> will reject length
+     values larger than <literal>INT_MAX</literal>.
 </para>
 
 <para>
-     <indexterm><primary>lo_truncate64</></>
+     <indexterm><primary>lo_truncate64</primary></indexterm>
      When dealing with large objects that might exceed 2GB in size,
      instead use
 <synopsis>
@@ -469,17 +481,17 @@ int lo_truncate64(PGcon *conn, int fd, pg_int64 len);
 </synopsis>
      This function has the same
      behavior as <function>lo_truncate</function>, but it can accept a
-     <parameter>len</> value exceeding 2GB.
+     <parameter>len</parameter> value exceeding 2GB.
 </para>
 
 <para>
-     <function>lo_truncate</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_truncate</function> is new as of <productname>PostgreSQL</productname>
      8.3; if this function is run against an older server version, it will
      fail and return -1.
 </para>
 
 <para>
-     <function>lo_truncate64</> is new as of <productname>PostgreSQL</productname>
+     <function>lo_truncate64</function> is new as of <productname>PostgreSQL</productname>
      9.3; if this function is run against an older server version, it will
      fail and return -1.
 </para>
@@ -489,12 +501,12 @@ int lo_truncate64(PGcon *conn, int fd, pg_int64 len);
 <title>Closing a Large Object Descriptor</title>
 
 <para>
-     <indexterm><primary>lo_close</></>
+     <indexterm><primary>lo_close</primary></indexterm>
      A large object descriptor can be closed by calling
 <synopsis>
 int lo_close(PGconn *conn, int fd);
 </synopsis>
-     where <parameter>fd</> is a
+     where <parameter>fd</parameter> is a
      large object descriptor returned by <function>lo_open</function>.
      On success, <function>lo_close</function> returns zero.  On
      error, the return value is -1.
@@ -510,7 +522,7 @@ int lo_close(PGconn *conn, int fd);
     <title>Removing a Large Object</title>
 
     <para>
-     <indexterm><primary>lo_unlink</></>
+     <indexterm><primary>lo_unlink</primary></indexterm>
      To remove a large object from the database, call
 <synopsis>
 int lo_unlink(PGconn *conn, Oid lobjId);
@@ -527,7 +539,7 @@ int lo_unlink(PGconn *conn, Oid lobjId);
 
   <para>
    Server-side functions tailored for manipulating large objects from SQL are
-   listed in <xref linkend="lo-funcs-table">.
+   listed in <xref linkend="lo-funcs-table"/>.
   </para>
 
   <table id="lo-funcs-table">
@@ -554,7 +566,7 @@ int lo_unlink(PGconn *conn, Oid lobjId);
       <entry><type>oid</type></entry>
       <entry>
        Create a large object and store data there, returning its OID.
-       Pass <literal>0</> to have the system choose an OID.
+       Pass <literal>0</literal> to have the system choose an OID.
       </entry>
       <entry><literal>lo_from_bytea(0, E'\\xffffff00')</literal></entry>
       <entry><literal>24528</literal></entry>
@@ -599,11 +611,11 @@ int lo_unlink(PGconn *conn, Oid lobjId);
    client-side functions described earlier; indeed, for the most part the
    client-side functions are simply interfaces to the equivalent server-side
    functions.  The ones just as convenient to call via SQL commands are
-   <function>lo_creat</function><indexterm><primary>lo_creat</></>,
+   <function>lo_creat</function><indexterm><primary>lo_creat</primary></indexterm>,
    <function>lo_create</function>,
-   <function>lo_unlink</function><indexterm><primary>lo_unlink</></>,
-   <function>lo_import</function><indexterm><primary>lo_import</></>, and
-   <function>lo_export</function><indexterm><primary>lo_export</></>.
+   <function>lo_unlink</function><indexterm><primary>lo_unlink</primary></indexterm>,
+   <function>lo_import</function><indexterm><primary>lo_import</primary></indexterm>, and
+   <function>lo_export</function><indexterm><primary>lo_export</primary></indexterm>.
    Here are examples of their use:
 
 <programlisting>
@@ -634,18 +646,40 @@ SELECT lo_export(image.raster, '/tmp/motd') FROM image
     <function>lo_export</function> functions behave considerably differently
     from their client-side analogs.  These two functions read and write files
     in the server's file system, using the permissions of the database's
-    owning user.  Therefore, their use is restricted to superusers.  In
-    contrast, the client-side import and export functions read and write files
-    in the client's file system, using the permissions of the client program.
-    The client-side functions do not require superuser privilege.
+    owning user.  Therefore, by default their use is restricted to superusers.
+    In contrast, the client-side import and export functions read and write
+    files in the client's file system, using the permissions of the client
+    program.  The client-side functions do not require any database
+    privileges, except the privilege to read or write the large object in
+    question.
   </para>
 
+  <caution>
+   <para>
+    It is possible to <xref linkend="sql-grant"/> use of the
+    server-side <function>lo_import</function>
+    and <function>lo_export</function> functions to non-superusers, but
+    careful consideration of the security implications is required.  A
+    malicious user of such privileges could easily parlay them into becoming
+    superuser (for example by rewriting server configuration files), or could
+    attack the rest of the server's file system without bothering to obtain
+    database superuser privileges as such.  <emphasis>Access to roles having
+    such privilege must therefore be guarded just as carefully as access to
+    superuser roles.</emphasis>  Nonetheless, if use of
+    server-side <function>lo_import</function>
+    or <function>lo_export</function> is needed for some routine task, it's
+    safer to use a role with such privileges than one with full superuser
+    privileges, as that helps to reduce the risk of damage from accidental
+    errors.
+   </para>
+  </caution>
+
   <para>
     The functionality of <function>lo_read</function> and
     <function>lo_write</function> is also available via server-side calls,
     but the names of the server-side functions differ from the client side
     interfaces in that they do not contain underscores.  You must call
-    these functions as <function>loread</> and <function>lowrite</>.
+    these functions as <function>loread</function> and <function>lowrite</function>.
   </para>
 
 </sect1>
@@ -654,9 +688,9 @@ SELECT lo_export(image.raster, '/tmp/motd') FROM image
 <title>Example Program</title>
 
 <para>
-     <xref linkend="lo-example"> is a sample program which shows how the large object
+     <xref linkend="lo-example"/> is a sample program which shows how the large object
      interface
-     in <application>libpq</> can be used.  Parts of the program are
+     in <application>libpq</application> can be used.  Parts of the program are
      commented out but are left in the source for  the  reader's
      benefit.  This program can also be found in
      <filename>src/test/examples/testlo.c</filename> in the source distribution.
@@ -670,7 +704,7 @@ SELECT lo_export(image.raster, '/tmp/motd') FROM image
  * testlo.c
  *    test using large objects with libpq
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -899,6 +933,17 @@ main(int argc, char **argv)
         exit_nicely(conn);
     }
 
+    /* Set always-secure search path, so malicous users can't take control. */
+    res = PQexec(conn,
+                 "SELECT pg_catalog.set_config('search_path', '', false)");
+    if (PQresultStatus(res) != PGRES_COMMAND_OK)
+    {
+        fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+        PQclear(res);
+        exit_nicely(conn);
+    }
+    PQclear(res);
+
     res = PQexec(conn, "begin");
     PQclear(res);
     printf("importing file \"%s\" ...\n", in_filename);
diff --git a/doc/src/sgml/logical-replication.sgml b/doc/src/sgml/logical-replication.sgml
index fa0bb56b7b..75551d8ee1 100644
--- a/doc/src/sgml/logical-replication.sgml
+++ b/doc/src/sgml/logical-replication.sgml
@@ -8,7 +8,7 @@
   changes, based upon their replication identity (usually a primary key).  We
   use the term logical in contrast to physical replication, which uses exact
   block addresses and byte-by-byte replication.  PostgreSQL supports both
-  mechanisms concurrently, see <xref linkend="high-availability">.  Logical
+  mechanisms concurrently, see <xref linkend="high-availability"/>.  Logical
   replication allows fine-grained control over both data replication and
   security.
  </para>
@@ -126,7 +126,7 @@
    fallback if no other solution is possible.  If a replica identity other
    than <quote>full</quote> is set on the publisher side, a replica identity
    comprising the same or fewer columns must also be set on the subscriber
-   side.  See <xref linkend="SQL-CREATETABLE-REPLICA-IDENTITY"> for details on
+   side.  See <xref linkend="sql-createtable-replica-identity"/> for details on
    how to set the replica identity.  If a table without a replica identity is
    added to a publication that replicates <command>UPDATE</command>
    or <command>DELETE</command> operations then
@@ -140,13 +140,13 @@
   </para>
 
   <para>
-   A publication is created using the <xref linkend="sql-createpublication">
+   A publication is created using the <xref linkend="sql-createpublication"/>
    command and may later be altered or dropped using corresponding commands.
   </para>
 
   <para>
    The individual tables can be added and removed dynamically using
-   <xref linkend="sql-alterpublication">.  Both the <literal>ADD
+   <xref linkend="sql-alterpublication"/>.  Both the <literal>ADD
    TABLE</literal> and <literal>DROP TABLE</literal> operations are
    transactional; so the table will start or stop replicating at the correct
    snapshot once the transaction has committed.
@@ -179,14 +179,14 @@
 
   <para>
    Each subscription will receive changes via one replication slot (see
-   <xref linkend="streaming-replication-slots">).  Additional temporary
+   <xref linkend="streaming-replication-slots"/>).  Additional temporary
    replication slots may be required for the initial data synchronization
    of pre-existing table data.
   </para>
 
   <para>
    A logical replication subscription can be a standby for synchronous
-   replication (see <xref linkend="synchronous-replication">).  The standby
+   replication (see <xref linkend="synchronous-replication"/>).  The standby
    name is by default the subscription name.  An alternative name can be
    specified as <literal>application_name</literal> in the connection
    information of the subscription.
@@ -200,10 +200,10 @@
   </para>
 
   <para>
-   The subscription is added using <xref linkend="sql-createsubscription"> and
+   The subscription is added using <xref linkend="sql-createsubscription"/> and
    can be stopped/resumed at any time using the
-   <xref linkend="sql-altersubscription"> command and removed using
-   <xref linkend="sql-dropsubscription">.
+   <xref linkend="sql-altersubscription"/> command and removed using
+   <xref linkend="sql-dropsubscription"/>.
   </para>
 
   <para>
@@ -375,7 +375,7 @@
 
    <listitem>
     <para>
-     Large objects (see <xref linkend="largeobjects">) are not replicated.
+     Large objects (see <xref linkend="largeobjects"/>) are not replicated.
      There is no workaround for that, other than storing data in normal
      tables.
     </para>
@@ -409,13 +409,13 @@
 
   <para>
    Logical replication is built with an architecture similar to physical
-   streaming replication (see <xref linkend="streaming-replication">).  It is
+   streaming replication (see <xref linkend="streaming-replication"/>).  It is
    implemented by <quote>walsender</quote> and <quote>apply</quote>
    processes.  The walsender process starts logical decoding (described
-   in <xref linkend="logicaldecoding">) of the WAL and loads the standard
+   in <xref linkend="logicaldecoding"/>) of the WAL and loads the standard
    logical decoding plugin (pgoutput).  The plugin transforms the changes read
    from WAL to the logical replication protocol
-   (see <xref linkend="protocol-logical-replication">) and filters the data
+   (see <xref linkend="protocol-logical-replication"/>) and filters the data
    according to the publication specification.  The data is then continuously
    transferred using the streaming replication protocol to the apply worker,
    which maps the data to local tables and applies the individual changes as
@@ -461,7 +461,7 @@
    <link linkend="streaming-replication">physical streaming replication</link>,
    the monitoring on a publication node is similar to monitoring of a
    physical replication master
-   (see <xref linkend="streaming-replication-monitoring">).
+   (see <xref linkend="streaming-replication-monitoring"/>).
   </para>
 
   <para>
diff --git a/doc/src/sgml/logicaldecoding.sgml b/doc/src/sgml/logicaldecoding.sgml
index 8dcfc6c742..5501eed108 100644
--- a/doc/src/sgml/logicaldecoding.sgml
+++ b/doc/src/sgml/logicaldecoding.sgml
@@ -24,17 +24,17 @@
    by <command>INSERT</command> and the new row version created
    by <command>UPDATE</command>.  Availability of old row versions for
    <command>UPDATE</command> and <command>DELETE</command> depends on
-   the configured replica identity (see <xref linkend="SQL-CREATETABLE-REPLICA-IDENTITY">).
+   the configured replica identity (see <xref linkend="sql-createtable-replica-identity"/>).
   </para>
 
   <para>
    Changes can be consumed either using the streaming replication protocol
-   (see <xref linkend="protocol-replication"> and
-   <xref linkend="logicaldecoding-walsender">), or by calling functions
-   via SQL (see <xref linkend="logicaldecoding-sql">). It is also possible
+   (see <xref linkend="protocol-replication"/> and
+   <xref linkend="logicaldecoding-walsender"/>), or by calling functions
+   via SQL (see <xref linkend="logicaldecoding-sql"/>). It is also possible
    to write additional methods of consuming the output of a replication slot
    without modifying core code
-   (see <xref linkend="logicaldecoding-writer">).
+   (see <xref linkend="logicaldecoding-writer"/>).
   </para>
 
   <sect1 id="logicaldecoding-example">
@@ -47,8 +47,8 @@
 
    <para>
     Before you can use logical decoding, you must set
-    <xref linkend="guc-wal-level"> to <literal>logical</literal> and
-    <xref linkend="guc-max-replication-slots"> to at least 1.  Then, you
+    <xref linkend="guc-wal-level"/> to <literal>logical</literal> and
+    <xref linkend="guc-max-replication-slots"/> to at least 1.  Then, you
     should connect to the target database (in the example
     below, <literal>postgres</literal>) as a superuser.
    </para>
@@ -146,23 +146,23 @@ postgres=# SELECT pg_drop_replication_slot('regression_slot');
    <para>
     The following example shows how logical decoding is controlled over the
     streaming replication protocol, using the
-    program <xref linkend="app-pgrecvlogical"> included in the PostgreSQL
+    program <xref linkend="app-pgrecvlogical"/> included in the PostgreSQL
     distribution.  This requires that client authentication is set up to allow
     replication connections
-    (see <xref linkend="streaming-replication-authentication">) and
+    (see <xref linkend="streaming-replication-authentication"/>) and
     that <varname>max_wal_senders</varname> is set sufficiently high to allow
     an additional connection.
    </para>
 <programlisting>
 $ pg_recvlogical -d postgres --slot test --create-slot
 $ pg_recvlogical -d postgres --slot test --start -f -
-<keycombo action="simul"><keycap>Control</><keycap>Z</></>
+<keycombo action="simul"><keycap>Control</keycap><keycap>Z</keycap></keycombo>
 $ psql -d postgres -c "INSERT INTO data(data) VALUES('4');"
 $ fg
 BEGIN 693
 table public.data: INSERT: id[integer]:4 data[text]:'4'
 COMMIT 693
-<keycombo action="simul"><keycap>Control</><keycap>C</></>
+<keycombo action="simul"><keycap>Control</keycap><keycap>C</keycap></keycombo>
 $ pg_recvlogical -d postgres --slot test --drop-slot
 </programlisting>
   </sect1>
@@ -208,7 +208,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
 
     <note>
      <para><productname>PostgreSQL</productname> also has streaming replication slots
-     (see <xref linkend="streaming-replication">), but they are used somewhat
+     (see <xref linkend="streaming-replication"/>), but they are used somewhat
      differently there.
      </para>
     </note>
@@ -248,16 +248,18 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
      may consume changes from a slot at any given time.
     </para>
 
-    <note>
+    <caution>
      <para>
       Replication slots persist across crashes and know nothing about the state
       of their consumer(s). They will prevent removal of required resources
       even when there is no connection using them. This consumes storage
       because neither required WAL nor required rows from the system catalogs
       can be removed by <command>VACUUM</command> as long as they are required by a replication
-      slot.  So if a slot is no longer required it should be dropped.
+      slot.  In extreme cases this could cause the database to shut down to prevent
+      transaction ID wraparound (see <xref linkend="vacuum-for-wraparound"/>).
+      So if a slot is no longer required it should be dropped.
      </para>
-    </note>
+    </caution>
    </sect2>
 
    <sect2>
@@ -272,9 +274,9 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
     <title>Exported Snapshots</title>
     <para>
      When a new replication slot is created using the streaming replication
-     interface (see <xref linkend="protocol-replication-create-slot">), a
+     interface (see <xref linkend="protocol-replication-create-slot"/>), a
      snapshot is exported
-     (see <xref linkend="functions-snapshot-synchronization">), which will show
+     (see <xref linkend="functions-snapshot-synchronization"/>), which will show
      exactly the state of the database after which all changes will be
      included in the change stream. This can be used to create a new replica by
      using <link linkend="sql-set-transaction"><literal>SET TRANSACTION
@@ -286,7 +288,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
     <para>
      Creation of a snapshot is not always possible.  In particular, it will
      fail when connected to a hot standby.  Applications that do not require
-     snapshot export may suppress it with the <literal>NOEXPORT_SNAPSHOT</>
+     snapshot export may suppress it with the <literal>NOEXPORT_SNAPSHOT</literal>
      option.
     </para>
    </sect2>
@@ -303,7 +305,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
      </listitem>
 
      <listitem>
-      <para><literal>DROP_REPLICATION_SLOT <replaceable>slot_name</replaceable></literal></para>
+      <para><literal>DROP_REPLICATION_SLOT <replaceable>slot_name</replaceable></literal> <optional> <literal>WAIT</literal> </optional></para>
      </listitem>
 
      <listitem>
@@ -313,11 +315,11 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
     are used to create, drop, and stream changes from a replication
     slot, respectively. These commands are only available over a replication
     connection; they cannot be used via SQL.
-    See <xref linkend="protocol-replication"> for details on these commands.
+    See <xref linkend="protocol-replication"/> for details on these commands.
    </para>
 
    <para>
-    The command <xref linkend="app-pgrecvlogical"> can be used to control
+    The command <xref linkend="app-pgrecvlogical"/> can be used to control
     logical decoding over a streaming replication connection.  (It uses
     these commands internally.)
    </para>
@@ -327,12 +329,12 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
    <title>Logical Decoding <acronym>SQL</acronym> Interface</title>
 
    <para>
-     See <xref linkend="functions-replication"> for detailed documentation on
+     See <xref linkend="functions-replication"/> for detailed documentation on
      the SQL-level API for interacting with logical decoding.
    </para>
 
    <para>
-    Synchronous replication (see <xref linkend="synchronous-replication">) is
+    Synchronous replication (see <xref linkend="synchronous-replication"/>) is
     only supported on replication slots used over the streaming replication interface. The
     function interface and additional, non-core interfaces do not support
     synchronous replication.
@@ -345,7 +347,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
    <para>
     The <link linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
     view and the
-    <link linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
+    <link linkend="pg-stat-replication-view"><structname>pg_stat_replication</structname></link>
     view provide information about the current state of replication slots and
     streaming replication connections respectively. These views apply to both physical and
     logical replication.
@@ -363,7 +365,7 @@ $ pg_recvlogical -d postgres --slot test --drop-slot
    </para>
    <sect2 id="logicaldecoding-output-init">
     <title>Initialization Function</title>
-    <indexterm zone="logicaldecoding">
+    <indexterm zone="logicaldecoding-output-init">
      <primary>_PG_output_plugin_init</primary>
     </indexterm>
     <para>
@@ -426,12 +428,12 @@ CREATE TABLE another_catalog_table(data text) WITH (user_catalog_table = true);
      data in a data type that can contain arbitrary data (e.g., <type>bytea</type>) is
      cumbersome. If the output plugin only outputs textual data in the
      server's encoding, it can declare that by
-     setting <literal>OutputPluginOptions.output_type</>
-     to <literal>OUTPUT_PLUGIN_TEXTUAL_OUTPUT</> instead
-     of <literal>OUTPUT_PLUGIN_BINARY_OUTPUT</> in
+     setting <literal>OutputPluginOptions.output_type</literal>
+     to <literal>OUTPUT_PLUGIN_TEXTUAL_OUTPUT</literal> instead
+     of <literal>OUTPUT_PLUGIN_BINARY_OUTPUT</literal> in
      the <link linkend="logicaldecoding-output-plugin-startup">startup
-     callback</>. In that case, all the data has to be in the server's encoding
-     so that a <type>text</> datum can contain it. This is checked in assertion-enabled
+     callback</link>. In that case, all the data has to be in the server's encoding
+     so that a <type>text</type> datum can contain it. This is checked in assertion-enabled
      builds.
     </para>
    </sect2>
@@ -489,7 +491,7 @@ typedef struct OutputPluginOptions
       <literal>output_type</literal> has to either be set to
       <literal>OUTPUT_PLUGIN_TEXTUAL_OUTPUT</literal>
       or <literal>OUTPUT_PLUGIN_BINARY_OUTPUT</literal>. See also
-      <xref linkend="logicaldecoding-output-mode">.
+      <xref linkend="logicaldecoding-output-mode"/>.
      </para>
 
      <para>
@@ -576,8 +578,8 @@ typedef void (*LogicalDecodeChangeCB) (struct LogicalDecodingContext *ctx,
      <note>
       <para>
        Only changes in user defined tables that are not unlogged
-       (see <xref linkend="SQL-CREATETABLE-UNLOGGED">) and not temporary
-       (see <xref linkend="SQL-CREATETABLE-TEMPORARY">) can be extracted using
+       (see <xref linkend="sql-createtable-unlogged"/>) and not temporary
+       (see <xref linkend="sql-createtable-temporary"/>) can be extracted using
        logical decoding.
       </para>
      </note>
@@ -685,7 +687,7 @@ OutputPluginWrite(ctx, true);
     <filename>src/backend/replication/logical/logicalfuncs.c</filename>.
     Essentially, three functions need to be provided: one to read WAL, one to
     prepare writing output, and one to write the output
-    (see <xref linkend="logicaldecoding-output-plugin-output">).
+    (see <xref linkend="logicaldecoding-output-plugin-output"/>).
    </para>
   </sect1>
 
@@ -698,9 +700,9 @@ OutputPluginWrite(ctx, true);
     replication</link> solutions with the same user interface as synchronous
     replication for <link linkend="streaming-replication">streaming
     replication</link>.  To do this, the streaming replication interface
-    (see <xref linkend="logicaldecoding-walsender">) must be used to stream out
+    (see <xref linkend="logicaldecoding-walsender"/>) must be used to stream out
     data. Clients have to send <literal>Standby status update (F)</literal>
-    (see <xref linkend="protocol-replication">) messages, just like streaming
+    (see <xref linkend="protocol-replication"/>) messages, just like streaming
     replication clients do.
    </para>
 
diff --git a/doc/src/sgml/ltree.sgml b/doc/src/sgml/ltree.sgml
index fccfd320f5..ea362f8a1d 100644
--- a/doc/src/sgml/ltree.sgml
+++ b/doc/src/sgml/ltree.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  This module implements a data type <type>ltree</> for representing
+  This module implements a data type <type>ltree</type> for representing
   labels of data stored in a hierarchical tree-like structure.
   Extensive facilities for searching through label trees are provided.
  </para>
@@ -19,17 +19,17 @@
   <para>
    A <firstterm>label</firstterm> is a sequence of alphanumeric characters
    and underscores (for example, in C locale the characters
-   <literal>A-Za-z0-9_</> are allowed).  Labels must be less than 256 bytes
+   <literal>A-Za-z0-9_</literal> are allowed).  Labels must be less than 256 bytes
    long.
   </para>
 
   <para>
-   Examples: <literal>42</>, <literal>Personal_Services</>
+   Examples: <literal>42</literal>, <literal>Personal_Services</literal>
   </para>
 
   <para>
    A <firstterm>label path</firstterm> is a sequence of zero or more
-   labels separated by dots, for example <literal>L1.L2.L3</>, representing
+   labels separated by dots, for example <literal>L1.L2.L3</literal>, representing
    a path from the root of a hierarchical tree to a particular node.  The
    length of a label path must be less than 65kB, but keeping it under 2kB is
    preferable.  In practice this is not a major limitation; for example,
@@ -42,7 +42,7 @@
   </para>
 
   <para>
-   The <filename>ltree</> module provides several data types:
+   The <filename>ltree</filename> module provides several data types:
   </para>
 
   <itemizedlist>
@@ -55,13 +55,13 @@
    <listitem>
     <para>
      <type>lquery</type> represents a regular-expression-like pattern
-     for matching <type>ltree</> values.  A simple word matches that
-     label within a path.  A star symbol (<literal>*</>) matches zero
+     for matching <type>ltree</type> values.  A simple word matches that
+     label within a path.  A star symbol (<literal>*</literal>) matches zero
      or more labels.  For example:
 <synopsis>
-foo         <lineannotation>Match the exact label path <literal>foo</></lineannotation>
-*.foo.*     <lineannotation>Match any label path containing the label <literal>foo</></lineannotation>
-*.foo       <lineannotation>Match any label path whose last label is <literal>foo</></lineannotation>
+foo         <lineannotation>Match the exact label path <literal>foo</literal></lineannotation>
+*.foo.*     <lineannotation>Match any label path containing the label <literal>foo</literal></lineannotation>
+*.foo       <lineannotation>Match any label path whose last label is <literal>foo</literal></lineannotation>
 </synopsis>
     </para>
 
@@ -69,34 +69,34 @@ foo         <lineannotation>Match the exact label path <literal>foo</></lineanno
      Star symbols can also be quantified to restrict how many labels
      they can match:
 <synopsis>
-*{<replaceable>n</>}        <lineannotation>Match exactly <replaceable>n</> labels</lineannotation>
-*{<replaceable>n</>,}       <lineannotation>Match at least <replaceable>n</> labels</lineannotation>
-*{<replaceable>n</>,<replaceable>m</>}      <lineannotation>Match at least <replaceable>n</> but not more than <replaceable>m</> labels</lineannotation>
-*{,<replaceable>m</>}       <lineannotation>Match at most <replaceable>m</> labels &mdash; same as </lineannotation> *{0,<replaceable>m</>}
+*{<replaceable>n</replaceable>}        <lineannotation>Match exactly <replaceable>n</replaceable> labels</lineannotation>
+*{<replaceable>n</replaceable>,}       <lineannotation>Match at least <replaceable>n</replaceable> labels</lineannotation>
+*{<replaceable>n</replaceable>,<replaceable>m</replaceable>}      <lineannotation>Match at least <replaceable>n</replaceable> but not more than <replaceable>m</replaceable> labels</lineannotation>
+*{,<replaceable>m</replaceable>}       <lineannotation>Match at most <replaceable>m</replaceable> labels &mdash; same as </lineannotation> *{0,<replaceable>m</replaceable>}
 </synopsis>
     </para>
 
     <para>
      There are several modifiers that can be put at the end of a non-star
-     label in <type>lquery</> to make it match more than just the exact match:
+     label in <type>lquery</type> to make it match more than just the exact match:
 <synopsis>
-@           <lineannotation>Match case-insensitively, for example <literal>a@</> matches <literal>A</></lineannotation>
-*           <lineannotation>Match any label with this prefix, for example <literal>foo*</> matches <literal>foobar</></lineannotation>
+@           <lineannotation>Match case-insensitively, for example <literal>a@</literal> matches <literal>A</literal></lineannotation>
+*           <lineannotation>Match any label with this prefix, for example <literal>foo*</literal> matches <literal>foobar</literal></lineannotation>
 %           <lineannotation>Match initial underscore-separated words</lineannotation>
 </synopsis>
-     The behavior of <literal>%</> is a bit complicated.  It tries to match
+     The behavior of <literal>%</literal> is a bit complicated.  It tries to match
      words rather than the entire label.  For example
-     <literal>foo_bar%</> matches <literal>foo_bar_baz</> but not
-     <literal>foo_barbaz</>.  If combined with <literal>*</>, prefix
+     <literal>foo_bar%</literal> matches <literal>foo_bar_baz</literal> but not
+     <literal>foo_barbaz</literal>.  If combined with <literal>*</literal>, prefix
      matching applies to each word separately, for example
-     <literal>foo_bar%*</> matches <literal>foo1_bar2_baz</> but
-     not <literal>foo1_br2_baz</>.
+     <literal>foo_bar%*</literal> matches <literal>foo1_bar2_baz</literal> but
+     not <literal>foo1_br2_baz</literal>.
     </para>
 
     <para>
      Also, you can write several possibly-modified labels separated with
-     <literal>|</> (OR) to match any of those labels, and you can put
-     <literal>!</> (NOT) at the start to match any label that doesn't
+     <literal>|</literal> (OR) to match any of those labels, and you can put
+     <literal>!</literal> (NOT) at the start to match any label that doesn't
      match any of the alternatives.
     </para>
 
@@ -141,14 +141,14 @@ a.  b.     c.      d.               e.
 
    <listitem>
     <para><type>ltxtquery</type> represents a full-text-search-like
-    pattern for matching <type>ltree</> values.  An
+    pattern for matching <type>ltree</type> values.  An
     <type>ltxtquery</type> value contains words, possibly with the
-    modifiers <literal>@</>, <literal>*</>, <literal>%</> at the end;
-    the modifiers have the same meanings as in <type>lquery</>.
-    Words can be combined with <literal>&amp;</> (AND),
-    <literal>|</> (OR), <literal>!</> (NOT), and parentheses.
+    modifiers <literal>@</literal>, <literal>*</literal>, <literal>%</literal> at the end;
+    the modifiers have the same meanings as in <type>lquery</type>.
+    Words can be combined with <literal>&amp;</literal> (AND),
+    <literal>|</literal> (OR), <literal>!</literal> (NOT), and parentheses.
     The key difference from
-    <type>lquery</> is that <type>ltxtquery</type> matches words without
+    <type>lquery</type> is that <type>ltxtquery</type> matches words without
     regard to their position in the label path.
     </para>
 
@@ -161,7 +161,7 @@ Europe &amp; Russia*@ &amp; !Transportation
      any label beginning with <literal>Russia</literal> (case-insensitive),
      but not paths containing the label <literal>Transportation</literal>.
      The location of these words within the path is not important.
-     Also, when <literal>%</> is used, the word can be matched to any
+     Also, when <literal>%</literal> is used, the word can be matched to any
      underscore-separated word within a label, regardless of position.
     </para>
    </listitem>
@@ -169,8 +169,8 @@ Europe &amp; Russia*@ &amp; !Transportation
   </itemizedlist>
 
   <para>
-   Note: <type>ltxtquery</> allows whitespace between symbols, but
-   <type>ltree</> and <type>lquery</> do not.
+   Note: <type>ltxtquery</type> allows whitespace between symbols, but
+   <type>ltree</type> and <type>lquery</type> do not.
   </para>
  </sect2>
 
@@ -178,16 +178,16 @@ Europe &amp; Russia*@ &amp; !Transportation
   <title>Operators and Functions</title>
 
   <para>
-   Type <type>ltree</> has the usual comparison operators
-   <literal>=</>, <literal>&lt;&gt;</literal>,
-   <literal>&lt;</>, <literal>&gt;</>, <literal>&lt;=</>, <literal>&gt;=</>.
+   Type <type>ltree</type> has the usual comparison operators
+   <literal>=</literal>, <literal>&lt;&gt;</literal>,
+   <literal>&lt;</literal>, <literal>&gt;</literal>, <literal>&lt;=</literal>, <literal>&gt;=</literal>.
    Comparison sorts in the order of a tree traversal, with the children
    of a node sorted by label text.  In addition, the specialized
-   operators shown in <xref linkend="ltree-op-table"> are available.
+   operators shown in <xref linkend="ltree-op-table"/> are available.
   </para>
 
   <table id="ltree-op-table">
-   <title><type>ltree</> Operators</title>
+   <title><type>ltree</type> Operators</title>
 
    <tgroup cols="3">
     <thead>
@@ -200,153 +200,153 @@ Europe &amp; Russia*@ &amp; !Transportation
 
     <tbody>
      <row>
-      <entry><type>ltree</> <literal>@&gt;</> <type>ltree</></entry>
+      <entry><type>ltree</type> <literal>@&gt;</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
       <entry>is left argument an ancestor of right (or equal)?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>&lt;@</> <type>ltree</></entry>
+      <entry><type>ltree</type> <literal>&lt;@</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
       <entry>is left argument a descendant of right (or equal)?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>~</> <type>lquery</></entry>
+      <entry><type>ltree</type> <literal>~</literal> <type>lquery</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match <type>lquery</>?</entry>
+      <entry>does <type>ltree</type> match <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>lquery</> <literal>~</> <type>ltree</></entry>
+      <entry><type>lquery</type> <literal>~</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match <type>lquery</>?</entry>
+      <entry>does <type>ltree</type> match <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>?</> <type>lquery[]</></entry>
+      <entry><type>ltree</type> <literal>?</literal> <type>lquery[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match any <type>lquery</> in array?</entry>
+      <entry>does <type>ltree</type> match any <type>lquery</type> in array?</entry>
      </row>
 
      <row>
-      <entry><type>lquery[]</> <literal>?</> <type>ltree</></entry>
+      <entry><type>lquery[]</type> <literal>?</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match any <type>lquery</> in array?</entry>
+      <entry>does <type>ltree</type> match any <type>lquery</type> in array?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>@</> <type>ltxtquery</></entry>
+      <entry><type>ltree</type> <literal>@</literal> <type>ltxtquery</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match <type>ltxtquery</>?</entry>
+      <entry>does <type>ltree</type> match <type>ltxtquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltxtquery</> <literal>@</> <type>ltree</></entry>
+      <entry><type>ltxtquery</type> <literal>@</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> match <type>ltxtquery</>?</entry>
+      <entry>does <type>ltree</type> match <type>ltxtquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>||</> <type>ltree</></entry>
+      <entry><type>ltree</type> <literal>||</literal> <type>ltree</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>concatenate <type>ltree</> paths</entry>
+      <entry>concatenate <type>ltree</type> paths</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>||</> <type>text</></entry>
+      <entry><type>ltree</type> <literal>||</literal> <type>text</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>convert text to <type>ltree</> and concatenate</entry>
+      <entry>convert text to <type>ltree</type> and concatenate</entry>
      </row>
 
      <row>
-      <entry><type>text</> <literal>||</> <type>ltree</></entry>
+      <entry><type>text</type> <literal>||</literal> <type>ltree</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>convert text to <type>ltree</> and concatenate</entry>
+      <entry>convert text to <type>ltree</type> and concatenate</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>@&gt;</> <type>ltree</></entry>
+      <entry><type>ltree[]</type> <literal>@&gt;</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain an ancestor of <type>ltree</>?</entry>
+      <entry>does array contain an ancestor of <type>ltree</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>&lt;@</> <type>ltree[]</></entry>
+      <entry><type>ltree</type> <literal>&lt;@</literal> <type>ltree[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain an ancestor of <type>ltree</>?</entry>
+      <entry>does array contain an ancestor of <type>ltree</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>&lt;@</> <type>ltree</></entry>
+      <entry><type>ltree[]</type> <literal>&lt;@</literal> <type>ltree</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain a descendant of <type>ltree</>?</entry>
+      <entry>does array contain a descendant of <type>ltree</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree</> <literal>@&gt;</> <type>ltree[]</></entry>
+      <entry><type>ltree</type> <literal>@&gt;</literal> <type>ltree[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain a descendant of <type>ltree</>?</entry>
+      <entry>does array contain a descendant of <type>ltree</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>~</> <type>lquery</></entry>
+      <entry><type>ltree[]</type> <literal>~</literal> <type>lquery</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain any path matching <type>lquery</>?</entry>
+      <entry>does array contain any path matching <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>lquery</> <literal>~</> <type>ltree[]</></entry>
+      <entry><type>lquery</type> <literal>~</literal> <type>ltree[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain any path matching <type>lquery</>?</entry>
+      <entry>does array contain any path matching <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>?</> <type>lquery[]</></entry>
+      <entry><type>ltree[]</type> <literal>?</literal> <type>lquery[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> array contain any path matching any <type>lquery</>?</entry>
+      <entry>does <type>ltree</type> array contain any path matching any <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>lquery[]</> <literal>?</> <type>ltree[]</></entry>
+      <entry><type>lquery[]</type> <literal>?</literal> <type>ltree[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does <type>ltree</> array contain any path matching any <type>lquery</>?</entry>
+      <entry>does <type>ltree</type> array contain any path matching any <type>lquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>@</> <type>ltxtquery</></entry>
+      <entry><type>ltree[]</type> <literal>@</literal> <type>ltxtquery</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain any path matching <type>ltxtquery</>?</entry>
+      <entry>does array contain any path matching <type>ltxtquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltxtquery</> <literal>@</> <type>ltree[]</></entry>
+      <entry><type>ltxtquery</type> <literal>@</literal> <type>ltree[]</type></entry>
       <entry><type>boolean</type></entry>
-      <entry>does array contain any path matching <type>ltxtquery</>?</entry>
+      <entry>does array contain any path matching <type>ltxtquery</type>?</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>?@&gt;</> <type>ltree</></entry>
+      <entry><type>ltree[]</type> <literal>?@&gt;</literal> <type>ltree</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>first array entry that is an ancestor of <type>ltree</>; NULL if none</entry>
+      <entry>first array entry that is an ancestor of <type>ltree</type>; NULL if none</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>?&lt;@</> <type>ltree</></entry>
+      <entry><type>ltree[]</type> <literal>?&lt;@</literal> <type>ltree</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>first array entry that is a descendant of <type>ltree</>; NULL if none</entry>
+      <entry>first array entry that is a descendant of <type>ltree</type>; NULL if none</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>?~</> <type>lquery</></entry>
+      <entry><type>ltree[]</type> <literal>?~</literal> <type>lquery</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>first array entry that matches <type>lquery</>; NULL if none</entry>
+      <entry>first array entry that matches <type>lquery</type>; NULL if none</entry>
      </row>
 
      <row>
-      <entry><type>ltree[]</> <literal>?@</> <type>ltxtquery</></entry>
+      <entry><type>ltree[]</type> <literal>?@</literal> <type>ltxtquery</type></entry>
       <entry><type>ltree</type></entry>
-      <entry>first array entry that matches <type>ltxtquery</>; NULL if none</entry>
+      <entry>first array entry that matches <type>ltxtquery</type>; NULL if none</entry>
      </row>
 
     </tbody>
@@ -356,17 +356,17 @@ Europe &amp; Russia*@ &amp; !Transportation
   <para>
    The operators <literal>&lt;@</literal>, <literal>@&gt;</literal>,
    <literal>@</literal> and <literal>~</literal> have analogues
-   <literal>^&lt;@</>, <literal>^@&gt;</>, <literal>^@</>,
+   <literal>^&lt;@</literal>, <literal>^@&gt;</literal>, <literal>^@</literal>,
    <literal>^~</literal>, which are the same except they do not use
    indexes.  These are useful only for testing purposes.
   </para>
 
   <para>
-   The available functions are shown in <xref linkend="ltree-func-table">.
+   The available functions are shown in <xref linkend="ltree-func-table"/>.
   </para>
 
   <table id="ltree-func-table">
-   <title><type>ltree</> Functions</title>
+   <title><type>ltree</type> Functions</title>
 
    <tgroup cols="5">
     <thead>
@@ -383,8 +383,8 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>subltree(ltree, int start, int end)</function><indexterm><primary>subltree</primary></indexterm></entry>
       <entry><type>ltree</type></entry>
-      <entry>subpath of <type>ltree</> from position <parameter>start</> to
-       position <parameter>end</>-1 (counting from 0)</entry>
+      <entry>subpath of <type>ltree</type> from position <parameter>start</parameter> to
+       position <parameter>end</parameter>-1 (counting from 0)</entry>
       <entry><literal>subltree('Top.Child1.Child2',1,2)</literal></entry>
       <entry><literal>Child1</literal></entry>
      </row>
@@ -392,10 +392,10 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>subpath(ltree, int offset, int len)</function><indexterm><primary>subpath</primary></indexterm></entry>
       <entry><type>ltree</type></entry>
-      <entry>subpath of <type>ltree</> starting at position
-       <parameter>offset</>, length <parameter>len</>.
-       If <parameter>offset</> is negative, subpath starts that far from the
-       end of the path.  If <parameter>len</> is negative, leaves that many
+      <entry>subpath of <type>ltree</type> starting at position
+       <parameter>offset</parameter>, length <parameter>len</parameter>.
+       If <parameter>offset</parameter> is negative, subpath starts that far from the
+       end of the path.  If <parameter>len</parameter> is negative, leaves that many
        labels off the end of the path.</entry>
       <entry><literal>subpath('Top.Child1.Child2',0,2)</literal></entry>
       <entry><literal>Top.Child1</literal></entry>
@@ -404,9 +404,9 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>subpath(ltree, int offset)</function></entry>
       <entry><type>ltree</type></entry>
-      <entry>subpath of <type>ltree</> starting at position
-       <parameter>offset</>, extending to end of path.
-       If <parameter>offset</> is negative, subpath starts that far from the
+      <entry>subpath of <type>ltree</type> starting at position
+       <parameter>offset</parameter>, extending to end of path.
+       If <parameter>offset</parameter> is negative, subpath starts that far from the
        end of the path.</entry>
       <entry><literal>subpath('Top.Child1.Child2',1)</literal></entry>
       <entry><literal>Child1.Child2</literal></entry>
@@ -423,8 +423,8 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>index(ltree a, ltree b)</function><indexterm><primary>index</primary></indexterm></entry>
       <entry><type>integer</type></entry>
-      <entry>position of first occurrence of <parameter>b</> in
-       <parameter>a</>; -1 if not found</entry>
+      <entry>position of first occurrence of <parameter>b</parameter> in
+       <parameter>a</parameter>; -1 if not found</entry>
       <entry><literal>index('0.1.2.3.5.4.5.6.8.5.6.8','5.6')</literal></entry>
       <entry><literal>6</literal></entry>
      </row>
@@ -432,9 +432,9 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>index(ltree a, ltree b, int offset)</function></entry>
       <entry><type>integer</type></entry>
-      <entry>position of first occurrence of <parameter>b</> in
-       <parameter>a</>, searching starting at <parameter>offset</>;
-       negative <parameter>offset</> means start <parameter>-offset</>
+      <entry>position of first occurrence of <parameter>b</parameter> in
+       <parameter>a</parameter>, searching starting at <parameter>offset</parameter>;
+       negative <parameter>offset</parameter> means start <parameter>-offset</parameter>
        labels from the end of the path</entry>
       <entry><literal>index('0.1.2.3.5.4.5.6.8.5.6.8','5.6',-4)</literal></entry>
       <entry><literal>9</literal></entry>
@@ -443,7 +443,7 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>text2ltree(text)</function><indexterm><primary>text2ltree</primary></indexterm></entry>
       <entry><type>ltree</type></entry>
-      <entry>cast <type>text</> to <type>ltree</></entry>
+      <entry>cast <type>text</type> to <type>ltree</type></entry>
       <entry><literal></literal></entry>
       <entry><literal></literal></entry>
      </row>
@@ -451,7 +451,7 @@ Europe &amp; Russia*@ &amp; !Transportation
      <row>
       <entry><function>ltree2text(ltree)</function><indexterm><primary>ltree2text</primary></indexterm></entry>
       <entry><type>text</type></entry>
-      <entry>cast <type>ltree</> to <type>text</></entry>
+      <entry>cast <type>ltree</type> to <type>text</type></entry>
       <entry><literal></literal></entry>
       <entry><literal></literal></entry>
      </row>
@@ -481,25 +481,25 @@ Europe &amp; Russia*@ &amp; !Transportation
  <sect2>
   <title>Indexes</title>
   <para>
-   <filename>ltree</> supports several types of indexes that can speed
+   <filename>ltree</filename> supports several types of indexes that can speed
    up the indicated operators:
   </para>
 
   <itemizedlist>
    <listitem>
     <para>
-     B-tree index over <type>ltree</>:
-     <literal>&lt;</>, <literal>&lt;=</>, <literal>=</>,
-     <literal>&gt;=</>, <literal>&gt;</literal>
+     B-tree index over <type>ltree</type>:
+     <literal>&lt;</literal>, <literal>&lt;=</literal>, <literal>=</literal>,
+     <literal>&gt;=</literal>, <literal>&gt;</literal>
     </para>
    </listitem>
    <listitem>
     <para>
-     GiST index over <type>ltree</>:
-     <literal>&lt;</>, <literal>&lt;=</>, <literal>=</>,
-     <literal>&gt;=</>, <literal>&gt;</>,
-     <literal>@&gt;</>, <literal>&lt;@</>,
-     <literal>@</>, <literal>~</>, <literal>?</literal>
+     GiST index over <type>ltree</type>:
+     <literal>&lt;</literal>, <literal>&lt;=</literal>, <literal>=</literal>,
+     <literal>&gt;=</literal>, <literal>&gt;</literal>,
+     <literal>@&gt;</literal>, <literal>&lt;@</literal>,
+     <literal>@</literal>, <literal>~</literal>, <literal>?</literal>
     </para>
     <para>
      Example of creating such an index:
@@ -510,9 +510,9 @@ CREATE INDEX path_gist_idx ON test USING GIST (path);
    </listitem>
    <listitem>
     <para>
-     GiST index over <type>ltree[]</>:
-     <literal>ltree[] &lt;@ ltree</>, <literal>ltree @&gt; ltree[]</>,
-     <literal>@</>, <literal>~</>, <literal>?</literal>
+     GiST index over <type>ltree[]</type>:
+     <literal>ltree[] &lt;@ ltree</literal>, <literal>ltree @&gt; ltree[]</literal>,
+     <literal>@</literal>, <literal>~</literal>, <literal>?</literal>
     </para>
     <para>
      Example of creating such an index:
@@ -532,7 +532,7 @@ CREATE INDEX path_gist_idx ON test USING GIST (array_path);
 
   <para>
    This example uses the following data (also available in file
-   <filename>contrib/ltree/ltreetest.sql</> in the source distribution):
+   <filename>contrib/ltree/ltreetest.sql</filename> in the source distribution):
   </para>
 
 <programlisting>
@@ -555,7 +555,7 @@ CREATE INDEX path_idx ON test USING BTREE (path);
 </programlisting>
 
   <para>
-   Now, we have a table <structname>test</> populated with data describing
+   Now, we have a table <structname>test</structname> populated with data describing
    the hierarchy shown below:
   </para>
 
@@ -672,7 +672,7 @@ ltreetest=&gt; SELECT ins_label(path,2,'Space') FROM test WHERE path &lt;@ 'Top.
    the <type>ltree</type> type for PL/Python.  The extensions are
    called <literal>ltree_plpythonu</literal>, <literal>ltree_plpython2u</literal>,
    and <literal>ltree_plpython3u</literal>
-   (see <xref linkend="plpython-python23"> for the PL/Python naming
+   (see <xref linkend="plpython-python23"/> for the PL/Python naming
    convention).  If you install these transforms and specify them when
    creating a function, <type>ltree</type> values are mapped to Python lists.
    (The reverse is currently not supported, however.)
diff --git a/doc/src/sgml/maintenance.sgml b/doc/src/sgml/maintenance.sgml
index fe1e0ed2b3..4a68ec3b40 100644
--- a/doc/src/sgml/maintenance.sgml
+++ b/doc/src/sgml/maintenance.sgml
@@ -12,12 +12,12 @@
  </indexterm>
 
   <para>
-   <productname>PostgreSQL</>, like any database software, requires that certain tasks
+   <productname>PostgreSQL</productname>, like any database software, requires that certain tasks
    be performed regularly to achieve optimum performance. The tasks
    discussed here are <emphasis>required</emphasis>, but they
    are repetitive in nature and can easily be automated using standard
    tools such as <application>cron</application> scripts or
-   Windows' <application>Task Scheduler</>.  It is the database
+   Windows' <application>Task Scheduler</application>.  It is the database
    administrator's responsibility to set up appropriate scripts, and to
    check that they execute successfully.
   </para>
@@ -28,27 +28,27 @@
    after a catastrophe (disk failure, fire, mistakenly dropping a critical
    table, etc.).  The backup and recovery mechanisms available in
    <productname>PostgreSQL</productname> are discussed at length in
-   <xref linkend="backup">.
+   <xref linkend="backup"/>.
   </para>
 
   <para>
-   The other main category of maintenance task is periodic <quote>vacuuming</>
+   The other main category of maintenance task is periodic <quote>vacuuming</quote>
    of the database.  This activity is discussed in
-   <xref linkend="routine-vacuuming">.  Closely related to this is updating
+   <xref linkend="routine-vacuuming"/>.  Closely related to this is updating
    the statistics that will be used by the query planner, as discussed in
-   <xref linkend="vacuum-for-statistics">.
+   <xref linkend="vacuum-for-statistics"/>.
   </para>
 
   <para>
    Another task that might need periodic attention is log file management.
-   This is discussed in <xref linkend="logfile-maintenance">.
+   This is discussed in <xref linkend="logfile-maintenance"/>.
   </para>
 
   <para>
    <ulink
-   url="http://bucardo.org/wiki/Check_postgres"><application>check_postgres</></ulink>
+   url="https://bucardo.org/check_postgres/"><application>check_postgres</application></ulink>
    is available for monitoring database health and reporting unusual
-   conditions.  <application>check_postgres</> integrates with
+   conditions.  <application>check_postgres</application> integrates with
    Nagios and MRTG, but can be run standalone too.
   </para>
 
@@ -68,15 +68,15 @@
 
   <para>
    <productname>PostgreSQL</productname> databases require periodic
-   maintenance known as <firstterm>vacuuming</>.  For many installations, it
+   maintenance known as <firstterm>vacuuming</firstterm>.  For many installations, it
    is sufficient to let vacuuming be performed by the <firstterm>autovacuum
-   daemon</>, which is described in <xref linkend="autovacuum">.  You might
+   daemon</firstterm>, which is described in <xref linkend="autovacuum"/>.  You might
    need to adjust the autovacuuming parameters described there to obtain best
    results for your situation.  Some database administrators will want to
    supplement or replace the daemon's activities with manually-managed
-   <command>VACUUM</> commands, which typically are executed according to a
+   <command>VACUUM</command> commands, which typically are executed according to a
    schedule by <application>cron</application> or <application>Task
-   Scheduler</> scripts.  To set up manually-managed vacuuming properly,
+   Scheduler</application> scripts.  To set up manually-managed vacuuming properly,
    it is essential to understand the issues discussed in the next few
    subsections.  Administrators who rely on autovacuuming may still wish
    to skim this material to help them understand and adjust autovacuuming.
@@ -87,7 +87,7 @@
 
    <para>
     <productname>PostgreSQL</productname>'s
-    <xref linkend="sql-vacuum"> command has to
+    <xref linkend="sql-vacuum"/> command has to
     process each table on a regular basis for several reasons:
 
     <orderedlist>
@@ -109,30 +109,30 @@
 
      <listitem>
       <simpara>To protect against loss of very old data due to
-      <firstterm>transaction ID wraparound</> or
-      <firstterm>multixact ID wraparound</>.</simpara>
+      <firstterm>transaction ID wraparound</firstterm> or
+      <firstterm>multixact ID wraparound</firstterm>.</simpara>
      </listitem>
     </orderedlist>
 
-    Each of these reasons dictates performing <command>VACUUM</> operations
+    Each of these reasons dictates performing <command>VACUUM</command> operations
     of varying frequency and scope, as explained in the following subsections.
    </para>
 
    <para>
-    There are two variants of <command>VACUUM</>: standard <command>VACUUM</>
-    and <command>VACUUM FULL</>.  <command>VACUUM FULL</> can reclaim more
+    There are two variants of <command>VACUUM</command>: standard <command>VACUUM</command>
+    and <command>VACUUM FULL</command>.  <command>VACUUM FULL</command> can reclaim more
     disk space but runs much more slowly.  Also,
-    the standard form of <command>VACUUM</> can run in parallel with production
+    the standard form of <command>VACUUM</command> can run in parallel with production
     database operations.  (Commands such as <command>SELECT</command>,
     <command>INSERT</command>, <command>UPDATE</command>, and
     <command>DELETE</command> will continue to function normally, though you
     will not be able to modify the definition of a table with commands such as
     <command>ALTER TABLE</command> while it is being vacuumed.)
-    <command>VACUUM FULL</> requires exclusive lock on the table it is
+    <command>VACUUM FULL</command> requires exclusive lock on the table it is
     working on, and therefore cannot be done in parallel with other use
     of the table.  Generally, therefore,
-    administrators should strive to use standard <command>VACUUM</> and
-    avoid <command>VACUUM FULL</>.
+    administrators should strive to use standard <command>VACUUM</command> and
+    avoid <command>VACUUM FULL</command>.
    </para>
 
    <para>
@@ -140,7 +140,7 @@
     traffic, which can cause poor performance for other active sessions.
     There are configuration parameters that can be adjusted to reduce the
     performance impact of background vacuuming &mdash; see
-    <xref linkend="runtime-config-resource-vacuum-cost">.
+    <xref linkend="runtime-config-resource-vacuum-cost"/>.
    </para>
   </sect2>
 
@@ -153,15 +153,15 @@
 
    <para>
     In <productname>PostgreSQL</productname>, an
-    <command>UPDATE</> or <command>DELETE</> of a row does not
+    <command>UPDATE</command> or <command>DELETE</command> of a row does not
     immediately remove the old version of the row.
     This approach is necessary to gain the benefits of multiversion
-    concurrency control (<acronym>MVCC</>, see <xref linkend="mvcc">): the row version
+    concurrency control (<acronym>MVCC</acronym>, see <xref linkend="mvcc"/>): the row version
     must not be deleted while it is still potentially visible to other
     transactions. But eventually, an outdated or deleted row version is no
     longer of interest to any transaction. The space it occupies must then be
     reclaimed for reuse by new rows, to avoid unbounded growth of disk
-    space requirements. This is done by running <command>VACUUM</>.
+    space requirements. This is done by running <command>VACUUM</command>.
    </para>
 
    <para>
@@ -170,7 +170,7 @@
     future reuse.  However, it will not return the space to the operating
     system, except in the special case where one or more pages at the
     end of a table become entirely free and an exclusive table lock can be
-    easily obtained.  In contrast, <command>VACUUM FULL</> actively compacts
+    easily obtained.  In contrast, <command>VACUUM FULL</command> actively compacts
     tables by writing a complete new version of the table file with no dead
     space.  This minimizes the size of the table, but can take a long time.
     It also requires extra disk space for the new copy of the table, until
@@ -178,18 +178,18 @@
    </para>
 
    <para>
-    The usual goal of routine vacuuming is to do standard <command>VACUUM</>s
-    often enough to avoid needing <command>VACUUM FULL</>.  The
+    The usual goal of routine vacuuming is to do standard <command>VACUUM</command>s
+    often enough to avoid needing <command>VACUUM FULL</command>.  The
     autovacuum daemon attempts to work this way, and in fact will
-    never issue <command>VACUUM FULL</>.  In this approach, the idea
+    never issue <command>VACUUM FULL</command>.  In this approach, the idea
     is not to keep tables at their minimum size, but to maintain steady-state
     usage of disk space: each table occupies space equivalent to its
     minimum size plus however much space gets used up between vacuumings.
-    Although <command>VACUUM FULL</> can be used to shrink a table back
+    Although <command>VACUUM FULL</command> can be used to shrink a table back
     to its minimum size and return the disk space to the operating system,
     there is not much point in this if the table will just grow again in the
-    future.  Thus, moderately-frequent standard <command>VACUUM</> runs are a
-    better approach than infrequent <command>VACUUM FULL</> runs for
+    future.  Thus, moderately-frequent standard <command>VACUUM</command> runs are a
+    better approach than infrequent <command>VACUUM FULL</command> runs for
     maintaining heavily-updated tables.
    </para>
 
@@ -198,38 +198,38 @@
     doing all the work at night when load is low.
     The difficulty with doing vacuuming according to a fixed schedule
     is that if a table has an unexpected spike in update activity, it may
-    get bloated to the point that <command>VACUUM FULL</> is really necessary
+    get bloated to the point that <command>VACUUM FULL</command> is really necessary
     to reclaim space.  Using the autovacuum daemon alleviates this problem,
     since the daemon schedules vacuuming dynamically in response to update
     activity.  It is unwise to disable the daemon completely unless you
     have an extremely predictable workload.  One possible compromise is
     to set the daemon's parameters so that it will only react to unusually
     heavy update activity, thus keeping things from getting out of hand,
-    while scheduled <command>VACUUM</>s are expected to do the bulk of the
+    while scheduled <command>VACUUM</command>s are expected to do the bulk of the
     work when the load is typical.
    </para>
 
    <para>
     For those not using autovacuum, a typical approach is to schedule a
-    database-wide <command>VACUUM</> once a day during a low-usage period,
+    database-wide <command>VACUUM</command> once a day during a low-usage period,
     supplemented by more frequent vacuuming of heavily-updated tables as
     necessary. (Some installations with extremely high update rates vacuum
     their busiest tables as often as once every few minutes.) If you have
     multiple databases in a cluster, don't forget to
     <command>VACUUM</command> each one; the program <xref
-    linkend="app-vacuumdb"> might be helpful.
+    linkend="app-vacuumdb"/> might be helpful.
    </para>
 
    <tip>
    <para>
-    Plain <command>VACUUM</> may not be satisfactory when
+    Plain <command>VACUUM</command> may not be satisfactory when
     a table contains large numbers of dead row versions as a result of
     massive update or delete activity.  If you have such a table and
     you need to reclaim the excess disk space it occupies, you will need
-    to use <command>VACUUM FULL</>, or alternatively
-    <xref linkend="sql-cluster">
+    to use <command>VACUUM FULL</command>, or alternatively
+    <xref linkend="sql-cluster"/>
     or one of the table-rewriting variants of
-    <xref linkend="sql-altertable">.
+    <xref linkend="sql-altertable"/>.
     These commands rewrite an entire new copy of the table and build
     new indexes for it.  All these options require exclusive lock.  Note that
     they also temporarily use extra disk space approximately equal to the size
@@ -242,7 +242,7 @@
    <para>
     If you have a table whose entire contents are deleted on a periodic
     basis, consider doing it with
-    <xref linkend="sql-truncate"> rather
+    <xref linkend="sql-truncate"/> rather
     than using <command>DELETE</command> followed by
     <command>VACUUM</command>. <command>TRUNCATE</command> removes the
     entire content of the table immediately, without requiring a
@@ -269,21 +269,21 @@
     The <productname>PostgreSQL</productname> query planner relies on
     statistical information about the contents of tables in order to
     generate good plans for queries.  These statistics are gathered by
-    the <xref linkend="sql-analyze"> command,
+    the <xref linkend="sql-analyze"/> command,
     which can be invoked by itself or
-    as an optional step in <command>VACUUM</>.  It is important to have
+    as an optional step in <command>VACUUM</command>.  It is important to have
     reasonably accurate statistics, otherwise poor choices of plans might
     degrade database performance.
    </para>
 
    <para>
     The autovacuum daemon, if enabled, will automatically issue
-    <command>ANALYZE</> commands whenever the content of a table has
+    <command>ANALYZE</command> commands whenever the content of a table has
     changed sufficiently.  However, administrators might prefer to rely
-    on manually-scheduled <command>ANALYZE</> operations, particularly
+    on manually-scheduled <command>ANALYZE</command> operations, particularly
     if it is known that update activity on a table will not affect the
-    statistics of <quote>interesting</> columns.  The daemon schedules
-    <command>ANALYZE</> strictly as a function of the number of rows
+    statistics of <quote>interesting</quote> columns.  The daemon schedules
+    <command>ANALYZE</command> strictly as a function of the number of rows
     inserted or updated; it has no knowledge of whether that will lead
     to meaningful statistical changes.
    </para>
@@ -305,25 +305,25 @@
    </para>
 
    <para>
-    It is possible to run <command>ANALYZE</> on specific tables and even
+    It is possible to run <command>ANALYZE</command> on specific tables and even
     just specific columns of a table, so the flexibility exists to update some
     statistics more frequently than others if your application requires it.
     In practice, however, it is usually best to just analyze the entire
-    database, because it is a fast operation.  <command>ANALYZE</> uses a
+    database, because it is a fast operation.  <command>ANALYZE</command> uses a
     statistically random sampling of the rows of a table rather than reading
     every single row.
    </para>
 
    <tip>
     <para>
-     Although per-column tweaking of <command>ANALYZE</> frequency might not be
+     Although per-column tweaking of <command>ANALYZE</command> frequency might not be
      very productive, you might find it worthwhile to do per-column
      adjustment of the level of detail of the statistics collected by
-     <command>ANALYZE</>.  Columns that are heavily used in <literal>WHERE</>
+     <command>ANALYZE</command>.  Columns that are heavily used in <literal>WHERE</literal>
      clauses and have highly irregular data distributions might require a
      finer-grain data histogram than other columns.  See <command>ALTER TABLE
-     SET STATISTICS</>, or change the database-wide default using the <xref
-     linkend="guc-default-statistics-target"> configuration parameter.
+     SET STATISTICS</command>, or change the database-wide default using the <xref
+     linkend="guc-default-statistics-target"/> configuration parameter.
     </para>
 
     <para>
@@ -337,11 +337,11 @@
 
    <tip>
     <para>
-     The autovacuum daemon does not issue <command>ANALYZE</> commands for
+     The autovacuum daemon does not issue <command>ANALYZE</command> commands for
      foreign tables, since it has no means of determining how often that
      might be useful.  If your queries require statistics on foreign tables
      for proper planning, it's a good idea to run manually-managed
-     <command>ANALYZE</> commands on those tables on a suitable schedule.
+     <command>ANALYZE</command> commands on those tables on a suitable schedule.
     </para>
    </tip>
   </sect2>
@@ -350,7 +350,7 @@
    <title>Updating The Visibility Map</title>
 
    <para>
-    Vacuum maintains a <link linkend="storage-vm">visibility map</> for each
+    Vacuum maintains a <link linkend="storage-vm">visibility map</link> for each
     table to keep track of which pages contain only tuples that are known to be
     visible to all active transactions (and all future transactions, until the
     page is again modified).  This has two purposes.  First, vacuum
@@ -366,7 +366,7 @@
     matching index entry, to check whether it should be seen by the current
     transaction.
     An <link linkend="indexes-index-only-scans"><firstterm>index-only
-    scan</></link>, on the other hand, checks the visibility map first.
+    scan</firstterm></link>, on the other hand, checks the visibility map first.
     If it's known that all tuples on the page are
     visible, the heap fetch can be skipped.  This is most useful on
     large data sets where the visibility map can prevent disk accesses.
@@ -391,13 +391,13 @@
    <para>
     <productname>PostgreSQL</productname>'s
     <link linkend="mvcc-intro">MVCC</link> transaction semantics
-    depend on being able to compare transaction ID (<acronym>XID</>)
+    depend on being able to compare transaction ID (<acronym>XID</acronym>)
     numbers: a row version with an insertion XID greater than the current
-    transaction's XID is <quote>in the future</> and should not be visible
+    transaction's XID is <quote>in the future</quote> and should not be visible
     to the current transaction.  But since transaction IDs have limited size
     (32 bits) a cluster that runs for a long time (more
     than 4 billion transactions) would suffer <firstterm>transaction ID
-    wraparound</>: the XID counter wraps around to zero, and all of a sudden
+    wraparound</firstterm>: the XID counter wraps around to zero, and all of a sudden
     transactions that were in the past appear to be in the future &mdash; which
     means their output become invisible.  In short, catastrophic data loss.
     (Actually the data is still there, but that's cold comfort if you cannot
@@ -407,53 +407,53 @@
 
    <para>
     The reason that periodic vacuuming solves the problem is that
-    <command>VACUUM</> will mark rows as <emphasis>frozen</>, indicating that
+    <command>VACUUM</command> will mark rows as <emphasis>frozen</emphasis>, indicating that
     they were inserted by a transaction that committed sufficiently far in
     the past that the effects of the inserting transaction are certain to be
     visible to all current and future transactions.
     Normal XIDs are
-    compared using modulo-2<superscript>32</> arithmetic. This means
+    compared using modulo-2<superscript>32</superscript> arithmetic. This means
     that for every normal XID, there are two billion XIDs that are
-    <quote>older</> and two billion that are <quote>newer</>; another
+    <quote>older</quote> and two billion that are <quote>newer</quote>; another
     way to say it is that the normal XID space is circular with no
     endpoint. Therefore, once a row version has been created with a particular
-    normal XID, the row version will appear to be <quote>in the past</> for
+    normal XID, the row version will appear to be <quote>in the past</quote> for
     the next two billion transactions, no matter which normal XID we are
     talking about. If the row version still exists after more than two billion
     transactions, it will suddenly appear to be in the future. To
-    prevent this, <productname>PostgreSQL</> reserves a special XID,
-    <literal>FrozenTransactionId</>, which does not follow the normal XID
+    prevent this, <productname>PostgreSQL</productname> reserves a special XID,
+    <literal>FrozenTransactionId</literal>, which does not follow the normal XID
     comparison rules and is always considered older
     than every normal XID.
     Frozen row versions are treated as if the inserting XID were
-    <literal>FrozenTransactionId</>, so that they will appear to be
-    <quote>in the past</> to all normal transactions regardless of wraparound
+    <literal>FrozenTransactionId</literal>, so that they will appear to be
+    <quote>in the past</quote> to all normal transactions regardless of wraparound
     issues, and so such row versions will be valid until deleted, no matter
     how long that is.
    </para>
 
    <note>
     <para>
-     In <productname>PostgreSQL</> versions before 9.4, freezing was
+     In <productname>PostgreSQL</productname> versions before 9.4, freezing was
      implemented by actually replacing a row's insertion XID
-     with <literal>FrozenTransactionId</>, which was visible in the
-     row's <structname>xmin</> system column.  Newer versions just set a flag
-     bit, preserving the row's original <structname>xmin</> for possible
-     forensic use.  However, rows with <structname>xmin</> equal
-     to <literal>FrozenTransactionId</> (2) may still be found
-     in databases <application>pg_upgrade</>'d from pre-9.4 versions.
+     with <literal>FrozenTransactionId</literal>, which was visible in the
+     row's <structname>xmin</structname> system column.  Newer versions just set a flag
+     bit, preserving the row's original <structname>xmin</structname> for possible
+     forensic use.  However, rows with <structname>xmin</structname> equal
+     to <literal>FrozenTransactionId</literal> (2) may still be found
+     in databases <application>pg_upgrade</application>'d from pre-9.4 versions.
     </para>
     <para>
-     Also, system catalogs may contain rows with <structname>xmin</> equal
-     to <literal>BootstrapTransactionId</> (1), indicating that they were
-     inserted during the first phase of <application>initdb</>.
-     Like <literal>FrozenTransactionId</>, this special XID is treated as
+     Also, system catalogs may contain rows with <structname>xmin</structname> equal
+     to <literal>BootstrapTransactionId</literal> (1), indicating that they were
+     inserted during the first phase of <application>initdb</application>.
+     Like <literal>FrozenTransactionId</literal>, this special XID is treated as
      older than every normal XID.
     </para>
    </note>
 
    <para>
-    <xref linkend="guc-vacuum-freeze-min-age">
+    <xref linkend="guc-vacuum-freeze-min-age"/>
     controls how old an XID value has to be before rows bearing that XID will be
     frozen.  Increasing this setting may avoid unnecessary work if the
     rows that would otherwise be frozen will soon be modified again,
@@ -463,61 +463,61 @@
    </para>
 
    <para>
-    <command>VACUUM</> uses the <link linkend="storage-vm">visibility map</>
+    <command>VACUUM</command> uses the <link linkend="storage-vm">visibility map</link>
     to determine which pages of a table must be scanned.  Normally, it
     will skip pages that don't have any dead row versions even if those pages
     might still have row versions with old XID values.  Therefore, normal
-    <command>VACUUM</>s won't always freeze every old row version in the table.
-    Periodically, <command>VACUUM</> will perform an <firstterm>aggressive
-    vacuum</>, skipping only those pages which contain neither dead rows nor
+    <command>VACUUM</command>s won't always freeze every old row version in the table.
+    Periodically, <command>VACUUM</command> will perform an <firstterm>aggressive
+    vacuum</firstterm>, skipping only those pages which contain neither dead rows nor
     any unfrozen XID or MXID values.
-    <xref linkend="guc-vacuum-freeze-table-age">
-    controls when <command>VACUUM</> does that: all-visible but not all-frozen
+    <xref linkend="guc-vacuum-freeze-table-age"/>
+    controls when <command>VACUUM</command> does that: all-visible but not all-frozen
     pages are scanned if the number of transactions that have passed since the
-    last such scan is greater than <varname>vacuum_freeze_table_age</> minus
-    <varname>vacuum_freeze_min_age</>. Setting
-    <varname>vacuum_freeze_table_age</> to 0 forces <command>VACUUM</> to
+    last such scan is greater than <varname>vacuum_freeze_table_age</varname> minus
+    <varname>vacuum_freeze_min_age</varname>. Setting
+    <varname>vacuum_freeze_table_age</varname> to 0 forces <command>VACUUM</command> to
     use this more aggressive strategy for all scans.
    </para>
 
    <para>
     The maximum time that a table can go unvacuumed is two billion
-    transactions minus the <varname>vacuum_freeze_min_age</> value at
+    transactions minus the <varname>vacuum_freeze_min_age</varname> value at
     the time of the last aggressive vacuum. If it were to go
     unvacuumed for longer than
     that, data loss could result.  To ensure that this does not happen,
     autovacuum is invoked on any table that might contain unfrozen rows with
     XIDs older than the age specified by the configuration parameter <xref
-    linkend="guc-autovacuum-freeze-max-age">.  (This will happen even if
+    linkend="guc-autovacuum-freeze-max-age"/>.  (This will happen even if
     autovacuum is disabled.)
    </para>
 
    <para>
     This implies that if a table is not otherwise vacuumed,
     autovacuum will be invoked on it approximately once every
-    <varname>autovacuum_freeze_max_age</> minus
-    <varname>vacuum_freeze_min_age</> transactions.
+    <varname>autovacuum_freeze_max_age</varname> minus
+    <varname>vacuum_freeze_min_age</varname> transactions.
     For tables that are regularly vacuumed for space reclamation purposes,
     this is of little importance.  However, for static tables
     (including tables that receive inserts, but no updates or deletes),
     there is no need to vacuum for space reclamation, so it can
     be useful to try to maximize the interval between forced autovacuums
     on very large static tables.  Obviously one can do this either by
-    increasing <varname>autovacuum_freeze_max_age</> or decreasing
-    <varname>vacuum_freeze_min_age</>.
+    increasing <varname>autovacuum_freeze_max_age</varname> or decreasing
+    <varname>vacuum_freeze_min_age</varname>.
    </para>
 
    <para>
-    The effective maximum for <varname>vacuum_freeze_table_age</> is 0.95 *
-    <varname>autovacuum_freeze_max_age</>; a setting higher than that will be
+    The effective maximum for <varname>vacuum_freeze_table_age</varname> is 0.95 *
+    <varname>autovacuum_freeze_max_age</varname>; a setting higher than that will be
     capped to the maximum. A value higher than
-    <varname>autovacuum_freeze_max_age</> wouldn't make sense because an
+    <varname>autovacuum_freeze_max_age</varname> wouldn't make sense because an
     anti-wraparound autovacuum would be triggered at that point anyway, and
     the 0.95 multiplier leaves some breathing room to run a manual
-    <command>VACUUM</> before that happens.  As a rule of thumb,
-    <command>vacuum_freeze_table_age</> should be set to a value somewhat
-    below <varname>autovacuum_freeze_max_age</>, leaving enough gap so that
-    a regularly scheduled <command>VACUUM</> or an autovacuum triggered by
+    <command>VACUUM</command> before that happens.  As a rule of thumb,
+    <command>vacuum_freeze_table_age</command> should be set to a value somewhat
+    below <varname>autovacuum_freeze_max_age</varname>, leaving enough gap so that
+    a regularly scheduled <command>VACUUM</command> or an autovacuum triggered by
     normal delete and update activity is run in that window.  Setting it too
     close could lead to anti-wraparound autovacuums, even though the table
     was recently vacuumed to reclaim space, whereas lower values lead to more
@@ -525,25 +525,29 @@
    </para>
 
    <para>
-    The sole disadvantage of increasing <varname>autovacuum_freeze_max_age</>
-    (and <varname>vacuum_freeze_table_age</> along with it)
-    is that the <filename>pg_xact</> subdirectory of the database cluster
-    will take more space, because it must store the commit status of all
-    transactions back to the <varname>autovacuum_freeze_max_age</> horizon.
-    The commit status uses two bits per transaction, so if
-    <varname>autovacuum_freeze_max_age</> is set to its maximum allowed
-    value of two billion, <filename>pg_xact</> can be expected to
-    grow to about half a gigabyte.  If this is trivial compared to your
-    total database size, setting <varname>autovacuum_freeze_max_age</> to
-    its maximum allowed value is recommended.  Otherwise, set it depending
-    on what you are willing to allow for <filename>pg_xact</> storage.
-    (The default, 200 million transactions, translates to about 50MB of
-    <filename>pg_xact</> storage.)
+    The sole disadvantage of increasing <varname>autovacuum_freeze_max_age</varname>
+    (and <varname>vacuum_freeze_table_age</varname> along with it) is that
+    the <filename>pg_xact</filename> and <filename>pg_commit_ts</filename>
+    subdirectories of the database cluster will take more space, because it
+    must store the commit status and (if <varname>track_commit_timestamp</varname> is
+    enabled) timestamp of all transactions back to
+    the <varname>autovacuum_freeze_max_age</varname> horizon.  The commit status uses
+    two bits per transaction, so if
+    <varname>autovacuum_freeze_max_age</varname> is set to its maximum allowed value
+    of two billion, <filename>pg_xact</filename> can be expected to grow to about half
+    a gigabyte and <filename>pg_commit_ts</filename> to about 20GB.  If this
+    is trivial compared to your total database size,
+    setting <varname>autovacuum_freeze_max_age</varname> to its maximum allowed value
+    is recommended.  Otherwise, set it depending on what you are willing to
+    allow for <filename>pg_xact</filename> and <filename>pg_commit_ts</filename> storage.
+    (The default, 200 million transactions, translates to about 50MB
+    of <filename>pg_xact</filename> storage and about 2GB of <filename>pg_commit_ts</filename>
+    storage.)
    </para>
 
    <para>
-    One disadvantage of decreasing <varname>vacuum_freeze_min_age</> is that
-    it might cause <command>VACUUM</> to do useless work: freezing a row
+    One disadvantage of decreasing <varname>vacuum_freeze_min_age</varname> is that
+    it might cause <command>VACUUM</command> to do useless work: freezing a row
     version is a waste of time if the row is modified
     soon thereafter (causing it to acquire a new XID).  So the setting should
     be large enough that rows are not frozen until they are unlikely to change
@@ -552,18 +556,18 @@
 
    <para>
     To track the age of the oldest unfrozen XIDs in a database,
-    <command>VACUUM</> stores XID
-    statistics in the system tables <structname>pg_class</> and
-    <structname>pg_database</>.  In particular,
-    the <structfield>relfrozenxid</> column of a table's
-    <structname>pg_class</> row contains the freeze cutoff XID that was used
-    by the last aggressive <command>VACUUM</> for that table.  All rows
+    <command>VACUUM</command> stores XID
+    statistics in the system tables <structname>pg_class</structname> and
+    <structname>pg_database</structname>.  In particular,
+    the <structfield>relfrozenxid</structfield> column of a table's
+    <structname>pg_class</structname> row contains the freeze cutoff XID that was used
+    by the last aggressive <command>VACUUM</command> for that table.  All rows
     inserted by transactions with XIDs older than this cutoff XID are
     guaranteed to have been frozen.  Similarly,
-    the <structfield>datfrozenxid</> column of a database's
-    <structname>pg_database</> row is a lower bound on the unfrozen XIDs
+    the <structfield>datfrozenxid</structfield> column of a database's
+    <structname>pg_database</structname> row is a lower bound on the unfrozen XIDs
     appearing in that database &mdash; it is just the minimum of the
-    per-table <structfield>relfrozenxid</> values within the database.
+    per-table <structfield>relfrozenxid</structfield> values within the database.
     A convenient way to
     examine this information is to execute queries such as:
 
@@ -577,27 +581,27 @@ WHERE c.relkind IN ('r', 'm');
 SELECT datname, age(datfrozenxid) FROM pg_database;
 </programlisting>
 
-    The <literal>age</> column measures the number of transactions from the
+    The <literal>age</literal> column measures the number of transactions from the
     cutoff XID to the current transaction's XID.
    </para>
 
    <para>
-    <command>VACUUM</> normally only scans pages that have been modified
-    since the last vacuum, but <structfield>relfrozenxid</> can only be
+    <command>VACUUM</command> normally only scans pages that have been modified
+    since the last vacuum, but <structfield>relfrozenxid</structfield> can only be
     advanced when every page of the table
     that might contain unfrozen XIDs is scanned.  This happens when
-    <structfield>relfrozenxid</> is more than
-    <varname>vacuum_freeze_table_age</> transactions old, when
-    <command>VACUUM</>'s <literal>FREEZE</> option is used, or when all
+    <structfield>relfrozenxid</structfield> is more than
+    <varname>vacuum_freeze_table_age</varname> transactions old, when
+    <command>VACUUM</command>'s <literal>FREEZE</literal> option is used, or when all
     pages that are not already all-frozen happen to
-    require vacuuming to remove dead row versions. When <command>VACUUM</>
+    require vacuuming to remove dead row versions. When <command>VACUUM</command>
     scans every page in the table that is not already all-frozen, it should
-    set <literal>age(relfrozenxid)</> to a value just a little more than the
-    <varname>vacuum_freeze_min_age</> setting
+    set <literal>age(relfrozenxid)</literal> to a value just a little more than the
+    <varname>vacuum_freeze_min_age</varname> setting
     that was used (more by the number of transactions started since the
-    <command>VACUUM</> started).  If no <structfield>relfrozenxid</>-advancing
-    <command>VACUUM</> is issued on the table until
-    <varname>autovacuum_freeze_max_age</> is reached, an autovacuum will soon
+    <command>VACUUM</command> started).  If no <structfield>relfrozenxid</structfield>-advancing
+    <command>VACUUM</command> is issued on the table until
+    <varname>autovacuum_freeze_max_age</varname> is reached, an autovacuum will soon
     be forced for the table.
    </para>
 
@@ -612,10 +616,10 @@ WARNING:  database "mydb" must be vacuumed within 177009986 transactions
 HINT:  To avoid a database shutdown, execute a database-wide VACUUM in "mydb".
 </programlisting>
 
-    (A manual <command>VACUUM</> should fix the problem, as suggested by the
-    hint; but note that the <command>VACUUM</> must be performed by a
+    (A manual <command>VACUUM</command> should fix the problem, as suggested by the
+    hint; but note that the <command>VACUUM</command> must be performed by a
     superuser, else it will fail to process system catalogs and thus not
-    be able to advance the database's <structfield>datfrozenxid</>.)
+    be able to advance the database's <structfield>datfrozenxid</structfield>.)
     If these warnings are
     ignored, the system will shut down and refuse to start any new
     transactions once there are fewer than 1 million transactions left
@@ -628,11 +632,11 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
 
     The 1-million-transaction safety margin exists to let the
     administrator recover without data loss, by manually executing the
-    required <command>VACUUM</> commands.  However, since the system will not
+    required <command>VACUUM</command> commands.  However, since the system will not
     execute commands once it has gone into the safety shutdown mode,
     the only way to do this is to stop the server and start the server in single-user
-    mode to execute <command>VACUUM</>.  The shutdown mode is not enforced
-    in single-user mode.  See the <xref linkend="app-postgres"> reference
+    mode to execute <command>VACUUM</command>.  The shutdown mode is not enforced
+    in single-user mode.  See the <xref linkend="app-postgres"/> reference
     page for details about using single-user mode.
    </para>
 
@@ -649,15 +653,15 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     </indexterm>
 
     <para>
-     <firstterm>Multixact IDs</> are used to support row locking by
+     <firstterm>Multixact IDs</firstterm> are used to support row locking by
      multiple transactions.  Since there is only limited space in a tuple
      header to store lock information, that information is encoded as
-     a <quote>multiple transaction ID</>, or multixact ID for short,
+     a <quote>multiple transaction ID</quote>, or multixact ID for short,
      whenever there is more than one transaction concurrently locking a
      row.  Information about which transaction IDs are included in any
      particular multixact ID is stored separately in
-     the <filename>pg_multixact</> subdirectory, and only the multixact ID
-     appears in the <structfield>xmax</> field in the tuple header.
+     the <filename>pg_multixact</filename> subdirectory, and only the multixact ID
+     appears in the <structfield>xmax</structfield> field in the tuple header.
      Like transaction IDs, multixact IDs are implemented as a
      32-bit counter and corresponding storage, all of which requires
      careful aging management, storage cleanup, and wraparound handling.
@@ -667,23 +671,23 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     </para>
 
     <para>
-     Whenever <command>VACUUM</> scans any part of a table, it will replace
+     Whenever <command>VACUUM</command> scans any part of a table, it will replace
      any multixact ID it encounters which is older than
-     <xref linkend="guc-vacuum-multixact-freeze-min-age">
+     <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
      by a different value, which can be the zero value, a single
      transaction ID, or a newer multixact ID.  For each table,
-     <structname>pg_class</>.<structfield>relminmxid</> stores the oldest
+     <structname>pg_class</structname>.<structfield>relminmxid</structfield> stores the oldest
      possible multixact ID still appearing in any tuple of that table.
      If this value is older than
-     <xref linkend="guc-vacuum-multixact-freeze-table-age">, an aggressive
+     <xref linkend="guc-vacuum-multixact-freeze-table-age"/>, an aggressive
      vacuum is forced.  As discussed in the previous section, an aggressive
      vacuum means that only those pages which are known to be all-frozen will
-     be skipped.  <function>mxid_age()</> can be used on
-     <structname>pg_class</>.<structfield>relminmxid</> to find its age.
+     be skipped.  <function>mxid_age()</function> can be used on
+     <structname>pg_class</structname>.<structfield>relminmxid</structfield> to find its age.
     </para>
 
     <para>
-     Aggressive <command>VACUUM</> scans, regardless of
+     Aggressive <command>VACUUM</command> scans, regardless of
      what causes them, enable advancing the value for that table.
      Eventually, as all tables in all databases are scanned and their
      oldest multixact values are advanced, on-disk storage for older
@@ -693,7 +697,7 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     <para>
      As a safety device, an aggressive vacuum scan will occur for any table
      whose multixact-age is greater than
-     <xref linkend="guc-autovacuum-multixact-freeze-max-age">.  Aggressive
+     <xref linkend="guc-autovacuum-multixact-freeze-max-age"/>.  Aggressive
      vacuum scans will also occur progressively for all tables, starting with
      those that have the oldest multixact-age, if the amount of used member
      storage space exceeds the amount 50% of the addressable storage space.
@@ -719,28 +723,28 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     tables that have had a large number of inserted, updated or deleted
     tuples.  These checks use the statistics collection facility;
     therefore, autovacuum cannot be used unless <xref
-    linkend="guc-track-counts"> is set to <literal>true</literal>.
+    linkend="guc-track-counts"/> is set to <literal>true</literal>.
     In the default configuration, autovacuuming is enabled and the related
     configuration parameters are appropriately set.
    </para>
 
    <para>
-    The <quote>autovacuum daemon</> actually consists of multiple processes.
+    The <quote>autovacuum daemon</quote> actually consists of multiple processes.
     There is a persistent daemon process, called the
     <firstterm>autovacuum launcher</firstterm>, which is in charge of starting
     <firstterm>autovacuum worker</firstterm> processes for all databases. The
     launcher will distribute the work across time, attempting to start one
-    worker within each database every <xref linkend="guc-autovacuum-naptime">
-    seconds.  (Therefore, if the installation has <replaceable>N</> databases,
+    worker within each database every <xref linkend="guc-autovacuum-naptime"/>
+    seconds.  (Therefore, if the installation has <replaceable>N</replaceable> databases,
     a new worker will be launched every
-    <varname>autovacuum_naptime</>/<replaceable>N</> seconds.)
-    A maximum of <xref linkend="guc-autovacuum-max-workers"> worker processes
+    <varname>autovacuum_naptime</varname>/<replaceable>N</replaceable> seconds.)
+    A maximum of <xref linkend="guc-autovacuum-max-workers"/> worker processes
     are allowed to run at the same time. If there are more than
-    <varname>autovacuum_max_workers</> databases to be processed,
+    <varname>autovacuum_max_workers</varname> databases to be processed,
     the next database will be processed as soon as the first worker finishes.
     Each worker process will check each table within its database and
-    execute <command>VACUUM</> and/or <command>ANALYZE</> as needed.
-    <xref linkend="guc-log-autovacuum-min-duration"> can be set to monitor
+    execute <command>VACUUM</command> and/or <command>ANALYZE</command> as needed.
+    <xref linkend="guc-log-autovacuum-min-duration"/> can be set to monitor
     autovacuum workers' activity.
    </para>
 
@@ -752,13 +756,13 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
     available. There is no limit on how many workers might be in a
     single database, but workers do try to avoid repeating work that has
     already been done by other workers. Note that the number of running
-    workers does not count towards <xref linkend="guc-max-connections"> or
-    <xref linkend="guc-superuser-reserved-connections"> limits.
+    workers does not count towards <xref linkend="guc-max-connections"/> or
+    <xref linkend="guc-superuser-reserved-connections"/> limits.
    </para>
 
    <para>
-    Tables whose <structfield>relfrozenxid</> value is more than
-    <xref linkend="guc-autovacuum-freeze-max-age"> transactions old are always
+    Tables whose <structfield>relfrozenxid</structfield> value is more than
+    <xref linkend="guc-autovacuum-freeze-max-age"/> transactions old are always
     vacuumed (this also applies to those tables whose freeze max age has
     been modified via storage parameters; see below).  Otherwise, if the
     number of tuples obsoleted since the last
@@ -768,19 +772,19 @@ HINT:  Stop the postmaster and vacuum that database in single-user mode.
 vacuum threshold = vacuum base threshold + vacuum scale factor * number of tuples
 </programlisting>
     where the vacuum base threshold is
-    <xref linkend="guc-autovacuum-vacuum-threshold">,
+    <xref linkend="guc-autovacuum-vacuum-threshold"/>,
     the vacuum scale factor is
-    <xref linkend="guc-autovacuum-vacuum-scale-factor">,
+    <xref linkend="guc-autovacuum-vacuum-scale-factor"/>,
     and the number of tuples is
     <structname>pg_class</structname>.<structfield>reltuples</structfield>.
     The number of obsolete tuples is obtained from the statistics
     collector; it is a semi-accurate count updated by each
     <command>UPDATE</command> and <command>DELETE</command> operation.  (It
     is only semi-accurate because some information might be lost under heavy
-    load.)  If the <structfield>relfrozenxid</> value of the table is more
-    than <varname>vacuum_freeze_table_age</> transactions old, an aggressive
+    load.)  If the <structfield>relfrozenxid</structfield> value of the table is more
+    than <varname>vacuum_freeze_table_age</varname> transactions old, an aggressive
     vacuum is performed to freeze old tuples and advance
-    <structfield>relfrozenxid</>; otherwise, only pages that have been modified
+    <structfield>relfrozenxid</structfield>; otherwise, only pages that have been modified
     since the last vacuum are scanned.
    </para>
 
@@ -804,21 +808,21 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
     <filename>postgresql.conf</filename>, but it is possible to override them
     (and many other autovacuum control parameters) on a per-table basis; see
     <xref linkend="sql-createtable-storage-parameters"
-    endterm="sql-createtable-storage-parameters-title"> for more information.
+    endterm="sql-createtable-storage-parameters-title"/> for more information.
     If a setting has been changed via a table's storage parameters, that value
     is used when processing that table; otherwise the global settings are
-    used. See <xref linkend="runtime-config-autovacuum"> for more details on
+    used. See <xref linkend="runtime-config-autovacuum"/> for more details on
     the global settings.
    </para>
 
    <para>
     When multiple workers are running, the autovacuum cost delay parameters
-    (see <xref linkend="runtime-config-resource-vacuum-cost">) are
+    (see <xref linkend="runtime-config-resource-vacuum-cost"/>) are
     <quote>balanced</quote> among all the running workers, so that the
     total I/O impact on the system is the same regardless of the number
     of workers actually running.  However, any workers processing tables whose
-    per-table <literal>autovacuum_vacuum_cost_delay</> or
-    <literal>autovacuum_vacuum_cost_limit</> storage parameters have been set
+    per-table <literal>autovacuum_vacuum_cost_delay</literal> or
+    <literal>autovacuum_vacuum_cost_limit</literal> storage parameters have been set
     are not considered in the balancing algorithm.
    </para>
   </sect2>
@@ -834,7 +838,7 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
 
   <para>
    In some situations it is worthwhile to rebuild indexes periodically
-   with the <xref linkend="sql-reindex"> command or a series of individual
+   with the <xref linkend="sql-reindex"/> command or a series of individual
    rebuilding steps.
 
   </para>
@@ -864,16 +868,16 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
   </para>
 
   <para>
-   <xref linkend="sql-reindex"> can be used safely and easily in all cases.
+   <xref linkend="sql-reindex"/> can be used safely and easily in all cases.
    But since the command requires an exclusive table lock, it is
    often preferable to execute an index rebuild with a sequence of
    creation and replacement steps.  Index types that support
-   <xref linkend="sql-createindex"> with the <literal>CONCURRENTLY</>
+   <xref linkend="sql-createindex"/> with the <literal>CONCURRENTLY</literal>
    option can instead be recreated that way. If that is successful and the
    resulting index is valid, the original index can then be replaced by
-   the newly built one using a combination of <xref linkend="sql-alterindex">
-   and <xref linkend="sql-dropindex">. When an index is used to enforce
-   uniqueness or other constraints, <xref linkend="sql-altertable"> might
+   the newly built one using a combination of <xref linkend="sql-alterindex"/>
+   and <xref linkend="sql-dropindex"/>. When an index is used to enforce
+   uniqueness or other constraints, <xref linkend="sql-altertable"/> might
    be necessary to swap the existing constraint with one enforced by
    the new index. Review this alternate multistep rebuild approach
    carefully before using it as there are limitations on which
@@ -892,17 +896,17 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
 
   <para>
    It is a good idea to save the database server's log output
-   somewhere, rather than just discarding it via <filename>/dev/null</>.
+   somewhere, rather than just discarding it via <filename>/dev/null</filename>.
    The log output is invaluable when diagnosing
    problems.  However, the log output tends to be voluminous
    (especially at higher debug levels) so you won't want to save it
-   indefinitely.  You need to <emphasis>rotate</> the log files so that
+   indefinitely.  You need to <emphasis>rotate</emphasis> the log files so that
    new log files are started and old ones removed after a reasonable
    period of time.
   </para>
 
   <para>
-   If you simply direct the <systemitem>stderr</> of
+   If you simply direct the <systemitem>stderr</systemitem> of
    <command>postgres</command> into a
    file, you will have log output, but
    the only way to truncate the log file is to stop and restart
@@ -913,13 +917,13 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
 
   <para>
    A better approach is to send the server's
-   <systemitem>stderr</> output to some type of log rotation program.
+   <systemitem>stderr</systemitem> output to some type of log rotation program.
    There is a built-in log rotation facility, which you can use by
-   setting the configuration parameter <varname>logging_collector</> to
-   <literal>true</> in <filename>postgresql.conf</>.  The control
+   setting the configuration parameter <varname>logging_collector</varname> to
+   <literal>true</literal> in <filename>postgresql.conf</filename>.  The control
    parameters for this program are described in <xref
-   linkend="runtime-config-logging-where">. You can also use this approach
-   to capture the log data in machine readable <acronym>CSV</>
+   linkend="runtime-config-logging-where"/>. You can also use this approach
+   to capture the log data in machine readable <acronym>CSV</acronym>
    (comma-separated values) format.
   </para>
 
@@ -930,10 +934,10 @@ analyze threshold = analyze base threshold + analyze scale factor * number of tu
    tool included in the <productname>Apache</productname> distribution
    can be used with <productname>PostgreSQL</productname>.  To do this,
    just pipe the server's
-   <systemitem>stderr</> output to the desired program.
+   <systemitem>stderr</systemitem> output to the desired program.
    If you start the server with
-   <command>pg_ctl</>, then <systemitem>stderr</>
-   is already redirected to <systemitem>stdout</>, so you just need a
+   <command>pg_ctl</command>, then <systemitem>stderr</systemitem>
+   is already redirected to <systemitem>stdout</systemitem>, so you just need a
    pipe command, for example:
 
 <programlisting>
@@ -943,12 +947,12 @@ pg_ctl start | rotatelogs /var/log/pgsql_log 86400
 
   <para>
    Another production-grade approach to managing log output is to
-   send it to <application>syslog</> and let
-   <application>syslog</> deal with file rotation. To do this, set the
-   configuration parameter <varname>log_destination</> to <literal>syslog</>
-   (to log to <application>syslog</> only) in
-   <filename>postgresql.conf</>. Then you can send a <literal>SIGHUP</literal>
-   signal to the <application>syslog</> daemon whenever you want to force it
+   send it to <application>syslog</application> and let
+   <application>syslog</application> deal with file rotation. To do this, set the
+   configuration parameter <varname>log_destination</varname> to <literal>syslog</literal>
+   (to log to <application>syslog</application> only) in
+   <filename>postgresql.conf</filename>. Then you can send a <literal>SIGHUP</literal>
+   signal to the <application>syslog</application> daemon whenever you want to force it
    to start writing a new log file.  If you want to automate log
    rotation, the <application>logrotate</application> program can be
    configured to work with log files from
@@ -956,12 +960,12 @@ pg_ctl start | rotatelogs /var/log/pgsql_log 86400
   </para>
 
   <para>
-   On many systems, however, <application>syslog</> is not very reliable,
+   On many systems, however, <application>syslog</application> is not very reliable,
    particularly with large log messages; it might truncate or drop messages
-   just when you need them the most.  Also, on <productname>Linux</>,
-   <application>syslog</> will flush each message to disk, yielding poor
-   performance.  (You can use a <quote><literal>-</></> at the start of the file name
-   in the <application>syslog</> configuration file to disable syncing.)
+   just when you need them the most.  Also, on <productname>Linux</productname>,
+   <application>syslog</application> will flush each message to disk, yielding poor
+   performance.  (You can use a <quote><literal>-</literal></quote> at the start of the file name
+   in the <application>syslog</application> configuration file to disable syncing.)
   </para>
 
   <para>
@@ -977,7 +981,7 @@ pg_ctl start | rotatelogs /var/log/pgsql_log 86400
    <ulink url="http://dalibo.github.io/pgbadger/"><productname>pgBadger</productname></ulink>
    is an external project that does sophisticated log file analysis.
    <ulink
-   url="http://bucardo.org/wiki/Check_postgres"><productname>check_postgres</productname></ulink>
+   url="https://bucardo.org/check_postgres/"><productname>check_postgres</productname></ulink>
    provides Nagios alerts when important messages appear in the log
    files, as well as detection of many other extraordinary conditions.
   </para>
diff --git a/doc/src/sgml/manage-ag.sgml b/doc/src/sgml/manage-ag.sgml
index fe1a6355c4..0154064e50 100644
--- a/doc/src/sgml/manage-ag.sgml
+++ b/doc/src/sgml/manage-ag.sgml
@@ -3,7 +3,7 @@
 <chapter id="managing-databases">
  <title>Managing Databases</title>
 
- <indexterm zone="managing-databases"><primary>database</></>
+ <indexterm zone="managing-databases"><primary>database</primary></indexterm>
 
  <para>
   Every instance of a running <productname>PostgreSQL</productname>
@@ -26,7 +26,7 @@
    (<quote>database objects</quote>).  Generally, every database
    object (tables, functions, etc.) belongs to one and only one
    database.  (However there are a few system catalogs, for example
-   <literal>pg_database</>, that belong to a whole cluster and
+   <literal>pg_database</literal>, that belong to a whole cluster and
    are accessible from each database within the cluster.)  More
    accurately, a database is a collection of schemas and the schemas
    contain the tables, functions, etc.  So the full hierarchy is:
@@ -41,7 +41,7 @@
    connection. However, an application is not restricted in the number of
    connections it opens to the same or other databases.  Databases are
    physically separated and access control is managed at the
-   connection level.  If one <productname>PostgreSQL</> server
+   connection level.  If one <productname>PostgreSQL</productname> server
    instance is to house projects or users that should be separate and
    for the most part unaware of each other, it is therefore
    recommended to put them into separate databases.  If the projects
@@ -49,27 +49,27 @@
    resources, they should be put in the same database but possibly
    into separate schemas.  Schemas are a purely logical structure and who can
    access what is managed by the privilege system.  More information about
-   managing schemas is in <xref linkend="ddl-schemas">.
+   managing schemas is in <xref linkend="ddl-schemas"/>.
   </para>
 
   <para>
-   Databases are created with the <command>CREATE DATABASE</> command
-   (see <xref linkend="manage-ag-createdb">) and destroyed with the
-   <command>DROP DATABASE</> command
-   (see <xref linkend="manage-ag-dropdb">).
+   Databases are created with the <command>CREATE DATABASE</command> command
+   (see <xref linkend="manage-ag-createdb"/>) and destroyed with the
+   <command>DROP DATABASE</command> command
+   (see <xref linkend="manage-ag-dropdb"/>).
    To determine the set of existing databases, examine the
-   <structname>pg_database</> system catalog, for example
+   <structname>pg_database</structname> system catalog, for example
 <synopsis>
 SELECT datname FROM pg_database;
 </synopsis>
-   The <xref linkend="app-psql"> program's <literal>\l</> meta-command
-   and <option>-l</> command-line option are also useful for listing the
+   The <xref linkend="app-psql"/> program's <literal>\l</literal> meta-command
+   and <option>-l</option> command-line option are also useful for listing the
    existing databases.
   </para>
 
   <note>
    <para>
-    The <acronym>SQL</> standard calls databases <quote>catalogs</>, but there
+    The <acronym>SQL</acronym> standard calls databases <quote>catalogs</quote>, but there
     is no difference in practice.
    </para>
   </note>
@@ -78,21 +78,21 @@ SELECT datname FROM pg_database;
  <sect1 id="manage-ag-createdb">
   <title>Creating a Database</title>
 
-  <indexterm><primary>CREATE DATABASE</></>
+  <indexterm><primary>CREATE DATABASE</primary></indexterm>
 
   <para>
-   In order to create a database, the <productname>PostgreSQL</>
+   In order to create a database, the <productname>PostgreSQL</productname>
    server must be up and running (see <xref
-   linkend="server-start">).
+   linkend="server-start"/>).
   </para>
 
   <para>
    Databases are created with the SQL command
-   <xref linkend="sql-createdatabase">:
+   <xref linkend="sql-createdatabase"/>:
 <synopsis>
-CREATE DATABASE <replaceable>name</>;
+CREATE DATABASE <replaceable>name</replaceable>;
 </synopsis>
-   where <replaceable>name</> follows the usual rules for
+   where <replaceable>name</replaceable> follows the usual rules for
    <acronym>SQL</acronym> identifiers.  The current role automatically
    becomes the owner of the new database. It is the privilege of the
    owner of a database to remove it later (which also removes all
@@ -101,55 +101,55 @@ CREATE DATABASE <replaceable>name</>;
 
   <para>
    The creation of databases is a restricted operation. See <xref
-   linkend="role-attributes"> for how to grant permission.
+   linkend="role-attributes"/> for how to grant permission.
   </para>
 
   <para>
    Since you need to be connected to the database server in order to
    execute the <command>CREATE DATABASE</command> command, the
-   question remains how the <emphasis>first</> database at any given
+   question remains how the <emphasis>first</emphasis> database at any given
    site can be created. The first database is always created by the
-   <command>initdb</> command when the data storage area is
-   initialized. (See <xref linkend="creating-cluster">.)  This
+   <command>initdb</command> command when the data storage area is
+   initialized. (See <xref linkend="creating-cluster"/>.)  This
    database is called
-   <literal>postgres</>.<indexterm><primary>postgres</></> So to
-   create the first <quote>ordinary</> database you can connect to
-   <literal>postgres</>.
+   <literal>postgres</literal>.<indexterm><primary>postgres</primary></indexterm> So to
+   create the first <quote>ordinary</quote> database you can connect to
+   <literal>postgres</literal>.
   </para>
 
   <para>
    A second database,
-   <literal>template1</literal>,<indexterm><primary>template1</></>
+   <literal>template1</literal>,<indexterm><primary>template1</primary></indexterm>
    is also created during database cluster initialization.  Whenever a
    new database is created within the
    cluster, <literal>template1</literal> is essentially cloned.
-   This means that any changes you make in <literal>template1</> are
+   This means that any changes you make in <literal>template1</literal> are
    propagated to all subsequently created databases. Because of this,
-   avoid creating objects in <literal>template1</> unless you want them
+   avoid creating objects in <literal>template1</literal> unless you want them
    propagated to every newly created database.  More details
-   appear in <xref linkend="manage-ag-templatedbs">.
+   appear in <xref linkend="manage-ag-templatedbs"/>.
   </para>
 
   <para>
    As a convenience, there is a program you can
    execute from the shell to create new databases,
-   <command>createdb</>.<indexterm><primary>createdb</></>
+   <command>createdb</command>.<indexterm><primary>createdb</primary></indexterm>
 
 <synopsis>
 createdb <replaceable class="parameter">dbname</replaceable>
 </synopsis>
 
-   <command>createdb</> does no magic. It connects to the <literal>postgres</>
-   database and issues the <command>CREATE DATABASE</> command,
+   <command>createdb</command> does no magic. It connects to the <literal>postgres</literal>
+   database and issues the <command>CREATE DATABASE</command> command,
    exactly as described above.
-   The <xref linkend="app-createdb"> reference page contains the invocation
-   details. Note that <command>createdb</> without any arguments will create
+   The <xref linkend="app-createdb"/> reference page contains the invocation
+   details. Note that <command>createdb</command> without any arguments will create
    a database with the current user name.
   </para>
 
   <note>
    <para>
-    <xref linkend="client-authentication"> contains information about
+    <xref linkend="client-authentication"/> contains information about
     how to restrict who can connect to a given database.
    </para>
   </note>
@@ -160,11 +160,11 @@ createdb <replaceable class="parameter">dbname</replaceable>
    configure and manage it themselves.  To achieve that, use one of the
    following commands:
 <programlisting>
-CREATE DATABASE <replaceable>dbname</> OWNER <replaceable>rolename</>;
+CREATE DATABASE <replaceable>dbname</replaceable> OWNER <replaceable>rolename</replaceable>;
 </programlisting>
    from the SQL environment, or:
 <programlisting>
-createdb -O <replaceable>rolename</> <replaceable>dbname</>
+createdb -O <replaceable>rolename</replaceable> <replaceable>dbname</replaceable>
 </programlisting>
    from the shell.
    Only the superuser is allowed to create a database for
@@ -176,55 +176,55 @@ createdb -O <replaceable>rolename</> <replaceable>dbname</>
   <title>Template Databases</title>
 
   <para>
-   <command>CREATE DATABASE</> actually works by copying an existing
+   <command>CREATE DATABASE</command> actually works by copying an existing
    database.  By default, it copies the standard system database named
-   <literal>template1</>.<indexterm><primary>template1</></> Thus that
-   database is the <quote>template</> from which new databases are
-   made.  If you add objects to <literal>template1</>, these objects
+   <literal>template1</literal>.<indexterm><primary>template1</primary></indexterm> Thus that
+   database is the <quote>template</quote> from which new databases are
+   made.  If you add objects to <literal>template1</literal>, these objects
    will be copied into subsequently created user databases.  This
    behavior allows site-local modifications to the standard set of
    objects in databases.  For example, if you install the procedural
-   language <application>PL/Perl</> in <literal>template1</>, it will
+   language <application>PL/Perl</application> in <literal>template1</literal>, it will
    automatically be available in user databases without any extra
    action being taken when those databases are created.
   </para>
 
   <para>
    There is a second standard system database named
-   <literal>template0</>.<indexterm><primary>template0</></> This
+   <literal>template0</literal>.<indexterm><primary>template0</primary></indexterm> This
    database contains the same data as the initial contents of
-   <literal>template1</>, that is, only the standard objects
+   <literal>template1</literal>, that is, only the standard objects
    predefined by your version of
-   <productname>PostgreSQL</productname>.  <literal>template0</>
+   <productname>PostgreSQL</productname>.  <literal>template0</literal>
    should never be changed after the database cluster has been
    initialized.  By instructing
-   <command>CREATE DATABASE</> to copy <literal>template0</> instead
-   of <literal>template1</>, you can create a <quote>virgin</> user
+   <command>CREATE DATABASE</command> to copy <literal>template0</literal> instead
+   of <literal>template1</literal>, you can create a <quote>virgin</quote> user
    database that contains none of the site-local additions in
-   <literal>template1</>.  This is particularly handy when restoring a
-   <literal>pg_dump</> dump: the dump script should be restored in a
+   <literal>template1</literal>.  This is particularly handy when restoring a
+   <literal>pg_dump</literal> dump: the dump script should be restored in a
    virgin database to ensure that one recreates the correct contents
    of the dumped database, without conflicting with objects that
-   might have been added to <literal>template1</> later on.
+   might have been added to <literal>template1</literal> later on.
   </para>
 
   <para>
-   Another common reason for copying <literal>template0</> instead
-   of <literal>template1</> is that new encoding and locale settings
-   can be specified when copying <literal>template0</>, whereas a copy
-   of <literal>template1</> must use the same settings it does.
-   This is because <literal>template1</> might contain encoding-specific
-   or locale-specific data, while <literal>template0</> is known not to.
+   Another common reason for copying <literal>template0</literal> instead
+   of <literal>template1</literal> is that new encoding and locale settings
+   can be specified when copying <literal>template0</literal>, whereas a copy
+   of <literal>template1</literal> must use the same settings it does.
+   This is because <literal>template1</literal> might contain encoding-specific
+   or locale-specific data, while <literal>template0</literal> is known not to.
   </para>
 
   <para>
    To create a database by copying <literal>template0</literal>, use:
 <programlisting>
-CREATE DATABASE <replaceable>dbname</> TEMPLATE template0;
+CREATE DATABASE <replaceable>dbname</replaceable> TEMPLATE template0;
 </programlisting>
    from the SQL environment, or:
 <programlisting>
-createdb -T template0 <replaceable>dbname</>
+createdb -T template0 <replaceable>dbname</replaceable>
 </programlisting>
    from the shell.
   </para>
@@ -232,49 +232,49 @@ createdb -T template0 <replaceable>dbname</>
   <para>
    It is possible to create additional template databases, and indeed
    one can copy any database in a cluster by specifying its name
-   as the template for <command>CREATE DATABASE</>.  It is important to
+   as the template for <command>CREATE DATABASE</command>.  It is important to
    understand, however, that this is not (yet) intended as
    a general-purpose <quote><command>COPY DATABASE</command></quote> facility.
    The principal limitation is that no other sessions can be connected to
    the source database while it is being copied.  <command>CREATE
-   DATABASE</> will fail if any other connection exists when it starts;
+   DATABASE</command> will fail if any other connection exists when it starts;
    during the copy operation, new connections to the source database
    are prevented.
   </para>
 
   <para>
-   Two useful flags exist in <literal>pg_database</literal><indexterm><primary>pg_database</></> for each
+   Two useful flags exist in <literal>pg_database</literal><indexterm><primary>pg_database</primary></indexterm> for each
    database: the columns <literal>datistemplate</literal> and
    <literal>datallowconn</literal>.  <literal>datistemplate</literal>
    can be set to indicate that a database is intended as a template for
-   <command>CREATE DATABASE</>.  If this flag is set, the database can be
-   cloned by any user with <literal>CREATEDB</> privileges; if it is not set,
+   <command>CREATE DATABASE</command>.  If this flag is set, the database can be
+   cloned by any user with <literal>CREATEDB</literal> privileges; if it is not set,
    only superusers and the owner of the database can clone it.
    If <literal>datallowconn</literal> is false, then no new connections
    to that database will be allowed (but existing sessions are not terminated
    simply by setting the flag false).  The <literal>template0</literal>
-   database is normally marked <literal>datallowconn = false</> to prevent its modification.
+   database is normally marked <literal>datallowconn = false</literal> to prevent its modification.
    Both <literal>template0</literal> and <literal>template1</literal>
-   should always be marked with <literal>datistemplate = true</>.
+   should always be marked with <literal>datistemplate = true</literal>.
   </para>
 
   <note>
    <para>
-    <literal>template1</> and <literal>template0</> do not have any special
-    status beyond the fact that the name <literal>template1</> is the default
-    source database name for <command>CREATE DATABASE</>.
-    For example, one could drop <literal>template1</> and recreate it from
-    <literal>template0</> without any ill effects.  This course of action
+    <literal>template1</literal> and <literal>template0</literal> do not have any special
+    status beyond the fact that the name <literal>template1</literal> is the default
+    source database name for <command>CREATE DATABASE</command>.
+    For example, one could drop <literal>template1</literal> and recreate it from
+    <literal>template0</literal> without any ill effects.  This course of action
     might be advisable if one has carelessly added a bunch of junk in
-    <literal>template1</>. (To delete <literal>template1</literal>,
-    it must have <literal>pg_database.datistemplate = false</>.)
+    <literal>template1</literal>. (To delete <literal>template1</literal>,
+    it must have <literal>pg_database.datistemplate = false</literal>.)
    </para>
 
    <para>
-    The <literal>postgres</> database is also created when a database
+    The <literal>postgres</literal> database is also created when a database
     cluster is initialized.  This database is meant as a default database for
     users and applications to connect to. It is simply a copy of
-    <literal>template1</> and can be dropped and recreated if necessary.
+    <literal>template1</literal> and can be dropped and recreated if necessary.
    </para>
   </note>
  </sect1>
@@ -283,8 +283,8 @@ createdb -T template0 <replaceable>dbname</>
   <title>Database Configuration</title>
 
   <para>
-   Recall from <xref linkend="runtime-config"> that the
-   <productname>PostgreSQL</> server provides a large number of
+   Recall from <xref linkend="runtime-config"/> that the
+   <productname>PostgreSQL</productname> server provides a large number of
    run-time configuration variables.  You can set database-specific
    default values for many of these settings.
   </para>
@@ -305,8 +305,8 @@ ALTER DATABASE mydb SET geqo TO off;
    session started.
    Note that users can still alter this setting during their sessions; it
    will only be the default.  To undo any such setting, use
-   <literal>ALTER DATABASE <replaceable>dbname</> RESET
-   <replaceable>varname</></literal>.
+   <literal>ALTER DATABASE <replaceable>dbname</replaceable> RESET
+   <replaceable>varname</replaceable></literal>.
   </para>
  </sect1>
 
@@ -315,9 +315,9 @@ ALTER DATABASE mydb SET geqo TO off;
 
   <para>
    Databases are destroyed with the command
-   <xref linkend="sql-dropdatabase">:<indexterm><primary>DROP DATABASE</></>
+   <xref linkend="sql-dropdatabase"/>:<indexterm><primary>DROP DATABASE</primary></indexterm>
 <synopsis>
-DROP DATABASE <replaceable>name</>;
+DROP DATABASE <replaceable>name</replaceable>;
 </synopsis>
    Only the owner of the database, or
    a superuser, can drop a database. Dropping a database removes all objects
@@ -329,19 +329,19 @@ DROP DATABASE <replaceable>name</>;
   <para>
    You cannot execute the <command>DROP DATABASE</command> command
    while connected to the victim database. You can, however, be
-   connected to any other database, including the <literal>template1</>
+   connected to any other database, including the <literal>template1</literal>
    database.
-   <literal>template1</> would be the only option for dropping the last user database of a
+   <literal>template1</literal> would be the only option for dropping the last user database of a
    given cluster.
   </para>
 
   <para>
    For convenience, there is also a shell program to drop
-   databases, <xref linkend="app-dropdb">:<indexterm><primary>dropdb</></>
+   databases, <xref linkend="app-dropdb"/>:<indexterm><primary>dropdb</primary></indexterm>
 <synopsis>
 dropdb <replaceable class="parameter">dbname</replaceable>
 </synopsis>
-   (Unlike <command>createdb</>, it is not the default action to drop
+   (Unlike <command>createdb</command>, it is not the default action to drop
    the database with the current user name.)
   </para>
  </sect1>
@@ -354,7 +354,7 @@ dropdb <replaceable class="parameter">dbname</replaceable>
   </indexterm>
 
   <para>
-   Tablespaces in <productname>PostgreSQL</> allow database administrators to
+   Tablespaces in <productname>PostgreSQL</productname> allow database administrators to
    define locations in the file system where the files representing
    database objects can be stored. Once created, a tablespace can be referred
    to by name when creating database objects.
@@ -362,7 +362,7 @@ dropdb <replaceable class="parameter">dbname</replaceable>
 
   <para>
    By using tablespaces, an administrator can control the disk layout
-   of a <productname>PostgreSQL</> installation. This is useful in at
+   of a <productname>PostgreSQL</productname> installation. This is useful in at
    least two ways. First, if the partition or volume on which the
    cluster was initialized runs out of space and cannot be extended,
    a tablespace can be created on a different partition and used
@@ -396,13 +396,13 @@ dropdb <replaceable class="parameter">dbname</replaceable>
 
   <para>
    To define a tablespace, use the <xref
-   linkend="sql-createtablespace">
-   command, for example:<indexterm><primary>CREATE TABLESPACE</></>:
+   linkend="sql-createtablespace"/>
+   command, for example:<indexterm><primary>CREATE TABLESPACE</primary></indexterm>:
 <programlisting>
 CREATE TABLESPACE fastspace LOCATION '/ssd1/postgresql/data';
 </programlisting>
    The location must be an existing, empty directory that is owned by
-   the <productname>PostgreSQL</> operating system user.  All objects subsequently
+   the <productname>PostgreSQL</productname> operating system user.  All objects subsequently
    created within the tablespace will be stored in files underneath this
    directory.  The location must not be on removable or transient storage,
    as the cluster might fail to function if the tablespace is missing
@@ -414,7 +414,7 @@ CREATE TABLESPACE fastspace LOCATION '/ssd1/postgresql/data';
     There is usually not much point in making more than one
     tablespace per logical file system, since you cannot control the location
     of individual files within a logical file system.  However,
-    <productname>PostgreSQL</> does not enforce any such limitation, and
+    <productname>PostgreSQL</productname> does not enforce any such limitation, and
     indeed it is not directly aware of the file system boundaries on your
     system.  It just stores files in the directories you tell it to use.
    </para>
@@ -423,34 +423,34 @@ CREATE TABLESPACE fastspace LOCATION '/ssd1/postgresql/data';
   <para>
    Creation of the tablespace itself must be done as a database superuser,
    but after that you can allow ordinary database users to use it.
-   To do that, grant them the <literal>CREATE</> privilege on it.
+   To do that, grant them the <literal>CREATE</literal> privilege on it.
   </para>
 
   <para>
    Tables, indexes, and entire databases can be assigned to
-   particular tablespaces. To do so, a user with the <literal>CREATE</>
+   particular tablespaces. To do so, a user with the <literal>CREATE</literal>
    privilege on a given tablespace must pass the tablespace name as a
    parameter to the relevant command. For example, the following creates
-   a table in the tablespace <literal>space1</>:
+   a table in the tablespace <literal>space1</literal>:
 <programlisting>
 CREATE TABLE foo(i int) TABLESPACE space1;
 </programlisting>
   </para>
 
   <para>
-   Alternatively, use the <xref linkend="guc-default-tablespace"> parameter:
+   Alternatively, use the <xref linkend="guc-default-tablespace"/> parameter:
 <programlisting>
 SET default_tablespace = space1;
 CREATE TABLE foo(i int);
 </programlisting>
-   When <varname>default_tablespace</> is set to anything but an empty
-   string, it supplies an implicit <literal>TABLESPACE</> clause for
-   <command>CREATE TABLE</> and <command>CREATE INDEX</> commands that
+   When <varname>default_tablespace</varname> is set to anything but an empty
+   string, it supplies an implicit <literal>TABLESPACE</literal> clause for
+   <command>CREATE TABLE</command> and <command>CREATE INDEX</command> commands that
    do not have an explicit one.
   </para>
 
   <para>
-   There is also a <xref linkend="guc-temp-tablespaces"> parameter, which
+   There is also a <xref linkend="guc-temp-tablespaces"/> parameter, which
    determines the placement of temporary tables and indexes, as well as
    temporary files that are used for purposes such as sorting large data
    sets.  This can be a list of tablespace names, rather than only one,
@@ -463,9 +463,9 @@ CREATE TABLE foo(i int);
    The tablespace associated with a database is used to store the system
    catalogs of that database.  Furthermore, it is the default tablespace
    used for tables, indexes, and temporary files created within the database,
-   if no <literal>TABLESPACE</> clause is given and no other selection is
-   specified by <varname>default_tablespace</> or
-   <varname>temp_tablespaces</> (as appropriate).
+   if no <literal>TABLESPACE</literal> clause is given and no other selection is
+   specified by <varname>default_tablespace</varname> or
+   <varname>temp_tablespaces</varname> (as appropriate).
    If a database is created without specifying a tablespace for it,
    it uses the same tablespace as the template database it is copied from.
   </para>
@@ -473,12 +473,12 @@ CREATE TABLE foo(i int);
   <para>
    Two tablespaces are automatically created when the database cluster
    is initialized.  The
-   <literal>pg_global</> tablespace is used for shared system catalogs. The
-   <literal>pg_default</> tablespace is the default tablespace of the
-   <literal>template1</> and <literal>template0</> databases (and, therefore,
+   <literal>pg_global</literal> tablespace is used for shared system catalogs. The
+   <literal>pg_default</literal> tablespace is the default tablespace of the
+   <literal>template1</literal> and <literal>template0</literal> databases (and, therefore,
    will be the default tablespace for other databases as well, unless
-   overridden by a <literal>TABLESPACE</> clause in <command>CREATE
-   DATABASE</>).
+   overridden by a <literal>TABLESPACE</literal> clause in <command>CREATE
+   DATABASE</command>).
   </para>
 
   <para>
@@ -490,7 +490,7 @@ CREATE TABLE foo(i int);
 
   <para>
    To remove an empty tablespace, use the <xref
-   linkend="sql-droptablespace">
+   linkend="sql-droptablespace"/>
    command.
   </para>
 
@@ -501,25 +501,25 @@ CREATE TABLE foo(i int);
 <synopsis>
 SELECT spcname FROM pg_tablespace;
 </synopsis>
-   The <xref linkend="app-psql"> program's <literal>\db</> meta-command
+   The <xref linkend="app-psql"/> program's <literal>\db</literal> meta-command
    is also useful for listing the existing tablespaces.
   </para>
 
   <para>
-   <productname>PostgreSQL</> makes use of symbolic links
+   <productname>PostgreSQL</productname> makes use of symbolic links
    to simplify the implementation of tablespaces. This
-   means that tablespaces can be used <emphasis>only</> on systems
+   means that tablespaces can be used <emphasis>only</emphasis> on systems
    that support symbolic links.
   </para>
 
   <para>
-   The directory <filename>$PGDATA/pg_tblspc</> contains symbolic links that
+   The directory <filename>$PGDATA/pg_tblspc</filename> contains symbolic links that
    point to each of the non-built-in tablespaces defined in the cluster.
    Although not recommended, it is possible to adjust the tablespace
    layout by hand by redefining these links. Under no circumstances perform
    this operation while the server is running. Note that in PostgreSQL 9.1
-   and earlier you will also need to update the <structname>pg_tablespace</>
-   catalog with the new locations. (If you do not, <literal>pg_dump</> will
+   and earlier you will also need to update the <structname>pg_tablespace</structname>
+   catalog with the new locations. (If you do not, <literal>pg_dump</literal> will
    continue to output the old tablespace locations.)
   </para>
 
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index 5575c2c837..82c015806e 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -24,11 +24,11 @@
    analyzing performance.  Most of this chapter is devoted to describing
    <productname>PostgreSQL</productname>'s statistics collector,
    but one should not neglect regular Unix monitoring programs such as
-   <command>ps</>, <command>top</>, <command>iostat</>, and <command>vmstat</>.
+   <command>ps</command>, <command>top</command>, <command>iostat</command>, and <command>vmstat</command>.
    Also, once one has identified a
    poorly-performing query, further investigation might be needed using
-   <productname>PostgreSQL</productname>'s <xref linkend="sql-explain"> command.
-   <xref linkend="using-explain"> discusses <command>EXPLAIN</>
+   <productname>PostgreSQL</productname>'s <xref linkend="sql-explain"/> command.
+   <xref linkend="using-explain"/> discusses <command>EXPLAIN</command>
    and other methods for understanding the behavior of an individual
    query.
   </para>
@@ -43,45 +43,45 @@
 
   <para>
    On most Unix platforms, <productname>PostgreSQL</productname> modifies its
-   command title as reported by <command>ps</>, so that individual server
+   command title as reported by <command>ps</command>, so that individual server
    processes can readily be identified.  A sample display is
 
 <screen>
 $ ps auxww | grep ^postgres
 postgres  15551  0.0  0.1  57536  7132 pts/0    S    18:02   0:00 postgres -i
-postgres  15554  0.0  0.0  57536  1184 ?        Ss   18:02   0:00 postgres: writer process
-postgres  15555  0.0  0.0  57536   916 ?        Ss   18:02   0:00 postgres: checkpointer process
-postgres  15556  0.0  0.0  57536   916 ?        Ss   18:02   0:00 postgres: wal writer process
-postgres  15557  0.0  0.0  58504  2244 ?        Ss   18:02   0:00 postgres: autovacuum launcher process
-postgres  15558  0.0  0.0  17512  1068 ?        Ss   18:02   0:00 postgres: stats collector process
+postgres  15554  0.0  0.0  57536  1184 ?        Ss   18:02   0:00 postgres: background writer
+postgres  15555  0.0  0.0  57536   916 ?        Ss   18:02   0:00 postgres: checkpointer
+postgres  15556  0.0  0.0  57536   916 ?        Ss   18:02   0:00 postgres: walwriter
+postgres  15557  0.0  0.0  58504  2244 ?        Ss   18:02   0:00 postgres: autovacuum launcher
+postgres  15558  0.0  0.0  17512  1068 ?        Ss   18:02   0:00 postgres: stats collector
 postgres  15582  0.0  0.0  58772  3080 ?        Ss   18:04   0:00 postgres: joe runbug 127.0.0.1 idle
 postgres  15606  0.0  0.0  58772  3052 ?        Ss   18:07   0:00 postgres: tgl regression [local] SELECT waiting
 postgres  15610  0.0  0.0  58772  3056 ?        Ss   18:07   0:00 postgres: tgl regression [local] idle in transaction
 </screen>
 
-   (The appropriate invocation of <command>ps</> varies across different
+   (The appropriate invocation of <command>ps</command> varies across different
    platforms, as do the details of what is shown.  This example is from a
    recent Linux system.)  The first process listed here is the
    master server process.  The command arguments
    shown for it are the same ones used when it was launched.  The next five
    processes are background worker processes automatically launched by the
-   master process.  (The <quote>stats collector</> process will not be present
+   master process.  (The <quote>stats collector</quote> process will not be present
    if you have set the system not to start the statistics collector; likewise
-   the <quote>autovacuum launcher</> process can be disabled.)
+   the <quote>autovacuum launcher</quote> process can be disabled.)
    Each of the remaining
    processes is a server process handling one client connection.  Each such
    process sets its command line display in the form
 
 <screen>
-postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <replaceable>activity</>
+postgres: <replaceable>user</replaceable> <replaceable>database</replaceable> <replaceable>host</replaceable> <replaceable>activity</replaceable>
 </screen>
 
   The user, database, and (client) host items remain the same for
   the life of the client connection, but the activity indicator changes.
-  The activity can be <literal>idle</> (i.e., waiting for a client command),
-  <literal>idle in transaction</> (waiting for client inside a <command>BEGIN</> block),
-  or a command type name such as <literal>SELECT</>.  Also,
-  <literal>waiting</> is appended if the server process is presently waiting
+  The activity can be <literal>idle</literal> (i.e., waiting for a client command),
+  <literal>idle in transaction</literal> (waiting for client inside a <command>BEGIN</command> block),
+  or a command type name such as <literal>SELECT</literal>.  Also,
+  <literal>waiting</literal> is appended if the server process is presently waiting
   on a lock held by another session.  In the above example we can infer
   that process 15606 is waiting for process 15610 to complete its transaction
   and thereby release some lock.  (Process 15610 must be the blocker, because
@@ -92,8 +92,8 @@ postgres: <replaceable>user</> <replaceable>database</> <replaceable>host</> <re
   </para>
 
   <para>
-   If <xref linkend="guc-cluster-name"> has been configured the
-   cluster name will also be shown in <command>ps</> output:
+   If <xref linkend="guc-cluster-name"/> has been configured the
+   cluster name will also be shown in <command>ps</command> output:
 <screen>
 $ psql -c 'SHOW cluster_name'
  cluster_name
@@ -102,13 +102,13 @@ $ psql -c 'SHOW cluster_name'
 (1 row)
 
 $ ps aux|grep server1
-postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: server1: writer process
+postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: server1: background writer
 ...
 </screen>
   </para>
 
   <para>
-   If you have turned off <xref linkend="guc-update-process-title"> then the
+   If you have turned off <xref linkend="guc-update-process-title"/> then the
    activity indicator is not updated; the process title is set only once
    when a new process is launched.  On some platforms this saves a measurable
    amount of per-command overhead;  on others it's insignificant.
@@ -122,8 +122,8 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
   flags, not just one. In addition, your original invocation of the
   <command>postgres</command> command must have a shorter
   <command>ps</command> status display than that provided by each
-  server process.  If you fail to do all three things, the <command>ps</>
-  output for each server process will be the original <command>postgres</>
+  server process.  If you fail to do all three things, the <command>ps</command>
+  output for each server process will be the original <command>postgres</command>
   command line.
   </para>
   </tip>
@@ -137,7 +137,7 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</productname>'s <firstterm>statistics collector</>
+   <productname>PostgreSQL</productname>'s <firstterm>statistics collector</firstterm>
    is a subsystem that supports collection and reporting of information about
    server activity.  Presently, the collector can count accesses to tables
    and indexes in both disk-block and individual-row terms.  It also tracks
@@ -161,47 +161,47 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
    Since collection of statistics adds some overhead to query execution,
    the system can be configured to collect or not collect information.
    This is controlled by configuration parameters that are normally set in
-   <filename>postgresql.conf</>.  (See <xref linkend="runtime-config"> for
+   <filename>postgresql.conf</filename>.  (See <xref linkend="runtime-config"/> for
    details about setting configuration parameters.)
   </para>
 
   <para>
-   The parameter <xref linkend="guc-track-activities"> enables monitoring
+   The parameter <xref linkend="guc-track-activities"/> enables monitoring
    of the current command being executed by any server process.
   </para>
 
   <para>
-   The parameter <xref linkend="guc-track-counts"> controls whether
+   The parameter <xref linkend="guc-track-counts"/> controls whether
    statistics are collected about table and index accesses.
   </para>
 
   <para>
-   The parameter <xref linkend="guc-track-functions"> enables tracking of
+   The parameter <xref linkend="guc-track-functions"/> enables tracking of
    usage of user-defined functions.
   </para>
 
   <para>
-   The parameter <xref linkend="guc-track-io-timing"> enables monitoring
+   The parameter <xref linkend="guc-track-io-timing"/> enables monitoring
    of block read and write times.
   </para>
 
   <para>
-   Normally these parameters are set in <filename>postgresql.conf</> so
+   Normally these parameters are set in <filename>postgresql.conf</filename> so
    that they apply to all server processes, but it is possible to turn
    them on or off in individual sessions using the <xref
-   linkend="sql-set"> command. (To prevent
+   linkend="sql-set"/> command. (To prevent
    ordinary users from hiding their activity from the administrator,
    only superusers are allowed to change these parameters with
-   <command>SET</>.)
+   <command>SET</command>.)
   </para>
 
   <para>
    The statistics collector transmits the collected information to other
    <productname>PostgreSQL</productname> processes through temporary files.
    These files are stored in the directory named by the
-   <xref linkend="guc-stats-temp-directory"> parameter,
+   <xref linkend="guc-stats-temp-directory"/> parameter,
    <filename>pg_stat_tmp</filename> by default.
-   For better performance, <varname>stats_temp_directory</> can be
+   For better performance, <varname>stats_temp_directory</varname> can be
    pointed at a RAM-based file system, decreasing physical I/O requirements.
    When the server shuts down cleanly, a permanent copy of the statistics
    data is stored in the <filename>pg_stat</filename> subdirectory, so that
@@ -217,13 +217,13 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
   <para>
    Several predefined views, listed in <xref
-   linkend="monitoring-stats-dynamic-views-table">, are available to show
+   linkend="monitoring-stats-dynamic-views-table"/>, are available to show
    the current state of the system. There are also several other
    views, listed in <xref
-   linkend="monitoring-stats-views-table">, available to show the results
+   linkend="monitoring-stats-views-table"/>, available to show the results
    of statistics collection.  Alternatively, one can
    build custom views using the underlying statistics functions, as discussed
-   in <xref linkend="monitoring-stats-functions">.
+   in <xref linkend="monitoring-stats-functions"/>.
   </para>
 
   <para>
@@ -261,10 +261,10 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
   <para>
    A transaction can also see its own statistics (as yet untransmitted to the
-   collector) in the views <structname>pg_stat_xact_all_tables</>,
-   <structname>pg_stat_xact_sys_tables</>,
-   <structname>pg_stat_xact_user_tables</>, and
-   <structname>pg_stat_xact_user_functions</>.  These numbers do not act as
+   collector) in the views <structname>pg_stat_xact_all_tables</structname>,
+   <structname>pg_stat_xact_sys_tables</structname>,
+   <structname>pg_stat_xact_user_tables</structname>, and
+   <structname>pg_stat_xact_user_functions</structname>.  These numbers do not act as
    stated above; instead they update continuously throughout the transaction.
   </para>
 
@@ -288,47 +288,47 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
       <entry>
        One row per server process, showing information related to
        the current activity of that process, such as state and current query.
-       See <xref linkend="pg-stat-activity-view"> for details.
+       See <xref linkend="pg-stat-activity-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_replication</><indexterm><primary>pg_stat_replication</primary></indexterm></entry>
+      <entry><structname>pg_stat_replication</structname><indexterm><primary>pg_stat_replication</primary></indexterm></entry>
       <entry>One row per WAL sender process, showing statistics about
        replication to that sender's connected standby server.
-       See <xref linkend="pg-stat-replication-view"> for details.
+       See <xref linkend="pg-stat-replication-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_wal_receiver</><indexterm><primary>pg_stat_wal_receiver</primary></indexterm></entry>
+      <entry><structname>pg_stat_wal_receiver</structname><indexterm><primary>pg_stat_wal_receiver</primary></indexterm></entry>
       <entry>Only one row, showing statistics about the WAL receiver from
        that receiver's connected server.
-       See <xref linkend="pg-stat-wal-receiver-view"> for details.
+       See <xref linkend="pg-stat-wal-receiver-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_subscription</><indexterm><primary>pg_stat_subscription</primary></indexterm></entry>
+      <entry><structname>pg_stat_subscription</structname><indexterm><primary>pg_stat_subscription</primary></indexterm></entry>
       <entry>At least one row per subscription, showing information about
        the subscription workers.
-       See <xref linkend="pg-stat-subscription"> for details.
+       See <xref linkend="pg-stat-subscription"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_ssl</><indexterm><primary>pg_stat_ssl</primary></indexterm></entry>
+      <entry><structname>pg_stat_ssl</structname><indexterm><primary>pg_stat_ssl</primary></indexterm></entry>
       <entry>One row per connection (regular and replication), showing information about
        SSL used on this connection.
-       See <xref linkend="pg-stat-ssl-view"> for details.
+       See <xref linkend="pg-stat-ssl-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_progress_vacuum</><indexterm><primary>pg_stat_progress_vacuum</primary></indexterm></entry>
+      <entry><structname>pg_stat_progress_vacuum</structname><indexterm><primary>pg_stat_progress_vacuum</primary></indexterm></entry>
       <entry>One row for each backend (including autovacuum worker processes) running
-       <command>VACUUM</>, showing current progress.
-       See <xref linkend='vacuum-progress-reporting'>.
+       <command>VACUUM</command>, showing current progress.
+       See <xref linkend='vacuum-progress-reporting'/>.
       </entry>
      </row>
 
@@ -349,178 +349,178 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
     <tbody>
      <row>
-      <entry><structname>pg_stat_archiver</><indexterm><primary>pg_stat_archiver</primary></indexterm></entry>
+      <entry><structname>pg_stat_archiver</structname><indexterm><primary>pg_stat_archiver</primary></indexterm></entry>
       <entry>One row only, showing statistics about the
        WAL archiver process's activity. See
-       <xref linkend="pg-stat-archiver-view"> for details.
+       <xref linkend="pg-stat-archiver-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_bgwriter</><indexterm><primary>pg_stat_bgwriter</primary></indexterm></entry>
+      <entry><structname>pg_stat_bgwriter</structname><indexterm><primary>pg_stat_bgwriter</primary></indexterm></entry>
       <entry>One row only, showing statistics about the
        background writer process's activity. See
-       <xref linkend="pg-stat-bgwriter-view"> for details.
+       <xref linkend="pg-stat-bgwriter-view"/> for details.
      </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_database</><indexterm><primary>pg_stat_database</primary></indexterm></entry>
+      <entry><structname>pg_stat_database</structname><indexterm><primary>pg_stat_database</primary></indexterm></entry>
       <entry>One row per database, showing database-wide statistics. See
-       <xref linkend="pg-stat-database-view"> for details.
+       <xref linkend="pg-stat-database-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_database_conflicts</><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
+      <entry><structname>pg_stat_database_conflicts</structname><indexterm><primary>pg_stat_database_conflicts</primary></indexterm></entry>
       <entry>
        One row per database, showing database-wide statistics about
        query cancels due to conflict with recovery on standby servers.
-       See <xref linkend="pg-stat-database-conflicts-view"> for details.
+       See <xref linkend="pg-stat-database-conflicts-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_all_tables</><indexterm><primary>pg_stat_all_tables</primary></indexterm></entry>
+      <entry><structname>pg_stat_all_tables</structname><indexterm><primary>pg_stat_all_tables</primary></indexterm></entry>
       <entry>
        One row for each table in the current database, showing statistics
        about accesses to that specific table.
-       See <xref linkend="pg-stat-all-tables-view"> for details.
+       See <xref linkend="pg-stat-all-tables-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_sys_tables</><indexterm><primary>pg_stat_sys_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_all_tables</>, except that only
+      <entry><structname>pg_stat_sys_tables</structname><indexterm><primary>pg_stat_sys_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_all_tables</structname>, except that only
       system tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_user_tables</><indexterm><primary>pg_stat_user_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_all_tables</>, except that only user
+      <entry><structname>pg_stat_user_tables</structname><indexterm><primary>pg_stat_user_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_all_tables</structname>, except that only user
       tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_xact_all_tables</><indexterm><primary>pg_stat_xact_all_tables</primary></indexterm></entry>
-      <entry>Similar to <structname>pg_stat_all_tables</>, but counts actions
-      taken so far within the current transaction (which are <emphasis>not</>
-      yet included in <structname>pg_stat_all_tables</> and related views).
+      <entry><structname>pg_stat_xact_all_tables</structname><indexterm><primary>pg_stat_xact_all_tables</primary></indexterm></entry>
+      <entry>Similar to <structname>pg_stat_all_tables</structname>, but counts actions
+      taken so far within the current transaction (which are <emphasis>not</emphasis>
+      yet included in <structname>pg_stat_all_tables</structname> and related views).
       The columns for numbers of live and dead rows and vacuum and
       analyze actions are not present in this view.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_xact_sys_tables</><indexterm><primary>pg_stat_xact_sys_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_xact_all_tables</>, except that only
+      <entry><structname>pg_stat_xact_sys_tables</structname><indexterm><primary>pg_stat_xact_sys_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_xact_all_tables</structname>, except that only
       system tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_xact_user_tables</><indexterm><primary>pg_stat_xact_user_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_xact_all_tables</>, except that only
+      <entry><structname>pg_stat_xact_user_tables</structname><indexterm><primary>pg_stat_xact_user_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_xact_all_tables</structname>, except that only
       user tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_all_indexes</><indexterm><primary>pg_stat_all_indexes</primary></indexterm></entry>
+      <entry><structname>pg_stat_all_indexes</structname><indexterm><primary>pg_stat_all_indexes</primary></indexterm></entry>
       <entry>
        One row for each index in the current database, showing statistics
        about accesses to that specific index.
-       See <xref linkend="pg-stat-all-indexes-view"> for details.
+       See <xref linkend="pg-stat-all-indexes-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_sys_indexes</><indexterm><primary>pg_stat_sys_indexes</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_all_indexes</>, except that only
+      <entry><structname>pg_stat_sys_indexes</structname><indexterm><primary>pg_stat_sys_indexes</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_all_indexes</structname>, except that only
       indexes on system tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_user_indexes</><indexterm><primary>pg_stat_user_indexes</primary></indexterm></entry>
-      <entry>Same as <structname>pg_stat_all_indexes</>, except that only
+      <entry><structname>pg_stat_user_indexes</structname><indexterm><primary>pg_stat_user_indexes</primary></indexterm></entry>
+      <entry>Same as <structname>pg_stat_all_indexes</structname>, except that only
       indexes on user tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_all_tables</><indexterm><primary>pg_statio_all_tables</primary></indexterm></entry>
+      <entry><structname>pg_statio_all_tables</structname><indexterm><primary>pg_statio_all_tables</primary></indexterm></entry>
       <entry>
        One row for each table in the current database, showing statistics
        about I/O on that specific table.
-       See <xref linkend="pg-statio-all-tables-view"> for details.
+       See <xref linkend="pg-statio-all-tables-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_sys_tables</><indexterm><primary>pg_statio_sys_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_tables</>, except that only
+      <entry><structname>pg_statio_sys_tables</structname><indexterm><primary>pg_statio_sys_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_tables</structname>, except that only
       system tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_user_tables</><indexterm><primary>pg_statio_user_tables</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_tables</>, except that only
+      <entry><structname>pg_statio_user_tables</structname><indexterm><primary>pg_statio_user_tables</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_tables</structname>, except that only
       user tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_all_indexes</><indexterm><primary>pg_statio_all_indexes</primary></indexterm></entry>
+      <entry><structname>pg_statio_all_indexes</structname><indexterm><primary>pg_statio_all_indexes</primary></indexterm></entry>
       <entry>
        One row for each index in the current database,
        showing statistics about I/O on that specific index.
-       See <xref linkend="pg-statio-all-indexes-view"> for details.
+       See <xref linkend="pg-statio-all-indexes-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_sys_indexes</><indexterm><primary>pg_statio_sys_indexes</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_indexes</>, except that only
+      <entry><structname>pg_statio_sys_indexes</structname><indexterm><primary>pg_statio_sys_indexes</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_indexes</structname>, except that only
       indexes on system tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_user_indexes</><indexterm><primary>pg_statio_user_indexes</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_indexes</>, except that only
+      <entry><structname>pg_statio_user_indexes</structname><indexterm><primary>pg_statio_user_indexes</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_indexes</structname>, except that only
       indexes on user tables are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_all_sequences</><indexterm><primary>pg_statio_all_sequences</primary></indexterm></entry>
+      <entry><structname>pg_statio_all_sequences</structname><indexterm><primary>pg_statio_all_sequences</primary></indexterm></entry>
      <entry>
        One row for each sequence in the current database,
        showing statistics about I/O on that specific sequence.
-       See <xref linkend="pg-statio-all-sequences-view"> for details.
+       See <xref linkend="pg-statio-all-sequences-view"/> for details.
      </entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_sys_sequences</><indexterm><primary>pg_statio_sys_sequences</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_sequences</>, except that only
+      <entry><structname>pg_statio_sys_sequences</structname><indexterm><primary>pg_statio_sys_sequences</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_sequences</structname>, except that only
       system sequences are shown.  (Presently, no system sequences are defined,
       so this view is always empty.)</entry>
      </row>
 
      <row>
-      <entry><structname>pg_statio_user_sequences</><indexterm><primary>pg_statio_user_sequences</primary></indexterm></entry>
-      <entry>Same as <structname>pg_statio_all_sequences</>, except that only
+      <entry><structname>pg_statio_user_sequences</structname><indexterm><primary>pg_statio_user_sequences</primary></indexterm></entry>
+      <entry>Same as <structname>pg_statio_all_sequences</structname>, except that only
       user sequences are shown.</entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_user_functions</><indexterm><primary>pg_stat_user_functions</primary></indexterm></entry>
+      <entry><structname>pg_stat_user_functions</structname><indexterm><primary>pg_stat_user_functions</primary></indexterm></entry>
       <entry>
        One row for each tracked function, showing statistics
        about executions of that function. See
-       <xref linkend="pg-stat-user-functions-view"> for details.
+       <xref linkend="pg-stat-user-functions-view"/> for details.
       </entry>
      </row>
 
      <row>
-      <entry><structname>pg_stat_xact_user_functions</><indexterm><primary>pg_stat_xact_user_functions</primary></indexterm></entry>
-      <entry>Similar to <structname>pg_stat_user_functions</>, but counts only
-      calls during the current transaction (which are <emphasis>not</>
-      yet included in <structname>pg_stat_user_functions</>).</entry>
+      <entry><structname>pg_stat_xact_user_functions</structname><indexterm><primary>pg_stat_xact_user_functions</primary></indexterm></entry>
+      <entry>Similar to <structname>pg_stat_user_functions</structname>, but counts only
+      calls during the current transaction (which are <emphasis>not</emphasis>
+      yet included in <structname>pg_stat_user_functions</structname>).</entry>
      </row>
 
     </tbody>
@@ -533,18 +533,18 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
   </para>
 
   <para>
-   The <structname>pg_statio_</> views are primarily useful to
+   The <structname>pg_statio_</structname> views are primarily useful to
    determine the effectiveness of the buffer cache.  When the number
    of actual disk reads is much smaller than the number of buffer
    hits, then the cache is satisfying most read requests without
    invoking a kernel call. However, these statistics do not give the
-   entire story: due to the way in which <productname>PostgreSQL</>
+   entire story: due to the way in which <productname>PostgreSQL</productname>
    handles disk I/O, data that is not in the
-   <productname>PostgreSQL</> buffer cache might still reside in the
+   <productname>PostgreSQL</productname> buffer cache might still reside in the
    kernel's I/O cache, and might therefore still be fetched without
    requiring a physical read. Users interested in obtaining more
-   detailed information on <productname>PostgreSQL</> I/O behavior are
-   advised to use the <productname>PostgreSQL</> statistics collector
+   detailed information on <productname>PostgreSQL</productname> I/O behavior are
+   advised to use the <productname>PostgreSQL</productname> statistics collector
    in combination with operating system utilities that allow insight
    into the kernel's handling of I/O.
   </para>
@@ -564,39 +564,39 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
    <tbody>
     <row>
-     <entry><structfield>datid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>datid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the database this backend is connected to</entry>
     </row>
     <row>
-     <entry><structfield>datname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>datname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the database this backend is connected to</entry>
     </row>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of this backend</entry>
     </row>
     <row>
-     <entry><structfield>usesysid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>usesysid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the user logged into this backend</entry>
     </row>
     <row>
-     <entry><structfield>usename</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>usename</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the user logged into this backend</entry>
     </row>
     <row>
-     <entry><structfield>application_name</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>application_name</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Name of the application that is connected
       to this backend</entry>
     </row>
     <row>
-     <entry><structfield>client_addr</></entry>
-     <entry><type>inet</></entry>
+     <entry><structfield>client_addr</structfield></entry>
+     <entry><type>inet</type></entry>
      <entry>IP address of the client connected to this backend.
       If this field is null, it indicates either that the client is
       connected via a Unix socket on the server machine or that this is an
@@ -604,78 +604,78 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
      </entry>
     </row>
     <row>
-     <entry><structfield>client_hostname</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>client_hostname</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Host name of the connected client, as reported by a
-      reverse DNS lookup of <structfield>client_addr</>. This field will
+      reverse DNS lookup of <structfield>client_addr</structfield>. This field will
       only be non-null for IP connections, and only when <xref
-      linkend="guc-log-hostname"> is enabled.
+      linkend="guc-log-hostname"/> is enabled.
      </entry>
     </row>
     <row>
-     <entry><structfield>client_port</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>client_port</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>TCP port number that the client is using for communication
-      with this backend, or <literal>-1</> if a Unix socket is used
+      with this backend, or <literal>-1</literal> if a Unix socket is used
      </entry>
     </row>
     <row>
-     <entry><structfield>backend_start</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>backend_start</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time when this process was started.  For client backends,
       this is the time the client connected to the server.
      </entry>
     </row>
     <row>
-     <entry><structfield>xact_start</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>xact_start</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time when this process' current transaction was started, or null
       if no transaction is active. If the current
       query is the first of its transaction, this column is equal to the
-      <structfield>query_start</> column.
+      <structfield>query_start</structfield> column.
      </entry>
     </row>
     <row>
-     <entry><structfield>query_start</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>query_start</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time when the currently active query was started, or if
-      <structfield>state</> is not <literal>active</>, when the last query
+      <structfield>state</structfield> is not <literal>active</literal>, when the last query
       was started
      </entry>
     </row>
     <row>
-     <entry><structfield>state_change</></entry>
-     <entry><type>timestamp with time zone</></entry>
-     <entry>Time when the <structfield>state</> was last changed</entry>
+     <entry><structfield>state_change</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
+     <entry>Time when the <structfield>state</structfield> was last changed</entry>
     </row>
      <row>
-      <entry><structfield>wait_event_type</></entry>
-      <entry><type>text</></entry>
+      <entry><structfield>wait_event_type</structfield></entry>
+      <entry><type>text</type></entry>
       <entry>The type of event for which the backend is waiting, if any;
        otherwise NULL. Possible values are:
        <itemizedlist>
         <listitem>
          <para>
-          <literal>LWLock</>: The backend is waiting for a lightweight lock.
+          <literal>LWLock</literal>: The backend is waiting for a lightweight lock.
           Each such lock protects a particular data structure in shared memory.
-          <literal>wait_event</> will contain a name identifying the purpose
+          <literal>wait_event</literal> will contain a name identifying the purpose
           of the lightweight lock.  (Some locks have specific names; others
           are part of a group of locks each with a similar purpose.)
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>Lock</>: The backend is waiting for a heavyweight lock.
+          <literal>Lock</literal>: The backend is waiting for a heavyweight lock.
           Heavyweight locks, also known as lock manager locks or simply locks,
           primarily protect SQL-visible objects such as tables.  However,
           they are also used to ensure mutual exclusion for certain internal
-          operations such as relation extension.  <literal>wait_event</> will
+          operations such as relation extension.  <literal>wait_event</literal> will
           identify the type of lock awaited.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>BufferPin</>: The server process is waiting to access to
+          <literal>BufferPin</literal>: The server process is waiting to access to
           a data buffer during a period when no other process can be
           examining that buffer.  Buffer pin waits can be protracted if
           another process holds an open cursor which last read data from the
@@ -684,95 +684,95 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
         </listitem>
         <listitem>
          <para>
-          <literal>Activity</>: The server process is idle.  This is used by
+          <literal>Activity</literal>: The server process is idle.  This is used by
           system processes waiting for activity in their main processing loop.
-          <literal>wait_event</> will identify the specific wait point.
+          <literal>wait_event</literal> will identify the specific wait point.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>Extension</>: The server process is waiting for activity
+          <literal>Extension</literal>: The server process is waiting for activity
           in an extension module.  This category is useful for modules to
           track custom waiting points.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>Client</>: The server process is waiting for some activity
+          <literal>Client</literal>: The server process is waiting for some activity
           on a socket from user applications, and that the server expects
           something to happen that is independent from its internal processes.
-          <literal>wait_event</> will identify the specific wait point.
+          <literal>wait_event</literal> will identify the specific wait point.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>IPC</>: The server process is waiting for some activity
-          from another process in the server.  <literal>wait_event</> will
+          <literal>IPC</literal>: The server process is waiting for some activity
+          from another process in the server.  <literal>wait_event</literal> will
           identify the specific wait point.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>Timeout</>: The server process is waiting for a timeout
-          to expire.  <literal>wait_event</> will identify the specific wait
+          <literal>Timeout</literal>: The server process is waiting for a timeout
+          to expire.  <literal>wait_event</literal> will identify the specific wait
           point.
          </para>
         </listitem>
         <listitem>
          <para>
-          <literal>IO</>: The server process is waiting for a IO to complete.
-          <literal>wait_event</> will identify the specific wait point.
+          <literal>IO</literal>: The server process is waiting for a IO to complete.
+          <literal>wait_event</literal> will identify the specific wait point.
          </para>
         </listitem>
        </itemizedlist>
       </entry>
      </row>
     <row>
-     <entry><structfield>wait_event</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>wait_event</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Wait event name if backend is currently waiting, otherwise NULL.
-     See <xref linkend="wait-event-table"> for details.
+     See <xref linkend="wait-event-table"/> for details.
      </entry>
     </row>
     <row>
-     <entry><structfield>state</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>state</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Current overall state of this backend.
        Possible values are:
        <itemizedlist>
          <listitem>
           <para>
-           <literal>active</>: The backend is executing a query.
+           <literal>active</literal>: The backend is executing a query.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>idle</>: The backend is waiting for a new client command.
+           <literal>idle</literal>: The backend is waiting for a new client command.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>idle in transaction</>: The backend is in a transaction,
+           <literal>idle in transaction</literal>: The backend is in a transaction,
            but is not currently executing a query.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>idle in transaction (aborted)</>: This state is similar to
-           <literal>idle in transaction</>, except one of the statements in
+           <literal>idle in transaction (aborted)</literal>: This state is similar to
+           <literal>idle in transaction</literal>, except one of the statements in
            the transaction caused an error.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>fastpath function call</>: The backend is executing a
+           <literal>fastpath function call</literal>: The backend is executing a
            fast-path function.
           </para>
          </listitem>
          <listitem>
            <para>
-           <literal>disabled</>: This state is reported if <xref
-           linkend="guc-track-activities"> is disabled in this backend.
+           <literal>disabled</literal>: This state is reported if <xref
+           linkend="guc-track-activities"/> is disabled in this backend.
           </para>
          </listitem>
        </itemizedlist>
@@ -786,28 +786,28 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
     <row>
      <entry><structfield>backend_xmin</structfield></entry>
      <entry><type>xid</type></entry>
-     <entry>The current backend's <literal>xmin</> horizon.</entry>
+     <entry>The current backend's <literal>xmin</literal> horizon.</entry>
     </row>
     <row>
-     <entry><structfield>query</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>query</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Text of this backend's most recent query. If
-      <structfield>state</> is <literal>active</> this field shows the
+      <structfield>state</structfield> is <literal>active</literal> this field shows the
       currently executing query. In all other states, it shows the last query
       that was executed. By default the query text is truncated at 1024
       characters; this value can be changed via the parameter
-      <xref linkend="guc-track-activity-query-size">.
+      <xref linkend="guc-track-activity-query-size"/>.
      </entry>
     </row>
     <row>
      <entry><structfield>backend_type</structfield></entry>
      <entry><type>text</type></entry>
      <entry>Type of current backend. Possible types are
-      <literal>autovacuum launcher</>, <literal>autovacuum worker</>,
-      <literal>background worker</>, <literal>background writer</>,
-      <literal>client backend</>, <literal>checkpointer</>,
-      <literal>startup</>, <literal>walreceiver</>,
-      <literal>walsender</> and <literal>walwriter</>.
+      <literal>autovacuum launcher</literal>, <literal>autovacuum worker</literal>,
+      <literal>background worker</literal>, <literal>background writer</literal>,
+      <literal>client backend</literal>, <literal>checkpointer</literal>,
+      <literal>startup</literal>, <literal>walreceiver</literal>,
+      <literal>walsender</literal> and <literal>walwriter</literal>.
      </entry>
     </row>
    </tbody>
@@ -822,10 +822,10 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
   <note>
    <para>
-    The <structfield>wait_event</> and <structfield>state</> columns are
-    independent.  If a backend is in the <literal>active</> state,
-    it may or may not be <literal>waiting</> on some event.  If the state
-    is <literal>active</> and <structfield>wait_event</> is non-null, it
+    The <structfield>wait_event</structfield> and <structfield>state</structfield> columns are
+    independent.  If a backend is in the <literal>active</literal> state,
+    it may or may not be <literal>waiting</literal> on some event.  If the state
+    is <literal>active</literal> and <structfield>wait_event</structfield> is non-null, it
     means that a query is being executed, but is being blocked somewhere
     in the system.
    </para>
@@ -845,755 +845,836 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
 
       <tbody>
        <row>
-        <entry morerows="60"><literal>LWLock</></entry>
-        <entry><literal>ShmemIndexLock</></entry>
+        <entry morerows="63"><literal>LWLock</literal></entry>
+        <entry><literal>ShmemIndexLock</literal></entry>
         <entry>Waiting to find or allocate space in shared memory.</entry>
        </row>
        <row>
-        <entry><literal>OidGenLock</></entry>
+        <entry><literal>OidGenLock</literal></entry>
         <entry>Waiting to allocate or assign an OID.</entry>
        </row>
         <row>
-         <entry><literal>XidGenLock</></entry>
+         <entry><literal>XidGenLock</literal></entry>
          <entry>Waiting to allocate or assign a transaction id.</entry>
         </row>
         <row>
-         <entry><literal>ProcArrayLock</></entry>
+         <entry><literal>ProcArrayLock</literal></entry>
          <entry>Waiting to get a snapshot or clearing a transaction id at
          transaction end.</entry>
         </row>
         <row>
-         <entry><literal>SInvalReadLock</></entry>
+         <entry><literal>SInvalReadLock</literal></entry>
          <entry>Waiting to retrieve or remove messages from shared invalidation
          queue.</entry>
         </row>
         <row>
-         <entry><literal>SInvalWriteLock</></entry>
+         <entry><literal>SInvalWriteLock</literal></entry>
          <entry>Waiting to add a message in shared invalidation queue.</entry>
         </row>
         <row>
-         <entry><literal>WALBufMappingLock</></entry>
+         <entry><literal>WALBufMappingLock</literal></entry>
          <entry>Waiting to replace a page in WAL buffers.</entry>
         </row>
         <row>
-         <entry><literal>WALWriteLock</></entry>
+         <entry><literal>WALWriteLock</literal></entry>
          <entry>Waiting for WAL buffers to be written to disk.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileLock</></entry>
+         <entry><literal>ControlFileLock</literal></entry>
          <entry>Waiting to read or update the control file or creation of a
          new WAL file.</entry>
         </row>
         <row>
-         <entry><literal>CheckpointLock</></entry>
+         <entry><literal>CheckpointLock</literal></entry>
          <entry>Waiting to perform checkpoint.</entry>
         </row>
         <row>
-         <entry><literal>CLogControlLock</></entry>
+         <entry><literal>CLogControlLock</literal></entry>
          <entry>Waiting to read or update transaction status.</entry>
         </row>
         <row>
-         <entry><literal>SubtransControlLock</></entry>
+         <entry><literal>SubtransControlLock</literal></entry>
          <entry>Waiting to read or update sub-transaction information.</entry>
         </row>
         <row>
-         <entry><literal>MultiXactGenLock</></entry>
+         <entry><literal>MultiXactGenLock</literal></entry>
          <entry>Waiting to read or update shared multixact state.</entry>
         </row>
         <row>
-         <entry><literal>MultiXactOffsetControlLock</></entry>
+         <entry><literal>MultiXactOffsetControlLock</literal></entry>
          <entry>Waiting to read or update multixact offset mappings.</entry>
         </row>
         <row>
-         <entry><literal>MultiXactMemberControlLock</></entry>
+         <entry><literal>MultiXactMemberControlLock</literal></entry>
          <entry>Waiting to read or update multixact member mappings.</entry>
         </row>
         <row>
-         <entry><literal>RelCacheInitLock</></entry>
+         <entry><literal>RelCacheInitLock</literal></entry>
          <entry>Waiting to read or write relation cache initialization
          file.</entry>
         </row>
         <row>
-         <entry><literal>CheckpointerCommLock</></entry>
+         <entry><literal>CheckpointerCommLock</literal></entry>
          <entry>Waiting to manage fsync requests.</entry>
         </row>
         <row>
-         <entry><literal>TwoPhaseStateLock</></entry>
+         <entry><literal>TwoPhaseStateLock</literal></entry>
          <entry>Waiting to read or update the state of prepared transactions.</entry>
         </row>
         <row>
-         <entry><literal>TablespaceCreateLock</></entry>
+         <entry><literal>TablespaceCreateLock</literal></entry>
          <entry>Waiting to create or drop the tablespace.</entry>
         </row>
         <row>
-         <entry><literal>BtreeVacuumLock</></entry>
+         <entry><literal>BtreeVacuumLock</literal></entry>
           <entry>Waiting to read or update vacuum-related information for a
           B-tree index.</entry>
         </row>
         <row>
-         <entry><literal>AddinShmemInitLock</></entry>
+         <entry><literal>AddinShmemInitLock</literal></entry>
          <entry>Waiting to manage space allocation in shared memory.</entry>
         </row>
         <row>
-         <entry><literal>AutovacuumLock</></entry>
+         <entry><literal>AutovacuumLock</literal></entry>
          <entry>Autovacuum worker or launcher waiting to update or
          read the current state of autovacuum workers.</entry>
         </row>
         <row>
-         <entry><literal>AutovacuumScheduleLock</></entry>
+         <entry><literal>AutovacuumScheduleLock</literal></entry>
          <entry>Waiting to ensure that the table it has selected for a vacuum
          still needs vacuuming.
          </entry>
         </row>
         <row>
-         <entry><literal>SyncScanLock</></entry>
+         <entry><literal>SyncScanLock</literal></entry>
          <entry>Waiting to get the start location of a scan on a table for
          synchronized scans.</entry>
         </row>
         <row>
-         <entry><literal>RelationMappingLock</></entry>
+         <entry><literal>RelationMappingLock</literal></entry>
          <entry>Waiting to update the relation map file used to store catalog
          to filenode mapping.
          </entry>
         </row>
         <row>
-         <entry><literal>AsyncCtlLock</></entry>
+         <entry><literal>AsyncCtlLock</literal></entry>
          <entry>Waiting to read or update shared notification state.</entry>
         </row>
         <row>
-         <entry><literal>AsyncQueueLock</></entry>
+         <entry><literal>AsyncQueueLock</literal></entry>
           <entry>Waiting to read or update notification messages.</entry>
         </row>
         <row>
-         <entry><literal>SerializableXactHashLock</></entry>
+         <entry><literal>SerializableXactHashLock</literal></entry>
          <entry>Waiting to retrieve or store information about serializable
          transactions.</entry>
         </row>
         <row>
-         <entry><literal>SerializableFinishedListLock</></entry>
+         <entry><literal>SerializableFinishedListLock</literal></entry>
          <entry>Waiting to access the list of finished serializable
          transactions.</entry>
         </row>
         <row>
-         <entry><literal>SerializablePredicateLockListLock</></entry>
+         <entry><literal>SerializablePredicateLockListLock</literal></entry>
          <entry>Waiting to perform an operation on a list of locks held by
          serializable transactions.</entry>
         </row>
         <row>
-         <entry><literal>OldSerXidLock</></entry>
+         <entry><literal>OldSerXidLock</literal></entry>
          <entry>Waiting to read or record conflicting serializable
          transactions.</entry>
         </row>
         <row>
-         <entry><literal>SyncRepLock</></entry>
+         <entry><literal>SyncRepLock</literal></entry>
          <entry>Waiting to read or update information about synchronous
          replicas.</entry>
         </row>
         <row>
-         <entry><literal>BackgroundWorkerLock</></entry>
+         <entry><literal>BackgroundWorkerLock</literal></entry>
          <entry>Waiting to read or update background worker state.</entry>
         </row>
         <row>
-         <entry><literal>DynamicSharedMemoryControlLock</></entry>
+         <entry><literal>DynamicSharedMemoryControlLock</literal></entry>
          <entry>Waiting to read or update dynamic shared memory state.</entry>
         </row>
         <row>
-         <entry><literal>AutoFileLock</></entry>
-         <entry>Waiting to update the <filename>postgresql.auto.conf</> file.</entry>
+         <entry><literal>AutoFileLock</literal></entry>
+         <entry>Waiting to update the <filename>postgresql.auto.conf</filename> file.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotAllocationLock</></entry>
+         <entry><literal>ReplicationSlotAllocationLock</literal></entry>
          <entry>Waiting to allocate or free a replication slot.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotControlLock</></entry>
+         <entry><literal>ReplicationSlotControlLock</literal></entry>
          <entry>Waiting to read or update replication slot state.</entry>
         </row>
         <row>
-         <entry><literal>CommitTsControlLock</></entry>
+         <entry><literal>CommitTsControlLock</literal></entry>
          <entry>Waiting to read or update transaction commit timestamps.</entry>
         </row>
         <row>
-         <entry><literal>CommitTsLock</></entry>
+         <entry><literal>CommitTsLock</literal></entry>
          <entry>Waiting to read or update the last value set for the
          transaction timestamp.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationOriginLock</></entry>
+         <entry><literal>ReplicationOriginLock</literal></entry>
          <entry>Waiting to setup, drop or use replication origin.</entry>
         </row>
         <row>
-         <entry><literal>MultiXactTruncationLock</></entry>
+         <entry><literal>MultiXactTruncationLock</literal></entry>
          <entry>Waiting to read or truncate multixact information.</entry>
         </row>
         <row>
-         <entry><literal>OldSnapshotTimeMapLock</></entry>
+         <entry><literal>OldSnapshotTimeMapLock</literal></entry>
          <entry>Waiting to read or update old snapshot control information.</entry>
         </row>
         <row>
-         <entry><literal>CLogTruncationLock</></entry>
+         <entry><literal>BackendRandomLock</literal></entry>
+         <entry>Waiting to generate a random number.</entry>
+        </row>
+        <row>
+         <entry><literal>LogicalRepWorkerLock</literal></entry>
+         <entry>Waiting for action on logical replication worker to finish.</entry>
+        </row>
+        <row>
+         <entry><literal>CLogTruncationLock</literal></entry>
          <entry>Waiting to truncate the write-ahead log or waiting for write-ahead log truncation to finish.</entry>
         </row>
         <row>
-         <entry><literal>clog</></entry>
+         <entry><literal>clog</literal></entry>
          <entry>Waiting for I/O on a clog (transaction status) buffer.</entry>
         </row>
         <row>
-         <entry><literal>commit_timestamp</></entry>
+         <entry><literal>commit_timestamp</literal></entry>
          <entry>Waiting for I/O on commit timestamp buffer.</entry>
         </row>
         <row>
-         <entry><literal>subtrans</></entry>
+         <entry><literal>subtrans</literal></entry>
          <entry>Waiting for I/O a subtransaction buffer.</entry>
         </row>
         <row>
-         <entry><literal>multixact_offset</></entry>
+         <entry><literal>multixact_offset</literal></entry>
          <entry>Waiting for I/O on a multixact offset buffer.</entry>
         </row>
         <row>
-         <entry><literal>multixact_member</></entry>
+         <entry><literal>multixact_member</literal></entry>
          <entry>Waiting for I/O on a multixact_member buffer.</entry>
         </row>
         <row>
-         <entry><literal>async</></entry>
+         <entry><literal>async</literal></entry>
          <entry>Waiting for I/O on an async (notify) buffer.</entry>
         </row>
         <row>
-         <entry><literal>oldserxid</></entry>
-         <entry>Waiting to I/O on an oldserxid buffer.</entry>
+         <entry><literal>oldserxid</literal></entry>
+         <entry>Waiting for I/O on an oldserxid buffer.</entry>
         </row>
         <row>
-         <entry><literal>wal_insert</></entry>
+         <entry><literal>wal_insert</literal></entry>
          <entry>Waiting to insert WAL into a memory buffer.</entry>
         </row>
         <row>
-         <entry><literal>buffer_content</></entry>
+         <entry><literal>buffer_content</literal></entry>
          <entry>Waiting to read or write a data page in memory.</entry>
         </row>
         <row>
-         <entry><literal>buffer_io</></entry>
+         <entry><literal>buffer_io</literal></entry>
          <entry>Waiting for I/O on a data page.</entry>
         </row>
         <row>
-         <entry><literal>replication_origin</></entry>
+         <entry><literal>replication_origin</literal></entry>
          <entry>Waiting to read or update the replication progress.</entry>
         </row>
         <row>
-         <entry><literal>replication_slot_io</></entry>
+         <entry><literal>replication_slot_io</literal></entry>
          <entry>Waiting for I/O on a replication slot.</entry>
         </row>
         <row>
-         <entry><literal>proc</></entry>
+         <entry><literal>proc</literal></entry>
          <entry>Waiting to read or update the fast-path lock information.</entry>
         </row>
         <row>
-         <entry><literal>buffer_mapping</></entry>
+         <entry><literal>buffer_mapping</literal></entry>
          <entry>Waiting to associate a data block with a buffer in the buffer
          pool.</entry>
         </row>
         <row>
-         <entry><literal>lock_manager</></entry>
+         <entry><literal>lock_manager</literal></entry>
          <entry>Waiting to add or examine locks for backends, or waiting to
          join or exit a locking group (used by parallel query).</entry>
         </row>
         <row>
-         <entry><literal>predicate_lock_manager</></entry>
+         <entry><literal>predicate_lock_manager</literal></entry>
          <entry>Waiting to add or examine predicate lock information.</entry>
         </row>
         <row>
-         <entry><literal>parallel_query_dsa</></entry>
+         <entry><literal>parallel_query_dsa</literal></entry>
          <entry>Waiting for parallel query dynamic shared memory allocation lock.</entry>
         </row>
         <row>
-         <entry><literal>tbm</></entry>
+         <entry><literal>tbm</literal></entry>
          <entry>Waiting for TBM shared iterator lock.</entry>
         </row>
         <row>
-         <entry morerows="9"><literal>Lock</></entry>
-         <entry><literal>relation</></entry>
+         <entry><literal>parallel_append</literal></entry>
+         <entry>Waiting to choose the next subplan during Parallel Append plan
+         execution.</entry>
+        </row>
+        <row>
+         <entry morerows="9"><literal>Lock</literal></entry>
+         <entry><literal>relation</literal></entry>
          <entry>Waiting to acquire a lock on a relation.</entry>
         </row>
         <row>
-         <entry><literal>extend</></entry>
+         <entry><literal>extend</literal></entry>
          <entry>Waiting to extend a relation.</entry>
         </row>
         <row>
-         <entry><literal>page</></entry>
+         <entry><literal>page</literal></entry>
          <entry>Waiting to acquire a lock on page of a relation.</entry>
         </row>
         <row>
-         <entry><literal>tuple</></entry>
+         <entry><literal>tuple</literal></entry>
          <entry>Waiting to acquire a lock on a tuple.</entry>
         </row>
         <row>
-         <entry><literal>transactionid</></entry>
+         <entry><literal>transactionid</literal></entry>
          <entry>Waiting for a transaction to finish.</entry>
         </row>
         <row>
-         <entry><literal>virtualxid</></entry>
+         <entry><literal>virtualxid</literal></entry>
          <entry>Waiting to acquire a virtual xid lock.</entry>
         </row>
         <row>
-         <entry><literal>speculative token</></entry>
+         <entry><literal>speculative token</literal></entry>
          <entry>Waiting to acquire a speculative insertion lock.</entry>
         </row>
         <row>
-         <entry><literal>object</></entry>
+         <entry><literal>object</literal></entry>
          <entry>Waiting to acquire a lock on a non-relation database object.</entry>
         </row>
         <row>
-         <entry><literal>userlock</></entry>
+         <entry><literal>userlock</literal></entry>
          <entry>Waiting to acquire a user lock.</entry>
         </row>
         <row>
-         <entry><literal>advisory</></entry>
+         <entry><literal>advisory</literal></entry>
          <entry>Waiting to acquire an advisory user lock.</entry>
         </row>
         <row>
-         <entry><literal>BufferPin</></entry>
-         <entry><literal>BufferPin</></entry>
+         <entry><literal>BufferPin</literal></entry>
+         <entry><literal>BufferPin</literal></entry>
          <entry>Waiting to acquire a pin on a buffer.</entry>
         </row>
         <row>
-         <entry morerows="13"><literal>Activity</></entry>
-         <entry><literal>ArchiverMain</></entry>
+         <entry morerows="13"><literal>Activity</literal></entry>
+         <entry><literal>ArchiverMain</literal></entry>
          <entry>Waiting in main loop of the archiver process.</entry>
         </row>
         <row>
-         <entry><literal>AutoVacuumMain</></entry>
+         <entry><literal>AutoVacuumMain</literal></entry>
          <entry>Waiting in main loop of autovacuum launcher process.</entry>
         </row>
         <row>
-         <entry><literal>BgWriterHibernate</></entry>
+         <entry><literal>BgWriterHibernate</literal></entry>
          <entry>Waiting in background writer process, hibernating.</entry>
         </row>
         <row>
-         <entry><literal>BgWriterMain</></entry>
+         <entry><literal>BgWriterMain</literal></entry>
          <entry>Waiting in main loop of background writer process background worker.</entry>
         </row>
         <row>
-         <entry><literal>CheckpointerMain</></entry>
+         <entry><literal>CheckpointerMain</literal></entry>
          <entry>Waiting in main loop of checkpointer process.</entry>
         </row>
         <row>
-         <entry><literal>LogicalLauncherMain</></entry>
+         <entry><literal>LogicalLauncherMain</literal></entry>
          <entry>Waiting in main loop of logical launcher process.</entry>
         </row>
         <row>
-         <entry><literal>LogicalApplyMain</></entry>
+         <entry><literal>LogicalApplyMain</literal></entry>
          <entry>Waiting in main loop of logical apply process.</entry>
         </row>
         <row>
-         <entry><literal>PgStatMain</></entry>
+         <entry><literal>PgStatMain</literal></entry>
          <entry>Waiting in main loop of the statistics collector process.</entry>
         </row>
         <row>
-         <entry><literal>RecoveryWalAll</></entry>
+         <entry><literal>RecoveryWalAll</literal></entry>
          <entry>Waiting for WAL from any kind of source (local, archive or stream) at recovery.</entry>
         </row>
         <row>
-         <entry><literal>RecoveryWalStream</></entry>
+         <entry><literal>RecoveryWalStream</literal></entry>
          <entry>Waiting for WAL from a stream at recovery.</entry>
         </row>
         <row>
-         <entry><literal>SysLoggerMain</></entry>
+         <entry><literal>SysLoggerMain</literal></entry>
          <entry>Waiting in main loop of syslogger process.</entry>
         </row>
         <row>
-         <entry><literal>WalReceiverMain</></entry>
+         <entry><literal>WalReceiverMain</literal></entry>
          <entry>Waiting in main loop of WAL receiver process.</entry>
         </row>
         <row>
-         <entry><literal>WalSenderMain</></entry>
+         <entry><literal>WalSenderMain</literal></entry>
          <entry>Waiting in main loop of WAL sender process.</entry>
         </row>
         <row>
-         <entry><literal>WalWriterMain</></entry>
+         <entry><literal>WalWriterMain</literal></entry>
          <entry>Waiting in main loop of WAL writer process.</entry>
         </row>
         <row>
-         <entry morerows="7"><literal>Client</></entry>
-         <entry><literal>ClientRead</></entry>
+         <entry morerows="7"><literal>Client</literal></entry>
+         <entry><literal>ClientRead</literal></entry>
          <entry>Waiting to read data from the client.</entry>
         </row>
         <row>
-         <entry><literal>ClientWrite</></entry>
+         <entry><literal>ClientWrite</literal></entry>
          <entry>Waiting to write data from the client.</entry>
         </row>
         <row>
-         <entry><literal>LibPQWalReceiverConnect</></entry>
+         <entry><literal>LibPQWalReceiverConnect</literal></entry>
          <entry>Waiting in WAL receiver to establish connection to remote server.</entry>
         </row>
         <row>
-         <entry><literal>LibPQWalReceiverReceive</></entry>
+         <entry><literal>LibPQWalReceiverReceive</literal></entry>
          <entry>Waiting in WAL receiver to receive data from remote server.</entry>
         </row>
         <row>
-         <entry><literal>SSLOpenServer</></entry>
+         <entry><literal>SSLOpenServer</literal></entry>
          <entry>Waiting for SSL while attempting connection.</entry>
         </row>
         <row>
-         <entry><literal>WalReceiverWaitStart</></entry>
+         <entry><literal>WalReceiverWaitStart</literal></entry>
          <entry>Waiting for startup process to send initial data for streaming replication.</entry>
         </row>
         <row>
-         <entry><literal>WalSenderWaitForWAL</></entry>
+         <entry><literal>WalSenderWaitForWAL</literal></entry>
          <entry>Waiting for WAL to be flushed in WAL sender process.</entry>
         </row>
         <row>
-         <entry><literal>WalSenderWriteData</></entry>
+         <entry><literal>WalSenderWriteData</literal></entry>
          <entry>Waiting for any activity when processing replies from WAL receiver in WAL sender process.</entry>
         </row>
         <row>
-         <entry><literal>Extension</></entry>
-         <entry><literal>Extension</></entry>
+         <entry><literal>Extension</literal></entry>
+         <entry><literal>Extension</literal></entry>
          <entry>Waiting in an extension.</entry>
         </row>
         <row>
-         <entry morerows="16"><literal>IPC</></entry>
-         <entry><literal>BgWorkerShutdown</></entry>
+         <entry morerows="33"><literal>IPC</literal></entry>
+         <entry><literal>BgWorkerShutdown</literal></entry>
          <entry>Waiting for background worker to shut down.</entry>
         </row>
         <row>
-         <entry><literal>BgWorkerStartup</></entry>
+         <entry><literal>BgWorkerStartup</literal></entry>
          <entry>Waiting for background worker to start up.</entry>
         </row>
         <row>
-         <entry><literal>BtreePage</></entry>
+         <entry><literal>BtreePage</literal></entry>
          <entry>Waiting for the page number needed to continue a parallel B-tree scan to become available.</entry>
         </row>
         <row>
-         <entry><literal>ExecuteGather</></entry>
-         <entry>Waiting for activity from child process when executing <literal>Gather</> node.</entry>
+         <entry><literal>ExecuteGather</literal></entry>
+         <entry>Waiting for activity from child process when executing <literal>Gather</literal> node.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Batch/Allocating</literal></entry>
+          <entry>Waiting for an elected Parallel Hash participant to allocate a hash table.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Batch/Electing</literal></entry>
+          <entry>Electing a Parallel Hash participant to allocate a hash table.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Batch/Loading</literal></entry>
+          <entry>Waiting for other Parallel Hash participants to finish loading a hash table.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Build/Allocating</literal></entry>
+          <entry>Waiting for an elected Parallel Hash participant to allocate the initial hash table.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Build/Electing</literal></entry>
+          <entry>Electing a Parallel Hash participant to allocate the initial hash table.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Build/HashingInner</literal></entry>
+          <entry>Waiting for other Parallel Hash participants to finish hashing the inner relation.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/Build/HashingOuter</literal></entry>
+          <entry>Waiting for other Parallel Hash participants to finish partitioning the outer relation.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBatches/Allocating</literal></entry>
+          <entry>Waiting for an elected Parallel Hash participant to allocate more batches.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBatches/Deciding</literal></entry>
+          <entry>Electing a Parallel Hash participant to decide on future batch growth.</entry>
         </row>
         <row>
-         <entry><literal>LogicalSyncData</></entry>
+          <entry><literal>Hash/GrowBatches/Electing</literal></entry>
+          <entry>Electing a Parallel Hash participant to allocate more batches.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBatches/Finishing</literal></entry>
+          <entry>Waiting for an elected Parallel Hash participant to decide on future batch growth.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBatches/Repartitioning</literal></entry>
+          <entry>Waiting for other Parallel Hash participants to finishing repartitioning.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBuckets/Allocating</literal></entry>
+          <entry>Waiting for an elected Parallel Hash participant to finish allocating more buckets.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBuckets/Electing</literal></entry>
+          <entry>Electing a Parallel Hash participant to allocate more buckets.</entry>
+        </row>
+        <row>
+          <entry><literal>Hash/GrowBuckets/Reinserting</literal></entry>
+          <entry>Waiting for other Parallel Hash participants to finish inserting tuples into new buckets.</entry>
+        </row>
+        <row>
+         <entry><literal>LogicalSyncData</literal></entry>
          <entry>Waiting for logical replication remote server to send data for initial table synchronization.</entry>
         </row>
         <row>
-         <entry><literal>LogicalSyncStateChange</></entry>
+         <entry><literal>LogicalSyncStateChange</literal></entry>
          <entry>Waiting for logical replication remote server to change state.</entry>
         </row>
         <row>
-         <entry><literal>MessageQueueInternal</></entry>
+         <entry><literal>MessageQueueInternal</literal></entry>
          <entry>Waiting for other process to be attached in shared message queue.</entry>
         </row>
         <row>
-         <entry><literal>MessageQueuePutMessage</></entry>
+         <entry><literal>MessageQueuePutMessage</literal></entry>
          <entry>Waiting to write a protocol message to a shared message queue.</entry>
         </row>
         <row>
-         <entry><literal>MessageQueueReceive</></entry>
+         <entry><literal>MessageQueueReceive</literal></entry>
          <entry>Waiting to receive bytes from a shared message queue.</entry>
         </row>
         <row>
-         <entry><literal>MessageQueueSend</></entry>
+         <entry><literal>MessageQueueSend</literal></entry>
          <entry>Waiting to send bytes to a shared message queue.</entry>
         </row>
         <row>
-         <entry><literal>ParallelFinish</></entry>
+         <entry><literal>ParallelFinish</literal></entry>
          <entry>Waiting for parallel workers to finish computing.</entry>
         </row>
         <row>
-         <entry><literal>ParallelBitmapScan</></entry>
+         <entry><literal>ParallelBitmapScan</literal></entry>
          <entry>Waiting for parallel bitmap scan to become initialized.</entry>
         </row>
         <row>
-         <entry><literal>ProcArrayGroupUpdate</></entry>
+         <entry><literal>ParallelCreateIndexScan</literal></entry>
+         <entry>Waiting for parallel <command>CREATE INDEX</command> workers to finish heap scan.</entry>
+        </row>
+        <row>
+         <entry><literal>ProcArrayGroupUpdate</literal></entry>
          <entry>Waiting for group leader to clear transaction id at transaction end.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationOriginDrop</></entry>
+         <entry><literal>ClogGroupUpdate</literal></entry>
+         <entry>Waiting for group leader to update transaction status at transaction end.</entry>
+        </row>
+        <row>
+         <entry><literal>ReplicationOriginDrop</literal></entry>
          <entry>Waiting for a replication origin to become inactive to be dropped.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotDrop</></entry>
+         <entry><literal>ReplicationSlotDrop</literal></entry>
          <entry>Waiting for a replication slot to become inactive to be dropped.</entry>
         </row>
         <row>
-         <entry><literal>SafeSnapshot</></entry>
-         <entry>Waiting for a snapshot for a <literal>READ ONLY DEFERRABLE</> transaction.</entry>
+         <entry><literal>SafeSnapshot</literal></entry>
+         <entry>Waiting for a snapshot for a <literal>READ ONLY DEFERRABLE</literal> transaction.</entry>
         </row>
         <row>
-         <entry><literal>SyncRep</></entry>
+         <entry><literal>SyncRep</literal></entry>
          <entry>Waiting for confirmation from remote server during synchronous replication.</entry>
         </row>
         <row>
-         <entry morerows="2"><literal>Timeout</></entry>
-         <entry><literal>BaseBackupThrottle</></entry>
+         <entry morerows="2"><literal>Timeout</literal></entry>
+         <entry><literal>BaseBackupThrottle</literal></entry>
          <entry>Waiting during base backup when throttling activity.</entry>
         </row>
         <row>
-         <entry><literal>PgSleep</></entry>
-         <entry>Waiting in process that called <function>pg_sleep</>.</entry>
+         <entry><literal>PgSleep</literal></entry>
+         <entry>Waiting in process that called <function>pg_sleep</function>.</entry>
         </row>
         <row>
-         <entry><literal>RecoveryApplyDelay</></entry>
+         <entry><literal>RecoveryApplyDelay</literal></entry>
          <entry>Waiting to apply WAL at recovery because it is delayed.</entry>
         </row>
         <row>
-         <entry morerows="65"><literal>IO</></entry>
-         <entry><literal>BufFileRead</></entry>
+         <entry morerows="65"><literal>IO</literal></entry>
+         <entry><literal>BufFileRead</literal></entry>
          <entry>Waiting for a read from a buffered file.</entry>
         </row>
         <row>
-         <entry><literal>BufFileWrite</></entry>
+         <entry><literal>BufFileWrite</literal></entry>
          <entry>Waiting for a write to a buffered file.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileRead</></entry>
+         <entry><literal>ControlFileRead</literal></entry>
          <entry>Waiting for a read from the control file.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileSync</></entry>
+         <entry><literal>ControlFileSync</literal></entry>
          <entry>Waiting for the control file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileSyncUpdate</></entry>
+         <entry><literal>ControlFileSyncUpdate</literal></entry>
          <entry>Waiting for an update to the control file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileWrite</></entry>
+         <entry><literal>ControlFileWrite</literal></entry>
          <entry>Waiting for a write to the control file.</entry>
         </row>
         <row>
-         <entry><literal>ControlFileWriteUpdate</></entry>
+         <entry><literal>ControlFileWriteUpdate</literal></entry>
          <entry>Waiting for a write to update the control file.</entry>
         </row>
         <row>
-         <entry><literal>CopyFileRead</></entry>
+         <entry><literal>CopyFileRead</literal></entry>
          <entry>Waiting for a read during a file copy operation.</entry>
         </row>
         <row>
-         <entry><literal>CopyFileWrite</></entry>
+         <entry><literal>CopyFileWrite</literal></entry>
          <entry>Waiting for a write during a file copy operation.</entry>
         </row>
         <row>
-         <entry><literal>DataFileExtend</></entry>
+         <entry><literal>DataFileExtend</literal></entry>
          <entry>Waiting for a relation data file to be extended.</entry>
         </row>
         <row>
-         <entry><literal>DataFileFlush</></entry>
+         <entry><literal>DataFileFlush</literal></entry>
          <entry>Waiting for a relation data file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>DataFileImmediateSync</></entry>
+         <entry><literal>DataFileImmediateSync</literal></entry>
          <entry>Waiting for an immediate synchronization of a relation data file to stable storage.</entry>
         </row>
         <row>
-         <entry><literal>DataFilePrefetch</></entry>
+         <entry><literal>DataFilePrefetch</literal></entry>
          <entry>Waiting for an asynchronous prefetch from a relation data file.</entry>
         </row>
         <row>
-         <entry><literal>DataFileRead</></entry>
+         <entry><literal>DataFileRead</literal></entry>
          <entry>Waiting for a read from a relation data file.</entry>
         </row>
         <row>
-         <entry><literal>DataFileSync</></entry>
+         <entry><literal>DataFileSync</literal></entry>
          <entry>Waiting for changes to a relation data file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>DataFileTruncate</></entry>
+         <entry><literal>DataFileTruncate</literal></entry>
          <entry>Waiting for a relation data file to be truncated.</entry>
         </row>
         <row>
-         <entry><literal>DataFileWrite</></entry>
+         <entry><literal>DataFileWrite</literal></entry>
          <entry>Waiting for a write to a relation data file.</entry>
         </row>
         <row>
-         <entry><literal>DSMFillZeroWrite</></entry>
+         <entry><literal>DSMFillZeroWrite</literal></entry>
          <entry>Waiting to write zero bytes to a dynamic shared memory backing file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileAddToDataDirRead</></entry>
+         <entry><literal>LockFileAddToDataDirRead</literal></entry>
          <entry>Waiting for a read while adding a line to the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileAddToDataDirSync</></entry>
+         <entry><literal>LockFileAddToDataDirSync</literal></entry>
          <entry>Waiting for data to reach stable storage while adding a line to the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileAddToDataDirWrite</></entry>
+         <entry><literal>LockFileAddToDataDirWrite</literal></entry>
          <entry>Waiting for a write while adding a line to the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileCreateRead</></entry>
+         <entry><literal>LockFileCreateRead</literal></entry>
          <entry>Waiting to read while creating the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileCreateSync</></entry>
+         <entry><literal>LockFileCreateSync</literal></entry>
          <entry>Waiting for data to reach stable storage while creating the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileCreateWrite</></entry>
+         <entry><literal>LockFileCreateWrite</literal></entry>
          <entry>Waiting for a write while creating the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LockFileReCheckDataDirRead</></entry>
+         <entry><literal>LockFileReCheckDataDirRead</literal></entry>
          <entry>Waiting for a read during recheck of the data directory lock file.</entry>
         </row>
         <row>
-         <entry><literal>LogicalRewriteCheckpointSync</></entry>
+         <entry><literal>LogicalRewriteCheckpointSync</literal></entry>
          <entry>Waiting for logical rewrite mappings to reach stable storage during a checkpoint.</entry>
         </row>
         <row>
-         <entry><literal>LogicalRewriteMappingSync</></entry>
+         <entry><literal>LogicalRewriteMappingSync</literal></entry>
          <entry>Waiting for mapping data to reach stable storage during a logical rewrite.</entry>
         </row>
         <row>
-         <entry><literal>LogicalRewriteMappingWrite</></entry>
+         <entry><literal>LogicalRewriteMappingWrite</literal></entry>
          <entry>Waiting for a write of mapping data during a logical rewrite.</entry>
         </row>
         <row>
-         <entry><literal>LogicalRewriteSync</></entry>
+         <entry><literal>LogicalRewriteSync</literal></entry>
          <entry>Waiting for logical rewrite mappings to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>LogicalRewriteWrite</></entry>
+         <entry><literal>LogicalRewriteWrite</literal></entry>
          <entry>Waiting for a write of logical rewrite mappings.</entry>
         </row>
         <row>
-         <entry><literal>RelationMapRead</></entry>
+         <entry><literal>RelationMapRead</literal></entry>
          <entry>Waiting for a read of the relation map file.</entry>
         </row>
         <row>
-         <entry><literal>RelationMapSync</></entry>
+         <entry><literal>RelationMapSync</literal></entry>
          <entry>Waiting for the relation map file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>RelationMapWrite</></entry>
+         <entry><literal>RelationMapWrite</literal></entry>
          <entry>Waiting for a write to the relation map file.</entry>
         </row>
         <row>
-         <entry><literal>ReorderBufferRead</></entry>
+         <entry><literal>ReorderBufferRead</literal></entry>
          <entry>Waiting for a read during reorder buffer management.</entry>
         </row>
         <row>
-         <entry><literal>ReorderBufferWrite</></entry>
+         <entry><literal>ReorderBufferWrite</literal></entry>
          <entry>Waiting for a write during reorder buffer management.</entry>
         </row>
         <row>
-         <entry><literal>ReorderLogicalMappingRead</></entry>
+         <entry><literal>ReorderLogicalMappingRead</literal></entry>
          <entry>Waiting for a read of a logical mapping during reorder buffer management.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotRead</></entry>
+         <entry><literal>ReplicationSlotRead</literal></entry>
          <entry>Waiting for a read from a replication slot control file.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotRestoreSync</></entry>
+         <entry><literal>ReplicationSlotRestoreSync</literal></entry>
          <entry>Waiting for a replication slot control file to reach stable storage while restoring it to memory.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotSync</></entry>
+         <entry><literal>ReplicationSlotSync</literal></entry>
          <entry>Waiting for a replication slot control file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>ReplicationSlotWrite</></entry>
+         <entry><literal>ReplicationSlotWrite</literal></entry>
          <entry>Waiting for a write to a replication slot control file.</entry>
         </row>
         <row>
-         <entry><literal>SLRUFlushSync</></entry>
+         <entry><literal>SLRUFlushSync</literal></entry>
          <entry>Waiting for SLRU data to reach stable storage during a checkpoint or database shutdown.</entry>
         </row>
         <row>
-         <entry><literal>SLRURead</></entry>
+         <entry><literal>SLRURead</literal></entry>
          <entry>Waiting for a read of an SLRU page.</entry>
         </row>
         <row>
-         <entry><literal>SLRUSync</></entry>
+         <entry><literal>SLRUSync</literal></entry>
          <entry>Waiting for SLRU data to reach stable storage following a page write.</entry>
         </row>
         <row>
-         <entry><literal>SLRUWrite</></entry>
+         <entry><literal>SLRUWrite</literal></entry>
          <entry>Waiting for a write of an SLRU page.</entry>
         </row>
         <row>
-         <entry><literal>SnapbuildRead</></entry>
+         <entry><literal>SnapbuildRead</literal></entry>
          <entry>Waiting for a read of a serialized historical catalog snapshot.</entry>
         </row>
         <row>
-         <entry><literal>SnapbuildSync</></entry>
+         <entry><literal>SnapbuildSync</literal></entry>
          <entry>Waiting for a serialized historical catalog snapshot to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>SnapbuildWrite</></entry>
+         <entry><literal>SnapbuildWrite</literal></entry>
          <entry>Waiting for a write of a serialized historical catalog snapshot.</entry>
         </row>
         <row>
-         <entry><literal>TimelineHistoryFileSync</></entry>
+         <entry><literal>TimelineHistoryFileSync</literal></entry>
          <entry>Waiting for a timeline history file received via streaming replication to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>TimelineHistoryFileWrite</></entry>
+         <entry><literal>TimelineHistoryFileWrite</literal></entry>
          <entry>Waiting for a write of a timeline history file received via streaming replication.</entry>
         </row>
         <row>
-         <entry><literal>TimelineHistoryRead</></entry>
+         <entry><literal>TimelineHistoryRead</literal></entry>
          <entry>Waiting for a read of a timeline history file.</entry>
         </row>
         <row>
-         <entry><literal>TimelineHistorySync</></entry>
+         <entry><literal>TimelineHistorySync</literal></entry>
          <entry>Waiting for a newly created timeline history file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>TimelineHistoryWrite</></entry>
+         <entry><literal>TimelineHistoryWrite</literal></entry>
          <entry>Waiting for a write of a newly created timeline history file.</entry>
         </row>
         <row>
-         <entry><literal>TwophaseFileRead</></entry>
+         <entry><literal>TwophaseFileRead</literal></entry>
          <entry>Waiting for a read of a two phase state file.</entry>
         </row>
         <row>
-         <entry><literal>TwophaseFileSync</></entry>
+         <entry><literal>TwophaseFileSync</literal></entry>
          <entry>Waiting for a two phase state file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>TwophaseFileWrite</></entry>
+         <entry><literal>TwophaseFileWrite</literal></entry>
          <entry>Waiting for a write of a two phase state file.</entry>
         </row>
         <row>
-         <entry><literal>WALBootstrapSync</></entry>
+         <entry><literal>WALBootstrapSync</literal></entry>
          <entry>Waiting for WAL to reach stable storage during bootstrapping.</entry>
         </row>
         <row>
-         <entry><literal>WALBootstrapWrite</></entry>
+         <entry><literal>WALBootstrapWrite</literal></entry>
          <entry>Waiting for a write of a WAL page during bootstrapping.</entry>
         </row>
         <row>
-         <entry><literal>WALCopyRead</></entry>
+         <entry><literal>WALCopyRead</literal></entry>
          <entry>Waiting for a read when creating a new WAL segment by copying an existing one.</entry>
         </row>
         <row>
-         <entry><literal>WALCopySync</></entry>
+         <entry><literal>WALCopySync</literal></entry>
          <entry>Waiting a new WAL segment created by copying an existing one to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>WALCopyWrite</></entry>
+         <entry><literal>WALCopyWrite</literal></entry>
          <entry>Waiting for a write when creating a new WAL segment by copying an existing one.</entry>
         </row>
         <row>
-         <entry><literal>WALInitSync</></entry>
+         <entry><literal>WALInitSync</literal></entry>
          <entry>Waiting for a newly initialized WAL file to reach stable storage.</entry>
         </row>
         <row>
-         <entry><literal>WALInitWrite</></entry>
+         <entry><literal>WALInitWrite</literal></entry>
          <entry>Waiting for a write while initializing a new WAL file.</entry>
         </row>
         <row>
-         <entry><literal>WALRead</></entry>
+         <entry><literal>WALRead</literal></entry>
          <entry>Waiting for a read from a WAL file.</entry>
         </row>
         <row>
-         <entry><literal>WALSenderTimelineHistoryRead</></entry>
+         <entry><literal>WALSenderTimelineHistoryRead</literal></entry>
          <entry>Waiting for a read from a timeline history file during walsender timeline command.</entry>
         </row>
         <row>
-         <entry><literal>WALSyncMethodAssign</></entry>
+         <entry><literal>WALSyncMethodAssign</literal></entry>
          <entry>Waiting for data to reach stable storage while assigning WAL sync method.</entry>
         </row>
         <row>
-         <entry><literal>WALWrite</></entry>
+         <entry><literal>WALWrite</literal></entry>
          <entry>Waiting for a write to a WAL file.</entry>
         </row>
       </tbody>
@@ -1603,10 +1684,10 @@ postgres   27093  0.0  0.0  30096  2752 ?        Ss   11:34   0:00 postgres: ser
    <note>
     <para>
      For tranches registered by extensions, the name is specified by extension
-     and this will be displayed as <structfield>wait_event</>.  It is quite
+     and this will be displayed as <structfield>wait_event</structfield>.  It is quite
      possible that user has registered the tranche in one of the backends (by
      having allocation in dynamic shared memory) in which case other backends
-     won't have that information, so we display <literal>extension</> for such
+     won't have that information, so we display <literal>extension</literal> for such
      cases.
     </para>
    </note>
@@ -1637,53 +1718,53 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of a WAL sender process</entry>
     </row>
     <row>
-     <entry><structfield>usesysid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>usesysid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the user logged into this WAL sender process</entry>
     </row>
     <row>
-     <entry><structfield>usename</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>usename</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the user logged into this WAL sender process</entry>
     </row>
     <row>
-     <entry><structfield>application_name</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>application_name</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Name of the application that is connected
       to this WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>client_addr</></entry>
-     <entry><type>inet</></entry>
+     <entry><structfield>client_addr</structfield></entry>
+     <entry><type>inet</type></entry>
      <entry>IP address of the client connected to this WAL sender.
       If this field is null, it indicates that the client is
       connected via a Unix socket on the server machine.
      </entry>
     </row>
     <row>
-     <entry><structfield>client_hostname</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>client_hostname</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Host name of the connected client, as reported by a
-      reverse DNS lookup of <structfield>client_addr</>. This field will
+      reverse DNS lookup of <structfield>client_addr</structfield>. This field will
       only be non-null for IP connections, and only when <xref
-      linkend="guc-log-hostname"> is enabled.
+      linkend="guc-log-hostname"/> is enabled.
      </entry>
     </row>
     <row>
-     <entry><structfield>client_port</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>client_port</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>TCP port number that the client is using for communication
-      with this WAL sender, or <literal>-1</> if a Unix socket is used
+      with this WAL sender, or <literal>-1</literal> if a Unix socket is used
      </entry>
     </row>
     <row>
-     <entry><structfield>backend_start</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>backend_start</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time when this process was started, i.e., when the
       client connected to this WAL sender
      </entry>
@@ -1691,71 +1772,71 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
     <row>
      <entry><structfield>backend_xmin</structfield></entry>
      <entry><type>xid</type></entry>
-     <entry>This standby's <literal>xmin</> horizon reported
-     by <xref linkend="guc-hot-standby-feedback">.</entry>
+     <entry>This standby's <literal>xmin</literal> horizon reported
+     by <xref linkend="guc-hot-standby-feedback"/>.</entry>
     </row>
     <row>
-     <entry><structfield>state</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>state</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Current WAL sender state.
        Possible values are:
        <itemizedlist>
          <listitem>
           <para>
-           <literal>startup</>: This WAL sender is starting up.
+           <literal>startup</literal>: This WAL sender is starting up.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>catchup</>: This WAL sender's connected standby is
+           <literal>catchup</literal>: This WAL sender's connected standby is
            catching up with the primary.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>streaming</>: This WAL sender is streaming changes
+           <literal>streaming</literal>: This WAL sender is streaming changes
            after its connected standby server has caught up with the primary.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>backup</>: This WAL sender is sending a backup.
+           <literal>backup</literal>: This WAL sender is sending a backup.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>stopping</>: This WAL sender is stopping.
+           <literal>stopping</literal>: This WAL sender is stopping.
           </para>
          </listitem>
        </itemizedlist>
      </entry>
     </row>
     <row>
-     <entry><structfield>sent_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>sent_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location sent on this connection</entry>
     </row>
     <row>
-     <entry><structfield>write_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>write_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location written to disk by this standby
       server</entry>
     </row>
     <row>
-     <entry><structfield>flush_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>flush_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location flushed to disk by this standby
       server</entry>
     </row>
     <row>
-     <entry><structfield>replay_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>replay_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location replayed into the database on this
       standby server</entry>
     </row>
     <row>
-     <entry><structfield>write_lag</></entry>
-     <entry><type>interval</></entry>
+     <entry><structfield>write_lag</structfield></entry>
+     <entry><type>interval</type></entry>
      <entry>Time elapsed between flushing recent WAL locally and receiving
       notification that this standby server has written it (but not yet
       flushed it or applied it).  This can be used to gauge the delay that
@@ -1764,8 +1845,8 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
       server was configured as a synchronous standby.</entry>
     </row>
     <row>
-     <entry><structfield>flush_lag</></entry>
-     <entry><type>interval</></entry>
+     <entry><structfield>flush_lag</structfield></entry>
+     <entry><type>interval</type></entry>
      <entry>Time elapsed between flushing recent WAL locally and receiving
       notification that this standby server has written and flushed it
       (but not yet applied it).  This can be used to gauge the delay that
@@ -1774,8 +1855,8 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
       server was configured as a synchronous standby.</entry>
     </row>
     <row>
-     <entry><structfield>replay_lag</></entry>
-     <entry><type>interval</></entry>
+     <entry><structfield>replay_lag</structfield></entry>
+     <entry><type>interval</type></entry>
      <entry>Time elapsed between flushing recent WAL locally and receiving
       notification that this standby server has written, flushed and
       applied it.  This can be used to gauge the delay that
@@ -1784,38 +1865,38 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
       server was configured as a synchronous standby.</entry>
     </row>
     <row>
-     <entry><structfield>sync_priority</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>sync_priority</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Priority of this standby server for being chosen as the
       synchronous standby in a priority-based synchronous replication.
       This has no effect in a quorum-based synchronous replication.</entry>
     </row>
     <row>
-     <entry><structfield>sync_state</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>sync_state</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Synchronous state of this standby server.
        Possible values are:
        <itemizedlist>
          <listitem>
           <para>
-           <literal>async</>: This standby server is asynchronous.
+           <literal>async</literal>: This standby server is asynchronous.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>potential</>: This standby server is now asynchronous,
+           <literal>potential</literal>: This standby server is now asynchronous,
            but can potentially become synchronous if one of current
            synchronous ones fails.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>sync</>: This standby server is synchronous.
+           <literal>sync</literal>: This standby server is synchronous.
           </para>
          </listitem>
          <listitem>
           <para>
-           <literal>quorum</>: This standby server is considered as a candidate
+           <literal>quorum</literal>: This standby server is considered as a candidate
            for quorum standbys.
           </para>
          </listitem>
@@ -1885,69 +1966,69 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of the WAL receiver process</entry>
     </row>
     <row>
-     <entry><structfield>status</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>status</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Activity status of the WAL receiver process</entry>
     </row>
     <row>
-     <entry><structfield>receive_start_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>receive_start_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>First write-ahead log location used when WAL receiver is
       started</entry>
     </row>
     <row>
-     <entry><structfield>receive_start_tli</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>receive_start_tli</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>First timeline number used when WAL receiver is started</entry>
     </row>
     <row>
-     <entry><structfield>received_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>received_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location already received and flushed to
       disk, the initial value of this field being the first log location used
       when WAL receiver is started</entry>
     </row>
     <row>
-     <entry><structfield>received_tli</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>received_tli</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Timeline number of last write-ahead log location received and
       flushed to disk, the initial value of this field being the timeline
       number of the first log location used when WAL receiver is started
      </entry>
     </row>
     <row>
-     <entry><structfield>last_msg_send_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_msg_send_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Send time of last message received from origin WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>last_msg_receipt_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_msg_receipt_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Receipt time of last message received from origin WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>latest_end_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>latest_end_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location reported to origin WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>latest_end_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>latest_end_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time of last write-ahead log location reported to origin WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>slot_name</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>slot_name</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Replication slot name used by this WAL receiver</entry>
     </row>
     <row>
-     <entry><structfield>conninfo</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>conninfo</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>
       Connection string used by this WAL receiver,
       with security-sensitive fields obfuscated.
@@ -1976,52 +2057,52 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>subid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>subid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the subscription</entry>
     </row>
     <row>
-     <entry><structfield>subname</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>subname</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Name of the subscription</entry>
     </row>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of the subscription worker process</entry>
     </row>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>Oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>Oid</type></entry>
      <entry>OID of the relation that the worker is synchronizing; null for the
      main apply worker</entry>
     </row>
     <row>
-     <entry><structfield>received_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>received_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location received, the initial value of
       this field being 0</entry>
     </row>
     <row>
-     <entry><structfield>last_msg_send_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_msg_send_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Send time of last message received from origin WAL sender</entry>
     </row>
     <row>
-     <entry><structfield>last_msg_receipt_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_msg_receipt_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Receipt time of last message received from origin WAL sender
      </entry>
     </row>
     <row>
-     <entry><structfield>latest_end_lsn</></entry>
-     <entry><type>pg_lsn</></entry>
+     <entry><structfield>latest_end_lsn</structfield></entry>
+     <entry><type>pg_lsn</type></entry>
      <entry>Last write-ahead log location reported to origin WAL sender
      </entry>
     </row>
     <row>
-     <entry><structfield>latest_end_time</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>latest_end_time</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time of last write-ahead log location reported to origin WAL
       sender</entry>
     </row>
@@ -2049,42 +2130,42 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of a backend or WAL sender process</entry>
     </row>
     <row>
-     <entry><structfield>ssl</></entry>
-     <entry><type>boolean</></entry>
+     <entry><structfield>ssl</structfield></entry>
+     <entry><type>boolean</type></entry>
      <entry>True if SSL is used on this connection</entry>
     </row>
     <row>
-     <entry><structfield>version</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>version</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Version of SSL in use, or NULL if SSL is not in use
       on this connection</entry>
     </row>
     <row>
-     <entry><structfield>cipher</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>cipher</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Name of SSL cipher in use, or NULL if SSL is not in use
       on this connection</entry>
     </row>
     <row>
-     <entry><structfield>bits</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>bits</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Number of bits in the encryption algorithm used, or NULL
      if SSL is not used on this connection</entry>
     </row>
     <row>
-     <entry><structfield>compression</></entry>
-     <entry><type>boolean</></entry>
+     <entry><structfield>compression</structfield></entry>
+     <entry><type>boolean</type></entry>
      <entry>True if SSL compression is in use, false if not,
       or NULL if SSL is not in use on this connection</entry>
     </row>
     <row>
-     <entry><structfield>clientdn</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>clientdn</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>Distinguished Name (DN) field from the client certificate
       used, or NULL if no client certificate was supplied or if SSL
       is not in use on this connection. This field is truncated if the
@@ -2120,37 +2201,37 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
     <tbody>
      <row>
-      <entry><structfield>archived_count</></entry>
+      <entry><structfield>archived_count</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of WAL files that have been successfully archived</entry>
      </row>
      <row>
-      <entry><structfield>last_archived_wal</></entry>
+      <entry><structfield>last_archived_wal</structfield></entry>
       <entry><type>text</type></entry>
       <entry>Name of the last WAL file successfully archived</entry>
      </row>
      <row>
-      <entry><structfield>last_archived_time</></entry>
+      <entry><structfield>last_archived_time</structfield></entry>
       <entry><type>timestamp with time zone</type></entry>
       <entry>Time of the last successful archive operation</entry>
      </row>
      <row>
-      <entry><structfield>failed_count</></entry>
+      <entry><structfield>failed_count</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of failed attempts for archiving WAL files</entry>
      </row>
      <row>
-      <entry><structfield>last_failed_wal</></entry>
+      <entry><structfield>last_failed_wal</structfield></entry>
       <entry><type>text</type></entry>
       <entry>Name of the WAL file of the last failed archival operation</entry>
      </row>
      <row>
-      <entry><structfield>last_failed_time</></entry>
+      <entry><structfield>last_failed_time</structfield></entry>
       <entry><type>timestamp with time zone</type></entry>
       <entry>Time of the last failed archival operation</entry>
      </row>
      <row>
-      <entry><structfield>stats_reset</></entry>
+      <entry><structfield>stats_reset</structfield></entry>
       <entry><type>timestamp with time zone</type></entry>
       <entry>Time at which these statistics were last reset</entry>
      </row>
@@ -2177,17 +2258,17 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
     <tbody>
      <row>
-      <entry><structfield>checkpoints_timed</></entry>
+      <entry><structfield>checkpoints_timed</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of scheduled checkpoints that have been performed</entry>
      </row>
      <row>
-      <entry><structfield>checkpoints_req</></entry>
+      <entry><structfield>checkpoints_req</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of requested checkpoints that have been performed</entry>
      </row>
      <row>
-      <entry><structfield>checkpoint_write_time</></entry>
+      <entry><structfield>checkpoint_write_time</structfield></entry>
       <entry><type>double precision</type></entry>
       <entry>
         Total amount of time that has been spent in the portion of
@@ -2195,7 +2276,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
       </entry>
      </row>
      <row>
-      <entry><structfield>checkpoint_sync_time</></entry>
+      <entry><structfield>checkpoint_sync_time</structfield></entry>
       <entry><type>double precision</type></entry>
       <entry>
         Total amount of time that has been spent in the portion of
@@ -2204,40 +2285,40 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
       </entry>
      </row>
      <row>
-      <entry><structfield>buffers_checkpoint</></entry>
+      <entry><structfield>buffers_checkpoint</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of buffers written during checkpoints</entry>
      </row>
      <row>
-      <entry><structfield>buffers_clean</></entry>
+      <entry><structfield>buffers_clean</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of buffers written by the background writer</entry>
      </row>
      <row>
-      <entry><structfield>maxwritten_clean</></entry>
+      <entry><structfield>maxwritten_clean</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of times the background writer stopped a cleaning
        scan because it had written too many buffers</entry>
      </row>
      <row>
-      <entry><structfield>buffers_backend</></entry>
+      <entry><structfield>buffers_backend</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of buffers written directly by a backend</entry>
      </row>
      <row>
-      <entry><structfield>buffers_backend_fsync</></entry>
+      <entry><structfield>buffers_backend_fsync</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of times a backend had to execute its own
-       <function>fsync</> call (normally the background writer handles those
+       <function>fsync</function> call (normally the background writer handles those
        even when the backend does its own write)</entry>
      </row>
      <row>
-      <entry><structfield>buffers_alloc</></entry>
+      <entry><structfield>buffers_alloc</structfield></entry>
       <entry><type>bigint</type></entry>
       <entry>Number of buffers allocated</entry>
      </row>
      <row>
-      <entry><structfield>stats_reset</></entry>
+      <entry><structfield>stats_reset</structfield></entry>
       <entry><type>timestamp with time zone</type></entry>
       <entry>Time at which these statistics were last reset</entry>
      </row>
@@ -2263,119 +2344,119 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>datid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>datid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a database</entry>
     </row>
     <row>
-     <entry><structfield>datname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>datname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this database</entry>
     </row>
     <row>
-     <entry><structfield>numbackends</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>numbackends</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Number of backends currently connected to this database.
      This is the only column in this view that returns a value reflecting
      current state; all other columns return the accumulated values since
      the last reset.</entry>
     </row>
     <row>
-     <entry><structfield>xact_commit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>xact_commit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of transactions in this database that have been
       committed</entry>
     </row>
     <row>
-     <entry><structfield>xact_rollback</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>xact_rollback</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of transactions in this database that have been
       rolled back</entry>
     </row>
     <row>
-     <entry><structfield>blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read in this database</entry>
     </row>
     <row>
-     <entry><structfield>blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times disk blocks were found already in the buffer
       cache, so that a read was not necessary (this only includes hits in the
       PostgreSQL buffer cache, not the operating system's file system cache)
      </entry>
     </row>
     <row>
-     <entry><structfield>tup_returned</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tup_returned</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows returned by queries in this database</entry>
     </row>
     <row>
-     <entry><structfield>tup_fetched</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tup_fetched</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows fetched by queries in this database</entry>
     </row>
     <row>
-     <entry><structfield>tup_inserted</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tup_inserted</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows inserted by queries in this database</entry>
     </row>
     <row>
-     <entry><structfield>tup_updated</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tup_updated</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows updated by queries in this database</entry>
     </row>
     <row>
-     <entry><structfield>tup_deleted</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tup_deleted</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows deleted by queries in this database</entry>
     </row>
     <row>
-     <entry><structfield>conflicts</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>conflicts</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries canceled due to conflicts with recovery
       in this database. (Conflicts occur only on standby servers; see
-      <xref linkend="pg-stat-database-conflicts-view"> for details.)
+      <xref linkend="pg-stat-database-conflicts-view"/> for details.)
      </entry>
     </row>
     <row>
-     <entry><structfield>temp_files</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>temp_files</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of temporary files created by queries in this database.
       All temporary files are counted, regardless of why the temporary file
       was created (e.g., sorting or hashing), and regardless of the
-      <xref linkend="guc-log-temp-files"> setting.
+      <xref linkend="guc-log-temp-files"/> setting.
      </entry>
     </row>
     <row>
-     <entry><structfield>temp_bytes</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>temp_bytes</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Total amount of data written to temporary files by queries in
       this database. All temporary files are counted, regardless of why
       the temporary file was created, and
-      regardless of the <xref linkend="guc-log-temp-files"> setting.
+      regardless of the <xref linkend="guc-log-temp-files"/> setting.
      </entry>
     </row>
     <row>
-     <entry><structfield>deadlocks</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>deadlocks</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of deadlocks detected in this database</entry>
     </row>
     <row>
-     <entry><structfield>blk_read_time</></entry>
-     <entry><type>double precision</></entry>
+     <entry><structfield>blk_read_time</structfield></entry>
+     <entry><type>double precision</type></entry>
      <entry>Time spent reading data file blocks by backends in this database,
       in milliseconds</entry>
     </row>
     <row>
-     <entry><structfield>blk_write_time</></entry>
-     <entry><type>double precision</></entry>
+     <entry><structfield>blk_write_time</structfield></entry>
+     <entry><type>double precision</type></entry>
      <entry>Time spent writing data file blocks by backends in this database,
       in milliseconds</entry>
     </row>
     <row>
-     <entry><structfield>stats_reset</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>stats_reset</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Time at which these statistics were last reset</entry>
     </row>
    </tbody>
@@ -2400,42 +2481,42 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>datid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>datid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a database</entry>
     </row>
     <row>
-     <entry><structfield>datname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>datname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this database</entry>
     </row>
     <row>
-     <entry><structfield>confl_tablespace</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>confl_tablespace</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries in this database that have been canceled due to
       dropped tablespaces</entry>
     </row>
     <row>
-     <entry><structfield>confl_lock</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>confl_lock</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries in this database that have been canceled due to
       lock timeouts</entry>
     </row>
     <row>
-     <entry><structfield>confl_snapshot</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>confl_snapshot</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries in this database that have been canceled due to
       old snapshots</entry>
     </row>
     <row>
-     <entry><structfield>confl_bufferpin</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>confl_bufferpin</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries in this database that have been canceled due to
       pinned buffers</entry>
     </row>
     <row>
-     <entry><structfield>confl_deadlock</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>confl_deadlock</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of queries in this database that have been canceled due to
       deadlocks</entry>
     </row>
@@ -2464,119 +2545,119 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a table</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema that this table is in</entry>
     </row>
     <row>
-     <entry><structfield>relname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>relname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this table</entry>
     </row>
     <row>
-     <entry><structfield>seq_scan</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>seq_scan</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of sequential scans initiated on this table</entry>
     </row>
     <row>
-     <entry><structfield>seq_tup_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>seq_tup_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of live rows fetched by sequential scans</entry>
     </row>
     <row>
-     <entry><structfield>idx_scan</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_scan</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of index scans initiated on this table</entry>
     </row>
     <row>
-     <entry><structfield>idx_tup_fetch</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_tup_fetch</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of live rows fetched by index scans</entry>
     </row>
     <row>
-     <entry><structfield>n_tup_ins</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_tup_ins</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows inserted</entry>
     </row>
     <row>
-     <entry><structfield>n_tup_upd</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_tup_upd</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows updated (includes HOT updated rows)</entry>
     </row>
     <row>
-     <entry><structfield>n_tup_del</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_tup_del</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows deleted</entry>
     </row>
     <row>
-     <entry><structfield>n_tup_hot_upd</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_tup_hot_upd</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of rows HOT updated (i.e., with no separate index
       update required)</entry>
     </row>
     <row>
-     <entry><structfield>n_live_tup</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_live_tup</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Estimated number of live rows</entry>
     </row>
     <row>
-     <entry><structfield>n_dead_tup</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_dead_tup</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Estimated number of dead rows</entry>
     </row>
     <row>
-     <entry><structfield>n_mod_since_analyze</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>n_mod_since_analyze</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Estimated number of rows modified since this table was last analyzed</entry>
     </row>
     <row>
-     <entry><structfield>last_vacuum</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_vacuum</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Last time at which this table was manually vacuumed
-      (not counting <command>VACUUM FULL</>)</entry>
+      (not counting <command>VACUUM FULL</command>)</entry>
     </row>
     <row>
-     <entry><structfield>last_autovacuum</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_autovacuum</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Last time at which this table was vacuumed by the autovacuum
       daemon</entry>
     </row>
     <row>
-     <entry><structfield>last_analyze</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_analyze</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Last time at which this table was manually analyzed</entry>
     </row>
     <row>
-     <entry><structfield>last_autoanalyze</></entry>
-     <entry><type>timestamp with time zone</></entry>
+     <entry><structfield>last_autoanalyze</structfield></entry>
+     <entry><type>timestamp with time zone</type></entry>
      <entry>Last time at which this table was analyzed by the autovacuum
       daemon</entry>
     </row>
     <row>
-     <entry><structfield>vacuum_count</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>vacuum_count</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times this table has been manually vacuumed
-      (not counting <command>VACUUM FULL</>)</entry>
+      (not counting <command>VACUUM FULL</command>)</entry>
     </row>
     <row>
-     <entry><structfield>autovacuum_count</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>autovacuum_count</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times this table has been vacuumed by the autovacuum
       daemon</entry>
     </row>
     <row>
-     <entry><structfield>analyze_count</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>analyze_count</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times this table has been manually analyzed</entry>
     </row>
     <row>
-     <entry><structfield>autoanalyze_count</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>autoanalyze_count</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times this table has been analyzed by the autovacuum
       daemon</entry>
     </row>
@@ -2607,43 +2688,43 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the table for this index</entry>
     </row>
     <row>
-     <entry><structfield>indexrelid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>indexrelid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of this index</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema this index is in</entry>
     </row>
     <row>
-     <entry><structfield>relname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>relname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the table for this index</entry>
     </row>
     <row>
-     <entry><structfield>indexrelname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>indexrelname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this index</entry>
     </row>
     <row>
-     <entry><structfield>idx_scan</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_scan</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of index scans initiated on this index</entry>
     </row>
     <row>
-     <entry><structfield>idx_tup_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_tup_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of index entries returned by scans on this index</entry>
     </row>
     <row>
-     <entry><structfield>idx_tup_fetch</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_tup_fetch</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of live table rows fetched by simple index scans using this
       index</entry>
     </row>
@@ -2662,17 +2743,17 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
   </para>
 
   <para>
-   Indexes can be used by simple index scans, <quote>bitmap</> index scans,
+   Indexes can be used by simple index scans, <quote>bitmap</quote> index scans,
    and the optimizer.  In a bitmap scan
    the output of several indexes can be combined via AND or OR rules,
    so it is difficult to associate individual heap row fetches
    with specific indexes when a bitmap scan is used.  Therefore, a bitmap
    scan increments the
-   <structname>pg_stat_all_indexes</>.<structfield>idx_tup_read</>
+   <structname>pg_stat_all_indexes</structname>.<structfield>idx_tup_read</structfield>
    count(s) for the index(es) it uses, and it increments the
-   <structname>pg_stat_all_tables</>.<structfield>idx_tup_fetch</>
+   <structname>pg_stat_all_tables</structname>.<structfield>idx_tup_fetch</structfield>
    count for the table, but it does not affect
-   <structname>pg_stat_all_indexes</>.<structfield>idx_tup_fetch</>.
+   <structname>pg_stat_all_indexes</structname>.<structfield>idx_tup_fetch</structfield>.
    The optimizer also accesses indexes to check for supplied constants
    whose values are outside the recorded range of the optimizer statistics
    because the optimizer statistics might be stale.
@@ -2680,10 +2761,10 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
   <note>
    <para>
-    The <structfield>idx_tup_read</> and <structfield>idx_tup_fetch</> counts
+    The <structfield>idx_tup_read</structfield> and <structfield>idx_tup_fetch</structfield> counts
     can be different even without any use of bitmap scans,
-    because <structfield>idx_tup_read</> counts
-    index entries retrieved from the index while <structfield>idx_tup_fetch</>
+    because <structfield>idx_tup_read</structfield> counts
+    index entries retrieved from the index while <structfield>idx_tup_fetch</structfield>
     counts live rows fetched from the table.  The latter will be less if any
     dead or not-yet-committed rows are fetched using the index, or if any
     heap fetches are avoided by means of an index-only scan.
@@ -2703,58 +2784,58 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a table</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema that this table is in</entry>
     </row>
     <row>
-     <entry><structfield>relname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>relname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this table</entry>
     </row>
     <row>
-     <entry><structfield>heap_blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>heap_blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from this table</entry>
     </row>
     <row>
-     <entry><structfield>heap_blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>heap_blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in this table</entry>
     </row>
     <row>
-     <entry><structfield>idx_blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from all indexes on this table</entry>
     </row>
     <row>
-     <entry><structfield>idx_blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in all indexes on this table</entry>
     </row>
     <row>
-     <entry><structfield>toast_blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>toast_blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from this table's TOAST table (if any)</entry>
     </row>
     <row>
-     <entry><structfield>toast_blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>toast_blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in this table's TOAST table (if any)</entry>
     </row>
     <row>
-     <entry><structfield>tidx_blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tidx_blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from this table's TOAST table indexes (if any)</entry>
     </row>
     <row>
-     <entry><structfield>tidx_blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>tidx_blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in this table's TOAST table indexes (if any)</entry>
     </row>
    </tbody>
@@ -2784,38 +2865,38 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the table for this index</entry>
     </row>
     <row>
-     <entry><structfield>indexrelid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>indexrelid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of this index</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema this index is in</entry>
     </row>
     <row>
-     <entry><structfield>relname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>relname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the table for this index</entry>
     </row>
     <row>
-     <entry><structfield>indexrelname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>indexrelname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this index</entry>
     </row>
     <row>
-     <entry><structfield>idx_blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from this index</entry>
     </row>
     <row>
-     <entry><structfield>idx_blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>idx_blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in this index</entry>
     </row>
    </tbody>
@@ -2845,28 +2926,28 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a sequence</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema this sequence is in</entry>
     </row>
     <row>
-     <entry><structfield>relname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>relname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this sequence</entry>
     </row>
     <row>
-     <entry><structfield>blks_read</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>blks_read</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of disk blocks read from this sequence</entry>
     </row>
     <row>
-     <entry><structfield>blks_hit</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>blks_hit</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of buffer hits in this sequence</entry>
     </row>
    </tbody>
@@ -2892,34 +2973,34 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
    <tbody>
     <row>
-     <entry><structfield>funcid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>funcid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of a function</entry>
     </row>
     <row>
-     <entry><structfield>schemaname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>schemaname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the schema this function is in</entry>
     </row>
     <row>
-     <entry><structfield>funcname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>funcname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of this function</entry>
     </row>
     <row>
-     <entry><structfield>calls</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>calls</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>Number of times this function has been called</entry>
     </row>
     <row>
-     <entry><structfield>total_time</></entry>
-     <entry><type>double precision</></entry>
+     <entry><structfield>total_time</structfield></entry>
+     <entry><type>double precision</type></entry>
      <entry>Total time spent in this function and all other functions
      called by it, in milliseconds</entry>
     </row>
     <row>
-     <entry><structfield>self_time</></entry>
-     <entry><type>double precision</></entry>
+     <entry><structfield>self_time</structfield></entry>
+     <entry><type>double precision</type></entry>
      <entry>Total time spent in this function itself, not including
      other functions called by it, in milliseconds</entry>
     </row>
@@ -2930,7 +3011,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
   <para>
    The <structname>pg_stat_user_functions</structname> view will contain
    one row for each tracked function, showing statistics about executions of
-   that function.  The <xref linkend="guc-track-functions"> parameter
+   that function.  The <xref linkend="guc-track-functions"/> parameter
    controls exactly which functions are tracked.
   </para>
 
@@ -2944,7 +3025,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
    queries that use the same underlying statistics access functions used by
    the standard views shown above.  For details such as the functions' names,
    consult the definitions of the standard views.  (For example, in
-   <application>psql</> you could issue <literal>\d+ pg_stat_activity</>.)
+   <application>psql</application> you could issue <literal>\d+ pg_stat_activity</literal>.)
    The access functions for per-database statistics take a database OID as an
    argument to identify which database to report on.
    The per-table and per-index functions take a table or index OID.
@@ -2955,7 +3036,7 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
   <para>
    Additional functions related to statistics collection are listed in <xref
-   linkend="monitoring-stats-funcs-table">.
+   linkend="monitoring-stats-funcs-table"/>.
   </para>
 
   <table id="monitoring-stats-funcs-table">
@@ -3025,10 +3106,10 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
        Reset some cluster-wide statistics counters to zero, depending on the
        argument (requires superuser privileges by default, but EXECUTE for
        this function can be granted to others).
-       Calling <literal>pg_stat_reset_shared('bgwriter')</> will zero all the
-       counters shown in the <structname>pg_stat_bgwriter</> view.
-       Calling <literal>pg_stat_reset_shared('archiver')</> will zero all the
-       counters shown in the <structname>pg_stat_archiver</> view.
+       Calling <literal>pg_stat_reset_shared('bgwriter')</literal> will zero all the
+       counters shown in the <structname>pg_stat_bgwriter</structname> view.
+       Calling <literal>pg_stat_reset_shared('archiver')</literal> will zero all the
+       counters shown in the <structname>pg_stat_archiver</structname> view.
       </entry>
      </row>
 
@@ -3057,17 +3138,17 @@ SELECT pid, wait_event_type, wait_event FROM pg_stat_activity WHERE wait_event i
 
   <para>
    <function>pg_stat_get_activity</function>, the underlying function of
-   the <structname>pg_stat_activity</> view, returns a set of records
+   the <structname>pg_stat_activity</structname> view, returns a set of records
    containing all the available information about each backend process.
    Sometimes it may be more convenient to obtain just a subset of this
    information.  In such cases, an older set of per-backend statistics
    access functions can be used; these are shown in <xref
-   linkend="monitoring-stats-backend-funcs-table">.
+   linkend="monitoring-stats-backend-funcs-table"/>.
    These access functions use a backend ID number, which ranges from one
    to the number of currently active backends.
    The function <function>pg_stat_get_backend_idset</function> provides a
    convenient way to generate one row for each active backend for
-   invoking these functions.  For example, to show the <acronym>PID</>s and
+   invoking these functions.  For example, to show the <acronym>PID</acronym>s and
    current queries of all backends:
 
 <programlisting>
@@ -3101,7 +3182,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
      <row>
       <entry><literal><function>pg_stat_get_backend_activity(integer)</function></literal></entry>
       <entry><type>text</type></entry>
-      <entry>Text of this backend's most recent query</>
+      <entry>Text of this backend's most recent query</entry>
      </row>
 
      <row>
@@ -3150,7 +3231,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
        <entry><literal><function>pg_stat_get_backend_wait_event_type(integer)</function></literal></entry>
        <entry><type>text</type></entry>
         <entry>Wait event type name if backend is currently waiting, otherwise NULL.
-        See <xref linkend="wait-event-table"> for details.
+        See <xref linkend="wait-event-table"/> for details.
         </entry>
       </row>
 
@@ -3158,7 +3239,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
       <entry><literal><function>pg_stat_get_backend_wait_event(integer)</function></literal></entry>
       <entry><type>text</type></entry>
        <entry>Wait event name if backend is currently waiting, otherwise NULL.
-       See <xref linkend="wait-event-table"> for details.
+       See <xref linkend="wait-event-table"/> for details.
        </entry>
      </row>
 
@@ -3218,9 +3299,9 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
    </itemizedlist>
 
    Details of the <structname>pg_locks</structname> view appear in
-   <xref linkend="view-pg-locks">.
+   <xref linkend="view-pg-locks"/>.
    For more information on locking and managing concurrency with
-   <productname>PostgreSQL</productname>, refer to <xref linkend="mvcc">.
+   <productname>PostgreSQL</productname>, refer to <xref linkend="mvcc"/>.
   </para>
  </sect1>
 
@@ -3228,9 +3309,9 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
   <title>Progress Reporting</title>
 
   <para>
-   <productname>PostgreSQL</> has the ability to report the progress of
+   <productname>PostgreSQL</productname> has the ability to report the progress of
    certain commands during command execution.  Currently, the only command
-   which supports progress reporting is <command>VACUUM</>.  This may be
+   which supports progress reporting is <command>VACUUM</command>.  This may be
    expanded in the future.
   </para>
 
@@ -3238,13 +3319,13 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
   <title>VACUUM Progress Reporting</title>
 
   <para>
-   Whenever <command>VACUUM</> is running, the
+   Whenever <command>VACUUM</command> is running, the
    <structname>pg_stat_progress_vacuum</structname> view will contain
    one row for each backend (including autovacuum worker processes) that is
    currently vacuuming.  The tables below describe the information
    that will be reported and provide information about how to interpret it.
-   Progress reporting is not currently supported for <command>VACUUM FULL</>
-   and backends running <command>VACUUM FULL</> will not be listed in this
+   Progress reporting is not currently supported for <command>VACUUM FULL</command>
+   and backends running <command>VACUUM FULL</command> will not be listed in this
    view.
   </para>
 
@@ -3261,82 +3342,82 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
 
    <tbody>
     <row>
-     <entry><structfield>pid</></entry>
-     <entry><type>integer</></entry>
+     <entry><structfield>pid</structfield></entry>
+     <entry><type>integer</type></entry>
      <entry>Process ID of backend.</entry>
     </row>
     <row>
-     <entry><structfield>datid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>datid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the database to which this backend is connected.</entry>
     </row>
     <row>
-     <entry><structfield>datname</></entry>
-     <entry><type>name</></entry>
+     <entry><structfield>datname</structfield></entry>
+     <entry><type>name</type></entry>
      <entry>Name of the database to which this backend is connected.</entry>
     </row>
     <row>
-     <entry><structfield>relid</></entry>
-     <entry><type>oid</></entry>
+     <entry><structfield>relid</structfield></entry>
+     <entry><type>oid</type></entry>
      <entry>OID of the table being vacuumed.</entry>
     </row>
     <row>
-     <entry><structfield>phase</></entry>
-     <entry><type>text</></entry>
+     <entry><structfield>phase</structfield></entry>
+     <entry><type>text</type></entry>
      <entry>
-       Current processing phase of vacuum.  See <xref linkend='vacuum-phases'>.
+       Current processing phase of vacuum.  See <xref linkend='vacuum-phases'/>.
      </entry>
     </row>
     <row>
-     <entry><structfield>heap_blks_total</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>heap_blks_total</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
        Total number of heap blocks in the table.  This number is reported
        as of the beginning of the scan; blocks added later will not be (and
-       need not be) visited by this <command>VACUUM</>.
+       need not be) visited by this <command>VACUUM</command>.
      </entry>
     </row>
     <row>
-     <entry><structfield>heap_blks_scanned</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>heap_blks_scanned</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
        Number of heap blocks scanned.  Because the
-       <link linkend="storage-vm">visibility map</> is used to optimize scans,
+       <link linkend="storage-vm">visibility map</link> is used to optimize scans,
        some blocks will be skipped without inspection; skipped blocks are
        included in this total, so that this number will eventually become
-       equal to <structfield>heap_blks_total</> when the vacuum is complete.
-       This counter only advances when the phase is <literal>scanning heap</>.
+       equal to <structfield>heap_blks_total</structfield> when the vacuum is complete.
+       This counter only advances when the phase is <literal>scanning heap</literal>.
      </entry>
     </row>
     <row>
-     <entry><structfield>heap_blks_vacuumed</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>heap_blks_vacuumed</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
        Number of heap blocks vacuumed.  Unless the table has no indexes, this
-       counter only advances when the phase is <literal>vacuuming heap</>.
+       counter only advances when the phase is <literal>vacuuming heap</literal>.
        Blocks that contain no dead tuples are skipped, so the counter may
        sometimes skip forward in large increments.
      </entry>
     </row>
     <row>
-     <entry><structfield>index_vacuum_count</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>index_vacuum_count</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
        Number of completed index vacuum cycles.
      </entry>
     </row>
     <row>
-     <entry><structfield>max_dead_tuples</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>max_dead_tuples</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
       Number of dead tuples that we can store before needing to perform
       an index vacuum cycle, based on
-      <xref linkend="guc-maintenance-work-mem">.
+      <xref linkend="guc-maintenance-work-mem"/>.
      </entry>
     </row>
     <row>
-     <entry><structfield>num_dead_tuples</></entry>
-     <entry><type>bigint</></entry>
+     <entry><structfield>num_dead_tuples</structfield></entry>
+     <entry><type>bigint</type></entry>
      <entry>
        Number of dead tuples collected since the last index vacuum cycle.
      </entry>
@@ -3359,36 +3440,36 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
     <row>
      <entry><literal>initializing</literal></entry>
      <entry>
-       <command>VACUUM</> is preparing to begin scanning the heap.  This
+       <command>VACUUM</command> is preparing to begin scanning the heap.  This
        phase is expected to be very brief.
      </entry>
     </row>
     <row>
      <entry><literal>scanning heap</literal></entry>
      <entry>
-       <command>VACUUM</> is currently scanning the heap.  It will prune and
+       <command>VACUUM</command> is currently scanning the heap.  It will prune and
        defragment each page if required, and possibly perform freezing
-       activity.  The <structfield>heap_blks_scanned</> column can be used
+       activity.  The <structfield>heap_blks_scanned</structfield> column can be used
        to monitor the progress of the scan.
      </entry>
     </row>
     <row>
      <entry><literal>vacuuming indexes</literal></entry>
      <entry>
-       <command>VACUUM</> is currently vacuuming the indexes.  If a table has
+       <command>VACUUM</command> is currently vacuuming the indexes.  If a table has
        any indexes, this will happen at least once per vacuum, after the heap
        has been completely scanned.  It may happen multiple times per vacuum
-       if <xref linkend="guc-maintenance-work-mem"> is insufficient to
+       if <xref linkend="guc-maintenance-work-mem"/> is insufficient to
        store the number of dead tuples found.
      </entry>
     </row>
     <row>
      <entry><literal>vacuuming heap</literal></entry>
      <entry>
-       <command>VACUUM</> is currently vacuuming the heap.  Vacuuming the heap
+       <command>VACUUM</command> is currently vacuuming the heap.  Vacuuming the heap
        is distinct from scanning the heap, and occurs after each instance of
-       vacuuming indexes.  If <structfield>heap_blks_scanned</> is less than
-       <structfield>heap_blks_total</>, the system will return to scanning
+       vacuuming indexes.  If <structfield>heap_blks_scanned</structfield> is less than
+       <structfield>heap_blks_total</structfield>, the system will return to scanning
        the heap after this phase is completed; otherwise, it will begin
        cleaning up indexes after this phase is completed.
      </entry>
@@ -3396,7 +3477,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
     <row>
      <entry><literal>cleaning up indexes</literal></entry>
      <entry>
-       <command>VACUUM</> is currently cleaning up indexes.  This occurs after
+       <command>VACUUM</command> is currently cleaning up indexes.  This occurs after
        the heap has been completely scanned and all vacuuming of the indexes
        and the heap has been completed.
      </entry>
@@ -3404,7 +3485,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
     <row>
      <entry><literal>truncating heap</literal></entry>
      <entry>
-       <command>VACUUM</> is currently truncating the heap so as to return
+       <command>VACUUM</command> is currently truncating the heap so as to return
        empty pages at the end of the relation to the operating system.  This
        occurs after cleaning up indexes.
      </entry>
@@ -3412,10 +3493,10 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
     <row>
      <entry><literal>performing final cleanup</literal></entry>
      <entry>
-       <command>VACUUM</> is performing final cleanup.  During this phase,
-       <command>VACUUM</> will vacuum the free space map, update statistics
-       in <literal>pg_class</>, and report statistics to the statistics
-       collector.  When this phase is completed, <command>VACUUM</> will end.
+       <command>VACUUM</command> is performing final cleanup.  During this phase,
+       <command>VACUUM</command> will vacuum the free space map, update statistics
+       in <literal>pg_class</literal>, and report statistics to the statistics
+       collector.  When this phase is completed, <command>VACUUM</command> will end.
      </entry>
     </row>
    </tbody>
@@ -3455,7 +3536,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
    <ulink url="http://sourceware.org/systemtap/">SystemTap</ulink> project
    for Linux provides a DTrace equivalent and can also be used.  Supporting other dynamic
    tracing utilities is theoretically possible by changing the definitions for
-   the macros in <filename>src/include/utils/probes.h</>.
+   the macros in <filename>src/include/utils/probes.h</filename>.
   </para>
 
   <sect2 id="compiling-for-trace">
@@ -3465,8 +3546,8 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
    By default, probes are not available, so you will need to
    explicitly tell the configure script to make the probes available
    in <productname>PostgreSQL</productname>. To include DTrace support
-   specify <option>--enable-dtrace</> to configure.  See <xref
-   linkend="install-procedure"> for further information.
+   specify <option>--enable-dtrace</option> to configure.  See <xref
+   linkend="install-procedure"/> for further information.
   </para>
   </sect2>
 
@@ -3475,10 +3556,10 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
 
   <para>
    A number of standard probes are provided in the source code,
-   as shown in <xref linkend="dtrace-probe-point-table">;
-   <xref linkend="typedefs-table">
+   as shown in <xref linkend="dtrace-probe-point-table"/>;
+   <xref linkend="typedefs-table"/>
    shows the types used in the probes.  More probes can certainly be
-   added to enhance <productname>PostgreSQL</>'s observability.
+   added to enhance <productname>PostgreSQL</productname>'s observability.
   </para>
 
  <table id="dtrace-probe-point-table">
@@ -3572,7 +3653,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
      <entry><literal>statement-status</literal></entry>
      <entry><literal>(const char *)</literal></entry>
      <entry>Probe that fires anytime the server process updates its
-      <structname>pg_stat_activity</>.<structfield>status</>.
+      <structname>pg_stat_activity</structname>.<structfield>status</structfield>.
       arg0 is the new status string.</entry>
     </row>
     <row>
@@ -3740,7 +3821,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
      <entry><literal>(ForkNumber, BlockNumber, Oid, Oid, Oid)</literal></entry>
      <entry>Probe that fires when a server process begins to write a dirty
       buffer.  (If this happens often, it implies that
-      <xref linkend="guc-shared-buffers"> is too
+      <xref linkend="guc-shared-buffers"/> is too
       small or the background writer control parameters need adjustment.)
       arg0 and arg1 contain the fork and block numbers of the page.
       arg2, arg3, and arg4 contain the tablespace, database, and relation OIDs
@@ -3758,7 +3839,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
      <entry>Probe that fires when a server process begins to write a
       dirty WAL buffer because no more WAL buffer space is available.
       (If this happens often, it implies that
-      <xref linkend="guc-wal-buffers"> is too small.)</entry>
+      <xref linkend="guc-wal-buffers"/> is too small.)</entry>
     </row>
     <row>
      <entry><literal>wal-buffer-write-dirty-done</literal></entry>
@@ -3823,13 +3904,15 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
     </row>
     <row>
      <entry><literal>sort-start</literal></entry>
-     <entry><literal>(int, bool, int, int, bool)</literal></entry>
+     <entry><literal>(int, bool, int, int, bool, int)</literal></entry>
      <entry>Probe that fires when a sort operation is started.
       arg0 indicates heap, index or datum sort.
       arg1 is true for unique-value enforcement.
       arg2 is the number of key columns.
       arg3 is the number of kilobytes of work memory allowed.
-      arg4 is true if random access to the sort result is required.</entry>
+      arg4 is true if random access to the sort result is required.
+      arg5 indicates serial when <literal>0</literal>, parallel worker when
+      <literal>1</literal>, or parallel leader when <literal>2</literal>.</entry>
     </row>
     <row>
      <entry><literal>sort-done</literal></entry>
@@ -3966,7 +4049,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
   <para>
    The example below shows a DTrace script for analyzing transaction
    counts in the system, as an alternative to snapshotting
-   <structname>pg_stat_database</> before and after a performance test:
+   <structname>pg_stat_database</structname> before and after a performance test:
 <programlisting>
 #!/usr/sbin/dtrace -qs
 
@@ -4038,15 +4121,15 @@ Total time (ns)                        2312105013
 
    <step>
     <para>
-     Add the probe definitions to <filename>src/backend/utils/probes.d</>
+     Add the probe definitions to <filename>src/backend/utils/probes.d</filename>
     </para>
    </step>
 
    <step>
     <para>
-     Include <filename>pg_trace.h</> if it is not already present in the
+     Include <filename>pg_trace.h</filename> if it is not already present in the
      module(s) containing the probe points, and insert
-     <literal>TRACE_POSTGRESQL</> probe macros at the desired locations
+     <literal>TRACE_POSTGRESQL</literal> probe macros at the desired locations
      in the source code
     </para>
    </step>
@@ -4069,30 +4152,30 @@ Total time (ns)                        2312105013
   <procedure>
    <step>
     <para>
-     Decide that the probe will be named <literal>transaction-start</> and
+     Decide that the probe will be named <literal>transaction-start</literal> and
      requires a parameter of type <type>LocalTransactionId</type>
     </para>
    </step>
 
    <step>
     <para>
-     Add the probe definition to <filename>src/backend/utils/probes.d</>:
+     Add the probe definition to <filename>src/backend/utils/probes.d</filename>:
 <programlisting>
 probe transaction__start(LocalTransactionId);
 </programlisting>
      Note the use of the double underline in the probe name. In a DTrace
      script using the probe, the double underline needs to be replaced with a
-     hyphen, so <literal>transaction-start</> is the name to document for
+     hyphen, so <literal>transaction-start</literal> is the name to document for
      users.
     </para>
    </step>
 
    <step>
     <para>
-     At compile time, <literal>transaction__start</> is converted to a macro
-     called <literal>TRACE_POSTGRESQL_TRANSACTION_START</> (notice the
+     At compile time, <literal>transaction__start</literal> is converted to a macro
+     called <literal>TRACE_POSTGRESQL_TRANSACTION_START</literal> (notice the
      underscores are single here), which is available by including
-     <filename>pg_trace.h</>.  Add the macro call to the appropriate location
+     <filename>pg_trace.h</filename>.  Add the macro call to the appropriate location
      in the source code.  In this case, it looks like the following:
 
 <programlisting>
@@ -4136,9 +4219,9 @@ TRACE_POSTGRESQL_TRANSACTION_START(vxid.localTransactionId);
     <listitem>
      <para>
       On most platforms, if <productname>PostgreSQL</productname> is
-      built with <option>--enable-dtrace</>, the arguments to a trace
+      built with <option>--enable-dtrace</option>, the arguments to a trace
       macro will be evaluated whenever control passes through the
-      macro, <emphasis>even if no tracing is being done</>.  This is
+      macro, <emphasis>even if no tracing is being done</emphasis>.  This is
       usually not worth worrying about if you are just reporting the
       values of a few local variables.  But beware of putting expensive
       function calls into the arguments.  If you need to do that,
@@ -4150,7 +4233,7 @@ if (TRACE_POSTGRESQL_TRANSACTION_START_ENABLED())
     TRACE_POSTGRESQL_TRANSACTION_START(some_function(...));
 </programlisting>
 
-      Each trace macro has a corresponding <literal>ENABLED</> macro.
+      Each trace macro has a corresponding <literal>ENABLED</literal> macro.
      </para>
     </listitem>
    </itemizedlist>
diff --git a/doc/src/sgml/mvcc.sgml b/doc/src/sgml/mvcc.sgml
index dda0170886..24613e3c75 100644
--- a/doc/src/sgml/mvcc.sgml
+++ b/doc/src/sgml/mvcc.sgml
@@ -165,7 +165,7 @@
      <primary>transaction isolation level</primary>
     </indexterm>
     The SQL standard and PostgreSQL-implemented transaction isolation levels
-    are described in <xref linkend="mvcc-isolevel-table">.
+    are described in <xref linkend="mvcc-isolevel-table"/>.
    </para>
 
     <table tocentry="1" id="mvcc-isolevel-table">
@@ -279,14 +279,14 @@
     The table also shows that PostgreSQL's Repeatable Read implementation
     does not allow phantom reads.  Stricter behavior is permitted by the
     SQL standard: the four isolation levels only define which phenomena
-    must not happen, not which phenomena <emphasis>must</> happen.
+    must not happen, not which phenomena <emphasis>must</emphasis> happen.
     The behavior of the available isolation levels is detailed in the
     following subsections.
    </para>
 
    <para>
     To set the transaction isolation level of a transaction, use the
-    command <xref linkend="sql-set-transaction">.
+    command <xref linkend="sql-set-transaction"/>.
    </para>
 
    <important>
@@ -296,8 +296,8 @@
        made to a sequence (and therefore the counter of a
        column declared using <type>serial</type>) are immediately visible
        to all other transactions and are not rolled back if the transaction
-       that made the changes aborts.  See <xref linkend="functions-sequence">
-       and <xref linkend="datatype-serial">.
+       that made the changes aborts.  See <xref linkend="functions-sequence"/>
+       and <xref linkend="datatype-serial"/>.
      </para>
    </important>
 
@@ -317,7 +317,7 @@
     <firstterm>Read Committed</firstterm> is the default isolation
     level in <productname>PostgreSQL</productname>.  When a transaction
     uses this isolation level, a <command>SELECT</command> query
-    (without a <literal>FOR UPDATE/SHARE</> clause) sees only data
+    (without a <literal>FOR UPDATE/SHARE</literal> clause) sees only data
     committed before the query began; it never sees either uncommitted
     data or changes committed during query execution by concurrent
     transactions.  In effect, a <command>SELECT</command> query sees
@@ -345,7 +345,7 @@
     updating the originally found row.  If the first updater commits, the
     second updater will ignore the row if the first updater deleted it,
     otherwise it will attempt to apply its operation to the updated version of
-    the row.  The search condition of the command (the <literal>WHERE</> clause) is
+    the row.  The search condition of the command (the <literal>WHERE</literal> clause) is
     re-evaluated to see if the updated version of the row still matches the
     search condition.  If so, the second updater proceeds with its operation
     using the updated version of the row.  In the case of
@@ -355,19 +355,19 @@
    </para>
 
    <para>
-    <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</> clause
+    <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</literal> clause
     behaves similarly. In Read Committed mode, each row proposed for insertion
     will either insert or update. Unless there are unrelated errors, one of
     those two outcomes is guaranteed.  If a conflict originates in another
     transaction whose effects are not yet visible to the <command>INSERT
     </command>, the <command>UPDATE</command> clause will affect that row,
-    even though possibly <emphasis>no</> version of that row is
+    even though possibly <emphasis>no</emphasis> version of that row is
     conventionally visible to the command.
    </para>
 
    <para>
     <command>INSERT</command> with an <literal>ON CONFLICT DO
-    NOTHING</> clause may have insertion not proceed for a row due to
+    NOTHING</literal> clause may have insertion not proceed for a row due to
     the outcome of another transaction whose effects are not visible
     to the <command>INSERT</command> snapshot.  Again, this is only
     the case in Read Committed mode.
@@ -416,10 +416,10 @@ COMMIT;
     The <command>DELETE</command> will have no effect even though
     there is a <literal>website.hits = 10</literal> row before and
     after the <command>UPDATE</command>. This occurs because the
-    pre-update row value <literal>9</> is skipped, and when the
+    pre-update row value <literal>9</literal> is skipped, and when the
     <command>UPDATE</command> completes and <command>DELETE</command>
-    obtains a lock, the new row value is no longer <literal>10</> but
-    <literal>11</>, which no longer matches the criteria.
+    obtains a lock, the new row value is no longer <literal>10</literal> but
+    <literal>11</literal>, which no longer matches the criteria.
    </para>
 
    <para>
@@ -427,7 +427,7 @@ COMMIT;
     that includes all transactions committed up to that instant,
     subsequent commands in the same transaction will see the effects
     of the committed concurrent transaction in any case.  The point
-    at issue above is whether or not a <emphasis>single</> command
+    at issue above is whether or not a <emphasis>single</emphasis> command
     sees an absolutely consistent view of the database.
    </para>
 
@@ -461,7 +461,7 @@ COMMIT;
     even though they are not yet committed.)  This is a stronger
     guarantee than is required by the <acronym>SQL</acronym> standard
     for this isolation level, and prevents all of the phenomena described
-    in <xref linkend="mvcc-isolevel-table"> except for serialization
+    in <xref linkend="mvcc-isolevel-table"/> except for serialization
     anomalies.  As mentioned above, this is
     specifically allowed by the standard, which only describes the
     <emphasis>minimum</emphasis> protections each isolation level must
@@ -472,9 +472,9 @@ COMMIT;
     This level is different from Read Committed in that a query in a
     repeatable read transaction sees a snapshot as of the start of the
     first non-transaction-control statement in the
-    <emphasis>transaction</>, not as of the start
+    <emphasis>transaction</emphasis>, not as of the start
     of the current statement within the transaction.  Thus, successive
-    <command>SELECT</command> commands within a <emphasis>single</>
+    <command>SELECT</command> commands within a <emphasis>single</emphasis>
     transaction see the same data, i.e., they do not see changes made by
     other transactions that committed after their own transaction started.
    </para>
@@ -587,7 +587,7 @@ ERROR:  could not serialize access due to concurrent update
 
    <para>
     As an example,
-    consider a table <structname>mytab</>, initially containing:
+    consider a table <structname>mytab</structname>, initially containing:
 <screen>
  class | value
 -------+-------
@@ -600,14 +600,14 @@ ERROR:  could not serialize access due to concurrent update
 <screen>
 SELECT SUM(value) FROM mytab WHERE class = 1;
 </screen>
-    and then inserts the result (30) as the <structfield>value</> in a
-    new row with <structfield>class</><literal> = 2</>.  Concurrently, serializable
+    and then inserts the result (30) as the <structfield>value</structfield> in a
+    new row with <structfield>class</structfield><literal> = 2</literal>.  Concurrently, serializable
     transaction B computes:
 <screen>
 SELECT SUM(value) FROM mytab WHERE class = 2;
 </screen>
     and obtains the result 300, which it inserts in a new row with
-    <structfield>class</><literal> = 1</>.  Then both transactions try to commit.
+    <structfield>class</structfield><literal> = 1</literal>.  Then both transactions try to commit.
     If either transaction were running at the Repeatable Read isolation level,
     both would be allowed to commit; but since there is no serial order of execution
     consistent with the result, using Serializable transactions will allow one
@@ -639,11 +639,11 @@ ERROR:  could not serialize access due to read/write dependencies among transact
 
    <para>
     To guarantee true serializability <productname>PostgreSQL</productname>
-    uses <firstterm>predicate locking</>, which means that it keeps locks
+    uses <firstterm>predicate locking</firstterm>, which means that it keeps locks
     which allow it to determine when a write would have had an impact on
     the result of a previous read from a concurrent transaction, had it run
     first.  In <productname>PostgreSQL</productname> these locks do not
-    cause any blocking and therefore can <emphasis>not</> play any part in
+    cause any blocking and therefore can <emphasis>not</emphasis> play any part in
     causing a deadlock.  They are used to identify and flag dependencies
     among concurrent Serializable transactions which in certain combinations
     can lead to serialization anomalies.  In contrast, a Read Committed or
@@ -659,20 +659,20 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     other database systems, are based on data actually accessed by a
     transaction.  These will show up in the
     <link linkend="view-pg-locks"><structname>pg_locks</structname></link>
-    system view with a <literal>mode</> of <literal>SIReadLock</>.  The
+    system view with a <literal>mode</literal> of <literal>SIReadLock</literal>.  The
     particular locks
     acquired during execution of a query will depend on the plan used by
     the query, and multiple finer-grained locks (e.g., tuple locks) may be
     combined into fewer coarser-grained locks (e.g., page locks) during the
     course of the transaction to prevent exhaustion of the memory used to
-    track the locks.  A <literal>READ ONLY</> transaction may be able to
+    track the locks.  A <literal>READ ONLY</literal> transaction may be able to
     release its SIRead locks before completion, if it detects that no
     conflicts can still occur which could lead to a serialization anomaly.
-    In fact, <literal>READ ONLY</> transactions will often be able to
+    In fact, <literal>READ ONLY</literal> transactions will often be able to
     establish that fact at startup and avoid taking any predicate locks.
-    If you explicitly request a <literal>SERIALIZABLE READ ONLY DEFERRABLE</>
+    If you explicitly request a <literal>SERIALIZABLE READ ONLY DEFERRABLE</literal>
     transaction, it will block until it can establish this fact.  (This is
-    the <emphasis>only</> case where Serializable transactions block but
+    the <emphasis>only</emphasis> case where Serializable transactions block but
     Repeatable Read transactions don't.)  On the other hand, SIRead locks
     often need to be kept past transaction commit, until overlapping read
     write transactions complete.
@@ -695,13 +695,13 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     anomalies.  The monitoring of read/write dependencies has a cost, as does
     the restart of transactions which are terminated with a serialization
     failure, but balanced against the cost and blocking involved in use of
-    explicit locks and <literal>SELECT FOR UPDATE</> or <literal>SELECT FOR
-    SHARE</>, Serializable transactions are the best performance choice
+    explicit locks and <literal>SELECT FOR UPDATE</literal> or <literal>SELECT FOR
+    SHARE</literal>, Serializable transactions are the best performance choice
     for some environments.
    </para>
 
    <para>
-    While <productname>PostgreSQL</>'s Serializable transaction isolation
+    While <productname>PostgreSQL</productname>'s Serializable transaction isolation
     level only allows concurrent transactions to commit if it can prove there
     is a serial order of execution that would produce the same effect, it
     doesn't always prevent errors from being raised that would not occur in
@@ -709,7 +709,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     constraint violations caused by conflicts with overlapping Serializable
     transactions even after explicitly checking that the key isn't present
     before attempting to insert it.  This can be avoided by making sure
-    that <emphasis>all</> Serializable transactions that insert potentially
+    that <emphasis>all</emphasis> Serializable transactions that insert potentially
     conflicting keys explicitly check if they can do so first.  For example,
     imagine an application that asks the user for a new key and then checks
     that it doesn't exist already by trying to select it first, or generates
@@ -727,7 +727,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     <itemizedlist>
      <listitem>
       <para>
-       Declare transactions as <literal>READ ONLY</> when possible.
+       Declare transactions as <literal>READ ONLY</literal> when possible.
       </para>
      </listitem>
      <listitem>
@@ -748,14 +748,14 @@ ERROR:  could not serialize access due to read/write dependencies among transact
       <para>
        Don't leave connections dangling <quote>idle in transaction</quote>
        longer than necessary.  The configuration parameter
-       <xref linkend="guc-idle-in-transaction-session-timeout"> may be used to
+       <xref linkend="guc-idle-in-transaction-session-timeout"/> may be used to
        automatically disconnect lingering sessions.
       </para>
      </listitem>
      <listitem>
       <para>
-       Eliminate explicit locks, <literal>SELECT FOR UPDATE</>, and
-       <literal>SELECT FOR SHARE</> where no longer needed due to the
+       Eliminate explicit locks, <literal>SELECT FOR UPDATE</literal>, and
+       <literal>SELECT FOR SHARE</literal> where no longer needed due to the
        protections automatically provided by Serializable transactions.
       </para>
      </listitem>
@@ -765,9 +765,9 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        locks into a single relation-level predicate lock because the predicate
        lock table is short of memory, an increase in the rate of serialization
        failures may occur.  You can avoid this by increasing
-       <xref linkend="guc-max-pred-locks-per-transaction">,
-       <xref linkend="guc-max-pred-locks-per-relation">, and/or
-       <xref linkend="guc-max-pred-locks-per-page">.
+       <xref linkend="guc-max-pred-locks-per-transaction"/>,
+       <xref linkend="guc-max-pred-locks-per-relation"/>, and/or
+       <xref linkend="guc-max-pred-locks-per-page"/>.
       </para>
      </listitem>
      <listitem>
@@ -775,8 +775,8 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        A sequential scan will always necessitate a relation-level predicate
        lock.  This can result in an increased rate of serialization failures.
        It may be helpful to encourage the use of index scans by reducing
-       <xref linkend="guc-random-page-cost"> and/or increasing
-       <xref linkend="guc-cpu-tuple-cost">.  Be sure to weigh any decrease
+       <xref linkend="guc-random-page-cost"/> and/or increasing
+       <xref linkend="guc-cpu-tuple-cost"/>.  Be sure to weigh any decrease
        in transaction rollbacks and restarts against any overall change in
        query execution time.
       </para>
@@ -801,7 +801,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     most <productname>PostgreSQL</productname> commands automatically
     acquire locks of appropriate modes to ensure that referenced
     tables are not dropped or modified in incompatible ways while the
-    command executes.  (For example, <command>TRUNCATE</> cannot safely be
+    command executes.  (For example, <command>TRUNCATE</command> cannot safely be
     executed concurrently with other operations on the same table, so it
     obtains an exclusive lock on the table to enforce that.)
    </para>
@@ -811,7 +811,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     server, use the
     <link linkend="view-pg-locks"><structname>pg_locks</structname></link>
     system view. For more information on monitoring the status of the lock
-    manager subsystem, refer to <xref linkend="monitoring">.
+    manager subsystem, refer to <xref linkend="monitoring"/>.
    </para>
 
   <sect2 id="locking-tables">
@@ -826,14 +826,14 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     which they are used automatically by
     <productname>PostgreSQL</productname>.  You can also acquire any
     of these locks explicitly with the command <xref
-    linkend="sql-lock">.
+    linkend="sql-lock"/>.
     Remember that all of these lock modes are table-level locks,
     even if the name contains the word
     <quote>row</quote>; the names of the lock modes are historical.
     To some extent the names reflect the typical usage of each lock
     mode &mdash; but the semantics are all the same.  The only real difference
     between one lock mode and another is the set of lock modes with
-    which each conflicts (see <xref linkend="table-lock-compatibility">).
+    which each conflicts (see <xref linkend="table-lock-compatibility"/>).
     Two transactions cannot hold locks of conflicting
     modes on the same table at the same time.  (However, a transaction
     never conflicts with itself.  For example, it might acquire
@@ -860,7 +860,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
 
         <para>
          The <command>SELECT</command> command acquires a lock of this mode on
-         referenced tables.  In general, any query that only <emphasis>reads</> a table
+         referenced tables.  In general, any query that only <emphasis>reads</emphasis> a table
          and does not modify it will acquire this lock mode.
         </para>
        </listitem>
@@ -904,7 +904,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
          acquire this lock mode on the target table (in addition to
          <literal>ACCESS SHARE</literal> locks on any other referenced
          tables).  In general, this lock mode will be acquired by any
-         command that <emphasis>modifies data</> in a table.
+         command that <emphasis>modifies data</emphasis> in a table.
         </para>
        </listitem>
       </varlistentry>
@@ -920,16 +920,16 @@ ERROR:  could not serialize access due to read/write dependencies among transact
          EXCLUSIVE</literal>, <literal>EXCLUSIVE</literal>, and
          <literal>ACCESS EXCLUSIVE</literal> lock modes.
          This mode protects a table against
-         concurrent schema changes and <command>VACUUM</> runs.
+         concurrent schema changes and <command>VACUUM</command> runs.
         </para>
 
         <para>
          Acquired by <command>VACUUM</command> (without <option>FULL</option>),
-         <command>ANALYZE</>, <command>CREATE INDEX CONCURRENTLY</>,
-         <command>CREATE STATISTICS</> and
+         <command>ANALYZE</command>, <command>CREATE INDEX CONCURRENTLY</command>,
+         <command>CREATE STATISTICS</command> and
          <command>ALTER TABLE VALIDATE</command> and other
          <command>ALTER TABLE</command> variants (for full details see
-         <xref linkend="SQL-ALTERTABLE">).
+         <xref linkend="sql-altertable"/>).
         </para>
        </listitem>
       </varlistentry>
@@ -972,7 +972,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
         <para>
          Acquired by <command>CREATE COLLATION</command>,
          <command>CREATE TRIGGER</command>, and many forms of
-         <command>ALTER TABLE</command> (see <xref linkend="SQL-ALTERTABLE">).
+         <command>ALTER TABLE</command> (see <xref linkend="sql-altertable"/>).
         </para>
        </listitem>
       </varlistentry>
@@ -1016,12 +1016,12 @@ ERROR:  could not serialize access due to read/write dependencies among transact
         </para>
 
         <para>
-         Acquired by the <command>DROP TABLE</>,
+         Acquired by the <command>DROP TABLE</command>,
          <command>TRUNCATE</command>, <command>REINDEX</command>,
          <command>CLUSTER</command>, <command>VACUUM FULL</command>,
          and <command>REFRESH MATERIALIZED VIEW</command> (without
          <option>CONCURRENTLY</option>)
-         commands. Many forms of <command>ALTER TABLE</> also acquire
+         commands. Many forms of <command>ALTER TABLE</command> also acquire
          a lock at this level. This is also the default lock mode for
          <command>LOCK TABLE</command> statements that do not specify
          a mode explicitly.
@@ -1042,9 +1042,9 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     Once acquired, a lock is normally held till end of transaction.  But if a
     lock is acquired after establishing a savepoint, the lock is released
     immediately if the savepoint is rolled back to.  This is consistent with
-    the principle that <command>ROLLBACK</> cancels all effects of the
+    the principle that <command>ROLLBACK</command> cancels all effects of the
     commands since the savepoint.  The same holds for locks acquired within a
-    <application>PL/pgSQL</> exception block: an error escape from the block
+    <application>PL/pgSQL</application> exception block: an error escape from the block
     releases locks acquired within it.
    </para>
 
@@ -1053,9 +1053,9 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     <table tocentry="1" id="table-lock-compatibility">
      <title> Conflicting Lock Modes</title>
      <tgroup cols="9">
-      <colspec colnum="2" colname="lockst">
-      <colspec colnum="9" colname="lockend">
-      <spanspec namest="lockst" nameend="lockend" spanname="lockreq">
+      <colspec colnum="2" colname="lockst"/>
+      <colspec colnum="9" colname="lockend"/>
+      <spanspec namest="lockst" nameend="lockend" spanname="lockreq"/>
       <thead>
        <row>
         <entry morerows="1">Requested Lock Mode</entry>
@@ -1173,7 +1173,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
      In addition to table-level locks, there are row-level locks, which
      are listed as below with the contexts in which they are used
      automatically by <productname>PostgreSQL</productname>.  See
-     <xref linkend="row-lock-compatibility"> for a complete table of
+     <xref linkend="row-lock-compatibility"/> for a complete table of
      row-level lock conflicts.  Note that a transaction can hold
      conflicting locks on the same row, even in different subtransactions;
      but other than that, two transactions can never hold conflicting locks
@@ -1204,17 +1204,17 @@ ERROR:  could not serialize access due to read/write dependencies among transact
          concurrent transaction that has run any of those commands on the
          same row,
          and will then lock and return the updated row (or no row, if the
-         row was deleted).  Within a <literal>REPEATABLE READ</> or
-         <literal>SERIALIZABLE</> transaction,
+         row was deleted).  Within a <literal>REPEATABLE READ</literal> or
+         <literal>SERIALIZABLE</literal> transaction,
          however, an error will be thrown if a row to be locked has changed
          since the transaction started.  For further discussion see
-         <xref linkend="applevel-consistency">.
+         <xref linkend="applevel-consistency"/>.
         </para>
         <para>
-         The <literal>FOR UPDATE</> lock mode
-         is also acquired by any <command>DELETE</> on a row, and also by an
-         <command>UPDATE</> that modifies the values on certain columns.  Currently,
-         the set of columns considered for the <command>UPDATE</> case are those that
+         The <literal>FOR UPDATE</literal> lock mode
+         is also acquired by any <command>DELETE</command> on a row, and also by an
+         <command>UPDATE</command> that modifies the values on certain columns.  Currently,
+         the set of columns considered for the <command>UPDATE</command> case are those that
          have a unique index on them that can be used in a foreign key (so partial
          indexes and expressional indexes are not considered), but this may change
          in the future.
@@ -1228,11 +1228,11 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        </term>
        <listitem>
         <para>
-         Behaves similarly to <literal>FOR UPDATE</>, except that the lock
+         Behaves similarly to <literal>FOR UPDATE</literal>, except that the lock
          acquired is weaker: this lock will not block
-         <literal>SELECT FOR KEY SHARE</> commands that attempt to acquire
+         <literal>SELECT FOR KEY SHARE</literal> commands that attempt to acquire
          a lock on the same rows. This lock mode is also acquired by any
-         <command>UPDATE</> that does not acquire a <literal>FOR UPDATE</> lock.
+         <command>UPDATE</command> that does not acquire a <literal>FOR UPDATE</literal> lock.
         </para>
        </listitem>
       </varlistentry>
@@ -1243,12 +1243,12 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        </term>
        <listitem>
         <para>
-         Behaves similarly to <literal>FOR NO KEY UPDATE</>, except that it
+         Behaves similarly to <literal>FOR NO KEY UPDATE</literal>, except that it
          acquires a shared lock rather than exclusive lock on each retrieved
          row.  A shared lock blocks other transactions from performing
          <command>UPDATE</command>, <command>DELETE</command>,
          <command>SELECT FOR UPDATE</command> or
-         <command>SELECT FOR NO KEY UPDATE</> on these rows, but it does not
+         <command>SELECT FOR NO KEY UPDATE</command> on these rows, but it does not
          prevent them from performing <command>SELECT FOR SHARE</command> or
          <command>SELECT FOR KEY SHARE</command>.
         </para>
@@ -1262,13 +1262,13 @@ ERROR:  could not serialize access due to read/write dependencies among transact
        <listitem>
         <para>
          Behaves similarly to <literal>FOR SHARE</literal>, except that the
-         lock is weaker: <literal>SELECT FOR UPDATE</> is blocked, but not
-         <literal>SELECT FOR NO KEY UPDATE</>.  A key-shared lock blocks
+         lock is weaker: <literal>SELECT FOR UPDATE</literal> is blocked, but not
+         <literal>SELECT FOR NO KEY UPDATE</literal>.  A key-shared lock blocks
          other transactions from performing <command>DELETE</command> or
          any <command>UPDATE</command> that changes the key values, but not
-         other <command>UPDATE</>, and neither does it prevent
-         <command>SELECT FOR NO KEY UPDATE</>, <command>SELECT FOR SHARE</>,
-         or <command>SELECT FOR KEY SHARE</>.
+         other <command>UPDATE</command>, and neither does it prevent
+         <command>SELECT FOR NO KEY UPDATE</command>, <command>SELECT FOR SHARE</command>,
+         or <command>SELECT FOR KEY SHARE</command>.
         </para>
        </listitem>
       </varlistentry>
@@ -1286,9 +1286,9 @@ ERROR:  could not serialize access due to read/write dependencies among transact
     <table tocentry="1" id="row-lock-compatibility">
      <title>Conflicting Row-level Locks</title>
      <tgroup cols="5">
-      <colspec colnum="2" colname="lockst">
-      <colspec colnum="5" colname="lockend">
-      <spanspec namest="lockst" nameend="lockend" spanname="lockreq">
+      <colspec colnum="2" colname="lockst"/>
+      <colspec colnum="5" colname="lockend"/>
+      <spanspec namest="lockst" nameend="lockend" spanname="lockreq"/>
       <thead>
        <row>
         <entry morerows="1">Requested Lock Mode</entry>
@@ -1357,7 +1357,7 @@ ERROR:  could not serialize access due to read/write dependencies among transact
 
     <para>
      The use of explicit locking can increase the likelihood of
-     <firstterm>deadlocks</>, wherein two (or more) transactions each
+     <firstterm>deadlocks</firstterm>, wherein two (or more) transactions each
      hold locks that the other wants.  For example, if transaction 1
      acquires an exclusive lock on table A and then tries to acquire
      an exclusive lock on table B, while transaction 2 has already
@@ -1447,12 +1447,12 @@ UPDATE accounts SET balance = balance - 100.00 WHERE acctnum = 22222;
     <para>
      <productname>PostgreSQL</productname> provides a means for
      creating locks that have application-defined meanings.  These are
-     called <firstterm>advisory locks</>, because the system does not
+     called <firstterm>advisory locks</firstterm>, because the system does not
      enforce their use &mdash; it is up to the application to use them
      correctly.  Advisory locks can be useful for locking strategies
      that are an awkward fit for the MVCC model.
      For example, a common use of advisory locks is to emulate pessimistic
-     locking strategies typical of so-called <quote>flat file</> data
+     locking strategies typical of so-called <quote>flat file</quote> data
      management systems.
      While a flag stored in a table could be used for the same purpose,
      advisory locks are faster, avoid table bloat, and are automatically
@@ -1495,8 +1495,8 @@ UPDATE accounts SET balance = balance - 100.00 WHERE acctnum = 22222;
     <para>
      Both advisory locks and regular locks are stored in a shared memory
      pool whose size is defined by the configuration variables
-     <xref linkend="guc-max-locks-per-transaction"> and
-     <xref linkend="guc-max-connections">.
+     <xref linkend="guc-max-locks-per-transaction"/> and
+     <xref linkend="guc-max-connections"/>.
      Care must be taken not to exhaust this
      memory or the server will be unable to grant any locks at all.
      This imposes an upper limit on the number of advisory locks
@@ -1506,7 +1506,7 @@ UPDATE accounts SET balance = balance - 100.00 WHERE acctnum = 22222;
 
     <para>
      In certain cases using advisory locking methods, especially in queries
-     involving explicit ordering and <literal>LIMIT</> clauses, care must be
+     involving explicit ordering and <literal>LIMIT</literal> clauses, care must be
      taken to control the locks acquired because of the order in which SQL
      expressions are evaluated.  For example:
 <screen>
@@ -1518,7 +1518,7 @@ SELECT pg_advisory_lock(q.id) FROM
 ) q; -- ok
 </screen>
      In the above queries, the second form is dangerous because the
-     <literal>LIMIT</> is not guaranteed to be applied before the locking
+     <literal>LIMIT</literal> is not guaranteed to be applied before the locking
      function is executed.  This might cause some locks to be acquired
      that the application was not expecting, and hence would fail to release
      (until it ends the session).
@@ -1529,7 +1529,7 @@ SELECT pg_advisory_lock(q.id) FROM
 
     <para>
      The functions provided to manipulate advisory locks are described in
-     <xref linkend="functions-advisory-locks">.
+     <xref linkend="functions-advisory-locks"/>.
     </para>
    </sect2>
 
@@ -1565,7 +1565,7 @@ SELECT pg_advisory_lock(q.id) FROM
    </para>
 
    <para>
-    As mentioned in <xref linkend="xact-serializable">, Serializable
+    As mentioned in <xref linkend="xact-serializable"/>, Serializable
     transactions are just Repeatable Read transactions which add
     nonblocking monitoring for dangerous patterns of read/write conflicts.
     When a pattern is detected which could cause a cycle in the apparent
@@ -1590,7 +1590,7 @@ SELECT pg_advisory_lock(q.id) FROM
      for application programmers if the application software goes through a
      framework which automatically retries transactions which are rolled
      back with a serialization failure.  It may be a good idea to set
-     <literal>default_transaction_isolation</> to <literal>serializable</>.
+     <literal>default_transaction_isolation</literal> to <literal>serializable</literal>.
      It would also be wise to take some action to ensure that no other
      transaction isolation level is used, either inadvertently or to
      subvert integrity checks, through checks of the transaction isolation
@@ -1598,13 +1598,13 @@ SELECT pg_advisory_lock(q.id) FROM
     </para>
 
     <para>
-     See <xref linkend="xact-serializable"> for performance suggestions.
+     See <xref linkend="xact-serializable"/> for performance suggestions.
     </para>
 
     <warning>
      <para>
       This level of integrity protection using Serializable transactions
-      does not yet extend to hot standby mode (<xref linkend="hot-standby">).
+      does not yet extend to hot standby mode (<xref linkend="hot-standby"/>).
       Because of that, those using hot standby may want to use Repeatable
       Read and explicit locking on the master.
      </para>
@@ -1660,7 +1660,7 @@ SELECT pg_advisory_lock(q.id) FROM
      includes some but not all post-transaction-start changes.  In such cases
      a careful person might wish to lock all tables needed for the check,
      in order to get an indisputable picture of current reality.  A
-     <literal>SHARE</> mode (or higher) lock guarantees that there are no
+     <literal>SHARE</literal> mode (or higher) lock guarantees that there are no
      uncommitted changes in the locked table, other than those of the current
      transaction.
     </para>
@@ -1675,8 +1675,8 @@ SELECT pg_advisory_lock(q.id) FROM
      transaction predates obtaining the lock, it might predate some now-committed
      changes in the table.  A repeatable read transaction's snapshot is actually
      frozen at the start of its first query or data-modification command
-     (<literal>SELECT</>, <literal>INSERT</>,
-     <literal>UPDATE</>, or <literal>DELETE</>), so
+     (<literal>SELECT</literal>, <literal>INSERT</literal>,
+     <literal>UPDATE</literal>, or <literal>DELETE</literal>), so
      it is possible to obtain locks explicitly before the snapshot is
      frozen.
     </para>
@@ -1687,8 +1687,8 @@ SELECT pg_advisory_lock(q.id) FROM
    <title>Caveats</title>
 
    <para>
-    Some DDL commands, currently only <xref linkend="sql-truncate"> and the
-    table-rewriting forms of <xref linkend="sql-altertable">, are not
+    Some DDL commands, currently only <xref linkend="sql-truncate"/> and the
+    table-rewriting forms of <xref linkend="sql-altertable"/>, are not
     MVCC-safe.  This means that after the truncation or rewrite commits, the
     table will appear empty to concurrent transactions, if they are using a
     snapshot taken before the DDL command committed.  This will only be an
@@ -1705,7 +1705,7 @@ SELECT pg_advisory_lock(q.id) FROM
    <para>
     Support for the Serializable transaction isolation level has not yet
     been added to Hot Standby replication targets (described in
-    <xref linkend="hot-standby">).  The strictest isolation level currently
+    <xref linkend="hot-standby"/>).  The strictest isolation level currently
     supported in hot standby mode is Repeatable Read.  While performing all
     permanent database writes within Serializable transactions on the
     master will ensure that all standbys will eventually reach a consistent
diff --git a/doc/src/sgml/nls.sgml b/doc/src/sgml/nls.sgml
index 1d331473af..16e25abd31 100644
--- a/doc/src/sgml/nls.sgml
+++ b/doc/src/sgml/nls.sgml
@@ -7,12 +7,12 @@
   <title>For the Translator</title>
 
   <para>
-   <productname>PostgreSQL</>
+   <productname>PostgreSQL</productname>
    programs (server and client) can issue their messages in
    your favorite language &mdash; if the messages have been translated.
    Creating and maintaining translated message sets needs the help of
    people who speak their own language well and want to contribute to
-   the <productname>PostgreSQL</> effort.  You do not have to be a
+   the <productname>PostgreSQL</productname> effort.  You do not have to be a
    programmer at all
    to do this.  This section explains how to help.
   </para>
@@ -170,8 +170,8 @@ make init-po
     This will create a file
     <filename><replaceable>progname</replaceable>.pot</filename>.
     (<filename>.pot</filename> to distinguish it from PO files that
-    are <quote>in production</quote>. The <literal>T</> stands for
-    <quote>template</>.)
+    are <quote>in production</quote>. The <literal>T</literal> stands for
+    <quote>template</quote>.)
     Copy this file to
     <filename><replaceable>language</replaceable>.po</filename> and
     edit it.  To make it known that the new language is available,
@@ -234,7 +234,7 @@ make update-po
 
      <listitem>
       <para>
-       If the original is a <function>printf</> format string, the translation
+       If the original is a <function>printf</function> format string, the translation
        also needs to be.  The translation also needs to have the same
        format specifiers in the same order.  Sometimes the natural
        rules of the language make this impossible or at least awkward.
@@ -272,7 +272,7 @@ msgstr "Die Datei %2$s hat %1$u Zeichen."
        open file %s</literal>) should probably not start with a
        capital letter (if your language distinguishes letter case) or
        end with a period (if your language uses punctuation marks).
-       It might help to read <xref linkend="error-style-guide">.
+       It might help to read <xref linkend="error-style-guide"/>.
       </para>
      </listitem>
 
@@ -301,7 +301,7 @@ msgstr "Die Datei %2$s hat %1$u Zeichen."
   <para>
    This section describes how to implement native language support in a
    program or library that is part of the
-   <productname>PostgreSQL</> distribution.
+   <productname>PostgreSQL</productname> distribution.
    Currently, it only applies to C programs.
   </para>
 
@@ -447,7 +447,7 @@ fprintf(stderr, gettext("panic level %d\n"), lvl);
 printf("Files were %s.\n", flag ? "copied" : "removed");
 </programlisting>
       The word order within the sentence might be different in other
-      languages.  Also, even if you remember to call <function>gettext()</> on
+      languages.  Also, even if you remember to call <function>gettext()</function> on
       each fragment, the fragments might not translate well separately.  It's
       better to duplicate a little code so that each message to be
       translated is a coherent whole.  Only numbers, file names, and
@@ -481,7 +481,7 @@ printf("number of copied files: %d", n);
      <para>
       If you really want to construct a properly pluralized message,
       there is support for this, but it's a bit awkward.  When generating
-      a primary or detail error message in <function>ereport()</>, you can
+      a primary or detail error message in <function>ereport()</function>, you can
       write something like this:
 <programlisting>
 errmsg_plural("copied %d file",
@@ -496,17 +496,17 @@ errmsg_plural("copied %d file",
       are formatted per the format string as usual.  (Normally, the
       pluralization control value will also be one of the values to be
       formatted, so it has to be written twice.)  In English it only
-      matters whether <replaceable>n</> is 1 or not 1, but in other
+      matters whether <replaceable>n</replaceable> is 1 or not 1, but in other
       languages there can be many different plural forms.  The translator
       sees the two English forms as a group and has the opportunity to
       supply multiple substitute strings, with the appropriate one being
-      selected based on the run-time value of <replaceable>n</>.
+      selected based on the run-time value of <replaceable>n</replaceable>.
      </para>
 
      <para>
       If you need to pluralize a message that isn't going directly to an
-      <function>errmsg</> or <function>errdetail</> report, you have to use
-      the underlying function <function>ngettext</>.  See the gettext
+      <function>errmsg</function> or <function>errdetail</function> report, you have to use
+      the underlying function <function>ngettext</function>.  See the gettext
       documentation.
      </para>
     </listitem>
diff --git a/doc/src/sgml/notation.sgml b/doc/src/sgml/notation.sgml
index 2f350a329d..bd1e8f629a 100644
--- a/doc/src/sgml/notation.sgml
+++ b/doc/src/sgml/notation.sgml
@@ -7,17 +7,17 @@
   The following conventions are used in the synopsis of a command:
   brackets (<literal>[</literal> and <literal>]</literal>) indicate
   optional parts.  (In the synopsis of a Tcl command, question marks
-  (<literal>?</>) are used instead, as is usual in Tcl.)  Braces
+  (<literal>?</literal>) are used instead, as is usual in Tcl.)  Braces
   (<literal>{</literal> and <literal>}</literal>) and vertical lines
   (<literal>|</literal>) indicate that you must choose one
-  alternative.  Dots (<literal>...</>) mean that the preceding element
+  alternative.  Dots (<literal>...</literal>) mean that the preceding element
   can be repeated.
  </para>
 
  <para>
   Where it enhances the clarity, SQL commands are preceded by the
-  prompt <literal>=&gt;</>, and shell commands are preceded by the
-  prompt <literal>$</>.  Normally, prompts are not shown, though.
+  prompt <literal>=&gt;</literal>, and shell commands are preceded by the
+  prompt <literal>$</literal>.  Normally, prompts are not shown, though.
  </para>
 
  <para>
diff --git a/doc/src/sgml/oid2name.sgml b/doc/src/sgml/oid2name.sgml
index 97b170a23f..dd875281c8 100644
--- a/doc/src/sgml/oid2name.sgml
+++ b/doc/src/sgml/oid2name.sgml
@@ -27,15 +27,15 @@
   <title>Description</title>
 
  <para>
-  <application>oid2name</> is a utility program that helps administrators to
+  <application>oid2name</application> is a utility program that helps administrators to
   examine the file structure used by PostgreSQL.  To make use of it, you need
   to be familiar with the database file structure, which is described in
-  <xref linkend="storage">.
+  <xref linkend="storage"/>.
  </para>
 
  <note>
   <para>
-   The name <quote>oid2name</> is historical, and is actually rather
+   The name <quote>oid2name</quote> is historical, and is actually rather
    misleading, since most of the time when you use it, you will really
    be concerned with tables' filenode numbers (which are the file names
    visible in the database directories).  Be sure you understand the
@@ -60,8 +60,8 @@
    <variablelist>
 
     <varlistentry>
-     <term><option>-f</option> <replaceable>filenode</></term>
-     <listitem><para>show info for table with filenode <replaceable>filenode</></para></listitem>
+     <term><option>-f</option> <replaceable>filenode</replaceable></term>
+     <listitem><para>show info for table with filenode <replaceable>filenode</replaceable></para></listitem>
     </varlistentry>
 
     <varlistentry>
@@ -70,8 +70,8 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>-o</option> <replaceable>oid</></term>
-     <listitem><para>show info for table with OID <replaceable>oid</></para></listitem>
+     <term><option>-o</option> <replaceable>oid</replaceable></term>
+     <listitem><para>show info for table with OID <replaceable>oid</replaceable></para></listitem>
     </varlistentry>
 
     <varlistentry>
@@ -93,13 +93,13 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>-t</option> <replaceable>tablename_pattern</></term>
-     <listitem><para>show info for table(s) matching <replaceable>tablename_pattern</></para></listitem>
+     <term><option>-t</option> <replaceable>tablename_pattern</replaceable></term>
+     <listitem><para>show info for table(s) matching <replaceable>tablename_pattern</replaceable></para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-V</></term>
-     <term><option>--version</></term>
+     <term><option>-V</option></term>
+     <term><option>--version</option></term>
      <listitem>
       <para>
        Print the <application>oid2name</application> version and exit.
@@ -115,8 +115,8 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>-?</></term>
-     <term><option>--help</></term>
+     <term><option>-?</option></term>
+     <term><option>--help</option></term>
      <listitem>
       <para>
        Show help about <application>oid2name</application> command line
@@ -133,27 +133,27 @@
 
    <variablelist>
     <varlistentry>
-     <term><option>-d</option> <replaceable>database</></term>
+     <term><option>-d</option> <replaceable>database</replaceable></term>
      <listitem><para>database to connect to</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-H</option> <replaceable>host</></term>
+     <term><option>-H</option> <replaceable>host</replaceable></term>
      <listitem><para>database server's host</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-p</option> <replaceable>port</></term>
+     <term><option>-p</option> <replaceable>port</replaceable></term>
      <listitem><para>database server's port</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-U</option> <replaceable>username</></term>
+     <term><option>-U</option> <replaceable>username</replaceable></term>
      <listitem><para>user name to connect as</para></listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-P</option> <replaceable>password</></term>
+     <term><option>-P</option> <replaceable>password</replaceable></term>
      <listitem><para>password (deprecated &mdash; putting this on the command line
       is a security hazard)</para></listitem>
     </varlistentry>
@@ -163,27 +163,27 @@
 
   <para>
    To display specific tables, select which tables to show by
-   using <option>-o</>, <option>-f</> and/or <option>-t</>.
-   <option>-o</> takes an OID,
-   <option>-f</> takes a filenode,
-   and <option>-t</> takes a table name (actually, it's a <literal>LIKE</>
-   pattern, so you can use things like <literal>foo%</>).
+   using <option>-o</option>, <option>-f</option> and/or <option>-t</option>.
+   <option>-o</option> takes an OID,
+   <option>-f</option> takes a filenode,
+   and <option>-t</option> takes a table name (actually, it's a <literal>LIKE</literal>
+   pattern, so you can use things like <literal>foo%</literal>).
    You can use as many
    of these options as you like, and the listing will include all objects
    matched by any of the options.  But note that these options can only
-   show objects in the database given by <option>-d</>.
+   show objects in the database given by <option>-d</option>.
   </para>
 
   <para>
-   If you don't give any of <option>-o</>, <option>-f</> or <option>-t</>,
-   but do give <option>-d</>, it will list all tables in the database
-   named by <option>-d</>.  In this mode, the <option>-S</> and
-   <option>-i</> options control what gets listed.
+   If you don't give any of <option>-o</option>, <option>-f</option> or <option>-t</option>,
+   but do give <option>-d</option>, it will list all tables in the database
+   named by <option>-d</option>.  In this mode, the <option>-S</option> and
+   <option>-i</option> options control what gets listed.
   </para>
 
   <para>
-   If you don't give <option>-d</> either, it will show a listing of database
-   OIDs.  Alternatively you can give <option>-s</> to get a tablespace
+   If you don't give <option>-d</option> either, it will show a listing of database
+   OIDs.  Alternatively you can give <option>-s</option> to get a tablespace
    listing.
   </para>
  </refsect1>
@@ -192,7 +192,7 @@
   <title>Notes</title>
 
   <para>
-   <application>oid2name</> requires a running database server with
+   <application>oid2name</application> requires a running database server with
    non-corrupt system catalogs.  It is therefore of only limited use
    for recovering from catastrophic database corruption situations.
   </para>
diff --git a/doc/src/sgml/pageinspect.sgml b/doc/src/sgml/pageinspect.sgml
index e46f5ca6bc..23570af4bf 100644
--- a/doc/src/sgml/pageinspect.sgml
+++ b/doc/src/sgml/pageinspect.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>pageinspect</> module provides functions that allow you to
+  The <filename>pageinspect</filename> module provides functions that allow you to
   inspect the contents of database pages at a low level, which is useful for
   debugging purposes.  All of these functions may be used only by superusers.
  </para>
@@ -28,7 +28,7 @@
     <listitem>
      <para>
       <function>get_raw_page</function> reads the specified block of the named
-      relation and returns a copy as a <type>bytea</> value.  This allows a
+      relation and returns a copy as a <type>bytea</type> value.  This allows a
       single time-consistent copy of the block to be obtained.
       <replaceable>fork</replaceable> should be <literal>'main'</literal> for
       the main data fork, <literal>'fsm'</literal> for the free space map,
@@ -63,7 +63,7 @@
     <listitem>
      <para>
       <function>page_header</function> shows fields that are common to all
-      <productname>PostgreSQL</> heap and index pages.
+      <productname>PostgreSQL</productname> heap and index pages.
      </para>
 
      <para>
@@ -76,8 +76,8 @@ test=# SELECT * FROM page_header(get_raw_page('pg_class', 0));
  0/24A1B50 |        0 |      1 |   232 |   368 |    8192 |     8192 |       4 |         0
 </screen>
       The returned columns correspond to the fields in the
-      <structname>PageHeaderData</> struct.
-      See <filename>src/include/storage/bufpage.h</> for details.
+      <structname>PageHeaderData</structname> struct.
+      See <filename>src/include/storage/bufpage.h</filename> for details.
      </para>
 
      <para>
@@ -147,8 +147,8 @@ test=# SELECT page_checksum(get_raw_page('pg_class', 0), 0);
 <screen>
 test=# SELECT * FROM heap_page_items(get_raw_page('pg_class', 0));
 </screen>
-      See <filename>src/include/storage/itemid.h</> and
-      <filename>src/include/access/htup_details.h</> for explanations of the fields
+      See <filename>src/include/storage/itemid.h</filename> and
+      <filename>src/include/access/htup_details.h</filename> for explanations of the fields
       returned.
      </para>
     </listitem>
@@ -221,7 +221,7 @@ test=# SELECT * FROM heap_page_item_attrs(get_raw_page('pg_class', 0), 'pg_class
       next slot to be returned from the page, is also printed.
      </para>
      <para>
-      See <filename>src/backend/storage/freespace/README</> for more
+      See <filename>src/backend/storage/freespace/README</filename> for more
       information on the structure of an FSM page.
      </para>
     </listitem>
@@ -315,21 +315,21 @@ test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
           7 | (0,7)   |      12 | f     | f    | 29 27 00 00
           8 | (0,8)   |      12 | f     | f    | 2a 27 00 00
 </screen>
-      In a B-tree leaf page, <structfield>ctid</> points to a heap tuple.
-      In an internal page, the block number part of <structfield>ctid</>
+      In a B-tree leaf page, <structfield>ctid</structfield> points to a heap tuple.
+      In an internal page, the block number part of <structfield>ctid</structfield>
       points to another page in the index itself, while the offset part
       (the second number) is ignored and is usually 1.
      </para>
      <para>
       Note that the first item on any non-rightmost page (any page with
-      a non-zero value in the <structfield>btpo_next</> field) is the
-      page's <quote>high key</quote>, meaning its <structfield>data</>
+      a non-zero value in the <structfield>btpo_next</structfield> field) is the
+      page's <quote>high key</quote>, meaning its <structfield>data</structfield>
       serves as an upper bound on all items appearing on the page, while
-      its <structfield>ctid</> field is meaningless.  Also, on non-leaf
+      its <structfield>ctid</structfield> field is meaningless.  Also, on non-leaf
       pages, the first real data item (the first item that is not a high
       key) is a <quote>minus infinity</quote> item, with no actual value
-      in its <structfield>data</> field.  Such an item does have a valid
-      downlink in its <structfield>ctid</> field, however.
+      in its <structfield>data</structfield> field.  Such an item does have a valid
+      downlink in its <structfield>ctid</structfield> field, however.
      </para>
     </listitem>
    </varlistentry>
@@ -345,7 +345,7 @@ test=# SELECT * FROM bt_page_items('pg_cast_oid_index', 1);
     <listitem>
      <para>
       It is also possible to pass a page to <function>bt_page_items</function>
-      as a <type>bytea</> value.  A page image obtained
+      as a <type>bytea</type> value.  A page image obtained
       with <function>get_raw_page</function> should be passed as argument.  So
       the last example could also be rewritten like this:
 <screen>
@@ -470,8 +470,8 @@ test=# SELECT * FROM brin_page_items(get_raw_page('brinidx', 5),
         139 |      8 |      2 | f        | f        | f           | {177 .. 264}
 </screen>
       The returned columns correspond to the fields in the
-      <structname>BrinMemTuple</> and <structname>BrinValues</> structs.
-      See <filename>src/include/access/brin_tuple.h</> for details.
+      <structname>BrinMemTuple</structname> and <structname>BrinValues</structname> structs.
+      See <filename>src/include/access/brin_tuple.h</filename> for details.
      </para>
     </listitem>
    </varlistentry>
diff --git a/doc/src/sgml/parallel.sgml b/doc/src/sgml/parallel.sgml
index 2a25f21eb4..f15a9233cb 100644
--- a/doc/src/sgml/parallel.sgml
+++ b/doc/src/sgml/parallel.sgml
@@ -8,7 +8,7 @@
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</> can devise query plans which can leverage
+   <productname>PostgreSQL</productname> can devise query plans which can leverage
    multiple CPUs in order to answer queries faster.  This feature is known
    as parallel query.  Many queries cannot benefit from parallel query, either
    due to limitations of the current implementation or because there is no
@@ -47,32 +47,32 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     In all cases, the <literal>Gather</literal> or
     <literal>Gather Merge</literal> node will have exactly one
     child plan, which is the portion of the plan that will be executed in
-    parallel.  If the <literal>Gather</> or <literal>Gather Merge</> node is
+    parallel.  If the <literal>Gather</literal> or <literal>Gather Merge</literal> node is
     at the very top of the plan tree, then the entire query will execute in
     parallel.  If it is somewhere else in the plan tree, then only the portion
     of the plan below it will run in parallel.  In the example above, the
     query accesses only one table, so there is only one plan node other than
-    the <literal>Gather</> node itself; since that plan node is a child of the
-    <literal>Gather</> node, it will run in parallel.
+    the <literal>Gather</literal> node itself; since that plan node is a child of the
+    <literal>Gather</literal> node, it will run in parallel.
    </para>
 
    <para>
-    <link linkend="using-explain">Using EXPLAIN</>, you can see the number of
-    workers chosen by the planner.  When the <literal>Gather</> node is reached
+    <link linkend="using-explain">Using EXPLAIN</link>, you can see the number of
+    workers chosen by the planner.  When the <literal>Gather</literal> node is reached
     during query execution, the process which is implementing the user's
     session will request a number of <link linkend="bgworker">background
     worker processes</link> equal to the number
     of workers chosen by the planner.  The number of background workers that
     the planner will consider using is limited to at most
-    <xref linkend="guc-max-parallel-workers-per-gather">.  The total number
+    <xref linkend="guc-max-parallel-workers-per-gather"/>.  The total number
     of background workers that can exist at any one time is limited by both
-    <xref linkend="guc-max-worker-processes"> and
-    <xref linkend="guc-max-parallel-workers">.  Therefore, it is possible for a
+    <xref linkend="guc-max-worker-processes"/> and
+    <xref linkend="guc-max-parallel-workers"/>.  Therefore, it is possible for a
     parallel query to run with fewer workers than planned, or even with
     no workers at all.  The optimal plan may depend on the number of workers
     that are available, so this can result in poor query performance.  If this
     occurrence is frequent, consider increasing
-    <varname>max_worker_processes</> and <varname>max_parallel_workers</>
+    <varname>max_worker_processes</varname> and <varname>max_parallel_workers</varname>
     so that more workers can be run simultaneously or alternatively reducing
     <varname>max_parallel_workers_per_gather</varname> so that the planner
     requests fewer workers.
@@ -96,10 +96,10 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
    <para>
     When the node at the top of the parallel portion of the plan is
-    <literal>Gather Merge</> rather than <literal>Gather</>, it indicates that
+    <literal>Gather Merge</literal> rather than <literal>Gather</literal>, it indicates that
     each process executing the parallel portion of the plan is producing
     tuples in sorted order, and that the leader is performing an
-    order-preserving merge.  In contrast, <literal>Gather</> reads tuples
+    order-preserving merge.  In contrast, <literal>Gather</literal> reads tuples
     from the workers in whatever order is convenient, destroying any sort
     order that may have existed.
    </para>   
@@ -118,7 +118,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
   <itemizedlist>
     <listitem>
       <para>
-        <xref linkend="guc-max-parallel-workers-per-gather"> must be set to a
+        <xref linkend="guc-max-parallel-workers-per-gather"/> must be set to a
         value which is greater than zero. This is a special case of the more
         general principle that no more workers should be used than the number
         configured via <varname>max_parallel_workers_per_gather</varname>.
@@ -127,8 +127,8 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
     <listitem>
       <para>
-        <xref linkend="guc-dynamic-shared-memory-type"> must be set to a
-        value other than <literal>none</>.  Parallel query requires dynamic
+        <xref linkend="guc-dynamic-shared-memory-type"/> must be set to a
+        value other than <literal>none</literal>.  Parallel query requires dynamic
         shared memory in order to pass data between cooperating processes.
       </para>
     </listitem>
@@ -151,9 +151,10 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
       <para>
         The query writes any data or locks any database rows. If a query
         contains a data-modifying operation either at the top level or within
-        a CTE, no parallel plans for that query will be generated. This is a
-        limitation of the current implementation which could be lifted in a
-        future release.
+        a CTE, no parallel plans for that query will be generated.  As an
+        exception, the commands <literal>CREATE TABLE</literal>, <literal>SELECT
+        INTO</literal>, and <literal>CREATE MATERIALIZED VIEW</literal> which create a new
+        table and populate it can use a parallel plan.
       </para>
     </listitem>
 
@@ -177,7 +178,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
         Most system-defined functions are <literal>PARALLEL SAFE</literal>,
         but user-defined functions are marked <literal>PARALLEL
         UNSAFE</literal> by default. See the discussion of
-        <xref linkend="parallel-safety">.
+        <xref linkend="parallel-safety"/>.
       </para>
     </listitem>
 
@@ -204,8 +205,8 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     Even when parallel query plan is generated for a particular query, there
     are several circumstances under which it will be impossible to execute
     that plan in parallel at execution time.  If this occurs, the leader
-    will execute the portion of the plan below the <literal>Gather</>
-    node entirely by itself, almost as if the <literal>Gather</> node were
+    will execute the portion of the plan below the <literal>Gather</literal>
+    node entirely by itself, almost as if the <literal>Gather</literal> node were
     not present.  This will happen if any of the following conditions are met:
   </para>
 
@@ -214,7 +215,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
       <para>
         No background workers can be obtained because of the limitation that
         the total number of background workers cannot exceed
-        <xref linkend="guc-max-worker-processes">.
+        <xref linkend="guc-max-worker-processes"/>.
       </para>
     </listitem>
 
@@ -222,7 +223,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
       <para>
         No background workers can be obtained because of the limitation that
         the total number of background workers launched for purposes of
-        parallel query cannot exceed <xref linkend="guc-max-parallel-workers">.
+        parallel query cannot exceed <xref linkend="guc-max-parallel-workers"/>.
       </para>
     </listitem>
 
@@ -235,21 +236,12 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
         send such a message, this can only occur when using a client that
         does not rely on libpq.  If this is a frequent
         occurrence, it may be a good idea to set
-        <xref linkend="guc-max-parallel-workers-per-gather"> to zero in
+        <xref linkend="guc-max-parallel-workers-per-gather"/> to zero in
         sessions where it is likely, so as to avoid generating query plans
         that may be suboptimal when run serially.
       </para>
     </listitem>
 
-    <listitem>
-      <para>
-        A prepared statement is executed using a <literal>CREATE TABLE .. AS
-        EXECUTE ..</literal> statement.  This construct converts what otherwise
-        would have been a read-only operation into a read-write operation,
-        making it ineligible for parallel query.
-      </para>
-    </listitem>
-
     <listitem>
       <para>
         The transaction isolation level is serializable.  This situation
@@ -272,7 +264,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     copy of the output result set, so the query would not run any faster
     than normal but would produce incorrect results.  Instead, the parallel
     portion of the plan must be what is known internally to the query
-    optimizer as a <firstterm>partial plan</>; that is, it must be constructed
+    optimizer as a <firstterm>partial plan</firstterm>; that is, it must be constructed
     so that each process which executes the plan will generate only a
     subset of the output rows in such a way that each required output row
     is guaranteed to be generated by exactly one of the cooperating processes.
@@ -289,14 +281,14 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
   <itemizedlist>
     <listitem>
       <para>
-        In a <emphasis>parallel sequential scan</>, the table's blocks will
+        In a <emphasis>parallel sequential scan</emphasis>, the table's blocks will
         be divided among the cooperating processes.  Blocks are handed out one
         at a time, so that access to the table remains sequential.
       </para>
     </listitem>
     <listitem>
       <para>
-        In a <emphasis>parallel bitmap heap scan</>, one process is chosen
+        In a <emphasis>parallel bitmap heap scan</emphasis>, one process is chosen
         as the leader.  That process performs a scan of one or more indexes
         and builds a bitmap indicating which table blocks need to be visited.
         These blocks are then divided among the cooperating processes as in
@@ -306,8 +298,8 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     </listitem>
     <listitem>
       <para>
-        In a <emphasis>parallel index scan</> or <emphasis>parallel index-only
-        scan</>, the cooperating processes take turns reading data from the
+        In a <emphasis>parallel index scan</emphasis> or <emphasis>parallel index-only
+        scan</emphasis>, the cooperating processes take turns reading data from the
         index.  Currently, parallel index scans are supported only for
         btree indexes.  Each process will claim a single index block and will
         scan and return all tuples referenced by that block; other process can
@@ -353,25 +345,25 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
  <sect2 id="parallel-aggregation">
   <title>Parallel Aggregation</title>
   <para>
-    <productname>PostgreSQL</> supports parallel aggregation by aggregating in
+    <productname>PostgreSQL</productname> supports parallel aggregation by aggregating in
     two stages.  First, each process participating in the parallel portion of
     the query performs an aggregation step, producing a partial result for
     each group of which that process is aware.  This is reflected in the plan
-    as a <literal>Partial Aggregate</> node.  Second, the partial results are
-    transferred to the leader via <literal>Gather</> or <literal>Gather
-    Merge</>.  Finally, the leader re-aggregates the results across all
+    as a <literal>Partial Aggregate</literal> node.  Second, the partial results are
+    transferred to the leader via <literal>Gather</literal> or <literal>Gather
+    Merge</literal>.  Finally, the leader re-aggregates the results across all
     workers in order to produce the final result.  This is reflected in the
-    plan as a <literal>Finalize Aggregate</> node.
+    plan as a <literal>Finalize Aggregate</literal> node.
   </para>
   
   <para>
-    Because the <literal>Finalize Aggregate</> node runs on the leader
+    Because the <literal>Finalize Aggregate</literal> node runs on the leader
     process, queries which produce a relatively large number of groups in
     comparison to the number of input rows will appear less favorable to the
     query planner. For example, in the worst-case scenario the number of
-    groups seen by the <literal>Finalize Aggregate</> node could be as many as
+    groups seen by the <literal>Finalize Aggregate</literal> node could be as many as
     the number of input rows which were seen by all worker processes in the
-    <literal>Partial Aggregate</> stage. For such cases, there is clearly
+    <literal>Partial Aggregate</literal> stage. For such cases, there is clearly
     going to be no performance benefit to using parallel aggregation. The
     query planner takes this into account during the planning process and is
     unlikely to choose parallel aggregate in this scenario.
@@ -379,14 +371,14 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
   <para>
     Parallel aggregation is not supported in all situations.  Each aggregate
-    must be <link linkend="parallel-safety">safe</> for parallelism and must
+    must be <link linkend="parallel-safety">safe</link> for parallelism and must
     have a combine function.  If the aggregate has a transition state of type
-    <literal>internal</>, it must have serialization and deserialization
-    functions.  See <xref linkend="sql-createaggregate"> for more details.
+    <literal>internal</literal>, it must have serialization and deserialization
+    functions.  See <xref linkend="sql-createaggregate"/> for more details.
     Parallel aggregation is not supported if any aggregate function call
-    contains <literal>DISTINCT</> or <literal>ORDER BY</> clause and is also
+    contains <literal>DISTINCT</literal> or <literal>ORDER BY</literal> clause and is also
     not supported for ordered set aggregates or when  the query involves
-    <literal>GROUPING SETS</>.  It can only be used when all joins involved in
+    <literal>GROUPING SETS</literal>.  It can only be used when all joins involved in
     the query are also part of the parallel portion of the plan.
   </para>
 
@@ -397,15 +389,15 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
   <para>
     If a query that is expected to do so does not produce a parallel plan,
-    you can try reducing <xref linkend="guc-parallel-setup-cost"> or
-    <xref linkend="guc-parallel-tuple-cost">.  Of course, this plan may turn
+    you can try reducing <xref linkend="guc-parallel-setup-cost"/> or
+    <xref linkend="guc-parallel-tuple-cost"/>.  Of course, this plan may turn
     out to be slower than the serial plan which the planner preferred, but
     this will not always be the case.  If you don't get a parallel
     plan even with very small values of these settings (e.g. after setting
     them both to zero), there may be some reason why the query planner is
     unable to generate a parallel plan for your query.  See
-    <xref linkend="when-can-parallel-query-be-used"> and
-    <xref linkend="parallel-safety"> for information on why this may be
+    <xref linkend="when-can-parallel-query-be-used"/> and
+    <xref linkend="parallel-safety"/> for information on why this may be
     the case.
   </para>
 
@@ -425,13 +417,13 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
 
   <para>
     The planner classifies operations involved in a query as either
-    <firstterm>parallel safe</>, <firstterm>parallel restricted</>,
-    or <firstterm>parallel unsafe</>.  A parallel safe operation is one which
+    <firstterm>parallel safe</firstterm>, <firstterm>parallel restricted</firstterm>,
+    or <firstterm>parallel unsafe</firstterm>.  A parallel safe operation is one which
     does not conflict with the use of parallel query.  A parallel restricted
     operation is one which cannot be performed in a parallel worker, but which
     can be performed in the leader while parallel query is in use.  Therefore,
-    parallel restricted operations can never occur below a <literal>Gather</>
-    or <literal>Gather Merge</> node, but can occur elsewhere in a plan which
+    parallel restricted operations can never occur below a <literal>Gather</literal>
+    or <literal>Gather Merge</literal> node, but can occur elsewhere in a plan which
     contains such a node.  A parallel unsafe operation is one which cannot
     be performed while parallel query is in use, not even in the leader.
     When a query contains anything which is parallel unsafe, parallel query
@@ -458,13 +450,13 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     <listitem>
       <para>
         Scans of foreign tables, unless the foreign data wrapper has
-        an <literal>IsForeignScanParallelSafe</> API which indicates otherwise.
+        an <literal>IsForeignScanParallelSafe</literal> API which indicates otherwise.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        Access to an <literal>InitPlan</> or correlated <literal>SubPlan</>.
+        Access to an <literal>InitPlan</literal> or correlated <literal>SubPlan</literal>.
       </para>
     </listitem>
   </itemizedlist>
@@ -481,25 +473,25 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     where it conceivably be done, we do not try, since this would be expensive
     and error-prone.  Instead, all user-defined functions are assumed to
     be parallel unsafe unless otherwise marked.  When using
-    <xref linkend="sql-createfunction"> or
-    <xref linkend="sql-alterfunction">, markings can be set by specifying
-    <literal>PARALLEL SAFE</>, <literal>PARALLEL RESTRICTED</>, or
-    <literal>PARALLEL UNSAFE</> as appropriate.  When using
-    <xref linkend="sql-createaggregate">, the
-    <literal>PARALLEL</> option can be specified with <literal>SAFE</>,
-    <literal>RESTRICTED</>, or <literal>UNSAFE</> as the corresponding value.
+    <xref linkend="sql-createfunction"/> or
+    <xref linkend="sql-alterfunction"/>, markings can be set by specifying
+    <literal>PARALLEL SAFE</literal>, <literal>PARALLEL RESTRICTED</literal>, or
+    <literal>PARALLEL UNSAFE</literal> as appropriate.  When using
+    <xref linkend="sql-createaggregate"/>, the
+    <literal>PARALLEL</literal> option can be specified with <literal>SAFE</literal>,
+    <literal>RESTRICTED</literal>, or <literal>UNSAFE</literal> as the corresponding value.
   </para>
 
   <para>
-    Functions and aggregates must be marked <literal>PARALLEL UNSAFE</> if
+    Functions and aggregates must be marked <literal>PARALLEL UNSAFE</literal> if
     they write to the database, access sequences, change the transaction state
     even temporarily (e.g. a PL/pgSQL function which establishes an
-    <literal>EXCEPTION</> block to catch errors), or make persistent changes to
+    <literal>EXCEPTION</literal> block to catch errors), or make persistent changes to
     settings.  Similarly, functions must be marked <literal>PARALLEL
-    RESTRICTED</> if they access temporary tables, client connection state,
+    RESTRICTED</literal> if they access temporary tables, client connection state,
     cursors, prepared statements, or miscellaneous backend-local state which
     the system cannot synchronize across workers. For example,
-    <literal>setseed</> and <literal>random</> are parallel restricted for
+    <literal>setseed</literal> and <literal>random</literal> are parallel restricted for
     this last reason.
   </para>
 
@@ -511,7 +503,7 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
     mislabeled, since there is no way for the system to protect itself against
     arbitrary C code, but in most likely cases the result will be no worse than
     for any other function. If in doubt, it is probably best to label functions
-    as <literal>UNSAFE</>.
+    as <literal>UNSAFE</literal>.
   </para>
 
   <para>
@@ -527,13 +519,13 @@ EXPLAIN SELECT * FROM pgbench_accounts WHERE filler LIKE '%x%';
   <para>
     Note that the query planner does not consider deferring the evaluation of
     parallel-restricted functions or aggregates involved in the query in
-    order to obtain a superior plan.  So, for example, if a <literal>WHERE</>
+    order to obtain a superior plan.  So, for example, if a <literal>WHERE</literal>
     clause applied to a particular table is parallel restricted, the query
     planner will not consider performing a scan of that table in the parallel
     portion of a plan.  In some cases, it would be
     possible (and perhaps even efficient) to include the scan of that table in
     the parallel portion of the query and defer the evaluation of the
-    <literal>WHERE</> clause so that it happens above the <literal>Gather</>
+    <literal>WHERE</literal> clause so that it happens above the <literal>Gather</literal>
     node.  However, the planner does not do this.
   </para>
 
diff --git a/doc/src/sgml/passwordcheck.sgml b/doc/src/sgml/passwordcheck.sgml
index 6e6e4ef435..3db169b4c1 100644
--- a/doc/src/sgml/passwordcheck.sgml
+++ b/doc/src/sgml/passwordcheck.sgml
@@ -10,15 +10,15 @@
  <para>
   The <filename>passwordcheck</filename> module checks users' passwords
   whenever they are set with
-  <xref linkend="SQL-CREATEROLE"> or
-  <xref linkend="SQL-ALTERROLE">.
+  <xref linkend="sql-createrole"/> or
+  <xref linkend="sql-alterrole"/>.
   If a password is considered too weak, it will be rejected and
   the command will terminate with an error.
  </para>
 
  <para>
   To enable this module, add <literal>'$libdir/passwordcheck'</literal>
-  to <xref linkend="guc-shared-preload-libraries"> in
+  to <xref linkend="guc-shared-preload-libraries"/> in
   <filename>postgresql.conf</filename>, then restart the server.
  </para>
 
@@ -49,7 +49,7 @@
    For this reason, <filename>passwordcheck</filename> is not
    recommended if your security requirements are high.
    It is more secure to use an external authentication method such as GSSAPI
-   (see <xref linkend="client-authentication">) than to rely on
+   (see <xref linkend="client-authentication"/>) than to rely on
    passwords within the database.
   </para>
   <para>
diff --git a/doc/src/sgml/perform.sgml b/doc/src/sgml/perform.sgml
index 924f6091ba..c32e95a154 100644
--- a/doc/src/sgml/perform.sgml
+++ b/doc/src/sgml/perform.sgml
@@ -30,8 +30,8 @@
     plan</firstterm> for each query it receives.  Choosing the right
     plan to match the query structure and the properties of the data
     is absolutely critical for good performance, so the system includes
-    a complex <firstterm>planner</> that tries to choose good plans.
-    You can use the <xref linkend="sql-explain"> command
+    a complex <firstterm>planner</firstterm> that tries to choose good plans.
+    You can use the <xref linkend="sql-explain"/> command
     to see what query plan the planner creates for any query.
     Plan-reading is an art that requires some experience to master,
     but this section attempts to cover the basics.
@@ -39,17 +39,17 @@
 
    <para>
     Examples in this section are drawn from the regression test database
-    after doing a <command>VACUUM ANALYZE</>, using 9.3 development sources.
+    after doing a <command>VACUUM ANALYZE</command>, using 9.3 development sources.
     You should be able to get similar results if you try the examples
     yourself, but your estimated costs and row counts might vary slightly
-    because <command>ANALYZE</>'s statistics are random samples rather
+    because <command>ANALYZE</command>'s statistics are random samples rather
     than exact, and because costs are inherently somewhat platform-dependent.
    </para>
 
    <para>
-    The examples use <command>EXPLAIN</>'s default <quote>text</> output
+    The examples use <command>EXPLAIN</command>'s default <quote>text</quote> output
     format, which is compact and convenient for humans to read.
-    If you want to feed <command>EXPLAIN</>'s output to a program for further
+    If you want to feed <command>EXPLAIN</command>'s output to a program for further
     analysis, you should use one of its machine-readable output formats
     (XML, JSON, or YAML) instead.
    </para>
@@ -58,12 +58,12 @@
    <title><command>EXPLAIN</command> Basics</title>
 
    <para>
-    The structure of a query plan is a tree of <firstterm>plan nodes</>.
+    The structure of a query plan is a tree of <firstterm>plan nodes</firstterm>.
     Nodes at the bottom level of the tree are scan nodes: they return raw rows
     from a table.  There are different types of scan nodes for different
     table access methods: sequential scans, index scans, and bitmap index
-    scans.  There are also non-table row sources, such as <literal>VALUES</>
-    clauses and set-returning functions in <literal>FROM</>, which have their
+    scans.  There are also non-table row sources, such as <literal>VALUES</literal>
+    clauses and set-returning functions in <literal>FROM</literal>, which have their
     own scan node types.
     If the query requires joining, aggregation, sorting, or other
     operations on the raw rows, then there will be additional nodes
@@ -93,7 +93,7 @@ EXPLAIN SELECT * FROM tenk1;
    </para>
 
    <para>
-    Since this query has no <literal>WHERE</> clause, it must scan all the
+    Since this query has no <literal>WHERE</literal> clause, it must scan all the
     rows of the table, so the planner has chosen to use a simple sequential
     scan plan.  The numbers that are quoted in parentheses are (left
     to right):
@@ -111,7 +111,7 @@ EXPLAIN SELECT * FROM tenk1;
        Estimated total cost.  This is stated on the assumption that the plan
        node is run to completion, i.e., all available rows are retrieved.
        In practice a node's parent node might stop short of reading all
-       available rows (see the <literal>LIMIT</> example below).
+       available rows (see the <literal>LIMIT</literal> example below).
       </para>
      </listitem>
 
@@ -132,10 +132,10 @@ EXPLAIN SELECT * FROM tenk1;
 
    <para>
     The costs are measured in arbitrary units determined by the planner's
-    cost parameters (see <xref linkend="runtime-config-query-constants">).
+    cost parameters (see <xref linkend="runtime-config-query-constants"/>).
     Traditional practice is to measure the costs in units of disk page
-    fetches; that is, <xref linkend="guc-seq-page-cost"> is conventionally
-    set to <literal>1.0</> and the other cost parameters are set relative
+    fetches; that is, <xref linkend="guc-seq-page-cost"/> is conventionally
+    set to <literal>1.0</literal> and the other cost parameters are set relative
     to that.  The examples in this section are run with the default cost
     parameters.
    </para>
@@ -152,11 +152,11 @@ EXPLAIN SELECT * FROM tenk1;
    </para>
 
    <para>
-    The <literal>rows</> value is a little tricky because it is
+    The <literal>rows</literal> value is a little tricky because it is
     not the number of rows processed or scanned by the
     plan node, but rather the number emitted by the node.  This is often
     less than the number scanned, as a result of filtering by any
-    <literal>WHERE</>-clause conditions that are being applied at the node.
+    <literal>WHERE</literal>-clause conditions that are being applied at the node.
     Ideally the top-level rows estimate will approximate the number of rows
     actually returned, updated, or deleted by the query.
    </para>
@@ -182,14 +182,14 @@ SELECT relpages, reltuples FROM pg_class WHERE relname = 'tenk1';
 
     you will find that <classname>tenk1</classname> has 358 disk
     pages and 10000 rows.  The estimated cost is computed as (disk pages read *
-    <xref linkend="guc-seq-page-cost">) + (rows scanned *
-    <xref linkend="guc-cpu-tuple-cost">).  By default,
-    <varname>seq_page_cost</> is 1.0 and <varname>cpu_tuple_cost</> is 0.01,
+    <xref linkend="guc-seq-page-cost"/>) + (rows scanned *
+    <xref linkend="guc-cpu-tuple-cost"/>).  By default,
+    <varname>seq_page_cost</varname> is 1.0 and <varname>cpu_tuple_cost</varname> is 0.01,
     so the estimated cost is (358 * 1.0) + (10000 * 0.01) = 458.
    </para>
 
    <para>
-    Now let's modify the query to add a <literal>WHERE</> condition:
+    Now let's modify the query to add a <literal>WHERE</literal> condition:
 
 <screen>
 EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 7000;
@@ -200,21 +200,21 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 7000;
    Filter: (unique1 &lt; 7000)
 </screen>
 
-    Notice that the <command>EXPLAIN</> output shows the <literal>WHERE</>
-    clause being applied as a <quote>filter</> condition attached to the Seq
+    Notice that the <command>EXPLAIN</command> output shows the <literal>WHERE</literal>
+    clause being applied as a <quote>filter</quote> condition attached to the Seq
     Scan plan node.  This means that
     the plan node checks the condition for each row it scans, and outputs
     only the ones that pass the condition.
     The estimate of output rows has been reduced because of the
-    <literal>WHERE</> clause.
+    <literal>WHERE</literal> clause.
     However, the scan will still have to visit all 10000 rows, so the cost
     hasn't decreased; in fact it has gone up a bit (by 10000 * <xref
-    linkend="guc-cpu-operator-cost">, to be exact) to reflect the extra CPU
-    time spent checking the <literal>WHERE</> condition.
+    linkend="guc-cpu-operator-cost"/>, to be exact) to reflect the extra CPU
+    time spent checking the <literal>WHERE</literal> condition.
    </para>
 
    <para>
-    The actual number of rows this query would select is 7000, but the <literal>rows</>
+    The actual number of rows this query would select is 7000, but the <literal>rows</literal>
     estimate is only approximate.  If you try to duplicate this experiment,
     you will probably get a slightly different estimate; moreover, it can
     change after each <command>ANALYZE</command> command, because the
@@ -245,12 +245,12 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100;
     scan.  (The reason for using two plan levels is that the upper plan
     node sorts the row locations identified by the index into physical order
     before reading them, to minimize the cost of separate fetches.
-    The <quote>bitmap</> mentioned in the node names is the mechanism that
+    The <quote>bitmap</quote> mentioned in the node names is the mechanism that
     does the sorting.)
    </para>
 
    <para>
-    Now let's add another condition to the <literal>WHERE</> clause:
+    Now let's add another condition to the <literal>WHERE</literal> clause:
 
 <screen>
 EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND stringu1 = 'xxx';
@@ -266,15 +266,15 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND stringu1 = 'xxx';
 
     The added condition <literal>stringu1 = 'xxx'</literal> reduces the
     output row count estimate, but not the cost because we still have to visit
-    the same set of rows.  Notice that the <literal>stringu1</> clause
+    the same set of rows.  Notice that the <literal>stringu1</literal> clause
     cannot be applied as an index condition, since this index is only on
-    the <literal>unique1</> column.  Instead it is applied as a filter on
+    the <literal>unique1</literal> column.  Instead it is applied as a filter on
     the rows retrieved by the index.  Thus the cost has actually gone up
     slightly to reflect this extra checking.
    </para>
 
    <para>
-    In some cases the planner will prefer a <quote>simple</> index scan plan:
+    In some cases the planner will prefer a <quote>simple</quote> index scan plan:
 
 <screen>
 EXPLAIN SELECT * FROM tenk1 WHERE unique1 = 42;
@@ -289,14 +289,14 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 = 42;
     makes them even more expensive to read, but there are so few that the
     extra cost of sorting the row locations is not worth it.  You'll most
     often see this plan type for queries that fetch just a single row.  It's
-    also often used for queries that have an <literal>ORDER BY</> condition
+    also often used for queries that have an <literal>ORDER BY</literal> condition
     that matches the index order, because then no extra sorting step is needed
-    to satisfy the <literal>ORDER BY</>.
+    to satisfy the <literal>ORDER BY</literal>.
    </para>
 
    <para>
     If there are separate indexes on several of the columns referenced
-    in <literal>WHERE</>, the planner might choose to use an AND or OR
+    in <literal>WHERE</literal>, the planner might choose to use an AND or OR
     combination of the indexes:
 
 <screen>
@@ -320,7 +320,7 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000;
    </para>
 
    <para>
-    Here is an example showing the effects of <literal>LIMIT</>:
+    Here is an example showing the effects of <literal>LIMIT</literal>:
 
 <screen>
 EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000 LIMIT 2;
@@ -335,7 +335,7 @@ EXPLAIN SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000 LIMIT 2
    </para>
 
    <para>
-    This is the same query as above, but we added a <literal>LIMIT</> so that
+    This is the same query as above, but we added a <literal>LIMIT</literal> so that
     not all the rows need be retrieved, and the planner changed its mind about
     what to do.  Notice that the total cost and row count of the Index Scan
     node are shown as if it were run to completion.  However, the Limit node
@@ -370,32 +370,32 @@ WHERE t1.unique1 &lt; 10 AND t1.unique2 = t2.unique2;
    <para>
     In this plan, we have a nested-loop join node with two table scans as
     inputs, or children.  The indentation of the node summary lines reflects
-    the plan tree structure.  The join's first, or <quote>outer</>, child
+    the plan tree structure.  The join's first, or <quote>outer</quote>, child
     is a bitmap scan similar to those we saw before.  Its cost and row count
-    are the same as we'd get from <literal>SELECT ... WHERE unique1 &lt; 10</>
+    are the same as we'd get from <literal>SELECT ... WHERE unique1 &lt; 10</literal>
     because we are
-    applying the <literal>WHERE</> clause <literal>unique1 &lt; 10</literal>
+    applying the <literal>WHERE</literal> clause <literal>unique1 &lt; 10</literal>
     at that node.
     The <literal>t1.unique2 = t2.unique2</literal> clause is not relevant yet,
     so it doesn't affect the row count of the outer scan.  The nested-loop
     join node will run its second,
-    or <quote>inner</> child once for each row obtained from the outer child.
+    or <quote>inner</quote> child once for each row obtained from the outer child.
     Column values from the current outer row can be plugged into the inner
-    scan; here, the <literal>t1.unique2</> value from the outer row is available,
+    scan; here, the <literal>t1.unique2</literal> value from the outer row is available,
     so we get a plan and costs similar to what we saw above for a simple
-    <literal>SELECT ... WHERE t2.unique2 = <replaceable>constant</></> case.
+    <literal>SELECT ... WHERE t2.unique2 = <replaceable>constant</replaceable></literal> case.
     (The estimated cost is actually a bit lower than what was seen above,
     as a result of caching that's expected to occur during the repeated
-    index scans on <literal>t2</>.)  The
+    index scans on <literal>t2</literal>.)  The
     costs of the loop node are then set on the basis of the cost of the outer
-    scan, plus one repetition of the inner scan for each outer row (10 * 7.87,
+    scan, plus one repetition of the inner scan for each outer row (10 * 7.91,
     here), plus a little CPU time for join processing.
    </para>
 
    <para>
     In this example the join's output row count is the same as the product
     of the two scans' row counts, but that's not true in all cases because
-    there can be additional <literal>WHERE</> clauses that mention both tables
+    there can be additional <literal>WHERE</literal> clauses that mention both tables
     and so can only be applied at the join point, not to either input scan.
     Here's an example:
 
@@ -418,15 +418,15 @@ WHERE t1.unique1 &lt; 10 AND t2.unique2 &lt; 10 AND t1.hundred &lt; t2.hundred;
 </screen>
 
     The condition <literal>t1.hundred &lt; t2.hundred</literal> can't be
-    tested in the <literal>tenk2_unique2</> index, so it's applied at the
+    tested in the <literal>tenk2_unique2</literal> index, so it's applied at the
     join node.  This reduces the estimated output row count of the join node,
     but does not change either input scan.
    </para>
 
    <para>
-    Notice that here the planner has chosen to <quote>materialize</> the inner
+    Notice that here the planner has chosen to <quote>materialize</quote> the inner
     relation of the join, by putting a Materialize plan node atop it.  This
-    means that the <literal>t2</> index scan will be done just once, even
+    means that the <literal>t2</literal> index scan will be done just once, even
     though the nested-loop join node needs to read that data ten times, once
     for each row from the outer relation.  The Materialize node saves the data
     in memory as it's read, and then returns the data from memory on each
@@ -435,8 +435,8 @@ WHERE t1.unique1 &lt; 10 AND t2.unique2 &lt; 10 AND t1.hundred &lt; t2.hundred;
 
    <para>
     When dealing with outer joins, you might see join plan nodes with both
-    <quote>Join Filter</> and plain <quote>Filter</> conditions attached.
-    Join Filter conditions come from the outer join's <literal>ON</> clause,
+    <quote>Join Filter</quote> and plain <quote>Filter</quote> conditions attached.
+    Join Filter conditions come from the outer join's <literal>ON</literal> clause,
     so a row that fails the Join Filter condition could still get emitted as
     a null-extended row.  But a plain Filter condition is applied after the
     outer-join rules and so acts to remove rows unconditionally.  In an inner
@@ -470,7 +470,7 @@ WHERE t1.unique1 &lt; 100 AND t1.unique2 = t2.unique2;
     table are entered into an in-memory hash table, after which the other
     table is scanned and the hash table is probed for matches to each row.
     Again note how the indentation reflects the plan structure: the bitmap
-    scan on <literal>tenk1</> is the input to the Hash node, which constructs
+    scan on <literal>tenk1</literal> is the input to the Hash node, which constructs
     the hash table.  That's then returned to the Hash Join node, which reads
     rows from its outer child plan and searches the hash table for each one.
    </para>
@@ -497,9 +497,9 @@ WHERE t1.unique1 &lt; 100 AND t1.unique2 = t2.unique2;
 
    <para>
     Merge join requires its input data to be sorted on the join keys.  In this
-    plan the <literal>tenk1</> data is sorted by using an index scan to visit
+    plan the <literal>tenk1</literal> data is sorted by using an index scan to visit
     the rows in the correct order, but a sequential scan and sort is preferred
-    for <literal>onek</>, because there are many more rows to be visited in
+    for <literal>onek</literal>, because there are many more rows to be visited in
     that table.
     (Sequential-scan-and-sort frequently beats an index scan for sorting many rows,
     because of the nonsequential disk access required by the index scan.)
@@ -508,11 +508,11 @@ WHERE t1.unique1 &lt; 100 AND t1.unique2 = t2.unique2;
    <para>
     One way to look at variant plans is to force the planner to disregard
     whatever strategy it thought was the cheapest, using the enable/disable
-    flags described in <xref linkend="runtime-config-query-enable">.
+    flags described in <xref linkend="runtime-config-query-enable"/>.
     (This is a crude tool, but useful.  See
-    also <xref linkend="explicit-joins">.)
+    also <xref linkend="explicit-joins"/>.)
     For example, if we're unconvinced that sequential-scan-and-sort is the best way to
-    deal with table <literal>onek</> in the previous example, we could try
+    deal with table <literal>onek</literal> in the previous example, we could try
 
 <screen>
 SET enable_sort = off;
@@ -530,10 +530,10 @@ WHERE t1.unique1 &lt; 100 AND t1.unique2 = t2.unique2;
    -&gt;  Index Scan using onek_unique2 on onek t2  (cost=0.28..224.79 rows=1000 width=244)
 </screen>
 
-    which shows that the planner thinks that sorting <literal>onek</> by
+    which shows that the planner thinks that sorting <literal>onek</literal> by
     index-scanning is about 12% more expensive than sequential-scan-and-sort.
     Of course, the next question is whether it's right about that.
-    We can investigate that using <command>EXPLAIN ANALYZE</>, as discussed
+    We can investigate that using <command>EXPLAIN ANALYZE</command>, as discussed
     below.
    </para>
 
@@ -544,8 +544,8 @@ WHERE t1.unique1 &lt; 100 AND t1.unique2 = t2.unique2;
 
    <para>
     It is possible to check the accuracy of the planner's estimates
-    by using <command>EXPLAIN</>'s <literal>ANALYZE</> option.  With this
-    option, <command>EXPLAIN</> actually executes the query, and then displays
+    by using <command>EXPLAIN</command>'s <literal>ANALYZE</literal> option.  With this
+    option, <command>EXPLAIN</command> actually executes the query, and then displays
     the true row counts and true run time accumulated within each plan node,
     along with the same estimates that a plain <command>EXPLAIN</command>
     shows.  For example, we might get a result like this:
@@ -569,7 +569,7 @@ WHERE t1.unique1 &lt; 10 AND t1.unique2 = t2.unique2;
 </screen>
 
     Note that the <quote>actual time</quote> values are in milliseconds of
-    real time, whereas the <literal>cost</> estimates are expressed in
+    real time, whereas the <literal>cost</literal> estimates are expressed in
     arbitrary units; so they are unlikely to match up.
     The thing that's usually most important to look for is whether the
     estimated row counts are reasonably close to reality.  In this example
@@ -580,17 +580,17 @@ WHERE t1.unique1 &lt; 10 AND t1.unique2 = t2.unique2;
     In some query plans, it is possible for a subplan node to be executed more
     than once.  For example, the inner index scan will be executed once per
     outer row in the above nested-loop plan.  In such cases, the
-    <literal>loops</> value reports the
+    <literal>loops</literal> value reports the
     total number of executions of the node, and the actual time and rows
     values shown are averages per-execution.  This is done to make the numbers
     comparable with the way that the cost estimates are shown.  Multiply by
-    the <literal>loops</> value to get the total time actually spent in
+    the <literal>loops</literal> value to get the total time actually spent in
     the node.  In the above example, we spent a total of 0.220 milliseconds
-    executing the index scans on <literal>tenk2</>.
+    executing the index scans on <literal>tenk2</literal>.
    </para>
 
    <para>
-    In some cases <command>EXPLAIN ANALYZE</> shows additional execution
+    In some cases <command>EXPLAIN ANALYZE</command> shows additional execution
     statistics beyond the plan node execution times and row counts.
     For example, Sort and Hash nodes provide extra information:
 
@@ -642,13 +642,13 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 WHERE ten &lt; 7;
 </screen>
 
     These counts can be particularly valuable for filter conditions applied at
-    join nodes.  The <quote>Rows Removed</> line only appears when at least
+    join nodes.  The <quote>Rows Removed</quote> line only appears when at least
     one scanned row, or potential join pair in the case of a join node,
     is rejected by the filter condition.
    </para>
 
    <para>
-    A case similar to filter conditions occurs with <quote>lossy</>
+    A case similar to filter conditions occurs with <quote>lossy</quote>
     index scans.  For example, consider this search for polygons containing a
     specific point:
 
@@ -685,14 +685,14 @@ EXPLAIN ANALYZE SELECT * FROM polygon_tbl WHERE f1 @&gt; polygon '(0.5,2.0)';
 
     Here we can see that the index returned one candidate row, which was
     then rejected by a recheck of the index condition.  This happens because a
-    GiST index is <quote>lossy</> for polygon containment tests: it actually
+    GiST index is <quote>lossy</quote> for polygon containment tests: it actually
     returns the rows with polygons that overlap the target, and then we have
     to do the exact containment test on those rows.
    </para>
 
    <para>
-    <command>EXPLAIN</> has a <literal>BUFFERS</> option that can be used with
-    <literal>ANALYZE</> to get even more run time statistics:
+    <command>EXPLAIN</command> has a <literal>BUFFERS</literal> option that can be used with
+    <literal>ANALYZE</literal> to get even more run time statistics:
 
 <screen>
 EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000;
@@ -714,7 +714,7 @@ EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique
  Execution time: 0.423 ms
 </screen>
 
-    The numbers provided by <literal>BUFFERS</> help to identify which parts
+    The numbers provided by <literal>BUFFERS</literal> help to identify which parts
     of the query are the most I/O-intensive.
    </para>
 
@@ -722,7 +722,7 @@ EXPLAIN (ANALYZE, BUFFERS) SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique
     Keep in mind that because <command>EXPLAIN ANALYZE</command> actually
     runs the query, any side-effects will happen as usual, even though
     whatever results the query might output are discarded in favor of
-    printing the <command>EXPLAIN</> data.  If you want to analyze a
+    printing the <command>EXPLAIN</command> data.  If you want to analyze a
     data-modifying query without changing your tables, you can
     roll the command back afterwards, for example:
 
@@ -746,8 +746,8 @@ ROLLBACK;
    </para>
 
    <para>
-    As seen in this example, when the query is an <command>INSERT</>,
-    <command>UPDATE</>, or <command>DELETE</> command, the actual work of
+    As seen in this example, when the query is an <command>INSERT</command>,
+    <command>UPDATE</command>, or <command>DELETE</command> command, the actual work of
     applying the table changes is done by a top-level Insert, Update,
     or Delete plan node.  The plan nodes underneath this node perform
     the work of locating the old rows and/or computing the new data.
@@ -762,7 +762,7 @@ ROLLBACK;
    </para>
 
    <para>
-    When an <command>UPDATE</> or <command>DELETE</> command affects an
+    When an <command>UPDATE</command> or <command>DELETE</command> command affects an
     inheritance hierarchy, the output might look like this:
 
 <screen>
@@ -789,7 +789,7 @@ EXPLAIN UPDATE parent SET f2 = f2 + 1 WHERE f1 = 101;
     scanning subplans, one per table.  For clarity, the Update node is
     annotated to show the specific target tables that will be updated, in the
     same order as the corresponding subplans.  (These annotations are new as
-    of <productname>PostgreSQL</> 9.5; in prior versions the reader had to
+    of <productname>PostgreSQL</productname> 9.5; in prior versions the reader had to
     intuit the target tables by inspecting the subplans.)
    </para>
 
@@ -804,12 +804,12 @@ EXPLAIN UPDATE parent SET f2 = f2 + 1 WHERE f1 = 101;
     ANALYZE</command> includes executor start-up and shut-down time, as well
     as the time to run any triggers that are fired, but it does not include
     parsing, rewriting, or planning time.
-    Time spent executing <literal>BEFORE</> triggers, if any, is included in
+    Time spent executing <literal>BEFORE</literal> triggers, if any, is included in
     the time for the related Insert, Update, or Delete node; but time
-    spent executing <literal>AFTER</> triggers is not counted there because
-    <literal>AFTER</> triggers are fired after completion of the whole plan.
+    spent executing <literal>AFTER</literal> triggers is not counted there because
+    <literal>AFTER</literal> triggers are fired after completion of the whole plan.
     The total time spent in each trigger
-    (either <literal>BEFORE</> or <literal>AFTER</>) is also shown separately.
+    (either <literal>BEFORE</literal> or <literal>AFTER</literal>) is also shown separately.
     Note that deferred constraint triggers will not be executed
     until end of transaction and are thus not considered at all by
     <command>EXPLAIN ANALYZE</command>.
@@ -827,13 +827,13 @@ EXPLAIN UPDATE parent SET f2 = f2 + 1 WHERE f1 = 101;
     network transmission costs and I/O conversion costs are not included.
     Second, the measurement overhead added by <command>EXPLAIN
     ANALYZE</command> can be significant, especially on machines with slow
-    <function>gettimeofday()</> operating-system calls. You can use the
-    <xref linkend="pgtesttiming"> tool to measure the overhead of timing
+    <function>gettimeofday()</function> operating-system calls. You can use the
+    <xref linkend="pgtesttiming"/> tool to measure the overhead of timing
     on your system.
    </para>
 
    <para>
-    <command>EXPLAIN</> results should not be extrapolated to situations
+    <command>EXPLAIN</command> results should not be extrapolated to situations
     much different from the one you are actually testing; for example,
     results on a toy-sized table cannot be assumed to apply to large tables.
     The planner's cost estimates are not linear and so it might choose
@@ -843,14 +843,14 @@ EXPLAIN UPDATE parent SET f2 = f2 + 1 WHERE f1 = 101;
     The planner realizes that it's going to take one disk page read to
     process the table in any case, so there's no value in expending additional
     page reads to look at an index.  (We saw this happening in the
-    <literal>polygon_tbl</> example above.)
+    <literal>polygon_tbl</literal> example above.)
    </para>
 
    <para>
     There are cases in which the actual and estimated values won't match up
     well, but nothing is really wrong.  One such case occurs when
-    plan node execution is stopped short by a <literal>LIMIT</> or similar
-    effect.  For example, in the <literal>LIMIT</> query we used before,
+    plan node execution is stopped short by a <literal>LIMIT</literal> or similar
+    effect.  For example, in the <literal>LIMIT</literal> query we used before,
 
 <screen>
 EXPLAIN ANALYZE SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000 LIMIT 2;
@@ -880,10 +880,10 @@ EXPLAIN ANALYZE SELECT * FROM tenk1 WHERE unique1 &lt; 100 AND unique2 &gt; 9000
     and the next key value in the one input is greater than the last key value
     of the other input; in such a case there can be no more matches and so no
     need to scan the rest of the first input.  This results in not reading all
-    of one child, with results like those mentioned for <literal>LIMIT</>.
+    of one child, with results like those mentioned for <literal>LIMIT</literal>.
     Also, if the outer (first) child contains rows with duplicate key values,
     the inner (second) child is backed up and rescanned for the portion of its
-    rows matching that key value.  <command>EXPLAIN ANALYZE</> counts these
+    rows matching that key value.  <command>EXPLAIN ANALYZE</command> counts these
     repeated emissions of the same inner rows as if they were real additional
     rows.  When there are many outer duplicates, the reported actual row count
     for the inner child plan node can be significantly larger than the number
@@ -948,9 +948,9 @@ WHERE relname LIKE 'tenk1%';
    For efficiency reasons, <structfield>reltuples</structfield>
    and <structfield>relpages</structfield> are not updated on-the-fly,
    and so they usually contain somewhat out-of-date values.
-   They are updated by <command>VACUUM</>, <command>ANALYZE</>, and a
-   few DDL commands such as <command>CREATE INDEX</>.  A <command>VACUUM</>
-   or <command>ANALYZE</> operation that does not scan the entire table
+   They are updated by <command>VACUUM</command>, <command>ANALYZE</command>, and a
+   few DDL commands such as <command>CREATE INDEX</command>.  A <command>VACUUM</command>
+   or <command>ANALYZE</command> operation that does not scan the entire table
    (which is commonly the case) will incrementally update the
    <structfield>reltuples</structfield> count on the basis of the part
    of the table it did scan, resulting in an approximate value.
@@ -966,16 +966,16 @@ WHERE relname LIKE 'tenk1%';
 
   <para>
    Most queries retrieve only a fraction of the rows in a table, due
-   to <literal>WHERE</> clauses that restrict the rows to be
+   to <literal>WHERE</literal> clauses that restrict the rows to be
    examined.  The planner thus needs to make an estimate of the
-   <firstterm>selectivity</> of <literal>WHERE</> clauses, that is,
+   <firstterm>selectivity</firstterm> of <literal>WHERE</literal> clauses, that is,
    the fraction of rows that match each condition in the
-   <literal>WHERE</> clause.  The information used for this task is
+   <literal>WHERE</literal> clause.  The information used for this task is
    stored in the
    <link linkend="catalog-pg-statistic"><structname>pg_statistic</structname></link>
    system catalog.  Entries in <structname>pg_statistic</structname>
-   are updated by the <command>ANALYZE</> and <command>VACUUM
-   ANALYZE</> commands, and are always approximate even when freshly
+   are updated by the <command>ANALYZE</command> and <command>VACUUM
+   ANALYZE</command> commands, and are always approximate even when freshly
    updated.
   </para>
 
@@ -1020,19 +1020,19 @@ WHERE tablename = 'road';
 
    Note that two rows are displayed for the same column, one corresponding
    to the complete inheritance hierarchy starting at the
-   <literal>road</literal> table (<literal>inherited</>=<literal>t</>),
+   <literal>road</literal> table (<literal>inherited</literal>=<literal>t</literal>),
    and another one including only the <literal>road</literal> table itself
-   (<literal>inherited</>=<literal>f</>).
+   (<literal>inherited</literal>=<literal>f</literal>).
   </para>
 
   <para>
    The amount of information stored in <structname>pg_statistic</structname>
-   by <command>ANALYZE</>, in particular the maximum number of entries in the
-   <structfield>most_common_vals</> and <structfield>histogram_bounds</>
+   by <command>ANALYZE</command>, in particular the maximum number of entries in the
+   <structfield>most_common_vals</structfield> and <structfield>histogram_bounds</structfield>
    arrays for each column, can be set on a
-   column-by-column basis using the <command>ALTER TABLE SET STATISTICS</>
+   column-by-column basis using the <command>ALTER TABLE SET STATISTICS</command>
    command, or globally by setting the
-   <xref linkend="guc-default-statistics-target"> configuration variable.
+   <xref linkend="guc-default-statistics-target"/> configuration variable.
    The default limit is presently 100 entries.  Raising the limit
    might allow more accurate planner estimates to be made, particularly for
    columns with irregular data distributions, at the price of consuming
@@ -1043,7 +1043,7 @@ WHERE tablename = 'road';
 
   <para>
    Further details about the planner's use of statistics can be found in
-   <xref linkend="planner-stats-details">.
+   <xref linkend="planner-stats-details"/>.
   </para>
   </sect2>
 
@@ -1072,7 +1072,7 @@ WHERE tablename = 'road';
     an assumption that does not hold when column values are correlated.
     Regular statistics, because of their per-individual-column nature,
     cannot capture any knowledge about cross-column correlation.
-    However, <productname>PostgreSQL</> has the ability to compute
+    However, <productname>PostgreSQL</productname> has the ability to compute
     <firstterm>multivariate statistics</firstterm>, which can capture
     such information.
    </para>
@@ -1081,13 +1081,13 @@ WHERE tablename = 'road';
     Because the number of possible column combinations is very large,
     it's impractical to compute multivariate statistics automatically.
     Instead, <firstterm>extended statistics objects</firstterm>, more often
-    called just <firstterm>statistics objects</>, can be created to instruct
+    called just <firstterm>statistics objects</firstterm>, can be created to instruct
     the server to obtain statistics across interesting sets of columns.
    </para>
 
    <para>
     Statistics objects are created using
-    <xref linkend="sql-createstatistics">, which see for more details.
+    <xref linkend="sql-createstatistics"/>, which see for more details.
     Creation of such an object merely creates a catalog entry expressing
     interest in the statistics.  Actual data collection is performed
     by <command>ANALYZE</command> (either a manual command, or background
@@ -1107,7 +1107,7 @@ WHERE tablename = 'road';
    </para>
 
    <para>
-    The following subsections describe the types of extended statistics
+    The following subsections describe the kinds of extended statistics
     that are currently supported.
    </para>
 
@@ -1115,13 +1115,13 @@ WHERE tablename = 'road';
     <title>Functional Dependencies</title>
 
     <para>
-     The simplest type of extended statistics tracks <firstterm>functional
-     dependencies</>, a concept used in definitions of database normal forms.
-     We say that column <structfield>b</> is functionally dependent on
-     column <structfield>a</> if knowledge of the value of
-     <structfield>a</> is sufficient to determine the value
-     of <structfield>b</>, that is there are no two rows having the same value
-     of <structfield>a</> but different values of <structfield>b</>.
+     The simplest kind of extended statistics tracks <firstterm>functional
+     dependencies</firstterm>, a concept used in definitions of database normal forms.
+     We say that column <structfield>b</structfield> is functionally dependent on
+     column <structfield>a</structfield> if knowledge of the value of
+     <structfield>a</structfield> is sufficient to determine the value
+     of <structfield>b</structfield>, that is there are no two rows having the same value
+     of <structfield>a</structfield> but different values of <structfield>b</structfield>.
      In a fully normalized database, functional dependencies should exist
      only on primary keys and superkeys. However, in practice many data sets
      are not fully normalized for various reasons; intentional
@@ -1142,15 +1142,15 @@ WHERE tablename = 'road';
     </para>
 
     <para>
-     To inform the planner about functional dependencies, <command>ANALYZE</>
+     To inform the planner about functional dependencies, <command>ANALYZE</command>
      can collect measurements of cross-column dependency. Assessing the
      degree of dependency between all sets of columns would be prohibitively
      expensive, so data collection is limited to those groups of columns
      appearing together in a statistics object defined with
-     the <literal>dependencies</> option.  It is advisable to create
-     <literal>dependencies</> statistics only for column groups that are
+     the <literal>dependencies</literal> option.  It is advisable to create
+     <literal>dependencies</literal> statistics only for column groups that are
      strongly correlated, to avoid unnecessary overhead in both
-     <command>ANALYZE</> and later query planning.
+     <command>ANALYZE</command> and later query planning.
     </para>
 
     <para>
@@ -1189,7 +1189,7 @@ SELECT stxname, stxkeys, stxdependencies
       simple equality conditions that compare columns to constant values.
       They are not used to improve estimates for equality conditions
       comparing two columns or comparing a column to an expression, nor for
-      range clauses, <literal>LIKE</> or any other type of condition.
+      range clauses, <literal>LIKE</literal> or any other type of condition.
      </para>
 
      <para>
@@ -1200,7 +1200,7 @@ SELECT stxname, stxkeys, stxdependencies
 <programlisting>
 SELECT * FROM zipcodes WHERE city = 'San Francisco' AND zip = '94105';
 </programlisting>
-      the planner will disregard the <structfield>city</> clause as not
+      the planner will disregard the <structfield>city</structfield> clause as not
       changing the selectivity, which is correct.  However, it will make
       the same assumption about
 <programlisting>
@@ -1233,11 +1233,11 @@ SELECT * FROM zipcodes WHERE city = 'San Francisco' AND zip = '90210';
     </para>
 
     <para>
-     To improve such estimates, <command>ANALYZE</> can collect n-distinct
+     To improve such estimates, <command>ANALYZE</command> can collect n-distinct
      statistics for groups of columns.  As before, it's impractical to do
      this for every possible column grouping, so data is collected only for
      those groups of columns appearing together in a statistics object
-     defined with the <literal>ndistinct</> option.  Data will be collected
+     defined with the <literal>ndistinct</literal> option.  Data will be collected
      for each possible combination of two or more columns from the set of
      listed columns.
     </para>
@@ -1267,17 +1267,17 @@ nd | {"1, 2": 33178, "1, 5": 33178, "2, 5": 27435, "1, 2, 5": 33178}
     </para>
 
     <para>
-     It's advisable to create <literal>ndistinct</> statistics objects only
+     It's advisable to create <literal>ndistinct</literal> statistics objects only
      on combinations of columns that are actually used for grouping, and
      for which misestimation of the number of groups is resulting in bad
-     plans.  Otherwise, the <command>ANALYZE</> cycles are just wasted.
+     plans.  Otherwise, the <command>ANALYZE</command> cycles are just wasted.
     </para>
    </sect3>
   </sect2>
  </sect1>
 
  <sect1 id="explicit-joins">
-  <title>Controlling the Planner with Explicit <literal>JOIN</> Clauses</title>
+  <title>Controlling the Planner with Explicit <literal>JOIN</literal> Clauses</title>
 
   <indexterm zone="explicit-joins">
    <primary>join</primary>
@@ -1286,7 +1286,7 @@ nd | {"1, 2": 33178, "1, 5": 33178, "2, 5": 27435, "1, 2, 5": 33178}
 
   <para>
    It is possible
-   to control the query planner to some extent by using the explicit <literal>JOIN</>
+   to control the query planner to some extent by using the explicit <literal>JOIN</literal>
    syntax.  To see why this matters, we first need some background.
   </para>
 
@@ -1297,13 +1297,13 @@ SELECT * FROM a, b, c WHERE a.id = b.id AND b.ref = c.id;
 </programlisting>
    the planner is free to join the given tables in any order.  For
    example, it could generate a query plan that joins A to B, using
-   the <literal>WHERE</> condition <literal>a.id = b.id</>, and then
-   joins C to this joined table, using the other <literal>WHERE</>
+   the <literal>WHERE</literal> condition <literal>a.id = b.id</literal>, and then
+   joins C to this joined table, using the other <literal>WHERE</literal>
    condition.  Or it could join B to C and then join A to that result.
    Or it could join A to C and then join them with B &mdash; but that
    would be inefficient, since the full Cartesian product of A and C
    would have to be formed, there being no applicable condition in the
-   <literal>WHERE</> clause to allow optimization of the join.  (All
+   <literal>WHERE</literal> clause to allow optimization of the join.  (All
    joins in the <productname>PostgreSQL</productname> executor happen
    between two input tables, so it's necessary to build up the result
    in one or another of these fashions.)  The important point is that
@@ -1323,7 +1323,7 @@ SELECT * FROM a, b, c WHERE a.id = b.id AND b.ref = c.id;
    <productname>PostgreSQL</productname> planner will switch from exhaustive
    search to a <firstterm>genetic</firstterm> probabilistic search
    through a limited number of possibilities.  (The switch-over threshold is
-   set by the <xref linkend="guc-geqo-threshold"> run-time
+   set by the <xref linkend="guc-geqo-threshold"/> run-time
    parameter.)
    The genetic search takes less time, but it won't
    necessarily find the best possible plan.
@@ -1347,30 +1347,30 @@ SELECT * FROM a LEFT JOIN (b JOIN c ON (b.ref = c.id)) ON (a.id = b.id);
 SELECT * FROM a LEFT JOIN b ON (a.bid = b.id) LEFT JOIN c ON (a.cid = c.id);
 </programlisting>
    it is valid to join A to either B or C first.  Currently, only
-   <literal>FULL JOIN</> completely constrains the join order.  Most
-   practical cases involving <literal>LEFT JOIN</> or <literal>RIGHT JOIN</>
+   <literal>FULL JOIN</literal> completely constrains the join order.  Most
+   practical cases involving <literal>LEFT JOIN</literal> or <literal>RIGHT JOIN</literal>
    can be rearranged to some extent.
   </para>
 
   <para>
-   Explicit inner join syntax (<literal>INNER JOIN</>, <literal>CROSS
-   JOIN</>, or unadorned <literal>JOIN</>) is semantically the same as
-   listing the input relations in <literal>FROM</>, so it does not
+   Explicit inner join syntax (<literal>INNER JOIN</literal>, <literal>CROSS
+   JOIN</literal>, or unadorned <literal>JOIN</literal>) is semantically the same as
+   listing the input relations in <literal>FROM</literal>, so it does not
    constrain the join order.
   </para>
 
   <para>
-   Even though most kinds of <literal>JOIN</> don't completely constrain
+   Even though most kinds of <literal>JOIN</literal> don't completely constrain
    the join order, it is possible to instruct the
    <productname>PostgreSQL</productname> query planner to treat all
-   <literal>JOIN</> clauses as constraining the join order anyway.
+   <literal>JOIN</literal> clauses as constraining the join order anyway.
    For example, these three queries are logically equivalent:
 <programlisting>
 SELECT * FROM a, b, c WHERE a.id = b.id AND b.ref = c.id;
 SELECT * FROM a CROSS JOIN b CROSS JOIN c WHERE a.id = b.id AND b.ref = c.id;
 SELECT * FROM a JOIN (b JOIN c ON (b.ref = c.id)) ON (a.id = b.id);
 </programlisting>
-   But if we tell the planner to honor the <literal>JOIN</> order,
+   But if we tell the planner to honor the <literal>JOIN</literal> order,
    the second and third take less time to plan than the first.  This effect
    is not worth worrying about for only three tables, but it can be a
    lifesaver with many tables.
@@ -1378,19 +1378,19 @@ SELECT * FROM a JOIN (b JOIN c ON (b.ref = c.id)) ON (a.id = b.id);
 
   <para>
    To force the planner to follow the join order laid out by explicit
-   <literal>JOIN</>s,
-   set the <xref linkend="guc-join-collapse-limit"> run-time parameter to 1.
+   <literal>JOIN</literal>s,
+   set the <xref linkend="guc-join-collapse-limit"/> run-time parameter to 1.
    (Other possible values are discussed below.)
   </para>
 
   <para>
    You do not need to constrain the join order completely in order to
-   cut search time, because it's OK to use <literal>JOIN</> operators
-   within items of a plain <literal>FROM</> list.  For example, consider:
+   cut search time, because it's OK to use <literal>JOIN</literal> operators
+   within items of a plain <literal>FROM</literal> list.  For example, consider:
 <programlisting>
 SELECT * FROM a CROSS JOIN b, c, d, e WHERE ...;
 </programlisting>
-   With <varname>join_collapse_limit</> = 1, this
+   With <varname>join_collapse_limit</varname> = 1, this
    forces the planner to join A to B before joining them to other tables,
    but doesn't constrain its choices otherwise.  In this example, the
    number of possible join orders is reduced by a factor of 5.
@@ -1400,7 +1400,7 @@ SELECT * FROM a CROSS JOIN b, c, d, e WHERE ...;
    Constraining the planner's search in this way is a useful technique
    both for reducing planning time and for directing the planner to a
    good query plan.  If the planner chooses a bad join order by default,
-   you can force it to choose a better order via <literal>JOIN</> syntax
+   you can force it to choose a better order via <literal>JOIN</literal> syntax
    &mdash; assuming that you know of a better order, that is.  Experimentation
    is recommended.
   </para>
@@ -1415,35 +1415,35 @@ FROM x, y,
 WHERE somethingelse;
 </programlisting>
    This situation might arise from use of a view that contains a join;
-   the view's <literal>SELECT</> rule will be inserted in place of the view
+   the view's <literal>SELECT</literal> rule will be inserted in place of the view
    reference, yielding a query much like the above.  Normally, the planner
    will try to collapse the subquery into the parent, yielding:
 <programlisting>
 SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 </programlisting>
    This usually results in a better plan than planning the subquery
-   separately.  (For example, the outer <literal>WHERE</> conditions might be such that
+   separately.  (For example, the outer <literal>WHERE</literal> conditions might be such that
    joining X to A first eliminates many rows of A, thus avoiding the need to
    form the full logical output of the subquery.)  But at the same time,
    we have increased the planning time; here, we have a five-way join
    problem replacing two separate three-way join problems.  Because of the
    exponential growth of the number of possibilities, this makes a big
    difference.  The planner tries to avoid getting stuck in huge join search
-   problems by not collapsing a subquery if more than <varname>from_collapse_limit</>
-   <literal>FROM</> items would result in the parent
+   problems by not collapsing a subquery if more than <varname>from_collapse_limit</varname>
+   <literal>FROM</literal> items would result in the parent
    query.  You can trade off planning time against quality of plan by
    adjusting this run-time parameter up or down.
   </para>
 
   <para>
-   <xref linkend="guc-from-collapse-limit"> and <xref
-   linkend="guc-join-collapse-limit">
+   <xref linkend="guc-from-collapse-limit"/> and <xref
+   linkend="guc-join-collapse-limit"/>
    are similarly named because they do almost the same thing: one controls
-   when the planner will <quote>flatten out</> subqueries, and the
+   when the planner will <quote>flatten out</quote> subqueries, and the
    other controls when it will flatten out explicit joins.  Typically
-   you would either set <varname>join_collapse_limit</> equal to
-   <varname>from_collapse_limit</> (so that explicit joins and subqueries
-   act similarly) or set <varname>join_collapse_limit</> to 1 (if you want
+   you would either set <varname>join_collapse_limit</varname> equal to
+   <varname>from_collapse_limit</varname> (so that explicit joins and subqueries
+   act similarly) or set <varname>join_collapse_limit</varname> to 1 (if you want
    to control join order with explicit joins).  But you might set them
    differently if you are trying to fine-tune the trade-off between planning
    time and run time.
@@ -1468,7 +1468,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
    </indexterm>
 
    <para>
-    When using multiple <command>INSERT</>s, turn off autocommit and just do
+    When using multiple <command>INSERT</command>s, turn off autocommit and just do
     one commit at the end.  (In plain
     SQL, this means issuing <command>BEGIN</command> at the start and
     <command>COMMIT</command> at the end.  Some client libraries might
@@ -1488,7 +1488,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
    <title>Use <command>COPY</command></title>
 
    <para>
-    Use <xref linkend="sql-copy"> to load
+    Use <xref linkend="sql-copy"/> to load
     all the rows in one command, instead of using a series of
     <command>INSERT</command> commands.  The <command>COPY</command>
     command is optimized for loading large numbers of rows; it is less
@@ -1500,19 +1500,19 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
    <para>
     If you cannot use <command>COPY</command>, it might help to use <xref
-    linkend="sql-prepare"> to create a
+    linkend="sql-prepare"/> to create a
     prepared <command>INSERT</command> statement, and then use
     <command>EXECUTE</command> as many times as required.  This avoids
     some of the overhead of repeatedly parsing and planning
     <command>INSERT</command>. Different interfaces provide this facility
-    in different ways; look for <quote>prepared statements</> in the interface
+    in different ways; look for <quote>prepared statements</quote> in the interface
     documentation.
    </para>
 
    <para>
     Note that loading a large number of rows using
     <command>COPY</command> is almost always faster than using
-    <command>INSERT</command>, even if <command>PREPARE</> is used and
+    <command>INSERT</command>, even if <command>PREPARE</command> is used and
     multiple insertions are batched into a single transaction.
    </para>
 
@@ -1523,7 +1523,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     needs to be written, because in case of an error, the files
     containing the newly loaded data will be removed anyway.
     However, this consideration only applies when
-    <xref linkend="guc-wal-level"> is <literal>minimal</> as all commands
+    <xref linkend="guc-wal-level"/> is <literal>minimal</literal> as all commands
     must write WAL otherwise.
    </para>
 
@@ -1557,7 +1557,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
    <para>
     Just as with indexes, a foreign key constraint can be checked
-    <quote>in bulk</> more efficiently than row-by-row.  So it might be
+    <quote>in bulk</quote> more efficiently than row-by-row.  So it might be
     useful to drop foreign key constraints, load data, and re-create
     the constraints.  Again, there is a trade-off between data load
     speed and loss of error checking while the constraint is missing.
@@ -1570,7 +1570,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     the row's foreign key constraint).  Loading many millions of rows can
     cause the trigger event queue to overflow available memory, leading to
     intolerable swapping or even outright failure of the command.  Therefore
-    it may be <emphasis>necessary</>, not just desirable, to drop and re-apply
+    it may be <emphasis>necessary</emphasis>, not just desirable, to drop and re-apply
     foreign keys when loading large amounts of data.  If temporarily removing
     the constraint isn't acceptable, the only other recourse may be to split
     up the load operation into smaller transactions.
@@ -1581,11 +1581,11 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
    <title>Increase <varname>maintenance_work_mem</varname></title>
 
    <para>
-    Temporarily increasing the <xref linkend="guc-maintenance-work-mem">
+    Temporarily increasing the <xref linkend="guc-maintenance-work-mem"/>
     configuration variable when loading large amounts of data can
     lead to improved performance.  This will help to speed up <command>CREATE
-    INDEX</> commands and <command>ALTER TABLE ADD FOREIGN KEY</> commands.
-    It won't do much for <command>COPY</> itself, so this advice is
+    INDEX</command> commands and <command>ALTER TABLE ADD FOREIGN KEY</command> commands.
+    It won't do much for <command>COPY</command> itself, so this advice is
     only useful when you are using one or both of the above techniques.
    </para>
   </sect2>
@@ -1594,7 +1594,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
    <title>Increase <varname>max_wal_size</varname></title>
 
    <para>
-    Temporarily increasing the <xref linkend="guc-max-wal-size">
+    Temporarily increasing the <xref linkend="guc-max-wal-size"/>
     configuration variable can also
     make large data loads faster.  This is because loading a large
     amount of data into <productname>PostgreSQL</productname> will
@@ -1617,9 +1617,9 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     new base backup after the load has completed than to process a large
     amount of incremental WAL data.  To prevent incremental WAL logging
     while loading, disable archiving and streaming replication, by setting
-    <xref linkend="guc-wal-level"> to <literal>minimal</>,
-    <xref linkend="guc-archive-mode"> to <literal>off</>, and
-    <xref linkend="guc-max-wal-senders"> to zero.
+    <xref linkend="guc-wal-level"/> to <literal>minimal</literal>,
+    <xref linkend="guc-archive-mode"/> to <literal>off</literal>, and
+    <xref linkend="guc-max-wal-senders"/> to zero.
     But note that changing these settings requires a server restart.
    </para>
 
@@ -1628,8 +1628,8 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     process the WAL data,
     doing this will actually make certain commands faster, because they
     are designed not to write WAL at all if <varname>wal_level</varname>
-    is <literal>minimal</>.  (They can guarantee crash safety more cheaply
-    by doing an <function>fsync</> at the end than by writing WAL.)
+    is <literal>minimal</literal>.  (They can guarantee crash safety more cheaply
+    by doing an <function>fsync</function> at the end than by writing WAL.)
     This applies to the following commands:
     <itemizedlist>
      <listitem>
@@ -1668,7 +1668,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
    <para>
     Whenever you have significantly altered the distribution of data
-    within a table, running <xref linkend="sql-analyze"> is strongly recommended. This
+    within a table, running <xref linkend="sql-analyze"/> is strongly recommended. This
     includes bulk loading large amounts of data into the table.  Running
     <command>ANALYZE</command> (or <command>VACUUM ANALYZE</command>)
     ensures that the planner has up-to-date statistics about the
@@ -1677,27 +1677,27 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     performance on any tables with inaccurate or nonexistent
     statistics.  Note that if the autovacuum daemon is enabled, it might
     run <command>ANALYZE</command> automatically; see
-    <xref linkend="vacuum-for-statistics">
-    and <xref linkend="autovacuum"> for more information.
+    <xref linkend="vacuum-for-statistics"/>
+    and <xref linkend="autovacuum"/> for more information.
    </para>
   </sect2>
 
   <sect2 id="populate-pg-dump">
-   <title>Some Notes About <application>pg_dump</></title>
+   <title>Some Notes About <application>pg_dump</application></title>
 
    <para>
-    Dump scripts generated by <application>pg_dump</> automatically apply
+    Dump scripts generated by <application>pg_dump</application> automatically apply
     several, but not all, of the above guidelines.  To reload a
-    <application>pg_dump</> dump as quickly as possible, you need to
+    <application>pg_dump</application> dump as quickly as possible, you need to
     do a few extra things manually.  (Note that these points apply while
-    <emphasis>restoring</> a dump, not while <emphasis>creating</> it.
+    <emphasis>restoring</emphasis> a dump, not while <emphasis>creating</emphasis> it.
     The same points apply whether loading a text dump with
-    <application>psql</> or using <application>pg_restore</> to load
-    from a <application>pg_dump</> archive file.)
+    <application>psql</application> or using <application>pg_restore</application> to load
+    from a <application>pg_dump</application> archive file.)
    </para>
 
    <para>
-    By default, <application>pg_dump</> uses <command>COPY</>, and when
+    By default, <application>pg_dump</application> uses <command>COPY</command>, and when
     it is generating a complete schema-and-data dump, it is careful to
     load data before creating indexes and foreign keys.  So in this case
     several guidelines are handled automatically.  What is left
@@ -1713,10 +1713,10 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
      <listitem>
       <para>
        If using WAL archiving or streaming replication, consider disabling
-       them during the restore. To do that, set <varname>archive_mode</>
-       to <literal>off</>,
-       <varname>wal_level</varname> to <literal>minimal</>, and
-       <varname>max_wal_senders</> to zero before loading the dump.
+       them during the restore. To do that, set <varname>archive_mode</varname>
+       to <literal>off</literal>,
+       <varname>wal_level</varname> to <literal>minimal</literal>, and
+       <varname>max_wal_senders</varname> to zero before loading the dump.
        Afterwards, set them back to the right values and take a fresh
        base backup.
       </para>
@@ -1724,49 +1724,49 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
      <listitem>
       <para>
        Experiment with the parallel dump and restore modes of both
-       <application>pg_dump</> and <application>pg_restore</> and find the
+       <application>pg_dump</application> and <application>pg_restore</application> and find the
        optimal number of concurrent jobs to use. Dumping and restoring in
-       parallel by means of the <option>-j</> option should give you a
+       parallel by means of the <option>-j</option> option should give you a
        significantly higher performance over the serial mode.
       </para>
      </listitem>
      <listitem>
       <para>
        Consider whether the whole dump should be restored as a single
-       transaction.  To do that, pass the <option>-1</> or
-       <option>--single-transaction</> command-line option to
-       <application>psql</> or <application>pg_restore</>. When using this
+       transaction.  To do that, pass the <option>-1</option> or
+       <option>--single-transaction</option> command-line option to
+       <application>psql</application> or <application>pg_restore</application>. When using this
        mode, even the smallest of errors will rollback the entire restore,
        possibly discarding many hours of processing.  Depending on how
        interrelated the data is, that might seem preferable to manual cleanup,
-       or not.  <command>COPY</> commands will run fastest if you use a single
+       or not.  <command>COPY</command> commands will run fastest if you use a single
        transaction and have WAL archiving turned off.
       </para>
      </listitem>
      <listitem>
       <para>
        If multiple CPUs are available in the database server, consider using
-       <application>pg_restore</>'s <option>--jobs</> option.  This
+       <application>pg_restore</application>'s <option>--jobs</option> option.  This
        allows concurrent data loading and index creation.
       </para>
      </listitem>
      <listitem>
       <para>
-       Run <command>ANALYZE</> afterwards.
+       Run <command>ANALYZE</command> afterwards.
       </para>
      </listitem>
     </itemizedlist>
    </para>
 
    <para>
-    A data-only dump will still use <command>COPY</>, but it does not
+    A data-only dump will still use <command>COPY</command>, but it does not
     drop or recreate indexes, and it does not normally touch foreign
     keys.
 
      <footnote>
       <para>
        You can get the effect of disabling foreign keys by using
-       the <option>--disable-triggers</> option &mdash; but realize that
+       the <option>--disable-triggers</option> option &mdash; but realize that
        that eliminates, rather than just postpones, foreign key
        validation, and so it is possible to insert bad data if you use it.
       </para>
@@ -1778,9 +1778,9 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
     while loading the data, but don't bother increasing
     <varname>maintenance_work_mem</varname>; rather, you'd do that while
     manually recreating indexes and foreign keys afterwards.
-    And don't forget to <command>ANALYZE</> when you're done; see
-    <xref linkend="vacuum-for-statistics">
-    and <xref linkend="autovacuum"> for more information.
+    And don't forget to <command>ANALYZE</command> when you're done; see
+    <xref linkend="vacuum-for-statistics"/>
+    and <xref linkend="autovacuum"/> for more information.
    </para>
   </sect2>
   </sect1>
@@ -1808,7 +1808,7 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
      <listitem>
       <para>
        Place the database cluster's data directory in a memory-backed
-       file system (i.e. <acronym>RAM</> disk).  This eliminates all
+       file system (i.e. <acronym>RAM</acronym> disk).  This eliminates all
        database disk I/O, but limits data storage to the amount of
        available memory (and perhaps swap).
       </para>
@@ -1816,39 +1816,39 @@ SELECT * FROM x, y, a, b, c WHERE something AND somethingelse;
 
      <listitem>
       <para>
-       Turn off <xref linkend="guc-fsync">;  there is no need to flush
+       Turn off <xref linkend="guc-fsync"/>;  there is no need to flush
        data to disk.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Turn off <xref linkend="guc-synchronous-commit">;  there might be no
+       Turn off <xref linkend="guc-synchronous-commit"/>;  there might be no
        need to force <acronym>WAL</acronym> writes to disk on every
        commit.  This setting does risk transaction loss (though not data
-       corruption) in case of a crash of the <emphasis>database</>.
+       corruption) in case of a crash of the <emphasis>database</emphasis>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Turn off <xref linkend="guc-full-page-writes">;  there is no need
+       Turn off <xref linkend="guc-full-page-writes"/>;  there is no need
        to guard against partial page writes.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Increase <xref linkend="guc-max-wal-size"> and <xref
-       linkend="guc-checkpoint-timeout"> ; this reduces the frequency
+       Increase <xref linkend="guc-max-wal-size"/> and <xref
+       linkend="guc-checkpoint-timeout"/>; this reduces the frequency
        of checkpoints, but increases the storage requirements of
-       <filename>/pg_wal</>.
+       <filename>/pg_wal</filename>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Create <link linkend="SQL-CREATETABLE-UNLOGGED">unlogged
+       Create <link linkend="sql-createtable-unlogged">unlogged
        tables</link> to avoid <acronym>WAL</acronym> writes, though it
        makes the tables non-crash-safe.
       </para>
diff --git a/doc/src/sgml/pgbuffercache.sgml b/doc/src/sgml/pgbuffercache.sgml
index 4e53009ae0..faf5a3115d 100644
--- a/doc/src/sgml/pgbuffercache.sgml
+++ b/doc/src/sgml/pgbuffercache.sgml
@@ -33,11 +33,11 @@
   <title>The <structname>pg_buffercache</structname> View</title>
 
   <para>
-   The definitions of the columns exposed by the view are shown in <xref linkend="pgbuffercache-columns">.
+   The definitions of the columns exposed by the view are shown in <xref linkend="pgbuffercache-columns"/>.
   </para>
 
   <table id="pgbuffercache-columns">
-   <title><structname>pg_buffercache</> Columns</title>
+   <title><structname>pg_buffercache</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -54,7 +54,7 @@
       <entry><structfield>bufferid</structfield></entry>
       <entry><type>integer</type></entry>
       <entry></entry>
-      <entry>ID, in the range 1..<varname>shared_buffers</></entry>
+      <entry>ID, in the range 1..<varname>shared_buffers</varname></entry>
      </row>
 
      <row>
@@ -83,7 +83,7 @@
       <entry><type>smallint</type></entry>
       <entry></entry>
       <entry>Fork number within the relation;  see
-      <filename>include/common/relpath.h</></entry>
+      <filename>include/common/relpath.h</filename></entry>
      </row>
 
      <row>
@@ -120,22 +120,22 @@
 
   <para>
    There is one row for each buffer in the shared cache. Unused buffers are
-   shown with all fields null except <structfield>bufferid</>.  Shared system
+   shown with all fields null except <structfield>bufferid</structfield>.  Shared system
    catalogs are shown as belonging to database zero.
   </para>
 
   <para>
    Because the cache is shared by all the databases, there will normally be
    pages from relations not belonging to the current database.  This means
-   that there may not be matching join rows in <structname>pg_class</> for
+   that there may not be matching join rows in <structname>pg_class</structname> for
    some rows, or that there could even be incorrect joins.  If you are
-   trying to join against <structname>pg_class</>, it's a good idea to
-   restrict the join to rows having <structfield>reldatabase</> equal to
+   trying to join against <structname>pg_class</structname>, it's a good idea to
+   restrict the join to rows having <structfield>reldatabase</structfield> equal to
    the current database's OID or zero.
   </para>
 
   <para>
-   When the <structname>pg_buffercache</> view is accessed, internal buffer
+   When the <structname>pg_buffercache</structname> view is accessed, internal buffer
    manager locks are taken for long enough to copy all the buffer state
    data that the view will display.
    This ensures that the view produces a consistent set of results, while not
diff --git a/doc/src/sgml/pgcrypto.sgml b/doc/src/sgml/pgcrypto.sgml
index bf514aacf3..efa193d22e 100644
--- a/doc/src/sgml/pgcrypto.sgml
+++ b/doc/src/sgml/pgcrypto.sgml
@@ -13,8 +13,8 @@
  </indexterm>
 
  <para>
-  The <filename>pgcrypto</> module provides cryptographic functions for
-  <productname>PostgreSQL</>.
+  The <filename>pgcrypto</filename> module provides cryptographic functions for
+  <productname>PostgreSQL</productname>.
  </para>
 
  <sect2>
@@ -33,19 +33,19 @@ digest(data bytea, type text) returns bytea
 </synopsis>
 
    <para>
-    Computes a binary hash of the given <parameter>data</>.
-    <parameter>type</> is the algorithm to use.
+    Computes a binary hash of the given <parameter>data</parameter>.
+    <parameter>type</parameter> is the algorithm to use.
     Standard algorithms are <literal>md5</literal>, <literal>sha1</literal>,
     <literal>sha224</literal>, <literal>sha256</literal>,
     <literal>sha384</literal> and <literal>sha512</literal>.
-    If <filename>pgcrypto</> was built with
+    If <filename>pgcrypto</filename> was built with
     OpenSSL, more algorithms are available, as detailed in
-    <xref linkend="pgcrypto-with-without-openssl">.
+    <xref linkend="pgcrypto-with-without-openssl"/>.
    </para>
 
    <para>
     If you want the digest as a hexadecimal string, use
-    <function>encode()</> on the result.  For example:
+    <function>encode()</function> on the result.  For example:
 <programlisting>
 CREATE OR REPLACE FUNCTION sha1(bytea) returns text AS $$
     SELECT encode(digest($1, 'sha1'), 'hex')
@@ -67,12 +67,12 @@ hmac(data bytea, key text, type text) returns bytea
 </synopsis>
 
    <para>
-    Calculates hashed MAC for <parameter>data</> with key <parameter>key</>.
-    <parameter>type</> is the same as in <function>digest()</>.
+    Calculates hashed MAC for <parameter>data</parameter> with key <parameter>key</parameter>.
+    <parameter>type</parameter> is the same as in <function>digest()</function>.
    </para>
 
    <para>
-    This is similar to <function>digest()</> but the hash can only be
+    This is similar to <function>digest()</function> but the hash can only be
     recalculated knowing the key.  This prevents the scenario of someone
     altering data and also changing the hash to match.
    </para>
@@ -88,14 +88,14 @@ hmac(data bytea, key text, type text) returns bytea
   <title>Password Hashing Functions</title>
 
   <para>
-   The functions <function>crypt()</> and <function>gen_salt()</>
+   The functions <function>crypt()</function> and <function>gen_salt()</function>
    are specifically designed for hashing passwords.
-   <function>crypt()</> does the hashing and <function>gen_salt()</>
+   <function>crypt()</function> does the hashing and <function>gen_salt()</function>
    prepares algorithm parameters for it.
   </para>
 
   <para>
-   The algorithms in <function>crypt()</> differ from the usual
+   The algorithms in <function>crypt()</function> differ from the usual
    MD5 or SHA1 hashing algorithms in the following respects:
   </para>
 
@@ -108,7 +108,7 @@ hmac(data bytea, key text, type text) returns bytea
    </listitem>
    <listitem>
     <para>
-     They use a random value, called the <firstterm>salt</>, so that users
+     They use a random value, called the <firstterm>salt</firstterm>, so that users
      having the same password will have different encrypted passwords.
      This is also an additional defense against reversing the algorithm.
     </para>
@@ -129,12 +129,12 @@ hmac(data bytea, key text, type text) returns bytea
   </orderedlist>
 
   <para>
-   <xref linkend="pgcrypto-crypt-algorithms"> lists the algorithms
+   <xref linkend="pgcrypto-crypt-algorithms"/> lists the algorithms
    supported by the <function>crypt()</function> function.
   </para>
 
   <table id="pgcrypto-crypt-algorithms">
-   <title>Supported Algorithms for <function>crypt()</></title>
+   <title>Supported Algorithms for <function>crypt()</function></title>
    <tgroup cols="6">
     <thead>
      <row>
@@ -148,7 +148,7 @@ hmac(data bytea, key text, type text) returns bytea
     </thead>
     <tbody>
      <row>
-      <entry><literal>bf</></entry>
+      <entry><literal>bf</literal></entry>
       <entry>72</entry>
       <entry>yes</entry>
       <entry>128</entry>
@@ -156,7 +156,7 @@ hmac(data bytea, key text, type text) returns bytea
       <entry>Blowfish-based, variant 2a</entry>
      </row>
      <row>
-      <entry><literal>md5</></entry>
+      <entry><literal>md5</literal></entry>
       <entry>unlimited</entry>
       <entry>no</entry>
       <entry>48</entry>
@@ -164,7 +164,7 @@ hmac(data bytea, key text, type text) returns bytea
       <entry>MD5-based crypt</entry>
      </row>
      <row>
-      <entry><literal>xdes</></entry>
+      <entry><literal>xdes</literal></entry>
       <entry>8</entry>
       <entry>yes</entry>
       <entry>24</entry>
@@ -172,7 +172,7 @@ hmac(data bytea, key text, type text) returns bytea
       <entry>Extended DES</entry>
      </row>
      <row>
-      <entry><literal>des</></entry>
+      <entry><literal>des</literal></entry>
       <entry>8</entry>
       <entry>no</entry>
       <entry>12</entry>
@@ -184,7 +184,7 @@ hmac(data bytea, key text, type text) returns bytea
   </table>
 
   <sect3>
-   <title><function>crypt()</></title>
+   <title><function>crypt()</function></title>
 
    <indexterm>
     <primary>crypt</primary>
@@ -195,10 +195,10 @@ crypt(password text, salt text) returns text
 </synopsis>
 
    <para>
-    Calculates a crypt(3)-style hash of <parameter>password</>.
+    Calculates a crypt(3)-style hash of <parameter>password</parameter>.
     When storing a new password, you need to use
-    <function>gen_salt()</> to generate a new <parameter>salt</> value.
-    To check a password, pass the stored hash value as <parameter>salt</>,
+    <function>gen_salt()</function> to generate a new <parameter>salt</parameter> value.
+    To check a password, pass the stored hash value as <parameter>salt</parameter>,
     and test whether the result matches the stored value.
    </para>
    <para>
@@ -212,12 +212,12 @@ UPDATE ... SET pswhash = crypt('new password', gen_salt('md5'));
 <programlisting>
 SELECT (pswhash = crypt('entered password', pswhash)) AS pswmatch FROM ... ;
 </programlisting>
-    This returns <literal>true</> if the entered password is correct.
+    This returns <literal>true</literal> if the entered password is correct.
    </para>
   </sect3>
 
   <sect3>
-   <title><function>gen_salt()</></title>
+   <title><function>gen_salt()</function></title>
 
   <indexterm>
    <primary>gen_salt</primary>
@@ -228,30 +228,30 @@ gen_salt(type text [, iter_count integer ]) returns text
 </synopsis>
 
    <para>
-    Generates a new random salt string for use in <function>crypt()</>.
-    The salt string also tells <function>crypt()</> which algorithm to use.
+    Generates a new random salt string for use in <function>crypt()</function>.
+    The salt string also tells <function>crypt()</function> which algorithm to use.
    </para>
 
    <para>
-    The <parameter>type</> parameter specifies the hashing algorithm.
+    The <parameter>type</parameter> parameter specifies the hashing algorithm.
     The accepted types are: <literal>des</literal>, <literal>xdes</literal>,
     <literal>md5</literal> and <literal>bf</literal>.
    </para>
 
    <para>
-    The <parameter>iter_count</> parameter lets the user specify the iteration
+    The <parameter>iter_count</parameter> parameter lets the user specify the iteration
     count, for algorithms that have one.
     The higher the count, the more time it takes to hash
     the password and therefore the more time to break it.  Although with
     too high a count the time to calculate a hash may be several years
-    &mdash; which is somewhat impractical.  If the <parameter>iter_count</>
+    &mdash; which is somewhat impractical.  If the <parameter>iter_count</parameter>
     parameter is omitted, the default iteration count is used.
-    Allowed values for <parameter>iter_count</> depend on the algorithm and
-    are shown in <xref linkend="pgcrypto-icfc-table">.
+    Allowed values for <parameter>iter_count</parameter> depend on the algorithm and
+    are shown in <xref linkend="pgcrypto-icfc-table"/>.
    </para>
 
    <table id="pgcrypto-icfc-table">
-    <title>Iteration Counts for <function>crypt()</></title>
+    <title>Iteration Counts for <function>crypt()</function></title>
     <tgroup cols="4">
      <thead>
       <row>
@@ -263,13 +263,13 @@ gen_salt(type text [, iter_count integer ]) returns text
      </thead>
      <tbody>
       <row>
-       <entry><literal>xdes</></entry>
+       <entry><literal>xdes</literal></entry>
        <entry>725</entry>
        <entry>1</entry>
        <entry>16777215</entry>
       </row>
       <row>
-       <entry><literal>bf</></entry>
+       <entry><literal>bf</literal></entry>
        <entry>6</entry>
        <entry>4</entry>
        <entry>31</entry>
@@ -292,7 +292,7 @@ gen_salt(type text [, iter_count integer ]) returns text
    </para>
 
    <para>
-    <xref linkend="pgcrypto-hash-speed-table"> gives an overview of the relative slowness
+    <xref linkend="pgcrypto-hash-speed-table"/> gives an overview of the relative slowness
     of different hashing algorithms.
     The table shows how much time it would take to try all
     combinations of characters in an 8-character password, assuming
@@ -310,63 +310,63 @@ gen_salt(type text [, iter_count integer ]) returns text
       <row>
        <entry>Algorithm</entry>
        <entry>Hashes/sec</entry>
-       <entry>For <literal>[a-z]</></entry>
-       <entry>For <literal>[A-Za-z0-9]</></entry>
-       <entry>Duration relative to <literal>md5 hash</></entry>
+       <entry>For <literal>[a-z]</literal></entry>
+       <entry>For <literal>[A-Za-z0-9]</literal></entry>
+       <entry>Duration relative to <literal>md5 hash</literal></entry>
       </row>
      </thead>
      <tbody>
       <row>
-       <entry><literal>crypt-bf/8</></entry>
+       <entry><literal>crypt-bf/8</literal></entry>
        <entry>1792</entry>
        <entry>4 years</entry>
        <entry>3927 years</entry>
        <entry>100k</entry>
       </row>
       <row>
-       <entry><literal>crypt-bf/7</></entry>
+       <entry><literal>crypt-bf/7</literal></entry>
        <entry>3648</entry>
        <entry>2 years</entry>
        <entry>1929 years</entry>
        <entry>50k</entry>
       </row>
       <row>
-       <entry><literal>crypt-bf/6</></entry>
+       <entry><literal>crypt-bf/6</literal></entry>
        <entry>7168</entry>
        <entry>1 year</entry>
        <entry>982 years</entry>
        <entry>25k</entry>
       </row>
       <row>
-       <entry><literal>crypt-bf/5</></entry>
+       <entry><literal>crypt-bf/5</literal></entry>
        <entry>13504</entry>
        <entry>188 days</entry>
        <entry>521 years</entry>
        <entry>12.5k</entry>
       </row>
       <row>
-       <entry><literal>crypt-md5</></entry>
+       <entry><literal>crypt-md5</literal></entry>
        <entry>171584</entry>
        <entry>15 days</entry>
        <entry>41 years</entry>
        <entry>1k</entry>
       </row>
       <row>
-       <entry><literal>crypt-des</></entry>
+       <entry><literal>crypt-des</literal></entry>
        <entry>23221568</entry>
        <entry>157.5 minutes</entry>
        <entry>108 days</entry>
        <entry>7</entry>
       </row>
       <row>
-       <entry><literal>sha1</></entry>
+       <entry><literal>sha1</literal></entry>
        <entry>37774272</entry>
        <entry>90 minutes</entry>
        <entry>68 days</entry>
        <entry>4</entry>
       </row>
       <row>
-       <entry><literal>md5</> (hash)</entry>
+       <entry><literal>md5</literal> (hash)</entry>
        <entry>150085504</entry>
        <entry>22.5 minutes</entry>
        <entry>17 days</entry>
@@ -388,18 +388,18 @@ gen_salt(type text [, iter_count integer ]) returns text
     </listitem>
     <listitem>
      <para>
-      <literal>crypt-des</> and <literal>crypt-md5</> algorithm numbers are
-      taken from John the Ripper v1.6.38 <literal>-test</> output.
+      <literal>crypt-des</literal> and <literal>crypt-md5</literal> algorithm numbers are
+      taken from John the Ripper v1.6.38 <literal>-test</literal> output.
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>md5 hash</> numbers are from mdcrack 1.2.
+      <literal>md5 hash</literal> numbers are from mdcrack 1.2.
      </para>
     </listitem>
     <listitem>
      <para>
-      <literal>sha1</> numbers are from lcrack-20031130-beta.
+      <literal>sha1</literal> numbers are from lcrack-20031130-beta.
      </para>
     </listitem>
     <listitem>
@@ -407,10 +407,10 @@ gen_salt(type text [, iter_count integer ]) returns text
       <literal>crypt-bf</literal> numbers are taken using a simple program that
       loops over 1000 8-character passwords.  That way I can show the speed
       with different numbers of iterations.  For reference: <literal>john
-      -test</literal> shows 13506 loops/sec for <literal>crypt-bf/5</>.
+      -test</literal> shows 13506 loops/sec for <literal>crypt-bf/5</literal>.
       (The very small
       difference in results is in accordance with the fact that the
-      <literal>crypt-bf</literal> implementation in <filename>pgcrypto</>
+      <literal>crypt-bf</literal> implementation in <filename>pgcrypto</filename>
       is the same one used in John the Ripper.)
      </para>
     </listitem>
@@ -436,7 +436,7 @@ gen_salt(type text [, iter_count integer ]) returns text
   </para>
 
   <para>
-   An encrypted PGP message consists of 2 parts, or <firstterm>packets</>:
+   An encrypted PGP message consists of 2 parts, or <firstterm>packets</firstterm>:
   </para>
   <itemizedlist>
    <listitem>
@@ -459,7 +459,7 @@ gen_salt(type text [, iter_count integer ]) returns text
    <listitem>
     <para>
      The given password is hashed using a String2Key (S2K) algorithm.  This is
-     rather similar to <function>crypt()</> algorithms &mdash; purposefully
+     rather similar to <function>crypt()</function> algorithms &mdash; purposefully
      slow and with random salt &mdash; but it produces a full-length binary
      key.
     </para>
@@ -540,8 +540,8 @@ pgp_sym_encrypt(data text, psw text [, options text ]) returns bytea
 pgp_sym_encrypt_bytea(data bytea, psw text [, options text ]) returns bytea
 </synopsis>
    <para>
-    Encrypt <parameter>data</> with a symmetric PGP key <parameter>psw</>.
-    The <parameter>options</> parameter can contain option settings,
+    Encrypt <parameter>data</parameter> with a symmetric PGP key <parameter>psw</parameter>.
+    The <parameter>options</parameter> parameter can contain option settings,
     as described below.
    </para>
   </sect3>
@@ -565,12 +565,12 @@ pgp_sym_decrypt_bytea(msg bytea, psw text [, options text ]) returns bytea
     Decrypt a symmetric-key-encrypted PGP message.
    </para>
    <para>
-    Decrypting <type>bytea</> data with <function>pgp_sym_decrypt</> is disallowed.
+    Decrypting <type>bytea</type> data with <function>pgp_sym_decrypt</function> is disallowed.
     This is to avoid outputting invalid character data.  Decrypting
-    originally textual data with <function>pgp_sym_decrypt_bytea</> is fine.
+    originally textual data with <function>pgp_sym_decrypt_bytea</function> is fine.
    </para>
    <para>
-    The <parameter>options</> parameter can contain option settings,
+    The <parameter>options</parameter> parameter can contain option settings,
     as described below.
    </para>
   </sect3>
@@ -591,11 +591,11 @@ pgp_pub_encrypt(data text, key bytea [, options text ]) returns bytea
 pgp_pub_encrypt_bytea(data bytea, key bytea [, options text ]) returns bytea
 </synopsis>
    <para>
-    Encrypt <parameter>data</> with a public PGP key <parameter>key</>.
+    Encrypt <parameter>data</parameter> with a public PGP key <parameter>key</parameter>.
     Giving this function a secret key will produce an error.
    </para>
    <para>
-    The <parameter>options</> parameter can contain option settings,
+    The <parameter>options</parameter> parameter can contain option settings,
     as described below.
    </para>
   </sect3>
@@ -616,19 +616,19 @@ pgp_pub_decrypt(msg bytea, key bytea [, psw text [, options text ]]) returns tex
 pgp_pub_decrypt_bytea(msg bytea, key bytea [, psw text [, options text ]]) returns bytea
 </synopsis>
    <para>
-    Decrypt a public-key-encrypted message.  <parameter>key</> must be the
+    Decrypt a public-key-encrypted message.  <parameter>key</parameter> must be the
     secret key corresponding to the public key that was used to encrypt.
     If the secret key is password-protected, you must give the password in
-    <parameter>psw</>.  If there is no password, but you want to specify
+    <parameter>psw</parameter>.  If there is no password, but you want to specify
     options, you need to give an empty password.
    </para>
    <para>
-    Decrypting <type>bytea</> data with <function>pgp_pub_decrypt</> is disallowed.
+    Decrypting <type>bytea</type> data with <function>pgp_pub_decrypt</function> is disallowed.
     This is to avoid outputting invalid character data.  Decrypting
-    originally textual data with <function>pgp_pub_decrypt_bytea</> is fine.
+    originally textual data with <function>pgp_pub_decrypt_bytea</function> is fine.
    </para>
    <para>
-    The <parameter>options</> parameter can contain option settings,
+    The <parameter>options</parameter> parameter can contain option settings,
     as described below.
    </para>
   </sect3>
@@ -644,7 +644,7 @@ pgp_pub_decrypt_bytea(msg bytea, key bytea [, psw text [, options text ]]) retur
 pgp_key_id(bytea) returns text
 </synopsis>
    <para>
-    <function>pgp_key_id</> extracts the key ID of a PGP public or secret key.
+    <function>pgp_key_id</function> extracts the key ID of a PGP public or secret key.
     Or it gives the key ID that was used for encrypting the data, if given
     an encrypted message.
    </para>
@@ -654,7 +654,7 @@ pgp_key_id(bytea) returns text
    <itemizedlist>
     <listitem>
      <para>
-      <literal>SYMKEY</>
+      <literal>SYMKEY</literal>
      </para>
      <para>
       The message is encrypted with a symmetric key.
@@ -662,12 +662,12 @@ pgp_key_id(bytea) returns text
     </listitem>
     <listitem>
      <para>
-      <literal>ANYKEY</>
+      <literal>ANYKEY</literal>
      </para>
      <para>
       The message is public-key encrypted, but the key ID has been removed.
       That means you will need to try all your secret keys on it to see
-      which one decrypts it.  <filename>pgcrypto</> itself does not produce
+      which one decrypts it.  <filename>pgcrypto</filename> itself does not produce
       such messages.
      </para>
     </listitem>
@@ -675,7 +675,7 @@ pgp_key_id(bytea) returns text
    <para>
     Note that different keys may have the same ID.   This is rare but a normal
     event. The client application should then try to decrypt with each one,
-    to see which fits &mdash; like handling <literal>ANYKEY</>.
+    to see which fits &mdash; like handling <literal>ANYKEY</literal>.
    </para>
   </sect3>
 
@@ -700,8 +700,8 @@ dearmor(data text) returns bytea
    </para>
 
    <para>
-    If the <parameter>keys</> and <parameter>values</> arrays are specified,
-    an <firstterm>armor header</> is added to the armored format for each
+    If the <parameter>keys</parameter> and <parameter>values</parameter> arrays are specified,
+    an <firstterm>armor header</firstterm> is added to the armored format for each
     key/value pair. Both arrays must be single-dimensional, and they must
     be of the same length.  The keys and values cannot contain any non-ASCII
     characters.
@@ -719,8 +719,8 @@ dearmor(data text) returns bytea
 pgp_armor_headers(data text, key out text, value out text) returns setof record
 </synopsis>
    <para>
-    <function>pgp_armor_headers()</> extracts the armor headers from
-    <parameter>data</>.  The return value is a set of rows with two columns,
+    <function>pgp_armor_headers()</function> extracts the armor headers from
+    <parameter>data</parameter>.  The return value is a set of rows with two columns,
     key and value.  If the keys or values contain any non-ASCII characters,
     they are treated as UTF-8.
    </para>
@@ -924,7 +924,7 @@ gpg --gen-key
 </programlisting>
   </para>
   <para>
-   The preferred key type is <quote>DSA and Elgamal</>.
+   The preferred key type is <quote>DSA and Elgamal</quote>.
   </para>
   <para>
    For RSA encryption you must create either DSA or RSA sign-only key
@@ -950,7 +950,7 @@ gpg -a --export-secret-keys KEYID > secret.key
 </programlisting>
   </para>
   <para>
-   You need to use <function>dearmor()</> on these keys before giving them to
+   You need to use <function>dearmor()</function> on these keys before giving them to
    the PGP functions.  Or if you can handle binary data, you can drop
    <literal>-a</literal> from the command.
   </para>
@@ -982,7 +982,7 @@ gpg -a --export-secret-keys KEYID > secret.key
     <para>
     No support for several subkeys.  This may seem like a problem, as this
     is common practice.  On the other hand, you should not use your regular
-    GPG/PGP keys with <filename>pgcrypto</>, but create new ones,
+    GPG/PGP keys with <filename>pgcrypto</filename>, but create new ones,
     as the usage scenario is rather different.
     </para>
    </listitem>
@@ -1056,15 +1056,15 @@ decrypt_iv(data bytea, key bytea, iv bytea, type text) returns bytea
    <parameter>type</parameter> string is:
 
 <synopsis>
-<replaceable>algorithm</> <optional> <literal>-</> <replaceable>mode</> </optional> <optional> <literal>/pad:</> <replaceable>padding</> </optional>
+<replaceable>algorithm</replaceable> <optional> <literal>-</literal> <replaceable>mode</replaceable> </optional> <optional> <literal>/pad:</literal> <replaceable>padding</replaceable> </optional>
 </synopsis>
-   where <replaceable>algorithm</> is one of:
+   where <replaceable>algorithm</replaceable> is one of:
 
   <itemizedlist>
    <listitem><para><literal>bf</literal> &mdash; Blowfish</para></listitem>
-   <listitem><para><literal>aes</literal> &mdash; AES (Rijndael-128)</para></listitem>
+   <listitem><para><literal>aes</literal> &mdash; AES (Rijndael-128, -192 or -256)</para></listitem>
   </itemizedlist>
-   and <replaceable>mode</> is one of:
+   and <replaceable>mode</replaceable> is one of:
   <itemizedlist>
    <listitem>
     <para>
@@ -1078,7 +1078,7 @@ decrypt_iv(data bytea, key bytea, iv bytea, type text) returns bytea
     </para>
    </listitem>
   </itemizedlist>
-   and <replaceable>padding</> is one of:
+   and <replaceable>padding</replaceable> is one of:
   <itemizedlist>
    <listitem>
     <para>
@@ -1100,8 +1100,8 @@ encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
 </programlisting>
   </para>
   <para>
-   In <function>encrypt_iv</> and <function>decrypt_iv</>, the
-   <parameter>iv</> parameter is the initial value for the CBC mode;
+   In <function>encrypt_iv</function> and <function>decrypt_iv</function>, the
+   <parameter>iv</parameter> parameter is the initial value for the CBC mode;
    it is ignored for ECB.
    It is clipped or padded with zeroes if not exactly block size.
    It defaults to all zeroes in the functions without this parameter.
@@ -1119,7 +1119,7 @@ encrypt(data, 'fooz', 'bf-cbc/pad:pkcs')
 gen_random_bytes(count integer) returns bytea
 </synopsis>
   <para>
-   Returns <parameter>count</> cryptographically strong random bytes.
+   Returns <parameter>count</parameter> cryptographically strong random bytes.
    At most 1024 bytes can be extracted at a time.  This is to avoid
    draining the randomness generator pool.
   </para>
@@ -1143,7 +1143,7 @@ gen_random_uuid() returns uuid
    <title>Configuration</title>
 
    <para>
-    <filename>pgcrypto</> configures itself according to the findings of the
+    <filename>pgcrypto</filename> configures itself according to the findings of the
     main PostgreSQL <literal>configure</literal> script.  The options that
     affect it are <literal>--with-zlib</literal> and
     <literal>--with-openssl</literal>.
@@ -1253,9 +1253,9 @@ gen_random_uuid() returns uuid
    <title>Security Limitations</title>
 
    <para>
-    All <filename>pgcrypto</> functions run inside the database server.
+    All <filename>pgcrypto</filename> functions run inside the database server.
     That means that all
-    the data and passwords move between <filename>pgcrypto</> and client
+    the data and passwords move between <filename>pgcrypto</filename> and client
     applications in clear text.  Thus you must:
    </para>
 
@@ -1276,7 +1276,7 @@ gen_random_uuid() returns uuid
     The implementation does not resist
     <ulink url="http://en.wikipedia.org/wiki/Side-channel_attack">side-channel
     attacks</ulink>.  For example, the time required for
-    a <filename>pgcrypto</> decryption function to complete varies among
+    a <filename>pgcrypto</filename> decryption function to complete varies among
     ciphertexts of a given size.
    </para>
   </sect3>
@@ -1317,15 +1317,15 @@ gen_random_uuid() returns uuid
 
    <itemizedlist>
     <listitem>
-     <para><ulink url="http://www.ietf.org/rfc/rfc4880.txt"></ulink></para>
+     <para><ulink url="https://tools.ietf.org/html/rfc4880"></ulink></para>
      <para>OpenPGP message format.</para>
     </listitem>
     <listitem>
-     <para><ulink url="http://www.ietf.org/rfc/rfc1321.txt"></ulink></para>
+     <para><ulink url="https://tools.ietf.org/html/rfc1321"></ulink></para>
      <para>The MD5 Message-Digest Algorithm.</para>
     </listitem>
     <listitem>
-     <para><ulink url="http://www.ietf.org/rfc/rfc2104.txt"></ulink></para>
+     <para><ulink url="https://tools.ietf.org/html/rfc2104"></ulink></para>
      <para>HMAC: Keyed-Hashing for Message Authentication.</para>
     </listitem>
     <listitem>
@@ -1342,7 +1342,7 @@ gen_random_uuid() returns uuid
     </listitem>
     <listitem>
      <para><ulink url="http://jlcooke.ca/random/"></ulink></para>
-     <para>Jean-Luc Cooke Fortuna-based <filename>/dev/random</> driver for Linux.</para>
+     <para>Jean-Luc Cooke Fortuna-based <filename>/dev/random</filename> driver for Linux.</para>
     </listitem>
     <listitem>
      <para><ulink url="http://kodu.ut.ee/~lipmaa/crypto/"></ulink></para>
diff --git a/doc/src/sgml/pgfreespacemap.sgml b/doc/src/sgml/pgfreespacemap.sgml
index 43e154a2f3..0122d278e3 100644
--- a/doc/src/sgml/pgfreespacemap.sgml
+++ b/doc/src/sgml/pgfreespacemap.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>pg_freespacemap</> module provides a means for examining the
+  The <filename>pg_freespacemap</filename> module provides a means for examining the
   free space map (FSM). It provides a function called
   <function>pg_freespace</function>, or two overloaded functions, to be
   precise. The functions show the value recorded in the free space map for
@@ -36,7 +36,7 @@
     <listitem>
      <para>
       Returns the amount of free space on the page of the relation, specified
-      by <literal>blkno</>, according to the FSM.
+      by <literal>blkno</literal>, according to the FSM.
      </para>
     </listitem>
    </varlistentry>
@@ -50,7 +50,7 @@
     <listitem>
      <para>
       Displays the amount of free space on each page of the relation,
-      according to the FSM. A set of <literal>(blkno bigint, avail int2)</>
+      according to the FSM. A set of <literal>(blkno bigint, avail int2)</literal>
       tuples is returned, one tuple for each page in the relation.
      </para>
     </listitem>
@@ -59,7 +59,7 @@
 
   <para>
    The values stored in the free space map are not exact. They're rounded
-   to precision of 1/256th of <symbol>BLCKSZ</> (32 bytes with default <symbol>BLCKSZ</>), and
+   to precision of 1/256th of <symbol>BLCKSZ</symbol> (32 bytes with default <symbol>BLCKSZ</symbol>), and
    they're not kept fully up-to-date as tuples are inserted and updated.
   </para>
 
diff --git a/doc/src/sgml/pgprewarm.sgml b/doc/src/sgml/pgprewarm.sgml
index c090401eca..51afc5df3f 100644
--- a/doc/src/sgml/pgprewarm.sgml
+++ b/doc/src/sgml/pgprewarm.sgml
@@ -10,7 +10,13 @@
  <para>
   The <filename>pg_prewarm</filename> module provides a convenient way
   to load relation data into either the operating system buffer cache
-  or the <productname>PostgreSQL</productname> buffer cache.
+  or the <productname>PostgreSQL</productname> buffer cache.  Prewarming
+  can be performed manually using the <filename>pg_prewarm</filename> function,
+  or can be performed automatically by including <literal>pg_prewarm</literal> in
+  <xref linkend="guc-shared-preload-libraries"/>.  In the latter case, the
+  system will run a background worker which periodically records the contents
+  of shared buffers in a file called <filename>autoprewarm.blocks</filename> and
+  will, using 2 background workers, reload those same blocks after a restart.
  </para>
 
  <sect2>
@@ -55,6 +61,67 @@ pg_prewarm(regclass, mode text default 'buffer', fork text default 'main',
    cache. For these reasons, prewarming is typically most useful at startup,
    when caches are largely empty.
   </para>
+
+<synopsis>
+autoprewarm_start_worker() RETURNS void
+</synopsis>
+
+  <para>
+   Launch the main autoprewarm worker.  This will normally happen
+   automatically, but is useful if automatic prewarm was not configured at
+   server startup time and you wish to start up the worker at a later time.
+  </para>
+
+<synopsis>
+autoprewarm_dump_now() RETURNS int8
+</synopsis>
+
+  <para>
+   Update <filename>autoprewarm.blocks</filename> immediately.  This may be useful
+   if the autoprewarm worker is not running but you anticipate running it
+   after the next restart.  The return value is the number of records written
+   to <filename>autoprewarm.blocks</filename>.
+  </para>
+ </sect2>
+
+ <sect2>
+  <title>Configuration Parameters</title>
+
+ <variablelist>
+   <varlistentry>
+    <term>
+     <varname>pg_prewarm.autoprewarm</varname> (<type>boolean</type>)
+     <indexterm>
+      <primary><varname>pg_prewarm.autoprewarm</varname> configuration parameter</primary>
+     </indexterm>
+    </term>
+    <listitem>
+     <para>
+      Controls whether the server should run the autoprewarm worker. This is
+      on by default. This parameter can only be set at server start.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
+  <variablelist>
+   <varlistentry>
+   <term>
+     <varname>pg_prewarm.autoprewarm_interval</varname> (<type>int</type>)
+     <indexterm>
+      <primary><varname>pg_prewarm.autoprewarm_interval</varname> configuration parameter</primary>
+     </indexterm>
+    </term>
+    <listitem>
+     <para>
+      This is the interval between updates to <literal>autoprewarm.blocks</literal>.
+      The default is 300 seconds. If set to 0, the file will not be
+      dumped at regular intervals, but only when the server is shut down.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+
  </sect2>
 
  <sect2>
diff --git a/doc/src/sgml/pgrowlocks.sgml b/doc/src/sgml/pgrowlocks.sgml
index 65d532e081..39de41a03c 100644
--- a/doc/src/sgml/pgrowlocks.sgml
+++ b/doc/src/sgml/pgrowlocks.sgml
@@ -33,11 +33,11 @@ pgrowlocks(text) returns setof record
   <para>
    The parameter is the name of a table.  The result is a set of records,
    with one row for each locked row within the table.  The output columns
-   are shown in <xref linkend="pgrowlocks-columns">.
+   are shown in <xref linkend="pgrowlocks-columns"/>.
   </para>
 
   <table id="pgrowlocks-columns">
-   <title><function>pgrowlocks</> Output Columns</title>
+   <title><function>pgrowlocks</function> Output Columns</title>
 
    <tgroup cols="3">
     <thead>
@@ -73,9 +73,9 @@ pgrowlocks(text) returns setof record
       <entry><structfield>lock_type</structfield></entry>
       <entry><type>text[]</type></entry>
       <entry>Lock mode of lockers (more than one if multitransaction),
-       an array of <literal>Key Share</>, <literal>Share</>,
-       <literal>For No Key Update</>, <literal>No Key Update</>,
-       <literal>For Update</>, <literal>Update</>.</entry>
+       an array of <literal>Key Share</literal>, <literal>Share</literal>,
+       <literal>For No Key Update</literal>, <literal>No Key Update</literal>,
+       <literal>For Update</literal>, <literal>Update</literal>.</entry>
      </row>
 
      <row>
@@ -89,7 +89,7 @@ pgrowlocks(text) returns setof record
   </table>
 
   <para>
-   <function>pgrowlocks</function> takes <literal>AccessShareLock</> for the
+   <function>pgrowlocks</function> takes <literal>AccessShareLock</literal> for the
    target table and reads each row one by one to collect the row locking
    information.  This is not very speedy for a large table.  Note that:
   </para>
diff --git a/doc/src/sgml/pgstandby.sgml b/doc/src/sgml/pgstandby.sgml
index bf4edea9f1..2cc58fe356 100644
--- a/doc/src/sgml/pgstandby.sgml
+++ b/doc/src/sgml/pgstandby.sgml
@@ -31,48 +31,48 @@
   <title>Description</title>
 
  <para>
-  <application>pg_standby</> supports creation of a <quote>warm standby</>
+  <application>pg_standby</application> supports creation of a <quote>warm standby</quote>
   database server.  It is designed to be a production-ready program, as well
   as a customizable template should you require specific modifications.
  </para>
 
  <para>
-  <application>pg_standby</> is designed to be a waiting
-  <varname>restore_command</>, which is needed to turn a standard
+  <application>pg_standby</application> is designed to be a waiting
+  <varname>restore_command</varname>, which is needed to turn a standard
   archive recovery into a warm standby operation.  Other
   configuration is required as well, all of which is described in the main
-  server manual (see <xref linkend="warm-standby">).
+  server manual (see <xref linkend="warm-standby"/>).
  </para>
 
   <para>
    To configure a standby
-   server to use <application>pg_standby</>, put this into its
+   server to use <application>pg_standby</application>, put this into its
    <filename>recovery.conf</filename> configuration file:
 <programlisting>
-restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
+restore_command = 'pg_standby <replaceable>archiveDir</replaceable> %f %p %r'
 </programlisting>
-   where <replaceable>archiveDir</> is the directory from which WAL segment
+   where <replaceable>archiveDir</replaceable> is the directory from which WAL segment
    files should be restored.
   </para>
   <para>
-   If <replaceable>restartwalfile</> is specified, normally by using the
+   If <replaceable>restartwalfile</replaceable> is specified, normally by using the
    <literal>%r</literal> macro, then all WAL files logically preceding this
-   file will be removed from <replaceable>archivelocation</>. This minimizes
+   file will be removed from <replaceable>archivelocation</replaceable>. This minimizes
    the number of files that need to be retained, while preserving
    crash-restart capability.  Use of this parameter is appropriate if the
-   <replaceable>archivelocation</> is a transient staging area for this
-   particular standby server, but <emphasis>not</> when the
-   <replaceable>archivelocation</> is intended as a long-term WAL archive area.
+   <replaceable>archivelocation</replaceable> is a transient staging area for this
+   particular standby server, but <emphasis>not</emphasis> when the
+   <replaceable>archivelocation</replaceable> is intended as a long-term WAL archive area.
   </para>
   <para>
    <application>pg_standby</application> assumes that
-   <replaceable>archivelocation</> is a directory readable by the
-   server-owning user.  If <replaceable>restartwalfile</> (or <literal>-k</>)
+   <replaceable>archivelocation</replaceable> is a directory readable by the
+   server-owning user.  If <replaceable>restartwalfile</replaceable> (or <literal>-k</literal>)
    is specified,
-   the <replaceable>archivelocation</> directory must be writable too.
+   the <replaceable>archivelocation</replaceable> directory must be writable too.
   </para>
   <para>
-   There are two ways to fail over to a <quote>warm standby</> database server
+   There are two ways to fail over to a <quote>warm standby</quote> database server
    when the master server fails:
 
    <variablelist>
@@ -85,7 +85,7 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
        the standby server has fallen behind, but if there is a lot of
        unapplied WAL it can be a long time before the standby server becomes
        ready. To trigger a smart failover, create a trigger file containing
-       the word <literal>smart</>, or just create it and leave it empty.
+       the word <literal>smart</literal>, or just create it and leave it empty.
       </para>
      </listitem>
     </varlistentry>
@@ -96,8 +96,8 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
        In fast failover, the server is brought up immediately. Any WAL files
        in the archive that have not yet been applied will be ignored, and
        all transactions in those files are lost. To trigger a fast failover,
-       create a trigger file and write the word <literal>fast</> into it.
-       <application>pg_standby</> can also be configured to execute a fast
+       create a trigger file and write the word <literal>fast</literal> into it.
+       <application>pg_standby</application> can also be configured to execute a fast
        failover automatically if no new WAL file appears within a defined
        interval.
       </para>
@@ -120,7 +120,7 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
       <term><option>-c</option></term>
       <listitem>
        <para>
-        Use <literal>cp</> or <literal>copy</> command to restore WAL files
+        Use <literal>cp</literal> or <literal>copy</literal> command to restore WAL files
         from archive.  This is the only supported behavior so this option is useless.
        </para>
       </listitem>
@@ -130,7 +130,7 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
       <term><option>-d</option></term>
       <listitem>
        <para>
-        Print lots of debug logging output on <filename>stderr</>.
+        Print lots of debug logging output on <filename>stderr</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -147,8 +147,8 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
         <replaceable>restartwalfile</replaceable> is specified, since that
         specification method is more accurate in determining the correct
         archive cut-off point.
-        Use of this parameter is <emphasis>deprecated</> as of
-        <productname>PostgreSQL</> 8.3; it is safer and more efficient to
+        Use of this parameter is <emphasis>deprecated</emphasis> as of
+        <productname>PostgreSQL</productname> 8.3; it is safer and more efficient to
         specify a <replaceable>restartwalfile</replaceable> parameter.  A too
         small setting could result in removal of files that are still needed
         for a restart of the standby server, while a too large setting wastes
@@ -158,12 +158,12 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
      </varlistentry>
 
      <varlistentry>
-      <term><option>-r</option> <replaceable>maxretries</></term>
+      <term><option>-r</option> <replaceable>maxretries</replaceable></term>
       <listitem>
        <para>
         Set the maximum number of times to retry the copy command if
         it fails (default 3). After each failure, we wait for
-        <replaceable>sleeptime</> * <replaceable>num_retries</>
+        <replaceable>sleeptime</replaceable> * <replaceable>num_retries</replaceable>
         so that the wait time increases progressively.  So by default,
         we will wait 5 secs, 10 secs, then 15 secs before reporting
         the failure back to the standby server. This will be
@@ -174,33 +174,33 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</option> <replaceable>sleeptime</></term>
+      <term><option>-s</option> <replaceable>sleeptime</replaceable></term>
       <listitem>
        <para>
         Set the number of seconds (up to 60, default 5) to sleep between
         tests to see if the WAL file to be restored is available in
         the archive yet.  The default setting is not necessarily
-        recommended; consult <xref linkend="warm-standby"> for discussion.
+        recommended; consult <xref linkend="warm-standby"/> for discussion.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t</option> <replaceable>triggerfile</></term>
+      <term><option>-t</option> <replaceable>triggerfile</replaceable></term>
       <listitem>
        <para>
         Specify a trigger file whose presence should cause failover.
         It is recommended that you use a structured file name to
         avoid confusion as to which server is being triggered
         when multiple servers exist on the same system; for example
-        <filename>/tmp/pgsql.trigger.5432</>.
+        <filename>/tmp/pgsql.trigger.5432</filename>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>pg_standby</application> version and exit.
@@ -209,21 +209,21 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</option> <replaceable>maxwaittime</></term>
+      <term><option>-w</option> <replaceable>maxwaittime</replaceable></term>
       <listitem>
        <para>
         Set the maximum number of seconds to wait for the next WAL file,
         after which a fast failover will be performed.
         A setting of zero (the default) means wait forever.
         The default setting is not necessarily recommended;
-        consult <xref linkend="warm-standby"> for discussion.
+        consult <xref linkend="warm-standby"/> for discussion.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_standby</application> command line
@@ -241,18 +241,18 @@ restore_command = 'pg_standby <replaceable>archiveDir</> %f %p %r'
 
   <para>
    <application>pg_standby</application> is designed to work with
-   <productname>PostgreSQL</> 8.2 and later.
+   <productname>PostgreSQL</productname> 8.2 and later.
   </para>
   <para>
-   <productname>PostgreSQL</> 8.3 provides the <literal>%r</literal> macro,
+   <productname>PostgreSQL</productname> 8.3 provides the <literal>%r</literal> macro,
    which is designed to let <application>pg_standby</application> know the
-   last file it needs to keep.  With <productname>PostgreSQL</> 8.2, the
+   last file it needs to keep.  With <productname>PostgreSQL</productname> 8.2, the
    <literal>-k</literal> option must be used if archive cleanup is
    required.  This option remains available in 8.3, but its use is deprecated.
   </para>
   <para>
-   <productname>PostgreSQL</> 8.4 provides the
-   <varname>recovery_end_command</> option.  Without this option
+   <productname>PostgreSQL</productname> 8.4 provides the
+   <varname>recovery_end_command</varname> option.  Without this option
    a leftover trigger file can be hazardous.
   </para>
 
@@ -276,13 +276,13 @@ restore_command = 'pg_standby -d -s 2 -t /tmp/pgsql.trigger.5442 .../archive %f
 recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
 </programlisting>
    where the archive directory is physically located on the standby server,
-   so that the <varname>archive_command</> is accessing it across NFS,
-   but the files are local to the standby (enabling use of <literal>ln</>).
+   so that the <varname>archive_command</varname> is accessing it across NFS,
+   but the files are local to the standby (enabling use of <literal>ln</literal>).
    This will:
   <itemizedlist>
    <listitem>
     <para>
-     produce debugging output in <filename>standby.log</>
+     produce debugging output in <filename>standby.log</filename>
     </para>
    </listitem>
    <listitem>
@@ -293,7 +293,7 @@ recovery_end_command = 'rm -f /tmp/pgsql.trigger.5442'
    <listitem>
     <para>
      stop waiting only when a trigger file called
-     <filename>/tmp/pgsql.trigger.5442</> appears,
+     <filename>/tmp/pgsql.trigger.5442</filename> appears,
      and perform failover according to its content
     </para>
    </listitem>
@@ -320,18 +320,18 @@ restore_command = 'pg_standby -d -s 5 -t C:\pgsql.trigger.5442 ...\archive %f %p
 recovery_end_command = 'del C:\pgsql.trigger.5442'
 </programlisting>
    Note that backslashes need to be doubled in the
-   <varname>archive_command</>, but <emphasis>not</emphasis> in the
-   <varname>restore_command</> or <varname>recovery_end_command</>.
+   <varname>archive_command</varname>, but <emphasis>not</emphasis> in the
+   <varname>restore_command</varname> or <varname>recovery_end_command</varname>.
    This will:
   <itemizedlist>
    <listitem>
     <para>
-     use the <literal>copy</> command to restore WAL files from archive
+     use the <literal>copy</literal> command to restore WAL files from archive
     </para>
    </listitem>
    <listitem>
     <para>
-     produce debugging output in <filename>standby.log</>
+     produce debugging output in <filename>standby.log</filename>
     </para>
    </listitem>
    <listitem>
@@ -342,7 +342,7 @@ recovery_end_command = 'del C:\pgsql.trigger.5442'
    <listitem>
     <para>
      stop waiting only when a trigger file called
-     <filename>C:\pgsql.trigger.5442</> appears,
+     <filename>C:\pgsql.trigger.5442</filename> appears,
      and perform failover according to its content
     </para>
    </listitem>
@@ -360,16 +360,16 @@ recovery_end_command = 'del C:\pgsql.trigger.5442'
   </para>
 
   <para>
-   The <literal>copy</> command on Windows sets the final file size
+   The <literal>copy</literal> command on Windows sets the final file size
    before the file is completely copied, which would ordinarily confuse
    <application>pg_standby</application>.  Therefore
-   <application>pg_standby</application> waits <replaceable>sleeptime</>
-   seconds once it sees the proper file size.  GNUWin32's <literal>cp</>
+   <application>pg_standby</application> waits <replaceable>sleeptime</replaceable>
+   seconds once it sees the proper file size.  GNUWin32's <literal>cp</literal>
    sets the file size only after the file copy is complete.
   </para>
 
   <para>
-   Since the Windows example uses <literal>copy</> at both ends, either
+   Since the Windows example uses <literal>copy</literal> at both ends, either
    or both servers might be accessing the archive directory across the
    network.
   </para>
@@ -388,7 +388,7 @@ recovery_end_command = 'del C:\pgsql.trigger.5442'
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="pgarchivecleanup"></member>
+   <member><xref linkend="pgarchivecleanup"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/pgstatstatements.sgml b/doc/src/sgml/pgstatstatements.sgml
index f9dd43e891..c0217ed485 100644
--- a/doc/src/sgml/pgstatstatements.sgml
+++ b/doc/src/sgml/pgstatstatements.sgml
@@ -13,20 +13,20 @@
  </para>
 
  <para>
-  The module must be loaded by adding <literal>pg_stat_statements</> to
-  <xref linkend="guc-shared-preload-libraries"> in
-  <filename>postgresql.conf</>, because it requires additional shared memory.
+  The module must be loaded by adding <literal>pg_stat_statements</literal> to
+  <xref linkend="guc-shared-preload-libraries"/> in
+  <filename>postgresql.conf</filename>, because it requires additional shared memory.
   This means that a server restart is needed to add or remove the module.
  </para>
 
  <para>
    When <filename>pg_stat_statements</filename> is loaded, it tracks
    statistics across all databases of the server.  To access and manipulate
-   these statistics, the module provides a view, <structname>pg_stat_statements</>,
-   and the utility functions <function>pg_stat_statements_reset</> and
-   <function>pg_stat_statements</>.  These are not available globally but
+   these statistics, the module provides a view, <structname>pg_stat_statements</structname>,
+   and the utility functions <function>pg_stat_statements_reset</function> and
+   <function>pg_stat_statements</function>.  These are not available globally but
    can be enabled for a specific database with
-   <command>CREATE EXTENSION pg_stat_statements</>.
+   <command>CREATE EXTENSION pg_stat_statements</command>.
  </para>
 
  <sect2>
@@ -34,15 +34,15 @@
 
   <para>
    The statistics gathered by the module are made available via a
-   view named <structname>pg_stat_statements</>.  This view
+   view named <structname>pg_stat_statements</structname>.  This view
    contains one row for each distinct database ID, user ID and query
    ID (up to the maximum number of distinct statements that the module
    can track).  The columns of the view are shown in
-   <xref linkend="pgstatstatements-columns">.
+   <xref linkend="pgstatstatements-columns"/>.
   </para>
 
   <table id="pgstatstatements-columns">
-   <title><structname>pg_stat_statements</> Columns</title>
+   <title><structname>pg_stat_statements</structname> Columns</title>
 
    <tgroup cols="4">
     <thead>
@@ -207,7 +207,7 @@
       <entry></entry>
       <entry>
         Total time the statement spent reading blocks, in milliseconds
-        (if <xref linkend="guc-track-io-timing"> is enabled, otherwise zero)
+        (if <xref linkend="guc-track-io-timing"/> is enabled, otherwise zero)
       </entry>
      </row>
 
@@ -217,7 +217,7 @@
       <entry></entry>
       <entry>
         Total time the statement spent writing blocks, in milliseconds
-        (if <xref linkend="guc-track-io-timing"> is enabled, otherwise zero)
+        (if <xref linkend="guc-track-io-timing"/> is enabled, otherwise zero)
       </entry>
      </row>
 
@@ -234,9 +234,9 @@
   </para>
 
   <para>
-   Plannable queries (that is, <command>SELECT</>, <command>INSERT</>,
-   <command>UPDATE</>, and <command>DELETE</>) are combined into a single
-   <structname>pg_stat_statements</> entry whenever they have identical query
+   Plannable queries (that is, <command>SELECT</command>, <command>INSERT</command>,
+   <command>UPDATE</command>, and <command>DELETE</command>) are combined into a single
+   <structname>pg_stat_statements</structname> entry whenever they have identical query
    structures according to an internal hash calculation.  Typically, two
    queries will be considered the same for this purpose if they are
    semantically equivalent except for the values of literal constants
@@ -247,16 +247,16 @@
   <para>
    When a constant's value has been ignored for purposes of matching the query
    to other queries, the constant is replaced by a parameter symbol, such
-   as <literal>$1</literal>, in the <structname>pg_stat_statements</>
+   as <literal>$1</literal>, in the <structname>pg_stat_statements</structname>
    display.
    The rest of the query text is that of the first query that had the
-   particular <structfield>queryid</> hash value associated with the
-   <structname>pg_stat_statements</> entry.
+   particular <structfield>queryid</structfield> hash value associated with the
+   <structname>pg_stat_statements</structname> entry.
   </para>
 
   <para>
    In some cases, queries with visibly different texts might get merged into a
-   single <structname>pg_stat_statements</> entry.  Normally this will happen
+   single <structname>pg_stat_statements</structname> entry.  Normally this will happen
    only for semantically equivalent queries, but there is a small chance of
    hash collisions causing unrelated queries to be merged into one entry.
    (This cannot happen for queries belonging to different users or databases,
@@ -264,41 +264,41 @@
   </para>
 
   <para>
-   Since the <structfield>queryid</> hash value is computed on the
+   Since the <structfield>queryid</structfield> hash value is computed on the
    post-parse-analysis representation of the queries, the opposite is
    also possible: queries with identical texts might appear as
    separate entries, if they have different meanings as a result of
-   factors such as different <varname>search_path</> settings.
+   factors such as different <varname>search_path</varname> settings.
   </para>
 
   <para>
-   Consumers of <structname>pg_stat_statements</> may wish to use
-   <structfield>queryid</> (perhaps in combination with
-   <structfield>dbid</> and <structfield>userid</>) as a more stable
+   Consumers of <structname>pg_stat_statements</structname> may wish to use
+   <structfield>queryid</structfield> (perhaps in combination with
+   <structfield>dbid</structfield> and <structfield>userid</structfield>) as a more stable
    and reliable identifier for each entry than its query text.
    However, it is important to understand that there are only limited
-   guarantees around the stability of the <structfield>queryid</> hash
+   guarantees around the stability of the <structfield>queryid</structfield> hash
    value.  Since the identifier is derived from the
    post-parse-analysis tree, its value is a function of, among other
    things, the internal object identifiers appearing in this representation.
    This has some counterintuitive implications.  For example,
-   <filename>pg_stat_statements</> will consider two apparently-identical
+   <filename>pg_stat_statements</filename> will consider two apparently-identical
    queries to be distinct, if they reference a table that was dropped
    and recreated between the executions of the two queries.
    The hashing process is also sensitive to differences in
    machine architecture and other facets of the platform.
-   Furthermore, it is not safe to assume that <structfield>queryid</>
-   will be stable across major versions of <productname>PostgreSQL</>.
+   Furthermore, it is not safe to assume that <structfield>queryid</structfield>
+   will be stable across major versions of <productname>PostgreSQL</productname>.
   </para>
 
   <para>
-   As a rule of thumb, <structfield>queryid</> values can be assumed to be
+   As a rule of thumb, <structfield>queryid</structfield> values can be assumed to be
    stable and comparable only so long as the underlying server version and
    catalog metadata details stay exactly the same.  Two servers
    participating in replication based on physical WAL replay can be expected
-   to have identical <structfield>queryid</> values for the same query.
+   to have identical <structfield>queryid</structfield> values for the same query.
    However, logical replication schemes do not promise to keep replicas
-   identical in all relevant details, so <structfield>queryid</> will
+   identical in all relevant details, so <structfield>queryid</structfield> will
    not be a useful identifier for accumulating costs across a set of logical
    replicas.  If in doubt, direct testing is recommended.
   </para>
@@ -306,13 +306,13 @@
   <para>
    The parameter symbols used to replace constants in
    representative query texts start from the next number after the
-   highest <literal>$</><replaceable>n</> parameter in the original query
-   text, or <literal>$1</> if there was none.  It's worth noting that in
+   highest <literal>$</literal><replaceable>n</replaceable> parameter in the original query
+   text, or <literal>$1</literal> if there was none.  It's worth noting that in
    some cases there may be hidden parameter symbols that affect this
-   numbering.  For example, <application>PL/pgSQL</> uses hidden parameter
+   numbering.  For example, <application>PL/pgSQL</application> uses hidden parameter
    symbols to insert values of function local variables into queries, so that
-   a <application>PL/pgSQL</> statement like <literal>SELECT i + 1 INTO j</>
-   would have representative text like <literal>SELECT i + $2</>.
+   a <application>PL/pgSQL</application> statement like <literal>SELECT i + 1 INTO j</literal>
+   would have representative text like <literal>SELECT i + $2</literal>.
   </para>
 
   <para>
@@ -320,11 +320,11 @@
    not consume shared memory.  Therefore, even very lengthy query texts can
    be stored successfully.  However, if many long query texts are
    accumulated, the external file might grow unmanageably large.  As a
-   recovery method if that happens, <filename>pg_stat_statements</> may
+   recovery method if that happens, <filename>pg_stat_statements</filename> may
    choose to discard the query texts, whereupon all existing entries in
-   the <structname>pg_stat_statements</> view will show
-   null <structfield>query</> fields, though the statistics associated with
-   each <structfield>queryid</> are preserved.  If this happens, consider
+   the <structname>pg_stat_statements</structname> view will show
+   null <structfield>query</structfield> fields, though the statistics associated with
+   each <structfield>queryid</structfield> are preserved.  If this happens, consider
    reducing <varname>pg_stat_statements.max</varname> to prevent
    recurrences.
   </para>
@@ -345,7 +345,7 @@
     <listitem>
      <para>
       <function>pg_stat_statements_reset</function> discards all statistics
-      gathered so far by <filename>pg_stat_statements</>.
+      gathered so far by <filename>pg_stat_statements</filename>.
       By default, this function can only be executed by superusers.
      </para>
     </listitem>
@@ -363,17 +363,17 @@
     <listitem>
      <para>
       The <structname>pg_stat_statements</structname> view is defined in
-      terms of a function also named <function>pg_stat_statements</>.
+      terms of a function also named <function>pg_stat_statements</function>.
       It is possible for clients to call
       the <function>pg_stat_statements</function> function directly, and by
       specifying <literal>showtext := false</literal> have query text be
       omitted (that is, the <literal>OUT</literal> argument that corresponds
-      to the view's <structfield>query</> column will return nulls).  This
+      to the view's <structfield>query</structfield> column will return nulls).  This
       feature is intended to support external tools that might wish to avoid
       the overhead of repeatedly retrieving query texts of indeterminate
       length.  Such tools can instead cache the first query text observed
       for each entry themselves, since that is
-      all <filename>pg_stat_statements</> itself does, and then retrieve
+      all <filename>pg_stat_statements</filename> itself does, and then retrieve
       query texts only as needed.  Since the server stores query texts in a
       file, this approach may reduce physical I/O for repeated examination
       of the <structname>pg_stat_statements</structname> data.
@@ -396,7 +396,7 @@
      <para>
       <varname>pg_stat_statements.max</varname> is the maximum number of
       statements tracked by the module (i.e., the maximum number of rows
-      in the <structname>pg_stat_statements</> view).  If more distinct
+      in the <structname>pg_stat_statements</structname> view).  If more distinct
       statements than that are observed, information about the least-executed
       statements is discarded.
       The default value is 5000.
@@ -414,11 +414,11 @@
      <para>
       <varname>pg_stat_statements.track</varname> controls which statements
       are counted by the module.
-      Specify <literal>top</> to track top-level statements (those issued
-      directly by clients), <literal>all</> to also track nested statements
-      (such as statements invoked within functions), or <literal>none</> to
+      Specify <literal>top</literal> to track top-level statements (those issued
+      directly by clients), <literal>all</literal> to also track nested statements
+      (such as statements invoked within functions), or <literal>none</literal> to
       disable statement statistics collection.
-      The default value is <literal>top</>.
+      The default value is <literal>top</literal>.
       Only superusers can change this setting.
      </para>
     </listitem>
@@ -433,9 +433,9 @@
      <para>
       <varname>pg_stat_statements.track_utility</varname> controls whether
       utility commands are tracked by the module.  Utility commands are
-      all those other than <command>SELECT</>, <command>INSERT</>,
-      <command>UPDATE</> and <command>DELETE</>.
-      The default value is <literal>on</>.
+      all those other than <command>SELECT</command>, <command>INSERT</command>,
+      <command>UPDATE</command> and <command>DELETE</command>.
+      The default value is <literal>on</literal>.
       Only superusers can change this setting.
      </para>
     </listitem>
@@ -450,10 +450,10 @@
      <para>
       <varname>pg_stat_statements.save</varname> specifies whether to
       save statement statistics across server shutdowns.
-      If it is <literal>off</> then statistics are not saved at
+      If it is <literal>off</literal> then statistics are not saved at
       shutdown nor reloaded at server start.
-      The default value is <literal>on</>.
-      This parameter can only be set in the <filename>postgresql.conf</>
+      The default value is <literal>on</literal>.
+      This parameter can only be set in the <filename>postgresql.conf</filename>
       file or on the server command line.
      </para>
     </listitem>
@@ -464,11 +464,11 @@
    The module requires additional shared memory proportional to
    <varname>pg_stat_statements.max</varname>.  Note that this
    memory is consumed whenever the module is loaded, even if
-   <varname>pg_stat_statements.track</> is set to <literal>none</>.
+   <varname>pg_stat_statements.track</varname> is set to <literal>none</literal>.
   </para>
 
   <para>
-   These parameters must be set in <filename>postgresql.conf</>.
+   These parameters must be set in <filename>postgresql.conf</filename>.
    Typical usage might be:
 
 <programlisting>
diff --git a/doc/src/sgml/pgstattuple.sgml b/doc/src/sgml/pgstattuple.sgml
index a7c67ae645..b17b3c59e0 100644
--- a/doc/src/sgml/pgstattuple.sgml
+++ b/doc/src/sgml/pgstattuple.sgml
@@ -13,12 +13,14 @@
  </para>
 
  <para>
-  As these functions return detailed page-level information, only the superuser
-  has EXECUTE privileges on them upon installation.  After the functions have
-  been installed, users may issue <command>GRANT</command> commands to change
-  the privileges on the functions to allow non-superusers to execute them. Members
-  of the <literal>pg_stat_scan_tables</literal> role are granted access by default. See
-  the description of the <xref linkend="sql-grant"> command for specifics.
+  Because these functions return detailed page-level information, access is
+  restricted by default.  By default, only the
+  role <literal>pg_stat_scan_tables</literal> has <literal>EXECUTE</literal>
+  privilege.  Superusers of course bypass this restriction.  After the
+  extension has been installed, users may issue <command>GRANT</command>
+  commands to change the privileges on the functions to allow others to
+  execute them.  However, it might be preferable to add those users to
+  the <literal>pg_stat_scan_tables</literal> role instead.
  </para>
 
  <sect2>
@@ -30,13 +32,13 @@
      <indexterm>
       <primary>pgstattuple</primary>
      </indexterm>
-     <function>pgstattuple(regclass) returns record</>
+     <function>pgstattuple(regclass) returns record</function>
     </term>
 
     <listitem>
      <para>
       <function>pgstattuple</function> returns a relation's physical length,
-      percentage of <quote>dead</> tuples, and other info. This may help users
+      percentage of <quote>dead</quote> tuples, and other info. This may help users
       to determine whether vacuum is necessary or not.  The argument is the
       target relation's name (optionally schema-qualified) or OID.
       For example:
@@ -53,7 +55,7 @@ dead_tuple_percent | 0.69
 free_space         | 8932
 free_percent       | 1.95
 </programlisting>
-     The output columns are described in <xref linkend="pgstattuple-columns">.
+     The output columns are described in <xref linkend="pgstattuple-columns"/>.
     </para>
 
     <table id="pgstattuple-columns">
@@ -135,15 +137,15 @@ free_percent       | 1.95
     </para>
 
     <para>
-     <function>pgstattuple</function> judges a tuple is <quote>dead</> if
-     <function>HeapTupleSatisfiesDirty</> returns false.
+     <function>pgstattuple</function> judges a tuple is <quote>dead</quote> if
+     <function>HeapTupleSatisfiesDirty</function> returns false.
     </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
     <term>
-     <function>pgstattuple(text) returns record</>
+     <function>pgstattuple(text) returns record</function>
     </term>
 
     <listitem>
@@ -161,7 +163,7 @@ free_percent       | 1.95
     <indexterm>
      <primary>pgstatindex</primary>
     </indexterm>
-     <function>pgstatindex(regclass) returns record</>
+     <function>pgstatindex(regclass) returns record</function>
     </term>
 
     <listitem>
@@ -225,7 +227,7 @@ leaf_fragmentation | 0
        <row>
         <entry><structfield>internal_pages</structfield></entry>
         <entry><type>bigint</type></entry>
-        <entry>Number of <quote>internal</> (upper-level) pages</entry>
+        <entry>Number of <quote>internal</quote> (upper-level) pages</entry>
        </row>
 
        <row>
@@ -264,14 +266,14 @@ leaf_fragmentation | 0
     </para>
 
     <para>
-     The reported <literal>index_size</> will normally correspond to one more
+     The reported <literal>index_size</literal> will normally correspond to one more
      page than is accounted for by <literal>internal_pages + leaf_pages +
      empty_pages + deleted_pages</literal>, because it also includes the
      index's metapage.
     </para>
 
     <para>
-     As with <function>pgstattuple</>, the results are accumulated
+     As with <function>pgstattuple</function>, the results are accumulated
      page-by-page, and should not be expected to represent an
      instantaneous snapshot of the whole index.
     </para>
@@ -280,7 +282,7 @@ leaf_fragmentation | 0
 
    <varlistentry>
     <term>
-     <function>pgstatindex(text) returns record</>
+     <function>pgstatindex(text) returns record</function>
     </term>
 
     <listitem>
@@ -298,7 +300,7 @@ leaf_fragmentation | 0
      <indexterm>
       <primary>pgstatginindex</primary>
      </indexterm>
-     <function>pgstatginindex(regclass) returns record</>
+     <function>pgstatginindex(regclass) returns record</function>
     </term>
 
     <listitem>
@@ -358,7 +360,7 @@ pending_tuples | 0
      <indexterm>
       <primary>pgstathashindex</primary>
      </indexterm>
-     <function>pgstathashindex(regclass) returns record</>
+     <function>pgstathashindex(regclass) returns record</function>
     </term>
 
     <listitem>
@@ -453,7 +455,7 @@ free_percent   | 61.8005949100872
      <indexterm>
       <primary>pg_relpages</primary>
      </indexterm>
-     <function>pg_relpages(regclass) returns bigint</>
+     <function>pg_relpages(regclass) returns bigint</function>
     </term>
 
     <listitem>
@@ -466,7 +468,7 @@ free_percent   | 61.8005949100872
 
    <varlistentry>
     <term>
-     <function>pg_relpages(text) returns bigint</>
+     <function>pg_relpages(text) returns bigint</function>
     </term>
 
     <listitem>
@@ -484,7 +486,7 @@ free_percent   | 61.8005949100872
      <indexterm>
       <primary>pgstattuple_approx</primary>
      </indexterm>
-     <function>pgstattuple_approx(regclass) returns record</>
+     <function>pgstattuple_approx(regclass) returns record</function>
     </term>
 
     <listitem>
@@ -507,7 +509,7 @@ dead_tuple_percent   | 0
 approx_free_space    | 11996
 approx_free_percent  | 2.09
 </programlisting>
-      The output columns are described in <xref linkend="pgstatapprox-columns">.
+      The output columns are described in <xref linkend="pgstatapprox-columns"/>.
      </para>
 
      <para>
diff --git a/doc/src/sgml/pgtrgm.sgml b/doc/src/sgml/pgtrgm.sgml
index 775a7b8be7..338ef30fbc 100644
--- a/doc/src/sgml/pgtrgm.sgml
+++ b/doc/src/sgml/pgtrgm.sgml
@@ -58,8 +58,8 @@
 
   <para>
    The functions provided by the <filename>pg_trgm</filename> module
-   are shown in <xref linkend="pgtrgm-func-table">, the operators
-   in <xref linkend="pgtrgm-op-table">.
+   are shown in <xref linkend="pgtrgm-func-table"/>, the operators
+   in <xref linkend="pgtrgm-op-table"/>.
   </para>
 
   <table id="pgtrgm-func-table">
@@ -111,7 +111,7 @@
       <entry><function>show_limit()</function><indexterm><primary>show_limit</primary></indexterm></entry>
       <entry><type>real</type></entry>
       <entry>
-       Returns the current similarity threshold used by the <literal>%</>
+       Returns the current similarity threshold used by the <literal>%</literal>
        operator.  This sets the minimum similarity between
        two words for them to be considered similar enough to
        be misspellings of each other, for example
@@ -122,7 +122,7 @@
       <entry><function>set_limit(real)</function><indexterm><primary>set_limit</primary></indexterm></entry>
       <entry><type>real</type></entry>
       <entry>
-       Sets the current similarity threshold that is used by the <literal>%</>
+       Sets the current similarity threshold that is used by the <literal>%</literal>
        operator.  The threshold must be between 0 and 1 (default is 0.3).
        Returns the same value passed in (<emphasis>deprecated</emphasis>).
       </entry>
@@ -144,56 +144,56 @@
 
     <tbody>
      <row>
-      <entry><type>text</> <literal>%</literal> <type>text</></entry>
+      <entry><type>text</type> <literal>%</literal> <type>text</type></entry>
       <entry><type>boolean</type></entry>
       <entry>
-       Returns <literal>true</> if its arguments have a similarity that is
+       Returns <literal>true</literal> if its arguments have a similarity that is
        greater than the current similarity threshold set by
-       <varname>pg_trgm.similarity_threshold</>.
+       <varname>pg_trgm.similarity_threshold</varname>.
       </entry>
      </row>
      <row>
-      <entry><type>text</> <literal>&lt;%</literal> <type>text</></entry>
+      <entry><type>text</type> <literal>&lt;%</literal> <type>text</type></entry>
       <entry><type>boolean</type></entry>
       <entry>
-       Returns <literal>true</> if its first argument has the similar word in
+       Returns <literal>true</literal> if its first argument has the similar word in
        the second argument and they have a similarity that is greater than the
        current word similarity threshold set by
-       <varname>pg_trgm.word_similarity_threshold</> parameter.
+       <varname>pg_trgm.word_similarity_threshold</varname> parameter.
       </entry>
      </row>
      <row>
-      <entry><type>text</> <literal>%&gt;</literal> <type>text</></entry>
+      <entry><type>text</type> <literal>%&gt;</literal> <type>text</type></entry>
       <entry><type>boolean</type></entry>
       <entry>
-       Commutator of the <literal>&lt;%</> operator.
+       Commutator of the <literal>&lt;%</literal> operator.
       </entry>
      </row>
      <row>
-      <entry><type>text</> <literal>&lt;-&gt;</literal> <type>text</></entry>
+      <entry><type>text</type> <literal>&lt;-&gt;</literal> <type>text</type></entry>
       <entry><type>real</type></entry>
       <entry>
-       Returns the <quote>distance</> between the arguments, that is
-       one minus the <function>similarity()</> value.
+       Returns the <quote>distance</quote> between the arguments, that is
+       one minus the <function>similarity()</function> value.
       </entry>
      </row>
      <row>
       <entry>
-       <type>text</> <literal>&lt;&lt;-&gt;</literal> <type>text</>
+       <type>text</type> <literal>&lt;&lt;-&gt;</literal> <type>text</type>
       </entry>
       <entry><type>real</type></entry>
       <entry>
-       Returns the <quote>distance</> between the arguments, that is
-       one minus the <function>word_similarity()</> value.
+       Returns the <quote>distance</quote> between the arguments, that is
+       one minus the <function>word_similarity()</function> value.
       </entry>
      </row>
      <row>
       <entry>
-       <type>text</> <literal>&lt;-&gt;&gt;</literal> <type>text</>
+       <type>text</type> <literal>&lt;-&gt;&gt;</literal> <type>text</type>
       </entry>
       <entry><type>real</type></entry>
       <entry>
-       Commutator of the <literal>&lt;&lt;-&gt;</> operator.
+       Commutator of the <literal>&lt;&lt;-&gt;</literal> operator.
       </entry>
      </row>
     </tbody>
@@ -207,31 +207,31 @@
   <variablelist>
    <varlistentry id="guc-pgtrgm-similarity-threshold" xreflabel="pg_trgm.similarity_threshold">
     <term>
-     <varname>pg_trgm.similarity_threshold</> (<type>real</type>)
+     <varname>pg_trgm.similarity_threshold</varname> (<type>real</type>)
      <indexterm>
-      <primary><varname>pg_trgm.similarity_threshold</> configuration parameter</primary>
+      <primary><varname>pg_trgm.similarity_threshold</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
-      Sets the current similarity threshold that is used by the <literal>%</>
+      Sets the current similarity threshold that is used by the <literal>%</literal>
       operator.  The threshold must be between 0 and 1 (default is 0.3).
      </para>
     </listitem>
    </varlistentry>
     <varlistentry id="guc-pgtrgm-word-similarity-threshold" xreflabel="pg_trgm.word_similarity_threshold">
      <term>
-      <varname>pg_trgm.word_similarity_threshold</> (<type>real</type>)
+      <varname>pg_trgm.word_similarity_threshold</varname> (<type>real</type>)
       <indexterm>
        <primary>
-        <varname>pg_trgm.word_similarity_threshold</> configuration parameter
+        <varname>pg_trgm.word_similarity_threshold</varname> configuration parameter
        </primary>
       </indexterm>
      </term>
      <listitem>
       <para>
        Sets the current word similarity threshold that is used by
-       <literal>&lt;%</> and <literal>%&gt;</> operators.  The threshold
+       <literal>&lt;%</literal> and <literal>%&gt;</literal> operators.  The threshold
        must be between 0 and 1 (default is 0.6).
       </para>
      </listitem>
@@ -247,8 +247,8 @@
    operator classes that allow you to create an index over a text column for
    the purpose of very fast similarity searches.  These index types support
    the above-described similarity operators, and additionally support
-   trigram-based index searches for <literal>LIKE</>, <literal>ILIKE</>,
-   <literal>~</> and <literal>~*</> queries.  (These indexes do not
+   trigram-based index searches for <literal>LIKE</literal>, <literal>ILIKE</literal>,
+   <literal>~</literal> and <literal>~*</literal> queries.  (These indexes do not
    support equality nor simple comparison operators, so you may need a
    regular B-tree index too.)
   </para>
@@ -267,16 +267,16 @@ CREATE INDEX trgm_idx ON test_trgm USING GIN (t gin_trgm_ops);
   </para>
 
   <para>
-   At this point, you will have an index on the <structfield>t</> column that
+   At this point, you will have an index on the <structfield>t</structfield> column that
    you can use for similarity searching.  A typical query is
 <programlisting>
-SELECT t, similarity(t, '<replaceable>word</>') AS sml
+SELECT t, similarity(t, '<replaceable>word</replaceable>') AS sml
   FROM test_trgm
-  WHERE t % '<replaceable>word</>'
+  WHERE t % '<replaceable>word</replaceable>'
   ORDER BY sml DESC, t;
 </programlisting>
    This will return all values in the text column that are sufficiently
-   similar to <replaceable>word</>, sorted from best match to worst.  The
+   similar to <replaceable>word</replaceable>, sorted from best match to worst.  The
    index will be used to make this a fast operation even over very large data
    sets.
   </para>
@@ -284,7 +284,7 @@ SELECT t, similarity(t, '<replaceable>word</>') AS sml
   <para>
    A variant of the above query is
 <programlisting>
-SELECT t, t &lt;-&gt; '<replaceable>word</>' AS dist
+SELECT t, t &lt;-&gt; '<replaceable>word</replaceable>' AS dist
   FROM test_trgm
   ORDER BY dist LIMIT 10;
 </programlisting>
@@ -294,16 +294,16 @@ SELECT t, t &lt;-&gt; '<replaceable>word</>' AS dist
   </para>
 
   <para>
-   Also you can use an index on the <structfield>t</> column for word
+   Also you can use an index on the <structfield>t</structfield> column for word
    similarity.  For example:
 <programlisting>
-SELECT t, word_similarity('<replaceable>word</>', t) AS sml
+SELECT t, word_similarity('<replaceable>word</replaceable>', t) AS sml
   FROM test_trgm
-  WHERE '<replaceable>word</>' &lt;% t
+  WHERE '<replaceable>word</replaceable>' &lt;% t
   ORDER BY sml DESC, t;
 </programlisting>
    This will return all values in the text column that have a word
-   which sufficiently similar to <replaceable>word</>, sorted from best
+   which sufficiently similar to <replaceable>word</replaceable>, sorted from best
    match to worst.  The index will be used to make this a fast operation
    even over very large data sets.
   </para>
@@ -311,7 +311,7 @@ SELECT t, word_similarity('<replaceable>word</>', t) AS sml
   <para>
    A variant of the above query is
 <programlisting>
-SELECT t, '<replaceable>word</>' &lt;&lt;-&gt; t AS dist
+SELECT t, '<replaceable>word</replaceable>' &lt;&lt;-&gt; t AS dist
   FROM test_trgm
   ORDER BY dist LIMIT 10;
 </programlisting>
@@ -321,8 +321,8 @@ SELECT t, '<replaceable>word</>' &lt;&lt;-&gt; t AS dist
 
 
   <para>
-   Beginning in <productname>PostgreSQL</> 9.1, these index types also support
-   index searches for <literal>LIKE</> and <literal>ILIKE</>, for example
+   Beginning in <productname>PostgreSQL</productname> 9.1, these index types also support
+   index searches for <literal>LIKE</literal> and <literal>ILIKE</literal>, for example
 <programlisting>
 SELECT * FROM test_trgm WHERE t LIKE '%foo%bar';
 </programlisting>
@@ -333,9 +333,9 @@ SELECT * FROM test_trgm WHERE t LIKE '%foo%bar';
   </para>
 
   <para>
-   Beginning in <productname>PostgreSQL</> 9.3, these index types also support
+   Beginning in <productname>PostgreSQL</productname> 9.3, these index types also support
    index searches for regular-expression matches
-   (<literal>~</> and <literal>~*</> operators), for example
+   (<literal>~</literal> and <literal>~*</literal> operators), for example
 <programlisting>
 SELECT * FROM test_trgm WHERE t ~ '(foo|bar)';
 </programlisting>
@@ -347,7 +347,7 @@ SELECT * FROM test_trgm WHERE t ~ '(foo|bar)';
   </para>
 
   <para>
-   For both <literal>LIKE</> and regular-expression searches, keep in mind
+   For both <literal>LIKE</literal> and regular-expression searches, keep in mind
    that a pattern with no extractable trigrams will degenerate to a full-index
    scan.
   </para>
@@ -377,9 +377,9 @@ CREATE TABLE words AS SELECT word FROM
         ts_stat('SELECT to_tsvector(''simple'', bodytext) FROM documents');
 </programlisting>
 
-   where <structname>documents</> is a table that has a text field
-   <structfield>bodytext</> that we wish to search.  The reason for using
-   the <literal>simple</> configuration with the <function>to_tsvector</>
+   where <structname>documents</structname> is a table that has a text field
+   <structfield>bodytext</structfield> that we wish to search.  The reason for using
+   the <literal>simple</literal> configuration with the <function>to_tsvector</function>
    function, instead of using a language-specific configuration,
    is that we want a list of the original (unstemmed) words.
   </para>
@@ -399,7 +399,7 @@ CREATE INDEX words_idx ON words USING GIN (word gin_trgm_ops);
 
   <note>
    <para>
-    Since the <structname>words</> table has been generated as a separate,
+    Since the <structname>words</structname> table has been generated as a separate,
     static table, it will need to be periodically regenerated so that
     it remains reasonably up-to-date with the document collection.
     Keeping it exactly current is usually unnecessary.
diff --git a/doc/src/sgml/pgvisibility.sgml b/doc/src/sgml/pgvisibility.sgml
index d466a3bce8..75336946a6 100644
--- a/doc/src/sgml/pgvisibility.sgml
+++ b/doc/src/sgml/pgvisibility.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>pg_visibility</> module provides a means for examining the
+  The <filename>pg_visibility</filename> module provides a means for examining the
   visibility map (VM) and page-level visibility information of a table.
   It also provides functions to check the integrity of a visibility map and to
   force it to be rebuilt.
@@ -28,13 +28,13 @@
   These two bits will normally agree, but the page's all-visible bit can
   sometimes be set while the visibility map bit is clear after a crash
   recovery.  The reported values can also disagree because of a change that
-  occurs after <literal>pg_visibility</> examines the visibility map and
+  occurs after <literal>pg_visibility</literal> examines the visibility map and
   before it examines the data page.  Any event that causes data corruption
   can also cause these bits to disagree.
  </para>
 
  <para>
-  Functions that display information about <literal>PD_ALL_VISIBLE</> bits
+  Functions that display information about <literal>PD_ALL_VISIBLE</literal> bits
   are much more costly than those that only consult the visibility map,
   because they must read the relation's data blocks rather than only the
   (much smaller) visibility map.  Functions that check the relation's
@@ -61,7 +61,7 @@
      <para>
       Returns the all-visible and all-frozen bits in the visibility map for
       the given block of the given relation, plus the
-      <literal>PD_ALL_VISIBLE</> bit of that block.
+      <literal>PD_ALL_VISIBLE</literal> bit of that block.
      </para>
     </listitem>
    </varlistentry>
@@ -82,7 +82,7 @@
     <listitem>
      <para>
       Returns the all-visible and all-frozen bits in the visibility map for
-      each block of the given relation, plus the <literal>PD_ALL_VISIBLE</>
+      each block of the given relation, plus the <literal>PD_ALL_VISIBLE</literal>
       bit of each block.
      </para>
     </listitem>
@@ -130,7 +130,7 @@
      <para>
       Truncates the visibility map for the given relation.  This function is
       useful if you believe that the visibility map for the relation is
-      corrupt and wish to force rebuilding it.  The first <command>VACUUM</>
+      corrupt and wish to force rebuilding it.  The first <command>VACUUM</command>
       executed on the given relation after this function is executed will scan
       every page in the relation and rebuild the visibility map.  (Until that
       is done, queries will treat the visibility map as containing all zeroes.)
diff --git a/doc/src/sgml/planstats.sgml b/doc/src/sgml/planstats.sgml
index 838fcda6d2..ef643ad064 100644
--- a/doc/src/sgml/planstats.sgml
+++ b/doc/src/sgml/planstats.sgml
@@ -5,7 +5,7 @@
 
   <para>
    This chapter builds on the material covered in <xref
-   linkend="using-explain"> and <xref linkend="planner-stats"> to show some
+   linkend="using-explain"/> and <xref linkend="planner-stats"/> to show some
    additional details about how the planner uses the
    system statistics to estimate the number of rows each part of a query might
    return. This is a significant part of the planning process,
@@ -28,13 +28,13 @@
   </indexterm>
 
   <para>
-   The examples shown below use tables in the <productname>PostgreSQL</>
+   The examples shown below use tables in the <productname>PostgreSQL</productname>
    regression test database.
    The outputs shown are taken from version 8.3.
    The behavior of earlier (or later) versions might vary.
-   Note also that since <command>ANALYZE</> uses random sampling
+   Note also that since <command>ANALYZE</command> uses random sampling
    while producing statistics, the results will change slightly after
-   any new <command>ANALYZE</>.
+   any new <command>ANALYZE</command>.
   </para>
 
   <para>
@@ -49,7 +49,7 @@ EXPLAIN SELECT * FROM tenk1;
 </programlisting>
 
    How the planner determines the cardinality of <structname>tenk1</structname>
-   is covered in <xref linkend="planner-stats">, but is repeated here for
+   is covered in <xref linkend="planner-stats"/>, but is repeated here for
    completeness. The number of pages and rows is looked up in
    <structname>pg_class</structname>:
 
@@ -61,8 +61,8 @@ SELECT relpages, reltuples FROM pg_class WHERE relname = 'tenk1';
       358 |     10000
 </programlisting>
 
-    These numbers are current as of the last <command>VACUUM</> or
-    <command>ANALYZE</> on the table.  The planner then fetches the
+    These numbers are current as of the last <command>VACUUM</command> or
+    <command>ANALYZE</command> on the table.  The planner then fetches the
     actual current number of pages in the table (this is a cheap operation,
     not requiring a table scan).  If that is different from
     <structfield>relpages</structfield> then
@@ -150,7 +150,7 @@ EXPLAIN SELECT * FROM tenk1 WHERE stringu1 = 'CRAAAA';
    and looks up the selectivity function for <literal>=</literal>, which is
    <function>eqsel</function>.  For equality estimation the histogram is
    not useful; instead the list of <firstterm>most
-   common values</> (<acronym>MCV</acronym>s) is used to determine the
+   common values</firstterm> (<acronym>MCV</acronym>s) is used to determine the
    selectivity. Let's have a look at the MCVs, with some additional columns
    that will be useful later:
 
@@ -165,7 +165,7 @@ most_common_freqs | {0.00333333,0.003,0.003,0.003,0.003,0.003,0.003,0.003,0.003,
 
 </programlisting>
 
-   Since <literal>CRAAAA</> appears in the list of MCVs, the selectivity is
+   Since <literal>CRAAAA</literal> appears in the list of MCVs, the selectivity is
    merely the corresponding entry in the list of most common frequencies
    (<acronym>MCF</acronym>s):
 
@@ -225,18 +225,18 @@ rows = 10000 * 0.0014559
   </para>
 
   <para>
-   The previous example with <literal>unique1 &lt; 1000</> was an
+   The previous example with <literal>unique1 &lt; 1000</literal> was an
    oversimplification of what <function>scalarltsel</function> really does;
    now that we have seen an example of the use of MCVs, we can fill in some
    more detail.  The example was correct as far as it went, because since
-   <structfield>unique1</> is a unique column it has no MCVs (obviously, no
+   <structfield>unique1</structfield> is a unique column it has no MCVs (obviously, no
    value is any more common than any other value).  For a non-unique
    column, there will normally be both a histogram and an MCV list, and
    <emphasis>the histogram does not include the portion of the column
-   population represented by the MCVs</>.  We do things this way because
+   population represented by the MCVs</emphasis>.  We do things this way because
    it allows more precise estimation.  In this situation
    <function>scalarltsel</function> directly applies the condition (e.g.,
-   <quote>&lt; 1000</>) to each value of the MCV list, and adds up the
+   <quote>&lt; 1000</quote>) to each value of the MCV list, and adds up the
    frequencies of the MCVs for which the condition is true.  This gives
    an exact estimate of the selectivity within the portion of the table
    that is MCVs.  The histogram is then used in the same way as above
@@ -253,7 +253,7 @@ EXPLAIN SELECT * FROM tenk1 WHERE stringu1 &lt; 'IAAAAA';
    Filter: (stringu1 &lt; 'IAAAAA'::name)
 </programlisting>
 
-   We already saw the MCV information for <structfield>stringu1</>,
+   We already saw the MCV information for <structfield>stringu1</structfield>,
    and here is its histogram:
 
 <programlisting>
@@ -266,7 +266,7 @@ WHERE tablename='tenk1' AND attname='stringu1';
 </programlisting>
 
    Checking the MCV list, we find that the condition <literal>stringu1 &lt;
-   'IAAAAA'</> is satisfied by the first six entries and not the last four,
+   'IAAAAA'</literal> is satisfied by the first six entries and not the last four,
    so the selectivity within the MCV part of the population is
 
 <programlisting>
@@ -279,11 +279,11 @@ selectivity = sum(relevant mvfs)
    population represented by MCVs is 0.03033333, and therefore the
    fraction represented by the histogram is 0.96966667 (again, there
    are no nulls, else we'd have to exclude them here).  We can see
-   that the value <literal>IAAAAA</> falls nearly at the end of the
+   that the value <literal>IAAAAA</literal> falls nearly at the end of the
    third histogram bucket.  Using some rather cheesy assumptions
    about the frequency of different characters, the planner arrives
    at the estimate 0.298387 for the portion of the histogram population
-   that is less than <literal>IAAAAA</>.  We then combine the estimates
+   that is less than <literal>IAAAAA</literal>.  We then combine the estimates
    for the MCV and non-MCV populations:
 
 <programlisting>
@@ -372,7 +372,7 @@ rows        = 10000 * 0.005035
             = 50  (rounding off)
 </programlisting>
 
-   The restriction for the join is <literal>t2.unique2 = t1.unique2</>.
+   The restriction for the join is <literal>t2.unique2 = t1.unique2</literal>.
    The operator is just
    our familiar <literal>=</literal>, however the selectivity function is
    obtained from the <structfield>oprjoin</structfield> column of
@@ -424,12 +424,12 @@ rows = (outer_cardinality * inner_cardinality) * selectivity
   </para>
 
   <para>
-   Notice that we showed <literal>inner_cardinality</> as 10000, that is,
-   the unmodified size of <structname>tenk2</>.  It might appear from
-   inspection of the <command>EXPLAIN</> output that the estimate of
+   Notice that we showed <literal>inner_cardinality</literal> as 10000, that is,
+   the unmodified size of <structname>tenk2</structname>.  It might appear from
+   inspection of the <command>EXPLAIN</command> output that the estimate of
    join rows comes from 50 * 1, that is, the number of outer rows times
    the estimated number of rows obtained by each inner index scan on
-   <structname>tenk2</>.  But this is not the case: the join relation size
+   <structname>tenk2</structname>.  But this is not the case: the join relation size
    is estimated before any particular join plan has been considered.  If
    everything is working well then the two ways of estimating the join
    size will produce about the same answer, but due to round-off error and
@@ -438,7 +438,7 @@ rows = (outer_cardinality * inner_cardinality) * selectivity
 
   <para>
    For those interested in further details, estimation of the size of
-   a table (before any <literal>WHERE</> clauses) is done in
+   a table (before any <literal>WHERE</literal> clauses) is done in
    <filename>src/backend/optimizer/util/plancat.c</filename>. The generic
    logic for clause selectivities is in
    <filename>src/backend/optimizer/path/clausesel.c</filename>.  The
@@ -468,7 +468,7 @@ INSERT INTO t SELECT i % 100, i % 100 FROM generate_series(1, 10000) s(i);
 ANALYZE t;
 </programlisting>
 
-    As explained in <xref linkend="planner-stats">, the planner can determine
+    As explained in <xref linkend="planner-stats"/>, the planner can determine
     cardinality of <structname>t</structname> using the number of pages and
     rows obtained from <structname>pg_class</structname>:
 
@@ -485,8 +485,8 @@ SELECT relpages, reltuples FROM pg_class WHERE relname = 't';
    </para>
 
    <para>
-    The following example shows the result of estimating a <literal>WHERE</>
-    condition on the <structfield>a</> column:
+    The following example shows the result of estimating a <literal>WHERE</literal>
+    condition on the <structfield>a</structfield> column:
 
 <programlisting>
 EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a = 1;
@@ -501,9 +501,9 @@ EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a = 1;
     of this clause to be 1%.  By comparing this estimate and the actual
     number of rows, we see that the estimate is very accurate
     (in fact exact, as the table is very small).  Changing the
-    <literal>WHERE</> condition to use the <structfield>b</> column, an
+    <literal>WHERE</literal> condition to use the <structfield>b</structfield> column, an
     identical plan is generated.  But observe what happens if we apply the same
-    condition on both columns, combining them with <literal>AND</>:
+    condition on both columns, combining them with <literal>AND</literal>:
 
 <programlisting>
 EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a = 1 AND b = 1;
@@ -524,7 +524,7 @@ EXPLAIN (ANALYZE, TIMING OFF) SELECT * FROM t WHERE a = 1 AND b = 1;
 
    <para>
     This problem can be fixed by creating a statistics object that
-    directs <command>ANALYZE</> to calculate functional-dependency
+    directs <command>ANALYZE</command> to calculate functional-dependency
     multivariate statistics on the two columns:
 
 <programlisting>
diff --git a/doc/src/sgml/plhandler.sgml b/doc/src/sgml/plhandler.sgml
index 57a2a05ed2..363f84b9f3 100644
--- a/doc/src/sgml/plhandler.sgml
+++ b/doc/src/sgml/plhandler.sgml
@@ -29,13 +29,13 @@
     special pseudo-type identifies the function as a call handler and
     prevents it from being called directly in SQL commands.
     For more details on C language calling conventions and dynamic loading,
-    see <xref linkend="xfunc-c">.
+    see <xref linkend="xfunc-c"/>.
    </para>
 
    <para>
     The call handler is called in the same way as any other function:
     It receives a pointer to a
-    <structname>FunctionCallInfoData</structname> <type>struct</> containing
+    <structname>FunctionCallInfoData</structname> <type>struct</type> containing
     argument values and information about the called function, and it
     is expected to return a <type>Datum</type> result (and possibly
     set the <structfield>isnull</structfield> field of the
@@ -54,7 +54,7 @@
    <para>
     It's up to the call handler to fetch the entry of the function from the
     <classname>pg_proc</classname> system catalog and to analyze the argument
-    and return types of the called function. The <literal>AS</> clause from the
+    and return types of the called function. The <literal>AS</literal> clause from the
     <command>CREATE FUNCTION</command> command for the function will be found
     in the <literal>prosrc</literal> column of the
     <classname>pg_proc</classname> row. This is commonly source
@@ -68,9 +68,9 @@
     A call handler can avoid repeated lookups of information about the
     called function by using the
     <structfield>flinfo-&gt;fn_extra</structfield> field.  This will
-    initially be <symbol>NULL</>, but can be set by the call handler to point at
+    initially be <symbol>NULL</symbol>, but can be set by the call handler to point at
     information about the called function.  On subsequent calls, if
-    <structfield>flinfo-&gt;fn_extra</structfield> is already non-<symbol>NULL</>
+    <structfield>flinfo-&gt;fn_extra</structfield> is already non-<symbol>NULL</symbol>
     then it can be used and the information lookup step skipped.  The
     call handler must make sure that
     <structfield>flinfo-&gt;fn_extra</structfield> is made to point at
@@ -90,7 +90,7 @@
     are passed in the usual way, but the
     <structname>FunctionCallInfoData</structname>'s
     <structfield>context</structfield> field points at a
-    <structname>TriggerData</structname> structure, rather than being <symbol>NULL</>
+    <structname>TriggerData</structname> structure, rather than being <symbol>NULL</symbol>
     as it is in a plain function call.  A language handler should
     provide mechanisms for procedural-language functions to get at the trigger
     information.
@@ -108,9 +108,7 @@
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 
 PG_FUNCTION_INFO_V1(plsample_call_handler);
 
@@ -146,7 +144,7 @@ plsample_call_handler(PG_FUNCTION_ARGS)
 
    <para>
     After having compiled the handler function into a loadable module
-    (see <xref linkend="dfunc">), the following commands then
+    (see <xref linkend="dfunc"/>), the following commands then
     register the sample procedural language:
 <programlisting>
 CREATE FUNCTION plsample_call_handler() RETURNS language_handler
@@ -164,83 +162,83 @@ CREATE LANGUAGE plsample
     are a <firstterm>validator</firstterm> and an
     <firstterm>inline handler</firstterm>.  A validator can be provided
     to allow language-specific checking to be done during
-    <xref linkend="sql-createfunction">.
+    <xref linkend="sql-createfunction"/>.
     An inline handler can be provided to allow the language to support
-    anonymous code blocks executed via the <xref linkend="sql-do"> command.
+    anonymous code blocks executed via the <xref linkend="sql-do"/> command.
    </para>
 
    <para>
     If a validator is provided by a procedural language, it
     must be declared as a function taking a single parameter of type
-    <type>oid</>.  The validator's result is ignored, so it is customarily
-    declared to return <type>void</>.  The validator will be called at
-    the end of a <command>CREATE FUNCTION</> command that has created
+    <type>oid</type>.  The validator's result is ignored, so it is customarily
+    declared to return <type>void</type>.  The validator will be called at
+    the end of a <command>CREATE FUNCTION</command> command that has created
     or updated a function written in the procedural language.
-    The passed-in OID is the OID of the function's <classname>pg_proc</>
+    The passed-in OID is the OID of the function's <classname>pg_proc</classname>
     row.  The validator must fetch this row in the usual way, and do
     whatever checking is appropriate.
-    First, call <function>CheckFunctionValidatorAccess()</> to diagnose
+    First, call <function>CheckFunctionValidatorAccess()</function> to diagnose
     explicit calls to the validator that the user could not achieve through
-    <command>CREATE FUNCTION</>.  Typical checks then include verifying
+    <command>CREATE FUNCTION</command>.  Typical checks then include verifying
     that the function's argument and result types are supported by the
     language, and that the function's body is syntactically correct
     in the language.  If the validator finds the function to be okay,
     it should just return.  If it finds an error, it should report that
-    via the normal <function>ereport()</> error reporting mechanism.
+    via the normal <function>ereport()</function> error reporting mechanism.
     Throwing an error will force a transaction rollback and thus prevent
     the incorrect function definition from being committed.
    </para>
 
    <para>
     Validator functions should typically honor the <xref
-    linkend="guc-check-function-bodies"> parameter: if it is turned off then
+    linkend="guc-check-function-bodies"/> parameter: if it is turned off then
     any expensive or context-sensitive checking should be skipped.  If the
     language provides for code execution at compilation time, the validator
     must suppress checks that would induce such execution.  In particular,
-    this parameter is turned off by <application>pg_dump</> so that it can
+    this parameter is turned off by <application>pg_dump</application> so that it can
     load procedural language functions without worrying about side effects or
     dependencies of the function bodies on other database objects.
     (Because of this requirement, the call handler should avoid
     assuming that the validator has fully checked the function.  The point
     of having a validator is not to let the call handler omit checks, but
     to notify the user immediately if there are obvious errors in a
-    <command>CREATE FUNCTION</> command.)
+    <command>CREATE FUNCTION</command> command.)
     While the choice of exactly what to check is mostly left to the
     discretion of the validator function, note that the core
-    <command>CREATE FUNCTION</> code only executes <literal>SET</> clauses
-    attached to a function when <varname>check_function_bodies</> is on.
+    <command>CREATE FUNCTION</command> code only executes <literal>SET</literal> clauses
+    attached to a function when <varname>check_function_bodies</varname> is on.
     Therefore, checks whose results might be affected by GUC parameters
-    definitely should be skipped when <varname>check_function_bodies</> is
+    definitely should be skipped when <varname>check_function_bodies</varname> is
     off, to avoid false failures when reloading a dump.
    </para>
 
    <para>
     If an inline handler is provided by a procedural language, it
     must be declared as a function taking a single parameter of type
-    <type>internal</>.  The inline handler's result is ignored, so it is
-    customarily declared to return <type>void</>.  The inline handler
-    will be called when a <command>DO</> statement is executed specifying
+    <type>internal</type>.  The inline handler's result is ignored, so it is
+    customarily declared to return <type>void</type>.  The inline handler
+    will be called when a <command>DO</command> statement is executed specifying
     the procedural language.  The parameter actually passed is a pointer
-    to an <structname>InlineCodeBlock</> struct, which contains information
-    about the <command>DO</> statement's parameters, in particular the
+    to an <structname>InlineCodeBlock</structname> struct, which contains information
+    about the <command>DO</command> statement's parameters, in particular the
     text of the anonymous code block to be executed.  The inline handler
     should execute this code and return.
    </para>
 
    <para>
     It's recommended that you wrap all these function declarations,
-    as well as the <command>CREATE LANGUAGE</> command itself, into
-    an <firstterm>extension</> so that a simple <command>CREATE EXTENSION</>
+    as well as the <command>CREATE LANGUAGE</command> command itself, into
+    an <firstterm>extension</firstterm> so that a simple <command>CREATE EXTENSION</command>
     command is sufficient to install the language.  See
-    <xref linkend="extend-extensions"> for information about writing
+    <xref linkend="extend-extensions"/> for information about writing
     extensions.
    </para>
 
    <para>
     The procedural languages included in the standard distribution
     are good references when trying to write your own language handler.
-    Look into the <filename>src/pl</> subdirectory of the source tree.
-    The <xref linkend="sql-createlanguage">
+    Look into the <filename>src/pl</filename> subdirectory of the source tree.
+    The <xref linkend="sql-createlanguage"/>
     reference page also has some useful details.
    </para>
 
diff --git a/doc/src/sgml/plperl.sgml b/doc/src/sgml/plperl.sgml
index 37a3557d61..cff7a847de 100644
--- a/doc/src/sgml/plperl.sgml
+++ b/doc/src/sgml/plperl.sgml
@@ -27,12 +27,12 @@
 
   <para>
    To install PL/Perl in a particular database, use
-   <literal>CREATE EXTENSION plperl</>.
+   <literal>CREATE EXTENSION plperl</literal>.
   </para>
 
   <tip>
    <para>
-    If a language is installed into <literal>template1</>, all subsequently
+    If a language is installed into <literal>template1</literal>, all subsequently
     created databases will have the language installed automatically.
    </para>
   </tip>
@@ -41,7 +41,7 @@
    <para>
     Users of source packages must specially enable the build of
     PL/Perl during the installation process.  (Refer to <xref
-    linkend="installation"> for more information.)  Users of
+    linkend="installation"/> for more information.)  Users of
     binary packages might find PL/Perl in a separate subpackage.
    </para>
   </note>
@@ -51,7 +51,7 @@
 
   <para>
    To create a function in the PL/Perl language, use the standard
-   <xref linkend="sql-createfunction">
+   <xref linkend="sql-createfunction"/>
    syntax:
 
 <programlisting>
@@ -67,9 +67,13 @@ $$ LANGUAGE plperl;
    as discussed below.
   </para>
 
+  <para>
+   In a PL/Perl procedure, any return value from the Perl code is ignored.
+  </para>
+
   <para>
    PL/Perl also supports anonymous code blocks called with the
-   <xref linkend="sql-do"> statement:
+   <xref linkend="sql-do"/> statement:
 
 <programlisting>
 DO $$
@@ -90,8 +94,8 @@ $$ LANGUAGE plperl;
     subroutines which you call via a coderef. For more information, see the
     entries for <literal>Variable "%s" will not stay shared</literal> and
     <literal>Variable "%s" is not available</literal> in the
-    <citerefentry><refentrytitle>perldiag</></citerefentry> man page, or
-    search the Internet for <quote>perl nested named subroutine</>.
+    <citerefentry><refentrytitle>perldiag</refentrytitle></citerefentry> man page, or
+    search the Internet for <quote>perl nested named subroutine</quote>.
    </para>
   </note>
 
@@ -99,17 +103,17 @@ $$ LANGUAGE plperl;
    The syntax of the <command>CREATE FUNCTION</command> command requires
    the function body to be written as a string constant.  It is usually
    most convenient to use dollar quoting (see <xref
-   linkend="sql-syntax-dollar-quoting">) for the string constant.
-   If you choose to use escape string syntax <literal>E''</>,
-   you must double any single quote marks (<literal>'</>) and backslashes
-   (<literal>\</>) used in the body of the function
-   (see <xref linkend="sql-syntax-strings">).
+   linkend="sql-syntax-dollar-quoting"/>) for the string constant.
+   If you choose to use escape string syntax <literal>E''</literal>,
+   you must double any single quote marks (<literal>'</literal>) and backslashes
+   (<literal>\</literal>) used in the body of the function
+   (see <xref linkend="sql-syntax-strings"/>).
   </para>
 
   <para>
    Arguments and results are handled as in any other Perl subroutine:
    arguments are passed in <varname>@_</varname>, and a result value
-   is returned with <literal>return</> or as the last expression
+   is returned with <literal>return</literal> or as the last expression
    evaluated in the function.
   </para>
 
@@ -134,12 +138,12 @@ $$ LANGUAGE plperl;
   </note>
 
   <para>
-   If an SQL null value<indexterm><primary>null value</><secondary
-   sortas="PL/Perl">in PL/Perl</></indexterm> is passed to a function,
-   the argument value will appear as <quote>undefined</> in Perl.  The
+   If an SQL null value<indexterm><primary>null value</primary><secondary
+   sortas="PL/Perl">in PL/Perl</secondary></indexterm> is passed to a function,
+   the argument value will appear as <quote>undefined</quote> in Perl.  The
    above function definition will not behave very nicely with null
    inputs (in fact, it will act as though they are zeroes).  We could
-   add <literal>STRICT</> to the function definition to make
+   add <literal>STRICT</literal> to the function definition to make
    <productname>PostgreSQL</productname> do something more reasonable:
    if a null value is passed, the function will not be called at all,
    but will just return a null result automatically.  Alternatively,
@@ -174,14 +178,14 @@ $$ LANGUAGE plperl;
    other cases the argument will need to be converted into a form that is
    more usable in Perl. For example, the <function>decode_bytea</function>
    function can be used to convert an argument of
-   type <type>bytea</> into unescaped binary.
+   type <type>bytea</type> into unescaped binary.
   </para>
 
   <para>
    Similarly, values passed back to <productname>PostgreSQL</productname>
    must be in the external text representation format. For example, the
    <function>encode_bytea</function> function can be used to
-   escape binary data for a return value of type <type>bytea</>.
+   escape binary data for a return value of type <type>bytea</type>.
   </para>
 
   <para>
@@ -330,10 +334,10 @@ SELECT * FROM perl_set();
   </para>
 
   <para>
-   If you wish to use the <literal>strict</> pragma with your code you
-   have a few options. For temporary global use you can <command>SET</>
+   If you wish to use the <literal>strict</literal> pragma with your code you
+   have a few options. For temporary global use you can <command>SET</command>
    <literal>plperl.use_strict</literal> to true.
-   This will affect subsequent compilations of <application>PL/Perl</>
+   This will affect subsequent compilations of <application>PL/Perl</application>
    functions, but not functions already compiled in the current session.
    For permanent global use you can set <literal>plperl.use_strict</literal>
    to true in the <filename>postgresql.conf</filename> file.
@@ -348,7 +352,7 @@ use strict;
   </para>
 
   <para>
-  The <literal>feature</> pragma is also available to <function>use</> if your Perl is version 5.10.0 or higher.
+  The <literal>feature</literal> pragma is also available to <function>use</function> if your Perl is version 5.10.0 or higher.
   </para>
 
  </sect1>
@@ -380,7 +384,7 @@ use strict;
    <variablelist>
     <varlistentry>
      <term>
-      <literal><function>spi_exec_query</>(<replaceable>query</replaceable> [, <replaceable>max-rows</replaceable>])</literal>
+      <literal><function>spi_exec_query</function>(<replaceable>query</replaceable> [, <replaceable>max-rows</replaceable>])</literal>
       <indexterm>
        <primary>spi_exec_query</primary>
        <secondary>in PL/Perl</secondary>
@@ -524,13 +528,13 @@ SELECT * from lotsa_md5(500);
     </para>
 
     <para>
-     Normally, <function>spi_fetchrow</> should be repeated until it
+     Normally, <function>spi_fetchrow</function> should be repeated until it
      returns <literal>undef</literal>, indicating that there are no more
      rows to read.  The cursor returned by <literal>spi_query</literal>
      is automatically freed when
-     <function>spi_fetchrow</> returns <literal>undef</literal>.
+     <function>spi_fetchrow</function> returns <literal>undef</literal>.
      If you do not wish to read all the rows, instead call
-     <function>spi_cursor_close</> to free the cursor.
+     <function>spi_cursor_close</function> to free the cursor.
      Failure to do so will result in memory leaks.
     </para>
 
@@ -657,6 +661,60 @@ SELECT release_hosts_query();
     </para>
     </listitem>
     </varlistentry>
+
+    <varlistentry>
+     <term>
+      <literal><function>spi_commit()</function></literal>
+      <indexterm>
+       <primary>spi_commit</primary>
+       <secondary>in PL/Perl</secondary>
+     </indexterm>
+     </term>
+     <term>
+      <literal><function>spi_rollback()</function></literal>
+      <indexterm>
+       <primary>spi_rollback</primary>
+       <secondary>in PL/Perl</secondary>
+      </indexterm>
+     </term>
+     <listitem>
+      <para>
+       Commit or roll back the current transaction.  This can only be called
+       in a procedure or anonymous code block (<command>DO</command> command)
+       called from the top level.  (Note that it is not possible to run the
+       SQL commands <command>COMMIT</command> or <command>ROLLBACK</command>
+       via <function>spi_exec_query</function> or similar.  It has to be done
+       using these functions.)  After a transaction is ended, a new
+       transaction is automatically started, so there is no separate function
+       for that.
+      </para>
+
+      <para>
+       Here is an example:
+<programlisting>
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plperl
+AS $$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+$$;
+
+CALL transaction_test1();
+</programlisting>
+      </para>
+
+      <para>
+       Transactions cannot be ended when a cursor created by
+       <function>spi_query</function> is open.
+      </para>
+     </listitem>
+    </varlistentry>
    </variablelist>
  </sect2>
 
@@ -675,20 +733,20 @@ SELECT release_hosts_query();
      <listitem>
       <para>
        Emit a log or error message. Possible levels are
-       <literal>DEBUG</>, <literal>LOG</>, <literal>INFO</>,
-       <literal>NOTICE</>, <literal>WARNING</>, and <literal>ERROR</>.
-       <literal>ERROR</>
+       <literal>DEBUG</literal>, <literal>LOG</literal>, <literal>INFO</literal>,
+       <literal>NOTICE</literal>, <literal>WARNING</literal>, and <literal>ERROR</literal>.
+       <literal>ERROR</literal>
         raises an error condition; if this is not trapped by the surrounding
         Perl code, the error propagates out to the calling query, causing
         the current transaction or subtransaction to be aborted.  This
-        is effectively the same as the Perl <literal>die</> command.
+        is effectively the same as the Perl <literal>die</literal> command.
         The other levels only generate messages of different
         priority levels.
         Whether messages of a particular priority are reported to the client,
         written to the server log, or both is controlled by the
-        <xref linkend="guc-log-min-messages"> and
-        <xref linkend="guc-client-min-messages"> configuration
-        variables. See <xref linkend="runtime-config"> for more
+        <xref linkend="guc-log-min-messages"/> and
+        <xref linkend="guc-client-min-messages"/> configuration
+        variables. See <xref linkend="runtime-config"/> for more
         information.
       </para>
      </listitem>
@@ -706,8 +764,8 @@ SELECT release_hosts_query();
       <para>
         Return the given string suitably quoted to be used as a string literal in an SQL
         statement string. Embedded single-quotes and backslashes are properly doubled.
-        Note that <function>quote_literal</> returns undef on undef input; if the argument
-        might be undef, <function>quote_nullable</> is often more suitable.
+        Note that <function>quote_literal</function> returns undef on undef input; if the argument
+        might be undef, <function>quote_nullable</function> is often more suitable.
       </para>
      </listitem>
     </varlistentry>
@@ -792,7 +850,7 @@ SELECT release_hosts_query();
      <listitem>
       <para>
         Returns the contents of the referenced array as a string in array literal format
-        (see <xref linkend="arrays-input">).
+        (see <xref linkend="arrays-input"/>).
         Returns the argument value unaltered if it's not a reference to an array.
         The delimiter used between elements of the array literal defaults to "<literal>, </literal>"
         if a delimiter is not specified or is undef.
@@ -828,7 +886,7 @@ SELECT release_hosts_query();
      <listitem>
       <para>
         Returns the contents of the referenced array as a string in array constructor format
-        (see <xref linkend="sql-syntax-array-constructors">).
+        (see <xref linkend="sql-syntax-array-constructors"/>).
         Individual values are quoted using <function>quote_nullable</function>.
         Returns the argument value, quoted using <function>quote_nullable</function>,
         if it's not a reference to an array.
@@ -849,7 +907,7 @@ SELECT release_hosts_query();
         Returns a true value if the content of the given string looks like a
         number, according to Perl, returns false otherwise.
         Returns undef if the argument is undef.  Leading and trailing space is
-        ignored. <literal>Inf</> and <literal>Infinity</> are regarded as numbers.
+        ignored. <literal>Inf</literal> and <literal>Infinity</literal> are regarded as numbers.
         </para>
      </listitem>
     </varlistentry>
@@ -865,8 +923,8 @@ SELECT release_hosts_query();
      <listitem>
       <para>
         Returns a true value if the given argument may be treated as an
-        array reference, that is, if ref of the argument is <literal>ARRAY</> or
-        <literal>PostgreSQL::InServer::ARRAY</>.  Returns false otherwise.
+        array reference, that is, if ref of the argument is <literal>ARRAY</literal> or
+        <literal>PostgreSQL::InServer::ARRAY</literal>.  Returns false otherwise.
       </para>
      </listitem>
     </varlistentry>
@@ -941,11 +999,11 @@ $$ LANGUAGE plperl;
    PL/Perl functions will share the same value of <varname>%_SHARED</varname>
    if and only if they are executed by the same SQL role.  In an application
    wherein a single session executes code under multiple SQL roles (via
-   <literal>SECURITY DEFINER</> functions, use of <command>SET ROLE</>, etc)
+   <literal>SECURITY DEFINER</literal> functions, use of <command>SET ROLE</command>, etc)
    you may need to take explicit steps to ensure that PL/Perl functions can
    share data via <varname>%_SHARED</varname>.  To do that, make sure that
    functions that should communicate are owned by the same user, and mark
-   them <literal>SECURITY DEFINER</>.  You must of course take care that
+   them <literal>SECURITY DEFINER</literal>.  You must of course take care that
    such functions can't be used to do anything unintended.
   </para>
  </sect1>
@@ -959,8 +1017,8 @@ $$ LANGUAGE plperl;
   </indexterm>
 
   <para>
-   Normally, PL/Perl is installed as a <quote>trusted</> programming
-   language named <literal>plperl</>.  In this setup, certain Perl
+   Normally, PL/Perl is installed as a <quote>trusted</quote> programming
+   language named <literal>plperl</literal>.  In this setup, certain Perl
    operations are disabled to preserve security.  In general, the
    operations that are restricted are those that interact with the
    environment. This includes file handle operations,
@@ -993,15 +1051,15 @@ $$ LANGUAGE plperl;
    Sometimes it is desirable to write Perl functions that are not
    restricted.  For example, one might want a Perl function that sends
    mail.  To handle these cases, PL/Perl can also be installed as an
-   <quote>untrusted</> language (usually called
-   <application>PL/PerlU</application><indexterm><primary>PL/PerlU</></indexterm>).
+   <quote>untrusted</quote> language (usually called
+   <application>PL/PerlU</application><indexterm><primary>PL/PerlU</primary></indexterm>).
    In this case the full Perl language is available.  When installing the
    language, the language name <literal>plperlu</literal> will select
    the untrusted PL/Perl variant.
   </para>
 
   <para>
-   The writer of a <application>PL/PerlU</> function must take care that the function
+   The writer of a <application>PL/PerlU</application> function must take care that the function
    cannot be used to do anything unwanted, since it will be able to do
    anything that could be done by a user logged in as the database
    administrator.  Note that the database system allows only database
@@ -1010,25 +1068,25 @@ $$ LANGUAGE plperl;
 
   <para>
    If the above function was created by a superuser using the language
-   <literal>plperlu</>, execution would succeed.
+   <literal>plperlu</literal>, execution would succeed.
   </para>
 
   <para>
    In the same way, anonymous code blocks written in Perl can use
    restricted operations if the language is specified as
-   <literal>plperlu</> rather than <literal>plperl</>, but the caller
+   <literal>plperlu</literal> rather than <literal>plperl</literal>, but the caller
    must be a superuser.
   </para>
 
   <note>
    <para>
-    While <application>PL/Perl</> functions run in a separate Perl
-    interpreter for each SQL role, all <application>PL/PerlU</> functions
+    While <application>PL/Perl</application> functions run in a separate Perl
+    interpreter for each SQL role, all <application>PL/PerlU</application> functions
     executed in a given session run in a single Perl interpreter (which is
-    not any of the ones used for <application>PL/Perl</> functions).
-    This allows <application>PL/PerlU</> functions to share data freely,
-    but no communication can occur between <application>PL/Perl</> and
-    <application>PL/PerlU</> functions.
+    not any of the ones used for <application>PL/Perl</application> functions).
+    This allows <application>PL/PerlU</application> functions to share data freely,
+    but no communication can occur between <application>PL/Perl</application> and
+    <application>PL/PerlU</application> functions.
    </para>
   </note>
 
@@ -1036,14 +1094,14 @@ $$ LANGUAGE plperl;
    <para>
     Perl cannot support multiple interpreters within one process unless
     it was built with the appropriate flags, namely either
-    <literal>usemultiplicity</> or <literal>useithreads</>.
-    (<literal>usemultiplicity</> is preferred unless you actually need
+    <literal>usemultiplicity</literal> or <literal>useithreads</literal>.
+    (<literal>usemultiplicity</literal> is preferred unless you actually need
     to use threads.  For more details, see the
-    <citerefentry><refentrytitle>perlembed</></citerefentry> man page.)
-    If <application>PL/Perl</> is used with a copy of Perl that was not built
+    <citerefentry><refentrytitle>perlembed</refentrytitle></citerefentry> man page.)
+    If <application>PL/Perl</application> is used with a copy of Perl that was not built
     this way, then it is only possible to have one Perl interpreter per
     session, and so any one session can only execute either
-    <application>PL/PerlU</> functions, or <application>PL/Perl</> functions
+    <application>PL/PerlU</application> functions, or <application>PL/Perl</application> functions
     that are all called by the same SQL role.
    </para>
   </note>
@@ -1056,7 +1114,7 @@ $$ LANGUAGE plperl;
   <para>
    PL/Perl can be used to write trigger functions.  In a trigger function,
    the hash reference <varname>$_TD</varname> contains information about the
-   current trigger event. <varname>$_TD</> is a global variable,
+   current trigger event. <varname>$_TD</varname> is a global variable,
    which gets a separate local value for each invocation of the trigger.
    The fields of the <varname>$_TD</varname> hash reference are:
 
@@ -1092,8 +1150,8 @@ $$ LANGUAGE plperl;
      <term><literal>$_TD-&gt;{event}</literal></term>
      <listitem>
       <para>
-       Trigger event: <literal>INSERT</>, <literal>UPDATE</>,
-       <literal>DELETE</>, <literal>TRUNCATE</>, or <literal>UNKNOWN</>
+       Trigger event: <literal>INSERT</literal>, <literal>UPDATE</literal>,
+       <literal>DELETE</literal>, <literal>TRUNCATE</literal>, or <literal>UNKNOWN</literal>
       </para>
      </listitem>
     </varlistentry>
@@ -1244,7 +1302,7 @@ CREATE TRIGGER test_valid_id_trig
   <para>
    PL/Perl can be used to write event trigger functions.  In an event trigger
    function, the hash reference <varname>$_TD</varname> contains information
-   about the current trigger event.  <varname>$_TD</> is a global variable,
+   about the current trigger event.  <varname>$_TD</varname> is a global variable,
    which gets a separate local value for each invocation of the trigger.  The
    fields of the <varname>$_TD</varname> hash reference are:
 
@@ -1295,7 +1353,7 @@ CREATE EVENT TRIGGER perl_a_snitch
   <title>Configuration</title>
 
   <para>
-  This section lists configuration parameters that affect <application>PL/Perl</>.
+  This section lists configuration parameters that affect <application>PL/Perl</application>.
   </para>
 
   <variablelist>
@@ -1304,14 +1362,14 @@ CREATE EVENT TRIGGER perl_a_snitch
       <term>
        <varname>plperl.on_init</varname> (<type>string</type>)
       <indexterm>
-       <primary><varname>plperl.on_init</> configuration parameter</primary>
+       <primary><varname>plperl.on_init</varname> configuration parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies Perl code to be executed when a Perl interpreter is first
-        initialized, before it is specialized for use by <literal>plperl</> or
-        <literal>plperlu</>.
+        initialized, before it is specialized for use by <literal>plperl</literal> or
+        <literal>plperlu</literal>.
         The SPI functions are not available when this code is executed.
         If the code fails with an error it will abort the initialization of
         the interpreter and propagate out to the calling query, causing the
@@ -1319,7 +1377,7 @@ CREATE EVENT TRIGGER perl_a_snitch
        </para>
        <para>
        The Perl code is limited to a single string. Longer code can be placed
-       into a module and loaded by the <literal>on_init</> string.
+       into a module and loaded by the <literal>on_init</literal> string.
        Examples:
 <programlisting>
 plperl.on_init = 'require "plperlinit.pl"'
@@ -1327,8 +1385,8 @@ plperl.on_init = 'use lib "/my/app"; use MyApp::PgInit;'
 </programlisting>
        </para>
        <para>
-       Any modules loaded by <literal>plperl.on_init</>, either directly or
-       indirectly, will be available for use by <literal>plperl</>.  This may
+       Any modules loaded by <literal>plperl.on_init</literal>, either directly or
+       indirectly, will be available for use by <literal>plperl</literal>.  This may
        create a security risk. To see what modules have been loaded you can use:
 <programlisting>
 DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
@@ -1336,17 +1394,17 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
        </para>
        <para>
         Initialization will happen in the postmaster if the <literal>plperl</literal> library is
-        included in <xref linkend="guc-shared-preload-libraries">, in which
+        included in <xref linkend="guc-shared-preload-libraries"/>, in which
         case extra consideration should be given to the risk of destabilizing
         the postmaster.  The principal reason for making use of this feature
-        is that Perl modules loaded by <literal>plperl.on_init</> need be
+        is that Perl modules loaded by <literal>plperl.on_init</literal> need be
         loaded only at postmaster start, and will be instantly available
         without loading overhead in individual database sessions.  However,
         keep in mind that the overhead is avoided only for the first Perl
         interpreter used by a database session &mdash; either PL/PerlU, or
         PL/Perl for the first SQL role that calls a PL/Perl function.  Any
         additional Perl interpreters created in a database session will have
-        to execute <literal>plperl.on_init</> afresh.  Also, on Windows there
+        to execute <literal>plperl.on_init</literal> afresh.  Also, on Windows there
         will be no savings whatsoever from preloading, since the Perl
         interpreter created in the postmaster process does not propagate to
         child processes.
@@ -1361,27 +1419,27 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
       <term>
        <varname>plperl.on_plperl_init</varname> (<type>string</type>)
        <indexterm>
-        <primary><varname>plperl.on_plperl_init</> configuration parameter</primary>
+        <primary><varname>plperl.on_plperl_init</varname> configuration parameter</primary>
        </indexterm>
       </term>
       <term>
        <varname>plperl.on_plperlu_init</varname> (<type>string</type>)
        <indexterm>
-        <primary><varname>plperl.on_plperlu_init</> configuration parameter</primary>
+        <primary><varname>plperl.on_plperlu_init</varname> configuration parameter</primary>
        </indexterm>
       </term>
       <listitem>
        <para>
         These parameters specify Perl code to be executed when a Perl
-        interpreter is specialized for <literal>plperl</> or
-        <literal>plperlu</> respectively.  This will happen when a PL/Perl or
+        interpreter is specialized for <literal>plperl</literal> or
+        <literal>plperlu</literal> respectively.  This will happen when a PL/Perl or
         PL/PerlU function is first executed in a database session, or when
         an additional interpreter has to be created because the other language
         is called or a PL/Perl function is called by a new SQL role.  This
-        follows any initialization done by <literal>plperl.on_init</>.
+        follows any initialization done by <literal>plperl.on_init</literal>.
         The SPI functions are not available when this code is executed.
-        The Perl code in <literal>plperl.on_plperl_init</> is executed after
-        <quote>locking down</> the interpreter, and thus it can only perform
+        The Perl code in <literal>plperl.on_plperl_init</literal> is executed after
+        <quote>locking down</quote> the interpreter, and thus it can only perform
         trusted operations.
        </para>
        <para>
@@ -1404,13 +1462,13 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
       <term>
        <varname>plperl.use_strict</varname> (<type>boolean</type>)
        <indexterm>
-        <primary><varname>plperl.use_strict</> configuration parameter</primary>
+        <primary><varname>plperl.use_strict</varname> configuration parameter</primary>
        </indexterm>
       </term>
       <listitem>
        <para>
         When set true subsequent compilations of PL/Perl functions will have
-        the <literal>strict</> pragma enabled.  This parameter does not affect
+        the <literal>strict</literal> pragma enabled.  This parameter does not affect
         functions already compiled in the current session.
        </para>
       </listitem>
@@ -1459,7 +1517,7 @@ DO 'elog(WARNING, join ", ", sort keys %INC)' LANGUAGE plperl;
      <listitem>
       <para>
         When a session ends normally, not due to a fatal error, any
-        <literal>END</> blocks that have been defined are executed.
+        <literal>END</literal> blocks that have been defined are executed.
         Currently no other actions are performed. Specifically,
         file handles are not automatically flushed and objects are
         not automatically destroyed.
diff --git a/doc/src/sgml/plpgsql.sgml b/doc/src/sgml/plpgsql.sgml
index 2f166d2d59..c1e3c6a19d 100644
--- a/doc/src/sgml/plpgsql.sgml
+++ b/doc/src/sgml/plpgsql.sgml
@@ -13,7 +13,7 @@
  <para>
   <application>PL/pgSQL</application> is a loadable procedural
   language for the <productname>PostgreSQL</productname> database
-  system.  The design goals of <application>PL/pgSQL</> were to create
+  system.  The design goals of <application>PL/pgSQL</application> were to create
   a loadable procedural language that
 
     <itemizedlist>
@@ -59,7 +59,7 @@
    </para>
 
    <para>
-    In <productname>PostgreSQL</> 9.0 and later,
+    In <productname>PostgreSQL</productname> 9.0 and later,
     <application>PL/pgSQL</application> is installed by default.
     However it is still a loadable module, so especially security-conscious
     administrators could choose to remove it.
@@ -69,7 +69,7 @@
    <title>Advantages of Using <application>PL/pgSQL</application></title>
 
     <para>
-     <acronym>SQL</acronym> is the language <productname>PostgreSQL</>
+     <acronym>SQL</acronym> is the language <productname>PostgreSQL</productname>
      and most other relational databases use as query language. It's
      portable and easy to learn. But every <acronym>SQL</acronym>
      statement must be executed individually by the database server.
@@ -123,55 +123,58 @@
      and they can return a result of any of these types.  They can also
      accept or return any composite type (row type) specified by name.
      It is also possible to declare a <application>PL/pgSQL</application>
-     function as returning <type>record</>, which means that the result
+     function as accepting <type>record</type>, which means that any
+     composite type will do as input, or
+     as returning <type>record</type>, which means that the result
      is a row type whose columns are determined by specification in the
-     calling query, as discussed in <xref linkend="queries-tablefunctions">.
+     calling query, as discussed in <xref linkend="queries-tablefunctions"/>.
     </para>
 
     <para>
-     <application>PL/pgSQL</> functions can be declared to accept a variable
-     number of arguments by using the <literal>VARIADIC</> marker.  This
+     <application>PL/pgSQL</application> functions can be declared to accept a variable
+     number of arguments by using the <literal>VARIADIC</literal> marker.  This
      works exactly the same way as for SQL functions, as discussed in
-     <xref linkend="xfunc-sql-variadic-functions">.
+     <xref linkend="xfunc-sql-variadic-functions"/>.
     </para>
 
     <para>
-     <application>PL/pgSQL</> functions can also be declared to accept
+     <application>PL/pgSQL</application> functions can also be declared to accept
      and return the polymorphic types
      <type>anyelement</type>, <type>anyarray</type>, <type>anynonarray</type>,
-     <type>anyenum</>, and <type>anyrange</type>.  The actual
+     <type>anyenum</type>, and <type>anyrange</type>.  The actual
      data types handled by a polymorphic function can vary from call to
-     call, as discussed in <xref linkend="extend-types-polymorphic">.
-     An example is shown in <xref linkend="plpgsql-declaration-parameters">.
+     call, as discussed in <xref linkend="extend-types-polymorphic"/>.
+     An example is shown in <xref linkend="plpgsql-declaration-parameters"/>.
     </para>
 
     <para>
-     <application>PL/pgSQL</> functions can also be declared to return
-     a <quote>set</> (or table) of any data type that can be returned as
+     <application>PL/pgSQL</application> functions can also be declared to return
+     a <quote>set</quote> (or table) of any data type that can be returned as
      a single instance.  Such a function generates its output by executing
-     <command>RETURN NEXT</> for each desired element of the result
-     set, or by using <command>RETURN QUERY</> to output the result of
+     <command>RETURN NEXT</command> for each desired element of the result
+     set, or by using <command>RETURN QUERY</command> to output the result of
      evaluating a query.
     </para>
 
     <para>
-     Finally, a <application>PL/pgSQL</> function can be declared to return
-     <type>void</> if it has no useful return value.
+     Finally, a <application>PL/pgSQL</application> function can be declared to return
+     <type>void</type> if it has no useful return value.  (Alternatively, it
+     could be written as a procedure in that case.)
     </para>
 
     <para>
-     <application>PL/pgSQL</> functions can also be declared with output
+     <application>PL/pgSQL</application> functions can also be declared with output
      parameters in place of an explicit specification of the return type.
      This does not add any fundamental capability to the language, but
      it is often convenient, especially for returning multiple values.
-     The <literal>RETURNS TABLE</> notation can also be used in place
-     of <literal>RETURNS SETOF</>.
+     The <literal>RETURNS TABLE</literal> notation can also be used in place
+     of <literal>RETURNS SETOF</literal>.
     </para>
 
     <para>
      Specific examples appear in
-     <xref linkend="plpgsql-declaration-parameters"> and
-     <xref linkend="plpgsql-statements-returning">.
+     <xref linkend="plpgsql-declaration-parameters"/> and
+     <xref linkend="plpgsql-statements-returning"/>.
     </para>
   </sect2>
  </sect1>
@@ -181,16 +184,16 @@
 
   <para>
    Functions written in <application>PL/pgSQL</application> are defined
-   to the server by executing <xref linkend="sql-createfunction"> commands.
+   to the server by executing <xref linkend="sql-createfunction"/> commands.
    Such a command would normally look like, say,
 <programlisting>
 CREATE FUNCTION somefunc(integer, text) RETURNS integer
-AS '<replaceable>function body text</>'
+AS '<replaceable>function body text</replaceable>'
 LANGUAGE plpgsql;
 </programlisting>
    The function body is simply a string literal so far as <command>CREATE
-   FUNCTION</> is concerned.  It is often helpful to use dollar quoting
-   (see <xref linkend="sql-syntax-dollar-quoting">) to write the function
+   FUNCTION</command> is concerned.  It is often helpful to use dollar quoting
+   (see <xref linkend="sql-syntax-dollar-quoting"/>) to write the function
    body, rather than the normal single quote syntax.  Without dollar quoting,
    any single quotes or backslashes in the function body must be escaped by
    doubling them.  Almost all the examples in this chapter use dollar-quoted
@@ -200,7 +203,7 @@ LANGUAGE plpgsql;
   <para>
    <application>PL/pgSQL</application> is a block-structured language.
    The complete text of a function body must be a
-   <firstterm>block</>. A block is defined as:
+   <firstterm>block</firstterm>. A block is defined as:
 
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -223,16 +226,16 @@ END <optional> <replaceable>label</replaceable> </optional>;
     <tip>
      <para>
       A common mistake is to write a semicolon immediately after
-      <literal>BEGIN</>.  This is incorrect and will result in a syntax error.
+      <literal>BEGIN</literal>.  This is incorrect and will result in a syntax error.
      </para>
     </tip>
 
     <para>
      A <replaceable>label</replaceable> is only needed if you want to
      identify the block for use
-     in an <literal>EXIT</> statement, or to qualify the names of the
+     in an <literal>EXIT</literal> statement, or to qualify the names of the
      variables declared in the block.  If a label is given after
-     <literal>END</>, it must match the label at the block's beginning.
+     <literal>END</literal>, it must match the label at the block's beginning.
     </para>
 
     <para>
@@ -242,7 +245,7 @@ END <optional> <replaceable>label</replaceable> </optional>;
     </para>
 
     <para>
-     Comments work the same way in <application>PL/pgSQL</> code as in
+     Comments work the same way in <application>PL/pgSQL</application> code as in
      ordinary SQL.  A double dash (<literal>--</literal>) starts a comment
      that extends to the end of the line. A <literal>/*</literal> starts a
      block comment that extends to the matching occurrence of
@@ -251,7 +254,7 @@ END <optional> <replaceable>label</replaceable> </optional>;
 
     <para>
      Any statement in the statement section of a block
-     can be a <firstterm>subblock</>.  Subblocks can be used for
+     can be a <firstterm>subblock</firstterm>.  Subblocks can be used for
      logical grouping or to localize variables to a small group
      of statements.  Variables declared in a subblock mask any
      similarly-named variables of outer blocks for the duration
@@ -285,11 +288,11 @@ $$ LANGUAGE plpgsql;
 
     <note>
      <para>
-      There is actually a hidden <quote>outer block</> surrounding the body
-      of any <application>PL/pgSQL</> function.  This block provides the
+      There is actually a hidden <quote>outer block</quote> surrounding the body
+      of any <application>PL/pgSQL</application> function.  This block provides the
       declarations of the function's parameters (if any), as well as some
       special variables such as <literal>FOUND</literal> (see
-      <xref linkend="plpgsql-statements-diagnostics">).  The outer block is
+      <xref linkend="plpgsql-statements-diagnostics"/>).  The outer block is
       labeled with the function's name, meaning that parameters and special
       variables can be qualified with the function's name.
      </para>
@@ -297,18 +300,18 @@ $$ LANGUAGE plpgsql;
 
     <para>
      It is important not to confuse the use of
-     <command>BEGIN</>/<command>END</> for grouping statements in
-     <application>PL/pgSQL</> with the similarly-named SQL commands
+     <command>BEGIN</command>/<command>END</command> for grouping statements in
+     <application>PL/pgSQL</application> with the similarly-named SQL commands
      for transaction
-     control.  <application>PL/pgSQL</>'s <command>BEGIN</>/<command>END</>
+     control.  <application>PL/pgSQL</application>'s <command>BEGIN</command>/<command>END</command>
      are only for grouping; they do not start or end a transaction.
      Functions and trigger procedures are always executed within a transaction
      established by an outer query &mdash; they cannot start or commit that
      transaction, since there would be no context for them to execute in.
-     However, a block containing an <literal>EXCEPTION</> clause effectively
+     However, a block containing an <literal>EXCEPTION</literal> clause effectively
      forms a subtransaction that can be rolled back without affecting the
      outer transaction.  For more about that see <xref
-     linkend="plpgsql-error-trapping">.
+     linkend="plpgsql-error-trapping"/>.
     </para>
   </sect1>
 
@@ -318,15 +321,15 @@ $$ LANGUAGE plpgsql;
     <para>
      All variables used in a block must be declared in the
      declarations section of the block.
-     (The only exceptions are that the loop variable of a <literal>FOR</> loop
+     (The only exceptions are that the loop variable of a <literal>FOR</literal> loop
      iterating over a range of integer values is automatically declared as an
-     integer variable, and likewise the loop variable of a <literal>FOR</> loop
+     integer variable, and likewise the loop variable of a <literal>FOR</literal> loop
      iterating over a cursor's result is automatically declared as a
      record variable.)
     </para>
 
     <para>
-     <application>PL/pgSQL</> variables can have any SQL data type, such as
+     <application>PL/pgSQL</application> variables can have any SQL data type, such as
      <type>integer</type>, <type>varchar</type>, and
      <type>char</type>.
     </para>
@@ -348,21 +351,21 @@ arow RECORD;
 <synopsis>
 <replaceable>name</replaceable> <optional> CONSTANT </optional> <replaceable>type</replaceable> <optional> COLLATE <replaceable>collation_name</replaceable> </optional> <optional> NOT NULL </optional> <optional> { DEFAULT | := | = } <replaceable>expression</replaceable> </optional>;
 </synopsis>
-      The <literal>DEFAULT</> clause, if given, specifies the initial value assigned
-      to the variable when the block is entered.  If the <literal>DEFAULT</> clause
+      The <literal>DEFAULT</literal> clause, if given, specifies the initial value assigned
+      to the variable when the block is entered.  If the <literal>DEFAULT</literal> clause
       is not given then the variable is initialized to the
       <acronym>SQL</acronym> null value.
-      The <literal>CONSTANT</> option prevents the variable from being
+      The <literal>CONSTANT</literal> option prevents the variable from being
       assigned to after initialization, so that its value will remain constant
       for the duration of the block.
-      The <literal>COLLATE</> option specifies a collation to use for the
-      variable (see <xref linkend="plpgsql-declaration-collation">).
-      If <literal>NOT NULL</>
+      The <literal>COLLATE</literal> option specifies a collation to use for the
+      variable (see <xref linkend="plpgsql-declaration-collation"/>).
+      If <literal>NOT NULL</literal>
       is specified, an assignment of a null value results in a run-time
-      error. All variables declared as <literal>NOT NULL</>
+      error. All variables declared as <literal>NOT NULL</literal>
       must have a nonnull default value specified.
-      Equal (<literal>=</>) can be used instead of PL/SQL-compliant
-      <literal>:=</>.
+      Equal (<literal>=</literal>) can be used instead of PL/SQL-compliant
+      <literal>:=</literal>.
      </para>
 
      <para>
@@ -428,9 +431,9 @@ $$ LANGUAGE plpgsql;
     <note>
      <para>
       These two examples are not perfectly equivalent.  In the first case,
-      <literal>subtotal</> could be referenced as
-      <literal>sales_tax.subtotal</>, but in the second case it could not.
-      (Had we attached a label to the inner block, <literal>subtotal</> could
+      <literal>subtotal</literal> could be referenced as
+      <literal>sales_tax.subtotal</literal>, but in the second case it could not.
+      (Had we attached a label to the inner block, <literal>subtotal</literal> could
       be qualified with that label, instead.)
      </para>
     </note>
@@ -474,7 +477,7 @@ END;
 $$ LANGUAGE plpgsql;
 </programlisting>
 
-      Notice that we omitted <literal>RETURNS real</> &mdash; we could have
+      Notice that we omitted <literal>RETURNS real</literal> &mdash; we could have
       included it, but it would be redundant.
      </para>
 
@@ -491,15 +494,15 @@ END;
 $$ LANGUAGE plpgsql;
 </programlisting>
 
-      As discussed in <xref linkend="xfunc-output-parameters">, this
+      As discussed in <xref linkend="xfunc-output-parameters"/>, this
       effectively creates an anonymous record type for the function's
-      results.  If a <literal>RETURNS</> clause is given, it must say
-      <literal>RETURNS record</>.
+      results.  If a <literal>RETURNS</literal> clause is given, it must say
+      <literal>RETURNS record</literal>.
      </para>
 
      <para>
       Another way to declare a <application>PL/pgSQL</application> function
-      is with <literal>RETURNS TABLE</>, for example:
+      is with <literal>RETURNS TABLE</literal>, for example:
 
 <programlisting>
 CREATE FUNCTION extended_sales(p_itemno int)
@@ -511,9 +514,9 @@ END;
 $$ LANGUAGE plpgsql;
 </programlisting>
 
-      This is exactly equivalent to declaring one or more <literal>OUT</>
+      This is exactly equivalent to declaring one or more <literal>OUT</literal>
       parameters and specifying <literal>RETURNS SETOF
-      <replaceable>sometype</></literal>.
+      <replaceable>sometype</replaceable></literal>.
      </para>
 
      <para>
@@ -523,14 +526,14 @@ $$ LANGUAGE plpgsql;
       or <type>anyrange</type>), a special parameter <literal>$0</literal>
       is created.  Its data type is the actual return type of the function,
       as deduced from the actual input types (see <xref
-      linkend="extend-types-polymorphic">).
+      linkend="extend-types-polymorphic"/>).
       This allows the function to access its actual return type
-      as shown in <xref linkend="plpgsql-declaration-type">.
+      as shown in <xref linkend="plpgsql-declaration-type"/>.
       <literal>$0</literal> is initialized to null and can be modified by
       the function, so it can be used to hold the return value if desired,
       though that is not required.  <literal>$0</literal> can also be
       given an alias.  For example, this function works on any data type
-      that has a <literal>+</> operator:
+      that has a <literal>+</literal> operator:
 
 <programlisting>
 CREATE FUNCTION add_three_values(v1 anyelement, v2 anyelement, v3 anyelement)
@@ -564,14 +567,14 @@ $$ LANGUAGE plpgsql;
     </sect2>
 
   <sect2 id="plpgsql-declaration-alias">
-   <title><literal>ALIAS</></title>
+   <title><literal>ALIAS</literal></title>
 
 <synopsis>
-<replaceable>newname</> ALIAS FOR <replaceable>oldname</>;
+<replaceable>newname</replaceable> ALIAS FOR <replaceable>oldname</replaceable>;
 </synopsis>
 
    <para>
-    The <literal>ALIAS</> syntax is more general than is suggested in the
+    The <literal>ALIAS</literal> syntax is more general than is suggested in the
     previous section: you can declare an alias for any variable, not just
     function parameters.  The main practical use for this is to assign
     a different name for variables with predetermined names, such as
@@ -589,7 +592,7 @@ DECLARE
    </para>
 
    <para>
-    Since <literal>ALIAS</> creates two different ways to name the same
+    Since <literal>ALIAS</literal> creates two different ways to name the same
     object, unrestricted use can be confusing.  It's best to use it only
     for the purpose of overriding predetermined names.
    </para>
@@ -608,7 +611,7 @@ DECLARE
     database values. For example, let's say you have a column named
     <literal>user_id</literal> in your <literal>users</literal>
     table. To declare a variable with the same data type as
-    <literal>users.user_id</> you write:
+    <literal>users.user_id</literal> you write:
 <programlisting>
 user_id users.user_id%TYPE;
 </programlisting>
@@ -618,7 +621,7 @@ user_id users.user_id%TYPE;
     By using <literal>%TYPE</literal> you don't need to know the data
     type of the structure you are referencing, and most importantly,
     if the data type of the referenced item changes in the future (for
-    instance: you change the type of <literal>user_id</>
+    instance: you change the type of <literal>user_id</literal>
     from <type>integer</type> to <type>real</type>), you might not need
     to change your function definition.
    </para>
@@ -642,9 +645,9 @@ user_id users.user_id%TYPE;
 </synopsis>
 
    <para>
-    A variable of a composite type is called a <firstterm>row</>
-    variable (or <firstterm>row-type</> variable).  Such a variable
-    can hold a whole row of a <command>SELECT</> or <command>FOR</>
+    A variable of a composite type is called a <firstterm>row</firstterm>
+    variable (or <firstterm>row-type</firstterm> variable).  Such a variable
+    can hold a whole row of a <command>SELECT</command> or <command>FOR</command>
     query result, so long as that query's column set matches the
     declared type of the variable.
     The individual fields of the row value
@@ -658,7 +661,7 @@ user_id users.user_id%TYPE;
     <replaceable>table_name</replaceable><literal>%ROWTYPE</literal>
     notation; or it can be declared by giving a composite type's name.
     (Since every table has an associated composite type of the same name,
-    it actually does not matter in <productname>PostgreSQL</> whether you
+    it actually does not matter in <productname>PostgreSQL</productname> whether you
     write <literal>%ROWTYPE</literal> or not.  But the form with
     <literal>%ROWTYPE</literal> is more portable.)
    </para>
@@ -666,21 +669,13 @@ user_id users.user_id%TYPE;
    <para>
     Parameters to a function can be
     composite types (complete table rows). In that case, the
-    corresponding identifier <literal>$<replaceable>n</replaceable></> will be a row variable, and fields can
+    corresponding identifier <literal>$<replaceable>n</replaceable></literal> will be a row variable, and fields can
     be selected from it, for example <literal>$1.user_id</literal>.
    </para>
 
    <para>
-    Only the user-defined columns of a table row are accessible in a
-    row-type variable, not the OID or other system columns (because the
-    row could be from a view).  The fields of the row type inherit the
-    table's field size or precision for data types such as
-    <type>char(<replaceable>n</>)</type>.
-   </para>
-
-   <para>
-    Here is an example of using composite types.  <structname>table1</>
-    and <structname>table2</> are existing tables having at least the
+    Here is an example of using composite types.  <structname>table1</structname>
+    and <structname>table2</structname> are existing tables having at least the
     mentioned fields:
 
 <programlisting>
@@ -708,7 +703,7 @@ SELECT merge_fields(t.*) FROM table1 t WHERE ... ;
    <para>
     Record variables are similar to row-type variables, but they have no
     predefined structure.  They take on the actual row structure of the
-    row they are assigned during a <command>SELECT</> or <command>FOR</> command.  The substructure
+    row they are assigned during a <command>SELECT</command> or <command>FOR</command> command.  The substructure
     of a record variable can change each time it is assigned to.
     A consequence of this is that until a record variable is first assigned
     to, it has no substructure, and any attempt to access a
@@ -716,13 +711,13 @@ SELECT merge_fields(t.*) FROM table1 t WHERE ... ;
    </para>
 
    <para>
-    Note that <literal>RECORD</> is not a true data type, only a placeholder.
+    Note that <literal>RECORD</literal> is not a true data type, only a placeholder.
     One should also realize that when a <application>PL/pgSQL</application>
-    function is declared to return type <type>record</>, this is not quite the
+    function is declared to return type <type>record</type>, this is not quite the
     same concept as a record variable, even though such a function might
     use a record variable to hold its result.  In both cases the actual row
     structure is unknown when the function is written, but for a function
-    returning <type>record</> the actual structure is determined when the
+    returning <type>record</type> the actual structure is determined when the
     calling query is parsed, whereas a record variable can change its row
     structure on-the-fly.
    </para>
@@ -732,15 +727,15 @@ SELECT merge_fields(t.*) FROM table1 t WHERE ... ;
    <title>Collation of <application>PL/pgSQL</application> Variables</title>
 
    <indexterm>
-    <primary>collation</>
-    <secondary>in PL/pgSQL</>
+    <primary>collation</primary>
+    <secondary>in PL/pgSQL</secondary>
    </indexterm>
 
    <para>
     When a <application>PL/pgSQL</application> function has one or more
     parameters of collatable data types, a collation is identified for each
     function call depending on the collations assigned to the actual
-    arguments, as described in <xref linkend="collation">.  If a collation is
+    arguments, as described in <xref linkend="collation"/>.  If a collation is
     successfully identified (i.e., there are no conflicts of implicit
     collations among the arguments) then all the collatable parameters are
     treated as having that collation implicitly.  This will affect the
@@ -758,9 +753,9 @@ SELECT less_than(text_field_1, text_field_2) FROM table1;
 SELECT less_than(text_field_1, text_field_2 COLLATE "C") FROM table1;
 </programlisting>
 
-    The first use of <function>less_than</> will use the common collation
-    of <structfield>text_field_1</> and <structfield>text_field_2</> for
-    the comparison, while the second use will use <literal>C</> collation.
+    The first use of <function>less_than</function> will use the common collation
+    of <structfield>text_field_1</structfield> and <structfield>text_field_2</structfield> for
+    the comparison, while the second use will use <literal>C</literal> collation.
    </para>
 
    <para>
@@ -790,7 +785,7 @@ $$ LANGUAGE plpgsql;
 
    <para>
     A local variable of a collatable data type can have a different collation
-    associated with it by including the <literal>COLLATE</> option in its
+    associated with it by including the <literal>COLLATE</literal> option in its
     declaration, for example
 
 <programlisting>
@@ -803,7 +798,7 @@ DECLARE
    </para>
 
    <para>
-    Also, of course explicit <literal>COLLATE</> clauses can be written inside
+    Also, of course explicit <literal>COLLATE</literal> clauses can be written inside
     a function if it is desired to force a particular collation to be used in
     a particular operation.  For example,
 
@@ -838,30 +833,30 @@ IF <replaceable>expression</replaceable> THEN ...
 <synopsis>
 SELECT <replaceable>expression</replaceable>
 </synopsis>
-     to the main SQL engine.  While forming the <command>SELECT</> command,
+     to the main SQL engine.  While forming the <command>SELECT</command> command,
      any occurrences of <application>PL/pgSQL</application> variable names
      are replaced by parameters, as discussed in detail in
-     <xref linkend="plpgsql-var-subst">.
+     <xref linkend="plpgsql-var-subst"/>.
      This allows the query plan for the <command>SELECT</command> to
      be prepared just once and then reused for subsequent
      evaluations with different values of the variables.  Thus, what
      really happens on first use of an expression is essentially a
-     <command>PREPARE</> command.  For example, if we have declared
-     two integer variables <literal>x</> and <literal>y</>, and we write
+     <command>PREPARE</command> command.  For example, if we have declared
+     two integer variables <literal>x</literal> and <literal>y</literal>, and we write
 <programlisting>
 IF x &lt; y THEN ...
 </programlisting>
      what happens behind the scenes is equivalent to
 <programlisting>
-PREPARE <replaceable>statement_name</>(integer, integer) AS SELECT $1 &lt; $2;
+PREPARE <replaceable>statement_name</replaceable>(integer, integer) AS SELECT $1 &lt; $2;
 </programlisting>
-     and then this prepared statement is <command>EXECUTE</>d for each
-     execution of the <command>IF</> statement, with the current values
+     and then this prepared statement is <command>EXECUTE</command>d for each
+     execution of the <command>IF</command> statement, with the current values
      of the <application>PL/pgSQL</application> variables supplied as
      parameter values.  Normally these details are
      not important to a <application>PL/pgSQL</application> user, but
      they are useful to know when trying to diagnose a problem.
-     More information appears in <xref linkend="plpgsql-plan-caching">.
+     More information appears in <xref linkend="plpgsql-plan-caching"/>.
     </para>
   </sect1>
 
@@ -874,8 +869,8 @@ PREPARE <replaceable>statement_name</>(integer, integer) AS SELECT $1 &lt; $2;
     <application>PL/pgSQL</application>.
     Anything not recognized as one of these statement types is presumed
     to be an SQL command and is sent to the main database engine to execute,
-    as described in <xref linkend="plpgsql-statements-sql-noresult">
-    and <xref linkend="plpgsql-statements-sql-onerow">.
+    as described in <xref linkend="plpgsql-statements-sql-noresult"/>
+    and <xref linkend="plpgsql-statements-sql-onerow"/>.
    </para>
 
    <sect2 id="plpgsql-statements-assignment">
@@ -888,20 +883,20 @@ PREPARE <replaceable>statement_name</>(integer, integer) AS SELECT $1 &lt; $2;
 <replaceable>variable</replaceable> { := | = } <replaceable>expression</replaceable>;
 </synopsis>
      As explained previously, the expression in such a statement is evaluated
-     by means of an SQL <command>SELECT</> command sent to the main
+     by means of an SQL <command>SELECT</command> command sent to the main
      database engine.  The expression must yield a single value (possibly
      a row value, if the variable is a row or record variable).  The target
      variable can be a simple variable (optionally qualified with a block
      name), a field of a row or record variable, or an element of an array
-     that is a simple variable or field.  Equal (<literal>=</>) can be
-     used instead of PL/SQL-compliant <literal>:=</>.
+     that is a simple variable or field.  Equal (<literal>=</literal>) can be
+     used instead of PL/SQL-compliant <literal>:=</literal>.
     </para>
 
     <para>
      If the expression's result data type doesn't match the variable's
      data type, the value will be coerced as though by an assignment cast
-     (see <xref linkend="typeconv-query">).  If no assignment cast is known
-     for the pair of data types involved, the <application>PL/pgSQL</>
+     (see <xref linkend="typeconv-query"/>).  If no assignment cast is known
+     for the pair of data types involved, the <application>PL/pgSQL</application>
      interpreter will attempt to convert the result value textually, that is
      by applying the result type's output function followed by the variable
      type's input function.  Note that this could result in run-time errors
@@ -923,7 +918,7 @@ my_record.user_id := 20;
 
     <para>
      For any SQL command that does not return rows, for example
-     <command>INSERT</> without a <literal>RETURNING</> clause, you can
+     <command>INSERT</command> without a <literal>RETURNING</literal> clause, you can
      execute the command within a <application>PL/pgSQL</application> function
      just by writing the command.
     </para>
@@ -933,18 +928,18 @@ my_record.user_id := 20;
      in the command text is treated as a parameter, and then the
      current value of the variable is provided as the parameter value
      at run time.  This is exactly like the processing described earlier
-     for expressions; for details see <xref linkend="plpgsql-var-subst">.
+     for expressions; for details see <xref linkend="plpgsql-var-subst"/>.
     </para>
 
     <para>
      When executing a SQL command in this way,
      <application>PL/pgSQL</application> may cache and re-use the execution
      plan for the command, as discussed in
-     <xref linkend="plpgsql-plan-caching">.
+     <xref linkend="plpgsql-plan-caching"/>.
     </para>
 
     <para>
-     Sometimes it is useful to evaluate an expression or <command>SELECT</>
+     Sometimes it is useful to evaluate an expression or <command>SELECT</command>
      query but discard the result, for example when calling a function
      that has side-effects but no useful result value.  To do
      this in <application>PL/pgSQL</application>, use the
@@ -956,9 +951,9 @@ PERFORM <replaceable>query</replaceable>;
 
      This executes <replaceable>query</replaceable> and discards the
      result.  Write the <replaceable>query</replaceable> the same
-     way you would write an SQL <command>SELECT</> command, but replace the
-     initial keyword <command>SELECT</> with <command>PERFORM</command>.
-     For <command>WITH</> queries, use <command>PERFORM</> and then
+     way you would write an SQL <command>SELECT</command> command, but replace the
+     initial keyword <command>SELECT</command> with <command>PERFORM</command>.
+     For <command>WITH</command> queries, use <command>PERFORM</command> and then
      place the query in parentheses.  (In this case, the query can only
      return one row.)
      <application>PL/pgSQL</application> variables will be
@@ -966,7 +961,7 @@ PERFORM <replaceable>query</replaceable>;
      and the plan is cached in the same way.  Also, the special variable
      <literal>FOUND</literal> is set to true if the query produced at
      least one row, or false if it produced no rows (see
-     <xref linkend="plpgsql-statements-diagnostics">).
+     <xref linkend="plpgsql-statements-diagnostics"/>).
     </para>
 
     <note>
@@ -976,7 +971,7 @@ PERFORM <replaceable>query</replaceable>;
       present the only accepted way to do it is
       <command>PERFORM</command>.  A SQL command that can return rows,
       such as <command>SELECT</command>, will be rejected as an error
-      unless it has an <literal>INTO</> clause as discussed in the
+      unless it has an <literal>INTO</literal> clause as discussed in the
       next section.
      </para>
     </note>
@@ -1006,7 +1001,7 @@ PERFORM create_mv('cs_session_page_requests_mv', my_query);
      The result of a SQL command yielding a single row (possibly of multiple
      columns) can be assigned to a record variable, row-type variable, or list
      of scalar variables.  This is done by writing the base SQL command and
-     adding an <literal>INTO</> clause.  For example,
+     adding an <literal>INTO</literal> clause.  For example,
 
 <synopsis>
 SELECT <replaceable>select_expressions</replaceable> INTO <optional>STRICT</optional> <replaceable>target</replaceable> FROM ...;
@@ -1021,21 +1016,21 @@ DELETE ... RETURNING <replaceable>expressions</replaceable> INTO <optional>STRIC
      <application>PL/pgSQL</application> variables will be
      substituted into the rest of the query, and the plan is cached,
      just as described above for commands that do not return rows.
-     This works for <command>SELECT</>,
-     <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> with
-     <literal>RETURNING</>, and utility commands that return row-set
-     results (such as <command>EXPLAIN</>).
-     Except for the <literal>INTO</> clause, the SQL command is the same
+     This works for <command>SELECT</command>,
+     <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> with
+     <literal>RETURNING</literal>, and utility commands that return row-set
+     results (such as <command>EXPLAIN</command>).
+     Except for the <literal>INTO</literal> clause, the SQL command is the same
      as it would be written outside <application>PL/pgSQL</application>.
     </para>
 
    <tip>
     <para>
-     Note that this interpretation of <command>SELECT</> with <literal>INTO</>
-     is quite different from <productname>PostgreSQL</>'s regular
-     <command>SELECT INTO</command> command, wherein the <literal>INTO</>
+     Note that this interpretation of <command>SELECT</command> with <literal>INTO</literal>
+     is quite different from <productname>PostgreSQL</productname>'s regular
+     <command>SELECT INTO</command> command, wherein the <literal>INTO</literal>
      target is a newly created table.  If you want to create a table from a
-     <command>SELECT</> result inside a
+     <command>SELECT</command> result inside a
      <application>PL/pgSQL</application> function, use the syntax
      <command>CREATE TABLE ... AS SELECT</command>.
     </para>
@@ -1050,24 +1045,24 @@ DELETE ... RETURNING <replaceable>expressions</replaceable> INTO <optional>STRIC
     </para>
 
     <para>
-     The <literal>INTO</> clause can appear almost anywhere in the SQL
+     The <literal>INTO</literal> clause can appear almost anywhere in the SQL
      command.  Customarily it is written either just before or just after
      the list of <replaceable>select_expressions</replaceable> in a
-     <command>SELECT</> command, or at the end of the command for other
+     <command>SELECT</command> command, or at the end of the command for other
      command types.  It is recommended that you follow this convention
      in case the <application>PL/pgSQL</application> parser becomes
      stricter in future versions.
     </para>
 
     <para>
-     If <literal>STRICT</literal> is not specified in the <literal>INTO</>
+     If <literal>STRICT</literal> is not specified in the <literal>INTO</literal>
      clause, then <replaceable>target</replaceable> will be set to the first
      row returned by the query, or to nulls if the query returned no rows.
-     (Note that <quote>the first row</> is not
-     well-defined unless you've used <literal>ORDER BY</>.)  Any result rows
+     (Note that <quote>the first row</quote> is not
+     well-defined unless you've used <literal>ORDER BY</literal>.)  Any result rows
      after the first row are discarded.
      You can check the special <literal>FOUND</literal> variable (see
-     <xref linkend="plpgsql-statements-diagnostics">) to
+     <xref linkend="plpgsql-statements-diagnostics"/>) to
      determine whether a row was returned:
 
 <programlisting>
@@ -1079,7 +1074,7 @@ END IF;
 
      If the <literal>STRICT</literal> option is specified, the query must
      return exactly one row or a run-time error will be reported, either
-     <literal>NO_DATA_FOUND</> (no rows) or <literal>TOO_MANY_ROWS</>
+     <literal>NO_DATA_FOUND</literal> (no rows) or <literal>TOO_MANY_ROWS</literal>
      (more than one row). You can use an exception block if you wish
      to catch the error, for example:
 
@@ -1093,28 +1088,28 @@ BEGIN
             RAISE EXCEPTION 'employee % not unique', myname;
 END;
 </programlisting>
-     Successful execution of a command with <literal>STRICT</>
+     Successful execution of a command with <literal>STRICT</literal>
      always sets <literal>FOUND</literal> to true.
     </para>
 
     <para>
-     For <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> with
-     <literal>RETURNING</>, <application>PL/pgSQL</application> reports
+     For <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> with
+     <literal>RETURNING</literal>, <application>PL/pgSQL</application> reports
      an error for more than one returned row, even when
      <literal>STRICT</literal> is not specified.  This is because there
-     is no option such as <literal>ORDER BY</> with which to determine
+     is no option such as <literal>ORDER BY</literal> with which to determine
      which affected row should be returned.
     </para>
 
     <para>
-     If <literal>print_strict_params</> is enabled for the function,
+     If <literal>print_strict_params</literal> is enabled for the function,
      then when an error is thrown because the requirements
-     of <literal>STRICT</> are not met, the <literal>DETAIL</> part of
+     of <literal>STRICT</literal> are not met, the <literal>DETAIL</literal> part of
      the error message will include information about the parameters
      passed to the query.
-     You can change the <literal>print_strict_params</>
+     You can change the <literal>print_strict_params</literal>
      setting for all functions by setting
-     <varname>plpgsql.print_strict_params</>, though only subsequent
+     <varname>plpgsql.print_strict_params</varname>, though only subsequent
      function compilations will be affected.  You can also enable it
      on a per-function basis by using a compiler option, for example:
 <programlisting>
@@ -1140,14 +1135,14 @@ CONTEXT:  PL/pgSQL function get_userid(text) line 6 at SQL statement
 
     <note>
      <para>
-      The <literal>STRICT</> option matches the behavior of
+      The <literal>STRICT</literal> option matches the behavior of
       Oracle PL/SQL's <command>SELECT INTO</command> and related statements.
      </para>
     </note>
 
     <para>
      To handle cases where you need to process multiple result rows
-     from a SQL query, see <xref linkend="plpgsql-records-iterating">.
+     from a SQL query, see <xref linkend="plpgsql-records-iterating"/>.
     </para>
 
    </sect2>
@@ -1161,7 +1156,7 @@ CONTEXT:  PL/pgSQL function get_userid(text) line 6 at SQL statement
      that will involve different tables or different data types each
      time they are executed.  <application>PL/pgSQL</application>'s
      normal attempts to cache plans for commands (as discussed in
-     <xref linkend="plpgsql-plan-caching">) will not work in such
+     <xref linkend="plpgsql-plan-caching"/>) will not work in such
      scenarios.  To handle this sort of problem, the
      <command>EXECUTE</command> statement is provided:
 
@@ -1174,12 +1169,12 @@ EXECUTE <replaceable class="command">command-string</replaceable> <optional> INT
      command to be executed.  The optional <replaceable>target</replaceable>
      is a record variable, a row variable, or a comma-separated list of
      simple variables and record/row fields, into which the results of
-     the command will be stored.  The optional <literal>USING</> expressions
+     the command will be stored.  The optional <literal>USING</literal> expressions
      supply values to be inserted into the command.
     </para>
 
     <para>
-     No substitution of <application>PL/pgSQL</> variables is done on the
+     No substitution of <application>PL/pgSQL</application> variables is done on the
      computed command string.  Any required variable values must be inserted
      in the command string as it is constructed; or you can use parameters
      as described below.
@@ -1207,14 +1202,14 @@ EXECUTE <replaceable class="command">command-string</replaceable> <optional> INT
     </para>
 
     <para>
-     If the <literal>STRICT</> option is given, an error is reported
+     If the <literal>STRICT</literal> option is given, an error is reported
      unless the query produces exactly one row.
     </para>
 
     <para>
      The command string can use parameter values, which are referenced
-     in the command as <literal>$1</>, <literal>$2</>, etc.
-     These symbols refer to values supplied in the <literal>USING</>
+     in the command as <literal>$1</literal>, <literal>$2</literal>, etc.
+     These symbols refer to values supplied in the <literal>USING</literal>
      clause.  This method is often preferable to inserting data values
      into the command string as text: it avoids run-time overhead of
      converting the values to text and back, and it is much less prone
@@ -1240,7 +1235,7 @@ EXECUTE 'SELECT count(*) FROM '
    INTO c
    USING checked_user, checked_date;
 </programlisting>
-     A cleaner approach is to use <function>format()</>'s <literal>%I</>
+     A cleaner approach is to use <function>format()</function>'s <literal>%I</literal>
      specification for table or column names (strings separated by a
      newline are concatenated):
 <programlisting>
@@ -1250,32 +1245,32 @@ EXECUTE format('SELECT count(*) FROM %I '
    USING checked_user, checked_date;
 </programlisting>
      Another restriction on parameter symbols is that they only work in
-     <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>, and
-     <command>DELETE</> commands.  In other statement
+     <command>SELECT</command>, <command>INSERT</command>, <command>UPDATE</command>, and
+     <command>DELETE</command> commands.  In other statement
      types (generically called utility statements), you must insert
      values textually even if they are just data values.
     </para>
 
     <para>
-     An <command>EXECUTE</> with a simple constant command string and some
-     <literal>USING</> parameters, as in the first example above, is
+     An <command>EXECUTE</command> with a simple constant command string and some
+     <literal>USING</literal> parameters, as in the first example above, is
      functionally equivalent to just writing the command directly in
      <application>PL/pgSQL</application> and allowing replacement of
      <application>PL/pgSQL</application> variables to happen automatically.
-     The important difference is that <command>EXECUTE</> will re-plan
+     The important difference is that <command>EXECUTE</command> will re-plan
      the command on each execution, generating a plan that is specific
      to the current parameter values; whereas
      <application>PL/pgSQL</application> may otherwise create a generic plan
      and cache it for re-use.  In situations where the best plan depends
      strongly on the parameter values, it can be helpful to use
-     <command>EXECUTE</> to positively ensure that a generic plan is not
+     <command>EXECUTE</command> to positively ensure that a generic plan is not
      selected.
     </para>
 
     <para>
      <command>SELECT INTO</command> is not currently supported within
-     <command>EXECUTE</command>; instead, execute a plain <command>SELECT</>
-     command and specify <literal>INTO</> as part of the <command>EXECUTE</>
+     <command>EXECUTE</command>; instead, execute a plain <command>SELECT</command>
+     command and specify <literal>INTO</literal> as part of the <command>EXECUTE</command>
      itself.
     </para>
 
@@ -1283,11 +1278,11 @@ EXECUTE format('SELECT count(*) FROM %I '
     <para>
      The <application>PL/pgSQL</application>
      <command>EXECUTE</command> statement is not related to the
-     <xref linkend="sql-execute"> SQL
+     <xref linkend="sql-execute"/> SQL
      statement supported by the
      <productname>PostgreSQL</productname> server. The server's
      <command>EXECUTE</command> statement cannot be used directly within
-     <application>PL/pgSQL</> functions (and is not needed).
+     <application>PL/pgSQL</application> functions (and is not needed).
     </para>
    </note>
 
@@ -1319,14 +1314,14 @@ EXECUTE format('SELECT count(*) FROM %I '
      of single quotes.  The recommended method for quoting fixed text in your
      function body is dollar quoting.  (If you have legacy code that does
      not use dollar quoting, please refer to the
-     overview in <xref linkend="plpgsql-quote-tips">, which can save you
+     overview in <xref linkend="plpgsql-quote-tips"/>, which can save you
      some effort when translating said code to a more reasonable scheme.)
     </para>
 
     <para>
      Dynamic values require careful handling since they might contain
      quote characters.
-     An example using <function>format()</> (this assumes that you are
+     An example using <function>format()</function> (this assumes that you are
      dollar quoting the function body so quote marks need not be doubled):
 <programlisting>
 EXECUTE format('UPDATE tbl SET %I = $1 '
@@ -1347,11 +1342,11 @@ EXECUTE 'UPDATE tbl SET '
      This example demonstrates the use of the
      <function>quote_ident</function> and
      <function>quote_literal</function> functions (see <xref
-     linkend="functions-string">).  For safety, expressions containing column
+     linkend="functions-string"/>).  For safety, expressions containing column
      or table identifiers should be passed through
      <function>quote_ident</function> before insertion in a dynamic query.
      Expressions containing values that should be literal strings in the
-     constructed command should be passed through <function>quote_literal</>.
+     constructed command should be passed through <function>quote_literal</function>.
      These functions take the appropriate steps to return the input text
      enclosed in double or single quotes respectively, with any embedded
      special characters properly escaped.
@@ -1360,12 +1355,12 @@ EXECUTE 'UPDATE tbl SET '
     <para>
      Because <function>quote_literal</function> is labeled
      <literal>STRICT</literal>, it will always return null when called with a
-     null argument.  In the above example, if <literal>newvalue</> or
-     <literal>keyvalue</> were null, the entire dynamic query string would
+     null argument.  In the above example, if <literal>newvalue</literal> or
+     <literal>keyvalue</literal> were null, the entire dynamic query string would
      become null, leading to an error from <command>EXECUTE</command>.
-     You can avoid this problem by using the <function>quote_nullable</>
-     function, which works the same as <function>quote_literal</> except that
-     when called with a null argument it returns the string <literal>NULL</>.
+     You can avoid this problem by using the <function>quote_nullable</function>
+     function, which works the same as <function>quote_literal</function> except that
+     when called with a null argument it returns the string <literal>NULL</literal>.
      For example,
 <programlisting>
 EXECUTE 'UPDATE tbl SET '
@@ -1376,26 +1371,26 @@ EXECUTE 'UPDATE tbl SET '
         || quote_nullable(keyvalue);
 </programlisting>
      If you are dealing with values that might be null, you should usually
-     use <function>quote_nullable</> in place of <function>quote_literal</>.
+     use <function>quote_nullable</function> in place of <function>quote_literal</function>.
     </para>
 
     <para>
      As always, care must be taken to ensure that null values in a query do
-     not deliver unintended results.  For example the <literal>WHERE</> clause
+     not deliver unintended results.  For example the <literal>WHERE</literal> clause
 <programlisting>
 'WHERE key = ' || quote_nullable(keyvalue)
 </programlisting>
-     will never succeed if <literal>keyvalue</> is null, because the
-     result of using the equality operator <literal>=</> with a null operand
+     will never succeed if <literal>keyvalue</literal> is null, because the
+     result of using the equality operator <literal>=</literal> with a null operand
      is always null.  If you wish null to work like an ordinary key value,
      you would need to rewrite the above as
 <programlisting>
 'WHERE key IS NOT DISTINCT FROM ' || quote_nullable(keyvalue)
 </programlisting>
-     (At present, <literal>IS NOT DISTINCT FROM</> is handled much less
-     efficiently than <literal>=</>, so don't do this unless you must.
-     See <xref linkend="functions-comparison"> for
-     more information on nulls and <literal>IS DISTINCT</>.)
+     (At present, <literal>IS NOT DISTINCT FROM</literal> is handled much less
+     efficiently than <literal>=</literal>, so don't do this unless you must.
+     See <xref linkend="functions-comparison"/> for
+     more information on nulls and <literal>IS DISTINCT</literal>.)
     </para>
 
     <para>
@@ -1409,24 +1404,24 @@ EXECUTE 'UPDATE tbl SET '
         || '$$ WHERE key = '
         || quote_literal(keyvalue);
 </programlisting>
-     because it would break if the contents of <literal>newvalue</>
-     happened to contain <literal>$$</>.  The same objection would
+     because it would break if the contents of <literal>newvalue</literal>
+     happened to contain <literal>$$</literal>.  The same objection would
      apply to any other dollar-quoting delimiter you might pick.
      So, to safely quote text that is not known in advance, you
-     <emphasis>must</> use <function>quote_literal</>,
-     <function>quote_nullable</>, or <function>quote_ident</>, as appropriate.
+     <emphasis>must</emphasis> use <function>quote_literal</function>,
+     <function>quote_nullable</function>, or <function>quote_ident</function>, as appropriate.
     </para>
 
     <para>
      Dynamic SQL statements can also be safely constructed using the
      <function>format</function> function (see <xref
-     linkend="functions-string">). For example:
+     linkend="functions-string"/>). For example:
 <programlisting>
 EXECUTE format('UPDATE tbl SET %I = %L '
    'WHERE key = %L', colname, newvalue, keyvalue);
 </programlisting>
-     <literal>%I</> is equivalent to <function>quote_ident</>, and
-     <literal>%L</> is equivalent to <function>quote_nullable</function>.
+     <literal>%I</literal> is equivalent to <function>quote_ident</function>, and
+     <literal>%L</literal> is equivalent to <function>quote_nullable</function>.
      The <function>format</function> function can be used in conjunction with
      the <literal>USING</literal> clause:
 <programlisting>
@@ -1435,15 +1430,15 @@ EXECUTE format('UPDATE tbl SET %I = $1 WHERE key = $2', colname)
 </programlisting>
      This form is better because the variables are handled in their native
      data type format, rather than unconditionally converting them to
-     text and quoting them via <literal>%L</>.  It is also more efficient.
+     text and quoting them via <literal>%L</literal>.  It is also more efficient.
     </para>
    </example>
 
     <para>
      A much larger example of a dynamic command and
      <command>EXECUTE</command> can be seen in <xref
-     linkend="plpgsql-porting-ex2">, which builds and executes a
-     <command>CREATE FUNCTION</> command to define a new function.
+     linkend="plpgsql-porting-ex2"/>, which builds and executes a
+     <command>CREATE FUNCTION</command> command to define a new function.
     </para>
    </sect2>
 
@@ -1460,14 +1455,14 @@ GET <optional> CURRENT </optional> DIAGNOSTICS <replaceable>variable</replaceabl
 </synopsis>
 
      This command allows retrieval of system status indicators.
-     <literal>CURRENT</> is a noise word (but see also <command>GET STACKED
-     DIAGNOSTICS</command> in <xref linkend="plpgsql-exception-diagnostics">).
+     <literal>CURRENT</literal> is a noise word (but see also <command>GET STACKED
+     DIAGNOSTICS</command> in <xref linkend="plpgsql-exception-diagnostics"/>).
      Each <replaceable>item</replaceable> is a key word identifying a status
      value to be assigned to the specified <replaceable>variable</replaceable>
      (which should be of the right data type to receive it).  The currently
      available status items are shown
-     in <xref linkend="plpgsql-current-diagnostics-values">.  Colon-equal
-     (<literal>:=</>) can be used instead of the SQL-standard <literal>=</>
+     in <xref linkend="plpgsql-current-diagnostics-values"/>.  Colon-equal
+     (<literal>:=</literal>) can be used instead of the SQL-standard <literal>=</literal>
      token.  An example:
 <programlisting>
 GET DIAGNOSTICS integer_var = ROW_COUNT;
@@ -1487,13 +1482,13 @@ GET DIAGNOSTICS integer_var = ROW_COUNT;
        <tbody>
         <row>
          <entry><varname>ROW_COUNT</varname></entry>
-         <entry><type>bigint</></entry>
+         <entry><type>bigint</type></entry>
          <entry>the number of rows processed by the most
           recent <acronym>SQL</acronym> command</entry>
         </row>
         <row>
          <entry><varname>RESULT_OID</varname></entry>
-         <entry><type>oid</></entry>
+         <entry><type>oid</type></entry>
          <entry>the OID of the last row inserted by the most
           recent <acronym>SQL</acronym> command (only useful after
           an <command>INSERT</command> command into a table having
@@ -1501,9 +1496,9 @@ GET DIAGNOSTICS integer_var = ROW_COUNT;
         </row>
         <row>
          <entry><literal>PG_CONTEXT</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>line(s) of text describing the current call stack
-          (see <xref linkend="plpgsql-call-stack">)</entry>
+          (see <xref linkend="plpgsql-call-stack"/>)</entry>
         </row>
        </tbody>
       </tgroup>
@@ -1526,33 +1521,33 @@ GET DIAGNOSTICS integer_var = ROW_COUNT;
           </listitem>
           <listitem>
            <para>
-            A <command>PERFORM</> statement sets <literal>FOUND</literal>
+            A <command>PERFORM</command> statement sets <literal>FOUND</literal>
             true if it produces (and discards) one or more rows, false if
             no row is produced.
            </para>
           </listitem>
           <listitem>
            <para>
-            <command>UPDATE</>, <command>INSERT</>, and <command>DELETE</>
+            <command>UPDATE</command>, <command>INSERT</command>, and <command>DELETE</command>
             statements set <literal>FOUND</literal> true if at least one
             row is affected, false if no row is affected.
            </para>
           </listitem>
           <listitem>
            <para>
-            A <command>FETCH</> statement sets <literal>FOUND</literal>
+            A <command>FETCH</command> statement sets <literal>FOUND</literal>
             true if it returns a row, false if no row is returned.
            </para>
           </listitem>
           <listitem>
            <para>
-            A <command>MOVE</> statement sets <literal>FOUND</literal>
+            A <command>MOVE</command> statement sets <literal>FOUND</literal>
             true if it successfully repositions the cursor, false otherwise.
            </para>
           </listitem>
           <listitem>
            <para>
-            A <command>FOR</> or <command>FOREACH</> statement sets
+            A <command>FOR</command> or <command>FOREACH</command> statement sets
             <literal>FOUND</literal> true
             if it iterates one or more times, else false.
             <literal>FOUND</literal> is set this way when the
@@ -1625,7 +1620,7 @@ END;
     <note>
      <para>
       In Oracle's PL/SQL, empty statement lists are not allowed, and so
-      <command>NULL</> statements are <emphasis>required</> for situations
+      <command>NULL</command> statements are <emphasis>required</emphasis> for situations
       such as this.  <application>PL/pgSQL</application> allows you to
       just write nothing, instead.
      </para>
@@ -1639,9 +1634,9 @@ END;
 
    <para>
     Control structures are probably the most useful (and
-    important) part of <application>PL/pgSQL</>. With
-    <application>PL/pgSQL</>'s control structures,
-    you can manipulate <productname>PostgreSQL</> data in a very
+    important) part of <application>PL/pgSQL</application>. With
+    <application>PL/pgSQL</application>'s control structures,
+    you can manipulate <productname>PostgreSQL</productname> data in a very
     flexible and powerful way.
    </para>
 
@@ -1655,7 +1650,7 @@ END;
     </para>
 
     <sect3>
-     <title><command>RETURN</></title>
+     <title><command>RETURN</command></title>
 
 <synopsis>
 RETURN <replaceable>expression</replaceable>;
@@ -1665,7 +1660,7 @@ RETURN <replaceable>expression</replaceable>;
       <command>RETURN</command> with an expression terminates the
       function and returns the value of
       <replaceable>expression</replaceable> to the caller.  This form
-      is used for <application>PL/pgSQL</> functions that do
+      is used for <application>PL/pgSQL</application> functions that do
       not return a set.
      </para>
 
@@ -1716,7 +1711,7 @@ RETURN (1, 2, 'three'::text);  -- must cast columns to correct types
     </sect3>
 
     <sect3>
-     <title><command>RETURN NEXT</> and <command>RETURN QUERY</command></title>
+     <title><command>RETURN NEXT</command> and <command>RETURN QUERY</command></title>
     <indexterm>
      <primary>RETURN NEXT</primary>
      <secondary>in PL/pgSQL</secondary>
@@ -1733,8 +1728,8 @@ RETURN QUERY EXECUTE <replaceable class="command">command-string</replaceable> <
 </synopsis>
 
      <para>
-      When a <application>PL/pgSQL</> function is declared to return
-      <literal>SETOF <replaceable>sometype</></literal>, the procedure
+      When a <application>PL/pgSQL</application> function is declared to return
+      <literal>SETOF <replaceable>sometype</replaceable></literal>, the procedure
       to follow is slightly different.  In that case, the individual
       items to return are specified by a sequence of <command>RETURN
       NEXT</command> or <command>RETURN QUERY</command> commands, and
@@ -1755,7 +1750,7 @@ RETURN QUERY EXECUTE <replaceable class="command">command-string</replaceable> <
       QUERY</command> do not actually return from the function &mdash;
       they simply append zero or more rows to the function's result
       set.  Execution then continues with the next statement in the
-      <application>PL/pgSQL</> function.  As successive
+      <application>PL/pgSQL</application> function.  As successive
       <command>RETURN NEXT</command> or <command>RETURN
       QUERY</command> commands are executed, the result set is built
       up.  A final <command>RETURN</command>, which should have no
@@ -1767,8 +1762,8 @@ RETURN QUERY EXECUTE <replaceable class="command">command-string</replaceable> <
       <command>RETURN QUERY</command> has a variant
       <command>RETURN QUERY EXECUTE</command>, which specifies the
       query to be executed dynamically.  Parameter expressions can
-      be inserted into the computed query string via <literal>USING</>,
-      in just the same way as in the <command>EXECUTE</> command.
+      be inserted into the computed query string via <literal>USING</literal>,
+      in just the same way as in the <command>EXECUTE</command> command.
      </para>
 
      <para>
@@ -1778,9 +1773,9 @@ RETURN QUERY EXECUTE <replaceable class="command">command-string</replaceable> <
       variable(s) will be saved for eventual return as a row of the
       result.  Note that you must declare the function as returning
       <literal>SETOF record</literal> when there are multiple output
-      parameters, or <literal>SETOF <replaceable>sometype</></literal>
+      parameters, or <literal>SETOF <replaceable>sometype</replaceable></literal>
       when there is just one output parameter of type
-      <replaceable>sometype</>, in order to create a set-returning
+      <replaceable>sometype</replaceable>, in order to create a set-returning
       function with output parameters.
      </para>
 
@@ -1823,8 +1818,8 @@ $BODY$
 BEGIN
     RETURN QUERY SELECT flightid
                    FROM flight
-                  WHERE flightdate >= $1
-                    AND flightdate < ($1 + 1);
+                  WHERE flightdate &gt;= $1
+                    AND flightdate &lt; ($1 + 1);
 
     -- Since execution is not finished, we can check whether rows were returned
     -- and raise exception if not.
@@ -1848,15 +1843,15 @@ SELECT * FROM get_available_flightid(CURRENT_DATE);
        The current implementation of <command>RETURN NEXT</command>
        and <command>RETURN QUERY</command> stores the entire result set
        before returning from the function, as discussed above.  That
-       means that if a <application>PL/pgSQL</> function produces a
+       means that if a <application>PL/pgSQL</application> function produces a
        very large result set, performance might be poor: data will be
        written to disk to avoid memory exhaustion, but the function
        itself will not return until the entire result set has been
-       generated.  A future version of <application>PL/pgSQL</> might
+       generated.  A future version of <application>PL/pgSQL</application> might
        allow users to define set-returning functions
        that do not have this limitation.  Currently, the point at
        which data begins being written to disk is controlled by the
-       <xref linkend="guc-work-mem">
+       <xref linkend="guc-work-mem"/>
        configuration variable.  Administrators who have sufficient
        memory to store larger result sets in memory should consider
        increasing this parameter.
@@ -1865,38 +1860,50 @@ SELECT * FROM get_available_flightid(CURRENT_DATE);
     </sect3>
    </sect2>
 
+   <sect2 id="plpgsql-statements-returning-procedure">
+    <title>Returning From a Procedure</title>
+
+    <para>
+     A procedure does not have a return value.  A procedure can therefore end
+     without a <command>RETURN</command> statement.  If
+     a <command>RETURN</command> statement is desired to exit the code early,
+     then <symbol>NULL</symbol> must be returned.  Returning any other value
+     will result in an error.
+    </para>
+   </sect2>
+
    <sect2 id="plpgsql-conditionals">
     <title>Conditionals</title>
 
     <para>
-     <command>IF</> and <command>CASE</> statements let you execute
+     <command>IF</command> and <command>CASE</command> statements let you execute
      alternative commands based on certain conditions.
-     <application>PL/pgSQL</> has three forms of <command>IF</>:
+     <application>PL/pgSQL</application> has three forms of <command>IF</command>:
     <itemizedlist>
      <listitem>
-      <para><literal>IF ... THEN ... END IF</></>
+      <para><literal>IF ... THEN ... END IF</literal></para>
      </listitem>
      <listitem>
-      <para><literal>IF ... THEN ... ELSE ... END IF</></>
+      <para><literal>IF ... THEN ... ELSE ... END IF</literal></para>
      </listitem>
      <listitem>
-      <para><literal>IF ... THEN ... ELSIF ... THEN ... ELSE ... END IF</></>
+      <para><literal>IF ... THEN ... ELSIF ... THEN ... ELSE ... END IF</literal></para>
      </listitem>
     </itemizedlist>
 
-    and two forms of <command>CASE</>:
+    and two forms of <command>CASE</command>:
     <itemizedlist>
      <listitem>
-      <para><literal>CASE ... WHEN ... THEN ... ELSE ... END CASE</></>
+      <para><literal>CASE ... WHEN ... THEN ... ELSE ... END CASE</literal></para>
      </listitem>
      <listitem>
-      <para><literal>CASE WHEN ... THEN ... ELSE ... END CASE</></>
+      <para><literal>CASE WHEN ... THEN ... ELSE ... END CASE</literal></para>
      </listitem>
     </itemizedlist>
     </para>
 
     <sect3>
-     <title><literal>IF-THEN</></title>
+     <title><literal>IF-THEN</literal></title>
 
 <synopsis>
 IF <replaceable>boolean-expression</replaceable> THEN
@@ -1923,7 +1930,7 @@ END IF;
      </sect3>
 
      <sect3>
-      <title><literal>IF-THEN-ELSE</></title>
+      <title><literal>IF-THEN-ELSE</literal></title>
 
 <synopsis>
 IF <replaceable>boolean-expression</replaceable> THEN
@@ -1964,7 +1971,7 @@ END IF;
     </sect3>
 
      <sect3>
-      <title><literal>IF-THEN-ELSIF</></title>
+      <title><literal>IF-THEN-ELSIF</literal></title>
 
 <synopsis>
 IF <replaceable>boolean-expression</replaceable> THEN
@@ -1983,15 +1990,15 @@ END IF;
 
        <para>
         Sometimes there are more than just two alternatives.
-        <literal>IF-THEN-ELSIF</> provides a convenient
+        <literal>IF-THEN-ELSIF</literal> provides a convenient
         method of checking several alternatives in turn.
-        The <literal>IF</> conditions are tested successively
+        The <literal>IF</literal> conditions are tested successively
         until the first one that is true is found.  Then the
         associated statement(s) are executed, after which control
-        passes to the next statement after <literal>END IF</>.
-        (Any subsequent <literal>IF</> conditions are <emphasis>not</>
-        tested.)  If none of the <literal>IF</> conditions is true,
-        then the <literal>ELSE</> block (if any) is executed.
+        passes to the next statement after <literal>END IF</literal>.
+        (Any subsequent <literal>IF</literal> conditions are <emphasis>not</emphasis>
+        tested.)  If none of the <literal>IF</literal> conditions is true,
+        then the <literal>ELSE</literal> block (if any) is executed.
        </para>
 
        <para>
@@ -2012,8 +2019,8 @@ END IF;
        </para>
 
        <para>
-        The key word <literal>ELSIF</> can also be spelled
-        <literal>ELSEIF</>.
+        The key word <literal>ELSIF</literal> can also be spelled
+        <literal>ELSEIF</literal>.
        </para>
 
        <para>
@@ -2033,14 +2040,14 @@ END IF;
        </para>
 
        <para>
-        However, this method requires writing a matching <literal>END IF</>
-        for each <literal>IF</>, so it is much more cumbersome than
-        using <literal>ELSIF</> when there are many alternatives.
+        However, this method requires writing a matching <literal>END IF</literal>
+        for each <literal>IF</literal>, so it is much more cumbersome than
+        using <literal>ELSIF</literal> when there are many alternatives.
        </para>
      </sect3>
 
      <sect3>
-      <title>Simple <literal>CASE</></title>
+      <title>Simple <literal>CASE</literal></title>
 
 <synopsis>
 CASE <replaceable>search-expression</replaceable>
@@ -2055,16 +2062,16 @@ END CASE;
 </synopsis>
 
       <para>
-       The simple form of <command>CASE</> provides conditional execution
-       based on equality of operands.  The <replaceable>search-expression</>
+       The simple form of <command>CASE</command> provides conditional execution
+       based on equality of operands.  The <replaceable>search-expression</replaceable>
        is evaluated (once) and successively compared to each
-       <replaceable>expression</> in the <literal>WHEN</> clauses.
+       <replaceable>expression</replaceable> in the <literal>WHEN</literal> clauses.
        If a match is found, then the corresponding
        <replaceable>statements</replaceable> are executed, and then control
-       passes to the next statement after <literal>END CASE</>.  (Subsequent
-       <literal>WHEN</> expressions are not evaluated.)  If no match is
-       found, the <literal>ELSE</> <replaceable>statements</replaceable> are
-       executed; but if <literal>ELSE</> is not present, then a
+       passes to the next statement after <literal>END CASE</literal>.  (Subsequent
+       <literal>WHEN</literal> expressions are not evaluated.)  If no match is
+       found, the <literal>ELSE</literal> <replaceable>statements</replaceable> are
+       executed; but if <literal>ELSE</literal> is not present, then a
        <literal>CASE_NOT_FOUND</literal> exception is raised.
       </para>
 
@@ -2083,7 +2090,7 @@ END CASE;
      </sect3>
 
      <sect3>
-      <title>Searched <literal>CASE</></title>
+      <title>Searched <literal>CASE</literal></title>
 
 <synopsis>
 CASE
@@ -2098,16 +2105,16 @@ END CASE;
 </synopsis>
 
       <para>
-       The searched form of <command>CASE</> provides conditional execution
-       based on truth of Boolean expressions.  Each <literal>WHEN</> clause's
+       The searched form of <command>CASE</command> provides conditional execution
+       based on truth of Boolean expressions.  Each <literal>WHEN</literal> clause's
        <replaceable>boolean-expression</replaceable> is evaluated in turn,
-       until one is found that yields <literal>true</>.  Then the
+       until one is found that yields <literal>true</literal>.  Then the
        corresponding <replaceable>statements</replaceable> are executed, and
-       then control passes to the next statement after <literal>END CASE</>.
-       (Subsequent <literal>WHEN</> expressions are not evaluated.)
-       If no true result is found, the <literal>ELSE</>
+       then control passes to the next statement after <literal>END CASE</literal>.
+       (Subsequent <literal>WHEN</literal> expressions are not evaluated.)
+       If no true result is found, the <literal>ELSE</literal>
        <replaceable>statements</replaceable> are executed;
-       but if <literal>ELSE</> is not present, then a
+       but if <literal>ELSE</literal> is not present, then a
        <literal>CASE_NOT_FOUND</literal> exception is raised.
       </para>
 
@@ -2125,9 +2132,9 @@ END CASE;
       </para>
 
       <para>
-       This form of <command>CASE</> is entirely equivalent to
-       <literal>IF-THEN-ELSIF</>, except for the rule that reaching
-       an omitted <literal>ELSE</> clause results in an error rather
+       This form of <command>CASE</command> is entirely equivalent to
+       <literal>IF-THEN-ELSIF</literal>, except for the rule that reaching
+       an omitted <literal>ELSE</literal> clause results in an error rather
        than doing nothing.
       </para>
 
@@ -2143,14 +2150,14 @@ END CASE;
     </indexterm>
 
     <para>
-     With the <literal>LOOP</>, <literal>EXIT</>,
-     <literal>CONTINUE</>, <literal>WHILE</>, <literal>FOR</>,
-     and <literal>FOREACH</> statements, you can arrange for your
-     <application>PL/pgSQL</> function to repeat a series of commands.
+     With the <literal>LOOP</literal>, <literal>EXIT</literal>,
+     <literal>CONTINUE</literal>, <literal>WHILE</literal>, <literal>FOR</literal>,
+     and <literal>FOREACH</literal> statements, you can arrange for your
+     <application>PL/pgSQL</application> function to repeat a series of commands.
     </para>
 
     <sect3>
-     <title><literal>LOOP</></title>
+     <title><literal>LOOP</literal></title>
 
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -2160,17 +2167,17 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 </synopsis>
 
      <para>
-      <literal>LOOP</> defines an unconditional loop that is repeated
-      indefinitely until terminated by an <literal>EXIT</> or
+      <literal>LOOP</literal> defines an unconditional loop that is repeated
+      indefinitely until terminated by an <literal>EXIT</literal> or
       <command>RETURN</command> statement.  The optional
-      <replaceable>label</replaceable> can be used by <literal>EXIT</>
+      <replaceable>label</replaceable> can be used by <literal>EXIT</literal>
       and <literal>CONTINUE</literal> statements within nested loops to
       specify which loop those statements refer to.
      </para>
     </sect3>
 
      <sect3>
-      <title><literal>EXIT</></title>
+      <title><literal>EXIT</literal></title>
 
      <indexterm>
       <primary>EXIT</primary>
@@ -2184,21 +2191,21 @@ EXIT <optional> <replaceable>label</replaceable> </optional> <optional> WHEN <re
        <para>
         If no <replaceable>label</replaceable> is given, the innermost
         loop is terminated and the statement following <literal>END
-        LOOP</> is executed next.  If <replaceable>label</replaceable>
+        LOOP</literal> is executed next.  If <replaceable>label</replaceable>
         is given, it must be the label of the current or some outer
         level of nested loop or block. Then the named loop or block is
         terminated and control continues with the statement after the
-        loop's/block's corresponding <literal>END</>.
+        loop's/block's corresponding <literal>END</literal>.
        </para>
 
        <para>
-        If <literal>WHEN</> is specified, the loop exit occurs only if
-        <replaceable>boolean-expression</> is true. Otherwise, control passes
-        to the statement after <literal>EXIT</>.
+        If <literal>WHEN</literal> is specified, the loop exit occurs only if
+        <replaceable>boolean-expression</replaceable> is true. Otherwise, control passes
+        to the statement after <literal>EXIT</literal>.
        </para>
 
        <para>
-        <literal>EXIT</> can be used with all types of loops; it is
+        <literal>EXIT</literal> can be used with all types of loops; it is
         not limited to use with unconditional loops.
        </para>
 
@@ -2242,7 +2249,7 @@ END;
      </sect3>
 
      <sect3>
-      <title><literal>CONTINUE</></title>
+      <title><literal>CONTINUE</literal></title>
 
      <indexterm>
       <primary>CONTINUE</primary>
@@ -2254,25 +2261,25 @@ CONTINUE <optional> <replaceable>label</replaceable> </optional> <optional> WHEN
 </synopsis>
 
        <para>
-        If no <replaceable>label</> is given, the next iteration of
+        If no <replaceable>label</replaceable> is given, the next iteration of
         the innermost loop is begun. That is, all statements remaining
         in the loop body are skipped, and control returns
         to the loop control expression (if any) to determine whether
         another loop iteration is needed.
-        If <replaceable>label</> is present, it
+        If <replaceable>label</replaceable> is present, it
         specifies the label of the loop whose execution will be
         continued.
        </para>
 
        <para>
-        If <literal>WHEN</> is specified, the next iteration of the
-        loop is begun only if <replaceable>boolean-expression</> is
+        If <literal>WHEN</literal> is specified, the next iteration of the
+        loop is begun only if <replaceable>boolean-expression</replaceable> is
         true. Otherwise, control passes to the statement after
-        <literal>CONTINUE</>.
+        <literal>CONTINUE</literal>.
        </para>
 
        <para>
-        <literal>CONTINUE</> can be used with all types of loops; it
+        <literal>CONTINUE</literal> can be used with all types of loops; it
         is not limited to use with unconditional loops.
        </para>
 
@@ -2291,7 +2298,7 @@ END LOOP;
 
 
      <sect3>
-      <title><literal>WHILE</></title>
+      <title><literal>WHILE</literal></title>
 
      <indexterm>
       <primary>WHILE</primary>
@@ -2306,7 +2313,7 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 </synopsis>
 
        <para>
-        The <literal>WHILE</> statement repeats a
+        The <literal>WHILE</literal> statement repeats a
         sequence of statements so long as the
         <replaceable>boolean-expression</replaceable>
         evaluates to true.  The expression is checked just before
@@ -2328,7 +2335,7 @@ END LOOP;
      </sect3>
 
      <sect3 id="plpgsql-integer-for">
-      <title><literal>FOR</> (Integer Variant)</title>
+      <title><literal>FOR</literal> (Integer Variant)</title>
 
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -2338,22 +2345,22 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 </synopsis>
 
        <para>
-        This form of <literal>FOR</> creates a loop that iterates over a range
+        This form of <literal>FOR</literal> creates a loop that iterates over a range
         of integer values. The variable
         <replaceable>name</replaceable> is automatically defined as type
-        <type>integer</> and exists only inside the loop (any existing
+        <type>integer</type> and exists only inside the loop (any existing
         definition of the variable name is ignored within the loop).
         The two expressions giving
         the lower and upper bound of the range are evaluated once when entering
-        the loop. If the <literal>BY</> clause isn't specified the iteration
-        step is 1, otherwise it's the value specified in the <literal>BY</>
+        the loop. If the <literal>BY</literal> clause isn't specified the iteration
+        step is 1, otherwise it's the value specified in the <literal>BY</literal>
         clause, which again is evaluated once on loop entry.
-        If <literal>REVERSE</> is specified then the step value is
+        If <literal>REVERSE</literal> is specified then the step value is
         subtracted, rather than added, after each iteration.
        </para>
 
        <para>
-        Some examples of integer <literal>FOR</> loops:
+        Some examples of integer <literal>FOR</literal> loops:
 <programlisting>
 FOR i IN 1..10 LOOP
     -- i will take on the values 1,2,3,4,5,6,7,8,9,10 within the loop
@@ -2371,13 +2378,13 @@ END LOOP;
 
        <para>
         If the lower bound is greater than the upper bound (or less than,
-        in the <literal>REVERSE</> case), the loop body is not
+        in the <literal>REVERSE</literal> case), the loop body is not
         executed at all.  No error is raised.
        </para>
 
        <para>
         If a <replaceable>label</replaceable> is attached to the
-        <literal>FOR</> loop then the integer loop variable can be
+        <literal>FOR</literal> loop then the integer loop variable can be
         referenced with a qualified name, using that
         <replaceable>label</replaceable>.
        </para>
@@ -2388,7 +2395,7 @@ END LOOP;
     <title>Looping Through Query Results</title>
 
     <para>
-     Using a different type of <literal>FOR</> loop, you can iterate through
+     Using a different type of <literal>FOR</literal> loop, you can iterate through
      the results of a query and manipulate that data
      accordingly. The syntax is:
 <synopsis>
@@ -2424,28 +2431,28 @@ END;
 $$ LANGUAGE plpgsql;
 </programlisting>
 
-     If the loop is terminated by an <literal>EXIT</> statement, the last
+     If the loop is terminated by an <literal>EXIT</literal> statement, the last
      assigned row value is still accessible after the loop.
     </para>
 
     <para>
-     The <replaceable>query</replaceable> used in this type of <literal>FOR</>
+     The <replaceable>query</replaceable> used in this type of <literal>FOR</literal>
      statement can be any SQL command that returns rows to the caller:
-     <command>SELECT</> is the most common case,
-     but you can also use <command>INSERT</>, <command>UPDATE</>, or
-     <command>DELETE</> with a <literal>RETURNING</> clause.  Some utility
-     commands such as <command>EXPLAIN</> will work too.
+     <command>SELECT</command> is the most common case,
+     but you can also use <command>INSERT</command>, <command>UPDATE</command>, or
+     <command>DELETE</command> with a <literal>RETURNING</literal> clause.  Some utility
+     commands such as <command>EXPLAIN</command> will work too.
     </para>
 
     <para>
-     <application>PL/pgSQL</> variables are substituted into the query text,
+     <application>PL/pgSQL</application> variables are substituted into the query text,
      and the query plan is cached for possible re-use, as discussed in
-     detail in <xref linkend="plpgsql-var-subst"> and
-     <xref linkend="plpgsql-plan-caching">.
+     detail in <xref linkend="plpgsql-var-subst"/> and
+     <xref linkend="plpgsql-plan-caching"/>.
     </para>
 
     <para>
-     The <literal>FOR-IN-EXECUTE</> statement is another way to iterate over
+     The <literal>FOR-IN-EXECUTE</literal> statement is another way to iterate over
      rows:
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -2455,17 +2462,17 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 </synopsis>
      This is like the previous form, except that the source query
      is specified as a string expression, which is evaluated and replanned
-     on each entry to the <literal>FOR</> loop.  This allows the programmer to
+     on each entry to the <literal>FOR</literal> loop.  This allows the programmer to
      choose the speed of a preplanned query or the flexibility of a dynamic
      query, just as with a plain <command>EXECUTE</command> statement.
      As with <command>EXECUTE</command>, parameter values can be inserted
-     into the dynamic command via <literal>USING</>.
+     into the dynamic command via <literal>USING</literal>.
     </para>
 
     <para>
      Another way to specify the query whose results should be iterated
      through is to declare it as a cursor.  This is described in
-     <xref linkend="plpgsql-cursor-for-loop">.
+     <xref linkend="plpgsql-cursor-for-loop"/>.
     </para>
    </sect2>
 
@@ -2473,13 +2480,13 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
     <title>Looping Through Arrays</title>
 
     <para>
-     The <literal>FOREACH</> loop is much like a <literal>FOR</> loop,
+     The <literal>FOREACH</literal> loop is much like a <literal>FOR</literal> loop,
      but instead of iterating through the rows returned by a SQL query,
      it iterates through the elements of an array value.
-     (In general, <literal>FOREACH</> is meant for looping through
+     (In general, <literal>FOREACH</literal> is meant for looping through
      components of a composite-valued expression; variants for looping
      through composites besides arrays may be added in future.)
-     The <literal>FOREACH</> statement to loop over an array is:
+     The <literal>FOREACH</literal> statement to loop over an array is:
 
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -2490,7 +2497,7 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
     </para>
 
     <para>
-     Without <literal>SLICE</>, or if <literal>SLICE 0</> is specified,
+     Without <literal>SLICE</literal>, or if <literal>SLICE 0</literal> is specified,
      the loop iterates through individual elements of the array produced
      by evaluating the <replaceable>expression</replaceable>.
      The <replaceable>target</replaceable> variable is assigned each
@@ -2522,13 +2529,13 @@ $$ LANGUAGE plpgsql;
     </para>
 
     <para>
-     With a positive <literal>SLICE</> value, <literal>FOREACH</>
+     With a positive <literal>SLICE</literal> value, <literal>FOREACH</literal>
      iterates through slices of the array rather than single elements.
-     The <literal>SLICE</> value must be an integer constant not larger
+     The <literal>SLICE</literal> value must be an integer constant not larger
      than the number of dimensions of the array.  The
      <replaceable>target</replaceable> variable must be an array,
      and it receives successive slices of the array value, where each slice
-     is of the number of dimensions specified by <literal>SLICE</>.
+     is of the number of dimensions specified by <literal>SLICE</literal>.
      Here is an example of iterating through one-dimensional slices:
 
 <programlisting>
@@ -2562,12 +2569,12 @@ NOTICE:  row = {10,11,12}
     </indexterm>
 
     <para>
-     By default, any error occurring in a <application>PL/pgSQL</>
+     By default, any error occurring in a <application>PL/pgSQL</application>
      function aborts execution of the function, and indeed of the
      surrounding transaction as well.  You can trap errors and recover
-     from them by using a <command>BEGIN</> block with an
-     <literal>EXCEPTION</> clause.  The syntax is an extension of the
-     normal syntax for a <command>BEGIN</> block:
+     from them by using a <command>BEGIN</command> block with an
+     <literal>EXCEPTION</literal> clause.  The syntax is an extension of the
+     normal syntax for a <command>BEGIN</command> block:
 
 <synopsis>
 <optional> &lt;&lt;<replaceable>label</replaceable>&gt;&gt; </optional>
@@ -2588,31 +2595,31 @@ END;
     <para>
      If no error occurs, this form of block simply executes all the
      <replaceable>statements</replaceable>, and then control passes
-     to the next statement after <literal>END</>.  But if an error
+     to the next statement after <literal>END</literal>.  But if an error
      occurs within the <replaceable>statements</replaceable>, further
      processing of the <replaceable>statements</replaceable> is
-     abandoned, and control passes to the <literal>EXCEPTION</> list.
+     abandoned, and control passes to the <literal>EXCEPTION</literal> list.
      The list is searched for the first <replaceable>condition</replaceable>
      matching the error that occurred.  If a match is found, the
      corresponding <replaceable>handler_statements</replaceable> are
      executed, and then control passes to the next statement after
-     <literal>END</>.  If no match is found, the error propagates out
-     as though the <literal>EXCEPTION</> clause were not there at all:
+     <literal>END</literal>.  If no match is found, the error propagates out
+     as though the <literal>EXCEPTION</literal> clause were not there at all:
      the error can be caught by an enclosing block with
-     <literal>EXCEPTION</>, or if there is none it aborts processing
+     <literal>EXCEPTION</literal>, or if there is none it aborts processing
      of the function.
     </para>
 
     <para>
      The <replaceable>condition</replaceable> names can be any of
-     those shown in <xref linkend="errcodes-appendix">.  A category
+     those shown in <xref linkend="errcodes-appendix"/>.  A category
      name matches any error within its category.  The special
-     condition name <literal>OTHERS</> matches every error type except
-     <literal>QUERY_CANCELED</> and <literal>ASSERT_FAILURE</>.
+     condition name <literal>OTHERS</literal> matches every error type except
+     <literal>QUERY_CANCELED</literal> and <literal>ASSERT_FAILURE</literal>.
      (It is possible, but often unwise, to trap those two error types
      by name.)  Condition names are
      not case-sensitive.  Also, an error condition can be specified
-     by <literal>SQLSTATE</> code; for example these are equivalent:
+     by <literal>SQLSTATE</literal> code; for example these are equivalent:
 <programlisting>
 WHEN division_by_zero THEN ...
 WHEN SQLSTATE '22012' THEN ...
@@ -2622,13 +2629,13 @@ WHEN SQLSTATE '22012' THEN ...
     <para>
      If a new error occurs within the selected
      <replaceable>handler_statements</replaceable>, it cannot be caught
-     by this <literal>EXCEPTION</> clause, but is propagated out.
-     A surrounding <literal>EXCEPTION</> clause could catch it.
+     by this <literal>EXCEPTION</literal> clause, but is propagated out.
+     A surrounding <literal>EXCEPTION</literal> clause could catch it.
     </para>
 
     <para>
-     When an error is caught by an <literal>EXCEPTION</> clause,
-     the local variables of the <application>PL/pgSQL</> function
+     When an error is caught by an <literal>EXCEPTION</literal> clause,
+     the local variables of the <application>PL/pgSQL</application> function
      remain as they were when the error occurred, but all changes
      to persistent database state within the block are rolled back.
      As an example, consider this fragment:
@@ -2646,32 +2653,32 @@ EXCEPTION
 END;
 </programlisting>
 
-     When control reaches the assignment to <literal>y</>, it will
-     fail with a <literal>division_by_zero</> error.  This will be caught by
-     the <literal>EXCEPTION</> clause.  The value returned in the
-     <command>RETURN</> statement will be the incremented value of
-     <literal>x</>, but the effects of the <command>UPDATE</> command will
-     have been rolled back.  The <command>INSERT</> command preceding the
+     When control reaches the assignment to <literal>y</literal>, it will
+     fail with a <literal>division_by_zero</literal> error.  This will be caught by
+     the <literal>EXCEPTION</literal> clause.  The value returned in the
+     <command>RETURN</command> statement will be the incremented value of
+     <literal>x</literal>, but the effects of the <command>UPDATE</command> command will
+     have been rolled back.  The <command>INSERT</command> command preceding the
      block is not rolled back, however, so the end result is that the database
-     contains <literal>Tom Jones</> not <literal>Joe Jones</>.
+     contains <literal>Tom Jones</literal> not <literal>Joe Jones</literal>.
     </para>
 
     <tip>
      <para>
-      A block containing an <literal>EXCEPTION</> clause is significantly
+      A block containing an <literal>EXCEPTION</literal> clause is significantly
       more expensive to enter and exit than a block without one.  Therefore,
-      don't use <literal>EXCEPTION</> without need.
+      don't use <literal>EXCEPTION</literal> without need.
      </para>
     </tip>
 
     <example id="plpgsql-upsert-example">
-    <title>Exceptions with <command>UPDATE</>/<command>INSERT</></title>
+    <title>Exceptions with <command>UPDATE</command>/<command>INSERT</command></title>
     <para>
 
     This example uses exception handling to perform either
-    <command>UPDATE</> or <command>INSERT</>, as appropriate.  It is
-    recommended that applications use <command>INSERT</> with
-    <literal>ON CONFLICT DO UPDATE</> rather than actually using
+    <command>UPDATE</command> or <command>INSERT</command>, as appropriate.  It is
+    recommended that applications use <command>INSERT</command> with
+    <literal>ON CONFLICT DO UPDATE</literal> rather than actually using
     this pattern.  This example serves primarily to illustrate use of
     <application>PL/pgSQL</application> control flow structures:
 
@@ -2705,8 +2712,8 @@ SELECT merge_db(1, 'david');
 SELECT merge_db(1, 'dennis');
 </programlisting>
 
-     This coding assumes the <literal>unique_violation</> error is caused by
-     the <command>INSERT</>, and not by, say, an <command>INSERT</> in a
+     This coding assumes the <literal>unique_violation</literal> error is caused by
+     the <command>INSERT</command>, and not by, say, an <command>INSERT</command> in a
      trigger function on the table.  It might also misbehave if there is
      more than one unique index on the table, since it will retry the
      operation regardless of which index caused the error.
@@ -2722,14 +2729,14 @@ SELECT merge_db(1, 'dennis');
     <para>
      Exception handlers frequently need to identify the specific error that
      occurred.  There are two ways to get information about the current
-     exception in <application>PL/pgSQL</>: special variables and the
+     exception in <application>PL/pgSQL</application>: special variables and the
      <command>GET STACKED DIAGNOSTICS</command> command.
     </para>
 
     <para>
      Within an exception handler, the special variable
      <varname>SQLSTATE</varname> contains the error code that corresponds to
-     the exception that was raised (refer to <xref linkend="errcodes-table">
+     the exception that was raised (refer to <xref linkend="errcodes-table"/>
      for a list of possible error codes). The special variable
      <varname>SQLERRM</varname> contains the error message associated with the
      exception. These variables are undefined outside exception handlers.
@@ -2748,7 +2755,7 @@ GET STACKED DIAGNOSTICS <replaceable>variable</replaceable> { = | := } <replacea
      value to be assigned to the specified <replaceable>variable</replaceable>
      (which should be of the right data type to receive it).  The currently
      available status items are shown
-     in <xref linkend="plpgsql-exception-diagnostics-values">.
+     in <xref linkend="plpgsql-exception-diagnostics-values"/>.
     </para>
 
      <table id="plpgsql-exception-diagnostics-values">
@@ -2764,54 +2771,54 @@ GET STACKED DIAGNOSTICS <replaceable>variable</replaceable> { = | := } <replacea
        <tbody>
         <row>
          <entry><literal>RETURNED_SQLSTATE</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the SQLSTATE error code of the exception</entry>
         </row>
         <row>
          <entry><literal>COLUMN_NAME</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the name of the column related to exception</entry>
         </row>
         <row>
          <entry><literal>CONSTRAINT_NAME</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the name of the constraint related to exception</entry>
         </row>
         <row>
          <entry><literal>PG_DATATYPE_NAME</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the name of the data type related to exception</entry>
         </row>
         <row>
          <entry><literal>MESSAGE_TEXT</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the text of the exception's primary message</entry>
         </row>
         <row>
          <entry><literal>TABLE_NAME</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the name of the table related to exception</entry>
         </row>
         <row>
          <entry><literal>SCHEMA_NAME</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the name of the schema related to exception</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_DETAIL</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the text of the exception's detail message, if any</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_HINT</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>the text of the exception's hint message, if any</entry>
         </row>
         <row>
          <entry><literal>PG_EXCEPTION_CONTEXT</literal></entry>
-         <entry><type>text</></entry>
+         <entry><type>text</type></entry>
          <entry>line(s) of text describing the call stack at the time of the
-          exception (see <xref linkend="plpgsql-call-stack">)</entry>
+          exception (see <xref linkend="plpgsql-call-stack"/>)</entry>
         </row>
        </tbody>
       </tgroup>
@@ -2847,12 +2854,12 @@ END;
 
    <para>
     The <command>GET DIAGNOSTICS</command> command, previously described
-    in <xref linkend="plpgsql-statements-diagnostics">, retrieves information
+    in <xref linkend="plpgsql-statements-diagnostics"/>, retrieves information
     about current execution state (whereas the <command>GET STACKED
     DIAGNOSTICS</command> command discussed above reports information about
-    the execution state as of a previous error).  Its <literal>PG_CONTEXT</>
+    the execution state as of a previous error).  Its <literal>PG_CONTEXT</literal>
     status item is useful for identifying the current execution
-    location.  <literal>PG_CONTEXT</> returns a text string with line(s)
+    location.  <literal>PG_CONTEXT</literal> returns a text string with line(s)
     of text describing the call stack.  The first line refers to the current
     function and currently executing <command>GET DIAGNOSTICS</command>
     command.  The second and any subsequent lines refer to calling functions
@@ -2907,11 +2914,11 @@ CONTEXT:  PL/pgSQL function outer_func() line 3 at RETURN
 
    <para>
     Rather than executing a whole query at once, it is possible to set
-    up a <firstterm>cursor</> that encapsulates the query, and then read
+    up a <firstterm>cursor</firstterm> that encapsulates the query, and then read
     the query result a few rows at a time. One reason for doing this is
     to avoid memory overrun when the result contains a large number of
-    rows. (However, <application>PL/pgSQL</> users do not normally need
-    to worry about that, since <literal>FOR</> loops automatically use a cursor
+    rows. (However, <application>PL/pgSQL</application> users do not normally need
+    to worry about that, since <literal>FOR</literal> loops automatically use a cursor
     internally to avoid memory problems.) A more interesting usage is to
     return a reference to a cursor that a function has created, allowing the
     caller to read the rows. This provides an efficient way to return
@@ -2922,19 +2929,19 @@ CONTEXT:  PL/pgSQL function outer_func() line 3 at RETURN
     <title>Declaring Cursor Variables</title>
 
     <para>
-     All access to cursors in <application>PL/pgSQL</> goes through
+     All access to cursors in <application>PL/pgSQL</application> goes through
      cursor variables, which are always of the special data type
-     <type>refcursor</>.  One way to create a cursor variable
-     is just to declare it as a variable of type <type>refcursor</>.
+     <type>refcursor</type>.  One way to create a cursor variable
+     is just to declare it as a variable of type <type>refcursor</type>.
      Another way is to use the cursor declaration syntax,
      which in general is:
 <synopsis>
 <replaceable>name</replaceable> <optional> <optional> NO </optional> SCROLL </optional> CURSOR <optional> ( <replaceable>arguments</replaceable> ) </optional> FOR <replaceable>query</replaceable>;
 </synopsis>
-     (<literal>FOR</> can be replaced by <literal>IS</> for
+     (<literal>FOR</literal> can be replaced by <literal>IS</literal> for
      <productname>Oracle</productname> compatibility.)
-     If <literal>SCROLL</> is specified, the cursor will be capable of
-     scrolling backward; if <literal>NO SCROLL</> is specified, backward
+     If <literal>SCROLL</literal> is specified, the cursor will be capable of
+     scrolling backward; if <literal>NO SCROLL</literal> is specified, backward
      fetches will be rejected; if neither specification appears, it is
      query-dependent whether backward fetches will be allowed.
      <replaceable>arguments</replaceable>, if specified, is a
@@ -2952,13 +2959,13 @@ DECLARE
     curs2 CURSOR FOR SELECT * FROM tenk1;
     curs3 CURSOR (key integer) FOR SELECT * FROM tenk1 WHERE unique1 = key;
 </programlisting>
-     All three of these variables have the data type <type>refcursor</>,
+     All three of these variables have the data type <type>refcursor</type>,
      but the first can be used with any query, while the second has
-     a fully specified query already <firstterm>bound</> to it, and the last
-     has a parameterized query bound to it.  (<literal>key</> will be
+     a fully specified query already <firstterm>bound</firstterm> to it, and the last
+     has a parameterized query bound to it.  (<literal>key</literal> will be
      replaced by an integer parameter value when the cursor is opened.)
-     The variable <literal>curs1</>
-     is said to be <firstterm>unbound</> since it is not bound to
+     The variable <literal>curs1</literal>
+     is said to be <firstterm>unbound</firstterm> since it is not bound to
      any particular query.
     </para>
    </sect2>
@@ -2968,17 +2975,17 @@ DECLARE
 
     <para>
      Before a cursor can be used to retrieve rows, it must be
-     <firstterm>opened</>. (This is the equivalent action to the SQL
-     command <command>DECLARE CURSOR</>.) <application>PL/pgSQL</> has
-     three forms of the <command>OPEN</> statement, two of which use unbound
+     <firstterm>opened</firstterm>. (This is the equivalent action to the SQL
+     command <command>DECLARE CURSOR</command>.) <application>PL/pgSQL</application> has
+     three forms of the <command>OPEN</command> statement, two of which use unbound
      cursor variables while the third uses a bound cursor variable.
     </para>
 
     <note>
      <para>
       Bound cursor variables can also be used without explicitly opening the cursor,
-      via the <command>FOR</> statement described in
-      <xref linkend="plpgsql-cursor-for-loop">.
+      via the <command>FOR</command> statement described in
+      <xref linkend="plpgsql-cursor-for-loop"/>.
      </para>
     </note>
 
@@ -2993,18 +3000,18 @@ OPEN <replaceable>unbound_cursorvar</replaceable> <optional> <optional> NO </opt
         The cursor variable is opened and given the specified query to
         execute.  The cursor cannot be open already, and it must have been
         declared as an unbound cursor variable (that is, as a simple
-        <type>refcursor</> variable).  The query must be a
+        <type>refcursor</type> variable).  The query must be a
         <command>SELECT</command>, or something else that returns rows
-        (such as <command>EXPLAIN</>).  The query
+        (such as <command>EXPLAIN</command>).  The query
         is treated in the same way as other SQL commands in
-        <application>PL/pgSQL</>: <application>PL/pgSQL</>
+        <application>PL/pgSQL</application>: <application>PL/pgSQL</application>
         variable names are substituted, and the query plan is cached for
-        possible reuse.  When a <application>PL/pgSQL</>
+        possible reuse.  When a <application>PL/pgSQL</application>
         variable is substituted into the cursor query, the value that is
-        substituted is the one it has at the time of the <command>OPEN</>;
+        substituted is the one it has at the time of the <command>OPEN</command>;
         subsequent changes to the variable will not affect the cursor's
         behavior.
-        The <literal>SCROLL</> and <literal>NO SCROLL</>
+        The <literal>SCROLL</literal> and <literal>NO SCROLL</literal>
         options have the same meanings as for a bound cursor.
        </para>
 
@@ -3028,16 +3035,16 @@ OPEN <replaceable>unbound_cursorvar</replaceable> <optional> <optional> NO </opt
           The cursor variable is opened and given the specified query to
           execute.  The cursor cannot be open already, and it must have been
           declared as an unbound cursor variable (that is, as a simple
-          <type>refcursor</> variable).  The query is specified as a string
+          <type>refcursor</type> variable).  The query is specified as a string
           expression, in the same way as in the <command>EXECUTE</command>
           command.  As usual, this gives flexibility so the query plan can vary
-          from one run to the next (see <xref linkend="plpgsql-plan-caching">),
+          from one run to the next (see <xref linkend="plpgsql-plan-caching"/>),
           and it also means that variable substitution is not done on the
           command string. As with <command>EXECUTE</command>, parameter values
           can be inserted into the dynamic command via
-          <literal>format()</> and <literal>USING</>.
-          The <literal>SCROLL</> and
-          <literal>NO SCROLL</> options have the same meanings as for a bound
+          <literal>format()</literal> and <literal>USING</literal>.
+          The <literal>SCROLL</literal> and
+          <literal>NO SCROLL</literal> options have the same meanings as for a bound
           cursor.
          </para>
 
@@ -3047,8 +3054,8 @@ OPEN <replaceable>unbound_cursorvar</replaceable> <optional> <optional> NO </opt
 OPEN curs1 FOR EXECUTE format('SELECT * FROM %I WHERE col1 = $1',tabname) USING keyvalue;
 </programlisting>
         In this example, the table name is inserted into the query via
-        <function>format()</>.  The comparison value for <literal>col1</>
-        is inserted via a <literal>USING</> parameter, so it needs
+        <function>format()</function>.  The comparison value for <literal>col1</literal>
+        is inserted via a <literal>USING</literal> parameter, so it needs
         no quoting.
        </para>
      </sect3>
@@ -3071,8 +3078,8 @@ OPEN <replaceable>bound_cursorvar</replaceable> <optional> ( <optional> <replace
          <para>
           The query plan for a bound cursor is always considered cacheable;
           there is no equivalent of <command>EXECUTE</command> in this case.
-          Notice that <literal>SCROLL</> and <literal>NO SCROLL</> cannot be
-          specified in <command>OPEN</>, as the cursor's scrolling
+          Notice that <literal>SCROLL</literal> and <literal>NO SCROLL</literal> cannot be
+          specified in <command>OPEN</command>, as the cursor's scrolling
           behavior was already determined.
          </para>
 
@@ -3082,7 +3089,7 @@ OPEN <replaceable>bound_cursorvar</replaceable> <optional> ( <optional> <replace
           notation, all arguments are specified in order.  In named notation,
           each argument's name is specified using <literal>:=</literal> to
           separate it from the argument expression. Similar to calling
-          functions, described in <xref linkend="sql-syntax-calling-funcs">, it
+          functions, described in <xref linkend="sql-syntax-calling-funcs"/>, it
           is also allowed to mix positional and named notation.
          </para>
 
@@ -3098,13 +3105,13 @@ OPEN curs3(key := 42);
          <para>
           Because variable substitution is done on a bound cursor's query,
           there are really two ways to pass values into the cursor: either
-          with an explicit argument to <command>OPEN</>, or implicitly by
-          referencing a <application>PL/pgSQL</> variable in the query.
+          with an explicit argument to <command>OPEN</command>, or implicitly by
+          referencing a <application>PL/pgSQL</application> variable in the query.
           However, only variables declared before the bound cursor was
           declared will be substituted into it.  In either case the value to
-          be passed is determined at the time of the <command>OPEN</>.
+          be passed is determined at the time of the <command>OPEN</command>.
           For example, another way to get the same effect as the
-          <literal>curs3</> example above is
+          <literal>curs3</literal> example above is
 <programlisting>
 DECLARE
     key integer;
@@ -3127,22 +3134,22 @@ BEGIN
 
     <para>
      These manipulations need not occur in the same function that
-     opened the cursor to begin with.  You can return a <type>refcursor</>
+     opened the cursor to begin with.  You can return a <type>refcursor</type>
      value out of a function and let the caller operate on the cursor.
-     (Internally, a <type>refcursor</> value is simply the string name
+     (Internally, a <type>refcursor</type> value is simply the string name
      of a so-called portal containing the active query for the cursor.  This name
-     can be passed around, assigned to other <type>refcursor</> variables,
+     can be passed around, assigned to other <type>refcursor</type> variables,
      and so on, without disturbing the portal.)
     </para>
 
     <para>
      All portals are implicitly closed at transaction end.  Therefore
-     a <type>refcursor</> value is usable to reference an open cursor
+     a <type>refcursor</type> value is usable to reference an open cursor
      only until the end of the transaction.
     </para>
 
     <sect3>
-     <title><literal>FETCH</></title>
+     <title><literal>FETCH</literal></title>
 
 <synopsis>
 FETCH <optional> <replaceable>direction</replaceable> { FROM | IN } </optional> <replaceable>cursor</replaceable> INTO <replaceable>target</replaceable>;
@@ -3160,26 +3167,26 @@ FETCH <optional> <replaceable>direction</replaceable> { FROM | IN } </optional>
 
     <para>
      The <replaceable>direction</replaceable> clause can be any of the
-     variants allowed in the SQL <xref linkend="sql-fetch">
+     variants allowed in the SQL <xref linkend="sql-fetch"/>
      command except the ones that can fetch
      more than one row; namely, it can be
-     <literal>NEXT</>,
-     <literal>PRIOR</>,
-     <literal>FIRST</>,
-     <literal>LAST</>,
-     <literal>ABSOLUTE</> <replaceable>count</replaceable>,
-     <literal>RELATIVE</> <replaceable>count</replaceable>,
-     <literal>FORWARD</>, or
-     <literal>BACKWARD</>.
+     <literal>NEXT</literal>,
+     <literal>PRIOR</literal>,
+     <literal>FIRST</literal>,
+     <literal>LAST</literal>,
+     <literal>ABSOLUTE</literal> <replaceable>count</replaceable>,
+     <literal>RELATIVE</literal> <replaceable>count</replaceable>,
+     <literal>FORWARD</literal>, or
+     <literal>BACKWARD</literal>.
      Omitting <replaceable>direction</replaceable> is the same
-     as specifying <literal>NEXT</>.
+     as specifying <literal>NEXT</literal>.
      <replaceable>direction</replaceable> values that require moving
      backward are likely to fail unless the cursor was declared or opened
-     with the <literal>SCROLL</> option.
+     with the <literal>SCROLL</literal> option.
     </para>
 
     <para>
-     <replaceable>cursor</replaceable> must be the name of a <type>refcursor</>
+     <replaceable>cursor</replaceable> must be the name of a <type>refcursor</type>
      variable that references an open cursor portal.
     </para>
 
@@ -3195,7 +3202,7 @@ FETCH RELATIVE -2 FROM curs4 INTO x;
      </sect3>
 
     <sect3>
-     <title><literal>MOVE</></title>
+     <title><literal>MOVE</literal></title>
 
 <synopsis>
 MOVE <optional> <replaceable>direction</replaceable> { FROM | IN } </optional> <replaceable>cursor</replaceable>;
@@ -3212,22 +3219,22 @@ MOVE <optional> <replaceable>direction</replaceable> { FROM | IN } </optional> <
 
     <para>
      The <replaceable>direction</replaceable> clause can be any of the
-     variants allowed in the SQL <xref linkend="sql-fetch">
+     variants allowed in the SQL <xref linkend="sql-fetch"/>
      command, namely
-     <literal>NEXT</>,
-     <literal>PRIOR</>,
-     <literal>FIRST</>,
-     <literal>LAST</>,
-     <literal>ABSOLUTE</> <replaceable>count</replaceable>,
-     <literal>RELATIVE</> <replaceable>count</replaceable>,
-     <literal>ALL</>,
-     <literal>FORWARD</> <optional> <replaceable>count</replaceable> | <literal>ALL</> </optional>, or
-     <literal>BACKWARD</> <optional> <replaceable>count</replaceable> | <literal>ALL</> </optional>.
+     <literal>NEXT</literal>,
+     <literal>PRIOR</literal>,
+     <literal>FIRST</literal>,
+     <literal>LAST</literal>,
+     <literal>ABSOLUTE</literal> <replaceable>count</replaceable>,
+     <literal>RELATIVE</literal> <replaceable>count</replaceable>,
+     <literal>ALL</literal>,
+     <literal>FORWARD</literal> <optional> <replaceable>count</replaceable> | <literal>ALL</literal> </optional>, or
+     <literal>BACKWARD</literal> <optional> <replaceable>count</replaceable> | <literal>ALL</literal> </optional>.
      Omitting <replaceable>direction</replaceable> is the same
-     as specifying <literal>NEXT</>.
+     as specifying <literal>NEXT</literal>.
      <replaceable>direction</replaceable> values that require moving
      backward are likely to fail unless the cursor was declared or opened
-     with the <literal>SCROLL</> option.
+     with the <literal>SCROLL</literal> option.
     </para>
 
     <para>
@@ -3242,7 +3249,7 @@ MOVE FORWARD 2 FROM curs4;
      </sect3>
 
     <sect3>
-     <title><literal>UPDATE/DELETE WHERE CURRENT OF</></title>
+     <title><literal>UPDATE/DELETE WHERE CURRENT OF</literal></title>
 
 <synopsis>
 UPDATE <replaceable>table</replaceable> SET ... WHERE CURRENT OF <replaceable>cursor</replaceable>;
@@ -3253,9 +3260,9 @@ DELETE FROM <replaceable>table</replaceable> WHERE CURRENT OF <replaceable>curso
         When a cursor is positioned on a table row, that row can be updated
         or deleted using the cursor to identify the row.  There are
         restrictions on what the cursor's query can be (in particular,
-        no grouping) and it's best to use <literal>FOR UPDATE</> in the
+        no grouping) and it's best to use <literal>FOR UPDATE</literal> in the
         cursor.  For more information see the
-        <xref linkend="sql-declare">
+        <xref linkend="sql-declare"/>
         reference page.
        </para>
 
@@ -3268,7 +3275,7 @@ UPDATE foo SET dataval = myval WHERE CURRENT OF curs1;
      </sect3>
 
     <sect3>
-     <title><literal>CLOSE</></title>
+     <title><literal>CLOSE</literal></title>
 
 <synopsis>
 CLOSE <replaceable>cursor</replaceable>;
@@ -3292,7 +3299,7 @@ CLOSE curs1;
      <title>Returning Cursors</title>
 
        <para>
-        <application>PL/pgSQL</> functions can return cursors to the
+        <application>PL/pgSQL</application> functions can return cursors to the
         caller. This is useful to return multiple rows or columns,
         especially with very large result sets.  To do this, the function
         opens the cursor and returns the cursor name to the caller (or simply
@@ -3305,13 +3312,13 @@ CLOSE curs1;
        <para>
         The portal name used for a cursor can be specified by the
         programmer or automatically generated.  To specify a portal name,
-        simply assign a string to the <type>refcursor</> variable before
-        opening it.  The string value of the <type>refcursor</> variable
-        will be used by <command>OPEN</> as the name of the underlying portal.
-        However, if the <type>refcursor</> variable is null,
-        <command>OPEN</> automatically generates a name that does not
+        simply assign a string to the <type>refcursor</type> variable before
+        opening it.  The string value of the <type>refcursor</type> variable
+        will be used by <command>OPEN</command> as the name of the underlying portal.
+        However, if the <type>refcursor</type> variable is null,
+        <command>OPEN</command> automatically generates a name that does not
         conflict with any existing portal, and assigns it to the
-        <type>refcursor</> variable.
+        <type>refcursor</type> variable.
        </para>
 
        <note>
@@ -3405,7 +3412,7 @@ COMMIT;
     <title>Looping Through a Cursor's Result</title>
 
     <para>
-     There is a variant of the <command>FOR</> statement that allows
+     There is a variant of the <command>FOR</command> statement that allows
      iterating through the rows returned by a cursor.  The syntax is:
 
 <synopsis>
@@ -3416,18 +3423,18 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 </synopsis>
 
      The cursor variable must have been bound to some query when it was
-     declared, and it <emphasis>cannot</> be open already.  The
-     <command>FOR</> statement automatically opens the cursor, and it closes
+     declared, and it <emphasis>cannot</emphasis> be open already.  The
+     <command>FOR</command> statement automatically opens the cursor, and it closes
      the cursor again when the loop exits.  A list of actual argument value
      expressions must appear if and only if the cursor was declared to take
      arguments.  These values will be substituted in the query, in just
-     the same way as during an <command>OPEN</> (see <xref
-     linkend="plpgsql-open-bound-cursor">).
+     the same way as during an <command>OPEN</command> (see <xref
+     linkend="plpgsql-open-bound-cursor"/>).
    </para>
 
    <para>
      The variable <replaceable>recordvar</replaceable> is automatically
-     defined as type <type>record</> and exists only inside the loop (any
+     defined as type <type>record</type> and exists only inside the loop (any
      existing definition of the variable name is ignored within the loop).
      Each row returned by the cursor is successively assigned to this
      record variable and the loop body is executed.
@@ -3436,6 +3443,48 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 
   </sect1>
 
+  <sect1 id="plpgsql-transactions">
+   <title>Transaction Management</title>
+
+   <para>
+    In procedures invoked by the <command>CALL</command> command from the top
+    level as well as in anonymous code blocks (<command>DO</command> command)
+    called from the top level, it is possible to end transactions using the
+    commands <command>COMMIT</command> and <command>ROLLBACK</command>.  A new
+    transaction is started automatically after a transaction is ended using
+    these commands, so there is no separate <command>START
+    TRANSACTION</command> command.  (Note that <command>BEGIN</command> and
+    <command>END</command> have different meanings in PL/pgSQL.)
+   </para>
+
+   <para>
+    Here is a simple example:
+<programlisting>
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+END
+$$;
+
+CALL transaction_test1();
+</programlisting>
+   </para>
+
+   <para>
+    A transaction cannot be ended inside a loop over a query result, nor
+    inside a block with exception handlers.
+   </para>
+  </sect1>
+
   <sect1 id="plpgsql-errors-and-messages">
    <title>Errors and Messages</title>
 
@@ -3458,8 +3507,8 @@ END LOOP <optional> <replaceable>label</replaceable> </optional>;
 
 <synopsis>
 RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> '<replaceable class="parameter">format</replaceable>' <optional>, <replaceable class="parameter">expression</replaceable> <optional>, ... </optional></optional> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <replaceable class="parameter">condition_name</> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
-RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> SQLSTATE '<replaceable class="parameter">sqlstate</>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> <replaceable class="parameter">condition_name</replaceable> <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
+RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> SQLSTATE '<replaceable class="parameter">sqlstate</replaceable>' <optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional> </optional>;
 RAISE <optional> <replaceable class="parameter">level</replaceable> </optional> USING <replaceable class="parameter">option</replaceable> = <replaceable class="parameter">expression</replaceable> <optional>, ... </optional>;
 RAISE ;
 </synopsis>
@@ -3475,9 +3524,9 @@ RAISE ;
     priority levels.
     Whether messages of a particular priority are reported to the client,
     written to the server log, or both is controlled by the
-    <xref linkend="guc-log-min-messages"> and
-    <xref linkend="guc-client-min-messages"> configuration
-    variables. See <xref linkend="runtime-config"> for more
+    <xref linkend="guc-log-min-messages"/> and
+    <xref linkend="guc-client-min-messages"/> configuration
+    variables. See <xref linkend="runtime-config"/> for more
     information.
    </para>
 
@@ -3491,13 +3540,13 @@ RAISE ;
     Inside the format string, <literal>%</literal> is replaced by the
     string representation of the next optional argument's value. Write
     <literal>%%</literal> to emit a literal <literal>%</literal>.
-    The number of arguments must match the number of <literal>%</>
+    The number of arguments must match the number of <literal>%</literal>
     placeholders in the format string, or an error is raised during
     the compilation of the function.
    </para>
 
    <para>
-    In this example, the value of <literal>v_job_id</> will replace the
+    In this example, the value of <literal>v_job_id</literal> will replace the
     <literal>%</literal> in the string:
 <programlisting>
 RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
@@ -3506,7 +3555,7 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
 
    <para>
     You can attach additional information to the error report by writing
-    <literal>USING</> followed by <replaceable
+    <literal>USING</literal> followed by <replaceable
     class="parameter">option</replaceable> = <replaceable
     class="parameter">expression</replaceable> items.  Each
     <replaceable class="parameter">expression</replaceable> can be any
@@ -3518,8 +3567,8 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
       <term><literal>MESSAGE</literal></term>
       <listitem>
        <para>Sets the error message text.  This option can't be used in the
-        form of <command>RAISE</> that includes a format string
-        before <literal>USING</>.</para>
+        form of <command>RAISE</command> that includes a format string
+        before <literal>USING</literal>.</para>
       </listitem>
      </varlistentry>
 
@@ -3541,7 +3590,7 @@ RAISE NOTICE 'Calling cs_create_job(%)', v_job_id;
       <term><literal>ERRCODE</literal></term>
       <listitem>
        <para>Specifies the error code (SQLSTATE) to report, either by condition
-        name, as shown in <xref linkend="errcodes-appendix">, or directly as a
+        name, as shown in <xref linkend="errcodes-appendix"/>, or directly as a
         five-character SQLSTATE code.</para>
       </listitem>
      </varlistentry>
@@ -3577,13 +3626,13 @@ RAISE 'Duplicate user ID: %', user_id USING ERRCODE = '23505';
    </para>
 
    <para>
-    There is a second <command>RAISE</> syntax in which the main argument
+    There is a second <command>RAISE</command> syntax in which the main argument
     is the condition name or SQLSTATE to be reported, for example:
 <programlisting>
 RAISE division_by_zero;
 RAISE SQLSTATE '22012';
 </programlisting>
-    In this syntax, <literal>USING</> can be used to supply a custom
+    In this syntax, <literal>USING</literal> can be used to supply a custom
     error message, detail, or hint.  Another way to do the earlier
     example is
 <programlisting>
@@ -3592,25 +3641,25 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id;
    </para>
 
    <para>
-    Still another variant is to write <literal>RAISE USING</> or <literal>RAISE
-    <replaceable class="parameter">level</replaceable> USING</> and put
-    everything else into the <literal>USING</> list.
+    Still another variant is to write <literal>RAISE USING</literal> or <literal>RAISE
+    <replaceable class="parameter">level</replaceable> USING</literal> and put
+    everything else into the <literal>USING</literal> list.
    </para>
 
    <para>
-    The last variant of <command>RAISE</> has no parameters at all.
-    This form can only be used inside a <literal>BEGIN</> block's
-    <literal>EXCEPTION</> clause;
+    The last variant of <command>RAISE</command> has no parameters at all.
+    This form can only be used inside a <literal>BEGIN</literal> block's
+    <literal>EXCEPTION</literal> clause;
     it causes the error currently being handled to be re-thrown.
    </para>
 
    <note>
     <para>
-     Before <productname>PostgreSQL</> 9.1, <command>RAISE</> without
+     Before <productname>PostgreSQL</productname> 9.1, <command>RAISE</command> without
      parameters was interpreted as re-throwing the error from the block
-     containing the active exception handler.  Thus an <literal>EXCEPTION</>
+     containing the active exception handler.  Thus an <literal>EXCEPTION</literal>
      clause nested within that handler could not catch it, even if the
-     <command>RAISE</> was within the nested <literal>EXCEPTION</> clause's
+     <command>RAISE</command> was within the nested <literal>EXCEPTION</literal> clause's
      block. This was deemed surprising as well as being incompatible with
      Oracle's PL/SQL.
     </para>
@@ -3619,7 +3668,7 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id;
    <para>
     If no condition name nor SQLSTATE is specified in a
     <command>RAISE EXCEPTION</command> command, the default is to use
-    <literal>RAISE_EXCEPTION</> (<literal>P0001</>).  If no message
+    <literal>RAISE_EXCEPTION</literal> (<literal>P0001</literal>).  If no message
     text is specified, the default is to use the condition name or
     SQLSTATE as message text.
    </para>
@@ -3629,7 +3678,7 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id;
      When specifying an error code by SQLSTATE code, you are not
      limited to the predefined error codes, but can select any
      error code consisting of five digits and/or upper-case ASCII
-     letters, other than <literal>00000</>.  It is recommended that
+     letters, other than <literal>00000</literal>.  It is recommended that
      you avoid throwing error codes that end in three zeroes, because
      these are category codes and can only be trapped by trapping
      the whole category.
@@ -3652,7 +3701,7 @@ RAISE unique_violation USING MESSAGE = 'Duplicate user ID: ' || user_id;
    </indexterm>
 
    <indexterm>
-    <primary><varname>plpgsql.check_asserts</> configuration parameter</primary>
+    <primary><varname>plpgsql.check_asserts</varname> configuration parameter</primary>
    </indexterm>
 
    <para>
@@ -3667,7 +3716,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
     The <replaceable class="parameter">condition</replaceable> is a Boolean
     expression that is expected to always evaluate to true; if it does,
     the <command>ASSERT</command> statement does nothing further.  If the
-    result is false or null, then an <literal>ASSERT_FAILURE</> exception
+    result is false or null, then an <literal>ASSERT_FAILURE</literal> exception
     is raised.  (If an error occurs while evaluating
     the <replaceable class="parameter">condition</replaceable>, it is
     reported as a normal error.)
@@ -3676,7 +3725,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
    <para>
     If the optional <replaceable class="parameter">message</replaceable> is
     provided, it is an expression whose result (if not null) replaces the
-    default error message text <quote>assertion failed</>, should
+    default error message text <quote>assertion failed</quote>, should
     the <replaceable class="parameter">condition</replaceable> fail.
     The <replaceable class="parameter">message</replaceable> expression is
     not evaluated in the normal case where the assertion succeeds.
@@ -3684,15 +3733,15 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
 
    <para>
     Testing of assertions can be enabled or disabled via the configuration
-    parameter <literal>plpgsql.check_asserts</>, which takes a Boolean
-    value; the default is <literal>on</>.  If this parameter
-    is <literal>off</> then <command>ASSERT</> statements do nothing.
+    parameter <literal>plpgsql.check_asserts</literal>, which takes a Boolean
+    value; the default is <literal>on</literal>.  If this parameter
+    is <literal>off</literal> then <command>ASSERT</command> statements do nothing.
    </para>
 
    <para>
     Note that <command>ASSERT</command> is meant for detecting program
     bugs, not for reporting ordinary error conditions.  Use
-    the <command>RAISE</> statement, described above, for that.
+    the <command>RAISE</command> statement, described above, for that.
    </para>
 
   </sect2>
@@ -3710,11 +3759,11 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
   <para>
    <application>PL/pgSQL</application> can be used to define trigger
    procedures on data changes or database events.
-   A trigger procedure is created with the <command>CREATE FUNCTION</>
+   A trigger procedure is created with the <command>CREATE FUNCTION</command>
    command, declaring it as a function with no arguments and a return type of
-   <type>trigger</> (for data change triggers) or
-   <type>event_trigger</> (for database event triggers).
-   Special local variables named <varname>PG_<replaceable>something</></> are
+   <type>trigger</type> (for data change triggers) or
+   <type>event_trigger</type> (for database event triggers).
+   Special local variables named <varname>PG_<replaceable>something</replaceable></varname> are
    automatically defined to describe the condition that triggered the call.
   </para>
 
@@ -3722,11 +3771,11 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
    <title>Triggers on Data Changes</title>
 
   <para>
-   A <link linkend="triggers">data change trigger</> is declared as a
-   function with no arguments and a return type of <type>trigger</>.
+   A <link linkend="triggers">data change trigger</link> is declared as a
+   function with no arguments and a return type of <type>trigger</type>.
    Note that the function must be declared with no arguments even if it
-   expects to receive some arguments specified in <command>CREATE TRIGGER</>
-   &mdash; such arguments are passed via <varname>TG_ARGV</>, as described
+   expects to receive some arguments specified in <command>CREATE TRIGGER</command>
+   &mdash; such arguments are passed via <varname>TG_ARGV</varname>, as described
    below.
   </para>
 
@@ -3741,7 +3790,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
      <listitem>
       <para>
        Data type <type>RECORD</type>; variable holding the new
-       database row for <command>INSERT</>/<command>UPDATE</> operations in row-level
+       database row for <command>INSERT</command>/<command>UPDATE</command> operations in row-level
        triggers. This variable is unassigned in statement-level triggers
        and for <command>DELETE</command> operations.
       </para>
@@ -3753,7 +3802,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
      <listitem>
       <para>
        Data type <type>RECORD</type>; variable holding the old
-       database row for <command>UPDATE</>/<command>DELETE</> operations in row-level
+       database row for <command>UPDATE</command>/<command>DELETE</command> operations in row-level
        triggers. This variable is unassigned in statement-level triggers
        and for <command>INSERT</command> operations.
       </para>
@@ -3798,7 +3847,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
       <para>
        Data type <type>text</type>; a string of
        <literal>INSERT</literal>, <literal>UPDATE</literal>,
-       <literal>DELETE</literal>, or <literal>TRUNCATE</>
+       <literal>DELETE</literal>, or <literal>TRUNCATE</literal>
        telling for which operation the trigger was fired.
       </para>
      </listitem>
@@ -3820,7 +3869,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
       <para>
        Data type <type>name</type>; the name of the table that caused the trigger
        invocation. This is now deprecated, and could disappear in a future
-       release. Use <literal>TG_TABLE_NAME</> instead.
+       release. Use <literal>TG_TABLE_NAME</literal> instead.
       </para>
      </listitem>
     </varlistentry>
@@ -3862,7 +3911,7 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
        Data type array of <type>text</type>; the arguments from
        the <command>CREATE TRIGGER</command> statement.
        The index counts from 0. Invalid
-       indexes (less than 0 or greater than or equal to <varname>tg_nargs</>)
+       indexes (less than 0 or greater than or equal to <varname>tg_nargs</varname>)
        result in a null value.
       </para>
      </listitem>
@@ -3877,20 +3926,20 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
    </para>
 
    <para>
-    Row-level triggers fired <literal>BEFORE</> can return null to signal the
+    Row-level triggers fired <literal>BEFORE</literal> can return null to signal the
     trigger manager to skip the rest of the operation for this row
     (i.e., subsequent triggers are not fired, and the
-    <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> does not occur
+    <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> does not occur
     for this row).  If a nonnull
     value is returned then the operation proceeds with that row value.
     Returning a row value different from the original value
-    of <varname>NEW</> alters the row that will be inserted or
+    of <varname>NEW</varname> alters the row that will be inserted or
     updated.  Thus, if the trigger function wants the triggering
     action to succeed normally without altering the row
     value, <varname>NEW</varname> (or a value equal thereto) has to be
     returned.  To alter the row to be stored, it is possible to
-    replace single values directly in <varname>NEW</> and return the
-    modified <varname>NEW</>, or to build a complete new record/row to
+    replace single values directly in <varname>NEW</varname> and return the
+    modified <varname>NEW</varname>, or to build a complete new record/row to
     return.  In the case of a before-trigger
     on <command>DELETE</command>, the returned value has no direct
     effect, but it has to be nonnull to allow the trigger action to
@@ -3901,34 +3950,34 @@ ASSERT <replaceable class="parameter">condition</replaceable> <optional> , <repl
    </para>
 
    <para>
-    <literal>INSTEAD OF</> triggers (which are always row-level triggers,
+    <literal>INSTEAD OF</literal> triggers (which are always row-level triggers,
     and may only be used on views) can return null to signal that they did
     not perform any updates, and that the rest of the operation for this
     row should be skipped (i.e., subsequent triggers are not fired, and the
     row is not counted in the rows-affected status for the surrounding
-    <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>).
+    <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>).
     Otherwise a nonnull value should be returned, to signal
     that the trigger performed the requested operation. For
-    <command>INSERT</> and <command>UPDATE</> operations, the return value
-    should be <varname>NEW</>, which the trigger function may modify to
-    support <command>INSERT RETURNING</> and <command>UPDATE RETURNING</>
+    <command>INSERT</command> and <command>UPDATE</command> operations, the return value
+    should be <varname>NEW</varname>, which the trigger function may modify to
+    support <command>INSERT RETURNING</command> and <command>UPDATE RETURNING</command>
     (this will also affect the row value passed to any subsequent triggers,
-    or passed to a special <varname>EXCLUDED</> alias reference within
-    an <command>INSERT</> statement with an <literal>ON CONFLICT DO
-    UPDATE</> clause).  For <command>DELETE</> operations, the return
-    value should be <varname>OLD</>.
+    or passed to a special <varname>EXCLUDED</varname> alias reference within
+    an <command>INSERT</command> statement with an <literal>ON CONFLICT DO
+    UPDATE</literal> clause).  For <command>DELETE</command> operations, the return
+    value should be <varname>OLD</varname>.
    </para>
 
    <para>
     The return value of a row-level trigger
     fired <literal>AFTER</literal> or a statement-level trigger
-    fired <literal>BEFORE</> or <literal>AFTER</> is
+    fired <literal>BEFORE</literal> or <literal>AFTER</literal> is
     always ignored; it might as well be null. However, any of these types of
     triggers might still abort the entire operation by raising an error.
    </para>
 
    <para>
-    <xref linkend="plpgsql-trigger-example"> shows an example of a
+    <xref linkend="plpgsql-trigger-example"/> shows an example of a
     trigger procedure in <application>PL/pgSQL</application>.
    </para>
 
@@ -3981,7 +4030,7 @@ CREATE TRIGGER emp_stamp BEFORE INSERT OR UPDATE ON emp
     Another way to log changes to a table involves creating a new table that
     holds a row for each insert, update, or delete that occurs. This approach
     can be thought of as auditing changes to a table.
-    <xref linkend="plpgsql-trigger-audit-example"> shows an example of an
+    <xref linkend="plpgsql-trigger-audit-example"/> shows an example of an
     audit trigger procedure in <application>PL/pgSQL</application>.
    </para>
 
@@ -4013,7 +4062,7 @@ CREATE OR REPLACE FUNCTION process_emp_audit() RETURNS TRIGGER AS $emp_audit$
     BEGIN
         --
         -- Create a row in emp_audit to reflect the operation performed on emp,
-        -- make use of the special variable TG_OP to work out the operation.
+        -- making use of the special variable TG_OP to work out the operation.
         --
         IF (TG_OP = 'DELETE') THEN
             INSERT INTO emp_audit SELECT 'D', now(), user, OLD.*;
@@ -4038,7 +4087,7 @@ AFTER INSERT OR UPDATE OR DELETE ON emp
     approach still records the full audit trail of changes to the table,
     but also presents a simplified view of the audit trail, showing just
     the last modified timestamp derived from the audit trail for each entry.
-    <xref linkend="plpgsql-view-trigger-audit-example"> shows an example
+    <xref linkend="plpgsql-view-trigger-audit-example"/> shows an example
     of an audit trigger on a view in <application>PL/pgSQL</application>.
    </para>
 
@@ -4118,7 +4167,7 @@ INSTEAD OF INSERT OR UPDATE OR DELETE ON emp_view
     times.
     This technique is commonly used in Data Warehousing, where the tables
     of measured or observed data (called fact tables) might be extremely large.
-    <xref linkend="plpgsql-trigger-summary-example"> shows an example of a
+    <xref linkend="plpgsql-trigger-summary-example"/> shows an example of a
     trigger procedure in <application>PL/pgSQL</application> that maintains
     a summary table for a fact table in a data warehouse.
    </para>
@@ -4265,6 +4314,82 @@ UPDATE sales_fact SET units_sold = units_sold * 2;
 SELECT * FROM sales_summary_bytime;
 </programlisting>
    </example>
+
+   <para>
+    <literal>AFTER</literal> triggers can also make use of <firstterm>transition
+    tables</firstterm> to inspect the entire set of rows changed by the triggering
+    statement.  The <command>CREATE TRIGGER</command> command assigns names to one
+    or both transition tables, and then the function can refer to those names
+    as though they were read-only temporary tables.
+    <xref linkend="plpgsql-trigger-audit-transition-example"/> shows an example.
+   </para>
+
+   <example id="plpgsql-trigger-audit-transition-example">
+    <title>Auditing with Transition Tables</title>
+
+    <para>
+     This example produces the same results as
+     <xref linkend="plpgsql-trigger-audit-example"/>, but instead of using a
+     trigger that fires for every row, it uses a trigger that fires once
+     per statement, after collecting the relevant information in a transition
+     table.  This can be significantly faster than the row-trigger approach
+     when the invoking statement has modified many rows.  Notice that we must
+     make a separate trigger declaration for each kind of event, since the
+     <literal>REFERENCING</literal> clauses must be different for each case.  But
+     this does not stop us from using a single trigger function if we choose.
+     (In practice, it might be better to use three separate functions and
+     avoid the run-time tests on <varname>TG_OP</varname>.)
+    </para>
+
+<programlisting>
+CREATE TABLE emp (
+    empname           text NOT NULL,
+    salary            integer
+);
+
+CREATE TABLE emp_audit(
+    operation         char(1)   NOT NULL,
+    stamp             timestamp NOT NULL,
+    userid            text      NOT NULL,
+    empname           text      NOT NULL,
+    salary integer
+);
+
+CREATE OR REPLACE FUNCTION process_emp_audit() RETURNS TRIGGER AS $emp_audit$
+    BEGIN
+        --
+        -- Create rows in emp_audit to reflect the operations performed on emp,
+        -- making use of the special variable TG_OP to work out the operation.
+        --
+        IF (TG_OP = 'DELETE') THEN
+            INSERT INTO emp_audit
+                SELECT 'D', now(), user, o.* FROM old_table o;
+        ELSIF (TG_OP = 'UPDATE') THEN
+            INSERT INTO emp_audit
+                SELECT 'U', now(), user, n.* FROM new_table n;
+        ELSIF (TG_OP = 'INSERT') THEN
+            INSERT INTO emp_audit
+                SELECT 'I', now(), user, n.* FROM new_table n;
+        END IF;
+        RETURN NULL; -- result is ignored since this is an AFTER trigger
+    END;
+$emp_audit$ LANGUAGE plpgsql;
+
+CREATE TRIGGER emp_audit_ins
+    AFTER INSERT ON emp
+    REFERENCING NEW TABLE AS new_table
+    FOR EACH STATEMENT EXECUTE PROCEDURE process_emp_audit();
+CREATE TRIGGER emp_audit_upd
+    AFTER UPDATE ON emp
+    REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+    FOR EACH STATEMENT EXECUTE PROCEDURE process_emp_audit();
+CREATE TRIGGER emp_audit_del
+    AFTER DELETE ON emp
+    REFERENCING OLD TABLE AS old_table
+    FOR EACH STATEMENT EXECUTE PROCEDURE process_emp_audit();
+</programlisting>
+   </example>
+
 </sect2>
 
   <sect2 id="plpgsql-event-trigger">
@@ -4272,10 +4397,10 @@ SELECT * FROM sales_summary_bytime;
 
    <para>
     <application>PL/pgSQL</application> can be used to define
-    <link linkend="event-triggers">event triggers</>.
-    <productname>PostgreSQL</> requires that a procedure that
+    <link linkend="event-triggers">event triggers</link>.
+    <productname>PostgreSQL</productname> requires that a procedure that
     is to be called as an event trigger must be declared as a function with
-    no arguments and a return type of <literal>event_trigger</>.
+    no arguments and a return type of <literal>event_trigger</literal>.
    </para>
 
    <para>
@@ -4307,7 +4432,7 @@ SELECT * FROM sales_summary_bytime;
   </para>
 
    <para>
-    <xref linkend="plpgsql-event-trigger-example"> shows an example of an
+    <xref linkend="plpgsql-event-trigger-example"/> shows an example of an
     event trigger procedure in <application>PL/pgSQL</application>.
    </para>
 
@@ -4334,29 +4459,29 @@ CREATE EVENT TRIGGER snitch ON ddl_command_start EXECUTE PROCEDURE snitch();
   </sect1>
 
   <sect1 id="plpgsql-implementation">
-   <title><application>PL/pgSQL</> Under the Hood</title>
+   <title><application>PL/pgSQL</application> Under the Hood</title>
 
    <para>
     This section discusses some implementation details that are
-    frequently important for <application>PL/pgSQL</> users to know.
+    frequently important for <application>PL/pgSQL</application> users to know.
    </para>
 
   <sect2 id="plpgsql-var-subst">
    <title>Variable Substitution</title>
 
    <para>
-    SQL statements and expressions within a <application>PL/pgSQL</> function
+    SQL statements and expressions within a <application>PL/pgSQL</application> function
     can refer to variables and parameters of the function.  Behind the scenes,
-    <application>PL/pgSQL</> substitutes query parameters for such references.
+    <application>PL/pgSQL</application> substitutes query parameters for such references.
     Parameters will only be substituted in places where a parameter or
     column reference is syntactically allowed.  As an extreme case, consider
     this example of poor programming style:
 <programlisting>
 INSERT INTO foo (foo) VALUES (foo);
 </programlisting>
-    The first occurrence of <literal>foo</> must syntactically be a table
+    The first occurrence of <literal>foo</literal> must syntactically be a table
     name, so it will not be substituted, even if the function has a variable
-    named <literal>foo</>.  The second occurrence must be the name of a
+    named <literal>foo</literal>.  The second occurrence must be the name of a
     column of the table, so it will not be substituted either.  Only the
     third occurrence is a candidate to be a reference to the function's
     variable.
@@ -4377,18 +4502,18 @@ INSERT INTO foo (foo) VALUES (foo);
 <programlisting>
 INSERT INTO dest (col) SELECT foo + bar FROM src;
 </programlisting>
-    Here, <literal>dest</> and <literal>src</> must be table names, and
-    <literal>col</> must be a column of <literal>dest</>, but <literal>foo</>
-    and <literal>bar</> might reasonably be either variables of the function
-    or columns of <literal>src</>.
+    Here, <literal>dest</literal> and <literal>src</literal> must be table names, and
+    <literal>col</literal> must be a column of <literal>dest</literal>, but <literal>foo</literal>
+    and <literal>bar</literal> might reasonably be either variables of the function
+    or columns of <literal>src</literal>.
    </para>
 
    <para>
-    By default, <application>PL/pgSQL</> will report an error if a name
+    By default, <application>PL/pgSQL</application> will report an error if a name
     in a SQL statement could refer to either a variable or a table column.
     You can fix such a problem by renaming the variable or column,
     or by qualifying the ambiguous reference, or by telling
-    <application>PL/pgSQL</> which interpretation to prefer.
+    <application>PL/pgSQL</application> which interpretation to prefer.
    </para>
 
    <para>
@@ -4397,16 +4522,16 @@ INSERT INTO dest (col) SELECT foo + bar FROM src;
     different naming convention for <application>PL/pgSQL</application>
     variables than you use for column names.  For example,
     if you consistently name function variables
-    <literal>v_<replaceable>something</></literal> while none of your
-    column names start with <literal>v_</>, no conflicts will occur.
+    <literal>v_<replaceable>something</replaceable></literal> while none of your
+    column names start with <literal>v_</literal>, no conflicts will occur.
    </para>
 
    <para>
     Alternatively you can qualify ambiguous references to make them clear.
-    In the above example, <literal>src.foo</> would be an unambiguous reference
+    In the above example, <literal>src.foo</literal> would be an unambiguous reference
     to the table column.  To create an unambiguous reference to a variable,
     declare it in a labeled block and use the block's label
-    (see <xref linkend="plpgsql-structure">).  For example,
+    (see <xref linkend="plpgsql-structure"/>).  For example,
 <programlisting>
 &lt;&lt;block&gt;&gt;
 DECLARE
@@ -4415,37 +4540,37 @@ BEGIN
     foo := ...;
     INSERT INTO dest (col) SELECT block.foo + bar FROM src;
 </programlisting>
-    Here <literal>block.foo</> means the variable even if there is a column
-    <literal>foo</> in <literal>src</>.  Function parameters, as well as
-    special variables such as <literal>FOUND</>, can be qualified by the
+    Here <literal>block.foo</literal> means the variable even if there is a column
+    <literal>foo</literal> in <literal>src</literal>.  Function parameters, as well as
+    special variables such as <literal>FOUND</literal>, can be qualified by the
     function's name, because they are implicitly declared in an outer block
     labeled with the function's name.
    </para>
 
    <para>
     Sometimes it is impractical to fix all the ambiguous references in a
-    large body of <application>PL/pgSQL</> code.  In such cases you can
-    specify that <application>PL/pgSQL</> should resolve ambiguous references
-    as the variable (which is compatible with <application>PL/pgSQL</>'s
+    large body of <application>PL/pgSQL</application> code.  In such cases you can
+    specify that <application>PL/pgSQL</application> should resolve ambiguous references
+    as the variable (which is compatible with <application>PL/pgSQL</application>'s
     behavior before <productname>PostgreSQL</productname> 9.0), or as the
     table column (which is compatible with some other systems such as
     <productname>Oracle</productname>).
    </para>
 
    <indexterm>
-     <primary><varname>plpgsql.variable_conflict</> configuration parameter</primary>
+     <primary><varname>plpgsql.variable_conflict</varname> configuration parameter</primary>
    </indexterm>
 
    <para>
     To change this behavior on a system-wide basis, set the configuration
-    parameter <literal>plpgsql.variable_conflict</> to one of
-    <literal>error</>, <literal>use_variable</>, or
-    <literal>use_column</> (where <literal>error</> is the factory default).
+    parameter <literal>plpgsql.variable_conflict</literal> to one of
+    <literal>error</literal>, <literal>use_variable</literal>, or
+    <literal>use_column</literal> (where <literal>error</literal> is the factory default).
     This parameter affects subsequent compilations
-    of statements in <application>PL/pgSQL</> functions, but not statements
+    of statements in <application>PL/pgSQL</application> functions, but not statements
     already compiled in the current session.
     Because changing this setting
-    can cause unexpected changes in the behavior of <application>PL/pgSQL</>
+    can cause unexpected changes in the behavior of <application>PL/pgSQL</application>
     functions, it can only be changed by a superuser.
    </para>
 
@@ -4459,7 +4584,7 @@ BEGIN
 #variable_conflict use_column
 </programlisting>
     These commands affect only the function they are written in, and override
-    the setting of <literal>plpgsql.variable_conflict</>.  An example is
+    the setting of <literal>plpgsql.variable_conflict</literal>.  An example is
 <programlisting>
 CREATE FUNCTION stamp_user(id int, comment text) RETURNS void AS $$
     #variable_conflict use_variable
@@ -4471,15 +4596,15 @@ CREATE FUNCTION stamp_user(id int, comment text) RETURNS void AS $$
     END;
 $$ LANGUAGE plpgsql;
 </programlisting>
-    In the <literal>UPDATE</> command, <literal>curtime</>, <literal>comment</>,
-    and <literal>id</> will refer to the function's variable and parameters
-    whether or not <literal>users</> has columns of those names.  Notice
-    that we had to qualify the reference to <literal>users.id</> in the
-    <literal>WHERE</> clause to make it refer to the table column.
-    But we did not have to qualify the reference to <literal>comment</>
-    as a target in the <literal>UPDATE</> list, because syntactically
-    that must be a column of <literal>users</>.  We could write the same
-    function without depending on the <literal>variable_conflict</> setting
+    In the <literal>UPDATE</literal> command, <literal>curtime</literal>, <literal>comment</literal>,
+    and <literal>id</literal> will refer to the function's variable and parameters
+    whether or not <literal>users</literal> has columns of those names.  Notice
+    that we had to qualify the reference to <literal>users.id</literal> in the
+    <literal>WHERE</literal> clause to make it refer to the table column.
+    But we did not have to qualify the reference to <literal>comment</literal>
+    as a target in the <literal>UPDATE</literal> list, because syntactically
+    that must be a column of <literal>users</literal>.  We could write the same
+    function without depending on the <literal>variable_conflict</literal> setting
     in this way:
 <programlisting>
 CREATE FUNCTION stamp_user(id int, comment text) RETURNS void AS $$
@@ -4496,19 +4621,19 @@ $$ LANGUAGE plpgsql;
 
    <para>
     Variable substitution does not happen in the command string given
-    to <command>EXECUTE</> or one of its variants.  If you need to
+    to <command>EXECUTE</command> or one of its variants.  If you need to
     insert a varying value into such a command, do so as part of
-    constructing the string value, or use <literal>USING</>, as illustrated in
-    <xref linkend="plpgsql-statements-executing-dyn">.
+    constructing the string value, or use <literal>USING</literal>, as illustrated in
+    <xref linkend="plpgsql-statements-executing-dyn"/>.
    </para>
 
    <para>
-    Variable substitution currently works only in <command>SELECT</>,
-    <command>INSERT</>, <command>UPDATE</>, and <command>DELETE</> commands,
+    Variable substitution currently works only in <command>SELECT</command>,
+    <command>INSERT</command>, <command>UPDATE</command>, and <command>DELETE</command> commands,
     because the main SQL engine allows query parameters only in these
     commands.  To use a non-constant name or value in other statement
     types (generically called utility statements), you must construct
-    the utility statement as a string and <command>EXECUTE</> it.
+    the utility statement as a string and <command>EXECUTE</command> it.
    </para>
 
   </sect2>
@@ -4517,22 +4642,22 @@ $$ LANGUAGE plpgsql;
    <title>Plan Caching</title>
 
    <para>
-    The <application>PL/pgSQL</> interpreter parses the function's source
+    The <application>PL/pgSQL</application> interpreter parses the function's source
     text and produces an internal binary instruction tree the first time the
     function is called (within each session).  The instruction tree
     fully translates the
-    <application>PL/pgSQL</> statement structure, but individual
+    <application>PL/pgSQL</application> statement structure, but individual
     <acronym>SQL</acronym> expressions and <acronym>SQL</acronym> commands
     used in the function are not translated immediately.
    </para>
 
    <para>
     <indexterm>
-     <primary>preparing a query</>
-     <secondary>in PL/pgSQL</>
+     <primary>preparing a query</primary>
+     <secondary>in PL/pgSQL</secondary>
     </indexterm>
     As each expression and <acronym>SQL</acronym> command is first
-    executed in the function, the <application>PL/pgSQL</> interpreter
+    executed in the function, the <application>PL/pgSQL</application> interpreter
     parses and analyzes the command to create a prepared statement,
     using the <acronym>SPI</acronym> manager's
     <function>SPI_prepare</function> function.
@@ -4548,19 +4673,19 @@ $$ LANGUAGE plpgsql;
    </para>
 
    <para>
-    <application>PL/pgSQL</> (or more precisely, the SPI manager) can
+    <application>PL/pgSQL</application> (or more precisely, the SPI manager) can
     furthermore attempt to cache the execution plan associated with any
     particular prepared statement.  If a cached plan is not used, then
     a fresh execution plan is generated on each visit to the statement,
-    and the current parameter values (that is, <application>PL/pgSQL</>
+    and the current parameter values (that is, <application>PL/pgSQL</application>
     variable values) can be used to optimize the selected plan.  If the
     statement has no parameters, or is executed many times, the SPI manager
-    will consider creating a <firstterm>generic</> plan that is not dependent
+    will consider creating a <firstterm>generic</firstterm> plan that is not dependent
     on specific parameter values, and caching that for re-use.  Typically
     this will happen only if the execution plan is not very sensitive to
-    the values of the <application>PL/pgSQL</> variables referenced in it.
+    the values of the <application>PL/pgSQL</application> variables referenced in it.
     If it is, generating a plan each time is a net win.  See <xref
-    linkend="sql-prepare"> for more information about the behavior of
+    linkend="sql-prepare"/> for more information about the behavior of
     prepared statements.
    </para>
 
@@ -4594,7 +4719,7 @@ $$ LANGUAGE plpgsql;
      for each trigger function and table combination, not just for each
      function.  This alleviates some of the problems with varying
      data types; for instance, a trigger function will be able to work
-     successfully with a column named <literal>key</> even if it happens
+     successfully with a column named <literal>key</literal> even if it happens
      to have different types in different tables.
     </para>
 
@@ -4644,8 +4769,8 @@ $$ LANGUAGE plpgsql;
      <command>INSERT</command> is analyzed, and then used in all
      invocations of <function>logfunc1</function> during the lifetime
      of the session. Needless to say, this isn't what the programmer
-     wanted.  A better idea is to use the <literal>now()</> or
-     <literal>current_timestamp</> function.
+     wanted.  A better idea is to use the <literal>now()</literal> or
+     <literal>current_timestamp</literal> function.
     </para>
 
     <para>
@@ -4661,7 +4786,7 @@ $$ LANGUAGE plpgsql;
      functions for the conversion.  So, the computed time stamp is updated
      on each execution as the programmer expects.  Even though this
      happens to work as expected, it's not terribly efficient, so
-     use of the <literal>now()</> function would still be a better idea.
+     use of the <literal>now()</literal> function would still be a better idea.
     </para>
 
   </sect2>
@@ -4673,12 +4798,12 @@ $$ LANGUAGE plpgsql;
 
    <para>
     One good way to develop in
-    <application>PL/pgSQL</> is to use the text editor of your
+    <application>PL/pgSQL</application> is to use the text editor of your
     choice to create your functions, and in another window, use
     <application>psql</application> to load and test those functions.
     If you are doing it this way, it
     is a good idea to write the function using <command>CREATE OR
-    REPLACE FUNCTION</>. That way you can just reload the file to update
+    REPLACE FUNCTION</command>. That way you can just reload the file to update
     the function definition.  For example:
 <programlisting>
 CREATE OR REPLACE FUNCTION testfunc(integer) RETURNS integer AS $$
@@ -4697,10 +4822,10 @@ $$ LANGUAGE plpgsql;
    </para>
 
    <para>
-    Another good way to develop in <application>PL/pgSQL</> is with a
+    Another good way to develop in <application>PL/pgSQL</application> is with a
     GUI database access tool that facilitates development in a
     procedural language. One example of such a tool is
-    <application>pgAdmin</>, although others exist. These tools often
+    <application>pgAdmin</application>, although others exist. These tools often
     provide convenient features such as escaping single quotes and
     making it easier to recreate and debug functions.
    </para>
@@ -4709,7 +4834,7 @@ $$ LANGUAGE plpgsql;
    <title>Handling of Quotation Marks</title>
 
    <para>
-    The code of a <application>PL/pgSQL</> function is specified in
+    The code of a <application>PL/pgSQL</application> function is specified in
     <command>CREATE FUNCTION</command> as a string literal.  If you
     write the string literal in the ordinary way with surrounding
     single quotes, then any single quotes inside the function body
@@ -4719,8 +4844,8 @@ $$ LANGUAGE plpgsql;
     the code can become downright incomprehensible, because you can
     easily find yourself needing half a dozen or more adjacent quote marks.
     It's recommended that you instead write the function body as a
-    <quote>dollar-quoted</> string literal (see <xref
-    linkend="sql-syntax-dollar-quoting">).  In the dollar-quoting
+    <quote>dollar-quoted</quote> string literal (see <xref
+    linkend="sql-syntax-dollar-quoting"/>).  In the dollar-quoting
     approach, you never double any quote marks, but instead take care to
     choose a different dollar-quoting delimiter for each level of
     nesting you need.  For example, you might write the <command>CREATE
@@ -4731,9 +4856,9 @@ CREATE OR REPLACE FUNCTION testfunc(integer) RETURNS integer AS $PROC$
 $PROC$ LANGUAGE plpgsql;
 </programlisting>
     Within this, you might use quote marks for simple literal strings in
-    SQL commands and <literal>$$</> to delimit fragments of SQL commands
+    SQL commands and <literal>$$</literal> to delimit fragments of SQL commands
     that you are assembling as strings.  If you need to quote text that
-    includes <literal>$$</>, you could use <literal>$Q$</>, and so on.
+    includes <literal>$$</literal>, you could use <literal>$Q$</literal>, and so on.
    </para>
 
    <para>
@@ -4754,7 +4879,7 @@ CREATE FUNCTION foo() RETURNS integer AS '
 ' LANGUAGE plpgsql;
 </programlisting>
       Anywhere within a single-quoted function body, quote marks
-      <emphasis>must</> appear in pairs.
+      <emphasis>must</emphasis> appear in pairs.
      </para>
     </listitem>
    </varlistentry>
@@ -4773,7 +4898,7 @@ SELECT * FROM users WHERE f_name=''foobar'';
 a_output := 'Blah';
 SELECT * FROM users WHERE f_name='foobar';
 </programlisting>
-      which is exactly what the <application>PL/pgSQL</> parser would see
+      which is exactly what the <application>PL/pgSQL</application> parser would see
       in either case.
      </para>
     </listitem>
@@ -4797,7 +4922,7 @@ a_output := a_output || '' AND name LIKE ''''foobar'''' AND xyz''
 a_output := a_output || $$ AND name LIKE 'foobar' AND xyz$$
 </programlisting>
       being careful that any dollar-quote delimiters around this are not
-      just <literal>$$</>.
+      just <literal>$$</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -4831,7 +4956,7 @@ a_output := a_output || $$ AND name LIKE 'foobar'$$
       accounts for 8 quotation marks) and this is adjacent to the end of that
       string constant (2 more).  You will probably only need that if
       you are writing a function that generates other functions, as in
-      <xref linkend="plpgsql-porting-ex2">.
+      <xref linkend="plpgsql-porting-ex2"/>.
       For example:
 <programlisting>
 a_output := a_output || '' if v_'' ||
@@ -4866,20 +4991,20 @@ a_output := a_output || $$ if v_$$ || referrer_keys.kind || $$ like '$$
 
    <para>
     To aid the user in finding instances of simple but common problems before
-    they cause harm, <application>PL/pgSQL</> provides additional
-    <replaceable>checks</>. When enabled, depending on the configuration, they
-    can be used to emit either a <literal>WARNING</> or an <literal>ERROR</>
+    they cause harm, <application>PL/pgSQL</application> provides additional
+    <replaceable>checks</replaceable>. When enabled, depending on the configuration, they
+    can be used to emit either a <literal>WARNING</literal> or an <literal>ERROR</literal>
     during the compilation of a function. A function which has received
-    a <literal>WARNING</> can be executed without producing further messages,
+    a <literal>WARNING</literal> can be executed without producing further messages,
     so you are advised to test in a separate development environment.
    </para>
 
  <para>
   These additional checks are enabled through the configuration variables
-  <varname>plpgsql.extra_warnings</> for warnings and
-  <varname>plpgsql.extra_errors</> for errors. Both can be set either to
-  a comma-separated list of checks, <literal>"none"</> or <literal>"all"</>.
-  The default is <literal>"none"</>. Currently the list of available checks
+  <varname>plpgsql.extra_warnings</varname> for warnings and
+  <varname>plpgsql.extra_errors</varname> for errors. Both can be set either to
+  a comma-separated list of checks, <literal>"none"</literal> or <literal>"all"</literal>.
+  The default is <literal>"none"</literal>. Currently the list of available checks
   includes only one:
   <variablelist>
    <varlistentry>
@@ -4892,8 +5017,8 @@ a_output := a_output || $$ if v_$$ || referrer_keys.kind || $$ like '$$
    </varlistentry>
   </variablelist>
 
-  The following example shows the effect of <varname>plpgsql.extra_warnings</>
-  set to <varname>shadowed_variables</>:
+  The following example shows the effect of <varname>plpgsql.extra_warnings</varname>
+  set to <varname>shadowed_variables</varname>:
 <programlisting>
 SET plpgsql.extra_warnings TO 'shadowed_variables';
 
@@ -4930,10 +5055,10 @@ CREATE FUNCTION
 
   <para>
    This section explains differences between
-   <productname>PostgreSQL</>'s <application>PL/pgSQL</application>
+   <productname>PostgreSQL</productname>'s <application>PL/pgSQL</application>
    language and Oracle's <application>PL/SQL</application> language,
    to help developers who port applications from
-   <trademark class="registered">Oracle</> to <productname>PostgreSQL</>.
+   <trademark class="registered">Oracle</trademark> to <productname>PostgreSQL</productname>.
   </para>
 
   <para>
@@ -4941,7 +5066,7 @@ CREATE FUNCTION
    aspects. It is a block-structured, imperative language, and all
    variables have to be declared.  Assignments, loops, conditionals
    are similar.  The main differences you should keep in mind when
-   porting from <application>PL/SQL</> to
+   porting from <application>PL/SQL</application> to
    <application>PL/pgSQL</application> are:
 
     <itemizedlist>
@@ -4949,34 +5074,34 @@ CREATE FUNCTION
       <para>
        If a name used in a SQL command could be either a column name of a
        table or a reference to a variable of the function,
-       <application>PL/SQL</> treats it as a column name.  This corresponds
-       to <application>PL/pgSQL</>'s
-       <literal>plpgsql.variable_conflict</> = <literal>use_column</>
+       <application>PL/SQL</application> treats it as a column name.  This corresponds
+       to <application>PL/pgSQL</application>'s
+       <literal>plpgsql.variable_conflict</literal> = <literal>use_column</literal>
        behavior, which is not the default,
-       as explained in <xref linkend="plpgsql-var-subst">.
+       as explained in <xref linkend="plpgsql-var-subst"/>.
        It's often best to avoid such ambiguities in the first place,
        but if you have to port a large amount of code that depends on
-       this behavior, setting <literal>variable_conflict</> may be the
+       this behavior, setting <literal>variable_conflict</literal> may be the
        best solution.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       In <productname>PostgreSQL</> the function body must be written as
+       In <productname>PostgreSQL</productname> the function body must be written as
        a string literal.  Therefore you need to use dollar quoting or escape
        single quotes in the function body. (See <xref
-       linkend="plpgsql-quote-tips">.)
+       linkend="plpgsql-quote-tips"/>.)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Data type names often need translation.  For example, in Oracle string
-       values are commonly declared as being of type <type>varchar2</>, which
+       values are commonly declared as being of type <type>varchar2</type>, which
        is a non-SQL-standard type.  In <productname>PostgreSQL</productname>,
-       use type <type>varchar</> or <type>text</> instead.  Similarly, replace
-       type <type>number</> with <type>numeric</>, or use some other numeric
+       use type <type>varchar</type> or <type>text</type> instead.  Similarly, replace
+       type <type>number</type> with <type>numeric</type>, or use some other numeric
        data type if there's a more appropriate one.
       </para>
      </listitem>
@@ -4998,21 +5123,21 @@ CREATE FUNCTION
 
      <listitem>
       <para>
-       Integer <command>FOR</> loops with <literal>REVERSE</> work
-       differently: <application>PL/SQL</> counts down from the second
-       number to the first, while <application>PL/pgSQL</> counts down
+       Integer <command>FOR</command> loops with <literal>REVERSE</literal> work
+       differently: <application>PL/SQL</application> counts down from the second
+       number to the first, while <application>PL/pgSQL</application> counts down
        from the first number to the second, requiring the loop bounds
        to be swapped when porting.  This incompatibility is unfortunate
        but is unlikely to be changed. (See <xref
-       linkend="plpgsql-integer-for">.)
+       linkend="plpgsql-integer-for"/>.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <command>FOR</> loops over queries (other than cursors) also work
+       <command>FOR</command> loops over queries (other than cursors) also work
        differently: the target variable(s) must have been declared,
-       whereas <application>PL/SQL</> always declares them implicitly.
+       whereas <application>PL/SQL</application> always declares them implicitly.
        An advantage of this is that the variable values are still accessible
        after the loop exits.
       </para>
@@ -5032,15 +5157,15 @@ CREATE FUNCTION
    <title>Porting Examples</title>
 
    <para>
-    <xref linkend="pgsql-porting-ex1"> shows how to port a simple
-    function from <application>PL/SQL</> to <application>PL/pgSQL</>.
+    <xref linkend="pgsql-porting-ex1"/> shows how to port a simple
+    function from <application>PL/SQL</application> to <application>PL/pgSQL</application>.
    </para>
 
    <example id="pgsql-porting-ex1">
-    <title>Porting a Simple Function from <application>PL/SQL</> to <application>PL/pgSQL</></title>
+    <title>Porting a Simple Function from <application>PL/SQL</application> to <application>PL/pgSQL</application></title>
 
     <para>
-     Here is an <productname>Oracle</productname> <application>PL/SQL</> function:
+     Here is an <productname>Oracle</productname> <application>PL/SQL</application> function:
 <programlisting>
 CREATE OR REPLACE FUNCTION cs_fmt_browser_version(v_name varchar2,
                                                   v_version varchar2)
@@ -5058,14 +5183,14 @@ show errors;
 
     <para>
      Let's go through this function and see the differences compared to
-     <application>PL/pgSQL</>:
+     <application>PL/pgSQL</application>:
 
      <itemizedlist>
       <listitem>
        <para>
-        The type name <type>varchar2</> has to be changed to <type>varchar</>
-        or <type>text</>.  In the examples in this section, we'll
-        use <type>varchar</>, but <type>text</> is often a better choice if
+        The type name <type>varchar2</type> has to be changed to <type>varchar</type>
+        or <type>text</type>.  In the examples in this section, we'll
+        use <type>varchar</type>, but <type>text</type> is often a better choice if
         you do not need specific string length limits.
        </para>
       </listitem>
@@ -5076,17 +5201,17 @@ show errors;
         prototype (not the function body) becomes
         <literal>RETURNS</literal> in
         <productname>PostgreSQL</productname>.
-        Also, <literal>IS</> becomes <literal>AS</>, and you need to
-        add a <literal>LANGUAGE</> clause because <application>PL/pgSQL</>
+        Also, <literal>IS</literal> becomes <literal>AS</literal>, and you need to
+        add a <literal>LANGUAGE</literal> clause because <application>PL/pgSQL</application>
         is not the only possible function language.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <productname>PostgreSQL</>, the function body is considered
+        In <productname>PostgreSQL</productname>, the function body is considered
         to be a string literal, so you need to use quote marks or dollar
-        quotes around it.  This substitutes for the terminating <literal>/</>
+        quotes around it.  This substitutes for the terminating <literal>/</literal>
         in the Oracle approach.
        </para>
       </listitem>
@@ -5094,7 +5219,7 @@ show errors;
       <listitem>
        <para>
         The <literal>show errors</literal> command does not exist in
-        <productname>PostgreSQL</>, and is not needed since errors are
+        <productname>PostgreSQL</productname>, and is not needed since errors are
         reported automatically.
        </para>
       </listitem>
@@ -5103,7 +5228,7 @@ show errors;
 
     <para>
      This is how this function would look when ported to
-     <productname>PostgreSQL</>:
+     <productname>PostgreSQL</productname>:
 
 <programlisting>
 CREATE OR REPLACE FUNCTION cs_fmt_browser_version(v_name varchar,
@@ -5121,13 +5246,13 @@ $$ LANGUAGE plpgsql;
    </example>
 
    <para>
-    <xref linkend="plpgsql-porting-ex2"> shows how to port a
+    <xref linkend="plpgsql-porting-ex2"/> shows how to port a
     function that creates another function and how to handle the
     ensuing quoting problems.
    </para>
 
    <example id="plpgsql-porting-ex2">
-    <title>Porting a Function that Creates Another Function from <application>PL/SQL</> to <application>PL/pgSQL</></title>
+    <title>Porting a Function that Creates Another Function from <application>PL/SQL</application> to <application>PL/pgSQL</application></title>
 
     <para>
      The following procedure grabs rows from a
@@ -5166,9 +5291,9 @@ show errors;
     </para>
 
     <para>
-     Here is how this function would end up in <productname>PostgreSQL</>:
+     Here is how this function would end up in <productname>PostgreSQL</productname>:
 <programlisting>
-CREATE OR REPLACE FUNCTION cs_update_referrer_type_proc() RETURNS void AS $func$
+CREATE OR REPLACE PROCEDURE cs_update_referrer_type_proc() AS $func$
 DECLARE
     referrer_keys CURSOR IS
         SELECT * FROM cs_referrer_keys
@@ -5201,27 +5326,27 @@ END;
 $func$ LANGUAGE plpgsql;
 </programlisting>
      Notice how the body of the function is built separately and passed
-     through <literal>quote_literal</> to double any quote marks in it.  This
+     through <literal>quote_literal</literal> to double any quote marks in it.  This
      technique is needed because we cannot safely use dollar quoting for
      defining the new function: we do not know for sure what strings will
-     be interpolated from the <structfield>referrer_key.key_string</> field.
-     (We are assuming here that <structfield>referrer_key.kind</> can be
-     trusted to always be <literal>host</>, <literal>domain</>, or
-     <literal>url</>, but <structfield>referrer_key.key_string</> might be
+     be interpolated from the <structfield>referrer_key.key_string</structfield> field.
+     (We are assuming here that <structfield>referrer_key.kind</structfield> can be
+     trusted to always be <literal>host</literal>, <literal>domain</literal>, or
+     <literal>url</literal>, but <structfield>referrer_key.key_string</structfield> might be
      anything, in particular it might contain dollar signs.) This function
      is actually an improvement on the Oracle original, because it will
-     not generate broken code when <structfield>referrer_key.key_string</> or
-     <structfield>referrer_key.referrer_type</> contain quote marks.
+     not generate broken code when <structfield>referrer_key.key_string</structfield> or
+     <structfield>referrer_key.referrer_type</structfield> contain quote marks.
     </para>
    </example>
 
    <para>
-    <xref linkend="plpgsql-porting-ex3"> shows how to port a function
-    with <literal>OUT</> parameters and string manipulation.
-    <productname>PostgreSQL</> does not have a built-in
+    <xref linkend="plpgsql-porting-ex3"/> shows how to port a function
+    with <literal>OUT</literal> parameters and string manipulation.
+    <productname>PostgreSQL</productname> does not have a built-in
     <function>instr</function> function, but you can create one
     using a combination of other
-    functions. In <xref linkend="plpgsql-porting-appendix"> there is a
+    functions. In <xref linkend="plpgsql-porting-appendix"/> there is a
     <application>PL/pgSQL</application> implementation of
     <function>instr</function> that you can use to make your porting
     easier.
@@ -5229,8 +5354,8 @@ $func$ LANGUAGE plpgsql;
 
    <example id="plpgsql-porting-ex3">
     <title>Porting a Procedure With String Manipulation and
-    <literal>OUT</> Parameters from <application>PL/SQL</> to
-    <application>PL/pgSQL</></title>
+    <literal>OUT</literal> Parameters from <application>PL/SQL</application> to
+    <application>PL/pgSQL</application></title>
 
     <para>
      The following <productname>Oracle</productname> PL/SQL procedure is used
@@ -5281,7 +5406,7 @@ show errors;
     </para>
 
     <para>
-     Here is a possible translation into <application>PL/pgSQL</>:
+     Here is a possible translation into <application>PL/pgSQL</application>:
 <programlisting>
 CREATE OR REPLACE FUNCTION cs_parse_url(
     v_url IN VARCHAR,
@@ -5330,12 +5455,12 @@ SELECT * FROM cs_parse_url('http://foobar.com/query.cgi?baz');
    </example>
 
    <para>
-    <xref linkend="plpgsql-porting-ex4"> shows how to port a procedure
+    <xref linkend="plpgsql-porting-ex4"/> shows how to port a procedure
     that uses numerous features that are specific to Oracle.
    </para>
 
    <example id="plpgsql-porting-ex4">
-    <title>Porting a Procedure from <application>PL/SQL</> to <application>PL/pgSQL</></title>
+    <title>Porting a Procedure from <application>PL/SQL</application> to <application>PL/pgSQL</application></title>
 
     <para>
      The Oracle version:
@@ -5343,14 +5468,13 @@ SELECT * FROM cs_parse_url('http://foobar.com/query.cgi?baz');
 <programlisting>
 CREATE OR REPLACE PROCEDURE cs_create_job(v_job_id IN INTEGER) IS
     a_running_job_count INTEGER;
-    PRAGMA AUTONOMOUS_TRANSACTION; -- <co id="co.plpgsql-porting-pragma">
 BEGIN
-    LOCK TABLE cs_jobs IN EXCLUSIVE MODE; -- <co id="co.plpgsql-porting-locktable">
+    LOCK TABLE cs_jobs IN EXCLUSIVE MODE;
 
     SELECT count(*) INTO a_running_job_count FROM cs_jobs WHERE end_stamp IS NULL;
 
     IF a_running_job_count &gt; 0 THEN
-        COMMIT; -- free lock <co id="co.plpgsql-porting-commit">
+        COMMIT; -- free lock
         raise_application_error(-20000,
                  'Unable to create a new job: a job is currently running.');
     END IF;
@@ -5371,44 +5495,10 @@ show errors
    </para>
 
    <para>
-    Procedures like this can easily be converted into <productname>PostgreSQL</>
-    functions returning <type>void</type>. This procedure in
-    particular is interesting because it can teach us some things:
-
-    <calloutlist>
-     <callout arearefs="co.plpgsql-porting-pragma">
-      <para>
-       There is no <literal>PRAGMA</literal> statement in <productname>PostgreSQL</>.
-      </para>
-     </callout>
-
-     <callout arearefs="co.plpgsql-porting-locktable">
-      <para>
-       If you do a <command>LOCK TABLE</command> in <application>PL/pgSQL</>,
-       the lock will not be released until the calling transaction is
-       finished.
-      </para>
-     </callout>
-
-     <callout arearefs="co.plpgsql-porting-commit">
-      <para>
-       You cannot issue <command>COMMIT</> in a
-       <application>PL/pgSQL</application> function.  The function is
-       running within some outer transaction and so <command>COMMIT</>
-       would imply terminating the function's execution.  However, in
-       this particular case it is not necessary anyway, because the lock
-       obtained by the <command>LOCK TABLE</command> will be released when
-       we raise an error.
-      </para>
-     </callout>
-    </calloutlist>
-   </para>
-
-   <para>
-    This is how we could port this procedure to <application>PL/pgSQL</>:
+    This is how we could port this procedure to <application>PL/pgSQL</application>:
 
 <programlisting>
-CREATE OR REPLACE FUNCTION cs_create_job(v_job_id integer) RETURNS void AS $$
+CREATE OR REPLACE PROCEDURE cs_create_job(v_job_id integer) AS $$
 DECLARE
     a_running_job_count integer;
 BEGIN
@@ -5417,7 +5507,8 @@ BEGIN
     SELECT count(*) INTO a_running_job_count FROM cs_jobs WHERE end_stamp IS NULL;
 
     IF a_running_job_count &gt; 0 THEN
-        RAISE EXCEPTION 'Unable to create a new job: a job is currently running'; -- <co id="co.plpgsql-porting-raise">
+        COMMIT; -- free lock
+        RAISE EXCEPTION 'Unable to create a new job: a job is currently running'; -- <co id="co.plpgsql-porting-raise"/>
     END IF;
 
     DELETE FROM cs_active_job;
@@ -5426,9 +5517,10 @@ BEGIN
     BEGIN
         INSERT INTO cs_jobs (job_id, start_stamp) VALUES (v_job_id, now());
     EXCEPTION
-        WHEN unique_violation THEN -- <co id="co.plpgsql-porting-exception">
+        WHEN unique_violation THEN -- <co id="co.plpgsql-porting-exception"/>
             -- don't worry if it already exists
     END;
+    COMMIT;
 END;
 $$ LANGUAGE plpgsql;
 </programlisting>
@@ -5436,28 +5528,22 @@ $$ LANGUAGE plpgsql;
     <calloutlist>
      <callout arearefs="co.plpgsql-porting-raise">
       <para>
-       The syntax of <literal>RAISE</> is considerably different from
-       Oracle's statement, although the basic case <literal>RAISE</>
+       The syntax of <literal>RAISE</literal> is considerably different from
+       Oracle's statement, although the basic case <literal>RAISE</literal>
        <replaceable class="parameter">exception_name</replaceable> works
        similarly.
       </para>
      </callout>
      <callout arearefs="co.plpgsql-porting-exception">
       <para>
-       The exception names supported by <application>PL/pgSQL</> are
+       The exception names supported by <application>PL/pgSQL</application> are
        different from Oracle's.  The set of built-in exception names
-       is much larger (see <xref linkend="errcodes-appendix">).  There
+       is much larger (see <xref linkend="errcodes-appendix"/>).  There
        is not currently a way to declare user-defined exception names,
        although you can throw user-chosen SQLSTATE values instead.
       </para>
      </callout>
     </calloutlist>
-
-    The main functional difference between this procedure and the
-    Oracle equivalent is that the exclusive lock on the <literal>cs_jobs</>
-    table will be held until the calling transaction completes.  Also, if
-    the caller later aborts (for example due to an error), the effects of
-    this procedure will be rolled back.
    </para>
    </example>
   </sect2>
@@ -5467,7 +5553,7 @@ $$ LANGUAGE plpgsql;
 
    <para>
     This section explains a few other things to watch for when porting
-    Oracle <application>PL/SQL</> functions to
+    Oracle <application>PL/SQL</application> functions to
     <productname>PostgreSQL</productname>.
    </para>
 
@@ -5475,9 +5561,9 @@ $$ LANGUAGE plpgsql;
     <title>Implicit Rollback after Exceptions</title>
 
     <para>
-     In <application>PL/pgSQL</>, when an exception is caught by an
-     <literal>EXCEPTION</> clause, all database changes since the block's
-     <literal>BEGIN</> are automatically rolled back.  That is, the behavior
+     In <application>PL/pgSQL</application>, when an exception is caught by an
+     <literal>EXCEPTION</literal> clause, all database changes since the block's
+     <literal>BEGIN</literal> are automatically rolled back.  That is, the behavior
      is equivalent to what you'd get in Oracle with:
 
 <programlisting>
@@ -5495,10 +5581,10 @@ END;
 </programlisting>
 
      If you are translating an Oracle procedure that uses
-     <command>SAVEPOINT</> and <command>ROLLBACK TO</> in this style,
-     your task is easy: just omit the <command>SAVEPOINT</> and
-     <command>ROLLBACK TO</>.  If you have a procedure that uses
-     <command>SAVEPOINT</> and <command>ROLLBACK TO</> in a different way
+     <command>SAVEPOINT</command> and <command>ROLLBACK TO</command> in this style,
+     your task is easy: just omit the <command>SAVEPOINT</command> and
+     <command>ROLLBACK TO</command>.  If you have a procedure that uses
+     <command>SAVEPOINT</command> and <command>ROLLBACK TO</command> in a different way
      then some actual thought will be required.
     </para>
    </sect3>
@@ -5507,12 +5593,12 @@ END;
     <title><command>EXECUTE</command></title>
 
     <para>
-     The <application>PL/pgSQL</> version of
+     The <application>PL/pgSQL</application> version of
      <command>EXECUTE</command> works similarly to the
-     <application>PL/SQL</> version, but you have to remember to use
+     <application>PL/SQL</application> version, but you have to remember to use
      <function>quote_literal</function> and
      <function>quote_ident</function> as described in <xref
-     linkend="plpgsql-statements-executing-dyn">.  Constructs of the
+     linkend="plpgsql-statements-executing-dyn"/>.  Constructs of the
      type <literal>EXECUTE 'SELECT * FROM $1';</literal> will not work
      reliably unless you use these functions.
     </para>
@@ -5522,12 +5608,12 @@ END;
     <title>Optimizing <application>PL/pgSQL</application> Functions</title>
 
     <para>
-     <productname>PostgreSQL</> gives you two function creation
-     modifiers to optimize execution: <quote>volatility</> (whether
+     <productname>PostgreSQL</productname> gives you two function creation
+     modifiers to optimize execution: <quote>volatility</quote> (whether
      the function always returns the same result when given the same
      arguments) and <quote>strictness</quote> (whether the function
      returns null if any argument is null).  Consult the <xref
-     linkend="sql-createfunction">
+     linkend="sql-createfunction"/>
      reference page for details.
     </para>
 
@@ -5555,30 +5641,32 @@ $$ LANGUAGE plpgsql STRICT IMMUTABLE;
    </para>
 
    <indexterm>
-    <primary><function>instr</> function</primary>
+    <primary><function>instr</function> function</primary>
    </indexterm>
 
-<programlisting>
+<programlisting><![CDATA[
 --
 -- instr functions that mimic Oracle's counterpart
--- Syntax: instr(string1, string2, [n], [m]) where [] denotes optional parameters.
+-- Syntax: instr(string1, string2 [, n [, m]])
+-- where [] denotes optional parameters.
 --
--- Searches string1 beginning at the nth character for the mth occurrence
--- of string2.  If n is negative, search backwards.  If m is not passed,
--- assume 1 (search starts at first character).
+-- Search string1, beginning at the nth character, for the mth occurrence
+-- of string2.  If n is negative, search backwards, starting at the abs(n)'th
+-- character from the end of string1.
+-- If n is not passed, assume 1 (search starts at first character).
+-- If m is not passed, assume 1 (find first occurrence).
+-- Returns starting index of string2 in string1, or 0 if string2 is not found.
 --
 
 CREATE FUNCTION instr(varchar, varchar) RETURNS integer AS $$
-DECLARE
-    pos integer;
 BEGIN
-    pos:= instr($1, $2, 1);
-    RETURN pos;
+    RETURN instr($1, $2, 1);
 END;
 $$ LANGUAGE plpgsql STRICT IMMUTABLE;
 
 
-CREATE FUNCTION instr(string varchar, string_to_search varchar, beg_index integer)
+CREATE FUNCTION instr(string varchar, string_to_search_for varchar,
+                      beg_index integer)
 RETURNS integer AS $$
 DECLARE
     pos integer NOT NULL DEFAULT 0;
@@ -5587,25 +5675,23 @@ DECLARE
     length integer;
     ss_length integer;
 BEGIN
-    IF beg_index &gt; 0 THEN
+    IF beg_index > 0 THEN
         temp_str := substring(string FROM beg_index);
-        pos := position(string_to_search IN temp_str);
+        pos := position(string_to_search_for IN temp_str);
 
         IF pos = 0 THEN
             RETURN 0;
         ELSE
             RETURN pos + beg_index - 1;
         END IF;
-    ELSIF beg_index &lt; 0 THEN
-        ss_length := char_length(string_to_search);
+    ELSIF beg_index < 0 THEN
+        ss_length := char_length(string_to_search_for);
         length := char_length(string);
-        beg := length + beg_index - ss_length + 2;
+        beg := length + 1 + beg_index;
 
-        WHILE beg &gt; 0 LOOP
+        WHILE beg > 0 LOOP
             temp_str := substring(string FROM beg FOR ss_length);
-            pos := position(string_to_search IN temp_str);
-
-            IF pos &gt; 0 THEN
+            IF string_to_search_for = temp_str THEN
                 RETURN beg;
             END IF;
 
@@ -5620,7 +5706,7 @@ END;
 $$ LANGUAGE plpgsql STRICT IMMUTABLE;
 
 
-CREATE FUNCTION instr(string varchar, string_to_search varchar,
+CREATE FUNCTION instr(string varchar, string_to_search_for varchar,
                       beg_index integer, occur_index integer)
 RETURNS integer AS $$
 DECLARE
@@ -5632,39 +5718,32 @@ DECLARE
     length integer;
     ss_length integer;
 BEGIN
-    IF beg_index &gt; 0 THEN
-        beg := beg_index;
-        temp_str := substring(string FROM beg_index);
+    IF occur_index <= 0 THEN
+        RAISE 'argument ''%'' is out of range', occur_index
+          USING ERRCODE = '22003';
+    END IF;
 
+    IF beg_index > 0 THEN
+        beg := beg_index - 1;
         FOR i IN 1..occur_index LOOP
-            pos := position(string_to_search IN temp_str);
-
-            IF i = 1 THEN
-                beg := beg + pos - 1;
-            ELSE
-                beg := beg + pos;
-            END IF;
-
             temp_str := substring(string FROM beg + 1);
+            pos := position(string_to_search_for IN temp_str);
+            IF pos = 0 THEN
+                RETURN 0;
+            END IF;
+            beg := beg + pos;
         END LOOP;
 
-        IF pos = 0 THEN
-            RETURN 0;
-        ELSE
-            RETURN beg;
-        END IF;
-    ELSIF beg_index &lt; 0 THEN
-        ss_length := char_length(string_to_search);
+        RETURN beg;
+    ELSIF beg_index < 0 THEN
+        ss_length := char_length(string_to_search_for);
         length := char_length(string);
-        beg := length + beg_index - ss_length + 2;
+        beg := length + 1 + beg_index;
 
-        WHILE beg &gt; 0 LOOP
+        WHILE beg > 0 LOOP
             temp_str := substring(string FROM beg FOR ss_length);
-            pos := position(string_to_search IN temp_str);
-
-            IF pos &gt; 0 THEN
+            IF string_to_search_for = temp_str THEN
                 occur_number := occur_number + 1;
-
                 IF occur_number = occur_index THEN
                     RETURN beg;
                 END IF;
@@ -5679,6 +5758,7 @@ BEGIN
     END IF;
 END;
 $$ LANGUAGE plpgsql STRICT IMMUTABLE;
+]]>
 </programlisting>
   </sect2>
 
diff --git a/doc/src/sgml/plpython.sgml b/doc/src/sgml/plpython.sgml
index 777a7ef780..ba79beb743 100644
--- a/doc/src/sgml/plpython.sgml
+++ b/doc/src/sgml/plpython.sgml
@@ -3,8 +3,8 @@
 <chapter id="plpython">
  <title>PL/Python - Python Procedural Language</title>
 
- <indexterm zone="plpython"><primary>PL/Python</></>
- <indexterm zone="plpython"><primary>Python</></>
+ <indexterm zone="plpython"><primary>PL/Python</primary></indexterm>
+ <indexterm zone="plpython"><primary>Python</primary></indexterm>
 
  <para>
   The <application>PL/Python</application> procedural language allows
@@ -14,22 +14,22 @@
 
  <para>
   To install PL/Python in a particular database, use
-  <literal>CREATE EXTENSION plpythonu</> (but
-  see also <xref linkend="plpython-python23">).
+  <literal>CREATE EXTENSION plpythonu</literal> (but
+  see also <xref linkend="plpython-python23"/>).
  </para>
 
   <tip>
    <para>
-    If a language is installed into <literal>template1</>, all subsequently
+    If a language is installed into <literal>template1</literal>, all subsequently
     created databases will have the language installed automatically.
    </para>
   </tip>
 
  <para>
-  PL/Python is only available as an <quote>untrusted</> language, meaning
+  PL/Python is only available as an <quote>untrusted</quote> language, meaning
   it does not offer any way of restricting what users can do in it and
-  is therefore named <literal>plpythonu</>.  A trusted
-  variant <literal>plpython</> might become available in the future
+  is therefore named <literal>plpythonu</literal>.  A trusted
+  variant <literal>plpython</literal> might become available in the future
   if a secure execution mechanism is developed in Python.  The
   writer of a function in untrusted PL/Python must take care that the
   function cannot be used to do anything unwanted, since it will be
@@ -103,7 +103,7 @@
     The built variant depends on which Python version was found during
     the installation or which version was explicitly set using
     the <envar>PYTHON</envar> environment variable;
-    see <xref linkend="install-procedure">.  To make both variants of
+    see <xref linkend="install-procedure"/>.  To make both variants of
     PL/Python available in one installation, the source tree has to be
     configured and built twice.
    </para>
@@ -186,7 +186,7 @@
 
   <para>
    Functions in PL/Python are declared via the
-   standard <xref linkend="sql-createfunction"> syntax:
+   standard <xref linkend="sql-createfunction"/> syntax:
 
 <programlisting>
 CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-list</replaceable>)
@@ -207,7 +207,11 @@ $$ LANGUAGE plpythonu;
    <literal>yield</literal> (in case of a result-set statement).  If
    you do not provide a return value, Python returns the default
    <symbol>None</symbol>. <application>PL/Python</application> translates
-   Python's <symbol>None</symbol> into the SQL null value.
+   Python's <symbol>None</symbol> into the SQL null value.  In a procedure,
+   the result from the Python code must be <symbol>None</symbol> (typically
+   achieved by ending the procedure without a <literal>return</literal>
+   statement or by using a <literal>return</literal> statement without
+   argument); otherwise, an error will be raised.
   </para>
 
   <para>
@@ -383,8 +387,8 @@ $$ LANGUAGE plpythonu;
        For all other PostgreSQL return types, the return value is converted
        to a string using the Python built-in <literal>str</literal>, and the
        result is passed to the input function of the PostgreSQL data type.
-       (If the Python value is a <type>float</>, it is converted using
-       the <literal>repr</> built-in instead of <literal>str</literal>, to
+       (If the Python value is a <type>float</type>, it is converted using
+       the <literal>repr</literal> built-in instead of <literal>str</literal>, to
        avoid loss of precision.)
       </para>
 
@@ -420,7 +424,7 @@ $$ LANGUAGE plpythonu;
    sortas="PL/Python">in PL/Python</secondary></indexterm> is passed to a
    function, the argument value will appear as <symbol>None</symbol> in
    Python. For example, the function definition of <function>pymax</function>
-   shown in <xref linkend="plpython-funcs"> will return the wrong answer for null
+   shown in <xref linkend="plpython-funcs"/> will return the wrong answer for null
    inputs. We could add <literal>STRICT</literal> to the function definition
    to make <productname>PostgreSQL</productname> do something more reasonable:
    if a null value is passed, the function will not be called at all,
@@ -756,8 +760,8 @@ SELECT * FROM multiout_simple_setof(3);
    data between function calls.  This variable is private static data.
    The global dictionary <varname>GD</varname> is public data,
    available to all Python functions within a session.  Use with
-   care.<indexterm><primary>global data</>
-   <secondary>in PL/Python</></indexterm>
+   care.<indexterm><primary>global data</primary>
+   <secondary>in PL/Python</secondary></indexterm>
   </para>
 
   <para>
@@ -774,7 +778,7 @@ SELECT * FROM multiout_simple_setof(3);
 
   <para>
    PL/Python also supports anonymous code blocks called with the
-   <xref linkend="sql-do"> statement:
+   <xref linkend="sql-do"/> statement:
 
 <programlisting>
 DO $$
@@ -800,38 +804,38 @@ $$ LANGUAGE plpythonu;
    <literal>TD</literal> contains trigger-related values:
    <variablelist>
     <varlistentry>
-     <term><literal>TD["event"]</></term>
+     <term><literal>TD["event"]</literal></term>
      <listitem>
       <para>
        contains the event as a string:
-       <literal>INSERT</>, <literal>UPDATE</>,
-       <literal>DELETE</>, or <literal>TRUNCATE</>.
+       <literal>INSERT</literal>, <literal>UPDATE</literal>,
+       <literal>DELETE</literal>, or <literal>TRUNCATE</literal>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["when"]</></term>
+     <term><literal>TD["when"]</literal></term>
      <listitem>
       <para>
-       contains one of <literal>BEFORE</>, <literal>AFTER</>, or
-       <literal>INSTEAD OF</>.
+       contains one of <literal>BEFORE</literal>, <literal>AFTER</literal>, or
+       <literal>INSTEAD OF</literal>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["level"]</></term>
+     <term><literal>TD["level"]</literal></term>
      <listitem>
       <para>
-       contains <literal>ROW</> or <literal>STATEMENT</>.
+       contains <literal>ROW</literal> or <literal>STATEMENT</literal>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["new"]</></term>
-     <term><literal>TD["old"]</></term>
+     <term><literal>TD["new"]</literal></term>
+     <term><literal>TD["old"]</literal></term>
      <listitem>
       <para>
        For a row-level trigger, one or both of these fields contain
@@ -841,7 +845,7 @@ $$ LANGUAGE plpythonu;
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["name"]</></term>
+     <term><literal>TD["name"]</literal></term>
      <listitem>
       <para>
        contains the trigger name.
@@ -850,7 +854,7 @@ $$ LANGUAGE plpythonu;
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["table_name"]</></term>
+     <term><literal>TD["table_name"]</literal></term>
      <listitem>
       <para>
        contains the name of the table on which the trigger occurred.
@@ -859,7 +863,7 @@ $$ LANGUAGE plpythonu;
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["table_schema"]</></term>
+     <term><literal>TD["table_schema"]</literal></term>
      <listitem>
       <para>
        contains the schema of the table on which the trigger occurred.
@@ -868,7 +872,7 @@ $$ LANGUAGE plpythonu;
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["relid"]</></term>
+     <term><literal>TD["relid"]</literal></term>
      <listitem>
       <para>
        contains the OID of the table on which the trigger occurred.
@@ -877,12 +881,12 @@ $$ LANGUAGE plpythonu;
     </varlistentry>
 
     <varlistentry>
-     <term><literal>TD["args"]</></term>
+     <term><literal>TD["args"]</literal></term>
      <listitem>
       <para>
-       If the <command>CREATE TRIGGER</> command
-       included arguments, they are available in <literal>TD["args"][0]</> to
-       <literal>TD["args"][<replaceable>n</>-1]</>.
+       If the <command>CREATE TRIGGER</command> command
+       included arguments, they are available in <literal>TD["args"][0]</literal> to
+       <literal>TD["args"][<replaceable>n</replaceable>-1]</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -890,14 +894,14 @@ $$ LANGUAGE plpythonu;
   </para>
 
   <para>
-   If <literal>TD["when"]</literal> is <literal>BEFORE</> or
-   <literal>INSTEAD OF</> and
-   <literal>TD["level"]</literal> is <literal>ROW</>, you can
+   If <literal>TD["when"]</literal> is <literal>BEFORE</literal> or
+   <literal>INSTEAD OF</literal> and
+   <literal>TD["level"]</literal> is <literal>ROW</literal>, you can
    return <literal>None</literal> or <literal>"OK"</literal> from the
    Python function to indicate the row is unmodified,
-   <literal>"SKIP"</> to abort the event, or if <literal>TD["event"]</>
-   is <command>INSERT</> or <command>UPDATE</> you can return
-   <literal>"MODIFY"</> to indicate you've modified the new row.
+   <literal>"SKIP"</literal> to abort the event, or if <literal>TD["event"]</literal>
+   is <command>INSERT</command> or <command>UPDATE</command> you can return
+   <literal>"MODIFY"</literal> to indicate you've modified the new row.
    Otherwise the return value is ignored.
   </para>
  </sect1>
@@ -1023,7 +1027,7 @@ foo = rv[i]["my_column"]
     <term><literal>plpy.<function>execute</function>(<replaceable>plan</replaceable> [, <replaceable>arguments</replaceable> [, <replaceable>max-rows</replaceable>]])</literal></term>
     <listitem>
      <para>
-      <indexterm><primary>preparing a query</><secondary>in PL/Python</></indexterm>
+      <indexterm><primary>preparing a query</primary><secondary>in PL/Python</secondary></indexterm>
       <function>plpy.prepare</function> prepares the execution plan for a
       query.  It is called with a query string and a list of parameter types,
       if you have parameter references in the query.  For example:
@@ -1056,16 +1060,16 @@ rv = plan.execute(["name"], 5)
 
      <para>
       Query parameters and result row fields are converted between PostgreSQL
-      and Python data types as described in <xref linkend="plpython-data">.
+      and Python data types as described in <xref linkend="plpython-data"/>.
      </para>
 
      <para>
       When you prepare a plan using the PL/Python module it is automatically
-      saved.  Read the SPI documentation (<xref linkend="spi">) for a
+      saved.  Read the SPI documentation (<xref linkend="spi"/>) for a
       description of what this means.  In order to make effective use of this
       across function calls one needs to use one of the persistent storage
       dictionaries <literal>SD</literal> or <literal>GD</literal> (see
-      <xref linkend="plpython-sharing">). For example:
+      <xref linkend="plpython-sharing"/>). For example:
 <programlisting>
 CREATE FUNCTION usesavedplan() RETURNS trigger AS $$
     if "plan" in SD:
@@ -1190,7 +1194,7 @@ $$ LANGUAGE plpythonu;
    <para>
     The actual class of the exception being raised corresponds to the
     specific condition that caused the error.  Refer
-    to <xref linkend="errcodes-table"> for a list of possible
+    to <xref linkend="errcodes-table"/> for a list of possible
     conditions.  The module
     <literal>plpy.spiexceptions</literal> defines an exception class
     for each <productname>PostgreSQL</productname> condition, deriving
@@ -1241,7 +1245,7 @@ $$ LANGUAGE plpythonu;
 
   <para>
    Recovering from errors caused by database access as described in
-   <xref linkend="plpython-trapping"> can lead to an undesirable
+   <xref linkend="plpython-trapping"/> can lead to an undesirable
    situation where some operations succeed before one of them fails,
    and after recovering from that error the data is left in an
    inconsistent state.  PL/Python offers a solution to this problem in
@@ -1366,38 +1370,79 @@ $$ LANGUAGE plpythonu;
   </sect2>
  </sect1>
 
+ <sect1 id="plpython-transactions">
+  <title>Transaction Management</title>
+
+  <para>
+   In a procedure called from the top level or an anonymous code block
+   (<command>DO</command> command) called from the top level it is possible to
+   control transactions.  To commit the current transaction, call
+   <literal>plpy.commit()</literal>.  To roll back the current transaction,
+   call <literal>plpy.rollback()</literal>.  (Note that it is not possible to
+   run the SQL commands <command>COMMIT</command> or
+   <command>ROLLBACK</command> via <function>plpy.execute</function> or
+   similar.  It has to be done using these functions.)  After a transaction is
+   ended, a new transaction is automatically started, so there is no separate
+   function for that.
+  </para>
+
+  <para>
+   Here is an example:
+<programlisting>
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpythonu
+AS $$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+$$;
+
+CALL transaction_test1();
+</programlisting>
+  </para>
+
+  <para>
+   Transactions cannot be ended when a cursor created by
+   <literal>plpy.cursor</literal> is open or when an explicit subtransaction
+   is active.
+  </para>
+ </sect1>
+
  <sect1 id="plpython-util">
   <title>Utility Functions</title>
   <para>
    The <literal>plpy</literal> module also provides the functions
    <simplelist>
-    <member><literal>plpy.debug(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.log(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.info(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.notice(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.warning(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.error(<replaceable>msg, **kwargs</>)</literal></member>
-    <member><literal>plpy.fatal(<replaceable>msg, **kwargs</>)</literal></member>
+    <member><literal>plpy.debug(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.log(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.info(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.notice(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.warning(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.error(<replaceable>msg, **kwargs</replaceable>)</literal></member>
+    <member><literal>plpy.fatal(<replaceable>msg, **kwargs</replaceable>)</literal></member>
    </simplelist>
-   <indexterm><primary>elog</><secondary>in PL/Python</></indexterm>
+   <indexterm><primary>elog</primary><secondary>in PL/Python</secondary></indexterm>
    <function>plpy.error</function> and <function>plpy.fatal</function>
    actually raise a Python exception which, if uncaught, propagates out to
    the calling query, causing the current transaction or subtransaction to
-   be aborted.  <literal>raise plpy.Error(<replaceable>msg</>)</literal> and
-   <literal>raise plpy.Fatal(<replaceable>msg</>)</literal> are
-   equivalent to calling <literal>plpy.error(<replaceable>msg</>)</literal> and
-   <literal>plpy.fatal(<replaceable>msg</>)</literal>, respectively but
+   be aborted.  <literal>raise plpy.Error(<replaceable>msg</replaceable>)</literal> and
+   <literal>raise plpy.Fatal(<replaceable>msg</replaceable>)</literal> are
+   equivalent to calling <literal>plpy.error(<replaceable>msg</replaceable>)</literal> and
+   <literal>plpy.fatal(<replaceable>msg</replaceable>)</literal>, respectively but
    the <literal>raise</literal> form does not allow passing keyword arguments.
    The other functions only generate messages of different priority levels.
    Whether messages of a particular priority are reported to the client,
    written to the server log, or both is controlled by the
-   <xref linkend="guc-log-min-messages"> and
-   <xref linkend="guc-client-min-messages"> configuration
-   variables. See <xref linkend="runtime-config"> for more information.
+   <xref linkend="guc-log-min-messages"/> and
+   <xref linkend="guc-client-min-messages"/> configuration
+   variables. See <xref linkend="runtime-config"/> for more information.
   </para>
 
   <para>
-   The <replaceable>msg</> argument is given as a positional argument.  For
+   The <replaceable>msg</replaceable> argument is given as a positional argument.  For
    backward compatibility, more than one positional argument can be given. In
    that case, the string representation of the tuple of positional arguments
    becomes the message reported to the client.
@@ -1438,13 +1483,13 @@ PL/Python function "raise_custom_exception"
 
   <para>
    Another set of utility functions are
-   <literal>plpy.quote_literal(<replaceable>string</>)</literal>,
-   <literal>plpy.quote_nullable(<replaceable>string</>)</literal>, and
-   <literal>plpy.quote_ident(<replaceable>string</>)</literal>.  They
+   <literal>plpy.quote_literal(<replaceable>string</replaceable>)</literal>,
+   <literal>plpy.quote_nullable(<replaceable>string</replaceable>)</literal>, and
+   <literal>plpy.quote_ident(<replaceable>string</replaceable>)</literal>.  They
    are equivalent to the built-in quoting functions described in <xref
-   linkend="functions-string">.  They are useful when constructing
+   linkend="functions-string"/>.  They are useful when constructing
    ad-hoc queries.  A PL/Python equivalent of dynamic SQL from <xref
-   linkend="plpgsql-quote-literal-example"> would be:
+   linkend="plpgsql-quote-literal-example"/> would be:
 <programlisting>
 plpy.execute("UPDATE tbl SET %s = %s WHERE key = %s" % (
     plpy.quote_ident(colname),
diff --git a/doc/src/sgml/pltcl.sgml b/doc/src/sgml/pltcl.sgml
index acd4dd69d3..a834ab8862 100644
--- a/doc/src/sgml/pltcl.sgml
+++ b/doc/src/sgml/pltcl.sgml
@@ -35,7 +35,7 @@
     everything is executed from within the safety of the context of a
     Tcl interpreter.  In addition to the limited command set of safe
     Tcl, only a few commands are available to access the database via
-    SPI and to raise messages via <function>elog()</>.  PL/Tcl
+    SPI and to raise messages via <function>elog()</function>.  PL/Tcl
     provides no way to access internals of the database server or to
     gain OS-level access under the permissions of the
     <productname>PostgreSQL</productname> server process, as a C
@@ -50,23 +50,23 @@
    <para>
     Sometimes it is desirable to write Tcl functions that are not restricted
     to safe Tcl.  For example, one might want a Tcl function that sends
-    email.  To handle these cases, there is a variant of <application>PL/Tcl</> called <literal>PL/TclU</>
+    email.  To handle these cases, there is a variant of <application>PL/Tcl</application> called <literal>PL/TclU</literal>
     (for untrusted Tcl).  This is exactly the same language except that a full
-    Tcl interpreter is used.  <emphasis>If <application>PL/TclU</> is used, it must be
+    Tcl interpreter is used.  <emphasis>If <application>PL/TclU</application> is used, it must be
     installed as an untrusted procedural language</emphasis> so that only
-    database superusers can create functions in it.  The writer of a <application>PL/TclU</>
+    database superusers can create functions in it.  The writer of a <application>PL/TclU</application>
     function must take care that the function cannot be used to do anything
     unwanted, since it will be able to do anything that could be done by
     a user logged in as the database administrator.
    </para>
    <para>
-    The shared object code for the <application>PL/Tcl</> and
-    <application>PL/TclU</> call handlers is automatically built and
+    The shared object code for the <application>PL/Tcl</application> and
+    <application>PL/TclU</application> call handlers is automatically built and
     installed in the <productname>PostgreSQL</productname> library
     directory if Tcl support is specified in the configuration step of
-    the installation procedure.  To install <application>PL/Tcl</>
-    and/or <application>PL/TclU</> in a particular database, use the
-    <command>CREATE EXTENSION</> command, for example
+    the installation procedure.  To install <application>PL/Tcl</application>
+    and/or <application>PL/TclU</application> in a particular database, use the
+    <command>CREATE EXTENSION</command> command, for example
     <literal>CREATE EXTENSION pltcl</literal> or
     <literal>CREATE EXTENSION pltclu</literal>.
    </para>
@@ -78,8 +78,8 @@
     <title>PL/Tcl Functions and Arguments</title>
 
     <para>
-     To create a function in the <application>PL/Tcl</> language, use
-     the standard <xref linkend="sql-createfunction"> syntax:
+     To create a function in the <application>PL/Tcl</application> language, use
+     the standard <xref linkend="sql-createfunction"/> syntax:
 
 <programlisting>
 CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-types</replaceable>) RETURNS <replaceable>return-type</replaceable> AS $$
@@ -87,8 +87,8 @@ CREATE FUNCTION <replaceable>funcname</replaceable> (<replaceable>argument-types
 $$ LANGUAGE pltcl;
 </programlisting>
 
-     <application>PL/TclU</> is the same, except that the language has to be specified as
-     <literal>pltclu</>.
+     <application>PL/TclU</application> is the same, except that the language has to be specified as
+     <literal>pltclu</literal>.
     </para>
 
     <para>
@@ -97,7 +97,8 @@ $$ LANGUAGE pltcl;
      Tcl script as variables named <literal>1</literal>
      ... <literal><replaceable>n</replaceable></literal>.  The result is
      returned from the Tcl code in the usual way, with
-     a <literal>return</literal> statement.
+     a <literal>return</literal> statement.  In a procedure, the return value
+     from the Tcl code is ignored.
     </para>
 
     <para>
@@ -111,7 +112,7 @@ CREATE FUNCTION tcl_max(integer, integer) RETURNS integer AS $$
 $$ LANGUAGE pltcl STRICT;
 </programlisting>
 
-     Note the clause <literal>STRICT</>, which saves us from
+     Note the clause <literal>STRICT</literal>, which saves us from
      having to think about null input values: if a null value is passed, the
      function will not be called at all, but will just return a null
      result automatically.
@@ -122,7 +123,7 @@ $$ LANGUAGE pltcl STRICT;
      if the actual value of an argument is null, the corresponding
      <literal>$<replaceable>n</replaceable></literal> variable will be set to an empty string.
      To detect whether a particular argument is null, use the function
-     <literal>argisnull</>.  For example, suppose that we wanted <function>tcl_max</function>
+     <literal>argisnull</literal>.  For example, suppose that we wanted <function>tcl_max</function>
      with one null and one nonnull argument to return the nonnull
      argument, rather than null:
 
@@ -188,7 +189,7 @@ $$ LANGUAGE pltcl;
     <tip>
      <para>
       The result list can be made from an array representation of the
-      desired tuple with the <literal>array get</> Tcl command.  For example:
+      desired tuple with the <literal>array get</literal> Tcl command.  For example:
 
 <programlisting>
 CREATE FUNCTION raise_pay(employee, delta int) RETURNS employee AS $$
@@ -233,8 +234,8 @@ $$ LANGUAGE pltcl;
     <para>
      The argument values supplied to a PL/Tcl function's code are simply
      the input arguments converted to text form (just as if they had been
-     displayed by a <command>SELECT</> statement).  Conversely, the
-     <literal>return</> and <literal>return_next</> commands will accept
+     displayed by a <command>SELECT</command> statement).  Conversely, the
+     <literal>return</literal> and <literal>return_next</literal> commands will accept
      any string that is acceptable input format for the function's declared
      result type, or for the specified column of a composite result type.
     </para>
@@ -262,14 +263,14 @@ $$ LANGUAGE pltcl;
      role in a separate Tcl interpreter for that role.  This prevents
      accidental or malicious interference by one user with the behavior of
      another user's PL/Tcl functions.  Each such interpreter will have its own
-     values for any <quote>global</> Tcl variables.  Thus, two PL/Tcl
+     values for any <quote>global</quote> Tcl variables.  Thus, two PL/Tcl
      functions will share the same global variables if and only if they are
      executed by the same SQL role.  In an application wherein a single
      session executes code under multiple SQL roles (via <literal>SECURITY
-     DEFINER</> functions, use of <command>SET ROLE</>, etc) you may need to
+     DEFINER</literal> functions, use of <command>SET ROLE</command>, etc) you may need to
      take explicit steps to ensure that PL/Tcl functions can share data.  To
      do that, make sure that functions that should communicate are owned by
-     the same user, and mark them <literal>SECURITY DEFINER</>.  You must of
+     the same user, and mark them <literal>SECURITY DEFINER</literal>.  You must of
      course take care that such functions can't be used to do anything
      unintended.
     </para>
@@ -286,19 +287,19 @@ $$ LANGUAGE pltcl;
     <para>
      To help protect PL/Tcl functions from unintentionally interfering
      with each other, a global
-     array is made available to each function via the <function>upvar</>
+     array is made available to each function via the <function>upvar</function>
      command. The global name of this variable is the function's internal
-     name, and the local name is <literal>GD</>.  It is recommended that
-     <literal>GD</> be used
+     name, and the local name is <literal>GD</literal>.  It is recommended that
+     <literal>GD</literal> be used
      for persistent private data of a function.  Use regular Tcl global
      variables only for values that you specifically intend to be shared among
-     multiple functions.  (Note that the <literal>GD</> arrays are only
+     multiple functions.  (Note that the <literal>GD</literal> arrays are only
      global within a particular interpreter, so they do not bypass the
      security restrictions mentioned above.)
     </para>
 
     <para>
-     An example of using <literal>GD</> appears in the
+     An example of using <literal>GD</literal> appears in the
      <function>spi_execp</function> example below.
     </para>
    </sect1>
@@ -320,28 +321,28 @@ $$ LANGUAGE pltcl;
         causes an error to be raised.  Otherwise, the return value of <function>spi_exec</function>
         is the number of rows processed (selected, inserted, updated, or
         deleted) by the command, or zero if the command is a utility
-        statement.  In addition, if the command is a <command>SELECT</> statement, the
+        statement.  In addition, if the command is a <command>SELECT</command> statement, the
         values of the selected columns are placed in Tcl variables as
         described below.
        </para>
        <para>
-        The optional <literal>-count</> value tells
+        The optional <literal>-count</literal> value tells
         <function>spi_exec</function> the maximum number of rows
         to process in the command.  The effect of this is comparable to
-        setting up a query as a cursor and then saying <literal>FETCH <replaceable>n</></>.
+        setting up a query as a cursor and then saying <literal>FETCH <replaceable>n</replaceable></literal>.
        </para>
        <para>
-        If the command is a <command>SELECT</> statement, the values of the
+        If the command is a <command>SELECT</command> statement, the values of the
         result columns are placed into Tcl variables named after the columns.
-        If the <literal>-array</> option is given, the column values are
+        If the <literal>-array</literal> option is given, the column values are
         instead stored into elements of the named associative array, with the
         column names used as array indexes.  In addition, the current row
         number within the result (counting from zero) is stored into the array
-        element named <quote><literal>.tupno</></quote>, unless that name is
+        element named <quote><literal>.tupno</literal></quote>, unless that name is
         in use as a column name in the result.
        </para>
        <para>
-        If the command is a <command>SELECT</> statement and no <replaceable>loop-body</>
+        If the command is a <command>SELECT</command> statement and no <replaceable>loop-body</replaceable>
         script is given, then only the first row of results are stored into
         Tcl variables or array elements; remaining rows, if any, are ignored.
         No storing occurs if the query returns no rows.  (This case can be
@@ -350,14 +351,14 @@ $$ LANGUAGE pltcl;
 <programlisting>
 spi_exec "SELECT count(*) AS cnt FROM pg_proc"
 </programlisting>
-        will set the Tcl variable <literal>$cnt</> to the number of rows in
-        the <structname>pg_proc</> system catalog.
+        will set the Tcl variable <literal>$cnt</literal> to the number of rows in
+        the <structname>pg_proc</structname> system catalog.
        </para>
        <para>
-        If the optional <replaceable>loop-body</> argument is given, it is
+        If the optional <replaceable>loop-body</replaceable> argument is given, it is
         a piece of Tcl script that is executed once for each row in the
-        query result.  (<replaceable>loop-body</> is ignored if the given
-        command is not a <command>SELECT</>.)
+        query result.  (<replaceable>loop-body</replaceable> is ignored if the given
+        command is not a <command>SELECT</command>.)
         The values of the current row's columns
         are stored into Tcl variables or array elements before each iteration.
         For example:
@@ -366,14 +367,14 @@ spi_exec -array C "SELECT * FROM pg_class" {
     elog DEBUG "have table $C(relname)"
 }
 </programlisting>
-        will print a log message for every row of <literal>pg_class</>.  This
+        will print a log message for every row of <literal>pg_class</literal>.  This
         feature works similarly to other Tcl looping constructs; in
-        particular <literal>continue</> and <literal>break</> work in the
+        particular <literal>continue</literal> and <literal>break</literal> work in the
         usual way inside the loop body.
        </para>
        <para>
         If a column of a query result is null, the target
-        variable for it is <quote>unset</> rather than being set.
+        variable for it is <quote>unset</quote> rather than being set.
        </para>
       </listitem>
      </varlistentry>
@@ -384,8 +385,8 @@ spi_exec -array C "SELECT * FROM pg_class" {
        <para>
         Prepares and saves a query plan for later execution.  The
         saved plan will be retained for the life of the current
-        session.<indexterm><primary>preparing a query</>
-        <secondary>in PL/Tcl</></>
+        session.<indexterm><primary>preparing a query</primary>
+        <secondary>in PL/Tcl</secondary></indexterm>
        </para>
        <para>
         The query can use parameters, that is, placeholders for
@@ -405,29 +406,29 @@ spi_exec -array C "SELECT * FROM pg_class" {
      </varlistentry>
 
      <varlistentry>
-      <term><literal><function>spi_execp</> <optional role="tcl">-count <replaceable>n</replaceable></optional> <optional role="tcl">-array <replaceable>name</replaceable></optional> <optional role="tcl">-nulls <replaceable>string</replaceable></optional> <replaceable>queryid</replaceable> <optional role="tcl"><replaceable>value-list</replaceable></optional> <optional role="tcl"><replaceable>loop-body</replaceable></optional></literal></term>
+      <term><literal><function>spi_execp</function> <optional role="tcl">-count <replaceable>n</replaceable></optional> <optional role="tcl">-array <replaceable>name</replaceable></optional> <optional role="tcl">-nulls <replaceable>string</replaceable></optional> <replaceable>queryid</replaceable> <optional role="tcl"><replaceable>value-list</replaceable></optional> <optional role="tcl"><replaceable>loop-body</replaceable></optional></literal></term>
       <listitem>
        <para>
-        Executes a query previously prepared with <function>spi_prepare</>.
+        Executes a query previously prepared with <function>spi_prepare</function>.
         <replaceable>queryid</replaceable> is the ID returned by
-        <function>spi_prepare</>.  If the query references parameters,
+        <function>spi_prepare</function>.  If the query references parameters,
         a <replaceable>value-list</replaceable> must be supplied.  This
         is a Tcl list of actual values for the parameters.  The list must be
         the same length as the parameter type list previously given to
-        <function>spi_prepare</>.  Omit <replaceable>value-list</replaceable>
+        <function>spi_prepare</function>.  Omit <replaceable>value-list</replaceable>
         if the query has no parameters.
        </para>
        <para>
-        The optional value for <literal>-nulls</> is a string of spaces and
-        <literal>'n'</> characters telling <function>spi_execp</function>
+        The optional value for <literal>-nulls</literal> is a string of spaces and
+        <literal>'n'</literal> characters telling <function>spi_execp</function>
         which of the parameters are null values. If given, it must have exactly the
         same length as the <replaceable>value-list</replaceable>.  If it
         is not given, all the parameter values are nonnull.
        </para>
        <para>
         Except for the way in which the query and its parameters are specified,
-        <function>spi_execp</> works just like <function>spi_exec</>.
-        The <literal>-count</>, <literal>-array</>, and
+        <function>spi_execp</function> works just like <function>spi_exec</function>.
+        The <literal>-count</literal>, <literal>-array</literal>, and
         <replaceable>loop-body</replaceable> options are the same,
         and so is the result value.
        </para>
@@ -448,9 +449,9 @@ $$ LANGUAGE pltcl;
 </programlisting>
 
         We need backslashes inside the query string given to
-        <function>spi_prepare</> to ensure that the
-        <literal>$<replaceable>n</replaceable></> markers will be passed
-        through to <function>spi_prepare</> as-is, and not replaced by Tcl
+        <function>spi_prepare</function> to ensure that the
+        <literal>$<replaceable>n</replaceable></literal> markers will be passed
+        through to <function>spi_prepare</function> as-is, and not replaced by Tcl
         variable substitution.
 
        </para>
@@ -459,7 +460,7 @@ $$ LANGUAGE pltcl;
 
      <varlistentry>
       <term>
-       <function>spi_lastoid</>
+       <function>spi_lastoid</function>
        <indexterm>
         <primary>spi_lastoid</primary>
         <secondary>in PL/Tcl</secondary>
@@ -468,8 +469,8 @@ $$ LANGUAGE pltcl;
       <listitem>
        <para>
         Returns the OID of the row inserted by the last
-        <function>spi_exec</> or <function>spi_execp</>, if the
-        command was a single-row <command>INSERT</> and the modified
+        <function>spi_exec</function> or <function>spi_execp</function>, if the
+        command was a single-row <command>INSERT</command> and the modified
         table contained OIDs.  (If not, you get zero.)
        </para>
       </listitem>
@@ -483,14 +484,14 @@ $$ LANGUAGE pltcl;
         executed within a SQL subtransaction.  If the script returns an
         error, that entire subtransaction is rolled back before returning the
         error out to the surrounding Tcl code.
-        See <xref linkend="pltcl-subtransactions"> for more details and an
+        See <xref linkend="pltcl-subtransactions"/> for more details and an
         example.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><function>quote</> <replaceable>string</replaceable></term>
+      <term><function>quote</function> <replaceable>string</replaceable></term>
       <listitem>
        <para>
         Doubles all occurrences of single quote and backslash characters
@@ -504,7 +505,7 @@ $$ LANGUAGE pltcl;
 "SELECT '$val' AS ret"
 </programlisting>
 
-        where the Tcl variable <literal>val</> actually contains
+        where the Tcl variable <literal>val</literal> actually contains
         <literal>doesn't</literal>. This would result
         in the final command string:
 
@@ -536,7 +537,7 @@ SELECT 'doesn''t' AS ret
 
      <varlistentry>
       <term>
-       <function>elog</> <replaceable>level</replaceable> <replaceable>msg</replaceable>
+       <function>elog</function> <replaceable>level</replaceable> <replaceable>msg</replaceable>
        <indexterm>
         <primary>elog</primary>
         <secondary>in PL/Tcl</secondary>
@@ -545,24 +546,24 @@ SELECT 'doesn''t' AS ret
       <listitem>
        <para>
         Emits a log or error message. Possible levels are
-        <literal>DEBUG</>, <literal>LOG</>, <literal>INFO</>,
-        <literal>NOTICE</>, <literal>WARNING</>, <literal>ERROR</>, and
-        <literal>FATAL</>. <literal>ERROR</>
+        <literal>DEBUG</literal>, <literal>LOG</literal>, <literal>INFO</literal>,
+        <literal>NOTICE</literal>, <literal>WARNING</literal>, <literal>ERROR</literal>, and
+        <literal>FATAL</literal>. <literal>ERROR</literal>
         raises an error condition; if this is not trapped by the surrounding
         Tcl code, the error propagates out to the calling query, causing
         the current transaction or subtransaction to be aborted.  This
-        is effectively the same as the Tcl <literal>error</> command.
-        <literal>FATAL</> aborts the transaction and causes the current
+        is effectively the same as the Tcl <literal>error</literal> command.
+        <literal>FATAL</literal> aborts the transaction and causes the current
         session to shut down.  (There is probably no good reason to use
         this error level in PL/Tcl functions, but it's provided for
         completeness.)  The other levels only generate messages of different
         priority levels.
         Whether messages of a particular priority are reported to the client,
         written to the server log, or both is controlled by the
-        <xref linkend="guc-log-min-messages"> and
-        <xref linkend="guc-client-min-messages"> configuration
-        variables. See <xref linkend="runtime-config">
-        and <xref linkend="pltcl-error-handling">
+        <xref linkend="guc-log-min-messages"/> and
+        <xref linkend="guc-client-min-messages"/> configuration
+        variables. See <xref linkend="runtime-config"/>
+        and <xref linkend="pltcl-error-handling"/>
         for more information.
        </para>
       </listitem>
@@ -585,7 +586,7 @@ SELECT 'doesn''t' AS ret
      Trigger procedures can be written in PL/Tcl.
      <productname>PostgreSQL</productname> requires that a procedure that is to be called
      as a trigger must be declared as a function with no arguments
-     and a return type of <literal>trigger</>.
+     and a return type of <literal>trigger</literal>.
     </para>
     <para>
      The information from the trigger manager is passed to the procedure body
@@ -637,8 +638,8 @@ SELECT 'doesn''t' AS ret
        <listitem>
         <para>
          A Tcl list of the table column names, prefixed with an empty list
-         element. So looking up a column name in the list with <application>Tcl</>'s
-         <function>lsearch</> command returns the element's number starting
+         element. So looking up a column name in the list with <application>Tcl</application>'s
+         <function>lsearch</function> command returns the element's number starting
          with 1 for the first column, the same way the columns are customarily
          numbered in <productname>PostgreSQL</productname>.  (Empty list
          elements also appear in the positions of columns that have been
@@ -652,8 +653,8 @@ SELECT 'doesn''t' AS ret
        <term><varname>$TG_when</varname></term>
        <listitem>
         <para>
-         The string <literal>BEFORE</>, <literal>AFTER</>, or
-         <literal>INSTEAD OF</>, depending on the type of trigger event.
+         The string <literal>BEFORE</literal>, <literal>AFTER</literal>, or
+         <literal>INSTEAD OF</literal>, depending on the type of trigger event.
         </para>
        </listitem>
       </varlistentry>
@@ -662,7 +663,7 @@ SELECT 'doesn''t' AS ret
        <term><varname>$TG_level</varname></term>
        <listitem>
         <para>
-         The string <literal>ROW</> or <literal>STATEMENT</> depending on the
+         The string <literal>ROW</literal> or <literal>STATEMENT</literal> depending on the
          type of trigger event.
         </para>
        </listitem>
@@ -672,8 +673,8 @@ SELECT 'doesn''t' AS ret
        <term><varname>$TG_op</varname></term>
        <listitem>
         <para>
-         The string <literal>INSERT</>, <literal>UPDATE</>,
-         <literal>DELETE</>, or <literal>TRUNCATE</> depending on the type of
+         The string <literal>INSERT</literal>, <literal>UPDATE</literal>,
+         <literal>DELETE</literal>, or <literal>TRUNCATE</literal> depending on the type of
          trigger event.
         </para>
        </listitem>
@@ -684,8 +685,8 @@ SELECT 'doesn''t' AS ret
        <listitem>
         <para>
          An associative array containing the values of the new table
-         row for <command>INSERT</> or <command>UPDATE</> actions, or
-         empty for <command>DELETE</>.  The array is indexed by column
+         row for <command>INSERT</command> or <command>UPDATE</command> actions, or
+         empty for <command>DELETE</command>.  The array is indexed by column
          name.  Columns that are null will not appear in the array.
          This is not set for statement-level triggers.
         </para>
@@ -697,8 +698,8 @@ SELECT 'doesn''t' AS ret
        <listitem>
         <para>
          An associative array containing the values of the old table
-         row for <command>UPDATE</> or <command>DELETE</> actions, or
-         empty for <command>INSERT</>.  The array is indexed by column
+         row for <command>UPDATE</command> or <command>DELETE</command> actions, or
+         empty for <command>INSERT</command>.  The array is indexed by column
          name.  Columns that are null will not appear in the array.
          This is not set for statement-level triggers.
         </para>
@@ -721,32 +722,32 @@ SELECT 'doesn''t' AS ret
 
     <para>
      The return value from a trigger procedure can be one of the strings
-     <literal>OK</> or <literal>SKIP</>, or a list of column name/value pairs.
-     If the return value is <literal>OK</>,
-     the operation (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>)
+     <literal>OK</literal> or <literal>SKIP</literal>, or a list of column name/value pairs.
+     If the return value is <literal>OK</literal>,
+     the operation (<command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>)
      that fired the trigger will proceed
-     normally. <literal>SKIP</> tells the trigger manager to silently suppress
+     normally. <literal>SKIP</literal> tells the trigger manager to silently suppress
      the operation for this row. If a list is returned, it tells PL/Tcl to
      return a modified row to the trigger manager; the contents of the
      modified row are specified by the column names and values in the list.
      Any columns not mentioned in the list are set to null.
      Returning a modified row is only meaningful
-     for row-level <literal>BEFORE</> <command>INSERT</> or <command>UPDATE</>
+     for row-level <literal>BEFORE</literal> <command>INSERT</command> or <command>UPDATE</command>
      triggers, for which the modified row will be inserted instead of the one
-     given in <varname>$NEW</>; or for row-level <literal>INSTEAD OF</>
-     <command>INSERT</> or <command>UPDATE</> triggers where the returned row
-     is used as the source data for <command>INSERT RETURNING</> or
-     <command>UPDATE RETURNING</> clauses.
-     In row-level <literal>BEFORE</> <command>DELETE</> or <literal>INSTEAD
-     OF</> <command>DELETE</> triggers, returning a modified row has the same
-     effect as returning <literal>OK</>, that is the operation proceeds.
+     given in <varname>$NEW</varname>; or for row-level <literal>INSTEAD OF</literal>
+     <command>INSERT</command> or <command>UPDATE</command> triggers where the returned row
+     is used as the source data for <command>INSERT RETURNING</command> or
+     <command>UPDATE RETURNING</command> clauses.
+     In row-level <literal>BEFORE</literal> <command>DELETE</command> or <literal>INSTEAD
+     OF</literal> <command>DELETE</command> triggers, returning a modified row has the same
+     effect as returning <literal>OK</literal>, that is the operation proceeds.
      The trigger return value is ignored for all other types of triggers.
     </para>
 
     <tip>
      <para>
       The result list can be made from an array representation of the
-      modified tuple with the <literal>array get</> Tcl command.
+      modified tuple with the <literal>array get</literal> Tcl command.
      </para>
     </tip>
 
@@ -797,7 +798,7 @@ CREATE TRIGGER trig_mytab_modcount BEFORE INSERT OR UPDATE ON mytab
      Event trigger procedures can be written in PL/Tcl.
      <productname>PostgreSQL</productname> requires that a procedure that is
      to be called as an event trigger must be declared as a function with no
-     arguments and a return type of <literal>event_trigger</>.
+     arguments and a return type of <literal>event_trigger</literal>.
     </para>
     <para>
      The information from the trigger manager is passed to the procedure body
@@ -885,17 +886,17 @@ CREATE EVENT TRIGGER tcl_a_snitch ON ddl_command_start EXECUTE PROCEDURE tclsnit
      word is <literal>POSTGRES</literal>, the second word is the PostgreSQL
      version number, and additional words are field name/value pairs
      providing detailed information about the error.
-     Fields <varname>SQLSTATE</>, <varname>condition</>,
-     and <varname>message</> are always supplied
+     Fields <varname>SQLSTATE</varname>, <varname>condition</varname>,
+     and <varname>message</varname> are always supplied
      (the first two represent the error code and condition name as shown
-     in <xref linkend="errcodes-appendix">).
+     in <xref linkend="errcodes-appendix"/>).
      Fields that may be present include
-     <varname>detail</>, <varname>hint</>, <varname>context</>,
-     <varname>schema</>, <varname>table</>, <varname>column</>,
-     <varname>datatype</>, <varname>constraint</>,
-     <varname>statement</>, <varname>cursor_position</>,
-     <varname>filename</>, <varname>lineno</>, and
-     <varname>funcname</>.
+     <varname>detail</varname>, <varname>hint</varname>, <varname>context</varname>,
+     <varname>schema</varname>, <varname>table</varname>, <varname>column</varname>,
+     <varname>datatype</varname>, <varname>constraint</varname>,
+     <varname>statement</varname>, <varname>cursor_position</varname>,
+     <varname>filename</varname>, <varname>lineno</varname>, and
+     <varname>funcname</varname>.
     </para>
 
     <para>
@@ -929,7 +930,7 @@ if {[catch { spi_exec $sql_command }]} {
 
     <para>
      Recovering from errors caused by database access as described in
-     <xref linkend="pltcl-error-handling"> can lead to an undesirable
+     <xref linkend="pltcl-error-handling"/> can lead to an undesirable
      situation where some operations succeed before one of them fails,
      and after recovering from that error the data is left in an
      inconsistent state.  PL/Tcl offers a solution to this problem in
@@ -1001,12 +1002,53 @@ $$ LANGUAGE pltcl;
     </para>
    </sect1>
 
+   <sect1 id="pltcl-transactions">
+    <title>Transaction Management</title>
+
+    <para>
+     In a procedure called from the top level or an anonymous code block
+     (<command>DO</command> command) called from the top level it is possible
+     to control transactions.  To commit the current transaction, call the
+     <literal>commit</literal> command.  To roll back the current transaction,
+     call the <literal>rollback</literal> command.  (Note that it is not
+     possible to run the SQL commands <command>COMMIT</command> or
+     <command>ROLLBACK</command> via <function>spi_exec</function> or similar.
+     It has to be done using these functions.)  After a transaction is ended,
+     a new transaction is automatically started, so there is no separate
+     command for that.
+    </para>
+
+    <para>
+     Here is an example:
+<programlisting>
+CREATE PROCEDURE transaction_test1()
+LANGUAGE pltcl
+AS $$
+for {set i 0} {$i &lt; 10} {incr i} {
+    spi_exec "INSERT INTO test1 (a) VALUES ($i)"
+    if {$i % 2 == 0} {
+        commit
+    } else {
+        rollback
+    }
+}
+$$;
+
+CALL transaction_test1();
+</programlisting>
+    </para>
+
+    <para>
+     Transactions cannot be ended when an explicit subtransaction is active.
+    </para>
+   </sect1>
+
    <sect1 id="pltcl-config">
     <title>PL/Tcl Configuration</title>
 
     <para>
      This section lists configuration parameters that
-     affect <application>PL/Tcl</>.
+     affect <application>PL/Tcl</application>.
     </para>
 
     <variablelist>
@@ -1015,7 +1057,7 @@ $$ LANGUAGE pltcl;
       <term>
        <varname>pltcl.start_proc</varname> (<type>string</type>)
        <indexterm>
-        <primary><varname>pltcl.start_proc</> configuration parameter</primary>
+        <primary><varname>pltcl.start_proc</varname> configuration parameter</primary>
        </indexterm>
       </term>
       <listitem>
@@ -1031,8 +1073,8 @@ $$ LANGUAGE pltcl;
        </para>
 
        <para>
-        The referenced function must be written in the <literal>pltcl</>
-        language, and must not be marked <literal>SECURITY DEFINER</>.
+        The referenced function must be written in the <literal>pltcl</literal>
+        language, and must not be marked <literal>SECURITY DEFINER</literal>.
         (These restrictions ensure that it runs in the interpreter it's
         supposed to initialize.)  The current user must have permission to
         call it, too.
@@ -1060,14 +1102,14 @@ $$ LANGUAGE pltcl;
       <term>
        <varname>pltclu.start_proc</varname> (<type>string</type>)
        <indexterm>
-        <primary><varname>pltclu.start_proc</> configuration parameter</primary>
+        <primary><varname>pltclu.start_proc</varname> configuration parameter</primary>
        </indexterm>
       </term>
       <listitem>
        <para>
         This parameter is exactly like <varname>pltcl.start_proc</varname>,
         except that it applies to PL/TclU.  The referenced function must
-        be written in the <literal>pltclu</> language.
+        be written in the <literal>pltclu</literal> language.
        </para>
       </listitem>
      </varlistentry>
@@ -1084,7 +1126,7 @@ $$ LANGUAGE pltcl;
      differ. Tcl, however, requires all procedure names to be distinct.
      PL/Tcl deals with this by making the internal Tcl procedure names contain
      the object
-     ID of the function from the system table <structname>pg_proc</> as part of their name. Thus,
+     ID of the function from the system table <structname>pg_proc</structname> as part of their name. Thus,
      <productname>PostgreSQL</productname> functions with the same name
      and different argument types will be different Tcl procedures, too.  This
      is not normally a concern for a PL/Tcl programmer, but it might be visible
diff --git a/doc/src/sgml/postgres-fdw.sgml b/doc/src/sgml/postgres-fdw.sgml
index d83fc9e52b..54b5e98a0e 100644
--- a/doc/src/sgml/postgres-fdw.sgml
+++ b/doc/src/sgml/postgres-fdw.sgml
@@ -8,31 +8,31 @@
  </indexterm>
 
  <para>
-  The <filename>postgres_fdw</> module provides the foreign-data wrapper
+  The <filename>postgres_fdw</filename> module provides the foreign-data wrapper
   <literal>postgres_fdw</literal>, which can be used to access data
   stored in external <productname>PostgreSQL</productname> servers.
  </para>
 
  <para>
   The functionality provided by this module overlaps substantially
-  with the functionality of the older <xref linkend="dblink"> module.
-  But <filename>postgres_fdw</> provides more transparent and
+  with the functionality of the older <xref linkend="dblink"/> module.
+  But <filename>postgres_fdw</filename> provides more transparent and
   standards-compliant syntax for accessing remote tables, and can give
   better performance in many cases.
  </para>
 
  <para>
-  To prepare for remote access using <filename>postgres_fdw</>:
+  To prepare for remote access using <filename>postgres_fdw</filename>:
   <orderedlist spacing="compact">
    <listitem>
     <para>
-     Install the  <filename>postgres_fdw</> extension using <xref
-     linkend="sql-createextension">.
+     Install the  <filename>postgres_fdw</filename> extension using <xref
+     linkend="sql-createextension"/>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Create a foreign server object, using <xref linkend="sql-createserver">,
+     Create a foreign server object, using <xref linkend="sql-createserver"/>,
      to represent each remote database you want to connect to.
      Specify connection information, except <literal>user</literal> and
      <literal>password</literal>, as options of the server object.
@@ -40,7 +40,7 @@
    </listitem>
    <listitem>
     <para>
-     Create a user mapping, using <xref linkend="sql-createusermapping">, for
+     Create a user mapping, using <xref linkend="sql-createusermapping"/>, for
      each database user you want to allow to access each foreign server.
      Specify the remote user name and password to use as
      <literal>user</literal> and <literal>password</literal> options of the
@@ -49,8 +49,8 @@
    </listitem>
    <listitem>
     <para>
-     Create a foreign table, using <xref linkend="sql-createforeigntable">
-     or <xref linkend="sql-importforeignschema">,
+     Create a foreign table, using <xref linkend="sql-createforeigntable"/>
+     or <xref linkend="sql-importforeignschema"/>,
      for each remote table you want to access.  The columns of the foreign
      table must match the referenced remote table.  You can, however, use
      table and/or column names different from the remote table's, if you
@@ -61,17 +61,17 @@
  </para>
 
  <para>
-  Now you need only <command>SELECT</> from a foreign table to access
+  Now you need only <command>SELECT</command> from a foreign table to access
   the data stored in its underlying remote table.  You can also modify
-  the remote table using <command>INSERT</>, <command>UPDATE</>, or
-  <command>DELETE</>.  (Of course, the remote user you have specified
+  the remote table using <command>INSERT</command>, <command>UPDATE</command>, or
+  <command>DELETE</command>.  (Of course, the remote user you have specified
   in your user mapping must have privileges to do these things.)
  </para>
 
  <para>
-  Note that <filename>postgres_fdw</> currently lacks support for
+  Note that <filename>postgres_fdw</filename> currently lacks support for
   <command>INSERT</command> statements with an <literal>ON CONFLICT DO
-  UPDATE</> clause.  However, the <literal>ON CONFLICT DO NOTHING</>
+  UPDATE</literal> clause.  However, the <literal>ON CONFLICT DO NOTHING</literal>
   clause is supported, provided a unique index inference specification
   is omitted.
  </para>
@@ -79,10 +79,10 @@
  <para>
   It is generally recommended that the columns of a foreign table be declared
   with exactly the same data types, and collations if applicable, as the
-  referenced columns of the remote table.  Although <filename>postgres_fdw</>
+  referenced columns of the remote table.  Although <filename>postgres_fdw</filename>
   is currently rather forgiving about performing data type conversions at
   need, surprising semantic anomalies may arise when types or collations do
-  not match, due to the remote server interpreting <literal>WHERE</> clauses
+  not match, due to the remote server interpreting <literal>WHERE</literal> clauses
   slightly differently from the local server.
  </para>
 
@@ -99,9 +99,9 @@
    <title>Connection Options</title>
 
    <para>
-    A foreign server using the <filename>postgres_fdw</> foreign data wrapper
-    can have the same options that <application>libpq</> accepts in
-    connection strings, as described in <xref linkend="libpq-paramkeywords">,
+    A foreign server using the <filename>postgres_fdw</filename> foreign data wrapper
+    can have the same options that <application>libpq</application> accepts in
+    connection strings, as described in <xref linkend="libpq-paramkeywords"/>,
     except that these options are not allowed:
 
     <itemizedlist spacing="compact">
@@ -113,14 +113,14 @@
      </listitem>
      <listitem>
       <para>
-       <literal>client_encoding</> (this is automatically set from the local
+       <literal>client_encoding</literal> (this is automatically set from the local
        server encoding)
       </para>
      </listitem>
      <listitem>
       <para>
-       <literal>fallback_application_name</> (always set to
-       <literal>postgres_fdw</>)
+       <literal>fallback_application_name</literal> (always set to
+       <literal>postgres_fdw</literal>)
       </para>
      </listitem>
     </itemizedlist>
@@ -186,14 +186,14 @@
    <title>Cost Estimation Options</title>
 
    <para>
-    <filename>postgres_fdw</> retrieves remote data by executing queries
+    <filename>postgres_fdw</filename> retrieves remote data by executing queries
     against remote servers, so ideally the estimated cost of scanning a
     foreign table should be whatever it costs to be done on the remote
     server, plus some overhead for communication.  The most reliable way to
     get such an estimate is to ask the remote server and then add something
     for overhead &mdash; but for simple queries, it may not be worth the cost
     of an additional remote query to get a cost estimate.
-    So <filename>postgres_fdw</> provides the following options to control
+    So <filename>postgres_fdw</filename> provides the following options to control
     how cost estimation is done:
    </para>
 
@@ -204,7 +204,7 @@
      <listitem>
       <para>
        This option, which can be specified for a foreign table or a foreign
-       server, controls whether <filename>postgres_fdw</> issues remote
+       server, controls whether <filename>postgres_fdw</filename> issues remote
        <command>EXPLAIN</command> commands to obtain cost estimates.
        A setting for a foreign table overrides any setting for its server,
        but only for that table.
@@ -245,16 +245,16 @@
 
    <para>
     When <literal>use_remote_estimate</literal> is true,
-    <filename>postgres_fdw</> obtains row count and cost estimates from the
+    <filename>postgres_fdw</filename> obtains row count and cost estimates from the
     remote server and then adds <literal>fdw_startup_cost</literal> and
     <literal>fdw_tuple_cost</literal> to the cost estimates.  When
     <literal>use_remote_estimate</literal> is false,
-    <filename>postgres_fdw</> performs local row count and cost estimation
+    <filename>postgres_fdw</filename> performs local row count and cost estimation
     and then adds <literal>fdw_startup_cost</literal> and
     <literal>fdw_tuple_cost</literal> to the cost estimates.  This local
     estimation is unlikely to be very accurate unless local copies of the
     remote table's statistics are available.  Running
-    <xref linkend="sql-analyze"> on the foreign table is the way to update
+    <xref linkend="sql-analyze"/> on the foreign table is the way to update
     the local statistics; this will perform a scan of the remote table and
     then calculate and store statistics just as though the table were local.
     Keeping local statistics can be a useful way to reduce per-query planning
@@ -268,12 +268,12 @@
    <title>Remote Execution Options</title>
 
    <para>
-    By default, only <literal>WHERE</> clauses using built-in operators and
+    By default, only <literal>WHERE</literal> clauses using built-in operators and
     functions will be considered for execution on the remote server.  Clauses
     involving non-built-in functions are checked locally after rows are
     fetched.  If such functions are available on the remote server and can be
     relied on to produce the same results as they do locally, performance can
-    be improved by sending such <literal>WHERE</> clauses for remote
+    be improved by sending such <literal>WHERE</literal> clauses for remote
     execution.  This behavior can be controlled using the following option:
    </para>
 
@@ -284,7 +284,7 @@
      <listitem>
       <para>
        This option is a comma-separated list of names
-       of <productname>PostgreSQL</> extensions that are installed, in
+       of <productname>PostgreSQL</productname> extensions that are installed, in
        compatible versions, on both the local and remote servers.  Functions
        and operators that are immutable and belong to a listed extension will
        be considered shippable to the remote server.
@@ -293,7 +293,7 @@
 
       <para>
        When using the <literal>extensions</literal> option, <emphasis>it is the
-       user's responsibility</> that the listed extensions exist and behave
+       user's responsibility</emphasis> that the listed extensions exist and behave
        identically on both the local and remote servers.  Otherwise, remote
        queries may fail or behave unexpectedly.
       </para>
@@ -304,11 +304,11 @@
      <term><literal>fetch_size</literal></term>
      <listitem>
       <para>
-       This option specifies the number of rows <filename>postgres_fdw</>
+       This option specifies the number of rows <filename>postgres_fdw</filename>
        should get in each fetch operation. It can be specified for a foreign
        table or a foreign server. The option specified on a table overrides
        an option specified for the server.
-       The default is <literal>100</>.
+       The default is <literal>100</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -321,7 +321,7 @@
    <title>Updatability Options</title>
 
    <para>
-    By default all foreign tables using <filename>postgres_fdw</> are assumed
+    By default all foreign tables using <filename>postgres_fdw</filename> are assumed
     to be updatable.  This may be overridden using the following option:
    </para>
 
@@ -331,20 +331,20 @@
      <term><literal>updatable</literal></term>
      <listitem>
       <para>
-       This option controls whether <filename>postgres_fdw</> allows foreign
-       tables to be modified using <command>INSERT</>, <command>UPDATE</> and
-       <command>DELETE</> commands.  It can be specified for a foreign table
+       This option controls whether <filename>postgres_fdw</filename> allows foreign
+       tables to be modified using <command>INSERT</command>, <command>UPDATE</command> and
+       <command>DELETE</command> commands.  It can be specified for a foreign table
        or a foreign server.  A table-level option overrides a server-level
        option.
-       The default is <literal>true</>.
+       The default is <literal>true</literal>.
       </para>
 
       <para>
        Of course, if the remote table is not in fact updatable, an error
        would occur anyway.  Use of this option primarily allows the error to
        be thrown locally without querying the remote server.  Note however
-       that the <literal>information_schema</> views will report a
-       <filename>postgres_fdw</> foreign table to be updatable (or not)
+       that the <literal>information_schema</literal> views will report a
+       <filename>postgres_fdw</filename> foreign table to be updatable (or not)
        according to the setting of this option, without any check of the
        remote server.
       </para>
@@ -358,8 +358,8 @@
    <title>Importing Options</title>
 
    <para>
-    <filename>postgres_fdw</> is able to import foreign table definitions
-    using <xref linkend="sql-importforeignschema">.  This command creates
+    <filename>postgres_fdw</filename> is able to import foreign table definitions
+    using <xref linkend="sql-importforeignschema"/>.  This command creates
     foreign table definitions on the local server that match tables or
     views present on the remote server.  If the remote tables to be imported
     have columns of user-defined data types, the local server must have
@@ -368,7 +368,7 @@
 
    <para>
     Importing behavior can be customized with the following options
-    (given in the <command>IMPORT FOREIGN SCHEMA</> command):
+    (given in the <command>IMPORT FOREIGN SCHEMA</command> command):
    </para>
 
    <variablelist>
@@ -376,9 +376,9 @@
      <term><literal>import_collate</literal></term>
      <listitem>
       <para>
-       This option controls whether column <literal>COLLATE</> options
+       This option controls whether column <literal>COLLATE</literal> options
        are included in the definitions of foreign tables imported
-       from a foreign server. The default is <literal>true</>.  You might
+       from a foreign server. The default is <literal>true</literal>.  You might
        need to turn this off if the remote server has a different set of
        collation names than the local server does, which is likely to be the
        case if it's running on a different operating system.
@@ -389,13 +389,13 @@
      <term><literal>import_default</literal></term>
      <listitem>
       <para>
-       This option controls whether column <literal>DEFAULT</> expressions
+       This option controls whether column <literal>DEFAULT</literal> expressions
        are included in the definitions of foreign tables imported
-       from a foreign server. The default is <literal>false</>.  If you
+       from a foreign server. The default is <literal>false</literal>.  If you
        enable this option, be wary of defaults that might get computed
        differently on the local server than they would be on the remote
-       server; <function>nextval()</> is a common source of problems.
-       The <command>IMPORT</> will fail altogether if an imported default
+       server; <function>nextval()</function> is a common source of problems.
+       The <command>IMPORT</command> will fail altogether if an imported default
        expression uses a function or operator that does not exist locally.
       </para>
      </listitem>
@@ -404,26 +404,26 @@
      <term><literal>import_not_null</literal></term>
      <listitem>
       <para>
-       This option controls whether column <literal>NOT NULL</>
+       This option controls whether column <literal>NOT NULL</literal>
        constraints are included in the definitions of foreign tables imported
-       from a foreign server. The default is <literal>true</>.
+       from a foreign server. The default is <literal>true</literal>.
       </para>
      </listitem>
     </varlistentry>
    </variablelist>
 
    <para>
-    Note that constraints other than <literal>NOT NULL</> will never be
-    imported from the remote tables.  Although <productname>PostgreSQL</>
-    does support <literal>CHECK</> constraints on foreign tables, there is no
+    Note that constraints other than <literal>NOT NULL</literal> will never be
+    imported from the remote tables.  Although <productname>PostgreSQL</productname>
+    does support <literal>CHECK</literal> constraints on foreign tables, there is no
     provision for importing them automatically, because of the risk that a
     constraint expression could evaluate differently on the local and remote
-    servers.  Any such inconsistency in the behavior of a <literal>CHECK</>
+    servers.  Any such inconsistency in the behavior of a <literal>CHECK</literal>
     constraint could lead to hard-to-detect errors in query optimization.
-    So if you wish to import <literal>CHECK</> constraints, you must do so
+    So if you wish to import <literal>CHECK</literal> constraints, you must do so
     manually, and you should verify the semantics of each one carefully.
-    For more detail about the treatment of <literal>CHECK</> constraints on
-    foreign tables, see <xref linkend="sql-createforeigntable">.
+    For more detail about the treatment of <literal>CHECK</literal> constraints on
+    foreign tables, see <xref linkend="sql-createforeigntable"/>.
    </para>
 
    <para>
@@ -464,18 +464,18 @@
   </para>
 
   <para>
-   The remote transaction uses <literal>SERIALIZABLE</>
-   isolation level when the local transaction has <literal>SERIALIZABLE</>
-   isolation level; otherwise it uses <literal>REPEATABLE READ</>
+   The remote transaction uses <literal>SERIALIZABLE</literal>
+   isolation level when the local transaction has <literal>SERIALIZABLE</literal>
+   isolation level; otherwise it uses <literal>REPEATABLE READ</literal>
    isolation level.  This choice ensures that if a query performs multiple
    table scans on the remote server, it will get snapshot-consistent results
    for all the scans.  A consequence is that successive queries within a
    single transaction will see the same data from the remote server, even if
    concurrent updates are occurring on the remote server due to other
    activities.  That behavior would be expected anyway if the local
-   transaction uses <literal>SERIALIZABLE</> or <literal>REPEATABLE READ</>
+   transaction uses <literal>SERIALIZABLE</literal> or <literal>REPEATABLE READ</literal>
    isolation level, but it might be surprising for a <literal>READ
-   COMMITTED</> local transaction.  A future
+   COMMITTED</literal> local transaction.  A future
    <productname>PostgreSQL</productname> release might modify these rules.
   </para>
  </sect2>
@@ -484,42 +484,42 @@
   <title>Remote Query Optimization</title>
 
   <para>
-   <filename>postgres_fdw</> attempts to optimize remote queries to reduce
+   <filename>postgres_fdw</filename> attempts to optimize remote queries to reduce
    the amount of data transferred from foreign servers.  This is done by
-   sending query <literal>WHERE</> clauses to the remote server for
+   sending query <literal>WHERE</literal> clauses to the remote server for
    execution, and by not retrieving table columns that are not needed for
    the current query.  To reduce the risk of misexecution of queries,
-   <literal>WHERE</> clauses are not sent to the remote server unless they use
+   <literal>WHERE</literal> clauses are not sent to the remote server unless they use
    only data types, operators, and functions that are built-in or belong to an
-   extension that's listed in the foreign server's <literal>extensions</>
+   extension that's listed in the foreign server's <literal>extensions</literal>
    option.  Operators and functions in such clauses must
-   be <literal>IMMUTABLE</> as well.
-   For an <command>UPDATE</> or <command>DELETE</> query,
-   <filename>postgres_fdw</> attempts to optimize the query execution by
+   be <literal>IMMUTABLE</literal> as well.
+   For an <command>UPDATE</command> or <command>DELETE</command> query,
+   <filename>postgres_fdw</filename> attempts to optimize the query execution by
    sending the whole query to the remote server if there are no query
-   <literal>WHERE</> clauses that cannot be sent to the remote server,
-   no local joins for the query, no row-level local <literal>BEFORE</> or
-   <literal>AFTER</> triggers on the target table, and no
-   <literal>CHECK OPTION</> constraints from parent views.
-   In <command>UPDATE</>,
+   <literal>WHERE</literal> clauses that cannot be sent to the remote server,
+   no local joins for the query, no row-level local <literal>BEFORE</literal> or
+   <literal>AFTER</literal> triggers on the target table, and no
+   <literal>CHECK OPTION</literal> constraints from parent views.
+   In <command>UPDATE</command>,
    expressions to assign to target columns must use only built-in data types,
-   <literal>IMMUTABLE</> operators, or <literal>IMMUTABLE</> functions,
+   <literal>IMMUTABLE</literal> operators, or <literal>IMMUTABLE</literal> functions,
    to reduce the risk of misexecution of the query.
   </para>
 
   <para>
-   When <filename>postgres_fdw</> encounters a join between foreign tables on
+   When <filename>postgres_fdw</filename> encounters a join between foreign tables on
    the same foreign server, it sends the entire join to the foreign server,
    unless for some reason it believes that it will be more efficient to fetch
    rows from each table individually, or unless the table references involved
-   are subject to different user mappings.  While sending the <literal>JOIN</>
+   are subject to different user mappings.  While sending the <literal>JOIN</literal>
    clauses, it takes the same precautions as mentioned above for the
-   <literal>WHERE</> clauses.
+   <literal>WHERE</literal> clauses.
   </para>
 
   <para>
    The query that is actually sent to the remote server for execution can
-   be examined using <command>EXPLAIN VERBOSE</>.
+   be examined using <command>EXPLAIN VERBOSE</command>.
   </para>
  </sect2>
 
@@ -527,55 +527,55 @@
   <title>Remote Query Execution Environment</title>
 
   <para>
-   In the remote sessions opened by <filename>postgres_fdw</>,
-   the <xref linkend="guc-search-path"> parameter is set to
-   just <literal>pg_catalog</>, so that only built-in objects are visible
+   In the remote sessions opened by <filename>postgres_fdw</filename>,
+   the <xref linkend="guc-search-path"/> parameter is set to
+   just <literal>pg_catalog</literal>, so that only built-in objects are visible
    without schema qualification.  This is not an issue for queries
-   generated by <filename>postgres_fdw</> itself, because it always
+   generated by <filename>postgres_fdw</filename> itself, because it always
    supplies such qualification.  However, this can pose a hazard for
    functions that are executed on the remote server via triggers or rules
    on remote tables.  For example, if a remote table is actually a view,
    any functions used in that view will be executed with the restricted
    search path.  It is recommended to schema-qualify all names in such
-   functions, or else attach <literal>SET search_path</> options
-   (see <xref linkend="sql-createfunction">) to such functions
+   functions, or else attach <literal>SET search_path</literal> options
+   (see <xref linkend="sql-createfunction"/>) to such functions
    to establish their expected search path environment.
   </para>
 
   <para>
-   <filename>postgres_fdw</> likewise establishes remote session settings
+   <filename>postgres_fdw</filename> likewise establishes remote session settings
    for various parameters: 
    <itemizedlist spacing="compact">
     <listitem>
      <para>
-      <xref linkend="guc-timezone"> is set to <literal>UTC</>
+      <xref linkend="guc-timezone"/> is set to <literal>UTC</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      <xref linkend="guc-datestyle"> is set to <literal>ISO</>
+      <xref linkend="guc-datestyle"/> is set to <literal>ISO</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      <xref linkend="guc-intervalstyle"> is set to <literal>postgres</>
+      <xref linkend="guc-intervalstyle"/> is set to <literal>postgres</literal>
      </para>
     </listitem>
     <listitem>
      <para>
-      <xref linkend="guc-extra-float-digits"> is set to <literal>3</> for remote
-      servers 9.0 and newer and is set to <literal>2</> for older versions
+      <xref linkend="guc-extra-float-digits"/> is set to <literal>3</literal> for remote
+      servers 9.0 and newer and is set to <literal>2</literal> for older versions
      </para>
     </listitem>
    </itemizedlist>
-   These are less likely to be problematic than <varname>search_path</>, but
-   can be handled with function <literal>SET</> options if the need arises.
+   These are less likely to be problematic than <varname>search_path</varname>, but
+   can be handled with function <literal>SET</literal> options if the need arises.
   </para>
 
   <para>
-   It is <emphasis>not</> recommended that you override this behavior by
+   It is <emphasis>not</emphasis> recommended that you override this behavior by
    changing the session-level settings of these parameters; that is likely
-   to cause <filename>postgres_fdw</> to malfunction.
+   to cause <filename>postgres_fdw</filename> to malfunction.
   </para>
  </sect2>
 
@@ -583,19 +583,19 @@
   <title>Cross-Version Compatibility</title>
 
   <para>
-   <filename>postgres_fdw</> can be used with remote servers dating back
-   to <productname>PostgreSQL</> 8.3.  Read-only capability is available
-   back to 8.1.  A limitation however is that <filename>postgres_fdw</>
+   <filename>postgres_fdw</filename> can be used with remote servers dating back
+   to <productname>PostgreSQL</productname> 8.3.  Read-only capability is available
+   back to 8.1.  A limitation however is that <filename>postgres_fdw</filename>
    generally assumes that immutable built-in functions and operators are
    safe to send to the remote server for execution, if they appear in a
-   <literal>WHERE</> clause for a foreign table.  Thus, a built-in
+   <literal>WHERE</literal> clause for a foreign table.  Thus, a built-in
    function that was added since the remote server's release might be sent
-   to it for execution, resulting in <quote>function does not exist</> or
+   to it for execution, resulting in <quote>function does not exist</quote> or
    a similar error.  This type of failure can be worked around by
    rewriting the query, for example by embedding the foreign table
-   reference in a sub-<literal>SELECT</> with <literal>OFFSET 0</> as an
+   reference in a sub-<literal>SELECT</literal> with <literal>OFFSET 0</literal> as an
    optimization fence, and placing the problematic function or operator
-   outside the sub-<literal>SELECT</>.
+   outside the sub-<literal>SELECT</literal>.
   </para>
  </sect2>
 
@@ -604,7 +604,7 @@
 
   <para>
    Here is an example of creating a foreign table with
-   <literal>postgres_fdw</>. First install the extension:
+   <literal>postgres_fdw</literal>. First install the extension:
   </para>
 
 <programlisting>
@@ -612,8 +612,8 @@ CREATE EXTENSION postgres_fdw;
 </programlisting>
 
   <para>
-   Then create a foreign server using <xref linkend="sql-createserver">.
-   In this example we wish to connect to a <productname>PostgreSQL</> server
+   Then create a foreign server using <xref linkend="sql-createserver"/>.
+   In this example we wish to connect to a <productname>PostgreSQL</productname> server
    on host <literal>192.83.123.89</literal> listening on
    port <literal>5432</literal>.  The database to which the connection is made
    is named <literal>foreign_db</literal> on the remote server:
@@ -626,7 +626,7 @@ CREATE SERVER foreign_server
   </para>
 
   <para>
-   A user mapping, defined with <xref linkend="sql-createusermapping">, is
+   A user mapping, defined with <xref linkend="sql-createusermapping"/>, is
    needed as well to identify the role that will be used on the remote
    server:
 
@@ -639,10 +639,10 @@ CREATE USER MAPPING FOR local_user
 
   <para>
    Now it is possible to create a foreign table with
-   <xref linkend="sql-createforeigntable">.  In this example we
-   wish to access the table named <structname>some_schema.some_table</>
+   <xref linkend="sql-createforeigntable"/>.  In this example we
+   wish to access the table named <structname>some_schema.some_table</structname>
    on the remote server.  The local name for it will
-   be <structname>foreign_table</>:
+   be <structname>foreign_table</structname>:
 
 <programlisting>
 CREATE FOREIGN TABLE foreign_table (
@@ -654,11 +654,11 @@ CREATE FOREIGN TABLE foreign_table (
 </programlisting>
 
    It's essential that the data types and other properties of the columns
-   declared in <command>CREATE FOREIGN TABLE</> match the actual remote table.
-   Column names must match as well, unless you attach <literal>column_name</>
+   declared in <command>CREATE FOREIGN TABLE</command> match the actual remote table.
+   Column names must match as well, unless you attach <literal>column_name</literal>
    options to the individual columns to show how they are named in the remote
    table.
-   In many cases, use of <xref linkend="sql-importforeignschema"> is
+   In many cases, use of <xref linkend="sql-importforeignschema"/> is
    preferable to constructing foreign table definitions manually.
   </para>
  </sect2>
diff --git a/doc/src/sgml/postgres.sgml b/doc/src/sgml/postgres.sgml
index 8a3bfc9b0d..054347b17d 100644
--- a/doc/src/sgml/postgres.sgml
+++ b/doc/src/sgml/postgres.sgml
@@ -1,6 +1,8 @@
 <!-- doc/src/sgml/postgres.sgml -->
 
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
+<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN"
+          "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"
+[
 
 <!ENTITY % version SYSTEM "version.sgml">
 %version;
@@ -42,11 +44,11 @@
 
    <para>
     After you have worked through this tutorial you might want to move
-    on to reading <xref linkend="sql"> to gain a more formal knowledge
-    of the SQL language, or <xref linkend="client-interfaces"> for
+    on to reading <xref linkend="sql"/> to gain a more formal knowledge
+    of the SQL language, or <xref linkend="client-interfaces"/> for
     information about developing applications for
     <productname>PostgreSQL</productname>.  Those who set up and
-    manage their own server should also read <xref linkend="admin">.
+    manage their own server should also read <xref linkend="admin"/>.
    </para>
   </partintro>
 
@@ -80,16 +82,16 @@
     chapters individually as they choose.  The information in this
     part is presented in a narrative fashion in topical units.
     Readers looking for a complete description of a particular command
-    should see <xref linkend="reference">.
+    should see <xref linkend="reference"/>.
    </para>
 
    <para>
     Readers of this part should know how to connect to a
-    <productname>PostgreSQL</> database and issue
+    <productname>PostgreSQL</productname> database and issue
     <acronym>SQL</acronym> commands.  Readers that are unfamiliar with
-    these issues are encouraged to read <xref linkend="tutorial">
+    these issues are encouraged to read <xref linkend="tutorial"/>
     first.  <acronym>SQL</acronym> commands are typically entered
-    using the <productname>PostgreSQL</> interactive terminal
+    using the <productname>PostgreSQL</productname> interactive terminal
     <application>psql</application>, but other programs that have
     similar functionality can be used as well.
    </para>
@@ -116,10 +118,10 @@
   <partintro>
    <para>
     This part covers topics that are of interest to a
-    <productname>PostgreSQL</> database administrator.  This includes
+    <productname>PostgreSQL</productname> database administrator.  This includes
     installation of the software, set up and configuration of the
     server, management of users and databases, and maintenance tasks.
-    Anyone who runs a <productname>PostgreSQL</> server, even for
+    Anyone who runs a <productname>PostgreSQL</productname> server, even for
     personal use, but especially in production, should be familiar
     with the topics covered in this part.
    </para>
@@ -130,7 +132,7 @@
     self-contained and can be read individually as desired.  The
     information in this part is presented in a narrative fashion in
     topical units.  Readers looking for a complete description of a
-    particular command should see <xref linkend="reference">.
+    particular command should see <xref linkend="reference"/>.
    </para>
 
    <para>
@@ -139,9 +141,9 @@
     up their own server can begin their exploration with this part.
     The rest of this part is about tuning and management; that material
     assumes that the reader is familiar with the general use of
-    the <productname>PostgreSQL</> database system.  Readers are
-    encouraged to look at <xref linkend="tutorial"> and <xref
-    linkend="sql"> for additional information.
+    the <productname>PostgreSQL</productname> database system.  Readers are
+    encouraged to look at <xref linkend="tutorial"/> and <xref
+    linkend="sql"/> for additional information.
    </para>
   </partintro>
 
@@ -171,13 +173,13 @@
   <partintro>
    <para>
     This part describes the client programming interfaces distributed
-    with <productname>PostgreSQL</>.  Each of these chapters can be
+    with <productname>PostgreSQL</productname>.  Each of these chapters can be
     read independently.  Note that there are many other programming
     interfaces for client programs that are distributed separately and
-    contain their own documentation (<xref linkend="external-projects">
+    contain their own documentation (<xref linkend="external-projects"/>
     lists some of the more popular ones).  Readers of this part should be
     familiar with using <acronym>SQL</acronym> commands to manipulate
-    and query the database (see <xref linkend="sql">) and of course
+    and query the database (see <xref linkend="sql"/>) and of course
     with the programming language that the interface uses.
    </para>
   </partintro>
@@ -197,13 +199,13 @@
     This part is about extending the server functionality with
     user-defined functions, data types, triggers, etc.  These are
     advanced topics which should probably be approached only after all
-    the other user documentation about <productname>PostgreSQL</> has
+    the other user documentation about <productname>PostgreSQL</productname> has
     been understood.  Later chapters in this part describe the server-side
     programming languages available in the
     <productname>PostgreSQL</productname> distribution as well as
     general issues concerning server-side programming languages.  It
     is essential to read at least the earlier sections of <xref
-    linkend="extend"> (covering functions) before diving into the
+    linkend="extend"/> (covering functions) before diving into the
     material about server-side programming languages.
    </para>
   </partintro>
@@ -234,7 +236,7 @@
   <partintro>
    <para>
     This part contains assorted information that might be of use to
-    <productname>PostgreSQL</> developers.
+    <productname>PostgreSQL</productname> developers.
    </para>
   </partintro>
 
@@ -250,6 +252,7 @@
   &geqo;
   &indexam;
   &generic-wal;
+  &btree;
   &gist;
   &spgist;
   &gin;
diff --git a/doc/src/sgml/problems.sgml b/doc/src/sgml/problems.sgml
index 6bf74bb399..7d14789e51 100644
--- a/doc/src/sgml/problems.sgml
+++ b/doc/src/sgml/problems.sgml
@@ -145,7 +145,7 @@
      </para>
 
      <para>
-      If your application uses some other client interface, such as <application>PHP</>, then
+      If your application uses some other client interface, such as <application>PHP</application>, then
       please try to isolate the offending queries. We will probably not set up a
       web server to reproduce your problem. In any case remember to provide
       the exact input files; do not guess that the problem happens for
@@ -167,10 +167,10 @@
      <note>
       <para>
        If you are reporting an error message, please obtain the most verbose
-       form of the message.  In <application>psql</>, say <literal>\set
-       VERBOSITY verbose</> beforehand.  If you are extracting the message
+       form of the message.  In <application>psql</application>, say <literal>\set
+       VERBOSITY verbose</literal> beforehand.  If you are extracting the message
        from the server log, set the run-time parameter
-       <xref linkend="guc-log-error-verbosity"> to <literal>verbose</> so that all
+       <xref linkend="guc-log-error-verbosity"/> to <literal>verbose</literal> so that all
        details are logged.
       </para>
      </note>
@@ -236,9 +236,9 @@
       If your version is older than &version; we will almost certainly
       tell you to upgrade. There are many bug fixes and improvements
       in each new release, so it is quite possible that a bug you have
-      encountered in an older release of <productname>PostgreSQL</>
+      encountered in an older release of <productname>PostgreSQL</productname>
       has already been fixed. We can only provide limited support for
-      sites using older releases of <productname>PostgreSQL</>; if you
+      sites using older releases of <productname>PostgreSQL</productname>; if you
       require more than we can provide, consider acquiring a
       commercial support contract.
      </para>
@@ -283,8 +283,8 @@
    are specifically talking about the backend process, mention that, do not
    just say <quote>PostgreSQL crashes</quote>.  A crash of a single
    backend process is quite different from crash of the parent
-   <quote>postgres</> process; please don't say <quote>the server
-   crashed</> when you mean a single backend process went down, nor vice versa.
+   <quote>postgres</quote> process; please don't say <quote>the server
+   crashed</quote> when you mean a single backend process went down, nor vice versa.
    Also, client programs such as the interactive frontend <quote><application>psql</application></quote>
    are completely separate from the backend.  Please try to be specific
    about whether the problem is on the client or server side.
@@ -356,10 +356,10 @@
     subscribed to a list to be allowed to post on it.  (You need not be
     subscribed to use the bug-report web form, however.)
     If you would like to send mail but do not want to receive list traffic,
-    you can subscribe and set your subscription option to <literal>nomail</>.
+    you can subscribe and set your subscription option to <literal>nomail</literal>.
     For more information send mail to
     <email>majordomo@postgresql.org</email>
-    with the single word <literal>help</> in the body of the message.
+    with the single word <literal>help</literal> in the body of the message.
    </para>
   </note>
  </sect2>
diff --git a/doc/src/sgml/protocol.sgml b/doc/src/sgml/protocol.sgml
index c8b083c29c..3cec9e0b0c 100644
--- a/doc/src/sgml/protocol.sgml
+++ b/doc/src/sgml/protocol.sgml
@@ -22,20 +22,28 @@
   <productname>PostgreSQL</productname> 7.4 and later.  For descriptions
   of the earlier protocol versions, see previous releases of the
   <productname>PostgreSQL</productname> documentation.  A single server
-  can support multiple protocol versions.  The initial
-  startup-request message tells the server which protocol version the
-  client is attempting to use, and then the server follows that protocol
-  if it is able.
+  can support multiple protocol versions.  The initial startup-request
+  message tells the server which protocol version the client is attempting to
+  use.  If the major version requested by the client is not supported by
+  the server, the connection will be rejected (for example, this would occur
+  if the client requested protocol version 4.0, which does not exist as of
+  this writing).  If the minor version requested by the client is not
+  supported by the server (e.g. the client requests version 3.1, but the
+  server supports only 3.0), the server may either reject the connection or
+  may respond with a NegotiateProtocolVersion message containing the highest
+  minor protocol version which it supports.  The client may then choose either
+  to continue with the connection using the specified protocol version or
+  to abort the connection.
  </para>
 
   <para>
    In order to serve multiple clients efficiently, the server launches
-   a new <quote>backend</> process for each client.
+   a new <quote>backend</quote> process for each client.
    In the current implementation, a new child
    process is created immediately after an incoming connection is detected.
    This is transparent to the protocol, however.  For purposes of the
-   protocol, the terms <quote>backend</> and <quote>server</> are
-   interchangeable; likewise <quote>frontend</> and <quote>client</>
+   protocol, the terms <quote>backend</quote> and <quote>server</quote> are
+   interchangeable; likewise <quote>frontend</quote> and <quote>client</quote>
    are interchangeable.
   </para>
 
@@ -56,7 +64,7 @@
   <para>
    During normal operation, the frontend sends queries and
    other commands to the backend, and the backend sends back query results
-   and other responses.  There are a few cases (such as <command>NOTIFY</>)
+   and other responses.  There are a few cases (such as <command>NOTIFY</command>)
    wherein the
    backend will send unsolicited messages, but for the most part this portion
    of a session is driven by frontend requests.
@@ -71,9 +79,9 @@
 
   <para>
    Within normal operation, SQL commands can be executed through either of
-   two sub-protocols.  In the <quote>simple query</> protocol, the frontend
+   two sub-protocols.  In the <quote>simple query</quote> protocol, the frontend
    just sends a textual query string, which is parsed and immediately
-   executed by the backend.  In the <quote>extended query</> protocol,
+   executed by the backend.  In the <quote>extended query</quote> protocol,
    processing of queries is separated into multiple steps: parsing,
    binding of parameter values, and execution.  This offers flexibility
    and performance benefits, at the cost of extra complexity.
@@ -81,7 +89,7 @@
 
   <para>
    Normal operation has additional sub-protocols for special operations
-   such as <command>COPY</>.
+   such as <command>COPY</command>.
   </para>
 
  <sect2 id="protocol-message-concepts">
@@ -123,24 +131,24 @@
    <para>
     In the extended-query protocol, execution of SQL commands is divided
     into multiple steps.  The state retained between steps is represented
-    by two types of objects: <firstterm>prepared statements</> and
-    <firstterm>portals</>.  A prepared statement represents the result of
+    by two types of objects: <firstterm>prepared statements</firstterm> and
+    <firstterm>portals</firstterm>.  A prepared statement represents the result of
     parsing and semantic analysis of a textual query string.
     A prepared statement is not in itself ready to execute, because it might
-    lack specific values for <firstterm>parameters</>.  A portal represents
+    lack specific values for <firstterm>parameters</firstterm>.  A portal represents
     a ready-to-execute or already-partially-executed statement, with any
-    missing parameter values filled in.  (For <command>SELECT</> statements,
+    missing parameter values filled in.  (For <command>SELECT</command> statements,
     a portal is equivalent to an open cursor, but we choose to use a different
-    term since cursors don't handle non-<command>SELECT</> statements.)
+    term since cursors don't handle non-<command>SELECT</command> statements.)
    </para>
 
    <para>
-    The overall execution cycle consists of a <firstterm>parse</> step,
+    The overall execution cycle consists of a <firstterm>parse</firstterm> step,
     which creates a prepared statement from a textual query string; a
-    <firstterm>bind</> step, which creates a portal given a prepared
+    <firstterm>bind</firstterm> step, which creates a portal given a prepared
     statement and values for any needed parameters; and an
-    <firstterm>execute</> step that runs a portal's query.  In the case of
-    a query that returns rows (<command>SELECT</>, <command>SHOW</>, etc),
+    <firstterm>execute</firstterm> step that runs a portal's query.  In the case of
+    a query that returns rows (<command>SELECT</command>, <command>SHOW</command>, etc),
     the execute step can be told to fetch only
     a limited number of rows, so that multiple execute steps might be needed
     to complete the operation.
@@ -151,7 +159,7 @@
     (but note that these exist only within a session, and are never shared
     across sessions).  Existing prepared statements and portals are
     referenced by names assigned when they were created.  In addition,
-    an <quote>unnamed</> prepared statement and portal exist.  Although these
+    an <quote>unnamed</quote> prepared statement and portal exist.  Although these
     behave largely the same as named objects, operations on them are optimized
     for the case of executing a query only once and then discarding it,
     whereas operations on named objects are optimized on the expectation
@@ -164,10 +172,10 @@
 
    <para>
     Data of a particular data type might be transmitted in any of several
-    different <firstterm>formats</>.  As of <productname>PostgreSQL</> 7.4
-    the only supported formats are <quote>text</> and <quote>binary</>,
+    different <firstterm>formats</firstterm>.  As of <productname>PostgreSQL</productname> 7.4
+    the only supported formats are <quote>text</quote> and <quote>binary</quote>,
     but the protocol makes provision for future extensions.  The desired
-    format for any value is specified by a <firstterm>format code</>.
+    format for any value is specified by a <firstterm>format code</firstterm>.
     Clients can specify a format code for each transmitted parameter value
     and for each column of a query result.  Text has format code zero,
     binary has format code one, and all other format codes are reserved
@@ -199,7 +207,7 @@
   <para>
    This section describes the message flow and the semantics of each
    message type.  (Details of the exact representation of each message
-   appear in <xref linkend="protocol-message-formats">.)  There are
+   appear in <xref linkend="protocol-message-formats"/>.)  There are
    several different sub-protocols depending on the state of the
    connection: start-up, query, function call,
    <command>COPY</command>, and termination.  There are also special
@@ -300,8 +308,8 @@
         password, the server responds with an AuthenticationOk,
         otherwise it responds with an ErrorResponse.  The actual
         PasswordMessage can be computed in SQL as <literal>concat('md5',
-        md5(concat(md5(concat(password, username)), random-salt)))</>.
-        (Keep in mind the <function>md5()</> function returns its
+        md5(concat(md5(concat(password, username)), random-salt)))</literal>.
+        (Keep in mind the <function>md5()</function> function returns its
         result as a hex string.)
        </para>
       </listitem>
@@ -375,7 +383,7 @@
         SASLInitialResponse with the name of the selected mechanism, and the
         first part of the SASL data stream in response to this. If further
         messages are needed, the server will respond with
-        AuthenticationSASLContinue. See <xref linkend="sasl-authentication">
+        AuthenticationSASLContinue. See <xref linkend="sasl-authentication"/>
         for details.
        </para>
       </listitem>
@@ -406,6 +414,21 @@
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term>NegotiateProtocolVersion</term>
+      <listitem>
+       <para>
+        The server does not support the minor protocol version requested
+        by the client, but does support an earlier version of the protocol;
+        this message indicates the highest supported minor version.  This
+        message will also be sent if the client requested unsupported protocol
+        options (i.e. beginning with <literal>_pq_.</literal>) in the
+        startup packet.  This message will be followed by an ErrorResponse or
+        a message indicating the success or failure of authentication.
+       </para>
+      </listitem>
+     </varlistentry>
+
     </variablelist>
    </para>
 
@@ -420,8 +443,10 @@
     for further messages from the server.  In this phase a backend process
     is being started, and the frontend is just an interested bystander.
     It is still possible for the startup attempt
-    to fail (ErrorResponse), but in the normal case the backend will send
-    some ParameterStatus messages, BackendKeyData, and finally ReadyForQuery.
+    to fail (ErrorResponse) or the server to decline support for the requested
+    minor protocol version (NegotiateProtocolVersion), but in the normal case
+    the backend will send some ParameterStatus messages, BackendKeyData, and
+    finally ReadyForQuery.
    </para>
 
    <para>
@@ -453,9 +478,9 @@
        <para>
         This message informs the frontend about the current (initial)
          setting of backend parameters, such as <xref
-         linkend="guc-client-encoding"> or <xref linkend="guc-datestyle">.
+         linkend="guc-client-encoding"/> or <xref linkend="guc-datestyle"/>.
          The frontend can ignore this message, or record the settings
-         for its future use; see <xref linkend="protocol-async"> for
+         for its future use; see <xref linkend="protocol-async"/> for
          more details.  The frontend should not respond to this
          message, but should continue listening for a ReadyForQuery
          message.
@@ -539,7 +564,7 @@
       <listitem>
        <para>
         The backend is ready to copy data from the frontend to a
-        table; see <xref linkend="protocol-copy">.
+        table; see <xref linkend="protocol-copy"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -549,7 +574,7 @@
       <listitem>
        <para>
         The backend is ready to copy data from a table to the
-        frontend; see <xref linkend="protocol-copy">.
+        frontend; see <xref linkend="protocol-copy"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -624,12 +649,12 @@
    </para>
 
    <para>
-    The response to a <command>SELECT</> query (or other queries that
-    return row sets, such as <command>EXPLAIN</> or <command>SHOW</>)
+    The response to a <command>SELECT</command> query (or other queries that
+    return row sets, such as <command>EXPLAIN</command> or <command>SHOW</command>)
     normally consists of RowDescription, zero or more
     DataRow messages, and then CommandComplete.
-    <command>COPY</> to or from the frontend invokes special protocol
-    as described in <xref linkend="protocol-copy">.
+    <command>COPY</command> to or from the frontend invokes special protocol
+    as described in <xref linkend="protocol-copy"/>.
     All other query types normally produce only
     a CommandComplete message.
    </para>
@@ -657,8 +682,8 @@
 
    <para>
     In simple Query mode, the format of retrieved values is always text,
-    except when the given command is a <command>FETCH</> from a cursor
-    declared with the <literal>BINARY</> option.  In that case, the
+    except when the given command is a <command>FETCH</command> from a cursor
+    declared with the <literal>BINARY</literal> option.  In that case, the
     retrieved values are in binary format.  The format codes given in
     the RowDescription message tell which format is being used.
    </para>
@@ -666,7 +691,7 @@
    <para>
     A frontend must be prepared to accept ErrorResponse and
     NoticeResponse messages whenever it is expecting any other type of
-    message.  See also <xref linkend="protocol-async"> concerning messages
+    message.  See also <xref linkend="protocol-async"/> concerning messages
     that the backend might generate due to outside events.
    </para>
 
@@ -675,6 +700,125 @@
     that will accept any message type at any time that it could make sense,
     rather than wiring in assumptions about the exact sequence of messages.
    </para>
+
+   <sect3 id="protocol-flow-multi-statement">
+    <title>Multiple Statements in a Simple Query</title>
+
+    <para>
+     When a simple Query message contains more than one SQL statement
+     (separated by semicolons), those statements are executed as a single
+     transaction, unless explicit transaction control commands are included
+     to force a different behavior.  For example, if the message contains
+<programlisting>
+INSERT INTO mytable VALUES(1);
+SELECT 1/0;
+INSERT INTO mytable VALUES(2);
+</programlisting>
+     then the divide-by-zero failure in the <command>SELECT</command> will force
+     rollback of the first <command>INSERT</command>.  Furthermore, because
+     execution of the message is abandoned at the first error, the second
+     <command>INSERT</command> is never attempted at all.
+    </para>
+
+    <para>
+     If instead the message contains
+<programlisting>
+BEGIN;
+INSERT INTO mytable VALUES(1);
+COMMIT;
+INSERT INTO mytable VALUES(2);
+SELECT 1/0;
+</programlisting>
+     then the first <command>INSERT</command> is committed by the
+     explicit <command>COMMIT</command> command.  The second <command>INSERT</command>
+     and the <command>SELECT</command> are still treated as a single transaction,
+     so that the divide-by-zero failure will roll back the
+     second <command>INSERT</command>, but not the first one.
+    </para>
+
+    <para>
+     This behavior is implemented by running the statements in a
+     multi-statement Query message in an <firstterm>implicit transaction
+     block</firstterm> unless there is some explicit transaction block for them to
+     run in.  The main difference between an implicit transaction block and
+     a regular one is that an implicit block is closed automatically at the
+     end of the Query message, either by an implicit commit if there was no
+     error, or an implicit rollback if there was an error.  This is similar
+     to the implicit commit or rollback that happens for a statement
+     executed by itself (when not in a transaction block).
+    </para>
+
+    <para>
+     If the session is already in a transaction block, as a result of
+     a <command>BEGIN</command> in some previous message, then the Query message
+     simply continues that transaction block, whether the message contains
+     one statement or several.  However, if the Query message contains
+     a <command>COMMIT</command> or <command>ROLLBACK</command> closing the existing
+     transaction block, then any following statements are executed in an
+     implicit transaction block.
+     Conversely, if a <command>BEGIN</command> appears in a multi-statement Query
+     message, then it starts a regular transaction block that will only be
+     terminated by an explicit <command>COMMIT</command> or <command>ROLLBACK</command>,
+     whether that appears in this Query message or a later one.
+     If the <command>BEGIN</command> follows some statements that were executed as
+     an implicit transaction block, those statements are not immediately
+     committed; in effect, they are retroactively included into the new
+     regular transaction block.
+    </para>
+
+    <para>
+     A <command>COMMIT</command> or <command>ROLLBACK</command> appearing in an implicit
+     transaction block is executed as normal, closing the implicit block;
+     however, a warning will be issued since a <command>COMMIT</command>
+     or <command>ROLLBACK</command> without a previous <command>BEGIN</command> might
+     represent a mistake.  If more statements follow, a new implicit
+     transaction block will be started for them.
+    </para>
+
+    <para>
+     Savepoints are not allowed in an implicit transaction block, since
+     they would conflict with the behavior of automatically closing the
+     block upon any error.
+    </para>
+
+    <para>
+     Remember that, regardless of any transaction control commands that may
+     be present, execution of the Query message stops at the first error.
+     Thus for example given
+<programlisting>
+BEGIN;
+SELECT 1/0;
+ROLLBACK;
+</programlisting>
+     in a single Query message, the session will be left inside a failed
+     regular transaction block, since the <command>ROLLBACK</command> is not
+     reached after the divide-by-zero error.  Another <command>ROLLBACK</command>
+     will be needed to restore the session to a usable state.
+    </para>
+
+    <para>
+     Another behavior of note is that initial lexical and syntactic
+     analysis is done on the entire query string before any of it is
+     executed.  Thus simple errors (such as a misspelled keyword) in later
+     statements can prevent execution of any of the statements.  This
+     is normally invisible to users since the statements would all roll
+     back anyway when done as an implicit transaction block.  However,
+     it can be visible when attempting to do multiple transactions within a
+     multi-statement Query.  For instance, if a typo turned our previous
+     example into
+<programlisting>
+BEGIN;
+INSERT INTO mytable VALUES(1);
+COMMIT;
+INSERT INTO mytable VALUES(2);
+SELCT 1/0;
+</programlisting>
+     then none of the statements would get run, resulting in the visible
+     difference that the first <command>INSERT</command> is not committed.
+     Errors detected at semantic analysis or later, such as a misspelled
+     table or column name, do not have this effect.
+    </para>
+   </sect3>
   </sect2>
 
   <sect2 id="protocol-flow-ext-query">
@@ -705,17 +849,17 @@
     <para>
      A parameter data type can be left unspecified by setting it to zero,
      or by making the array of parameter type OIDs shorter than the
-     number of parameter symbols (<literal>$</><replaceable>n</>)
+     number of parameter symbols (<literal>$</literal><replaceable>n</replaceable>)
      used in the query string.  Another special case is that a parameter's
-     type can be specified as <type>void</> (that is, the OID of the
-     <type>void</> pseudo-type).  This is meant to allow parameter symbols
+     type can be specified as <type>void</type> (that is, the OID of the
+     <type>void</type> pseudo-type).  This is meant to allow parameter symbols
      to be used for function parameters that are actually OUT parameters.
-     Ordinarily there is no context in which a <type>void</> parameter
+     Ordinarily there is no context in which a <type>void</type> parameter
      could be used, but if such a parameter symbol appears in a function's
      parameter list, it is effectively ignored.  For example, a function
-     call such as <literal>foo($1,$2,$3,$4)</> could match a function with
-     two IN and two OUT arguments, if <literal>$3</> and <literal>$4</>
-     are specified as having type <type>void</>.
+     call such as <literal>foo($1,$2,$3,$4)</literal> could match a function with
+     two IN and two OUT arguments, if <literal>$3</literal> and <literal>$4</literal>
+     are specified as having type <type>void</type>.
     </para>
    </note>
 
@@ -739,7 +883,7 @@
     statements must be explicitly closed before they can be redefined by
     another Parse message, but this is not required for the unnamed statement.
     Named prepared statements can also be created and accessed at the SQL
-    command level, using <command>PREPARE</> and <command>EXECUTE</>.
+    command level, using <command>PREPARE</command> and <command>EXECUTE</command>.
    </para>
 
    <para>
@@ -750,7 +894,7 @@
     the values to use for any parameter placeholders present in the prepared
     statement.  The
     supplied parameter set must match those needed by the prepared statement.
-    (If you declared any <type>void</> parameters in the Parse message,
+    (If you declared any <type>void</type> parameters in the Parse message,
     pass NULL values for them in the Bind message.)
     Bind also specifies the format to use for any data returned
     by the query; the format can be specified overall, or per-column.
@@ -761,7 +905,7 @@
     <para>
      The choice between text and binary output is determined by the format
      codes given in Bind, regardless of the SQL command involved.  The
-     <literal>BINARY</> attribute in cursor declarations is irrelevant when
+     <literal>BINARY</literal> attribute in cursor declarations is irrelevant when
      using extended query protocol.
     </para>
    </note>
@@ -785,14 +929,14 @@
     portals must be explicitly closed before they can be redefined by another
     Bind message, but this is not required for the unnamed portal.
     Named portals can also be created and accessed at the SQL
-    command level, using <command>DECLARE CURSOR</> and <command>FETCH</>.
+    command level, using <command>DECLARE CURSOR</command> and <command>FETCH</command>.
    </para>
 
    <para>
     Once a portal exists, it can be executed using an Execute message.
     The Execute message specifies the portal name (empty string denotes the
     unnamed portal) and
-    a maximum result-row count (zero meaning <quote>fetch all rows</>).
+    a maximum result-row count (zero meaning <quote>fetch all rows</quote>).
     The result-row count is only meaningful for portals
     containing commands that return row sets; in other cases the command is
     always executed to completion, and the row count is ignored.
@@ -819,7 +963,7 @@
     At completion of each series of extended-query messages, the frontend
     should issue a Sync message.  This parameterless message causes the
     backend to close the current transaction if it's not inside a
-    <command>BEGIN</>/<command>COMMIT</> transaction block (<quote>close</>
+    <command>BEGIN</command>/<command>COMMIT</command> transaction block (<quote>close</quote>
     meaning to commit if no error, or roll back if error).  Then a
     ReadyForQuery response is issued.  The purpose of Sync is to provide
     a resynchronization point for error recovery.  When an error is detected
@@ -827,13 +971,13 @@
     ErrorResponse, then reads and discards messages until a Sync is reached,
     then issues ReadyForQuery and returns to normal message processing.
     (But note that no skipping occurs if an error is detected
-    <emphasis>while</> processing Sync &mdash; this ensures that there is one
+    <emphasis>while</emphasis> processing Sync &mdash; this ensures that there is one
     and only one ReadyForQuery sent for each Sync.)
    </para>
 
    <note>
     <para>
-     Sync does not cause a transaction block opened with <command>BEGIN</>
+     Sync does not cause a transaction block opened with <command>BEGIN</command>
      to be closed.  It is possible to detect this situation since the
      ReadyForQuery message includes transaction status information.
     </para>
@@ -920,7 +1064,7 @@
     <para>
      The Function Call sub-protocol is a legacy feature that is probably best
      avoided in new code.  Similar results can be accomplished by setting up
-     a prepared statement that does <literal>SELECT function($1, ...)</>.
+     a prepared statement that does <literal>SELECT function($1, ...)</literal>.
      The Function Call cycle can then be replaced with Bind/Execute.
     </para>
    </note>
@@ -988,7 +1132,7 @@
    <title>COPY Operations</title>
 
    <para>
-    The <command>COPY</> command allows high-speed bulk data transfer
+    The <command>COPY</command> command allows high-speed bulk data transfer
     to or from the server.  Copy-in and copy-out operations each switch
     the connection into a distinct sub-protocol, which lasts until the
     operation is completed.
@@ -996,16 +1140,16 @@
 
    <para>
     Copy-in mode (data transfer to the server) is initiated when the
-    backend executes a <command>COPY FROM STDIN</> SQL statement.  The backend
+    backend executes a <command>COPY FROM STDIN</command> SQL statement.  The backend
     sends a CopyInResponse message to the frontend.  The frontend should
     then send zero or more CopyData messages, forming a stream of input
     data.  (The message boundaries are not required to have anything to do
     with row boundaries, although that is often a reasonable choice.)
     The frontend can terminate the copy-in mode by sending either a CopyDone
     message (allowing successful termination) or a CopyFail message (which
-    will cause the <command>COPY</> SQL statement to fail with an
+    will cause the <command>COPY</command> SQL statement to fail with an
     error).  The backend then reverts to the command-processing mode it was
-    in before the <command>COPY</> started, which will be either simple or
+    in before the <command>COPY</command> started, which will be either simple or
     extended query protocol.  It will next send either CommandComplete
     (if successful) or ErrorResponse (if not).
    </para>
@@ -1013,10 +1157,10 @@
    <para>
     In the event of a backend-detected error during copy-in mode (including
     receipt of a CopyFail message), the backend will issue an ErrorResponse
-    message.  If the <command>COPY</> command was issued via an extended-query
+    message.  If the <command>COPY</command> command was issued via an extended-query
     message, the backend will now discard frontend messages until a Sync
     message is received, then it will issue ReadyForQuery and return to normal
-    processing.  If the <command>COPY</> command was issued in a simple
+    processing.  If the <command>COPY</command> command was issued in a simple
     Query message, the rest of that message is discarded and ReadyForQuery
     is issued.  In either case, any subsequent CopyData, CopyDone, or CopyFail
     messages issued by the frontend will simply be dropped.
@@ -1028,16 +1172,16 @@
     that will abort the copy-in state as described above.  (The exception for
     Flush and Sync is for the convenience of client libraries that always
     send Flush or Sync after an Execute message, without checking whether
-    the command to be executed is a <command>COPY FROM STDIN</>.)
+    the command to be executed is a <command>COPY FROM STDIN</command>.)
    </para>
 
    <para>
     Copy-out mode (data transfer from the server) is initiated when the
-    backend executes a <command>COPY TO STDOUT</> SQL statement.  The backend
+    backend executes a <command>COPY TO STDOUT</command> SQL statement.  The backend
     sends a CopyOutResponse message to the frontend, followed by
     zero or more CopyData messages (always one per row), followed by CopyDone.
     The backend then reverts to the command-processing mode it was
-    in before the <command>COPY</> started, and sends CommandComplete.
+    in before the <command>COPY</command> started, and sends CommandComplete.
     The frontend cannot abort the transfer (except by closing the connection
     or issuing a Cancel request),
     but it can discard unwanted CopyData and CopyDone messages.
@@ -1054,13 +1198,13 @@
     It is possible for NoticeResponse and ParameterStatus messages to be
     interspersed between CopyData messages; frontends must handle these cases,
     and should be prepared for other asynchronous message types as well (see
-    <xref linkend="protocol-async">).  Otherwise, any message type other than
+    <xref linkend="protocol-async"/>).  Otherwise, any message type other than
     CopyData or CopyDone may be treated as terminating copy-out mode.
    </para>
 
    <para>
     There is another Copy-related mode called copy-both, which allows
-    high-speed bulk data transfer to <emphasis>and</> from the server.
+    high-speed bulk data transfer to <emphasis>and</emphasis> from the server.
     Copy-both mode is initiated when a backend in walsender mode
     executes a <command>START_REPLICATION</command> statement.  The
     backend sends a CopyBothResponse message to the frontend.  Both
@@ -1077,7 +1221,7 @@
     until a Sync message is received, and then issue ReadyForQuery and return
     to normal processing.  The frontend should treat receipt of ErrorResponse
     as terminating the copy in both directions; no CopyDone should be sent
-    in this case.  See <xref linkend="protocol-replication"> for more
+    in this case.  See <xref linkend="protocol-replication"/> for more
     information on the subprotocol transmitted over copy-both mode.
    </para>
 
@@ -1085,7 +1229,7 @@
     The CopyInResponse, CopyOutResponse and CopyBothResponse messages
     include fields that inform the frontend of the number of columns
     per row and the format codes being used for each column.  (As of
-    the present implementation, all columns in a given <command>COPY</>
+    the present implementation, all columns in a given <command>COPY</command>
     operation will use the same format, but the message design does not
     assume this.)
    </para>
@@ -1107,7 +1251,7 @@
    <para>
     It is possible for NoticeResponse messages to be generated due to
     outside activity; for example, if the database administrator commands
-    a <quote>fast</> database shutdown, the backend will send a NoticeResponse
+    a <quote>fast</quote> database shutdown, the backend will send a NoticeResponse
     indicating this fact before closing the connection.  Accordingly,
     frontends should always be prepared to accept and display NoticeResponse
     messages, even when the connection is nominally idle.
@@ -1117,7 +1261,7 @@
     ParameterStatus messages will be generated whenever the active
     value changes for any of the parameters the backend believes the
     frontend should know about.  Most commonly this occurs in response
-    to a <command>SET</> SQL command executed by the frontend, and
+    to a <command>SET</command> SQL command executed by the frontend, and
     this case is effectively synchronous &mdash; but it is also possible
     for parameter status changes to occur because the administrator
     changed a configuration file and then sent the
@@ -1130,27 +1274,27 @@
    <para>
     At present there is a hard-wired set of parameters for which
     ParameterStatus will be generated: they are
-    <varname>server_version</>,
-    <varname>server_encoding</>,
-    <varname>client_encoding</>,
-    <varname>application_name</>,
-    <varname>is_superuser</>,
-    <varname>session_authorization</>,
-    <varname>DateStyle</>,
-    <varname>IntervalStyle</>,
-    <varname>TimeZone</>,
-    <varname>integer_datetimes</>, and
-    <varname>standard_conforming_strings</>.
-    (<varname>server_encoding</>, <varname>TimeZone</>, and
-    <varname>integer_datetimes</> were not reported by releases before 8.0;
-    <varname>standard_conforming_strings</> was not reported by releases
+    <varname>server_version</varname>,
+    <varname>server_encoding</varname>,
+    <varname>client_encoding</varname>,
+    <varname>application_name</varname>,
+    <varname>is_superuser</varname>,
+    <varname>session_authorization</varname>,
+    <varname>DateStyle</varname>,
+    <varname>IntervalStyle</varname>,
+    <varname>TimeZone</varname>,
+    <varname>integer_datetimes</varname>, and
+    <varname>standard_conforming_strings</varname>.
+    (<varname>server_encoding</varname>, <varname>TimeZone</varname>, and
+    <varname>integer_datetimes</varname> were not reported by releases before 8.0;
+    <varname>standard_conforming_strings</varname> was not reported by releases
     before 8.1;
-    <varname>IntervalStyle</> was not reported by releases before 8.4;
-    <varname>application_name</> was not reported by releases before 9.0.)
+    <varname>IntervalStyle</varname> was not reported by releases before 8.4;
+    <varname>application_name</varname> was not reported by releases before 9.0.)
     Note that
-    <varname>server_version</>,
-    <varname>server_encoding</> and
-    <varname>integer_datetimes</>
+    <varname>server_version</varname>,
+    <varname>server_encoding</varname> and
+    <varname>integer_datetimes</varname>
     are pseudo-parameters that cannot change after startup.
     This set might change in the future, or even become configurable.
     Accordingly, a frontend should simply ignore ParameterStatus for
@@ -1275,7 +1419,7 @@
     frontend disconnects while a non-<command>SELECT</command> query
     is being processed, the backend will probably finish the query
     before noticing the disconnection.  If the query is outside any
-    transaction block (<command>BEGIN</> ... <command>COMMIT</>
+    transaction block (<command>BEGIN</command> ... <command>COMMIT</command>
     sequence) then its results might be committed before the
     disconnection is recognized.
    </para>
@@ -1285,30 +1429,30 @@
    <title><acronym>SSL</acronym> Session Encryption</title>
 
    <para>
-    If <productname>PostgreSQL</> was built with
+    If <productname>PostgreSQL</productname> was built with
     <acronym>SSL</acronym> support, frontend/backend communications
     can be encrypted using <acronym>SSL</acronym>.  This provides
     communication security in environments where attackers might be
     able to capture the session traffic. For more information on
     encrypting <productname>PostgreSQL</productname> sessions with
-    <acronym>SSL</acronym>, see <xref linkend="ssl-tcp">.
+    <acronym>SSL</acronym>, see <xref linkend="ssl-tcp"/>.
    </para>
 
    <para>
     To initiate an <acronym>SSL</acronym>-encrypted connection, the
     frontend initially sends an SSLRequest message rather than a
     StartupMessage.  The server then responds with a single byte
-    containing <literal>S</> or <literal>N</>, indicating that it is
+    containing <literal>S</literal> or <literal>N</literal>, indicating that it is
     willing or unwilling to perform <acronym>SSL</acronym>,
     respectively.  The frontend might close the connection at this point
     if it is dissatisfied with the response.  To continue after
-    <literal>S</>, perform an <acronym>SSL</acronym> startup handshake
+    <literal>S</literal>, perform an <acronym>SSL</acronym> startup handshake
     (not described here, part of the <acronym>SSL</acronym>
     specification) with the server.  If this is successful, continue
     with sending the usual StartupMessage.  In this case the
     StartupMessage and all subsequent data will be
     <acronym>SSL</acronym>-encrypted.  To continue after
-    <literal>N</>, send the usual StartupMessage and proceed without
+    <literal>N</literal>, send the usual StartupMessage and proceed without
     encryption.
    </para>
 
@@ -1316,7 +1460,7 @@
     The frontend should also be prepared to handle an ErrorMessage
     response to SSLRequest from the server.  This would only occur if
     the server predates the addition of <acronym>SSL</acronym> support
-    to <productname>PostgreSQL</>.  (Such servers are now very ancient,
+    to <productname>PostgreSQL</productname>.  (Such servers are now very ancient,
     and likely do not exist in the wild anymore.)
     In this case the connection must
     be closed, but the frontend might choose to open a fresh connection
@@ -1341,11 +1485,12 @@
 <title>SASL Authentication</title>
 
 <para>
-<firstterm>SASL</> is a framework for authentication in connection-oriented
-protocols. At the moment, <productname>PostgreSQL</> implements only one SASL
-authentication mechanism, SCRAM-SHA-256, but more might be added in the
-future. The below steps illustrate how SASL authentication is performed in
-general, while the next subsection gives more details on SCRAM-SHA-256.
+<firstterm>SASL</firstterm> is a framework for authentication in connection-oriented
+protocols. At the moment, <productname>PostgreSQL</productname> implements two SASL
+authentication mechanisms, SCRAM-SHA-256 and SCRAM-SHA-256-PLUS. More
+might be added in the future. The below steps illustrate how SASL
+authentication is performed in general, while the next subsection gives
+more details on SCRAM-SHA-256 and SCRAM-SHA-256-PLUS.
 </para>
 
 <procedure>
@@ -1395,30 +1540,29 @@ On error, the server can abort the authentication at any stage, and send an
 ErrorMessage.
 </para>
 
- <sect2 id="sasl-scram-sha256">
+ <sect2 id="sasl-scram-sha-256">
   <title>SCRAM-SHA-256 authentication</title>
 
   <para>
-    <firstterm>SCRAM-SHA-256</> (called just <firstterm>SCRAM</> from now on) is
-    the only implemented SASL mechanism, at the moment. It is described in detail
-    in RFC 7677 and RFC 5802.
+   The implemented SASL mechanisms at the moment
+   are <literal>SCRAM-SHA-256</literal> and its variant with channel
+   binding <literal>SCRAM-SHA-256-PLUS</literal>. They are described in
+   detail in RFC 7677 and RFC 5802.
   </para>
 
   <para>
-When SCRAM-SHA-256 is used in PostgreSQL, the server will ignore the username
-that the client sends in the <structname>client-first-message</>. The username
+When SCRAM-SHA-256 is used in PostgreSQL, the server will ignore the user name
+that the client sends in the <structname>client-first-message</structname>. The user name
 that was already sent in the startup message is used instead.
-<productname>PostgreSQL</> supports multiple character encodings, while SCRAM
-dictates UTF-8 to be used for the username, so it might be impossible to
-represent the PostgreSQL username in UTF-8. To avoid confusion, the client
-should use <literal>pg_same_as_startup_message</literal> as the username in the
-<structname>client-first-message</>.
+<productname>PostgreSQL</productname> supports multiple character encodings, while SCRAM
+dictates UTF-8 to be used for the user name, so it might be impossible to
+represent the PostgreSQL user name in UTF-8.
   </para>
 
   <para>
 The SCRAM specification dictates that the password is also in UTF-8, and is
-processed with the <firstterm>SASLprep</> algorithm.
-<productname>PostgreSQL</>, however, does not require UTF-8 to be used for
+processed with the <firstterm>SASLprep</firstterm> algorithm.
+<productname>PostgreSQL</productname>, however, does not require UTF-8 to be used for
 the password. When a user's password is set, it is processed with SASLprep
 as if it was in UTF-8, regardless of the actual encoding used. However, if
 it is not a legal UTF-8 byte sequence, or it contains UTF-8 byte sequences
@@ -1430,7 +1574,14 @@ the password is in.
   </para>
 
   <para>
-<firstterm>Channel binding</> has not been implemented yet.
+<firstterm>Channel binding</firstterm> is supported in PostgreSQL builds with
+SSL support. The SASL mechanism name for SCRAM with channel binding is
+<literal>SCRAM-SHA-256-PLUS</literal>.  Two channel binding types are
+supported: <literal>tls-unique</literal> and
+<literal>tls-server-end-point</literal>, both defined in RFC 5929.  Clients
+should use <literal>tls-unique</literal> if they can support it.
+<literal>tls-server-end-point</literal> is intended for third-party clients
+that cannot support <literal>tls-unique</literal> for some reason.
   </para>
 
 <procedure>
@@ -1439,32 +1590,39 @@ the password is in.
 <para>
   The server sends an AuthenticationSASL message. It includes a list of
   SASL authentication mechanisms that the server can accept.
+  This will be <literal>SCRAM-SHA-256-PLUS</literal>
+  and <literal>SCRAM-SHA-256</literal> if the server is built with SSL
+  support, or else just the latter.
 </para>
 </step>
 <step id="scram-client-first">
 <para>
   The client responds by sending a SASLInitialResponse message, which
-  indicates the chosen mechanism, <literal>SCRAM-SHA-256</>. In the Initial
-  Client response field, the message contains the SCRAM
-  <structname>client-first-message</>.
+  indicates the chosen mechanism, <literal>SCRAM-SHA-256</literal> or
+  <literal>SCRAM-SHA-256-PLUS</literal>. (A client is free to choose either
+  mechanism, but for better security it should choose the channel-binding
+  variant if it can support it.) In the Initial Client response field, the
+  message contains the SCRAM <structname>client-first-message</structname>.
+  The <structname>client-first-message</structname> also contains the channel
+  binding type chosen by the client.
 </para>
 </step>
 <step id="scram-server-first">
 <para>
   Server sends an AuthenticationSASLContinue message, with a SCRAM
-  <structname>server-first message</> as the content.
+  <structname>server-first message</structname> as the content.
 </para>
 </step>
 <step id="scram-client-final">
 <para>
   Client sends a SASLResponse message, with SCRAM
-  <structname>client-final-message</> as the content.
+  <structname>client-final-message</structname> as the content.
 </para>
 </step>
 <step id="scram-server-final">
 <para>
   Server sends an AuthenticationSASLFinal message, with the SCRAM
-  <structname>server-final-message</>, followed immediately by
+  <structname>server-final-message</structname>, followed immediately by
   an AuthenticationOk message.
 </para>
 </step>
@@ -1477,14 +1635,14 @@ the password is in.
 
 <para>
 To initiate streaming replication, the frontend sends the
-<literal>replication</> parameter in the startup message. A Boolean value
-of <literal>true</> tells the backend to go into walsender mode, wherein a
+<literal>replication</literal> parameter in the startup message. A Boolean value
+of <literal>true</literal> tells the backend to go into walsender mode, wherein a
 small set of replication commands can be issued instead of SQL statements. Only
 the simple query protocol can be used in walsender mode.
 Replication commands are logged in the server log when
-<xref linkend="guc-log-replication-commands"> is enabled.
-Passing <literal>database</> as the value instructs walsender to connect to
-the database specified in the <literal>dbname</> parameter, which will allow
+<xref linkend="guc-log-replication-commands"/> is enabled.
+Passing <literal>database</literal> as the value instructs walsender to connect to
+the database specified in the <literal>dbname</literal> parameter, which will allow
 the connection to be used for logical replication from that database.
 </para>
 <para>
@@ -1496,8 +1654,8 @@ the connection to be used for logical replication from that database.
 psql "dbname=postgres replication=database" -c "IDENTIFY_SYSTEM;"
 </programlisting>
  However, it is often more useful to use
- <xref linkend="app-pgreceivewal"> (for physical replication) or
- <xref linkend="app-pgrecvlogical"> (for logical replication).
+ <xref linkend="app-pgreceivewal"/> (for physical replication) or
+ <xref linkend="app-pgrecvlogical"/> (for logical replication).
 </para>
 
 <para>
@@ -1575,16 +1733,16 @@ The commands accepted in walsender mode are:
     <listitem>
      <para>
       Requests the server to send the current setting of a run-time parameter.
-      This is similar to the SQL command <xref linkend="sql-show">.
+      This is similar to the SQL command <xref linkend="sql-show"/>.
      </para>
 
      <variablelist>
       <varlistentry>
-       <term><replaceable class="parameter">name</></term>
+       <term><replaceable class="parameter">name</replaceable></term>
        <listitem>
          <para>
           The name of a run-time parameter. Available parameters are documented
-          in <xref linkend="runtime-config">.
+          in <xref linkend="runtime-config"/>.
          </para>
        </listitem>
       </varlistentry>
@@ -1611,7 +1769,7 @@ The commands accepted in walsender mode are:
       </term>
       <listitem>
       <para>
-       File name of the timeline history file, e.g., <filename>00000002.history</>.
+       File name of the timeline history file, e.g., <filename>00000002.history</filename>.
       </para>
       </listitem>
       </varlistentry>
@@ -1633,38 +1791,38 @@ The commands accepted in walsender mode are:
   </varlistentry>
 
   <varlistentry id="protocol-replication-create-slot" xreflabel="CREATE_REPLICATION_SLOT">
-   <term><literal>CREATE_REPLICATION_SLOT</literal> <replaceable class="parameter">slot_name</> [ <literal>TEMPORARY</> ] { <literal>PHYSICAL</> [ <literal>RESERVE_WAL</> ] | <literal>LOGICAL</> <replaceable class="parameter">output_plugin</> [ <literal>EXPORT_SNAPSHOT</> | <literal>NOEXPORT_SNAPSHOT</> | <literal>USE_SNAPSHOT</> ] }
+   <term><literal>CREATE_REPLICATION_SLOT</literal> <replaceable class="parameter">slot_name</replaceable> [ <literal>TEMPORARY</literal> ] { <literal>PHYSICAL</literal> [ <literal>RESERVE_WAL</literal> ] | <literal>LOGICAL</literal> <replaceable class="parameter">output_plugin</replaceable> [ <literal>EXPORT_SNAPSHOT</literal> | <literal>NOEXPORT_SNAPSHOT</literal> | <literal>USE_SNAPSHOT</literal> ] }
      <indexterm><primary>CREATE_REPLICATION_SLOT</primary></indexterm>
     </term>
     <listitem>
      <para>
       Create a physical or logical replication
-      slot. See <xref linkend="streaming-replication-slots"> for more about
+      slot. See <xref linkend="streaming-replication-slots"/> for more about
       replication slots.
      </para>
      <variablelist>
       <varlistentry>
-       <term><replaceable class="parameter">slot_name</></term>
+       <term><replaceable class="parameter">slot_name</replaceable></term>
        <listitem>
          <para>
           The name of the slot to create. Must be a valid replication slot
-          name (see <xref linkend="streaming-replication-slots-manipulation">).
+          name (see <xref linkend="streaming-replication-slots-manipulation"/>).
          </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><replaceable class="parameter">output_plugin</></term>
+       <term><replaceable class="parameter">output_plugin</replaceable></term>
        <listitem>
          <para>
           The name of the output plugin used for logical decoding
-          (see <xref linkend="logicaldecoding-output-plugin">).
+          (see <xref linkend="logicaldecoding-output-plugin"/>).
          </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><literal>TEMPORARY</></term>
+       <term><literal>TEMPORARY</literal></term>
        <listitem>
         <para>
          Specify that this replication slot is a temporary one. Temporary
@@ -1675,30 +1833,30 @@ The commands accepted in walsender mode are:
       </varlistentry>
 
       <varlistentry>
-       <term><literal>RESERVE_WAL</></term>
+       <term><literal>RESERVE_WAL</literal></term>
        <listitem>
         <para>
-         Specify that this physical replication slot reserves <acronym>WAL</>
-         immediately.  Otherwise, <acronym>WAL</> is only reserved upon
+         Specify that this physical replication slot reserves <acronym>WAL</acronym>
+         immediately.  Otherwise, <acronym>WAL</acronym> is only reserved upon
          connection from a streaming replication client.
         </para>
        </listitem>
       </varlistentry>
 
       <varlistentry>
-       <term><literal>EXPORT_SNAPSHOT</></term>
-       <term><literal>NOEXPORT_SNAPSHOT</></term>
-       <term><literal>USE_SNAPSHOT</></term>
+       <term><literal>EXPORT_SNAPSHOT</literal></term>
+       <term><literal>NOEXPORT_SNAPSHOT</literal></term>
+       <term><literal>USE_SNAPSHOT</literal></term>
        <listitem>
         <para>
          Decides what to do with the snapshot created during logical slot
-         initialization. <literal>EXPORT_SNAPSHOT</>, which is the default,
+         initialization. <literal>EXPORT_SNAPSHOT</literal>, which is the default,
          will export the snapshot for use in other sessions. This option can't
-         be used inside a transaction.  <literal>USE_SNAPSHOT</> will use the
+         be used inside a transaction.  <literal>USE_SNAPSHOT</literal> will use the
          snapshot for the current transaction executing the command. This
          option must be used in a transaction, and
          <literal>CREATE_REPLICATION_SLOT</literal> must be the first command
-         run in that transaction.  Finally, <literal>NOEXPORT_SNAPSHOT</> will
+         run in that transaction.  Finally, <literal>NOEXPORT_SNAPSHOT</literal> will
          just use the snapshot for logical decoding as normal but won't do
          anything else with it.
         </para>
@@ -1758,15 +1916,15 @@ The commands accepted in walsender mode are:
   </varlistentry>
 
   <varlistentry>
-    <term><literal>START_REPLICATION</literal> [ <literal>SLOT</literal> <replaceable class="parameter">slot_name</> ] [ <literal>PHYSICAL</literal> ] <replaceable class="parameter">XXX/XXX</> [ <literal>TIMELINE</literal> <replaceable class="parameter">tli</> ]
+    <term><literal>START_REPLICATION</literal> [ <literal>SLOT</literal> <replaceable class="parameter">slot_name</replaceable> ] [ <literal>PHYSICAL</literal> ] <replaceable class="parameter">XXX/XXX</replaceable> [ <literal>TIMELINE</literal> <replaceable class="parameter">tli</replaceable> ]
      <indexterm><primary>START_REPLICATION</primary></indexterm>
     </term>
     <listitem>
      <para>
       Instructs server to start streaming WAL, starting at
-      WAL location <replaceable class="parameter">XXX/XXX</>.
+      WAL location <replaceable class="parameter">XXX/XXX</replaceable>.
       If <literal>TIMELINE</literal> option is specified,
-      streaming starts on timeline <replaceable class="parameter">tli</>;
+      streaming starts on timeline <replaceable class="parameter">tli</replaceable>;
       otherwise, the server's current timeline is selected. The server can
       reply with an error, for example if the requested section of WAL has already
       been recycled. On success, server responds with a CopyBothResponse
@@ -1775,9 +1933,9 @@ The commands accepted in walsender mode are:
 
      <para>
       If a slot's name is provided
-      via <replaceable class="parameter">slot_name</>, it will be updated
+      via <replaceable class="parameter">slot_name</replaceable>, it will be updated
       as replication progresses so that the server knows which WAL segments,
-      and if <varname>hot_standby_feedback</> is on which transactions,
+      and if <varname>hot_standby_feedback</varname> is on which transactions,
       are still needed by the standby.
      </para>
 
@@ -2111,11 +2269,11 @@ The commands accepted in walsender mode are:
     </listitem>
   </varlistentry>
   <varlistentry>
-    <term><literal>START_REPLICATION</literal> <literal>SLOT</literal> <replaceable class="parameter">slot_name</> <literal>LOGICAL</literal> <replaceable class="parameter">XXX/XXX</> [ ( <replaceable>option_name</replaceable> [ <replaceable>option_value</replaceable> ] [, ...] ) ]</term>
+    <term><literal>START_REPLICATION</literal> <literal>SLOT</literal> <replaceable class="parameter">slot_name</replaceable> <literal>LOGICAL</literal> <replaceable class="parameter">XXX/XXX</replaceable> [ ( <replaceable>option_name</replaceable> [ <replaceable>option_value</replaceable> ] [, ...] ) ]</term>
     <listitem>
      <para>
       Instructs server to start streaming WAL for logical replication, starting
-      at WAL location <replaceable class="parameter">XXX/XXX</>. The server can
+      at WAL location <replaceable class="parameter">XXX/XXX</replaceable>. The server can
       reply with an error, for example if the requested section of WAL has already
       been recycled. On success, server responds with a CopyBothResponse
       message, and then starts to stream WAL to the frontend.
@@ -2133,7 +2291,7 @@ The commands accepted in walsender mode are:
 
      <variablelist>
       <varlistentry>
-       <term><literal>SLOT</literal> <replaceable class="parameter">slot_name</></term>
+       <term><literal>SLOT</literal> <replaceable class="parameter">slot_name</replaceable></term>
        <listitem>
          <para>
           The name of the slot to stream changes from. This parameter is required,
@@ -2144,7 +2302,7 @@ The commands accepted in walsender mode are:
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><replaceable class="parameter">XXX/XXX</></term>
+       <term><replaceable class="parameter">XXX/XXX</replaceable></term>
        <listitem>
         <para>
          The WAL location to begin streaming at.
@@ -2152,7 +2310,7 @@ The commands accepted in walsender mode are:
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><replaceable class="parameter">option_name</></term>
+       <term><replaceable class="parameter">option_name</replaceable></term>
        <listitem>
         <para>
          The name of an option passed to the slot's logical decoding plugin.
@@ -2160,7 +2318,7 @@ The commands accepted in walsender mode are:
        </listitem>
       </varlistentry>
       <varlistentry>
-       <term><replaceable class="parameter">option_value</></term>
+       <term><replaceable class="parameter">option_value</replaceable></term>
        <listitem>
         <para>
          Optional value, in the form of a string constant, associated with the
@@ -2173,25 +2331,36 @@ The commands accepted in walsender mode are:
   </varlistentry>
 
   <varlistentry>
-    <term><literal>DROP_REPLICATION_SLOT</literal> <replaceable class="parameter">slot_name</>
+    <term>
+     <literal>DROP_REPLICATION_SLOT</literal> <replaceable class="parameter">slot_name</replaceable> <optional> <literal>WAIT</literal> </optional>
      <indexterm><primary>DROP_REPLICATION_SLOT</primary></indexterm>
     </term>
     <listitem>
      <para>
-      Drops a replication slot, freeing any reserved server-side resources. If
-      the slot is currently in use by an active connection, this command fails.
+      Drops a replication slot, freeing any reserved server-side resources.
       If the slot is a logical slot that was created in a database other than
       the database the walsender is connected to, this command fails.
      </para>
      <variablelist>
       <varlistentry>
-       <term><replaceable class="parameter">slot_name</></term>
+       <term><replaceable class="parameter">slot_name</replaceable></term>
        <listitem>
          <para>
           The name of the slot to drop.
          </para>
        </listitem>
       </varlistentry>
+
+      <varlistentry>
+       <term><literal>WAIT</literal></term>
+       <listitem>
+        <para>
+         This option causes the command to wait if the slot is active until
+         it becomes inactive, instead of the default behavior of raising an
+         error.
+        </para>
+       </listitem>
+      </varlistentry>
      </variablelist>
     </listitem>
   </varlistentry>
@@ -2214,13 +2383,13 @@ The commands accepted in walsender mode are:
           Sets the label of the backup. If none is specified, a backup label
           of <literal>base backup</literal> will be used. The quoting rules
           for the label are the same as a standard SQL string with
-          <xref linkend="guc-standard-conforming-strings"> turned on.
+          <xref linkend="guc-standard-conforming-strings"/> turned on.
          </para>
         </listitem>
        </varlistentry>
 
        <varlistentry>
-        <term><literal>PROGRESS</></term>
+        <term><literal>PROGRESS</literal></term>
         <listitem>
          <para>
           Request information required to generate a progress report. This will
@@ -2237,7 +2406,7 @@ The commands accepted in walsender mode are:
        </varlistentry>
 
        <varlistentry>
-        <term><literal>FAST</></term>
+        <term><literal>FAST</literal></term>
         <listitem>
          <para>
           Request a fast checkpoint.
@@ -2271,7 +2440,7 @@ The commands accepted in walsender mode are:
        </varlistentry>
 
        <varlistentry>
-        <term><literal>MAX_RATE</literal> <replaceable>rate</></term>
+        <term><literal>MAX_RATE</literal> <replaceable>rate</replaceable></term>
         <listitem>
          <para>
           Limit (throttle) the maximum amount of data transferred from server
@@ -2292,7 +2461,7 @@ The commands accepted in walsender mode are:
           <filename>pg_tblspc</filename> in a file named
           <filename>tablespace_map</filename>. The tablespace map file includes
           each symbolic link name as it exists in the directory
-          <filename>pg_tblspc/</> and the full path of that symbolic link.
+          <filename>pg_tblspc/</filename> and the full path of that symbolic link.
          </para>
         </listitem>
        </varlistentry>
@@ -2345,9 +2514,9 @@ The commands accepted in walsender mode are:
      <para>
       After the second regular result set, one or more CopyResponse results
       will be sent, one for the main data directory and one for each additional tablespace other
-      than <literal>pg_default</> and <literal>pg_global</>. The data in
+      than <literal>pg_default</literal> and <literal>pg_global</literal>. The data in
       the CopyResponse results will be a tar format (following the
-      <quote>ustar interchange format</> specified in the POSIX 1003.1-2008
+      <quote>ustar interchange format</quote> specified in the POSIX 1003.1-2008
       standard) dump of the tablespace contents, except that the two trailing
       blocks of zeroes specified in the standard are omitted.
       After the tar data is complete, a final ordinary result set will be sent,
@@ -2358,29 +2527,34 @@ The commands accepted in walsender mode are:
      <para>
       The tar archive for the data directory and each tablespace will contain
       all files in the directories, regardless of whether they are
-      <productname>PostgreSQL</> files or other files added to the same
+      <productname>PostgreSQL</productname> files or other files added to the same
       directory. The only excluded files are:
       <itemizedlist spacing="compact" mark="bullet">
        <listitem>
         <para>
-         <filename>postmaster.pid</>
+         <filename>postmaster.pid</filename>
         </para>
        </listitem>
        <listitem>
         <para>
-         <filename>postmaster.opts</>
+         <filename>postmaster.opts</filename>
+        </para>
+       </listitem>
+       <listitem>
+        <para>
+         <filename>pg_internal.init</filename> (found in multiple directories)
         </para>
        </listitem>
        <listitem>
         <para>
          Various temporary files and directories created during the operation
          of the PostgreSQL server, such as any file or directory beginning
-         with <filename>pgsql_tmp</>.
+         with <filename>pgsql_tmp</filename>.
         </para>
        </listitem>
        <listitem>
         <para>
-         <filename>pg_wal</>, including subdirectories. If the backup is run
+         <filename>pg_wal</filename>, including subdirectories. If the backup is run
          with WAL files included, a synthesized version of <filename>pg_wal</filename> will be
          included, but it will only contain the files necessary for the
          backup to work, not the rest of the contents.
@@ -2388,10 +2562,10 @@ The commands accepted in walsender mode are:
        </listitem>
        <listitem>
         <para>
-         <filename>pg_dynshmem</>, <filename>pg_notify</>,
-         <filename>pg_replslot</>, <filename>pg_serial</>,
-         <filename>pg_snapshots</>, <filename>pg_stat_tmp</>, and
-         <filename>pg_subtrans</> are copied as empty directories (even if
+         <filename>pg_dynshmem</filename>, <filename>pg_notify</filename>,
+         <filename>pg_replslot</filename>, <filename>pg_serial</filename>,
+         <filename>pg_snapshots</filename>, <filename>pg_stat_tmp</filename>, and
+         <filename>pg_subtrans</filename> are copied as empty directories (even if
          they are symbolic links).
         </para>
        </listitem>
@@ -2421,7 +2595,7 @@ The commands accepted in walsender mode are:
  <para>
   This section describes the logical replication protocol, which is the message
   flow started by the <literal>START_REPLICATION</literal>
-  <literal>SLOT</literal> <replaceable class="parameter">slot_name</>
+  <literal>SLOT</literal> <replaceable class="parameter">slot_name</replaceable>
   <literal>LOGICAL</literal> replication command.
  </para>
 
@@ -2473,7 +2647,7 @@ The commands accepted in walsender mode are:
   <para>
    The individual protocol messages are discussed in the following
    subsections. Individual messages are described in
-   <xref linkend="protocol-logicalrep-message-formats">.
+   <xref linkend="protocol-logicalrep-message-formats"/>.
   </para>
 
   <para>
@@ -3291,7 +3465,7 @@ Bind (F)
 <listitem>
 <para>
                 The number of parameter format codes that follow
-                (denoted <replaceable>C</> below).
+                (denoted <replaceable>C</replaceable> below).
                 This can be zero to indicate that there are no parameters
                 or that the parameters all use the default format (text);
                 or one, in which case the specified format code is applied
@@ -3302,7 +3476,7 @@ Bind (F)
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>C</>]
+        Int16[<replaceable>C</replaceable>]
 </term>
 <listitem>
 <para>
@@ -3360,7 +3534,7 @@ Bind (F)
 <listitem>
 <para>
                 The number of result-column format codes that follow
-                (denoted <replaceable>R</> below).
+                (denoted <replaceable>R</replaceable> below).
                 This can be zero to indicate that there are no result columns
                 or that the result columns should all use the default format
                 (text);
@@ -3372,7 +3546,7 @@ Bind (F)
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>R</>]
+        Int16[<replaceable>R</replaceable>]
 </term>
 <listitem>
 <para>
@@ -3447,7 +3621,7 @@ CancelRequest (F)
 <listitem>
 <para>
                 The cancel request code.  The value is chosen to contain
-                <literal>1234</> in the most significant 16 bits, and <literal>5678</> in the
+                <literal>1234</literal> in the most significant 16 bits, and <literal>5678</literal> in the
                 least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)
 </para>
@@ -3514,8 +3688,8 @@ Close (F)
 </term>
 <listitem>
 <para>
-                '<literal>S</>' to close a prepared statement; or
-                '<literal>P</>' to close a portal.
+                '<literal>S</literal>' to close a prepared statement; or
+                '<literal>P</literal>' to close a portal.
 </para>
 </listitem>
 </varlistentry>
@@ -3837,7 +4011,7 @@ CopyInResponse (B)
                 characters, etc).
                 1 indicates the overall copy format is binary (similar
                 to DataRow format).
-                See <xref linkend="sql-copy">
+                See <xref linkend="sql-copy"/>
                 for more information.
 </para>
 </listitem>
@@ -3849,13 +4023,13 @@ CopyInResponse (B)
 <listitem>
 <para>
                 The number of columns in the data to be copied
-                (denoted <replaceable>N</> below).
+                (denoted <replaceable>N</replaceable> below).
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>N</>]
+        Int16[<replaceable>N</replaceable>]
 </term>
 <listitem>
 <para>
@@ -3911,7 +4085,7 @@ CopyOutResponse (B)
                 is textual (rows separated by newlines, columns
                 separated by separator characters, etc). 1 indicates
                 the overall copy format is binary (similar to DataRow
-                format). See <xref linkend="sql-copy"> for more information.
+                format). See <xref linkend="sql-copy"/> for more information.
 </para>
 </listitem>
 </varlistentry>
@@ -3922,13 +4096,13 @@ CopyOutResponse (B)
 <listitem>
 <para>
                 The number of columns in the data to be copied
-                (denoted <replaceable>N</> below).
+                (denoted <replaceable>N</replaceable> below).
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>N</>]
+        Int16[<replaceable>N</replaceable>]
 </term>
 <listitem>
 <para>
@@ -3984,7 +4158,7 @@ CopyBothResponse (B)
                 is textual (rows separated by newlines, columns
                 separated by separator characters, etc). 1 indicates
                 the overall copy format is binary (similar to DataRow
-                format). See <xref linkend="sql-copy"> for more information.
+                format). See <xref linkend="sql-copy"/> for more information.
 </para>
 </listitem>
 </varlistentry>
@@ -3995,13 +4169,13 @@ CopyBothResponse (B)
 <listitem>
 <para>
                 The number of columns in the data to be copied
-                (denoted <replaceable>N</> below).
+                (denoted <replaceable>N</replaceable> below).
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>N</>]
+        Int16[<replaceable>N</replaceable>]
 </term>
 <listitem>
 <para>
@@ -4124,8 +4298,8 @@ Describe (F)
 </term>
 <listitem>
 <para>
-                '<literal>S</>' to describe a prepared statement; or
-                '<literal>P</>' to describe a portal.
+                '<literal>S</literal>' to describe a prepared statement; or
+                '<literal>P</literal>' to describe a portal.
 </para>
 </listitem>
 </varlistentry>
@@ -4225,7 +4399,7 @@ ErrorResponse (B)
                 A code identifying the field type; if zero, this is
                 the message terminator and no string follows.
                 The presently defined field types are listed in
-                <xref linkend="protocol-error-fields">.
+                <xref linkend="protocol-error-fields"/>.
                 Since more field types might be added in future,
                 frontends should silently ignore fields of unrecognized
                 type.
@@ -4296,7 +4470,7 @@ Execute (F)
 <para>
                 Maximum number of rows to return, if portal contains
                 a query that returns rows (ignored otherwise).  Zero
-                denotes <quote>no limit</>.
+                denotes <quote>no limit</quote>.
 </para>
 </listitem>
 </varlistentry>
@@ -4386,7 +4560,7 @@ FunctionCall (F)
 <listitem>
 <para>
                 The number of argument format codes that follow
-                (denoted <replaceable>C</> below).
+                (denoted <replaceable>C</replaceable> below).
                 This can be zero to indicate that there are no arguments
                 or that the arguments all use the default format (text);
                 or one, in which case the specified format code is applied
@@ -4397,7 +4571,7 @@ FunctionCall (F)
 </varlistentry>
 <varlistentry>
 <term>
-        Int16[<replaceable>C</>]
+        Int16[<replaceable>C</replaceable>]
 </term>
 <listitem>
 <para>
@@ -4571,6 +4745,74 @@ GSSResponse (F)
 </listitem>
 </varlistentry>
 
+<varlistentry>
+<term>
+NegotiateProtocolVersion (B)
+</term>
+<listitem>
+<para>
+
+<variablelist>
+<varlistentry>
+<term>
+        Byte1('v')
+</term>
+<listitem>
+<para>
+                Identifies the message as a protocol version negotiation
+                message.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+        Int32
+</term>
+<listitem>
+<para>
+                Length of message contents in bytes, including self.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+        Int32
+</term>
+<listitem>
+<para>
+                Newest minor protocol version supported by the server
+                for the major protocol version requested by the client.
+</para>
+</listitem>
+</varlistentry>
+<varlistentry>
+<term>
+        Int32
+</term>
+<listitem>
+<para>
+                Number of protocol options not recognized by the server.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+        Then, for protocol option not recognized by the server, there
+        is the following:
+<variablelist>
+<varlistentry>
+<term>
+        String
+</term>
+<listitem>
+<para>
+                The option name.
+</para>
+</listitem>
+</varlistentry>
+</variablelist>
+</para>
+</listitem>
+</varlistentry>
 
 <varlistentry>
 <term>
@@ -4649,7 +4891,7 @@ NoticeResponse (B)
                 A code identifying the field type; if zero, this is
                 the message terminator and no string follows.
                 The presently defined field types are listed in
-                <xref linkend="protocol-error-fields">.
+                <xref linkend="protocol-error-fields"/>.
                 Since more field types might be added in future,
                 frontends should silently ignore fields of unrecognized
                 type.
@@ -4727,7 +4969,7 @@ NotificationResponse (B)
 </term>
 <listitem>
 <para>
-                The <quote>payload</> string passed from the notifying process.
+                The <quote>payload</quote> string passed from the notifying process.
 </para>
 </listitem>
 </varlistentry>
@@ -5133,9 +5375,9 @@ ReadyForQuery (B)
 <listitem>
 <para>
                 Current backend transaction status indicator.
-                Possible values are '<literal>I</>' if idle (not in
-                a transaction block); '<literal>T</>' if in a transaction
-                block; or '<literal>E</>' if in a failed transaction
+                Possible values are '<literal>I</literal>' if idle (not in
+                a transaction block); '<literal>T</literal>' if in a transaction
+                block; or '<literal>E</literal>' if in a failed transaction
                 block (queries will be rejected until block is ended).
 </para>
 </listitem>
@@ -5236,7 +5478,7 @@ RowDescription (B)
 </term>
 <listitem>
 <para>
-                The data type size (see <varname>pg_type.typlen</>).
+                The data type size (see <varname>pg_type.typlen</varname>).
                 Note that negative values denote variable-width types.
 </para>
 </listitem>
@@ -5247,7 +5489,7 @@ RowDescription (B)
 </term>
 <listitem>
 <para>
-                The type modifier (see <varname>pg_attribute.atttypmod</>).
+                The type modifier (see <varname>pg_attribute.atttypmod</varname>).
                 The meaning of the modifier is type-specific.
 </para>
 </listitem>
@@ -5274,7 +5516,7 @@ RowDescription (B)
 
 <varlistentry>
 <term>
-SASLInitialresponse (F)
+SASLInitialResponse (F)
 </term>
 <listitem>
 <para>
@@ -5411,7 +5653,7 @@ SSLRequest (F)
 <listitem>
 <para>
                 The <acronym>SSL</acronym> request code.  The value is chosen to contain
-                <literal>1234</> in the most significant 16 bits, and <literal>5679</> in the
+                <literal>1234</literal> in the most significant 16 bits, and <literal>5679</literal> in the
                 least significant 16 bits.  (To avoid confusion, this code
                 must not be the same as any protocol version number.)
 </para>
@@ -5460,7 +5702,7 @@ StartupMessage (F)
         parameter name and value strings.  A zero byte is required as a
         terminator after the last name/value pair.
         Parameters can appear in any
-        order.  <literal>user</> is required, others are optional.
+        order.  <literal>user</literal> is required, others are optional.
         Each parameter is specified as:
 <variablelist>
 <varlistentry>
@@ -5474,7 +5716,7 @@ StartupMessage (F)
 <variablelist>
 <varlistentry>
 <term>
-                <literal>user</>
+                <literal>user</literal>
 </term>
 <listitem>
 <para>
@@ -5485,7 +5727,7 @@ StartupMessage (F)
 </varlistentry>
 <varlistentry>
 <term>
-                <literal>database</>
+                <literal>database</literal>
 </term>
 <listitem>
 <para>
@@ -5495,7 +5737,7 @@ StartupMessage (F)
 </varlistentry>
 <varlistentry>
 <term>
-                <literal>options</>
+                <literal>options</literal>
 </term>
 <listitem>
 <para>
@@ -5503,34 +5745,36 @@ StartupMessage (F)
                         deprecated in favor of setting individual run-time
                         parameters.)  Spaces within this string are
                         considered to separate arguments, unless escaped with
-                        a backslash (<literal>\</>); write <literal>\\</> to
+                        a backslash (<literal>\</literal>); write <literal>\\</literal> to
                         represent a literal backslash.
 </para>
 </listitem>
 </varlistentry>
 <varlistentry>
 <term>
-                <literal>replication</>
+                <literal>replication</literal>
 </term>
 <listitem>
 <para>
                         Used to connect in streaming replication mode, where
                         a small set of replication commands can be issued
                         instead of SQL statements. Value can be
-                        <literal>true</>, <literal>false</>, or
-                        <literal>database</>, and the default is
-                        <literal>false</>. See
-                        <xref linkend="protocol-replication"> for details.
+                        <literal>true</literal>, <literal>false</literal>, or
+                        <literal>database</literal>, and the default is
+                        <literal>false</literal>. See
+                        <xref linkend="protocol-replication"/> for details.
 </para>
 </listitem>
 </varlistentry>
 </variablelist>
 
-                In addition to the above, any run-time parameter that can be
-                set at backend start time might be listed.  Such settings
-                will be applied during backend start (after parsing the
-                command-line arguments if any).  The values will act as
-                session defaults.
+                In addition to the above, others parameter may be listed.
+                Parameter names beginning with <literal>_pq_.</literal> are
+                reserved for use as protocol extensions, while others are
+                treated as run-time parameters to be set at backend start
+                time.  Such settings will be applied during backend start
+                (after parsing the command-line arguments if any) and will
+                act as session defaults.
 </para>
 </listitem>
 </varlistentry>
@@ -5640,15 +5884,15 @@ message.
 
 <varlistentry>
 <term>
-<literal>S</>
+<literal>S</literal>
 </term>
 <listitem>
 <para>
         Severity: the field contents are
-        <literal>ERROR</>, <literal>FATAL</>, or
-        <literal>PANIC</> (in an error message), or
-        <literal>WARNING</>, <literal>NOTICE</>, <literal>DEBUG</>,
-        <literal>INFO</>, or <literal>LOG</> (in a notice message),
+        <literal>ERROR</literal>, <literal>FATAL</literal>, or
+        <literal>PANIC</literal> (in an error message), or
+        <literal>WARNING</literal>, <literal>NOTICE</literal>, <literal>DEBUG</literal>,
+        <literal>INFO</literal>, or <literal>LOG</literal> (in a notice message),
         or a localized translation of one of these.  Always present.
 </para>
 </listitem>
@@ -5656,18 +5900,18 @@ message.
 
 <varlistentry>
 <term>
-<literal>V</>
+<literal>V</literal>
 </term>
 <listitem>
 <para>
         Severity: the field contents are
-        <literal>ERROR</>, <literal>FATAL</>, or
-        <literal>PANIC</> (in an error message), or
-        <literal>WARNING</>, <literal>NOTICE</>, <literal>DEBUG</>,
-        <literal>INFO</>, or <literal>LOG</> (in a notice message).
-        This is identical to the <literal>S</> field except
+        <literal>ERROR</literal>, <literal>FATAL</literal>, or
+        <literal>PANIC</literal> (in an error message), or
+        <literal>WARNING</literal>, <literal>NOTICE</literal>, <literal>DEBUG</literal>,
+        <literal>INFO</literal>, or <literal>LOG</literal> (in a notice message).
+        This is identical to the <literal>S</literal> field except
         that the contents are never localized.  This is present only in
-        messages generated by <productname>PostgreSQL</> versions 9.6
+        messages generated by <productname>PostgreSQL</productname> versions 9.6
         and later.
 </para>
 </listitem>
@@ -5675,19 +5919,19 @@ message.
 
 <varlistentry>
 <term>
-<literal>C</>
+<literal>C</literal>
 </term>
 <listitem>
 <para>
         Code: the SQLSTATE code for the error (see <xref
-        linkend="errcodes-appendix">).  Not localizable.  Always present.
+        linkend="errcodes-appendix"/>).  Not localizable.  Always present.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<literal>M</>
+<literal>M</literal>
 </term>
 <listitem>
 <para>
@@ -5700,7 +5944,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>D</>
+<literal>D</literal>
 </term>
 <listitem>
 <para>
@@ -5712,7 +5956,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>H</>
+<literal>H</literal>
 </term>
 <listitem>
 <para>
@@ -5726,7 +5970,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>P</>
+<literal>P</literal>
 </term>
 <listitem>
 <para>
@@ -5740,21 +5984,21 @@ message.
 
 <varlistentry>
 <term>
-<literal>p</>
+<literal>p</literal>
 </term>
 <listitem>
 <para>
-        Internal position: this is defined the same as the <literal>P</>
+        Internal position: this is defined the same as the <literal>P</literal>
         field, but it is used when the cursor position refers to an internally
         generated command rather than the one submitted by the client.
-        The <literal>q</> field will always appear when this field appears.
+        The <literal>q</literal> field will always appear when this field appears.
 </para>
 </listitem>
 </varlistentry>
 
 <varlistentry>
 <term>
-<literal>q</>
+<literal>q</literal>
 </term>
 <listitem>
 <para>
@@ -5766,7 +6010,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>W</>
+<literal>W</literal>
 </term>
 <listitem>
 <para>
@@ -5780,7 +6024,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>s</>
+<literal>s</literal>
 </term>
 <listitem>
 <para>
@@ -5792,7 +6036,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>t</>
+<literal>t</literal>
 </term>
 <listitem>
 <para>
@@ -5805,7 +6049,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>c</>
+<literal>c</literal>
 </term>
 <listitem>
 <para>
@@ -5818,7 +6062,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>d</>
+<literal>d</literal>
 </term>
 <listitem>
 <para>
@@ -5831,7 +6075,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>n</>
+<literal>n</literal>
 </term>
 <listitem>
 <para>
@@ -5846,7 +6090,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>F</>
+<literal>F</literal>
 </term>
 <listitem>
 <para>
@@ -5858,7 +6102,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>L</>
+<literal>L</literal>
 </term>
 <listitem>
 <para>
@@ -5870,7 +6114,7 @@ message.
 
 <varlistentry>
 <term>
-<literal>R</>
+<literal>R</literal>
 </term>
 <listitem>
 <para>
@@ -5885,7 +6129,7 @@ message.
  <para>
   The fields for schema name, table name, column name, data type name, and
   constraint name are supplied only for a limited number of error types;
-  see <xref linkend="errcodes-appendix">.  Frontends should not assume that
+  see <xref linkend="errcodes-appendix"/>.  Frontends should not assume that
   the presence of any of these fields guarantees the presence of another
   field.  Core error sources observe the interrelationships noted above, but
   user-defined functions may use these fields in other ways.  In the same
@@ -5910,7 +6154,7 @@ not line breaks.
 This section describes the detailed format of each logical replication message.
 These messages are returned either by the replication slot SQL interface or are
 sent by a walsender. In case of a walsender they are encapsulated inside the replication
-protocol WAL messages as described in <xref linkend="protocol-replication">
+protocol WAL messages as described in <xref linkend="protocol-replication"/>
 and generally obey same message flow as physical replication.
 </para>
 
@@ -6610,8 +6854,8 @@ developers trying to update existing client libraries to protocol 3.0.
 The initial startup packet uses a flexible list-of-strings format
 instead of a fixed format.  Notice that session default values for run-time
 parameters can now be specified directly in the startup packet.  (Actually,
-you could do that before using the <literal>options</> field, but given the
-limited width of <literal>options</> and the lack of any way to quote
+you could do that before using the <literal>options</literal> field, but given the
+limited width of <literal>options</literal> and the lack of any way to quote
 whitespace in the values, it wasn't a very safe technique.)
 </para>
 
@@ -6622,7 +6866,7 @@ PasswordMessage now has a type byte.
 </para>
 
 <para>
-ErrorResponse and NoticeResponse ('<literal>E</>' and '<literal>N</>')
+ErrorResponse and NoticeResponse ('<literal>E</literal>' and '<literal>N</literal>')
 messages now contain multiple fields, from which the client code can
 assemble an error message of the desired level of verbosity.  Note that
 individual fields will typically not end with a newline, whereas the single
@@ -6630,7 +6874,7 @@ string sent in the older protocol always did.
 </para>
 
 <para>
-The ReadyForQuery ('<literal>Z</>') message includes a transaction status
+The ReadyForQuery ('<literal>Z</literal>') message includes a transaction status
 indicator.
 </para>
 
@@ -6643,7 +6887,7 @@ directly tied to the server's internal representation.
 </para>
 
 <para>
-There is a new <quote>extended query</> sub-protocol, which adds the frontend
+There is a new <quote>extended query</quote> sub-protocol, which adds the frontend
 message types Parse, Bind, Execute, Describe, Close, Flush, and Sync, and the
 backend message types ParseComplete, BindComplete, PortalSuspended,
 ParameterDescription, NoData, and CloseComplete.  Existing clients do not
@@ -6654,7 +6898,7 @@ might allow improvements in performance or functionality.
 <para>
 <command>COPY</command> data is now encapsulated into CopyData and CopyDone messages.  There
 is a well-defined way to recover from errors during <command>COPY</command>.  The special
-<quote><literal>\.</></quote> last line is not needed anymore, and is not sent
+<quote><literal>\.</literal></quote> last line is not needed anymore, and is not sent
 during <command>COPY OUT</command>.
 (It is still recognized as a terminator during <command>COPY IN</command>, but its use is
 deprecated and will eventually be removed.)  Binary <command>COPY</command> is supported.
@@ -6672,31 +6916,31 @@ server data representations.
 </para>
 
 <para>
-The backend sends ParameterStatus ('<literal>S</>') messages during connection
+The backend sends ParameterStatus ('<literal>S</literal>') messages during connection
 startup for all parameters it considers interesting to the client library.
 Subsequently, a ParameterStatus message is sent whenever the active value
 changes for any of these parameters.
 </para>
 
 <para>
-The RowDescription ('<literal>T</>') message carries new table OID and column
+The RowDescription ('<literal>T</literal>') message carries new table OID and column
 number fields for each column of the described row.  It also shows the format
 code for each column.
 </para>
 
 <para>
-The CursorResponse ('<literal>P</>') message is no longer generated by
+The CursorResponse ('<literal>P</literal>') message is no longer generated by
 the backend.
 </para>
 
 <para>
-The NotificationResponse ('<literal>A</>') message has an additional string
-field, which can carry a <quote>payload</> string passed
+The NotificationResponse ('<literal>A</literal>') message has an additional string
+field, which can carry a <quote>payload</quote> string passed
 from the <command>NOTIFY</command> event sender.
 </para>
 
 <para>
-The EmptyQueryResponse ('<literal>I</>') message used to include an empty
+The EmptyQueryResponse ('<literal>I</literal>') message used to include an empty
 string parameter; this has been removed.
 </para>
 
diff --git a/doc/src/sgml/queries.sgml b/doc/src/sgml/queries.sgml
index 0588da2912..19a7d2e18b 100644
--- a/doc/src/sgml/queries.sgml
+++ b/doc/src/sgml/queries.sgml
@@ -24,14 +24,14 @@
   <para>
    The process of retrieving or the command to retrieve data from a
    database is called a <firstterm>query</firstterm>.  In SQL the
-   <xref linkend="sql-select"> command is
+   <xref linkend="sql-select"/> command is
    used to specify queries.  The general syntax of the
    <command>SELECT</command> command is
 <synopsis>
 <optional>WITH <replaceable>with_queries</replaceable></optional> SELECT <replaceable>select_list</replaceable> FROM <replaceable>table_expression</replaceable> <optional><replaceable>sort_specification</replaceable></optional>
 </synopsis>
    The following sections describe the details of the select list, the
-   table expression, and the sort specification.  <literal>WITH</>
+   table expression, and the sort specification.  <literal>WITH</literal>
    queries are treated last since they are an advanced feature.
   </para>
 
@@ -51,15 +51,15 @@ SELECT * FROM table1;
   expression happens to provide.  A select list can also select a
   subset of the available columns or make calculations using the
   columns.  For example, if
-  <literal>table1</literal> has columns named <literal>a</>,
-  <literal>b</>, and <literal>c</> (and perhaps others) you can make
+  <literal>table1</literal> has columns named <literal>a</literal>,
+  <literal>b</literal>, and <literal>c</literal> (and perhaps others) you can make
   the following query:
 <programlisting>
 SELECT a, b + c FROM table1;
 </programlisting>
-  (assuming that <literal>b</> and <literal>c</> are of a numerical
+  (assuming that <literal>b</literal> and <literal>c</literal> are of a numerical
   data type).
-  See <xref linkend="queries-select-lists"> for more details.
+  See <xref linkend="queries-select-lists"/> for more details.
  </para>
 
  <para>
@@ -89,19 +89,19 @@ SELECT random();
 
   <para>
    A <firstterm>table expression</firstterm> computes a table.  The
-   table expression contains a <literal>FROM</> clause that is
-   optionally followed by <literal>WHERE</>, <literal>GROUP BY</>, and
-   <literal>HAVING</> clauses.  Trivial table expressions simply refer
+   table expression contains a <literal>FROM</literal> clause that is
+   optionally followed by <literal>WHERE</literal>, <literal>GROUP BY</literal>, and
+   <literal>HAVING</literal> clauses.  Trivial table expressions simply refer
    to a table on disk, a so-called base table, but more complex
    expressions can be used to modify or combine base tables in various
    ways.
   </para>
 
   <para>
-   The optional <literal>WHERE</>, <literal>GROUP BY</>, and
-   <literal>HAVING</> clauses in the table expression specify a
+   The optional <literal>WHERE</literal>, <literal>GROUP BY</literal>, and
+   <literal>HAVING</literal> clauses in the table expression specify a
    pipeline of successive transformations performed on the table
-   derived in the <literal>FROM</> clause.  All these transformations
+   derived in the <literal>FROM</literal> clause.  All these transformations
    produce a virtual table that provides the rows that are passed to
    the select list to compute the output rows of the query.
   </para>
@@ -110,7 +110,7 @@ SELECT random();
    <title>The <literal>FROM</literal> Clause</title>
 
    <para>
-    The <xref linkend="sql-from" endterm="sql-from-title"> derives a
+    The <xref linkend="sql-from" endterm="sql-from-title"/> derives a
     table from one or more other tables given in a comma-separated
     table reference list.
 <synopsis>
@@ -118,14 +118,14 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
 </synopsis>
 
     A table reference can be a table name (possibly schema-qualified),
-    or a derived table such as a subquery, a <literal>JOIN</> construct, or
+    or a derived table such as a subquery, a <literal>JOIN</literal> construct, or
     complex combinations of these.  If more than one table reference is
-    listed in the <literal>FROM</> clause, the tables are cross-joined
+    listed in the <literal>FROM</literal> clause, the tables are cross-joined
     (that is, the Cartesian product of their rows is formed; see below).
-    The result of the <literal>FROM</> list is an intermediate virtual
+    The result of the <literal>FROM</literal> list is an intermediate virtual
     table that can then be subject to
-    transformations by the <literal>WHERE</>, <literal>GROUP BY</>,
-    and <literal>HAVING</> clauses and is finally the result of the
+    transformations by the <literal>WHERE</literal>, <literal>GROUP BY</literal>,
+    and <literal>HAVING</literal> clauses and is finally the result of the
     overall table expression.
    </para>
 
@@ -137,14 +137,14 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
     When a table reference names a table that is the parent of a
     table inheritance hierarchy, the table reference produces rows of
     not only that table but all of its descendant tables, unless the
-    key word <literal>ONLY</> precedes the table name.  However, the
+    key word <literal>ONLY</literal> precedes the table name.  However, the
     reference produces only the columns that appear in the named table
     &mdash; any columns added in subtables are ignored.
    </para>
 
    <para>
-    Instead of writing <literal>ONLY</> before the table name, you can write
-    <literal>*</> after the table name to explicitly specify that descendant
+    Instead of writing <literal>ONLY</literal> before the table name, you can write
+    <literal>*</literal> after the table name to explicitly specify that descendant
     tables are included.  There is no real reason to use this syntax any more,
     because searching descendant tables is now always the default behavior.
     However, it is supported for compatibility with older releases.
@@ -168,8 +168,8 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
      Joins of all types can be chained together, or nested: either or
      both <replaceable>T1</replaceable> and
      <replaceable>T2</replaceable> can be joined tables.  Parentheses
-     can be used around <literal>JOIN</> clauses to control the join
-     order.  In the absence of parentheses, <literal>JOIN</> clauses
+     can be used around <literal>JOIN</literal> clauses to control the join
+     order.  In the absence of parentheses, <literal>JOIN</literal> clauses
      nest left-to-right.
     </para>
 
@@ -215,7 +215,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         <note>
         <para>
          This latter equivalence does not hold exactly when more than two
-         tables appear, because <literal>JOIN</> binds more tightly than
+         tables appear, because <literal>JOIN</literal> binds more tightly than
          comma.  For example
          <literal>FROM <replaceable>T1</replaceable> CROSS JOIN
          <replaceable>T2</replaceable> INNER JOIN <replaceable>T3</replaceable>
@@ -262,8 +262,8 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
 
        <para>
         The <firstterm>join condition</firstterm> is specified in the
-        <literal>ON</> or <literal>USING</> clause, or implicitly by
-        the word <literal>NATURAL</>.  The join condition determines
+        <literal>ON</literal> or <literal>USING</literal> clause, or implicitly by
+        the word <literal>NATURAL</literal>.  The join condition determines
         which rows from the two source tables are considered to
         <quote>match</quote>, as explained in detail below.
        </para>
@@ -273,7 +273,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
 
        <variablelist>
         <varlistentry>
-         <term><literal>INNER JOIN</></term>
+         <term><literal>INNER JOIN</literal></term>
 
          <listitem>
           <para>
@@ -284,7 +284,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         </varlistentry>
 
         <varlistentry>
-         <term><literal>LEFT OUTER JOIN</>
+         <term><literal>LEFT OUTER JOIN</literal>
          <indexterm>
           <primary>join</primary>
           <secondary>left</secondary>
@@ -307,7 +307,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         </varlistentry>
 
         <varlistentry>
-         <term><literal>RIGHT OUTER JOIN</>
+         <term><literal>RIGHT OUTER JOIN</literal>
          <indexterm>
           <primary>join</primary>
           <secondary>right</secondary>
@@ -330,7 +330,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         </varlistentry>
 
         <varlistentry>
-         <term><literal>FULL OUTER JOIN</></term>
+         <term><literal>FULL OUTER JOIN</literal></term>
 
          <listitem>
           <para>
@@ -347,35 +347,35 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
        </para>
 
        <para>
-        The <literal>ON</> clause is the most general kind of join
+        The <literal>ON</literal> clause is the most general kind of join
         condition: it takes a Boolean value expression of the same
-        kind as is used in a <literal>WHERE</> clause.  A pair of rows
-        from <replaceable>T1</> and <replaceable>T2</> match if the
-        <literal>ON</> expression evaluates to true.
+        kind as is used in a <literal>WHERE</literal> clause.  A pair of rows
+        from <replaceable>T1</replaceable> and <replaceable>T2</replaceable> match if the
+        <literal>ON</literal> expression evaluates to true.
        </para>
 
        <para>
-        The <literal>USING</> clause is a shorthand that allows you to take
+        The <literal>USING</literal> clause is a shorthand that allows you to take
         advantage of the specific situation where both sides of the join use
         the same name for the joining column(s).  It takes a
         comma-separated list of the shared column names
         and forms a join condition that includes an equality comparison
-        for each one.  For example, joining <replaceable>T1</>
-        and <replaceable>T2</> with <literal>USING (a, b)</> produces
-        the join condition <literal>ON <replaceable>T1</>.a
-        = <replaceable>T2</>.a AND <replaceable>T1</>.b
-        = <replaceable>T2</>.b</literal>.
+        for each one.  For example, joining <replaceable>T1</replaceable>
+        and <replaceable>T2</replaceable> with <literal>USING (a, b)</literal> produces
+        the join condition <literal>ON <replaceable>T1</replaceable>.a
+        = <replaceable>T2</replaceable>.a AND <replaceable>T1</replaceable>.b
+        = <replaceable>T2</replaceable>.b</literal>.
        </para>
 
        <para>
-        Furthermore, the output of <literal>JOIN USING</> suppresses
+        Furthermore, the output of <literal>JOIN USING</literal> suppresses
         redundant columns: there is no need to print both of the matched
         columns, since they must have equal values.  While <literal>JOIN
-        ON</> produces all columns from <replaceable>T1</> followed by all
-        columns from <replaceable>T2</>, <literal>JOIN USING</> produces one
+        ON</literal> produces all columns from <replaceable>T1</replaceable> followed by all
+        columns from <replaceable>T2</replaceable>, <literal>JOIN USING</literal> produces one
         output column for each of the listed column pairs (in the listed
-        order), followed by any remaining columns from <replaceable>T1</>,
-        followed by any remaining columns from <replaceable>T2</>.
+        order), followed by any remaining columns from <replaceable>T1</replaceable>,
+        followed by any remaining columns from <replaceable>T2</replaceable>.
        </para>
 
        <para>
@@ -386,10 +386,10 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         <indexterm>
          <primary>natural join</primary>
         </indexterm>
-        Finally, <literal>NATURAL</> is a shorthand form of
-        <literal>USING</>: it forms a <literal>USING</> list
+        Finally, <literal>NATURAL</literal> is a shorthand form of
+        <literal>USING</literal>: it forms a <literal>USING</literal> list
         consisting of all column names that appear in both
-        input tables.  As with <literal>USING</>, these columns appear
+        input tables.  As with <literal>USING</literal>, these columns appear
         only once in the output table.  If there are no common
         column names, <literal>NATURAL JOIN</literal> behaves like
         <literal>JOIN ... ON TRUE</literal>, producing a cross-product join.
@@ -399,7 +399,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
         <para>
          <literal>USING</literal> is reasonably safe from column changes
          in the joined relations since only the listed columns
-         are combined.  <literal>NATURAL</> is considerably more risky since
+         are combined.  <literal>NATURAL</literal> is considerably more risky since
          any schema changes to either relation that cause a new matching
          column name to be present will cause the join to combine that new
          column as well.
@@ -428,7 +428,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
 </programlisting>
      then we get the following results for the various joins:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 CROSS JOIN t2;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 CROSS JOIN t2;</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
@@ -442,28 +442,28 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
    3 | c    |   5 | zzz
 (9 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 INNER JOIN t2 ON t1.num = t2.num;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 INNER JOIN t2 ON t1.num = t2.num;</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
    3 | c    |   3 | yyy
 (2 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 INNER JOIN t2 USING (num);</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 INNER JOIN t2 USING (num);</userinput>
  num | name | value
 -----+------+-------
    1 | a    | xxx
    3 | c    | yyy
 (2 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 NATURAL INNER JOIN t2;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 NATURAL INNER JOIN t2;</userinput>
  num | name | value
 -----+------+-------
    1 | a    | xxx
    3 | c    | yyy
 (2 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num;</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
@@ -471,7 +471,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
    3 | c    |   3 | yyy
 (3 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 LEFT JOIN t2 USING (num);</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 LEFT JOIN t2 USING (num);</userinput>
  num | name | value
 -----+------+-------
    1 | a    | xxx
@@ -479,7 +479,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
    3 | c    | yyy
 (3 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 RIGHT JOIN t2 ON t1.num = t2.num;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 RIGHT JOIN t2 ON t1.num = t2.num;</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
@@ -487,7 +487,7 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
      |      |   5 | zzz
 (3 rows)
 
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 FULL JOIN t2 ON t1.num = t2.num;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 FULL JOIN t2 ON t1.num = t2.num;</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
@@ -499,12 +499,12 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
     </para>
 
     <para>
-     The join condition specified with <literal>ON</> can also contain
+     The join condition specified with <literal>ON</literal> can also contain
      conditions that do not relate directly to the join.  This can
      prove useful for some queries but needs to be thought out
      carefully.  For example:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num AND t2.value = 'xxx';</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num AND t2.value = 'xxx';</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
@@ -512,19 +512,19 @@ FROM <replaceable>table_reference</replaceable> <optional>, <replaceable>table_r
    3 | c    |     |
 (3 rows)
 </screen>
-     Notice that placing the restriction in the <literal>WHERE</> clause
+     Notice that placing the restriction in the <literal>WHERE</literal> clause
      produces a different result:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num WHERE t2.value = 'xxx';</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM t1 LEFT JOIN t2 ON t1.num = t2.num WHERE t2.value = 'xxx';</userinput>
  num | name | num | value
 -----+------+-----+-------
    1 | a    |   1 | xxx
 (1 row)
 </screen>
-     This is because a restriction placed in the <literal>ON</>
-     clause is processed <emphasis>before</> the join, while
-     a restriction placed in the <literal>WHERE</> clause is processed
-     <emphasis>after</> the join.
+     This is because a restriction placed in the <literal>ON</literal>
+     clause is processed <emphasis>before</emphasis> the join, while
+     a restriction placed in the <literal>WHERE</literal> clause is processed
+     <emphasis>after</emphasis> the join.
      That does not matter with inner joins, but it matters a lot with outer
      joins.
     </para>
@@ -589,13 +589,13 @@ SELECT * FROM my_table AS m WHERE my_table.a &gt; 5;    -- wrong
 SELECT * FROM people AS mother JOIN people AS child ON mother.id = child.mother_id;
 </programlisting>
      Additionally, an alias is required if the table reference is a
-     subquery (see <xref linkend="queries-subqueries">).
+     subquery (see <xref linkend="queries-subqueries"/>).
     </para>
 
     <para>
      Parentheses are used to resolve ambiguities.  In the following example,
      the first statement assigns the alias <literal>b</literal> to the second
-     instance of <literal>my_table</>, but the second statement assigns the
+     instance of <literal>my_table</literal>, but the second statement assigns the
      alias to the result of the join:
 <programlisting>
 SELECT * FROM my_table AS a CROSS JOIN my_table AS b ...
@@ -615,9 +615,9 @@ FROM <replaceable>table_reference</replaceable> <optional>AS</optional> <replace
     </para>
 
     <para>
-     When an alias is applied to the output of a <literal>JOIN</>
+     When an alias is applied to the output of a <literal>JOIN</literal>
      clause, the alias hides the original
-     name(s) within the <literal>JOIN</>.  For example:
+     name(s) within the <literal>JOIN</literal>.  For example:
 <programlisting>
 SELECT a.* FROM my_table AS a JOIN your_table AS b ON ...
 </programlisting>
@@ -625,8 +625,8 @@ SELECT a.* FROM my_table AS a JOIN your_table AS b ON ...
 <programlisting>
 SELECT a.* FROM (my_table AS a JOIN your_table AS b ON ...) AS c
 </programlisting>
-     is not valid; the table alias <literal>a</> is not visible
-     outside the alias <literal>c</>.
+     is not valid; the table alias <literal>a</literal> is not visible
+     outside the alias <literal>c</literal>.
     </para>
    </sect3>
 
@@ -640,7 +640,7 @@ SELECT a.* FROM (my_table AS a JOIN your_table AS b ON ...) AS c
     <para>
      Subqueries specifying a derived table must be enclosed in
      parentheses and <emphasis>must</emphasis> be assigned a table
-     alias name (as in <xref linkend="queries-table-aliases">).  For
+     alias name (as in <xref linkend="queries-table-aliases"/>).  For
      example:
 <programlisting>
 FROM (SELECT * FROM table1) AS alias_name
@@ -655,39 +655,39 @@ FROM (SELECT * FROM table1) AS alias_name
     </para>
 
     <para>
-     A subquery can also be a <command>VALUES</> list:
+     A subquery can also be a <command>VALUES</command> list:
 <programlisting>
 FROM (VALUES ('anne', 'smith'), ('bob', 'jones'), ('joe', 'blow'))
      AS names(first, last)
 </programlisting>
      Again, a table alias is required.  Assigning alias names to the columns
-     of the <command>VALUES</> list is optional, but is good practice.
-     For more information see <xref linkend="queries-values">.
+     of the <command>VALUES</command> list is optional, but is good practice.
+     For more information see <xref linkend="queries-values"/>.
     </para>
    </sect3>
 
    <sect3 id="queries-tablefunctions">
     <title>Table Functions</title>
 
-    <indexterm zone="queries-tablefunctions"><primary>table function</></>
+    <indexterm zone="queries-tablefunctions"><primary>table function</primary></indexterm>
 
     <indexterm zone="queries-tablefunctions">
-     <primary>function</>
-     <secondary>in the FROM clause</>
+     <primary>function</primary>
+     <secondary>in the FROM clause</secondary>
     </indexterm>
 
     <para>
      Table functions are functions that produce a set of rows, made up
      of either base data types (scalar types) or composite data types
      (table rows).  They are used like a table, view, or subquery in
-     the <literal>FROM</> clause of a query. Columns returned by table
-     functions can be included in <literal>SELECT</>,
-     <literal>JOIN</>, or <literal>WHERE</> clauses in the same manner
+     the <literal>FROM</literal> clause of a query. Columns returned by table
+     functions can be included in <literal>SELECT</literal>,
+     <literal>JOIN</literal>, or <literal>WHERE</literal> clauses in the same manner
      as columns of a table, view, or subquery.
     </para>
 
     <para>
-     Table functions may also be combined using the <literal>ROWS FROM</>
+     Table functions may also be combined using the <literal>ROWS FROM</literal>
      syntax, with the results returned in parallel columns; the number of
      result rows in this case is that of the largest function result, with
      smaller results padded with null values to match.
@@ -704,7 +704,7 @@ ROWS FROM( <replaceable>function_call</replaceable> <optional>, ... </optional>
      function result columns.  This column numbers the rows of the function
      result set, starting from 1. (This is a generalization of the
      SQL-standard syntax for <literal>UNNEST ... WITH ORDINALITY</literal>.)
-     By default, the ordinal column is called <literal>ordinality</>, but
+     By default, the ordinal column is called <literal>ordinality</literal>, but
      a different column name can be assigned to it using
      an <literal>AS</literal> clause.
     </para>
@@ -713,7 +713,7 @@ ROWS FROM( <replaceable>function_call</replaceable> <optional>, ... </optional>
      The special table function <literal>UNNEST</literal> may be called with
      any number of array parameters, and it returns a corresponding number of
      columns, as if <literal>UNNEST</literal>
-     (<xref linkend="functions-array">) had been called on each parameter
+     (<xref linkend="functions-array"/>) had been called on each parameter
      separately and combined using the <literal>ROWS FROM</literal> construct.
     </para>
 
@@ -723,7 +723,7 @@ UNNEST( <replaceable>array_expression</replaceable> <optional>, ... </optional>
 
     <para>
      If no <replaceable>table_alias</replaceable> is specified, the function
-     name is used as the table name; in the case of a <literal>ROWS FROM()</>
+     name is used as the table name; in the case of a <literal>ROWS FROM()</literal>
      construct, the first function's name is used.
     </para>
 
@@ -762,7 +762,7 @@ SELECT * FROM vw_getfoo;
      In some cases it is useful to define table functions that can
      return different column sets depending on how they are invoked.
      To support this, the table function can be declared as returning
-     the pseudo-type <type>record</>.  When such a function is used in
+     the pseudo-type <type>record</type>.  When such a function is used in
      a query, the expected row structure must be specified in the
      query itself, so that the system can know how to parse and plan
      the query.  This syntax looks like:
@@ -775,16 +775,16 @@ ROWS FROM( ... <replaceable>function_call</replaceable> AS (<replaceable>column_
 </synopsis>
 
     <para>
-     When not using the <literal>ROWS FROM()</> syntax,
+     When not using the <literal>ROWS FROM()</literal> syntax,
      the <replaceable>column_definition</replaceable> list replaces the column
-     alias list that could otherwise be attached to the <literal>FROM</>
+     alias list that could otherwise be attached to the <literal>FROM</literal>
      item; the names in the column definitions serve as column aliases.
-     When using the <literal>ROWS FROM()</> syntax,
+     When using the <literal>ROWS FROM()</literal> syntax,
      a <replaceable>column_definition</replaceable> list can be attached to
      each member function separately; or if there is only one member function
-     and no <literal>WITH ORDINALITY</> clause,
+     and no <literal>WITH ORDINALITY</literal> clause,
      a <replaceable>column_definition</replaceable> list can be written in
-     place of a column alias list following <literal>ROWS FROM()</>.
+     place of a column alias list following <literal>ROWS FROM()</literal>.
     </para>
 
     <para>
@@ -795,52 +795,52 @@ SELECT *
       AS t1(proname name, prosrc text)
     WHERE proname LIKE 'bytea%';
 </programlisting>
-     The <xref linkend="CONTRIB-DBLINK-FUNCTION"> function
-     (part of the <xref linkend="dblink"> module) executes
+     The <xref linkend="contrib-dblink-function"/> function
+     (part of the <xref linkend="dblink"/> module) executes
      a remote query.  It is declared to return
-     <type>record</> since it might be used for any kind of query.
+     <type>record</type> since it might be used for any kind of query.
      The actual column set must be specified in the calling query so
-     that the parser knows, for example, what <literal>*</> should
+     that the parser knows, for example, what <literal>*</literal> should
      expand to.
     </para>
    </sect3>
 
    <sect3 id="queries-lateral">
-    <title><literal>LATERAL</> Subqueries</title>
+    <title><literal>LATERAL</literal> Subqueries</title>
 
     <indexterm zone="queries-lateral">
-     <primary>LATERAL</>
-     <secondary>in the FROM clause</>
+     <primary>LATERAL</primary>
+     <secondary>in the FROM clause</secondary>
     </indexterm>
 
     <para>
-     Subqueries appearing in <literal>FROM</> can be
-     preceded by the key word <literal>LATERAL</>.  This allows them to
-     reference columns provided by preceding <literal>FROM</> items.
+     Subqueries appearing in <literal>FROM</literal> can be
+     preceded by the key word <literal>LATERAL</literal>.  This allows them to
+     reference columns provided by preceding <literal>FROM</literal> items.
      (Without <literal>LATERAL</literal>, each subquery is
      evaluated independently and so cannot cross-reference any other
-     <literal>FROM</> item.)
+     <literal>FROM</literal> item.)
     </para>
 
     <para>
-     Table functions appearing in <literal>FROM</> can also be
-     preceded by the key word <literal>LATERAL</>, but for functions the
+     Table functions appearing in <literal>FROM</literal> can also be
+     preceded by the key word <literal>LATERAL</literal>, but for functions the
      key word is optional; the function's arguments can contain references
-     to columns provided by preceding <literal>FROM</> items in any case.
+     to columns provided by preceding <literal>FROM</literal> items in any case.
     </para>
 
     <para>
      A <literal>LATERAL</literal> item can appear at top level in the
-     <literal>FROM</> list, or within a <literal>JOIN</> tree.  In the latter
+     <literal>FROM</literal> list, or within a <literal>JOIN</literal> tree.  In the latter
      case it can also refer to any items that are on the left-hand side of a
-     <literal>JOIN</> that it is on the right-hand side of.
+     <literal>JOIN</literal> that it is on the right-hand side of.
     </para>
 
     <para>
-     When a <literal>FROM</> item contains <literal>LATERAL</literal>
+     When a <literal>FROM</literal> item contains <literal>LATERAL</literal>
      cross-references, evaluation proceeds as follows: for each row of the
-     <literal>FROM</> item providing the cross-referenced column(s), or
-     set of rows of multiple <literal>FROM</> items providing the
+     <literal>FROM</literal> item providing the cross-referenced column(s), or
+     set of rows of multiple <literal>FROM</literal> items providing the
      columns, the <literal>LATERAL</literal> item is evaluated using that
      row or row set's values of the columns.  The resulting row(s) are
      joined as usual with the rows they were computed from.  This is
@@ -860,7 +860,7 @@ SELECT * FROM foo, bar WHERE bar.id = foo.bar_id;
      <literal>LATERAL</literal> is primarily useful when the cross-referenced
      column is necessary for computing the row(s) to be joined.  A common
      application is providing an argument value for a set-returning function.
-     For example, supposing that <function>vertices(polygon)</> returns the
+     For example, supposing that <function>vertices(polygon)</function> returns the
      set of vertices of a polygon, we could identify close-together vertices
      of polygons stored in a table with:
 <programlisting>
@@ -878,15 +878,15 @@ FROM polygons p1 CROSS JOIN LATERAL vertices(p1.poly) v1,
 WHERE (v1 &lt;-&gt; v2) &lt; 10 AND p1.id != p2.id;
 </programlisting>
      or in several other equivalent formulations.  (As already mentioned,
-     the <literal>LATERAL</> key word is unnecessary in this example, but
+     the <literal>LATERAL</literal> key word is unnecessary in this example, but
      we use it for clarity.)
     </para>
 
     <para>
-     It is often particularly handy to <literal>LEFT JOIN</> to a
+     It is often particularly handy to <literal>LEFT JOIN</literal> to a
      <literal>LATERAL</literal> subquery, so that source rows will appear in
      the result even if the <literal>LATERAL</literal> subquery produces no
-     rows for them.  For example, if <function>get_product_names()</> returns
+     rows for them.  For example, if <function>get_product_names()</function> returns
      the names of products made by a manufacturer, but some manufacturers in
      our table currently produce no products, we could find out which ones
      those are like this:
@@ -908,30 +908,30 @@ WHERE pname IS NULL;
 
    <para>
     The syntax of the <xref linkend="sql-where"
-    endterm="sql-where-title"> is
+    endterm="sql-where-title"/> is
 <synopsis>
 WHERE <replaceable>search_condition</replaceable>
 </synopsis>
     where <replaceable>search_condition</replaceable> is any value
-    expression (see <xref linkend="sql-expressions">) that
+    expression (see <xref linkend="sql-expressions"/>) that
     returns a value of type <type>boolean</type>.
    </para>
 
    <para>
-    After the processing of the <literal>FROM</> clause is done, each
+    After the processing of the <literal>FROM</literal> clause is done, each
     row of the derived virtual table is checked against the search
     condition.  If the result of the condition is true, the row is
     kept in the output table, otherwise (i.e., if the result is
     false or null) it is discarded.  The search condition typically
     references at least one column of the table generated in the
-    <literal>FROM</> clause; this is not required, but otherwise the
-    <literal>WHERE</> clause will be fairly useless.
+    <literal>FROM</literal> clause; this is not required, but otherwise the
+    <literal>WHERE</literal> clause will be fairly useless.
    </para>
 
    <note>
     <para>
      The join condition of an inner join can be written either in
-     the <literal>WHERE</> clause or in the <literal>JOIN</> clause.
+     the <literal>WHERE</literal> clause or in the <literal>JOIN</literal> clause.
      For example, these table expressions are equivalent:
 <programlisting>
 FROM a, b WHERE a.id = b.id AND b.val &gt; 5
@@ -945,13 +945,13 @@ FROM a INNER JOIN b ON (a.id = b.id) WHERE b.val &gt; 5
 FROM a NATURAL JOIN b WHERE b.val &gt; 5
 </programlisting>
      Which one of these you use is mainly a matter of style.  The
-     <literal>JOIN</> syntax in the <literal>FROM</> clause is
+     <literal>JOIN</literal> syntax in the <literal>FROM</literal> clause is
      probably not as portable to other SQL database management systems,
      even though it is in the SQL standard.  For
      outer joins there is no choice:  they must be done in
-     the <literal>FROM</> clause.  The <literal>ON</> or <literal>USING</>
-     clause of an outer join is <emphasis>not</> equivalent to a
-     <literal>WHERE</> condition, because it results in the addition
+     the <literal>FROM</literal> clause.  The <literal>ON</literal> or <literal>USING</literal>
+     clause of an outer join is <emphasis>not</emphasis> equivalent to a
+     <literal>WHERE</literal> condition, because it results in the addition
      of rows (for unmatched input rows) as well as the removal of rows
      in the final result.
     </para>
@@ -973,14 +973,14 @@ SELECT ... FROM fdt WHERE c1 BETWEEN (SELECT c3 FROM t2 WHERE c2 = fdt.c1 + 10)
 SELECT ... FROM fdt WHERE EXISTS (SELECT c1 FROM t2 WHERE c2 &gt; fdt.c1)
 </programlisting>
     <literal>fdt</literal> is the table derived in the
-    <literal>FROM</> clause. Rows that do not meet the search
-    condition of the <literal>WHERE</> clause are eliminated from
+    <literal>FROM</literal> clause. Rows that do not meet the search
+    condition of the <literal>WHERE</literal> clause are eliminated from
     <literal>fdt</literal>. Notice the use of scalar subqueries as
     value expressions.  Just like any other query, the subqueries can
     employ complex table expressions.  Notice also how
     <literal>fdt</literal> is referenced in the subqueries.
-    Qualifying <literal>c1</> as <literal>fdt.c1</> is only necessary
-    if <literal>c1</> is also the name of a column in the derived
+    Qualifying <literal>c1</literal> as <literal>fdt.c1</literal> is only necessary
+    if <literal>c1</literal> is also the name of a column in the derived
     input table of the subquery.  But qualifying the column name adds
     clarity even when it is not needed.  This example shows how the column
     naming scope of an outer query extends into its inner queries.
@@ -1000,9 +1000,9 @@ SELECT ... FROM fdt WHERE EXISTS (SELECT c1 FROM t2 WHERE c2 &gt; fdt.c1)
    </indexterm>
 
    <para>
-    After passing the <literal>WHERE</> filter, the derived input
-    table might be subject to grouping, using the <literal>GROUP BY</>
-    clause, and elimination of group rows using the <literal>HAVING</>
+    After passing the <literal>WHERE</literal> filter, the derived input
+    table might be subject to grouping, using the <literal>GROUP BY</literal>
+    clause, and elimination of group rows using the <literal>HAVING</literal>
     clause.
    </para>
 
@@ -1014,7 +1014,7 @@ SELECT <replaceable>select_list</replaceable>
 </synopsis>
 
    <para>
-    The <xref linkend="sql-groupby" endterm="sql-groupby-title"> is
+    The <xref linkend="sql-groupby" endterm="sql-groupby-title"/> is
     used to group together those rows in a table that have the same
     values in all the columns listed. The order in which the columns
     are listed does not matter.  The effect is to combine each set
@@ -1023,7 +1023,7 @@ SELECT <replaceable>select_list</replaceable>
     eliminate redundancy in the output and/or compute aggregates that
     apply to these groups.  For instance:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM test1;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM test1;</userinput>
  x | y
 ---+---
  a | 3
@@ -1032,7 +1032,7 @@ SELECT <replaceable>select_list</replaceable>
  a | 1
 (4 rows)
 
-<prompt>=&gt;</> <userinput>SELECT x FROM test1 GROUP BY x;</>
+<prompt>=&gt;</prompt> <userinput>SELECT x FROM test1 GROUP BY x;</userinput>
  x
 ---
  a
@@ -1045,17 +1045,17 @@ SELECT <replaceable>select_list</replaceable>
    <para>
     In the second query, we could not have written <literal>SELECT *
     FROM test1 GROUP BY x</literal>, because there is no single value
-    for the column <literal>y</> that could be associated with each
+    for the column <literal>y</literal> that could be associated with each
     group.  The grouped-by columns can be referenced in the select list since
     they have a single value in each group.
    </para>
 
    <para>
     In general, if a table is grouped, columns that are not
-    listed in <literal>GROUP BY</> cannot be referenced except in aggregate
+    listed in <literal>GROUP BY</literal> cannot be referenced except in aggregate
     expressions.  An example with aggregate expressions is:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x;</>
+<prompt>=&gt;</prompt> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x;</userinput>
  x | sum
 ---+-----
  a |   4
@@ -1066,15 +1066,15 @@ SELECT <replaceable>select_list</replaceable>
     Here <literal>sum</literal> is an aggregate function that
     computes a single value over the entire group.  More information
     about the available aggregate functions can be found in <xref
-    linkend="functions-aggregate">.
+    linkend="functions-aggregate"/>.
    </para>
 
    <tip>
     <para>
      Grouping without aggregate expressions effectively calculates the
      set of distinct values in a column.  This can also be achieved
-     using the <literal>DISTINCT</> clause (see <xref
-     linkend="queries-distinct">).
+     using the <literal>DISTINCT</literal> clause (see <xref
+     linkend="queries-distinct"/>).
     </para>
    </tip>
 
@@ -1088,10 +1088,10 @@ SELECT product_id, p.name, (sum(s.units) * p.price) AS sales
 </programlisting>
     In this example, the columns <literal>product_id</literal>,
     <literal>p.name</literal>, and <literal>p.price</literal> must be
-    in the <literal>GROUP BY</> clause since they are referenced in
+    in the <literal>GROUP BY</literal> clause since they are referenced in
     the query select list (but see below).  The column
-    <literal>s.units</> does not have to be in the <literal>GROUP
-    BY</> list since it is only used in an aggregate expression
+    <literal>s.units</literal> does not have to be in the <literal>GROUP
+    BY</literal> list since it is only used in an aggregate expression
     (<literal>sum(...)</literal>), which represents the sales
     of a product.  For each product, the query returns a summary row about
     all sales of the product.
@@ -1110,9 +1110,9 @@ SELECT product_id, p.name, (sum(s.units) * p.price) AS sales
    </para>
 
    <para>
-    In strict SQL, <literal>GROUP BY</> can only group by columns of
+    In strict SQL, <literal>GROUP BY</literal> can only group by columns of
     the source table but <productname>PostgreSQL</productname> extends
-    this to also allow <literal>GROUP BY</> to group by columns in the
+    this to also allow <literal>GROUP BY</literal> to group by columns in the
     select list.  Grouping by value expressions instead of simple
     column names is also allowed.
    </para>
@@ -1125,12 +1125,12 @@ SELECT product_id, p.name, (sum(s.units) * p.price) AS sales
     If a table has been grouped using <literal>GROUP BY</literal>,
     but only certain groups are of interest, the
     <literal>HAVING</literal> clause can be used, much like a
-    <literal>WHERE</> clause, to eliminate groups from the result.
+    <literal>WHERE</literal> clause, to eliminate groups from the result.
     The syntax is:
 <synopsis>
 SELECT <replaceable>select_list</replaceable> FROM ... <optional>WHERE ...</optional> GROUP BY ... HAVING <replaceable>boolean_expression</replaceable>
 </synopsis>
-    Expressions in the <literal>HAVING</> clause can refer both to
+    Expressions in the <literal>HAVING</literal> clause can refer both to
     grouped expressions and to ungrouped expressions (which necessarily
     involve an aggregate function).
    </para>
@@ -1138,14 +1138,14 @@ SELECT <replaceable>select_list</replaceable> FROM ... <optional>WHERE ...</opti
    <para>
     Example:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x HAVING sum(y) &gt; 3;</>
+<prompt>=&gt;</prompt> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x HAVING sum(y) &gt; 3;</userinput>
  x | sum
 ---+-----
  a |   4
  b |   5
 (2 rows)
 
-<prompt>=&gt;</> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x HAVING x &lt; 'c';</>
+<prompt>=&gt;</prompt> <userinput>SELECT x, sum(y) FROM test1 GROUP BY x HAVING x &lt; 'c';</userinput>
  x | sum
 ---+-----
  a |   4
@@ -1163,26 +1163,26 @@ SELECT product_id, p.name, (sum(s.units) * (p.price - p.cost)) AS profit
     GROUP BY product_id, p.name, p.price, p.cost
     HAVING sum(p.price * s.units) &gt; 5000;
 </programlisting>
-    In the example above, the <literal>WHERE</> clause is selecting
+    In the example above, the <literal>WHERE</literal> clause is selecting
     rows by a column that is not grouped (the expression is only true for
-    sales during the last four weeks), while the <literal>HAVING</>
+    sales during the last four weeks), while the <literal>HAVING</literal>
     clause restricts the output to groups with total gross sales over
     5000.  Note that the aggregate expressions do not necessarily need
     to be the same in all parts of the query.
    </para>
 
    <para>
-    If a query contains aggregate function calls, but no <literal>GROUP BY</>
+    If a query contains aggregate function calls, but no <literal>GROUP BY</literal>
     clause, grouping still occurs: the result is a single group row (or
     perhaps no rows at all, if the single row is then eliminated by
-    <literal>HAVING</>).
-    The same is true if it contains a <literal>HAVING</> clause, even
-    without any aggregate function calls or <literal>GROUP BY</> clause.
+    <literal>HAVING</literal>).
+    The same is true if it contains a <literal>HAVING</literal> clause, even
+    without any aggregate function calls or <literal>GROUP BY</literal> clause.
    </para>
   </sect2>
 
   <sect2 id="queries-grouping-sets">
-   <title><literal>GROUPING SETS</>, <literal>CUBE</>, and <literal>ROLLUP</></title>
+   <title><literal>GROUPING SETS</literal>, <literal>CUBE</literal>, and <literal>ROLLUP</literal></title>
 
    <indexterm zone="queries-grouping-sets">
     <primary>GROUPING SETS</primary>
@@ -1196,13 +1196,13 @@ SELECT product_id, p.name, (sum(s.units) * (p.price - p.cost)) AS profit
 
    <para>
     More complex grouping operations than those described above are possible
-    using the concept of <firstterm>grouping sets</>.  The data selected by
-    the <literal>FROM</> and <literal>WHERE</> clauses is grouped separately
+    using the concept of <firstterm>grouping sets</firstterm>.  The data selected by
+    the <literal>FROM</literal> and <literal>WHERE</literal> clauses is grouped separately
     by each specified grouping set, aggregates computed for each group just as
-    for simple <literal>GROUP BY</> clauses, and then the results returned.
+    for simple <literal>GROUP BY</literal> clauses, and then the results returned.
     For example:
 <screen>
-<prompt>=&gt;</> <userinput>SELECT * FROM items_sold;</>
+<prompt>=&gt;</prompt> <userinput>SELECT * FROM items_sold;</userinput>
  brand | size | sales
 -------+------+-------
  Foo   | L    |  10
@@ -1211,7 +1211,7 @@ SELECT product_id, p.name, (sum(s.units) * (p.price - p.cost)) AS profit
  Bar   | L    |  5
 (4 rows)
 
-<prompt>=&gt;</> <userinput>SELECT brand, size, sum(sales) FROM items_sold GROUP BY GROUPING SETS ((brand), (size), ());</>
+<prompt>=&gt;</prompt> <userinput>SELECT brand, size, sum(sales) FROM items_sold GROUP BY GROUPING SETS ((brand), (size), ());</userinput>
  brand | size | sum
 -------+------+-----
  Foo   |      |  30
@@ -1224,35 +1224,35 @@ SELECT product_id, p.name, (sum(s.units) * (p.price - p.cost)) AS profit
    </para>
 
    <para>
-    Each sublist of <literal>GROUPING SETS</> may specify zero or more columns
+    Each sublist of <literal>GROUPING SETS</literal> may specify zero or more columns
     or expressions and is interpreted the same way as though it were directly
-    in the <literal>GROUP BY</> clause.  An empty grouping set means that all
+    in the <literal>GROUP BY</literal> clause.  An empty grouping set means that all
     rows are aggregated down to a single group (which is output even if no
     input rows were present), as described above for the case of aggregate
-    functions with no <literal>GROUP BY</> clause.
+    functions with no <literal>GROUP BY</literal> clause.
    </para>
 
    <para>
     References to the grouping columns or expressions are replaced
     by null values in result rows for grouping sets in which those
     columns do not appear.  To distinguish which grouping a particular output
-    row resulted from, see <xref linkend="functions-grouping-table">.
+    row resulted from, see <xref linkend="functions-grouping-table"/>.
    </para>
 
    <para>
     A shorthand notation is provided for specifying two common types of grouping set.
     A clause of the form
 <programlisting>
-ROLLUP ( <replaceable>e1</>, <replaceable>e2</>, <replaceable>e3</>, ... )
+ROLLUP ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable>, <replaceable>e3</replaceable>, ... )
 </programlisting>
     represents the given list of expressions and all prefixes of the list including
     the empty list; thus it is equivalent to
 <programlisting>
 GROUPING SETS (
-    ( <replaceable>e1</>, <replaceable>e2</>, <replaceable>e3</>, ... ),
+    ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable>, <replaceable>e3</replaceable>, ... ),
     ...
-    ( <replaceable>e1</>, <replaceable>e2</> ),
-    ( <replaceable>e1</> ),
+    ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable> ),
+    ( <replaceable>e1</replaceable> ),
     ( )
 )
 </programlisting>
@@ -1263,7 +1263,7 @@ GROUPING SETS (
    <para>
     A clause of the form
 <programlisting>
-CUBE ( <replaceable>e1</>, <replaceable>e2</>, ... )
+CUBE ( <replaceable>e1</replaceable>, <replaceable>e2</replaceable>, ... )
 </programlisting>
     represents the given list and all of its possible subsets (i.e. the power
     set).  Thus
@@ -1286,7 +1286,7 @@ GROUPING SETS (
    </para>
 
    <para>
-    The individual elements of a <literal>CUBE</> or <literal>ROLLUP</>
+    The individual elements of a <literal>CUBE</literal> or <literal>ROLLUP</literal>
     clause may be either individual expressions, or sublists of elements in
     parentheses.  In the latter case, the sublists are treated as single
     units for the purposes of generating the individual grouping sets.
@@ -1319,15 +1319,15 @@ GROUPING SETS (
    </para>
 
    <para>
-    The <literal>CUBE</> and <literal>ROLLUP</> constructs can be used either
-    directly in the <literal>GROUP BY</> clause, or nested inside a
-    <literal>GROUPING SETS</> clause.  If one <literal>GROUPING SETS</> clause
+    The <literal>CUBE</literal> and <literal>ROLLUP</literal> constructs can be used either
+    directly in the <literal>GROUP BY</literal> clause, or nested inside a
+    <literal>GROUPING SETS</literal> clause.  If one <literal>GROUPING SETS</literal> clause
     is nested inside another, the effect is the same as if all the elements of
     the inner clause had been written directly in the outer clause.
    </para>
 
    <para>
-    If multiple grouping items are specified in a single <literal>GROUP BY</>
+    If multiple grouping items are specified in a single <literal>GROUP BY</literal>
     clause, then the final list of grouping sets is the cross product of the
     individual items.  For example:
 <programlisting>
@@ -1346,12 +1346,12 @@ GROUP BY GROUPING SETS (
 
   <note>
    <para>
-    The construct <literal>(a, b)</> is normally recognized in expressions as
+    The construct <literal>(a, b)</literal> is normally recognized in expressions as
     a <link linkend="sql-syntax-row-constructors">row constructor</link>.
-    Within the <literal>GROUP BY</> clause, this does not apply at the top
-    levels of expressions, and <literal>(a, b)</> is parsed as a list of
-    expressions as described above.  If for some reason you <emphasis>need</>
-    a row constructor in a grouping expression, use <literal>ROW(a, b)</>.
+    Within the <literal>GROUP BY</literal> clause, this does not apply at the top
+    levels of expressions, and <literal>(a, b)</literal> is parsed as a list of
+    expressions as described above.  If for some reason you <emphasis>need</emphasis>
+    a row constructor in a grouping expression, use <literal>ROW(a, b)</literal>.
    </para>
   </note>
   </sect2>
@@ -1361,40 +1361,40 @@ GROUP BY GROUPING SETS (
 
    <indexterm zone="queries-window">
     <primary>window function</primary>
-    <secondary>order of execution</>
+    <secondary>order of execution</secondary>
    </indexterm>
 
    <para>
     If the query contains any window functions (see
-    <xref linkend="tutorial-window">,
-    <xref linkend="functions-window"> and
-    <xref linkend="syntax-window-functions">), these functions are evaluated
-    after any grouping, aggregation, and <literal>HAVING</> filtering is
+    <xref linkend="tutorial-window"/>,
+    <xref linkend="functions-window"/> and
+    <xref linkend="syntax-window-functions"/>), these functions are evaluated
+    after any grouping, aggregation, and <literal>HAVING</literal> filtering is
     performed.  That is, if the query uses any aggregates, <literal>GROUP
-    BY</>, or <literal>HAVING</>, then the rows seen by the window functions
+    BY</literal>, or <literal>HAVING</literal>, then the rows seen by the window functions
     are the group rows instead of the original table rows from
-    <literal>FROM</>/<literal>WHERE</>.
+    <literal>FROM</literal>/<literal>WHERE</literal>.
    </para>
 
    <para>
     When multiple window functions are used, all the window functions having
-    syntactically equivalent <literal>PARTITION BY</> and <literal>ORDER BY</>
+    syntactically equivalent <literal>PARTITION BY</literal> and <literal>ORDER BY</literal>
     clauses in their window definitions are guaranteed to be evaluated in a
     single pass over the data. Therefore they will see the same sort ordering,
-    even if the <literal>ORDER BY</> does not uniquely determine an ordering.
+    even if the <literal>ORDER BY</literal> does not uniquely determine an ordering.
     However, no guarantees are made about the evaluation of functions having
-    different <literal>PARTITION BY</> or <literal>ORDER BY</> specifications.
+    different <literal>PARTITION BY</literal> or <literal>ORDER BY</literal> specifications.
     (In such cases a sort step is typically required between the passes of
     window function evaluations, and the sort is not guaranteed to preserve
-    ordering of rows that its <literal>ORDER BY</> sees as equivalent.)
+    ordering of rows that its <literal>ORDER BY</literal> sees as equivalent.)
    </para>
 
    <para>
     Currently, window functions always require presorted data, and so the
     query output will be ordered according to one or another of the window
-    functions' <literal>PARTITION BY</>/<literal>ORDER BY</> clauses.
+    functions' <literal>PARTITION BY</literal>/<literal>ORDER BY</literal> clauses.
     It is not recommended to rely on this, however.  Use an explicit
-    top-level <literal>ORDER BY</> clause if you want to be sure the
+    top-level <literal>ORDER BY</literal> clause if you want to be sure the
     results are sorted in a particular way.
    </para>
   </sect2>
@@ -1430,18 +1430,18 @@ GROUP BY GROUPING SETS (
     The simplest kind of select list is <literal>*</literal> which
     emits all columns that the table expression produces.  Otherwise,
     a select list is a comma-separated list of value expressions (as
-    defined in <xref linkend="sql-expressions">).  For instance, it
+    defined in <xref linkend="sql-expressions"/>).  For instance, it
     could be a list of column names:
 <programlisting>
 SELECT a, b, c FROM ...
 </programlisting>
-     The columns names <literal>a</>, <literal>b</>, and <literal>c</>
+     The columns names <literal>a</literal>, <literal>b</literal>, and <literal>c</literal>
      are either the actual names of the columns of tables referenced
-     in the <literal>FROM</> clause, or the aliases given to them as
-     explained in <xref linkend="queries-table-aliases">.  The name
+     in the <literal>FROM</literal> clause, or the aliases given to them as
+     explained in <xref linkend="queries-table-aliases"/>.  The name
      space available in the select list is the same as in the
-     <literal>WHERE</> clause, unless grouping is used, in which case
-     it is the same as in the <literal>HAVING</> clause.
+     <literal>WHERE</literal> clause, unless grouping is used, in which case
+     it is the same as in the <literal>HAVING</literal> clause.
    </para>
 
    <para>
@@ -1455,8 +1455,8 @@ SELECT tbl1.a, tbl2.a, tbl1.b FROM ...
 <programlisting>
 SELECT tbl1.*, tbl2.a FROM ...
 </programlisting>
-    See <xref linkend="rowtypes-usage"> for more about
-    the <replaceable>table_name</><literal>.*</> notation.
+    See <xref linkend="rowtypes-usage"/> for more about
+    the <replaceable>table_name</replaceable><literal>.*</literal> notation.
    </para>
 
    <para>
@@ -1465,7 +1465,7 @@ SELECT tbl1.*, tbl2.a FROM ...
     value expression is evaluated once for each result row, with
     the row's values substituted for any column references.  But the
     expressions in the select list do not have to reference any
-    columns in the table expression of the <literal>FROM</> clause;
+    columns in the table expression of the <literal>FROM</literal> clause;
     they can be constant arithmetic expressions, for instance.
    </para>
   </sect2>
@@ -1480,7 +1480,7 @@ SELECT tbl1.*, tbl2.a FROM ...
 
    <para>
     The entries in the select list can be assigned names for subsequent
-    processing, such as for use in an <literal>ORDER BY</> clause
+    processing, such as for use in an <literal>ORDER BY</literal> clause
     or for display by the client application.  For example:
 <programlisting>
 SELECT a AS value, b + c AS sum FROM ...
@@ -1488,7 +1488,7 @@ SELECT a AS value, b + c AS sum FROM ...
    </para>
 
    <para>
-    If no output column name is specified using <literal>AS</>,
+    If no output column name is specified using <literal>AS</literal>,
     the system assigns a default column name.  For simple column references,
     this is the name of the referenced column.  For function
     calls, this is the name of the function.  For complex expressions,
@@ -1496,12 +1496,12 @@ SELECT a AS value, b + c AS sum FROM ...
    </para>
 
    <para>
-    The <literal>AS</> keyword is optional, but only if the new column
+    The <literal>AS</literal> keyword is optional, but only if the new column
     name does not match any
     <productname>PostgreSQL</productname> keyword (see <xref
-    linkend="sql-keywords-appendix">).  To avoid an accidental match to
+    linkend="sql-keywords-appendix"/>).  To avoid an accidental match to
     a keyword, you can double-quote the column name.  For example,
-    <literal>VALUE</> is a keyword, so this does not work:
+    <literal>VALUE</literal> is a keyword, so this does not work:
 <programlisting>
 SELECT a value, b + c AS sum FROM ...
 </programlisting>
@@ -1517,8 +1517,8 @@ SELECT a "value", b + c AS sum FROM ...
    <note>
     <para>
      The naming of output columns here is different from that done in
-     the <literal>FROM</> clause (see <xref
-     linkend="queries-table-aliases">).  It is possible
+     the <literal>FROM</literal> clause (see <xref
+     linkend="queries-table-aliases"/>).  It is possible
      to rename the same column twice, but the name assigned in
      the select list is the one that will be passed on.
     </para>
@@ -1544,13 +1544,13 @@ SELECT a "value", b + c AS sum FROM ...
 <synopsis>
 SELECT DISTINCT <replaceable>select_list</replaceable> ...
 </synopsis>
-    (Instead of <literal>DISTINCT</> the key word <literal>ALL</literal>
+    (Instead of <literal>DISTINCT</literal> the key word <literal>ALL</literal>
     can be used to specify the default behavior of retaining all rows.)
    </para>
 
    <indexterm>
-    <primary>null value</>
-    <secondary sortas="DISTINCT">in DISTINCT</>
+    <primary>null value</primary>
+    <secondary sortas="DISTINCT">in DISTINCT</secondary>
    </indexterm>
 
    <para>
@@ -1571,16 +1571,16 @@ SELECT DISTINCT ON (<replaceable>expression</replaceable> <optional>, <replaceab
     only the first row of the set is kept in the output.  Note that
     the <quote>first row</quote> of a set is unpredictable unless the
     query is sorted on enough columns to guarantee a unique ordering
-    of the rows arriving at the <literal>DISTINCT</> filter.
-    (<literal>DISTINCT ON</> processing occurs after <literal>ORDER
-    BY</> sorting.)
+    of the rows arriving at the <literal>DISTINCT</literal> filter.
+    (<literal>DISTINCT ON</literal> processing occurs after <literal>ORDER
+    BY</literal> sorting.)
    </para>
 
    <para>
-    The <literal>DISTINCT ON</> clause is not part of the SQL standard
+    The <literal>DISTINCT ON</literal> clause is not part of the SQL standard
     and is sometimes considered bad style because of the potentially
     indeterminate nature of its results.  With judicious use of
-    <literal>GROUP BY</> and subqueries in <literal>FROM</>, this
+    <literal>GROUP BY</literal> and subqueries in <literal>FROM</literal>, this
     construct can be avoided, but it is often the most convenient
     alternative.
    </para>
@@ -1635,27 +1635,27 @@ SELECT DISTINCT ON (<replaceable>expression</replaceable> <optional>, <replaceab
   </para>
 
   <para>
-   <literal>UNION</> effectively appends the result of
+   <literal>UNION</literal> effectively appends the result of
    <replaceable>query2</replaceable> to the result of
    <replaceable>query1</replaceable> (although there is no guarantee
    that this is the order in which the rows are actually returned).
    Furthermore, it eliminates duplicate rows from its result, in the same
-   way as <literal>DISTINCT</>, unless <literal>UNION ALL</> is used.
+   way as <literal>DISTINCT</literal>, unless <literal>UNION ALL</literal> is used.
   </para>
 
   <para>
-   <literal>INTERSECT</> returns all rows that are both in the result
+   <literal>INTERSECT</literal> returns all rows that are both in the result
    of <replaceable>query1</replaceable> and in the result of
    <replaceable>query2</replaceable>.  Duplicate rows are eliminated
-   unless <literal>INTERSECT ALL</> is used.
+   unless <literal>INTERSECT ALL</literal> is used.
   </para>
 
   <para>
-   <literal>EXCEPT</> returns all rows that are in the result of
+   <literal>EXCEPT</literal> returns all rows that are in the result of
    <replaceable>query1</replaceable> but not in the result of
    <replaceable>query2</replaceable>.  (This is sometimes called the
-   <firstterm>difference</> between two queries.)  Again, duplicates
-   are eliminated unless <literal>EXCEPT ALL</> is used.
+   <firstterm>difference</firstterm> between two queries.)  Again, duplicates
+   are eliminated unless <literal>EXCEPT ALL</literal> is used.
   </para>
 
   <para>
@@ -1663,7 +1663,7 @@ SELECT DISTINCT ON (<replaceable>expression</replaceable> <optional>, <replaceab
    queries, the two queries must be <quote>union compatible</quote>,
    which means that they return the same number of columns and
    the corresponding columns have compatible data types, as
-   described in <xref linkend="typeconv-union-case">.
+   described in <xref linkend="typeconv-union-case"/>.
   </para>
  </sect1>
 
@@ -1690,7 +1690,7 @@ SELECT DISTINCT ON (<replaceable>expression</replaceable> <optional>, <replaceab
   </para>
 
   <para>
-   The <literal>ORDER BY</> clause specifies the sort order:
+   The <literal>ORDER BY</literal> clause specifies the sort order:
 <synopsis>
 SELECT <replaceable>select_list</replaceable>
     FROM <replaceable>table_expression</replaceable>
@@ -1705,17 +1705,17 @@ SELECT a, b FROM table1 ORDER BY a + b, c;
    When more than one expression is specified,
    the later values are used to sort rows that are equal according to the
    earlier values.  Each expression can be followed by an optional
-   <literal>ASC</> or <literal>DESC</> keyword to set the sort direction to
-   ascending or descending.  <literal>ASC</> order is the default.
+   <literal>ASC</literal> or <literal>DESC</literal> keyword to set the sort direction to
+   ascending or descending.  <literal>ASC</literal> order is the default.
    Ascending order puts smaller values first, where
    <quote>smaller</quote> is defined in terms of the
    <literal>&lt;</literal> operator.  Similarly, descending order is
    determined with the <literal>&gt;</literal> operator.
     <footnote>
      <para>
-      Actually, <productname>PostgreSQL</> uses the <firstterm>default B-tree
-      operator class</> for the expression's data type to determine the sort
-      ordering for <literal>ASC</> and <literal>DESC</>.  Conventionally,
+      Actually, <productname>PostgreSQL</productname> uses the <firstterm>default B-tree
+      operator class</firstterm> for the expression's data type to determine the sort
+      ordering for <literal>ASC</literal> and <literal>DESC</literal>.  Conventionally,
       data types will be set up so that the <literal>&lt;</literal> and
       <literal>&gt;</literal> operators correspond to this sort ordering,
       but a user-defined data type's designer could choose to do something
@@ -1725,22 +1725,22 @@ SELECT a, b FROM table1 ORDER BY a + b, c;
   </para>
 
   <para>
-   The <literal>NULLS FIRST</> and <literal>NULLS LAST</> options can be
+   The <literal>NULLS FIRST</literal> and <literal>NULLS LAST</literal> options can be
    used to determine whether nulls appear before or after non-null values
    in the sort ordering.  By default, null values sort as if larger than any
-   non-null value; that is, <literal>NULLS FIRST</> is the default for
-   <literal>DESC</> order, and <literal>NULLS LAST</> otherwise.
+   non-null value; that is, <literal>NULLS FIRST</literal> is the default for
+   <literal>DESC</literal> order, and <literal>NULLS LAST</literal> otherwise.
   </para>
 
   <para>
    Note that the ordering options are considered independently for each
-   sort column.  For example <literal>ORDER BY x, y DESC</> means
-   <literal>ORDER BY x ASC, y DESC</>, which is not the same as
-   <literal>ORDER BY x DESC, y DESC</>.
+   sort column.  For example <literal>ORDER BY x, y DESC</literal> means
+   <literal>ORDER BY x ASC, y DESC</literal>, which is not the same as
+   <literal>ORDER BY x DESC, y DESC</literal>.
   </para>
 
   <para>
-   A <replaceable>sort_expression</> can also be the column label or number
+   A <replaceable>sort_expression</replaceable> can also be the column label or number
    of an output column, as in:
 <programlisting>
 SELECT a + b AS sum, c FROM table1 ORDER BY sum;
@@ -1748,21 +1748,21 @@ SELECT a, max(b) FROM table1 GROUP BY a ORDER BY 1;
 </programlisting>
    both of which sort by the first output column.  Note that an output
    column name has to stand alone, that is, it cannot be used in an expression
-   &mdash; for example, this is <emphasis>not</> correct:
+   &mdash; for example, this is <emphasis>not</emphasis> correct:
 <programlisting>
 SELECT a + b AS sum, c FROM table1 ORDER BY sum + c;          -- wrong
 </programlisting>
    This restriction is made to reduce ambiguity.  There is still
-   ambiguity if an <literal>ORDER BY</> item is a simple name that
+   ambiguity if an <literal>ORDER BY</literal> item is a simple name that
    could match either an output column name or a column from the table
    expression.  The output column is used in such cases.  This would
-   only cause confusion if you use <literal>AS</> to rename an output
+   only cause confusion if you use <literal>AS</literal> to rename an output
    column to match some other table column's name.
   </para>
 
   <para>
-   <literal>ORDER BY</> can be applied to the result of a
-   <literal>UNION</>, <literal>INTERSECT</>, or <literal>EXCEPT</>
+   <literal>ORDER BY</literal> can be applied to the result of a
+   <literal>UNION</literal>, <literal>INTERSECT</literal>, or <literal>EXCEPT</literal>
    combination, but in this case it is only permitted to sort by
    output column names or numbers, not by expressions.
   </para>
@@ -1781,7 +1781,7 @@ SELECT a + b AS sum, c FROM table1 ORDER BY sum + c;          -- wrong
   </indexterm>
 
   <para>
-   <literal>LIMIT</> and <literal>OFFSET</> allow you to retrieve just
+   <literal>LIMIT</literal> and <literal>OFFSET</literal> allow you to retrieve just
    a portion of the rows that are generated by the rest of the query:
 <synopsis>
 SELECT <replaceable>select_list</replaceable>
@@ -1794,49 +1794,49 @@ SELECT <replaceable>select_list</replaceable>
   <para>
    If a limit count is given, no more than that many rows will be
    returned (but possibly fewer, if the query itself yields fewer rows).
-   <literal>LIMIT ALL</> is the same as omitting the <literal>LIMIT</>
-   clause, as is <literal>LIMIT</> with a NULL argument.
+   <literal>LIMIT ALL</literal> is the same as omitting the <literal>LIMIT</literal>
+   clause, as is <literal>LIMIT</literal> with a NULL argument.
   </para>
 
   <para>
-   <literal>OFFSET</> says to skip that many rows before beginning to
-   return rows.  <literal>OFFSET 0</> is the same as omitting the
-   <literal>OFFSET</> clause, as is <literal>OFFSET</> with a NULL argument.
+   <literal>OFFSET</literal> says to skip that many rows before beginning to
+   return rows.  <literal>OFFSET 0</literal> is the same as omitting the
+   <literal>OFFSET</literal> clause, as is <literal>OFFSET</literal> with a NULL argument.
   </para>
 
   <para>
-   If both <literal>OFFSET</>
-   and <literal>LIMIT</> appear, then <literal>OFFSET</> rows are
-   skipped before starting to count the <literal>LIMIT</> rows that
+   If both <literal>OFFSET</literal>
+   and <literal>LIMIT</literal> appear, then <literal>OFFSET</literal> rows are
+   skipped before starting to count the <literal>LIMIT</literal> rows that
    are returned.
   </para>
 
   <para>
-   When using <literal>LIMIT</>, it is important to use an
-   <literal>ORDER BY</> clause that constrains the result rows into a
+   When using <literal>LIMIT</literal>, it is important to use an
+   <literal>ORDER BY</literal> clause that constrains the result rows into a
    unique order.  Otherwise you will get an unpredictable subset of
    the query's rows. You might be asking for the tenth through
    twentieth rows, but tenth through twentieth in what ordering? The
-   ordering is unknown, unless you specified <literal>ORDER BY</>.
+   ordering is unknown, unless you specified <literal>ORDER BY</literal>.
   </para>
 
   <para>
-   The query optimizer takes <literal>LIMIT</> into account when
+   The query optimizer takes <literal>LIMIT</literal> into account when
    generating query plans, so you are very likely to get different
    plans (yielding different row orders) depending on what you give
-   for <literal>LIMIT</> and <literal>OFFSET</>.  Thus, using
-   different <literal>LIMIT</>/<literal>OFFSET</> values to select
+   for <literal>LIMIT</literal> and <literal>OFFSET</literal>.  Thus, using
+   different <literal>LIMIT</literal>/<literal>OFFSET</literal> values to select
    different subsets of a query result <emphasis>will give
    inconsistent results</emphasis> unless you enforce a predictable
-   result ordering with <literal>ORDER BY</>.  This is not a bug; it
+   result ordering with <literal>ORDER BY</literal>.  This is not a bug; it
    is an inherent consequence of the fact that SQL does not promise to
    deliver the results of a query in any particular order unless
-   <literal>ORDER BY</> is used to constrain the order.
+   <literal>ORDER BY</literal> is used to constrain the order.
   </para>
 
   <para>
-   The rows skipped by an <literal>OFFSET</> clause still have to be
-   computed inside the server; therefore a large <literal>OFFSET</>
+   The rows skipped by an <literal>OFFSET</literal> clause still have to be
+   computed inside the server; therefore a large <literal>OFFSET</literal>
    might be inefficient.
   </para>
  </sect1>
@@ -1850,18 +1850,18 @@ SELECT <replaceable>select_list</replaceable>
   </indexterm>
 
   <para>
-   <literal>VALUES</> provides a way to generate a <quote>constant table</>
+   <literal>VALUES</literal> provides a way to generate a <quote>constant table</quote>
    that can be used in a query without having to actually create and populate
    a table on-disk.  The syntax is
 <synopsis>
-VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ...]
+VALUES ( <replaceable class="parameter">expression</replaceable> [, ...] ) [, ...]
 </synopsis>
    Each parenthesized list of expressions generates a row in the table.
    The lists must all have the same number of elements (i.e., the number
    of columns in the table), and corresponding entries in each list must
    have compatible data types.  The actual data type assigned to each column
-   of the result is determined using the same rules as for <literal>UNION</>
-   (see <xref linkend="typeconv-union-case">).
+   of the result is determined using the same rules as for <literal>UNION</literal>
+   (see <xref linkend="typeconv-union-case"/>).
   </para>
 
   <para>
@@ -1881,8 +1881,8 @@ SELECT 3, 'three';
 </programlisting>
 
    By default, <productname>PostgreSQL</productname> assigns the names
-   <literal>column1</>, <literal>column2</>, etc. to the columns of a
-   <literal>VALUES</> table.  The column names are not specified by the
+   <literal>column1</literal>, <literal>column2</literal>, etc. to the columns of a
+   <literal>VALUES</literal> table.  The column names are not specified by the
    SQL standard and different database systems do it differently, so
    it's usually better to override the default names with a table alias
    list, like this:
@@ -1898,21 +1898,21 @@ SELECT 3, 'three';
   </para>
 
   <para>
-   Syntactically, <literal>VALUES</> followed by expression lists is
+   Syntactically, <literal>VALUES</literal> followed by expression lists is
    treated as equivalent to:
 <synopsis>
 SELECT <replaceable>select_list</replaceable> FROM <replaceable>table_expression</replaceable>
 </synopsis>
-   and can appear anywhere a <literal>SELECT</> can.  For example, you can
-   use it as part of a <literal>UNION</>, or attach a
-   <replaceable>sort_specification</replaceable> (<literal>ORDER BY</>,
-   <literal>LIMIT</>, and/or <literal>OFFSET</>) to it.  <literal>VALUES</>
-   is most commonly used as the data source in an <command>INSERT</> command,
+   and can appear anywhere a <literal>SELECT</literal> can.  For example, you can
+   use it as part of a <literal>UNION</literal>, or attach a
+   <replaceable>sort_specification</replaceable> (<literal>ORDER BY</literal>,
+   <literal>LIMIT</literal>, and/or <literal>OFFSET</literal>) to it.  <literal>VALUES</literal>
+   is most commonly used as the data source in an <command>INSERT</command> command,
    and next most commonly as a subquery.
   </para>
 
   <para>
-   For more information see <xref linkend="sql-values">.
+   For more information see <xref linkend="sql-values"/>.
   </para>
 
  </sect1>
@@ -1932,22 +1932,22 @@ SELECT <replaceable>select_list</replaceable> FROM <replaceable>table_expression
   </indexterm>
 
   <para>
-   <literal>WITH</> provides a way to write auxiliary statements for use in a
+   <literal>WITH</literal> provides a way to write auxiliary statements for use in a
    larger query.  These statements, which are often referred to as Common
    Table Expressions or <acronym>CTE</acronym>s, can be thought of as defining
    temporary tables that exist just for one query.  Each auxiliary statement
-   in a <literal>WITH</> clause can be a <command>SELECT</>,
-   <command>INSERT</>, <command>UPDATE</>, or <command>DELETE</>; and the
-   <literal>WITH</> clause itself is attached to a primary statement that can
-   also be a <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>, or
-   <command>DELETE</>.
+   in a <literal>WITH</literal> clause can be a <command>SELECT</command>,
+   <command>INSERT</command>, <command>UPDATE</command>, or <command>DELETE</command>; and the
+   <literal>WITH</literal> clause itself is attached to a primary statement that can
+   also be a <command>SELECT</command>, <command>INSERT</command>, <command>UPDATE</command>, or
+   <command>DELETE</command>.
   </para>
 
  <sect2 id="queries-with-select">
-   <title><command>SELECT</> in <literal>WITH</></title>
+   <title><command>SELECT</command> in <literal>WITH</literal></title>
 
   <para>
-   The basic value of <command>SELECT</> in <literal>WITH</> is to
+   The basic value of <command>SELECT</command> in <literal>WITH</literal> is to
    break down complicated queries into simpler parts.  An example is:
 
 <programlisting>
@@ -1970,21 +1970,21 @@ GROUP BY region, product;
 </programlisting>
 
    which displays per-product sales totals in only the top sales regions.
-   The <literal>WITH</> clause defines two auxiliary statements named
-   <structname>regional_sales</> and <structname>top_regions</>,
-   where the output of <structname>regional_sales</> is used in
-   <structname>top_regions</> and the output of <structname>top_regions</>
-   is used in the primary <command>SELECT</> query.
-   This example could have been written without <literal>WITH</>,
+   The <literal>WITH</literal> clause defines two auxiliary statements named
+   <structname>regional_sales</structname> and <structname>top_regions</structname>,
+   where the output of <structname>regional_sales</structname> is used in
+   <structname>top_regions</structname> and the output of <structname>top_regions</structname>
+   is used in the primary <command>SELECT</command> query.
+   This example could have been written without <literal>WITH</literal>,
    but we'd have needed two levels of nested sub-<command>SELECT</command>s.  It's a bit
    easier to follow this way.
   </para>
 
   <para>
-   The optional <literal>RECURSIVE</> modifier changes <literal>WITH</>
+   The optional <literal>RECURSIVE</literal> modifier changes <literal>WITH</literal>
    from a mere syntactic convenience into a feature that accomplishes
    things not otherwise possible in standard SQL.  Using
-   <literal>RECURSIVE</>, a <literal>WITH</> query can refer to its own
+   <literal>RECURSIVE</literal>, a <literal>WITH</literal> query can refer to its own
    output.  A very simple example is this query to sum the integers from 1
    through 100:
 
@@ -1997,10 +1997,10 @@ WITH RECURSIVE t(n) AS (
 SELECT sum(n) FROM t;
 </programlisting>
 
-   The general form of a recursive <literal>WITH</> query is always a
-   <firstterm>non-recursive term</>, then <literal>UNION</> (or
-   <literal>UNION ALL</>), then a
-   <firstterm>recursive term</>, where only the recursive term can contain
+   The general form of a recursive <literal>WITH</literal> query is always a
+   <firstterm>non-recursive term</firstterm>, then <literal>UNION</literal> (or
+   <literal>UNION ALL</literal>), then a
+   <firstterm>recursive term</firstterm>, where only the recursive term can contain
    a reference to the query's own output.  Such a query is executed as
    follows:
   </para>
@@ -2010,10 +2010,10 @@ SELECT sum(n) FROM t;
 
    <step performance="required">
     <para>
-     Evaluate the non-recursive term.  For <literal>UNION</> (but not
-     <literal>UNION ALL</>), discard duplicate rows.  Include all remaining
+     Evaluate the non-recursive term.  For <literal>UNION</literal> (but not
+     <literal>UNION ALL</literal>), discard duplicate rows.  Include all remaining
      rows in the result of the recursive query, and also place them in a
-     temporary <firstterm>working table</>.
+     temporary <firstterm>working table</firstterm>.
     </para>
    </step>
 
@@ -2026,10 +2026,10 @@ SELECT sum(n) FROM t;
       <para>
        Evaluate the recursive term, substituting the current contents of
        the working table for the recursive self-reference.
-       For <literal>UNION</> (but not <literal>UNION ALL</>), discard
+       For <literal>UNION</literal> (but not <literal>UNION ALL</literal>), discard
        duplicate rows and rows that duplicate any previous result row.
        Include all remaining rows in the result of the recursive query, and
-       also place them in a temporary <firstterm>intermediate table</>.
+       also place them in a temporary <firstterm>intermediate table</firstterm>.
       </para>
      </step>
 
@@ -2046,7 +2046,7 @@ SELECT sum(n) FROM t;
   <note>
    <para>
     Strictly speaking, this process is iteration not recursion, but
-    <literal>RECURSIVE</> is the terminology chosen by the SQL standards
+    <literal>RECURSIVE</literal> is the terminology chosen by the SQL standards
     committee.
    </para>
   </note>
@@ -2054,7 +2054,7 @@ SELECT sum(n) FROM t;
   <para>
    In the example above, the working table has just a single row in each step,
    and it takes on the values from 1 through 100 in successive steps.  In
-   the 100th step, there is no output because of the <literal>WHERE</>
+   the 100th step, there is no output because of the <literal>WHERE</literal>
    clause, and so the query terminates.
   </para>
 
@@ -2082,14 +2082,14 @@ GROUP BY sub_part
    When working with recursive queries it is important to be sure that
    the recursive part of the query will eventually return no tuples,
    or else the query will loop indefinitely.  Sometimes, using
-   <literal>UNION</> instead of <literal>UNION ALL</> can accomplish this
+   <literal>UNION</literal> instead of <literal>UNION ALL</literal> can accomplish this
    by discarding rows that duplicate previous output rows.  However, often a
    cycle does not involve output rows that are completely duplicate: it may be
    necessary to check just one or a few fields to see if the same point has
    been reached before.  The standard method for handling such situations is
    to compute an array of the already-visited values.  For example, consider
-   the following query that searches a table <structname>graph</> using a
-   <structfield>link</> field:
+   the following query that searches a table <structname>graph</structname> using a
+   <structfield>link</structfield> field:
 
 <programlisting>
 WITH RECURSIVE search_graph(id, link, data, depth) AS (
@@ -2103,12 +2103,12 @@ WITH RECURSIVE search_graph(id, link, data, depth) AS (
 SELECT * FROM search_graph;
 </programlisting>
 
-   This query will loop if the <structfield>link</> relationships contain
-   cycles.  Because we require a <quote>depth</> output, just changing
-   <literal>UNION ALL</> to <literal>UNION</> would not eliminate the looping.
+   This query will loop if the <structfield>link</structfield> relationships contain
+   cycles.  Because we require a <quote>depth</quote> output, just changing
+   <literal>UNION ALL</literal> to <literal>UNION</literal> would not eliminate the looping.
    Instead we need to recognize whether we have reached the same row again
    while following a particular path of links.  We add two columns
-   <structfield>path</> and <structfield>cycle</> to the loop-prone query:
+   <structfield>path</structfield> and <structfield>cycle</structfield> to the loop-prone query:
 
 <programlisting>
 WITH RECURSIVE search_graph(id, link, data, depth, path, cycle) AS (
@@ -2127,13 +2127,13 @@ SELECT * FROM search_graph;
 </programlisting>
 
    Aside from preventing cycles, the array value is often useful in its own
-   right as representing the <quote>path</> taken to reach any particular row.
+   right as representing the <quote>path</quote> taken to reach any particular row.
   </para>
 
   <para>
    In the general case where more than one field needs to be checked to
    recognize a cycle, use an array of rows.  For example, if we needed to
-   compare fields <structfield>f1</> and <structfield>f2</>:
+   compare fields <structfield>f1</structfield> and <structfield>f2</structfield>:
 
 <programlisting>
 WITH RECURSIVE search_graph(id, link, data, depth, path, cycle) AS (
@@ -2154,7 +2154,7 @@ SELECT * FROM search_graph;
 
   <tip>
    <para>
-    Omit the <literal>ROW()</> syntax in the common case where only one field
+    Omit the <literal>ROW()</literal> syntax in the common case where only one field
     needs to be checked to recognize a cycle.  This allows a simple array
     rather than a composite-type array to be used, gaining efficiency.
    </para>
@@ -2164,16 +2164,16 @@ SELECT * FROM search_graph;
    <para>
     The recursive query evaluation algorithm produces its output in
     breadth-first search order.  You can display the results in depth-first
-    search order by making the outer query <literal>ORDER BY</> a
-    <quote>path</> column constructed in this way.
+    search order by making the outer query <literal>ORDER BY</literal> a
+    <quote>path</quote> column constructed in this way.
    </para>
   </tip>
 
   <para>
    A helpful trick for testing queries
-   when you are not certain if they might loop is to place a <literal>LIMIT</>
+   when you are not certain if they might loop is to place a <literal>LIMIT</literal>
    in the parent query.  For example, this query would loop forever without
-   the <literal>LIMIT</>:
+   the <literal>LIMIT</literal>:
 
 <programlisting>
 WITH RECURSIVE t(n) AS (
@@ -2185,26 +2185,26 @@ SELECT n FROM t LIMIT 100;
 </programlisting>
 
    This works because <productname>PostgreSQL</productname>'s implementation
-   evaluates only as many rows of a <literal>WITH</> query as are actually
+   evaluates only as many rows of a <literal>WITH</literal> query as are actually
    fetched by the parent query.  Using this trick in production is not
    recommended, because other systems might work differently.  Also, it
    usually won't work if you make the outer query sort the recursive query's
    results or join them to some other table, because in such cases the
-   outer query will usually try to fetch all of the <literal>WITH</> query's
+   outer query will usually try to fetch all of the <literal>WITH</literal> query's
    output anyway.
   </para>
 
   <para>
-   A useful property of <literal>WITH</> queries is that they are evaluated
+   A useful property of <literal>WITH</literal> queries is that they are evaluated
    only once per execution of the parent query, even if they are referred to
-   more than once by the parent query or sibling <literal>WITH</> queries.
+   more than once by the parent query or sibling <literal>WITH</literal> queries.
    Thus, expensive calculations that are needed in multiple places can be
-   placed within a <literal>WITH</> query to avoid redundant work.  Another
+   placed within a <literal>WITH</literal> query to avoid redundant work.  Another
    possible application is to prevent unwanted multiple evaluations of
    functions with side-effects.
    However, the other side of this coin is that the optimizer is less able to
-   push restrictions from the parent query down into a <literal>WITH</> query
-   than an ordinary subquery.  The <literal>WITH</> query will generally be
+   push restrictions from the parent query down into a <literal>WITH</literal> query
+   than an ordinary subquery.  The <literal>WITH</literal> query will generally be
    evaluated as written, without suppression of rows that the parent query
    might discard afterwards.  (But, as mentioned above, evaluation might stop
    early if the reference(s) to the query demand only a limited number of
@@ -2212,20 +2212,20 @@ SELECT n FROM t LIMIT 100;
   </para>
 
   <para>
-   The examples above only show <literal>WITH</> being used with
-   <command>SELECT</>, but it can be attached in the same way to
-   <command>INSERT</>, <command>UPDATE</>, or <command>DELETE</>.
+   The examples above only show <literal>WITH</literal> being used with
+   <command>SELECT</command>, but it can be attached in the same way to
+   <command>INSERT</command>, <command>UPDATE</command>, or <command>DELETE</command>.
    In each case it effectively provides temporary table(s) that can
    be referred to in the main command.
   </para>
  </sect2>
 
  <sect2 id="queries-with-modifying">
-   <title>Data-Modifying Statements in <literal>WITH</></title>
+   <title>Data-Modifying Statements in <literal>WITH</literal></title>
 
    <para>
-    You can use data-modifying statements (<command>INSERT</>,
-    <command>UPDATE</>, or <command>DELETE</>) in <literal>WITH</>.  This
+    You can use data-modifying statements (<command>INSERT</command>,
+    <command>UPDATE</command>, or <command>DELETE</command>) in <literal>WITH</literal>.  This
     allows you to perform several different operations in the same query.
     An example is:
 
@@ -2241,32 +2241,32 @@ INSERT INTO products_log
 SELECT * FROM moved_rows;
 </programlisting>
 
-    This query effectively moves rows from <structname>products</> to
-    <structname>products_log</>.  The <command>DELETE</> in <literal>WITH</>
-    deletes the specified rows from <structname>products</>, returning their
-    contents by means of its <literal>RETURNING</> clause; and then the
+    This query effectively moves rows from <structname>products</structname> to
+    <structname>products_log</structname>.  The <command>DELETE</command> in <literal>WITH</literal>
+    deletes the specified rows from <structname>products</structname>, returning their
+    contents by means of its <literal>RETURNING</literal> clause; and then the
     primary query reads that output and inserts it into
-    <structname>products_log</>.
+    <structname>products_log</structname>.
    </para>
 
    <para>
-    A fine point of the above example is that the <literal>WITH</> clause is
-    attached to the <command>INSERT</>, not the sub-<command>SELECT</> within
-    the <command>INSERT</>.  This is necessary because data-modifying
-    statements are only allowed in <literal>WITH</> clauses that are attached
-    to the top-level statement.  However, normal <literal>WITH</> visibility
-    rules apply, so it is possible to refer to the <literal>WITH</>
-    statement's output from the sub-<command>SELECT</>.
+    A fine point of the above example is that the <literal>WITH</literal> clause is
+    attached to the <command>INSERT</command>, not the sub-<command>SELECT</command> within
+    the <command>INSERT</command>.  This is necessary because data-modifying
+    statements are only allowed in <literal>WITH</literal> clauses that are attached
+    to the top-level statement.  However, normal <literal>WITH</literal> visibility
+    rules apply, so it is possible to refer to the <literal>WITH</literal>
+    statement's output from the sub-<command>SELECT</command>.
    </para>
 
    <para>
-    Data-modifying statements in <literal>WITH</> usually have
-    <literal>RETURNING</> clauses (see <xref linkend="dml-returning">),
+    Data-modifying statements in <literal>WITH</literal> usually have
+    <literal>RETURNING</literal> clauses (see <xref linkend="dml-returning"/>),
     as shown in the example above.
-    It is the output of the <literal>RETURNING</> clause, <emphasis>not</> the
+    It is the output of the <literal>RETURNING</literal> clause, <emphasis>not</emphasis> the
     target table of the data-modifying statement, that forms the temporary
     table that can be referred to by the rest of the query.  If a
-    data-modifying statement in <literal>WITH</> lacks a <literal>RETURNING</>
+    data-modifying statement in <literal>WITH</literal> lacks a <literal>RETURNING</literal>
     clause, then it forms no temporary table and cannot be referred to in
     the rest of the query.  Such a statement will be executed nonetheless.
     A not-particularly-useful example is:
@@ -2278,15 +2278,15 @@ WITH t AS (
 DELETE FROM bar;
 </programlisting>
 
-    This example would remove all rows from tables <structname>foo</> and
-    <structname>bar</>.  The number of affected rows reported to the client
-    would only include rows removed from <structname>bar</>.
+    This example would remove all rows from tables <structname>foo</structname> and
+    <structname>bar</structname>.  The number of affected rows reported to the client
+    would only include rows removed from <structname>bar</structname>.
    </para>
 
    <para>
     Recursive self-references in data-modifying statements are not
     allowed.  In some cases it is possible to work around this limitation by
-    referring to the output of a recursive <literal>WITH</>, for example:
+    referring to the output of a recursive <literal>WITH</literal>, for example:
 
 <programlisting>
 WITH RECURSIVE included_parts(sub_part, part) AS (
@@ -2304,24 +2304,24 @@ DELETE FROM parts
    </para>
 
    <para>
-    Data-modifying statements in <literal>WITH</> are executed exactly once,
+    Data-modifying statements in <literal>WITH</literal> are executed exactly once,
     and always to completion, independently of whether the primary query
     reads all (or indeed any) of their output.  Notice that this is different
-    from the rule for <command>SELECT</> in <literal>WITH</>: as stated in the
-    previous section, execution of a <command>SELECT</> is carried only as far
+    from the rule for <command>SELECT</command> in <literal>WITH</literal>: as stated in the
+    previous section, execution of a <command>SELECT</command> is carried only as far
     as the primary query demands its output.
    </para>
 
    <para>
-    The sub-statements in <literal>WITH</> are executed concurrently with
+    The sub-statements in <literal>WITH</literal> are executed concurrently with
     each other and with the main query.  Therefore, when using data-modifying
-    statements in <literal>WITH</>, the order in which the specified updates
+    statements in <literal>WITH</literal>, the order in which the specified updates
     actually happen is unpredictable.  All the statements are executed with
-    the same <firstterm>snapshot</> (see <xref linkend="mvcc">), so they
-    cannot <quote>see</> one another's effects on the target tables.  This
+    the same <firstterm>snapshot</firstterm> (see <xref linkend="mvcc"/>), so they
+    cannot <quote>see</quote> one another's effects on the target tables.  This
     alleviates the effects of the unpredictability of the actual order of row
-    updates, and means that <literal>RETURNING</> data is the only way to
-    communicate changes between different <literal>WITH</> sub-statements and
+    updates, and means that <literal>RETURNING</literal> data is the only way to
+    communicate changes between different <literal>WITH</literal> sub-statements and
     the main query.  An example of this is that in
 
 <programlisting>
@@ -2332,8 +2332,8 @@ WITH t AS (
 SELECT * FROM products;
 </programlisting>
 
-    the outer <command>SELECT</> would return the original prices before the
-    action of the <command>UPDATE</>, while in
+    the outer <command>SELECT</command> would return the original prices before the
+    action of the <command>UPDATE</command>, while in
 
 <programlisting>
 WITH t AS (
@@ -2343,7 +2343,7 @@ WITH t AS (
 SELECT * FROM t;
 </programlisting>
 
-    the outer <command>SELECT</> would return the updated data.
+    the outer <command>SELECT</command> would return the updated data.
    </para>
 
    <para>
@@ -2353,15 +2353,15 @@ SELECT * FROM t;
     applies to deleting a row that was already updated in the same statement:
     only the update is performed.  Therefore you should generally avoid trying
     to modify a single row twice in a single statement.  In particular avoid
-    writing <literal>WITH</> sub-statements that could affect the same rows
+    writing <literal>WITH</literal> sub-statements that could affect the same rows
     changed by the main statement or a sibling sub-statement.  The effects
     of such a statement will not be predictable.
    </para>
 
    <para>
     At present, any table used as the target of a data-modifying statement in
-    <literal>WITH</> must not have a conditional rule, nor an <literal>ALSO</>
-    rule, nor an <literal>INSTEAD</> rule that expands to multiple statements.
+    <literal>WITH</literal> must not have a conditional rule, nor an <literal>ALSO</literal>
+    rule, nor an <literal>INSTEAD</literal> rule that expands to multiple statements.
    </para>
 
   </sect2>
diff --git a/doc/src/sgml/query.sgml b/doc/src/sgml/query.sgml
index 98434925df..c0889743c4 100644
--- a/doc/src/sgml/query.sgml
+++ b/doc/src/sgml/query.sgml
@@ -12,7 +12,7 @@
     tutorial is only intended to give you an introduction and is in no
     way a complete tutorial on <acronym>SQL</acronym>.  Numerous books
     have been written on <acronym>SQL</acronym>, including <xref
-    linkend="MELT93"> and <xref linkend="DATE97">.
+    linkend="melt93"/> and <xref linkend="date97"/>.
     You should be aware that some <productname>PostgreSQL</productname>
     language features are extensions to the standard.
    </para>
@@ -29,7 +29,7 @@
     in the directory <filename>src/tutorial/</filename>.  (Binary
     distributions of <productname>PostgreSQL</productname> might not
     compile these files.)  To use those
-    files, first change to that directory and run <application>make</>:
+    files, first change to that directory and run <application>make</application>:
 
 <screen>
 <prompt>$</prompt> <userinput>cd <replaceable>....</replaceable>/src/tutorial</userinput>
@@ -50,7 +50,7 @@
 </screen>
 
     The <literal>\i</literal> command reads in commands from the
-    specified file. <command>psql</command>'s <literal>-s</> option puts you in
+    specified file. <command>psql</command>'s <literal>-s</literal> option puts you in
     single step mode which pauses before sending each statement to the
     server.  The commands used in this section are in the file
     <filename>basics.sql</filename>.
@@ -155,8 +155,8 @@ CREATE TABLE weather (
     <productname>PostgreSQL</productname> supports the standard
     <acronym>SQL</acronym> types <type>int</type>,
     <type>smallint</type>, <type>real</type>, <type>double
-    precision</type>, <type>char(<replaceable>N</>)</type>,
-    <type>varchar(<replaceable>N</>)</type>, <type>date</type>,
+    precision</type>, <type>char(<replaceable>N</replaceable>)</type>,
+    <type>varchar(<replaceable>N</replaceable>)</type>, <type>date</type>,
     <type>time</type>, <type>timestamp</type>, and
     <type>interval</type>, as well as other types of general utility
     and a rich set of geometric types.
@@ -211,7 +211,7 @@ INSERT INTO weather VALUES ('San Francisco', 46, 50, 0.25, '1994-11-27');
 
     Note that all data types use rather obvious input formats.
     Constants that are not simple numeric values usually must be
-    surrounded by single quotes (<literal>'</>), as in the example.
+    surrounded by single quotes (<literal>'</literal>), as in the example.
     The
     <type>date</type> type is actually quite flexible in what it
     accepts, but for this tutorial we will stick to the unambiguous
@@ -267,7 +267,7 @@ COPY weather FROM '/home/user/weather.txt';
     where the file name for the source file must be available on the
     machine running the backend process, not the client, since the backend process
     reads the file directly.  You can read more about the
-    <command>COPY</command> command in <xref linkend="sql-copy">.
+    <command>COPY</command> command in <xref linkend="sql-copy"/>.
    </para>
   </sect1>
 
@@ -336,8 +336,8 @@ SELECT city, (temp_hi+temp_lo)/2 AS temp_avg, date FROM weather;
    </para>
 
    <para>
-    A query can be <quote>qualified</> by adding a <literal>WHERE</>
-    clause that specifies which rows are wanted.  The <literal>WHERE</>
+    A query can be <quote>qualified</quote> by adding a <literal>WHERE</literal>
+    clause that specifies which rows are wanted.  The <literal>WHERE</literal>
     clause contains a Boolean (truth value) expression, and only rows for
     which the Boolean expression is true are returned.  The usual
     Boolean operators (<literal>AND</literal>,
@@ -446,9 +446,9 @@ SELECT DISTINCT city
     of the same or different tables at one time is called a
     <firstterm>join</firstterm> query.  As an example, say you wish to
     list all the weather records together with the location of the
-    associated city.  To do that, we need to compare the <structfield>city</>
-    column of each row of the <structname>weather</> table with the
-    <structfield>name</> column of all rows in the <structname>cities</>
+    associated city.  To do that, we need to compare the <structfield>city</structfield>
+    column of each row of the <structname>weather</structname> table with the
+    <structfield>name</structfield> column of all rows in the <structname>cities</structname>
     table, and select the pairs of rows where these values match.
     <note>
      <para>
@@ -483,7 +483,7 @@ SELECT *
        There is no result row for the city of Hayward.  This is
        because there is no matching entry in the
        <structname>cities</structname> table for Hayward, so the join
-       ignores the unmatched rows in the <structname>weather</> table.  We will see
+       ignores the unmatched rows in the <structname>weather</structname> table.  We will see
        shortly how this can be fixed.
       </para>
      </listitem>
@@ -520,7 +520,7 @@ SELECT city, temp_lo, temp_hi, prcp, date, location
     Since the columns all had different names, the parser
     automatically found which table they belong to.  If there
     were duplicate column names in the two tables you'd need to
-    <firstterm>qualify</> the column names to show which one you
+    <firstterm>qualify</firstterm> the column names to show which one you
     meant, as in:
 
 <programlisting>
@@ -599,7 +599,7 @@ SELECT *
     <firstterm>self join</firstterm>.  As an example, suppose we wish
     to find all the weather records that are in the temperature range
     of other weather records.  So we need to compare the
-    <structfield>temp_lo</> and <structfield>temp_hi</> columns of
+    <structfield>temp_lo</structfield> and <structfield>temp_hi</structfield> columns of
     each <structname>weather</structname> row to the
     <structfield>temp_lo</structfield> and
     <structfield>temp_hi</structfield> columns of all other
@@ -620,8 +620,8 @@ SELECT W1.city, W1.temp_lo AS low, W1.temp_hi AS high,
 (2 rows)
 </programlisting>
 
-    Here we have relabeled the weather table as <literal>W1</> and
-    <literal>W2</> to be able to distinguish the left and right side
+    Here we have relabeled the weather table as <literal>W1</literal> and
+    <literal>W2</literal> to be able to distinguish the left and right side
     of the join.  You can also use these kinds of aliases in other
     queries to save some typing, e.g.:
 <programlisting>
@@ -644,7 +644,7 @@ SELECT *
    <para>
     Like  most  other relational database products,
     <productname>PostgreSQL</productname> supports
-    <firstterm>aggregate functions</>.
+    <firstterm>aggregate functions</firstterm>.
     An aggregate function computes a single result from multiple input rows.
     For example, there are aggregates to compute the
     <function>count</function>, <function>sum</function>,
@@ -747,14 +747,14 @@ SELECT city, max(temp_lo)
 </screen>
 
     which gives us the same results for only the cities that have all
-    <structfield>temp_lo</> values below 40.  Finally, if we only care about
+    <structfield>temp_lo</structfield> values below 40.  Finally, if we only care about
     cities whose
     names begin with <quote><literal>S</literal></quote>, we might do:
 
 <programlisting>
 SELECT city, max(temp_lo)
     FROM weather
-    WHERE city LIKE 'S%'            -- <co id="co.tutorial-agg-like">
+    WHERE city LIKE 'S%'            -- <co id="co.tutorial-agg-like"/>
     GROUP BY city
     HAVING max(temp_lo) &lt; 40;
 </programlisting>
@@ -762,7 +762,7 @@ SELECT city, max(temp_lo)
     <callout arearefs="co.tutorial-agg-like">
      <para>
       The <literal>LIKE</literal> operator does pattern matching and
-      is explained in <xref linkend="functions-matching">.
+      is explained in <xref linkend="functions-matching"/>.
      </para>
     </callout>
    </calloutlist>
@@ -871,7 +871,7 @@ DELETE FROM <replaceable>tablename</replaceable>;
 </synopsis>
 
     Without a qualification, <command>DELETE</command> will
-    remove  <emphasis>all</>  rows from the given table, leaving it
+    remove  <emphasis>all</emphasis>  rows from the given table, leaving it
     empty.  The system will not request confirmation before
     doing this!
    </para>
diff --git a/doc/src/sgml/rangetypes.sgml b/doc/src/sgml/rangetypes.sgml
index 9557c16a4d..3a034d9b06 100644
--- a/doc/src/sgml/rangetypes.sgml
+++ b/doc/src/sgml/rangetypes.sgml
@@ -9,7 +9,7 @@
 
  <para>
   Range types are data types representing a range of values of some
-  element type (called the range's <firstterm>subtype</>).
+  element type (called the range's <firstterm>subtype</firstterm>).
   For instance, ranges
   of <type>timestamp</type> might be used to represent the ranges of
   time that a meeting room is reserved. In this case the data type
@@ -65,7 +65,7 @@
     </listitem>
   </itemizedlist>
   In addition, you can define your own range types;
-  see <xref linkend="SQL-CREATETYPE"> for more information.
+  see <xref linkend="sql-createtype"/> for more information.
  </para>
  </sect2>
 
@@ -94,8 +94,8 @@ SELECT int4range(10, 20) * int4range(15, 25);
 SELECT isempty(numrange(1, 5));
 </programlisting>
 
-   See <xref linkend="range-operators-table">
-   and <xref linkend="range-functions-table"> for complete lists of
+   See <xref linkend="range-operators-table"/>
+   and <xref linkend="range-functions-table"/> for complete lists of
    operators and functions on range types.
   </para>
  </sect2>
@@ -117,7 +117,7 @@ SELECT isempty(numrange(1, 5));
    represented by <quote><literal>(</literal></quote>. Likewise, an inclusive upper bound is represented by
    <quote><literal>]</literal></quote>, while an exclusive upper bound is
    represented by <quote><literal>)</literal></quote>.
-   (See <xref linkend="rangetypes-io"> for more details.)
+   (See <xref linkend="rangetypes-io"/> for more details.)
   </para>
 
   <para>
@@ -148,12 +148,12 @@ SELECT isempty(numrange(1, 5));
   </para>
 
   <para>
-   Also, some element types have a notion of <quote>infinity</>, but that
+   Also, some element types have a notion of <quote>infinity</quote>, but that
    is just another value so far as the range type mechanisms are concerned.
-   For example, in timestamp ranges, <literal>[today,]</> means the same
-   thing as <literal>[today,)</>.  But <literal>[today,infinity]</> means
-   something different from <literal>[today,infinity)</> &mdash; the latter
-   excludes the special <type>timestamp</> value <literal>infinity</>.
+   For example, in timestamp ranges, <literal>[today,]</literal> means the same
+   thing as <literal>[today,)</literal>.  But <literal>[today,infinity]</literal> means
+   something different from <literal>[today,infinity)</literal> &mdash; the latter
+   excludes the special <type>timestamp</type> value <literal>infinity</literal>.
   </para>
 
   <para>
@@ -214,7 +214,7 @@ empty
   <note>
    <para>
     These rules are very similar to those for writing field values in
-    composite-type literals.  See <xref linkend="rowtypes-io-syntax"> for
+    composite-type literals.  See <xref linkend="rowtypes-io-syntax"/> for
     additional commentary.
    </para>
   </note>
@@ -284,25 +284,25 @@ SELECT numrange(NULL, 2.2);
    no valid values between them.  This contrasts with continuous ranges,
    where it's always (or almost always) possible to identify other element
    values between two given values.  For example, a range over the
-   <type>numeric</> type is continuous, as is a range over <type>timestamp</>.
-   (Even though <type>timestamp</> has limited precision, and so could
+   <type>numeric</type> type is continuous, as is a range over <type>timestamp</type>.
+   (Even though <type>timestamp</type> has limited precision, and so could
    theoretically be treated as discrete, it's better to consider it continuous
    since the step size is normally not of interest.)
   </para>
 
   <para>
    Another way to think about a discrete range type is that there is a clear
-   idea of a <quote>next</> or <quote>previous</> value for each element value.
+   idea of a <quote>next</quote> or <quote>previous</quote> value for each element value.
    Knowing that, it is possible to convert between inclusive and exclusive
    representations of a range's bounds, by choosing the next or previous
    element value instead of the one originally given.
-   For example, in an integer range type <literal>[4,8]</> and
-   <literal>(3,9)</> denote the same set of values; but this would not be so
+   For example, in an integer range type <literal>[4,8]</literal> and
+   <literal>(3,9)</literal> denote the same set of values; but this would not be so
    for a range over numeric.
   </para>
 
   <para>
-   A discrete range type should have a <firstterm>canonicalization</>
+   A discrete range type should have a <firstterm>canonicalization</firstterm>
    function that is aware of the desired step size for the element type.
    The canonicalization function is charged with converting equivalent values
    of the range type to have identical representations, in particular
@@ -352,8 +352,8 @@ SELECT '[1.234, 5.678]'::floatrange;
 
   <para>
    If the subtype is considered to have discrete rather than continuous
-   values, the <command>CREATE TYPE</> command should specify a
-   <literal>canonical</> function.
+   values, the <command>CREATE TYPE</command> command should specify a
+   <literal>canonical</literal> function.
    The canonicalization function takes an input range value, and must return
    an equivalent range value that may have different bounds and formatting.
    The canonical output for two ranges that represent the same set of values,
@@ -364,7 +364,7 @@ SELECT '[1.234, 5.678]'::floatrange;
    formatting.  In addition to adjusting the inclusive/exclusive bounds
    format, a canonicalization function might round off boundary values, in
    case the desired step size is larger than what the subtype is capable of
-   storing.  For instance, a range type over <type>timestamp</> could be
+   storing.  For instance, a range type over <type>timestamp</type> could be
    defined to have a step size of an hour, in which case the canonicalization
    function would need to round off bounds that weren't a multiple of an hour,
    or perhaps throw an error instead.
@@ -372,25 +372,25 @@ SELECT '[1.234, 5.678]'::floatrange;
 
   <para>
    In addition, any range type that is meant to be used with GiST or SP-GiST
-   indexes should define a subtype difference, or <literal>subtype_diff</>,
-   function.  (The index will still work without <literal>subtype_diff</>,
+   indexes should define a subtype difference, or <literal>subtype_diff</literal>,
+   function.  (The index will still work without <literal>subtype_diff</literal>,
    but it is likely to be considerably less efficient than if a difference
    function is provided.)  The subtype difference function takes two input
    values of the subtype, and returns their difference
-   (i.e., <replaceable>X</> minus <replaceable>Y</>) represented as
-   a <type>float8</> value.  In our example above, the
-   function <function>float8mi</> that underlies the regular <type>float8</>
+   (i.e., <replaceable>X</replaceable> minus <replaceable>Y</replaceable>) represented as
+   a <type>float8</type> value.  In our example above, the
+   function <function>float8mi</function> that underlies the regular <type>float8</type>
    minus operator can be used; but for any other subtype, some type
    conversion would be necessary.  Some creative thought about how to
    represent differences as numbers might be needed, too.  To the greatest
-   extent possible, the <literal>subtype_diff</> function should agree with
+   extent possible, the <literal>subtype_diff</literal> function should agree with
    the sort ordering implied by the selected operator class and collation;
    that is, its result should be positive whenever its first argument is
    greater than its second according to the sort ordering.
   </para>
 
   <para>
-   A less-oversimplified example of a <literal>subtype_diff</> function is:
+   A less-oversimplified example of a <literal>subtype_diff</literal> function is:
   </para>
 
 <programlisting>
@@ -406,7 +406,7 @@ SELECT '[11:10, 23:00]'::timerange;
 </programlisting>
 
   <para>
-   See <xref linkend="SQL-CREATETYPE"> for more information about creating
+   See <xref linkend="sql-createtype"/> for more information about creating
    range types.
   </para>
  </sect2>
@@ -426,23 +426,23 @@ SELECT '[11:10, 23:00]'::timerange;
 CREATE INDEX reservation_idx ON reservation USING GIST (during);
 </programlisting>
    A GiST or SP-GiST index can accelerate queries involving these range operators:
-   <literal>=</>,
-   <literal>&amp;&amp;</>,
-   <literal>&lt;@</>,
-   <literal>@&gt;</>,
-   <literal>&lt;&lt;</>,
-   <literal>&gt;&gt;</>,
-   <literal>-|-</>,
-   <literal>&amp;&lt;</>, and
-   <literal>&amp;&gt;</>
-   (see <xref linkend="range-operators-table"> for more information).
+   <literal>=</literal>,
+   <literal>&amp;&amp;</literal>,
+   <literal>&lt;@</literal>,
+   <literal>@&gt;</literal>,
+   <literal>&lt;&lt;</literal>,
+   <literal>&gt;&gt;</literal>,
+   <literal>-|-</literal>,
+   <literal>&amp;&lt;</literal>, and
+   <literal>&amp;&gt;</literal>
+   (see <xref linkend="range-operators-table"/> for more information).
   </para>
 
   <para>
    In addition, B-tree and hash indexes can be created for table columns of
    range types.  For these index types, basically the only useful range
    operation is equality.  There is a B-tree sort ordering defined for range
-   values, with corresponding <literal>&lt;</> and <literal>&gt;</> operators,
+   values, with corresponding <literal>&lt;</literal> and <literal>&gt;</literal> operators,
    but the ordering is rather arbitrary and not usually useful in the real
    world.  Range types' B-tree and hash support is primarily meant to
    allow sorting and hashing internally in queries, rather than creation of
@@ -462,7 +462,7 @@ CREATE INDEX reservation_idx ON reservation USING GIST (during);
    While <literal>UNIQUE</literal> is a natural constraint for scalar
    values, it is usually unsuitable for range types. Instead, an
    exclusion constraint is often more appropriate
-   (see <link linkend="SQL-CREATETABLE-EXCLUDE">CREATE TABLE
+   (see <link linkend="sql-createtable-exclude">CREATE TABLE
    ... CONSTRAINT ... EXCLUDE</link>). Exclusion constraints allow the
    specification of constraints such as <quote>non-overlapping</quote> on a
    range type. For example:
@@ -491,7 +491,7 @@ with existing key (during)=(["2010-01-01 11:30:00","2010-01-01 15:00:00")).
   </para>
 
   <para>
-   You can use the <link linkend="btree-gist"><literal>btree_gist</></link>
+   You can use the <link linkend="btree-gist"><literal>btree_gist</literal></link>
    extension to define exclusion constraints on plain scalar data types, which
    can then be combined with range exclusions for maximum flexibility.  For
    example, after <literal>btree_gist</literal> is installed, the following
diff --git a/doc/src/sgml/recovery-config.sgml b/doc/src/sgml/recovery-config.sgml
index 0a5d086248..92825fdf19 100644
--- a/doc/src/sgml/recovery-config.sgml
+++ b/doc/src/sgml/recovery-config.sgml
@@ -11,23 +11,23 @@
 
    <para>
     This chapter describes the settings available in the
-    <filename>recovery.conf</><indexterm><primary>recovery.conf</></>
+    <filename>recovery.conf</filename><indexterm><primary>recovery.conf</primary></indexterm>
     file. They apply only for the duration of the
     recovery.  They must be reset for any subsequent recovery you wish to
     perform.  They cannot be changed once recovery has begun.
    </para>
 
    <para>
-     Settings in <filename>recovery.conf</> are specified in the format
-     <literal>name = 'value'</>. One parameter is specified per line.
+     Settings in <filename>recovery.conf</filename> are specified in the format
+     <literal>name = 'value'</literal>. One parameter is specified per line.
      Hash marks (<literal>#</literal>) designate the rest of the
      line as a comment.  To embed a single quote in a parameter
-     value, write two quotes (<literal>''</>).
+     value, write two quotes (<literal>''</literal>).
    </para>
 
    <para>
-    A sample file, <filename>share/recovery.conf.sample</>,
-    is provided in the installation's <filename>share/</> directory.
+    A sample file, <filename>share/recovery.conf.sample</filename>,
+    is provided in the installation's <filename>share/</filename> directory.
    </para>
 
   <sect1 id="archive-recovery-settings">
@@ -38,7 +38,7 @@
      <varlistentry id="restore-command" xreflabel="restore_command">
       <term><varname>restore_command</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>restore_command</> recovery parameter</primary>
+        <primary><varname>restore_command</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -46,25 +46,25 @@
         The local shell command to execute to retrieve an archived segment of
         the WAL file series. This parameter is required for archive recovery,
         but optional for streaming replication.
-        Any <literal>%f</> in the string is
+        Any <literal>%f</literal> in the string is
         replaced by the name of the file to retrieve from the archive,
-        and any <literal>%p</> is replaced by the copy destination path name
+        and any <literal>%p</literal> is replaced by the copy destination path name
         on the server.
         (The path name is relative to the current working directory,
         i.e., the cluster's data directory.)
-        Any <literal>%r</> is replaced by the name of the file containing the
+        Any <literal>%r</literal> is replaced by the name of the file containing the
         last valid restart point. That is the earliest file that must be kept
         to allow a restore to be restartable, so this information can be used
         to truncate the archive to just the minimum required to support
-        restarting from the current restore. <literal>%r</> is typically only
+        restarting from the current restore. <literal>%r</literal> is typically only
         used by warm-standby configurations
-        (see <xref linkend="warm-standby">).
-        Write <literal>%%</> to embed an actual <literal>%</> character.
+        (see <xref linkend="warm-standby"/>).
+        Write <literal>%%</literal> to embed an actual <literal>%</literal> character.
        </para>
 
        <para>
         It is important for the command to return a zero exit status
-        only if it succeeds.  The command <emphasis>will</> be asked for file
+        only if it succeeds.  The command <emphasis>will</emphasis> be asked for file
         names that are not present in the archive; it must return nonzero
         when so asked.  Examples:
 <programlisting>
@@ -82,33 +82,33 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="archive-cleanup-command" xreflabel="archive_cleanup_command">
       <term><varname>archive_cleanup_command</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>archive_cleanup_command</> recovery parameter</primary>
+        <primary><varname>archive_cleanup_command</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This optional parameter specifies a shell command that will be executed
         at every restartpoint.  The purpose of
-        <varname>archive_cleanup_command</> is to provide a mechanism for
+        <varname>archive_cleanup_command</varname> is to provide a mechanism for
         cleaning up old archived WAL files that are no longer needed by the
         standby server.
-        Any <literal>%r</> is replaced by the name of the file containing the
+        Any <literal>%r</literal> is replaced by the name of the file containing the
         last valid restart point.
-        That is the earliest file that must be <emphasis>kept</> to allow a
-        restore to be restartable, and so all files earlier than <literal>%r</>
+        That is the earliest file that must be <emphasis>kept</emphasis> to allow a
+        restore to be restartable, and so all files earlier than <literal>%r</literal>
         may be safely removed.
         This information can be used to truncate the archive to just the
         minimum required to support restart from the current restore.
-        The <xref linkend="pgarchivecleanup"> module
-        is often used in <varname>archive_cleanup_command</> for
+        The <xref linkend="pgarchivecleanup"/> module
+        is often used in <varname>archive_cleanup_command</varname> for
         single-standby configurations, for example:
 <programlisting>archive_cleanup_command = 'pg_archivecleanup /mnt/server/archivedir %r'</programlisting>
         Note however that if multiple standby servers are restoring from the
         same archive directory, you will need to ensure that you do not delete
         WAL files until they are no longer needed by any of the servers.
-        <varname>archive_cleanup_command</> would typically be used in a
-        warm-standby configuration (see <xref linkend="warm-standby">).
-        Write <literal>%%</> to embed an actual <literal>%</> character in the
+        <varname>archive_cleanup_command</varname> would typically be used in a
+        warm-standby configuration (see <xref linkend="warm-standby"/>).
+        Write <literal>%%</literal> to embed an actual <literal>%</literal> character in the
         command.
        </para>
        <para>
@@ -123,17 +123,17 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-end-command" xreflabel="recovery_end_command">
       <term><varname>recovery_end_command</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>recovery_end_command</> recovery parameter</primary>
+        <primary><varname>recovery_end_command</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This parameter specifies a shell command that will be executed once only
         at the end of recovery. This parameter is optional. The purpose of the
-        <varname>recovery_end_command</> is to provide a mechanism for cleanup
+        <varname>recovery_end_command</varname> is to provide a mechanism for cleanup
         following replication or recovery.
-        Any <literal>%r</> is replaced by the name of the file containing the
-        last valid restart point, like in <xref linkend="archive-cleanup-command">.
+        Any <literal>%r</literal> is replaced by the name of the file containing the
+        last valid restart point, like in <xref linkend="archive-cleanup-command"/>.
        </para>
        <para>
         If the command returns a nonzero exit status then a warning log
@@ -156,9 +156,9 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <para>
       By default, recovery will recover to the end of the WAL log. The
       following parameters can be used to specify an earlier stopping point.
-      At most one of <varname>recovery_target</>,
-      <varname>recovery_target_lsn</>, <varname>recovery_target_name</>,
-      <varname>recovery_target_time</>, or <varname>recovery_target_xid</>
+      At most one of <varname>recovery_target</varname>,
+      <varname>recovery_target_lsn</varname>, <varname>recovery_target_name</varname>,
+      <varname>recovery_target_time</varname>, or <varname>recovery_target_xid</varname>
       can be used; if more than one of these is specified in the configuration
       file, the last entry will be used.
      </para>
@@ -167,7 +167,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-target" xreflabel="recovery_target">
       <term><varname>recovery_target</varname><literal> = 'immediate'</literal>
       <indexterm>
-        <primary><varname>recovery_target</> recovery parameter</primary>
+        <primary><varname>recovery_target</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -178,7 +178,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         ended.
        </para>
        <para>
-        Technically, this is a string parameter, but <literal>'immediate'</>
+        Technically, this is a string parameter, but <literal>'immediate'</literal>
         is currently the only allowed value.
        </para>
       </listitem>
@@ -187,13 +187,13 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-target-name" xreflabel="recovery_target_name">
       <term><varname>recovery_target_name</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>recovery_target_name</> recovery parameter</primary>
+        <primary><varname>recovery_target_name</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This parameter specifies the named restore point (created with
-        <function>pg_create_restore_point()</>) to which recovery will proceed.
+        <function>pg_create_restore_point()</function>) to which recovery will proceed.
        </para>
       </listitem>
      </varlistentry>
@@ -201,7 +201,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-target-time" xreflabel="recovery_target_time">
       <term><varname>recovery_target_time</varname> (<type>timestamp</type>)
       <indexterm>
-        <primary><varname>recovery_target_time</> recovery parameter</primary>
+        <primary><varname>recovery_target_time</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -209,7 +209,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         This parameter specifies the time stamp up to which recovery
         will proceed.
         The precise stopping point is also influenced by
-        <xref linkend="recovery-target-inclusive">.
+        <xref linkend="recovery-target-inclusive"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -217,7 +217,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-target-xid" xreflabel="recovery_target_xid">
       <term><varname>recovery_target_xid</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>recovery_target_xid</> recovery parameter</primary>
+        <primary><varname>recovery_target_xid</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -229,7 +229,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         The transactions that will be recovered are those that committed
         before (and optionally including) the specified one.
         The precise stopping point is also influenced by
-        <xref linkend="recovery-target-inclusive">.
+        <xref linkend="recovery-target-inclusive"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -237,16 +237,16 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-target-lsn" xreflabel="recovery_target_lsn">
       <term><varname>recovery_target_lsn</varname> (<type>pg_lsn</type>)
       <indexterm>
-        <primary><varname>recovery_target_lsn</> recovery parameter</primary>
+        <primary><varname>recovery_target_lsn</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         This parameter specifies the LSN of the write-ahead log location up
         to which recovery will proceed. The precise stopping point is also
-        influenced by <xref linkend="recovery-target-inclusive">. This
+        influenced by <xref linkend="recovery-target-inclusive"/>. This
         parameter is parsed using the system data type
-        <link linkend="datatype-pg-lsn"><type>pg_lsn</></link>.
+        <link linkend="datatype-pg-lsn"><type>pg_lsn</type></link>.
        </para>
       </listitem>
      </varlistentry>
@@ -262,7 +262,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
                    xreflabel="recovery_target_inclusive">
       <term><varname>recovery_target_inclusive</varname> (<type>boolean</type>)
       <indexterm>
-        <primary><varname>recovery_target_inclusive</> recovery parameter</primary>
+        <primary><varname>recovery_target_inclusive</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -270,11 +270,12 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         Specifies whether to stop just after the specified recovery target
         (<literal>true</literal>), or just before the recovery target
         (<literal>false</literal>).
-        Applies when either <xref linkend="recovery-target-time">
-        or <xref linkend="recovery-target-xid"> is specified.
+        Applies when <xref linkend="recovery-target-lsn"/>,
+        <xref linkend="recovery-target-time"/>, or
+        <xref linkend="recovery-target-xid"/> is specified.
         This setting controls whether transactions
-        having exactly the target commit time or ID, respectively, will
-        be included in the recovery.  Default is <literal>true</>.
+        having exactly the target WAL location (LSN), commit time, or transaction ID, respectively, will
+        be included in the recovery.  Default is <literal>true</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -283,19 +284,19 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
                    xreflabel="recovery_target_timeline">
       <term><varname>recovery_target_timeline</varname> (<type>string</type>)
       <indexterm>
-        <primary><varname>recovery_target_timeline</> recovery parameter</primary>
+        <primary><varname>recovery_target_timeline</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies recovering into a particular timeline.  The default is
         to recover along the same timeline that was current when the
-        base backup was taken. Setting this to <literal>latest</> recovers
+        base backup was taken. Setting this to <literal>latest</literal> recovers
         to the latest timeline found in the archive, which is useful in
         a standby server. Other than that you only need to set this parameter
         in complex re-recovery situations, where you need to return to
         a state that itself was reached after a point-in-time recovery.
-        See <xref linkend="backup-timelines"> for discussion.
+        See <xref linkend="backup-timelines"/> for discussion.
        </para>
       </listitem>
      </varlistentry>
@@ -304,47 +305,47 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
                    xreflabel="recovery_target_action">
       <term><varname>recovery_target_action</varname> (<type>enum</type>)
       <indexterm>
-        <primary><varname>recovery_target_action</> recovery parameter</primary>
+        <primary><varname>recovery_target_action</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
        <para>
         Specifies what action the server should take once the recovery target is
-        reached. The default is <literal>pause</>, which means recovery will
-        be paused. <literal>promote</> means the recovery process will finish
+        reached. The default is <literal>pause</literal>, which means recovery will
+        be paused. <literal>promote</literal> means the recovery process will finish
         and the server will start to accept connections.
-        Finally <literal>shutdown</> will stop the server after reaching the
+        Finally <literal>shutdown</literal> will stop the server after reaching the
         recovery target.
        </para>
        <para>
-        The intended use of the <literal>pause</> setting is to allow queries
+        The intended use of the <literal>pause</literal> setting is to allow queries
         to be executed against the database to check if this recovery target
         is the most desirable point for recovery.
         The paused state can be resumed by
-        using <function>pg_wal_replay_resume()</> (see
-        <xref linkend="functions-recovery-control-table">), which then
+        using <function>pg_wal_replay_resume()</function> (see
+        <xref linkend="functions-recovery-control-table"/>), which then
         causes recovery to end. If this recovery target is not the
         desired stopping point, then shut down the server, change the
         recovery target settings to a later target and restart to
         continue recovery.
        </para>
        <para>
-        The <literal>shutdown</> setting is useful to have the instance ready
+        The <literal>shutdown</literal> setting is useful to have the instance ready
         at the exact replay point desired.  The instance will still be able to
         replay more WAL records (and in fact will have to replay WAL records
         since the last checkpoint next time it is started).
        </para>
        <para>
-        Note that because <filename>recovery.conf</> will not be renamed when
-        <varname>recovery_target_action</> is set to <literal>shutdown</>,
+        Note that because <filename>recovery.conf</filename> will not be renamed when
+        <varname>recovery_target_action</varname> is set to <literal>shutdown</literal>,
         any subsequent start will end with immediate shutdown unless the
-        configuration is changed or the <filename>recovery.conf</> file is
+        configuration is changed or the <filename>recovery.conf</filename> file is
         removed manually.
        </para>
        <para>
         This setting has no effect if no recovery target is set.
-        If <xref linkend="guc-hot-standby"> is not enabled, a setting of
-        <literal>pause</> will act the same as <literal>shutdown</>.
+        If <xref linkend="guc-hot-standby"/> is not enabled, a setting of
+        <literal>pause</literal> will act the same as <literal>shutdown</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -360,34 +361,34 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
        <varlistentry id="standby-mode" xreflabel="standby_mode">
         <term><varname>standby_mode</varname> (<type>boolean</type>)
         <indexterm>
-          <primary><varname>standby_mode</> recovery parameter</primary>
+          <primary><varname>standby_mode</varname> recovery parameter</primary>
         </indexterm>
         </term>
         <listitem>
          <para>
-          Specifies whether to start the <productname>PostgreSQL</> server as
-          a standby. If this parameter is <literal>on</>, the server will
+          Specifies whether to start the <productname>PostgreSQL</productname> server as
+          a standby. If this parameter is <literal>on</literal>, the server will
           not stop recovery when the end of archived WAL is reached, but
           will keep trying to continue recovery by fetching new WAL segments
-          using <varname>restore_command</>
+          using <varname>restore_command</varname>
           and/or by connecting to the primary server as specified by the
-          <varname>primary_conninfo</> setting.
+          <varname>primary_conninfo</varname> setting.
          </para>
         </listitem>
        </varlistentry>
        <varlistentry id="primary-conninfo" xreflabel="primary_conninfo">
         <term><varname>primary_conninfo</varname> (<type>string</type>)
         <indexterm>
-          <primary><varname>primary_conninfo</> recovery parameter</primary>
+          <primary><varname>primary_conninfo</varname> recovery parameter</primary>
         </indexterm>
         </term>
         <listitem>
          <para>
           Specifies a connection string to be used for the standby server
           to connect with the primary. This string is in the format
-          described in <xref linkend="libpq-connstring">. If any option is
+          described in <xref linkend="libpq-connstring"/>. If any option is
           unspecified in this string, then the corresponding environment
-          variable (see <xref linkend="libpq-envars">) is checked. If the
+          variable (see <xref linkend="libpq-envars"/>) is checked. If the
           environment variable is not set either, then
           defaults are used.
          </para>
@@ -397,24 +398,24 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
           the same as the standby server's default.
           Also specify a user name corresponding to a suitably-privileged role
           on the primary (see
-          <xref linkend="streaming-replication-authentication">).
+          <xref linkend="streaming-replication-authentication"/>).
           A password needs to be provided too, if the primary demands password
           authentication.  It can be provided in the
           <varname>primary_conninfo</varname> string, or in a separate
-          <filename>~/.pgpass</> file on the standby server (use
-          <literal>replication</> as the database name).
+          <filename>~/.pgpass</filename> file on the standby server (use
+          <literal>replication</literal> as the database name).
           Do not specify a database name in the
           <varname>primary_conninfo</varname> string.
          </para>
          <para>
-          This setting has no effect if <varname>standby_mode</> is <literal>off</>.
+          This setting has no effect if <varname>standby_mode</varname> is <literal>off</literal>.
          </para>
         </listitem>
        </varlistentry>
        <varlistentry id="primary-slot-name" xreflabel="primary_slot_name">
         <term><varname>primary_slot_name</varname> (<type>string</type>)
         <indexterm>
-          <primary><varname>primary_slot_name</> recovery parameter</primary>
+          <primary><varname>primary_slot_name</varname> recovery parameter</primary>
         </indexterm>
         </term>
         <listitem>
@@ -422,8 +423,8 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
           Optionally specifies an existing replication slot to be used when
           connecting to the primary via streaming replication to control
           resource removal on the upstream node
-          (see <xref linkend="streaming-replication-slots">).
-          This setting has no effect if <varname>primary_conninfo</> is not
+          (see <xref linkend="streaming-replication-slots"/>).
+          This setting has no effect if <varname>primary_conninfo</varname> is not
           set.
          </para>
         </listitem>
@@ -431,15 +432,15 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
        <varlistentry id="trigger-file" xreflabel="trigger_file">
         <term><varname>trigger_file</varname> (<type>string</type>)
         <indexterm>
-          <primary><varname>trigger_file</> recovery parameter</primary>
+          <primary><varname>trigger_file</varname> recovery parameter</primary>
         </indexterm>
         </term>
         <listitem>
          <para>
           Specifies a trigger file whose presence ends recovery in the
           standby.  Even if this value is not set, you can still promote
-          the standby using <command>pg_ctl promote</>.
-          This setting has no effect if <varname>standby_mode</> is <literal>off</>.
+          the standby using <command>pg_ctl promote</command>.
+          This setting has no effect if <varname>standby_mode</varname> is <literal>off</literal>.
          </para>
         </listitem>
        </varlistentry>
@@ -447,7 +448,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
      <varlistentry id="recovery-min-apply-delay" xreflabel="recovery_min_apply_delay">
       <term><varname>recovery_min_apply_delay</varname> (<type>integer</type>)
       <indexterm>
-        <primary><varname>recovery_min_apply_delay</> recovery parameter</primary>
+        <primary><varname>recovery_min_apply_delay</varname> recovery parameter</primary>
       </indexterm>
       </term>
       <listitem>
@@ -488,7 +489,7 @@ restore_command = 'copy "C:\\server\\archivedir\\%f" "%p"'  # Windows
         This parameter is intended for use with streaming replication deployments;
         however, if the parameter is specified it will be honored in all cases.
 
-        <varname>hot_standby_feedback</> will be delayed by use of this feature
+        <varname>hot_standby_feedback</varname> will be delayed by use of this feature
         which could lead to bloat on the master; use both together with care.
 
         <warning>
diff --git a/doc/src/sgml/ref/abort.sgml b/doc/src/sgml/ref/abort.sgml
index ed9332c395..21799d2a83 100644
--- a/doc/src/sgml/ref/abort.sgml
+++ b/doc/src/sgml/ref/abort.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/abort.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ABORT">
+<refentry id="sql-abort">
  <indexterm zone="sql-abort">
   <primary>ABORT</primary>
  </indexterm>
@@ -33,7 +33,7 @@ ABORT [ WORK | TRANSACTION ]
    all the updates made by the transaction to be discarded.
    This command is identical
    in behavior to the standard <acronym>SQL</acronym> command
-   <xref linkend="SQL-ROLLBACK">,
+   <xref linkend="sql-rollback"/>,
    and is present only for historical reasons.
   </para>
  </refsect1>
@@ -58,12 +58,12 @@ ABORT [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-COMMIT"> to
+   Use <xref linkend="sql-commit"/> to
    successfully terminate a transaction.
   </para>
 
   <para>
-   Issuing <command>ABORT</> outside of a transaction block
+   Issuing <command>ABORT</command> outside of a transaction block
    emits a warning and otherwise has no effect.
   </para>
  </refsect1>
@@ -92,9 +92,9 @@ ABORT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/allfiles.sgml b/doc/src/sgml/ref/allfiles.sgml
index 01acc2ef9d..22e6893211 100644
--- a/doc/src/sgml/ref/allfiles.sgml
+++ b/doc/src/sgml/ref/allfiles.sgml
@@ -26,8 +26,10 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY alterOperatorClass SYSTEM "alter_opclass.sgml">
 <!ENTITY alterOperatorFamily SYSTEM "alter_opfamily.sgml">
 <!ENTITY alterPolicy        SYSTEM "alter_policy.sgml">
+<!ENTITY alterProcedure     SYSTEM "alter_procedure.sgml">
 <!ENTITY alterPublication   SYSTEM "alter_publication.sgml">
 <!ENTITY alterRole          SYSTEM "alter_role.sgml">
+<!ENTITY alterRoutine       SYSTEM "alter_routine.sgml">
 <!ENTITY alterRule          SYSTEM "alter_rule.sgml">
 <!ENTITY alterSchema        SYSTEM "alter_schema.sgml">
 <!ENTITY alterServer        SYSTEM "alter_server.sgml">
@@ -48,6 +50,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY alterView          SYSTEM "alter_view.sgml">
 <!ENTITY analyze            SYSTEM "analyze.sgml">
 <!ENTITY begin              SYSTEM "begin.sgml">
+<!ENTITY call               SYSTEM "call.sgml">
 <!ENTITY checkpoint         SYSTEM "checkpoint.sgml">
 <!ENTITY close              SYSTEM "close.sgml">
 <!ENTITY cluster            SYSTEM "cluster.sgml">
@@ -75,6 +78,7 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY createOperatorClass SYSTEM "create_opclass.sgml">
 <!ENTITY createOperatorFamily SYSTEM "create_opfamily.sgml">
 <!ENTITY createPolicy       SYSTEM "create_policy.sgml">
+<!ENTITY createProcedure    SYSTEM "create_procedure.sgml">
 <!ENTITY createPublication  SYSTEM "create_publication.sgml">
 <!ENTITY createRole         SYSTEM "create_role.sgml">
 <!ENTITY createRule         SYSTEM "create_rule.sgml">
@@ -122,8 +126,10 @@ Complete list of usable sgml source files in this directory.
 <!ENTITY dropOperatorFamily  SYSTEM "drop_opfamily.sgml">
 <!ENTITY dropOwned          SYSTEM "drop_owned.sgml">
 <!ENTITY dropPolicy         SYSTEM "drop_policy.sgml">
+<!ENTITY dropProcedure      SYSTEM "drop_procedure.sgml">
 <!ENTITY dropPublication    SYSTEM "drop_publication.sgml">
 <!ENTITY dropRole           SYSTEM "drop_role.sgml">
+<!ENTITY dropRoutine        SYSTEM "drop_routine.sgml">
 <!ENTITY dropRule           SYSTEM "drop_rule.sgml">
 <!ENTITY dropSchema         SYSTEM "drop_schema.sgml">
 <!ENTITY dropSequence       SYSTEM "drop_sequence.sgml">
diff --git a/doc/src/sgml/ref/alter_aggregate.sgml b/doc/src/sgml/ref/alter_aggregate.sgml
index 7b7616ca01..2ad3e0440b 100644
--- a/doc/src/sgml/ref/alter_aggregate.sgml
+++ b/doc/src/sgml/ref/alter_aggregate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_aggregate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERAGGREGATE">
+<refentry id="sql-alteraggregate">
  <indexterm zone="sql-alteraggregate">
   <primary>ALTER AGGREGATE</primary>
  </indexterm>
@@ -43,7 +43,7 @@ ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signatu
   </para>
 
   <para>
-   You must own the aggregate function to use <command>ALTER AGGREGATE</>.
+   You must own the aggregate function to use <command>ALTER AGGREGATE</command>.
    To change the schema of an aggregate function, you must also have
    <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
@@ -73,8 +73,8 @@ ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signatu
 
     <listitem>
      <para>
-      The mode of an argument: <literal>IN</> or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of an argument: <literal>IN</literal> or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -97,10 +97,10 @@ ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signatu
     <listitem>
      <para>
       An input data type on which the aggregate function operates.
-      To reference a zero-argument aggregate function, write <literal>*</>
+      To reference a zero-argument aggregate function, write <literal>*</literal>
       in place of the list of argument specifications.
       To reference an ordered-set aggregate function, write
-      <literal>ORDER BY</> between the direct and aggregated argument
+      <literal>ORDER BY</literal> between the direct and aggregated argument
       specifications.
      </para>
     </listitem>
@@ -140,13 +140,13 @@ ALTER AGGREGATE <replaceable>name</replaceable> ( <replaceable>aggregate_signatu
 
    <para>
     The recommended syntax for referencing an ordered-set aggregate
-    is to write <literal>ORDER BY</> between the direct and aggregated
+    is to write <literal>ORDER BY</literal> between the direct and aggregated
     argument specifications, in the same style as in
-    <xref linkend="sql-createaggregate">.  However, it will also work to
-    omit <literal>ORDER BY</> and just run the direct and aggregated
+    <xref linkend="sql-createaggregate"/>.  However, it will also work to
+    omit <literal>ORDER BY</literal> and just run the direct and aggregated
     argument specifications into a single list.  In this abbreviated form,
-    if <literal>VARIADIC "any"</> was used in both the direct and
-    aggregated argument lists, write <literal>VARIADIC "any"</> only once.
+    if <literal>VARIADIC "any"</literal> was used in both the direct and
+    aggregated argument lists, write <literal>VARIADIC "any"</literal> only once.
    </para>
  </refsect1>
 
@@ -195,8 +195,8 @@ ALTER AGGREGATE mypercentile(float8, integer) SET SCHEMA myschema;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createaggregate"></member>
-   <member><xref linkend="sql-dropaggregate"></member>
+   <member><xref linkend="sql-createaggregate"/></member>
+   <member><xref linkend="sql-dropaggregate"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_collation.sgml b/doc/src/sgml/ref/alter_collation.sgml
index 30e8c756a1..b51b3a2564 100644
--- a/doc/src/sgml/ref/alter_collation.sgml
+++ b/doc/src/sgml/ref/alter_collation.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_collation.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERCOLLATION">
+<refentry id="sql-altercollation">
  <indexterm zone="sql-altercollation">
   <primary>ALTER COLLATION</primary>
  </indexterm>
@@ -38,7 +38,7 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
   </para>
 
   <para>
-   You must own the collation to use <command>ALTER COLLATION</>.
+   You must own the collation to use <command>ALTER COLLATION</command>.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the collation's schema.  (These restrictions enforce that altering the
@@ -94,7 +94,7 @@ ALTER COLLATION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sche
      <para>
       Update the collation's version.
       See <xref linkend="sql-altercollation-notes"
-      endterm="sql-altercollation-notes-title"> below.
+      endterm="sql-altercollation-notes-title"/> below.
      </para>
     </listitem>
    </varlistentry>
@@ -176,8 +176,8 @@ ALTER COLLATION "en_US" OWNER TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createcollation"></member>
-   <member><xref linkend="sql-dropcollation"></member>
+   <member><xref linkend="sql-createcollation"/></member>
+   <member><xref linkend="sql-dropcollation"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_conversion.sgml b/doc/src/sgml/ref/alter_conversion.sgml
index 3514720d03..c42bd8b3e4 100644
--- a/doc/src/sgml/ref/alter_conversion.sgml
+++ b/doc/src/sgml/ref/alter_conversion.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_conversion.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERCONVERSION">
+<refentry id="sql-alterconversion">
  <indexterm zone="sql-alterconversion">
   <primary>ALTER CONVERSION</primary>
  </indexterm>
@@ -36,7 +36,7 @@ ALTER CONVERSION <replaceable>name</replaceable> SET SCHEMA <replaceable>new_sch
   </para>
 
   <para>
-   You must own the conversion to use <command>ALTER CONVERSION</>.
+   You must own the conversion to use <command>ALTER CONVERSION</command>.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the conversion's schema.  (These restrictions enforce that altering the
@@ -120,8 +120,8 @@ ALTER CONVERSION iso_8859_1_to_utf8 OWNER TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createconversion"></member>
-   <member><xref linkend="sql-dropconversion"></member>
+   <member><xref linkend="sql-createconversion"/></member>
+   <member><xref linkend="sql-dropconversion"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_database.sgml b/doc/src/sgml/ref/alter_database.sgml
index cfc28cf9a7..7db878cf53 100644
--- a/doc/src/sgml/ref/alter_database.sgml
+++ b/doc/src/sgml/ref/alter_database.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_database.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERDATABASE">
+<refentry id="sql-alterdatabase">
  <indexterm zone="sql-alterdatabase">
   <primary>ALTER DATABASE</primary>
  </indexterm>
@@ -21,24 +21,24 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+ALTER DATABASE <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
-    ALLOW_CONNECTIONS <replaceable class="PARAMETER">allowconn</replaceable>
-    CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
-    IS_TEMPLATE <replaceable class="PARAMETER">istemplate</replaceable>
+    ALLOW_CONNECTIONS <replaceable class="parameter">allowconn</replaceable>
+    CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
+    IS_TEMPLATE <replaceable class="parameter">istemplate</replaceable>
 
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER DATABASE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER DATABASE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable>
+ALTER DATABASE <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable>
 
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET <replaceable>configuration_parameter</replaceable>
-ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
+ALTER DATABASE <replaceable class="parameter">name</replaceable> SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER DATABASE <replaceable class="parameter">name</replaceable> SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
+ALTER DATABASE <replaceable class="parameter">name</replaceable> RESET <replaceable>configuration_parameter</replaceable>
+ALTER DATABASE <replaceable class="parameter">name</replaceable> RESET ALL
 </synopsis>
  </refsynopsisdiv>
 
@@ -89,7 +89,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
    database. Whenever a new session is subsequently started in that
    database, the specified value becomes the session default value.
    The database-specific default overrides whatever setting is present
-   in <filename>postgresql.conf</> or has been received from the
+   in <filename>postgresql.conf</filename> or has been received from the
    <command>postgres</command> command line.  Only the database
    owner or a superuser can change the session defaults for a
    database.  Certain variables cannot be set this way, or can only be
@@ -102,7 +102,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name of the database whose attributes are to be altered.
@@ -164,6 +164,10 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
      <para>
       The new default tablespace of the database.
      </para>
+
+     <para>
+      This form of the command cannot be executed inside a transaction block.
+     </para>
     </listitem>
    </varlistentry>
 
@@ -179,12 +183,12 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
         database-specific setting is removed, so the system-wide default
         setting will be inherited in new sessions.  Use <literal>RESET
         ALL</literal> to clear all database-specific settings.
-        <literal>SET FROM CURRENT</> saves the session's current value of
+        <literal>SET FROM CURRENT</literal> saves the session's current value of
         the parameter as the database-specific value.
        </para>
 
        <para>
-        See <xref linkend="sql-set"> and <xref linkend="runtime-config">
+        See <xref linkend="sql-set"/> and <xref linkend="runtime-config"/>
         for more information about allowed parameter names
         and values.
        </para>
@@ -199,7 +203,7 @@ ALTER DATABASE <replaceable class="PARAMETER">name</replaceable> RESET ALL
   <para>
    It is also possible to tie a session default to a specific role
    rather than to a database; see
-   <xref linkend="sql-alterrole">.
+   <xref linkend="sql-alterrole"/>.
    Role-specific settings override database-specific
    ones if there is a conflict.
   </para>
@@ -230,10 +234,10 @@ ALTER DATABASE test SET enable_indexscan TO off;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase"></member>
-   <member><xref linkend="sql-dropdatabase"></member>
-   <member><xref linkend="sql-set"></member>
-   <member><xref linkend="sql-createtablespace"></member>
+   <member><xref linkend="sql-createdatabase"/></member>
+   <member><xref linkend="sql-dropdatabase"/></member>
+   <member><xref linkend="sql-set"/></member>
+   <member><xref linkend="sql-createtablespace"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_default_privileges.sgml b/doc/src/sgml/ref/alter_default_privileges.sgml
index e3363f868a..0c09f1db5c 100644
--- a/doc/src/sgml/ref/alter_default_privileges.sgml
+++ b/doc/src/sgml/ref/alter_default_privileges.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_default_privileges.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERDEFAULTPRIVILEGES">
+<refentry id="sql-alterdefaultprivileges">
  <indexterm zone="sql-alterdefaultprivileges">
   <primary>ALTER DEFAULT PRIVILEGES</primary>
  </indexterm>
@@ -31,55 +31,55 @@ ALTER DEFAULT PRIVILEGES
 GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
     [, ...] | ALL [ PRIVILEGES ] }
     ON TABLES
-    TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { USAGE | SELECT | UPDATE }
     [, ...] | ALL [ PRIVILEGES ] }
     ON SEQUENCES
-    TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { EXECUTE | ALL [ PRIVILEGES ] }
-    ON FUNCTIONS
-    TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    ON { FUNCTIONS | ROUTINES }
+    TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON TYPES
-    TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | CREATE | ALL [ PRIVILEGES ] }
     ON SCHEMAS
-    TO { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
+    TO { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...] [ WITH GRANT OPTION ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
     [, ...] | ALL [ PRIVILEGES ] }
     ON TABLES
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { USAGE | SELECT | UPDATE }
     [, ...] | ALL [ PRIVILEGES ] }
     ON SEQUENCES
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { EXECUTE | ALL [ PRIVILEGES ] }
-    ON FUNCTIONS
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    ON { FUNCTIONS | ROUTINES }
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON TYPES
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | CREATE | ALL [ PRIVILEGES ] }
     ON SCHEMAS
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
@@ -88,12 +88,18 @@ REVOKE [ GRANT OPTION FOR ]
   <title>Description</title>
 
   <para>
-   <command>ALTER DEFAULT PRIVILEGES</> allows you to set the privileges
+   <command>ALTER DEFAULT PRIVILEGES</command> allows you to set the privileges
    that will be applied to objects created in the future.  (It does not
    affect privileges assigned to already-existing objects.)  Currently,
    only the privileges for schemas, tables (including views and foreign
    tables), sequences, functions, and types (including domains) can be
-   altered.
+   altered.  For this command, functions include aggregates and procedures.
+   The words <literal>FUNCTIONS</literal> and <literal>ROUTINES</literal> are
+   equivalent in this command.  (<literal>ROUTINES</literal> is preferred
+   going forward as the standard term for functions and procedures taken
+   together.  In earlier PostgreSQL releases, only the
+   word <literal>FUNCTIONS</literal> was allowed.  It is not possible to set
+   default privileges for functions and procedures separately.)
   </para>
 
   <para>
@@ -106,12 +112,12 @@ REVOKE [ GRANT OPTION FOR ]
   </para>
 
   <para>
-   As explained under <xref linkend="sql-grant">,
+   As explained under <xref linkend="sql-grant"/>,
    the default privileges for any object type normally grant all grantable
    permissions to the object owner, and may grant some privileges to
-   <literal>PUBLIC</> as well.  However, this behavior can be changed by
+   <literal>PUBLIC</literal> as well.  However, this behavior can be changed by
    altering the global default privileges with
-   <command>ALTER DEFAULT PRIVILEGES</>.
+   <command>ALTER DEFAULT PRIVILEGES</command>.
   </para>
 
  <refsect2>
@@ -123,7 +129,7 @@ REVOKE [ GRANT OPTION FOR ]
     <listitem>
      <para>
       The name of an existing role of which the current role is a member.
-      If <literal>FOR ROLE</> is omitted, the current role is assumed.
+      If <literal>FOR ROLE</literal> is omitted, the current role is assumed.
      </para>
     </listitem>
    </varlistentry>
@@ -134,9 +140,9 @@ REVOKE [ GRANT OPTION FOR ]
      <para>
       The name of an existing schema.  If specified, the default privileges
       are altered for objects later created in that schema.
-      If <literal>IN SCHEMA</> is omitted, the global default privileges
+      If <literal>IN SCHEMA</literal> is omitted, the global default privileges
       are altered.
-      <literal>IN SCHEMA</> is not allowed when using <literal>ON SCHEMAS</>
+      <literal>IN SCHEMA</literal> is not allowed when using <literal>ON SCHEMAS</literal>
       as schemas can't be nested.
      </para>
     </listitem>
@@ -148,10 +154,10 @@ REVOKE [ GRANT OPTION FOR ]
      <para>
       The name of an existing role to grant or revoke privileges for.
       This parameter, and all the other parameters in
-      <replaceable class="parameter">abbreviated_grant_or_revoke</>,
+      <replaceable class="parameter">abbreviated_grant_or_revoke</replaceable>,
       act as described under
-      <xref linkend="sql-grant"> or
-      <xref linkend="sql-revoke">,
+      <xref linkend="sql-grant"/> or
+      <xref linkend="sql-revoke"/>,
       except that one is setting permissions for a whole class of objects
       rather than specific named objects.
      </para>
@@ -165,17 +171,17 @@ REVOKE [ GRANT OPTION FOR ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="app-psql">'s <command>\ddp</command> command
+   Use <xref linkend="app-psql"/>'s <command>\ddp</command> command
    to obtain information about existing assignments of default privileges.
    The meaning of the privilege values is the same as explained for
    <command>\dp</command> under
-   <xref linkend="sql-grant">.
+   <xref linkend="sql-grant"/>.
   </para>
 
   <para>
    If you wish to drop a role for which the default privileges have been
    altered, it is necessary to reverse the changes in its default privileges
-   or use <command>DROP OWNED BY</> to get rid of the default privileges entry
+   or use <command>DROP OWNED BY</command> to get rid of the default privileges entry
    for the role.
   </para>
  </refsect1>
@@ -186,7 +192,7 @@ REVOKE [ GRANT OPTION FOR ]
   <para>
    Grant SELECT privilege to everyone for all tables (and views) you
    subsequently create in schema <literal>myschema</literal>, and allow
-   role <literal>webuser</> to INSERT into them too:
+   role <literal>webuser</literal> to INSERT into them too:
 
 <programlisting>
 ALTER DEFAULT PRIVILEGES IN SCHEMA myschema GRANT SELECT ON TABLES TO PUBLIC;
@@ -206,7 +212,7 @@ ALTER DEFAULT PRIVILEGES IN SCHEMA myschema REVOKE INSERT ON TABLES FROM webuser
 
   <para>
    Remove the public EXECUTE permission that is normally granted on functions,
-   for all functions subsequently created by role <literal>admin</>:
+   for all functions subsequently created by role <literal>admin</literal>:
 
 <programlisting>
 ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
@@ -226,8 +232,8 @@ ALTER DEFAULT PRIVILEGES FOR ROLE admin REVOKE EXECUTE ON FUNCTIONS FROM PUBLIC;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-grant"></member>
-   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="sql-grant"/></member>
+   <member><xref linkend="sql-revoke"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_domain.sgml b/doc/src/sgml/ref/alter_domain.sgml
index 95a822aef6..85253e209b 100644
--- a/doc/src/sgml/ref/alter_domain.sgml
+++ b/doc/src/sgml/ref/alter_domain.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_domain.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERDOMAIN">
+<refentry id="sql-alterdomain">
  <indexterm zone="sql-alterdomain">
   <primary>ALTER DOMAIN</primary>
  </indexterm>
@@ -23,24 +23,24 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    { SET DEFAULT <replaceable class="PARAMETER">expression</replaceable> | DROP DEFAULT }
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    { SET DEFAULT <replaceable class="parameter">expression</replaceable> | DROP DEFAULT }
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
     { SET | DROP } NOT NULL
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    ADD <replaceable class="PARAMETER">domain_constraint</replaceable> [ NOT VALID ]
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    DROP CONSTRAINT [ IF EXISTS ] <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-     RENAME CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> TO <replaceable class="PARAMETER">new_constraint_name</replaceable>
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
-    SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    ADD <replaceable class="parameter">domain_constraint</replaceable> [ NOT VALID ]
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    DROP CONSTRAINT [ IF EXISTS ] <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ]
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+     RENAME CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> TO <replaceable class="parameter">new_constraint_name</replaceable>
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable>
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER DOMAIN <replaceable class="parameter">name</replaceable>
+    SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -69,18 +69,18 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       These forms change whether a domain is marked to allow NULL
-      values or to reject NULL values.  You can only <literal>SET NOT NULL</>
+      values or to reject NULL values.  You can only <literal>SET NOT NULL</literal>
       when the columns using the domain contain no null values.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">domain_constraint</replaceable> [ NOT VALID ]</literal></term>
+    <term><literal>ADD <replaceable class="parameter">domain_constraint</replaceable> [ NOT VALID ]</literal></term>
     <listitem>
      <para>
       This form adds a new constraint to a domain using the same syntax as
-      <xref linkend="SQL-CREATEDOMAIN">.
+      <xref linkend="sql-createdomain"/>.
       When a new constraint is added to a domain, all columns using that
       domain will be checked against the newly added constraint.  These
       checks can be suppressed by adding the new constraint using the
@@ -88,7 +88,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
       valid using <command>ALTER DOMAIN ... VALIDATE CONSTRAINT</command>.
       Newly inserted or updated rows are always checked against all
       constraints, even those marked <literal>NOT VALID</literal>.
-      <literal>NOT VALID</> is only accepted for <literal>CHECK</> constraints.
+      <literal>NOT VALID</literal> is only accepted for <literal>CHECK</literal> constraints.
      </para>
     </listitem>
    </varlistentry>
@@ -118,7 +118,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form validates a constraint previously added as
-      <literal>NOT VALID</>, that is, verify that all data in columns using the
+      <literal>NOT VALID</literal>, that is, verify that all data in columns using the
       domain satisfy the specified constraint.
      </para>
     </listitem>
@@ -154,7 +154,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
   </variablelist>
 
   <para>
-   You must own the domain to use <command>ALTER DOMAIN</>.
+   You must own the domain to use <command>ALTER DOMAIN</command>.
    To change the schema of a domain, you must also have
    <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
@@ -171,7 +171,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
    <para>
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name (possibly schema-qualified) of an existing domain to
@@ -181,7 +181,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">domain_constraint</replaceable></term>
+      <term><replaceable class="parameter">domain_constraint</replaceable></term>
       <listitem>
        <para>
         New domain constraint for the domain.
@@ -190,7 +190,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
+      <term><replaceable class="parameter">constraint_name</replaceable></term>
       <listitem>
        <para>
         Name of an existing constraint to drop or rename.
@@ -199,7 +199,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">NOT VALID</replaceable></term>
+      <term><literal>NOT VALID</literal></term>
       <listitem>
        <para>
         Do not verify existing column data for constraint validity.
@@ -214,7 +214,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
        <para>
         Automatically drop objects that depend on the constraint,
         and in turn all objects that depend on those objects
-        (see <xref linkend="ddl-depend">).
+        (see <xref linkend="ddl-depend"/>).
        </para>
       </listitem>
      </varlistentry>
@@ -230,7 +230,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_name</replaceable></term>
+      <term><replaceable class="parameter">new_name</replaceable></term>
       <listitem>
        <para>
         The new name for the domain.
@@ -239,7 +239,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_constraint_name</replaceable></term>
+      <term><replaceable class="parameter">new_constraint_name</replaceable></term>
       <listitem>
        <para>
         The new name for the constraint.
@@ -248,7 +248,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+      <term><replaceable class="parameter">new_owner</replaceable></term>
       <listitem>
        <para>
         The user name of the new owner of the domain.
@@ -257,7 +257,7 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_schema</replaceable></term>
+      <term><replaceable class="parameter">new_schema</replaceable></term>
       <listitem>
        <para>
         The new schema for the domain.
@@ -273,12 +273,12 @@ ALTER DOMAIN <replaceable class="PARAMETER">name</replaceable>
   <title>Notes</title>
 
   <para>
-   Currently, <command>ALTER DOMAIN ADD CONSTRAINT</>, <command>ALTER
-   DOMAIN VALIDATE CONSTRAINT</>, and <command>ALTER DOMAIN SET NOT NULL</>
-   will fail if the validated named domain or
-   any derived domain is used within a composite-type column of any
-   table in the database.  They should eventually be improved to be
-   able to verify the new constraint for such nested columns.
+   Currently, <command>ALTER DOMAIN ADD CONSTRAINT</command>, <command>ALTER
+   DOMAIN VALIDATE CONSTRAINT</command>, and <command>ALTER DOMAIN SET NOT
+   NULL</command> will fail if the named domain or any derived domain is used
+   within a container-type column (a composite, array, or range column) in
+   any table in the database.  They should eventually be improved to be able
+   to verify the new constraint for such nested values.
   </para>
 
  </refsect1>
@@ -325,25 +325,25 @@ ALTER DOMAIN zipcode SET SCHEMA customers;
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-ALTERDOMAIN-compatibility">
+ <refsect1 id="sql-alterdomain-compatibility">
   <title>Compatibility</title>
 
   <para>
    <command>ALTER DOMAIN</command> conforms to the <acronym>SQL</acronym>
-   standard, except for the <literal>OWNER</>, <literal>RENAME</literal>, <literal>SET SCHEMA</>, and
-   <literal>VALIDATE CONSTRAINT</> variants, which are
-   <productname>PostgreSQL</productname> extensions.  The <literal>NOT VALID</>
-   clause of the <literal>ADD CONSTRAINT</> variant is also a
+   standard, except for the <literal>OWNER</literal>, <literal>RENAME</literal>, <literal>SET SCHEMA</literal>, and
+   <literal>VALIDATE CONSTRAINT</literal> variants, which are
+   <productname>PostgreSQL</productname> extensions.  The <literal>NOT VALID</literal>
+   clause of the <literal>ADD CONSTRAINT</literal> variant is also a
    <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-ALTERDOMAIN-see-also">
+ <refsect1 id="sql-alterdomain-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdomain"></member>
-   <member><xref linkend="sql-dropdomain"></member>
+   <member><xref linkend="sql-createdomain"/></member>
+   <member><xref linkend="sql-dropdomain"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_event_trigger.sgml b/doc/src/sgml/ref/alter_event_trigger.sgml
index 9d6c64ad52..61919f7845 100644
--- a/doc/src/sgml/ref/alter_event_trigger.sgml
+++ b/doc/src/sgml/ref/alter_event_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_event_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTEREVENTTRIGGER">
+<refentry id="sql-altereventtrigger">
  <indexterm zone="sql-altereventtrigger">
   <primary>ALTER EVENT TRIGGER</primary>
  </indexterm>
@@ -21,10 +21,10 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> DISABLE
-ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> ENABLE [ REPLICA | ALWAYS ]
-ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
+ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> DISABLE
+ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> ENABLE [ REPLICA | ALWAYS ]
+ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER EVENT TRIGGER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -46,7 +46,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an existing trigger to alter.
@@ -55,7 +55,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the event trigger.
@@ -64,7 +64,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_name</replaceable></term>
+    <term><replaceable class="parameter">new_name</replaceable></term>
     <listitem>
      <para>
       The new name of the event trigger.
@@ -78,7 +78,7 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO
      <para>
       These forms configure the firing of event triggers.  A disabled trigger
       is still known to the system, but is not executed when its triggering
-      event occurs.  See also <xref linkend="guc-session-replication-role">.
+      event occurs.  See also <xref linkend="guc-session-replication-role"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -98,8 +98,8 @@ ALTER EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable> RENAME TO
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createeventtrigger"></member>
-   <member><xref linkend="sql-dropeventtrigger"></member>
+   <member><xref linkend="sql-createeventtrigger"/></member>
+   <member><xref linkend="sql-dropeventtrigger"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_extension.sgml b/doc/src/sgml/ref/alter_extension.sgml
index a7c0927d1c..a2d405d6cd 100644
--- a/doc/src/sgml/ref/alter_extension.sgml
+++ b/doc/src/sgml/ref/alter_extension.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_extension.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTEREXTENSION">
+<refentry id="sql-alterextension">
  <indexterm zone="sql-alterextension">
   <primary>ALTER EXTENSION</primary>
  </indexterm>
@@ -23,39 +23,41 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> UPDATE [ TO <replaceable class="PARAMETER">new_version</replaceable> ]
-ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
-ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> ADD <replaceable class="PARAMETER">member_object</replaceable>
-ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replaceable class="PARAMETER">member_object</replaceable>
+ALTER EXTENSION <replaceable class="parameter">name</replaceable> UPDATE [ TO <replaceable class="parameter">new_version</replaceable> ]
+ALTER EXTENSION <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
+ALTER EXTENSION <replaceable class="parameter">name</replaceable> ADD <replaceable class="parameter">member_object</replaceable>
+ALTER EXTENSION <replaceable class="parameter">name</replaceable> DROP <replaceable class="parameter">member_object</replaceable>
 
-<phrase>where <replaceable class="PARAMETER">member_object</replaceable> is:</phrase>
+<phrase>where <replaceable class="parameter">member_object</replaceable> is:</phrase>
 
-  ACCESS METHOD <replaceable class="PARAMETER">object_name</replaceable> |
-  AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
+  ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
+  AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
   CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
-  COLLATION <replaceable class="PARAMETER">object_name</replaceable> |
-  CONVERSION <replaceable class="PARAMETER">object_name</replaceable> |
-  DOMAIN <replaceable class="PARAMETER">object_name</replaceable> |
-  EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> |
-  FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> |
-  FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> |
-  FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
-  MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> |
-  OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) |
-  OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> |
-  SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
-  SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
-  SERVER <replaceable class="PARAMETER">object_name</replaceable> |
-  TABLE <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
+  COLLATION <replaceable class="parameter">object_name</replaceable> |
+  CONVERSION <replaceable class="parameter">object_name</replaceable> |
+  DOMAIN <replaceable class="parameter">object_name</replaceable> |
+  EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> |
+  FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> |
+  FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> |
+  FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> |
+  OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) |
+  OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
+  OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
+  [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
+  PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  SCHEMA <replaceable class="parameter">object_name</replaceable> |
+  SEQUENCE <replaceable class="parameter">object_name</replaceable> |
+  SERVER <replaceable class="parameter">object_name</replaceable> |
+  TABLE <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> |
   TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
-  TYPE <replaceable class="PARAMETER">object_name</replaceable> |
-  VIEW <replaceable class="PARAMETER">object_name</replaceable>
+  TYPE <replaceable class="parameter">object_name</replaceable> |
+  VIEW <replaceable class="parameter">object_name</replaceable>
 
 <phrase>and <replaceable>aggregate_signature</replaceable> is:</phrase>
 
@@ -89,14 +91,14 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
     <listitem>
      <para>
       This form moves the extension's objects into another schema. The
-      extension has to be <firstterm>relocatable</> for this command to
+      extension has to be <firstterm>relocatable</firstterm> for this command to
       succeed.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">member_object</replaceable></literal></term>
+    <term><literal>ADD <replaceable class="parameter">member_object</replaceable></literal></term>
     <listitem>
      <para>
       This form adds an existing object to the extension.  This is mainly
@@ -108,7 +110,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DROP <replaceable class="PARAMETER">member_object</replaceable></literal></term>
+    <term><literal>DROP <replaceable class="parameter">member_object</replaceable></literal></term>
     <listitem>
      <para>
       This form removes a member object from the extension.  This is mainly
@@ -119,13 +121,13 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
    </varlistentry>
    </variablelist>
 
-   See <xref linkend="extend-extensions"> for more information about these
+   See <xref linkend="extend-extensions"/> for more information about these
    operations.
   </para>
 
   <para>
    You must own the extension to use <command>ALTER EXTENSION</command>.
-   The <literal>ADD</>/<literal>DROP</> forms require ownership of the
+   The <literal>ADD</literal>/<literal>DROP</literal> forms require ownership of the
    added/dropped object as well.
   </para>
  </refsect1>
@@ -136,7 +138,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
   <para>
    <variablelist>
     <varlistentry>
-     <term><replaceable class="PARAMETER">name</replaceable></term>
+     <term><replaceable class="parameter">name</replaceable></term>
      <listitem>
       <para>
        The name of an installed extension.
@@ -145,19 +147,19 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="PARAMETER">new_version</replaceable></term>
+     <term><replaceable class="parameter">new_version</replaceable></term>
      <listitem>
       <para>
        The desired new version of the extension.  This can be written as
        either an identifier or a string literal.  If not specified,
-       <command>ALTER EXTENSION UPDATE</> attempts to update to whatever is
+       <command>ALTER EXTENSION UPDATE</command> attempts to update to whatever is
        shown as the default version in the extension's control file.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="PARAMETER">new_schema</replaceable></term>
+     <term><replaceable class="parameter">new_schema</replaceable></term>
      <listitem>
       <para>
        The new schema for the extension.
@@ -170,12 +172,14 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
      <term><replaceable class="parameter">aggregate_name</replaceable></term>
      <term><replaceable class="parameter">function_name</replaceable></term>
      <term><replaceable class="parameter">operator_name</replaceable></term>
+     <term><replaceable class="parameter">procedure_name</replaceable></term>
+     <term><replaceable class="parameter">routine_name</replaceable></term>
      <listitem>
       <para>
        The name of an object to be added to or removed from the extension.
        Names of tables,
        aggregates, domains, foreign tables, functions, operators,
-       operator classes, operator families, sequences, text search objects,
+       operator classes, operator families, procedures, routines, sequences, text search objects,
        types, and views can be schema-qualified.
       </para>
      </listitem>
@@ -204,15 +208,15 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
 
      <listitem>
       <para>
-       The mode of a function or aggregate
-       argument: <literal>IN</>, <literal>OUT</>,
-       <literal>INOUT</>, or <literal>VARIADIC</>.
-       If omitted, the default is <literal>IN</>.
+       The mode of a function, procedure, or aggregate
+       argument: <literal>IN</literal>, <literal>OUT</literal>,
+       <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+       If omitted, the default is <literal>IN</literal>.
        Note that <command>ALTER EXTENSION</command> does not actually pay
-       any attention to <literal>OUT</> arguments, since only the input
+       any attention to <literal>OUT</literal> arguments, since only the input
        arguments are needed to determine the function's identity.
-       So it is sufficient to list the <literal>IN</>, <literal>INOUT</>,
-       and <literal>VARIADIC</> arguments.
+       So it is sufficient to list the <literal>IN</literal>, <literal>INOUT</literal>,
+       and <literal>VARIADIC</literal> arguments.
       </para>
      </listitem>
     </varlistentry>
@@ -222,7 +226,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
 
      <listitem>
       <para>
-       The name of a function or aggregate argument.
+       The name of a function, procedure, or aggregate argument.
        Note that <command>ALTER EXTENSION</command> does not actually pay
        any attention to argument names, since only the argument data
        types are needed to determine the function's identity.
@@ -235,7 +239,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
 
      <listitem>
       <para>
-       The data type of a function or aggregate argument.
+       The data type of a function, procedure, or aggregate argument.
       </para>
      </listitem>
     </varlistentry>
@@ -246,7 +250,7 @@ ALTER EXTENSION <replaceable class="PARAMETER">name</replaceable> DROP <replacea
      <listitem>
       <para>
        The data type(s) of the operator's arguments (optionally
-       schema-qualified).  Write <literal>NONE</> for the missing argument
+       schema-qualified).  Write <literal>NONE</literal> for the missing argument
        of a prefix or postfix operator.
       </para>
      </listitem>
@@ -314,17 +318,17 @@ ALTER EXTENSION hstore ADD FUNCTION populate_record(anyelement, hstore);
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER EXTENSION</command> is a <productname>PostgreSQL</>
+   <command>ALTER EXTENSION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-ALTEREXTENSION-see-also">
+ <refsect1 id="sql-alterextension-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createextension"></member>
-   <member><xref linkend="sql-dropextension"></member>
+   <member><xref linkend="sql-createextension"/></member>
+   <member><xref linkend="sql-dropextension"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
index 3f5fb0f77e..14f3d616e7 100644
--- a/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_foreign_data_wrapper.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERFOREIGNDATAWRAPPER">
+<refentry id="sql-alterforeigndatawrapper">
  <indexterm zone="sql-alterforeigndatawrapper">
   <primary>ALTER FOREIGN DATA WRAPPER</primary>
  </indexterm>
@@ -24,7 +24,7 @@ PostgreSQL documentation
 ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
     [ HANDLER <replaceable class="parameter">handler_function</replaceable> | NO HANDLER ]
     [ VALIDATOR <replaceable class="parameter">validator_function</replaceable> | NO VALIDATOR ]
-    [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ]) ]
+    [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ]) ]
 ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 </synopsis>
@@ -93,11 +93,11 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN
      <para>
       Note that it is possible that pre-existing options of the foreign-data
       wrapper, or of dependent servers, user mappings, or foreign tables, are
-      invalid according to the new validator.  <productname>PostgreSQL</> does
+      invalid according to the new validator.  <productname>PostgreSQL</productname> does
       not check for this.  It is up to the user to make sure that these
       options are correct before using the modified foreign-data wrapper.
       However, any options specified in this <command>ALTER FOREIGN DATA
-      WRAPPER</> command will be checked using the new validator.
+      WRAPPER</command> command will be checked using the new validator.
      </para>
     </listitem>
    </varlistentry>
@@ -113,12 +113,12 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term>
     <listitem>
      <para>
       Change options for the foreign-data
-      wrapper.  <literal>ADD</>, <literal>SET</>, and <literal>DROP</>
-      specify the action to be performed.  <literal>ADD</> is assumed
+      wrapper.  <literal>ADD</literal>, <literal>SET</literal>, and <literal>DROP</literal>
+      specify the action to be performed.  <literal>ADD</literal> is assumed
       if no operation is explicitly specified.  Option names must be
       unique; names and values are also validated using the foreign
       data wrapper's validator function, if any.
@@ -127,7 +127,7 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the foreign-data wrapper.
@@ -150,16 +150,16 @@ ALTER FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable> REN
   <title>Examples</title>
 
   <para>
-   Change a foreign-data wrapper <literal>dbi</>, add
-   option <literal>foo</>, drop <literal>bar</>:
+   Change a foreign-data wrapper <literal>dbi</literal>, add
+   option <literal>foo</literal>, drop <literal>bar</literal>:
 <programlisting>
 ALTER FOREIGN DATA WRAPPER dbi OPTIONS (ADD foo '1', DROP 'bar');
 </programlisting>
   </para>
 
   <para>
-   Change the foreign-data wrapper <literal>dbi</> validator
-   to <literal>bob.myvalidator</>:
+   Change the foreign-data wrapper <literal>dbi</literal> validator
+   to <literal>bob.myvalidator</literal>:
 <programlisting>
 ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
 </programlisting></para>
@@ -171,7 +171,7 @@ ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
   <para>
    <command>ALTER FOREIGN DATA WRAPPER</command> conforms to ISO/IEC
    9075-9 (SQL/MED), except that the <literal>HANDLER</literal>,
-   <literal>VALIDATOR</>, <literal>OWNER TO</>, and <literal>RENAME</literal>
+   <literal>VALIDATOR</literal>, <literal>OWNER TO</literal>, and <literal>RENAME</literal>
    clauses are extensions.
   </para>
  </refsect1>
@@ -180,8 +180,8 @@ ALTER FOREIGN DATA WRAPPER dbi VALIDATOR bob.myvalidator;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigndatawrapper"></member>
-   <member><xref linkend="sql-dropforeigndatawrapper"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"/></member>
+   <member><xref linkend="sql-dropforeigndatawrapper"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_foreign_table.sgml b/doc/src/sgml/ref/alter_foreign_table.sgml
index b1692842b2..f266be0c37 100644
--- a/doc/src/sgml/ref/alter_foreign_table.sgml
+++ b/doc/src/sgml/ref/alter_foreign_table.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/rel/alter_foreign_table.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERFOREIGNTABLE">
+<refentry id="sql-alterforeigntable">
  <indexterm zone="sql-alterforeigntable">
   <primary>ALTER FOREIGN TABLE</primary>
  </indexterm>
@@ -21,41 +21,41 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
-    <replaceable class="PARAMETER">action</replaceable> [, ... ]
-ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
-    RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable>
-ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
-
-<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
-
-    ADD [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
-    DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> [ RESTRICT | CASCADE ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable>
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET | DROP } NOT NULL
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable>
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ])
-    ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]
-    VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
-    DROP CONSTRAINT [ IF EXISTS ]  <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
-    DISABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ]
-    ENABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ]
-    ENABLE REPLICA TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable>
-    ENABLE ALWAYS TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable>
+ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
+    <replaceable class="parameter">action</replaceable> [, ... ]
+ALTER FOREIGN TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
+    RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable>
+ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
+
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
+
+    ADD [ COLUMN ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
+    DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="parameter">column_name</replaceable> [ RESTRICT | CASCADE ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET | DROP } NOT NULL
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ])
+    ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]
+    VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable>
+    DROP CONSTRAINT [ IF EXISTS ]  <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ]
+    DISABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
+    ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
+    ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable>
+    ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable>
     SET WITH OIDS
     SET WITHOUT OIDS
-    INHERIT <replaceable class="PARAMETER">parent_table</replaceable>
-    NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable>
-    OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-    OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ])
+    INHERIT <replaceable class="parameter">parent_table</replaceable>
+    NO INHERIT <replaceable class="parameter">parent_table</replaceable>
+    OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+    OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ])
 </synopsis>
  </refsynopsisdiv>
 
@@ -72,7 +72,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <listitem>
      <para>
       This form adds a new column to the foreign table, using the same syntax as
-      <xref linkend="SQL-CREATEFOREIGNTABLE">.
+      <xref linkend="sql-createforeigntable"/>.
       Unlike the case when adding a column to a regular table, nothing happens
       to the underlying storage: this action simply declares that
       some new column is now accessible through the foreign table.
@@ -85,7 +85,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <listitem>
      <para>
       This form drops a column from a foreign table.
-      You will need to say <literal>CASCADE</> if
+      You will need to say <literal>CASCADE</literal> if
       anything outside the table depends on the column; for example,
       views.
       If <literal>IF EXISTS</literal> is specified and the column
@@ -101,7 +101,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      <para>
       This form changes the type of a column of a foreign table.
       Again, this has no effect on any underlying storage: this action simply
-      changes the type that <productname>PostgreSQL</> believes the column to
+      changes the type that <productname>PostgreSQL</productname> believes the column to
       have.
      </para>
     </listitem>
@@ -113,7 +113,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      <para>
       These forms set or remove the default value for a column.
       Default values only apply in subsequent <command>INSERT</command>
-      or <command>UPDATE</> commands; they do not cause rows already in the
+      or <command>UPDATE</command> commands; they do not cause rows already in the
       table to change.
      </para>
     </listitem>
@@ -134,20 +134,20 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      <para>
       This form
       sets the per-column statistics-gathering target for subsequent
-      <xref linkend="sql-analyze"> operations.
-      See the similar form of <xref linkend="sql-altertable">
+      <xref linkend="sql-analyze"/> operations.
+      See the similar form of <xref linkend="sql-altertable"/>
       for more details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term>
-    <term><literal>RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )</literal></term>
+    <term><literal>SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
+    <term><literal>RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form sets or resets per-attribute options.
-      See the similar form of <xref linkend="sql-altertable">
+      See the similar form of <xref linkend="sql-altertable"/>
       for more details.
      </para>
     </listitem>
@@ -160,7 +160,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <listitem>
      <para>
       This form sets the storage mode for a column.
-      See the similar form of <xref linkend="sql-altertable">
+      See the similar form of <xref linkend="sql-altertable"/>
       for more details.
       Note that the storage mode has no effect unless the table's
       foreign-data wrapper chooses to pay attention to it.
@@ -169,12 +169,12 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term>
+    <term><literal>ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]</literal></term>
     <listitem>
      <para>
       This form adds a new constraint to a foreign table, using the same
-      syntax as <xref linkend="SQL-CREATEFOREIGNTABLE">.
-      Currently only <literal>CHECK</> constraints are supported.
+      syntax as <xref linkend="sql-createforeigntable"/>.
+      Currently only <literal>CHECK</literal> constraints are supported.
      </para>
 
      <para>
@@ -182,8 +182,8 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
       done to verify the constraint is correct; rather, this action simply
       declares that some new condition should be assumed to hold for all rows
       in the foreign table.  (See the discussion
-      in <xref linkend="SQL-CREATEFOREIGNTABLE">.)
-      If the constraint is marked <literal>NOT VALID</>, then it isn't
+      in <xref linkend="sql-createforeigntable"/>.)
+      If the constraint is marked <literal>NOT VALID</literal>, then it isn't
       assumed to hold, but is only recorded for possible future use.
      </para>
     </listitem>
@@ -217,7 +217,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <listitem>
      <para>
       These forms configure the firing of trigger(s) belonging to the foreign
-      table.  See the similar form of <xref linkend="sql-altertable"> for more
+      table.  See the similar form of <xref linkend="sql-altertable"/> for more
       details.
      </para>
     </listitem>
@@ -228,16 +228,16 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <listitem>
      <para>
       This form adds an <literal>oid</literal> system column to the
-      table (see <xref linkend="ddl-system-columns">).
+      table (see <xref linkend="ddl-system-columns"/>).
       It does nothing if the table already has OIDs.
       Unless the table's foreign-data wrapper supports OIDs, this column
       will simply read as zeroes.
      </para>
 
      <para>
-      Note that this is not equivalent to <literal>ADD COLUMN oid oid</>;
+      Note that this is not equivalent to <literal>ADD COLUMN oid oid</literal>;
       that would add a normal column that happened to be named
-      <literal>oid</>, not a system column.
+      <literal>oid</literal>, not a system column.
      </para>
     </listitem>
    </varlistentry>
@@ -256,19 +256,19 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    </varlistentry>
 
    <varlistentry>
-    <term><literal>INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term>
+    <term><literal>INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term>
     <listitem>
      <para>
       This form adds the target foreign table as a new child of the specified
       parent table.
-      See the similar form of <xref linkend="sql-altertable">
+      See the similar form of <xref linkend="sql-altertable"/>
       for more details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term>
+    <term><literal>NO INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term>
     <listitem>
      <para>
       This form removes the target foreign table from the list of children of
@@ -288,12 +288,12 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term>
     <listitem>
      <para>
       Change options for the foreign table or one of its columns.
-      <literal>ADD</>, <literal>SET</>, and <literal>DROP</>
-      specify the action to be performed.  <literal>ADD</> is assumed
+      <literal>ADD</literal>, <literal>SET</literal>, and <literal>DROP</literal>
+      specify the action to be performed.  <literal>ADD</literal> is assumed
       if no operation is explicitly specified.  Duplicate option names are not
       allowed (although it's OK for a table option and a column option to have
       the same name).  Option names and values are also validated using the
@@ -325,7 +325,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
   </para>
 
   <para>
-   All the actions except <literal>RENAME</literal> and <literal>SET SCHEMA</>
+   All the actions except <literal>RENAME</literal> and <literal>SET SCHEMA</literal>
    can be combined into
    a list of multiple alterations to apply in parallel.  For example, it
    is possible to add several columns and/or alter the type of several
@@ -333,13 +333,13 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
   </para>
 
   <para>
-   If the command is written as <literal>ALTER FOREIGN TABLE IF EXISTS ...</>
+   If the command is written as <literal>ALTER FOREIGN TABLE IF EXISTS ...</literal>
    and the foreign table does not exist, no error is thrown. A notice is
    issued in this case.
   </para>
 
   <para>
-   You must own the table to use <command>ALTER FOREIGN TABLE</>.
+   You must own the table to use <command>ALTER FOREIGN TABLE</command>.
    To change the schema of a foreign table, you must also have
    <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
@@ -358,21 +358,21 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
     <variablelist>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name (possibly schema-qualified) of an existing foreign table to
-        alter. If <literal>ONLY</> is specified before the table name, only
-        that table is altered. If <literal>ONLY</> is not specified, the table
+        alter. If <literal>ONLY</literal> is specified before the table name, only
+        that table is altered. If <literal>ONLY</literal> is not specified, the table
         and all its descendant tables (if any) are altered.  Optionally,
-        <literal>*</> can be specified after the table name to explicitly
+        <literal>*</literal> can be specified after the table name to explicitly
         indicate that descendant tables are included.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">column_name</replaceable></term>
+      <term><replaceable class="parameter">column_name</replaceable></term>
       <listitem>
        <para>
         Name of a new or existing column.
@@ -381,7 +381,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_column_name</replaceable></term>
+      <term><replaceable class="parameter">new_column_name</replaceable></term>
       <listitem>
        <para>
         New name for an existing column.
@@ -390,7 +390,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_name</replaceable></term>
+      <term><replaceable class="parameter">new_name</replaceable></term>
       <listitem>
        <para>
         New name for the table.
@@ -399,7 +399,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">data_type</replaceable></term>
+      <term><replaceable class="parameter">data_type</replaceable></term>
       <listitem>
        <para>
         Data type of the new column, or new data type for an existing
@@ -409,7 +409,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">table_constraint</replaceable></term>
+      <term><replaceable class="parameter">table_constraint</replaceable></term>
       <listitem>
        <para>
         New table constraint for the foreign table.
@@ -418,7 +418,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
+      <term><replaceable class="parameter">constraint_name</replaceable></term>
       <listitem>
        <para>
         Name of an existing constraint to drop.
@@ -433,7 +433,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
         Automatically drop objects that depend on the dropped column
         or constraint (for example, views referencing the column),
         and in turn all objects that depend on those objects
-        (see <xref linkend="ddl-depend">).
+        (see <xref linkend="ddl-depend"/>).
        </para>
       </listitem>
      </varlistentry>
@@ -449,7 +449,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">trigger_name</replaceable></term>
+      <term><replaceable class="parameter">trigger_name</replaceable></term>
       <listitem>
        <para>
         Name of a single trigger to disable or enable.
@@ -480,7 +480,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">parent_table</replaceable></term>
+      <term><replaceable class="parameter">parent_table</replaceable></term>
       <listitem>
        <para>
         A parent table to associate or de-associate with this foreign table.
@@ -489,7 +489,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+      <term><replaceable class="parameter">new_owner</replaceable></term>
       <listitem>
        <para>
         The user name of the new owner of the table.
@@ -498,7 +498,7 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_schema</replaceable></term>
+      <term><replaceable class="parameter">new_schema</replaceable></term>
       <listitem>
        <para>
         The name of the schema to which the table will be moved.
@@ -518,14 +518,14 @@ ALTER FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    <para>
     Consistency with the foreign server is not checked when a column is added
     or removed with <literal>ADD COLUMN</literal> or
-    <literal>DROP COLUMN</literal>, a <literal>NOT NULL</>
-    or <literal>CHECK</> constraint is added, or a column type is changed
-    with <literal>SET DATA TYPE</>.  It is the user's responsibility to ensure
+    <literal>DROP COLUMN</literal>, a <literal>NOT NULL</literal>
+    or <literal>CHECK</literal> constraint is added, or a column type is changed
+    with <literal>SET DATA TYPE</literal>.  It is the user's responsibility to ensure
     that the table definition matches the remote side.
    </para>
 
    <para>
-    Refer to <xref linkend="sql-createforeigntable"> for a further description of valid
+    Refer to <xref linkend="sql-createforeigntable"/> for a further description of valid
     parameters.
    </para>
  </refsect1>
@@ -552,16 +552,16 @@ ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2 'v
   <title>Compatibility</title>
 
   <para>
-   The forms <literal>ADD</literal>, <literal>DROP</>,
+   The forms <literal>ADD</literal>, <literal>DROP</literal>,
    and <literal>SET DATA TYPE</literal>
    conform with the SQL standard.  The other forms are
    <productname>PostgreSQL</productname> extensions of the SQL standard.
    Also, the ability to specify more than one manipulation in a single
-   <command>ALTER FOREIGN TABLE</> command is an extension.
+   <command>ALTER FOREIGN TABLE</command> command is an extension.
   </para>
 
   <para>
-   <command>ALTER FOREIGN TABLE DROP COLUMN</> can be used to drop the only
+   <command>ALTER FOREIGN TABLE DROP COLUMN</command> can be used to drop the only
    column of a foreign table, leaving a zero-column table.  This is an
    extension of SQL, which disallows zero-column foreign tables.
   </para>
@@ -571,8 +571,8 @@ ALTER FOREIGN TABLE myschema.distributors OPTIONS (ADD opt1 'value', SET opt2 'v
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigntable"></member>
-   <member><xref linkend="sql-dropforeigntable"></member>
+   <member><xref linkend="sql-createforeigntable"/></member>
+   <member><xref linkend="sql-dropforeigntable"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_function.sgml b/doc/src/sgml/ref/alter_function.sgml
index 168eeb7c52..d8747e0748 100644
--- a/doc/src/sgml/ref/alter_function.sgml
+++ b/doc/src/sgml/ref/alter_function.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_function.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERFUNCTION">
+<refentry id="sql-alterfunction">
  <indexterm zone="sql-alterfunction">
   <primary>ALTER FUNCTION</primary>
  </indexterm>
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
-    <replaceable class="PARAMETER">action</replaceable> [ ... ] [ RESTRICT ]
+    <replaceable class="parameter">action</replaceable> [ ... ] [ RESTRICT ]
 ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
     RENAME TO <replaceable>new_name</replaceable>
 ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
@@ -32,7 +32,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
 ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
     DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
 
-<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
 
     CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT
     IMMUTABLE | STABLE | VOLATILE | [ NOT ] LEAKPROOF
@@ -56,8 +56,8 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
   </para>
 
   <para>
-   You must own the function to use <command>ALTER FUNCTION</>.
-   To change a function's schema, you must also have <literal>CREATE</>
+   You must own the function to use <command>ALTER FUNCTION</command>.
+   To change a function's schema, you must also have <literal>CREATE</literal>
    privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
@@ -86,14 +86,14 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
 
     <listitem>
      <para>
-      The mode of an argument: <literal>IN</>, <literal>OUT</>,
-      <literal>INOUT</>, or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of an argument: <literal>IN</literal>, <literal>OUT</literal>,
+      <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
       Note that <command>ALTER FUNCTION</command> does not actually pay
-      any attention to <literal>OUT</> arguments, since only the input
+      any attention to <literal>OUT</literal> arguments, since only the input
       arguments are needed to determine the function's identity.
-      So it is sufficient to list the <literal>IN</>, <literal>INOUT</>,
-      and <literal>VARIADIC</> arguments.
+      So it is sufficient to list the <literal>IN</literal>, <literal>INOUT</literal>,
+      and <literal>VARIADIC</literal> arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -171,7 +171,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
        null. <literal>RETURNS NULL ON NULL INPUT</literal> or
        <literal>STRICT</literal> changes the function so that it is not
        invoked if any of its arguments are null; instead, a null result
-       is assumed automatically.  See <xref linkend="sql-createfunction">
+       is assumed automatically.  See <xref linkend="sql-createfunction"/>
        for more information.
       </para>
      </listitem>
@@ -185,7 +185,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
      <listitem>
       <para>
        Change the volatility of the function to the specified setting.
-       See <xref linkend="sql-createfunction"> for details.
+       See <xref linkend="sql-createfunction"/> for details.
       </para>
     </listitem>
    </varlistentry>
@@ -198,7 +198,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
      <para>
       Change whether the function is a security definer or not. The
       key word <literal>EXTERNAL</literal> is ignored for SQL
-      conformance. See <xref linkend="sql-createfunction"> for more information about
+      conformance. See <xref linkend="sql-createfunction"/> for more information about
       this capability.
      </para>
     </listitem>
@@ -210,7 +210,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
     <listitem>
      <para>
       Change whether the function is deemed safe for parallelism.
-      See <xref linkend="sql-createfunction"> for details.
+      See <xref linkend="sql-createfunction"/> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -220,7 +220,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
     <listitem>
      <para>
       Change whether the function is considered leakproof or not.
-      See <xref linkend="sql-createfunction"> for more information about
+      See <xref linkend="sql-createfunction"/> for more information about
       this capability.
      </para>
     </listitem>
@@ -232,7 +232,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
      <listitem>
       <para>
        Change the estimated execution cost of the function.
-       See <xref linkend="sql-createfunction"> for more information.
+       See <xref linkend="sql-createfunction"/> for more information.
       </para>
      </listitem>
    </varlistentry>
@@ -243,7 +243,7 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
      <listitem>
       <para>
        Change the estimated number of rows returned by a set-returning
-       function.  See <xref linkend="sql-createfunction"> for more information.
+       function.  See <xref linkend="sql-createfunction"/> for more information.
       </para>
      </listitem>
    </varlistentry>
@@ -260,14 +260,14 @@ ALTER FUNCTION <replaceable>name</replaceable> [ ( [ [ <replaceable class="param
         setting is removed, so that the function executes with the value
         present in its environment.  Use <literal>RESET
         ALL</literal> to clear all function-local settings.
-        <literal>SET FROM CURRENT</> saves the value of the parameter that
-        is current when <command>ALTER FUNCTION</> is executed as the value
+        <literal>SET FROM CURRENT</literal> saves the value of the parameter that
+        is current when <command>ALTER FUNCTION</command> is executed as the value
         to be applied when the function is entered.
        </para>
 
        <para>
-        See <xref linkend="sql-set"> and
-        <xref linkend="runtime-config">
+        See <xref linkend="sql-set"/> and
+        <xref linkend="runtime-config"/>
         for more information about allowed parameter names and values.
        </para>
       </listitem>
@@ -329,7 +329,7 @@ ALTER FUNCTION check_password(text) SET search_path = admin, pg_temp;
   </para>
 
   <para>
-   To disable automatic setting of <varname>search_path</> for a function:
+   To disable automatic setting of <varname>search_path</varname> for a function:
 <programlisting>
 ALTER FUNCTION check_password(text) RESET search_path;
 </programlisting>
@@ -343,13 +343,13 @@ ALTER FUNCTION check_password(text) RESET search_path;
 
   <para>
    This statement is partially compatible with the <command>ALTER
-   FUNCTION</> statement in the SQL standard. The standard allows more
+   FUNCTION</command> statement in the SQL standard. The standard allows more
    properties of a function to be modified, but does not provide the
    ability to rename a function, make a function a security definer,
    attach configuration parameter values to a function,
    or change the owner, schema, or volatility of a function. The standard also
-   requires the <literal>RESTRICT</> key word, which is optional in
-   <productname>PostgreSQL</>.
+   requires the <literal>RESTRICT</literal> key word, which is optional in
+   <productname>PostgreSQL</productname>.
   </para>
  </refsect1>
 
@@ -357,8 +357,10 @@ ALTER FUNCTION check_password(text) RESET search_path;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-dropfunction"></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-dropfunction"/></member>
+   <member><xref linkend="sql-alterprocedure"/></member>
+   <member><xref linkend="sql-alterroutine"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_group.sgml b/doc/src/sgml/ref/alter_group.sgml
index adf6f7e932..39cc2b88cf 100644
--- a/doc/src/sgml/ref/alter_group.sgml
+++ b/doc/src/sgml/ref/alter_group.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_group.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERGROUP">
+<refentry id="sql-altergroup">
  <indexterm zone="sql-altergroup">
   <primary>ALTER GROUP</primary>
  </indexterm>
@@ -21,16 +21,16 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER GROUP <replaceable class="PARAMETER">role_specification</replaceable> ADD USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ]
-ALTER GROUP <replaceable class="PARAMETER">role_specification</replaceable> DROP USER <replaceable class="PARAMETER">user_name</replaceable> [, ... ]
+ALTER GROUP <replaceable class="parameter">role_specification</replaceable> ADD USER <replaceable class="parameter">user_name</replaceable> [, ... ]
+ALTER GROUP <replaceable class="parameter">role_specification</replaceable> DROP USER <replaceable class="parameter">user_name</replaceable> [, ... ]
 
-<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
 
-    <replaceable class="PARAMETER">role_name</replaceable>
+    <replaceable class="parameter">role_name</replaceable>
   | CURRENT_USER
   | SESSION_USER
 
-ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER GROUP <replaceable class="parameter">group_name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -46,18 +46,18 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r
 
   <para>
    The first two variants add users to a group or remove them from a group.
-   (Any role can play the part of either a <quote>user</> or a
-   <quote>group</> for this purpose.)  These variants are effectively
+   (Any role can play the part of either a <quote>user</quote> or a
+   <quote>group</quote> for this purpose.)  These variants are effectively
    equivalent to granting or revoking membership in the role named as the
-   <quote>group</>; so the preferred way to do this is to use
-   <xref linkend="SQL-GRANT"> or
-   <xref linkend="SQL-REVOKE">.
+   <quote>group</quote>; so the preferred way to do this is to use
+   <xref linkend="sql-grant"/> or
+   <xref linkend="sql-revoke"/>.
   </para>
 
   <para>
    The third variant changes the name of the group.  This is exactly
    equivalent to renaming the role with
-   <xref linkend="sql-alterrole">.
+   <xref linkend="sql-alterrole"/>.
   </para>
  </refsect1>
 
@@ -66,7 +66,7 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">group_name</replaceable></term>
+    <term><replaceable class="parameter">group_name</replaceable></term>
     <listitem>
      <para>
       The name of the group (role) to modify.
@@ -75,11 +75,11 @@ ALTER GROUP <replaceable class="PARAMETER">group_name</replaceable> RENAME TO <r
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">user_name</replaceable></term>
+    <term><replaceable class="parameter">user_name</replaceable></term>
     <listitem>
      <para>
       Users (roles) that are to be added to or removed from the group.
-      The users must already exist; <command>ALTER GROUP</> does not
+      The users must already exist; <command>ALTER GROUP</command> does not
       create or drop users.
      </para>
     </listitem>
@@ -125,9 +125,9 @@ ALTER GROUP workers DROP USER beth;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-grant"></member>
-   <member><xref linkend="sql-revoke"></member>
-   <member><xref linkend="sql-alterrole"></member>
+   <member><xref linkend="sql-grant"/></member>
+   <member><xref linkend="sql-revoke"/></member>
+   <member><xref linkend="sql-alterrole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_index.sgml b/doc/src/sgml/ref/alter_index.sgml
index ad77b5743a..c0606689f0 100644
--- a/doc/src/sgml/ref/alter_index.sgml
+++ b/doc/src/sgml/ref/alter_index.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_index.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERINDEX">
+<refentry id="sql-alterindex">
  <indexterm zone="sql-alterindex">
   <primary>ALTER INDEX</primary>
  </indexterm>
@@ -21,13 +21,16 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> SET TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable>
-ALTER INDEX <replaceable class="PARAMETER">name</replaceable> DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable>
-ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-ALTER INDEX [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )
-ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ]
-    SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ]
+ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
+ALTER INDEX <replaceable class="parameter">name</replaceable> ATTACH PARTITION <replaceable class="parameter">index_name</replaceable>
+ALTER INDEX <replaceable class="parameter">name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable>
+ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
+ALTER INDEX [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable>
+    SET STATISTICS <replaceable class="parameter">integer</replaceable>
+ALTER INDEX ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ]
+    SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -68,7 +71,20 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
       this command, use <command>ALTER DATABASE</command> or explicit
       <command>ALTER INDEX</command> invocations instead if desired.
       See also
-      <xref linkend="SQL-CREATETABLESPACE">.
+      <xref linkend="sql-createtablespace"/>.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>ATTACH PARTITION</literal></term>
+    <listitem>
+     <para>
+      Causes the named index to become attached to the altered index.
+      The named index must be on a partition of the table containing the
+      index being altered, and have an equivalent definition.  An attached
+      index cannot be dropped by itself, and will automatically be dropped
+      if its parent index is dropped.
      </para>
     </listitem>
    </varlistentry>
@@ -84,32 +100,51 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term>
+    <term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form changes one or more index-method-specific storage parameters
       for the index.  See
-      <xref linkend="SQL-CREATEINDEX">
+      <xref linkend="sql-createindex"/>
       for details on the available parameters.  Note that the index contents
       will not be modified immediately by this command; depending on the
       parameter you might need to rebuild the index with
-      <xref linkend="SQL-REINDEX">
+      <xref linkend="sql-reindex"/>
       to get the desired effects.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )</literal></term>
+    <term><literal>RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form resets one or more index-method-specific storage parameters to
-      their defaults.  As with <literal>SET</>, a <literal>REINDEX</literal>
+      their defaults.  As with <literal>SET</literal>, a <literal>REINDEX</literal>
       might be needed to update the index entirely.
      </para>
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><literal>ALTER [ COLUMN ] <replaceable class="parameter">column_number</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable></literal></term>
+    <listitem>
+     <para>
+      This form sets the per-column statistics-gathering target for
+      subsequent <xref linkend="sql-analyze"/> operations, though can
+      be used only on index columns that are defined as an expression.
+      Since expressions lack a unique name, we refer to them using the
+      ordinal number of the index column. 
+      The target can be set in the range 0 to 10000; alternatively, set it
+      to -1 to revert to using the system default statistics
+      target (<xref linkend="guc-default-statistics-target"/>).
+      For more information on the use of statistics by the
+      <productname>PostgreSQL</productname> query planner, refer to
+      <xref linkend="planner-stats"/>.
+     </para>
+    </listitem>
+   </varlistentry>
+
   </variablelist>
   </para>
 
@@ -131,7 +166,17 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">column_number</replaceable></term>
+      <listitem>
+       <para>
+        The ordinal number refers to the ordinal (left-to-right) position
+        of the index column.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name (possibly schema-qualified) of an existing index to
@@ -141,7 +186,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_name</replaceable></term>
+      <term><replaceable class="parameter">new_name</replaceable></term>
       <listitem>
        <para>
         The new name for the index.
@@ -150,7 +195,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">tablespace_name</replaceable></term>
+      <term><replaceable class="parameter">tablespace_name</replaceable></term>
       <listitem>
        <para>
         The tablespace to which the index will be moved.
@@ -159,7 +204,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">extension_name</replaceable></term>
+      <term><replaceable class="parameter">extension_name</replaceable></term>
       <listitem>
        <para>
         The name of the extension that the index is to depend on.
@@ -168,7 +213,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">storage_parameter</replaceable></term>
+      <term><replaceable class="parameter">storage_parameter</replaceable></term>
       <listitem>
        <para>
         The name of an index-method-specific storage parameter.
@@ -177,7 +222,7 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">value</replaceable></term>
+      <term><replaceable class="parameter">value</replaceable></term>
       <listitem>
        <para>
         The new value for an index-method-specific storage parameter.
@@ -194,13 +239,13 @@ ALTER INDEX ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable>
 
    <para>
     These operations are also possible using
-    <xref linkend="SQL-ALTERTABLE">.
-    <command>ALTER INDEX</> is in fact just an alias for the forms
-    of <command>ALTER TABLE</> that apply to indexes.
+    <xref linkend="sql-altertable"/>.
+    <command>ALTER INDEX</command> is in fact just an alias for the forms
+    of <command>ALTER TABLE</command> that apply to indexes.
    </para>
 
    <para>
-    There was formerly an <command>ALTER INDEX OWNER</> variant, but
+    There was formerly an <command>ALTER INDEX OWNER</command> variant, but
     this is now ignored (with a warning).  An index cannot have an owner
     different from its table's owner.  Changing the table's owner
     automatically changes the index as well.
@@ -235,13 +280,21 @@ ALTER INDEX distributors SET (fillfactor = 75);
 REINDEX INDEX distributors;
 </programlisting></para>
 
+  <para>
+   Set the statistics-gathering target for an expression index:
+<programlisting>
+CREATE INDEX coord_idx ON measured (x, y, (z + t));
+ALTER INDEX coord_idx ALTER COLUMN 3 SET STATISTICS 1000;
+</programlisting>
+  </para>
+
  </refsect1>
 
  <refsect1>
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER INDEX</> is a <productname>PostgreSQL</productname>
+   <command>ALTER INDEX</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -251,8 +304,8 @@ REINDEX INDEX distributors;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createindex"></member>
-   <member><xref linkend="sql-reindex"></member>
+   <member><xref linkend="sql-createindex"/></member>
+   <member><xref linkend="sql-reindex"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_language.sgml b/doc/src/sgml/ref/alter_language.sgml
index 63d9ecd924..eac63dec13 100644
--- a/doc/src/sgml/ref/alter_language.sgml
+++ b/doc/src/sgml/ref/alter_language.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_language.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERLANGUAGE">
+<refentry id="sql-alterlanguage">
  <indexterm zone="sql-alterlanguage">
   <primary>ALTER LANGUAGE</primary>
  </indexterm>
@@ -83,8 +83,8 @@ ALTER [ PROCEDURAL ] LANGUAGE <replaceable>name</replaceable> OWNER TO { <replac
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createlanguage"></member>
-   <member><xref linkend="sql-droplanguage"></member>
+   <member><xref linkend="sql-createlanguage"/></member>
+   <member><xref linkend="sql-droplanguage"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_large_object.sgml b/doc/src/sgml/ref/alter_large_object.sgml
index 5748d52db1..f4a9c9e2a5 100644
--- a/doc/src/sgml/ref/alter_large_object.sgml
+++ b/doc/src/sgml/ref/alter_large_object.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_large_object.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERLARGEOBJECT">
+<refentry id="sql-alterlargeobject">
  <indexterm zone="sql-alterlargeobject">
   <primary>ALTER LARGE OBJECT</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 </synopsis>
  </refsynopsisdiv>
 
@@ -73,7 +73,7 @@ ALTER LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="largeobjects"></member>
+   <member><xref linkend="largeobjects"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_materialized_view.sgml b/doc/src/sgml/ref/alter_materialized_view.sgml
index b88f5ac00f..03e3df1ffd 100644
--- a/doc/src/sgml/ref/alter_materialized_view.sgml
+++ b/doc/src/sgml/ref/alter_materialized_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_materialized_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERMATERIALIZEDVIEW">
+<refentry id="sql-altermaterializedview">
  <indexterm zone="sql-altermaterializedview">
   <primary>ALTER MATERIALIZED VIEW</primary>
  </indexterm>
@@ -21,30 +21,30 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    <replaceable class="PARAMETER">action</replaceable> [, ... ]
-ALTER MATERIALIZED VIEW <replaceable class="PARAMETER">name</replaceable>
-    DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable>
-ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable>
+ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    <replaceable class="parameter">action</replaceable> [, ... ]
+ALTER MATERIALIZED VIEW <replaceable class="parameter">name</replaceable>
+    DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable>
+ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable>
 ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
     RENAME TO <replaceable class="parameter">new_name</replaceable>
 ALTER MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
     SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
-ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ]
-    SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ]
+ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ]
+    SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ]
 
-<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
 
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable>
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-    CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
+    CLUSTER ON <replaceable class="parameter">index_name</replaceable>
     SET WITHOUT CLUSTER
-    SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-    RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )
-    OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+    SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+    RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
+    OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 </synopsis>
  </refsynopsisdiv>
 
@@ -58,8 +58,8 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
 
   <para>
    You must own the materialized view to use <command>ALTER MATERIALIZED
-   VIEW</>.  To change a materialized view's schema, you must also have
-   <literal>CREATE</> privilege on the new schema.
+   VIEW</command>.  To change a materialized view's schema, you must also have
+   <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the materialized view's schema.  (These restrictions enforce that altering
@@ -78,7 +78,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
    The statement subforms and actions available for
    <command>ALTER MATERIALIZED VIEW</command> are a subset of those available
    for <command>ALTER TABLE</command>, and have the same meaning when used for
-   materialized views.  See the descriptions for <xref linkend="sql-altertable">
+   materialized views.  See the descriptions for <xref linkend="sql-altertable"/>
    for details.
   </para>
  </refsect1>
@@ -98,7 +98,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="PARAMETER">column_name</replaceable></term>
+     <term><replaceable class="parameter">column_name</replaceable></term>
      <listitem>
       <para>
        Name of a new or existing column.
@@ -107,7 +107,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="PARAMETER">extension_name</replaceable></term>
+     <term><replaceable class="parameter">extension_name</replaceable></term>
      <listitem>
       <para>
        The name of the extension that the materialized view is to depend on.
@@ -116,7 +116,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="PARAMETER">new_column_name</replaceable></term>
+     <term><replaceable class="parameter">new_column_name</replaceable></term>
      <listitem>
       <para>
        New name for an existing column.
@@ -125,7 +125,7 @@ ALTER MATERIALIZED VIEW ALL IN TABLESPACE <replaceable class="parameter">name</r
     </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the materialized view.
@@ -177,9 +177,9 @@ ALTER MATERIALIZED VIEW foo RENAME TO bar;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-creatematerializedview"></member>
-   <member><xref linkend="sql-dropmaterializedview"></member>
-   <member><xref linkend="sql-refreshmaterializedview"></member>
+   <member><xref linkend="sql-creatematerializedview"/></member>
+   <member><xref linkend="sql-dropmaterializedview"/></member>
+   <member><xref linkend="sql-refreshmaterializedview"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_opclass.sgml b/doc/src/sgml/ref/alter_opclass.sgml
index 58de603aa4..59a64caa4f 100644
--- a/doc/src/sgml/ref/alter_opclass.sgml
+++ b/doc/src/sgml/ref/alter_opclass.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_opclass.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTEROPCLASS">
+<refentry id="sql-alteropclass">
  <indexterm zone="sql-alteropclass">
   <primary>ALTER OPERATOR CLASS</primary>
  </indexterm>
@@ -41,7 +41,7 @@ ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="p
   </para>
 
   <para>
-   You must own the operator class to use <command>ALTER OPERATOR CLASS</>.
+   You must own the operator class to use <command>ALTER OPERATOR CLASS</command>.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the operator class's schema.  (These restrictions enforce that altering the
@@ -116,9 +116,9 @@ ALTER OPERATOR CLASS <replaceable>name</replaceable> USING <replaceable class="p
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-dropopclass"></member>
-   <member><xref linkend="sql-alteropfamily"></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-dropopclass"/></member>
+   <member><xref linkend="sql-alteropfamily"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_operator.sgml b/doc/src/sgml/ref/alter_operator.sgml
index b2eaa7a263..b3bfa9ccbe 100644
--- a/doc/src/sgml/ref/alter_operator.sgml
+++ b/doc/src/sgml/ref/alter_operator.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_operator.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTEROPERATOR">
+<refentry id="sql-alteroperator">
  <indexterm zone="sql-alteroperator">
   <primary>ALTER OPERATOR</primary>
  </indexterm>
@@ -43,7 +43,7 @@ ALTER OPERATOR <replaceable>name</replaceable> ( { <replaceable>left_type</repla
   </para>
 
   <para>
-   You must own the operator to use <command>ALTER OPERATOR</>.
+   You must own the operator to use <command>ALTER OPERATOR</command>.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the operator's schema.  (These restrictions enforce that altering the owner
@@ -134,9 +134,9 @@ ALTER OPERATOR @@ (text, text) OWNER TO joe;
 </programlisting></para>
 
   <para>
-    Change the restriction and join selectivity estimator functions of a custom operator <literal>a && b</literal> for type <type>int[]</type>:
+    Change the restriction and join selectivity estimator functions of a custom operator <literal>a &amp;&amp; b</literal> for type <type>int[]</type>:
 <programlisting>
-ALTER OPERATOR && (_int4, _int4) SET (RESTRICT = _int_contsel, JOIN = _int_contjoinsel);
+ALTER OPERATOR &amp;&amp; (_int4, _int4) SET (RESTRICT = _int_contsel, JOIN = _int_contjoinsel);
 </programlisting></para>
 
  </refsect1>
@@ -154,8 +154,8 @@ ALTER OPERATOR && (_int4, _int4) SET (RESTRICT = _int_contsel, JOIN = _int_contj
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createoperator"></member>
-   <member><xref linkend="sql-dropoperator"></member>
+   <member><xref linkend="sql-createoperator"/></member>
+   <member><xref linkend="sql-dropoperator"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_opfamily.sgml b/doc/src/sgml/ref/alter_opfamily.sgml
index 0bafe5b8f8..3c0922c645 100644
--- a/doc/src/sgml/ref/alter_opfamily.sgml
+++ b/doc/src/sgml/ref/alter_opfamily.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_opfamily.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTEROPFAMILY">
+<refentry id="sql-alteropfamily">
  <indexterm zone="sql-alteropfamily">
   <primary>ALTER OPERATOR FAMILY</primary>
  </indexterm>
@@ -57,12 +57,12 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   <para>
    When operators and support functions are added to a family with
    <command>ALTER OPERATOR FAMILY</command>, they are not part of any
-   specific operator class within the family, but are just <quote>loose</>
+   specific operator class within the family, but are just <quote>loose</quote>
    within the family.  This indicates that these operators and functions
    are compatible with the family's semantics, but are not required for
    correct functioning of any specific index.  (Operators and functions
    that are so required should be declared as part of an operator class,
-   instead; see <xref linkend="sql-createopclass">.)
+   instead; see <xref linkend="sql-createopclass"/>.)
    <productname>PostgreSQL</productname> will allow loose members of a
    family to be dropped from the family at any time, but members of an
    operator class cannot be dropped without dropping the whole class and
@@ -74,7 +74,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   </para>
 
   <para>
-   You must be a superuser to use <command>ALTER OPERATOR FAMILY</>.
+   You must be a superuser to use <command>ALTER OPERATOR FAMILY</command>.
    (This restriction is made because an erroneous operator family definition
    could confuse or even crash the server.)
   </para>
@@ -88,7 +88,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   </para>
 
   <para>
-   Refer to <xref linkend="xindex"> for further information.
+   Refer to <xref linkend="xindex"/> for further information.
   </para>
  </refsect1>
 
@@ -139,15 +139,15 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
     <term><replaceable class="parameter">op_type</replaceable></term>
     <listitem>
      <para>
-      In an <literal>OPERATOR</> clause,
-      the operand data type(s) of the operator, or <literal>NONE</> to
+      In an <literal>OPERATOR</literal> clause,
+      the operand data type(s) of the operator, or <literal>NONE</literal> to
       signify a left-unary or right-unary operator.  Unlike the comparable
-      syntax in <command>CREATE OPERATOR CLASS</>, the operand data types
+      syntax in <command>CREATE OPERATOR CLASS</command>, the operand data types
       must always be specified.
      </para>
 
      <para>
-      In an <literal>ADD FUNCTION</> clause, the operand data type(s) the
+      In an <literal>ADD FUNCTION</literal> clause, the operand data type(s) the
       function is intended to support, if different from
       the input data type(s) of the function.  For B-tree comparison functions
       and hash functions it is not necessary to specify <replaceable
@@ -159,7 +159,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
      </para>
 
      <para>
-      In a <literal>DROP FUNCTION</> clause, the operand data type(s) the
+      In a <literal>DROP FUNCTION</literal> clause, the operand data type(s) the
       function is intended to support must be specified.
      </para>
     </listitem>
@@ -175,8 +175,8 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
      </para>
 
      <para>
-      If neither <literal>FOR SEARCH</> nor <literal>FOR ORDER BY</> is
-      specified, <literal>FOR SEARCH</> is the default.
+      If neither <literal>FOR SEARCH</literal> nor <literal>FOR ORDER BY</literal> is
+      specified, <literal>FOR SEARCH</literal> is the default.
      </para>
     </listitem>
    </varlistentry>
@@ -240,7 +240,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
  </variablelist>
 
   <para>
-   The <literal>OPERATOR</> and <literal>FUNCTION</>
+   The <literal>OPERATOR</literal> and <literal>FUNCTION</literal>
    clauses can appear in any order.
   </para>
 
@@ -250,10 +250,10 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   <title>Notes</title>
 
   <para>
-   Notice that the <literal>DROP</> syntax only specifies the <quote>slot</>
+   Notice that the <literal>DROP</literal> syntax only specifies the <quote>slot</quote>
    in the operator family, by strategy or support number and input data
    type(s).  The name of the operator or function occupying the slot is not
-   mentioned.  Also, for <literal>DROP FUNCTION</> the type(s) to specify
+   mentioned.  Also, for <literal>DROP FUNCTION</literal> the type(s) to specify
    are the input data type(s) the function is intended to support; for
    GiST, SP-GiST and GIN indexes this might have nothing to do with the actual
    input argument types of the function.
@@ -274,9 +274,9 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   </para>
 
   <para>
-   Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</>
-   clause could include a <literal>RECHECK</> option.  This is no longer
-   supported because whether an index operator is <quote>lossy</> is now
+   Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</literal>
+   clause could include a <literal>RECHECK</literal> option.  This is no longer
+   supported because whether an index operator is <quote>lossy</quote> is now
    determined on-the-fly at run time.  This allows efficient handling of
    cases where an operator might or might not be lossy.
   </para>
@@ -288,7 +288,7 @@ ALTER OPERATOR FAMILY <replaceable>name</replaceable> USING <replaceable class="
   <para>
    The following example command adds cross-data-type operators and
    support functions to an operator family that already contains B-tree
-   operator classes for data types <type>int4</> and <type>int2</>.
+   operator classes for data types <type>int4</type> and <type>int2</type>.
   </para>
 
 <programlisting>
@@ -349,11 +349,11 @@ ALTER OPERATOR FAMILY integer_ops USING btree DROP
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createopfamily"></member>
-   <member><xref linkend="sql-dropopfamily"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-alteropclass"></member>
-   <member><xref linkend="sql-dropopclass"></member>
+   <member><xref linkend="sql-createopfamily"/></member>
+   <member><xref linkend="sql-dropopfamily"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-alteropclass"/></member>
+   <member><xref linkend="sql-dropopclass"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_policy.sgml b/doc/src/sgml/ref/alter_policy.sgml
index df347d180e..a1c720a956 100644
--- a/doc/src/sgml/ref/alter_policy.sgml
+++ b/doc/src/sgml/ref/alter_policy.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_policy.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERPOLICY">
+<refentry id="sql-alterpolicy">
  <indexterm zone="sql-alterpolicy">
   <primary>ALTER POLICY</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
+ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 
 ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
     [ TO { <replaceable class="parameter">role_name</replaceable> | PUBLIC | CURRENT_USER | SESSION_USER } [, ...] ]
@@ -105,7 +105,7 @@ ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable c
     <listitem>
      <para>
       The <literal>USING</literal> expression for the policy.
-      See <xref linkend="sql-createpolicy"> for details.
+      See <xref linkend="sql-createpolicy"/> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -115,7 +115,7 @@ ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable c
     <listitem>
      <para>
       The <literal>WITH CHECK</literal> expression for the policy.
-      See <xref linkend="sql-createpolicy"> for details.
+      See <xref linkend="sql-createpolicy"/> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -135,8 +135,8 @@ ALTER POLICY <replaceable class="parameter">name</replaceable> ON <replaceable c
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createpolicy"></member>
-   <member><xref linkend="sql-droppolicy"></member>
+   <member><xref linkend="sql-createpolicy"/></member>
+   <member><xref linkend="sql-droppolicy"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_procedure.sgml b/doc/src/sgml/ref/alter_procedure.sgml
new file mode 100644
index 0000000000..dae80076d9
--- /dev/null
+++ b/doc/src/sgml/ref/alter_procedure.sgml
@@ -0,0 +1,281 @@
+<!--
+doc/src/sgml/ref/alter_procedure.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-alterprocedure">
+ <indexterm zone="sql-alterprocedure">
+  <primary>ALTER PROCEDURE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>ALTER PROCEDURE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER PROCEDURE</refname>
+  <refpurpose>change the definition of a procedure</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    <replaceable class="parameter">action</replaceable> [ ... ] [ RESTRICT ]
+ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    RENAME TO <replaceable>new_name</replaceable>
+ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    SET SCHEMA <replaceable>new_schema</replaceable>
+ALTER PROCEDURE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
+
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
+
+    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER
+    SET <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | DEFAULT }
+    SET <replaceable class="parameter">configuration_parameter</replaceable> FROM CURRENT
+    RESET <replaceable class="parameter">configuration_parameter</replaceable>
+    RESET ALL
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER PROCEDURE</command> changes the definition of a
+   procedure.
+  </para>
+
+  <para>
+   You must own the procedure to use <command>ALTER PROCEDURE</command>.
+   To change a procedure's schema, you must also have <literal>CREATE</literal>
+   privilege on the new schema.
+   To alter the owner, you must also be a direct or indirect member of the new
+   owning role, and that role must have <literal>CREATE</literal> privilege on
+   the procedure's schema.  (These restrictions enforce that altering the owner
+   doesn't do anything you couldn't do by dropping and recreating the procedure.
+   However, a superuser can alter ownership of any procedure anyway.)
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing procedure.  If no
+      argument list is specified, the name must be unique in its schema.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argmode</replaceable></term>
+
+    <listitem>
+     <para>
+      The mode of an argument: <literal>IN</literal>  or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argname</replaceable></term>
+
+    <listitem>
+     <para>
+      The name of an argument.
+      Note that <command>ALTER PROCEDURE</command> does not actually pay
+      any attention to argument names, since only the argument data
+      types are needed to determine the procedure's identity.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argtype</replaceable></term>
+
+    <listitem>
+     <para>
+      The data type(s) of the procedure's arguments (optionally
+      schema-qualified), if any.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_name</replaceable></term>
+    <listitem>
+     <para>
+      The new name of the procedure.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
+    <listitem>
+     <para>
+      The new owner of the procedure.  Note that if the procedure is
+      marked <literal>SECURITY DEFINER</literal>, it will subsequently
+      execute as the new owner.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">new_schema</replaceable></term>
+    <listitem>
+     <para>
+      The new schema for the procedure.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">extension_name</replaceable></term>
+    <listitem>
+     <para>
+      The name of the extension that the procedure is to depend on.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal><optional> EXTERNAL </optional> SECURITY INVOKER</literal></term>
+    <term><literal><optional> EXTERNAL </optional> SECURITY DEFINER</literal></term>
+
+    <listitem>
+     <para>
+      Change whether the procedure is a security definer or not. The
+      key word <literal>EXTERNAL</literal> is ignored for SQL
+      conformance. See <xref linkend="sql-createprocedure"/> for more information about
+      this capability.
+     </para>
+    </listitem>
+   </varlistentry>
+
+     <varlistentry>
+      <term><replaceable>configuration_parameter</replaceable></term>
+      <term><replaceable>value</replaceable></term>
+      <listitem>
+       <para>
+        Add or change the assignment to be made to a configuration parameter
+        when the procedure is called.  If
+        <replaceable>value</replaceable> is <literal>DEFAULT</literal>
+        or, equivalently, <literal>RESET</literal> is used, the procedure-local
+        setting is removed, so that the procedure executes with the value
+        present in its environment.  Use <literal>RESET
+        ALL</literal> to clear all procedure-local settings.
+        <literal>SET FROM CURRENT</literal> saves the value of the parameter that
+        is current when <command>ALTER PROCEDURE</command> is executed as the value
+        to be applied when the procedure is entered.
+       </para>
+
+       <para>
+        See <xref linkend="sql-set"/> and
+        <xref linkend="runtime-config"/>
+        for more information about allowed parameter names and values.
+       </para>
+      </listitem>
+     </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+
+    <listitem>
+     <para>
+      Ignored for conformance with the SQL standard.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   To rename the procedure <literal>insert_data</literal> with two arguments
+   of type <type>integer</type> to <literal>insert_record</literal>:
+<programlisting>
+ALTER PROCEDURE insert_data(integer, integer) RENAME TO insert_record;
+</programlisting>
+  </para>
+
+  <para>
+   To change the owner of the procedure <literal>insert_data</literal> with
+   two arguments of type <type>integer</type> to <literal>joe</literal>:
+<programlisting>
+ALTER PROCEDURE insert_data(integer, integer) OWNER TO joe;
+</programlisting>
+  </para>
+
+  <para>
+   To change the schema of the procedure <literal>insert_data</literal> with
+   two arguments of type <type>integer</type>
+   to <literal>accounting</literal>:
+<programlisting>
+ALTER PROCEDURE insert_data(integer, integer) SET SCHEMA accounting;
+</programlisting>
+  </para>
+
+  <para>
+   To mark the procedure <literal>insert_data(integer, integer)</literal> as
+   being dependent on the extension <literal>myext</literal>:
+<programlisting>
+ALTER PROCEDURE insert_data(integer, integer) DEPENDS ON EXTENSION myext;
+</programlisting>
+  </para>
+
+  <para>
+   To adjust the search path that is automatically set for a procedure:
+<programlisting>
+ALTER PROCEDURE check_password(text) SET search_path = admin, pg_temp;
+</programlisting>
+  </para>
+
+  <para>
+   To disable automatic setting of <varname>search_path</varname> for a procedure:
+<programlisting>
+ALTER PROCEDURE check_password(text) RESET search_path;
+</programlisting>
+   The procedure will now execute with whatever search path is used by its
+   caller.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   This statement is partially compatible with the <command>ALTER
+   PROCEDURE</command> statement in the SQL standard. The standard allows more
+   properties of a procedure to be modified, but does not provide the
+   ability to rename a procedure, make a procedure a security definer,
+   attach configuration parameter values to a procedure,
+   or change the owner, schema, or volatility of a procedure. The standard also
+   requires the <literal>RESTRICT</literal> key word, which is optional in
+   <productname>PostgreSQL</productname>.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createprocedure"/></member>
+   <member><xref linkend="sql-dropprocedure"/></member>
+   <member><xref linkend="sql-alterfunction"/></member>
+   <member><xref linkend="sql-alterroutine"/></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_publication.sgml b/doc/src/sgml/ref/alter_publication.sgml
index f064ec5f32..534e598d93 100644
--- a/doc/src/sgml/ref/alter_publication.sgml
+++ b/doc/src/sgml/ref/alter_publication.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_publication.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERPUBLICATION">
+<refentry id="sql-alterpublication">
  <indexterm zone="sql-alterpublication">
   <primary>ALTER PUBLICATION</primary>
  </indexterm>
@@ -21,12 +21,12 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> ADD TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...]
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> SET TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...]
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> DROP TABLE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [, ...]
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> ADD TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...]
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...]
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> DROP TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [, ...]
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">publication_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER PUBLICATION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -52,7 +52,7 @@ ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> RENAME TO <r
   <para>
    The fourth variant of this command listed in the synopsis can change
    all of the publication properties specified in
-   <xref linkend="sql-createpublication">.  Properties not mentioned in the
+   <xref linkend="sql-createpublication"/>.  Properties not mentioned in the
    command retain their previous settings.
   </para>
 
@@ -87,10 +87,10 @@ ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> RENAME TO <r
     <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
-      Name of an existing table.  If <literal>ONLY</> is specified before the
-      table name, only that table is affected.  If <literal>ONLY</> is not
+      Name of an existing table.  If <literal>ONLY</literal> is specified before the
+      table name, only that table is affected.  If <literal>ONLY</literal> is not
       specified, the table and all its descendant tables (if any) are
-      affected.  Optionally, <literal>*</> can be specified after the table
+      affected.  Optionally, <literal>*</literal> can be specified after the table
       name to explicitly indicate that descendant tables are included.
      </para>
     </listitem>
@@ -101,7 +101,7 @@ ALTER PUBLICATION <replaceable class="PARAMETER">name</replaceable> RENAME TO <r
     <listitem>
      <para>
       This clause alters publication parameters originally set by
-      <xref linkend="SQL-CREATEPUBLICATION">.  See there for more information.
+      <xref linkend="sql-createpublication"/>.  See there for more information.
      </para>
     </listitem>
    </varlistentry>
@@ -147,7 +147,7 @@ ALTER PUBLICATION mypublication ADD TABLE users, departments;
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER PUBLICATION</command> is a <productname>PostgreSQL</>
+   <command>ALTER PUBLICATION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -156,10 +156,10 @@ ALTER PUBLICATION mypublication ADD TABLE users, departments;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createpublication"></member>
-   <member><xref linkend="sql-droppublication"></member>
-   <member><xref linkend="sql-createsubscription"></member>
-   <member><xref linkend="sql-altersubscription"></member>
+   <member><xref linkend="sql-createpublication"/></member>
+   <member><xref linkend="sql-droppublication"/></member>
+   <member><xref linkend="sql-createsubscription"/></member>
+   <member><xref linkend="sql-altersubscription"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_role.sgml b/doc/src/sgml/ref/alter_role.sgml
index 8cd8602bc4..573a3e80f7 100644
--- a/doc/src/sgml/ref/alter_role.sgml
+++ b/doc/src/sgml/ref/alter_role.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_role.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERROLE">
+<refentry id="sql-alterrole">
  <indexterm zone="sql-alterrole">
   <primary>ALTER ROLE</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER ROLE <replaceable class="PARAMETER">role_specification</replaceable> [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ]
+ALTER ROLE <replaceable class="parameter">role_specification</replaceable> [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
       SUPERUSER | NOSUPERUSER
     | CREATEDB | NOCREATEDB
@@ -32,20 +32,20 @@ ALTER ROLE <replaceable class="PARAMETER">role_specification</replaceable> [ WIT
     | LOGIN | NOLOGIN
     | REPLICATION | NOREPLICATION
     | BYPASSRLS | NOBYPASSRLS
-    | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
-    | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
-    | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
+    | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
+    | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
+    | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
 
-ALTER ROLE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER ROLE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 
-ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
-ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
-ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL
+ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
+ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
+ALTER ROLE { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET ALL
 
-<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
 
-    [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable>
+    <replaceable class="parameter">role_name</replaceable>
   | CURRENT_USER
   | SESSION_USER
 </synopsis>
@@ -62,14 +62,14 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
   <para>
    The first variant of this command listed in the synopsis can change
    many of the role attributes that can be specified in
-   <xref linkend="sql-createrole">.
+   <xref linkend="sql-createrole"/>.
    (All the possible attributes are covered,
    except that there are no options for adding or removing memberships; use
-   <xref linkend="SQL-GRANT"> and
-   <xref linkend="SQL-REVOKE"> for that.)
+   <xref linkend="sql-grant"/> and
+   <xref linkend="sql-revoke"/> for that.)
    Attributes not mentioned in the command retain their previous settings.
    Database superusers can change any of these settings for any role.
-   Roles having <literal>CREATEROLE</> privilege can change any of these
+   Roles having <literal>CREATEROLE</literal> privilege can change any of these
    settings, but only for non-superuser and non-replication roles.
    Ordinary roles can only change their own password.
   </para>
@@ -77,13 +77,13 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
   <para>
    The second variant changes the name of the role.
    Database superusers can rename any role.
-   Roles having <literal>CREATEROLE</> privilege can rename non-superuser
+   Roles having <literal>CREATEROLE</literal> privilege can rename non-superuser
    roles.
    The current session user cannot be renamed.
    (Connect as a different user if you need to do that.)
-   Because <literal>MD5</>-encrypted passwords use the role name as
+   Because <literal>MD5</literal>-encrypted passwords use the role name as
    cryptographic salt, renaming a role clears its password if the
-   password is <literal>MD5</>-encrypted.
+   password is <literal>MD5</literal>-encrypted.
   </para>
 
   <para>
@@ -100,10 +100,10 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
    Whenever the role subsequently
    starts a new session, the specified value becomes the session
    default, overriding whatever setting is present in
-   <filename>postgresql.conf</> or has been received from the <command>postgres</command>
+   <filename>postgresql.conf</filename> or has been received from the <command>postgres</command>
    command line. This only happens at login time; executing
-   <xref linkend="sql-set-role"> or
-   <xref linkend="sql-set-session-authorization"> does not cause new
+   <xref linkend="sql-set-role"/> or
+   <xref linkend="sql-set-session-authorization"/> does not cause new
    configuration values to be set.
    Settings set for all databases are overridden by database-specific settings
    attached to a role.  Settings for specific databases or specific roles override
@@ -112,7 +112,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
 
   <para>
    Superusers can change anyone's session defaults. Roles having
-   <literal>CREATEROLE</> privilege can change defaults for non-superuser
+   <literal>CREATEROLE</literal> privilege can change defaults for non-superuser
    roles. Ordinary roles can only set defaults for themselves.
    Certain configuration variables cannot be set this way, or can only be
    set if a superuser issues the command.  Only superusers can change a setting
@@ -125,7 +125,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
 
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name of the role whose attributes are to be altered.
@@ -155,8 +155,8 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
      <varlistentry>
       <term><literal>SUPERUSER</literal></term>
       <term><literal>NOSUPERUSER</literal></term>
-      <term><literal>CREATEDB</></term>
-      <term><literal>NOCREATEDB</></term>
+      <term><literal>CREATEDB</literal></term>
+      <term><literal>NOCREATEDB</literal></term>
       <term><literal>CREATEROLE</literal></term>
       <term><literal>NOCREATEROLE</literal></term>
       <term><literal>INHERIT</literal></term>
@@ -168,12 +168,12 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
       <term><literal>BYPASSRLS</literal></term>
       <term><literal>NOBYPASSRLS</literal></term>
       <term><literal>CONNECTION LIMIT</literal> <replaceable class="parameter">connlimit</replaceable></term>
-      <term>[ <literal>ENCRYPTED</> ] <literal>PASSWORD</> <replaceable class="parameter">password</replaceable></term>
+      <term>[ <literal>ENCRYPTED</literal> ] <literal>PASSWORD</literal> <replaceable class="parameter">password</replaceable></term>
       <term><literal>VALID UNTIL</literal> '<replaceable class="parameter">timestamp</replaceable>'</term>
       <listitem>
        <para>
         These clauses alter attributes originally set by
-        <xref linkend="SQL-CREATEROLE">. For more information, see the
+        <xref linkend="sql-createrole"/>. For more information, see the
         <command>CREATE ROLE</command> reference page.
        </para>
       </listitem>
@@ -209,7 +209,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
         role-specific variable setting is removed, so the role will
         inherit the system-wide default setting in new sessions.  Use
         <literal>RESET ALL</literal> to clear all role-specific settings.
-        <literal>SET FROM CURRENT</> saves the session's current value of
+        <literal>SET FROM CURRENT</literal> saves the session's current value of
         the parameter as the role-specific value.
         If <literal>IN DATABASE</literal> is specified, the configuration
         parameter is set or removed for the given role and database only.
@@ -217,14 +217,14 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
 
        <para>
         Role-specific variable settings take effect only at login;
-        <xref linkend="sql-set-role"> and
-        <xref linkend="sql-set-session-authorization">
+        <xref linkend="sql-set-role"/> and
+        <xref linkend="sql-set-session-authorization"/>
         do not process role-specific variable settings.
        </para>
 
        <para>
-        See <xref linkend="sql-set"> and <xref
-        linkend="runtime-config"> for more information about allowed
+        See <xref linkend="sql-set"/> and <xref
+        linkend="runtime-config"/> for more information about allowed
         parameter names and values.
        </para>
       </listitem>
@@ -236,14 +236,14 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-CREATEROLE">
-   to add new roles, and <xref linkend="SQL-DROPROLE"> to remove a role.
+   Use <xref linkend="sql-createrole"/>
+   to add new roles, and <xref linkend="sql-droprole"/> to remove a role.
   </para>
 
   <para>
    <command>ALTER ROLE</command> cannot change a role's memberships.
-   Use <xref linkend="SQL-GRANT"> and
-   <xref linkend="SQL-REVOKE">
+   Use <xref linkend="sql-grant"/> and
+   <xref linkend="sql-revoke"/>
    to do that.
   </para>
 
@@ -251,7 +251,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
    Caution must be exercised when specifying an unencrypted password
    with this command.  The password will be transmitted to the server
    in cleartext, and it might also be logged in the client's command
-   history or the server log.  <xref linkend="app-psql">
+   history or the server log.  <xref linkend="app-psql"/>
    contains a command
    <command>\password</command> that can be used to change a
    role's password without exposing the cleartext password.
@@ -260,7 +260,7 @@ ALTER ROLE { <replaceable class="PARAMETER">role_specification</replaceable> | A
   <para>
    It is also possible to tie a
    session default to a specific database rather than to a role; see
-   <xref linkend="sql-alterdatabase">.
+   <xref linkend="sql-alterdatabase"/>.
    If there is a conflict, database-role-specific settings override role-specific
    ones, which in turn override database-specific ones.
   </para>
@@ -288,7 +288,7 @@ ALTER ROLE davide WITH PASSWORD NULL;
   <para>
    Change a password expiration date, specifying that the password
    should expire at midday on 4th May 2015 using
-   the time zone which is one hour ahead of <acronym>UTC</>:
+   the time zone which is one hour ahead of <acronym>UTC</acronym>:
 <programlisting>
 ALTER ROLE chris VALID UNTIL 'May 4 12:00:00 2015 +1';
 </programlisting>
@@ -311,7 +311,7 @@ ALTER ROLE miriam CREATEROLE CREATEDB;
 
   <para>
    Give a role a non-default setting of the
-   <xref linkend="guc-maintenance-work-mem"> parameter:
+   <xref linkend="guc-maintenance-work-mem"/> parameter:
 
 <programlisting>
 ALTER ROLE worker_bee SET maintenance_work_mem = 100000;
@@ -320,7 +320,7 @@ ALTER ROLE worker_bee SET maintenance_work_mem = 100000;
 
   <para>
    Give a role a non-default, database-specific setting of the
-   <xref linkend="guc-client-min-messages"> parameter:
+   <xref linkend="guc-client-min-messages"/> parameter:
 
 <programlisting>
 ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG;
@@ -340,10 +340,10 @@ ALTER ROLE fred IN DATABASE devel SET client_min_messages = DEBUG;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole"></member>
-   <member><xref linkend="sql-droprole"></member>
-   <member><xref linkend="sql-alterdatabase"></member>
-   <member><xref linkend="sql-set"></member>
+   <member><xref linkend="sql-createrole"/></member>
+   <member><xref linkend="sql-droprole"/></member>
+   <member><xref linkend="sql-alterdatabase"/></member>
+   <member><xref linkend="sql-set"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_routine.sgml b/doc/src/sgml/ref/alter_routine.sgml
new file mode 100644
index 0000000000..d1699691e1
--- /dev/null
+++ b/doc/src/sgml/ref/alter_routine.sgml
@@ -0,0 +1,102 @@
+<!--
+doc/src/sgml/ref/alter_routine.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-alterroutine">
+ <indexterm zone="sql-alterroutine">
+  <primary>ALTER ROUTINE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>ALTER ROUTINE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>ALTER ROUTINE</refname>
+  <refpurpose>change the definition of a routine</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    <replaceable class="parameter">action</replaceable> [ ... ] [ RESTRICT ]
+ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    RENAME TO <replaceable>new_name</replaceable>
+ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    SET SCHEMA <replaceable>new_schema</replaceable>
+ALTER ROUTINE <replaceable>name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ]
+    DEPENDS ON EXTENSION <replaceable>extension_name</replaceable>
+
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
+
+    IMMUTABLE | STABLE | VOLATILE | [ NOT ] LEAKPROOF
+    [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER
+    PARALLEL { UNSAFE | RESTRICTED | SAFE }
+    COST <replaceable class="parameter">execution_cost</replaceable>
+    ROWS <replaceable class="parameter">result_rows</replaceable>
+    SET <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | DEFAULT }
+    SET <replaceable class="parameter">configuration_parameter</replaceable> FROM CURRENT
+    RESET <replaceable class="parameter">configuration_parameter</replaceable>
+    RESET ALL
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>ALTER ROUTINE</command> changes the definition of a routine, which
+   can be an aggregate function, a normal function, or a procedure.  See
+   under <xref linkend="sql-alteraggregate"/>, <xref linkend="sql-alterfunction"/>,
+   and <xref linkend="sql-alterprocedure"/> for the description of the
+   parameters, more examples, and further details.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+
+  <para>
+   To rename the routine <literal>foo</literal> for type
+   <type>integer</type> to <literal>foobar</literal>:
+<programlisting>
+ALTER ROUTINE foo(integer) RENAME TO foobar;
+</programlisting>
+   This command will work independent of whether <literal>foo</literal> is an
+   aggregate, function, or procedure.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   This statement is partially compatible with the <command>ALTER
+   ROUTINE</command> statement in the SQL standard.  See
+   under <xref linkend="sql-alterfunction"/>
+   and <xref linkend="sql-alterprocedure"/> for more details.  Allowing
+   routine names to refer to aggregate functions is
+   a <productname>PostgreSQL</productname> extension.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-alteraggregate"/></member>
+   <member><xref linkend="sql-alterfunction"/></member>
+   <member><xref linkend="sql-alterprocedure"/></member>
+   <member><xref linkend="sql-droproutine"/></member>
+  </simplelist>
+
+  <para>
+   Note that there is no <literal>CREATE ROUTINE</literal> command.
+  </para>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/alter_rule.sgml b/doc/src/sgml/ref/alter_rule.sgml
index 993a0ceb83..c20bfb35e1 100644
--- a/doc/src/sgml/ref/alter_rule.sgml
+++ b/doc/src/sgml/ref/alter_rule.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_rule.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERRULE">
+<refentry id="sql-alterrule">
  <indexterm zone="sql-alterrule">
   <primary>ALTER RULE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
+ALTER RULE <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -44,7 +44,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an existing rule to alter.
@@ -53,7 +53,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table or view that the
@@ -63,7 +63,7 @@ ALTER RULE <replaceable class="PARAMETER">name</replaceable> ON <replaceable cla
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_name</replaceable></term>
+    <term><replaceable class="parameter">new_name</replaceable></term>
     <listitem>
      <para>
       The new name for the rule.
@@ -97,8 +97,8 @@ ALTER RULE notify_all ON emp RENAME TO notify_me;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrule"></member>
-   <member><xref linkend="sql-droprule"></member>
+   <member><xref linkend="sql-createrule"/></member>
+   <member><xref linkend="sql-droprule"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_schema.sgml b/doc/src/sgml/ref/alter_schema.sgml
index dbc5c2d45f..2937214026 100644
--- a/doc/src/sgml/ref/alter_schema.sgml
+++ b/doc/src/sgml/ref/alter_schema.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_schema.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSCHEMA">
+<refentry id="sql-alterschema">
  <indexterm zone="sql-alterschema">
   <primary>ALTER SCHEMA</primary>
  </indexterm>
@@ -34,7 +34,7 @@ ALTER SCHEMA <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</
   </para>
 
   <para>
-   You must own the schema to use <command>ALTER SCHEMA</>.
+   You must own the schema to use <command>ALTER SCHEMA</command>.
    To rename a schema you must also have the
    <literal>CREATE</literal> privilege for the database.
    To alter the owner, you must also be a direct or
@@ -92,8 +92,8 @@ ALTER SCHEMA <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createschema"></member>
-   <member><xref linkend="sql-dropschema"></member>
+   <member><xref linkend="sql-createschema"/></member>
+   <member><xref linkend="sql-dropschema"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_sequence.sgml b/doc/src/sgml/ref/alter_sequence.sgml
index 3a04d07ecc..bfd20af6d3 100644
--- a/doc/src/sgml/ref/alter_sequence.sgml
+++ b/doc/src/sgml/ref/alter_sequence.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_sequence.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSEQUENCE">
+<refentry id="sql-altersequence">
  <indexterm zone="sql-altersequence">
   <primary>ALTER SEQUENCE</primary>
  </indexterm>
@@ -31,7 +31,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
     [ RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] ]
     [ CACHE <replaceable class="parameter">cache</replaceable> ] [ [ NO ] CYCLE ]
     [ OWNED BY { <replaceable class="parameter">table_name</replaceable>.<replaceable class="parameter">column_name</replaceable> | NONE } ]
-ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
 </synopsis>
@@ -47,8 +47,8 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
   </para>
 
   <para>
-   You must own the sequence to use <command>ALTER SEQUENCE</>.
-   To change a sequence's schema, you must also have <literal>CREATE</>
+   You must own the sequence to use <command>ALTER SEQUENCE</command>.
+   To change a sequence's schema, you must also have <literal>CREATE</literal>
    privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
@@ -89,7 +89,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
         The optional
         clause <literal>AS <replaceable class="parameter">data_type</replaceable></literal>
         changes the data type of the sequence.  Valid types are
-        are <literal>smallint</literal>, <literal>integer</literal>,
+        <literal>smallint</literal>, <literal>integer</literal>,
         and <literal>bigint</literal>.
        </para>
 
@@ -159,8 +159,8 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
         The optional clause <literal>START WITH <replaceable
         class="parameter">start</replaceable></literal> changes the
         recorded start value of the sequence.  This has no effect on the
-        <emphasis>current</> sequence value; it simply sets the value
-        that future <command>ALTER SEQUENCE RESTART</> commands will use.
+        <emphasis>current</emphasis> sequence value; it simply sets the value
+        that future <command>ALTER SEQUENCE RESTART</command> commands will use.
        </para>
       </listitem>
      </varlistentry>
@@ -172,13 +172,13 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
         The optional clause <literal>RESTART [ WITH <replaceable
         class="parameter">restart</replaceable> ]</literal> changes the
         current value of the sequence.  This is similar to calling the
-        <function>setval</> function with <literal>is_called</literal> =
-        <literal>false</>: the specified value will be returned by the
-        <emphasis>next</> call of <function>nextval</>.
-        Writing <literal>RESTART</> with no <replaceable
-        class="parameter">restart</> value is equivalent to supplying
-        the start value that was recorded by <command>CREATE SEQUENCE</>
-        or last set by <command>ALTER SEQUENCE START WITH</>.
+        <function>setval</function> function with <literal>is_called</literal> =
+        <literal>false</literal>: the specified value will be returned by the
+        <emphasis>next</emphasis> call of <function>nextval</function>.
+        Writing <literal>RESTART</literal> with no <replaceable
+        class="parameter">restart</replaceable> value is equivalent to supplying
+        the start value that was recorded by <command>CREATE SEQUENCE</command>
+        or last set by <command>ALTER SEQUENCE START WITH</command>.
        </para>
 
        <para>
@@ -186,7 +186,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
         a <literal>RESTART</literal> operation on a sequence is transactional
         and blocks concurrent transactions from obtaining numbers from the
         same sequence. If that's not the desired mode of
-        operation, <function>setval</> should be used.
+        operation, <function>setval</function> should be used.
        </para>
       </listitem>
      </varlistentry>
@@ -250,13 +250,13 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
       table must have the same owner and be in the same schema as the
       sequence.
       Specifying <literal>OWNED BY NONE</literal> removes any existing
-      association, making the sequence <quote>free-standing</>.
+      association, making the sequence <quote>free-standing</quote>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the sequence.
@@ -291,7 +291,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
 
   <para>
    <command>ALTER SEQUENCE</command> will not immediately affect
-   <function>nextval</> results in backends,
+   <function>nextval</function> results in backends,
    other than the current one, that have preallocated (cached) sequence
    values. They will use up all cached values prior to noticing the changed
    sequence generation parameters.  The current backend will be affected
@@ -299,7 +299,7 @@ ALTER SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> S
   </para>
 
   <para>
-   <command>ALTER SEQUENCE</command> does not affect the <function>currval</>
+   <command>ALTER SEQUENCE</command> does not affect the <function>currval</function>
    status for the sequence.  (Before <productname>PostgreSQL</productname>
    8.3, it sometimes did.)
   </para>
@@ -332,8 +332,8 @@ ALTER SEQUENCE serial RESTART WITH 105;
 
   <para>
    <command>ALTER SEQUENCE</command> conforms to the <acronym>SQL</acronym>
-   standard, except for the <literal>AS</literal>, <literal>START WITH</>,
-   <literal>OWNED BY</>, <literal>OWNER TO</>, <literal>RENAME TO</>, and
+   standard, except for the <literal>AS</literal>, <literal>START WITH</literal>,
+   <literal>OWNED BY</literal>, <literal>OWNER TO</literal>, <literal>RENAME TO</literal>, and
    <literal>SET SCHEMA</literal> clauses, which are
    <productname>PostgreSQL</productname> extensions.
   </para>
@@ -343,8 +343,8 @@ ALTER SEQUENCE serial RESTART WITH 105;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsequence"></member>
-   <member><xref linkend="sql-dropsequence"></member>
+   <member><xref linkend="sql-createsequence"/></member>
+   <member><xref linkend="sql-dropsequence"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_server.sgml b/doc/src/sgml/ref/alter_server.sgml
index e6cf511853..17e55b093e 100644
--- a/doc/src/sgml/ref/alter_server.sgml
+++ b/doc/src/sgml/ref/alter_server.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_server.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSERVER">
+<refentry id="sql-alterserver">
  <indexterm zone="sql-alterserver">
   <primary>ALTER SERVER</primary>
  </indexterm>
@@ -22,9 +22,9 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 ALTER SERVER <replaceable class="parameter">name</replaceable> [ VERSION '<replaceable class="parameter">new_version</replaceable>' ]
-    [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] ) ]
-ALTER SERVER <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+    [ OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] ) ]
+ALTER SERVER <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER SERVER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -42,7 +42,7 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac
    To alter the server you must be the owner of the server.
    Additionally to alter the owner, you must own the server and also
    be a direct or indirect member of the new owning role, and you must
-   have <literal>USAGE</> privilege on the server's foreign-data
+   have <literal>USAGE</literal> privilege on the server's foreign-data
    wrapper.  (Note that superusers satisfy all these criteria
    automatically.)
   </para>
@@ -71,12 +71,12 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term>
     <listitem>
      <para>
       Change options for the
-      server.  <literal>ADD</>, <literal>SET</>, and <literal>DROP</>
-      specify the action to be performed.  <literal>ADD</> is assumed
+      server.  <literal>ADD</literal>, <literal>SET</literal>, and <literal>DROP</literal>
+      specify the action to be performed.  <literal>ADD</literal> is assumed
       if no operation is explicitly specified.  Option names must be
       unique; names and values are also validated using the server's
       foreign-data wrapper library.
@@ -85,7 +85,7 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the foreign server.
@@ -108,15 +108,15 @@ ALTER SERVER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replac
   <title>Examples</title>
 
   <para>
-   Alter server <literal>foo</>, add connection options:
+   Alter server <literal>foo</literal>, add connection options:
 <programlisting>
 ALTER SERVER foo OPTIONS (host 'foo', dbname 'foodb');
 </programlisting>
   </para>
 
   <para>
-   Alter server <literal>foo</>, change version,
-   change <literal>host</> option:
+   Alter server <literal>foo</literal>, change version,
+   change <literal>host</literal> option:
 <programlisting>
 ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz');
 </programlisting></para>
@@ -136,8 +136,8 @@ ALTER SERVER foo VERSION '8.4' OPTIONS (SET host 'baz');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createserver"></member>
-   <member><xref linkend="sql-dropserver"></member>
+   <member><xref linkend="sql-createserver"/></member>
+   <member><xref linkend="sql-dropserver"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_statistics.sgml b/doc/src/sgml/ref/alter_statistics.sgml
index 4f25669852..58c7ed020d 100644
--- a/doc/src/sgml/ref/alter_statistics.sgml
+++ b/doc/src/sgml/ref/alter_statistics.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_statistics.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSTATISTICS">
+<refentry id="sql-alterstatistics">
  <indexterm zone="sql-alterstatistics">
   <primary>ALTER STATISTICS</primary>
  </indexterm>
@@ -23,7 +23,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER STATISTICS <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 ALTER STATISTICS <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
 </synopsis>
@@ -39,9 +39,9 @@ ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <r
   </para>
 
   <para>
-   You must own the statistics object to use <command>ALTER STATISTICS</>.
+   You must own the statistics object to use <command>ALTER STATISTICS</command>.
    To change a statistics object's schema, you must also
-   have <literal>CREATE</> privilege on the new schema.
+   have <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
    the statistics object's schema.  (These restrictions enforce that altering
@@ -67,7 +67,7 @@ ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <r
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+      <term><replaceable class="parameter">new_owner</replaceable></term>
       <listitem>
        <para>
         The user name of the new owner of the statistics object.
@@ -109,8 +109,8 @@ ALTER STATISTICS <replaceable class="parameter">name</replaceable> SET SCHEMA <r
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createstatistics"></member>
-   <member><xref linkend="sql-dropstatistics"></member>
+   <member><xref linkend="sql-createstatistics"/></member>
+   <member><xref linkend="sql-dropstatistics"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_subscription.sgml b/doc/src/sgml/ref/alter_subscription.sgml
index b1b7765d76..6dfb2e4d3e 100644
--- a/doc/src/sgml/ref/alter_subscription.sgml
+++ b/doc/src/sgml/ref/alter_subscription.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_subscription.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSUBSCRIPTION">
+<refentry id="sql-altersubscription">
  <indexterm zone="sql-altersubscription">
   <primary>ALTER SUBSCRIPTION</primary>
  </indexterm>
@@ -21,14 +21,14 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> CONNECTION '<replaceable>conninfo</replaceable>'
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> SET PUBLICATION <replaceable class="PARAMETER">publication_name</replaceable> [, ...] [ WITH ( <replaceable class="PARAMETER">set_publication_option</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ]
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> REFRESH PUBLICATION [ WITH ( <replaceable class="PARAMETER">refresh_option</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ]
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> ENABLE
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> DISABLE
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> SET ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> CONNECTION '<replaceable>conninfo</replaceable>'
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> SET PUBLICATION <replaceable class="parameter">publication_name</replaceable> [, ...] [ WITH ( <replaceable class="parameter">set_publication_option</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> REFRESH PUBLICATION [ WITH ( <replaceable class="parameter">refresh_option</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> ENABLE
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> DISABLE
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER SUBSCRIPTION <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,11 +38,11 @@ ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <
   <para>
    <command>ALTER SUBSCRIPTION</command> can change most of the subscription
    properties that can be specified
-   in <xref linkend="sql-createsubscription">.
+   in <xref linkend="sql-createsubscription"/>.
   </para>
 
   <para>
-   You must own the subscription to use <command>ALTER SUBSCRIPTION</>.
+   You must own the subscription to use <command>ALTER SUBSCRIPTION</command>.
    To alter the owner, you must also be a direct or indirect member of the
    new owning role. The new owner has to be a superuser.
    (Currently, all subscription owners must be superusers, so the owner checks
@@ -68,7 +68,7 @@ ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <
     <listitem>
      <para>
       This clause alters the connection property originally set by
-      <xref linkend="SQL-CREATESUBSCRIPTION">.  See there for more
+      <xref linkend="sql-createsubscription"/>.  See there for more
       information.
      </para>
     </listitem>
@@ -79,7 +79,7 @@ ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <
     <listitem>
      <para>
       Changes list of subscribed publications. See
-      <xref linkend="SQL-CREATESUBSCRIPTION"> for more information.
+      <xref linkend="sql-createsubscription"/> for more information.
       By default this command will also act like <literal>REFRESH
       PUBLICATION</literal>.
      </para>
@@ -162,7 +162,7 @@ ALTER SUBSCRIPTION <replaceable class="PARAMETER">name</replaceable> RENAME TO <
     <listitem>
      <para>
       This clause alters parameters originally set by
-      <xref linkend="SQL-CREATESUBSCRIPTION">.  See there for more
+      <xref linkend="sql-createsubscription"/>.  See there for more
       information.  The allowed options are <literal>slot_name</literal> and
       <literal>synchronous_commit</literal>
      </para>
@@ -211,7 +211,7 @@ ALTER SUBSCRIPTION mysub DISABLE;
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER SUBSCRIPTION</command> is a <productname>PostgreSQL</>
+   <command>ALTER SUBSCRIPTION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -220,10 +220,10 @@ ALTER SUBSCRIPTION mysub DISABLE;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsubscription"></member>
-   <member><xref linkend="sql-dropsubscription"></member>
-   <member><xref linkend="sql-createpublication"></member>
-   <member><xref linkend="sql-alterpublication"></member>
+   <member><xref linkend="sql-createsubscription"/></member>
+   <member><xref linkend="sql-dropsubscription"/></member>
+   <member><xref linkend="sql-createpublication"/></member>
+   <member><xref linkend="sql-alterpublication"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_system.sgml b/doc/src/sgml/ref/alter_system.sgml
index b234793f3e..5e41f7f644 100644
--- a/doc/src/sgml/ref/alter_system.sgml
+++ b/doc/src/sgml/ref/alter_system.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_system.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERSYSTEM">
+<refentry id="sql-altersystem">
  <indexterm zone="sql-altersystem">
   <primary>ALTER SYSTEM</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER SYSTEM SET <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
+ALTER SYSTEM SET <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | '<replaceable class="parameter">value</replaceable>' | DEFAULT }
 
-ALTER SYSTEM RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
+ALTER SYSTEM RESET <replaceable class="parameter">configuration_parameter</replaceable>
 ALTER SYSTEM RESET ALL
 </synopsis>
  </refsynopsisdiv>
@@ -50,8 +50,8 @@ ALTER SYSTEM RESET ALL
    the next server configuration reload, or after the next server restart
    in the case of parameters that can only be changed at server start.
    A server configuration reload can be commanded by calling the SQL
-   function <function>pg_reload_conf()</>, running <literal>pg_ctl reload</>,
-   or sending a <systemitem>SIGHUP</> signal to the main server process.
+   function <function>pg_reload_conf()</function>, running <literal>pg_ctl reload</literal>,
+   or sending a <systemitem>SIGHUP</systemitem> signal to the main server process.
   </para>
 
   <para>
@@ -70,7 +70,7 @@ ALTER SYSTEM RESET ALL
     <listitem>
      <para>
       Name of a settable configuration parameter.  Available parameters are
-      documented in <xref linkend="runtime-config">.
+      documented in <xref linkend="runtime-config"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -94,13 +94,13 @@ ALTER SYSTEM RESET ALL
   <title>Notes</title>
 
   <para>
-   This command can't be used to set <xref linkend="guc-data-directory">,
-   nor parameters that are not allowed in <filename>postgresql.conf</>
-   (e.g., <link linkend="runtime-config-preset">preset options</>).
+   This command can't be used to set <xref linkend="guc-data-directory"/>,
+   nor parameters that are not allowed in <filename>postgresql.conf</filename>
+   (e.g., <link linkend="runtime-config-preset">preset options</link>).
   </para>
 
   <para>
-   See <xref linkend="config-setting"> for other ways to set the parameters.
+   See <xref linkend="config-setting"/> for other ways to set the parameters.
   </para>
  </refsect1>
 
@@ -108,7 +108,7 @@ ALTER SYSTEM RESET ALL
   <title>Examples</title>
 
   <para>
-   Set the <literal>wal_level</>:
+   Set the <literal>wal_level</literal>:
 <programlisting>
 ALTER SYSTEM SET wal_level = replica;
 </programlisting>
@@ -116,7 +116,7 @@ ALTER SYSTEM SET wal_level = replica;
 
   <para>
    Undo that, restoring whatever setting was effective
-   in <filename>postgresql.conf</>:
+   in <filename>postgresql.conf</filename>:
 <programlisting>
 ALTER SYSTEM RESET wal_level;
 </programlisting></para>
@@ -135,8 +135,8 @@ ALTER SYSTEM RESET wal_level;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-SET"></member>
-   <member><xref linkend="SQL-SHOW"></member>
+   <member><xref linkend="sql-set"/></member>
+   <member><xref linkend="sql-show"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml
index 69600321e6..afe213910c 100644
--- a/doc/src/sgml/ref/alter_table.sgml
+++ b/doc/src/sgml/ref/alter_table.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_table.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTABLE">
+<refentry id="sql-altertable">
  <indexterm zone="sql-altertable">
   <primary>ALTER TABLE</primary>
  </indexterm>
@@ -21,75 +21,117 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
-    <replaceable class="PARAMETER">action</replaceable> [, ... ]
-ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
-    RENAME [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> TO <replaceable class="PARAMETER">new_column_name</replaceable>
-ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
-    RENAME CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> TO <replaceable class="PARAMETER">new_constraint_name</replaceable>
-ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
-ALTER TABLE ALL IN TABLESPACE <replaceable class="PARAMETER">name</replaceable> [ OWNED BY <replaceable class="PARAMETER">role_name</replaceable> [, ... ] ]
-    SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable> [ NOWAIT ]
-ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    ATTACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable> FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable>
-ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
-    DETACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable>
-
-<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
-
-    ADD [ COLUMN ] [ IF NOT EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
-    DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="PARAMETER">column_name</replaceable> [ RESTRICT | CASCADE ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ USING <replaceable class="PARAMETER">expression</replaceable> ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable>
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET | DROP } NOT NULL
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> ADD GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> { SET GENERATED { ALWAYS | BY DEFAULT } | SET <replaceable>sequence_option</replaceable> | RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] } [...]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP IDENTITY [ IF EXISTS ]
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STATISTICS <replaceable class="PARAMETER">integer</replaceable>
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )
-    ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
-    ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]
-    ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable>
-    ALTER CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
-    VALIDATE CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
-    DROP CONSTRAINT [ IF EXISTS ]  <replaceable class="PARAMETER">constraint_name</replaceable> [ RESTRICT | CASCADE ]
-    DISABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ]
-    ENABLE TRIGGER [ <replaceable class="PARAMETER">trigger_name</replaceable> | ALL | USER ]
-    ENABLE REPLICA TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable>
-    ENABLE ALWAYS TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable>
-    DISABLE RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable>
-    ENABLE RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable>
-    ENABLE REPLICA RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable>
-    ENABLE ALWAYS RULE <replaceable class="PARAMETER">rewrite_rule_name</replaceable>
+ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
+    <replaceable class="parameter">action</replaceable> [, ... ]
+ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
+    RENAME [ COLUMN ] <replaceable class="parameter">column_name</replaceable> TO <replaceable class="parameter">new_column_name</replaceable>
+ALTER TABLE [ IF EXISTS ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ]
+    RENAME CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> TO <replaceable class="parameter">new_constraint_name</replaceable>
+ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
+ALTER TABLE ALL IN TABLESPACE <replaceable class="parameter">name</replaceable> [ OWNED BY <replaceable class="parameter">role_name</replaceable> [, ... ] ]
+    SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable> [ NOWAIT ]
+ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    ATTACH PARTITION <replaceable class="parameter">partition_name</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }
+ALTER TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
+    DETACH PARTITION <replaceable class="parameter">partition_name</replaceable>
+
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
+
+    ADD [ COLUMN ] [ IF NOT EXISTS ] <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
+    DROP [ COLUMN ] [ IF EXISTS ] <replaceable class="parameter">column_name</replaceable> [ RESTRICT | CASCADE ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ USING <replaceable class="parameter">expression</replaceable> ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET | DROP } NOT NULL
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> ADD GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> { SET GENERATED { ALWAYS | BY DEFAULT } | SET <replaceable>sequence_option</replaceable> | RESTART [ [ WITH ] <replaceable class="parameter">restart</replaceable> ] } [...]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP IDENTITY [ IF EXISTS ]
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STATISTICS <replaceable class="parameter">integer</replaceable>
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )
+    ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET STORAGE { PLAIN | EXTERNAL | EXTENDED | MAIN }
+    ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]
+    ADD <replaceable class="parameter">table_constraint_using_index</replaceable>
+    ALTER CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+    VALIDATE CONSTRAINT <replaceable class="parameter">constraint_name</replaceable>
+    DROP CONSTRAINT [ IF EXISTS ]  <replaceable class="parameter">constraint_name</replaceable> [ RESTRICT | CASCADE ]
+    DISABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
+    ENABLE TRIGGER [ <replaceable class="parameter">trigger_name</replaceable> | ALL | USER ]
+    ENABLE REPLICA TRIGGER <replaceable class="parameter">trigger_name</replaceable>
+    ENABLE ALWAYS TRIGGER <replaceable class="parameter">trigger_name</replaceable>
+    DISABLE RULE <replaceable class="parameter">rewrite_rule_name</replaceable>
+    ENABLE RULE <replaceable class="parameter">rewrite_rule_name</replaceable>
+    ENABLE REPLICA RULE <replaceable class="parameter">rewrite_rule_name</replaceable>
+    ENABLE ALWAYS RULE <replaceable class="parameter">rewrite_rule_name</replaceable>
     DISABLE ROW LEVEL SECURITY
     ENABLE ROW LEVEL SECURITY
     FORCE ROW LEVEL SECURITY
     NO FORCE ROW LEVEL SECURITY
-    CLUSTER ON <replaceable class="PARAMETER">index_name</replaceable>
+    CLUSTER ON <replaceable class="parameter">index_name</replaceable>
     SET WITHOUT CLUSTER
     SET WITH OIDS
     SET WITHOUT OIDS
-    SET TABLESPACE <replaceable class="PARAMETER">new_tablespace</replaceable>
+    SET TABLESPACE <replaceable class="parameter">new_tablespace</replaceable>
     SET { LOGGED | UNLOGGED }
-    SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-    RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )
-    INHERIT <replaceable class="PARAMETER">parent_table</replaceable>
-    NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable>
-    OF <replaceable class="PARAMETER">type_name</replaceable>
+    SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+    RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )
+    INHERIT <replaceable class="parameter">parent_table</replaceable>
+    NO INHERIT <replaceable class="parameter">parent_table</replaceable>
+    OF <replaceable class="parameter">type_name</replaceable>
     NOT OF
-    OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-    REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="PARAMETER">index_name</replaceable> | FULL | NOTHING }
+    OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+    REPLICA IDENTITY { DEFAULT | USING INDEX <replaceable class="parameter">index_name</replaceable> | FULL | NOTHING }
+
+<phrase>and <replaceable class="parameter">partition_bound_spec</replaceable> is:</phrase>
+
+IN ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | NULL } [, ...] ) |
+FROM ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] )
+  TO ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) |
+WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REMAINDER <replaceable class="parameter">numeric_literal</replaceable> )
+
+<phrase>and <replaceable class="parameter">column_constraint</replaceable> is:</phrase>
+
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+{ NOT NULL |
+  NULL |
+  CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
+  DEFAULT <replaceable>default_expr</replaceable> |
+  GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ] |
+  UNIQUE <replaceable class="parameter">index_parameters</replaceable> |
+  PRIMARY KEY <replaceable class="parameter">index_parameters</replaceable> |
+  REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]
+    [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
+[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+
+<phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase>
+
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+{ CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
+  UNIQUE ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> |
+  PRIMARY KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> |
+  EXCLUDE [ USING <replaceable class="parameter">index_method</replaceable> ] ( <replaceable class="parameter">exclude_element</replaceable> WITH <replaceable class="parameter">operator</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> [ WHERE ( <replaceable class="parameter">predicate</replaceable> ) ] |
+  FOREIGN KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> [, ... ] ) ]
+    [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
+[ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
+
+<phrase>and <replaceable class="parameter">table_constraint_using_index</replaceable> is:</phrase>
+
+    [ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+    { UNIQUE | PRIMARY KEY } USING INDEX <replaceable class="parameter">index_name</replaceable>
+    [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 
-<phrase>and <replaceable class="PARAMETER">table_constraint_using_index</replaceable> is:</phrase>
+<phrase><replaceable class="parameter">index_parameters</replaceable> in <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and <literal>EXCLUDE</literal> constraints are:</phrase>
+
+[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
+[ USING INDEX TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
+
+<phrase><replaceable class="parameter">exclude_element</replaceable> in an <literal>EXCLUDE</literal> constraint is:</phrase>
+
+{ <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]
 
-    [ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
-    { UNIQUE | PRIMARY KEY } USING INDEX <replaceable class="PARAMETER">index_name</replaceable>
-    [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -109,7 +151,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form adds a new column to the table, using the same syntax as
-      <xref linkend="SQL-CREATETABLE">. If <literal>IF NOT EXISTS</literal>
+      <xref linkend="sql-createtable"/>. If <literal>IF NOT EXISTS</literal>
       is specified and a column already exists with this name,
       no error is thrown.
      </para>
@@ -126,7 +168,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       Multivariate statistics referencing the dropped column will also be
       removed if the removal of the column would cause the statistics to
       contain data for only a single column.
-      You will need to say <literal>CASCADE</> if anything outside the table
+      You will need to say <literal>CASCADE</literal> if anything outside the table
       depends on the column, for example, foreign key references or views.
       If <literal>IF EXISTS</literal> is specified and the column
       does not exist, no error is thrown. In this case a notice
@@ -162,7 +204,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       These forms set or remove the default value for a column.
       Default values only apply in subsequent <command>INSERT</command>
-      or <command>UPDATE</> commands; they do not cause rows already in the
+      or <command>UPDATE</command> commands; they do not cause rows already in the
       table to change.
      </para>
     </listitem>
@@ -174,7 +216,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       These forms change whether a column is marked to allow null
       values or to reject null values.  You can only use <literal>SET
-      NOT NULL</> when the column contains no null values.
+      NOT NULL</literal> when the column contains no null values.
      </para>
 
      <para>
@@ -182,7 +224,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       on a column if it is marked <literal>NOT NULL</literal> in the parent
       table.  To drop the <literal>NOT NULL</literal> constraint from all the
       partitions, perform <literal>DROP NOT NULL</literal> on the parent
-      table.  Even if there is no <literal>NOT NULL</> constraint on the
+      table.  Even if there is no <literal>NOT NULL</literal> constraint on the
       parent, such a constraint can still be added to individual partitions,
       if desired; that is, the children can disallow nulls even if the parent
       allows them, but not the other way around.
@@ -198,7 +240,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       These forms change whether a column is an identity column or change the
       generation attribute of an existing identity column.
-      See <xref linkend="sql-createtable"> for details.
+      See <xref linkend="sql-createtable"/> for details.
      </para>
 
      <para>
@@ -216,7 +258,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       These forms alter the sequence that underlies an existing identity
       column.  <replaceable>sequence_option</replaceable> is an option
-      supported by <xref linkend="sql-altersequence"> such
+      supported by <xref linkend="sql-altersequence"/> such
       as <literal>INCREMENT BY</literal>.
      </para>
     </listitem>
@@ -228,13 +270,13 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       This form
       sets the per-column statistics-gathering target for subsequent
-      <xref linkend="sql-analyze"> operations.
+      <xref linkend="sql-analyze"/> operations.
       The target can be set in the range 0 to 10000; alternatively, set it
       to -1 to revert to using the system default statistics
-      target (<xref linkend="guc-default-statistics-target">).
+      target (<xref linkend="guc-default-statistics-target"/>).
       For more information on the use of statistics by the
       <productname>PostgreSQL</productname> query planner, refer to
-      <xref linkend="planner-stats">.
+      <xref linkend="planner-stats"/>.
      </para>
      <para>
       <literal>SET STATISTICS</literal> acquires a
@@ -244,22 +286,22 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>SET ( <replaceable class="PARAMETER">attribute_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term>
-    <term><literal>RESET ( <replaceable class="PARAMETER">attribute_option</replaceable> [, ... ] )</literal></term>
+    <term><literal>SET ( <replaceable class="parameter">attribute_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
+    <term><literal>RESET ( <replaceable class="parameter">attribute_option</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form sets or resets per-attribute options.  Currently, the only
-      defined per-attribute options are <literal>n_distinct</> and
-      <literal>n_distinct_inherited</>, which override the
+      defined per-attribute options are <literal>n_distinct</literal> and
+      <literal>n_distinct_inherited</literal>, which override the
       number-of-distinct-values estimates made by subsequent
-      <xref linkend="sql-analyze">
-      operations.  <literal>n_distinct</> affects the statistics for the table
-      itself, while <literal>n_distinct_inherited</> affects the statistics
+      <xref linkend="sql-analyze"/>
+      operations.  <literal>n_distinct</literal> affects the statistics for the table
+      itself, while <literal>n_distinct_inherited</literal> affects the statistics
       gathered for the table plus its inheritance children.  When set to a
-      positive value, <command>ANALYZE</> will assume that the column contains
+      positive value, <command>ANALYZE</command> will assume that the column contains
       exactly the specified number of distinct nonnull values.  When set to a
       negative value, which must be greater
-      than or equal to -1, <command>ANALYZE</> will assume that the number of
+      than or equal to -1, <command>ANALYZE</command> will assume that the number of
       distinct nonnull values in the column is linear in the size of the
       table; the exact count is to be computed by multiplying the estimated
       table size by the absolute value of the given number.  For example,
@@ -270,7 +312,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       until query planning time.  Specify a value of 0 to revert to estimating
       the number of distinct values normally.  For more information on the use
       of statistics by the <productname>PostgreSQL</productname> query
-      planner, refer to <xref linkend="planner-stats">.
+      planner, refer to <xref linkend="planner-stats"/>.
      </para>
      <para>
       Changing per-attribute options acquires a
@@ -290,7 +332,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form sets the storage mode for a column. This controls whether this
-      column is held inline or in a secondary <acronym>TOAST</> table, and
+      column is held inline or in a secondary <acronym>TOAST</acronym> table, and
       whether the data
       should be compressed or not. <literal>PLAIN</literal> must be used
       for fixed-length values such as <type>integer</type> and is
@@ -302,19 +344,19 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       Use of <literal>EXTERNAL</literal> will make substring operations on
       very large <type>text</type> and <type>bytea</type> values run faster,
       at the penalty of increased storage space.  Note that
-      <literal>SET STORAGE</> doesn't itself change anything in the table,
+      <literal>SET STORAGE</literal> doesn't itself change anything in the table,
       it just sets the strategy to be pursued during future table updates.
-      See <xref linkend="storage-toast"> for more information.
+      See <xref linkend="storage-toast"/> for more information.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">table_constraint</replaceable> [ NOT VALID ]</literal></term>
+    <term><literal>ADD <replaceable class="parameter">table_constraint</replaceable> [ NOT VALID ]</literal></term>
     <listitem>
      <para>
       This form adds a new constraint to a table using the same syntax as
-      <xref linkend="SQL-CREATETABLE">, plus the option <literal>NOT
+      <xref linkend="sql-createtable"/>, plus the option <literal>NOT
       VALID</literal>, which is currently only allowed for foreign key
       and CHECK constraints.
       If the constraint is marked <literal>NOT VALID</literal>, the
@@ -328,14 +370,20 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       the table, until it is validated by using the <literal>VALIDATE
       CONSTRAINT</literal> option.
      </para>
+
+     <para>
+      Additional restrictions apply when unique or primary key constraints
+      are added to partitioned tables; see <xref linkend="sql-createtable" />.
+     </para>
+
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ADD <replaceable class="PARAMETER">table_constraint_using_index</replaceable></literal></term>
+    <term><literal>ADD <replaceable class="parameter">table_constraint_using_index</replaceable></literal></term>
     <listitem>
      <para>
-      This form adds a new <literal>PRIMARY KEY</> or <literal>UNIQUE</>
+      This form adds a new <literal>PRIMARY KEY</literal> or <literal>UNIQUE</literal>
       constraint to a table based on an existing unique index.  All the
       columns of the index will be included in the constraint.
      </para>
@@ -344,14 +392,14 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       The index cannot have expression columns nor be a partial index.
       Also, it must be a b-tree index with default sort ordering.  These
       restrictions ensure that the index is equivalent to one that would be
-      built by a regular <literal>ADD PRIMARY KEY</> or <literal>ADD UNIQUE</>
+      built by a regular <literal>ADD PRIMARY KEY</literal> or <literal>ADD UNIQUE</literal>
       command.
      </para>
 
      <para>
-      If <literal>PRIMARY KEY</> is specified, and the index's columns are not
-      already marked <literal>NOT NULL</>, then this command will attempt to
-      do <literal>ALTER COLUMN SET NOT NULL</> against each such column.
+      If <literal>PRIMARY KEY</literal> is specified, and the index's columns are not
+      already marked <literal>NOT NULL</literal>, then this command will attempt to
+      do <literal>ALTER COLUMN SET NOT NULL</literal> against each such column.
       That requires a full table scan to verify the column(s) contain no
       nulls.  In all other cases, this is a fast operation.
      </para>
@@ -363,19 +411,23 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </para>
 
      <para>
-      After this command is executed, the index is <quote>owned</> by the
+      After this command is executed, the index is <quote>owned</quote> by the
       constraint, in the same way as if the index had been built by
-      a regular <literal>ADD PRIMARY KEY</> or <literal>ADD UNIQUE</>
+      a regular <literal>ADD PRIMARY KEY</literal> or <literal>ADD UNIQUE</literal>
       command.  In particular, dropping the constraint will make the index
       disappear too.
      </para>
 
+     <para>
+      This form is not currently supported on partitioned tables.
+     </para>
+
      <note>
       <para>
        Adding a constraint using an existing index can be helpful in
        situations where a new constraint needs to be added without blocking
        table updates for a long time.  To do that, create the index using
-       <command>CREATE INDEX CONCURRENTLY</>, and then install it as an
+       <command>CREATE INDEX CONCURRENTLY</command>, and then install it as an
        official constraint using this syntax.  See the example below.
       </para>
      </note>
@@ -445,14 +497,30 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       requires superuser privileges; it should be done with caution since
       of course the integrity of the constraint cannot be guaranteed if the
       triggers are not executed.
+     </para>
+
+     <para>
       The trigger firing mechanism is also affected by the configuration
-      variable <xref linkend="guc-session-replication-role">. Simply enabled
-      triggers will fire when the replication role is <quote>origin</>
-      (the default) or <quote>local</>. Triggers configured as <literal>ENABLE
-      REPLICA</literal> will only fire if the session is in <quote>replica</>
+      variable <xref linkend="guc-session-replication-role"/>. Simply enabled
+      triggers (the default) will fire when the replication role is <quote>origin</quote>
+      (the default) or <quote>local</quote>. Triggers configured as <literal>ENABLE
+      REPLICA</literal> will only fire if the session is in <quote>replica</quote>
       mode, and triggers configured as <literal>ENABLE ALWAYS</literal> will
-      fire regardless of the current replication mode.
+      fire regardless of the current replication role.
      </para>
+
+     <para>
+      The effect of this mechanism is that in the default configuration,
+      triggers do not fire on replicas.  This is useful because if a trigger
+      is used on the origin to propagate data between tables, then the
+      replication system will also replicate the propagated data, and the
+      trigger should not fire a second time on the replica, because that would
+      lead to duplication.  However, if a trigger is used for another purpose
+      such as creating external alerts, then it might be appropriate to set it
+      to <literal>ENABLE ALWAYS</literal> so that it is also fired on
+      replicas.
+     </para>
+
      <para>
       This command acquires a <literal>SHARE ROW EXCLUSIVE</literal> lock.
      </para>
@@ -470,6 +538,12 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       are always applied in order to keep views working even if the current
       session is in a non-default replication role.
      </para>
+
+     <para>
+      The rule firing mechanism is also affected by the configuration variable
+      <xref linkend="guc-session-replication-role"/>, analogous to triggers as
+      described above.
+     </para>
     </listitem>
    </varlistentry>
 
@@ -483,7 +557,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       even if row level security is disabled - in this case, the policies will
       NOT be applied and the policies will be ignored.
       See also
-      <xref linkend="SQL-CREATEPOLICY">.
+      <xref linkend="sql-createpolicy"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -498,7 +572,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       disabled (the default) then row level security will not be applied when
       the user is the table owner.
       See also
-      <xref linkend="SQL-CREATEPOLICY">.
+      <xref linkend="sql-createpolicy"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -508,7 +582,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form selects the default index for future
-      <xref linkend="SQL-CLUSTER">
+      <xref linkend="sql-cluster"/>
       operations.  It does not actually re-cluster the table.
      </para>
      <para>
@@ -522,7 +596,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form removes the most recently used
-      <xref linkend="SQL-CLUSTER">
+      <xref linkend="sql-cluster"/>
       index specification from the table.  This affects
       future cluster operations that don't specify an index.
      </para>
@@ -537,14 +611,14 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form adds an <literal>oid</literal> system column to the
-      table (see <xref linkend="ddl-system-columns">).
+      table (see <xref linkend="ddl-system-columns"/>).
       It does nothing if the table already has OIDs.
      </para>
 
      <para>
-      Note that this is not equivalent to <literal>ADD COLUMN oid oid</>;
+      Note that this is not equivalent to <literal>ADD COLUMN oid oid</literal>;
       that would add a normal column that happened to be named
-      <literal>oid</>, not a system column.
+      <literal>oid</literal>, not a system column.
      </para>
     </listitem>
    </varlistentry>
@@ -582,7 +656,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
       <literal>information_schema</literal> relations are not considered part
       of the system catalogs and will be moved.
       See also
-      <xref linkend="SQL-CREATETABLESPACE">.
+      <xref linkend="sql-createtablespace"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -592,25 +666,25 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       This form changes the table from unlogged to logged or vice-versa
-      (see <xref linkend="SQL-CREATETABLE-UNLOGGED">).  It cannot be applied
+      (see <xref linkend="sql-createtable-unlogged"/>).  It cannot be applied
       to a temporary table.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>SET ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )</literal></term>
+    <term><literal>SET ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form changes one or more storage parameters for the table.  See
-      <xref linkend="SQL-CREATETABLE-storage-parameters"
-      endterm="SQL-CREATETABLE-storage-parameters-title">
+      <xref linkend="sql-createtable-storage-parameters"
+      endterm="sql-createtable-storage-parameters-title"/>
       for details on the available parameters.  Note that the table contents
       will not be modified immediately by this command; depending on the
       parameter you might need to rewrite the table to get the desired effects.
-      That can be done with <link linkend="SQL-VACUUM">VACUUM
-      FULL</>, <xref linkend="SQL-CLUSTER"> or one of the forms
-      of <command>ALTER TABLE</> that forces a table rewrite.
+      That can be done with <link linkend="sql-vacuum">VACUUM
+      FULL</link>, <xref linkend="sql-cluster"/> or one of the forms
+      of <command>ALTER TABLE</command> that forces a table rewrite.
       For planner related parameters, changes will take effect from the next
       time the table is locked so currently executing queries will not be
       affected.
@@ -618,38 +692,38 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
 
      <para>
       <literal>SHARE UPDATE EXCLUSIVE</literal> lock will be taken for
-      fillfactor and autovacuum storage parameters, as well as the
+      fillfactor, toast and autovacuum storage parameters, as well as the
       following planner related parameters:
-      effective_io_concurrency, parallel_workers, seq_page_cost
-      random_page_cost, n_distinct and n_distinct_inherited.
+      <varname>effective_io_concurrency</varname>, <varname>parallel_workers</varname>, <varname>seq_page_cost</varname>,
+      <varname>random_page_cost</varname>, <varname>n_distinct</varname> and <varname>n_distinct_inherited</varname>.
      </para>
 
      <note>
       <para>
-       While <command>CREATE TABLE</> allows <literal>OIDS</> to be specified
+       While <command>CREATE TABLE</command> allows <literal>OIDS</literal> to be specified
        in the <literal>WITH (<replaceable
-       class="PARAMETER">storage_parameter</>)</literal> syntax,
-       <command>ALTER TABLE</> does not treat <literal>OIDS</> as a
-       storage parameter.  Instead use the <literal>SET WITH OIDS</>
-       and <literal>SET WITHOUT OIDS</> forms to change OID status.
+       class="parameter">storage_parameter</replaceable>)</literal> syntax,
+       <command>ALTER TABLE</command> does not treat <literal>OIDS</literal> as a
+       storage parameter.  Instead use the <literal>SET WITH OIDS</literal>
+       and <literal>SET WITHOUT OIDS</literal> forms to change OID status.
       </para>
      </note>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>RESET ( <replaceable class="PARAMETER">storage_parameter</replaceable> [, ... ] )</literal></term>
+    <term><literal>RESET ( <replaceable class="parameter">storage_parameter</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
       This form resets one or more storage parameters to their
-      defaults.  As with <literal>SET</>, a table rewrite might be
+      defaults.  As with <literal>SET</literal>, a table rewrite might be
       needed to update the table entirely.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term>
+    <term><literal>INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term>
     <listitem>
      <para>
       This form adds the target table as a new child of the specified parent
@@ -677,7 +751,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NO INHERIT <replaceable class="PARAMETER">parent_table</replaceable></literal></term>
+    <term><literal>NO INHERIT <replaceable class="parameter">parent_table</replaceable></literal></term>
     <listitem>
      <para>
       This form removes the target table from the list of children of the
@@ -689,15 +763,15 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OF <replaceable class="PARAMETER">type_name</replaceable></literal></term>
+    <term><literal>OF <replaceable class="parameter">type_name</replaceable></literal></term>
     <listitem>
      <para>
       This form links the table to a composite type as though <command>CREATE
-      TABLE OF</> had formed it.  The table's list of column names and types
+      TABLE OF</command> had formed it.  The table's list of column names and types
       must precisely match that of the composite type; the presence of
-      an <literal>oid</> system column is permitted to differ.  The table must
+      an <literal>oid</literal> system column is permitted to differ.  The table must
       not inherit from any other table.  These restrictions ensure
-      that <command>CREATE TABLE OF</> would permit an equivalent table
+      that <command>CREATE TABLE OF</command> would permit an equivalent table
       definition.
      </para>
     </listitem>
@@ -713,7 +787,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OWNER</literal></term>
+    <term><literal>OWNER TO</literal></term>
     <listitem>
      <para>
       This form changes the owner of the table, sequence, view, materialized view,
@@ -722,19 +796,19 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     </listitem>
    </varlistentry>
 
-   <varlistentry id="SQL-CREATETABLE-REPLICA-IDENTITY">
+   <varlistentry id="sql-createtable-replica-identity">
     <term><literal>REPLICA IDENTITY</literal></term>
     <listitem>
      <para>
       This form changes the information which is written to the write-ahead log
       to identify rows which are updated or deleted.  This option has no effect
-      except when logical replication is in use.  <literal>DEFAULT</>
+      except when logical replication is in use.  <literal>DEFAULT</literal>
       (the default for non-system tables) records the
-      old values of the columns of the primary key, if any.  <literal>USING INDEX</>
+      old values of the columns of the primary key, if any.  <literal>USING INDEX</literal>
       records the old values of the columns covered by the named index, which
       must be unique, not partial, not deferrable, and include only columns marked
-      <literal>NOT NULL</>.  <literal>FULL</> records the old values of all columns
-      in the row.  <literal>NOTHING</> records no information about the old row.
+      <literal>NOT NULL</literal>.  <literal>FULL</literal> records the old values of all columns
+      in the row.  <literal>NOTHING</literal> records no information about the old row.
       (This is the default for system tables.)
       In all cases, no old values are logged unless at least one of the columns
       that would be logged differs between the old and new versions of the row.
@@ -765,20 +839,32 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ATTACH PARTITION <replaceable class="PARAMETER">partition_name</replaceable> FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable></literal></term>
+    <term><literal>ATTACH PARTITION <replaceable class="parameter">partition_name</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }</literal></term>
     <listitem>
      <para>
       This form attaches an existing table (which might itself be partitioned)
-      as a partition of the target table using the same syntax for
-      <replaceable class="PARAMETER">partition_bound_spec</replaceable> as
-      <xref linkend="sql-createtable">.  The partition bound specification
+      as a partition of the target table. The table can be attached
+      as a partition for specific values using <literal>FOR VALUES</literal>
+      or as a default partition by using <literal>DEFAULT</literal>.
+      For each index in the target table, a corresponding
+      one will be created in the attached table; or, if an equivalent
+      index already exists, will be attached to the target table's index,
+      as if <command>ALTER INDEX ATTACH PARTITION</command> had been executed.
+     </para>
+
+     <para>
+      A partition using <literal>FOR VALUES</literal> uses same syntax for
+      <replaceable class="parameter">partition_bound_spec</replaceable> as
+      <xref linkend="sql-createtable"/>.  The partition bound specification
       must correspond to the partitioning strategy and partition key of the
       target table.  The table to be attached must have all the same columns
       as the target table and no more; moreover, the column types must also
       match.  Also, it must have all the <literal>NOT NULL</literal> and
       <literal>CHECK</literal> constraints of the target table.  Currently
-      <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and
       <literal>FOREIGN KEY</literal> constraints are not considered.
+      <literal>UNIQUE</literal> and <literal>PRIMARY KEY</literal> constraints
+      from the parent table will be created in the partition, if they don't
+      already exist.
       If any of the <literal>CHECK</literal> constraints of the table being
       attached is marked <literal>NO INHERIT</literal>, the command will fail;
       such a constraint must be recreated without the <literal>NO INHERIT</literal>
@@ -803,19 +889,31 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      <para>
       If the new partition is a foreign table, nothing is done to verify
       that all the rows in the foreign table obey the partition constraint.
-      (See the discussion in <xref linkend="SQL-CREATEFOREIGNTABLE"> about
+      (See the discussion in <xref linkend="sql-createforeigntable"/> about
       constraints on the foreign table.)
      </para>
+
+     <para>
+      When a table has a default partition, defining a new partition changes
+      the partition constraint for the default partition. The default
+      partition can't contain any rows that would need to be moved to the new
+      partition, and will be scanned to verify that none are present. This
+      scan, like the scan of the new partition, can be avoided if an
+      appropriate <literal>CHECK</literal> constraint is present. Also like
+      the scan of the new partition, it is always skipped when the default
+      partition is a foreign table.
+     </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DETACH PARTITION</literal> <replaceable class="PARAMETER">partition_name</replaceable></term>
+    <term><literal>DETACH PARTITION</literal> <replaceable class="parameter">partition_name</replaceable></term>
     <listitem>
      <para>
       This form detaches specified partition of the target table.  The detached
       partition continues to exist as a standalone table, but no longer has any
-      ties to the table from which it was detached.
+      ties to the table from which it was detached.  Any indexes that were
+      attached to the target table's indexes are detached.
      </para>
     </listitem>
    </varlistentry>
@@ -835,7 +933,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   </para>
 
   <para>
-   You must own the table to use <command>ALTER TABLE</>.
+   You must own the table to use <command>ALTER TABLE</command>.
    To change the schema or tablespace of a table, you must also have
    <literal>CREATE</literal> privilege on the new schema or tablespace.
    To add the table as a new child of a parent table, you must own the parent
@@ -868,21 +966,21 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name (optionally schema-qualified) of an existing table to
-        alter. If <literal>ONLY</> is specified before the table name, only
-        that table is altered. If <literal>ONLY</> is not specified, the table
+        alter. If <literal>ONLY</literal> is specified before the table name, only
+        that table is altered. If <literal>ONLY</literal> is not specified, the table
         and all its descendant tables (if any) are altered.  Optionally,
-        <literal>*</> can be specified after the table name to explicitly
+        <literal>*</literal> can be specified after the table name to explicitly
         indicate that descendant tables are included.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">column_name</replaceable></term>
+      <term><replaceable class="parameter">column_name</replaceable></term>
       <listitem>
        <para>
         Name of a new or existing column.
@@ -891,7 +989,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_column_name</replaceable></term>
+      <term><replaceable class="parameter">new_column_name</replaceable></term>
       <listitem>
        <para>
         New name for an existing column.
@@ -900,7 +998,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_name</replaceable></term>
+      <term><replaceable class="parameter">new_name</replaceable></term>
       <listitem>
        <para>
         New name for the table.
@@ -909,7 +1007,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">data_type</replaceable></term>
+      <term><replaceable class="parameter">data_type</replaceable></term>
       <listitem>
        <para>
         Data type of the new column, or new data type for an existing
@@ -919,7 +1017,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">table_constraint</replaceable></term>
+      <term><replaceable class="parameter">table_constraint</replaceable></term>
       <listitem>
        <para>
         New table constraint for the table.
@@ -928,7 +1026,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
+      <term><replaceable class="parameter">constraint_name</replaceable></term>
       <listitem>
        <para>
         Name of a new or existing constraint.
@@ -943,7 +1041,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
         Automatically drop objects that depend on the dropped column
         or constraint (for example, views referencing the column),
         and in turn all objects that depend on those objects
-        (see <xref linkend="ddl-depend">).
+        (see <xref linkend="ddl-depend"/>).
        </para>
       </listitem>
      </varlistentry>
@@ -959,7 +1057,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">trigger_name</replaceable></term>
+      <term><replaceable class="parameter">trigger_name</replaceable></term>
       <listitem>
        <para>
         Name of a single trigger to disable or enable.
@@ -993,7 +1091,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">index_name</replaceable></term>
+      <term><replaceable class="parameter">index_name</replaceable></term>
       <listitem>
        <para>
         The name of an existing index.
@@ -1002,7 +1100,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">storage_parameter</replaceable></term>
+      <term><replaceable class="parameter">storage_parameter</replaceable></term>
       <listitem>
        <para>
         The name of a table storage parameter.
@@ -1011,7 +1109,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">value</replaceable></term>
+      <term><replaceable class="parameter">value</replaceable></term>
       <listitem>
        <para>
         The new value for a table storage parameter.
@@ -1021,7 +1119,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">parent_table</replaceable></term>
+      <term><replaceable class="parameter">parent_table</replaceable></term>
       <listitem>
        <para>
         A parent table to associate or de-associate with this table.
@@ -1030,7 +1128,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+      <term><replaceable class="parameter">new_owner</replaceable></term>
       <listitem>
        <para>
         The user name of the new owner of the table.
@@ -1039,7 +1137,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_tablespace</replaceable></term>
+      <term><replaceable class="parameter">new_tablespace</replaceable></term>
       <listitem>
        <para>
         The name of the tablespace to which the table will be moved.
@@ -1048,7 +1146,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_schema</replaceable></term>
+      <term><replaceable class="parameter">new_schema</replaceable></term>
       <listitem>
        <para>
         The name of the schema to which the table will be moved.
@@ -1057,7 +1155,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">partition_name</replaceable></term>
+      <term><replaceable class="parameter">partition_name</replaceable></term>
       <listitem>
        <para>
         The name of the table to attach as a new partition or to detach from this table.
@@ -1066,11 +1164,11 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">partition_bound_spec</replaceable></term>
+      <term><replaceable class="parameter">partition_bound_spec</replaceable></term>
       <listitem>
        <para>
         The partition bound specification for a new partition.  Refer to
-        <xref linkend="sql-createtable"> for more details on the syntax of the same.
+        <xref linkend="sql-createtable"/> for more details on the syntax of the same.
        </para>
       </listitem>
      </varlistentry>
@@ -1088,28 +1186,28 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    <para>
     When a column is added with <literal>ADD COLUMN</literal>, all existing
     rows in the table are initialized with the column's default value
-    (NULL if no <literal>DEFAULT</> clause is specified).
-    If there is no <literal>DEFAULT</> clause, this is merely a metadata
+    (NULL if no <literal>DEFAULT</literal> clause is specified).
+    If there is no <literal>DEFAULT</literal> clause, this is merely a metadata
     change and does not require any immediate update of the table's data;
     the added NULL values are supplied on readout, instead.
    </para>
 
    <para>
-    Adding a column with a <literal>DEFAULT</> clause or changing the type of
+    Adding a column with a <literal>DEFAULT</literal> clause or changing the type of
     an existing column will require the entire table and its indexes to be
     rewritten.  As an exception when changing the type of an existing column,
-    if the <literal>USING</> clause does not change the column
+    if the <literal>USING</literal> clause does not change the column
     contents and the old type is either binary coercible to the new type or
     an unconstrained domain over the new type, a table rewrite is not needed;
     but any indexes on the affected columns must still be rebuilt.  Adding or
-    removing a system <literal>oid</> column also requires rewriting the entire
+    removing a system <literal>oid</literal> column also requires rewriting the entire
     table.  Table and/or index rebuilds may take a significant amount of time
     for a large table; and will temporarily require as much as double the disk
     space.
    </para>
 
    <para>
-    Adding a <literal>CHECK</> or <literal>NOT NULL</> constraint requires
+    Adding a <literal>CHECK</literal> or <literal>NOT NULL</literal> constraint requires
     scanning the table to verify that existing rows meet the constraint,
     but does not require a table rewrite.
    </para>
@@ -1121,7 +1219,7 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
 
    <para>
     The main reason for providing the option to specify multiple changes
-    in a single <command>ALTER TABLE</> is that multiple table scans or
+    in a single <command>ALTER TABLE</command> is that multiple table scans or
     rewrites can thereby be combined into a single pass over the table.
    </para>
 
@@ -1133,37 +1231,37 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     reduce the on-disk size of your table, as the space occupied
     by the dropped column is not reclaimed.  The space will be
     reclaimed over time as existing rows are updated.  (These statements do
-    not apply when dropping the system <literal>oid</> column; that is done
+    not apply when dropping the system <literal>oid</literal> column; that is done
     with an immediate rewrite.)
    </para>
 
    <para>
     To force immediate reclamation of space occupied by a dropped column,
-    you can execute one of the forms of <command>ALTER TABLE</> that
+    you can execute one of the forms of <command>ALTER TABLE</command> that
     performs a rewrite of the whole table.  This results in reconstructing
     each row with the dropped column replaced by a null value.
    </para>
 
    <para>
-    The rewriting forms of <command>ALTER TABLE</> are not MVCC-safe.
+    The rewriting forms of <command>ALTER TABLE</command> are not MVCC-safe.
     After a table rewrite, the table will appear empty to concurrent
     transactions, if they are using a snapshot taken before the rewrite
-    occurred.  See <xref linkend="mvcc-caveats"> for more details.
+    occurred.  See <xref linkend="mvcc-caveats"/> for more details.
    </para>
 
    <para>
-    The <literal>USING</literal> option of <literal>SET DATA TYPE</> can actually
+    The <literal>USING</literal> option of <literal>SET DATA TYPE</literal> can actually
     specify any expression involving the old values of the row; that is, it
     can refer to other columns as well as the one being converted.  This allows
-    very general conversions to be done with the <literal>SET DATA TYPE</>
+    very general conversions to be done with the <literal>SET DATA TYPE</literal>
     syntax.  Because of this flexibility, the <literal>USING</literal>
     expression is not applied to the column's default value (if any); the
     result might not be a constant expression as required for a default.
     This means that when there is no implicit or assignment cast from old to
-    new type, <literal>SET DATA TYPE</> might fail to convert the default even
+    new type, <literal>SET DATA TYPE</literal> might fail to convert the default even
     though a <literal>USING</literal> clause is supplied.  In such cases,
-    drop the default with <literal>DROP DEFAULT</>, perform the <literal>ALTER
-    TYPE</>, and then use <literal>SET DEFAULT</> to add a suitable new
+    drop the default with <literal>DROP DEFAULT</literal>, perform the <literal>ALTER
+    TYPE</literal>, and then use <literal>SET DEFAULT</literal> to add a suitable new
     default.  Similar considerations apply to indexes and constraints involving
     the column.
    </para>
@@ -1198,11 +1296,11 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
     The actions for identity columns (<literal>ADD
     GENERATED</literal>, <literal>SET</literal> etc., <literal>DROP
     IDENTITY</literal>), as well as the actions
-    <literal>TRIGGER</>, <literal>CLUSTER</>, <literal>OWNER</>,
-    and <literal>TABLESPACE</> never recurse to descendant tables;
-    that is, they always act as though <literal>ONLY</> were specified.
-    Adding a constraint recurses only for <literal>CHECK</> constraints
-    that are not marked <literal>NO INHERIT</>.
+    <literal>TRIGGER</literal>, <literal>CLUSTER</literal>, <literal>OWNER</literal>,
+    and <literal>TABLESPACE</literal> never recurse to descendant tables;
+    that is, they always act as though <literal>ONLY</literal> were specified.
+    Adding a constraint recurses only for <literal>CHECK</literal> constraints
+    that are not marked <literal>NO INHERIT</literal>.
    </para>
 
    <para>
@@ -1210,8 +1308,8 @@ ALTER TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </para>
 
    <para>
-    Refer to <xref linkend="sql-createtable"> for a further description of valid
-    parameters. <xref linkend="ddl"> has further information on
+    Refer to <xref linkend="sql-createtable"/> for a further description of valid
+    parameters. <xref linkend="ddl"/> has further information on
     inheritance.
    </para>
  </refsect1>
@@ -1395,6 +1493,20 @@ ALTER TABLE cities
     ATTACH PARTITION cities_ab FOR VALUES IN ('a', 'b');
 </programlisting></para>
 
+  <para>
+   Attach a default partition to a partitioned table:
+<programlisting>
+ALTER TABLE cities
+    ATTACH PARTITION cities_partdef DEFAULT;
+</programlisting></para>
+
+  <para>
+   Attach a partition to hash partitioned table:
+<programlisting>
+ALTER TABLE orders
+    ATTACH PARTITION orders_p4 FOR VALUES WITH (MODULUS 4, REMAINDER 3);
+</programlisting></para>
+
   <para>
    Detach a partition from partitioned table:
 <programlisting>
@@ -1409,17 +1521,17 @@ ALTER TABLE measurement
 
   <para>
    The forms <literal>ADD</literal> (without <literal>USING INDEX</literal>),
-   <literal>DROP [COLUMN]</>, <literal>DROP IDENTITY</literal>, <literal>RESTART</literal>,
-   <literal>SET DEFAULT</>, <literal>SET DATA TYPE</literal> (without <literal>USING</literal>),
+   <literal>DROP [COLUMN]</literal>, <literal>DROP IDENTITY</literal>, <literal>RESTART</literal>,
+   <literal>SET DEFAULT</literal>, <literal>SET DATA TYPE</literal> (without <literal>USING</literal>),
    <literal>SET GENERATED</literal>, and <literal>SET <replaceable>sequence_option</replaceable></literal>
    conform with the SQL standard.  The other forms are
    <productname>PostgreSQL</productname> extensions of the SQL standard.
    Also, the ability to specify more than one manipulation in a single
-   <command>ALTER TABLE</> command is an extension.
+   <command>ALTER TABLE</command> command is an extension.
   </para>
 
   <para>
-   <command>ALTER TABLE DROP COLUMN</> can be used to drop the only
+   <command>ALTER TABLE DROP COLUMN</command> can be used to drop the only
    column of a table, leaving a zero-column table.  This is an
    extension of SQL, which disallows zero-column tables.
   </para>
@@ -1429,7 +1541,7 @@ ALTER TABLE measurement
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtable"></member>
+   <member><xref linkend="sql-createtable"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tablespace.sgml b/doc/src/sgml/ref/alter_tablespace.sgml
index 2f41105001..acec33469f 100644
--- a/doc/src/sgml/ref/alter_tablespace.sgml
+++ b/doc/src/sgml/ref/alter_tablespace.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_tablespace.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTABLESPACE">
+<refentry id="sql-altertablespace">
  <indexterm zone="sql-altertablespace">
   <primary>ALTER TABLESPACE</primary>
  </indexterm>
@@ -23,8 +23,8 @@ PostgreSQL documentation
 <synopsis>
 ALTER TABLESPACE <replaceable>name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 ALTER TABLESPACE <replaceable>name</replaceable> OWNER TO { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER TABLESPACE <replaceable>name</replaceable> SET ( <replaceable class="PARAMETER">tablespace_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] )
-ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="PARAMETER">tablespace_option</replaceable> [, ... ] )
+ALTER TABLESPACE <replaceable>name</replaceable> SET ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] )
+ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="parameter">tablespace_option</replaceable> [, ... ] )
 </synopsis>
  </refsynopsisdiv>
 
@@ -83,14 +83,14 @@ ALTER TABLESPACE <replaceable>name</replaceable> RESET ( <replaceable class="PAR
     <listitem>
      <para>
       A tablespace parameter to be set or reset.  Currently, the only
-      available parameters are <varname>seq_page_cost</>,
-      <varname>random_page_cost</> and <varname>effective_io_concurrency</>.
+      available parameters are <varname>seq_page_cost</varname>,
+      <varname>random_page_cost</varname> and <varname>effective_io_concurrency</varname>.
       Setting either value for a particular tablespace will override the
       planner's usual estimate of the cost of reading pages from tables in
       that tablespace, as established by the configuration parameters of the
-      same name (see <xref linkend="guc-seq-page-cost">,
-      <xref linkend="guc-random-page-cost">,
-      <xref linkend="guc-effective-io-concurrency">).  This may be useful if
+      same name (see <xref linkend="guc-seq-page-cost"/>,
+      <xref linkend="guc-random-page-cost"/>,
+      <xref linkend="guc-effective-io-concurrency"/>).  This may be useful if
       one tablespace is located on a disk which is faster or slower than the
       remainder of the I/O subsystem.
      </para>
@@ -130,8 +130,8 @@ ALTER TABLESPACE index_space OWNER TO mary;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtablespace"></member>
-   <member><xref linkend="sql-droptablespace"></member>
+   <member><xref linkend="sql-createtablespace"/></member>
+   <member><xref linkend="sql-droptablespace"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_trigger.sgml b/doc/src/sgml/ref/alter_trigger.sgml
index 47eef6e5e8..6cf789a67a 100644
--- a/doc/src/sgml/ref/alter_trigger.sgml
+++ b/doc/src/sgml/ref/alter_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTRIGGER">
+<refentry id="sql-altertrigger">
  <indexterm zone="sql-altertrigger">
   <primary>ALTER TRIGGER</primary>
  </indexterm>
@@ -21,8 +21,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> DEPENDS ON EXTENSION <replaceable class="PARAMETER">extension_name</replaceable>
+ALTER TRIGGER <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER TRIGGER <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> DEPENDS ON EXTENSION <replaceable class="parameter">extension_name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -48,7 +48,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an existing trigger to alter.
@@ -57,7 +57,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name of the table on which this trigger acts.
@@ -66,7 +66,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_name</replaceable></term>
+    <term><replaceable class="parameter">new_name</replaceable></term>
     <listitem>
      <para>
       The new name for the trigger.
@@ -75,7 +75,7 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">extension_name</replaceable></term>
+    <term><replaceable class="parameter">extension_name</replaceable></term>
     <listitem>
      <para>
       The name of the extension that the trigger is to depend on.
@@ -90,8 +90,8 @@ ALTER TRIGGER <replaceable class="PARAMETER">name</replaceable> ON <replaceable
 
    <para>
     The ability to temporarily enable or disable a trigger is provided by
-    <xref linkend="SQL-ALTERTABLE">, not by
-    <command>ALTER TRIGGER</>, because <command>ALTER TRIGGER</> has no
+    <xref linkend="sql-altertable"/>, not by
+    <command>ALTER TRIGGER</command>, because <command>ALTER TRIGGER</command> has no
     convenient way to express the option of enabling or disabling all of
     a table's triggers at once.
    </para>
@@ -117,7 +117,7 @@ ALTER TRIGGER emp_stamp ON emp DEPENDS ON EXTENSION emplib;
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER TRIGGER</command> is a <productname>PostgreSQL</>
+   <command>ALTER TRIGGER</command> is a <productname>PostgreSQL</productname>
    extension of the SQL standard.
   </para>
  </refsect1>
@@ -126,7 +126,7 @@ ALTER TRIGGER emp_stamp ON emp DEPENDS ON EXTENSION emplib;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable"></member>
+   <member><xref linkend="sql-altertable"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsconfig.sgml b/doc/src/sgml/ref/alter_tsconfig.sgml
index 72a719b862..ebe0b94b27 100644
--- a/doc/src/sgml/ref/alter_tsconfig.sgml
+++ b/doc/src/sgml/ref/alter_tsconfig.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_tsconfig.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTSCONFIG">
+<refentry id="sql-altertsconfig">
  <indexterm zone="sql-altertsconfig">
   <primary>ALTER TEXT SEARCH CONFIGURATION</primary>
  </indexterm>
@@ -49,7 +49,7 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> SET SCHEMA <repl
 
   <para>
    You must be the owner of the configuration to use
-   <command>ALTER TEXT SEARCH CONFIGURATION</>.
+   <command>ALTER TEXT SEARCH CONFIGURATION</command>.
   </para>
  </refsect1>
 
@@ -136,20 +136,20 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> SET SCHEMA <repl
  </variablelist>
 
   <para>
-   The <literal>ADD MAPPING FOR</> form installs a list of dictionaries to be
+   The <literal>ADD MAPPING FOR</literal> form installs a list of dictionaries to be
    consulted for the specified token type(s); it is an error if there is
    already a mapping for any of the token types.
-   The <literal>ALTER MAPPING FOR</> form does the same, but first removing
+   The <literal>ALTER MAPPING FOR</literal> form does the same, but first removing
    any existing mapping for those token types.
-   The <literal>ALTER MAPPING REPLACE</> forms substitute <replaceable
+   The <literal>ALTER MAPPING REPLACE</literal> forms substitute <replaceable
    class="parameter">new_dictionary</replaceable> for <replaceable
    class="parameter">old_dictionary</replaceable> anywhere the latter appears.
-   This is done for only the specified token types when <literal>FOR</>
+   This is done for only the specified token types when <literal>FOR</literal>
    appears, or for all mappings of the configuration when it doesn't.
-   The <literal>DROP MAPPING</> form removes all dictionaries for the
+   The <literal>DROP MAPPING</literal> form removes all dictionaries for the
    specified token type(s), causing tokens of those types to be ignored
    by the text search configuration.  It is an error if there is no mapping
-   for the token types, unless <literal>IF EXISTS</> appears.
+   for the token types, unless <literal>IF EXISTS</literal> appears.
   </para>
 
  </refsect1>
@@ -158,9 +158,9 @@ ALTER TEXT SEARCH CONFIGURATION <replaceable>name</replaceable> SET SCHEMA <repl
   <title>Examples</title>
 
   <para>
-   The following example replaces the <literal>english</> dictionary
-   with the <literal>swedish</> dictionary anywhere that <literal>english</>
-   is used within <literal>my_config</>.
+   The following example replaces the <literal>english</literal> dictionary
+   with the <literal>swedish</literal> dictionary anywhere that <literal>english</literal>
+   is used within <literal>my_config</literal>.
   </para>
 
 <programlisting>
@@ -182,8 +182,8 @@ ALTER TEXT SEARCH CONFIGURATION my_config
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsconfig"></member>
-   <member><xref linkend="sql-droptsconfig"></member>
+   <member><xref linkend="sql-createtsconfig"/></member>
+   <member><xref linkend="sql-droptsconfig"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsdictionary.sgml b/doc/src/sgml/ref/alter_tsdictionary.sgml
index 7cecabea83..b29865e11e 100644
--- a/doc/src/sgml/ref/alter_tsdictionary.sgml
+++ b/doc/src/sgml/ref/alter_tsdictionary.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_tsdictionary.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTSDICTIONARY">
+<refentry id="sql-altertsdictionary">
  <indexterm zone="sql-altertsdictionary">
   <primary>ALTER TEXT SEARCH DICTIONARY</primary>
  </indexterm>
@@ -41,7 +41,7 @@ ALTER TEXT SEARCH DICTIONARY <replaceable>name</replaceable> SET SCHEMA <replace
 
   <para>
    You must be the owner of the dictionary to use
-   <command>ALTER TEXT SEARCH DICTIONARY</>.
+   <command>ALTER TEXT SEARCH DICTIONARY</command>.
   </para>
  </refsect1>
 
@@ -126,7 +126,7 @@ ALTER TEXT SEARCH DICTIONARY my_dict ( StopWords = newrussian );
 </programlisting>
 
   <para>
-   The following example command changes the language option to <literal>dutch</>,
+   The following example command changes the language option to <literal>dutch</literal>,
    and removes the stopword option entirely.
   </para>
 
@@ -135,7 +135,7 @@ ALTER TEXT SEARCH DICTIONARY my_dict ( language = dutch, StopWords );
 </programlisting>
 
   <para>
-   The following example command <quote>updates</> the dictionary's
+   The following example command <quote>updates</quote> the dictionary's
    definition without actually changing anything.
 
 <programlisting>
@@ -144,7 +144,7 @@ ALTER TEXT SEARCH DICTIONARY my_dict ( dummy );
 
    (The reason this works is that the option removal code doesn't complain
    if there is no such option.)  This trick is useful when changing
-   configuration files for the dictionary: the <command>ALTER</> will
+   configuration files for the dictionary: the <command>ALTER</command> will
    force existing database sessions to re-read the configuration files,
    which otherwise they would never do if they had read them earlier.
   </para>
@@ -163,8 +163,8 @@ ALTER TEXT SEARCH DICTIONARY my_dict ( dummy );
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsdictionary"></member>
-   <member><xref linkend="sql-droptsdictionary"></member>
+   <member><xref linkend="sql-createtsdictionary"/></member>
+   <member><xref linkend="sql-droptsdictionary"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tsparser.sgml b/doc/src/sgml/ref/alter_tsparser.sgml
index e2b6060a17..9edff4b71a 100644
--- a/doc/src/sgml/ref/alter_tsparser.sgml
+++ b/doc/src/sgml/ref/alter_tsparser.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_tsparser.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTSPARSER">
+<refentry id="sql-altertsparser">
  <indexterm zone="sql-altertsparser">
   <primary>ALTER TEXT SEARCH PARSER</primary>
  </indexterm>
@@ -36,7 +36,7 @@ ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> SET SCHEMA <replaceable
   </para>
 
   <para>
-   You must be a superuser to use <command>ALTER TEXT SEARCH PARSER</>.
+   You must be a superuser to use <command>ALTER TEXT SEARCH PARSER</command>.
   </para>
  </refsect1>
 
@@ -86,8 +86,8 @@ ALTER TEXT SEARCH PARSER <replaceable>name</replaceable> SET SCHEMA <replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtsparser"></member>
-   <member><xref linkend="sql-droptsparser"></member>
+   <member><xref linkend="sql-createtsparser"/></member>
+   <member><xref linkend="sql-droptsparser"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_tstemplate.sgml b/doc/src/sgml/ref/alter_tstemplate.sgml
index e7ae91c0a0..5d3c826533 100644
--- a/doc/src/sgml/ref/alter_tstemplate.sgml
+++ b/doc/src/sgml/ref/alter_tstemplate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_tstemplate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTSTEMPLATE">
+<refentry id="sql-altertstemplate">
  <indexterm zone="sql-altertstemplate">
   <primary>ALTER TEXT SEARCH TEMPLATE</primary>
  </indexterm>
@@ -36,7 +36,7 @@ ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> SET SCHEMA <replaceab
   </para>
 
   <para>
-   You must be a superuser to use <command>ALTER TEXT SEARCH TEMPLATE</>.
+   You must be a superuser to use <command>ALTER TEXT SEARCH TEMPLATE</command>.
   </para>
  </refsect1>
 
@@ -86,8 +86,8 @@ ALTER TEXT SEARCH TEMPLATE <replaceable>name</replaceable> SET SCHEMA <replaceab
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtstemplate"></member>
-   <member><xref linkend="sql-droptstemplate"></member>
+   <member><xref linkend="sql-createtstemplate"/></member>
+   <member><xref linkend="sql-droptstemplate"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_type.sgml b/doc/src/sgml/ref/alter_type.sgml
index d65f70f674..9127dfd88d 100644
--- a/doc/src/sgml/ref/alter_type.sgml
+++ b/doc/src/sgml/ref/alter_type.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_type.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERTYPE">
+<refentry id="sql-altertype">
  <indexterm zone="sql-altertype">
   <primary>ALTER TYPE</primary>
  </indexterm>
@@ -23,19 +23,19 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> <replaceable class="PARAMETER">action</replaceable> [, ... ]
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> TO <replaceable class="PARAMETER">new_attribute_name</replaceable> [ CASCADE | RESTRICT ]
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable class="PARAMETER">new_name</replaceable>
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> SET SCHEMA <replaceable class="PARAMETER">new_schema</replaceable>
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> ADD VALUE [ IF NOT EXISTS ] <replaceable class="PARAMETER">new_enum_value</replaceable> [ { BEFORE | AFTER } <replaceable class="PARAMETER">neighbor_enum_value</replaceable> ]
-ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <replaceable class="PARAMETER">existing_enum_value</replaceable> TO <replaceable class="PARAMETER">new_enum_value</replaceable>
-
-<phrase>where <replaceable class="PARAMETER">action</replaceable> is one of:</phrase>
-
-    ADD ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ CASCADE | RESTRICT ]
-    DROP ATTRIBUTE [ IF EXISTS ] <replaceable class="PARAMETER">attribute_name</replaceable> [ CASCADE | RESTRICT ]
-    ALTER ATTRIBUTE <replaceable class="PARAMETER">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable class="PARAMETER">collation</replaceable> ] [ CASCADE | RESTRICT ]
+ALTER TYPE <replaceable class="parameter">name</replaceable> <replaceable class="parameter">action</replaceable> [, ... ]
+ALTER TYPE <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> TO <replaceable class="parameter">new_attribute_name</replaceable> [ CASCADE | RESTRICT ]
+ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
+ALTER TYPE <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
+ALTER TYPE <replaceable class="parameter">name</replaceable> ADD VALUE [ IF NOT EXISTS ] <replaceable class="parameter">new_enum_value</replaceable> [ { BEFORE | AFTER } <replaceable class="parameter">neighbor_enum_value</replaceable> ]
+ALTER TYPE <replaceable class="parameter">name</replaceable> RENAME VALUE <replaceable class="parameter">existing_enum_value</replaceable> TO <replaceable class="parameter">new_enum_value</replaceable>
+
+<phrase>where <replaceable class="parameter">action</replaceable> is one of:</phrase>
+
+    ADD ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ CASCADE | RESTRICT ]
+    DROP ATTRIBUTE [ IF EXISTS ] <replaceable class="parameter">attribute_name</replaceable> [ CASCADE | RESTRICT ]
+    ALTER ATTRIBUTE <replaceable class="parameter">attribute_name</replaceable> [ SET DATA ] TYPE <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -52,7 +52,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
     <listitem>
      <para>
       This form adds a new attribute to a composite type, using the same syntax as
-      <xref linkend="SQL-CREATETYPE">.
+      <xref linkend="sql-createtype"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -147,7 +147,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
   </para>
 
   <para>
-   You must own the type to use <command>ALTER TYPE</>.
+   You must own the type to use <command>ALTER TYPE</command>.
    To change the schema of a type, you must also have
    <literal>CREATE</literal> privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
@@ -166,7 +166,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
    <para>
     <variablelist>
      <varlistentry>
-      <term><replaceable class="PARAMETER">name</replaceable></term>
+      <term><replaceable class="parameter">name</replaceable></term>
       <listitem>
        <para>
         The name (possibly schema-qualified) of an existing type to
@@ -176,7 +176,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_name</replaceable></term>
+      <term><replaceable class="parameter">new_name</replaceable></term>
       <listitem>
        <para>
         The new name for the type.
@@ -185,7 +185,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+      <term><replaceable class="parameter">new_owner</replaceable></term>
       <listitem>
        <para>
         The user name of the new owner of the type.
@@ -194,7 +194,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_schema</replaceable></term>
+      <term><replaceable class="parameter">new_schema</replaceable></term>
       <listitem>
        <para>
         The new schema for the type.
@@ -203,7 +203,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">attribute_name</replaceable></term>
+      <term><replaceable class="parameter">attribute_name</replaceable></term>
       <listitem>
        <para>
         The name of the attribute to add, alter, or drop.
@@ -212,7 +212,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_attribute_name</replaceable></term>
+      <term><replaceable class="parameter">new_attribute_name</replaceable></term>
       <listitem>
        <para>
         The new name of the attribute to be renamed.
@@ -221,7 +221,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">data_type</replaceable></term>
+      <term><replaceable class="parameter">data_type</replaceable></term>
       <listitem>
        <para>
         The data type of the attribute to add, or the new type of the
@@ -231,7 +231,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">new_enum_value</replaceable></term>
+      <term><replaceable class="parameter">new_enum_value</replaceable></term>
       <listitem>
        <para>
         The new value to be added to an enum type's list of values,
@@ -242,7 +242,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">neighbor_enum_value</replaceable></term>
+      <term><replaceable class="parameter">neighbor_enum_value</replaceable></term>
       <listitem>
        <para>
         The existing enum value that the new value should be added immediately
@@ -253,7 +253,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">existing_enum_value</replaceable></term>
+      <term><replaceable class="parameter">existing_enum_value</replaceable></term>
       <listitem>
        <para>
         The existing enum value that should be renamed.
@@ -290,12 +290,8 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
   <title>Notes</title>
 
   <para>
-   If <command>ALTER TYPE ... ADD VALUE</> (the form that adds a new value to
-   an enum type) is executed inside a transaction block, the new value cannot
-   be used until after the transaction has been committed, except in the case
-   that the enum type itself was created earlier in the same transaction.
-   Likewise, when a pre-existing enum value is renamed, the transaction must
-   be committed before the renamed value can be used.
+   <command>ALTER TYPE ... ADD VALUE</command> (the form that adds a new value to an
+   enum type) cannot be executed inside a transaction block.
   </para>
 
   <para>
@@ -305,7 +301,7 @@ ALTER TYPE <replaceable class="PARAMETER">name</replaceable> RENAME VALUE <repla
    is used to set the new value's sort position somewhere other than at the
    end of the list.  However, sometimes it will happen even though the new
    value is added at the end (this occurs if the OID counter <quote>wrapped
-   around</> since the original creation of the enum type).  The slowdown is
+   around</quote> since the original creation of the enum type).  The slowdown is
    usually insignificant; but if it matters, optimal performance can be
    regained by dropping and recreating the enum type, or by dumping and
    reloading the database.
@@ -368,12 +364,12 @@ ALTER TYPE colors RENAME VALUE 'purple' TO 'mauve';
   </para>
  </refsect1>
 
- <refsect1 id="SQL-ALTERTYPE-see-also">
+ <refsect1 id="sql-altertype-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtype"></member>
-   <member><xref linkend="sql-droptype"></member>
+   <member><xref linkend="sql-createtype"/></member>
+   <member><xref linkend="sql-droptype"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_user.sgml b/doc/src/sgml/ref/alter_user.sgml
index 411a6dcc38..8f50f43089 100644
--- a/doc/src/sgml/ref/alter_user.sgml
+++ b/doc/src/sgml/ref/alter_user.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_user.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERUSER">
+<refentry id="sql-alteruser">
  <indexterm zone="sql-alteruser">
   <primary>ALTER USER</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ]
+ALTER USER <replaceable class="parameter">role_specification</replaceable> [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
       SUPERUSER | NOSUPERUSER
     | CREATEDB | NOCREATEDB
@@ -32,20 +32,20 @@ ALTER USER <replaceable class="PARAMETER">role_specification</replaceable> [ WIT
     | LOGIN | NOLOGIN
     | REPLICATION | NOREPLICATION
     | BYPASSRLS | NOBYPASSRLS
-    | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
-    | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
-    | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
+    | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
+    | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
+    | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
 
-ALTER USER <replaceable class="PARAMETER">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
+ALTER USER <replaceable class="parameter">name</replaceable> RENAME TO <replaceable>new_name</replaceable>
 
-ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
-ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
-ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
-ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="PARAMETER">database_name</replaceable> ] RESET ALL
+ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> { TO | = } { <replaceable>value</replaceable> | DEFAULT }
+ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] SET <replaceable>configuration_parameter</replaceable> FROM CURRENT
+ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET <replaceable>configuration_parameter</replaceable>
+ALTER USER { <replaceable class="parameter">role_specification</replaceable> | ALL } [ IN DATABASE <replaceable class="parameter">database_name</replaceable> ] RESET ALL
 
-<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
 
-    [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable>
+    <replaceable class="parameter">role_name</replaceable>
   | CURRENT_USER
   | SESSION_USER
 </synopsis>
@@ -56,7 +56,7 @@ ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | A
 
   <para>
    <command>ALTER USER</command> is now an alias for
-   <xref linkend="sql-alterrole">.
+   <xref linkend="sql-alterrole"/>.
   </para>
  </refsect1>
 
@@ -74,7 +74,7 @@ ALTER USER { <replaceable class="PARAMETER">role_specification</replaceable> | A
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterrole"></member>
+   <member><xref linkend="sql-alterrole"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/alter_user_mapping.sgml b/doc/src/sgml/ref/alter_user_mapping.sgml
index 3be54afee5..7a9b5a188a 100644
--- a/doc/src/sgml/ref/alter_user_mapping.sgml
+++ b/doc/src/sgml/ref/alter_user_mapping.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_user_mapping.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERUSERMAPPING">
+<refentry id="sql-alterusermapping">
  <indexterm zone="sql-alterusermapping">
   <primary>ALTER USER MAPPING</primary>
  </indexterm>
@@ -23,7 +23,7 @@ PostgreSQL documentation
 <synopsis>
 ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | SESSION_USER | PUBLIC }
     SERVER <replaceable class="parameter">server_name</replaceable>
-    OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )
+    OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,7 +38,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
   <para>
    The owner of a foreign server can alter user mappings for that
    server for any user.  Also, a user can alter a user mapping for
-   their own user name if <literal>USAGE</> privilege on the server has
+   their own user name if <literal>USAGE</literal> privilege on the server has
    been granted to the user.
   </para>
  </refsect1>
@@ -51,9 +51,9 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
     <term><replaceable class="parameter">user_name</replaceable></term>
     <listitem>
      <para>
-      User name of the mapping. <literal>CURRENT_USER</>
-      and <literal>USER</> match the name of the current
-      user. <literal>PUBLIC</> is used to match all present and future
+      User name of the mapping. <literal>CURRENT_USER</literal>
+      and <literal>USER</literal> match the name of the current
+      user. <literal>PUBLIC</literal> is used to match all present and future
       user names in the system.
      </para>
     </listitem>
@@ -69,13 +69,13 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="PARAMETER">option</replaceable> ['<replaceable class="PARAMETER">value</replaceable>'] [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( [ ADD | SET | DROP ] <replaceable class="parameter">option</replaceable> ['<replaceable class="parameter">value</replaceable>'] [, ... ] )</literal></term>
     <listitem>
      <para>
       Change options for the user mapping. The new options override
       any previously specified
-      options.  <literal>ADD</>, <literal>SET</>, and <literal>DROP</>
-      specify the action to be performed.  <literal>ADD</> is assumed
+      options.  <literal>ADD</literal>, <literal>SET</literal>, and <literal>DROP</literal>
+      specify the action to be performed.  <literal>ADD</literal> is assumed
       if no operation is explicitly specified.  Option names must be
       unique; options are also validated by the server's foreign-data
       wrapper.
@@ -89,7 +89,7 @@ ALTER USER MAPPING FOR { <replaceable class="parameter">user_name</replaceable>
   <title>Examples</title>
 
   <para>
-   Change the password for user mapping <literal>bob</>, server <literal>foo</>:
+   Change the password for user mapping <literal>bob</literal>, server <literal>foo</literal>:
 <programlisting>
 ALTER USER MAPPING FOR bob SERVER foo OPTIONS (SET password 'public');
 </programlisting></para>
@@ -116,8 +116,8 @@ ALTER USER MAPPING FOR bob SERVER foo OPTIONS (SET password 'public');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createusermapping"></member>
-   <member><xref linkend="sql-dropusermapping"></member>
+   <member><xref linkend="sql-createusermapping"/></member>
+   <member><xref linkend="sql-dropusermapping"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/alter_view.sgml b/doc/src/sgml/ref/alter_view.sgml
index 00f4ecb9b1..2e9edc1975 100644
--- a/doc/src/sgml/ref/alter_view.sgml
+++ b/doc/src/sgml/ref/alter_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/alter_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ALTERVIEW">
+<refentry id="sql-alterview">
  <indexterm zone="sql-alterview">
   <primary>ALTER VIEW</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> SET DEFAULT <replaceable class="PARAMETER">expression</replaceable>
-ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="PARAMETER">column_name</replaceable> DROP DEFAULT
-ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="PARAMETER">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
+ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> SET DEFAULT <replaceable class="parameter">expression</replaceable>
+ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ALTER [ COLUMN ] <replaceable class="parameter">column_name</replaceable> DROP DEFAULT
+ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> OWNER TO { <replaceable class="parameter">new_owner</replaceable> | CURRENT_USER | SESSION_USER }
 ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RENAME TO <replaceable class="parameter">new_name</replaceable>
 ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET SCHEMA <replaceable class="parameter">new_schema</replaceable>
 ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> SET ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] )
@@ -37,12 +37,12 @@ ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET
   <para>
    <command>ALTER VIEW</command> changes various auxiliary properties
    of a view.  (If you want to modify the view's defining query,
-   use <command>CREATE OR REPLACE VIEW</>.)
+   use <command>CREATE OR REPLACE VIEW</command>.)
   </para>
 
   <para>
-   You must own the view to use <command>ALTER VIEW</>.
-   To change a view's schema, you must also have <literal>CREATE</>
+   You must own the view to use <command>ALTER VIEW</command>.
+   To change a view's schema, you must also have <literal>CREATE</literal>
    privilege on the new schema.
    To alter the owner, you must also be a direct or indirect member of the new
    owning role, and that role must have <literal>CREATE</literal> privilege on
@@ -81,7 +81,7 @@ ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET
      <para>
       These forms set or remove the default value for a column.
       A view column's default value is substituted into any
-      <command>INSERT</> or <command>UPDATE</> command whose target is the
+      <command>INSERT</command> or <command>UPDATE</command> command whose target is the
       view, before applying any rules or triggers for the view.  The view's
       default will therefore take precedence over any default values from
       underlying relations.
@@ -90,7 +90,7 @@ ALTER VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> RESET
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_owner</replaceable></term>
+    <term><replaceable class="parameter">new_owner</replaceable></term>
     <listitem>
      <para>
       The user name of the new owner of the view.
@@ -185,7 +185,7 @@ INSERT INTO a_view(id) VALUES(2);  -- ts will receive the current time
   <title>Compatibility</title>
 
   <para>
-   <command>ALTER VIEW</command> is a <productname>PostgreSQL</>
+   <command>ALTER VIEW</command> is a <productname>PostgreSQL</productname>
    extension of the SQL standard.
   </para>
  </refsect1>
@@ -194,8 +194,8 @@ INSERT INTO a_view(id) VALUES(2);  -- ts will receive the current time
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createview"></member>
-   <member><xref linkend="sql-dropview"></member>
+   <member><xref linkend="sql-createview"/></member>
+   <member><xref linkend="sql-dropview"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/analyze.sgml b/doc/src/sgml/ref/analyze.sgml
index 45dee101df..83b07a0300 100644
--- a/doc/src/sgml/ref/analyze.sgml
+++ b/doc/src/sgml/ref/analyze.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/analyze.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ANALYZE">
+<refentry id="sql-analyze">
  <indexterm zone="sql-analyze">
   <primary>ANALYZE</primary>
  </indexterm>
@@ -21,7 +21,11 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] ]
+ANALYZE [ VERBOSE ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ]
+
+<phrase>where <replaceable class="parameter">table_and_columns</replaceable> is:</phrase>
+
+    <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -31,16 +35,18 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
   <para>
    <command>ANALYZE</command> collects statistics about the contents
    of tables in the database, and stores the results in the <link
-   linkend="catalog-pg-statistic"><structname>pg_statistic</></>
+   linkend="catalog-pg-statistic"><structname>pg_statistic</structname></link>
    system catalog.  Subsequently, the query planner uses these
    statistics to help determine the most efficient execution plans for
    queries.
   </para>
 
   <para>
-   With no parameter, <command>ANALYZE</command> examines every table in the
-   current database.  With a parameter, <command>ANALYZE</command> examines
-   only that table.  It is further possible to give a list of column names,
+   Without a <replaceable class="parameter">table_and_columns</replaceable>
+   list, <command>ANALYZE</command> processes every table and materialized view
+   in the current database that the current user has permission to analyze.
+   With a list, <command>ANALYZE</command> processes only those table(s).
+   It is further possible to give a list of column names for a table,
    in which case only the statistics for those columns are collected.
   </para>
  </refsect1>
@@ -59,7 +65,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (possibly schema-qualified) of a specific table to
@@ -73,7 +79,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a specific column to analyze. Defaults to all columns.
@@ -87,7 +93,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
   <title>Outputs</title>
 
    <para>
-    When <literal>VERBOSE</> is specified, <command>ANALYZE</> emits
+    When <literal>VERBOSE</literal> is specified, <command>ANALYZE</command> emits
     progress messages to indicate which table is currently being
     processed.  Various statistics about the tables are printed as well.
    </para>
@@ -98,14 +104,14 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
 
   <para>
    Foreign tables are analyzed only when explicitly selected.  Not all
-   foreign data wrappers support <command>ANALYZE</>.  If the table's
-   wrapper does not support <command>ANALYZE</>, the command prints a
+   foreign data wrappers support <command>ANALYZE</command>.  If the table's
+   wrapper does not support <command>ANALYZE</command>, the command prints a
    warning and does nothing.
   </para>
 
   <para>
    In the default <productname>PostgreSQL</productname> configuration,
-   the autovacuum daemon (see <xref linkend="autovacuum">)
+   the autovacuum daemon (see <xref linkend="autovacuum"/>)
    takes care of automatic analyzing of tables when they are first loaded
    with data, and as they change throughout regular operation.
    When autovacuum is disabled,
@@ -113,7 +119,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    just after making major changes in the contents of a table.  Accurate
    statistics will help the planner to choose the most appropriate query
    plan, and thereby improve the speed of query processing.  A common
-   strategy for read-mostly databases is to run <xref linkend="sql-vacuum">
+   strategy for read-mostly databases is to run <xref linkend="sql-vacuum"/>
    and <command>ANALYZE</command> once a day during a low-usage time of day.
    (This will not be sufficient if there is heavy update activity.)
   </para>
@@ -133,7 +139,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    in a unique-key column, there are no common values) or if the
    column data type does not support the appropriate operators.  There
    is more information about the statistics in <xref
-   linkend="maintenance">.
+   linkend="maintenance"/>.
   </para>
 
   <para>
@@ -144,7 +150,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    will change slightly each time <command>ANALYZE</command> is run,
    even if the actual table contents did not change.  This might result
    in small changes in the planner's estimated costs shown by
-   <xref linkend="sql-explain">.
+   <xref linkend="sql-explain"/>.
    In rare situations, this non-determinism will cause the planner's
    choices of query plans to change after <command>ANALYZE</command> is run.
    To avoid this, raise the amount of statistics collected by
@@ -153,10 +159,10 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
 
   <para>
    The extent of analysis can be controlled by adjusting the
-   <xref linkend="guc-default-statistics-target"> configuration variable, or
+   <xref linkend="guc-default-statistics-target"/> configuration variable, or
    on a column-by-column basis by setting the per-column statistics
    target with <command>ALTER TABLE ... ALTER COLUMN ... SET
-   STATISTICS</command> (see <xref linkend="sql-altertable">).
+   STATISTICS</command> (see <xref linkend="sql-altertable"/>).
    The target value sets the
    maximum number of entries in the most-common-value list and the
    maximum number of bins in the histogram.  The default target value
@@ -166,8 +172,8 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    <literal>pg_statistic</literal>.  In particular, setting the
    statistics target to zero disables collection of statistics for
    that column.  It might be useful to do that for columns that are
-   never used as part of the <literal>WHERE</>, <literal>GROUP BY</>,
-   or <literal>ORDER BY</> clauses of queries, since the planner will
+   never used as part of the <literal>WHERE</literal>, <literal>GROUP BY</literal>,
+   or <literal>ORDER BY</literal> clauses of queries, since the planner will
    have no use for statistics on such columns.
   </para>
 
@@ -185,8 +191,8 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
    with the largest possible statistics target.  If this inaccuracy leads to
    bad query plans, a more accurate value can be determined manually and then
    installed with
-   <command>ALTER TABLE ... ALTER COLUMN ... SET (n_distinct = ...)</>
-   (see <xref linkend="sql-altertable">).
+   <command>ALTER TABLE ... ALTER COLUMN ... SET (n_distinct = ...)</command>
+   (see <xref linkend="sql-altertable"/>).
   </para>
 
   <para>
@@ -204,7 +210,7 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
 
   <para>
     If any of the child tables are foreign tables whose foreign data wrappers
-    do not support <command>ANALYZE</>, those child tables are ignored while
+    do not support <command>ANALYZE</command>, those child tables are ignored while
     gathering inheritance statistics.
   </para>
 
@@ -227,10 +233,10 @@ ANALYZE [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> [
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-vacuum"></member>
-   <member><xref linkend="app-vacuumdb"></member>
-   <member><xref linkend="runtime-config-resource-vacuum-cost"></member>
-   <member><xref linkend="autovacuum"></member>
+   <member><xref linkend="sql-vacuum"/></member>
+   <member><xref linkend="app-vacuumdb"/></member>
+   <member><xref linkend="runtime-config-resource-vacuum-cost"/></member>
+   <member><xref linkend="autovacuum"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/begin.sgml b/doc/src/sgml/ref/begin.sgml
index c04f1c8064..c23bbfb4e7 100644
--- a/doc/src/sgml/ref/begin.sgml
+++ b/doc/src/sgml/ref/begin.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/begin.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-BEGIN">
+<refentry id="sql-begin">
  <indexterm zone="sql-begin">
   <primary>BEGIN</primary>
  </indexterm>
@@ -38,8 +38,8 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
    <command>BEGIN</command> initiates a transaction block, that is,
    all statements after a <command>BEGIN</command> command will be
    executed in a single transaction until an explicit <xref
-   linkend="sql-commit"> or <xref
-   linkend="sql-rollback"> is given.
+   linkend="sql-commit"/> or <xref
+   linkend="sql-rollback"/> is given.
    By default (without <command>BEGIN</command>),
    <productname>PostgreSQL</productname> executes
    transactions in <quote>autocommit</quote> mode, that is, each
@@ -60,7 +60,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   <para>
    If the isolation level, read/write mode, or deferrable mode is specified, the new
    transaction has those characteristics, as if
-   <xref linkend="sql-set-transaction">
+   <xref linkend="sql-set-transaction"/>
    was executed.
   </para>
  </refsect1>
@@ -81,7 +81,7 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   </variablelist>
 
   <para>
-   Refer to <xref linkend="sql-set-transaction"> for information on the meaning
+   Refer to <xref linkend="sql-set-transaction"/> for information on the meaning
    of the other parameters to this statement.
   </para>
  </refsect1>
@@ -90,21 +90,21 @@ BEGIN [ WORK | TRANSACTION ] [ <replaceable class="parameter">transaction_mode</
   <title>Notes</title>
 
   <para>
-   <xref linkend="sql-start-transaction"> has the same functionality
-   as <command>BEGIN</>.
+   <xref linkend="sql-start-transaction"/> has the same functionality
+   as <command>BEGIN</command>.
   </para>
 
   <para>
-   Use <xref linkend="SQL-COMMIT"> or
-   <xref linkend="SQL-ROLLBACK">
+   Use <xref linkend="sql-commit"/> or
+   <xref linkend="sql-rollback"/>
    to terminate a transaction block.
   </para>
 
   <para>
-   Issuing <command>BEGIN</> when already inside a transaction block will
+   Issuing <command>BEGIN</command> when already inside a transaction block will
    provoke a warning message.  The state of the transaction is not affected.
    To nest transactions within a transaction block, use savepoints
-   (see <xref linkend="sql-savepoint">).
+   (see <xref linkend="sql-savepoint"/>).
   </para>
 
   <para>
@@ -131,7 +131,7 @@ BEGIN;
   <para>
    <command>BEGIN</command> is a <productname>PostgreSQL</productname>
    language extension.  It is equivalent to the SQL-standard command
-   <xref linkend="sql-start-transaction">, whose reference page
+   <xref linkend="sql-start-transaction"/>, whose reference page
    contains additional compatibility information.
   </para>
 
@@ -152,10 +152,10 @@ BEGIN;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback"></member>
-   <member><xref linkend="sql-start-transaction"></member>
-   <member><xref linkend="sql-savepoint"></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback"/></member>
+   <member><xref linkend="sql-start-transaction"/></member>
+   <member><xref linkend="sql-savepoint"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/call.sgml b/doc/src/sgml/ref/call.sgml
new file mode 100644
index 0000000000..03da4518ee
--- /dev/null
+++ b/doc/src/sgml/ref/call.sgml
@@ -0,0 +1,104 @@
+<!--
+doc/src/sgml/ref/call.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-call">
+ <indexterm zone="sql-call">
+  <primary>CALL</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>CALL</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CALL</refname>
+  <refpurpose>invoke a procedure</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+CALL <replaceable class="parameter">name</replaceable> ( [ <replaceable class="parameter">argument</replaceable> ] [ , ...] )
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>CALL</command> executes a procedure.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of the procedure.
+     </para>
+    </listitem>
+   </varlistentry>
+
+  <varlistentry>
+    <term><replaceable class="parameter">argument</replaceable></term>
+    <listitem>
+     <para>
+      An argument for the procedure call.
+      See <xref linkend="sql-syntax-calling-funcs"/> for the full details on
+      function and procedure call syntax, including use of named parameters.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Notes</title>
+
+  <para>
+   The user must have <literal>EXECUTE</literal> privilege on the procedure in
+   order to be allowed to invoke it.
+  </para>
+
+  <para>
+   To call a function (not a procedure), use <command>SELECT</command> instead.
+  </para>
+
+  <para>
+   If <command>CALL</command> is executed in a transaction block, then the
+   called procedure cannot execute transaction control statements.
+   Transaction control statements are only allowed if <command>CALL</command>
+   is executed in its own transaction.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Examples</title>
+<programlisting>
+CALL do_db_maintenance();
+</programlisting>
+ </refsect1>
+
+ <refsect1>
+  <title>Compatibility</title>
+
+  <para>
+   <command>CALL</command> conforms to the SQL standard.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createprocedure"/></member>
+  </simplelist>
+ </refsect1>
+</refentry>
diff --git a/doc/src/sgml/ref/checkpoint.sgml b/doc/src/sgml/ref/checkpoint.sgml
index a8f3186d8c..dfcadcf402 100644
--- a/doc/src/sgml/ref/checkpoint.sgml
+++ b/doc/src/sgml/ref/checkpoint.sgml
@@ -29,7 +29,7 @@ CHECKPOINT
    A checkpoint is a point in the write-ahead log sequence at which
    all data files have been updated to reflect the information in the
    log.  All data files will be flushed to disk.  Refer to
-   <xref linkend="wal-configuration"> for more details about what happens
+   <xref linkend="wal-configuration"/> for more details about what happens
    during a checkpoint.
   </para>
 
@@ -37,14 +37,14 @@ CHECKPOINT
    The <command>CHECKPOINT</command> command forces an immediate
    checkpoint when the command is issued, without waiting for a
    regular checkpoint scheduled by the system (controlled by the settings in
-   <xref linkend="runtime-config-wal-checkpoints">).
+   <xref linkend="runtime-config-wal-checkpoints"/>).
    <command>CHECKPOINT</command> is not intended for use during normal
    operation.
   </para>
 
   <para>
    If executed during recovery, the <command>CHECKPOINT</command> command
-   will force a restartpoint (see <xref linkend="wal-configuration">)
+   will force a restartpoint (see <xref linkend="wal-configuration"/>)
    rather than writing a new checkpoint.
   </para>
 
diff --git a/doc/src/sgml/ref/close.sgml b/doc/src/sgml/ref/close.sgml
index aacc667144..e464df1965 100644
--- a/doc/src/sgml/ref/close.sgml
+++ b/doc/src/sgml/ref/close.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/close.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CLOSE">
+<refentry id="sql-close">
  <indexterm zone="sql-close">
   <primary>CLOSE</primary>
  </indexterm>
@@ -26,7 +26,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
+CLOSE { <replaceable class="parameter">name</replaceable> | ALL }
 </synopsis>
  </refsynopsisdiv>
 
@@ -57,7 +57,7 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an open cursor to close.
@@ -84,13 +84,13 @@ CLOSE { <replaceable class="PARAMETER">name</replaceable> | ALL }
    <productname>PostgreSQL</productname> does not have an explicit
    <command>OPEN</command> cursor statement; a cursor is considered
    open when it is declared.  Use the
-   <xref linkend="sql-declare">
+   <xref linkend="sql-declare"/>
    statement to declare a cursor.
   </para>
 
   <para>
    You can see all available cursors by querying the <link
-   linkend="view-pg-cursors"><structname>pg_cursors</></> system view.
+   linkend="view-pg-cursors"><structname>pg_cursors</structname></link> system view.
   </para>
 
   <para>
@@ -115,7 +115,7 @@ CLOSE liahona;
 
   <para>
    <command>CLOSE</command> is fully conforming with the SQL
-   standard. <command>CLOSE ALL</> is a <productname>PostgreSQL</>
+   standard. <command>CLOSE ALL</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -124,9 +124,9 @@ CLOSE liahona;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-declare"></member>
-   <member><xref linkend="sql-fetch"></member>
-   <member><xref linkend="sql-move"></member>
+   <member><xref linkend="sql-declare"/></member>
+   <member><xref linkend="sql-fetch"/></member>
+   <member><xref linkend="sql-move"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/cluster.sgml b/doc/src/sgml/ref/cluster.sgml
index e6a77095ec..4da60d8d56 100644
--- a/doc/src/sgml/ref/cluster.sgml
+++ b/doc/src/sgml/ref/cluster.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/cluster.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CLUSTER">
+<refentry id="sql-cluster">
  <indexterm zone="sql-cluster">
   <primary>CLUSTER</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CLUSTER [VERBOSE] <replaceable class="PARAMETER">table_name</replaceable> [ USING <replaceable class="PARAMETER">index_name</replaceable> ]
+CLUSTER [VERBOSE] <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">index_name</replaceable> ]
 CLUSTER [VERBOSE]
 </synopsis>
  </refsynopsisdiv>
@@ -57,7 +57,7 @@ CLUSTER [VERBOSE]
    <command>CLUSTER <replaceable class="parameter">table_name</replaceable></command>
    reclusters the table using the same index as before.  You can also
    use the <literal>CLUSTER</literal> or <literal>SET WITHOUT CLUSTER</literal>
-   forms of <xref linkend="SQL-ALTERTABLE"> to set the index to be used for
+   forms of <xref linkend="sql-altertable"/> to set the index to be used for
    future cluster operations, or to clear any previous setting.
   </para>
 
@@ -82,7 +82,7 @@ CLUSTER [VERBOSE]
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (possibly schema-qualified) of a table.
@@ -91,7 +91,7 @@ CLUSTER [VERBOSE]
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">index_name</replaceable></term>
+    <term><replaceable class="parameter">index_name</replaceable></term>
     <listitem>
      <para>
       The name of an index.
@@ -128,7 +128,7 @@ CLUSTER [VERBOSE]
    </para>
 
    <para>
-    <command>CLUSTER</> can re-sort the table using either an index scan
+    <command>CLUSTER</command> can re-sort the table using either an index scan
     on the specified index, or (if the index is a b-tree) a sequential
     scan followed by sorting.  It will attempt to choose the method that
     will be faster, based on planner cost parameters and available statistical
@@ -148,18 +148,18 @@ CLUSTER [VERBOSE]
     as double the table size, plus the index sizes.  This method is often
     faster than the index scan method, but if the disk space requirement is
     intolerable, you can disable this choice by temporarily setting <xref
-    linkend="guc-enable-sort"> to <literal>off</>.
+    linkend="guc-enable-sort"/> to <literal>off</literal>.
    </para>
 
    <para>
-    It is advisable to set <xref linkend="guc-maintenance-work-mem"> to
+    It is advisable to set <xref linkend="guc-maintenance-work-mem"/> to
     a reasonably large value (but not more than the amount of RAM you can
-    dedicate to the <command>CLUSTER</> operation) before clustering.
+    dedicate to the <command>CLUSTER</command> operation) before clustering.
    </para>
 
    <para>
     Because the planner records statistics about the ordering of
-    tables, it is advisable to run <xref linkend="sql-analyze">
+    tables, it is advisable to run <xref linkend="sql-analyze"/>
     on the newly clustered table.
     Otherwise, the planner might make poor choices of query plans.
    </para>
@@ -168,7 +168,7 @@ CLUSTER [VERBOSE]
     Because <command>CLUSTER</command> remembers which indexes are clustered,
     one can cluster the tables one wants clustered manually the first time,
     then set up a periodic maintenance script that executes
-    <command>CLUSTER</> without any parameters, so that the desired tables
+    <command>CLUSTER</command> without any parameters, so that the desired tables
     are periodically reclustered.
    </para>
 
@@ -210,9 +210,9 @@ CLUSTER;
   <para>
    The syntax
 <synopsis>
-CLUSTER <replaceable class="PARAMETER">index_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable>
+CLUSTER <replaceable class="parameter">index_name</replaceable> ON <replaceable class="parameter">table_name</replaceable>
 </synopsis>
-  is also supported for compatibility with pre-8.3 <productname>PostgreSQL</>
+  is also supported for compatibility with pre-8.3 <productname>PostgreSQL</productname>
   versions.
   </para>
  </refsect1>
@@ -221,7 +221,7 @@ CLUSTER <replaceable class="PARAMETER">index_name</replaceable> ON <replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-clusterdb"></member>
+   <member><xref linkend="app-clusterdb"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/clusterdb.sgml b/doc/src/sgml/ref/clusterdb.sgml
index 67582fd6e6..ed343dd7da 100644
--- a/doc/src/sgml/ref/clusterdb.sgml
+++ b/doc/src/sgml/ref/clusterdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/clusterdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-CLUSTERDB">
+<refentry id="app-clusterdb">
  <indexterm zone="app-clusterdb">
   <primary>clusterdb</primary>
  </indexterm>
@@ -60,7 +60,7 @@ PostgreSQL documentation
 
   <para>
    <application>clusterdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-CLUSTER">.
+   command <xref linkend="sql-cluster"/>.
    There is no effective difference between clustering databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -76,8 +76,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-a</></term>
-      <term><option>--all</></term>
+      <term><option>-a</option></term>
+      <term><option>--all</option></term>
       <listitem>
        <para>
         Cluster all databases.
@@ -86,8 +86,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>-d</optional> <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option><optional>--dbname=</optional><replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
         Specifies the name of the database to be clustered.
@@ -101,8 +101,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>clusterdb</application> generates
@@ -112,8 +112,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-q</option></term>
+      <term><option>--quiet</option></term>
       <listitem>
        <para>
         Do not display progress messages.
@@ -122,20 +122,20 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table=<replaceable class="parameter">table</replaceable></></term>
+      <term><option>-t <replaceable class="parameter">table</replaceable></option></term>
+      <term><option>--table=<replaceable class="parameter">table</replaceable></option></term>
       <listitem>
        <para>
         Cluster <replaceable class="parameter">table</replaceable> only.
         Multiple tables can be clustered by writing multiple
-        <option>-t</> switches.
+        <option>-t</option> switches.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-v</></term>
-      <term><option>--verbose</></term>
+      <term><option>-v</option></term>
+      <term><option>--verbose</option></term>
       <listitem>
        <para>
         Print detailed information during processing.
@@ -144,8 +144,8 @@ PostgreSQL documentation
      </varlistentry>
 
     <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
       <para>
       Print the <application>clusterdb</application> version and exit.
@@ -154,8 +154,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
       <para>
       Show help about <application>clusterdb</application> command line
@@ -173,8 +173,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server is
@@ -185,8 +185,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -197,8 +197,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as.
@@ -207,8 +207,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -222,8 +222,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>clusterdb</application> to prompt for a
@@ -236,14 +236,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>clusterdb</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
          Specifies the name of the database to connect to discover what other
@@ -277,9 +277,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -289,8 +289,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CLUSTER">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-cluster"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -325,7 +325,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-cluster"></member>
+   <member><xref linkend="sql-cluster"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/comment.sgml b/doc/src/sgml/ref/comment.sgml
index df328117f1..965c5a40ad 100644
--- a/doc/src/sgml/ref/comment.sgml
+++ b/doc/src/sgml/ref/comment.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/comment.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-COMMENT">
+<refentry id="sql-comment">
  <indexterm zone="sql-comment">
   <primary>COMMENT</primary>
  </indexterm>
@@ -23,48 +23,50 @@ PostgreSQL documentation
 <synopsis>
 COMMENT ON
 {
-  ACCESS METHOD <replaceable class="PARAMETER">object_name</replaceable> |
-  AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
+  ACCESS METHOD <replaceable class="parameter">object_name</replaceable> |
+  AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
   CAST (<replaceable>source_type</replaceable> AS <replaceable>target_type</replaceable>) |
-  COLLATION <replaceable class="PARAMETER">object_name</replaceable> |
-  COLUMN <replaceable class="PARAMETER">relation_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
-  CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
-  CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ON DOMAIN <replaceable class="PARAMETER">domain_name</replaceable> |
-  CONVERSION <replaceable class="PARAMETER">object_name</replaceable> |
-  DATABASE <replaceable class="PARAMETER">object_name</replaceable> |
-  DOMAIN <replaceable class="PARAMETER">object_name</replaceable> |
-  EXTENSION <replaceable class="PARAMETER">object_name</replaceable> |
-  EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> |
-  FOREIGN DATA WRAPPER <replaceable class="PARAMETER">object_name</replaceable> |
-  FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable> |
-  FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
-  INDEX <replaceable class="PARAMETER">object_name</replaceable> |
-  LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> |
-  MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> |
-  OPERATOR <replaceable class="PARAMETER">operator_name</replaceable> (<replaceable class="PARAMETER">left_type</replaceable>, <replaceable class="PARAMETER">right_type</replaceable>) |
-  OPERATOR CLASS <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  OPERATOR FAMILY <replaceable class="PARAMETER">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
-  POLICY <replaceable class="PARAMETER">policy_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
-  [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> |
-  PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> |
-  ROLE <replaceable class="PARAMETER">object_name</replaceable> |
-  RULE <replaceable class="PARAMETER">rule_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
-  SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
-  SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
-  SERVER <replaceable class="PARAMETER">object_name</replaceable> |
-  STATISTICS <replaceable class="PARAMETER">object_name</replaceable> |
-  SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> |
-  TABLE <replaceable class="PARAMETER">object_name</replaceable> |
-  TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH CONFIGURATION <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH DICTIONARY <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH PARSER <replaceable class="PARAMETER">object_name</replaceable> |
-  TEXT SEARCH TEMPLATE <replaceable class="PARAMETER">object_name</replaceable> |
+  COLLATION <replaceable class="parameter">object_name</replaceable> |
+  COLUMN <replaceable class="parameter">relation_name</replaceable>.<replaceable class="parameter">column_name</replaceable> |
+  CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
+  CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ON DOMAIN <replaceable class="parameter">domain_name</replaceable> |
+  CONVERSION <replaceable class="parameter">object_name</replaceable> |
+  DATABASE <replaceable class="parameter">object_name</replaceable> |
+  DOMAIN <replaceable class="parameter">object_name</replaceable> |
+  EXTENSION <replaceable class="parameter">object_name</replaceable> |
+  EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> |
+  FOREIGN DATA WRAPPER <replaceable class="parameter">object_name</replaceable> |
+  FOREIGN TABLE <replaceable class="parameter">object_name</replaceable> |
+  FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  INDEX <replaceable class="parameter">object_name</replaceable> |
+  LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> |
+  MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> |
+  OPERATOR <replaceable class="parameter">operator_name</replaceable> (<replaceable class="parameter">left_type</replaceable>, <replaceable class="parameter">right_type</replaceable>) |
+  OPERATOR CLASS <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
+  OPERATOR FAMILY <replaceable class="parameter">object_name</replaceable> USING <replaceable class="parameter">index_method</replaceable> |
+  POLICY <replaceable class="parameter">policy_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
+  [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
+  PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  PUBLICATION <replaceable class="parameter">object_name</replaceable> |
+  ROLE <replaceable class="parameter">object_name</replaceable> |
+  ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  RULE <replaceable class="parameter">rule_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
+  SCHEMA <replaceable class="parameter">object_name</replaceable> |
+  SEQUENCE <replaceable class="parameter">object_name</replaceable> |
+  SERVER <replaceable class="parameter">object_name</replaceable> |
+  STATISTICS <replaceable class="parameter">object_name</replaceable> |
+  SUBSCRIPTION <replaceable class="parameter">object_name</replaceable> |
+  TABLE <replaceable class="parameter">object_name</replaceable> |
+  TABLESPACE <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH CONFIGURATION <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH DICTIONARY <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH PARSER <replaceable class="parameter">object_name</replaceable> |
+  TEXT SEARCH TEMPLATE <replaceable class="parameter">object_name</replaceable> |
   TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAGE <replaceable>lang_name</replaceable> |
-  TRIGGER <replaceable class="PARAMETER">trigger_name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> |
-  TYPE <replaceable class="PARAMETER">object_name</replaceable> |
-  VIEW <replaceable class="PARAMETER">object_name</replaceable>
-} IS '<replaceable class="PARAMETER">text</replaceable>'
+  TRIGGER <replaceable class="parameter">trigger_name</replaceable> ON <replaceable class="parameter">table_name</replaceable> |
+  TYPE <replaceable class="parameter">object_name</replaceable> |
+  VIEW <replaceable class="parameter">object_name</replaceable>
+} IS '<replaceable class="parameter">text</replaceable>'
 
 <phrase>where <replaceable>aggregate_signature</replaceable> is:</phrase>
 
@@ -83,16 +85,16 @@ COMMENT ON
 
   <para>
    Only one comment string is stored for each object, so to modify a comment,
-   issue a new <command>COMMENT</> command for the same object.  To remove a
+   issue a new <command>COMMENT</command> command for the same object.  To remove a
    comment, write <literal>NULL</literal> in place of the text string.
    Comments are automatically dropped when their object is dropped.
   </para>
 
   <para>
    For most kinds of object, only the object's owner can set the comment.
-   Roles don't have owners, so the rule for <literal>COMMENT ON ROLE</> is
+   Roles don't have owners, so the rule for <literal>COMMENT ON ROLE</literal> is
    that you must be superuser to comment on a superuser role, or have the
-   <literal>CREATEROLE</> privilege to comment on non-superuser roles.
+   <literal>CREATEROLE</literal> privilege to comment on non-superuser roles.
    Likewise, access methods don't have owners either; you must be superuser
    to comment on an access method.
    Of course, a superuser can comment on anything.
@@ -103,9 +105,9 @@ COMMENT ON
     <command>\d</command> family of commands.
     Other user interfaces to retrieve comments can be built atop
     the same built-in functions that <application>psql</application> uses, namely
-    <function>obj_description</>, <function>col_description</>,
-    and <function>shobj_description</>
-    (see <xref linkend="functions-info-comment-table">).
+    <function>obj_description</function>, <function>col_description</function>,
+    and <function>shobj_description</function>
+    (see <xref linkend="functions-info-comment-table"/>).
   </para>
  </refsect1>
 
@@ -121,13 +123,15 @@ COMMENT ON
     <term><replaceable class="parameter">function_name</replaceable></term>
     <term><replaceable class="parameter">operator_name</replaceable></term>
     <term><replaceable class="parameter">policy_name</replaceable></term>
+    <term><replaceable class="parameter">procedure_name</replaceable></term>
+    <term><replaceable class="parameter">routine_name</replaceable></term>
     <term><replaceable class="parameter">rule_name</replaceable></term>
     <term><replaceable class="parameter">trigger_name</replaceable></term>
     <listitem>
      <para>
       The name of the object to be commented.  Names of tables,
       aggregates, collations, conversions, domains, foreign tables, functions,
-      indexes, operators, operator classes, operator families, sequences,
+      indexes, operators, operator classes, operator families, procedures, routines, sequences,
       statistics, text search objects, types, and views can be
       schema-qualified. When commenting on a column,
       <replaceable class="parameter">relation_name</replaceable> must refer
@@ -170,15 +174,15 @@ COMMENT ON
     <term><replaceable class="parameter">argmode</replaceable></term>
     <listitem>
      <para>
-      The mode of a function or aggregate
-      argument: <literal>IN</>, <literal>OUT</>,
-      <literal>INOUT</>, or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of a function, procedure, or aggregate
+      argument: <literal>IN</literal>, <literal>OUT</literal>,
+      <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
       Note that <command>COMMENT</command> does not actually pay
-      any attention to <literal>OUT</> arguments, since only the input
+      any attention to <literal>OUT</literal> arguments, since only the input
       arguments are needed to determine the function's identity.
-      So it is sufficient to list the <literal>IN</>, <literal>INOUT</>,
-      and <literal>VARIADIC</> arguments.
+      So it is sufficient to list the <literal>IN</literal>, <literal>INOUT</literal>,
+      and <literal>VARIADIC</literal> arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -187,7 +191,7 @@ COMMENT ON
     <term><replaceable class="parameter">argname</replaceable></term>
     <listitem>
      <para>
-      The name of a function or aggregate argument.
+      The name of a function, procedure, or aggregate argument.
       Note that <command>COMMENT</command> does not actually pay
       any attention to argument names, since only the argument data
       types are needed to determine the function's identity.
@@ -199,7 +203,7 @@ COMMENT ON
     <term><replaceable class="parameter">argtype</replaceable></term>
     <listitem>
      <para>
-      The data type of a function or aggregate argument.
+      The data type of a function, procedure, or aggregate argument.
      </para>
     </listitem>
    </varlistentry>
@@ -219,7 +223,7 @@ COMMENT ON
     <listitem>
      <para>
       The data type(s) of the operator's arguments (optionally
-      schema-qualified).  Write <literal>NONE</> for the missing argument
+      schema-qualified).  Write <literal>NONE</literal> for the missing argument
       of a prefix or postfix operator.
      </para>
     </listitem>
@@ -258,7 +262,7 @@ COMMENT ON
     <term><replaceable class="parameter">text</replaceable></term>
     <listitem>
      <para>
-      The new comment, written as a string literal; or <literal>NULL</>
+      The new comment, written as a string literal; or <literal>NULL</literal>
       to drop the comment.
      </para>
     </listitem>
@@ -325,6 +329,7 @@ COMMENT ON OPERATOR - (NONE, integer) IS 'Unary minus';
 COMMENT ON OPERATOR CLASS int4ops USING btree IS '4 byte integer operators for btrees';
 COMMENT ON OPERATOR FAMILY integer_ops USING btree IS 'all integer operators for btrees';
 COMMENT ON POLICY my_policy ON mytable IS 'Filter rows by users';
+COMMENT ON PROCEDURE my_proc (integer, integer) IS 'Runs a report';
 COMMENT ON ROLE my_role IS 'Administration group for finance tables';
 COMMENT ON RULE my_rule ON my_table IS 'Logs updates of employee records';
 COMMENT ON SCHEMA my_schema IS 'Departmental data';
diff --git a/doc/src/sgml/ref/commit.sgml b/doc/src/sgml/ref/commit.sgml
index e93c216849..b2e8d5d180 100644
--- a/doc/src/sgml/ref/commit.sgml
+++ b/doc/src/sgml/ref/commit.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/commit.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-COMMIT">
+<refentry id="sql-commit">
  <indexterm zone="sql-commit">
   <primary>COMMIT</primary>
  </indexterm>
@@ -55,12 +55,12 @@ COMMIT [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK"> to
+   Use <xref linkend="sql-rollback"/> to
    abort a transaction.
   </para>
 
   <para>
-   Issuing <command>COMMIT</> when not inside a transaction does
+   Issuing <command>COMMIT</command> when not inside a transaction does
    no harm, but it will provoke a warning message.
   </para>
  </refsect1>
@@ -89,8 +89,8 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-rollback"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/commit_prepared.sgml b/doc/src/sgml/ref/commit_prepared.sgml
index e1988ad318..d938b65bbe 100644
--- a/doc/src/sgml/ref/commit_prepared.sgml
+++ b/doc/src/sgml/ref/commit_prepared.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/commit_prepared.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-COMMIT-PREPARED">
+<refentry id="sql-commit-prepared">
  <indexterm zone="sql-commit-prepared">
   <primary>COMMIT PREPARED</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
+COMMIT PREPARED <replaceable class="parameter">transaction_id</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -39,7 +39,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">transaction_id</replaceable></term>
+    <term><replaceable class="parameter">transaction_id</replaceable></term>
     <listitem>
      <para>
       The transaction identifier of the transaction that is to be
@@ -75,7 +75,7 @@ COMMIT PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
   <title id="sql-commit-prepared-examples-title">Examples</title>
   <para>
    Commit the transaction identified by the transaction
-   identifier <literal>foobar</>:
+   identifier <literal>foobar</literal>:
 
 <programlisting>
 COMMIT PREPARED 'foobar';
@@ -99,8 +99,8 @@ COMMIT PREPARED 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-prepare-transaction"></member>
-   <member><xref linkend="sql-rollback-prepared"></member>
+   <member><xref linkend="sql-prepare-transaction"/></member>
+   <member><xref linkend="sql-rollback-prepared"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/copy.sgml b/doc/src/sgml/ref/copy.sgml
index 8de1150dfb..af2a0e91b9 100644
--- a/doc/src/sgml/ref/copy.sgml
+++ b/doc/src/sgml/ref/copy.sgml
@@ -4,7 +4,7 @@ PostgreSQL documentation
 -->
 
 
-<refentry id="SQL-COPY">
+<refentry id="sql-copy">
  <indexterm zone="sql-copy">
   <primary>COPY</primary>
  </indexterm>
@@ -54,10 +54,10 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
    <command>COPY</command> moves data between
    <productname>PostgreSQL</productname> tables and standard file-system
    files. <command>COPY TO</command> copies the contents of a table
-   <emphasis>to</> a file, while <command>COPY FROM</command> copies
-   data <emphasis>from</> a file to a table (appending the data to
+   <emphasis>to</emphasis> a file, while <command>COPY FROM</command> copies
+   data <emphasis>from</emphasis> a file to a table (appending the data to
    whatever is in the table already).  <command>COPY TO</command>
-   can also copy the results of a <command>SELECT</> query.
+   can also copy the results of a <command>SELECT</command> query.
   </para>
 
   <para>
@@ -112,16 +112,16 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select">, <xref linkend="sql-values">,
-      <xref linkend="sql-insert">, <xref linkend="sql-update"> or
-      <xref linkend="sql-delete"> command whose results are to be
+      A <xref linkend="sql-select"/>, <xref linkend="sql-values"/>,
+      <xref linkend="sql-insert"/>, <xref linkend="sql-update"/> or
+      <xref linkend="sql-delete"/> command whose results are to be
       copied.  Note that parentheses are required around the query.
      </para>
      <para>
-      For <command>INSERT</>, <command>UPDATE</> and
-      <command>DELETE</> queries a RETURNING clause must be provided,
+      For <command>INSERT</command>, <command>UPDATE</command> and
+      <command>DELETE</command> queries a RETURNING clause must be provided,
       and the target relation must not have a conditional rule, nor
-      an <literal>ALSO</> rule, nor an <literal>INSTEAD</> rule
+      an <literal>ALSO</literal> rule, nor an <literal>INSTEAD</literal> rule
       that expands to multiple statements.
      </para>
     </listitem>
@@ -133,7 +133,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
      <para>
       The path name of the input or output file.  An input file name can be
       an absolute or relative path, but an output file name must be an absolute
-      path.  Windows users might need to use an <literal>E''</> string and
+      path.  Windows users might need to use an <literal>E''</literal> string and
       double any backslashes used in the path name.
      </para>
     </listitem>
@@ -144,7 +144,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <listitem>
      <para>
       A command to execute. In <command>COPY FROM</command>, the input is
-      read from standard output of the command, and in <command>COPY TO</>,
+      read from standard output of the command, and in <command>COPY TO</command>,
       the output is written to the standard input of the command.
      </para>
      <para>
@@ -181,9 +181,9 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <listitem>
      <para>
       Specifies whether the selected option should be turned on or off.
-      You can write <literal>TRUE</literal>, <literal>ON</>, or
+      You can write <literal>TRUE</literal>, <literal>ON</literal>, or
       <literal>1</literal> to enable the option, and <literal>FALSE</literal>,
-      <literal>OFF</>, or <literal>0</literal> to disable it.  The
+      <literal>OFF</literal>, or <literal>0</literal> to disable it.  The
       <replaceable class="parameter">boolean</replaceable> value can also
       be omitted, in which case <literal>TRUE</literal> is assumed.
      </para>
@@ -195,10 +195,10 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <listitem>
      <para>
       Selects the data format to be read or written:
-      <literal>text</>,
-      <literal>csv</> (Comma Separated Values),
-      or <literal>binary</>.
-      The default is <literal>text</>.
+      <literal>text</literal>,
+      <literal>csv</literal> (Comma Separated Values),
+      or <literal>binary</literal>.
+      The default is <literal>text</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -220,7 +220,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <listitem>
      <para>
       Requests copying the data with rows already frozen, just as they
-      would be after running the <command>VACUUM FREEZE</> command.
+      would be after running the <command>VACUUM FREEZE</command> command.
       This is intended as a performance option for initial data loading.
       Rows will be frozen only if the table being loaded has been created
       or truncated in the current subtransaction, there are no cursors
@@ -241,9 +241,9 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
      <para>
       Specifies the character that separates columns within each row
       (line) of the file.  The default is a tab character in text format,
-      a comma in <literal>CSV</> format.
+      a comma in <literal>CSV</literal> format.
       This must be a single one-byte character.
-      This option is not allowed when using <literal>binary</> format.
+      This option is not allowed when using <literal>binary</literal> format.
      </para>
     </listitem>
    </varlistentry>
@@ -254,10 +254,10 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
      <para>
       Specifies the string that represents a null value. The default is
       <literal>\N</literal> (backslash-N) in text format, and an unquoted empty
-      string in <literal>CSV</> format. You might prefer an
+      string in <literal>CSV</literal> format. You might prefer an
       empty string even in text format for cases where you don't want to
       distinguish nulls from empty strings.
-      This option is not allowed when using <literal>binary</> format.
+      This option is not allowed when using <literal>binary</literal> format.
      </para>
 
      <note>
@@ -279,7 +279,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
       Specifies that the file contains a header line with the names of each
       column in the file.  On output, the first line contains the column
       names from the table, and on input, the first line is ignored.
-      This option is allowed only when using <literal>CSV</> format.
+      This option is allowed only when using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
@@ -291,7 +291,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
       Specifies the quoting character to be used when a data value is quoted.
       The default is double-quote.
       This must be a single one-byte character.
-      This option is allowed only when using <literal>CSV</> format.
+      This option is allowed only when using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
@@ -301,59 +301,59 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
     <listitem>
      <para>
       Specifies the character that should appear before a
-      data character that matches the <literal>QUOTE</> value.
-      The default is the same as the <literal>QUOTE</> value (so that
+      data character that matches the <literal>QUOTE</literal> value.
+      The default is the same as the <literal>QUOTE</literal> value (so that
       the quoting character is doubled if it appears in the data).
       This must be a single one-byte character.
-      This option is allowed only when using <literal>CSV</> format.
+      This option is allowed only when using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>FORCE_QUOTE</></term>
+    <term><literal>FORCE_QUOTE</literal></term>
     <listitem>
      <para>
       Forces quoting to be
-      used for all non-<literal>NULL</> values in each specified column.
-      <literal>NULL</> output is never quoted. If <literal>*</> is specified,
-      non-<literal>NULL</> values will be quoted in all columns.
-      This option is allowed only in <command>COPY TO</>, and only when
-      using <literal>CSV</> format.
+      used for all non-<literal>NULL</literal> values in each specified column.
+      <literal>NULL</literal> output is never quoted. If <literal>*</literal> is specified,
+      non-<literal>NULL</literal> values will be quoted in all columns.
+      This option is allowed only in <command>COPY TO</command>, and only when
+      using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>FORCE_NOT_NULL</></term>
+    <term><literal>FORCE_NOT_NULL</literal></term>
     <listitem>
      <para>
       Do not match the specified columns' values against the null string.
       In the default case where the null string is empty, this means that
       empty values will be read as zero-length strings rather than nulls,
       even when they are not quoted.
-      This option is allowed only in <command>COPY FROM</>, and only when
-      using <literal>CSV</> format.
+      This option is allowed only in <command>COPY FROM</command>, and only when
+      using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>FORCE_NULL</></term>
+    <term><literal>FORCE_NULL</literal></term>
     <listitem>
      <para>
       Match the specified columns' values against the null string, even
       if it has been quoted, and if a match is found set the value to
-      <literal>NULL</>. In the default case where the null string is empty,
+      <literal>NULL</literal>. In the default case where the null string is empty,
       this converts a quoted empty string into NULL.
-      This option is allowed only in <command>COPY FROM</>, and only when
-      using <literal>CSV</> format.
+      This option is allowed only in <command>COPY FROM</command>, and only when
+      using <literal>CSV</literal> format.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>ENCODING</></term>
+    <term><literal>ENCODING</literal></term>
     <listitem>
      <para>
       Specifies that the file is encoded in the <replaceable
@@ -371,7 +371,7 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
   <title>Outputs</title>
 
   <para>
-   On successful completion, a <command>COPY</> command returns a command
+   On successful completion, a <command>COPY</command> command returns a command
    tag of the form
 <screen>
 COPY <replaceable class="parameter">count</replaceable>
@@ -382,10 +382,10 @@ COPY <replaceable class="parameter">count</replaceable>
 
   <note>
    <para>
-    <application>psql</> will print this command tag only if the command
-    was not <literal>COPY ... TO STDOUT</>, or the
-    equivalent <application>psql</> meta-command
-    <literal>\copy ... to stdout</>.  This is to prevent confusing the
+    <application>psql</application> will print this command tag only if the command
+    was not <literal>COPY ... TO STDOUT</literal>, or the
+    equivalent <application>psql</application> meta-command
+    <literal>\copy ... to stdout</literal>.  This is to prevent confusing the
     command tag with the data that was just printed.
    </para>
   </note>
@@ -403,16 +403,16 @@ COPY <replaceable class="parameter">count</replaceable>
 
    <para>
     <command>COPY FROM</command> can be used with plain tables and with views
-    that have <literal>INSTEAD OF INSERT</> triggers.
+    that have <literal>INSTEAD OF INSERT</literal> triggers.
    </para>
 
    <para>
     <command>COPY</command> only deals with the specific table named;
     it does not copy data to or from child tables.  Thus for example
-    <literal>COPY <replaceable class="parameter">table</> TO</literal>
+    <literal>COPY <replaceable class="parameter">table</replaceable> TO</literal>
     shows the same data as <literal>SELECT * FROM ONLY <replaceable
-    class="parameter">table</></literal>.  But <literal>COPY
-    (SELECT * FROM <replaceable class="parameter">table</>) TO ...</literal>
+    class="parameter">table</replaceable></literal>.  But <literal>COPY
+    (SELECT * FROM <replaceable class="parameter">table</replaceable>) TO ...</literal>
     can be used to dump all of the data in an inheritance hierarchy.
    </para>
 
@@ -427,7 +427,7 @@ COPY <replaceable class="parameter">count</replaceable>
    <para>
     If row-level security is enabled for the table, the relevant
     <command>SELECT</command> policies will apply to <literal>COPY
-    <replaceable class="parameter">table</> TO</literal> statements.
+    <replaceable class="parameter">table</replaceable> TO</literal> statements.
     Currently, <command>COPY FROM</command> is not supported for tables
     with row-level security. Use equivalent <command>INSERT</command>
     statements instead.
@@ -451,7 +451,7 @@ COPY <replaceable class="parameter">count</replaceable>
    <para>
     Do not confuse <command>COPY</command> with the
     <application>psql</application> instruction
-    <command><link linkend="APP-PSQL-meta-commands-copy">\copy</link></command>. <command>\copy</command> invokes
+    <command><link linkend="app-psql-meta-commands-copy">\copy</link></command>. <command>\copy</command> invokes
     <command>COPY FROM STDIN</command> or <command>COPY TO
     STDOUT</command>, and then fetches/stores the data in a file
     accessible to the <application>psql</application> client. Thus,
@@ -482,7 +482,7 @@ COPY <replaceable class="parameter">count</replaceable>
    <para>
     For identity columns, the <command>COPY FROM</command> command will always
     write the column values provided in the input data, like
-    the <command>INPUT</command> option <literal>OVERRIDING SYSTEM
+    the <command>INSERT</command> option <literal>OVERRIDING SYSTEM
     VALUE</literal>.
    </para>
 
@@ -491,10 +491,10 @@ COPY <replaceable class="parameter">count</replaceable>
     <varname>DateStyle</varname>. To ensure portability to other
     <productname>PostgreSQL</productname> installations that might use
     non-default <varname>DateStyle</varname> settings,
-    <varname>DateStyle</varname> should be set to <literal>ISO</> before
-    using <command>COPY TO</>.  It is also a good idea to avoid dumping
+    <varname>DateStyle</varname> should be set to <literal>ISO</literal> before
+    using <command>COPY TO</command>.  It is also a good idea to avoid dumping
     data with <varname>IntervalStyle</varname> set to
-    <literal>sql_standard</>, because negative interval values might be
+    <literal>sql_standard</literal>, because negative interval values might be
     misinterpreted by a server that has a different setting for
     <varname>IntervalStyle</varname>.
    </para>
@@ -519,7 +519,7 @@ COPY <replaceable class="parameter">count</replaceable>
    </para>
 
    <para>
-    <literal>FORCE_NULL</> and <literal>FORCE_NOT_NULL</> can be used
+    <literal>FORCE_NULL</literal> and <literal>FORCE_NOT_NULL</literal> can be used
     simultaneously on the same column. This results in converting quoted
     null strings to null values and unquoted null strings to empty strings.
    </para>
@@ -533,7 +533,7 @@ COPY <replaceable class="parameter">count</replaceable>
    <title>Text Format</title>
 
    <para>
-    When the <literal>text</> format is used,
+    When the <literal>text</literal> format is used,
     the data read or written is a text file with one line per table row.
     Columns in a row are separated by the delimiter character.
     The column values themselves are strings generated by the
@@ -548,17 +548,17 @@ COPY <replaceable class="parameter">count</replaceable>
 
    <para>
     End of data can be represented by a single line containing just
-    backslash-period (<literal>\.</>).  An end-of-data marker is
+    backslash-period (<literal>\.</literal>).  An end-of-data marker is
     not necessary when reading from a file, since the end of file
     serves perfectly well; it is needed only when copying data to or from
     client applications using pre-3.0 client protocol.
    </para>
 
    <para>
-    Backslash characters (<literal>\</>) can be used in the
+    Backslash characters (<literal>\</literal>) can be used in the
     <command>COPY</command> data to quote data characters that might
     otherwise be taken as row or column delimiters. In particular, the
-    following characters <emphasis>must</> be preceded by a backslash if
+    following characters <emphasis>must</emphasis> be preceded by a backslash if
     they appear as part of a column value: backslash itself,
     newline, carriage return, and the current delimiter character.
    </para>
@@ -587,37 +587,37 @@ COPY <replaceable class="parameter">count</replaceable>
 
      <tbody>
       <row>
-       <entry><literal>\b</></entry>
+       <entry><literal>\b</literal></entry>
        <entry>Backspace (ASCII 8)</entry>
       </row>
       <row>
-       <entry><literal>\f</></entry>
+       <entry><literal>\f</literal></entry>
        <entry>Form feed (ASCII 12)</entry>
       </row>
       <row>
-       <entry><literal>\n</></entry>
+       <entry><literal>\n</literal></entry>
        <entry>Newline (ASCII 10)</entry>
       </row>
       <row>
-       <entry><literal>\r</></entry>
+       <entry><literal>\r</literal></entry>
        <entry>Carriage return (ASCII 13)</entry>
       </row>
       <row>
-       <entry><literal>\t</></entry>
+       <entry><literal>\t</literal></entry>
        <entry>Tab (ASCII 9)</entry>
       </row>
       <row>
-       <entry><literal>\v</></entry>
+       <entry><literal>\v</literal></entry>
        <entry>Vertical tab (ASCII 11)</entry>
       </row>
       <row>
-       <entry><literal>\</><replaceable>digits</></entry>
+       <entry><literal>\</literal><replaceable>digits</replaceable></entry>
        <entry>Backslash followed by one to three octal digits specifies
        the character with that numeric code</entry>
       </row>
       <row>
-       <entry><literal>\x</><replaceable>digits</></entry>
-       <entry>Backslash <literal>x</> followed by one or two hex digits specifies
+       <entry><literal>\x</literal><replaceable>digits</replaceable></entry>
+       <entry>Backslash <literal>x</literal> followed by one or two hex digits specifies
        the character with that numeric code</entry>
       </row>
      </tbody>
@@ -633,15 +633,15 @@ COPY <replaceable class="parameter">count</replaceable>
     Any other backslashed character that is not mentioned in the above table
     will be taken to represent itself.  However, beware of adding backslashes
     unnecessarily, since that might accidentally produce a string matching the
-    end-of-data marker (<literal>\.</>) or the null string (<literal>\N</> by
+    end-of-data marker (<literal>\.</literal>) or the null string (<literal>\N</literal> by
     default).  These strings will be recognized before any other backslash
     processing is done.
    </para>
 
    <para>
     It is strongly recommended that applications generating <command>COPY</command> data convert
-    data newlines and carriage returns to the <literal>\n</> and
-    <literal>\r</> sequences respectively.  At present it is
+    data newlines and carriage returns to the <literal>\n</literal> and
+    <literal>\r</literal> sequences respectively.  At present it is
     possible to represent a data carriage return by a backslash and carriage
     return, and to represent a data newline by a backslash and newline.
     However, these representations might not be accepted in future releases.
@@ -652,10 +652,10 @@ COPY <replaceable class="parameter">count</replaceable>
 
    <para>
     <command>COPY TO</command> will terminate each row with a Unix-style
-    newline (<quote><literal>\n</></>).  Servers running on Microsoft Windows instead
-    output carriage return/newline (<quote><literal>\r\n</></>), but only for
-    <command>COPY</> to a server file; for consistency across platforms,
-    <command>COPY TO STDOUT</> always sends <quote><literal>\n</></>
+    newline (<quote><literal>\n</literal></quote>).  Servers running on Microsoft Windows instead
+    output carriage return/newline (<quote><literal>\r\n</literal></quote>), but only for
+    <command>COPY</command> to a server file; for consistency across platforms,
+    <command>COPY TO STDOUT</command> always sends <quote><literal>\n</literal></quote>
     regardless of server platform.
     <command>COPY FROM</command> can handle lines ending with newlines,
     carriage returns, or carriage return/newlines.  To reduce the risk of
@@ -670,62 +670,62 @@ COPY <replaceable class="parameter">count</replaceable>
 
    <para>
     This format option is used for importing and exporting the Comma
-    Separated Value (<literal>CSV</>) file format used by many other
+    Separated Value (<literal>CSV</literal>) file format used by many other
     programs, such as spreadsheets. Instead of the escaping rules used by
     <productname>PostgreSQL</productname>'s standard text format, it
     produces and recognizes the common CSV escaping mechanism.
    </para>
 
    <para>
-    The values in each record are separated by the <literal>DELIMITER</>
+    The values in each record are separated by the <literal>DELIMITER</literal>
     character. If the value contains the delimiter character, the
-    <literal>QUOTE</> character, the <literal>NULL</> string, a carriage
+    <literal>QUOTE</literal> character, the <literal>NULL</literal> string, a carriage
     return, or line feed character, then the whole value is prefixed and
-    suffixed by the <literal>QUOTE</> character, and any occurrence
-    within the value of a <literal>QUOTE</> character or the
-    <literal>ESCAPE</> character is preceded by the escape character.
-    You can also use <literal>FORCE_QUOTE</> to force quotes when outputting
-    non-<literal>NULL</> values in specific columns.
+    suffixed by the <literal>QUOTE</literal> character, and any occurrence
+    within the value of a <literal>QUOTE</literal> character or the
+    <literal>ESCAPE</literal> character is preceded by the escape character.
+    You can also use <literal>FORCE_QUOTE</literal> to force quotes when outputting
+    non-<literal>NULL</literal> values in specific columns.
    </para>
 
    <para>
-    The <literal>CSV</> format has no standard way to distinguish a
-    <literal>NULL</> value from an empty string.
-    <productname>PostgreSQL</>'s <command>COPY</> handles this by quoting.
-    A <literal>NULL</> is output as the <literal>NULL</> parameter string
-    and is not quoted, while a non-<literal>NULL</> value matching the
-    <literal>NULL</> parameter string is quoted.  For example, with the
-    default settings, a <literal>NULL</> is written as an unquoted empty
+    The <literal>CSV</literal> format has no standard way to distinguish a
+    <literal>NULL</literal> value from an empty string.
+    <productname>PostgreSQL</productname>'s <command>COPY</command> handles this by quoting.
+    A <literal>NULL</literal> is output as the <literal>NULL</literal> parameter string
+    and is not quoted, while a non-<literal>NULL</literal> value matching the
+    <literal>NULL</literal> parameter string is quoted.  For example, with the
+    default settings, a <literal>NULL</literal> is written as an unquoted empty
     string, while an empty string data value is written with double quotes
-    (<literal>""</>). Reading values follows similar rules. You can
-    use <literal>FORCE_NOT_NULL</> to prevent <literal>NULL</> input
+    (<literal>""</literal>). Reading values follows similar rules. You can
+    use <literal>FORCE_NOT_NULL</literal> to prevent <literal>NULL</literal> input
     comparisons for specific columns. You can also use
-    <literal>FORCE_NULL</> to convert quoted null string data values to
-    <literal>NULL</>.
+    <literal>FORCE_NULL</literal> to convert quoted null string data values to
+    <literal>NULL</literal>.
    </para>
 
    <para>
-    Because backslash is not a special character in the <literal>CSV</>
-    format, <literal>\.</>, the end-of-data marker, could also appear
-    as a data value.  To avoid any misinterpretation, a <literal>\.</>
+    Because backslash is not a special character in the <literal>CSV</literal>
+    format, <literal>\.</literal>, the end-of-data marker, could also appear
+    as a data value.  To avoid any misinterpretation, a <literal>\.</literal>
     data value appearing as a lone entry on a line is automatically
     quoted on output, and on input, if quoted, is not interpreted as the
     end-of-data marker.  If you are loading a file created by another
     application that has a single unquoted column and might have a
-    value of <literal>\.</>, you might need to quote that value in the
+    value of <literal>\.</literal>, you might need to quote that value in the
     input file.
    </para>
 
    <note>
     <para>
-     In <literal>CSV</> format, all characters are significant. A quoted value
+     In <literal>CSV</literal> format, all characters are significant. A quoted value
      surrounded by white space, or any characters other than
-     <literal>DELIMITER</>, will include those characters. This can cause
-     errors if you import data from a system that pads <literal>CSV</>
+     <literal>DELIMITER</literal>, will include those characters. This can cause
+     errors if you import data from a system that pads <literal>CSV</literal>
      lines with white space out to some fixed width. If such a situation
-     arises you might need to preprocess the <literal>CSV</> file to remove
+     arises you might need to preprocess the <literal>CSV</literal> file to remove
      the trailing white space, before importing the data into
-     <productname>PostgreSQL</>.
+     <productname>PostgreSQL</productname>.
     </para>
    </note>
 
@@ -743,7 +743,7 @@ COPY <replaceable class="parameter">count</replaceable>
      Many programs produce strange and occasionally perverse CSV files,
      so the file format is more a convention than a standard. Thus you
      might encounter some files that cannot be imported using this
-     mechanism, and <command>COPY</> might produce files that other
+     mechanism, and <command>COPY</command> might produce files that other
      programs cannot process.
     </para>
    </note>
@@ -756,17 +756,17 @@ COPY <replaceable class="parameter">count</replaceable>
    <para>
     The <literal>binary</literal> format option causes all data to be
     stored/read as binary format rather than as text.  It is
-    somewhat faster than the text and <literal>CSV</> formats,
+    somewhat faster than the text and <literal>CSV</literal> formats,
     but a binary-format file is less portable across machine architectures and
     <productname>PostgreSQL</productname> versions.
     Also, the binary format is very data type specific; for example
-    it will not work to output binary data from a <type>smallint</> column
-    and read it into an <type>integer</> column, even though that would work
+    it will not work to output binary data from a <type>smallint</type> column
+    and read it into an <type>integer</type> column, even though that would work
     fine in text format.
    </para>
 
    <para>
-    The <literal>binary</> file format consists
+    The <literal>binary</literal> file format consists
     of a file header, zero or more tuples containing the row data, and
     a file trailer.  Headers and data are in network byte order.
    </para>
@@ -790,7 +790,7 @@ COPY <replaceable class="parameter">count</replaceable>
       <term>Signature</term>
       <listitem>
        <para>
-11-byte sequence <literal>PGCOPY\n\377\r\n\0</> &mdash; note that the zero byte
+11-byte sequence <literal>PGCOPY\n\377\r\n\0</literal> &mdash; note that the zero byte
 is a required part of the signature.  (The signature is designed to allow
 easy identification of files that have been munged by a non-8-bit-clean
 transfer.  This signature will be changed by end-of-line-translation
@@ -804,7 +804,7 @@ filters, dropped zero bytes, dropped high bits, or parity changes.)
       <listitem>
        <para>
 32-bit integer bit mask to denote important aspects of the file format. Bits
-are numbered from 0 (<acronym>LSB</>) to 31 (<acronym>MSB</>).  Note that
+are numbered from 0 (<acronym>LSB</acronym>) to 31 (<acronym>MSB</acronym>).  Note that
 this field is stored in network byte order (most significant byte first),
 as are all the integer fields used in the file format.  Bits
 16-31 are reserved to denote critical file format issues; a reader
@@ -880,7 +880,7 @@ to be specified.
     <para>
 To determine the appropriate binary format for the actual tuple data you
 should consult the <productname>PostgreSQL</productname> source, in
-particular the <function>*send</> and <function>*recv</> functions for
+particular the <function>*send</function> and <function>*recv</function> functions for
 each column's data type (typically these functions are found in the
 <filename>src/backend/utils/adt/</filename> directory of the source
 distribution).
@@ -924,7 +924,7 @@ COPY country TO STDOUT (DELIMITER '|');
   </para>
 
   <para>
-   To copy data from a file into the <literal>country</> table:
+   To copy data from a file into the <literal>country</literal> table:
 <programlisting>
 COPY country FROM '/usr1/proj/bray/sql/country_data';
 </programlisting>
@@ -986,7 +986,7 @@ ZW      ZIMBABWE
   </para>
 
   <para>
-   The following syntax was used before <productname>PostgreSQL</>
+   The following syntax was used before <productname>PostgreSQL</productname>
    version 9.0 and is still supported:
 
 <synopsis>
@@ -1015,13 +1015,13 @@ COPY { <replaceable class="parameter">table_name</replaceable> [ ( <replaceable
                 [ FORCE QUOTE { <replaceable class="parameter">column_name</replaceable> [, ...] | * } ] ] ]
 </synopsis>
 
-   Note that in this syntax, <literal>BINARY</> and <literal>CSV</> are
-   treated as independent keywords, not as arguments of a <literal>FORMAT</>
+   Note that in this syntax, <literal>BINARY</literal> and <literal>CSV</literal> are
+   treated as independent keywords, not as arguments of a <literal>FORMAT</literal>
    option.
   </para>
 
   <para>
-   The following syntax was used before <productname>PostgreSQL</>
+   The following syntax was used before <productname>PostgreSQL</productname>
    version 7.3 and is still supported:
 
 <synopsis>
diff --git a/doc/src/sgml/ref/create_access_method.sgml b/doc/src/sgml/ref/create_access_method.sgml
index 891926dba5..851c5e63be 100644
--- a/doc/src/sgml/ref/create_access_method.sgml
+++ b/doc/src/sgml/ref/create_access_method.sgml
@@ -73,12 +73,12 @@ CREATE ACCESS METHOD <replaceable class="parameter">name</replaceable>
       <replaceable class="parameter">handler_function</replaceable> is the
       name (possibly schema-qualified) of a previously registered function
       that represents the access method.  The handler function must be
-      declared to take a single argument of type <type>internal</>,
+      declared to take a single argument of type <type>internal</type>,
       and its return type depends on the type of access method;
       for <literal>INDEX</literal> access methods, it must
       be <type>index_am_handler</type>.  The C-level API that the handler
       function must implement varies depending on the type of access method.
-      The index access method API is described in <xref linkend="indexam">.
+      The index access method API is described in <xref linkend="indexam"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -89,8 +89,8 @@ CREATE ACCESS METHOD <replaceable class="parameter">name</replaceable>
   <title>Examples</title>
 
   <para>
-   Create an index access method <literal>heptree</> with
-   handler function <literal>heptree_handler</>:
+   Create an index access method <literal>heptree</literal> with
+   handler function <literal>heptree_handler</literal>:
 <programlisting>
 CREATE ACCESS METHOD heptree TYPE INDEX HANDLER heptree_handler;
 </programlisting></para>
@@ -101,7 +101,7 @@ CREATE ACCESS METHOD heptree TYPE INDEX HANDLER heptree_handler;
 
   <para>
    <command>CREATE ACCESS METHOD</command> is a
-   <productname>PostgreSQL</> extension.
+   <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -109,9 +109,9 @@ CREATE ACCESS METHOD heptree TYPE INDEX HANDLER heptree_handler;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-drop-access-method"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-createopfamily"></member>
+   <member><xref linkend="sql-drop-access-method"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-createopfamily"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_aggregate.sgml b/doc/src/sgml/ref/create_aggregate.sgml
index 6a8acfb4f9..a4aaae876e 100644
--- a/doc/src/sgml/ref/create_aggregate.sgml
+++ b/doc/src/sgml/ref/create_aggregate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_aggregate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEAGGREGATE">
+<refentry id="sql-createaggregate">
  <indexterm zone="sql-createaggregate">
   <primary>CREATE AGGREGATE</primary>
  </indexterm>
@@ -22,59 +22,64 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ) (
-    SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>,
-    STYPE = <replaceable class="PARAMETER">state_data_type</replaceable>
-    [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ]
-    [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
+    SFUNC = <replaceable class="parameter">sfunc</replaceable>,
+    STYPE = <replaceable class="parameter">state_data_type</replaceable>
+    [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ]
+    [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ]
     [ , FINALFUNC_EXTRA ]
-    [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ]
-    [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ]
-    [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ]
-    [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
-    [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ]
-    [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ]
-    [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ]
-    [ , MSSPACE = <replaceable class="PARAMETER">mstate_data_size</replaceable> ]
-    [ , MFINALFUNC = <replaceable class="PARAMETER">mffunc</replaceable> ]
+    [ , FINALFUNC_MODIFY = { READ_ONLY | SHARABLE | READ_WRITE } ]
+    [ , COMBINEFUNC = <replaceable class="parameter">combinefunc</replaceable> ]
+    [ , SERIALFUNC = <replaceable class="parameter">serialfunc</replaceable> ]
+    [ , DESERIALFUNC = <replaceable class="parameter">deserialfunc</replaceable> ]
+    [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ]
+    [ , MSFUNC = <replaceable class="parameter">msfunc</replaceable> ]
+    [ , MINVFUNC = <replaceable class="parameter">minvfunc</replaceable> ]
+    [ , MSTYPE = <replaceable class="parameter">mstate_data_type</replaceable> ]
+    [ , MSSPACE = <replaceable class="parameter">mstate_data_size</replaceable> ]
+    [ , MFINALFUNC = <replaceable class="parameter">mffunc</replaceable> ]
     [ , MFINALFUNC_EXTRA ]
-    [ , MINITCOND = <replaceable class="PARAMETER">minitial_condition</replaceable> ]
-    [ , SORTOP = <replaceable class="PARAMETER">sort_operator</replaceable> ]
+    [ , MFINALFUNC_MODIFY = { READ_ONLY | SHARABLE | READ_WRITE } ]
+    [ , MINITCOND = <replaceable class="parameter">minitial_condition</replaceable> ]
+    [ , SORTOP = <replaceable class="parameter">sort_operator</replaceable> ]
     [ , PARALLEL = { SAFE | RESTRICTED | UNSAFE } ]
 )
 
 CREATE AGGREGATE <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ]
                         ORDER BY [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">arg_data_type</replaceable> [ , ... ] ) (
-    SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>,
-    STYPE = <replaceable class="PARAMETER">state_data_type</replaceable>
-    [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ]
-    [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
+    SFUNC = <replaceable class="parameter">sfunc</replaceable>,
+    STYPE = <replaceable class="parameter">state_data_type</replaceable>
+    [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ]
+    [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ]
     [ , FINALFUNC_EXTRA ]
-    [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
+    [ , FINALFUNC_MODIFY = { READ_ONLY | SHARABLE | READ_WRITE } ]
+    [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ]
     [ , PARALLEL = { SAFE | RESTRICTED | UNSAFE } ]
     [ , HYPOTHETICAL ]
 )
 
 <phrase>or the old syntax</phrase>
 
-CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
-    BASETYPE = <replaceable class="PARAMETER">base_type</replaceable>,
-    SFUNC = <replaceable class="PARAMETER">sfunc</replaceable>,
-    STYPE = <replaceable class="PARAMETER">state_data_type</replaceable>
-    [ , SSPACE = <replaceable class="PARAMETER">state_data_size</replaceable> ]
-    [ , FINALFUNC = <replaceable class="PARAMETER">ffunc</replaceable> ]
+CREATE AGGREGATE <replaceable class="parameter">name</replaceable> (
+    BASETYPE = <replaceable class="parameter">base_type</replaceable>,
+    SFUNC = <replaceable class="parameter">sfunc</replaceable>,
+    STYPE = <replaceable class="parameter">state_data_type</replaceable>
+    [ , SSPACE = <replaceable class="parameter">state_data_size</replaceable> ]
+    [ , FINALFUNC = <replaceable class="parameter">ffunc</replaceable> ]
     [ , FINALFUNC_EXTRA ]
-    [ , COMBINEFUNC = <replaceable class="PARAMETER">combinefunc</replaceable> ]
-    [ , SERIALFUNC = <replaceable class="PARAMETER">serialfunc</replaceable> ]
-    [ , DESERIALFUNC = <replaceable class="PARAMETER">deserialfunc</replaceable> ]
-    [ , INITCOND = <replaceable class="PARAMETER">initial_condition</replaceable> ]
-    [ , MSFUNC = <replaceable class="PARAMETER">msfunc</replaceable> ]
-    [ , MINVFUNC = <replaceable class="PARAMETER">minvfunc</replaceable> ]
-    [ , MSTYPE = <replaceable class="PARAMETER">mstate_data_type</replaceable> ]
-    [ , MSSPACE = <replaceable class="PARAMETER">mstate_data_size</replaceable> ]
-    [ , MFINALFUNC = <replaceable class="PARAMETER">mffunc</replaceable> ]
+    [ , FINALFUNC_MODIFY = { READ_ONLY | SHARABLE | READ_WRITE } ]
+    [ , COMBINEFUNC = <replaceable class="parameter">combinefunc</replaceable> ]
+    [ , SERIALFUNC = <replaceable class="parameter">serialfunc</replaceable> ]
+    [ , DESERIALFUNC = <replaceable class="parameter">deserialfunc</replaceable> ]
+    [ , INITCOND = <replaceable class="parameter">initial_condition</replaceable> ]
+    [ , MSFUNC = <replaceable class="parameter">msfunc</replaceable> ]
+    [ , MINVFUNC = <replaceable class="parameter">minvfunc</replaceable> ]
+    [ , MSTYPE = <replaceable class="parameter">mstate_data_type</replaceable> ]
+    [ , MSSPACE = <replaceable class="parameter">mstate_data_size</replaceable> ]
+    [ , MFINALFUNC = <replaceable class="parameter">mffunc</replaceable> ]
     [ , MFINALFUNC_EXTRA ]
-    [ , MINITCOND = <replaceable class="PARAMETER">minitial_condition</replaceable> ]
-    [ , SORTOP = <replaceable class="PARAMETER">sort_operator</replaceable> ]
+    [ , MFINALFUNC_MODIFY = { READ_ONLY | SHARABLE | READ_WRITE } ]
+    [ , MINITCOND = <replaceable class="parameter">minitial_condition</replaceable> ]
+    [ , SORTOP = <replaceable class="parameter">sort_operator</replaceable> ]
 )
 </synopsis>
  </refsynopsisdiv>
@@ -86,14 +91,14 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
    <command>CREATE AGGREGATE</command> defines a new aggregate
    function. Some basic and commonly-used aggregate functions are
    included with the distribution; they are documented in <xref
-   linkend="functions-aggregate">. If one defines new types or needs
+   linkend="functions-aggregate"/>. If one defines new types or needs
    an aggregate function not already provided, then <command>CREATE
    AGGREGATE</command> can be used to provide the desired features.
   </para>
 
   <para>
    If a schema name is given (for example, <literal>CREATE AGGREGATE
-   myschema.myagg ...</>) then the aggregate function is created in the
+   myschema.myagg ...</literal>) then the aggregate function is created in the
    specified schema.  Otherwise it is created in the current schema.
   </para>
 
@@ -105,26 +110,26 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
    the name and input data type(s) of every ordinary function in the same
    schema.
    This behavior is identical to overloading of ordinary function names
-   (see <xref linkend="sql-createfunction">).
+   (see <xref linkend="sql-createfunction"/>).
   </para>
 
   <para>
    A simple aggregate function is made from one or two ordinary
    functions:
    a state transition function
-   <replaceable class="PARAMETER">sfunc</replaceable>,
+   <replaceable class="parameter">sfunc</replaceable>,
    and an optional final calculation function
-   <replaceable class="PARAMETER">ffunc</replaceable>.
+   <replaceable class="parameter">ffunc</replaceable>.
    These are used as follows:
 <programlisting>
-<replaceable class="PARAMETER">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state
-<replaceable class="PARAMETER">ffunc</replaceable>( internal-state ) ---> aggregate-value
+<replaceable class="parameter">sfunc</replaceable>( internal-state, next-data-values ) ---> next-internal-state
+<replaceable class="parameter">ffunc</replaceable>( internal-state ) ---> aggregate-value
 </programlisting>
   </para>
 
   <para>
    <productname>PostgreSQL</productname> creates a temporary variable
-   of data type <replaceable class="PARAMETER">stype</replaceable>
+   of data type <replaceable class="parameter">stype</replaceable>
    to hold the current internal state of the aggregate.  At each input row,
    the aggregate argument value(s) are calculated and
    the state transition function is invoked with the current state value
@@ -155,9 +160,9 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
    all-nonnull input values.
    This is handy for implementing aggregates like <function>max</function>.
    Note that this behavior is only available when
-   <replaceable class="PARAMETER">state_data_type</replaceable>
+   <replaceable class="parameter">state_data_type</replaceable>
    is the same as the first
-   <replaceable class="PARAMETER">arg_data_type</replaceable>.
+   <replaceable class="parameter">arg_data_type</replaceable>.
    When these types are different, you must supply a nonnull initial
    condition or use a nonstrict transition function.
   </para>
@@ -186,56 +191,57 @@ CREATE AGGREGATE <replaceable class="PARAMETER">name</replaceable> (
    is polymorphic and the state value's data type would be inadequate to
    pin down the result type.  These extra parameters are always passed as
    NULL (and so the final function must not be strict when
-   the <literal>FINALFUNC_EXTRA</> option is used), but nonetheless they
+   the <literal>FINALFUNC_EXTRA</literal> option is used), but nonetheless they
    are valid parameters.  The final function could for example make use
-   of <function>get_fn_expr_argtype</> to identify the actual argument type
+   of <function>get_fn_expr_argtype</function> to identify the actual argument type
    in the current call.
   </para>
 
   <para>
-   An aggregate can optionally support <firstterm>moving-aggregate mode</>,
-   as described in <xref linkend="xaggr-moving-aggregates">.  This requires
-   specifying the <literal>MSFUNC</>, <literal>MINVFUNC</>,
-   and <literal>MSTYPE</> parameters, and optionally
-   the <literal>MSPACE</>, <literal>MFINALFUNC</>, <literal>MFINALFUNC_EXTRA</>,
-   and <literal>MINITCOND</> parameters.  Except for <literal>MINVFUNC</>,
+   An aggregate can optionally support <firstterm>moving-aggregate mode</firstterm>,
+   as described in <xref linkend="xaggr-moving-aggregates"/>.  This requires
+   specifying the <literal>MSFUNC</literal>, <literal>MINVFUNC</literal>,
+   and <literal>MSTYPE</literal> parameters, and optionally
+   the <literal>MSPACE</literal>, <literal>MFINALFUNC</literal>,
+   <literal>MFINALFUNC_EXTRA</literal>, <literal>MFINALFUNC_MODIFY</literal>,
+   and <literal>MINITCOND</literal> parameters.  Except for <literal>MINVFUNC</literal>,
    these parameters work like the corresponding simple-aggregate parameters
-   without <literal>M</>; they define a separate implementation of the
+   without <literal>M</literal>; they define a separate implementation of the
    aggregate that includes an inverse transition function.
   </para>
 
   <para>
    The syntax with <literal>ORDER BY</literal> in the parameter list creates
    a special type of aggregate called an <firstterm>ordered-set
-   aggregate</firstterm>; or if <literal>HYPOTHETICAL</> is specified, then
+   aggregate</firstterm>; or if <literal>HYPOTHETICAL</literal> is specified, then
    a <firstterm>hypothetical-set aggregate</firstterm> is created.  These
    aggregates operate over groups of sorted values in order-dependent ways,
    so that specification of an input sort order is an essential part of a
-   call.  Also, they can have <firstterm>direct</> arguments, which are
+   call.  Also, they can have <firstterm>direct</firstterm> arguments, which are
    arguments that are evaluated only once per aggregation rather than once
    per input row.  Hypothetical-set aggregates are a subclass of ordered-set
    aggregates in which some of the direct arguments are required to match,
    in number and data types, the aggregated argument columns.  This allows
    the values of those direct arguments to be added to the collection of
-   aggregate-input rows as an additional <quote>hypothetical</> row.
+   aggregate-input rows as an additional <quote>hypothetical</quote> row.
   </para>
 
   <para>
-   An aggregate can optionally support <firstterm>partial aggregation</>,
-   as described in <xref linkend="xaggr-partial-aggregates">.
-   This requires specifying the <literal>COMBINEFUNC</> parameter.
-   If the <replaceable class="PARAMETER">state_data_type</replaceable>
-   is <type>internal</>, it's usually also appropriate to provide the
-   <literal>SERIALFUNC</> and <literal>DESERIALFUNC</> parameters so that
+   An aggregate can optionally support <firstterm>partial aggregation</firstterm>,
+   as described in <xref linkend="xaggr-partial-aggregates"/>.
+   This requires specifying the <literal>COMBINEFUNC</literal> parameter.
+   If the <replaceable class="parameter">state_data_type</replaceable>
+   is <type>internal</type>, it's usually also appropriate to provide the
+   <literal>SERIALFUNC</literal> and <literal>DESERIALFUNC</literal> parameters so that
    parallel aggregation is possible.  Note that the aggregate must also be
-   marked <literal>PARALLEL SAFE</> to enable parallel aggregation.
+   marked <literal>PARALLEL SAFE</literal> to enable parallel aggregation.
   </para>
 
   <para>
-   Aggregates that behave like <function>MIN</> or <function>MAX</> can
+   Aggregates that behave like <function>MIN</function> or <function>MAX</function> can
    sometimes be optimized by looking into an index instead of scanning every
    input row.  If this aggregate can be so optimized, indicate it by
-   specifying a <firstterm>sort operator</>.  The basic requirement is that
+   specifying a <firstterm>sort operator</firstterm>.  The basic requirement is that
    the aggregate must yield the first element in the sort ordering induced by
    the operator; in other words:
 <programlisting>
@@ -247,9 +253,9 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
 </programlisting>
    Further assumptions are that the aggregate ignores null inputs, and that
    it delivers a null result if and only if there were no non-null inputs.
-   Ordinarily, a data type's <literal>&lt;</> operator is the proper sort
-   operator for <function>MIN</>, and <literal>&gt;</> is the proper sort
-   operator for <function>MAX</>.  Note that the optimization will never
+   Ordinarily, a data type's <literal>&lt;</literal> operator is the proper sort
+   operator for <function>MIN</function>, and <literal>&gt;</literal> is the proper sort
+   operator for <function>MAX</function>.  Note that the optimization will never
    actually take effect unless the specified operator is the <quote>less
    than</quote> or <quote>greater than</quote> strategy member of a B-tree
    index operator class.
@@ -268,7 +274,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the aggregate function
@@ -282,10 +288,10 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
 
     <listitem>
      <para>
-      The mode of an argument: <literal>IN</> or <literal>VARIADIC</>.
-      (Aggregate functions do not support <literal>OUT</> arguments.)
-      If omitted, the default is <literal>IN</>.  Only the last argument
-      can be marked <literal>VARIADIC</>.
+      The mode of an argument: <literal>IN</literal> or <literal>VARIADIC</literal>.
+      (Aggregate functions do not support <literal>OUT</literal> arguments.)
+      If omitted, the default is <literal>IN</literal>.  Only the last argument
+      can be marked <literal>VARIADIC</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -302,11 +308,11 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">arg_data_type</replaceable></term>
+    <term><replaceable class="parameter">arg_data_type</replaceable></term>
     <listitem>
      <para>
       An input data type on which this aggregate function operates.
-      To create a zero-argument aggregate function, write <literal>*</>
+      To create a zero-argument aggregate function, write <literal>*</literal>
       in place of the list of argument specifications.  (An example of such an
       aggregate is <function>count(*)</function>.)
      </para>
@@ -314,33 +320,33 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">base_type</replaceable></term>
+    <term><replaceable class="parameter">base_type</replaceable></term>
     <listitem>
      <para>
-      In the old syntax for <command>CREATE AGGREGATE</>, the input data type
-      is specified by a <literal>basetype</> parameter rather than being
+      In the old syntax for <command>CREATE AGGREGATE</command>, the input data type
+      is specified by a <literal>basetype</literal> parameter rather than being
       written next to the aggregate name.  Note that this syntax allows
       only one input parameter.  To define a zero-argument aggregate function
-      with this syntax, specify the <literal>basetype</> as
-      <literal>"ANY"</> (not <literal>*</>).
+      with this syntax, specify the <literal>basetype</literal> as
+      <literal>"ANY"</literal> (not <literal>*</literal>).
       Ordered-set aggregates cannot be defined with the old syntax.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">sfunc</replaceable></term>
+    <term><replaceable class="parameter">sfunc</replaceable></term>
     <listitem>
      <para>
       The name of the state transition function to be called for each
-      input row.  For a normal <replaceable class="PARAMETER">N</>-argument
-      aggregate function, the <replaceable class="PARAMETER">sfunc</>
-      must take <replaceable class="PARAMETER">N</>+1 arguments,
+      input row.  For a normal <replaceable class="parameter">N</replaceable>-argument
+      aggregate function, the <replaceable class="parameter">sfunc</replaceable>
+      must take <replaceable class="parameter">N</replaceable>+1 arguments,
       the first being of type <replaceable
-      class="PARAMETER">state_data_type</replaceable> and the rest
+      class="parameter">state_data_type</replaceable> and the rest
       matching the declared input data type(s) of the aggregate.
       The function must return a value of type <replaceable
-      class="PARAMETER">state_data_type</replaceable>.  This function
+      class="parameter">state_data_type</replaceable>.  This function
       takes the current state value and the current input data value(s),
       and returns the next state value.
      </para>
@@ -355,7 +361,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">state_data_type</replaceable></term>
+    <term><replaceable class="parameter">state_data_type</replaceable></term>
     <listitem>
      <para>
       The data type for the aggregate's state value.
@@ -364,35 +370,35 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">state_data_size</replaceable></term>
+    <term><replaceable class="parameter">state_data_size</replaceable></term>
     <listitem>
      <para>
       The approximate average size (in bytes) of the aggregate's state value.
       If this parameter is omitted or is zero, a default estimate is used
-      based on the <replaceable>state_data_type</>.
+      based on the <replaceable>state_data_type</replaceable>.
       The planner uses this value to estimate the memory required for a
       grouped aggregate query.  The planner will consider using hash
       aggregation for such a query only if the hash table is estimated to fit
-      in <xref linkend="guc-work-mem">; therefore, large values of this
+      in <xref linkend="guc-work-mem"/>; therefore, large values of this
       parameter discourage use of hash aggregation.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">ffunc</replaceable></term>
+    <term><replaceable class="parameter">ffunc</replaceable></term>
     <listitem>
      <para>
       The name of the final function called to compute the aggregate's
       result after all input rows have been traversed.
       For a normal aggregate, this function
       must take a single argument of type <replaceable
-      class="PARAMETER">state_data_type</replaceable>.  The return
+      class="parameter">state_data_type</replaceable>.  The return
       data type of the aggregate is defined as the return type of this
-      function.  If <replaceable class="PARAMETER">ffunc</replaceable>
+      function.  If <replaceable class="parameter">ffunc</replaceable>
       is not specified, then the ending state value is used as the
       aggregate's result, and the return type is <replaceable
-      class="PARAMETER">state_data_type</replaceable>.
+      class="parameter">state_data_type</replaceable>.
      </para>
 
      <para>
@@ -402,7 +408,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
      </para>
 
      <para>
-      If <literal>FINALFUNC_EXTRA</> is specified, then in addition to the
+      If <literal>FINALFUNC_EXTRA</literal> is specified, then in addition to the
       final state value and any direct arguments, the final function
       receives extra NULL values corresponding to the aggregate's regular
       (aggregated) arguments.  This is mainly useful to allow correct
@@ -413,30 +419,45 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">combinefunc</replaceable></term>
+    <term><literal>FINALFUNC_MODIFY</literal> = { <literal>READ_ONLY</literal> | <literal>SHARABLE</literal> | <literal>READ_WRITE</literal> }</term>
     <listitem>
      <para>
-      The <replaceable class="PARAMETER">combinefunc</replaceable> function
+      This option specifies whether the final function is a pure function
+      that does not modify its arguments.  <literal>READ_ONLY</literal> indicates
+      it does not; the other two values indicate that it may change the
+      transition state value.  See <xref linkend="sql-createaggregate-notes"
+      endterm="sql-createaggregate-notes-title"/> below for more detail.  The
+      default is <literal>READ_ONLY</literal>, except for ordered-set aggregates,
+      for which the default is <literal>READ_WRITE</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">combinefunc</replaceable></term>
+    <listitem>
+     <para>
+      The <replaceable class="parameter">combinefunc</replaceable> function
       may optionally be specified to allow the aggregate function to support
       partial aggregation.  If provided,
-      the <replaceable class="PARAMETER">combinefunc</replaceable> must
-      combine two <replaceable class="PARAMETER">state_data_type</replaceable>
+      the <replaceable class="parameter">combinefunc</replaceable> must
+      combine two <replaceable class="parameter">state_data_type</replaceable>
       values, each containing the result of aggregation over some subset of
       the input values, to produce a
-      new <replaceable class="PARAMETER">state_data_type</replaceable> that
+      new <replaceable class="parameter">state_data_type</replaceable> that
       represents the result of aggregating over both sets of inputs.  This
       function can be thought of as
-      an <replaceable class="PARAMETER">sfunc</replaceable>, where instead of
+      an <replaceable class="parameter">sfunc</replaceable>, where instead of
       acting upon an individual input row and adding it to the running
       aggregate state, it adds another aggregate state to the running state.
      </para>
 
      <para>
-      The <replaceable class="PARAMETER">combinefunc</replaceable> must be
+      The <replaceable class="parameter">combinefunc</replaceable> must be
       declared as taking two arguments of
-      the <replaceable class="PARAMETER">state_data_type</replaceable> and
+      the <replaceable class="parameter">state_data_type</replaceable> and
       returning a value of
-      the <replaceable class="PARAMETER">state_data_type</replaceable>.
+      the <replaceable class="parameter">state_data_type</replaceable>.
       Optionally this function may be <quote>strict</quote>. In this case the
       function will not be called when either of the input states are null;
       the other state will be taken as the correct result.
@@ -444,11 +465,11 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
 
      <para>
       For aggregate functions
-      whose <replaceable class="PARAMETER">state_data_type</replaceable>
+      whose <replaceable class="parameter">state_data_type</replaceable>
       is <type>internal</type>,
-      the <replaceable class="PARAMETER">combinefunc</replaceable> must not
+      the <replaceable class="parameter">combinefunc</replaceable> must not
       be strict. In this case
-      the <replaceable class="PARAMETER">combinefunc</replaceable> must
+      the <replaceable class="parameter">combinefunc</replaceable> must
       ensure that null states are handled correctly and that the state being
       returned is properly stored in the aggregate memory context.
      </para>
@@ -456,68 +477,68 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">serialfunc</replaceable></term>
+    <term><replaceable class="parameter">serialfunc</replaceable></term>
     <listitem>
      <para>
       An aggregate function
-      whose <replaceable class="PARAMETER">state_data_type</replaceable>
-      is <type>internal</> can participate in parallel aggregation only if it
-      has a <replaceable class="PARAMETER">serialfunc</replaceable> function,
-      which must serialize the aggregate state into a <type>bytea</> value for
+      whose <replaceable class="parameter">state_data_type</replaceable>
+      is <type>internal</type> can participate in parallel aggregation only if it
+      has a <replaceable class="parameter">serialfunc</replaceable> function,
+      which must serialize the aggregate state into a <type>bytea</type> value for
       transmission to another process.  This function must take a single
-      argument of type <type>internal</> and return type <type>bytea</>.  A
-      corresponding <replaceable class="PARAMETER">deserialfunc</replaceable>
+      argument of type <type>internal</type> and return type <type>bytea</type>.  A
+      corresponding <replaceable class="parameter">deserialfunc</replaceable>
       is also required.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">deserialfunc</replaceable></term>
+    <term><replaceable class="parameter">deserialfunc</replaceable></term>
     <listitem>
      <para>
       Deserialize a previously serialized aggregate state back into
-      <replaceable class="PARAMETER">state_data_type</replaceable>. This
-      function must take two arguments of types <type>bytea</>
-      and <type>internal</>, and produce a result of type <type>internal</>.
-      (Note: the second, <type>internal</> argument is unused, but is required
+      <replaceable class="parameter">state_data_type</replaceable>. This
+      function must take two arguments of types <type>bytea</type>
+      and <type>internal</type>, and produce a result of type <type>internal</type>.
+      (Note: the second, <type>internal</type> argument is unused, but is required
       for type safety reasons.)
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">initial_condition</replaceable></term>
+    <term><replaceable class="parameter">initial_condition</replaceable></term>
     <listitem>
      <para>
       The initial setting for the state value.  This must be a string
       constant in the form accepted for the data type <replaceable
-      class="PARAMETER">state_data_type</replaceable>.  If not
+      class="parameter">state_data_type</replaceable>.  If not
       specified, the state value starts out null.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">msfunc</replaceable></term>
+    <term><replaceable class="parameter">msfunc</replaceable></term>
     <listitem>
      <para>
       The name of the forward state transition function to be called for each
       input row in moving-aggregate mode.  This is exactly like the regular
       transition function, except that its first argument and result are of
-      type <replaceable>mstate_data_type</>, which might be different
-      from <replaceable>state_data_type</>.
+      type <replaceable>mstate_data_type</replaceable>, which might be different
+      from <replaceable>state_data_type</replaceable>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">minvfunc</replaceable></term>
+    <term><replaceable class="parameter">minvfunc</replaceable></term>
     <listitem>
      <para>
       The name of the inverse state transition function to be used in
       moving-aggregate mode.  This function has the same argument and
-      result types as <replaceable>msfunc</>, but it is used to remove
+      result types as <replaceable>msfunc</replaceable>, but it is used to remove
       a value from the current aggregate state, rather than add a value to
       it.  The inverse transition function must have the same strictness
       attribute as the forward state transition function.
@@ -526,7 +547,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">mstate_data_type</replaceable></term>
+    <term><replaceable class="parameter">mstate_data_type</replaceable></term>
     <listitem>
      <para>
       The data type for the aggregate's state value, when using
@@ -536,49 +557,59 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">mstate_data_size</replaceable></term>
+    <term><replaceable class="parameter">mstate_data_size</replaceable></term>
     <listitem>
      <para>
       The approximate average size (in bytes) of the aggregate's state
       value, when using moving-aggregate mode.  This works the same as
-      <replaceable>state_data_size</>.
+      <replaceable>state_data_size</replaceable>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">mffunc</replaceable></term>
+    <term><replaceable class="parameter">mffunc</replaceable></term>
     <listitem>
      <para>
       The name of the final function called to compute the aggregate's
       result after all input rows have been traversed, when using
-      moving-aggregate mode.  This works the same as <replaceable>ffunc</>,
+      moving-aggregate mode.  This works the same as <replaceable>ffunc</replaceable>,
       except that its first argument's type
-      is <replaceable>mstate_data_type</> and extra dummy arguments are
-      specified by writing <literal>MFINALFUNC_EXTRA</>.
-      The aggregate result type determined by <replaceable>mffunc</>
-      or <replaceable>mstate_data_type</> must match that determined by the
+      is <replaceable>mstate_data_type</replaceable> and extra dummy arguments are
+      specified by writing <literal>MFINALFUNC_EXTRA</literal>.
+      The aggregate result type determined by <replaceable>mffunc</replaceable>
+      or <replaceable>mstate_data_type</replaceable> must match that determined by the
       aggregate's regular implementation.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">minitial_condition</replaceable></term>
+    <term><literal>MFINALFUNC_MODIFY</literal> = { <literal>READ_ONLY</literal> | <literal>SHARABLE</literal> | <literal>READ_WRITE</literal> }</term>
+    <listitem>
+     <para>
+      This option is like <literal>FINALFUNC_MODIFY</literal>, but it describes
+      the behavior of the moving-aggregate final function.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">minitial_condition</replaceable></term>
     <listitem>
      <para>
       The initial setting for the state value, when using moving-aggregate
-      mode.  This works the same as <replaceable>initial_condition</>.
+      mode.  This works the same as <replaceable>initial_condition</replaceable>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">sort_operator</replaceable></term>
+    <term><replaceable class="parameter">sort_operator</replaceable></term>
     <listitem>
      <para>
-      The associated sort operator for a <function>MIN</>- or
-      <function>MAX</>-like aggregate.
+      The associated sort operator for a <function>MIN</function>- or
+      <function>MAX</function>-like aggregate.
       This is just an operator name (possibly schema-qualified).
       The operator is assumed to have the same input data types as
       the aggregate (which must be a single-argument normal aggregate).
@@ -587,14 +618,14 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    </varlistentry>
 
    <varlistentry>
-    <term><literal>PARALLEL</literal></term>
+    <term><literal>PARALLEL =</literal> { <literal>SAFE</literal> | <literal>RESTRICTED</literal> | <literal>UNSAFE</literal> }</term>
     <listitem>
      <para>
-      The meanings of <literal>PARALLEL SAFE</>, <literal>PARALLEL
-      RESTRICTED</>, and <literal>PARALLEL UNSAFE</> are the same as
-      for <xref linkend="sql-createfunction">.  An aggregate will not be
+      The meanings of <literal>PARALLEL SAFE</literal>, <literal>PARALLEL
+      RESTRICTED</literal>, and <literal>PARALLEL UNSAFE</literal> are the same as
+      in <xref linkend="sql-createfunction"/>.  An aggregate will not be
       considered for parallelization if it is marked <literal>PARALLEL
-      UNSAFE</> (which is the default!) or <literal>PARALLEL RESTRICTED</>.
+      UNSAFE</literal> (which is the default!) or <literal>PARALLEL RESTRICTED</literal>.
       Note that the parallel-safety markings of the aggregate's support
       functions are not consulted by the planner, only the marking of the
       aggregate itself.
@@ -609,7 +640,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
       For ordered-set aggregates only, this flag specifies that the aggregate
       arguments are to be processed according to the requirements for
       hypothetical-set aggregates: that is, the last few direct arguments must
-      match the data types of the aggregated (<literal>WITHIN GROUP</>)
+      match the data types of the aggregated (<literal>WITHIN GROUP</literal>)
       arguments.  The <literal>HYPOTHETICAL</literal> flag has no effect on
       run-time behavior, only on parse-time resolution of the data types and
       collations of the aggregate's arguments.
@@ -624,21 +655,49 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
   </para>
  </refsect1>
 
- <refsect1>
-  <title>Notes</title>
+ <refsect1 id="sql-createaggregate-notes">
+  <title id="sql-createaggregate-notes-title">Notes</title>
 
    <para>
     In parameters that specify support function names, you can write
-    a schema name if needed, for example <literal>SFUNC = public.sum</>.
+    a schema name if needed, for example <literal>SFUNC = public.sum</literal>.
     Do not write argument types there, however &mdash; the argument types
     of the support functions are determined from other parameters.
    </para>
 
+   <para>
+    Ordinarily, PostgreSQL functions are expected to be true functions that
+    do not modify their input values.  However, an aggregate transition
+    function, <emphasis>when used in the context of an aggregate</emphasis>,
+    is allowed to cheat and modify its transition-state argument in place.
+    This can provide substantial performance benefits compared to making
+    a fresh copy of the transition state each time.
+   </para>
+
+   <para>
+    Likewise, while an aggregate final function is normally expected not to
+    modify its input values, sometimes it is impractical to avoid modifying
+    the transition-state argument.  Such behavior must be declared using
+    the <literal>FINALFUNC_MODIFY</literal> parameter.  The <literal>READ_WRITE</literal>
+    value indicates that the final function modifies the transition state in
+    unspecified ways.  This value prevents use of the aggregate as a window
+    function, and it also prevents merging of transition states for aggregate
+    calls that share the same input values and transition functions.
+    The <literal>SHARABLE</literal> value indicates that the transition function
+    cannot be applied after the final function, but multiple final-function
+    calls can be performed on the ending transition state value.  This value
+    prevents use of the aggregate as a window function, but it allows merging
+    of transition states.  (That is, the optimization of interest here is not
+    applying the same final function repeatedly, but applying different final
+    functions to the same ending transition state value.  This is allowed as
+    long as none of the final functions are marked <literal>READ_WRITE</literal>.)
+   </para>
+
    <para>
     If an aggregate supports moving-aggregate mode, it will improve
     calculation efficiency when the aggregate is used as a window function
     for a window with moving frame start (that is, a frame start mode other
-    than <literal>UNBOUNDED PRECEDING</>).  Conceptually, the forward
+    than <literal>UNBOUNDED PRECEDING</literal>).  Conceptually, the forward
     transition function adds input values to the aggregate's state when
     they enter the window frame from the bottom, and the inverse transition
     function removes them again when they leave the frame at the top.  So,
@@ -671,27 +730,28 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
     Note that whether or not the aggregate supports moving-aggregate
     mode, <productname>PostgreSQL</productname> can handle a moving frame
     end without recalculation; this is done by continuing to add new values
-    to the aggregate's state.  It is assumed that the final function does
+    to the aggregate's state.  This is why use of an aggregate as a window
+    function requires that the final function be read-only: it must
     not damage the aggregate's state value, so that the aggregation can be
     continued even after an aggregate result value has been obtained for
     one set of frame boundaries.
    </para>
 
    <para>
-    The syntax for ordered-set aggregates allows <literal>VARIADIC</>
+    The syntax for ordered-set aggregates allows <literal>VARIADIC</literal>
     to be specified for both the last direct parameter and the last
-    aggregated (<literal>WITHIN GROUP</>) parameter.  However, the
-    current implementation restricts use of <literal>VARIADIC</>
+    aggregated (<literal>WITHIN GROUP</literal>) parameter.  However, the
+    current implementation restricts use of <literal>VARIADIC</literal>
     in two ways.  First, ordered-set aggregates can only use
-    <literal>VARIADIC "any"</>, not other variadic array types.
-    Second, if the last direct parameter is <literal>VARIADIC "any"</>,
+    <literal>VARIADIC "any"</literal>, not other variadic array types.
+    Second, if the last direct parameter is <literal>VARIADIC "any"</literal>,
     then there can be only one aggregated parameter and it must also
-    be <literal>VARIADIC "any"</>.  (In the representation used in the
+    be <literal>VARIADIC "any"</literal>.  (In the representation used in the
     system catalogs, these two parameters are merged into a single
-    <literal>VARIADIC "any"</> item, since <structname>pg_proc</> cannot
-    represent functions with more than one <literal>VARIADIC</> parameter.)
+    <literal>VARIADIC "any"</literal> item, since <structname>pg_proc</structname> cannot
+    represent functions with more than one <literal>VARIADIC</literal> parameter.)
     If the aggregate is a hypothetical-set aggregate, the direct arguments
-    that match the <literal>VARIADIC "any"</> parameter are the hypothetical
+    that match the <literal>VARIADIC "any"</literal> parameter are the hypothetical
     ones; any preceding parameters represent additional direct arguments
     that are not constrained to match the aggregated arguments.
    </para>
@@ -704,7 +764,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
    <para>
     Partial (including parallel) aggregation is currently not supported for
     ordered-set aggregates.  Also, it will never be used for aggregate calls
-    that include <literal>DISTINCT</> or <literal>ORDER BY</> clauses, since
+    that include <literal>DISTINCT</literal> or <literal>ORDER BY</literal> clauses, since
     those semantics cannot be supported during partial aggregation.
   </para>
  </refsect1>
@@ -713,7 +773,7 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
   <title>Examples</title>
 
   <para>
-   See <xref linkend="xaggr">.
+   See <xref linkend="xaggr"/>.
   </para>
  </refsect1>
 
@@ -731,8 +791,8 @@ SELECT col FROM tab ORDER BY col USING sortop LIMIT 1;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteraggregate"></member>
-   <member><xref linkend="sql-dropaggregate"></member>
+   <member><xref linkend="sql-alteraggregate"/></member>
+   <member><xref linkend="sql-dropaggregate"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_cast.sgml b/doc/src/sgml/ref/create_cast.sgml
index a7d13edc22..84317047c2 100644
--- a/doc/src/sgml/ref/create_cast.sgml
+++ b/doc/src/sgml/ref/create_cast.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/create_cast.sgml -->
 
-<refentry id="SQL-CREATECAST">
+<refentry id="sql-createcast">
  <indexterm zone="sql-createcast">
   <primary>CREATE CAST</primary>
  </indexterm>
@@ -44,7 +44,7 @@ SELECT CAST(42 AS float8);
 </programlisting>
    converts the integer constant 42 to type <type>float8</type> by
    invoking a previously specified function, in this case
-   <literal>float8(int4)</>. (If no suitable cast has been defined, the
+   <literal>float8(int4)</literal>. (If no suitable cast has been defined, the
    conversion fails.)
   </para>
 
@@ -64,7 +64,7 @@ SELECT CAST(42 AS float8);
   </para>
 
   <para>
-   You can define a cast as an <firstterm>I/O conversion cast</> by using
+   You can define a cast as an <firstterm>I/O conversion cast</firstterm> by using
    the <literal>WITH INOUT</literal> syntax. An I/O conversion cast is
    performed by invoking the output function of the source data type, and
    passing the resulting string to the input function of the target data type.
@@ -75,14 +75,14 @@ SELECT CAST(42 AS float8);
 
   <para>
    By default, a cast can be invoked only by an explicit cast request,
-   that is an explicit <literal>CAST(<replaceable>x</> AS
-   <replaceable>typename</>)</literal> or
-   <replaceable>x</><literal>::</><replaceable>typename</>
+   that is an explicit <literal>CAST(<replaceable>x</replaceable> AS
+   <replaceable>typename</replaceable>)</literal> or
+   <replaceable>x</replaceable><literal>::</literal><replaceable>typename</replaceable>
    construct.
   </para>
 
   <para>
-   If the cast is marked <literal>AS ASSIGNMENT</> then it can be invoked
+   If the cast is marked <literal>AS ASSIGNMENT</literal> then it can be invoked
    implicitly when assigning a value to a column of the target data type.
    For example, supposing that <literal>foo.f1</literal> is a column of
    type <type>text</type>, then:
@@ -90,13 +90,13 @@ SELECT CAST(42 AS float8);
 INSERT INTO foo (f1) VALUES (42);
 </programlisting>
    will be allowed if the cast from type <type>integer</type> to type
-   <type>text</type> is marked <literal>AS ASSIGNMENT</>, otherwise not.
+   <type>text</type> is marked <literal>AS ASSIGNMENT</literal>, otherwise not.
    (We generally use the term <firstterm>assignment
    cast</firstterm> to describe this kind of cast.)
   </para>
 
   <para>
-   If the cast is marked <literal>AS IMPLICIT</> then it can be invoked
+   If the cast is marked <literal>AS IMPLICIT</literal> then it can be invoked
    implicitly in any context, whether assignment or internally in an
    expression.  (We generally use the term <firstterm>implicit
    cast</firstterm> to describe this kind of cast.)
@@ -104,12 +104,12 @@ INSERT INTO foo (f1) VALUES (42);
 <programlisting>
 SELECT 2 + 4.0;
 </programlisting>
-   The parser initially marks the constants as being of type <type>integer</>
-   and <type>numeric</> respectively.  There is no <type>integer</>
-   <literal>+</> <type>numeric</> operator in the system catalogs,
-   but there is a <type>numeric</> <literal>+</> <type>numeric</> operator.
-   The query will therefore succeed if a cast from <type>integer</> to
-   <type>numeric</> is available and is marked <literal>AS IMPLICIT</> &mdash;
+   The parser initially marks the constants as being of type <type>integer</type>
+   and <type>numeric</type> respectively.  There is no <type>integer</type>
+   <literal>+</literal> <type>numeric</type> operator in the system catalogs,
+   but there is a <type>numeric</type> <literal>+</literal> <type>numeric</type> operator.
+   The query will therefore succeed if a cast from <type>integer</type> to
+   <type>numeric</type> is available and is marked <literal>AS IMPLICIT</literal> &mdash;
    which in fact it is.  The parser will apply the implicit cast and resolve
    the query as if it had been written
 <programlisting>
@@ -118,17 +118,17 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
   </para>
 
   <para>
-   Now, the catalogs also provide a cast from <type>numeric</> to
-   <type>integer</>.  If that cast were marked <literal>AS IMPLICIT</> &mdash;
+   Now, the catalogs also provide a cast from <type>numeric</type> to
+   <type>integer</type>.  If that cast were marked <literal>AS IMPLICIT</literal> &mdash;
    which it is not &mdash; then the parser would be faced with choosing
    between the above interpretation and the alternative of casting the
-   <type>numeric</> constant to <type>integer</> and applying the
-   <type>integer</> <literal>+</> <type>integer</> operator.  Lacking any
+   <type>numeric</type> constant to <type>integer</type> and applying the
+   <type>integer</type> <literal>+</literal> <type>integer</type> operator.  Lacking any
    knowledge of which choice to prefer, it would give up and declare the
    query ambiguous.  The fact that only one of the two casts is
    implicit is the way in which we teach the parser to prefer resolution
-   of a mixed <type>numeric</>-and-<type>integer</> expression as
-   <type>numeric</>; there is no built-in knowledge about that.
+   of a mixed <type>numeric</type>-and-<type>integer</type> expression as
+   <type>numeric</type>; there is no built-in knowledge about that.
   </para>
 
   <para>
@@ -142,8 +142,8 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
    general type category.  For example, the cast from <type>int2</type> to
    <type>int4</type> can reasonably be implicit, but the cast from
    <type>float8</type> to <type>int4</type> should probably be
-   assignment-only.  Cross-type-category casts, such as <type>text</>
-   to <type>int4</>, are best made explicit-only.
+   assignment-only.  Cross-type-category casts, such as <type>text</type>
+   to <type>int4</type>, are best made explicit-only.
   </para>
 
   <note>
@@ -151,9 +151,9 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
     Sometimes it is necessary for usability or standards-compliance reasons
     to provide multiple implicit casts among a set of types, resulting in
     ambiguity that cannot be avoided as above.  The parser has a fallback
-    heuristic based on <firstterm>type categories</> and <firstterm>preferred
-    types</> that can help to provide desired behavior in such cases.  See
-    <xref linkend="sql-createtype"> for
+    heuristic based on <firstterm>type categories</firstterm> and <firstterm>preferred
+    types</firstterm> that can help to provide desired behavior in such cases.  See
+    <xref linkend="sql-createtype"/> for
     more information.
    </para>
   </note>
@@ -255,11 +255,11 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
    Cast implementation functions can have one to three arguments.
    The first argument type must be identical to or binary-coercible from
    the cast's source type.  The second argument,
-   if present, must be type <type>integer</>; it receives the type
-   modifier associated with the destination type, or <literal>-1</>
+   if present, must be type <type>integer</type>; it receives the type
+   modifier associated with the destination type, or <literal>-1</literal>
    if there is none.  The third argument,
-   if present, must be type <type>boolean</>; it receives <literal>true</>
-   if the cast is an explicit cast, <literal>false</> otherwise.
+   if present, must be type <type>boolean</type>; it receives <literal>true</literal>
+   if the cast is an explicit cast, <literal>false</literal> otherwise.
    (Bizarrely, the SQL standard demands different behaviors for explicit and
    implicit casts in some cases.  This argument is supplied for functions
    that must implement such casts.  It is not recommended that you design
@@ -301,7 +301,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="sql-dropcast"> to remove user-defined casts.
+   Use <xref linkend="sql-dropcast"/> to remove user-defined casts.
   </para>
 
   <para>
@@ -316,9 +316,9 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
 
   <para>
    It is normally not necessary to create casts between user-defined types
-   and the standard string types (<type>text</>, <type>varchar</>, and
-   <type>char(<replaceable>n</>)</type>, as well as user-defined types that
-   are defined to be in the string category).  <productname>PostgreSQL</>
+   and the standard string types (<type>text</type>, <type>varchar</type>, and
+   <type>char(<replaceable>n</replaceable>)</type>, as well as user-defined types that
+   are defined to be in the string category).  <productname>PostgreSQL</productname>
    provides automatic I/O conversion casts for that. The automatic casts to
    string types are treated as assignment casts, while the automatic casts
    from string types are
@@ -338,11 +338,11 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
    convention of naming cast implementation functions after the target data
    type.  Many users are used to being able to cast data types using a
    function-style notation, that is
-   <replaceable>typename</>(<replaceable>x</>).  This notation is in fact
+   <replaceable>typename</replaceable>(<replaceable>x</replaceable>).  This notation is in fact
    nothing more nor less than a call of the cast implementation function; it
    is not specially treated as a cast.  If your conversion functions are not
    named to support this convention then you will have surprised users.
-   Since <productname>PostgreSQL</> allows overloading of the same function
+   Since <productname>PostgreSQL</productname> allows overloading of the same function
    name with different argument types, there is no difficulty in having
    multiple conversion functions from different types that all use the
    target type's name.
@@ -353,14 +353,14 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
     Actually the preceding paragraph is an oversimplification: there are
     two cases in which a function-call construct will be treated as a cast
     request without having matched it to an actual function.
-    If a function call <replaceable>name</>(<replaceable>x</>) does not
-    exactly match any existing function, but <replaceable>name</> is the name
-    of a data type and <structname>pg_cast</> provides a binary-coercible cast
-    to this type from the type of <replaceable>x</>, then the call will be
+    If a function call <replaceable>name</replaceable>(<replaceable>x</replaceable>) does not
+    exactly match any existing function, but <replaceable>name</replaceable> is the name
+    of a data type and <structname>pg_cast</structname> provides a binary-coercible cast
+    to this type from the type of <replaceable>x</replaceable>, then the call will be
     construed as a binary-coercible cast.  This exception is made so that
     binary-coercible casts can be invoked using functional syntax, even
     though they lack any function.  Likewise, if there is no
-    <structname>pg_cast</> entry but the cast would be to or from a string
+    <structname>pg_cast</structname> entry but the cast would be to or from a string
     type, the call will be construed as an I/O conversion cast.  This
     exception allows I/O conversion casts to be invoked using functional
     syntax.
@@ -372,7 +372,7 @@ SELECT CAST ( 2 AS numeric ) + 4.0;
     There is also an exception to the exception: I/O conversion casts from
     composite types to string types cannot be invoked using functional
     syntax, but must be written in explicit cast syntax (either
-    <literal>CAST</> or <literal>::</> notation).  This exception was added
+    <literal>CAST</literal> or <literal>::</literal> notation).  This exception was added
     because after the introduction of automatically-provided I/O conversion
     casts, it was found too easy to accidentally invoke such a cast when
     a function or column reference was intended.
@@ -402,7 +402,7 @@ CREATE CAST (bigint AS int4) WITH FUNCTION int4(bigint) AS ASSIGNMENT;
    <acronym>SQL</acronym> standard,
    except that SQL does not make provisions for binary-coercible
    types or extra arguments to implementation functions.
-   <literal>AS IMPLICIT</> is a <productname>PostgreSQL</productname>
+   <literal>AS IMPLICIT</literal> is a <productname>PostgreSQL</productname>
    extension, too.
   </para>
  </refsect1>
@@ -412,9 +412,9 @@ CREATE CAST (bigint AS int4) WITH FUNCTION int4(bigint) AS ASSIGNMENT;
   <title>See Also</title>
 
   <para>
-   <xref linkend="sql-createfunction">,
-   <xref linkend="sql-createtype">,
-   <xref linkend="sql-dropcast">
+   <xref linkend="sql-createfunction"/>,
+   <xref linkend="sql-createtype"/>,
+   <xref linkend="sql-dropcast"/>
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_collation.sgml b/doc/src/sgml/ref/create_collation.sgml
index 2d3e050545..5bc9af5499 100644
--- a/doc/src/sgml/ref/create_collation.sgml
+++ b/doc/src/sgml/ref/create_collation.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/create_collation.sgml -->
 
-<refentry id="SQL-CREATECOLLATION">
+<refentry id="sql-createcollation">
  <indexterm zone="sql-createcollation">
   <primary>CREATE COLLATION</primary>
  </indexterm>
@@ -93,10 +93,7 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
      <listitem>
       <para>
        Use the specified operating system locale for
-       the <symbol>LC_COLLATE</symbol> locale category.  The locale
-       must be applicable to the current database encoding.
-       (See <xref linkend="sql-createdatabase"> for the precise
-       rules.)
+       the <symbol>LC_COLLATE</symbol> locale category.
       </para>
      </listitem>
     </varlistentry>
@@ -107,10 +104,7 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
      <listitem>
       <para>
        Use the specified operating system locale for
-       the <symbol>LC_CTYPE</symbol> locale category.  The locale
-       must be applicable to the current database encoding.
-       (See <xref linkend="sql-createdatabase"> for the precise
-       rules.)
+       the <symbol>LC_CTYPE</symbol> locale category.
       </para>
      </listitem>
     </varlistentry>
@@ -122,7 +116,7 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
       <para>
        Specifies the provider to use for locale services associated with this
        collation.  Possible values
-       are: <literal>icu</literal>,<indexterm><primary>ICU</></>
+       are: <literal>icu</literal>,<indexterm><primary>ICU</primary></indexterm>
        <literal>libc</literal>.
        <literal>libc</literal> is the default.
        The available choices depend on the operating system and build options.
@@ -144,7 +138,7 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
       </para>
 
       <para>
-       See also <xref linkend="sql-altercollation"> for how to handle
+       See also <xref linkend="sql-altercollation"/> for how to handle
        collation version mismatches.
       </para>
      </listitem>
@@ -173,8 +167,13 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
   </para>
 
   <para>
-   See <xref linkend="collation"> for more information about collation
-   support in PostgreSQL.
+   See <xref linkend="collation-create"/> for more information on how to create collations.
+  </para>
+
+  <para>
+   When using the <literal>libc</literal> collation provider, the locale must
+   be applicable to the current database encoding.
+   See <xref linkend="sql-createdatabase"/> for the precise rules.
   </para>
  </refsect1>
 
@@ -186,7 +185,14 @@ CREATE COLLATION [ IF NOT EXISTS ] <replaceable>name</replaceable> FROM <replace
    <literal>fr_FR.utf8</literal>
    (assuming the current database encoding is <literal>UTF8</literal>):
 <programlisting>
-CREATE COLLATION french (LOCALE = 'fr_FR.utf8');
+CREATE COLLATION french (locale = 'fr_FR.utf8');
+</programlisting>
+  </para>
+
+  <para>
+   To create a collation using the ICU provider using German phone book sort order:
+<programlisting>
+CREATE COLLATION german_phonebook (provider = icu, locale = 'de-u-co-phonebk');
 </programlisting>
   </para>
 
@@ -217,8 +223,8 @@ CREATE COLLATION german FROM "de_DE";
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altercollation"></member>
-   <member><xref linkend="sql-dropcollation"></member>
+   <member><xref linkend="sql-altercollation"/></member>
+   <member><xref linkend="sql-dropcollation"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_conversion.sgml b/doc/src/sgml/ref/create_conversion.sgml
index d2e2c010ef..4ddbcfacef 100644
--- a/doc/src/sgml/ref/create_conversion.sgml
+++ b/doc/src/sgml/ref/create_conversion.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/create_conversion.sgml -->
 
-<refentry id="SQL-CREATECONVERSION">
+<refentry id="sql-createconversion">
  <indexterm zone="sql-createconversion">
   <primary>CREATE CONVERSION</primary>
  </indexterm>
@@ -29,7 +29,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
   <para>
    <command>CREATE CONVERSION</command> defines a new conversion between
    character set encodings.  Also, conversions that
-   are marked <literal>DEFAULT</> can be used for automatic encoding
+   are marked <literal>DEFAULT</literal> can be used for automatic encoding
    conversion between
    client and server. For this purpose, two conversions, from encoding A to
    B <emphasis>and</emphasis> from encoding B to A, must be defined.
@@ -51,7 +51,7 @@ CREATE [ DEFAULT ] CONVERSION <replaceable>name</replaceable>
 
      <listitem>
       <para>
-       The <literal>DEFAULT</> clause indicates that this conversion
+       The <literal>DEFAULT</literal> clause indicates that this conversion
        is the default for this particular source to destination
        encoding. There should be only one default encoding in a schema
        for the encoding pair.
@@ -137,7 +137,7 @@ conv_proc(
 
   <para>
    To create a conversion from encoding <literal>UTF8</literal> to
-   <literal>LATIN1</literal> using <function>myfunc</>:
+   <literal>LATIN1</literal> using <function>myfunc</function>:
 <programlisting>
 CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
 </programlisting></para>
@@ -161,9 +161,9 @@ CREATE CONVERSION myconv FOR 'UTF8' TO 'LATIN1' FROM myfunc;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterconversion"></member>
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-dropconversion"></member>
+   <member><xref linkend="sql-alterconversion"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-dropconversion"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_database.sgml b/doc/src/sgml/ref/create_database.sgml
index 48386a29f9..b2c9e241c2 100644
--- a/doc/src/sgml/ref/create_database.sgml
+++ b/doc/src/sgml/ref/create_database.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_database.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEDATABASE">
+<refentry id="sql-createdatabase">
  <indexterm zone="sql-createdatabase">
   <primary>CREATE DATABASE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
+CREATE DATABASE <replaceable class="parameter">name</replaceable>
     [ [ WITH ] [ OWNER [=] <replaceable class="parameter">user_name</replaceable> ]
            [ TEMPLATE [=] <replaceable class="parameter">template</replaceable> ]
            [ ENCODING [=] <replaceable class="parameter">encoding</replaceable> ]
@@ -44,21 +44,21 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
 
   <para>
    To create a database, you must be a superuser or have the special
-   <literal>CREATEDB</> privilege.
-   See <xref linkend="SQL-CREATEUSER">.
+   <literal>CREATEDB</literal> privilege.
+   See <xref linkend="sql-createrole"/>.
   </para>
 
   <para>
    By default, the new database will be created by cloning the standard
-   system database <literal>template1</>.  A different template can be
+   system database <literal>template1</literal>.  A different template can be
    specified by writing <literal>TEMPLATE
    <replaceable class="parameter">name</replaceable></literal>.  In particular,
-   by writing <literal>TEMPLATE template0</>, you can create a virgin
+   by writing <literal>TEMPLATE template0</literal>, you can create a virgin
    database containing only the standard objects predefined by your
    version of <productname>PostgreSQL</productname>.  This is useful
    if you wish to avoid copying
    any installation-local objects that might have been added to
-   <literal>template1</>.
+   <literal>template1</literal>.
   </para>
  </refsect1>
 
@@ -106,7 +106,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
         to use the default encoding (namely, the encoding of the
         template database). The character sets supported by the
         <productname>PostgreSQL</productname> server are described in
-        <xref linkend="multibyte-charset-supported">. See below for
+        <xref linkend="multibyte-charset-supported"/>. See below for
         additional restrictions.
        </para>
       </listitem>
@@ -115,7 +115,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
       <term><replaceable class="parameter">lc_collate</replaceable></term>
       <listitem>
        <para>
-        Collation order (<literal>LC_COLLATE</>) to use in the new database.
+        Collation order (<literal>LC_COLLATE</literal>) to use in the new database.
         This affects the sort order applied to strings, e.g. in queries with
         ORDER BY, as well as the order used in indexes on text columns.
         The default is to use the collation order of the template database.
@@ -127,7 +127,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
       <term><replaceable class="parameter">lc_ctype</replaceable></term>
       <listitem>
        <para>
-        Character classification (<literal>LC_CTYPE</>) to use in the new
+        Character classification (<literal>LC_CTYPE</literal>) to use in the new
         database. This affects the categorization of characters, e.g. lower,
         upper and digit. The default is to use the character classification of
         the template database. See below for additional restrictions.
@@ -143,7 +143,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
         template database's tablespace. This
         tablespace will be the default tablespace used for objects
         created in this database. See
-        <xref linkend="sql-createtablespace">
+        <xref linkend="sql-createtablespace"/>
         for more information.
        </para>
       </listitem>
@@ -155,7 +155,7 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
         <para>
          If false then no one can connect to this database.  The default is
          true, allowing connections (except as restricted by other mechanisms,
-         such as <literal>GRANT</>/<literal>REVOKE CONNECT</>).
+         such as <literal>GRANT</literal>/<literal>REVOKE CONNECT</literal>).
         </para>
        </listitem>
       </varlistentry>
@@ -192,52 +192,52 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
   <title>Notes</title>
 
    <para>
-    <command>CREATE DATABASE</> cannot be executed inside a transaction
+    <command>CREATE DATABASE</command> cannot be executed inside a transaction
     block.
    </para>
 
    <para>
-    Errors along the line of <quote>could not initialize database directory</>
+    Errors along the line of <quote>could not initialize database directory</quote>
     are most likely related to insufficient permissions on the data
     directory, a full disk, or other file system problems.
    </para>
 
    <para>
-    Use <xref linkend="SQL-DROPDATABASE"> to remove a database.
+    Use <xref linkend="sql-dropdatabase"/> to remove a database.
    </para>
 
    <para>
-    The program <xref linkend="APP-CREATEDB"> is a
+    The program <xref linkend="app-createdb"/> is a
     wrapper program around this command, provided for convenience.
    </para>
 
    <para>
     Database-level configuration parameters (set via <xref
-    linkend="sql-alterdatabase">) are not copied from the template
+    linkend="sql-alterdatabase"/>) are not copied from the template
     database.
    </para>
 
   <para>
-   Although it is possible to copy a database other than <literal>template1</>
+   Although it is possible to copy a database other than <literal>template1</literal>
    by specifying its name as the template, this is not (yet) intended as
    a general-purpose <quote><command>COPY DATABASE</command></quote> facility.
    The principal limitation is that no other sessions can be connected to
    the template database while it is being copied.  <command>CREATE
-   DATABASE</> will fail if any other connection exists when it starts;
+   DATABASE</command> will fail if any other connection exists when it starts;
    otherwise, new connections to the template database are locked out
-   until <command>CREATE DATABASE</> completes.
-   See <xref linkend="manage-ag-templatedbs"> for more information.
+   until <command>CREATE DATABASE</command> completes.
+   See <xref linkend="manage-ag-templatedbs"/> for more information.
   </para>
 
   <para>
    The character set encoding specified for the new database must be
-   compatible with the chosen locale settings (<literal>LC_COLLATE</> and
-   <literal>LC_CTYPE</>).  If the locale is <literal>C</> (or equivalently
-   <literal>POSIX</>), then all encodings are allowed, but for other
+   compatible with the chosen locale settings (<literal>LC_COLLATE</literal> and
+   <literal>LC_CTYPE</literal>).  If the locale is <literal>C</literal> (or equivalently
+   <literal>POSIX</literal>), then all encodings are allowed, but for other
    locale settings there is only one encoding that will work properly.
    (On Windows, however, UTF-8 encoding can be used with any locale.)
-   <command>CREATE DATABASE</> will allow superusers to specify
-   <literal>SQL_ASCII</> encoding regardless of the locale settings,
+   <command>CREATE DATABASE</command> will allow superusers to specify
+   <literal>SQL_ASCII</literal> encoding regardless of the locale settings,
    but this choice is deprecated and may result in misbehavior of
    character-string functions if data that is not encoding-compatible
    with the locale is stored in the database.
@@ -245,19 +245,19 @@ CREATE DATABASE <replaceable class="PARAMETER">name</replaceable>
 
   <para>
    The encoding and locale settings must match those of the template database,
-   except when <literal>template0</> is used as template.  This is because
+   except when <literal>template0</literal> is used as template.  This is because
    other databases might contain data that does not match the specified
    encoding, or might contain indexes whose sort ordering is affected by
-   <literal>LC_COLLATE</> and <literal>LC_CTYPE</>.  Copying such data would
+   <literal>LC_COLLATE</literal> and <literal>LC_CTYPE</literal>.  Copying such data would
    result in a database that is corrupt according to the new settings.
    <literal>template0</literal>, however, is known to not contain any data or
    indexes that would be affected.
   </para>
 
   <para>
-   The <literal>CONNECTION LIMIT</> option is only enforced approximately;
+   The <literal>CONNECTION LIMIT</literal> option is only enforced approximately;
    if two new sessions start at about the same time when just one
-   connection <quote>slot</> remains for the database, it is possible that
+   connection <quote>slot</quote> remains for the database, it is possible that
    both will fail.  Also, the limit is not enforced against superusers or
    background worker processes.
   </para>
@@ -275,8 +275,8 @@ CREATE DATABASE lusiadas;
   </para>
 
   <para>
-   To create a database <literal>sales</> owned by user <literal>salesapp</>
-   with a default tablespace of <literal>salesspace</>:
+   To create a database <literal>sales</literal> owned by user <literal>salesapp</literal>
+   with a default tablespace of <literal>salesspace</literal>:
 
 <programlisting>
 CREATE DATABASE sales OWNER salesapp TABLESPACE salesspace;
@@ -284,19 +284,19 @@ CREATE DATABASE sales OWNER salesapp TABLESPACE salesspace;
   </para>
 
   <para>
-   To create a database <literal>music</> with a different locale:
+   To create a database <literal>music</literal> with a different locale:
 <programlisting>
 CREATE DATABASE music
     LC_COLLATE 'sv_SE.utf8' LC_CTYPE 'sv_SE.utf8'
     TEMPLATE template0;
 </programlisting>
-    In this example, the <literal>TEMPLATE template0</> clause is required if
-    the specified locale is different from the one in <literal>template1</>.
+    In this example, the <literal>TEMPLATE template0</literal> clause is required if
+    the specified locale is different from the one in <literal>template1</literal>.
     (If it is not, then specifying the locale explicitly is redundant.)
   </para>
 
   <para>
-   To create a database <literal>music2</> with a different locale and a
+   To create a database <literal>music2</literal> with a different locale and a
    different character set encoding:
 <programlisting>
 CREATE DATABASE music2
@@ -328,8 +328,8 @@ CREATE DATABASE music2
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterdatabase"></member>
-   <member><xref linkend="sql-dropdatabase"></member>
+   <member><xref linkend="sql-alterdatabase"/></member>
+   <member><xref linkend="sql-dropdatabase"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_domain.sgml b/doc/src/sgml/ref/create_domain.sgml
index 3423bf9a32..49d5304330 100644
--- a/doc/src/sgml/ref/create_domain.sgml
+++ b/doc/src/sgml/ref/create_domain.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_domain.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEDOMAIN">
+<refentry id="sql-createdomain">
  <indexterm zone="sql-createdomain">
   <primary>CREATE DOMAIN</primary>
  </indexterm>
@@ -24,12 +24,12 @@ PostgreSQL documentation
 CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replaceable class="parameter">data_type</replaceable>
     [ COLLATE <replaceable>collation</replaceable> ]
     [ DEFAULT <replaceable>expression</replaceable> ]
-    [ <replaceable class="PARAMETER">constraint</replaceable> [ ... ] ]
+    [ <replaceable class="parameter">constraint</replaceable> [ ... ] ]
 
-<phrase>where <replaceable class="PARAMETER">constraint</replaceable> is:</phrase>
+<phrase>where <replaceable class="parameter">constraint</replaceable> is:</phrase>
 
-[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
-{ NOT NULL | NULL | CHECK (<replaceable class="PARAMETER">expression</replaceable>) }
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+{ NOT NULL | NULL | CHECK (<replaceable class="parameter">expression</replaceable>) }
 </synopsis>
  </refsynopsisdiv>
 
@@ -45,7 +45,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
 
   <para>
    If a schema name is given (for example, <literal>CREATE DOMAIN
-   myschema.mydomain ...</>) then the domain is created in the
+   myschema.mydomain ...</literal>) then the domain is created in the
    specified schema.  Otherwise it is created in the current schema.
    The domain name must be unique among the types and domains existing
    in its schema.
@@ -80,7 +80,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">data_type</replaceable></term>
+      <term><replaceable class="parameter">data_type</replaceable></term>
       <listitem>
        <para>
         The underlying data type of the domain. This can include array
@@ -95,7 +95,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
        <para>
         An optional collation for the domain.  If no collation is
         specified, the underlying data type's default collation is used.
-        The underlying type must be collatable if <literal>COLLATE</>
+        The underlying type must be collatable if <literal>COLLATE</literal>
         is specified.
        </para>
       </listitem>
@@ -106,7 +106,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
 
       <listitem>
        <para>
-        The <literal>DEFAULT</> clause specifies a default value for
+        The <literal>DEFAULT</literal> clause specifies a default value for
         columns of the domain data type.  The value is any
         variable-free expression (but subqueries are not allowed).
         The data type of the default expression must match the data
@@ -126,7 +126,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
      </varlistentry>
 
      <varlistentry>
-      <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term>
+      <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term>
       <listitem>
        <para>
         An optional name for a constraint.  If not specified,
@@ -136,7 +136,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
      </varlistentry>
 
      <varlistentry>
-      <term><literal>NOT NULL</></term>
+      <term><literal>NOT NULL</literal></term>
       <listitem>
        <para>
         Values of this domain are prevented from being null
@@ -146,7 +146,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
      </varlistentry>
 
      <varlistentry>
-      <term><literal>NULL</></term>
+      <term><literal>NULL</literal></term>
       <listitem>
        <para>
         Values of this domain are allowed to be null.  This is the default.
@@ -161,12 +161,12 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
      </varlistentry>
 
    <varlistentry>
-    <term><literal>CHECK (<replaceable class="PARAMETER">expression</replaceable>)</literal></term>
+    <term><literal>CHECK (<replaceable class="parameter">expression</replaceable>)</literal></term>
     <listitem>
-     <para><literal>CHECK</> clauses specify integrity constraints or tests
+     <para><literal>CHECK</literal> clauses specify integrity constraints or tests
       which values of the domain must satisfy.
       Each constraint must be an expression
-      producing a Boolean result.  It should use the key word <literal>VALUE</>
+      producing a Boolean result.  It should use the key word <literal>VALUE</literal>
       to refer to the value being tested.  Expressions evaluating
       to TRUE or UNKNOWN succeed.  If the expression produces a FALSE result,
       an error is reported and the value is not allowed to be converted
@@ -175,13 +175,13 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
 
      <para>
       Currently, <literal>CHECK</literal> expressions cannot contain
-      subqueries nor refer to variables other than <literal>VALUE</>.
+      subqueries nor refer to variables other than <literal>VALUE</literal>.
      </para>
 
      <para>
       When a domain has multiple <literal>CHECK</literal> constraints,
       they will be tested in alphabetical order by name.
-      (<productname>PostgreSQL</> versions before 9.5 did not honor any
+      (<productname>PostgreSQL</productname> versions before 9.5 did not honor any
       particular firing order for <literal>CHECK</literal> constraints.)
      </para>
     </listitem>
@@ -193,7 +193,7 @@ CREATE DOMAIN <replaceable class="parameter">name</replaceable> [ AS ] <replacea
   <title>Notes</title>
 
   <para>
-   Domain constraints, particularly <literal>NOT NULL</>, are checked when
+   Domain constraints, particularly <literal>NOT NULL</literal>, are checked when
    converting a value to the domain type.  It is possible for a column that
    is nominally of the domain type to read as null despite there being such
    a constraint.  For example, this can happen in an outer-join query, if
@@ -211,7 +211,7 @@ INSERT INTO tab (domcol) VALUES ((SELECT domcol FROM tab WHERE false));
    It is very difficult to avoid such problems, because of SQL's general
    assumption that a null value is a valid value of every data type.  Best practice
    therefore is to design a domain's constraints so that a null value is allowed,
-   and then to apply column <literal>NOT NULL</> constraints to columns of
+   and then to apply column <literal>NOT NULL</literal> constraints to columns of
    the domain type as needed, rather than directly to the domain type.
   </para>
  </refsect1>
@@ -242,7 +242,7 @@ CREATE TABLE us_snail_addy (
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-CREATEDOMAIN-compatibility">
+ <refsect1 id="sql-createdomain-compatibility">
   <title>Compatibility</title>
 
   <para>
@@ -251,12 +251,12 @@ CREATE TABLE us_snail_addy (
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATEDOMAIN-see-also">
+ <refsect1 id="sql-createdomain-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterdomain"></member>
-   <member><xref linkend="sql-dropdomain"></member>
+   <member><xref linkend="sql-alterdomain"/></member>
+   <member><xref linkend="sql-dropdomain"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_event_trigger.sgml b/doc/src/sgml/ref/create_event_trigger.sgml
index be18fc36e8..396d82118e 100644
--- a/doc/src/sgml/ref/create_event_trigger.sgml
+++ b/doc/src/sgml/ref/create_event_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_event_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEEVENTTRIGGER">
+<refentry id="sql-createeventtrigger">
  <indexterm zone="sql-createeventtrigger">
   <primary>CREATE EVENT TRIGGER</primary>
  </indexterm>
@@ -21,10 +21,10 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
-    ON <replaceable class="PARAMETER">event</replaceable>
-    [ WHEN <replaceable class="PARAMETER">filter_variable</replaceable> IN (filter_value [, ... ]) [ AND ... ] ]
-    EXECUTE PROCEDURE <replaceable class="PARAMETER">function_name</replaceable>()
+CREATE EVENT TRIGGER <replaceable class="parameter">name</replaceable>
+    ON <replaceable class="parameter">event</replaceable>
+    [ WHEN <replaceable class="parameter">filter_variable</replaceable> IN (filter_value [, ... ]) [ AND ... ] ]
+    EXECUTE PROCEDURE <replaceable class="parameter">function_name</replaceable>()
 </synopsis>
  </refsynopsisdiv>
 
@@ -33,10 +33,10 @@ CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
 
   <para>
    <command>CREATE EVENT TRIGGER</command> creates a new event trigger.
-   Whenever the designated event occurs and the <literal>WHEN</> condition
+   Whenever the designated event occurs and the <literal>WHEN</literal> condition
    associated with the trigger, if any, is satisfied, the trigger function
    will be executed.  For a general introduction to event triggers, see
-   <xref linkend="event-triggers">.  The user who creates an event trigger
+   <xref linkend="event-triggers"/>.  The user who creates an event trigger
    becomes its owner.
   </para>
  </refsect1>
@@ -60,7 +60,7 @@ CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
     <listitem>
      <para>
       The name of the event that triggers a call to the given function.
-      See <xref linkend="event-trigger-definition"> for more information
+      See <xref linkend="event-trigger-definition"/> for more information
       on event names.
      </para>
     </listitem>
@@ -85,8 +85,8 @@ CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
      <para>
       A list of values for the
       associated <replaceable class="parameter">filter_variable</replaceable>
-      for which the trigger should fire.  For <literal>TAG</>, this means a
-      list of command tags (e.g. <literal>'DROP FUNCTION'</>).
+      for which the trigger should fire.  For <literal>TAG</literal>, this means a
+      list of command tags (e.g. <literal>'DROP FUNCTION'</literal>).
      </para>
     </listitem>
    </varlistentry>
@@ -113,7 +113,7 @@ CREATE EVENT TRIGGER <replaceable class="PARAMETER">name</replaceable>
 
   <para>
    Event triggers are disabled in single-user mode (see <xref
-   linkend="app-postgres">).  If an erroneous event trigger disables the
+   linkend="app-postgres"/>).  If an erroneous event trigger disables the
    database so much that you can't even drop the trigger, restart in
    single-user mode and you'll be able to do that.
   </para>
@@ -154,9 +154,9 @@ CREATE EVENT TRIGGER abort_ddl ON ddl_command_start
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altereventtrigger"></member>
-   <member><xref linkend="sql-dropeventtrigger"></member>
-   <member><xref linkend="sql-createfunction"></member>
+   <member><xref linkend="sql-altereventtrigger"/></member>
+   <member><xref linkend="sql-dropeventtrigger"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_extension.sgml b/doc/src/sgml/ref/create_extension.sgml
index 14e910115a..36837f927d 100644
--- a/doc/src/sgml/ref/create_extension.sgml
+++ b/doc/src/sgml/ref/create_extension.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_extension.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEEXTENSION">
+<refentry id="sql-createextension">
  <indexterm zone="sql-createextension">
   <primary>CREATE EXTENSION</primary>
  </indexterm>
@@ -39,7 +39,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
 
   <para>
    Loading an extension essentially amounts to running the extension's script
-   file.  The script will typically create new <acronym>SQL</> objects such as
+   file.  The script will typically create new <acronym>SQL</acronym> objects such as
    functions, data types, operators and index support methods.
    <command>CREATE EXTENSION</command> additionally records the identities
    of all the created objects, so that they can be dropped again if
@@ -62,7 +62,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
 
     <variablelist>
      <varlistentry>
-      <term><literal>IF NOT EXISTS</></term>
+      <term><literal>IF NOT EXISTS</literal></term>
       <listitem>
        <para>
         Do not throw an error if an extension with the same name already
@@ -97,17 +97,17 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
        </para>
 
        <para>
-        If the extension specifies a <literal>schema</> parameter in its
+        If the extension specifies a <literal>schema</literal> parameter in its
         control file, then that schema cannot be overridden with
-        a <literal>SCHEMA</> clause.  Normally, an error will be raised if
-        a <literal>SCHEMA</> clause is given and it conflicts with the
-        extension's <literal>schema</> parameter.  However, if
-        the <literal>CASCADE</> clause is also given,
+        a <literal>SCHEMA</literal> clause.  Normally, an error will be raised if
+        a <literal>SCHEMA</literal> clause is given and it conflicts with the
+        extension's <literal>schema</literal> parameter.  However, if
+        the <literal>CASCADE</literal> clause is also given,
         then <replaceable class="parameter">schema_name</replaceable> is
         ignored when it conflicts.  The
         given <replaceable class="parameter">schema_name</replaceable> will be
         used for installation of any needed extensions that do not
-        specify <literal>schema</> in their control files.
+        specify <literal>schema</literal> in their control files.
        </para>
 
        <para>
@@ -134,13 +134,13 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
       <term><replaceable class="parameter">old_version</replaceable></term>
       <listitem>
        <para>
-        <literal>FROM</> <replaceable class="parameter">old_version</>
+        <literal>FROM</literal> <replaceable class="parameter">old_version</replaceable>
         must be specified when, and only when, you are attempting to install
-        an extension that replaces an <quote>old style</> module that is just
+        an extension that replaces an <quote>old style</quote> module that is just
         a collection of objects not packaged into an extension.  This option
-        causes <command>CREATE EXTENSION</> to run an alternative installation
+        causes <command>CREATE EXTENSION</command> to run an alternative installation
         script that absorbs the existing objects into the extension, instead
-        of creating new objects.  Be careful that <literal>SCHEMA</> specifies
+        of creating new objects.  Be careful that <literal>SCHEMA</literal> specifies
         the schema containing these pre-existing objects.
        </para>
 
@@ -150,7 +150,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
         extension's author, and might vary if there is more than one version
         of the old-style module that can be upgraded into an extension.
         For the standard additional modules supplied with pre-9.1
-        <productname>PostgreSQL</productname>, use <literal>unpackaged</>
+        <productname>PostgreSQL</productname>, use <literal>unpackaged</literal>
         for <replaceable class="parameter">old_version</replaceable> when
         updating a module to extension style.
        </para>
@@ -158,12 +158,12 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
      </varlistentry>
 
      <varlistentry>
-      <term><literal>CASCADE</></term>
+      <term><literal>CASCADE</literal></term>
       <listitem>
        <para>
         Automatically install any extensions that this extension depends on
         that are not already installed.  Their dependencies are likewise
-        automatically installed, recursively.  The <literal>SCHEMA</> clause,
+        automatically installed, recursively.  The <literal>SCHEMA</literal> clause,
         if given, applies to all extensions that get installed this way.
         Other options of the statement are not applied to
         automatically-installed extensions; in particular, their default
@@ -178,7 +178,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
   <title>Notes</title>
 
   <para>
-   Before you can use <command>CREATE EXTENSION</> to load an extension
+   Before you can use <command>CREATE EXTENSION</command> to load an extension
    into a database, the extension's supporting files must be installed.
    Information about installing the extensions supplied with
    <productname>PostgreSQL</productname> can be found in
@@ -195,7 +195,7 @@ CREATE EXTENSION [ IF NOT EXISTS ] <replaceable class="parameter">extension_name
 
   <para>
    For information about writing new extensions, see
-   <xref linkend="extend-extensions">.
+   <xref linkend="extend-extensions"/>.
   </para>
  </refsect1>
 
@@ -211,13 +211,13 @@ CREATE EXTENSION hstore;
   </para>
 
   <para>
-   Update a pre-9.1 installation of <literal>hstore</> into
+   Update a pre-9.1 installation of <literal>hstore</literal> into
    extension style:
 <programlisting>
 CREATE EXTENSION hstore SCHEMA public FROM unpackaged;
 </programlisting>
    Be careful to specify the schema in which you installed the existing
-   <literal>hstore</> objects.
+   <literal>hstore</literal> objects.
   </para>
  </refsect1>
 
@@ -225,7 +225,7 @@ CREATE EXTENSION hstore SCHEMA public FROM unpackaged;
   <title>Compatibility</title>
 
   <para>
-   <command>CREATE EXTENSION</command> is a <productname>PostgreSQL</>
+   <command>CREATE EXTENSION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -234,8 +234,8 @@ CREATE EXTENSION hstore SCHEMA public FROM unpackaged;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterextension"></member>
-   <member><xref linkend="sql-dropextension"></member>
+   <member><xref linkend="sql-alterextension"/></member>
+   <member><xref linkend="sql-dropextension"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
index a3811a3b63..0fcba18a34 100644
--- a/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/create_foreign_data_wrapper.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_foreign_data_wrapper.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEFOREIGNDATAWRAPPER">
+<refentry id="sql-createforeigndatawrapper">
  <indexterm zone="sql-createforeigndatawrapper">
   <primary>CREATE FOREIGN DATA WRAPPER</primary>
  </indexterm>
@@ -24,7 +24,7 @@ PostgreSQL documentation
 CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
     [ HANDLER <replaceable class="parameter">handler_function</replaceable> | NO HANDLER ]
     [ VALIDATOR <replaceable class="parameter">validator_function</replaceable> | NO VALIDATOR ]
-    [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
+    [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -100,7 +100,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies options for the new foreign-data wrapper.
@@ -117,7 +117,7 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
   <title>Notes</title>
 
   <para>
-   <productname>PostgreSQL</>'s foreign-data functionality is still under
+   <productname>PostgreSQL</productname>'s foreign-data functionality is still under
    active development.  Optimization of queries is primitive (and mostly left
    to the wrapper, too).  Thus, there is considerable room for future
    performance improvements.
@@ -128,22 +128,22 @@ CREATE FOREIGN DATA WRAPPER <replaceable class="parameter">name</replaceable>
   <title>Examples</title>
 
   <para>
-   Create a useless foreign-data wrapper <literal>dummy</>:
+   Create a useless foreign-data wrapper <literal>dummy</literal>:
 <programlisting>
 CREATE FOREIGN DATA WRAPPER dummy;
 </programlisting>
   </para>
 
   <para>
-   Create a foreign-data wrapper <literal>file</> with
-   handler function <literal>file_fdw_handler</>:
+   Create a foreign-data wrapper <literal>file</literal> with
+   handler function <literal>file_fdw_handler</literal>:
 <programlisting>
 CREATE FOREIGN DATA WRAPPER file HANDLER file_fdw_handler;
 </programlisting>
   </para>
 
   <para>
-   Create a foreign-data wrapper <literal>mywrapper</> with some
+   Create a foreign-data wrapper <literal>mywrapper</literal> with some
    options:
 <programlisting>
 CREATE FOREIGN DATA WRAPPER mywrapper
@@ -159,7 +159,7 @@ CREATE FOREIGN DATA WRAPPER mywrapper
    9075-9 (SQL/MED), with the exception that the <literal>HANDLER</literal>
    and <literal>VALIDATOR</literal> clauses are extensions and the standard
    clauses <literal>LIBRARY</literal> and <literal>LANGUAGE</literal>
-   are not implemented in <productname>PostgreSQL</>.
+   are not implemented in <productname>PostgreSQL</productname>.
   </para>
 
   <para>
@@ -172,11 +172,11 @@ CREATE FOREIGN DATA WRAPPER mywrapper
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterforeigndatawrapper"></member>
-   <member><xref linkend="sql-dropforeigndatawrapper"></member>
-   <member><xref linkend="sql-createserver"></member>
-   <member><xref linkend="sql-createusermapping"></member>
-   <member><xref linkend="sql-createforeigntable"></member>
+   <member><xref linkend="sql-alterforeigndatawrapper"/></member>
+   <member><xref linkend="sql-dropforeigndatawrapper"/></member>
+   <member><xref linkend="sql-createserver"/></member>
+   <member><xref linkend="sql-createusermapping"/></member>
+   <member><xref linkend="sql-createforeigntable"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_foreign_table.sgml b/doc/src/sgml/ref/create_foreign_table.sgml
index 065c982082..37a45b26db 100644
--- a/doc/src/sgml/ref/create_foreign_table.sgml
+++ b/doc/src/sgml/ref/create_foreign_table.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/create_foreign_table.sgml -->
 
-<refentry id="SQL-CREATEFOREIGNTABLE">
+<refentry id="sql-createforeigntable">
  <indexterm zone="sql-createforeigntable">
   <primary>CREATE FOREIGN TABLE</primary>
  </indexterm>
@@ -18,40 +18,40 @@
 
  <refsynopsisdiv>
 <synopsis>
-CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [
-  { <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ] [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
+CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> ( [
+  { <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ] [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     | <replaceable>table_constraint</replaceable> }
     [, ... ]
 ] )
 [ INHERITS ( <replaceable>parent_table</replaceable> [, ... ] ) ]
   SERVER <replaceable class="parameter">server_name</replaceable>
-[ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
+[ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ]
 
-CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable>
-  PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> [ (
-  { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
+CREATE FOREIGN TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable>
+  PARTITION OF <replaceable class="parameter">parent_table</replaceable> [ (
+  { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     | <replaceable>table_constraint</replaceable> }
     [, ... ]
-) ] <replaceable class="PARAMETER">partition_bound_spec</replaceable>
+) ] <replaceable class="parameter">partition_bound_spec</replaceable>
   SERVER <replaceable class="parameter">server_name</replaceable>
-[ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
+[ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ]
 
-<phrase>where <replaceable class="PARAMETER">column_constraint</replaceable> is:</phrase>
+<phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase>
 
-[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
 { NOT NULL |
   NULL |
-  CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] |
+  CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
   DEFAULT <replaceable>default_expr</replaceable> }
 
-<phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase>
+<phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase>
 
-[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
-CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ]
 </synopsis>
  </refsynopsisdiv>
 
- <refsect1 id="SQL-CREATEFOREIGNTABLE-description">
+ <refsect1 id="sql-createforeigntable-description">
   <title>Description</title>
 
   <para>
@@ -62,7 +62,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
 
   <para>
    If a schema name is given (for example, <literal>CREATE FOREIGN TABLE
-   myschema.mytable ...</>) then the table is created in the specified
+   myschema.mytable ...</literal>) then the table is created in the specified
    schema.  Otherwise it is created in the current schema.
    The name of the foreign table must be
    distinct from the name of any other foreign table, table, sequence, index,
@@ -95,7 +95,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
   <variablelist>
 
    <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a relation with the same name already exists.
@@ -107,7 +107,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to be created.
@@ -116,7 +116,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a column to be created in the new table.
@@ -125,13 +125,13 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">data_type</replaceable></term>
+    <term><replaceable class="parameter">data_type</replaceable></term>
     <listitem>
      <para>
       The data type of the column. This can include array
       specifiers. For more information on the data types supported by
       <productname>PostgreSQL</productname>, refer to <xref
-      linkend="datatype">.
+      linkend="datatype"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -140,7 +140,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
     <term><literal>COLLATE <replaceable>collation</replaceable></literal></term>
     <listitem>
      <para>
-      The <literal>COLLATE</> clause assigns a collation to
+      The <literal>COLLATE</literal> clause assigns a collation to
       the column (which must be of a collatable data type).
       If not specified, the column data type's default collation is used.
      </para>
@@ -151,22 +151,22 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
     <term><literal>INHERITS ( <replaceable>parent_table</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
-      The optional <literal>INHERITS</> clause specifies a list of
+      The optional <literal>INHERITS</literal> clause specifies a list of
       tables from which the new foreign table automatically inherits
       all columns.  Parent tables can be plain tables or foreign tables.
       See the similar form of
-      <xref linkend="sql-createtable"> for more details.
+      <xref linkend="sql-createtable"/> for more details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term>
+    <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term>
     <listitem>
      <para>
       An optional name for a column or table constraint.  If the
       constraint is violated, the constraint name is present in error messages,
-      so constraint names like <literal>col must be positive</> can be used
+      so constraint names like <literal>col must be positive</literal> can be used
       to communicate helpful constraint information to client applications.
       (Double-quotes are needed to specify constraint names that contain spaces.)
       If a constraint name is not specified, the system generates a name.
@@ -175,7 +175,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NOT NULL</></term>
+    <term><literal>NOT NULL</literal></term>
     <listitem>
      <para>
       The column is not allowed to contain null values.
@@ -184,7 +184,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NULL</></term>
+    <term><literal>NULL</literal></term>
     <listitem>
      <para>
       The column is allowed to contain null values. This is the default.
@@ -199,10 +199,10 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><literal>CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </literal></term>
+    <term><literal>CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] </literal></term>
     <listitem>
      <para>
-      The <literal>CHECK</> clause specifies an expression producing a
+      The <literal>CHECK</literal> clause specifies an expression producing a
       Boolean result which each row in the foreign table is expected
       to satisfy; that is, the expression should produce TRUE or UNKNOWN,
       never FALSE, for all rows in the foreign table.
@@ -219,7 +219,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
      </para>
 
      <para>
-      A constraint marked with <literal>NO INHERIT</> will not propagate to
+      A constraint marked with <literal>NO INHERIT</literal> will not propagate to
       child tables.
      </para>
     </listitem>
@@ -230,7 +230,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
     <replaceable>default_expr</replaceable></literal></term>
     <listitem>
      <para>
-      The <literal>DEFAULT</> clause assigns a default data value for
+      The <literal>DEFAULT</literal> clause assigns a default data value for
       the column whose column definition it appears within.  The value
       is any variable-free expression (subqueries and cross-references
       to other columns in the current table are not allowed).  The
@@ -247,18 +247,18 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">server_name</replaceable></term>
+    <term><replaceable class="parameter">server_name</replaceable></term>
     <listitem>
      <para>
       The name of an existing foreign server to use for the foreign table.
       For details on defining a server, see <xref
-      linkend="SQL-CREATESERVER">.
+      linkend="sql-createserver"/>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ...] )</literal></term>
+    <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ...] )</literal></term>
     <listitem>
      <para>
       Options to be associated with the new foreign table or one of its
@@ -279,9 +279,9 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
   <title>Notes</title>
 
    <para>
-    Constraints on foreign tables (such as <literal>CHECK</>
-    or <literal>NOT NULL</> clauses) are not enforced by the
-    core <productname>PostgreSQL</> system, and most foreign data wrappers
+    Constraints on foreign tables (such as <literal>CHECK</literal>
+    or <literal>NOT NULL</literal> clauses) are not enforced by the
+    core <productname>PostgreSQL</productname> system, and most foreign data wrappers
     do not attempt to enforce them either; that is, the constraint is
     simply assumed to hold true.  There would be little point in such
     enforcement since it would only apply to rows inserted or updated via
@@ -300,7 +300,7 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </para>
 
    <para>
-    Although <productname>PostgreSQL</> does not attempt to enforce
+    Although <productname>PostgreSQL</productname> does not attempt to enforce
     constraints on foreign tables, it does assume that they are correct
     for purposes of query optimization.  If there are rows visible in the
     foreign table that do not satisfy a declared constraint, queries on
@@ -310,12 +310,12 @@ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ]
    </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATEFOREIGNTABLE-examples">
+ <refsect1 id="sql-createforeigntable-examples">
   <title>Examples</title>
 
   <para>
-   Create foreign table <structname>films</>, which will be accessed through
-   the server <structname>film_server</>:
+   Create foreign table <structname>films</structname>, which will be accessed through
+   the server <structname>film_server</structname>:
 
 <programlisting>
 CREATE FOREIGN TABLE films (
@@ -330,9 +330,9 @@ SERVER film_server;
 </programlisting></para>
 
   <para>
-   Create foreign table <structname>measurement_y2016m07</>, which will be
-   accessed through the server <structname>server_07</>, as a partition
-   of the range partitioned table <structname>measurement</>:
+   Create foreign table <structname>measurement_y2016m07</structname>, which will be
+   accessed through the server <structname>server_07</structname>, as a partition
+   of the range partitioned table <structname>measurement</structname>:
 
 <programlisting>
 CREATE FOREIGN TABLE measurement_y2016m07
@@ -342,16 +342,16 @@ CREATE FOREIGN TABLE measurement_y2016m07
 
  </refsect1>
 
- <refsect1 id="SQL-CREATEFOREIGNTABLE-compatibility">
-  <title id="SQL-CREATEFOREIGNTABLE-compatibility-title">Compatibility</title>
+ <refsect1 id="sql-createforeigntable-compatibility">
+  <title id="sql-createforeigntable-compatibility-title">Compatibility</title>
 
   <para>
    The <command>CREATE FOREIGN TABLE</command> command largely conforms to the
    <acronym>SQL</acronym> standard; however, much as with
-   <link linkend="sql-createtable"><command>CREATE TABLE</></link>,
-   <literal>NULL</> constraints and zero-column foreign tables are permitted.
+   <link linkend="sql-createtable"><command>CREATE TABLE</command></link>,
+   <literal>NULL</literal> constraints and zero-column foreign tables are permitted.
    The ability to specify column default values is also
-   a <productname>PostgreSQL</> extension.  Table inheritance, in the form
+   a <productname>PostgreSQL</productname> extension.  Table inheritance, in the form
    defined by <productname>PostgreSQL</productname>, is nonstandard.
   </para>
 
@@ -361,11 +361,11 @@ CREATE FOREIGN TABLE measurement_y2016m07
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterforeigntable"></member>
-   <member><xref linkend="sql-dropforeigntable"></member>
-   <member><xref linkend="sql-createtable"></member>
-   <member><xref linkend="sql-createserver"></member>
-   <member><xref linkend="sql-importforeignschema"></member>
+   <member><xref linkend="sql-alterforeigntable"/></member>
+   <member><xref linkend="sql-dropforeigntable"/></member>
+   <member><xref linkend="sql-createtable"/></member>
+   <member><xref linkend="sql-createserver"/></member>
+   <member><xref linkend="sql-importforeignschema"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_function.sgml b/doc/src/sgml/ref/create_function.sgml
index 072e033687..c0adb8cf1e 100644
--- a/doc/src/sgml/ref/create_function.sgml
+++ b/doc/src/sgml/ref/create_function.sgml
@@ -2,7 +2,7 @@
 doc/src/sgml/ref/create_function.sgml
 -->
 
-<refentry id="SQL-CREATEFUNCTION">
+<refentry id="sql-createfunction">
  <indexterm zone="sql-createfunction">
   <primary>CREATE FUNCTION</primary>
  </indexterm>
@@ -37,7 +37,6 @@ CREATE [ OR REPLACE ] FUNCTION
     | AS '<replaceable class="parameter">definition</replaceable>'
     | AS '<replaceable class="parameter">obj_file</replaceable>', '<replaceable class="parameter">link_symbol</replaceable>'
   } ...
-    [ WITH ( <replaceable class="parameter">attribute</replaceable> [, ...] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -55,10 +54,10 @@ CREATE [ OR REPLACE ] FUNCTION
   <para>
    If a schema name is included, then the function is created in the
    specified schema.  Otherwise it is created in the current schema.
-   The name of the new function must not match any existing function
+   The name of the new function must not match any existing function or procedure
    with the same input argument types in the same schema.  However,
-   functions of different argument types can share a name (this is
-   called <firstterm>overloading</>).
+   functions and procedures of different argument types can share a name (this is
+   called <firstterm>overloading</firstterm>).
   </para>
 
   <para>
@@ -68,13 +67,13 @@ CREATE [ OR REPLACE ] FUNCTION
    tried, you would actually be creating a new, distinct function).
    Also, <command>CREATE OR REPLACE FUNCTION</command> will not let
    you change the return type of an existing function.  To do that,
-   you must drop and recreate the function.  (When using <literal>OUT</>
+   you must drop and recreate the function.  (When using <literal>OUT</literal>
    parameters, that means you cannot change the types of any
-   <literal>OUT</> parameters except by dropping the function.)
+   <literal>OUT</literal> parameters except by dropping the function.)
   </para>
 
   <para>
-   When <command>CREATE OR REPLACE FUNCTION</> is used to replace an
+   When <command>CREATE OR REPLACE FUNCTION</command> is used to replace an
    existing function, the ownership and permissions of the function
    do not change.  All other function properties are assigned the
    values specified or implied in the command.  You must own the function
@@ -87,7 +86,7 @@ CREATE [ OR REPLACE ] FUNCTION
    triggers, etc. that refer to the old function.  Use
    <command>CREATE OR REPLACE FUNCTION</command> to change a function
    definition without breaking objects that refer to the function.
-   Also, <command>ALTER FUNCTION</> can be used to change most of the
+   Also, <command>ALTER FUNCTION</command> can be used to change most of the
    auxiliary properties of an existing function.
   </para>
 
@@ -121,12 +120,12 @@ CREATE [ OR REPLACE ] FUNCTION
 
      <listitem>
       <para>
-       The mode of an argument: <literal>IN</>, <literal>OUT</>,
-       <literal>INOUT</>, or <literal>VARIADIC</>.
-       If omitted, the default is <literal>IN</>.
-       Only <literal>OUT</> arguments can follow a <literal>VARIADIC</> one.
-       Also, <literal>OUT</> and <literal>INOUT</> arguments cannot be used
-       together with the <literal>RETURNS TABLE</> notation.
+       The mode of an argument: <literal>IN</literal>, <literal>OUT</literal>,
+       <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+       If omitted, the default is <literal>IN</literal>.
+       Only <literal>OUT</literal> arguments can follow a <literal>VARIADIC</literal> one.
+       Also, <literal>OUT</literal> and <literal>INOUT</literal> arguments cannot be used
+       together with the <literal>RETURNS TABLE</literal> notation.
       </para>
      </listitem>
     </varlistentry>
@@ -141,7 +140,7 @@ CREATE [ OR REPLACE ] FUNCTION
        name of an input argument is just extra documentation, so far as
        the function itself is concerned; but you can use input argument names
        when calling a function to improve readability (see <xref
-       linkend="sql-syntax-calling-funcs">).  In any case, the name
+       linkend="sql-syntax-calling-funcs"/>).  In any case, the name
        of an output argument is significant, because it defines the column
        name in the result row type.  (If you omit the name for an output
        argument, the system will choose a default column name.)
@@ -160,7 +159,7 @@ CREATE [ OR REPLACE ] FUNCTION
       </para>
       <para>
        Depending on the implementation language it might also be allowed
-       to specify <quote>pseudo-types</> such as <type>cstring</>.
+       to specify <quote>pseudo-types</quote> such as <type>cstring</type>.
        Pseudo-types indicate that the actual argument type is either
        incompletely specified, or outside the set of ordinary SQL data types.
       </para>
@@ -183,7 +182,7 @@ CREATE [ OR REPLACE ] FUNCTION
        An expression to be used as default value if the parameter is
        not specified.  The expression has to be coercible to the
        argument type of the parameter.
-       Only input (including <literal>INOUT</>) parameters can have a default
+       Only input (including <literal>INOUT</literal>) parameters can have a default
         value.  All input parameters following a
        parameter with a default value must have default values as well.
       </para>
@@ -199,15 +198,15 @@ CREATE [ OR REPLACE ] FUNCTION
        can be a base, composite, or domain type,
        or can reference the type of a table column.
        Depending on the implementation language it might also be allowed
-       to specify <quote>pseudo-types</> such as <type>cstring</>.
+       to specify <quote>pseudo-types</quote> such as <type>cstring</type>.
        If the function is not supposed to return a value, specify
-       <type>void</> as the return type.
+       <type>void</type> as the return type.
       </para>
       <para>
-       When there are <literal>OUT</> or <literal>INOUT</> parameters,
-       the <literal>RETURNS</> clause can be omitted.  If present, it
+       When there are <literal>OUT</literal> or <literal>INOUT</literal> parameters,
+       the <literal>RETURNS</literal> clause can be omitted.  If present, it
        must agree with the result type implied by the output parameters:
-       <literal>RECORD</> if there are multiple output parameters, or
+       <literal>RECORD</literal> if there are multiple output parameters, or
        the same type as the single output parameter.
       </para>
       <para>
@@ -229,10 +228,10 @@ CREATE [ OR REPLACE ] FUNCTION
 
      <listitem>
       <para>
-       The name of an output column in the <literal>RETURNS TABLE</>
+       The name of an output column in the <literal>RETURNS TABLE</literal>
        syntax.  This is effectively another way of declaring a named
-       <literal>OUT</> parameter, except that <literal>RETURNS TABLE</>
-       also implies <literal>RETURNS SETOF</>.
+       <literal>OUT</literal> parameter, except that <literal>RETURNS TABLE</literal>
+       also implies <literal>RETURNS SETOF</literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -242,7 +241,7 @@ CREATE [ OR REPLACE ] FUNCTION
 
      <listitem>
       <para>
-       The data type of an output column in the <literal>RETURNS TABLE</>
+       The data type of an output column in the <literal>RETURNS TABLE</literal>
        syntax.
       </para>
      </listitem>
@@ -269,7 +268,7 @@ CREATE [ OR REPLACE ] FUNCTION
       <para>
        Lists which transforms a call to the function should apply.  Transforms
        convert between SQL types and language-specific data types;
-       see <xref linkend="sql-createtransform">.  Procedural language
+       see <xref linkend="sql-createtransform"/>.  Procedural language
        implementations usually have hardcoded knowledge of the built-in types,
        so those don't need to be listed here.  If a procedural language
        implementation does not know how to handle a type and no transform is
@@ -284,9 +283,9 @@ CREATE [ OR REPLACE ] FUNCTION
 
      <listitem>
       <para><literal>WINDOW</literal> indicates that the function is a
-       <firstterm>window function</> rather than a plain function.
+       <firstterm>window function</firstterm> rather than a plain function.
        This is currently only useful for functions written in C.
-       The <literal>WINDOW</> attribute cannot be changed when
+       The <literal>WINDOW</literal> attribute cannot be changed when
        replacing an existing function definition.
       </para>
      </listitem>
@@ -321,24 +320,24 @@ CREATE [ OR REPLACE ] FUNCTION
        result could change across SQL statements.  This is the appropriate
        selection for functions whose results depend on database lookups,
        parameter variables (such as the current time zone), etc.  (It is
-       inappropriate for <literal>AFTER</> triggers that wish to
+       inappropriate for <literal>AFTER</literal> triggers that wish to
        query rows modified by the current command.)  Also note
-       that the <function>current_timestamp</> family of functions qualify
+       that the <function>current_timestamp</function> family of functions qualify
        as stable, since their values do not change within a transaction.
       </para>
 
       <para><literal>VOLATILE</literal> indicates that the function value can
        change even within a single table scan, so no optimizations can be
        made.  Relatively few database functions are volatile in this sense;
-       some examples are <literal>random()</>, <literal>currval()</>,
-       <literal>timeofday()</>.  But note that any function that has
+       some examples are <literal>random()</literal>, <literal>currval()</literal>,
+       <literal>timeofday()</literal>.  But note that any function that has
        side-effects must be classified volatile, even if its result is quite
        predictable, to prevent calls from being optimized away; an example is
-       <literal>setval()</>.
+       <literal>setval()</literal>.
       </para>
 
       <para>
-       For additional details see <xref linkend="xfunc-volatility">.
+       For additional details see <xref linkend="xfunc-volatility"/>.
       </para>
      </listitem>
     </varlistentry>
@@ -363,7 +362,7 @@ CREATE [ OR REPLACE ] FUNCTION
        In addition, functions which do not take arguments or which are not
        passed any arguments from the security barrier view or table do not have
        to be marked as leakproof to be executed before security conditions.  See
-       <xref linkend="sql-createview"> and <xref linkend="rules-privileges">.
+       <xref linkend="sql-createview"/> and <xref linkend="rules-privileges"/>.
        This option can only be set by the superuser.
       </para>
      </listitem>
@@ -430,11 +429,11 @@ CREATE [ OR REPLACE ] FUNCTION
       Functions should be labeled parallel unsafe if they modify any database
       state, or if they make changes to the transaction such as using
       sub-transactions, or if they access sequences or attempt to make
-      persistent changes to settings (e.g. <literal>setval</>).  They should
+      persistent changes to settings (e.g. <literal>setval</literal>).  They should
       be labeled as parallel restricted if they access temporary tables,
       client connection state, cursors, prepared statements, or miscellaneous
       backend-local state which the system cannot synchronize in parallel mode
-      (e.g.  <literal>setseed</> cannot be executed other than by the group
+      (e.g.  <literal>setseed</literal> cannot be executed other than by the group
       leader because a change made by another process would not be reflected
       in the leader).  In general, if a function is labeled as being safe when
       it is restricted or unsafe, or if it is labeled as being restricted when
@@ -443,19 +442,19 @@ CREATE [ OR REPLACE ] FUNCTION
       exhibit totally undefined behavior if mislabeled, since there is no way
       for the system to protect itself against arbitrary C code, but in most
       likely cases the result will be no worse than for any other function.
-      If in doubt, functions should be labeled as <literal>UNSAFE</>, which is
+      If in doubt, functions should be labeled as <literal>UNSAFE</literal>, which is
       the default.
      </para>
     </listitem>
    </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="parameter">execution_cost</replaceable></term>
+     <term><literal>COST</literal> <replaceable class="parameter">execution_cost</replaceable></term>
 
      <listitem>
       <para>
        A positive number giving the estimated execution cost for the function,
-       in units of <xref linkend="guc-cpu-operator-cost">.  If the function
+       in units of <xref linkend="guc-cpu-operator-cost"/>.  If the function
        returns a set, this is the cost per returned row.  If the cost is
        not specified, 1 unit is assumed for C-language and internal functions,
        and 100 units for functions in all other languages.  Larger values
@@ -466,7 +465,7 @@ CREATE [ OR REPLACE ] FUNCTION
     </varlistentry>
 
     <varlistentry>
-     <term><replaceable class="parameter">result_rows</replaceable></term>
+     <term><literal>ROWS</literal> <replaceable class="parameter">result_rows</replaceable></term>
 
      <listitem>
       <para>
@@ -483,29 +482,29 @@ CREATE [ OR REPLACE ] FUNCTION
      <term><replaceable>value</replaceable></term>
      <listitem>
       <para>
-       The <literal>SET</> clause causes the specified configuration
+       The <literal>SET</literal> clause causes the specified configuration
        parameter to be set to the specified value when the function is
        entered, and then restored to its prior value when the function exits.
-       <literal>SET FROM CURRENT</> saves the value of the parameter that
-       is current when <command>CREATE FUNCTION</> is executed as the value
+       <literal>SET FROM CURRENT</literal> saves the value of the parameter that
+       is current when <command>CREATE FUNCTION</command> is executed as the value
        to be applied when the function is entered.
       </para>
 
       <para>
-       If a <literal>SET</> clause is attached to a function, then
-       the effects of a <command>SET LOCAL</> command executed inside the
+       If a <literal>SET</literal> clause is attached to a function, then
+       the effects of a <command>SET LOCAL</command> command executed inside the
        function for the same variable are restricted to the function: the
        configuration parameter's prior value is still restored at function exit.
        However, an ordinary
-       <command>SET</> command (without <literal>LOCAL</>) overrides the
-       <literal>SET</> clause, much as it would do for a previous <command>SET
-       LOCAL</> command: the effects of such a command will persist after
+       <command>SET</command> command (without <literal>LOCAL</literal>) overrides the
+       <literal>SET</literal> clause, much as it would do for a previous <command>SET
+       LOCAL</command> command: the effects of such a command will persist after
        function exit, unless the current transaction is rolled back.
       </para>
 
       <para>
-       See <xref linkend="sql-set"> and
-       <xref linkend="runtime-config">
+       See <xref linkend="sql-set"/> and
+       <xref linkend="runtime-config"/>
        for more information about allowed parameter names and values.
       </para>
      </listitem>
@@ -523,7 +522,7 @@ CREATE [ OR REPLACE ] FUNCTION
 
       <para>
        It is often helpful to use dollar quoting (see <xref
-       linkend="sql-syntax-dollar-quoting">) to write the function definition
+       linkend="sql-syntax-dollar-quoting"/>) to write the function definition
        string, rather than the normal single quote syntax.  Without dollar
        quoting, any single quotes or backslashes in the function definition must
        be escaped by doubling them.
@@ -543,7 +542,7 @@ CREATE [ OR REPLACE ] FUNCTION
        the SQL function. The string <replaceable
        class="parameter">obj_file</replaceable> is the name of the shared
        library file containing the compiled C function, and is interpreted
-       as for the <xref linkend="SQL-LOAD"> command.  The string
+       as for the <xref linkend="sql-load"/> command.  The string
        <replaceable class="parameter">link_symbol</replaceable> is the
        function's link symbol, that is, the name of the function in the C
        language source code.  If the link symbol is omitted, it is assumed
@@ -560,45 +559,10 @@ CREATE [ OR REPLACE ] FUNCTION
      </listitem>
     </varlistentry>
 
-    <varlistentry>
-     <term><replaceable class="parameter">attribute</replaceable></term>
-
-     <listitem>
-      <para>
-       The historical way to specify optional pieces of information
-       about the function.  The following attributes can appear here:
-
-      <variablelist>
-       <varlistentry>
-        <term><literal>isStrict</></term>
-        <listitem>
-         <para>
-          Equivalent to <literal>STRICT</literal> or <literal>RETURNS NULL ON NULL INPUT</literal>.
-         </para>
-        </listitem>
-       </varlistentry>
-
-       <varlistentry>
-        <term><literal>isCachable</></term>
-        <listitem>
-         <para><literal>isCachable</literal> is an obsolete equivalent of
-          <literal>IMMUTABLE</literal>; it's still accepted for
-          backwards-compatibility reasons.
-         </para>
-        </listitem>
-       </varlistentry>
-
-      </variablelist>
-
-      Attribute names are not case-sensitive.
-     </para>
-    </listitem>
-   </varlistentry>
-
    </variablelist>
 
    <para>
-    Refer to <xref linkend="xfunc"> for further information on writing
+    Refer to <xref linkend="xfunc"/> for further information on writing
     functions.
    </para>
 
@@ -619,7 +583,7 @@ CREATE [ OR REPLACE ] FUNCTION
 
    <para>
     Two functions are considered the same if they have the same names and
-    <emphasis>input</> argument types, ignoring any <literal>OUT</>
+    <emphasis>input</emphasis> argument types, ignoring any <literal>OUT</literal>
     parameters.  Thus for example these declarations conflict:
 <programlisting>
 CREATE FUNCTION foo(int) ...
@@ -635,7 +599,7 @@ CREATE FUNCTION foo(int, out text) ...
 CREATE FUNCTION foo(int) ...
 CREATE FUNCTION foo(int, int default 42) ...
 </programlisting>
-    A call <literal>foo(10)</> will fail due to the ambiguity about which
+    A call <literal>foo(10)</literal> will fail due to the ambiguity about which
     function should be called.
    </para>
 
@@ -648,16 +612,16 @@ CREATE FUNCTION foo(int, int default 42) ...
     The full <acronym>SQL</acronym> type syntax is allowed for
     declaring a function's arguments and return value.  However,
     parenthesized type modifiers (e.g., the precision field for
-    type <type>numeric</type>) are discarded by <command>CREATE FUNCTION</>.
+    type <type>numeric</type>) are discarded by <command>CREATE FUNCTION</command>.
     Thus for example
-    <literal>CREATE FUNCTION foo (varchar(10)) ...</>
+    <literal>CREATE FUNCTION foo (varchar(10)) ...</literal>
     is exactly the same as
-    <literal>CREATE FUNCTION foo (varchar) ...</>.
+    <literal>CREATE FUNCTION foo (varchar) ...</literal>.
    </para>
 
    <para>
     When replacing an existing function with <command>CREATE OR REPLACE
-    FUNCTION</>, there are restrictions on changing parameter names.
+    FUNCTION</command>, there are restrictions on changing parameter names.
     You cannot change the name already assigned to any input parameter
     (although you can add names to parameters that had none before).
     If there is more than one output parameter, you cannot change the
@@ -668,9 +632,9 @@ CREATE FUNCTION foo(int, int default 42) ...
    </para>
 
    <para>
-    If a function is declared <literal>STRICT</> with a <literal>VARIADIC</>
+    If a function is declared <literal>STRICT</literal> with a <literal>VARIADIC</literal>
     argument, the strictness check tests that the variadic array <emphasis>as
-    a whole</> is non-null.  The function will still be called if the
+    a whole</emphasis> is non-null.  The function will still be called if the
     array has null elements.
    </para>
 
@@ -681,7 +645,7 @@ CREATE FUNCTION foo(int, int default 42) ...
 
   <para>
    Here are some trivial examples to help you get started.  For more
-   information and examples, see <xref linkend="xfunc">.
+   information and examples, see <xref linkend="xfunc"/>.
 <programlisting>
 CREATE FUNCTION add(integer, integer) RETURNS integer
     AS 'select $1 + $2;'
@@ -723,7 +687,7 @@ CREATE FUNCTION dup(int) RETURNS dup_result
 
 SELECT * FROM dup(42);
 </programlisting>
-   Another way to return multiple columns is to use a <literal>TABLE</>
+   Another way to return multiple columns is to use a <literal>TABLE</literal>
    function:
 <programlisting>
 CREATE FUNCTION dup(int) RETURNS TABLE(f1 int, f2 text)
@@ -732,8 +696,8 @@ CREATE FUNCTION dup(int) RETURNS TABLE(f1 int, f2 text)
 
 SELECT * FROM dup(42);
 </programlisting>
-   However, a <literal>TABLE</> function is different from the
-   preceding examples, because it actually returns a <emphasis>set</>
+   However, a <literal>TABLE</literal> function is different from the
+   preceding examples, because it actually returns a <emphasis>set</emphasis>
    of records, not just one record.
   </para>
  </refsect1>
@@ -742,15 +706,15 @@ SELECT * FROM dup(42);
   <title>Writing <literal>SECURITY DEFINER</literal> Functions Safely</title>
 
   <indexterm>
-   <primary><varname>search_path</varname> configuration parameter</>
-   <secondary>use in securing functions</>
+   <primary><varname>search_path</varname> configuration parameter</primary>
+   <secondary>use in securing functions</secondary>
   </indexterm>
 
    <para>
     Because a <literal>SECURITY DEFINER</literal> function is executed
     with the privileges of the user that owns it, care is needed to
     ensure that the function cannot be misused.  For security,
-    <xref linkend="guc-search-path"> should be set to exclude any schemas
+    <xref linkend="guc-search-path"/> should be set to exclude any schemas
     writable by untrusted users.  This prevents
     malicious users from creating objects (e.g., tables, functions, and
     operators) that mask objects intended to be used by the function.
@@ -758,7 +722,7 @@ SELECT * FROM dup(42);
     temporary-table schema, which is searched first by default, and
     is normally writable by anyone.  A secure arrangement can be obtained
     by forcing the temporary schema to be searched last.  To do this,
-    write <literal>pg_temp</><indexterm><primary>pg_temp</><secondary>securing functions</></> as the last entry in <varname>search_path</>.
+    write <literal>pg_temp</literal><indexterm><primary>pg_temp</primary><secondary>securing functions</secondary></indexterm> as the last entry in <varname>search_path</varname>.
     This function illustrates safe usage:
 
 <programlisting>
@@ -778,27 +742,27 @@ $$  LANGUAGE plpgsql
     SET search_path = admin, pg_temp;
 </programlisting>
 
-    This function's intention is to access a table <literal>admin.pwds</>.
-    But without the <literal>SET</> clause, or with a <literal>SET</> clause
-    mentioning only <literal>admin</>, the function could be subverted by
-    creating a temporary table named <literal>pwds</>.
+    This function's intention is to access a table <literal>admin.pwds</literal>.
+    But without the <literal>SET</literal> clause, or with a <literal>SET</literal> clause
+    mentioning only <literal>admin</literal>, the function could be subverted by
+    creating a temporary table named <literal>pwds</literal>.
    </para>
 
    <para>
     Before <productname>PostgreSQL</productname> version 8.3, the
-    <literal>SET</> clause was not available, and so older functions may
+    <literal>SET</literal> clause was not available, and so older functions may
     contain rather complicated logic to save, set, and restore
-    <varname>search_path</>.  The <literal>SET</> clause is far easier
+    <varname>search_path</varname>.  The <literal>SET</literal> clause is far easier
     to use for this purpose.
    </para>
 
    <para>
     Another point to keep in mind is that by default, execute privilege
-    is granted to <literal>PUBLIC</> for newly created functions
-    (see <xref linkend="sql-grant"> for more
+    is granted to <literal>PUBLIC</literal> for newly created functions
+    (see <xref linkend="sql-grant"/> for more
     information).  Frequently you will wish to restrict use of a security
     definer function to only some users.  To do that, you must revoke
-    the default <literal>PUBLIC</> privileges and then grant execute
+    the default <literal>PUBLIC</literal> privileges and then grant execute
     privilege selectively.  To avoid having a window where the new function
     is accessible to all, create it and set the privileges within a single
     transaction.  For example:
@@ -818,7 +782,7 @@ COMMIT;
   <title>Compatibility</title>
 
   <para>
-   A <command>CREATE FUNCTION</command> command is defined in SQL:1999 and later.
+   A <command>CREATE FUNCTION</command> command is defined in the SQL standard.
    The <productname>PostgreSQL</productname> version is similar but
    not fully compatible.  The attributes are not portable, neither are the
    different available languages.
@@ -843,11 +807,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterfunction"></member>
-   <member><xref linkend="sql-dropfunction"></member>
-   <member><xref linkend="sql-grant"></member>
-   <member><xref linkend="sql-load"></member>
-   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="sql-alterfunction"/></member>
+   <member><xref linkend="sql-dropfunction"/></member>
+   <member><xref linkend="sql-grant"/></member>
+   <member><xref linkend="sql-load"/></member>
+   <member><xref linkend="sql-revoke"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_group.sgml b/doc/src/sgml/ref/create_group.sgml
index 158617cb93..1b8e76e326 100644
--- a/doc/src/sgml/ref/create_group.sgml
+++ b/doc/src/sgml/ref/create_group.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_group.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEGROUP">
+<refentry id="sql-creategroup">
  <indexterm zone="sql-creategroup">
   <primary>CREATE GROUP</primary>
  </indexterm>
@@ -21,23 +21,23 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+CREATE GROUP <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
       SUPERUSER | NOSUPERUSER
     | CREATEDB | NOCREATEDB
     | CREATEROLE | NOCREATEROLE
     | INHERIT | NOINHERIT
     | LOGIN | NOLOGIN
-    | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
-    | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
-    | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | SYSID <replaceable class="PARAMETER">uid</replaceable>
+    | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
+    | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
+    | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...]
+    | USER <replaceable class="parameter">role_name</replaceable> [, ...]
+    | SYSID <replaceable class="parameter">uid</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -46,7 +46,7 @@ CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <repla
 
   <para>
    <command>CREATE GROUP</command> is now an alias for
-   <xref linkend="sql-createrole">.
+   <xref linkend="sql-createrole"/>.
   </para>
  </refsect1>
 
@@ -63,7 +63,7 @@ CREATE GROUP <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <repla
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole"></member>
+   <member><xref linkend="sql-createrole"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_index.sgml b/doc/src/sgml/ref/create_index.sgml
index 83ee7d3f25..1fd21e12bd 100644
--- a/doc/src/sgml/ref/create_index.sgml
+++ b/doc/src/sgml/ref/create_index.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_index.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEINDEX">
+<refentry id="sql-createindex">
  <indexterm zone="sql-createindex">
   <primary>CREATE INDEX</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class="parameter">name</replaceable> ] ON <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">method</replaceable> ]
+CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class="parameter">name</replaceable> ] ON [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ USING <replaceable class="parameter">method</replaceable> ]
     ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ] [, ...] )
-    [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) ]
+    [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) ]
     [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
     [ WHERE <replaceable class="parameter">predicate</replaceable> ]
 </synopsis>
@@ -51,8 +51,8 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    one or more columns of the table row.  This feature can be used
    to obtain fast access to data based on some transformation of
    the basic data. For example, an index computed on
-   <literal>upper(col)</> would allow the clause
-   <literal>WHERE upper(col) = 'JIM'</> to use an index.
+   <literal>upper(col)</literal> would allow the clause
+   <literal>WHERE upper(col) = 'JIM'</literal> to use an index.
   </para>
 
   <para>
@@ -72,7 +72,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     can improve performance by creating an index on just that portion.
     Another possible application is to use <literal>WHERE</literal> with
     <literal>UNIQUE</literal> to enforce uniqueness over a subset of a
-    table.  See <xref linkend="indexes-partial"> for more discussion.
+    table.  See <xref linkend="indexes-partial"/> for more discussion.
   </para>
 
   <para>
@@ -85,7 +85,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
 
   <para>
    All functions and operators used in an index definition must be
-   <quote>immutable</>, that is, their results must depend only on
+   <quote>immutable</quote>, that is, their results must depend only on
    their arguments and never on any outside influence (such as
    the contents of another table or the current time).  This restriction
    ensures that the behavior of the index is well-defined.  To use a
@@ -108,6 +108,11 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
         insert or update data which would result in duplicate entries
         will generate an error.
        </para>
+
+       <para>
+        Additional restrictions apply when unique indexes are applied to
+        partitioned tables; see <xref linkend="sql-createtable" />.
+       </para>
       </listitem>
      </varlistentry>
 
@@ -115,13 +120,13 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
       <term><literal>CONCURRENTLY</literal></term>
       <listitem>
        <para>
-        When this option is used, <productname>PostgreSQL</> will build the
+        When this option is used, <productname>PostgreSQL</productname> will build the
         index without taking any locks that prevent concurrent inserts,
         updates, or deletes on the table; whereas a standard index build
         locks out writes (but not reads) on the table until it's done.
         There are several caveats to be aware of when using this option
-        &mdash; see <xref linkend="SQL-CREATEINDEX-CONCURRENTLY"
-        endterm="SQL-CREATEINDEX-CONCURRENTLY-title">.
+        &mdash; see <xref linkend="sql-createindex-concurrently"
+        endterm="sql-createindex-concurrently-title"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -144,13 +149,23 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
        <para>
         The name of the index to be created.  No schema name can be included
         here; the index is always created in the same schema as its parent
-        table.  If the name is omitted, <productname>PostgreSQL</> chooses a
+        table.  If the name is omitted, <productname>PostgreSQL</productname> chooses a
         suitable name based on the parent table's name and the indexed column
         name(s).
        </para>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><literal>ONLY</literal></term>
+      <listitem>
+       <para>
+        Indicates not to recurse creating indexes on partitions, if the
+        table is partitioned.  The default is to recurse.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><replaceable class="parameter">table_name</replaceable></term>
       <listitem>
@@ -166,8 +181,8 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
        <para>
         The name of the index method to be used.  Choices are
         <literal>btree</literal>, <literal>hash</literal>,
-        <literal>gist</literal>, <literal>spgist</>, <literal>gin</>, and
-        <literal>brin</>.
+        <literal>gist</literal>, <literal>spgist</literal>, <literal>gin</literal>, and
+        <literal>brin</literal>.
         The default method is <literal>btree</literal>.
        </para>
       </listitem>
@@ -217,7 +232,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ASC</></term>
+      <term><literal>ASC</literal></term>
       <listitem>
        <para>
         Specifies ascending sort order (which is the default).
@@ -226,7 +241,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
      </varlistentry>
 
      <varlistentry>
-      <term><literal>DESC</></term>
+      <term><literal>DESC</literal></term>
       <listitem>
        <para>
         Specifies descending sort order.
@@ -235,21 +250,21 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
      </varlistentry>
 
      <varlistentry>
-      <term><literal>NULLS FIRST</></term>
+      <term><literal>NULLS FIRST</literal></term>
       <listitem>
        <para>
         Specifies that nulls sort before non-nulls.  This is the default
-        when <literal>DESC</> is specified.
+        when <literal>DESC</literal> is specified.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>NULLS LAST</></term>
+      <term><literal>NULLS LAST</literal></term>
       <listitem>
        <para>
         Specifies that nulls sort after non-nulls.  This is the default
-        when <literal>DESC</> is not specified.
+        when <literal>DESC</literal> is not specified.
        </para>
       </listitem>
      </varlistentry>
@@ -259,7 +274,7 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
       <listitem>
        <para>
         The name of an index-method-specific storage parameter.  See
-        <xref linkend="sql-createindex-storage-parameters" endterm="sql-createindex-storage-parameters-title">
+        <xref linkend="sql-createindex-storage-parameters" endterm="sql-createindex-storage-parameters-title"/>
         for details.
        </para>
       </listitem>
@@ -270,8 +285,8 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
       <listitem>
        <para>
         The tablespace in which to create the index.  If not specified,
-        <xref linkend="guc-default-tablespace"> is consulted, or
-        <xref linkend="guc-temp-tablespaces"> for indexes on temporary
+        <xref linkend="guc-default-tablespace"/> is consulted, or
+        <xref linkend="guc-temp-tablespaces"/> for indexes on temporary
         tables.
        </para>
       </listitem>
@@ -288,19 +303,19 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
 
     </variablelist>
 
-  <refsect2 id="SQL-CREATEINDEX-storage-parameters">
-   <title id="SQL-CREATEINDEX-storage-parameters-title">Index Storage Parameters</title>
+  <refsect2 id="sql-createindex-storage-parameters">
+   <title id="sql-createindex-storage-parameters-title">Index Storage Parameters</title>
 
    <para>
-    The optional <literal>WITH</> clause specifies <firstterm>storage
-    parameters</> for the index.  Each index method has its own set of allowed
+    The optional <literal>WITH</literal> clause specifies <firstterm>storage
+    parameters</firstterm> for the index.  Each index method has its own set of allowed
     storage parameters.  The B-tree, hash, GiST and SP-GiST index methods all
     accept this parameter:
    </para>
 
    <variablelist>
    <varlistentry>
-    <term><literal>fillfactor</></term>
+    <term><literal>fillfactor</literal></term>
     <listitem>
      <para>
       The fillfactor for an index is a percentage that determines how full
@@ -327,14 +342,14 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
 
    <variablelist>
    <varlistentry>
-    <term><literal>buffering</></term>
+    <term><literal>buffering</literal></term>
     <listitem>
     <para>
      Determines whether the buffering build technique described in
-     <xref linkend="gist-buffering-build"> is used to build the index. With
-     <literal>OFF</> it is disabled, with <literal>ON</> it is enabled, and
-     with <literal>AUTO</> it is initially disabled, but turned on
-     on-the-fly once the index size reaches <xref linkend="guc-effective-cache-size">. The default is <literal>AUTO</>.
+     <xref linkend="gist-buffering-build"/> is used to build the index. With
+     <literal>OFF</literal> it is disabled, with <literal>ON</literal> it is enabled, and
+     with <literal>AUTO</literal> it is initially disabled, but turned on
+     on-the-fly once the index size reaches <xref linkend="guc-effective-cache-size"/>. The default is <literal>AUTO</literal>.
     </para>
     </listitem>
    </varlistentry>
@@ -346,23 +361,23 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
 
    <variablelist>
    <varlistentry>
-    <term><literal>fastupdate</></term>
+    <term><literal>fastupdate</literal></term>
     <listitem>
     <para>
      This setting controls usage of the fast update technique described in
-     <xref linkend="gin-fast-update">.  It is a Boolean parameter:
-     <literal>ON</> enables fast update, <literal>OFF</> disables it.
-     (Alternative spellings of <literal>ON</> and <literal>OFF</> are
-     allowed as described in <xref linkend="config-setting">.)  The
-     default is <literal>ON</>.
+     <xref linkend="gin-fast-update"/>.  It is a Boolean parameter:
+     <literal>ON</literal> enables fast update, <literal>OFF</literal> disables it.
+     (Alternative spellings of <literal>ON</literal> and <literal>OFF</literal> are
+     allowed as described in <xref linkend="config-setting"/>.)  The
+     default is <literal>ON</literal>.
     </para>
 
     <note>
      <para>
-      Turning <literal>fastupdate</> off via <command>ALTER INDEX</> prevents
+      Turning <literal>fastupdate</literal> off via <command>ALTER INDEX</command> prevents
       future insertions from going into the list of pending index entries,
       but does not in itself flush previous entries.  You might want to
-      <command>VACUUM</> the table or call <function>gin_clean_pending_list</>
+      <command>VACUUM</command> the table or call <function>gin_clean_pending_list</function>
       function afterward to ensure the pending list is emptied.
      </para>
     </note>
@@ -371,10 +386,10 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    </variablelist>
    <variablelist>
    <varlistentry>
-    <term><literal>gin_pending_list_limit</></term>
+    <term><literal>gin_pending_list_limit</literal></term>
     <listitem>
     <para>
-     Custom <xref linkend="guc-gin-pending-list-limit"> parameter.
+     Custom <xref linkend="guc-gin-pending-list-limit"/> parameter.
      This value is specified in kilobytes.
     </para>
     </listitem>
@@ -382,23 +397,23 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    </variablelist>
 
    <para>
-    <acronym>BRIN</> indexes accept different parameters:
+    <acronym>BRIN</acronym> indexes accept different parameters:
    </para>
 
    <variablelist>
    <varlistentry>
-    <term><literal>pages_per_range</></term>
+    <term><literal>pages_per_range</literal></term>
     <listitem>
     <para>
      Defines the number of table blocks that make up one block range for
-     each entry of a <acronym>BRIN</> index (see <xref linkend="brin-intro">
-     for more details).  The default is <literal>128</>.
+     each entry of a <acronym>BRIN</acronym> index (see <xref linkend="brin-intro"/>
+     for more details).  The default is <literal>128</literal>.
     </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autosummarize</></term>
+    <term><literal>autosummarize</literal></term>
     <listitem>
     <para>
      Defines whether a summarization run is invoked for the previous page
@@ -409,17 +424,17 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    </variablelist>
   </refsect2>
 
-  <refsect2 id="SQL-CREATEINDEX-CONCURRENTLY">
-   <title id="SQL-CREATEINDEX-CONCURRENTLY-title">Building Indexes Concurrently</title>
+  <refsect2 id="sql-createindex-concurrently">
+   <title id="sql-createindex-concurrently-title">Building Indexes Concurrently</title>
 
-   <indexterm zone="SQL-CREATEINDEX-CONCURRENTLY">
+   <indexterm zone="sql-createindex-concurrently">
    <primary>index</primary>
    <secondary>building concurrently</secondary>
    </indexterm>
 
    <para>
     Creating an index can interfere with regular operation of a database.
-    Normally <productname>PostgreSQL</> locks the table to be indexed against
+    Normally <productname>PostgreSQL</productname> locks the table to be indexed against
     writes and performs the entire index build with a single scan of the
     table. Other transactions can still read the table, but if they try to
     insert, update, or delete rows in the table they will block until the
@@ -430,11 +445,11 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
    </para>
 
    <para>
-    <productname>PostgreSQL</> supports building indexes without locking
+    <productname>PostgreSQL</productname> supports building indexes without locking
     out writes.  This method is invoked by specifying the
-    <literal>CONCURRENTLY</> option of <command>CREATE INDEX</>.
+    <literal>CONCURRENTLY</literal> option of <command>CREATE INDEX</command>.
     When this option is used,
-    <productname>PostgreSQL</> must perform two scans of the table, and in
+    <productname>PostgreSQL</productname> must perform two scans of the table, and in
     addition it must wait for all existing transactions that could potentially
     modify or use the index to terminate.  Thus
     this method requires more total work than a standard index build and takes
@@ -450,9 +465,9 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
     two more transactions.  Before each table scan, the index build must
     wait for existing transactions that have modified the table to terminate.
     After the second scan, the index build must wait for any transactions
-    that have a snapshot (see <xref linkend="mvcc">) predating the second
+    that have a snapshot (see <xref linkend="mvcc"/>) predating the second
     scan to terminate.  Then finally the index can be marked ready for use,
-    and the <command>CREATE INDEX</> command terminates.
+    and the <command>CREATE INDEX</command> command terminates.
     Even then, however, the index may not be immediately usable for queries:
     in the worst case, it cannot be used as long as transactions exist that
     predate the start of the index build.
@@ -460,11 +475,11 @@ CREATE [ UNIQUE ] INDEX [ CONCURRENTLY ] [ [ IF NOT EXISTS ] <replaceable class=
 
    <para>
     If a problem arises while scanning the table, such as a deadlock or a
-    uniqueness violation in a unique index, the <command>CREATE INDEX</>
-    command will fail but leave behind an <quote>invalid</> index. This index
+    uniqueness violation in a unique index, the <command>CREATE INDEX</command>
+    command will fail but leave behind an <quote>invalid</quote> index. This index
     will be ignored for querying purposes because it might be incomplete;
-    however it will still consume update overhead. The <application>psql</>
-    <command>\d</> command will report such an index as <literal>INVALID</>:
+    however it will still consume update overhead. The <application>psql</application>
+    <command>\d</command> command will report such an index as <literal>INVALID</literal>:
 
 <programlisting>
 postgres=# \d tab
@@ -478,8 +493,8 @@ Indexes:
 
     The recommended recovery
     method in such cases is to drop the index and try again to perform
-    <command>CREATE INDEX CONCURRENTLY</>.  (Another possibility is to rebuild
-    the index with <command>REINDEX</>.  However, since <command>REINDEX</>
+    <command>CREATE INDEX CONCURRENTLY</command>.  (Another possibility is to rebuild
+    the index with <command>REINDEX</command>.  However, since <command>REINDEX</command>
     does not support concurrent builds, this option is unlikely to seem
     attractive.)
    </para>
@@ -490,7 +505,7 @@ Indexes:
     when the second table scan begins.  This means that constraint violations
     could be reported in other queries prior to the index becoming available
     for use, or even in cases where the index build eventually fails.  Also,
-    if a failure does occur in the second scan, the <quote>invalid</> index
+    if a failure does occur in the second scan, the <quote>invalid</quote> index
     continues to enforce its uniqueness constraint afterwards.
    </para>
 
@@ -505,8 +520,8 @@ Indexes:
     same table to occur in parallel, but only one concurrent index build
     can occur on a table at a time.  In both cases, no other types of schema
     modification on the table are allowed meanwhile.  Another difference
-    is that a regular <command>CREATE INDEX</> command can be performed within
-    a transaction block, but <command>CREATE INDEX CONCURRENTLY</> cannot.
+    is that a regular <command>CREATE INDEX</command> command can be performed within
+    a transaction block, but <command>CREATE INDEX CONCURRENTLY</command> cannot.
    </para>
   </refsect2>
  </refsect1>
@@ -515,7 +530,7 @@ Indexes:
   <title>Notes</title>
 
   <para>
-   See <xref linkend="indexes"> for information about when indexes can
+   See <xref linkend="indexes"/> for information about when indexes can
    be used, when they are not used, and in which particular situations
    they can be useful.
   </para>
@@ -541,35 +556,114 @@ Indexes:
    type either by absolute value or by real part. We could do this by
    defining two operator classes for the data type and then selecting
    the proper class when making an index.  More information about
-   operator classes is in <xref linkend="indexes-opclass"> and in <xref
-   linkend="xindex">.
+   operator classes is in <xref linkend="indexes-opclass"/> and in <xref
+   linkend="xindex"/>.
+  </para>
+
+  <para>
+   When <literal>CREATE INDEX</literal> is invoked on a partitioned
+   table, the default behavior is to recurse to all partitions to ensure
+   they all have matching indexes.
+   Each partition is first checked to determine whether an equivalent
+   index already exists, and if so, that index will become attached as a
+   partition index to the index being created, which will become its
+   parent index.
+   If no matching index exists, a new index will be created and
+   automatically attached; the name of the new index in each partition
+   will be determined as if no index name had been specified in the
+   command.
+   If the <literal>ONLY</literal> option is specified, no recursion
+   is done, and the index is marked invalid
+   (<command>ALTER INDEX ... ATTACH PARTITION</command> turns the index
+   valid, once all partitions acquire the index.)  Note, however, that
+   any partition that is created in the future using
+   <command>CREATE TABLE ... PARTITION OF</command> will automatically
+   contain the index regardless of whether this option was specified.
   </para>
 
   <para>
    For index methods that support ordered scans (currently, only B-tree),
-   the optional clauses <literal>ASC</>, <literal>DESC</>, <literal>NULLS
-   FIRST</>, and/or <literal>NULLS LAST</> can be specified to modify
+   the optional clauses <literal>ASC</literal>, <literal>DESC</literal>, <literal>NULLS
+   FIRST</literal>, and/or <literal>NULLS LAST</literal> can be specified to modify
    the sort ordering of the index.  Since an ordered index can be
    scanned either forward or backward, it is not normally useful to create a
-   single-column <literal>DESC</> index &mdash; that sort ordering is already
+   single-column <literal>DESC</literal> index &mdash; that sort ordering is already
    available with a regular index.  The value of these options is that
    multicolumn indexes can be created that match the sort ordering requested
    by a mixed-ordering query, such as <literal>SELECT ... ORDER BY x ASC, y
-   DESC</>.  The <literal>NULLS</> options are useful if you need to support
-   <quote>nulls sort low</> behavior, rather than the default <quote>nulls
-   sort high</>, in queries that depend on indexes to avoid sorting steps.
+   DESC</literal>.  The <literal>NULLS</literal> options are useful if you need to support
+   <quote>nulls sort low</quote> behavior, rather than the default <quote>nulls
+   sort high</quote>, in queries that depend on indexes to avoid sorting steps.
   </para>
 
   <para>
    For most index methods, the speed of creating an index is
-   dependent on the setting of <xref linkend="guc-maintenance-work-mem">.
+   dependent on the setting of <xref linkend="guc-maintenance-work-mem"/>.
    Larger values will reduce the time needed for index creation, so long
    as you don't make it larger than the amount of memory really available,
    which would drive the machine into swapping.
   </para>
 
   <para>
-   Use <xref linkend="sql-dropindex">
+   <productname>PostgreSQL</productname> can build indexes while
+   leveraging multiple CPUs in order to process the table rows faster.
+   This feature is known as <firstterm>parallel index
+   build</firstterm>.  For index methods that support building indexes
+   in parallel (currently, only B-tree),
+   <varname>maintenance_work_mem</varname> specifies the maximum
+   amount of memory that can be used by each index build operation as
+   a whole, regardless of how many worker processes were started.
+   Generally, a cost model automatically determines how many worker
+   processes should be requested, if any.
+  </para>
+
+  <para>
+   Parallel index builds may benefit from increasing
+   <varname>maintenance_work_mem</varname> where an equivalent serial
+   index build will see little or no benefit.  Note that
+   <varname>maintenance_work_mem</varname> may influence the number of
+   worker processes requested, since parallel workers must have at
+   least a <literal>32MB</literal> share of the total
+   <varname>maintenance_work_mem</varname> budget.  There must also be
+   a remaining <literal>32MB</literal> share for the leader process.
+   Increasing <xref linkend="guc-max-parallel-workers-maintenance"/>
+   may allow more workers to be used, which will reduce the time
+   needed for index creation, so long as the index build is not
+   already I/O bound.  Of course, there should also be sufficient
+   CPU capacity that would otherwise lie idle.
+  </para>
+
+  <para>
+   Setting a value for <literal>parallel_workers</literal> via <xref
+   linkend="sql-altertable"/> directly controls how many parallel
+   worker processes will be requested by a <command>CREATE
+   INDEX</command> against the table.  This bypasses the cost model
+   completely, and prevents <varname>maintenance_work_mem</varname>
+   from affecting how many parallel workers are requested.  Setting
+   <literal>parallel_workers</literal> to 0 via <command>ALTER
+   TABLE</command> will disable parallel index builds on the table in
+   all cases.
+  </para>
+
+  <tip>
+   <para>
+    You might want to reset <literal>parallel_workers</literal> after
+    setting it as part of tuning an index build.  This avoids
+    inadvertent changes to query plans, since
+    <literal>parallel_workers</literal> affects
+    <emphasis>all</emphasis> parallel table scans.
+   </para>
+  </tip>
+
+  <para>
+   While <command>CREATE INDEX</command> with the
+   <literal>CONCURRENTLY</literal> option supports parallel builds
+   without special restrictions, only the first table scan is actually
+   performed in parallel.
+  </para>
+
+  <para>
+   Use <xref linkend="sql-dropindex"/>
    to remove an index.
   </para>
 
@@ -577,8 +671,8 @@ Indexes:
    Prior releases of <productname>PostgreSQL</productname> also had an
    R-tree index method.  This method has been removed because
    it had no significant advantages over the GiST method.
-   If <literal>USING rtree</> is specified, <command>CREATE INDEX</>
-   will interpret it as <literal>USING gist</>, to simplify conversion
+   If <literal>USING rtree</literal> is specified, <command>CREATE INDEX</command>
+   will interpret it as <literal>USING gist</literal>, to simplify conversion
    of old databases to GiST.
   </para>
  </refsect1>
@@ -595,13 +689,13 @@ CREATE UNIQUE INDEX title_idx ON films (title);
   </para>
 
   <para>
-   To create an index on the expression <literal>lower(title)</>,
+   To create an index on the expression <literal>lower(title)</literal>,
    allowing efficient case-insensitive searches:
 <programlisting>
 CREATE INDEX ON films ((lower(title)));
 </programlisting>
    (In this example we have chosen to omit the index name, so the system
-   will choose a name, typically <literal>films_lower_idx</>.)
+   will choose a name, typically <literal>films_lower_idx</literal>.)
   </para>
 
   <para>
@@ -626,16 +720,16 @@ CREATE UNIQUE INDEX title_idx ON films (title) WITH (fillfactor = 70);
   </para>
 
   <para>
-   To create a <acronym>GIN</> index with fast updates disabled:
+   To create a <acronym>GIN</acronym> index with fast updates disabled:
 <programlisting>
 CREATE INDEX gin_idx ON documents_table USING GIN (locations) WITH (fastupdate = off);
 </programlisting>
   </para>
 
   <para>
-   To create an index on the column <literal>code</> in the table
-   <literal>films</> and have the index reside in the tablespace
-   <literal>indexspace</>:
+   To create an index on the column <literal>code</literal> in the table
+   <literal>films</literal> and have the index reside in the tablespace
+   <literal>indexspace</literal>:
 <programlisting>
 CREATE INDEX code_idx ON films (code) TABLESPACE indexspace;
 </programlisting>
@@ -675,8 +769,8 @@ CREATE INDEX CONCURRENTLY sales_quantity_index ON sales_table (quantity);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterindex"></member>
-   <member><xref linkend="sql-dropindex"></member>
+   <member><xref linkend="sql-alterindex"/></member>
+   <member><xref linkend="sql-dropindex"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_language.sgml b/doc/src/sgml/ref/create_language.sgml
index 75165b677f..6bb69cf0ef 100644
--- a/doc/src/sgml/ref/create_language.sgml
+++ b/doc/src/sgml/ref/create_language.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_language.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATELANGUAGE">
+<refentry id="sql-createlanguage">
  <indexterm zone="sql-createlanguage">
   <primary>CREATE LANGUAGE</primary>
  </indexterm>
@@ -40,14 +40,14 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   <note>
    <para>
     As of <productname>PostgreSQL</productname> 9.1, most procedural
-    languages have been made into <quote>extensions</>, and should
-    therefore be installed with <xref linkend="sql-createextension">
+    languages have been made into <quote>extensions</quote>, and should
+    therefore be installed with <xref linkend="sql-createextension"/>
     not <command>CREATE LANGUAGE</command>.  Direct use of
     <command>CREATE LANGUAGE</command> should now be confined to
-    extension installation scripts.  If you have a <quote>bare</>
+    extension installation scripts.  If you have a <quote>bare</quote>
     language in your database, perhaps as a result of an upgrade,
     you can convert it to an extension using
-    <literal>CREATE EXTENSION <replaceable>langname</> FROM
+    <literal>CREATE EXTENSION <replaceable>langname</replaceable> FROM
     unpackaged</literal>.
    </para>
   </note>
@@ -55,7 +55,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   <para>
    <command>CREATE LANGUAGE</command> effectively associates the
    language name with handler function(s) that are responsible for executing
-   functions written in the language.  Refer to <xref linkend="plhandler">
+   functions written in the language.  Refer to <xref linkend="plhandler"/>
    for more information about language handlers.
   </para>
 
@@ -67,11 +67,11 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
    system catalog to determine the correct parameters.  In the second form,
    the user supplies the language parameters along with the language name.
    The second form can be used to create a language that is not defined in
-   <structname>pg_pltemplate</>, but this approach is considered obsolescent.
+   <structname>pg_pltemplate</structname>, but this approach is considered obsolescent.
   </para>
 
   <para>
-   When the server finds an entry in the <structname>pg_pltemplate</> catalog
+   When the server finds an entry in the <structname>pg_pltemplate</structname> catalog
    for the given language name, it will use the catalog data even if the
    command includes language parameters.  This behavior simplifies loading of
    old dump files, which are likely to contain out-of-date information
@@ -84,7 +84,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
    register a new language.  However, the owner of a database can register
    a new language within that database if the language is listed in
    the <structname>pg_pltemplate</structname> catalog and is marked
-   as allowed to be created by database owners (<structfield>tmpldbacreate</>
+   as allowed to be created by database owners (<structfield>tmpldbacreate</structfield>
    is true).  The default is that trusted languages can be created
    by database owners, but this can be adjusted by superusers by modifying
    the contents of <structname>pg_pltemplate</structname>.
@@ -101,9 +101,9 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
    and any existing functions written in the language are assumed to still
    be valid.  In addition to the normal privilege requirements for creating
    a language, the user must be superuser or owner of the existing language.
-   The <literal>REPLACE</> case is mainly meant to be used to
+   The <literal>REPLACE</literal> case is mainly meant to be used to
    ensure that the language exists.  If the language has a
-   <structname>pg_pltemplate</structname> entry then <literal>REPLACE</>
+   <structname>pg_pltemplate</structname> entry then <literal>REPLACE</literal>
    will not actually change anything about an existing definition, except in
    the unusual case where the <structname>pg_pltemplate</structname> entry
    has been modified since the language was created.
@@ -178,15 +178,15 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
       <para><replaceable class="parameter">inline_handler</replaceable> is the
        name of a previously registered function that will be called
        to execute an anonymous code block
-       (<xref linkend="sql-do"> command)
+       (<xref linkend="sql-do"/> command)
        in this language.
        If no <replaceable class="parameter">inline_handler</replaceable>
        function is specified, the language does not support anonymous code
        blocks.
        The handler function must take one argument of
-       type <type>internal</type>, which will be the <command>DO</> command's
+       type <type>internal</type>, which will be the <command>DO</command> command's
        internal representation, and it will typically return
-       <type>void</>.  The return value of the handler is ignored.
+       <type>void</type>.  The return value of the handler is ignored.
       </para>
      </listitem>
     </varlistentry>
@@ -204,7 +204,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
        be checked when it is created.
        The validator function must take one argument of
        type <type>oid</type>, which will be the OID of the
-       to-be-created function, and will typically return <type>void</>.
+       to-be-created function, and will typically return <type>void</type>.
       </para>
 
       <para>
@@ -220,9 +220,9 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
    </variablelist>
 
   <para>
-   The <literal>TRUSTED</> option and the support function name(s) are
+   The <literal>TRUSTED</literal> option and the support function name(s) are
    ignored if the server has an entry for the specified language
-   name in <structname>pg_pltemplate</>.
+   name in <structname>pg_pltemplate</structname>.
   </para>
  </refsect1>
 
@@ -230,12 +230,12 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="sql-droplanguage"> to drop procedural languages.
+   Use <xref linkend="sql-droplanguage"/> to drop procedural languages.
   </para>
 
   <para>
    The system catalog <classname>pg_language</classname> (see <xref
-   linkend="catalog-pg-language">) records information about the
+   linkend="catalog-pg-language"/>) records information about the
    currently installed languages.  Also, the <application>psql</application>
    command <command>\dL</command> lists the installed languages.
   </para>
@@ -243,7 +243,7 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   <para>
    To create functions in a procedural language, a user must have the
    <literal>USAGE</literal> privilege for the language.  By default,
-   <literal>USAGE</> is granted to <literal>PUBLIC</> (i.e., everyone)
+   <literal>USAGE</literal> is granted to <literal>PUBLIC</literal> (i.e., everyone)
    for trusted languages.  This can be revoked if desired.
   </para>
 
@@ -258,10 +258,10 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
    The call handler function, the inline handler function (if any),
    and the validator function (if any)
    must already exist if the server does not have an entry for the language
-   in <structname>pg_pltemplate</>.  But when there is an entry,
+   in <structname>pg_pltemplate</structname>.  But when there is an entry,
    the functions need not already exist;
    they will be automatically defined if not present in the database.
-   (This might result in <command>CREATE LANGUAGE</> failing, if the
+   (This might result in <command>CREATE LANGUAGE</command> failing, if the
    shared library that implements the language is not available in
    the installation.)
   </para>
@@ -269,11 +269,11 @@ CREATE [ OR REPLACE ] [ TRUSTED ] [ PROCEDURAL ] LANGUAGE <replaceable class="pa
   <para>
    In <productname>PostgreSQL</productname> versions before 7.3, it was
    necessary to declare handler functions as returning the placeholder
-   type <type>opaque</>, rather than <type>language_handler</>.
+   type <type>opaque</type>, rather than <type>language_handler</type>.
    To support loading
-   of old dump files, <command>CREATE LANGUAGE</> will accept a function
-   declared as returning <type>opaque</>, but it will issue a notice and
-   change the function's declared return type to <type>language_handler</>.
+   of old dump files, <command>CREATE LANGUAGE</command> will accept a function
+   declared as returning <type>opaque</type>, but it will issue a notice and
+   change the function's declared return type to <type>language_handler</type>.
   </para>
  </refsect1>
 
@@ -289,7 +289,7 @@ CREATE LANGUAGE plperl;
   </para>
 
   <para>
-   For a language not known in the <structname>pg_pltemplate</> catalog, a
+   For a language not known in the <structname>pg_pltemplate</structname> catalog, a
    sequence such as this is needed:
 <programlisting>
 CREATE FUNCTION plsample_call_handler() RETURNS language_handler
@@ -313,11 +313,11 @@ CREATE LANGUAGE plsample
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterlanguage"></member>
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-droplanguage"></member>
-   <member><xref linkend="sql-grant"></member>
-   <member><xref linkend="sql-revoke"></member>
+   <member><xref linkend="sql-alterlanguage"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-droplanguage"/></member>
+   <member><xref linkend="sql-grant"/></member>
+   <member><xref linkend="sql-revoke"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_materialized_view.sgml b/doc/src/sgml/ref/create_materialized_view.sgml
index a8fb84e7a7..eed4273c4b 100644
--- a/doc/src/sgml/ref/create_materialized_view.sgml
+++ b/doc/src/sgml/ref/create_materialized_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_materialized_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEMATERIALIZEDVIEW">
+<refentry id="sql-creatematerializedview">
  <indexterm zone="sql-creatematerializedview">
   <primary>CREATE MATERIALIZED VIEW</primary>
  </indexterm>
@@ -23,8 +23,8 @@ PostgreSQL documentation
 <synopsis>
 CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
     [ (<replaceable>column_name</replaceable> [, ...] ) ]
-    [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ]
-    [ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+    [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
+    [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
     AS <replaceable>query</replaceable>
     [ WITH [ NO ] DATA ]
 </synopsis>
@@ -36,13 +36,13 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
   <para>
    <command>CREATE MATERIALIZED VIEW</command> defines a materialized view of
    a query.  The query is executed and used to populate the view at the time
-   the command is issued (unless <command>WITH NO DATA</> is used) and may be
+   the command is issued (unless <command>WITH NO DATA</command> is used) and may be
    refreshed later using <command>REFRESH MATERIALIZED VIEW</command>.
   </para>
 
   <para>
    <command>CREATE MATERIALIZED VIEW</command> is similar to
-   <command>CREATE TABLE AS</>, except that it also remembers the query used
+   <command>CREATE TABLE AS</command>, except that it also remembers the query used
    to initialize the view, so that it can be refreshed later upon demand.
    A materialized view has many of the same properties as a table, but there
    is no support for temporary materialized views or automatic generation of
@@ -55,7 +55,7 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a materialized view with the same name already
@@ -87,27 +87,27 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term>
+    <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies optional storage parameters for the new
       materialized view; see <xref linkend="sql-createtable-storage-parameters"
-      endterm="sql-createtable-storage-parameters-title"> for more
+      endterm="sql-createtable-storage-parameters-title"/> for more
       information.  All parameters supported for <literal>CREATE
       TABLE</literal> are also supported for <literal>CREATE MATERIALIZED
       VIEW</literal> with the exception of <literal>OIDS</literal>.
-      See <xref linkend="sql-createtable"> for more information.
+      See <xref linkend="sql-createtable"/> for more information.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term>
+    <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term>
     <listitem>
      <para>
-      The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name
+      The <replaceable class="parameter">tablespace_name</replaceable> is the name
       of the tablespace in which the new materialized view is to be created.
-      If not specified, <xref linkend="guc-default-tablespace"> is consulted.
+      If not specified, <xref linkend="guc-default-tablespace"/> is consulted.
      </para>
     </listitem>
    </varlistentry>
@@ -116,8 +116,8 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
     <term><replaceable>query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select">, <link linkend="sql-table">TABLE</link>,
-      or <xref linkend="sql-values"> command.  This query will run within a
+      A <xref linkend="sql-select"/>, <link linkend="sql-table">TABLE</link>,
+      or <xref linkend="sql-values"/> command.  This query will run within a
       security-restricted operation; in particular, calls to functions that
       themselves create temporary tables will fail.
      </para>
@@ -125,13 +125,13 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH [ NO ] DATA</></term>
+    <term><literal>WITH [ NO ] DATA</literal></term>
     <listitem>
      <para>
       This clause specifies whether or not the materialized view should be
       populated at creation time.  If not, the materialized view will be
       flagged as unscannable and cannot be queried until <command>REFRESH
-      MATERIALIZED VIEW</> is used.
+      MATERIALIZED VIEW</command> is used.
      </para>
     </listitem>
    </varlistentry>
@@ -152,11 +152,11 @@ CREATE MATERIALIZED VIEW [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altermaterializedview"></member>
-   <member><xref linkend="sql-createtableas"></member>
-   <member><xref linkend="sql-createview"></member>
-   <member><xref linkend="sql-dropmaterializedview"></member>
-   <member><xref linkend="sql-refreshmaterializedview"></member>
+   <member><xref linkend="sql-altermaterializedview"/></member>
+   <member><xref linkend="sql-createtableas"/></member>
+   <member><xref linkend="sql-createview"/></member>
+   <member><xref linkend="sql-dropmaterializedview"/></member>
+   <member><xref linkend="sql-refreshmaterializedview"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_opclass.sgml b/doc/src/sgml/ref/create_opclass.sgml
index 829d8f2fff..0714aeca7c 100644
--- a/doc/src/sgml/ref/create_opclass.sgml
+++ b/doc/src/sgml/ref/create_opclass.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_opclass.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEOPCLASS">
+<refentry id="sql-createopclass">
  <indexterm zone="sql-createopclass">
   <primary>CREATE OPERATOR CLASS</primary>
  </indexterm>
@@ -37,7 +37,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
    <command>CREATE OPERATOR CLASS</command> creates a new operator class.
    An operator class defines how a particular data type can be used with
    an index.  The operator class specifies that certain operators will fill
-   particular roles or <quote>strategies</> for this data type and this
+   particular roles or <quote>strategies</quote> for this data type and this
    index method.  The operator class also specifies the support procedures to
    be used by
    the index method when the operator class is selected for an
@@ -69,15 +69,15 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
 
   <para>
    Related operator classes can be grouped into <firstterm>operator
-   families</>.  To add a new operator class to an existing family,
-   specify the <literal>FAMILY</> option in <command>CREATE OPERATOR
+   families</firstterm>.  To add a new operator class to an existing family,
+   specify the <literal>FAMILY</literal> option in <command>CREATE OPERATOR
    CLASS</command>.  Without this option, the new class is placed into
    a family named the same as the new class (creating that family if
    it doesn't already exist).
   </para>
 
   <para>
-   Refer to <xref linkend="xindex"> for further information.
+   Refer to <xref linkend="xindex"/> for further information.
   </para>
  </refsect1>
 
@@ -96,7 +96,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
    </varlistentry>
 
    <varlistentry>
-    <term><literal>DEFAULT</></term>
+    <term><literal>DEFAULT</literal></term>
     <listitem>
      <para>
       If present, the operator class will become the default
@@ -159,15 +159,15 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
     <term><replaceable class="parameter">op_type</replaceable></term>
     <listitem>
      <para>
-      In an <literal>OPERATOR</> clause,
-      the operand data type(s) of the operator, or <literal>NONE</> to
+      In an <literal>OPERATOR</literal> clause,
+      the operand data type(s) of the operator, or <literal>NONE</literal> to
       signify a left-unary or right-unary operator.  The operand data
       types can be omitted in the normal case where they are the same
       as the operator class's data type.
      </para>
 
      <para>
-      In a <literal>FUNCTION</> clause, the operand data type(s) the
+      In a <literal>FUNCTION</literal> clause, the operand data type(s) the
       function is intended to support, if different from
       the input data type(s) of the function (for B-tree comparison functions
       and hash functions)
@@ -175,7 +175,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       functions in GiST, SP-GiST, GIN and BRIN operator classes).  These defaults
       are correct, and so <replaceable
       class="parameter">op_type</replaceable> need not be specified in
-      <literal>FUNCTION</> clauses, except for the case of a B-tree sort
+      <literal>FUNCTION</literal> clauses, except for the case of a B-tree sort
       support function that is meant to support cross-data-type comparisons.
      </para>
     </listitem>
@@ -191,8 +191,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
      </para>
 
      <para>
-      If neither <literal>FOR SEARCH</> nor <literal>FOR ORDER BY</> is
-      specified, <literal>FOR SEARCH</> is the default.
+      If neither <literal>FOR SEARCH</literal> nor <literal>FOR ORDER BY</literal> is
+      specified, <literal>FOR SEARCH</literal> is the default.
      </para>
     </listitem>
    </varlistentry>
@@ -233,11 +233,11 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
       The data type actually stored in the index.  Normally this is
       the same as the column data type, but some index methods
       (currently GiST, GIN and BRIN) allow it to be different.  The
-      <literal>STORAGE</> clause must be omitted unless the index
+      <literal>STORAGE</literal> clause must be omitted unless the index
       method allows a different type to be used.
-      If the column <replaceable class="parameter">data_type</> is specified
-      as <type>anyarray</>, the <replaceable class="parameter">storage_type</>
-      can be declared as <type>anyelement</> to indicate that the index
+      If the column <replaceable class="parameter">data_type</replaceable> is specified
+      as <type>anyarray</type>, the <replaceable class="parameter">storage_type</replaceable>
+      can be declared as <type>anyelement</type> to indicate that the index
       entries are members of the element type belonging to the actual array
       type that each particular index is created for.
      </para>
@@ -246,7 +246,7 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
   </variablelist>
 
   <para>
-   The <literal>OPERATOR</>, <literal>FUNCTION</>, and <literal>STORAGE</>
+   The <literal>OPERATOR</literal>, <literal>FUNCTION</literal>, and <literal>STORAGE</literal>
    clauses can appear in any order.
   </para>
  </refsect1>
@@ -269,9 +269,9 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
   </para>
 
   <para>
-   Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</>
-   clause could include a <literal>RECHECK</> option.  This is no longer
-   supported because whether an index operator is <quote>lossy</> is now
+   Before <productname>PostgreSQL</productname> 8.4, the <literal>OPERATOR</literal>
+   clause could include a <literal>RECHECK</literal> option.  This is no longer
+   supported because whether an index operator is <quote>lossy</quote> is now
    determined on-the-fly at run time.  This allows efficient handling of
    cases where an operator might or might not be lossy.
   </para>
@@ -282,8 +282,8 @@ CREATE OPERATOR CLASS <replaceable class="parameter">name</replaceable> [ DEFAUL
 
   <para>
    The following example command defines a GiST index operator class
-   for the data type <literal>_int4</> (array of <type>int4</type>).  See the
-   <xref linkend="intarray"> module for the complete example.
+   for the data type <literal>_int4</literal> (array of <type>int4</type>).  See the
+   <xref linkend="intarray"/> module for the complete example.
   </para>
 
 <programlisting>
@@ -319,10 +319,10 @@ CREATE OPERATOR CLASS gist__int_ops
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropclass"></member>
-   <member><xref linkend="sql-dropopclass"></member>
-   <member><xref linkend="sql-createopfamily"></member>
-   <member><xref linkend="sql-alteropfamily"></member>
+   <member><xref linkend="sql-alteropclass"/></member>
+   <member><xref linkend="sql-dropopclass"/></member>
+   <member><xref linkend="sql-createopfamily"/></member>
+   <member><xref linkend="sql-alteropfamily"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_operator.sgml b/doc/src/sgml/ref/create_operator.sgml
index 818e3a2315..35f2f46985 100644
--- a/doc/src/sgml/ref/create_operator.sgml
+++ b/doc/src/sgml/ref/create_operator.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_operator.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEOPERATOR">
+<refentry id="sql-createoperator">
  <indexterm zone="sql-createoperator">
   <primary>CREATE OPERATOR</primary>
  </indexterm>
@@ -43,7 +43,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
   </para>
 
   <para>
-   The operator name is a sequence of up to <symbol>NAMEDATALEN</>-1
+   The operator name is a sequence of up to <symbol>NAMEDATALEN</symbol>-1
    (63 by default) characters from the following list:
 <literallayout>
 + - * / &lt; &gt; = ~ ! @ # % ^ &amp; | ` ?
@@ -72,7 +72,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
     </listitem>
     <listitem>
      <para>
-     The use of <literal>=&gt;</> as an operator name is deprecated.  It may
+     The use of <literal>=&gt;</literal> as an operator name is deprecated.  It may
      be disallowed altogether in a future release.
      </para>
     </listitem>
@@ -86,10 +86,10 @@ CREATE OPERATOR <replaceable>name</replaceable> (
   </para>
 
   <para>
-   At least one of <literal>LEFTARG</> and <literal>RIGHTARG</> must be defined.  For
+   At least one of <literal>LEFTARG</literal> and <literal>RIGHTARG</literal> must be defined.  For
    binary operators, both must be defined. For right  unary
-   operators, only <literal>LEFTARG</> should be defined, while for left
-   unary operators only <literal>RIGHTARG</> should be defined.
+   operators, only <literal>LEFTARG</literal> should be defined, while for left
+   unary operators only <literal>RIGHTARG</literal> should be defined.
   </para>
 
   <para>
@@ -101,7 +101,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
 
   <para>
    The other clauses specify optional operator optimization clauses.
-   Their meaning is detailed in <xref linkend="xoper-optimization">.
+   Their meaning is detailed in <xref linkend="xoper-optimization"/>.
   </para>
 
   <para>
@@ -122,11 +122,11 @@ CREATE OPERATOR <replaceable>name</replaceable> (
        <para>
         The name of the operator to be defined. See above for allowable
         characters.  The name can be schema-qualified, for example
-        <literal>CREATE OPERATOR myschema.+ (...)</>.  If not, then
+        <literal>CREATE OPERATOR myschema.+ (...)</literal>.  If not, then
         the operator is created in the current schema.  Two operators
         in the same schema can have the same name if they operate on
         different data types.  This is called
-        <firstterm>overloading</>.
+        <firstterm>overloading</firstterm>.
        </para>
       </listitem>
      </varlistentry>
@@ -218,7 +218,7 @@ CREATE OPERATOR <replaceable>name</replaceable> (
   <para>
    To give a schema-qualified operator name in <replaceable
    class="parameter">com_op</replaceable> or the other optional
-   arguments, use the <literal>OPERATOR()</> syntax, for example:
+   arguments, use the <literal>OPERATOR()</literal> syntax, for example:
 <programlisting>
 COMMUTATOR = OPERATOR(myschema.===) ,
 </programlisting></para>
@@ -228,28 +228,28 @@ COMMUTATOR = OPERATOR(myschema.===) ,
   <title>Notes</title>
 
   <para>
-   Refer to <xref linkend="xoper"> for further information.
+   Refer to <xref linkend="xoper"/> for further information.
   </para>
 
   <para>
    It is not possible to specify an operator's lexical precedence in
-   <command>CREATE OPERATOR</>, because the parser's precedence behavior
-   is hard-wired.  See <xref linkend="sql-precedence"> for precedence details.
+   <command>CREATE OPERATOR</command>, because the parser's precedence behavior
+   is hard-wired.  See <xref linkend="sql-precedence"/> for precedence details.
   </para>
 
   <para>
-   The obsolete options <literal>SORT1</>, <literal>SORT2</>,
-   <literal>LTCMP</>, and <literal>GTCMP</> were formerly used to
+   The obsolete options <literal>SORT1</literal>, <literal>SORT2</literal>,
+   <literal>LTCMP</literal>, and <literal>GTCMP</literal> were formerly used to
    specify the names of sort operators associated with a merge-joinable
    operator.  This is no longer necessary, since information about
    associated operators is found by looking at B-tree operator families
    instead.  If one of these options is given, it is ignored except
-   for implicitly setting <literal>MERGES</> true.
+   for implicitly setting <literal>MERGES</literal> true.
   </para>
 
   <para>
-   Use <xref linkend="sql-dropoperator"> to delete user-defined operators
-   from a database.  Use <xref linkend="sql-alteroperator"> to modify operators in a
+   Use <xref linkend="sql-dropoperator"/> to delete user-defined operators
+   from a database.  Use <xref linkend="sql-alteroperator"/> to modify operators in a
    database.
   </para>
  </refsect1>
@@ -288,9 +288,9 @@ CREATE OPERATOR === (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteroperator"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-dropoperator"></member>
+   <member><xref linkend="sql-alteroperator"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-dropoperator"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_opfamily.sgml b/doc/src/sgml/ref/create_opfamily.sgml
index c4bcf0863e..ba612c2f2b 100644
--- a/doc/src/sgml/ref/create_opfamily.sgml
+++ b/doc/src/sgml/ref/create_opfamily.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_opfamily.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEOPFAMILY">
+<refentry id="sql-createopfamily">
  <indexterm zone="sql-createopfamily">
   <primary>CREATE OPERATOR FAMILY</primary>
  </indexterm>
@@ -35,7 +35,7 @@ CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <
    compatible with these operator classes but not essential for the
    functioning of any individual index.  (Operators and functions that
    are essential to indexes should be grouped within the relevant operator
-   class, rather than being <quote>loose</> in the operator family.
+   class, rather than being <quote>loose</quote> in the operator family.
    Typically, single-data-type operators are bound to operator classes,
    while cross-data-type operators can be loose in an operator family
    containing operator classes for both data types.)
@@ -45,7 +45,7 @@ CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <
    The new operator family is initially empty.  It should be populated
    by issuing subsequent <command>CREATE OPERATOR CLASS</command> commands
    to add contained operator classes, and optionally
-   <command>ALTER OPERATOR FAMILY</command> commands to add <quote>loose</>
+   <command>ALTER OPERATOR FAMILY</command> commands to add <quote>loose</quote>
    operators and their corresponding support functions.
   </para>
 
@@ -64,7 +64,7 @@ CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <
   </para>
 
   <para>
-   Refer to <xref linkend="xindex"> for further information.
+   Refer to <xref linkend="xindex"/> for further information.
   </para>
  </refsect1>
 
@@ -108,11 +108,11 @@ CREATE OPERATOR FAMILY <replaceable class="parameter">name</replaceable> USING <
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropfamily"></member>
-   <member><xref linkend="sql-dropopfamily"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-alteropclass"></member>
-   <member><xref linkend="sql-dropopclass"></member>
+   <member><xref linkend="sql-alteropfamily"/></member>
+   <member><xref linkend="sql-dropopfamily"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-alteropclass"/></member>
+   <member><xref linkend="sql-dropopclass"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_policy.sgml b/doc/src/sgml/ref/create_policy.sgml
index c0dfe1ea4b..0e35b0ef43 100644
--- a/doc/src/sgml/ref/create_policy.sgml
+++ b/doc/src/sgml/ref/create_policy.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_policy.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEPOLICY">
+<refentry id="sql-createpolicy">
  <indexterm zone="sql-createpolicy">
   <primary>CREATE POLICY</primary>
  </indexterm>
@@ -73,25 +73,25 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
   <para>
    Policies can be applied for specific commands or for specific roles.  The
    default for newly created policies is that they apply for all commands and
-   roles, unless otherwise specified.  If multiple policies apply to a given
-   statement, they will be combined using OR (although <literal>ON CONFLICT DO
-   UPDATE</> and <literal>INSERT</> policies are not combined in this way, but
-   rather enforced as noted at each stage of <literal>ON CONFLICT</> execution).
+   roles, unless otherwise specified.  Multiple policies may apply to a single
+   command; see below for more details.
+   <xref linkend="sql-createpolicy-summary"/> summarizes how the different types
+   of policy apply to specific commands.
   </para>
 
   <para>
-   For commands that can have both <literal>USING</literal>
-   and <literal>WITH CHECK</literal> policies (<literal>ALL</literal>
+   For policies that can have both <literal>USING</literal>
+   and <literal>WITH CHECK</literal> expressions (<literal>ALL</literal>
    and <literal>UPDATE</literal>), if no <literal>WITH CHECK</literal>
-   policy is defined, then the <literal>USING</literal> policy will be used
-   both for which rows are visible (normal <literal>USING</literal> case)
-   and for which rows will be allowed to be added (<literal>WITH
-   CHECK</literal> case).
+   expression is defined, then the <literal>USING</literal> expression will be
+   used both to determine which rows are visible (normal
+   <literal>USING</literal> case) and which new rows will be allowed to be
+   added (<literal>WITH CHECK</literal> case).
   </para>
 
   <para>
    If row-level security is enabled for a table, but no applicable policies
-   exist, a <quote>default deny</> policy is assumed, so that no rows will
+   exist, a <quote>default deny</quote> policy is assumed, so that no rows will
    be visible or updatable.
   </para>
  </refsect1>
@@ -144,6 +144,16 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       which can be accessed as all restrictive policies must be passed for
       each record.
      </para>
+
+     <para>
+      Note that there needs to be at least one permissive policy to grant
+      access to records before restrictive policies can be usefully used to
+      reduce that access. If only restrictive policies exist, then no records
+      will be accessible. When a mix of permissive and restrictive policies
+      are present, a record is only accessible if at least one of the
+      permissive policies passes, in addition to all the restrictive
+      policies.
+     </para>
     </listitem>
    </varlistentry>
 
@@ -181,9 +191,9 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       to queries that refer to the table if row level security is enabled.
       Rows for which the expression returns true will be visible.  Any
       rows for which the expression returns false or null will not be
-      visible to the user (in a <command>SELECT</>), and will not be
-      available for modification (in an <command>UPDATE</>
-      or <command>DELETE</>).  Such rows are silently suppressed; no error
+      visible to the user (in a <command>SELECT</command>), and will not be
+      available for modification (in an <command>UPDATE</command>
+      or <command>DELETE</command>).  Such rows are silently suppressed; no error
       is reported.
      </para>
     </listitem>
@@ -210,21 +220,20 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
 
   </variablelist>
 
- <refsect2>
+  <refsect2>
    <title>Per-Command Policies</title>
 
    <variablelist>
 
-     <varlistentry id="SQL-CREATEPOLICY-ALL">
-      <term><literal>ALL</></term>
+     <varlistentry id="sql-createpolicy-all">
+      <term><literal>ALL</literal></term>
       <listitem>
        <para>
          Using <literal>ALL</literal> for a policy means that it will apply
          to all commands, regardless of the type of command.  If an
          <literal>ALL</literal> policy exists and more specific policies
          exist, then both the <literal>ALL</literal> policy and the more
-         specific policy (or policies) will be combined using
-         OR, as usual for overlapping policies.
+         specific policy (or policies) will be applied.
          Additionally, <literal>ALL</literal> policies will be applied to
          both the selection side of a query and the modification side, using
          the <literal>USING</literal> expression for both cases if only
@@ -247,8 +256,8 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       </listitem>
      </varlistentry>
 
-     <varlistentry id="SQL-CREATEPOLICY-SELECT">
-      <term><literal>SELECT</></term>
+     <varlistentry id="sql-createpolicy-select">
+      <term><literal>SELECT</literal></term>
       <listitem>
        <para>
          Using <literal>SELECT</literal> for a policy means that it will apply
@@ -267,8 +276,8 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       </listitem>
      </varlistentry>
 
-     <varlistentry id="SQL-CREATEPOLICY-INSERT">
-      <term><literal>INSERT</></term>
+     <varlistentry id="sql-createpolicy-insert">
+      <term><literal>INSERT</literal></term>
       <listitem>
        <para>
          Using <literal>INSERT</literal> for a policy means that it will apply
@@ -288,16 +297,17 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
       </listitem>
      </varlistentry>
 
-     <varlistentry id="SQL-CREATEPOLICY-UPDATE">
-      <term><literal>UPDATE</></term>
+     <varlistentry id="sql-createpolicy-update">
+      <term><literal>UPDATE</literal></term>
       <listitem>
        <para>
          Using <literal>UPDATE</literal> for a policy means that it will apply
-         to <literal>UPDATE</literal> commands (or auxiliary <literal>ON
-         CONFLICT DO UPDATE</literal> clauses of <literal>INSERT</literal>
-         commands).  Since <literal>UPDATE</literal> involves pulling an
-         existing record and then making changes to some portion (but
-         possibly not all) of the record, <literal>UPDATE</literal>
+         to <literal>UPDATE</literal>, <literal>SELECT FOR UPDATE</literal>
+         and <literal>SELECT FOR SHARE</literal> commands, as well as
+         auxiliary <literal>ON CONFLICT DO UPDATE</literal> clauses of
+         <literal>INSERT</literal> commands.  Since <literal>UPDATE</literal>
+         involves pulling an existing record and replacing it with a new
+         modified record, <literal>UPDATE</literal>
          policies accept both a <literal>USING</literal> expression and
          a <literal>WITH CHECK</literal> expression.
          The <literal>USING</literal> expression determines which records
@@ -306,22 +316,6 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
          modified rows are allowed to be stored back into the relation.
        </para>
 
-       <para>
-         When an <literal>UPDATE</literal> command is used with a
-         <literal>WHERE</literal> clause or a <literal>RETURNING</literal>
-         clause, <literal>SELECT</literal> rights are also required on the
-         relation being updated and the appropriate <literal>SELECT</literal>
-         and <literal>ALL</literal> policies will be combined (using OR for any
-         overlapping <literal>SELECT</literal> related policies found) with the
-         <literal>USING</literal> clause of the <literal>UPDATE</literal> policy
-         using AND.  Therefore, in order for a user to be able to
-         <literal>UPDATE</literal> specific rows, the user must have access
-         to the row(s) through a <literal>SELECT</literal>
-         or <literal>ALL</literal> policy and the row(s) must pass
-         the <literal>UPDATE</literal> policy's <literal>USING</>
-         expression.
-       </para>
-
        <para>
          Any rows whose updated values do not pass the
          <literal>WITH CHECK</literal> expression will cause an error, and the
@@ -331,27 +325,39 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
        </para>
 
        <para>
-         Note, however, that <literal>INSERT</literal> with <literal>ON CONFLICT
-         DO UPDATE</literal> requires that an <literal>UPDATE</literal> policy
-         <literal>USING</literal> expression always be enforced as a
-         <literal>WITH CHECK</literal> expression.  This
-         <literal>UPDATE</literal> policy must always pass when the
-         <literal>UPDATE</literal> path is taken.  Any existing row that
-         necessitates that the <literal>UPDATE</literal> path be taken must
-         pass the (<literal>UPDATE</literal> or <literal>ALL</literal>)
-         <literal>USING</literal> qualifications (combined using OR), which
-         are always enforced as <literal>WITH CHECK</literal>
-         options in this context.  (The <literal>UPDATE</literal> path will
-         <emphasis>never</> be silently avoided; an error will be thrown
-         instead.)  Finally, the final row appended to the relation must pass
-         any <literal>WITH CHECK</literal> options that a conventional
-         <literal>UPDATE</literal> is required to pass.
+         Typically an <literal>UPDATE</literal> command also needs to read
+         data from columns in the relation being updated (e.g., in a
+         <literal>WHERE</literal> clause or a <literal>RETURNING</literal>
+         clause, or in an expression on the right hand side of the
+         <literal>SET</literal> clause).  In this case,
+         <literal>SELECT</literal> rights are also required on the relation
+         being updated, and the appropriate <literal>SELECT</literal> or
+         <literal>ALL</literal> policies will be applied in addition to
+         the <literal>UPDATE</literal> policies.  Thus the user must have
+         access to the row(s) being updated through a <literal>SELECT</literal>
+         or <literal>ALL</literal> policy in addition to being granted
+         permission to update the row(s) via an <literal>UPDATE</literal>
+         or <literal>ALL</literal> policy.
+       </para>
+
+       <para>
+         When an <literal>INSERT</literal> command has an auxiliary
+         <literal>ON CONFLICT DO UPDATE</literal> clause, if the
+         <literal>UPDATE</literal> path is taken, the row to be updated is
+         first checked against the <literal>USING</literal> expressions of
+         any <literal>UPDATE</literal> policies, and then the new updated row
+         is checked against the <literal>WITH CHECK</literal> expressions.
+         Note, however, that unlike a standalone <literal>UPDATE</literal>
+         command, if the existing row does not pass the
+         <literal>USING</literal> expressions, an error will be thrown (the
+         <literal>UPDATE</literal> path will <emphasis>never</emphasis> be silently
+         avoided).
        </para>
       </listitem>
      </varlistentry>
 
-     <varlistentry id="SQL-CREATEPOLICY-DELETE">
-      <term><literal>DELETE</></term>
+     <varlistentry id="sql-createpolicy-delete">
+      <term><literal>DELETE</literal></term>
       <listitem>
        <para>
          Using <literal>DELETE</literal> for a policy means that it will apply
@@ -364,19 +370,18 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
        </para>
 
        <para>
-         When a <literal>DELETE</literal> command is used with a
-         <literal>WHERE</literal> clause or a <literal>RETURNING</literal>
-         clause, <literal>SELECT</literal> rights are also required on the
-         relation being updated and the appropriate <literal>SELECT</literal>
-         and <literal>ALL</literal> policies will be combined (using OR for any
-         overlapping <literal>SELECT</literal> related policies found) with the
-         <literal>USING</literal> clause of the <literal>DELETE</literal> policy
-         using AND.  Therefore, in order for a user to be able to
-         <literal>DELETE</literal> specific rows, the user must have access
-         to the row(s) through a <literal>SELECT</literal>
-         or <literal>ALL</literal> policy and the row(s) must pass
-         the <literal>DELETE</literal> policy's <literal>USING</>
-         expression.
+         In most cases a <literal>DELETE</literal> command also needs to read
+         data from columns in the relation that it is deleting from (e.g.,
+         in a <literal>WHERE</literal> clause or a
+         <literal>RETURNING</literal> clause). In this case,
+         <literal>SELECT</literal> rights are also required on the relation,
+         and the appropriate <literal>SELECT</literal> or
+         <literal>ALL</literal> policies will be applied in addition to
+         the <literal>DELETE</literal> policies.  Thus the user must have
+         access to the row(s) being deleted through a <literal>SELECT</literal>
+         or <literal>ALL</literal> policy in addition to being granted
+         permission to delete the row(s) via a <literal>DELETE</literal> or
+         <literal>ALL</literal> policy.
        </para>
 
        <para>
@@ -389,6 +394,172 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
      </varlistentry>
 
    </variablelist>
+
+   <table id="sql-createpolicy-summary">
+    <title>Policies Applied by Command Type</title>
+    <tgroup cols="6">
+     <colspec colnum="4" colname="update-using"/>
+     <colspec colnum="5" colname="update-check"/>
+     <spanspec namest="update-using" nameend="update-check" spanname="update"/>
+     <thead>
+      <row>
+       <entry morerows="1">Command</entry>
+       <entry><literal>SELECT/ALL policy</literal></entry>
+       <entry><literal>INSERT/ALL policy</literal></entry>
+       <entry spanname="update"><literal>UPDATE/ALL policy</literal></entry>
+       <entry><literal>DELETE/ALL policy</literal></entry>
+      </row>
+      <row>
+       <entry><literal>USING expression</literal></entry>
+       <entry><literal>WITH CHECK expression</literal></entry>
+       <entry><literal>USING expression</literal></entry>
+       <entry><literal>WITH CHECK expression</literal></entry>
+       <entry><literal>USING expression</literal></entry>
+      </row>
+     </thead>
+     <tbody>
+      <row>
+       <entry><command>SELECT</command></entry>
+       <entry>Existing row</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>SELECT FOR UPDATE/SHARE</command></entry>
+       <entry>Existing row</entry>
+       <entry>&mdash;</entry>
+       <entry>Existing row</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>INSERT</command></entry>
+       <entry>&mdash;</entry>
+       <entry>New row</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>INSERT ... RETURNING</command></entry>
+       <entry>
+        New row <footnote id="rls-select-priv">
+         <para>
+          If read access is required to the existing or new row (for example,
+          a <literal>WHERE</literal> or <literal>RETURNING</literal> clause
+          that refers to columns from the relation).
+         </para>
+        </footnote>
+       </entry>
+       <entry>New row</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>UPDATE</command></entry>
+       <entry>
+        Existing &amp; new rows <footnoteref linkend="rls-select-priv"/>
+       </entry>
+       <entry>&mdash;</entry>
+       <entry>Existing row</entry>
+       <entry>New row</entry>
+       <entry>&mdash;</entry>
+      </row>
+      <row>
+       <entry><command>DELETE</command></entry>
+       <entry>
+        Existing row <footnoteref linkend="rls-select-priv"/>
+       </entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>&mdash;</entry>
+       <entry>Existing row</entry>
+      </row>
+      <row>
+       <entry><command>ON CONFLICT DO UPDATE</command></entry>
+       <entry>Existing &amp; new rows</entry>
+       <entry>&mdash;</entry>
+       <entry>Existing row</entry>
+       <entry>New row</entry>
+       <entry>&mdash;</entry>
+      </row>
+     </tbody>
+    </tgroup>
+   </table>
+
+  </refsect2>
+
+  <refsect2>
+   <title>Application of Multiple Policies</title>
+
+   <para>
+    When multiple policies of different command types apply to the same command
+    (for example, <literal>SELECT</literal> and <literal>UPDATE</literal>
+    policies applied to an <literal>UPDATE</literal> command), then the user
+    must have both types of permissions (for example, permission to select rows
+    from the relation as well as permission to update them).  Thus the
+    expressions for one type of policy are combined with the expressions for
+    the other type of policy using the <literal>AND</literal> operator.
+   </para>
+
+   <para>
+    When multiple policies of the same command type apply to the same command,
+    then there must be at least one <literal>PERMISSIVE</literal> policy
+    granting access to the relation, and all of the
+    <literal>RESTRICTIVE</literal> policies must pass.  Thus all the
+    <literal>PERMISSIVE</literal> policy expressions are combined using
+    <literal>OR</literal>, all the <literal>RESTRICTIVE</literal> policy
+    expressions are combined using <literal>AND</literal>, and the results are
+    combined using <literal>AND</literal>.  If there are no
+    <literal>PERMISSIVE</literal> policies, then access is denied.
+   </para>
+
+   <para>
+    Note that, for the purposes of combining multiple policies,
+    <literal>ALL</literal> policies are treated as having the same type as
+    whichever other type of policy is being applied.
+   </para>
+
+   <para>
+    For example, in an <literal>UPDATE</literal> command requiring both
+    <literal>SELECT</literal> and <literal>UPDATE</literal> permissions, if
+    there are multiple applicable policies of each type, they will be combined
+    as follows:
+
+<programlisting>
+<replaceable>expression</replaceable> from RESTRICTIVE SELECT/ALL policy 1
+AND
+<replaceable>expression</replaceable> from RESTRICTIVE SELECT/ALL policy 2
+AND
+...
+AND
+(
+  <replaceable>expression</replaceable> from PERMISSIVE SELECT/ALL policy 1
+  OR
+  <replaceable>expression</replaceable> from PERMISSIVE SELECT/ALL policy 2
+  OR
+  ...
+)
+AND
+<replaceable>expression</replaceable> from RESTRICTIVE UPDATE/ALL policy 1
+AND
+<replaceable>expression</replaceable> from RESTRICTIVE UPDATE/ALL policy 2
+AND
+...
+AND
+(
+  <replaceable>expression</replaceable> from PERMISSIVE UPDATE/ALL policy 1
+  OR
+  <replaceable>expression</replaceable> from PERMISSIVE UPDATE/ALL policy 2
+  OR
+  ...
+)
+</programlisting>
+   </para>
+
   </refsect2>
  </refsect1>
 
@@ -418,16 +589,6 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
    keys) instead of keys with external meanings.
   </para>
 
-  <para>
-   Note that there needs to be at least one permissive policy to grant
-   access to records before restrictive policies can be usefully used to
-   reduce that access. If only restrictive policies exist, then no records
-   will be accessible. When a mix of permissive and restrictive policies
-   are present, a record is only accessible if at least one of the
-   permissive policies passes, in addition to all the restrictive
-   policies.
-  </para>
-
   <para>
    Generally, the system will enforce filter conditions imposed using
    security policies prior to qualifications that appear in user queries,
@@ -453,7 +614,7 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
 
   <para>
    Additional discussion and practical examples can be found
-   in <xref linkend="ddl-rowsecurity">.
+   in <xref linkend="ddl-rowsecurity"/>.
   </para>
 
  </refsect1>
@@ -471,9 +632,9 @@ CREATE POLICY <replaceable class="parameter">name</replaceable> ON <replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterpolicy"></member>
-   <member><xref linkend="sql-droppolicy"></member>
-   <member><xref linkend="sql-altertable"></member>
+   <member><xref linkend="sql-alterpolicy"/></member>
+   <member><xref linkend="sql-droppolicy"/></member>
+   <member><xref linkend="sql-altertable"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_procedure.sgml b/doc/src/sgml/ref/create_procedure.sgml
new file mode 100644
index 0000000000..bbf8b03d04
--- /dev/null
+++ b/doc/src/sgml/ref/create_procedure.sgml
@@ -0,0 +1,348 @@
+<!--
+doc/src/sgml/ref/create_procedure.sgml
+-->
+
+<refentry id="sql-createprocedure">
+ <indexterm zone="sql-createprocedure">
+  <primary>CREATE PROCEDURE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>CREATE PROCEDURE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>CREATE PROCEDURE</refname>
+  <refpurpose>define a new procedure</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+CREATE [ OR REPLACE ] PROCEDURE
+    <replaceable class="parameter">name</replaceable> ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [ { DEFAULT | = } <replaceable class="parameter">default_expr</replaceable> ] [, ...] ] )
+  { LANGUAGE <replaceable class="parameter">lang_name</replaceable>
+    | TRANSFORM { FOR TYPE <replaceable class="parameter">type_name</replaceable> } [, ... ]
+    | [ EXTERNAL ] SECURITY INVOKER | [ EXTERNAL ] SECURITY DEFINER
+    | SET <replaceable class="parameter">configuration_parameter</replaceable> { TO <replaceable class="parameter">value</replaceable> | = <replaceable class="parameter">value</replaceable> | FROM CURRENT }
+    | AS '<replaceable class="parameter">definition</replaceable>'
+    | AS '<replaceable class="parameter">obj_file</replaceable>', '<replaceable class="parameter">link_symbol</replaceable>'
+  } ...
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1 id="sql-createprocedure-description">
+  <title>Description</title>
+
+  <para>
+   <command>CREATE PROCEDURE</command> defines a new procedure.
+   <command>CREATE OR REPLACE PROCEDURE</command> will either create a
+   new procedure, or replace an existing definition.
+   To be able to define a procedure, the user must have the
+   <literal>USAGE</literal> privilege on the language.
+  </para>
+
+  <para>
+   If a schema name is included, then the procedure is created in the
+   specified schema.  Otherwise it is created in the current schema.
+   The name of the new procedure must not match any existing procedure or function
+   with the same input argument types in the same schema.  However,
+   procedures and functions of different argument types can share a name (this is
+   called <firstterm>overloading</firstterm>).
+  </para>
+
+  <para>
+   To replace the current definition of an existing procedure, use
+   <command>CREATE OR REPLACE PROCEDURE</command>.  It is not possible
+   to change the name or argument types of a procedure this way (if you
+   tried, you would actually be creating a new, distinct procedure).
+  </para>
+
+  <para>
+   When <command>CREATE OR REPLACE PROCEDURE</command> is used to replace an
+   existing procedure, the ownership and permissions of the procedure
+   do not change.  All other procedure properties are assigned the
+   values specified or implied in the command.  You must own the procedure
+   to replace it (this includes being a member of the owning role).
+  </para>
+
+  <para>
+   The user that creates the procedure becomes the owner of the procedure.
+  </para>
+
+  <para>
+   To be able to create a procedure, you must have <literal>USAGE</literal>
+   privilege on the argument types.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+   <variablelist>
+    <varlistentry>
+     <term><replaceable class="parameter">name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name (optionally schema-qualified) of the procedure to create.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">argmode</replaceable></term>
+
+     <listitem>
+      <para>
+       The mode of an argument: <literal>IN</literal> or <literal>VARIADIC</literal>.
+       If omitted, the default is <literal>IN</literal>.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">argname</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of an argument.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">argtype</replaceable></term>
+
+     <listitem>
+      <para>
+       The data type(s) of the procedure's arguments (optionally
+       schema-qualified), if any. The argument types can be base, composite,
+       or domain types, or can reference the type of a table column.
+      </para>
+      <para>
+       Depending on the implementation language it might also be allowed
+       to specify <quote>pseudo-types</quote> such as <type>cstring</type>.
+       Pseudo-types indicate that the actual argument type is either
+       incompletely specified, or outside the set of ordinary SQL data types.
+      </para>
+      <para>
+       The type of a column is referenced by writing
+       <literal><replaceable
+       class="parameter">table_name</replaceable>.<replaceable
+       class="parameter">column_name</replaceable>%TYPE</literal>.
+       Using this feature can sometimes help make a procedure independent of
+       changes to the definition of a table.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">default_expr</replaceable></term>
+
+     <listitem>
+      <para>
+       An expression to be used as default value if the parameter is
+       not specified.  The expression has to be coercible to the
+       argument type of the parameter.
+       All input parameters following a
+       parameter with a default value must have default values as well.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">lang_name</replaceable></term>
+
+     <listitem>
+      <para>
+       The name of the language that the procedure is implemented in.
+       It can be <literal>sql</literal>, <literal>c</literal>,
+       <literal>internal</literal>, or the name of a user-defined
+       procedural language, e.g. <literal>plpgsql</literal>.  Enclosing the
+       name in single quotes is deprecated and requires matching case.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal>TRANSFORM { FOR TYPE <replaceable class="parameter">type_name</replaceable> } [, ... ] }</literal></term>
+
+     <listitem>
+      <para>
+       Lists which transforms a call to the procedure should apply.  Transforms
+       convert between SQL types and language-specific data types;
+       see <xref linkend="sql-createtransform"/>.  Procedural language
+       implementations usually have hardcoded knowledge of the built-in types,
+       so those don't need to be listed here.  If a procedural language
+       implementation does not know how to handle a type and no transform is
+       supplied, it will fall back to a default behavior for converting data
+       types, but this depends on the implementation.
+      </para>
+     </listitem>
+    </varlistentry>
+
+   <varlistentry>
+    <term><literal><optional>EXTERNAL</optional> SECURITY INVOKER</literal></term>
+    <term><literal><optional>EXTERNAL</optional> SECURITY DEFINER</literal></term>
+
+    <listitem>
+     <para><literal>SECURITY INVOKER</literal> indicates that the procedure
+      is to be executed with the privileges of the user that calls it.
+      That is the default.  <literal>SECURITY DEFINER</literal>
+      specifies that the procedure is to be executed with the
+      privileges of the user that owns it.
+     </para>
+
+     <para>
+      The key word <literal>EXTERNAL</literal> is allowed for SQL
+      conformance, but it is optional since, unlike in SQL, this feature
+      applies to all procedures not only external ones.
+     </para>
+    </listitem>
+   </varlistentry>
+
+    <varlistentry>
+     <term><replaceable>configuration_parameter</replaceable></term>
+     <term><replaceable>value</replaceable></term>
+     <listitem>
+      <para>
+       The <literal>SET</literal> clause causes the specified configuration
+       parameter to be set to the specified value when the procedure is
+       entered, and then restored to its prior value when the procedure exits.
+       <literal>SET FROM CURRENT</literal> saves the value of the parameter that
+       is current when <command>CREATE PROCEDURE</command> is executed as the value
+       to be applied when the procedure is entered.
+      </para>
+
+      <para>
+       If a <literal>SET</literal> clause is attached to a procedure, then
+       the effects of a <command>SET LOCAL</command> command executed inside the
+       procedure for the same variable are restricted to the procedure: the
+       configuration parameter's prior value is still restored at procedure exit.
+       However, an ordinary
+       <command>SET</command> command (without <literal>LOCAL</literal>) overrides the
+       <literal>SET</literal> clause, much as it would do for a previous <command>SET
+       LOCAL</command> command: the effects of such a command will persist after
+       procedure exit, unless the current transaction is rolled back.
+      </para>
+
+      <para>
+       If a <literal>SET</literal> clause is attached to a procedure, then
+       that procedure cannot execute transaction control statements (for
+       example, <command>COMMIT</command> and <command>ROLLBACK</command>,
+       depending on the language).
+      </para>
+
+      <para>
+       See <xref linkend="sql-set"/> and
+       <xref linkend="runtime-config"/>
+       for more information about allowed parameter names and values.
+      </para>
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><replaceable class="parameter">definition</replaceable></term>
+
+     <listitem>
+      <para>
+       A string constant defining the procedure; the meaning depends on the
+       language.  It can be an internal procedure name, the path to an
+       object file, an SQL command, or text in a procedural language.
+      </para>
+
+      <para>
+       It is often helpful to use dollar quoting (see <xref
+       linkend="sql-syntax-dollar-quoting"/>) to write the procedure definition
+       string, rather than the normal single quote syntax.  Without dollar
+       quoting, any single quotes or backslashes in the procedure definition must
+       be escaped by doubling them.
+      </para>
+
+     </listitem>
+    </varlistentry>
+
+    <varlistentry>
+     <term><literal><replaceable class="parameter">obj_file</replaceable>, <replaceable class="parameter">link_symbol</replaceable></literal></term>
+
+     <listitem>
+      <para>
+       This form of the <literal>AS</literal> clause is used for
+       dynamically loadable C language procedures when the procedure name
+       in the C language source code is not the same as the name of
+       the SQL procedure. The string <replaceable
+       class="parameter">obj_file</replaceable> is the name of the shared
+       library file containing the compiled C procedure, and is interpreted
+       as for the <xref linkend="sql-load"/> command.  The string
+       <replaceable class="parameter">link_symbol</replaceable> is the
+       procedure's link symbol, that is, the name of the procedure in the C
+       language source code.  If the link symbol is omitted, it is assumed
+       to be the same as the name of the SQL procedure being defined.
+      </para>
+
+      <para>
+       When repeated <command>CREATE PROCEDURE</command> calls refer to
+       the same object file, the file is only loaded once per session.
+       To unload and
+       reload the file (perhaps during development), start a new session.
+      </para>
+
+     </listitem>
+    </varlistentry>
+   </variablelist>
+ </refsect1>
+
+ <refsect1 id="sql-createprocedure-notes">
+  <title>Notes</title>
+
+  <para>
+   See <xref linkend="sql-createfunction"/> for more details on function
+   creation that also apply to procedures.
+  </para>
+
+  <para>
+   Use <xref linkend="sql-call"/> to execute a procedure.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-createprocedure-examples">
+  <title>Examples</title>
+
+<programlisting>
+CREATE PROCEDURE insert_data(a integer, b integer)
+LANGUAGE SQL
+AS $$
+INSERT INTO tbl VALUES (a);
+INSERT INTO tbl VALUES (b);
+$$;
+
+CALL insert_data(1, 2);
+</programlisting>
+ </refsect1>
+
+ <refsect1 id="sql-createprocedure-compat">
+  <title>Compatibility</title>
+
+  <para>
+   A <command>CREATE PROCEDURE</command> command is defined in the SQL
+   standard.  The <productname>PostgreSQL</productname> version is similar but
+   not fully compatible.  For details see
+   also <xref linkend="sql-createfunction"/>.
+  </para>
+ </refsect1>
+
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-alterprocedure"/></member>
+   <member><xref linkend="sql-dropprocedure"/></member>
+   <member><xref linkend="sql-call"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/create_publication.sgml b/doc/src/sgml/ref/create_publication.sgml
index 62a5fd432e..bfe12d5f41 100644
--- a/doc/src/sgml/ref/create_publication.sgml
+++ b/doc/src/sgml/ref/create_publication.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_publication.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEPUBLICATION">
+<refentry id="sql-createpublication">
  <indexterm zone="sql-createpublication">
   <primary>CREATE PUBLICATION</primary>
  </indexterm>
@@ -41,7 +41,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
   <para>
    A publication is essentially a group of tables whose data changes are
    intended to be replicated through logical replication.  See
-   <xref linkend="logical-replication-publication"> for details about how
+   <xref linkend="logical-replication-publication"/> for details about how
    publications fit into the logical replication setup.
    </para>
  </refsect1>
@@ -64,10 +64,10 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
     <listitem>
      <para>
       Specifies a list of tables to add to the publication.  If
-      <literal>ONLY</> is specified before the table name, only
-      that table is added to the publication.  If <literal>ONLY</> is not
+      <literal>ONLY</literal> is specified before the table name, only
+      that table is added to the publication.  If <literal>ONLY</literal> is not
       specified, the table and all its descendant tables (if any) are added.
-      Optionally, <literal>*</> can be specified after the table name to
+      Optionally, <literal>*</literal> can be specified after the table name to
       explicitly indicate that descendant tables are included.
      </para>
 
@@ -138,7 +138,7 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
 
   <para>
    To create a publication, the invoking user must have the
-   <literal>CREATE</> privilege for the current database.
+   <literal>CREATE</literal> privilege for the current database.
    (Of course, superusers bypass this check.)
   </para>
 
@@ -151,12 +151,12 @@ CREATE PUBLICATION <replaceable class="parameter">name</replaceable>
   <para>
    The tables added to a publication that publishes <command>UPDATE</command>
    and/or <command>DELETE</command> operations must have
-   <literal>REPLICA IDENTITY</> defined.  Otherwise those operations will be
+   <literal>REPLICA IDENTITY</literal> defined.  Otherwise those operations will be
    disallowed on those tables.
   </para>
 
   <para>
-   For an <command>INSERT ... ON CONFLICT</> command, the publication will
+   For an <command>INSERT ... ON CONFLICT</command> command, the publication will
    publish the operation that actually results from the command.  So depending
    of the outcome, it may be published as either <command>INSERT</command> or
    <command>UPDATE</command>, or it may not be published at all.
@@ -203,7 +203,7 @@ CREATE PUBLICATION insert_only FOR TABLE mydata
   <title>Compatibility</title>
 
   <para>
-   <command>CREATE PUBLICATION</command> is a <productname>PostgreSQL</>
+   <command>CREATE PUBLICATION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -212,8 +212,8 @@ CREATE PUBLICATION insert_only FOR TABLE mydata
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterpublication"></member>
-   <member><xref linkend="sql-droppublication"></member>
+   <member><xref linkend="sql-alterpublication"/></member>
+   <member><xref linkend="sql-droppublication"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_role.sgml b/doc/src/sgml/ref/create_role.sgml
index 36772b678a..9c3b6978af 100644
--- a/doc/src/sgml/ref/create_role.sgml
+++ b/doc/src/sgml/ref/create_role.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_role.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEROLE">
+<refentry id="sql-createrole">
  <indexterm zone="sql-createrole">
   <primary>CREATE ROLE</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+CREATE ROLE <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
       SUPERUSER | NOSUPERUSER
     | CREATEDB | NOCREATEDB
@@ -32,15 +32,15 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
     | LOGIN | NOLOGIN
     | REPLICATION | NOREPLICATION
     | BYPASSRLS | NOBYPASSRLS
-    | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
-    | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
-    | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
-    | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | SYSID <replaceable class="PARAMETER">uid</replaceable>
+    | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
+    | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
+    | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
+    | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...]
+    | USER <replaceable class="parameter">role_name</replaceable> [, ...]
+    | SYSID <replaceable class="parameter">uid</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -51,11 +51,11 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
    <command>CREATE ROLE</command> adds a new role to a
    <productname>PostgreSQL</productname> database cluster.  A role is
    an entity that can own database objects and have database privileges;
-   a role can be considered a <quote>user</>, a <quote>group</>, or both
+   a role can be considered a <quote>user</quote>, a <quote>group</quote>, or both
    depending on how it is used.  Refer to
-   <xref linkend="user-manag"> and <xref
-   linkend="client-authentication"> for information about managing
-   users and authentication.  You must have <literal>CREATEROLE</>
+   <xref linkend="user-manag"/> and <xref
+   linkend="client-authentication"/> for information about managing
+   users and authentication.  You must have <literal>CREATEROLE</literal>
    privilege or be a database superuser to use this command.
   </para>
 
@@ -83,7 +83,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
       <term><literal>NOSUPERUSER</literal></term>
       <listitem>
        <para>
-        These clauses determine whether the new role is a <quote>superuser</>,
+        These clauses determine whether the new role is a <quote>superuser</quote>,
         who can override all access restrictions within the database.
         Superuser status is dangerous and should be used only when really
         needed.  You must yourself be a superuser to create a new superuser.
@@ -94,8 +94,8 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
      </varlistentry>
 
      <varlistentry>
-      <term><literal>CREATEDB</></term>
-      <term><literal>NOCREATEDB</></term>
+      <term><literal>CREATEDB</literal></term>
+      <term><literal>NOCREATEDB</literal></term>
       <listitem>
        <para>
         These clauses define a role's ability to create databases.  If
@@ -128,13 +128,13 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
       <term><literal>NOINHERIT</literal></term>
       <listitem>
        <para>
-        These clauses determine whether a role <quote>inherits</> the
+        These clauses determine whether a role <quote>inherits</quote> the
         privileges of roles it is a member of.
         A role with the <literal>INHERIT</literal> attribute can automatically
         use whatever database privileges have been granted to all roles
         it is directly or indirectly a member of.
         Without <literal>INHERIT</literal>, membership in another role
-        only grants the ability to <command>SET ROLE</> to that other role;
+        only grants the ability to <command>SET ROLE</command> to that other role;
         the privileges of the other role are only available after having
         done so.
         If not specified,
@@ -156,8 +156,8 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
         privileges, but are not users in the usual sense of the word.
         If not specified,
         <literal>NOLOGIN</literal> is the default, except when
-        <command>CREATE ROLE</> is invoked through its alternative spelling
-        <xref linkend="sql-createuser">.
+        <command>CREATE ROLE</command> is invoked through its alternative spelling
+        <xref linkend="sql-createuser"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -172,7 +172,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
         connect to the server in replication mode (physical or logical
         replication) and in order to be able to create or drop replication
         slots.
-        A role having the <literal>REPLICATION</> attribute is a very
+        A role having the <literal>REPLICATION</literal> attribute is a very
         highly privileged role, and should only be used on roles actually
         used for replication. If not specified,
         <literal>NOREPLICATION</literal> is the default.
@@ -210,7 +210,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
      </varlistentry>
 
      <varlistentry>
-      <term>[ <literal>ENCRYPTED</> ] <literal>PASSWORD</> <replaceable class="parameter">password</replaceable></term>
+      <term>[ <literal>ENCRYPTED</literal> ] <literal>PASSWORD</literal> <replaceable class="parameter">password</replaceable></term>
       <listitem>
        <para>
         Sets the role's password.  (A password is only of use for
@@ -225,7 +225,7 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
        <note>
          <para>
            Specifying an empty string will also set the password to null,
-           but that was not the case before <productname>PostgreSQL</>
+           but that was not the case before <productname>PostgreSQL</productname>
            version 10. In earlier versions, an empty string could be used,
            or not, depending on the authentication method and the exact
            version, and libpq would refuse to use it in any case.
@@ -235,12 +235,12 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
        </note>
        <para>
         The password is always stored encrypted in the system catalogs. The
-        <literal>ENCRYPTED</> keyword has no effect, but is accepted for
+        <literal>ENCRYPTED</literal> keyword has no effect, but is accepted for
         backwards compatibility. The method of encryption is determined
-        by the configuration parameter <xref linkend="guc-password-encryption">.
+        by the configuration parameter <xref linkend="guc-password-encryption"/>.
         If the presented password string is already in MD5-encrypted or
         SCRAM-encrypted format, then it is stored as-is regardless of
-        <varname>password_encryption</> (since the system cannot decrypt
+        <varname>password_encryption</varname> (since the system cannot decrypt
         the specified encrypted password string, to encrypt it in a
         different format).  This allows reloading of encrypted passwords
         during dump/restore.
@@ -260,61 +260,61 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
      </varlistentry>
 
      <varlistentry>
-      <term><literal>IN ROLE</> <replaceable class="parameter">role_name</replaceable></term>
+      <term><literal>IN ROLE</literal> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
        <para>
         The <literal>IN ROLE</literal> clause lists one or more existing
         roles to which the new role will be immediately added as a new
         member.  (Note that there is no option to add the new role as an
-        administrator; use a separate <command>GRANT</> command to do that.)
+        administrator; use a separate <command>GRANT</command> command to do that.)
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>IN GROUP</> <replaceable class="parameter">role_name</replaceable></term>
+      <term><literal>IN GROUP</literal> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
        <para><literal>IN GROUP</literal> is an obsolete spelling of
-        <literal>IN ROLE</>.
+        <literal>IN ROLE</literal>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ROLE</> <replaceable class="parameter">role_name</replaceable></term>
+      <term><literal>ROLE</literal> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
        <para>
         The <literal>ROLE</literal> clause lists one or more existing
         roles which are automatically added as members of the new role.
-        (This in effect makes the new role a <quote>group</>.)
+        (This in effect makes the new role a <quote>group</quote>.)
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>ADMIN</> <replaceable class="parameter">role_name</replaceable></term>
+      <term><literal>ADMIN</literal> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
        <para>
         The <literal>ADMIN</literal> clause is like <literal>ROLE</literal>,
         but the named roles are added to the new role <literal>WITH ADMIN
-        OPTION</>, giving them the right to grant membership in this role
+        OPTION</literal>, giving them the right to grant membership in this role
         to others.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>USER</> <replaceable class="parameter">role_name</replaceable></term>
+      <term><literal>USER</literal> <replaceable class="parameter">role_name</replaceable></term>
       <listitem>
        <para>
         The <literal>USER</literal> clause is an obsolete spelling of
-        the <literal>ROLE</> clause.
+        the <literal>ROLE</literal> clause.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><literal>SYSID</> <replaceable class="parameter">uid</replaceable></term>
+      <term><literal>SYSID</literal> <replaceable class="parameter">uid</replaceable></term>
       <listitem>
        <para>
         The <literal>SYSID</literal> clause is ignored, but is accepted
@@ -329,71 +329,71 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ALTERROLE"> to
-   change the attributes of a role, and <xref linkend="SQL-DROPROLE">
+   Use <xref linkend="sql-alterrole"/> to
+   change the attributes of a role, and <xref linkend="sql-droprole"/>
    to remove a role.  All the attributes
-   specified by <command>CREATE ROLE</> can be modified by later
-   <command>ALTER ROLE</> commands.
+   specified by <command>CREATE ROLE</command> can be modified by later
+   <command>ALTER ROLE</command> commands.
   </para>
 
   <para>
    The preferred way to add and remove members of roles that are being
    used as groups is to use
-   <xref linkend="SQL-GRANT"> and
-   <xref linkend="SQL-REVOKE">.
+   <xref linkend="sql-grant"/> and
+   <xref linkend="sql-revoke"/>.
   </para>
 
   <para>
-   The <literal>VALID UNTIL</> clause defines an expiration time for a
-   password only, not for the role <foreignphrase>per se</>.  In
+   The <literal>VALID UNTIL</literal> clause defines an expiration time for a
+   password only, not for the role <foreignphrase>per se</foreignphrase>.  In
    particular, the expiration time is not enforced when logging in using
    a non-password-based authentication method.
   </para>
 
   <para>
-   The <literal>INHERIT</> attribute governs inheritance of grantable
+   The <literal>INHERIT</literal> attribute governs inheritance of grantable
    privileges (that is, access privileges for database objects and role
    memberships).  It does not apply to the special role attributes set by
-   <command>CREATE ROLE</> and <command>ALTER ROLE</>.  For example, being
-   a member of a role with <literal>CREATEDB</> privilege does not immediately
-   grant the ability to create databases, even if <literal>INHERIT</> is set;
+   <command>CREATE ROLE</command> and <command>ALTER ROLE</command>.  For example, being
+   a member of a role with <literal>CREATEDB</literal> privilege does not immediately
+   grant the ability to create databases, even if <literal>INHERIT</literal> is set;
    it would be necessary to become that role via
-   <xref linkend="SQL-SET-ROLE"> before
+   <xref linkend="sql-set-role"/> before
    creating a database.
   </para>
 
   <para>
-   The <literal>INHERIT</> attribute is the default for reasons of backwards
+   The <literal>INHERIT</literal> attribute is the default for reasons of backwards
    compatibility: in prior releases of <productname>PostgreSQL</productname>,
    users always had access to all privileges of groups they were members of.
-   However, <literal>NOINHERIT</> provides a closer match to the semantics
+   However, <literal>NOINHERIT</literal> provides a closer match to the semantics
    specified in the SQL standard.
   </para>
 
   <para>
-   Be careful with the <literal>CREATEROLE</> privilege. There is no concept of
-   inheritance for the privileges of a <literal>CREATEROLE</>-role. That
+   Be careful with the <literal>CREATEROLE</literal> privilege. There is no concept of
+   inheritance for the privileges of a <literal>CREATEROLE</literal>-role. That
    means that even if a role does not have a certain privilege but is allowed
    to create other roles, it can easily create another role with different
    privileges than its own (except for creating roles with superuser
-   privileges). For example, if the role <quote>user</> has the
-   <literal>CREATEROLE</> privilege but not the <literal>CREATEDB</> privilege,
-   nonetheless it can create a new role with the <literal>CREATEDB</>
-   privilege. Therefore, regard roles that have the <literal>CREATEROLE</>
+   privileges). For example, if the role <quote>user</quote> has the
+   <literal>CREATEROLE</literal> privilege but not the <literal>CREATEDB</literal> privilege,
+   nonetheless it can create a new role with the <literal>CREATEDB</literal>
+   privilege. Therefore, regard roles that have the <literal>CREATEROLE</literal>
    privilege as almost-superuser-roles.
   </para>
 
   <para>
    <productname>PostgreSQL</productname> includes a program <xref
-   linkend="APP-CREATEUSER"> that has
+   linkend="app-createuser"/> that has
    the same functionality as <command>CREATE ROLE</command> (in fact,
    it calls this command) but can be run from the command shell.
   </para>
 
   <para>
-   The <literal>CONNECTION LIMIT</> option is only enforced approximately;
+   The <literal>CONNECTION LIMIT</literal> option is only enforced approximately;
    if two new sessions start at about the same time when just one
-   connection <quote>slot</> remains for the role, it is possible that
+   connection <quote>slot</quote> remains for the role, it is possible that
    both will fail.  Also, the limit is never enforced for superusers.
   </para>
 
@@ -402,8 +402,8 @@ CREATE ROLE <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
    with this command.  The password will be transmitted to the server
    in cleartext, and it might also be logged in the client's command
    history or the server log.  The command <xref
-   linkend="APP-CREATEUSER">, however, transmits
-   the password encrypted.  Also, <xref linkend="app-psql">
+   linkend="app-createuser"/>, however, transmits
+   the password encrypted.  Also, <xref linkend="app-psql"/>
    contains a command
    <command>\password</command> that can be used to safely change the
    password later.
@@ -425,8 +425,8 @@ CREATE ROLE jonathan LOGIN;
 <programlisting>
 CREATE USER davide WITH PASSWORD 'jw8s0F4';
 </programlisting>
-   (<command>CREATE USER</> is the same as <command>CREATE ROLE</> except
-   that it implies <literal>LOGIN</>.)
+   (<command>CREATE USER</command> is the same as <command>CREATE ROLE</command> except
+   that it implies <literal>LOGIN</literal>.)
   </para>
 
   <para>
@@ -453,7 +453,7 @@ CREATE ROLE admin WITH CREATEDB CREATEROLE;
    The <command>CREATE ROLE</command> statement is in the SQL standard,
    but the standard only requires the syntax
 <synopsis>
-CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable class="PARAMETER">role_name</> ]
+CREATE ROLE <replaceable class="parameter">name</replaceable> [ WITH ADMIN <replaceable class="parameter">role_name</replaceable> ]
 </synopsis>
    Multiple initial administrators, and all the other options of
    <command>CREATE ROLE</command>, are
@@ -471,8 +471,8 @@ CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable cla
 
   <para>
    The behavior specified by the SQL standard is most closely approximated
-   by giving users the <literal>NOINHERIT</> attribute, while roles are
-   given the <literal>INHERIT</> attribute.
+   by giving users the <literal>NOINHERIT</literal> attribute, while roles are
+   given the <literal>INHERIT</literal> attribute.
   </para>
  </refsect1>
 
@@ -480,12 +480,12 @@ CREATE ROLE <replaceable class="PARAMETER">name</> [ WITH ADMIN <replaceable cla
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-role"></member>
-   <member><xref linkend="sql-alterrole"></member>
-   <member><xref linkend="sql-droprole"></member>
-   <member><xref linkend="sql-grant"></member>
-   <member><xref linkend="sql-revoke"></member>
-   <member><xref linkend="app-createuser"></member>
+   <member><xref linkend="sql-set-role"/></member>
+   <member><xref linkend="sql-alterrole"/></member>
+   <member><xref linkend="sql-droprole"/></member>
+   <member><xref linkend="sql-grant"/></member>
+   <member><xref linkend="sql-revoke"/></member>
+   <member><xref linkend="app-createuser"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_rule.sgml b/doc/src/sgml/ref/create_rule.sgml
index 53fdf56621..dbf4c93784 100644
--- a/doc/src/sgml/ref/create_rule.sgml
+++ b/doc/src/sgml/ref/create_rule.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_rule.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATERULE">
+<refentry id="sql-createrule">
  <indexterm zone="sql-createrule">
   <primary>CREATE RULE</primary>
  </indexterm>
@@ -55,7 +55,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
    transformation happens before the execution of the command starts.
    If you actually want an operation that fires independently for each
    physical row, you probably want to use a trigger, not a rule.
-   More information about the rules system is in <xref linkend="rules">.
+   More information about the rules system is in <xref linkend="rules"/>.
   </para>
 
   <para>
@@ -76,13 +76,13 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
    <literal>ON DELETE</literal> rules (or any subset of those that's
    sufficient for your purposes) to replace update actions on the view
    with appropriate updates on other tables.  If you want to support
-   <command>INSERT RETURNING</> and so on, then be sure to put a suitable
-   <literal>RETURNING</> clause into each of these rules.
+   <command>INSERT RETURNING</command> and so on, then be sure to put a suitable
+   <literal>RETURNING</literal> clause into each of these rules.
   </para>
 
   <para>
    There is a catch if you try to use conditional rules for complex view
-   updates: there <emphasis>must</> be an unconditional
+   updates: there <emphasis>must</emphasis> be an unconditional
    <literal>INSTEAD</literal> rule for each action you wish to allow
    on the view.  If the rule is conditional, or is not
    <literal>INSTEAD</literal>, then the system will still reject
@@ -95,21 +95,21 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
    Then make the conditional rules non-<literal>INSTEAD</literal>; in
    the cases where they are applied, they add to the default
    <literal>INSTEAD NOTHING</literal> action.  (This method does not
-   currently work to support <literal>RETURNING</> queries, however.)
+   currently work to support <literal>RETURNING</literal> queries, however.)
   </para>
 
   <note>
    <para>
     A view that is simple enough to be automatically updatable (see <xref
-    linkend="sql-createview">) does not require a user-created rule in
+    linkend="sql-createview"/>) does not require a user-created rule in
     order to be updatable.  While you can create an explicit rule anyway,
     the automatic update transformation will generally outperform an
     explicit rule.
    </para>
 
    <para>
-    Another alternative worth considering is to use <literal>INSTEAD OF</>
-    triggers (see <xref linkend="sql-createtrigger">) in place of rules.
+    Another alternative worth considering is to use <literal>INSTEAD OF</literal>
+    triggers (see <xref linkend="sql-createtrigger"/>) in place of rules.
    </para>
   </note>
  </refsect1>
@@ -161,7 +161,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
      <para>
       Any <acronym>SQL</acronym> conditional expression (returning
       <type>boolean</type>).  The condition expression cannot refer
-      to any tables except <literal>NEW</> and <literal>OLD</>, and
+      to any tables except <literal>NEW</literal> and <literal>OLD</literal>, and
       cannot contain aggregate functions.
      </para>
     </listitem>
@@ -171,7 +171,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
     <term><option>INSTEAD</option></term>
     <listitem>
      <para><literal>INSTEAD</literal> indicates that the commands should be
-      executed <emphasis>instead of</> the original command.
+      executed <emphasis>instead of</emphasis> the original command.
      </para>
     </listitem>
    </varlistentry>
@@ -227,19 +227,19 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
 
   <para>
    In a rule for <literal>INSERT</literal>, <literal>UPDATE</literal>, or
-   <literal>DELETE</literal> on a view, you can add a <literal>RETURNING</>
+   <literal>DELETE</literal> on a view, you can add a <literal>RETURNING</literal>
    clause that emits the view's columns.  This clause will be used to compute
-   the outputs if the rule is triggered by an <command>INSERT RETURNING</>,
-   <command>UPDATE RETURNING</>, or <command>DELETE RETURNING</> command
+   the outputs if the rule is triggered by an <command>INSERT RETURNING</command>,
+   <command>UPDATE RETURNING</command>, or <command>DELETE RETURNING</command> command
    respectively.  When the rule is triggered by a command without
-   <literal>RETURNING</>, the rule's <literal>RETURNING</> clause will be
+   <literal>RETURNING</literal>, the rule's <literal>RETURNING</literal> clause will be
    ignored.  The current implementation allows only unconditional
-   <literal>INSTEAD</> rules to contain <literal>RETURNING</>; furthermore
-   there can be at most one <literal>RETURNING</> clause among all the rules
+   <literal>INSTEAD</literal> rules to contain <literal>RETURNING</literal>; furthermore
+   there can be at most one <literal>RETURNING</literal> clause among all the rules
    for the same event.  (This ensures that there is only one candidate
-   <literal>RETURNING</> clause to be used to compute the results.)
-   <literal>RETURNING</> queries on the view will be rejected if
-   there is no <literal>RETURNING</> clause in any available rule.
+   <literal>RETURNING</literal> clause to be used to compute the results.)
+   <literal>RETURNING</literal> queries on the view will be rejected if
+   there is no <literal>RETURNING</literal> clause in any available rule.
   </para>
 
   <para>
@@ -297,8 +297,8 @@ UPDATE mytable SET name = 'foo' WHERE id = 42;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterrule"></member>
-   <member><xref linkend="sql-droprule"></member>
+   <member><xref linkend="sql-alterrule"/></member>
+   <member><xref linkend="sql-droprule"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_schema.sgml b/doc/src/sgml/ref/create_schema.sgml
index 554a4483c5..ffbe1ba3bc 100644
--- a/doc/src/sgml/ref/create_schema.sgml
+++ b/doc/src/sgml/ref/create_schema.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_schema.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATESCHEMA">
+<refentry id="sql-createschema">
  <indexterm zone="sql-createschema">
   <primary>CREATE SCHEMA</primary>
  </indexterm>
@@ -21,14 +21,14 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ]
-CREATE SCHEMA AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ]
-CREATE SCHEMA IF NOT EXISTS <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable> ]
-CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_specification</replaceable>
+CREATE SCHEMA <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> ] [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ]
+CREATE SCHEMA AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> [ <replaceable class="parameter">schema_element</replaceable> [ ... ] ]
+CREATE SCHEMA IF NOT EXISTS <replaceable class="parameter">schema_name</replaceable> [ AUTHORIZATION <replaceable class="parameter">role_specification</replaceable> ]
+CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="parameter">role_specification</replaceable>
 
-<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
 
-    [ GROUP ] <replaceable class="PARAMETER">user_name</replaceable>
+    <replaceable class="parameter">user_name</replaceable>
   | CURRENT_USER
   | SESSION_USER
 </synopsis>
@@ -48,9 +48,9 @@ CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_sp
    A schema is essentially a namespace:
    it contains named objects (tables, data types, functions, and operators)
    whose names can duplicate those of other objects existing in other
-   schemas.  Named objects are accessed either by <quote>qualifying</>
+   schemas.  Named objects are accessed either by <quote>qualifying</quote>
    their names with the schema name as a prefix, or by setting a search
-   path that includes the desired schema(s).  A <literal>CREATE</> command
+   path that includes the desired schema(s).  A <literal>CREATE</literal> command
    specifying an unqualified object name creates the object
    in the current schema (the one at the front of the search path,
    which can be determined with the function <function>current_schema</function>).
@@ -60,7 +60,7 @@ CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_sp
    Optionally, <command>CREATE SCHEMA</command> can include subcommands
    to create objects within the new schema.  The subcommands are treated
    essentially the same as separate commands issued after creating the
-   schema, except that if the <literal>AUTHORIZATION</> clause is used,
+   schema, except that if the <literal>AUTHORIZATION</literal> clause is used,
    all the created objects will be owned by that user.
   </para>
  </refsect1>
@@ -100,10 +100,10 @@ CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_sp
        <para>
         An SQL statement defining an object to be created within the
         schema. Currently, only <command>CREATE
-        TABLE</>, <command>CREATE VIEW</>, <command>CREATE
-        INDEX</>, <command>CREATE SEQUENCE</>, <command>CREATE
-        TRIGGER</> and <command>GRANT</> are accepted as clauses
-        within <command>CREATE SCHEMA</>. Other kinds of objects may
+        TABLE</command>, <command>CREATE VIEW</command>, <command>CREATE
+        INDEX</command>, <command>CREATE SEQUENCE</command>, <command>CREATE
+        TRIGGER</command> and <command>GRANT</command> are accepted as clauses
+        within <command>CREATE SCHEMA</command>. Other kinds of objects may
         be created in separate commands after the schema is created.
        </para>
       </listitem>
@@ -114,7 +114,7 @@ CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_sp
       <listitem>
        <para>
         Do nothing (except issuing a notice) if a schema with the same name
-        already exists.  <replaceable class="parameter">schema_element</>
+        already exists.  <replaceable class="parameter">schema_element</replaceable>
         subcommands cannot be included when this option is used.
        </para>
       </listitem>
@@ -127,7 +127,7 @@ CREATE SCHEMA IF NOT EXISTS AUTHORIZATION <replaceable class="PARAMETER">role_sp
 
   <para>
    To create a schema, the invoking user must have the
-   <literal>CREATE</> privilege for the current database.
+   <literal>CREATE</literal> privilege for the current database.
    (Of course, superusers bypass this check.)
   </para>
  </refsect1>
@@ -143,17 +143,17 @@ CREATE SCHEMA myschema;
   </para>
 
   <para>
-   Create a schema for user <literal>joe</>; the schema will also be
-   named <literal>joe</>:
+   Create a schema for user <literal>joe</literal>; the schema will also be
+   named <literal>joe</literal>:
 <programlisting>
 CREATE SCHEMA AUTHORIZATION joe;
 </programlisting>
   </para>
 
   <para>
-   Create a schema named <literal>test</> that will be owned by user
-   <literal>joe</>, unless there already is a schema named <literal>test</>.
-   (It does not matter whether <literal>joe</> owns the pre-existing schema.)
+   Create a schema named <literal>test</literal> that will be owned by user
+   <literal>joe</literal>, unless there already is a schema named <literal>test</literal>.
+   (It does not matter whether <literal>joe</literal> owns the pre-existing schema.)
 <programlisting>
 CREATE SCHEMA IF NOT EXISTS test AUTHORIZATION joe;
 </programlisting>
@@ -185,7 +185,7 @@ CREATE VIEW hollywood.winners AS
   <title>Compatibility</title>
 
   <para>
-   The SQL standard allows a <literal>DEFAULT CHARACTER SET</> clause
+   The SQL standard allows a <literal>DEFAULT CHARACTER SET</literal> clause
    in <command>CREATE SCHEMA</command>, as well as more subcommand
    types than are presently accepted by
    <productname>PostgreSQL</productname>.
@@ -205,7 +205,7 @@ CREATE VIEW hollywood.winners AS
    all objects within it.  <productname>PostgreSQL</productname>
    allows schemas to contain objects owned by users other than the
    schema owner.  This can happen only if the schema owner grants the
-   <literal>CREATE</> privilege on their schema to someone else, or a
+   <literal>CREATE</literal> privilege on their schema to someone else, or a
    superuser chooses to create objects in it.
   </para>
 
@@ -219,8 +219,8 @@ CREATE VIEW hollywood.winners AS
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterschema"></member>
-   <member><xref linkend="sql-dropschema"></member>
+   <member><xref linkend="sql-alterschema"/></member>
+   <member><xref linkend="sql-dropschema"/></member>
  </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_sequence.sgml b/doc/src/sgml/ref/create_sequence.sgml
index f1448e7ab3..3e0d339c85 100644
--- a/doc/src/sgml/ref/create_sequence.sgml
+++ b/doc/src/sgml/ref/create_sequence.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_sequence.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATESEQUENCE">
+<refentry id="sql-createsequence">
  <indexterm zone="sql-createsequence">
   <primary>CREATE SEQUENCE</primary>
  </indexterm>
@@ -56,7 +56,7 @@ CREATE [ TEMPORARY | TEMP ] SEQUENCE [ IF NOT EXISTS ] <replaceable class="param
    <function>currval</function>, and
    <function>setval</function>
    to operate on the sequence.  These functions are documented in
-   <xref linkend="functions-sequence">.
+   <xref linkend="functions-sequence"/>.
   </para>
 
   <para>
@@ -67,10 +67,10 @@ SELECT * FROM <replaceable>name</replaceable>;
 </programlisting>
 
    to examine the parameters and current state of a sequence.  In particular,
-   the <literal>last_value</> field of the sequence shows the last value
+   the <literal>last_value</literal> field of the sequence shows the last value
    allocated by any session.  (Of course, this value might be obsolete
    by the time it's printed, if other sessions are actively doing
-   <function>nextval</> calls.)
+   <function>nextval</function> calls.)
   </para>
  </refsect1>
 
@@ -119,7 +119,7 @@ SELECT * FROM <replaceable>name</replaceable>;
       The optional
       clause <literal>AS <replaceable class="parameter">data_type</replaceable></literal>
       specifies the data type of the sequence.  Valid types are
-      are <literal>smallint</literal>, <literal>integer</literal>,
+      <literal>smallint</literal>, <literal>integer</literal>,
       and <literal>bigint</literal>.  <literal>bigint</literal> is the
       default.  The data type determines the default minimum and maximum
       values of the sequence.
@@ -250,14 +250,14 @@ SELECT * FROM <replaceable>name</replaceable>;
   </para>
 
   <para>
-   Sequences are based on <type>bigint</> arithmetic, so the range
+   Sequences are based on <type>bigint</type> arithmetic, so the range
    cannot exceed the range of an eight-byte integer
    (-9223372036854775808 to 9223372036854775807).
   </para>
 
   <para>
-   Because <function>nextval</> and <function>setval</> calls are never
-   rolled back, sequence objects cannot be used if <quote>gapless</>
+   Because <function>nextval</function> and <function>setval</function> calls are never
+   rolled back, sequence objects cannot be used if <quote>gapless</quote>
    assignment of sequence numbers is needed.  It is possible to build
    gapless assignment by using exclusive locking of a table containing a
    counter; but this solution is much more expensive than sequence
@@ -271,9 +271,9 @@ SELECT * FROM <replaceable>name</replaceable>;
    used for a sequence object that will be used concurrently by
    multiple sessions.  Each session will allocate and cache successive
    sequence values during one access to the sequence object and
-   increase the sequence object's <literal>last_value</> accordingly.
+   increase the sequence object's <literal>last_value</literal> accordingly.
    Then, the next <replaceable class="parameter">cache</replaceable>-1
-   uses of <function>nextval</> within that session simply return the
+   uses of <function>nextval</function> within that session simply return the
    preallocated values without touching the sequence object.  So, any
    numbers allocated but not used within a session will be lost when
    that session ends, resulting in <quote>holes</quote> in the
@@ -290,18 +290,18 @@ SELECT * FROM <replaceable>name</replaceable>;
    11..20 and return <function>nextval</function>=11 before session A
    has generated <literal>nextval</literal>=2.  Thus, with a
    <replaceable class="parameter">cache</replaceable> setting of one
-   it is safe to assume that <function>nextval</> values are generated
+   it is safe to assume that <function>nextval</function> values are generated
    sequentially; with a <replaceable
    class="parameter">cache</replaceable> setting greater than one you
-   should only assume that the <function>nextval</> values are all
+   should only assume that the <function>nextval</function> values are all
    distinct, not that they are generated purely sequentially.  Also,
-   <literal>last_value</> will reflect the latest value reserved by
+   <literal>last_value</literal> will reflect the latest value reserved by
    any session, whether or not it has yet been returned by
-   <function>nextval</>.
+   <function>nextval</function>.
   </para>
 
   <para>
-   Another consideration is that a <function>setval</> executed on
+   Another consideration is that a <function>setval</function> executed on
    such a sequence will not be noticed by other sessions until they
    have used up any preallocated values they have cached.
   </para>
@@ -365,14 +365,14 @@ END;
    <itemizedlist>
     <listitem>
      <para>
-      Obtaining the next value is done using the <function>nextval()</>
+      Obtaining the next value is done using the <function>nextval()</function>
       function instead of the standard's <command>NEXT VALUE FOR</command>
       expression.
      </para>
     </listitem>
     <listitem>
      <para>
-      The <literal>OWNED BY</> clause is a <productname>PostgreSQL</>
+      The <literal>OWNED BY</literal> clause is a <productname>PostgreSQL</productname>
       extension.
      </para>
     </listitem>
@@ -383,8 +383,8 @@ END;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altersequence"></member>
-   <member><xref linkend="sql-dropsequence"></member>
+   <member><xref linkend="sql-altersequence"/></member>
+   <member><xref linkend="sql-dropsequence"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_server.sgml b/doc/src/sgml/ref/create_server.sgml
index 7318481487..eb4ca890c2 100644
--- a/doc/src/sgml/ref/create_server.sgml
+++ b/doc/src/sgml/ref/create_server.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_server.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATESERVER">
+<refentry id="sql-createserver">
  <indexterm zone="sql-createserver">
   <primary>CREATE SERVER</primary>
  </indexterm>
@@ -23,7 +23,7 @@ PostgreSQL documentation
 <synopsis>
 CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replaceable> [ TYPE '<replaceable class="parameter">server_type</replaceable>' ] [ VERSION '<replaceable class="parameter">server_version</replaceable>' ]
     FOREIGN DATA WRAPPER <replaceable class="parameter">fdw_name</replaceable>
-    [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
+    [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -47,7 +47,7 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac
   </para>
 
   <para>
-   Creating a server requires <literal>USAGE</> privilege on the
+   Creating a server requires <literal>USAGE</literal> privilege on the
    foreign-data wrapper being used.
   </para>
  </refsect1>
@@ -57,7 +57,7 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac
 
   <variablelist>
   <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a server with the same name already exists.
@@ -105,7 +105,7 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies the options for the server.  The options
@@ -122,9 +122,9 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac
   <title>Notes</title>
 
   <para>
-   When using the <xref linkend="dblink"> module,
+   When using the <xref linkend="dblink"/> module,
    a foreign server's name can be used
-   as an argument of the <xref linkend="contrib-dblink-connect">
+   as an argument of the <xref linkend="contrib-dblink-connect"/>
    function to indicate the connection parameters.  It is necessary to have
    the <literal>USAGE</literal> privilege on the foreign server to be
    able to use it in this way.
@@ -135,12 +135,12 @@ CREATE SERVER [IF NOT EXISTS] <replaceable class="parameter">server_name</replac
   <title>Examples</title>
 
   <para>
-   Create a server <literal>myserver</> that uses the
-   foreign-data wrapper <literal>postgres_fdw</>:
+   Create a server <literal>myserver</literal> that uses the
+   foreign-data wrapper <literal>postgres_fdw</literal>:
 <programlisting>
 CREATE SERVER myserver FOREIGN DATA WRAPPER postgres_fdw OPTIONS (host 'foo', dbname 'foodb', port '5432');
 </programlisting>
-   See <xref linkend="postgres-fdw"> for more details.
+   See <xref linkend="postgres-fdw"/> for more details.
   </para>
  </refsect1>
 
@@ -156,11 +156,11 @@ CREATE SERVER myserver FOREIGN DATA WRAPPER postgres_fdw OPTIONS (host 'foo', db
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterserver"></member>
-   <member><xref linkend="sql-dropserver"></member>
-   <member><xref linkend="sql-createforeigndatawrapper"></member>
-   <member><xref linkend="sql-createforeigntable"></member>
-   <member><xref linkend="sql-createusermapping"></member>
+   <member><xref linkend="sql-alterserver"/></member>
+   <member><xref linkend="sql-dropserver"/></member>
+   <member><xref linkend="sql-createforeigndatawrapper"/></member>
+   <member><xref linkend="sql-createforeigntable"/></member>
+   <member><xref linkend="sql-createusermapping"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_statistics.sgml b/doc/src/sgml/ref/create_statistics.sgml
index deda21fec7..382a1eb64b 100644
--- a/doc/src/sgml/ref/create_statistics.sgml
+++ b/doc/src/sgml/ref/create_statistics.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_statistics.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATESTATISTICS">
+<refentry id="sql-createstatistics">
  <indexterm zone="sql-createstatistics">
   <primary>CREATE STATISTICS</primary>
  </indexterm>
@@ -21,15 +21,15 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_name</replaceable>
-    [ ( <replaceable class="PARAMETER">statistic_type</replaceable> [, ... ] ) ]
-    ON <replaceable class="PARAMETER">column_name</replaceable>, <replaceable class="PARAMETER">column_name</replaceable> [, ...]
-    FROM <replaceable class="PARAMETER">table_name</replaceable>
+CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="parameter">statistics_name</replaceable>
+    [ ( <replaceable class="parameter">statistics_kind</replaceable> [, ... ] ) ]
+    ON <replaceable class="parameter">column_name</replaceable>, <replaceable class="parameter">column_name</replaceable> [, ...]
+    FROM <replaceable class="parameter">table_name</replaceable>
 </synopsis>
 
  </refsynopsisdiv>
 
- <refsect1 id="SQL-CREATESTATISTICS-description">
+ <refsect1 id="sql-createstatistics-description">
   <title>Description</title>
 
   <para>
@@ -41,7 +41,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
 
   <para>
    If a schema name is given (for example, <literal>CREATE STATISTICS
-   myschema.mystat ...</>) then the statistics object is created in the
+   myschema.mystat ...</literal>) then the statistics object is created in the
    specified schema.  Otherwise it is created in the current schema.
    The name of the statistics object must be distinct from the name of any
    other statistics object in the same schema.
@@ -54,7 +54,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
   <variablelist>
 
    <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a statistics object with the same name already
@@ -66,7 +66,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">statistics_name</replaceable></term>
+    <term><replaceable class="parameter">statistics_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the statistics object to be
@@ -76,24 +76,24 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">statistic_type</replaceable></term>
+    <term><replaceable class="parameter">statistics_kind</replaceable></term>
     <listitem>
      <para>
-      A statistic type to be computed in this statistics object.
-      Currently supported types are
+      A statistics kind to be computed in this statistics object.
+      Currently supported kinds are
       <literal>ndistinct</literal>, which enables n-distinct statistics, and
       <literal>dependencies</literal>, which enables functional
       dependency statistics.
-      If this clause is omitted, all supported statistic types are
+      If this clause is omitted, all supported statistics kinds are
       included in the statistics object.
-      For more information, see <xref linkend="planner-stats-extended">
-      and <xref linkend="multivariate-statistics-examples">.
+      For more information, see <xref linkend="planner-stats-extended"/>
+      and <xref linkend="multivariate-statistics-examples"/>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a table column to be covered by the computed statistics.
@@ -103,7 +103,7 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table containing the
@@ -125,11 +125,11 @@ CREATE STATISTICS [ IF NOT EXISTS ] <replaceable class="PARAMETER">statistics_na
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATESTATISTICS-examples">
+ <refsect1 id="sql-createstatistics-examples">
   <title>Examples</title>
 
   <para>
-   Create table <structname>t1</> with two functionally dependent columns, i.e.
+   Create table <structname>t1</structname> with two functionally dependent columns, i.e.
    knowledge of a value in the first column is sufficient for determining the
    value in the other column. Then functional dependency statistics are built
    on those columns:
@@ -157,10 +157,10 @@ EXPLAIN ANALYZE SELECT * FROM t1 WHERE (a = 1) AND (b = 0);
 </programlisting>
 
    Without functional-dependency statistics, the planner would assume
-   that the two <literal>WHERE</> conditions are independent, and would
+   that the two <literal>WHERE</literal> conditions are independent, and would
    multiply their selectivities together to arrive at a much-too-small
    row count estimate.
-   With such statistics, the planner recognizes that the <literal>WHERE</>
+   With such statistics, the planner recognizes that the <literal>WHERE</literal>
    conditions are redundant and does not underestimate the rowcount.
   </para>
 
@@ -178,8 +178,8 @@ EXPLAIN ANALYZE SELECT * FROM t1 WHERE (a = 1) AND (b = 0);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterstatistics"></member>
-   <member><xref linkend="sql-dropstatistics"></member>
+   <member><xref linkend="sql-alterstatistics"/></member>
+   <member><xref linkend="sql-dropstatistics"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_subscription.sgml b/doc/src/sgml/ref/create_subscription.sgml
index 9f45b6f574..49e4841188 100644
--- a/doc/src/sgml/ref/create_subscription.sgml
+++ b/doc/src/sgml/ref/create_subscription.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_subscription.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATESUBSCRIPTION">
+<refentry id="sql-createsubscription">
  <indexterm zone="sql-createsubscription">
   <primary>CREATE SUBSCRIPTION</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceable>
-    CONNECTION '<replaceable class="PARAMETER">conninfo</replaceable>'
-    PUBLICATION <replaceable class="PARAMETER">publication_name</replaceable> [, ...]
+CREATE SUBSCRIPTION <replaceable class="parameter">subscription_name</replaceable>
+    CONNECTION '<replaceable class="parameter">conninfo</replaceable>'
+    PUBLICATION <replaceable class="parameter">publication_name</replaceable> [, ...]
     [ WITH ( <replaceable class="parameter">subscription_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
@@ -48,15 +48,10 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
    subscription at the commit of the transaction where this command is run.
   </para>
 
-  <para>
-   <command>CREATE SUBSCRIPTION</command> cannot be executed inside a
-   transaction block when the parameter <literal>create_slot</literal> is specified.
-  </para>
-
   <para>
    Additional info about subscriptions and logical replication as a whole
-   can is available at <xref linkend="logical-replication-subscription"> and
-   <xref linkend="logical-replication">.
+   can is available at <xref linkend="logical-replication-subscription"/> and
+   <xref linkend="logical-replication"/>.
   </para>
 
  </refsect1>
@@ -79,7 +74,7 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
     <listitem>
      <para>
       The connection string to the publisher.  For details
-      see <xref linkend="libpq-connstring">.
+      see <xref linkend="libpq-connstring"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -157,7 +152,7 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
         <listitem>
          <para>
           The value of this parameter overrides the
-          <xref linkend="guc-synchronous-commit"> setting.  The default
+          <xref linkend="guc-synchronous-commit"/> setting.  The default
           value is <literal>off</literal>.
          </para>
 
@@ -206,7 +201,7 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
           to <literal>false</literal>, the tables are not subscribed, and so
           after you enable the subscription nothing will be replicated.
           It is required to run
-          <literal>ALTER SUBSCRIPTION ... REFRESH PUBLICATION</> in order
+          <literal>ALTER SUBSCRIPTION ... REFRESH PUBLICATION</literal> in order
           for tables to be subscribed.
          </para>
         </listitem>
@@ -222,11 +217,16 @@ CREATE SUBSCRIPTION <replaceable class="PARAMETER">subscription_name</replaceabl
   <title>Notes</title>
 
   <para>
-   See <xref linkend="logical-replication-security"> for details on
+   See <xref linkend="logical-replication-security"/> for details on
    how to configure access control between the subscription and the
    publication instance.
   </para>
 
+  <para>
+   When creating a replication slot (the default behavior), <command>CREATE
+   SUBSCRIPTION</command> cannot be executed inside a transaction block.
+  </para>
+
   <para>
    Creating a subscription that connects to the same database cluster (for
    example, to replicate between databases in the same cluster or to replicate
@@ -272,7 +272,7 @@ CREATE SUBSCRIPTION mysub
   <title>Compatibility</title>
 
   <para>
-   <command>CREATE SUBSCRIPTION</command> is a <productname>PostgreSQL</>
+   <command>CREATE SUBSCRIPTION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -281,10 +281,10 @@ CREATE SUBSCRIPTION mysub
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altersubscription"></member>
-   <member><xref linkend="sql-dropsubscription"></member>
-   <member><xref linkend="sql-createpublication"></member>
-   <member><xref linkend="sql-alterpublication"></member>
+   <member><xref linkend="sql-altersubscription"/></member>
+   <member><xref linkend="sql-dropsubscription"/></member>
+   <member><xref linkend="sql-createpublication"/></member>
+   <member><xref linkend="sql-alterpublication"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml
index e9c2c49533..338dddd7cc 100644
--- a/doc/src/sgml/ref/create_table.sgml
+++ b/doc/src/sgml/ref/create_table.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_table.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETABLE">
+<refentry id="sql-createtable">
  <indexterm zone="sql-createtable">
   <primary>CREATE TABLE</primary>
  </indexterm>
@@ -21,88 +21,89 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable> ( [
-  { <replaceable class="PARAMETER">column_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
+CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable> ( [
+  { <replaceable class="parameter">column_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     | <replaceable>table_constraint</replaceable>
     | LIKE <replaceable>source_table</replaceable> [ <replaceable>like_option</replaceable> ... ] }
     [, ... ]
 ] )
 [ INHERITS ( <replaceable>parent_table</replaceable> [, ... ] ) ]
-[ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
-[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
+[ PARTITION BY { RANGE | LIST | HASH } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
+[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
 [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
 
-CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable>
-    OF <replaceable class="PARAMETER">type_name</replaceable> [ (
-  { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
+CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable>
+    OF <replaceable class="parameter">type_name</replaceable> [ (
+  { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     | <replaceable>table_constraint</replaceable> }
     [, ... ]
 ) ]
-[ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
-[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
+[ PARTITION BY { RANGE | LIST | HASH } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
+[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
 [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
 
-CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="PARAMETER">table_name</replaceable>
-    PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> [ (
-  { <replaceable class="PARAMETER">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="PARAMETER">column_constraint</replaceable> [ ... ] ]
+CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable class="parameter">table_name</replaceable>
+    PARTITION OF <replaceable class="parameter">parent_table</replaceable> [ (
+  { <replaceable class="parameter">column_name</replaceable> [ WITH OPTIONS ] [ <replaceable class="parameter">column_constraint</replaceable> [ ... ] ]
     | <replaceable>table_constraint</replaceable> }
     [, ... ]
-) ] FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable>
-[ PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
-[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
+) ] { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }
+[ PARTITION BY { RANGE | LIST | HASH } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ... ] ) ]
+[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
 [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-[ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+[ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
 
-<phrase>where <replaceable class="PARAMETER">column_constraint</replaceable> is:</phrase>
+<phrase>where <replaceable class="parameter">column_constraint</replaceable> is:</phrase>
 
-[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
 { NOT NULL |
   NULL |
-  CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] |
+  CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
   DEFAULT <replaceable>default_expr</replaceable> |
   GENERATED { ALWAYS | BY DEFAULT } AS IDENTITY [ ( <replaceable>sequence_options</replaceable> ) ] |
-  UNIQUE <replaceable class="PARAMETER">index_parameters</replaceable> |
-  PRIMARY KEY <replaceable class="PARAMETER">index_parameters</replaceable> |
-  REFERENCES <replaceable class="PARAMETER">reftable</replaceable> [ ( <replaceable class="PARAMETER">refcolumn</replaceable> ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]
+  UNIQUE <replaceable class="parameter">index_parameters</replaceable> |
+  PRIMARY KEY <replaceable class="parameter">index_parameters</replaceable> |
+  REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> ) ] [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ]
     [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
 [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 
-<phrase>and <replaceable class="PARAMETER">table_constraint</replaceable> is:</phrase>
+<phrase>and <replaceable class="parameter">table_constraint</replaceable> is:</phrase>
 
-[ CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable> ]
-{ CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] |
-  UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> |
-  PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) <replaceable class="PARAMETER">index_parameters</replaceable> |
+[ CONSTRAINT <replaceable class="parameter">constraint_name</replaceable> ]
+{ CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] |
+  UNIQUE ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> |
+  PRIMARY KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> |
   EXCLUDE [ USING <replaceable class="parameter">index_method</replaceable> ] ( <replaceable class="parameter">exclude_element</replaceable> WITH <replaceable class="parameter">operator</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> [ WHERE ( <replaceable class="parameter">predicate</replaceable> ) ] |
-  FOREIGN KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="PARAMETER">reftable</replaceable> [ ( <replaceable class="PARAMETER">refcolumn</replaceable> [, ... ] ) ]
+  FOREIGN KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] ) REFERENCES <replaceable class="parameter">reftable</replaceable> [ ( <replaceable class="parameter">refcolumn</replaceable> [, ... ] ) ]
     [ MATCH FULL | MATCH PARTIAL | MATCH SIMPLE ] [ ON DELETE <replaceable class="parameter">action</replaceable> ] [ ON UPDATE <replaceable class="parameter">action</replaceable> ] }
 [ DEFERRABLE | NOT DEFERRABLE ] [ INITIALLY DEFERRED | INITIALLY IMMEDIATE ]
 
-<phrase>and <replaceable class="PARAMETER">like_option</replaceable> is:</phrase>
+<phrase>and <replaceable class="parameter">like_option</replaceable> is:</phrase>
 
 { INCLUDING | EXCLUDING } { DEFAULTS | CONSTRAINTS | IDENTITY | INDEXES | STORAGE | COMMENTS | ALL }
 
-<phrase>and <replaceable class="PARAMETER">partition_bound_spec</replaceable> is:</phrase>
+<phrase>and <replaceable class="parameter">partition_bound_spec</replaceable> is:</phrase>
 
-IN ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | NULL } [, ...] ) |
-FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] )
-  TO ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replaceable class="PARAMETER">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] )
+IN ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | NULL } [, ...] ) |
+FROM ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] )
+  TO ( { <replaceable class="parameter">numeric_literal</replaceable> | <replaceable class="parameter">string_literal</replaceable> | MINVALUE | MAXVALUE } [, ...] ) |
+WITH ( MODULUS <replaceable class="parameter">numeric_literal</replaceable>, REMAINDER <replaceable class="parameter">numeric_literal</replaceable> )
 
-<phrase><replaceable class="PARAMETER">index_parameters</replaceable> in <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and <literal>EXCLUDE</literal> constraints are:</phrase>
+<phrase><replaceable class="parameter">index_parameters</replaceable> in <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>, and <literal>EXCLUDE</literal> constraints are:</phrase>
 
-[ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) ]
-[ USING INDEX TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+[ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) ]
+[ USING INDEX TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
 
-<phrase><replaceable class="PARAMETER">exclude_element</replaceable> in an <literal>EXCLUDE</literal> constraint is:</phrase>
+<phrase><replaceable class="parameter">exclude_element</replaceable> in an <literal>EXCLUDE</literal> constraint is:</phrase>
 
 { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [ ASC | DESC ] [ NULLS { FIRST | LAST } ]
 </synopsis>
 
  </refsynopsisdiv>
 
- <refsect1 id="SQL-CREATETABLE-description">
+ <refsect1 id="sql-createtable-description">
   <title>Description</title>
 
   <para>
@@ -113,7 +114,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
 
   <para>
    If a schema name is given (for example, <literal>CREATE TABLE
-   myschema.mytable ...</>) then the table is created in the specified
+   myschema.mytable ...</literal>) then the table is created in the specified
    schema.  Otherwise it is created in the current schema.  Temporary
    tables exist in a special schema, so a schema name cannot be given
    when creating a temporary table.  The name of the table must be
@@ -157,8 +158,8 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
 
   <variablelist>
 
-   <varlistentry id="SQL-CREATETABLE-TEMPORARY">
-    <term><literal>TEMPORARY</> or <literal>TEMP</></term>
+   <varlistentry id="sql-createtable-temporary">
+    <term><literal>TEMPORARY</literal> or <literal>TEMP</literal></term>
     <listitem>
      <para>
       If specified, the table is created as a temporary table.
@@ -177,27 +178,27 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       For this reason, appropriate vacuum and analyze operations should be
       performed via session SQL commands.  For example, if a temporary
       table is going to be used in complex queries, it is wise to run
-      <command>ANALYZE</> on the temporary table after it is populated.
+      <command>ANALYZE</command> on the temporary table after it is populated.
      </para>
 
      <para>
       Optionally, <literal>GLOBAL</literal> or <literal>LOCAL</literal>
-      can be written before <literal>TEMPORARY</> or <literal>TEMP</>.
-      This presently makes no difference in <productname>PostgreSQL</>
+      can be written before <literal>TEMPORARY</literal> or <literal>TEMP</literal>.
+      This presently makes no difference in <productname>PostgreSQL</productname>
       and is deprecated; see
       <xref linkend="sql-createtable-compatibility"
-      endterm="sql-createtable-compatibility-title">.
+      endterm="sql-createtable-compatibility-title"/>.
      </para>
     </listitem>
    </varlistentry>
 
-   <varlistentry id="SQL-CREATETABLE-UNLOGGED">
-    <term><literal>UNLOGGED</></term>
+   <varlistentry id="sql-createtable-unlogged">
+    <term><literal>UNLOGGED</literal></term>
     <listitem>
      <para>
       If specified, the table is created as an unlogged table.  Data written
       to unlogged tables is not written to the write-ahead log (see <xref
-      linkend="wal">), which makes them considerably faster than ordinary
+      linkend="wal"/>), which makes them considerably faster than ordinary
       tables.  However, they are not crash-safe: an unlogged table is
       automatically truncated after a crash or unclean shutdown.  The contents
       of an unlogged table are also not replicated to standby servers.
@@ -208,7 +209,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a relation with the same name already exists.
@@ -220,7 +221,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to be created.
@@ -229,7 +230,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OF <replaceable class="PARAMETER">type_name</replaceable></literal></term>
+    <term><literal>OF <replaceable class="parameter">type_name</replaceable></literal></term>
     <listitem>
      <para>
       Creates a <firstterm>typed table</firstterm>, which takes its
@@ -249,26 +250,30 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     </listitem>
    </varlistentry>
 
-   <varlistentry id="SQL-CREATETABLE-PARTITION">
-    <term><literal>PARTITION OF <replaceable class="PARAMETER">parent_table</replaceable> FOR VALUES <replaceable class="PARAMETER">partition_bound_spec</replaceable></literal></term>
+   <varlistentry id="sql-createtable-partition">
+    <term><literal>PARTITION OF <replaceable class="parameter">parent_table</replaceable> { FOR VALUES <replaceable class="parameter">partition_bound_spec</replaceable> | DEFAULT }</literal></term>
     <listitem>
      <para>
       Creates the table as a <firstterm>partition</firstterm> of the specified
-      parent table.
+      parent table. The table can be created either as a partition for specific
+      values using <literal>FOR VALUES</literal> or as a default partition
+      using <literal>DEFAULT</literal>.  This option is not available for
+      hash-partitioned tables.
      </para>
 
      <para>
-      The <replaceable class="PARAMETER">partition_bound_spec</replaceable>
+      The <replaceable class="parameter">partition_bound_spec</replaceable>
       must correspond to the partitioning method and partition key of the
       parent table, and must not overlap with any existing partition of that
-      parent.  The form with <literal>IN</> is used for list partitioning,
-      while the form with <literal>FROM</> and <literal>TO</> is used for
-      range partitioning.
+      parent.  The form with <literal>IN</literal> is used for list partitioning,
+      the form with <literal>FROM</literal> and <literal>TO</literal> is used
+      for range partitioning, and the form with <literal>WITH</literal> is used
+      for hash partitioning.
      </para>
 
      <para>
       Each of the values specified in
-      the <replaceable class="PARAMETER">partition_bound_spec</> is
+      the <replaceable class="parameter">partition_bound_spec</replaceable> is
       a literal, <literal>NULL</literal>, <literal>MINVALUE</literal>, or
       <literal>MAXVALUE</literal>.  Each literal value must be either a
       numeric constant that is coercible to the corresponding partition key
@@ -291,57 +296,99 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       are valid values of the corresponding partition key columns for this
       partition, whereas those in the <literal>TO</literal> list are
       not.  Note that this statement must be understood according to the
-      rules of row-wise comparison (<xref linkend="row-wise-comparison">).
-      For example, given <literal>PARTITION BY RANGE (x,y)</>, a partition
+      rules of row-wise comparison (<xref linkend="row-wise-comparison"/>).
+      For example, given <literal>PARTITION BY RANGE (x,y)</literal>, a partition
       bound <literal>FROM (1, 2) TO (3, 4)</literal>
-      allows <literal>x=1</> with any <literal>y&gt;=2</>,
-      <literal>x=2</> with any non-null <literal>y</>,
-      and <literal>x=3</> with any <literal>y&lt;4</>.
+      allows <literal>x=1</literal> with any <literal>y&gt;=2</literal>,
+      <literal>x=2</literal> with any non-null <literal>y</literal>,
+      and <literal>x=3</literal> with any <literal>y&lt;4</literal>.
      </para>
 
      <para>
-      The special values <literal>MINVALUE</> and <literal>MAXVALUE</>
+      The special values <literal>MINVALUE</literal> and <literal>MAXVALUE</literal>
       may be used when creating a range partition to indicate that there
       is no lower or upper bound on the column's value. For example, a
-      partition defined using <literal>FROM (MINVALUE) TO (10)</> allows
+      partition defined using <literal>FROM (MINVALUE) TO (10)</literal> allows
       any values less than 10, and a partition defined using
-      <literal>FROM (10) TO (MAXVALUE)</> allows any values greater than
+      <literal>FROM (10) TO (MAXVALUE)</literal> allows any values greater than
       or equal to 10.
      </para>
 
      <para>
       When creating a range partition involving more than one column, it
-      can also make sense to use <literal>MAXVALUE</> as part of the lower
-      bound, and <literal>MINVALUE</> as part of the upper bound. For
+      can also make sense to use <literal>MAXVALUE</literal> as part of the lower
+      bound, and <literal>MINVALUE</literal> as part of the upper bound. For
       example, a partition defined using
-      <literal>FROM (0, MAXVALUE) TO (10, MAXVALUE)</> allows any rows
+      <literal>FROM (0, MAXVALUE) TO (10, MAXVALUE)</literal> allows any rows
       where the first partition key column is greater than 0 and less than
       or equal to 10. Similarly, a partition defined using
-      <literal>FROM ('a', MINVALUE) TO ('b', MINVALUE)</> allows any rows
+      <literal>FROM ('a', MINVALUE) TO ('b', MINVALUE)</literal> allows any rows
       where the first partition key column starts with "a".
      </para>
 
      <para>
-      Note that any values after <literal>MINVALUE</> or
-      <literal>MAXVALUE</> in a partition bound are ignored; so the bound
-      <literal>(10, MINVALUE, 0)</> is equivalent to
-      <literal>(10, MINVALUE, 10)</> and <literal>(10, MINVALUE, MINVALUE)</>
-      and <literal>(10, MINVALUE, MAXVALUE)</>.
+      Note that if <literal>MINVALUE</literal> or <literal>MAXVALUE</literal> is used for
+      one column of a partitioning bound, the same value must be used for all
+      subsequent columns.  For example, <literal>(10, MINVALUE, 0)</literal> is not
+      a valid bound; you should write <literal>(10, MINVALUE, MINVALUE)</literal>.
      </para>
 
      <para>
-      Also note that some element types, such as <literal>timestamp</>,
+      Also note that some element types, such as <literal>timestamp</literal>,
       have a notion of "infinity", which is just another value that can
-      be stored. This is different from <literal>MINVALUE</> and
-      <literal>MAXVALUE</>, which are not real values that can be stored,
+      be stored. This is different from <literal>MINVALUE</literal> and
+      <literal>MAXVALUE</literal>, which are not real values that can be stored,
       but rather they are ways of saying that the value is unbounded.
-      <literal>MAXVALUE</> can be thought of as being greater than any
-      other value, including "infinity" and <literal>MINVALUE</> as being
+      <literal>MAXVALUE</literal> can be thought of as being greater than any
+      other value, including "infinity" and <literal>MINVALUE</literal> as being
       less than any other value, including "minus infinity". Thus the range
-      <literal>FROM ('infinity') TO (MAXVALUE)</> is not an empty range; it
+      <literal>FROM ('infinity') TO (MAXVALUE)</literal> is not an empty range; it
       allows precisely one value to be stored &mdash; "infinity".
      </para>
 
+     <para>
+      If <literal>DEFAULT</literal> is specified, the table will be
+      created as a default partition of the parent table. The parent can
+      either be a list or range partitioned table. A partition key value
+      not fitting into any other partition of the given parent will be
+      routed to the default partition. There can be only one default
+      partition for a given parent table.
+     </para>
+
+     <para>
+      When a table has an existing <literal>DEFAULT</literal> partition and
+      a new partition is added to it, the existing default partition must
+      be scanned to verify that it does not contain any rows which properly
+      belong in the new partition.  If the default partition contains a
+      large number of rows, this may be slow.  The scan will be skipped if
+      the default partition is a foreign table or if it has a constraint which
+      proves that it cannot contain rows which should be placed in the new
+      partition.
+     </para>
+
+     <para>
+      When creating a hash partition, a modulus and remainder must be specified.
+      The modulus must be a positive integer, and the remainder must be a
+      non-negative integer less than the modulus.  Typically, when initially
+      setting up a hash-partitioned table, you should choose a modulus equal to
+      the number of partitions and assign every table the same modulus and a
+      different remainder (see examples, below).   However, it is not required
+      that every partition have the same modulus, only that every modulus which
+      occurs among the partitions of a hash-partitioned table is a factor of the
+      next larger modulus.  This allows the number of partitions to be increased
+      incrementally without needing to move all the data at once.  For example,
+      suppose you have a hash-partitioned table with 8 partitions, each of which
+      has modulus 8, but find it necessary to increase the number of partitions
+      to 16.  You can detach one of the modulus-8 partitions, create two new
+      modulus-16 partitions covering the same portion of the key space (one with
+      a remainder equal to the remainder of the detached partition, and the
+      other with a remainder equal to that value plus 8), and repopulate them
+      with data.  You can then repeat this -- perhaps at a later time -- for
+      each modulus-8 partition until none remain.  While this may still involve
+      a large amount of data movement at each step, it is still better than
+      having to create a whole new table and move all the data at once.
+     </para>
+
      <para>
       A partition must have the same column names and types as the partitioned
       table to which it belongs.  If the parent is specified <literal>WITH
@@ -349,9 +396,9 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       column will be inherited by all partitions just like any other column.
       Modifications to the column names or types of a partitioned table, or
       the addition or removal of an OID column, will automatically propagate
-      to all partitions.  <literal>CHECK</> constraints will be inherited
+      to all partitions.  <literal>CHECK</literal> constraints will be inherited
       automatically by every partition, but an individual partition may specify
-      additional <literal>CHECK</> constraints; additional constraints with
+      additional <literal>CHECK</literal> constraints; additional constraints with
       the same name and condition as in the parent will be merged with the
       parent constraint.  Defaults may be specified separately for each
       partition.
@@ -376,7 +423,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a column to be created in the new table.
@@ -385,13 +432,13 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">data_type</replaceable></term>
+    <term><replaceable class="parameter">data_type</replaceable></term>
     <listitem>
      <para>
       The data type of the column. This can include array
       specifiers. For more information on the data types supported by
       <productname>PostgreSQL</productname>, refer to <xref
-      linkend="datatype">.
+      linkend="datatype"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -400,7 +447,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <term><literal>COLLATE <replaceable>collation</replaceable></literal></term>
     <listitem>
      <para>
-      The <literal>COLLATE</> clause assigns a collation to
+      The <literal>COLLATE</literal> clause assigns a collation to
       the column (which must be of a collatable data type).
       If not specified, the column data type's default collation is used.
      </para>
@@ -411,13 +458,13 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <term><literal>INHERITS ( <replaceable>parent_table</replaceable> [, ... ] )</literal></term>
     <listitem>
      <para>
-      The optional <literal>INHERITS</> clause specifies a list of
+      The optional <literal>INHERITS</literal> clause specifies a list of
       tables from which the new table automatically inherits all
       columns.  Parent tables can be plain tables or foreign tables.
      </para>
 
      <para>
-      Use of <literal>INHERITS</> creates a persistent relationship
+      Use of <literal>INHERITS</literal> creates a persistent relationship
       between the new child table and its parent table(s).  Schema
       modifications to the parent(s) normally propagate to children
       as well, and by default the data of the child table is included in
@@ -441,19 +488,19 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      </para>
 
      <para>
-      <literal>CHECK</> constraints are merged in essentially the same way as
+      <literal>CHECK</literal> constraints are merged in essentially the same way as
       columns: if multiple parent tables and/or the new table definition
-      contain identically-named <literal>CHECK</> constraints, these
+      contain identically-named <literal>CHECK</literal> constraints, these
       constraints must all have the same check expression, or an error will be
       reported.  Constraints having the same name and expression will
-      be merged into one copy.  A constraint marked <literal>NO INHERIT</> in a
-      parent will not be considered.  Notice that an unnamed <literal>CHECK</>
+      be merged into one copy.  A constraint marked <literal>NO INHERIT</literal> in a
+      parent will not be considered.  Notice that an unnamed <literal>CHECK</literal>
       constraint in the new table will never be merged, since a unique name
       will always be chosen for it.
      </para>
 
      <para>
-      Column <literal>STORAGE</> settings are also copied from parent tables.
+      Column <literal>STORAGE</literal> settings are also copied from parent tables.
      </para>
 
      <para>
@@ -465,25 +512,33 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>PARTITION BY { RANGE | LIST } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) </literal></term>
+    <term><literal>PARTITION BY { RANGE | LIST | HASH } ( { <replaceable class="parameter">column_name</replaceable> | ( <replaceable class="parameter">expression</replaceable> ) } [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) </literal></term>
     <listitem>
      <para>
       The optional <literal>PARTITION BY</literal> clause specifies a strategy
       of partitioning the table.  The table thus created is called a
       <firstterm>partitioned</firstterm> table.  The parenthesized list of
       columns or expressions forms the <firstterm>partition key</firstterm>
-      for the table.  When using range partitioning, the partition key can
-      include multiple columns or expressions (up to 32, but this limit can
-      altered when building <productname>PostgreSQL</productname>.), but for
+      for the table.  When using range or hash partitioning, the partition key
+      can include multiple columns or expressions (up to 32, but this limit can
+      be altered when building <productname>PostgreSQL</productname>), but for
       list partitioning, the partition key must consist of a single column or
-      expression.  If no B-tree operator class is specified when creating a
-      partitioned table, the default B-tree operator class for the datatype will
-      be used.  If there is none, an error will be reported.
+      expression.
+     </para>
+
+     <para>
+      Range and list partitioning require a btree operator class, while hash
+      partitioning requires a hash operator class.  If no operator class is
+      specified explicitly, the default operator class of the appropriate
+      type will be used; if no default operator class exists, an error will
+      be raised.  When hash partitioning is used, the operator class used
+      must implement support function 2 (see <xref linkend="xindex-support"/>
+      for details).
      </para>
 
      <para>
       A partitioned table is divided into sub-tables (called partitions),
-      which are created using separate <literal>CREATE TABLE</> commands.
+      which are created using separate <literal>CREATE TABLE</literal> commands.
       The partitioned table is itself empty.  A data row inserted into the
       table is routed to a partition based on the value of columns or
       expressions in the partition key.  If no existing partition matches
@@ -491,8 +546,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      </para>
 
      <para>
-      Partitioned tables do not support <literal>UNIQUE</literal>,
-      <literal>PRIMARY KEY</literal>, <literal>EXCLUDE</literal>, or
+      Partitioned tables do not support <literal>EXCLUDE</literal> or
       <literal>FOREIGN KEY</literal> constraints; however, you can define
       these constraints on individual partitions.
      </para>
@@ -521,7 +575,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       default behavior is to exclude default expressions, resulting in the
       copied columns in the new table having null defaults.
       Note that copying defaults that call database-modification functions,
-      such as <function>nextval</>, may create a functional linkage between
+      such as <function>nextval</function>, may create a functional linkage between
       the original and new tables.
      </para>
      <para>
@@ -538,8 +592,8 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       constraints.
      </para>
      <para>
-      Indexes, <literal>PRIMARY KEY</>, <literal>UNIQUE</>,
-      and <literal>EXCLUDE</> constraints on the original table will be
+      Indexes, <literal>PRIMARY KEY</literal>, <literal>UNIQUE</literal>,
+      and <literal>EXCLUDE</literal> constraints on the original table will be
       created on the new table only if <literal>INCLUDING INDEXES</literal>
       is specified.  Names for the new indexes and constraints are
       chosen according to the default rules, regardless of how the originals
@@ -547,12 +601,12 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       the new indexes.)
      </para>
      <para>
-      <literal>STORAGE</> settings for the copied column definitions will be
+      <literal>STORAGE</literal> settings for the copied column definitions will be
       copied only if <literal>INCLUDING STORAGE</literal> is specified.  The
-      default behavior is to exclude <literal>STORAGE</> settings, resulting
+      default behavior is to exclude <literal>STORAGE</literal> settings, resulting
       in the copied columns in the new table having type-specific default
-      settings.  For more on <literal>STORAGE</> settings, see
-      <xref linkend="storage-toast">.
+      settings.  For more on <literal>STORAGE</literal> settings, see
+      <xref linkend="storage-toast"/>.
      </para>
      <para>
       Comments for the copied columns, constraints, and indexes
@@ -566,7 +620,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      </para>
      <para>
       Note that unlike <literal>INHERITS</literal>, columns and
-      constraints copied by <literal>LIKE</> are not merged with similarly
+      constraints copied by <literal>LIKE</literal> are not merged with similarly
       named columns and constraints.
       If the same name is specified explicitly or in another
       <literal>LIKE</literal> clause, an error is signaled.
@@ -581,12 +635,12 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable></literal></term>
+    <term><literal>CONSTRAINT <replaceable class="parameter">constraint_name</replaceable></literal></term>
     <listitem>
      <para>
       An optional name for a column or table constraint.  If the
       constraint is violated, the constraint name is present in error messages,
-      so constraint names like <literal>col must be positive</> can be used
+      so constraint names like <literal>col must be positive</literal> can be used
       to communicate helpful constraint information to client applications.
       (Double-quotes are needed to specify constraint names that contain spaces.)
       If a constraint name is not specified, the system generates a name.
@@ -595,7 +649,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NOT NULL</></term>
+    <term><literal>NOT NULL</literal></term>
     <listitem>
      <para>
       The column is not allowed to contain null values.
@@ -604,7 +658,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>NULL</></term>
+    <term><literal>NULL</literal></term>
     <listitem>
      <para>
       The column is allowed to contain null values. This is the default.
@@ -619,10 +673,10 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>CHECK ( <replaceable class="PARAMETER">expression</replaceable> ) [ NO INHERIT ] </literal></term>
+    <term><literal>CHECK ( <replaceable class="parameter">expression</replaceable> ) [ NO INHERIT ] </literal></term>
     <listitem>
      <para>
-      The <literal>CHECK</> clause specifies an expression producing a
+      The <literal>CHECK</literal> clause specifies an expression producing a
       Boolean result which new or updated rows must satisfy for an
       insert or update operation to succeed.  Expressions evaluating
       to TRUE or UNKNOWN succeed.  Should any row of an insert or
@@ -641,15 +695,15 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      </para>
 
      <para>
-      A constraint marked with <literal>NO INHERIT</> will not propagate to
+      A constraint marked with <literal>NO INHERIT</literal> will not propagate to
       child tables.
      </para>
 
      <para>
       When a table has multiple <literal>CHECK</literal> constraints,
       they will be tested for each row in alphabetical order by name,
-      after checking <literal>NOT NULL</> constraints.
-      (<productname>PostgreSQL</> versions before 9.5 did not honor any
+      after checking <literal>NOT NULL</literal> constraints.
+      (<productname>PostgreSQL</productname> versions before 9.5 did not honor any
       particular firing order for <literal>CHECK</literal> constraints.)
      </para>
     </listitem>
@@ -660,7 +714,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <replaceable>default_expr</replaceable></literal></term>
     <listitem>
      <para>
-      The <literal>DEFAULT</> clause assigns a default data value for
+      The <literal>DEFAULT</literal> clause assigns a default data value for
       the column whose column definition it appears within.  The value
       is any variable-free expression (subqueries and cross-references
       to other columns in the current table are not allowed).  The
@@ -694,7 +748,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       only accepted if the <command>INSERT</command> statement
       specifies <literal>OVERRIDING SYSTEM VALUE</literal>.  If <literal>BY
       DEFAULT</literal> is specified, then the user-specified value takes
-      precedence.  See <xref linkend="sql-insert"> for details.  (In
+      precedence.  See <xref linkend="sql-insert"/> for details.  (In
       the <command>COPY</command> command, user-specified values are always
       used regardless of this setting.)
      </para>
@@ -702,14 +756,14 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      <para>
       The optional <replaceable>sequence_options</replaceable> clause can be
       used to override the options of the sequence.
-      See <xref linkend="sql-createsequence"> for details.
+      See <xref linkend="sql-createsequence"/> for details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>UNIQUE</> (column constraint)</term>
-    <term><literal>UNIQUE ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )</> (table constraint)</term>
+    <term><literal>UNIQUE</literal> (column constraint)</term>
+    <term><literal>UNIQUE ( <replaceable class="parameter">column_name</replaceable> [, ... ] )</literal> (table constraint)</term>
 
     <listitem>
      <para>
@@ -731,15 +785,23 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       primary key constraint defined for the table.  (Otherwise it
       would just be the same constraint listed twice.)
      </para>
+
+     <para>
+      When used on partitioned tables, unique constraints must include all the
+      columns of the partition key.
+      If any partitions are in turn partitioned, all columns of each partition
+      key are considered at each level below the <literal>UNIQUE</literal>
+      constraint.
+     </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>PRIMARY KEY</> (column constraint)</term>
-    <term><literal>PRIMARY KEY ( <replaceable class="PARAMETER">column_name</replaceable> [, ... ] )</> (table constraint)</term>
+    <term><literal>PRIMARY KEY</literal> (column constraint)</term>
+    <term><literal>PRIMARY KEY ( <replaceable class="parameter">column_name</replaceable> [, ... ] )</literal> (table constraint)</term>
     <listitem>
      <para>
-      The <literal>PRIMARY KEY</> constraint specifies that a column or
+      The <literal>PRIMARY KEY</literal> constraint specifies that a column or
       columns of a table can contain only unique (non-duplicate), nonnull
       values. Only one primary key can be specified for a table, whether as a
       column constraint or a table constraint.
@@ -754,58 +816,65 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
 
      <para>
       <literal>PRIMARY KEY</literal> enforces the same data constraints as
-      a combination of <literal>UNIQUE</> and <literal>NOT NULL</>, but
+      a combination of <literal>UNIQUE</literal> and <literal>NOT NULL</literal>, but
       identifying a set of columns as the primary key also provides metadata
       about the design of the schema, since a primary key implies that other
       tables can rely on this set of columns as a unique identifier for rows.
      </para>
+
+     <para>
+      <literal>PRIMARY KEY</literal> constraints share the restrictions that
+      <literal>UNIQUE</literal> constraints have when placed on partitioned
+      tables.
+     </para>
+
     </listitem>
    </varlistentry>
 
-   <varlistentry id="SQL-CREATETABLE-EXCLUDE">
+   <varlistentry id="sql-createtable-exclude">
     <term><literal>EXCLUDE [ USING <replaceable class="parameter">index_method</replaceable> ] ( <replaceable class="parameter">exclude_element</replaceable> WITH <replaceable class="parameter">operator</replaceable> [, ... ] ) <replaceable class="parameter">index_parameters</replaceable> [ WHERE ( <replaceable class="parameter">predicate</replaceable> ) ]</literal></term>
     <listitem>
      <para>
-      The <literal>EXCLUDE</> clause defines an exclusion
+      The <literal>EXCLUDE</literal> clause defines an exclusion
       constraint, which guarantees that if
       any two rows are compared on the specified column(s) or
       expression(s) using the specified operator(s), not all of these
-      comparisons will return <literal>TRUE</>.  If all of the
+      comparisons will return <literal>TRUE</literal>.  If all of the
       specified operators test for equality, this is equivalent to a
-      <literal>UNIQUE</> constraint, although an ordinary unique constraint
+      <literal>UNIQUE</literal> constraint, although an ordinary unique constraint
       will be faster.  However, exclusion constraints can specify
       constraints that are more general than simple equality.
       For example, you can specify a constraint that
       no two rows in the table contain overlapping circles
-      (see <xref linkend="datatype-geometric">) by using the
-      <literal>&amp;&amp;</> operator.
+      (see <xref linkend="datatype-geometric"/>) by using the
+      <literal>&amp;&amp;</literal> operator.
      </para>
 
      <para>
       Exclusion constraints are implemented using
       an index, so each specified operator must be associated with an
       appropriate operator class
-      (see <xref linkend="indexes-opclass">) for the index access
-      method <replaceable>index_method</>.
+      (see <xref linkend="indexes-opclass"/>) for the index access
+      method <replaceable>index_method</replaceable>.
       The operators are required to be commutative.
       Each <replaceable class="parameter">exclude_element</replaceable>
       can optionally specify an operator class and/or ordering options;
       these are described fully under
-      <xref linkend="sql-createindex">.
+      <xref linkend="sql-createindex"/>.
      </para>
 
      <para>
-      The access method must support <literal>amgettuple</> (see <xref
-      linkend="indexam">); at present this means <acronym>GIN</>
+      The access method must support <literal>amgettuple</literal> (see <xref
+      linkend="indexam"/>); at present this means <acronym>GIN</acronym>
       cannot be used.  Although it's allowed, there is little point in using
       B-tree or hash indexes with an exclusion constraint, because this
       does nothing that an ordinary unique constraint doesn't do better.
-      So in practice the access method will always be <acronym>GiST</> or
-      <acronym>SP-GiST</>.
+      So in practice the access method will always be <acronym>GiST</acronym> or
+      <acronym>SP-GiST</acronym>.
      </para>
 
      <para>
-      The <replaceable class="parameter">predicate</> allows you to specify an
+      The <replaceable class="parameter">predicate</replaceable> allows you to specify an
       exclusion constraint on a subset of the table; internally this creates a
       partial index. Note that parentheses are required around the predicate.
      </para>
@@ -832,7 +901,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       primary key of the <replaceable class="parameter">reftable</replaceable>
       is used.  The referenced columns must be the columns of a non-deferrable
       unique or primary key constraint in the referenced table.  The user
-      must have <literal>REFERENCES</> permission on the referenced table
+      must have <literal>REFERENCES</literal> permission on the referenced table
       (either the whole table, or the specific referenced columns).
       Note that foreign key constraints cannot be defined between temporary
       tables and permanent tables.
@@ -842,16 +911,16 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       A value inserted into the referencing column(s) is matched against the
       values of the referenced table and referenced columns using the
       given match type.  There are three match types: <literal>MATCH
-      FULL</>, <literal>MATCH PARTIAL</>, and <literal>MATCH
+      FULL</literal>, <literal>MATCH PARTIAL</literal>, and <literal>MATCH
       SIMPLE</literal> (which is the default).  <literal>MATCH
-      FULL</> will not allow one column of a multicolumn foreign key
+      FULL</literal> will not allow one column of a multicolumn foreign key
       to be null unless all foreign key columns are null; if they are all
       null, the row is not required to have a match in the referenced table.
       <literal>MATCH SIMPLE</literal> allows any of the foreign key columns
       to be null; if any of them are null, the row is not required to have a
       match in the referenced table.
-      <literal>MATCH PARTIAL</> is not yet implemented.
-      (Of course, <literal>NOT NULL</> constraints can be applied to the
+      <literal>MATCH PARTIAL</literal> is not yet implemented.
+      (Of course, <literal>NOT NULL</literal> constraints can be applied to the
       referencing column(s) to prevent these cases from arising.)
      </para>
 
@@ -946,15 +1015,15 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       constraint that is not deferrable will be checked immediately
       after every command.  Checking of constraints that are
       deferrable can be postponed until the end of the transaction
-      (using the <xref linkend="sql-set-constraints"> command).
+      (using the <xref linkend="sql-set-constraints"/> command).
       <literal>NOT DEFERRABLE</literal> is the default.
-      Currently, only <literal>UNIQUE</>, <literal>PRIMARY KEY</>,
-      <literal>EXCLUDE</>, and
-      <literal>REFERENCES</> (foreign key) constraints accept this
-      clause.  <literal>NOT NULL</> and <literal>CHECK</> constraints are not
+      Currently, only <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>,
+      <literal>EXCLUDE</literal>, and
+      <literal>REFERENCES</literal> (foreign key) constraints accept this
+      clause.  <literal>NOT NULL</literal> and <literal>CHECK</literal> constraints are not
       deferrable.  Note that deferrable constraints cannot be used as
       conflict arbitrators in an <command>INSERT</command> statement that
-      includes an <literal>ON CONFLICT DO UPDATE</> clause.
+      includes an <literal>ON CONFLICT DO UPDATE</literal> clause.
      </para>
     </listitem>
    </varlistentry>
@@ -970,28 +1039,28 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
       statement. This is the default.  If the constraint is
       <literal>INITIALLY DEFERRED</literal>, it is checked only at the
       end of the transaction.  The constraint check time can be
-      altered with the <xref linkend="sql-set-constraints"> command.
+      altered with the <xref linkend="sql-set-constraints"/> command.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term>
+    <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies optional storage parameters for a table or index;
       see <xref linkend="sql-createtable-storage-parameters"
-      endterm="sql-createtable-storage-parameters-title"> for more
-      information.  The <literal>WITH</> clause for a
-      table can also include <literal>OIDS=TRUE</> (or just <literal>OIDS</>)
+      endterm="sql-createtable-storage-parameters-title"/> for more
+      information.  The <literal>WITH</literal> clause for a
+      table can also include <literal>OIDS=TRUE</literal> (or just <literal>OIDS</literal>)
       to specify that rows of the new table
       should have OIDs (object identifiers) assigned to them, or
-      <literal>OIDS=FALSE</> to specify that the rows should not have OIDs.
-      If <literal>OIDS</> is not specified, the default setting depends upon
-      the <xref linkend="guc-default-with-oids"> configuration parameter.
+      <literal>OIDS=FALSE</literal> to specify that the rows should not have OIDs.
+      If <literal>OIDS</literal> is not specified, the default setting depends upon
+      the <xref linkend="guc-default-with-oids"/> configuration parameter.
       (If the new table inherits from any tables that have OIDs, then
-      <literal>OIDS=TRUE</> is forced even if the command says
-      <literal>OIDS=FALSE</>.)
+      <literal>OIDS=TRUE</literal> is forced even if the command says
+      <literal>OIDS=FALSE</literal>.)
      </para>
 
      <para>
@@ -1008,20 +1077,20 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
 
      <para>
       To remove OIDs from a table after it has been created, use <xref
-      linkend="sql-altertable">.
+      linkend="sql-altertable"/>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH OIDS</></term>
-    <term><literal>WITHOUT OIDS</></term>
+    <term><literal>WITH OIDS</literal></term>
+    <term><literal>WITHOUT OIDS</literal></term>
     <listitem>
      <para>
-      These are obsolescent syntaxes equivalent to <literal>WITH (OIDS)</>
-      and <literal>WITH (OIDS=FALSE)</>, respectively.  If you wish to give
-      both an <literal>OIDS</> setting and storage parameters, you must use
-      the <literal>WITH ( ... )</> syntax; see above.
+      These are obsolescent syntaxes equivalent to <literal>WITH (OIDS)</literal>
+      and <literal>WITH (OIDS=FALSE)</literal>, respectively.  If you wish to give
+      both an <literal>OIDS</literal> setting and storage parameters, you must use
+      the <literal>WITH ( ... )</literal> syntax; see above.
      </para>
     </listitem>
    </varlistentry>
@@ -1051,7 +1120,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
          <para>
           All rows in the temporary table will be deleted at the end
           of each transaction block.  Essentially, an automatic <xref
-          linkend="sql-truncate"> is done
+          linkend="sql-truncate"/> is done
           at each commit.
          </para>
         </listitem>
@@ -1071,53 +1140,53 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term>
+    <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term>
     <listitem>
      <para>
-      The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name
+      The <replaceable class="parameter">tablespace_name</replaceable> is the name
       of the tablespace in which the new table is to be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is consulted, or
-      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
+      <xref linkend="guc-default-tablespace"/> is consulted, or
+      <xref linkend="guc-temp-tablespaces"/> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>USING INDEX TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term>
+    <term><literal>USING INDEX TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term>
     <listitem>
      <para>
       This clause allows selection of the tablespace in which the index
       associated with a <literal>UNIQUE</literal>, <literal>PRIMARY
-      KEY</literal>, or <literal>EXCLUDE</> constraint will be created.
+      KEY</literal>, or <literal>EXCLUDE</literal> constraint will be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is consulted, or
-      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
+      <xref linkend="guc-default-tablespace"/> is consulted, or
+      <xref linkend="guc-temp-tablespaces"/> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
 
   </variablelist>
 
-  <refsect2 id="SQL-CREATETABLE-storage-parameters">
-   <title id="SQL-CREATETABLE-storage-parameters-title">Storage Parameters</title>
+  <refsect2 id="sql-createtable-storage-parameters">
+   <title id="sql-createtable-storage-parameters-title">Storage Parameters</title>
 
  <indexterm zone="sql-createtable-storage-parameters">
   <primary>storage parameters</primary>
  </indexterm>
 
    <para>
-    The <literal>WITH</> clause can specify <firstterm>storage parameters</>
+    The <literal>WITH</literal> clause can specify <firstterm>storage parameters</firstterm>
     for tables, and for indexes associated with a <literal>UNIQUE</literal>,
-    <literal>PRIMARY KEY</literal>, or <literal>EXCLUDE</> constraint.
+    <literal>PRIMARY KEY</literal>, or <literal>EXCLUDE</literal> constraint.
     Storage parameters for
-    indexes are documented in <xref linkend="SQL-CREATEINDEX">.
+    indexes are documented in <xref linkend="sql-createindex"/>.
     The storage parameters currently
     available for tables are listed below.  For many of these parameters, as
     shown, there is an additional parameter with the same name prefixed with
     <literal>toast.</literal>, which controls the behavior of the
-    table's secondary <acronym>TOAST</> table, if any
-    (see <xref linkend="storage-toast"> for more information about TOAST).
+    table's secondary <acronym>TOAST</acronym> table, if any
+    (see <xref linkend="storage-toast"/> for more information about TOAST).
     If a table parameter value is set and the
     equivalent <literal>toast.</literal> parameter is not, the TOAST table
     will use the table's parameter value.
@@ -1128,14 +1197,14 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    <variablelist>
 
    <varlistentry>
-    <term><literal>fillfactor</> (<type>integer</>)</term>
+    <term><literal>fillfactor</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
       The fillfactor for a table is a percentage between 10 and 100.
       100 (complete packing) is the default.  When a smaller fillfactor
-      is specified, <command>INSERT</> operations pack table pages only
+      is specified, <command>INSERT</command> operations pack table pages only
       to the indicated percentage; the remaining space on each page is
-      reserved for updating rows on that page.  This gives <command>UPDATE</>
+      reserved for updating rows on that page.  This gives <command>UPDATE</command>
       a chance to place the updated copy of a row on the same page as the
       original, which is more efficient than placing it on a different page.
       For a table whose entries are never updated, complete packing is the
@@ -1146,119 +1215,140 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
    </varlistentry>
 
    <varlistentry>
-    <term><literal>parallel_workers</> (<type>integer</>)</term>
+    <term><literal>toast_tuple_target</literal> (<type>integer</type>)</term>
+    <listitem>
+     <para>
+      The toast_tuple_target specifies the minimum tuple length required before
+      we try to move long column values into TOAST tables, and is also the
+      target length we try to reduce the length below once toasting begins.
+      This only affects columns marked as either External or Extended
+      and applies only to new tuples - there is no effect on existing rows.
+      By default this parameter is set to allow at least 4 tuples per block,
+      which with the default blocksize will be 2040 bytes. Valid values are
+      between 128 bytes and the (blocksize - header), by default 8160 bytes.
+      Changing this value may not be useful for very short or very long rows.
+      Note that the default setting is often close to optimal, and
+      it is possible that setting this parameter could have negative
+      effects in some cases.
+      This parameter cannot be set for TOAST tables.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>parallel_workers</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
       This sets the number of workers that should be used to assist a parallel
       scan of this table.  If not set, the system will determine a value based
       on the relation size.  The actual number of workers chosen by the planner
-      may be less, for example due to
-      the setting of <xref linkend="guc-max-worker-processes">.
+      or by utility statements that use parallel scans may be less, for example
+      due to the setting of <xref linkend="guc-max-worker-processes"/>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_enabled</>, <literal>toast.autovacuum_enabled</literal> (<type>boolean</>)</term>
+    <term><literal>autovacuum_enabled</literal>, <literal>toast.autovacuum_enabled</literal> (<type>boolean</type>)</term>
     <listitem>
      <para>
      Enables or disables the autovacuum daemon for a particular table.
-     If true, the autovacuum daemon will perform automatic <command>VACUUM</>
-     and/or <command>ANALYZE</> operations on this table following the rules
-     discussed in <xref linkend="autovacuum">.
+     If true, the autovacuum daemon will perform automatic <command>VACUUM</command>
+     and/or <command>ANALYZE</command> operations on this table following the rules
+     discussed in <xref linkend="autovacuum"/>.
      If false, this table will not be autovacuumed, except to prevent
-     transaction ID wraparound. See <xref linkend="vacuum-for-wraparound"> for
+     transaction ID wraparound. See <xref linkend="vacuum-for-wraparound"/> for
      more about wraparound prevention.
      Note that the autovacuum daemon does not run at all (except to prevent
-     transaction ID wraparound) if the <xref linkend="guc-autovacuum">
+     transaction ID wraparound) if the <xref linkend="guc-autovacuum"/>
      parameter is false; setting individual tables' storage parameters does
      not override that.  Therefore there is seldom much point in explicitly
-     setting this storage parameter to <literal>true</>, only
-     to <literal>false</>.
+     setting this storage parameter to <literal>true</literal>, only
+     to <literal>false</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_vacuum_threshold</>, <literal>toast.autovacuum_vacuum_threshold</literal> (<type>integer</>)</term>
+    <term><literal>autovacuum_vacuum_threshold</literal>, <literal>toast.autovacuum_vacuum_threshold</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-vacuum-threshold">
+      Per-table value for <xref linkend="guc-autovacuum-vacuum-threshold"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_vacuum_scale_factor</>, <literal>toast.autovacuum_vacuum_scale_factor</literal> (<type>float4</>)</term>
+    <term><literal>autovacuum_vacuum_scale_factor</literal>, <literal>toast.autovacuum_vacuum_scale_factor</literal> (<type>float4</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-vacuum-scale-factor">
+      Per-table value for <xref linkend="guc-autovacuum-vacuum-scale-factor"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_analyze_threshold</> (<type>integer</>)</term>
+    <term><literal>autovacuum_analyze_threshold</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-analyze-threshold">
+      Per-table value for <xref linkend="guc-autovacuum-analyze-threshold"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_analyze_scale_factor</> (<type>float4</>)</term>
+    <term><literal>autovacuum_analyze_scale_factor</literal> (<type>float4</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-analyze-scale-factor">
+      Per-table value for <xref linkend="guc-autovacuum-analyze-scale-factor"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_vacuum_cost_delay</>, <literal>toast.autovacuum_vacuum_cost_delay</literal> (<type>integer</>)</term>
+    <term><literal>autovacuum_vacuum_cost_delay</literal>, <literal>toast.autovacuum_vacuum_cost_delay</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-delay">
+      Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-delay"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_vacuum_cost_limit</>, <literal>toast.autovacuum_vacuum_cost_limit</literal> (<type>integer</>)</term>
+    <term><literal>autovacuum_vacuum_cost_limit</literal>, <literal>toast.autovacuum_vacuum_cost_limit</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-limit">
+      Per-table value for <xref linkend="guc-autovacuum-vacuum-cost-limit"/>
       parameter.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_freeze_min_age</>, <literal>toast.autovacuum_freeze_min_age</literal> (<type>integer</>)</term>
+    <term><literal>autovacuum_freeze_min_age</literal>, <literal>toast.autovacuum_freeze_min_age</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-vacuum-freeze-min-age">
+      Per-table value for <xref linkend="guc-vacuum-freeze-min-age"/>
       parameter.  Note that autovacuum will ignore
-      per-table <literal>autovacuum_freeze_min_age</> parameters that are
+      per-table <literal>autovacuum_freeze_min_age</literal> parameters that are
       larger than half the
-      system-wide <xref linkend="guc-autovacuum-freeze-max-age"> setting.
+      system-wide <xref linkend="guc-autovacuum-freeze-max-age"/> setting.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>autovacuum_freeze_max_age</>, <literal>toast.autovacuum_freeze_max_age</literal> (<type>integer</>)</term>
+    <term><literal>autovacuum_freeze_max_age</literal>, <literal>toast.autovacuum_freeze_max_age</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-autovacuum-freeze-max-age">
+      Per-table value for <xref linkend="guc-autovacuum-freeze-max-age"/>
       parameter.  Note that autovacuum will ignore
-      per-table <literal>autovacuum_freeze_max_age</> parameters that are
+      per-table <literal>autovacuum_freeze_max_age</literal> parameters that are
       larger than the system-wide setting (it can only be set smaller).
      </para>
     </listitem>
@@ -1268,7 +1358,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <term><literal>autovacuum_freeze_table_age</literal>, <literal>toast.autovacuum_freeze_table_age</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-vacuum-freeze-table-age">
+      Per-table value for <xref linkend="guc-vacuum-freeze-table-age"/>
       parameter.
      </para>
     </listitem>
@@ -1278,11 +1368,11 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <term><literal>autovacuum_multixact_freeze_min_age</literal>, <literal>toast.autovacuum_multixact_freeze_min_age</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-vacuum-multixact-freeze-min-age">
+      Per-table value for <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
       parameter.  Note that autovacuum will ignore
-      per-table <literal>autovacuum_multixact_freeze_min_age</> parameters
+      per-table <literal>autovacuum_multixact_freeze_min_age</literal> parameters
       that are larger than half the
-      system-wide <xref linkend="guc-autovacuum-multixact-freeze-max-age">
+      system-wide <xref linkend="guc-autovacuum-multixact-freeze-max-age"/>
       setting.
      </para>
     </listitem>
@@ -1293,9 +1383,9 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <listitem>
      <para>
       Per-table value
-      for <xref linkend="guc-autovacuum-multixact-freeze-max-age"> parameter.
+      for <xref linkend="guc-autovacuum-multixact-freeze-max-age"/> parameter.
       Note that autovacuum will ignore
-      per-table <literal>autovacuum_multixact_freeze_max_age</> parameters
+      per-table <literal>autovacuum_multixact_freeze_max_age</literal> parameters
       that are larger than the system-wide setting (it can only be set
       smaller).
      </para>
@@ -1307,7 +1397,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <listitem>
      <para>
       Per-table value
-      for <xref linkend="guc-vacuum-multixact-freeze-table-age"> parameter.
+      for <xref linkend="guc-vacuum-multixact-freeze-table-age"/> parameter.
      </para>
     </listitem>
    </varlistentry>
@@ -1316,7 +1406,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
     <term><literal>log_autovacuum_min_duration</literal>, <literal>toast.log_autovacuum_min_duration</literal> (<type>integer</type>)</term>
     <listitem>
      <para>
-      Per-table value for <xref linkend="guc-log-autovacuum-min-duration">
+      Per-table value for <xref linkend="guc-log-autovacuum-min-duration"/>
       parameter.
      </para>
     </listitem>
@@ -1328,7 +1418,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      <para>
       Declare the table as an additional catalog table for purposes of
       logical replication. See
-      <xref linkend="logicaldecoding-capabilities"> for details.
+      <xref linkend="logicaldecoding-capabilities"/> for details.
       This parameter cannot be set for TOAST tables.
      </para>
     </listitem>
@@ -1339,7 +1429,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
   </refsect2>
  </refsect1>
 
- <refsect1 id="SQL-CREATETABLE-notes">
+ <refsect1 id="sql-createtable-notes">
   <title>Notes</title>
 
     <para>
@@ -1348,11 +1438,11 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      generator as the table's primary key is preferred. However, if
      your application does make use of OIDs to identify specific
      rows of a table, it is recommended to create a unique constraint
-     on the <structfield>oid</> column of that table, to ensure that
+     on the <structfield>oid</structfield> column of that table, to ensure that
      OIDs in the table will indeed uniquely identify rows even after
      counter wraparound.  Avoid assuming that OIDs are unique across
      tables; if you need a database-wide unique identifier, use the
-     combination of <structfield>tableoid</> and row OID for the
+     combination of <structfield>tableoid</structfield> and row OID for the
      purpose.
     </para>
 
@@ -1369,7 +1459,7 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
      index for each unique constraint and primary key constraint to
      enforce uniqueness.  Thus, it is not necessary to create an
      index explicitly for primary key columns.  (See <xref
-     linkend="sql-createindex"> for more information.)
+     linkend="sql-createindex"/> for more information.)
     </para>
 
     <para>
@@ -1386,12 +1476,12 @@ FROM ( { <replaceable class="PARAMETER">numeric_literal</replaceable> | <replace
  </refsect1>
 
 
- <refsect1 id="SQL-CREATETABLE-examples">
+ <refsect1 id="sql-createtable-examples">
   <title>Examples</title>
 
   <para>
-   Create table <structname>films</> and table
-   <structname>distributors</>:
+   Create table <structname>films</structname> and table
+   <structname>distributors</structname>:
 
 <programlisting>
 CREATE TABLE films (
@@ -1455,7 +1545,7 @@ CREATE TABLE distributors (
 <programlisting>
 CREATE TABLE distributors (
     did     integer,
-    name    varchar(40)
+    name    varchar(40),
     CONSTRAINT con1 CHECK (did &gt; 100 AND name &lt;&gt; '')
 );
 </programlisting>
@@ -1463,7 +1553,7 @@ CREATE TABLE distributors (
 
   <para>
    Define a primary key table constraint for the table
-   <structname>films</>:
+   <structname>films</structname>:
 
 <programlisting>
 CREATE TABLE films (
@@ -1480,7 +1570,7 @@ CREATE TABLE films (
 
   <para>
    Define a primary key constraint for table
-   <structname>distributors</>.  The following two examples are
+   <structname>distributors</structname>.  The following two examples are
    equivalent, the first using the table constraint syntax, the second
    the column constraint syntax:
 
@@ -1516,7 +1606,7 @@ CREATE TABLE distributors (
   </para>
 
   <para>
-   Define two <literal>NOT NULL</> column constraints on the table
+   Define two <literal>NOT NULL</literal> column constraints on the table
    <classname>distributors</classname>, one of which is explicitly
    given a name:
 
@@ -1564,7 +1654,7 @@ WITH (fillfactor=70);
   </para>
 
   <para>
-   Create table <structname>circles</> with an exclusion
+   Create table <structname>circles</structname> with an exclusion
    constraint that prevents any two circles from overlapping:
 
 <programlisting>
@@ -1576,7 +1666,7 @@ CREATE TABLE circles (
   </para>
 
   <para>
-   Create table <structname>cinemas</> in tablespace <structname>diskvol1</>:
+   Create table <structname>cinemas</structname> in tablespace <structname>diskvol1</structname>:
 
 <programlisting>
 CREATE TABLE cinemas (
@@ -1626,6 +1716,16 @@ CREATE TABLE cities (
     name         text not null,
     population   bigint
 ) PARTITION BY LIST (left(lower(name), 1));
+</programlisting></para>
+
+  <para>
+   Create a hash partitioned table:
+<programlisting>
+CREATE TABLE orders (
+    order_id     bigint not null,
+    cust_id      bigint not null,
+    status       text
+) PARTITION BY HASH (order_id);
 </programlisting></para>
 
   <para>
@@ -1643,7 +1743,7 @@ CREATE TABLE measurement_y2016m07
 <programlisting>
 CREATE TABLE measurement_ym_older
     PARTITION OF measurement_year_month
-    FOR VALUES FROM (MINVALUE, 0) TO (2016, 11);
+    FOR VALUES FROM (MINVALUE, MINVALUE) TO (2016, 11);
 
 CREATE TABLE measurement_ym_y2016m11
     PARTITION OF measurement_year_month
@@ -1679,10 +1779,30 @@ CREATE TABLE cities_ab
 CREATE TABLE cities_ab_10000_to_100000
     PARTITION OF cities_ab FOR VALUES FROM (10000) TO (100000);
 </programlisting></para>
+
+  <para>
+   Create partitions of a hash partitioned table:
+<programlisting>
+CREATE TABLE orders_p1 PARTITION OF orders
+    FOR VALUES WITH (MODULUS 4, REMAINDER 0);
+CREATE TABLE orders_p2 PARTITION OF orders
+    FOR VALUES WITH (MODULUS 4, REMAINDER 1);
+CREATE TABLE orders_p3 PARTITION OF orders
+    FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+CREATE TABLE orders_p4 PARTITION OF orders
+    FOR VALUES WITH (MODULUS 4, REMAINDER 3);
+</programlisting></para>
+
+  <para>
+   Create a default partition:
+<programlisting>
+CREATE TABLE cities_partdef
+    PARTITION OF cities DEFAULT;
+</programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-CREATETABLE-compatibility">
-  <title id="SQL-CREATETABLE-compatibility-title">Compatibility</title>
+ <refsect1 id="sql-createtable-compatibility">
+  <title id="sql-createtable-compatibility-title">Compatibility</title>
 
   <para>
    The <command>CREATE TABLE</command> command conforms to the
@@ -1733,8 +1853,8 @@ CREATE TABLE cities_ab_10000_to_100000
    <para>
     The <literal>ON COMMIT</literal> clause for temporary tables
     also resembles the SQL standard, but has some differences.
-    If the <literal>ON COMMIT</> clause is omitted, SQL specifies that the
-    default behavior is <literal>ON COMMIT DELETE ROWS</>.  However, the
+    If the <literal>ON COMMIT</literal> clause is omitted, SQL specifies that the
+    default behavior is <literal>ON COMMIT DELETE ROWS</literal>.  However, the
     default behavior in <productname>PostgreSQL</productname> is
     <literal>ON COMMIT PRESERVE ROWS</literal>.  The <literal>ON COMMIT
     DROP</literal> option does not exist in SQL.
@@ -1745,15 +1865,15 @@ CREATE TABLE cities_ab_10000_to_100000
    <title>Non-deferred Uniqueness Constraints</title>
 
    <para>
-    When a <literal>UNIQUE</> or <literal>PRIMARY KEY</> constraint is
+    When a <literal>UNIQUE</literal> or <literal>PRIMARY KEY</literal> constraint is
     not deferrable, <productname>PostgreSQL</productname> checks for
     uniqueness immediately whenever a row is inserted or modified.
     The SQL standard says that uniqueness should be enforced only at
     the end of the statement; this makes a difference when, for example,
     a single command updates multiple key values.  To obtain
     standard-compliant behavior, declare the constraint as
-    <literal>DEFERRABLE</> but not deferred (i.e., <literal>INITIALLY
-    IMMEDIATE</>).  Be aware that this can be significantly slower than
+    <literal>DEFERRABLE</literal> but not deferred (i.e., <literal>INITIALLY
+    IMMEDIATE</literal>).  Be aware that this can be significantly slower than
     immediate uniqueness checking.
    </para>
   </refsect2>
@@ -1762,8 +1882,8 @@ CREATE TABLE cities_ab_10000_to_100000
    <title>Column Check Constraints</title>
 
    <para>
-    The SQL standard says that <literal>CHECK</> column constraints
-    can only refer to the column they apply to; only <literal>CHECK</>
+    The SQL standard says that <literal>CHECK</literal> column constraints
+    can only refer to the column they apply to; only <literal>CHECK</literal>
     table constraints can refer to multiple columns.
     <productname>PostgreSQL</productname> does not enforce this
     restriction; it treats column and table check constraints alike.
@@ -1774,7 +1894,7 @@ CREATE TABLE cities_ab_10000_to_100000
    <title><literal>EXCLUDE</literal> Constraint</title>
 
    <para>
-    The <literal>EXCLUDE</> constraint type is a
+    The <literal>EXCLUDE</literal> constraint type is a
     <productname>PostgreSQL</productname> extension.
    </para>
   </refsect2>
@@ -1783,7 +1903,7 @@ CREATE TABLE cities_ab_10000_to_100000
    <title><literal>NULL</literal> <quote>Constraint</quote></title>
 
    <para>
-    The <literal>NULL</> <quote>constraint</quote> (actually a
+    The <literal>NULL</literal> <quote>constraint</quote> (actually a
     non-constraint) is a <productname>PostgreSQL</productname>
     extension to the SQL standard that is included for compatibility with some
     other database systems (and for symmetry with the <literal>NOT
@@ -1810,11 +1930,11 @@ CREATE TABLE cities_ab_10000_to_100000
 
    <para>
     <productname>PostgreSQL</productname> allows a table of no columns
-    to be created (for example, <literal>CREATE TABLE foo();</>).  This
+    to be created (for example, <literal>CREATE TABLE foo();</literal>).  This
     is an extension from the SQL standard, which does not allow zero-column
     tables.  Zero-column tables are not in themselves very useful, but
     disallowing them creates odd special cases for <command>ALTER TABLE
-    DROP COLUMN</>, so it seems cleaner to ignore this spec restriction.
+    DROP COLUMN</command>, so it seems cleaner to ignore this spec restriction.
    </para>
   </refsect2>
 
@@ -1833,10 +1953,10 @@ CREATE TABLE cities_ab_10000_to_100000
   </refsect2>
 
   <refsect2>
-   <title><literal>LIKE</> Clause</title>
+   <title><literal>LIKE</literal> Clause</title>
 
    <para>
-    While a <literal>LIKE</> clause exists in the SQL standard, many of the
+    While a <literal>LIKE</literal> clause exists in the SQL standard, many of the
     options that <productname>PostgreSQL</productname> accepts for it are not
     in the standard, and some of the standard's options are not implemented
     by <productname>PostgreSQL</productname>.
@@ -1844,10 +1964,10 @@ CREATE TABLE cities_ab_10000_to_100000
   </refsect2>
 
   <refsect2>
-   <title><literal>WITH</> Clause</title>
+   <title><literal>WITH</literal> Clause</title>
 
    <para>
-    The <literal>WITH</> clause is a <productname>PostgreSQL</productname>
+    The <literal>WITH</literal> clause is a <productname>PostgreSQL</productname>
     extension; neither storage parameters nor OIDs are in the standard.
    </para>
   </refsect2>
@@ -1876,19 +1996,19 @@ CREATE TABLE cities_ab_10000_to_100000
   </refsect2>
 
   <refsect2>
-   <title><literal>PARTITION BY</> Clause</title>
+   <title><literal>PARTITION BY</literal> Clause</title>
 
    <para>
-    The <literal>PARTITION BY</> clause is a
+    The <literal>PARTITION BY</literal> clause is a
     <productname>PostgreSQL</productname> extension.
    </para>
   </refsect2>
 
   <refsect2>
-   <title><literal>PARTITION OF</> Clause</title>
+   <title><literal>PARTITION OF</literal> Clause</title>
 
    <para>
-    The <literal>PARTITION OF</> clause is a
+    The <literal>PARTITION OF</literal> clause is a
     <productname>PostgreSQL</productname> extension.
    </para>
   </refsect2>
@@ -1900,11 +2020,11 @@ CREATE TABLE cities_ab_10000_to_100000
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable"></member>
-   <member><xref linkend="sql-droptable"></member>
-   <member><xref linkend="sql-createtableas"></member>
-   <member><xref linkend="sql-createtablespace"></member>
-   <member><xref linkend="sql-createtype"></member>
+   <member><xref linkend="sql-altertable"/></member>
+   <member><xref linkend="sql-droptable"/></member>
+   <member><xref linkend="sql-createtableas"/></member>
+   <member><xref linkend="sql-createtablespace"/></member>
+   <member><xref linkend="sql-createtype"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_table_as.sgml b/doc/src/sgml/ref/create_table_as.sgml
index 8e4ada794d..527138e787 100644
--- a/doc/src/sgml/ref/create_table_as.sgml
+++ b/doc/src/sgml/ref/create_table_as.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_table_as.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETABLEAS">
+<refentry id="sql-createtableas">
  <indexterm zone="sql-createtableas">
   <primary>CREATE TABLE AS</primary>
  </indexterm>
@@ -23,9 +23,9 @@ PostgreSQL documentation
 <synopsis>
 CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXISTS ] <replaceable>table_name</replaceable>
     [ (<replaceable>column_name</replaceable> [, ...] ) ]
-    [ WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
+    [ WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] ) | WITH OIDS | WITHOUT OIDS ]
     [ ON COMMIT { PRESERVE ROWS | DELETE ROWS | DROP } ]
-    [ TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable> ]
+    [ TABLESPACE <replaceable class="parameter">tablespace_name</replaceable> ]
     AS <replaceable>query</replaceable>
     [ WITH [ NO ] DATA ]
 </synopsis>
@@ -63,7 +63,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
     <listitem>
      <para>
       Ignored for compatibility.  Use of these keywords is deprecated;
-      refer to <xref linkend="sql-createtable"> for details.
+      refer to <xref linkend="sql-createtable"/> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -71,31 +71,31 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
 
   <variablelist>
    <varlistentry>
-    <term><literal>TEMPORARY</> or <literal>TEMP</></term>
+    <term><literal>TEMPORARY</literal> or <literal>TEMP</literal></term>
     <listitem>
      <para>
       If specified, the table is created as a temporary table.
-      Refer to <xref linkend="sql-createtable"> for details.
+      Refer to <xref linkend="sql-createtable"/> for details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>UNLOGGED</></term>
+    <term><literal>UNLOGGED</literal></term>
     <listitem>
      <para>
       If specified, the table is created as an unlogged table.
-      Refer to <xref linkend="sql-createtable"> for details.
+      Refer to <xref linkend="sql-createtable"/> for details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a relation with the same name already exists.
-      A notice is issued in this case. Refer to <xref linkend="sql-createtable">
+      A notice is issued in this case. Refer to <xref linkend="sql-createtable"/>
       for details.
      </para>
     </listitem>
@@ -121,31 +121,31 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH ( <replaceable class="PARAMETER">storage_parameter</replaceable> [= <replaceable class="PARAMETER">value</replaceable>] [, ... ] )</literal></term>
+    <term><literal>WITH ( <replaceable class="parameter">storage_parameter</replaceable> [= <replaceable class="parameter">value</replaceable>] [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies optional storage parameters for the new table;
       see <xref linkend="sql-createtable-storage-parameters"
-      endterm="sql-createtable-storage-parameters-title"> for more
-      information.  The <literal>WITH</> clause
-      can also include <literal>OIDS=TRUE</> (or just <literal>OIDS</>)
+      endterm="sql-createtable-storage-parameters-title"/> for more
+      information.  The <literal>WITH</literal> clause
+      can also include <literal>OIDS=TRUE</literal> (or just <literal>OIDS</literal>)
       to specify that rows of the new table
       should have OIDs (object identifiers) assigned to them, or
-      <literal>OIDS=FALSE</> to specify that the rows should not have OIDs.
-      See <xref linkend="sql-createtable"> for more information.
+      <literal>OIDS=FALSE</literal> to specify that the rows should not have OIDs.
+      See <xref linkend="sql-createtable"/> for more information.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH OIDS</></term>
-    <term><literal>WITHOUT OIDS</></term>
+    <term><literal>WITH OIDS</literal></term>
+    <term><literal>WITHOUT OIDS</literal></term>
     <listitem>
      <para>
-      These are obsolescent syntaxes equivalent to <literal>WITH (OIDS)</>
-      and <literal>WITH (OIDS=FALSE)</>, respectively.  If you wish to give
-      both an <literal>OIDS</> setting and storage parameters, you must use
-      the <literal>WITH ( ... )</> syntax; see above.
+      These are obsolescent syntaxes equivalent to <literal>WITH (OIDS)</literal>
+      and <literal>WITH (OIDS=FALSE)</literal>, respectively.  If you wish to give
+      both an <literal>OIDS</literal> setting and storage parameters, you must use
+      the <literal>WITH ( ... )</literal> syntax; see above.
      </para>
     </listitem>
    </varlistentry>
@@ -175,7 +175,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
          <para>
           All rows in the temporary table will be deleted at the end
           of each transaction block.  Essentially, an automatic <xref
-          linkend="sql-truncate"> is done
+          linkend="sql-truncate"/> is done
           at each commit.
          </para>
         </listitem>
@@ -195,14 +195,14 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
    </varlistentry>
 
    <varlistentry>
-    <term><literal>TABLESPACE <replaceable class="PARAMETER">tablespace_name</replaceable></literal></term>
+    <term><literal>TABLESPACE <replaceable class="parameter">tablespace_name</replaceable></literal></term>
     <listitem>
      <para>
-      The <replaceable class="PARAMETER">tablespace_name</replaceable> is the name
+      The <replaceable class="parameter">tablespace_name</replaceable> is the name
       of the tablespace in which the new table is to be created.
       If not specified,
-      <xref linkend="guc-default-tablespace"> is consulted, or
-      <xref linkend="guc-temp-tablespaces"> if the table is temporary.
+      <xref linkend="guc-default-tablespace"/> is consulted, or
+      <xref linkend="guc-temp-tablespaces"/> if the table is temporary.
      </para>
     </listitem>
    </varlistentry>
@@ -211,17 +211,17 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
     <term><replaceable>query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select">, <link
-      linkend="sql-table">TABLE</link>, or <xref linkend="sql-values">
-      command, or an <xref linkend="sql-execute"> command that runs a
-      prepared <command>SELECT</>, <command>TABLE</>, or
-      <command>VALUES</> query.
+      A <xref linkend="sql-select"/>, <link
+      linkend="sql-table">TABLE</link>, or <xref linkend="sql-values"/>
+      command, or an <xref linkend="sql-execute"/> command that runs a
+      prepared <command>SELECT</command>, <command>TABLE</command>, or
+      <command>VALUES</command> query.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH [ NO ] DATA</></term>
+    <term><literal>WITH [ NO ] DATA</literal></term>
     <listitem>
      <para>
       This clause specifies whether or not the data produced by the query
@@ -239,9 +239,9 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
 
   <para>
    This command is functionally similar to <xref
-   linkend="sql-selectinto">, but it is
+   linkend="sql-selectinto"/>, but it is
    preferred since it is less likely to be confused with other uses of
-   the <command>SELECT INTO</> syntax. Furthermore, <command>CREATE
+   the <command>SELECT INTO</command> syntax. Furthermore, <command>CREATE
    TABLE AS</command> offers a superset of the functionality offered
    by <command>SELECT INTO</command>.
   </para>
@@ -250,7 +250,7 @@ CREATE [ [ GLOBAL | LOCAL ] { TEMPORARY | TEMP } | UNLOGGED ] TABLE [ IF NOT EXI
    The <command>CREATE TABLE AS</command> command allows the user to
    explicitly specify whether OIDs should be included. If the
    presence of OIDs is not explicitly specified,
-   the <xref linkend="guc-default-with-oids"> configuration variable is
+   the <xref linkend="guc-default-with-oids"/> configuration variable is
    used.
   </para>
  </refsect1>
@@ -315,16 +315,16 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
     </listitem>
 
     <listitem>
-     <para><productname>PostgreSQL</> handles temporary tables in a way
+     <para><productname>PostgreSQL</productname> handles temporary tables in a way
       rather different from the standard; see
-      <xref linkend="sql-createtable">
+      <xref linkend="sql-createtable"/>
       for details.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      The <literal>WITH</> clause is a <productname>PostgreSQL</productname>
+      The <literal>WITH</literal> clause is a <productname>PostgreSQL</productname>
       extension; neither storage parameters nor OIDs are in the standard.
      </para>
     </listitem>
@@ -343,12 +343,12 @@ CREATE TEMP TABLE films_recent WITH (OIDS) ON COMMIT DROP AS
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-creatematerializedview"></member>
-   <member><xref linkend="sql-createtable"></member>
-   <member><xref linkend="sql-execute"></member>
-   <member><xref linkend="sql-select"></member>
-   <member><xref linkend="sql-selectinto"></member>
-   <member><xref linkend="sql-values"></member>
+   <member><xref linkend="sql-creatematerializedview"/></member>
+   <member><xref linkend="sql-createtable"/></member>
+   <member><xref linkend="sql-execute"/></member>
+   <member><xref linkend="sql-select"/></member>
+   <member><xref linkend="sql-selectinto"/></member>
+   <member><xref linkend="sql-values"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_tablespace.sgml b/doc/src/sgml/ref/create_tablespace.sgml
index cf08408f96..18fa5f0ebf 100644
--- a/doc/src/sgml/ref/create_tablespace.sgml
+++ b/doc/src/sgml/ref/create_tablespace.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_tablespace.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETABLESPACE">
+<refentry id="sql-createtablespace">
  <indexterm zone="sql-createtablespace">
   <primary>CREATE TABLESPACE</primary>
  </indexterm>
@@ -24,7 +24,7 @@ PostgreSQL documentation
 CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
     [ OWNER { <replaceable>new_owner</replaceable> | CURRENT_USER | SESSION_USER } ]
     LOCATION '<replaceable class="parameter">directory</replaceable>'
-    [ WITH ( <replaceable class="PARAMETER">tablespace_option</replaceable> = <replaceable class="PARAMETER">value</replaceable> [, ... ] ) ]
+    [ WITH ( <replaceable class="parameter">tablespace_option</replaceable> = <replaceable class="parameter">value</replaceable> [, ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -45,16 +45,16 @@ CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
 
   <para>
    A user with appropriate privileges can pass
-   <replaceable class="parameter">tablespace_name</> to
-   <command>CREATE DATABASE</>, <command>CREATE TABLE</>,
-   <command>CREATE INDEX</> or <command>ADD CONSTRAINT</> to have the data
+   <replaceable class="parameter">tablespace_name</replaceable> to
+   <command>CREATE DATABASE</command>, <command>CREATE TABLE</command>,
+   <command>CREATE INDEX</command> or <command>ADD CONSTRAINT</command> to have the data
    files for these objects stored within the specified tablespace.
   </para>
 
   <warning>
    <para>
     A tablespace cannot be used independently of the cluster in which it
-    is defined;  see <xref linkend="manage-ag-tablespaces">.
+    is defined;  see <xref linkend="manage-ag-tablespaces"/>.
    </para>
   </warning>
 
@@ -93,7 +93,7 @@ CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
        <para>
         The directory that will be used for the tablespace. The directory
         should be empty and must be owned by the
-        <productname>PostgreSQL</> system user.  The directory must be
+        <productname>PostgreSQL</productname> system user.  The directory must be
         specified by an absolute path name.
        </para>
       </listitem>
@@ -104,14 +104,14 @@ CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
       <listitem>
        <para>
         A tablespace parameter to be set or reset.  Currently, the only
-        available parameters are <varname>seq_page_cost</>,
-        <varname>random_page_cost</> and <varname>effective_io_concurrency</>.
+        available parameters are <varname>seq_page_cost</varname>,
+        <varname>random_page_cost</varname> and <varname>effective_io_concurrency</varname>.
         Setting either value for a particular tablespace will override the
         planner's usual estimate of the cost of reading pages from tables in
         that tablespace, as established by the configuration parameters of the
-        same name (see <xref linkend="guc-seq-page-cost">,
-        <xref linkend="guc-random-page-cost">,
-        <xref linkend="guc-effective-io-concurrency">).  This may be useful if
+        same name (see <xref linkend="guc-seq-page-cost"/>,
+        <xref linkend="guc-random-page-cost"/>,
+        <xref linkend="guc-effective-io-concurrency"/>).  This may be useful if
         one tablespace is located on a disk which is faster or slower than the
         remainder of the I/O subsystem.
        </para>
@@ -128,7 +128,7 @@ CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
   </para>
 
    <para>
-    <command>CREATE TABLESPACE</> cannot be executed inside a transaction
+    <command>CREATE TABLESPACE</command> cannot be executed inside a transaction
     block.
    </para>
  </refsect1>
@@ -137,15 +137,15 @@ CREATE TABLESPACE <replaceable class="parameter">tablespace_name</replaceable>
   <title>Examples</title>
 
   <para>
-   Create a tablespace <literal>dbspace</> at <literal>/data/dbs</>:
+   Create a tablespace <literal>dbspace</literal> at <literal>/data/dbs</literal>:
 <programlisting>
 CREATE TABLESPACE dbspace LOCATION '/data/dbs';
 </programlisting>
   </para>
 
   <para>
-   Create a tablespace <literal>indexspace</> at <literal>/data/indexes</>
-   owned by user <literal>genevieve</>:
+   Create a tablespace <literal>indexspace</literal> at <literal>/data/indexes</literal>
+   owned by user <literal>genevieve</literal>:
 <programlisting>
 CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes';
 </programlisting></para>
@@ -155,7 +155,7 @@ CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes';
   <title>Compatibility</title>
 
   <para>
-   <command>CREATE TABLESPACE</command> is a <productname>PostgreSQL</>
+   <command>CREATE TABLESPACE</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -164,11 +164,11 @@ CREATE TABLESPACE indexspace OWNER genevieve LOCATION '/data/indexes';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase"></member>
-   <member><xref linkend="sql-createtable"></member>
-   <member><xref linkend="sql-createindex"></member>
-   <member><xref linkend="sql-droptablespace"></member>
-   <member><xref linkend="sql-altertablespace"></member>
+   <member><xref linkend="sql-createdatabase"/></member>
+   <member><xref linkend="sql-createtable"/></member>
+   <member><xref linkend="sql-createindex"/></member>
+   <member><xref linkend="sql-droptablespace"/></member>
+   <member><xref linkend="sql-altertablespace"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_transform.sgml b/doc/src/sgml/ref/create_transform.sgml
index 647c3b9f05..17cb1932cf 100644
--- a/doc/src/sgml/ref/create_transform.sgml
+++ b/doc/src/sgml/ref/create_transform.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/create_transform.sgml -->
 
-<refentry id="SQL-CREATETRANSFORM">
+<refentry id="sql-createtransform">
  <indexterm zone="sql-createtransform">
   <primary>CREATE TRANSFORM</primary>
  </indexterm>
@@ -144,7 +144,7 @@ CREATE [ OR REPLACE ] TRANSFORM FOR <replaceable>type_name</replaceable> LANGUAG
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="sql-droptransform"> to remove transforms.
+   Use <xref linkend="sql-droptransform"/> to remove transforms.
   </para>
  </refsect1>
 
@@ -201,10 +201,10 @@ CREATE TRANSFORM FOR hstore LANGUAGE plpythonu (
   <title>See Also</title>
 
   <para>
-   <xref linkend="sql-createfunction">,
-   <xref linkend="sql-createlanguage">,
-   <xref linkend="sql-createtype">,
-   <xref linkend="sql-droptransform">
+   <xref linkend="sql-createfunction"/>,
+   <xref linkend="sql-createlanguage"/>,
+   <xref linkend="sql-createtype"/>,
+   <xref linkend="sql-droptransform"/>
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml
index 18efe6a9ed..3d6b9f033c 100644
--- a/doc/src/sgml/ref/create_trigger.sgml
+++ b/doc/src/sgml/ref/create_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETRIGGER">
+<refentry id="sql-createtrigger">
  <indexterm zone="sql-createtrigger">
   <primary>CREATE TRIGGER</primary>
  </indexterm>
@@ -26,14 +26,14 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable> { BEFORE | AFTER | INSTEAD OF } { <replaceable class="PARAMETER">event</replaceable> [ OR ... ] }
-    ON <replaceable class="PARAMETER">table_name</replaceable>
+CREATE [ CONSTRAINT ] TRIGGER <replaceable class="parameter">name</replaceable> { BEFORE | AFTER | INSTEAD OF } { <replaceable class="parameter">event</replaceable> [ OR ... ] }
+    ON <replaceable class="parameter">table_name</replaceable>
     [ FROM <replaceable class="parameter">referenced_table_name</replaceable> ]
     [ NOT DEFERRABLE | [ DEFERRABLE ] [ INITIALLY IMMEDIATE | INITIALLY DEFERRED ] ]
-    [ REFERENCING { { OLD | NEW } TABLE [ AS ] <replaceable class="PARAMETER">transition_relation_name</replaceable> } [ ... ] ]
+    [ REFERENCING { { OLD | NEW } TABLE [ AS ] <replaceable class="parameter">transition_relation_name</replaceable> } [ ... ] ]
     [ FOR [ EACH ] { ROW | STATEMENT } ]
     [ WHEN ( <replaceable class="parameter">condition</replaceable> ) ]
-    EXECUTE PROCEDURE <replaceable class="PARAMETER">function_name</replaceable> ( <replaceable class="PARAMETER">arguments</replaceable> )
+    EXECUTE PROCEDURE <replaceable class="parameter">function_name</replaceable> ( <replaceable class="parameter">arguments</replaceable> )
 
 <phrase>where <replaceable class="parameter">event</replaceable> can be one of:</phrase>
 
@@ -52,7 +52,7 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
    trigger will be associated with the specified table, view, or foreign table
    and will execute the specified
    function <replaceable class="parameter">function_name</replaceable> when
-   certain events occur.
+   certain operations are performed on that table.
   </para>
 
   <para>
@@ -82,17 +82,14 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
    executes once for any given operation, regardless of how many rows
    it modifies (in particular, an operation that modifies zero rows
    will still result in the execution of any applicable <literal>FOR
-   EACH STATEMENT</literal> triggers).  Note that with an
-   <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</>
-   clause, both <command>INSERT</command> and
-   <command>UPDATE</command> statement level trigger will be fired.
+   EACH STATEMENT</literal> triggers).
   </para>
 
   <para>
-   Triggers that are specified to fire <literal>INSTEAD OF</> the trigger
-   event must be marked <literal>FOR EACH ROW</>, and can only be defined
-   on views. <literal>BEFORE</> and <literal>AFTER</> triggers on a view
-   must be marked as <literal>FOR EACH STATEMENT</>.
+   Triggers that are specified to fire <literal>INSTEAD OF</literal> the trigger
+   event must be marked <literal>FOR EACH ROW</literal>, and can only be defined
+   on views. <literal>BEFORE</literal> and <literal>AFTER</literal> triggers on a view
+   must be marked as <literal>FOR EACH STATEMENT</literal>.
   </para>
 
   <para>
@@ -118,35 +115,35 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
     </thead>
     <tbody>
      <row>
-      <entry align="center" morerows="1"><literal>BEFORE</></entry>
-      <entry align="center"><command>INSERT</>/<command>UPDATE</>/<command>DELETE</></entry>
+      <entry align="center" morerows="1"><literal>BEFORE</literal></entry>
+      <entry align="center"><command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command></entry>
       <entry align="center">Tables and foreign tables</entry>
       <entry align="center">Tables, views, and foreign tables</entry>
      </row>
      <row>
-      <entry align="center"><command>TRUNCATE</></entry>
+      <entry align="center"><command>TRUNCATE</command></entry>
       <entry align="center">&mdash;</entry>
       <entry align="center">Tables</entry>
      </row>
      <row>
-      <entry align="center" morerows="1"><literal>AFTER</></entry>
-      <entry align="center"><command>INSERT</>/<command>UPDATE</>/<command>DELETE</></entry>
+      <entry align="center" morerows="1"><literal>AFTER</literal></entry>
+      <entry align="center"><command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command></entry>
       <entry align="center">Tables and foreign tables</entry>
       <entry align="center">Tables, views, and foreign tables</entry>
      </row>
      <row>
-      <entry align="center"><command>TRUNCATE</></entry>
+      <entry align="center"><command>TRUNCATE</command></entry>
       <entry align="center">&mdash;</entry>
       <entry align="center">Tables</entry>
      </row>
      <row>
-      <entry align="center" morerows="1"><literal>INSTEAD OF</></entry>
-      <entry align="center"><command>INSERT</>/<command>UPDATE</>/<command>DELETE</></entry>
+      <entry align="center" morerows="1"><literal>INSTEAD OF</literal></entry>
+      <entry align="center"><command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command></entry>
       <entry align="center">Views</entry>
       <entry align="center">&mdash;</entry>
      </row>
      <row>
-      <entry align="center"><command>TRUNCATE</></entry>
+      <entry align="center"><command>TRUNCATE</command></entry>
       <entry align="center">&mdash;</entry>
       <entry align="center">&mdash;</entry>
      </row>
@@ -155,11 +152,11 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
   </informaltable>
 
   <para>
-   Also, a trigger definition can specify a Boolean <literal>WHEN</>
+   Also, a trigger definition can specify a Boolean <literal>WHEN</literal>
    condition, which will be tested to see whether the trigger should
-   be fired.  In row-level triggers the <literal>WHEN</> condition can
+   be fired.  In row-level triggers the <literal>WHEN</literal> condition can
    examine the old and/or new values of columns of the row.  Statement-level
-   triggers can also have <literal>WHEN</> conditions, although the feature
+   triggers can also have <literal>WHEN</literal> conditions, although the feature
    is not so useful for them since the condition cannot refer to any values
    in the table.
   </para>
@@ -170,36 +167,48 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
   </para>
 
   <para>
-   When the <literal>CONSTRAINT</> option is specified, this command creates a
-   <firstterm>constraint trigger</>.  This is the same as a regular trigger
+   When the <literal>CONSTRAINT</literal> option is specified, this command creates a
+   <firstterm>constraint trigger</firstterm>.  This is the same as a regular trigger
    except that the timing of the trigger firing can be adjusted using
-   <xref linkend="SQL-SET-CONSTRAINTS">.
-   Constraint triggers must be <literal>AFTER ROW</> triggers on tables.  They
+   <xref linkend="sql-set-constraints"/>.
+   Constraint triggers must be <literal>AFTER ROW</literal> triggers on plain
+   tables (not foreign tables).  They
    can be fired either at the end of the statement causing the triggering
    event, or at the end of the containing transaction; in the latter case they
-   are said to be <firstterm>deferred</>.  A pending deferred-trigger firing
+   are said to be <firstterm>deferred</firstterm>.  A pending deferred-trigger firing
    can also be forced to happen immediately by using <command>SET
-   CONSTRAINTS</>.  Constraint triggers are expected to raise an exception
+   CONSTRAINTS</command>.  Constraint triggers are expected to raise an exception
    when the constraints they implement are violated.
   </para>
 
   <para>
-   The <literal>REFERENCING</> option is only allowed for an <literal>AFTER</>
-   trigger which is not a constraint trigger.  <literal>OLD TABLE</> may only
-   be specified once, and only on a trigger which can fire on
-   <literal>UPDATE</> or <literal>DELETE</>.  <literal>NEW TABLE</> may only
-   be specified once, and only on a trigger which can fire on
-   <literal>UPDATE</> or <literal>INSERT</>.
+   The <literal>REFERENCING</literal> option enables collection
+   of <firstterm>transition relations</firstterm>, which are row sets that include all
+   of the rows inserted, deleted, or modified by the current SQL statement.
+   This feature lets the trigger see a global view of what the statement did,
+   not just one row at a time.  This option is only allowed for
+   an <literal>AFTER</literal> trigger that is not a constraint trigger; also, if
+   the trigger is an <literal>UPDATE</literal> trigger, it must not specify
+   a <replaceable class="parameter">column_name</replaceable> list.
+   <literal>OLD TABLE</literal> may only be specified once, and only for a trigger
+   that can fire on <literal>UPDATE</literal> or <literal>DELETE</literal>; it creates a
+   transition relation containing the <firstterm>before-images</firstterm> of all rows
+   updated or deleted by the statement.
+   Similarly, <literal>NEW TABLE</literal> may only be specified once, and only for
+   a trigger that can fire on <literal>UPDATE</literal> or <literal>INSERT</literal>;
+   it creates a transition relation containing the <firstterm>after-images</firstterm>
+   of all rows updated or inserted by the statement.
   </para>
 
   <para>
    <command>SELECT</command> does not modify any rows so you cannot
-   create <command>SELECT</command> triggers. Rules and views are more
-   appropriate in such cases.
+   create <command>SELECT</command> triggers.  Rules and views may provide
+   workable solutions to problems that seem to need <command>SELECT</command>
+   triggers.
   </para>
 
   <para>
-   Refer to <xref linkend="triggers"> for more information about triggers.
+   Refer to <xref linkend="triggers"/> for more information about triggers.
   </para>
  </refsect1>
 
@@ -216,7 +225,7 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
       The name cannot be schema-qualified &mdash; the trigger inherits the
       schema of its table.  For a constraint trigger, this is also the name to
       use when modifying the trigger's behavior using
-      <command>SET CONSTRAINTS</>.
+      <command>SET CONSTRAINTS</command>.
      </para>
     </listitem>
    </varlistentry>
@@ -229,7 +238,7 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
      <para>
       Determines whether the function is called before, after, or instead of
       the event.  A constraint trigger can only be specified as
-      <literal>AFTER</>.
+      <literal>AFTER</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -241,7 +250,8 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
       One of <literal>INSERT</literal>, <literal>UPDATE</literal>,
       <literal>DELETE</literal>, or <literal>TRUNCATE</literal>;
       this specifies the event that will fire the trigger. Multiple
-      events can be specified using <literal>OR</literal>.
+      events can be specified using <literal>OR</literal>, except when
+      transition relations are requested.
      </para>
 
      <para>
@@ -251,10 +261,13 @@ CREATE [ CONSTRAINT ] TRIGGER <replaceable class="PARAMETER">name</replaceable>
 UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</replaceable> ... ]
 </synopsis>
       The trigger will only fire if at least one of the listed columns
-      is mentioned as a target of the <command>UPDATE</> command.
+      is mentioned as a target of the <command>UPDATE</command> command.
      </para>
 
-     <para><literal>INSTEAD OF UPDATE</> events do not support lists of columns.
+     <para>
+      <literal>INSTEAD OF UPDATE</literal> events do not allow a list of columns.
+      A column list cannot be specified when requesting transition relations,
+      either.
      </para>
     </listitem>
    </varlistentry>
@@ -270,7 +283,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">referenced_table_name</replaceable></term>
+    <term><replaceable class="parameter">referenced_table_name</replaceable></term>
     <listitem>
      <para>
       The (possibly schema-qualified) name of another table referenced by the
@@ -289,7 +302,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
     <listitem>
      <para>
       The default timing of the trigger.
-      See the <xref linkend="SQL-CREATETABLE"> documentation for details of
+      See the <xref linkend="sql-createtable"/> documentation for details of
       these constraint options.  This can only be specified for constraint
       triggers.
      </para>
@@ -300,12 +313,9 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
     <term><literal>REFERENCING</literal></term>
     <listitem>
      <para>
-      This immediately precedes the declaration of one or two relations which
-      can be used to read the before and/or after images of all rows directly
-      affected by the triggering statement.  An <literal>AFTER EACH ROW</>
-      trigger is allowed to use both these transition relation names and the
-      row names (<literal>OLD</> and <literal>NEW</>) which reference each
-      individual row for which the trigger fires.
+      This keyword immediately precedes the declaration of one or two
+      relation names that provide access to the transition relations of the
+      triggering statement.
      </para>
     </listitem>
    </varlistentry>
@@ -315,17 +325,19 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
     <term><literal>NEW TABLE</literal></term>
     <listitem>
      <para>
-      This specifies whether the named relation contains the before or after
-      images for rows affected by the statement which fired the trigger.
+      This clause indicates whether the following relation name is for the
+      before-image transition relation or the after-image transition
+      relation.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">transition_relation_name</replaceable></term>
+    <term><replaceable class="parameter">transition_relation_name</replaceable></term>
     <listitem>
      <para>
-      The (unqualified) name to be used within the trigger for this relation.
+      The (unqualified) name to be used within the trigger for this
+      transition relation.
      </para>
     </listitem>
    </varlistentry>
@@ -340,7 +352,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
       once for every row affected by the trigger event, or just once
       per SQL statement. If neither is specified, <literal>FOR EACH
       STATEMENT</literal> is the default.  Constraint triggers can only
-      be specified <literal>FOR EACH ROW</>.
+      be specified <literal>FOR EACH ROW</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -350,20 +362,20 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
     <listitem>
      <para>
       A Boolean expression that determines whether the trigger function
-      will actually be executed.  If <literal>WHEN</> is specified, the
+      will actually be executed.  If <literal>WHEN</literal> is specified, the
       function will only be called if the <replaceable
-      class="parameter">condition</replaceable> returns <literal>true</>.
-      In <literal>FOR EACH ROW</literal> triggers, the <literal>WHEN</>
+      class="parameter">condition</replaceable> returns <literal>true</literal>.
+      In <literal>FOR EACH ROW</literal> triggers, the <literal>WHEN</literal>
       condition can refer to columns of the old and/or new row values
       by writing <literal>OLD.<replaceable
       class="parameter">column_name</replaceable></literal> or
       <literal>NEW.<replaceable
       class="parameter">column_name</replaceable></literal> respectively.
-      Of course, <literal>INSERT</> triggers cannot refer to <literal>OLD</>
-      and <literal>DELETE</> triggers cannot refer to <literal>NEW</>.
+      Of course, <literal>INSERT</literal> triggers cannot refer to <literal>OLD</literal>
+      and <literal>DELETE</literal> triggers cannot refer to <literal>NEW</literal>.
      </para>
 
-     <para><literal>INSTEAD OF</> triggers do not support <literal>WHEN</>
+     <para><literal>INSTEAD OF</literal> triggers do not support <literal>WHEN</literal>
       conditions.
      </para>
 
@@ -373,7 +385,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
      </para>
 
      <para>
-      Note that for constraint triggers, evaluation of the <literal>WHEN</>
+      Note that for constraint triggers, evaluation of the <literal>WHEN</literal>
       condition is not deferred, but occurs immediately after the row update
       operation is performed. If the condition does not evaluate to true then
       the trigger is not queued for deferred execution.
@@ -386,7 +398,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
     <listitem>
      <para>
       A user-supplied function that is declared as taking no arguments
-      and returning type <literal>trigger</>, which is executed when
+      and returning type <literal>trigger</literal>, which is executed when
       the trigger fires.
      </para>
     </listitem>
@@ -410,7 +422,7 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-CREATETRIGGER-notes">
+ <refsect1 id="sql-createtrigger-notes">
   <title>Notes</title>
 
   <para>
@@ -420,38 +432,38 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
   </para>
 
   <para>
-   Use <xref linkend="sql-droptrigger"> to remove a trigger.
+   Use <xref linkend="sql-droptrigger"/> to remove a trigger.
   </para>
 
   <para>
    A column-specific trigger (one defined using the <literal>UPDATE OF
    <replaceable>column_name</replaceable></literal> syntax) will fire when any
-   of its columns are listed as targets in the <command>UPDATE</>
-   command's <literal>SET</> list.  It is possible for a column's value
+   of its columns are listed as targets in the <command>UPDATE</command>
+   command's <literal>SET</literal> list.  It is possible for a column's value
    to change even when the trigger is not fired, because changes made to the
-   row's contents by <literal>BEFORE UPDATE</> triggers are not considered.
-   Conversely, a command such as <literal>UPDATE ... SET x = x ...</>
-   will fire a trigger on column <literal>x</>, even though the column's
+   row's contents by <literal>BEFORE UPDATE</literal> triggers are not considered.
+   Conversely, a command such as <literal>UPDATE ... SET x = x ...</literal>
+   will fire a trigger on column <literal>x</literal>, even though the column's
    value did not change.
   </para>
 
   <para>
-   In a <literal>BEFORE</> trigger, the <literal>WHEN</> condition is
+   In a <literal>BEFORE</literal> trigger, the <literal>WHEN</literal> condition is
    evaluated just before the function is or would be executed, so using
-   <literal>WHEN</> is not materially different from testing the same
+   <literal>WHEN</literal> is not materially different from testing the same
    condition at the beginning of the trigger function.  Note in particular
-   that the <literal>NEW</> row seen by the condition is the current value,
-   as possibly modified by earlier triggers.  Also, a <literal>BEFORE</>
-   trigger's <literal>WHEN</> condition is not allowed to examine the
-   system columns of the <literal>NEW</> row (such as <literal>oid</>),
+   that the <literal>NEW</literal> row seen by the condition is the current value,
+   as possibly modified by earlier triggers.  Also, a <literal>BEFORE</literal>
+   trigger's <literal>WHEN</literal> condition is not allowed to examine the
+   system columns of the <literal>NEW</literal> row (such as <literal>oid</literal>),
    because those won't have been set yet.
   </para>
 
   <para>
-   In an <literal>AFTER</> trigger, the <literal>WHEN</> condition is
+   In an <literal>AFTER</literal> trigger, the <literal>WHEN</literal> condition is
    evaluated just after the row update occurs, and it determines whether an
    event is queued to fire the trigger at the end of statement.  So when an
-   <literal>AFTER</> trigger's <literal>WHEN</> condition does not return
+   <literal>AFTER</literal> trigger's <literal>WHEN</literal> condition does not return
    true, it is not necessary to queue an event nor to re-fetch the row at end
    of statement.  This can result in significant speedups in statements that
    modify many rows, if the trigger only needs to be fired for a few of the
@@ -459,35 +471,65 @@ UPDATE OF <replaceable>column_name1</replaceable> [, <replaceable>column_name2</
   </para>
 
   <para>
-    Modifying a partitioned table or a table with inheritance children fires
-    statement-level triggers directly attached to that table, but not
-    statement-level triggers for its partitions or child tables.  In contrast,
-    row-level triggers are fired for all affected partitions or child tables.
-    If a statement-level trigger has been defined with transition relations
-    named by a <literal>REFERENCING</literal> clause, then before and after
-    images of rows are visible from all affected partitions or child tables.
-    In the case of inheritance children, the row images include only columns
-    that are present in the table that the trigger is attached to.  Currently,
-    row-level triggers with transition relations cannot be defined on
-    partitions or inheritance child tables.
+   In some cases it is possible for a single SQL command to fire more than
+   one kind of trigger.  For instance an <command>INSERT</command> with
+   an <literal>ON CONFLICT DO UPDATE</literal> clause may cause both insert and
+   update operations, so it will fire both kinds of triggers as needed.
+   The transition relations supplied to triggers are
+   specific to their event type; thus an <command>INSERT</command> trigger
+   will see only the inserted rows, while an <command>UPDATE</command>
+   trigger will see only the updated rows.
+  </para>
+
+  <para>
+   Row updates or deletions caused by foreign-key enforcement actions, such
+   as <literal>ON UPDATE CASCADE</literal> or <literal>ON DELETE SET NULL</literal>, are
+   treated as part of the SQL command that caused them (note that such
+   actions are never deferred).  Relevant triggers on the affected table will
+   be fired, so that this provides another way in which a SQL command might
+   fire triggers not directly matching its type.  In simple cases, triggers
+   that request transition relations will see all changes caused in their
+   table by a single original SQL command as a single transition relation.
+   However, there are cases in which the presence of an <literal>AFTER ROW</literal>
+   trigger that requests transition relations will cause the foreign-key
+   enforcement actions triggered by a single SQL command to be split into
+   multiple steps, each with its own transition relation(s).  In such cases,
+   any statement-level triggers that are present will be fired once per
+   creation of a transition relation set, ensuring that the triggers see
+   each affected row in a transition relation once and only once.
+  </para>
+
+  <para>
+   Modifying a partitioned table or a table with inheritance children fires
+   statement-level triggers attached to the explicitly named table, but not
+   statement-level triggers for its partitions or child tables.  In contrast,
+   row-level triggers are fired on the rows in affected partitions or
+   child tables, even if they are not explicitly named in the query.
+   If a statement-level trigger has been defined with transition relations
+   named by a <literal>REFERENCING</literal> clause, then before and after
+   images of rows are visible from all affected partitions or child tables.
+   In the case of inheritance children, the row images include only columns
+   that are present in the table that the trigger is attached to.  Currently,
+   row-level triggers with transition relations cannot be defined on
+   partitions or inheritance child tables.
   </para>
 
   <para>
    In <productname>PostgreSQL</productname> versions before 7.3, it was
    necessary to declare trigger functions as returning the placeholder
-   type <type>opaque</>, rather than <type>trigger</>.  To support loading
-   of old dump files, <command>CREATE TRIGGER</> will accept a function
-   declared as returning <type>opaque</>, but it will issue a notice and
-   change the function's declared return type to <type>trigger</>.
+   type <type>opaque</type>, rather than <type>trigger</type>.  To support loading
+   of old dump files, <command>CREATE TRIGGER</command> will accept a function
+   declared as returning <type>opaque</type>, but it will issue a notice and
+   change the function's declared return type to <type>trigger</type>.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATETRIGGER-examples">
+ <refsect1 id="sql-createtrigger-examples">
   <title>Examples</title>
 
   <para>
-   Execute the function <function>check_account_update</> whenever
-   a row of the table <literal>accounts</> is about to be updated:
+   Execute the function <function>check_account_update</function> whenever
+   a row of the table <literal>accounts</literal> is about to be updated:
 
 <programlisting>
 CREATE TRIGGER check_update
@@ -496,8 +538,8 @@ CREATE TRIGGER check_update
     EXECUTE PROCEDURE check_account_update();
 </programlisting>
 
-   The same, but only execute the function if column <literal>balance</>
-   is specified as a target in the <command>UPDATE</> command:
+   The same, but only execute the function if column <literal>balance</literal>
+   is specified as a target in the <command>UPDATE</command> command:
 
 <programlisting>
 CREATE TRIGGER check_update
@@ -506,7 +548,7 @@ CREATE TRIGGER check_update
     EXECUTE PROCEDURE check_account_update();
 </programlisting>
 
-   This form only executes the function if column <literal>balance</>
+   This form only executes the function if column <literal>balance</literal>
    has in fact changed value:
 
 <programlisting>
@@ -517,7 +559,7 @@ CREATE TRIGGER check_update
     EXECUTE PROCEDURE check_account_update();
 </programlisting>
 
-   Call a function to log updates of <literal>accounts</>, but only if
+   Call a function to log updates of <literal>accounts</literal>, but only if
    something changed:
 
 <programlisting>
@@ -528,7 +570,7 @@ CREATE TRIGGER log_update
     EXECUTE PROCEDURE log_account_update();
 </programlisting>
 
-   Execute the function <function>view_insert_row</> for each row to insert
+   Execute the function <function>view_insert_row</function> for each row to insert
    rows into the tables underlying a view:
 
 <programlisting>
@@ -538,8 +580,8 @@ CREATE TRIGGER view_insert
     EXECUTE PROCEDURE view_insert_row();
 </programlisting>
 
-   Execute the function <function>check_transfer_balances_to_zero</> for each
-   statement to confirm that the <literal>transfer</> rows offset to a net of
+   Execute the function <function>check_transfer_balances_to_zero</function> for each
+   statement to confirm that the <literal>transfer</literal> rows offset to a net of
    zero:
 
 <programlisting>
@@ -550,7 +592,7 @@ CREATE TRIGGER transfer_insert
     EXECUTE PROCEDURE check_transfer_balances_to_zero();
 </programlisting>
 
-   Execute the function <function>check_matching_pairs</> for each row to
+   Execute the function <function>check_matching_pairs</function> for each row to
    confirm that changes are made to matching pairs at the same time (by the
    same statement):
 
@@ -564,12 +606,12 @@ CREATE TRIGGER paired_items_update
   </para>
 
   <para>
-   <xref linkend="trigger-example"> contains a complete example of a trigger
+   <xref linkend="trigger-example"/> contains a complete example of a trigger
    function written in C.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATETRIGGER-compatibility">
+ <refsect1 id="sql-createtrigger-compatibility">
   <title>Compatibility</title>
 
   <!--
@@ -583,25 +625,36 @@ CREATE TRIGGER paired_items_update
   <para>
    The <command>CREATE TRIGGER</command> statement in
    <productname>PostgreSQL</productname> implements a subset of the
-   <acronym>SQL</> standard. The following functionalities are currently
+   <acronym>SQL</acronym> standard. The following functionalities are currently
    missing:
 
    <itemizedlist>
     <listitem>
      <para>
-      While transition tables for <literal>AFTER</> triggers are specified
-      using the <literal>REFERENCING</> clause in the standard way, the row
-      variables used in <literal>FOR EACH ROW</> triggers may not be
-      specified in <literal>REFERENCING</> clause.  They are available in a
-      manner which is dependent on the language in which the trigger function
-      is written.  Some languages effectively behave as though there is a
-      <literal>REFERENCING</> clause containing <literal>OLD ROW AS OLD NEW
-      ROW AS NEW</>.
+      While transition table names for <literal>AFTER</literal> triggers are
+      specified using the <literal>REFERENCING</literal> clause in the standard way,
+      the row variables used in <literal>FOR EACH ROW</literal> triggers may not be
+      specified in a <literal>REFERENCING</literal> clause.  They are available in a
+      manner that is dependent on the language in which the trigger function
+      is written, but is fixed for any one language.  Some languages
+      effectively behave as though there is a <literal>REFERENCING</literal> clause
+      containing <literal>OLD ROW AS OLD NEW ROW AS NEW</literal>.
      </para>
     </listitem>
 
     <listitem>
-     <para><productname>PostgreSQL</productname> only allows the execution
+     <para>
+      The standard allows transition tables to be used with
+      column-specific <literal>UPDATE</literal> triggers, but then the set of rows
+      that should be visible in the transition tables depends on the
+      trigger's column list.  This is not currently implemented by
+      <productname>PostgreSQL</productname>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      <productname>PostgreSQL</productname> only allows the execution
       of a user-defined function for the triggered action.  The standard
       allows the execution of a number of other SQL commands, such as
       <command>CREATE TABLE</command>, as the triggered action.  This
@@ -621,7 +674,7 @@ CREATE TRIGGER paired_items_update
 
   <para>
    SQL specifies that <literal>BEFORE DELETE</literal> triggers on cascaded
-   deletes fire <emphasis>after</> the cascaded <literal>DELETE</> completes.
+   deletes fire <emphasis>after</emphasis> the cascaded <literal>DELETE</literal> completes.
    The <productname>PostgreSQL</productname> behavior is for <literal>BEFORE
    DELETE</literal> to always fire before the delete action, even a cascading
    one.  This is considered more consistent.  There is also nonstandard
@@ -633,19 +686,19 @@ CREATE TRIGGER paired_items_update
 
   <para>
    The ability to specify multiple actions for a single trigger using
-   <literal>OR</literal> is a <productname>PostgreSQL</> extension of
+   <literal>OR</literal> is a <productname>PostgreSQL</productname> extension of
    the SQL standard.
   </para>
 
   <para>
    The ability to fire triggers for <command>TRUNCATE</command> is a
-   <productname>PostgreSQL</> extension of the SQL standard, as is the
+   <productname>PostgreSQL</productname> extension of the SQL standard, as is the
    ability to define statement-level triggers on views.
   </para>
 
   <para>
    <command>CREATE CONSTRAINT TRIGGER</command> is a
-   <productname>PostgreSQL</productname> extension of the <acronym>SQL</>
+   <productname>PostgreSQL</productname> extension of the <acronym>SQL</acronym>
    standard.
   </para>
 
@@ -655,10 +708,10 @@ CREATE TRIGGER paired_items_update
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertrigger"></member>
-   <member><xref linkend="sql-droptrigger"></member>
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-set-constraints"></member>
+   <member><xref linkend="sql-altertrigger"/></member>
+   <member><xref linkend="sql-droptrigger"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-set-constraints"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsconfig.sgml b/doc/src/sgml/ref/create_tsconfig.sgml
index 63321520df..390d3cfe51 100644
--- a/doc/src/sgml/ref/create_tsconfig.sgml
+++ b/doc/src/sgml/ref/create_tsconfig.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_tsconfig.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETSCONFIG">
+<refentry id="sql-createtsconfig">
  <indexterm zone="sql-createtsconfig">
   <primary>CREATE TEXT SEARCH CONFIGURATION</primary>
  </indexterm>
@@ -57,7 +57,7 @@ CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceabl
   </para>
 
   <para>
-   Refer to <xref linkend="textsearch"> for further information.
+   Refer to <xref linkend="textsearch"/> for further information.
   </para>
  </refsect1>
 
@@ -99,7 +99,7 @@ CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceabl
   <title>Notes</title>
 
   <para>
-   The <literal>PARSER</> and <literal>COPY</> options are mutually
+   The <literal>PARSER</literal> and <literal>COPY</literal> options are mutually
    exclusive, because when an existing configuration is copied, its
    parser selection is copied too.
   </para>
@@ -119,8 +119,8 @@ CREATE TEXT SEARCH CONFIGURATION <replaceable class="parameter">name</replaceabl
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsconfig"></member>
-   <member><xref linkend="sql-droptsconfig"></member>
+   <member><xref linkend="sql-altertsconfig"/></member>
+   <member><xref linkend="sql-droptsconfig"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsdictionary.sgml b/doc/src/sgml/ref/create_tsdictionary.sgml
index 9c95c11608..0608104821 100644
--- a/doc/src/sgml/ref/create_tsdictionary.sgml
+++ b/doc/src/sgml/ref/create_tsdictionary.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_tsdictionary.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETSDICTIONARY">
+<refentry id="sql-createtsdictionary">
  <indexterm zone="sql-createtsdictionary">
   <primary>CREATE TEXT SEARCH DICTIONARY</primary>
  </indexterm>
@@ -50,7 +50,7 @@ CREATE TEXT SEARCH DICTIONARY <replaceable class="parameter">name</replaceable>
   </para>
 
   <para>
-   Refer to <xref linkend="textsearch"> for further information.
+   Refer to <xref linkend="textsearch"/> for further information.
   </para>
  </refsect1>
 
@@ -134,8 +134,8 @@ CREATE TEXT SEARCH DICTIONARY my_russian (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsdictionary"></member>
-   <member><xref linkend="sql-droptsdictionary"></member>
+   <member><xref linkend="sql-altertsdictionary"/></member>
+   <member><xref linkend="sql-droptsdictionary"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tsparser.sgml b/doc/src/sgml/ref/create_tsparser.sgml
index 044581f6f2..088d92323a 100644
--- a/doc/src/sgml/ref/create_tsparser.sgml
+++ b/doc/src/sgml/ref/create_tsparser.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_tsparser.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETSPARSER">
+<refentry id="sql-createtsparser">
  <indexterm zone="sql-createtsparser">
   <primary>CREATE TEXT SEARCH PARSER</primary>
  </indexterm>
@@ -55,7 +55,7 @@ CREATE TEXT SEARCH PARSER <replaceable class="parameter">name</replaceable> (
   </para>
 
   <para>
-   Refer to <xref linkend="textsearch"> for further information.
+   Refer to <xref linkend="textsearch"/> for further information.
   </para>
  </refsect1>
 
@@ -146,8 +146,8 @@ CREATE TEXT SEARCH PARSER <replaceable class="parameter">name</replaceable> (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsparser"></member>
-   <member><xref linkend="sql-droptsparser"></member>
+   <member><xref linkend="sql-altertsparser"/></member>
+   <member><xref linkend="sql-droptsparser"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_tstemplate.sgml b/doc/src/sgml/ref/create_tstemplate.sgml
index 360ad41f35..5b82d5564b 100644
--- a/doc/src/sgml/ref/create_tstemplate.sgml
+++ b/doc/src/sgml/ref/create_tstemplate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_tstemplate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETSTEMPLATE">
+<refentry id="sql-createtstemplate">
  <indexterm zone="sql-createtstemplate">
   <primary>CREATE TEXT SEARCH TEMPLATE</primary>
  </indexterm>
@@ -49,14 +49,14 @@ CREATE TEXT SEARCH TEMPLATE <replaceable class="parameter">name</replaceable> (
    TEMPLATE</command>.  This restriction is made because an erroneous text
    search template definition could confuse or even crash the server.
    The reason for separating templates from dictionaries is that a template
-   encapsulates the <quote>unsafe</> aspects of defining a dictionary.
+   encapsulates the <quote>unsafe</quote> aspects of defining a dictionary.
    The parameters that can be set when defining a dictionary are safe for
    unprivileged users to set, and so creating a dictionary need not be a
    privileged operation.
   </para>
 
   <para>
-   Refer to <xref linkend="textsearch"> for further information.
+   Refer to <xref linkend="textsearch"/> for further information.
   </para>
  </refsect1>
 
@@ -119,8 +119,8 @@ CREATE TEXT SEARCH TEMPLATE <replaceable class="parameter">name</replaceable> (
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertstemplate"></member>
-   <member><xref linkend="sql-droptstemplate"></member>
+   <member><xref linkend="sql-altertstemplate"/></member>
+   <member><xref linkend="sql-droptstemplate"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_type.sgml b/doc/src/sgml/ref/create_type.sgml
index 7146c4a27b..fa9b520b24 100644
--- a/doc/src/sgml/ref/create_type.sgml
+++ b/doc/src/sgml/ref/create_type.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_type.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATETYPE">
+<refentry id="sql-createtype">
  <indexterm zone="sql-createtype">
   <primary>CREATE TYPE</primary>
  </indexterm>
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 CREATE TYPE <replaceable class="parameter">name</replaceable> AS
-    ( [ <replaceable class="PARAMETER">attribute_name</replaceable> <replaceable class="PARAMETER">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [, ... ] ] )
+    ( [ <replaceable class="parameter">attribute_name</replaceable> <replaceable class="parameter">data_type</replaceable> [ COLLATE <replaceable>collation</replaceable> ] [, ... ] ] )
 
 CREATE TYPE <replaceable class="parameter">name</replaceable> AS ENUM
     ( [ '<replaceable class="parameter">label</replaceable>' [, ... ] ] )
@@ -81,8 +81,8 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   <para>
    There are five forms of <command>CREATE TYPE</command>, as shown in the
    syntax synopsis above.  They respectively create a <firstterm>composite
-   type</>, an <firstterm>enum type</>, a <firstterm>range type</>, a
-   <firstterm>base type</>, or a <firstterm>shell type</>.  The first four
+   type</firstterm>, an <firstterm>enum type</firstterm>, a <firstterm>range type</firstterm>, a
+   <firstterm>base type</firstterm>, or a <firstterm>shell type</firstterm>.  The first four
    of these are discussed in turn below.  A shell type is simply a placeholder
    for a type to be defined later; it is created by issuing <command>CREATE
    TYPE</command> with no parameters except for the type name.  Shell types
@@ -111,24 +111,24 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   </para>
   </refsect2>
 
-  <refsect2 id="SQL-CREATETYPE-enum">
+  <refsect2 id="sql-createtype-enum">
    <title>Enumerated Types</title>
 
    <para>
     The second form of <command>CREATE TYPE</command> creates an enumerated
-    (enum) type, as described in <xref linkend="datatype-enum">.
+    (enum) type, as described in <xref linkend="datatype-enum"/>.
     Enum types take a list of one or more quoted labels, each of which
     must be less than <symbol>NAMEDATALEN</symbol> bytes long (64 bytes in a
     standard <productname>PostgreSQL</productname> build).
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-CREATETYPE-RANGE">
+  <refsect2 id="sql-createtype-range">
    <title>Range Types</title>
 
    <para>
     The third form of <command>CREATE TYPE</command> creates a new
-    range type, as described in <xref linkend="rangetypes">.
+    range type, as described in <xref linkend="rangetypes"/>.
    </para>
 
    <para>
@@ -148,13 +148,13 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     function must take one argument of the range type being defined, and
     return a value of the same type.  This is used to convert range values
     to a canonical form, when applicable.  See <xref
-    linkend="rangetypes-defining"> for more information.  Creating a
+    linkend="rangetypes-defining"/> for more information.  Creating a
     <replaceable class="parameter">canonical</replaceable> function
     is a bit tricky, since it must be defined before the range type can be
     declared.  To do this, you must first create a shell type, which is a
     placeholder type that has no properties except a name and an
     owner.  This is done by issuing the command <literal>CREATE TYPE
-    <replaceable>name</></literal>, with no additional parameters.  Then
+    <replaceable>name</replaceable></literal>, with no additional parameters.  Then
     the function can be declared using the shell type as argument and result,
     and finally the range type can be declared using the same name.  This
     automatically replaces the shell type entry with a valid range type.
@@ -167,7 +167,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     and return a <type>double precision</type> value representing the
     difference between the two given values.  While this is optional,
     providing it allows much greater efficiency of GiST indexes on columns of
-    the range type.  See <xref linkend="rangetypes-defining"> for more
+    the range type.  See <xref linkend="rangetypes-defining"/> for more
     information.
    </para>
   </refsect2>
@@ -211,7 +211,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    The first argument is the input text as a C string, the second
    argument is the type's own OID (except for array types, which instead
    receive their element type's OID),
-   and the third is the <literal>typmod</> of the destination column, if known
+   and the third is the <literal>typmod</literal> of the destination column, if known
    (-1 will be passed if not).
    The input function must return a value of the data type itself.
    Usually, an input function should be declared STRICT; if it is not,
@@ -264,12 +264,12 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    You should at this point be wondering how the input and output functions
    can be declared to have results or arguments of the new type, when they
    have to be created before the new type can be created.  The answer is that
-   the type should first be defined as a <firstterm>shell type</>, which is a
+   the type should first be defined as a <firstterm>shell type</firstterm>, which is a
    placeholder type that has no properties except a name and an owner.  This
    is done by issuing the command <literal>CREATE TYPE
-   <replaceable>name</></literal>, with no additional parameters.  Then the
+   <replaceable>name</replaceable></literal>, with no additional parameters.  Then the
    C I/O functions can be defined referencing the shell type.  Finally,
-   <command>CREATE TYPE</> with a full definition replaces the shell entry
+   <command>CREATE TYPE</command> with a full definition replaces the shell entry
    with a complete, valid type definition, after which the new type can be
    used normally.
   </para>
@@ -279,23 +279,23 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    <replaceable class="parameter">type_modifier_input_function</replaceable>
    and <replaceable class="parameter">type_modifier_output_function</replaceable>
    are needed if the type supports modifiers, that is optional constraints
-   attached to a type declaration, such as <literal>char(5)</> or
-   <literal>numeric(30,2)</>.  <productname>PostgreSQL</productname> allows
+   attached to a type declaration, such as <literal>char(5)</literal> or
+   <literal>numeric(30,2)</literal>.  <productname>PostgreSQL</productname> allows
    user-defined types to take one or more simple constants or identifiers as
    modifiers.  However, this information must be capable of being packed into a
    single non-negative integer value for storage in the system catalogs.  The
    <replaceable class="parameter">type_modifier_input_function</replaceable>
-   is passed the declared modifier(s) in the form of a <type>cstring</>
+   is passed the declared modifier(s) in the form of a <type>cstring</type>
    array.  It must check the values for validity (throwing an error if they
    are wrong), and if they are correct, return a single non-negative
-   <type>integer</> value that will be stored as the column <quote>typmod</>.
+   <type>integer</type> value that will be stored as the column <quote>typmod</quote>.
    Type modifiers will be rejected if the type does not have a
    <replaceable class="parameter">type_modifier_input_function</replaceable>.
    The <replaceable class="parameter">type_modifier_output_function</replaceable>
    converts the internal integer typmod value back to the correct form for
-   user display.  It must return a <type>cstring</> value that is the exact
-   string to append to the type name; for example <type>numeric</>'s
-   function might return <literal>(30,2)</>.
+   user display.  It must return a <type>cstring</type> value that is the exact
+   string to append to the type name; for example <type>numeric</type>'s
+   function might return <literal>(30,2)</literal>.
    It is allowed to omit the
    <replaceable class="parameter">type_modifier_output_function</replaceable>,
    in which case the default display format is just the stored typmod integer
@@ -305,14 +305,14 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   <para>
    The optional <replaceable class="parameter">analyze_function</replaceable>
    performs type-specific statistics collection for columns of the data type.
-   By default, <command>ANALYZE</> will attempt to gather statistics using
-   the type's <quote>equals</> and <quote>less-than</> operators, if there
+   By default, <command>ANALYZE</command> will attempt to gather statistics using
+   the type's <quote>equals</quote> and <quote>less-than</quote> operators, if there
    is a default b-tree operator class for the type.  For non-scalar types
    this behavior is likely to be unsuitable, so it can be overridden by
    specifying a custom analysis function.  The analysis function must be
-   declared to take a single argument of type <type>internal</>, and return
-   a <type>boolean</> result.  The detailed API for analysis functions appears
-   in <filename>src/include/commands/vacuum.h</>.
+   declared to take a single argument of type <type>internal</type>, and return
+   a <type>boolean</type> result.  The detailed API for analysis functions appears
+   in <filename>src/include/commands/vacuum.h</filename>.
   </para>
 
   <para>
@@ -327,10 +327,10 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    positive integer, or variable-length, indicated by setting
    <replaceable class="parameter">internallength</replaceable>
    to <literal>VARIABLE</literal>.  (Internally, this is represented
-   by setting <literal>typlen</> to -1.)  The internal representation of all
+   by setting <literal>typlen</literal> to -1.)  The internal representation of all
    variable-length types must start with a 4-byte integer giving the total
    length of this value of the type.  (Note that the length field is often
-   encoded, as described in <xref linkend="storage-toast">; it's unwise
+   encoded, as described in <xref linkend="storage-toast"/>; it's unwise
    to access it directly.)
   </para>
 
@@ -338,7 +338,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    The optional flag <literal>PASSEDBYVALUE</literal> indicates that
    values of this data type are passed by value, rather than by
    reference.  Types passed by value must be fixed-length, and their internal
-   representation cannot be larger than the size of the <type>Datum</> type
+   representation cannot be larger than the size of the <type>Datum</type> type
    (4 bytes on some machines, 8 bytes on others).
   </para>
 
@@ -347,7 +347,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    specifies the storage alignment required for the data type.  The
    allowed values equate to alignment on 1, 2, 4, or 8 byte boundaries.
    Note that variable-length types must have an alignment of at least
-   4, since they necessarily contain an <type>int4</> as their first component.
+   4, since they necessarily contain an <type>int4</type> as their first component.
   </para>
 
   <para>
@@ -372,12 +372,12 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   <para>
    All <replaceable class="parameter">storage</replaceable> values other
    than <literal>plain</literal> imply that the functions of the data type
-   can handle values that have been <firstterm>toasted</>, as described
-   in <xref linkend="storage-toast"> and <xref linkend="xtypes-toast">.
+   can handle values that have been <firstterm>toasted</firstterm>, as described
+   in <xref linkend="storage-toast"/> and <xref linkend="xtypes-toast"/>.
    The specific other value given merely determines the default TOAST
    storage strategy for columns of a toastable data type; users can pick
    other strategies for individual columns using <literal>ALTER TABLE
-   SET STORAGE</>.
+   SET STORAGE</literal>.
   </para>
 
   <para>
@@ -389,9 +389,9 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    <replaceable class="parameter">alignment</replaceable>, and
    <replaceable class="parameter">storage</replaceable> are copied from the
    named type.  (It is possible, though usually undesirable, to override
-   some of these values by specifying them along with the <literal>LIKE</>
+   some of these values by specifying them along with the <literal>LIKE</literal>
    clause.)  Specifying representation this way is especially useful when
-   the low-level implementation of the new type <quote>piggybacks</> on an
+   the low-level implementation of the new type <quote>piggybacks</quote> on an
    existing type in some fashion.
   </para>
 
@@ -400,15 +400,15 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    <replaceable class="parameter">preferred</replaceable> parameters can be
    used to help control which implicit cast will be applied in ambiguous
    situations.  Each data type belongs to a category named by a single ASCII
-   character, and each type is either <quote>preferred</> or not within its
+   character, and each type is either <quote>preferred</quote> or not within its
    category.  The parser will prefer casting to preferred types (but only from
    other types within the same category) when this rule is helpful in
    resolving overloaded functions or operators.  For more details see <xref
-   linkend="typeconv">.  For types that have no implicit casts to or from any
+   linkend="typeconv"/>.  For types that have no implicit casts to or from any
    other types, it is sufficient to leave these settings at the defaults.
    However, for a group of related types that have implicit casts, it is often
    helpful to mark them all as belonging to a category and select one or two
-   of the <quote>most general</> types as being preferred within the category.
+   of the <quote>most general</quote> types as being preferred within the category.
    The <replaceable class="parameter">category</replaceable> parameter is
    especially useful when adding a user-defined type to an existing built-in
    category, such as the numeric or string types.  However, it is also
@@ -426,7 +426,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
 
   <para>
    To indicate that a type is an array, specify the type of the array
-   elements using the <literal>ELEMENT</> key word.  For example, to
+   elements using the <literal>ELEMENT</literal> key word.  For example, to
    define an array of 4-byte integers (<type>int4</type>), specify
    <literal>ELEMENT = int4</literal>. More details about array types
    appear below.
@@ -465,26 +465,26 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     so generated collides with an existing type name, the process is
     repeated until a non-colliding name is found.)
     This implicitly-created array type is variable length and uses the
-    built-in input and output functions <literal>array_in</> and
-    <literal>array_out</>.  The array type tracks any changes in its
+    built-in input and output functions <literal>array_in</literal> and
+    <literal>array_out</literal>.  The array type tracks any changes in its
     element type's owner or schema, and is dropped if the element type is.
    </para>
 
    <para>
-    You might reasonably ask why there is an <option>ELEMENT</>
+    You might reasonably ask why there is an <option>ELEMENT</option>
     option, if the system makes the correct array type automatically.
-    The only case where it's useful to use <option>ELEMENT</> is when you are
+    The only case where it's useful to use <option>ELEMENT</option> is when you are
     making a fixed-length type that happens to be internally an array of a number of
     identical things, and you want to allow these things to be accessed
     directly by subscripting, in addition to whatever operations you plan
-    to provide for the type as a whole.  For example, type <type>point</>
+    to provide for the type as a whole.  For example, type <type>point</type>
     is represented as just two floating-point numbers, which can be accessed
-    using <literal>point[0]</> and <literal>point[1]</>.
+    using <literal>point[0]</literal> and <literal>point[1]</literal>.
     Note that
     this facility only works for fixed-length types whose internal form
     is exactly a sequence of identical fixed-length fields.  A subscriptable
     variable-length type must have the generalized internal representation
-    used by <literal>array_in</> and <literal>array_out</>.
+    used by <literal>array_in</literal> and <literal>array_out</literal>.
     For historical reasons (i.e., this is clearly wrong but it's far too
     late to change it), subscripting of fixed-length array types starts from
     zero, rather than from one as for variable-length arrays.
@@ -697,7 +697,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
       <replaceable class="parameter">alignment</replaceable>, and
       <replaceable class="parameter">storage</replaceable>
       are copied from that type, unless overridden by explicit
-      specification elsewhere in this <command>CREATE TYPE</> command.
+      specification elsewhere in this <command>CREATE TYPE</command> command.
      </para>
     </listitem>
    </varlistentry>
@@ -707,9 +707,9 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
     <listitem>
      <para>
       The category code (a single ASCII character) for this type.
-      The default is <literal>'U'</> for <quote>user-defined type</>.
+      The default is <literal>'U'</literal> for <quote>user-defined type</quote>.
       Other standard category codes can be found in
-      <xref linkend="catalog-typcategory-table">.  You may also choose
+      <xref linkend="catalog-typcategory-table"/>.  You may also choose
       other ASCII characters in order to create custom categories.
      </para>
     </listitem>
@@ -769,7 +769,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-CREATETYPE-notes">
+ <refsect1 id="sql-createtype-notes">
   <title>Notes</title>
 
   <para>
@@ -779,7 +779,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    This is usually
    not an issue for the sorts of functions that are useful in a type
    definition.  But you might want to think twice before designing a type
-   in a way that would require <quote>secret</> information to be used
+   in a way that would require <quote>secret</quote> information to be used
    while converting it to or from external form.
   </para>
 
@@ -792,7 +792,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    this in case of maximum-length names or collisions with user type names
    that begin with underscore.  Writing code that depends on this convention
    is therefore deprecated.  Instead, use
-   <structname>pg_type</>.<structfield>typarray</> to locate the array type
+   <structname>pg_type</structname>.<structfield>typarray</structfield> to locate the array type
    associated with a given type.
   </para>
 
@@ -807,7 +807,7 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
   <para>
    Before <productname>PostgreSQL</productname> version 8.2, the shell-type
    creation syntax
-   <literal>CREATE TYPE <replaceable>name</></literal> did not exist.
+   <literal>CREATE TYPE <replaceable>name</replaceable></literal> did not exist.
    The way to create a new base type was to create its input function first.
    In this approach, <productname>PostgreSQL</productname> will first see
    the name of the new data type as the return type of the input function.
@@ -824,10 +824,10 @@ CREATE TYPE <replaceable class="parameter">name</replaceable>
    In <productname>PostgreSQL</productname> versions before 7.3, it
    was customary to avoid creating a shell type at all, by replacing the
    functions' forward references to the type name with the placeholder
-   pseudo-type <type>opaque</>.  The <type>cstring</> arguments and
-   results also had to be declared as <type>opaque</> before 7.3.  To
-   support loading of old dump files, <command>CREATE TYPE</> will
-   accept I/O functions declared using <type>opaque</>, but it will issue
+   pseudo-type <type>opaque</type>.  The <type>cstring</type> arguments and
+   results also had to be declared as <type>opaque</type> before 7.3.  To
+   support loading of old dump files, <command>CREATE TYPE</command> will
+   accept I/O functions declared using <type>opaque</type>, but it will issue
    a notice and change the function declarations to use the correct
    types.
   </para>
@@ -894,7 +894,7 @@ CREATE TABLE myboxes (
 
   <para>
    If the internal structure of <type>box</type> were an array of four
-   <type>float4</> elements, we might instead use:
+   <type>float4</type> elements, we might instead use:
 <programlisting>
 CREATE TYPE box (
     INTERNALLENGTH = 16,
@@ -924,20 +924,20 @@ CREATE TABLE big_objs (
 
   <para>
    More examples, including suitable input and output functions, are
-   in <xref linkend="xtypes">.
+   in <xref linkend="xtypes"/>.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATETYPE-compatibility">
+ <refsect1 id="sql-createtype-compatibility">
   <title>Compatibility</title>
 
   <para>
    The first form of the <command>CREATE TYPE</command> command, which
-   creates a composite type, conforms to the <acronym>SQL</> standard.
+   creates a composite type, conforms to the <acronym>SQL</acronym> standard.
    The other forms are <productname>PostgreSQL</productname>
    extensions.  The <command>CREATE TYPE</command> statement in
-   the <acronym>SQL</> standard also defines other forms that are not
-   implemented in <productname>PostgreSQL</>.
+   the <acronym>SQL</acronym> standard also defines other forms that are not
+   implemented in <productname>PostgreSQL</productname>.
   </para>
 
   <para>
@@ -947,14 +947,14 @@ CREATE TABLE big_objs (
   </para>
  </refsect1>
 
- <refsect1 id="SQL-CREATETYPE-see-also">
+ <refsect1 id="sql-createtype-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertype"></member>
-   <member><xref linkend="sql-createdomain"></member>
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-droptype"></member>
+   <member><xref linkend="sql-altertype"/></member>
+   <member><xref linkend="sql-createdomain"/></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-droptype"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_user.sgml b/doc/src/sgml/ref/create_user.sgml
index 8a596eec9f..a51dc50c97 100644
--- a/doc/src/sgml/ref/create_user.sgml
+++ b/doc/src/sgml/ref/create_user.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_user.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEUSER">
+<refentry id="sql-createuser">
  <indexterm zone="sql-createuser">
   <primary>CREATE USER</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replaceable class="PARAMETER">option</replaceable> [ ... ] ]
+CREATE USER <replaceable class="parameter">name</replaceable> [ [ WITH ] <replaceable class="parameter">option</replaceable> [ ... ] ]
 
-<phrase>where <replaceable class="PARAMETER">option</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">option</replaceable> can be:</phrase>
 
       SUPERUSER | NOSUPERUSER
     | CREATEDB | NOCREATEDB
@@ -32,15 +32,15 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
     | LOGIN | NOLOGIN
     | REPLICATION | NOREPLICATION
     | BYPASSRLS | NOBYPASSRLS
-    | CONNECTION LIMIT <replaceable class="PARAMETER">connlimit</replaceable>
-    | [ ENCRYPTED ] PASSWORD '<replaceable class="PARAMETER">password</replaceable>'
-    | VALID UNTIL '<replaceable class="PARAMETER">timestamp</replaceable>'
-    | IN ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | IN GROUP <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ROLE <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | ADMIN <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | USER <replaceable class="PARAMETER">role_name</replaceable> [, ...]
-    | SYSID <replaceable class="PARAMETER">uid</replaceable>
+    | CONNECTION LIMIT <replaceable class="parameter">connlimit</replaceable>
+    | [ ENCRYPTED ] PASSWORD '<replaceable class="parameter">password</replaceable>'
+    | VALID UNTIL '<replaceable class="parameter">timestamp</replaceable>'
+    | IN ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | IN GROUP <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ROLE <replaceable class="parameter">role_name</replaceable> [, ...]
+    | ADMIN <replaceable class="parameter">role_name</replaceable> [, ...]
+    | USER <replaceable class="parameter">role_name</replaceable> [, ...]
+    | SYSID <replaceable class="parameter">uid</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,10 +49,10 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
 
   <para>
    <command>CREATE USER</command> is now an alias for
-   <xref linkend="sql-createrole">.
+   <xref linkend="sql-createrole"/>.
    The only difference is that when the command is spelled
-   <command>CREATE USER</command>, <literal>LOGIN</> is assumed
-   by default, whereas <literal>NOLOGIN</> is assumed when
+   <command>CREATE USER</command>, <literal>LOGIN</literal> is assumed
+   by default, whereas <literal>NOLOGIN</literal> is assumed when
    the command is spelled
    <command>CREATE ROLE</command>.
   </para>
@@ -72,7 +72,7 @@ CREATE USER <replaceable class="PARAMETER">name</replaceable> [ [ WITH ] <replac
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole"></member>
+   <member><xref linkend="sql-createrole"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/create_user_mapping.sgml b/doc/src/sgml/ref/create_user_mapping.sgml
index 1c44679a98..c2f5278f62 100644
--- a/doc/src/sgml/ref/create_user_mapping.sgml
+++ b/doc/src/sgml/ref/create_user_mapping.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_user_mapping.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEUSERMAPPING">
+<refentry id="sql-createusermapping">
  <indexterm zone="sql-createusermapping">
   <primary>CREATE USER MAPPING</primary>
  </indexterm>
@@ -23,7 +23,7 @@ PostgreSQL documentation
 <synopsis>
 CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_name</replaceable> | USER | CURRENT_USER | PUBLIC }
     SERVER <replaceable class="parameter">server_name</replaceable>
-    [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [ , ... ] ) ]
+    [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [ , ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -41,7 +41,7 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na
   <para>
    The owner of a foreign server can create user mappings for that
    server for any user.  Also, a user can create a user mapping for
-   their own user name if <literal>USAGE</> privilege on the server has
+   their own user name if <literal>USAGE</literal> privilege on the server has
    been granted to the user.
   </para>
  </refsect1>
@@ -51,7 +51,7 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na
 
   <variablelist>
   <varlistentry>
-    <term><literal>IF NOT EXISTS</></term>
+    <term><literal>IF NOT EXISTS</literal></term>
     <listitem>
      <para>
       Do not throw an error if a mapping of the given user to the given foreign
@@ -67,8 +67,8 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na
     <listitem>
      <para>
       The name of an existing user that is mapped to foreign server.
-      <literal>CURRENT_USER</> and <literal>USER</> match the name of
-      the current user.  When <literal>PUBLIC</> is specified, a
+      <literal>CURRENT_USER</literal> and <literal>USER</literal> match the name of
+      the current user.  When <literal>PUBLIC</literal> is specified, a
       so-called public mapping is created that is used when no
       user-specific mapping is applicable.
      </para>
@@ -86,7 +86,7 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] )</literal></term>
+    <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies the options of the user mapping.  The
@@ -103,7 +103,7 @@ CREATE USER MAPPING [IF NOT EXISTS] FOR { <replaceable class="parameter">user_na
   <title>Examples</title>
 
   <para>
-   Create a user mapping for user <literal>bob</>, server <literal>foo</>:
+   Create a user mapping for user <literal>bob</literal>, server <literal>foo</literal>:
 <programlisting>
 CREATE USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'secret');
 </programlisting></para>
@@ -122,10 +122,10 @@ CREATE USER MAPPING FOR bob SERVER foo OPTIONS (user 'bob', password 'secret');
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterusermapping"></member>
-   <member><xref linkend="sql-dropusermapping"></member>
-   <member><xref linkend="sql-createforeigndatawrapper"></member>
-   <member><xref linkend="sql-createserver"></member>
+   <member><xref linkend="sql-alterusermapping"/></member>
+   <member><xref linkend="sql-dropusermapping"/></member>
+   <member><xref linkend="sql-createforeigndatawrapper"/></member>
+   <member><xref linkend="sql-createserver"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/create_view.sgml b/doc/src/sgml/ref/create_view.sgml
index a83d9564e5..b325c1be50 100644
--- a/doc/src/sgml/ref/create_view.sgml
+++ b/doc/src/sgml/ref/create_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/create_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-CREATEVIEW">
+<refentry id="sql-createview">
  <indexterm zone="sql-createview">
   <primary>CREATE VIEW</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ]
-    [ WITH ( <replaceable class="PARAMETER">view_option_name</replaceable> [= <replaceable class="PARAMETER">view_option_value</replaceable>] [, ... ] ) ]
-    AS <replaceable class="PARAMETER">query</replaceable>
+CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ]
+    [ WITH ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] ) ]
+    AS <replaceable class="parameter">query</replaceable>
     [ WITH [ CASCADED | LOCAL ] CHECK OPTION ]
 </synopsis>
  </refsynopsisdiv>
@@ -48,7 +48,7 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class
 
   <para>
    If a schema name is given (for example, <literal>CREATE VIEW
-   myschema.myview ...</>) then the view is created in the specified
+   myschema.myview ...</literal>) then the view is created in the specified
    schema.  Otherwise it is created in the current schema.  Temporary
    views exist in a special schema, so a schema name cannot be given
    when creating a temporary view. The name of the view must be
@@ -62,7 +62,7 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class
 
   <variablelist>
    <varlistentry>
-    <term><literal>TEMPORARY</> or <literal>TEMP</></term>
+    <term><literal>TEMPORARY</literal> or <literal>TEMP</literal></term>
     <listitem>
      <para>
       If specified, the view is created as a temporary view.
@@ -82,16 +82,16 @@ CREATE [ OR REPLACE ] [ TEMP | TEMPORARY ] [ RECURSIVE ] VIEW <replaceable class
    </varlistentry>
 
    <varlistentry>
-    <term><literal>RECURSIVE</></term>
+    <term><literal>RECURSIVE</literal></term>
     <listitem>
      <para>
       Creates a recursive view.  The syntax
 <synopsis>
-CREATE RECURSIVE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> (<replaceable>column_names</>) AS SELECT <replaceable>...</>;
+CREATE RECURSIVE VIEW [ <replaceable>schema</replaceable> . ] <replaceable>view_name</replaceable> (<replaceable>column_names</replaceable>) AS SELECT <replaceable>...</replaceable>;
 </synopsis>
       is equivalent to
 <synopsis>
-CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECURSIVE <replaceable>view_name</> (<replaceable>column_names</>) AS (SELECT <replaceable>...</>) SELECT <replaceable>column_names</> FROM <replaceable>view_name</>;
+CREATE VIEW [ <replaceable>schema</replaceable> . ] <replaceable>view_name</replaceable> AS WITH RECURSIVE <replaceable>view_name</replaceable> (<replaceable>column_names</replaceable>) AS (SELECT <replaceable>...</replaceable>) SELECT <replaceable>column_names</replaceable> FROM <replaceable>view_name</replaceable>;
 </synopsis>
       A view column name list must be specified for a recursive view.
      </para>
@@ -118,7 +118,7 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
    </varlistentry>
 
    <varlistentry>
-    <term><literal>WITH ( <replaceable class="PARAMETER">view_option_name</replaceable> [= <replaceable class="PARAMETER">view_option_value</replaceable>] [, ... ] )</literal></term>
+    <term><literal>WITH ( <replaceable class="parameter">view_option_name</replaceable> [= <replaceable class="parameter">view_option_value</replaceable>] [, ... ] )</literal></term>
     <listitem>
      <para>
       This clause specifies optional parameters for a view; the following
@@ -129,11 +129,11 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
         <term><literal>check_option</literal> (<type>string</type>)</term>
         <listitem>
          <para>
-          This parameter may be either <literal>local</> or
-          <literal>cascaded</>, and is equivalent to specifying
-          <literal>WITH [ CASCADED | LOCAL ] CHECK OPTION</> (see below).
+          This parameter may be either <literal>local</literal> or
+          <literal>cascaded</literal>, and is equivalent to specifying
+          <literal>WITH [ CASCADED | LOCAL ] CHECK OPTION</literal> (see below).
           This option can be changed on existing views using <xref
-          linkend="sql-alterview">.
+          linkend="sql-alterview"/>.
          </para>
         </listitem>
        </varlistentry>
@@ -143,7 +143,7 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
         <listitem>
          <para>
           This should be used if the view is intended to provide row-level
-          security.  See <xref linkend="rules-privileges"> for full details.
+          security.  See <xref linkend="rules-privileges"/> for full details.
          </para>
         </listitem>
        </varlistentry>
@@ -156,8 +156,8 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select"> or
-      <xref linkend="sql-values"> command
+      A <xref linkend="sql-select"/> or
+      <xref linkend="sql-values"/> command
       which will provide the columns and rows of the view.
      </para>
     </listitem>
@@ -165,22 +165,22 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
 
    <varlistentry>
     <term><literal>WITH [ CASCADED | LOCAL ] CHECK OPTION</literal>
-      <indexterm zone="SQL-CREATEVIEW">
+      <indexterm zone="sql-createview">
        <primary>CHECK OPTION</primary>
       </indexterm>
-      <indexterm zone="SQL-CREATEVIEW">
+      <indexterm zone="sql-createview">
        <primary>WITH CHECK OPTION</primary>
       </indexterm>
     </term>
     <listitem>
      <para>
       This option controls the behavior of automatically updatable views.  When
-      this option is specified, <command>INSERT</> and <command>UPDATE</>
+      this option is specified, <command>INSERT</command> and <command>UPDATE</command>
       commands on the view will be checked to ensure that new rows satisfy the
       view-defining condition (that is, the new rows are checked to ensure that
       they are visible through the view).  If they are not, the update will be
-      rejected.  If the <literal>CHECK OPTION</> is not specified,
-      <command>INSERT</> and <command>UPDATE</> commands on the view are
+      rejected.  If the <literal>CHECK OPTION</literal> is not specified,
+      <command>INSERT</command> and <command>UPDATE</command> commands on the view are
       allowed to create rows that are not visible through the view.  The
       following check options are supported:
 
@@ -191,7 +191,7 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
          <para>
           New rows are only checked against the conditions defined directly in
           the view itself.  Any conditions defined on underlying base views are
-          not checked (unless they also specify the <literal>CHECK OPTION</>).
+          not checked (unless they also specify the <literal>CHECK OPTION</literal>).
          </para>
         </listitem>
        </varlistentry>
@@ -201,9 +201,9 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
         <listitem>
          <para>
           New rows are checked against the conditions of the view and all
-          underlying base views.  If the <literal>CHECK OPTION</> is specified,
-          and neither <literal>LOCAL</> nor <literal>CASCADED</> is specified,
-          then <literal>CASCADED</> is assumed.
+          underlying base views.  If the <literal>CHECK OPTION</literal> is specified,
+          and neither <literal>LOCAL</literal> nor <literal>CASCADED</literal> is specified,
+          then <literal>CASCADED</literal> is assumed.
          </para>
         </listitem>
        </varlistentry>
@@ -211,26 +211,26 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
      </para>
 
      <para>
-      The <literal>CHECK OPTION</> may not be used with <literal>RECURSIVE</>
+      The <literal>CHECK OPTION</literal> may not be used with <literal>RECURSIVE</literal>
       views.
      </para>
 
      <para>
-      Note that the <literal>CHECK OPTION</> is only supported on views that
-      are automatically updatable, and do not have <literal>INSTEAD OF</>
-      triggers or <literal>INSTEAD</> rules.  If an automatically updatable
-      view is defined on top of a base view that has <literal>INSTEAD OF</>
-      triggers, then the <literal>LOCAL CHECK OPTION</> may be used to check
+      Note that the <literal>CHECK OPTION</literal> is only supported on views that
+      are automatically updatable, and do not have <literal>INSTEAD OF</literal>
+      triggers or <literal>INSTEAD</literal> rules.  If an automatically updatable
+      view is defined on top of a base view that has <literal>INSTEAD OF</literal>
+      triggers, then the <literal>LOCAL CHECK OPTION</literal> may be used to check
       the conditions on the automatically updatable view, but the conditions
-      on the base view with <literal>INSTEAD OF</> triggers will not be
+      on the base view with <literal>INSTEAD OF</literal> triggers will not be
       checked (a cascaded check option will not cascade down to a
       trigger-updatable view, and any check options defined directly on a
       trigger-updatable view will be ignored).  If the view or any of its base
-      relations has an <literal>INSTEAD</> rule that causes the
-      <command>INSERT</> or <command>UPDATE</> command to be rewritten, then
+      relations has an <literal>INSTEAD</literal> rule that causes the
+      <command>INSERT</command> or <command>UPDATE</command> command to be rewritten, then
       all check options will be ignored in the rewritten query, including any
       checks from automatically updatable views defined on top of the relation
-      with the <literal>INSTEAD</> rule.
+      with the <literal>INSTEAD</literal> rule.
      </para>
     </listitem>
    </varlistentry>
@@ -241,7 +241,7 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
   <title>Notes</title>
 
    <para>
-    Use the <xref linkend="sql-dropview">
+    Use the <xref linkend="sql-dropview"/>
     statement to drop views.
    </para>
 
@@ -251,8 +251,8 @@ CREATE VIEW [ <replaceable>schema</> . ] <replaceable>view_name</> AS WITH RECUR
 <programlisting>
 CREATE VIEW vista AS SELECT 'Hello World';
 </programlisting>
-    is bad form because the column name defaults to <literal>?column?</>;
-    also, the column data type defaults to <type>text</>, which might not
+    is bad form because the column name defaults to <literal>?column?</literal>;
+    also, the column data type defaults to <type>text</type>, which might not
     be what you wanted.  Better style for a string literal in a view's
     result is something like:
 <programlisting>
@@ -264,22 +264,22 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     Access to tables referenced in the view is determined by permissions of
     the view owner.  In some cases, this can be used to provide secure but
     restricted access to the underlying tables.  However, not all views are
-    secure against tampering; see <xref linkend="rules-privileges"> for
+    secure against tampering; see <xref linkend="rules-privileges"/> for
     details.  Functions called in the view are treated the same as if they had
     been called directly from the query using the view.  Therefore the user of
     a view must have permissions to call all functions used by the view.
    </para>
 
    <para>
-    When <command>CREATE OR REPLACE VIEW</> is used on an
+    When <command>CREATE OR REPLACE VIEW</command> is used on an
     existing view, only the view's defining SELECT rule is changed.
     Other view properties, including ownership, permissions, and non-SELECT
     rules, remain unchanged.  You must own the view
     to replace it (this includes being a member of the owning role).
    </para>
 
-  <refsect2 id="SQL-CREATEVIEW-updatable-views">
-   <title id="SQL-CREATEVIEW-updatable-views-title">Updatable Views</title>
+  <refsect2 id="sql-createview-updatable-views">
+   <title id="sql-createview-updatable-views-title">Updatable Views</title>
 
    <indexterm zone="sql-createview-updatable-views">
     <primary>updatable views</primary>
@@ -287,30 +287,30 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
 
    <para>
     Simple views are automatically updatable: the system will allow
-    <command>INSERT</>, <command>UPDATE</> and <command>DELETE</> statements
+    <command>INSERT</command>, <command>UPDATE</command> and <command>DELETE</command> statements
     to be used on the view in the same way as on a regular table.  A view is
     automatically updatable if it satisfies all of the following conditions:
 
     <itemizedlist>
      <listitem>
       <para>
-       The view must have exactly one entry in its <literal>FROM</> list,
+       The view must have exactly one entry in its <literal>FROM</literal> list,
        which must be a table or another updatable view.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The view definition must not contain <literal>WITH</>,
-       <literal>DISTINCT</>, <literal>GROUP BY</>, <literal>HAVING</>,
-       <literal>LIMIT</>, or <literal>OFFSET</> clauses at the top level.
+       The view definition must not contain <literal>WITH</literal>,
+       <literal>DISTINCT</literal>, <literal>GROUP BY</literal>, <literal>HAVING</literal>,
+       <literal>LIMIT</literal>, or <literal>OFFSET</literal> clauses at the top level.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       The view definition must not contain set operations (<literal>UNION</>,
-       <literal>INTERSECT</> or <literal>EXCEPT</>) at the top level.
+       The view definition must not contain set operations (<literal>UNION</literal>,
+       <literal>INTERSECT</literal> or <literal>EXCEPT</literal>) at the top level.
       </para>
      </listitem>
 
@@ -327,42 +327,42 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     An automatically updatable view may contain a mix of updatable and
     non-updatable columns.  A column is updatable if it is a simple reference
     to an updatable column of the underlying base relation; otherwise the
-    column is read-only, and an error will be raised if an <command>INSERT</>
-    or <command>UPDATE</> statement attempts to assign a value to it.
+    column is read-only, and an error will be raised if an <command>INSERT</command>
+    or <command>UPDATE</command> statement attempts to assign a value to it.
    </para>
 
    <para>
     If the view is automatically updatable the system will convert any
-    <command>INSERT</>, <command>UPDATE</> or <command>DELETE</> statement
+    <command>INSERT</command>, <command>UPDATE</command> or <command>DELETE</command> statement
     on the view into the corresponding statement on the underlying base
-    relation.  <command>INSERT</> statements that have an <literal>ON
-    CONFLICT UPDATE</> clause are fully supported.
+    relation.  <command>INSERT</command> statements that have an <literal>ON
+    CONFLICT UPDATE</literal> clause are fully supported.
    </para>
 
    <para>
-    If an automatically updatable view contains a <literal>WHERE</>
+    If an automatically updatable view contains a <literal>WHERE</literal>
     condition, the condition restricts which rows of the base relation are
-    available to be modified by <command>UPDATE</> and <command>DELETE</>
-    statements on the view.  However, an <command>UPDATE</> is allowed to
-    change a row so that it no longer satisfies the <literal>WHERE</>
+    available to be modified by <command>UPDATE</command> and <command>DELETE</command>
+    statements on the view.  However, an <command>UPDATE</command> is allowed to
+    change a row so that it no longer satisfies the <literal>WHERE</literal>
     condition, and thus is no longer visible through the view.  Similarly,
-    an <command>INSERT</> command can potentially insert base-relation rows
-    that do not satisfy the <literal>WHERE</> condition and thus are not
-    visible through the view (<literal>ON CONFLICT UPDATE</> may
+    an <command>INSERT</command> command can potentially insert base-relation rows
+    that do not satisfy the <literal>WHERE</literal> condition and thus are not
+    visible through the view (<literal>ON CONFLICT UPDATE</literal> may
     similarly affect an existing row not visible through the view).
-    The <literal>CHECK OPTION</> may be used to prevent
-    <command>INSERT</> and <command>UPDATE</> commands from creating
+    The <literal>CHECK OPTION</literal> may be used to prevent
+    <command>INSERT</command> and <command>UPDATE</command> commands from creating
     such rows that are not visible through the view.
    </para>
 
    <para>
     If an automatically updatable view is marked with the
-    <literal>security_barrier</> property then all the view's <literal>WHERE</>
+    <literal>security_barrier</literal> property then all the view's <literal>WHERE</literal>
     conditions (and any conditions using operators which are marked as <literal>LEAKPROOF</literal>)
     will always be evaluated before any conditions that a user of the view has
-    added.   See <xref linkend="rules-privileges"> for full details.  Note that,
+    added.   See <xref linkend="rules-privileges"/> for full details.  Note that,
     due to this, rows which are not ultimately returned (because they do not
-    pass the user's <literal>WHERE</> conditions) may still end up being locked.
+    pass the user's <literal>WHERE</literal> conditions) may still end up being locked.
     <command>EXPLAIN</command> can be used to see which conditions are
     applied at the relation level (and therefore do not lock rows) and which are
     not.
@@ -372,11 +372,11 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     A more complex view that does not satisfy all these conditions is
     read-only by default: the system will not allow an insert, update, or
     delete on the view.  You can get the effect of an updatable view by
-    creating <literal>INSTEAD OF</> triggers on the view, which must
+    creating <literal>INSTEAD OF</literal> triggers on the view, which must
     convert attempted inserts, etc. on the view into appropriate actions
     on other tables.  For more information see <xref
-    linkend="sql-createtrigger">.  Another possibility is to create rules
-    (see <xref linkend="sql-createrule">), but in practice triggers are
+    linkend="sql-createtrigger"/>.  Another possibility is to create rules
+    (see <xref linkend="sql-createrule"/>), but in practice triggers are
     easier to understand and use correctly.
    </para>
 
@@ -386,7 +386,7 @@ CREATE VIEW vista AS SELECT text 'Hello World' AS hello;
     view.  In addition the view's owner must have the relevant privileges on
     the underlying base relations, but the user performing the update does
     not need any permissions on the underlying base relations (see
-    <xref linkend="rules-privileges">).
+    <xref linkend="rules-privileges"/>).
    </para>
   </refsect2>
  </refsect1>
@@ -404,13 +404,13 @@ CREATE VIEW comedies AS
     WHERE kind = 'Comedy';
 </programlisting>
    This will create a view containing the columns that are in the
-   <literal>film</> table at the time of view creation.  Though
-   <literal>*</> was used to create the view, columns added later to
+   <literal>film</literal> table at the time of view creation.  Though
+   <literal>*</literal> was used to create the view, columns added later to
    the table will not be part of the view.
   </para>
 
   <para>
-   Create a view with <literal>LOCAL CHECK OPTION</>:
+   Create a view with <literal>LOCAL CHECK OPTION</literal>:
 
 <programlisting>
 CREATE VIEW universal_comedies AS
@@ -419,16 +419,16 @@ CREATE VIEW universal_comedies AS
     WHERE classification = 'U'
     WITH LOCAL CHECK OPTION;
 </programlisting>
-   This will create a view based on the <literal>comedies</> view, showing
-   only films with <literal>kind = 'Comedy'</> and
-   <literal>classification = 'U'</>. Any attempt to <command>INSERT</> or
-   <command>UPDATE</> a row in the view will be rejected if the new row
-   doesn't have <literal>classification = 'U'</>, but the film
-   <literal>kind</> will not be checked.
+   This will create a view based on the <literal>comedies</literal> view, showing
+   only films with <literal>kind = 'Comedy'</literal> and
+   <literal>classification = 'U'</literal>. Any attempt to <command>INSERT</command> or
+   <command>UPDATE</command> a row in the view will be rejected if the new row
+   doesn't have <literal>classification = 'U'</literal>, but the film
+   <literal>kind</literal> will not be checked.
   </para>
 
   <para>
-   Create a view with <literal>CASCADED CHECK OPTION</>:
+   Create a view with <literal>CASCADED CHECK OPTION</literal>:
 
 <programlisting>
 CREATE VIEW pg_comedies AS
@@ -437,8 +437,8 @@ CREATE VIEW pg_comedies AS
     WHERE classification = 'PG'
     WITH CASCADED CHECK OPTION;
 </programlisting>
-   This will create a view that checks both the <literal>kind</> and
-   <literal>classification</> of new rows.
+   This will create a view that checks both the <literal>kind</literal> and
+   <literal>classification</literal> of new rows.
   </para>
 
   <para>
@@ -454,10 +454,10 @@ CREATE VIEW comedies AS
     FROM films f
     WHERE f.kind = 'Comedy';
 </programlisting>
-   This view will support <command>INSERT</>, <command>UPDATE</> and
-   <command>DELETE</>.  All the columns from the <literal>films</> table will
-   be updatable, whereas the computed columns <literal>country</> and
-   <literal>avg_rating</> will be read-only.
+   This view will support <command>INSERT</command>, <command>UPDATE</command> and
+   <command>DELETE</command>.  All the columns from the <literal>films</literal> table will
+   be updatable, whereas the computed columns <literal>country</literal> and
+   <literal>avg_rating</literal> will be read-only.
   </para>
 
   <para>
@@ -466,10 +466,10 @@ CREATE VIEW comedies AS
 CREATE RECURSIVE VIEW public.nums_1_100 (n) AS
     VALUES (1)
 UNION ALL
-    SELECT n+1 FROM nums_1_100 WHERE n < 100;
+    SELECT n+1 FROM nums_1_100 WHERE n &lt; 100;
 </programlisting>
    Notice that although the recursive view's name is schema-qualified in this
-   <command>CREATE</>, its internal self-reference is not schema-qualified.
+   <command>CREATE</command>, its internal self-reference is not schema-qualified.
    This is because the implicitly-created CTE's name cannot be
    schema-qualified.
   </para>
@@ -482,7 +482,7 @@ UNION ALL
    <command>CREATE OR REPLACE VIEW</command> is a
    <productname>PostgreSQL</productname> language extension.
    So is the concept of a temporary view.
-   The <literal>WITH ( ... )</> clause is an extension as well.
+   The <literal>WITH ( ... )</literal> clause is an extension as well.
   </para>
  </refsect1>
 
@@ -490,9 +490,9 @@ UNION ALL
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterview"></member>
-   <member><xref linkend="sql-dropview"></member>
-   <member><xref linkend="sql-creatematerializedview"></member>
+   <member><xref linkend="sql-alterview"/></member>
+   <member><xref linkend="sql-dropview"/></member>
+   <member><xref linkend="sql-creatematerializedview"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/createdb.sgml b/doc/src/sgml/ref/createdb.sgml
index 9fc4c16a81..2658efeb1a 100644
--- a/doc/src/sgml/ref/createdb.sgml
+++ b/doc/src/sgml/ref/createdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/createdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-CREATEDB">
+<refentry id="app-createdb">
  <indexterm zone="app-createdb">
   <primary>createdb</primary>
  </indexterm>
@@ -30,7 +30,7 @@ PostgreSQL documentation
  </refsynopsisdiv>
 
 
- <refsect1 id="R1-APP-CREATEDB-1">
+ <refsect1 id="r1-app-createdb-1">
   <title>
    Description
   </title>
@@ -48,7 +48,7 @@ PostgreSQL documentation
 
   <para>
    <application>createdb</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEDATABASE">.
+   <acronym>SQL</acronym> command <xref linkend="sql-createdatabase"/>.
    There is no effective difference between creating databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -86,8 +86,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-D <replaceable class="parameter">tablespace</replaceable></></term>
-      <term><option>--tablespace=<replaceable class="parameter">tablespace</replaceable></></term>
+      <term><option>-D <replaceable class="parameter">tablespace</replaceable></option></term>
+      <term><option>--tablespace=<replaceable class="parameter">tablespace</replaceable></option></term>
       <listitem>
        <para>
         Specifies the default tablespace for the database. (This name
@@ -97,8 +97,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>createdb</application> generates
@@ -108,21 +108,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-E <replaceable class="parameter">encoding</replaceable></></term>
-      <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></></term>
+      <term><option>-E <replaceable class="parameter">encoding</replaceable></option></term>
+      <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></option></term>
       <listitem>
        <para>
         Specifies the character encoding scheme to be used in this
         database. The character sets supported by the
         <productname>PostgreSQL</productname> server are described in
-        <xref linkend="multibyte-charset-supported">.
+        <xref linkend="multibyte-charset-supported"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-l <replaceable class="parameter">locale</replaceable></></term>
-      <term><option>--locale=<replaceable class="parameter">locale</replaceable></></term>
+      <term><option>-l <replaceable class="parameter">locale</replaceable></option></term>
+      <term><option>--locale=<replaceable class="parameter">locale</replaceable></option></term>
       <listitem>
        <para>
         Specifies the locale to be used in this database.  This is equivalent
@@ -132,7 +132,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--lc-collate=<replaceable class="parameter">locale</replaceable></></term>
+      <term><option>--lc-collate=<replaceable class="parameter">locale</replaceable></option></term>
       <listitem>
        <para>
         Specifies the LC_COLLATE setting to be used in this database.
@@ -141,7 +141,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--lc-ctype=<replaceable class="parameter">locale</replaceable></></term>
+      <term><option>--lc-ctype=<replaceable class="parameter">locale</replaceable></option></term>
       <listitem>
        <para>
         Specifies the LC_CTYPE setting to be used in this database.
@@ -150,8 +150,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-O <replaceable class="parameter">owner</replaceable></></term>
-      <term><option>--owner=<replaceable class="parameter">owner</replaceable></></term>
+      <term><option>-O <replaceable class="parameter">owner</replaceable></option></term>
+      <term><option>--owner=<replaceable class="parameter">owner</replaceable></option></term>
       <listitem>
        <para>
         Specifies the database user who will own the new database.
@@ -161,8 +161,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-T <replaceable class="parameter">template</replaceable></></term>
-      <term><option>--template=<replaceable class="parameter">template</replaceable></></term>
+      <term><option>-T <replaceable class="parameter">template</replaceable></option></term>
+      <term><option>--template=<replaceable class="parameter">template</replaceable></option></term>
       <listitem>
        <para>
         Specifies the template database from which to build this
@@ -172,8 +172,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>createdb</application> version and exit.
@@ -182,8 +182,8 @@ PostgreSQL documentation
      </varlistentry>
 
     <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
       <para>
       Show help about <application>createdb</application> command line
@@ -199,7 +199,7 @@ PostgreSQL documentation
     The options <option>-D</option>, <option>-l</option>, <option>-E</option>,
     <option>-O</option>, and
     <option>-T</option> correspond to options of the underlying
-    SQL command <xref linkend="SQL-CREATEDATABASE">; see there for more information
+    SQL command <xref linkend="sql-createdatabase"/>; see there for more information
     about them.
    </para>
 
@@ -209,8 +209,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -221,8 +221,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or the local Unix domain socket file
@@ -232,8 +232,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as.
@@ -242,8 +242,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -257,8 +257,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>createdb</application> to prompt for a
@@ -271,14 +271,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>createdb</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
          Specifies the name of the database to connect to when creating the
@@ -325,9 +325,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -337,8 +337,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CREATEDATABASE">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-createdatabase"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -362,7 +362,7 @@ PostgreSQL documentation
 
    <para>
     To create the database <literal>demo</literal> using the
-    server on host <literal>eden</>, port 5000, using the
+    server on host <literal>eden</literal>, port 5000, using the
     <literal>template0</literal> template database,  here is the
     command-line command and the underlying SQL command:
 <screen>
@@ -376,8 +376,8 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-dropdb"></member>
-   <member><xref linkend="sql-createdatabase"></member>
+   <member><xref linkend="app-dropdb"/></member>
+   <member><xref linkend="sql-createdatabase"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/createuser.sgml b/doc/src/sgml/ref/createuser.sgml
index fda77976ff..22ee99f2cc 100644
--- a/doc/src/sgml/ref/createuser.sgml
+++ b/doc/src/sgml/ref/createuser.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/createuser.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-CREATEUSER">
+<refentry id="app-createuser">
  <indexterm zone="app-createuser">
   <primary>createuser</primary>
  </indexterm>
@@ -34,22 +34,22 @@ PostgreSQL documentation
   <para>
    <application>createuser</application> creates a
    new <productname>PostgreSQL</productname> user (or more precisely, a role).
-   Only superusers and users with <literal>CREATEROLE</> privilege can create
+   Only superusers and users with <literal>CREATEROLE</literal> privilege can create
    new users, so <application>createuser</application> must be
    invoked by someone who can connect as a superuser or a user with
-   <literal>CREATEROLE</> privilege.
+   <literal>CREATEROLE</literal> privilege.
   </para>
 
   <para>
    If you wish to create a new superuser, you must connect as a
-   superuser, not merely with <literal>CREATEROLE</> privilege.
+   superuser, not merely with <literal>CREATEROLE</literal> privilege.
    Being a superuser implies the ability to bypass all access permission
    checks within the database, so superuserdom should not be granted lightly.
   </para>
 
   <para>
    <application>createuser</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-CREATEROLE">.
+   <acronym>SQL</acronym> command <xref linkend="sql-createrole"/>.
    There is no effective difference between creating users via
    this utility and via other methods for accessing the server.
   </para>
@@ -61,7 +61,7 @@ PostgreSQL documentation
   <title>Options</title>
 
   <para>
-   <application>createuser</> accepts the following command-line arguments:
+   <application>createuser</application> accepts the following command-line arguments:
 
     <variablelist>
      <varlistentry>
@@ -77,8 +77,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-c <replaceable class="parameter">number</replaceable></></term>
-      <term><option>--connection-limit=<replaceable class="parameter">number</replaceable></></term>
+      <term><option>-c <replaceable class="parameter">number</replaceable></option></term>
+      <term><option>--connection-limit=<replaceable class="parameter">number</replaceable></option></term>
       <listitem>
        <para>
         Set a maximum number of connections for the new user.
@@ -88,8 +88,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-d</></term>
-      <term><option>--createdb</></term>
+      <term><option>-d</option></term>
+      <term><option>--createdb</option></term>
       <listitem>
        <para>
         The new user will be allowed to create databases.
@@ -98,8 +98,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-D</></term>
-      <term><option>--no-createdb</></term>
+      <term><option>-D</option></term>
+      <term><option>--no-createdb</option></term>
       <listitem>
        <para>
         The new user will not be allowed to create databases.  This is the
@@ -109,8 +109,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>createuser</application> generates
@@ -120,8 +120,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-E</></term>
-      <term><option>--encrypted</></term>
+      <term><option>-E</option></term>
+      <term><option>--encrypted</option></term>
       <listitem>
        <para>
         This option is obsolete but still accepted for backward
@@ -131,21 +131,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-g <replaceable class="parameter">role</replaceable></></term>
-      <term><option>--role=<replaceable class="parameter">role</replaceable></></term>
+      <term><option>-g <replaceable class="parameter">role</replaceable></option></term>
+      <term><option>--role=<replaceable class="parameter">role</replaceable></option></term>
       <listitem>
        <para>
          Indicates role to which this role will be added immediately as a new
          member. Multiple roles to which this role will be added as a member
          can be specified by writing multiple
-         <option>-g</> switches.
+         <option>-g</option> switches.
          </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-i</></term>
-      <term><option>--inherit</></term>
+      <term><option>-i</option></term>
+      <term><option>--inherit</option></term>
       <listitem>
        <para>
         The new role will automatically inherit privileges of roles
@@ -156,8 +156,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-I</></term>
-      <term><option>--no-inherit</></term>
+      <term><option>-I</option></term>
+      <term><option>--no-inherit</option></term>
       <listitem>
        <para>
         The new role will not automatically inherit privileges of roles
@@ -167,7 +167,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--interactive</></term>
+      <term><option>--interactive</option></term>
       <listitem>
        <para>
         Prompt for the user name if none is specified on the command line, and
@@ -181,8 +181,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-l</></term>
-      <term><option>--login</></term>
+      <term><option>-l</option></term>
+      <term><option>--login</option></term>
       <listitem>
        <para>
         The new user will be allowed to log in (that is, the user name
@@ -193,8 +193,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-L</></term>
-      <term><option>--no-login</></term>
+      <term><option>-L</option></term>
+      <term><option>--no-login</option></term>
       <listitem>
        <para>
         The new user will not be allowed to log in.
@@ -205,8 +205,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-P</></term>
-      <term><option>--pwprompt</></term>
+      <term><option>-P</option></term>
+      <term><option>--pwprompt</option></term>
       <listitem>
        <para>
        If given, <application>createuser</application> will issue a prompt for
@@ -217,19 +217,19 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-r</></term>
-      <term><option>--createrole</></term>
+      <term><option>-r</option></term>
+      <term><option>--createrole</option></term>
       <listitem>
        <para>
         The new user will be allowed to create new roles (that is,
-        this user will have <literal>CREATEROLE</> privilege).
+        this user will have <literal>CREATEROLE</literal> privilege).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-R</></term>
-      <term><option>--no-createrole</></term>
+      <term><option>-R</option></term>
+      <term><option>--no-createrole</option></term>
       <listitem>
        <para>
         The new user will not be allowed to create new roles.  This is the
@@ -239,8 +239,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--superuser</></term>
+      <term><option>-s</option></term>
+      <term><option>--superuser</option></term>
       <listitem>
        <para>
         The new user will be a superuser.
@@ -249,8 +249,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-S</></term>
-      <term><option>--no-superuser</></term>
+      <term><option>-S</option></term>
+      <term><option>--no-superuser</option></term>
       <listitem>
        <para>
         The new user will not be a superuser.  This is the default.
@@ -259,8 +259,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>createuser</application> version and exit.
@@ -269,30 +269,30 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--replication</></term>
+      <term><option>--replication</option></term>
       <listitem>
        <para>
         The new user will have the <literal>REPLICATION</literal> privilege,
         which is described more fully in the documentation for <xref
-        linkend="sql-createrole">.
+        linkend="sql-createrole"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-replication</></term>
+      <term><option>--no-replication</option></term>
       <listitem>
        <para>
         The new user will not have the <literal>REPLICATION</literal>
         privilege, which is described more fully in the documentation for <xref
-        linkend="sql-createrole">.
+        linkend="sql-createrole"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>createuser</application> command line
@@ -310,8 +310,8 @@ PostgreSQL documentation
 
    <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -323,8 +323,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -335,8 +335,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as (not the user name to create).
@@ -345,8 +345,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -360,8 +360,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>createuser</application> to prompt for a
@@ -375,7 +375,7 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>createuser</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -403,9 +403,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -415,8 +415,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-CREATEROLE">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-createrole"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -451,7 +451,7 @@ PostgreSQL documentation
 
    <para>
     To create the same user <literal>joe</literal> using the
-    server on host <literal>eden</>, port 5000, with attributes explicitly specified,
+    server on host <literal>eden</literal>, port 5000, with attributes explicitly specified,
     taking a look at the underlying command:
 <screen>
 <prompt>$ </prompt><userinput>createuser -h eden -p 5000 -S -D -R -e joe</userinput>
@@ -479,8 +479,8 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-dropuser"></member>
-   <member><xref linkend="sql-createrole"></member>
+   <member><xref linkend="app-dropuser"/></member>
+   <member><xref linkend="sql-createrole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/deallocate.sgml b/doc/src/sgml/ref/deallocate.sgml
index 394b125f52..3875e5069e 100644
--- a/doc/src/sgml/ref/deallocate.sgml
+++ b/doc/src/sgml/ref/deallocate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/deallocate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DEALLOCATE">
+<refentry id="sql-deallocate">
  <indexterm zone="sql-deallocate">
   <primary>DEALLOCATE</primary>
  </indexterm>
@@ -41,7 +41,7 @@ DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL
 
   <para>
    For more information on prepared statements, see <xref
-   linkend="sql-prepare">.
+   linkend="sql-prepare"/>.
   </para>
  </refsect1>
 
@@ -91,8 +91,8 @@ DEALLOCATE [ PREPARE ] { <replaceable class="parameter">name</replaceable> | ALL
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-execute"></member>
-   <member><xref linkend="sql-prepare"></member>
+   <member><xref linkend="sql-execute"/></member>
+   <member><xref linkend="sql-prepare"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/declare.sgml b/doc/src/sgml/ref/declare.sgml
index 5cb85cc568..648c2950f4 100644
--- a/doc/src/sgml/ref/declare.sgml
+++ b/doc/src/sgml/ref/declare.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/declare.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DECLARE">
+<refentry id="sql-declare">
  <indexterm zone="sql-declare">
   <primary>DECLARE</primary>
  </indexterm>
@@ -39,15 +39,15 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
    can be used to retrieve
    a small number of rows at a time out of a larger query.
    After the cursor is created, rows are fetched from it using
-   <xref linkend="sql-fetch">.
+   <xref linkend="sql-fetch"/>.
   </para>
 
   <note>
    <para>
     This page describes usage of cursors at the SQL command level.
-    If you are trying to use cursors inside a <application>PL/pgSQL</>
+    If you are trying to use cursors inside a <application>PL/pgSQL</application>
     function, the rules are different &mdash;
-    see <xref linkend="plpgsql-cursors">.
+    see <xref linkend="plpgsql-cursors"/>.
    </para>
   </note>
  </refsect1>
@@ -100,7 +100,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
       used to retrieve rows in a nonsequential fashion.  The default is to
       allow scrolling in some cases; this is not the same as specifying
       <literal>SCROLL</literal>. See <xref linkend="sql-declare-notes"
-      endterm="sql-declare-notes-title"> for details.
+      endterm="sql-declare-notes-title"/> for details.
      </para>
     </listitem>
    </varlistentry>
@@ -124,8 +124,8 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <term><replaceable class="parameter">query</replaceable></term>
     <listitem>
      <para>
-      A <xref linkend="sql-select"> or
-      <xref linkend="sql-values"> command
+      A <xref linkend="sql-select"/> or
+      <xref linkend="sql-values"/> command
       which will provide the rows to be returned by the cursor.
      </para>
     </listitem>
@@ -144,13 +144,13 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
 
   <para>
    Normal cursors return data in text format, the same as a
-   <command>SELECT</> would produce.  The <literal>BINARY</> option
+   <command>SELECT</command> would produce.  The <literal>BINARY</literal> option
    specifies that the cursor should return data in binary format.
    This reduces conversion effort for both the server and client,
    at the cost of more programmer effort to deal with platform-dependent
    binary data formats.
    As an example, if a query returns a value of one from an integer column,
-   you would get a string of <literal>1</> with a default cursor,
+   you would get a string of <literal>1</literal> with a default cursor,
    whereas with a binary cursor you would get
    a 4-byte field containing the internal representation of the value
    (in big-endian byte order).
@@ -165,8 +165,8 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
 
   <note>
    <para>
-    When the client application uses the <quote>extended query</> protocol
-    to issue a <command>FETCH</> command, the Bind protocol message
+    When the client application uses the <quote>extended query</quote> protocol
+    to issue a <command>FETCH</command> command, the Bind protocol message
     specifies whether data is to be retrieved in text or binary format.
     This choice overrides the way that the cursor is defined.  The concept
     of a binary cursor as such is thus obsolete when using extended query
@@ -177,15 +177,15 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
    <para>
     Unless <literal>WITH HOLD</literal> is specified, the cursor
     created by this command can only be used within the current
-    transaction.  Thus, <command>DECLARE</> without <literal>WITH
+    transaction.  Thus, <command>DECLARE</command> without <literal>WITH
     HOLD</literal> is useless outside a transaction block: the cursor would
     survive only to the completion of the statement.  Therefore
     <productname>PostgreSQL</productname> reports an error if such a
     command is used outside a transaction block.
     Use
-    <xref linkend="sql-begin"> and
-    <xref linkend="sql-commit">
-    (or <xref linkend="sql-rollback">)
+    <xref linkend="sql-begin"/> and
+    <xref linkend="sql-commit"/>
+    (or <xref linkend="sql-rollback"/>)
     to define a transaction block.
    </para>
 
@@ -204,25 +204,25 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
 
    <para>
     <literal>WITH HOLD</literal> may not be specified when the query
-    includes <literal>FOR UPDATE</> or <literal>FOR SHARE</>.
+    includes <literal>FOR UPDATE</literal> or <literal>FOR SHARE</literal>.
    </para>
 
    <para>
-    The <literal>SCROLL</> option should be specified when defining a
+    The <literal>SCROLL</literal> option should be specified when defining a
     cursor that will be used to fetch backwards.  This is required by
     the SQL standard.  However, for compatibility with earlier
     versions, <productname>PostgreSQL</productname> will allow
-    backward fetches without <literal>SCROLL</>, if the cursor's query
+    backward fetches without <literal>SCROLL</literal>, if the cursor's query
     plan is simple enough that no extra overhead is needed to support
     it. However, application developers are advised not to rely on
     using backward fetches from a cursor that has not been created
-    with <literal>SCROLL</literal>.  If <literal>NO SCROLL</> is
+    with <literal>SCROLL</literal>.  If <literal>NO SCROLL</literal> is
     specified, then backward fetches are disallowed in any case.
    </para>
 
    <para>
     Backward fetches are also disallowed when the query
-    includes <literal>FOR UPDATE</> or <literal>FOR SHARE</>; therefore
+    includes <literal>FOR UPDATE</literal> or <literal>FOR SHARE</literal>; therefore
     <literal>SCROLL</literal> may not be specified in this case.
    </para>
 
@@ -230,7 +230,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
     <para>
      Scrollable and <literal>WITH HOLD</literal> cursors may give unexpected
      results if they invoke any volatile functions (see <xref
-     linkend="xfunc-volatility">).  When a previously fetched row is
+     linkend="xfunc-volatility"/>).  When a previously fetched row is
      re-fetched, the functions might be re-executed, perhaps leading to
      results different from the first time.  One workaround for such cases
      is to declare the cursor <literal>WITH HOLD</literal> and commit the
@@ -241,42 +241,42 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
    </caution>
 
    <para>
-    If the cursor's query includes <literal>FOR UPDATE</> or <literal>FOR
-    SHARE</>, then returned rows are locked at the time they are first
+    If the cursor's query includes <literal>FOR UPDATE</literal> or <literal>FOR
+    SHARE</literal>, then returned rows are locked at the time they are first
     fetched, in the same way as for a regular
-    <xref linkend="sql-select"> command with
+    <xref linkend="sql-select"/> command with
     these options.
     In addition, the returned rows will be the most up-to-date versions;
     therefore these options provide the equivalent of what the SQL standard
-    calls a <quote>sensitive cursor</>.  (Specifying <literal>INSENSITIVE</>
-    together with <literal>FOR UPDATE</> or <literal>FOR SHARE</> is an error.)
+    calls a <quote>sensitive cursor</quote>.  (Specifying <literal>INSENSITIVE</literal>
+    together with <literal>FOR UPDATE</literal> or <literal>FOR SHARE</literal> is an error.)
    </para>
 
    <caution>
     <para>
-     It is generally recommended to use <literal>FOR UPDATE</> if the cursor
-     is intended to be used with <command>UPDATE ... WHERE CURRENT OF</> or
-     <command>DELETE ... WHERE CURRENT OF</>.  Using <literal>FOR UPDATE</>
+     It is generally recommended to use <literal>FOR UPDATE</literal> if the cursor
+     is intended to be used with <command>UPDATE ... WHERE CURRENT OF</command> or
+     <command>DELETE ... WHERE CURRENT OF</command>.  Using <literal>FOR UPDATE</literal>
      prevents other sessions from changing the rows between the time they are
-     fetched and the time they are updated.  Without <literal>FOR UPDATE</>,
-     a subsequent <literal>WHERE CURRENT OF</> command will have no effect if
+     fetched and the time they are updated.  Without <literal>FOR UPDATE</literal>,
+     a subsequent <literal>WHERE CURRENT OF</literal> command will have no effect if
      the row was changed since the cursor was created.
     </para>
 
     <para>
-     Another reason to use <literal>FOR UPDATE</> is that without it, a
-     subsequent <literal>WHERE CURRENT OF</> might fail if the cursor query
+     Another reason to use <literal>FOR UPDATE</literal> is that without it, a
+     subsequent <literal>WHERE CURRENT OF</literal> might fail if the cursor query
      does not meet the SQL standard's rules for being <quote>simply
-     updatable</> (in particular, the cursor must reference just one table
-     and not use grouping or <literal>ORDER BY</>).  Cursors
+     updatable</quote> (in particular, the cursor must reference just one table
+     and not use grouping or <literal>ORDER BY</literal>).  Cursors
      that are not simply updatable might work, or might not, depending on plan
      choice details; so in the worst case, an application might work in testing
      and then fail in production.
     </para>
 
     <para>
-     The main reason not to use <literal>FOR UPDATE</> with <literal>WHERE
-     CURRENT OF</> is if you need the cursor to be scrollable, or to be
+     The main reason not to use <literal>FOR UPDATE</literal> with <literal>WHERE
+     CURRENT OF</literal> is if you need the cursor to be scrollable, or to be
      insensitive to the subsequent updates (that is, continue to show the old
      data).  If this is a requirement, pay close heed to the caveats shown
      above.
@@ -309,7 +309,7 @@ DECLARE <replaceable class="parameter">name</replaceable> [ BINARY ] [ INSENSITI
 <programlisting>
 DECLARE liahona CURSOR FOR SELECT * FROM films;
 </programlisting>
-   See <xref linkend="sql-fetch"> for more
+   See <xref linkend="sql-fetch"/> for more
    examples of cursor usage.
   </para>
  </refsect1>
@@ -321,13 +321,13 @@ DECLARE liahona CURSOR FOR SELECT * FROM films;
    The SQL standard says that it is implementation-dependent whether cursors
    are sensitive to concurrent updates of the underlying data by default.  In
    <productname>PostgreSQL</productname>, cursors are insensitive by default,
-   and can be made sensitive by specifying <literal>FOR UPDATE</>.  Other
+   and can be made sensitive by specifying <literal>FOR UPDATE</literal>.  Other
    products may work differently.
   </para>
 
   <para>
    The SQL standard allows cursors only in embedded
-   <acronym>SQL</acronym> and in modules. <productname>PostgreSQL</>
+   <acronym>SQL</acronym> and in modules. <productname>PostgreSQL</productname>
    permits cursors to be used interactively.
   </para>
 
@@ -341,9 +341,9 @@ DECLARE liahona CURSOR FOR SELECT * FROM films;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close"></member>
-   <member><xref linkend="sql-fetch"></member>
-   <member><xref linkend="sql-move"></member>
+   <member><xref linkend="sql-close"/></member>
+   <member><xref linkend="sql-fetch"/></member>
+   <member><xref linkend="sql-move"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/delete.sgml b/doc/src/sgml/ref/delete.sgml
index 20417a1391..df8cea48cf 100644
--- a/doc/src/sgml/ref/delete.sgml
+++ b/doc/src/sgml/ref/delete.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/delete.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DELETE">
+<refentry id="sql-delete">
  <indexterm zone="sql-delete">
   <primary>DELETE</primary>
  </indexterm>
@@ -22,9 +22,9 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
-DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
-    [ USING <replaceable class="PARAMETER">using_list</replaceable> ]
-    [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ]
+DELETE FROM [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
+    [ USING <replaceable class="parameter">using_list</replaceable> ]
+    [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
  </refsynopsisdiv>
@@ -41,7 +41,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
 
    <tip>
     <para>
-     <xref linkend="sql-truncate"> provides a
+     <xref linkend="sql-truncate"/> provides a
      faster mechanism to remove all rows from a table.
     </para>
    </tip>
@@ -55,12 +55,12 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
   </para>
 
   <para>
-   The optional <literal>RETURNING</> clause causes <command>DELETE</>
+   The optional <literal>RETURNING</literal> clause causes <command>DELETE</command>
    to compute and return value(s) based on each row actually deleted.
    Any expression using the table's columns, and/or columns of other
    tables mentioned in <literal>USING</literal>, can be computed.
-   The syntax of the <literal>RETURNING</> list is identical to that of the
-   output list of <command>SELECT</>.
+   The syntax of the <literal>RETURNING</literal> list is identical to that of the
+   output list of <command>SELECT</command>.
   </para>
 
   <para>
@@ -81,8 +81,8 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
     <listitem>
      <para>
       The <literal>WITH</literal> clause allows you to specify one or more
-      subqueries that can be referenced by name in the <command>DELETE</>
-      query. See <xref linkend="queries-with"> and <xref linkend="sql-select">
+      subqueries that can be referenced by name in the <command>DELETE</command>
+      query. See <xref linkend="queries-with"/> and <xref linkend="sql-select"/>
       for details.
      </para>
     </listitem>
@@ -93,11 +93,11 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to delete rows
-      from.  If <literal>ONLY</> is specified before the table name,
+      from.  If <literal>ONLY</literal> is specified before the table name,
       matching rows are deleted from the named table only.  If
-      <literal>ONLY</> is not specified, matching rows are also deleted
+      <literal>ONLY</literal> is not specified, matching rows are also deleted
       from any tables inheriting from the named table.  Optionally,
-      <literal>*</> can be specified after the table name to explicitly
+      <literal>*</literal> can be specified after the table name to explicitly
       indicate that descendant tables are included.
      </para>
     </listitem>
@@ -109,24 +109,24 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
      <para>
       A substitute name for the target table. When an alias is
       provided, it completely hides the actual name of the table.  For
-      example, given <literal>DELETE FROM foo AS f</>, the remainder
+      example, given <literal>DELETE FROM foo AS f</literal>, the remainder
       of the <command>DELETE</command> statement must refer to this
-      table as <literal>f</> not <literal>foo</>.
+      table as <literal>f</literal> not <literal>foo</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">using_list</replaceable></term>
+    <term><replaceable class="parameter">using_list</replaceable></term>
     <listitem>
      <para>
       A list of table expressions, allowing columns from other tables
-      to appear in the <literal>WHERE</> condition.  This is similar
+      to appear in the <literal>WHERE</literal> condition.  This is similar
       to the list of tables that can be specified in the <xref
-      linkend="sql-from" endterm="sql-from-title"> of a
+      linkend="sql-from" endterm="sql-from-title"/> of a
       <command>SELECT</command> statement; for example, an alias for
       the table name can be specified.  Do not repeat the target table
-      in the <replaceable class="PARAMETER">using_list</replaceable>,
+      in the <replaceable class="parameter">using_list</replaceable>,
       unless you wish to set up a self-join.
      </para>
     </listitem>
@@ -137,44 +137,44 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
     <listitem>
      <para>
       An expression that returns a value of type <type>boolean</type>.
-      Only rows for which this expression returns <literal>true</>
+      Only rows for which this expression returns <literal>true</literal>
       will be deleted.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+    <term><replaceable class="parameter">cursor_name</replaceable></term>
     <listitem>
      <para>
-      The name of the cursor to use in a <literal>WHERE CURRENT OF</>
+      The name of the cursor to use in a <literal>WHERE CURRENT OF</literal>
       condition.  The row to be deleted is the one most recently fetched
       from this cursor.  The cursor must be a non-grouping
-      query on the <command>DELETE</>'s target table.
-      Note that <literal>WHERE CURRENT OF</> cannot be
+      query on the <command>DELETE</command>'s target table.
+      Note that <literal>WHERE CURRENT OF</literal> cannot be
       specified together with a Boolean condition.  See
-      <xref linkend="sql-declare">
+      <xref linkend="sql-declare"/>
       for more information about using cursors with
-      <literal>WHERE CURRENT OF</>.
+      <literal>WHERE CURRENT OF</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">output_expression</replaceable></term>
+    <term><replaceable class="parameter">output_expression</replaceable></term>
     <listitem>
      <para>
-      An expression to be computed and returned by the <command>DELETE</>
+      An expression to be computed and returned by the <command>DELETE</command>
       command after each row is deleted.  The expression can use any
-      column names of the table named by <replaceable class="PARAMETER">table_name</replaceable>
-      or table(s) listed in <literal>USING</>.
-      Write <literal>*</> to return all columns.
+      column names of the table named by <replaceable class="parameter">table_name</replaceable>
+      or table(s) listed in <literal>USING</literal>.
+      Write <literal>*</literal> to return all columns.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">output_name</replaceable></term>
+    <term><replaceable class="parameter">output_name</replaceable></term>
     <listitem>
      <para>
       A name to use for a returned column.
@@ -188,7 +188,7 @@ DELETE FROM [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ *
   <title>Outputs</title>
 
   <para>
-   On successful completion, a <command>DELETE</> command returns a command
+   On successful completion, a <command>DELETE</command> command returns a command
    tag of the form
 <screen>
 DELETE <replaceable class="parameter">count</replaceable>
@@ -197,16 +197,16 @@ DELETE <replaceable class="parameter">count</replaceable>
    of rows deleted.  Note that the number may be less than the number of
    rows that matched the <replaceable
    class="parameter">condition</replaceable> when deletes were
-   suppressed by a <literal>BEFORE DELETE</> trigger.  If <replaceable
+   suppressed by a <literal>BEFORE DELETE</literal> trigger.  If <replaceable
    class="parameter">count</replaceable> is 0, no rows were deleted by
    the query (this is not considered an error).
   </para>
 
   <para>
-   If the <command>DELETE</> command contains a <literal>RETURNING</>
-   clause, the result will be similar to that of a <command>SELECT</>
+   If the <command>DELETE</command> command contains a <literal>RETURNING</literal>
+   clause, the result will be similar to that of a <command>SELECT</command>
    statement containing the columns and values defined in the
-   <literal>RETURNING</> list, computed over the row(s) deleted by the
+   <literal>RETURNING</literal> list, computed over the row(s) deleted by the
    command.
   </para>
  </refsect1>
@@ -216,16 +216,16 @@ DELETE <replaceable class="parameter">count</replaceable>
 
   <para>
    <productname>PostgreSQL</productname> lets you reference columns of
-   other tables in the <literal>WHERE</> condition by specifying the
+   other tables in the <literal>WHERE</literal> condition by specifying the
    other tables in the <literal>USING</literal> clause.  For example,
    to delete all films produced by a given producer, one can do:
 <programlisting>
 DELETE FROM films USING producers
   WHERE producer_id = producers.id AND producers.name = 'foo';
 </programlisting>
-   What is essentially happening here is a join between <structname>films</>
-   and <structname>producers</>, with all successfully joined
-   <structname>films</> rows being marked for deletion.
+   What is essentially happening here is a join between <structname>films</structname>
+   and <structname>producers</structname>, with all successfully joined
+   <structname>films</structname> rows being marked for deletion.
    This syntax is not standard.  A more standard way to do it is:
 <programlisting>
 DELETE FROM films
@@ -261,8 +261,8 @@ DELETE FROM tasks WHERE status = 'DONE' RETURNING *;
   </para>
 
    <para>
-   Delete the row of <structname>tasks</> on which the cursor
-   <literal>c_tasks</> is currently positioned:
+   Delete the row of <structname>tasks</structname> on which the cursor
+   <literal>c_tasks</literal> is currently positioned:
 <programlisting>
 DELETE FROM tasks WHERE CURRENT OF c_tasks;
 </programlisting></para>
@@ -273,9 +273,9 @@ DELETE FROM tasks WHERE CURRENT OF c_tasks;
 
   <para>
    This command conforms to the <acronym>SQL</acronym> standard, except
-   that the <literal>USING</literal> and <literal>RETURNING</> clauses
+   that the <literal>USING</literal> and <literal>RETURNING</literal> clauses
    are <productname>PostgreSQL</productname> extensions, as is the ability
-   to use <literal>WITH</> with <command>DELETE</>.
+   to use <literal>WITH</literal> with <command>DELETE</command>.
   </para>
  </refsect1>
 
@@ -283,7 +283,7 @@ DELETE FROM tasks WHERE CURRENT OF c_tasks;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-truncate"></member>
+   <member><xref linkend="sql-truncate"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/discard.sgml b/doc/src/sgml/ref/discard.sgml
index e859bf7bab..6b909b7232 100644
--- a/doc/src/sgml/ref/discard.sgml
+++ b/doc/src/sgml/ref/discard.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/discard.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DISCARD">
+<refentry id="sql-discard">
  <indexterm zone="sql-discard">
   <primary>DISCARD</primary>
  </indexterm>
@@ -29,10 +29,10 @@ DISCARD { ALL | PLANS | SEQUENCES | TEMPORARY | TEMP }
   <title>Description</title>
 
   <para>
-   <command>DISCARD</> releases internal resources associated with a
+   <command>DISCARD</command> releases internal resources associated with a
    database session.  This command is useful for partially or fully
    resetting the session's state.  There are several subcommands to
-   release different types of resources; the <command>DISCARD ALL</>
+   release different types of resources; the <command>DISCARD ALL</command>
    variant subsumes all the others, and also resets additional state.
   </para>
  </refsect1>
@@ -57,10 +57,10 @@ DISCARD { ALL | PLANS | SEQUENCES | TEMPORARY | TEMP }
     <listitem>
      <para>
       Discards all cached sequence-related state,
-      including <function>currval()</>/<function>lastval()</>
+      including <function>currval()</function>/<function>lastval()</function>
       information and any preallocated sequence values that have not
-      yet been returned by <function>nextval()</>.
-      (See <xref linkend="sql-createsequence"> for a description of
+      yet been returned by <function>nextval()</function>.
+      (See <xref linkend="sql-createsequence"/> for a description of
       preallocated sequence values.)
      </para>
     </listitem>
@@ -104,7 +104,7 @@ DISCARD TEMP;
   <title>Notes</title>
 
    <para>
-    <command>DISCARD ALL</> cannot be executed inside a transaction block.
+    <command>DISCARD ALL</command> cannot be executed inside a transaction block.
    </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/do.sgml b/doc/src/sgml/ref/do.sgml
index ed5e588ee7..b9a6f9a6fd 100644
--- a/doc/src/sgml/ref/do.sgml
+++ b/doc/src/sgml/ref/do.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/do.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DO">
+<refentry id="sql-do">
  <indexterm zone="sql-do">
   <primary>DO</primary>
  </indexterm>
@@ -25,7 +25,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replaceable class="PARAMETER">code</replaceable>
+DO [ LANGUAGE <replaceable class="parameter">lang_name</replaceable> ] <replaceable class="parameter">code</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -39,12 +39,12 @@ DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replacea
 
   <para>
    The code block is treated as though it were the body of a function
-   with no parameters, returning <type>void</>.  It is parsed and
+   with no parameters, returning <type>void</type>.  It is parsed and
    executed a single time.
   </para>
 
   <para>
-   The optional <literal>LANGUAGE</> clause can be written either
+   The optional <literal>LANGUAGE</literal> clause can be written either
    before or after the code block.
   </para>
  </refsect1>
@@ -54,22 +54,22 @@ DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replacea
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">code</replaceable></term>
+    <term><replaceable class="parameter">code</replaceable></term>
     <listitem>
      <para>
       The procedural language code to be executed.  This must be specified
-      as a string literal, just as in <command>CREATE FUNCTION</>.
+      as a string literal, just as in <command>CREATE FUNCTION</command>.
       Use of a dollar-quoted literal is recommended.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">lang_name</replaceable></term>
+    <term><replaceable class="parameter">lang_name</replaceable></term>
     <listitem>
      <para>
       The name of the procedural language the code is written in.
-      If omitted, the default is <literal>plpgsql</>.
+      If omitted, the default is <literal>plpgsql</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -81,23 +81,30 @@ DO [ LANGUAGE <replaceable class="PARAMETER">lang_name</replaceable> ] <replacea
 
   <para>
    The procedural language to be used must already have been installed
-   into the current database by means of <command>CREATE LANGUAGE</>.
-   <literal>plpgsql</> is installed by default, but other languages are not.
+   into the current database by means of <command>CREATE LANGUAGE</command>.
+   <literal>plpgsql</literal> is installed by default, but other languages are not.
   </para>
 
   <para>
-   The user must have <literal>USAGE</> privilege for the procedural
+   The user must have <literal>USAGE</literal> privilege for the procedural
    language, or must be a superuser if the language is untrusted.
    This is the same privilege requirement as for creating a function
    in the language.
   </para>
+
+  <para>
+   If <command>DO</command> is executed in a transaction block, then the
+   procedure code cannot execute transaction control statements.  Transaction
+   control statements are only allowed if <command>DO</command> is executed in
+   its own transaction.
+  </para>
  </refsect1>
 
  <refsect1 id="sql-do-examples">
   <title id="sql-do-examples-title">Examples</title>
   <para>
-   Grant all privileges on all views in schema <literal>public</> to
-   role <literal>webuser</>:
+   Grant all privileges on all views in schema <literal>public</literal> to
+   role <literal>webuser</literal>:
 <programlisting>
 DO $$DECLARE r record;
 BEGIN
@@ -122,7 +129,7 @@ END$$;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createlanguage"></member>
+   <member><xref linkend="sql-createlanguage"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_access_method.sgml b/doc/src/sgml/ref/drop_access_method.sgml
index 8aa9197fe4..a908a64b74 100644
--- a/doc/src/sgml/ref/drop_access_method.sgml
+++ b/doc/src/sgml/ref/drop_access_method.sgml
@@ -64,7 +64,7 @@ DROP ACCESS METHOD [ IF EXISTS ] <replaceable class="parameter">name</replaceabl
       Automatically drop objects that depend on the access method
       (such as operator classes, operator families, and indexes),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -85,7 +85,7 @@ DROP ACCESS METHOD [ IF EXISTS ] <replaceable class="parameter">name</replaceabl
   <title>Examples</title>
 
   <para>
-   Drop the access method <literal>heptree</>:
+   Drop the access method <literal>heptree</literal>:
 <programlisting>
 DROP ACCESS METHOD heptree;
 </programlisting></para>
@@ -96,7 +96,7 @@ DROP ACCESS METHOD heptree;
 
   <para>
    <command>DROP ACCESS METHOD</command> is a
-   <productname>PostgreSQL</> extension.
+   <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -104,7 +104,7 @@ DROP ACCESS METHOD heptree;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-create-access-method"></member>
+   <member><xref linkend="sql-create-access-method"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_aggregate.sgml b/doc/src/sgml/ref/drop_aggregate.sgml
index dde1ea2444..ba74f4f5eb 100644
--- a/doc/src/sgml/ref/drop_aggregate.sgml
+++ b/doc/src/sgml/ref/drop_aggregate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_aggregate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPAGGREGATE">
+<refentry id="sql-dropaggregate">
  <indexterm zone="sql-dropaggregate">
   <primary>DROP AGGREGATE</primary>
  </indexterm>
@@ -70,8 +70,8 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable>name</replaceable> ( <replaceable>aggr
 
     <listitem>
      <para>
-      The mode of an argument: <literal>IN</> or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of an argument: <literal>IN</literal> or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
      </para>
     </listitem>
    </varlistentry>
@@ -94,10 +94,10 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable>name</replaceable> ( <replaceable>aggr
     <listitem>
      <para>
       An input data type on which the aggregate function operates.
-      To reference a zero-argument aggregate function, write <literal>*</>
+      To reference a zero-argument aggregate function, write <literal>*</literal>
       in place of the list of argument specifications.
       To reference an ordered-set aggregate function, write
-      <literal>ORDER BY</> between the direct and aggregated argument
+      <literal>ORDER BY</literal> between the direct and aggregated argument
       specifications.
      </para>
     </listitem>
@@ -110,7 +110,7 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable>name</replaceable> ( <replaceable>aggr
       Automatically drop objects that depend on the aggregate function
       (such as views using it),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -132,7 +132,7 @@ DROP AGGREGATE [ IF EXISTS ] <replaceable>name</replaceable> ( <replaceable>aggr
 
    <para>
     Alternative syntaxes for referencing ordered-set aggregates
-    are described under <xref linkend="sql-alteraggregate">.
+    are described under <xref linkend="sql-alteraggregate"/>.
    </para>
  </refsect1>
 
@@ -148,7 +148,7 @@ DROP AGGREGATE myavg(integer);
   </para>
 
   <para>
-   To remove the hypothetical-set aggregate function <literal>myrank</>,
+   To remove the hypothetical-set aggregate function <literal>myrank</literal>,
    which takes an arbitrary list of ordering columns and a matching list
    of direct arguments:
 <programlisting>
@@ -176,8 +176,8 @@ DROP AGGREGATE myavg(integer), myavg(bigint);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteraggregate"></member>
-   <member><xref linkend="sql-createaggregate"></member>
+   <member><xref linkend="sql-alteraggregate"/></member>
+   <member><xref linkend="sql-createaggregate"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_cast.sgml b/doc/src/sgml/ref/drop_cast.sgml
index dae3a39fce..9f42867e12 100644
--- a/doc/src/sgml/ref/drop_cast.sgml
+++ b/doc/src/sgml/ref/drop_cast.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/drop_cast.sgml -->
 
-<refentry id="SQL-DROPCAST">
+<refentry id="sql-dropcast">
  <indexterm zone="sql-dropcast">
   <primary>DROP CAST</primary>
  </indexterm>
@@ -107,7 +107,7 @@ DROP CAST (text AS int);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createcast"></member>
+   <member><xref linkend="sql-createcast"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_collation.sgml b/doc/src/sgml/ref/drop_collation.sgml
index 2177d8e5d6..89b975aac3 100644
--- a/doc/src/sgml/ref/drop_collation.sgml
+++ b/doc/src/sgml/ref/drop_collation.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/drop_collation.sgml -->
 
-<refentry id="SQL-DROPCOLLATION">
+<refentry id="sql-dropcollation">
  <indexterm zone="sql-dropcollation">
   <primary>DROP COLLATION</primary>
  </indexterm>
@@ -62,7 +62,7 @@ DROP COLLATION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRIC
       <para>
        Automatically drop objects that depend on the collation,
        and in turn all objects that depend on those objects
-       (see <xref linkend="ddl-depend">).
+       (see <xref linkend="ddl-depend"/>).
       </para>
      </listitem>
     </varlistentry>
@@ -83,7 +83,7 @@ DROP COLLATION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRIC
   <title>Examples</title>
 
   <para>
-   To drop the collation named <literal>german</>:
+   To drop the collation named <literal>german</literal>:
 <programlisting>
 DROP COLLATION german;
 </programlisting></para>
@@ -95,7 +95,7 @@ DROP COLLATION german;
   <para>
    The <command>DROP COLLATION</command> command conforms to the
    <acronym>SQL</acronym> standard, apart from the <literal>IF
-   EXISTS</> option, which is a <productname>PostgreSQL</> extension.
+   EXISTS</literal> option, which is a <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -103,8 +103,8 @@ DROP COLLATION german;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altercollation"></member>
-   <member><xref linkend="sql-createcollation"></member>
+   <member><xref linkend="sql-altercollation"/></member>
+   <member><xref linkend="sql-createcollation"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_conversion.sgml b/doc/src/sgml/ref/drop_conversion.sgml
index 1a33b3dcc5..131e3cbc0b 100644
--- a/doc/src/sgml/ref/drop_conversion.sgml
+++ b/doc/src/sgml/ref/drop_conversion.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/drop_conversion.sgml -->
 
-<refentry id="SQL-DROPCONVERSION">
+<refentry id="sql-dropconversion">
  <indexterm zone="sql-dropconversion">
   <primary>DROP CONVERSION</primary>
  </indexterm>
@@ -74,7 +74,7 @@ DROP CONVERSION [ IF EXISTS ] <replaceable>name</replaceable> [ CASCADE | RESTRI
   <title>Examples</title>
 
   <para>
-   To drop the conversion named <literal>myname</>:
+   To drop the conversion named <literal>myname</literal>:
 <programlisting>
 DROP CONVERSION myname;
 </programlisting></para>
@@ -96,8 +96,8 @@ DROP CONVERSION myname;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterconversion"></member>
-   <member><xref linkend="sql-createconversion"></member>
+   <member><xref linkend="sql-alterconversion"/></member>
+   <member><xref linkend="sql-createconversion"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_database.sgml b/doc/src/sgml/ref/drop_database.sgml
index 740aa31995..3ac06c984a 100644
--- a/doc/src/sgml/ref/drop_database.sgml
+++ b/doc/src/sgml/ref/drop_database.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_database.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPDATABASE">
+<refentry id="sql-dropdatabase">
  <indexterm zone="sql-dropdatabase">
   <primary>DROP DATABASE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
+DROP DATABASE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -57,7 +57,7 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the database to remove.
@@ -71,14 +71,14 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   <title>Notes</title>
 
    <para>
-    <command>DROP DATABASE</> cannot be executed inside a transaction
+    <command>DROP DATABASE</command> cannot be executed inside a transaction
     block.
    </para>
 
   <para>
    This command cannot be executed while connected to the target
    database. Thus, it might be more convenient to use the program
-   <xref linkend="app-dropdb"> instead,
+   <xref linkend="app-dropdb"/> instead,
    which is a wrapper around this command.
   </para>
  </refsect1>
@@ -95,7 +95,7 @@ DROP DATABASE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdatabase"></member>
+   <member><xref linkend="sql-createdatabase"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_domain.sgml b/doc/src/sgml/ref/drop_domain.sgml
index e14795e6a3..b18faf3917 100644
--- a/doc/src/sgml/ref/drop_domain.sgml
+++ b/doc/src/sgml/ref/drop_domain.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_domain.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPDOMAIN">
+<refentry id="sql-dropdomain">
  <indexterm zone="sql-dropdomain">
   <primary>DROP DOMAIN</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP DOMAIN [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,7 +49,7 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of an existing domain.
@@ -58,19 +58,19 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
    </varlistentry>
 
    <varlistentry>
-    <term><literal>CASCADE</></term>
+    <term><literal>CASCADE</literal></term>
     <listitem>
      <para>
       Automatically drop objects that depend on the domain (such as
       table columns),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>RESTRICT</></term>
+    <term><literal>RESTRICT</literal></term>
     <listitem>
      <para>
       Refuse to drop the domain if any objects depend on it.  This is
@@ -81,7 +81,7 @@ DROP DOMAIN [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-DROPDOMAIN-examples">
+ <refsect1 id="sql-dropdomain-examples">
   <title>Examples</title>
 
   <para>
@@ -92,22 +92,22 @@ DROP DOMAIN box;
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-DROPDOMAIN-compatibility">
+ <refsect1 id="sql-dropdomain-compatibility">
   <title>Compatibility</title>
 
   <para>
    This command conforms to the SQL standard, except for the
-   <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-DROPDOMAIN-see-also">
+ <refsect1 id="sql-dropdomain-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createdomain"></member>
-   <member><xref linkend="sql-alterdomain"></member>
+   <member><xref linkend="sql-createdomain"/></member>
+   <member><xref linkend="sql-alterdomain"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_event_trigger.sgml b/doc/src/sgml/ref/drop_event_trigger.sgml
index 6e3ee22d7b..137884cc83 100644
--- a/doc/src/sgml/ref/drop_event_trigger.sgml
+++ b/doc/src/sgml/ref/drop_event_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_event_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPEVENTTRIGGER">
+<refentry id="sql-dropeventtrigger">
  <indexterm zone="sql-dropeventtrigger">
   <primary>DROP EVENT TRIGGER</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -51,7 +51,7 @@ DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the event trigger to remove.
@@ -65,7 +65,7 @@ DROP EVENT TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
      <para>
       Automatically drop objects that depend on the trigger,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -107,8 +107,8 @@ DROP EVENT TRIGGER snitch;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createeventtrigger"></member>
-   <member><xref linkend="sql-altereventtrigger"></member>
+   <member><xref linkend="sql-createeventtrigger"/></member>
+   <member><xref linkend="sql-altereventtrigger"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_extension.sgml b/doc/src/sgml/ref/drop_extension.sgml
index 7438a08bb3..5e507dec92 100644
--- a/doc/src/sgml/ref/drop_extension.sgml
+++ b/doc/src/sgml/ref/drop_extension.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_extension.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPEXTENSION">
+<refentry id="sql-dropextension">
  <indexterm zone="sql-dropextension">
   <primary>DROP EXTENSION</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP EXTENSION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -54,7 +54,7 @@ DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an installed extension.
@@ -68,7 +68,7 @@ DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [
      <para>
       Automatically drop objects that depend on the extension,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -79,7 +79,7 @@ DROP EXTENSION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [
      <para>
       Refuse to drop the extension if any objects depend on it (other than
       its own member objects and other extensions listed in the same
-      <command>DROP</> command).  This is the default.
+      <command>DROP</command> command).  This is the default.
      </para>
     </listitem>
    </varlistentry>
@@ -97,7 +97,7 @@ DROP EXTENSION hstore;
 </programlisting>
    This command will fail if any of <literal>hstore</literal>'s objects
    are in use in the database, for example if any tables have columns
-   of the <type>hstore</> type.  Add the <literal>CASCADE</> option to
+   of the <type>hstore</type> type.  Add the <literal>CASCADE</literal> option to
    forcibly remove those dependent objects as well.
   </para>
  </refsect1>
@@ -106,7 +106,7 @@ DROP EXTENSION hstore;
   <title>Compatibility</title>
 
   <para>
-   <command>DROP EXTENSION</command> is a <productname>PostgreSQL</>
+   <command>DROP EXTENSION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -115,8 +115,8 @@ DROP EXTENSION hstore;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createextension"></member>
-   <member><xref linkend="sql-alterextension"></member>
+   <member><xref linkend="sql-createextension"/></member>
+   <member><xref linkend="sql-alterextension"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
index 702cc021db..e53178b8c7 100644
--- a/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
+++ b/doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_foreign_data_wrapper.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPFOREIGNDATAWRAPPER">
+<refentry id="sql-dropforeigndatawrapper">
  <indexterm zone="sql-dropforeigndatawrapper">
   <primary>DROP FOREIGN DATA WRAPPER</primary>
  </indexterm>
@@ -65,7 +65,7 @@ DROP FOREIGN DATA WRAPPER [ IF EXISTS ] <replaceable class="parameter">name</rep
       Automatically drop objects that depend on the foreign-data
       wrapper (such as foreign tables and servers),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -86,7 +86,7 @@ DROP FOREIGN DATA WRAPPER [ IF EXISTS ] <replaceable class="parameter">name</rep
   <title>Examples</title>
 
   <para>
-   Drop the foreign-data wrapper <literal>dbi</>:
+   Drop the foreign-data wrapper <literal>dbi</literal>:
 <programlisting>
 DROP FOREIGN DATA WRAPPER dbi;
 </programlisting></para>
@@ -97,8 +97,8 @@ DROP FOREIGN DATA WRAPPER dbi;
 
   <para>
    <command>DROP FOREIGN DATA WRAPPER</command> conforms to ISO/IEC
-   9075-9 (SQL/MED).  The <literal>IF EXISTS</> clause is
-   a <productname>PostgreSQL</> extension.
+   9075-9 (SQL/MED).  The <literal>IF EXISTS</literal> clause is
+   a <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -106,8 +106,8 @@ DROP FOREIGN DATA WRAPPER dbi;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigndatawrapper"></member>
-   <member><xref linkend="sql-alterforeigndatawrapper"></member>
+   <member><xref linkend="sql-createforeigndatawrapper"/></member>
+   <member><xref linkend="sql-alterforeigndatawrapper"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_foreign_table.sgml b/doc/src/sgml/ref/drop_foreign_table.sgml
index 5a2b235d4e..b29169e0d3 100644
--- a/doc/src/sgml/ref/drop_foreign_table.sgml
+++ b/doc/src/sgml/ref/drop_foreign_table.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/drop_foreign_table.sgml -->
 
-<refentry id="SQL-DROPFOREIGNTABLE">
+<refentry id="sql-dropforeigntable">
  <indexterm zone="sql-dropforeigntable">
   <primary>DROP FOREIGN TABLE</primary>
  </indexterm>
@@ -18,7 +18,7 @@
 
  <refsynopsisdiv>
 <synopsis>
-DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -46,7 +46,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the foreign table to drop.
@@ -60,7 +60,7 @@ DROP FOREIGN TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceabl
      <para>
       Automatically drop objects that depend on the foreign table (such as
       views), and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -95,7 +95,7 @@ DROP FOREIGN TABLE films, distributors;
   <para>
    This command conforms to the ISO/IEC 9075-9 (SQL/MED), except that the
    standard only allows one foreign table to be dropped per command, and apart
-   from the <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   from the <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -104,8 +104,8 @@ DROP FOREIGN TABLE films, distributors;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterforeigntable"></member>
-   <member><xref linkend="sql-createforeigntable"></member>
+   <member><xref linkend="sql-alterforeigntable"/></member>
+   <member><xref linkend="sql-createforeigntable"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_function.sgml b/doc/src/sgml/ref/drop_function.sgml
index 0aa984528d..127fdfe419 100644
--- a/doc/src/sgml/ref/drop_function.sgml
+++ b/doc/src/sgml/ref/drop_function.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_function.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPFUNCTION">
+<refentry id="sql-dropfunction">
  <indexterm zone="sql-dropfunction">
   <primary>DROP FUNCTION</primary>
  </indexterm>
@@ -67,14 +67,14 @@ DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [
 
     <listitem>
      <para>
-      The mode of an argument: <literal>IN</>, <literal>OUT</>,
-      <literal>INOUT</>, or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of an argument: <literal>IN</literal>, <literal>OUT</literal>,
+      <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
       Note that <command>DROP FUNCTION</command> does not actually pay
-      any attention to <literal>OUT</> arguments, since only the input
+      any attention to <literal>OUT</literal> arguments, since only the input
       arguments are needed to determine the function's identity.
-      So it is sufficient to list the <literal>IN</>, <literal>INOUT</>,
-      and <literal>VARIADIC</> arguments.
+      So it is sufficient to list the <literal>IN</literal>, <literal>INOUT</literal>,
+      and <literal>VARIADIC</literal> arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -110,7 +110,7 @@ DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [
       Automatically drop objects that depend on the function (such as
       operators or triggers),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -127,7 +127,7 @@ DROP FUNCTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-DROPFUNCTION-examples">
+ <refsect1 id="sql-dropfunction-examples">
   <title>Examples</title>
 
   <para>
@@ -159,7 +159,7 @@ DROP FUNCTION update_employee_salaries();
   </para>
  </refsect1>
 
- <refsect1 id="SQL-DROPFUNCTION-compatibility">
+ <refsect1 id="sql-dropfunction-compatibility">
   <title>Compatibility</title>
 
   <para>
@@ -183,8 +183,10 @@ DROP FUNCTION update_employee_salaries();
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createfunction"></member>
-   <member><xref linkend="sql-alterfunction"></member>
+   <member><xref linkend="sql-createfunction"/></member>
+   <member><xref linkend="sql-alterfunction"/></member>
+   <member><xref linkend="sql-dropprocedure"/></member>
+   <member><xref linkend="sql-droproutine"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_group.sgml b/doc/src/sgml/ref/drop_group.sgml
index e601ff4172..47d4a72121 100644
--- a/doc/src/sgml/ref/drop_group.sgml
+++ b/doc/src/sgml/ref/drop_group.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_group.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPGROUP">
+<refentry id="sql-dropgroup">
  <indexterm zone="sql-dropgroup">
   <primary>DROP GROUP</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
+DROP GROUP [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...]
 </synopsis>
  </refsynopsisdiv>
 
@@ -30,7 +30,7 @@ DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
 
   <para>
    <command>DROP GROUP</command> is now an alias for
-   <xref linkend="sql-droprole">.
+   <xref linkend="sql-droprole"/>.
   </para>
  </refsect1>
 
@@ -46,7 +46,7 @@ DROP GROUP [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="sql-droprole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_index.sgml b/doc/src/sgml/ref/drop_index.sgml
index 6fe108ded2..2a8ca5bf68 100644
--- a/doc/src/sgml/ref/drop_index.sgml
+++ b/doc/src/sgml/ref/drop_index.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_index.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPINDEX">
+<refentry id="sql-dropindex">
  <indexterm zone="sql-dropindex">
   <primary>DROP INDEX</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -44,19 +44,19 @@ DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</r
     <listitem>
      <para>
       Drop the index without locking out concurrent selects, inserts, updates,
-      and deletes on the index's table.  A normal <command>DROP INDEX</>
+      and deletes on the index's table.  A normal <command>DROP INDEX</command>
       acquires exclusive lock on the table, blocking other accesses until the
       index drop can be completed.  With this option, the command instead
       waits until conflicting transactions have completed.
      </para>
      <para>
       There are several caveats to be aware of when using this option.
-      Only one index name can be specified, and the <literal>CASCADE</> option
-      is not supported.  (Thus, an index that supports a <literal>UNIQUE</> or
-      <literal>PRIMARY KEY</> constraint cannot be dropped this way.)
-      Also, regular <command>DROP INDEX</> commands can be
+      Only one index name can be specified, and the <literal>CASCADE</literal> option
+      is not supported.  (Thus, an index that supports a <literal>UNIQUE</literal> or
+      <literal>PRIMARY KEY</literal> constraint cannot be dropped this way.)
+      Also, regular <command>DROP INDEX</command> commands can be
       performed within a transaction block, but
-      <command>DROP INDEX CONCURRENTLY</> cannot.
+      <command>DROP INDEX CONCURRENTLY</command> cannot.
      </para>
     </listitem>
    </varlistentry>
@@ -72,7 +72,7 @@ DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</r
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of an index to remove.
@@ -86,7 +86,7 @@ DROP INDEX [ CONCURRENTLY ] [ IF EXISTS ] <replaceable class="PARAMETER">name</r
      <para>
       Automatically drop objects that depend on the index,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -128,7 +128,7 @@ DROP INDEX title_idx;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createindex"></member>
+   <member><xref linkend="sql-createindex"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_language.sgml b/doc/src/sgml/ref/drop_language.sgml
index f014a74d45..976f3a0ce1 100644
--- a/doc/src/sgml/ref/drop_language.sgml
+++ b/doc/src/sgml/ref/drop_language.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_language.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPLANGUAGE">
+<refentry id="sql-droplanguage">
  <indexterm zone="sql-droplanguage">
   <primary>DROP LANGUAGE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -31,14 +31,14 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
   <para>
    <command>DROP LANGUAGE</command> removes the definition of a
    previously registered procedural language.  You must be a superuser
-   or the owner of the language to use <command>DROP LANGUAGE</>.
+   or the owner of the language to use <command>DROP LANGUAGE</command>.
   </para>
 
   <note>
    <para>
     As of <productname>PostgreSQL</productname> 9.1, most procedural
-    languages have been made into <quote>extensions</>, and should
-    therefore be removed with <xref linkend="sql-dropextension">
+    languages have been made into <quote>extensions</quote>, and should
+    therefore be removed with <xref linkend="sql-dropextension"/>
     not <command>DROP LANGUAGE</command>.
    </para>
   </note>
@@ -60,7 +60,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of an existing procedural language.  For backward
@@ -76,7 +76,7 @@ DROP [ PROCEDURAL ] LANGUAGE [ IF EXISTS ] <replaceable class="PARAMETER">name</
       Automatically drop objects that depend on the language (such as
       functions in the language),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -118,8 +118,8 @@ DROP LANGUAGE plsample;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterlanguage"></member>
-   <member><xref linkend="sql-createlanguage"></member>
+   <member><xref linkend="sql-alterlanguage"/></member>
+   <member><xref linkend="sql-createlanguage"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_materialized_view.sgml b/doc/src/sgml/ref/drop_materialized_view.sgml
index 36ec33ceb0..c8f3bc5b0d 100644
--- a/doc/src/sgml/ref/drop_materialized_view.sgml
+++ b/doc/src/sgml/ref/drop_materialized_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_materialized_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPMATERIALIZEDVIEW">
+<refentry id="sql-dropmaterializedview">
  <indexterm zone="sql-dropmaterializedview">
   <primary>DROP MATERIALIZED VIEW</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -50,7 +50,7 @@ DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replac
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the materialized view to
@@ -66,7 +66,7 @@ DROP MATERIALIZED VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replac
       Automatically drop objects that depend on the materialized view (such as
       other materialized views, or regular views),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -107,9 +107,9 @@ DROP MATERIALIZED VIEW order_summary;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-creatematerializedview"></member>
-   <member><xref linkend="sql-altermaterializedview"></member>
-   <member><xref linkend="sql-refreshmaterializedview"></member>
+   <member><xref linkend="sql-creatematerializedview"/></member>
+   <member><xref linkend="sql-altermaterializedview"/></member>
+   <member><xref linkend="sql-refreshmaterializedview"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_opclass.sgml b/doc/src/sgml/ref/drop_opclass.sgml
index 187a9a4d1f..4cb4cc35f7 100644
--- a/doc/src/sgml/ref/drop_opclass.sgml
+++ b/doc/src/sgml/ref/drop_opclass.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_opclass.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPOPCLASS">
+<refentry id="sql-dropopclass">
  <indexterm zone="sql-dropopclass">
   <primary>DROP OPERATOR CLASS</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ]
+DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="parameter">name</replaceable> USING <replaceable class="parameter">index_method</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -37,7 +37,7 @@ DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
    <command>DROP OPERATOR CLASS</command> does not drop any of the operators
    or functions referenced by the class.  If there are any indexes depending
    on the operator class, you will need to specify
-   <literal>CASCADE</> for the drop to complete.
+   <literal>CASCADE</literal> for the drop to complete.
   </para>
  </refsect1>
 
@@ -80,7 +80,7 @@ DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
      <para>
       Automatically drop objects that depend on the operator class (such as
       indexes), and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -101,13 +101,13 @@ DROP OPERATOR CLASS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceab
   <title>Notes</title>
 
   <para>
-   <command>DROP OPERATOR CLASS</> will not drop the operator family
+   <command>DROP OPERATOR CLASS</command> will not drop the operator family
    containing the class, even if there is nothing else left in the
    family (in particular, in the case where the family was implicitly
-   created by <command>CREATE OPERATOR CLASS</>).  An empty operator
+   created by <command>CREATE OPERATOR CLASS</command>).  An empty operator
    family is harmless, but for the sake of tidiness you might wish to
-   remove the family with <command>DROP OPERATOR FAMILY</>; or perhaps
-   better, use <command>DROP OPERATOR FAMILY</> in the first place.
+   remove the family with <command>DROP OPERATOR FAMILY</command>; or perhaps
+   better, use <command>DROP OPERATOR FAMILY</command> in the first place.
   </para>
  </refsect1>
 
@@ -122,7 +122,7 @@ DROP OPERATOR CLASS widget_ops USING btree;
 </programlisting>
 
    This command will not succeed if there are any existing indexes
-   that use the operator class.  Add <literal>CASCADE</> to drop
+   that use the operator class.  Add <literal>CASCADE</literal> to drop
    such indexes along with the operator class.
   </para>
  </refsect1>
@@ -140,9 +140,9 @@ DROP OPERATOR CLASS widget_ops USING btree;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropclass"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-dropopfamily"></member>
+   <member><xref linkend="sql-alteropclass"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-dropopfamily"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_operator.sgml b/doc/src/sgml/ref/drop_operator.sgml
index fc82c3e0e3..2dff050ecf 100644
--- a/doc/src/sgml/ref/drop_operator.sgml
+++ b/doc/src/sgml/ref/drop_operator.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_operator.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPOPERATOR">
+<refentry id="sql-dropoperator">
  <indexterm zone="sql-dropoperator">
   <primary>DROP OPERATOR</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ( { <replaceable class="PARAMETER">left_type</replaceable> | NONE } , { <replaceable class="PARAMETER">right_type</replaceable> | NONE } ) [, ...] [ CASCADE | RESTRICT ]
+DROP OPERATOR [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ( { <replaceable class="parameter">left_type</replaceable> | NONE } , { <replaceable class="parameter">right_type</replaceable> | NONE } ) [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -85,7 +85,7 @@ DROP OPERATOR [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> (
      <para>
       Automatically drop objects that depend on the operator (such as views
       using it), and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -146,8 +146,8 @@ DROP OPERATOR ~ (none, bit), ! (bigint, none);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createoperator"></member>
-   <member><xref linkend="sql-alteroperator"></member>
+   <member><xref linkend="sql-createoperator"/></member>
+   <member><xref linkend="sql-alteroperator"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_opfamily.sgml b/doc/src/sgml/ref/drop_opfamily.sgml
index 53bce22883..c1bcd0d1df 100644
--- a/doc/src/sgml/ref/drop_opfamily.sgml
+++ b/doc/src/sgml/ref/drop_opfamily.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_opfamily.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPOPFAMILY">
+<refentry id="sql-dropopfamily">
  <indexterm zone="sql-dropopfamily">
   <primary>DROP OPERATOR FAMILY</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> USING <replaceable class="PARAMETER">index_method</replaceable> [ CASCADE | RESTRICT ]
+DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="parameter">name</replaceable> USING <replaceable class="parameter">index_method</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,7 +38,7 @@ DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="PARAMETER">name</replacea
    classes contained in the family, but it does not drop any of the operators
    or functions referenced by the family.  If there are any indexes depending
    on operator classes within the family, you will need to specify
-   <literal>CASCADE</> for the drop to complete.
+   <literal>CASCADE</literal> for the drop to complete.
   </para>
  </refsect1>
 
@@ -81,7 +81,7 @@ DROP OPERATOR FAMILY [ IF EXISTS ] <replaceable class="PARAMETER">name</replacea
      <para>
       Automatically drop objects that depend on the operator family,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -109,7 +109,7 @@ DROP OPERATOR FAMILY float_ops USING btree;
 </programlisting>
 
    This command will not succeed if there are any existing indexes
-   that use operator classes within the family.  Add <literal>CASCADE</> to
+   that use operator classes within the family.  Add <literal>CASCADE</literal> to
    drop such indexes along with the operator family.
   </para>
  </refsect1>
@@ -127,11 +127,11 @@ DROP OPERATOR FAMILY float_ops USING btree;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alteropfamily"></member>
-   <member><xref linkend="sql-createopfamily"></member>
-   <member><xref linkend="sql-alteropclass"></member>
-   <member><xref linkend="sql-createopclass"></member>
-   <member><xref linkend="sql-dropopclass"></member>
+   <member><xref linkend="sql-alteropfamily"/></member>
+   <member><xref linkend="sql-createopfamily"/></member>
+   <member><xref linkend="sql-alteropclass"/></member>
+   <member><xref linkend="sql-createopclass"/></member>
+   <member><xref linkend="sql-dropopclass"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_owned.sgml b/doc/src/sgml/ref/drop_owned.sgml
index 81694b88e5..4c66da2b34 100644
--- a/doc/src/sgml/ref/drop_owned.sgml
+++ b/doc/src/sgml/ref/drop_owned.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_owned.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROP-OWNED">
+<refentry id="sql-drop-owned">
  <indexterm zone="sql-drop-owned">
   <primary>DROP OWNED</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ]
+DROP OWNED BY { <replaceable class="parameter">name</replaceable> | CURRENT_USER | SESSION_USER } [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -42,7 +42,7 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of a role whose objects will be dropped, and whose
@@ -57,7 +57,7 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER
      <para>
       Automatically drop objects that depend on the affected objects,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -90,9 +90,9 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER
   </para>
 
   <para>
-   The <xref linkend="sql-reassign-owned"> command is an alternative that
+   The <xref linkend="sql-reassign-owned"/> command is an alternative that
    reassigns the ownership of all the database objects owned by one or
-   more roles.  However, <command>REASSIGN OWNED</> does not deal with
+   more roles.  However, <command>REASSIGN OWNED</command> does not deal with
    privileges for other objects.
   </para>
 
@@ -101,7 +101,7 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER
   </para>
 
   <para>
-   See <xref linkend="role-removal"> for more discussion.
+   See <xref linkend="role-removal"/> for more discussion.
   </para>
  </refsect1>
 
@@ -118,8 +118,8 @@ DROP OWNED BY { <replaceable class="PARAMETER">name</replaceable> | CURRENT_USER
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-reassign-owned"></member>
-   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="sql-reassign-owned"/></member>
+   <member><xref linkend="sql-droprole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_policy.sgml b/doc/src/sgml/ref/drop_policy.sgml
index f474692105..9297ade113 100644
--- a/doc/src/sgml/ref/drop_policy.sgml
+++ b/doc/src/sgml/ref/drop_policy.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_policy.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPPOLICY">
+<refentry id="sql-droppolicy">
  <indexterm zone="sql-droppolicy">
   <primary>DROP POLICY</primary>
  </indexterm>
@@ -111,8 +111,8 @@ DROP POLICY p1 ON my_table;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createpolicy"></member>
-   <member><xref linkend="sql-alterpolicy"></member>
+   <member><xref linkend="sql-createpolicy"/></member>
+   <member><xref linkend="sql-alterpolicy"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_procedure.sgml b/doc/src/sgml/ref/drop_procedure.sgml
new file mode 100644
index 0000000000..fef61b66ac
--- /dev/null
+++ b/doc/src/sgml/ref/drop_procedure.sgml
@@ -0,0 +1,162 @@
+<!--
+doc/src/sgml/ref/drop_procedure.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-dropprocedure">
+ <indexterm zone="sql-dropprocedure">
+  <primary>DROP PROCEDURE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>DROP PROCEDURE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP PROCEDURE</refname>
+  <refpurpose>remove a procedure</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP PROCEDURE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] [, ...]
+    [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP PROCEDURE</command> removes the definition of an existing
+   procedure. To execute this command the user must be the
+   owner of the procedure. The argument types to the
+   procedure must be specified, since several different procedures
+   can exist with the same name and different argument lists.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Parameters</title>
+
+  <variablelist>
+    <varlistentry>
+    <term><literal>IF EXISTS</literal></term>
+    <listitem>
+     <para>
+      Do not throw an error if the procedure does not exist. A notice is issued
+      in this case.
+     </para>
+    </listitem>
+   </varlistentry>
+
+  <varlistentry>
+    <term><replaceable class="parameter">name</replaceable></term>
+    <listitem>
+     <para>
+      The name (optionally schema-qualified) of an existing procedure.  If no
+      argument list is specified, the name must be unique in its schema.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argmode</replaceable></term>
+
+    <listitem>
+     <para>
+      The mode of an argument: <literal>IN</literal> or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argname</replaceable></term>
+
+    <listitem>
+     <para>
+      The name of an argument.
+      Note that <command>DROP PROCEDURE</command> does not actually pay
+      any attention to argument names, since only the argument data
+      types are needed to determine the procedure's identity.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><replaceable class="parameter">argtype</replaceable></term>
+
+    <listitem>
+     <para>
+      The data type(s) of the procedure's arguments (optionally
+      schema-qualified), if any.
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>CASCADE</literal></term>
+    <listitem>
+     <para>
+      Automatically drop objects that depend on the procedure,
+      and in turn all objects that depend on those objects
+      (see <xref linkend="ddl-depend"/>).
+     </para>
+    </listitem>
+   </varlistentry>
+
+   <varlistentry>
+    <term><literal>RESTRICT</literal></term>
+    <listitem>
+     <para>
+      Refuse to drop the procedure if any objects depend on it.  This
+      is the default.
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1 id="sql-dropprocedure-examples">
+  <title>Examples</title>
+
+<programlisting>
+DROP PROCEDURE do_db_maintenance();
+</programlisting>
+ </refsect1>
+
+ <refsect1 id="sql-dropprocedure-compatibility">
+  <title>Compatibility</title>
+
+  <para>
+   This command conforms to the SQL standard, with
+   these <productname>PostgreSQL</productname> extensions:
+   <itemizedlist>
+    <listitem>
+     <para>The standard only allows one procedure to be dropped per command.</para>
+    </listitem>
+    <listitem>
+     <para>The <literal>IF EXISTS</literal> option</para>
+    </listitem>
+    <listitem>
+     <para>The ability to specify argument modes and names</para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-createprocedure"/></member>
+   <member><xref linkend="sql-alterprocedure"/></member>
+   <member><xref linkend="sql-dropfunction"/></member>
+   <member><xref linkend="sql-droproutine"/></member>
+  </simplelist>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_publication.sgml b/doc/src/sgml/ref/drop_publication.sgml
index 8e45a43982..5dcbb837d1 100644
--- a/doc/src/sgml/ref/drop_publication.sgml
+++ b/doc/src/sgml/ref/drop_publication.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_publication.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPPUBLICATION">
+<refentry id="sql-droppublication">
  <indexterm zone="sql-droppublication">
   <primary>DROP PUBLICATION</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP PUBLICATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP PUBLICATION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -89,7 +89,7 @@ DROP PUBLICATION mypublication;
   <title>Compatibility</title>
 
   <para>
-   <command>DROP PUBLICATION</command> is a <productname>PostgreSQL</>
+   <command>DROP PUBLICATION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -98,8 +98,8 @@ DROP PUBLICATION mypublication;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createpublication"></member>
-   <member><xref linkend="sql-alterpublication"></member>
+   <member><xref linkend="sql-createpublication"/></member>
+   <member><xref linkend="sql-alterpublication"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_role.sgml b/doc/src/sgml/ref/drop_role.sgml
index 75b48f94f9..13079f3e1f 100644
--- a/doc/src/sgml/ref/drop_role.sgml
+++ b/doc/src/sgml/ref/drop_role.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_role.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPROLE">
+<refentry id="sql-droprole">
  <indexterm zone="sql-droprole">
   <primary>DROP ROLE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
+DROP ROLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...]
 </synopsis>
  </refsynopsisdiv>
 
@@ -31,7 +31,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
   <para>
    <command>DROP ROLE</command> removes the specified role(s).
    To drop a superuser role, you must be a superuser yourself;
-   to drop non-superuser roles, you must have <literal>CREATEROLE</>
+   to drop non-superuser roles, you must have <literal>CREATEROLE</literal>
    privilege.
   </para>
 
@@ -40,14 +40,14 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    of the cluster; an error will be raised if so.  Before dropping the role,
    you must drop all the objects it owns (or reassign their ownership)
    and revoke any privileges the role has been granted on other objects.
-   The <xref linkend="sql-reassign-owned"> and <xref linkend="sql-drop-owned">
-   commands can be useful for this purpose; see <xref linkend="role-removal">
+   The <xref linkend="sql-reassign-owned"/> and <xref linkend="sql-drop-owned"/>
+   commands can be useful for this purpose; see <xref linkend="role-removal"/>
    for more discussion.
   </para>
 
   <para>
    However, it is not necessary to remove role memberships involving
-   the role; <command>DROP ROLE</> automatically revokes any memberships
+   the role; <command>DROP ROLE</command> automatically revokes any memberships
    of the target role in other roles, and of other roles in the target role.
    The other roles are not dropped nor otherwise affected.
   </para>
@@ -68,7 +68,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the role to remove.
@@ -83,7 +83,7 @@ DROP ROLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
 
   <para>
    <productname>PostgreSQL</productname> includes a program <xref
-   linkend="APP-DROPUSER"> that has the
+   linkend="app-dropuser"/> that has the
    same functionality as this command (in fact, it calls this command)
    but can be run from the command shell.
   </para>
@@ -113,9 +113,9 @@ DROP ROLE jonathan;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrole"></member>
-   <member><xref linkend="sql-alterrole"></member>
-   <member><xref linkend="sql-set-role"></member>
+   <member><xref linkend="sql-createrole"/></member>
+   <member><xref linkend="sql-alterrole"/></member>
+   <member><xref linkend="sql-set-role"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_routine.sgml b/doc/src/sgml/ref/drop_routine.sgml
new file mode 100644
index 0000000000..5cd1a0f11e
--- /dev/null
+++ b/doc/src/sgml/ref/drop_routine.sgml
@@ -0,0 +1,94 @@
+<!--
+doc/src/sgml/ref/drop_routine.sgml
+PostgreSQL documentation
+-->
+
+<refentry id="sql-droproutine">
+ <indexterm zone="sql-droproutine">
+  <primary>DROP ROUTINE</primary>
+ </indexterm>
+
+ <refmeta>
+  <refentrytitle>DROP ROUTINE</refentrytitle>
+  <manvolnum>7</manvolnum>
+  <refmiscinfo>SQL - Language Statements</refmiscinfo>
+ </refmeta>
+
+ <refnamediv>
+  <refname>DROP ROUTINE</refname>
+  <refpurpose>remove a routine</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+DROP ROUTINE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] [, ...]
+    [ CASCADE | RESTRICT ]
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <command>DROP ROUTINE</command> removes the definition of an existing
+   routine, which can be an aggregate function, a normal function, or a
+   procedure.  See
+   under <xref linkend="sql-dropaggregate"/>, <xref linkend="sql-dropfunction"/>,
+   and <xref linkend="sql-dropprocedure"/> for the description of the
+   parameters, more examples, and further details.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-droproutine-examples">
+  <title>Examples</title>
+
+  <para>
+   To drop the routine <literal>foo</literal> for type
+   <type>integer</type>:
+<programlisting>
+DROP ROUTINE foo(integer);
+</programlisting>
+   This command will work independent of whether <literal>foo</literal> is an
+   aggregate, function, or procedure.
+  </para>
+ </refsect1>
+
+ <refsect1 id="sql-droproutine-compatibility">
+  <title>Compatibility</title>
+
+  <para>
+   This command conforms to the SQL standard, with
+   these <productname>PostgreSQL</productname> extensions:
+   <itemizedlist>
+    <listitem>
+     <para>The standard only allows one routine to be dropped per command.</para>
+    </listitem>
+    <listitem>
+     <para>The <literal>IF EXISTS</literal> option</para>
+    </listitem>
+    <listitem>
+     <para>The ability to specify argument modes and names</para>
+    </listitem>
+    <listitem>
+     <para>Aggregate functions are an extension.</para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>See Also</title>
+
+  <simplelist type="inline">
+   <member><xref linkend="sql-dropaggregate"/></member>
+   <member><xref linkend="sql-dropfunction"/></member>
+   <member><xref linkend="sql-dropprocedure"/></member>
+   <member><xref linkend="sql-alterroutine"/></member>
+  </simplelist>
+
+  <para>
+   Note that there is no <literal>CREATE ROUTINE</literal> command.
+  </para>
+ </refsect1>
+
+</refentry>
diff --git a/doc/src/sgml/ref/drop_rule.sgml b/doc/src/sgml/ref/drop_rule.sgml
index d4905a69c9..cc5d00e4dc 100644
--- a/doc/src/sgml/ref/drop_rule.sgml
+++ b/doc/src/sgml/ref/drop_rule.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_rule.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPRULE">
+<refentry id="sql-droprule">
  <indexterm zone="sql-droprule">
   <primary>DROP RULE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ]
+DROP RULE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -73,7 +73,7 @@ DROP RULE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <re
      <para>
       Automatically drop objects that depend on the rule,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -115,8 +115,8 @@ DROP RULE newrule ON mytable;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createrule"></member>
-   <member><xref linkend="sql-alterrule"></member>
+   <member><xref linkend="sql-createrule"/></member>
+   <member><xref linkend="sql-alterrule"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_schema.sgml b/doc/src/sgml/ref/drop_schema.sgml
index 5b1697fff2..4d5d9f55df 100644
--- a/doc/src/sgml/ref/drop_schema.sgml
+++ b/doc/src/sgml/ref/drop_schema.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_schema.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPSCHEMA">
+<refentry id="sql-dropschema">
  <indexterm zone="sql-dropschema">
   <primary>DROP SCHEMA</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP SCHEMA [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -54,7 +54,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of a schema.
@@ -69,7 +69,7 @@ DROP SCHEMA [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, .
       Automatically drop objects (tables, functions, etc.) that are
       contained in the schema,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -114,7 +114,7 @@ DROP SCHEMA mystuff CASCADE;
    <command>DROP SCHEMA</command> is fully conforming with the SQL
    standard, except that the standard only allows one schema to be
    dropped per command, and apart from the
-   <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -123,8 +123,8 @@ DROP SCHEMA mystuff CASCADE;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterschema"></member>
-   <member><xref linkend="sql-createschema"></member>
+   <member><xref linkend="sql-alterschema"/></member>
+   <member><xref linkend="sql-createschema"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_sequence.sgml b/doc/src/sgml/ref/drop_sequence.sgml
index f0e1edc81c..387c98edbc 100644
--- a/doc/src/sgml/ref/drop_sequence.sgml
+++ b/doc/src/sgml/ref/drop_sequence.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_sequence.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPSEQUENCE">
+<refentry id="sql-dropsequence">
  <indexterm zone="sql-dropsequence">
   <primary>DROP SEQUENCE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP SEQUENCE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,7 +49,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [,
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of a sequence.
@@ -63,7 +63,7 @@ DROP SEQUENCE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [,
      <para>
       Automatically drop objects that depend on the sequence,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -98,7 +98,7 @@ DROP SEQUENCE serial;
    <command>DROP SEQUENCE</command> conforms to the <acronym>SQL</acronym>
    standard, except that the standard only allows one
    sequence to be dropped per command, and apart from the
-   <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -107,8 +107,8 @@ DROP SEQUENCE serial;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsequence"></member>
-   <member><xref linkend="sql-altersequence"></member>
+   <member><xref linkend="sql-createsequence"/></member>
+   <member><xref linkend="sql-altersequence"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_server.sgml b/doc/src/sgml/ref/drop_server.sgml
index 42acdd41dc..f83a661b3e 100644
--- a/doc/src/sgml/ref/drop_server.sgml
+++ b/doc/src/sgml/ref/drop_server.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_server.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPSERVER">
+<refentry id="sql-dropserver">
  <indexterm zone="sql-dropserver">
   <primary>DROP SERVER</primary>
  </indexterm>
@@ -65,7 +65,7 @@ DROP SERVER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, .
       Automatically drop objects that depend on the server (such as
       user mappings),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -86,7 +86,7 @@ DROP SERVER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, .
   <title>Examples</title>
 
   <para>
-   Drop a server <literal>foo</> if it exists:
+   Drop a server <literal>foo</literal> if it exists:
 <programlisting>
 DROP SERVER IF EXISTS foo;
 </programlisting></para>
@@ -97,8 +97,8 @@ DROP SERVER IF EXISTS foo;
 
   <para>
    <command>DROP SERVER</command> conforms to ISO/IEC 9075-9
-   (SQL/MED).  The <literal>IF EXISTS</> clause is
-   a <productname>PostgreSQL</> extension.
+   (SQL/MED).  The <literal>IF EXISTS</literal> clause is
+   a <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -106,8 +106,8 @@ DROP SERVER IF EXISTS foo;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createserver"></member>
-   <member><xref linkend="sql-alterserver"></member>
+   <member><xref linkend="sql-createserver"/></member>
+   <member><xref linkend="sql-alterserver"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_statistics.sgml b/doc/src/sgml/ref/drop_statistics.sgml
index 37fc402589..f58c3d6d22 100644
--- a/doc/src/sgml/ref/drop_statistics.sgml
+++ b/doc/src/sgml/ref/drop_statistics.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_statistics.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPSTATISTICS">
+<refentry id="sql-dropstatistics">
  <indexterm zone="sql-dropstatistics">
   <primary>DROP STATISTICS</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP STATISTICS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
+DROP STATISTICS [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...]
 </synopsis>
  </refsynopsisdiv>
 
@@ -51,7 +51,7 @@ DROP STATISTICS [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the statistics object to drop.
@@ -88,8 +88,8 @@ DROP STATISTICS IF EXISTS
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterstatistics"></member>
-   <member><xref linkend="sql-createstatistics"></member>
+   <member><xref linkend="sql-alterstatistics"/></member>
+   <member><xref linkend="sql-createstatistics"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_subscription.sgml b/doc/src/sgml/ref/drop_subscription.sgml
index f535c000c4..adbdeafb4e 100644
--- a/doc/src/sgml/ref/drop_subscription.sgml
+++ b/doc/src/sgml/ref/drop_subscription.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_subscription.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPSUBSCRIPTION">
+<refentry id="sql-dropsubscription">
  <indexterm zone="sql-dropsubscription">
   <primary>DROP SUBSCRIPTION</primary>
  </indexterm>
@@ -91,7 +91,12 @@ DROP SUBSCRIPTION [ IF EXISTS ] <replaceable class="parameter">name</replaceable
    actions on a remote host.  Note that if the remote replication slot still
    exists, it should then be dropped manually; otherwise it will continue to
    reserve WAL and might eventually cause the disk to fill up.  See
-   also <xref linkend="logical-replication-subscription-slot">.
+   also <xref linkend="logical-replication-subscription-slot"/>.
+  </para>
+
+  <para>
+   If a subscription is associated with a replication slot, then <command>DROP
+   SUBSCRIPTION</command> cannot be executed inside a transaction block.
   </para>
  </refsect1>
 
@@ -109,7 +114,7 @@ DROP SUBSCRIPTION mysub;
   <title>Compatibility</title>
 
   <para>
-   <command>DROP SUBSCRIPTION</command> is a <productname>PostgreSQL</>
+   <command>DROP SUBSCRIPTION</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -118,8 +123,8 @@ DROP SUBSCRIPTION mysub;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createsubscription"></member>
-   <member><xref linkend="sql-altersubscription"></member>
+   <member><xref linkend="sql-createsubscription"/></member>
+   <member><xref linkend="sql-altersubscription"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/drop_table.sgml b/doc/src/sgml/ref/drop_table.sgml
index 94d28b06fb..bf8996d198 100644
--- a/doc/src/sgml/ref/drop_table.sgml
+++ b/doc/src/sgml/ref/drop_table.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_table.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTABLE">
+<refentry id="sql-droptable">
  <indexterm zone="sql-droptable">
   <primary>DROP TABLE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP TABLE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -32,16 +32,16 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
    <command>DROP TABLE</command> removes tables from the database.
    Only the table owner, the schema owner, and superuser can drop a
    table.  To empty a table of rows
-   without destroying the table, use <xref linkend="sql-delete">
-   or <xref linkend="sql-truncate">.
+   without destroying the table, use <xref linkend="sql-delete"/>
+   or <xref linkend="sql-truncate"/>.
   </para>
 
   <para>
    <command>DROP TABLE</command> always removes any indexes, rules,
    triggers, and constraints that exist for the target table.
    However, to drop a table that is referenced by a view or a foreign-key
-   constraint of another table, <literal>CASCADE</> must be
-   specified. (<literal>CASCADE</> will remove a dependent view entirely,
+   constraint of another table, <literal>CASCADE</literal> must be
+   specified. (<literal>CASCADE</literal> will remove a dependent view entirely,
    but in the foreign-key case it will only remove the foreign-key
    constraint, not the other table entirely.)
   </para>
@@ -62,7 +62,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to drop.
@@ -77,7 +77,7 @@ DROP TABLE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ..
       Automatically drop objects that depend on the table (such as
       views),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -112,7 +112,7 @@ DROP TABLE films, distributors;
   <para>
    This command conforms to the SQL standard, except that the standard only
    allows one table to be dropped per command, and apart from the
-   <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -121,8 +121,8 @@ DROP TABLE films, distributors;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertable"></member>
-   <member><xref linkend="sql-createtable"></member>
+   <member><xref linkend="sql-altertable"/></member>
+   <member><xref linkend="sql-createtable"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tablespace.sgml b/doc/src/sgml/ref/drop_tablespace.sgml
index d0a05af2e1..047e4e0481 100644
--- a/doc/src/sgml/ref/drop_tablespace.sgml
+++ b/doc/src/sgml/ref/drop_tablespace.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_tablespace.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTABLESPACE">
+<refentry id="sql-droptablespace">
  <indexterm zone="sql-droptablespace">
   <primary>DROP TABLESPACE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
+DROP TABLESPACE [ IF EXISTS ] <replaceable class="parameter">name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -38,8 +38,8 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    dropped. It is possible that objects in other databases might still reside
    in the tablespace even if no objects in the current database are using
    the tablespace.  Also, if the tablespace is listed in the <xref
-   linkend="guc-temp-tablespaces"> setting of any active session, the
-   <command>DROP</> might fail due to temporary files residing in the
+   linkend="guc-temp-tablespaces"/> setting of any active session, the
+   <command>DROP</command> might fail due to temporary files residing in the
    tablespace.
   </para>
  </refsect1>
@@ -60,7 +60,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of a tablespace.
@@ -74,7 +74,7 @@ DROP TABLESPACE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable>
   <title>Notes</title>
 
    <para>
-    <command>DROP TABLESPACE</> cannot be executed inside a transaction block.
+    <command>DROP TABLESPACE</command> cannot be executed inside a transaction block.
    </para>
  </refsect1>
 
@@ -93,7 +93,7 @@ DROP TABLESPACE mystuff;
   <title>Compatibility</title>
 
   <para>
-   <command>DROP TABLESPACE</command> is a <productname>PostgreSQL</>
+   <command>DROP TABLESPACE</command> is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -102,8 +102,8 @@ DROP TABLESPACE mystuff;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtablespace"></member>
-   <member><xref linkend="sql-altertablespace"></member>
+   <member><xref linkend="sql-createtablespace"/></member>
+   <member><xref linkend="sql-altertablespace"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_transform.sgml b/doc/src/sgml/ref/drop_transform.sgml
index 698920a226..582e782219 100644
--- a/doc/src/sgml/ref/drop_transform.sgml
+++ b/doc/src/sgml/ref/drop_transform.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/drop_transform.sgml -->
 
-<refentry id="SQL-DROPTRANSFORM">
+<refentry id="sql-droptransform">
  <indexterm zone="sql-droptransform">
   <primary>DROP TRANSFORM</primary>
  </indexterm>
@@ -76,7 +76,7 @@ DROP TRANSFORM [ IF EXISTS ] FOR <replaceable>type_name</replaceable> LANGUAGE <
       <para>
        Automatically drop objects that depend on the transform,
        and in turn all objects that depend on those objects
-       (see <xref linkend="ddl-depend">).
+       (see <xref linkend="ddl-depend"/>).
       </para>
      </listitem>
     </varlistentry>
@@ -110,7 +110,7 @@ DROP TRANSFORM FOR hstore LANGUAGE plpythonu;
   <para>
    This form of <command>DROP TRANSFORM</command> is a
    <productname>PostgreSQL</productname> extension.  See <xref
-   linkend="sql-createtransform"> for details.
+   linkend="sql-createtransform"/> for details.
   </para>
  </refsect1>
 
@@ -118,7 +118,7 @@ DROP TRANSFORM FOR hstore LANGUAGE plpythonu;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtransform"></member>
+   <member><xref linkend="sql-createtransform"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_trigger.sgml b/doc/src/sgml/ref/drop_trigger.sgml
index d400b8383f..728541e557 100644
--- a/doc/src/sgml/ref/drop_trigger.sgml
+++ b/doc/src/sgml/ref/drop_trigger.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_trigger.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTRIGGER">
+<refentry id="sql-droptrigger">
  <indexterm zone="sql-droptrigger">
   <primary>DROP TRIGGER</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON <replaceable class="PARAMETER">table_name</replaceable> [ CASCADE | RESTRICT ]
+DROP TRIGGER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> ON <replaceable class="parameter">table_name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -51,7 +51,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the trigger to remove.
@@ -60,7 +60,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table for which
@@ -75,7 +75,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON
      <para>
       Automatically drop objects that depend on the trigger,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -92,7 +92,7 @@ DROP TRIGGER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> ON
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-DROPTRIGGER-examples">
+ <refsect1 id="sql-droptrigger-examples">
   <title>Examples</title>
 
   <para>
@@ -104,7 +104,7 @@ DROP TRIGGER if_dist_exists ON films;
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-DROPTRIGGER-compatibility">
+ <refsect1 id="sql-droptrigger-compatibility">
   <title>Compatibility</title>
 
   <para>
@@ -120,7 +120,7 @@ DROP TRIGGER if_dist_exists ON films;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtrigger"></member>
+   <member><xref linkend="sql-createtrigger"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsconfig.sgml b/doc/src/sgml/ref/drop_tsconfig.sgml
index 0096e0092d..9eec4bab53 100644
--- a/doc/src/sgml/ref/drop_tsconfig.sgml
+++ b/doc/src/sgml/ref/drop_tsconfig.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_tsconfig.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTSCONFIG">
+<refentry id="sql-droptsconfig">
  <indexterm zone="sql-droptsconfig">
   <primary>DROP TEXT SEARCH CONFIGURATION</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -66,7 +66,7 @@ DROP TEXT SEARCH CONFIGURATION [ IF EXISTS ] <replaceable class="PARAMETER">name
      <para>
       Automatically drop objects that depend on the text search configuration,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -94,8 +94,8 @@ DROP TEXT SEARCH CONFIGURATION my_english;
 </programlisting>
 
    This command will not succeed if there are any existing indexes
-   that reference the configuration in <function>to_tsvector</> calls.
-   Add <literal>CASCADE</> to
+   that reference the configuration in <function>to_tsvector</function> calls.
+   Add <literal>CASCADE</literal> to
    drop such indexes along with the text search configuration.
   </para>
  </refsect1>
@@ -113,8 +113,8 @@ DROP TEXT SEARCH CONFIGURATION my_english;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsconfig"></member>
-   <member><xref linkend="sql-createtsconfig"></member>
+   <member><xref linkend="sql-altertsconfig"/></member>
+   <member><xref linkend="sql-createtsconfig"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsdictionary.sgml b/doc/src/sgml/ref/drop_tsdictionary.sgml
index 803abf8cba..8d22cfdc75 100644
--- a/doc/src/sgml/ref/drop_tsdictionary.sgml
+++ b/doc/src/sgml/ref/drop_tsdictionary.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_tsdictionary.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTSDICTIONARY">
+<refentry id="sql-droptsdictionary">
  <indexterm zone="sql-droptsdictionary">
   <primary>DROP TEXT SEARCH DICTIONARY</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -66,7 +66,7 @@ DROP TEXT SEARCH DICTIONARY [ IF EXISTS ] <replaceable class="PARAMETER">name</r
      <para>
       Automatically drop objects that depend on the text search dictionary,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -94,7 +94,7 @@ DROP TEXT SEARCH DICTIONARY english;
 </programlisting>
 
    This command will not succeed if there are any existing text search
-   configurations that use the dictionary.  Add <literal>CASCADE</> to
+   configurations that use the dictionary.  Add <literal>CASCADE</literal> to
    drop such configurations along with the dictionary.
   </para>
  </refsect1>
@@ -112,8 +112,8 @@ DROP TEXT SEARCH DICTIONARY english;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsdictionary"></member>
-   <member><xref linkend="sql-createtsdictionary"></member>
+   <member><xref linkend="sql-altertsdictionary"/></member>
+   <member><xref linkend="sql-createtsdictionary"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tsparser.sgml b/doc/src/sgml/ref/drop_tsparser.sgml
index fa99720161..2b647ccaa6 100644
--- a/doc/src/sgml/ref/drop_tsparser.sgml
+++ b/doc/src/sgml/ref/drop_tsparser.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_tsparser.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTSPARSER">
+<refentry id="sql-droptsparser">
  <indexterm zone="sql-droptsparser">
   <primary>DROP TEXT SEARCH PARSER</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -64,7 +64,7 @@ DROP TEXT SEARCH PARSER [ IF EXISTS ] <replaceable class="PARAMETER">name</repla
      <para>
       Automatically drop objects that depend on the text search parser,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -92,7 +92,7 @@ DROP TEXT SEARCH PARSER my_parser;
 </programlisting>
 
    This command will not succeed if there are any existing text search
-   configurations that use the parser.  Add <literal>CASCADE</> to
+   configurations that use the parser.  Add <literal>CASCADE</literal> to
    drop such configurations along with the parser.
   </para>
  </refsect1>
@@ -110,8 +110,8 @@ DROP TEXT SEARCH PARSER my_parser;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertsparser"></member>
-   <member><xref linkend="sql-createtsparser"></member>
+   <member><xref linkend="sql-altertsparser"/></member>
+   <member><xref linkend="sql-createtsparser"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_tstemplate.sgml b/doc/src/sgml/ref/drop_tstemplate.sgml
index 9d051eb619..972b90a85c 100644
--- a/doc/src/sgml/ref/drop_tstemplate.sgml
+++ b/doc/src/sgml/ref/drop_tstemplate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_tstemplate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTSTEMPLATE">
+<refentry id="sql-droptstemplate">
  <indexterm zone="sql-droptstemplate">
   <primary>DROP TEXT SEARCH TEMPLATE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [ CASCADE | RESTRICT ]
+DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -65,7 +65,7 @@ DROP TEXT SEARCH TEMPLATE [ IF EXISTS ] <replaceable class="PARAMETER">name</rep
      <para>
       Automatically drop objects that depend on the text search template,
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -93,7 +93,7 @@ DROP TEXT SEARCH TEMPLATE thesaurus;
 </programlisting>
 
    This command will not succeed if there are any existing text search
-   dictionaries that use the template.  Add <literal>CASCADE</> to
+   dictionaries that use the template.  Add <literal>CASCADE</literal> to
    drop such dictionaries along with the template.
   </para>
  </refsect1>
@@ -111,8 +111,8 @@ DROP TEXT SEARCH TEMPLATE thesaurus;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertstemplate"></member>
-   <member><xref linkend="sql-createtstemplate"></member>
+   <member><xref linkend="sql-altertstemplate"/></member>
+   <member><xref linkend="sql-createtstemplate"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_type.sgml b/doc/src/sgml/ref/drop_type.sgml
index 2c7b8fe9f6..9e555c0624 100644
--- a/doc/src/sgml/ref/drop_type.sgml
+++ b/doc/src/sgml/ref/drop_type.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_type.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPTYPE">
+<refentry id="sql-droptype">
  <indexterm zone="sql-droptype">
   <primary>DROP TYPE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP TYPE [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,7 +49,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the data type to remove.
@@ -64,7 +64,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
       Automatically drop objects that depend on the type (such as
       table columns, functions, and operators),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -81,7 +81,7 @@ DROP TYPE [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-DROPTYPE-examples">
+ <refsect1 id="sql-droptype-examples">
   <title>Examples</title>
 
   <para>
@@ -91,25 +91,25 @@ DROP TYPE box;
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-DROPTYPE-compatibility">
+ <refsect1 id="sql-droptype-compatibility">
   <title>Compatibility</title>
 
   <para>
    This command is similar to the corresponding command in the SQL
-   standard, apart from the <literal>IF EXISTS</>
-   option, which is a <productname>PostgreSQL</> extension.
+   standard, apart from the <literal>IF EXISTS</literal>
+   option, which is a <productname>PostgreSQL</productname> extension.
    But note that much of the <command>CREATE TYPE</command> command
    and the data type extension mechanisms in
    <productname>PostgreSQL</productname> differ from the SQL standard.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-DROPTYPE-see-also">
+ <refsect1 id="sql-droptype-see-also">
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-altertype"></member>
-   <member><xref linkend="sql-createtype"></member>
+   <member><xref linkend="sql-altertype"/></member>
+   <member><xref linkend="sql-createtype"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_user.sgml b/doc/src/sgml/ref/drop_user.sgml
index 38e5418d07..37ab856125 100644
--- a/doc/src/sgml/ref/drop_user.sgml
+++ b/doc/src/sgml/ref/drop_user.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_user.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPUSER">
+<refentry id="sql-dropuser">
  <indexterm zone="sql-dropuser">
   <primary>DROP USER</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...]
+DROP USER [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...]
 </synopsis>
  </refsynopsisdiv>
 
@@ -30,7 +30,7 @@ DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
 
   <para>
    <command>DROP USER</command> is simply an alternate spelling of
-   <xref linkend="sql-droprole">.
+   <xref linkend="sql-droprole"/>.
   </para>
  </refsect1>
 
@@ -48,7 +48,7 @@ DROP USER [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="sql-droprole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_user_mapping.sgml b/doc/src/sgml/ref/drop_user_mapping.sgml
index eb4c320293..7cb09f1166 100644
--- a/doc/src/sgml/ref/drop_user_mapping.sgml
+++ b/doc/src/sgml/ref/drop_user_mapping.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_user_mapping.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPUSERMAPPING">
+<refentry id="sql-dropusermapping">
  <indexterm zone="sql-dropusermapping">
   <primary>DROP USER MAPPING</primary>
  </indexterm>
@@ -36,7 +36,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</
   <para>
    The owner of a foreign server can drop user mappings for that server
    for any user.  Also, a user can drop a user mapping for their own
-   user name if <literal>USAGE</> privilege on the server has been
+   user name if <literal>USAGE</literal> privilege on the server has been
    granted to the user.
   </para>
  </refsect1>
@@ -59,9 +59,9 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</
     <term><replaceable class="parameter">user_name</replaceable></term>
     <listitem>
      <para>
-      User name of the mapping.  <literal>CURRENT_USER</>
-      and <literal>USER</> match the name of the current
-      user.  <literal>PUBLIC</> is used to match all present and
+      User name of the mapping.  <literal>CURRENT_USER</literal>
+      and <literal>USER</literal> match the name of the current
+      user.  <literal>PUBLIC</literal> is used to match all present and
       future user names in the system.
      </para>
     </listitem>
@@ -82,7 +82,7 @@ DROP USER MAPPING [ IF EXISTS ] FOR { <replaceable class="parameter">user_name</
   <title>Examples</title>
 
   <para>
-   Drop a user mapping <literal>bob</>, server <literal>foo</> if it exists:
+   Drop a user mapping <literal>bob</literal>, server <literal>foo</literal> if it exists:
 <programlisting>
 DROP USER MAPPING IF EXISTS FOR bob SERVER foo;
 </programlisting></para>
@@ -93,8 +93,8 @@ DROP USER MAPPING IF EXISTS FOR bob SERVER foo;
 
   <para>
    <command>DROP USER MAPPING</command> conforms to ISO/IEC 9075-9
-   (SQL/MED).  The <literal>IF EXISTS</> clause is
-   a <productname>PostgreSQL</> extension.
+   (SQL/MED).  The <literal>IF EXISTS</literal> clause is
+   a <productname>PostgreSQL</productname> extension.
   </para>
  </refsect1>
 
@@ -102,8 +102,8 @@ DROP USER MAPPING IF EXISTS FOR bob SERVER foo;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createusermapping"></member>
-   <member><xref linkend="sql-alterusermapping"></member>
+   <member><xref linkend="sql-createusermapping"/></member>
+   <member><xref linkend="sql-alterusermapping"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/drop_view.sgml b/doc/src/sgml/ref/drop_view.sgml
index 40f2356188..a1c550ec3e 100644
--- a/doc/src/sgml/ref/drop_view.sgml
+++ b/doc/src/sgml/ref/drop_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/drop_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-DROPVIEW">
+<refentry id="sql-dropview">
  <indexterm zone="sql-dropview">
   <primary>DROP VIEW</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
+DROP VIEW [ IF EXISTS ] <replaceable class="parameter">name</replaceable> [, ...] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -49,7 +49,7 @@ DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the view to remove.
@@ -64,7 +64,7 @@ DROP VIEW [ IF EXISTS ] <replaceable class="PARAMETER">name</replaceable> [, ...
       Automatically drop objects that depend on the view (such as
       other views),
       and in turn all objects that depend on those objects
-      (see <xref linkend="ddl-depend">).
+      (see <xref linkend="ddl-depend"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -97,7 +97,7 @@ DROP VIEW kinds;
   <para>
    This command conforms to the SQL standard, except that the standard only
    allows one view to be dropped per command, and apart from the
-   <literal>IF EXISTS</> option, which is a <productname>PostgreSQL</>
+   <literal>IF EXISTS</literal> option, which is a <productname>PostgreSQL</productname>
    extension.
   </para>
  </refsect1>
@@ -106,8 +106,8 @@ DROP VIEW kinds;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-alterview"></member>
-   <member><xref linkend="sql-createview"></member>
+   <member><xref linkend="sql-alterview"/></member>
+   <member><xref linkend="sql-createview"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/dropdb.sgml b/doc/src/sgml/ref/dropdb.sgml
index 16c49e7928..38f38f01ce 100644
--- a/doc/src/sgml/ref/dropdb.sgml
+++ b/doc/src/sgml/ref/dropdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/dropdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-DROPDB">
+<refentry id="app-dropdb">
  <indexterm zone="app-dropdb">
   <primary>dropdb</primary>
  </indexterm>
@@ -41,7 +41,7 @@ PostgreSQL documentation
 
   <para>
    <application>dropdb</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-DROPDATABASE">.
+   <acronym>SQL</acronym> command <xref linkend="sql-dropdatabase"/>.
    There is no effective difference between dropping databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -53,7 +53,7 @@ PostgreSQL documentation
   <title>Options</title>
 
   <para>
-   <application>dropdb</> accepts the following command-line arguments:
+   <application>dropdb</application> accepts the following command-line arguments:
 
     <variablelist>
      <varlistentry>
@@ -66,8 +66,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>dropdb</application> generates
@@ -77,8 +77,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-i</></term>
-      <term><option>--interactive</></term>
+      <term><option>-i</option></term>
+      <term><option>--interactive</option></term>
       <listitem>
        <para>
        Issues a verification prompt before doing anything destructive.
@@ -87,8 +87,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>dropdb</application> version and exit.
@@ -97,7 +97,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--if-exists</></term>
+      <term><option>--if-exists</option></term>
       <listitem>
        <para>
        Do not throw an error if the database does not exist. A notice is issued
@@ -107,8 +107,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>dropdb</application> command line
@@ -127,8 +127,8 @@ PostgreSQL documentation
 
    <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -140,8 +140,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -152,8 +152,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as.
@@ -162,8 +162,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -177,8 +177,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>dropdb</application> to prompt for a
@@ -191,14 +191,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>dropdb</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
          Specifies the name of the database to connect to in order to drop the
@@ -231,9 +231,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -243,8 +243,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-DROPDATABASE">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-dropdatabase"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -283,8 +283,8 @@ Are you sure? (y/n) </computeroutput><userinput>y</userinput>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-createdb"></member>
-   <member><xref linkend="sql-dropdatabase"></member>
+   <member><xref linkend="app-createdb"/></member>
+   <member><xref linkend="sql-dropdatabase"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/dropuser.sgml b/doc/src/sgml/ref/dropuser.sgml
index d7ad61b3d6..3d4e4b37b3 100644
--- a/doc/src/sgml/ref/dropuser.sgml
+++ b/doc/src/sgml/ref/dropuser.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/dropuser.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-DROPUSER">
+<refentry id="app-dropuser">
  <indexterm zone="app-dropuser">
   <primary>dropuser</primary>
  </indexterm>
@@ -35,14 +35,14 @@ PostgreSQL documentation
   <para>
    <application>dropuser</application> removes an existing
    <productname>PostgreSQL</productname> user.
-   Only superusers and users with the <literal>CREATEROLE</> privilege can
+   Only superusers and users with the <literal>CREATEROLE</literal> privilege can
    remove <productname>PostgreSQL</productname> users.  (To remove a
    superuser, you must yourself be a superuser.)
   </para>
 
   <para>
    <application>dropuser</application> is a wrapper around the
-   <acronym>SQL</acronym> command <xref linkend="SQL-DROPROLE">.
+   <acronym>SQL</acronym> command <xref linkend="sql-droprole"/>.
    There is no effective difference between dropping users via
    this utility and via other methods for accessing the server.
   </para>
@@ -70,8 +70,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>dropuser</application> generates
@@ -81,8 +81,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-i</></term>
-      <term><option>--interactive</></term>
+      <term><option>-i</option></term>
+      <term><option>--interactive</option></term>
       <listitem>
        <para>
         Prompt for confirmation before actually removing the user, and prompt
@@ -92,8 +92,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>dropuser</application> version and exit.
@@ -102,7 +102,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--if-exists</></term>
+      <term><option>--if-exists</option></term>
       <listitem>
        <para>
         Do not throw an error if the user does not exist. A notice is
@@ -112,8 +112,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>dropuser</application> command line
@@ -131,8 +131,8 @@ PostgreSQL documentation
 
    <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the
@@ -144,8 +144,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -156,8 +156,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as (not the user name to drop).
@@ -166,8 +166,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -181,8 +181,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>dropuser</application> to prompt for a
@@ -195,7 +195,7 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>dropuser</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -223,9 +223,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -235,8 +235,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-DROPROLE">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-droprole"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -275,8 +275,8 @@ Are you sure? (y/n) </computeroutput><userinput>y</userinput>
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-createuser"></member>
-   <member><xref linkend="sql-droprole"></member>
+   <member><xref linkend="app-createuser"/></member>
+   <member><xref linkend="sql-droprole"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/ecpg-ref.sgml b/doc/src/sgml/ref/ecpg-ref.sgml
index 8bfb47c4d7..7bfee805a7 100644
--- a/doc/src/sgml/ref/ecpg-ref.sgml
+++ b/doc/src/sgml/ref/ecpg-ref.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/ecpg-ref.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-ECPG">
+<refentry id="app-ecpg">
  <indexterm zone="app-ecpg">
   <primary>ecpg</primary>
  </indexterm>
@@ -28,7 +28,7 @@ PostgreSQL documentation
  </refsynopsisdiv>
 
 
- <refsect1 id="APP-ECPG-description">
+ <refsect1 id="app-ecpg-description">
   <title>Description</title>
 
   <para>
@@ -51,7 +51,7 @@ PostgreSQL documentation
 
   <para>
    This reference page does not describe the embedded SQL language.
-   See <xref linkend="ecpg"> for more information on that topic.
+   See <xref linkend="ecpg"/> for more information on that topic.
   </para>
  </refsect1>
 
@@ -220,9 +220,9 @@ PostgreSQL documentation
 
   <para>
    When compiling the preprocessed C code files, the compiler needs to
-   be able to find the <application>ECPG</> header files in the
-   <productname>PostgreSQL</> include directory.  Therefore, you might
-   have to use the <option>-I</> option when invoking the compiler
+   be able to find the <application>ECPG</application> header files in the
+   <productname>PostgreSQL</productname> include directory.  Therefore, you might
+   have to use the <option>-I</option> option when invoking the compiler
    (e.g., <literal>-I/usr/local/pgsql/include</literal>).
   </para>
 
@@ -235,7 +235,7 @@ PostgreSQL documentation
   <para>
    The value of either of these directories that is appropriate for
    the installation can be found out using <xref
-   linkend="app-pgconfig">.
+   linkend="app-pgconfig"/>.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/end.sgml b/doc/src/sgml/ref/end.sgml
index 10e414515b..7523315f34 100644
--- a/doc/src/sgml/ref/end.sgml
+++ b/doc/src/sgml/ref/end.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/end.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-END">
+<refentry id="sql-end">
  <indexterm zone="sql-end">
   <primary>END</primary>
  </indexterm>
@@ -33,7 +33,7 @@ END [ WORK | TRANSACTION ]
    made by the transaction become visible to others and are guaranteed
    to be durable if a crash occurs.  This command is a
    <productname>PostgreSQL</productname> extension
-   that is equivalent to <xref linkend="sql-commit">.
+   that is equivalent to <xref linkend="sql-commit"/>.
   </para>
  </refsect1>
 
@@ -57,12 +57,12 @@ END [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK"> to
+   Use <xref linkend="sql-rollback"/> to
    abort a transaction.
   </para>
 
   <para>
-   Issuing <command>END</> when not inside a transaction does
+   Issuing <command>END</command> when not inside a transaction does
    no harm, but it will provoke a warning message.
   </para>
  </refsect1>
@@ -83,7 +83,7 @@ END;
   <para>
    <command>END</command> is a <productname>PostgreSQL</productname>
    extension that provides functionality equivalent to <xref
-   linkend="sql-commit">, which is
+   linkend="sql-commit"/>, which is
    specified in the SQL standard.
   </para>
  </refsect1>
@@ -92,9 +92,9 @@ END;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/execute.sgml b/doc/src/sgml/ref/execute.sgml
index 76069c019e..aab1f4b7e0 100644
--- a/doc/src/sgml/ref/execute.sgml
+++ b/doc/src/sgml/ref/execute.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/execute.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-EXECUTE">
+<refentry id="sql-execute">
  <indexterm zone="sql-execute">
   <primary>EXECUTE</primary>
  </indexterm>
@@ -26,7 +26,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">parameter</replaceable> [, ...] ) ]
+EXECUTE <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">parameter</replaceable> [, ...] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -52,7 +52,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
 
   <para>
    For more information on the creation and usage of prepared statements,
-   see <xref linkend="sql-prepare">.
+   see <xref linkend="sql-prepare"/>.
   </para>
  </refsect1>
 
@@ -61,7 +61,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the prepared statement to execute.
@@ -70,7 +70,7 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">parameter</replaceable></term>
+    <term><replaceable class="parameter">parameter</replaceable></term>
     <listitem>
      <para>
       The actual value of a parameter to the prepared statement.  This
@@ -87,16 +87,16 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
   <title>Outputs</title>
    <para>
    The command tag returned by <command>EXECUTE</command>
-   is that of the prepared statement, and not <literal>EXECUTE</>.
+   is that of the prepared statement, and not <literal>EXECUTE</literal>.
   </para>
  </refsect1>
 
  <refsect1>
-  <title>Examples</>
+  <title>Examples</title>
   <para>
     Examples are given in the <xref linkend="sql-prepare-examples"
-    endterm="sql-prepare-examples-title"> section of the <xref
-    linkend="sql-prepare"> documentation.
+    endterm="sql-prepare-examples-title"/> section of the <xref
+    linkend="sql-prepare"/> documentation.
    </para>
  </refsect1>
 
@@ -115,8 +115,8 @@ EXECUTE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-deallocate"></member>
-   <member><xref linkend="sql-prepare"></member>
+   <member><xref linkend="sql-deallocate"/></member>
+   <member><xref linkend="sql-prepare"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/explain.sgml b/doc/src/sgml/ref/explain.sgml
index 4219180943..8dc0d7038a 100644
--- a/doc/src/sgml/ref/explain.sgml
+++ b/doc/src/sgml/ref/explain.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/explain.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-EXPLAIN">
+<refentry id="sql-explain">
  <indexterm zone="sql-explain">
   <primary>EXPLAIN</primary>
  </indexterm>
@@ -160,15 +160,15 @@ ROLLBACK;
       shared blocks hit, read, dirtied, and written, the number of local blocks
       hit, read, dirtied, and written, and the number of temp blocks read and
       written.
-      A <emphasis>hit</> means that a read was avoided because the block was
+      A <emphasis>hit</emphasis> means that a read was avoided because the block was
       found already in cache when needed.
       Shared blocks contain data from regular tables and indexes;
       local blocks contain data from temporary tables and indexes;
       while temp blocks contain short-term working data used in sorts, hashes,
       Materialize plan nodes, and similar cases.
-      The number of blocks <emphasis>dirtied</> indicates the number of
+      The number of blocks <emphasis>dirtied</emphasis> indicates the number of
       previously unmodified blocks that were changed by this query; while the
-      number of blocks <emphasis>written</> indicates the number of
+      number of blocks <emphasis>written</emphasis> indicates the number of
       previously-dirtied blocks evicted from cache by this backend during
       query processing.
       The number of blocks shown for an
@@ -229,9 +229,9 @@ ROLLBACK;
     <listitem>
      <para>
       Specifies whether the selected option should be turned on or off.
-      You can write <literal>TRUE</literal>, <literal>ON</>, or
+      You can write <literal>TRUE</literal>, <literal>ON</literal>, or
       <literal>1</literal> to enable the option, and <literal>FALSE</literal>,
-      <literal>OFF</>, or <literal>0</literal> to disable it.  The
+      <literal>OFF</literal>, or <literal>0</literal> to disable it.  The
       <replaceable class="parameter">boolean</replaceable> value can also
       be omitted, in which case <literal>TRUE</literal> is assumed.
      </para>
@@ -242,10 +242,10 @@ ROLLBACK;
     <term><replaceable class="parameter">statement</replaceable></term>
     <listitem>
      <para>
-      Any <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>,
-      <command>DELETE</>, <command>VALUES</>, <command>EXECUTE</>,
-      <command>DECLARE</>, <command>CREATE TABLE AS</>, or
-      <command>CREATE MATERIALIZED VIEW AS</> statement, whose execution
+      Any <command>SELECT</command>, <command>INSERT</command>, <command>UPDATE</command>,
+      <command>DELETE</command>, <command>VALUES</command>, <command>EXECUTE</command>,
+      <command>DECLARE</command>, <command>CREATE TABLE AS</command>, or
+      <command>CREATE MATERIALIZED VIEW AS</command> statement, whose execution
       plan you wish to see.
      </para>
     </listitem>
@@ -260,7 +260,7 @@ ROLLBACK;
     The command's result is a textual description of the plan selected
     for the <replaceable class="parameter">statement</replaceable>,
     optionally annotated with execution statistics.
-    <xref linkend="using-explain"> describes the information provided.
+    <xref linkend="using-explain"/> describes the information provided.
    </para>
  </refsect1>
 
@@ -276,7 +276,7 @@ ROLLBACK;
    the <link linkend="autovacuum">autovacuum daemon</link> will take care
    of that automatically.  But if a table has recently had substantial
    changes in its contents, you might need to do a manual
-   <xref linkend="sql-analyze"> rather than wait for autovacuum to catch up
+   <xref linkend="sql-analyze"/> rather than wait for autovacuum to catch up
    with the changes.
   </para>
 
@@ -450,7 +450,7 @@ EXPLAIN ANALYZE EXECUTE query(100, 200);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-analyze"></member>
+   <member><xref linkend="sql-analyze"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/fetch.sgml b/doc/src/sgml/ref/fetch.sgml
index 24c8c49156..5ef63f0058 100644
--- a/doc/src/sgml/ref/fetch.sgml
+++ b/doc/src/sgml/ref/fetch.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/fetch.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-FETCH">
+<refentry id="sql-fetch">
 
  <indexterm zone="sql-fetch">
   <primary>FETCH</primary>
@@ -27,23 +27,23 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <!-- Note the "direction" bit is also in ref/move.sgml -->
 <synopsis>
-FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <replaceable class="PARAMETER">cursor_name</replaceable>
+FETCH [ <replaceable class="parameter">direction</replaceable> [ FROM | IN ] ] <replaceable class="parameter">cursor_name</replaceable>
 
-<phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase>
+<phrase>where <replaceable class="parameter">direction</replaceable> can be empty or one of:</phrase>
 
     NEXT
     PRIOR
     FIRST
     LAST
-    ABSOLUTE <replaceable class="PARAMETER">count</replaceable>
-    RELATIVE <replaceable class="PARAMETER">count</replaceable>
-    <replaceable class="PARAMETER">count</replaceable>
+    ABSOLUTE <replaceable class="parameter">count</replaceable>
+    RELATIVE <replaceable class="parameter">count</replaceable>
+    <replaceable class="parameter">count</replaceable>
     ALL
     FORWARD
-    FORWARD <replaceable class="PARAMETER">count</replaceable>
+    FORWARD <replaceable class="parameter">count</replaceable>
     FORWARD ALL
     BACKWARD
-    BACKWARD <replaceable class="PARAMETER">count</replaceable>
+    BACKWARD <replaceable class="parameter">count</replaceable>
     BACKWARD ALL
 </synopsis>
  </refsynopsisdiv>
@@ -57,20 +57,20 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
 
   <para>
    A cursor has an associated position, which is used by
-   <command>FETCH</>.  The cursor position can be before the first row of the
+   <command>FETCH</command>.  The cursor position can be before the first row of the
    query result, on any particular row of the result, or after the last row
    of the result.  When created, a cursor is positioned before the first row.
    After fetching some rows, the cursor is positioned on the row most recently
-   retrieved.  If <command>FETCH</> runs off the end of the available rows
+   retrieved.  If <command>FETCH</command> runs off the end of the available rows
    then the cursor is left positioned after the last row, or before the first
-   row if fetching backward.  <command>FETCH ALL</> or <command>FETCH BACKWARD
-   ALL</> will always leave the cursor positioned after the last row or before
+   row if fetching backward.  <command>FETCH ALL</command> or <command>FETCH BACKWARD
+   ALL</command> will always leave the cursor positioned after the last row or before
    the first row.
   </para>
 
   <para>
-   The forms <literal>NEXT</>, <literal>PRIOR</>, <literal>FIRST</>,
-   <literal>LAST</>, <literal>ABSOLUTE</>, <literal>RELATIVE</> fetch
+   The forms <literal>NEXT</literal>, <literal>PRIOR</literal>, <literal>FIRST</literal>,
+   <literal>LAST</literal>, <literal>ABSOLUTE</literal>, <literal>RELATIVE</literal> fetch
    a single row after moving the cursor appropriately.  If there is no
    such row, an empty result is returned, and the cursor is left
    positioned before the first row or after the last row as
@@ -78,17 +78,17 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
   </para>
 
   <para>
-   The forms using <literal>FORWARD</> and <literal>BACKWARD</>
+   The forms using <literal>FORWARD</literal> and <literal>BACKWARD</literal>
    retrieve the indicated number of rows moving in the forward or
    backward direction, leaving the cursor positioned on the
    last-returned row (or after/before all rows, if the <replaceable
-   class="PARAMETER">count</replaceable> exceeds the number of rows
+   class="parameter">count</replaceable> exceeds the number of rows
    available).
   </para>
 
   <para>
-   <literal>RELATIVE 0</>, <literal>FORWARD 0</>, and
-   <literal>BACKWARD 0</> all request fetching the current row without
+   <literal>RELATIVE 0</literal>, <literal>FORWARD 0</literal>, and
+   <literal>BACKWARD 0</literal> all request fetching the current row without
    moving the cursor, that is, re-fetching the most recently fetched
    row.  This will succeed unless the cursor is positioned before the
    first row or after the last row; in which case, no row is returned.
@@ -97,9 +97,9 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
   <note>
    <para>
     This page describes usage of cursors at the SQL command level.
-    If you are trying to use cursors inside a <application>PL/pgSQL</>
+    If you are trying to use cursors inside a <application>PL/pgSQL</application>
     function, the rules are different &mdash;
-    see <xref linkend="plpgsql-cursors">.
+    see <xref linkend="plpgsql-cursors"/>.
    </para>
   </note>
  </refsect1>
@@ -109,9 +109,9 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">direction</replaceable></term>
+    <term><replaceable class="parameter">direction</replaceable></term>
     <listitem>
-     <para><replaceable class="PARAMETER">direction</replaceable> defines
+     <para><replaceable class="parameter">direction</replaceable> defines
       the fetch direction and number of rows to fetch.  It can be one
       of the following:
 
@@ -121,7 +121,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
         <listitem>
          <para>
           Fetch the next row. This is the default if <replaceable
-          class="PARAMETER">direction</replaceable> is omitted.
+          class="parameter">direction</replaceable> is omitted.
          </para>
         </listitem>
        </varlistentry>
@@ -154,17 +154,17 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
        </varlistentry>
 
        <varlistentry>
-        <term><literal>ABSOLUTE <replaceable class="PARAMETER">count</replaceable></literal></term>
+        <term><literal>ABSOLUTE <replaceable class="parameter">count</replaceable></literal></term>
         <listitem>
          <para>
           Fetch the <replaceable
-          class="PARAMETER">count</replaceable>'th row of the query,
+          class="parameter">count</replaceable>'th row of the query,
           or the <literal>abs(<replaceable
-          class="PARAMETER">count</replaceable>)</literal>'th row from
+          class="parameter">count</replaceable>)</literal>'th row from
           the end if <replaceable
-          class="PARAMETER">count</replaceable> is negative.  Position
+          class="parameter">count</replaceable> is negative.  Position
           before first row or after last row if <replaceable
-          class="PARAMETER">count</replaceable> is out of range; in
+          class="parameter">count</replaceable> is out of range; in
           particular, <literal>ABSOLUTE 0</literal> positions before
           the first row.
          </para>
@@ -172,14 +172,14 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
        </varlistentry>
 
        <varlistentry>
-        <term><literal>RELATIVE <replaceable class="PARAMETER">count</replaceable></literal></term>
+        <term><literal>RELATIVE <replaceable class="parameter">count</replaceable></literal></term>
         <listitem>
          <para>
           Fetch the <replaceable
-          class="PARAMETER">count</replaceable>'th succeeding row, or
+          class="parameter">count</replaceable>'th succeeding row, or
           the <literal>abs(<replaceable
-          class="PARAMETER">count</replaceable>)</literal>'th prior
-          row if <replaceable class="PARAMETER">count</replaceable> is
+          class="parameter">count</replaceable>)</literal>'th prior
+          row if <replaceable class="parameter">count</replaceable> is
           negative.  <literal>RELATIVE 0</literal> re-fetches the
           current row, if any.
          </para>
@@ -187,13 +187,13 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
        </varlistentry>
 
        <varlistentry>
-        <term><replaceable class="PARAMETER">count</replaceable></term>
+        <term><replaceable class="parameter">count</replaceable></term>
         <listitem>
          <para>
           Fetch the next <replaceable
-          class="PARAMETER">count</replaceable> rows (same as
+          class="parameter">count</replaceable> rows (same as
           <literal>FORWARD <replaceable
-          class="PARAMETER">count</replaceable></literal>).
+          class="parameter">count</replaceable></literal>).
          </para>
         </listitem>
        </varlistentry>
@@ -217,11 +217,11 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
        </varlistentry>
 
        <varlistentry>
-        <term><literal>FORWARD <replaceable class="PARAMETER">count</replaceable></literal></term>
+        <term><literal>FORWARD <replaceable class="parameter">count</replaceable></literal></term>
         <listitem>
          <para>
           Fetch the next <replaceable
-          class="PARAMETER">count</replaceable> rows.
+          class="parameter">count</replaceable> rows.
           <literal>FORWARD 0</literal> re-fetches the current row.
          </para>
         </listitem>
@@ -246,11 +246,11 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
        </varlistentry>
 
        <varlistentry>
-        <term><literal>BACKWARD <replaceable class="PARAMETER">count</replaceable></literal></term>
+        <term><literal>BACKWARD <replaceable class="parameter">count</replaceable></literal></term>
         <listitem>
          <para>
           Fetch the prior <replaceable
-          class="PARAMETER">count</replaceable> rows (scanning
+          class="parameter">count</replaceable> rows (scanning
           backwards).  <literal>BACKWARD 0</literal> re-fetches the
           current row.
          </para>
@@ -270,20 +270,20 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">count</replaceable></term>
+    <term><replaceable class="parameter">count</replaceable></term>
     <listitem>
-     <para><replaceable class="PARAMETER">count</replaceable> is a
+     <para><replaceable class="parameter">count</replaceable> is a
       possibly-signed integer constant, determining the location or
-      number of rows to fetch.  For <literal>FORWARD</> and
-      <literal>BACKWARD</> cases, specifying a negative <replaceable
-      class="PARAMETER">count</replaceable> is equivalent to changing
-      the sense of <literal>FORWARD</> and <literal>BACKWARD</>.
+      number of rows to fetch.  For <literal>FORWARD</literal> and
+      <literal>BACKWARD</literal> cases, specifying a negative <replaceable
+      class="parameter">count</replaceable> is equivalent to changing
+      the sense of <literal>FORWARD</literal> and <literal>BACKWARD</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+    <term><replaceable class="parameter">cursor_name</replaceable></term>
     <listitem>
      <para>
       An open cursor's name.
@@ -297,7 +297,7 @@ FETCH [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <
   <title>Outputs</title>
 
   <para>
-   On successful completion, a <command>FETCH</> command returns a command
+   On successful completion, a <command>FETCH</command> command returns a command
    tag of the form
 <screen>
 FETCH <replaceable class="parameter">count</replaceable>
@@ -315,8 +315,8 @@ FETCH <replaceable class="parameter">count</replaceable>
 
   <para>
    The cursor should be declared with the <literal>SCROLL</literal>
-   option if one intends to use any variants of <command>FETCH</>
-   other than <command>FETCH NEXT</> or <command>FETCH FORWARD</> with
+   option if one intends to use any variants of <command>FETCH</command>
+   other than <command>FETCH NEXT</command> or <command>FETCH FORWARD</command> with
    a positive count.  For simple queries
    <productname>PostgreSQL</productname> will allow backwards fetch
    from cursors not declared with <literal>SCROLL</literal>, but this
@@ -335,9 +335,9 @@ FETCH <replaceable class="parameter">count</replaceable>
   </para>
 
   <para>
-   <xref linkend="sql-declare">
+   <xref linkend="sql-declare"/>
    is used to define a cursor.  Use
-   <xref linkend="sql-move">
+   <xref linkend="sql-move"/>
    to change cursor position without retrieving data.
   </para>
  </refsect1>
@@ -394,14 +394,14 @@ COMMIT WORK;
    The <command>FETCH</command> forms involving
    <literal>FORWARD</literal> and <literal>BACKWARD</literal>, as well
    as the forms <literal>FETCH <replaceable
-   class="PARAMETER">count</replaceable></literal> and <literal>FETCH
+   class="parameter">count</replaceable></literal> and <literal>FETCH
    ALL</literal>, in which <literal>FORWARD</literal> is implicit, are
    <productname>PostgreSQL</productname> extensions.
   </para>
 
   <para>
-   The SQL standard allows only <literal>FROM</> preceding the cursor
-   name; the option to use <literal>IN</>, or to leave them out altogether, is
+   The SQL standard allows only <literal>FROM</literal> preceding the cursor
+   name; the option to use <literal>IN</literal>, or to leave them out altogether, is
    an extension.
   </para>
  </refsect1>
@@ -410,9 +410,9 @@ COMMIT WORK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close"></member>
-   <member><xref linkend="sql-declare"></member>
-   <member><xref linkend="sql-move"></member>
+   <member><xref linkend="sql-close"/></member>
+   <member><xref linkend="sql-declare"/></member>
+   <member><xref linkend="sql-move"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/grant.sgml b/doc/src/sgml/ref/grant.sgml
index c63252ca24..ff64c7a3ba 100644
--- a/doc/src/sgml/ref/grant.sgml
+++ b/doc/src/sgml/ref/grant.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/grant.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-GRANT">
+<refentry id="sql-grant">
  <indexterm zone="sql-grant">
   <primary>GRANT</primary>
  </indexterm>
@@ -23,70 +23,70 @@ PostgreSQL documentation
 <synopsis>
 GRANT { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
     [, ...] | ALL [ PRIVILEGES ] }
-    ON { [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...]
-         | ALL TABLES IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] }
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    ON { [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...]
+         | ALL TABLES IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] }
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
-GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] )
-    [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) }
-    ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+GRANT { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="parameter">column_name</replaceable> [, ...] )
+    [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="parameter">column_name</replaceable> [, ...] ) }
+    ON [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { USAGE | SELECT | UPDATE }
     [, ...] | ALL [ PRIVILEGES ] }
-    ON { SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...]
-         | ALL SEQUENCES IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] }
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    ON { SEQUENCE <replaceable class="parameter">sequence_name</replaceable> [, ...]
+         | ALL SEQUENCES IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] }
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { CREATE | CONNECT | TEMPORARY | TEMP } [, ...] | ALL [ PRIVILEGES ] }
     ON DATABASE <replaceable>database_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON DOMAIN <replaceable>domain_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { EXECUTE | ALL [ PRIVILEGES ] }
-    ON { FUNCTION <replaceable>function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...]
-         | ALL FUNCTIONS IN SCHEMA <replaceable class="PARAMETER">schema_name</replaceable> [, ...] }
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    ON { { FUNCTION | PROCEDURE | ROUTINE } <replaceable>routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...]
+         | ALL { FUNCTIONS | PROCEDURES | ROUTINES } IN SCHEMA <replaceable class="parameter">schema_name</replaceable> [, ...] }
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON LANGUAGE <replaceable>lang_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] }
-    ON LARGE OBJECT <replaceable class="PARAMETER">loid</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    ON LARGE OBJECT <replaceable class="parameter">loid</replaceable> [, ...]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { { CREATE | USAGE } [, ...] | ALL [ PRIVILEGES ] }
     ON SCHEMA <replaceable>schema_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { CREATE | ALL [ PRIVILEGES ] }
     ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
 GRANT { USAGE | ALL [ PRIVILEGES ] }
     ON TYPE <replaceable>type_name</replaceable> [, ...]
-    TO <replaceable class="PARAMETER">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
+    TO <replaceable class="parameter">role_specification</replaceable> [, ...] [ WITH GRANT OPTION ]
 
-<phrase>where <replaceable class="PARAMETER">role_specification</replaceable> can be:</phrase>
+<phrase>where <replaceable class="parameter">role_specification</replaceable> can be:</phrase>
 
-    [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable>
+    [ GROUP ] <replaceable class="parameter">role_name</replaceable>
   | PUBLIC
   | CURRENT_USER
   | SESSION_USER
 
-GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replaceable class="PARAMETER">role_name</replaceable> [, ...] [ WITH ADMIN OPTION ]
+GRANT <replaceable class="parameter">role_name</replaceable> [, ...] TO <replaceable class="parameter">role_name</replaceable> [, ...] [ WITH ADMIN OPTION ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -96,7 +96,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
   <para>
    The <command>GRANT</command> command has two basic variants: one
    that grants privileges on a database object (table, column, view, foreign
-   table, sequence, database, foreign-data wrapper, foreign server, function,
+   table, sequence, database, foreign-data wrapper, foreign server, function, procedure,
    procedural language, schema, or tablespace), and one that grants
    membership in a role.  These variants are similar in many ways, but
    they are different enough to be described separately.
@@ -115,8 +115,11 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
   <para>
    There is also an option to grant privileges on all objects of the same
    type within one or more schemas.  This functionality is currently supported
-   only for tables, sequences, and functions (but note that <literal>ALL
-   TABLES</> is considered to include views and foreign tables).
+   only for tables, sequences, functions, and procedures.  <literal>ALL
+   TABLES</literal> also affects views and foreign tables, just like the
+   specific-object <command>GRANT</command> command.  <literal>ALL
+   FUNCTIONS</literal> also affects aggregate functions, but not procedures,
+   again just like the specific-object <command>GRANT</command> command.
   </para>
 
   <para>
@@ -156,19 +159,29 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
   <para>
    PostgreSQL grants default privileges on some types of objects to
    <literal>PUBLIC</literal>.  No privileges are granted to
-   <literal>PUBLIC</literal> by default on tables,
-   columns, schemas or tablespaces. For other types, the default privileges
+   <literal>PUBLIC</literal> by default on
+   tables,
+   table columns,
+   sequences,
+   foreign data wrappers,
+   foreign servers,
+   large objects,
+   schemas,
+   or tablespaces.
+   For other types of objects, the default privileges
    granted to <literal>PUBLIC</literal> are as follows:
-   <literal>CONNECT</literal> and <literal>CREATE TEMP TABLE</literal> for
-   databases; <literal>EXECUTE</literal> privilege for functions; and
-   <literal>USAGE</literal> privilege for languages.
+   <literal>CONNECT</literal> and <literal>TEMPORARY</literal> (create
+   temporary tables) privileges for databases;
+   <literal>EXECUTE</literal> privilege for functions and procedures; and
+   <literal>USAGE</literal> privilege for languages and data types
+   (including domains).
    The object owner can, of course, <command>REVOKE</command>
    both default and  expressly granted privileges. (For maximum
-   security, issue the <command>REVOKE</> in the same transaction that
+   security, issue the <command>REVOKE</command> in the same transaction that
    creates the object; then there is no window in which another user
    can use the object.)
    Also, these initial default privilege settings can be changed using the
-   <xref linkend="sql-alterdefaultprivileges">
+   <xref linkend="sql-alterdefaultprivileges"/>
    command.
   </para>
 
@@ -180,14 +193,14 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>SELECT</literal></term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-select"> from
+       Allows <xref linkend="sql-select"/> from
        any column, or the specific columns listed, of the specified table,
        view, or sequence.
        Also allows the use of
-       <xref linkend="sql-copy"> TO.
+       <xref linkend="sql-copy"/> TO.
        This privilege is also needed to reference existing column values in
-       <xref linkend="sql-update"> or
-       <xref linkend="sql-delete">.
+       <xref linkend="sql-update"/> or
+       <xref linkend="sql-delete"/>.
        For sequences, this privilege also allows the use of the
        <function>currval</function> function.
        For large objects, this privilege allows the object to be read.
@@ -199,11 +212,11 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>INSERT</literal></term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-insert"> of a new
+       Allows <xref linkend="sql-insert"/> of a new
        row into the specified table.  If specific columns are listed,
-       only those columns may be assigned to in the <command>INSERT</>
+       only those columns may be assigned to in the <command>INSERT</command>
        command (other columns will therefore receive default values).
-       Also allows <xref linkend="sql-copy"> FROM.
+       Also allows <xref linkend="sql-copy"/> FROM.
       </para>
      </listitem>
     </varlistentry>
@@ -212,10 +225,10 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>UPDATE</literal></term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-update"> of any
+       Allows <xref linkend="sql-update"/> of any
        column, or the specific columns listed, of the specified table.
-       (In practice, any nontrivial <command>UPDATE</> command will require
-       <literal>SELECT</> privilege as well, since it must reference table
+       (In practice, any nontrivial <command>UPDATE</command> command will require
+       <literal>SELECT</literal> privilege as well, since it must reference table
        columns to determine which rows to update, and/or to compute new
        values for columns.)
        <literal>SELECT ... FOR UPDATE</literal>
@@ -234,10 +247,10 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>DELETE</literal></term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-delete"> of a row
+       Allows <xref linkend="sql-delete"/> of a row
        from the specified table.
-       (In practice, any nontrivial <command>DELETE</> command will require
-       <literal>SELECT</> privilege as well, since it must reference table
+       (In practice, any nontrivial <command>DELETE</command> command will require
+       <literal>SELECT</literal> privilege as well, since it must reference table
        columns to determine which rows to delete.)
       </para>
      </listitem>
@@ -247,7 +260,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>TRUNCATE</literal></term>
      <listitem>
       <para>
-       Allows <xref linkend="sql-truncate"> on
+       Allows <xref linkend="sql-truncate"/> on
        the specified table.
       </para>
      </listitem>
@@ -259,7 +272,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
       <para>
        Allows creation of a foreign key constraint referencing the specified
        table, or specified column(s) of the table.  (See the
-       <xref linkend="sql-createtable"> statement.)
+       <xref linkend="sql-createtable"/> statement.)
       </para>
      </listitem>
     </varlistentry>
@@ -269,7 +282,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <listitem>
       <para>
        Allows the creation of a trigger on the specified table.  (See the
-       <xref linkend="sql-createtrigger"> statement.)
+       <xref linkend="sql-createtrigger"/> statement.)
       </para>
      </listitem>
     </varlistentry>
@@ -282,7 +295,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
       </para>
       <para>
        For schemas, allows new objects to be created within the schema.
-       To rename an existing object, you must own the object <emphasis>and</>
+       To rename an existing object, you must own the object <emphasis>and</emphasis>
        have this privilege for the containing schema.
       </para>
       <para>
@@ -300,7 +313,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
       <para>
        Allows the user to connect to the specified database.  This
        privilege is checked at connection startup (in addition to checking
-       any restrictions imposed by <filename>pg_hba.conf</>).
+       any restrictions imposed by <filename>pg_hba.conf</filename>).
       </para>
      </listitem>
     </varlistentry>
@@ -319,10 +332,12 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
      <term><literal>EXECUTE</literal></term>
      <listitem>
       <para>
-       Allows the use of the specified function and the use of any
-       operators that are implemented on top of the function.  This is
-       the only type of privilege that is applicable to functions.
-       (This syntax works for aggregate functions, as well.)
+       Allows the use of the specified function or procedure and the use of
+       any operators that are implemented on top of the function.  This is the
+       only type of privilege that is applicable to functions and procedures.
+       The <literal>FUNCTION</literal> syntax also works for aggregate
+       functions.  Alternatively, use <literal>ROUTINE</literal> to refer to a function,
+       aggregate function, or procedure regardless of what it is.
       </para>
      </listitem>
     </varlistentry>
@@ -338,7 +353,7 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
       <para>
        For schemas, allows access to objects contained in the specified
        schema (assuming that the objects' own privilege requirements are
-       also met).  Essentially this allows the grantee to <quote>look up</>
+       also met).  Essentially this allows the grantee to <quote>look up</quote>
        objects within the schema.  Without this permission, it is still
        possible to see the object names, e.g. by querying the system tables.
        Also, after revoking this permission, existing backends might have
@@ -406,37 +421,37 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
    OPTION</literal> on itself, but it may grant or revoke membership in
    itself from a database session where the session user matches the
    role.  Database superusers can grant or revoke membership in any role
-   to anyone.  Roles having <literal>CREATEROLE</> privilege can grant
+   to anyone.  Roles having <literal>CREATEROLE</literal> privilege can grant
    or revoke membership in any role that is not a superuser.
   </para>
 
   <para>
    Unlike the case with privileges, membership in a role cannot be granted
-   to <literal>PUBLIC</>.  Note also that this form of the command does not
-   allow the noise word <literal>GROUP</>.
+   to <literal>PUBLIC</literal>.  Note also that this form of the command does not
+   allow the noise word <literal>GROUP</literal>.
   </para>
  </refsect2>
  </refsect1>
 
 
- <refsect1 id="SQL-GRANT-notes">
+ <refsect1 id="sql-grant-notes">
   <title>Notes</title>
 
    <para>
-    The <xref linkend="sql-revoke"> command is used
+    The <xref linkend="sql-revoke"/> command is used
     to revoke access privileges.
    </para>
 
    <para>
     Since <productname>PostgreSQL</productname> 8.1, the concepts of users and
     groups have been unified into a single kind of entity called a role.
-    It is therefore no longer necessary to use the keyword <literal>GROUP</>
-    to identify whether a grantee is a user or a group.  <literal>GROUP</>
+    It is therefore no longer necessary to use the keyword <literal>GROUP</literal>
+    to identify whether a grantee is a user or a group.  <literal>GROUP</literal>
     is still allowed in the command, but it is a noise word.
    </para>
 
    <para>
-    A user may perform <command>SELECT</>, <command>INSERT</>, etc. on a
+    A user may perform <command>SELECT</command>, <command>INSERT</command>, etc. on a
     column if they hold that privilege for either the specific column or
     its whole table.  Granting the privilege at the table level and then
     revoking it for one column will not do what one might wish: the
@@ -444,12 +459,12 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
    </para>
 
    <para>
-    When a non-owner of an object attempts to <command>GRANT</> privileges
+    When a non-owner of an object attempts to <command>GRANT</command> privileges
     on the object, the command will fail outright if the user has no
     privileges whatsoever on the object.  As long as some privilege is
     available, the command will proceed, but it will grant only those
     privileges for which the user has grant options.  The <command>GRANT ALL
-    PRIVILEGES</> forms will issue a warning message if no grant options are
+    PRIVILEGES</command> forms will issue a warning message if no grant options are
     held, while the other forms will issue a warning if grant options for
     any of the privileges specifically named in the command are not held.
     (In principle these statements apply to the object owner as well, but
@@ -460,13 +475,13 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
    <para>
     It should be noted that database superusers can access
     all objects regardless of object privilege settings.  This
-    is comparable to the rights of <literal>root</> in a Unix system.
-    As with <literal>root</>, it's unwise to operate as a superuser
+    is comparable to the rights of <literal>root</literal> in a Unix system.
+    As with <literal>root</literal>, it's unwise to operate as a superuser
     except when absolutely necessary.
    </para>
 
    <para>
-    If a superuser chooses to issue a <command>GRANT</> or <command>REVOKE</>
+    If a superuser chooses to issue a <command>GRANT</command> or <command>REVOKE</command>
     command, the command is performed as though it were issued by the
     owner of the affected object.  In particular, privileges granted via
     such a command will appear to have been granted by the object owner.
@@ -475,37 +490,37 @@ GRANT <replaceable class="PARAMETER">role_name</replaceable> [, ...] TO <replace
    </para>
 
    <para>
-    <command>GRANT</> and <command>REVOKE</> can also be done by a role
+    <command>GRANT</command> and <command>REVOKE</command> can also be done by a role
     that is not the owner of the affected object, but is a member of the role
     that owns the object, or is a member of a role that holds privileges
     <literal>WITH GRANT OPTION</literal> on the object.  In this case the
     privileges will be recorded as having been granted by the role that
     actually owns the object or holds the privileges
     <literal>WITH GRANT OPTION</literal>.  For example, if table
-    <literal>t1</> is owned by role <literal>g1</>, of which role
-    <literal>u1</> is a member, then <literal>u1</> can grant privileges
-    on <literal>t1</> to <literal>u2</>, but those privileges will appear
-    to have been granted directly by <literal>g1</>.  Any other member
-    of role <literal>g1</> could revoke them later.
+    <literal>t1</literal> is owned by role <literal>g1</literal>, of which role
+    <literal>u1</literal> is a member, then <literal>u1</literal> can grant privileges
+    on <literal>t1</literal> to <literal>u2</literal>, but those privileges will appear
+    to have been granted directly by <literal>g1</literal>.  Any other member
+    of role <literal>g1</literal> could revoke them later.
    </para>
 
    <para>
-    If the role executing <command>GRANT</> holds the required privileges
+    If the role executing <command>GRANT</command> holds the required privileges
     indirectly via more than one role membership path, it is unspecified
     which containing role will be recorded as having done the grant.  In such
-    cases it is best practice to use <command>SET ROLE</> to become the
-    specific role you want to do the <command>GRANT</> as.
+    cases it is best practice to use <command>SET ROLE</command> to become the
+    specific role you want to do the <command>GRANT</command> as.
    </para>
 
    <para>
     Granting permission on a table does not automatically extend
     permissions to any sequences used by the table, including
-    sequences tied to <type>SERIAL</> columns.  Permissions on
+    sequences tied to <type>SERIAL</type> columns.  Permissions on
     sequences must be set separately.
    </para>
 
    <para>
-    Use <xref linkend="app-psql">'s <command>\dp</command> command
+    Use <xref linkend="app-psql"/>'s <command>\dp</command> command
     to obtain information about existing privileges for tables and
     columns.  For example:
 <programlisting>
@@ -541,8 +556,8 @@ rolename=xxxx -- privileges granted to a role
         /yyyy -- role that granted this privilege
 </literallayout>
 
-    The above example display would be seen by user <literal>miriam</> after
-    creating table <literal>mytable</> and doing:
+    The above example display would be seen by user <literal>miriam</literal> after
+    creating table <literal>mytable</literal> and doing:
 
 <programlisting>
 GRANT SELECT ON mytable TO PUBLIC;
@@ -552,31 +567,31 @@ GRANT SELECT (col1), UPDATE (col1) ON mytable TO miriam_rw;
    </para>
 
    <para>
-    For non-table objects there are other <command>\d</> commands
+    For non-table objects there are other <command>\d</command> commands
     that can display their privileges.
    </para>
 
    <para>
-    If the <quote>Access privileges</> column is empty for a given object,
+    If the <quote>Access privileges</quote> column is empty for a given object,
     it means the object has default privileges (that is, its privileges column
     is null).  Default privileges always include all privileges for the owner,
-    and can include some privileges for <literal>PUBLIC</> depending on the
-    object type, as explained above.  The first <command>GRANT</> or
-    <command>REVOKE</> on an object
+    and can include some privileges for <literal>PUBLIC</literal> depending on the
+    object type, as explained above.  The first <command>GRANT</command> or
+    <command>REVOKE</command> on an object
     will instantiate the default privileges (producing, for example,
-    <literal>{miriam=arwdDxt/miriam}</>) and then modify them per the
+    <literal>{miriam=arwdDxt/miriam}</literal>) and then modify them per the
     specified request.  Similarly, entries are shown in <quote>Column access
-    privileges</> only for columns with nondefault privileges.
-    (Note: for this purpose, <quote>default privileges</> always means the
+    privileges</quote> only for columns with nondefault privileges.
+    (Note: for this purpose, <quote>default privileges</quote> always means the
     built-in default privileges for the object's type.  An object whose
-    privileges have been affected by an <command>ALTER DEFAULT PRIVILEGES</>
+    privileges have been affected by an <command>ALTER DEFAULT PRIVILEGES</command>
     command will always be shown with an explicit privilege entry that
-    includes the effects of the <command>ALTER</>.)
+    includes the effects of the <command>ALTER</command>.)
    </para>
 
    <para>
     Notice that the owner's implicit grant options are not marked in the
-    access privileges display.  A <literal>*</> will appear only when
+    access privileges display.  A <literal>*</literal> will appear only when
     grant options have been explicitly granted to someone.
    </para>
  </refsect1>
@@ -607,7 +622,7 @@ GRANT ALL PRIVILEGES ON kinds TO manuel;
   </para>
 
   <para>
-   Grant membership in role <literal>admins</> to user <literal>joe</>:
+   Grant membership in role <literal>admins</literal> to user <literal>joe</literal>:
 
 <programlisting>
 GRANT admins TO joe;
@@ -627,14 +642,14 @@ GRANT admins TO joe;
    <para>
     <productname>PostgreSQL</productname> allows an object owner to revoke their
     own ordinary privileges: for example, a table owner can make the table
-    read-only to themselves by revoking their own <literal>INSERT</>,
-    <literal>UPDATE</>, <literal>DELETE</>, and <literal>TRUNCATE</>
+    read-only to themselves by revoking their own <literal>INSERT</literal>,
+    <literal>UPDATE</literal>, <literal>DELETE</literal>, and <literal>TRUNCATE</literal>
     privileges.  This is not possible according to the SQL standard.  The
     reason is that <productname>PostgreSQL</productname> treats the owner's
     privileges as having been granted by the owner to themselves; therefore they
     can revoke them too.  In the SQL standard, the owner's privileges are
-    granted by an assumed entity <quote>_SYSTEM</>.  Not being
-    <quote>_SYSTEM</>, the owner cannot revoke these rights.
+    granted by an assumed entity <quote>_SYSTEM</quote>.  Not being
+    <quote>_SYSTEM</quote>, the owner cannot revoke these rights.
    </para>
 
    <para>
@@ -672,8 +687,8 @@ GRANT admins TO joe;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-revoke"></member>
-   <member><xref linkend="sql-alterdefaultprivileges"></member>
+   <member><xref linkend="sql-revoke"/></member>
+   <member><xref linkend="sql-alterdefaultprivileges"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/import_foreign_schema.sgml b/doc/src/sgml/ref/import_foreign_schema.sgml
index b73dee9439..f07f757ac6 100644
--- a/doc/src/sgml/ref/import_foreign_schema.sgml
+++ b/doc/src/sgml/ref/import_foreign_schema.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/import_foreign_schema.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-IMPORTFOREIGNSCHEMA">
+<refentry id="sql-importforeignschema">
  <indexterm zone="sql-importforeignschema">
   <primary>IMPORT FOREIGN SCHEMA</primary>
  </indexterm>
@@ -21,15 +21,15 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
-    [ { LIMIT TO | EXCEPT } ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] ) ]
-    FROM SERVER <replaceable class="PARAMETER">server_name</replaceable>
-    INTO <replaceable class="PARAMETER">local_schema</replaceable>
-    [ OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ... ] ) ]
+IMPORT FOREIGN SCHEMA <replaceable class="parameter">remote_schema</replaceable>
+    [ { LIMIT TO | EXCEPT } ( <replaceable class="parameter">table_name</replaceable> [, ...] ) ]
+    FROM SERVER <replaceable class="parameter">server_name</replaceable>
+    INTO <replaceable class="parameter">local_schema</replaceable>
+    [ OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ... ] ) ]
 </synopsis>
  </refsynopsisdiv>
 
- <refsect1 id="SQL-IMPORTFOREIGNSCHEMA-description">
+ <refsect1 id="sql-importforeignschema-description">
   <title>Description</title>
 
   <para>
@@ -59,7 +59,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
   <variablelist>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">remote_schema</replaceable></term>
+    <term><replaceable class="parameter">remote_schema</replaceable></term>
     <listitem>
      <para>
       The remote schema to import from. The specific meaning of a remote schema
@@ -69,7 +69,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>LIMIT TO ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] )</literal></term>
+    <term><literal>LIMIT TO ( <replaceable class="parameter">table_name</replaceable> [, ...] )</literal></term>
     <listitem>
      <para>
       Import only foreign tables matching one of the given table names.
@@ -79,7 +79,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>EXCEPT ( <replaceable class="PARAMETER">table_name</replaceable> [, ...] )</literal></term>
+    <term><literal>EXCEPT ( <replaceable class="parameter">table_name</replaceable> [, ...] )</literal></term>
     <listitem>
      <para>
       Exclude specified foreign tables from the import.  All tables
@@ -90,7 +90,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">server_name</replaceable></term>
+    <term><replaceable class="parameter">server_name</replaceable></term>
     <listitem>
      <para>
       The foreign server to import from.
@@ -99,7 +99,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">local_schema</replaceable></term>
+    <term><replaceable class="parameter">local_schema</replaceable></term>
     <listitem>
      <para>
       The schema in which the imported foreign tables will be created.
@@ -108,7 +108,7 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>OPTIONS ( <replaceable class="PARAMETER">option</replaceable> '<replaceable class="PARAMETER">value</replaceable>' [, ...] )</literal></term>
+    <term><literal>OPTIONS ( <replaceable class="parameter">option</replaceable> '<replaceable class="parameter">value</replaceable>' [, ...] )</literal></term>
     <listitem>
      <para>
       Options to be used during the import.
@@ -120,13 +120,13 @@ IMPORT FOREIGN SCHEMA <replaceable class="PARAMETER">remote_schema</replaceable>
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-IMPORTFOREIGNSCHEMA-examples">
+ <refsect1 id="sql-importforeignschema-examples">
   <title>Examples</title>
 
   <para>
-   Import table definitions from a remote schema <structname>foreign_films</>
-   on server <structname>film_server</>, creating the foreign tables in
-   local schema <structname>films</>:
+   Import table definitions from a remote schema <structname>foreign_films</structname>
+   on server <structname>film_server</structname>, creating the foreign tables in
+   local schema <structname>films</structname>:
 
 <programlisting>
 IMPORT FOREIGN SCHEMA foreign_films
@@ -135,8 +135,8 @@ IMPORT FOREIGN SCHEMA foreign_films
    </para>
 
   <para>
-   As above, but import only the two tables <structname>actors</> and
-   <literal>directors</> (if they exist):
+   As above, but import only the two tables <structname>actors</structname> and
+   <literal>directors</literal> (if they exist):
 
 <programlisting>
 IMPORT FOREIGN SCHEMA foreign_films LIMIT TO (actors, directors)
@@ -144,13 +144,13 @@ IMPORT FOREIGN SCHEMA foreign_films LIMIT TO (actors, directors)
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-IMPORTFOREIGNSCHEMA-compatibility">
+ <refsect1 id="sql-importforeignschema-compatibility">
   <title>Compatibility</title>
 
   <para>
    The <command>IMPORT FOREIGN SCHEMA</command> command conforms to the
-   <acronym>SQL</acronym> standard, except that the <literal>OPTIONS</>
-   clause is a <productname>PostgreSQL</> extension.
+   <acronym>SQL</acronym> standard, except that the <literal>OPTIONS</literal>
+   clause is a <productname>PostgreSQL</productname> extension.
   </para>
 
  </refsect1>
@@ -159,8 +159,8 @@ IMPORT FOREIGN SCHEMA foreign_films LIMIT TO (actors, directors)
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createforeigntable"></member>
-   <member><xref linkend="sql-createserver"></member>
+   <member><xref linkend="sql-createforeigntable"/></member>
+   <member><xref linkend="sql-createserver"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/initdb.sgml b/doc/src/sgml/ref/initdb.sgml
index 6efb2e442d..585665f161 100644
--- a/doc/src/sgml/ref/initdb.sgml
+++ b/doc/src/sgml/ref/initdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/initdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-INITDB">
+<refentry id="app-initdb">
  <indexterm zone="app-initdb">
   <primary>initdb</primary>
  </indexterm>
@@ -33,7 +33,7 @@ PostgreSQL documentation
   </cmdsynopsis>
  </refsynopsisdiv>
 
- <refsect1 id="R1-APP-INITDB-1">
+ <refsect1 id="r1-app-initdb-1">
   <title>
    Description
   </title>
@@ -79,8 +79,8 @@ PostgreSQL documentation
   <para>
    <command>initdb</command> initializes the database cluster's default
    locale and character set encoding. The character set encoding,
-   collation order (<literal>LC_COLLATE</>) and character set classes
-   (<literal>LC_CTYPE</>, e.g. upper, lower, digit) can be set separately
+   collation order (<literal>LC_COLLATE</literal>) and character set classes
+   (<literal>LC_CTYPE</literal>, e.g. upper, lower, digit) can be set separately
    for a database when it is created. <command>initdb</command> determines
    those settings for the <literal>template1</literal> database, which will
    serve as the default for all other databases.
@@ -89,7 +89,7 @@ PostgreSQL documentation
   <para>
    To alter the default collation order or character set classes, use the
    <option>--lc-collate</option> and <option>--lc-ctype</option> options.
-   Collation orders other than <literal>C</> or <literal>POSIX</> also have
+   Collation orders other than <literal>C</literal> or <literal>POSIX</literal> also have
    a performance penalty.  For these reasons it is important to choose the
    right locale when running <command>initdb</command>.
   </para>
@@ -98,14 +98,14 @@ PostgreSQL documentation
    The remaining locale categories can be changed later when the server
    is started.  You can also use <option>--locale</option> to set the
    default for all locale categories, including collation order and
-   character set classes. All server locale values (<literal>lc_*</>) can
-   be displayed via <command>SHOW ALL</>.
-   More details can be found in <xref linkend="locale">.
+   character set classes. All server locale values (<literal>lc_*</literal>) can
+   be displayed via <command>SHOW ALL</command>.
+   More details can be found in <xref linkend="locale"/>.
   </para>
 
   <para>
    To alter the default encoding, use the <option>--encoding</option>.
-   More details can be found in <xref linkend="multibyte">.
+   More details can be found in <xref linkend="multibyte"/>.
   </para>
 
  </refsect1>
@@ -121,7 +121,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         This option specifies the default authentication method for local
-        users used in <filename>pg_hba.conf</> (<literal>host</literal>
+        users used in <filename>pg_hba.conf</filename> (<literal>host</literal>
         and <literal>local</literal> lines).  <command>initdb</command> will
         prepopulate <filename>pg_hba.conf</filename> entries using the
         specified authentication method for non-replication as well as
@@ -129,8 +129,8 @@ PostgreSQL documentation
        </para>
 
        <para>
-        Do not use <literal>trust</> unless you trust all local users on your
-        system.  <literal>trust</> is the default for ease of installation.
+        Do not use <literal>trust</literal> unless you trust all local users on your
+        system.  <literal>trust</literal> is the default for ease of installation.
        </para>
       </listitem>
      </varlistentry>
@@ -140,7 +140,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         This option specifies the authentication method for local users via
-        TCP/IP connections used in <filename>pg_hba.conf</>
+        TCP/IP connections used in <filename>pg_hba.conf</filename>
         (<literal>host</literal> lines).
        </para>
       </listitem>
@@ -151,7 +151,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         This option specifies the authentication method for local users via
-        Unix-domain socket connections used in <filename>pg_hba.conf</>
+        Unix-domain socket connections used in <filename>pg_hba.conf</filename>
         (<literal>local</literal> lines).
        </para>
       </listitem>
@@ -183,7 +183,7 @@ PostgreSQL documentation
         unless you override it there.  The default is derived from the locale, or
         <literal>SQL_ASCII</literal> if that does not work. The character sets supported by
         the <productname>PostgreSQL</productname> server are described
-        in <xref linkend="multibyte-charset-supported">.
+        in <xref linkend="multibyte-charset-supported"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -209,7 +209,7 @@ PostgreSQL documentation
         Sets the default locale for the database cluster.  If this
         option is not specified, the locale is inherited from the
         environment that <command>initdb</command> runs in. Locale
-        support is described in <xref linkend="locale">.
+        support is described in <xref linkend="locale"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -255,7 +255,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--pwfile=<replaceable>filename</></option></term>
+      <term><option>--pwfile=<replaceable>filename</replaceable></option></term>
       <listitem>
        <para>
         Makes <command>initdb</command> read the database superuser's password
@@ -270,18 +270,18 @@ PostgreSQL documentation
       <listitem>
        <para>
         Safely write all database files to disk and exit.  This does not
-        perform any of the normal <application>initdb</> operations.
+        perform any of the normal <application>initdb</application> operations.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-T <replaceable>config</></option></term>
-      <term><option>--text-search-config=<replaceable>config</></option></term>
+      <term><option>-T <replaceable>config</replaceable></option></term>
+      <term><option>--text-search-config=<replaceable>config</replaceable></option></term>
       <listitem>
        <para>
         Sets the default text search configuration.
-        See <xref linkend="guc-default-text-search-config"> for further information.
+        See <xref linkend="guc-default-text-search-config"/> for further information.
        </para>
       </listitem>
      </varlistentry>
@@ -316,6 +316,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
+       <term><option>--wal-segsize=<replaceable>SEGSIZE</replaceable></option></term>
+       <listitem>
+        <para>
+         Set the <firstterm>WAL segment size</firstterm>, in megabytes.  This is
+         the size of each individual file in the WAL log.  It may be useful
+         to adjust this size to control the granularity of WAL log shipping.
+         This option can only be set during initialization, and cannot be
+         changed later.
+         The default size is 16 megabytes.
+         The value must be a power of 2 between 1 and 1024 (megabytes).
+        </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
       <term><option>-X <replaceable class="parameter">directory</replaceable></option></term>
       <term><option>--waldir=<replaceable class="parameter">directory</replaceable></option></term>
       <listitem>
@@ -380,8 +395,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>initdb</application> version and exit.
@@ -390,8 +405,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>initdb</application> command line
@@ -427,16 +442,16 @@ PostgreSQL documentation
      <para>
       Specifies the default time zone of the created database cluster.  The
       value should be a full time zone name
-      (see <xref linkend="datatype-timezones">).
+      (see <xref linkend="datatype-timezones"/>).
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -454,8 +469,8 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-pg-ctl"></member>
-   <member><xref linkend="app-postgres"></member>
+   <member><xref linkend="app-pg-ctl"/></member>
+   <member><xref linkend="app-postgres"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/insert.sgml b/doc/src/sgml/ref/insert.sgml
index 94dad00870..134092fa9c 100644
--- a/doc/src/sgml/ref/insert.sgml
+++ b/doc/src/sgml/ref/insert.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/insert.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-INSERT">
+<refentry id="sql-insert">
  <indexterm zone="sql-insert">
   <primary>INSERT</primary>
  </indexterm>
@@ -22,25 +22,25 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
-INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replaceable class="parameter">alias</replaceable> ] [ ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ]
+INSERT INTO <replaceable class="parameter">table_name</replaceable> [ AS <replaceable class="parameter">alias</replaceable> ] [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ]
     [ OVERRIDING { SYSTEM | USER} VALUE ]
-    { DEFAULT VALUES | VALUES ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) [, ...] | <replaceable class="PARAMETER">query</replaceable> }
+    { DEFAULT VALUES | VALUES ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) [, ...] | <replaceable class="parameter">query</replaceable> }
     [ ON CONFLICT [ <replaceable class="parameter">conflict_target</replaceable> ] <replaceable class="parameter">conflict_action</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 
 <phrase>where <replaceable class="parameter">conflict_target</replaceable> can be one of:</phrase>
 
-    ( { <replaceable class="parameter">index_column_name</replaceable> | ( <replaceable class="parameter">index_expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="PARAMETER">index_predicate</replaceable> ]
-    ON CONSTRAINT <replaceable class="PARAMETER">constraint_name</replaceable>
+    ( { <replaceable class="parameter">index_column_name</replaceable> | ( <replaceable class="parameter">index_expression</replaceable> ) } [ COLLATE <replaceable class="parameter">collation</replaceable> ] [ <replaceable class="parameter">opclass</replaceable> ] [, ...] ) [ WHERE <replaceable class="parameter">index_predicate</replaceable> ]
+    ON CONSTRAINT <replaceable class="parameter">constraint_name</replaceable>
 
 <phrase>and <replaceable class="parameter">conflict_action</replaceable> is one of:</phrase>
 
     DO NOTHING
-    DO UPDATE SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } |
-                    ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) |
-                    ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> )
+    DO UPDATE SET { <replaceable class="parameter">column_name</replaceable> = { <replaceable class="parameter">expression</replaceable> | DEFAULT } |
+                    ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) |
+                    ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> )
                   } [, ...]
-              [ WHERE <replaceable class="PARAMETER">condition</replaceable> ]
+              [ WHERE <replaceable class="parameter">condition</replaceable> ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -56,10 +56,10 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
   <para>
    The target column names can be listed in any order.  If no list of
    column names is given at all, the default is all the columns of the
-   table in their declared order; or the first <replaceable>N</> column
-   names, if there are only <replaceable>N</> columns supplied by the
-   <literal>VALUES</> clause or <replaceable>query</>.  The values
-   supplied by the <literal>VALUES</> clause or <replaceable>query</> are
+   table in their declared order; or the first <replaceable>N</replaceable> column
+   names, if there are only <replaceable>N</replaceable> columns supplied by the
+   <literal>VALUES</literal> clause or <replaceable>query</replaceable>.  The values
+   supplied by the <literal>VALUES</literal> clause or <replaceable>query</replaceable> are
    associated with the explicit or implicit column list left-to-right.
   </para>
 
@@ -75,31 +75,31 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
   </para>
 
   <para>
-   <literal>ON CONFLICT</> can be used to specify an alternative
+   <literal>ON CONFLICT</literal> can be used to specify an alternative
    action to raising a unique constraint or exclusion constraint
    violation error. (See <xref linkend="sql-on-conflict"
-   endterm="sql-on-conflict-title"> below.)
+   endterm="sql-on-conflict-title"/> below.)
   </para>
 
   <para>
-   The optional <literal>RETURNING</> clause causes <command>INSERT</>
+   The optional <literal>RETURNING</literal> clause causes <command>INSERT</command>
    to compute and return value(s) based on each row actually inserted
-   (or updated, if an <literal>ON CONFLICT DO UPDATE</> clause was
+   (or updated, if an <literal>ON CONFLICT DO UPDATE</literal> clause was
    used).  This is primarily useful for obtaining values that were
    supplied by defaults, such as a serial sequence number.  However,
    any expression using the table's columns is allowed.  The syntax of
-   the <literal>RETURNING</> list is identical to that of the output
-   list of <command>SELECT</>.  Only rows that were successfully
+   the <literal>RETURNING</literal> list is identical to that of the output
+   list of <command>SELECT</command>.  Only rows that were successfully
    inserted or updated will be returned.  For example, if a row was
    locked but not updated because an <literal>ON CONFLICT DO UPDATE
    ... WHERE</literal> clause <replaceable
-   class="PARAMETER">condition</replaceable> was not satisfied, the
+   class="parameter">condition</replaceable> was not satisfied, the
    row will not be returned.
   </para>
 
   <para>
    You must have <literal>INSERT</literal> privilege on a table in
-   order to insert into it.  If <literal>ON CONFLICT DO UPDATE</> is
+   order to insert into it.  If <literal>ON CONFLICT DO UPDATE</literal> is
    present, <literal>UPDATE</literal> privilege on the table is also
    required.
   </para>
@@ -107,19 +107,19 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
   <para>
    If a column list is specified, you only need
    <literal>INSERT</literal> privilege on the listed columns.
-   Similarly, when <literal>ON CONFLICT DO UPDATE</> is specified, you
-   only need <literal>UPDATE</> privilege on the column(s) that are
-   listed to be updated.  However, <literal>ON CONFLICT DO UPDATE</>
-   also requires <literal>SELECT</> privilege on any column whose
-   values are read in the <literal>ON CONFLICT DO UPDATE</>
-   expressions or <replaceable>condition</>.
+   Similarly, when <literal>ON CONFLICT DO UPDATE</literal> is specified, you
+   only need <literal>UPDATE</literal> privilege on the column(s) that are
+   listed to be updated.  However, <literal>ON CONFLICT DO UPDATE</literal>
+   also requires <literal>SELECT</literal> privilege on any column whose
+   values are read in the <literal>ON CONFLICT DO UPDATE</literal>
+   expressions or <replaceable>condition</replaceable>.
   </para>
 
   <para>
-   Use of the <literal>RETURNING</> clause requires <literal>SELECT</>
-   privilege on all columns mentioned in <literal>RETURNING</>.
+   Use of the <literal>RETURNING</literal> clause requires <literal>SELECT</literal>
+   privilege on all columns mentioned in <literal>RETURNING</literal>.
    If you use the <replaceable
-   class="PARAMETER">query</replaceable> clause to insert rows from a
+   class="parameter">query</replaceable> clause to insert rows from a
    query, you of course need to have <literal>SELECT</literal> privilege on
    any table or column used in the query.
   </para>
@@ -128,7 +128,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
  <refsect1>
   <title>Parameters</title>
 
-  <refsect2 id="SQL-INSERTING-PARAMS">
+  <refsect2 id="sql-inserting-params">
    <title id="sql-inserting-params-title">Inserting</title>
 
    <para>
@@ -144,8 +144,8 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
       <listitem>
        <para>
         The <literal>WITH</literal> clause allows you to specify one or more
-        subqueries that can be referenced by name in the <command>INSERT</>
-        query. See <xref linkend="queries-with"> and <xref linkend="sql-select">
+        subqueries that can be referenced by name in the <command>INSERT</command>
+        query. See <xref linkend="queries-with"/> and <xref linkend="sql-select"/>
         for details.
        </para>
        <para>
@@ -160,7 +160,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">table_name</replaceable></term>
+      <term><replaceable class="parameter">table_name</replaceable></term>
       <listitem>
        <para>
         The name (optionally schema-qualified) of an existing table.
@@ -173,10 +173,10 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
       <listitem>
        <para>
         A substitute name for <replaceable
-        class="PARAMETER">table_name</replaceable>.  When an alias is
+        class="parameter">table_name</replaceable>.  When an alias is
         provided, it completely hides the actual name of the table.
-        This is particularly useful when <literal>ON CONFLICT DO UPDATE</>
-        targets a table named <varname>excluded</>, since that will otherwise
+        This is particularly useful when <literal>ON CONFLICT DO UPDATE</literal>
+        targets a table named <varname>excluded</varname>, since that will otherwise
         be taken as the name of the special table representing rows proposed
         for insertion.
        </para>
@@ -185,19 +185,19 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
 
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">column_name</replaceable></term>
+      <term><replaceable class="parameter">column_name</replaceable></term>
       <listitem>
        <para>
         The name of a column in the table named by <replaceable
-        class="PARAMETER">table_name</replaceable>.  The column name
+        class="parameter">table_name</replaceable>.  The column name
         can be qualified with a subfield name or array subscript, if
         needed.  (Inserting into only some fields of a composite
         column leaves the other fields null.)  When referencing a
-        column with <literal>ON CONFLICT DO UPDATE</>, do not include
+        column with <literal>ON CONFLICT DO UPDATE</literal>, do not include
         the table's name in the specification of a target column.  For
         example, <literal>INSERT INTO table_name ... ON CONFLICT DO UPDATE
-        SET table_name.col = 1</> is invalid (this follows the general
-        behavior for <command>UPDATE</>).
+        SET table_name.col = 1</literal> is invalid (this follows the general
+        behavior for <command>UPDATE</command>).
        </para>
       </listitem>
      </varlistentry>
@@ -227,8 +227,9 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
         This clause is useful for example when copying values between tables.
         Writing <literal>INSERT INTO tbl2 OVERRIDING USER VALUE SELECT * FROM
         tbl1</literal> will copy from <literal>tbl1</literal> all columns that
-        are not identity columns in <literal>tbl2</literal> but will continue
-        the sequence counters for any identity columns.
+        are not identity columns in <literal>tbl2</literal> while values for
+        the identity columns in <literal>tbl2</literal> will be generated by
+        the sequences associated with <literal>tbl2</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -245,7 +246,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">expression</replaceable></term>
+      <term><replaceable class="parameter">expression</replaceable></term>
       <listitem>
        <para>
         An expression or value to assign to the corresponding column.
@@ -264,34 +265,34 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">query</replaceable></term>
+      <term><replaceable class="parameter">query</replaceable></term>
       <listitem>
        <para>
         A query (<command>SELECT</command> statement) that supplies the
         rows to be inserted.  Refer to the
-        <xref linkend="sql-select">
+        <xref linkend="sql-select"/>
         statement for a description of the syntax.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">output_expression</replaceable></term>
+      <term><replaceable class="parameter">output_expression</replaceable></term>
       <listitem>
        <para>
         An expression to be computed and returned by the
-        <command>INSERT</> command after each row is inserted or
+        <command>INSERT</command> command after each row is inserted or
         updated. The expression can use any column names of the table
         named by <replaceable
-        class="PARAMETER">table_name</replaceable>.  Write
-        <literal>*</> to return all columns of the inserted or updated
+        class="parameter">table_name</replaceable>.  Write
+        <literal>*</literal> to return all columns of the inserted or updated
         row(s).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">output_name</replaceable></term>
+      <term><replaceable class="parameter">output_name</replaceable></term>
       <listitem>
        <para>
         A name to use for a returned column.
@@ -303,10 +304,10 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
 
   <refsect2 id="sql-on-conflict">
    <title id="sql-on-conflict-title"><literal>ON CONFLICT</literal> Clause</title>
-   <indexterm zone="SQL-INSERT">
+   <indexterm zone="sql-insert">
     <primary>UPSERT</primary>
    </indexterm>
-   <indexterm zone="SQL-INSERT">
+   <indexterm zone="sql-insert">
     <primary>ON CONFLICT</primary>
    </indexterm>
    <para>
@@ -327,14 +328,14 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
     <parameter>conflict_target</parameter> can perform
     <emphasis>unique index inference</emphasis>.  When performing
     inference, it consists of one or more <replaceable
-    class="PARAMETER">index_column_name</replaceable> columns and/or
-    <replaceable class="PARAMETER">index_expression</replaceable>
-    expressions, and an optional <replaceable class="PARAMETER">index_predicate</replaceable>.  All <replaceable
-    class="PARAMETER">table_name</replaceable> unique indexes that,
+    class="parameter">index_column_name</replaceable> columns and/or
+    <replaceable class="parameter">index_expression</replaceable>
+    expressions, and an optional <replaceable class="parameter">index_predicate</replaceable>.  All <replaceable
+    class="parameter">table_name</replaceable> unique indexes that,
     without regard to order, contain exactly the
     <parameter>conflict_target</parameter>-specified
     columns/expressions are inferred (chosen) as arbiter indexes.  If
-    an <replaceable class="PARAMETER">index_predicate</replaceable> is
+    an <replaceable class="parameter">index_predicate</replaceable> is
     specified, it must, as a further requirement for inference,
     satisfy arbiter indexes.  Note that this means a non-partial
     unique index (a unique index without a predicate) will be inferred
@@ -385,7 +386,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
         UPDATE</literal> have access to the existing row using the
         table's name (or an alias), and to rows proposed for insertion
         using the special <varname>excluded</varname> table.
-        <literal>SELECT</> privilege is required on any column in the
+        <literal>SELECT</literal> privilege is required on any column in the
         target table where corresponding <varname>excluded</varname>
         columns are read.
        </para>
@@ -399,42 +400,42 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">index_column_name</replaceable></term>
+      <term><replaceable class="parameter">index_column_name</replaceable></term>
       <listitem>
        <para>
         The name of a <replaceable
-        class="PARAMETER">table_name</replaceable> column.  Used to
+        class="parameter">table_name</replaceable> column.  Used to
         infer arbiter indexes.  Follows <command>CREATE
-        INDEX</command> format.  <literal>SELECT</> privilege on
-        <replaceable class="PARAMETER">index_column_name</replaceable>
+        INDEX</command> format.  <literal>SELECT</literal> privilege on
+        <replaceable class="parameter">index_column_name</replaceable>
         is required.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">index_expression</replaceable></term>
+      <term><replaceable class="parameter">index_expression</replaceable></term>
       <listitem>
        <para>
         Similar to <replaceable
-        class="PARAMETER">index_column_name</replaceable>, but used to
+        class="parameter">index_column_name</replaceable>, but used to
         infer expressions on <replaceable
-        class="PARAMETER">table_name</replaceable> columns appearing
+        class="parameter">table_name</replaceable> columns appearing
         within index definitions (not simple columns).  Follows
-        <command>CREATE INDEX</command> format.  <literal>SELECT</>
+        <command>CREATE INDEX</command> format.  <literal>SELECT</literal>
         privilege on any column appearing within <replaceable
-        class="PARAMETER">index_expression</replaceable> is required.
+        class="parameter">index_expression</replaceable> is required.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">collation</replaceable></term>
+      <term><replaceable class="parameter">collation</replaceable></term>
       <listitem>
        <para>
         When specified, mandates that corresponding <replaceable
-        class="PARAMETER">index_column_name</replaceable> or
-        <replaceable class="PARAMETER">index_expression</replaceable>
+        class="parameter">index_column_name</replaceable> or
+        <replaceable class="parameter">index_expression</replaceable>
         use a particular collation in order to be matched during
         inference.  Typically this is omitted, as collations usually
         do not affect whether or not a constraint violation occurs.
@@ -444,12 +445,12 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">opclass</replaceable></term>
+      <term><replaceable class="parameter">opclass</replaceable></term>
       <listitem>
        <para>
         When specified, mandates that corresponding <replaceable
-        class="PARAMETER">index_column_name</replaceable> or
-        <replaceable class="PARAMETER">index_expression</replaceable>
+        class="parameter">index_column_name</replaceable> or
+        <replaceable class="parameter">index_expression</replaceable>
         use particular operator class in order to be matched during
         inference.  Typically this is omitted,  as the
         <emphasis>equality</emphasis> semantics are often equivalent
@@ -462,21 +463,21 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">index_predicate</replaceable></term>
+      <term><replaceable class="parameter">index_predicate</replaceable></term>
       <listitem>
        <para>
         Used to allow inference of partial unique indexes.  Any
         indexes that satisfy the predicate (which need not actually be
         partial indexes) can be inferred.  Follows <command>CREATE
-        INDEX</command> format.  <literal>SELECT</> privilege on any
+        INDEX</command> format.  <literal>SELECT</literal> privilege on any
         column appearing within <replaceable
-        class="PARAMETER">index_predicate</replaceable> is required.
+        class="parameter">index_predicate</replaceable> is required.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">constraint_name</replaceable></term>
+      <term><replaceable class="parameter">constraint_name</replaceable></term>
       <listitem>
        <para>
         Explicitly specifies an arbiter
@@ -487,13 +488,13 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
      </varlistentry>
 
      <varlistentry>
-      <term><replaceable class="PARAMETER">condition</replaceable></term>
+      <term><replaceable class="parameter">condition</replaceable></term>
       <listitem>
        <para>
         An expression that returns a value of type
         <type>boolean</type>.  Only rows for which this expression
         returns <literal>true</literal> will be updated, although all
-        rows will be locked when the <literal>ON CONFLICT DO UPDATE</>
+        rows will be locked when the <literal>ON CONFLICT DO UPDATE</literal>
         action is taken.  Note that
         <replaceable>condition</replaceable> is evaluated last, after
         a conflict has been identified as a candidate to update.
@@ -509,7 +510,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
    </para>
 
    <para>
-    <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</>
+    <command>INSERT</command> with an <literal>ON CONFLICT DO UPDATE</literal>
     clause is a <quote>deterministic</quote> statement.  This means
     that the command will not be allowed to affect any single existing
     row more than once; a cardinality violation error will be raised
@@ -521,7 +522,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
     <para>
      It is often preferable to use unique index inference rather than
      naming a constraint directly using <literal>ON CONFLICT ON
-     CONSTRAINT</literal> <replaceable class="PARAMETER">
+     CONSTRAINT</literal> <replaceable class="parameter">
      constraint_name</replaceable>.  Inference will continue to work
      correctly when the underlying index is replaced by another more
      or less equivalent index in an overlapping way, for example when
@@ -537,7 +538,7 @@ INSERT INTO <replaceable class="PARAMETER">table_name</replaceable> [ AS <replac
   <title>Outputs</title>
 
   <para>
-   On successful completion, an <command>INSERT</> command returns a command
+   On successful completion, an <command>INSERT</command> command returns a command
    tag of the form
 <screen>
 INSERT <replaceable>oid</replaceable> <replaceable class="parameter">count</replaceable>
@@ -553,10 +554,10 @@ INSERT <replaceable>oid</replaceable> <replaceable class="parameter">count</repl
   </para>
 
   <para>
-   If the <command>INSERT</> command contains a <literal>RETURNING</>
-   clause, the result will be similar to that of a <command>SELECT</>
+   If the <command>INSERT</command> command contains a <literal>RETURNING</literal>
+   clause, the result will be similar to that of a <command>SELECT</command>
    statement containing the columns and values defined in the
-   <literal>RETURNING</> list, computed over the row(s) inserted or
+   <literal>RETURNING</literal> list, computed over the row(s) inserted or
    updated by the command.
   </para>
  </refsect1>
@@ -615,7 +616,7 @@ INSERT INTO films DEFAULT VALUES;
   </para>
 
   <para>
-   To insert multiple rows using the multirow <command>VALUES</> syntax:
+   To insert multiple rows using the multirow <command>VALUES</command> syntax:
 
 <programlisting>
 INSERT INTO films (code, title, did, date_prod, kind) VALUES
@@ -674,7 +675,7 @@ INSERT INTO employees_log SELECT *, current_timestamp FROM upd;
    Insert or update new distributors as appropriate.  Assumes a unique
    index has been defined that constrains values appearing in the
    <literal>did</literal> column.  Note that the special
-   <varname>excluded</> table is used to reference values originally
+   <varname>excluded</varname> table is used to reference values originally
    proposed for insertion:
 <programlisting>
 INSERT INTO distributors (did, dname)
@@ -696,7 +697,7 @@ INSERT INTO distributors (did, dname) VALUES (7, 'Redline GmbH')
   <para>
    Insert or update new distributors as appropriate.  Example assumes
    a unique index has been defined that constrains values appearing in
-   the <literal>did</literal> column.  <literal>WHERE</> clause is
+   the <literal>did</literal> column.  <literal>WHERE</literal> clause is
    used to limit the rows actually updated (any existing row not
    updated will still be locked, though):
 <programlisting>
@@ -733,13 +734,13 @@ INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International')
 
   <para>
    <command>INSERT</command> conforms to the SQL standard, except that
-   the <literal>RETURNING</> clause is a
+   the <literal>RETURNING</literal> clause is a
    <productname>PostgreSQL</productname> extension, as is the ability
-   to use <literal>WITH</> with <command>INSERT</>, and the ability to
-   specify an alternative action with <literal>ON CONFLICT</>.
+   to use <literal>WITH</literal> with <command>INSERT</command>, and the ability to
+   specify an alternative action with <literal>ON CONFLICT</literal>.
    Also, the case in
    which a column name list is omitted, but not all the columns are
-   filled from the <literal>VALUES</> clause or <replaceable>query</>,
+   filled from the <literal>VALUES</literal> clause or <replaceable>query</replaceable>,
    is disallowed by the standard.
   </para>
 
@@ -752,8 +753,8 @@ INSERT INTO distributors (did, dname) VALUES (10, 'Conrad International')
 
   <para>
    Possible limitations of the <replaceable
-   class="PARAMETER">query</replaceable> clause are documented under
-   <xref linkend="sql-select">.
+   class="parameter">query</replaceable> clause are documented under
+   <xref linkend="sql-select"/>.
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/listen.sgml b/doc/src/sgml/ref/listen.sgml
index 9cd53b02bb..ecc1fb82de 100644
--- a/doc/src/sgml/ref/listen.sgml
+++ b/doc/src/sgml/ref/listen.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/listen.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-LISTEN">
+<refentry id="sql-listen">
  <indexterm zone="sql-listen">
   <primary>LISTEN</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-LISTEN <replaceable class="PARAMETER">channel</replaceable>
+LISTEN <replaceable class="parameter">channel</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -31,14 +31,14 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable>
   <para>
    <command>LISTEN</command> registers the current session as a
    listener on the notification channel named <replaceable
-   class="PARAMETER">channel</replaceable>.
+   class="parameter">channel</replaceable>.
    If the current session is already registered as a listener for
    this notification channel, nothing is done.
   </para>
 
   <para>
    Whenever the command <command>NOTIFY <replaceable
-   class="PARAMETER">channel</replaceable></command> is invoked, either
+   class="parameter">channel</replaceable></command> is invoked, either
    by this session or another one connected to the same database, all
    the sessions currently listening on that notification channel are
    notified, and each will in turn notify its connected client
@@ -54,18 +54,18 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable>
   <para>
    The method a client application must use to detect notification events depends on
    which <productname>PostgreSQL</productname> application programming interface it
-   uses.  With the <application>libpq</> library, the application issues
+   uses.  With the <application>libpq</application> library, the application issues
    <command>LISTEN</command> as an ordinary SQL command, and then must
    periodically call the function <function>PQnotifies</function> to find out
    whether any notification events have been received.  Other interfaces such as
-   <application>libpgtcl</> provide higher-level methods for handling notify events; indeed,
-   with <application>libpgtcl</> the application programmer should not even issue
+   <application>libpgtcl</application> provide higher-level methods for handling notify events; indeed,
+   with <application>libpgtcl</application> the application programmer should not even issue
    <command>LISTEN</command> or <command>UNLISTEN</command> directly.  See the
    documentation for the interface you are using for more details.
   </para>
 
   <para>
-   <xref linkend="sql-notify">
+   <xref linkend="sql-notify"/>
    contains a more extensive
    discussion of the use of <command>LISTEN</command> and
    <command>NOTIFY</command>.
@@ -77,7 +77,7 @@ LISTEN <replaceable class="PARAMETER">channel</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">channel</replaceable></term>
+    <term><replaceable class="parameter">channel</replaceable></term>
     <listitem>
      <para>
       Name of a notification channel (any identifier).
@@ -129,8 +129,8 @@ Asynchronous notification "virtual" received from server process with PID 8448.
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-notify"></member>
-   <member><xref linkend="sql-unlisten"></member>
+   <member><xref linkend="sql-notify"/></member>
+   <member><xref linkend="sql-unlisten"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/load.sgml b/doc/src/sgml/ref/load.sgml
index 6e9182fa3b..506699ef6f 100644
--- a/doc/src/sgml/ref/load.sgml
+++ b/doc/src/sgml/ref/load.sgml
@@ -2,7 +2,7 @@
 doc/src/sgml/ref/load.sgml
 -->
 
-<refentry id="SQL-LOAD">
+<refentry id="sql-load">
  <indexterm zone="sql-load">
   <primary>LOAD</primary>
  </indexterm>
@@ -20,7 +20,7 @@ doc/src/sgml/ref/load.sgml
 
  <refsynopsisdiv>
 <synopsis>
-LOAD '<replaceable class="PARAMETER">filename</replaceable>'
+LOAD '<replaceable class="parameter">filename</replaceable>'
 </synopsis>
  </refsynopsisdiv>
 
@@ -28,34 +28,34 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>'
   <title>Description</title>
 
   <para>
-   This command loads a shared library file into the <productname>PostgreSQL</>
+   This command loads a shared library file into the <productname>PostgreSQL</productname>
    server's address space.  If the file has been loaded already,
    the command does nothing.  Shared library files that contain C functions
    are automatically loaded whenever one of their functions is called.
-   Therefore, an explicit <command>LOAD</> is usually only needed to
-   load a library that modifies the server's behavior through <quote>hooks</>
+   Therefore, an explicit <command>LOAD</command> is usually only needed to
+   load a library that modifies the server's behavior through <quote>hooks</quote>
    rather than providing a set of functions.
   </para>
 
   <para>
    The library file name is typically given as just a bare file name,
    which is sought in the server's library search path (set
-   by <xref linkend="guc-dynamic-library-path">).  Alternatively it can be
+   by <xref linkend="guc-dynamic-library-path"/>).  Alternatively it can be
    given as a full path name.  In either case the platform's standard shared
    library file name extension may be omitted.
-   See <xref linkend="xfunc-c-dynload"> for more information on this topic.
+   See <xref linkend="xfunc-c-dynload"/> for more information on this topic.
   </para>
 
   <indexterm>
-   <primary><filename>$libdir/plugins</></primary>
+   <primary><filename>$libdir/plugins</filename></primary>
   </indexterm>
 
   <para>
-   Non-superusers can only apply <command>LOAD</> to library files
-   located in <filename>$libdir/plugins/</> &mdash; the specified
-   <replaceable class="PARAMETER">filename</replaceable> must begin
+   Non-superusers can only apply <command>LOAD</command> to library files
+   located in <filename>$libdir/plugins/</filename> &mdash; the specified
+   <replaceable class="parameter">filename</replaceable> must begin
    with exactly that string.  (It is the database administrator's
-   responsibility to ensure that only <quote>safe</> libraries
+   responsibility to ensure that only <quote>safe</quote> libraries
    are installed there.)
   </para>
  </refsect1>
@@ -74,7 +74,7 @@ LOAD '<replaceable class="PARAMETER">filename</replaceable>'
   <title>See Also</title>
 
   <para>
-   <xref linkend="sql-createfunction">
+   <xref linkend="sql-createfunction"/>
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/lock.sgml b/doc/src/sgml/ref/lock.sgml
index b946eab303..b2c7203919 100644
--- a/doc/src/sgml/ref/lock.sgml
+++ b/doc/src/sgml/ref/lock.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/lock.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-LOCK">
+<refentry id="sql-lock">
  <indexterm zone="sql-lock">
   <primary>LOCK</primary>
  </indexterm>
@@ -21,9 +21,9 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ...] [ IN <replaceable class="PARAMETER">lockmode</replaceable> MODE ] [ NOWAIT ]
+LOCK [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] [, ...] [ IN <replaceable class="parameter">lockmode</replaceable> MODE ] [ NOWAIT ]
 
-<phrase>where <replaceable class="PARAMETER">lockmode</replaceable> is one of:</phrase>
+<phrase>where <replaceable class="parameter">lockmode</replaceable> is one of:</phrase>
 
     ACCESS SHARE | ROW SHARE | ROW EXCLUSIVE | SHARE UPDATE EXCLUSIVE
     | SHARE | SHARE ROW EXCLUSIVE | EXCLUSIVE | ACCESS EXCLUSIVE
@@ -51,15 +51,15 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
    restrictive lock mode possible. <command>LOCK TABLE</command>
    provides for cases when you might need more restrictive locking.
    For example, suppose an application runs a transaction at the
-   <literal>READ COMMITTED</> isolation level and needs to ensure that
+   <literal>READ COMMITTED</literal> isolation level and needs to ensure that
    data in a table remains stable for the duration of the transaction.
-   To achieve this you could obtain <literal>SHARE</> lock mode over the
+   To achieve this you could obtain <literal>SHARE</literal> lock mode over the
    table before querying. This will prevent concurrent data changes
    and ensure subsequent reads of the table see a stable view of
-   committed data, because <literal>SHARE</> lock mode conflicts with
-   the <literal>ROW EXCLUSIVE</> lock acquired by writers, and your
+   committed data, because <literal>SHARE</literal> lock mode conflicts with
+   the <literal>ROW EXCLUSIVE</literal> lock acquired by writers, and your
    <command>LOCK TABLE <replaceable
-   class="PARAMETER">name</replaceable> IN SHARE MODE</command>
+   class="parameter">name</replaceable> IN SHARE MODE</command>
    statement will wait until any concurrent holders of <literal>ROW
    EXCLUSIVE</literal> mode locks commit or roll back. Thus, once you
    obtain the lock, there are no uncommitted writes outstanding;
@@ -68,28 +68,28 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
 
   <para>
    To achieve a similar effect when running a transaction at the
-   <literal>REPEATABLE READ</> or <literal>SERIALIZABLE</>
-   isolation level, you have to execute the <command>LOCK TABLE</> statement
-   before executing any <command>SELECT</> or data modification statement.
-   A <literal>REPEATABLE READ</> or <literal>SERIALIZABLE</> transaction's
+   <literal>REPEATABLE READ</literal> or <literal>SERIALIZABLE</literal>
+   isolation level, you have to execute the <command>LOCK TABLE</command> statement
+   before executing any <command>SELECT</command> or data modification statement.
+   A <literal>REPEATABLE READ</literal> or <literal>SERIALIZABLE</literal> transaction's
    view of data will be frozen when its first
-   <command>SELECT</> or data modification statement begins.  A <command>LOCK
-   TABLE</> later in the transaction will still prevent concurrent writes
+   <command>SELECT</command> or data modification statement begins.  A <command>LOCK
+   TABLE</command> later in the transaction will still prevent concurrent writes
    &mdash; but it won't ensure that what the transaction reads corresponds to
    the latest committed values.
   </para>
 
   <para>
    If a transaction of this sort is going to change the data in the
-   table, then it should use <literal>SHARE ROW EXCLUSIVE</> lock mode
-   instead of <literal>SHARE</> mode.  This ensures that only one
+   table, then it should use <literal>SHARE ROW EXCLUSIVE</literal> lock mode
+   instead of <literal>SHARE</literal> mode.  This ensures that only one
    transaction of this type runs at a time.  Without this, a deadlock
-   is possible: two transactions might both acquire <literal>SHARE</>
-   mode, and then be unable to also acquire <literal>ROW EXCLUSIVE</>
+   is possible: two transactions might both acquire <literal>SHARE</literal>
+   mode, and then be unable to also acquire <literal>ROW EXCLUSIVE</literal>
    mode to actually perform their updates.  (Note that a transaction's
    own locks never conflict, so a transaction can acquire <literal>ROW
-   EXCLUSIVE</> mode when it holds <literal>SHARE</> mode &mdash; but not
-   if anyone else holds <literal>SHARE</> mode.)  To avoid deadlocks,
+   EXCLUSIVE</literal> mode when it holds <literal>SHARE</literal> mode &mdash; but not
+   if anyone else holds <literal>SHARE</literal> mode.)  To avoid deadlocks,
    make sure all transactions acquire locks on the same objects in the
    same order, and if multiple lock modes are involved for a single
    object, then transactions should always acquire the most
@@ -98,7 +98,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
 
   <para>
    More information about the lock modes and locking strategies can be
-   found in <xref linkend="explicit-locking">.
+   found in <xref linkend="explicit-locking"/>.
   </para>
  </refsect1>
 
@@ -107,20 +107,20 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of an existing table to
-      lock. If <literal>ONLY</> is specified before the table name, only that
-      table is locked. If <literal>ONLY</> is not specified, the table and all
-      its descendant tables (if any) are locked.  Optionally, <literal>*</>
+      lock. If <literal>ONLY</literal> is specified before the table name, only that
+      table is locked. If <literal>ONLY</literal> is not specified, the table and all
+      its descendant tables (if any) are locked.  Optionally, <literal>*</literal>
       can be specified after the table name to explicitly indicate that
       descendant tables are included.
      </para>
 
      <para>
-      The command <literal>LOCK TABLE a, b;</> is equivalent to
-      <literal>LOCK TABLE a; LOCK TABLE b;</>. The tables are locked
+      The command <literal>LOCK TABLE a, b;</literal> is equivalent to
+      <literal>LOCK TABLE a; LOCK TABLE b;</literal>. The tables are locked
       one-by-one in the order specified in the <command>LOCK
       TABLE</command> command.
      </para>
@@ -132,7 +132,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
     <listitem>
      <para>
       The lock mode specifies which locks this lock conflicts with.
-      Lock modes are described in <xref linkend="explicit-locking">.
+      Lock modes are described in <xref linkend="explicit-locking"/>.
      </para>
 
      <para>
@@ -160,38 +160,38 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
   <title>Notes</title>
 
    <para>
-    <literal>LOCK TABLE ... IN ACCESS SHARE MODE</> requires <literal>SELECT</>
+    <literal>LOCK TABLE ... IN ACCESS SHARE MODE</literal> requires <literal>SELECT</literal>
     privileges on the target table.  <literal>LOCK TABLE ... IN ROW EXCLUSIVE
-    MODE</> requires <literal>INSERT</>, <literal>UPDATE</>, <literal>DELETE</>,
-    or <literal>TRUNCATE</> privileges on the target table. All other forms of
-    <command>LOCK</> require table-level <literal>UPDATE</>, <literal>DELETE</>,
-    or <literal>TRUNCATE</> privileges.
+    MODE</literal> requires <literal>INSERT</literal>, <literal>UPDATE</literal>, <literal>DELETE</literal>,
+    or <literal>TRUNCATE</literal> privileges on the target table. All other forms of
+    <command>LOCK</command> require table-level <literal>UPDATE</literal>, <literal>DELETE</literal>,
+    or <literal>TRUNCATE</literal> privileges.
    </para>
 
    <para>
-    <command>LOCK TABLE</> is useless outside a transaction block: the lock
+    <command>LOCK TABLE</command> is useless outside a transaction block: the lock
     would remain held only to the completion of the statement.  Therefore
-    <productname>PostgreSQL</productname> reports an error if <command>LOCK</>
+    <productname>PostgreSQL</productname> reports an error if <command>LOCK</command>
     is used outside a transaction block.
     Use
-    <xref linkend="sql-begin"> and
-    <xref linkend="sql-commit">
-    (or <xref linkend="sql-rollback">)
+    <xref linkend="sql-begin"/> and
+    <xref linkend="sql-commit"/>
+    (or <xref linkend="sql-rollback"/>)
     to define a transaction block.
    </para>
 
   <para>
-   <command>LOCK TABLE</> only deals with table-level locks, and so
-   the mode names involving <literal>ROW</> are all misnomers.  These
+   <command>LOCK TABLE</command> only deals with table-level locks, and so
+   the mode names involving <literal>ROW</literal> are all misnomers.  These
    mode names should generally be read as indicating the intention of
    the user to acquire row-level locks within the locked table.  Also,
-   <literal>ROW EXCLUSIVE</> mode is a shareable table lock.  Keep in
+   <literal>ROW EXCLUSIVE</literal> mode is a shareable table lock.  Keep in
    mind that all the lock modes have identical semantics so far as
-   <command>LOCK TABLE</> is concerned, differing only in the rules
+   <command>LOCK TABLE</command> is concerned, differing only in the rules
    about which modes conflict with which. For information on how to
-   acquire an actual row-level lock, see <xref linkend="locking-rows">
+   acquire an actual row-level lock, see <xref linkend="locking-rows"/>
    and the <xref linkend="sql-for-update-share"
-   endterm="sql-for-update-share-title"> in the <command>SELECT</command>
+   endterm="sql-for-update-share-title"/> in the <command>SELECT</command>
    reference documentation.
   </para>
  </refsect1>
@@ -200,7 +200,7 @@ LOCK [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ]
   <title>Examples</title>
 
   <para>
-   Obtain a <literal>SHARE</> lock on a primary key table when going to perform
+   Obtain a <literal>SHARE</literal> lock on a primary key table when going to perform
    inserts into a foreign key table:
 
 <programlisting>
@@ -216,7 +216,7 @@ COMMIT WORK;
   </para>
 
   <para>
-   Take a <literal>SHARE ROW EXCLUSIVE</> lock on a primary key table when going to perform
+   Take a <literal>SHARE ROW EXCLUSIVE</literal> lock on a primary key table when going to perform
    a delete operation:
 
 <programlisting>
@@ -236,12 +236,12 @@ COMMIT WORK;
    There is no <command>LOCK TABLE</command> in the SQL standard,
    which instead uses <command>SET TRANSACTION</command> to specify
    concurrency levels on transactions.  <productname>PostgreSQL</productname> supports that too;
-   see <xref linkend="SQL-SET-TRANSACTION"> for details.
+   see <xref linkend="sql-set-transaction"/> for details.
   </para>
 
   <para>
-   Except for <literal>ACCESS SHARE</>, <literal>ACCESS EXCLUSIVE</>,
-   and <literal>SHARE UPDATE EXCLUSIVE</> lock modes, the
+   Except for <literal>ACCESS SHARE</literal>, <literal>ACCESS EXCLUSIVE</literal>,
+   and <literal>SHARE UPDATE EXCLUSIVE</literal> lock modes, the
    <productname>PostgreSQL</productname> lock modes and the
    <command>LOCK TABLE</command> syntax are compatible with those
    present in <productname>Oracle</productname>.
diff --git a/doc/src/sgml/ref/move.sgml b/doc/src/sgml/ref/move.sgml
index ed64f23068..4c7d1dca39 100644
--- a/doc/src/sgml/ref/move.sgml
+++ b/doc/src/sgml/ref/move.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/move.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-MOVE">
+<refentry id="sql-move">
  <indexterm zone="sql-move">
   <primary>MOVE</primary>
  </indexterm>
@@ -27,23 +27,23 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <!-- Note the "direction" bit is also in ref/fetch.sgml -->
 <synopsis>
-MOVE [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <replaceable class="PARAMETER">cursor_name</replaceable>
+MOVE [ <replaceable class="parameter">direction</replaceable> [ FROM | IN ] ] <replaceable class="parameter">cursor_name</replaceable>
 
-<phrase>where <replaceable class="PARAMETER">direction</replaceable> can be empty or one of:</phrase>
+<phrase>where <replaceable class="parameter">direction</replaceable> can be empty or one of:</phrase>
 
     NEXT
     PRIOR
     FIRST
     LAST
-    ABSOLUTE <replaceable class="PARAMETER">count</replaceable>
-    RELATIVE <replaceable class="PARAMETER">count</replaceable>
-    <replaceable class="PARAMETER">count</replaceable>
+    ABSOLUTE <replaceable class="parameter">count</replaceable>
+    RELATIVE <replaceable class="parameter">count</replaceable>
+    <replaceable class="parameter">count</replaceable>
     ALL
     FORWARD
-    FORWARD <replaceable class="PARAMETER">count</replaceable>
+    FORWARD <replaceable class="parameter">count</replaceable>
     FORWARD ALL
     BACKWARD
-    BACKWARD <replaceable class="PARAMETER">count</replaceable>
+    BACKWARD <replaceable class="parameter">count</replaceable>
     BACKWARD ALL
 </synopsis>
  </refsynopsisdiv>
@@ -60,7 +60,7 @@ MOVE [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <r
   <para>
    The parameters for the <command>MOVE</command> command are identical to
    those of the <command>FETCH</command> command; refer to
-   <xref linkend="sql-fetch">
+   <xref linkend="sql-fetch"/>
    for details on syntax and usage.
   </para>
  </refsect1>
@@ -69,7 +69,7 @@ MOVE [ <replaceable class="PARAMETER">direction</replaceable> [ FROM | IN ] ] <r
   <title>Outputs</title>
 
   <para>
-   On successful completion, a <command>MOVE</> command returns a command
+   On successful completion, a <command>MOVE</command> command returns a command
    tag of the form
 <screen>
 MOVE <replaceable class="parameter">count</replaceable>
@@ -116,9 +116,9 @@ COMMIT WORK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-close"></member>
-   <member><xref linkend="sql-declare"></member>
-   <member><xref linkend="sql-fetch"></member>
+   <member><xref linkend="sql-close"/></member>
+   <member><xref linkend="sql-declare"/></member>
+   <member><xref linkend="sql-fetch"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/notify.sgml b/doc/src/sgml/ref/notify.sgml
index 3389aa055c..e0e125a2a2 100644
--- a/doc/src/sgml/ref/notify.sgml
+++ b/doc/src/sgml/ref/notify.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/notify.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-NOTIFY">
+<refentry id="sql-notify">
  <indexterm zone="sql-notify">
   <primary>NOTIFY</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable class="PARAMETER">payload</replaceable> ]
+NOTIFY <replaceable class="parameter">channel</replaceable> [ , <replaceable class="parameter">payload</replaceable> ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -30,9 +30,9 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
 
   <para>
    The <command>NOTIFY</command> command sends a notification event together
-   with an optional <quote>payload</> string to each client application that
+   with an optional <quote>payload</quote> string to each client application that
    has previously executed
-   <command>LISTEN <replaceable class="parameter">channel</></command>
+   <command>LISTEN <replaceable class="parameter">channel</replaceable></command>
    for the specified channel name in the current database.
    Notifications are visible to all users.
   </para>
@@ -49,7 +49,7 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
   <para>
    The information passed to the client for a notification event includes the
    notification channel
-   name, the notifying session's server process <acronym>PID</>, and the
+   name, the notifying session's server process <acronym>PID</acronym>, and the
    payload string, which is an empty string if it has not been specified.
   </para>
 
@@ -115,9 +115,9 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
    result in useless work, for example, reading a database table to
    find the same updates that that session just wrote out.  It is
    possible to avoid such extra work by noticing whether the notifying
-   session's server process <acronym>PID</> (supplied in the
+   session's server process <acronym>PID</acronym> (supplied in the
    notification event message) is the same as one's own session's
-   <acronym>PID</> (available from <application>libpq</>).  When they
+   <acronym>PID</acronym> (available from <application>libpq</application>).  When they
    are the same, the notification event is one's own work bouncing
    back, and can be ignored.
   </para>
@@ -128,7 +128,7 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">channel</replaceable></term>
+    <term><replaceable class="parameter">channel</replaceable></term>
     <listitem>
      <para>
       Name of the notification channel to be signaled (any identifier).
@@ -136,10 +136,10 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><replaceable class="PARAMETER">payload</replaceable></term>
+    <term><replaceable class="parameter">payload</replaceable></term>
     <listitem>
      <para>
-      The <quote>payload</> string to be communicated along with the
+      The <quote>payload</quote> string to be communicated along with the
       notification.  This must be specified as a simple string literal.
       In the default configuration it must be shorter than 8000 bytes.
       (If binary data or large amounts of information need to be communicated,
@@ -168,7 +168,7 @@ NOTIFY <replaceable class="PARAMETER">channel</replaceable> [ , <replaceable cla
   <para>
    The function <function>pg_notification_queue_usage</function> returns the
    fraction of the queue that is currently occupied by pending notifications.
-   See <xref linkend="functions-info"> for more information.
+   See <xref linkend="functions-info"/> for more information.
   </para>
   <para>
    A transaction that has executed <command>NOTIFY</command> cannot be
@@ -226,8 +226,8 @@ Asynchronous notification "foo" with payload "payload" received from server proc
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-listen"></member>
-   <member><xref linkend="sql-unlisten"></member>
+   <member><xref linkend="sql-listen"/></member>
+   <member><xref linkend="sql-unlisten"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pg_basebackup.sgml b/doc/src/sgml/ref/pg_basebackup.sgml
index 2454d35af3..e8921b1bb4 100644
--- a/doc/src/sgml/ref/pg_basebackup.sgml
+++ b/doc/src/sgml/ref/pg_basebackup.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_basebackup</command>
-   <arg rep="repeat"><replaceable>option</></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -34,9 +34,9 @@ PostgreSQL documentation
    <application>pg_basebackup</application> is used to take base backups of
    a running <productname>PostgreSQL</productname> database cluster. These
    are taken without affecting other clients to the database, and can be used
-   both for point-in-time recovery (see <xref linkend="continuous-archiving">)
+   both for point-in-time recovery (see <xref linkend="continuous-archiving"/>)
    and as the starting point for a log shipping or streaming replication standby
-   servers (see <xref linkend="warm-standby">).
+   servers (see <xref linkend="warm-standby"/>).
   </para>
 
   <para>
@@ -45,17 +45,17 @@ PostgreSQL documentation
    out of backup mode automatically. Backups are always taken of the entire
    database cluster; it is not possible to back up individual databases or
    database objects. For individual database backups, a tool such as
-   <xref linkend="APP-PGDUMP"> must be used.
+   <xref linkend="app-pgdump"/> must be used.
   </para>
 
   <para>
    The backup is made over a regular <productname>PostgreSQL</productname>
    connection, and uses the replication protocol. The connection must be made
    with a superuser or a user having <literal>REPLICATION</literal>
-   permissions (see <xref linkend="role-attributes">),
+   permissions (see <xref linkend="role-attributes"/>),
    and <filename>pg_hba.conf</filename> must explicitly permit the replication
    connection. The server must also be configured
-   with <xref linkend="guc-max-wal-senders"> set high enough to leave at least
+   with <xref linkend="guc-max-wal-senders"/> set high enough to leave at least
    one session available for the backup and one for WAL streaming (if used).
   </para>
 
@@ -69,9 +69,9 @@ PostgreSQL documentation
    <application>pg_basebackup</application> can make a base backup from
    not only the master but also the standby. To take a backup from the standby,
    set up the standby so that it can accept replication connections (that is, set
-   <varname>max_wal_senders</> and <xref linkend="guc-hot-standby">,
+   <varname>max_wal_senders</varname> and <xref linkend="guc-hot-standby"/>,
    and configure <link linkend="auth-pg-hba-conf">host-based authentication</link>).
-   You will also need to enable <xref linkend="guc-full-page-writes"> on the master.
+   You will also need to enable <xref linkend="guc-full-page-writes"/> on the master.
   </para>
 
   <para>
@@ -85,7 +85,7 @@ PostgreSQL documentation
     </listitem>
     <listitem>
      <para>
-      If you are using <literal>-X none</>, there is no guarantee that all
+      If you are using <literal>-X none</literal>, there is no guarantee that all
       WAL files required for the backup are archived at the end of backup.
      </para>
     </listitem>
@@ -97,9 +97,9 @@ PostgreSQL documentation
     <listitem>
      <para>
       All WAL records required for the backup must contain sufficient full-page writes,
-      which requires you to enable <varname>full_page_writes</> on the master and
-      not to use a tool like <application>pg_compresslog</> as
-      <varname>archive_command</> to remove full-page writes from WAL files.
+      which requires you to enable <varname>full_page_writes</varname> on the master and
+      not to use a tool like <application>pg_compresslog</application> as
+      <varname>archive_command</varname> to remove full-page writes from WAL files.
      </para>
     </listitem>
    </itemizedlist>
@@ -193,8 +193,8 @@ PostgreSQL documentation
       <listitem>
        <para>
         The maximum transfer rate of data transferred from the server.  Values are
-        in kilobytes per second.  Use a suffix of <literal>M</> to indicate megabytes
-        per second.  A suffix of <literal>k</> is also accepted, and has no effect.
+        in kilobytes per second.  Use a suffix of <literal>M</literal> to indicate megabytes
+        per second.  A suffix of <literal>k</literal> is also accepted, and has no effect.
         Valid values are between 32 kilobytes per second and 1024 megabytes per second.
        </para>
        <para>
@@ -226,48 +226,6 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
-     <varlistentry>
-      <term><option>-S <replaceable>slotname</replaceable></option></term>
-      <term><option>--slot=<replaceable class="parameter">slotname</replaceable></option></term>
-      <listitem>
-       <para>
-        This option can only be used together with <literal>-X
-        stream</literal>.  It causes the WAL streaming to use the specified
-        replication slot.  If the base backup is intended to be used as a
-        streaming replication standby using replication slots, it should then
-        use the same replication slot name
-        in <filename>recovery.conf</filename>.  That way, it is ensured that
-        the server does not remove any necessary WAL data in the time between
-        the end of the base backup and the start of streaming replication.
-       </para>
-       <para>
-        If this option is not specified and the server supports temporary
-        replication slots (version 10 and later), then a temporary replication
-        slot is automatically used for WAL streaming.
-       </para>
-      </listitem>
-     </varlistentry>
-
-     <varlistentry>
-      <term><option>--no-slot</option></term>
-      <listitem>
-       <para>
-        This option prevents the creation of a temporary replication slot
-        during the backup even if it's supported by the server.
-       </para>
-       <para>
-        Temporary replication slots are created by default if no slot name
-        is given with the option <option>-S</option> when using log streaming.
-       </para>
-       <para>
-        The main purpose of this option is to allow taking a base backup when
-        the server is out of free replication slots.  Using replication slots
-        is almost always preferred, because it prevents needed WAL from being
-        removed by the server during the backup.
-       </para>
-      </listitem>
-     </varlistentry>
-
      <varlistentry>
       <term><option>-T <replaceable class="parameter">olddir</replaceable>=<replaceable class="parameter">newdir</replaceable></option></term>
       <term><option>--tablespace-mapping=<replaceable class="parameter">olddir</replaceable>=<replaceable class="parameter">newdir</replaceable></option></term>
@@ -341,7 +299,7 @@ PostgreSQL documentation
            <para>
             The write-ahead log files are collected at the end of the backup.
             Therefore, it is necessary for the
-            <xref linkend="guc-wal-keep-segments"> parameter to be set high
+            <xref linkend="guc-wal-keep-segments"/> parameter to be set high
              enough that the log is not removed before the end of the backup.
              If the log has been rotated when it's time to transfer it, the
              backup will fail and be unusable.
@@ -362,7 +320,7 @@ PostgreSQL documentation
             open a second connection to the server and start streaming the
             write-ahead log in parallel while running the backup. Therefore,
             it will use up two connections configured by the
-            <xref linkend="guc-max-wal-senders"> parameter. As long as the
+            <xref linkend="guc-max-wal-senders"/> parameter. As long as the
              client can keep up with write-ahead log received, using this mode
              requires no extra write-ahead logs to be saved on the master.
            </para>
@@ -419,7 +377,19 @@ PostgreSQL documentation
       <term><option>--checkpoint=<replaceable class="parameter">fast|spread</replaceable></option></term>
       <listitem>
        <para>
-        Sets checkpoint mode to fast (immediate) or spread (default) (see <xref linkend="backup-lowlevel-base-backup">).
+        Sets checkpoint mode to fast (immediate) or spread (default) (see <xref linkend="backup-lowlevel-base-backup"/>).
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-C</option></term>
+      <term><option>--create-slot</option></term>
+      <listitem>
+       <para>
+        This option causes the replication slot specified by the
+        option <literal>--slot</literal> to be created before starting the
+        backup.  In this case, an error is raised if the slot already exists.
        </para>
       </listitem>
      </varlistentry>
@@ -453,6 +423,21 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-N</option></term>
+      <term><option>--no-sync</option></term>
+      <listitem>
+       <para>
+        By default, <command>pg_basebackup</command> will wait for all files
+        to be written safely to disk.  This option causes
+        <command>pg_basebackup</command> to return without waiting, which is
+        faster, but means that a subsequent operating system crash can leave
+        the base backup corrupt.  Generally, this option is useful for testing
+        but should not be used when creating a production installation.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-P</option></term>
       <term><option>--progress</option></term>
@@ -476,16 +461,47 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-N</option></term>
-      <term><option>--no-sync</option></term>
+      <term><option>-S <replaceable>slotname</replaceable></option></term>
+      <term><option>--slot=<replaceable class="parameter">slotname</replaceable></option></term>
       <listitem>
        <para>
-        By default, <command>pg_basebackup</command> will wait for all files
-        to be written safely to disk.  This option causes
-        <command>pg_basebackup</command> to return without waiting, which is
-        faster, but means that a subsequent operating system crash can leave
-        the base backup corrupt.  Generally, this option is useful for testing
-        but should not be used when creating a production installation.
+        This option can only be used together with <literal>-X
+        stream</literal>.  It causes the WAL streaming to use the specified
+        replication slot.  If the base backup is intended to be used as a
+        streaming replication standby using replication slots, it should then
+        use the same replication slot name
+        in <filename>recovery.conf</filename>.  That way, it is ensured that
+        the server does not remove any necessary WAL data in the time between
+        the end of the base backup and the start of streaming replication.
+       </para>
+       <para>
+        The specified replication slot has to exist unless the
+        option <option>-C</option> is also used.
+       </para>
+       <para>
+        If this option is not specified and the server supports temporary
+        replication slots (version 10 and later), then a temporary replication
+        slot is automatically used for WAL streaming.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>--no-slot</option></term>
+      <listitem>
+       <para>
+        This option prevents the creation of a temporary replication slot
+        during the backup even if it's supported by the server.
+       </para>
+       <para>
+        Temporary replication slots are created by default if no slot name
+        is given with the option <option>-S</option> when using log streaming.
+       </para>
+       <para>
+        The main purpose of this option is to allow taking a base backup when
+        the server is out of free replication slots.  Using replication slots
+        is almost always preferred, because it prevents needed WAL from being
+        removed by the server during the backup.
        </para>
       </listitem>
      </varlistentry>
@@ -515,10 +531,10 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies parameters used to connect to the server, as a connection
-        string. See <xref linkend="libpq-connstring"> for more information.
+        string. See <xref linkend="libpq-connstring"/> for more information.
        </para>
        <para>
-        The option is called <literal>--dbname</> for consistency with other
+        The option is called <literal>--dbname</literal> for consistency with other
         client applications, but because <application>pg_basebackup</application>
         doesn't connect to any particular database in the cluster, database
         name in the connection string will be ignored.
@@ -578,8 +594,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -607,7 +623,7 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>pg_basebackup</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -620,8 +636,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_basebackup</application> version and exit.
@@ -630,8 +646,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>pg_basebackup</application> command line
@@ -649,9 +665,9 @@ PostgreSQL documentation
   <title>Environment</title>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -675,7 +691,7 @@ PostgreSQL documentation
    symbolic links used for tablespaces are preserved.  Symbolic links pointing
    to certain directories known to PostgreSQL are copied as empty directories.
    Other symbolic links and special device files are skipped.
-   See <xref linkend="protocol-replication"> for the precise details.
+   See <xref linkend="protocol-replication"/> for the precise details.
   </para>
 
   <para>
@@ -693,8 +709,8 @@ PostgreSQL documentation
    tar file before starting the PostgreSQL server. If there are additional tablespaces, the
    tar files for them need to be unpacked in the correct locations. In this
    case the symbolic links for those tablespaces will be created by the server
-   according to the contents of the <filename>tablespace_map</> file that is
-   included in the <filename>base.tar</> file.
+   according to the contents of the <filename>tablespace_map</filename> file that is
+   included in the <filename>base.tar</filename> file.
   </para>
 
   <para>
@@ -752,7 +768,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="APP-PGDUMP"></member>
+   <member><xref linkend="app-pgdump"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_config-ref.sgml b/doc/src/sgml/ref/pg_config-ref.sgml
index 0210f6389d..b819f3f345 100644
--- a/doc/src/sgml/ref/pg_config-ref.sgml
+++ b/doc/src/sgml/ref/pg_config-ref.sgml
@@ -13,7 +13,7 @@
 
  <refnamediv>
   <refname>pg_config</refname>
-  <refpurpose>retrieve information about the installed version of <productname>PostgreSQL</></refpurpose>
+  <refpurpose>retrieve information about the installed version of <productname>PostgreSQL</productname></refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
@@ -24,12 +24,12 @@
  </refsynopsisdiv>
 
  <refsect1>
-  <title>Description</>
+  <title>Description</title>
   <para>
-   The <application>pg_config</> utility prints configuration parameters
-   of the currently installed version of <productname>PostgreSQL</>. It is
+   The <application>pg_config</application> utility prints configuration parameters
+   of the currently installed version of <productname>PostgreSQL</productname>. It is
    intended, for example, to be used by software packages that want to interface
-   to <productname>PostgreSQL</> to facilitate finding the required header files
+   to <productname>PostgreSQL</productname> to facilitate finding the required header files
    and libraries.
   </para>
  </refsect1>
@@ -39,22 +39,22 @@
   <title>Options</title>
 
   <para>
-   To use <application>pg_config</>, supply one or more of the following
+   To use <application>pg_config</application>, supply one or more of the following
    options:
    <variablelist>
     <varlistentry>
-     <term><option>--bindir</option></>
+     <term><option>--bindir</option></term>
      <listitem>
       <para>
        Print the location of user executables. Use this, for example, to find
-       the <command>psql</> program. This is normally also the location
-       where the <filename>pg_config</> program resides.
+       the <command>psql</command> program. This is normally also the location
+       where the <filename>pg_config</filename> program resides.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--docdir</option></>
+     <term><option>--docdir</option></term>
      <listitem>
       <para>
        Print the location of documentation files.
@@ -63,7 +63,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--htmldir</option></>
+     <term><option>--htmldir</option></term>
      <listitem>
       <para>
        Print the location of HTML documentation files.
@@ -72,7 +72,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--includedir</option></>
+     <term><option>--includedir</option></term>
      <listitem>
       <para>
        Print the location of C header files of the client interfaces.
@@ -81,7 +81,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--pkgincludedir</option></>
+     <term><option>--pkgincludedir</option></term>
      <listitem>
       <para>
        Print the location of other C header files.
@@ -90,7 +90,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--includedir-server</option></>
+     <term><option>--includedir-server</option></term>
      <listitem>
       <para>
        Print the location of C header files for server programming.
@@ -99,7 +99,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--libdir</option></>
+     <term><option>--libdir</option></term>
      <listitem>
       <para>
        Print the location of object code libraries.
@@ -108,7 +108,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--pkglibdir</option></>
+     <term><option>--pkglibdir</option></term>
      <listitem>
       <para>
        Print the location of dynamically loadable modules, or where
@@ -120,18 +120,18 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--localedir</option></>
+     <term><option>--localedir</option></term>
      <listitem>
       <para>
        Print the location of locale support files.  (This will be an empty
        string if locale support was not configured when
-       <productname>PostgreSQL</> was built.)
+       <productname>PostgreSQL</productname> was built.)
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--mandir</option></>
+     <term><option>--mandir</option></term>
      <listitem>
       <para>
        Print the location of manual pages.
@@ -140,7 +140,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--sharedir</option></>
+     <term><option>--sharedir</option></term>
      <listitem>
       <para>
        Print the location of architecture-independent support files.
@@ -149,7 +149,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--sysconfdir</option></>
+     <term><option>--sysconfdir</option></term>
      <listitem>
       <para>
        Print the location of system-wide configuration files.
@@ -158,7 +158,7 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--pgxs</option></>
+     <term><option>--pgxs</option></term>
      <listitem>
       <para>
        Print the location of extension makefiles.
@@ -167,11 +167,11 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--configure</option></>
+     <term><option>--configure</option></term>
      <listitem>
       <para>
-       Print the options that were given to the <filename>configure</>
-       script when <productname>PostgreSQL</> was configured for building.
+       Print the options that were given to the <filename>configure</filename>
+       script when <productname>PostgreSQL</productname> was configured for building.
        This can be used to reproduce the identical configuration, or
        to find out with what options a binary package was built. (Note
        however that binary packages often contain vendor-specific custom
@@ -181,102 +181,102 @@
     </varlistentry>
 
     <varlistentry>
-     <term><option>--cc</option></>
+     <term><option>--cc</option></term>
      <listitem>
       <para>
        Print the value of the <varname>CC</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows the C compiler used.
+       <productname>PostgreSQL</productname>.  This shows the C compiler used.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--cppflags</option></>
+     <term><option>--cppflags</option></term>
      <listitem>
       <para>
        Print the value of the <varname>CPPFLAGS</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows C compiler switches needed
-       at preprocessing time (typically, <literal>-I</> switches).
+       <productname>PostgreSQL</productname>.  This shows C compiler switches needed
+       at preprocessing time (typically, <literal>-I</literal> switches).
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--cflags</option></>
+     <term><option>--cflags</option></term>
      <listitem>
       <para>
        Print the value of the <varname>CFLAGS</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows C compiler switches.
+       <productname>PostgreSQL</productname>.  This shows C compiler switches.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--cflags_sl</option></>
+     <term><option>--cflags_sl</option></term>
      <listitem>
       <para>
        Print the value of the <varname>CFLAGS_SL</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows extra C compiler switches
+       <productname>PostgreSQL</productname>.  This shows extra C compiler switches
        used for building shared libraries.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--ldflags</option></>
+     <term><option>--ldflags</option></term>
      <listitem>
       <para>
        Print the value of the <varname>LDFLAGS</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows linker switches.
+       <productname>PostgreSQL</productname>.  This shows linker switches.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--ldflags_ex</option></>
+     <term><option>--ldflags_ex</option></term>
      <listitem>
       <para>
        Print the value of the <varname>LDFLAGS_EX</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows linker switches
+       <productname>PostgreSQL</productname>.  This shows linker switches
        used for building executables only.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--ldflags_sl</option></>
+     <term><option>--ldflags_sl</option></term>
      <listitem>
       <para>
        Print the value of the <varname>LDFLAGS_SL</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This shows linker switches
+       <productname>PostgreSQL</productname>.  This shows linker switches
        used for building shared libraries only.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--libs</option></>
+     <term><option>--libs</option></term>
      <listitem>
       <para>
        Print the value of the <varname>LIBS</varname> variable that was used for building
-       <productname>PostgreSQL</>.  This normally contains <literal>-l</>
-       switches for external libraries linked into <productname>PostgreSQL</>.
+       <productname>PostgreSQL</productname>.  This normally contains <literal>-l</literal>
+       switches for external libraries linked into <productname>PostgreSQL</productname>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>--version</option></>
+     <term><option>--version</option></term>
      <listitem>
       <para>
-       Print the version of <productname>PostgreSQL</>.
+       Print the version of <productname>PostgreSQL</productname>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><option>-?</></term>
-     <term><option>--help</></term>
+     <term><option>-?</option></term>
+     <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_config</application> command line
@@ -303,9 +303,9 @@
    <option>--cc</option>, <option>--cppflags</option>,
    <option>--cflags</option>, <option>--cflags_sl</option>,
    <option>--ldflags</option>, <option>--ldflags_sl</option>,
-   and <option>--libs</option> were added in <productname>PostgreSQL</> 8.1.
-   The option <option>--htmldir</option> was added in <productname>PostgreSQL</> 8.4.
-   The option <option>--ldflags_ex</option> was added in <productname>PostgreSQL</> 9.0.
+   and <option>--libs</option> were added in <productname>PostgreSQL</productname> 8.1.
+   The option <option>--htmldir</option> was added in <productname>PostgreSQL</productname> 8.4.
+   The option <option>--ldflags_ex</option> was added in <productname>PostgreSQL</productname> 9.0.
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_controldata.sgml b/doc/src/sgml/ref/pg_controldata.sgml
index 4a360d61fd..9a676e0a78 100644
--- a/doc/src/sgml/ref/pg_controldata.sgml
+++ b/doc/src/sgml/ref/pg_controldata.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/pg_controldata.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-PGCONTROLDATA">
+<refentry id="app-pgcontroldata">
  <indexterm zone="app-pgcontroldata">
   <primary>pg_controldata</primary>
  </indexterm>
@@ -27,11 +27,11 @@ PostgreSQL documentation
   </cmdsynopsis>
  </refsynopsisdiv>
 
- <refsect1 id="R1-APP-PGCONTROLDATA-1">
+ <refsect1 id="r1-app-pgcontroldata-1">
   <title>Description</title>
   <para>
    <command>pg_controldata</command> prints information initialized during
-   <command>initdb</>, such as the catalog version.
+   <command>initdb</command>, such as the catalog version.
    It also shows information about write-ahead logging and checkpoint
    processing.  This information is cluster-wide, and not specific to any one
    database.
@@ -41,10 +41,10 @@ PostgreSQL documentation
    This utility can only be run by the user who initialized the cluster because
    it requires read access to the data directory.
    You can specify the data directory on the command line, or use
-   the environment variable <envar>PGDATA</>.  This utility supports the options
-   <option>-V</> and <option>--version</>, which print the
+   the environment variable <envar>PGDATA</envar>.  This utility supports the options
+   <option>-V</option> and <option>--version</option>, which print the
    <application>pg_controldata</application> version and exit.  It also
-   supports options <option>-?</> and <option>--help</>, which output the
+   supports options <option>-?</option> and <option>--help</option>, which output the
    supported arguments.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/pg_ctl-ref.sgml b/doc/src/sgml/ref/pg_ctl-ref.sgml
index 12fa011c4e..0816bc1686 100644
--- a/doc/src/sgml/ref/pg_ctl-ref.sgml
+++ b/doc/src/sgml/ref/pg_ctl-ref.sgml
@@ -140,7 +140,7 @@ PostgreSQL documentation
    <application>pg_ctl</application> is a utility for initializing a
    <productname>PostgreSQL</productname> database cluster, starting,
    stopping, or restarting the <productname>PostgreSQL</productname>
-   database server (<xref linkend="app-postgres">), or displaying the
+   database server (<xref linkend="app-postgres"/>), or displaying the
    status of a running server.  Although the server can be started
    manually, <application>pg_ctl</application> encapsulates tasks such
    as redirecting log output and properly detaching from the terminal
@@ -153,19 +153,19 @@ PostgreSQL documentation
    <productname>PostgreSQL</productname> database cluster, that is,
    a collection of databases that will be managed by a single
    server instance.  This mode invokes the <command>initdb</command>
-   command.  See <xref linkend="app-initdb"> for details.
+   command.  See <xref linkend="app-initdb"/> for details.
   </para>
 
   <para>
    <option>start</option> mode launches a new server.  The
    server is started in the background, and its standard input is attached
-   to <filename>/dev/null</filename> (or <literal>nul</> on Windows).
+   to <filename>/dev/null</filename> (or <literal>nul</literal> on Windows).
    On Unix-like systems, by default, the server's standard output and
    standard error are sent to <application>pg_ctl</application>'s
    standard output (not standard error).  The standard output of
    <application>pg_ctl</application> should then be redirected to a
    file or piped to another process such as a log rotating program
-   like <application>rotatelogs</>; otherwise <command>postgres</command>
+   like <application>rotatelogs</application>; otherwise <command>postgres</command>
    will write its output to the controlling terminal (from the
    background) and will not leave the shell's process group.  On
    Windows, by default the server's standard output and standard error
@@ -203,7 +203,7 @@ PostgreSQL documentation
 
   <para>
    <option>reload</option> mode simply sends the
-   <command>postgres</command> server process a <systemitem>SIGHUP</>
+   <command>postgres</command> server process a <systemitem>SIGHUP</systemitem>
    signal, causing it to reread its configuration files
    (<filename>postgresql.conf</filename>,
    <filename>pg_hba.conf</filename>, etc.).  This allows changing
@@ -228,14 +228,14 @@ PostgreSQL documentation
 
   <para>
    <option>kill</option> mode sends a signal to a specified process.
-   This is primarily valuable on <productname>Microsoft Windows</>
-   which does not have a built-in <application>kill</> command.  Use
-   <literal>--help</> to see a list of supported signal names.
+   This is primarily valuable on <productname>Microsoft Windows</productname>
+   which does not have a built-in <application>kill</application> command.  Use
+   <literal>--help</literal> to see a list of supported signal names.
   </para>
 
   <para>
-   <option>register</option> mode registers the <productname>PostgreSQL</>
-   server as a system service on <productname>Microsoft Windows</>.
+   <option>register</option> mode registers the <productname>PostgreSQL</productname>
+   server as a system service on <productname>Microsoft Windows</productname>.
    The <option>-S</option> option allows selection of service start type,
    either <quote>auto</quote> (start service automatically on system startup)
    or <quote>demand</quote> (start service on demand).
@@ -243,7 +243,7 @@ PostgreSQL documentation
 
   <para>
    <option>unregister</option> mode unregisters a system service
-   on <productname>Microsoft Windows</>.  This undoes the effects of the
+   on <productname>Microsoft Windows</productname>.  This undoes the effects of the
    <option>register</option> command.
   </para>
  </refsect1>
@@ -286,7 +286,7 @@ PostgreSQL documentation
        <para>
         Append the server log output to
         <replaceable>filename</replaceable>.  If the file does not
-        exist, it is created.  The <systemitem>umask</> is set to 077,
+        exist, it is created.  The <systemitem>umask</systemitem> is set to 077,
         so access to the log file is disallowed to other users by default.
        </para>
       </listitem>
@@ -313,11 +313,11 @@ PostgreSQL documentation
        <para>
         Specifies options to be passed directly to the
         <command>postgres</command> command.
-        <option>-o</> can be specified multiple times, with all the given
+        <option>-o</option> can be specified multiple times, with all the given
         options being passed through.
        </para>
        <para>
-        The <replaceable>options</> should usually be surrounded by single or
+        The <replaceable>options</replaceable> should usually be surrounded by single or
         double quotes to ensure that they are passed through as a group.
        </para>
       </listitem>
@@ -330,11 +330,11 @@ PostgreSQL documentation
        <para>
         Specifies options to be passed directly to the
         <command>initdb</command> command.
-        <option>-o</> can be specified multiple times, with all the given
+        <option>-o</option> can be specified multiple times, with all the given
         options being passed through.
        </para>
        <para>
-        The <replaceable>options</> should usually be surrounded by single or
+        The <replaceable>options</replaceable> should usually be surrounded by single or
         double quotes to ensure that they are passed through as a group.
        </para>
       </listitem>
@@ -377,15 +377,15 @@ PostgreSQL documentation
        <para>
         Specifies the maximum number of seconds to wait when waiting for an
         operation to complete (see option <option>-w</option>).  Defaults to
-        the value of the <envar>PGCTLTIMEOUT</> environment variable or, if
+        the value of the <envar>PGCTLTIMEOUT</envar> environment variable or, if
         not set, to 60 seconds.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
        <listitem>
         <para>
          Print the <application>pg_ctl</application> version and exit.
@@ -405,10 +405,12 @@ PostgreSQL documentation
        </para>
 
        <para>
-        When waiting for startup, <command>pg_ctl</command> repeatedly
-        attempts to connect to the server.
-        When waiting for shutdown, <command>pg_ctl</command> waits for
-        the server to remove its <acronym>PID</acronym> file.
+        When waiting, <command>pg_ctl</command> repeatedly checks the
+        server's <acronym>PID</acronym> file, sleeping for a short amount
+        of time between checks.  Startup is considered complete when
+        the <acronym>PID</acronym> file indicates that the server is ready to
+        accept connections.  Shutdown is considered complete when the server
+        removes the <acronym>PID</acronym> file.
         <command>pg_ctl</command> returns an exit code based on the
         success of the startup or shutdown.
        </para>
@@ -446,8 +448,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_ctl</application> command line
@@ -475,7 +477,7 @@ PostgreSQL documentation
        default is <literal>PostgreSQL</literal>.  Note that this only controls
        messages sent from <application>pg_ctl</application> itself; once
        started, the server will use the event source specified
-       by its <xref linkend="guc-event-source"> parameter.  Should the server
+       by its <xref linkend="guc-event-source"/> parameter.  Should the server
        fail very early in startup, before that parameter has been set,
        it might also log using the default event
        source name <literal>PostgreSQL</literal>.
@@ -507,7 +509,7 @@ PostgreSQL documentation
      <term><option>-S <replaceable class="parameter">start-type</replaceable></option></term>
      <listitem>
       <para>
-       Start type of the system service.  <replaceable>start-type</> can
+       Start type of the system service.  <replaceable>start-type</replaceable> can
        be <literal>auto</literal>, or <literal>demand</literal>, or
        the first letter of one of these two. If this option is omitted,
        <literal>auto</literal> is the default.
@@ -559,20 +561,20 @@ PostgreSQL documentation
 
   <para>
    Most <command>pg_ctl</command> modes require knowing the data directory
-   location; therefore, the <option>-D</> option is required
+   location; therefore, the <option>-D</option> option is required
    unless <envar>PGDATA</envar> is set.
   </para>
 
   <para>
-   <command>pg_ctl</command>, like most other <productname>PostgreSQL</>
+   <command>pg_ctl</command>, like most other <productname>PostgreSQL</productname>
    utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
   <para>
    For additional variables that affect the server,
-   see <xref linkend="app-postgres">.
+   see <xref linkend="app-postgres"/>.
   </para>
  </refsect1>
 
@@ -610,10 +612,10 @@ PostgreSQL documentation
  </refsect1>
 
 
- <refsect1 id="R1-APP-PGCTL-2">
+ <refsect1 id="r1-app-pgctl-2">
   <title>Examples</title>
 
-  <refsect2 id="R2-APP-PGCTL-3">
+  <refsect2 id="r2-app-pgctl-3">
    <title>Starting the Server</title>
 
    <para>
@@ -632,7 +634,7 @@ PostgreSQL documentation
 </screen></para>
   </refsect2>
 
-  <refsect2 id="R2-APP-PGCTL-4">
+  <refsect2 id="r2-app-pgctl-4">
    <title>Stopping the Server</title>
    <para>
     To stop the server, use:
@@ -646,7 +648,7 @@ PostgreSQL documentation
 </screen></para>
   </refsect2>
 
-  <refsect2 id="R2-APP-PGCTL-5">
+  <refsect2 id="r2-app-pgctl-5">
    <title>Restarting the Server</title>
 
    <para>
@@ -661,14 +663,14 @@ PostgreSQL documentation
    </para>
 
    <para>
-    But if <option>-o</> is specified, that replaces any previous options.
-    To restart using port 5433, disabling <function>fsync</> upon restart:
+    But if <option>-o</option> is specified, that replaces any previous options.
+    To restart using port 5433, disabling <function>fsync</function> upon restart:
 <screen>
 <prompt>$</prompt> <userinput>pg_ctl -o "-F -p 5433" restart</userinput>
 </screen></para>
   </refsect2>
 
-  <refsect2 id="R2-APP-PGCTL-6">
+  <refsect2 id="r2-app-pgctl-6">
    <title>Showing the Server Status</title>
 
    <para>
@@ -691,8 +693,8 @@ pg_ctl: server is running (PID: 13718)
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-initdb"></member>
-   <member><xref linkend="app-postgres"></member>
+   <member><xref linkend="app-initdb"/></member>
+   <member><xref linkend="app-postgres"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_dump.sgml b/doc/src/sgml/ref/pg_dump.sgml
index 7ccbee4855..50809b4844 100644
--- a/doc/src/sgml/ref/pg_dump.sgml
+++ b/doc/src/sgml/ref/pg_dump.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/pg_dump.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-PGDUMP">
+<refentry id="app-pgdump">
  <indexterm zone="app-pgdump">
   <primary>pg_dump</primary>
  </indexterm>
@@ -46,9 +46,10 @@ PostgreSQL documentation
   </para>
 
   <para>
-   <application>pg_dump</application> only dumps a single database.  To backup
-   global objects that are common to all databases in a cluster, such as roles
-   and tablespaces, use <xref linkend="app-pg-dumpall">.
+   <application>pg_dump</application> only dumps a single database.
+   To back up an entire cluster, or to back up global objects that are
+   common to all databases in a cluster (such as roles and tablespaces),
+   use <xref linkend="app-pg-dumpall"/>.
   </para>
 
   <para>
@@ -56,7 +57,7 @@ PostgreSQL documentation
    dumps are plain-text files containing the SQL commands required
    to reconstruct the database to the state it was in at the time it was
    saved. To restore from such a script, feed it to <xref
-   linkend="app-psql">. Script files
+   linkend="app-psql"/>. Script files
    can be used to reconstruct the database even on other machines and
    other architectures; with some modifications, even on other SQL
    database products.
@@ -64,7 +65,7 @@ PostgreSQL documentation
 
   <para>
    The alternative archive file formats must be used with
-   <xref linkend="app-pgrestore"> to rebuild the database.  They
+   <xref linkend="app-pgrestore"/> to rebuild the database.  They
    allow <application>pg_restore</application> to be selective about
    what is restored, or even to reorder the items prior to being
    restored.
@@ -116,8 +117,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-a</></term>
-      <term><option>--data-only</></term>
+      <term><option>-a</option></term>
+      <term><option>--data-only</option></term>
       <listitem>
        <para>
         Dump only the data, not the schema (data definitions).
@@ -126,39 +127,40 @@ PostgreSQL documentation
 
        <para>
         This option is similar to, but for historical reasons not identical
-        to, specifying <option>--section=data</>.
+        to, specifying <option>--section=data</option>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-b</></term>
-      <term><option>--blobs</></term>
+      <term><option>-b</option></term>
+      <term><option>--blobs</option></term>
       <listitem>
        <para>
         Include large objects in the dump.  This is the default behavior
-        except when <option>--schema</>, <option>--table</>, or
-        <option>--schema-only</> is specified.  The <option>-b</>
+        except when <option>--schema</option>, <option>--table</option>, or
+        <option>--schema-only</option> is specified.  The <option>-b</option>
         switch is therefore only useful to add large objects to dumps
         where a specific schema or table has been requested.  Note that
         blobs are considered data and therefore will be included when
-        --data-only is used, but not when --schema-only is.
+        <option>--data-only</option> is used, but not
+        when <option>--schema-only</option> is.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-B</></term>
-      <term><option>--no-blobs</></term>
+      <term><option>-B</option></term>
+      <term><option>--no-blobs</option></term>
       <listitem>
        <para>
         Exclude large objects in the dump.
        </para>
 
        <para>
-        When both <option>-b</> and <option>-B</> are given, the behavior
+        When both <option>-b</option> and <option>-B</option> are given, the behavior
         is to output large objects, when data is being dumped, see the
-        <option>-b</> documentation.
+        <option>-b</option> documentation.
        </para>
       </listitem>
      </varlistentry>
@@ -170,7 +172,7 @@ PostgreSQL documentation
        <para>
         Output commands to clean (drop)
         database objects prior to outputting the commands for creating them.
-        (Unless <option>--if-exists</> is also specified,
+        (Unless <option>--if-exists</option> is also specified,
         restore might generate some harmless error messages, if any objects
         were not present in the destination database.)
        </para>
@@ -184,8 +186,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-C</></term>
-      <term><option>--create</></term>
+      <term><option>-C</option></term>
+      <term><option>--create</option></term>
       <listitem>
        <para>
         Begin the output with a command to create the
@@ -196,6 +198,17 @@ PostgreSQL documentation
         recreates the target database before reconnecting to it.
        </para>
 
+       <para>
+        With <option>--create</option>, the output also includes the
+        database's comment if any, and any configuration variable settings
+        that are specific to this database, that is,
+        any <command>ALTER DATABASE ... SET ...</command>
+        and <command>ALTER ROLE ... IN DATABASE ... SET ...</command>
+        commands that mention this database.
+        Access privileges for the database itself are also dumped,
+        unless <option>--no-acl</option> is specified.
+       </para>
+
        <para>
         This option is only meaningful for the plain-text format.  For
         the archive formats, you can specify the option when you
@@ -242,8 +255,8 @@ PostgreSQL documentation
 
        <variablelist>
         <varlistentry>
-         <term><literal>p</></term>
-         <term><literal>plain</></term>
+         <term><literal>p</literal></term>
+         <term><literal>plain</literal></term>
          <listitem>
           <para>
            Output a plain-text <acronym>SQL</acronym> script file (the default).
@@ -252,8 +265,8 @@ PostgreSQL documentation
         </varlistentry>
 
         <varlistentry>
-         <term><literal>c</></term>
-         <term><literal>custom</></term>
+         <term><literal>c</literal></term>
+         <term><literal>custom</literal></term>
          <listitem>
           <para>
            Output a custom-format archive suitable for input into
@@ -267,8 +280,8 @@ PostgreSQL documentation
         </varlistentry>
 
         <varlistentry>
-         <term><literal>d</></term>
-         <term><literal>directory</></term>
+         <term><literal>d</literal></term>
+         <term><literal>directory</literal></term>
          <listitem>
           <para>
            Output a directory-format archive suitable for input into
@@ -286,8 +299,8 @@ PostgreSQL documentation
         </varlistentry>
 
         <varlistentry>
-         <term><literal>t</></term>
-         <term><literal>tar</></term>
+         <term><literal>t</literal></term>
+         <term><literal>tar</literal></term>
          <listitem>
           <para>
            Output a <command>tar</command>-format archive suitable for input
@@ -305,8 +318,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-j <replaceable class="parameter">njobs</replaceable></></term>
-      <term><option>--jobs=<replaceable class="parameter">njobs</replaceable></></term>
+      <term><option>-j <replaceable class="parameter">njobs</replaceable></option></term>
+      <term><option>--jobs=<replaceable class="parameter">njobs</replaceable></option></term>
       <listitem>
        <para>
         Run the dump in parallel by dumping <replaceable class="parameter">njobs</replaceable>
@@ -315,13 +328,13 @@ PostgreSQL documentation
         directory output format because this is the only output format where multiple processes
         can write their data at the same time.
        </para>
-       <para><application>pg_dump</> will open <replaceable class="parameter">njobs</replaceable>
-        + 1 connections to the database, so make sure your <xref linkend="guc-max-connections">
+       <para><application>pg_dump</application> will open <replaceable class="parameter">njobs</replaceable>
+        + 1 connections to the database, so make sure your <xref linkend="guc-max-connections"/>
         setting is high enough to accommodate all connections.
        </para>
        <para>
         Requesting exclusive locks on database objects while running a parallel dump could
-        cause the dump to fail. The reason is that the <application>pg_dump</> master process
+        cause the dump to fail. The reason is that the <application>pg_dump</application> master process
         requests shared locks on the objects that the worker processes are going to dump later
         in order to
         make sure that nobody deletes them and makes them go away while the dump is running.
@@ -330,10 +343,10 @@ PostgreSQL documentation
         released. Consequently any other access to the table will not be granted either and
         will queue after the exclusive lock request. This includes the worker process trying
         to dump the table. Without any precautions this would be a classic deadlock situation.
-        To detect this conflict, the <application>pg_dump</> worker process requests another
-        shared lock using the <literal>NOWAIT</> option. If the worker process is not granted
+        To detect this conflict, the <application>pg_dump</application> worker process requests another
+        shared lock using the <literal>NOWAIT</literal> option. If the worker process is not granted
         this shared lock, somebody else must have requested an exclusive lock in the meantime
-        and there is no way to continue with the dump, so <application>pg_dump</> has no choice
+        and there is no way to continue with the dump, so <application>pg_dump</application> has no choice
         but to abort the dump.
        </para>
        <para>
@@ -371,20 +384,20 @@ PostgreSQL documentation
         schema itself, and all its contained objects.  When this option is
         not specified, all non-system schemas in the target database will be
         dumped.  Multiple schemas can be
-        selected by writing multiple <option>-n</> switches.  Also, the
+        selected by writing multiple <option>-n</option> switches.  Also, the
         <replaceable class="parameter">schema</replaceable> parameter is
         interpreted as a pattern according to the same rules used by
-        <application>psql</>'s <literal>\d</> commands (see <xref
-        linkend="APP-PSQL-patterns" endterm="APP-PSQL-patterns-title">),
+        <application>psql</application>'s <literal>\d</literal> commands (see <xref
+        linkend="app-psql-patterns" endterm="app-psql-patterns-title"/>),
         so multiple schemas can also be selected by writing wildcard characters
         in the pattern.  When using wildcards, be careful to quote the pattern
         if needed to prevent the shell from expanding the wildcards;  see
-        <xref linkend="pg-dump-examples" endterm="pg-dump-examples-title">.
+        <xref linkend="pg-dump-examples" endterm="pg-dump-examples-title"/>.
        </para>
 
        <note>
         <para>
-         When <option>-n</> is specified, <application>pg_dump</application>
+         When <option>-n</option> is specified, <application>pg_dump</application>
          makes no attempt to dump any other database objects that the selected
          schema(s) might depend upon. Therefore, there is no guarantee
          that the results of a specific-schema dump can be successfully
@@ -394,9 +407,9 @@ PostgreSQL documentation
 
        <note>
         <para>
-         Non-schema objects such as blobs are not dumped when <option>-n</> is
+         Non-schema objects such as blobs are not dumped when <option>-n</option> is
          specified.  You can add blobs back to the dump with the
-         <option>--blobs</> switch.
+         <option>--blobs</option> switch.
         </para>
        </note>
 
@@ -410,29 +423,29 @@ PostgreSQL documentation
        <para>
         Do not dump any schemas matching the <replaceable
         class="parameter">schema</replaceable> pattern.  The pattern is
-        interpreted according to the same rules as for <option>-n</>.
-        <option>-N</> can be given more than once to exclude schemas
+        interpreted according to the same rules as for <option>-n</option>.
+        <option>-N</option> can be given more than once to exclude schemas
         matching any of several patterns.
        </para>
 
        <para>
-        When both <option>-n</> and <option>-N</> are given, the behavior
-        is to dump just the schemas that match at least one <option>-n</>
-        switch but no <option>-N</> switches.  If <option>-N</> appears
-        without <option>-n</>, then schemas matching <option>-N</> are
+        When both <option>-n</option> and <option>-N</option> are given, the behavior
+        is to dump just the schemas that match at least one <option>-n</option>
+        switch but no <option>-N</option> switches.  If <option>-N</option> appears
+        without <option>-n</option>, then schemas matching <option>-N</option> are
         excluded from what is otherwise a normal dump.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-o</></term>
-      <term><option>--oids</></term>
+      <term><option>-o</option></term>
+      <term><option>--oids</option></term>
       <listitem>
        <para>
         Dump object identifiers (<acronym>OID</acronym>s) as part of the
         data for every table.  Use this option if your application references
-        the <acronym>OID</>
+        the <acronym>OID</acronym>
         columns in some way (e.g., in a foreign key constraint).
         Otherwise, this option should not be used.
        </para>
@@ -440,21 +453,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-O</></term>
+      <term><option>-O</option></term>
       <term><option>--no-owner</option></term>
       <listitem>
        <para>
         Do not output commands to set
         ownership of objects to match the original database.
         By default, <application>pg_dump</application> issues
-        <command>ALTER OWNER</> or
+        <command>ALTER OWNER</command> or
         <command>SET SESSION AUTHORIZATION</command>
         statements to set ownership of created database objects.
         These statements
         will fail when the script is run unless it is started by a superuser
         (or the same user that owns all of the objects in the script).
         To make a script that can be restored by any user, but will give
-        that user ownership of all the objects, specify <option>-O</>.
+        that user ownership of all the objects, specify <option>-O</option>.
        </para>
 
        <para>
@@ -484,18 +497,18 @@ PostgreSQL documentation
         Dump only the object definitions (schema), not data.
        </para>
        <para>
-        This option is the inverse of <option>--data-only</>.
+        This option is the inverse of <option>--data-only</option>.
         It is similar to, but for historical reasons not identical to,
         specifying
-        <option>--section=pre-data --section=post-data</>.
+        <option>--section=pre-data --section=post-data</option>.
        </para>
        <para>
-        (Do not confuse this with the <option>--schema</> option, which
-        uses the word <quote>schema</> in a different meaning.)
+        (Do not confuse this with the <option>--schema</option> option, which
+        uses the word <quote>schema</quote> in a different meaning.)
        </para>
        <para>
         To exclude table data for only a subset of tables in the database,
-        see <option>--exclude-table-data</>.
+        see <option>--exclude-table-data</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -506,7 +519,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specify the superuser user name to use when disabling triggers.
-        This is relevant only if <option>--disable-triggers</> is used.
+        This is relevant only if <option>--disable-triggers</option> is used.
         (Usually, it's better to leave this out, and instead start the
         resulting script as superuser.)
        </para>
@@ -520,29 +533,29 @@ PostgreSQL documentation
        <para>
         Dump only tables with names matching
         <replaceable class="parameter">table</replaceable>.
-        For this purpose, <quote>table</> includes views, materialized views,
+        For this purpose, <quote>table</quote> includes views, materialized views,
         sequences, and foreign tables.  Multiple tables
-        can be selected by writing multiple <option>-t</> switches.  Also, the
+        can be selected by writing multiple <option>-t</option> switches.  Also, the
         <replaceable class="parameter">table</replaceable> parameter is
         interpreted as a pattern according to the same rules used by
-        <application>psql</>'s <literal>\d</> commands (see <xref
-        linkend="APP-PSQL-patterns" endterm="APP-PSQL-patterns-title">),
+        <application>psql</application>'s <literal>\d</literal> commands (see <xref
+        linkend="app-psql-patterns" endterm="app-psql-patterns-title"/>),
         so multiple tables can also be selected by writing wildcard characters
         in the pattern.  When using wildcards, be careful to quote the pattern
         if needed to prevent the shell from expanding the wildcards;  see
-        <xref linkend="pg-dump-examples" endterm="pg-dump-examples-title">.
+        <xref linkend="pg-dump-examples" endterm="pg-dump-examples-title"/>.
        </para>
 
        <para>
-        The <option>-n</> and <option>-N</> switches have no effect when
-        <option>-t</> is used, because tables selected by <option>-t</> will
+        The <option>-n</option> and <option>-N</option> switches have no effect when
+        <option>-t</option> is used, because tables selected by <option>-t</option> will
         be dumped regardless of those switches, and non-table objects will not
         be dumped.
        </para>
 
        <note>
         <para>
-         When <option>-t</> is specified, <application>pg_dump</application>
+         When <option>-t</option> is specified, <application>pg_dump</application>
          makes no attempt to dump any other database objects that the selected
          table(s) might depend upon. Therefore, there is no guarantee
          that the results of a specific-table dump can be successfully
@@ -552,14 +565,14 @@ PostgreSQL documentation
 
        <note>
         <para>
-         The behavior of the <option>-t</> switch is not entirely upward
+         The behavior of the <option>-t</option> switch is not entirely upward
          compatible with pre-8.2 <productname>PostgreSQL</productname>
-         versions.  Formerly, writing <literal>-t tab</> would dump all
-         tables named <literal>tab</>, but now it just dumps whichever one
+         versions.  Formerly, writing <literal>-t tab</literal> would dump all
+         tables named <literal>tab</literal>, but now it just dumps whichever one
          is visible in your default search path.  To get the old behavior
-         you can write <literal>-t '*.tab'</>.  Also, you must write something
-         like <literal>-t sch.tab</> to select a table in a particular schema,
-         rather than the old locution of <literal>-n sch -t tab</>.
+         you can write <literal>-t '*.tab'</literal>.  Also, you must write something
+         like <literal>-t sch.tab</literal> to select a table in a particular schema,
+         rather than the old locution of <literal>-n sch -t tab</literal>.
         </para>
        </note>
       </listitem>
@@ -572,24 +585,24 @@ PostgreSQL documentation
        <para>
         Do not dump any tables matching the <replaceable
         class="parameter">table</replaceable> pattern.  The pattern is
-        interpreted according to the same rules as for <option>-t</>.
-        <option>-T</> can be given more than once to exclude tables
+        interpreted according to the same rules as for <option>-t</option>.
+        <option>-T</option> can be given more than once to exclude tables
         matching any of several patterns.
        </para>
 
        <para>
-        When both <option>-t</> and <option>-T</> are given, the behavior
-        is to dump just the tables that match at least one <option>-t</>
-        switch but no <option>-T</> switches.  If <option>-T</> appears
-        without <option>-t</>, then tables matching <option>-T</> are
+        When both <option>-t</option> and <option>-T</option> are given, the behavior
+        is to dump just the tables that match at least one <option>-t</option>
+        switch but no <option>-T</option> switches.  If <option>-T</option> appears
+        without <option>-t</option>, then tables matching <option>-T</option> are
         excluded from what is otherwise a normal dump.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-v</></term>
-      <term><option>--verbose</></term>
+      <term><option>-v</option></term>
+      <term><option>--verbose</option></term>
       <listitem>
        <para>
         Specifies verbose mode.  This will cause
@@ -601,8 +614,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_dump</application> version and exit.
@@ -611,9 +624,9 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-x</></term>
-      <term><option>--no-privileges</></term>
-      <term><option>--no-acl</></term>
+      <term><option>-x</option></term>
+      <term><option>--no-privileges</option></term>
+      <term><option>--no-acl</option></term>
       <listitem>
        <para>
         Prevent dumping of access privileges (grant/revoke commands).
@@ -632,7 +645,7 @@ PostgreSQL documentation
         at a moderate level.
         For plain text output, setting a nonzero compression level causes
         the entire output file to be compressed, as though it had been
-        fed through <application>gzip</>; but the default is not to compress.
+        fed through <application>gzip</application>; but the default is not to compress.
         The tar archive format currently does not support compression at all.
        </para>
       </listitem>
@@ -670,7 +683,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--disable-dollar-quoting</></term>
+      <term><option>--disable-dollar-quoting</option></term>
       <listitem>
        <para>
         This option disables the use of dollar quoting for function bodies,
@@ -680,7 +693,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--disable-triggers</></term>
+      <term><option>--disable-triggers</option></term>
       <listitem>
        <para>
         This option is relevant only when creating a data-only dump.
@@ -692,9 +705,9 @@ PostgreSQL documentation
        </para>
 
        <para>
-        Presently, the commands emitted for <option>--disable-triggers</>
+        Presently, the commands emitted for <option>--disable-triggers</option>
         must be done as superuser.  So, you should also specify
-        a superuser name with <option>-S</>, or preferably be careful to
+        a superuser name with <option>-S</option>, or preferably be careful to
         start the resulting script as a superuser.
        </para>
 
@@ -707,16 +720,16 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--enable-row-security</></term>
+      <term><option>--enable-row-security</option></term>
       <listitem>
        <para>
         This option is relevant only when dumping the contents of a table
         which has row security.  By default, <application>pg_dump</application> will set
-        <xref linkend="guc-row-security"> to off, to ensure
+        <xref linkend="guc-row-security"/> to off, to ensure
         that all data is dumped from the table.  If the user does not have
         sufficient privileges to bypass row security, then an error is thrown.
         This parameter instructs <application>pg_dump</application> to set
-        <xref linkend="guc-row-security"> to on instead, allowing the user
+        <xref linkend="guc-row-security"/> to on instead, allowing the user
         to dump the parts of the contents of the table that they have access to.
        </para>
 
@@ -734,14 +747,14 @@ PostgreSQL documentation
        <para>
         Do not dump data for any tables matching the <replaceable
         class="parameter">table</replaceable> pattern. The pattern is
-        interpreted according to the same rules as for <option>-t</>.
-        <option>--exclude-table-data</> can be given more than once to
+        interpreted according to the same rules as for <option>-t</option>.
+        <option>--exclude-table-data</option> can be given more than once to
         exclude tables matching any of several patterns. This option is
         useful when you need the definition of a particular table even
         though you do not need the data in it.
        </para>
        <para>
-        To exclude data for all tables in the database, see <option>--schema-only</>.
+        To exclude data for all tables in the database, see <option>--schema-only</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -752,7 +765,7 @@ PostgreSQL documentation
        <para>
         Use conditional commands (i.e. add an <literal>IF EXISTS</literal>
         clause) when cleaning database objects.  This option is not valid
-        unless <option>--clean</> is also specified.
+        unless <option>--clean</option> is also specified.
        </para>
       </listitem>
      </varlistentry>
@@ -782,15 +795,24 @@ PostgreSQL documentation
        <para>
         Do not wait forever to acquire shared table locks at the beginning of
         the dump. Instead fail if unable to lock a table within the specified
-        <replaceable class="parameter">timeout</>. The timeout may be
+        <replaceable class="parameter">timeout</replaceable>. The timeout may be
         specified in any of the formats accepted by <command>SET
-        statement_timeout</>.  (Allowed formats vary depending on the server
+        statement_timeout</command>.  (Allowed formats vary depending on the server
         version you are dumping from, but an integer number of milliseconds
         is accepted by all versions.)
        </para>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--no-comments</option></term>
+      <listitem>
+       <para>
+        Do not dump comments.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-publications</option></term>
       <listitem>
@@ -833,10 +855,10 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--no-synchronized-snapshots</></term>
+      <term><option>--no-synchronized-snapshots</option></term>
       <listitem>
        <para>
-        This option allows running <command>pg_dump -j</> against a pre-9.2
+        This option allows running <command>pg_dump -j</command> against a pre-9.2
         server, see the documentation of the <option>-j</option> parameter
         for more details.
        </para>
@@ -873,25 +895,25 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--quote-all-identifiers</></term>
+      <term><option>--quote-all-identifiers</option></term>
       <listitem>
        <para>
         Force quoting of all identifiers.  This option is recommended when
-        dumping a database from a server whose <productname>PostgreSQL</>
-        major version is different from <application>pg_dump</>'s, or when
+        dumping a database from a server whose <productname>PostgreSQL</productname>
+        major version is different from <application>pg_dump</application>'s, or when
         the output is intended to be loaded into a server of a different
-        major version.  By default, <application>pg_dump</> quotes only
+        major version.  By default, <application>pg_dump</application> quotes only
         identifiers that are reserved words in its own major version.
         This sometimes results in compatibility issues when dealing with
         servers of other versions that may have slightly different sets
-        of reserved words.  Using <option>--quote-all-identifiers</> prevents
+        of reserved words.  Using <option>--quote-all-identifiers</option> prevents
         such issues, at the price of a harder-to-read dump script.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--load-via-partition-root</></term>
+      <term><option>--load-via-partition-root</option></term>
       <listitem>
        <para>
         When dumping a COPY or INSERT statement for a partitioned table,
@@ -910,7 +932,7 @@ PostgreSQL documentation
        <listitem>
          <para>
           Only dump the named section. The section name can be
-          <option>pre-data</>, <option>data</>, or <option>post-data</>.
+          <option>pre-data</option>, <option>data</option>, or <option>post-data</option>.
           This option can be specified more than once to select multiple
           sections. The default is to dump all sections.
          </para>
@@ -933,7 +955,7 @@ PostgreSQL documentation
         states; but do this by waiting for a point in the transaction stream
         at which no anomalies can be present, so that there isn't a risk of
         the dump failing or causing other transactions to roll back with a
-        <literal>serialization_failure</literal>.  See <xref linkend="mvcc">
+        <literal>serialization_failure</literal>.  See <xref linkend="mvcc"/>
         for more information about transaction isolation and concurrency
         control.
        </para>
@@ -965,12 +987,12 @@ PostgreSQL documentation
          <para>
           Use the specified synchronized snapshot when making a dump of the
           database (see
-          <xref linkend="functions-snapshot-synchronization-table"> for more
+          <xref linkend="functions-snapshot-synchronization-table"/> for more
           details).
          </para>
          <para>
           This option is useful when needing to synchronize the dump with
-          a logical replication slot (see <xref linkend="logicaldecoding">)
+          a logical replication slot (see <xref linkend="logicaldecoding"/>)
           or with a concurrent session.
          </para>
          <para>
@@ -981,7 +1003,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--strict-names</></term>
+      <term><option>--strict-names</option></term>
       <listitem>
        <para>
         Require that each schema
@@ -1003,23 +1025,23 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--use-set-session-authorization</></term>
+      <term><option>--use-set-session-authorization</option></term>
       <listitem>
        <para>
-        Output SQL-standard <command>SET SESSION AUTHORIZATION</> commands
-        instead of <command>ALTER OWNER</> commands to determine object
+        Output SQL-standard <command>SET SESSION AUTHORIZATION</command> commands
+        instead of <command>ALTER OWNER</command> commands to determine object
         ownership.  This makes the dump more standards-compatible, but
         depending on the history of the objects in the dump, might not restore
-        properly.  Also, a dump using <command>SET SESSION AUTHORIZATION</>
+        properly.  Also, a dump using <command>SET SESSION AUTHORIZATION</command>
         will certainly require superuser privileges to restore correctly,
-        whereas <command>ALTER OWNER</> requires lesser privileges.
+        whereas <command>ALTER OWNER</command> requires lesser privileges.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>pg_dump</application> command line
@@ -1036,8 +1058,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>-d <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
       <para>
        Specifies the name of the database to connect to. This is
@@ -1050,7 +1072,7 @@ PostgreSQL documentation
        with a valid <acronym>URI</acronym> prefix
        (<literal>postgresql://</literal>
        or <literal>postgres://</literal>), it is treated as a
-       <parameter>conninfo</parameter> string. See <xref linkend="libpq-connect"> for more information.
+       <parameter>conninfo</parameter> string. See <xref linkend="libpq-connect"/> for more information.
       </para>
       </listitem>
      </varlistentry>
@@ -1093,8 +1115,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -1122,7 +1144,7 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>pg_dump</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -1133,11 +1155,11 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies a role name to be used to create the dump.
-        This option causes <application>pg_dump</> to issue a
-        <command>SET ROLE</> <replaceable class="parameter">rolename</>
+        This option causes <application>pg_dump</application> to issue a
+        <command>SET ROLE</command> <replaceable class="parameter">rolename</replaceable>
         command after connecting to the database. It is useful when the
-        authenticated user (specified by <option>-U</>) lacks privileges
-        needed by <application>pg_dump</>, but can switch to a role with
+        authenticated user (specified by <option>-U</option>) lacks privileges
+        needed by <application>pg_dump</application>, but can switch to a role with
         the required rights.  Some installations have a policy against
         logging in directly as a superuser, and use of this option allows
         dumps to be made without violating the policy.
@@ -1169,9 +1191,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -1184,7 +1206,7 @@ PostgreSQL documentation
    <command>SELECT</command> statements. If you have problems running
    <application>pg_dump</application>, make sure you are able to
    select information from the database using, for example, <xref
-   linkend="app-psql">.  Also, any default connection settings and environment
+   linkend="app-psql"/>.  Also, any default connection settings and environment
    variables used by the <application>libpq</application> front-end
    library will apply.
   </para>
@@ -1192,7 +1214,7 @@ PostgreSQL documentation
   <para>
    The database activity of <application>pg_dump</application> is
    normally collected by the statistics collector.  If this is
-   undesirable, you can set parameter <varname>track_counts</>
+   undesirable, you can set parameter <varname>track_counts</varname>
    to false via <envar>PGOPTIONS</envar> or the <literal>ALTER
    USER</literal> command.
   </para>
@@ -1204,11 +1226,11 @@ PostgreSQL documentation
   <title>Notes</title>
 
   <para>
-   If your database cluster has any local additions to the <literal>template1</> database,
+   If your database cluster has any local additions to the <literal>template1</literal> database,
    be careful to restore the output of <application>pg_dump</application> into a
    truly empty database; otherwise you are likely to get errors due to
    duplicate definitions of the added objects.  To make an empty database
-   without any local additions, copy from <literal>template0</> not <literal>template1</>,
+   without any local additions, copy from <literal>template0</literal> not <literal>template1</literal>,
    for example:
 <programlisting>
 CREATE DATABASE foo WITH TEMPLATE template0;
@@ -1216,7 +1238,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   When a data-only dump is chosen and the option <option>--disable-triggers</>
+   When a data-only dump is chosen and the option <option>--disable-triggers</option>
    is used, <application>pg_dump</application> emits commands
    to disable triggers on user tables before inserting the data,
    and then commands to re-enable them after the data has been
@@ -1229,33 +1251,29 @@ CREATE DATABASE foo WITH TEMPLATE template0;
    does not contain the statistics used by the optimizer to make
    query planning decisions.  Therefore, it is wise to run
    <command>ANALYZE</command> after restoring from a dump file
-   to ensure optimal performance; see <xref linkend="vacuum-for-statistics">
-   and <xref linkend="autovacuum"> for more information.
-   The dump file also does not
-   contain any <command>ALTER DATABASE ... SET</> commands;
-   these settings are dumped by <xref linkend="app-pg-dumpall">,
-   along with database users and other installation-wide settings.
+   to ensure optimal performance; see <xref linkend="vacuum-for-statistics"/>
+   and <xref linkend="autovacuum"/> for more information.
   </para>
 
   <para>
    Because <application>pg_dump</application> is used to transfer data
-   to newer versions of <productname>PostgreSQL</>, the output of
+   to newer versions of <productname>PostgreSQL</productname>, the output of
    <application>pg_dump</application> can be expected to load into
-   <productname>PostgreSQL</> server versions newer than
-   <application>pg_dump</>'s version.  <application>pg_dump</> can also
-   dump from <productname>PostgreSQL</> servers older than its own version.
+   <productname>PostgreSQL</productname> server versions newer than
+   <application>pg_dump</application>'s version.  <application>pg_dump</application> can also
+   dump from <productname>PostgreSQL</productname> servers older than its own version.
    (Currently, servers back to version 8.0 are supported.)
-   However, <application>pg_dump</> cannot dump from
-   <productname>PostgreSQL</> servers newer than its own major version;
+   However, <application>pg_dump</application> cannot dump from
+   <productname>PostgreSQL</productname> servers newer than its own major version;
    it will refuse to even try, rather than risk making an invalid dump.
-   Also, it is not guaranteed that <application>pg_dump</>'s output can
+   Also, it is not guaranteed that <application>pg_dump</application>'s output can
    be loaded into a server of an older major version &mdash; not even if the
    dump was taken from a server of that version.  Loading a dump file
    into an older server may require manual editing of the dump file
    to remove syntax not understood by the older server.
    Use of the <option>--quote-all-identifiers</option> option is recommended
    in cross-version cases, as it can prevent problems arising from varying
-   reserved-word lists in different <productname>PostgreSQL</> versions.
+   reserved-word lists in different <productname>PostgreSQL</productname> versions.
   </para>
 
   <para>
@@ -1276,7 +1294,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   <title id="pg-dump-examples-title">Examples</title>
 
   <para>
-   To dump a database called <literal>mydb</> into a SQL-script file:
+   To dump a database called <literal>mydb</literal> into a SQL-script file:
 <screen>
 <prompt>$</prompt> <userinput>pg_dump mydb &gt; db.sql</userinput>
 </screen>
@@ -1284,7 +1302,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
 
   <para>
    To reload such a script into a (freshly created) database named
-   <literal>newdb</>:
+   <literal>newdb</literal>:
 
 <screen>
 <prompt>$</prompt> <userinput>psql -d newdb -f db.sql</userinput>
@@ -1318,7 +1336,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
 
   <para>
    To reload an archive file into a (freshly created) database named
-   <literal>newdb</>:
+   <literal>newdb</literal>:
 
 <screen>
 <prompt>$</prompt> <userinput>pg_restore -d newdb db.dump</userinput>
@@ -1326,7 +1344,16 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   To dump a single table named <literal>mytab</>:
+   To reload an archive file into the same database it was dumped from,
+   discarding the current contents of that database:
+
+<screen>
+<prompt>$</prompt> <userinput>pg_restore -d postgres --clean --create db.dump</userinput>
+</screen>
+  </para>
+
+  <para>
+   To dump a single table named <literal>mytab</literal>:
 
 <screen>
 <prompt>$</prompt> <userinput>pg_dump -t mytab mydb &gt; db.sql</userinput>
@@ -1334,8 +1361,8 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   To dump all tables whose names start with <literal>emp</> in the
-   <literal>detroit</> schema, except for the table named
+   To dump all tables whose names start with <literal>emp</literal> in the
+   <literal>detroit</literal> schema, except for the table named
    <literal>employee_log</literal>:
 
 <screen>
@@ -1344,9 +1371,9 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   To dump all schemas whose names start with <literal>east</> or
-   <literal>west</> and end in <literal>gsm</>, excluding any schemas whose
-   names contain the word <literal>test</>:
+   To dump all schemas whose names start with <literal>east</literal> or
+   <literal>west</literal> and end in <literal>gsm</literal>, excluding any schemas whose
+   names contain the word <literal>test</literal>:
 
 <screen>
 <prompt>$</prompt> <userinput>pg_dump -n 'east*gsm' -n 'west*gsm' -N '*test*' mydb &gt; db.sql</userinput>
@@ -1371,10 +1398,10 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   To specify an upper-case or mixed-case name in <option>-t</> and related
+   To specify an upper-case or mixed-case name in <option>-t</option> and related
    switches, you need to double-quote the name; else it will be folded to
    lower case (see <xref
-   linkend="APP-PSQL-patterns" endterm="APP-PSQL-patterns-title">).  But
+   linkend="app-psql-patterns" endterm="app-psql-patterns-title"/>).  But
    double quotes are special to the shell, so in turn they must be quoted.
    Thus, to dump a single table with a mixed-case name, you need something
    like
@@ -1389,9 +1416,9 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-pg-dumpall"></member>
-   <member><xref linkend="app-pgrestore"></member>
-   <member><xref linkend="app-psql"></member>
+   <member><xref linkend="app-pg-dumpall"/></member>
+   <member><xref linkend="app-pgrestore"/></member>
+   <member><xref linkend="app-psql"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_dumpall.sgml b/doc/src/sgml/ref/pg_dumpall.sgml
index f8a2521743..5d6fe9b87d 100644
--- a/doc/src/sgml/ref/pg_dumpall.sgml
+++ b/doc/src/sgml/ref/pg_dumpall.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/pg_dumpall.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-PG-DUMPALL">
+<refentry id="app-pg-dumpall">
  <indexterm zone="app-pg-dumpall">
   <primary>pg_dumpall</primary>
  </indexterm>
@@ -32,17 +32,14 @@ PostgreSQL documentation
 
   <para>
    <application>pg_dumpall</application> is a utility for writing out
-   (<quote>dumping</quote>) all <productname>PostgreSQL</> databases
+   (<quote>dumping</quote>) all <productname>PostgreSQL</productname> databases
    of a cluster into one script file.  The script file contains
    <acronym>SQL</acronym> commands that can be used as input to <xref
-   linkend="app-psql"> to restore the databases.  It does this by
-   calling <xref linkend="app-pgdump"> for each database in a cluster.
+   linkend="app-psql"/> to restore the databases.  It does this by
+   calling <xref linkend="app-pgdump"/> for each database in the cluster.
    <application>pg_dumpall</application> also dumps global objects
-   that are common to all databases.
+   that are common to all databases, that is, database roles and tablespaces.
    (<application>pg_dump</application> does not save these objects.)
-   This currently includes information about database users and
-   groups, tablespaces, and properties such as access permissions
-   that apply to databases as a whole.
   </para>
 
   <para>
@@ -50,7 +47,7 @@ PostgreSQL documentation
    databases you will most likely have to connect as a database
    superuser in order to produce a complete dump.  Also you will need
    superuser privileges to execute the saved script in order to be
-   allowed to add users and groups, and to create databases.
+   allowed to add roles and create databases.
   </para>
 
   <para>
@@ -63,8 +60,8 @@ PostgreSQL documentation
   times to the <productname>PostgreSQL</productname> server (once per
   database).  If you use password authentication it will ask for
   a password each time. It is convenient to have a
-  <filename>~/.pgpass</> file in such cases. See <xref
-  linkend="libpq-pgpass"> for more information.
+  <filename>~/.pgpass</filename> file in such cases. See <xref
+  linkend="libpq-pgpass"/> for more information.
   </para>
 
  </refsect1>
@@ -78,8 +75,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-a</></term>
-      <term><option>--data-only</></term>
+      <term><option>-a</option></term>
+      <term><option>--data-only</option></term>
       <listitem>
        <para>
         Dump only the data, not the schema (data definitions).
@@ -93,12 +90,25 @@ PostgreSQL documentation
       <listitem>
        <para>
         Include SQL commands to clean (drop) databases before
-        recreating them.  <command>DROP</> commands for roles and
+        recreating them.  <command>DROP</command> commands for roles and
         tablespaces are added as well.
        </para>
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-E <replaceable class="parameter">encoding</replaceable></option></term>
+      <term><option>--encoding=<replaceable class="parameter">encoding</replaceable></option></term>
+      <listitem>
+       <para>
+        Create the dump in the specified character set encoding. By default,
+        the dump is created in the database encoding.  (Another way to get the
+        same result is to set the <envar>PGCLIENTENCODING</envar> environment
+        variable to the desired dump encoding.)
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-f <replaceable class="parameter">filename</replaceable></option></term>
       <term><option>--file=<replaceable class="parameter">filename</replaceable></option></term>
@@ -121,13 +131,13 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-o</></term>
-      <term><option>--oids</></term>
+      <term><option>-o</option></term>
+      <term><option>--oids</option></term>
       <listitem>
        <para>
         Dump object identifiers (<acronym>OID</acronym>s) as part of the
         data for every table.  Use this option if your application references
-        the <acronym>OID</>
+        the <acronym>OID</acronym>
         columns in some way (e.g., in a foreign key constraint).
         Otherwise, this option should not be used.
        </para>
@@ -135,21 +145,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-O</></term>
+      <term><option>-O</option></term>
       <term><option>--no-owner</option></term>
       <listitem>
        <para>
         Do not output commands to set
         ownership of objects to match the original database.
         By default, <application>pg_dumpall</application> issues
-        <command>ALTER OWNER</> or
+        <command>ALTER OWNER</command> or
         <command>SET SESSION AUTHORIZATION</command>
         statements to set ownership of created schema elements.
         These statements
         will fail when the script is run unless it is started by a superuser
         (or the same user that owns all of the objects in the script).
         To make a script that can be restored by any user, but will give
-        that user ownership of all the objects, specify <option>-O</>.
+        that user ownership of all the objects, specify <option>-O</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -180,7 +190,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specify the superuser user name to use when disabling triggers.
-        This is relevant only if <option>--disable-triggers</> is used.
+        This is relevant only if <option>--disable-triggers</option> is used.
         (Usually, it's better to leave this out, and instead start the
         resulting script as superuser.)
        </para>
@@ -198,21 +208,21 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-v</></term>
-      <term><option>--verbose</></term>
+      <term><option>-v</option></term>
+      <term><option>--verbose</option></term>
       <listitem>
        <para>
         Specifies verbose mode.  This will cause
         <application>pg_dumpall</application> to output start/stop
         times to the dump file, and progress messages to standard error.
-        It will also enable verbose output in <application>pg_dump</>.
+        It will also enable verbose output in <application>pg_dump</application>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_dumpall</application> version and exit.
@@ -221,9 +231,9 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-x</></term>
-      <term><option>--no-privileges</></term>
-      <term><option>--no-acl</></term>
+      <term><option>-x</option></term>
+      <term><option>--no-privileges</option></term>
+      <term><option>--no-acl</option></term>
       <listitem>
        <para>
         Prevent dumping of access privileges (grant/revoke commands).
@@ -260,7 +270,7 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--disable-dollar-quoting</></term>
+      <term><option>--disable-dollar-quoting</option></term>
       <listitem>
        <para>
         This option disables the use of dollar quoting for function bodies,
@@ -270,7 +280,7 @@ PostgreSQL documentation
     </varlistentry>
 
      <varlistentry>
-      <term><option>--disable-triggers</></term>
+      <term><option>--disable-triggers</option></term>
       <listitem>
        <para>
         This option is relevant only when creating a data-only dump.
@@ -282,9 +292,9 @@ PostgreSQL documentation
        </para>
 
        <para>
-        Presently, the commands emitted for <option>--disable-triggers</>
+        Presently, the commands emitted for <option>--disable-triggers</option>
         must be done as superuser.  So, you should also specify
-        a superuser name with <option>-S</>, or preferably be careful to
+        a superuser name with <option>-S</option>, or preferably be careful to
         start the resulting script as a superuser.
        </para>
       </listitem>
@@ -295,8 +305,8 @@ PostgreSQL documentation
       <listitem>
        <para>
         Use conditional commands (i.e. add an <literal>IF EXISTS</literal>
-        clause) to clean databases and other objects.  This option is not valid
-        unless <option>--clean</> is also specified.
+        clause) to drop databases and other objects.  This option is not valid
+        unless <option>--clean</option> is also specified.
        </para>
       </listitem>
      </varlistentry>
@@ -322,9 +332,9 @@ PostgreSQL documentation
        <para>
         Do not wait forever to acquire shared table locks at the beginning of
         the dump. Instead, fail if unable to lock a table within the specified
-        <replaceable class="parameter">timeout</>. The timeout may be
+        <replaceable class="parameter">timeout</replaceable>. The timeout may be
         specified in any of the formats accepted by <command>SET
-        statement_timeout</>.  Allowed values vary depending on the server
+        statement_timeout</command>.  Allowed values vary depending on the server
         version you are dumping from, but an integer number of milliseconds
         is accepted by all versions since 7.3.  This option is ignored when
         dumping from a pre-7.3 server.
@@ -332,6 +342,15 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--no-comments</option></term>
+      <listitem>
+       <para>
+        Do not dump comments.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--no-publications</option></term>
       <listitem>
@@ -413,25 +432,25 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--quote-all-identifiers</></term>
+      <term><option>--quote-all-identifiers</option></term>
       <listitem>
        <para>
         Force quoting of all identifiers.  This option is recommended when
-        dumping a database from a server whose <productname>PostgreSQL</>
-        major version is different from <application>pg_dumpall</>'s, or when
+        dumping a database from a server whose <productname>PostgreSQL</productname>
+        major version is different from <application>pg_dumpall</application>'s, or when
         the output is intended to be loaded into a server of a different
-        major version.  By default, <application>pg_dumpall</> quotes only
+        major version.  By default, <application>pg_dumpall</application> quotes only
         identifiers that are reserved words in its own major version.
         This sometimes results in compatibility issues when dealing with
         servers of other versions that may have slightly different sets
-        of reserved words.  Using <option>--quote-all-identifiers</> prevents
+        of reserved words.  Using <option>--quote-all-identifiers</option> prevents
         such issues, at the price of a harder-to-read dump script.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--load-via-partition-root</></term>
+      <term><option>--load-via-partition-root</option></term>
       <listitem>
        <para>
         When dumping a COPY or INSERT statement for a partitioned table,
@@ -446,11 +465,11 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>--use-set-session-authorization</></term>
+      <term><option>--use-set-session-authorization</option></term>
       <listitem>
        <para>
-        Output SQL-standard <command>SET SESSION AUTHORIZATION</> commands
-        instead of <command>ALTER OWNER</> commands to determine object
+        Output SQL-standard <command>SET SESSION AUTHORIZATION</command> commands
+        instead of <command>ALTER OWNER</command> commands to determine object
         ownership.  This makes the dump more standards compatible, but
         depending on the history of the objects in the dump, might not restore
         properly.
@@ -459,8 +478,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>pg_dumpall</application> command line
@@ -482,15 +501,16 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies parameters used to connect to the server, as a connection
-        string. See <xref linkend="libpq-connstring"> for more information.
+        string. See <xref linkend="libpq-connstring"/> for more information.
        </para>
        <para>
-        The option is called <literal>--dbname</> for consistency with other
+        The option is called <literal>--dbname</literal> for consistency with other
         client applications, but because <application>pg_dumpall</application>
-        needs to connect to many databases, database name in the connection
-        string will be ignored. Use <literal>-l</literal> option to specify
-        the name of the database used to dump global objects and to discover
-        what other databases should be dumped.
+        needs to connect to many databases, the database name in the
+        connection string will be ignored.  Use the <literal>-l</literal>
+        option to specify the name of the database used for the initial
+        connection, which will dump global objects and discover what other
+        databases should be dumped.
        </para>
       </listitem>
      </varlistentry>
@@ -546,8 +566,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -575,14 +595,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>pg_dumpall</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
 
        <para>
         Note that the password prompt will occur again for each database
         to be dumped.  Usually, it's better to set up a
-        <filename>~/.pgpass</> file than to rely on manual password entry.
+        <filename>~/.pgpass</filename> file than to rely on manual password entry.
        </para>
       </listitem>
      </varlistentry>
@@ -592,11 +612,11 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies a role name to be used to create the dump.
-        This option causes <application>pg_dumpall</> to issue a
-        <command>SET ROLE</> <replaceable class="parameter">rolename</>
+        This option causes <application>pg_dumpall</application> to issue a
+        <command>SET ROLE</command> <replaceable class="parameter">rolename</replaceable>
         command after connecting to the database. It is useful when the
-        authenticated user (specified by <option>-U</>) lacks privileges
-        needed by <application>pg_dumpall</>, but can switch to a role with
+        authenticated user (specified by <option>-U</option>) lacks privileges
+        needed by <application>pg_dumpall</application>, but can switch to a role with
         the required rights.  Some installations have a policy against
         logging in directly as a superuser, and use of this option allows
         dumps to be made without violating the policy.
@@ -627,9 +647,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -645,12 +665,35 @@ PostgreSQL documentation
   </para>
 
   <para>
-   Once restored, it is wise to run <command>ANALYZE</> on each
+   The <option>--clean</option> option can be useful even when your
+   intention is to restore the dump script into a fresh cluster.  Use of
+   <option>--clean</option> authorizes the script to drop and re-create the
+   built-in <literal>postgres</literal> and <literal>template1</literal>
+   databases, ensuring that those databases will retain the same properties
+   (for instance, locale and encoding) that they had in the source cluster.
+   Without the option, those databases will retain their existing
+   database-level properties, as well as any pre-existing contents.
+  </para>
+
+  <para>
+   Once restored, it is wise to run <command>ANALYZE</command> on each
    database so the optimizer has useful statistics. You
-   can also run <command>vacuumdb -a -z</> to analyze all
+   can also run <command>vacuumdb -a -z</command> to analyze all
    databases.
   </para>
 
+  <para>
+   The dump script should not be expected to run completely without errors.
+   In particular, because the script will issue <command>CREATE ROLE</command>
+   for every role existing in the source cluster, it is certain to get a
+   <quote>role already exists</quote> error for the bootstrap superuser,
+   unless the destination cluster was initialized with a different bootstrap
+   superuser name.  This error is harmless and should be ignored.  Use of
+   the <option>--clean</option> option is likely to produce additional
+   harmless error messages about non-existent objects, although you can
+   minimize those by adding <option>--if-exists</option>.
+  </para>
+
   <para>
    <application>pg_dumpall</application> requires all needed
    tablespace directories to exist before the restore;  otherwise,
@@ -675,10 +718,13 @@ PostgreSQL documentation
 <screen>
 <prompt>$</prompt> <userinput>psql -f db.out postgres</userinput>
 </screen>
-   (It is not important to which database you connect here since the
+   It is not important to which database you connect here since the
    script file created by <application>pg_dumpall</application> will
    contain the appropriate commands to create and connect to the saved
-   databases.)
+   databases.  An exception is that if you specified <option>--clean</option>,
+   you must connect to the <literal>postgres</literal> database initially;
+   the script will attempt to drop other databases immediately, and that
+   will fail for the database you are connected to.
   </para>
  </refsect1>
 
@@ -686,7 +732,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <para>
-    Check <xref linkend="app-pgdump"> for details on possible
+    Check <xref linkend="app-pgdump"/> for details on possible
     error conditions.
   </para>
  </refsect1>
diff --git a/doc/src/sgml/ref/pg_isready.sgml b/doc/src/sgml/ref/pg_isready.sgml
index 2ee79a0bbe..9567b57ebe 100644
--- a/doc/src/sgml/ref/pg_isready.sgml
+++ b/doc/src/sgml/ref/pg_isready.sgml
@@ -43,8 +43,8 @@ PostgreSQL documentation
     <variablelist>
 
     <varlistentry>
-      <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>-d <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
       <para>
        Specifies the name of the database to connect to.
@@ -55,14 +55,14 @@ PostgreSQL documentation
        (<literal>postgresql://</literal>
        or <literal>postgres://</literal>), it is treated as a
        <parameter>conninfo</parameter> string. See <xref
-       linkend="libpq-connstring"> for more information.
+       linkend="libpq-connstring"/> for more information.
       </para>
       </listitem>
     </varlistentry>
 
      <varlistentry>
-       <term><option>-h <replaceable class="parameter">hostname</replaceable></></term>
-       <term><option>--host=<replaceable class="parameter">hostname</replaceable></></term>
+       <term><option>-h <replaceable class="parameter">hostname</replaceable></option></term>
+       <term><option>--host=<replaceable class="parameter">hostname</replaceable></option></term>
        <listitem>
        <para>
        Specifies the host name of the machine on which the
@@ -74,8 +74,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-       <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+       <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+       <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
        <listitem>
        <para>
        Specifies the TCP port or the local Unix-domain
@@ -98,8 +98,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-t <replaceable class="parameter">seconds</replaceable></></term>
-       <term><option>--timeout=<replaceable class="parameter">seconds</replaceable></></term>
+       <term><option>-t <replaceable class="parameter">seconds</replaceable></option></term>
+       <term><option>--timeout=<replaceable class="parameter">seconds</replaceable></option></term>
        <listitem>
        <para>
         The maximum number of seconds to wait when attempting connection before
@@ -110,8 +110,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-       <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+       <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+       <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
        <listitem>
        <para>
        Connect to the database as the user <replaceable
@@ -121,8 +121,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
        <listitem>
         <para>
          Print the <application>pg_isready</application> version and exit.
@@ -131,8 +131,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_isready</application> command line
@@ -159,10 +159,10 @@ PostgreSQL documentation
   <title>Environment</title>
 
   <para>
-   <command>pg_isready</command>, like most other <productname>PostgreSQL</>
+   <command>pg_isready</command>, like most other <productname>PostgreSQL</productname>
    utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_receivewal.sgml b/doc/src/sgml/ref/pg_receivewal.sgml
index 7c82e36c7c..e3f2ce1fcb 100644
--- a/doc/src/sgml/ref/pg_receivewal.sgml
+++ b/doc/src/sgml/ref/pg_receivewal.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>pg_receivewal</command>
-   <arg rep="repeat"><replaceable>option</></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -36,22 +36,22 @@ PostgreSQL documentation
    log is streamed using the streaming replication protocol, and is written
    to a local directory of files. This directory can be used as the archive
    location for doing a restore using point-in-time recovery (see
-   <xref linkend="continuous-archiving">).
+   <xref linkend="continuous-archiving"/>).
   </para>
 
   <para>
    <application>pg_receivewal</application> streams the write-ahead
    log in real time as it's being generated on the server, and does not wait
-   for segments to complete like <xref linkend="guc-archive-command"> does.
+   for segments to complete like <xref linkend="guc-archive-command"/> does.
    For this reason, it is not necessary to set
-   <xref linkend="guc-archive-timeout"> when using
+   <xref linkend="guc-archive-timeout"/> when using
     <application>pg_receivewal</application>.
   </para>
 
   <para>
-   Unlike the WAL receiver of a PostgreSQL standby server, <application>pg_receivewal</>
+   Unlike the WAL receiver of a PostgreSQL standby server, <application>pg_receivewal</application>
    by default flushes WAL data only when a WAL file is closed.
-   The option <option>--synchronous</> must be specified to flush WAL data
+   The option <option>--synchronous</option> must be specified to flush WAL data
    in real time.
   </para>
 
@@ -60,9 +60,9 @@ PostgreSQL documentation
    <productname>PostgreSQL</productname> connection and uses the replication
    protocol. The connection must be made with a superuser or a user
    having <literal>REPLICATION</literal> permissions (see
-   <xref linkend="role-attributes">), and <filename>pg_hba.conf</filename>
+   <xref linkend="role-attributes"/>), and <filename>pg_hba.conf</filename>
    must permit the replication connection. The server must also be
-   configured with <xref linkend="guc-max-wal-senders"> set high enough to
+   configured with <xref linkend="guc-max-wal-senders"/> set high enough to
    leave at least one session available for the stream.
   </para>
 
@@ -77,7 +77,7 @@ PostgreSQL documentation
   <para>
    In the absence of fatal errors, <application>pg_receivewal</application>
    will run until terminated by the <systemitem>SIGINT</systemitem> signal
-   (<keycombo action="simul"><keycap>Control</><keycap>C</></>).
+   (<keycombo action="simul"><keycap>Control</keycap><keycap>C</keycap></keycombo>).
   </para>
  </refsect1>
 
@@ -98,6 +98,22 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>-E <replaceable>lsn</replaceable></option></term>
+      <term><option>--endpos=<replaceable>lsn</replaceable></option></term>
+      <listitem>
+       <para>
+        Automatically stop replication and exit with normal exit status 0 when
+        receiving reaches the specified LSN.
+       </para>
+
+       <para>
+        If there is a record with LSN exactly equal to <replaceable>lsn</replaceable>,
+        the record will be processed.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>--if-not-exists</option></term>
       <listitem>
@@ -119,6 +135,23 @@ PostgreSQL documentation
       </listitem>
      </varlistentry>
 
+     <varlistentry>
+      <term><option>--no-sync</option></term>
+      <listitem>
+       <para>
+        This option causes <command>pg_receivewal</command> to not force WAL
+        data to be flushed to disk.  This is faster, but means that a
+        subsequent operating system crash can leave the WAL segments corrupt.
+        Generally, this option is useful for testing but should not be used
+        when doing WAL archiving on a production deployment.
+       </para>
+
+       <para>
+        This option is incompatible with <literal>--synchronous</literal>.
+       </para>
+      </listitem>
+     </varlistentry>
+
      <varlistentry>
       <term><option>-s <replaceable class="parameter">interval</replaceable></option></term>
       <term><option>--status-interval=<replaceable class="parameter">interval</replaceable></option></term>
@@ -139,8 +172,8 @@ PostgreSQL documentation
       <listitem>
         <para>
          Require <application>pg_receivewal</application> to use an existing
-         replication slot (see <xref linkend="streaming-replication-slots">).
-         When this option is used, <application>pg_receivewal</> will report
+         replication slot (see <xref linkend="streaming-replication-slots"/>).
+         When this option is used, <application>pg_receivewal</application> will report
          a flush position to the server, indicating when each segment has been
          synchronized to disk so that the server can remove that segment if it
          is not otherwise needed.
@@ -165,7 +198,7 @@ PostgreSQL documentation
        <para>
         Flush the WAL data to disk immediately after it has been received. Also
         send a status packet back to the server immediately after flushing,
-        regardless of <literal>--status-interval</>.
+        regardless of <literal>--status-interval</literal>.
        </para>
 
        <para>
@@ -211,10 +244,10 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies parameters used to connect to the server, as a connection
-        string. See <xref linkend="libpq-connstring"> for more information.
+        string. See <xref linkend="libpq-connstring"/> for more information.
        </para>
        <para>
-        The option is called <literal>--dbname</> for consistency with other
+        The option is called <literal>--dbname</literal> for consistency with other
         client applications, but because <application>pg_receivewal</application>
         doesn't connect to any particular database in the cluster, database
         name in the connection string will be ignored.
@@ -260,8 +293,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -289,7 +322,7 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>pg_receivewal</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -329,8 +362,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_receivewal</application> version and exit.
@@ -339,8 +372,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>pg_receivewal</application> command line
@@ -370,9 +403,9 @@ PostgreSQL documentation
   <title>Environment</title>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -382,11 +415,11 @@ PostgreSQL documentation
 
   <para>
    When using <application>pg_receivewal</application> instead of
-   <xref linkend="guc-archive-command"> as the main WAL backup method, it is
+   <xref linkend="guc-archive-command"/> as the main WAL backup method, it is
    strongly recommended to use replication slots.  Otherwise, the server is
    free to recycle or remove write-ahead log files before they are backed up,
    because it does not have any information, either
-   from <xref linkend="guc-archive-command"> or the replication slots, about
+   from <xref linkend="guc-archive-command"/> or the replication slots, about
    how far the WAL stream has been archived.  Note, however, that a
    replication slot will fill up the server's disk space if the receiver does
    not keep up with fetching the WAL data.
@@ -410,7 +443,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="APP-PGBASEBACKUP"></member>
+   <member><xref linkend="app-pgbasebackup"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pg_recvlogical.sgml b/doc/src/sgml/ref/pg_recvlogical.sgml
index 9c7bb1907b..a79ca20084 100644
--- a/doc/src/sgml/ref/pg_recvlogical.sgml
+++ b/doc/src/sgml/ref/pg_recvlogical.sgml
@@ -35,16 +35,16 @@ PostgreSQL documentation
 
   <para>
    It creates a replication-mode connection, so it is subject to the same
-   constraints as <xref linkend="app-pgreceivewal">, plus those for logical
-   replication (see <xref linkend="logicaldecoding">).
+   constraints as <xref linkend="app-pgreceivewal"/>, plus those for logical
+   replication (see <xref linkend="logicaldecoding"/>).
   </para>
 
   <para>
-   <command>pg_recvlogical</> has no equivalent to the logical decoding
+   <command>pg_recvlogical</command> has no equivalent to the logical decoding
    SQL interface's peek and get modes. It sends replay confirmations for
    data lazily as it receives it and on clean exit. To examine pending data on
     a slot without consuming it, use
-   <link linkend="functions-replication"><function>pg_logical_slot_peek_changes</></>.
+   <link linkend="functions-replication"><function>pg_logical_slot_peek_changes</function></link>.
   </para>
  </refsect1>
 
@@ -125,7 +125,7 @@ PostgreSQL documentation
        </para>
 
        <para>
-        If there's a record with LSN exactly equal to <replaceable>lsn</>,
+        If there's a record with LSN exactly equal to <replaceable>lsn</replaceable>,
         the record will be output.
        </para>
 
@@ -145,7 +145,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Write received and decoded transaction data into this
-        file. Use <literal>-</> for <systemitem>stdout</systemitem>.
+        file. Use <literal>-</literal> for <systemitem>stdout</systemitem>.
        </para>
       </listitem>
      </varlistentry>
@@ -182,8 +182,8 @@ PostgreSQL documentation
        <para>
         In <option>--start</option> mode, start replication from the given
         LSN.  For details on the effect of this, see the documentation
-        in <xref linkend="logicaldecoding">
-        and <xref linkend="protocol-replication">. Ignored in other modes.
+        in <xref linkend="logicaldecoding"/>
+        and <xref linkend="protocol-replication"/>. Ignored in other modes.
        </para>
       </listitem>
      </varlistentry>
@@ -226,7 +226,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         When creating a slot, use the specified logical decoding output
-        plugin. See <xref linkend="logicaldecoding">. This option has no
+        plugin. See <xref linkend="logicaldecoding"/>. This option has no
         effect if the slot already exists.
        </para>
       </listitem>
@@ -238,7 +238,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         This option has the same effect as the option of the same name
-        in <xref linkend="app-pgreceivewal">.  See the description there.
+        in <xref linkend="app-pgreceivewal"/>.  See the description there.
        </para>
       </listitem>
      </varlistentry>
@@ -257,8 +257,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-v</></term>
-       <term><option>--verbose</></term>
+       <term><option>-v</option></term>
+       <term><option>--verbose</option></term>
        <listitem>
        <para>
         Enables verbose mode.
@@ -279,7 +279,7 @@ PostgreSQL documentation
         <para>
          The database to connect to.  See the description of the actions for
          what this means in detail.  This can be a <application>libpq</application> connection string;
-         see <xref linkend="LIBPQ-CONNSTRING"> for more information.  Defaults
+         see <xref linkend="libpq-connstring"/> for more information.  Defaults
          to user name.
         </para>
        </listitem>
@@ -353,7 +353,7 @@ PostgreSQL documentation
          for a password if the server demands password authentication.
          However, <application>pg_recvlogical</application> will waste a
          connection attempt finding out that the server wants a password.
-         In some cases it is worth typing <option>-W</> to avoid the extra
+         In some cases it is worth typing <option>-W</option> to avoid the extra
          connection attempt.
         </para>
       </listitem>
@@ -366,8 +366,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
         Print the <application>pg_recvlogical</application> version and exit.
@@ -376,8 +376,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
        <listitem>
         <para>
          Show help about <application>pg_recvlogical</application> command line
@@ -393,9 +393,9 @@ PostgreSQL documentation
   <title>Environment</title>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
  </refsect1>
 
@@ -403,7 +403,7 @@ PostgreSQL documentation
   <title>Examples</title>
 
   <para>
-   See <xref linkend="logicaldecoding-example"> for an example.
+   See <xref linkend="logicaldecoding-example"/> for an example.
   </para>
  </refsect1>
 
@@ -411,7 +411,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-pgreceivewal"></member>
+   <member><xref linkend="app-pgreceivewal"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pg_resetwal.sgml b/doc/src/sgml/ref/pg_resetwal.sgml
index defaf170dc..43b58a49e6 100644
--- a/doc/src/sgml/ref/pg_resetwal.sgml
+++ b/doc/src/sgml/ref/pg_resetwal.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/pg_resetwal.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-PGRESETWAL">
+<refentry id="app-pgresetwal">
  <indexterm zone="app-pgresetwal">
   <primary>pg_resetwal</primary>
  </indexterm>
@@ -29,12 +29,12 @@ PostgreSQL documentation
   </cmdsynopsis>
  </refsynopsisdiv>
 
- <refsect1 id="R1-APP-PGRESETWAL-1">
+ <refsect1 id="r1-app-pgresetwal-1">
   <title>Description</title>
   <para>
    <command>pg_resetwal</command> clears the write-ahead log (WAL) and
    optionally resets some other control information stored in the
-   <filename>pg_control</> file.  This function is sometimes needed
+   <filename>pg_control</filename> file.  This function is sometimes needed
    if these files have become corrupted.  It should be used only as a
    last resort, when the server will not start due to such corruption.
   </para>
@@ -43,7 +43,7 @@ PostgreSQL documentation
    After running this command, it should be possible to start the server,
    but bear in mind that the database might contain inconsistent data due to
    partially-committed transactions.  You should immediately dump your data,
-   run <command>initdb</>, and reload.  After reload, check for
+   run <command>initdb</command>, and reload.  After reload, check for
    inconsistencies and repair as needed.
   </para>
 
@@ -52,21 +52,21 @@ PostgreSQL documentation
    it requires read/write access to the data directory.
    For safety reasons, you must specify the data directory on the command line.
    <command>pg_resetwal</command> does not use the environment variable
-   <envar>PGDATA</>.
+   <envar>PGDATA</envar>.
   </para>
 
   <para>
    If <command>pg_resetwal</command> complains that it cannot determine
-   valid data for <filename>pg_control</>, you can force it to proceed anyway
-   by specifying the <option>-f</> (force) option.  In this case plausible
+   valid data for <filename>pg_control</filename>, you can force it to proceed anyway
+   by specifying the <option>-f</option> (force) option.  In this case plausible
    values will be substituted for the missing data.  Most of the fields can be
    expected to match, but manual assistance might be needed for the next OID,
    next transaction ID and epoch, next multitransaction ID and offset, and
    WAL starting address fields. These fields can be set using the options
    discussed below. If you are not able to determine correct values for all
-   these fields, <option>-f</> can still be used, but
+   these fields, <option>-f</option> can still be used, but
    the recovered database must be treated with even more suspicion than
-   usual: an immediate dump and reload is imperative.  <emphasis>Do not</>
+   usual: an immediate dump and reload is imperative.  <emphasis>Do not</emphasis>
    execute any data-modifying operations in the database before you dump,
    as any such action is likely to make the corruption worse.
   </para>
@@ -81,7 +81,7 @@ PostgreSQL documentation
     <listitem>
      <para>
       Force <command>pg_resetwal</command> to proceed even if it cannot determine
-      valid data for <filename>pg_control</>, as explained above.
+      valid data for <filename>pg_control</filename>, as explained above.
      </para>
     </listitem>
    </varlistentry>
@@ -90,9 +90,9 @@ PostgreSQL documentation
     <term><option>-n</option></term>
     <listitem>
      <para>
-      The <option>-n</> (no operation) option instructs
+      The <option>-n</option> (no operation) option instructs
       <command>pg_resetwal</command> to print the values reconstructed from
-      <filename>pg_control</> and values about to be changed, and then exit
+      <filename>pg_control</filename> and values about to be changed, and then exit
       without modifying anything. This is mainly a debugging tool, but can be
       useful as a sanity check before allowing <command>pg_resetwal</command>
       to proceed for real.
@@ -116,7 +116,7 @@ PostgreSQL documentation
   <para>
    The following options are only needed when
    <command>pg_resetwal</command> is unable to determine appropriate values
-   by reading <filename>pg_control</>.  Safe values can be determined as
+   by reading <filename>pg_control</filename>.  Safe values can be determined as
    described below.  For values that take numeric arguments, hexadecimal
    values can be specified by using the prefix <literal>0x</literal>.
   </para>
@@ -134,7 +134,7 @@ PostgreSQL documentation
       A safe value for the oldest transaction ID for which the commit time can
       be retrieved (first part) can be determined by looking
       for the numerically smallest file name in the directory
-      <filename>pg_commit_ts</> under the data directory.  Conversely, a safe
+      <filename>pg_commit_ts</filename> under the data directory.  Conversely, a safe
       value for the newest transaction ID for which the commit time can be
       retrieved (second part) can be determined by looking for the numerically
       greatest file name in the same directory.  The file names are in
@@ -155,8 +155,8 @@ PostgreSQL documentation
       except in the field that is set by <command>pg_resetwal</command>,
       so any value will work so far as the database itself is concerned.
       You might need to adjust this value to ensure that replication
-      systems such as <application>Slony-I</> and
-      <application>Skytools</> work correctly &mdash;
+      systems such as <application>Slony-I</application> and
+      <application>Skytools</application> work correctly &mdash;
       if so, an appropriate value should be obtainable from the state of
       the downstream replicated database.
      </para>
@@ -173,22 +173,22 @@ PostgreSQL documentation
      <para>
       The WAL starting address should be
       larger than any WAL segment file name currently existing in
-      the directory <filename>pg_wal</> under the data directory.
+      the directory <filename>pg_wal</filename> under the data directory.
       These names are also in hexadecimal and have three parts.  The first
-      part is the <quote>timeline ID</> and should usually be kept the same.
-      For example, if <filename>00000001000000320000004A</> is the
-      largest entry in <filename>pg_wal</>, use <literal>-l 00000001000000320000004B</> or higher.
+      part is the <quote>timeline ID</quote> and should usually be kept the same.
+      For example, if <filename>00000001000000320000004A</filename> is the
+      largest entry in <filename>pg_wal</filename>, use <literal>-l 00000001000000320000004B</literal> or higher.
      </para>
 
      <note>
       <para>
        <command>pg_resetwal</command> itself looks at the files in
-       <filename>pg_wal</> and chooses a default <option>-l</> setting
+       <filename>pg_wal</filename> and chooses a default <option>-l</option> setting
        beyond the last existing file name.  Therefore, manual adjustment of
-       <option>-l</> should only be needed if you are aware of WAL segment
-       files that are not currently present in <filename>pg_wal</>, such as
+       <option>-l</option> should only be needed if you are aware of WAL segment
+       files that are not currently present in <filename>pg_wal</filename>, such as
        entries in an offline archive; or if the contents of
-       <filename>pg_wal</> have been lost entirely.
+       <filename>pg_wal</filename> have been lost entirely.
       </para>
      </note>
     </listitem>
@@ -204,10 +204,10 @@ PostgreSQL documentation
      <para>
       A safe value for the next multitransaction ID (first part) can be
       determined by looking for the numerically largest file name in the
-      directory <filename>pg_multixact/offsets</> under the data directory,
+      directory <filename>pg_multixact/offsets</filename> under the data directory,
       adding one, and then multiplying by 65536 (0x10000).  Conversely, a safe
       value for the oldest multitransaction ID (second part of
-      <option>-m</>) can be determined by looking for the numerically smallest
+      <option>-m</option>) can be determined by looking for the numerically smallest
       file name in the same directory and multiplying by 65536.  The file
       names are in hexadecimal, so the easiest way to do this is to specify
       the option value in hexadecimal and append four zeroes.
@@ -239,7 +239,7 @@ PostgreSQL documentation
 
      <para>
       A safe value can be determined by looking for the numerically largest
-      file name in the directory <filename>pg_multixact/members</> under the
+      file name in the directory <filename>pg_multixact/members</filename> under the
       data directory, adding one, and then multiplying by 52352 (0xCC80).
       The file names are in hexadecimal.  There is no simple recipe such as
       the ones for other options of appending zeroes.
@@ -256,12 +256,12 @@ PostgreSQL documentation
 
      <para>
       A safe value can be determined by looking for the numerically largest
-      file name in the directory <filename>pg_xact</> under the data directory,
+      file name in the directory <filename>pg_xact</filename> under the data directory,
       adding one,
       and then multiplying by 1048576 (0x100000).  Note that the file names are in
       hexadecimal.  It is usually easiest to specify the option value in
-      hexadecimal too. For example, if <filename>0011</> is the largest entry
-      in <filename>pg_xact</>, <literal>-x 0x1200000</> will work (five
+      hexadecimal too. For example, if <filename>0011</filename> is the largest entry
+      in <filename>pg_xact</filename>, <literal>-x 0x1200000</literal> will work (five
       trailing zeroes provide the proper multiplier).
      </para>
     </listitem>
@@ -292,7 +292,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-pgcontroldata"></member>
+   <member><xref linkend="app-pgcontroldata"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pg_restore.sgml b/doc/src/sgml/ref/pg_restore.sgml
index 5180103526..345324bd27 100644
--- a/doc/src/sgml/ref/pg_restore.sgml
+++ b/doc/src/sgml/ref/pg_restore.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/ref/pg_restore.sgml -->
 
-<refentry id="APP-PGRESTORE">
+<refentry id="app-pgrestore">
  <indexterm zone="app-pgrestore">
   <primary>pg_restore</primary>
  </indexterm>
@@ -36,7 +36,7 @@
   <para>
    <application>pg_restore</application> is a utility for restoring a
    <productname>PostgreSQL</productname> database from an archive
-   created by <xref linkend="app-pgdump"> in one of the non-plain-text
+   created by <xref linkend="app-pgdump"/> in one of the non-plain-text
    formats.  It will issue the commands necessary to reconstruct the
    database to the state it was in at the time it was saved.  The
    archive files also allow <application>pg_restore</application> to
@@ -98,7 +98,7 @@
 
        <para>
         This option is similar to, but for historical reasons not identical
-        to, specifying <option>--section=data</>.
+        to, specifying <option>--section=data</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -109,7 +109,7 @@
       <listitem>
        <para>
         Clean (drop) database objects before recreating them.
-        (Unless <option>--if-exists</> is used,
+        (Unless <option>--if-exists</option> is used,
         this might generate some harmless error messages, if any objects
         were not present in the destination database.)
        </para>
@@ -126,10 +126,21 @@
         recreate the target database before connecting to it.
        </para>
 
+       <para>
+        With <option>--create</option>, <application>pg_restore</application>
+        also restores the database's comment if any, and any configuration
+        variable settings that are specific to this database, that is,
+        any <command>ALTER DATABASE ... SET ...</command>
+        and <command>ALTER ROLE ... IN DATABASE ... SET ...</command>
+        commands that mention this database.
+        Access privileges for the database itself are also restored,
+        unless <option>--no-acl</option> is specified.
+       </para>
+
        <para>
         When this option is used, the database named with <option>-d</option>
-        is used only to issue the initial <command>DROP DATABASE</> and
-        <command>CREATE DATABASE</> commands.  All data is restored into the
+        is used only to issue the initial <command>DROP DATABASE</command> and
+        <command>CREATE DATABASE</command> commands.  All data is restored into the
         database name that appears in the archive.
        </para>
       </listitem>
@@ -183,8 +194,8 @@
 
        <variablelist>
         <varlistentry>
-         <term><literal>c</></term>
-         <term><literal>custom</></term>
+         <term><literal>c</literal></term>
+         <term><literal>custom</literal></term>
          <listitem>
           <para>
            The archive is in the custom format of
@@ -194,8 +205,8 @@
         </varlistentry>
 
         <varlistentry>
-         <term><literal>d</></term>
-         <term><literal>directory</></term>
+         <term><literal>d</literal></term>
+         <term><literal>directory</literal></term>
          <listitem>
           <para>
            The archive is a directory archive.
@@ -204,8 +215,8 @@
         </varlistentry>
 
         <varlistentry>
-         <term><literal>t</></term>
-         <term><literal>tar</></term>
+         <term><literal>t</literal></term>
+         <term><literal>tar</literal></term>
          <listitem>
           <para>
            The archive is a <command>tar</command> archive.
@@ -222,7 +233,7 @@
       <listitem>
        <para>
         Restore definition of named index only.  Multiple indexes
-        may be specified with multiple <option>-I</> switches.
+        may be specified with multiple <option>-I</option> switches.
        </para>
       </listitem>
      </varlistentry>
@@ -233,7 +244,7 @@
       <listitem>
        <para>
         Run the most time-consuming parts
-        of <application>pg_restore</> &mdash; those which load data,
+        of <application>pg_restore</application> &mdash; those which load data,
         create indexes, or create constraints &mdash; using multiple
         concurrent jobs.  This option can dramatically reduce the time
         to restore a large database to a server running on a
@@ -275,8 +286,8 @@
        <para>
         List the table of contents of the archive. The output of this operation
         can be used as input to the <option>-L</option> option.  Note that
-        if filtering switches such as <option>-n</> or <option>-t</> are
-        used with <option>-l</>, they will restrict the items listed.
+        if filtering switches such as <option>-n</option> or <option>-t</option> are
+        used with <option>-l</option>, they will restrict the items listed.
        </para>
       </listitem>
      </varlistentry>
@@ -287,13 +298,13 @@
       <listitem>
        <para>
         Restore only those archive elements that are listed in <replaceable
-        class="PARAMETER">list-file</replaceable>, and restore them in the
+        class="parameter">list-file</replaceable>, and restore them in the
         order they appear in the file.  Note that
-        if filtering switches such as <option>-n</> or <option>-t</> are
-        used with <option>-L</>, they will further restrict the items restored.
+        if filtering switches such as <option>-n</option> or <option>-t</option> are
+        used with <option>-L</option>, they will further restrict the items restored.
        </para>
-       <para><replaceable class="PARAMETER">list-file</> is normally created by
-        editing the output of a previous <option>-l</> operation.
+       <para><replaceable class="parameter">list-file</replaceable> is normally created by
+        editing the output of a previous <option>-l</option> operation.
         Lines can be moved or removed, and can also
         be commented out by placing a semicolon (<literal>;</literal>) at the
         start of the line.  See below for examples.
@@ -307,7 +318,7 @@
       <listitem>
        <para>
         Restore only objects that are in the named schema.  Multiple schemas
-        may be specified with multiple <option>-n</> switches.  This can be
+        may be specified with multiple <option>-n</option> switches.  This can be
         combined with the <option>-t</option> option to restore just a
         specific table.
        </para>
@@ -320,12 +331,12 @@
       <listitem>
        <para>
         Do not restore objects that are in the named schema.  Multiple schemas
-        to be excluded may be specified with multiple <option>-N</> switches.
+        to be excluded may be specified with multiple <option>-N</option> switches.
        </para>
 
        <para>
-        When both <option>-n</> and <option>-N</> are given for the same
-        schema name, the <option>-N</> switch wins and the schema is excluded.
+        When both <option>-n</option> and <option>-N</option> are given for the same
+        schema name, the <option>-N</option> switch wins and the schema is excluded.
        </para>
       </listitem>
      </varlistentry>
@@ -338,7 +349,7 @@
         Do not output commands to set
         ownership of objects to match the original database.
         By default, <application>pg_restore</application> issues
-        <command>ALTER OWNER</> or
+        <command>ALTER OWNER</command> or
         <command>SET SESSION AUTHORIZATION</command>
         statements to set ownership of created schema elements.
         These statements will fail unless the initial connection to the
@@ -358,7 +369,7 @@
         Restore the named function only.  Be careful to spell the function
         name and arguments exactly as they appear in the dump file's table
         of contents.  Multiple functions may be specified with multiple
-        <option>-P</> switches.
+        <option>-P</option> switches.
        </para>
       </listitem>
      </varlistentry>
@@ -383,14 +394,14 @@
         to the extent that schema entries are present in the archive.
        </para>
        <para>
-        This option is the inverse of <option>--data-only</>.
+        This option is the inverse of <option>--data-only</option>.
         It is similar to, but for historical reasons not identical to,
         specifying
-        <option>--section=pre-data --section=post-data</>.
+        <option>--section=pre-data --section=post-data</option>.
        </para>
        <para>
-        (Do not confuse this with the <option>--schema</> option, which
-        uses the word <quote>schema</> in a different meaning.)
+        (Do not confuse this with the <option>--schema</option> option, which
+        uses the word <quote>schema</quote> in a different meaning.)
        </para>
       </listitem>
      </varlistentry>
@@ -401,7 +412,7 @@
       <listitem>
        <para>
         Specify the superuser user name to use when disabling triggers.
-        This is relevant only if <option>--disable-triggers</> is used.
+        This is relevant only if <option>--disable-triggers</option> is used.
        </para>
       </listitem>
      </varlistentry>
@@ -412,16 +423,16 @@
       <listitem>
        <para>
         Restore definition and/or data of only the named table.
-        For this purpose, <quote>table</> includes views, materialized views,
+        For this purpose, <quote>table</quote> includes views, materialized views,
         sequences, and foreign tables.  Multiple tables
-        can be selected by writing multiple <option>-t</> switches.
+        can be selected by writing multiple <option>-t</option> switches.
         This option can be combined with the <option>-n</option> option to
         specify table(s) in a particular schema.
        </para>
 
        <note>
         <para>
-         When <option>-t</option> is specified, <application>pg_restore</>
+         When <option>-t</option> is specified, <application>pg_restore</application>
          makes no attempt to restore any other database objects that the
          selected table(s) might depend upon.  Therefore, there is no
          guarantee that a specific-table restore into a clean database will
@@ -433,14 +444,19 @@
         <para>
          This flag does not behave identically to the <option>-t</option>
          flag of <application>pg_dump</application>.  There is not currently
-         any provision for wild-card matching in <application>pg_restore</>,
-         nor can you include a schema name within its <option>-t</>.
+         any provision for wild-card matching in <application>pg_restore</application>,
+         nor can you include a schema name within its <option>-t</option>.
+         And, while <application>pg_dump</application>'s <option>-t</option>
+         flag will also dump subsidiary objects (such as indexes) of the
+         selected table(s),
+         <application>pg_restore</application>'s <option>-t</option>
+         flag does not include such subsidiary objects.
         </para>
        </note>
 
        <note>
         <para>
-         In versions prior to <productname>PostgreSQL</> 9.6, this flag
+         In versions prior to <productname>PostgreSQL</productname> 9.6, this flag
          matched only tables, not any other type of relation.
         </para>
        </note>
@@ -453,7 +469,7 @@
       <listitem>
        <para>
         Restore named trigger only.  Multiple triggers may be specified with
-        multiple <option>-T</> switches.
+        multiple <option>-T</option> switches.
        </para>
       </listitem>
      </varlistentry>
@@ -469,8 +485,8 @@
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_restore</application> version and exit.
@@ -495,16 +511,16 @@
       <listitem>
        <para>
         Execute the restore as a single transaction (that is, wrap the
-        emitted commands in <command>BEGIN</>/<command>COMMIT</>).  This
+        emitted commands in <command>BEGIN</command>/<command>COMMIT</command>).  This
         ensures that either all the commands complete successfully, or no
         changes are applied. This option implies
-        <option>--exit-on-error</>.
+        <option>--exit-on-error</option>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--disable-triggers</></term>
+      <term><option>--disable-triggers</option></term>
       <listitem>
        <para>
         This option is relevant only when performing a data-only restore.
@@ -517,25 +533,25 @@
 
        <para>
         Presently, the commands emitted for
-        <option>--disable-triggers</> must be done as superuser.  So you
-        should also specify a superuser name with <option>-S</> or,
+        <option>--disable-triggers</option> must be done as superuser.  So you
+        should also specify a superuser name with <option>-S</option> or,
         preferably, run <application>pg_restore</application> as a
-        <productname>PostgreSQL</> superuser.
+        <productname>PostgreSQL</productname> superuser.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--enable-row-security</></term>
+      <term><option>--enable-row-security</option></term>
       <listitem>
        <para>
         This option is relevant only when restoring the contents of a table
         which has row security.  By default, <application>pg_restore</application> will set
-        <xref linkend="guc-row-security"> to off, to ensure
+        <xref linkend="guc-row-security"/> to off, to ensure
         that all data is restored in to the table.  If the user does not have
         sufficient privileges to bypass row security, then an error is thrown.
         This parameter instructs <application>pg_restore</application> to set
-        <xref linkend="guc-row-security"> to on instead, allowing the user to attempt to restore
+        <xref linkend="guc-row-security"/> to on instead, allowing the user to attempt to restore
         the contents of the table with row security enabled.  This might still
         fail if the user does not have the right to insert the rows from the
         dump into the table.
@@ -553,8 +569,17 @@
       <listitem>
        <para>
         Use conditional commands (i.e. add an <literal>IF EXISTS</literal>
-        clause) when cleaning database objects.  This option is not valid
-        unless <option>--clean</> is also specified.
+        clause) to drop database objects.  This option is not valid
+        unless <option>--clean</option> is also specified.
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>--no-comments</option></term>
+      <listitem>
+       <para>
+        Do not dump comments.
        </para>
       </listitem>
      </varlistentry>
@@ -568,8 +593,8 @@
         With this option, data for such a table is skipped.
         This behavior is useful if the target database already
         contains the desired table contents.  For example,
-        auxiliary tables for <productname>PostgreSQL</> extensions
-        such as <productname>PostGIS</> might already be loaded in
+        auxiliary tables for <productname>PostgreSQL</productname> extensions
+        such as <productname>PostGIS</productname> might already be loaded in
         the target database; specifying this option prevents duplicate
         or obsolete data from being loaded into them.
        </para>
@@ -627,7 +652,7 @@
        <listitem>
          <para>
           Only restore the named section. The section name can be
-          <option>pre-data</>, <option>data</>, or <option>post-data</>.
+          <option>pre-data</option>, <option>data</option>, or <option>post-data</option>.
           This option can be specified more than once to select multiple
           sections. The default is to restore all sections.
          </para>
@@ -642,7 +667,7 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>--strict-names</></term>
+      <term><option>--strict-names</option></term>
       <listitem>
        <para>
         Require that each schema
@@ -657,8 +682,8 @@
       <term><option>--use-set-session-authorization</option></term>
       <listitem>
        <para>
-        Output SQL-standard <command>SET SESSION AUTHORIZATION</> commands
-        instead of <command>ALTER OWNER</> commands to determine object
+        Output SQL-standard <command>SET SESSION AUTHORIZATION</command> commands
+        instead of <command>ALTER OWNER</command> commands to determine object
         ownership.  This makes the dump more standards-compatible, but
         depending on the history of the objects in the dump, might not restore
         properly.
@@ -667,8 +692,8 @@
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>pg_restore</application> command line
@@ -723,8 +748,8 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -752,7 +777,7 @@
         for a password if the server demands password authentication.
         However, <application>pg_restore</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
@@ -763,11 +788,11 @@
       <listitem>
        <para>
         Specifies a role name to be used to perform the restore.
-        This option causes <application>pg_restore</> to issue a
-        <command>SET ROLE</> <replaceable class="parameter">rolename</>
+        This option causes <application>pg_restore</application> to issue a
+        <command>SET ROLE</command> <replaceable class="parameter">rolename</replaceable>
         command after connecting to the database. It is useful when the
-        authenticated user (specified by <option>-U</>) lacks privileges
-        needed by <application>pg_restore</>, but can switch to a role with
+        authenticated user (specified by <option>-U</option>) lacks privileges
+        needed by <application>pg_restore</application>, but can switch to a role with
         the required rights.  Some installations have a policy against
         logging in directly as a superuser, and use of this option allows
         restores to be performed without violating the policy.
@@ -799,9 +824,9 @@
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).  However, it does not read
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).  However, it does not read
    <envar>PGDATABASE</envar> when a database name is not supplied.
   </para>
 
@@ -817,7 +842,7 @@
    internally executes <acronym>SQL</acronym> statements. If you have
    problems running <application>pg_restore</application>, make sure
    you are able to select information from the database using, for
-   example, <xref linkend="app-psql">.  Also, any default connection
+   example, <xref linkend="app-psql"/>.  Also, any default connection
    settings and environment variables used by the
    <application>libpq</application> front-end library will apply.
   </para>
@@ -829,11 +854,11 @@
 
   <para>
    If your installation has any local additions to the
-   <literal>template1</> database, be careful to load the output of
+   <literal>template1</literal> database, be careful to load the output of
    <application>pg_restore</application> into a truly empty database;
    otherwise you are likely to get errors due to duplicate definitions
    of the added objects.  To make an empty database without any local
-   additions, copy from <literal>template0</> not <literal>template1</>, for example:
+   additions, copy from <literal>template0</literal> not <literal>template1</literal>, for example:
 <programlisting>
 CREATE DATABASE foo WITH TEMPLATE template0;
 </programlisting>
@@ -846,7 +871,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
     <listitem>
      <para>
       When restoring data to a pre-existing table and the option
-      <option>--disable-triggers</> is used,
+      <option>--disable-triggers</option> is used,
       <application>pg_restore</application> emits commands
       to disable triggers on user tables before inserting the data, then emits commands to
       re-enable them after the data has been inserted.  If the restore is stopped in the
@@ -867,15 +892,15 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   </para>
 
   <para>
-   See also the <xref linkend="app-pgdump"> documentation for details on
+   See also the <xref linkend="app-pgdump"/> documentation for details on
    limitations of <application>pg_dump</application>.
   </para>
 
   <para>
-   Once restored, it is wise to run <command>ANALYZE</> on each
+   Once restored, it is wise to run <command>ANALYZE</command> on each
    restored table so the optimizer has useful statistics; see
-   <xref linkend="vacuum-for-statistics"> and
-   <xref linkend="autovacuum"> for more information.
+   <xref linkend="vacuum-for-statistics"/> and
+   <xref linkend="autovacuum"/> for more information.
   </para>
 
  </refsect1>
@@ -885,7 +910,7 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   <title>Examples</title>
 
   <para>
-   Assume we have dumped a database called <literal>mydb</> into a
+   Assume we have dumped a database called <literal>mydb</literal> into a
    custom-format dump file:
 
 <screen>
@@ -901,24 +926,24 @@ CREATE DATABASE foo WITH TEMPLATE template0;
 <prompt>$</prompt> <userinput>pg_restore -C -d postgres db.dump</userinput>
 </screen>
 
-   The database named in the <option>-d</> switch can be any database existing
-   in the cluster; <application>pg_restore</> only uses it to issue the
-   <command>CREATE DATABASE</> command for <literal>mydb</>.  With
-   <option>-C</>, data is always restored into the database name that appears
+   The database named in the <option>-d</option> switch can be any database existing
+   in the cluster; <application>pg_restore</application> only uses it to issue the
+   <command>CREATE DATABASE</command> command for <literal>mydb</literal>.  With
+   <option>-C</option>, data is always restored into the database name that appears
    in the dump file.
   </para>
 
   <para>
-   To reload the dump into a new database called <literal>newdb</>:
+   To reload the dump into a new database called <literal>newdb</literal>:
 
 <screen>
 <prompt>$</prompt> <userinput>createdb -T template0 newdb</userinput>
 <prompt>$</prompt> <userinput>pg_restore -d newdb db.dump</userinput>
 </screen>
 
-   Notice we don't use <option>-C</>, and instead connect directly to the
+   Notice we don't use <option>-C</option>, and instead connect directly to the
    database to be restored into.  Also note that we clone the new database
-   from <literal>template0</> not <literal>template1</>, to ensure it is
+   from <literal>template0</literal> not <literal>template1</literal>, to ensure it is
    initially empty.
   </para>
 
@@ -976,9 +1001,9 @@ CREATE DATABASE foo WITH TEMPLATE template0;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-pgdump"></member>
-   <member><xref linkend="app-pg-dumpall"></member>
-   <member><xref linkend="app-psql"></member>
+   <member><xref linkend="app-pgdump"/></member>
+   <member><xref linkend="app-pg-dumpall"/></member>
+   <member><xref linkend="app-psql"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pg_rewind.sgml b/doc/src/sgml/ref/pg_rewind.sgml
index d5430d4324..8e49249826 100644
--- a/doc/src/sgml/ref/pg_rewind.sgml
+++ b/doc/src/sgml/ref/pg_rewind.sgml
@@ -41,7 +41,7 @@ PostgreSQL documentation
   <title>Description</title>
 
   <para>
-   <application>pg_rewind</> is a tool for synchronizing a PostgreSQL cluster
+   <application>pg_rewind</application> is a tool for synchronizing a PostgreSQL cluster
    with another copy of the same cluster, after the clusters' timelines have
    diverged. A typical scenario is to bring an old master server back online
    after failover as a standby that follows the new master.
@@ -51,49 +51,49 @@ PostgreSQL documentation
    The result is equivalent to replacing the target data directory with the
    source one. Only changed blocks from relation files are copied;
    all other files are copied in full, including configuration files. The
-   advantage of <application>pg_rewind</> over taking a new base backup, or
-   tools like <application>rsync</>, is that <application>pg_rewind</> does
+   advantage of <application>pg_rewind</application> over taking a new base backup, or
+   tools like <application>rsync</application>, is that <application>pg_rewind</application> does
    not require reading through unchanged blocks in the cluster. This makes
    it a lot faster when the database is large and only a small
    fraction of blocks differ between the clusters.
   </para>
 
   <para>
-   <application>pg_rewind</> examines the timeline histories of the source
+   <application>pg_rewind</application> examines the timeline histories of the source
    and target clusters to determine the point where they diverged, and
-   expects to find WAL in the target cluster's <filename>pg_wal</> directory
+   expects to find WAL in the target cluster's <filename>pg_wal</filename> directory
    reaching all the way back to the point of divergence. The point of divergence
    can be found either on the target timeline, the source timeline, or their common
    ancestor. In the typical failover scenario where the target cluster was
    shut down soon after the divergence, this is not a problem, but if the
    target cluster ran for a long time after the divergence, the old WAL
    files might no longer be present. In that case, they can be manually
-   copied from the WAL archive to the <filename>pg_wal</> directory, or
-   fetched on startup by configuring <filename>recovery.conf</>.  The use of
-   <application>pg_rewind</> is not limited to failover, e.g.  a standby
+   copied from the WAL archive to the <filename>pg_wal</filename> directory, or
+   fetched on startup by configuring <filename>recovery.conf</filename>.  The use of
+   <application>pg_rewind</application> is not limited to failover, e.g.  a standby
    server can be promoted, run some write transactions, and then rewinded
    to become a standby again.
   </para>
 
   <para>
    When the target server is started for the first time after running
-   <application>pg_rewind</>, it will go into recovery mode and replay all
+   <application>pg_rewind</application>, it will go into recovery mode and replay all
    WAL generated in the source server after the point of divergence.
    If some of the WAL was no longer available in the source server when
-   <application>pg_rewind</> was run, and therefore could not be copied by the
-   <application>pg_rewind</> session, it must be made available when the
+   <application>pg_rewind</application> was run, and therefore could not be copied by the
+   <application>pg_rewind</application> session, it must be made available when the
    target server is started. This can be done by creating a
-   <filename>recovery.conf</> file in the target data directory with a
-   suitable <varname>restore_command</>.
+   <filename>recovery.conf</filename> file in the target data directory with a
+   suitable <varname>restore_command</varname>.
   </para>
 
   <para>
-   <application>pg_rewind</> requires that the target server either has
-   the <xref linkend="guc-wal-log-hints"> option enabled
-   in <filename>postgresql.conf</> or data checksums enabled when
-   the cluster was initialized with <application>initdb</>.  Neither of these
-   are currently on by default.  <xref linkend="guc-full-page-writes">
-   must also be set to <literal>on</>, but is enabled by default.
+   <application>pg_rewind</application> requires that the target server either has
+   the <xref linkend="guc-wal-log-hints"/> option enabled
+   in <filename>postgresql.conf</filename> or data checksums enabled when
+   the cluster was initialized with <application>initdb</application>.  Neither of these
+   are currently on by default.  <xref linkend="guc-full-page-writes"/>
+   must also be set to <literal>on</literal>, but is enabled by default.
   </para>
  </refsect1>
 
@@ -133,7 +133,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Specifies a libpq connection string to connect to the source
-        <productname>PostgreSQL</> server to synchronize the target with.
+        <productname>PostgreSQL</productname> server to synchronize the target with.
         The connection must be a normal (non-replication) connection
         with superuser access. This option requires the source
         server to be running and not in recovery mode.
@@ -167,7 +167,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Print verbose debugging output that is mostly useful for developers
-        debugging <application>pg_rewind</>.
+        debugging <application>pg_rewind</application>.
        </para>
       </listitem>
      </varlistentry>
@@ -192,9 +192,9 @@ PostgreSQL documentation
   <title>Environment</title>
 
   <para>
-   When <option>--source-server</> option is used,
+   When <option>--source-server</option> option is used,
    <application>pg_rewind</application> also uses the environment variables
-   supported by <application>libpq</> (see <xref linkend="libpq-envars">).
+   supported by <application>libpq</application> (see <xref linkend="libpq-envars"/>).
   </para>
  </refsect1>
 
@@ -224,7 +224,7 @@ PostgreSQL documentation
      <para>
       Copy all those changed blocks from the source cluster to
       the target cluster, either using direct file system access
-      (<option>--source-pgdata</>) or SQL (<option>--source-server</>).
+      (<option>--source-pgdata</option>) or SQL (<option>--source-server</option>).
      </para>
     </step>
     <step>
@@ -237,9 +237,9 @@ PostgreSQL documentation
     <step>
      <para>
       Apply the WAL from the source cluster, starting from the checkpoint
-      created at failover. (Strictly speaking, <application>pg_rewind</>
+      created at failover. (Strictly speaking, <application>pg_rewind</application>
       doesn't apply the WAL, it just creates a backup label file that
-      makes <productname>PostgreSQL</> start by replaying all WAL from
+      makes <productname>PostgreSQL</productname> start by replaying all WAL from
       that checkpoint forward.)
      </para>
     </step>
diff --git a/doc/src/sgml/ref/pg_waldump.sgml b/doc/src/sgml/ref/pg_waldump.sgml
index cff88a4c1e..35f974f8c1 100644
--- a/doc/src/sgml/ref/pg_waldump.sgml
+++ b/doc/src/sgml/ref/pg_waldump.sgml
@@ -29,7 +29,7 @@ PostgreSQL documentation
   </cmdsynopsis>
  </refsynopsisdiv>
 
- <refsect1 id="R1-APP-PGWALDUMP-1">
+ <refsect1 id="r1-app-pgwaldump-1">
   <title>Description</title>
   <para>
    <command>pg_waldump</command> displays the write-ahead log (WAL) and is mainly
@@ -133,7 +133,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Only display records generated by the specified resource manager.
-        If <literal>list</> is passed as name, print a list of valid resource manager
+        If <literal>list</literal> is passed as name, print a list of valid resource manager
         names, and exit.
        </para>
       </listitem>
@@ -156,15 +156,15 @@ PostgreSQL documentation
       <listitem>
        <para>
         Timeline from which to read log records. The default is to use the
-        value in <replaceable>startseg</>, if that is specified; otherwise, the
+        value in <replaceable>startseg</replaceable>, if that is specified; otherwise, the
         default is 1.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>pg_waldump</application> version and exit.
@@ -195,8 +195,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
        <listitem>
         <para>
          Show help about <application>pg_waldump</application> command line
@@ -220,8 +220,8 @@ PostgreSQL documentation
   </para>
 
   <para>
-    <application>pg_waldump</> cannot read WAL files with suffix
-    <literal>.partial</>. If those files need to be read, <literal>.partial</>
+    <application>pg_waldump</application> cannot read WAL files with suffix
+    <literal>.partial</literal>. If those files need to be read, <literal>.partial</literal>
     suffix needs to be removed from the file name.
   </para>
  </refsect1>
@@ -230,7 +230,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="wal-internals"></member>
+   <member><xref linkend="wal-internals"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/pgarchivecleanup.sgml b/doc/src/sgml/ref/pgarchivecleanup.sgml
index abe01bef4f..4117a4392c 100644
--- a/doc/src/sgml/ref/pgarchivecleanup.sgml
+++ b/doc/src/sgml/ref/pgarchivecleanup.sgml
@@ -29,44 +29,44 @@
   <title>Description</title>
 
  <para>
-  <application>pg_archivecleanup</> is designed to be used as an
+  <application>pg_archivecleanup</application> is designed to be used as an
   <literal>archive_cleanup_command</literal> to clean up WAL file archives when
-  running as a standby server (see <xref linkend="warm-standby">).
-  <application>pg_archivecleanup</> can also be used as a standalone program to
+  running as a standby server (see <xref linkend="warm-standby"/>).
+  <application>pg_archivecleanup</application> can also be used as a standalone program to
   clean WAL file archives.
  </para>
 
   <para>
    To configure a standby
-   server to use <application>pg_archivecleanup</>, put this into its
+   server to use <application>pg_archivecleanup</application>, put this into its
    <filename>recovery.conf</filename> configuration file:
 <programlisting>
-archive_cleanup_command = 'pg_archivecleanup <replaceable>archivelocation</> %r'
+archive_cleanup_command = 'pg_archivecleanup <replaceable>archivelocation</replaceable> %r'
 </programlisting>
-   where <replaceable>archivelocation</> is the directory from which WAL segment
+   where <replaceable>archivelocation</replaceable> is the directory from which WAL segment
    files should be removed.
   </para>
   <para>
-   When used within <xref linkend="archive-cleanup-command">, all WAL files
-   logically preceding the value of the <literal>%r</> argument will be removed
-   from <replaceable>archivelocation</>. This minimizes the number of files
+   When used within <xref linkend="archive-cleanup-command"/>, all WAL files
+   logically preceding the value of the <literal>%r</literal> argument will be removed
+   from <replaceable>archivelocation</replaceable>. This minimizes the number of files
    that need to be retained, while preserving crash-restart capability.  Use of
-   this parameter is appropriate if the <replaceable>archivelocation</> is a
+   this parameter is appropriate if the <replaceable>archivelocation</replaceable> is a
    transient staging area for this particular standby server, but
-   <emphasis>not</> when the <replaceable>archivelocation</> is intended as a
+   <emphasis>not</emphasis> when the <replaceable>archivelocation</replaceable> is intended as a
    long-term WAL archive area, or when multiple standby servers are recovering
    from the same archive location.
   </para>
   <para>
    When used as a standalone program all WAL files logically preceding the
-   <replaceable>oldestkeptwalfile</> will be removed from <replaceable>archivelocation</>.
-   In this mode, if you specify a <filename>.partial</> or <filename>.backup</>
+   <replaceable>oldestkeptwalfile</replaceable> will be removed from <replaceable>archivelocation</replaceable>.
+   In this mode, if you specify a <filename>.partial</filename> or <filename>.backup</filename>
    file name, then only the file prefix will be used as the
-   <replaceable>oldestkeptwalfile</>. This treatment of <filename>.backup</>
+   <replaceable>oldestkeptwalfile</replaceable>. This treatment of <filename>.backup</filename>
    file name allows you to remove
    all WAL files archived prior to a specific base backup without error.
    For example, the following example will remove all files older than
-   WAL file name <filename>000000010000003700000010</>:
+   WAL file name <filename>000000010000003700000010</filename>:
 <programlisting>
 pg_archivecleanup -d archive 000000010000003700000010.00000020.backup
 
@@ -77,7 +77,7 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
   </para>
   <para>
    <application>pg_archivecleanup</application> assumes that
-   <replaceable>archivelocation</> is a directory readable and writable by the
+   <replaceable>archivelocation</replaceable> is a directory readable and writable by the
    server-owning user.
   </para>
  </refsect1>
@@ -94,7 +94,7 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
       <term><option>-d</option></term>
       <listitem>
        <para>
-        Print lots of debug logging output on <filename>stderr</>.
+        Print lots of debug logging output on <filename>stderr</filename>.
        </para>
       </listitem>
      </varlistentry>
@@ -103,14 +103,14 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
       <term><option>-n</option></term>
       <listitem>
        <para>
-        Print the names of the files that would have been removed on <filename>stdout</> (performs a dry run).
+        Print the names of the files that would have been removed on <filename>stdout</filename> (performs a dry run).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>pg_archivecleanup</application> version and exit.
@@ -119,7 +119,7 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
      </varlistentry>
 
      <varlistentry>
-      <term><option>-x</option> <replaceable>extension</></term>
+      <term><option>-x</option> <replaceable>extension</replaceable></term>
       <listitem>
        <para>
         Provide an extension
@@ -134,8 +134,8 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_archivecleanup</application> command line
@@ -152,8 +152,8 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
 
   <para>
    <application>pg_archivecleanup</application> is designed to work with
-   <productname>PostgreSQL</> 8.0 and later when used as a standalone utility,
-   or with <productname>PostgreSQL</> 9.0 and later when used as an
+   <productname>PostgreSQL</productname> 8.0 and later when used as a standalone utility,
+   or with <productname>PostgreSQL</productname> 9.0 and later when used as an
    archive cleanup command.
   </para>
 
@@ -172,14 +172,14 @@ pg_archivecleanup:  removing file "archive/00000001000000370000000E"
 archive_cleanup_command = 'pg_archivecleanup -d /mnt/standby/archive %r 2>>cleanup.log'
 </programlisting>
    where the archive directory is physically located on the standby server,
-   so that the <varname>archive_command</> is accessing it across NFS,
+   so that the <varname>archive_command</varname> is accessing it across NFS,
    but the files are local to the standby.
    This will:
   </para>
   <itemizedlist>
    <listitem>
     <para>
-     produce debugging output in <filename>cleanup.log</>
+     produce debugging output in <filename>cleanup.log</filename>
     </para>
    </listitem>
    <listitem>
@@ -194,7 +194,7 @@ archive_cleanup_command = 'pg_archivecleanup -d /mnt/standby/archive %r 2>>clean
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="pgstandby"></member>
+   <member><xref linkend="pgstandby"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pgbench.sgml b/doc/src/sgml/ref/pgbench.sgml
index 03e1212d50..59b573b501 100644
--- a/doc/src/sgml/ref/pgbench.sgml
+++ b/doc/src/sgml/ref/pgbench.sgml
@@ -34,12 +34,12 @@
   <title>Description</title>
  <para>
   <application>pgbench</application> is a simple program for running benchmark
-  tests on <productname>PostgreSQL</>.  It runs the same sequence of SQL
+  tests on <productname>PostgreSQL</productname>.  It runs the same sequence of SQL
   commands over and over, possibly in multiple concurrent database sessions,
   and then calculates the average transaction rate (transactions per second).
   By default, <application>pgbench</application> tests a scenario that is
-  loosely based on TPC-B, involving five <command>SELECT</>,
-  <command>UPDATE</>, and <command>INSERT</> commands per transaction.
+  loosely based on TPC-B, involving five <command>SELECT</command>,
+  <command>UPDATE</command>, and <command>INSERT</command> commands per transaction.
   However, it is easy to test other cases by writing your own transaction
   script files.
  </para>
@@ -63,7 +63,7 @@ tps = 85.296346 (excluding connections establishing)
   settings.  The next line reports the number of transactions completed
   and intended (the latter being just the product of number of clients
   and number of transactions per client); these will be equal unless the run
-  failed before completion.  (In <option>-T</> mode, only the actual
+  failed before completion.  (In <option>-T</option> mode, only the actual
   number of transactions is printed.)
   The last two lines report the number of transactions per second,
   figured with and without counting the time to start database sessions.
@@ -71,27 +71,27 @@ tps = 85.296346 (excluding connections establishing)
 
   <para>
    The default TPC-B-like transaction test requires specific tables to be
-   set up beforehand.  <application>pgbench</> should be invoked with
-   the <option>-i</> (initialize) option to create and populate these
+   set up beforehand.  <application>pgbench</application> should be invoked with
+   the <option>-i</option> (initialize) option to create and populate these
    tables.  (When you are testing a custom script, you don't need this
    step, but will instead need to do whatever setup your test needs.)
    Initialization looks like:
 
 <programlisting>
-pgbench -i <optional> <replaceable>other-options</> </optional> <replaceable>dbname</>
+pgbench -i <optional> <replaceable>other-options</replaceable> </optional> <replaceable>dbname</replaceable>
 </programlisting>
 
-   where <replaceable>dbname</> is the name of the already-created
-   database to test in.  (You may also need <option>-h</>,
-   <option>-p</>, and/or <option>-U</> options to specify how to
+   where <replaceable>dbname</replaceable> is the name of the already-created
+   database to test in.  (You may also need <option>-h</option>,
+   <option>-p</option>, and/or <option>-U</option> options to specify how to
    connect to the database server.)
   </para>
 
   <caution>
    <para>
-    <literal>pgbench -i</> creates four tables <structname>pgbench_accounts</>,
-    <structname>pgbench_branches</>, <structname>pgbench_history</>, and
-    <structname>pgbench_tellers</>,
+    <literal>pgbench -i</literal> creates four tables <structname>pgbench_accounts</structname>,
+    <structname>pgbench_branches</structname>, <structname>pgbench_history</structname>, and
+    <structname>pgbench_tellers</structname>,
     destroying any existing tables of these names.
     Be very careful to use another database if you have tables having these
     names!
@@ -99,7 +99,7 @@ pgbench -i <optional> <replaceable>other-options</> </optional> <replaceable>dbn
   </caution>
 
   <para>
-   At the default <quote>scale factor</> of 1, the tables initially
+   At the default <quote>scale factor</quote> of 1, the tables initially
    contain this many rows:
 <screen>
 table                   # of rows
@@ -110,22 +110,22 @@ pgbench_accounts        100000
 pgbench_history         0
 </screen>
    You can (and, for most purposes, probably should) increase the number
-   of rows by using the <option>-s</> (scale factor) option.  The
-   <option>-F</> (fillfactor) option might also be used at this point.
+   of rows by using the <option>-s</option> (scale factor) option.  The
+   <option>-F</option> (fillfactor) option might also be used at this point.
   </para>
 
   <para>
    Once you have done the necessary setup, you can run your benchmark
-   with a command that doesn't include <option>-i</>, that is
+   with a command that doesn't include <option>-i</option>, that is
 
 <programlisting>
-pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
+pgbench <optional> <replaceable>options</replaceable> </optional> <replaceable>dbname</replaceable>
 </programlisting>
 
    In nearly all cases, you'll need some options to make a useful test.
-   The most important options are <option>-c</> (number of clients),
-   <option>-t</> (number of transactions), <option>-T</> (time limit),
-   and <option>-f</> (specify a custom script file).
+   The most important options are <option>-c</option> (number of clients),
+   <option>-t</option> (number of transactions), <option>-T</option> (time limit),
+   and <option>-f</option> (specify a custom script file).
    See below for a full list.
   </para>
  </refsect1>
@@ -134,9 +134,9 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   <title>Options</title>
 
   <para>
-   The following is divided into three subsections: Different options are used
-   during database initialization and while running benchmarks, some options
-   are useful in both cases.
+   The following is divided into three subsections.  Different options are
+   used during database initialization and while running benchmarks, but some
+   options are useful in both cases.
   </para>
 
  <refsect2 id="pgbench-init-options">
@@ -159,13 +159,86 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-F</option> <replaceable>fillfactor</></term>
-      <term><option>--fillfactor=</option><replaceable>fillfactor</></term>
+      <term><option>-I <replaceable>init_steps</replaceable></option></term>
+      <term><option>--init-steps=<replaceable>init_steps</replaceable></option></term>
       <listitem>
        <para>
-        Create the <structname>pgbench_accounts</>,
-        <structname>pgbench_tellers</> and
-        <structname>pgbench_branches</> tables with the given fillfactor.
+        Perform just a selected set of the normal initialization steps.
+        <replaceable>init_steps</replaceable> specifies the
+        initialization steps to be performed, using one character per step.
+        Each step is invoked in the specified order.
+        The default is <literal>dtgvp</literal>.
+        The available steps are:
+
+        <variablelist>
+         <varlistentry>
+          <term><literal>d</literal> (Drop)</term>
+          <listitem>
+           <para>
+            Drop any existing <application>pgbench</application> tables.
+           </para>
+          </listitem>
+         </varlistentry>
+         <varlistentry>
+          <term><literal>t</literal> (create Tables)</term>
+          <listitem>
+           <para>
+            Create the tables used by the
+            standard <application>pgbench</application> scenario, namely
+            <structname>pgbench_accounts</structname>,
+            <structname>pgbench_branches</structname>,
+            <structname>pgbench_history</structname>, and
+            <structname>pgbench_tellers</structname>.
+           </para>
+          </listitem>
+         </varlistentry>
+         <varlistentry>
+          <term><literal>g</literal> (Generate data)</term>
+          <listitem>
+           <para>
+            Generate data and load it into the standard tables,
+            replacing any data already present.
+           </para>
+          </listitem>
+         </varlistentry>
+         <varlistentry>
+          <term><literal>v</literal> (Vacuum)</term>
+          <listitem>
+           <para>
+            Invoke <command>VACUUM</command> on the standard tables.
+           </para>
+          </listitem>
+         </varlistentry>
+         <varlistentry>
+          <term><literal>p</literal> (create Primary keys)</term>
+          <listitem>
+           <para>
+            Create primary key indexes on the standard tables.
+           </para>
+          </listitem>
+         </varlistentry>
+         <varlistentry>
+         <term><literal>f</literal> (create Foreign keys)</term>
+          <listitem>
+           <para>
+            Create foreign key constraints between the standard tables.
+            (Note that this step is not performed by default.)
+           </para>
+          </listitem>
+         </varlistentry>
+        </variablelist>
+       </para>
+      </listitem>
+     </varlistentry>
+
+     <varlistentry>
+      <term><option>-F</option> <replaceable>fillfactor</replaceable></term>
+      <term><option>--fillfactor=</option><replaceable>fillfactor</replaceable></term>
+      <listitem>
+       <para>
+        Create the <structname>pgbench_accounts</structname>,
+        <structname>pgbench_tellers</structname> and
+        <structname>pgbench_branches</structname> tables with the given fillfactor.
         Default is 100.
        </para>
       </listitem>
@@ -176,7 +249,9 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <term><option>--no-vacuum</option></term>
       <listitem>
        <para>
-        Perform no vacuuming after initialization.
+        Perform no vacuuming during initialization.
+        (This option suppresses the <literal>v</literal> initialization step,
+        even if it was specified in <option>-I</option>.)
        </para>
       </listitem>
      </varlistentry>
@@ -194,13 +269,13 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</option> <replaceable>scale_factor</></term>
-      <term><option>--scale=</option><replaceable>scale_factor</></term>
+      <term><option>-s</option> <replaceable>scale_factor</replaceable></term>
+      <term><option>--scale=</option><replaceable>scale_factor</replaceable></term>
       <listitem>
        <para>
         Multiply the number of rows generated by the scale factor.
-        For example, <literal>-s 100</> will create 10,000,000 rows
-        in the <structname>pgbench_accounts</> table. Default is 1.
+        For example, <literal>-s 100</literal> will create 10,000,000 rows
+        in the <structname>pgbench_accounts</structname> table. Default is 1.
         When the scale is 20,000 or larger, the columns used to
         hold account identifiers (<structfield>aid</structfield> columns)
         will switch to using larger integers (<type>bigint</type>),
@@ -215,6 +290,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <listitem>
        <para>
         Create foreign key constraints between the standard tables.
+        (This option adds the <literal>f</literal> step to the initialization
+        step sequence, if it is not already present.)
        </para>
       </listitem>
      </varlistentry>
@@ -262,17 +339,17 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
 
     <variablelist>
      <varlistentry>
-      <term><option>-b</> <replaceable>scriptname[@weight]</></term>
-      <term><option>--builtin</>=<replaceable>scriptname[@weight]</></term>
+      <term><option>-b</option> <replaceable>scriptname[@weight]</replaceable></term>
+      <term><option>--builtin</option>=<replaceable>scriptname[@weight]</replaceable></term>
       <listitem>
        <para>
         Add the specified built-in script to the list of executed scripts.
-        An optional integer weight after <literal>@</> allows to adjust the
+        An optional integer weight after <literal>@</literal> allows to adjust the
         probability of drawing the script.  If not specified, it is set to 1.
-        Available built-in scripts are: <literal>tpcb-like</>,
-        <literal>simple-update</> and <literal>select-only</>.
+        Available built-in scripts are: <literal>tpcb-like</literal>,
+        <literal>simple-update</literal> and <literal>select-only</literal>.
         Unambiguous prefixes of built-in names are accepted.
-        With special name <literal>list</>, show the list of built-in scripts
+        With special name <literal>list</literal>, show the list of built-in scripts
         and exit immediately.
        </para>
       </listitem>
@@ -280,8 +357,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
 
 
      <varlistentry>
-      <term><option>-c</option> <replaceable>clients</></term>
-      <term><option>--client=</option><replaceable>clients</></term>
+      <term><option>-c</option> <replaceable>clients</replaceable></term>
+      <term><option>--client=</option><replaceable>clients</replaceable></term>
       <listitem>
        <para>
         Number of clients simulated, that is, number of concurrent database
@@ -313,24 +390,24 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-D</option> <replaceable>varname</><literal>=</><replaceable>value</></term>
-      <term><option>--define=</option><replaceable>varname</><literal>=</><replaceable>value</></term>
+      <term><option>-D</option> <replaceable>varname</replaceable><literal>=</literal><replaceable>value</replaceable></term>
+      <term><option>--define=</option><replaceable>varname</replaceable><literal>=</literal><replaceable>value</replaceable></term>
       <listitem>
        <para>
         Define a variable for use by a custom script (see below).
-        Multiple <option>-D</> options are allowed.
+        Multiple <option>-D</option> options are allowed.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-f</> <replaceable>filename[@weight]</></term>
-      <term><option>--file=</><replaceable>filename[@weight]</></term>
+      <term><option>-f</option> <replaceable>filename[@weight]</replaceable></term>
+      <term><option>--file=</option><replaceable>filename[@weight]</replaceable></term>
       <listitem>
        <para>
-        Add a transaction script read from <replaceable>filename</> to
+        Add a transaction script read from <replaceable>filename</replaceable> to
         the list of executed scripts.
-        An optional integer weight after <literal>@</> allows to adjust the
+        An optional integer weight after <literal>@</literal> allows to adjust the
         probability of drawing the test.
         See below for details.
        </para>
@@ -338,8 +415,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-j</option> <replaceable>threads</></term>
-      <term><option>--jobs=</option><replaceable>threads</></term>
+      <term><option>-j</option> <replaceable>threads</replaceable></term>
+      <term><option>--jobs=</option><replaceable>threads</replaceable></term>
       <listitem>
        <para>
         Number of worker threads within <application>pgbench</application>.
@@ -362,41 +439,41 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-L</option> <replaceable>limit</></term>
-      <term><option>--latency-limit=</option><replaceable>limit</></term>
+      <term><option>-L</option> <replaceable>limit</replaceable></term>
+      <term><option>--latency-limit=</option><replaceable>limit</replaceable></term>
       <listitem>
        <para>
-        Transaction which last more than <replaceable>limit</> milliseconds
-        are counted and reported separately, as <firstterm>late</>.
+        Transaction which last more than <replaceable>limit</replaceable> milliseconds
+        are counted and reported separately, as <firstterm>late</firstterm>.
        </para>
        <para>
-        When throttling is used (<option>--rate=...</>), transactions that
-        lag behind schedule by more than <replaceable>limit</> ms, and thus
+        When throttling is used (<option>--rate=...</option>), transactions that
+        lag behind schedule by more than <replaceable>limit</replaceable> ms, and thus
         have no hope of meeting the latency limit, are not sent to the server
         at all. They are counted and reported separately as
-        <firstterm>skipped</>.
+        <firstterm>skipped</firstterm>.
        </para>
        </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-M</option> <replaceable>querymode</></term>
-      <term><option>--protocol=</option><replaceable>querymode</></term>
+      <term><option>-M</option> <replaceable>querymode</replaceable></term>
+      <term><option>--protocol=</option><replaceable>querymode</replaceable></term>
       <listitem>
        <para>
         Protocol to use for submitting queries to the server:
           <itemizedlist>
            <listitem>
-            <para><literal>simple</>: use simple query protocol.</para>
+            <para><literal>simple</literal>: use simple query protocol.</para>
            </listitem>
            <listitem>
-            <para><literal>extended</>: use extended query protocol.</para>
+            <para><literal>extended</literal>: use extended query protocol.</para>
            </listitem>
            <listitem>
-            <para><literal>prepared</>: use extended query protocol with prepared statements.</para>
+            <para><literal>prepared</literal>: use extended query protocol with prepared statements.</para>
            </listitem>
           </itemizedlist>
-        The default is simple query protocol.  (See <xref linkend="protocol">
+        The default is simple query protocol.  (See <xref linkend="protocol"/>
         for more information.)
        </para>
       </listitem>
@@ -408,11 +485,11 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <listitem>
        <para>
         Perform no vacuuming before running the test.
-        This option is <emphasis>necessary</>
+        This option is <emphasis>necessary</emphasis>
         if you are running a custom test scenario that does not include
-        the standard tables <structname>pgbench_accounts</>,
-        <structname>pgbench_branches</>, <structname>pgbench_history</>, and
-        <structname>pgbench_tellers</>.
+        the standard tables <structname>pgbench_accounts</structname>,
+        <structname>pgbench_branches</structname>, <structname>pgbench_history</structname>, and
+        <structname>pgbench_tellers</structname>.
        </para>
       </listitem>
      </varlistentry>
@@ -423,20 +500,20 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <listitem>
        <para>
         Run built-in simple-update script.
-        Shorthand for <option>-b simple-update</>.
+        Shorthand for <option>-b simple-update</option>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-P</option> <replaceable>sec</></term>
-      <term><option>--progress=</option><replaceable>sec</></term>
+      <term><option>-P</option> <replaceable>sec</replaceable></term>
+      <term><option>--progress=</option><replaceable>sec</replaceable></term>
       <listitem>
        <para>
-        Show progress report every <replaceable>sec</> seconds.  The report
+        Show progress report every <replaceable>sec</replaceable> seconds.  The report
         includes the time since the beginning of the run, the tps since the
         last report, and the transaction latency average and standard
-        deviation since the last report.  Under throttling (<option>-R</>),
+        deviation since the last report.  Under throttling (<option>-R</option>),
         the latency is computed with respect to the transaction scheduled
         start time, not the actual transaction beginning time, thus it also
         includes the average schedule lag time.
@@ -457,8 +534,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-R</option> <replaceable>rate</></term>
-      <term><option>--rate=</option><replaceable>rate</></term>
+      <term><option>-R</option> <replaceable>rate</replaceable></term>
+      <term><option>--rate=</option><replaceable>rate</replaceable></term>
       <listitem>
        <para>
         Execute transactions targeting the specified rate instead of running
@@ -487,7 +564,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
        </para>
 
        <para>
-        If <option>--latency-limit</> is used together with <option>--rate</>,
+        If <option>--latency-limit</option> is used together with <option>--rate</option>,
         a transaction can lag behind so much that it is already over the
         latency limit when the previous transaction ends, because the latency
         is calculated from the scheduled start time. Such transactions are
@@ -508,15 +585,15 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</option> <replaceable>scale_factor</></term>
-      <term><option>--scale=</option><replaceable>scale_factor</></term>
+      <term><option>-s</option> <replaceable>scale_factor</replaceable></term>
+      <term><option>--scale=</option><replaceable>scale_factor</replaceable></term>
       <listitem>
        <para>
-        Report the specified scale factor in <application>pgbench</>'s
+        Report the specified scale factor in <application>pgbench</application>'s
         output.  With the built-in tests, this is not necessary; the
         correct scale factor will be detected by counting the number of
-        rows in the <structname>pgbench_branches</> table.
-        However, when testing only custom benchmarks (<option>-f</> option),
+        rows in the <structname>pgbench_branches</structname> table.
+        However, when testing only custom benchmarks (<option>-f</option> option),
         the scale factor will be reported as 1 unless this option is used.
        </para>
       </listitem>
@@ -528,14 +605,14 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <listitem>
        <para>
         Run built-in select-only script.
-        Shorthand for <option>-b select-only</>.
+        Shorthand for <option>-b select-only</option>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t</option> <replaceable>transactions</></term>
-      <term><option>--transactions=</option><replaceable>transactions</></term>
+      <term><option>-t</option> <replaceable>transactions</replaceable></term>
+      <term><option>--transactions=</option><replaceable>transactions</replaceable></term>
       <listitem>
        <para>
         Number of transactions each client runs.  Default is 10.
@@ -544,8 +621,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-T</option> <replaceable>seconds</></term>
-      <term><option>--time=</option><replaceable>seconds</></term>
+      <term><option>-T</option> <replaceable>seconds</replaceable></term>
+      <term><option>--time=</option><replaceable>seconds</replaceable></term>
       <listitem>
        <para>
         Run the test for this many seconds, rather than a fixed number of
@@ -561,15 +638,15 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <listitem>
        <para>
         Vacuum all four standard tables before running the test.
-        With neither <option>-n</> nor <option>-v</>, <application>pgbench</application> will vacuum the
-        <structname>pgbench_tellers</> and <structname>pgbench_branches</>
-        tables, and will truncate <structname>pgbench_history</>.
+        With neither <option>-n</option> nor <option>-v</option>, <application>pgbench</application> will vacuum the
+        <structname>pgbench_tellers</structname> and <structname>pgbench_branches</structname>
+        tables, and will truncate <structname>pgbench_history</structname>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--aggregate-interval=<replaceable>seconds</></option></term>
+      <term><option>--aggregate-interval=<replaceable>seconds</replaceable></option></term>
       <listitem>
        <para>
         Length of aggregation interval (in seconds).  May be used only
@@ -580,11 +657,11 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--log-prefix=<replaceable>prefix</></option></term>
+      <term><option>--log-prefix=<replaceable>prefix</replaceable></option></term>
       <listitem>
        <para>
         Set the filename prefix for the log files created by
-        <option>--log</>.  The default is <literal>pgbench_log</>.
+        <option>--log</option>.  The default is <literal>pgbench_log</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -593,7 +670,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
       <term><option>--progress-timestamp</option></term>
       <listitem>
        <para>
-        When showing progress (option <option>-P</>), use a timestamp
+        When showing progress (option <option>-P</option>), use a timestamp
         (Unix epoch) instead of the number of seconds since the
         beginning of the run.  The unit is in seconds, with millisecond
         precision after the dot.
@@ -603,7 +680,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--sampling-rate=<replaceable>rate</></option></term>
+      <term><option>--sampling-rate=<replaceable>rate</replaceable></option></term>
       <listitem>
        <para>
         Sampling rate, used when writing data into the log, to reduce the
@@ -635,8 +712,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
     <variablelist>
 
      <varlistentry>
-      <term><option>-h</option> <replaceable>hostname</></term>
-      <term><option>--host=</option><replaceable>hostname</></term>
+      <term><option>-h</option> <replaceable>hostname</replaceable></term>
+      <term><option>--host=</option><replaceable>hostname</replaceable></term>
       <listitem>
        <para>
         The database server's host name
@@ -645,8 +722,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p</option> <replaceable>port</></term>
-      <term><option>--port=</option><replaceable>port</></term>
+      <term><option>-p</option> <replaceable>port</replaceable></term>
+      <term><option>--port=</option><replaceable>port</replaceable></term>
       <listitem>
        <para>
         The database server's port number
@@ -655,8 +732,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U</option> <replaceable>login</></term>
-      <term><option>--username=</option><replaceable>login</></term>
+      <term><option>-U</option> <replaceable>login</replaceable></term>
+      <term><option>--username=</option><replaceable>login</replaceable></term>
       <listitem>
        <para>
         The user name to connect as
@@ -665,8 +742,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>pgbench</application> version and exit.
@@ -675,8 +752,8 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pgbench</application> command line
@@ -694,23 +771,23 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   <title>Notes</title>
 
  <refsect2>
-  <title>What is the <quote>Transaction</> Actually Performed in <application>pgbench</application>?</title>
+  <title>What is the <quote>Transaction</quote> Actually Performed in <application>pgbench</application>?</title>
 
   <para>
-   <application>pgbench</> executes test scripts chosen randomly
+   <application>pgbench</application> executes test scripts chosen randomly
    from a specified list.
-   They include built-in scripts with <option>-b</> and
-   user-provided custom scripts with <option>-f</>.
+   They include built-in scripts with <option>-b</option> and
+   user-provided custom scripts with <option>-f</option>.
    Each script may be given a relative weight specified after a
-   <literal>@</> so as to change its drawing probability.
-   The default weight is <literal>1</>.
-   Scripts with a weight of <literal>0</> are ignored.
+   <literal>@</literal> so as to change its drawing probability.
+   The default weight is <literal>1</literal>.
+   Scripts with a weight of <literal>0</literal> are ignored.
  </para>
 
   <para>
-   The default built-in transaction script (also invoked with <option>-b tpcb-like</>)
-   issues seven commands per transaction over randomly chosen <literal>aid</>,
-   <literal>tid</>, <literal>bid</> and <literal>balance</>.
+   The default built-in transaction script (also invoked with <option>-b tpcb-like</option>)
+   issues seven commands per transaction over randomly chosen <literal>aid</literal>,
+   <literal>tid</literal>, <literal>bid</literal> and <literal>balance</literal>.
    The scenario is inspired by the TPC-B benchmark, but is not actually TPC-B,
    hence the name.
   </para>
@@ -726,15 +803,15 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   </orderedlist>
 
   <para>
-   If you select the <literal>simple-update</> built-in (also <option>-N</>),
+   If you select the <literal>simple-update</literal> built-in (also <option>-N</option>),
    steps 4 and 5 aren't included in the transaction.
    This will avoid update contention on these tables, but
    it makes the test case even less like TPC-B.
   </para>
 
   <para>
-   If you select the <literal>select-only</> built-in (also <option>-S</>),
-   only the <command>SELECT</> is issued.
+   If you select the <literal>select-only</literal> built-in (also <option>-S</option>),
+   only the <command>SELECT</command> is issued.
   </para>
  </refsect2>
 
@@ -745,41 +822,43 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
    <application>pgbench</application> has support for running custom
    benchmark scenarios by replacing the default transaction script
    (described above) with a transaction script read from a file
-   (<option>-f</option> option).  In this case a <quote>transaction</>
+   (<option>-f</option> option).  In this case a <quote>transaction</quote>
    counts as one execution of a script file.
   </para>
 
   <para>
    A script file contains one or more SQL commands terminated by
    semicolons.  Empty lines and lines beginning with
-   <literal>--</> are ignored.  Script files can also contain
-   <quote>meta commands</>, which are interpreted by <application>pgbench</>
+   <literal>--</literal> are ignored.  Script files can also contain
+   <quote>meta commands</quote>, which are interpreted by <application>pgbench</application>
    itself, as described below.
   </para>
 
   <note>
    <para>
-    Before <productname>PostgreSQL</> 9.6, SQL commands in script files
+    Before <productname>PostgreSQL</productname> 9.6, SQL commands in script files
     were terminated by newlines, and so they could not be continued across
-    lines.  Now a semicolon is <emphasis>required</> to separate consecutive
+    lines.  Now a semicolon is <emphasis>required</emphasis> to separate consecutive
     SQL commands (though a SQL command does not need one if it is followed
     by a meta command).  If you need to create a script file that works with
-    both old and new versions of <application>pgbench</>, be sure to write
+    both old and new versions of <application>pgbench</application>, be sure to write
     each SQL command on a single line ending with a semicolon.
    </para>
   </note>
 
   <para>
    There is a simple variable-substitution facility for script files.
-   Variables can be set by the command-line <option>-D</> option,
+   Variable names must consist of letters (including non-Latin letters),
+   digits, and underscores.
+   Variables can be set by the command-line <option>-D</option> option,
    explained above, or by the meta commands explained below.
-   In addition to any variables preset by <option>-D</> command-line options,
+   In addition to any variables preset by <option>-D</option> command-line options,
    there are a few variables that are preset automatically, listed in
-   <xref linkend="pgbench-automatic-variables">. A value specified for these
-   variables using <option>-D</> takes precedence over the automatic presets.
+   <xref linkend="pgbench-automatic-variables"/>. A value specified for these
+   variables using <option>-D</option> takes precedence over the automatic presets.
    Once set, a variable's
    value can be inserted into a SQL command by writing
-   <literal>:</><replaceable>variablename</>.  When running more than
+   <literal>:</literal><replaceable>variablename</replaceable>.  When running more than
    one client session, each session has its own set of variables.
   </para>
 
@@ -808,7 +887,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
    </table>
 
   <para>
-   Script file meta commands begin with a backslash (<literal>\</>) and
+   Script file meta commands begin with a backslash (<literal>\</literal>) and
    normally extend to the end of the line, although they can be continued
    to additional lines by writing backslash-return.
    Arguments to a meta command are separated by white space.
@@ -818,21 +897,39 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   <variablelist>
    <varlistentry id='pgbench-metacommand-set'>
     <term>
-     <literal>\set <replaceable>varname</> <replaceable>expression</></literal>
+     <literal>\set <replaceable>varname</replaceable> <replaceable>expression</replaceable></literal>
     </term>
 
     <listitem>
      <para>
-      Sets variable <replaceable>varname</> to a value calculated
-      from <replaceable>expression</>.
-      The expression may contain integer constants such as <literal>5432</>,
-      double constants such as <literal>3.14159</>,
-      references to variables <literal>:</><replaceable>variablename</>,
-      unary operators (<literal>+</>, <literal>-</>) and binary operators
-      (<literal>+</>, <literal>-</>, <literal>*</>, <literal>/</>,
-      <literal>%</>) with their usual precedence and associativity,
-      <link linkend="pgbench-builtin-functions">function calls</>, and
-      parentheses.
+      Sets variable <replaceable>varname</replaceable> to a value calculated
+      from <replaceable>expression</replaceable>.
+      The expression may contain the <literal>NULL</literal> constant,
+      boolean constants <literal>TRUE</literal> and <literal>FALSE</literal>,
+      integer constants such as <literal>5432</literal>,
+      double constants such as <literal>3.14159</literal>,
+      references to variables <literal>:</literal><replaceable>variablename</replaceable>,
+      <link linkend="pgbench-builtin-operators">operators</link>
+      with their usual SQL precedence and associativity,
+      <link linkend="pgbench-builtin-functions">function calls</link>,
+      SQL <link linkend="functions-case"><token>CASE</token> generic conditional
+      expressions</link> and parentheses.
+     </para>
+
+     <para>
+      Functions and most operators return <literal>NULL</literal> on
+      <literal>NULL</literal> input.
+     </para>
+
+     <para>
+      For conditional purposes, non zero numerical values are
+      <literal>TRUE</literal>, zero numerical values and <literal>NULL</literal>
+      are <literal>FALSE</literal>.
+     </para>
+
+     <para>
+      When no final <token>ELSE</token> clause is provided to a
+      <token>CASE</token>, the default value is <literal>NULL</literal>.
      </para>
 
      <para>
@@ -841,22 +938,23 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
 \set ntellers 10 * :scale
 \set aid (1021 * random(1, 100000 * :scale)) % \
            (100000 * :scale) + 1
+\set divx CASE WHEN :x &lt;&gt; 0 THEN :y/:x ELSE NULL END
 </programlisting></para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
     <term>
-     <literal>\sleep <replaceable>number</> [ us | ms | s ]</literal>
+     <literal>\sleep <replaceable>number</replaceable> [ us | ms | s ]</literal>
     </term>
 
     <listitem>
      <para>
       Causes script execution to sleep for the specified duration in
-      microseconds (<literal>us</>), milliseconds (<literal>ms</>) or seconds
-      (<literal>s</>).  If the unit is omitted then seconds are the default.
-      <replaceable>number</> can be either an integer constant or a
-      <literal>:</><replaceable>variablename</> reference to a variable
+      microseconds (<literal>us</literal>), milliseconds (<literal>ms</literal>) or seconds
+      (<literal>s</literal>).  If the unit is omitted then seconds are the default.
+      <replaceable>number</replaceable> can be either an integer constant or a
+      <literal>:</literal><replaceable>variablename</replaceable> reference to a variable
       having an integer value.
      </para>
 
@@ -870,22 +968,22 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
 
    <varlistentry>
     <term>
-     <literal>\setshell <replaceable>varname</> <replaceable>command</> [ <replaceable>argument</> ... ]</literal>
+     <literal>\setshell <replaceable>varname</replaceable> <replaceable>command</replaceable> [ <replaceable>argument</replaceable> ... ]</literal>
     </term>
 
     <listitem>
      <para>
-      Sets variable <replaceable>varname</> to the result of the shell command
-      <replaceable>command</> with the given <replaceable>argument</>(s).
+      Sets variable <replaceable>varname</replaceable> to the result of the shell command
+      <replaceable>command</replaceable> with the given <replaceable>argument</replaceable>(s).
       The command must return an integer value through its standard output.
      </para>
 
      <para>
-      <replaceable>command</> and each <replaceable>argument</> can be either
-      a text constant or a <literal>:</><replaceable>variablename</> reference
-      to a variable. If you want to use an <replaceable>argument</> starting
+      <replaceable>command</replaceable> and each <replaceable>argument</replaceable> can be either
+      a text constant or a <literal>:</literal><replaceable>variablename</replaceable> reference
+      to a variable. If you want to use an <replaceable>argument</replaceable> starting
       with a colon, write an additional colon at the beginning of
-      <replaceable>argument</>.
+      <replaceable>argument</replaceable>.
      </para>
 
      <para>
@@ -898,7 +996,7 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
 
    <varlistentry>
     <term>
-     <literal>\shell <replaceable>command</> [ <replaceable>argument</> ... ]</literal>
+     <literal>\shell <replaceable>command</replaceable> [ <replaceable>argument</replaceable> ... ]</literal>
     </term>
 
     <listitem>
@@ -917,12 +1015,183 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
   </variablelist>
  </refsect2>
 
+ <refsect2 id="pgbench-builtin-operators">
+  <title>Built-In Operators</title>
+
+  <para>
+   The arithmetic, bitwise, comparison and logical operators listed in
+   <xref linkend="pgbench-operators"/> are built into <application>pgbench</application>
+   and may be used in expressions appearing in
+   <link linkend="pgbench-metacommand-set"><literal>\set</literal></link>.
+  </para>
+
+  <table id="pgbench-operators">
+   <title>pgbench Operators by increasing precedence</title>
+   <tgroup cols="4">
+    <thead>
+     <row>
+      <entry>Operator</entry>
+      <entry>Description</entry>
+      <entry>Example</entry>
+      <entry>Result</entry>
+     </row>
+    </thead>
+    <tbody>
+     <row>
+      <entry><literal>OR</literal></entry>
+      <entry>logical or</entry>
+      <entry><literal>5 or 0</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>AND</literal></entry>
+      <entry>logical and</entry>
+      <entry><literal>3 and 0</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>NOT</literal></entry>
+      <entry>logical not</entry>
+      <entry><literal>not false</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>IS [NOT] (NULL|TRUE|FALSE)</literal></entry>
+      <entry>value tests</entry>
+      <entry><literal>1 is null</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>ISNULL|NOTNULL</literal></entry>
+      <entry>null tests</entry>
+      <entry><literal>1 notnull</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>=</literal></entry>
+      <entry>is equal</entry>
+      <entry><literal>5 = 4</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&lt;&gt;</literal></entry>
+      <entry>is not equal</entry>
+      <entry><literal>5 &lt;&gt; 4</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>!=</literal></entry>
+      <entry>is not equal</entry>
+      <entry><literal>5 != 5</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&lt;</literal></entry>
+      <entry>lower than</entry>
+      <entry><literal>5 &lt; 4</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&lt;=</literal></entry>
+      <entry>lower or equal</entry>
+      <entry><literal>5 &lt;= 4</literal></entry>
+      <entry><literal>FALSE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&gt;</literal></entry>
+      <entry>greater than</entry>
+      <entry><literal>5 &gt; 4</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&gt;=</literal></entry>
+      <entry>greater or equal</entry>
+      <entry><literal>5 &gt;= 4</literal></entry>
+      <entry><literal>TRUE</literal></entry>
+     </row>
+     <row>
+      <entry><literal>|</literal></entry>
+      <entry>integer bitwise OR</entry>
+      <entry><literal>1 | 2</literal></entry>
+      <entry><literal>3</literal></entry>
+     </row>
+     <row>
+      <entry><literal>#</literal></entry>
+      <entry>integer bitwise XOR</entry>
+      <entry><literal>1 # 3</literal></entry>
+      <entry><literal>2</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&amp;</literal></entry>
+      <entry>integer bitwise AND</entry>
+      <entry><literal>1 &amp; 3</literal></entry>
+      <entry><literal>1</literal></entry>
+     </row>
+     <row>
+      <entry><literal>~</literal></entry>
+      <entry>integer bitwise NOT</entry>
+      <entry><literal>~ 1</literal></entry>
+      <entry><literal>-2</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&lt;&lt;</literal></entry>
+      <entry>integer bitwise shift left</entry>
+      <entry><literal>1 &lt;&lt; 2</literal></entry>
+      <entry><literal>4</literal></entry>
+     </row>
+     <row>
+      <entry><literal>&gt;&gt;</literal></entry>
+      <entry>integer bitwise shift right</entry>
+      <entry><literal>8 &gt;&gt; 2</literal></entry>
+      <entry><literal>2</literal></entry>
+     </row>
+     <row>
+      <entry><literal>+</literal></entry>
+      <entry>addition</entry>
+      <entry><literal>5 + 4</literal></entry>
+      <entry><literal>9</literal></entry>
+     </row>
+     <row>
+      <entry><literal>-</literal></entry>
+      <entry>substraction</entry>
+      <entry><literal>3 - 2.0</literal></entry>
+      <entry><literal>1.0</literal></entry>
+     </row>
+     <row>
+      <entry><literal>*</literal></entry>
+      <entry>multiplication</entry>
+      <entry><literal>5 * 4</literal></entry>
+      <entry><literal>20</literal></entry>
+     </row>
+     <row>
+      <entry><literal>/</literal></entry>
+      <entry>division (integer truncates the results)</entry>
+      <entry><literal>5 / 3</literal></entry>
+      <entry><literal>1</literal></entry>
+     </row>
+     <row>
+      <entry><literal>%</literal></entry>
+      <entry>modulo</entry>
+      <entry><literal>3 % 2</literal></entry>
+      <entry><literal>1</literal></entry>
+     </row>
+     <row>
+      <entry><literal>-</literal></entry>
+      <entry>opposite</entry>
+      <entry><literal>- 2.0</literal></entry>
+      <entry><literal>-2.0</literal></entry>
+     </row>
+    </tbody>
+   </tgroup>
+  </table>
+ </refsect2>
+
  <refsect2 id="pgbench-builtin-functions">
   <title>Built-In Functions</title>
 
   <para>
-   The functions listed in <xref linkend="pgbench-functions"> are built
-   into <application>pgbench</> and may be used in expressions appearing in
+   The functions listed in <xref linkend="pgbench-functions"/> are built
+   into <application>pgbench</application> and may be used in expressions appearing in
    <link linkend="pgbench-metacommand-set"><literal>\set</literal></link>.
   </para>
 
@@ -941,123 +1210,159 @@ pgbench <optional> <replaceable>options</> </optional> <replaceable>dbname</>
      </thead>
      <tbody>
       <row>
-       <entry><literal><function>abs(<replaceable>a</>)</></></>
-       <entry>same as <replaceable>a</></>
-       <entry>absolute value</>
-       <entry><literal>abs(-17)</></>
-       <entry><literal>17</></>
+       <entry><literal><function>abs(<replaceable>a</replaceable>)</function></literal></entry>
+       <entry>same as <replaceable>a</replaceable></entry>
+       <entry>absolute value</entry>
+       <entry><literal>abs(-17)</literal></entry>
+       <entry><literal>17</literal></entry>
+      </row>
+      <row>
+       <entry><literal><function>debug(<replaceable>a</replaceable>)</function></literal></entry>
+       <entry>same as <replaceable>a</replaceable> </entry>
+       <entry>print <replaceable>a</replaceable> to <systemitem>stderr</systemitem>,
+        and return <replaceable>a</replaceable></entry>
+       <entry><literal>debug(5432.1)</literal></entry>
+       <entry><literal>5432.1</literal></entry>
+      </row>
+      <row>
+       <entry><literal><function>double(<replaceable>i</replaceable>)</function></literal></entry>
+       <entry>double</entry>
+       <entry>cast to double</entry>
+       <entry><literal>double(5432)</literal></entry>
+       <entry><literal>5432.0</literal></entry>
+      </row>
+      <row>
+       <entry><literal><function>exp(<replaceable>x</replaceable>)</function></literal></entry>
+       <entry>double</entry>
+       <entry>exponential</entry>
+       <entry><literal>exp(1.0)</literal></entry>
+       <entry><literal>2.718281828459045</literal></entry>
+      </row>
+      <row>
+       <entry><literal><function>greatest(<replaceable>a</replaceable> [, <replaceable>...</replaceable> ] )</function></literal></entry>
+       <entry>double if any <replaceable>a</replaceable> is double, else integer</entry>
+       <entry>largest value among arguments</entry>
+       <entry><literal>greatest(5, 4, 3, 2)</literal></entry>
+       <entry><literal>5</literal></entry>
+      </row>
+      <row>
+       <entry><literal><function>int(<replaceable>x</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>cast to int</entry>
+       <entry><literal>int(5.4 + 3.8)</literal></entry>
+       <entry><literal>9</literal></entry>
       </row>
       <row>
-       <entry><literal><function>debug(<replaceable>a</>)</></></>
-       <entry>same as <replaceable>a</> </>
-       <entry>print <replaceable>a</> to <systemitem>stderr</systemitem>,
-        and return <replaceable>a</></>
-       <entry><literal>debug(5432.1)</></>
-       <entry><literal>5432.1</></>
+       <entry><literal><function>least(<replaceable>a</replaceable> [, <replaceable>...</replaceable> ] )</function></literal></entry>
+       <entry>double if any <replaceable>a</replaceable> is double, else integer</entry>
+       <entry>smallest value among arguments</entry>
+       <entry><literal>least(5, 4, 3, 2.1)</literal></entry>
+       <entry><literal>2.1</literal></entry>
       </row>
       <row>
-       <entry><literal><function>double(<replaceable>i</>)</></></>
-       <entry>double</>
-       <entry>cast to double</>
-       <entry><literal>double(5432)</></>
-       <entry><literal>5432.0</></>
+       <entry><literal><function>ln(<replaceable>x</replaceable>)</function></literal></entry>
+       <entry>double</entry>
+       <entry>natural logarithm</entry>
+       <entry><literal>ln(2.718281828459045)</literal></entry>
+       <entry><literal>1.0</literal></entry>
       </row>
       <row>
-       <entry><literal><function>greatest(<replaceable>a</> [, <replaceable>...</> ] )</></></>
-       <entry>double if any <replaceable>a</> is double, else integer</>
-       <entry>largest value among arguments</>
-       <entry><literal>greatest(5, 4, 3, 2)</></>
-       <entry><literal>5</></>
+       <entry><literal><function>mod(<replaceable>i</replaceable>, <replaceable>bj</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>modulo</entry>
+       <entry><literal>mod(54, 32)</literal></entry>
+       <entry><literal>22</literal></entry>
       </row>
       <row>
-       <entry><literal><function>int(<replaceable>x</>)</></></>
-       <entry>integer</>
-       <entry>cast to int</>
-       <entry><literal>int(5.4 + 3.8)</></>
-       <entry><literal>9</></>
+       <entry><literal><function>pi()</function></literal></entry>
+       <entry>double</entry>
+       <entry>value of the constant PI</entry>
+       <entry><literal>pi()</literal></entry>
+       <entry><literal>3.14159265358979323846</literal></entry>
       </row>
       <row>
-       <entry><literal><function>least(<replaceable>a</> [, <replaceable>...</> ] )</></></>
-       <entry>double if any <replaceable>a</> is double, else integer</>
-       <entry>smallest value among arguments</>
-       <entry><literal>least(5, 4, 3, 2.1)</></>
-       <entry><literal>2.1</></>
+       <entry><literal><function>pow(<replaceable>x</replaceable>, <replaceable>y</replaceable>)</function>, <function>power(<replaceable>x</replaceable>, <replaceable>y</replaceable>)</function></literal></entry>
+       <entry>double</entry>
+       <entry>exponentiation</entry>
+       <entry><literal>pow(2.0, 10)</literal>, <literal>power(2.0, 10)</literal></entry>
+       <entry><literal>1024.0</literal></entry>
       </row>
       <row>
-       <entry><literal><function>pi()</></></>
-       <entry>double</>
-       <entry>value of the constant PI</>
-       <entry><literal>pi()</></>
-       <entry><literal>3.14159265358979323846</></>
+       <entry><literal><function>random(<replaceable>lb</replaceable>, <replaceable>ub</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>uniformly-distributed random integer in <literal>[lb, ub]</literal></entry>
+       <entry><literal>random(1, 10)</literal></entry>
+       <entry>an integer between <literal>1</literal> and <literal>10</literal></entry>
       </row>
       <row>
-       <entry><literal><function>random(<replaceable>lb</>, <replaceable>ub</>)</></></>
-       <entry>integer</>
-       <entry>uniformly-distributed random integer in <literal>[lb, ub]</></>
-       <entry><literal>random(1, 10)</></>
-       <entry>an integer between <literal>1</> and <literal>10</></>
+       <entry><literal><function>random_exponential(<replaceable>lb</replaceable>, <replaceable>ub</replaceable>, <replaceable>parameter</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>exponentially-distributed random integer in <literal>[lb, ub]</literal>,
+              see below</entry>
+       <entry><literal>random_exponential(1, 10, 3.0)</literal></entry>
+       <entry>an integer between <literal>1</literal> and <literal>10</literal></entry>
       </row>
       <row>
-       <entry><literal><function>random_exponential(<replaceable>lb</>, <replaceable>ub</>, <replaceable>parameter</>)</></></>
-       <entry>integer</>
-       <entry>exponentially-distributed random integer in <literal>[lb, ub]</>,
-              see below</>
-       <entry><literal>random_exponential(1, 10, 3.0)</></>
-       <entry>an integer between <literal>1</> and <literal>10</></>
+       <entry><literal><function>random_gaussian(<replaceable>lb</replaceable>, <replaceable>ub</replaceable>, <replaceable>parameter</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>Gaussian-distributed random integer in <literal>[lb, ub]</literal>,
+              see below</entry>
+       <entry><literal>random_gaussian(1, 10, 2.5)</literal></entry>
+       <entry>an integer between <literal>1</literal> and <literal>10</literal></entry>
       </row>
       <row>
-       <entry><literal><function>random_gaussian(<replaceable>lb</>, <replaceable>ub</>, <replaceable>parameter</>)</></></>
-       <entry>integer</>
-       <entry>Gaussian-distributed random integer in <literal>[lb, ub]</>,
-              see below</>
-       <entry><literal>random_gaussian(1, 10, 2.5)</></>
-       <entry>an integer between <literal>1</> and <literal>10</></>
+       <entry><literal><function>random_zipfian(<replaceable>lb</replaceable>, <replaceable>ub</replaceable>, <replaceable>parameter</replaceable>)</function></literal></entry>
+       <entry>integer</entry>
+       <entry>Zipfian-distributed random integer in <literal>[lb, ub]</literal>,
+              see below</entry>
+       <entry><literal>random_zipfian(1, 10, 1.5)</literal></entry>
+       <entry>an integer between <literal>1</literal> and <literal>10</literal></entry>
       </row>
       <row>
-       <entry><literal><function>sqrt(<replaceable>x</>)</></></>
-       <entry>double</>
-       <entry>square root</>
-       <entry><literal>sqrt(2.0)</></>
-       <entry><literal>1.414213562</></>
+       <entry><literal><function>sqrt(<replaceable>x</replaceable>)</function></literal></entry>
+       <entry>double</entry>
+       <entry>square root</entry>
+       <entry><literal>sqrt(2.0)</literal></entry>
+       <entry><literal>1.414213562</literal></entry>
       </row>
      </tbody>
      </tgroup>
    </table>
 
    <para>
-    The <literal>random</> function generates values using a uniform
+    The <literal>random</literal> function generates values using a uniform
     distribution, that is all the values are drawn within the specified
-    range with equal probability. The <literal>random_exponential</> and
-    <literal>random_gaussian</> functions require an additional double
+    range with equal probability. The <literal>random_exponential</literal> and
+    <literal>random_gaussian</literal> functions require an additional double
     parameter which determines the precise shape of the distribution.
    </para>
 
    <itemizedlist>
     <listitem>
      <para>
-      For an exponential distribution, <replaceable>parameter</>
+      For an exponential distribution, <replaceable>parameter</replaceable>
       controls the distribution by truncating a quickly-decreasing
-      exponential distribution at <replaceable>parameter</>, and then
+      exponential distribution at <replaceable>parameter</replaceable>, and then
       projecting onto integers between the bounds.
       To be precise, with
 <literallayout>
 f(x) = exp(-parameter * (x - min) / (max - min + 1)) / (1 - exp(-parameter))
 </literallayout>
-      Then value <replaceable>i</> between <replaceable>min</> and
-      <replaceable>max</> inclusive is drawn with probability:
-      <literal>f(i) - f(i + 1)</>.
+      Then value <replaceable>i</replaceable> between <replaceable>min</replaceable> and
+      <replaceable>max</replaceable> inclusive is drawn with probability:
+      <literal>f(i) - f(i + 1)</literal>.
      </para>
 
      <para>
-      Intuitively, the larger the <replaceable>parameter</>, the more
-      frequently values close to <replaceable>min</> are accessed, and the
-      less frequently values close to <replaceable>max</> are accessed.
-      The closer to 0 <replaceable>parameter</> is, the flatter (more
+      Intuitively, the larger the <replaceable>parameter</replaceable>, the more
+      frequently values close to <replaceable>min</replaceable> are accessed, and the
+      less frequently values close to <replaceable>max</replaceable> are accessed.
+      The closer to 0 <replaceable>parameter</replaceable> is, the flatter (more
       uniform) the access distribution.
       A crude approximation of the distribution is that the most frequent 1%
-      values in the range, close to <replaceable>min</>, are drawn
-      <replaceable>parameter</>% of the time.
-      The <replaceable>parameter</> value must be strictly positive.
+      values in the range, close to <replaceable>min</replaceable>, are drawn
+      <replaceable>parameter</replaceable>% of the time.
+      The <replaceable>parameter</replaceable> value must be strictly positive.
      </para>
     </listitem>
 
@@ -1065,35 +1370,56 @@ f(x) = exp(-parameter * (x - min) / (max - min + 1)) / (1 - exp(-parameter))
      <para>
       For a Gaussian distribution, the interval is mapped onto a standard
       normal distribution (the classical bell-shaped Gaussian curve) truncated
-      at <literal>-parameter</> on the left and <literal>+parameter</>
+      at <literal>-parameter</literal> on the left and <literal>+parameter</literal>
       on the right.
       Values in the middle of the interval are more likely to be drawn.
-      To be precise, if <literal>PHI(x)</> is the cumulative distribution
-      function of the standard normal distribution, with mean <literal>mu</>
-      defined as <literal>(max + min) / 2.0</>, with
+      To be precise, if <literal>PHI(x)</literal> is the cumulative distribution
+      function of the standard normal distribution, with mean <literal>mu</literal>
+      defined as <literal>(max + min) / 2.0</literal>, with
 <literallayout>
 f(x) = PHI(2.0 * parameter * (x - mu) / (max - min + 1)) /
        (2.0 * PHI(parameter) - 1)
 </literallayout>
-      then value <replaceable>i</> between <replaceable>min</> and
-      <replaceable>max</> inclusive is drawn with probability:
-      <literal>f(i + 0.5) - f(i - 0.5)</>.
-      Intuitively, the larger the <replaceable>parameter</>, the more
+      then value <replaceable>i</replaceable> between <replaceable>min</replaceable> and
+      <replaceable>max</replaceable> inclusive is drawn with probability:
+      <literal>f(i + 0.5) - f(i - 0.5)</literal>.
+      Intuitively, the larger the <replaceable>parameter</replaceable>, the more
       frequently values close to the middle of the interval are drawn, and the
-      less frequently values close to the <replaceable>min</> and
-      <replaceable>max</> bounds. About 67% of values are drawn from the
-      middle <literal>1.0 / parameter</>, that is a relative
-      <literal>0.5 / parameter</> around the mean, and 95% in the middle
-      <literal>2.0 / parameter</>, that is a relative
-      <literal>1.0 / parameter</> around the mean; for instance, if
-      <replaceable>parameter</> is 4.0, 67% of values are drawn from the
+      less frequently values close to the <replaceable>min</replaceable> and
+      <replaceable>max</replaceable> bounds. About 67% of values are drawn from the
+      middle <literal>1.0 / parameter</literal>, that is a relative
+      <literal>0.5 / parameter</literal> around the mean, and 95% in the middle
+      <literal>2.0 / parameter</literal>, that is a relative
+      <literal>1.0 / parameter</literal> around the mean; for instance, if
+      <replaceable>parameter</replaceable> is 4.0, 67% of values are drawn from the
       middle quarter (1.0 / 4.0) of the interval (i.e. from
-      <literal>3.0 / 8.0</> to <literal>5.0 / 8.0</>) and 95% from
-      the middle half (<literal>2.0 / 4.0</>) of the interval (second and third
-      quartiles). The minimum <replaceable>parameter</> is 2.0 for performance
+      <literal>3.0 / 8.0</literal> to <literal>5.0 / 8.0</literal>) and 95% from
+      the middle half (<literal>2.0 / 4.0</literal>) of the interval (second and third
+      quartiles). The minimum <replaceable>parameter</replaceable> is 2.0 for performance
       of the Box-Muller transform.
      </para>
     </listitem>
+    <listitem>
+     <para>
+      <literal>random_zipfian</literal> generates an approximated bounded zipfian
+      distribution. For <replaceable>parameter</replaceable> in (0, 1), an
+      approximated algorithm is taken from
+      "Quickly Generating Billion-Record Synthetic Databases",
+      Jim Gray et al, SIGMOD 1994. For <replaceable>parameter</replaceable>
+      in (1, 1000), a rejection method is used, based on
+      "Non-Uniform Random Variate Generation", Luc Devroye, p. 550-551,
+      Springer 1986. The distribution is not defined when the parameter's
+      value is 1.0. The drawing performance is poor for parameter values
+      close and above 1.0 and on a small range.
+     </para>
+     <para>
+      <replaceable>parameter</replaceable>
+      defines how skewed the distribution is. The larger the <replaceable>parameter</replaceable>, the more
+      frequently values to the beginning of the interval are drawn.
+      The closer to 0 <replaceable>parameter</replaceable> is,
+      the flatter (more uniform) the access distribution.
+     </para>
+    </listitem>
    </itemizedlist>
 
   <para>
@@ -1126,21 +1452,21 @@ END;
   <title>Per-Transaction Logging</title>
 
   <para>
-   With the <option>-l</> option (but without
+   With the <option>-l</option> option (but without
    the <option>--aggregate-interval</option> option),
-   <application>pgbench</> writes information about each transaction
+   <application>pgbench</application> writes information about each transaction
    to a log file.  The log file will be named
-   <filename><replaceable>prefix</>.<replaceable>nnn</></filename>,
-   where <replaceable>prefix</> defaults to <literal>pgbench_log</>, and
-   <replaceable>nnn</> is the PID of the
+   <filename><replaceable>prefix</replaceable>.<replaceable>nnn</replaceable></filename>,
+   where <replaceable>prefix</replaceable> defaults to <literal>pgbench_log</literal>, and
+   <replaceable>nnn</replaceable> is the PID of the
    <application>pgbench</application> process.
-   The prefix can be changed by using the <option>--log-prefix</> option.
-   If the <option>-j</> option is 2 or higher, so that there are multiple
+   The prefix can be changed by using the <option>--log-prefix</option> option.
+   If the <option>-j</option> option is 2 or higher, so that there are multiple
    worker threads, each will have its own log file. The first worker will
    use the same name for its log file as in the standard single worker case.
    The additional log files for the other workers will be named
-   <filename><replaceable>prefix</>.<replaceable>nnn</>.<replaceable>mmm</></filename>,
-   where <replaceable>mmm</> is a sequential number for each worker starting
+   <filename><replaceable>prefix</replaceable>.<replaceable>nnn</replaceable>.<replaceable>mmm</replaceable></filename>,
+   where <replaceable>mmm</replaceable> is a sequential number for each worker starting
    with 1.
   </para>
 
@@ -1148,27 +1474,27 @@ END;
    The format of the log is:
 
 <synopsis>
-<replaceable>client_id</> <replaceable>transaction_no</> <replaceable>time</> <replaceable>script_no</> <replaceable>time_epoch</> <replaceable>time_us</> <optional> <replaceable>schedule_lag</replaceable> </optional>
+<replaceable>client_id</replaceable> <replaceable>transaction_no</replaceable> <replaceable>time</replaceable> <replaceable>script_no</replaceable> <replaceable>time_epoch</replaceable> <replaceable>time_us</replaceable> <optional> <replaceable>schedule_lag</replaceable> </optional>
 </synopsis>
 
    where
-   <replaceable>client_id</> indicates which client session ran the transaction,
-   <replaceable>transaction_no</> counts how many transactions have been
+   <replaceable>client_id</replaceable> indicates which client session ran the transaction,
+   <replaceable>transaction_no</replaceable> counts how many transactions have been
    run by that session,
-   <replaceable>time</> is the total elapsed transaction time in microseconds,
-   <replaceable>script_no</> identifies which script file was used (useful when
-   multiple scripts were specified with <option>-f</> or <option>-b</>),
-   and <replaceable>time_epoch</>/<replaceable>time_us</> are a
+   <replaceable>time</replaceable> is the total elapsed transaction time in microseconds,
+   <replaceable>script_no</replaceable> identifies which script file was used (useful when
+   multiple scripts were specified with <option>-f</option> or <option>-b</option>),
+   and <replaceable>time_epoch</replaceable>/<replaceable>time_us</replaceable> are a
    Unix-epoch time stamp and an offset
    in microseconds (suitable for creating an ISO 8601
    time stamp with fractional seconds) showing when
    the transaction completed.
-   The <replaceable>schedule_lag</> field is the difference between the
+   The <replaceable>schedule_lag</replaceable> field is the difference between the
    transaction's scheduled start time, and the time it actually started, in
-   microseconds. It is only present when the <option>--rate</> option is used.
-   When both <option>--rate</> and <option>--latency-limit</> are used,
-   the <replaceable>time</> for a skipped transaction will be reported as
-   <literal>skipped</>.
+   microseconds. It is only present when the <option>--rate</option> option is used.
+   When both <option>--rate</option> and <option>--latency-limit</option> are used,
+   the <replaceable>time</replaceable> for a skipped transaction will be reported as
+   <literal>skipped</literal>.
   </para>
 
   <para>
@@ -1180,9 +1506,9 @@ END;
 0 202 2038 0 1175850569 2663
 </screen>
 
-   Another example with <literal>--rate=100</>
-   and <literal>--latency-limit=5</> (note the additional
-   <replaceable>schedule_lag</> column):
+   Another example with <literal>--rate=100</literal>
+   and <literal>--latency-limit=5</literal> (note the additional
+   <replaceable>schedule_lag</replaceable> column):
 <screen>
 0 81 4621 0 1412881037 912698 3005
 0 82 6173 0 1412881037 914578 4304
@@ -1199,7 +1525,7 @@ END;
 
   <para>
    When running a long test on hardware that can handle a lot of transactions,
-   the log files can become very large.  The <option>--sampling-rate</> option
+   the log files can become very large.  The <option>--sampling-rate</option> option
    can be used to log only a random sample of transactions.
   </para>
  </refsect2>
@@ -1212,30 +1538,30 @@ END;
    format is used for the log files:
 
 <synopsis>
-<replaceable>interval_start</> <replaceable>num_transactions</> <replaceable>sum_latency</> <replaceable>sum_latency_2</> <replaceable>min_latency</> <replaceable>max_latency</> <optional> <replaceable>sum_lag</> <replaceable>sum_lag_2</> <replaceable>min_lag</> <replaceable>max_lag</> <optional> <replaceable>skipped</> </optional> </optional>
+<replaceable>interval_start</replaceable> <replaceable>num_transactions</replaceable> <replaceable>sum_latency</replaceable> <replaceable>sum_latency_2</replaceable> <replaceable>min_latency</replaceable> <replaceable>max_latency</replaceable> <optional> <replaceable>sum_lag</replaceable> <replaceable>sum_lag_2</replaceable> <replaceable>min_lag</replaceable> <replaceable>max_lag</replaceable> <optional> <replaceable>skipped</replaceable> </optional> </optional>
 </synopsis>
 
    where
-   <replaceable>interval_start</> is the start of the interval (as a Unix
+   <replaceable>interval_start</replaceable> is the start of the interval (as a Unix
    epoch time stamp),
-   <replaceable>num_transactions</> is the number of transactions
+   <replaceable>num_transactions</replaceable> is the number of transactions
    within the interval,
    <replaceable>sum_latency</replaceable> is the sum of the transaction
    latencies within the interval,
    <replaceable>sum_latency_2</replaceable> is the sum of squares of the
    transaction latencies within the interval,
-   <replaceable>min_latency</> is the minimum latency within the interval,
+   <replaceable>min_latency</replaceable> is the minimum latency within the interval,
    and
-   <replaceable>max_latency</> is the maximum latency within the interval.
+   <replaceable>max_latency</replaceable> is the maximum latency within the interval.
    The next fields,
-   <replaceable>sum_lag</>, <replaceable>sum_lag_2</>, <replaceable>min_lag</>,
-   and <replaceable>max_lag</>, are only present if the <option>--rate</>
+   <replaceable>sum_lag</replaceable>, <replaceable>sum_lag_2</replaceable>, <replaceable>min_lag</replaceable>,
+   and <replaceable>max_lag</replaceable>, are only present if the <option>--rate</option>
    option is used.
    They provide statistics about the time each transaction had to wait for the
    previous one to finish, i.e. the difference between each transaction's
    scheduled start time and the time it actually started.
-   The very last field, <replaceable>skipped</>,
-   is only present if the <option>--latency-limit</> option is used, too.
+   The very last field, <replaceable>skipped</replaceable>,
+   is only present if the <option>--latency-limit</option> option is used, too.
    It counts the number of transactions skipped because they would have
    started too late.
    Each transaction is counted in the interval when it was committed.
@@ -1263,7 +1589,7 @@ END;
   <title>Per-Statement Latencies</title>
 
   <para>
-   With the <option>-r</> option, <application>pgbench</> collects
+   With the <option>-r</option> option, <application>pgbench</application> collects
    the elapsed transaction time of each statement executed by every
    client.  It then reports an average of those values, referred to
    as the latency for each statement, after the benchmark has finished.
@@ -1284,8 +1610,7 @@ latency average = 15.844 ms
 latency stddev = 2.715 ms
 tps = 618.764555 (including connections establishing)
 tps = 622.977698 (excluding connections establishing)
-script statistics:
- - statement latencies in milliseconds:
+statement latencies in milliseconds:
         0.002  \set aid random(1, 100000 * :scale)
         0.005  \set bid random(1, 1 * :scale)
         0.002  \set tid random(1, 10 * :scale)
@@ -1319,14 +1644,14 @@ script statistics:
   <title>Good Practices</title>
 
   <para>
-   It is very easy to use <application>pgbench</> to produce completely
+   It is very easy to use <application>pgbench</application> to produce completely
    meaningless numbers.  Here are some guidelines to help you get useful
    results.
   </para>
 
   <para>
-   In the first place, <emphasis>never</> believe any test that runs
-   for only a few seconds.  Use the <option>-t</> or <option>-T</> option
+   In the first place, <emphasis>never</emphasis> believe any test that runs
+   for only a few seconds.  Use the <option>-t</option> or <option>-T</option> option
    to make the run last at least a few minutes, so as to average out noise.
    In some cases you could need hours to get numbers that are reproducible.
    It's a good idea to try the test run a few times, to find out if your
@@ -1335,11 +1660,11 @@ script statistics:
 
   <para>
    For the default TPC-B-like test scenario, the initialization scale factor
-   (<option>-s</>) should be at least as large as the largest number of
-   clients you intend to test (<option>-c</>); else you'll mostly be
-   measuring update contention.  There are only <option>-s</> rows in
-   the <structname>pgbench_branches</> table, and every transaction wants to
-   update one of them, so <option>-c</> values in excess of <option>-s</>
+   (<option>-s</option>) should be at least as large as the largest number of
+   clients you intend to test (<option>-c</option>); else you'll mostly be
+   measuring update contention.  There are only <option>-s</option> rows in
+   the <structname>pgbench_branches</structname> table, and every transaction wants to
+   update one of them, so <option>-c</option> values in excess of <option>-s</option>
    will undoubtedly result in lots of transactions blocked waiting for
    other transactions.
   </para>
@@ -1354,14 +1679,25 @@ script statistics:
   </para>
 
   <para>
-   A limitation of <application>pgbench</> is that it can itself become
+   A limitation of <application>pgbench</application> is that it can itself become
    the bottleneck when trying to test a large number of client sessions.
-   This can be alleviated by running <application>pgbench</> on a different
+   This can be alleviated by running <application>pgbench</application> on a different
    machine from the database server, although low network latency will be
-   essential.  It might even be useful to run several <application>pgbench</>
+   essential.  It might even be useful to run several <application>pgbench</application>
    instances concurrently, on several client machines, against the same
    database server.
   </para>
  </refsect2>
+ <refsect2>
+  <title>Security</title>
+
+  <para>
+    If untrusted users have access to a database that has not adopted a
+    <link linkend="ddl-schemas-patterns">secure schema usage pattern</link>,
+    do not run <application>pgbench</application> in that
+    database.  <application>pgbench</application> uses unqualified names and
+    does not manipulate the search path.
+  </para>
+ </refsect2>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pgtestfsync.sgml b/doc/src/sgml/ref/pgtestfsync.sgml
index 467d6e647a..501157cb36 100644
--- a/doc/src/sgml/ref/pgtestfsync.sgml
+++ b/doc/src/sgml/ref/pgtestfsync.sgml
@@ -27,8 +27,8 @@
   <title>Description</title>
 
  <para>
-  <application>pg_test_fsync</> is intended to give you a reasonable
-  idea of what the fastest <xref linkend="guc-wal-sync-method"> is on your
+  <application>pg_test_fsync</application> is intended to give you a reasonable
+  idea of what the fastest <xref linkend="guc-wal-sync-method"/> is on your
   specific system,
   as well as supplying diagnostic information in the event of an identified I/O
   problem.  However, differences shown by
@@ -37,7 +37,7 @@
   are not speed-limited by their write-ahead logs.
   <application>pg_test_fsync</application> reports average file sync operation
   time in microseconds for each <literal>wal_sync_method</literal>, which can also be used to
-  inform efforts to optimize the value of <xref linkend="guc-commit-delay">.
+  inform efforts to optimize the value of <xref linkend="guc-commit-delay"/>.
  </para>
  </refsect1>
 
@@ -57,9 +57,9 @@
        <para>
         Specifies the file name to write test data in.
         This file should be in the same file system that the
-        <filename>pg_wal</> directory is or will be placed in.
-        (<filename>pg_wal</> contains the <acronym>WAL</> files.)
-        The default is <filename>pg_test_fsync.out</> in the current
+        <filename>pg_wal</filename> directory is or will be placed in.
+        (<filename>pg_wal</filename> contains the <acronym>WAL</acronym> files.)
+        The default is <filename>pg_test_fsync.out</filename> in the current
         directory.
        </para>
       </listitem>
@@ -79,8 +79,8 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>pg_test_fsync</application> version and exit.
@@ -89,8 +89,8 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_test_fsync</application> command line
@@ -107,7 +107,7 @@
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-postgres"></member>
+   <member><xref linkend="app-postgres"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pgtesttiming.sgml b/doc/src/sgml/ref/pgtesttiming.sgml
index e3539cf764..545a934cf8 100644
--- a/doc/src/sgml/ref/pgtesttiming.sgml
+++ b/doc/src/sgml/ref/pgtesttiming.sgml
@@ -27,7 +27,7 @@
   <title>Description</title>
 
  <para>
-  <application>pg_test_timing</> is a tool to measure the timing overhead
+  <application>pg_test_timing</application> is a tool to measure the timing overhead
   on your system and confirm that the system time never moves backwards.
   Systems that are slow to collect timing data can give less accurate
   <command>EXPLAIN ANALYZE</command> results.
@@ -57,8 +57,8 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>pg_test_timing</application> version and exit.
@@ -67,8 +67,8 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>pg_test_timing</application> command line
@@ -94,7 +94,7 @@
    nanoseconds. This example from an Intel i7-860 system using a TSC clock
    source shows excellent performance:
 
-<screen>
+<screen><![CDATA[
 Testing timing overhead for 3 seconds.
 Per loop time including overhead: 35.96 ns
 Histogram of timing durations:
@@ -104,7 +104,7 @@ Histogram of timing durations:
      4      0.00015        126
      8      0.00002         13
     16      0.00000          2
-</screen>
+]]></screen>
   </para>
 
   <para>
@@ -152,7 +152,7 @@ EXPLAIN ANALYZE SELECT COUNT(*) FROM t;
    possible from switching to the slower acpi_pm time source, on the same
    system used for the fast results above:
 
-<screen>
+<screen><![CDATA[
 # cat /sys/devices/system/clocksource/clocksource0/available_clocksource
 tsc hpet acpi_pm
 # echo acpi_pm > /sys/devices/system/clocksource/clocksource0/current_clocksource
@@ -165,7 +165,7 @@ Histogram of timing durations:
      4      0.07810       3241
      8      0.01357        563
     16      0.00007          3
-</screen>
+]]></screen>
   </para>
 
   <para>
@@ -201,7 +201,7 @@ kern.timecounter.hardware: ACPI-fast -> TSC
    implementation, which can have good resolution when it's backed by fast
    enough timing hardware, as in this example:
 
-<screen>
+<screen><![CDATA[
 $ cat /sys/devices/system/clocksource/clocksource0/available_clocksource
 jiffies
 $ dmesg | grep time.c
@@ -218,7 +218,7 @@ Histogram of timing durations:
      8      0.00007         22
     16      0.00000          1
     32      0.00000          1
-</screen></para>
+]]></screen></para>
 
  </refsect2>
 
@@ -294,7 +294,7 @@ Histogram of timing durations:
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-explain"></member>
+   <member><xref linkend="sql-explain"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/pgupgrade.sgml b/doc/src/sgml/ref/pgupgrade.sgml
index d44431803b..6dafb404a1 100644
--- a/doc/src/sgml/ref/pgupgrade.sgml
+++ b/doc/src/sgml/ref/pgupgrade.sgml
@@ -24,9 +24,9 @@
    <arg choice="plain"><option>-B</option></arg>
    <arg choice="plain"><replaceable>newbindir</replaceable></arg>
    <arg choice="plain"><option>-d</option></arg>
-   <arg choice="plain"><replaceable>olddatadir</replaceable></arg>
+   <arg choice="plain"><replaceable>oldconfigdir</replaceable></arg>
    <arg choice="plain"><option>-D</option></arg>
-   <arg choice="plain"><replaceable>newdatadir</replaceable></arg>
+   <arg choice="plain"><replaceable>newconfigdir</replaceable></arg>
    <arg rep="repeat"><replaceable>option</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
@@ -35,38 +35,38 @@
   <title>Description</title>
 
  <para>
-  <application>pg_upgrade</> (formerly called <application>pg_migrator</>) allows data
-  stored in <productname>PostgreSQL</> data files to be upgraded to a later <productname>PostgreSQL</>
+  <application>pg_upgrade</application> (formerly called <application>pg_migrator</application>) allows data
+  stored in <productname>PostgreSQL</productname> data files to be upgraded to a later <productname>PostgreSQL</productname>
   major version without the data dump/reload typically required for
-  major version upgrades, e.g. from 9.6.3 to the current major release
-  of <productname>PostgreSQL</>.  It is not required for minor version upgrades, e.g. from
-  9.6.2 to 9.6.3.
+  major version upgrades, e.g. from 9.5.8 to 9.6.4 or from 10.7 to 11.2.
+  It is not required for minor version upgrades, e.g. from 9.6.2 to 9.6.3
+  or from 10.1 to 10.2.
  </para>
 
  <para>
   Major PostgreSQL releases regularly add new features that often
   change the layout of the system tables, but the internal data storage
-  format rarely changes.  <application>pg_upgrade</> uses this fact
+  format rarely changes.  <application>pg_upgrade</application> uses this fact
   to perform rapid upgrades by creating new system tables and simply
   reusing the old user data files.  If a future major release ever
   changes the data storage format in a way that makes the old data
-  format unreadable, <application>pg_upgrade</> will not be usable
+  format unreadable, <application>pg_upgrade</application> will not be usable
   for such upgrades.  (The community will attempt to avoid such
   situations.)
  </para>
 
  <para>
-  <application>pg_upgrade</> does its best to
+  <application>pg_upgrade</application> does its best to
   make sure the old and new clusters are binary-compatible, e.g.  by
   checking for compatible compile-time settings, including 32/64-bit
   binaries.  It is important that
   any external modules are also binary compatible, though this cannot
-  be checked by <application>pg_upgrade</>.
+  be checked by <application>pg_upgrade</application>.
  </para>
 
   <para>
    pg_upgrade supports upgrades from 8.4.X and later to the current
-   major release of <productname>PostgreSQL</>, including snapshot and beta releases.
+   major release of <productname>PostgreSQL</productname>, including snapshot and beta releases.
   </para>
  </refsect1>
 
@@ -79,17 +79,17 @@
     <variablelist>
 
      <varlistentry>
-      <term><option>-b</option> <replaceable>bindir</></term>
-      <term><option>--old-bindir=</option><replaceable>bindir</></term>
+      <term><option>-b</option> <replaceable>bindir</replaceable></term>
+      <term><option>--old-bindir=</option><replaceable>bindir</replaceable></term>
       <listitem><para>the old PostgreSQL executable directory;
-      environment variable <envar>PGBINOLD</></para></listitem>
+      environment variable <envar>PGBINOLD</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-B</option> <replaceable>bindir</></term>
-      <term><option>--new-bindir=</option><replaceable>bindir</></term>
+      <term><option>-B</option> <replaceable>bindir</replaceable></term>
+      <term><option>--new-bindir=</option><replaceable>bindir</replaceable></term>
       <listitem><para>the new PostgreSQL executable directory;
-      environment variable <envar>PGBINNEW</></para></listitem>
+      environment variable <envar>PGBINNEW</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -99,17 +99,17 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-d</option> <replaceable>datadir</></term>
-      <term><option>--old-datadir=</option><replaceable>datadir</></term>
-      <listitem><para>the old cluster data directory; environment
-      variable <envar>PGDATAOLD</></para></listitem>
+      <term><option>-d</option> <replaceable>configdir</replaceable></term>
+      <term><option>--old-datadir=</option><replaceable>configdir</replaceable></term>
+      <listitem><para>the old database cluster configuration directory; environment
+      variable <envar>PGDATAOLD</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-D</option> <replaceable>datadir</></term>
-      <term><option>--new-datadir=</option><replaceable>datadir</></term>
-      <listitem><para>the new cluster data directory; environment
-      variable <envar>PGDATANEW</></para></listitem>
+      <term><option>-D</option> <replaceable>configdir</replaceable></term>
+      <term><option>--new-datadir=</option><replaceable>configdir</replaceable></term>
+      <listitem><para>the new database cluster configuration directory; environment
+      variable <envar>PGDATANEW</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -143,17 +143,17 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p</option> <replaceable>port</></term>
-      <term><option>--old-port=</option><replaceable>port</></term>
+      <term><option>-p</option> <replaceable>port</replaceable></term>
+      <term><option>--old-port=</option><replaceable>port</replaceable></term>
       <listitem><para>the old cluster port number; environment
-      variable <envar>PGPORTOLD</></para></listitem>
+      variable <envar>PGPORTOLD</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-P</option> <replaceable>port</></term>
-      <term><option>--new-port=</option><replaceable>port</></term>
+      <term><option>-P</option> <replaceable>port</replaceable></term>
+      <term><option>--new-port=</option><replaceable>port</replaceable></term>
       <listitem><para>the new cluster port number; environment
-      variable <envar>PGPORTNEW</></para></listitem>
+      variable <envar>PGPORTNEW</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -164,10 +164,10 @@
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U</option> <replaceable>username</></term>
-      <term><option>--username=</option><replaceable>username</></term>
+      <term><option>-U</option> <replaceable>username</replaceable></term>
+      <term><option>--username=</option><replaceable>username</replaceable></term>
       <listitem><para>cluster's install user name; environment
-      variable <envar>PGUSER</></para></listitem>
+      variable <envar>PGUSER</envar></para></listitem>
      </varlistentry>
 
      <varlistentry>
@@ -207,17 +207,17 @@
 
     <para>
      If you are using a version-specific installation directory, e.g.
-     <filename>/opt/PostgreSQL/&majorversion;</>, you do not need to move the old cluster. The
+     <filename>/opt/PostgreSQL/&majorversion;</filename>, you do not need to move the old cluster. The
      graphical installers all use version-specific installation directories.
     </para>
 
     <para>
      If your installation directory is not version-specific, e.g.
-     <filename>/usr/local/pgsql</>, it is necessary to move the current PostgreSQL install
-     directory so it does not interfere with the new <productname>PostgreSQL</> installation.
-     Once the current <productname>PostgreSQL</> server is shut down, it is safe to rename the
+     <filename>/usr/local/pgsql</filename>, it is necessary to move the current PostgreSQL install
+     directory so it does not interfere with the new <productname>PostgreSQL</productname> installation.
+     Once the current <productname>PostgreSQL</productname> server is shut down, it is safe to rename the
      PostgreSQL installation directory; assuming the old directory is
-     <filename>/usr/local/pgsql</>, you can do:
+     <filename>/usr/local/pgsql</filename>, you can do:
 
 <programlisting>
 mv /usr/local/pgsql /usr/local/pgsql.old
@@ -230,8 +230,8 @@ mv /usr/local/pgsql /usr/local/pgsql.old
     <title>For source installs, build the new version</title>
 
     <para>
-     Build the new PostgreSQL source with <command>configure</> flags that are compatible
-     with the old cluster. <application>pg_upgrade</> will check <command>pg_controldata</> to make
+     Build the new PostgreSQL source with <command>configure</command> flags that are compatible
+     with the old cluster. <application>pg_upgrade</application> will check <command>pg_controldata</command> to make
      sure all settings are compatible before starting the upgrade.
     </para>
    </step>
@@ -241,7 +241,7 @@ mv /usr/local/pgsql /usr/local/pgsql.old
 
     <para>
      Install the new server's binaries and support
-     files.  <application>pg_upgrade</> is included in a default installation.
+     files.  <application>pg_upgrade</application> is included in a default installation.
     </para>
 
     <para>
@@ -273,7 +273,7 @@ make prefix=/usr/local/pgsql.new install
      into the new cluster, e.g. <filename>pgcrypto.so</filename>,
      whether they are from <filename>contrib</filename>
      or some other source. Do not install the schema definitions, e.g.
-     <command>CREATE EXTENSION pgcrypto</>, because these will be upgraded
+     <command>CREATE EXTENSION pgcrypto</command>, because these will be upgraded
      from the old cluster.
      Also, any custom full text search files (dictionary, synonym,
      thesaurus, stop words) must also be copied to the new cluster.
@@ -284,10 +284,10 @@ make prefix=/usr/local/pgsql.new install
     <title>Adjust authentication</title>
 
     <para>
-     <command>pg_upgrade</> will connect to the old and new servers several
-     times, so you might want to set authentication to <literal>peer</>
-     in <filename>pg_hba.conf</> or use a <filename>~/.pgpass</> file
-     (see <xref linkend="libpq-pgpass">).
+     <command>pg_upgrade</command> will connect to the old and new servers several
+     times, so you might want to set authentication to <literal>peer</literal>
+     in <filename>pg_hba.conf</filename> or use a <filename>~/.pgpass</filename> file
+     (see <xref linkend="libpq-pgpass"/>).
     </para>
    </step>
 
@@ -320,29 +320,25 @@ NET STOP postgresql-&majorversion;
     <title>Prepare for standby server upgrades</title>
 
     <para>
-     If you are upgrading standby servers (as outlined in section <xref
-     linkend="pgupgrade-step-replicas">), verify that the old standby
-     servers are caught up by running <application>pg_controldata</>
+     If you are upgrading standby servers using methods outlined in section <xref
+     linkend="pgupgrade-step-replicas"/>, verify that the old standby
+     servers are caught up by running <application>pg_controldata</application>
      against the old primary and standby clusters.  Verify that the
-     <quote>Latest checkpoint location</> values match in all clusters.
+     <quote>Latest checkpoint location</quote> values match in all clusters.
      (There will be a mismatch if old standby servers were shut down
-     before the old primary.)
-    </para>
-
-    <para>
-     Also, if upgrading standby servers, change <varname>wal_level</>
-     to <literal>replica</> in the <filename>postgresql.conf</> file on
-     the new master cluster.
+     before the old primary.)  Also, change <varname>wal_level</varname> to
+     <literal>replica</literal> in the <filename>postgresql.conf</filename> file on the
+     new primary cluster.
     </para>
    </step>
 
    <step>
-    <title>Run <application>pg_upgrade</></title>
+    <title>Run <application>pg_upgrade</application></title>
 
     <para>
-     Always run the <application>pg_upgrade</> binary of the new server, not the old one.
-     <application>pg_upgrade</> requires the specification of the old and new cluster's
-     data and executable (<filename>bin</>) directories. You can also specify
+     Always run the <application>pg_upgrade</application> binary of the new server, not the old one.
+     <application>pg_upgrade</application> requires the specification of the old and new cluster's
+     data and executable (<filename>bin</filename>) directories. You can also specify
      user and port values, and whether you want the data files linked
      instead of the default copy behavior.
     </para>
@@ -353,13 +349,13 @@ NET STOP postgresql-&majorversion;
      your old cluster
      once you start the new cluster after the upgrade.  Link mode also
      requires that the old and new cluster data directories be in the
-     same file system.  (Tablespaces and <filename>pg_wal</> can be on
-     different file systems.)  See <literal>pg_upgrade --help</> for a full
+     same file system.  (Tablespaces and <filename>pg_wal</filename> can be on
+     different file systems.)  See <literal>pg_upgrade --help</literal> for a full
      list of options.
     </para>
 
     <para>
-     The <option>--jobs</> option allows multiple CPU cores to be used
+     The <option>--jobs</option> option allows multiple CPU cores to be used
      for copying/linking of files and to dump and reload database schemas
      in parallel;  a good place to start is the maximum of the number of
      CPU cores and tablespaces.  This option can dramatically reduce the
@@ -369,14 +365,14 @@ NET STOP postgresql-&majorversion;
 
     <para>
      For Windows users, you must be logged into an administrative account, and
-     then start a shell as the <literal>postgres</> user and set the proper path:
+     then start a shell as the <literal>postgres</literal> user and set the proper path:
 
 <programlisting>
 RUNAS /USER:postgres "CMD.EXE"
 SET PATH=%PATH%;C:\Program Files\PostgreSQL\&majorversion;\bin;
 </programlisting>
 
-     and then run <application>pg_upgrade</> with quoted directories, e.g.:
+     and then run <application>pg_upgrade</application> with quoted directories, e.g.:
 
 <programlisting>
 pg_upgrade.exe
@@ -386,19 +382,19 @@ pg_upgrade.exe
         --new-bindir "C:/Program Files/PostgreSQL/&majorversion;/bin"
 </programlisting>
 
-     Once started, <command>pg_upgrade</> will verify the two clusters are compatible
-     and then do the upgrade. You can use <command>pg_upgrade --check</>
+     Once started, <command>pg_upgrade</command> will verify the two clusters are compatible
+     and then do the upgrade. You can use <command>pg_upgrade --check</command>
      to perform only the checks, even if the old server is still
-     running. <command>pg_upgrade --check</> will also outline any
+     running. <command>pg_upgrade --check</command> will also outline any
      manual adjustments you will need to make after the upgrade.  If you
-     are going to be using link mode, you should use the <option>--link</>
+     are going to be using link mode, you should use the <option>--link</option>
      option with <option>--check</option> to enable link-mode-specific checks.
-     <command>pg_upgrade</> requires write permission in the current directory.
+     <command>pg_upgrade</command> requires write permission in the current directory.
     </para>
 
     <para>
      Obviously, no one should be accessing the clusters during the
-     upgrade.  <application>pg_upgrade</> defaults to running servers
+     upgrade.  <application>pg_upgrade</application> defaults to running servers
      on port 50432 to avoid unintended client connections.
      You can use the same port number for both clusters when doing an
      upgrade because the old and new clusters will not be running at the
@@ -407,8 +403,8 @@ pg_upgrade.exe
     </para>
 
     <para>
-     If an error occurs while restoring the database schema, <command>pg_upgrade</> will
-     exit and you will have to revert to the old cluster as outlined in <xref linkend="pgupgrade-step-revert">
+     If an error occurs while restoring the database schema, <command>pg_upgrade</command> will
+     exit and you will have to revert to the old cluster as outlined in <xref linkend="pgupgrade-step-revert"/>
      below. To try <command>pg_upgrade</command> again, you will need to modify the old
      cluster so the pg_upgrade schema restore succeeds. If the problem is a
      <filename>contrib</filename> module, you might need to uninstall the <filename>contrib</filename> module from
@@ -421,12 +417,20 @@ pg_upgrade.exe
     <title>Upgrade Streaming Replication and Log-Shipping standby servers</title>
 
     <para>
-     If you have Streaming Replication (see <xref
-     linkend="streaming-replication">) or Log-Shipping (see <xref
-     linkend="warm-standby">) standby servers, follow these steps to
-     upgrade them.  You will not be running <application>pg_upgrade</>
-     on the standby servers, but rather <application>rsync</>.  Do not
-     start any servers yet.
+     If you used link mode and have Streaming Replication (see <xref
+     linkend="streaming-replication"/>) or Log-Shipping (see <xref
+     linkend="warm-standby"/>) standby servers, you can follow these steps to
+     quickly upgrade them.  You will not be running <application>pg_upgrade</application> on
+     the standby servers, but rather <application>rsync</application> on the primary.
+     Do not start any servers yet.
+    </para>
+
+    <para>
+     If you did <emphasis>not</emphasis> use link mode, do not have or do not
+     want to use <application>rsync</application>, or want an easier solution, skip
+     the instructions in this section and simply recreate the standby
+     servers once <application>pg_upgrade</application> completes and the new primary
+     is running.
     </para>
 
     <substeps>
@@ -441,12 +445,12 @@ pg_upgrade.exe
      </step>
 
      <step>
-      <title>Make sure the new standby data directories do <emphasis>not</> exist</title>
+      <title>Make sure the new standby data directories do <emphasis>not</emphasis> exist</title>
 
       <para>
-       Make sure the new standby data directories do <emphasis>not</>
-       exist or are empty.  If <application>initdb</> was run, delete
-       the standby server data directories.
+       Make sure the new standby data directories do <emphasis>not</emphasis>
+       exist or are empty.  If <application>initdb</application> was run, delete
+       the standby servers' new data directories.
       </para>
      </step>
 
@@ -455,7 +459,7 @@ pg_upgrade.exe
 
       <para>
        Install the same custom shared object files on the new standbys
-       that you installed in the new master cluster.
+       that you installed in the new primary cluster.
       </para>
      </step>
 
@@ -472,42 +476,73 @@ pg_upgrade.exe
       <title>Save configuration files</title>
 
       <para>
-       Save any configuration files from the standbys you need to keep,
-       e.g.  <filename>postgresql.conf</>, <literal>recovery.conf</>,
-       as these will be overwritten or removed in the next step.
+       Save any configuration files from the old standbys' configuration
+       directories you need to keep, e.g.  <filename>postgresql.conf</filename>,
+       <literal>recovery.conf</literal>, because these will be overwritten or
+       removed in the next step.
       </para>
      </step>
 
      <step>
-      <title>Run <application>rsync</></title>
+      <title>Run <application>rsync</application></title>
 
       <para>
-       From a directory that is above the old and new database cluster
-       directories, run this for each standby:
+       When using link mode, standby servers can be quickly upgraded using
+       <application>rsync</application>.  To accomplish this, from a directory on
+       the primary server that is above the old and new database cluster
+       directories, run this on the <emphasis>primary</emphasis> for each standby
+       server:
 
 <programlisting>
-rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_dir
+rsync --archive --delete --hard-links --size-only --no-inc-recursive old_cluster new_cluster remote_dir
 </programlisting>
 
-       where <option>old_pgdata</> and <option>new_pgdata</> are relative
-       to the current directory, and <option>remote_dir</> is
-       <emphasis>above</> the old and new cluster directories on
-       the standby server.  The old and new relative cluster paths
-       must match on the master and standby server.  Consult the
-       <application>rsync</> manual page for details on specifying the
-       remote directory, e.g. <literal>standbyhost:/opt/PostgreSQL/</>.
-       <application>rsync</> will be fast when <application>pg_upgrade</>'s
-       <option>--link</> mode is used because it will create hard links
-       on the remote server rather than transferring user data.
-       Unfortunately, <application>rsync</> needlessly copies the
-       files associated with temporary and unlogged tables.
+       where <option>old_cluster</option> and <option>new_cluster</option> are relative
+       to the current directory on the primary, and <option>remote_dir</option>
+       is <emphasis>above</emphasis> the old and new cluster directories
+       on the standby.  The directory structure under the specified
+       directories on the primary and standbys must match.  Consult the
+       <application>rsync</application> manual page for details on specifying the
+       remote directory, e.g.
+
+<programlisting>
+rsync --archive --delete --hard-links --size-only --no-inc-recursive /opt/PostgreSQL/9.5 \
+      /opt/PostgreSQL/9.6 standby.example.com:/opt/PostgreSQL
+</programlisting>
+
+       You can verify what the command will do using
+       <application>rsync</application>'s <option>--dry-run</option> option.  While
+       <application>rsync</application> must be run on the primary for at least one
+       standby, it is possible to run <application>rsync</application> on an upgraded
+       standby to upgrade other standbys, as long as the upgraded standby
+       has not been started.
+      </para>
+
+      <para>
+       What this does is to record the links created by
+       <application>pg_upgrade</application>'s link mode that connect files in the
+       old and new clusters on the primary server.  It then finds matching
+       files in the standby's old cluster and creates links for them in the
+       standby's new cluster.  Files that were not linked on the primary
+       are copied from the primary to the standby.  (They are usually
+       small.)  This provides rapid standby upgrades.  Unfortunately,
+       <application>rsync</application> needlessly copies files associated with
+       temporary and unlogged tables because these files don't normally
+       exist on standby servers.
       </para>
 
       <para>
        If you have tablespaces, you will need to run a similar
-       <application>rsync</> command for each tablespace directory.  If you
-       have relocated <filename>pg_wal</> outside the data directories,
-       <application>rsync</> must be run on those directories too.
+       <application>rsync</application> command for each tablespace directory, e.g.:
+
+<programlisting>
+rsync --archive --delete --hard-links --size-only --no-inc-recursive /vol1/pg_tblsp/PG_9.5_201510051 \
+      /vol1/pg_tblsp/PG_9.6_201608131 standby.example.com:/vol1/pg_tblsp
+</programlisting>
+
+       If you have relocated <filename>pg_wal</filename> outside the data
+       directories, <application>rsync</application> must be run on those directories
+       too.
       </para>
      </step>
 
@@ -516,9 +551,9 @@ rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_d
 
       <para>
        Configure the servers for log shipping.  (You do not need to run
-       <function>pg_start_backup()</> and <function>pg_stop_backup()</>
+       <function>pg_start_backup()</function> and <function>pg_stop_backup()</function>
        or take a file system backup as the standbys are still synchronized
-       with the master.)
+       with the primary.)
       </para>
      </step>
 
@@ -527,12 +562,12 @@ rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_d
    </step>
 
    <step>
-    <title>Restore <filename>pg_hba.conf</></title>
+    <title>Restore <filename>pg_hba.conf</filename></title>
 
     <para>
-     If you modified <filename>pg_hba.conf</>, restore its original settings.
+     If you modified <filename>pg_hba.conf</filename>, restore its original settings.
      It might also be necessary to adjust other configuration files in the new
-     cluster to match the old cluster, e.g. <filename>postgresql.conf</>.
+     cluster to match the old cluster, e.g. <filename>postgresql.conf</filename>.
     </para>
    </step>
 
@@ -541,7 +576,7 @@ rsync --archive --delete --hard-links --size-only old_pgdata new_pgdata remote_d
 
     <para>
      The new server can now be safely started, and then any
-     <application>rsync</>'ed standby servers.
+     <application>rsync</application>'ed standby servers.
     </para>
    </step>
 
@@ -577,7 +612,7 @@ psql --username=postgres --file=script.sql postgres
     <title>Statistics</title>
 
     <para>
-     Because optimizer statistics are not transferred by <command>pg_upgrade</>, you will
+     Because optimizer statistics are not transferred by <command>pg_upgrade</command>, you will
      be instructed to run a command to regenerate that information at the end
      of the upgrade.  You might need to set connection parameters to
      match your new cluster.
@@ -593,7 +628,7 @@ psql --username=postgres --file=script.sql postgres
      <command>pg_upgrade</command> completes. (Automatic deletion is not
      possible if you have user-defined tablespaces inside the old data
      directory.)  You can also delete the old installation directories
-     (e.g. <filename>bin</>, <filename>share</>).
+     (e.g. <filename>bin</filename>, <filename>share</filename>).
     </para>
    </step>
 
@@ -608,7 +643,7 @@ psql --username=postgres --file=script.sql postgres
       <listitem>
        <para>
         If you ran <command>pg_upgrade</command>
-        with <option>--check</>, no modifications were made to the old
+        with <option>--check</option>, no modifications were made to the old
         cluster and you can re-use it anytime.
        </para>
       </listitem>
@@ -616,7 +651,7 @@ psql --username=postgres --file=script.sql postgres
       <listitem>
        <para>
         If you ran <command>pg_upgrade</command>
-        with <option>--link</>, the data files are shared between the
+        with <option>--link</option>, the data files are shared between the
         old and new cluster. If you started the new cluster, the new
         server has written to those shared files and it is unsafe to
         use the old cluster.
@@ -625,13 +660,13 @@ psql --username=postgres --file=script.sql postgres
 
       <listitem>
        <para>
-        If you ran <command>pg_upgrade</command> <emphasis>without</>
-        <option>--link</> or did not start the new server, the
+        If you ran <command>pg_upgrade</command> <emphasis>without</emphasis>
+        <option>--link</option> or did not start the new server, the
         old cluster was not modified except that, if linking
-        started, a <literal>.old</> suffix was appended to
-        <filename>$PGDATA/global/pg_control</>.  To reuse the old
-        cluster, possibly remove the <filename>.old</> suffix from
-        <filename>$PGDATA/global/pg_control</>; you can then restart the
+        started, a <literal>.old</literal> suffix was appended to
+        <filename>$PGDATA/global/pg_control</filename>.  To reuse the old
+        cluster, possibly remove the <filename>.old</filename> suffix from
+        <filename>$PGDATA/global/pg_control</filename>; you can then restart the
         old cluster.
        </para>
       </listitem>
@@ -646,16 +681,16 @@ psql --username=postgres --file=script.sql postgres
   <title>Notes</title>
 
   <para>
-   <application>pg_upgrade</> does not support upgrading of databases
-   containing these <type>reg*</> OID-referencing system data types:
-   <type>regproc</>, <type>regprocedure</>, <type>regoper</>,
-   <type>regoperator</>, <type>regconfig</>, and
-   <type>regdictionary</>.  (<type>regtype</> can be upgraded.)
+   <application>pg_upgrade</application> does not support upgrading of databases
+   containing table columns using these <type>reg*</type> OID-referencing system data types:
+   <type>regproc</type>, <type>regprocedure</type>, <type>regoper</type>,
+   <type>regoperator</type>, <type>regconfig</type>, and
+   <type>regdictionary</type>.  (<type>regtype</type> can be upgraded.)
   </para>
 
   <para>
    All failure, rebuild, and reindex cases will be reported by
-   <application>pg_upgrade</> if they affect your installation;
+   <application>pg_upgrade</application> if they affect your installation;
    post-upgrade scripts to rebuild tables and indexes will be
    generated automatically.  If you are trying to automate the upgrade
    of many clusters, you should find that clusters with identical database
@@ -670,17 +705,17 @@ psql --username=postgres --file=script.sql postgres
   </para>
 
   <para>
-   If you are upgrading a pre-<productname>PostgreSQL</> 9.2 cluster
+   If you are upgrading a pre-<productname>PostgreSQL</productname> 9.2 cluster
    that uses a configuration-file-only directory, you must pass the
-   real data directory location to <application>pg_upgrade</>, and
+   real data directory location to <application>pg_upgrade</application>, and
    pass the configuration directory location to the server, e.g.
-   <literal>-d /real-data-directory -o '-D /configuration-directory'</>.
+   <literal>-d /real-data-directory -o '-D /configuration-directory'</literal>.
   </para>
 
   <para>
    If using a pre-9.1 old server that is using a non-default Unix-domain
    socket directory or a default that differs from the default of the
-   new cluster, set <envar>PGHOST</> to point to the old server's socket
+   new cluster, set <envar>PGHOST</envar> to point to the old server's socket
    location.  (This is not relevant on Windows.)
   </para>
 
@@ -688,14 +723,14 @@ psql --username=postgres --file=script.sql postgres
    If you want to use link mode and you do not want your old cluster
    to be modified when the new cluster is started, make a copy of the
    old cluster and upgrade that in link mode. To make a valid copy
-   of the old cluster, use <command>rsync</> to create a dirty
+   of the old cluster, use <command>rsync</command> to create a dirty
    copy of the old cluster while the server is running, then shut down
-   the old server and run <command>rsync --checksum</> again to update the
-   copy with any changes to make it consistent.  (<option>--checksum</>
-   is necessary because <command>rsync</> only has file modification-time
+   the old server and run <command>rsync --checksum</command> again to update the
+   copy with any changes to make it consistent.  (<option>--checksum</option>
+   is necessary because <command>rsync</command> only has file modification-time
    granularity of one second.)  You might want to exclude some
-   files, e.g. <filename>postmaster.pid</>, as documented in <xref
-   linkend="backup-lowlevel-base-backup">.  If your file system supports
+   files, e.g. <filename>postmaster.pid</filename>, as documented in <xref
+   linkend="backup-lowlevel-base-backup"/>.  If your file system supports
    file system snapshots or copy-on-write file copies, you can use that
    to make a backup of the old cluster and tablespaces, though the snapshot
    and copies must be created simultaneously or while the database server
@@ -708,10 +743,10 @@ psql --username=postgres --file=script.sql postgres
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-initdb"></member>
-   <member><xref linkend="app-pg-ctl"></member>
-   <member><xref linkend="app-pgdump"></member>
-   <member><xref linkend="app-postgres"></member>
+   <member><xref linkend="app-initdb"/></member>
+   <member><xref linkend="app-pg-ctl"/></member>
+   <member><xref linkend="app-pgdump"/></member>
+   <member><xref linkend="app-postgres"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/postgres-ref.sgml b/doc/src/sgml/ref/postgres-ref.sgml
index fc11aa14a6..53dc05a78f 100644
--- a/doc/src/sgml/ref/postgres-ref.sgml
+++ b/doc/src/sgml/ref/postgres-ref.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>postgres</command>
-   <arg rep="repeat"><replaceable>option</></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -51,8 +51,8 @@ PostgreSQL documentation
    <option>-D</option> option or the <envar>PGDATA</envar> environment
    variable; there is no default.  Typically, <option>-D</option> or
    <envar>PGDATA</envar> points directly to the data area directory
-   created by <xref linkend="app-initdb">.  Other possible file layouts are
-   discussed in <xref linkend="runtime-config-file-locations">.
+   created by <xref linkend="app-initdb"/>.  Other possible file layouts are
+   discussed in <xref linkend="runtime-config-file-locations"/>.
   </para>
 
   <para>
@@ -65,7 +65,7 @@ PostgreSQL documentation
   <para>
    The <command>postgres</command> command can also be called in
    single-user mode.  The primary use for this mode is during
-   bootstrapping by <xref linkend="app-initdb">.  Sometimes it is used
+   bootstrapping by <xref linkend="app-initdb"/>.  Sometimes it is used
    for debugging or disaster recovery;  note that running a single-user
    server is not truly suitable for debugging the server, since no
    realistic interprocess communication and locking will happen.
@@ -87,12 +87,12 @@ PostgreSQL documentation
    <para>
     <command>postgres</command> accepts the following command-line
     arguments.  For a detailed discussion of the options consult <xref
-    linkend="runtime-config">.  You can save typing most of these
+    linkend="runtime-config"/>.  You can save typing most of these
     options by setting up a configuration file.  Some (safe) options
     can also be set from the connecting client in an
     application-dependent way to apply only for that session.  For
     example, if the environment variable <envar>PGOPTIONS</envar> is
-    set, then <application>libpq</>-based clients will pass that
+    set, then <application>libpq</application>-based clients will pass that
     string to the server, which will interpret it as
     <command>postgres</command> command-line options.
    </para>
@@ -109,7 +109,7 @@ PostgreSQL documentation
         processes.  The default value of this parameter is chosen
         automatically by <application>initdb</application>.
         Specifying this option is equivalent to setting the
-        <xref linkend="guc-shared-buffers"> configuration parameter.
+        <xref linkend="guc-shared-buffers"/> configuration parameter.
        </para>
       </listitem>
      </varlistentry>
@@ -120,9 +120,9 @@ PostgreSQL documentation
        <para>
         Sets a named run-time parameter. The configuration parameters
         supported by <productname>PostgreSQL</productname> are
-        described in <xref linkend="runtime-config">. Most of the
+        described in <xref linkend="runtime-config"/>. Most of the
         other command line options are in fact short forms of such a
-        parameter assignment.  <option>-c</> can appear multiple times
+        parameter assignment.  <option>-c</option> can appear multiple times
         to set multiple parameters.
        </para>
       </listitem>
@@ -133,18 +133,18 @@ PostgreSQL documentation
       <listitem>
        <para>
         Prints the value of the named run-time parameter, and exits.
-        (See the <option>-c</> option above for details.)  This can
+        (See the <option>-c</option> option above for details.)  This can
         be used on a running server, and returns values from
-        <filename>postgresql.conf</>, modified by any parameters
+        <filename>postgresql.conf</filename>, modified by any parameters
         supplied in this invocation.  It does not reflect parameters
         supplied when the cluster was started.
        </para>
 
        <para>
         This option is meant for other programs that interact with a server
-        instance, such as <xref linkend="app-pg-ctl">, to query configuration
+        instance, such as <xref linkend="app-pg-ctl"/>, to query configuration
         parameter values.  User-facing applications should instead use <xref
-        linkend="sql-show"> or the <structname>pg_settings</structname> view.
+        linkend="sql-show"/> or the <structname>pg_settings</structname> view.
        </para>
       </listitem>
      </varlistentry>
@@ -157,7 +157,7 @@ PostgreSQL documentation
         debugging output is written to the server log.  Values are
         from 1 to 5.  It is also possible to pass <literal>-d
         0</literal> for a specific session, which will prevent the
-        server log level of the parent <command>postgres</> process from being
+        server log level of the parent <command>postgres</command> process from being
         propagated to this session.
        </para>
       </listitem>
@@ -169,7 +169,7 @@ PostgreSQL documentation
        <para>
         Specifies the file system location of the database
         configuration files.  See
-        <xref linkend="runtime-config-file-locations"> for details.
+        <xref linkend="runtime-config-file-locations"/> for details.
        </para>
       </listitem>
      </varlistentry>
@@ -179,9 +179,9 @@ PostgreSQL documentation
       <listitem>
        <para>
         Sets the default date style to <quote>European</quote>, that is
-        <literal>DMY</> ordering of input date fields.  This also causes
+        <literal>DMY</literal> ordering of input date fields.  This also causes
         the day to be printed before the month in certain date output formats.
-        See <xref linkend="datatype-datetime"> for more information.
+        See <xref linkend="datatype-datetime"/> for more information.
        </para>
       </listitem>
      </varlistentry>
@@ -193,7 +193,7 @@ PostgreSQL documentation
         Disables <function>fsync</function> calls for improved
         performance, at the risk of data corruption in the event of a
         system crash.  Specifying this option is equivalent to
-        disabling the <xref linkend="guc-fsync"> configuration
+        disabling the <xref linkend="guc-fsync"/> configuration
         parameter. Read the detailed documentation before using this!
        </para>
       </listitem>
@@ -206,14 +206,14 @@ PostgreSQL documentation
         Specifies the IP host name or address on which
         <command>postgres</command> is to listen for TCP/IP
         connections from client applications.  The value can also be a
-        comma-separated list of addresses, or <literal>*</> to specify
+        comma-separated list of addresses, or <literal>*</literal> to specify
         listening on all available interfaces.  An empty value
         specifies not listening on any IP addresses, in which case
         only Unix-domain sockets can be used to connect to the
         server.  Defaults to listening only on
         <systemitem class="systemname">localhost</systemitem>.
         Specifying this option is equivalent to setting the <xref
-        linkend="guc-listen-addresses"> configuration parameter.
+        linkend="guc-listen-addresses"/> configuration parameter.
        </para>
       </listitem>
      </varlistentry>
@@ -225,13 +225,13 @@ PostgreSQL documentation
         Allows remote clients to connect via TCP/IP (Internet domain)
         connections.  Without this option, only local connections are
         accepted.  This option is equivalent to setting
-        <varname>listen_addresses</> to <literal>*</> in
-        <filename>postgresql.conf</> or via <option>-h</>.
+        <varname>listen_addresses</varname> to <literal>*</literal> in
+        <filename>postgresql.conf</filename> or via <option>-h</option>.
        </para>
        <para>
         This option is deprecated since it does not allow access to the
-        full functionality of <xref linkend="guc-listen-addresses">.
-        It's usually better to set <varname>listen_addresses</> directly.
+        full functionality of <xref linkend="guc-listen-addresses"/>.
+        It's usually better to set <varname>listen_addresses</varname> directly.
        </para>
       </listitem>
      </varlistentry>
@@ -249,7 +249,7 @@ PostgreSQL documentation
         The default value is normally
         <filename>/tmp</filename>, but that can be changed at build time.
         Specifying this option is equivalent to setting the <xref
-        linkend="guc-unix-socket-directories"> configuration parameter.
+        linkend="guc-unix-socket-directories"/> configuration parameter.
        </para>
       </listitem>
      </varlistentry>
@@ -262,7 +262,7 @@ PostgreSQL documentation
         <productname>PostgreSQL</productname> must have been compiled with
         support for <acronym>SSL</acronym> for this option to be
         available. For more information on using <acronym>SSL</acronym>,
-        refer to <xref linkend="ssl-tcp">.
+        refer to <xref linkend="ssl-tcp"/>.
        </para>
       </listitem>
      </varlistentry>
@@ -275,7 +275,7 @@ PostgreSQL documentation
         server will accept.  The default value of this parameter is chosen
         automatically by <application>initdb</application>.
         Specifying this option is equivalent to setting the
-        <xref linkend="guc-max-connections"> configuration parameter.
+        <xref linkend="guc-max-connections"/> configuration parameter.
        </para>
       </listitem>
      </varlistentry>
@@ -291,11 +291,11 @@ PostgreSQL documentation
        </para>
 
        <para>
-        Spaces within <replaceable class="parameter">extra-options</> are
+        Spaces within <replaceable class="parameter">extra-options</replaceable> are
         considered to separate arguments, unless escaped with a backslash
-        (<literal>\</>); write <literal>\\</> to represent a literal
+        (<literal>\</literal>); write <literal>\\</literal> to represent a literal
         backslash.  Multiple arguments can also be specified via multiple
-        uses of <option>-o</>.
+        uses of <option>-o</option>.
        </para>
 
        <para>
@@ -340,15 +340,15 @@ PostgreSQL documentation
        <para>
         Specifies the amount of memory to be used by internal sorts and hashes
         before resorting to temporary disk files.  See the description of the
-        <varname>work_mem</> configuration parameter in <xref
-        linkend="runtime-config-resource-memory">.
+        <varname>work_mem</varname> configuration parameter in <xref
+        linkend="runtime-config-resource-memory"/>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
         Print the <application>postgres</application> version and exit.
@@ -361,7 +361,7 @@ PostgreSQL documentation
       <listitem>
        <para>
         Sets a named run-time parameter; a shorter form of
-        <option>-c</>.
+        <option>-c</option>.
        </para>
       </listitem>
      </varlistentry>
@@ -371,15 +371,15 @@ PostgreSQL documentation
       <listitem>
        <para>
         This option dumps out the server's internal configuration variables,
-        descriptions, and defaults in tab-delimited <command>COPY</> format.
+        descriptions, and defaults in tab-delimited <command>COPY</command> format.
         It is designed primarily for use by administration tools.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
        <para>
         Show help about <application>postgres</application> command line
@@ -531,7 +531,7 @@ PostgreSQL documentation
     <para>
      The following options only apply to the single-user mode
      (see <xref linkend="app-postgres-single-user"
-     endterm="app-postgres-single-user-title">).
+     endterm="app-postgres-single-user-title"/>).
     </para>
 
     <variablelist>
@@ -620,7 +620,7 @@ PostgreSQL documentation
 
     <listitem>
      <para>
-      Default value of the <xref linkend="guc-datestyle"> run-time
+      Default value of the <xref linkend="guc-datestyle"/> run-time
       parameter.  (The use of this environment variable is deprecated.)
      </para>
     </listitem>
@@ -643,14 +643,14 @@ PostgreSQL documentation
    <title>Diagnostics</title>
 
    <para>
-    A failure message mentioning <literal>semget</> or
-    <literal>shmget</> probably indicates you need to configure your
+    A failure message mentioning <literal>semget</literal> or
+    <literal>shmget</literal> probably indicates you need to configure your
     kernel to provide adequate shared memory and semaphores.  For more
-    discussion see <xref linkend="kernel-resources">.  You might be able
+    discussion see <xref linkend="kernel-resources"/>.  You might be able
     to postpone reconfiguring your kernel by decreasing <xref
-    linkend="guc-shared-buffers"> to reduce the shared memory
-    consumption of <productname>PostgreSQL</>, and/or by reducing
-    <xref linkend="guc-max-connections"> to reduce the semaphore
+    linkend="guc-shared-buffers"/> to reduce the shared memory
+    consumption of <productname>PostgreSQL</productname>, and/or by reducing
+    <xref linkend="guc-max-connections"/> to reduce the semaphore
     consumption.
    </para>
 
@@ -689,7 +689,7 @@ PostgreSQL documentation
   <title>Notes</title>
 
   <para>
-   The utility command <xref linkend="app-pg-ctl"> can be used to
+   The utility command <xref linkend="app-pg-ctl"/> can be used to
    start and shut down the <command>postgres</command> server
    safely and comfortably.
   </para>
@@ -725,8 +725,8 @@ PostgreSQL documentation
    To cancel a running query, send the <literal>SIGINT</literal> signal
    to the process running that command. To terminate a backend process
    cleanly, send <literal>SIGTERM</literal> to that process. See
-   also <function>pg_cancel_backend</> and <function>pg_terminate_backend</>
-   in <xref linkend="functions-admin-signal"> for the SQL-callable equivalents
+   also <function>pg_cancel_backend</function> and <function>pg_terminate_backend</function>
+   in <xref linkend="functions-admin-signal"/> for the SQL-callable equivalents
    of these two actions.
   </para>
 
@@ -745,9 +745,9 @@ PostgreSQL documentation
  <refsect1 id="app-postgres-bugs">
   <title>Bugs</title>
   <para>
-   The <option>--</> options will not work on <systemitem
-   class="osname">FreeBSD</> or <systemitem class="osname">OpenBSD</>.
-   Use <option>-c</> instead. This is a bug in the affected operating
+   The <option>--</option> options will not work on <systemitem
+   class="osname">FreeBSD</systemitem> or <systemitem class="osname">OpenBSD</systemitem>.
+   Use <option>-c</option> instead. This is a bug in the affected operating
    systems; a future release of <productname>PostgreSQL</productname>
    will provide a workaround if this is not fixed.
   </para>
@@ -759,17 +759,17 @@ PostgreSQL documentation
    <para>
     To start a single-user mode server, use a command like
 <screen>
-<userinput>postgres --single -D /usr/local/pgsql/data <replaceable>other-options</> my_database</userinput>
+<userinput>postgres --single -D /usr/local/pgsql/data <replaceable>other-options</replaceable> my_database</userinput>
 </screen>
-    Provide the correct path to the database directory with <option>-D</>, or
-    make sure that the environment variable <envar>PGDATA</> is set.
+    Provide the correct path to the database directory with <option>-D</option>, or
+    make sure that the environment variable <envar>PGDATA</envar> is set.
     Also specify the name of the particular database you want to work in.
    </para>
 
    <para>
     Normally, the single-user mode server treats newline as the command
     entry terminator; there is no intelligence about semicolons,
-    as there is in <application>psql</>.  To continue a command
+    as there is in <application>psql</application>.  To continue a command
     across multiple lines, you must type backslash just before each
     newline except the last one.  The backslash and adjacent newline are
     both dropped from the input command.  Note that this will happen even
@@ -777,7 +777,7 @@ PostgreSQL documentation
    </para>
 
    <para>
-    But if you use the <option>-j</> command line switch, a single newline
+    But if you use the <option>-j</option> command line switch, a single newline
     does not terminate command entry; instead, the sequence
     semicolon-newline-newline does.  That is, type a semicolon immediately
     followed by a completely empty line.  Backslash-newline is not
@@ -794,10 +794,10 @@ PostgreSQL documentation
 
    <para>
     To quit the session, type <acronym>EOF</acronym>
-    (<keycombo action="simul"><keycap>Control</><keycap>D</></>, usually).
+    (<keycombo action="simul"><keycap>Control</keycap><keycap>D</keycap></keycombo>, usually).
     If you've entered any text since the last command entry terminator,
     then <acronym>EOF</acronym> will be taken as a command entry terminator,
-    and another <acronym>EOF</> will be needed to exit.
+    and another <acronym>EOF</acronym> will be needed to exit.
    </para>
 
    <para>
@@ -826,7 +826,7 @@ PostgreSQL documentation
 <screen>
 <prompt>$</prompt> <userinput>postgres -p 1234</userinput>
 </screen>
-   To connect to this server using <application>psql</>, specify this port with the -p option:
+   To connect to this server using <application>psql</application>, specify this port with the -p option:
 <screen>
 <prompt>$</prompt> <userinput>psql -p 1234</userinput>
 </screen>
@@ -844,11 +844,11 @@ PostgreSQL documentation
 <prompt>$</prompt> <userinput>postgres --work-mem=1234</userinput>
 </screen>
    Either form overrides whatever setting might exist for
-   <varname>work_mem</> in <filename>postgresql.conf</>.  Notice that
+   <varname>work_mem</varname> in <filename>postgresql.conf</filename>.  Notice that
    underscores in parameter names can be written as either underscore
    or dash on the command line.  Except for short-term experiments,
    it's probably better practice to edit the setting in
-   <filename>postgresql.conf</> than to rely on a command-line switch
+   <filename>postgresql.conf</filename> than to rely on a command-line switch
    to set a parameter.
   </para>
  </refsect1>
@@ -857,8 +857,8 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <para>
-   <xref linkend="app-initdb">,
-   <xref linkend="app-pg-ctl">
+   <xref linkend="app-initdb"/>,
+   <xref linkend="app-pg-ctl"/>
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/postmaster.sgml b/doc/src/sgml/ref/postmaster.sgml
index 0a58a63331..311510a44d 100644
--- a/doc/src/sgml/ref/postmaster.sgml
+++ b/doc/src/sgml/ref/postmaster.sgml
@@ -22,7 +22,7 @@ PostgreSQL documentation
  <refsynopsisdiv>
   <cmdsynopsis>
    <command>postmaster</command>
-   <arg rep="repeat"><replaceable>option</></arg>
+   <arg rep="repeat"><replaceable>option</replaceable></arg>
   </cmdsynopsis>
  </refsynopsisdiv>
 
@@ -38,7 +38,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <para>
-   <xref linkend="app-postgres">
+   <xref linkend="app-postgres"/>
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/prepare.sgml b/doc/src/sgml/ref/prepare.sgml
index fea2196efe..704fb5e4ab 100644
--- a/doc/src/sgml/ref/prepare.sgml
+++ b/doc/src/sgml/ref/prepare.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/prepare.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-PREPARE">
+<refentry id="sql-prepare">
  <indexterm zone="sql-prepare">
   <primary>PREPARE</primary>
  </indexterm>
@@ -26,7 +26,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class="PARAMETER">data_type</replaceable> [, ...] ) ] AS <replaceable class="PARAMETER">statement</replaceable>
+PREPARE <replaceable class="parameter">name</replaceable> [ ( <replaceable class="parameter">data_type</replaceable> [, ...] ) ] AS <replaceable class="parameter">statement</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -48,14 +48,14 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    Prepared statements can take parameters: values that are
    substituted into the statement when it is executed. When creating
    the prepared statement, refer to parameters by position, using
-   <literal>$1</>, <literal>$2</>, etc. A corresponding list of
+   <literal>$1</literal>, <literal>$2</literal>, etc. A corresponding list of
    parameter data types can optionally be specified. When a
    parameter's data type is not specified or is declared as
    <literal>unknown</literal>, the type is inferred from the context
    in which the parameter is used (if possible). When executing the
    statement, specify the actual values for these parameters in the
    <command>EXECUTE</command> statement.  Refer to <xref
-   linkend="sql-execute"> for more
+   linkend="sql-execute"/> for more
    information about that.
   </para>
 
@@ -66,7 +66,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    also means that a single  prepared statement cannot be used by
    multiple simultaneous database clients; however, each client can create
    their own prepared statement to use.  Prepared statements can be
-   manually cleaned up using the <xref linkend="sql-deallocate"> command.
+   manually cleaned up using the <xref linkend="sql-deallocate"/> command.
   </para>
 
   <para>
@@ -86,7 +86,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       An arbitrary name given to this particular prepared
@@ -98,7 +98,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">data_type</replaceable></term>
+    <term><replaceable class="parameter">data_type</replaceable></term>
     <listitem>
      <para>
       The data type of a parameter to the prepared statement.  If the
@@ -112,18 +112,18 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">statement</replaceable></term>
+    <term><replaceable class="parameter">statement</replaceable></term>
     <listitem>
      <para>
-      Any <command>SELECT</>, <command>INSERT</>, <command>UPDATE</>,
-      <command>DELETE</>, or <command>VALUES</> statement.
+      Any <command>SELECT</command>, <command>INSERT</command>, <command>UPDATE</command>,
+      <command>DELETE</command>, or <command>VALUES</command> statement.
      </para>
     </listitem>
    </varlistentry>
   </variablelist>
  </refsect1>
 
- <refsect1 id="SQL-PREPARE-notes">
+ <refsect1 id="sql-prepare-notes">
   <title>Notes</title>
 
   <para>
@@ -154,10 +154,10 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
 
   <para>
    To examine the query plan <productname>PostgreSQL</productname> is using
-   for a prepared statement, use <xref linkend="sql-explain">, e.g.
-   <command>EXPLAIN EXECUTE</>.
+   for a prepared statement, use <xref linkend="sql-explain"/>, e.g.
+   <command>EXPLAIN EXECUTE</command>.
    If a generic plan is in use, it will contain parameter symbols
-   <literal>$<replaceable>n</></literal>, while a custom plan will have the
+   <literal>$<replaceable>n</replaceable></literal>, while a custom plan will have the
    supplied parameter values substituted into it.
    The row estimates in the generic plan reflect the selectivity
    computed for the parameters.
@@ -166,19 +166,19 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
   <para>
    For more information on query planning and the statistics collected
    by <productname>PostgreSQL</productname> for that purpose, see
-   the <xref linkend="sql-analyze">
+   the <xref linkend="sql-analyze"/>
    documentation.
   </para>
 
   <para>
    Although the main point of a prepared statement is to avoid repeated parse
-   analysis and planning of the statement, <productname>PostgreSQL</> will
+   analysis and planning of the statement, <productname>PostgreSQL</productname> will
    force re-analysis and re-planning of the statement before using it
    whenever database objects used in the statement have undergone
    definitional (DDL) changes since the previous use of the prepared
-   statement.  Also, if the value of <xref linkend="guc-search-path"> changes
+   statement.  Also, if the value of <xref linkend="guc-search-path"/> changes
    from one use to the next, the statement will be re-parsed using the new
-   <varname>search_path</>.  (This latter behavior is new as of
+   <varname>search_path</varname>.  (This latter behavior is new as of
    <productname>PostgreSQL</productname> 9.3.)  These rules make use of a
    prepared statement semantically almost equivalent to re-submitting the
    same query text over and over, but with a performance benefit if no object
@@ -186,7 +186,7 @@ PREPARE <replaceable class="PARAMETER">name</replaceable> [ ( <replaceable class
    across uses.  An example of a case where the semantic equivalence is not
    perfect is that if the statement refers to a table by an unqualified name,
    and then a new table of the same name is created in a schema appearing
-   earlier in the <varname>search_path</>, no automatic re-parse will occur
+   earlier in the <varname>search_path</varname>, no automatic re-parse will occur
    since no object used in the statement changed.  However, if some other
    change forces a re-parse, the new table will be referenced in subsequent
    uses.
@@ -222,7 +222,7 @@ EXECUTE usrrptplan(1, current_date);
 </programlisting>
 
    Note that the data type of the second parameter is not specified,
-   so it is inferred from the context in which <literal>$2</> is used.
+   so it is inferred from the context in which <literal>$2</literal> is used.
   </para>
  </refsect1>
  <refsect1>
@@ -240,8 +240,8 @@ EXECUTE usrrptplan(1, current_date);
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-deallocate"></member>
-   <member><xref linkend="sql-execute"></member>
+   <member><xref linkend="sql-deallocate"/></member>
+   <member><xref linkend="sql-execute"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/prepare_transaction.sgml b/doc/src/sgml/ref/prepare_transaction.sgml
index 626753f576..d958f7a06f 100644
--- a/doc/src/sgml/ref/prepare_transaction.sgml
+++ b/doc/src/sgml/ref/prepare_transaction.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/prepare_transaction.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-PREPARE-TRANSACTION">
+<refentry id="sql-prepare-transaction">
  <indexterm zone="sql-prepare-transaction">
   <primary>PREPARE TRANSACTION</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
+PREPARE TRANSACTION <replaceable class="parameter">transaction_id</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -39,15 +39,15 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <para>
    Once prepared, a transaction can later be committed or rolled back
-   with <xref linkend="sql-commit-prepared">
-   or <xref linkend="sql-rollback-prepared">,
+   with <xref linkend="sql-commit-prepared"/>
+   or <xref linkend="sql-rollback-prepared"/>,
    respectively.  Those commands can be issued from any session, not
    only the one that executed the original transaction.
   </para>
 
   <para>
    From the point of view of the issuing session, <command>PREPARE
-   TRANSACTION</command> is not unlike a <command>ROLLBACK</> command:
+   TRANSACTION</command> is not unlike a <command>ROLLBACK</command> command:
    after executing it, there is no active current transaction, and the
    effects of the prepared transaction are no longer visible.  (The effects
    will become visible again if the transaction is committed.)
@@ -55,7 +55,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <para>
    If the <command>PREPARE TRANSACTION</command> command fails for any
-   reason, it becomes a <command>ROLLBACK</>: the current transaction
+   reason, it becomes a <command>ROLLBACK</command>: the current transaction
    is canceled.
   </para>
  </refsect1>
@@ -65,11 +65,11 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">transaction_id</replaceable></term>
+    <term><replaceable class="parameter">transaction_id</replaceable></term>
     <listitem>
      <para>
       An arbitrary identifier that later identifies this transaction for
-      <command>COMMIT PREPARED</> or <command>ROLLBACK PREPARED</>.
+      <command>COMMIT PREPARED</command> or <command>ROLLBACK PREPARED</command>.
       The identifier must be written as a string literal, and must be
       less than 200 bytes long.  It must not be the same as the identifier
       used for any currently prepared transaction.
@@ -83,36 +83,37 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
   <title>Notes</title>
 
   <para>
-   <command>PREPARE TRANSACTION</> is not intended for use in applications
+   <command>PREPARE TRANSACTION</command> is not intended for use in applications
    or interactive sessions. Its purpose is to allow an external
    transaction manager to perform atomic global transactions across multiple
    databases or other transactional resources. Unless you're writing a
    transaction manager, you probably shouldn't be using <command>PREPARE
-   TRANSACTION</>.
+   TRANSACTION</command>.
   </para>
 
   <para>
    This command must be used inside a transaction block. Use <xref
-   linkend="sql-begin"> to start one.
+   linkend="sql-begin"/> to start one.
   </para>
 
   <para>
-   It is not currently allowed to <command>PREPARE</> a transaction that
+   It is not currently allowed to <command>PREPARE</command> a transaction that
    has executed any operations involving temporary tables,
-   created any cursors <literal>WITH HOLD</>, or executed
-   <command>LISTEN</> or <command>UNLISTEN</>.
+   created any cursors <literal>WITH HOLD</literal>, or executed
+   <command>LISTEN</command>, <command>UNLISTEN</command>, or
+   <command>NOTIFY</command>.
    Those features are too tightly
    tied to the current session to be useful in a transaction to be prepared.
   </para>
 
   <para>
-   If the transaction modified any run-time parameters with <command>SET</>
-   (without the <literal>LOCAL</> option),
-   those effects persist after <command>PREPARE TRANSACTION</>, and will not
+   If the transaction modified any run-time parameters with <command>SET</command>
+   (without the <literal>LOCAL</literal> option),
+   those effects persist after <command>PREPARE TRANSACTION</command>, and will not
    be affected by any later <command>COMMIT PREPARED</command> or
    <command>ROLLBACK PREPARED</command>.  Thus, in this one respect
-   <command>PREPARE TRANSACTION</> acts more like <command>COMMIT</> than
-   <command>ROLLBACK</>.
+   <command>PREPARE TRANSACTION</command> acts more like <command>COMMIT</command> than
+   <command>ROLLBACK</command>.
   </para>
 
   <para>
@@ -124,10 +125,10 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
   <caution>
    <para>
     It is unwise to leave transactions in the prepared state for a long time.
-    This will interfere with the ability of <command>VACUUM</> to reclaim
+    This will interfere with the ability of <command>VACUUM</command> to reclaim
     storage, and in extreme cases could cause the database to shut down
     to prevent transaction ID wraparound (see <xref
-    linkend="vacuum-for-wraparound">).  Keep in mind also that the transaction
+    linkend="vacuum-for-wraparound"/>).  Keep in mind also that the transaction
     continues to hold whatever locks it held.  The intended usage of the
     feature is that a prepared transaction will normally be committed or
     rolled back as soon as an external transaction manager has verified that
@@ -138,7 +139,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
     If you have not set up an external transaction manager to track prepared
     transactions and ensure they get closed out promptly, it is best to keep
     the prepared-transaction feature disabled by setting
-    <xref linkend="guc-max-prepared-transactions"> to zero.  This will
+    <xref linkend="guc-max-prepared-transactions"/> to zero.  This will
     prevent accidental creation of prepared transactions that might then
     be forgotten and eventually cause problems.
    </para>
@@ -149,7 +150,7 @@ PREPARE TRANSACTION <replaceable class="PARAMETER">transaction_id</replaceable>
   <title id="sql-prepare-transaction-examples-title">Examples</title>
   <para>
    Prepare the current transaction for two-phase commit, using
-   <literal>foobar</> as the transaction identifier:
+   <literal>foobar</literal> as the transaction identifier:
 
 <programlisting>
 PREPARE TRANSACTION 'foobar';
@@ -172,8 +173,8 @@ PREPARE TRANSACTION 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-commit-prepared"></member>
-   <member><xref linkend="sql-rollback-prepared"></member>
+   <member><xref linkend="sql-commit-prepared"/></member>
+   <member><xref linkend="sql-rollback-prepared"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/psql-ref.sgml b/doc/src/sgml/ref/psql-ref.sgml
index c592edac60..bfdf859731 100644
--- a/doc/src/sgml/ref/psql-ref.sgml
+++ b/doc/src/sgml/ref/psql-ref.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/psql-ref.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-PSQL">
+<refentry id="app-psql">
  <indexterm zone="app-psql">
   <primary>psql</primary>
  </indexterm>
@@ -45,13 +45,13 @@ PostgreSQL documentation
     </para>
  </refsect1>
 
- <refsect1 id="R1-APP-PSQL-3">
+ <refsect1 id="r1-app-psql-3">
   <title>Options</title>
 
   <variablelist>
     <varlistentry>
-      <term><option>-a</></term>
-      <term><option>--echo-all</></term>
+      <term><option>-a</option></term>
+      <term><option>--echo-all</option></term>
       <listitem>
       <para>
       Print all nonempty input lines to standard output as they are read.
@@ -63,8 +63,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-A</></term>
-      <term><option>--no-align</></term>
+      <term><option>-A</option></term>
+      <term><option>--no-align</option></term>
       <listitem>
       <para>
       Switches to unaligned output mode. (The default output mode is
@@ -75,8 +75,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-b</></term>
-      <term><option>--echo-errors</></term>
+      <term><option>-b</option></term>
+      <term><option>--echo-errors</option></term>
       <listitem>
       <para>
       Print failed SQL commands to standard error output. This is
@@ -87,8 +87,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-c <replaceable class="parameter">command</replaceable></></term>
-      <term><option>--command=<replaceable class="parameter">command</replaceable></></term>
+      <term><option>-c <replaceable class="parameter">command</replaceable></option></term>
+      <term><option>--command=<replaceable class="parameter">command</replaceable></option></term>
       <listitem>
       <para>
        Specifies that <application>psql</application> is to execute the given
@@ -116,16 +116,18 @@ psql -c '\x' -c 'SELECT * FROM foo;'
 <programlisting>
 echo '\x \\ SELECT * FROM foo;' | psql
 </programlisting>
-       (<literal>\\</> is the separator meta-command.)
+       (<literal>\\</literal> is the separator meta-command.)
       </para>
       <para>
        Each <acronym>SQL</acronym> command string passed
-       to <option>-c</option> is sent to the server as a single query.
+       to <option>-c</option> is sent to the server as a single request.
        Because of this, the server executes it as a single transaction even
        if the string contains multiple <acronym>SQL</acronym> commands,
-       unless there are explicit <command>BEGIN</>/<command>COMMIT</>
+       unless there are explicit <command>BEGIN</command>/<command>COMMIT</command>
        commands included in the string to divide it into multiple
-       transactions.  Also, <application>psql</application> only prints the
+       transactions.  (See <xref linkend="protocol-flow-multi-statement"/>
+       for more details about how the server handles multi-query strings.)
+       Also, <application>psql</application> only prints the
        result of the last <acronym>SQL</acronym> command in the string.
        This is different from the behavior when the same string is read from
        a file or fed to <application>psql</application>'s standard input,
@@ -133,7 +135,7 @@ echo '\x \\ SELECT * FROM foo;' | psql
        each <acronym>SQL</acronym> command separately.
       </para>
       <para>
-       Because of this behavior, putting more than one command in a
+       Because of this behavior, putting more than one SQL command in a
        single <option>-c</option> string often has unexpected results.
        It's better to use repeated <option>-c</option> commands or feed
        multiple commands to <application>psql</application>'s standard input,
@@ -150,8 +152,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-d <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>-d <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option>--dbname=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
       <para>
        Specifies the name of the database to connect to. This is
@@ -165,14 +167,14 @@ EOF
        (<literal>postgresql://</literal>
        or <literal>postgres://</literal>), it is treated as a
        <parameter>conninfo</parameter> string. See <xref
-       linkend="libpq-connstring"> for more information.
+       linkend="libpq-connstring"/> for more information.
       </para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo-queries</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo-queries</option></term>
       <listitem>
       <para>
       Copy all SQL commands sent to the server to standard output as well.
@@ -184,21 +186,21 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-E</></term>
-      <term><option>--echo-hidden</></term>
+      <term><option>-E</option></term>
+      <term><option>--echo-hidden</option></term>
       <listitem>
       <para>
       Echo the actual queries generated by <command>\d</command> and other backslash
       commands. You can use this to study <application>psql</application>'s
       internal operations. This is equivalent to
-      setting the variable <varname>ECHO_HIDDEN</varname> to <literal>on</>.
+      setting the variable <varname>ECHO_HIDDEN</varname> to <literal>on</literal>.
       </para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><option>-f <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--file=<replaceable class="parameter">filename</replaceable></></term>
+      <term><option>-f <replaceable class="parameter">filename</replaceable></option></term>
+      <term><option>--file=<replaceable class="parameter">filename</replaceable></option></term>
       <listitem>
       <para>
        Read commands from the
@@ -217,7 +219,7 @@ EOF
       <para>
        If <replaceable>filename</replaceable> is <literal>-</literal>
        (hyphen), then standard input is read until an EOF indication
-       or <command>\q</> meta-command.  This can be used to intersperse
+       or <command>\q</command> meta-command.  This can be used to intersperse
        interactive input with input from files.  Note however that Readline
        is not used in this case (much as if <option>-n</option> had been
        specified).
@@ -239,8 +241,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-F <replaceable class="parameter">separator</replaceable></></term>
-      <term><option>--field-separator=<replaceable class="parameter">separator</replaceable></></term>
+      <term><option>-F <replaceable class="parameter">separator</replaceable></option></term>
+      <term><option>--field-separator=<replaceable class="parameter">separator</replaceable></option></term>
       <listitem>
       <para>
       Use <replaceable class="parameter">separator</replaceable> as the
@@ -251,8 +253,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-h <replaceable class="parameter">hostname</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">hostname</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">hostname</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">hostname</replaceable></option></term>
       <listitem>
       <para>
       Specifies the host name of the machine on which the
@@ -264,8 +266,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-H</></term>
-      <term><option>--html</></term>
+      <term><option>-H</option></term>
+      <term><option>--html</option></term>
       <listitem>
       <para>
       Turn on <acronym>HTML</acronym> tabular output. This is
@@ -276,20 +278,28 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-l</></term>
-      <term><option>--list</></term>
+      <term><option>-l</option></term>
+      <term><option>--list</option></term>
       <listitem>
       <para>
       List all available databases, then exit. Other non-connection
       options are ignored. This is similar to the meta-command
       <command>\list</command>.
       </para>
+
+      <para>
+      When this option is used, <application>psql</application> will connect
+      to the database <literal>postgres</literal>, unless a different database
+      is named on the command line (option <option>-d</option> or non-option
+      argument, possibly via a service entry, but not via an environment
+      variable).
+      </para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><option>-L <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--log-file=<replaceable class="parameter">filename</replaceable></></term>
+      <term><option>-L <replaceable class="parameter">filename</replaceable></option></term>
+      <term><option>--log-file=<replaceable class="parameter">filename</replaceable></option></term>
       <listitem>
       <para>
        Write all query output into file <replaceable
@@ -300,8 +310,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-n</></term>
-      <term><option>--no-readline</></term>
+      <term><option>-n</option></term>
+      <term><option>--no-readline</option></term>
       <listitem>
       <para>
        Do not use <application>Readline</application> for line editing and do
@@ -312,8 +322,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-o <replaceable class="parameter">filename</replaceable></></term>
-      <term><option>--output=<replaceable class="parameter">filename</replaceable></></term>
+      <term><option>-o <replaceable class="parameter">filename</replaceable></option></term>
+      <term><option>--output=<replaceable class="parameter">filename</replaceable></option></term>
       <listitem>
       <para>
       Put all query output into file <replaceable
@@ -324,8 +334,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
       <para>
       Specifies the TCP port or the local Unix-domain
@@ -338,8 +348,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-P <replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--pset=<replaceable class="parameter">assignment</replaceable></></term>
+      <term><option>-P <replaceable class="parameter">assignment</replaceable></option></term>
+      <term><option>--pset=<replaceable class="parameter">assignment</replaceable></option></term>
       <listitem>
       <para>
       Specifies printing options, in the style of
@@ -352,8 +362,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-q</option></term>
+      <term><option>--quiet</option></term>
       <listitem>
       <para>
       Specifies that <application>psql</application> should do its work
@@ -361,14 +371,14 @@ EOF
       informational output. If this option is used, none of this
       happens. This is useful with the <option>-c</option> option.
       This is equivalent to setting the variable <varname>QUIET</varname>
-      to <literal>on</>.
+      to <literal>on</literal>.
       </para>
       </listitem>
     </varlistentry>
 
     <varlistentry>
-      <term><option>-R <replaceable class="parameter">separator</replaceable></></term>
-      <term><option>--record-separator=<replaceable class="parameter">separator</replaceable></></term>
+      <term><option>-R <replaceable class="parameter">separator</replaceable></option></term>
+      <term><option>--record-separator=<replaceable class="parameter">separator</replaceable></option></term>
       <listitem>
       <para>
       Use <replaceable class="parameter">separator</replaceable> as the
@@ -379,8 +389,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--single-step</></term>
+      <term><option>-s</option></term>
+      <term><option>--single-step</option></term>
       <listitem>
       <para>
       Run in single-step mode. That means the user is prompted before
@@ -391,8 +401,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-S</></term>
-      <term><option>--single-line</></term>
+      <term><option>-S</option></term>
+      <term><option>--single-line</option></term>
       <listitem>
       <para>
       Runs in single-line mode where a newline terminates an SQL command, as a
@@ -411,8 +421,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-t</></term>
-      <term><option>--tuples-only</></term>
+      <term><option>-t</option></term>
+      <term><option>--tuples-only</option></term>
       <listitem>
       <para>
       Turn off printing of column names and result row count footers,
@@ -423,8 +433,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-T <replaceable class="parameter">table_options</replaceable></></term>
-      <term><option>--table-attr=<replaceable class="parameter">table_options</replaceable></></term>
+      <term><option>-T <replaceable class="parameter">table_options</replaceable></option></term>
+      <term><option>--table-attr=<replaceable class="parameter">table_options</replaceable></option></term>
       <listitem>
       <para>
       Specifies options to be placed within the
@@ -435,8 +445,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
       <para>
       Connect to the database as the user <replaceable
@@ -447,9 +457,9 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-v <replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--set=<replaceable class="parameter">assignment</replaceable></></term>
-      <term><option>--variable=<replaceable class="parameter">assignment</replaceable></></term>
+      <term><option>-v <replaceable class="parameter">assignment</replaceable></option></term>
+      <term><option>--set=<replaceable class="parameter">assignment</replaceable></option></term>
+      <term><option>--variable=<replaceable class="parameter">assignment</replaceable></option></term>
       <listitem>
       <para>
       Perform a variable assignment, like the <command>\set</command>
@@ -464,8 +474,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
       <para>
       Print the <application>psql</application> version and exit.
@@ -474,8 +484,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-     <term><option>-w</></term>
-     <term><option>--no-password</></term>
+     <term><option>-w</option></term>
+     <term><option>--no-password</option></term>
      <listitem>
       <para>
        Never issue a password prompt.  If the server requires password
@@ -494,8 +504,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
       <para>
        Force <application>psql</application> to prompt for a
@@ -507,7 +517,7 @@ EOF
        will automatically prompt for a password if the server demands
        password authentication.  However, <application>psql</application>
        will waste a connection attempt finding out that the server wants a
-       password.  In some cases it is worth typing <option>-W</> to avoid
+       password.  In some cases it is worth typing <option>-W</option> to avoid
        the extra connection attempt.
       </para>
 
@@ -520,8 +530,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-x</></term>
-      <term><option>--expanded</></term>
+      <term><option>-x</option></term>
+      <term><option>--expanded</option></term>
       <listitem>
       <para>
       Turn on the expanded table formatting mode. This is equivalent to
@@ -531,8 +541,8 @@ EOF
     </varlistentry>
 
     <varlistentry>
-      <term><option>-X,</></term>
-      <term><option>--no-psqlrc</></term>
+      <term><option>-X,</option></term>
+      <term><option>--no-psqlrc</option></term>
       <listitem>
       <para>
       Do not read the start-up file (neither the system-wide
@@ -572,8 +582,8 @@ EOF
        <para>
         This option can only be used in combination with one or more
         <option>-c</option> and/or <option>-f</option> options.  It causes
-        <application>psql</application> to issue a <command>BEGIN</> command
-        before the first such option and a <command>COMMIT</> command after
+        <application>psql</application> to issue a <command>BEGIN</command> command
+        before the first such option and a <command>COMMIT</command> command after
         the last one, thereby wrapping all the commands into a single
         transaction.  This ensures that either all the commands complete
         successfully, or no changes are applied.
@@ -581,8 +591,8 @@ EOF
 
        <para>
         If the commands themselves
-        contain <command>BEGIN</>, <command>COMMIT</>,
-        or <command>ROLLBACK</>, this option will not have the desired
+        contain <command>BEGIN</command>, <command>COMMIT</command>,
+        or <command>ROLLBACK</command>, this option will not have the desired
         effects.  Also, if an individual command cannot be executed inside a
         transaction block, specifying this option will cause the whole
         transaction to fail.
@@ -591,17 +601,17 @@ EOF
      </varlistentry>
 
     <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help[=<replaceable class="parameter">topic</>]</option></term>
+      <term><option>-?</option></term>
+      <term><option>--help[=<replaceable class="parameter">topic</replaceable>]</option></term>
       <listitem>
       <para>
       Show help about <application>psql</application> and exit. The optional
-      <replaceable class="parameter">topic</> parameter (defaulting
+      <replaceable class="parameter">topic</replaceable> parameter (defaulting
       to <literal>options</literal>) selects which part of <application>psql</application> is
-      explained: <literal>commands</> describes <application>psql</>'s
-      backslash commands; <literal>options</> describes the command-line
-      options that can be passed to <application>psql</>;
-      and <literal>variables</> shows help about <application>psql</application> configuration
+      explained: <literal>commands</literal> describes <application>psql</application>'s
+      backslash commands; <literal>options</literal> describes the command-line
+      options that can be passed to <application>psql</application>;
+      and <literal>variables</literal> shows help about <application>psql</application> configuration
       variables.
       </para>
       </listitem>
@@ -627,7 +637,7 @@ EOF
  <refsect1>
   <title>Usage</title>
 
-  <refsect2 id="R2-APP-PSQL-connecting">
+  <refsect2 id="r2-app-psql-connecting">
     <title>Connecting to a Database</title>
 
     <para>
@@ -642,8 +652,8 @@ EOF
     not belong to any option it will be interpreted as the database name
     (or the user name, if the database name is already given). Not all
     of these options are required; there are useful defaults. If you omit the host
-    name, <application>psql</> will connect via a Unix-domain socket
-    to a server on the local host, or via TCP/IP to <literal>localhost</> on
+    name, <application>psql</application> will connect via a Unix-domain socket
+    to a server on the local host, or via TCP/IP to <literal>localhost</literal> on
     machines that don't have Unix-domain sockets. The default port number is
     determined at compile time.
     Since the database server uses the same default, you will not have
@@ -660,9 +670,9 @@ EOF
     <envar>PGDATABASE</envar>, <envar>PGHOST</envar>,
     <envar>PGPORT</envar> and/or <envar>PGUSER</envar> to appropriate
     values. (For additional environment variables, see <xref
-    linkend="libpq-envars">.) It is also convenient to have a
-    <filename>~/.pgpass</> file to avoid regularly having to type in
-    passwords. See <xref linkend="libpq-pgpass"> for more information.
+    linkend="libpq-envars"/>.) It is also convenient to have a
+    <filename>~/.pgpass</filename> file to avoid regularly having to type in
+    passwords. See <xref linkend="libpq-pgpass"/> for more information.
     </para>
 
     <para>
@@ -676,8 +686,8 @@ $ <userinput>psql "service=myservice sslmode=require"</userinput>
 $ <userinput>psql postgresql://dbmaster:5433/mydb?sslmode=require</userinput>
 </programlisting>
      This way you can also use <acronym>LDAP</acronym> for connection
-     parameter lookup as described in <xref linkend="libpq-ldap">.
-     See <xref linkend="libpq-paramkeywords"> for more information on all the
+     parameter lookup as described in <xref linkend="libpq-ldap"/>.
+     See <xref linkend="libpq-paramkeywords"/> for more information on all the
      available connection options.
     </para>
 
@@ -699,7 +709,7 @@ $ <userinput>psql postgresql://dbmaster:5433/mydb?sslmode=require</userinput>
     </para>
   </refsect2>
 
-  <refsect2 id="R2-APP-PSQL-4">
+  <refsect2 id="r2-app-psql-4">
     <title>Entering SQL Commands</title>
 
     <para>
@@ -725,11 +735,23 @@ testdb=&gt;
     of the command are displayed on the screen.
     </para>
 
+    <para>
+    If untrusted users have access to a database that has not adopted a
+    <link linkend="ddl-schemas-patterns">secure schema usage pattern</link>,
+    begin your session by removing publicly-writable schemas
+    from <varname>search_path</varname>.  One can
+    add <literal>options=-csearch_path=</literal> to the connection string or
+    issue <literal>SELECT pg_catalog.set_config('search_path', '',
+    false)</literal> before other SQL commands.  This consideration is not
+    specific to <application>psql</application>; it applies to every interface
+    for executing arbitrary SQL commands.
+    </para>
+
     <para>
     Whenever a command is executed, <application>psql</application> also polls
     for asynchronous notification events generated by
-    <xref linkend="SQL-LISTEN"> and
-    <xref linkend="SQL-NOTIFY">.
+    <xref linkend="sql-listen"/> and
+    <xref linkend="sql-notify"/>.
     </para>
 
     <para>
@@ -739,7 +761,7 @@ testdb=&gt;
     </para>
   </refsect2>
 
-  <refsect2 id="APP-PSQL-meta-commands">
+  <refsect2 id="app-psql-meta-commands">
     <title>Meta-Commands</title>
 
     <para>
@@ -775,12 +797,16 @@ testdb=&gt;
 
     <para>
     If an unquoted colon (<literal>:</literal>) followed by a
-    <application>psql</> variable name appears within an argument, it is
+    <application>psql</application> variable name appears within an argument, it is
     replaced by the variable's value, as described in <xref
-    linkend="APP-PSQL-interpolation" endterm="APP-PSQL-interpolation-title">.
-    The forms <literal>:'<replaceable>variable_name</>'</literal> and
-    <literal>:"<replaceable>variable_name</>"</literal> described there
+    linkend="app-psql-interpolation" endterm="app-psql-interpolation-title"/>.
+    The forms <literal>:'<replaceable>variable_name</replaceable>'</literal> and
+    <literal>:"<replaceable>variable_name</replaceable>"</literal> described there
     work as well.
+    The <literal>:{?<replaceable>variable_name</replaceable>}</literal> syntax allows
+    testing whether a variable is defined. It is substituted by
+    TRUE or FALSE.
+    Escaping the colon with a backslash protects it from substitution.
     </para>
 
     <para>
@@ -789,15 +815,15 @@ testdb=&gt;
     shell.  The output of the command (with any trailing newline removed)
     replaces the backquoted text.  Within the text enclosed in backquotes,
     no special quoting or other processing occurs, except that appearances
-    of <literal>:<replaceable>variable_name</></literal> where
-    <replaceable>variable_name</> is a <application>psql</> variable name
+    of <literal>:<replaceable>variable_name</replaceable></literal> where
+    <replaceable>variable_name</replaceable> is a <application>psql</application> variable name
     are replaced by the variable's value.  Also, appearances of
-    <literal>:'<replaceable>variable_name</>'</literal> are replaced by the
+    <literal>:'<replaceable>variable_name</replaceable>'</literal> are replaced by the
     variable's value suitably quoted to become a single shell command
     argument.  (The latter form is almost always preferable, unless you are
     very sure of what is in the variable.)  Because carriage return and line
     feed characters cannot be safely quoted on all platforms, the
-    <literal>:'<replaceable>variable_name</>'</literal> form prints an
+    <literal>:'<replaceable>variable_name</replaceable>'</literal> form prints an
     error message and does not substitute the variable value when such
     characters appear in the value.
     </para>
@@ -806,13 +832,13 @@ testdb=&gt;
     Some commands take an <acronym>SQL</acronym> identifier (such as a
     table name) as argument. These arguments follow the syntax rules
     of <acronym>SQL</acronym>: Unquoted letters are forced to
-    lowercase, while double quotes (<literal>"</>) protect letters
+    lowercase, while double quotes (<literal>"</literal>) protect letters
     from case conversion and allow incorporation of whitespace into
     the identifier.  Within double quotes, paired double quotes reduce
     to a single double quote in the resulting name.  For example,
-    <literal>FOO"BAR"BAZ</> is interpreted as <literal>fooBARbaz</>,
-    and <literal>"A weird"" name"</> becomes <literal>A weird"
-    name</>.
+    <literal>FOO"BAR"BAZ</literal> is interpreted as <literal>fooBARbaz</literal>,
+    and <literal>"A weird"" name"</literal> becomes <literal>A weird"
+    name</literal>.
     </para>
 
     <para>
@@ -828,7 +854,7 @@ testdb=&gt;
     </para>
 
     <para>
-    Many of the meta-commands act on the <firstterm>current query buffer</>.
+    Many of the meta-commands act on the <firstterm>current query buffer</firstterm>.
     This is simply a buffer holding whatever SQL command text has been typed
     but not yet sent to the server for execution.  This will include previous
     input lines as well as any text appearing before the meta-command on the
@@ -855,18 +881,18 @@ testdb=&gt;
         <term><literal>\c</literal> or <literal>\connect [ -reuse-previous=<replaceable class="parameter">on|off</replaceable> ] [ <replaceable class="parameter">dbname</replaceable> [ <replaceable class="parameter">username</replaceable> ] [ <replaceable class="parameter">host</replaceable> ] [ <replaceable class="parameter">port</replaceable> ] | <replaceable class="parameter">conninfo</replaceable> ]</literal></term>
         <listitem>
         <para>
-        Establishes a new connection to a <productname>PostgreSQL</>
+        Establishes a new connection to a <productname>PostgreSQL</productname>
         server.  The connection parameters to use can be specified either
-        using a positional syntax, or using <replaceable>conninfo</> connection
-        strings as detailed in <xref linkend="libpq-connstring">.
+        using a positional syntax, or using <replaceable>conninfo</replaceable> connection
+        strings as detailed in <xref linkend="libpq-connstring"/>.
         </para>
 
         <para>
         Where the command omits database name, user, host, or port, the new
         connection can reuse values from the previous connection.  By default,
         values from the previous connection are reused except when processing
-        a <replaceable>conninfo</> string.  Passing a first argument
-        of <literal>-reuse-previous=on</>
+        a <replaceable>conninfo</replaceable> string.  Passing a first argument
+        of <literal>-reuse-previous=on</literal>
         or <literal>-reuse-previous=off</literal> overrides that default.
         When the command neither specifies nor reuses a particular parameter,
         the <application>libpq</application> default is used.  Specifying any
@@ -943,7 +969,7 @@ testdb=&gt;
         </listitem>
       </varlistentry>
 
-      <varlistentry id="APP-PSQL-meta-commands-copy">
+      <varlistentry id="app-psql-meta-commands-copy">
         <term><literal>\copy { <replaceable class="parameter">table</replaceable> [ ( <replaceable class="parameter">column_list</replaceable> ) ] | ( <replaceable class="parameter">query</replaceable> ) }
         { <literal>from</literal> | <literal>to</literal> }
         { <replaceable class="parameter">'filename'</replaceable> | program <replaceable class="parameter">'command'</replaceable> | stdin | stdout | pstdin | pstdout }
@@ -952,7 +978,7 @@ testdb=&gt;
         <listitem>
         <para>
         Performs a frontend (client) copy. This is an operation that
-        runs an <acronym>SQL</acronym> <xref linkend="SQL-COPY">
+        runs an <acronym>SQL</acronym> <xref linkend="sql-copy"/>
         command, but instead of the server
         reading or writing the specified file,
         <application>psql</application> reads or writes the file and
@@ -963,7 +989,7 @@ testdb=&gt;
         </para>
 
         <para>
-        When <literal>program</> is specified,
+        When <literal>program</literal> is specified,
         <replaceable class="parameter">command</replaceable> is
         executed by <application>psql</application> and the data passed from
         or to <replaceable class="parameter">command</replaceable> is
@@ -974,27 +1000,27 @@ testdb=&gt;
         </para>
 
         <para>
-        For <literal>\copy ... from stdin</>, data rows are read from the same
+        For <literal>\copy ... from stdin</literal>, data rows are read from the same
         source that issued the command, continuing until <literal>\.</literal>
-        is read or the stream reaches <acronym>EOF</>. This option is useful
+        is read or the stream reaches <acronym>EOF</acronym>. This option is useful
         for populating tables in-line within a SQL script file.
-        For <literal>\copy ... to stdout</>, output is sent to the same place
-        as <application>psql</> command output, and
-        the <literal>COPY <replaceable>count</></literal> command status is
+        For <literal>\copy ... to stdout</literal>, output is sent to the same place
+        as <application>psql</application> command output, and
+        the <literal>COPY <replaceable>count</replaceable></literal> command status is
         not printed (since it might be confused with a data row).
         To read/write <application>psql</application>'s standard input or
-        output regardless of the current command source or <literal>\o</>
-        option, write <literal>from pstdin</> or <literal>to pstdout</>.
+        output regardless of the current command source or <literal>\o</literal>
+        option, write <literal>from pstdin</literal> or <literal>to pstdout</literal>.
         </para>
 
         <para>
         The syntax of this command is similar to that of the
-        <acronym>SQL</acronym> <xref linkend="sql-copy">
+        <acronym>SQL</acronym> <xref linkend="sql-copy"/>
         command.  All options other than the data source/destination are
-        as specified for <xref linkend="sql-copy">.
-        Because of this, special parsing rules apply to the <command>\copy</>
+        as specified for <xref linkend="sql-copy"/>.
+        Because of this, special parsing rules apply to the <command>\copy</command>
         meta-command.  Unlike most other meta-commands, the entire remainder
-        of the line is always taken to be the arguments of <command>\copy</>,
+        of the line is always taken to be the arguments of <command>\copy</command>,
         and neither variable interpolation nor backquote expansion are
         performed in the arguments.
         </para>
@@ -1022,7 +1048,7 @@ testdb=&gt;
       </varlistentry>
 
 
-      <varlistentry id="APP-PSQL-meta-commands-crosstabview">
+      <varlistentry id="app-psql-meta-commands-crosstabview">
         <term><literal>\crosstabview [
             <replaceable class="parameter">colV</replaceable>
             [ <replaceable class="parameter">colH</replaceable>
@@ -1034,7 +1060,7 @@ testdb=&gt;
         Executes the current query buffer (like <literal>\g</literal>) and
         shows the results in a crosstab grid.
         The query must return at least three columns.
-        The output column identified by <replaceable class="parameter">colV</>
+        The output column identified by <replaceable class="parameter">colV</replaceable>
         becomes a vertical header and the output column identified by
         <replaceable class="parameter">colH</replaceable>
         becomes a horizontal header.
@@ -1062,7 +1088,7 @@ testdb=&gt;
 
         <para>
         The vertical header, displayed as the leftmost column, contains the
-        values found in column <replaceable class="parameter">colV</>, in the
+        values found in column <replaceable class="parameter">colV</replaceable>, in the
         same order as in the query results, but with duplicates removed.
         </para>
 
@@ -1071,11 +1097,11 @@ testdb=&gt;
         found in column <replaceable class="parameter">colH</replaceable>,
         with duplicates removed.  By default, these appear in the same order
         as in the query results.  But if the
-        optional <replaceable class="parameter">sortcolH</> argument is given,
+        optional <replaceable class="parameter">sortcolH</replaceable> argument is given,
         it identifies a column whose values must be integer numbers, and the
         values from <replaceable class="parameter">colH</replaceable> will
         appear in the horizontal header sorted according to the
-        corresponding <replaceable class="parameter">sortcolH</> values.
+        corresponding <replaceable class="parameter">sortcolH</replaceable> values.
         </para>
 
         <para>
@@ -1088,7 +1114,7 @@ testdb=&gt;
         the value of <replaceable class="parameter">colH</replaceable>
         is <literal>x</literal> and the value
         of <replaceable class="parameter">colV</replaceable>
-        is <literal>y</>.  If there is no such row, the cell is empty.  If
+        is <literal>y</literal>.  If there is no such row, the cell is empty.  If
         there are multiple such rows, an error is reported.
         </para>
         </listitem>
@@ -1096,7 +1122,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\d[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\d[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1109,13 +1135,13 @@ testdb=&gt;
         Associated indexes, constraints, rules, and triggers are
         also shown.  For foreign tables, the associated foreign
         server is shown as well.
-        (<quote>Matching the pattern</> is defined in
-        <xref linkend="APP-PSQL-patterns" endterm="APP-PSQL-patterns-title">
+        (<quote>Matching the pattern</quote> is defined in
+        <xref linkend="app-psql-patterns" endterm="app-psql-patterns-title"/>
         below.)
         </para>
 
         <para>
-        For some types of relation, <literal>\d</> shows additional information
+        For some types of relation, <literal>\d</literal> shows additional information
         for each column: column values for sequences, indexed expressions for
         indexes, and foreign data wrapper options for foreign tables.
         </para>
@@ -1125,7 +1151,7 @@ testdb=&gt;
         more information is displayed: any comments associated with the
         columns of the table are shown, as is the presence of OIDs in the
         table, the view definition if the relation is a view, a non-default
-        <link linkend="SQL-CREATETABLE-REPLICA-IDENTITY">replica
+        <link linkend="sql-createtable-replica-identity">replica
         identity</link> setting.
         </para>
 
@@ -1149,7 +1175,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\da[S] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\da[S] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1165,7 +1191,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dA[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dA[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1179,7 +1205,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\db[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\db[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1195,7 +1221,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dc[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dc[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists conversions between character-set encodings.
@@ -1213,7 +1239,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dC[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dC[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists type casts.
@@ -1228,12 +1254,12 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dd[S] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dd[S] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
-        Shows the descriptions of objects of type <literal>constraint</>,
-        <literal>operator class</>, <literal>operator family</>,
-        <literal>rule</>, and <literal>trigger</>. All
+        Shows the descriptions of objects of type <literal>constraint</literal>,
+        <literal>operator class</literal>, <literal>operator family</literal>,
+        <literal>rule</literal>, and <literal>trigger</literal>. All
         other comments may be viewed by the respective backslash commands for
         those object types.
         </para>
@@ -1249,7 +1275,7 @@ testdb=&gt;
 
         <para>
         Descriptions for objects can be created with the <xref
-        linkend="sql-comment">
+        linkend="sql-comment"/>
         <acronym>SQL</acronym> command.
        </para>
         </listitem>
@@ -1257,7 +1283,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dD[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dD[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists domains. If <replaceable
@@ -1274,7 +1300,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\ddp [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\ddp [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists default access privilege settings.  An entry is shown for
@@ -1286,22 +1312,22 @@ testdb=&gt;
         </para>
 
         <para>
-        The <xref linkend="sql-alterdefaultprivileges"> command is used to set
+        The <xref linkend="sql-alterdefaultprivileges"/> command is used to set
         default access privileges.  The meaning of the
         privilege display is explained under
-        <xref linkend="sql-grant">.
+        <xref linkend="sql-grant"/>.
         </para>
         </listitem>
       </varlistentry>
 
 
       <varlistentry>
-        <term><literal>\dE[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
-        <term><literal>\di[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
-        <term><literal>\dm[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
-        <term><literal>\ds[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
-        <term><literal>\dt[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
-        <term><literal>\dv[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dE[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\di[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dm[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\ds[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dt[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dv[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1312,7 +1338,7 @@ testdb=&gt;
         respectively.
         You can specify any or all of
         these letters, in any order, to obtain a listing of objects
-        of these types.  For example, <literal>\dit</> lists indexes
+        of these types.  For example, <literal>\dit</literal> lists indexes
         and tables.  If <literal>+</literal> is
         appended to the command name, each object is listed with its
         physical size on disk and its associated description, if any.
@@ -1327,7 +1353,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\des[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\des[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists foreign servers (mnemonic: <quote>external
@@ -1343,7 +1369,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\det[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\det[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists foreign tables (mnemonic: <quote>external tables</quote>).
@@ -1358,7 +1384,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\deu[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\deu[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists user mappings (mnemonic: <quote>external
@@ -1381,7 +1407,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dew[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dew[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists foreign-data wrappers (mnemonic: <quote>external
@@ -1397,16 +1423,16 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\df[antwS+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\df[antwS+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
         Lists functions, together with their result data types, argument data
-        types, and function types, which are classified as <quote>agg</>
-        (aggregate), <quote>normal</>, <quote>trigger</>, or <quote>window</>.
+        types, and function types, which are classified as <quote>agg</quote>
+        (aggregate), <quote>normal</quote>, <quote>trigger</quote>, or <quote>window</quote>.
         To display only functions
-        of specific type(s), add the corresponding letters <literal>a</>,
-        <literal>n</>, <literal>t</>, or <literal>w</> to the command.
+        of specific type(s), add the corresponding letters <literal>a</literal>,
+        <literal>n</literal>, <literal>t</literal>, or <literal>w</literal> to the command.
         If <replaceable
         class="parameter">pattern</replaceable> is specified, only
         functions whose names match the pattern are shown.
@@ -1423,7 +1449,7 @@ testdb=&gt;
         <para>
         To look up functions taking arguments or returning values of a specific
         data type, use your pager's search capability to scroll through the
-        <literal>\df</> output.
+        <literal>\df</literal> output.
         </para>
         </tip>
 
@@ -1431,7 +1457,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dF[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dF[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
          Lists text search configurations.
@@ -1445,7 +1471,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dFd[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dFd[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
          Lists text search dictionaries.
@@ -1459,7 +1485,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dFp[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dFp[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
          Lists text search parsers.
@@ -1473,7 +1499,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dFt[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dFt[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
          Lists text search templates.
@@ -1487,12 +1513,12 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dg[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dg[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists database roles.
-        (Since the concepts of <quote>users</> and <quote>groups</> have been
-        unified into <quote>roles</>, this command is now equivalent to
+        (Since the concepts of <quote>users</quote> and <quote>groups</quote> have been
+        unified into <quote>roles</quote>, this command is now equivalent to
         <literal>\du</literal>.)
         By default, only user-created roles are shown; supply the
         <literal>S</literal> modifier to include system roles.
@@ -1517,7 +1543,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dL[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dL[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists procedural languages. If <replaceable
@@ -1534,7 +1560,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dn[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dn[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
 
         <listitem>
         <para>
@@ -1551,7 +1577,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\do[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\do[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists operators with their operand and result types.
@@ -1569,7 +1595,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dO[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dO[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists collations.
@@ -1589,7 +1615,7 @@ testdb=&gt;
 
 
       <varlistentry>
-        <term><literal>\dp [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dp [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists tables, views and sequences with their
@@ -1600,17 +1626,17 @@ testdb=&gt;
         </para>
 
         <para>
-        The <xref linkend="sql-grant"> and
-        <xref linkend="sql-revoke">
+        The <xref linkend="sql-grant"/> and
+        <xref linkend="sql-revoke"/>
         commands are used to set access privileges.  The meaning of the
         privilege display is explained under
-        <xref linkend="sql-grant">.
+        <xref linkend="sql-grant"/>.
         </para>
         </listitem>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\drds [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">role-pattern</replaceable></link> [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">database-pattern</replaceable></link> ] ]</literal></term>
+        <term><literal>\drds [ <link linkend="app-psql-patterns"><replaceable class="parameter">role-pattern</replaceable></link> [ <link linkend="app-psql-patterns"><replaceable class="parameter">database-pattern</replaceable></link> ] ]</literal></term>
         <listitem>
         <para>
         Lists defined configuration settings.  These settings can be
@@ -1618,13 +1644,13 @@ testdb=&gt;
         <replaceable>role-pattern</replaceable> and
         <replaceable>database-pattern</replaceable> are used to select
         specific roles and databases to list, respectively.  If omitted, or if
-        <literal>*</> is specified, all settings are listed, including those
+        <literal>*</literal> is specified, all settings are listed, including those
         not role-specific or database-specific, respectively.
         </para>
 
         <para>
-        The <xref linkend="sql-alterrole"> and
-        <xref linkend="sql-alterdatabase">
+        The <xref linkend="sql-alterrole"/> and
+        <xref linkend="sql-alterdatabase"/>
         commands are used to define per-role and per-database configuration
         settings.
         </para>
@@ -1632,7 +1658,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dRp[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dRp[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists replication publications.
@@ -1646,7 +1672,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dRs[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dRs[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists replication subscriptions.
@@ -1660,7 +1686,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dT[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dT[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists data types.
@@ -1668,7 +1694,7 @@ testdb=&gt;
         specified, only types whose names match the pattern are listed.
         If <literal>+</literal> is appended to the command name, each type is
         listed with its internal name and size, its allowed values
-        if it is an <type>enum</> type, and its associated permissions.
+        if it is an <type>enum</type> type, and its associated permissions.
         By default, only user-created objects are shown;  supply a
         pattern or the <literal>S</literal> modifier to include system
         objects.
@@ -1677,12 +1703,12 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\du[S+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\du[S+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists database roles.
-        (Since the concepts of <quote>users</> and <quote>groups</> have been
-        unified into <quote>roles</>, this command is now equivalent to
+        (Since the concepts of <quote>users</quote> and <quote>groups</quote> have been
+        unified into <quote>roles</quote>, this command is now equivalent to
         <literal>\dg</literal>.)
         By default, only user-created roles are shown; supply the
         <literal>S</literal> modifier to include system roles.
@@ -1696,7 +1722,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dx[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dx[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists installed extensions.
@@ -1710,7 +1736,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\dy[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\dy[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists event triggers.
@@ -1724,7 +1750,7 @@ testdb=&gt;
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\e</literal> or <literal>\edit</> <literal> <optional> <replaceable class="parameter">filename</> </optional> <optional> <replaceable class="parameter">line_number</> </optional> </literal></term>
+        <term><literal>\e</literal> or <literal>\edit</literal> <literal> <optional> <replaceable class="parameter">filename</replaceable> </optional> <optional> <replaceable class="parameter">line_number</replaceable> </optional> </literal></term>
 
         <listitem>
         <para>
@@ -1744,8 +1770,8 @@ testdb=&gt;
         whole buffer as a single line.  Any complete queries are immediately
         executed; that is, if the query buffer contains or ends with a
         semicolon, everything up to that point is executed.  Whatever remains
-        will wait in the query buffer; type semicolon or <literal>\g</> to
-        send it, or <literal>\r</> to cancel it by clearing the query buffer.
+        will wait in the query buffer; type semicolon or <literal>\g</literal> to
+        send it, or <literal>\r</literal> to cancel it by clearing the query buffer.
         Treating the buffer as a single line primarily affects meta-commands:
         whatever is in the buffer after a meta-command will be taken as
         argument(s) to the meta-command, even if it spans multiple lines.
@@ -1764,7 +1790,7 @@ testdb=&gt;
         <tip>
         <para>
         See under <xref linkend="app-psql-environment"
-        endterm="app-psql-environment-title"> for how to configure and
+        endterm="app-psql-environment-title"/> for how to configure and
         customize your editor.
         </para>
         </tip>
@@ -1797,27 +1823,28 @@ Tue Oct 26 21:40:57 CEST 1999
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\ef <optional> <replaceable class="parameter">function_description</> <optional>  <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
+        <term><literal>\ef <optional> <replaceable class="parameter">function_description</replaceable> <optional>  <replaceable class="parameter">line_number</replaceable> </optional> </optional> </literal></term>
 
         <listitem>
         <para>
-         This command fetches and edits the definition of the named function,
-         in the form of a <command>CREATE OR REPLACE FUNCTION</> command.
-         Editing is done in the same way as for <literal>\edit</>.
+         This command fetches and edits the definition of the named function or procedure,
+         in the form of a <command>CREATE OR REPLACE FUNCTION</command> or
+         <command>CREATE OR REPLACE PROCEDURE</command> command.
+         Editing is done in the same way as for <literal>\edit</literal>.
          After the editor exits, the updated command waits in the query buffer;
-         type semicolon or <literal>\g</> to send it, or <literal>\r</>
+         type semicolon or <literal>\g</literal> to send it, or <literal>\r</literal>
          to cancel.
         </para>
 
         <para>
          The target function can be specified by name alone, or by name
-         and arguments, for example <literal>foo(integer, text)</>.
+         and arguments, for example <literal>foo(integer, text)</literal>.
          The argument types must be given if there is more
          than one function of the same name.
         </para>
 
         <para>
-         If no function is specified, a blank <command>CREATE FUNCTION</>
+         If no function is specified, a blank <command>CREATE FUNCTION</command>
          template is presented for editing.
         </para>
 
@@ -1830,7 +1857,7 @@ Tue Oct 26 21:40:57 CEST 1999
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\ef</>, and neither
+        always taken to be the argument(s) of <command>\ef</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.
         </para>
@@ -1838,7 +1865,7 @@ Tue Oct 26 21:40:57 CEST 1999
         <tip>
         <para>
         See under <xref linkend="app-psql-environment"
-        endterm="app-psql-environment-title"> for how to configure and
+        endterm="app-psql-environment-title"/> for how to configure and
         customize your editor.
         </para>
         </tip>
@@ -1865,28 +1892,28 @@ Tue Oct 26 21:40:57 CEST 1999
         <para>
         Repeats the most recent server error message at maximum
         verbosity, as though <varname>VERBOSITY</varname> were set
-        to <literal>verbose</> and <varname>SHOW_CONTEXT</varname> were
-        set to <literal>always</>.
+        to <literal>verbose</literal> and <varname>SHOW_CONTEXT</varname> were
+        set to <literal>always</literal>.
         </para>
         </listitem>
       </varlistentry>
 
 
       <varlistentry>
-        <term><literal>\ev <optional> <replaceable class="parameter">view_name</> <optional>  <replaceable class="parameter">line_number</> </optional> </optional> </literal></term>
+        <term><literal>\ev <optional> <replaceable class="parameter">view_name</replaceable> <optional>  <replaceable class="parameter">line_number</replaceable> </optional> </optional> </literal></term>
 
         <listitem>
         <para>
          This command fetches and edits the definition of the named view,
-         in the form of a <command>CREATE OR REPLACE VIEW</> command.
-         Editing is done in the same way as for <literal>\edit</>.
+         in the form of a <command>CREATE OR REPLACE VIEW</command> command.
+         Editing is done in the same way as for <literal>\edit</literal>.
          After the editor exits, the updated command waits in the query buffer;
-         type semicolon or <literal>\g</> to send it, or <literal>\r</>
+         type semicolon or <literal>\g</literal> to send it, or <literal>\r</literal>
          to cancel.
         </para>
 
         <para>
-         If no view is specified, a blank <command>CREATE VIEW</>
+         If no view is specified, a blank <command>CREATE VIEW</command>
          template is presented for editing.
         </para>
 
@@ -1897,7 +1924,7 @@ Tue Oct 26 21:40:57 CEST 1999
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\ev</>, and neither
+        always taken to be the argument(s) of <command>\ev</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.
         </para>
@@ -1938,7 +1965,7 @@ Tue Oct 26 21:40:57 CEST 1999
         alternative to the <command>\o</command> command.
         </para>
         <para>
-        If the argument begins with <literal>|</>, then the entire remainder
+        If the argument begins with <literal>|</literal>, then the entire remainder
         of the line is taken to be
         the <replaceable class="parameter">command</replaceable> to execute,
         and neither variable interpolation nor backquote expansion are
@@ -1949,6 +1976,25 @@ Tue Oct 26 21:40:57 CEST 1999
       </varlistentry>
 
 
+      <varlistentry>
+        <term><literal>\gdesc</literal></term>
+
+        <listitem>
+        <para>
+         Shows the description (that is, the column names and data types)
+         of the result of the current query buffer.  The query is not
+         actually executed; however, if it contains some type of syntax
+         error, that error will be reported in the normal way.
+        </para>
+
+        <para>
+         If the current query buffer is empty, the most recently sent query
+         is described instead.
+        </para>
+        </listitem>
+      </varlistentry>
+
+
       <varlistentry>
         <term><literal>\gexec</literal></term>
 
@@ -1957,13 +2003,13 @@ Tue Oct 26 21:40:57 CEST 1999
          Sends the current query buffer to the server, then treats
          each column of each row of the query's output (if any) as a SQL
          statement to be executed.  For example, to create an index on each
-         column of <structname>my_table</>:
+         column of <structname>my_table</structname>:
 <programlisting>
-=&gt; <userinput>SELECT format('create index on my_table(%I)', attname)</>
--&gt; <userinput>FROM pg_attribute</>
--&gt; <userinput>WHERE attrelid = 'my_table'::regclass AND attnum &gt; 0</>
--&gt; <userinput>ORDER BY attnum</>
--&gt; <userinput>\gexec</>
+=&gt; <userinput>SELECT format('create index on my_table(%I)', attname)</userinput>
+-&gt; <userinput>FROM pg_attribute</userinput>
+-&gt; <userinput>WHERE attrelid = 'my_table'::regclass AND attnum &gt; 0</userinput>
+-&gt; <userinput>ORDER BY attnum</userinput>
+-&gt; <userinput>\gexec</userinput>
 CREATE INDEX
 CREATE INDEX
 CREATE INDEX
@@ -1976,14 +2022,14 @@ CREATE INDEX
          are returned, and left-to-right within each row if there is more
          than one column.  NULL fields are ignored.  The generated queries
          are sent literally to the server for processing, so they cannot be
-         <application>psql</> meta-commands nor contain <application>psql</>
+         <application>psql</application> meta-commands nor contain <application>psql</application>
          variable references.  If any individual query fails, execution of
          the remaining queries continues
          unless <varname>ON_ERROR_STOP</varname> is set.  Execution of each
          query is subject to <varname>ECHO</varname> processing.
          (Setting <varname>ECHO</varname> to <literal>all</literal>
          or <literal>queries</literal> is often advisable when
-         using <command>\gexec</>.)  Query logging, single-step mode,
+         using <command>\gexec</command>.)  Query logging, single-step mode,
          timing, and other query execution features apply to each generated
          query as well.
         </para>
@@ -2001,8 +2047,8 @@ CREATE INDEX
         <listitem>
         <para>
          Sends the current query buffer to the server and stores the
-         query's output into <application>psql</> variables (see <xref
-         linkend="APP-PSQL-variables" endterm="APP-PSQL-variables-title">).
+         query's output into <application>psql</application> variables (see <xref
+         linkend="app-psql-variables" endterm="app-psql-variables-title"/>).
          The query to be executed must return exactly one row.  Each column of
          the row is stored into a separate variable, named the same as the
          column.  For example:
@@ -2067,7 +2113,7 @@ hello 10
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\help</>, and neither
+        always taken to be the argument(s) of <command>\help</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.
         </para>
@@ -2108,7 +2154,7 @@ hello 10
         <para>
         If <replaceable>filename</replaceable> is <literal>-</literal>
         (hyphen), then standard input is read until an EOF indication
-        or <command>\q</> meta-command.  This can be used to intersperse
+        or <command>\q</command> meta-command.  This can be used to intersperse
         interactive input with input from files.  Note that Readline behavior
         will be used only if it is active at the outermost level.
         </para>
@@ -2183,7 +2229,7 @@ hello 10
         the same source file. If EOF is reached on the main input file or an
         <command>\include</command>-ed file before all local
         <command>\if</command>-blocks have been closed,
-        then <application>psql</> will raise an error.
+        then <application>psql</application> will raise an error.
         </para>
         <para>
          Here is an example:
@@ -2216,7 +2262,7 @@ SELECT
         <term><literal>\ir</literal> or <literal>\include_relative</literal> <replaceable class="parameter">filename</replaceable></term>
         <listitem>
         <para>
-        The <literal>\ir</> command is similar to <literal>\i</>, but resolves
+        The <literal>\ir</literal> command is similar to <literal>\i</literal>, but resolves
         relative file names differently.  When executing in interactive mode,
         the two commands behave identically.  However, when invoked from a
         script, <literal>\ir</literal> interprets file names relative to the
@@ -2228,7 +2274,7 @@ SELECT
 
 
       <varlistentry>
-        <term><literal>\l[+]</literal> or <literal>\list[+] [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\l[+]</literal> or <literal>\list[+] [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         List the databases in the server and show their names, owners,
@@ -2341,7 +2387,7 @@ lo_import 152801
         </para>
 
         <para>
-        If the argument begins with <literal>|</>, then the entire remainder
+        If the argument begins with <literal>|</literal>, then the entire remainder
         of the line is taken to be
         the <replaceable class="parameter">command</replaceable> to execute,
         and neither variable interpolation nor backquote expansion are
@@ -2384,7 +2430,7 @@ lo_import 152801
         <para>
         Changes the password of the specified user (by default, the current
         user).  This command prompts for the new password, encrypts it, and
-        sends it to the server as an <command>ALTER ROLE</> command.  This
+        sends it to the server as an <command>ALTER ROLE</command> command.  This
         makes sure that the new password does not appear in cleartext in the
         command history, the server log, or elsewhere.
         </para>
@@ -2396,16 +2442,16 @@ lo_import 152801
         <listitem>
         <para>
          Prompts the user to supply text, which is assigned to the variable
-         <replaceable class="parameter">name</>.
+         <replaceable class="parameter">name</replaceable>.
          An optional prompt string, <replaceable
-         class="parameter">text</>, can be specified.  (For multiword
+         class="parameter">text</replaceable>, can be specified.  (For multiword
          prompts, surround the text with single quotes.)
         </para>
 
         <para>
-         By default, <literal>\prompt</> uses the terminal for input and
-         output.  However, if the <option>-f</> command line switch was
-         used, <literal>\prompt</> uses standard input and standard output.
+         By default, <literal>\prompt</literal> uses the terminal for input and
+         output.  However, if the <option>-f</option> command line switch was
+         used, <literal>\prompt</literal> uses standard input and standard output.
         </para>
         </listitem>
       </varlistentry>
@@ -2459,16 +2505,16 @@ lo_import 152801
           <term><literal>columns</literal></term>
           <listitem>
           <para>
-          Sets the target width for the <literal>wrapped</> format, and also
+          Sets the target width for the <literal>wrapped</literal> format, and also
           the width limit for determining whether output is wide enough to
           require the pager or switch to the vertical display in expanded auto
           mode.
           Zero (the default) causes the target width to be controlled by the
-          environment variable <envar>COLUMNS</>, or the detected screen width
-          if <envar>COLUMNS</> is not set.
-          In addition, if <literal>columns</> is zero then the
-          <literal>wrapped</> format only affects screen output.
-          If <literal>columns</> is nonzero then file and pipe output is
+          environment variable <envar>COLUMNS</envar>, or the detected screen width
+          if <envar>COLUMNS</envar> is not set.
+          In addition, if <literal>columns</literal> is zero then the
+          <literal>wrapped</literal> format only affects screen output.
+          If <literal>columns</literal> is nonzero then file and pipe output is
           wrapped to that width as well.
           </para>
           </listitem>
@@ -2527,7 +2573,7 @@ lo_import 152801
           If <replaceable class="parameter">value</replaceable> is specified
           it must be either <literal>on</literal> or <literal>off</literal>
           which will enable or disable display of the table footer
-          (the <literal>(<replaceable>n</> rows)</literal> count).
+          (the <literal>(<replaceable>n</replaceable> rows)</literal> count).
           If <replaceable class="parameter">value</replaceable> is omitted the
           command toggles footer display on or off.
           </para>
@@ -2548,7 +2594,7 @@ lo_import 152801
           is enough.)
           </para>
 
-          <para><literal>unaligned</> format writes all columns of a row on one
+          <para><literal>unaligned</literal> format writes all columns of a row on one
           line, separated by the currently active field separator. This
           is useful for creating output that might be intended to be read
           in by other programs (for example, tab-separated or comma-separated
@@ -2559,18 +2605,18 @@ lo_import 152801
           nicely formatted text output;  this is the default.
           </para>
 
-          <para><literal>wrapped</> format is like <literal>aligned</> but wraps
+          <para><literal>wrapped</literal> format is like <literal>aligned</literal> but wraps
           wide data values across lines to make the output fit in the target
           column width.  The target width is determined as described under
-          the <literal>columns</> option.  Note that <application>psql</> will
+          the <literal>columns</literal> option.  Note that <application>psql</application> will
           not attempt to wrap column header titles; therefore,
-          <literal>wrapped</> format behaves the same as <literal>aligned</>
+          <literal>wrapped</literal> format behaves the same as <literal>aligned</literal>
           if the total width needed for column headers exceeds the target.
           </para>
 
           <para>
-          The <literal>html</>, <literal>asciidoc</>, <literal>latex</>,
-          <literal>latex-longtable</literal>, and <literal>troff-ms</>
+          The <literal>html</literal>, <literal>asciidoc</literal>, <literal>latex</literal>,
+          <literal>latex-longtable</literal>, and <literal>troff-ms</literal>
           formats put out tables that are intended to
           be included in documents using the respective mark-up
           language. They are not complete documents! This might not be
@@ -2578,7 +2624,7 @@ lo_import 152801
           <application>LaTeX</application> you must have a complete
           document wrapper.  <literal>latex-longtable</literal>
           also requires the <application>LaTeX</application>
-          <literal>longtable</literal> and <literal>booktabs</> packages.
+          <literal>longtable</literal> and <literal>booktabs</literal> packages.
           </para>
           </listitem>
           </varlistentry>
@@ -2592,9 +2638,9 @@ lo_import 152801
           or <literal>unicode</literal>.
           Unique abbreviations are allowed.  (That would mean one
           letter is enough.)
-          The default setting is <literal>ascii</>.
-          This option only affects the <literal>aligned</> and
-          <literal>wrapped</> output formats.
+          The default setting is <literal>ascii</literal>.
+          This option only affects the <literal>aligned</literal> and
+          <literal>wrapped</literal> output formats.
           </para>
 
           <para><literal>ascii</literal> style uses plain <acronym>ASCII</acronym>
@@ -2602,17 +2648,17 @@ lo_import 152801
           a <literal>+</literal> symbol in the right-hand margin.
           When the <literal>wrapped</literal> format wraps data from
           one line to the next without a newline character, a dot
-          (<literal>.</>) is shown in the right-hand margin of the first line,
+          (<literal>.</literal>) is shown in the right-hand margin of the first line,
           and again in the left-hand margin of the following line.
           </para>
 
-          <para><literal>old-ascii</literal> style uses plain <acronym>ASCII</>
+          <para><literal>old-ascii</literal> style uses plain <acronym>ASCII</acronym>
           characters, using the formatting style used
           in <productname>PostgreSQL</productname> 8.4 and earlier.
           Newlines in data are shown using a <literal>:</literal>
           symbol in place of the left-hand column separator.
           When the data is wrapped from one line
-          to the next without a newline character, a <literal>;</>
+          to the next without a newline character, a <literal>;</literal>
           symbol is used in place of the left-hand column separator.
           </para>
 
@@ -2625,7 +2671,7 @@ lo_import 152801
           </para>
 
           <para>
-          When the <literal>border</> setting is greater than zero,
+          When the <literal>border</literal> setting is greater than zero,
           the <literal>linestyle</literal> option also determines the
           characters with which the border lines are drawn.
           Plain <acronym>ASCII</acronym> characters work everywhere, but
@@ -2664,21 +2710,21 @@ lo_import 152801
           <term><literal>pager</literal></term>
           <listitem>
           <para>
-          Controls use of a pager program for query and <application>psql</>
-          help output. If the environment variable <envar>PAGER</envar>
-          is set, the output is piped to the specified program.
-          Otherwise a platform-dependent default (such as
-          <filename>more</filename>) is used.
+          Controls use of a pager program for query and <application>psql</application>
+          help output.  If the environment variable <envar>PSQL_PAGER</envar>
+          or <envar>PAGER</envar> is set, the output is piped to the
+          specified program.  Otherwise a platform-dependent default program
+          (such as <filename>more</filename>) is used.
           </para>
 
           <para>
-          When the <literal>pager</> option is <literal>off</>, the pager
-          program is not used. When the <literal>pager</> option is
-          <literal>on</>, the pager is used when appropriate, i.e., when the
+          When the <literal>pager</literal> option is <literal>off</literal>, the pager
+          program is not used. When the <literal>pager</literal> option is
+          <literal>on</literal>, the pager is used when appropriate, i.e., when the
           output is to a terminal and will not fit on the screen.
-          The <literal>pager</> option can also be set to <literal>always</>,
+          The <literal>pager</literal> option can also be set to <literal>always</literal>,
           which causes the pager to be used for all terminal output regardless
-          of whether it fits on the screen.  <literal>\pset pager</>
+          of whether it fits on the screen.  <literal>\pset pager</literal>
           without a <replaceable class="parameter">value</replaceable>
           toggles pager use on and off.
           </para>
@@ -2689,7 +2735,7 @@ lo_import 152801
           <term><literal>pager_min_lines</literal></term>
           <listitem>
           <para>
-          If <literal>pager_min_lines</> is set to a number greater than the
+          If <literal>pager_min_lines</literal> is set to a number greater than the
           page height, the pager program will not be called unless there are
           at least this many lines of output to show. The default setting
           is 0.
@@ -2735,7 +2781,7 @@ lo_import 152801
           In <literal>latex-longtable</literal> format, this controls
           the proportional width of each column containing a left-aligned
           data type.  It is specified as a whitespace-separated list of values,
-          e.g. <literal>'0.2 0.2 0.6'</>.  Unspecified output columns
+          e.g. <literal>'0.2 0.2 0.6'</literal>.  Unspecified output columns
           use the last specified value.
           </para>
           </listitem>
@@ -2806,8 +2852,8 @@ lo_import 152801
 
         <para>
         Illustrations of how these different formats look can be seen in
-        the <xref linkend="APP-PSQL-examples"
-        endterm="APP-PSQL-examples-title"> section.
+        the <xref linkend="app-psql-examples"
+        endterm="app-psql-examples-title"/> section.
         </para>
 
         <tip>
@@ -2877,7 +2923,7 @@ lo_import 152801
 
         <listitem>
         <para>
-        Sets the <application>psql</> variable <replaceable
+        Sets the <application>psql</application> variable <replaceable
         class="parameter">name</replaceable> to <replaceable
         class="parameter">value</replaceable>, or if more than one value
         is given, to the concatenation of all of them. If only one
@@ -2885,15 +2931,15 @@ lo_import 152801
         unset a variable, use the <command>\unset</command> command.
         </para>
 
-        <para><command>\set</> without any arguments displays the names and values
-        of all currently-set <application>psql</> variables.
+        <para><command>\set</command> without any arguments displays the names and values
+        of all currently-set <application>psql</application> variables.
         </para>
 
         <para>
         Valid variable names can contain letters, digits, and
         underscores. See the section <xref
-        linkend="APP-PSQL-variables"
-        endterm="APP-PSQL-variables-title"> below for details.
+        linkend="app-psql-variables"
+        endterm="app-psql-variables-title"/> below for details.
         Variable names are case-sensitive.
         </para>
 
@@ -2901,14 +2947,14 @@ lo_import 152801
         Certain variables are special, in that they
         control <application>psql</application>'s behavior or are
         automatically set to reflect connection state.  These variables are
-        documented in <xref linkend="APP-PSQL-variables"
-        endterm="APP-PSQL-variables-title">, below.
+        documented in <xref linkend="app-psql-variables"
+        endterm="app-psql-variables-title"/>, below.
         </para>
 
         <note>
         <para>
         This command is unrelated to the <acronym>SQL</acronym>
-        command <xref linkend="SQL-SET">.
+        command <xref linkend="sql-set"/>.
         </para>
         </note>
         </listitem>
@@ -2933,19 +2979,20 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
       </varlistentry>
 
       <varlistentry>
-        <term><literal>\sf[+] <replaceable class="parameter">function_description</> </literal></term>
+        <term><literal>\sf[+] <replaceable class="parameter">function_description</replaceable> </literal></term>
 
         <listitem>
         <para>
-         This command fetches and shows the definition of the named function,
-         in the form of a <command>CREATE OR REPLACE FUNCTION</> command.
+         This command fetches and shows the definition of the named function or procedure,
+         in the form of a <command>CREATE OR REPLACE FUNCTION</command> or
+         <command>CREATE OR REPLACE PROCEDURE</command> command.
          The definition is printed to the current query output channel,
          as set by <command>\o</command>.
         </para>
 
         <para>
          The target function can be specified by name alone, or by name
-         and arguments, for example <literal>foo(integer, text)</>.
+         and arguments, for example <literal>foo(integer, text)</literal>.
          The argument types must be given if there is more
          than one function of the same name.
         </para>
@@ -2958,7 +3005,7 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\sf</>, and neither
+        always taken to be the argument(s) of <command>\sf</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.
         </para>
@@ -2967,12 +3014,12 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
 
       <varlistentry>
-        <term><literal>\sv[+] <replaceable class="parameter">view_name</> </literal></term>
+        <term><literal>\sv[+] <replaceable class="parameter">view_name</replaceable> </literal></term>
 
         <listitem>
          <para>
           This command fetches and shows the definition of the named view,
-          in the form of a <command>CREATE OR REPLACE VIEW</> command.
+          in the form of a <command>CREATE OR REPLACE VIEW</command> command.
           The definition is printed to the current query output channel,
           as set by <command>\o</command>.
          </para>
@@ -2984,7 +3031,7 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\sv</>, and neither
+        always taken to be the argument(s) of <command>\sv</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.
         </para>
@@ -3037,16 +3084,16 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
         <listitem>
         <para>
-        Unsets (deletes) the <application>psql</> variable <replaceable
+        Unsets (deletes) the <application>psql</application> variable <replaceable
         class="parameter">name</replaceable>.
         </para>
 
         <para>
         Most variables that control <application>psql</application>'s behavior
-        cannot be unset; instead, an <literal>\unset</> command is interpreted
+        cannot be unset; instead, an <literal>\unset</literal> command is interpreted
         as setting them to their default values.
-        See <xref linkend="APP-PSQL-variables"
-        endterm="APP-PSQL-variables-title">, below.
+        See <xref linkend="app-psql-variables"
+        endterm="app-psql-variables-title"/>, below.
         </para>
         </listitem>
       </varlistentry>
@@ -3054,7 +3101,7 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
       <varlistentry>
         <term><literal>\w</literal> or <literal>\write</literal> <replaceable class="parameter">filename</replaceable></term>
-        <term><literal>\w</literal> or <literal>\write</literal> <literal>|</><replaceable class="parameter">command</replaceable></term>
+        <term><literal>\w</literal> or <literal>\write</literal> <literal>|</literal><replaceable class="parameter">command</replaceable></term>
         <listitem>
         <para>
         Writes the current query buffer to the file <replaceable
@@ -3065,7 +3112,7 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
         </para>
 
         <para>
-        If the argument begins with <literal>|</>, then the entire remainder
+        If the argument begins with <literal>|</literal>, then the entire remainder
         of the line is taken to be
         the <replaceable class="parameter">command</replaceable> to execute,
         and neither variable interpolation nor backquote expansion are
@@ -3080,10 +3127,10 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
         <term><literal>\watch [ <replaceable class="parameter">seconds</replaceable> ]</literal></term>
         <listitem>
         <para>
-        Repeatedly execute the current query buffer (as <literal>\g</> does)
+        Repeatedly execute the current query buffer (as <literal>\g</literal> does)
         until interrupted or the query fails.  Wait the specified number of
         seconds (default 2) between executions.  Each query result is
-        displayed with a header that includes the <literal>\pset title</>
+        displayed with a header that includes the <literal>\pset title</literal>
         string (if any), the time as of query start, and the delay interval.
         </para>
         <para>
@@ -3106,7 +3153,7 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
 
       <varlistentry>
-        <term><literal>\z [ <link linkend="APP-PSQL-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
+        <term><literal>\z [ <link linkend="app-psql-patterns"><replaceable class="parameter">pattern</replaceable></link> ]</literal></term>
         <listitem>
         <para>
         Lists tables, views and sequences with their
@@ -3128,14 +3175,14 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
         <term><literal>\! [ <replaceable class="parameter">command</replaceable> ]</literal></term>
         <listitem>
         <para>
-        With no argument, escapes to a sub-shell; <application>psql</>
+        With no argument, escapes to a sub-shell; <application>psql</application>
         resumes when the sub-shell exits.  With an argument, executes the
         shell command <replaceable class="parameter">command</replaceable>.
         </para>
 
         <para>
         Unlike most other meta-commands, the entire remainder of the line is
-        always taken to be the argument(s) of <command>\!</>, and neither
+        always taken to be the argument(s) of <command>\!</command>, and neither
         variable interpolation nor backquote expansion are performed in the
         arguments.  The rest of the line is simply passed literally to the
         shell.
@@ -3145,26 +3192,67 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
 
       <varlistentry>
-        <term><literal>\? [ <replaceable class="parameter">topic</> ]</literal></term>
+        <term><literal>\? [ <replaceable class="parameter">topic</replaceable> ]</literal></term>
         <listitem>
         <para>
         Shows help information. The optional
-        <replaceable class="parameter">topic</> parameter
-        (defaulting to <literal>commands</>) selects which part of <application>psql</application> is
-        explained: <literal>commands</> describes <application>psql</>'s
-        backslash commands; <literal>options</> describes the command-line
-        options that can be passed to <application>psql</>;
-        and <literal>variables</> shows help about <application>psql</application> configuration
+        <replaceable class="parameter">topic</replaceable> parameter
+        (defaulting to <literal>commands</literal>) selects which part of <application>psql</application> is
+        explained: <literal>commands</literal> describes <application>psql</application>'s
+        backslash commands; <literal>options</literal> describes the command-line
+        options that can be passed to <application>psql</application>;
+        and <literal>variables</literal> shows help about <application>psql</application> configuration
         variables.
         </para>
         </listitem>
       </varlistentry>
 
+
+      <varlistentry>
+        <term><literal>\;</literal></term>
+        <listitem>
+        <para>
+        Backslash-semicolon is not a meta-command in the same way as the
+        preceding commands; rather, it simply causes a semicolon to be
+        added to the query buffer without any further processing.
+        </para>
+
+        <para>
+        Normally, <application>psql</application> will dispatch a SQL command to the
+        server as soon as it reaches the command-ending semicolon, even if
+        more input remains on the current line.  Thus for example entering
+<programlisting>
+select 1; select 2; select 3;
+</programlisting>
+        will result in the three SQL commands being individually sent to
+        the server, with each one's results being displayed before
+        continuing to the next command.  However, a semicolon entered
+        as <literal>\;</literal> will not trigger command processing, so that the
+        command before it and the one after are effectively combined and
+        sent to the server in one request.  So for example
+<programlisting>
+select 1\; select 2\; select 3;
+</programlisting>
+        results in sending the three SQL commands to the server in a single
+        request, when the non-backslashed semicolon is reached.
+        The server executes such a request as a single transaction,
+        unless there are explicit <command>BEGIN</command>/<command>COMMIT</command>
+        commands included in the string to divide it into multiple
+        transactions.  (See <xref linkend="protocol-flow-multi-statement"/>
+        for more details about how the server handles multi-query strings.)
+        <application>psql</application> prints only the last query result
+        it receives for each request; in this example, although all
+        three <command>SELECT</command>s are indeed executed, <application>psql</application>
+        only prints the <literal>3</literal>.
+        </para>
+        </listitem>
+      </varlistentry>
+
     </variablelist>
   </para>
 
-  <refsect3 id="APP-PSQL-patterns">
-   <title id="APP-PSQL-patterns-title">Patterns</title>
+  <refsect3 id="app-psql-patterns">
+   <title id="app-psql-patterns-title">Patterns</title>
 
    <indexterm>
     <primary>patterns</primary>
@@ -3172,54 +3260,54 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
    </indexterm>
 
   <para>
-   The various <literal>\d</> commands accept a <replaceable
+   The various <literal>\d</literal> commands accept a <replaceable
    class="parameter">pattern</replaceable> parameter to specify the
    object name(s) to be displayed.  In the simplest case, a pattern
    is just the exact name of the object.  The characters within a
    pattern are normally folded to lower case, just as in SQL names;
-   for example, <literal>\dt FOO</> will display the table named
-   <literal>foo</>.  As in SQL names, placing double quotes around
+   for example, <literal>\dt FOO</literal> will display the table named
+   <literal>foo</literal>.  As in SQL names, placing double quotes around
    a pattern stops folding to lower case.  Should you need to include
    an actual double quote character in a pattern, write it as a pair
    of double quotes within a double-quote sequence; again this is in
    accord with the rules for SQL quoted identifiers.  For example,
-   <literal>\dt "FOO""BAR"</> will display the table named
-   <literal>FOO"BAR</> (not <literal>foo"bar</>).  Unlike the normal
+   <literal>\dt "FOO""BAR"</literal> will display the table named
+   <literal>FOO"BAR</literal> (not <literal>foo"bar</literal>).  Unlike the normal
    rules for SQL names, you can put double quotes around just part
-   of a pattern, for instance <literal>\dt FOO"FOO"BAR</> will display
-   the table named <literal>fooFOObar</>.
+   of a pattern, for instance <literal>\dt FOO"FOO"BAR</literal> will display
+   the table named <literal>fooFOObar</literal>.
   </para>
 
   <para>
    Whenever the <replaceable class="parameter">pattern</replaceable> parameter
-   is omitted completely, the <literal>\d</> commands display all objects
+   is omitted completely, the <literal>\d</literal> commands display all objects
    that are visible in the current schema search path &mdash; this is
-   equivalent to using <literal>*</> as the pattern.
-   (An object is said to be <firstterm>visible</> if its
+   equivalent to using <literal>*</literal> as the pattern.
+   (An object is said to be <firstterm>visible</firstterm> if its
    containing schema is in the search path and no object of the same
    kind and name appears earlier in the search path. This is equivalent to the
    statement that the object can be referenced by name without explicit
    schema qualification.)
    To see all objects in the database regardless of visibility,
-   use <literal>*.*</> as the pattern.
+   use <literal>*.*</literal> as the pattern.
   </para>
 
   <para>
-   Within a pattern, <literal>*</> matches any sequence of characters
-   (including no characters) and <literal>?</> matches any single character.
+   Within a pattern, <literal>*</literal> matches any sequence of characters
+   (including no characters) and <literal>?</literal> matches any single character.
    (This notation is comparable to Unix shell file name patterns.)
-   For example, <literal>\dt int*</> displays tables whose names
-   begin with <literal>int</>.  But within double quotes, <literal>*</>
-   and <literal>?</> lose these special meanings and are just matched
+   For example, <literal>\dt int*</literal> displays tables whose names
+   begin with <literal>int</literal>.  But within double quotes, <literal>*</literal>
+   and <literal>?</literal> lose these special meanings and are just matched
    literally.
   </para>
 
   <para>
-   A pattern that contains a dot (<literal>.</>) is interpreted as a schema
+   A pattern that contains a dot (<literal>.</literal>) is interpreted as a schema
    name pattern followed by an object name pattern.  For example,
-   <literal>\dt foo*.*bar*</> displays all tables whose table name
-   includes <literal>bar</> that are in schemas whose schema name
-   starts with <literal>foo</>.  When no dot appears, then the pattern
+   <literal>\dt foo*.*bar*</literal> displays all tables whose table name
+   includes <literal>bar</literal> that are in schemas whose schema name
+   starts with <literal>foo</literal>.  When no dot appears, then the pattern
    matches only objects that are visible in the current schema search path.
    Again, a dot within double quotes loses its special meaning and is matched
    literally.
@@ -3227,28 +3315,28 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
 
   <para>
    Advanced users can use regular-expression notations such as character
-   classes, for example <literal>[0-9]</> to match any digit.  All regular
+   classes, for example <literal>[0-9]</literal> to match any digit.  All regular
    expression special characters work as specified in
-   <xref linkend="functions-posix-regexp">, except for <literal>.</> which
-   is taken as a separator as mentioned above, <literal>*</> which is
-   translated to the regular-expression notation <literal>.*</>,
-   <literal>?</> which is translated to <literal>.</>, and
-   <literal>$</> which is matched literally.  You can emulate
+   <xref linkend="functions-posix-regexp"/>, except for <literal>.</literal> which
+   is taken as a separator as mentioned above, <literal>*</literal> which is
+   translated to the regular-expression notation <literal>.*</literal>,
+   <literal>?</literal> which is translated to <literal>.</literal>, and
+   <literal>$</literal> which is matched literally.  You can emulate
    these pattern characters at need by writing
-   <literal>?</> for <literal>.</>,
+   <literal>?</literal> for <literal>.</literal>,
    <literal>(<replaceable class="parameter">R</replaceable>+|)</literal> for
    <literal><replaceable class="parameter">R</replaceable>*</literal>, or
    <literal>(<replaceable class="parameter">R</replaceable>|)</literal> for
    <literal><replaceable class="parameter">R</replaceable>?</literal>.
-   <literal>$</> is not needed as a regular-expression character since
+   <literal>$</literal> is not needed as a regular-expression character since
    the pattern must match the whole name, unlike the usual
-   interpretation of regular expressions (in other words, <literal>$</>
-   is automatically appended to your pattern).  Write <literal>*</> at the
+   interpretation of regular expressions (in other words, <literal>$</literal>
+   is automatically appended to your pattern).  Write <literal>*</literal> at the
    beginning and/or end if you don't wish the pattern to be anchored.
    Note that within double quotes, all regular expression special characters
    lose their special meanings and are matched literally.  Also, the regular
    expression special characters are matched literally in operator name
-   patterns (i.e., the argument of <literal>\do</>).
+   patterns (i.e., the argument of <literal>\do</literal>).
   </para>
   </refsect3>
  </refsect2>
@@ -3256,8 +3344,8 @@ testdb=&gt; <userinput>\setenv LESS -imx4F</userinput>
  <refsect2>
   <title>Advanced Features</title>
 
-   <refsect3 id="APP-PSQL-variables">
-    <title id="APP-PSQL-variables-title">Variables</title>
+   <refsect3 id="app-psql-variables">
+    <title id="app-psql-variables-title">Variables</title>
 
     <para>
     <application>psql</application> provides variable substitution
@@ -3281,8 +3369,8 @@ testdb=&gt; <userinput>\echo :foo</userinput>
 bar
 </programlisting>
     This works in both regular SQL commands and meta-commands; there is
-    more detail in <xref linkend="APP-PSQL-interpolation"
-    endterm="APP-PSQL-interpolation-title">, below.
+    more detail in <xref linkend="app-psql-interpolation"
+    endterm="app-psql-interpolation-title"/>, below.
     </para>
 
     <para>
@@ -3321,14 +3409,14 @@ bar
 
    <para>
     Variables that control <application>psql</application>'s behavior
-    generally cannot be unset or set to invalid values.  An <literal>\unset</>
+    generally cannot be unset or set to invalid values.  An <literal>\unset</literal>
     command is allowed but is interpreted as setting the variable to its
-    default value.  A <literal>\set</> command without a second argument is
-    interpreted as setting the variable to <literal>on</>, for control
+    default value.  A <literal>\set</literal> command without a second argument is
+    interpreted as setting the variable to <literal>on</literal>, for control
     variables that accept that value, and is rejected for others.  Also,
-    control variables that accept the values <literal>on</>
-    and <literal>off</> will also accept other common spellings of Boolean
-    values, such as <literal>true</> and <literal>false</>.
+    control variables that accept the values <literal>on</literal>
+    and <literal>off</literal> will also accept other common spellings of Boolean
+    values, such as <literal>true</literal> and <literal>false</literal>.
    </para>
 
    <para>
@@ -3346,23 +3434,23 @@ bar
       </term>
         <listitem>
         <para>
-        When <literal>on</> (the default), each SQL command is automatically
+        When <literal>on</literal> (the default), each SQL command is automatically
         committed upon successful completion.  To postpone commit in this
-        mode, you must enter a <command>BEGIN</> or <command>START
-        TRANSACTION</> SQL command.  When <literal>off</> or unset, SQL
+        mode, you must enter a <command>BEGIN</command> or <command>START
+        TRANSACTION</command> SQL command.  When <literal>off</literal> or unset, SQL
         commands are not committed until you explicitly issue
-        <command>COMMIT</> or <command>END</>.  The autocommit-off
-        mode works by issuing an implicit <command>BEGIN</> for you, just
+        <command>COMMIT</command> or <command>END</command>.  The autocommit-off
+        mode works by issuing an implicit <command>BEGIN</command> for you, just
         before any command that is not already in a transaction block and
-        is not itself a <command>BEGIN</> or other transaction-control
+        is not itself a <command>BEGIN</command> or other transaction-control
         command, nor a command that cannot be executed inside a transaction
-        block (such as <command>VACUUM</>).
+        block (such as <command>VACUUM</command>).
         </para>
 
         <note>
         <para>
          In autocommit-off mode, you must explicitly abandon any failed
-         transaction by entering <command>ABORT</> or <command>ROLLBACK</>.
+         transaction by entering <command>ABORT</command> or <command>ROLLBACK</command>.
          Also keep in mind that if you exit the session
          without committing, your work will be lost.
         </para>
@@ -3370,7 +3458,7 @@ bar
 
         <note>
         <para>
-         The autocommit-on mode is <productname>PostgreSQL</>'s traditional
+         The autocommit-on mode is <productname>PostgreSQL</productname>'s traditional
          behavior, but autocommit-off is closer to the SQL spec.  If you
          prefer autocommit-off, you might wish to set it in the system-wide
          <filename>psqlrc</filename> file or your
@@ -3430,7 +3518,7 @@ bar
         <term><varname>ECHO_HIDDEN</varname></term>
         <listitem>
         <para>
-        When this variable is set to <literal>on</> and a backslash command
+        When this variable is set to <literal>on</literal> and a backslash command
         queries the database, the query is first shown.
         This feature helps you to study
         <productname>PostgreSQL</productname> internals and provide
@@ -3438,7 +3526,7 @@ bar
         on program start-up, use the switch <option>-E</option>.)  If you set
         this variable to the value <literal>noexec</literal>, the queries are
         just shown but are not actually sent to the server and executed.
-        The default value is <literal>off</>.
+        The default value is <literal>off</literal>.
         </para>
         </listitem>
       </varlistentry>
@@ -3450,11 +3538,21 @@ bar
         The current client character set encoding.
         This is set every time you connect to a database (including
         program start-up), and when you change the encoding
-        with <literal>\encoding</>, but it can be changed or unset.
+        with <literal>\encoding</literal>, but it can be changed or unset.
         </para>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term><varname>ERROR</varname></term>
+       <listitem>
+        <para>
+         <literal>true</literal> if the last SQL query failed, <literal>false</literal> if
+         it succeeded.  See also <varname>SQLSTATE</varname>.
+        </para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>FETCH_COUNT</varname></term>
         <listitem>
@@ -3474,7 +3572,7 @@ bar
         <tip>
         <para>
         Although you can use any output format with this feature,
-        the default <literal>aligned</> format tends to look bad
+        the default <literal>aligned</literal> format tends to look bad
         because each group of <varname>FETCH_COUNT</varname> rows
         will be formatted separately, leading to varying column
         widths across the row groups.  The other output formats work better.
@@ -3561,13 +3659,13 @@ bar
         <term><varname>IGNOREEOF</varname></term>
         <listitem>
         <para>
-         If set to 1 or less, sending an <acronym>EOF</> character (usually
-         <keycombo action="simul"><keycap>Control</><keycap>D</></>)
+         If set to 1 or less, sending an <acronym>EOF</acronym> character (usually
+         <keycombo action="simul"><keycap>Control</keycap><keycap>D</keycap></keycombo>)
          to an interactive session of <application>psql</application>
          will terminate the application.  If set to a larger numeric value,
-         that many consecutive <acronym>EOF</> characters must be typed to
+         that many consecutive <acronym>EOF</acronym> characters must be typed to
          make an interactive session terminate.  If the variable is set to a
-         non-numeric value, it is interpreted as 10.
+         non-numeric value, it is interpreted as 10.  The default is 0.
         </para>
         <note>
         <para>
@@ -3591,6 +3689,19 @@ bar
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term><varname>LAST_ERROR_MESSAGE</varname></term>
+       <term><varname>LAST_ERROR_SQLSTATE</varname></term>
+       <listitem>
+        <para>
+         The primary error message and associated SQLSTATE code for the most
+         recent failed query in the current <application>psql</application> session, or
+         an empty string and <literal>00000</literal> if no error has occurred in
+         the current session.
+        </para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
       <term>
        <varname>ON_ERROR_ROLLBACK</varname>
@@ -3601,14 +3712,14 @@ bar
       </term>
         <listitem>
         <para>
-        When set to <literal>on</>, if a statement in a transaction block
+        When set to <literal>on</literal>, if a statement in a transaction block
         generates an error, the error is ignored and the transaction
-        continues. When set to <literal>interactive</>, such errors are only
+        continues. When set to <literal>interactive</literal>, such errors are only
         ignored in interactive sessions, and not when reading script
-        files. When set to <literal>off</> (the default), a statement in a
+        files. When set to <literal>off</literal> (the default), a statement in a
         transaction block that generates an error aborts the entire
         transaction. The error rollback mode works by issuing an
-        implicit <command>SAVEPOINT</> for you, just before each command
+        implicit <command>SAVEPOINT</command> for you, just before each command
         that is in a transaction block, and then rolling back to the
         savepoint if the command fails.
         </para>
@@ -3620,7 +3731,7 @@ bar
         <listitem>
         <para>
         By default, command processing continues after an error.  When this
-        variable is set to <literal>on</>, processing will instead stop
+        variable is set to <literal>on</literal>, processing will instead stop
         immediately.  In interactive mode,
         <application>psql</application> will return to the command prompt;
         otherwise, <application>psql</application> will exit, returning
@@ -3653,8 +3764,8 @@ bar
         <para>
         These specify what the prompts <application>psql</application>
         issues should look like. See <xref
-        linkend="APP-PSQL-prompting"
-        endterm="APP-PSQL-prompting-title"> below.
+        linkend="app-psql-prompting"
+        endterm="app-psql-prompting-title"/> below.
         </para>
         </listitem>
       </varlistentry>
@@ -3663,25 +3774,50 @@ bar
         <term><varname>QUIET</varname></term>
         <listitem>
         <para>
-        Setting this variable to <literal>on</> is equivalent to the command
+        Setting this variable to <literal>on</literal> is equivalent to the command
         line option <option>-q</option>. It is probably not too useful in
         interactive mode.
         </para>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term><varname>ROW_COUNT</varname></term>
+       <listitem>
+        <para>
+         The number of rows returned or affected by the last SQL query, or 0
+         if the query failed or did not report a row count.
+        </para>
+       </listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><varname>SERVER_VERSION_NAME</varname></term>
+        <term><varname>SERVER_VERSION_NUM</varname></term>
+        <listitem>
+        <para>
+        The server's version number as a string, for
+        example <literal>9.6.2</literal>, <literal>10.1</literal> or <literal>11beta1</literal>,
+        and in numeric form, for
+        example <literal>90602</literal> or <literal>100001</literal>.
+        These are set every time you connect to a database
+        (including program start-up), but can be changed or unset.
+        </para>
+        </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>SHOW_CONTEXT</varname></term>
         <listitem>
         <para>
         This variable can be set to the
-        values <literal>never</>, <literal>errors</>, or <literal>always</>
-        to control whether <literal>CONTEXT</> fields are displayed in
-        messages from the server. The default is <literal>errors</> (meaning
+        values <literal>never</literal>, <literal>errors</literal>, or <literal>always</literal>
+        to control whether <literal>CONTEXT</literal> fields are displayed in
+        messages from the server. The default is <literal>errors</literal> (meaning
         that context will be shown in error messages, but not in notice or
         warning messages).  This setting has no effect
-        when <varname>VERBOSITY</> is set to <literal>terse</>.
-        (See also <command>\errverbose</>, for use when you want a verbose
+        when <varname>VERBOSITY</varname> is set to <literal>terse</literal>.
+        (See also <command>\errverbose</command>, for use when you want a verbose
         version of the error you just got.)
         </para>
         </listitem>
@@ -3691,7 +3827,7 @@ bar
         <term><varname>SINGLELINE</varname></term>
         <listitem>
         <para>
-        Setting this variable to <literal>on</> is equivalent to the command
+        Setting this variable to <literal>on</literal> is equivalent to the command
         line option <option>-S</option>.
         </para>
         </listitem>
@@ -3701,12 +3837,23 @@ bar
         <term><varname>SINGLESTEP</varname></term>
         <listitem>
         <para>
-        Setting this variable to <literal>on</> is equivalent to the command
+        Setting this variable to <literal>on</literal> is equivalent to the command
         line option <option>-s</option>.
         </para>
         </listitem>
       </varlistentry>
 
+      <varlistentry>
+       <term><varname>SQLSTATE</varname></term>
+       <listitem>
+        <para>
+         The error code (see <xref linkend="errcodes-appendix"/>) associated
+         with the last SQL query's failure, or <literal>00000</literal> if it
+         succeeded.
+        </para>
+       </listitem>
+      </varlistentry>
+
       <varlistentry>
         <term><varname>USER</varname></term>
         <listitem>
@@ -3722,10 +3869,10 @@ bar
         <term><varname>VERBOSITY</varname></term>
         <listitem>
         <para>
-        This variable can be set to the values <literal>default</>,
-        <literal>verbose</>, or <literal>terse</> to control the verbosity
+        This variable can be set to the values <literal>default</literal>,
+        <literal>verbose</literal>, or <literal>terse</literal> to control the verbosity
         of error reports.
-        (See also <command>\errverbose</>, for use when you want a verbose
+        (See also <command>\errverbose</command>, for use when you want a verbose
         version of the error you just got.)
         </para>
         </listitem>
@@ -3733,10 +3880,15 @@ bar
 
       <varlistentry>
         <term><varname>VERSION</varname></term>
+        <term><varname>VERSION_NAME</varname></term>
+        <term><varname>VERSION_NUM</varname></term>
         <listitem>
         <para>
-        This variable is set at program start-up to
-        reflect <application>psql</>'s version.  It can be changed or unset.
+        These variables are set at program start-up to reflect
+        <application>psql</application>'s version, respectively as a verbose string,
+        a short string (e.g., <literal>9.6.2</literal>, <literal>10.1</literal>,
+        or <literal>11beta1</literal>), and a number (e.g., <literal>90602</literal>
+        or <literal>100001</literal>).  They can be changed or unset.
         </para>
         </listitem>
       </varlistentry>
@@ -3745,8 +3897,8 @@ bar
 
    </refsect3>
 
-   <refsect3 id="APP-PSQL-interpolation">
-    <title id="APP-PSQL-interpolation-title"><acronym>SQL</acronym> Interpolation</title>
+   <refsect3 id="app-psql-interpolation">
+    <title id="app-psql-interpolation-title"><acronym>SQL</acronym> Interpolation</title>
 
     <para>
     A key feature of <application>psql</application>
@@ -3786,7 +3938,7 @@ testdb=&gt; <userinput>SELECT * FROM :"foo";</userinput>
     <para>
     Variable interpolation will not be performed within quoted
     <acronym>SQL</acronym> literals and identifiers.  Therefore, a
-    construction such as <literal>':foo'</> doesn't work to produce a quoted
+    construction such as <literal>':foo'</literal> doesn't work to produce a quoted
     literal from a variable's value (and it would be unsafe if it did work,
     since it wouldn't correctly handle quotes embedded in the value).
     </para>
@@ -3812,6 +3964,12 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
     can escape a colon with a backslash to protect it from substitution.
     </para>
 
+    <para>
+    The <literal>:{?<replaceable>name</replaceable>}</literal> special syntax returns TRUE
+    or FALSE depending on whether the variable exists or not, and is thus
+    always substituted, unless the colon is backslash-escaped.
+    </para>
+
     <para>
     The colon syntax for variables is standard <acronym>SQL</acronym> for
     embedded query languages, such as <application>ECPG</application>.
@@ -3824,8 +3982,8 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
 
    </refsect3>
 
-   <refsect3 id="APP-PSQL-prompting">
-    <title id="APP-PSQL-prompting-title">Prompting</title>
+   <refsect3 id="app-psql-prompting">
+    <title id="app-psql-prompting-title">Prompting</title>
 
     <para>
     The prompts <application>psql</application> issues can be customized
@@ -3950,8 +4108,8 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
         <listitem>
         <para>
         Transaction status: an empty string when not in a transaction
-        block, or <literal>*</> when in a transaction block, or
-        <literal>!</> when in a failed transaction block, or <literal>?</>
+        block, or <literal>*</literal> when in a transaction block, or
+        <literal>!</literal> when in a failed transaction block, or <literal>?</literal>
         when the transaction state is indeterminate (for example, because
         there is no connection).
         </para>
@@ -3962,7 +4120,7 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
         <term><literal>%l</literal></term>
         <listitem>
          <para>
-          The line number inside the current statement, starting from <literal>1</>.
+          The line number inside the current statement, starting from <literal>1</literal>.
          </para>
         </listitem>
       </varlistentry>
@@ -3982,8 +4140,8 @@ testdb=&gt; <userinput>INSERT INTO my_table VALUES (:'content');</userinput>
         <para>
         The value of the <application>psql</application> variable
         <replaceable class="parameter">name</replaceable>. See the
-        section <xref linkend="APP-PSQL-variables"
-        endterm="APP-PSQL-variables-title"> for details.
+        section <xref linkend="app-psql-variables"
+        endterm="app-psql-variables-title"/> for details.
         </para>
         </listitem>
       </varlistentry>
@@ -4050,7 +4208,7 @@ testdb=&gt; \set PROMPT1 '%[%033[1;33;40m%]%n@%/%R%[%033[0m%]%# '
     supported, although the completion logic makes no claim to be an
     <acronym>SQL</acronym> parser.  The queries generated by tab-completion
     can also interfere with other SQL commands, e.g. <literal>SET
-    TRANSACTION ISOLATION LEVEL</>.
+    TRANSACTION ISOLATION LEVEL</literal>.
     If for some reason you do not like the tab completion, you
     can turn it off by putting this in a file named
     <filename>.inputrc</filename> in your home directory:
@@ -4078,29 +4236,14 @@ $endif
 
     <listitem>
      <para>
-      If <literal>\pset columns</> is zero, controls the
-      width for the <literal>wrapped</> format and width for determining
+      If <literal>\pset columns</literal> is zero, controls the
+      width for the <literal>wrapped</literal> format and width for determining
       if wide output requires the pager or should be switched to the
       vertical format in expanded auto mode.
      </para>
     </listitem>
    </varlistentry>
 
-   <varlistentry>
-    <term><envar>PAGER</envar></term>
-
-    <listitem>
-     <para>
-      If the query results do not fit on the screen, they are piped
-      through this command.  Typical values are
-      <literal>more</literal> or <literal>less</literal>.  The default
-      is platform-dependent.  Use of the pager can be disabled by setting
-      <envar>PAGER</envar> to empty, or by using pager-related options of
-      the <command>\pset</command> command.
-     </para>
-    </listitem>
-   </varlistentry>
-
    <varlistentry>
     <term><envar>PGDATABASE</envar></term>
     <term><envar>PGHOST</envar></term>
@@ -4109,7 +4252,7 @@ $endif
 
     <listitem>
      <para>
-      Default connection parameters (see <xref linkend="libpq-envars">).
+      Default connection parameters (see <xref linkend="libpq-envars"/>).
      </para>
     </listitem>
    </varlistentry>
@@ -4125,11 +4268,8 @@ $endif
       and <command>\ev</command> commands.
       These variables are examined in the order listed;
       the first that is set is used.
-     </para>
-
-     <para>
-      The built-in default editors are <filename>vi</filename> on Unix
-      systems and <filename>notepad.exe</filename> on Windows systems.
+      If none of them is set, the default is to use <filename>vi</filename>
+      on Unix systems or <filename>notepad.exe</filename> on Windows systems.
      </para>
     </listitem>
    </varlistentry>
@@ -4143,8 +4283,8 @@ $endif
       <command>\ev</command> is used
       with a line number argument, this variable specifies the
       command-line argument used to pass the starting line number to
-      the user's editor.  For editors such as <productname>Emacs</> or
-      <productname>vi</>, this is a plus sign.  Include a trailing
+      the user's editor.  For editors such as <productname>Emacs</productname> or
+      <productname>vi</productname>, this is a plus sign.  Include a trailing
       space in the value of the variable if there needs to be space
       between the option name and the line number.  Examples:
 <programlisting>
@@ -4172,6 +4312,27 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
     </listitem>
    </varlistentry>
 
+   <varlistentry>
+    <term><envar>PSQL_PAGER</envar></term>
+    <term><envar>PAGER</envar></term>
+
+    <listitem>
+     <para>
+      If a query's results do not fit on the screen, they are piped
+      through this command. Typical values are <literal>more</literal>
+      or <literal>less</literal>.
+      Use of the pager can be disabled by setting <envar>PSQL_PAGER</envar>
+      or <envar>PAGER</envar> to an empty string, or by adjusting the
+      pager-related options of the <command>\pset</command> command.
+      These variables are examined in the order listed;
+      the first that is set is used.
+      If none of them is set, the default is to use <literal>more</literal> on most
+      platforms, but <literal>less</literal> on Cygwin.
+     </para>
+
+    </listitem>
+   </varlistentry>
+
    <varlistentry>
     <term><envar>PSQLRC</envar></term>
 
@@ -4205,9 +4366,9 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -4232,9 +4393,9 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
     </para>
     <para>
      The system-wide startup file is named <filename>psqlrc</filename> and is
-     sought in the installation's <quote>system configuration</> directory,
+     sought in the installation's <quote>system configuration</quote> directory,
      which is most reliably identified by running <literal>pg_config
-     --sysconfdir</>.  By default this directory will be <filename>../etc/</>
+     --sysconfdir</literal>.  By default this directory will be <filename>../etc/</filename>
      relative to the directory containing
      the <productname>PostgreSQL</productname> executables.  The name of this
      directory can be set explicitly via the <envar>PGSYSCONFDIR</envar>
@@ -4271,7 +4432,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
     </para>
     <para>
      The location of the history file can be set explicitly via
-     the <varname>HISTFILE</varname> <application>psql</> variable or
+     the <varname>HISTFILE</varname> <application>psql</application> variable or
      the <envar>PSQL_HISTORY</envar> environment variable.
     </para>
    </listitem>
@@ -4287,10 +4448,10 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
       <listitem>
       <para><application>psql</application> works best with servers of the same
        or an older major version.  Backslash commands are particularly likely
-       to fail if the server is of a newer version than <application>psql</>
-       itself.  However, backslash commands of the <literal>\d</> family should
+       to fail if the server is of a newer version than <application>psql</application>
+       itself.  However, backslash commands of the <literal>\d</literal> family should
        work with servers of versions back to 7.4, though not necessarily with
-       servers newer than <application>psql</> itself.  The general
+       servers newer than <application>psql</application> itself.  The general
        functionality of running SQL commands and displaying query results
        should also work with servers of a newer major version, but this cannot
        be guaranteed in all cases.
@@ -4310,7 +4471,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
       <para>
        Before <productname>PostgreSQL</productname> 9.6,
        the <option>-c</option> option implied <option>-X</option>
-       (<option>--no-psqlrc</>); this is no longer the case.
+       (<option>--no-psqlrc</option>); this is no longer the case.
       </para>
       </listitem>
 
@@ -4332,7 +4493,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
 
  <para>
   <application>psql</application> is built as a <quote>console
-  application</>.  Since the Windows console windows use a different
+  application</quote>.  Since the Windows console windows use a different
   encoding than the rest of the system, you must take special care
   when using 8-bit characters within <application>psql</application>.
   If <application>psql</application> detects a problematic
@@ -4351,7 +4512,7 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
 
     <listitem>
      <para>
-      Set the console font to <literal>Lucida Console</>, because the
+      Set the console font to <literal>Lucida Console</literal>, because the
       raster font does not work with the ANSI code page.
      </para>
     </listitem>
@@ -4360,8 +4521,8 @@ PSQL_EDITOR_LINENUMBER_ARG='--line '
  </refsect1>
 
 
- <refsect1 id="APP-PSQL-examples">
-  <title id="APP-PSQL-examples-title">Examples</title>
+ <refsect1 id="app-psql-examples">
+  <title id="app-psql-examples-title">Examples</title>
 
   <para>
   The first example shows how to spread a command over several lines of
diff --git a/doc/src/sgml/ref/reassign_owned.sgml b/doc/src/sgml/ref/reassign_owned.sgml
index ccd038629b..0fffd6088a 100644
--- a/doc/src/sgml/ref/reassign_owned.sgml
+++ b/doc/src/sgml/ref/reassign_owned.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/reassign_owned.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-REASSIGN-OWNED">
+<refentry id="sql-reassign-owned">
  <indexterm zone="sql-reassign-owned">
   <primary>REASSIGN OWNED</primary>
  </indexterm>
@@ -21,8 +21,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...]
-               TO { <replaceable class="PARAMETER">new_role</replaceable> | CURRENT_USER | SESSION_USER }
+REASSIGN OWNED BY { <replaceable class="parameter">old_role</replaceable> | CURRENT_USER | SESSION_USER } [, ...]
+               TO { <replaceable class="parameter">new_role</replaceable> | CURRENT_USER | SESSION_USER }
 </synopsis>
  </refsynopsisdiv>
 
@@ -32,8 +32,8 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR
   <para>
    <command>REASSIGN OWNED</command> instructs the system to change
    the ownership of database objects owned by any of the
-   <replaceable class="PARAMETER">old_roles</replaceable> to
-   <replaceable class="PARAMETER">new_role</replaceable>.
+   <replaceable class="parameter">old_roles</replaceable> to
+   <replaceable class="parameter">new_role</replaceable>.
   </para>
  </refsect1>
 
@@ -42,19 +42,19 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">old_role</replaceable></term>
+    <term><replaceable class="parameter">old_role</replaceable></term>
     <listitem>
      <para>
       The name of a role. The ownership of all the objects within the
       current database, and of all shared objects (databases, tablespaces),
       owned by this role will be reassigned to
-      <replaceable class="PARAMETER">new_role</replaceable>.
+      <replaceable class="parameter">new_role</replaceable>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_role</replaceable></term>
+    <term><replaceable class="parameter">new_role</replaceable></term>
     <listitem>
      <para>
       The name of the role that will be made the new owner of the
@@ -77,24 +77,24 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR
   </para>
 
   <para>
-   <command>REASSIGN OWNED</command> requires privileges on both the
+   <command>REASSIGN OWNED</command> requires membership on both the
    source role(s) and the target role.
   </para>
 
   <para>
-   The <xref linkend="sql-drop-owned"> command is an alternative that
+   The <xref linkend="sql-drop-owned"/> command is an alternative that
    simply drops all the database objects owned by one or more roles.
   </para>
 
   <para>
    The <command>REASSIGN OWNED</command> command does not affect any
-   privileges granted to the <replaceable class="PARAMETER">old_roles</> for
+   privileges granted to the <replaceable class="parameter">old_roles</replaceable> for
    objects that are not owned by them.  Use <command>DROP OWNED</command> to
    revoke such privileges.
   </para>
 
   <para>
-   See <xref linkend="role-removal"> for more discussion.
+   See <xref linkend="role-removal"/> for more discussion.
   </para>
 
  </refsect1>
@@ -112,9 +112,9 @@ REASSIGN OWNED BY { <replaceable class="PARAMETER">old_role</replaceable> | CURR
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-drop-owned"></member>
-   <member><xref linkend="sql-droprole"></member>
-   <member><xref linkend="sql-alterdatabase"></member>
+   <member><xref linkend="sql-drop-owned"/></member>
+   <member><xref linkend="sql-droprole"/></member>
+   <member><xref linkend="sql-alterdatabase"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/refresh_materialized_view.sgml b/doc/src/sgml/ref/refresh_materialized_view.sgml
index c165c69c9f..9cf01a25a5 100644
--- a/doc/src/sgml/ref/refresh_materialized_view.sgml
+++ b/doc/src/sgml/ref/refresh_materialized_view.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/refresh_materialized_view.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-REFRESHMATERIALIZEDVIEW">
+<refentry id="sql-refreshmaterializedview">
  <indexterm zone="sql-refreshmaterializedview">
   <primary>REFRESH MATERIALIZED VIEW</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</replaceable>
+REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="parameter">name</replaceable>
     [ WITH [ NO ] DATA ]
 </synopsis>
  </refsynopsisdiv>
@@ -77,7 +77,7 @@ REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the materialized view to
@@ -93,10 +93,10 @@ REFRESH MATERIALIZED VIEW [ CONCURRENTLY ] <replaceable class="PARAMETER">name</
 
   <para>
    While the default index for future
-   <xref linkend="SQL-CLUSTER">
-   operations is retained, <command>REFRESH MATERIALIZED VIEW</> does not
+   <xref linkend="sql-cluster"/>
+   operations is retained, <command>REFRESH MATERIALIZED VIEW</command> does not
    order the generated rows based on this property. If you want the data
-   to be ordered upon generation, you must use an <literal>ORDER BY</>
+   to be ordered upon generation, you must use an <literal>ORDER BY</literal>
    clause in the backing query.
   </para>
  </refsect1>
@@ -135,9 +135,9 @@ REFRESH MATERIALIZED VIEW annual_statistics_basis WITH NO DATA;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-creatematerializedview"></member>
-   <member><xref linkend="sql-altermaterializedview"></member>
-   <member><xref linkend="sql-dropmaterializedview"></member>
+   <member><xref linkend="sql-creatematerializedview"/></member>
+   <member><xref linkend="sql-altermaterializedview"/></member>
+   <member><xref linkend="sql-dropmaterializedview"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/reindex.sgml b/doc/src/sgml/ref/reindex.sgml
index 3908ade37b..1c21fafb80 100644
--- a/doc/src/sgml/ref/reindex.sgml
+++ b/doc/src/sgml/ref/reindex.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/reindex.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-REINDEX">
+<refentry id="sql-reindex">
  <indexterm zone="sql-reindex">
   <primary>REINDEX</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="PARAMETER">name</replaceable>
+REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replaceable class="parameter">name</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -46,13 +46,13 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
 
     <listitem>
      <para>
-      An index has become <quote>bloated</>, that is it contains many
+      An index has become <quote>bloated</quote>, that is it contains many
       empty or nearly-empty pages.  This can occur with B-tree indexes in
       <productname>PostgreSQL</productname> under certain uncommon access
       patterns. <command>REINDEX</command> provides a way to reduce
       the space consumption of the index by writing a new version of
       the index without the dead pages. See <xref
-      linkend="routine-reindex"> for more information.
+      linkend="routine-reindex"/> for more information.
      </para>
     </listitem>
 
@@ -65,12 +65,12 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
 
     <listitem>
      <para>
-      An index build with the <literal>CONCURRENTLY</> option failed, leaving
-      an <quote>invalid</> index. Such indexes are useless but it can be
-      convenient to use <command>REINDEX</> to rebuild them. Note that
-      <command>REINDEX</> will not perform a concurrent build. To build the
+      An index build with the <literal>CONCURRENTLY</literal> option failed, leaving
+      an <quote>invalid</quote> index. Such indexes are useless but it can be
+      convenient to use <command>REINDEX</command> to rebuild them. Note that
+      <command>REINDEX</command> will not perform a concurrent build. To build the
       index without interfering with production you should drop the index and
-      reissue the <command>CREATE INDEX CONCURRENTLY</> command.
+      reissue the <command>CREATE INDEX CONCURRENTLY</command> command.
      </para>
     </listitem>
 
@@ -95,7 +95,7 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
     <listitem>
      <para>
       Recreate all indexes of the specified table.  If the table has a
-      secondary <quote>TOAST</> table, that is reindexed as well.
+      secondary <quote>TOAST</quote> table, that is reindexed as well.
      </para>
     </listitem>
    </varlistentry>
@@ -105,7 +105,7 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
     <listitem>
      <para>
       Recreate all indexes of the specified schema.  If a table of this
-      schema has a secondary <quote>TOAST</> table, that is reindexed as
+      schema has a secondary <quote>TOAST</quote> table, that is reindexed as
       well. Indexes on shared system catalogs are also processed.
       This form of <command>REINDEX</command> cannot be executed inside a
       transaction block.
@@ -139,12 +139,12 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of the specific index, table, or database to be
       reindexed.  Index and table names can be schema-qualified.
-      Presently, <command>REINDEX DATABASE</> and <command>REINDEX SYSTEM</>
+      Presently, <command>REINDEX DATABASE</command> and <command>REINDEX SYSTEM</command>
       can only reindex the current database, so their parameter must match
       the current database's name.
      </para>
@@ -186,13 +186,13 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
    One way to do this is to shut down the server and start a single-user
    <productname>PostgreSQL</productname> server
    with the <option>-P</option> option included on its command line.
-   Then, <command>REINDEX DATABASE</>, <command>REINDEX SYSTEM</>,
-   <command>REINDEX TABLE</>, or <command>REINDEX INDEX</> can be
+   Then, <command>REINDEX DATABASE</command>, <command>REINDEX SYSTEM</command>,
+   <command>REINDEX TABLE</command>, or <command>REINDEX INDEX</command> can be
    issued, depending on how much you want to reconstruct.  If in
-   doubt, use <command>REINDEX SYSTEM</> to select
+   doubt, use <command>REINDEX SYSTEM</command> to select
    reconstruction of all system indexes in the database.  Then quit
    the single-user server session and restart the regular server.
-   See the <xref linkend="app-postgres"> reference page for more
+   See the <xref linkend="app-postgres"/> reference page for more
    information about how to interact with the single-user server
    interface.
   </para>
@@ -201,8 +201,8 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
    Alternatively, a regular server session can be started with
    <option>-P</option> included in its command line options.
    The method for doing this varies across clients, but in all
-   <application>libpq</>-based clients, it is possible to set
-   the <envar>PGOPTIONS</envar> environment variable to <literal>-P</>
+   <application>libpq</application>-based clients, it is possible to set
+   the <envar>PGOPTIONS</envar> environment variable to <literal>-P</literal>
    before starting the client.  Note that while this method does not
    require locking out other clients, it might still be wise to prevent
    other users from connecting to the damaged database until repairs
@@ -212,12 +212,12 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
   <para>
    <command>REINDEX</command> is similar to a drop and recreate of the index
    in that the index contents are rebuilt from scratch.  However, the locking
-   considerations are rather different.  <command>REINDEX</> locks out writes
+   considerations are rather different.  <command>REINDEX</command> locks out writes
    but not reads of the index's parent table.  It also takes an exclusive lock
    on the specific index being processed, which will block reads that attempt
-   to use that index.  In contrast, <command>DROP INDEX</> momentarily takes
+   to use that index.  In contrast, <command>DROP INDEX</command> momentarily takes
    an exclusive lock on the parent table, blocking both writes and reads.  The
-   subsequent <command>CREATE INDEX</> locks out writes but not reads; since
+   subsequent <command>CREATE INDEX</command> locks out writes but not reads; since
    the index is not there, no read will attempt to use it, meaning that there
    will be no blocking but reads might be forced into expensive sequential
    scans.
@@ -231,6 +231,11 @@ REINDEX [ ( VERBOSE ) ] { INDEX | TABLE | SCHEMA | DATABASE | SYSTEM } <replacea
    reindex anything.
   </para>
 
+  <para>
+   Reindexing partitioned tables or partitioned indexes is not supported.
+   Each individual partition can be reindexed separately instead.
+  </para>
+
  </refsect1>
 
  <refsect1>
diff --git a/doc/src/sgml/ref/reindexdb.sgml b/doc/src/sgml/ref/reindexdb.sgml
index e4721d8113..1273dad807 100644
--- a/doc/src/sgml/ref/reindexdb.sgml
+++ b/doc/src/sgml/ref/reindexdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/reindexdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-REINDEXDB">
+<refentry id="app-reindexdb">
  <indexterm zone="app-reindexdb">
   <primary>reindexdb</primary>
  </indexterm>
@@ -93,7 +93,7 @@ PostgreSQL documentation
 
   <para>
    <application>reindexdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-REINDEX">.
+   command <xref linkend="sql-reindex"/>.
    There is no effective difference between reindexing databases via
    this utility and via other methods for accessing the server.
   </para>
@@ -109,8 +109,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-a</></term>
-      <term><option>--all</></term>
+      <term><option>-a</option></term>
+      <term><option>--all</option></term>
       <listitem>
        <para>
         Reindex all databases.
@@ -119,8 +119,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></></term>
-      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></></term>
+      <term><option><optional>-d</optional> <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option><optional>--dbname=</optional><replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
         Specifies the name of the database to be reindexed.
@@ -134,8 +134,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>reindexdb</application> generates
@@ -145,20 +145,20 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-i <replaceable class="parameter">index</replaceable></></term>
-      <term><option>--index=<replaceable class="parameter">index</replaceable></></term>
+      <term><option>-i <replaceable class="parameter">index</replaceable></option></term>
+      <term><option>--index=<replaceable class="parameter">index</replaceable></option></term>
       <listitem>
        <para>
         Recreate <replaceable class="parameter">index</replaceable> only.
         Multiple indexes can be recreated by writing multiple
-        <option>-i</> switches.
+        <option>-i</option> switches.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-q</option></term>
+      <term><option>--quiet</option></term>
       <listitem>
        <para>
         Do not display progress messages.
@@ -167,8 +167,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-s</></term>
-      <term><option>--system</></term>
+      <term><option>-s</option></term>
+      <term><option>--system</option></term>
       <listitem>
        <para>
         Reindex database's system catalogs.
@@ -177,32 +177,32 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-S <replaceable class="parameter">schema</replaceable></></term>
-      <term><option>--schema=<replaceable class="parameter">schema</replaceable></></term>
+      <term><option>-S <replaceable class="parameter">schema</replaceable></option></term>
+      <term><option>--schema=<replaceable class="parameter">schema</replaceable></option></term>
       <listitem>
        <para>
         Reindex <replaceable class="parameter">schema</replaceable> only.
         Multiple schemas can be reindexed by writing multiple
-        <option>-S</> switches.
+        <option>-S</option> switches.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>-t <replaceable class="parameter">table</replaceable></></term>
-      <term><option>--table=<replaceable class="parameter">table</replaceable></></term>
+      <term><option>-t <replaceable class="parameter">table</replaceable></option></term>
+      <term><option>--table=<replaceable class="parameter">table</replaceable></option></term>
       <listitem>
        <para>
         Reindex <replaceable class="parameter">table</replaceable> only.
         Multiple tables can be reindexed by writing multiple
-        <option>-t</> switches.
+        <option>-t</option> switches.
        </para>
       </listitem>
      </varlistentry>
 
     <varlistentry>
-     <term><option>-v</></term>
-     <term><option>--verbose</></term>
+     <term><option>-v</option></term>
+     <term><option>--verbose</option></term>
      <listitem>
       <para>
        Print detailed information during processing.
@@ -211,8 +211,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-V</></term>
-      <term><option>--version</></term>
+      <term><option>-V</option></term>
+      <term><option>--version</option></term>
       <listitem>
        <para>
        Print the <application>reindexdb</application> version and exit.
@@ -221,8 +221,8 @@ PostgreSQL documentation
     </varlistentry>
 
     <varlistentry>
-      <term><option>-?</></term>
-      <term><option>--help</></term>
+      <term><option>-?</option></term>
+      <term><option>--help</option></term>
       <listitem>
       <para>
       Show help about <application>reindexdb</application> command line
@@ -241,8 +241,8 @@ PostgreSQL documentation
 
     <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server is
@@ -253,8 +253,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -265,8 +265,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as.
@@ -275,8 +275,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -290,8 +290,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>reindexdb</application> to prompt for a
@@ -304,14 +304,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>reindexdb</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
          Specifies the name of the database to connect to discover what other
@@ -345,9 +345,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -357,8 +357,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-REINDEX">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-reindex"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -376,8 +376,8 @@ PostgreSQL documentation
    <application>reindexdb</application> might need to connect several
    times to the <productname>PostgreSQL</productname> server, asking
    for a password each time. It is convenient to have a
-   <filename>~/.pgpass</> file in such cases. See <xref
-   linkend="libpq-pgpass"> for more information.
+   <filename>~/.pgpass</filename> file in such cases. See <xref
+   linkend="libpq-pgpass"/> for more information.
   </para>
  </refsect1>
 
@@ -405,7 +405,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-reindex"></member>
+   <member><xref linkend="sql-reindex"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/release_savepoint.sgml b/doc/src/sgml/ref/release_savepoint.sgml
index b331b7226b..39665d28ef 100644
--- a/doc/src/sgml/ref/release_savepoint.sgml
+++ b/doc/src/sgml/ref/release_savepoint.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/release_savepoint.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-RELEASE-SAVEPOINT">
+<refentry id="sql-release-savepoint">
  <indexterm zone="sql-release-savepoint">
   <primary>RELEASE SAVEPOINT</primary>
  </indexterm>
@@ -42,7 +42,7 @@ RELEASE [ SAVEPOINT ] <replaceable>savepoint_name</replaceable>
    Destroying a savepoint makes it unavailable as a rollback point,
    but it has no other user visible behavior.  It does not undo the
    effects of commands executed after the savepoint was established.
-   (To do that, see <xref linkend="sql-rollback-to">.)
+   (To do that, see <xref linkend="sql-rollback-to"/>.)
    Destroying a savepoint when
    it is no longer needed allows the system to reclaim some resources
    earlier than transaction end.
@@ -109,7 +109,7 @@ COMMIT;
   <title>Compatibility</title>
 
   <para>
-   This command conforms to the <acronym>SQL</> standard.  The standard
+   This command conforms to the <acronym>SQL</acronym> standard.  The standard
    specifies that the key word <literal>SAVEPOINT</literal> is
    mandatory, but <productname>PostgreSQL</productname> allows it to
    be omitted.
@@ -120,11 +120,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback"></member>
-   <member><xref linkend="sql-rollback-to"></member>
-   <member><xref linkend="sql-savepoint"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback"/></member>
+   <member><xref linkend="sql-rollback-to"/></member>
+   <member><xref linkend="sql-savepoint"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/reset.sgml b/doc/src/sgml/ref/reset.sgml
index 7e76891bde..95599072e7 100644
--- a/doc/src/sgml/ref/reset.sgml
+++ b/doc/src/sgml/ref/reset.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/reset.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-RESET">
+<refentry id="sql-reset">
  <indexterm zone="sql-reset">
   <primary>RESET</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-RESET <replaceable class="PARAMETER">configuration_parameter</replaceable>
+RESET <replaceable class="parameter">configuration_parameter</replaceable>
 RESET ALL
 </synopsis>
  </refsynopsisdiv>
@@ -36,25 +36,25 @@ RESET ALL
 <synopsis>
 SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFAULT
 </synopsis>
-   Refer to <xref linkend="sql-set"> for
+   Refer to <xref linkend="sql-set"/> for
    details.
   </para>
 
   <para>
    The default value is defined as the value that the parameter would
-   have had, if no <command>SET</> had ever been issued for it in the
+   have had, if no <command>SET</command> had ever been issued for it in the
    current session.  The actual source of this value might be a
    compiled-in default, the configuration file, command-line options,
    or per-database or per-user default settings.  This is subtly different
    from defining it as <quote>the value that the parameter had at session
-   start</>, because if the value came from the configuration file, it
+   start</quote>, because if the value came from the configuration file, it
    will be reset to whatever is specified by the configuration file now.
-   See <xref linkend="runtime-config"> for details.
+   See <xref linkend="runtime-config"/> for details.
   </para>
 
   <para>
-   The transactional behavior of <command>RESET</> is the same as
-   <command>SET</>: its effects will be undone by transaction rollback.
+   The transactional behavior of <command>RESET</command> is the same as
+   <command>SET</command>: its effects will be undone by transaction rollback.
   </para>
  </refsect1>
 
@@ -63,12 +63,12 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">configuration_parameter</replaceable></term>
+    <term><replaceable class="parameter">configuration_parameter</replaceable></term>
     <listitem>
      <para>
       Name of a settable run-time parameter.  Available parameters are
-      documented in <xref linkend="runtime-config"> and on the
-      <xref linkend="sql-set"> reference page.
+      documented in <xref linkend="runtime-config"/> and on the
+      <xref linkend="sql-set"/> reference page.
      </para>
     </listitem>
    </varlistentry>
@@ -88,7 +88,7 @@ SET <replaceable class="parameter">configuration_parameter</replaceable> TO DEFA
   <title>Examples</title>
 
   <para>
-   Set the <varname>timezone</> configuration variable to its default value:
+   Set the <varname>timezone</varname> configuration variable to its default value:
 <screen>
 RESET timezone;
 </screen></para>
@@ -106,8 +106,8 @@ RESET timezone;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-SET"></member>
-   <member><xref linkend="SQL-SHOW"></member>
+   <member><xref linkend="sql-set"/></member>
+   <member><xref linkend="sql-show"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/revoke.sgml b/doc/src/sgml/ref/revoke.sgml
index ce532543f0..7018202f14 100644
--- a/doc/src/sgml/ref/revoke.sgml
+++ b/doc/src/sgml/ref/revoke.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/revoke.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-REVOKE">
+<refentry id="sql-revoke">
  <indexterm zone="sql-revoke">
   <primary>REVOKE</primary>
  </indexterm>
@@ -24,94 +24,94 @@ PostgreSQL documentation
 REVOKE [ GRANT OPTION FOR ]
     { { SELECT | INSERT | UPDATE | DELETE | TRUNCATE | REFERENCES | TRIGGER }
     [, ...] | ALL [ PRIVILEGES ] }
-    ON { [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...]
+    ON { [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...]
          | ALL TABLES IN SCHEMA <replaceable>schema_name</replaceable> [, ...] }
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
-    { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] )
-    [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) }
-    ON [ TABLE ] <replaceable class="PARAMETER">table_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    { { SELECT | INSERT | UPDATE | REFERENCES } ( <replaceable class="parameter">column_name</replaceable> [, ...] )
+    [, ...] | ALL [ PRIVILEGES ] ( <replaceable class="parameter">column_name</replaceable> [, ...] ) }
+    ON [ TABLE ] <replaceable class="parameter">table_name</replaceable> [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { USAGE | SELECT | UPDATE }
     [, ...] | ALL [ PRIVILEGES ] }
-    ON { SEQUENCE <replaceable class="PARAMETER">sequence_name</replaceable> [, ...]
+    ON { SEQUENCE <replaceable class="parameter">sequence_name</replaceable> [, ...]
          | ALL SEQUENCES IN SCHEMA <replaceable>schema_name</replaceable> [, ...] }
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { CREATE | CONNECT | TEMPORARY | TEMP } [, ...] | ALL [ PRIVILEGES ] }
     ON DATABASE <replaceable>database_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON DOMAIN <replaceable>domain_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON FOREIGN DATA WRAPPER <replaceable>fdw_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON FOREIGN SERVER <replaceable>server_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { EXECUTE | ALL [ PRIVILEGES ] }
-    ON { FUNCTION <replaceable>function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...]
-         | ALL FUNCTIONS IN SCHEMA <replaceable>schema_name</replaceable> [, ...] }
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    ON { { FUNCTION | PROCEDURE | ROUTINE } <replaceable>function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">arg_name</replaceable> ] <replaceable class="parameter">arg_type</replaceable> [, ...] ] ) ] [, ...]
+         | ALL { FUNCTIONS | PROCEDURES | ROUTINES } IN SCHEMA <replaceable>schema_name</replaceable> [, ...] }
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON LANGUAGE <replaceable>lang_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { SELECT | UPDATE } [, ...] | ALL [ PRIVILEGES ] }
-    ON LARGE OBJECT <replaceable class="PARAMETER">loid</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    ON LARGE OBJECT <replaceable class="parameter">loid</replaceable> [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { { CREATE | USAGE } [, ...] | ALL [ PRIVILEGES ] }
     ON SCHEMA <replaceable>schema_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { CREATE | ALL [ PRIVILEGES ] }
     ON TABLESPACE <replaceable>tablespace_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ GRANT OPTION FOR ]
     { USAGE | ALL [ PRIVILEGES ] }
     ON TYPE <replaceable>type_name</replaceable> [, ...]
-    FROM { [ GROUP ] <replaceable class="PARAMETER">role_name</replaceable> | PUBLIC } [, ...]
+    FROM { [ GROUP ] <replaceable class="parameter">role_name</replaceable> | PUBLIC } [, ...]
     [ CASCADE | RESTRICT ]
 
 REVOKE [ ADMIN OPTION FOR ]
-    <replaceable class="PARAMETER">role_name</replaceable> [, ...] FROM <replaceable class="PARAMETER">role_name</replaceable> [, ...]
+    <replaceable class="parameter">role_name</replaceable> [, ...] FROM <replaceable class="parameter">role_name</replaceable> [, ...]
     [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
 
- <refsect1 id="SQL-REVOKE-description">
+ <refsect1 id="sql-revoke-description">
   <title>Description</title>
 
   <para>
@@ -122,7 +122,7 @@ REVOKE [ ADMIN OPTION FOR ]
   </para>
 
   <para>
-   See the description of the <xref linkend="sql-grant"> command for
+   See the description of the <xref linkend="sql-grant"/> command for
    the meaning of the privilege types.
   </para>
 
@@ -130,13 +130,13 @@ REVOKE [ ADMIN OPTION FOR ]
    Note that any particular role will have the sum
    of privileges granted directly to it, privileges granted to any role it
    is presently a member of, and privileges granted to
-   <literal>PUBLIC</literal>.  Thus, for example, revoking <literal>SELECT</> privilege
+   <literal>PUBLIC</literal>.  Thus, for example, revoking <literal>SELECT</literal> privilege
    from <literal>PUBLIC</literal> does not necessarily mean that all roles
-   have lost <literal>SELECT</> privilege on the object: those who have it granted
+   have lost <literal>SELECT</literal> privilege on the object: those who have it granted
    directly or via another role will still have it.  Similarly, revoking
-   <literal>SELECT</> from a user might not prevent that user from using
-   <literal>SELECT</> if <literal>PUBLIC</literal> or another membership
-   role still has <literal>SELECT</> rights.
+   <literal>SELECT</literal> from a user might not prevent that user from using
+   <literal>SELECT</literal> if <literal>PUBLIC</literal> or another membership
+   role still has <literal>SELECT</literal> rights.
   </para>
 
   <para>
@@ -167,21 +167,21 @@ REVOKE [ ADMIN OPTION FOR ]
   </para>
 
   <para>
-   When revoking membership in a role, <literal>GRANT OPTION</> is instead
-   called <literal>ADMIN OPTION</>, but the behavior is similar.
+   When revoking membership in a role, <literal>GRANT OPTION</literal> is instead
+   called <literal>ADMIN OPTION</literal>, but the behavior is similar.
    Note also that this form of the command does not
-   allow the noise word <literal>GROUP</>.
+   allow the noise word <literal>GROUP</literal>.
   </para>
  </refsect1>
 
- <refsect1 id="SQL-REVOKE-notes">
+ <refsect1 id="sql-revoke-notes">
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="app-psql">'s <command>\dp</command> command to
+   Use <xref linkend="app-psql"/>'s <command>\dp</command> command to
    display the privileges granted on existing tables and columns.  See <xref
-   linkend="sql-grant"> for information about the
-   format.  For non-table objects there are other <command>\d</> commands
+   linkend="sql-grant"/> for information about the
+   format.  For non-table objects there are other <command>\d</command> commands
    that can display their privileges.
   </para>
 
@@ -198,12 +198,12 @@ REVOKE [ ADMIN OPTION FOR ]
   </para>
 
    <para>
-    When a non-owner of an object attempts to <command>REVOKE</> privileges
+    When a non-owner of an object attempts to <command>REVOKE</command> privileges
     on the object, the command will fail outright if the user has no
     privileges whatsoever on the object.  As long as some privilege is
     available, the command will proceed, but it will revoke only those
     privileges for which the user has grant options.  The <command>REVOKE ALL
-    PRIVILEGES</> forms will issue a warning message if no grant options are
+    PRIVILEGES</command> forms will issue a warning message if no grant options are
     held, while the other forms will issue a warning if grant options for
     any of the privileges specifically named in the command are not held.
     (In principle these statements apply to the object owner as well, but
@@ -212,7 +212,7 @@ REVOKE [ ADMIN OPTION FOR ]
    </para>
 
    <para>
-    If a superuser chooses to issue a <command>GRANT</> or <command>REVOKE</>
+    If a superuser chooses to issue a <command>GRANT</command> or <command>REVOKE</command>
     command, the command is performed as though it were issued by the
     owner of the affected object.  Since all privileges ultimately come
     from the object owner (possibly indirectly via chains of grant options),
@@ -221,32 +221,32 @@ REVOKE [ ADMIN OPTION FOR ]
    </para>
 
    <para>
-    <command>REVOKE</> can also be done by a role
+    <command>REVOKE</command> can also be done by a role
     that is not the owner of the affected object, but is a member of the role
     that owns the object, or is a member of a role that holds privileges
     <literal>WITH GRANT OPTION</literal> on the object.  In this case the
     command is performed as though it were issued by the containing role that
     actually owns the object or holds the privileges
     <literal>WITH GRANT OPTION</literal>.  For example, if table
-    <literal>t1</> is owned by role <literal>g1</>, of which role
-    <literal>u1</> is a member, then <literal>u1</> can revoke privileges
-    on <literal>t1</> that are recorded as being granted by <literal>g1</>.
-    This would include grants made by <literal>u1</> as well as by other
-    members of role <literal>g1</>.
+    <literal>t1</literal> is owned by role <literal>g1</literal>, of which role
+    <literal>u1</literal> is a member, then <literal>u1</literal> can revoke privileges
+    on <literal>t1</literal> that are recorded as being granted by <literal>g1</literal>.
+    This would include grants made by <literal>u1</literal> as well as by other
+    members of role <literal>g1</literal>.
    </para>
 
    <para>
-    If the role executing <command>REVOKE</> holds privileges
+    If the role executing <command>REVOKE</command> holds privileges
     indirectly via more than one role membership path, it is unspecified
     which containing role will be used to perform the command.  In such cases
-    it is best practice to use <command>SET ROLE</> to become the specific
-    role you want to do the <command>REVOKE</> as.  Failure to do so might
+    it is best practice to use <command>SET ROLE</command> to become the specific
+    role you want to do the <command>REVOKE</command> as.  Failure to do so might
     lead to revoking privileges other than the ones you intended, or not
     revoking anything at all.
    </para>
  </refsect1>
 
- <refsect1 id="SQL-REVOKE-examples">
+ <refsect1 id="sql-revoke-examples">
   <title>Examples</title>
 
   <para>
@@ -267,25 +267,25 @@ REVOKE ALL PRIVILEGES ON kinds FROM manuel;
 </programlisting>
 
    Note that this actually means <quote>revoke all privileges that I
-   granted</>.
+   granted</quote>.
   </para>
 
   <para>
-   Revoke membership in role <literal>admins</> from user <literal>joe</>:
+   Revoke membership in role <literal>admins</literal> from user <literal>joe</literal>:
 
 <programlisting>
 REVOKE admins FROM joe;
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="SQL-REVOKE-compatibility">
+ <refsect1 id="sql-revoke-compatibility">
   <title>Compatibility</title>
 
    <para>
-    The compatibility notes of the <xref linkend="sql-grant"> command
+    The compatibility notes of the <xref linkend="sql-grant"/> command
     apply analogously to <command>REVOKE</command>.
     The keyword <literal>RESTRICT</literal> or <literal>CASCADE</literal>
-    is required according to the standard, but <productname>PostgreSQL</>
+    is required according to the standard, but <productname>PostgreSQL</productname>
     assumes <literal>RESTRICT</literal> by default.
    </para>
  </refsect1>
@@ -294,7 +294,7 @@ REVOKE admins FROM joe;
   <title>See Also</title>
 
   <simpara>
-   <xref linkend="sql-grant">
+   <xref linkend="sql-grant"/>
   </simpara>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback.sgml b/doc/src/sgml/ref/rollback.sgml
index b0b1e8d0e3..3cafb848a9 100644
--- a/doc/src/sgml/ref/rollback.sgml
+++ b/doc/src/sgml/ref/rollback.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/rollback.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ROLLBACK">
+<refentry id="sql-rollback">
  <indexterm zone="sql-rollback">
   <primary>ROLLBACK</primary>
  </indexterm>
@@ -54,12 +54,12 @@ ROLLBACK [ WORK | TRANSACTION ]
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-COMMIT"> to
+   Use <xref linkend="sql-commit"/> to
    successfully terminate a transaction.
   </para>
 
   <para>
-   Issuing <command>ROLLBACK</> outside of a transaction
+   Issuing <command>ROLLBACK</command> outside of a transaction
    block emits a warning and otherwise has no effect.
   </para>
  </refsect1>
@@ -88,9 +88,9 @@ ROLLBACK;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback-to"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback-to"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/rollback_prepared.sgml b/doc/src/sgml/ref/rollback_prepared.sgml
index a5328e96a2..08821a6652 100644
--- a/doc/src/sgml/ref/rollback_prepared.sgml
+++ b/doc/src/sgml/ref/rollback_prepared.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/rollback_prepared.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ROLLBACK-PREPARED">
+<refentry id="sql-rollback-prepared">
  <indexterm zone="sql-rollback-prepared">
   <primary>ROLLBACK PREPARED</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
+ROLLBACK PREPARED <replaceable class="parameter">transaction_id</replaceable>
 </synopsis>
  </refsynopsisdiv>
 
@@ -39,7 +39,7 @@ ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">transaction_id</replaceable></term>
+    <term><replaceable class="parameter">transaction_id</replaceable></term>
     <listitem>
      <para>
       The transaction identifier of the transaction that is to be
@@ -75,7 +75,7 @@ ROLLBACK PREPARED <replaceable class="PARAMETER">transaction_id</replaceable>
   <title id="sql-rollback-prepared-examples-title">Examples</title>
   <para>
    Roll back the transaction identified by the transaction
-   identifier <literal>foobar</>:
+   identifier <literal>foobar</literal>:
 
 <programlisting>
 ROLLBACK PREPARED 'foobar';
@@ -99,8 +99,8 @@ ROLLBACK PREPARED 'foobar';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-prepare-transaction"></member>
-   <member><xref linkend="sql-commit-prepared"></member>
+   <member><xref linkend="sql-prepare-transaction"/></member>
+   <member><xref linkend="sql-commit-prepared"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/rollback_to.sgml b/doc/src/sgml/ref/rollback_to.sgml
index 060f408a63..4d5647a302 100644
--- a/doc/src/sgml/ref/rollback_to.sgml
+++ b/doc/src/sgml/ref/rollback_to.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/rollback_to.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-ROLLBACK-TO">
+<refentry id="sql-rollback-to">
  <indexterm zone="sql-rollback-to">
   <primary>ROLLBACK TO SAVEPOINT</primary>
  </indexterm>
@@ -40,7 +40,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
   </para>
 
   <para>
-   <command>ROLLBACK TO SAVEPOINT</> implicitly destroys all savepoints that
+   <command>ROLLBACK TO SAVEPOINT</command> implicitly destroys all savepoints that
    were established after the named savepoint.
   </para>
  </refsect1>
@@ -50,7 +50,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">savepoint_name</></term>
+    <term><replaceable class="parameter">savepoint_name</replaceable></term>
     <listitem>
      <para>
       The savepoint to roll back to.
@@ -64,7 +64,7 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-RELEASE-SAVEPOINT"> to destroy a savepoint
+   Use <xref linkend="sql-release-savepoint"/> to destroy a savepoint
    without discarding the effects of commands executed after it was
    established.
   </para>
@@ -77,17 +77,17 @@ ROLLBACK [ WORK | TRANSACTION ] TO [ SAVEPOINT ] <replaceable>savepoint_name</re
    Cursors have somewhat non-transactional behavior with respect to
    savepoints.  Any cursor that is opened inside a savepoint will be closed
    when the savepoint is rolled back.  If a previously opened cursor is
-   affected by a <command>FETCH</> or <command>MOVE</> command inside a
+   affected by a <command>FETCH</command> or <command>MOVE</command> command inside a
    savepoint that is later rolled back, the cursor remains at the
-   position that <command>FETCH</> left it pointing to (that is, the cursor
-   motion caused by <command>FETCH</> is not rolled back).
+   position that <command>FETCH</command> left it pointing to (that is, the cursor
+   motion caused by <command>FETCH</command> is not rolled back).
    Closing a cursor is not undone by rolling back, either.
    However, other side-effects caused by the cursor's query (such as
-   side-effects of volatile functions called by the query) <emphasis>are</>
+   side-effects of volatile functions called by the query) <emphasis>are</emphasis>
    rolled back if they occur during a savepoint that is later rolled back.
    A cursor whose execution causes a transaction to abort is put in a
    cannot-execute state, so while the transaction can be restored using
-   <command>ROLLBACK TO SAVEPOINT</>, the cursor can no longer be used.
+   <command>ROLLBACK TO SAVEPOINT</command>, the cursor can no longer be used.
   </para>
  </refsect1>
 
@@ -133,13 +133,13 @@ COMMIT;
   <title>Compatibility</title>
 
   <para>
-   The <acronym>SQL</> standard specifies that the key word
-   <literal>SAVEPOINT</> is mandatory, but <productname>PostgreSQL</>
-   and <productname>Oracle</> allow it to be omitted.  SQL allows
-   only <literal>WORK</>, not <literal>TRANSACTION</>, as a noise word
-   after <literal>ROLLBACK</>.  Also, SQL has an optional clause
-   <literal>AND [ NO ] CHAIN</> which is not currently supported by
-   <productname>PostgreSQL</>.  Otherwise, this command conforms to
+   The <acronym>SQL</acronym> standard specifies that the key word
+   <literal>SAVEPOINT</literal> is mandatory, but <productname>PostgreSQL</productname>
+   and <productname>Oracle</productname> allow it to be omitted.  SQL allows
+   only <literal>WORK</literal>, not <literal>TRANSACTION</literal>, as a noise word
+   after <literal>ROLLBACK</literal>.  Also, SQL has an optional clause
+   <literal>AND [ NO ] CHAIN</literal> which is not currently supported by
+   <productname>PostgreSQL</productname>.  Otherwise, this command conforms to
    the SQL standard.
   </para>
  </refsect1>
@@ -148,11 +148,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-release-savepoint"></member>
-   <member><xref linkend="sql-rollback"></member>
-   <member><xref linkend="sql-savepoint"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-release-savepoint"/></member>
+   <member><xref linkend="sql-rollback"/></member>
+   <member><xref linkend="sql-savepoint"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/savepoint.sgml b/doc/src/sgml/ref/savepoint.sgml
index 5b944a2561..87243b1d20 100644
--- a/doc/src/sgml/ref/savepoint.sgml
+++ b/doc/src/sgml/ref/savepoint.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/savepoint.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SAVEPOINT">
+<refentry id="sql-savepoint">
  <indexterm zone="sql-savepoint">
   <primary>SAVEPOINT</primary>
  </indexterm>
@@ -64,8 +64,8 @@ SAVEPOINT <replaceable>savepoint_name</replaceable>
   <title>Notes</title>
 
   <para>
-   Use <xref linkend="SQL-ROLLBACK-TO"> to
-   rollback to a savepoint.  Use <xref linkend="SQL-RELEASE-SAVEPOINT">
+   Use <xref linkend="sql-rollback-to"/> to
+   rollback to a savepoint.  Use <xref linkend="sql-release-savepoint"/>
    to destroy a savepoint, keeping
    the effects of commands executed after it was established.
   </para>
@@ -114,11 +114,11 @@ COMMIT;
   <para>
    SQL requires a savepoint to be destroyed automatically when another
    savepoint with the same name is established.  In
-   <productname>PostgreSQL</>, the old savepoint is kept, though only the more
+   <productname>PostgreSQL</productname>, the old savepoint is kept, though only the more
    recent one will be used when rolling back or releasing.  (Releasing the
-   newer savepoint with <command>RELEASE SAVEPOINT</> will cause the older one
-   to again become accessible to <command>ROLLBACK TO SAVEPOINT</> and
-   <command>RELEASE SAVEPOINT</>.) Otherwise, <command>SAVEPOINT</command> is
+   newer savepoint with <command>RELEASE SAVEPOINT</command> will cause the older one
+   to again become accessible to <command>ROLLBACK TO SAVEPOINT</command> and
+   <command>RELEASE SAVEPOINT</command>.) Otherwise, <command>SAVEPOINT</command> is
    fully SQL conforming.
   </para>
  </refsect1>
@@ -127,11 +127,11 @@ COMMIT;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-release-savepoint"></member>
-   <member><xref linkend="sql-rollback"></member>
-   <member><xref linkend="sql-rollback-to"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-release-savepoint"/></member>
+   <member><xref linkend="sql-rollback"/></member>
+   <member><xref linkend="sql-rollback-to"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/security_label.sgml b/doc/src/sgml/ref/security_label.sgml
index aa8be473bd..e9cfdec9f9 100644
--- a/doc/src/sgml/ref/security_label.sgml
+++ b/doc/src/sgml/ref/security_label.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/security_label.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SECURITY-LABEL">
+<refentry id="sql-security-label">
  <indexterm zone="sql-security-label">
   <primary>SECURITY LABEL</primary>
  </indexterm>
@@ -21,28 +21,30 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
+SECURITY LABEL [ FOR <replaceable class="parameter">provider</replaceable> ] ON
 {
-  TABLE <replaceable class="PARAMETER">object_name</replaceable> |
-  COLUMN <replaceable class="PARAMETER">table_name</replaceable>.<replaceable class="PARAMETER">column_name</replaceable> |
-  AGGREGATE <replaceable class="PARAMETER">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
-  DATABASE <replaceable class="PARAMETER">object_name</replaceable> |
-  DOMAIN <replaceable class="PARAMETER">object_name</replaceable> |
-  EVENT TRIGGER <replaceable class="PARAMETER">object_name</replaceable> |
-  FOREIGN TABLE <replaceable class="PARAMETER">object_name</replaceable>
-  FUNCTION <replaceable class="PARAMETER">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
-  LARGE OBJECT <replaceable class="PARAMETER">large_object_oid</replaceable> |
-  MATERIALIZED VIEW <replaceable class="PARAMETER">object_name</replaceable> |
-  [ PROCEDURAL ] LANGUAGE <replaceable class="PARAMETER">object_name</replaceable> |
-  PUBLICATION <replaceable class="PARAMETER">object_name</replaceable> |
-  ROLE <replaceable class="PARAMETER">object_name</replaceable> |
-  SCHEMA <replaceable class="PARAMETER">object_name</replaceable> |
-  SEQUENCE <replaceable class="PARAMETER">object_name</replaceable> |
-  SUBSCRIPTION <replaceable class="PARAMETER">object_name</replaceable> |
-  TABLESPACE <replaceable class="PARAMETER">object_name</replaceable> |
-  TYPE <replaceable class="PARAMETER">object_name</replaceable> |
-  VIEW <replaceable class="PARAMETER">object_name</replaceable>
-} IS '<replaceable class="PARAMETER">label</replaceable>'
+  TABLE <replaceable class="parameter">object_name</replaceable> |
+  COLUMN <replaceable class="parameter">table_name</replaceable>.<replaceable class="parameter">column_name</replaceable> |
+  AGGREGATE <replaceable class="parameter">aggregate_name</replaceable> ( <replaceable>aggregate_signature</replaceable> ) |
+  DATABASE <replaceable class="parameter">object_name</replaceable> |
+  DOMAIN <replaceable class="parameter">object_name</replaceable> |
+  EVENT TRIGGER <replaceable class="parameter">object_name</replaceable> |
+  FOREIGN TABLE <replaceable class="parameter">object_name</replaceable>
+  FUNCTION <replaceable class="parameter">function_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  LARGE OBJECT <replaceable class="parameter">large_object_oid</replaceable> |
+  MATERIALIZED VIEW <replaceable class="parameter">object_name</replaceable> |
+  [ PROCEDURAL ] LANGUAGE <replaceable class="parameter">object_name</replaceable> |
+  PROCEDURE <replaceable class="parameter">procedure_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  PUBLICATION <replaceable class="parameter">object_name</replaceable> |
+  ROLE <replaceable class="parameter">object_name</replaceable> |
+  ROUTINE <replaceable class="parameter">routine_name</replaceable> [ ( [ [ <replaceable class="parameter">argmode</replaceable> ] [ <replaceable class="parameter">argname</replaceable> ] <replaceable class="parameter">argtype</replaceable> [, ...] ] ) ] |
+  SCHEMA <replaceable class="parameter">object_name</replaceable> |
+  SEQUENCE <replaceable class="parameter">object_name</replaceable> |
+  SUBSCRIPTION <replaceable class="parameter">object_name</replaceable> |
+  TABLESPACE <replaceable class="parameter">object_name</replaceable> |
+  TYPE <replaceable class="parameter">object_name</replaceable> |
+  VIEW <replaceable class="parameter">object_name</replaceable>
+} IS '<replaceable class="parameter">label</replaceable>'
 
 <phrase>where <replaceable>aggregate_signature</replaceable> is:</phrase>
 
@@ -60,12 +62,12 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
    object.  An arbitrary number of security labels, one per label provider, can
    be associated with a given database object.  Label providers are loadable
    modules which register themselves by using the function
-   <function>register_label_provider</>.
+   <function>register_label_provider</function>.
   </para>
 
   <note>
     <para>
-      <function>register_label_provider</> is not an SQL function; it can
+      <function>register_label_provider</function> is not an SQL function; it can
       only be called from C code loaded into the backend.
     </para>
   </note>
@@ -74,11 +76,11 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
    The label provider determines whether a given label is valid and whether
    it is permissible to assign that label to a given object.  The meaning of a
    given label is likewise at the discretion of the label provider.
-   <productname>PostgreSQL</> places no restrictions on whether or how a
+   <productname>PostgreSQL</productname> places no restrictions on whether or how a
    label provider must interpret security labels; it merely provides a
    mechanism for storing them.  In practice, this facility is intended to allow
    integration with label-based mandatory access control (MAC) systems such as
-   <productname>SE-Linux</>.  Such systems make all access control decisions
+   <productname>SE-Linux</productname>.  Such systems make all access control decisions
    based on object labels, rather than traditional discretionary access control
    (DAC) concepts such as users and groups.
   </para>
@@ -93,10 +95,12 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
     <term><replaceable class="parameter">table_name.column_name</replaceable></term>
     <term><replaceable class="parameter">aggregate_name</replaceable></term>
     <term><replaceable class="parameter">function_name</replaceable></term>
+    <term><replaceable class="parameter">procedure_name</replaceable></term>
+    <term><replaceable class="parameter">routine_name</replaceable></term>
     <listitem>
      <para>
       The name of the object to be labeled.  Names of tables,
-      aggregates, domains, foreign tables, functions, sequences, types, and
+      aggregates, domains, foreign tables, functions, procedures, routines, sequences, types, and
       views can be schema-qualified.
      </para>
     </listitem>
@@ -119,15 +123,15 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
 
     <listitem>
      <para>
-      The mode of a function or aggregate
-      argument: <literal>IN</>, <literal>OUT</>,
-      <literal>INOUT</>, or <literal>VARIADIC</>.
-      If omitted, the default is <literal>IN</>.
+      The mode of a function, procedure, or aggregate
+      argument: <literal>IN</literal>, <literal>OUT</literal>,
+      <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+      If omitted, the default is <literal>IN</literal>.
       Note that <command>SECURITY LABEL</command> does not actually
-      pay any attention to <literal>OUT</> arguments, since only the input
+      pay any attention to <literal>OUT</literal> arguments, since only the input
       arguments are needed to determine the function's identity.
-      So it is sufficient to list the <literal>IN</>, <literal>INOUT</>,
-      and <literal>VARIADIC</> arguments.
+      So it is sufficient to list the <literal>IN</literal>, <literal>INOUT</literal>,
+      and <literal>VARIADIC</literal> arguments.
      </para>
     </listitem>
    </varlistentry>
@@ -137,7 +141,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
 
     <listitem>
      <para>
-      The name of a function or aggregate argument.
+      The name of a function, procedure, or aggregate argument.
       Note that <command>SECURITY LABEL</command> does not actually
       pay any attention to argument names, since only the argument data
       types are needed to determine the function's identity.
@@ -150,7 +154,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
 
     <listitem>
      <para>
-      The data type of a function or aggregate argument.
+      The data type of a function, procedure, or aggregate argument.
      </para>
     </listitem>
    </varlistentry>
@@ -178,7 +182,7 @@ SECURITY LABEL [ FOR <replaceable class="PARAMETER">provider</replaceable> ] ON
     <term><replaceable class="parameter">label</replaceable></term>
     <listitem>
      <para>
-      The new security label, written as a string literal; or <literal>NULL</>
+      The new security label, written as a string literal; or <literal>NULL</literal>
       to drop the security label.
      </para>
     </listitem>
@@ -208,7 +212,7 @@ SECURITY LABEL FOR selinux ON TABLE mytable IS 'system_u:object_r:sepgsql_table_
  <refsect1>
   <title>See Also</title>
   <simplelist type="inline">
-   <member><xref linkend="sepgsql"></member>
+   <member><xref linkend="sepgsql"/></member>
    <member><filename>src/test/modules/dummy_seclabel</filename></member>
   </simplelist>
  </refsect1>
diff --git a/doc/src/sgml/ref/select.sgml b/doc/src/sgml/ref/select.sgml
index 57f11e66fb..b5d3d3a071 100644
--- a/doc/src/sgml/ref/select.sgml
+++ b/doc/src/sgml/ref/select.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/select.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SELECT">
+<refentry id="sql-select">
  <indexterm zone="sql-select">
   <primary>SELECT</primary>
  </indexterm>
@@ -94,7 +94,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       in the <literal>FROM</literal> list.  A <literal>WITH</literal> query
       that is referenced more than once in <literal>FROM</literal> is
       computed only once.
-      (See <xref linkend="sql-with" endterm="sql-with-title"> below.)
+      (See <xref linkend="sql-with" endterm="sql-with-title"/> below.)
      </para>
     </listitem>
 
@@ -104,7 +104,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       (Each element in the <literal>FROM</literal> list is a real or
       virtual table.)  If more than one element is specified in the
       <literal>FROM</literal> list, they are cross-joined together.
-      (See <xref linkend="sql-from" endterm="sql-from-title"> below.)
+      (See <xref linkend="sql-from" endterm="sql-from-title"/> below.)
      </para>
     </listitem>
 
@@ -113,7 +113,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       If the <literal>WHERE</literal> clause is specified, all rows
       that do not satisfy the condition are eliminated from the
       output.  (See <xref linkend="sql-where"
-      endterm="sql-where-title"> below.)
+      endterm="sql-where-title"/> below.)
      </para>
     </listitem>
 
@@ -125,8 +125,8 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       values, and the results of aggregate functions are computed.
       If the <literal>HAVING</literal> clause is present, it
       eliminates groups that do not satisfy the given condition.  (See
-      <xref linkend="sql-groupby" endterm="sql-groupby-title"> and
-      <xref linkend="sql-having" endterm="sql-having-title"> below.)
+      <xref linkend="sql-groupby" endterm="sql-groupby-title"/> and
+      <xref linkend="sql-having" endterm="sql-having-title"/> below.)
      </para>
     </listitem>
 
@@ -135,7 +135,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       The actual output rows are computed using the
       <command>SELECT</command> output expressions for each selected
       row or row group.  (See
-      <xref linkend="sql-select-list" endterm="sql-select-list-title">
+      <xref linkend="sql-select-list" endterm="sql-select-list-title"/>
       below.)
      </para>
     </listitem>
@@ -146,7 +146,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       match on all the specified expressions.  <literal>SELECT ALL</literal>
       (the default) will return all candidate rows, including
       duplicates.  (See <xref linkend="sql-distinct"
-      endterm="sql-distinct-title"> below.)
+      endterm="sql-distinct-title"/> below.)
      </para>
     </listitem>
 
@@ -163,13 +163,13 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       operator returns the rows that are in the first result set but
       not in the second.  In all three cases, duplicate rows are
       eliminated unless <literal>ALL</literal> is specified.  The noise
-      word <literal>DISTINCT</> can be added to explicitly specify
-      eliminating duplicate rows.  Notice that <literal>DISTINCT</> is
+      word <literal>DISTINCT</literal> can be added to explicitly specify
+      eliminating duplicate rows.  Notice that <literal>DISTINCT</literal> is
       the default behavior here, even though <literal>ALL</literal> is
-      the default for <command>SELECT</> itself.  (See
-      <xref linkend="sql-union" endterm="sql-union-title">, <xref
-      linkend="sql-intersect" endterm="sql-intersect-title">, and
-      <xref linkend="sql-except" endterm="sql-except-title"> below.)
+      the default for <command>SELECT</command> itself.  (See
+      <xref linkend="sql-union" endterm="sql-union-title"/>, <xref
+      linkend="sql-intersect" endterm="sql-intersect-title"/>, and
+      <xref linkend="sql-except" endterm="sql-except-title"/> below.)
      </para>
     </listitem>
 
@@ -179,7 +179,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       returned rows are sorted in the specified order.  If
       <literal>ORDER BY</literal> is not given, the rows are returned
       in whatever order the system finds fastest to produce.  (See
-      <xref linkend="sql-orderby" endterm="sql-orderby-title"> below.)
+      <xref linkend="sql-orderby" endterm="sql-orderby-title"/> below.)
      </para>
     </listitem>
 
@@ -188,18 +188,18 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       If the <literal>LIMIT</literal> (or <literal>FETCH FIRST</literal>) or <literal>OFFSET</literal>
       clause is specified, the <command>SELECT</command> statement
       only returns a subset of the result rows. (See <xref
-      linkend="sql-limit" endterm="sql-limit-title"> below.)
+      linkend="sql-limit" endterm="sql-limit-title"/> below.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      If <literal>FOR UPDATE</>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR SHARE</literal>
+      If <literal>FOR UPDATE</literal>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR SHARE</literal>
       or <literal>FOR KEY SHARE</literal>
       is specified, the
       <command>SELECT</command> statement locks the selected rows
       against concurrent updates.  (See <xref linkend="sql-for-update-share"
-      endterm="sql-for-update-share-title"> below.)
+      endterm="sql-for-update-share-title"/> below.)
      </para>
     </listitem>
    </orderedlist>
@@ -207,7 +207,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
 
   <para>
    You must have <literal>SELECT</literal> privilege on each column used
-   in a <command>SELECT</> command.  The use of <literal>FOR NO KEY UPDATE</>,
+   in a <command>SELECT</command> command.  The use of <literal>FOR NO KEY UPDATE</literal>,
    <literal>FOR UPDATE</literal>,
    <literal>FOR SHARE</literal> or <literal>FOR KEY SHARE</literal> requires
    <literal>UPDATE</literal> privilege as well (for at least one column
@@ -218,7 +218,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
  <refsect1>
   <title>Parameters</title>
 
-  <refsect2 id="SQL-WITH">
+  <refsect2 id="sql-with">
    <title id="sql-with-title"><literal>WITH</literal> Clause</title>
 
    <para>
@@ -226,15 +226,15 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
     subqueries that can be referenced by name in the primary query.
     The subqueries effectively act as temporary tables or views
     for the duration of the primary query.
-    Each subquery can be a <command>SELECT</command>, <command>TABLE</>, <command>VALUES</command>,
+    Each subquery can be a <command>SELECT</command>, <command>TABLE</command>, <command>VALUES</command>,
     <command>INSERT</command>, <command>UPDATE</command> or
     <command>DELETE</command> statement.
     When writing a data-modifying statement (<command>INSERT</command>,
     <command>UPDATE</command> or <command>DELETE</command>) in
-    <literal>WITH</>, it is usual to include a <literal>RETURNING</> clause.
-    It is the output of <literal>RETURNING</>, <emphasis>not</> the underlying
+    <literal>WITH</literal>, it is usual to include a <literal>RETURNING</literal> clause.
+    It is the output of <literal>RETURNING</literal>, <emphasis>not</emphasis> the underlying
     table that the statement modifies, that forms the temporary table that is
-    read by the primary query.  If <literal>RETURNING</> is omitted, the
+    read by the primary query.  If <literal>RETURNING</literal> is omitted, the
     statement is still executed, but it produces no output so it cannot be
     referenced as a table by the primary query.
    </para>
@@ -254,11 +254,11 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
 <replaceable class="parameter">non_recursive_term</replaceable> UNION [ ALL | DISTINCT ] <replaceable class="parameter">recursive_term</replaceable>
 </synopsis>
     where the recursive self-reference must appear on the right-hand
-    side of the <literal>UNION</>.  Only one recursive self-reference
+    side of the <literal>UNION</literal>.  Only one recursive self-reference
     is permitted per query.  Recursive data-modifying statements are not
     supported, but you can use the results of a recursive
     <command>SELECT</command> query in
-    a data-modifying statement.  See <xref linkend="queries-with"> for
+    a data-modifying statement.  See <xref linkend="queries-with"/> for
     an example.
    </para>
 
@@ -285,17 +285,17 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
     The primary query and the <literal>WITH</literal> queries are all
     (notionally) executed at the same time.  This implies that the effects of
     a data-modifying statement in <literal>WITH</literal> cannot be seen from
-    other parts of the query, other than by reading its <literal>RETURNING</>
+    other parts of the query, other than by reading its <literal>RETURNING</literal>
     output.  If two such data-modifying statements attempt to modify the same
     row, the results are unspecified.
    </para>
 
    <para>
-    See <xref linkend="queries-with"> for additional information.
+    See <xref linkend="queries-with"/> for additional information.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-FROM">
+  <refsect2 id="sql-from">
    <title id="sql-from-title"><literal>FROM</literal> Clause</title>
 
    <para>
@@ -303,7 +303,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
     tables for the <command>SELECT</command>.  If multiple sources are
     specified, the result is the Cartesian product (cross join) of all
     the sources.  But usually qualification conditions are added (via
-    <literal>WHERE</>) to restrict the returned rows to a small subset of the
+    <literal>WHERE</literal>) to restrict the returned rows to a small subset of the
     Cartesian product.
    </para>
 
@@ -317,10 +317,10 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <listitem>
        <para>
         The name (optionally schema-qualified) of an existing table or view.
-        If <literal>ONLY</> is specified before the table name, only that
-        table is scanned.  If <literal>ONLY</> is not specified, the table
+        If <literal>ONLY</literal> is specified before the table name, only that
+        table is scanned.  If <literal>ONLY</literal> is not specified, the table
         and all its descendant tables (if any) are scanned.  Optionally,
-        <literal>*</> can be specified after the table name to explicitly
+        <literal>*</literal> can be specified after the table name to explicitly
         indicate that descendant tables are included.
        </para>
       </listitem>
@@ -330,14 +330,14 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <term><replaceable class="parameter">alias</replaceable></term>
       <listitem>
        <para>
-        A substitute name for the <literal>FROM</> item containing the
+        A substitute name for the <literal>FROM</literal> item containing the
         alias.  An alias is used for brevity or to eliminate ambiguity
         for self-joins (where the same table is scanned multiple
         times).  When an alias is provided, it completely hides the
         actual name of the table or function; for example given
-        <literal>FROM foo AS f</>, the remainder of the
-        <command>SELECT</command> must refer to this <literal>FROM</>
-        item as <literal>f</> not <literal>foo</>.  If an alias is
+        <literal>FROM foo AS f</literal>, the remainder of the
+        <command>SELECT</command> must refer to this <literal>FROM</literal>
+        item as <literal>f</literal> not <literal>foo</literal>.  If an alias is
         written, a column alias list can also be written to provide
         substitute names for one or more columns of the table.
        </para>
@@ -348,12 +348,12 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <term><literal>TABLESAMPLE <replaceable class="parameter">sampling_method</replaceable> ( <replaceable class="parameter">argument</replaceable> [, ...] ) [ REPEATABLE ( <replaceable class="parameter">seed</replaceable> ) ]</literal></term>
       <listitem>
        <para>
-        A <literal>TABLESAMPLE</> clause after
-        a <replaceable class="parameter">table_name</> indicates that the
+        A <literal>TABLESAMPLE</literal> clause after
+        a <replaceable class="parameter">table_name</replaceable> indicates that the
         specified <replaceable class="parameter">sampling_method</replaceable>
         should be used to retrieve a subset of the rows in that table.
         This sampling precedes the application of any other filters such
-        as <literal>WHERE</> clauses.
+        as <literal>WHERE</literal> clauses.
         The standard <productname>PostgreSQL</productname> distribution
         includes two sampling methods, <literal>BERNOULLI</literal>
         and <literal>SYSTEM</literal>, and other sampling methods can be
@@ -361,11 +361,11 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
        </para>
 
        <para>
-        The <literal>BERNOULLI</> and <literal>SYSTEM</> sampling methods
-        each accept a single <replaceable class="parameter">argument</>
+        The <literal>BERNOULLI</literal> and <literal>SYSTEM</literal> sampling methods
+        each accept a single <replaceable class="parameter">argument</replaceable>
         which is the fraction of the table to sample, expressed as a
         percentage between 0 and 100.  This argument can be
-        any <type>real</>-valued expression.  (Other sampling methods might
+        any <type>real</type>-valued expression.  (Other sampling methods might
         accept more or different arguments.)  These two methods each return
         a randomly-chosen sample of the table that will contain
         approximately the specified percentage of the table's rows.
@@ -383,10 +383,10 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
 
        <para>
         The optional <literal>REPEATABLE</literal> clause specifies
-        a <replaceable class="parameter">seed</> number or expression to use
+        a <replaceable class="parameter">seed</replaceable> number or expression to use
         for generating random numbers within the sampling method.  The seed
         value can be any non-null floating-point value.  Two queries that
-        specify the same seed and <replaceable class="parameter">argument</>
+        specify the same seed and <replaceable class="parameter">argument</replaceable>
         values will select the same sample of the table, if the table has
         not been changed meanwhile.  But different seed values will usually
         produce different samples.
@@ -410,7 +410,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
         sub-<command>SELECT</command> must be surrounded by
         parentheses, and an alias <emphasis>must</emphasis> be
         provided for it.  A
-        <xref linkend="sql-values"> command
+        <xref linkend="sql-values"/> command
         can also be used here.
        </para>
       </listitem>
@@ -420,9 +420,9 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <term><replaceable class="parameter">with_query_name</replaceable></term>
       <listitem>
        <para>
-        A <literal>WITH</> query is referenced by writing its name,
+        A <literal>WITH</literal> query is referenced by writing its name,
         just as though the query's name were a table name.  (In fact,
-        the <literal>WITH</> query hides any real table of the same name
+        the <literal>WITH</literal> query hides any real table of the same name
         for the purposes of the primary query.  If necessary, you can
         refer to a real table of the same name by schema-qualifying
         the table's name.)
@@ -456,8 +456,8 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
 
        <para>
         Multiple function calls can be combined into a
-        single <literal>FROM</>-clause item by surrounding them
-        with <literal>ROWS FROM( ... )</>.  The output of such an item is the
+        single <literal>FROM</literal>-clause item by surrounding them
+        with <literal>ROWS FROM( ... )</literal>.  The output of such an item is the
         concatenation of the first row from each function, then the second
         row from each function, etc.  If some of the functions produce fewer
         rows than others, null values are substituted for the missing data, so
@@ -467,28 +467,28 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
 
       <para>
         If the function has been defined as returning the
-        <type>record</> data type, then an alias or the key word
-        <literal>AS</> must be present, followed by a column
+        <type>record</type> data type, then an alias or the key word
+        <literal>AS</literal> must be present, followed by a column
         definition list in the form <literal>( <replaceable
         class="parameter">column_name</replaceable> <replaceable
         class="parameter">data_type</replaceable> <optional>, ...
-        </>)</literal>.  The column definition list must match the
+        </optional>)</literal>.  The column definition list must match the
         actual number and types of columns returned by the function.
        </para>
 
        <para>
-        When using the <literal>ROWS FROM( ... )</> syntax, if one of the
+        When using the <literal>ROWS FROM( ... )</literal> syntax, if one of the
         functions requires a column definition list, it's preferred to put
         the column definition list after the function call inside
-        <literal>ROWS FROM( ... )</>.  A column definition list can be placed
-        after the <literal>ROWS FROM( ... )</> construct only if there's just
-        a single function and no <literal>WITH ORDINALITY</> clause.
+        <literal>ROWS FROM( ... )</literal>.  A column definition list can be placed
+        after the <literal>ROWS FROM( ... )</literal> construct only if there's just
+        a single function and no <literal>WITH ORDINALITY</literal> clause.
        </para>
 
        <para>
         To use <literal>ORDINALITY</literal> together with a column definition
-        list, you must use the <literal>ROWS FROM( ... )</> syntax and put the
-        column definition list inside <literal>ROWS FROM( ... )</>.
+        list, you must use the <literal>ROWS FROM( ... )</literal> syntax and put the
+        column definition list inside <literal>ROWS FROM( ... )</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -516,9 +516,9 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
          </listitem>
         </itemizedlist>
 
-        For the <literal>INNER</> and <literal>OUTER</> join types, a
+        For the <literal>INNER</literal> and <literal>OUTER</literal> join types, a
         join condition must be specified, namely exactly one of
-        <literal>NATURAL</>, <literal>ON <replaceable
+        <literal>NATURAL</literal>, <literal>ON <replaceable
         class="parameter">join_condition</replaceable></literal>, or
         <literal>USING (<replaceable
         class="parameter">join_column</replaceable> [, ...])</literal>.
@@ -527,46 +527,46 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
        </para>
 
        <para>
-        A <literal>JOIN</literal> clause combines two <literal>FROM</>
-        items, which for convenience we will refer to as <quote>tables</>,
-        though in reality they can be any type of <literal>FROM</> item.
+        A <literal>JOIN</literal> clause combines two <literal>FROM</literal>
+        items, which for convenience we will refer to as <quote>tables</quote>,
+        though in reality they can be any type of <literal>FROM</literal> item.
         Use parentheses if necessary to determine the order of nesting.
         In the absence of parentheses, <literal>JOIN</literal>s nest
         left-to-right.  In any case <literal>JOIN</literal> binds more
-        tightly than the commas separating <literal>FROM</>-list items.
+        tightly than the commas separating <literal>FROM</literal>-list items.
        </para>
 
-       <para><literal>CROSS JOIN</> and <literal>INNER JOIN</literal>
+       <para><literal>CROSS JOIN</literal> and <literal>INNER JOIN</literal>
         produce a simple Cartesian product, the same result as you get from
-        listing the two tables at the top level of <literal>FROM</>,
+        listing the two tables at the top level of <literal>FROM</literal>,
         but restricted by the join condition (if any).
-        <literal>CROSS JOIN</> is equivalent to <literal>INNER JOIN ON
-        (TRUE)</>, that is, no rows are removed by qualification.
+        <literal>CROSS JOIN</literal> is equivalent to <literal>INNER JOIN ON
+        (TRUE)</literal>, that is, no rows are removed by qualification.
         These join types are just a notational convenience, since they
-        do nothing you couldn't do with plain <literal>FROM</> and
-        <literal>WHERE</>.
+        do nothing you couldn't do with plain <literal>FROM</literal> and
+        <literal>WHERE</literal>.
        </para>
 
-       <para><literal>LEFT OUTER JOIN</> returns all rows in the qualified
+       <para><literal>LEFT OUTER JOIN</literal> returns all rows in the qualified
         Cartesian product (i.e., all combined rows that pass its join
         condition), plus one copy of each row in the left-hand table
         for which there was no right-hand row that passed the join
         condition.  This left-hand row is extended to the full width
         of the joined table by inserting null values for the
-        right-hand columns.  Note that only the <literal>JOIN</>
+        right-hand columns.  Note that only the <literal>JOIN</literal>
         clause's own condition is considered while deciding which rows
         have matches.  Outer conditions are applied afterwards.
        </para>
 
        <para>
-        Conversely, <literal>RIGHT OUTER JOIN</> returns all the
+        Conversely, <literal>RIGHT OUTER JOIN</literal> returns all the
         joined rows, plus one row for each unmatched right-hand row
         (extended with nulls on the left).  This is just a notational
         convenience, since you could convert it to a <literal>LEFT
-        OUTER JOIN</> by switching the left and right tables.
+        OUTER JOIN</literal> by switching the left and right tables.
        </para>
 
-       <para><literal>FULL OUTER JOIN</> returns all the joined rows, plus
+       <para><literal>FULL OUTER JOIN</literal> returns all the joined rows, plus
         one row for each unmatched left-hand row (extended with nulls
         on the right), plus one row for each unmatched right-hand row
         (extended with nulls on the left).
@@ -593,7 +593,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
         A clause of the form <literal>USING ( a, b, ... )</literal> is
         shorthand for <literal>ON left_table.a = right_table.a AND
         left_table.b = right_table.b ...</literal>.  Also,
-        <literal>USING</> implies that only one of each pair of
+        <literal>USING</literal> implies that only one of each pair of
         equivalent columns will be included in the join output, not
         both.
        </para>
@@ -605,10 +605,10 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <listitem>
        <para>
         <literal>NATURAL</literal> is shorthand for a
-        <literal>USING</> list that mentions all columns in the two
+        <literal>USING</literal> list that mentions all columns in the two
         tables that have matching names.  If there are no common
         column names, <literal>NATURAL</literal> is equivalent
-        to <literal>ON TRUE</>.
+        to <literal>ON TRUE</literal>.
        </para>
       </listitem>
      </varlistentry>
@@ -618,32 +618,32 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
       <listitem>
        <para>
         The <literal>LATERAL</literal> key word can precede a
-        sub-<command>SELECT</command> <literal>FROM</> item.  This allows the
-        sub-<command>SELECT</command> to refer to columns of <literal>FROM</>
-        items that appear before it in the <literal>FROM</> list.  (Without
+        sub-<command>SELECT</command> <literal>FROM</literal> item.  This allows the
+        sub-<command>SELECT</command> to refer to columns of <literal>FROM</literal>
+        items that appear before it in the <literal>FROM</literal> list.  (Without
         <literal>LATERAL</literal>, each sub-<command>SELECT</command> is
         evaluated independently and so cannot cross-reference any other
-        <literal>FROM</> item.)
+        <literal>FROM</literal> item.)
        </para>
 
        <para><literal>LATERAL</literal> can also precede a function-call
-        <literal>FROM</> item, but in this case it is a noise word, because
-        the function expression can refer to earlier <literal>FROM</> items
+        <literal>FROM</literal> item, but in this case it is a noise word, because
+        the function expression can refer to earlier <literal>FROM</literal> items
         in any case.
        </para>
 
        <para>
         A <literal>LATERAL</literal> item can appear at top level in the
-        <literal>FROM</> list, or within a <literal>JOIN</> tree.  In the
+        <literal>FROM</literal> list, or within a <literal>JOIN</literal> tree.  In the
         latter case it can also refer to any items that are on the left-hand
-        side of a <literal>JOIN</> that it is on the right-hand side of.
+        side of a <literal>JOIN</literal> that it is on the right-hand side of.
        </para>
 
        <para>
-        When a <literal>FROM</> item contains <literal>LATERAL</literal>
+        When a <literal>FROM</literal> item contains <literal>LATERAL</literal>
         cross-references, evaluation proceeds as follows: for each row of the
-        <literal>FROM</> item providing the cross-referenced column(s), or
-        set of rows of multiple <literal>FROM</> items providing the
+        <literal>FROM</literal> item providing the cross-referenced column(s), or
+        set of rows of multiple <literal>FROM</literal> items providing the
         columns, the <literal>LATERAL</literal> item is evaluated using that
         row or row set's values of the columns.  The resulting row(s) are
         joined as usual with the rows they were computed from.  This is
@@ -651,14 +651,14 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
        </para>
 
        <para>
-        The column source table(s) must be <literal>INNER</> or
-        <literal>LEFT</> joined to the <literal>LATERAL</literal> item, else
+        The column source table(s) must be <literal>INNER</literal> or
+        <literal>LEFT</literal> joined to the <literal>LATERAL</literal> item, else
         there would not be a well-defined set of rows from which to compute
         each set of rows for the <literal>LATERAL</literal> item.  Thus,
-        although a construct such as <literal><replaceable>X</> RIGHT JOIN
-        LATERAL <replaceable>Y</></literal> is syntactically valid, it is
-        not actually allowed for <replaceable>Y</> to reference
-        <replaceable>X</>.
+        although a construct such as <literal><replaceable>X</replaceable> RIGHT JOIN
+        LATERAL <replaceable>Y</replaceable></literal> is syntactically valid, it is
+        not actually allowed for <replaceable>Y</replaceable> to reference
+        <replaceable>X</replaceable>.
        </para>
       </listitem>
      </varlistentry>
@@ -666,7 +666,7 @@ TABLE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ]
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-WHERE">
+  <refsect2 id="sql-where">
    <title id="sql-where-title"><literal>WHERE</literal> Clause</title>
 
    <para>
@@ -683,7 +683,7 @@ WHERE <replaceable class="parameter">condition</replaceable>
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-GROUPBY">
+  <refsect2 id="sql-groupby">
    <title id="sql-groupby-title"><literal>GROUP BY</literal> Clause</title>
 
    <para>
@@ -707,14 +707,14 @@ GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...]
    </para>
 
    <para>
-    If any of <literal>GROUPING SETS</>, <literal>ROLLUP</> or
-    <literal>CUBE</> are present as grouping elements, then the
-    <literal>GROUP BY</> clause as a whole defines some number of
-    independent <replaceable>grouping sets</>.  The effect of this is
-    equivalent to constructing a <literal>UNION ALL</> between
+    If any of <literal>GROUPING SETS</literal>, <literal>ROLLUP</literal> or
+    <literal>CUBE</literal> are present as grouping elements, then the
+    <literal>GROUP BY</literal> clause as a whole defines some number of
+    independent <replaceable>grouping sets</replaceable>.  The effect of this is
+    equivalent to constructing a <literal>UNION ALL</literal> between
     subqueries with the individual grouping sets as their
-    <literal>GROUP BY</> clauses.  For further details on the handling
-    of grouping sets see <xref linkend="queries-grouping-sets">.
+    <literal>GROUP BY</literal> clauses.  For further details on the handling
+    of grouping sets see <xref linkend="queries-grouping-sets"/>.
    </para>
 
    <para>
@@ -725,7 +725,7 @@ GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...]
     the selected rows.)
     The set of rows fed to each aggregate function can be further filtered by
     attaching a <literal>FILTER</literal> clause to the aggregate function
-    call; see <xref linkend="syntax-aggregates"> for more information.  When
+    call; see <xref linkend="syntax-aggregates"/> for more information.  When
     a <literal>FILTER</literal> clause is present, only those rows matching it
     are included in the input to that aggregate function.
    </para>
@@ -744,20 +744,20 @@ GROUP BY <replaceable class="parameter">grouping_element</replaceable> [, ...]
 
    <para>
     Keep in mind that all aggregate functions are evaluated before
-    evaluating any <quote>scalar</> expressions in the <literal>HAVING</>
-    clause or <literal>SELECT</> list.  This means that, for example,
-    a <literal>CASE</> expression cannot be used to skip evaluation of
-    an aggregate function; see <xref linkend="syntax-express-eval">.
+    evaluating any <quote>scalar</quote> expressions in the <literal>HAVING</literal>
+    clause or <literal>SELECT</literal> list.  This means that, for example,
+    a <literal>CASE</literal> expression cannot be used to skip evaluation of
+    an aggregate function; see <xref linkend="syntax-express-eval"/>.
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>,
-    <literal>FOR SHARE</> and <literal>FOR KEY SHARE</> cannot be
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal> and <literal>FOR KEY SHARE</literal> cannot be
     specified with <literal>GROUP BY</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-HAVING">
+  <refsect2 id="sql-having">
    <title id="sql-having-title"><literal>HAVING</literal> Clause</title>
 
    <para>
@@ -784,9 +784,9 @@ HAVING <replaceable class="parameter">condition</replaceable>
 
    <para>
     The presence of <literal>HAVING</literal> turns a query into a grouped
-    query even if there is no <literal>GROUP BY</> clause.  This is the
+    query even if there is no <literal>GROUP BY</literal> clause.  This is the
     same as what happens when the query contains aggregate functions but
-    no <literal>GROUP BY</> clause.  All the selected rows are considered to
+    no <literal>GROUP BY</literal> clause.  All the selected rows are considered to
     form a single group, and the <command>SELECT</command> list and
     <literal>HAVING</literal> clause can only reference table columns from
     within aggregate functions.  Such a query will emit a single row if the
@@ -794,13 +794,13 @@ HAVING <replaceable class="parameter">condition</replaceable>
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>,
-    <literal>FOR SHARE</> and <literal>FOR KEY SHARE</> cannot be
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal> and <literal>FOR KEY SHARE</literal> cannot be
     specified with <literal>HAVING</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-WINDOW">
+  <refsect2 id="sql-window">
    <title id="sql-window-title"><literal>WINDOW</literal> Clause</title>
 
    <para>
@@ -809,7 +809,7 @@ HAVING <replaceable class="parameter">condition</replaceable>
 WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceable class="parameter">window_definition</replaceable> ) [, ...]
 </synopsis>
     where <replaceable class="parameter">window_name</replaceable> is
-    a name that can be referenced from <literal>OVER</> clauses or
+    a name that can be referenced from <literal>OVER</literal> clauses or
     subsequent window definitions, and
     <replaceable class="parameter">window_definition</replaceable> is
 <synopsis>
@@ -822,128 +822,178 @@ WINDOW <replaceable class="parameter">window_name</replaceable> AS ( <replaceabl
 
    <para>
     If an <replaceable class="parameter">existing_window_name</replaceable>
-    is specified it must refer to an earlier entry in the <literal>WINDOW</>
+    is specified it must refer to an earlier entry in the <literal>WINDOW</literal>
     list; the new window copies its partitioning clause from that entry,
     as well as its ordering clause if any.  In this case the new window cannot
-    specify its own <literal>PARTITION BY</> clause, and it can specify
-    <literal>ORDER BY</> only if the copied window does not have one.
+    specify its own <literal>PARTITION BY</literal> clause, and it can specify
+    <literal>ORDER BY</literal> only if the copied window does not have one.
     The new window always uses its own frame clause; the copied window
     must not specify a frame clause.
    </para>
 
    <para>
-    The elements of the <literal>PARTITION BY</> list are interpreted in
+    The elements of the <literal>PARTITION BY</literal> list are interpreted in
     much the same fashion as elements of a
-    <xref linkend="sql-groupby" endterm="sql-groupby-title">, except that
+    <xref linkend="sql-groupby" endterm="sql-groupby-title"/>, except that
     they are always simple expressions and never the name or number of an
     output column.
     Another difference is that these expressions can contain aggregate
-    function calls, which are not allowed in a regular <literal>GROUP BY</>
+    function calls, which are not allowed in a regular <literal>GROUP BY</literal>
     clause.  They are allowed here because windowing occurs after grouping
     and aggregation.
    </para>
 
    <para>
-    Similarly, the elements of the <literal>ORDER BY</> list are interpreted
+    Similarly, the elements of the <literal>ORDER BY</literal> list are interpreted
     in much the same fashion as elements of an
-    <xref linkend="sql-orderby" endterm="sql-orderby-title">, except that
+    <xref linkend="sql-orderby" endterm="sql-orderby-title"/>, except that
     the expressions are always taken as simple expressions and never the name
     or number of an output column.
    </para>
 
    <para>
-    The optional <replaceable class="parameter">frame_clause</> defines
-    the <firstterm>window frame</> for window functions that depend on the
+    The optional <replaceable class="parameter">frame_clause</replaceable> defines
+    the <firstterm>window frame</firstterm> for window functions that depend on the
     frame (not all do).  The window frame is a set of related rows for
-    each row of the query (called the <firstterm>current row</>).
-    The <replaceable class="parameter">frame_clause</> can be one of
+    each row of the query (called the <firstterm>current row</firstterm>).
+    The <replaceable class="parameter">frame_clause</replaceable> can be one of
 
 <synopsis>
-{ RANGE | ROWS } <replaceable>frame_start</>
-{ RANGE | ROWS } BETWEEN <replaceable>frame_start</> AND <replaceable>frame_end</>
+{ RANGE | ROWS | GROUPS } <replaceable>frame_start</replaceable> [ <replaceable>frame_exclusion</replaceable> ]
+{ RANGE | ROWS | GROUPS } BETWEEN <replaceable>frame_start</replaceable> AND <replaceable>frame_end</replaceable> [ <replaceable>frame_exclusion</replaceable> ]
 </synopsis>
 
-    where <replaceable>frame_start</> and <replaceable>frame_end</> can be
-    one of
+    where <replaceable>frame_start</replaceable>
+    and <replaceable>frame_end</replaceable> can be one of
 
 <synopsis>
 UNBOUNDED PRECEDING
-<replaceable>value</replaceable> PRECEDING
+<replaceable>offset</replaceable> PRECEDING
 CURRENT ROW
-<replaceable>value</replaceable> FOLLOWING
+<replaceable>offset</replaceable> FOLLOWING
 UNBOUNDED FOLLOWING
 </synopsis>
 
-    If <replaceable>frame_end</> is omitted it defaults to <literal>CURRENT
-    ROW</>.  Restrictions are that
-    <replaceable>frame_start</> cannot be <literal>UNBOUNDED FOLLOWING</>,
-    <replaceable>frame_end</> cannot be <literal>UNBOUNDED PRECEDING</>,
-    and the <replaceable>frame_end</> choice cannot appear earlier in the
-    above list than the <replaceable>frame_start</> choice &mdash; for example
-    <literal>RANGE BETWEEN CURRENT ROW AND <replaceable>value</>
+    and <replaceable>frame_exclusion</replaceable> can be one of
+
+<synopsis>
+EXCLUDE CURRENT ROW
+EXCLUDE GROUP
+EXCLUDE TIES
+EXCLUDE NO OTHERS
+</synopsis>
+
+    If <replaceable>frame_end</replaceable> is omitted it defaults to <literal>CURRENT
+    ROW</literal>.  Restrictions are that
+    <replaceable>frame_start</replaceable> cannot be <literal>UNBOUNDED FOLLOWING</literal>,
+    <replaceable>frame_end</replaceable> cannot be <literal>UNBOUNDED PRECEDING</literal>,
+    and the <replaceable>frame_end</replaceable> choice cannot appear earlier in the
+    above list of <replaceable>frame_start</replaceable>
+    and <replaceable>frame_end</replaceable> options than
+    the <replaceable>frame_start</replaceable> choice does &mdash; for example
+    <literal>RANGE BETWEEN CURRENT ROW AND <replaceable>offset</replaceable>
     PRECEDING</literal> is not allowed.
    </para>
 
    <para>
-    The default framing option is <literal>RANGE UNBOUNDED PRECEDING</>,
+    The default framing option is <literal>RANGE UNBOUNDED PRECEDING</literal>,
     which is the same as <literal>RANGE BETWEEN UNBOUNDED PRECEDING AND
-    CURRENT ROW</>; it sets the frame to be all rows from the partition start
-    up through the current row's last peer (a row that <literal>ORDER
-    BY</> considers equivalent to the current row, or all rows if there
-    is no <literal>ORDER BY</>).
-    In general, <literal>UNBOUNDED PRECEDING</> means that the frame
+    CURRENT ROW</literal>; it sets the frame to be all rows from the partition start
+    up through the current row's last <firstterm>peer</firstterm> (a row
+    that the window's <literal>ORDER BY</literal> clause considers
+    equivalent to the current row), or all rows if there
+    is no <literal>ORDER BY</literal>.
+    In general, <literal>UNBOUNDED PRECEDING</literal> means that the frame
     starts with the first row of the partition, and similarly
-    <literal>UNBOUNDED FOLLOWING</> means that the frame ends with the last
-    row of the partition (regardless of <literal>RANGE</> or <literal>ROWS</>
-    mode).  In <literal>ROWS</> mode, <literal>CURRENT ROW</>
-    means that the frame starts or ends with the current row; but in
-    <literal>RANGE</> mode it means that the frame starts or ends with
-    the current row's first or last peer in the <literal>ORDER BY</> ordering.
-    The <replaceable>value</> <literal>PRECEDING</> and
-    <replaceable>value</> <literal>FOLLOWING</> cases are currently only
-    allowed in <literal>ROWS</> mode.  They indicate that the frame starts
-    or ends with the row that many rows before or after the current row.
-    <replaceable>value</replaceable> must be an integer expression not
-    containing any variables, aggregate functions, or window functions.
-    The value must not be null or negative; but it can be zero, which
-    selects the current row itself.
-   </para>
-
-   <para>
-    Beware that the <literal>ROWS</> options can produce unpredictable
-    results if the <literal>ORDER BY</> ordering does not order the rows
-    uniquely.  The <literal>RANGE</> options are designed to ensure that
-    rows that are peers in the <literal>ORDER BY</> ordering are treated
-    alike; all peer rows will be in the same frame.
+    <literal>UNBOUNDED FOLLOWING</literal> means that the frame ends with the last
+    row of the partition, regardless
+    of <literal>RANGE</literal>, <literal>ROWS</literal>
+    or <literal>GROUPS</literal> mode.
+    In <literal>ROWS</literal> mode, <literal>CURRENT ROW</literal> means
+    that the frame starts or ends with the current row; but
+    in <literal>RANGE</literal> or <literal>GROUPS</literal> mode it means
+    that the frame starts or ends with the current row's first or last peer
+    in the <literal>ORDER BY</literal> ordering.
+    The <replaceable>offset</replaceable> <literal>PRECEDING</literal> and
+    <replaceable>offset</replaceable> <literal>FOLLOWING</literal> options
+    vary in meaning depending on the frame mode.
+    In <literal>ROWS</literal> mode, the <replaceable>offset</replaceable>
+    is an integer indicating that the frame starts or ends that many rows
+    before or after the current row.
+    In <literal>GROUPS</literal> mode, the <replaceable>offset</replaceable>
+    is an integer indicating that the frame starts or ends that many peer
+    groups before or after the current row's peer group, where
+    a <firstterm>peer group</firstterm> is a group of rows that are
+    equivalent according to <literal>ORDER BY</literal>.
+    In <literal>RANGE</literal> mode, use of
+    an <replaceable>offset</replaceable> option requires that there be
+    exactly one <literal>ORDER BY</literal> column in the window definition.
+    Then the frame contains those rows whose ordering column value is no
+    more than <replaceable>offset</replaceable> less than
+    (for <literal>PRECEDING</literal>) or more than
+    (for <literal>FOLLOWING</literal>) the current row's ordering column
+    value.  In these cases the data type of
+    the <replaceable>offset</replaceable> expression depends on the data
+    type of the ordering column.  For numeric ordering columns it is
+    typically of the same type as the ordering column, but for datetime
+    ordering columns it is an <type>interval</type>.
+    In all these cases, the value of the <replaceable>offset</replaceable>
+    must be non-null and non-negative.  Also, while
+    the <replaceable>offset</replaceable> does not have to be a simple
+    constant, it cannot contain variables, aggregate functions, or window
+    functions.
+   </para>
+
+   <para>
+    The <replaceable>frame_exclusion</replaceable> option allows rows around
+    the current row to be excluded from the frame, even if they would be
+    included according to the frame start and frame end options.
+    <literal>EXCLUDE CURRENT ROW</literal> excludes the current row from the
+    frame.
+    <literal>EXCLUDE GROUP</literal> excludes the current row and its
+    ordering peers from the frame.
+    <literal>EXCLUDE TIES</literal> excludes any peers of the current
+    row from the frame, but not the current row itself.
+    <literal>EXCLUDE NO OTHERS</literal> simply specifies explicitly the
+    default behavior of not excluding the current row or its peers.
+   </para>
+
+   <para>
+    Beware that the <literal>ROWS</literal> mode can produce unpredictable
+    results if the <literal>ORDER BY</literal> ordering does not order the rows
+    uniquely.  The <literal>RANGE</literal> and <literal>GROUPS</literal>
+    modes are designed to ensure that rows that are peers in
+    the <literal>ORDER BY</literal> ordering are treated alike: all rows of
+    a given peer group will be in the frame or excluded from it.
    </para>
 
    <para>
     The purpose of a <literal>WINDOW</literal> clause is to specify the
-    behavior of <firstterm>window functions</> appearing in the query's
-    <xref linkend="sql-select-list" endterm="sql-select-list-title"> or
-    <xref linkend="sql-orderby" endterm="sql-orderby-title">.  These functions
+    behavior of <firstterm>window functions</firstterm> appearing in the query's
+    <xref linkend="sql-select-list" endterm="sql-select-list-title"/> or
+    <xref linkend="sql-orderby" endterm="sql-orderby-title"/>.  These functions
     can reference the <literal>WINDOW</literal> clause entries by name
-    in their <literal>OVER</> clauses.  A <literal>WINDOW</literal> clause
+    in their <literal>OVER</literal> clauses.  A <literal>WINDOW</literal> clause
     entry does not have to be referenced anywhere, however; if it is not
     used in the query it is simply ignored.  It is possible to use window
     functions without any <literal>WINDOW</literal> clause at all, since
     a window function call can specify its window definition directly in
-    its <literal>OVER</> clause.  However, the <literal>WINDOW</literal>
+    its <literal>OVER</literal> clause.  However, the <literal>WINDOW</literal>
     clause saves typing when the same window definition is needed for more
     than one window function.
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>,
-    <literal>FOR SHARE</> and <literal>FOR KEY SHARE</> cannot be
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal> and <literal>FOR KEY SHARE</literal> cannot be
     specified with <literal>WINDOW</literal>.
    </para>
 
    <para>
     Window functions are described in detail in
-    <xref linkend="tutorial-window">,
-    <xref linkend="syntax-window-functions">, and
-    <xref linkend="queries-window">.
+    <xref linkend="tutorial-window"/>,
+    <xref linkend="syntax-window-functions"/>, and
+    <xref linkend="queries-window"/>.
    </para>
   </refsect2>
 
@@ -952,24 +1002,24 @@ UNBOUNDED FOLLOWING
 
    <para>
     The <command>SELECT</command> list (between the key words
-    <literal>SELECT</> and <literal>FROM</>) specifies expressions
+    <literal>SELECT</literal> and <literal>FROM</literal>) specifies expressions
     that form the output rows of the <command>SELECT</command>
     statement.  The expressions can (and usually do) refer to columns
-    computed in the <literal>FROM</> clause.
+    computed in the <literal>FROM</literal> clause.
    </para>
 
    <para>
     Just as in a table, every output column of a <command>SELECT</command>
     has a name.  In a simple <command>SELECT</command> this name is just
-    used to label the column for display, but when the <command>SELECT</>
+    used to label the column for display, but when the <command>SELECT</command>
     is a sub-query of a larger query, the name is seen by the larger query
     as the column name of the virtual table produced by the sub-query.
     To specify the name to use for an output column, write
-    <literal>AS</> <replaceable class="parameter">output_name</replaceable>
+    <literal>AS</literal> <replaceable class="parameter">output_name</replaceable>
     after the column's expression.  (You can omit <literal>AS</literal>,
     but only if the desired output name does not match any
     <productname>PostgreSQL</productname> keyword (see <xref
-    linkend="sql-keywords-appendix">).  For protection against possible
+    linkend="sql-keywords-appendix"/>).  For protection against possible
     future keyword additions, it is recommended that you always either
     write <literal>AS</literal> or double-quote the output name.)
     If you do not specify a column name, a name is chosen automatically
@@ -982,8 +1032,8 @@ UNBOUNDED FOLLOWING
 
    <para>
     An output column's name can be used to refer to the column's value in
-    <literal>ORDER BY</> and <literal>GROUP BY</> clauses, but not in the
-    <literal>WHERE</> or <literal>HAVING</> clauses; there you must write
+    <literal>ORDER BY</literal> and <literal>GROUP BY</literal> clauses, but not in the
+    <literal>WHERE</literal> or <literal>HAVING</literal> clauses; there you must write
     out the expression instead.
    </para>
 
@@ -993,7 +1043,7 @@ UNBOUNDED FOLLOWING
     rows.  Also, you can write <literal><replaceable
     class="parameter">table_name</replaceable>.*</literal> as a
     shorthand for the columns coming from just that table.  In these
-    cases it is not possible to specify new names with <literal>AS</>;
+    cases it is not possible to specify new names with <literal>AS</literal>;
     the output column names will be the same as the table columns' names.
    </para>
 
@@ -1008,11 +1058,11 @@ UNBOUNDED FOLLOWING
     contains any volatile or expensive functions.  With that behavior, the
     order of function evaluations is more intuitive and there will not be
     evaluations corresponding to rows that never appear in the output.
-    <productname>PostgreSQL</> will effectively evaluate output expressions
+    <productname>PostgreSQL</productname> will effectively evaluate output expressions
     after sorting and limiting, so long as those expressions are not
     referenced in <literal>DISTINCT</literal>, <literal>ORDER BY</literal>
     or <literal>GROUP BY</literal>.  (As a counterexample, <literal>SELECT
-    f(x) FROM tab ORDER BY 1</> clearly must evaluate <function>f(x)</>
+    f(x) FROM tab ORDER BY 1</literal> clearly must evaluate <function>f(x)</function>
     before sorting.)  Output expressions that contain set-returning functions
     are effectively evaluated after sorting and before limiting, so
     that <literal>LIMIT</literal> will act to cut off the output from a
@@ -1021,7 +1071,7 @@ UNBOUNDED FOLLOWING
 
    <note>
     <para>
-     <productname>PostgreSQL</> versions before 9.6 did not provide any
+     <productname>PostgreSQL</productname> versions before 9.6 did not provide any
      guarantees about the timing of evaluation of output expressions versus
      sorting and limiting; it depended on the form of the chosen query plan.
     </para>
@@ -1032,9 +1082,9 @@ UNBOUNDED FOLLOWING
    <title id="sql-distinct-title"><literal>DISTINCT</literal> Clause</title>
 
    <para>
-    If <literal>SELECT DISTINCT</> is specified, all duplicate rows are
+    If <literal>SELECT DISTINCT</literal> is specified, all duplicate rows are
     removed from the result set (one row is kept from each group of
-    duplicates).  <literal>SELECT ALL</> specifies the opposite: all rows are
+    duplicates).  <literal>SELECT ALL</literal> specifies the opposite: all rows are
     kept; that is the default.
    </para>
 
@@ -1044,9 +1094,9 @@ UNBOUNDED FOLLOWING
     keeps only the first row of each set of rows where the given
     expressions evaluate to equal.  The <literal>DISTINCT ON</literal>
     expressions are interpreted using the same rules as for
-    <literal>ORDER BY</> (see above).  Note that the <quote>first
+    <literal>ORDER BY</literal> (see above).  Note that the <quote>first
     row</quote> of each set is unpredictable unless <literal>ORDER
-    BY</> is used to ensure that the desired row appears first.  For
+    BY</literal> is used to ensure that the desired row appears first.  For
     example:
 <programlisting>
 SELECT DISTINCT ON (location) location, time, report
@@ -1054,26 +1104,26 @@ SELECT DISTINCT ON (location) location, time, report
     ORDER BY location, time DESC;
 </programlisting>
     retrieves the most recent weather report for each location.  But
-    if we had not used <literal>ORDER BY</> to force descending order
+    if we had not used <literal>ORDER BY</literal> to force descending order
     of time values for each location, we'd have gotten a report from
     an unpredictable time for each location.
    </para>
 
    <para>
-    The <literal>DISTINCT ON</> expression(s) must match the leftmost
-    <literal>ORDER BY</> expression(s).  The <literal>ORDER BY</> clause
+    The <literal>DISTINCT ON</literal> expression(s) must match the leftmost
+    <literal>ORDER BY</literal> expression(s).  The <literal>ORDER BY</literal> clause
     will normally contain additional expression(s) that determine the
-    desired precedence of rows within each <literal>DISTINCT ON</> group.
+    desired precedence of rows within each <literal>DISTINCT ON</literal> group.
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>,
-    <literal>FOR SHARE</> and <literal>FOR KEY SHARE</> cannot be
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal> and <literal>FOR KEY SHARE</literal> cannot be
     specified with <literal>DISTINCT</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-UNION">
+  <refsect2 id="sql-union">
    <title id="sql-union-title"><literal>UNION</literal> Clause</title>
 
    <para>
@@ -1082,9 +1132,9 @@ SELECT DISTINCT ON (location) location, time, report
 <replaceable class="parameter">select_statement</replaceable> UNION [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
 </synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
-    BY</>, <literal>LIMIT</>, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</literal>,
+    BY</literal>, <literal>LIMIT</literal>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
     <literal>FOR SHARE</literal>, or <literal>FOR KEY SHARE</literal> clause.
-    (<literal>ORDER BY</> and <literal>LIMIT</> can be attached to a
+    (<literal>ORDER BY</literal> and <literal>LIMIT</literal> can be attached to a
     subexpression if it is enclosed in parentheses.  Without
     parentheses, these clauses will be taken to apply to the result of
     the <literal>UNION</literal>, not to its right-hand input
@@ -1103,30 +1153,30 @@ SELECT DISTINCT ON (location) location, time, report
    </para>
 
    <para>
-    The result of <literal>UNION</> does not contain any duplicate
-    rows unless the <literal>ALL</> option is specified.
-    <literal>ALL</> prevents elimination of duplicates.  (Therefore,
-    <literal>UNION ALL</> is usually significantly quicker than
-    <literal>UNION</>; use <literal>ALL</> when you can.)
-    <literal>DISTINCT</> can be written to explicitly specify the
+    The result of <literal>UNION</literal> does not contain any duplicate
+    rows unless the <literal>ALL</literal> option is specified.
+    <literal>ALL</literal> prevents elimination of duplicates.  (Therefore,
+    <literal>UNION ALL</literal> is usually significantly quicker than
+    <literal>UNION</literal>; use <literal>ALL</literal> when you can.)
+    <literal>DISTINCT</literal> can be written to explicitly specify the
     default behavior of eliminating duplicate rows.
    </para>
 
    <para>
-    Multiple <literal>UNION</> operators in the same
+    Multiple <literal>UNION</literal> operators in the same
     <command>SELECT</command> statement are evaluated left to right,
     unless otherwise indicated by parentheses.
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>, <literal>FOR SHARE</> and
-    <literal>FOR KEY SHARE</> cannot be
-    specified either for a <literal>UNION</> result or for any input of a
-    <literal>UNION</>.
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>, <literal>FOR SHARE</literal> and
+    <literal>FOR KEY SHARE</literal> cannot be
+    specified either for a <literal>UNION</literal> result or for any input of a
+    <literal>UNION</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-INTERSECT">
+  <refsect2 id="sql-intersect">
    <title id="sql-intersect-title"><literal>INTERSECT</literal> Clause</title>
 
    <para>
@@ -1135,8 +1185,8 @@ SELECT DISTINCT ON (location) location, time, report
 <replaceable class="parameter">select_statement</replaceable> INTERSECT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
 </synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
-    BY</>, <literal>LIMIT</>, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</literal>,
-    <literal>FOR SHARE</literal>, or <literal>FOR KEY SHARE</> clause.
+    BY</literal>, <literal>LIMIT</literal>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal>, or <literal>FOR KEY SHARE</literal> clause.
    </para>
 
    <para>
@@ -1148,11 +1198,11 @@ SELECT DISTINCT ON (location) location, time, report
 
    <para>
     The result of <literal>INTERSECT</literal> does not contain any
-    duplicate rows unless the <literal>ALL</> option is specified.
-    With <literal>ALL</>, a row that has <replaceable>m</> duplicates in the
-    left table and <replaceable>n</> duplicates in the right table will appear
-    min(<replaceable>m</>,<replaceable>n</>) times in the result set.
-    <literal>DISTINCT</> can be written to explicitly specify the
+    duplicate rows unless the <literal>ALL</literal> option is specified.
+    With <literal>ALL</literal>, a row that has <replaceable>m</replaceable> duplicates in the
+    left table and <replaceable>n</replaceable> duplicates in the right table will appear
+    min(<replaceable>m</replaceable>,<replaceable>n</replaceable>) times in the result set.
+    <literal>DISTINCT</literal> can be written to explicitly specify the
     default behavior of eliminating duplicate rows.
    </para>
 
@@ -1167,14 +1217,14 @@ SELECT DISTINCT ON (location) location, time, report
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>, <literal>FOR SHARE</> and
-    <literal>FOR KEY SHARE</> cannot be
-    specified either for an <literal>INTERSECT</> result or for any input of
-    an <literal>INTERSECT</>.
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>, <literal>FOR SHARE</literal> and
+    <literal>FOR KEY SHARE</literal> cannot be
+    specified either for an <literal>INTERSECT</literal> result or for any input of
+    an <literal>INTERSECT</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-EXCEPT">
+  <refsect2 id="sql-except">
    <title id="sql-except-title"><literal>EXCEPT</literal> Clause</title>
 
    <para>
@@ -1183,8 +1233,8 @@ SELECT DISTINCT ON (location) location, time, report
 <replaceable class="parameter">select_statement</replaceable> EXCEPT [ ALL | DISTINCT ] <replaceable class="parameter">select_statement</replaceable>
 </synopsis><replaceable class="parameter">select_statement</replaceable> is
     any <command>SELECT</command> statement without an <literal>ORDER
-    BY</>, <literal>LIMIT</>, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</literal>,
-    <literal>FOR SHARE</literal>, or <literal>FOR KEY SHARE</> clause.
+    BY</literal>, <literal>LIMIT</literal>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>,
+    <literal>FOR SHARE</literal>, or <literal>FOR KEY SHARE</literal> clause.
    </para>
 
    <para>
@@ -1195,30 +1245,30 @@ SELECT DISTINCT ON (location) location, time, report
 
    <para>
     The result of <literal>EXCEPT</literal> does not contain any
-    duplicate rows unless the <literal>ALL</> option is specified.
-    With <literal>ALL</>, a row that has <replaceable>m</> duplicates in the
-    left table and <replaceable>n</> duplicates in the right table will appear
-    max(<replaceable>m</>-<replaceable>n</>,0) times in the result set.
-    <literal>DISTINCT</> can be written to explicitly specify the
+    duplicate rows unless the <literal>ALL</literal> option is specified.
+    With <literal>ALL</literal>, a row that has <replaceable>m</replaceable> duplicates in the
+    left table and <replaceable>n</replaceable> duplicates in the right table will appear
+    max(<replaceable>m</replaceable>-<replaceable>n</replaceable>,0) times in the result set.
+    <literal>DISTINCT</literal> can be written to explicitly specify the
     default behavior of eliminating duplicate rows.
    </para>
 
    <para>
     Multiple <literal>EXCEPT</literal> operators in the same
     <command>SELECT</command> statement are evaluated left to right,
-    unless parentheses dictate otherwise.  <literal>EXCEPT</> binds at
-    the same level as <literal>UNION</>.
+    unless parentheses dictate otherwise.  <literal>EXCEPT</literal> binds at
+    the same level as <literal>UNION</literal>.
    </para>
 
    <para>
-    Currently, <literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>, <literal>FOR SHARE</> and
-    <literal>FOR KEY SHARE</> cannot be
-    specified either for an <literal>EXCEPT</> result or for any input of
-    an <literal>EXCEPT</>.
+    Currently, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>, <literal>FOR SHARE</literal> and
+    <literal>FOR KEY SHARE</literal> cannot be
+    specified either for an <literal>EXCEPT</literal> result or for any input of
+    an <literal>EXCEPT</literal>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-ORDERBY">
+  <refsect2 id="sql-orderby">
    <title id="sql-orderby-title"><literal>ORDER BY</literal> Clause</title>
 
    <para>
@@ -1247,7 +1297,7 @@ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC |
     ordering on the basis of a column that does not have a unique
     name.  This is never absolutely necessary because it is always
     possible to assign a name to an output column using the
-    <literal>AS</> clause.
+    <literal>AS</literal> clause.
    </para>
 
    <para>
@@ -1258,65 +1308,65 @@ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC |
 <programlisting>
 SELECT name FROM distributors ORDER BY code;
 </programlisting>
-    A limitation of this feature is that an <literal>ORDER BY</>
-    clause applying to the result of a <literal>UNION</>,
-    <literal>INTERSECT</>, or <literal>EXCEPT</> clause can only
+    A limitation of this feature is that an <literal>ORDER BY</literal>
+    clause applying to the result of a <literal>UNION</literal>,
+    <literal>INTERSECT</literal>, or <literal>EXCEPT</literal> clause can only
     specify an output column name or number, not an expression.
    </para>
 
    <para>
-    If an <literal>ORDER BY</> expression is a simple name that
+    If an <literal>ORDER BY</literal> expression is a simple name that
     matches both an output column name and an input column name,
-    <literal>ORDER BY</> will interpret it as the output column name.
-    This is the opposite of the choice that <literal>GROUP BY</> will
+    <literal>ORDER BY</literal> will interpret it as the output column name.
+    This is the opposite of the choice that <literal>GROUP BY</literal> will
     make in the same situation.  This inconsistency is made to be
     compatible with the SQL standard.
    </para>
 
    <para>
-    Optionally one can add the key word <literal>ASC</> (ascending) or
-    <literal>DESC</> (descending) after any expression in the
-    <literal>ORDER BY</> clause.  If not specified, <literal>ASC</> is
+    Optionally one can add the key word <literal>ASC</literal> (ascending) or
+    <literal>DESC</literal> (descending) after any expression in the
+    <literal>ORDER BY</literal> clause.  If not specified, <literal>ASC</literal> is
     assumed by default.  Alternatively, a specific ordering operator
-    name can be specified in the <literal>USING</> clause.
+    name can be specified in the <literal>USING</literal> clause.
     An ordering operator must be a less-than or greater-than
     member of some B-tree operator family.
-    <literal>ASC</> is usually equivalent to <literal>USING &lt;</> and
-    <literal>DESC</> is usually equivalent to <literal>USING &gt;</>.
+    <literal>ASC</literal> is usually equivalent to <literal>USING &lt;</literal> and
+    <literal>DESC</literal> is usually equivalent to <literal>USING &gt;</literal>.
     (But the creator of a user-defined data type can define exactly what the
     default sort ordering is, and it might correspond to operators with other
     names.)
    </para>
 
    <para>
-    If <literal>NULLS LAST</> is specified, null values sort after all
-    non-null values; if <literal>NULLS FIRST</> is specified, null values
+    If <literal>NULLS LAST</literal> is specified, null values sort after all
+    non-null values; if <literal>NULLS FIRST</literal> is specified, null values
     sort before all non-null values.  If neither is specified, the default
-    behavior is <literal>NULLS LAST</> when <literal>ASC</> is specified
-    or implied, and <literal>NULLS FIRST</> when <literal>DESC</> is specified
+    behavior is <literal>NULLS LAST</literal> when <literal>ASC</literal> is specified
+    or implied, and <literal>NULLS FIRST</literal> when <literal>DESC</literal> is specified
     (thus, the default is to act as though nulls are larger than non-nulls).
-    When <literal>USING</> is specified, the default nulls ordering depends
+    When <literal>USING</literal> is specified, the default nulls ordering depends
     on whether the operator is a less-than or greater-than operator.
    </para>
 
    <para>
     Note that ordering options apply only to the expression they follow;
-    for example <literal>ORDER BY x, y DESC</> does not mean
-    the same thing as <literal>ORDER BY x DESC, y DESC</>.
+    for example <literal>ORDER BY x, y DESC</literal> does not mean
+    the same thing as <literal>ORDER BY x DESC, y DESC</literal>.
    </para>
 
    <para>
     Character-string data is sorted according to the collation that applies
     to the column being sorted.  That can be overridden at need by including
-    a <literal>COLLATE</> clause in the
+    a <literal>COLLATE</literal> clause in the
     <replaceable class="parameter">expression</replaceable>, for example
-    <literal>ORDER BY mycolumn COLLATE "en_US"</>.
-    For more information see <xref linkend="sql-syntax-collate-exprs"> and
-    <xref linkend="collation">.
+    <literal>ORDER BY mycolumn COLLATE "en_US"</literal>.
+    For more information see <xref linkend="sql-syntax-collate-exprs"/> and
+    <xref linkend="collation"/>.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-LIMIT">
+  <refsect2 id="sql-limit">
    <title id="sql-limit-title"><literal>LIMIT</literal> Clause</title>
 
    <para>
@@ -1337,72 +1387,72 @@ OFFSET <replaceable class="parameter">start</replaceable>
 
    <para>
     If the <replaceable class="parameter">count</replaceable> expression
-    evaluates to NULL, it is treated as <literal>LIMIT ALL</>, i.e., no
+    evaluates to NULL, it is treated as <literal>LIMIT ALL</literal>, i.e., no
     limit.  If <replaceable class="parameter">start</replaceable> evaluates
-    to NULL, it is treated the same as <literal>OFFSET 0</>.
+    to NULL, it is treated the same as <literal>OFFSET 0</literal>.
    </para>
 
    <para>
     SQL:2008 introduced a different syntax to achieve the same result,
-    which <productname>PostgreSQL</> also supports.  It is:
+    which <productname>PostgreSQL</productname> also supports.  It is:
 <synopsis>
 OFFSET <replaceable class="parameter">start</replaceable> { ROW | ROWS }
 FETCH { FIRST | NEXT } [ <replaceable class="parameter">count</replaceable> ] { ROW | ROWS } ONLY
 </synopsis>
     In this syntax, to write anything except a simple integer constant for
-    <replaceable class="parameter">start</> or <replaceable
+    <replaceable class="parameter">start</replaceable> or <replaceable
     class="parameter">count</replaceable>, you must write parentheses
     around it.
-    If <replaceable class="parameter">count</> is
-    omitted in a <literal>FETCH</> clause, it defaults to 1.
+    If <replaceable class="parameter">count</replaceable> is
+    omitted in a <literal>FETCH</literal> clause, it defaults to 1.
     <literal>ROW</literal>
     and <literal>ROWS</literal> as well as <literal>FIRST</literal>
     and <literal>NEXT</literal> are noise words that don't influence
     the effects of these clauses.
     According to the standard, the <literal>OFFSET</literal> clause must come
     before the <literal>FETCH</literal> clause if both are present; but
-    <productname>PostgreSQL</> is laxer and allows either order.
+    <productname>PostgreSQL</productname> is laxer and allows either order.
    </para>
 
    <para>
-    When using <literal>LIMIT</>, it is a good idea to use an
-    <literal>ORDER BY</> clause that constrains the result rows into a
+    When using <literal>LIMIT</literal>, it is a good idea to use an
+    <literal>ORDER BY</literal> clause that constrains the result rows into a
     unique order.  Otherwise you will get an unpredictable subset of
     the query's rows &mdash; you might be asking for the tenth through
     twentieth rows, but tenth through twentieth in what ordering?  You
-    don't know what ordering unless you specify <literal>ORDER BY</>.
+    don't know what ordering unless you specify <literal>ORDER BY</literal>.
    </para>
 
    <para>
-    The query planner takes <literal>LIMIT</> into account when
+    The query planner takes <literal>LIMIT</literal> into account when
     generating a query plan, so you are very likely to get different
     plans (yielding different row orders) depending on what you use
-    for <literal>LIMIT</> and <literal>OFFSET</>.  Thus, using
-    different <literal>LIMIT</>/<literal>OFFSET</> values to select
+    for <literal>LIMIT</literal> and <literal>OFFSET</literal>.  Thus, using
+    different <literal>LIMIT</literal>/<literal>OFFSET</literal> values to select
     different subsets of a query result <emphasis>will give
     inconsistent results</emphasis> unless you enforce a predictable
-    result ordering with <literal>ORDER BY</>.  This is not a bug; it
+    result ordering with <literal>ORDER BY</literal>.  This is not a bug; it
     is an inherent consequence of the fact that SQL does not promise
     to deliver the results of a query in any particular order unless
-    <literal>ORDER BY</> is used to constrain the order.
+    <literal>ORDER BY</literal> is used to constrain the order.
    </para>
 
    <para>
-    It is even possible for repeated executions of the same <literal>LIMIT</>
+    It is even possible for repeated executions of the same <literal>LIMIT</literal>
     query to return different subsets of the rows of a table, if there
-    is not an <literal>ORDER BY</> to enforce selection of a deterministic
+    is not an <literal>ORDER BY</literal> to enforce selection of a deterministic
     subset.  Again, this is not a bug; determinism of the results is
     simply not guaranteed in such a case.
    </para>
   </refsect2>
 
-  <refsect2 id="SQL-FOR-UPDATE-SHARE">
+  <refsect2 id="sql-for-update-share">
    <title id="sql-for-update-share-title">The Locking Clause</title>
 
    <para>
-    <literal>FOR UPDATE</>, <literal>FOR NO KEY UPDATE</>, <literal>FOR SHARE</>
-    and <literal>FOR KEY SHARE</>
-    are <firstterm>locking clauses</>; they affect how <literal>SELECT</>
+    <literal>FOR UPDATE</literal>, <literal>FOR NO KEY UPDATE</literal>, <literal>FOR SHARE</literal>
+    and <literal>FOR KEY SHARE</literal>
+    are <firstterm>locking clauses</firstterm>; they affect how <literal>SELECT</literal>
     locks rows as they are obtained from the table.
    </para>
 
@@ -1410,10 +1460,10 @@ FETCH { FIRST | NEXT } [ <replaceable class="parameter">count</replaceable> ] {
     The locking clause has the general form
 
 <synopsis>
-FOR <replaceable>lock_strength</> [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ] [ NOWAIT | SKIP LOCKED ]
+FOR <replaceable>lock_strength</replaceable> [ OF <replaceable class="parameter">table_name</replaceable> [, ...] ] [ NOWAIT | SKIP LOCKED ]
 </synopsis>
 
-    where <replaceable>lock_strength</> can be one of
+    where <replaceable>lock_strength</replaceable> can be one of
 
 <synopsis>
 UPDATE
@@ -1425,25 +1475,25 @@ KEY SHARE
 
    <para>
     For more information on each row-level lock mode, refer to
-    <xref linkend="locking-rows">.
+    <xref linkend="locking-rows"/>.
    </para>
 
    <para>
     To prevent the operation from waiting for other transactions to commit,
-    use either the <literal>NOWAIT</> or <literal>SKIP LOCKED</literal>
-    option.  With <literal>NOWAIT</>, the statement reports an error, rather
+    use either the <literal>NOWAIT</literal> or <literal>SKIP LOCKED</literal>
+    option.  With <literal>NOWAIT</literal>, the statement reports an error, rather
     than waiting, if a selected row cannot be locked immediately.
     With <literal>SKIP LOCKED</literal>, any selected rows that cannot be
     immediately locked are skipped.  Skipping locked rows provides an
     inconsistent view of the data, so this is not suitable for general purpose
     work, but can be used to avoid lock contention with multiple consumers
     accessing a queue-like table.
-    Note that <literal>NOWAIT</> and <literal>SKIP LOCKED</literal> apply only
+    Note that <literal>NOWAIT</literal> and <literal>SKIP LOCKED</literal> apply only
     to the row-level lock(s) &mdash; the required <literal>ROW SHARE</literal>
     table-level lock is still taken in the ordinary way (see
-    <xref linkend="mvcc">).  You can use
-    <xref linkend="sql-lock">
-    with the <literal>NOWAIT</> option first,
+    <xref linkend="mvcc"/>).  You can use
+    <xref linkend="sql-lock"/>
+    with the <literal>NOWAIT</literal> option first,
     if you need to acquire the table-level lock without waiting.
    </para>
 
@@ -1457,9 +1507,9 @@ KEY SHARE
     applied to a view or sub-query, it affects all tables used in
     the view or sub-query.
     However, these clauses
-    do not apply to <literal>WITH</> queries referenced by the primary query.
-    If you want row locking to occur within a <literal>WITH</> query, specify
-    a locking clause within the <literal>WITH</> query.
+    do not apply to <literal>WITH</literal> queries referenced by the primary query.
+    If you want row locking to occur within a <literal>WITH</literal> query, specify
+    a locking clause within the <literal>WITH</literal> query.
    </para>
 
    <para>
@@ -1469,7 +1519,7 @@ KEY SHARE
     implicitly affected) by more than one locking clause,
     then it is processed as if it was only specified by the strongest one.
     Similarly, a table is processed
-    as <literal>NOWAIT</> if that is specified in any of the clauses
+    as <literal>NOWAIT</literal> if that is specified in any of the clauses
     affecting it.  Otherwise, it is processed
     as <literal>SKIP LOCKED</literal> if that is specified in any of the
     clauses affecting it.
@@ -1483,16 +1533,16 @@ KEY SHARE
 
    <para>
     When a locking clause
-    appears at the top level of a <command>SELECT</> query, the rows that
+    appears at the top level of a <command>SELECT</command> query, the rows that
     are locked are exactly those that are returned by the query; in the
     case of a join query, the rows locked are those that contribute to
     returned join rows.  In addition, rows that satisfied the query
     conditions as of the query snapshot will be locked, although they
     will not be returned if they were updated after the snapshot
     and no longer satisfy the query conditions.  If a
-    <literal>LIMIT</> is used, locking stops
+    <literal>LIMIT</literal> is used, locking stops
     once enough rows have been returned to satisfy the limit (but note that
-    rows skipped over by <literal>OFFSET</> will get locked).  Similarly,
+    rows skipped over by <literal>OFFSET</literal> will get locked).  Similarly,
     if a locking clause
     is used in a cursor's query, only rows actually fetched or stepped past
     by the cursor will be locked.
@@ -1500,7 +1550,7 @@ KEY SHARE
 
    <para>
     When a locking clause
-    appears in a sub-<command>SELECT</>, the rows locked are those
+    appears in a sub-<command>SELECT</command>, the rows locked are those
     returned to the outer query by the sub-query.  This might involve
     fewer rows than inspection of the sub-query alone would suggest,
     since conditions from the outer query might be used to optimize
@@ -1508,7 +1558,7 @@ KEY SHARE
 <programlisting>
 SELECT * FROM (SELECT * FROM mytable FOR UPDATE) ss WHERE col1 = 5;
 </programlisting>
-    will lock only rows having <literal>col1 = 5</>, even though that
+    will lock only rows having <literal>col1 = 5</literal>, even though that
     condition is not textually within the sub-query.
    </para>
 
@@ -1522,18 +1572,18 @@ SAVEPOINT s;
 UPDATE mytable SET ... WHERE key = 1;
 ROLLBACK TO s;
 </programlisting>
-   would fail to preserve the <literal>FOR UPDATE</> lock after the
-   <command>ROLLBACK TO</>.  This has been fixed in release 9.3.
+   would fail to preserve the <literal>FOR UPDATE</literal> lock after the
+   <command>ROLLBACK TO</command>.  This has been fixed in release 9.3.
   </para>
 
   <caution>
    <para>
-    It is possible for a <command>SELECT</> command running at the <literal>READ
+    It is possible for a <command>SELECT</command> command running at the <literal>READ
     COMMITTED</literal> transaction isolation level and using <literal>ORDER
     BY</literal> and a locking clause to return rows out of
-    order.  This is because <literal>ORDER BY</> is applied first.
+    order.  This is because <literal>ORDER BY</literal> is applied first.
     The command sorts the result, but might then block trying to obtain a lock
-    on one or more of the rows.  Once the <literal>SELECT</> unblocks, some
+    on one or more of the rows.  Once the <literal>SELECT</literal> unblocks, some
     of the ordering column values might have been modified, leading to those
     rows appearing to be out of order (though they are in order in terms
     of the original column values).  This can be worked around at need by
@@ -1542,11 +1592,11 @@ ROLLBACK TO s;
 <programlisting>
 SELECT * FROM (SELECT * FROM mytable FOR UPDATE) ss ORDER BY column1;
 </programlisting>
-    Note that this will result in locking all rows of <structname>mytable</>,
-    whereas <literal>FOR UPDATE</> at the top level would lock only the
+    Note that this will result in locking all rows of <structname>mytable</structname>,
+    whereas <literal>FOR UPDATE</literal> at the top level would lock only the
     actually returned rows.  This can make for a significant performance
-    difference, particularly if the <literal>ORDER BY</> is combined with
-    <literal>LIMIT</> or other restrictions.  So this technique is recommended
+    difference, particularly if the <literal>ORDER BY</literal> is combined with
+    <literal>LIMIT</literal> or other restrictions.  So this technique is recommended
     only if concurrent updates of the ordering columns are expected and a
     strictly sorted result is required.
    </para>
@@ -1560,7 +1610,7 @@ SELECT * FROM (SELECT * FROM mytable FOR UPDATE) ss ORDER BY column1;
   </caution>
   </refsect2>
 
-  <refsect2 id="SQL-TABLE">
+  <refsect2 id="sql-table">
    <title><literal>TABLE</literal> Command</title>
 
    <para>
@@ -1573,11 +1623,11 @@ TABLE <replaceable class="parameter">name</replaceable>
 SELECT * FROM <replaceable class="parameter">name</replaceable>
 </programlisting>
     It can be used as a top-level command or as a space-saving syntax
-    variant in parts of complex queries. Only the <literal>WITH</>,
-    <literal>UNION</>, <literal>INTERSECT</>, <literal>EXCEPT</>,
-    <literal>ORDER BY</>, <literal>LIMIT</>, <literal>OFFSET</>,
-    <literal>FETCH</> and <literal>FOR</> locking clauses can be used
-    with <command>TABLE</>; the <literal>WHERE</> clause and any form of
+    variant in parts of complex queries. Only the <literal>WITH</literal>,
+    <literal>UNION</literal>, <literal>INTERSECT</literal>, <literal>EXCEPT</literal>,
+    <literal>ORDER BY</literal>, <literal>LIMIT</literal>, <literal>OFFSET</literal>,
+    <literal>FETCH</literal> and <literal>FOR</literal> locking clauses can be used
+    with <command>TABLE</command>; the <literal>WHERE</literal> clause and any form of
     aggregation cannot
     be used.
    </para>
@@ -1702,7 +1752,7 @@ SELECT actors.name
   </para>
 
   <para>
-   This example shows how to use a function in the <literal>FROM</>
+   This example shows how to use a function in the <literal>FROM</literal>
    clause, both with and without a column definition list:
 
 <programlisting>
@@ -1744,7 +1794,7 @@ SELECT * FROM unnest(ARRAY['a','b','c','d','e','f']) WITH ORDINALITY;
   </para>
 
   <para>
-   This example shows how to use a simple <literal>WITH</> clause:
+   This example shows how to use a simple <literal>WITH</literal> clause:
 
 <programlisting>
 WITH t AS (
@@ -1764,7 +1814,7 @@ SELECT * FROM t
  0.0735620250925422
 </programlisting>
 
-   Notice that the <literal>WITH</> query was evaluated only once,
+   Notice that the <literal>WITH</literal> query was evaluated only once,
    so that we got two sets of the same three random values.
   </para>
 
@@ -1791,14 +1841,14 @@ SELECT distance, employee_name FROM employee_recursive;
    an initial condition, followed by <literal>UNION</literal>,
    followed by the recursive part of the query. Be sure that the
    recursive part of the query will eventually return no tuples, or
-   else the query will loop indefinitely.  (See <xref linkend="queries-with">
+   else the query will loop indefinitely.  (See <xref linkend="queries-with"/>
    for more examples.)
   </para>
 
   <para>
-   This example uses <literal>LATERAL</> to apply a set-returning function
-   <function>get_product_names()</> for each row of the
-   <structname>manufacturers</> table:
+   This example uses <literal>LATERAL</literal> to apply a set-returning function
+   <function>get_product_names()</function> for each row of the
+   <structname>manufacturers</structname> table:
 
 <programlisting>
 SELECT m.name AS mname, pname
@@ -1866,7 +1916,7 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
     This is not valid syntax according to the SQL standard.
     <productname>PostgreSQL</productname> allows it to be consistent with
     allowing zero-column tables.
-    However, an empty list is not allowed when <literal>DISTINCT</> is used.
+    However, an empty list is not allowed when <literal>DISTINCT</literal> is used.
    </para>
   </refsect2>
 
@@ -1874,19 +1924,19 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    <title>Omitting the <literal>AS</literal> Key Word</title>
 
    <para>
-    In the SQL standard, the optional key word <literal>AS</> can be
+    In the SQL standard, the optional key word <literal>AS</literal> can be
     omitted before an output column name whenever the new column name
     is a valid column name (that is, not the same as any reserved
     keyword).  <productname>PostgreSQL</productname> is slightly more
-    restrictive: <literal>AS</> is required if the new column name
+    restrictive: <literal>AS</literal> is required if the new column name
     matches any keyword at all, reserved or not.  Recommended practice is
-    to use <literal>AS</> or double-quote output column names, to prevent
+    to use <literal>AS</literal> or double-quote output column names, to prevent
     any possible conflict against future keyword additions.
    </para>
 
    <para>
     In <literal>FROM</literal> items, both the standard and
-    <productname>PostgreSQL</productname> allow <literal>AS</> to
+    <productname>PostgreSQL</productname> allow <literal>AS</literal> to
     be omitted before an alias that is an unreserved keyword.  But
     this is impractical for output column names, because of syntactic
     ambiguities.
@@ -1899,12 +1949,12 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    <para>
     The SQL standard requires parentheses around the table name when
     writing <literal>ONLY</literal>, for example <literal>SELECT * FROM ONLY
-    (tab1), ONLY (tab2) WHERE ...</literal>.  <productname>PostgreSQL</>
+    (tab1), ONLY (tab2) WHERE ...</literal>.  <productname>PostgreSQL</productname>
     considers these parentheses to be optional.
    </para>
 
    <para>
-    <productname>PostgreSQL</> allows a trailing <literal>*</> to be written to
+    <productname>PostgreSQL</productname> allows a trailing <literal>*</literal> to be written to
     explicitly specify the non-<literal>ONLY</literal> behavior of including
     child tables.  The standard does not allow this.
    </para>
@@ -1919,9 +1969,9 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    <title><literal>TABLESAMPLE</literal> Clause Restrictions</title>
 
    <para>
-    The <literal>TABLESAMPLE</> clause is currently accepted only on
+    The <literal>TABLESAMPLE</literal> clause is currently accepted only on
     regular tables and materialized views.  According to the SQL standard
-    it should be possible to apply it to any <literal>FROM</> item.
+    it should be possible to apply it to any <literal>FROM</literal> item.
    </para>
   </refsect2>
 
@@ -1930,16 +1980,16 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
 
    <para>
     <productname>PostgreSQL</productname> allows a function call to be
-    written directly as a member of the <literal>FROM</> list.  In the SQL
+    written directly as a member of the <literal>FROM</literal> list.  In the SQL
     standard it would be necessary to wrap such a function call in a
     sub-<command>SELECT</command>; that is, the syntax
-    <literal>FROM <replaceable>func</>(...) <replaceable>alias</></literal>
+    <literal>FROM <replaceable>func</replaceable>(...) <replaceable>alias</replaceable></literal>
     is approximately equivalent to
-    <literal>FROM LATERAL (SELECT <replaceable>func</>(...)) <replaceable>alias</></literal>.
-    Note that <literal>LATERAL</> is considered to be implicit; this is
-    because the standard requires <literal>LATERAL</> semantics for an
-    <literal>UNNEST()</> item in <literal>FROM</>.
-    <productname>PostgreSQL</productname> treats <literal>UNNEST()</> the
+    <literal>FROM LATERAL (SELECT <replaceable>func</replaceable>(...)) <replaceable>alias</replaceable></literal>.
+    Note that <literal>LATERAL</literal> is considered to be implicit; this is
+    because the standard requires <literal>LATERAL</literal> semantics for an
+    <literal>UNNEST()</literal> item in <literal>FROM</literal>.
+    <productname>PostgreSQL</productname> treats <literal>UNNEST()</literal> the
     same as other set-returning functions.
    </para>
   </refsect2>
@@ -1974,24 +2024,13 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
 
    <para>
     <productname>PostgreSQL</productname> recognizes functional dependency
-    (allowing columns to be omitted from <literal>GROUP BY</>) only when
-    a table's primary key is included in the <literal>GROUP BY</> list.
+    (allowing columns to be omitted from <literal>GROUP BY</literal>) only when
+    a table's primary key is included in the <literal>GROUP BY</literal> list.
     The SQL standard specifies additional conditions that should be
     recognized.
    </para>
   </refsect2>
 
-  <refsect2>
-   <title><literal>WINDOW</literal> Clause Restrictions</title>
-
-   <para>
-    The SQL standard provides additional options for the window
-    <replaceable class="parameter">frame_clause</>.
-    <productname>PostgreSQL</productname> currently supports only the
-    options listed above.
-   </para>
-  </refsect2>
-
   <refsect2>
    <title><literal>LIMIT</literal> and <literal>OFFSET</literal></title>
 
@@ -2001,7 +2040,7 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
     used by <productname>MySQL</productname>.  The SQL:2008 standard
     has introduced the clauses <literal>OFFSET ... FETCH {FIRST|NEXT}
     ...</literal> for the same functionality, as shown above
-    in <xref linkend="sql-limit" endterm="sql-limit-title">.  This
+    in <xref linkend="sql-limit" endterm="sql-limit-title"/>.  This
     syntax is also used by <productname>IBM DB2</productname>.
     (Applications written for <productname>Oracle</productname>
     frequently use a workaround involving the automatically
@@ -2011,26 +2050,26 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
   </refsect2>
 
   <refsect2>
-   <title><literal>FOR NO KEY UPDATE</>, <literal>FOR UPDATE</>, <literal>FOR SHARE</>, <literal>FOR KEY SHARE</></title>
+   <title><literal>FOR NO KEY UPDATE</literal>, <literal>FOR UPDATE</literal>, <literal>FOR SHARE</literal>, <literal>FOR KEY SHARE</literal></title>
 
    <para>
-    Although <literal>FOR UPDATE</> appears in the SQL standard, the
-    standard allows it only as an option of <command>DECLARE CURSOR</>.
-    <productname>PostgreSQL</productname> allows it in any <command>SELECT</>
-    query as well as in sub-<command>SELECT</>s, but this is an extension.
-    The <literal>FOR NO KEY UPDATE</>, <literal>FOR SHARE</> and
-    <literal>FOR KEY SHARE</> variants, as well as the <literal>NOWAIT</>
+    Although <literal>FOR UPDATE</literal> appears in the SQL standard, the
+    standard allows it only as an option of <command>DECLARE CURSOR</command>.
+    <productname>PostgreSQL</productname> allows it in any <command>SELECT</command>
+    query as well as in sub-<command>SELECT</command>s, but this is an extension.
+    The <literal>FOR NO KEY UPDATE</literal>, <literal>FOR SHARE</literal> and
+    <literal>FOR KEY SHARE</literal> variants, as well as the <literal>NOWAIT</literal>
     and <literal>SKIP LOCKED</literal> options, do not appear in the
     standard.
    </para>
   </refsect2>
 
   <refsect2>
-   <title>Data-Modifying Statements in <literal>WITH</></title>
+   <title>Data-Modifying Statements in <literal>WITH</literal></title>
 
    <para>
-    <productname>PostgreSQL</productname> allows <command>INSERT</>,
-    <command>UPDATE</>, and <command>DELETE</> to be used as <literal>WITH</>
+    <productname>PostgreSQL</productname> allows <command>INSERT</command>,
+    <command>UPDATE</command>, and <command>DELETE</command> to be used as <literal>WITH</literal>
     queries.  This is not found in the SQL standard.
    </para>
   </refsect2>
@@ -2044,7 +2083,7 @@ SELECT distributors.* WHERE distributors.name = 'Westward';
    </para>
 
    <para>
-    <literal>ROWS FROM( ... )</> is an extension of the SQL standard.
+    <literal>ROWS FROM( ... )</literal> is an extension of the SQL standard.
    </para>
   </refsect2>
 
diff --git a/doc/src/sgml/ref/select_into.sgml b/doc/src/sgml/ref/select_into.sgml
index 84b0dd831f..6c1a25f5ed 100644
--- a/doc/src/sgml/ref/select_into.sgml
+++ b/doc/src/sgml/ref/select_into.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/select_into.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SELECTINTO">
+<refentry id="sql-selectinto">
  <indexterm zone="sql-selectinto">
   <primary>SELECT INTO</primary>
  </indexterm>
@@ -60,7 +60,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
    <listitem>
     <para>
      If specified, the table is created as a temporary table.  Refer
-     to <xref linkend="sql-createtable"> for details.
+     to <xref linkend="sql-createtable"/> for details.
     </para>
    </listitem>
   </varlistentry>
@@ -70,13 +70,13 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
    <listitem>
     <para>
      If specified, the table is created as an unlogged table.  Refer
-     to <xref linkend="sql-createtable"> for details.
+     to <xref linkend="sql-createtable"/> for details.
     </para>
    </listitem>
   </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">new_table</replaceable></term>
+    <term><replaceable class="parameter">new_table</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to be created.
@@ -87,7 +87,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
 
   <para>
    All other parameters are described in detail under <xref
-   linkend="sql-select">.
+   linkend="sql-select"/>.
   </para>
  </refsect1>
 
@@ -95,7 +95,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
   <title>Notes</title>
 
   <para>
-   <xref linkend="sql-createtableas"> is functionally similar to
+   <xref linkend="sql-createtableas"/> is functionally similar to
    <command>SELECT INTO</command>.  <command>CREATE TABLE AS</command>
    is the recommended syntax, since this form of <command>SELECT
    INTO</command> is not available in <application>ECPG</application>
@@ -107,7 +107,7 @@ SELECT [ ALL | DISTINCT [ ON ( <replaceable class="parameter">expression</replac
 
   <para>
    To add OIDs to the table created by <command>SELECT INTO</command>,
-   enable the <xref linkend="guc-default-with-oids"> configuration
+   enable the <xref linkend="guc-default-with-oids"/> configuration
    variable.  Alternatively, <command>CREATE TABLE AS</command> can be
    used with the <literal>WITH OIDS</literal> clause.
   </para>
@@ -132,8 +132,8 @@ SELECT * INTO films_recent FROM films WHERE date_prod &gt;= '2002-01-01';
    The SQL standard uses <command>SELECT INTO</command> to
    represent selecting values into scalar variables of a host program,
    rather than creating a new table.  This indeed is the usage found
-   in <application>ECPG</application> (see <xref linkend="ecpg">) and
-   <application>PL/pgSQL</application> (see <xref linkend="plpgsql">).
+   in <application>ECPG</application> (see <xref linkend="ecpg"/>) and
+   <application>PL/pgSQL</application> (see <xref linkend="plpgsql"/>).
    The <productname>PostgreSQL</productname> usage of <command>SELECT
    INTO</command> to represent table creation is historical.  It is
    best to use <command>CREATE TABLE AS</command> for this purpose in
@@ -145,7 +145,7 @@ SELECT * INTO films_recent FROM films WHERE date_prod &gt;= '2002-01-01';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-createtableas"></member>
+   <member><xref linkend="sql-createtableas"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set.sgml b/doc/src/sgml/ref/set.sgml
index 4ebb6a627b..63f312e812 100644
--- a/doc/src/sgml/ref/set.sgml
+++ b/doc/src/sgml/ref/set.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/set.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SET">
+<refentry id="sql-set">
  <indexterm zone="sql-set">
   <primary>SET</primary>
  </indexterm>
@@ -21,8 +21,8 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-SET [ SESSION | LOCAL ] <replaceable class="PARAMETER">configuration_parameter</replaceable> { TO | = } { <replaceable class="PARAMETER">value</replaceable> | '<replaceable class="PARAMETER">value</replaceable>' | DEFAULT }
-SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</replaceable> | LOCAL | DEFAULT }
+SET [ SESSION | LOCAL ] <replaceable class="parameter">configuration_parameter</replaceable> { TO | = } { <replaceable class="parameter">value</replaceable> | '<replaceable class="parameter">value</replaceable>' | DEFAULT }
+SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="parameter">timezone</replaceable> | LOCAL | DEFAULT }
 </synopsis>
  </refsynopsisdiv>
 
@@ -32,7 +32,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
   <para>
    The <command>SET</command> command changes run-time configuration
    parameters.  Many of the run-time parameters listed in
-   <xref linkend="runtime-config"> can be changed on-the-fly with
+   <xref linkend="runtime-config"/> can be changed on-the-fly with
    <command>SET</command>.
    (But some require superuser privileges to change, and others cannot
    be changed after server or session start.)
@@ -66,15 +66,15 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
   <para>
    If <command>SET LOCAL</command> is used within a function that has a
-   <literal>SET</> option for the same variable (see
-   <xref linkend="sql-createfunction">),
+   <literal>SET</literal> option for the same variable (see
+   <xref linkend="sql-createfunction"/>),
    the effects of the <command>SET LOCAL</command> command disappear at
    function exit; that is, the value in effect when the function was called is
    restored anyway.  This allows <command>SET LOCAL</command> to be used for
    dynamic or repeated changes of a parameter within a function, while still
-   having the convenience of using the <literal>SET</> option to save and
-   restore the caller's value.  However, a regular <command>SET</> command
-   overrides any surrounding function's <literal>SET</> option; its effects
+   having the convenience of using the <literal>SET</literal> option to save and
+   restore the caller's value.  However, a regular <command>SET</command> command
+   overrides any surrounding function's <literal>SET</literal> option; its effects
    will persist unless rolled back.
   </para>
 
@@ -94,22 +94,22 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
   <variablelist>
    <varlistentry>
-    <term><literal>SESSION</></term>
+    <term><literal>SESSION</literal></term>
     <listitem>
      <para>
       Specifies that the command takes effect for the current session.
-      (This is the default if neither <literal>SESSION</> nor
-      <literal>LOCAL</> appears.)
+      (This is the default if neither <literal>SESSION</literal> nor
+      <literal>LOCAL</literal> appears.)
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><literal>LOCAL</></term>
+    <term><literal>LOCAL</literal></term>
     <listitem>
      <para>
       Specifies that the command takes effect for only the current
-      transaction.  After <command>COMMIT</> or <command>ROLLBACK</>,
+      transaction.  After <command>COMMIT</command> or <command>ROLLBACK</command>,
       the session-level setting takes effect again.  Issuing this
       outside of a transaction block emits a warning and otherwise has
       no effect.
@@ -118,17 +118,17 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">configuration_parameter</replaceable></term>
+    <term><replaceable class="parameter">configuration_parameter</replaceable></term>
     <listitem>
      <para>
       Name of a settable run-time parameter.  Available parameters are
-      documented in <xref linkend="runtime-config"> and below.
+      documented in <xref linkend="runtime-config"/> and below.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">value</replaceable></term>
+    <term><replaceable class="parameter">value</replaceable></term>
     <listitem>
      <para>
       New value of parameter.  Values can be specified as string
@@ -136,7 +136,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
       these, as appropriate for the particular parameter.
       <literal>DEFAULT</literal> can be written to specify
       resetting the parameter to its default value (that is, whatever
-      value it would have had if no <command>SET</> had been executed
+      value it would have had if no <command>SET</command> had been executed
       in the current session).
      </para>
     </listitem>
@@ -145,7 +145,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
 
   <para>
    Besides the configuration parameters documented in <xref
-   linkend="runtime-config">, there are a few that can only be
+   linkend="runtime-config"/>, there are a few that can only be
    adjusted using the <command>SET</command> command or that have a
    special syntax:
 
@@ -153,8 +153,8 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
     <varlistentry>
      <term><literal>SCHEMA</literal></term>
      <listitem>
-      <para><literal>SET SCHEMA '<replaceable>value</>'</> is an alias for
-       <literal>SET search_path TO <replaceable>value</></>.  Only one
+      <para><literal>SET SCHEMA '<replaceable>value</replaceable>'</literal> is an alias for
+       <literal>SET search_path TO <replaceable>value</replaceable></literal>.  Only one
        schema can be specified using this syntax.
       </para>
      </listitem>
@@ -163,8 +163,8 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
     <varlistentry>
      <term><literal>NAMES</literal></term>
      <listitem>
-      <para><literal>SET NAMES <replaceable>value</></> is an alias for
-       <literal>SET client_encoding TO <replaceable>value</></>.
+      <para><literal>SET NAMES <replaceable>value</replaceable></literal> is an alias for
+       <literal>SET client_encoding TO <replaceable>value</replaceable></literal>.
       </para>
      </listitem>
     </varlistentry>
@@ -176,7 +176,7 @@ SET [ SESSION | LOCAL ] TIME ZONE { <replaceable class="PARAMETER">timezone</rep
        Sets the internal seed for the random number generator (the
        function <function>random</function>).  Allowed values are
        floating-point numbers between -1 and 1, which are then
-       multiplied by 2<superscript>31</>-1.
+       multiplied by 2<superscript>31</superscript>-1.
       </para>
 
       <para>
@@ -191,8 +191,8 @@ SELECT setseed(<replaceable>value</replaceable>);
     <varlistentry>
      <term><literal>TIME ZONE</literal></term>
      <listitem>
-      <para><literal>SET TIME ZONE <replaceable>value</></> is an alias
-       for <literal>SET timezone TO <replaceable>value</></>.  The
+      <para><literal>SET TIME ZONE <replaceable>value</replaceable></literal> is an alias
+       for <literal>SET timezone TO <replaceable>value</replaceable></literal>.  The
        syntax <literal>SET TIME ZONE</literal> allows special syntax
        for the time zone specification.  Here are examples of valid
        values:
@@ -238,7 +238,7 @@ SELECT setseed(<replaceable>value</replaceable>);
          <listitem>
           <para>
            Set the time zone to your local time zone (that is, the
-           server's default value of <varname>timezone</>).
+           server's default value of <varname>timezone</varname>).
           </para>
          </listitem>
         </varlistentry>
@@ -248,12 +248,12 @@ SELECT setseed(<replaceable>value</replaceable>);
       <para>
        Timezone settings given as numbers or intervals are internally
        translated to POSIX timezone syntax.  For example, after
-       <literal>SET TIME ZONE -7</>, <command>SHOW TIME ZONE</> would
-       report <literal>&lt;-07&gt;+07</>.
+       <literal>SET TIME ZONE -7</literal>, <command>SHOW TIME ZONE</command> would
+       report <literal>&lt;-07&gt;+07</literal>.
       </para>
 
       <para>
-       See <xref linkend="datatype-timezones"> for more information
+       See <xref linkend="datatype-timezones"/> for more information
        about time zones.
       </para>
      </listitem>
@@ -267,10 +267,10 @@ SELECT setseed(<replaceable>value</replaceable>);
 
   <para>
    The function <function>set_config</function> provides equivalent
-   functionality; see <xref linkend="functions-admin">.
+   functionality; see <xref linkend="functions-admin"/>.
    Also, it is possible to UPDATE the
    <link linkend="view-pg-settings"><structname>pg_settings</structname></link>
-   system view to perform the equivalent of <command>SET</>.
+   system view to perform the equivalent of <command>SET</command>.
   </para>
  </refsect1>
 
@@ -286,7 +286,7 @@ SET search_path TO my_schema, public;
 
   <para>
    Set the style of date to traditional
-   <productname>POSTGRES</productname> with <quote>day before month</>
+   <productname>POSTGRES</productname> with <quote>day before month</quote>
    input convention:
 <screen>
 SET datestyle TO postgres, dmy;
@@ -323,8 +323,8 @@ SET TIME ZONE 'Europe/Rome';
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-RESET"></member>
-   <member><xref linkend="SQL-SHOW"></member>
+   <member><xref linkend="sql-reset"/></member>
+   <member><xref linkend="sql-show"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_constraints.sgml b/doc/src/sgml/ref/set_constraints.sgml
index 7c31871b0b..671332afc7 100644
--- a/doc/src/sgml/ref/set_constraints.sgml
+++ b/doc/src/sgml/ref/set_constraints.sgml
@@ -1,5 +1,5 @@
 <!-- doc/src/sgml/ref/set_constraints.sgml -->
-<refentry id="SQL-SET-CONSTRAINTS">
+<refentry id="sql-set-constraints">
  <indexterm zone="sql-set-constraints">
   <primary>SET CONSTRAINTS</primary>
  </indexterm>
@@ -67,18 +67,18 @@ SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...
   </para>
 
   <para>
-   Currently, only <literal>UNIQUE</>, <literal>PRIMARY KEY</>,
-   <literal>REFERENCES</> (foreign key), and <literal>EXCLUDE</>
+   Currently, only <literal>UNIQUE</literal>, <literal>PRIMARY KEY</literal>,
+   <literal>REFERENCES</literal> (foreign key), and <literal>EXCLUDE</literal>
    constraints are affected by this setting.
-   <literal>NOT NULL</> and <literal>CHECK</> constraints are
+   <literal>NOT NULL</literal> and <literal>CHECK</literal> constraints are
    always checked immediately when a row is inserted or modified
-   (<emphasis>not</> at the end of the statement).
+   (<emphasis>not</emphasis> at the end of the statement).
    Uniqueness and exclusion constraints that have not been declared
-   <literal>DEFERRABLE</> are also checked immediately.
+   <literal>DEFERRABLE</literal> are also checked immediately.
   </para>
 
   <para>
-   The firing of triggers that are declared as <quote>constraint triggers</>
+   The firing of triggers that are declared as <quote>constraint triggers</quote>
    is also controlled by this setting &mdash; they fire at the same time
    that the associated constraint should be checked.
   </para>
@@ -111,7 +111,7 @@ SET CONSTRAINTS { ALL | <replaceable class="parameter">name</replaceable> [, ...
    This command complies with the behavior defined in the SQL
    standard, except for the limitation that, in
    <productname>PostgreSQL</productname>, it does not apply to
-   <literal>NOT NULL</> and <literal>CHECK</> constraints.
+   <literal>NOT NULL</literal> and <literal>CHECK</literal> constraints.
    Also, <productname>PostgreSQL</productname> checks non-deferrable
    uniqueness constraints immediately, not at end of statement as the
    standard would suggest.
diff --git a/doc/src/sgml/ref/set_role.sgml b/doc/src/sgml/ref/set_role.sgml
index a97ceabcff..0ef6eb9a9c 100644
--- a/doc/src/sgml/ref/set_role.sgml
+++ b/doc/src/sgml/ref/set_role.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/set_role.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SET-ROLE">
+<refentry id="sql-set-role">
  <indexterm zone="sql-set-role">
   <primary>SET ROLE</primary>
  </indexterm>
@@ -35,7 +35,7 @@ RESET ROLE
    identifier of the current SQL session to be <replaceable
    class="parameter">role_name</replaceable>.  The role name can be
    written as either an identifier or a string literal.
-   After <command>SET ROLE</>, permissions checking for SQL commands
+   After <command>SET ROLE</command>, permissions checking for SQL commands
    is carried out as though the named role were the one that had logged
    in originally.
   </para>
@@ -47,13 +47,13 @@ RESET ROLE
   </para>
 
   <para>
-   The <literal>SESSION</> and <literal>LOCAL</> modifiers act the same
-   as for the regular <xref linkend="SQL-SET">
+   The <literal>SESSION</literal> and <literal>LOCAL</literal> modifiers act the same
+   as for the regular <xref linkend="sql-set"/>
    command.
   </para>
 
   <para>
-   The <literal>NONE</> and <literal>RESET</> forms reset the current
+   The <literal>NONE</literal> and <literal>RESET</literal> forms reset the current
    user identifier to be the current session user identifier.
    These forms can be executed by any user.
   </para>
@@ -64,41 +64,41 @@ RESET ROLE
 
   <para>
    Using this command, it is possible to either add privileges or restrict
-   one's privileges.  If the session user role has the <literal>INHERITS</>
+   one's privileges.  If the session user role has the <literal>INHERITS</literal>
    attribute, then it automatically has all the privileges of every role that
-   it could <command>SET ROLE</> to; in this case <command>SET ROLE</>
+   it could <command>SET ROLE</command> to; in this case <command>SET ROLE</command>
    effectively drops all the privileges assigned directly to the session user
    and to the other roles it is a member of, leaving only the privileges
    available to the named role.  On the other hand, if the session user role
-   has the <literal>NOINHERITS</> attribute, <command>SET ROLE</> drops the
+   has the <literal>NOINHERITS</literal> attribute, <command>SET ROLE</command> drops the
    privileges assigned directly to the session user and instead acquires the
    privileges available to the named role.
   </para>
 
   <para>
-   In particular, when a superuser chooses to <command>SET ROLE</> to a
+   In particular, when a superuser chooses to <command>SET ROLE</command> to a
    non-superuser role, they lose their superuser privileges.
   </para>
 
   <para>
-   <command>SET ROLE</> has effects comparable to
-   <xref linkend="sql-set-session-authorization">, but the privilege
+   <command>SET ROLE</command> has effects comparable to
+   <xref linkend="sql-set-session-authorization"/>, but the privilege
    checks involved are quite different.  Also,
-   <command>SET SESSION AUTHORIZATION</> determines which roles are
-   allowable for later <command>SET ROLE</> commands, whereas changing
-   roles with <command>SET ROLE</> does not change the set of roles
-   allowed to a later <command>SET ROLE</>.
+   <command>SET SESSION AUTHORIZATION</command> determines which roles are
+   allowable for later <command>SET ROLE</command> commands, whereas changing
+   roles with <command>SET ROLE</command> does not change the set of roles
+   allowed to a later <command>SET ROLE</command>.
   </para>
 
   <para>
-   <command>SET ROLE</> does not process session variables as specified by
-   the role's <xref linkend="sql-alterrole"> settings;  this only happens during
+   <command>SET ROLE</command> does not process session variables as specified by
+   the role's <xref linkend="sql-alterrole"/> settings;  this only happens during
    login.
   </para>
 
   <para>
-   <command>SET ROLE</> cannot be used within a
-   <literal>SECURITY DEFINER</> function.
+   <command>SET ROLE</command> cannot be used within a
+   <literal>SECURITY DEFINER</literal> function.
   </para>
  </refsect1>
 
@@ -127,14 +127,14 @@ SELECT SESSION_USER, CURRENT_USER;
 
   <para>
    <productname>PostgreSQL</productname>
-   allows identifier syntax (<literal>"<replaceable>rolename</>"</literal>), while
+   allows identifier syntax (<literal>"<replaceable>rolename</replaceable>"</literal>), while
    the SQL standard requires the role name to be written as a string
    literal.  SQL does not allow this command during a transaction;
    <productname>PostgreSQL</productname> does not make this
    restriction because there is no reason to.
-   The <literal>SESSION</> and <literal>LOCAL</> modifiers are a
+   The <literal>SESSION</literal> and <literal>LOCAL</literal> modifiers are a
    <productname>PostgreSQL</productname> extension, as is the
-   <literal>RESET</> syntax.
+   <literal>RESET</literal> syntax.
   </para>
  </refsect1>
 
@@ -142,7 +142,7 @@ SELECT SESSION_USER, CURRENT_USER;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-session-authorization"></member>
+   <member><xref linkend="sql-set-session-authorization"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_session_auth.sgml b/doc/src/sgml/ref/set_session_auth.sgml
index 96d279aaf9..37b9ff8b18 100644
--- a/doc/src/sgml/ref/set_session_auth.sgml
+++ b/doc/src/sgml/ref/set_session_auth.sgml
@@ -1,5 +1,5 @@
 <!-- doc/src/sgml/ref/set_session_auth.sgml -->
-<refentry id="SQL-SET-SESSION-AUTHORIZATION">
+<refentry id="sql-set-session-authorization">
  <indexterm zone="sql-set-session-authorization">
   <primary>SET SESSION AUTHORIZATION</primary>
  </indexterm>
@@ -39,9 +39,9 @@ RESET SESSION AUTHORIZATION
    The session user identifier is initially set to be the (possibly
    authenticated) user name provided by the client.  The current user
    identifier is normally equal to the session user identifier, but
-   might change temporarily in the context of <literal>SECURITY DEFINER</>
+   might change temporarily in the context of <literal>SECURITY DEFINER</literal>
    functions and similar mechanisms; it can also be changed by
-   <xref linkend="sql-set-role">.
+   <xref linkend="sql-set-role"/>.
    The current user identifier is relevant for permission checking.
   </para>
 
@@ -53,13 +53,13 @@ RESET SESSION AUTHORIZATION
   </para>
 
   <para>
-   The <literal>SESSION</> and <literal>LOCAL</> modifiers act the same
-   as for the regular <xref linkend="SQL-SET">
+   The <literal>SESSION</literal> and <literal>LOCAL</literal> modifiers act the same
+   as for the regular <xref linkend="sql-set"/>
    command.
   </para>
 
   <para>
-   The <literal>DEFAULT</> and <literal>RESET</> forms reset the session
+   The <literal>DEFAULT</literal> and <literal>RESET</literal> forms reset the session
    and current user identifiers to be the originally authenticated user
    name.  These forms can be executed by any user.
   </para>
@@ -69,8 +69,8 @@ RESET SESSION AUTHORIZATION
   <title>Notes</title>
 
   <para>
-   <command>SET SESSION AUTHORIZATION</> cannot be used within a
-   <literal>SECURITY DEFINER</> function.
+   <command>SET SESSION AUTHORIZATION</command> cannot be used within a
+   <literal>SECURITY DEFINER</literal> function.
   </para>
  </refsect1>
 
@@ -101,13 +101,13 @@ SELECT SESSION_USER, CURRENT_USER;
    The SQL standard allows some other expressions to appear in place
    of the literal <replaceable>user_name</replaceable>, but these options
    are not important in practice.  <productname>PostgreSQL</productname>
-   allows identifier syntax (<literal>"<replaceable>username</>"</literal>), which SQL
+   allows identifier syntax (<literal>"<replaceable>username</replaceable>"</literal>), which SQL
    does not.  SQL does not allow this command during a transaction;
    <productname>PostgreSQL</productname> does not make this
    restriction because there is no reason to.
-   The <literal>SESSION</> and <literal>LOCAL</> modifiers are a
+   The <literal>SESSION</literal> and <literal>LOCAL</literal> modifiers are a
    <productname>PostgreSQL</productname> extension, as is the
-   <literal>RESET</> syntax.
+   <literal>RESET</literal> syntax.
   </para>
 
   <para>
@@ -120,7 +120,7 @@ SELECT SESSION_USER, CURRENT_USER;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-set-role"></member>
+   <member><xref linkend="sql-set-role"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/set_transaction.sgml b/doc/src/sgml/ref/set_transaction.sgml
index 188d2ed92e..43b1c6c892 100644
--- a/doc/src/sgml/ref/set_transaction.sgml
+++ b/doc/src/sgml/ref/set_transaction.sgml
@@ -1,5 +1,5 @@
 <!-- doc/src/sgml/ref/set_transaction.sgml -->
-<refentry id="SQL-SET-TRANSACTION">
+<refentry id="sql-set-transaction">
  <indexterm zone="sql-set-transaction">
   <primary>SET TRANSACTION</primary>
  </indexterm>
@@ -119,7 +119,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
    <command>INSERT</command>, <command>DELETE</command>,
    <command>UPDATE</command>, <command>FETCH</command>, or
    <command>COPY</command>) of a transaction has been executed.  See
-   <xref linkend="mvcc"> for more information about transaction
+   <xref linkend="mvcc"/> for more information about transaction
    isolation and concurrency control.
   </para>
 
@@ -153,14 +153,14 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
 
   <para>
    The <literal>SET TRANSACTION SNAPSHOT</literal> command allows a new
-   transaction to run with the same <firstterm>snapshot</> as an existing
+   transaction to run with the same <firstterm>snapshot</firstterm> as an existing
    transaction.  The pre-existing transaction must have exported its snapshot
    with the <literal>pg_export_snapshot</literal> function (see <xref
-   linkend="functions-snapshot-synchronization">).  That function returns a
+   linkend="functions-snapshot-synchronization"/>).  That function returns a
    snapshot identifier, which must be given to <literal>SET TRANSACTION
    SNAPSHOT</literal> to specify which snapshot is to be imported.  The
    identifier must be written as a string literal in this command, for example
-   <literal>'000003A1-1'</>.
+   <literal>'000003A1-1'</literal>.
    <literal>SET TRANSACTION SNAPSHOT</literal> can only be executed at the
    start of a transaction, before the first query or
    data-modification statement (<command>SELECT</command>,
@@ -169,7 +169,7 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
    <command>COPY</command>) of the transaction.  Furthermore, the transaction
    must already be set to <literal>SERIALIZABLE</literal> or
    <literal>REPEATABLE READ</literal> isolation level (otherwise, the snapshot
-   would be discarded immediately, since <literal>READ COMMITTED</> mode takes
+   would be discarded immediately, since <literal>READ COMMITTED</literal> mode takes
    a new snapshot for each command).  If the importing transaction uses
    <literal>SERIALIZABLE</literal> isolation level, then the transaction that
    exported the snapshot must also use that isolation level.  Also, a
@@ -199,13 +199,13 @@ SET SESSION CHARACTERISTICS AS TRANSACTION <replaceable class="parameter">transa
 
   <para>
    The session default transaction modes can also be set by setting the
-   configuration parameters <xref linkend="guc-default-transaction-isolation">,
-   <xref linkend="guc-default-transaction-read-only">, and
-   <xref linkend="guc-default-transaction-deferrable">.
+   configuration parameters <xref linkend="guc-default-transaction-isolation"/>,
+   <xref linkend="guc-default-transaction-read-only"/>, and
+   <xref linkend="guc-default-transaction-deferrable"/>.
    (In fact <command>SET SESSION CHARACTERISTICS</command> is just a
-   verbose equivalent for setting these variables with <command>SET</>.)
+   verbose equivalent for setting these variables with <command>SET</command>.)
    This means the defaults can be set in the configuration file, via
-   <command>ALTER DATABASE</>, etc.  Consult <xref linkend="runtime-config">
+   <command>ALTER DATABASE</command>, etc.  Consult <xref linkend="runtime-config"/>
    for more information.
   </para>
  </refsect1>
@@ -237,13 +237,13 @@ SET TRANSACTION SNAPSHOT '00000003-0000001B-1';
 </programlisting></para>
  </refsect1>
 
- <refsect1 id="R1-SQL-SET-TRANSACTION-3">
+ <refsect1 id="r1-sql-set-transaction-3">
   <title>Compatibility</title>
 
   <para>
    These commands are defined in the <acronym>SQL</acronym> standard,
    except for the <literal>DEFERRABLE</literal> transaction mode
-   and the <command>SET TRANSACTION SNAPSHOT</> form, which are
+   and the <command>SET TRANSACTION SNAPSHOT</command> form, which are
    <productname>PostgreSQL</productname> extensions.
   </para>
 
diff --git a/doc/src/sgml/ref/show.sgml b/doc/src/sgml/ref/show.sgml
index 46bb239baf..945b0491b1 100644
--- a/doc/src/sgml/ref/show.sgml
+++ b/doc/src/sgml/ref/show.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/show.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-SHOW">
+<refentry id="sql-show">
  <indexterm zone="sql-show">
   <primary>SHOW</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-SHOW <replaceable class="PARAMETER">name</replaceable>
+SHOW <replaceable class="parameter">name</replaceable>
 SHOW ALL
 </synopsis>
  </refsynopsisdiv>
@@ -35,10 +35,10 @@ SHOW ALL
    <command>SET</command> statement, by editing the
    <filename>postgresql.conf</filename> configuration file, through
    the <envar>PGOPTIONS</envar> environmental variable (when using
-   <application>libpq</> or a <application>libpq</>-based
+   <application>libpq</application> or a <application>libpq</application>-based
    application), or through command-line flags when starting the
    <command>postgres</command> server.  See <xref
-   linkend="runtime-config"> for details.
+   linkend="runtime-config"/> for details.
   </para>
  </refsect1>
 
@@ -47,12 +47,12 @@ SHOW ALL
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name of a run-time parameter.  Available parameters are
-      documented in <xref linkend="runtime-config"> and on the <xref
-      linkend="SQL-SET"> reference page.  In
+      documented in <xref linkend="runtime-config"/> and on the <xref
+      linkend="sql-set"/> reference page.  In
       addition, there are a few parameters that can be shown but not
       set:
 
@@ -129,7 +129,7 @@ SHOW ALL
 
   <para>
    The function <function>current_setting</function> produces
-   equivalent output; see <xref linkend="functions-admin">.
+   equivalent output; see <xref linkend="functions-admin"/>.
    Also, the
    <link linkend="view-pg-settings"><structname>pg_settings</structname></link>
    system view produces the same information.
@@ -192,8 +192,8 @@ SHOW ALL;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="SQL-SET"></member>
-   <member><xref linkend="SQL-RESET"></member>
+   <member><xref linkend="sql-set"/></member>
+   <member><xref linkend="sql-reset"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/start_transaction.sgml b/doc/src/sgml/ref/start_transaction.sgml
index 60926f5dfe..d6cd1d4177 100644
--- a/doc/src/sgml/ref/start_transaction.sgml
+++ b/doc/src/sgml/ref/start_transaction.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/start_transaction.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-START-TRANSACTION">
+<refentry id="sql-start-transaction">
  <indexterm zone="sql-start-transaction">
   <primary>START TRANSACTION</primary>
  </indexterm>
@@ -37,8 +37,8 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <para>
    This command begins a new transaction block. If the isolation level,
    read/write mode, or deferrable mode is specified, the new transaction has those
-   characteristics, as if <xref linkend="sql-set-transaction"> was executed. This is the same
-   as the <xref linkend="sql-begin"> command.
+   characteristics, as if <xref linkend="sql-set-transaction"/> was executed. This is the same
+   as the <xref linkend="sql-begin"/> command.
   </para>
  </refsect1>
 
@@ -46,7 +46,7 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <title>Parameters</title>
 
   <para>
-   Refer to <xref linkend="sql-set-transaction"> for information on the meaning
+   Refer to <xref linkend="sql-set-transaction"/> for information on the meaning
    of the parameters to this statement.
   </para>
  </refsect1>
@@ -55,12 +55,12 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <title>Compatibility</title>
 
   <para>
-   In the standard, it is not necessary to issue <command>START TRANSACTION</>
+   In the standard, it is not necessary to issue <command>START TRANSACTION</command>
    to start a transaction block: any SQL command implicitly begins a block.
    <productname>PostgreSQL</productname>'s behavior can be seen as implicitly
    issuing a <command>COMMIT</command> after each command that does not
-   follow <command>START TRANSACTION</> (or <command>BEGIN</command>),
-   and it is therefore often called <quote>autocommit</>.
+   follow <command>START TRANSACTION</command> (or <command>BEGIN</command>),
+   and it is therefore often called <quote>autocommit</quote>.
    Other relational database systems might offer an autocommit feature
    as a convenience.
   </para>
@@ -79,7 +79,7 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   </para>
 
   <para>
-   See also the compatibility section of <xref linkend="sql-set-transaction">.
+   See also the compatibility section of <xref linkend="sql-set-transaction"/>.
   </para>
  </refsect1>
 
@@ -87,11 +87,11 @@ START TRANSACTION [ <replaceable class="parameter">transaction_mode</replaceable
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-begin"></member>
-   <member><xref linkend="sql-commit"></member>
-   <member><xref linkend="sql-rollback"></member>
-   <member><xref linkend="sql-savepoint"></member>
-   <member><xref linkend="sql-set-transaction"></member>
+   <member><xref linkend="sql-begin"/></member>
+   <member><xref linkend="sql-commit"/></member>
+   <member><xref linkend="sql-rollback"/></member>
+   <member><xref linkend="sql-savepoint"/></member>
+   <member><xref linkend="sql-set-transaction"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/truncate.sgml b/doc/src/sgml/ref/truncate.sgml
index e9c8a03a63..c1e42376ab 100644
--- a/doc/src/sgml/ref/truncate.sgml
+++ b/doc/src/sgml/ref/truncate.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/truncate.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-TRUNCATE">
+<refentry id="sql-truncate">
  <indexterm zone="sql-truncate">
   <primary>TRUNCATE</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [ * ] [, ... ]
+TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="parameter">name</replaceable> [ * ] [, ... ]
     [ RESTART IDENTITY | CONTINUE IDENTITY ] [ CASCADE | RESTRICT ]
 </synopsis>
  </refsynopsisdiv>
@@ -44,13 +44,13 @@ TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">name</replaceable></term>
+    <term><replaceable class="parameter">name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of a table to truncate.
-      If <literal>ONLY</> is specified before the table name, only that table
-      is truncated.  If <literal>ONLY</> is not specified, the table and all
-      its descendant tables (if any) are truncated.  Optionally, <literal>*</>
+      If <literal>ONLY</literal> is specified before the table name, only that table
+      is truncated.  If <literal>ONLY</literal> is not specified, the table and all
+      its descendant tables (if any) are truncated.  Optionally, <literal>*</literal>
       can be specified after the table name to explicitly indicate that
       descendant tables are included.
      </para>
@@ -108,29 +108,29 @@ TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [
   </para>
 
   <para>
-   <command>TRUNCATE</> acquires an <literal>ACCESS EXCLUSIVE</> lock on each
+   <command>TRUNCATE</command> acquires an <literal>ACCESS EXCLUSIVE</literal> lock on each
    table it operates on, which blocks all other concurrent operations
-   on the table.  When <literal>RESTART IDENTITY</> is specified, any
+   on the table.  When <literal>RESTART IDENTITY</literal> is specified, any
    sequences that are to be restarted are likewise locked exclusively.
    If concurrent access to a table is required, then
-   the <command>DELETE</> command should be used instead.
+   the <command>DELETE</command> command should be used instead.
   </para>
 
   <para>
-   <command>TRUNCATE</> cannot be used on a table that has foreign-key
+   <command>TRUNCATE</command> cannot be used on a table that has foreign-key
    references from other tables, unless all such tables are also truncated
    in the same command.  Checking validity in such cases would require table
-   scans, and the whole point is not to do one.  The <literal>CASCADE</>
+   scans, and the whole point is not to do one.  The <literal>CASCADE</literal>
    option can be used to automatically include all dependent tables &mdash;
    but be very careful when using this option, or else you might lose data you
    did not intend to!
   </para>
 
   <para>
-   <command>TRUNCATE</> will not fire any <literal>ON DELETE</literal>
+   <command>TRUNCATE</command> will not fire any <literal>ON DELETE</literal>
    triggers that might exist for the tables.  But it will fire
    <literal>ON TRUNCATE</literal> triggers.
-   If <literal>ON TRUNCATE</> triggers are defined for any of
+   If <literal>ON TRUNCATE</literal> triggers are defined for any of
    the tables, then all <literal>BEFORE TRUNCATE</literal> triggers are
    fired before any truncation happens, and all <literal>AFTER
    TRUNCATE</literal> triggers are fired after the last truncation is
@@ -141,36 +141,36 @@ TRUNCATE [ TABLE ] [ ONLY ] <replaceable class="PARAMETER">name</replaceable> [
   </para>
 
   <para>
-   <command>TRUNCATE</> is not MVCC-safe.  After truncation, the table will
+   <command>TRUNCATE</command> is not MVCC-safe.  After truncation, the table will
    appear empty to concurrent transactions, if they are using a snapshot
    taken before the truncation occurred.
-   See <xref linkend="mvcc-caveats"> for more details.
+   See <xref linkend="mvcc-caveats"/> for more details.
   </para>
 
   <para>
-   <command>TRUNCATE</> is transaction-safe with respect to the data
+   <command>TRUNCATE</command> is transaction-safe with respect to the data
    in the tables: the truncation will be safely rolled back if the surrounding
    transaction does not commit.
   </para>
 
   <para>
-   When <literal>RESTART IDENTITY</> is specified, the implied
-   <command>ALTER SEQUENCE RESTART</> operations are also done
+   When <literal>RESTART IDENTITY</literal> is specified, the implied
+   <command>ALTER SEQUENCE RESTART</command> operations are also done
    transactionally; that is, they will be rolled back if the surrounding
    transaction does not commit.  This is unlike the normal behavior of
-   <command>ALTER SEQUENCE RESTART</>.  Be aware that if any additional
+   <command>ALTER SEQUENCE RESTART</command>.  Be aware that if any additional
    sequence operations are done on the restarted sequences before the
    transaction rolls back, the effects of these operations on the sequences
-   will be rolled back, but not their effects on <function>currval()</>;
-   that is, after the transaction <function>currval()</> will continue to
+   will be rolled back, but not their effects on <function>currval()</function>;
+   that is, after the transaction <function>currval()</function> will continue to
    reflect the last sequence value obtained inside the failed transaction,
    even though the sequence itself may no longer be consistent with that.
-   This is similar to the usual behavior of <function>currval()</> after
+   This is similar to the usual behavior of <function>currval()</function> after
    a failed transaction.
   </para>
 
   <para>
-   <command>TRUNCATE</> is not currently supported for foreign tables.
+   <command>TRUNCATE</command> is not currently supported for foreign tables.
    This implies that if a specified table has any descendant tables that are
    foreign, the command will fail.
   </para>
@@ -225,7 +225,7 @@ TRUNCATE othertable CASCADE;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-delete"></member>
+   <member><xref linkend="sql-delete"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/unlisten.sgml b/doc/src/sgml/ref/unlisten.sgml
index f7c3c47e2f..687bf485c9 100644
--- a/doc/src/sgml/ref/unlisten.sgml
+++ b/doc/src/sgml/ref/unlisten.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/unlisten.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-UNLISTEN">
+<refentry id="sql-unlisten">
  <indexterm zone="sql-unlisten">
   <primary>UNLISTEN</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * }
+UNLISTEN { <replaceable class="parameter">channel</replaceable> | * }
 </synopsis>
  </refsynopsisdiv>
 
@@ -34,13 +34,13 @@ UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * }
    <command>UNLISTEN</command> cancels any existing registration of
    the current <productname>PostgreSQL</productname> session as a
    listener on the notification channel named <replaceable
-   class="PARAMETER">channel</replaceable>.  The special wildcard
+   class="parameter">channel</replaceable>.  The special wildcard
    <literal>*</literal> cancels all listener registrations for the
    current session.
   </para>
 
   <para>
-   <xref linkend="sql-notify">
+   <xref linkend="sql-notify"/>
    contains a more extensive
    discussion of the use of <command>LISTEN</command> and
    <command>NOTIFY</command>.
@@ -52,7 +52,7 @@ UNLISTEN { <replaceable class="PARAMETER">channel</replaceable> | * }
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">channel</replaceable></term>
+    <term><replaceable class="parameter">channel</replaceable></term>
     <listitem>
      <para>
       Name of a notification channel (any identifier).
@@ -104,7 +104,7 @@ Asynchronous notification "virtual" received from server process with PID 8448.
   </para>
 
   <para>
-   Once <command>UNLISTEN</> has been executed, further <command>NOTIFY</>
+   Once <command>UNLISTEN</command> has been executed, further <command>NOTIFY</command>
    messages will be ignored:
 
 <programlisting>
@@ -126,8 +126,8 @@ NOTIFY virtual;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-listen"></member>
-   <member><xref linkend="sql-notify"></member>
+   <member><xref linkend="sql-listen"/></member>
+   <member><xref linkend="sql-notify"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/update.sgml b/doc/src/sgml/ref/update.sgml
index 8a1619fb68..c8ac8a335b 100644
--- a/doc/src/sgml/ref/update.sgml
+++ b/doc/src/sgml/ref/update.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/update.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-UPDATE">
+<refentry id="sql-update">
  <indexterm zone="sql-update">
   <primary>UPDATE</primary>
  </indexterm>
@@ -22,13 +22,13 @@ PostgreSQL documentation
  <refsynopsisdiv>
 <synopsis>
 [ WITH [ RECURSIVE ] <replaceable class="parameter">with_query</replaceable> [, ...] ]
-UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
-    SET { <replaceable class="PARAMETER">column_name</replaceable> = { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } |
-          ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="PARAMETER">expression</replaceable> | DEFAULT } [, ...] ) |
-          ( <replaceable class="PARAMETER">column_name</replaceable> [, ...] ) = ( <replaceable class="PARAMETER">sub-SELECT</replaceable> )
+UPDATE [ ONLY ] <replaceable class="parameter">table_name</replaceable> [ * ] [ [ AS ] <replaceable class="parameter">alias</replaceable> ]
+    SET { <replaceable class="parameter">column_name</replaceable> = { <replaceable class="parameter">expression</replaceable> | DEFAULT } |
+          ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = [ ROW ] ( { <replaceable class="parameter">expression</replaceable> | DEFAULT } [, ...] ) |
+          ( <replaceable class="parameter">column_name</replaceable> [, ...] ) = ( <replaceable class="parameter">sub-SELECT</replaceable> )
         } [, ...]
-    [ FROM <replaceable class="PARAMETER">from_list</replaceable> ]
-    [ WHERE <replaceable class="PARAMETER">condition</replaceable> | WHERE CURRENT OF <replaceable class="PARAMETER">cursor_name</replaceable> ]
+    [ FROM <replaceable class="parameter">from_list</replaceable> ]
+    [ WHERE <replaceable class="parameter">condition</replaceable> | WHERE CURRENT OF <replaceable class="parameter">cursor_name</replaceable> ]
     [ RETURNING * | <replaceable class="parameter">output_expression</replaceable> [ [ AS ] <replaceable class="parameter">output_name</replaceable> ] [, ...] ]
 </synopsis>
  </refsynopsisdiv>
@@ -52,13 +52,13 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
   </para>
 
   <para>
-   The optional <literal>RETURNING</> clause causes <command>UPDATE</>
+   The optional <literal>RETURNING</literal> clause causes <command>UPDATE</command>
    to compute and return value(s) based on each row actually updated.
    Any expression using the table's columns, and/or columns of other
    tables mentioned in <literal>FROM</literal>, can be computed.
    The new (post-update) values of the table's columns are used.
-   The syntax of the <literal>RETURNING</> list is identical to that of the
-   output list of <command>SELECT</>.
+   The syntax of the <literal>RETURNING</literal> list is identical to that of the
+   output list of <command>SELECT</command>.
   </para>
 
   <para>
@@ -80,22 +80,22 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
     <listitem>
      <para>
       The <literal>WITH</literal> clause allows you to specify one or more
-      subqueries that can be referenced by name in the <command>UPDATE</>
-      query. See <xref linkend="queries-with"> and <xref linkend="sql-select">
+      subqueries that can be referenced by name in the <command>UPDATE</command>
+      query. See <xref linkend="queries-with"/> and <xref linkend="sql-select"/>
       for details.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
       The name (optionally schema-qualified) of the table to update.
-      If <literal>ONLY</> is specified before the table name, matching rows
-      are updated in the named table only.  If <literal>ONLY</> is not
+      If <literal>ONLY</literal> is specified before the table name, matching rows
+      are updated in the named table only.  If <literal>ONLY</literal> is not
       specified, matching rows are also updated in any tables inheriting from
-      the named table.  Optionally, <literal>*</> can be specified after the
+      the named table.  Optionally, <literal>*</literal> can be specified after the
       table name to explicitly indicate that descendant tables are included.
      </para>
     </listitem>
@@ -107,29 +107,29 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
      <para>
       A substitute name for the target table. When an alias is
       provided, it completely hides the actual name of the table.  For
-      example, given <literal>UPDATE foo AS f</>, the remainder of the
+      example, given <literal>UPDATE foo AS f</literal>, the remainder of the
       <command>UPDATE</command> statement must refer to this table as
-      <literal>f</> not <literal>foo</>.
+      <literal>f</literal> not <literal>foo</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a column in the table named by <replaceable
-      class="PARAMETER">table_name</replaceable>.
+      class="parameter">table_name</replaceable>.
       The column name can be qualified with a subfield name or array
       subscript, if needed.  Do not include the table's name in the
       specification of a target column &mdash; for example,
-      <literal>UPDATE table_name SET table_name.col = 1</> is invalid.
+      <literal>UPDATE table_name SET table_name.col = 1</literal> is invalid.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">expression</replaceable></term>
+    <term><replaceable class="parameter">expression</replaceable></term>
     <listitem>
      <para>
       An expression to assign to the column.  The expression can use the
@@ -149,10 +149,10 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">sub-SELECT</replaceable></term>
+    <term><replaceable class="parameter">sub-SELECT</replaceable></term>
     <listitem>
      <para>
-      A <literal>SELECT</> sub-query that produces as many output columns
+      A <literal>SELECT</literal> sub-query that produces as many output columns
       as are listed in the parenthesized column list preceding it.  The
       sub-query must yield no more than one row when executed.  If it
       yields one row, its column values are assigned to the target columns;
@@ -164,64 +164,64 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">from_list</replaceable></term>
+    <term><replaceable class="parameter">from_list</replaceable></term>
     <listitem>
      <para>
       A list of table expressions, allowing columns from other tables
-      to appear in the <literal>WHERE</> condition and the update
+      to appear in the <literal>WHERE</literal> condition and the update
       expressions. This is similar to the list of tables that can be
       specified in the <xref linkend="sql-from"
-      endterm="sql-from-title"> of a <command>SELECT</command>
+      endterm="sql-from-title"/> of a <command>SELECT</command>
       statement.  Note that the target table must not appear in the
-      <replaceable>from_list</>, unless you intend a self-join (in which
-      case it must appear with an alias in the <replaceable>from_list</>).
+      <replaceable>from_list</replaceable>, unless you intend a self-join (in which
+      case it must appear with an alias in the <replaceable>from_list</replaceable>).
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">condition</replaceable></term>
+    <term><replaceable class="parameter">condition</replaceable></term>
     <listitem>
      <para>
       An expression that returns a value of type <type>boolean</type>.
-      Only rows for which this expression returns <literal>true</>
+      Only rows for which this expression returns <literal>true</literal>
       will be updated.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">cursor_name</replaceable></term>
+    <term><replaceable class="parameter">cursor_name</replaceable></term>
     <listitem>
      <para>
-      The name of the cursor to use in a <literal>WHERE CURRENT OF</>
+      The name of the cursor to use in a <literal>WHERE CURRENT OF</literal>
       condition.  The row to be updated is the one most recently fetched
       from this cursor.  The cursor must be a non-grouping
-      query on the <command>UPDATE</>'s target table.
-      Note that <literal>WHERE CURRENT OF</> cannot be
+      query on the <command>UPDATE</command>'s target table.
+      Note that <literal>WHERE CURRENT OF</literal> cannot be
       specified together with a Boolean condition.  See
-      <xref linkend="sql-declare">
+      <xref linkend="sql-declare"/>
       for more information about using cursors with
-      <literal>WHERE CURRENT OF</>.
+      <literal>WHERE CURRENT OF</literal>.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">output_expression</replaceable></term>
+    <term><replaceable class="parameter">output_expression</replaceable></term>
     <listitem>
      <para>
-      An expression to be computed and returned by the <command>UPDATE</>
+      An expression to be computed and returned by the <command>UPDATE</command>
       command after each row is updated.  The expression can use any
-      column names of the table named by <replaceable class="PARAMETER">table_name</replaceable>
-      or table(s) listed in <literal>FROM</>.
-      Write <literal>*</> to return all columns.
+      column names of the table named by <replaceable class="parameter">table_name</replaceable>
+      or table(s) listed in <literal>FROM</literal>.
+      Write <literal>*</literal> to return all columns.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">output_name</replaceable></term>
+    <term><replaceable class="parameter">output_name</replaceable></term>
     <listitem>
      <para>
       A name to use for a returned column.
@@ -235,7 +235,7 @@ UPDATE [ ONLY ] <replaceable class="PARAMETER">table_name</replaceable> [ * ] [
   <title>Outputs</title>
 
   <para>
-   On successful completion, an <command>UPDATE</> command returns a command
+   On successful completion, an <command>UPDATE</command> command returns a command
    tag of the form
 <screen>
 UPDATE <replaceable class="parameter">count</replaceable>
@@ -244,16 +244,16 @@ UPDATE <replaceable class="parameter">count</replaceable>
    of rows updated, including matched rows whose values did not change.
    Note that the number may be less than the number of rows that matched
    the <replaceable class="parameter">condition</replaceable> when
-   updates were suppressed by a <literal>BEFORE UPDATE</> trigger.  If
+   updates were suppressed by a <literal>BEFORE UPDATE</literal> trigger.  If
    <replaceable class="parameter">count</replaceable> is 0, no rows were
    updated by the query (this is not considered an error).
   </para>
 
   <para>
-   If the <command>UPDATE</> command contains a <literal>RETURNING</>
-   clause, the result will be similar to that of a <command>SELECT</>
+   If the <command>UPDATE</command> command contains a <literal>RETURNING</literal>
+   clause, the result will be similar to that of a <command>SELECT</command>
    statement containing the columns and values defined in the
-   <literal>RETURNING</> list, computed over the row(s) updated by the
+   <literal>RETURNING</literal> list, computed over the row(s) updated by the
    command.
   </para>
  </refsect1>
@@ -262,11 +262,11 @@ UPDATE <replaceable class="parameter">count</replaceable>
   <title>Notes</title>
 
   <para>
-   When a <literal>FROM</> clause is present, what essentially happens
+   When a <literal>FROM</literal> clause is present, what essentially happens
    is that the target table is joined to the tables mentioned in the
    <replaceable>from_list</replaceable>, and each output row of the join
    represents an update operation for the target table.  When using
-   <literal>FROM</> you should ensure that the join
+   <literal>FROM</literal> you should ensure that the join
    produces at most one output row for each row to be modified.  In
    other words, a target row shouldn't join to more than one row from
    the other table(s).  If it does, then only one of the join rows
@@ -282,10 +282,15 @@ UPDATE <replaceable class="parameter">count</replaceable>
 
   <para>
    In the case of a partitioned table, updating a row might cause it to no
-   longer satisfy the partition constraint.  Since there is no provision to
-   move the row to the partition appropriate to the new value of its
-   partitioning key, an error will occur in this case.  This can also happen
-   when updating a partition directly.
+   longer satisfy the partition constraint of the containing partition. In that
+   case, if there is some other partition in the partition tree for which this
+   row satisfies its partition constraint, then the row is moved to that
+   partition. If there is no such partition, an error will occur.  Behind the
+   scenes, the row movement is actually a <command>DELETE</command> and
+   <command>INSERT</command> operation. However, there is a possibility that a
+   concurrent <command>UPDATE</command> or <command>DELETE</command> on the
+   same row may miss this row. For details see the section
+   <xref linkend="ddl-partitioning-declarative-limitations"/>.
   </para>
  </refsect1>
 
@@ -293,8 +298,8 @@ UPDATE <replaceable class="parameter">count</replaceable>
   <title>Examples</title>
 
   <para>
-   Change the word <literal>Drama</> to <literal>Dramatic</> in the
-   column <structfield>kind</> of the table <structname>films</structname>:
+   Change the word <literal>Drama</literal> to <literal>Dramatic</literal> in the
+   column <structfield>kind</structfield> of the table <structname>films</structname>:
 
 <programlisting>
 UPDATE films SET kind = 'Dramatic' WHERE kind = 'Drama';
@@ -364,10 +369,10 @@ UPDATE accounts SET contact_first_name = first_name,
   FROM salesmen WHERE salesmen.id = accounts.sales_id;
 </programlisting>
    However, the second query may give unexpected results
-   if <structname>salesmen</>.<structfield>id</> is not a unique key, whereas
+   if <structname>salesmen</structname>.<structfield>id</structfield> is not a unique key, whereas
    the first query is guaranteed to raise an error if there are multiple
-   <structfield>id</> matches.  Also, if there is no match for a particular
-   <structname>accounts</>.<structfield>sales_id</> entry, the first query
+   <structfield>id</structfield> matches.  Also, if there is no match for a particular
+   <structname>accounts</structname>.<structfield>sales_id</structfield> entry, the first query
    will set the corresponding name fields to NULL, whereas the second query
    will not update that row at all.
   </para>
@@ -400,9 +405,9 @@ COMMIT;
   </para>
 
   <para>
-   Change the <structfield>kind</> column of the table
+   Change the <structfield>kind</structfield> column of the table
    <structname>films</structname> in the row on which the cursor
-   <literal>c_films</> is currently positioned:
+   <literal>c_films</literal> is currently positioned:
 <programlisting>
 UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films;
 </programlisting></para>
@@ -413,16 +418,16 @@ UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films;
 
   <para>
    This command conforms to the <acronym>SQL</acronym> standard, except
-   that the <literal>FROM</literal> and <literal>RETURNING</> clauses
+   that the <literal>FROM</literal> and <literal>RETURNING</literal> clauses
    are <productname>PostgreSQL</productname> extensions, as is the ability
-   to use <literal>WITH</> with <command>UPDATE</>.
+   to use <literal>WITH</literal> with <command>UPDATE</command>.
   </para>
 
   <para>
-   Some other database systems offer a <literal>FROM</> option in which
-   the target table is supposed to be listed again within <literal>FROM</>.
+   Some other database systems offer a <literal>FROM</literal> option in which
+   the target table is supposed to be listed again within <literal>FROM</literal>.
    That is not how <productname>PostgreSQL</productname> interprets
-   <literal>FROM</>.  Be careful when porting applications that use this
+   <literal>FROM</literal>.  Be careful when porting applications that use this
    extension.
   </para>
 
@@ -431,9 +436,9 @@ UPDATE films SET kind = 'Dramatic' WHERE CURRENT OF c_films;
    target column names can be any row-valued expression yielding the correct
    number of columns.  <productname>PostgreSQL</productname> only allows the
    source value to be a <link linkend="sql-syntax-row-constructors">row
-   constructor</link> or a sub-<literal>SELECT</>.  An individual column's
-   updated value can be specified as <literal>DEFAULT</> in the
-   row-constructor case, but not inside a sub-<literal>SELECT</>.
+   constructor</link> or a sub-<literal>SELECT</literal>.  An individual column's
+   updated value can be specified as <literal>DEFAULT</literal> in the
+   row-constructor case, but not inside a sub-<literal>SELECT</literal>.
   </para>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/vacuum.sgml b/doc/src/sgml/ref/vacuum.sgml
index 421c18d117..b760e8ede1 100644
--- a/doc/src/sgml/ref/vacuum.sgml
+++ b/doc/src/sgml/ref/vacuum.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/vacuum.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-VACUUM">
+<refentry id="sql-vacuum">
  <indexterm zone="sql-vacuum">
   <primary>VACUUM</primary>
  </indexterm>
@@ -21,9 +21,20 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-VACUUM [ ( { FULL | FREEZE | VERBOSE | ANALYZE | DISABLE_PAGE_SKIPPING } [, ...] ) ] [ <replaceable class="PARAMETER">table_name</replaceable> [ (<replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] ]
-VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ <replaceable class="PARAMETER">table_name</replaceable> ]
-VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">table_name</replaceable> [ (<replaceable class="PARAMETER">column_name</replaceable> [, ...] ) ] ]
+VACUUM [ ( <replaceable class="parameter">option</replaceable> [, ...] ) ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ]
+VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] [ ANALYZE ] [ <replaceable class="parameter">table_and_columns</replaceable> [, ...] ]
+
+<phrase>where <replaceable class="parameter">option</replaceable> can be one of:</phrase>
+
+    FULL
+    FREEZE
+    VERBOSE
+    ANALYZE
+    DISABLE_PAGE_SKIPPING
+
+<phrase>and <replaceable class="parameter">table_and_columns</replaceable> is:</phrase>
+
+    <replaceable class="parameter">table_name</replaceable> [ ( <replaceable class="parameter">column_name</replaceable> [, ...] ) ]
 </synopsis>
  </refsynopsisdiv>
 
@@ -40,21 +51,22 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
   </para>
 
   <para>
-   With no parameter, <command>VACUUM</command> processes every table in the
-   current database that the current user has permission to vacuum.
-   With a parameter, <command>VACUUM</command> processes only that table.
+   Without a <replaceable class="parameter">table_and_columns</replaceable>
+   list, <command>VACUUM</command> processes every table and materialized view
+   in the current database that the current user has permission to vacuum.
+   With a list, <command>VACUUM</command> processes only those table(s).
   </para>
 
   <para>
    <command>VACUUM ANALYZE</command> performs a <command>VACUUM</command>
    and then an <command>ANALYZE</command> for each selected table.  This
    is a handy combination form for routine maintenance scripts.  See
-   <xref linkend="sql-analyze">
+   <xref linkend="sql-analyze"/>
    for more details about its processing.
   </para>
 
   <para>
-   Plain <command>VACUUM</command> (without <literal>FULL</>) simply reclaims
+   Plain <command>VACUUM</command> (without <literal>FULL</literal>) simply reclaims
    space and makes it
    available for re-use.  This form of the command can operate in parallel
    with normal reading and writing of the table, as an exclusive lock
@@ -101,10 +113,10 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
       Selects aggressive <quote>freezing</quote> of tuples.
       Specifying <literal>FREEZE</literal> is equivalent to performing
       <command>VACUUM</command> with the
-      <xref linkend="guc-vacuum-freeze-min-age"> and
-      <xref linkend="guc-vacuum-freeze-table-age"> parameters
+      <xref linkend="guc-vacuum-freeze-min-age"/> and
+      <xref linkend="guc-vacuum-freeze-table-age"/> parameters
       set to zero.  Aggressive freezing is always performed when the
-      table is rewritten, so this option is redundant when <literal>FULL</>
+      table is rewritten, so this option is redundant when <literal>FULL</literal>
       is specified.
      </para>
     </listitem>
@@ -133,39 +145,39 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
     <term><literal>DISABLE_PAGE_SKIPPING</literal></term>
     <listitem>
      <para>
-      Normally, <command>VACUUM</> will skip pages based on the <link
-      linkend="vacuum-for-visibility-map">visibility map</>.  Pages where
+      Normally, <command>VACUUM</command> will skip pages based on the <link
+      linkend="vacuum-for-visibility-map">visibility map</link>.  Pages where
       all tuples are known to be frozen can always be skipped, and those
       where all tuples are known to be visible to all transactions may be
       skipped except when performing an aggressive vacuum.  Furthermore,
       except when performing an aggressive vacuum, some pages may be skipped
       in order to avoid waiting for other sessions to finish using them.
       This option disables all page-skipping behavior, and is intended to
-      be used only the contents of the visibility map are thought to
-      be suspect, which should happen only if there is a hardware or software
+      be used only when the contents of the visibility map are
+      suspect, which should happen only if there is a hardware or software
       issue causing database corruption.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">table_name</replaceable></term>
+    <term><replaceable class="parameter">table_name</replaceable></term>
     <listitem>
      <para>
-      The name (optionally schema-qualified) of a specific table to
-      vacuum.  If omitted, all regular tables and materialized views in the
-      current database are vacuumed.  If the specified table is a partitioned
+      The name (optionally schema-qualified) of a specific table or
+      materialized view to vacuum.  If the specified table is a partitioned
       table, all of its leaf partitions are vacuumed.
      </para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><replaceable class="PARAMETER">column_name</replaceable></term>
+    <term><replaceable class="parameter">column_name</replaceable></term>
     <listitem>
      <para>
       The name of a specific column to analyze. Defaults to all columns.
-      If a column list is specified, <literal>ANALYZE</> is implied.
+      If a column list is specified, <literal>ANALYZE</literal> must also be
+      specified.
      </para>
     </listitem>
    </varlistentry>
@@ -176,7 +188,7 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
   <title>Outputs</title>
 
    <para>
-    When <literal>VERBOSE</> is specified, <command>VACUUM</> emits
+    When <literal>VERBOSE</literal> is specified, <command>VACUUM</command> emits
     progress messages to indicate which table is currently being
     processed.  Various statistics about the tables are printed as well.
    </para>
@@ -190,20 +202,20 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
     superuser.  However, database owners are allowed to
     vacuum all tables in their databases, except shared catalogs.
     (The restriction for shared catalogs means that a true database-wide
-    <command>VACUUM</> can only be performed by a superuser.)
-    <command>VACUUM</> will skip over any tables that the calling user
+    <command>VACUUM</command> can only be performed by a superuser.)
+    <command>VACUUM</command> will skip over any tables that the calling user
     does not have permission to vacuum.
    </para>
 
    <para>
-    <command>VACUUM</> cannot be executed inside a transaction block.
+    <command>VACUUM</command> cannot be executed inside a transaction block.
    </para>
 
    <para>
-    For tables with <acronym>GIN</> indexes, <command>VACUUM</command> (in
+    For tables with <acronym>GIN</acronym> indexes, <command>VACUUM</command> (in
     any form) also completes any pending index insertions, by moving pending
-    index entries to the appropriate places in the main <acronym>GIN</> index
-    structure.  See <xref linkend="gin-fast-update"> for details.
+    index entries to the appropriate places in the main <acronym>GIN</acronym> index
+    structure.  See <xref linkend="gin-fast-update"/> for details.
    </para>
 
    <para>
@@ -231,14 +243,14 @@ VACUUM [ FULL ] [ FREEZE ] [ VERBOSE ] ANALYZE [ <replaceable class="PARAMETER">
     <command>VACUUM</command> causes a substantial increase in I/O traffic,
     which might cause poor performance for other active sessions.  Therefore,
     it is sometimes advisable to use the cost-based vacuum delay feature.
-    See <xref linkend="runtime-config-resource-vacuum-cost"> for details.
+    See <xref linkend="runtime-config-resource-vacuum-cost"/> for details.
    </para>
 
    <para>
-    <productname>PostgreSQL</productname> includes an <quote>autovacuum</>
+    <productname>PostgreSQL</productname> includes an <quote>autovacuum</quote>
     facility which can automate routine vacuum maintenance.  For more
     information about automatic and manual vacuuming, see
-    <xref linkend="routine-vacuuming">.
+    <xref linkend="routine-vacuuming"/>.
    </para>
  </refsect1>
 
@@ -266,9 +278,9 @@ VACUUM (VERBOSE, ANALYZE) onek;
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="app-vacuumdb"></member>
-   <member><xref linkend="runtime-config-resource-vacuum-cost"></member>
-   <member><xref linkend="autovacuum"></member>
+   <member><xref linkend="app-vacuumdb"/></member>
+   <member><xref linkend="runtime-config-resource-vacuum-cost"/></member>
+   <member><xref linkend="autovacuum"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/ref/vacuumdb.sgml b/doc/src/sgml/ref/vacuumdb.sgml
index 4f6fa0d708..955a17a849 100644
--- a/doc/src/sgml/ref/vacuumdb.sgml
+++ b/doc/src/sgml/ref/vacuumdb.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/vacuumdb.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="APP-VACUUMDB">
+<refentry id="app-vacuumdb">
  <indexterm zone="app-vacuumdb">
   <primary>vacuumdb</primary>
  </indexterm>
@@ -62,7 +62,7 @@ PostgreSQL documentation
 
   <para>
    <application>vacuumdb</application> is a wrapper around the SQL
-   command <xref linkend="SQL-VACUUM">.
+   command <xref linkend="sql-vacuum"/>.
    There is no effective difference between vacuuming and analyzing
    databases via this utility and via other methods for accessing the
    server.
@@ -88,8 +88,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option><optional>-d</> <replaceable class="parameter">dbname</replaceable></option></term>
-      <term><option><optional>--dbname=</><replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option><optional>-d</optional> <replaceable class="parameter">dbname</replaceable></option></term>
+      <term><option><optional>--dbname=</optional><replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
         Specifies the name of the database to be cleaned or analyzed.
@@ -103,8 +103,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-e</></term>
-      <term><option>--echo</></term>
+      <term><option>-e</option></term>
+      <term><option>--echo</option></term>
       <listitem>
        <para>
         Echo the commands that <application>vacuumdb</application> generates
@@ -146,7 +146,7 @@ PostgreSQL documentation
        <para>
         <application>vacuumdb</application> will open
         <replaceable class="parameter">njobs</replaceable> connections to the
-        database, so make sure your <xref linkend="guc-max-connections">
+        database, so make sure your <xref linkend="guc-max-connections"/>
         setting is high enough to accommodate all connections.
        </para>
        <para>
@@ -158,8 +158,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-q</></term>
-      <term><option>--quiet</></term>
+      <term><option>-q</option></term>
+      <term><option>--quiet</option></term>
       <listitem>
        <para>
         Do not display progress messages.
@@ -176,7 +176,7 @@ PostgreSQL documentation
         Column names can be specified only in conjunction with
         the <option>--analyze</option> or <option>--analyze-only</option> options.
         Multiple tables can be vacuumed by writing multiple
-        <option>-t</> switches.
+        <option>-t</option> switches.
        </para>
        <tip>
         <para>
@@ -198,8 +198,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-V</></term>
-       <term><option>--version</></term>
+       <term><option>-V</option></term>
+       <term><option>--version</option></term>
        <listitem>
        <para>
        Print the <application>vacuumdb</application> version and exit.
@@ -248,8 +248,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-       <term><option>-?</></term>
-       <term><option>--help</></term>
+       <term><option>-?</option></term>
+       <term><option>--help</option></term>
        <listitem>
        <para>
        Show help about <application>vacuumdb</application> command line
@@ -266,8 +266,8 @@ PostgreSQL documentation
     the following command-line arguments for connection parameters:
     <variablelist>
      <varlistentry>
-      <term><option>-h <replaceable class="parameter">host</replaceable></></term>
-      <term><option>--host=<replaceable class="parameter">host</replaceable></></term>
+      <term><option>-h <replaceable class="parameter">host</replaceable></option></term>
+      <term><option>--host=<replaceable class="parameter">host</replaceable></option></term>
       <listitem>
        <para>
         Specifies the host name of the machine on which the server
@@ -278,8 +278,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-p <replaceable class="parameter">port</replaceable></></term>
-      <term><option>--port=<replaceable class="parameter">port</replaceable></></term>
+      <term><option>-p <replaceable class="parameter">port</replaceable></option></term>
+      <term><option>--port=<replaceable class="parameter">port</replaceable></option></term>
       <listitem>
        <para>
         Specifies the TCP port or local Unix domain socket file
@@ -290,8 +290,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-U <replaceable class="parameter">username</replaceable></></term>
-      <term><option>--username=<replaceable class="parameter">username</replaceable></></term>
+      <term><option>-U <replaceable class="parameter">username</replaceable></option></term>
+      <term><option>--username=<replaceable class="parameter">username</replaceable></option></term>
       <listitem>
        <para>
         User name to connect as.
@@ -300,8 +300,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-w</></term>
-      <term><option>--no-password</></term>
+      <term><option>-w</option></term>
+      <term><option>--no-password</option></term>
       <listitem>
        <para>
         Never issue a password prompt.  If the server requires
@@ -315,8 +315,8 @@ PostgreSQL documentation
      </varlistentry>
 
      <varlistentry>
-      <term><option>-W</></term>
-      <term><option>--password</></term>
+      <term><option>-W</option></term>
+      <term><option>--password</option></term>
       <listitem>
        <para>
         Force <application>vacuumdb</application> to prompt for a
@@ -329,14 +329,14 @@ PostgreSQL documentation
         for a password if the server demands password authentication.
         However, <application>vacuumdb</application> will waste a
         connection attempt finding out that the server wants a password.
-        In some cases it is worth typing <option>-W</> to avoid the extra
+        In some cases it is worth typing <option>-W</option> to avoid the extra
         connection attempt.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></></term>
+      <term><option>--maintenance-db=<replaceable class="parameter">dbname</replaceable></option></term>
       <listitem>
        <para>
          Specifies the name of the database to connect to discover what other
@@ -370,9 +370,9 @@ PostgreSQL documentation
   </variablelist>
 
   <para>
-   This utility, like most other <productname>PostgreSQL</> utilities,
-   also uses the environment variables supported by <application>libpq</>
-   (see <xref linkend="libpq-envars">).
+   This utility, like most other <productname>PostgreSQL</productname> utilities,
+   also uses the environment variables supported by <application>libpq</application>
+   (see <xref linkend="libpq-envars"/>).
   </para>
 
  </refsect1>
@@ -382,8 +382,8 @@ PostgreSQL documentation
   <title>Diagnostics</title>
 
   <para>
-   In case of difficulty, see <xref linkend="SQL-VACUUM">
-   and <xref linkend="APP-PSQL"> for
+   In case of difficulty, see <xref linkend="sql-vacuum"/>
+   and <xref linkend="app-psql"/> for
    discussions of potential problems and error messages.
    The database server must be running at the
    targeted host.  Also, any default connection settings and environment
@@ -401,8 +401,8 @@ PostgreSQL documentation
    <application>vacuumdb</application> might need to connect several
    times to the <productname>PostgreSQL</productname> server, asking
    for a password each time. It is convenient to have a
-   <filename>~/.pgpass</> file in such cases. See <xref
-   linkend="libpq-pgpass"> for more information.
+   <filename>~/.pgpass</filename> file in such cases. See <xref
+   linkend="libpq-pgpass"/> for more information.
   </para>
  </refsect1>
 
@@ -439,7 +439,7 @@ PostgreSQL documentation
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-vacuum"></member>
+   <member><xref linkend="sql-vacuum"/></member>
   </simplelist>
  </refsect1>
 
diff --git a/doc/src/sgml/ref/values.sgml b/doc/src/sgml/ref/values.sgml
index 9b0d8fa4a1..849220b120 100644
--- a/doc/src/sgml/ref/values.sgml
+++ b/doc/src/sgml/ref/values.sgml
@@ -3,7 +3,7 @@ doc/src/sgml/ref/values.sgml
 PostgreSQL documentation
 -->
 
-<refentry id="SQL-VALUES">
+<refentry id="sql-values">
  <indexterm zone="sql-values">
   <primary>VALUES</primary>
  </indexterm>
@@ -21,7 +21,7 @@ PostgreSQL documentation
 
  <refsynopsisdiv>
 <synopsis>
-VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ...]
+VALUES ( <replaceable class="parameter">expression</replaceable> [, ...] ) [, ...]
     [ ORDER BY <replaceable class="parameter">sort_expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [, ...] ]
     [ LIMIT { <replaceable class="parameter">count</replaceable> | ALL } ]
     [ OFFSET <replaceable class="parameter">start</replaceable> [ ROW | ROWS ] ]
@@ -35,7 +35,7 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
   <para>
    <command>VALUES</command> computes a row value or set of row values
    specified by value expressions.  It is most commonly used to generate
-   a <quote>constant table</> within a larger command, but it can be
+   a <quote>constant table</quote> within a larger command, but it can be
    used on its own.
   </para>
 
@@ -43,18 +43,18 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
    When more than one row is specified, all the rows must have the same
    number of elements.  The data types of the resulting table's columns are
    determined by combining the explicit or inferred types of the expressions
-   appearing in that column, using the same rules as for <literal>UNION</>
-   (see <xref linkend="typeconv-union-case">).
+   appearing in that column, using the same rules as for <literal>UNION</literal>
+   (see <xref linkend="typeconv-union-case"/>).
   </para>
 
   <para>
-   Within larger commands, <command>VALUES</> is syntactically allowed
-   anywhere that <command>SELECT</> is.  Because it is treated like a
-   <command>SELECT</> by the grammar, it is possible to use
-   the <literal>ORDER BY</>, <literal>LIMIT</> (or
+   Within larger commands, <command>VALUES</command> is syntactically allowed
+   anywhere that <command>SELECT</command> is.  Because it is treated like a
+   <command>SELECT</command> by the grammar, it is possible to use
+   the <literal>ORDER BY</literal>, <literal>LIMIT</literal> (or
    equivalently <literal>FETCH FIRST</literal>),
-   and <literal>OFFSET</> clauses with a
-   <command>VALUES</> command.
+   and <literal>OFFSET</literal> clauses with a
+   <command>VALUES</command> command.
   </para>
  </refsect1>
 
@@ -63,16 +63,16 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
 
   <variablelist>
    <varlistentry>
-    <term><replaceable class="PARAMETER">expression</replaceable></term>
+    <term><replaceable class="parameter">expression</replaceable></term>
     <listitem>
      <para>
       A constant or expression to compute and insert at the indicated place
-      in the resulting table (set of rows).  In a <command>VALUES</> list
-      appearing at the top level of an <command>INSERT</>, an
-      <replaceable class="PARAMETER">expression</replaceable> can be replaced
+      in the resulting table (set of rows).  In a <command>VALUES</command> list
+      appearing at the top level of an <command>INSERT</command>, an
+      <replaceable class="parameter">expression</replaceable> can be replaced
       by <literal>DEFAULT</literal> to indicate that the destination column's
       default value should be inserted.  <literal>DEFAULT</literal> cannot
-      be used when <command>VALUES</> appears in other contexts.
+      be used when <command>VALUES</command> appears in other contexts.
      </para>
     </listitem>
    </varlistentry>
@@ -83,9 +83,9 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
      <para>
       An expression or integer constant indicating how to sort the result
       rows.  This expression can refer to the columns of the
-      <command>VALUES</> result as <literal>column1</>, <literal>column2</>,
+      <command>VALUES</command> result as <literal>column1</literal>, <literal>column2</literal>,
       etc.  For more details see
-      <xref linkend="sql-orderby" endterm="sql-orderby-title">.
+      <xref linkend="sql-orderby" endterm="sql-orderby-title"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -95,7 +95,7 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
     <listitem>
      <para>
       A sorting operator.  For details see
-      <xref linkend="sql-orderby" endterm="sql-orderby-title">.
+      <xref linkend="sql-orderby" endterm="sql-orderby-title"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -105,7 +105,7 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
     <listitem>
      <para>
       The maximum number of rows to return.  For details see
-      <xref linkend="sql-limit" endterm="sql-limit-title">.
+      <xref linkend="sql-limit" endterm="sql-limit-title"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -116,7 +116,7 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
      <para>
       The number of rows to skip before starting to return rows.
       For details see
-      <xref linkend="sql-limit" endterm="sql-limit-title">.
+      <xref linkend="sql-limit" endterm="sql-limit-title"/>.
      </para>
     </listitem>
    </varlistentry>
@@ -127,11 +127,11 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
   <title>Notes</title>
 
   <para>
-   <command>VALUES</> lists with very large numbers of rows should be avoided,
+   <command>VALUES</command> lists with very large numbers of rows should be avoided,
    as you might encounter out-of-memory failures or poor performance.
-   <command>VALUES</> appearing within <command>INSERT</> is a special case
-   (because the desired column types are known from the <command>INSERT</>'s
-   target table, and need not be inferred by scanning the <command>VALUES</>
+   <command>VALUES</command> appearing within <command>INSERT</command> is a special case
+   (because the desired column types are known from the <command>INSERT</command>'s
+   target table, and need not be inferred by scanning the <command>VALUES</command>
    list), so it can handle larger lists than are practical in other contexts.
   </para>
  </refsect1>
@@ -140,7 +140,7 @@ VALUES ( <replaceable class="PARAMETER">expression</replaceable> [, ...] ) [, ..
   <title>Examples</title>
 
   <para>
-   A bare <command>VALUES</> command:
+   A bare <command>VALUES</command> command:
 
 <programlisting>
 VALUES (1, 'one'), (2, 'two'), (3, 'three');
@@ -160,8 +160,8 @@ SELECT 3, 'three';
   </para>
 
   <para>
-   More usually, <command>VALUES</> is used within a larger SQL command.
-   The most common use is in <command>INSERT</>:
+   More usually, <command>VALUES</command> is used within a larger SQL command.
+   The most common use is in <command>INSERT</command>:
 
 <programlisting>
 INSERT INTO films (code, title, did, date_prod, kind)
@@ -170,7 +170,7 @@ INSERT INTO films (code, title, did, date_prod, kind)
   </para>
 
   <para>
-   In the context of <command>INSERT</>, entries of a <command>VALUES</> list
+   In the context of <command>INSERT</command>, entries of a <command>VALUES</command> list
    can be <literal>DEFAULT</literal> to indicate that the column default
    should be used here instead of specifying a value:
 
@@ -182,8 +182,8 @@ INSERT INTO films VALUES
   </para>
 
   <para>
-   <command>VALUES</> can also be used where a sub-<command>SELECT</> might
-   be written, for example in a <literal>FROM</> clause:
+   <command>VALUES</command> can also be used where a sub-<command>SELECT</command> might
+   be written, for example in a <literal>FROM</literal> clause:
 
 <programlisting>
 SELECT f.*
@@ -195,17 +195,17 @@ UPDATE employees SET salary = salary * v.increase
   WHERE employees.depno = v.depno AND employees.sales &gt;= v.target;
 </programlisting>
 
-   Note that an <literal>AS</> clause is required when <command>VALUES</>
-   is used in a <literal>FROM</> clause, just as is true for
-   <command>SELECT</>.  It is not required that the <literal>AS</> clause
+   Note that an <literal>AS</literal> clause is required when <command>VALUES</command>
+   is used in a <literal>FROM</literal> clause, just as is true for
+   <command>SELECT</command>.  It is not required that the <literal>AS</literal> clause
    specify names for all the columns, but it's good practice to do so.
-   (The default column names for <command>VALUES</> are <literal>column1</>,
-   <literal>column2</>, etc in <productname>PostgreSQL</productname>, but
+   (The default column names for <command>VALUES</command> are <literal>column1</literal>,
+   <literal>column2</literal>, etc in <productname>PostgreSQL</productname>, but
    these names might be different in other database systems.)
   </para>
 
   <para>
-   When <command>VALUES</> is used in <command>INSERT</>, the values are all
+   When <command>VALUES</command> is used in <command>INSERT</command>, the values are all
    automatically coerced to the data type of the corresponding destination
    column.  When it's used in other contexts, it might be necessary to specify
    the correct data type.  If the entries are all quoted literal constants,
@@ -218,9 +218,9 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
 
   <tip>
    <para>
-    For simple <literal>IN</> tests, it's better to rely on the
+    For simple <literal>IN</literal> tests, it's better to rely on the
     <link linkend="functions-comparisons-in-scalar">list-of-scalars</link>
-    form of <literal>IN</> than to write a <command>VALUES</>
+    form of <literal>IN</literal> than to write a <command>VALUES</command>
     query as shown above.  The list of scalars method requires less writing
     and is often more efficient.
    </para>
@@ -233,7 +233,7 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
   <para><command>VALUES</command> conforms to the SQL standard.
    <literal>LIMIT</literal> and <literal>OFFSET</literal> are
    <productname>PostgreSQL</productname> extensions; see also
-   under <xref linkend="sql-select">.
+   under <xref linkend="sql-select"/>.
   </para>
  </refsect1>
 
@@ -241,8 +241,8 @@ WHERE ip_address IN (VALUES('192.168.0.1'::inet), ('192.168.0.10'), ('192.168.1.
   <title>See Also</title>
 
   <simplelist type="inline">
-   <member><xref linkend="sql-insert"></member>
-   <member><xref linkend="sql-select"></member>
+   <member><xref linkend="sql-insert"/></member>
+   <member><xref linkend="sql-select"/></member>
   </simplelist>
  </refsect1>
 </refentry>
diff --git a/doc/src/sgml/reference.sgml b/doc/src/sgml/reference.sgml
index 9000b3aaaa..d27fb414f7 100644
--- a/doc/src/sgml/reference.sgml
+++ b/doc/src/sgml/reference.sgml
@@ -54,8 +54,10 @@
    &alterOperatorClass;
    &alterOperatorFamily;
    &alterPolicy;
+   &alterProcedure;
    &alterPublication;
    &alterRole;
+   &alterRoutine;
    &alterRule;
    &alterSchema;
    &alterSequence;
@@ -76,6 +78,7 @@
    &alterView;
    &analyze;
    &begin;
+   &call;
    &checkpoint;
    &close;
    &cluster;
@@ -103,6 +106,7 @@
    &createOperatorClass;
    &createOperatorFamily;
    &createPolicy;
+   &createProcedure;
    &createPublication;
    &createRole;
    &createRule;
@@ -150,8 +154,10 @@
    &dropOperatorFamily;
    &dropOwned;
    &dropPolicy;
+   &dropProcedure;
    &dropPublication;
    &dropRole;
+   &dropRoutine;
    &dropRule;
    &dropSchema;
    &dropSequence;
@@ -264,7 +270,7 @@
     <productname>PostgreSQL</productname> server applications and
     support utilities.  These commands can only be run usefully on the
     host where the database server resides.  Other utility programs
-    are listed in <xref linkend="reference-client">.
+    are listed in <xref linkend="reference-client"/>.
    </para>
   </partintro>
 
diff --git a/doc/src/sgml/regress.sgml b/doc/src/sgml/regress.sgml
index 7c2b1029c2..53716a029f 100644
--- a/doc/src/sgml/regress.sgml
+++ b/doc/src/sgml/regress.sgml
@@ -52,8 +52,8 @@ make check
 </computeroutput>
 </screen>
    or otherwise a note about which tests failed.  See <xref
-   linkend="regress-evaluation"> below before assuming that a
-   <quote>failure</> represents a serious problem.
+   linkend="regress-evaluation"/> below before assuming that a
+   <quote>failure</quote> represents a serious problem.
   </para>
 
    <para>
@@ -66,12 +66,12 @@ make check
    <para>
     If you have configured <productname>PostgreSQL</productname> to install
     into a location where an older <productname>PostgreSQL</productname>
-    installation already exists, and you perform <literal>make check</>
+    installation already exists, and you perform <literal>make check</literal>
     before installing the new version, you might find that the tests fail
     because the new programs try to use the already-installed shared
     libraries.  (Typical symptoms are complaints about undefined symbols.)
     If you wish to run the tests before overwriting the old installation,
-    you'll need to build with <literal>configure --disable-rpath</>.
+    you'll need to build with <literal>configure --disable-rpath</literal>.
     It is not recommended that you use this option for the final installation,
     however.
    </para>
@@ -80,12 +80,12 @@ make check
     The parallel regression test starts quite a few processes under your
     user ID.  Presently, the maximum concurrency is twenty parallel test
     scripts, which means forty processes: there's a server process and a
-    <application>psql</> process for each test script.
+    <application>psql</application> process for each test script.
     So if your system enforces a per-user limit on the number of processes,
     make sure this limit is at least fifty or so, else you might get
     random-seeming failures in the parallel test.  If you are not in
     a position to raise the limit, you can cut down the degree of parallelism
-    by setting the <literal>MAX_CONNECTIONS</> parameter.  For example:
+    by setting the <literal>MAX_CONNECTIONS</literal> parameter.  For example:
 <screen>
 make MAX_CONNECTIONS=10 check
 </screen>
@@ -97,9 +97,9 @@ make MAX_CONNECTIONS=10 check
    <title>Running the Tests Against an Existing Installation</title>
 
   <para>
-   To run the tests after installation (see <xref linkend="installation">),
+   To run the tests after installation (see <xref linkend="installation"/>),
    initialize a data area and start the
-   server as explained in <xref linkend="runtime">, then type:
+   server as explained in <xref linkend="runtime"/>, then type:
 <screen>
 make installcheck
 </screen>
@@ -110,14 +110,14 @@ make installcheck-parallel
    The tests will expect to contact the server at the local host and the
    default port number, unless directed otherwise by <envar>PGHOST</envar> and
    <envar>PGPORT</envar> environment variables.  The tests will be run in a
-   database named <literal>regression</>; any existing database by this name
+   database named <literal>regression</literal>; any existing database by this name
    will be dropped.
   </para>
 
   <para>
    The tests will also transiently create some cluster-wide objects, such as
    roles and tablespaces.  These objects will have names beginning with
-   <literal>regress_</literal>.  Beware of using <literal>installcheck</>
+   <literal>regress_</literal>.  Beware of using <literal>installcheck</literal>
    mode in installations that have any actual users or tablespaces named
    that way.
   </para>
@@ -127,9 +127,9 @@ make installcheck-parallel
    <title>Additional Test Suites</title>
 
   <para>
-   The <literal>make check</> and <literal>make installcheck</> commands
-   run only the <quote>core</> regression tests, which test built-in
-   functionality of the <productname>PostgreSQL</> server.  The source
+   The <literal>make check</literal> and <literal>make installcheck</literal> commands
+   run only the <quote>core</quote> regression tests, which test built-in
+   functionality of the <productname>PostgreSQL</productname> server.  The source
    distribution also contains additional test suites, most of them having
    to do with add-on functionality such as optional procedural languages.
   </para>
@@ -144,18 +144,18 @@ make installcheck-world
 </screen>
    These commands run the tests using temporary servers or an
    already-installed server, respectively, just as previously explained
-   for <literal>make check</> and <literal>make installcheck</>.  Other
+   for <literal>make check</literal> and <literal>make installcheck</literal>.  Other
    considerations are the same as previously explained for each method.
-   Note that <literal>make check-world</> builds a separate temporary
+   Note that <literal>make check-world</literal> builds a separate temporary
    installation tree for each tested module, so it requires a great deal
-   more time and disk space than <literal>make installcheck-world</>.
+   more time and disk space than <literal>make installcheck-world</literal>.
   </para>
 
   <para>
    Alternatively, you can run individual test suites by typing
-   <literal>make check</> or <literal>make installcheck</> in the appropriate
+   <literal>make check</literal> or <literal>make installcheck</literal> in the appropriate
    subdirectory of the build tree.  Keep in mind that <literal>make
-   installcheck</> assumes you've installed the relevant module(s), not
+   installcheck</literal> assumes you've installed the relevant module(s), not
    only the core server.
   </para>
 
@@ -167,43 +167,43 @@ make installcheck-world
    <listitem>
     <para>
      Regression tests for optional procedural languages (other than
-     <application>PL/pgSQL</>, which is tested by the core tests).
-     These are located under <filename>src/pl</>.
+     <application>PL/pgSQL</application>, which is tested by the core tests).
+     These are located under <filename>src/pl</filename>.
     </para>
    </listitem>
    <listitem>
     <para>
-     Regression tests for <filename>contrib</> modules,
-     located under <filename>contrib</>.
-     Not all <filename>contrib</> modules have tests.
+     Regression tests for <filename>contrib</filename> modules,
+     located under <filename>contrib</filename>.
+     Not all <filename>contrib</filename> modules have tests.
     </para>
    </listitem>
    <listitem>
     <para>
      Regression tests for the ECPG interface library,
-     located in <filename>src/interfaces/ecpg/test</>.
+     located in <filename>src/interfaces/ecpg/test</filename>.
     </para>
    </listitem>
    <listitem>
     <para>
      Tests stressing behavior of concurrent sessions,
-     located in <filename>src/test/isolation</>.
+     located in <filename>src/test/isolation</filename>.
     </para>
    </listitem>
    <listitem>
     <para>
      Tests of client programs under <filename>src/bin</filename>.  See
-     also <xref linkend="regress-tap">.
+     also <xref linkend="regress-tap"/>.
     </para>
    </listitem>
   </itemizedlist>
 
   <para>
-   When using <literal>installcheck</> mode, these tests will destroy any
-   existing databases named <literal>pl_regression</>,
-   <literal>contrib_regression</>, <literal>isolation_regression</>,
-   <literal>ecpg1_regression</>, or <literal>ecpg2_regression</>, as well as
-   <literal>regression</>.
+   When using <literal>installcheck</literal> mode, these tests will destroy any
+   existing databases named <literal>pl_regression</literal>,
+   <literal>contrib_regression</literal>, <literal>isolation_regression</literal>,
+   <literal>ecpg1_regression</literal>, or <literal>ecpg2_regression</literal>, as well as
+   <literal>regression</literal>.
   </para>
 
   <para>
@@ -272,7 +272,7 @@ make check EXTRA_TESTS=numeric_big
 <screen>
 make check EXTRA_TESTS='collate.icu.utf8 collate.linux.utf8' LANG=en_US.utf8
 </screen>
-    The <literal>collate.linux.utf8</> test works only on Linux/glibc
+    The <literal>collate.linux.utf8</literal> test works only on Linux/glibc
     platforms.  The <literal>collate.icu.utf8</literal> test only works when
     support for ICU was built.  Both tests will only succeed when run in a
     database that uses UTF-8 encoding.
@@ -294,7 +294,7 @@ make check EXTRA_TESTS='collate.icu.utf8 collate.linux.utf8' LANG=en_US.utf8
 
   <para>
    To run the Hot Standby tests, first create a database
-   called <literal>regression</> on the primary:
+   called <literal>regression</literal> on the primary:
 <screen>
 psql -h primary -c "CREATE DATABASE regression"
 </screen>
@@ -311,7 +311,7 @@ psql -h primary -f src/test/regress/sql/hs_primary_setup.sql regression
    Now arrange for the default database connection to be to the standby
    server under test (for example, by setting the <envar>PGHOST</envar> and
    <envar>PGPORT</envar> environment variables).
-   Finally, run <literal>make standbycheck</> in the regression directory:
+   Finally, run <literal>make standbycheck</literal> in the regression directory:
 <screen>
 cd src/test/regress
 make standbycheck
@@ -355,7 +355,7 @@ make standbycheck
     <filename>src/test/regress/regression.diffs</filename>.
     (When running a test suite other than the core tests, these files
     of course appear in the relevant subdirectory,
-    not <filename>src/test/regress</>.)
+    not <filename>src/test/regress</filename>.)
    </para>
 
    <para>
@@ -367,11 +367,11 @@ make standbycheck
    </para>
 
    <para>
-    If for some reason a particular platform generates a <quote>failure</>
+    If for some reason a particular platform generates a <quote>failure</quote>
     for a given test, but inspection of the output convinces you that
     the result is valid, you can add a new comparison file to silence
     the failure report in future test runs.  See
-    <xref linkend="regress-variant"> for details.
+    <xref linkend="regress-variant"/> for details.
    </para>
 
    <sect2>
@@ -457,8 +457,8 @@ make check NO_LOCALE=1
      Some of the tests involve computing 64-bit floating-point numbers (<type>double
      precision</type>) from table columns. Differences in
      results involving mathematical functions of <type>double
-     precision</type> columns have been observed.  The <literal>float8</> and
-     <literal>geometry</> tests are particularly prone to small differences
+     precision</type> columns have been observed.  The <literal>float8</literal> and
+     <literal>geometry</literal> tests are particularly prone to small differences
      across platforms, or even with different compiler optimization settings.
      Human eyeball comparison is needed to determine the real
      significance of these differences which are usually 10 places to
@@ -466,8 +466,8 @@ make check NO_LOCALE=1
     </para>
 
     <para>
-     Some systems display minus zero as <literal>-0</>, while others
-     just show <literal>0</>.
+     Some systems display minus zero as <literal>-0</literal>, while others
+     just show <literal>0</literal>.
     </para>
 
     <para>
@@ -485,23 +485,23 @@ make check NO_LOCALE=1
 You might see differences in which the same rows are output in a
 different order than what appears in the expected file.  In most cases
 this is not, strictly speaking, a bug.  Most of the regression test
-scripts are not so pedantic as to use an <literal>ORDER BY</> for every single
-<literal>SELECT</>, and so their result row orderings are not well-defined
+scripts are not so pedantic as to use an <literal>ORDER BY</literal> for every single
+<literal>SELECT</literal>, and so their result row orderings are not well-defined
 according to the SQL specification.  In practice, since we are
 looking at the same queries being executed on the same data by the same
 software, we usually get the same result ordering on all platforms,
-so the lack of <literal>ORDER BY</> is not a problem.  Some queries do exhibit
+so the lack of <literal>ORDER BY</literal> is not a problem.  Some queries do exhibit
 cross-platform ordering differences, however.  When testing against an
 already-installed server, ordering differences can also be caused by
 non-C locale settings or non-default parameter settings, such as custom values
-of <varname>work_mem</> or the planner cost parameters.
+of <varname>work_mem</varname> or the planner cost parameters.
     </para>
 
     <para>
 Therefore, if you see an ordering difference, it's not something to
-worry about, unless the query does have an <literal>ORDER BY</> that your
+worry about, unless the query does have an <literal>ORDER BY</literal> that your
 result is violating.  However, please report it anyway, so that we can add an
-<literal>ORDER BY</> to that particular query to eliminate the bogus
+<literal>ORDER BY</literal> to that particular query to eliminate the bogus
 <quote>failure</quote> in future releases.
     </para>
 
@@ -519,18 +519,18 @@ exclusion of those that don't.
 
     <para>
      If the <literal>errors</literal> test results in a server crash
-     at the <literal>select infinite_recurse()</> command, it means that
+     at the <literal>select infinite_recurse()</literal> command, it means that
      the platform's limit on process stack size is smaller than the
-     <xref linkend="guc-max-stack-depth"> parameter indicates.  This
+     <xref linkend="guc-max-stack-depth"/> parameter indicates.  This
      can be fixed by running the server under a higher stack
      size limit (4MB is recommended with the default value of
-     <varname>max_stack_depth</>).  If you are unable to do that, an
-     alternative is to reduce the value of <varname>max_stack_depth</>.
+     <varname>max_stack_depth</varname>).  If you are unable to do that, an
+     alternative is to reduce the value of <varname>max_stack_depth</varname>.
     </para>
 
     <para>
-     On platforms supporting <function>getrlimit()</>, the server should
-     automatically choose a safe value of <varname>max_stack_depth</>;
+     On platforms supporting <function>getrlimit()</function>, the server should
+     automatically choose a safe value of <varname>max_stack_depth</varname>;
      so unless you've manually overridden this setting, a failure of this
      kind is a reportable bug.
     </para>
@@ -559,7 +559,7 @@ diff results/random.out expected/random.out
      parameter settings could cause the tests to fail.  For example, changing
      parameters such as <varname>enable_seqscan</varname> or
      <varname>enable_indexscan</varname> could cause plan changes that would
-     affect the results of tests that use <command>EXPLAIN</>.
+     affect the results of tests that use <command>EXPLAIN</command>.
     </para>
    </sect2>
   </sect1>
@@ -570,7 +570,7 @@ diff results/random.out expected/random.out
 
    <para>
     Since some of the tests inherently produce environment-dependent
-    results, we have provided ways to specify alternate <quote>expected</>
+    results, we have provided ways to specify alternate <quote>expected</quote>
     result files.  Each regression test can have several comparison files
     showing possible results on different platforms.  There are two
     independent mechanisms for determining which comparison file is used
@@ -597,7 +597,7 @@ testname:output:platformpattern=comparisonfilename
     standard regression tests, this is always <literal>out</literal>. The
     value corresponds to the file extension of the output file.
     The platform pattern is a pattern in the style of the Unix
-    tool <command>expr</> (that is, a regular expression with an implicit
+    tool <command>expr</command> (that is, a regular expression with an implicit
     <literal>^</literal> anchor at the start).  It is matched against the
     platform name as printed by <command>config.guess</command>.
     The comparison file name is the base name of the substitute result
@@ -607,7 +607,7 @@ testname:output:platformpattern=comparisonfilename
    <para>
     For example: some systems interpret very small floating-point values
     as zero, rather than reporting an underflow error.  This causes a
-    few differences in the <filename>float8</> regression test.
+    few differences in the <filename>float8</filename> regression test.
     Therefore, we provide a variant comparison file,
     <filename>float8-small-is-zero.out</filename>, which includes
     the results to be expected on these systems.  To silence the bogus
@@ -619,30 +619,30 @@ float8:out:i.86-.*-openbsd=float8-small-is-zero.out
     which will trigger on any machine where the output of
     <command>config.guess</command> matches <literal>i.86-.*-openbsd</literal>.
     Other lines
-    in <filename>resultmap</> select the variant comparison file for other
+    in <filename>resultmap</filename> select the variant comparison file for other
     platforms where it's appropriate.
    </para>
 
    <para>
     The second selection mechanism for variant comparison files is
-    much more automatic: it simply uses the <quote>best match</> among
+    much more automatic: it simply uses the <quote>best match</quote> among
     several supplied comparison files.  The regression test driver
     script considers both the standard comparison file for a test,
-    <literal><replaceable>testname</>.out</>, and variant files named
-    <literal><replaceable>testname</>_<replaceable>digit</>.out</>
-    (where the <replaceable>digit</> is any single digit
-    <literal>0</>-<literal>9</>).  If any such file is an exact match,
+    <literal><replaceable>testname</replaceable>.out</literal>, and variant files named
+    <literal><replaceable>testname</replaceable>_<replaceable>digit</replaceable>.out</literal>
+    (where the <replaceable>digit</replaceable> is any single digit
+    <literal>0</literal>-<literal>9</literal>).  If any such file is an exact match,
     the test is considered to pass; otherwise, the one that generates
     the shortest diff is used to create the failure report.  (If
     <filename>resultmap</filename> includes an entry for the particular
-    test, then the base <replaceable>testname</> is the substitute
+    test, then the base <replaceable>testname</replaceable> is the substitute
     name given in <filename>resultmap</filename>.)
    </para>
 
    <para>
     For example, for the <literal>char</literal> test, the comparison file
     <filename>char.out</filename> contains results that are expected
-    in the <literal>C</> and <literal>POSIX</> locales, while
+    in the <literal>C</literal> and <literal>POSIX</literal> locales, while
     the file <filename>char_1.out</filename> contains results sorted as
     they appear in many other locales.
    </para>
@@ -652,7 +652,7 @@ float8:out:i.86-.*-openbsd=float8-small-is-zero.out
     results, but it can be used in any situation where the test results
     cannot be predicted easily from the platform name alone.  A limitation of
     this mechanism is that the test driver cannot tell which variant is
-    actually <quote>correct</> for the current environment; it will just pick
+    actually <quote>correct</quote> for the current environment; it will just pick
     the variant that seems to work best.  Therefore it is safest to use this
     mechanism only for variant results that you are willing to consider
     equally valid in all contexts.
@@ -668,7 +668,7 @@ float8:out:i.86-.*-openbsd=float8-small-is-zero.out
     under <filename>src/bin</filename>, use the Perl TAP tools and are run
     using the Perl testing program <command>prove</command>.  You can pass
     command-line options to <command>prove</command> by setting
-    the <command>make</command> variable <varname>PROVE_FLAGS</>, for example:
+    the <command>make</command> variable <varname>PROVE_FLAGS</varname>, for example:
 <programlisting>
 make -C src/bin check PROVE_FLAGS='--timer'
 </programlisting>
@@ -706,6 +706,19 @@ make coverage-html
     The <command>make</command> commands also work in subdirectories.
    </para>
 
+   <para>
+    If you don't have <command>lcov</command> or prefer text output over an
+    HTML report, you can also run
+<screen>
+make coverage
+</screen>
+    instead of <literal>make coverage-html</literal>, which will
+    produce <filename>.gcov</filename> output files for each source file
+    relevant to the test.  (<literal>make coverage</literal> and <literal>make
+    coverage-html</literal> will overwrite each other's files, so mixing them
+    might be confusing.)
+   </para>
+
    <para>
     To reset the execution counts between test runs, run:
 <screen>
diff --git a/doc/src/sgml/release-10.sgml b/doc/src/sgml/release-10.sgml
index 269f1aac86..e8b34086b7 100644
--- a/doc/src/sgml/release-10.sgml
+++ b/doc/src/sgml/release-10.sgml
@@ -1,26 +1,2312 @@
 <!-- doc/src/sgml/release-10.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-10-3">
+  <title>Release 10.3</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-03-01</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 10.2.
+   For information about new features in major release 10, see
+   <xref linkend="release-10"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 10.3</title>
+
+   <para>
+    A dump/restore is not required for those running 10.X.
+   </para>
+
+   <para>
+    However, if you run an installation in which not all users are mutually
+    trusting, or if you maintain an application or extension that is
+    intended for use in arbitrary situations, it is strongly recommended
+    that you read the documentation changes described in the first changelog
+    entry below, and take suitable steps to ensure that your installation or
+    code is secure.
+   </para>
+
+   <para>
+    Also, the changes described in the second changelog entry below may
+    cause functions used in index expressions or materialized views to fail
+    during auto-analyze, or when reloading from a dump.  After upgrading,
+    monitor the server logs for such problems, and fix affected functions.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 10.2,
+    see <xref linkend="release-10-2"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [5770172cb] 2018-02-26 07:39:44 -0800
+Branch: REL_10_STABLE [ee0d1966e] 2018-02-26 07:39:47 -0800
+Branch: REL9_6_STABLE [70396dbe3] 2018-02-26 07:39:48 -0800
+Branch: REL9_5_STABLE [1f47ea7b8] 2018-02-26 07:39:48 -0800
+Branch: REL9_4_STABLE [f28955e38] 2018-02-26 07:39:48 -0800
+Branch: REL9_3_STABLE [41ee473a4] 2018-02-26 07:39:48 -0800
+-->
+     <para>
+      Document how to configure installations and applications to guard
+      against search-path-dependent trojan-horse attacks from other users
+      (Noah Misch)
+     </para>
+
+     <para>
+      Using a <varname>search_path</varname> setting that includes any
+      schemas writable by a hostile user enables that user to capture
+      control of queries and then run arbitrary SQL code with the
+      permissions of the attacked user.  While it is possible to write
+      queries that are proof against such hijacking, it is notationally
+      tedious, and it's very easy to overlook holes.  Therefore, we now
+      recommend configurations in which no untrusted schemas appear in
+      one's search path.  Relevant documentation appears in
+      <xref linkend="ddl-schemas-patterns"/> (for database administrators and users),
+      <xref linkend="libpq-connect"/> (for application authors),
+      <xref linkend="extend-extensions-style"/>  (for extension authors), and
+      <xref linkend="sql-createfunction"/> (for authors
+      of <literal>SECURITY DEFINER</literal> functions).
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [582edc369] 2018-02-26 07:39:44 -0800
+Branch: REL_10_STABLE [10d598354] 2018-02-26 07:39:47 -0800
+Branch: REL9_6_STABLE [e170b8c8c] 2018-02-26 07:39:48 -0800
+Branch: REL9_5_STABLE [91f3ffc52] 2018-02-26 07:39:48 -0800
+Branch: REL9_4_STABLE [928bca1a3] 2018-02-26 07:39:48 -0800
+Branch: REL9_3_STABLE [3db38b0ce] 2018-02-26 07:39:48 -0800
+Author: Noah Misch <noah@leadboat.com>
+Branch: REL9_4_STABLE [461c32b55] 2018-02-26 07:39:48 -0800
+Branch: REL9_3_STABLE [de8ffd666] 2018-02-26 07:39:48 -0800
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [3d2aed664] 2018-02-26 10:18:21 -0500
+Branch: REL_10_STABLE [b8a2908f0] 2018-02-26 10:18:22 -0500
+Branch: REL9_6_STABLE [815172ba8] 2018-02-26 10:18:22 -0500
+Branch: REL9_5_STABLE [a8fc37a63] 2018-02-26 10:18:22 -0500
+Branch: REL9_4_STABLE [9f6e5296a] 2018-02-26 10:18:22 -0500
+Branch: REL9_3_STABLE [fe8b95b7e] 2018-02-26 10:18:22 -0500
+-->
+     <para>
+      Avoid use of insecure <varname>search_path</varname> settings
+      in <application>pg_dump</application> and other client programs
+      (Noah Misch, Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</application>,
+      <application>pg_upgrade</application>,
+      <application>vacuumdb</application> and
+      other <productname>PostgreSQL</productname>-provided applications were
+      themselves vulnerable to the type of hijacking described in the previous
+      changelog entry; since these applications are commonly run by
+      superusers, they present particularly attractive targets.  To make them
+      secure whether or not the installation as a whole has been secured,
+      modify them to include only the <structname>pg_catalog</structname>
+      schema in their <varname>search_path</varname> settings.
+      Autovacuum worker processes now do the same, as well.
+     </para>
+
+     <para>
+      In cases where user-provided functions are indirectly executed by
+      these programs &mdash; for example, user-provided functions in index
+      expressions &mdash; the tighter <varname>search_path</varname> may
+      result in errors, which will need to be corrected by adjusting those
+      user-provided functions to not assume anything about what search path
+      they are invoked under.  That has always been good practice, but now
+      it will be necessary for correct behavior.
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [bc1adc651] 2018-02-23 22:13:21 -0500
+Branch: REL_10_STABLE [b9bf23abb] 2018-02-23 22:09:26 -0500
+-->
+     <para>
+      Prevent logical replication from trying to ship changes for
+      unpublishable relations (Peter Eisentraut)
+     </para>
+
+     <para>
+      A publication marked <literal>FOR ALL TABLES</literal> would
+      incorrectly ship changes in materialized views
+      and <structname>information_schema</structname> tables, which are
+      supposed to be omitted from the change stream.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [159efe4af] 2018-02-19 16:00:31 -0500
+Branch: REL_10_STABLE [517e0fe86] 2018-02-19 16:00:18 -0500
+Branch: REL9_6_STABLE [795f2112e] 2018-02-19 16:00:18 -0500
+Branch: REL9_5_STABLE [340d63bfb] 2018-02-19 16:00:18 -0500
+Branch: REL9_4_STABLE [e11b6488e] 2018-02-19 16:00:18 -0500
+Branch: REL9_3_STABLE [ea6d67cf8] 2018-02-19 16:00:18 -0500
+-->
+     <para>
+      Fix misbehavior of concurrent-update rechecks with CTE references
+      appearing in subplans (Tom Lane)
+     </para>
+
+     <para>
+      If a CTE (<literal>WITH</literal> clause reference) is used in an
+      InitPlan or SubPlan, and the query requires a recheck due to trying
+      to update or lock a concurrently-updated row, incorrect results could
+      be obtained.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9afd513df] 2018-02-23 13:47:33 -0500
+Branch: REL_10_STABLE [c458970ad] 2018-02-23 13:47:33 -0500
+Branch: REL9_6_STABLE [e7c02a54a] 2018-02-23 13:47:33 -0500
+Branch: REL9_5_STABLE [7dc5f316f] 2018-02-23 13:47:33 -0500
+Branch: REL9_4_STABLE [f6dd08489] 2018-02-23 13:47:33 -0500
+Branch: REL9_3_STABLE [71a0d0c5a] 2018-02-23 13:47:33 -0500
+-->
+     <para>
+      Fix planner failures with overlapping mergejoin clauses in an outer
+      join (Tom Lane)
+     </para>
+
+     <para>
+      These mistakes led to <quote>left and right pathkeys do not match in
+      mergejoin</quote> or <quote>outer pathkeys do not match
+      mergeclauses</quote> planner errors in corner cases.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [38b41f182] 2018-02-21 18:40:24 -0500
+Branch: REL_10_STABLE [5ab5d21aa] 2018-02-21 18:40:24 -0500
+Branch: REL9_6_STABLE [66e203c85] 2018-02-21 18:40:24 -0500
+Branch: REL9_5_STABLE [9936f1499] 2018-02-21 18:40:24 -0500
+Branch: REL9_4_STABLE [2d12c5593] 2018-02-21 18:40:24 -0500
+Branch: REL9_3_STABLE [d3b0a23a2] 2018-02-21 18:40:24 -0500
+-->
+     <para>
+      Repair <application>pg_upgrade</application>'s failure to
+      preserve <structfield>relfrozenxid</structfield> for materialized
+      views (Tom Lane, Andres Freund)
+     </para>
+
+     <para>
+      This oversight could lead to data corruption in materialized views
+      after an upgrade, manifesting as <quote>could not access status of
+      transaction</quote> or <quote>found xmin from before
+      relfrozenxid</quote> errors.  The problem would be more likely to
+      occur in seldom-refreshed materialized views, or ones that were
+      maintained only with <command>REFRESH MATERIALIZED VIEW
+      CONCURRENTLY</command>.
+     </para>
+
+     <para>
+      If such corruption is observed, it can be repaired by refreshing the
+      materialized view (without <literal>CONCURRENTLY</literal>).
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [3486bcf9e] 2018-02-20 11:23:42 -0500
+Branch: REL_10_STABLE [6753f6c41] 2018-02-20 11:23:34 -0500
+-->
+     <para>
+      Fix incorrect <application>pg_dump</application> output for some
+      non-default sequence limit values (Alexey Bashtanov)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [5c9f2564f] 2018-02-11 13:24:15 -0500
+Branch: REL_10_STABLE [1298fccef] 2018-02-11 13:24:15 -0500
+-->
+     <para>
+      Fix <application>pg_dump</application>'s mishandling
+      of <literal>STATISTICS</literal> objects (Tom Lane)
+     </para>
+
+     <para>
+      An extended statistics object's schema was mislabeled in the dump's
+      table of contents, possibly leading to the wrong results in a
+      schema-selective restore.  Its ownership was not correctly restored,
+      either.  Also, change the logic so that statistics objects are
+      dumped/restored, or not, as independent objects rather than tying
+      them to the dump/restore decision for the table they are on.  The
+      original definition could not scale to the planned future extension to
+      cross-table statistics.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e748e902d] 2018-02-14 14:47:18 -0500
+Branch: REL_10_STABLE [4081e1136] 2018-02-14 14:47:18 -0500
+Branch: REL9_6_STABLE [0a2381d13] 2018-02-14 14:47:18 -0500
+Branch: REL9_5_STABLE [db1c597f3] 2018-02-14 14:47:18 -0500
+Branch: REL9_4_STABLE [bd8718637] 2018-02-14 14:47:18 -0500
+Branch: REL9_3_STABLE [457e9e88e] 2018-02-14 14:47:18 -0500
+-->
+     <para>
+      Fix incorrect reporting of PL/Python function names in
+      error <literal>CONTEXT</literal> stacks (Tom Lane)
+     </para>
+
+     <para>
+      An error occurring within a nested PL/Python function call (that is,
+      one reached via a SPI query from another PL/Python function) would
+      result in a stack trace showing the inner function's name twice,
+      rather than the expected results.  Also, an error in a nested
+      PL/Python <literal>DO</literal> block could result in a null pointer
+      dereference crash on some platforms.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8af87f411] 2018-02-23 14:39:17 -0500
+Branch: REL_10_STABLE [0222e897d] 2018-02-23 14:39:18 -0500
+Branch: REL9_6_STABLE [be87cd2a0] 2018-02-23 14:39:20 -0500
+Branch: REL9_5_STABLE [753875ed4] 2018-02-23 14:39:21 -0500
+Branch: REL9_4_STABLE [3ba503bde] 2018-02-23 14:39:22 -0500
+Branch: REL9_3_STABLE [a7a6051cf] 2018-02-23 14:39:23 -0500
+-->
+     <para>
+      Allow <filename>contrib/auto_explain</filename>'s
+      <varname>log_min_duration</varname> setting to range up
+      to <literal>INT_MAX</literal>, or about 24 days instead of 35 minutes
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [935dee9ad] 2018-02-09 15:54:45 -0500
+Author: Andres Freund <andres@anarazel.de>
+Branch: REL_10_STABLE [2ff2baa22] 2018-02-22 12:54:45 -0800
+Branch: REL9_6_STABLE [83fce670e] 2018-02-22 12:58:43 -0800
+-->
+     <para>
+      Mark assorted GUC variables as <literal>PGDLLIMPORT</literal>, to
+      ease porting extension modules to Windows (Metin Doslu)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-10-2">
+  <title>Release 10.2</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-02-08</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 10.1.
+   For information about new features in major release 10, see
+   <xref linkend="release-10"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 10.2</title>
+
+   <para>
+    A dump/restore is not required for those running 10.X.
+   </para>
+
+   <para>
+    However,
+    if you use <filename>contrib/cube</filename>'s <literal>~&gt;</literal>
+    operator, see the entry below about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 10.1,
+    see <xref linkend="release-10-1"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [3492a0af0] 2018-02-05 10:37:30 -0500
+Branch: REL_10_STABLE [fe921a360] 2018-02-05 10:37:30 -0500
+-->
+     <para>
+      Fix processing of partition keys containing multiple expressions
+      (&Aacute;lvaro Herrera, David Rowley)
+     </para>
+
+     <para>
+      This error led to crashes or, with carefully crafted input, disclosure
+      of arbitrary backend memory.
+      (CVE-2018-1052)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a926eb84e] 2018-02-05 10:58:27 -0500
+Branch: REL_10_STABLE [6ba52aeb2] 2018-02-05 10:58:27 -0500
+Branch: REL9_6_STABLE [1341e017d] 2018-02-05 10:58:27 -0500
+Branch: REL9_5_STABLE [17aa02368] 2018-02-05 10:58:27 -0500
+Branch: REL9_4_STABLE [c3456208d] 2018-02-05 10:58:27 -0500
+Branch: REL9_3_STABLE [9c59e48a2] 2018-02-05 10:58:27 -0500
+-->
+     <para>
+      Ensure that all temporary files made
+      by <application>pg_upgrade</application> are non-world-readable
+      (Tom Lane, Noah Misch)
+     </para>
+
+     <para>
+      <application>pg_upgrade</application> normally restricts its
+      temporary files to be readable and writable only by the calling user.
+      But the temporary file containing <literal>pg_dumpall -g</literal>
+      output would be group- or world-readable, or even writable, if the
+      user's <literal>umask</literal> setting allows.  In typical usage on
+      multi-user machines, the <literal>umask</literal> and/or the working
+      directory's permissions would be tight enough to prevent problems;
+      but there may be people using <application>pg_upgrade</application>
+      in scenarios where this oversight would permit disclosure of database
+      passwords to unfriendly eyes.
+      (CVE-2018-1053)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [9c2f0a6c3] 2017-12-14 18:20:47 -0800
+Branch: REL_10_STABLE [1224383e8] 2017-12-14 18:20:48 -0800
+Branch: REL9_6_STABLE [937494c0e] 2017-12-14 18:20:48 -0800
+Branch: REL9_5_STABLE [32c0295b1] 2017-12-14 18:20:48 -0800
+Branch: REL9_4_STABLE [4eff5a8c9] 2017-12-14 18:20:48 -0800
+Branch: REL9_3_STABLE [387abe870] 2017-12-14 18:20:48 -0800
+-->
+     <para>
+      Fix vacuuming of tuples that were updated while key-share locked
+      (Andres Freund, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In some cases <command>VACUUM</command> would fail to remove such
+      tuples even though they are now dead, leading to assorted data
+      corruption scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [ad25a6b1f] 2018-02-01 15:23:45 -0500
+Branch: REL_10_STABLE [b94988fad] 2018-02-01 15:31:31 -0500
+-->
+     <para>
+      Fix failure to mark a hash index's metapage dirty after
+      adding a new overflow page, potentially leading to index corruption
+      (Lixian Zou, Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [3b2787e1f] 2017-11-16 14:19:27 -0500
+Branch: REL_10_STABLE [c8df4831e] 2017-11-16 15:24:19 -0500
+Branch: REL9_6_STABLE [19648ce55] 2017-11-16 15:26:49 -0500
+-->
+     <para>
+      Ensure that vacuum will always clean up the pending-insertions list of
+      a GIN index (Masahiko Sawada)
+     </para>
+
+     <para>
+      This is necessary to ensure that dead index entries get removed.
+      The old code got it backwards, allowing vacuum to skip the cleanup if
+      some other process were running cleanup concurrently, thus risking
+      invalid entries being left behind in the index.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [272c2ab9f] 2018-01-09 17:06:31 -0300
+Branch: REL_10_STABLE [37dd11281] 2018-01-09 17:08:10 -0300
+Branch: REL9_6_STABLE [012683866] 2018-01-09 17:07:47 -0300
+Branch: REL9_5_STABLE [38a23790e] 2018-01-09 17:07:36 -0300
+Branch: REL9_4_STABLE [c61879640] 2018-01-09 17:07:24 -0300
+Branch: REL9_3_STABLE [469fa9ad6] 2018-01-09 17:07:00 -0300
+-->
+     <para>
+      Fix inadequate buffer locking in some LSN fetches (Jacob Champion,
+      Asim Praveen, Ashwin Agrawal)
+     </para>
+
+     <para>
+      These errors could result in misbehavior under concurrent load.
+      The potential consequences have not been characterized fully.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [90947674f] 2018-01-12 12:24:50 -0500
+Branch: REL_10_STABLE [d3ca1a6c3] 2018-01-12 12:24:50 -0500
+Branch: REL9_6_STABLE [6520d4a96] 2018-01-12 12:24:50 -0500
+Branch: REL9_5_STABLE [ff99d7761] 2018-01-12 12:24:50 -0500
+-->
+     <para>
+      Fix incorrect query results from cases involving flattening of
+      subqueries whose outputs are used in <literal>GROUPING SETS</literal>
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [3ccdc6f9a] 2018-01-31 15:43:11 -0500
+Branch: REL_10_STABLE [86fba2865] 2018-01-31 16:08:39 -0500
+-->
+     <para>
+      Fix handling of list partitioning constraints for partition keys of
+      boolean or array types (Amit Langote)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [680d54050] 2018-01-12 15:46:37 -0500
+Branch: REL_10_STABLE [55e5eb4d9] 2018-01-12 15:46:37 -0500
+Branch: REL9_6_STABLE [c2a7044a5] 2018-01-12 15:46:37 -0500
+Branch: REL9_5_STABLE [a99922f96] 2018-01-12 15:46:37 -0500
+Branch: REL9_4_STABLE [8b0e5e7e7] 2018-01-12 15:46:38 -0500
+Branch: REL9_3_STABLE [4e7170058] 2018-01-12 15:46:38 -0500
+-->
+     <para>
+      Avoid unnecessary failure in a query on an inheritance tree that
+      occurs concurrently with some child table being removed from the tree
+      by <command>ALTER TABLE NO INHERIT</command> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [54eff5311] 2018-01-02 19:16:16 -0300
+Branch: REL_10_STABLE [6d2a9ae0e] 2018-01-02 19:16:16 -0300
+Branch: REL9_6_STABLE [fb7b43903] 2018-01-02 19:16:16 -0300
+Branch: REL9_5_STABLE [82f1c3b7d] 2018-01-02 19:16:16 -0300
+Branch: REL9_4_STABLE [47a3a1317] 2018-01-02 19:16:16 -0300
+-->
+     <para>
+      Fix spurious deadlock failures when multiple sessions are
+      running <command>CREATE INDEX CONCURRENTLY</command> (Jeff Janes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Teodor Sigaev <teodor@sigaev.ru>
+Branch: master [ad337c76b] 2017-12-27 18:25:37 +0300
+Branch: REL_10_STABLE [bdbf29aae] 2017-12-27 18:26:58 +0300
+-->
+     <para>
+      During <command>VACUUM FULL</command>, update the table's size fields
+      in <structname>pg_class</structname> sooner (Amit Kapila)
+     </para>
+
+     <para>
+      This prevents poor behavior when rebuilding hash indexes on the
+      table, since those use the <structname>pg_class</structname>
+      statistics to govern the initial hash size.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c4c2885cb] 2017-12-22 12:08:06 -0500
+Branch: REL_10_STABLE [c252ccda7] 2017-12-22 12:08:18 -0500
+-->
+     <para>
+      Fix
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>
+      over zero columns (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [005ac298b] 2017-12-08 12:13:04 -0500
+Branch: REL_10_STABLE [a2c6cf366] 2017-12-08 12:25:41 -0500
+-->
+     <para>
+      Disallow identity columns on typed tables and partitions
+      (Michael Paquier)
+     </para>
+
+     <para>
+      These cases will be treated as unsupported features for now.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [2d2d06b7e] 2017-12-08 09:18:18 -0500
+Branch: REL_10_STABLE [ee5b59549] 2017-12-08 09:39:55 -0500
+Branch: master [533c5d8bd] 2018-02-02 14:39:10 -0500
+Branch: REL_10_STABLE [1597948c9] 2018-02-02 15:06:52 -0500
+-->
+     <para>
+      Fix assorted failures to apply the correct default value when
+      inserting into an identity column (Michael Paquier, Peter Eisentraut)
+     </para>
+
+     <para>
+      In several contexts, notably <command>COPY</command>
+      and <command>ALTER TABLE ADD COLUMN</command>, the expected default
+      value was not applied and instead a null value was inserted.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9a785ad57] 2017-11-27 17:54:07 -0500
+Branch: REL_10_STABLE [a57aa430b] 2017-11-27 17:54:09 -0500
+Branch: REL9_6_STABLE [06ba53096] 2017-11-27 17:54:10 -0500
+Branch: REL9_5_STABLE [39f180fdd] 2017-11-27 17:54:11 -0500
+-->
+     <para>
+      Fix failures when an inheritance tree contains foreign child tables
+      (Etsuro Fujita)
+     </para>
+
+     <para>
+      A mix of regular and foreign tables in an inheritance tree resulted in
+      creation of incorrect plans for <command>UPDATE</command>
+      and <command>DELETE</command> queries.  This led to visible failures in
+      some cases, notably when there are row-level triggers on a foreign
+      child table.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9b63c13f0] 2017-11-25 14:15:48 -0500
+Branch: REL_10_STABLE [5dc7faa91] 2017-11-25 14:15:48 -0500
+Branch: REL9_6_STABLE [497e79b96] 2017-11-25 14:15:48 -0500
+Branch: REL9_5_STABLE [ae6ed0784] 2017-11-25 14:15:48 -0500
+Branch: REL9_4_STABLE [2e105cf6d] 2017-11-25 14:15:48 -0500
+Branch: REL9_3_STABLE [d538f6568] 2017-11-25 14:15:48 -0500
+-->
+     <para>
+      Repair failure with correlated sub-<literal>SELECT</literal>
+      inside <literal>VALUES</literal> inside a <literal>LATERAL</literal>
+      subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [bb94ce4d2] 2018-01-23 16:50:34 -0500
+Branch: REL_10_STABLE [c5e59bb60] 2018-01-23 16:50:34 -0500
+Branch: REL9_6_STABLE [ae3699a6a] 2018-01-23 16:50:35 -0500
+Branch: REL9_5_STABLE [8a2228b2f] 2018-01-23 16:50:35 -0500
+Branch: REL9_4_STABLE [54e1599c7] 2018-01-23 16:50:35 -0500
+Branch: REL9_3_STABLE [b100a5274] 2018-01-23 16:50:35 -0500
+-->
+     <para>
+      Fix <quote>could not devise a query plan for the given query</quote>
+      planner failure for some cases involving nested <literal>UNION
+      ALL</literal> inside a lateral subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ecc27d55f] 2017-12-04 11:51:43 -0500
+Branch: REL_10_STABLE [bf2b317f1] 2017-12-04 11:51:43 -0500
+-->
+     <para>
+      Allow functional dependency statistics to be used for boolean columns
+      (Tom Lane)
+     </para>
+
+     <para>
+      Previously, although extended statistics could be declared and
+      collected on boolean columns, the planner failed to apply them.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [df3a66e28] 2017-11-25 11:48:09 -0500
+Branch: REL_10_STABLE [b9fc2d0b9] 2017-11-25 11:48:09 -0500
+-->
+     <para>
+      Avoid underestimating the number of groups emitted by subqueries
+      containing set-returning functions in their grouping columns (Tom Lane)
+     </para>
+
+     <para>
+      Cases similar to <literal>SELECT DISTINCT unnest(foo)</literal> got a
+      lower output rowcount estimate in 10.0 than they did in earlier
+      releases, possibly resulting in unfavorable plan choices.  Restore the
+      prior estimation behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Simon Riggs <simon@2ndQuadrant.com>
+Branch: master [7e17a6889] 2017-11-22 16:28:14 +1100
+Branch: REL_10_STABLE [7015bb389] 2017-11-28 09:37:22 +0000
+-->
+     <para>
+      Fix use of triggers in logical replication workers (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [df9f682c7] 2018-01-05 12:17:10 -0300
+Branch: REL_10_STABLE [a19c262f3] 2018-01-05 12:17:10 -0300
+Branch: REL9_6_STABLE [9a5e4a6e0] 2018-01-05 12:17:10 -0300
+Branch: REL9_5_STABLE [132cd58d6] 2018-01-05 12:17:10 -0300
+Branch: REL9_4_STABLE [f68c49f86] 2018-01-05 12:17:10 -0300
+-->
+     <para>
+      Fix logical decoding to correctly clean up disk files for crashed
+      transactions (Atsushi Torikoshi)
+     </para>
+
+     <para>
+      Logical decoding may spill WAL records to disk for transactions
+      generating many WAL records.  Normally these files are cleaned up
+      after the transaction's commit or abort record arrives; but if
+      no such record is ever seen, the removal code misbehaved.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [0fedb4ea6] 2017-12-14 11:13:14 -0500
+Branch: REL_10_STABLE [14c15b1f4] 2017-12-14 11:29:34 -0500
+Branch: REL9_6_STABLE [c28e0b1e0] 2017-12-14 11:31:13 -0500
+Branch: REL9_5_STABLE [87056267e] 2017-12-14 11:32:00 -0500
+Branch: REL9_4_STABLE [f5c7e0cdd] 2017-12-14 11:32:25 -0500
+-->
+     <para>
+      Fix walsender timeout failure and failure to respond to interrupts
+      when processing a large transaction (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8a906204a] 2018-01-09 12:09:30 -0500
+Branch: REL_10_STABLE [1f5adbd79] 2018-01-09 12:09:30 -0500
+-->
+     <para>
+      Fix race condition during replication origin drop that could allow the
+      dropping process to wait indefinitely (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Simon Riggs <simon@2ndQuadrant.com>
+Branch: master [6668a54eb] 2018-01-06 11:48:21 +0000
+Branch: REL_10_STABLE [76e117dbe] 2018-01-28 16:14:31 +0000
+-->
+     <para>
+      Allow members of the <literal>pg_read_all_stats</literal> role to see
+      walsender statistics in the <structname>pg_stat_replication</structname>
+      view (Feike Steenbergen)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Magnus Hagander <magnus@hagander.net>
+Branch: master [d02974e32] 2017-12-29 16:28:32 +0100
+Branch: REL_10_STABLE [b38c3d58e] 2017-12-29 16:22:43 +0100
+-->
+     <para>
+      Show walsenders that are sending base backups as active in
+      the <structname>pg_stat_activity</structname> view (Magnus Hagander)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [38d485fda] 2018-01-30 16:50:30 -0500
+Branch: REL_10_STABLE [167a22b2a] 2018-01-30 17:05:35 -0500
+-->
+     <para>
+      Fix reporting of <literal>scram-sha-256</literal> authentication
+      method in the <structname>pg_hba_file_rules</structname> view
+      (Michael Paquier)
+     </para>
+
+     <para>
+      Previously this was printed as <literal>scram-sha256</literal>,
+      possibly confusing users as to the correct spelling.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Joe Conway <mail@joeconway.com>
+Branch: master [752714dd9] 2017-11-26 09:49:40 -0800
+Branch: REL_10_STABLE [9e051b674] 2017-11-26 09:50:00 -0800
+Branch: REL9_6_STABLE [997015ef2] 2017-11-26 09:50:15 -0800
+Branch: REL9_5_STABLE [db714c62b] 2017-11-26 09:50:27 -0800
+Branch: REL9_4_STABLE [d8d9c97cd] 2017-11-26 09:50:42 -0800
+Branch: REL9_3_STABLE [69e5b1e9c] 2017-11-26 09:50:53 -0800
+-->
+     <para>
+      Fix <function>has_sequence_privilege()</function> to
+      support <literal>WITH GRANT OPTION</literal> tests,
+      as other privilege-testing functions do (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [2918fcedb] 2017-11-11 11:10:53 -0800
+Branch: REL_10_STABLE [30a5e940a] 2017-11-11 11:11:15 -0800
+Branch: REL9_6_STABLE [46fb15f48] 2017-11-11 11:11:19 -0800
+Branch: REL9_5_STABLE [e7083dfce] 2017-11-11 11:11:21 -0800
+Branch: REL9_4_STABLE [2f4061aff] 2017-11-11 11:11:24 -0800
+Branch: REL9_3_STABLE [d8406b9de] 2017-11-11 11:11:28 -0800
+Branch: master [4b865aee2] 2017-11-11 13:07:46 -0800
+Branch: REL_10_STABLE [075ced2a4] 2017-11-11 13:07:54 -0800
+Branch: REL9_6_STABLE [742471ef9] 2017-11-11 13:07:55 -0800
+Branch: REL9_5_STABLE [739f1f6ac] 2017-11-11 13:07:55 -0800
+Branch: REL9_4_STABLE [e48fb50d8] 2017-11-11 13:07:55 -0800
+Branch: REL9_3_STABLE [f5260d5ad] 2017-11-11 13:07:55 -0800
+-->
+     <para>
+      In databases using UTF8 encoding, ignore any XML declaration that
+      asserts a different encoding (Pavel Stehule, Noah Misch)
+     </para>
+
+     <para>
+      We always store XML strings in the database encoding, so allowing
+      libxml to act on a declaration of another encoding gave wrong results.
+      In encodings other than UTF8, we don't promise to support non-ASCII
+      XML data anyway, so retain the previous behavior for bug compatibility.
+      This change affects only <function>xpath()</function> and related
+      functions; other XML code paths already acted this way.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [ae65f6066] 2017-11-21 13:56:24 -0500
+Branch: REL_10_STABLE [5b2a87707] 2017-11-21 14:03:51 -0500
+Branch: REL9_6_STABLE [7c84bc0b3] 2017-11-21 14:30:33 -0500
+Branch: REL9_5_STABLE [c703aa625] 2017-11-21 14:34:26 -0500
+Branch: REL9_4_STABLE [294136d42] 2017-11-21 14:38:29 -0500
+Branch: REL9_3_STABLE [aa3a78c3d] 2017-11-21 14:45:29 -0500
+-->
+     <para>
+      Provide for forward compatibility with future minor protocol versions
+      (Robert Haas, Badrul Chowdhury)
+     </para>
+
+     <para>
+      Up to now, <productname>PostgreSQL</productname> servers simply
+      rejected requests to use protocol versions newer than 3.0, so that
+      there was no functional difference between the major and minor parts
+      of the protocol version number.  Allow clients to request versions 3.x
+      without failing, sending back a message showing that the server only
+      understands 3.0.  This makes no difference at the moment, but
+      back-patching this change should allow speedier introduction of future
+      minor protocol upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: REL_10_STABLE [218b024a7] 2017-12-08 10:17:46 -0500
+-->
+     <para>
+      Allow a client that supports SCRAM channel binding (such as v11 or
+      later <application>libpq</application>) to connect to a v10 server
+      (Michael Paquier)
+     </para>
+
+     <para>
+      v10 does not have this feature, and the connection-time negotiation
+      about whether to use it was done incorrectly.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [aced5a92b] 2018-01-05 19:21:30 -0500
+Branch: REL_10_STABLE [1c77e9908] 2018-01-05 19:21:30 -0500
+-->
+     <para>
+      Avoid live-lock in <function>ConditionVariableBroadcast()</function>
+      (Tom Lane, Thomas Munro)
+     </para>
+
+     <para>
+      Given repeatedly-unlucky timing, a process attempting to awaken all
+      waiters for a condition variable could loop indefinitely.  Due to the
+      limited usage of condition variables in v10, this affects only
+      parallel index scans and some operations on replication slots.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [59d1e2b95] 2017-12-21 09:24:30 -0500
+Branch: REL_10_STABLE [f3decdc94] 2017-12-21 09:24:48 -0500
+-->
+     <para>
+      Clean up waits for condition variables correctly during subtransaction
+      abort (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [80259d4db] 2018-01-09 12:34:57 -0500
+Branch: REL_10_STABLE [d56a5f994] 2018-01-09 12:34:46 -0500
+-->
+     <para>
+      Ensure that child processes that are waiting for a condition variable
+      will exit promptly if the postmaster process dies (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [fd7c0fa73] 2017-12-18 12:22:31 -0500
+Branch: REL_10_STABLE [b70ea4c75] 2017-12-18 12:31:10 -0500
+-->
+     <para>
+      Fix crashes in parallel queries using more than one Gather node
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [884a60840] 2017-12-13 16:15:44 -0500
+Branch: REL_10_STABLE [192ffe1cb] 2017-12-13 16:09:00 -0500
+-->
+     <para>
+      Fix hang in parallel index scan when processing a deleted or half-dead
+      index page (Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [c6755e233] 2017-11-28 11:44:59 -0500
+Branch: REL_10_STABLE [ec7629dfb] 2017-11-28 11:49:01 -0500
+-->
+     <para>
+      Avoid crash if parallel bitmap heap scan is unable to allocate a
+      shared memory segment (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [28724fd90] 2017-12-06 08:58:27 -0500
+Branch: REL_10_STABLE [a8ef4e81e] 2017-12-06 09:01:21 -0500
+Branch: REL9_6_STABLE [b75644066] 2017-12-06 09:04:02 -0500
+Branch: REL9_5_STABLE [0426a77ce] 2017-12-06 09:06:25 -0500
+Branch: REL9_4_STABLE [facd94e72] 2017-12-06 09:08:30 -0500
+Branch: master [2badb5afb] 2018-01-23 11:03:03 -0500
+Branch: REL_10_STABLE [383e4268f] 2018-01-23 11:13:42 -0500
+Branch: REL9_6_STABLE [2843c01a5] 2018-01-23 11:13:50 -0500
+-->
+     <para>
+      Cope with failure to start a parallel worker process
+      (Amit Kapila, Robert Haas)
+     </para>
+
+     <para>
+      Parallel query previously tended to hang indefinitely if a worker
+      could not be started, as the result of <literal>fork()</literal>
+      failure or other low-probability problems.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [445dbd82a] 2017-11-28 12:15:38 -0500
+Branch: REL_10_STABLE [dba6e75c1] 2017-11-28 12:19:19 -0500
+-->
+     <para>
+      Avoid unnecessary failure when no parallel workers can be obtained
+      during parallel query startup (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [8526bcb2d] 2017-12-19 12:21:56 -0500
+Branch: REL_10_STABLE [72567f617] 2017-12-19 12:44:21 -0500
+Branch: REL9_6_STABLE [2157a61b5] 2018-01-04 12:46:00 -0500
+-->
+     <para>
+      Fix collection of <command>EXPLAIN</command> statistics from parallel
+      workers (Amit Kapila, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [f94eec490] 2017-12-20 17:26:50 -0500
+Branch: REL_10_STABLE [7be0d775a] 2017-12-20 17:27:25 -0500
+-->
+     <para>
+      Ensure that query strings passed to parallel workers are correctly
+      null-terminated (Thomas Munro)
+     </para>
+
+     <para>
+      This prevents emitting garbage in postmaster log output from such
+      workers.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [751804998] 2017-11-14 15:03:55 -0500
+Branch: REL_10_STABLE [619a8c47d] 2017-11-14 17:49:49 -0500
+Branch: REL9_6_STABLE [4a15f87d2] 2017-11-14 17:49:49 -0500
+Branch: REL9_5_STABLE [d4e38489f] 2017-11-14 17:49:49 -0500
+-->
+     <para>
+      Avoid unsafe alignment assumptions when working
+      with <type>__int128</type> (Tom Lane)
+     </para>
+
+     <para>
+      Typically, compilers assume that <type>__int128</type> variables are
+      aligned on 16-byte boundaries, but our memory allocation
+      infrastructure isn't prepared to guarantee that, and increasing the
+      setting of MAXALIGN seems infeasible for multiple reasons.  Adjust the
+      code to allow use of <type>__int128</type> only when we can tell the
+      compiler to assume lesser alignment.  The only known symptom of this
+      problem so far is crashes in some parallel aggregation queries.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [35a528062] 2018-01-28 13:39:07 -0500
+Branch: REL_10_STABLE [1b2a3860d] 2018-01-28 13:39:07 -0500
+Branch: REL9_6_STABLE [4e9fb4bfe] 2018-01-28 13:39:07 -0500
+Branch: REL9_5_STABLE [e194f1383] 2018-01-28 13:39:07 -0500
+Branch: REL9_4_STABLE [06efc5cf5] 2018-01-28 13:39:07 -0500
+Branch: REL9_3_STABLE [c03fc8462] 2018-01-28 13:39:07 -0500
+-->
+     <para>
+      Prevent stack-overflow crashes when planning extremely deeply
+      nested set operations
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [2e668c522] 2018-01-27 13:52:24 -0500
+Branch: REL_10_STABLE [78433f41f] 2018-01-27 13:52:24 -0500
+-->
+     <para>
+      Avoid crash during an EvalPlanQual recheck of an indexscan that is the
+      inner child of a merge join (Tom Lane)
+     </para>
+
+     <para>
+      This could only happen during an update or <command>SELECT FOR
+      UPDATE</command> of a join, when there is a concurrent update of some
+      selected row.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [414cd434f] 2017-11-28 23:40:11 -0300
+Branch: REL_10_STABLE [d4607590b] 2017-11-28 23:42:42 -0300
+-->
+     <para>
+      Fix crash in autovacuum when extended statistics are defined
+      for a table but can't be computed (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [0c98d0dd5] 2017-11-10 14:21:32 -0500
+Branch: REL_10_STABLE [f9e2885d5] 2017-11-10 14:27:51 -0500
+Branch: REL9_6_STABLE [d380d080f] 2017-11-10 14:29:13 -0500
+Branch: REL9_5_STABLE [9efd83bfd] 2017-11-10 14:30:06 -0500
+Branch: REL9_4_STABLE [0bcdab58e] 2017-11-10 14:30:34 -0500
+Branch: REL9_3_STABLE [62906461c] 2017-11-10 14:30:48 -0500
+-->
+     <para>
+      Fix null-pointer crashes for some types of LDAP URLs appearing
+      in <filename>pg_hba.conf</filename> (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [ab9f2c429] 2018-01-29 11:24:57 -0800
+Branch: REL_10_STABLE [d1aac2998] 2018-01-29 11:24:57 -0800
+Branch: master [c068f8772] 2018-01-29 11:24:57 -0800
+Branch: REL_10_STABLE [d18d4bca8] 2018-01-29 11:24:57 -0800
+Branch: REL_10_STABLE [c0fda304d] 2018-01-29 11:24:57 -0800
+-->
+     <para>
+      Prevent out-of-memory failures due to excessive growth of simple hash
+      tables (Tomas Vondra, Andres Freund)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [3c1e9fd23] 2018-01-10 17:13:47 -0500
+Branch: REL_10_STABLE [08adf688f] 2018-01-10 17:13:29 -0500
+Branch: REL9_6_STABLE [122605194] 2018-01-10 17:13:29 -0500
+Branch: REL9_5_STABLE [10bcd4165] 2018-01-10 17:13:29 -0500
+Branch: REL9_4_STABLE [493cdc8ee] 2018-01-10 17:13:29 -0500
+Branch: REL9_3_STABLE [45bfef7fb] 2018-01-10 17:13:29 -0500
+-->
+     <para>
+      Fix sample <function>INSTR()</function> functions in the PL/pgSQL
+      documentation (Yugo Nagata, Tom Lane)
+     </para>
+
+     <para>
+      These functions are stated to
+      be <trademark class="registered">Oracle</trademark> compatible, but
+      they weren't exactly.  In particular, there was a discrepancy in the
+      interpretation of a negative third parameter: Oracle thinks that a
+      negative value indicates the last place where the target substring can
+      begin, whereas our functions took it as the last place where the
+      target can end.  Also, Oracle throws an error for a zero or negative
+      fourth parameter, whereas our functions returned zero.
+     </para>
+
+     <para>
+      The sample code has been adjusted to match Oracle's behavior more
+      precisely.  Users who have copied this code into their applications
+      may wish to update their copies.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [2b792ab09] 2018-01-22 12:06:18 -0500
+Branch: REL_10_STABLE [46246fd9d] 2018-01-22 12:06:18 -0500
+Branch: REL9_6_STABLE [52cc1b484] 2018-01-22 12:06:19 -0500
+Branch: REL9_5_STABLE [367e2b230] 2018-01-22 12:06:19 -0500
+Branch: REL9_4_STABLE [da83ca7d9] 2018-01-22 12:06:19 -0500
+Branch: REL9_3_STABLE [ef115621c] 2018-01-22 12:06:19 -0500
+-->
+     <para>
+      Fix <application>pg_dump</application> to make ACL (permissions),
+      comment, and security label entries reliably identifiable in archive
+      output formats (Tom Lane)
+     </para>
+
+     <para>
+      The <quote>tag</quote> portion of an ACL archive entry was usually
+      just the name of the associated object.  Make it start with the object
+      type instead, bringing ACLs into line with the convention already used
+      for comment and security label archive entries.  Also, fix the
+      comment and security label entries for the whole database, if present,
+      to make their tags start with <literal>DATABASE</literal> so that they
+      also follow this convention.  This prevents false matches in code that
+      tries to identify large-object-related entries by seeing if the tag
+      starts with <literal>LARGE OBJECT</literal>.  That could have resulted
+      in misclassifying entries as data rather than schema, with undesirable
+      results in a schema-only or data-only dump.
+     </para>
+
+     <para>
+      Note that this change has user-visible results in the output
+      of <command>pg_restore --list</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [3e68686e2] 2018-01-03 12:40:32 -0800
+Branch: REL_10_STABLE [e3fdb7c00] 2018-01-03 12:39:59 -0800
+Branch: REL9_6_STABLE [ceee51e38] 2018-01-03 12:39:59 -0800
+Branch: REL9_5_STABLE [ea4cbf8f1] 2018-01-03 12:39:59 -0800
+-->
+     <para>
+      Rename <application>pg_rewind</application>'s
+      <function>copy_file_range</function> function to avoid conflict
+      with new Linux system call of that name (Andres Freund)
+     </para>
+
+     <para>
+      This change prevents build failures with newer glibc versions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [649aeb123] 2018-01-13 14:57:49 +0100
+Branch: REL_10_STABLE [8b89b7aac] 2018-01-15 10:00:56 +0100
+Branch: REL9_6_STABLE [f082ef836] 2018-01-15 10:01:15 +0100
+Branch: REL9_5_STABLE [4eae1e6f5] 2018-01-15 10:02:03 +0100
+Branch: REL9_4_STABLE [2c1c4b060] 2018-01-15 10:02:16 +0100
+Branch: REL9_3_STABLE [a0f5890a6] 2018-01-15 10:02:23 +0100
+-->
+     <para>
+      In <application>ecpg</application>, detect indicator arrays that do
+      not have the correct length and report an error (David Rader)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Teodor Sigaev <teodor@sigaev.ru>
+Branch: master [563a053bd] 2018-01-11 14:41:14 +0300
+Branch: REL_10_STABLE [b8279a783] 2018-01-11 14:42:16 +0300
+Branch: REL9_6_STABLE [bda5281fd] 2018-01-11 14:43:13 +0300
+-->
+     <para>
+      Change the behavior of <filename>contrib/cube</filename>'s
+      <type>cube</type> <literal>~&gt;</literal> <type>int</type>
+      operator to make it compatible with KNN search (Alexander Korotkov)
+     </para>
+
+     <para>
+      The meaning of the second argument (the dimension selector) has been
+      changed to make it predictable which value is selected even when
+      dealing with cubes of varying dimensionalities.
+     </para>
+
+     <para>
+      This is an incompatible change, but since the point of the operator
+      was to be used in KNN searches, it seems rather useless as-is.
+      After installing this update, any expression indexes or materialized
+      views using this operator will need to be reindexed/refreshed.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d3f4e8a8a] 2017-11-25 14:42:10 -0500
+Branch: REL_10_STABLE [ddba32005] 2017-11-25 14:42:25 -0500
+Branch: REL9_6_STABLE [630aceda5] 2017-11-25 14:42:32 -0500
+Branch: REL9_5_STABLE [47226971e] 2017-11-25 14:42:36 -0500
+Branch: REL9_4_STABLE [5c38ddebd] 2017-11-25 14:42:41 -0500
+Branch: REL9_3_STABLE [6e9ac0a2e] 2017-11-25 14:42:46 -0500
+-->
+     <para>
+      Avoid triggering a libc assertion
+      in <filename>contrib/hstore</filename>, due to use
+      of <function>memcpy()</function> with equal source and destination
+      pointers (Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [39cfe8619] 2018-01-04 14:59:00 -0500
+Branch: REL_10_STABLE [5ad1b1728] 2018-01-04 14:59:00 -0500
+Branch: REL9_6_STABLE [ad592f4a6] 2018-01-04 14:59:00 -0500
+Branch: master [18869e202] 2018-01-04 16:00:21 -0500
+Branch: REL_10_STABLE [0dc5dfcd7] 2018-01-04 15:59:30 -0500
+-->
+     <para>
+      Fix incorrect display of tuples' null bitmaps
+      in <filename>contrib/pageinspect</filename> (Maksim Milyutin)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [b0313f9cc] 2018-01-26 09:56:33 -0500
+Branch: REL_10_STABLE [51fc1b09a] 2018-01-26 09:59:14 -0500
+-->
+     <para>
+      Fix incorrect output from <filename>contrib/pageinspect</filename>'s
+      <function>hash_page_items()</function> function (Masahiko Sawada)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [4bbf6edfb] 2018-01-17 16:18:39 -0500
+Branch: REL_10_STABLE [3f05a30b5] 2018-01-17 16:57:53 -0500
+Branch: REL9_6_STABLE [4a81c0229] 2018-01-17 17:09:20 -0500
+Branch: master [99f6a17dd] 2018-01-30 14:44:30 -0500
+Branch: REL_10_STABLE [92123c6ea] 2018-01-30 14:47:02 -0500
+Branch: REL9_6_STABLE [d397f558d] 2018-01-30 14:55:14 -0500
+-->
+     <para>
+      In <filename>contrib/postgres_fdw</filename>, avoid
+      <quote>outer pathkeys do not match mergeclauses</quote>
+      planner error when constructing a plan involving a remote join
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [e9f2703ab] 2018-01-12 16:52:49 -0500
+Branch: REL_10_STABLE [67854bc59] 2018-01-12 16:52:49 -0500
+-->
+     <para>
+      In <filename>contrib/postgres_fdw</filename>, avoid planner failure
+      when there are duplicate <literal>GROUP BY</literal> entries
+      (Jeevan Chalke)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [ac3b96268] 2017-11-17 12:46:52 -0500
+Branch: REL_10_STABLE [6313995c2] 2017-11-17 12:47:11 -0500
+Branch: REL9_6_STABLE [0d9243903] 2017-11-17 12:47:21 -0500
+Branch: REL9_5_STABLE [9508d422b] 2017-11-17 12:47:29 -0500
+Branch: REL9_4_STABLE [7d98dc133] 2017-11-17 12:47:36 -0500
+Branch: REL9_3_STABLE [77b76fea9] 2017-11-17 12:47:44 -0500
+-->
+     <para>
+      Provide modern examples of how to auto-start Postgres on macOS
+      (Tom Lane)
+     </para>
+
+     <para>
+      The scripts in <filename>contrib/start-scripts/osx</filename> use
+      infrastructure that's been deprecated for over a decade, and which no
+      longer works at all in macOS releases of the last couple of years.
+      Add a new subdirectory <filename>contrib/start-scripts/macos</filename>
+      containing scripts that use the newer <application>launchd</application>
+      infrastructure.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [99d5a3ffb] 2018-01-03 15:36:54 -0500
+Branch: REL_10_STABLE [0fb69340b] 2018-01-03 15:33:12 -0500
+Branch: REL9_6_STABLE [85cdcde1f] 2018-01-03 15:33:32 -0500
+Branch: REL9_5_STABLE [d329d2d3e] 2018-01-03 15:33:47 -0500
+Branch: REL9_4_STABLE [2d03daa7b] 2018-01-03 15:34:02 -0500
+Branch: REL9_3_STABLE [5404145c5] 2018-01-03 15:34:21 -0500
+-->
+     <para>
+      Fix incorrect selection of configuration-specific libraries for
+      OpenSSL on Windows (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [84c4313c6] 2017-11-23 20:22:04 -0800
+Branch: REL_10_STABLE [f16a0958d] 2017-11-23 20:22:24 -0800
+Branch: REL9_6_STABLE [1695ce068] 2017-11-23 20:24:53 -0800
+Branch: REL9_5_STABLE [da8eae56e] 2017-11-23 20:25:08 -0800
+Branch: REL9_4_STABLE [558f62079] 2017-11-23 20:29:48 -0800
+Branch: REL9_3_STABLE [83e6b1434] 2017-11-23 20:32:01 -0800
+Branch: master [7e0c574ee] 2017-12-09 00:58:55 -0800
+Branch: REL_10_STABLE [e2cc65050] 2017-12-09 00:58:58 -0800
+Branch: REL9_6_STABLE [055532bad] 2017-12-09 00:58:58 -0800
+Branch: REL9_5_STABLE [470de6a24] 2017-12-09 00:58:59 -0800
+Branch: REL9_4_STABLE [d78c3ca0e] 2017-12-09 00:58:59 -0800
+Branch: REL9_3_STABLE [70dc7ad58] 2017-12-09 00:58:59 -0800
+-->
+     <para>
+      Support linking to MinGW-built versions of libperl (Noah Misch)
+     </para>
+
+     <para>
+      This allows building PL/Perl with some common Perl distributions for
+      Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [65a00f303] 2017-12-08 18:06:05 -0800
+Branch: REL_10_STABLE [9b5c99790] 2017-12-08 18:06:22 -0800
+Branch: REL9_6_STABLE [140fa2fba] 2017-12-08 18:06:25 -0800
+Branch: REL9_5_STABLE [1c1a572d0] 2017-12-08 18:06:29 -0800
+Branch: REL9_4_STABLE [aed8d41af] 2017-12-08 18:13:49 -0800
+Branch: REL9_3_STABLE [188689942] 2017-12-08 18:14:08 -0800
+-->
+     <para>
+      Fix MSVC build to test whether 32-bit libperl
+      needs <literal>-D_USE_32BIT_TIME_T</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Available Perl distributions are inconsistent about what they expect,
+      and lack any reliable means of reporting it, so resort to a build-time
+      test on what the library being used actually does.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [cbfffee41] 2017-11-12 14:31:00 -0800
+Branch: REL_10_STABLE [d6387e27e] 2017-11-12 14:31:04 -0800
+Branch: REL9_6_STABLE [8c92e66f1] 2017-11-12 14:31:04 -0800
+Branch: REL9_5_STABLE [b2df91f2f] 2017-11-12 14:31:04 -0800
+Branch: REL9_4_STABLE [e17b38db6] 2017-11-12 14:31:04 -0800
+Branch: REL9_3_STABLE [1c065901e] 2017-11-12 14:31:05 -0800
+-->
+     <para>
+      On Windows, install the crash dump handler earlier in postmaster
+      startup (Takayuki Tsunakawa)
+     </para>
+
+     <para>
+      This may allow collection of a core dump for some early-startup
+      failures that did not produce a dump before.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [e02571b73] 2017-11-12 13:03:15 -0800
+Branch: REL_10_STABLE [dcbec53f4] 2017-11-12 13:03:28 -0800
+Branch: REL9_6_STABLE [fd5da32fc] 2017-11-12 13:03:28 -0800
+Branch: REL9_5_STABLE [d74db7a35] 2017-11-12 13:03:28 -0800
+Branch: REL9_4_STABLE [19cf9e96a] 2017-11-12 13:03:29 -0800
+Branch: REL9_3_STABLE [30e99efe8] 2017-11-12 13:05:55 -0800
+-->
+     <para>
+      On Windows, avoid encoding-conversion-related crashes when emitting
+      messages very early in postmaster startup (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [84669c9b0] 2017-11-20 18:05:17 -0500
+Branch: REL_10_STABLE [ae772bbf9] 2017-11-20 18:05:02 -0500
+Branch: REL9_6_STABLE [fa9a69d3d] 2017-11-20 18:05:02 -0500
+Branch: REL9_5_STABLE [2cfafabe6] 2017-11-20 18:05:02 -0500
+Branch: REL9_4_STABLE [13f2bdb63] 2017-11-20 18:05:03 -0500
+Branch: REL9_3_STABLE [1056dd0e9] 2017-11-20 18:05:03 -0500
+-->
+     <para>
+      Use our existing Motorola 68K spinlock code on OpenBSD as
+      well as NetBSD (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f3bd00c01] 2017-11-20 18:05:17 -0500
+Branch: REL_10_STABLE [1ecf7eeb8] 2017-11-20 17:57:46 -0500
+Branch: REL9_6_STABLE [940bafa75] 2017-11-20 17:57:46 -0500
+Branch: REL9_5_STABLE [516cea4bb] 2017-11-20 17:57:46 -0500
+Branch: REL9_4_STABLE [8bd8b4b77] 2017-11-20 17:57:46 -0500
+Branch: REL9_3_STABLE [0245c75f4] 2017-11-20 17:57:46 -0500
+-->
+     <para>
+      Add support for spinlocks on Motorola 88K (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [41fc04ff9] 2018-01-27 16:42:28 -0500
+Branch: REL_10_STABLE [2d71b2700] 2018-01-27 16:42:36 -0500
+Branch: REL9_6_STABLE [462402be8] 2018-01-27 16:42:44 -0500
+Branch: REL9_5_STABLE [b00e7555e] 2018-01-27 16:42:49 -0500
+Branch: REL9_4_STABLE [fa86a32f9] 2018-01-27 16:42:55 -0500
+Branch: REL9_3_STABLE [e5e2cc6f8] 2018-01-27 16:43:00 -0500
+-->
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2018c for DST law changes in Brazil, Sao Tome and Principe,
+      plus historical corrections for Bolivia, Japan, and South Sudan.
+      The <literal>US/Pacific-New</literal> zone has been removed (it was
+      only an alias for <literal>America/Los_Angeles</literal> anyway).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-10-1">
+  <title>Release 10.1</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 10.0.
+   For information about new features in major release 10, see
+   <xref linkend="release-10"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 10.1</title>
+
+   <para>
+    A dump/restore is not required for those running 10.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the fourth changelog entry below.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Dean Rasheed <dean.a.rasheed@gmail.com>
+Branch: master [87b2ebd35] 2017-11-06 09:19:22 +0000
+Branch: REL_10_STABLE [3f8089572] 2017-11-06 09:17:44 +0000
+Branch: REL9_6_STABLE [1f23d1cd2] 2017-11-06 09:16:24 +0000
+Branch: REL9_5_STABLE [045a18888] 2017-11-06 09:15:11 +0000
+-->
+     <para>
+      Ensure that <literal>INSERT ... ON CONFLICT DO UPDATE</literal> checks
+      table permissions and RLS policies in all cases (Dean Rasheed)
+     </para>
+
+     <para>
+      The update path of <literal>INSERT ... ON CONFLICT DO UPDATE</literal>
+      requires <literal>SELECT</literal> permission on the columns of the
+      arbiter index, but it failed to check for that in the case of an
+      arbiter specified by constraint name.
+      In addition, for a table with row level security enabled, it failed to
+      check updated rows against the table's <literal>SELECT</literal>
+      policies (regardless of how the arbiter index was specified).
+      (CVE-2017-15099)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [b57422871] 2017-11-06 10:29:37 -0500
+Branch: REL_10_STABLE [c30f082d2] 2017-11-06 10:29:38 -0500
+Branch: REL9_6_STABLE [38e825632] 2017-11-06 10:29:39 -0500
+Branch: REL9_5_STABLE [d5fe5fb23] 2017-11-06 10:29:40 -0500
+Branch: REL9_4_STABLE [70846ee05] 2017-11-06 10:29:41 -0500
+Branch: REL9_3_STABLE [c0c8807de] 2017-11-06 10:29:42 -0500
+-->
+     <para>
+      Fix crash due to rowtype mismatch
+      in <function>json{b}_populate_recordset()</function>
+      (Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      These functions used the result rowtype specified in the <literal>FROM
+      ... AS</literal> clause without checking that it matched the actual
+      rowtype of the supplied tuple value.  If it didn't, that would usually
+      result in a crash, though disclosure of server memory contents seems
+      possible as well.
+      (CVE-2017-15098)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [dfc015dcf] 2017-11-06 07:11:10 -0800
+Branch: REL_10_STABLE [6b0b983f7] 2017-11-06 07:11:13 -0800
+Branch: REL9_6_STABLE [b7d6f7507] 2017-11-06 07:11:13 -0800
+Branch: REL9_5_STABLE [ed546dd06] 2017-11-06 07:11:13 -0800
+Branch: REL9_4_STABLE [29d067051] 2017-11-06 07:11:13 -0800
+Branch: REL9_3_STABLE [b50029768] 2017-11-06 07:11:13 -0800
+Branch: REL9_2_STABLE [eda780281] 2017-11-06 07:11:13 -0800
+-->
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [ec42a1dcb] 2017-11-03 17:23:13 +0100
+Branch: REL_10_STABLE [37a856567] 2017-11-03 17:23:13 +0100
+Branch: REL9_6_STABLE [bd8e2b3cf] 2017-11-03 17:23:13 +0100
+Branch: REL9_5_STABLE [cf0612aa2] 2017-11-03 17:23:13 +0100
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [1b890562b] 2017-11-03 20:45:36 +0100
+Branch: REL_10_STABLE [b17870d75] 2017-11-03 20:47:44 +0100
+-->
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [62a16572d] 2017-11-02 12:54:55 -0400
+Branch: REL_10_STABLE [97ba7b8c8] 2017-11-02 12:54:22 -0400
+Branch: REL9_6_STABLE [a43cd427e] 2017-11-02 12:54:23 -0400
+Branch: REL9_5_STABLE [43276abc6] 2017-11-02 12:54:23 -0400
+-->
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [a9fce6672] 2017-11-03 12:27:59 -0400
+Branch: REL_10_STABLE [a14b52c61] 2017-11-03 12:28:08 -0400
+-->
+     <para>
+      Prevent logical replication from setting non-replicated columns to
+      nulls when replicating an <command>UPDATE</command> (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [360fd1a7b] 2017-10-12 10:26:55 -0400
+Branch: REL_10_STABLE [7cde649ab] 2017-10-12 10:26:54 -0400
+-->
+     <para>
+      Fix logical replication to fire <literal>BEFORE ROW DELETE</literal>
+      triggers when expected (Masahiko Sawada)
+     </para>
+
+     <para>
+      Previously, that failed to happen unless the table also had
+      a <literal>BEFORE ROW UPDATE</literal> trigger.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [1518d0784] 2017-10-06 19:18:58 -0400
+Branch: REL_10_STABLE [485d49dbc] 2017-10-06 19:18:58 -0400
+Branch: REL9_6_STABLE [185279da3] 2017-10-06 19:18:58 -0400
+Branch: REL9_5_STABLE [13d2ed921] 2017-10-06 19:18:59 -0400
+Branch: REL9_4_STABLE [bfb69b1e5] 2017-10-06 19:18:59 -0400
+-->
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7421f4b89] 2017-10-16 17:56:54 -0400
+Branch: REL_10_STABLE [799037099] 2017-10-16 17:56:43 -0400
+-->
+     <para>
+      Ignore CTEs when looking up the target table for
+      <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>,
+      and prevent matching schema-qualified target table names to trigger
+      transition table names (Thomas Munro)
+     </para>
+
+     <para>
+      This restores the pre-v10 behavior for CTEs attached to DML commands.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [c3dfe0fec] 2017-10-16 15:24:36 -0400
+Branch: REL_10_STABLE [72e9cc971] 2017-10-16 15:24:36 -0400
+-->
+     <para>
+      Avoid evaluating an aggregate function's argument expression(s) at rows
+      where its <literal>FILTER</literal> test fails (Tom Lane)
+     </para>
+
+     <para>
+      This restores the pre-v10 (and SQL-standard) behavior.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [08f1e1f0a] 2017-10-26 12:17:40 -0400
+Branch: REL_10_STABLE [6a81ba1d4] 2017-10-26 12:17:40 -0400
+Branch: REL9_6_STABLE [37b4e0fe9] 2017-10-26 12:17:40 -0400
+-->
+     <para>
+      Fix incorrect query results when multiple <literal>GROUPING
+      SETS</literal> columns contain the same simple variable (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [a1c2c430d] 2017-10-06 14:28:42 -0400
+Branch: REL_10_STABLE [0c25e9652] 2017-10-06 14:28:42 -0400
+-->
+     <para>
+      Fix query-lifespan memory leakage while evaluating a set-returning
+      function in a <command>SELECT</command>'s target list (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [682ce911f] 2017-10-27 22:22:39 +0200
+Branch: REL_10_STABLE [a87c0c763] 2017-10-29 20:48:51 +0530
+-->
+     <para>
+      Allow parallel execution of prepared statements with generic plans
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [639c1a6bb] 2017-10-27 16:04:01 +0200
+Branch: REL_10_STABLE [965a16fa9] 2017-10-27 16:04:10 +0200
+Branch: REL9_6_STABLE [036b6bd50] 2017-10-27 16:12:16 +0200
+-->
+     <para>
+      Fix incorrect parallelization decisions for nested queries
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [846fcc851] 2017-10-29 12:58:40 +0530
+Branch: REL_10_STABLE [69125c883] 2017-10-29 13:04:37 +0530
+Branch: REL9_6_STABLE [f74f871b8] 2017-10-29 13:14:37 +0530
+-->
+     <para>
+      Fix parallel query handling to not fail when a recently-used role is
+      dropped (Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [6393613b6] 2017-10-13 15:02:45 -0400
+Branch: REL_10_STABLE [a3b1c2218] 2017-10-13 15:05:14 -0400
+-->
+     <para>
+      Fix crash in parallel execution of a bitmap scan having a BitmapAnd
+      plan node below a BitmapOr node (Dilip Kumar)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [f3c6e8a27] 2017-10-25 07:13:11 -0400
+Branch: REL_10_STABLE [fb17082d7] 2017-10-25 07:14:21 -0400
+Branch: REL9_6_STABLE [5c3a1bbb4] 2017-10-25 07:19:59 -0400
+Branch: REL9_5_STABLE [5c8dcd322] 2017-10-25 07:20:37 -0400
+Branch: REL9_4_STABLE [7f89fc418] 2017-10-25 07:20:48 -0400
+Author: Andrew Dunstan <andrew@dunslane.net>
+Branch: master [18fc4ecf4] 2017-10-25 07:34:00 -0400
+Branch: REL_10_STABLE [06d5ba0d4] 2017-10-25 07:40:33 -0400
+Branch: REL9_6_STABLE [98efa5ebf] 2017-10-25 07:48:36 -0400
+Branch: REL9_5_STABLE [3cc5f0550] 2017-10-25 07:49:13 -0400
+Branch: REL9_4_STABLE [9cb28e98b] 2017-10-25 07:52:45 -0400
+-->
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [be72b9c37] 2017-10-30 15:52:02 +0100
+Branch: REL_10_STABLE [52ca7572c] 2017-10-30 15:52:13 +0100
+-->
+     <para>
+      Fix autovacuum's <quote>work item</quote> logic to prevent possible
+      crashes and silent loss of work items (&Aacute;lvaro Herrera)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d5b760ecb] 2017-10-27 17:28:54 -0400
+Branch: REL_10_STABLE [ddde3b4f3] 2017-10-27 17:10:21 -0400
+Branch: REL9_6_STABLE [7e5e8b36d] 2017-10-27 17:10:21 -0400
+Branch: REL9_5_STABLE [acd3287e4] 2017-10-27 17:10:21 -0400
+Branch: REL9_4_STABLE [66104119e] 2017-10-27 17:10:21 -0400
+Branch: REL9_3_STABLE [9d15b8b36] 2017-10-27 17:10:21 -0400
+Branch: REL9_2_STABLE [80e79718d] 2017-10-27 17:10:21 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [d76886c2d] 2017-10-27 18:16:24 -0400
+Branch: REL_10_STABLE [291a31c42] 2017-10-27 18:16:25 -0400
+Branch: REL9_6_STABLE [21daada10] 2017-10-27 18:16:25 -0400
+Branch: REL9_5_STABLE [1f81c2cd5] 2017-10-27 18:16:25 -0400
+Branch: REL9_4_STABLE [d01d97c25] 2017-10-27 18:16:25 -0400
+Branch: REL9_3_STABLE [e06b9e9dc] 2017-10-27 18:16:25 -0400
+Branch: REL9_2_STABLE [a4c11c103] 2017-10-27 18:16:25 -0400
+-->
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [f3ea3e3e8] 2017-10-23 13:57:45 -0400
+Branch: REL_10_STABLE [df4aa6e4e] 2017-10-23 13:57:45 -0400
+Branch: REL9_6_STABLE [285b850d5] 2017-10-23 13:57:45 -0400
+Branch: REL9_5_STABLE [aa0518301] 2017-10-23 13:57:45 -0400
+Branch: REL9_4_STABLE [d8a3be52f] 2017-10-23 13:57:45 -0400
+Branch: REL9_3_STABLE [dde99de11] 2017-10-23 13:57:46 -0400
+Branch: REL9_2_STABLE [900a9fd64] 2017-10-23 13:57:46 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6784d7a1d] 2017-10-27 12:19:09 -0400
+Branch: REL_10_STABLE [8be102242] 2017-10-27 12:19:11 -0400
+Branch: REL9_6_STABLE [cf0331a54] 2017-10-27 12:18:57 -0400
+Branch: REL9_5_STABLE [37fb01cb0] 2017-10-27 12:18:57 -0400
+Branch: REL9_4_STABLE [376ac922d] 2017-10-27 12:18:57 -0400
+Branch: REL9_3_STABLE [be203c36a] 2017-10-27 12:18:57 -0400
+Branch: REL9_2_STABLE [adcfa7bd1] 2017-10-27 12:18:57 -0400
+-->
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [36ea99c84] 2017-10-20 17:12:27 -0400
+Branch: REL_10_STABLE [7a5f8de55] 2017-10-20 17:12:27 -0400
+Branch: REL9_6_STABLE [b1752c3a7] 2017-10-20 17:12:27 -0400
+Branch: REL9_5_STABLE [63fbc51e3] 2017-10-20 17:12:27 -0400
+Branch: REL9_4_STABLE [d1ced6114] 2017-10-20 17:12:27 -0400
+Branch: REL9_3_STABLE [7c70a129e] 2017-10-20 17:12:27 -0400
+Branch: REL9_2_STABLE [0270ad1f7] 2017-10-20 17:12:28 -0400
+-->
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Alvaro Herrera <alvherre@alvh.no-ip.org>
+Branch: master [e9ef11ac8] 2017-10-12 17:23:47 +0200
+Branch: REL_10_STABLE [a01a3d931] 2017-10-12 17:32:48 +0200
+-->
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when examining functional-dependency statistics (David Rowley)
+     </para>
+
+     <para>
+      This allows, e.g., extended statistics on <type>varchar</type> columns
+      to be used properly.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [52328727b] 2017-10-11 22:18:10 -0400
+Branch: REL_10_STABLE [604723d29] 2017-10-11 22:18:01 -0400
+Branch: REL9_6_STABLE [96cfc7e19] 2017-10-11 22:18:01 -0400
+-->
+     <para>
+      Prevent sharing transition states between ordered-set aggregates
+      (David Rowley)
+     </para>
+
+     <para>
+      This causes a crash with the built-in ordered-set aggregates, and
+      probably with user-written ones as well.  v11 and later will include
+      provisions for dealing with such cases safely, but in released
+      branches, just disable the optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: master [f67661665] 2017-10-11 14:02:41 -0700
+Branch: REL_10_STABLE [61ace8fe7] 2017-10-11 14:02:41 -0700
+Branch: REL9_6_STABLE [0da46d75e] 2017-10-11 14:02:41 -0700
+-->
+     <para>
+      Prevent <varname>idle_in_transaction_session_timeout</varname> from
+      being ignored when a <varname>statement_timeout</varname> occurred
+      earlier (Lukas Fittl)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [118e99c3d] 2017-10-11 14:28:33 -0400
+Branch: REL_10_STABLE [f4cdf781a] 2017-10-11 14:28:33 -0400
+Branch: REL9_6_STABLE [36c687a22] 2017-10-11 14:28:33 -0400
+Branch: REL9_5_STABLE [69bc245d9] 2017-10-11 14:28:33 -0400
+Branch: REL9_4_STABLE [0e84f7075] 2017-10-11 14:28:33 -0400
+Branch: REL9_3_STABLE [7573d122f] 2017-10-11 14:28:33 -0400
+Branch: REL9_2_STABLE [525b09ada] 2017-10-11 14:28:34 -0400
+-->
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [643c27e36] 2017-10-08 15:25:26 -0400
+Branch: REL_10_STABLE [c3723317d] 2017-10-08 15:25:26 -0400
+Branch: REL9_6_STABLE [13a8924ec] 2017-10-08 15:25:26 -0400
+-->
+     <para>
+      Reduce the frequency of data flush requests during bulk file copies to
+      avoid performance problems on macOS, particularly with its new APFS
+      file system (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [bab3a714b] 2017-11-05 09:25:52 -0800
+Branch: REL_10_STABLE [2168f37c4] 2017-11-05 09:25:59 -0800
+Branch: REL9_6_STABLE [1cac62dac] 2017-11-05 09:26:28 -0800
+Branch: REL9_5_STABLE [7932891ab] 2017-11-05 09:26:43 -0800
+Branch: REL9_4_STABLE [2a2e2e85e] 2017-11-05 09:26:47 -0800
+-->
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [305cf1fd7] 2017-10-12 15:20:16 -0400
+Branch: REL_10_STABLE [d48bf6a94] 2017-10-12 15:20:04 -0400
+Branch: REL9_6_STABLE [aa1e9b3a4] 2017-10-12 15:20:04 -0400
+-->
+     <para>
+      Fix <function>AggGetAggref()</function> to return the
+      correct <structname>Aggref</structname> nodes to aggregate final
+      functions whose transition calculations have been merged (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [080351466] 2017-10-31 13:40:23 -0400
+Branch: REL_10_STABLE [9cf2b854a] 2017-10-31 13:40:23 -0400
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [51f4d3ed7] 2017-11-01 19:16:14 -0700
+Branch: REL_10_STABLE [f4e13963c] 2017-11-01 19:16:17 -0700
+-->
+     <para>
+      Fix insufficient schema-qualification in some new queries
+      in <application>pg_dump</application>
+      and <application>psql</application>
+      (Vitaly Burovoy, Tom Lane, Noah Misch)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [471d55859] 2017-10-22 16:45:16 -0400
+Branch: REL_10_STABLE [852e3224e] 2017-10-22 16:45:26 -0400
+-->
+     <para>
+      Avoid use of <literal>@&gt;</literal> operator
+      in <application>psql</application>'s queries for <command>\d</command>
+      (Tom Lane)
+     </para>
+
+     <para>
+      This prevents problems when the <application>parray_gin</application>
+      extension is installed, since that defines a conflicting operator.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [067a2259f] 2017-11-01 10:20:05 -0400
+Branch: REL_10_STABLE [dd12b5307] 2017-11-01 21:41:45 -0400
+Branch: REL9_6_STABLE [4ba0ffaae] 2017-11-01 21:44:55 -0400
+Branch: REL9_5_STABLE [3064f0e25] 2017-11-01 21:45:11 -0400
+-->
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [db6986f47] 2017-10-25 19:32:24 -0400
+Branch: REL_10_STABLE [51e9fffba] 2017-10-25 19:32:24 -0400
+Branch: REL9_6_STABLE [7dc66a2f6] 2017-10-25 19:32:24 -0400
+Branch: REL9_5_STABLE [ee02c1c89] 2017-10-25 19:32:24 -0400
+Branch: REL9_4_STABLE [9f7afb25b] 2017-10-25 19:32:24 -0400
+Branch: REL9_3_STABLE [6dd7a1207] 2017-10-25 19:32:24 -0400
+Branch: REL9_2_STABLE [caeae886e] 2017-10-25 19:32:25 -0400
+-->
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [0af98a95c] 2017-10-26 10:16:04 +0200
+Branch: REL_10_STABLE [65ba1b5c2] 2017-10-26 10:39:37 +0200
+Branch: REL9_6_STABLE [41753604b] 2017-10-26 10:39:46 +0200
+Branch: REL9_5_STABLE [9b01a21fc] 2017-10-26 10:39:54 +0200
+Branch: REL9_4_STABLE [c6a396888] 2017-10-26 10:40:03 +0200
+-->
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [63d6b97fd] 2017-11-01 13:32:18 +0100
+Branch: REL_10_STABLE [e4381c039] 2017-11-01 13:40:27 +0100
+Branch: REL9_6_STABLE [e0ec1cbff] 2017-11-01 13:40:50 +0100
+Branch: REL9_5_STABLE [d2e6bd13a] 2017-11-01 13:41:00 +0100
+Branch: REL9_4_STABLE [18647e21d] 2017-11-01 13:41:12 +0100
+Branch: REL9_3_STABLE [d64a4d368] 2017-11-01 13:41:21 +0100
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [6976a4f05] 2017-11-02 20:49:47 +0100
+Branch: REL_10_STABLE [ee46980a7] 2017-11-02 20:51:00 +0100
+Branch: REL9_6_STABLE [049dab009] 2017-11-02 20:51:13 +0100
+Branch: REL9_5_STABLE [b6d95939e] 2017-11-02 20:51:23 +0100
+Branch: REL9_4_STABLE [ad24e7bc2] 2017-11-02 20:51:34 +0100
+Branch: REL9_3_STABLE [7a35507ac] 2017-11-02 20:51:44 +0100
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [7164991ca] 2017-11-03 11:15:14 +0100
+Branch: REL_10_STABLE [c63568b06] 2017-11-03 12:41:39 +0100
+Branch: REL9_6_STABLE [6cf68e223] 2017-11-03 12:41:23 +0100
+Branch: REL9_5_STABLE [90d61bd1d] 2017-11-03 12:41:11 +0100
+Branch: REL9_4_STABLE [946f16518] 2017-11-03 12:40:54 +0100
+Branch: REL9_3_STABLE [deb429b51] 2017-11-03 12:40:42 +0100
+-->
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Noah Misch <noah@leadboat.com>
+Branch: master [c66b438db] 2017-11-05 18:51:08 -0800
+Branch: REL_10_STABLE [937f67800] 2017-11-05 18:51:15 -0800
+Branch: REL9_6_STABLE [971983f42] 2017-11-05 18:52:38 -0800
+Branch: REL9_5_STABLE [014c5cd87] 2017-11-05 18:54:52 -0800
+-->
+     <para>
+      Fix missing temp-install prerequisites
+      for <literal>check</literal>-like Make targets (Noah Misch)
+     </para>
+
+     <para>
+      Some non-default test procedures that are meant to work
+      like <literal>make check</literal> failed to ensure that the temporary
+      installation was up to date.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [8df4ce1ea] 2017-10-23 18:15:36 -0400
+Branch: REL_10_STABLE [0cde56247] 2017-10-23 18:15:42 -0400
+Branch: REL9_6_STABLE [fae550e52] 2017-10-23 18:15:47 -0400
+Branch: REL9_5_STABLE [1e57d85cd] 2017-10-23 18:15:51 -0400
+Branch: REL9_4_STABLE [ba67fac85] 2017-10-23 18:15:56 -0400
+Branch: REL9_3_STABLE [da82bb1d8] 2017-10-23 18:16:00 -0400
+Branch: REL9_2_STABLE [7e8d84c36] 2017-10-23 18:16:04 -0400
+-->
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [49df45acd] 2017-11-03 14:14:02 -0400
+Branch: REL_10_STABLE [5159626af] 2017-11-03 14:14:16 -0400
+-->
+     <para>
+      In the documentation, restore HTML anchors to being upper-case strings
+      (Peter Eisentraut)
+     </para>
+
+     <para>
+      Due to a toolchain change, the 10.0 user manual had lower-case strings
+      for intrapage anchors, thus breaking some external links into our
+      website documentation.  Return to our previous convention of using
+      upper-case strings.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-10">
   <title>Release 10</title>
 
   <formalpara>
    <title>Release date:</title>
-   <para>2017-??-?? (current as of 2017-08-05, commit eccead9ed)</para>
+   <para>2017-10-05</para>
   </formalpara>
 
   <sect2>
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 10 include:
+    Major enhancements in <productname>PostgreSQL</productname> 10 include:
    </para>
 
    <!-- Items in this list summarize one or more items below -->
 
    <itemizedlist>
 
-   <listitem><para>(to be written)</para></listitem>
+   <listitem><para>Logical replication using publish/subscribe</para></listitem>
+   <listitem><para>Declarative table partitioning</para></listitem>
+   <listitem><para>Improved query parallelism</para></listitem>
+   <listitem><para>Significant general performance improvements</para></listitem>
+   <listitem><para>Stronger password authentication based on SCRAM-SHA-256</para></listitem>
+   <listitem><para>Improved monitoring and control</para></listitem>
    </itemizedlist>
 
    <para>
@@ -34,8 +2320,8 @@
   <title>Migration to Version 10</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
+    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 release.
    </para>
 
@@ -50,16 +2336,17 @@
 <!--
 2017-04-03 [ea69a0dea] Expand hash indexes more gradually.
 2017-05-19 [a95410e2e] pg_upgrade: Handle hash index upgrades more smoothly.
+2017-08-04 [620b49a16] hash: Increase the number of possible overflow bitmaps b
 -->
      <para>
-      Hash indexes must be rebuilt after <application>pg_upgrade</>-ing
-      from any previous major <productname>PostgreSQL</> version (Mithun
-      Cy, Robert Haas)
+      Hash indexes must be rebuilt after <application>pg_upgrade</application>-ing
+      from any previous major <productname>PostgreSQL</productname> version (Mithun
+      Cy, Robert Haas, Amit Kapila)
      </para>
 
      <para>
       Major hash index improvements necessitated this requirement.
-      <application>pg_upgrade</> will create a script to assist with this.
+      <application>pg_upgrade</application> will create a script to assist with this.
      </para>
     </listitem>
 
@@ -69,9 +2356,9 @@
 2017-03-17 [88e66d193] Rename "pg_clog" directory to "pg_xact".
 -->
      <para>
-      Rename write-ahead log directory <filename>pg_xlog</>
-      to <link linkend="wal"><filename>pg_wal</></>, and rename transaction
-      status directory <filename>pg_clog</> to <filename>pg_xact</>
+      Rename write-ahead log directory <filename>pg_xlog</filename>
+      to <link linkend="wal"><filename>pg_wal</filename></link>, and rename transaction
+      status directory <filename>pg_clog</filename> to <filename>pg_xact</filename>
       (Michael Paquier)
      </para>
 
@@ -92,17 +2379,17 @@
 2017-02-15 [0dfa89ba2] Replace reference to "xlog-method" with "wal-method" in
 -->
      <para>
-      Rename <acronym>SQL</> functions, tools, and options that reference
-      <quote>xlog</> to <quote>wal</> (Robert Haas)
+      Rename <acronym>SQL</acronym> functions, tools, and options that reference
+      <quote>xlog</quote> to <quote>wal</quote> (Robert Haas)
      </para>
 
      <para>
-      For example, <function>pg_switch_xlog()</> becomes
-      <function>pg_switch_wal()</>, <application>pg_receivexlog</>
-      becomes <application>pg_receivewal</>, and <option>--xlogdir</>
-      becomes <option>--waldir</>.  This is for consistency with the
-      change of the <filename>pg_xlog</> directory name; in general,
-      the <quote>xlog</> terminology is no longer used in any user-facing
+      For example, <function>pg_switch_xlog()</function> becomes
+      <function>pg_switch_wal()</function>, <application>pg_receivexlog</application>
+      becomes <application>pg_receivewal</application>, and <option>--xlogdir</option>
+      becomes <option>--waldir</option>.  This is for consistency with the
+      change of the <filename>pg_xlog</filename> directory name; in general,
+      the <quote>xlog</quote> terminology is no longer used in any user-facing
       places.
      </para>
     </listitem>
@@ -112,8 +2399,8 @@
 2017-05-11 [d10c626de] Rename WAL-related functions and views to use "lsn" not
 -->
      <para>
-      Rename <acronym>WAL</>-related functions and views to use <literal>lsn</>
-      instead of <literal>location</> (David Rowley)
+      Rename <acronym>WAL</acronym>-related functions and views to use <literal>lsn</literal>
+      instead of <literal>location</literal> (David Rowley)
      </para>
 
      <para>
@@ -130,22 +2417,80 @@
 -->
      <para>
       Change the implementation of set-returning functions appearing in
-      a query's <literal>SELECT</> list (Andres Freund)
+      a query's <literal>SELECT</literal> list (Andres Freund)
      </para>
 
      <para>
       Set-returning functions are now evaluated before evaluation of scalar
-      expressions in the <literal>SELECT</> list, much as though they had
-      been placed in a <literal>LATERAL FROM</>-clause item.  This allows
+      expressions in the <literal>SELECT</literal> list, much as though they had
+      been placed in a <literal>LATERAL FROM</literal>-clause item.  This allows
       saner semantics for cases where multiple set-returning functions are
       present.  If they return different numbers of rows, the shorter results
       are extended to match the longest result by adding nulls.  Previously
       the results were cycled until they all terminated at the same time,
       producing a number of rows equal to the least common multiple of the
       functions' periods.  In addition, set-returning functions are now
-      disallowed within <literal>CASE</> and <literal>COALESCE</> constructs.
+      disallowed within <literal>CASE</literal> and <literal>COALESCE</literal> constructs.
       For more information
-      see <xref linkend="xfunc-sql-functions-returning-set">.
+      see <xref linkend="xfunc-sql-functions-returning-set"/>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+2016-11-22 [906bfcad7] Improve handling of "UPDATE ... SET (column_list) = row_
+-->
+     <para>
+      Use standard row constructor syntax in <literal>UPDATE ... SET
+      (<replaceable>column_list</replaceable>) = <replaceable>row_constructor</replaceable></literal>
+      (Tom Lane)
+     </para>
+
+     <para>
+      The <replaceable>row_constructor</replaceable> can now begin with the
+      keyword <literal>ROW</literal>; previously that had to be omitted.
+      If just one column name appears in
+      the <replaceable>column_list</replaceable>, then
+      the <replaceable>row_constructor</replaceable> now must use
+      the <literal>ROW</literal> keyword, since otherwise it is not a valid
+      row constructor but just a parenthesized expression.
+      Also, an occurrence
+      of <literal><replaceable>table_name</replaceable>.*</literal> within
+      the <replaceable>row_constructor</replaceable> is now expanded into
+      multiple columns, as occurs in other uses
+      of <replaceable>row_constructor</replaceable>s.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+2017-08-04 [c30f1770a] Apply ALTER ... SET NOT NULL recursively in ALTER ... AD
+-->
+     <para>
+      When <command>ALTER TABLE ... ADD PRIMARY KEY</command> marks
+      columns <literal>NOT NULL</literal>, that change now propagates to
+      inheritance child tables as well (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+2017-09-16 [54d4d0ff6] Fix SQL-spec incompatibilities in new transition table f
+2017-09-17 [5cc234931] Ensure that BEFORE STATEMENT triggers fire the right num
+-->
+     <para>
+      Prevent statement-level triggers from firing more than once per
+      statement (Tom Lane)
+     </para>
+
+     <para>
+      Cases involving writable CTEs updating the same table updated by the
+      containing statement, or by another writable CTE, fired <literal>BEFORE
+      STATEMENT</literal> or <literal>AFTER STATEMENT</literal> triggers more than once.
+      Also, if there were statement-level triggers on a table affected by a
+      foreign key enforcement action (such as <literal>ON DELETE CASCADE</literal>),
+      they could fire more than once per outer SQL statement.  This is
+      contrary to the SQL standard, so change it.
      </para>
     </listitem>
 
@@ -155,23 +2500,24 @@
 2016-11-18 [67dc4ccbb] Add pg_sequences view
 2017-05-15 [f8dc1985f] Fix ALTER SEQUENCE locking
 2017-06-01 [3d79013b9] Make ALTER SEQUENCE, including RESTART, fully transactio
+2017-09-29 [5cc5987ce] psql: Update \d sequence display
 -->
      <para>
       Move sequences' metadata fields into a new <link
-      linkend="catalog-pg-sequence"><structname>pg_sequence</></>
+      linkend="catalog-pg-sequence"><structname>pg_sequence</structname></link>
       system catalog (Peter Eisentraut)
      </para>
 
      <para>
       A sequence relation now stores only the fields that can be modified
-      by <function>nextval()</>, that
-      is <structfield>last_value</>, <structfield>log_cnt</>,
-      and <structfield>is_called</>.  Other sequence properties, such as
+      by <function>nextval()</function>, that
+      is <structfield>last_value</structfield>, <structfield>log_cnt</structfield>,
+      and <structfield>is_called</structfield>.  Other sequence properties, such as
       the starting value and increment, are kept in a corresponding row of
-      the <structname>pg_sequence</> catalog.
-      <command>ALTER SEQUENCE</> updates are now fully transactional,
+      the <structname>pg_sequence</structname> catalog.
+      <command>ALTER SEQUENCE</command> updates are now fully transactional,
       implying that the sequence is locked until commit.
-      The <function>nextval()</> and <function>setval()</> functions
+      The <function>nextval()</function> and <function>setval()</function> functions
       remain nontransactional.
      </para>
 
@@ -179,11 +2525,16 @@
       The main incompatibility introduced by this change is that selecting
       from a sequence relation now returns only the three fields named
       above.  To obtain the sequence's other properties, applications must
-      look into <structname>pg_sequence</>.  The new system
-      view <link linkend="view-pg-sequences"><structname>pg_sequences</></>
+      look into <structname>pg_sequence</structname>.  The new system
+      view <link linkend="view-pg-sequences"><structname>pg_sequences</structname></link>
       can also be used for this purpose; it provides column names that are
       more compatible with existing code.
      </para>
+
+     <para>
+      The output of <application>psql</application>'s <command>\d</command> command for a
+      sequence has been redesigned, too.
+     </para>
     </listitem>
 
     <listitem>
@@ -191,17 +2542,17 @@
 2017-01-04 [9a4d51077] Make wal streaming the default mode for pg_basebackup
 -->
      <para>
-      Make <application><xref linkend="app-pgbasebackup"></> stream the
-      <acronym>WAL</> needed to restore the backup by default (Magnus
+      Make <application><xref linkend="app-pgbasebackup"/></application> stream the
+      <acronym>WAL</acronym> needed to restore the backup by default (Magnus
       Hagander)
      </para>
 
      <para>
-      This changes <application>pg_basebackup</>'s
-      <option>-X</>/<option>--xlog-method</> default to <literal>stream</>.
-      An option value <literal>none</> has been added to reproduce the old
-      behavior.  The <application>pg_basebackup</> option <option>-x</>
-      has been removed (instead, use <literal>-X fetch</>).
+      This changes <application>pg_basebackup</application>'s
+      <option>-X</option>/<option>--wal-method</option> default to <literal>stream</literal>.
+      An option value <literal>none</literal> has been added to reproduce the old
+      behavior.  The <application>pg_basebackup</application> option <option>-x</option>
+      has been removed (instead, use <literal>-X fetch</literal>).
      </para>
     </listitem>
 
@@ -231,18 +2582,67 @@
 2017-01-14 [05cd12ed5] pg_ctl: Change default to wait for all actions
 -->
     <para>
-     Make all <application><xref linkend="app-pg-ctl"></> actions wait
+     Make all <application><xref linkend="app-pg-ctl"/></application> actions wait
      for completion by default (Peter Eisentraut)
     </para>
 
     <para>
-     Previously some <application>pg_ctl</> actions didn't wait for
-     completion, and required the use of <option>-w</> to do so.
+     Previously some <application>pg_ctl</application> actions didn't wait for
+     completion, and required the use of <option>-w</option> to do so.
     </para>
     </listitem>
 
     <listitem>
 <!--
+2017-03-27 [3371e4d9b] Change default of log_directory to 'log'
+-->
+     <para>
+      Change the default value of the <xref linkend="guc-log-directory"/>
+      server parameter from <filename>pg_log</filename> to <filename>log</filename>
+      (Andreas Karlsson)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+2017-07-31 [c0a15e07c] Always use 2048 bit DH parameters for OpenSSL ephemeral
+-->
+     <para>
+      Add configuration option <xref linkend="guc-ssl-dh-params-file"/> to
+      specify file name for custom OpenSSL DH parameters (Heikki Linnakangas)
+     </para>
+
+     <para>
+      This replaces the hardcoded, undocumented file
+      name <filename>dh1024.pem</filename>.  Note that <filename>dh1024.pem</filename> is
+      no longer examined by default; you must set this option if you want
+      to use custom DH parameters.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+2017-07-31 [c0a15e07c] Always use 2048 bit DH parameters for OpenSSL ephemeral
+-->
+     <para>
+      Increase the size of the default DH parameters used for OpenSSL
+      ephemeral DH ciphers to 2048 bits (Heikki Linnakangas)
+     </para>
+
+     <para>
+      The size of the compiled-in DH parameters has been increased from
+      1024 to 2048 bits, making DH key exchange more resistant to
+      brute-force attacks.  However, some old SSL implementations, notably
+      some revisions of Java Runtime Environment version 6, will not accept
+      DH parameters longer than 1024 bits, and hence will not be able to
+      connect over SSL.  If it's necessary to support such old clients, you
+      can use custom 1024-bit DH parameters instead of the compiled-in
+      defaults.  See <xref linkend="guc-ssl-dh-params-file"/>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
 2017-05-08 [eb61136dc] Remove support for password_encryption='off' / 'plain'.
 -->
     <para>
@@ -251,113 +2651,102 @@
     </para>
 
     <para>
-     The <xref linkend="guc-password-encryption"> server parameter
-     no longer supports <literal>off</> or <literal>plain</>.
-     The <literal>UNENCRYPTED</> option is no longer supported in
-     <command>CREATE/ALTER USER ... PASSSWORD</>.  Similarly, the
-     <option>--unencrypted</> option has been removed
-     from <application>createuser</>.  Unencrypted passwords migrated from
+     The <xref linkend="guc-password-encryption"/> server parameter
+     no longer supports <literal>off</literal> or <literal>plain</literal>.
+     The <literal>UNENCRYPTED</literal> option is no longer supported in
+     <command>CREATE/ALTER USER ... PASSWORD</command>.  Similarly, the
+     <option>--unencrypted</option> option has been removed
+     from <application>createuser</application>.  Unencrypted passwords migrated from
      older versions will be stored encrypted in this release.  The default
-     setting for <varname>password_encryption</> is still
-     <literal>md5</>.
+     setting for <varname>password_encryption</varname> is still
+     <literal>md5</literal>.
     </para>
     </listitem>
 
     <listitem>
 <!--
-2016-10-26 [94aceed31] Support multi-dimensional arrays in PL/python.
-2016-10-26 [cfd9c87a5] Only treat Python Lists as array dimensions.
+2017-02-15 [51ee6f316] Replace min_parallel_relation_size with two new GUCs.
 -->
     <para>
-     Allow multi-dimensional arrays to be passed into PL/Python functions,
-     and returned as nested Python lists (Alexey Grishchenko, Dave Cramer,
-     Heikki Linnakangas)
+     Add <xref linkend="guc-min-parallel-table-scan-size"/>
+     and <xref linkend="guc-min-parallel-index-scan-size"/> server
+     parameters to control parallel queries (Amit Kapila, Robert Haas)
     </para>
 
     <para>
-     This feature requires a backwards-incompatible change to the handling
-     of arrays of composite types in PL/Python.  Previously, you could
-     return an array of composite values by writing, e.g., <literal>[[col1,
-     col2], [col1, col2]]</>; but now that is interpreted as a
-     two-dimensional array.  Composite types in arrays must now be written
-     as Python tuples, not lists, to resolve the ambiguity; that is,
-     write <literal>[(col1, col2), (col1, col2)]</> instead.
+     These replace <varname>min_parallel_relation_size</varname>, which was
+     found to be too generic.
     </para>
     </listitem>
 
     <listitem>
 <!--
-2017-02-27 [817f2a586] Remove PL/Tcl's "module" facility.
+2017-06-20 [a69dfe5f4] Don't downcase entries within shared_preload_libraries e
 -->
     <para>
-     Remove PL/Tcl's <quote>module</> auto-loading facility (Tom Lane)
+     Don't downcase unquoted text
+     within <xref linkend="guc-shared-preload-libraries"/> and related
+     server parameters (QL Zhuo)
     </para>
 
     <para>
-     This functionality has been replaced by new server
-     parameters <xref linkend="guc-pltcl-start-proc">
-     and <xref linkend="guc-pltclu-start-proc">, which are easier to use
-     and more similar to features available in other PLs.
+     These settings are really lists of file names, but they were
+     previously treated as lists of SQL identifiers, which have different
+     parsing rules.
     </para>
     </listitem>
 
     <listitem>
 <!--
-2017-03-27 [3371e4d9b] Change default of log_directory to 'log'
--->
-     <para>
-      Change the default value of the <xref linkend="guc-log-directory">
-      server parameter from <filename>pg_log</> to <filename>log</>
-      (Andreas Karlsson)
-     </para>
-    </listitem>
-
-    <listitem>
-<!--
 2016-12-23 [e13486eba] Remove sql_inheritance GUC.
 -->
     <para>
-     Remove <varname>sql_inheritance</> server parameter (Robert Haas)
+     Remove <varname>sql_inheritance</varname> server parameter (Robert Haas)
     </para>
 
     <para>
      Changing this setting from the default value caused queries referencing
-     parent tables to not include child tables.  The <acronym>SQL</>
-     standard requires such behavior and this has been the default since
-     <productname>PostgreSQL</> 7.1.
+     parent tables to not include child tables.  The <acronym>SQL</acronym>
+     standard requires them to be included, however, and this has been the
+     default since <productname>PostgreSQL</productname> 7.1.
     </para>
     </listitem>
 
     <listitem>
 <!--
-2017-02-15 [51ee6f316] Replace min_parallel_relation_size with two new GUCs.
+2016-10-26 [94aceed31] Support multi-dimensional arrays in PL/python.
+2016-10-26 [cfd9c87a5] Only treat Python Lists as array dimensions.
 -->
     <para>
-     Add <xref linkend="guc-min-parallel-table-scan-size">
-     and <xref linkend="guc-min-parallel-index-scan-size"> server
-     parameters to control parallel queries (Amit Kapila, Robert Haas)
+     Allow multi-dimensional arrays to be passed into PL/Python functions,
+     and returned as nested Python lists (Alexey Grishchenko, Dave Cramer,
+     Heikki Linnakangas)
     </para>
 
     <para>
-     These replace <varname>min_parallel_relation_size</>, which was
-     found to be too generic.
+     This feature requires a backwards-incompatible change to the handling
+     of arrays of composite types in PL/Python.  Previously, you could
+     return an array of composite values by writing, e.g., <literal>[[col1,
+     col2], [col1, col2]]</literal>; but now that is interpreted as a
+     two-dimensional array.  Composite types in arrays must now be written
+     as Python tuples, not lists, to resolve the ambiguity; that is,
+     write <literal>[(col1, col2), (col1, col2)]</literal> instead.
     </para>
     </listitem>
 
     <listitem>
 <!--
-2017-06-20 [a69dfe5f4] Don't downcase entries within shared_preload_libraries e
+2017-02-27 [817f2a586] Remove PL/Tcl's "module" facility.
 -->
     <para>
-     Don't downcase unquoted text
-     within <xref linkend="guc-shared-preload-libraries"> and related
-     server parameters (QL Zhuo)
+     Remove PL/Tcl's <quote>module</quote> auto-loading facility (Tom Lane)
     </para>
 
     <para>
-     These settings are really lists of file names, but they were
-     previously treated as lists of SQL identifiers, which have different
-     parsing rules.
+     This functionality has been replaced by new server
+     parameters <xref linkend="guc-pltcl-start-proc"/>
+     and <xref linkend="guc-pltclu-start-proc"/>, which are easier to use
+     and more similar to features available in other PLs.
     </para>
     </listitem>
 
@@ -366,13 +2755,13 @@
 2016-10-12 [64f3524e2] Remove pg_dump/pg_dumpall support for dumping from pre-8
 -->
     <para>
-     Remove <application>pg_dump</>/<application>pg_dumpall</> support
+     Remove <application>pg_dump</application>/<application>pg_dumpall</application> support
      for dumping from pre-8.0 servers (Tom Lane)
     </para>
 
      <para>
       Users needing to dump from pre-8.0 servers will need to use dump
-      programs from <productname>PostgreSQL</> 9.6 or earlier.  The
+      programs from <productname>PostgreSQL</productname> 9.6 or earlier.  The
       resulting output should still load successfully into newer servers.
      </para>
     </listitem>
@@ -386,9 +2775,9 @@
      </para>
 
      <para>
-      This removes configure's <option>--disable-integer-datetimes</>
-      option.  Floating-point timestamps have not been the
-      default since <productname>PostgreSQL</> 8.3 and have few advantages.
+      This removes configure's <option>--disable-integer-datetimes</option>
+      option.  Floating-point timestamps have few advantages and have not
+      been the default since <productname>PostgreSQL</productname> 8.3.
      </para>
     </listitem>
 
@@ -397,61 +2786,12 @@
 2016-10-11 [2f1eaf87e] Drop server support for FE/BE protocol version 1.0.
 -->
      <para>
-      Remove support for client/server protocol version 1.0 (Tom Lane)
+      Remove server support for client/server protocol version 1.0 (Tom Lane)
      </para>
 
      <para>
       This protocol hasn't had client support
-      since <productname>PostgreSQL</> 6.3.
-     </para>
-    </listitem>
-
-    <listitem>
-<!--
-2017-07-31 [c0a15e07c] Always use 2048 bit DH parameters for OpenSSL ephemeral
--->
-     <para>
-      Add configuration option <xref linkend="guc-ssl-dh-params-file"> to
-      specify file name for custom OpenSSL DH parameters (Heikki Linnakangas)
-     </para>
-
-     <para>
-      This replaces the hardcoded, undocumented file
-      name <filename>dh1024.pem</>.  Note that <filename>dh1024.pem</> is
-      no longer examined by default; you must set this option to use custom
-      DH parameters.
-     </para>
-    </listitem>
-
-    <listitem>
-<!--
-2017-07-31 [c0a15e07c] Always use 2048 bit DH parameters for OpenSSL ephemeral
--->
-     <para>
-      Increase the size of the default DH parameters used for OpenSSL
-      ephemeral DH ciphers to 2048 bits (Heikki Linnakangas)
-     </para>
-
-     <para>
-      The size of the compiled-in DH parameters has been increased from
-      1024 to 2048 bits, making DH key exchange more resistant to
-      brute-force attacks.  However, some old SSL implementations, notably
-      some revisions of Java Runtime Environment version 6, will not accept
-      DH parameters longer than 1024 bits, and hence will not be able to
-      connect over SSL.  If it's necessary to support such old clients, you
-      can use custom 1024-bit DH parameters instead of the compiled-in
-      defaults.  See <xref linkend="guc-ssl-dh-params-file">.
-     </para>
-    </listitem>
-
-    <listitem>
-<!--
-2017-08-04 [c30f1770a] Apply ALTER ... SET NOT NULL recursively in ALTER ... AD
--->
-     <para>
-      When <command>ALTER TABLE ... ADD PRIMARY KEY</> marks
-      columns <literal>NOT NULL</>, that change now propagates to
-      inheritance child tables as well (Michael Paquier)
+      since <productname>PostgreSQL</productname> 6.3.
      </para>
     </listitem>
 
@@ -460,12 +2800,12 @@
 2017-02-13 [7ada2d31f] Remove contrib/tsearch2.
 -->
      <para>
-      Remove <filename>contrib/tsearch2</> module (Robert Haas)
+      Remove <filename>contrib/tsearch2</filename> module (Robert Haas)
      </para>
 
      <para>
       This module provided compatibility with the version of full text
-      search that shipped in pre-8.3 <productname>PostgreSQL</> releases.
+      search that shipped in pre-8.3 <productname>PostgreSQL</productname> releases.
      </para>
     </listitem>
 
@@ -474,14 +2814,14 @@
 2017-03-23 [50c956add] Remove createlang and droplang
 -->
      <para>
-      Remove <application>createlang</> and <application>droplang</>
+      Remove <application>createlang</application> and <application>droplang</application>
       command-line applications (Peter Eisentraut)
      </para>
 
      <para>
-      These were deprecated since <productname>PostgreSQL</> 9.1.  Instead,
-      use <command>CREATE EXTENSION</> and <command>DROP EXTENSION</>
-      directly.
+      These had been deprecated since <productname>PostgreSQL</productname> 9.1.
+      Instead, use <command>CREATE EXTENSION</command> and <command>DROP
+      EXTENSION</command> directly.
      </para>
     </listitem>
 
@@ -597,14 +2937,14 @@
 2016-12-05 [2b959d495] Reduce the default for max_worker_processes back to 8.
 -->
        <para>
-        Add <xref linkend="guc-max-parallel-workers"> server parameter
+        Add <xref linkend="guc-max-parallel-workers"/> server parameter
         to limit the number of worker processes that can be used for
         query parallelism (Julien Rouhaud)
        </para>
 
        <para>
         This parameter can be set lower than <xref
-        linkend="guc-max-worker-processes"> to reserve worker processes
+        linkend="guc-max-worker-processes"/> to reserve worker processes
         for purposes other than parallel queries.
        </para>
       </listitem>
@@ -620,25 +2960,41 @@
 
       <listitem>
 <!--
-2016-08-23 [77e290682] Create an SP-GiST opclass for inet/cidr.
+2017-02-27 [30df93f69] hash: Refactor overflow page allocation.
+2017-03-14 [c11453ce0] hash: Add write-ahead logging support.
+2017-02-27 [b0f18cb77] hash: Refactor bucket squeeze code.
 -->
        <para>
-        Add <acronym>SP-GiST</> index support for <type>INET</> and
-        <type>CIDR</> data types (Emre Hasegeli)
+        Add write-ahead logging support to hash indexes (Amit Kapila)
        </para>
 
        <para>
-        These data types already had GiST support.
+        This makes hash indexes crash-safe and replicatable.
+        The former warning message about their use is removed.
        </para>
       </listitem>
 
       <listitem>
 <!--
-2017-03-23 [218f51584] Reduce page locking in GIN vacuum
+2016-11-30 [6d46f4783] Improve hash index bucket split behavior.
+2017-02-07 [293e24e50] Cache hash index's metapage in rel->rd_amcache.
+2017-03-15 [6977b8b7f] Port single-page btree vacuum logic to hash indexes.
+2017-04-03 [ea69a0dea] Expand hash indexes more gradually.
+2017-08-04 [620b49a16] hash: Increase the number of possible overflow bitmaps b
 -->
        <para>
-        Reduce page locking during vacuuming of <acronym>GIN</> indexes
-        (Andrey Borodin)
+        Improve hash index performance (Amit Kapila, Mithun Cy, Ashutosh
+        Sharma)
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
+2016-08-23 [77e290682] Create an SP-GiST opclass for inet/cidr.
+-->
+       <para>
+        Add <acronym>SP-GiST</acronym> index support for <type>INET</type> and
+        <type>CIDR</type> data types (Emre Hasegeli)
        </para>
       </listitem>
 
@@ -647,14 +3003,14 @@
 2017-04-01 [7526e1022] BRIN auto-summarization
 -->
        <para>
-        Add option to allow <acronym>BRIN</> index summarization to happen
+        Add option to allow <acronym>BRIN</acronym> index summarization to happen
         more aggressively (&Aacute;lvaro Herrera)
        </para>
 
        <para>
-        Specifically, a new <link linkend="SQL-CREATEINDEX"><command>CREATE
-        INDEX</></> option allows auto-summarization of the
-        previous <acronym>BRIN</> page range when a new page
+        A new <link linkend="sql-createindex"><command>CREATE
+        INDEX</command></link> option enables auto-summarization of the
+        previous <acronym>BRIN</acronym> page range when a new page
         range is created.
        </para>
       </listitem>
@@ -664,18 +3020,18 @@
 2017-04-01 [c655899ba] BRIN de-summarization
 -->
        <para>
-        Add functions to remove and re-add <acronym>BRIN</>
-        summarization for <acronym>BRIN</> index ranges (&Aacute;lvaro
+        Add functions to remove and re-add <acronym>BRIN</acronym>
+        summarization for <acronym>BRIN</acronym> index ranges (&Aacute;lvaro
         Herrera)
        </para>
 
        <para>
-        The new <acronym>SQL</> function <link
-        linkend="functions-admin-index-table"><function>brin_summarize_range()</></>
-        updates <acronym>BRIN</> index summarization for a specified
-        range and <function>brin_desummarize_range()</> removes it.
+        The new <acronym>SQL</acronym> function <link
+        linkend="functions-admin-index-table"><function>brin_summarize_range()</function></link>
+        updates <acronym>BRIN</acronym> index summarization for a specified
+        range and <function>brin_desummarize_range()</function> removes it.
         This is helpful to update summarization of a range that is now
-        smaller due to <command>UPDATE</>s and <command>DELETE</>s.
+        smaller due to <command>UPDATE</command>s and <command>DELETE</command>s.
        </para>
       </listitem>
 
@@ -684,7 +3040,7 @@
 2017-04-06 [7e534adcd] Fix BRIN cost estimation
 -->
        <para>
-        Improve accuracy in determining if a <acronym>BRIN</> index scan
+        Improve accuracy in determining if a <acronym>BRIN</acronym> index scan
         is beneficial (David Rowley, Emre Hasegeli)
        </para>
       </listitem>
@@ -694,70 +3050,22 @@
 2016-09-09 [b1328d78f] Invent PageIndexTupleOverwrite, and teach BRIN and GiST
 -->
        <para>
-        Allow faster <acronym>GiST</> inserts and updates by reusing
+        Allow faster <acronym>GiST</acronym> inserts and updates by reusing
         index space more efficiently (Andrey Borodin)
        </para>
       </listitem>
 
-     </itemizedlist>
-
-     <sect5>
-      <title><link linkend="indexes-types">Hash Indexes</link></title>
-
-      <itemizedlist>
-
-       <listitem>
-<!--
-2017-02-27 [30df93f69] hash: Refactor overflow page allocation.
-2017-03-14 [c11453ce0] hash: Add write-ahead logging support.
-2017-02-27 [b0f18cb77] hash: Refactor bucket squeeze code.
--->
-        <para>
-         Add write-ahead logging support to hash indexes (Amit Kapila)
-        </para>
-
-        <para>
-         This makes hash indexes crash-safe and replicatable.
-         The former warning message about their use is removed.
-        </para>
-       </listitem>
-
-       <listitem>
-<!--
-2016-11-30 [6d46f4783] Improve hash index bucket split behavior.
-2017-02-07 [293e24e50] Cache hash index's metapage in rel->rd_amcache.
--->
-        <para>
-         Improve hash index bucket split performance by reducing locking
-         requirements (Amit Kapila, Mithun Cy)
-        </para>
-
-        <para>
-         Also cache hash index meta-information for faster lookups.
-        </para>
-       </listitem>
-
-       <listitem>
-<!--
-2017-04-03 [ea69a0dea] Expand hash indexes more gradually.
--->
-        <para>
-         Improve efficiency of hash index growth (Amit Kapila, Mithun Cy)
-        </para>
-       </listitem>
-
-       <listitem>
+      <listitem>
 <!--
-2017-03-15 [6977b8b7f] Port single-page btree vacuum logic to hash indexes.
+2017-03-23 [218f51584] Reduce page locking in GIN vacuum
 -->
-        <para>
-         Allow page-at-a-time hash index pruning (Ashutosh Sharma)
-        </para>
-       </listitem>
-
-      </itemizedlist>
+       <para>
+        Reduce page locking during vacuuming of <acronym>GIN</acronym> indexes
+        (Andrey Borodin)
+       </para>
+      </listitem>
 
-     </sect5>
+     </itemizedlist>
 
     </sect4>
 
@@ -769,23 +3077,6 @@
 
       <listitem>
 <!--
-2016-09-05 [15bc038f9] Relax transactional restrictions on ALTER TYPE ... ADD V
--->
-       <para>
-        Reduce locking required for adding values to enum types (Andrew
-        Dunstan, Tom Lane)
-       </para>
-
-       <para>
-        Previously it was impossible to run <command>ALTER TYPE ... ADD
-        VALUE</> in a transaction block unless the enum type was created
-        in the same block.  Now, only references to uncommitted enum
-        values from other transactions are prohibited.
-       </para>
-      </listitem>
-
-      <listitem>
-<!--
 2017-03-06 [21d4e2e20] Reduce lock levels for table storage params related to p
 2017-04-05 [68ea2b7f9] Reduce lock level for CREATE STATISTICS
 -->
@@ -796,7 +3087,7 @@
 
        <para>
         For example, changing a table's <xref
-        linkend="guc-effective-io-concurrency"> setting can now be done
+        linkend="guc-effective-io-concurrency"/> setting can now be done
         with a more lightweight lock.
        </para>
       </listitem>
@@ -813,8 +3104,8 @@
        <para>
         Lock promotion can now be controlled through two new server
         parameters, <xref
-        linkend="guc-max-pred-locks-per-relation"> and
-        <xref linkend="guc-max-pred-locks-per-page">.
+        linkend="guc-max-pred-locks-per-relation"/> and
+        <xref linkend="guc-max-pred-locks-per-page"/>.
        </para>
       </listitem>
 
@@ -841,9 +3132,9 @@
 
       <para>
        New commands are <link
-       linkend="SQL-CREATESTATISTICS"><command>CREATE STATISTICS</></>,
-       <link linkend="SQL-ALTERSTATISTICS"><command>ALTER STATISTICS</></>, and
-       <link linkend="SQL-DROPSTATISTICS"><command>DROP STATISTICS</></>.
+       linkend="sql-createstatistics"><command>CREATE STATISTICS</command></link>,
+       <link linkend="sql-alterstatistics"><command>ALTER STATISTICS</command></link>, and
+       <link linkend="sql-dropstatistics"><command>DROP STATISTICS</command></link>.
        This feature is helpful in estimating query memory usage and when
        combining the statistics from individual columns.
       </para>
@@ -880,9 +3171,9 @@
 -->
        <para>
         Speed up aggregate functions that calculate a running sum
-        using <type>numeric</>-type arithmetic, including some variants
-        of <function>SUM()</>, <function>AVG()</>,
-        and <function>STDDEV()</> (Heikki Linnakangas)
+        using <type>numeric</type>-type arithmetic, including some variants
+        of <function>SUM()</function>, <function>AVG()</function>,
+        and <function>STDDEV()</function> (Heikki Linnakangas)
        </para>
       </listitem>
 
@@ -966,41 +3257,41 @@
 -->
        <para>
         Allow explicit control
-        over <link linkend="SQL-EXPLAIN"><command>EXPLAIN</></>'s display
+        over <link linkend="sql-explain"><command>EXPLAIN</command></link>'s display
         of planning and execution time (Ashutosh Bapat)
        </para>
 
        <para>
         By default planning and execution time are displayed by
-        <command>EXPLAIN ANALYZE</> and are not displayed in other cases.
-        The new <command>EXPLAIN</> option <literal>SUMMARY</> allows
+        <command>EXPLAIN ANALYZE</command> and are not displayed in other cases.
+        The new <command>EXPLAIN</command> option <literal>SUMMARY</literal> allows
         explicit control of this.
        </para>
       </listitem>
 
       <listitem>
 <!--
-2017-03-18 [17f8ffa1e] Fix REFRESH MATERIALIZED VIEW to report activity to the
+2017-03-30 [25fff4079] Default monitoring roles
 -->
        <para>
-        Properly update the statistics collector during <link
-        linkend="SQL-REFRESHMATERIALIZEDVIEW"><command>REFRESH MATERIALIZED
-        VIEW</></> (Jim Mlodgenski)
+        Add default monitoring roles (Dave Page)
+       </para>
+
+       <para>
+        New roles <literal>pg_monitor</literal>, <literal>pg_read_all_settings</literal>,
+        <literal>pg_read_all_stats</literal>, and <literal>pg_stat_scan_tables</literal>
+        allow simplified permission configuration.
        </para>
       </listitem>
 
       <listitem>
 <!--
-2017-03-30 [25fff4079] Default monitoring roles
+2017-03-18 [17f8ffa1e] Fix REFRESH MATERIALIZED VIEW to report activity to the
 -->
        <para>
-        Add default monitoring roles (Dave Page)
-       </para>
-
-       <para>
-        New roles <literal>pg_monitor</>, <literal>pg_read_all_settings</>,
-        <literal>pg_read_all_stats</>, and <literal>pg_stat_scan_tables</>
-        allow simplified permission configuration.
+        Properly update the statistics collector during <link
+        linkend="sql-refreshmaterializedview"><command>REFRESH MATERIALIZED
+        VIEW</command></link> (Jim Mlodgenski)
        </para>
       </listitem>
 
@@ -1016,7 +3307,7 @@
 2016-10-17 [7d3235ba4] By default, set log_line_prefix = '%m [%p] '.
 -->
         <para>
-         Change the default value of <xref linkend="guc-log-line-prefix">
+         Change the default value of <xref linkend="guc-log-line-prefix"/>
          to include current timestamp (with milliseconds) and the process ID
          in each line of postmaster log output (Christoph Berg)
         </para>
@@ -1031,14 +3322,14 @@
 2017-03-16 [befd73c50] Add pg_ls_logdir() and pg_ls_waldir() functions.
 -->
         <para>
-         Add functions to return the log and <acronym>WAL</> directory
+         Add functions to return the log and <acronym>WAL</acronym> directory
          contents (Dave Page)
         </para>
 
         <para>
          The new functions
-         are <link linkend="functions-admin-genfile-table"><function>pg_ls_logdir()</></>
-         and <link linkend="functions-admin-genfile-table"><function>pg_ls_waldir()</></>
+         are <link linkend="functions-admin-genfile-table"><function>pg_ls_logdir()</function></link>
+         and <link linkend="functions-admin-genfile-table"><function>pg_ls_waldir()</function></link>
          and can be executed by non-superusers with the proper
          permissions.
         </para>
@@ -1050,7 +3341,7 @@
 -->
         <para>
          Add function <link
-         linkend="functions-info-session-table"><function>pg_current_logfile()</></>
+         linkend="functions-info-session-table"><function>pg_current_logfile()</function></link>
          to read logging collector's current stderr and csvlog output file names
          (Gilles Darold)
         </para>
@@ -1082,7 +3373,7 @@
         </para>
 
         <para>
-         These are now <literal>DEBUG1</>-level messages.
+         These are now <literal>DEBUG1</literal>-level messages.
         </para>
        </listitem>
 
@@ -1093,12 +3384,12 @@
         <para>
          Reduce message verbosity of lower-numbered debug levels
          controlled by
-         <xref linkend="guc-log-min-messages"> (Robert Haas)
+         <xref linkend="guc-log-min-messages"/> (Robert Haas)
         </para>
 
         <para>
          This also changes the verbosity of <xref
-         linkend="guc-client-min-messages"> debug levels.
+         linkend="guc-client-min-messages"/> debug levels.
         </para>
        </listitem>
 
@@ -1107,32 +3398,24 @@
      </sect5>
 
      <sect5>
-      <title><link linkend="pg-stat-activity-view"><structname>pg_stat_activity</></link></title>
+      <title><link linkend="pg-stat-activity-view"><structname>pg_stat_activity</structname></link></title>
 
       <itemizedlist>
 
        <listitem>
 <!--
 2016-10-04 [6f3bd98eb] Extend framework from commit 53be0b1ad to report latch w
+2017-03-18 [249cf070e] Create and use wait events for read, write, and fsync op
 -->
         <para>
-         Add <structname>pg_stat_activity</> reporting of latch wait states
-         (Michael Paquier, Robert Haas)
+         Add <structname>pg_stat_activity</structname> reporting of low-level wait
+         states (Michael Paquier, Robert Haas, Rushabh Lathia)
         </para>
 
         <para>
-         This includes the remaining wait events, like client reads,
-         client writes, and synchronous replication.
-        </para>
-       </listitem>
-
-       <listitem>
-<!--
-2017-03-18 [249cf070e] Create and use wait events for read, write, and fsync op
--->
-        <para>
-         Add <structname>pg_stat_activity</> reporting of waits on reads,
-         writes, and fsyncs (Rushabh Lathia)
+         This change enables reporting of numerous low-level wait conditions,
+         including latch waits, file reads/writes/fsyncs, client reads/writes,
+         and synchronous replication.
         </para>
        </listitem>
 
@@ -1143,13 +3426,13 @@
 -->
         <para>
          Show auxiliary processes, background workers, and walsender
-         processes in <structname>pg_stat_activity</> (Kuntal Ghosh,
+         processes in <structname>pg_stat_activity</structname> (Kuntal Ghosh,
          Michael Paquier)
         </para>
 
         <para>
          This simplifies monitoring.  A new
-         column <structfield>backend_type</> identifies the process type.
+         column <structfield>backend_type</structfield> identifies the process type.
         </para>
        </listitem>
 
@@ -1158,7 +3441,7 @@
 2017-02-22 [4c728f382] Pass the source text for a parallel query to the workers
 -->
         <para>
-         Allow <structname>pg_stat_activity</> to show the SQL query
+         Allow <structname>pg_stat_activity</structname> to show the SQL query
          being executed by parallel workers (Rafia Sabih)
         </para>
        </listitem>
@@ -1169,9 +3452,9 @@
 -->
         <para>
          Rename
-         <structname>pg_stat_activity</>.<structfield>wait_event_type</>
-         values <literal>LWLockTranche</> and
-         <literal>LWLockNamed</> to <literal>LWLock</> (Robert Haas)
+         <structname>pg_stat_activity</structname>.<structfield>wait_event_type</structfield>
+         values <literal>LWLockTranche</literal> and
+         <literal>LWLockNamed</literal> to <literal>LWLock</literal> (Robert Haas)
         </para>
 
         <para>
@@ -1185,7 +3468,7 @@
     </sect4>
 
     <sect4>
-     <title><acronym>Authentication</></title>
+     <title><acronym>Authentication</acronym></title>
 
      <itemizedlist>
 
@@ -1197,13 +3480,13 @@
 2017-04-18 [c727f120f] Rename "scram" to "scram-sha-256" in pg_hba.conf and pas
 -->
        <para>
-        Add <link linkend="auth-pg-hba-conf"><literal>SCRAM-SHA-256</></>
+        Add <link linkend="auth-password">SCRAM-SHA-256</link>
         support for password negotiation and storage (Michael Paquier,
         Heikki Linnakangas)
       </para>
 
        <para>
-        This provides better security than the existing <literal>md5</>
+        This provides better security than the existing <literal>md5</literal>
         negotiation and storage method.
        </para>
       </listitem>
@@ -1213,8 +3496,8 @@
 2016-09-28 [babe05bc2] Turn password_encryption GUC into an enum.
 -->
        <para>
-        Change the <xref linkend="guc-password-encryption"> server parameter
-        from <type>boolean</> to <type>enum</> (Michael Paquier)
+        Change the <xref linkend="guc-password-encryption"/> server parameter
+        from <type>boolean</type> to <type>enum</type> (Michael Paquier)
        </para>
 
        <para>
@@ -1228,8 +3511,8 @@
 -->
        <para>
         Add view <link
-        linkend="view-pg-hba-file-rules"><structname>pg_hba_file_rules</></>
-        to display the contents of <filename>pg_hba.conf</> (Haribabu
+        linkend="view-pg-hba-file-rules"><structname>pg_hba_file_rules</structname></link>
+        to display the contents of <filename>pg_hba.conf</filename> (Haribabu
         Kommi)
        </para>
 
@@ -1243,11 +3526,11 @@
 2017-03-22 [6b76f1bb5] Support multiple RADIUS servers
 -->
        <para>
-        Support multiple <acronym>RADIUS</> servers (Magnus Hagander)
+        Support multiple <acronym>RADIUS</acronym> servers (Magnus Hagander)
        </para>
 
        <para>
-        All the <acronym>RADIUS</> related parameters are now plural and
+        All the <acronym>RADIUS</acronym> related parameters are now plural and
         support a comma-separated list of servers.
        </para>
       </listitem>
@@ -1268,16 +3551,16 @@
 2017-01-04 [6667d9a6d] Re-allow SSL passphrase prompt at server start, but not
 -->
        <para>
-        Allow <acronym>SSL</> configuration to be updated during
+        Allow <acronym>SSL</acronym> configuration to be updated during
         configuration reload (Andreas Karlsson, Tom Lane)
        </para>
 
        <para>
-        This allows <acronym>SSL</> to be reconfigured without a server
-        restart, by using <command>pg_ctl reload</>, <command>SELECT
-        pg_reload_conf()</>, or sending a <literal>SIGHUP</> signal.
-        However, reloading the <acronym>SSL</> configuration does not work
-        if the server's <acronym>SSL</> key requires a passphrase, as there
+        This allows <acronym>SSL</acronym> to be reconfigured without a server
+        restart, by using <command>pg_ctl reload</command>, <command>SELECT
+        pg_reload_conf()</command>, or sending a <literal>SIGHUP</literal> signal.
+        However, reloading the <acronym>SSL</acronym> configuration does not work
+        if the server's <acronym>SSL</acronym> key requires a passphrase, as there
         is no way to re-prompt for the passphrase.  The original
         configuration will apply for the life of the postmaster in that
         case.
@@ -1290,7 +3573,7 @@
 -->
        <para>
         Make the maximum value of <xref
-        linkend="guc-bgwriter-lru-maxpages"> effectively unlimited
+        linkend="guc-bgwriter-lru-maxpages"/> effectively unlimited
         (Jim Nasby)
        </para>
       </listitem>
@@ -1309,8 +3592,8 @@
 2017-03-27 [1b02be21f] Fsync directory after creating or unlinking file.
 -->
        <para>
-        Perform an fsync on the directory after creating or unlinking files
-        (Michael Paquier)
+        After creating or unlinking files, perform an fsync on their parent
+        directory (Michael Paquier)
        </para>
 
        <para>
@@ -1321,7 +3604,7 @@
      </itemizedlist>
 
      <sect5>
-      <title><link linkend="wal">Write-Ahead Log</> (<acronym>WAL</>)</title>
+      <title><link linkend="wal">Write-Ahead Log</link> (<acronym>WAL</acronym>)</title>
 
       <itemizedlist>
 
@@ -1330,7 +3613,7 @@
 2016-12-22 [6ef2eba3f] Skip checkpoints, archiving on idle systems.
 -->
         <para>
-         Prevent unnecessary checkpoints and <acronym>WAL</> archiving on
+         Prevent unnecessary checkpoints and <acronym>WAL</acronym> archiving on
          otherwise-idle systems (Michael Paquier)
         </para>
        </listitem>
@@ -1341,8 +3624,8 @@
 2017-03-14 [bb4a39637] hash: Support WAL consistency checking.
 -->
         <para>
-         Add <xref linkend="guc-wal-consistency-checking"> server parameter
-         to add details to <acronym>WAL</> that can be sanity-checked on
+         Add <xref linkend="guc-wal-consistency-checking"/> server parameter
+         to add details to <acronym>WAL</acronym> that can be sanity-checked on
          the standby (Kuntal Ghosh, Robert Haas)
         </para>
 
@@ -1356,14 +3639,14 @@
 2017-04-05 [00b6b6feb] Allow -\-with-wal-segsize=n up to n=1024MB
 -->
         <para>
-         Increase the maximum configurable <acronym>WAL</> segment size
+         Increase the maximum configurable <acronym>WAL</acronym> segment size
          to one gigabyte (Beena Emerson)
         </para>
 
         <para>
-         Larger <acronym>WAL</> segment sizes allows for fewer
-         <xref linkend="guc-archive-command"> invocations and fewer
-         <acronym>WAL</> files to manage.
+         A larger <acronym>WAL</acronym> segment size allows for fewer
+         <xref linkend="guc-archive-command"/> invocations and fewer
+         <acronym>WAL</acronym> files to manage.
         </para>
        </listitem>
 
@@ -1388,13 +3671,13 @@
 -->
       <para>
        Add the ability to <link linkend="logical-replication">logically
-       replicate</> tables to standby servers (Petr Jelinek)
+       replicate</link> tables to standby servers (Petr Jelinek)
       </para>
 
       <para>
        Logical replication allows more flexibility than physical
        replication does, including replication between different major
-       versions of <productname>PostgreSQL</> and selective-table
+       versions of <productname>PostgreSQL</productname> and selective
        replication.
       </para>
      </listitem>
@@ -1406,13 +3689,13 @@
       <para>
        Allow waiting for commit acknowledgement from standby
        servers irrespective of the order they appear in <xref
-       linkend="guc-synchronous-standby-names"> (Masahiko Sawada)
+       linkend="guc-synchronous-standby-names"/> (Masahiko Sawada)
       </para>
 
       <para>
        Previously the server always waited for the active standbys that
-       appeared first in <varname>synchronous_standby_names</>.  The new
-       <varname>synchronous_standby_names</> keyword <literal>ANY</> allows
+       appeared first in <varname>synchronous_standby_names</varname>.  The new
+       <varname>synchronous_standby_names</varname> keyword <literal>ANY</literal> allows
        waiting for any number of standbys irrespective of their ordering.
        This is known as quorum commit.
       </para>
@@ -1430,9 +3713,9 @@
 
       <para>
        Specifically, the defaults were changed for <xref
-       linkend="guc-wal-level">, <xref linkend="guc-max-wal-senders">,
-       <xref linkend="guc-max-replication-slots">, and <xref
-       linkend="guc-hot-standby"> to make them suitable for these usages
+       linkend="guc-wal-level"/>, <xref linkend="guc-max-wal-senders"/>,
+       <xref linkend="guc-max-replication-slots"/>, and <xref
+       linkend="guc-hot-standby"/> to make them suitable for these usages
        out-of-the-box.
       </para>
      </listitem>
@@ -1443,14 +3726,14 @@
 -->
       <para>
        Enable replication from localhost connections by default in
-       <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></>
+       <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
        (Michael Paquier)
       </para>
 
       <para>
-       Previously <filename>pg_hba.conf</>'s replication connection
-       lines were commented out.  This is particularly useful for
-       <application><xref linkend="app-pgbasebackup"></>.
+       Previously <filename>pg_hba.conf</filename>'s replication connection
+       lines were commented out by default.  This is particularly useful for
+       <application><xref linkend="app-pgbasebackup"/></application>.
       </para>
      </listitem>
 
@@ -1460,13 +3743,13 @@
 -->
       <para>
        Add columns to <link
-       linkend="monitoring-stats-views-table"><structname>pg_stat_replication</></>
+       linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
        to report replication delay times (Thomas Munro)
       </para>
 
       <para>
-       The new columns are <structfield>write_lag</>,
-       <structfield>flush_lag</>, and <structfield>replay_lag</>.
+       The new columns are <structfield>write_lag</structfield>,
+       <structfield>flush_lag</structfield>, and <structfield>replay_lag</structfield>.
       </para>
      </listitem>
 
@@ -1476,8 +3759,8 @@
 -->
       <para>
        Allow specification of the recovery stopping point by Log Sequence
-       Number (<acronym>LSN</>) in
-       <link linkend="recovery-config"><filename>recovery.conf</></>
+       Number (<acronym>LSN</acronym>) in
+       <link linkend="recovery-config"><filename>recovery.conf</filename></link>
        (Michael Paquier)
       </para>
 
@@ -1490,15 +3773,16 @@
      <listitem>
 <!--
 2017-03-22 [017e4f258] Expose waitforarchive option through pg_stop_backup()
+2017-08-05 [52f8a59dd] Make pg_stop_backup's wait_for_archive flag work on stan
 -->
       <para>
        Allow users to disable <link
-       linkend="functions-admin"><function>pg_stop_backup()</></>'s
-       waiting for all <acronym>WAL</> to be archived (David Steele)
+       linkend="functions-admin"><function>pg_stop_backup()</function></link>'s
+       waiting for all <acronym>WAL</acronym> to be archived (David Steele)
       </para>
 
       <para>
-       An optional second argument to <function>pg_stop_backup()</>
+       An optional second argument to <function>pg_stop_backup()</function>
        controls that behavior.
       </para>
      </listitem>
@@ -1509,7 +3793,7 @@
 -->
       <para>
        Allow creation of <link
-       linkend="functions-replication-table">temporary replication slots</>
+       linkend="functions-replication-table">temporary replication slots</link>
        (Petr Jelinek)
       </para>
 
@@ -1553,45 +3837,25 @@
 -->
       <para>
        Add <link
-       linkend="functions-xml-processing-xmltable"><function>XMLTABLE</></>
-       function that converts <type>XML</>-formatted data into a row set
+       linkend="functions-xml-processing-xmltable"><function>XMLTABLE</function></link>
+       function that converts <type>XML</type>-formatted data into a row set
        (Pavel Stehule, &Aacute;lvaro Herrera)
       </para>
      </listitem>
 
      <listitem>
 <!--
-2016-11-22 [906bfcad7] Improve handling of "UPDATE ... SET (column_list) = row_
--->
-      <para>
-       Allow standard row constructor syntax in <literal>UPDATE ... SET
-       (<replaceable>column_list</>) = <replaceable>row_constructor</></literal>
-       (Tom Lane)
-      </para>
-
-      <para>
-       The <replaceable>row_constructor</> can now begin with the
-       keyword <literal>ROW</>; previously that had to be omitted.  Also,
-       an occurrence of <literal><replaceable>table_name</>.*</literal>
-       within the <replaceable>row_constructor</> is now expanded into
-       multiple columns, as in other uses
-       of <replaceable>row_constructor</>s.
-      </para>
-     </listitem>
-
-     <listitem>
-<!--
 2016-09-05 [c54159d44] Make locale-dependent regex character classes work for l
 -->
       <para>
        Fix regular expressions' character class handling for large character
-       codes, particularly Unicode characters above <literal>U+7FF</>
+       codes, particularly Unicode characters above <literal>U+7FF</literal>
        (Tom Lane)
       </para>
 
       <para>
        Previously, such characters were never recognized as belonging to
-       locale-dependent character classes such as <literal>[[:alpha:]]</>.
+       locale-dependent character classes such as <literal>[[:alpha:]]</literal>.
       </para>
      </listitem>
 
@@ -1609,8 +3873,8 @@
 2016-12-07 [f0e44751d] Implement table partitioning.
 -->
       <para>
-       Add table <link linkend="SQL-CREATETABLE-PARTITION">partitioning
-       syntax</> that automatically creates partition constraints and
+       Add table <link linkend="sql-createtable-partition">partitioning
+       syntax</link> that automatically creates partition constraints and
        handles routing of tuple insertions and updates (Amit Langote)
       </para>
 
@@ -1626,8 +3890,9 @@
 2017-03-31 [597027163] Add transition table support to plpgsql.
 -->
       <para>
-       Add <link linkend="SQL-CREATETRIGGER"><literal>AFTER</> trigger</>
-       transition tables to record changed rows (Kevin Grittner)
+       Add <link linkend="sql-createtrigger"><literal>AFTER</literal> trigger</link>
+       transition tables to record changed rows (Kevin Grittner, Thomas
+       Munro)
       </para>
 
       <para>
@@ -1641,13 +3906,13 @@
 2016-12-05 [093129c9d] Add support for restrictive RLS policies
 -->
       <para>
-       Allow <link linkend="SQL-CREATEPOLICY">restrictive row-level
-       security policies</> (Stephen Frost)
+       Allow <link linkend="sql-createpolicy">restrictive row-level
+       security policies</link> (Stephen Frost)
       </para>
 
       <para>
        Previously all security policies were permissive, meaning that any
-       matching policy allowed access.  Optional restrictive policies must
+       matching policy allowed access.  A restrictive policy must
        match for access to be granted.  These policy types can be combined.
       </para>
      </listitem>
@@ -1658,16 +3923,16 @@
 -->
        <para>
         When creating a foreign-key constraint, check
-        for <literal>REFERENCES</> permission on only the referenced table
+        for <literal>REFERENCES</literal> permission on only the referenced table
         (Tom Lane)
        </para>
 
        <para>
-        Previously <literal>REFERENCES</> permission on the referencing
+        Previously <literal>REFERENCES</literal> permission on the referencing
         table was also required.  This appears to have stemmed from a
         misreading of the SQL standard.  Since creating a foreign key (or
         any other type of) constraint requires ownership privilege on the
-        constrained table, additionally requiring <literal>REFERENCES</>
+        constrained table, additionally requiring <literal>REFERENCES</literal>
         permission seems rather pointless.
        </para>
       </listitem>
@@ -1677,12 +3942,12 @@
 2017-03-28 [ab89e465c] Altering default privileges on schemas
 -->
       <para>
-       Allow <link linkend="SQL-ALTERDEFAULTPRIVILEGES">default
-       permissions</> on schemas (Matheus Oliveira)
+       Allow <link linkend="sql-alterdefaultprivileges">default
+       permissions</link> on schemas (Matheus Oliveira)
       </para>
 
       <para>
-       This is done using the <literal>ALTER DEFAULT PRIVILEGES</> command.
+       This is done using the <literal>ALTER DEFAULT PRIVILEGES</literal> command.
       </para>
      </listitem>
 
@@ -1691,8 +3956,8 @@
 2017-02-10 [2ea5b06c7] Add CREATE SEQUENCE AS <data type> clause
 -->
       <para>
-       Add <link linkend="SQL-CREATESEQUENCE"><command>CREATE SEQUENCE
-       AS</></> command to create a sequence matching an integer data type
+       Add <link linkend="sql-createsequence"><command>CREATE SEQUENCE
+       AS</command></link> command to create a sequence matching an integer data type
        (Peter Eisentraut)
       </para>
 
@@ -1707,13 +3972,13 @@
 2016-11-10 [279c439c7] Support "COPY view FROM" for views with INSTEAD OF INSER
 -->
       <para>
-       Allow <literal>COPY <replaceable>view</>
-       FROM <replaceable>source</></> on views with <literal>INSTEAD
-       INSERT</> triggers (Haribabu Kommi)
+       Allow <literal>COPY <replaceable>view</replaceable>
+       FROM <replaceable>source</replaceable></literal> on views with <literal>INSTEAD
+       INSERT</literal> triggers (Haribabu Kommi)
       </para>
 
       <para>
-       The triggers are fed the data rows read by <command>COPY</>.
+       The triggers are fed the data rows read by <command>COPY</command>.
       </para>
      </listitem>
 
@@ -1723,14 +3988,14 @@
 -->
       <para>
        Allow the specification of a function name without arguments in
-       <acronym>DDL</> commands, if it is unique (Peter Eisentraut)
+       <acronym>DDL</acronym> commands, if it is unique (Peter Eisentraut)
       </para>
 
       <para>
-       For example, allow <link linkend="SQL-DROPFUNCTION"><command>DROP
-       FUNCTION</></> on a function name without arguments if there
+       For example, allow <link linkend="sql-dropfunction"><command>DROP
+       FUNCTION</command></link> on a function name without arguments if there
        is only one function with that name.  This behavior is required by the
-       <acronym>SQL</> standard.
+       <acronym>SQL</acronym> standard.
       </para>
      </listitem>
 
@@ -1740,7 +4005,7 @@
 -->
       <para>
        Allow multiple functions, operators, and aggregates to be dropped
-       with a single <command>DROP</> command (Peter Eisentraut)
+       with a single <command>DROP</command> command (Peter Eisentraut)
       </para>
      </listitem>
 
@@ -1750,10 +4015,10 @@
 2017-03-20 [b6fb534f1] Add IF NOT EXISTS for CREATE SERVER and CREATE USER MAPP
 -->
       <para>
-       Support <literal>IF NOT EXISTS</>
-       in <link linkend="SQL-CREATESERVER"><command>CREATE SERVER</></>,
-       <link linkend="SQL-CREATEUSERMAPPING"><command>CREATE USER MAPPING</></>,
-       and <link linkend="SQL-CREATECOLLATION"><command>CREATE COLLATION</></>
+       Support <literal>IF NOT EXISTS</literal>
+       in <link linkend="sql-createserver"><command>CREATE SERVER</command></link>,
+       <link linkend="sql-createusermapping"><command>CREATE USER MAPPING</command></link>,
+       and <link linkend="sql-createcollation"><command>CREATE COLLATION</command></link>
        (Anastasia Lubennikova, Peter Eisentraut)
       </para>
      </listitem>
@@ -1764,14 +4029,14 @@
 2017-03-03 [9eb344faf] Allow vacuums to report oldestxmin
 -->
       <para>
-       Make <link linkend="SQL-VACUUM"><command>VACUUM VERBOSE</></> report
+       Make <link linkend="sql-vacuum"><command>VACUUM VERBOSE</command></link> report
        the number of skipped frozen pages and oldest xmin (Masahiko
        Sawada, Simon Riggs)
       </para>
 
       <para>
        This information is also included in <xref
-       linkend="guc-log-autovacuum-min-duration"> output.
+       linkend="guc-log-autovacuum-min-duration"/> output.
       </para>
      </listitem>
 
@@ -1780,7 +4045,7 @@
 2017-01-23 [7e26e02ee] Prefetch blocks during lazy vacuum's truncation scan
 -->
       <para>
-       Improve speed of <command>VACUUM</>'s removal of trailing empty
+       Improve speed of <command>VACUUM</command>'s removal of trailing empty
        heap pages (Claudio Freire, &Aacute;lvaro Herrera)
       </para>
      </listitem>
@@ -1799,13 +4064,13 @@
 2017-03-31 [e306df7f9] Full Text Search support for JSON and JSONB
 -->
        <para>
-        Add full text search support for <type>JSON</> and <type>JSONB</>
+        Add full text search support for <type>JSON</type> and <type>JSONB</type>
         (Dmitry Dolgov)
        </para>
 
        <para>
-        The functions <function>ts_headline()</> and
-        <function>to_tsvector()</> can now be used on these data types.
+        The functions <function>ts_headline()</function> and
+        <function>to_tsvector()</function> can now be used on these data types.
        </para>
       </listitem>
 
@@ -1814,15 +4079,15 @@
 2017-03-15 [c7a9fa399] Add support for EUI-64 MAC addresses as macaddr8
 -->
       <para>
-       Add support for <acronym>EUI-64</> <acronym>MAC</> addresses, as a
-       new data type <link linkend="datatype-macaddr8"><type>macaddr8</></>
+       Add support for <acronym>EUI-64</acronym> <acronym>MAC</acronym> addresses, as a
+       new data type <link linkend="datatype-macaddr8"><type>macaddr8</type></link>
        (Haribabu Kommi)
       </para>
 
       <para>
        This complements the existing support
-       for <acronym>EUI-48</> <acronym>MAC</> addresses
-       as <type>macaddr</>.
+       for <acronym>EUI-48</acronym> <acronym>MAC</acronym> addresses
+       (type <type>macaddr</type>).
       </para>
      </listitem>
 
@@ -1831,13 +4096,13 @@
 2017-04-06 [321732705] Identity columns
 -->
       <para>
-       Add <link linkend="SQL-CREATETABLE">identity columns</> for
+       Add <link linkend="sql-createtable">identity columns</link> for
        assigning a numeric value to columns on insert (Peter Eisentraut)
       </para>
 
       <para>
-       These are similar to <type>SERIAL</> columns, but are
-       <acronym>SQL</> standard compliant.
+       These are similar to <type>SERIAL</type> columns, but are
+       <acronym>SQL</acronym> standard compliant.
       </para>
      </listitem>
 
@@ -1846,13 +4111,13 @@
 2016-09-07 [0ab9c56d0] Support renaming an existing value of an enum type.
 -->
       <para>
-       Allow <link linkend="datatype-enum"><type>ENUM</></> values to be
+       Allow <link linkend="datatype-enum"><type>ENUM</type></link> values to be
        renamed (Dagfinn Ilmari Manns&aring;ker)
       </para>
 
       <para>
-       This uses the syntax <link linkend="SQL-ALTERTYPE"><command>ALTER
-       TYPE ... RENAME VALUE</></>.
+       This uses the syntax <link linkend="sql-altertype"><command>ALTER
+       TYPE ... RENAME VALUE</command></link>.
       </para>
      </listitem>
 
@@ -1862,14 +4127,14 @@
 -->
       <para>
        Properly treat array pseudotypes
-       (<type>anyarray</>) as arrays in <link
-       linkend="functions-json-creation-table"><function>to_json()</></>
-       and <function>to_jsonb()</> (Andrew Dunstan)
+       (<type>anyarray</type>) as arrays in <link
+       linkend="functions-json-creation-table"><function>to_json()</function></link>
+       and <function>to_jsonb()</function> (Andrew Dunstan)
       </para>
 
       <para>
-       Previously columns declared as <type>anyarray</> (particularly those
-       in the <structname>pg_stats</> view) were converted to <type>JSON</>
+       Previously columns declared as <type>anyarray</type> (particularly those
+       in the <structname>pg_stats</structname> view) were converted to <type>JSON</type>
        strings rather than arrays.
       </para>
      </listitem>
@@ -1880,16 +4145,16 @@
 -->
       <para>
        Add operators for multiplication and division
-       of <link linkend="datatype-money"><type>money</></link> values
-       with <type>int8</> values (Peter Eisentraut)
+       of <link linkend="datatype-money"><type>money</type></link> values
+       with <type>int8</type> values (Peter Eisentraut)
       </para>
 
       <para>
-       Previously such cases would result in converting the <type>int8</>
-       values to <type>float8</> and then using
-       the <type>money</>-and-<type>float8</> operators.  The new behavior
+       Previously such cases would result in converting the <type>int8</type>
+       values to <type>float8</type> and then using
+       the <type>money</type>-and-<type>float8</type> operators.  The new behavior
        avoids possible precision loss.  But note that division
-       of <type>money</> by <type>int8</> now truncates the quotient, like
+       of <type>money</type> by <type>int8</type> now truncates the quotient, like
        other integer-division cases, while the previous behavior would have
        rounded.
       </para>
@@ -1900,7 +4165,7 @@
 2016-09-14 [656df624c] Add overflow checks to money type input function
 -->
       <para>
-       Check for overflow in the <type>money</> type's input function
+       Check for overflow in the <type>money</type> type's input function
        (Peter Eisentraut)
       </para>
      </listitem>
@@ -1920,12 +4185,12 @@
 -->
       <para>
        Add simplified <link
-       linkend="functions-posix-regexp"><function>regexp_match()</></>
+       linkend="functions-posix-regexp"><function>regexp_match()</function></link>
        function (Emre Hasegeli)
       </para>
 
       <para>
-       This is similar to <function>regexp_matches()</>, but it only
+       This is similar to <function>regexp_matches()</function>, but it only
        returns results from the first match so it does not need to return a
        set, making it easier to use for simple cases.
       </para>
@@ -1936,8 +4201,8 @@
 2017-01-18 [d00ca333c] Implement array version of jsonb_delete and operator
 -->
       <para>
-       Add a version of <type>jsonb</>'s <link
-       linkend="functions-jsonb-op-table">delete operator</> that takes
+       Add a version of <type>jsonb</type>'s <link
+       linkend="functions-jsonb-op-table">delete operator</link> that takes
        an array of keys to delete (Magnus Hagander)
       </para>
      </listitem>
@@ -1947,7 +4212,7 @@
 2017-04-06 [cf35346e8] Make json_populate_record and friends operate recursivel
 -->
       <para>
-       Make <link linkend="functions-json-processing-table"><function>json_populate_record()</></>
+       Make <link linkend="functions-json-processing-table"><function>json_populate_record()</function></link>
        and related functions process JSON arrays and objects recursively
        (Nikita Glukhov)
       </para>
@@ -1957,7 +4222,7 @@
        properly converted from JSON arrays, and composite-type fields are
        properly converted from JSON objects.  Previously, such cases would
        fail because the text representation of the JSON value would be fed
-       to <function>array_in()</> or <function>record_in()</>, and its
+       to <function>array_in()</function> or <function>record_in()</function>, and its
        syntax would not match what those input functions expect.
       </para>
      </listitem>
@@ -1968,14 +4233,14 @@
 -->
       <para>
        Add function <link
-       linkend="functions-txid-snapshot"><function>txid_current_ifassigned()</></>
-       to return the current transaction ID or <literal>NULL</> if no
+       linkend="functions-txid-snapshot"><function>txid_current_if_assigned()</function></link>
+       to return the current transaction ID or <literal>NULL</literal> if no
        transaction ID has been assigned (Craig Ringer)
       </para>
 
       <para>
        This is different from <link
-       linkend="functions-txid-snapshot"><function>txid_current()</></>,
+       linkend="functions-txid-snapshot"><function>txid_current()</function></link>,
        which always returns a transaction ID, assigning one if necessary.
        Unlike that function, this function can be run on standby servers.
       </para>
@@ -1987,7 +4252,7 @@
 -->
       <para>
        Add function <link
-       linkend="functions-txid-snapshot"><function>txid_status()</></>
+       linkend="functions-txid-snapshot"><function>txid_status()</function></link>
        to check if a transaction was committed (Craig Ringer)
       </para>
 
@@ -2004,8 +4269,8 @@
 -->
       <para>
        Allow <link
-       linkend="functions-formatting-table"><function>make_date()</></>
-       to interpret negative years as <acronym>BC</> years (&Aacute;lvaro
+       linkend="functions-datetime-table"><function>make_date()</function></link>
+       to interpret negative years as <acronym>BC</acronym> years (&Aacute;lvaro
        Herrera)
       </para>
      </listitem>
@@ -2015,14 +4280,16 @@
 2016-09-28 [d3cd36a13] Make to_timestamp() and to_date() range-check fields of
 -->
       <para>
-       Make <function>to_timestamp()</> and <function>to_date()</> reject
+       Make <link
+       linkend="functions-formatting-table"><function>to_timestamp()</function></link>
+       and <function>to_date()</function> reject
        out-of-range input fields (Artur Zakirov)
       </para>
 
       <para>
        For example,
-       previously <literal>to_date('2009-06-40','YYYY-MM-DD')</> was
-       accepted and returned <literal>2009-07-10</>.  It will now generate
+       previously <literal>to_date('2009-06-40','YYYY-MM-DD')</literal> was
+       accepted and returned <literal>2009-07-10</literal>.  It will now generate
        an error.
       </para>
      </listitem>
@@ -2041,7 +4308,7 @@
 2017-03-27 [70ec3f1f8] PL/Python: Add cursor and execute methods to plan object
 -->
       <para>
-       Allow PL/Python's <function>cursor()</> and <function>execute()</>
+       Allow PL/Python's <function>cursor()</function> and <function>execute()</function>
        functions to be called as methods of their plan-object arguments
        (Peter Eisentraut)
       </para>
@@ -2056,7 +4323,7 @@
 2016-12-13 [55caaaeba] Improve handling of array elements as getdiag_targets an
 -->
       <para>
-       Allow PL/pgSQL's <command>GET DIAGNOSTICS</> statement to retrieve
+       Allow PL/pgSQL's <command>GET DIAGNOSTICS</command> statement to retrieve
        values into array elements (Tom Lane)
       </para>
 
@@ -2069,7 +4336,7 @@
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="pltcl">PL/Tcl</></title>
+     <title><link linkend="pltcl">PL/Tcl</link></title>
 
      <itemizedlist>
 
@@ -2079,7 +4346,7 @@
 -->
        <para>
         Allow PL/Tcl functions to return composite types and sets
-        (Jim Nasby)
+        (Karl Lehenbauer)
        </para>
       </listitem>
 
@@ -2102,8 +4369,8 @@
 2017-03-07 [0d2b1f305] Invent start_proc parameters for PL/Tcl.
 -->
        <para>
-        Add server parameters <xref linkend="guc-pltcl-start-proc">
-        and <xref linkend="guc-pltclu-start-proc">, to allow initialization
+        Add server parameters <xref linkend="guc-pltcl-start-proc"/>
+        and <xref linkend="guc-pltclu-start-proc"/>, to allow initialization
         functions to be called on PL/Tcl startup (Tom Lane)
        </para>
       </listitem>
@@ -2126,7 +4393,7 @@
 -->
       <para>
        Allow specification of <link linkend="libpq-connect-host">multiple
-       host names or addresses</> in libpq connection strings and URIs
+       host names or addresses</link> in libpq connection strings and URIs
        (Robert Haas, Heikki Linnakangas)
       </para>
 
@@ -2141,7 +4408,7 @@
 -->
       <para>
        Allow libpq connection strings and URIs to request a <link
-       linkend="libpq-connect-target-session-attrs">read/write host</>,
+       linkend="libpq-connect-target-session-attrs">read/write host</link>,
        that is a master server rather than a standby server
        (Victor Wagner, Mithun Cy)
       </para>
@@ -2149,7 +4416,7 @@
       <para>
        This is useful when multiple host names are
        specified.  It is controlled by libpq connection parameter
-       <option>target_session_attrs</>.
+       <option>target_session_attrs</option>.
       </para>
      </listitem>
 
@@ -2158,7 +4425,7 @@
 2017-01-24 [ba005f193] Allow password file name to be specified as a libpq conn
 -->
       <para>
-       Allow the <link linkend="libpq-connect-passfile">password file name</>
+       Allow the <link linkend="libpq-connect-passfile">password file name</link>
        to be specified as a libpq connection parameter (Julian Markwort)
       </para>
 
@@ -2173,17 +4440,17 @@
 -->
       <para>
        Add function <link
-       linkend="libpq-pqencryptpasswordconn"><function>PQencryptPasswordConn()</></>
+       linkend="libpq-pqencryptpasswordconn"><function>PQencryptPasswordConn()</function></link>
        to allow creation of more types of encrypted passwords on the
        client side (Michael Paquier, Heikki Linnakangas)
       </para>
 
       <para>
-       Previously only <literal>MD5</>-encrypted passwords could be created
+       Previously only <literal>MD5</literal>-encrypted passwords could be created
        using <link
-       linkend="libpq-pqencryptpassword"><function>PQencryptPassword()</></>.
+       linkend="libpq-pqencryptpassword"><function>PQencryptPassword()</function></link>.
        This new function can also create <link
-       linkend="auth-pg-hba-conf"><literal>SCRAM-SHA-256</></>-encrypted
+       linkend="auth-pg-hba-conf"><literal>SCRAM-SHA-256</literal></link>-encrypted
        passwords.
       </para>
      </listitem>
@@ -2193,13 +4460,13 @@
 2016-08-16 [a7b5573d6] Remove separate version numbering for ecpg preprocessor.
 -->
       <para>
-       Change <application>ecpg</> preprocessor version from 4.12 to 10
+       Change <application>ecpg</application> preprocessor version from 4.12 to 10
        (Tom Lane)
       </para>
 
       <para>
-       Henceforth the <application>ecpg</> version will match
-       the <productname>PostgreSQL</> distribution version number.
+       Henceforth the <application>ecpg</application> version will match
+       the <productname>PostgreSQL</productname> distribution version number.
       </para>
      </listitem>
 
@@ -2211,7 +4478,7 @@
     <title>Client Applications</title>
 
     <sect4>
-     <title><xref linkend="APP-PSQL"></title>
+     <title><xref linkend="app-psql"/></title>
 
      <itemizedlist>
 
@@ -2222,14 +4489,14 @@
 2017-04-02 [68dba97a4] Document psql's behavior of recalling the previously exe
 -->
        <para>
-        Add conditional branch support to <application>psql</> (Corey
+        Add conditional branch support to <application>psql</application> (Corey
         Huinker)
        </para>
 
        <para>
-        This feature adds <application>psql</>
-        meta-commands <command>\if</>, <command>\elif</>, <command>\else</>,
-        and <command>\endif</>.  This is primarily helpful for scripting.
+        This feature adds <application>psql</application>
+        meta-commands <command>\if</command>, <command>\elif</command>, <command>\else</command>,
+        and <command>\endif</command>.  This is primarily helpful for scripting.
        </para>
       </listitem>
 
@@ -2238,39 +4505,23 @@
 2017-03-07 [b2678efd4] psql: Add \gx command
 -->
        <para>
-        Add <application>psql</> <command>\gx</> meta-command to execute
-        (<command>\g</>) a query in expanded mode (<command>\x</>)
+        Add <application>psql</application> <command>\gx</command> meta-command to execute
+        (<command>\g</command>) a query in expanded mode (<command>\x</command>)
         (Christoph Berg)
        </para>
       </listitem>
 
       <listitem>
 <!--
-2016-11-03 [a0f357e57] psql: Split up "Modifiers" column in \d and \dD
--->
-       <para>
-        Improve <application>psql</>'s <command>\d</> (display relation)
-        and <command>\dD</> (display domain) commands to show collation,
-        nullable, and default properties in separate columns (Peter
-        Eisentraut)
-       </para>
-
-       <para>
-        Previous they were shown in a single <quote>Modifiers</> column.
-       </para>
-      </listitem>
-
-      <listitem>
-<!--
 2017-04-01 [f833c847b] Allow psql variable substitution to occur in backtick co
 -->
        <para>
-        Expand <application>psql</> variable references in
+        Expand <application>psql</application> variable references in
         backtick-executed strings (Tom Lane)
        </para>
 
        <para>
-        This is particularly useful in the new <application>psql</>
+        This is particularly useful in the new <application>psql</application>
         conditional branch commands.
        </para>
       </listitem>
@@ -2282,23 +4533,64 @@
 2017-02-02 [fd6cd6980] Clean up psql's behavior for a few more control variable
 -->
        <para>
-        Prevent <application>psql</>'s special variables from being set to
+        Prevent <application>psql</application>'s special variables from being set to
         invalid values (Daniel V&eacute;rit&eacute;, Tom Lane)
        </para>
 
        <para>
-        Previously, setting one of <application>psql</>'s special variables
+        Previously, setting one of <application>psql</application>'s special variables
         to an invalid value silently resulted in the default behavior.
-        <command>\set</> on a special variable now fails if the proposed
-        new value is invalid.  As a special exception, <command>\set</>
+        <command>\set</command> on a special variable now fails if the proposed
+        new value is invalid.  As a special exception, <command>\set</command>
         with an empty or omitted new value, on a boolean-valued special
         variable, still has the effect of setting the variable
-        to <literal>on</>; but now it actually acquires that value rather
-        than an empty string.  <command>\unset</> on a special variable now
+        to <literal>on</literal>; but now it actually acquires that value rather
+        than an empty string.  <command>\unset</command> on a special variable now
         explicitly sets the variable to its default value, which is also
         the value it acquires at startup.  In sum, a control variable now
         always has a displayable value that reflects
-        what <application>psql</> is actually doing.
+        what <application>psql</application> is actually doing.
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
+2017-09-06 [a6c678f01] Add psql variables showing server version and psql versi
+-->
+       <para>
+        Add variables showing server version and <application>psql</application> version
+        (Fabien Coelho)
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
+2016-11-03 [a0f357e57] psql: Split up "Modifiers" column in \d and \dD
+-->
+       <para>
+        Improve <application>psql</application>'s <command>\d</command> (display relation)
+        and <command>\dD</command> (display domain) commands to show collation,
+        nullable, and default properties in separate columns (Peter
+        Eisentraut)
+       </para>
+
+       <para>
+        Previously they were shown in a single <quote>Modifiers</quote> column.
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
+2017-07-27 [77cb4a1d6] Standardize describe.c's behavior for no-matching-object
+-->
+       <para>
+        Make the various <command>\d</command> commands handle no-matching-object
+        cases more consistently (Daniel Gustafsson)
+       </para>
+
+       <para>
+        They now all print the message about that to stderr, not stdout,
+        and the message wording is more consistent.
        </para>
       </listitem>
 
@@ -2316,7 +4608,7 @@
 2017-03-16 [d7d77f382] psql: Add completion for \help DROP|ALTER
 -->
        <para>
-        Improve <application>psql</>'s tab completion (Jeff Janes,
+        Improve <application>psql</application>'s tab completion (Jeff Janes,
         Ian Barwick, Andreas Karlsson, Sehrope Sarkuni, Thomas Munro,
         Kevin Grittner, Dagfinn Ilmari Manns&aring;ker)
        </para>
@@ -2327,7 +4619,7 @@
     </sect4>
 
     <sect4>
-     <title><xref linkend="pgbench"></title>
+     <title><xref linkend="pgbench"/></title>
 
      <itemizedlist>
 
@@ -2336,7 +4628,7 @@
 2016-11-09 [41124a91e] pgbench: Allow the transaction log file prefix to be cha
 -->
        <para>
-        Add <application>pgbench</> option <option>--log-prefix</> to
+        Add <application>pgbench</application> option <option>--log-prefix</option> to
         control the log file prefix (Masahiko Sawada)
        </para>
       </listitem>
@@ -2346,7 +4638,7 @@
 2017-01-20 [cdc2a7047] Allow backslash line continuations in pgbench's meta com
 -->
        <para>
-        Allow <application>pgbench</>'s meta-commands to span multiple
+        Allow <application>pgbench</application>'s meta-commands to span multiple
         lines (Fabien Coelho)
        </para>
 
@@ -2356,6 +4648,16 @@
        </para>
       </listitem>
 
+      <listitem>
+<!--
+2017-08-11 [796818442] Remove pgbench's restriction on placement of -M switch.
+-->
+       <para>
+        Remove restriction on placement of <option>-M</option> option relative to
+        other command line options (Tom Lane)
+       </para>
+      </listitem>
+
      </itemizedlist>
 
     </sect4>
@@ -2373,8 +4675,8 @@
 -->
       <para>
        Add <link
-       linkend="app-pgreceivewal"><application>pg_receivewal</></>
-       option <option>-Z</>/<option>--compress</> to specify compression
+       linkend="app-pgreceivewal"><application>pg_receivewal</application></link>
+       option <option>-Z</option>/<option>--compress</option> to specify compression
        (Michael Paquier)
       </para>
      </listitem>
@@ -2385,12 +4687,12 @@
 -->
       <para>
        Add <link
-       linkend="app-pgrecvlogical"><application>pg_recvlogical</></> option
-       <option>--endpos</> to specify the ending position (Craig Ringer)
+       linkend="app-pgrecvlogical"><application>pg_recvlogical</application></link> option
+       <option>--endpos</option> to specify the ending position (Craig Ringer)
       </para>
 
       <para>
-       This complements the existing <option>--startpos</> option.
+       This complements the existing <option>--startpos</option> option.
       </para>
      </listitem>
 
@@ -2399,9 +4701,9 @@
 2016-10-19 [5d58c07a4] initdb pg_basebackup: Rename -\-noxxx options to -\-no-x
 -->
       <para>
-       Rename <link linkend="APP-INITDB"><application>initdb</></>
-       options <option>--noclean</> and <option>--nosync</> to be spelled
-       <option>--no-clean</> and <option>--no-sync</> (Vik Fearing,
+       Rename <link linkend="app-initdb"><application>initdb</application></link>
+       options <option>--noclean</option> and <option>--nosync</option> to be spelled
+       <option>--no-clean</option> and <option>--no-sync</option> (Vik Fearing,
        Peter Eisentraut)
       </para>
 
@@ -2413,9 +4715,9 @@
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></>,
-     <link linkend="APP-PG-DUMPALL"><application>pg_dumpall</></>,
-     <link linkend="APP-PGRESTORE"><application>pg_restore</></></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link>,
+     <link linkend="app-pg-dumpall"><application>pg_dumpall</application></link>,
+     <link linkend="app-pgrestore"><application>pg_restore</application></link></title>
 
      <itemizedlist>
 
@@ -2424,11 +4726,11 @@
 2016-09-20 [46b55e7f8] pg_restore: Add -N option to exclude schemas
 -->
        <para>
-        Allow <application>pg_restore</> to exclude schemas (Michael Banck)
+        Allow <application>pg_restore</application> to exclude schemas (Michael Banck)
        </para>
 
        <para>
-        This adds a new <option>-N</>/<option>--exclude-schema</> option.
+        This adds a new <option>-N</option>/<option>--exclude-schema</option> option.
        </para>
       </listitem>
 
@@ -2437,8 +4739,8 @@
 2016-11-29 [4fafa579b] Add -\-no-blobs option to pg_dump
 -->
        <para>
-        Add <option>--no-blobs</> option to
-        <application>pg_dump</> (Guillaume Lelarge)
+        Add <option>--no-blobs</option> option to
+        <application>pg_dump</application> (Guillaume Lelarge)
        </para>
 
        <para>
@@ -2451,31 +4753,41 @@
 2017-03-07 [9a83d56b3] Allow pg_dumpall to dump roles w/o user passwords
 -->
        <para>
-        Add <application>pg_dumpall</> option
-        <option>--no-role-passwords</> to omit role passwords
+        Add <application>pg_dumpall</application> option
+        <option>--no-role-passwords</option> to omit role passwords
         (Robins Tharakan, Simon Riggs)
        </para>
 
        <para>
-        This allows use of <application>pg_dumpall</> by non-superusers;
+        This allows use of <application>pg_dumpall</application> by non-superusers;
         without this option, it fails due to inability to read passwords.
        </para>
       </listitem>
 
       <listitem>
 <!--
+2017-08-16 [e4892c681] pg_dump: Support using synchronized snapshots on standby
+-->
+       <para>
+        Support using synchronized snapshots when dumping from a standby
+        server (Petr Jelinek)
+       </para>
+      </listitem>
+
+      <listitem>
+<!--
 2017-03-22 [96a7128b7] Sync pg_dump and pg_dumpall output
 -->
        <para>
-        Issue <function>fsync()</> on the output files generated by
-        <application>pg_dump</> and
-        <application>pg_dumpall</> (Michael Paquier)
+        Issue <function>fsync()</function> on the output files generated by
+        <application>pg_dump</application> and
+        <application>pg_dumpall</application> (Michael Paquier)
        </para>
 
        <para>
         This provides more security that the output is safely stored on
         disk before the program exits.  This can be disabled with
-        the new <option>--no-sync</> option.
+        the new <option>--no-sync</option> option.
        </para>
       </listitem>
 
@@ -2485,7 +4797,7 @@
 
     <sect4>
 
-    <title><xref linkend="app-pgbasebackup"></title>
+    <title><xref linkend="app-pgbasebackup"/></title>
 
      <itemizedlist>
 
@@ -2495,12 +4807,12 @@
 2016-12-21 [ecbdc4c55] Forbid invalid combination of options in pg_basebackup.
 -->
        <para>
-        Allow <application>pg_basebackup</> to stream write-ahead log in
+        Allow <application>pg_basebackup</application> to stream write-ahead log in
         tar mode (Magnus Hagander)
        </para>
 
        <para>
-        The <acronym>WAL</> will be stored in a separate tar file from
+        The <acronym>WAL</acronym> will be stored in a separate tar file from
         the base backup.
        </para>
       </listitem>
@@ -2510,13 +4822,13 @@
 2017-01-16 [e7b020f78] Make pg_basebackup use temporary replication slots
 -->
        <para>
-        Make <application>pg_basebackup</> use temporary replication slots
+        Make <application>pg_basebackup</application> use temporary replication slots
         (Magnus Hagander)
        </para>
 
        <para>
         Temporary replication slots will be used by default when
-        <application>pg_basebackup</> uses WAL streaming with default
+        <application>pg_basebackup</application> uses WAL streaming with default
         options.
        </para>
       </listitem>
@@ -2527,8 +4839,8 @@
 -->
        <para>
         Be more careful about fsync'ing in all required places
-        in <application>pg_basebackup</> and
-        <application>pg_receivewal</> (Michael Paquier)
+        in <application>pg_basebackup</application> and
+        <application>pg_receivewal</application> (Michael Paquier)
        </para>
       </listitem>
 
@@ -2538,7 +4850,7 @@
 2016-10-19 [5d58c07a4] initdb pg_basebackup: Rename -\-noxxx options to -\-no-x
 -->
        <para>
-        Add <application>pg_basebackup</> option <option>--no-sync</> to
+        Add <application>pg_basebackup</application> option <option>--no-sync</option> to
         disable fsync (Michael Paquier)
        </para>
       </listitem>
@@ -2548,7 +4860,7 @@
 2016-09-28 [6ad8ac602] Exclude additional directories in pg_basebackup
 -->
        <para>
-        Improve <application>pg_basebackup</>'s handling of which
+        Improve <application>pg_basebackup</application>'s handling of which
         directories to skip (David Steele)
        </para>
       </listitem>
@@ -2558,7 +4870,7 @@
     </sect4>
 
     <sect4>
-     <title><application><xref linkend="app-pg-ctl"></></title>
+     <title><application><xref linkend="app-pg-ctl"/></application></title>
 
      <itemizedlist>
 
@@ -2567,7 +4879,7 @@
 2016-09-21 [e7010ce47] pg_ctl: Add wait option to promote action
 -->
        <para>
-        Add wait option for <application><xref linkend="app-pg-ctl"></>'s
+        Add wait option for <application><xref linkend="app-pg-ctl"/></application>'s
         promote operation (Peter Eisentraut)
        </para>
       </listitem>
@@ -2577,8 +4889,8 @@
 2016-10-19 [0be22457d] pg_ctl: Add long options for -w and -W
 -->
        <para>
-        Add long options for <application>pg_ctl</> wait (<option>--wait</>)
-        and no-wait (<option>--no-wait</>) (Vik Fearing)
+        Add long options for <application>pg_ctl</application> wait (<option>--wait</option>)
+        and no-wait (<option>--no-wait</option>) (Vik Fearing)
        </para>
       </listitem>
 
@@ -2587,8 +4899,8 @@
 2016-10-19 [caf936b09] pg_ctl: Add long option for -o
 -->
        <para>
-        Add long option for <application>pg_ctl</> server options
-        (<option>--options</>) (Peter Eisentraut)
+        Add long option for <application>pg_ctl</application> server options
+        (<option>--options</option>) (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -2597,14 +4909,14 @@
 2017-06-28 [f13ea95f9] Change pg_ctl to detect server-ready by watching status
 -->
        <para>
-        Make <literal>pg_ctl start --wait</> detect server-ready by
-        watching <filename>postmaster.pid</>, not by attempting connections
+        Make <literal>pg_ctl start --wait</literal> detect server-ready by
+        watching <filename>postmaster.pid</filename>, not by attempting connections
         (Tom Lane)
        </para>
 
        <para>
         The postmaster has been changed to report its ready-for-connections
-        status in <filename>postmaster.pid</>, and <application>pg_ctl</>
+        status in <filename>postmaster.pid</filename>, and <application>pg_ctl</application>
         now examines that file to detect whether startup is complete.
         This is more efficient and reliable than the old method, and it
         eliminates postmaster log entries about rejected connection
@@ -2617,12 +4929,12 @@
 2017-06-26 [c61559ec3] Reduce pg_ctl's reaction time when waiting for postmaste
 -->
        <para>
-        Reduce <application>pg_ctl</>'s reaction time when waiting for
+        Reduce <application>pg_ctl</application>'s reaction time when waiting for
         postmaster start/stop (Tom Lane)
        </para>
 
        <para>
-        <application>pg_ctl</> now probes ten times per second when waiting
+        <application>pg_ctl</application> now probes ten times per second when waiting
         for a postmaster state change, rather than once per second.
        </para>
       </listitem>
@@ -2632,14 +4944,14 @@
 2017-07-05 [1bac5f552] pg_ctl: Make failure to complete operation a nonzero exi
 -->
        <para>
-        Ensure that <application>pg_ctl</> exits with nonzero status if an
+        Ensure that <application>pg_ctl</application> exits with nonzero status if an
         operation being waited for does not complete within the timeout
         (Peter Eisentraut)
        </para>
 
        <para>
-        The <literal>start</> and <literal>promote</> operations now return
-        exit status 1, not 0, in such cases.  The <literal>stop</> operation
+        The <literal>start</literal> and <literal>promote</literal> operations now return
+        exit status 1, not 0, in such cases.  The <literal>stop</literal> operation
         has always done that.
        </para>
       </listitem>
@@ -2664,19 +4976,20 @@
       </para>
 
       <para>
-       Release numbers will now have two parts (e.g., <literal>10.1</>)
-       rather than three (e.g., <literal>9.6.3</>).
+       Release numbers will now have two parts (e.g., <literal>10.1</literal>)
+       rather than three (e.g., <literal>9.6.3</literal>).
        Major versions will now increase just the first number, and minor
        releases will increase just the second number.
        Release branches will be referred to by single numbers
-       (e.g., <literal>10</> rather than <literal>9.6</>).
+       (e.g., <literal>10</literal> rather than <literal>9.6</literal>).
        This change is intended to reduce user confusion about what is a
-       major or minor release of <productname>PostgreSQL</>.
+       major or minor release of <productname>PostgreSQL</productname>.
       </para>
      </listitem>
 
      <listitem>
 <!--
+2017-06-16 [cea258b63] Teach pgindent to skip files generated by bison or flex
 2017-06-21 [8ff6d4ec7] Adjust pgindent script to use pg_bsd_indent 2.0.
 2017-06-21 [e3860ffa4] Initial pgindent run with pg_bsd_indent version 2.0.
 2017-06-21 [c7b8998eb] Phase 2 of pgindent updates.
@@ -2684,12 +4997,12 @@
 2017-06-21 [81f056c72] Remove entab and associated detritus.
 -->
       <para>
-       Improve behavior of <application>pgindent</>
+       Improve behavior of <application>pgindent</application>
        (Piotr Stefaniak, Tom Lane)
       </para>
 
       <para>
-       We have switched to a new version of <application>pg_bsd_indent</>
+       We have switched to a new version of <application>pg_bsd_indent</application>
        based on recent improvements made by the FreeBSD project.  This
        fixes numerous small bugs that led to odd C code formatting
        decisions.  Most notably, lines within parentheses (such as in a
@@ -2704,14 +5017,14 @@
 2017-03-23 [eccfef81e] ICU support
 -->
       <para>
-       Allow the <link linkend="configure"><acronym>ICU</></> library to
+       Allow the <link linkend="configure"><acronym>ICU</acronym></link> library to
        optionally be used for collation support (Peter Eisentraut)
       </para>
 
       <para>
-       The <acronym>ICU</> library has versioning that allows detection
+       The <acronym>ICU</acronym> library has versioning that allows detection
        of collation changes between versions.  It is enabled via configure
-       option <option>--with-icu</>.  The default still uses the operating
+       option <option>--with-icu</option>.  The default still uses the operating
        system's native collation library.
       </para>
      </listitem>
@@ -2722,14 +5035,14 @@
 -->
       <para>
        Automatically mark all <link
-       linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</></> functions
-       as <literal>DLLEXPORT</>-ed on
-      <systemitem class="osname">Windows</> (Laurenz Albe)
+       linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</function></link> functions
+       as <literal>DLLEXPORT</literal>-ed on
+      <systemitem class="osname">Windows</systemitem> (Laurenz Albe)
       </para>
 
       <para>
-       If third-party code is using <literal>extern</> function
-       declarations, they should also add <literal>DLLEXPORT</> markers
+       If third-party code is using <literal>extern</literal> function
+       declarations, they should also add <literal>DLLEXPORT</literal> markers
        to those declarations.
       </para>
      </listitem>
@@ -2739,10 +5052,10 @@
 2016-11-08 [1833f1a1c] Simplify code by getting rid of SPI_push, SPI_pop, SPI_r
 -->
       <para>
-       Remove <acronym>SPI</> functions <function>SPI_push()</>,
-       <function>SPI_pop()</>, <function>SPI_push_conditional()</>,
-       <function>SPI_pop_conditional()</>,
-       and <function>SPI_restore_connection()</> as unnecessary (Tom Lane)
+       Remove <acronym>SPI</acronym> functions <function>SPI_push()</function>,
+       <function>SPI_pop()</function>, <function>SPI_push_conditional()</function>,
+       <function>SPI_pop_conditional()</function>,
+       and <function>SPI_restore_connection()</function> as unnecessary (Tom Lane)
       </para>
 
       <para>
@@ -2752,9 +5065,9 @@
       </para>
 
       <para>
-       A side effect of this change is that <function>SPI_palloc()</> and
+       A side effect of this change is that <function>SPI_palloc()</function> and
        allied functions now require an active SPI connection; they do not
-       degenerate to simple <function>palloc()</> if there is none.  That
+       degenerate to simple <function>palloc()</function> if there is none.  That
        previous behavior was not very useful and posed risks of unexpected
        memory leaks.
       </para>
@@ -2787,9 +5100,9 @@
 2016-10-09 [ecb0d20a9] Use unnamed POSIX semaphores, if available, on Linux and
 -->
       <para>
-       Use <acronym>POSIX</> semaphores rather than SysV semaphores
-       on <systemitem class="osname">Linux</> and <systemitem
-       class="osname">FreeBSD</> (Tom Lane)
+       Use <acronym>POSIX</acronym> semaphores rather than SysV semaphores
+       on <systemitem class="osname">Linux</systemitem> and <systemitem
+       class="osname">FreeBSD</systemitem> (Tom Lane)
       </para>
 
       <para>
@@ -2811,7 +5124,7 @@
 2017-03-10 [f8f1430ae] Enable 64 bit atomics on ARM64.
 -->
       <para>
-       Enable 64-bit atomic operations on <acronym>ARM64</> (Roman
+       Enable 64-bit atomic operations on <acronym>ARM64</acronym> (Roman
        Shaposhnik)
       </para>
      </listitem>
@@ -2821,13 +5134,13 @@
 2017-01-02 [1d63f7d2d] Use clock_gettime(), if available, in instr_time measure
 -->
       <para>
-       Switch to using <function>clock_gettime()</>, if available, for
+       Switch to using <function>clock_gettime()</function>, if available, for
        duration measurements (Tom Lane)
       </para>
 
       <para>
-       <function>gettimeofday()</> is still used
-       if <function>clock_gettime()</> is not available.
+       <function>gettimeofday()</function> is still used
+       if <function>clock_gettime()</function> is not available.
       </para>
      </listitem>
 
@@ -2843,11 +5156,37 @@
       </para>
 
       <para>
-       If no strong random number generator can be found, configure will
-       fail unless the <link linkend="configure">configure</>
-       option <option>--disable-strong-random</> is used.  However, with
-       this option, pgcrypto functions requiring a strong random number
-       generator will be disabled.
+       If no strong random number generator can be
+       found, <link linkend="configure">configure</link> will fail unless
+       the <option>--disable-strong-random</option> option is used.  However, with
+       this option, <link linkend="pgcrypto"><application>pgcrypto</application></link>
+       functions requiring a strong random number generator will be disabled.
+      </para>
+     </listitem>
+
+     <listitem>
+<!--
+2017-08-15 [d7ab908fb] Distinguish wait-for-connection from wait-for-write-read
+-->
+      <para>
+       Allow <function>WaitLatchOrSocket()</function> to wait for socket
+       connection on Windows (Andres Freund)
+      </para>
+     </listitem>
+
+     <listitem>
+<!--
+2017-04-06 [3f902354b] Clean up after insufficiently-researched optimization of
+-->
+      <para>
+       <filename>tupconvert.c</filename> functions no longer convert tuples just to
+       embed a different composite-type OID in them (Ashutosh Bapat, Tom Lane)
+      </para>
+
+      <para>
+       The majority of callers don't care about the composite-type OID;
+       but if the result tuple is to be used as a composite Datum, steps
+       should be taken to make sure the correct OID is inserted in it.
       </para>
      </listitem>
 
@@ -2856,8 +5195,8 @@
 2016-10-11 [2b860f52e] Remove "sco" and "unixware" ports.
 -->
      <para>
-      Remove <systemitem class="osname">SCO</> and <systemitem
-      class="osname">Unixware</> ports (Tom Lane)
+      Remove <systemitem class="osname">SCO</systemitem> and <systemitem
+      class="osname">Unixware</systemitem> ports (Tom Lane)
      </para>
     </listitem>
 
@@ -2868,7 +5207,7 @@
 -->
       <para>
        Overhaul documentation <link linkend="docguide-toolsets">build
-       process</> (Alexander Lakhin, Alexander Law)
+       process</link> (Alexander Lakhin)
       </para>
      </listitem>
 
@@ -2877,13 +5216,13 @@
 2017-04-06 [510074f9f] Remove use of Jade and DSSSL
 -->
       <para>
-       Use <acronym>XSLT</> to build the <productname>PostgreSQL</>
+       Use <acronym>XSLT</acronym> to build the <productname>PostgreSQL</productname>
        documentation (Peter Eisentraut)
       </para>
 
       <para>
-       Previously <application>Jade</>, <acronym>DSSSL,</> and
-       <application>JadeTex</> were used.
+       Previously <application>Jade</application>, <acronym>DSSSL</acronym>, and
+       <application>JadeTex</application> were used.
       </para>
      </listitem>
 
@@ -2892,7 +5231,7 @@
 2016-11-15 [e36ddab11] Build HTML documentation using XSLT stylesheets by defau
 -->
       <para>
-       Build <acronym>HTML</> documentation using <acronym>XSLT</>
+       Build <acronym>HTML</acronym> documentation using <acronym>XSLT</acronym>
        stylesheets by default (Peter Eisentraut)
       </para>
      </listitem>
@@ -2911,7 +5250,7 @@
 2016-09-29 [8e91e12bc] Allow contrib/file_fdw to read from a program, like COPY
 -->
       <para>
-       Allow <link linkend="file-fdw"><application>file_fdw</></> to read
+       Allow <link linkend="file-fdw"><application>file_fdw</application></link> to read
        from program output as well as files (Corey Huinker, Adam Gomaa)
       </para>
      </listitem>
@@ -2919,31 +5258,27 @@
      <listitem>
 <!--
 2016-10-21 [7012b132d] postgres_fdw: Push down aggregates to remote servers.
-2017-04-24 [332bec1e6] postgres_fdw: Fix join push down with extensions
 -->
       <para>
-       Push aggregates to foreign data wrapper servers, where possible
+       In <link linkend="postgres-fdw"><application>postgres_fdw</application></link>,
+       push aggregate functions to the remote server, when possible
        (Jeevan Chalke, Ashutosh Bapat)
       </para>
 
       <para>
-       This reduces the amount of data that must be passed
-       from the foreign data wrapper server, and offloads
-       aggregate computation from the requesting server.  The <link
-       linkend="postgres-fdw"><application>postgres_fdw</></> FDW is able to
-       perform this optimization.  There are also improvements in
-       pushing down joins involving extensions.
+       This reduces the amount of data that must be passed from the remote
+       server, and offloads aggregate computation from the requesting server.
       </para>
      </listitem>
 
      <listitem>
 <!--
 2017-03-16 [b30fb56b0] postgres_fdw: Push down FULL JOINs with restriction clau
+2017-04-24 [332bec1e6] postgres_fdw: Fix join push down with extensions
 -->
       <para>
-       Allow push down of <literal>FULL JOIN</> queries containing
-       subqueries in the
-      <literal>FROM</> clause to foreign servers (Etsuro Fujita)
+       In <application>postgres_fdw</application>, push joins to the remote server in
+       more cases (David Rowley, Ashutosh Bapat, Etsuro Fujita)
       </para>
      </listitem>
 
@@ -2952,12 +5287,12 @@
 2016-08-26 [ae025a159] Support OID system column in postgres_fdw.
 -->
       <para>
-       Properly support <type>OID</> columns in
-       <application>postgres_fdw</> tables (Etsuro Fujita)
+       Properly support <type>OID</type> columns in
+       <application>postgres_fdw</application> tables (Etsuro Fujita)
       </para>
 
       <para>
-       Previously <type>OID</> columns always returned zeros.
+       Previously <type>OID</type> columns always returned zeros.
       </para>
      </listitem>
 
@@ -2966,8 +5301,8 @@
 2017-03-21 [f7946a92b] Add btree_gist support for enum types.
 -->
       <para>
-       Allow <link linkend="btree-gist"><application>btree_gist</></>
-       and <link linkend="btree-gin"><application>btree_gin</></> to
+       Allow <link linkend="btree-gist"><application>btree_gist</application></link>
+       and <link linkend="btree-gin"><application>btree_gin</application></link> to
        index enum types (Andrew Dunstan)
       </para>
 
@@ -2981,8 +5316,8 @@
 2016-11-29 [11da83a0e] Add uuid to the set of types supported by contrib/btree_
 -->
       <para>
-       Add indexing support to <application>btree_gist</> for the
-       <type>UUID</> data type (Paul Jungwirth)
+       Add indexing support to <application>btree_gist</application> for the
+       <type>UUID</type> data type (Paul Jungwirth)
       </para>
      </listitem>
 
@@ -2991,7 +5326,7 @@
 2017-03-09 [3717dc149] Add amcheck extension to contrib.
 -->
       <para>
-       Add <link linkend="amcheck"><application>amcheck</></> which can
+       Add <link linkend="amcheck"><application>amcheck</application></link> which can
        check the validity of B-tree indexes (Peter Geoghegan)
       </para>
      </listitem>
@@ -3001,10 +5336,10 @@
 2017-03-27 [a6f22e835] Show ignored constants as "$N" rather than "?" in pg_sta
 -->
       <para>
-       Show ignored constants as <literal>$N</> rather than <literal>?</>
+       Show ignored constants as <literal>$N</literal> rather than <literal>?</literal>
        in
       <link
-      linkend="pgstatstatements"><application>pg_stat_statements</></>
+      linkend="pgstatstatements"><application>pg_stat_statements</application></link>
       (Lukas Fittl)
       </para>
      </listitem>
@@ -3014,13 +5349,13 @@
 2016-09-27 [f31a931fa] Improve contrib/cube's handling of zero-D cubes, infinit
 -->
       <para>
-       Improve <link linkend="cube"><application>cube</></>'s handling
+       Improve <link linkend="cube"><application>cube</application></link>'s handling
        of zero-dimensional cubes (Tom Lane)
       </para>
 
       <para>
-       This also improves handling of <literal>infinite</> and
-       <literal>NaN</> values.
+       This also improves handling of <literal>infinite</literal> and
+       <literal>NaN</literal> values.
       </para>
      </listitem>
 
@@ -3030,12 +5365,12 @@
 -->
       <para>
        Allow <link
-       linkend="pgbuffercache"><application>pg_buffercache</></> to run
+       linkend="pgbuffercache"><application>pg_buffercache</application></link> to run
        with fewer locks (Ivan Kartyshov)
       </para>
 
       <para>
-       This allows it to be less disruptive when run on production systems.
+       This makes it less disruptive when run on production systems.
       </para>
      </listitem>
 
@@ -3044,8 +5379,8 @@
 2017-02-03 [e759854a0] pgstattuple: Add pgstathashindex.
 -->
       <para>
-       Add <link linkend="pgstattuple"><application>pgstattuple</></>
-       function <function>pgstathashindex()</> to view hash index
+       Add <link linkend="pgstattuple"><application>pgstattuple</application></link>
+       function <function>pgstathashindex()</function> to view hash index
        statistics (Ashutosh Sharma)
       </para>
      </listitem>
@@ -3055,8 +5390,8 @@
 2016-09-29 [fd321a1df] Remove superuser checks in pgstattuple
 -->
       <para>
-       Use <command>GRANT</> permissions to
-       control <application>pgstattuple</> function usage (Stephen Frost)
+       Use <command>GRANT</command> permissions to
+       control <application>pgstattuple</application> function usage (Stephen Frost)
       </para>
 
       <para>
@@ -3069,7 +5404,7 @@
 2016-10-28 [d4b5d4cad] pgstattuple: Don't take heavyweight locks when examining
 -->
       <para>
-       Reduce locking when <application>pgstattuple</> examines hash
+       Reduce locking when <application>pgstattuple</application> examines hash
        indexes (Amit Kapila)
       </para>
      </listitem>
@@ -3079,8 +5414,8 @@
 2017-03-17 [fef2bcdcb] pageinspect: Add page_checksum function
 -->
       <para>
-       Add <link linkend="pageinspect"><application>pageinspect</></>
-       function <function>page_checksum()</> to show a page's checksum
+       Add <link linkend="pageinspect"><application>pageinspect</application></link>
+       function <function>page_checksum()</function> to show a page's checksum
        (Tomas Vondra)
       </para>
      </listitem>
@@ -3090,8 +5425,8 @@
 2017-04-04 [193f5f9e9] pageinspect: Add bt_page_items function with bytea argum
 -->
       <para>
-       Add <application>pageinspect</>
-       function <function>bt_page_items()</> to print page items from a
+       Add <application>pageinspect</application>
+       function <function>bt_page_items()</function> to print page items from a
        page image (Tomas Vondra)
       </para>
      </listitem>
@@ -3101,7 +5436,7 @@
 2017-02-02 [08bf6e529] pageinspect: Support hash indexes.
 -->
       <para>
-       Add hash index support to <application>pageinspect</> (Jesper
+       Add hash index support to <application>pageinspect</application> (Jesper
        Pedersen, Ashutosh Sharma)
       </para>
      </listitem>
@@ -3112,4 +5447,341 @@
 
   </sect2>
 
+  <sect2>
+   <title>Acknowledgments</title>
+
+   <para>
+    The following individuals (in alphabetical order) have contributed to this
+    release as patch authors, committers, reviewers, testers, or reporters of
+    issues.
+   </para>
+
+   <simplelist>
+    <member>Adam Brightwell</member>
+    <member>Adam Brusselback</member>
+    <member>Adam Gomaa</member>
+    <member>Adam Sah</member>
+    <member>Adrian Klaver</member>
+    <member>Aidan Van Dyk</member>
+    <member>Aleksander Alekseev</member>
+    <member>Alexander Korotkov</member>
+    <member>Alexander Lakhin</member>
+    <member>Alexander Sosna</member>
+    <member>Alexey Bashtanov</member>
+    <member>Alexey Grishchenko</member>
+    <member>Alexey Isayko</member>
+    <member>&Aacute;lvaro Hern&aacute;ndez Tortosa</member>
+    <member>&Aacute;lvaro Herrera</member>
+    <member>Amit Kapila</member>
+    <member>Amit Khandekar</member>
+    <member>Amit Langote</member>
+    <member>Amul Sul</member>
+    <member>Anastasia Lubennikova</member>
+    <member>Andreas Joseph Krogh</member>
+    <member>Andreas Karlsson</member>
+    <member>Andreas Scherbaum</member>
+    <member>Andreas Seltenreich</member>
+    <member>Andres Freund</member>
+    <member>Andrew Dunstan</member>
+    <member>Andrew Gierth</member>
+    <member>Andrew Wheelwright</member>
+    <member>Andrey Borodin</member>
+    <member>Andrey Lizenko</member>
+    <member>Andy Abelisto</member>
+    <member>Antonin Houska</member>
+    <member>Ants Aasma</member>
+    <member>Arjen Nienhuis</member>
+    <member>Arseny Sher</member>
+    <member>Artur Zakirov</member>
+    <member>Ashutosh Bapat</member>
+    <member>Ashutosh Sharma</member>
+    <member>Ashwin Agrawal</member>
+    <member>Atsushi Torikoshi</member>
+    <member>Ayumi Ishii</member>
+    <member>Basil Bourque</member>
+    <member>Beena Emerson</member>
+    <member>Ben de Graaff</member>
+    <member>Benedikt Grundmann</member>
+    <member>Bernd Helmle</member>
+    <member>Brad DeJong</member>
+    <member>Brandur Leach</member>
+    <member>Breen Hagan</member>
+    <member>Bruce Momjian</member>
+    <member>Bruno Wolff III</member>
+    <member>Catalin Iacob</member>
+    <member>Chapman Flack</member>
+    <member>Chen Huajun</member>
+    <member>Choi Doo-Won</member>
+    <member>Chris Bandy</member>
+    <member>Chris Richards</member>
+    <member>Chris Ruprecht</member>
+    <member>Christian Ullrich</member>
+    <member>Christoph Berg</member>
+    <member>Chuanting Wang</member>
+    <member>Claudio Freire</member>
+    <member>Clinton Adams</member>
+    <member>Const Zhang</member>
+    <member>Constantin Pan</member>
+    <member>Corey Huinker</member>
+    <member>Craig Ringer</member>
+    <member>Cynthia Shang</member>
+    <member>Dagfinn Ilmari Manns&aring;ker</member>
+    <member>Daisuke Higuchi</member>
+    <member>Damian Quiroga</member>
+    <member>Dan Wood</member>
+    <member>Dang Minh Huong</member>
+    <member>Daniel Gustafsson</member>
+    <member>Daniel V&eacute;rit&eacute;</member>
+    <member>Daniel Westermann</member>
+    <member>Daniele Varrazzo</member>
+    <member>Danylo Hlynskyi</member>
+    <member>Darko Prelec</member>
+    <member>Dave Cramer</member>
+    <member>Dave Page</member>
+    <member>David Christensen</member>
+    <member>David Fetter</member>
+    <member>David Johnston</member>
+    <member>David Rader</member>
+    <member>David Rowley</member>
+    <member>David Steele</member>
+    <member>Dean Rasheed</member>
+    <member>Denis Smirnov</member>
+    <member>Denish Patel</member>
+    <member>Dennis Bj&ouml;rklund</member>
+    <member>Devrim G&uuml;nd&uuml;z</member>
+    <member>Dilip Kumar</member>
+    <member>Dilyan Palauzov</member>
+    <member>Dima Pavlov</member>
+    <member>Dimitry Ivanov</member>
+    <member>Dmitriy Sarafannikov</member>
+    <member>Dmitry Dolgov</member>
+    <member>Dmitry Fedin</member>
+    <member>Don Morrison</member>
+    <member>Egor Rogov</member>
+    <member>Eiji Seki</member>
+    <member>Emil Iggland</member>
+    <member>Emre Hasegeli</member>
+    <member>Enrique Meneses</member>
+    <member>Erik Nordstr&ouml;m</member>
+    <member>Erik Rijkers</member>
+    <member>Erwin Brandstetter</member>
+    <member>Etsuro Fujita</member>
+    <member>Eugen Konkov</member>
+    <member>Eugene Kazakov</member>
+    <member>Euler Taveira</member>
+    <member>Fabien Coelho</member>
+    <member>Fabr&iacute;zio de Royes Mello</member>
+    <member>Feike Steenbergen</member>
+    <member>Felix Gerzaguet</member>
+    <member>Filip Jirs&aacute;k</member>
+    <member>Fujii Masao</member>
+    <member>Gabriele Bartolini</member>
+    <member>Gabrielle Roth</member>
+    <member>Gao Zengqi</member>
+    <member>Gerdan Santos</member>
+    <member>Gianni Ciolli</member>
+    <member>Gilles Darold</member>
+    <member>Giuseppe Broccolo</member>
+    <member>Graham Dutton</member>
+    <member>Greg Atkins</member>
+    <member>Greg Burek</member>
+    <member>Grigory Smolkin</member>
+    <member>Guillaume Lelarge</member>
+    <member>Hans Buschmann</member>
+    <member>Haribabu Kommi</member>
+    <member>Heikki Linnakangas</member>
+    <member>Henry Boehlert</member>
+    <member>Huan Ruan</member>
+    <member>Ian Barwick</member>
+    <member>Igor Korot</member>
+    <member>Ildus Kurbangaliev</member>
+    <member>Ivan Kartyshov</member>
+    <member>Jaime Casanova</member>
+    <member>Jakob Egger</member>
+    <member>James Parks</member>
+    <member>Jarred Ward</member>
+    <member>Jason Li</member>
+    <member>Jason O'Donnell</member>
+    <member>Jason Petersen</member>
+    <member>Jeevan Chalke</member>
+    <member>Jeevan Ladhe</member>
+    <member>Jeff Dafoe</member>
+    <member>Jeff Davis</member>
+    <member>Jeff Janes</member>
+    <member>Jelte Fennema</member>
+    <member>Jeremy Finzel</member>
+    <member>Jeremy Schneider</member>
+    <member>Jeroen van der Ham</member>
+    <member>Jesper Pedersen</member>
+    <member>Jim Mlodgenski</member>
+    <member>Jim Nasby</member>
+    <member>Jinyu Zhang</member>
+    <member>Joe Conway</member>
+    <member>Joel Jacobson</member>
+    <member>John Harvey</member>
+    <member>Jon Nelson</member>
+    <member>Jordan Gigov</member>
+    <member>Josh Berkus</member>
+    <member>Josh Soref</member>
+    <member>Julian Markwort</member>
+    <member>Julien Rouhaud</member>
+    <member>Junseok Yang</member>
+    <member>Justin Muise</member>
+    <member>Justin Pryzby</member>
+    <member>Kacper Zuk</member>
+    <member>KaiGai Kohei</member>
+    <member>Karen Huddleston</member>
+    <member>Karl Lehenbauer</member>
+    <member>Karl O. Pinc</member>
+    <member>Keith Fiske</member>
+    <member>Kevin Grittner</member>
+    <member>Kim Rose Carlsen</member>
+    <member>Konstantin Evteev</member>
+    <member>Konstantin Knizhnik</member>
+    <member>Kuntal Ghosh</member>
+    <member>Kurt Kartaltepe</member>
+    <member>Kyle Conroy</member>
+    <member>Kyotaro Horiguchi</member>
+    <member>Laurenz Albe</member>
+    <member>Leonardo Cecchi</member>
+    <member>Ludovic Vaugeois-Pepin</member>
+    <member>Lukas Fittl</member>
+    <member>Magnus Hagander</member>
+    <member>Maksim Milyutin</member>
+    <member>Maksym Sobolyev</member>
+    <member>Marc Rassbach</member>
+    <member>Marc-Olaf Jaschke</member>
+    <member>Marcos Castedo</member>
+    <member>Marek Cvoren</member>
+    <member>Mark Dilger</member>
+    <member>Mark Kirkwood</member>
+    <member>Mark Pether</member>
+    <member>Marko Tiikkaja</member>
+    <member>Markus Winand</member>
+    <member>Marllius Ribeiro</member>
+    <member>Marti Raudsepp</member>
+    <member>Mart&iacute;n Marqu&eacute;s</member>
+    <member>Masahiko Sawada</member>
+    <member>Matheus Oliveira</member>
+    <member>Mathieu Fenniak</member>
+    <member>Merlin Moncure</member>
+    <member>Michael Banck</member>
+    <member>Michael Day</member>
+    <member>Michael Meskes</member>
+    <member>Michael Overmeyer</member>
+    <member>Michael Paquier</member>
+    <member>Mike Palmiotto</member>
+    <member>Milos Urbanek</member>
+    <member>Mithun Cy</member>
+    <member>Moshe Jacobson</member>
+    <member>Murtuza Zabuawala</member>
+    <member>Naoki Okano</member>
+    <member>Nathan Bossart</member>
+    <member>Nathan Wagner</member>
+    <member>Neha Khatri</member>
+    <member>Neha Sharma</member>
+    <member>Neil Anderson</member>
+    <member>Nicolas Baccelli</member>
+    <member>Nicolas Guini</member>
+    <member>Nicolas Thauvin</member>
+    <member>Nikhil Sontakke</member>
+    <member>Nikita Glukhov</member>
+    <member>Nikolaus Thiel</member>
+    <member>Nikolay Nikitin</member>
+    <member>Nikolay Shaplov</member>
+    <member>Noah Misch</member>
+    <member>Noriyoshi Shinoda</member>
+    <member>Olaf Gawenda</member>
+    <member>Oleg Bartunov</member>
+    <member>Oskari Saarenmaa</member>
+    <member>Otar Shavadze</member>
+    <member>Paresh More</member>
+    <member>Paul Jungwirth</member>
+    <member>Paul Ramsey</member>
+    <member>Pavan Deolasee</member>
+    <member>Pavel Golub</member>
+    <member>Pavel Han&aacute;k</member>
+    <member>Pavel Raiskup</member>
+    <member>Pavel Stehule</member>
+    <member>Peng Sun</member>
+    <member>Peter Eisentraut</member>
+    <member>Peter Geoghegan</member>
+    <member>Petr Jel&iacute;nek</member>
+    <member>Philippe Beaudoin</member>
+    <member>Pierre-Emmanuel Andr&eacute;</member>
+    <member>Piotr Stefaniak</member>
+    <member>Prabhat Sahu</member>
+    <member>QL Zhuo</member>
+    <member>Radek Slupik</member>
+    <member>Rafa de la Torre</member>
+    <member>Rafia Sabih</member>
+    <member>Ragnar Ouchterlony</member>
+    <member>Rahila Syed</member>
+    <member>Rajkumar Raghuwanshi</member>
+    <member>Regina Obe</member>
+    <member>Richard Pistole</member>
+    <member>Robert Haas</member>
+    <member>Robins Tharakan</member>
+    <member>Rod Taylor</member>
+    <member>Roman Shaposhnik</member>
+    <member>Rushabh Lathia</member>
+    <member>Ryan Murphy</member>
+    <member>Sandeep Thakkar</member>
+    <member>Scott Milliken</member>
+    <member>Sean Farrell</member>
+    <member>Sebastian Luque</member>
+    <member>Sehrope Sarkuni</member>
+    <member>Sergey Burladyan</member>
+    <member>Sergey Koposov</member>
+    <member>Shay Rojansky</member>
+    <member>Shinichi Matsuda</member>
+    <member>Sho Kato</member>
+    <member>Simon Riggs</member>
+    <member>Simone Gotti</member>
+    <member>Spencer Thomason</member>
+    <member>Stas Kelvich</member>
+    <member>Stepan Pesternikov</member>
+    <member>Stephen Frost</member>
+    <member>Steve Randall</member>
+    <member>Steve Singer</member>
+    <member>Steven Fackler</member>
+    <member>Steven Winfield</member>
+    <member>Suraj Kharage</member>
+    <member>Sveinn Sveinsson</member>
+    <member>Sven R. Kunze</member>
+    <member>Tahir Fakhroutdinov</member>
+    <member>Taiki Kondo</member>
+    <member>Takayuki Tsunakawa</member>
+    <member>Takeshi Ideriha</member>
+    <member>Tatsuo Ishii</member>
+    <member>Tatsuro Yamada</member>
+    <member>Teodor Sigaev</member>
+    <member>Thom Brown</member>
+    <member>Thomas Kellerer</member>
+    <member>Thomas Munro</member>
+    <member>Tim Goodaire</member>
+    <member>Tobias Bussmann</member>
+    <member>Tom Dunstan</member>
+    <member>Tom Lane</member>
+    <member>Tom van Tilburg</member>
+    <member>Tomas Vondra</member>
+    <member>Tomonari Katsumata</member>
+    <member>Tushar Ahuja</member>
+    <member>Vaishnavi Prabakaran</member>
+    <member>Venkata Balaji Nagothi</member>
+    <member>Vicky Vergara</member>
+    <member>Victor Wagner</member>
+    <member>Vik Fearing</member>
+    <member>Vinayak Pokale</member>
+    <member>Viren Negi</member>
+    <member>Vitaly Burovoy</member>
+    <member>Vladimir Kunshchikov</member>
+    <member>Vladimir Rusinov</member>
+    <member>Yi Wen Wong</member>
+    <member>Yugo Nagata</member>
+    <member>Zhen Ming Yang</member>
+    <member>Zhou Digoal</member>
+   </simplelist>
+  </sect2>
+
  </sect1>
diff --git a/doc/src/sgml/release-7.4.sgml b/doc/src/sgml/release-7.4.sgml
index bc4f4e18d0..a67945a42b 100644
--- a/doc/src/sgml/release-7.4.sgml
+++ b/doc/src/sgml/release-7.4.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 7.4.29.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 7.4.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -27,7 +27,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
-    see <xref linkend="release-7-4-26">.
+    see <xref linkend="release-7-4-26"/>.
    </para>
 
   </sect2>
@@ -47,7 +47,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -76,7 +76,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -97,7 +97,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -111,7 +111,7 @@
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -119,7 +119,7 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
@@ -146,11 +146,11 @@
   <para>
    This release contains a variety of fixes from 7.4.28.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 7.4.X release series in July 2010.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -161,7 +161,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
-    see <xref linkend="release-7-4-26">.
+    see <xref linkend="release-7-4-26"/>.
    </para>
 
   </sect2>
@@ -173,19 +173,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -194,19 +194,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -219,10 +219,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -230,7 +230,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -242,7 +242,7 @@
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -255,7 +255,7 @@
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -263,7 +263,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -290,11 +290,11 @@
   <para>
    This release contains a variety of fixes from 7.4.27.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 7.4.X release series in July 2010.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -305,7 +305,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
-    see <xref linkend="release-7-4-26">.
+    see <xref linkend="release-7-4-26"/>.
    </para>
 
   </sect2>
@@ -317,7 +317,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -332,8 +332,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -351,17 +351,17 @@
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -369,7 +369,7 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
@@ -381,14 +381,14 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
@@ -409,7 +409,7 @@
   <para>
    This release contains a variety of fixes from 7.4.26.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -418,7 +418,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.26,
-    see <xref linkend="release-7-4-26">.
+    see <xref linkend="release-7-4-26"/>.
    </para>
 
   </sect2>
@@ -460,14 +460,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -486,7 +486,7 @@
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -498,7 +498,7 @@
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -507,7 +507,7 @@
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -529,7 +529,7 @@
   <para>
    This release contains a variety of fixes from 7.4.25.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -537,10 +537,10 @@
 
    <para>
     A dump/restore is not required for those running 7.4.X.
-    However, if you have any hash indexes on <type>interval</> columns,
-    you must <command>REINDEX</> them after updating to 7.4.26.
+    However, if you have any hash indexes on <type>interval</type> columns,
+    you must <command>REINDEX</command> them after updating to 7.4.26.
     Also, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -552,14 +552,14 @@
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
@@ -573,21 +573,21 @@
 
     <listitem>
      <para>
-      Fix hash calculation for data type <type>interval</> (Tom)
+      Fix hash calculation for data type <type>interval</type> (Tom)
      </para>
 
      <para>
       This corrects wrong results for hash joins on interval values.
       It also changes the contents of hash indexes on interval columns.
-      If you have any such indexes, you must <command>REINDEX</> them
+      If you have any such indexes, you must <command>REINDEX</command> them
       after updating.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -604,7 +604,7 @@
 
     <listitem>
      <para>
-      Fix <type>money</> data type to work in locales where currency
+      Fix <type>money</type> data type to work in locales where currency
       amounts have no fractional digits, e.g. Japan (Itagaki Takahiro)
      </para>
     </listitem>
@@ -612,7 +612,7 @@
     <listitem>
      <para>
       Properly round datetime input like
-      <literal>00:12:57.9999999999999999999999999999</> (Tom)
+      <literal>00:12:57.9999999999999999999999999999</literal> (Tom)
      </para>
     </listitem>
 
@@ -631,8 +631,8 @@
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -659,7 +659,7 @@
   <para>
    This release contains a variety of fixes from 7.4.24.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -668,7 +668,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -687,7 +687,7 @@
       This change extends fixes made in the last two minor releases for
       related failure scenarios.  The previous fixes were narrowly tailored
       for the original problem reports, but we have now recognized that
-      <emphasis>any</> error thrown by an encoding conversion function could
+      <emphasis>any</emphasis> error thrown by an encoding conversion function could
       potentially lead to infinite recursion while trying to report the
       error.  The solution therefore is to disable translation and encoding
       conversion and report the plain-ASCII form of any error message,
@@ -698,7 +698,7 @@
 
     <listitem>
      <para>
-      Disallow <command>CREATE CONVERSION</> with the wrong encodings
+      Disallow <command>CREATE CONVERSION</command> with the wrong encodings
       for the specified conversion function (Heikki)
      </para>
 
@@ -711,14 +711,14 @@
 
     <listitem>
      <para>
-      Fix core dump when <function>to_char()</> is given format codes that
+      Fix core dump when <function>to_char()</function> is given format codes that
       are inappropriate for the type of the data argument (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>MUST</> (Mauritius Island Summer Time) to the default list
+      Add <literal>MUST</literal> (Mauritius Island Summer Time) to the default list
       of known timezone abbreviations (Xavier Bugaud)
      </para>
     </listitem>
@@ -739,7 +739,7 @@
   <para>
    This release contains a variety of fixes from 7.4.23.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -748,7 +748,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -760,13 +760,13 @@
 
     <listitem>
      <para>
-      Improve handling of URLs in <function>headline()</> function (Teodor)
+      Improve handling of URLs in <function>headline()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of overlength headlines in <function>headline()</>
+      Improve handling of overlength headlines in <function>headline()</function>
       function (Teodor)
      </para>
     </listitem>
@@ -781,30 +781,30 @@
 
     <listitem>
      <para>
-      Avoid unnecessary locking of small tables in <command>VACUUM</>
+      Avoid unnecessary locking of small tables in <command>VACUUM</command>
       (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix uninitialized variables in <filename>contrib/tsearch2</>'s
-      <function>get_covers()</> function (Teodor)
+      Fix uninitialized variables in <filename>contrib/tsearch2</filename>'s
+      <function>get_covers()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug in <function>to_char()</>'s handling of <literal>TH</>
+      Fix bug in <function>to_char()</function>'s handling of <literal>TH</literal>
       format codes (Andreas Scherbaum)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make all documentation reference <literal>pgsql-bugs</> and/or
-      <literal>pgsql-hackers</> as appropriate, instead of the
-      now-decommissioned <literal>pgsql-ports</> and <literal>pgsql-patches</>
+      Make all documentation reference <literal>pgsql-bugs</literal> and/or
+      <literal>pgsql-hackers</literal> as appropriate, instead of the
+      now-decommissioned <literal>pgsql-ports</literal> and <literal>pgsql-patches</literal>
       mailing lists (Tom)
      </para>
     </listitem>
@@ -825,7 +825,7 @@
   <para>
    This release contains a variety of fixes from 7.4.22.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -834,7 +834,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -852,7 +852,7 @@
 
      <para>
       We have addressed similar issues before, but it would still fail if
-      the <quote>character has no equivalent</> message itself couldn't
+      the <quote>character has no equivalent</quote> message itself couldn't
       be converted.  The fix is to disable localization and send the plain
       ASCII error message when we detect such a situation.
      </para>
@@ -868,14 +868,14 @@
     <listitem>
      <para>
       Fix improper display of fractional seconds in interval values when
-      using a non-ISO datestyle in an <option>--enable-integer-datetimes</>
+      using a non-ISO datestyle in an <option>--enable-integer-datetimes</option>
       build (Ron Mayer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>SPI_getvalue</> and <function>SPI_getbinval</>
+      Ensure <function>SPI_getvalue</function> and <function>SPI_getbinval</function>
       behave correctly when the passed tuple and tuple descriptor have
       different numbers of columns (Tom)
      </para>
@@ -889,7 +889,7 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s parsing of <command>CREATE USER</> (Michael)
+      Fix <application>ecpg</application>'s parsing of <command>CREATE USER</command> (Michael)
      </para>
     </listitem>
 
@@ -909,7 +909,7 @@
   <para>
    This release contains a variety of fixes from 7.4.21.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -918,7 +918,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -944,27 +944,27 @@
     <listitem>
      <para>
       Fix bug in backwards scanning of a cursor on a <literal>SELECT DISTINCT
-      ON</> query (Tom)
+      ON</literal> query (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner to estimate that <literal>GROUP BY</> expressions yielding
+      Fix planner to estimate that <literal>GROUP BY</literal> expressions yielding
       boolean results always result in two groups, regardless of the
       expressions' contents (Tom)
      </para>
 
      <para>
       This is very substantially more accurate than the regular <literal>GROUP
-      BY</> estimate for certain boolean tests like <replaceable>col</>
-      <literal>IS NULL</>.
+      BY</literal> estimate for certain boolean tests like <replaceable>col</replaceable>
+      <literal>IS NULL</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       error reporting after failure to send a SQL command (Tom)
      </para>
     </listitem>
@@ -985,7 +985,7 @@
   <para>
    This release contains one serious bug fix over 7.4.20.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -994,7 +994,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1006,18 +1006,18 @@
 
     <listitem>
      <para>
-      Make <function>pg_get_ruledef()</> parenthesize negative constants (Tom)
+      Make <function>pg_get_ruledef()</function> parenthesize negative constants (Tom)
      </para>
 
      <para>
       Before this fix, a negative constant in a view or rule might be dumped
-      as, say, <literal>-42::integer</>, which is subtly incorrect: it should
-      be <literal>(-42)::integer</> due to operator precedence rules.
+      as, say, <literal>-42::integer</literal>, which is subtly incorrect: it should
+      be <literal>(-42)::integer</literal> due to operator precedence rules.
       Usually this would make little difference, but it could interact with
       another recent patch to cause
-      <productname>PostgreSQL</> to reject what had been a valid
-      <command>SELECT DISTINCT</> view query.  Since this could result in
-      <application>pg_dump</> output failing to reload, it is being treated
+      <productname>PostgreSQL</productname> to reject what had been a valid
+      <command>SELECT DISTINCT</command> view query.  Since this could result in
+      <application>pg_dump</application> output failing to reload, it is being treated
       as a high-priority fix.  The only released versions in which dump
       output is actually incorrect are 8.3.1 and 8.2.7.
      </para>
@@ -1039,7 +1039,7 @@
   <para>
    This release contains a variety of fixes from 7.4.19.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1048,7 +1048,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.
     However, if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1061,7 +1061,7 @@
     <listitem>
      <para>
       Fix conversions between ISO-8859-5 and other encodings to handle
-      Cyrillic <quote>Yo</> characters (<literal>e</> and <literal>E</> with
+      Cyrillic <quote>Yo</quote> characters (<literal>e</literal> and <literal>E</literal> with
       two dots) (Sergey Burladyan)
      </para>
     </listitem>
@@ -1076,7 +1076,7 @@
      <para>
       This could lead to failures in which two apparently identical literal
       values were not seen as equal, resulting in the parser complaining
-      about unmatched <literal>ORDER BY</> and <literal>DISTINCT</>
+      about unmatched <literal>ORDER BY</literal> and <literal>DISTINCT</literal>
       expressions.
      </para>
     </listitem>
@@ -1084,36 +1084,36 @@
     <listitem>
      <para>
       Fix a corner case in regular-expression substring matching
-      (<literal>substring(<replaceable>string</> from
-      <replaceable>pattern</>)</literal>) (Tom)
+      (<literal>substring(<replaceable>string</replaceable> from
+      <replaceable>pattern</replaceable>)</literal>) (Tom)
      </para>
 
      <para>
       The problem occurs when there is a match to the pattern overall but
       the user has specified a parenthesized subexpression and that
       subexpression hasn't got a match.  An example is
-      <literal>substring('foo' from 'foo(bar)?')</>.
-      This should return NULL, since <literal>(bar)</> isn't matched, but
+      <literal>substring('foo' from 'foo(bar)?')</literal>.
+      This should return NULL, since <literal>(bar)</literal> isn't matched, but
       it was mistakenly returning the whole-pattern match instead (ie,
-      <literal>foo</>).
+      <literal>foo</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect result from <application>ecpg</>'s
-      <function>PGTYPEStimestamp_sub()</> function (Michael)
+      Fix incorrect result from <application>ecpg</application>'s
+      <function>PGTYPEStimestamp_sub()</function> function (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>DatumGetBool</> macro to not fail with <application>gcc</>
+      Fix <literal>DatumGetBool</literal> macro to not fail with <application>gcc</application>
       4.3 (Tom)
      </para>
 
      <para>
-      This problem affects <quote>old style</> (V0) C functions that
+      This problem affects <quote>old style</quote> (V0) C functions that
       return boolean.  The fix is already in 8.3, but the need to
       back-patch it was not realized at the time.
      </para>
@@ -1121,21 +1121,21 @@
 
     <listitem>
      <para>
-      Fix longstanding <command>LISTEN</>/<command>NOTIFY</>
+      Fix longstanding <command>LISTEN</command>/<command>NOTIFY</command>
       race condition (Tom)
      </para>
 
      <para>
       In rare cases a session that had just executed a
-      <command>LISTEN</> might not get a notification, even though
+      <command>LISTEN</command> might not get a notification, even though
       one would be expected because the concurrent transaction executing
-      <command>NOTIFY</> was observed to commit later.
+      <command>NOTIFY</command> was observed to commit later.
      </para>
 
      <para>
       A side effect of the fix is that a transaction that has executed
-      a not-yet-committed <command>LISTEN</> command will not see any
-      row in <structname>pg_listener</> for the <command>LISTEN</>,
+      a not-yet-committed <command>LISTEN</command> command will not see any
+      row in <structname>pg_listener</structname> for the <command>LISTEN</command>,
       should it choose to look; formerly it would have.  This behavior
       was never documented one way or the other, but it is possible that
       some applications depend on the old behavior.
@@ -1144,8 +1144,8 @@
 
     <listitem>
      <para>
-      Fix display of constant expressions in <literal>ORDER BY</>
-      and <literal>GROUP BY</> (Tom)
+      Fix display of constant expressions in <literal>ORDER BY</literal>
+      and <literal>GROUP BY</literal> (Tom)
      </para>
 
      <para>
@@ -1157,7 +1157,7 @@
 
     <listitem>
      <para>
-      Fix <application>libpq</> to handle NOTICE messages correctly
+      Fix <application>libpq</application> to handle NOTICE messages correctly
       during COPY OUT (Tom)
      </para>
 
@@ -1185,7 +1185,7 @@
    This release contains a variety of fixes from 7.4.18,
    including fixes for significant security issues.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1194,7 +1194,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1207,7 +1207,7 @@
     <listitem>
      <para>
       Prevent functions in indexes from executing with the privileges of
-      the user running <command>VACUUM</>, <command>ANALYZE</>, etc (Tom)
+      the user running <command>VACUUM</command>, <command>ANALYZE</command>, etc (Tom)
      </para>
 
      <para>
@@ -1218,18 +1218,18 @@
       (Note that triggers, defaults, check constraints, etc. pose the
       same type of risk.)  But functions in indexes pose extra danger
       because they will be executed by routine maintenance operations
-      such as <command>VACUUM FULL</>, which are commonly performed
+      such as <command>VACUUM FULL</command>, which are commonly performed
       automatically under a superuser account.  For example, a nefarious user
       can execute code with superuser privileges by setting up a
       trojan-horse index definition and waiting for the next routine vacuum.
       The fix arranges for standard maintenance operations
-      (including <command>VACUUM</>, <command>ANALYZE</>, <command>REINDEX</>,
-      and <command>CLUSTER</>) to execute as the table owner rather than
+      (including <command>VACUUM</command>, <command>ANALYZE</command>, <command>REINDEX</command>,
+      and <command>CLUSTER</command>) to execute as the table owner rather than
       the calling user, using the same privilege-switching mechanism already
-      used for <literal>SECURITY DEFINER</> functions.  To prevent bypassing
+      used for <literal>SECURITY DEFINER</literal> functions.  To prevent bypassing
       this security measure, execution of <command>SET SESSION
-      AUTHORIZATION</> and <command>SET ROLE</> is now forbidden within a
-      <literal>SECURITY DEFINER</> context.  (CVE-2007-6600)
+      AUTHORIZATION</command> and <command>SET ROLE</command> is now forbidden within a
+      <literal>SECURITY DEFINER</literal> context.  (CVE-2007-6600)
      </para>
     </listitem>
 
@@ -1249,13 +1249,13 @@
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
 
      <para>
       The fix that appeared for this in 7.4.18 was incomplete, as it plugged
-      the hole for only some <filename>dblink</> functions.  (CVE-2007-6601,
+      the hole for only some <filename>dblink</filename> functions.  (CVE-2007-6601,
       CVE-2007-3278)
      </para>
     </listitem>
@@ -1263,13 +1263,13 @@
     <listitem>
      <para>
       Fix planner failure in some cases of <literal>WHERE false AND var IN
-      (SELECT ...)</> (Tom)
+      (SELECT ...)</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential crash in <function>translate()</> when using a multibyte
+      Fix potential crash in <function>translate()</function> when using a multibyte
       database encoding (Tom)
      </para>
     </listitem>
@@ -1282,42 +1282,42 @@
 
     <listitem>
      <para>
-      <application>ecpg</> parser fixes (Michael)
+      <application>ecpg</application> parser fixes (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/tablefunc</>'s <function>crosstab()</> handle
+      Make <filename>contrib/tablefunc</filename>'s <function>crosstab()</function> handle
       NULL rowid as a category in its own right, rather than crashing (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <type>tsvector</> and <type>tsquery</> output routines to
+      Fix <type>tsvector</type> and <type>tsquery</type> output routines to
       escape backslashes correctly (Teodor, Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash of <function>to_tsvector()</> on huge input strings (Teodor)
+      Fix crash of <function>to_tsvector()</function> on huge input strings (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require a specific version of <productname>Autoconf</> to be used
-      when re-generating the <command>configure</> script (Peter)
+      Require a specific version of <productname>Autoconf</productname> to be used
+      when re-generating the <command>configure</command> script (Peter)
      </para>
 
      <para>
       This affects developers and packagers only.  The change was made
       to prevent accidental use of untested combinations of
-      <productname>Autoconf</> and <productname>PostgreSQL</> versions.
+      <productname>Autoconf</productname> and <productname>PostgreSQL</productname> versions.
       You can remove the version check if you really want to use a
-      different <productname>Autoconf</> version, but it's
+      different <productname>Autoconf</productname> version, but it's
       your responsibility whether the result works or not.
      </para>
     </listitem>
@@ -1338,7 +1338,7 @@
   <para>
    This release contains fixes from 7.4.17.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1347,7 +1347,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1360,40 +1360,40 @@
     <listitem>
      <para>
       Prevent index corruption when a transaction inserts rows and
-      then aborts close to the end of a concurrent <command>VACUUM</>
+      then aborts close to the end of a concurrent <command>VACUUM</command>
       on the same table (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE DOMAIN ... DEFAULT NULL</> work properly (Tom)
+      Make <command>CREATE DOMAIN ... DEFAULT NULL</command> work properly (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix excessive logging of <acronym>SSL</> error messages (Tom)
+      Fix excessive logging of <acronym>SSL</acronym> error messages (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when <varname>log_min_error_statement</> logging runs out
+      Fix crash when <varname>log_min_error_statement</varname> logging runs out
       of memory (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>CLUSTER</> from failing
+      Prevent <command>CLUSTER</command> from failing
       due to attempting to process temporary tables of other sessions (Alvaro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
     </listitem>
@@ -1415,7 +1415,7 @@
    This release contains fixes from 7.4.16,
    including a security fix.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1424,7 +1424,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1437,28 +1437,28 @@
     <listitem>
     <para>
      Support explicit placement of the temporary-table schema within
-     <varname>search_path</>, and disable searching it for functions
+     <varname>search_path</varname>, and disable searching it for functions
      and operators (Tom)
     </para>
     <para>
      This is needed to allow a security-definer function to set a
-     truly secure value of <varname>search_path</>.  Without it,
+     truly secure value of <varname>search_path</varname>.  Without it,
      an unprivileged SQL user can use temporary objects to execute code
      with the privileges of the security-definer function (CVE-2007-2138).
-     See <command>CREATE FUNCTION</> for more information.
+     See <command>CREATE FUNCTION</command> for more information.
     </para>
     </listitem>
 
     <listitem>
     <para>
-     <filename>/contrib/tsearch2</> crash fixes (Teodor)
+     <filename>/contrib/tsearch2</filename> crash fixes (Teodor)
     </para>
     </listitem>
 
     <listitem>
     <para>
-     Fix potential-data-corruption bug in how <command>VACUUM FULL</> handles
-     <command>UPDATE</> chains (Tom, Pavan Deolasee)
+     Fix potential-data-corruption bug in how <command>VACUUM FULL</command> handles
+     <command>UPDATE</command> chains (Tom, Pavan Deolasee)
     </para>
     </listitem>
 
@@ -1486,7 +1486,7 @@
    This release contains a variety of fixes from 7.4.15, including
    a security fix.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1495,7 +1495,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1529,7 +1529,7 @@
 
     <listitem>
     <para>
-     Fix for rare Assert() crash triggered by <literal>UNION</> (Tom)
+     Fix for rare Assert() crash triggered by <literal>UNION</literal> (Tom)
     </para>
     </listitem>
 
@@ -1556,7 +1556,7 @@
   <para>
    This release contains a variety of fixes from 7.4.14.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1565,7 +1565,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1577,7 +1577,7 @@
 
     <listitem>
      <para>
-      Improve handling of <function>getaddrinfo()</> on AIX (Tom)
+      Improve handling of <function>getaddrinfo()</function> on AIX (Tom)
      </para>
 
      <para>
@@ -1588,8 +1588,8 @@
 
      <listitem>
       <para>
-       Fix <quote>failed to re-find parent key</> errors in
-       <command>VACUUM</> (Tom)
+       Fix <quote>failed to re-find parent key</quote> errors in
+       <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
@@ -1601,20 +1601,20 @@
 
     <listitem>
      <para>
-      Fix error when constructing an <literal>ARRAY[]</> made up of multiple
+      Fix error when constructing an <literal>ARRAY[]</literal> made up of multiple
       empty elements (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <function>to_number()</> and <function>to_char(numeric)</>
-      are now <literal>STABLE</>, not <literal>IMMUTABLE</>, for
-      new <application>initdb</> installs (Tom)
+      <function>to_number()</function> and <function>to_char(numeric)</function>
+      are now <literal>STABLE</literal>, not <literal>IMMUTABLE</literal>, for
+      new <application>initdb</application> installs (Tom)
      </para>
 
      <para>
-      This is because <varname>lc_numeric</> can potentially
+      This is because <varname>lc_numeric</varname> can potentially
       change the output of these functions.
      </para>
     </listitem>
@@ -1625,7 +1625,7 @@
      </para>
 
      <para>
-      This improves <application>psql</> <literal>\d</> performance also.
+      This improves <application>psql</application> <literal>\d</literal> performance also.
      </para>
     </listitem>
 
@@ -1645,7 +1645,7 @@
   <para>
    This release contains a variety of fixes from 7.4.13.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1654,7 +1654,7 @@
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
   </sect2>
@@ -1665,12 +1665,12 @@
 <itemizedlist>
 <listitem><para>Fix core dump when an untyped literal is taken as
 ANYARRAY</para></listitem>
-<listitem><para>Fix <function>string_to_array()</> to handle overlapping
+<listitem><para>Fix <function>string_to_array()</function> to handle overlapping
  matches for the separator string</para>
-<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</>.
+<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</literal>.
 </para></listitem>
 <listitem><para>Fix corner cases in pattern matching for
- <application>psql</>'s <literal>\d</> commands</para></listitem>
+ <application>psql</application>'s <literal>\d</literal> commands</para></listitem>
 <listitem><para>Fix index-corrupting bugs in /contrib/ltree
  (Teodor)</para></listitem>
 <listitem><para>Fix backslash escaping in /contrib/dbmirror</para></listitem>
@@ -1693,7 +1693,7 @@ ANYARRAY</para></listitem>
    This release contains a variety of fixes from 7.4.12,
    including patches for extremely serious security issues.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1702,7 +1702,7 @@ ANYARRAY</para></listitem>
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
 
    <para>
@@ -1712,9 +1712,9 @@ ANYARRAY</para></listitem>
     into SQL commands, you should examine them as soon as possible to
     ensure that they are using recommended escaping techniques.  In
     most cases, applications should be using subroutines provided by
-    libraries or drivers (such as <application>libpq</>'s
-    <function>PQescapeStringConn()</>) to perform string escaping,
-    rather than relying on <foreignphrase>ad hoc</> code to do it.
+    libraries or drivers (such as <application>libpq</application>'s
+    <function>PQescapeStringConn()</function>) to perform string escaping,
+    rather than relying on <foreignphrase>ad hoc</foreignphrase> code to do it.
    </para>
   </sect2>
 
@@ -1724,48 +1724,48 @@ ANYARRAY</para></listitem>
 <itemizedlist>
 <listitem><para>Change the server to reject invalidly-encoded multibyte
 characters in all cases (Tatsuo, Tom)</para>
-<para>While <productname>PostgreSQL</> has been moving in this direction for
+<para>While <productname>PostgreSQL</productname> has been moving in this direction for
 some time, the checks are now applied uniformly to all encodings and all
 textual input, and are now always errors not merely warnings.  This change
 defends against SQL-injection attacks of the type described in CVE-2006-2313.
 </para></listitem>
 
-<listitem><para>Reject unsafe uses of <literal>\'</> in string literals</para>
+<listitem><para>Reject unsafe uses of <literal>\'</literal> in string literals</para>
 <para>As a server-side defense against SQL-injection attacks of the type
-described in CVE-2006-2314, the server now only accepts <literal>''</> and not
-<literal>\'</> as a representation of ASCII single quote in SQL string
-literals.  By default, <literal>\'</> is rejected only when
-<varname>client_encoding</> is set to a client-only encoding (SJIS, BIG5, GBK,
+described in CVE-2006-2314, the server now only accepts <literal>''</literal> and not
+<literal>\'</literal> as a representation of ASCII single quote in SQL string
+literals.  By default, <literal>\'</literal> is rejected only when
+<varname>client_encoding</varname> is set to a client-only encoding (SJIS, BIG5, GBK,
 GB18030, or UHC), which is the scenario in which SQL injection is possible.
-A new configuration parameter <varname>backslash_quote</> is available to
+A new configuration parameter <varname>backslash_quote</varname> is available to
 adjust this behavior when needed.  Note that full security against
 CVE-2006-2314 might require client-side changes; the purpose of
-<varname>backslash_quote</> is in part to make it obvious that insecure
+<varname>backslash_quote</varname> is in part to make it obvious that insecure
 clients are insecure.
 </para></listitem>
 
-<listitem><para>Modify <application>libpq</>'s string-escaping routines to be
+<listitem><para>Modify <application>libpq</application>'s string-escaping routines to be
 aware of encoding considerations and
-<varname>standard_conforming_strings</></para>
-<para>This fixes <application>libpq</>-using applications for the security
+<varname>standard_conforming_strings</varname></para>
+<para>This fixes <application>libpq</application>-using applications for the security
 issues described in CVE-2006-2313 and CVE-2006-2314, and also future-proofs
 them against the planned changeover to SQL-standard string literal syntax.
-Applications that use multiple <productname>PostgreSQL</> connections
-concurrently should migrate to <function>PQescapeStringConn()</> and
-<function>PQescapeByteaConn()</> to ensure that escaping is done correctly
+Applications that use multiple <productname>PostgreSQL</productname> connections
+concurrently should migrate to <function>PQescapeStringConn()</function> and
+<function>PQescapeByteaConn()</function> to ensure that escaping is done correctly
 for the settings in use in each database connection.  Applications that
-do string escaping <quote>by hand</> should be modified to rely on library
+do string escaping <quote>by hand</quote> should be modified to rely on library
 routines instead.
 </para></listitem>
 
 <listitem><para>Fix some incorrect encoding conversion functions</para>
-<para><function>win1251_to_iso</>, <function>alt_to_iso</>,
-<function>euc_tw_to_big5</>, <function>euc_tw_to_mic</>,
-<function>mic_to_euc_tw</> were all broken to varying
+<para><function>win1251_to_iso</function>, <function>alt_to_iso</function>,
+<function>euc_tw_to_big5</function>, <function>euc_tw_to_mic</function>,
+<function>mic_to_euc_tw</function> were all broken to varying
 extents.
 </para></listitem>
 
-<listitem><para>Clean up stray remaining uses of <literal>\'</> in strings
+<listitem><para>Clean up stray remaining uses of <literal>\'</literal> in strings
 (Bruce, Jan)</para></listitem>
 
 <listitem><para>Fix bug that sometimes caused OR'd index scans to
@@ -1774,8 +1774,8 @@ miss rows they should have returned</para></listitem>
 <listitem><para>Fix WAL replay for case where a btree index has been
 truncated</para></listitem>
 
-<listitem><para>Fix <literal>SIMILAR TO</> for patterns involving
-<literal>|</> (Tom)</para></listitem>
+<listitem><para>Fix <literal>SIMILAR TO</literal> for patterns involving
+<literal>|</literal> (Tom)</para></listitem>
 
 <listitem><para>Fix server to use custom DH SSL parameters correctly (Michael
 Fuhr)</para></listitem>
@@ -1799,7 +1799,7 @@ Fuhr)</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.11.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1808,7 +1808,7 @@ Fuhr)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.11,
-    see <xref linkend="release-7-4-11">.
+    see <xref linkend="release-7-4-11"/>.
    </para>
   </sect2>
 
@@ -1818,7 +1818,7 @@ Fuhr)</para></listitem>
 <itemizedlist>
 
 <listitem><para>Fix potential crash in <command>SET
-SESSION AUTHORIZATION</> (CVE-2006-0553)</para>
+SESSION AUTHORIZATION</command> (CVE-2006-0553)</para>
 <para>An unprivileged user could crash the server process, resulting in
 momentary denial of service to other users, if the server has been compiled
 with Asserts enabled (which is not the default).
@@ -1833,18 +1833,18 @@ created in 7.4.9 and 7.3.11 releases.
 </para></listitem>
 
 <listitem><para>Fix race condition that could lead to <quote>file already
-exists</> errors during pg_clog file creation
+exists</quote> errors during pg_clog file creation
 (Tom)</para></listitem>
 
-<listitem><para>Properly check <literal>DOMAIN</> constraints for
-<literal>UNKNOWN</> parameters in prepared statements
+<listitem><para>Properly check <literal>DOMAIN</literal> constraints for
+<literal>UNKNOWN</literal> parameters in prepared statements
 (Neil)</para></listitem>
 
 <listitem><para>Fix to allow restoring dumps that have cross-schema
 references to custom operators (Tom)</para></listitem>
 
-<listitem><para>Portability fix for testing presence of <function>finite</>
-and <function>isinf</> during configure (Tom)</para></listitem>
+<listitem><para>Portability fix for testing presence of <function>finite</function>
+and <function>isinf</function> during configure (Tom)</para></listitem>
 
 </itemizedlist>
 
@@ -1862,7 +1862,7 @@ and <function>isinf</> during configure (Tom)</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.10.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1871,10 +1871,10 @@ and <function>isinf</> during configure (Tom)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
-    see <xref linkend="release-7-4-8">.
-    Also, you might need to <command>REINDEX</> indexes on textual
+    see <xref linkend="release-7-4-8"/>.
+    Also, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the locale or
-    <application>plperl</> issues described below.
+    <application>plperl</application> issues described below.
    </para>
   </sect2>
 
@@ -1888,28 +1888,28 @@ outside a transaction or in a failed transaction (Tom)</para></listitem>
 
 <listitem><para>Fix character string comparison for locales that consider
 different character combinations as equal, such as Hungarian (Tom)</para>
-<para>This might require <command>REINDEX</> to fix existing indexes on
+<para>This might require <command>REINDEX</command> to fix existing indexes on
 textual columns.</para></listitem>
 
 <listitem><para>Set locale environment variables during postmaster startup
-to ensure that <application>plperl</> won't change the locale later</para>
-<para>This fixes a problem that occurred if the <application>postmaster</> was
+to ensure that <application>plperl</application> won't change the locale later</para>
+<para>This fixes a problem that occurred if the <application>postmaster</application> was
 started with environment variables specifying a different locale than what
-<application>initdb</> had been told.  Under these conditions, any use of
-<application>plperl</> was likely to lead to corrupt indexes.  You might need
-<command>REINDEX</> to fix existing indexes on
+<application>initdb</application> had been told.  Under these conditions, any use of
+<application>plperl</application> was likely to lead to corrupt indexes.  You might need
+<command>REINDEX</command> to fix existing indexes on
 textual columns if this has happened to you.</para></listitem>
 
 <listitem><para>Fix longstanding bug in strpos() and regular expression
 handling in certain rarely used Asian multi-byte character sets (Tatsuo)
 </para></listitem>
 
-<listitem><para>Fix bug in <filename>/contrib/pgcrypto</> gen_salt,
+<listitem><para>Fix bug in <filename>/contrib/pgcrypto</filename> gen_salt,
 which caused it not to use all available salt space for MD5 and
 XDES algorithms (Marko Kreen, Solar Designer)</para>
 <para>Salts for Blowfish and standard DES are unaffected.</para></listitem>
 
-<listitem><para>Fix <filename>/contrib/dblink</> to throw an error,
+<listitem><para>Fix <filename>/contrib/dblink</filename> to throw an error,
 rather than crashing, when the number of columns specified is different from
 what's actually returned by the query (Joe)</para></listitem>
 
@@ -1929,7 +1929,7 @@ what's actually returned by the query (Joe)</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.9.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1938,7 +1938,7 @@ what's actually returned by the query (Joe)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
-    see <xref linkend="release-7-4-8">.
+    see <xref linkend="release-7-4-8"/>.
    </para>
   </sect2>
 
@@ -1956,15 +1956,15 @@ corruption.</para>
 <listitem><para>Prevent failure if client sends Bind protocol message
 when current transaction is already aborted</para></listitem>
 
-<listitem><para><filename>/contrib/ltree</> fixes (Teodor)</para></listitem>
+<listitem><para><filename>/contrib/ltree</filename> fixes (Teodor)</para></listitem>
 
 <listitem><para>AIX and HPUX compile fixes (Tom)</para></listitem>
 
 <listitem><para>Fix longstanding planning error for outer joins</para>
 <para>This bug sometimes caused a bogus error <quote>RIGHT JOIN is
-only supported with merge-joinable join conditions</>.</para></listitem>
+only supported with merge-joinable join conditions</quote>.</para></listitem>
 
-<listitem><para>Prevent core dump in <application>pg_autovacuum</> when a
+<listitem><para>Prevent core dump in <application>pg_autovacuum</application> when a
 table has been dropped</para></listitem>
 </itemizedlist>
 
@@ -1982,7 +1982,7 @@ table has been dropped</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.8.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -1991,7 +1991,7 @@ table has been dropped</para></listitem>
    <para>
     A dump/restore is not required for those running 7.4.X.  However,
     if you are upgrading from a version earlier than 7.4.8,
-    see <xref linkend="release-7-4-8">.
+    see <xref linkend="release-7-4-8"/>.
    </para>
   </sect2>
 
@@ -1999,41 +1999,41 @@ table has been dropped</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Fix error that allowed <command>VACUUM</> to remove
-<literal>ctid</> chains too soon, and add more checking in code that follows
-<literal>ctid</> links</para>
+<listitem><para>Fix error that allowed <command>VACUUM</command> to remove
+<literal>ctid</literal> chains too soon, and add more checking in code that follows
+<literal>ctid</literal> links</para>
 <para>This fixes a long-standing problem that could cause crashes in very rare
 circumstances.</para></listitem>
-<listitem><para>Fix <type>CHAR()</> to properly pad spaces to the specified
+<listitem><para>Fix <type>CHAR()</type> to properly pad spaces to the specified
 length when using a multiple-byte character set (Yoshiyuki Asaba)</para>
-<para>In prior releases, the padding of <type>CHAR()</> was incorrect
+<para>In prior releases, the padding of <type>CHAR()</type> was incorrect
 because it only padded to the specified number of bytes without
 considering how many characters were stored.</para></listitem>
 <listitem><para>Fix the sense of the test for read-only transaction
-in <command>COPY</></para>
-<para>The code formerly prohibited <command>COPY TO</>, where it should
-prohibit <command>COPY FROM</>.
+in <command>COPY</command></para>
+<para>The code formerly prohibited <command>COPY TO</command>, where it should
+prohibit <command>COPY FROM</command>.
 </para></listitem>
 <listitem><para>Fix planning problem with outer-join ON clauses that reference
 only the inner-side relation</para></listitem>
-<listitem><para>Further fixes for <literal>x FULL JOIN y ON true</> corner
+<listitem><para>Further fixes for <literal>x FULL JOIN y ON true</literal> corner
 cases</para></listitem>
-<listitem><para>Make <function>array_in</> and <function>array_recv</> more
+<listitem><para>Make <function>array_in</function> and <function>array_recv</function> more
 paranoid about validating their OID parameter</para></listitem>
 <listitem><para>Fix missing rows in queries like <literal>UPDATE a=... WHERE
-a...</> with GiST index on column <literal>a</></para></listitem>
+a...</literal> with GiST index on column <literal>a</literal></para></listitem>
 <listitem><para>Improve robustness of datetime parsing</para></listitem>
 <listitem><para>Improve checking for partially-written WAL
 pages</para></listitem>
 <listitem><para>Improve robustness of signal handling when SSL is
 enabled</para></listitem>
-<listitem><para>Don't try to open more than <literal>max_files_per_process</>
+<listitem><para>Don't try to open more than <literal>max_files_per_process</literal>
 files during postmaster startup</para></listitem>
 <listitem><para>Various memory leakage fixes</para></listitem>
 <listitem><para>Various portability improvements</para></listitem>
-<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when
+<listitem><para>Fix PL/pgSQL to handle <literal>var := var</literal> correctly when
 the variable is of pass-by-reference type</para></listitem>
-<listitem><para>Update <filename>contrib/tsearch2</> to use current Snowball
+<listitem><para>Update <filename>contrib/tsearch2</filename> to use current Snowball
 code</para></listitem>
 </itemizedlist>
 
@@ -2052,7 +2052,7 @@ code</para></listitem>
    This release contains a variety of fixes from 7.4.7, including several
    security-related issues.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -2077,10 +2077,10 @@ code</para></listitem>
    </para>
 
    <para>
-    The lesser problem is that the <filename>contrib/tsearch2</> module
+    The lesser problem is that the <filename>contrib/tsearch2</filename> module
     creates several functions that are misdeclared to return
-    <type>internal</> when they do not accept <type>internal</> arguments.
-    This breaks type safety for all functions using <type>internal</>
+    <type>internal</type> when they do not accept <type>internal</type> arguments.
+    This breaks type safety for all functions using <type>internal</type>
     arguments.
    </para>
 
@@ -2106,7 +2106,7 @@ WHERE pronamespace = 11 AND pronargs = 5
 COMMIT;
 </programlisting>
 
-    Next, if you have installed <filename>contrib/tsearch2</>, do:
+    Next, if you have installed <filename>contrib/tsearch2</filename>, do:
 
 <programlisting>
 BEGIN;
@@ -2124,22 +2124,22 @@ COMMIT;
 </programlisting>
 
     If this command fails with a message like <quote>function
-    "dex_init(text)" does not exist</>, then either <filename>tsearch2</>
+    "dex_init(text)" does not exist</quote>, then either <filename>tsearch2</filename>
     is not installed in this database, or you already did the update.
    </para>
 
    <para>
-    The above procedures must be carried out in <emphasis>each</> database
-    of an installation, including <literal>template1</>, and ideally
-    including <literal>template0</> as well.  If you do not fix the
+    The above procedures must be carried out in <emphasis>each</emphasis> database
+    of an installation, including <literal>template1</literal>, and ideally
+    including <literal>template0</literal> as well.  If you do not fix the
     template databases then any subsequently created databases will contain
-    the same errors.  <literal>template1</> can be fixed in the same way
-    as any other database, but fixing <literal>template0</> requires
+    the same errors.  <literal>template1</literal> can be fixed in the same way
+    as any other database, but fixing <literal>template0</literal> requires
     additional steps.  First, from any database issue:
 <programlisting>
 UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
 </programlisting>
-     Next connect to <literal>template0</> and perform the above repair
+     Next connect to <literal>template0</literal> and perform the above repair
      procedures.  Finally, do:
 <programlisting>
 -- re-freeze template0:
@@ -2156,8 +2156,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 <itemizedlist>
 <listitem><para>Change encoding function signature to prevent
 misuse</para></listitem>
-<listitem><para>Change <filename>contrib/tsearch2</> to avoid unsafe use of
-<type>INTERNAL</> function results</para></listitem>
+<listitem><para>Change <filename>contrib/tsearch2</filename> to avoid unsafe use of
+<type>INTERNAL</type> function results</para></listitem>
 <listitem><para>Repair ancient race condition that allowed a transaction to be
 seen as committed for some purposes (eg SELECT FOR UPDATE) slightly sooner
 than for other purposes</para>
@@ -2169,56 +2169,56 @@ VACUUM</para>
 freshly-inserted data, although the scenario seems of very low probability.
 There are no known cases of it having caused more than an Assert failure.
 </para></listitem>
-<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</> values</para>
+<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</type> values</para>
 <para>
 The comparison code was wrong in the case where the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
-NOTE: if you have an index on a <type>TIME WITH TIME ZONE</> column,
-it will need to be <command>REINDEX</>ed after installing this update, because
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
+NOTE: if you have an index on a <type>TIME WITH TIME ZONE</type> column,
+it will need to be <command>REINDEX</command>ed after installing this update, because
 the fix corrects the sort order of column values.
 </para></listitem>
-<listitem><para>Fix <function>EXTRACT(EPOCH)</> for
-<type>TIME WITH TIME ZONE</> values</para></listitem>
+<listitem><para>Fix <function>EXTRACT(EPOCH)</function> for
+<type>TIME WITH TIME ZONE</type> values</para></listitem>
 <listitem><para>Fix mis-display of negative fractional seconds in
-<type>INTERVAL</> values</para>
+<type>INTERVAL</type> values</para>
 <para>
 This error only occurred when the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
 </para></listitem>
 <listitem><para>Ensure operations done during backend shutdown are counted by
 statistics collector</para>
 <para>
-This is expected to resolve reports of <application>pg_autovacuum</>
+This is expected to resolve reports of <application>pg_autovacuum</application>
 not vacuuming the system catalogs often enough &mdash; it was not being
 told about catalog deletions caused by temporary table removal during
 backend exit.
 </para></listitem>
 <listitem><para>Additional buffer overrun checks in plpgsql
 (Neil)</para></listitem>
-<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</>
+<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</literal>
 correctly (Neil)</para></listitem>
-<listitem><para>Fix <filename>contrib/pgcrypto</> for newer OpenSSL builds
+<listitem><para>Fix <filename>contrib/pgcrypto</filename> for newer OpenSSL builds
 (Marko Kreen)</para></listitem>
 <listitem><para>Still more 64-bit fixes for
-<filename>contrib/intagg</></para></listitem>
+<filename>contrib/intagg</filename></para></listitem>
 <listitem><para>Prevent incorrect optimization of functions returning
-<type>RECORD</></para></listitem>
-<listitem><para>Prevent <function>to_char(interval)</> from dumping core for
+<type>RECORD</type></para></listitem>
+<listitem><para>Prevent <function>to_char(interval)</function> from dumping core for
 month-related formats</para></listitem>
-<listitem><para>Prevent crash on <literal>COALESCE(NULL,NULL)</></para></listitem>
-<listitem><para>Fix <function>array_map</> to call PL functions correctly</para></listitem>
-<listitem><para>Fix permission checking in <command>ALTER DATABASE RENAME</></para></listitem>
-<listitem><para>Fix <command>ALTER LANGUAGE RENAME</></para></listitem>
-<listitem><para>Make <function>RemoveFromWaitQueue</> clean up after itself</para>
+<listitem><para>Prevent crash on <literal>COALESCE(NULL,NULL)</literal></para></listitem>
+<listitem><para>Fix <function>array_map</function> to call PL functions correctly</para></listitem>
+<listitem><para>Fix permission checking in <command>ALTER DATABASE RENAME</command></para></listitem>
+<listitem><para>Fix <command>ALTER LANGUAGE RENAME</command></para></listitem>
+<listitem><para>Make <function>RemoveFromWaitQueue</function> clean up after itself</para>
 <para>
 This fixes a lock management error that would only be visible if a transaction
 was kicked out of a wait for a lock (typically by query cancel) and then the
 holder of the lock released it within a very narrow window.
 </para></listitem>
 <listitem><para>Fix problem with untyped parameter appearing in
-<command>INSERT ... SELECT</></para></listitem>
-<listitem><para>Fix <command>CLUSTER</> failure after
-<command>ALTER TABLE SET WITHOUT OIDS</></para></listitem>
+<command>INSERT ... SELECT</command></para></listitem>
+<listitem><para>Fix <command>CLUSTER</command> failure after
+<command>ALTER TABLE SET WITHOUT OIDS</command></para></listitem>
 </itemizedlist>
 
   </sect2>
@@ -2236,7 +2236,7 @@ holder of the lock released it within a very narrow window.
    This release contains a variety of fixes from 7.4.6, including several
    security-related issues.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
   <sect2>
@@ -2251,11 +2251,11 @@ holder of the lock released it within a very narrow window.
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Disallow <command>LOAD</> to non-superusers</para>
+<listitem><para>Disallow <command>LOAD</command> to non-superusers</para>
 <para>
 On platforms that will automatically execute initialization functions of a
 shared library (this includes at least Windows and ELF-based Unixen),
-<command>LOAD</> can be used to make the server execute arbitrary code.
+<command>LOAD</command> can be used to make the server execute arbitrary code.
 Thanks to NGS Software for reporting this.</para></listitem>
 <listitem><para>Check that creator of an aggregate function has the right to
 execute the specified transition functions</para>
@@ -2295,7 +2295,7 @@ GMT</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.5.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2314,7 +2314,7 @@ GMT</para></listitem>
 <listitem><para>Repair possible failure to update hint bits on disk</para>
 <para>
 Under rare circumstances this oversight could lead to
-<quote>could not access transaction status</> failures, which qualifies
+<quote>could not access transaction status</quote> failures, which qualifies
 it as a potential-data-loss bug.
 </para></listitem>
 <listitem><para>Ensure that hashed outer join does not miss tuples</para>
@@ -2322,11 +2322,11 @@ it as a potential-data-loss bug.
 Very large left joins using a hash join plan could fail to output unmatched
 left-side rows given just the right data distribution.
 </para></listitem>
-<listitem><para>Disallow running <application>pg_ctl</> as root</para>
+<listitem><para>Disallow running <application>pg_ctl</application> as root</para>
 <para>
 This is to guard against any possible security issues.
 </para></listitem>
-<listitem><para>Avoid using temp files in <filename>/tmp</> in <command>make_oidjoins_check</command></para>
+<listitem><para>Avoid using temp files in <filename>/tmp</filename> in <command>make_oidjoins_check</command></para>
 <para>
 This has been reported as a security issue, though it's hardly worthy of
 concern since there is no reason for non-developers to use this script anyway.
@@ -2343,13 +2343,13 @@ This could lead to misbehavior in some of the system-statistics views.
 </para></listitem>
 <listitem><para>Fix small memory leak in postmaster</para></listitem>
 <listitem><para>Fix <quote>expected both swapped tables to have TOAST
-tables</> bug</para>
+tables</quote> bug</para>
 <para>
 This could arise in cases such as CLUSTER after ALTER TABLE DROP COLUMN.
 </para></listitem>
-<listitem><para>Prevent <literal>pg_ctl restart</> from adding <literal>-D</> multiple times</para></listitem>
+<listitem><para>Prevent <literal>pg_ctl restart</literal> from adding <literal>-D</literal> multiple times</para></listitem>
 <listitem><para>Fix problem with NULL values in GiST indexes</para></listitem>
-<listitem><para><literal>::</> is no longer interpreted as a variable in an
+<listitem><para><literal>::</literal> is no longer interpreted as a variable in an
 ECPG prepare statement</para></listitem>
 </itemizedlist>
 
@@ -2367,7 +2367,7 @@ ECPG prepare statement</para></listitem>
   <para>
    This release contains one serious bug fix over 7.4.4.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2405,7 +2405,7 @@ still worth a re-release.  The bug does not exist in pre-7.4 releases.
   <para>
    This release contains a variety of fixes from 7.4.3.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2435,8 +2435,8 @@ aggregate plan</para></listitem>
 <listitem><para>Fix hashed crosstab for zero-rows case (Joe)</para></listitem>
 <listitem><para>Force cache update after renaming a column in a foreign key</para></listitem>
 <listitem><para>Pretty-print UNION queries correctly</para></listitem>
-<listitem><para>Make psql handle <literal>\r\n</> newlines properly in COPY IN</para></listitem>
-<listitem><para><application>pg_dump</> handled ACLs with grant options incorrectly</para></listitem>
+<listitem><para>Make psql handle <literal>\r\n</literal> newlines properly in COPY IN</para></listitem>
+<listitem><para><application>pg_dump</application> handled ACLs with grant options incorrectly</para></listitem>
 <listitem><para>Fix thread support for macOS and Solaris</para></listitem>
 <listitem><para>Updated JDBC driver (build 215) with various fixes</para></listitem>
 <listitem><para>ECPG fixes</para></listitem>
@@ -2457,7 +2457,7 @@ aggregate plan</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.2.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2492,7 +2492,7 @@ large tables, unsigned oids, stability, temp tables, and debug mode
 Select-list aliases within the sub-select will now take precedence over
 names from outer query levels.
 </para></listitem>
-<listitem><para>Do not generate <quote>NATURAL CROSS JOIN</> when decompiling rules (Tom)</para></listitem>
+<listitem><para>Do not generate <quote>NATURAL CROSS JOIN</quote> when decompiling rules (Tom)</para></listitem>
 <listitem><para>Add checks for invalid field length in binary COPY (Tom)</para>
 <para>
  This fixes a difficult-to-exploit security hole.
@@ -2515,7 +2515,7 @@ names from outer query levels.
   <para>
    This release contains a variety of fixes from 7.4.1.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2531,29 +2531,29 @@ names from outer query levels.
    </para>
 
    <para>
-    The more severe of the two errors is that data type <type>anyarray</>
+    The more severe of the two errors is that data type <type>anyarray</type>
     has the wrong alignment label; this is a problem because the
-    <structname>pg_statistic</> system catalog uses <type>anyarray</>
+    <structname>pg_statistic</structname> system catalog uses <type>anyarray</type>
     columns.  The mislabeling can cause planner misestimations and even
-    crashes when planning queries that involve <literal>WHERE</> clauses on
-    double-aligned columns (such as <type>float8</> and <type>timestamp</>).
+    crashes when planning queries that involve <literal>WHERE</literal> clauses on
+    double-aligned columns (such as <type>float8</type> and <type>timestamp</type>).
     It is strongly recommended that all installations repair this error,
     either by initdb or by following the manual repair procedure given
     below.
    </para>
 
    <para>
-    The lesser error is that the system view <structname>pg_settings</>
+    The lesser error is that the system view <structname>pg_settings</structname>
     ought to be marked as having public update access, to allow
-    <literal>UPDATE pg_settings</> to be used as a substitute for
-    <command>SET</>.  This can also be fixed either by initdb or manually,
+    <literal>UPDATE pg_settings</literal> to be used as a substitute for
+    <command>SET</command>.  This can also be fixed either by initdb or manually,
     but it is not necessary to fix unless you want to use <literal>UPDATE
-    pg_settings</>.
+    pg_settings</literal>.
    </para>
 
    <para>
     If you wish not to do an initdb, the following procedure will work
-    for fixing <structname>pg_statistic</>.  As the database superuser,
+    for fixing <structname>pg_statistic</structname>.  As the database superuser,
     do:
 
 <programlisting>
@@ -2573,28 +2573,28 @@ ANALYZE;
 
     This can be done in a live database, but beware that all backends
     running in the altered database must be restarted before it is safe to
-    repopulate <structname>pg_statistic</>.
+    repopulate <structname>pg_statistic</structname>.
    </para>
 
    <para>
-    To repair the <structname>pg_settings</> error, simply do:
+    To repair the <structname>pg_settings</structname> error, simply do:
 <programlisting>
 GRANT SELECT, UPDATE ON pg_settings TO PUBLIC;
 </programlisting>
    </para>
 
    <para>
-    The above procedures must be carried out in <emphasis>each</> database
-    of an installation, including <literal>template1</>, and ideally
-    including <literal>template0</> as well.  If you do not fix the
+    The above procedures must be carried out in <emphasis>each</emphasis> database
+    of an installation, including <literal>template1</literal>, and ideally
+    including <literal>template0</literal> as well.  If you do not fix the
     template databases then any subsequently created databases will contain
-    the same errors.  <literal>template1</> can be fixed in the same way
-    as any other database, but fixing <literal>template0</> requires
+    the same errors.  <literal>template1</literal> can be fixed in the same way
+    as any other database, but fixing <literal>template0</literal> requires
     additional steps.  First, from any database issue:
 <programlisting>
 UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
 </programlisting>
-     Next connect to <literal>template0</> and perform the above repair
+     Next connect to <literal>template0</literal> and perform the above repair
      procedures.  Finally, do:
 <programlisting>
 -- re-freeze template0:
@@ -2614,28 +2614,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 </para>
 
 <itemizedlist>
-<listitem><para>Fix <structname>pg_statistic</> alignment bug that could crash optimizer</para>
+<listitem><para>Fix <structname>pg_statistic</structname> alignment bug that could crash optimizer</para>
 <para>See above for details about this problem.</para></listitem>
-<listitem><para>Allow non-super users to update <structname>pg_settings</></para></listitem>
+<listitem><para>Allow non-super users to update <structname>pg_settings</structname></para></listitem>
 <listitem><para>Fix several optimizer bugs, most of which led to
-<quote>variable not found in subplan target lists</> errors</para></listitem>
+<quote>variable not found in subplan target lists</quote> errors</para></listitem>
 <listitem><para>Avoid out-of-memory failure during startup of large multiple
 index scan</para></listitem>
 <listitem><para>Fix multibyte problem that could lead to <quote>out of
-memory</> error during <command>COPY IN</></para></listitem>
-<listitem><para>Fix problems with <command>SELECT INTO</> / <command>CREATE
-TABLE AS</> from tables without OIDs</para></listitem>
-<listitem><para>Fix problems with <filename>alter_table</> regression test
+memory</quote> error during <command>COPY IN</command></para></listitem>
+<listitem><para>Fix problems with <command>SELECT INTO</command> / <command>CREATE
+TABLE AS</command> from tables without OIDs</para></listitem>
+<listitem><para>Fix problems with <filename>alter_table</filename> regression test
 during parallel testing</para></listitem>
 <listitem><para>Fix problems with hitting open file limit, especially on macOS (Tom)</para></listitem>
 <listitem><para>Partial fix for Turkish-locale issues</para>
 <para>initdb will succeed now in Turkish locale, but there are still some
-inconveniences associated with the <literal>i/I</> problem.</para></listitem>
+inconveniences associated with the <literal>i/I</literal> problem.</para></listitem>
 <listitem><para>Make pg_dump set client encoding on restore</para></listitem>
 <listitem><para>Other minor pg_dump fixes</para></listitem>
 <listitem><para>Allow ecpg to again use C keywords as column names (Michael)</para></listitem>
-<listitem><para>Added ecpg <literal>WHENEVER NOT_FOUND</> to
-<literal>SELECT/INSERT/UPDATE/DELETE</> (Michael)</para></listitem>
+<listitem><para>Added ecpg <literal>WHENEVER NOT_FOUND</literal> to
+<literal>SELECT/INSERT/UPDATE/DELETE</literal> (Michael)</para></listitem>
 <listitem><para>Fix ecpg crash for queries calling set-returning functions (Michael)</para></listitem>
 <listitem><para>Various other ecpg fixes (Michael)</para></listitem>
 <listitem><para>Fixes for Borland compiler</para></listitem>
@@ -2658,7 +2658,7 @@ inconveniences associated with the <literal>i/I</> problem.</para></listitem>
   <para>
    This release contains a variety of fixes from 7.4.
    For information about new features in the 7.4 major release, see
-   <xref linkend="release-7-4">.
+   <xref linkend="release-7-4"/>.
   </para>
 
 
@@ -2810,7 +2810,7 @@ DROP SCHEMA information_schema CASCADE;
       without sorting, by accumulating results into a hash table
       with one entry per group.  It will still use the sort
       technique, however, if the hash table is estimated to be too
-      large to fit in <varname>sort_mem</>.
+      large to fit in <varname>sort_mem</varname>.
      </para>
     </listitem>
    </varlistentry>
@@ -3125,16 +3125,16 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>
      Trailing spaces are now trimmed when converting from type
-     <type>char(<replaceable>n</>)</type> to
-     <type>varchar(<replaceable>n</>)</type> or <type>text</type>.
+     <type>char(<replaceable>n</replaceable>)</type> to
+     <type>varchar(<replaceable>n</replaceable>)</type> or <type>text</type>.
      This is what most people always expected to happen anyway.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     The data type <type>float(<replaceable>p</>)</type> now
-     measures <replaceable>p</> in binary digits, not decimal
+     The data type <type>float(<replaceable>p</replaceable>)</type> now
+     measures <replaceable>p</replaceable> in binary digits, not decimal
      digits.  The new behavior follows the SQL standard.
     </para>
    </listitem>
@@ -3143,11 +3143,11 @@ DROP SCHEMA information_schema CASCADE;
     <para>
      Ambiguous date values now must match the ordering specified by
      the <varname>datestyle</varname> setting.  In prior releases, a
-     date specification of <literal>10/20/03</> was interpreted as a
-     date in October even if <varname>datestyle</> specified that
+     date specification of <literal>10/20/03</literal> was interpreted as a
+     date in October even if <varname>datestyle</varname> specified that
      the day should be first.  7.4 will throw an error if a date
      specification is invalid for the current setting of
-     <varname>datestyle</>.
+     <varname>datestyle</varname>.
     </para>
    </listitem>
 
@@ -3167,28 +3167,28 @@ DROP SCHEMA information_schema CASCADE;
      no longer work as expected in column default expressions; they
      now cause the time of the table creation to be the default, not
      the time of the insertion.  Functions such as
-     <function>now()</>, <function>current_timestamp</>, or
+     <function>now()</function>, <function>current_timestamp</function>, or
      <function>current_date</function> should be used instead.
     </para>
 
     <para>
      In previous releases, there was special code so that strings
      such as <literal>'now'</literal> were interpreted at
-     <command>INSERT</> time and not at table creation time, but
+     <command>INSERT</command> time and not at table creation time, but
      this work around didn't cover all cases.  Release 7.4 now
      requires that defaults be defined properly using functions such
-     as <function>now()</> or <function>current_timestamp</>. These
+     as <function>now()</function> or <function>current_timestamp</function>. These
      will work in all situations.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     The dollar sign (<literal>$</>) is no longer allowed in
+     The dollar sign (<literal>$</literal>) is no longer allowed in
      operator names.  It can instead be a non-first character in
      identifiers.  This was done to improve compatibility with other
      database systems, and to avoid syntax problems when parameter
-     placeholders (<literal>$<replaceable>n</></>) are written
+     placeholders (<literal>$<replaceable>n</replaceable></literal>) are written
      adjacent to operators.
     </para>
    </listitem>
@@ -3333,14 +3333,14 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Allow <literal>IN</>/<literal>NOT IN</> to be handled via hash
+     Allow <literal>IN</literal>/<literal>NOT IN</literal> to be handled via hash
      tables (Tom)
     </para>
    </listitem>
 
    <listitem>
     <para>
-     Improve <literal>NOT IN (<replaceable>subquery</>)</literal>
+     Improve <literal>NOT IN (<replaceable>subquery</replaceable>)</literal>
      performance (Tom)
     </para>
    </listitem>
@@ -3490,19 +3490,19 @@ DROP SCHEMA information_schema CASCADE;
 
   <itemizedlist>
    <listitem>
-    <para>Rename server parameter <varname>server_min_messages</> to <varname>log_min_messages</> (Bruce)</para>
+    <para>Rename server parameter <varname>server_min_messages</varname> to <varname>log_min_messages</varname> (Bruce)</para>
     <para>
      This was done so most parameters that control the server logs
-     begin with <literal>log_</>.
+     begin with <literal>log_</literal>.
     </para>
    </listitem>
 
-   <listitem><para>Rename <varname>show_*_stats</> to <varname>log_*_stats</> (Bruce)</para></listitem>
-   <listitem><para>Rename <varname>show_source_port</> to <varname>log_source_port</> (Bruce)</para></listitem>
-   <listitem><para>Rename <varname>hostname_lookup</> to <varname>log_hostname</> (Bruce)</para></listitem>
+   <listitem><para>Rename <varname>show_*_stats</varname> to <varname>log_*_stats</varname> (Bruce)</para></listitem>
+   <listitem><para>Rename <varname>show_source_port</varname> to <varname>log_source_port</varname> (Bruce)</para></listitem>
+   <listitem><para>Rename <varname>hostname_lookup</varname> to <varname>log_hostname</varname> (Bruce)</para></listitem>
 
    <listitem>
-    <para>Add <varname>checkpoint_warning</> to warn of excessive checkpointing (Bruce)</para>
+    <para>Add <varname>checkpoint_warning</varname> to warn of excessive checkpointing (Bruce)</para>
     <para>
      In prior releases, it was difficult to determine if checkpoint
      was happening too frequently. This feature adds a warning to the
@@ -3514,8 +3514,8 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Change debug server log messages to output as <literal>DEBUG</>
-     rather than <literal>LOG</> (Bruce)
+     Change debug server log messages to output as <literal>DEBUG</literal>
+     rather than <literal>LOG</literal> (Bruce)
     </para>
    </listitem>
 
@@ -3529,8 +3529,8 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     <varname>log_min_messages</>/<varname>client_min_messages</> now
-     controls <varname>debug_*</> output (Bruce)
+     <varname>log_min_messages</varname>/<varname>client_min_messages</varname> now
+     controls <varname>debug_*</varname> output (Bruce)
     </para>
     <para>
      This centralizes client debug information so all debug output
@@ -3589,15 +3589,15 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>
      Add new columns in <literal>pg_settings</literal>:
-     <literal>context</>, <literal>type</>, <literal>source</>,
-     <literal>min_val</>, <literal>max_val</> (Joe)
+     <literal>context</literal>, <literal>type</literal>, <literal>source</literal>,
+     <literal>min_val</literal>, <literal>max_val</literal> (Joe)
     </para>
    </listitem>
 
    <listitem>
     <para>
-     Make default <varname>shared_buffers</> 1000 and
-     <varname>max_connections</> 100, if possible (Tom)
+     Make default <varname>shared_buffers</varname> 1000 and
+     <varname>max_connections</varname> 100, if possible (Tom)
     </para>
     <para>
      Prior versions defaulted to 64 shared buffers so <productname>PostgreSQL</productname>
@@ -3612,7 +3612,7 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>
      New <filename>pg_hba.conf</filename> record type
-     <literal>hostnossl</> to prevent SSL connections (Jon
+     <literal>hostnossl</literal> to prevent SSL connections (Jon
      Jensen)
     </para>
     <para>
@@ -3675,7 +3675,7 @@ DROP SCHEMA information_schema CASCADE;
     <para>Add option to prevent auto-addition of tables referenced in query (Nigel J. Andrews)</para>
     <para>
      By default, tables mentioned in the query are automatically
-     added to the <literal>FROM</> clause if they are not already
+     added to the <literal>FROM</literal> clause if they are not already
      there.  This is compatible with historic
      <productname>POSTGRES</productname> behavior but is contrary to
      the SQL standard.  This option allows selecting
@@ -3692,9 +3692,9 @@ DROP SCHEMA information_schema CASCADE;
    </listitem>
 
    <listitem>
-    <para>Allow expressions to be used in <literal>LIMIT</>/<literal>OFFSET</> (Tom)</para>
+    <para>Allow expressions to be used in <literal>LIMIT</literal>/<literal>OFFSET</literal> (Tom)</para>
     <para>
-     In prior releases, <literal>LIMIT</>/<literal>OFFSET</> could
+     In prior releases, <literal>LIMIT</literal>/<literal>OFFSET</literal> could
      only use constants, not expressions.
     </para>
    </listitem>
@@ -3780,7 +3780,7 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem><para>Improve automatic type casting for domains (Rod, Tom)</para></listitem>
    <listitem><para>Allow dollar signs in identifiers, except as first character (Tom)</para></listitem>
-   <listitem><para>Disallow dollar signs in operator names, so <literal>x=$1</> works (Tom)</para></listitem>
+   <listitem><para>Disallow dollar signs in operator names, so <literal>x=$1</literal> works (Tom)</para></listitem>
 
    <listitem>
     <para>
@@ -3863,9 +3863,9 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Implement SQL-compatible options <literal>FIRST</>,
-     <literal>LAST</>, <literal>ABSOLUTE <replaceable>n</></>,
-     <literal>RELATIVE <replaceable>n</></> for
+     Implement SQL-compatible options <literal>FIRST</literal>,
+     <literal>LAST</literal>, <literal>ABSOLUTE <replaceable>n</replaceable></literal>,
+     <literal>RELATIVE <replaceable>n</replaceable></literal> for
      <command>FETCH</command> and <command>MOVE</command> (Tom)
     </para>
    </listitem>
@@ -3888,18 +3888,18 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem><para>Prevent <command>CLUSTER</command> on partial indexes (Tom)</para></listitem>
 
-   <listitem><para>Allow DOS and Mac line-endings in <command>COPY</> files (Bruce)</para></listitem>
+   <listitem><para>Allow DOS and Mac line-endings in <command>COPY</command> files (Bruce)</para></listitem>
 
    <listitem>
     <para>
      Disallow literal carriage return as a data value,
-     backslash-carriage-return and <literal>\r</> are still allowed
+     backslash-carriage-return and <literal>\r</literal> are still allowed
      (Bruce)
     </para>
    </listitem>
 
    <listitem>
-    <para><command>COPY</> changes (binary, <literal>\.</>) (Tom)</para>
+    <para><command>COPY</command> changes (binary, <literal>\.</literal>) (Tom)</para>
    </listitem>
 
    <listitem>
@@ -3965,7 +3965,7 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Improve reliability of <command>LISTEN</>/<command>NOTIFY</> (Tom)
+     Improve reliability of <command>LISTEN</command>/<command>NOTIFY</command> (Tom)
     </para>
    </listitem>
 
@@ -3976,8 +3976,8 @@ DROP SCHEMA information_schema CASCADE;
      requirement of a standalone session, which was necessary in
      previous releases. The only tables that now require a standalone
      session for reindexing are the global system tables
-     <literal>pg_database</>, <literal>pg_shadow</>, and
-     <literal>pg_group</>.
+     <literal>pg_database</literal>, <literal>pg_shadow</literal>, and
+     <literal>pg_group</literal>.
     </para>
    </listitem>
   </itemizedlist>
@@ -4003,14 +4003,14 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Remove rarely used functions <function>oidrand</>,
-     <function>oidsrand</>, and <function>userfntest</> functions
+     Remove rarely used functions <function>oidrand</function>,
+     <function>oidsrand</function>, and <function>userfntest</function> functions
      (Neil)
     </para>
    </listitem>
 
    <listitem>
-    <para>Add <function>md5()</> function to main server, already in <filename>contrib/pgcrypto</filename> (Joe)</para>
+    <para>Add <function>md5()</function> function to main server, already in <filename>contrib/pgcrypto</filename> (Joe)</para>
     <para>
      An MD5 function was frequently requested. For more complex
      encryption capabilities, use
@@ -4067,8 +4067,8 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>
      Allow <literal>WHERE</literal> qualification
-     <literal><replaceable>expr</> <replaceable>op</> ANY/SOME/ALL
-     (<replaceable>array_expr</>)</literal> (Joe)
+     <literal><replaceable>expr</replaceable> <replaceable>op</replaceable> ANY/SOME/ALL
+     (<replaceable>array_expr</replaceable>)</literal> (Joe)
     </para>
     <para>
      This allows arrays to behave like a list of values, for purposes
@@ -4079,10 +4079,10 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     New array functions <function>array_append</>,
-     <function>array_cat</>, <function>array_lower</>,
-     <function>array_prepend</>, <function>array_to_string</>,
-     <function>array_upper</>, <function>string_to_array</> (Joe)
+     New array functions <function>array_append</function>,
+     <function>array_cat</function>, <function>array_lower</function>,
+     <function>array_prepend</function>, <function>array_to_string</function>,
+     <function>array_upper</function>, <function>string_to_array</function> (Joe)
     </para>
    </listitem>
 
@@ -4107,14 +4107,14 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>
      Trim trailing spaces when <type>char</type> is cast to
-     <type>varchar</> or <type>text</> (Tom)
+     <type>varchar</type> or <type>text</type> (Tom)
     </para>
    </listitem>
 
    <listitem>
     <para>
-     Make <type>float(<replaceable>p</>)</> measure the precision
-     <replaceable>p</> in binary digits, not decimal digits
+     Make <type>float(<replaceable>p</replaceable>)</type> measure the precision
+     <replaceable>p</replaceable> in binary digits, not decimal digits
      (Tom)
     </para>
    </listitem>
@@ -4164,9 +4164,9 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Add new <varname>datestyle</varname> values <literal>MDY</>,
-     <literal>DMY</>, and <literal>YMD</> to set input field order;
-     honor <literal>US</> and <literal>European</> for backward
+     Add new <varname>datestyle</varname> values <literal>MDY</literal>,
+     <literal>DMY</literal>, and <literal>YMD</literal> to set input field order;
+     honor <literal>US</literal> and <literal>European</literal> for backward
      compatibility (Tom)
     </para>
    </listitem>
@@ -4182,10 +4182,10 @@ DROP SCHEMA information_schema CASCADE;
    </listitem>
 
    <listitem>
-    <para>Treat NaN as larger than any other value in <function>min()</>/<function>max()</> (Tom)</para>
+    <para>Treat NaN as larger than any other value in <function>min()</function>/<function>max()</function> (Tom)</para>
     <para>
      NaN was already sorted after ordinary numeric values for most
-     purposes, but <function>min()</> and <function>max()</> didn't
+     purposes, but <function>min()</function> and <function>max()</function> didn't
      get this right.
     </para>
    </listitem>
@@ -4203,7 +4203,7 @@ DROP SCHEMA information_schema CASCADE;
    </listitem>
 
    <listitem>
-    <para>Allow time to be specified as <literal>040506</> or <literal>0405</> (Tom)</para>
+    <para>Allow time to be specified as <literal>040506</literal> or <literal>0405</literal> (Tom)</para>
    </listitem>
 
    <listitem>
@@ -4275,7 +4275,7 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Add new parameter <literal>$0</> in PL/pgSQL representing the
+     Add new parameter <literal>$0</literal> in PL/pgSQL representing the
      function's actual return type (Joe)
     </para>
    </listitem>
@@ -4310,12 +4310,12 @@ DROP SCHEMA information_schema CASCADE;
    </listitem>
 
    <listitem><para>Improve tab completion (Rod, Ross Reedstrom, Ian Barwick)</para></listitem>
-   <listitem><para>Reorder <literal>\?</> help into groupings (Harald Armin Massa, Bruce)</para></listitem>
+   <listitem><para>Reorder <literal>\?</literal> help into groupings (Harald Armin Massa, Bruce)</para></listitem>
    <listitem><para>Add backslash commands for listing schemas, casts, and conversions (Christopher)</para></listitem>
 
    <listitem>
     <para>
-     <command>\encoding</> now changes based on the server parameter
+     <command>\encoding</command> now changes based on the server parameter
      <varname>client_encoding</varname> (Tom)
     </para>
     <para>
@@ -4328,7 +4328,7 @@ DROP SCHEMA information_schema CASCADE;
    <listitem>
     <para>Save editor buffer into readline history (Ross)</para>
     <para>
-     When <command>\e</> is used to edit a query, the result is saved
+     When <command>\e</command> is used to edit a query, the result is saved
      in the readline history for retrieval using the up arrow.
     </para>
    </listitem>
@@ -4373,14 +4373,14 @@ DROP SCHEMA information_schema CASCADE;
 
    <listitem>
     <para>
-     Have pg_dumpall use <command>GRANT</>/<command>REVOKE</> to dump database-level privileges (Tom)
+     Have pg_dumpall use <command>GRANT</command>/<command>REVOKE</command> to dump database-level privileges (Tom)
     </para>
    </listitem>
 
    <listitem>
     <para>
-     Allow pg_dumpall to support the options <option>-a</>,
-     <option>-s</>, <option>-x</> of pg_dump (Tom)
+     Allow pg_dumpall to support the options <option>-a</option>,
+     <option>-s</option>, <option>-x</option> of pg_dump (Tom)
     </para>
    </listitem>
 
@@ -4565,7 +4565,7 @@ DROP SCHEMA information_schema CASCADE;
    <listitem><para>Allow libpq to compile with Borland C++ compiler (Lester Godwin, Karl Waclawek)</para></listitem>
    <listitem><para>Use our own version of <function>getopt_long()</function> if needed (Peter)</para></listitem>
    <listitem><para>Convert administration scripts to C (Peter)</para></listitem>
-   <listitem><para> Bison &gt;= 1.85 is now required to build the <productname>PostgreSQL</> grammar, if building from CVS</para></listitem>
+   <listitem><para> Bison &gt;= 1.85 is now required to build the <productname>PostgreSQL</productname> grammar, if building from CVS</para></listitem>
    <listitem><para>Merge documentation into one book (Peter)</para></listitem>
    <listitem><para>Add Windows compatibility functions (Bruce)</para></listitem>
    <listitem><para>Allow client interfaces to compile under MinGW (Bruce)</para></listitem>
@@ -4605,16 +4605,16 @@ DROP SCHEMA information_schema CASCADE;
    <listitem><para>Update btree_gist (Oleg)</para></listitem>
    <listitem><para>New tsearch2 full-text search module (Oleg, Teodor)</para></listitem>
    <listitem><para>Add hash-based crosstab function to tablefuncs (Joe)</para></listitem>
-   <listitem><para>Add serial column to order <function>connectby()</> siblings in tablefuncs (Nabil Sayegh,Joe)</para></listitem>
+   <listitem><para>Add serial column to order <function>connectby()</function> siblings in tablefuncs (Nabil Sayegh,Joe)</para></listitem>
    <listitem><para>Add named persistent connections to dblink (Shridhar Daithanka)</para></listitem>
    <listitem><para>New pg_autovacuum allows automatic <command>VACUUM</command> (Matthew T. O'Connor)</para></listitem>
-   <listitem><para>Make pgbench honor environment variables <envar>PGHOST</>, <envar>PGPORT</>, <envar>PGUSER</> (Tatsuo)</para></listitem>
+   <listitem><para>Make pgbench honor environment variables <envar>PGHOST</envar>, <envar>PGPORT</envar>, <envar>PGUSER</envar> (Tatsuo)</para></listitem>
    <listitem><para>Improve intarray (Teodor Sigaev)</para></listitem>
    <listitem><para>Improve pgstattuple (Rod)</para></listitem>
    <listitem><para>Fix bug in <function>metaphone()</function> in fuzzystrmatch</para></listitem>
    <listitem><para>Improve adddepend (Rod)</para></listitem>
    <listitem><para>Update spi/timetravel (B&ouml;jthe Zolt&aacute;n)</para></listitem>
-   <listitem><para>Fix dbase <option>-s</> option and improve non-ASCII handling (Thomas Behr, M&aacute;rcio Smiderle)</para></listitem>
+   <listitem><para>Fix dbase <option>-s</option> option and improve non-ASCII handling (Thomas Behr, M&aacute;rcio Smiderle)</para></listitem>
    <listitem><para>Remove array module because features now included by default (Joe)</para></listitem>
   </itemizedlist>
  </sect3>
diff --git a/doc/src/sgml/release-8.0.sgml b/doc/src/sgml/release-8.0.sgml
index 0f43e24b1d..6171e0d1ee 100644
--- a/doc/src/sgml/release-8.0.sgml
+++ b/doc/src/sgml/release-8.0.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 8.0.25.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 8.0.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -27,7 +27,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
-    see <xref linkend="release-8-0-22">.
+    see <xref linkend="release-8-0-22"/>.
    </para>
 
   </sect2>
@@ -47,7 +47,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -76,7 +76,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -104,7 +104,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -130,7 +130,7 @@
 
     <listitem>
      <para>
-      Fix <varname>log_line_prefix</>'s <literal>%i</> escape,
+      Fix <varname>log_line_prefix</varname>'s <literal>%i</literal> escape,
       which could produce junk early in backend startup (Tom Lane)
      </para>
     </listitem>
@@ -138,28 +138,28 @@
     <listitem>
      <para>
       Fix possible data corruption in <command>ALTER TABLE ... SET
-      TABLESPACE</> when archiving is enabled (Jeff Davis)
+      TABLESPACE</command> when archiving is enabled (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>CREATE DATABASE</> and <command>ALTER DATABASE ... SET
-      TABLESPACE</> to be interrupted by query-cancel (Guillaume Lelarge)
+      Allow <command>CREATE DATABASE</command> and <command>ALTER DATABASE ... SET
+      TABLESPACE</command> to be interrupted by query-cancel (Guillaume Lelarge)
      </para>
     </listitem>
 
     <listitem>
      <para>
       In PL/Python, defend against null pointer results from
-      <function>PyCObject_AsVoidPtr</> and <function>PyCObject_FromVoidPtr</>
+      <function>PyCObject_AsVoidPtr</function> and <function>PyCObject_FromVoidPtr</function>
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -167,13 +167,13 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle connection names longer than
+      Fix <filename>contrib/dblink</filename> to handle connection names longer than
       62 bytes correctly (Itagaki Takahiro)
      </para>
     </listitem>
@@ -187,7 +187,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010l
+      Update time zone data files to <application>tzdata</application> release 2010l
       for DST law changes in Egypt and Palestine; also historical corrections
       for Finland.
      </para>
@@ -216,11 +216,11 @@
   <para>
    This release contains a variety of fixes from 8.0.24.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.0.X release series in July 2010.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -231,7 +231,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
-    see <xref linkend="release-8-0-22">.
+    see <xref linkend="release-8-0-22"/>.
    </para>
 
   </sect2>
@@ -243,19 +243,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -264,19 +264,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -289,10 +289,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -300,7 +300,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -312,7 +312,7 @@
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -325,14 +325,14 @@
 
     <listitem>
      <para>
-      Prevent infinite recursion in <application>psql</> when expanding
+      Prevent infinite recursion in <application>psql</application> when expanding
       a variable that refers to itself (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -340,7 +340,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -353,7 +353,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010j
+      Update time zone data files to <application>tzdata</application> release 2010j
       for DST law changes in Argentina, Australian Antarctic, Bangladesh,
       Mexico, Morocco, Pakistan, Palestine, Russia, Syria, Tunisia;
       also historical corrections for Taiwan.
@@ -376,11 +376,11 @@
   <para>
    This release contains a variety of fixes from 8.0.23.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.0.X release series in July 2010.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -391,7 +391,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
-    see <xref linkend="release-8-0-22">.
+    see <xref linkend="release-8-0-22"/>.
    </para>
 
   </sect2>
@@ -403,7 +403,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -432,8 +432,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -459,7 +459,7 @@
 
     <listitem>
      <para>
-      Fix the <literal>STOP WAL LOCATION</> entry in backup history files to
+      Fix the <literal>STOP WAL LOCATION</literal> entry in backup history files to
       report the next WAL segment's name when the end location is exactly at a
       segment boundary (Itagaki Takahiro)
      </para>
@@ -467,17 +467,17 @@
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -485,7 +485,7 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
@@ -499,7 +499,7 @@
 
     <listitem>
      <para>
-      Add <literal>volatile</> markings in PL/Python to avoid possible
+      Add <literal>volatile</literal> markings in PL/Python to avoid possible
       compiler-specific misbehavior (Zdenek Kotala)
      </para>
     </listitem>
@@ -511,28 +511,28 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted crashes in <filename>contrib/xml2</> caused by sloppy
+      Fix assorted crashes in <filename>contrib/xml2</filename> caused by sloppy
       memory management (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010e
+      Update time zone data files to <application>tzdata</application> release 2010e
       for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.
      </para>
     </listitem>
@@ -553,7 +553,7 @@
   <para>
    This release contains a variety of fixes from 8.0.22.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -562,7 +562,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.22,
-    see <xref linkend="release-8-0-22">.
+    see <xref linkend="release-8-0-22"/>.
    </para>
 
   </sect2>
@@ -604,14 +604,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -630,7 +630,7 @@
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -649,7 +649,7 @@
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -664,20 +664,20 @@
 
     <listitem>
      <para>
-      Ensure <application>psql</>'s flex module is compiled with the correct
+      Ensure <application>psql</application>'s flex module is compiled with the correct
       system header definitions (Tom)
      </para>
 
      <para>
       This fixes build failures on platforms where
-      <literal>--enable-largefile</> causes incompatible changes in the
+      <literal>--enable-largefile</literal> causes incompatible changes in the
       generated code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -685,7 +685,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009s
+      Update time zone data files to <application>tzdata</application> release 2009s
       for DST law changes in Antarctica, Argentina, Bangladesh, Fiji,
       Novokuznetsk, Pakistan, Palestine, Samoa, Syria; also historical
       corrections for Hong Kong.
@@ -708,7 +708,7 @@
   <para>
    This release contains a variety of fixes from 8.0.21.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -716,10 +716,10 @@
 
    <para>
     A dump/restore is not required for those running 8.0.X.
-    However, if you have any hash indexes on <type>interval</> columns,
-    you must <command>REINDEX</> them after updating to 8.0.22.
+    However, if you have any hash indexes on <type>interval</type> columns,
+    you must <command>REINDEX</command> them after updating to 8.0.22.
     Also, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -731,14 +731,14 @@
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
@@ -752,32 +752,32 @@
 
     <listitem>
      <para>
-      Fix hash calculation for data type <type>interval</> (Tom)
+      Fix hash calculation for data type <type>interval</type> (Tom)
      </para>
 
      <para>
       This corrects wrong results for hash joins on interval values.
       It also changes the contents of hash indexes on interval columns.
-      If you have any such indexes, you must <command>REINDEX</> them
+      If you have any such indexes, you must <command>REINDEX</command> them
       after updating.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Treat <function>to_char(..., 'TH')</> as an uppercase ordinal
-      suffix with <literal>'HH'</>/<literal>'HH12'</> (Heikki)
+      Treat <function>to_char(..., 'TH')</function> as an uppercase ordinal
+      suffix with <literal>'HH'</literal>/<literal>'HH12'</literal> (Heikki)
      </para>
 
      <para>
-      It was previously handled as <literal>'th'</> (lowercase).
+      It was previously handled as <literal>'th'</literal> (lowercase).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -794,7 +794,7 @@
 
     <listitem>
      <para>
-      Fix <type>money</> data type to work in locales where currency
+      Fix <type>money</type> data type to work in locales where currency
       amounts have no fractional digits, e.g. Japan (Itagaki Takahiro)
      </para>
     </listitem>
@@ -802,7 +802,7 @@
     <listitem>
      <para>
       Properly round datetime input like
-      <literal>00:12:57.9999999999999999999999999999</> (Tom)
+      <literal>00:12:57.9999999999999999999999999999</literal> (Tom)
      </para>
     </listitem>
 
@@ -821,22 +821,22 @@
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to not go into an infinite loop if
-      <filename>postgresql.conf</> is empty (Jeff Davis)
+      Fix <application>pg_ctl</application> to not go into an infinite loop if
+      <filename>postgresql.conf</filename> is empty (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s <function>xslt_process()</> to
+      Fix <filename>contrib/xml2</filename>'s <function>xslt_process()</function> to
       properly handle the maximum number of parameters (twenty) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -849,7 +849,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009l
+      Update time zone data files to <application>tzdata</application> release 2009l
       for DST law changes in Bangladesh, Egypt, Jordan, Pakistan,
       Argentina/San_Luis, Cuba, Jordan (historical correction only),
       Mauritius, Morocco, Palestine, Syria, Tunisia.
@@ -872,7 +872,7 @@
   <para>
    This release contains a variety of fixes from 8.0.20.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -881,7 +881,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -900,7 +900,7 @@
       This change extends fixes made in the last two minor releases for
       related failure scenarios.  The previous fixes were narrowly tailored
       for the original problem reports, but we have now recognized that
-      <emphasis>any</> error thrown by an encoding conversion function could
+      <emphasis>any</emphasis> error thrown by an encoding conversion function could
       potentially lead to infinite recursion while trying to report the
       error.  The solution therefore is to disable translation and encoding
       conversion and report the plain-ASCII form of any error message,
@@ -911,7 +911,7 @@
 
     <listitem>
      <para>
-      Disallow <command>CREATE CONVERSION</> with the wrong encodings
+      Disallow <command>CREATE CONVERSION</command> with the wrong encodings
       for the specified conversion function (Heikki)
      </para>
 
@@ -924,14 +924,14 @@
 
     <listitem>
      <para>
-      Fix core dump when <function>to_char()</> is given format codes that
+      Fix core dump when <function>to_char()</function> is given format codes that
       are inappropriate for the type of the data argument (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>MUST</> (Mauritius Island Summer Time) to the default list
+      Add <literal>MUST</literal> (Mauritius Island Summer Time) to the default list
       of known timezone abbreviations (Xavier Bugaud)
      </para>
     </listitem>
@@ -952,7 +952,7 @@
   <para>
    This release contains a variety of fixes from 8.0.19.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -961,7 +961,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -973,13 +973,13 @@
 
     <listitem>
      <para>
-      Improve handling of URLs in <function>headline()</> function (Teodor)
+      Improve handling of URLs in <function>headline()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of overlength headlines in <function>headline()</>
+      Improve handling of overlength headlines in <function>headline()</function>
       function (Teodor)
      </para>
     </listitem>
@@ -994,30 +994,30 @@
 
     <listitem>
      <para>
-      Avoid unnecessary locking of small tables in <command>VACUUM</>
+      Avoid unnecessary locking of small tables in <command>VACUUM</command>
       (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix uninitialized variables in <filename>contrib/tsearch2</>'s
-      <function>get_covers()</> function (Teodor)
+      Fix uninitialized variables in <filename>contrib/tsearch2</filename>'s
+      <function>get_covers()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make all documentation reference <literal>pgsql-bugs</> and/or
-      <literal>pgsql-hackers</> as appropriate, instead of the
-      now-decommissioned <literal>pgsql-ports</> and <literal>pgsql-patches</>
+      Make all documentation reference <literal>pgsql-bugs</literal> and/or
+      <literal>pgsql-hackers</literal> as appropriate, instead of the
+      now-decommissioned <literal>pgsql-ports</literal> and <literal>pgsql-patches</literal>
       mailing lists (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009a (for
+      Update time zone data files to <application>tzdata</application> release 2009a (for
       Kathmandu and historical DST corrections in Switzerland, Cuba)
      </para>
     </listitem>
@@ -1038,7 +1038,7 @@
   <para>
    This release contains a variety of fixes from 8.0.18.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1047,7 +1047,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1065,7 +1065,7 @@
 
      <para>
       We have addressed similar issues before, but it would still fail if
-      the <quote>character has no equivalent</> message itself couldn't
+      the <quote>character has no equivalent</quote> message itself couldn't
       be converted.  The fix is to disable localization and send the plain
       ASCII error message when we detect such a situation.
      </para>
@@ -1095,14 +1095,14 @@
     <listitem>
      <para>
       Fix improper display of fractional seconds in interval values when
-      using a non-ISO datestyle in an <option>--enable-integer-datetimes</>
+      using a non-ISO datestyle in an <option>--enable-integer-datetimes</option>
       build (Ron Mayer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>SPI_getvalue</> and <function>SPI_getbinval</>
+      Ensure <function>SPI_getvalue</function> and <function>SPI_getbinval</function>
       behave correctly when the passed tuple and tuple descriptor have
       different numbers of columns (Tom)
      </para>
@@ -1116,19 +1116,19 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s parsing of <command>CREATE USER</> (Michael)
+      Fix <application>ecpg</application>'s parsing of <command>CREATE USER</command> (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix recent breakage of <literal>pg_ctl restart</> (Tom)
+      Fix recent breakage of <literal>pg_ctl restart</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008i (for
+      Update time zone data files to <application>tzdata</application> release 2008i (for
       DST law changes in Argentina, Brazil, Mauritius, Syria)
      </para>
     </listitem>
@@ -1149,7 +1149,7 @@
   <para>
    This release contains a variety of fixes from 8.0.17.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1158,7 +1158,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1176,19 +1176,19 @@
      <para>
       This responds to reports that the counters could overflow in
       sufficiently long transactions, leading to unexpected <quote>lock is
-      already held</> errors.
+      already held</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Add checks in executor startup to ensure that the tuples produced by an
-      <command>INSERT</> or <command>UPDATE</> will match the target table's
+      <command>INSERT</command> or <command>UPDATE</command> will match the target table's
       current rowtype (Tom)
      </para>
 
      <para>
-      <command>ALTER COLUMN TYPE</>, followed by re-use of a previously
+      <command>ALTER COLUMN TYPE</command>, followed by re-use of a previously
       cached plan, could produce this type of situation.  The check protects
       against data corruption and/or crashes that could ensue.
      </para>
@@ -1210,21 +1210,21 @@
     <listitem>
      <para>
       Fix bug in backwards scanning of a cursor on a <literal>SELECT DISTINCT
-      ON</> query (Tom)
+      ON</literal> query (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner to estimate that <literal>GROUP BY</> expressions yielding
+      Fix planner to estimate that <literal>GROUP BY</literal> expressions yielding
       boolean results always result in two groups, regardless of the
       expressions' contents (Tom)
      </para>
 
      <para>
       This is very substantially more accurate than the regular <literal>GROUP
-      BY</> estimate for certain boolean tests like <replaceable>col</>
-      <literal>IS NULL</>.
+      BY</literal> estimate for certain boolean tests like <replaceable>col</replaceable>
+      <literal>IS NULL</literal>.
      </para>
     </listitem>
 
@@ -1247,21 +1247,21 @@
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       error reporting after failure to send a SQL command (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to properly preserve postmaster
-      command-line arguments across a <literal>restart</> (Bruce)
+      Fix <application>pg_ctl</application> to properly preserve postmaster
+      command-line arguments across a <literal>restart</literal> (Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008f (for
+      Update time zone data files to <application>tzdata</application> release 2008f (for
       DST law changes in Argentina, Bahamas, Brazil, Mauritius, Morocco,
       Pakistan, Palestine, and Paraguay)
      </para>
@@ -1283,7 +1283,7 @@
   <para>
    This release contains one serious bug fix over 8.0.16.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1292,7 +1292,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1304,18 +1304,18 @@
 
     <listitem>
      <para>
-      Make <function>pg_get_ruledef()</> parenthesize negative constants (Tom)
+      Make <function>pg_get_ruledef()</function> parenthesize negative constants (Tom)
      </para>
 
      <para>
       Before this fix, a negative constant in a view or rule might be dumped
-      as, say, <literal>-42::integer</>, which is subtly incorrect: it should
-      be <literal>(-42)::integer</> due to operator precedence rules.
+      as, say, <literal>-42::integer</literal>, which is subtly incorrect: it should
+      be <literal>(-42)::integer</literal> due to operator precedence rules.
       Usually this would make little difference, but it could interact with
       another recent patch to cause
-      <productname>PostgreSQL</> to reject what had been a valid
-      <command>SELECT DISTINCT</> view query.  Since this could result in
-      <application>pg_dump</> output failing to reload, it is being treated
+      <productname>PostgreSQL</productname> to reject what had been a valid
+      <command>SELECT DISTINCT</command> view query.  Since this could result in
+      <application>pg_dump</application> output failing to reload, it is being treated
       as a high-priority fix.  The only released versions in which dump
       output is actually incorrect are 8.3.1 and 8.2.7.
      </para>
@@ -1337,7 +1337,7 @@
   <para>
    This release contains a variety of fixes from 8.0.15.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1346,7 +1346,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.
     However, if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1358,7 +1358,7 @@
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</> so that the new
+      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</command> so that the new
       column is correctly checked to see if it's been initialized to all
       non-nulls (Brendan Jurd)
      </para>
@@ -1370,8 +1370,8 @@
 
     <listitem>
      <para>
-      Fix possible <command>CREATE TABLE</> failure when inheriting the
-      <quote>same</> constraint from multiple parent relations that
+      Fix possible <command>CREATE TABLE</command> failure when inheriting the
+      <quote>same</quote> constraint from multiple parent relations that
       inherited that constraint from a common ancestor (Tom)
      </para>
     </listitem>
@@ -1379,7 +1379,7 @@
     <listitem>
      <para>
       Fix conversions between ISO-8859-5 and other encodings to handle
-      Cyrillic <quote>Yo</> characters (<literal>e</> and <literal>E</> with
+      Cyrillic <quote>Yo</quote> characters (<literal>e</literal> and <literal>E</literal> with
       two dots) (Sergey Burladyan)
      </para>
     </listitem>
@@ -1394,7 +1394,7 @@
      <para>
       This could lead to failures in which two apparently identical literal
       values were not seen as equal, resulting in the parser complaining
-      about unmatched <literal>ORDER BY</> and <literal>DISTINCT</>
+      about unmatched <literal>ORDER BY</literal> and <literal>DISTINCT</literal>
       expressions.
      </para>
     </listitem>
@@ -1402,24 +1402,24 @@
     <listitem>
      <para>
       Fix a corner case in regular-expression substring matching
-      (<literal>substring(<replaceable>string</> from
-      <replaceable>pattern</>)</literal>) (Tom)
+      (<literal>substring(<replaceable>string</replaceable> from
+      <replaceable>pattern</replaceable>)</literal>) (Tom)
      </para>
 
      <para>
       The problem occurs when there is a match to the pattern overall but
       the user has specified a parenthesized subexpression and that
       subexpression hasn't got a match.  An example is
-      <literal>substring('foo' from 'foo(bar)?')</>.
-      This should return NULL, since <literal>(bar)</> isn't matched, but
+      <literal>substring('foo' from 'foo(bar)?')</literal>.
+      This should return NULL, since <literal>(bar)</literal> isn't matched, but
       it was mistakenly returning the whole-pattern match instead (ie,
-      <literal>foo</>).
+      <literal>foo</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008c (for
+      Update time zone data files to <application>tzdata</application> release 2008c (for
       DST law changes in Morocco, Iraq, Choibalsan, Pakistan, Syria, Cuba,
       Argentina/San_Luis, and Chile)
      </para>
@@ -1427,34 +1427,34 @@
 
     <listitem>
      <para>
-      Fix incorrect result from <application>ecpg</>'s
-      <function>PGTYPEStimestamp_sub()</> function (Michael)
+      Fix incorrect result from <application>ecpg</application>'s
+      <function>PGTYPEStimestamp_sub()</function> function (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix core dump in <filename>contrib/xml2</>'s
-      <function>xpath_table()</> function when the input query returns a
+      Fix core dump in <filename>contrib/xml2</filename>'s
+      <function>xpath_table()</function> function when the input query returns a
       NULL value (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s makefile to not override
-      <literal>CFLAGS</> (Tom)
+      Fix <filename>contrib/xml2</filename>'s makefile to not override
+      <literal>CFLAGS</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>DatumGetBool</> macro to not fail with <application>gcc</>
+      Fix <literal>DatumGetBool</literal> macro to not fail with <application>gcc</application>
       4.3 (Tom)
      </para>
 
      <para>
-      This problem affects <quote>old style</> (V0) C functions that
+      This problem affects <quote>old style</quote> (V0) C functions that
       return boolean.  The fix is already in 8.3, but the need to
       back-patch it was not realized at the time.
      </para>
@@ -1462,21 +1462,21 @@
 
     <listitem>
      <para>
-      Fix longstanding <command>LISTEN</>/<command>NOTIFY</>
+      Fix longstanding <command>LISTEN</command>/<command>NOTIFY</command>
       race condition (Tom)
      </para>
 
      <para>
       In rare cases a session that had just executed a
-      <command>LISTEN</> might not get a notification, even though
+      <command>LISTEN</command> might not get a notification, even though
       one would be expected because the concurrent transaction executing
-      <command>NOTIFY</> was observed to commit later.
+      <command>NOTIFY</command> was observed to commit later.
      </para>
 
      <para>
       A side effect of the fix is that a transaction that has executed
-      a not-yet-committed <command>LISTEN</> command will not see any
-      row in <structname>pg_listener</> for the <command>LISTEN</>,
+      a not-yet-committed <command>LISTEN</command> command will not see any
+      row in <structname>pg_listener</structname> for the <command>LISTEN</command>,
       should it choose to look; formerly it would have.  This behavior
       was never documented one way or the other, but it is possible that
       some applications depend on the old behavior.
@@ -1502,19 +1502,19 @@
 
     <listitem>
      <para>
-      Fix <quote>unrecognized node type</> error in some variants of
-      <command>ALTER OWNER</> (Tom)
+      Fix <quote>unrecognized node type</quote> error in some variants of
+      <command>ALTER OWNER</command> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to correctly extract the postmaster's port
+      Fix <application>pg_ctl</application> to correctly extract the postmaster's port
       number from command-line options (Itagaki Takahiro, Tom)
      </para>
 
      <para>
-      Previously, <literal>pg_ctl start -w</> could try to contact the
+      Previously, <literal>pg_ctl start -w</literal> could try to contact the
       postmaster on the wrong port, leading to bogus reports of startup
       failure.
      </para>
@@ -1522,20 +1522,20 @@
 
     <listitem>
      <para>
-      Use <option>-fwrapv</> to defend against possible misoptimization
-      in recent <application>gcc</> versions (Tom)
+      Use <option>-fwrapv</option> to defend against possible misoptimization
+      in recent <application>gcc</application> versions (Tom)
      </para>
 
      <para>
-      This is known to be necessary when building <productname>PostgreSQL</>
-      with <application>gcc</> 4.3 or later.
+      This is known to be necessary when building <productname>PostgreSQL</productname>
+      with <application>gcc</application> 4.3 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix display of constant expressions in <literal>ORDER BY</>
-      and <literal>GROUP BY</> (Tom)
+      Fix display of constant expressions in <literal>ORDER BY</literal>
+      and <literal>GROUP BY</literal> (Tom)
      </para>
 
      <para>
@@ -1547,7 +1547,7 @@
 
     <listitem>
      <para>
-      Fix <application>libpq</> to handle NOTICE messages correctly
+      Fix <application>libpq</application> to handle NOTICE messages correctly
       during COPY OUT (Tom)
      </para>
 
@@ -1575,12 +1575,12 @@
    This release contains a variety of fixes from 8.0.14,
    including fixes for significant security issues.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <para>
-   This is the last 8.0.X release for which the <productname>PostgreSQL</>
-   community will produce binary packages for <productname>Windows</>.
+   This is the last 8.0.X release for which the <productname>PostgreSQL</productname>
+   community will produce binary packages for <productname>Windows</productname>.
    Windows users are encouraged to move to 8.2.X or later,
    since there are Windows-specific fixes in 8.2.X that
    are impractical to back-port.  8.0.X will continue to
@@ -1593,7 +1593,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1606,7 +1606,7 @@
     <listitem>
      <para>
       Prevent functions in indexes from executing with the privileges of
-      the user running <command>VACUUM</>, <command>ANALYZE</>, etc (Tom)
+      the user running <command>VACUUM</command>, <command>ANALYZE</command>, etc (Tom)
      </para>
 
      <para>
@@ -1617,18 +1617,18 @@
       (Note that triggers, defaults, check constraints, etc. pose the
       same type of risk.)  But functions in indexes pose extra danger
       because they will be executed by routine maintenance operations
-      such as <command>VACUUM FULL</>, which are commonly performed
+      such as <command>VACUUM FULL</command>, which are commonly performed
       automatically under a superuser account.  For example, a nefarious user
       can execute code with superuser privileges by setting up a
       trojan-horse index definition and waiting for the next routine vacuum.
       The fix arranges for standard maintenance operations
-      (including <command>VACUUM</>, <command>ANALYZE</>, <command>REINDEX</>,
-      and <command>CLUSTER</>) to execute as the table owner rather than
+      (including <command>VACUUM</command>, <command>ANALYZE</command>, <command>REINDEX</command>,
+      and <command>CLUSTER</command>) to execute as the table owner rather than
       the calling user, using the same privilege-switching mechanism already
-      used for <literal>SECURITY DEFINER</> functions.  To prevent bypassing
+      used for <literal>SECURITY DEFINER</literal> functions.  To prevent bypassing
       this security measure, execution of <command>SET SESSION
-      AUTHORIZATION</> and <command>SET ROLE</> is now forbidden within a
-      <literal>SECURITY DEFINER</> context.  (CVE-2007-6600)
+      AUTHORIZATION</command> and <command>SET ROLE</command> is now forbidden within a
+      <literal>SECURITY DEFINER</literal> context.  (CVE-2007-6600)
      </para>
     </listitem>
 
@@ -1648,20 +1648,20 @@
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
 
      <para>
       The fix that appeared for this in 8.0.14 was incomplete, as it plugged
-      the hole for only some <filename>dblink</> functions.  (CVE-2007-6601,
+      the hole for only some <filename>dblink</filename> functions.  (CVE-2007-6601,
       CVE-2007-3278)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2007k
+      Update time zone data files to <application>tzdata</application> release 2007k
       (in particular, recent Argentina changes) (Tom)
      </para>
     </listitem>
@@ -1669,14 +1669,14 @@
     <listitem>
      <para>
       Fix planner failure in some cases of <literal>WHERE false AND var IN
-      (SELECT ...)</> (Tom)
+      (SELECT ...)</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Preserve the tablespace of indexes that are
-      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</> (Tom)
+      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</command> (Tom)
      </para>
     </listitem>
 
@@ -1695,27 +1695,27 @@
 
     <listitem>
      <para>
-      Make <command>VACUUM</> not use all of <varname>maintenance_work_mem</>
+      Make <command>VACUUM</command> not use all of <varname>maintenance_work_mem</varname>
       when the table is too small for it to be useful (Alvaro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential crash in <function>translate()</> when using a multibyte
+      Fix potential crash in <function>translate()</function> when using a multibyte
       database encoding (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</>
-      as <literal>int</> rather than <literal>char</> (Tom)
+      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</literal>
+      as <literal>int</literal> rather than <literal>char</literal> (Tom)
      </para>
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>macOS</> 10.5.
+      Perl did things this way ... until <productname>macOS</productname> 10.5.
      </para>
     </listitem>
 
@@ -1727,49 +1727,49 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to correctly handle inheritance child tables
+      Fix <application>pg_dump</application> to correctly handle inheritance child tables
       that have default expressions different from their parent's (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <application>ecpg</> parser fixes (Michael)
+      <application>ecpg</application> parser fixes (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/tablefunc</>'s <function>crosstab()</> handle
+      Make <filename>contrib/tablefunc</filename>'s <function>crosstab()</function> handle
       NULL rowid as a category in its own right, rather than crashing (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <type>tsvector</> and <type>tsquery</> output routines to
+      Fix <type>tsvector</type> and <type>tsquery</type> output routines to
       escape backslashes correctly (Teodor, Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash of <function>to_tsvector()</> on huge input strings (Teodor)
+      Fix crash of <function>to_tsvector()</function> on huge input strings (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require a specific version of <productname>Autoconf</> to be used
-      when re-generating the <command>configure</> script (Peter)
+      Require a specific version of <productname>Autoconf</productname> to be used
+      when re-generating the <command>configure</command> script (Peter)
      </para>
 
      <para>
       This affects developers and packagers only.  The change was made
       to prevent accidental use of untested combinations of
-      <productname>Autoconf</> and <productname>PostgreSQL</> versions.
+      <productname>Autoconf</productname> and <productname>PostgreSQL</productname> versions.
       You can remove the version check if you really want to use a
-      different <productname>Autoconf</> version, but it's
+      different <productname>Autoconf</productname> version, but it's
       your responsibility whether the result works or not.
      </para>
     </listitem>
@@ -1790,7 +1790,7 @@
   <para>
    This release contains a variety of fixes from 8.0.13.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1799,7 +1799,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1812,20 +1812,20 @@
     <listitem>
      <para>
       Prevent index corruption when a transaction inserts rows and
-      then aborts close to the end of a concurrent <command>VACUUM</>
+      then aborts close to the end of a concurrent <command>VACUUM</command>
       on the same table (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE DOMAIN ... DEFAULT NULL</> work properly (Tom)
+      Make <command>CREATE DOMAIN ... DEFAULT NULL</command> work properly (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix excessive logging of <acronym>SSL</> error messages (Tom)
+      Fix excessive logging of <acronym>SSL</acronym> error messages (Tom)
      </para>
     </listitem>
 
@@ -1838,7 +1838,7 @@
 
     <listitem>
      <para>
-      Fix crash when <varname>log_min_error_statement</> logging runs out
+      Fix crash when <varname>log_min_error_statement</varname> logging runs out
       of memory (Tom)
      </para>
     </listitem>
@@ -1851,7 +1851,7 @@
 
     <listitem>
      <para>
-      Prevent <command>CLUSTER</> from failing
+      Prevent <command>CLUSTER</command> from failing
       due to attempting to process temporary tables of other sessions (Alvaro)
      </para>
     </listitem>
@@ -1870,14 +1870,14 @@
 
     <listitem>
      <para>
-      Suppress timezone name (<literal>%Z</>) in log timestamps on Windows
+      Suppress timezone name (<literal>%Z</literal>) in log timestamps on Windows
       because of possible encoding mismatches (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
     </listitem>
@@ -1899,7 +1899,7 @@
    This release contains a variety of fixes from 8.0.12,
    including a security fix.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1908,7 +1908,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -1921,28 +1921,28 @@
     <listitem>
     <para>
      Support explicit placement of the temporary-table schema within
-     <varname>search_path</>, and disable searching it for functions
+     <varname>search_path</varname>, and disable searching it for functions
      and operators (Tom)
     </para>
     <para>
      This is needed to allow a security-definer function to set a
-     truly secure value of <varname>search_path</>.  Without it,
+     truly secure value of <varname>search_path</varname>.  Without it,
      an unprivileged SQL user can use temporary objects to execute code
      with the privileges of the security-definer function (CVE-2007-2138).
-     See <command>CREATE FUNCTION</> for more information.
+     See <command>CREATE FUNCTION</command> for more information.
     </para>
     </listitem>
 
     <listitem>
     <para>
-     <filename>/contrib/tsearch2</> crash fixes (Teodor)
+     <filename>/contrib/tsearch2</filename> crash fixes (Teodor)
     </para>
     </listitem>
 
     <listitem>
     <para>
-     Fix potential-data-corruption bug in how <command>VACUUM FULL</> handles
-     <command>UPDATE</> chains (Tom, Pavan Deolasee)
+     Fix potential-data-corruption bug in how <command>VACUUM FULL</command> handles
+     <command>UPDATE</command> chains (Tom, Pavan Deolasee)
     </para>
     </listitem>
 
@@ -1975,7 +1975,7 @@
   <para>
    This release contains one fix from 8.0.11.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -1984,7 +1984,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -2018,7 +2018,7 @@
    This release contains a variety of fixes from 8.0.10, including
    a security fix.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2027,7 +2027,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -2061,7 +2061,7 @@
 
     <listitem>
     <para>
-     Fix for rare Assert() crash triggered by <literal>UNION</> (Tom)
+     Fix for rare Assert() crash triggered by <literal>UNION</literal> (Tom)
     </para>
     </listitem>
 
@@ -2088,7 +2088,7 @@
   <para>
    This release contains a variety of fixes from 8.0.9.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2097,7 +2097,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -2109,7 +2109,7 @@
 
     <listitem>
      <para>
-      Improve handling of <function>getaddrinfo()</> on AIX (Tom)
+      Improve handling of <function>getaddrinfo()</function> on AIX (Tom)
      </para>
 
      <para>
@@ -2120,15 +2120,15 @@
 
      <listitem>
       <para>
-       Fix <quote>failed to re-find parent key</> errors in
-       <command>VACUUM</> (Tom)
+       Fix <quote>failed to re-find parent key</quote> errors in
+       <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Fix race condition for truncation of a large relation across a
-       gigabyte boundary by <command>VACUUM</> (Tom)
+       gigabyte boundary by <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
@@ -2146,7 +2146,7 @@
 
     <listitem>
      <para>
-      Fix error when constructing an <literal>ARRAY[]</> made up of multiple
+      Fix error when constructing an <literal>ARRAY[]</literal> made up of multiple
       empty elements (Tom)
      </para>
     </listitem>
@@ -2159,13 +2159,13 @@
 
     <listitem>
      <para>
-      <function>to_number()</> and <function>to_char(numeric)</>
-      are now <literal>STABLE</>, not <literal>IMMUTABLE</>, for
-      new <application>initdb</> installs (Tom)
+      <function>to_number()</function> and <function>to_char(numeric)</function>
+      are now <literal>STABLE</literal>, not <literal>IMMUTABLE</literal>, for
+      new <application>initdb</application> installs (Tom)
      </para>
 
      <para>
-      This is because <varname>lc_numeric</> can potentially
+      This is because <varname>lc_numeric</varname> can potentially
       change the output of these functions.
      </para>
     </listitem>
@@ -2176,7 +2176,7 @@
      </para>
 
      <para>
-      This improves <application>psql</> <literal>\d</> performance also.
+      This improves <application>psql</application> <literal>\d</literal> performance also.
      </para>
     </listitem>
 
@@ -2207,7 +2207,7 @@
   <para>
    This release contains a variety of fixes from 8.0.8.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2216,7 +2216,7 @@
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
   </sect2>
@@ -2225,28 +2225,28 @@
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Fix crash when referencing <literal>NEW</> row
+<listitem><para>Fix crash when referencing <literal>NEW</literal> row
 values in rule WHERE expressions (Tom)</para></listitem>
 <listitem><para>Fix core dump when an untyped literal is taken as
 ANYARRAY</para></listitem>
 <listitem><para>Fix mishandling of AFTER triggers when query contains a SQL
 function returning multiple rows (Tom)</para></listitem>
-<listitem><para>Fix <command>ALTER TABLE ... TYPE</> to recheck
-<literal>NOT NULL</> for <literal>USING</> clause (Tom)</para></listitem>
-<listitem><para>Fix <function>string_to_array()</> to handle overlapping
+<listitem><para>Fix <command>ALTER TABLE ... TYPE</command> to recheck
+<literal>NOT NULL</literal> for <literal>USING</literal> clause (Tom)</para></listitem>
+<listitem><para>Fix <function>string_to_array()</function> to handle overlapping
  matches for the separator string</para>
-<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</>.
+<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</literal>.
 </para></listitem>
 <listitem><para>Fix corner cases in pattern matching for
- <application>psql</>'s <literal>\d</> commands</para></listitem>
+ <application>psql</application>'s <literal>\d</literal> commands</para></listitem>
 <listitem><para>Fix index-corrupting bugs in /contrib/ltree
  (Teodor)</para></listitem>
-<listitem><para>Numerous robustness fixes in <application>ecpg</> (Joachim
+<listitem><para>Numerous robustness fixes in <application>ecpg</application> (Joachim
 Wieland)</para></listitem>
 <listitem><para>Fix backslash escaping in /contrib/dbmirror</para></listitem>
 <listitem><para>Fix instability of statistics collection on Win32 (Tom, Andrew)</para></listitem>
-<listitem><para>Fixes for <systemitem class="osname">AIX</> and
-<productname>Intel</> compilers (Tom)</para></listitem>
+<listitem><para>Fixes for <systemitem class="osname">AIX</systemitem> and
+<productname>Intel</productname> compilers (Tom)</para></listitem>
 </itemizedlist>
 
   </sect2>
@@ -2264,7 +2264,7 @@ Wieland)</para></listitem>
    This release contains a variety of fixes from 8.0.7,
    including patches for extremely serious security issues.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2273,7 +2273,7 @@ Wieland)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
 
    <para>
@@ -2283,9 +2283,9 @@ Wieland)</para></listitem>
     into SQL commands, you should examine them as soon as possible to
     ensure that they are using recommended escaping techniques.  In
     most cases, applications should be using subroutines provided by
-    libraries or drivers (such as <application>libpq</>'s
-    <function>PQescapeStringConn()</>) to perform string escaping,
-    rather than relying on <foreignphrase>ad hoc</> code to do it.
+    libraries or drivers (such as <application>libpq</application>'s
+    <function>PQescapeStringConn()</function>) to perform string escaping,
+    rather than relying on <foreignphrase>ad hoc</foreignphrase> code to do it.
    </para>
   </sect2>
 
@@ -2295,48 +2295,48 @@ Wieland)</para></listitem>
 <itemizedlist>
 <listitem><para>Change the server to reject invalidly-encoded multibyte
 characters in all cases (Tatsuo, Tom)</para>
-<para>While <productname>PostgreSQL</> has been moving in this direction for
+<para>While <productname>PostgreSQL</productname> has been moving in this direction for
 some time, the checks are now applied uniformly to all encodings and all
 textual input, and are now always errors not merely warnings.  This change
 defends against SQL-injection attacks of the type described in CVE-2006-2313.
 </para></listitem>
 
-<listitem><para>Reject unsafe uses of <literal>\'</> in string literals</para>
+<listitem><para>Reject unsafe uses of <literal>\'</literal> in string literals</para>
 <para>As a server-side defense against SQL-injection attacks of the type
-described in CVE-2006-2314, the server now only accepts <literal>''</> and not
-<literal>\'</> as a representation of ASCII single quote in SQL string
-literals.  By default, <literal>\'</> is rejected only when
-<varname>client_encoding</> is set to a client-only encoding (SJIS, BIG5, GBK,
+described in CVE-2006-2314, the server now only accepts <literal>''</literal> and not
+<literal>\'</literal> as a representation of ASCII single quote in SQL string
+literals.  By default, <literal>\'</literal> is rejected only when
+<varname>client_encoding</varname> is set to a client-only encoding (SJIS, BIG5, GBK,
 GB18030, or UHC), which is the scenario in which SQL injection is possible.
-A new configuration parameter <varname>backslash_quote</> is available to
+A new configuration parameter <varname>backslash_quote</varname> is available to
 adjust this behavior when needed.  Note that full security against
 CVE-2006-2314 might require client-side changes; the purpose of
-<varname>backslash_quote</> is in part to make it obvious that insecure
+<varname>backslash_quote</varname> is in part to make it obvious that insecure
 clients are insecure.
 </para></listitem>
 
-<listitem><para>Modify <application>libpq</>'s string-escaping routines to be
+<listitem><para>Modify <application>libpq</application>'s string-escaping routines to be
 aware of encoding considerations and
-<varname>standard_conforming_strings</></para>
-<para>This fixes <application>libpq</>-using applications for the security
+<varname>standard_conforming_strings</varname></para>
+<para>This fixes <application>libpq</application>-using applications for the security
 issues described in CVE-2006-2313 and CVE-2006-2314, and also future-proofs
 them against the planned changeover to SQL-standard string literal syntax.
-Applications that use multiple <productname>PostgreSQL</> connections
-concurrently should migrate to <function>PQescapeStringConn()</> and
-<function>PQescapeByteaConn()</> to ensure that escaping is done correctly
+Applications that use multiple <productname>PostgreSQL</productname> connections
+concurrently should migrate to <function>PQescapeStringConn()</function> and
+<function>PQescapeByteaConn()</function> to ensure that escaping is done correctly
 for the settings in use in each database connection.  Applications that
-do string escaping <quote>by hand</> should be modified to rely on library
+do string escaping <quote>by hand</quote> should be modified to rely on library
 routines instead.
 </para></listitem>
 
 <listitem><para>Fix some incorrect encoding conversion functions</para>
-<para><function>win1251_to_iso</>, <function>alt_to_iso</>,
-<function>euc_tw_to_big5</>, <function>euc_tw_to_mic</>,
-<function>mic_to_euc_tw</> were all broken to varying
+<para><function>win1251_to_iso</function>, <function>alt_to_iso</function>,
+<function>euc_tw_to_big5</function>, <function>euc_tw_to_mic</function>,
+<function>mic_to_euc_tw</function> were all broken to varying
 extents.
 </para></listitem>
 
-<listitem><para>Clean up stray remaining uses of <literal>\'</> in strings
+<listitem><para>Clean up stray remaining uses of <literal>\'</literal> in strings
 (Bruce, Jan)</para></listitem>
 
 <listitem><para>Fix bug that sometimes caused OR'd index scans to
@@ -2345,10 +2345,10 @@ miss rows they should have returned</para></listitem>
 <listitem><para>Fix WAL replay for case where a btree index has been
 truncated</para></listitem>
 
-<listitem><para>Fix <literal>SIMILAR TO</> for patterns involving
-<literal>|</> (Tom)</para></listitem>
+<listitem><para>Fix <literal>SIMILAR TO</literal> for patterns involving
+<literal>|</literal> (Tom)</para></listitem>
 
-<listitem><para>Fix <command>SELECT INTO</> and <command>CREATE TABLE AS</> to
+<listitem><para>Fix <command>SELECT INTO</command> and <command>CREATE TABLE AS</command> to
 create tables in the default tablespace, not the base directory (Kris
 Jurka)</para></listitem>
 
@@ -2377,7 +2377,7 @@ Fuhr)</para></listitem>
   <para>
    This release contains a variety of fixes from 8.0.6.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2386,7 +2386,7 @@ Fuhr)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.6,
-    see <xref linkend="release-8-0-6">.
+    see <xref linkend="release-8-0-6"/>.
    </para>
   </sect2>
 
@@ -2396,7 +2396,7 @@ Fuhr)</para></listitem>
 <itemizedlist>
 
 <listitem><para>Fix potential crash in <command>SET
-SESSION AUTHORIZATION</> (CVE-2006-0553)</para>
+SESSION AUTHORIZATION</command> (CVE-2006-0553)</para>
 <para>An unprivileged user could crash the server process, resulting in
 momentary denial of service to other users, if the server has been compiled
 with Asserts enabled (which is not the default).
@@ -2411,44 +2411,44 @@ created in 8.0.4, 7.4.9, and 7.3.11 releases.
 </para></listitem>
 
 <listitem><para>Fix race condition that could lead to <quote>file already
-exists</> errors during pg_clog and pg_subtrans file creation
+exists</quote> errors during pg_clog and pg_subtrans file creation
 (Tom)</para></listitem>
 
 <listitem><para>Fix cases that could lead to crashes if a cache-invalidation
 message arrives at just the wrong time (Tom)</para></listitem>
 
-<listitem><para>Properly check <literal>DOMAIN</> constraints for
-<literal>UNKNOWN</> parameters in prepared statements
+<listitem><para>Properly check <literal>DOMAIN</literal> constraints for
+<literal>UNKNOWN</literal> parameters in prepared statements
 (Neil)</para></listitem>
 
-<listitem><para>Ensure <command>ALTER COLUMN TYPE</> will process
-<literal>FOREIGN KEY</>, <literal>UNIQUE</>, and <literal>PRIMARY KEY</>
+<listitem><para>Ensure <command>ALTER COLUMN TYPE</command> will process
+<literal>FOREIGN KEY</literal>, <literal>UNIQUE</literal>, and <literal>PRIMARY KEY</literal>
 constraints in the proper order (Nakano Yoshihisa)</para></listitem>
 
 <listitem><para>Fixes to allow restoring dumps that have cross-schema
 references to custom operators or operator classes (Tom)</para></listitem>
 
-<listitem><para>Allow <application>pg_restore</> to continue properly after a
-<command>COPY</> failure; formerly it tried to treat the remaining
-<command>COPY</> data as SQL commands (Stephen Frost)</para></listitem>
+<listitem><para>Allow <application>pg_restore</application> to continue properly after a
+<command>COPY</command> failure; formerly it tried to treat the remaining
+<command>COPY</command> data as SQL commands (Stephen Frost)</para></listitem>
 
-<listitem><para>Fix <application>pg_ctl</> <literal>unregister</> crash
+<listitem><para>Fix <application>pg_ctl</application> <literal>unregister</literal> crash
 when the  data directory is not specified (Magnus)</para></listitem>
 
-<listitem><para>Fix <application>ecpg</> crash on AMD64 and PPC
+<listitem><para>Fix <application>ecpg</application> crash on AMD64 and PPC
 (Neil)</para></listitem>
 
 <listitem><para>Recover properly if error occurs during argument passing
-in <application>PL/Python</> (Neil)</para></listitem>
+in <application>PL/Python</application> (Neil)</para></listitem>
 
-<listitem><para>Fix <application>PL/Perl</>'s handling of locales on
+<listitem><para>Fix <application>PL/Perl</application>'s handling of locales on
 Win32 to match the backend (Andrew)</para></listitem>
 
-<listitem><para>Fix crash when <literal>log_min_messages</> is set to
-<literal>DEBUG3</> or above in <filename>postgresql.conf</> on Win32
+<listitem><para>Fix crash when <literal>log_min_messages</literal> is set to
+<literal>DEBUG3</literal> or above in <filename>postgresql.conf</filename> on Win32
 (Bruce)</para></listitem>
 
-<listitem><para>Fix <application>pgxs</> <literal>-L</> library path
+<listitem><para>Fix <application>pgxs</application> <literal>-L</literal> library path
 specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
 
 <listitem><para>Check that SID is enabled while checking for Win32 admin
@@ -2457,8 +2457,8 @@ privileges (Magnus)</para></listitem>
 <listitem><para>Properly reject out-of-range date inputs (Kris
 Jurka)</para></listitem>
 
-<listitem><para>Portability fix for testing presence of <function>finite</>
-and <function>isinf</> during configure (Tom)</para></listitem>
+<listitem><para>Portability fix for testing presence of <function>finite</function>
+and <function>isinf</function> during configure (Tom)</para></listitem>
 
 </itemizedlist>
 
@@ -2476,7 +2476,7 @@ and <function>isinf</> during configure (Tom)</para></listitem>
   <para>
    This release contains a variety of fixes from 8.0.5.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2485,10 +2485,10 @@ and <function>isinf</> during configure (Tom)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
-    see <xref linkend="release-8-0-3">.
-    Also, you might need to <command>REINDEX</> indexes on textual
+    see <xref linkend="release-8-0-3"/>.
+    Also, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the locale or
-    <application>plperl</> issues described below.
+    <application>plperl</application> issues described below.
    </para>
   </sect2>
 
@@ -2501,7 +2501,7 @@ and <function>isinf</> during configure (Tom)</para></listitem>
 than exit if there is no more room in ShmemBackendArray (Magnus)</para>
 <para>The previous behavior could lead to a denial-of-service situation if too
 many connection requests arrive close together.  This applies
-<emphasis>only</> to the Windows port.</para></listitem>
+<emphasis>only</emphasis> to the Windows port.</para></listitem>
 
 <listitem><para>Fix bug introduced in 8.0 that could allow ReadBuffer
 to return an already-used page as new, potentially causing loss of
@@ -2512,16 +2512,16 @@ outside a transaction or in a failed transaction (Tom)</para></listitem>
 
 <listitem><para>Fix character string comparison for locales that consider
 different character combinations as equal, such as Hungarian (Tom)</para>
-<para>This might require <command>REINDEX</> to fix existing indexes on
+<para>This might require <command>REINDEX</command> to fix existing indexes on
 textual columns.</para></listitem>
 
 <listitem><para>Set locale environment variables during postmaster startup
-to ensure that <application>plperl</> won't change the locale later</para>
-<para>This fixes a problem that occurred if the <application>postmaster</> was
+to ensure that <application>plperl</application> won't change the locale later</para>
+<para>This fixes a problem that occurred if the <application>postmaster</application> was
 started with environment variables specifying a different locale than what
-<application>initdb</> had been told.  Under these conditions, any use of
-<application>plperl</> was likely to lead to corrupt indexes.  You might need
-<command>REINDEX</> to fix existing indexes on
+<application>initdb</application> had been told.  Under these conditions, any use of
+<application>plperl</application> was likely to lead to corrupt indexes.  You might need
+<command>REINDEX</command> to fix existing indexes on
 textual columns if this has happened to you.</para></listitem>
 
 <listitem><para>Allow more flexible relocation of installation
@@ -2533,15 +2533,15 @@ directory paths were the same except for the last component.</para></listitem>
 handling in certain rarely used Asian multi-byte character sets (Tatsuo)
 </para></listitem>
 
-<listitem><para>Various fixes for functions returning <literal>RECORD</>s
+<listitem><para>Various fixes for functions returning <literal>RECORD</literal>s
 (Tom) </para></listitem>
 
-<listitem><para>Fix bug in <filename>/contrib/pgcrypto</> gen_salt,
+<listitem><para>Fix bug in <filename>/contrib/pgcrypto</filename> gen_salt,
 which caused it not to use all available salt space for MD5 and
 XDES algorithms (Marko Kreen, Solar Designer)</para>
 <para>Salts for Blowfish and standard DES are unaffected.</para></listitem>
 
-<listitem><para>Fix <filename>/contrib/dblink</> to throw an error,
+<listitem><para>Fix <filename>/contrib/dblink</filename> to throw an error,
 rather than crashing, when the number of columns specified is different from
 what's actually returned by the query (Joe)</para></listitem>
 
@@ -2561,7 +2561,7 @@ what's actually returned by the query (Joe)</para></listitem>
   <para>
    This release contains a variety of fixes from 8.0.4.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2570,7 +2570,7 @@ what's actually returned by the query (Joe)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
-    see <xref linkend="release-8-0-3">.
+    see <xref linkend="release-8-0-3"/>.
    </para>
   </sect2>
 
@@ -2597,35 +2597,35 @@ later VACUUM commands.
 <listitem><para>Prevent failure if client sends Bind protocol message
 when current transaction is already aborted</para></listitem>
 
-<listitem><para><filename>/contrib/ltree</> fixes (Teodor)</para></listitem>
+<listitem><para><filename>/contrib/ltree</filename> fixes (Teodor)</para></listitem>
 
 <listitem><para>AIX and HPUX compile fixes (Tom)</para></listitem>
 
 <listitem><para>Retry file reads and writes after Windows
 NO_SYSTEM_RESOURCES error (Qingqing Zhou)</para></listitem>
 
-<listitem><para>Fix intermittent failure when <varname>log_line_prefix</>
-includes <literal>%i</></para></listitem>
+<listitem><para>Fix intermittent failure when <varname>log_line_prefix</varname>
+includes <literal>%i</literal></para></listitem>
 
-<listitem><para>Fix <application>psql</> performance issue with long scripts
+<listitem><para>Fix <application>psql</application> performance issue with long scripts
 on Windows (Merlin Moncure)</para></listitem>
 
-<listitem><para>Fix missing updates of <filename>pg_group</> flat
+<listitem><para>Fix missing updates of <filename>pg_group</filename> flat
 file</para></listitem>
 
 <listitem><para>Fix longstanding planning error for outer joins</para>
 <para>This bug sometimes caused a bogus error <quote>RIGHT JOIN is
-only supported with merge-joinable join conditions</>.</para></listitem>
+only supported with merge-joinable join conditions</quote>.</para></listitem>
 
 <listitem><para>Postpone timezone initialization until after
-<filename>postmaster.pid</> is created</para>
+<filename>postmaster.pid</filename> is created</para>
 <para>This avoids confusing startup scripts that expect the pid file to appear
 quickly.</para></listitem>
 
-<listitem><para>Prevent core dump in <application>pg_autovacuum</> when a
+<listitem><para>Prevent core dump in <application>pg_autovacuum</application> when a
 table has been dropped</para></listitem>
 
-<listitem><para>Fix problems with whole-row references (<literal>foo.*</>)
+<listitem><para>Fix problems with whole-row references (<literal>foo.*</literal>)
 to subquery results</para></listitem>
 </itemizedlist>
 
@@ -2643,7 +2643,7 @@ to subquery results</para></listitem>
   <para>
    This release contains a variety of fixes from 8.0.3.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2652,7 +2652,7 @@ to subquery results</para></listitem>
    <para>
     A dump/restore is not required for those running 8.0.X.  However,
     if you are upgrading from a version earlier than 8.0.3,
-    see <xref linkend="release-8-0-3">.
+    see <xref linkend="release-8-0-3"/>.
    </para>
   </sect2>
 
@@ -2660,69 +2660,69 @@ to subquery results</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Fix error that allowed <command>VACUUM</> to remove
-<literal>ctid</> chains too soon, and add more checking in code that follows
-<literal>ctid</> links</para>
+<listitem><para>Fix error that allowed <command>VACUUM</command> to remove
+<literal>ctid</literal> chains too soon, and add more checking in code that follows
+<literal>ctid</literal> links</para>
 <para>This fixes a long-standing problem that could cause crashes in very rare
 circumstances.</para></listitem>
-<listitem><para>Fix <type>CHAR()</> to properly pad spaces to the specified
+<listitem><para>Fix <type>CHAR()</type> to properly pad spaces to the specified
 length when using a multiple-byte character set (Yoshiyuki Asaba)</para>
-<para>In prior releases, the padding of <type>CHAR()</> was incorrect
+<para>In prior releases, the padding of <type>CHAR()</type> was incorrect
 because it only padded to the specified number of bytes without
 considering how many characters were stored.</para></listitem>
 <listitem><para>Force a checkpoint before committing <command>CREATE
-DATABASE</></para>
-<para>This should fix recent reports of <quote>index is not a btree</>
+DATABASE</command></para>
+<para>This should fix recent reports of <quote>index is not a btree</quote>
 failures when a crash occurs shortly after <command>CREATE
-DATABASE</>.</para></listitem>
+DATABASE</command>.</para></listitem>
 <listitem><para>Fix the sense of the test for read-only transaction
-in <command>COPY</></para>
-<para>The code formerly prohibited <command>COPY TO</>, where it should
-prohibit <command>COPY FROM</>.
+in <command>COPY</command></para>
+<para>The code formerly prohibited <command>COPY TO</command>, where it should
+prohibit <command>COPY FROM</command>.
 </para></listitem>
-<listitem><para>Handle consecutive embedded newlines in <command>COPY</>
+<listitem><para>Handle consecutive embedded newlines in <command>COPY</command>
 CSV-mode input</para></listitem>
-<listitem><para>Fix <function>date_trunc(week)</> for dates near year
+<listitem><para>Fix <function>date_trunc(week)</function> for dates near year
 end</para></listitem>
 <listitem><para>Fix planning problem with outer-join ON clauses that reference
 only the inner-side relation</para></listitem>
-<listitem><para>Further fixes for <literal>x FULL JOIN y ON true</> corner
+<listitem><para>Further fixes for <literal>x FULL JOIN y ON true</literal> corner
 cases</para></listitem>
 <listitem><para>Fix overenthusiastic optimization of <literal>x IN (SELECT
-DISTINCT ...)</> and related cases</para></listitem>
-<listitem><para>Fix mis-planning of queries with small <literal>LIMIT</>
-values due to poorly thought out <quote>fuzzy</> cost
+DISTINCT ...)</literal> and related cases</para></listitem>
+<listitem><para>Fix mis-planning of queries with small <literal>LIMIT</literal>
+values due to poorly thought out <quote>fuzzy</quote> cost
 comparison</para></listitem>
-<listitem><para>Make <function>array_in</> and <function>array_recv</> more
+<listitem><para>Make <function>array_in</function> and <function>array_recv</function> more
 paranoid about validating their OID parameter</para></listitem>
 <listitem><para>Fix missing rows in queries like <literal>UPDATE a=... WHERE
-a...</> with GiST index on column <literal>a</></para></listitem>
+a...</literal> with GiST index on column <literal>a</literal></para></listitem>
 <listitem><para>Improve robustness of datetime parsing</para></listitem>
 <listitem><para>Improve checking for partially-written WAL
 pages</para></listitem>
 <listitem><para>Improve robustness of signal handling when SSL is
 enabled</para></listitem>
 <listitem><para>Improve MIPS and M68K spinlock code</para></listitem>
-<listitem><para>Don't try to open more than <literal>max_files_per_process</>
+<listitem><para>Don't try to open more than <literal>max_files_per_process</literal>
 files during postmaster startup</para></listitem>
 <listitem><para>Various memory leakage fixes</para></listitem>
 <listitem><para>Various portability improvements</para></listitem>
 <listitem><para>Update timezone data files</para></listitem>
 <listitem><para>Improve handling of DLL load failures on Windows</para></listitem>
 <listitem><para>Improve random-number generation on Windows</para></listitem>
-<listitem><para>Make <literal>psql -f filename</> return a nonzero exit code
+<listitem><para>Make <literal>psql -f filename</literal> return a nonzero exit code
 when opening the file fails</para></listitem>
-<listitem><para>Change <application>pg_dump</> to handle inherited check
+<listitem><para>Change <application>pg_dump</application> to handle inherited check
 constraints more reliably</para></listitem>
-<listitem><para>Fix password prompting in <application>pg_restore</> on
+<listitem><para>Fix password prompting in <application>pg_restore</application> on
 Windows</para></listitem>
-<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when
+<listitem><para>Fix PL/pgSQL to handle <literal>var := var</literal> correctly when
 the variable is of pass-by-reference type</para></listitem>
-<listitem><para>Fix PL/Perl <literal>%_SHARED</> so it's actually
+<listitem><para>Fix PL/Perl <literal>%_SHARED</literal> so it's actually
 shared</para></listitem>
-<listitem><para>Fix <filename>contrib/pg_autovacuum</> to allow sleep
+<listitem><para>Fix <filename>contrib/pg_autovacuum</filename> to allow sleep
 intervals over 2000 sec</para></listitem>
-<listitem><para>Update <filename>contrib/tsearch2</> to use current Snowball
+<listitem><para>Update <filename>contrib/tsearch2</filename> to use current Snowball
 code</para></listitem>
 </itemizedlist>
 
@@ -2741,7 +2741,7 @@ code</para></listitem>
    This release contains a variety of fixes from 8.0.2, including several
    security-related issues.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2766,10 +2766,10 @@ code</para></listitem>
    </para>
 
    <para>
-    The lesser problem is that the <filename>contrib/tsearch2</> module
+    The lesser problem is that the <filename>contrib/tsearch2</filename> module
     creates several functions that are improperly declared to return
-    <type>internal</> when they do not accept <type>internal</> arguments.
-    This breaks type safety for all functions using <type>internal</>
+    <type>internal</type> when they do not accept <type>internal</type> arguments.
+    This breaks type safety for all functions using <type>internal</type>
     arguments.
    </para>
 
@@ -2794,10 +2794,10 @@ code</para></listitem>
 <itemizedlist>
 <listitem><para>Change encoding function signature to prevent
 misuse</para></listitem>
-<listitem><para>Change <filename>contrib/tsearch2</> to avoid unsafe use of
-<type>INTERNAL</> function results</para></listitem>
+<listitem><para>Change <filename>contrib/tsearch2</filename> to avoid unsafe use of
+<type>INTERNAL</type> function results</para></listitem>
 <listitem><para>Guard against incorrect second parameter to
-<function>record_out</></para></listitem>
+<function>record_out</function></para></listitem>
 <listitem><para>Repair ancient race condition that allowed a transaction to be
 seen as committed for some purposes (eg SELECT FOR UPDATE) slightly sooner
 than for other purposes</para>
@@ -2809,36 +2809,36 @@ VACUUM</para>
 freshly-inserted data, although the scenario seems of very low probability.
 There are no known cases of it having caused more than an Assert failure.
 </para></listitem>
-<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</> values</para>
+<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</type> values</para>
 <para>
 The comparison code was wrong in the case where the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
-NOTE: if you have an index on a <type>TIME WITH TIME ZONE</> column,
-it will need to be <command>REINDEX</>ed after installing this update, because
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
+NOTE: if you have an index on a <type>TIME WITH TIME ZONE</type> column,
+it will need to be <command>REINDEX</command>ed after installing this update, because
 the fix corrects the sort order of column values.
 </para></listitem>
-<listitem><para>Fix <function>EXTRACT(EPOCH)</> for
-<type>TIME WITH TIME ZONE</> values</para></listitem>
+<listitem><para>Fix <function>EXTRACT(EPOCH)</function> for
+<type>TIME WITH TIME ZONE</type> values</para></listitem>
 <listitem><para>Fix mis-display of negative fractional seconds in
-<type>INTERVAL</> values</para>
+<type>INTERVAL</type> values</para>
 <para>
 This error only occurred when the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
 </para></listitem>
-<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</>
+<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</literal>
 correctly (Neil)</para></listitem>
 <listitem><para>Still more 64-bit fixes for
-<filename>contrib/intagg</></para></listitem>
+<filename>contrib/intagg</filename></para></listitem>
 <listitem><para>Prevent incorrect optimization of functions returning
-<type>RECORD</></para></listitem>
-<listitem><para>Prevent crash on <literal>COALESCE(NULL,NULL)</></para></listitem>
+<type>RECORD</type></para></listitem>
+<listitem><para>Prevent crash on <literal>COALESCE(NULL,NULL)</literal></para></listitem>
 <listitem><para>Fix Borland makefile for libpq</para></listitem>
-<listitem><para>Fix <filename>contrib/btree_gist</> for <type>timetz</> type
+<listitem><para>Fix <filename>contrib/btree_gist</filename> for <type>timetz</type> type
 (Teodor)</para></listitem>
-<listitem><para>Make <command>pg_ctl</> check the PID found in
-<filename>postmaster.pid</> to see if it is still a live
+<listitem><para>Make <command>pg_ctl</command> check the PID found in
+<filename>postmaster.pid</filename> to see if it is still a live
 process</para></listitem>
-<listitem><para>Fix <command>pg_dump</>/<command>pg_restore</> problems caused
+<listitem><para>Fix <command>pg_dump</command>/<command>pg_restore</command> problems caused
 by addition of dump timestamps</para></listitem>
 <listitem><para>Fix interaction between materializing holdable cursors and
 firing deferred triggers during transaction commit</para></listitem>
@@ -2860,7 +2860,7 @@ data types</para></listitem>
   <para>
    This release contains a variety of fixes from 8.0.1.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -2883,51 +2883,51 @@ data types</para></listitem>
 libraries (Bruce)</para>
 <para>
 This should have been done in 8.0.0.  It is required so 7.4.X versions
-of PostgreSQL client applications, like <application>psql</>,
+of PostgreSQL client applications, like <application>psql</application>,
 can be used on the same machine as 8.0.X applications.  This might require
 re-linking user applications that use these libraries.
 </para></listitem>
-<listitem><para>Add Windows-only <varname>wal_sync_method</> setting of
-<option>fsync_writethrough</> (Magnus, Bruce)</para>
+<listitem><para>Add Windows-only <varname>wal_sync_method</varname> setting of
+<option>fsync_writethrough</option> (Magnus, Bruce)</para>
 <para>
 This setting causes <productname>PostgreSQL</productname> to write through
 any disk-drive write cache when writing to WAL.
-This behavior was formerly called <option>fsync</>, but was
-renamed because it acts quite differently from <option>fsync</> on other
+This behavior was formerly called <option>fsync</option>, but was
+renamed because it acts quite differently from <option>fsync</option> on other
 platforms.
 </para>
 </listitem>
-<listitem><para>Enable the <varname>wal_sync_method</> setting of
-<option>open_datasync</> on Windows, and make it the default for that
+<listitem><para>Enable the <varname>wal_sync_method</varname> setting of
+<option>open_datasync</option> on Windows, and make it the default for that
  platform (Magnus, Bruce)</para>
 <para>
-Because the default is no longer <option>fsync_writethrough</>,
+Because the default is no longer <option>fsync_writethrough</option>,
 data loss is possible during a power failure if the disk drive has
 write caching enabled. To turn off the write cache on Windows,
-from the <application>Device Manager</>, choose the drive properties,
-then <literal>Policies</>.
+from the <application>Device Manager</application>, choose the drive properties,
+then <literal>Policies</literal>.
 </para>
 </listitem>
-<listitem><para>New cache management algorithm <acronym>2Q</> replaces
-<acronym>ARC</> (Tom)</para>
+<listitem><para>New cache management algorithm <acronym>2Q</acronym> replaces
+<acronym>ARC</acronym> (Tom)</para>
 <para>
-This was done to avoid a pending US patent on <acronym>ARC</>.  The
-<acronym>2Q</> code might be a few percentage points slower than
-<acronym>ARC</> for some work loads.  A better cache management algorithm
+This was done to avoid a pending US patent on <acronym>ARC</acronym>.  The
+<acronym>2Q</acronym> code might be a few percentage points slower than
+<acronym>ARC</acronym> for some work loads.  A better cache management algorithm
 will appear in 8.1.
 </para></listitem>
 <listitem><para>Planner adjustments to improve behavior on freshly-created
 tables (Tom)</para></listitem>
 <listitem><para>Allow plpgsql to assign to an element of an array that is
-initially <literal>NULL</> (Tom)</para>
+initially <literal>NULL</literal> (Tom)</para>
 <para>
-Formerly the array would remain <literal>NULL</>, but now it becomes a
+Formerly the array would remain <literal>NULL</literal>, but now it becomes a
 single-element array.  The main SQL engine was changed to handle
-<command>UPDATE</> of a null array value this way in 8.0, but the similar
+<command>UPDATE</command> of a null array value this way in 8.0, but the similar
 case in plpgsql was overlooked.
 </para>
 </listitem>
-<listitem><para>Convert <literal>\r\n</> and <literal>\r</> to <literal>\n</>
+<listitem><para>Convert <literal>\r\n</literal> and <literal>\r</literal> to <literal>\n</literal>
 in plpython function bodies (Michael Fuhr)</para>
 <para>
  This prevents syntax errors when plpython code is written on a Windows or
@@ -2935,72 +2935,72 @@ in plpython function bodies (Michael Fuhr)</para>
 </para>
 </listitem>
 <listitem><para>Allow SPI cursors to handle utility commands that return rows,
-such as <command>EXPLAIN</> (Tom)</para></listitem>
-<listitem><para>Fix <command>CLUSTER</> failure after <command>ALTER TABLE
-SET WITHOUT OIDS</> (Tom)</para></listitem>
-<listitem><para>Reduce memory usage of <command>ALTER TABLE ADD COLUMN</>
+such as <command>EXPLAIN</command> (Tom)</para></listitem>
+<listitem><para>Fix <command>CLUSTER</command> failure after <command>ALTER TABLE
+SET WITHOUT OIDS</command> (Tom)</para></listitem>
+<listitem><para>Reduce memory usage of <command>ALTER TABLE ADD COLUMN</command>
 (Neil)</para></listitem>
-<listitem><para>Fix <command>ALTER LANGUAGE RENAME</> (Tom)</para></listitem>
-<listitem><para>Document the Windows-only <literal>register</> and
-<literal>unregister</> options of <application>pg_ctl</> (Magnus)</para></listitem>
+<listitem><para>Fix <command>ALTER LANGUAGE RENAME</command> (Tom)</para></listitem>
+<listitem><para>Document the Windows-only <literal>register</literal> and
+<literal>unregister</literal> options of <application>pg_ctl</application> (Magnus)</para></listitem>
 <listitem><para>Ensure operations done during backend shutdown are counted by
 statistics collector</para>
 <para>
-This is expected to resolve reports of <application>pg_autovacuum</>
+This is expected to resolve reports of <application>pg_autovacuum</application>
 not vacuuming the system catalogs often enough &mdash; it was not being
 told about catalog deletions caused by temporary table removal during
 backend exit.
 </para></listitem>
 <listitem><para>Change the Windows default for configuration parameter
-<varname>log_destination</> to <option>eventlog</> (Magnus)</para>
+<varname>log_destination</varname> to <option>eventlog</option> (Magnus)</para>
 <para>
 By default, a server running on Windows will now send log output to the
 Windows event logger rather than standard error.
 </para></listitem>
 <listitem><para>Make Kerberos authentication work on Windows (Magnus)</para></listitem>
-<listitem><para>Allow <command>ALTER DATABASE RENAME</> by superusers
+<listitem><para>Allow <command>ALTER DATABASE RENAME</command> by superusers
 who aren't flagged as having CREATEDB privilege (Tom)</para></listitem>
-<listitem><para>Modify WAL log entries for <command>CREATE</> and
-<command>DROP DATABASE</> to not specify absolute paths (Tom)</para>
+<listitem><para>Modify WAL log entries for <command>CREATE</command> and
+<command>DROP DATABASE</command> to not specify absolute paths (Tom)</para>
 <para>This allows point-in-time recovery on a different machine with possibly
-different database location.  Note that <command>CREATE TABLESPACE</> still
+different database location.  Note that <command>CREATE TABLESPACE</command> still
 poses a hazard in such situations.
 </para></listitem>
 <listitem><para>Fix crash from a backend exiting with an open transaction
 that created a table and opened a cursor on it (Tom)</para></listitem>
-<listitem><para>Fix <function>array_map()</> so it can call PL functions
+<listitem><para>Fix <function>array_map()</function> so it can call PL functions
 (Tom)</para></listitem>
-<listitem><para>Several <filename>contrib/tsearch2</> and
-<filename>contrib/btree_gist</> fixes (Teodor)
+<listitem><para>Several <filename>contrib/tsearch2</filename> and
+<filename>contrib/btree_gist</filename> fixes (Teodor)
 </para></listitem>
-<listitem><para>Fix crash of some <filename>contrib/pgcrypto</>
+<listitem><para>Fix crash of some <filename>contrib/pgcrypto</filename>
 functions on some platforms (Marko Kreen)</para></listitem>
-<listitem><para>Fix <filename>contrib/intagg</> for 64-bit platforms
+<listitem><para>Fix <filename>contrib/intagg</filename> for 64-bit platforms
 (Tom)</para></listitem>
-<listitem><para>Fix ecpg bugs in parsing of <command>CREATE</> statement
+<listitem><para>Fix ecpg bugs in parsing of <command>CREATE</command> statement
 (Michael)</para></listitem>
 <listitem><para>Work around gcc bug on powerpc and amd64 causing problems in
 ecpg (Christof Petig)</para></listitem>
-<listitem><para>Do not use locale-aware versions of <function>upper()</>,
-<function>lower()</>, and <function>initcap()</> when the locale is
-<literal>C</> (Bruce)</para>
+<listitem><para>Do not use locale-aware versions of <function>upper()</function>,
+<function>lower()</function>, and <function>initcap()</function> when the locale is
+<literal>C</literal> (Bruce)</para>
 <para>
  This allows these functions to work on platforms that generate errors
- for non-7-bit data when the locale is <literal>C</>.
+ for non-7-bit data when the locale is <literal>C</literal>.
 </para></listitem>
-<listitem><para>Fix <function>quote_ident()</> to quote names that match keywords (Tom)</para></listitem>
-<listitem><para>Fix <function>to_date()</> to behave reasonably when
-<literal>CC</> and <literal>YY</> fields are both used (Karel)</para></listitem>
-<listitem><para>Prevent <function>to_char(interval)</> from failing
+<listitem><para>Fix <function>quote_ident()</function> to quote names that match keywords (Tom)</para></listitem>
+<listitem><para>Fix <function>to_date()</function> to behave reasonably when
+<literal>CC</literal> and <literal>YY</literal> fields are both used (Karel)</para></listitem>
+<listitem><para>Prevent <function>to_char(interval)</function> from failing
 when given a zero-month interval (Tom)</para></listitem>
-<listitem><para>Fix wrong week returned by <function>date_trunc('week')</>
+<listitem><para>Fix wrong week returned by <function>date_trunc('week')</function>
 (Bruce)</para>
 <para>
-<function>date_trunc('week')</>
+<function>date_trunc('week')</function>
 returned the wrong year for the first few days of January in some years.
 </para></listitem>
-<listitem><para>Use the correct default mask length for class <literal>D</>
-addresses in <type>INET</> data types (Tom)</para></listitem>
+<listitem><para>Use the correct default mask length for class <literal>D</literal>
+addresses in <type>INET</type> data types (Tom)</para></listitem>
 </itemizedlist>
 
   </sect2>
@@ -3018,7 +3018,7 @@ addresses in <type>INET</> data types (Tom)</para></listitem>
    This release contains a variety of fixes from 8.0.0, including several
    security-related issues.
    For information about new features in the 8.0 major release, see
-   <xref linkend="release-8-0">.
+   <xref linkend="release-8-0"/>.
   </para>
 
   <sect2>
@@ -3033,11 +3033,11 @@ addresses in <type>INET</> data types (Tom)</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Disallow <command>LOAD</> to non-superusers</para>
+<listitem><para>Disallow <command>LOAD</command> to non-superusers</para>
 <para>
 On platforms that will automatically execute initialization functions of a
 shared library (this includes at least Windows and ELF-based Unixen),
-<command>LOAD</> can be used to make the server execute arbitrary code.
+<command>LOAD</command> can be used to make the server execute arbitrary code.
 Thanks to NGS Software for reporting this.</para></listitem>
 <listitem><para>Check that creator of an aggregate function has the right to
 execute the specified transition functions</para>
@@ -3050,7 +3050,7 @@ contrib/intagg</para></listitem>
 Jurka)</para></listitem>
 <listitem><para>Avoid buffer overrun when plpgsql cursor declaration has too
 many parameters (Neil)</para></listitem>
-<listitem><para>Make <command>ALTER TABLE ADD COLUMN</> enforce domain
+<listitem><para>Make <command>ALTER TABLE ADD COLUMN</command> enforce domain
 constraints in all cases</para></listitem>
 <listitem><para>Fix planning error for FULL and RIGHT outer joins</para>
 <para>
@@ -3059,7 +3059,7 @@ left input.  This could not only deliver mis-sorted output to the user, but
 in case of nested merge joins could give outright wrong answers.
 </para></listitem>
 <listitem><para>Improve planning of grouped aggregate queries</para></listitem>
-<listitem><para><command>ROLLBACK TO <replaceable>savepoint</></command>
+<listitem><para><command>ROLLBACK TO <replaceable>savepoint</replaceable></command>
 closes cursors created since the savepoint</para></listitem>
 <listitem><para>Fix inadequate backend stack size on Windows</para></listitem>
 <listitem><para>Avoid SHGetSpecialFolderPath() on Windows
@@ -3099,17 +3099,17 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        This is the first <productname>PostgreSQL</productname> release
-       to run natively on <trademark class="registered">Microsoft Windows</> as
-       a server. It can run as a <productname>Windows</> service. This
+       to run natively on <trademark class="registered">Microsoft Windows</trademark> as
+       a server. It can run as a <productname>Windows</productname> service. This
        release supports NT-based Windows releases like
-       <productname>Windows 2000 SP4</>, <productname>Windows XP</>, and
-       <productname>Windows 2003</>. Older releases like
-       <productname>Windows 95</>, <productname>Windows 98</>, and
-       <productname>Windows ME</> are not supported because these operating
+       <productname>Windows 2000 SP4</productname>, <productname>Windows XP</productname>, and
+       <productname>Windows 2003</productname>. Older releases like
+       <productname>Windows 95</productname>, <productname>Windows 98</productname>, and
+       <productname>Windows ME</productname> are not supported because these operating
        systems do not have the infrastructure to support
        <productname>PostgreSQL</productname>. A separate installer
        project has been created to ease installation on
-       <productname>Windows</> &mdash; see <ulink
+       <productname>Windows</productname> &mdash; see <ulink
        url="http://www.postgresql.org/ftp/win32/"></ulink>.
       </para>
 
@@ -3123,7 +3123,7 @@ typedefs (Michael)</para></listitem>
 
       <para>
        Previous releases required the Unix emulation toolkit
-       <productname>Cygwin</> in order to run the server on Windows
+       <productname>Cygwin</productname> in order to run the server on Windows
        operating systems.  <productname>PostgreSQL</productname> has
        supported native clients on Windows for many years.
       </para>
@@ -3174,7 +3174,7 @@ typedefs (Michael)</para></listitem>
        Tablespaces allow administrators to select different file systems
        for storage of individual tables, indexes, and databases.
        This improves performance and control over disk space
-       usage. Prior releases used <application>initlocation</> and
+       usage. Prior releases used <application>initlocation</application> and
        manual symlink management for such tasks.
       </para>
      </listitem>
@@ -3216,7 +3216,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       A new version of the <application>plperl</> server-side language now
+       A new version of the <application>plperl</application> server-side language now
        supports a persistent shared storage area, triggers, returning records
        and arrays of records, and SPI calls to access the database.
       </para>
@@ -3257,7 +3257,7 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      In <option>READ COMMITTED</> serialization mode, volatile functions
+      In <option>READ COMMITTED</option> serialization mode, volatile functions
       now see the results of concurrent transactions committed up to the
       beginning of each statement within the function, rather than up to the
       beginning of the interactive command that called the function.
@@ -3266,18 +3266,18 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      Functions declared <option>STABLE</> or <option>IMMUTABLE</> always
+      Functions declared <option>STABLE</option> or <option>IMMUTABLE</option> always
       use the snapshot of the calling query, and therefore do not see the
       effects of actions taken after the calling query starts, whether in
       their own transaction or other transactions.  Such a function must be
       read-only, too, meaning that it cannot use any SQL commands other than
-      <command>SELECT</>.
+      <command>SELECT</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Nondeferred <option>AFTER</> triggers are now fired immediately
+      Nondeferred <option>AFTER</option> triggers are now fired immediately
       after completion of the triggering query, rather than upon
       finishing the current interactive command. This makes a
       difference when the triggering query occurred within a function:
@@ -3288,19 +3288,19 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      Server configuration parameters <varname>virtual_host</> and
-      <varname>tcpip_socket</> have been replaced with a more general
-      parameter <varname>listen_addresses</>. Also, the server now listens on
-      <literal>localhost</> by default, which eliminates the need for the
-      <literal>-i</> postmaster switch in many scenarios.
+      Server configuration parameters <varname>virtual_host</varname> and
+      <varname>tcpip_socket</varname> have been replaced with a more general
+      parameter <varname>listen_addresses</varname>. Also, the server now listens on
+      <literal>localhost</literal> by default, which eliminates the need for the
+      <literal>-i</literal> postmaster switch in many scenarios.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Server configuration parameters <varname>SortMem</> and
-      <varname>VacuumMem</> have been renamed to <varname>work_mem</>
-      and <varname>maintenance_work_mem</> to better reflect their
+      Server configuration parameters <varname>SortMem</varname> and
+      <varname>VacuumMem</varname> have been renamed to <varname>work_mem</varname>
+      and <varname>maintenance_work_mem</varname> to better reflect their
       use. The original names are still supported in
       <command>SET</command> and <command>SHOW</command>.
      </para>
@@ -3308,34 +3308,34 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      Server configuration parameters <varname>log_pid</>,
-      <varname>log_timestamp</>, and <varname>log_source_port</> have been
-      replaced with a more general parameter <varname>log_line_prefix</>.
+      Server configuration parameters <varname>log_pid</varname>,
+      <varname>log_timestamp</varname>, and <varname>log_source_port</varname> have been
+      replaced with a more general parameter <varname>log_line_prefix</varname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Server configuration parameter <varname>syslog</> has been
-      replaced with a more logical <varname>log_destination</> variable to
+      Server configuration parameter <varname>syslog</varname> has been
+      replaced with a more logical <varname>log_destination</varname> variable to
       control the log output destination.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Server configuration parameter <varname>log_statement</> has been
+      Server configuration parameter <varname>log_statement</varname> has been
       changed so it can selectively log just database modification or
       data definition statements.  Server configuration parameter
-      <varname>log_duration</> now prints only when <varname>log_statement</>
+      <varname>log_duration</varname> now prints only when <varname>log_statement</varname>
       prints the query.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Server configuration parameter <varname>max_expr_depth</> parameter has
-      been replaced with <varname>max_stack_depth</> which measures the
+      Server configuration parameter <varname>max_expr_depth</varname> parameter has
+      been replaced with <varname>max_stack_depth</varname> which measures the
       physical stack size rather than the expression nesting depth. This
       helps prevent session termination due to stack overflow caused by
       recursive functions.
@@ -3344,14 +3344,14 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      The <function>length()</> function no longer counts trailing spaces in
-      <type>CHAR(n)</> values.
+      The <function>length()</function> function no longer counts trailing spaces in
+      <type>CHAR(n)</type> values.
      </para>
     </listitem>
 
    <listitem>
     <para>
-     Casting an integer to <type>BIT(N)</> selects the rightmost N bits of the
+     Casting an integer to <type>BIT(N)</type> selects the rightmost N bits of the
      integer, not the leftmost N bits as before.
     </para>
    </listitem>
@@ -3369,7 +3369,7 @@ typedefs (Michael)</para></listitem>
       Syntax checking of array input values has been tightened up
       considerably. Junk that was previously allowed in odd places with
       odd results now causes an error. Empty-string element values
-      must now be written as <literal>""</>, rather than writing nothing.
+      must now be written as <literal>""</literal>, rather than writing nothing.
       Also changed behavior with respect to whitespace surrounding
       array elements: trailing whitespace is now ignored, for symmetry
       with leading whitespace (which has always been ignored).
@@ -3386,14 +3386,14 @@ typedefs (Michael)</para></listitem>
     <listitem>
      <para>
       The arithmetic operators associated with the single-byte
-      <type>"char"</> data type have been removed.
+      <type>"char"</type> data type have been removed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      The <function>extract()</> function (also called
-      <function>date_part</>) now returns the proper year for BC dates.
+      The <function>extract()</function> function (also called
+      <function>date_part</function>) now returns the proper year for BC dates.
       It previously returned one less than the correct year. The
       function now also returns the proper values for millennium and
       century.
@@ -3402,9 +3402,9 @@ typedefs (Michael)</para></listitem>
 
    <listitem>
     <para>
-     <type>CIDR</> values now must have their nonmasked bits be zero.
+     <type>CIDR</type> values now must have their nonmasked bits be zero.
      For example, we no longer allow
-     <literal>204.248.199.1/31</literal> as a <type>CIDR</> value. Such
+     <literal>204.248.199.1/31</literal> as a <type>CIDR</type> value. Such
      values should never have been accepted by
      <productname>PostgreSQL</productname> and will now be rejected.
     </para>
@@ -3419,11 +3419,11 @@ typedefs (Michael)</para></listitem>
 
     <listitem>
      <para>
-      <application>psql</>'s <command>\copy</> command now reads or
-      writes to the query's <literal>stdin/stdout</>, rather than
-      <application>psql</>'s <literal>stdin/stdout</>. The previous
+      <application>psql</application>'s <command>\copy</command> command now reads or
+      writes to the query's <literal>stdin/stdout</literal>, rather than
+      <application>psql</application>'s <literal>stdin/stdout</literal>. The previous
       behavior can be accessed via new
-      <option>pstdin</>/<option>pstdout</> parameters.
+      <option>pstdin</option>/<option>pstdout</option> parameters.
      </para>
     </listitem>
 
@@ -3449,14 +3449,14 @@ typedefs (Michael)</para></listitem>
       one supplied by the operating system. This will provide consistent
       behavior across all platforms.  In most cases, there should be
       little noticeable difference in time zone behavior, except that
-      the time zone names used by <command>SET</>/<command>SHOW</>
-      <varname>TimeZone</> might be different from what your platform provides.
+      the time zone names used by <command>SET</command>/<command>SHOW</command>
+      <varname>TimeZone</varname> might be different from what your platform provides.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <application>Configure</>'s threading option no longer requires
+      <application>Configure</application>'s threading option no longer requires
       users to run tests or edit configuration files; threading options
       are now detected automatically.
      </para>
@@ -3465,7 +3465,7 @@ typedefs (Michael)</para></listitem>
     <listitem>
      <para>
       Now that tablespaces have been implemented,
-      <application>initlocation</> has been removed.
+      <application>initlocation</application> has been removed.
      </para>
     </listitem>
 
@@ -3495,7 +3495,7 @@ typedefs (Michael)</para></listitem>
    <itemizedlist>
     <listitem>
      <para>
-      The 8.1 release will remove the <function>to_char()</> function
+      The 8.1 release will remove the <function>to_char()</function> function
       for intervals.
      </para>
     </listitem>
@@ -3513,12 +3513,12 @@ typedefs (Michael)</para></listitem>
     <listitem>
      <para>
       By default, tables in <productname>PostgreSQL</productname> 8.0
-      and earlier are created with <type>OID</>s. In the next release,
+      and earlier are created with <type>OID</type>s. In the next release,
       this will <emphasis>not</emphasis> be the case: to create a table
-      that contains <type>OID</>s, the <option>WITH OIDS</> clause must
+      that contains <type>OID</type>s, the <option>WITH OIDS</option> clause must
       be specified or the <varname>default_with_oids</varname>
       configuration parameter must be set. Users are encouraged to
-      explicitly specify <option>WITH OIDS</> if their tables
+      explicitly specify <option>WITH OIDS</option> if their tables
       require OIDs for compatibility with future releases of
       <productname>PostgreSQL</productname>.
      </para>
@@ -3581,7 +3581,7 @@ typedefs (Michael)</para></listitem>
        hurt performance. The new code uses a background writer to trickle
        disk writes at a steady pace so checkpoints have far fewer dirty
        pages to write to disk. Also, the new code does not issue a global
-       <function>sync()</> call, but instead <function>fsync()</>s just
+       <function>sync()</function> call, but instead <function>fsync()</function>s just
        the files written since the last checkpoint. This should improve
        performance and minimize degradation during checkpoints.
       </para>
@@ -3629,13 +3629,13 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Improved index usage with <literal>OR</> clauses (Tom)
+       Improved index usage with <literal>OR</literal> clauses (Tom)
       </para>
       <para>
        This allows the optimizer to use indexes in statements with many OR
        clauses that would not have been indexed in the past.  It can also use
        multi-column indexes where the first column is specified and the second
-       column is part of an <literal>OR</> clause.
+       column is part of an <literal>OR</literal> clause.
       </para>
      </listitem>
 
@@ -3645,7 +3645,7 @@ typedefs (Michael)</para></listitem>
       </para>
       <para>
        The server is now smarter about using partial indexes in queries
-       involving complex <option>WHERE</> clauses.
+       involving complex <option>WHERE</option> clauses.
       </para>
      </listitem>
 
@@ -3754,7 +3754,7 @@ typedefs (Michael)</para></listitem>
       </para>
       <para>
        It is now possible to log server messages conveniently without
-       relying on either <application>syslog</> or an external log
+       relying on either <application>syslog</application> or an external log
        rotation program.
       </para>
      </listitem>
@@ -3762,56 +3762,56 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Add new read-only server configuration parameters to show server
-       compile-time settings: <varname>block_size</>,
-       <varname>integer_datetimes</>, <varname>max_function_args</>,
-       <varname>max_identifier_length</>, <varname>max_index_keys</>  (Joe)
+       compile-time settings: <varname>block_size</varname>,
+       <varname>integer_datetimes</varname>, <varname>max_function_args</varname>,
+       <varname>max_identifier_length</varname>, <varname>max_index_keys</varname>  (Joe)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make quoting of <literal>sameuser</>, <literal>samegroup</>, and
-       <literal>all</> remove special meaning of these terms in
-       <filename>pg_hba.conf</> (Andrew)
+       Make quoting of <literal>sameuser</literal>, <literal>samegroup</literal>, and
+       <literal>all</literal> remove special meaning of these terms in
+       <filename>pg_hba.conf</filename> (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Use clearer IPv6 name <literal>::1/128</> for
-       <literal>localhost</> in default <filename>pg_hba.conf</> (Andrew)
+       Use clearer IPv6 name <literal>::1/128</literal> for
+       <literal>localhost</literal> in default <filename>pg_hba.conf</filename> (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Use CIDR format in <filename>pg_hba.conf</> examples (Andrew)
+       Use CIDR format in <filename>pg_hba.conf</filename> examples (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Rename server configuration parameters <varname>SortMem</> and
-       <varname>VacuumMem</> to <varname>work_mem</> and
-       <varname>maintenance_work_mem</> (Old names still supported) (Tom)
+       Rename server configuration parameters <varname>SortMem</varname> and
+       <varname>VacuumMem</varname> to <varname>work_mem</varname> and
+       <varname>maintenance_work_mem</varname> (Old names still supported) (Tom)
       </para>
       <para>
        This change was made to clarify that bulk operations such as index and
-       foreign key creation use <varname>maintenance_work_mem</>, while
-       <varname>work_mem</> is for workspaces used during query execution.
+       foreign key creation use <varname>maintenance_work_mem</varname>, while
+       <varname>work_mem</varname> is for workspaces used during query execution.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Allow logging of session disconnections using server configuration
-       <varname>log_disconnections</> (Andrew)
+       <varname>log_disconnections</varname> (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new server configuration parameter <varname>log_line_prefix</> to
+       Add new server configuration parameter <varname>log_line_prefix</varname> to
        allow control of information emitted in each log line (Andrew)
       </para>
       <para>
@@ -3822,21 +3822,21 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Remove server configuration parameters <varname>log_pid</>,
-       <varname>log_timestamp</>, <varname>log_source_port</>; functionality
-       superseded by <varname>log_line_prefix</> (Andrew)
+       Remove server configuration parameters <varname>log_pid</varname>,
+       <varname>log_timestamp</varname>, <varname>log_source_port</varname>; functionality
+       superseded by <varname>log_line_prefix</varname> (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Replace the <varname>virtual_host</> and <varname>tcpip_socket</>
-       parameters with a unified <varname>listen_addresses</> parameter
+       Replace the <varname>virtual_host</varname> and <varname>tcpip_socket</varname>
+       parameters with a unified <varname>listen_addresses</varname> parameter
        (Andrew, Tom)
       </para>
       <para>
-       <varname>virtual_host</> could only specify a single IP address to
-       listen on.  <varname>listen_addresses</> allows multiple addresses
+       <varname>virtual_host</varname> could only specify a single IP address to
+       listen on.  <varname>listen_addresses</varname> allows multiple addresses
        to be specified.
       </para>
      </listitem>
@@ -3844,10 +3844,10 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Listen on localhost by default, which eliminates the need for the
-       <option>-i</> postmaster switch in many scenarios (Andrew)
+       <option>-i</option> postmaster switch in many scenarios (Andrew)
       </para>
       <para>
-       Listening on localhost (<literal>127.0.0.1</>) opens no new
+       Listening on localhost (<literal>127.0.0.1</literal>) opens no new
        security holes but allows configurations like Windows and JDBC,
        which do not support local sockets, to work without special
        adjustments.
@@ -3856,17 +3856,17 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Remove <varname>syslog</> server configuration parameter, and add more
-       logical <varname>log_destination</> variable to control log output
+       Remove <varname>syslog</varname> server configuration parameter, and add more
+       logical <varname>log_destination</varname> variable to control log output
        location (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change server configuration parameter <varname>log_statement</> to take
-       values <varname>all</>, <varname>mod</>, <varname>ddl</>, or
-       <varname>none</> to select which queries are logged (Bruce)
+       Change server configuration parameter <varname>log_statement</varname> to take
+       values <varname>all</varname>, <varname>mod</varname>, <varname>ddl</varname>, or
+       <varname>none</varname> to select which queries are logged (Bruce)
       </para>
       <para>
        This allows administrators to log only data definition changes or
@@ -3877,12 +3877,12 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Some logging-related configuration parameters could formerly be adjusted
-       by ordinary users, but only in the <quote>more verbose</> direction.
+       by ordinary users, but only in the <quote>more verbose</quote> direction.
        They are now treated more strictly: only superusers can set them.
-       However, a superuser can use <command>ALTER USER</> to provide per-user
+       However, a superuser can use <command>ALTER USER</command> to provide per-user
        settings of these values for non-superusers.  Also, it is now possible
        for superusers to set values of superuser-only configuration parameters
-       via <literal>PGOPTIONS</>.
+       via <literal>PGOPTIONS</literal>.
       </para>
      </listitem>
 
@@ -3921,8 +3921,8 @@ typedefs (Michael)</para></listitem>
       </para>
       <para>
        It is now useful to issue <command>DECLARE CURSOR</command> in a
-       <function>Parse</> message with parameters. The parameter values
-       sent at <function>Bind</> time will be substituted into the
+       <function>Parse</function> message with parameters. The parameter values
+       sent at <function>Bind</function> time will be substituted into the
        execution of the cursor's query.
       </para>
      </listitem>
@@ -3942,7 +3942,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Make <varname>log_duration</> print only when <varname>log_statement</>
+       Make <varname>log_duration</varname> print only when <varname>log_statement</varname>
        prints the query (Ed L.)
       </para>
      </listitem>
@@ -4007,10 +4007,10 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Make <literal>CASE val WHEN compval1 THEN ...</> evaluate <literal>val</> only once (Tom)
+       Make <literal>CASE val WHEN compval1 THEN ...</literal> evaluate <literal>val</literal> only once (Tom)
       </para>
       <para>
-       <option>CASE</> no longer evaluates the tested expression multiple
+       <option>CASE</option> no longer evaluates the tested expression multiple
        times. This has benefits when the expression is complex or is
        volatile.
       </para>
@@ -4018,20 +4018,20 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Test <option>HAVING</> before computing target list of an
+       Test <option>HAVING</option> before computing target list of an
        aggregate query (Tom)
       </para>
       <para>
        Fixes improper failure of cases such as <literal>SELECT SUM(win)/SUM(lose)
-       ... GROUP BY ... HAVING SUM(lose) &gt; 0</>.  This should work but formerly
+       ... GROUP BY ... HAVING SUM(lose) &gt; 0</literal>.  This should work but formerly
        could fail with divide-by-zero.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Replace <varname>max_expr_depth</> parameter with
-       <varname>max_stack_depth</> parameter, measured in kilobytes of stack
+       Replace <varname>max_expr_depth</varname> parameter with
+       <varname>max_stack_depth</varname> parameter, measured in kilobytes of stack
        size (Tom)
       </para>
       <para>
@@ -4054,7 +4054,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Allow <option>LIKE</>/<option>ILIKE</> to be used as the operator
+       Allow <option>LIKE</option>/<option>ILIKE</option> to be used as the operator
        in row and subselect comparisons (Fabien Coelho)
       </para>
      </listitem>
@@ -4065,8 +4065,8 @@ typedefs (Michael)</para></listitem>
        identifiers and keywords (Tom)
       </para>
       <para>
-       This solves the <quote>Turkish problem</> with mangling of words
-       containing <literal>I</> and  <literal>i</>.  Folding of characters
+       This solves the <quote>Turkish problem</quote> with mangling of words
+       containing <literal>I</literal> and  <literal>i</literal>.  Folding of characters
        outside the 7-bit-ASCII set is still locale-aware.
       </para>
      </listitem>
@@ -4094,7 +4094,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Avoid emitting <option>NATURAL CROSS JOIN</> in rule listings (Tom)
+       Avoid emitting <option>NATURAL CROSS JOIN</option> in rule listings (Tom)
       </para>
       <para>
        Such a clause makes no logical sense, but in some cases the rule
@@ -4112,36 +4112,36 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <command>COMMENT ON</> for casts, conversions, languages,
+       Add <command>COMMENT ON</command> for casts, conversions, languages,
        operator classes, and large objects (Christopher)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new server configuration parameter <varname>default_with_oids</> to
-       control whether tables are created with <type>OID</>s by default (Neil)
+       Add new server configuration parameter <varname>default_with_oids</varname> to
+       control whether tables are created with <type>OID</type>s by default (Neil)
       </para>
       <para>
        This allows administrators to control whether <command>CREATE
-       TABLE</command> commands create tables with or without <type>OID</>
+       TABLE</command> commands create tables with or without <type>OID</type>
        columns by default.  (Note: the current factory default setting for
-       <varname>default_with_oids</> is <literal>TRUE</>, but the default
-       will become <literal>FALSE</> in future releases.)
+       <varname>default_with_oids</varname> is <literal>TRUE</literal>, but the default
+       will become <literal>FALSE</literal> in future releases.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>WITH</> / <option>WITHOUT OIDS</> clause to
+       Add <option>WITH</option> / <option>WITHOUT OIDS</option> clause to
        <command>CREATE TABLE AS</command> (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <command>ALTER TABLE DROP COLUMN</> to drop an <type>OID</>
-       column (<command>ALTER TABLE SET WITHOUT OIDS</> still works)
+       Allow <command>ALTER TABLE DROP COLUMN</command> to drop an <type>OID</type>
+       column (<command>ALTER TABLE SET WITHOUT OIDS</command> still works)
        (Tom)
       </para>
      </listitem>
@@ -4154,11 +4154,11 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Allow <command>ALTER ... ADD COLUMN</> with defaults and
-       <option>NOT NULL</> constraints; works per SQL spec (Rod)
+       Allow <command>ALTER ... ADD COLUMN</command> with defaults and
+       <option>NOT NULL</option> constraints; works per SQL spec (Rod)
       </para>
       <para>
-       It is now possible for <option>ADD COLUMN</> to create a column
+       It is now possible for <option>ADD COLUMN</option> to create a column
        that is not initially filled with NULLs, but with a specified
        default value.
       </para>
@@ -4166,7 +4166,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <command>ALTER COLUMN TYPE</> to change column's type (Rod)
+       Add <command>ALTER COLUMN TYPE</command> to change column's type (Rod)
       </para>
       <para>
        It is now possible to alter a column's data type without dropping
@@ -4176,14 +4176,14 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Allow multiple <command>ALTER</> actions in a single <command>ALTER
+       Allow multiple <command>ALTER</command> actions in a single <command>ALTER
        TABLE</command> command (Rod)
       </para>
       <para>
-       This is particularly useful for <command>ALTER</> commands that
-       rewrite the table (which include <option>ALTER COLUMN TYPE</> and
-       <option>ADD COLUMN</> with a default). By grouping
-       <command>ALTER</> commands together, the table need be rewritten
+       This is particularly useful for <command>ALTER</command> commands that
+       rewrite the table (which include <option>ALTER COLUMN TYPE</option> and
+       <option>ADD COLUMN</option> with a default). By grouping
+       <command>ALTER</command> commands together, the table need be rewritten
        only once.
       </para>
      </listitem>
@@ -4213,13 +4213,13 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Allow temporary object creation to be limited to <option>SECURITY
-       DEFINER</> functions (Sean Chittenden)
+       DEFINER</option> functions (Sean Chittenden)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>ALTER TABLE ... SET WITHOUT CLUSTER</> (Christopher)
+       Add <option>ALTER TABLE ... SET WITHOUT CLUSTER</option> (Christopher)
       </para>
       <para>
        Prior to this release, there was no way to clear an auto-cluster
@@ -4229,8 +4229,8 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Constraint/Index/<type>SERIAL</> names are now
-       <replaceable>table_column_type</>
+       Constraint/Index/<type>SERIAL</type> names are now
+       <replaceable>table_column_type</replaceable>
        with numbers appended to guarantee uniqueness within the schema
        (Tom)
       </para>
@@ -4242,11 +4242,11 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <function>pg_get_serial_sequence()</> to return a
-       <type>SERIAL</> column's sequence name (Christopher)
+       Add <function>pg_get_serial_sequence()</function> to return a
+       <type>SERIAL</type> column's sequence name (Christopher)
       </para>
       <para>
-       This allows automated scripts to reliably find the <type>SERIAL</>
+       This allows automated scripts to reliably find the <type>SERIAL</type>
        sequence name.
       </para>
      </listitem>
@@ -4259,14 +4259,14 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       New <command>ALTER INDEX</> command to allow moving of indexes
+       New <command>ALTER INDEX</command> command to allow moving of indexes
        between tablespaces (Gavin)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <command>ALTER TABLE OWNER</> change dependent sequence
+       Make <command>ALTER TABLE OWNER</command> change dependent sequence
        ownership too (Alvaro)
       </para>
      </listitem>
@@ -4289,18 +4289,18 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <option>ALSO</> keyword to <command>CREATE RULE</command> (Fabien
+       Add <option>ALSO</option> keyword to <command>CREATE RULE</command> (Fabien
        Coelho)
       </para>
       <para>
-       This allows <option>ALSO</> to be added to rule creation to contrast it with
-       <option>INSTEAD</> rules.
+       This allows <option>ALSO</option> to be added to rule creation to contrast it with
+       <option>INSTEAD</option> rules.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>NOWAIT</> option to <command>LOCK</command> (Tatsuo)
+       Add <option>NOWAIT</option> option to <command>LOCK</command> (Tatsuo)
       </para>
       <para>
        This allows the <command>LOCK</command> command to fail if it
@@ -4336,7 +4336,7 @@ typedefs (Michael)</para></listitem>
       </para>
       <para>
        In 7.3 and 7.4, a long-running B-tree index build could block concurrent
-       <command>CHECKPOINT</>s from completing, thereby causing WAL bloat because the
+       <command>CHECKPOINT</command>s from completing, thereby causing WAL bloat because the
        WAL log could not be recycled.
       </para>
      </listitem>
@@ -4384,11 +4384,11 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       New <application>pg_ctl</> <option>kill</> option for Windows (Andrew)
+       New <application>pg_ctl</application> <option>kill</option> option for Windows (Andrew)
       </para>
       <para>
-       Windows does not have a <literal>kill</> command to send signals to
-       backends so this capability was added to <application>pg_ctl</>.
+       Windows does not have a <literal>kill</literal> command to send signals to
+       backends so this capability was added to <application>pg_ctl</application>.
       </para>
      </listitem>
 
@@ -4400,7 +4400,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <option>--pwfile</> option to
+       Add <option>--pwfile</option> option to
        <application>initdb</application> so the initial password can be
        set by GUI tools (Magnus)
       </para>
@@ -4415,7 +4415,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <option>register</> command to <application>pg_ctl</> to
+       Add <option>register</option> command to <application>pg_ctl</application> to
        register Windows operating system service (Dave Page)
       </para>
      </listitem>
@@ -4443,7 +4443,7 @@ typedefs (Michael)</para></listitem>
        Reject nonrectangular array values as erroneous (Joe)
       </para>
       <para>
-       Formerly, <function>array_in</> would silently build a
+       Formerly, <function>array_in</function> would silently build a
        surprising result.
       </para>
      </listitem>
@@ -4457,13 +4457,13 @@ typedefs (Michael)</para></listitem>
       <listitem>
        <para>
         The arithmetic operators associated with the single-byte
-        <type>"char"</> data type have been removed.
+        <type>"char"</type> data type have been removed.
        </para>
        <para>
         Formerly, the parser would select these operators in many situations
-        where an <quote>unable to select an operator</> error would be more
-        appropriate, such as <literal>null * null</>.  If you actually want
-        to do arithmetic on a <type>"char"</> column, you can cast it to
+        where an <quote>unable to select an operator</quote> error would be more
+        appropriate, such as <literal>null * null</literal>.  If you actually want
+        to do arithmetic on a <type>"char"</type> column, you can cast it to
         integer explicitly.
        </para>
       </listitem>
@@ -4474,7 +4474,7 @@ typedefs (Michael)</para></listitem>
        </para>
       <para>
         Junk that was previously allowed in odd places with odd results
-        now causes an <literal>ERROR</>, for example, non-whitespace
+        now causes an <literal>ERROR</literal>, for example, non-whitespace
         after the closing right brace.
        </para>
      </listitem>
@@ -4482,7 +4482,7 @@ typedefs (Michael)</para></listitem>
      <listitem>
        <para>
         Empty-string array element values must now be written as
-        <literal>""</>, rather than writing nothing (Joe)
+        <literal>""</literal>, rather than writing nothing (Joe)
        </para>
       <para>
         Formerly, both ways of writing an empty-string element value were
@@ -4512,13 +4512,13 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Accept <literal>YYYY-monthname-DD</> as a date string (Tom)
+       Accept <literal>YYYY-monthname-DD</literal> as a date string (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <function>netmask</> and <function>hostmask</> functions
+       Make <function>netmask</function> and <function>hostmask</function> functions
        return maximum-length mask length (Tom)
       </para>
      </listitem>
@@ -4535,27 +4535,27 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       <function>to_char</>/<function>to_date()</> date conversion
+       <function>to_char</function>/<function>to_date()</function> date conversion
        improvements (Kurt Roeckx, Fabien Coelho)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <function>length()</> disregard trailing spaces in
-       <type>CHAR(n)</> (Gavin)
+       Make <function>length()</function> disregard trailing spaces in
+       <type>CHAR(n)</type> (Gavin)
       </para>
       <para>
        This change was made to improve consistency: trailing spaces are
-       semantically insignificant in <type>CHAR(n)</> data, so they
-       should not be counted by <function>length()</>.
+       semantically insignificant in <type>CHAR(n)</type> data, so they
+       should not be counted by <function>length()</function>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Warn about empty string being passed to
-       <type>OID</>/<type>float4</>/<type>float8</> data types (Neil)
+       <type>OID</type>/<type>float4</type>/<type>float8</type> data types (Neil)
       </para>
       <para>
        8.1 will throw an error instead.
@@ -4565,7 +4565,7 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Allow leading or trailing whitespace in
-       <type>int2</>/<type>int4</>/<type>int8</>/<type>float4</>/<type>float8</>
+       <type>int2</type>/<type>int4</type>/<type>int8</type>/<type>float4</type>/<type>float8</type>
        input routines
        (Neil)
       </para>
@@ -4573,7 +4573,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Better support for IEEE <literal>Infinity</> and <literal>NaN</>
+       Better support for IEEE <literal>Infinity</literal> and <literal>NaN</literal>
        values in <type>float4</type>/<type>float8</type> (Neil)
       </para>
       <para>
@@ -4584,27 +4584,27 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <option>week</> option to <function>date_trunc()</> (Robert Creager)
+       Add <option>week</option> option to <function>date_trunc()</function> (Robert Creager)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <function>to_char</function> for <literal>1 BC</>
-       (previously it returned <literal>1 AD</>) (Bruce)
+       Fix <function>to_char</function> for <literal>1 BC</literal>
+       (previously it returned <literal>1 AD</literal>) (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <function>date_part(year)</> for BC dates (previously it
+       Fix <function>date_part(year)</function> for BC dates (previously it
        returned one less than the correct year) (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <function>date_part()</> to return the proper millennium and
+       Fix <function>date_part()</function> to return the proper millennium and
        century (Fabien Coelho)
       </para>
       <para>
@@ -4616,44 +4616,44 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <function>ceiling()</> as an alias for <function>ceil()</>,
-       and <function>power()</> as an alias for <function>pow()</> for
+       Add <function>ceiling()</function> as an alias for <function>ceil()</function>,
+       and <function>power()</function> as an alias for <function>pow()</function> for
        standards compliance (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change <function>ln()</>, <function>log()</>,
-       <function>power()</>, and <function>sqrt()</> to emit the correct
-       <literal>SQLSTATE</> error codes for certain error conditions, as
+       Change <function>ln()</function>, <function>log()</function>,
+       <function>power()</function>, and <function>sqrt()</function> to emit the correct
+       <literal>SQLSTATE</literal> error codes for certain error conditions, as
        specified by SQL:2003 (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>width_bucket()</> function as defined by SQL:2003 (Neil)
+       Add <function>width_bucket()</function> function as defined by SQL:2003 (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>generate_series()</> functions to simplify working
+       Add <function>generate_series()</function> functions to simplify working
        with numeric sets (Joe)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <function>upper/lower/initcap()</> functions to work with
+       Fix <function>upper/lower/initcap()</function> functions to work with
        multibyte encodings (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add boolean and bitwise integer <option>AND</>/<option>OR</>
+       Add boolean and bitwise integer <option>AND</option>/<option>OR</option>
        aggregates (Fabien Coelho)
       </para>
      </listitem>
@@ -4679,17 +4679,17 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <type>interval</> plus <type>datetime</> operators (Tom)
+       Add <type>interval</type> plus <type>datetime</type> operators (Tom)
       </para>
       <para>
-       The reverse ordering, <type>datetime</> plus <type>interval</>,
+       The reverse ordering, <type>datetime</type> plus <type>interval</type>,
        was already supported, but both are required by the SQL standard.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Casting an integer to <type>BIT(N)</> selects the rightmost N bits
+       Casting an integer to <type>BIT(N)</type> selects the rightmost N bits
        of the integer
        (Tom)
       </para>
@@ -4702,7 +4702,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Require <type>CIDR</> values to have all nonmasked bits be zero
+       Require <type>CIDR</type> values to have all nonmasked bits be zero
        (Kevin Brintnall)
       </para>
      </listitem>
@@ -4717,7 +4717,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       In <literal>READ COMMITTED</> serialization mode, volatile functions
+       In <literal>READ COMMITTED</literal> serialization mode, volatile functions
        now see the results of concurrent transactions committed up to the
        beginning of each statement within the function, rather than up to the
        beginning of the interactive command that called the function.
@@ -4726,20 +4726,20 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Functions declared <literal>STABLE</> or <literal>IMMUTABLE</> always
+       Functions declared <literal>STABLE</literal> or <literal>IMMUTABLE</literal> always
        use the snapshot of the calling query, and therefore do not see the
        effects of actions taken after the calling query starts, whether in
        their own transaction or other transactions.  Such a function must be
        read-only, too, meaning that it cannot use any SQL commands other than
-       <command>SELECT</>.  There is a considerable performance gain from
-       declaring a function <literal>STABLE</> or <literal>IMMUTABLE</>
-       rather than <literal>VOLATILE</>.
+       <command>SELECT</command>.  There is a considerable performance gain from
+       declaring a function <literal>STABLE</literal> or <literal>IMMUTABLE</literal>
+       rather than <literal>VOLATILE</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Nondeferred <option>AFTER</> triggers are now fired immediately
+       Nondeferred <option>AFTER</option> triggers are now fired immediately
        after completion of the triggering query, rather than upon
        finishing the current interactive command. This makes a difference
        when the triggering query occurred within a function: the trigger
@@ -4801,8 +4801,8 @@ typedefs (Michael)</para></listitem>
        Improve parsing of PL/pgSQL FOR loops (Tom)
       </para>
       <para>
-       Parsing is now driven by presence of <literal>".."</> rather than
-       data type of <option>FOR</> variable. This makes no difference for
+       Parsing is now driven by presence of <literal>".."</literal> rather than
+       data type of <option>FOR</option> variable. This makes no difference for
        correct functions, but should result in more understandable error
        messages when a mistake is made.
       </para>
@@ -4818,18 +4818,18 @@ typedefs (Michael)</para></listitem>
       <para>
        In PL/Tcl, SPI commands are now run in subtransactions.  If an error
        occurs, the subtransaction is cleaned up and the error is reported
-       as an ordinary Tcl error, which can be trapped with <literal>catch</>.
+       as an ordinary Tcl error, which can be trapped with <literal>catch</literal>.
        Formerly, it was not possible to catch such errors.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Accept <command>ELSEIF</> in PL/pgSQL (Neil)
+       Accept <command>ELSEIF</command> in PL/pgSQL (Neil)
       </para>
       <para>
-       Previously PL/pgSQL only allowed <command>ELSIF</>, but many people
-       are accustomed to spelling this keyword <command>ELSEIF</>.
+       Previously PL/pgSQL only allowed <command>ELSIF</command>, but many people
+       are accustomed to spelling this keyword <command>ELSEIF</command>.
       </para>
      </listitem>
 
@@ -4838,47 +4838,47 @@ typedefs (Michael)</para></listitem>
 
 
    <sect3>
-    <title><application>psql</> Changes</title>
+    <title><application>psql</application> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Improve <application>psql</> information display about database
+       Improve <application>psql</application> information display about database
        objects (Christopher)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>psql</> to display group membership in
-       <command>\du</> and <command>\dg</> (Markus Bertheau)
+       Allow <application>psql</application> to display group membership in
+       <command>\du</command> and <command>\dg</command> (Markus Bertheau)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Prevent <application>psql</> <command>\dn</command> from showing
+       Prevent <application>psql</application> <command>\dn</command> from showing
        temporary schemas (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>psql</> to handle tilde user expansion for file
+       Allow <application>psql</application> to handle tilde user expansion for file
        names (Zach Irmen)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>psql</> to display fancy prompts, including
-       color, via <application>readline</> (Reece Hart, Chet Ramey)
+       Allow <application>psql</application> to display fancy prompts, including
+       color, via <application>readline</application> (Reece Hart, Chet Ramey)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <application>psql</> <command>\copy</> match <command>COPY</command> command syntax
+       Make <application>psql</application> <command>\copy</command> match <command>COPY</command> command syntax
        fully (Tom)
       </para>
      </listitem>
@@ -4891,55 +4891,55 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add <command>CLUSTER</command> information to <application>psql</>
-       <command>\d</> display
+       Add <command>CLUSTER</command> information to <application>psql</application>
+       <command>\d</command> display
        (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change <application>psql</> <command>\copy stdin/stdout</> to read
+       Change <application>psql</application> <command>\copy stdin/stdout</command> to read
        from command input/output (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>pstdin</>/<option>pstdout</> to read from
-       <application>psql</>'s <literal>stdin</>/<literal>stdout</> (Mark
+       Add <option>pstdin</option>/<option>pstdout</option> to read from
+       <application>psql</application>'s <literal>stdin</literal>/<literal>stdout</literal> (Mark
        Feit)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add global <application>psql</> configuration file, <filename>psqlrc.sample</filename>
+       Add global <application>psql</application> configuration file, <filename>psqlrc.sample</filename>
        (Bruce)
       </para>
       <para>
-       This allows a central file where global <application>psql</> startup commands can
+       This allows a central file where global <application>psql</application> startup commands can
        be stored.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have <application>psql</> <command>\d+</> indicate if the table
-       has an <type>OID</> column (Neil)
+       Have <application>psql</application> <command>\d+</command> indicate if the table
+       has an <type>OID</type> column (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       On Windows, use binary mode in <application>psql</> when reading files so control-Z
+       On Windows, use binary mode in <application>psql</application> when reading files so control-Z
        is not seen as end-of-file
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have <command>\dn+</> show permissions and description for schemas (Dennis
+       Have <command>\dn+</command> show permissions and description for schemas (Dennis
        Bj&ouml;rklund)
       </para>
      </listitem>
@@ -4961,13 +4961,13 @@ typedefs (Michael)</para></listitem>
 
 
    <sect3>
-    <title><application>pg_dump</> Changes</title>
+    <title><application>pg_dump</application> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
        Use dependency information to improve the reliability of
-       <application>pg_dump</> (Tom)
+       <application>pg_dump</application> (Tom)
       </para>
       <para>
        This should solve the longstanding problems with related objects
@@ -4977,7 +4977,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Have <application>pg_dump</> output objects in alphabetical order if possible (Tom)
+       Have <application>pg_dump</application> output objects in alphabetical order if possible (Tom)
       </para>
       <para>
        This should make it easier to identify changes between
@@ -4987,12 +4987,12 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Allow <application>pg_restore</> to ignore some SQL errors (Fabien Coelho)
+       Allow <application>pg_restore</application> to ignore some SQL errors (Fabien Coelho)
       </para>
       <para>
-       This makes <application>pg_restore</>'s behavior similar to the
-       results of feeding a <application>pg_dump</> output script to
-       <application>psql</>. In most cases, ignoring errors and plowing
+       This makes <application>pg_restore</application>'s behavior similar to the
+       results of feeding a <application>pg_dump</application> output script to
+       <application>psql</application>. In most cases, ignoring errors and plowing
        ahead is the most useful thing to do. Also added was a pg_restore
        option to give the old behavior of exiting on an error.
       </para>
@@ -5000,36 +5000,36 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       <application>pg_restore</> <option>-l</> display now includes
+       <application>pg_restore</application> <option>-l</option> display now includes
        objects' schema names
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New begin/end markers in <application>pg_dump</> text output (Bruce)
+       New begin/end markers in <application>pg_dump</application> text output (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add start/stop times for
-       <application>pg_dump</>/<application>pg_dumpall</> in verbose mode
+       <application>pg_dump</application>/<application>pg_dumpall</application> in verbose mode
        (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow most <application>pg_dump</> options in
-       <application>pg_dumpall</> (Christopher)
+       Allow most <application>pg_dump</application> options in
+       <application>pg_dumpall</application> (Christopher)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Have <application>pg_dump</> use <command>ALTER OWNER</> rather
-       than <command>SET SESSION AUTHORIZATION</> by default
+       Have <application>pg_dump</application> use <command>ALTER OWNER</command> rather
+       than <command>SET SESSION AUTHORIZATION</command> by default
        (Christopher)
       </para>
      </listitem>
@@ -5044,42 +5044,42 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Make libpq's <option>SIGPIPE</> handling thread-safe (Bruce)
+       Make libpq's <option>SIGPIPE</option> handling thread-safe (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>PQmbdsplen()</> which returns the display length
+       Add <function>PQmbdsplen()</function> which returns the display length
        of a character (Tatsuo)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add thread locking to <application>SSL</> and
-       <application>Kerberos</> connections (Manfred Spraul)
+       Add thread locking to <application>SSL</application> and
+       <application>Kerberos</application> connections (Manfred Spraul)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <function>PQoidValue()</>, <function>PQcmdTuples()</>, and
-       <function>PQoidStatus()</> to work on <command>EXECUTE</command>
+       Allow <function>PQoidValue()</function>, <function>PQcmdTuples()</function>, and
+       <function>PQoidStatus()</function> to work on <command>EXECUTE</command>
        commands (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>PQserverVersion()</> to provide more convenient
+       Add <function>PQserverVersion()</function> to provide more convenient
        access to the server version number (Greg Sabino Mullane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>PQprepare/PQsendPrepared()</> functions to support
+       Add <function>PQprepare/PQsendPrepared()</function> functions to support
        preparing statements without necessarily specifying the data types
        of their parameters (Abhijit Menon-Sen)
       </para>
@@ -5087,7 +5087,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Many ECPG improvements, including <command>SET DESCRIPTOR</> (Michael)
+       Many ECPG improvements, including <command>SET DESCRIPTOR</command> (Michael)
       </para>
      </listitem>
 
@@ -5127,7 +5127,7 @@ typedefs (Michael)</para></listitem>
       </para>
       <para>
        Directory paths for installed files (such as the
-       <filename>/share</> directory) are now computed relative to the
+       <filename>/share</filename> directory) are now computed relative to the
        actual location of the executables, so that an installation tree
        can be moved to another place without reconfiguring and
        rebuilding.
@@ -5136,31 +5136,31 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Use <option>--with-docdir</> to choose installation location of documentation; also
-       allow <option>--infodir</> (Peter)
+       Use <option>--with-docdir</option> to choose installation location of documentation; also
+       allow <option>--infodir</option> (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>--without-docdir</> to prevent installation of documentation (Peter)
+       Add <option>--without-docdir</option> to prevent installation of documentation (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Upgrade to <application>DocBook</> V4.2 SGML (Peter)
+       Upgrade to <application>DocBook</application> V4.2 SGML (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New <literal>PostgreSQL</> <application>CVS</> tag (Marc)
+       New <literal>PostgreSQL</literal> <application>CVS</application> tag (Marc)
       </para>
       <para>
        This was done to make it easier for organizations to manage their
        own copies of the <productname>PostgreSQL</productname>
-       <application>CVS</> repository. File version stamps from the master
+       <application>CVS</application> repository. File version stamps from the master
        repository will not get munged by checking into or out of a copied
        repository.
       </para>
@@ -5186,7 +5186,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Add inlined test-and-set code on PA-RISC for <application>gcc</>
+       Add inlined test-and-set code on PA-RISC for <application>gcc</application>
        (ViSolve, Tom)
       </para>
      </listitem>
@@ -5200,7 +5200,7 @@ typedefs (Michael)</para></listitem>
      <listitem>
       <para>
        Clean up spinlock assembly code to avoid warnings from newer
-       <application>gcc</> releases (Tom)
+       <application>gcc</application> releases (Tom)
       </para>
      </listitem>
 
@@ -5230,7 +5230,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       New <function>fsync()</> test program (Bruce)
+       New <function>fsync()</function> test program (Bruce)
       </para>
      </listitem>
 
@@ -5268,7 +5268,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Use Olson's public domain <application>timezone</> library (Magnus)
+       Use Olson's public domain <application>timezone</application> library (Magnus)
       </para>
      </listitem>
 
@@ -5285,7 +5285,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       <application>psql</> now uses a <application>flex</>-generated
+       <application>psql</application> now uses a <application>flex</application>-generated
        lexical analyzer to process command strings
       </para>
      </listitem>
@@ -5322,7 +5322,7 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       New <application>pgevent</> for Windows logging
+       New <application>pgevent</application> for Windows logging
       </para>
      </listitem>
 
@@ -5342,19 +5342,19 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       Overhaul of <filename>contrib/dblink</> (Joe)
+       Overhaul of <filename>contrib/dblink</filename> (Joe)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <filename>contrib/dbmirror</> improvements (Steven Singer)
+       <filename>contrib/dbmirror</filename> improvements (Steven Singer)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New <filename>contrib/xml2</> (John Gray, Torchbox)
+       New <filename>contrib/xml2</filename> (John Gray, Torchbox)
       </para>
      </listitem>
 
@@ -5366,51 +5366,51 @@ typedefs (Michael)</para></listitem>
 
      <listitem>
       <para>
-       New version of <filename>contrib/btree_gist</> (Teodor)
+       New version of <filename>contrib/btree_gist</filename> (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       New <filename>contrib/trgm</>, trigram matching for
+       New <filename>contrib/trgm</filename>, trigram matching for
        <productname>PostgreSQL</productname> (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Many <filename>contrib/tsearch2</> improvements (Teodor)
+       Many <filename>contrib/tsearch2</filename> improvements (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add double metaphone to <filename>contrib/fuzzystrmatch</> (Andrew)
+       Add double metaphone to <filename>contrib/fuzzystrmatch</filename> (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <filename>contrib/pg_autovacuum</> to run as a Windows service (Dave Page)
+       Allow <filename>contrib/pg_autovacuum</filename> to run as a Windows service (Dave Page)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add functions to <filename>contrib/dbsize</> (Andreas Pflug)
+       Add functions to <filename>contrib/dbsize</filename> (Andreas Pflug)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Removed <filename>contrib/pg_logger</>: obsoleted by integrated logging
+       Removed <filename>contrib/pg_logger</filename>: obsoleted by integrated logging
        subprocess
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Removed <filename>contrib/rserv</>: obsoleted by various separate projects
+       Removed <filename>contrib/rserv</filename>: obsoleted by various separate projects
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/release-8.1.sgml b/doc/src/sgml/release-8.1.sgml
index d48bccd17d..44a30892fd 100644
--- a/doc/src/sgml/release-8.1.sgml
+++ b/doc/src/sgml/release-8.1.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 8.1.22.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 8.1.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -27,7 +27,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
-    see <xref linkend="release-8-1-18">.
+    see <xref linkend="release-8-1-18"/>.
    </para>
 
   </sect2>
@@ -40,17 +40,17 @@
     <listitem>
      <para>
       Force the default
-      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>
-      to be <literal>fdatasync</> on Linux (Tom Lane, Marti Raudsepp)
+      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>
+      to be <literal>fdatasync</literal> on Linux (Tom Lane, Marti Raudsepp)
      </para>
 
      <para>
-      The default on Linux has actually been <literal>fdatasync</> for many
-      years, but recent kernel changes caused <productname>PostgreSQL</> to
-      choose <literal>open_datasync</> instead.  This choice did not result
+      The default on Linux has actually been <literal>fdatasync</literal> for many
+      years, but recent kernel changes caused <productname>PostgreSQL</productname> to
+      choose <literal>open_datasync</literal> instead.  This choice did not result
       in any performance improvement, and caused outright failures on
-      certain filesystems, notably <literal>ext4</> with the
-      <literal>data=journal</> mount option.
+      certain filesystems, notably <literal>ext4</literal> with the
+      <literal>data=journal</literal> mount option.
      </para>
     </listitem>
 
@@ -63,19 +63,19 @@
 
     <listitem>
      <para>
-      Add support for detecting register-stack overrun on <literal>IA64</>
+      Add support for detecting register-stack overrun on <literal>IA64</literal>
       (Tom Lane)
      </para>
 
      <para>
-      The <literal>IA64</> architecture has two hardware stacks.  Full
+      The <literal>IA64</literal> architecture has two hardware stacks.  Full
       prevention of stack-overrun failures requires checking both.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a check for stack overflow in <function>copyObject()</> (Tom Lane)
+      Add a check for stack overflow in <function>copyObject()</function> (Tom Lane)
      </para>
 
      <para>
@@ -91,7 +91,7 @@
      </para>
 
      <para>
-      It is possible to have a <quote>concurrent</> page split in a
+      It is possible to have a <quote>concurrent</quote> page split in a
       temporary index, if for example there is an open cursor scanning the
       index when an insertion is done.  GiST failed to detect this case and
       hence could deliver wrong results when execution of the cursor
@@ -101,7 +101,7 @@
 
     <listitem>
      <para>
-      Avoid memory leakage while <command>ANALYZE</>'ing complex index
+      Avoid memory leakage while <command>ANALYZE</command>'ing complex index
       expressions (Tom Lane)
      </para>
     </listitem>
@@ -113,14 +113,14 @@
      </para>
 
      <para>
-      An index declared like <literal>create index i on t (foo(t.*))</>
+      An index declared like <literal>create index i on t (foo(t.*))</literal>
       would not automatically get dropped when its table was dropped.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not <quote>inline</> a SQL function with multiple <literal>OUT</>
+      Do not <quote>inline</quote> a SQL function with multiple <literal>OUT</literal>
       parameters (Tom Lane)
      </para>
 
@@ -132,7 +132,7 @@
 
     <listitem>
      <para>
-      Fix constant-folding of <literal>COALESCE()</> expressions (Tom Lane)
+      Fix constant-folding of <literal>COALESCE()</literal> expressions (Tom Lane)
      </para>
 
      <para>
@@ -143,11 +143,11 @@
 
     <listitem>
      <para>
-      Add print functionality for <structname>InhRelation</> nodes (Tom Lane)
+      Add print functionality for <structname>InhRelation</structname> nodes (Tom Lane)
      </para>
 
      <para>
-      This avoids a failure when <varname>debug_print_parse</> is enabled
+      This avoids a failure when <varname>debug_print_parse</varname> is enabled
       and certain types of query are executed.
      </para>
     </listitem>
@@ -166,29 +166,29 @@
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s handling of <quote>simple</>
+      Fix <application>PL/pgSQL</application>'s handling of <quote>simple</quote>
       expressions to not fail in recursion or error-recovery cases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/cube</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/cube</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>cube</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>cube</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't emit <quote>identifier will be truncated</> notices in
-      <filename>contrib/dblink</> except when creating new connections
+      Don't emit <quote>identifier will be truncated</quote> notices in
+      <filename>contrib/dblink</filename> except when creating new connections
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -196,20 +196,20 @@
     <listitem>
      <para>
       Fix potential coredump on missing public key in
-      <filename>contrib/pgcrypto</> (Marti Raudsepp)
+      <filename>contrib/pgcrypto</filename> (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/xml2</>'s XPath query functions
+      Fix memory leak in <filename>contrib/xml2</filename>'s XPath query functions
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010o
+      Update time zone data files to <application>tzdata</application> release 2010o
       for DST law changes in Fiji and Samoa;
       also historical corrections for Hong Kong.
      </para>
@@ -231,11 +231,11 @@
   <para>
    This release contains a variety of fixes from 8.1.21.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.1.X release series in November 2010.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -246,7 +246,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
-    see <xref linkend="release-8-1-18">.
+    see <xref linkend="release-8-1-18"/>.
    </para>
 
   </sect2>
@@ -266,7 +266,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -295,7 +295,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -337,7 +337,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -363,7 +363,7 @@
 
     <listitem>
      <para>
-      Fix <varname>log_line_prefix</>'s <literal>%i</> escape,
+      Fix <varname>log_line_prefix</varname>'s <literal>%i</literal> escape,
       which could produce junk early in backend startup (Tom Lane)
      </para>
     </listitem>
@@ -371,28 +371,28 @@
     <listitem>
      <para>
       Fix possible data corruption in <command>ALTER TABLE ... SET
-      TABLESPACE</> when archiving is enabled (Jeff Davis)
+      TABLESPACE</command> when archiving is enabled (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>CREATE DATABASE</> and <command>ALTER DATABASE ... SET
-      TABLESPACE</> to be interrupted by query-cancel (Guillaume Lelarge)
+      Allow <command>CREATE DATABASE</command> and <command>ALTER DATABASE ... SET
+      TABLESPACE</command> to be interrupted by query-cancel (Guillaume Lelarge)
      </para>
     </listitem>
 
     <listitem>
      <para>
       In PL/Python, defend against null pointer results from
-      <function>PyCObject_AsVoidPtr</> and <function>PyCObject_FromVoidPtr</>
+      <function>PyCObject_AsVoidPtr</function> and <function>PyCObject_FromVoidPtr</function>
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -400,13 +400,13 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle connection names longer than
+      Fix <filename>contrib/dblink</filename> to handle connection names longer than
       62 bytes correctly (Itagaki Takahiro)
      </para>
     </listitem>
@@ -420,7 +420,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010l
+      Update time zone data files to <application>tzdata</application> release 2010l
       for DST law changes in Egypt and Palestine; also historical corrections
       for Finland.
      </para>
@@ -449,7 +449,7 @@
   <para>
    This release contains a variety of fixes from 8.1.20.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -458,7 +458,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
-    see <xref linkend="release-8-1-18">.
+    see <xref linkend="release-8-1-18"/>.
    </para>
 
   </sect2>
@@ -470,19 +470,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -491,19 +491,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -516,10 +516,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -527,7 +527,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -539,7 +539,7 @@
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -552,14 +552,14 @@
 
     <listitem>
      <para>
-      Prevent infinite recursion in <application>psql</> when expanding
+      Prevent infinite recursion in <application>psql</application> when expanding
       a variable that refers to itself (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -567,7 +567,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -580,7 +580,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010j
+      Update time zone data files to <application>tzdata</application> release 2010j
       for DST law changes in Argentina, Australian Antarctic, Bangladesh,
       Mexico, Morocco, Pakistan, Palestine, Russia, Syria, Tunisia;
       also historical corrections for Taiwan.
@@ -603,7 +603,7 @@
   <para>
    This release contains a variety of fixes from 8.1.19.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -612,7 +612,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
-    see <xref linkend="release-8-1-18">.
+    see <xref linkend="release-8-1-18"/>.
    </para>
 
   </sect2>
@@ -624,7 +624,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -653,8 +653,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -680,7 +680,7 @@
 
     <listitem>
      <para>
-      Fix the <literal>STOP WAL LOCATION</> entry in backup history files to
+      Fix the <literal>STOP WAL LOCATION</literal> entry in backup history files to
       report the next WAL segment's name when the end location is exactly at a
       segment boundary (Itagaki Takahiro)
      </para>
@@ -700,17 +700,17 @@
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -718,14 +718,14 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>numericlocale</> option to not
+      Fix <application>psql</application>'s <literal>numericlocale</literal> option to not
       format strings it shouldn't in latex and troff output formats (Heikki)
      </para>
     </listitem>
@@ -739,7 +739,7 @@
 
     <listitem>
      <para>
-      Add <literal>volatile</> markings in PL/Python to avoid possible
+      Add <literal>volatile</literal> markings in PL/Python to avoid possible
       compiler-specific misbehavior (Zdenek Kotala)
      </para>
     </listitem>
@@ -751,28 +751,28 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted crashes in <filename>contrib/xml2</> caused by sloppy
+      Fix assorted crashes in <filename>contrib/xml2</filename> caused by sloppy
       memory management (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010e
+      Update time zone data files to <application>tzdata</application> release 2010e
       for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.
      </para>
     </listitem>
@@ -793,7 +793,7 @@
   <para>
    This release contains a variety of fixes from 8.1.18.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -802,7 +802,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.18,
-    see <xref linkend="release-8-1-18">.
+    see <xref linkend="release-8-1-18"/>.
    </para>
 
   </sect2>
@@ -844,14 +844,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -870,7 +870,7 @@
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -896,7 +896,7 @@
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -906,14 +906,14 @@
     <listitem>
      <para>
       Fix processing of ownership dependencies during <literal>CREATE OR
-      REPLACE FUNCTION</> (Tom)
+      REPLACE FUNCTION</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that Perl arrays are properly converted to
-      <productname>PostgreSQL</> arrays when returned by a set-returning
+      <productname>PostgreSQL</productname> arrays when returned by a set-returning
       PL/Perl function (Andrew Dunstan, Abhijit Menon-Sen)
      </para>
 
@@ -930,20 +930,20 @@
 
     <listitem>
      <para>
-      Ensure <application>psql</>'s flex module is compiled with the correct
+      Ensure <application>psql</application>'s flex module is compiled with the correct
       system header definitions (Tom)
      </para>
 
      <para>
       This fixes build failures on platforms where
-      <literal>--enable-largefile</> causes incompatible changes in the
+      <literal>--enable-largefile</literal> causes incompatible changes in the
       generated code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -951,7 +951,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009s
+      Update time zone data files to <application>tzdata</application> release 2009s
       for DST law changes in Antarctica, Argentina, Bangladesh, Fiji,
       Novokuznetsk, Pakistan, Palestine, Samoa, Syria; also historical
       corrections for Hong Kong.
@@ -974,7 +974,7 @@
   <para>
    This release contains a variety of fixes from 8.1.17.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -982,10 +982,10 @@
 
    <para>
     A dump/restore is not required for those running 8.1.X.
-    However, if you have any hash indexes on <type>interval</> columns,
-    you must <command>REINDEX</> them after updating to 8.1.18.
+    However, if you have any hash indexes on <type>interval</type> columns,
+    you must <command>REINDEX</command> them after updating to 8.1.18.
     Also, if you are upgrading from a version earlier than 8.1.15,
-    see <xref linkend="release-8-1-15">.
+    see <xref linkend="release-8-1-15"/>.
    </para>
 
   </sect2>
@@ -997,14 +997,14 @@
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
@@ -1018,32 +1018,32 @@
 
     <listitem>
      <para>
-      Fix hash calculation for data type <type>interval</> (Tom)
+      Fix hash calculation for data type <type>interval</type> (Tom)
      </para>
 
      <para>
       This corrects wrong results for hash joins on interval values.
       It also changes the contents of hash indexes on interval columns.
-      If you have any such indexes, you must <command>REINDEX</> them
+      If you have any such indexes, you must <command>REINDEX</command> them
       after updating.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Treat <function>to_char(..., 'TH')</> as an uppercase ordinal
-      suffix with <literal>'HH'</>/<literal>'HH12'</> (Heikki)
+      Treat <function>to_char(..., 'TH')</function> as an uppercase ordinal
+      suffix with <literal>'HH'</literal>/<literal>'HH12'</literal> (Heikki)
      </para>
 
      <para>
-      It was previously handled as <literal>'th'</> (lowercase).
+      It was previously handled as <literal>'th'</literal> (lowercase).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -1060,7 +1060,7 @@
 
     <listitem>
      <para>
-      Fix <type>money</> data type to work in locales where currency
+      Fix <type>money</type> data type to work in locales where currency
       amounts have no fractional digits, e.g. Japan (Itagaki Takahiro)
      </para>
     </listitem>
@@ -1068,7 +1068,7 @@
     <listitem>
      <para>
       Properly round datetime input like
-      <literal>00:12:57.9999999999999999999999999999</> (Tom)
+      <literal>00:12:57.9999999999999999999999999999</literal> (Tom)
      </para>
     </listitem>
 
@@ -1087,22 +1087,22 @@
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to not go into an infinite loop if
-      <filename>postgresql.conf</> is empty (Jeff Davis)
+      Fix <application>pg_ctl</application> to not go into an infinite loop if
+      <filename>postgresql.conf</filename> is empty (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s <function>xslt_process()</> to
+      Fix <filename>contrib/xml2</filename>'s <function>xslt_process()</function> to
       properly handle the maximum number of parameters (twenty) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -1115,7 +1115,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009l
+      Update time zone data files to <application>tzdata</application> release 2009l
       for DST law changes in Bangladesh, Egypt, Jordan, Pakistan,
       Argentina/San_Luis, Cuba, Jordan (historical correction only),
       Mauritius, Morocco, Palestine, Syria, Tunisia.
@@ -1138,7 +1138,7 @@
   <para>
    This release contains a variety of fixes from 8.1.16.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1147,7 +1147,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.15,
-    see <xref linkend="release-8-1-15">.
+    see <xref linkend="release-8-1-15"/>.
    </para>
 
   </sect2>
@@ -1166,7 +1166,7 @@
       This change extends fixes made in the last two minor releases for
       related failure scenarios.  The previous fixes were narrowly tailored
       for the original problem reports, but we have now recognized that
-      <emphasis>any</> error thrown by an encoding conversion function could
+      <emphasis>any</emphasis> error thrown by an encoding conversion function could
       potentially lead to infinite recursion while trying to report the
       error.  The solution therefore is to disable translation and encoding
       conversion and report the plain-ASCII form of any error message,
@@ -1177,7 +1177,7 @@
 
     <listitem>
      <para>
-      Disallow <command>CREATE CONVERSION</> with the wrong encodings
+      Disallow <command>CREATE CONVERSION</command> with the wrong encodings
       for the specified conversion function (Heikki)
      </para>
 
@@ -1190,20 +1190,20 @@
 
     <listitem>
      <para>
-      Fix core dump when <function>to_char()</> is given format codes that
+      Fix core dump when <function>to_char()</function> is given format codes that
       are inappropriate for the type of the data argument (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix decompilation of <literal>CASE WHEN</> with an implicit coercion
+      Fix decompilation of <literal>CASE WHEN</literal> with an implicit coercion
       (Tom)
      </para>
 
      <para>
       This mistake could lead to Assert failures in an Assert-enabled build,
-      or an <quote>unexpected CASE WHEN clause</> error message in other
+      or an <quote>unexpected CASE WHEN clause</quote> error message in other
       cases, when trying to examine or dump a view.
      </para>
     </listitem>
@@ -1214,15 +1214,15 @@
      </para>
 
      <para>
-      If <command>CLUSTER</> or a rewriting variant of <command>ALTER TABLE</>
+      If <command>CLUSTER</command> or a rewriting variant of <command>ALTER TABLE</command>
       were executed by someone other than the table owner, the
-      <structname>pg_type</> entry for the table's TOAST table would end up
+      <structname>pg_type</structname> entry for the table's TOAST table would end up
       marked as owned by that someone.  This caused no immediate problems,
       since the permissions on the TOAST rowtype aren't examined by any
       ordinary database operation.  However, it could lead to unexpected
       failures if one later tried to drop the role that issued the command
-      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</>
-      warnings from <application>pg_dump</> after having done so (in 8.3).
+      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</quote>
+      warnings from <application>pg_dump</application> after having done so (in 8.3).
      </para>
     </listitem>
 
@@ -1240,7 +1240,7 @@
 
     <listitem>
      <para>
-      Add <literal>MUST</> (Mauritius Island Summer Time) to the default list
+      Add <literal>MUST</literal> (Mauritius Island Summer Time) to the default list
       of known timezone abbreviations (Xavier Bugaud)
      </para>
     </listitem>
@@ -1261,7 +1261,7 @@
   <para>
    This release contains a variety of fixes from 8.1.15.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1270,7 +1270,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.15,
-    see <xref linkend="release-8-1-15">.
+    see <xref linkend="release-8-1-15"/>.
    </para>
 
   </sect2>
@@ -1294,13 +1294,13 @@
 
     <listitem>
      <para>
-      Improve handling of URLs in <function>headline()</> function (Teodor)
+      Improve handling of URLs in <function>headline()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of overlength headlines in <function>headline()</>
+      Improve handling of overlength headlines in <function>headline()</function>
       function (Teodor)
      </para>
     </listitem>
@@ -1315,7 +1315,7 @@
 
     <listitem>
      <para>
-      Avoid unnecessary locking of small tables in <command>VACUUM</>
+      Avoid unnecessary locking of small tables in <command>VACUUM</command>
       (Heikki)
      </para>
     </listitem>
@@ -1337,30 +1337,30 @@
 
     <listitem>
      <para>
-      Fix uninitialized variables in <filename>contrib/tsearch2</>'s
-      <function>get_covers()</> function (Teodor)
+      Fix uninitialized variables in <filename>contrib/tsearch2</filename>'s
+      <function>get_covers()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>configure</> script to properly report failure when
+      Fix <application>configure</application> script to properly report failure when
       unable to obtain linkage information for PL/Perl (Andrew)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make all documentation reference <literal>pgsql-bugs</> and/or
-      <literal>pgsql-hackers</> as appropriate, instead of the
-      now-decommissioned <literal>pgsql-ports</> and <literal>pgsql-patches</>
+      Make all documentation reference <literal>pgsql-bugs</literal> and/or
+      <literal>pgsql-hackers</literal> as appropriate, instead of the
+      now-decommissioned <literal>pgsql-ports</literal> and <literal>pgsql-patches</literal>
       mailing lists (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009a (for
+      Update time zone data files to <application>tzdata</application> release 2009a (for
       Kathmandu and historical DST corrections in Switzerland, Cuba)
      </para>
     </listitem>
@@ -1381,7 +1381,7 @@
   <para>
    This release contains a variety of fixes from 8.1.14.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1390,8 +1390,8 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.  Also, if you were running a previous
-    8.1.X release, it is recommended to <command>REINDEX</> all GiST
+    see <xref linkend="release-8-1-2"/>.  Also, if you were running a previous
+    8.1.X release, it is recommended to <command>REINDEX</command> all GiST
     indexes after the upgrade.
    </para>
 
@@ -1405,13 +1405,13 @@
     <listitem>
      <para>
       Fix GiST index corruption due to marking the wrong index entry
-      <quote>dead</> after a deletion (Teodor)
+      <quote>dead</quote> after a deletion (Teodor)
      </para>
 
      <para>
       This would result in index searches failing to find rows they
       should have found.  Corrupted indexes can be fixed with
-      <command>REINDEX</>.
+      <command>REINDEX</command>.
      </para>
     </listitem>
 
@@ -1423,7 +1423,7 @@
 
      <para>
       We have addressed similar issues before, but it would still fail if
-      the <quote>character has no equivalent</> message itself couldn't
+      the <quote>character has no equivalent</quote> message itself couldn't
       be converted.  The fix is to disable localization and send the plain
       ASCII error message when we detect such a situation.
      </para>
@@ -1438,13 +1438,13 @@
 
     <listitem>
      <para>
-      Fix mis-expansion of rule queries when a sub-<literal>SELECT</> appears
-      in a function call in <literal>FROM</>,  a multi-row <literal>VALUES</>
-      list, or a <literal>RETURNING</> list (Tom)
+      Fix mis-expansion of rule queries when a sub-<literal>SELECT</literal> appears
+      in a function call in <literal>FROM</literal>,  a multi-row <literal>VALUES</literal>
+      list, or a <literal>RETURNING</literal> list (Tom)
      </para>
 
      <para>
-      The usual symptom of this problem is an <quote>unrecognized node type</>
+      The usual symptom of this problem is an <quote>unrecognized node type</quote>
       error.
      </para>
     </listitem>
@@ -1458,9 +1458,9 @@
 
     <listitem>
      <para>
-      Prevent possible collision of <structfield>relfilenode</> numbers
+      Prevent possible collision of <structfield>relfilenode</structfield> numbers
       when moving a table to another tablespace with <command>ALTER SET
-      TABLESPACE</> (Heikki)
+      TABLESPACE</command> (Heikki)
      </para>
 
      <para>
@@ -1479,14 +1479,14 @@
     <listitem>
      <para>
       Fix improper display of fractional seconds in interval values when
-      using a non-ISO datestyle in an <option>--enable-integer-datetimes</>
+      using a non-ISO datestyle in an <option>--enable-integer-datetimes</option>
       build (Ron Mayer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>SPI_getvalue</> and <function>SPI_getbinval</>
+      Ensure <function>SPI_getvalue</function> and <function>SPI_getbinval</function>
       behave correctly when the passed tuple and tuple descriptor have
       different numbers of columns (Tom)
      </para>
@@ -1500,19 +1500,19 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s parsing of <command>CREATE ROLE</> (Michael)
+      Fix <application>ecpg</application>'s parsing of <command>CREATE ROLE</command> (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix recent breakage of <literal>pg_ctl restart</> (Tom)
+      Fix recent breakage of <literal>pg_ctl restart</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008i (for
+      Update time zone data files to <application>tzdata</application> release 2008i (for
       DST law changes in Argentina, Brazil, Mauritius, Syria)
      </para>
     </listitem>
@@ -1533,7 +1533,7 @@
   <para>
    This release contains a variety of fixes from 8.1.13.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1542,7 +1542,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -1560,7 +1560,7 @@
      <para>
       This responds to reports that the counters could overflow in
       sufficiently long transactions, leading to unexpected <quote>lock is
-      already held</> errors.
+      already held</quote> errors.
      </para>
     </listitem>
 
@@ -1573,12 +1573,12 @@
     <listitem>
      <para>
       Add checks in executor startup to ensure that the tuples produced by an
-      <command>INSERT</> or <command>UPDATE</> will match the target table's
+      <command>INSERT</command> or <command>UPDATE</command> will match the target table's
       current rowtype (Tom)
      </para>
 
      <para>
-      <command>ALTER COLUMN TYPE</>, followed by re-use of a previously
+      <command>ALTER COLUMN TYPE</command>, followed by re-use of a previously
       cached plan, could produce this type of situation.  The check protects
       against data corruption and/or crashes that could ensue.
      </para>
@@ -1586,18 +1586,18 @@
 
     <listitem>
      <para>
-      Fix <literal>AT TIME ZONE</> to first try to interpret its timezone
+      Fix <literal>AT TIME ZONE</literal> to first try to interpret its timezone
       argument as a timezone abbreviation, and only try it as a full timezone
       name if that fails, rather than the other way around as formerly (Tom)
      </para>
 
      <para>
       The timestamp input functions have always resolved ambiguous zone names
-      in this order.  Making <literal>AT TIME ZONE</> do so as well improves
+      in this order.  Making <literal>AT TIME ZONE</literal> do so as well improves
       consistency, and fixes a compatibility bug introduced in 8.1:
       in ambiguous cases we now behave the same as 8.0 and before did,
-      since in the older versions <literal>AT TIME ZONE</> accepted
-      <emphasis>only</> abbreviations.
+      since in the older versions <literal>AT TIME ZONE</literal> accepted
+      <emphasis>only</emphasis> abbreviations.
      </para>
     </listitem>
 
@@ -1617,7 +1617,7 @@
     <listitem>
      <para>
       Fix bug in backwards scanning of a cursor on a <literal>SELECT DISTINCT
-      ON</> query (Tom)
+      ON</literal> query (Tom)
      </para>
     </listitem>
 
@@ -1635,21 +1635,21 @@
 
     <listitem>
      <para>
-      Fix planner to estimate that <literal>GROUP BY</> expressions yielding
+      Fix planner to estimate that <literal>GROUP BY</literal> expressions yielding
       boolean results always result in two groups, regardless of the
       expressions' contents (Tom)
      </para>
 
      <para>
       This is very substantially more accurate than the regular <literal>GROUP
-      BY</> estimate for certain boolean tests like <replaceable>col</>
-      <literal>IS NULL</>.
+      BY</literal> estimate for certain boolean tests like <replaceable>col</replaceable>
+      <literal>IS NULL</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable
+      Fix PL/pgSQL to not fail when a <literal>FOR</literal> loop's target variable
       is a record containing composite-type fields (Tom)
      </para>
     </listitem>
@@ -1673,21 +1673,21 @@
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       error reporting after failure to send a SQL command (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to properly preserve postmaster
-      command-line arguments across a <literal>restart</> (Bruce)
+      Fix <application>pg_ctl</application> to properly preserve postmaster
+      command-line arguments across a <literal>restart</literal> (Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008f (for
+      Update time zone data files to <application>tzdata</application> release 2008f (for
       DST law changes in Argentina, Bahamas, Brazil, Mauritius, Morocco,
       Pakistan, Palestine, and Paraguay)
      </para>
@@ -1709,7 +1709,7 @@
   <para>
    This release contains one serious and one minor bug fix over 8.1.12.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1718,7 +1718,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -1730,18 +1730,18 @@
 
     <listitem>
      <para>
-      Make <function>pg_get_ruledef()</> parenthesize negative constants (Tom)
+      Make <function>pg_get_ruledef()</function> parenthesize negative constants (Tom)
      </para>
 
      <para>
       Before this fix, a negative constant in a view or rule might be dumped
-      as, say, <literal>-42::integer</>, which is subtly incorrect: it should
-      be <literal>(-42)::integer</> due to operator precedence rules.
+      as, say, <literal>-42::integer</literal>, which is subtly incorrect: it should
+      be <literal>(-42)::integer</literal> due to operator precedence rules.
       Usually this would make little difference, but it could interact with
       another recent patch to cause
-      <productname>PostgreSQL</> to reject what had been a valid
-      <command>SELECT DISTINCT</> view query.  Since this could result in
-      <application>pg_dump</> output failing to reload, it is being treated
+      <productname>PostgreSQL</productname> to reject what had been a valid
+      <command>SELECT DISTINCT</command> view query.  Since this could result in
+      <application>pg_dump</application> output failing to reload, it is being treated
       as a high-priority fix.  The only released versions in which dump
       output is actually incorrect are 8.3.1 and 8.2.7.
      </para>
@@ -1749,13 +1749,13 @@
 
     <listitem>
      <para>
-      Make <command>ALTER AGGREGATE ... OWNER TO</> update
-      <structname>pg_shdepend</> (Tom)
+      Make <command>ALTER AGGREGATE ... OWNER TO</command> update
+      <structname>pg_shdepend</structname> (Tom)
      </para>
 
      <para>
       This oversight could lead to problems if the aggregate was later
-      involved in a <command>DROP OWNED</> or <command>REASSIGN OWNED</>
+      involved in a <command>DROP OWNED</command> or <command>REASSIGN OWNED</command>
       operation.
      </para>
     </listitem>
@@ -1776,7 +1776,7 @@
   <para>
    This release contains a variety of fixes from 8.1.11.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -1785,7 +1785,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -1797,7 +1797,7 @@
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</> so that the new
+      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</command> so that the new
       column is correctly checked to see if it's been initialized to all
       non-nulls (Brendan Jurd)
      </para>
@@ -1809,8 +1809,8 @@
 
     <listitem>
      <para>
-      Fix possible <command>CREATE TABLE</> failure when inheriting the
-      <quote>same</> constraint from multiple parent relations that
+      Fix possible <command>CREATE TABLE</command> failure when inheriting the
+      <quote>same</quote> constraint from multiple parent relations that
       inherited that constraint from a common ancestor (Tom)
      </para>
     </listitem>
@@ -1818,7 +1818,7 @@
     <listitem>
      <para>
       Fix conversions between ISO-8859-5 and other encodings to handle
-      Cyrillic <quote>Yo</> characters (<literal>e</> and <literal>E</> with
+      Cyrillic <quote>Yo</quote> characters (<literal>e</literal> and <literal>E</literal> with
       two dots) (Sergey Burladyan)
      </para>
     </listitem>
@@ -1833,7 +1833,7 @@
      <para>
       This could lead to failures in which two apparently identical literal
       values were not seen as equal, resulting in the parser complaining
-      about unmatched <literal>ORDER BY</> and <literal>DISTINCT</>
+      about unmatched <literal>ORDER BY</literal> and <literal>DISTINCT</literal>
       expressions.
      </para>
     </listitem>
@@ -1841,24 +1841,24 @@
     <listitem>
      <para>
       Fix a corner case in regular-expression substring matching
-      (<literal>substring(<replaceable>string</> from
-      <replaceable>pattern</>)</literal>) (Tom)
+      (<literal>substring(<replaceable>string</replaceable> from
+      <replaceable>pattern</replaceable>)</literal>) (Tom)
      </para>
 
      <para>
       The problem occurs when there is a match to the pattern overall but
       the user has specified a parenthesized subexpression and that
       subexpression hasn't got a match.  An example is
-      <literal>substring('foo' from 'foo(bar)?')</>.
-      This should return NULL, since <literal>(bar)</> isn't matched, but
+      <literal>substring('foo' from 'foo(bar)?')</literal>.
+      This should return NULL, since <literal>(bar)</literal> isn't matched, but
       it was mistakenly returning the whole-pattern match instead (ie,
-      <literal>foo</>).
+      <literal>foo</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008c (for
+      Update time zone data files to <application>tzdata</application> release 2008c (for
       DST law changes in Morocco, Iraq, Choibalsan, Pakistan, Syria, Cuba,
       Argentina/San_Luis, and Chile)
      </para>
@@ -1866,34 +1866,34 @@
 
     <listitem>
      <para>
-      Fix incorrect result from <application>ecpg</>'s
-      <function>PGTYPEStimestamp_sub()</> function (Michael)
+      Fix incorrect result from <application>ecpg</application>'s
+      <function>PGTYPEStimestamp_sub()</function> function (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix core dump in <filename>contrib/xml2</>'s
-      <function>xpath_table()</> function when the input query returns a
+      Fix core dump in <filename>contrib/xml2</filename>'s
+      <function>xpath_table()</function> function when the input query returns a
       NULL value (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s makefile to not override
-      <literal>CFLAGS</> (Tom)
+      Fix <filename>contrib/xml2</filename>'s makefile to not override
+      <literal>CFLAGS</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>DatumGetBool</> macro to not fail with <application>gcc</>
+      Fix <literal>DatumGetBool</literal> macro to not fail with <application>gcc</application>
       4.3 (Tom)
      </para>
 
      <para>
-      This problem affects <quote>old style</> (V0) C functions that
+      This problem affects <quote>old style</quote> (V0) C functions that
       return boolean.  The fix is already in 8.3, but the need to
       back-patch it was not realized at the time.
      </para>
@@ -1901,21 +1901,21 @@
 
     <listitem>
      <para>
-      Fix longstanding <command>LISTEN</>/<command>NOTIFY</>
+      Fix longstanding <command>LISTEN</command>/<command>NOTIFY</command>
       race condition (Tom)
      </para>
 
      <para>
       In rare cases a session that had just executed a
-      <command>LISTEN</> might not get a notification, even though
+      <command>LISTEN</command> might not get a notification, even though
       one would be expected because the concurrent transaction executing
-      <command>NOTIFY</> was observed to commit later.
+      <command>NOTIFY</command> was observed to commit later.
      </para>
 
      <para>
       A side effect of the fix is that a transaction that has executed
-      a not-yet-committed <command>LISTEN</> command will not see any
-      row in <structname>pg_listener</> for the <command>LISTEN</>,
+      a not-yet-committed <command>LISTEN</command> command will not see any
+      row in <structname>pg_listener</structname> for the <command>LISTEN</command>,
       should it choose to look; formerly it would have.  This behavior
       was never documented one way or the other, but it is possible that
       some applications depend on the old behavior.
@@ -1924,14 +1924,14 @@
 
     <listitem>
      <para>
-      Disallow <command>LISTEN</> and <command>UNLISTEN</> within a
+      Disallow <command>LISTEN</command> and <command>UNLISTEN</command> within a
       prepared transaction (Tom)
      </para>
 
      <para>
       This was formerly allowed but trying to do it had various unpleasant
       consequences, notably that the originating backend could not exit
-      as long as an <command>UNLISTEN</> remained uncommitted.
+      as long as an <command>UNLISTEN</command> remained uncommitted.
      </para>
     </listitem>
 
@@ -1954,19 +1954,19 @@
 
     <listitem>
      <para>
-      Fix <quote>unrecognized node type</> error in some variants of
-      <command>ALTER OWNER</> (Tom)
+      Fix <quote>unrecognized node type</quote> error in some variants of
+      <command>ALTER OWNER</command> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to correctly extract the postmaster's port
+      Fix <application>pg_ctl</application> to correctly extract the postmaster's port
       number from command-line options (Itagaki Takahiro, Tom)
      </para>
 
      <para>
-      Previously, <literal>pg_ctl start -w</> could try to contact the
+      Previously, <literal>pg_ctl start -w</literal> could try to contact the
       postmaster on the wrong port, leading to bogus reports of startup
       failure.
      </para>
@@ -1974,20 +1974,20 @@
 
     <listitem>
      <para>
-      Use <option>-fwrapv</> to defend against possible misoptimization
-      in recent <application>gcc</> versions (Tom)
+      Use <option>-fwrapv</option> to defend against possible misoptimization
+      in recent <application>gcc</application> versions (Tom)
      </para>
 
      <para>
-      This is known to be necessary when building <productname>PostgreSQL</>
-      with <application>gcc</> 4.3 or later.
+      This is known to be necessary when building <productname>PostgreSQL</productname>
+      with <application>gcc</application> 4.3 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix display of constant expressions in <literal>ORDER BY</>
-      and <literal>GROUP BY</> (Tom)
+      Fix display of constant expressions in <literal>ORDER BY</literal>
+      and <literal>GROUP BY</literal> (Tom)
      </para>
 
      <para>
@@ -1999,7 +1999,7 @@
 
     <listitem>
      <para>
-      Fix <application>libpq</> to handle NOTICE messages correctly
+      Fix <application>libpq</application> to handle NOTICE messages correctly
       during COPY OUT (Tom)
      </para>
 
@@ -2027,12 +2027,12 @@
    This release contains a variety of fixes from 8.1.10,
    including fixes for significant security issues.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <para>
-   This is the last 8.1.X release for which the <productname>PostgreSQL</>
-   community will produce binary packages for <productname>Windows</>.
+   This is the last 8.1.X release for which the <productname>PostgreSQL</productname>
+   community will produce binary packages for <productname>Windows</productname>.
    Windows users are encouraged to move to 8.2.X or later,
    since there are Windows-specific fixes in 8.2.X that
    are impractical to back-port.  8.1.X will continue to
@@ -2045,7 +2045,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2058,7 +2058,7 @@
     <listitem>
      <para>
       Prevent functions in indexes from executing with the privileges of
-      the user running <command>VACUUM</>, <command>ANALYZE</>, etc (Tom)
+      the user running <command>VACUUM</command>, <command>ANALYZE</command>, etc (Tom)
      </para>
 
      <para>
@@ -2069,18 +2069,18 @@
       (Note that triggers, defaults, check constraints, etc. pose the
       same type of risk.)  But functions in indexes pose extra danger
       because they will be executed by routine maintenance operations
-      such as <command>VACUUM FULL</>, which are commonly performed
+      such as <command>VACUUM FULL</command>, which are commonly performed
       automatically under a superuser account.  For example, a nefarious user
       can execute code with superuser privileges by setting up a
       trojan-horse index definition and waiting for the next routine vacuum.
       The fix arranges for standard maintenance operations
-      (including <command>VACUUM</>, <command>ANALYZE</>, <command>REINDEX</>,
-      and <command>CLUSTER</>) to execute as the table owner rather than
+      (including <command>VACUUM</command>, <command>ANALYZE</command>, <command>REINDEX</command>,
+      and <command>CLUSTER</command>) to execute as the table owner rather than
       the calling user, using the same privilege-switching mechanism already
-      used for <literal>SECURITY DEFINER</> functions.  To prevent bypassing
+      used for <literal>SECURITY DEFINER</literal> functions.  To prevent bypassing
       this security measure, execution of <command>SET SESSION
-      AUTHORIZATION</> and <command>SET ROLE</> is now forbidden within a
-      <literal>SECURITY DEFINER</> context.  (CVE-2007-6600)
+      AUTHORIZATION</command> and <command>SET ROLE</command> is now forbidden within a
+      <literal>SECURITY DEFINER</literal> context.  (CVE-2007-6600)
      </para>
     </listitem>
 
@@ -2100,20 +2100,20 @@
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
 
      <para>
       The fix that appeared for this in 8.1.10 was incomplete, as it plugged
-      the hole for only some <filename>dblink</> functions.  (CVE-2007-6601,
+      the hole for only some <filename>dblink</filename> functions.  (CVE-2007-6601,
       CVE-2007-3278)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2007k
+      Update time zone data files to <application>tzdata</application> release 2007k
       (in particular, recent Argentina changes) (Tom)
      </para>
     </listitem>
@@ -2128,14 +2128,14 @@
     <listitem>
      <para>
       Fix planner failure in some cases of <literal>WHERE false AND var IN
-      (SELECT ...)</> (Tom)
+      (SELECT ...)</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Preserve the tablespace of indexes that are
-      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</> (Tom)
+      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</command> (Tom)
      </para>
     </listitem>
 
@@ -2154,21 +2154,21 @@
 
     <listitem>
      <para>
-      Make <command>VACUUM</> not use all of <varname>maintenance_work_mem</>
+      Make <command>VACUUM</command> not use all of <varname>maintenance_work_mem</varname>
       when the table is too small for it to be useful (Alvaro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential crash in <function>translate()</> when using a multibyte
+      Fix potential crash in <function>translate()</function> when using a multibyte
       database encoding (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow in <literal>extract(epoch from interval)</> for intervals
+      Fix overflow in <literal>extract(epoch from interval)</literal> for intervals
       exceeding 68 years (Tom)
      </para>
     </listitem>
@@ -2182,13 +2182,13 @@
 
     <listitem>
      <para>
-      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</>
-      as <literal>int</> rather than <literal>char</> (Tom)
+      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</literal>
+      as <literal>int</literal> rather than <literal>char</literal> (Tom)
      </para>
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>macOS</> 10.5.
+      Perl did things this way ... until <productname>macOS</productname> 10.5.
      </para>
     </listitem>
 
@@ -2200,64 +2200,64 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to correctly handle inheritance child tables
+      Fix <application>pg_dump</application> to correctly handle inheritance child tables
       that have default expressions different from their parent's (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</> crash when <varname>PGPASSFILE</> refers
+      Fix <application>libpq</application> crash when <varname>PGPASSFILE</varname> refers
       to a file that is not a plain file (Martin Pitt)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <application>ecpg</> parser fixes (Michael)
+      <application>ecpg</application> parser fixes (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pgcrypto</> defend against
-      <application>OpenSSL</> libraries that fail on keys longer than 128
+      Make <filename>contrib/pgcrypto</filename> defend against
+      <application>OpenSSL</application> libraries that fail on keys longer than 128
       bits; which is the case at least on some Solaris versions (Marko Kreen)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/tablefunc</>'s <function>crosstab()</> handle
+      Make <filename>contrib/tablefunc</filename>'s <function>crosstab()</function> handle
       NULL rowid as a category in its own right, rather than crashing (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <type>tsvector</> and <type>tsquery</> output routines to
+      Fix <type>tsvector</type> and <type>tsquery</type> output routines to
       escape backslashes correctly (Teodor, Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash of <function>to_tsvector()</> on huge input strings (Teodor)
+      Fix crash of <function>to_tsvector()</function> on huge input strings (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require a specific version of <productname>Autoconf</> to be used
-      when re-generating the <command>configure</> script (Peter)
+      Require a specific version of <productname>Autoconf</productname> to be used
+      when re-generating the <command>configure</command> script (Peter)
      </para>
 
      <para>
       This affects developers and packagers only.  The change was made
       to prevent accidental use of untested combinations of
-      <productname>Autoconf</> and <productname>PostgreSQL</> versions.
+      <productname>Autoconf</productname> and <productname>PostgreSQL</productname> versions.
       You can remove the version check if you really want to use a
-      different <productname>Autoconf</> version, but it's
+      different <productname>Autoconf</productname> version, but it's
       your responsibility whether the result works or not.
      </para>
     </listitem>
@@ -2278,7 +2278,7 @@
   <para>
    This release contains a variety of fixes from 8.1.9.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2287,7 +2287,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2300,20 +2300,20 @@
     <listitem>
      <para>
       Prevent index corruption when a transaction inserts rows and
-      then aborts close to the end of a concurrent <command>VACUUM</>
+      then aborts close to the end of a concurrent <command>VACUUM</command>
       on the same table (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE DOMAIN ... DEFAULT NULL</> work properly (Tom)
+      Make <command>CREATE DOMAIN ... DEFAULT NULL</command> work properly (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow the <type>interval</> data type to accept input consisting only of
+      Allow the <type>interval</type> data type to accept input consisting only of
       milliseconds or microseconds (Neil)
      </para>
     </listitem>
@@ -2326,7 +2326,7 @@
 
     <listitem>
      <para>
-      Fix excessive logging of <acronym>SSL</> error messages (Tom)
+      Fix excessive logging of <acronym>SSL</acronym> error messages (Tom)
      </para>
     </listitem>
 
@@ -2339,7 +2339,7 @@
 
     <listitem>
      <para>
-      Fix crash when <varname>log_min_error_statement</> logging runs out
+      Fix crash when <varname>log_min_error_statement</varname> logging runs out
       of memory (Tom)
      </para>
     </listitem>
@@ -2352,7 +2352,7 @@
 
     <listitem>
      <para>
-      Prevent <command>REINDEX</> and <command>CLUSTER</> from failing
+      Prevent <command>REINDEX</command> and <command>CLUSTER</command> from failing
       due to attempting to process temporary tables of other sessions (Alvaro)
      </para>
     </listitem>
@@ -2371,14 +2371,14 @@
 
     <listitem>
      <para>
-      Suppress timezone name (<literal>%Z</>) in log timestamps on Windows
+      Suppress timezone name (<literal>%Z</literal>) in log timestamps on Windows
       because of possible encoding mismatches (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
     </listitem>
@@ -2400,7 +2400,7 @@
    This release contains a variety of fixes from 8.1.8,
    including a security fix.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2409,7 +2409,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2422,35 +2422,35 @@
     <listitem>
     <para>
      Support explicit placement of the temporary-table schema within
-     <varname>search_path</>, and disable searching it for functions
+     <varname>search_path</varname>, and disable searching it for functions
      and operators (Tom)
     </para>
     <para>
      This is needed to allow a security-definer function to set a
-     truly secure value of <varname>search_path</>.  Without it,
+     truly secure value of <varname>search_path</varname>.  Without it,
      an unprivileged SQL user can use temporary objects to execute code
      with the privileges of the security-definer function (CVE-2007-2138).
-     See <command>CREATE FUNCTION</> for more information.
+     See <command>CREATE FUNCTION</command> for more information.
     </para>
     </listitem>
 
     <listitem>
     <para>
-     <filename>/contrib/tsearch2</> crash fixes (Teodor)
+     <filename>/contrib/tsearch2</filename> crash fixes (Teodor)
     </para>
     </listitem>
 
     <listitem>
     <para>
-     Require <command>COMMIT PREPARED</> to be executed in the same
+     Require <command>COMMIT PREPARED</command> to be executed in the same
      database as the transaction was prepared in (Heikki)
     </para>
     </listitem>
 
     <listitem>
     <para>
-     Fix potential-data-corruption bug in how <command>VACUUM FULL</> handles
-     <command>UPDATE</> chains (Tom, Pavan Deolasee)
+     Fix potential-data-corruption bug in how <command>VACUUM FULL</command> handles
+     <command>UPDATE</command> chains (Tom, Pavan Deolasee)
     </para>
     </listitem>
 
@@ -2490,7 +2490,7 @@
   <para>
    This release contains one fix from 8.1.7.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2499,7 +2499,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2533,7 +2533,7 @@
    This release contains a variety of fixes from 8.1.6, including
    a security fix.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2542,7 +2542,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2576,7 +2576,7 @@
 
     <listitem>
     <para>
-     Improve <command>VACUUM</> performance for databases with many tables (Tom)
+     Improve <command>VACUUM</command> performance for databases with many tables (Tom)
     </para>
     </listitem>
 
@@ -2593,7 +2593,7 @@
 
     <listitem>
     <para>
-     Fix for rare Assert() crash triggered by <literal>UNION</> (Tom)
+     Fix for rare Assert() crash triggered by <literal>UNION</literal> (Tom)
     </para>
     </listitem>
 
@@ -2606,7 +2606,7 @@
 
     <listitem>
     <para>
-     Fix bogus <quote>permission denied</> failures occurring on Windows
+     Fix bogus <quote>permission denied</quote> failures occurring on Windows
      due to attempts to fsync already-deleted files (Magnus, Tom)
     </para>
     </listitem>
@@ -2634,7 +2634,7 @@
   <para>
    This release contains a variety of fixes from 8.1.5.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2643,7 +2643,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2655,7 +2655,7 @@
 
     <listitem>
      <para>
-      Improve handling of <function>getaddrinfo()</> on AIX (Tom)
+      Improve handling of <function>getaddrinfo()</function> on AIX (Tom)
      </para>
 
      <para>
@@ -2666,21 +2666,21 @@
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to handle a tar-format backup
+      Fix <application>pg_restore</application> to handle a tar-format backup
       that contains large objects (blobs) with comments (Tom)
      </para>
     </listitem>
 
      <listitem>
       <para>
-       Fix <quote>failed to re-find parent key</> errors in
-       <command>VACUUM</> (Tom)
+       Fix <quote>failed to re-find parent key</quote> errors in
+       <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Clean out <filename>pg_internal.init</> cache files during server
+       Clean out <filename>pg_internal.init</filename> cache files during server
        restart (Simon)
       </para>
 
@@ -2693,7 +2693,7 @@
      <listitem>
       <para>
        Fix race condition for truncation of a large relation across a
-       gigabyte boundary by <command>VACUUM</> (Tom)
+       gigabyte boundary by <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
@@ -2717,7 +2717,7 @@
 
     <listitem>
      <para>
-      Fix error when constructing an <literal>ARRAY[]</> made up of multiple
+      Fix error when constructing an <literal>ARRAY[]</literal> made up of multiple
       empty elements (Tom)
      </para>
     </listitem>
@@ -2736,13 +2736,13 @@
 
     <listitem>
      <para>
-      <function>to_number()</> and <function>to_char(numeric)</>
-      are now <literal>STABLE</>, not <literal>IMMUTABLE</>, for
-      new <application>initdb</> installs (Tom)
+      <function>to_number()</function> and <function>to_char(numeric)</function>
+      are now <literal>STABLE</literal>, not <literal>IMMUTABLE</literal>, for
+      new <application>initdb</application> installs (Tom)
      </para>
 
      <para>
-      This is because <varname>lc_numeric</> can potentially
+      This is because <varname>lc_numeric</varname> can potentially
       change the output of these functions.
      </para>
     </listitem>
@@ -2753,7 +2753,7 @@
      </para>
 
      <para>
-      This improves <application>psql</> <literal>\d</> performance also.
+      This improves <application>psql</application> <literal>\d</literal> performance also.
      </para>
     </listitem>
 
@@ -2784,7 +2784,7 @@
   <para>
    This release contains a variety of fixes from 8.1.4.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2793,7 +2793,7 @@
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
   </sect2>
@@ -2802,7 +2802,7 @@
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Disallow aggregate functions in <command>UPDATE</>
+<listitem><para>Disallow aggregate functions in <command>UPDATE</command>
 commands, except within sub-SELECTs (Tom)</para>
 <para>The behavior of such an aggregate was unpredictable, and in 8.1.X
 could cause a crash, so it has been disabled.  The SQL standard does not allow
@@ -2810,25 +2810,25 @@ this either.</para></listitem>
 <listitem><para>Fix core dump when an untyped literal is taken as
 ANYARRAY</para></listitem>
 <listitem><para>Fix core dump in duration logging for extended query protocol
-when a <command>COMMIT</> or <command>ROLLBACK</> is
+when a <command>COMMIT</command> or <command>ROLLBACK</command> is
 executed</para></listitem>
 <listitem><para>Fix mishandling of AFTER triggers when query contains a SQL
 function returning multiple rows (Tom)</para></listitem>
-<listitem><para>Fix <command>ALTER TABLE ... TYPE</> to recheck
-<literal>NOT NULL</> for <literal>USING</> clause (Tom)</para></listitem>
-<listitem><para>Fix <function>string_to_array()</> to handle overlapping
+<listitem><para>Fix <command>ALTER TABLE ... TYPE</command> to recheck
+<literal>NOT NULL</literal> for <literal>USING</literal> clause (Tom)</para></listitem>
+<listitem><para>Fix <function>string_to_array()</function> to handle overlapping
  matches for the separator string</para>
-<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</>.
+<para>For example, <literal>string_to_array('123xx456xxx789', 'xx')</literal>.
 </para></listitem>
-<listitem><para>Fix <function>to_timestamp()</> for
-<literal>AM</>/<literal>PM</> formats (Bruce)</para></listitem>
+<listitem><para>Fix <function>to_timestamp()</function> for
+<literal>AM</literal>/<literal>PM</literal> formats (Bruce)</para></listitem>
 <listitem><para>Fix autovacuum's calculation that decides whether
- <command>ANALYZE</> is needed (Alvaro)</para></listitem>
+ <command>ANALYZE</command> is needed (Alvaro)</para></listitem>
 <listitem><para>Fix corner cases in pattern matching for
- <application>psql</>'s <literal>\d</> commands</para></listitem>
+ <application>psql</application>'s <literal>\d</literal> commands</para></listitem>
 <listitem><para>Fix index-corrupting bugs in /contrib/ltree
  (Teodor)</para></listitem>
-<listitem><para>Numerous robustness fixes in <application>ecpg</> (Joachim
+<listitem><para>Numerous robustness fixes in <application>ecpg</application> (Joachim
 Wieland)</para></listitem>
 <listitem><para>Fix backslash escaping in /contrib/dbmirror</para></listitem>
 <listitem><para>Minor fixes in /contrib/dblink and /contrib/tsearch2</para>
@@ -2836,14 +2836,14 @@ Wieland)</para></listitem>
 <listitem><para>Efficiency improvements in hash tables and bitmap index scans
 (Tom)</para></listitem>
 <listitem><para>Fix instability of statistics collection on Windows (Tom, Andrew)</para></listitem>
-<listitem><para>Fix <varname>statement_timeout</> to use the proper
+<listitem><para>Fix <varname>statement_timeout</varname> to use the proper
 units on Win32 (Bruce)</para>
 <para>In previous Win32 8.1.X versions, the delay was off by a factor of
 100.</para></listitem>
-<listitem><para>Fixes for <acronym>MSVC</> and <productname>Borland C++</>
+<listitem><para>Fixes for <acronym>MSVC</acronym> and <productname>Borland C++</productname>
 compilers (Hiroshi Saito)</para></listitem>
-<listitem><para>Fixes for <systemitem class="osname">AIX</> and
-<productname>Intel</> compilers (Tom)</para></listitem>
+<listitem><para>Fixes for <systemitem class="osname">AIX</systemitem> and
+<productname>Intel</productname> compilers (Tom)</para></listitem>
 <listitem><para>Fix rare bug in continuous archiving (Tom)</para></listitem>
 </itemizedlist>
 
@@ -2862,7 +2862,7 @@ compilers (Hiroshi Saito)</para></listitem>
    This release contains a variety of fixes from 8.1.3,
    including patches for extremely serious security issues.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -2871,7 +2871,7 @@ compilers (Hiroshi Saito)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
 
    <para>
@@ -2881,9 +2881,9 @@ compilers (Hiroshi Saito)</para></listitem>
     into SQL commands, you should examine them as soon as possible to
     ensure that they are using recommended escaping techniques.  In
     most cases, applications should be using subroutines provided by
-    libraries or drivers (such as <application>libpq</>'s
-    <function>PQescapeStringConn()</>) to perform string escaping,
-    rather than relying on <foreignphrase>ad hoc</> code to do it.
+    libraries or drivers (such as <application>libpq</application>'s
+    <function>PQescapeStringConn()</function>) to perform string escaping,
+    rather than relying on <foreignphrase>ad hoc</foreignphrase> code to do it.
    </para>
   </sect2>
 
@@ -2893,61 +2893,61 @@ compilers (Hiroshi Saito)</para></listitem>
 <itemizedlist>
 <listitem><para>Change the server to reject invalidly-encoded multibyte
 characters in all cases (Tatsuo, Tom)</para>
-<para>While <productname>PostgreSQL</> has been moving in this direction for
+<para>While <productname>PostgreSQL</productname> has been moving in this direction for
 some time, the checks are now applied uniformly to all encodings and all
 textual input, and are now always errors not merely warnings.  This change
 defends against SQL-injection attacks of the type described in CVE-2006-2313.
 </para></listitem>
 
-<listitem><para>Reject unsafe uses of <literal>\'</> in string literals</para>
+<listitem><para>Reject unsafe uses of <literal>\'</literal> in string literals</para>
 <para>As a server-side defense against SQL-injection attacks of the type
-described in CVE-2006-2314, the server now only accepts <literal>''</> and not
-<literal>\'</> as a representation of ASCII single quote in SQL string
-literals.  By default, <literal>\'</> is rejected only when
-<varname>client_encoding</> is set to a client-only encoding (SJIS, BIG5, GBK,
+described in CVE-2006-2314, the server now only accepts <literal>''</literal> and not
+<literal>\'</literal> as a representation of ASCII single quote in SQL string
+literals.  By default, <literal>\'</literal> is rejected only when
+<varname>client_encoding</varname> is set to a client-only encoding (SJIS, BIG5, GBK,
 GB18030, or UHC), which is the scenario in which SQL injection is possible.
-A new configuration parameter <varname>backslash_quote</> is available to
+A new configuration parameter <varname>backslash_quote</varname> is available to
 adjust this behavior when needed.  Note that full security against
 CVE-2006-2314 might require client-side changes; the purpose of
-<varname>backslash_quote</> is in part to make it obvious that insecure
+<varname>backslash_quote</varname> is in part to make it obvious that insecure
 clients are insecure.
 </para></listitem>
 
-<listitem><para>Modify <application>libpq</>'s string-escaping routines to be
+<listitem><para>Modify <application>libpq</application>'s string-escaping routines to be
 aware of encoding considerations and
-<varname>standard_conforming_strings</></para>
-<para>This fixes <application>libpq</>-using applications for the security
+<varname>standard_conforming_strings</varname></para>
+<para>This fixes <application>libpq</application>-using applications for the security
 issues described in CVE-2006-2313 and CVE-2006-2314, and also future-proofs
 them against the planned changeover to SQL-standard string literal syntax.
-Applications that use multiple <productname>PostgreSQL</> connections
-concurrently should migrate to <function>PQescapeStringConn()</> and
-<function>PQescapeByteaConn()</> to ensure that escaping is done correctly
+Applications that use multiple <productname>PostgreSQL</productname> connections
+concurrently should migrate to <function>PQescapeStringConn()</function> and
+<function>PQescapeByteaConn()</function> to ensure that escaping is done correctly
 for the settings in use in each database connection.  Applications that
-do string escaping <quote>by hand</> should be modified to rely on library
+do string escaping <quote>by hand</quote> should be modified to rely on library
 routines instead.
 </para></listitem>
 
 <listitem><para>Fix weak key selection in pgcrypto (Marko Kreen)</para>
 <para>Errors in fortuna PRNG reseeding logic could cause a predictable
-session key to be selected by <function>pgp_sym_encrypt()</> in some cases.
+session key to be selected by <function>pgp_sym_encrypt()</function> in some cases.
 This only affects non-OpenSSL-using builds.
 </para></listitem>
 
 <listitem><para>Fix some incorrect encoding conversion functions</para>
-<para><function>win1251_to_iso</>, <function>win866_to_iso</>,
-<function>euc_tw_to_big5</>, <function>euc_tw_to_mic</>,
-<function>mic_to_euc_tw</> were all broken to varying
+<para><function>win1251_to_iso</function>, <function>win866_to_iso</function>,
+<function>euc_tw_to_big5</function>, <function>euc_tw_to_mic</function>,
+<function>mic_to_euc_tw</function> were all broken to varying
 extents.
 </para></listitem>
 
-<listitem><para>Clean up stray remaining uses of <literal>\'</> in strings
+<listitem><para>Clean up stray remaining uses of <literal>\'</literal> in strings
 (Bruce, Jan)</para></listitem>
 
-<listitem><para>Make autovacuum visible in <structname>pg_stat_activity</>
+<listitem><para>Make autovacuum visible in <structname>pg_stat_activity</structname>
 (Alvaro)</para></listitem>
 
-<listitem><para>Disable <literal>full_page_writes</> (Tom)</para>
-<para>In certain cases, having <literal>full_page_writes</> off would cause
+<listitem><para>Disable <literal>full_page_writes</literal> (Tom)</para>
+<para>In certain cases, having <literal>full_page_writes</literal> off would cause
 crash recovery to fail.  A proper fix will appear in 8.2; for now it's just
 disabled.
 </para></listitem>
@@ -2965,10 +2965,10 @@ same transaction</para></listitem>
 <listitem><para>Fix WAL replay for case where a B-Tree index has been
 truncated</para></listitem>
 
-<listitem><para>Fix <literal>SIMILAR TO</> for patterns involving
-<literal>|</> (Tom)</para></listitem>
+<listitem><para>Fix <literal>SIMILAR TO</literal> for patterns involving
+<literal>|</literal> (Tom)</para></listitem>
 
-<listitem><para>Fix <command>SELECT INTO</> and <command>CREATE TABLE AS</> to
+<listitem><para>Fix <command>SELECT INTO</command> and <command>CREATE TABLE AS</command> to
 create tables in the default tablespace, not the base directory (Kris
 Jurka)</para></listitem>
 
@@ -2986,18 +2986,18 @@ Fuhr)</para></listitem>
 <listitem><para>Fix problem with password prompting on some Win32 systems
 (Robert Kinberg)</para></listitem>
 
-<listitem><para>Improve <application>pg_dump</>'s handling of default values
+<listitem><para>Improve <application>pg_dump</application>'s handling of default values
 for domains</para></listitem>
 
-<listitem><para>Fix <application>pg_dumpall</> to handle identically-named
+<listitem><para>Fix <application>pg_dumpall</application> to handle identically-named
 users and groups reasonably (only possible when dumping from a pre-8.1 server)
 (Tom)</para>
 <para>The user and group will be merged into a single role with
-<literal>LOGIN</> permission.  Formerly the merged role wouldn't have
-<literal>LOGIN</> permission, making it unusable as a user.
+<literal>LOGIN</literal> permission.  Formerly the merged role wouldn't have
+<literal>LOGIN</literal> permission, making it unusable as a user.
 </para></listitem>
 
-<listitem><para>Fix <application>pg_restore</> <literal>-n</> to work as
+<listitem><para>Fix <application>pg_restore</application> <literal>-n</literal> to work as
 documented (Tom)</para></listitem>
 </itemizedlist>
 
@@ -3016,7 +3016,7 @@ documented (Tom)</para></listitem>
    This release contains a variety of fixes from 8.1.2,
    including one very serious security issue.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -3025,7 +3025,7 @@ documented (Tom)</para></listitem>
    <para>
     A dump/restore is not required for those running 8.1.X.
     However, if you are upgrading from a version earlier than 8.1.2,
-    see <xref linkend="release-8-1-2">.
+    see <xref linkend="release-8-1-2"/>.
    </para>
   </sect2>
 
@@ -3035,14 +3035,14 @@ documented (Tom)</para></listitem>
 <itemizedlist>
 
 <listitem><para>Fix bug that allowed any logged-in user to <command>SET
-ROLE</> to any other database user id (CVE-2006-0553)</para>
+ROLE</command> to any other database user id (CVE-2006-0553)</para>
 <para>Due to inadequate validity checking, a user could exploit the special
-case that <command>SET ROLE</> normally uses to restore the previous role
+case that <command>SET ROLE</command> normally uses to restore the previous role
 setting after an error.  This allowed ordinary users to acquire superuser
 status, for example.
 The escalation-of-privilege risk exists only in 8.1.0-8.1.2.
 However, in all releases back to 7.3 there is a related bug in <command>SET
-SESSION AUTHORIZATION</> that allows unprivileged users to crash the server,
+SESSION AUTHORIZATION</command> that allows unprivileged users to crash the server,
 if it has been compiled with Asserts enabled (which is not the default).
 Thanks to Akio Ishida for reporting this problem.
 </para></listitem>
@@ -3055,55 +3055,55 @@ created in 8.0.4, 7.4.9, and 7.3.11 releases.
 </para></listitem>
 
 <listitem><para>Fix race condition that could lead to <quote>file already
-exists</> errors during pg_clog and pg_subtrans file creation
+exists</quote> errors during pg_clog and pg_subtrans file creation
 (Tom)</para></listitem>
 
 <listitem><para>Fix cases that could lead to crashes if a cache-invalidation
 message arrives at just the wrong time (Tom)</para></listitem>
 
-<listitem><para>Properly check <literal>DOMAIN</> constraints for
-<literal>UNKNOWN</> parameters in prepared statements
+<listitem><para>Properly check <literal>DOMAIN</literal> constraints for
+<literal>UNKNOWN</literal> parameters in prepared statements
 (Neil)</para></listitem>
 
-<listitem><para>Ensure <command>ALTER COLUMN TYPE</> will process
-<literal>FOREIGN KEY</>, <literal>UNIQUE</>, and <literal>PRIMARY KEY</>
+<listitem><para>Ensure <command>ALTER COLUMN TYPE</command> will process
+<literal>FOREIGN KEY</literal>, <literal>UNIQUE</literal>, and <literal>PRIMARY KEY</literal>
 constraints in the proper order (Nakano Yoshihisa)</para></listitem>
 
 <listitem><para>Fixes to allow restoring dumps that have cross-schema
 references to custom operators or operator classes (Tom)</para></listitem>
 
-<listitem><para>Allow <application>pg_restore</> to continue properly after a
-<command>COPY</> failure; formerly it tried to treat the remaining
-<command>COPY</> data as SQL commands (Stephen Frost)</para></listitem>
+<listitem><para>Allow <application>pg_restore</application> to continue properly after a
+<command>COPY</command> failure; formerly it tried to treat the remaining
+<command>COPY</command> data as SQL commands (Stephen Frost)</para></listitem>
 
-<listitem><para>Fix <application>pg_ctl</> <literal>unregister</> crash
+<listitem><para>Fix <application>pg_ctl</application> <literal>unregister</literal> crash
 when the  data directory is not specified (Magnus)</para></listitem>
 
-<listitem><para>Fix <application>libpq</> <function>PQprint</> HTML tags
+<listitem><para>Fix <application>libpq</application> <function>PQprint</function> HTML tags
 (Christoph Zwerschke)</para></listitem>
 
-<listitem><para>Fix <application>ecpg</> crash on AMD64 and PPC
+<listitem><para>Fix <application>ecpg</application> crash on AMD64 and PPC
 (Neil)</para></listitem>
 
-<listitem><para>Allow <literal>SETOF</> and <literal>%TYPE</> to be used
+<listitem><para>Allow <literal>SETOF</literal> and <literal>%TYPE</literal> to be used
 together in function result type declarations</para></listitem>
 
 <listitem><para>Recover properly if error occurs during argument passing
-in <application>PL/Python</> (Neil)</para></listitem>
+in <application>PL/Python</application> (Neil)</para></listitem>
 
-<listitem><para>Fix memory leak in <function>plperl_return_next</>
+<listitem><para>Fix memory leak in <function>plperl_return_next</function>
 (Neil)</para></listitem>
 
-<listitem><para>Fix <application>PL/Perl</>'s handling of locales on
+<listitem><para>Fix <application>PL/Perl</application>'s handling of locales on
 Win32 to match the backend (Andrew)</para></listitem>
 
 <listitem><para>Various optimizer fixes (Tom)</para></listitem>
 
-<listitem><para>Fix crash when <literal>log_min_messages</> is set to
-<literal>DEBUG3</> or above in <filename>postgresql.conf</> on Win32
+<listitem><para>Fix crash when <literal>log_min_messages</literal> is set to
+<literal>DEBUG3</literal> or above in <filename>postgresql.conf</filename> on Win32
 (Bruce)</para></listitem>
 
-<listitem><para>Fix <application>pgxs</> <literal>-L</> library path
+<listitem><para>Fix <application>pgxs</application> <literal>-L</literal> library path
 specification for Win32, Cygwin, macOS, AIX (Bruce)</para></listitem>
 
 <listitem><para>Check that SID is enabled while checking for Win32 admin
@@ -3112,13 +3112,13 @@ privileges (Magnus)</para></listitem>
 <listitem><para>Properly reject out-of-range date inputs (Kris
 Jurka)</para></listitem>
 
-<listitem><para>Portability fix for testing presence of <function>finite</>
-and <function>isinf</> during configure (Tom)</para></listitem>
+<listitem><para>Portability fix for testing presence of <function>finite</function>
+and <function>isinf</function> during configure (Tom)</para></listitem>
 
-<listitem><para>Improve speed of <command>COPY IN</> via libpq, by
+<listitem><para>Improve speed of <command>COPY IN</command> via libpq, by
 avoiding a kernel call per data line (Alon Goldshuv)</para></listitem>
 
-<listitem><para>Improve speed of <filename>/contrib/tsearch2</> index
+<listitem><para>Improve speed of <filename>/contrib/tsearch2</filename> index
 creation (Tom)</para></listitem>
 
 </itemizedlist>
@@ -3137,7 +3137,7 @@ creation (Tom)</para></listitem>
   <para>
    This release contains a variety of fixes from 8.1.1.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -3145,9 +3145,9 @@ creation (Tom)</para></listitem>
 
    <para>
     A dump/restore is not required for those running 8.1.X.
-    However, you might need to <command>REINDEX</> indexes on textual
+    However, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the locale or
-    <application>plperl</> issues described below.
+    <application>plperl</application> issues described below.
    </para>
   </sect2>
 
@@ -3160,7 +3160,7 @@ creation (Tom)</para></listitem>
 than exit if there is no more room in ShmemBackendArray (Magnus)</para>
 <para>The previous behavior could lead to a denial-of-service situation if too
 many connection requests arrive close together.  This applies
-<emphasis>only</> to the Windows port.</para></listitem>
+<emphasis>only</emphasis> to the Windows port.</para></listitem>
 
 <listitem><para>Fix bug introduced in 8.0 that could allow ReadBuffer
 to return an already-used page as new, potentially causing loss of
@@ -3171,16 +3171,16 @@ outside a transaction or in a failed transaction (Tom)</para></listitem>
 
 <listitem><para>Fix character string comparison for locales that consider
 different character combinations as equal, such as Hungarian (Tom)</para>
-<para>This might require <command>REINDEX</> to fix existing indexes on
+<para>This might require <command>REINDEX</command> to fix existing indexes on
 textual columns.</para></listitem>
 
 <listitem><para>Set locale environment variables during postmaster startup
-to ensure that <application>plperl</> won't change the locale later</para>
-<para>This fixes a problem that occurred if the <application>postmaster</> was
+to ensure that <application>plperl</application> won't change the locale later</para>
+<para>This fixes a problem that occurred if the <application>postmaster</application> was
 started with environment variables specifying a different locale than what
-<application>initdb</> had been told.  Under these conditions, any use of
-<application>plperl</> was likely to lead to corrupt indexes.  You might need
-<command>REINDEX</> to fix existing indexes on
+<application>initdb</application> had been told.  Under these conditions, any use of
+<application>plperl</application> was likely to lead to corrupt indexes.  You might need
+<command>REINDEX</command> to fix existing indexes on
 textual columns if this has happened to you.</para></listitem>
 
 <listitem><para>Allow more flexible relocation of installation
@@ -3189,7 +3189,7 @@ directories (Tom)</para>
 directory paths were the same except for the last component.</para></listitem>
 
 <listitem><para>Prevent crashes caused by the use of
-<literal>ISO-8859-5</> and <literal>ISO-8859-9</> encodings
+<literal>ISO-8859-5</literal> and <literal>ISO-8859-9</literal> encodings
 (Tatsuo)</para></listitem>
 
 <listitem><para>Fix longstanding bug in strpos() and regular expression
@@ -3197,22 +3197,22 @@ handling in certain rarely used Asian multi-byte character sets (Tatsuo)
 </para></listitem>
 
 <listitem><para>Fix bug where COPY CSV mode considered any
-<literal>\.</> to terminate the copy data</para> <para>The new code
-requires <literal>\.</> to appear alone on a line, as per
+<literal>\.</literal> to terminate the copy data</para> <para>The new code
+requires <literal>\.</literal> to appear alone on a line, as per
 documentation.</para></listitem>
 
 <listitem><para>Make COPY CSV mode quote a literal data value of
-<literal>\.</> to ensure it cannot be interpreted as the
+<literal>\.</literal> to ensure it cannot be interpreted as the
 end-of-data marker (Bruce)</para></listitem>
 
-<listitem><para>Various fixes for functions returning <literal>RECORD</>s
+<listitem><para>Various fixes for functions returning <literal>RECORD</literal>s
 (Tom) </para></listitem>
 
-<listitem><para>Fix processing of <filename>postgresql.conf</> so a
+<listitem><para>Fix processing of <filename>postgresql.conf</filename> so a
 final line with no newline is processed properly (Tom)
 </para></listitem>
 
-<listitem><para>Fix bug in <filename>/contrib/pgcrypto</> gen_salt,
+<listitem><para>Fix bug in <filename>/contrib/pgcrypto</filename> gen_salt,
 which caused it not to use all available salt space for MD5 and
 XDES algorithms (Marko Kreen, Solar Designer)</para>
 <para>Salts for Blowfish and standard DES are unaffected.</para></listitem>
@@ -3220,7 +3220,7 @@ XDES algorithms (Marko Kreen, Solar Designer)</para>
 <listitem><para>Fix autovacuum crash when processing expression indexes
 </para></listitem>
 
-<listitem><para>Fix <filename>/contrib/dblink</> to throw an error,
+<listitem><para>Fix <filename>/contrib/dblink</filename> to throw an error,
 rather than crashing, when the number of columns specified is different from
 what's actually returned by the query (Joe)</para></listitem>
 
@@ -3240,7 +3240,7 @@ what's actually returned by the query (Joe)</para></listitem>
   <para>
    This release contains a variety of fixes from 8.1.0.
    For information about new features in the 8.1 major release, see
-   <xref linkend="release-8-1">.
+   <xref linkend="release-8-1"/>.
   </para>
 
   <sect2>
@@ -3262,7 +3262,7 @@ what's actually returned by the query (Joe)</para></listitem>
 involving sub-selects flattened by the optimizer (Tom)</para></listitem>
 
 <listitem><para>Fix update failures in scenarios involving CHECK constraints,
-toasted columns, <emphasis>and</> indexes (Tom)</para></listitem>
+toasted columns, <emphasis>and</emphasis> indexes (Tom)</para></listitem>
 
 <listitem><para>Fix bgwriter problems after recovering from errors
 (Tom)</para>
@@ -3276,7 +3276,7 @@ later VACUUM commands.
 <listitem><para>Prevent failure if client sends Bind protocol message
 when current transaction is already aborted</para></listitem>
 
-<listitem><para><filename>/contrib/tsearch2</> and <filename>/contrib/ltree</>
+<listitem><para><filename>/contrib/tsearch2</filename> and <filename>/contrib/ltree</filename>
 fixes (Teodor)</para></listitem>
 
 <listitem><para>Fix problems with translated error messages in
@@ -3285,17 +3285,17 @@ unexpected truncation of output strings and wrong display of the smallest
 possible bigint value (Andrew, Tom)</para>
 <para>
 These problems only appeared on platforms that were using our
-<filename>port/snprintf.c</> code, which includes BSD variants if
-<literal>--enable-nls</> was given, and perhaps others.  In addition,
+<filename>port/snprintf.c</filename> code, which includes BSD variants if
+<literal>--enable-nls</literal> was given, and perhaps others.  In addition,
 a different form of the translated-error-message problem could appear
-on Windows depending on which version of <filename>libintl</> was used.
+on Windows depending on which version of <filename>libintl</filename> was used.
 </para></listitem>
 
-<listitem><para>Re-allow <literal>AM</>/<literal>PM</>, <literal>HH</>,
-<literal>HH12</>, and <literal>D</> format specifiers for
-<function>to_char(time)</> and <function>to_char(interval)</>.
-(<function>to_char(interval)</> should probably use
-<literal>HH24</>.) (Bruce)</para></listitem>
+<listitem><para>Re-allow <literal>AM</literal>/<literal>PM</literal>, <literal>HH</literal>,
+<literal>HH12</literal>, and <literal>D</literal> format specifiers for
+<function>to_char(time)</function> and <function>to_char(interval)</function>.
+(<function>to_char(interval)</function> should probably use
+<literal>HH24</literal>.) (Bruce)</para></listitem>
 
 <listitem><para>AIX, HPUX, and MSVC compile fixes (Tom, Hiroshi
 Saito)</para></listitem>
@@ -3305,7 +3305,7 @@ Saito)</para></listitem>
 <listitem><para>Retry file reads and writes after Windows
 NO_SYSTEM_RESOURCES error (Qingqing Zhou)</para></listitem>
 
-<listitem><para>Prevent <application>autovacuum</> from crashing during
+<listitem><para>Prevent <application>autovacuum</application> from crashing during
 ANALYZE of expression index (Alvaro)</para></listitem>
 
 <listitem><para>Fix problems with ON COMMIT DELETE ROWS temp
@@ -3315,7 +3315,7 @@ tables</para></listitem>
 DISTINCT query</para></listitem>
 
 <listitem><para>Add 8.1.0 release note item on how to migrate invalid
-<literal>UTF-8</> byte sequences (Paul Lindner)</para></listitem>
+<literal>UTF-8</literal> byte sequences (Paul Lindner)</para></listitem>
 </itemizedlist>
 
   </sect2>
@@ -3365,13 +3365,13 @@ DISTINCT query</para></listitem>
       <para>
        In previous releases, only a single index could be used to do
        lookups on a table. With this feature, if a query has
-       <command>WHERE tab.col1 = 4 and tab.col2 = 9</>, and there is
-       no multicolumn index on <literal>col1</> and <literal>col2</>,
-       but there is an index on <literal>col1</> and another on
-       <literal>col2</>, it is possible to search both indexes and
+       <command>WHERE tab.col1 = 4 and tab.col2 = 9</command>, and there is
+       no multicolumn index on <literal>col1</literal> and <literal>col2</literal>,
+       but there is an index on <literal>col1</literal> and another on
+       <literal>col2</literal>, it is possible to search both indexes and
        combine the results in memory, then do heap fetches for only
-       the rows matching both the <literal>col1</> and
-       <literal>col2</> restrictions. This is very useful in
+       the rows matching both the <literal>col1</literal> and
+       <literal>col2</literal> restrictions. This is very useful in
        environments that have a lot of unstructured queries where it
        is impossible to create indexes that match all possible access
        conditions.  Bitmap scans are useful even with a single index,
@@ -3394,9 +3394,9 @@ DISTINCT query</para></listitem>
        their transactions (none failed), all transactions can be
        committed. Even if a machine crashes after a prepare, the
        prepared transaction can be committed after the machine is
-       restarted. New syntax includes <command>PREPARE TRANSACTION</> and
-       <command>COMMIT/ROLLBACK PREPARED</>. A new system view
-       <literal>pg_prepared_xacts</> has also been added.
+       restarted. New syntax includes <command>PREPARE TRANSACTION</command> and
+       <command>COMMIT/ROLLBACK PREPARED</command>. A new system view
+       <literal>pg_prepared_xacts</literal> has also been added.
       </para>
      </listitem>
     </varlistentry>
@@ -3445,12 +3445,12 @@ DISTINCT query</para></listitem>
       <para>
        Once a user logs into a role, she obtains capabilities of
        the login role plus any inherited roles, and can use
-       <command>SET ROLE</> to switch to other roles she is a member of.
+       <command>SET ROLE</command> to switch to other roles she is a member of.
        This feature is a generalization of the SQL standard's concept of
        roles.
-       This change also replaces <structname>pg_shadow</> and
-       <structname>pg_group</> by new role-capable catalogs
-       <structname>pg_authid</> and <structname>pg_auth_members</>. The old
+       This change also replaces <structname>pg_shadow</structname> and
+       <structname>pg_group</structname> by new role-capable catalogs
+       <structname>pg_authid</structname> and <structname>pg_auth_members</structname>. The old
        tables are redefined as read-only views on the new role tables.
       </para>
      </listitem>
@@ -3458,15 +3458,15 @@ DISTINCT query</para></listitem>
 
     <varlistentry>
      <term>
-      Automatically use indexes for <function>MIN()</> and
-      <function>MAX()</> (Tom)
+      Automatically use indexes for <function>MIN()</function> and
+      <function>MAX()</function> (Tom)
      </term>
 
      <listitem>
       <para>
        In previous releases, the only way to use an index for
-       <function>MIN()</> or <function>MAX()</> was to rewrite the
-       query as <command>SELECT col FROM tab ORDER BY col LIMIT 1</>.
+       <function>MIN()</function> or <function>MAX()</function> was to rewrite the
+       query as <command>SELECT col FROM tab ORDER BY col LIMIT 1</command>.
        Index usage now happens automatically.
       </para>
      </listitem>
@@ -3474,7 +3474,7 @@ DISTINCT query</para></listitem>
 
     <varlistentry>
      <term>
-      Move <filename>/contrib/pg_autovacuum</> into the main server
+      Move <filename>/contrib/pg_autovacuum</filename> into the main server
       (Alvaro)
      </term>
 
@@ -3483,21 +3483,21 @@ DISTINCT query</para></listitem>
        Integrating autovacuum into the server allows it to be
        automatically started and stopped in sync with the database
        server, and allows autovacuum to be configured from
-       <filename>postgresql.conf</>.
+       <filename>postgresql.conf</filename>.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
      <term>
-      Add shared row level locks using <command>SELECT ... FOR SHARE</>
+      Add shared row level locks using <command>SELECT ... FOR SHARE</command>
       (Alvaro)
      </term>
 
      <listitem>
       <para>
        While <productname>PostgreSQL</productname>'s MVCC locking
-       allows <command>SELECT</> to never be blocked by writers and
+       allows <command>SELECT</command> to never be blocked by writers and
        therefore does not need shared row locks for typical operations,
        shared locks are useful for applications that require shared row
        locking.  In particular this reduces the locking requirements
@@ -3516,7 +3516,7 @@ DISTINCT query</para></listitem>
       <para>
        This extension of the dependency mechanism prevents roles from
        being dropped while there are still database objects they own.
-       Formerly it was possible to accidentally <quote>orphan</> objects by
+       Formerly it was possible to accidentally <quote>orphan</quote> objects by
        deleting their owner.  While this could be recovered from, it
        was messy and unpleasant.
       </para>
@@ -3537,7 +3537,7 @@ DISTINCT query</para></listitem>
       <para>
        This allows for a basic type of table partitioning. If child tables
        store separate key ranges and this is enforced using appropriate
-       <command>CHECK</> constraints, the optimizer will skip child
+       <command>CHECK</command> constraints, the optimizer will skip child
        table accesses when the constraint guarantees no matching rows
        exist in the child table.
       </para>
@@ -3556,9 +3556,9 @@ DISTINCT query</para></listitem>
    </para>
 
    <para>
-    The 8.0 release announced that the <function>to_char()</> function
+    The 8.0 release announced that the <function>to_char()</function> function
     for intervals would be removed in 8.1. However, since no better API
-    has been suggested, <function>to_char(interval)</> has been enhanced in
+    has been suggested, <function>to_char(interval)</function> has been enhanced in
     8.1 and will remain in the server.
    </para>
 
@@ -3570,21 +3570,21 @@ DISTINCT query</para></listitem>
 
     <listitem>
      <para>
-      <varname>add_missing_from</> is now false by default (Neil)
+      <varname>add_missing_from</varname> is now false by default (Neil)
      </para>
      <para>
       By default, we now generate an error if a table is used in a query
-      without a <literal>FROM</> reference.  The old behavior is still
+      without a <literal>FROM</literal> reference.  The old behavior is still
       available, but the parameter must be set to 'true' to obtain it.
      </para>
 
      <para>
-      It might be necessary to set <varname>add_missing_from</> to true
+      It might be necessary to set <varname>add_missing_from</varname> to true
       in order to load an existing dump file, if the dump contains any
-      views or rules created using the implicit-<literal>FROM</> syntax.
+      views or rules created using the implicit-<literal>FROM</literal> syntax.
       This should be a one-time annoyance, because
       <productname>PostgreSQL</productname> 8.1 will convert
-      such views and rules to standard explicit-<literal>FROM</> syntax.
+      such views and rules to standard explicit-<literal>FROM</literal> syntax.
       Subsequent dumps will therefore not have the problem.
      </para>
     </listitem>
@@ -3604,29 +3604,29 @@ DISTINCT query</para></listitem>
 
     <listitem>
      <para>
-      <varname>default_with_oids</> is now false by default (Neil)
+      <varname>default_with_oids</varname> is now false by default (Neil)
      </para>
      <para>
       With this option set to false, user-created tables no longer
-      have an OID column unless <command>WITH OIDS</> is specified in
-      <command>CREATE TABLE</>. Though OIDs have existed in all
-      releases of <productname>PostgreSQL</>, their use is limited
+      have an OID column unless <command>WITH OIDS</command> is specified in
+      <command>CREATE TABLE</command>. Though OIDs have existed in all
+      releases of <productname>PostgreSQL</productname>, their use is limited
       because they are only four bytes long and the counter is shared
       across all installed databases. The preferred way of uniquely
-      identifying rows is via sequences and the <type>SERIAL</> type,
-      which have been supported since <productname>PostgreSQL</> 6.4.
+      identifying rows is via sequences and the <type>SERIAL</type> type,
+      which have been supported since <productname>PostgreSQL</productname> 6.4.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>E''</> syntax so eventually ordinary strings can
+      Add <literal>E''</literal> syntax so eventually ordinary strings can
       treat backslashes literally (Bruce)
      </para>
      <para>
       Currently <productname>PostgreSQL</productname> processes a
       backslash in a string literal as introducing a special escape sequence,
-      e.g. <literal>\n</> or <literal>\010</>.
+      e.g. <literal>\n</literal> or <literal>\010</literal>.
       While this allows easy entry of special values, it is
       nonstandard and makes porting of applications from other
       databases more difficult. For this reason, the
@@ -3634,8 +3634,8 @@ DISTINCT query</para></listitem>
       remove the special meaning of backslashes in strings. For
       backward compatibility and for users who want special backslash
       processing, a new string syntax has been created. This new string
-      syntax is formed by writing an <literal>E</> immediately preceding the
-      single quote that starts the string, e.g. <literal>E'hi\n'</>. While
+      syntax is formed by writing an <literal>E</literal> immediately preceding the
+      single quote that starts the string, e.g. <literal>E'hi\n'</literal>. While
       this release does not change the handling of backslashes in strings, it
       does add new configuration parameters to help users migrate applications
       for future releases:
@@ -3644,14 +3644,14 @@ DISTINCT query</para></listitem>
 
       <listitem>
        <para>
-        <varname>standard_conforming_strings</> &mdash; does this release
+        <varname>standard_conforming_strings</varname> &mdash; does this release
         treat backslashes literally in ordinary strings?
        </para>
       </listitem>
 
       <listitem>
       <para>
-       <varname>escape_string_warning</> &mdash; warn about backslashes in
+       <varname>escape_string_warning</varname> &mdash; warn about backslashes in
        ordinary (non-E) strings
       </para>
      </listitem>
@@ -3659,36 +3659,36 @@ DISTINCT query</para></listitem>
      </itemizedlist>
 
      <para>
-      The <varname>standard_conforming_strings</> value is read-only.
+      The <varname>standard_conforming_strings</varname> value is read-only.
       Applications can retrieve the value to know how backslashes are
       processed.  (Presence of the parameter can also be taken as an
-      indication that <literal>E''</> string syntax is supported.)
-      In a future release, <varname>standard_conforming_strings</>
+      indication that <literal>E''</literal> string syntax is supported.)
+      In a future release, <varname>standard_conforming_strings</varname>
       will be true, meaning backslashes will be treated literally in
-      non-E strings. To prepare for this change, use <literal>E''</>
+      non-E strings. To prepare for this change, use <literal>E''</literal>
       strings in places that need special backslash processing, and
-      turn on <varname>escape_string_warning</> to find additional
-      strings that need to be converted to use <literal>E''</>.
-      Also, use two single-quotes (<literal>''</>) to embed a literal
+      turn on <varname>escape_string_warning</varname> to find additional
+      strings that need to be converted to use <literal>E''</literal>.
+      Also, use two single-quotes (<literal>''</literal>) to embed a literal
       single-quote in a string, rather than the
       <productname>PostgreSQL</productname>-supported syntax of
-      backslash single-quote (<literal>\'</>).  The former is
+      backslash single-quote (<literal>\'</literal>).  The former is
       standards-conforming and does not require the use of the
-      <literal>E''</> string syntax.  You can also use the
-      <literal>$$</> string syntax, which does not treat backslashes
+      <literal>E''</literal> string syntax.  You can also use the
+      <literal>$$</literal> string syntax, which does not treat backslashes
       specially.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>REINDEX DATABASE</> reindex all indexes in the
+      Make <command>REINDEX DATABASE</command> reindex all indexes in the
       database (Tom)
      </para>
      <para>
-      Formerly, <command>REINDEX DATABASE</> reindexed only
+      Formerly, <command>REINDEX DATABASE</command> reindexed only
       system tables. This new behavior seems more intuitive. A new
-      command <command>REINDEX SYSTEM</> provides the old functionality
+      command <command>REINDEX SYSTEM</command> provides the old functionality
       of reindexing just the system tables.
      </para>
     </listitem>
@@ -3698,13 +3698,13 @@ DISTINCT query</para></listitem>
       Read-only large object descriptors now obey MVCC snapshot semantics
      </para>
      <para>
-      When a large object is opened with <literal>INV_READ</> (and not
-      <literal>INV_WRITE</>), the data read from the descriptor will now
-      reflect a <quote>snapshot</> of the large object's state at the
+      When a large object is opened with <literal>INV_READ</literal> (and not
+      <literal>INV_WRITE</literal>), the data read from the descriptor will now
+      reflect a <quote>snapshot</quote> of the large object's state at the
       time of the transaction snapshot in use by the query that called
-      <function>lo_open()</>.  To obtain the old behavior of always
-      returning the latest committed data, include <literal>INV_WRITE</>
-      in the mode flags for <function>lo_open()</>.
+      <function>lo_open()</function>.  To obtain the old behavior of always
+      returning the latest committed data, include <literal>INV_WRITE</literal>
+      in the mode flags for <function>lo_open()</function>.
      </para>
     </listitem>
 
@@ -3713,28 +3713,28 @@ DISTINCT query</para></listitem>
       Add proper dependencies for arguments of sequence functions (Tom)
      </para>
      <para>
-      In previous releases, sequence names passed to <function>nextval()</>,
-      <function>currval()</>, and <function>setval()</> were stored as
+      In previous releases, sequence names passed to <function>nextval()</function>,
+      <function>currval()</function>, and <function>setval()</function> were stored as
       simple text strings, meaning that renaming or dropping a
-      sequence used in a <literal>DEFAULT</> clause made the clause
+      sequence used in a <literal>DEFAULT</literal> clause made the clause
       invalid. This release stores all newly-created sequence function
       arguments as internal OIDs, allowing them to track sequence
       renaming, and adding dependency information that prevents
-      improper sequence removal. It also makes such <literal>DEFAULT</>
+      improper sequence removal. It also makes such <literal>DEFAULT</literal>
       clauses immune to schema renaming and search path changes.
      </para>
      <para>
       Some applications might rely on the old behavior of
       run-time lookup for sequence names. This can still be done by
-      explicitly casting the argument to <type>text</>, for example
-      <literal>nextval('myseq'::text)</>.
+      explicitly casting the argument to <type>text</type>, for example
+      <literal>nextval('myseq'::text)</literal>.
      </para>
      <para>
       Pre-8.1 database dumps loaded into 8.1 will use the old text-based
       representation and therefore will not have the features of
       OID-stored arguments. However, it is possible to update a
-      database containing text-based <literal>DEFAULT</> clauses.
-      First, save this query into a file, such as <filename>fixseq.sql</>:
+      database containing text-based <literal>DEFAULT</literal> clauses.
+      First, save this query into a file, such as <filename>fixseq.sql</filename>:
 <programlisting>
 SELECT  'ALTER TABLE ' ||
    pg_catalog.quote_ident(n.nspname) || '.' ||
@@ -3754,11 +3754,11 @@ WHERE   n.oid = c.relnamespace AND
    d.adsrc ~ $$val\(\('[^']*'::text\)::regclass$$;
 </programlisting>
       Next, run the query against a database to find what
-      adjustments are required, like this for database <literal>db1</>:
+      adjustments are required, like this for database <literal>db1</literal>:
 <programlisting>
 psql -t -f fixseq.sql db1
 </programlisting>
-      This will show the <command>ALTER TABLE</> commands needed to
+      This will show the <command>ALTER TABLE</command> commands needed to
       convert the database to the newer OID-based representation.
       If the commands look reasonable, run this to update the database:
 <programlisting>
@@ -3771,51 +3771,51 @@ psql -t -f fixseq.sql db1 | psql -e db1
     <listitem>
      <para>
       In <application>psql</application>, treat unquoted
-      <literal>\{digit}+</> sequences as octal (Bruce)
+      <literal>\{digit}+</literal> sequences as octal (Bruce)
      </para>
      <para>
-      In previous releases, <literal>\{digit}+</> sequences were
-      treated as decimal, and only <literal>\0{digit}+</> were treated
+      In previous releases, <literal>\{digit}+</literal> sequences were
+      treated as decimal, and only <literal>\0{digit}+</literal> were treated
       as octal. This change was made for consistency.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove grammar productions for prefix and postfix <literal>%</>
-      and <literal>^</> operators
+      Remove grammar productions for prefix and postfix <literal>%</literal>
+      and <literal>^</literal> operators
       (Tom)
      </para>
      <para>
       These have never been documented and complicated the use of the
-      modulus operator (<literal>%</>) with negative numbers.
+      modulus operator (<literal>%</literal>) with negative numbers.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <literal>&amp;&lt;</> and <literal>&amp;&gt;</> for polygons
+      Make <literal>&amp;&lt;</literal> and <literal>&amp;&gt;</literal> for polygons
       consistent with the box "over" operators (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <command>CREATE LANGUAGE</> can ignore the provided arguments
-      in favor of information from <structname>pg_pltemplate</>
+      <command>CREATE LANGUAGE</command> can ignore the provided arguments
+      in favor of information from <structname>pg_pltemplate</structname>
       (Tom)
      </para>
      <para>
-      A new system catalog <structname>pg_pltemplate</> has been defined
+      A new system catalog <structname>pg_pltemplate</structname> has been defined
       to carry information about the preferred definitions of procedural
       languages (such as whether they have validator functions).  When
       an entry exists in this catalog for the language being created,
-      <command>CREATE LANGUAGE</> will ignore all its parameters except the
+      <command>CREATE LANGUAGE</command> will ignore all its parameters except the
       language name and instead use the catalog information.  This measure
       was taken because of increasing problems with obsolete language
       definitions being loaded by old dump files.  As of 8.1,
-      <application>pg_dump</> will dump procedural language definitions as
-      just <command>CREATE LANGUAGE <replaceable>name</></command>, relying
+      <application>pg_dump</application> will dump procedural language definitions as
+      just <command>CREATE LANGUAGE <replaceable>name</replaceable></command>, relying
       on a template entry to exist at load time.  We expect this will be a
       more future-proof representation.
      </para>
@@ -3835,11 +3835,11 @@ psql -t -f fixseq.sql db1 | psql -e db1
       sequences to be entered into the database, and this release
       properly accepts only valid UTF-8 sequences. One way to correct a
       dumpfile is to run the command <command>iconv -c -f UTF-8 -t
-      UTF-8 -o cleanfile.sql dumpfile.sql</>. The <literal>-c</> option
+      UTF-8 -o cleanfile.sql dumpfile.sql</command>. The <literal>-c</literal> option
       removes invalid character sequences. A diff of the two files will
-      show the sequences that are invalid. <command>iconv</> reads the
+      show the sequences that are invalid. <command>iconv</command> reads the
       entire input file into memory so it might be necessary to use
-      <application>split</> to break up the dump into multiple smaller
+      <application>split</application> to break up the dump into multiple smaller
       files for processing.
      </para>
     </listitem>
@@ -3908,17 +3908,17 @@ psql -t -f fixseq.sql db1 | psql -e db1
       </para>
       <para>
        For example, this allows an index on columns a,b,c to be used in
-       a query with <command>WHERE a = 4 and c = 10</>.
+       a query with <command>WHERE a = 4 and c = 10</command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Skip WAL logging for <command>CREATE TABLE AS</> /
-       <command>SELECT INTO</> (Simon)
+       Skip WAL logging for <command>CREATE TABLE AS</command> /
+       <command>SELECT INTO</command> (Simon)
       </para>
       <para>
-       Since a crash during <command>CREATE TABLE AS</> would cause the
+       Since a crash during <command>CREATE TABLE AS</command> would cause the
        table to be dropped during recovery, there is no reason to WAL
        log as the table is loaded.  (Logging still happens if WAL
        archiving is enabled, however.)
@@ -3933,7 +3933,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add configuration parameter <varname>full_page_writes</> to
+       Add configuration parameter <varname>full_page_writes</varname> to
        control writing full pages to WAL (Bruce)
       </para>
       <para>
@@ -3948,22 +3948,22 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Use <literal>O_DIRECT</> if available when using
-       <literal>O_SYNC</> for <varname>wal_sync_method</varname>
+       Use <literal>O_DIRECT</literal> if available when using
+       <literal>O_SYNC</literal> for <varname>wal_sync_method</varname>
        (Itagaki Takahiro)
       </para>
       <para>
-       <literal>O_DIRECT</> causes disk writes to bypass the kernel
+       <literal>O_DIRECT</literal> causes disk writes to bypass the kernel
        cache, and for WAL writes, this improves performance.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve <command>COPY FROM</> performance (Alon Goldshuv)
+       Improve <command>COPY FROM</command> performance (Alon Goldshuv)
       </para>
       <para>
-       This was accomplished by reading <command>COPY</> input in
+       This was accomplished by reading <command>COPY</command> input in
        larger chunks, rather than character by character.
       </para>
      </listitem>
@@ -4005,14 +4005,14 @@ psql -t -f fixseq.sql db1 | psql -e db1
      <listitem>
       <para>
        Add warning about the need to increase
-       <varname>max_fsm_relations</> and <varname>max_fsm_pages</>
-       during <command>VACUUM</> (Ron Mayer)
+       <varname>max_fsm_relations</varname> and <varname>max_fsm_pages</varname>
+       during <command>VACUUM</command> (Ron Mayer)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <varname>temp_buffers</> configuration parameter to allow
+       Add <varname>temp_buffers</varname> configuration parameter to allow
        users to determine the size of the local buffer area for
        temporary table access (Tom)
       </para>
@@ -4021,13 +4021,13 @@ psql -t -f fixseq.sql db1 | psql -e db1
      <listitem>
       <para>
        Add session start time and client IP address to
-       <literal>pg_stat_activity</> (Magnus)
+       <literal>pg_stat_activity</literal> (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Adjust <literal>pg_stat</> views for bitmap scans (Tom)
+       Adjust <literal>pg_stat</literal> views for bitmap scans (Tom)
       </para>
       <para>
        The meanings of some of the fields have changed slightly.
@@ -4036,27 +4036,27 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Enhance <literal>pg_locks</> view (Tom)
+       Enhance <literal>pg_locks</literal> view (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Log queries for client-side <command>PREPARE</> and
-       <command>EXECUTE</> (Simon)
+       Log queries for client-side <command>PREPARE</command> and
+       <command>EXECUTE</command> (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Allow Kerberos name and user name case sensitivity to be
-       specified in <filename>postgresql.conf</> (Magnus)
+       specified in <filename>postgresql.conf</filename> (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add configuration parameter <varname>krb_server_hostname</> so
+       Add configuration parameter <varname>krb_server_hostname</varname> so
        that the server host name can be specified as part of service
        principal (Todd Kover)
       </para>
@@ -4069,8 +4069,8 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add <varname>log_line_prefix</> options for millisecond
-       timestamps (<literal>%m</>) and remote host (<literal>%h</>) (Ed
+       Add <varname>log_line_prefix</varname> options for millisecond
+       timestamps (<literal>%m</literal>) and remote host (<literal>%h</literal>) (Ed
        L.)
       </para>
      </listitem>
@@ -4086,12 +4086,12 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Remove old <filename>*.backup</> files when we do
-       <function>pg_stop_backup()</> (Bruce)
+       Remove old <filename>*.backup</filename> files when we do
+       <function>pg_stop_backup()</function> (Bruce)
       </para>
       <para>
-       This prevents a large number of <filename>*.backup</> files from
-       existing in <filename>pg_xlog/</>.
+       This prevents a large number of <filename>*.backup</filename> files from
+       existing in <filename>pg_xlog/</filename>.
       </para>
      </listitem>
 
@@ -4112,7 +4112,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
        Add per-user and per-database connection limits (Petr Jelinek)
       </para>
       <para>
-       Using <command>ALTER USER</> and <command>ALTER DATABASE</>,
+       Using <command>ALTER USER</command> and <command>ALTER DATABASE</command>,
        limits can now be enforced on the maximum number of sessions that
        can concurrently connect as a specific user or to a specific database.
        Setting the limit to zero disables user or database connections.
@@ -4128,7 +4128,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       New system catalog <structname>pg_pltemplate</> allows overriding
+       New system catalog <structname>pg_pltemplate</structname> allows overriding
        obsolete procedural-language definitions in dump files (Tom)
       </para>
      </listitem>
@@ -4149,63 +4149,63 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Fix <command>HAVING</> without any aggregate functions or
-       <command>GROUP BY</> so that the query returns a single group (Tom)
+       Fix <command>HAVING</command> without any aggregate functions or
+       <command>GROUP BY</command> so that the query returns a single group (Tom)
       </para>
       <para>
-       Previously, such a case would treat the <command>HAVING</>
-       clause the same as a <command>WHERE</> clause.  This was not per spec.
+       Previously, such a case would treat the <command>HAVING</command>
+       clause the same as a <command>WHERE</command> clause.  This was not per spec.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>USING</> clause to allow additional tables to be
-       specified to <command>DELETE</> (Euler Taveira de Oliveira, Neil)
+       Add <command>USING</command> clause to allow additional tables to be
+       specified to <command>DELETE</command> (Euler Taveira de Oliveira, Neil)
       </para>
       <para>
        In prior releases, there was no clear method for specifying
-       additional tables to be used for joins in a <command>DELETE</>
-       statement. <command>UPDATE</> already has a <literal>FROM</>
+       additional tables to be used for joins in a <command>DELETE</command>
+       statement. <command>UPDATE</command> already has a <literal>FROM</literal>
        clause for this purpose.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <literal>\x</> hex escapes in backend and ecpg
+       Add support for <literal>\x</literal> hex escapes in backend and ecpg
        strings (Bruce)
       </para>
       <para>
-       This is just like the standard C <literal>\x</> escape syntax.
+       This is just like the standard C <literal>\x</literal> escape syntax.
        Octal escapes were already supported.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>BETWEEN SYMMETRIC</> query syntax (Pavel Stehule)
+       Add <command>BETWEEN SYMMETRIC</command> query syntax (Pavel Stehule)
       </para>
       <para>
-       This feature allows <command>BETWEEN</> comparisons without
+       This feature allows <command>BETWEEN</command> comparisons without
        requiring the first value to be less than the second. For
-       example, <command>2 BETWEEN [ASYMMETRIC] 3 AND 1</> returns
-       false, while <command>2 BETWEEN SYMMETRIC 3 AND 1</> returns
-       true. <command>BETWEEN ASYMMETRIC</> was already supported.
+       example, <command>2 BETWEEN [ASYMMETRIC] 3 AND 1</command> returns
+       false, while <command>2 BETWEEN SYMMETRIC 3 AND 1</command> returns
+       true. <command>BETWEEN ASYMMETRIC</command> was already supported.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>NOWAIT</> option to <command>SELECT ... FOR
-       UPDATE/SHARE</> (Hans-Juergen Schoenig)
+       Add <command>NOWAIT</command> option to <command>SELECT ... FOR
+       UPDATE/SHARE</command> (Hans-Juergen Schoenig)
       </para>
       <para>
-       While the <varname>statement_timeout</> configuration
+       While the <varname>statement_timeout</varname> configuration
        parameter allows a query taking more than a certain amount of
-       time to be canceled, the <command>NOWAIT</> option allows a
+       time to be canceled, the <command>NOWAIT</command> option allows a
        query to be canceled as soon as a <command>SELECT ... FOR
-       UPDATE/SHARE</> command cannot immediately acquire a row lock.
+       UPDATE/SHARE</command> command cannot immediately acquire a row lock.
       </para>
      </listitem>
     </itemizedlist>
@@ -4233,7 +4233,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Allow limited <command>ALTER OWNER</> commands to be performed
+       Allow limited <command>ALTER OWNER</command> commands to be performed
        by the object owner (Stephen Frost)
       </para>
       <para>
@@ -4248,7 +4248,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add <command>ALTER</> object <command>SET SCHEMA</> capability
+       Add <command>ALTER</command> object <command>SET SCHEMA</command> capability
        for some object types (tables, functions, types) (Bernd Helmle)
       </para>
       <para>
@@ -4273,54 +4273,54 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Allow <command>TRUNCATE</> to truncate multiple tables in a
+       Allow <command>TRUNCATE</command> to truncate multiple tables in a
        single command (Alvaro)
       </para>
       <para>
        Because of referential integrity checks, it is not allowed to
        truncate a table that is part of a referential integrity
-       constraint. Using this new functionality, <command>TRUNCATE</>
+       constraint. Using this new functionality, <command>TRUNCATE</command>
        can be used to truncate such tables, if both tables involved in
        a referential integrity constraint are truncated in a single
-       <command>TRUNCATE</> command.
+       <command>TRUNCATE</command> command.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Properly process carriage returns and line feeds in
-       <command>COPY CSV</> mode (Andrew)
+       <command>COPY CSV</command> mode (Andrew)
       </para>
       <para>
        In release 8.0, carriage returns and line feeds in <command>CSV
-       COPY TO</> were processed in an inconsistent manner. (This was
+       COPY TO</command> were processed in an inconsistent manner. (This was
        documented on the TODO list.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>COPY WITH CSV HEADER</> to allow a header line as
-       the first line in <command>COPY</> (Andrew)
+       Add <command>COPY WITH CSV HEADER</command> to allow a header line as
+       the first line in <command>COPY</command> (Andrew)
       </para>
       <para>
-       This allows handling of the common <command>CSV</> usage of
+       This allows handling of the common <command>CSV</command> usage of
        placing the column names on the first line of the data file. For
-       <command>COPY TO</>, the first line contains the column names,
-       and for <command>COPY FROM</>, the first line is ignored.
+       <command>COPY TO</command>, the first line contains the column names,
+       and for <command>COPY FROM</command>, the first line is ignored.
       </para>
      </listitem>
 
      <listitem>
       <para>
        On Windows, display better sub-second precision in
-       <command>EXPLAIN ANALYZE</> (Magnus)
+       <command>EXPLAIN ANALYZE</command> (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add trigger duration display to <command>EXPLAIN ANALYZE</>
+       Add trigger duration display to <command>EXPLAIN ANALYZE</command>
        (Tom)
       </para>
       <para>
@@ -4332,7 +4332,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add support for <literal>\x</> hex escapes in <command>COPY</>
+       Add support for <literal>\x</literal> hex escapes in <command>COPY</command>
        (Sergey Ten)
       </para>
       <para>
@@ -4342,11 +4342,11 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Make <command>SHOW ALL</> include variable descriptions
+       Make <command>SHOW ALL</command> include variable descriptions
        (Matthias Schmidt)
       </para>
       <para>
-       <command>SHOW</> varname still only displays the variable's
+       <command>SHOW</command> varname still only displays the variable's
        value and does not include the description.
       </para>
      </listitem>
@@ -4354,27 +4354,27 @@ psql -t -f fixseq.sql db1 | psql -e db1
      <listitem>
       <para>
        Make <application>initdb</application> create a new standard
-       database called <literal>postgres</>, and convert utilities to
-       use <literal>postgres</> rather than <literal>template1</> for
+       database called <literal>postgres</literal>, and convert utilities to
+       use <literal>postgres</literal> rather than <literal>template1</literal> for
        standard lookups (Dave)
       </para>
       <para>
-       In prior releases, <literal>template1</> was used both as a
+       In prior releases, <literal>template1</literal> was used both as a
        default connection for utilities like
        <application>createuser</application>, and as a template for
-       new databases. This caused <command>CREATE DATABASE</> to
+       new databases. This caused <command>CREATE DATABASE</command> to
        sometimes fail, because a new database cannot be created if
        anyone else is in the template database. With this change, the
-       default connection database is now <literal>postgres</>,
+       default connection database is now <literal>postgres</literal>,
        meaning it is much less likely someone will be using
-       <literal>template1</> during <command>CREATE DATABASE</>.
+       <literal>template1</literal> during <command>CREATE DATABASE</command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Create new <application>reindexdb</application> command-line
-       utility by moving <filename>/contrib/reindexdb</> into the
+       utility by moving <filename>/contrib/reindexdb</filename> into the
        server (Euler Taveira de Oliveira)
       </para>
      </listitem>
@@ -4389,38 +4389,38 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add <function>MAX()</> and <function>MIN()</> aggregates for
+       Add <function>MAX()</function> and <function>MIN()</function> aggregates for
        array types (Koju Iijima)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <function>to_date()</> and <function>to_timestamp()</> to
-       behave reasonably when <literal>CC</> and <literal>YY</> fields
+       Fix <function>to_date()</function> and <function>to_timestamp()</function> to
+       behave reasonably when <literal>CC</literal> and <literal>YY</literal> fields
        are both used (Karel Zak)
       </para>
       <para>
-       If the format specification contains <literal>CC</> and a year
-       specification is <literal>YYY</> or longer, ignore the
-       <literal>CC</>. If the year specification is <literal>YY</> or
-       shorter, interpret <literal>CC</> as the previous century.
+       If the format specification contains <literal>CC</literal> and a year
+       specification is <literal>YYY</literal> or longer, ignore the
+       <literal>CC</literal>. If the year specification is <literal>YY</literal> or
+       shorter, interpret <literal>CC</literal> as the previous century.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>md5(bytea)</> (Abhijit Menon-Sen)
+       Add <function>md5(bytea)</function> (Abhijit Menon-Sen)
       </para>
       <para>
-       <function>md5(text)</> already existed.
+       <function>md5(text)</function> already existed.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <command>numeric ^ numeric</> based on
-       <function>power(numeric, numeric)</>
+       Add support for <command>numeric ^ numeric</command> based on
+       <function>power(numeric, numeric)</function>
       </para>
       <para>
        The function already existed, but there was no operator assigned
@@ -4430,7 +4430,7 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Fix <type>NUMERIC</> modulus by properly truncating the quotient
+       Fix <type>NUMERIC</type> modulus by properly truncating the quotient
        during computation (Bruce)
       </para>
       <para>
@@ -4441,29 +4441,29 @@ psql -t -f fixseq.sql db1 | psql -e db1
 
      <listitem>
       <para>
-       Add a function <function>lastval()</> (Dennis Bj&ouml;rklund)
+       Add a function <function>lastval()</function> (Dennis Bj&ouml;rklund)
       </para>
       <para>
-       <function>lastval()</> is a simplified version of
-       <function>currval()</>. It automatically determines the proper
-       sequence name based on the most recent <function>nextval()</> or
-       <function>setval()</> call performed by the current session.
+       <function>lastval()</function> is a simplified version of
+       <function>currval()</function>. It automatically determines the proper
+       sequence name based on the most recent <function>nextval()</function> or
+       <function>setval()</function> call performed by the current session.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>to_timestamp(DOUBLE PRECISION) (Michael Glaesemann)</>
+       Add <function>to_timestamp(DOUBLE PRECISION) (Michael Glaesemann)</function>
       </para>
       <para>
        Converts Unix seconds since 1970 to a <type>TIMESTAMP WITH
-       TIMEZONE</>.
+       TIMEZONE</type>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>pg_postmaster_start_time()</> function (Euler
+       Add <function>pg_postmaster_start_time()</function> function (Euler
        Taveira de Oliveira, Matthias Schmidt)
       </para>
      </listitem>
@@ -4471,11 +4471,11 @@ psql -t -f fixseq.sql db1 | psql -e db1
      <listitem>
       <para>
        Allow the full use of time zone names in <command>AT TIME
-       ZONE</>, not just the short list previously available (Magnus)
+       ZONE</command>, not just the short list previously available (Magnus)
       </para>
       <para>
        Previously, only a predefined list of time zone names were
-       supported by <command>AT TIME ZONE</>. Now any supported time
+       supported by <command>AT TIME ZONE</command>. Now any supported time
        zone name can be used, e.g.:
 <programlisting>
 SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
@@ -4488,7 +4488,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <function>GREATEST()</> and <function>LEAST()</> variadic
+       Add <function>GREATEST()</function> and <function>LEAST()</function> variadic
        functions (Pavel Stehule)
       </para>
       <para>
@@ -4499,7 +4499,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <function>pg_column_size()</> (Mark Kirkwood)
+       Add <function>pg_column_size()</function> (Mark Kirkwood)
       </para>
       <para>
        This returns storage size of a column, which might be compressed.
@@ -4508,7 +4508,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <function>regexp_replace()</> (Atsushi Ogawa)
+       Add <function>regexp_replace()</function> (Atsushi Ogawa)
       </para>
       <para>
        This allows regular expression replacement, like sed. An optional
@@ -4523,8 +4523,8 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
       </para>
       <para>
        Previous versions sometimes returned unjustified results, like
-       <command>'4 months'::interval / 5</> returning <command>'1 mon
-       -6 days'</>.
+       <command>'4 months'::interval / 5</command> returning <command>'1 mon
+       -6 days'</command>.
       </para>
      </listitem>
 
@@ -4534,24 +4534,24 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
       </para>
       <para>
        This fixes some cases in which the seconds field would be shown as
-       <literal>60</> instead of incrementing the higher-order fields.
+       <literal>60</literal> instead of incrementing the higher-order fields.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a separate day field to type <type>interval</> so a one day
+       Add a separate day field to type <type>interval</type> so a one day
        interval can be distinguished from a 24 hour interval (Michael
        Glaesemann)
       </para>
       <para>
        Days that contain a daylight saving time adjustment are not 24
        hours long, but typically 23 or 25 hours.  This change creates a
-       conceptual distinction between intervals of <quote>so many days</>
-       and intervals of <quote>so many hours</>.  Adding
-       <literal>1 day</> to a timestamp now gives the same local time on
+       conceptual distinction between intervals of <quote>so many days</quote>
+       and intervals of <quote>so many hours</quote>.  Adding
+       <literal>1 day</literal> to a timestamp now gives the same local time on
        the next day even if a daylight saving time adjustment occurs
-       between, whereas adding <literal>24 hours</> will give a different
+       between, whereas adding <literal>24 hours</literal> will give a different
        local time when this happens.  For example, under US DST rules:
 <programlisting>
 '2005-04-03 00:00:00-05' + '1 day' = '2005-04-04 00:00:00-04'
@@ -4562,7 +4562,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <function>justify_days()</> and <function>justify_hours()</>
+       Add <function>justify_days()</function> and <function>justify_hours()</function>
        (Michael Glaesemann)
       </para>
       <para>
@@ -4574,7 +4574,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Move <filename>/contrib/dbsize</> into the backend, and rename
+       Move <filename>/contrib/dbsize</filename> into the backend, and rename
        some of the functions (Dave Page, Andreas Pflug)
       </para>
       <para>
@@ -4582,38 +4582,38 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
         <listitem>
          <para>
-           <function>pg_tablespace_size()</>
+           <function>pg_tablespace_size()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_database_size()</>
+          <function>pg_database_size()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_relation_size()</>
+          <function>pg_relation_size()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_total_relation_size()</>
+          <function>pg_total_relation_size()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_size_pretty()</>
+          <function>pg_size_pretty()</function>
          </para>
         </listitem>
 
        </itemizedlist>
       </para>
       <para>
-       <function>pg_total_relation_size()</> includes indexes and TOAST
+       <function>pg_total_relation_size()</function> includes indexes and TOAST
        tables.
       </para>
      </listitem>
@@ -4628,19 +4628,19 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
         <listitem>
          <para>
-          <function>pg_stat_file()</>
+          <function>pg_stat_file()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_read_file()</>
+          <function>pg_read_file()</function>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <function>pg_ls_dir()</>
+          <function>pg_ls_dir()</function>
          </para>
         </listitem>
 
@@ -4650,21 +4650,21 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <function>pg_reload_conf()</> to force reloading of the
+       Add <function>pg_reload_conf()</function> to force reloading of the
        configuration files (Dave Page, Andreas Pflug)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>pg_rotate_logfile()</> to force rotation of the
+       Add <function>pg_rotate_logfile()</function> to force rotation of the
        server log file (Dave Page, Andreas Pflug)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change <literal>pg_stat_*</> views to include TOAST tables (Tom)
+       Change <literal>pg_stat_*</literal> views to include TOAST tables (Tom)
       </para>
      </listitem>
 
@@ -4686,25 +4686,25 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
         <listitem>
          <para>
-          <literal>UNICODE</> is now <literal>UTF8</>
+          <literal>UNICODE</literal> is now <literal>UTF8</literal>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <literal>ALT</> is now <literal>WIN866</>
+          <literal>ALT</literal> is now <literal>WIN866</literal>
          </para>
         </listitem>
 
         <listitem>
          <para>
-          <literal>WIN</> is now <literal>WIN1251</>
+          <literal>WIN</literal> is now <literal>WIN1251</literal>
          </para>
         </listitem>
 
         <listitem>
          <para>
-         <literal>TCVN</> is now <literal>WIN1258</>
+         <literal>TCVN</literal> is now <literal>WIN1258</literal>
          </para>
         </listitem>
 
@@ -4718,17 +4718,17 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add support for <literal>WIN1252</> encoding (Roland Volkmann)
+       Add support for <literal>WIN1252</literal> encoding (Roland Volkmann)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for four-byte <literal>UTF8</> characters (John
+       Add support for four-byte <literal>UTF8</literal> characters (John
        Hansen)
       </para>
       <para>
-       Previously only one, two, and three-byte <literal>UTF8</> characters
+       Previously only one, two, and three-byte <literal>UTF8</literal> characters
        were supported. This is particularly important for support for
        some Chinese character sets.
       </para>
@@ -4736,8 +4736,8 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow direct conversion between <literal>EUC_JP</> and
-       <literal>SJIS</> to improve performance (Atsushi Ogawa)
+       Allow direct conversion between <literal>EUC_JP</literal> and
+       <literal>SJIS</literal> to improve performance (Atsushi Ogawa)
       </para>
      </listitem>
 
@@ -4761,14 +4761,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Fix <command>ALTER LANGUAGE RENAME</> (Sergey Yatskevich)
+       Fix <command>ALTER LANGUAGE RENAME</command> (Sergey Yatskevich)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Allow function characteristics, like strictness and volatility,
-       to be modified via <command>ALTER FUNCTION</> (Neil)
+       to be modified via <command>ALTER FUNCTION</command> (Neil)
       </para>
      </listitem>
 
@@ -4780,14 +4780,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow SQL and PL/pgSQL functions to use <command>OUT</> and
-       <command>INOUT</> parameters (Tom)
+       Allow SQL and PL/pgSQL functions to use <command>OUT</command> and
+       <command>INOUT</command> parameters (Tom)
       </para>
       <para>
-       <command>OUT</> is an alternate way for a function to return
-       values. Instead of using <command>RETURN</>, values can be
-       returned by assigning to parameters declared as <command>OUT</> or
-       <command>INOUT</>.  This is notationally simpler in some cases,
+       <command>OUT</command> is an alternate way for a function to return
+       values. Instead of using <command>RETURN</command>, values can be
+       returned by assigning to parameters declared as <command>OUT</command> or
+       <command>INOUT</command>.  This is notationally simpler in some cases,
        particularly so when multiple values need to be returned.
        While returning multiple values from a function
        was possible in previous releases, this greatly simplifies the
@@ -4798,7 +4798,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Move language handler functions into the <literal>pg_catalog</> schema
+       Move language handler functions into the <literal>pg_catalog</literal> schema
       </para>
       <para>
        This makes it easier to drop the public schema if desired.
@@ -4831,7 +4831,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Check function syntax at <command>CREATE FUNCTION</> time,
+       Check function syntax at <command>CREATE FUNCTION</command> time,
        rather than at runtime (Neil)
       </para>
       <para>
@@ -4842,19 +4842,19 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow <command>OPEN</> to open non-<command>SELECT</> queries
-       like <command>EXPLAIN</> and <command>SHOW</> (Tom)
+       Allow <command>OPEN</command> to open non-<command>SELECT</command> queries
+       like <command>EXPLAIN</command> and <command>SHOW</command> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       No longer require functions to issue a <command>RETURN</>
+       No longer require functions to issue a <command>RETURN</command>
        statement (Tom)
       </para>
       <para>
-       This is a byproduct of the newly added <command>OUT</> and
-       <command>INOUT</> functionality.  <command>RETURN</> can
+       This is a byproduct of the newly added <command>OUT</command> and
+       <command>INOUT</command> functionality.  <command>RETURN</command> can
        be omitted when it is not needed to provide the function's
        return value.
       </para>
@@ -4862,21 +4862,21 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add support for an optional <command>INTO</> clause to
-       PL/pgSQL's <command>EXECUTE</> statement (Pavel Stehule, Neil)
+       Add support for an optional <command>INTO</command> clause to
+       PL/pgSQL's <command>EXECUTE</command> statement (Pavel Stehule, Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <command>CREATE TABLE AS</> set <command>ROW_COUNT</> (Tom)
+       Make <command>CREATE TABLE AS</command> set <command>ROW_COUNT</command> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Define <literal>SQLSTATE</> and <literal>SQLERRM</> to return
-       the <literal>SQLSTATE</> and error message of the current
+       Define <literal>SQLSTATE</literal> and <literal>SQLERRM</literal> to return
+       the <literal>SQLSTATE</literal> and error message of the current
        exception (Pavel Stehule, Neil)
       </para>
       <para>
@@ -4886,14 +4886,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow the parameters to the <command>RAISE</> statement to be
+       Allow the parameters to the <command>RAISE</command> statement to be
        expressions (Pavel Stehule, Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a loop <command>CONTINUE</> statement (Pavel Stehule, Neil)
+       Add a loop <command>CONTINUE</command> statement (Pavel Stehule, Neil)
       </para>
      </listitem>
 
@@ -4917,7 +4917,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
        Menon-Sen)
       </para>
       <para>
-       This allows functions to use <function>return_next()</> to avoid
+       This allows functions to use <function>return_next()</function> to avoid
        building the entire result set in memory.
       </para>
      </listitem>
@@ -4927,16 +4927,16 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
        Allow one-row-at-a-time retrieval of query results (Abhijit Menon-Sen)
       </para>
       <para>
-       This allows functions to use <function>spi_query()</> and
-       <function>spi_fetchrow()</> to avoid accumulating the entire
+       This allows functions to use <function>spi_query()</function> and
+       <function>spi_fetchrow()</function> to avoid accumulating the entire
        result set in memory.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Force PL/Perl to handle strings as <literal>UTF8</> if the
-       server encoding is <literal>UTF8</> (David Kamholz)
+       Force PL/Perl to handle strings as <literal>UTF8</literal> if the
+       server encoding is <literal>UTF8</literal> (David Kamholz)
       </para>
      </listitem>
 
@@ -4963,14 +4963,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow Perl nonfatal warnings to generate <command>NOTICE</>
+       Allow Perl nonfatal warnings to generate <command>NOTICE</command>
        messages (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow Perl's <literal>strict</> mode to be enabled (Andrew)
+       Allow Perl's <literal>strict</literal> mode to be enabled (Andrew)
       </para>
      </listitem>
 
@@ -4979,12 +4979,12 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
 
    <sect3>
-    <title><application>psql</> Changes</title>
+    <title><application>psql</application> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Add <command>\set ON_ERROR_ROLLBACK</> to allow statements in
+       Add <command>\set ON_ERROR_ROLLBACK</command> to allow statements in
        a transaction to error without affecting the rest of the
        transaction (Greg Sabino Mullane)
       </para>
@@ -4996,8 +4996,8 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add support for <literal>\x</> hex strings in
-       <application>psql</> variables (Bruce)
+       Add support for <literal>\x</literal> hex strings in
+       <application>psql</application> variables (Bruce)
       </para>
       <para>
        Octal escapes were already supported.
@@ -5006,7 +5006,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add support for <command>troff -ms</> output format (Roger
+       Add support for <command>troff -ms</command> output format (Roger
        Leigh)
       </para>
      </listitem>
@@ -5014,7 +5014,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
      <listitem>
       <para>
        Allow the history file location to be controlled by
-       <envar>HISTFILE</> (Andreas Seltenreich)
+       <envar>HISTFILE</envar> (Andreas Seltenreich)
       </para>
       <para>
        This allows configuration of per-database history storage.
@@ -5023,14 +5023,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Prevent <command>\x</> (expanded mode) from affecting
-       the output of <command>\d tablename</> (Neil)
+       Prevent <command>\x</command> (expanded mode) from affecting
+       the output of <command>\d tablename</command> (Neil)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <option>-L</> option to <application>psql</application> to
+       Add <option>-L</option> option to <application>psql</application> to
        log sessions (Lorne Sunley)
       </para>
       <para>
@@ -5041,44 +5041,44 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Make <command>\d</> show the tablespaces of indexes (Qingqing
+       Make <command>\d</command> show the tablespaces of indexes (Qingqing
        Zhou)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>psql</application> help (<command>\h</>) to
+       Allow <application>psql</application> help (<command>\h</command>) to
        make a best guess on the proper help information (Greg Sabino
        Mullane)
       </para>
       <para>
-       This allows the user to just add <command>\h</> to the front of
+       This allows the user to just add <command>\h</command> to the front of
        the syntax error query and get help on the supported syntax.
        Previously any additional query text beyond the command name
-       had to be removed to use <command>\h</>.
+       had to be removed to use <command>\h</command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>\pset numericlocale</> to allow numbers to be
+       Add <command>\pset numericlocale</command> to allow numbers to be
        output in a locale-aware format (Eugen Nedelcu)
       </para>
       <para>
-       For example, using <literal>C</> locale <literal>100000</> would
-       be output as <literal>100,000.0</> while a European locale might
-       output this value as <literal>100.000,0</>.
+       For example, using <literal>C</literal> locale <literal>100000</literal> would
+       be output as <literal>100,000.0</literal> while a European locale might
+       output this value as <literal>100.000,0</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Make startup banner show both server version number and
-       <application>psql</>'s version number, when they are different (Bruce)
+       <application>psql</application>'s version number, when they are different (Bruce)
       </para>
       <para>
-       Also, a warning will be shown if the server and <application>psql</>
+       Also, a warning will be shown if the server and <application>psql</application>
        are from different major releases.
       </para>
      </listitem>
@@ -5088,13 +5088,13 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
 
    <sect3>
-    <title><application>pg_dump</> Changes</title>
+    <title><application>pg_dump</application> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Add <option>-n</> / <option>--schema</> switch to
-       <application>pg_restore</> (Richard van den Berg)
+       Add <option>-n</option> / <option>--schema</option> switch to
+       <application>pg_restore</application> (Richard van den Berg)
       </para>
       <para>
        This allows just the objects in a specified schema to be restored.
@@ -5103,18 +5103,18 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow <application>pg_dump</> to dump large objects even in
+       Allow <application>pg_dump</application> to dump large objects even in
        text mode (Tom)
       </para>
       <para>
        With this change, large objects are now always dumped; the former
-       <option>-b</> switch is a no-op.
+       <option>-b</option> switch is a no-op.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>pg_dump</> to dump a consistent snapshot of
+       Allow <application>pg_dump</application> to dump a consistent snapshot of
        large objects (Tom)
       </para>
      </listitem>
@@ -5127,7 +5127,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <option>--encoding</> to <application>pg_dump</>
+       Add <option>--encoding</option> to <application>pg_dump</application>
        (Magnus Hagander)
       </para>
       <para>
@@ -5139,14 +5139,14 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Rely on <structname>pg_pltemplate</> for procedural languages (Tom)
+       Rely on <structname>pg_pltemplate</structname> for procedural languages (Tom)
       </para>
       <para>
        If the call handler for a procedural language is in the
-       <literal>pg_catalog</> schema, <application>pg_dump</> does not
+       <literal>pg_catalog</literal> schema, <application>pg_dump</application> does not
        dump the handler.  Instead, it dumps the language using just
-       <command>CREATE LANGUAGE <replaceable>name</></command>,
-       relying on the <structname>pg_pltemplate</> catalog to provide
+       <command>CREATE LANGUAGE <replaceable>name</replaceable></command>,
+       relying on the <structname>pg_pltemplate</structname> catalog to provide
        the language's creation parameters at load time.
       </para>
      </listitem>
@@ -5161,15 +5161,15 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add a <envar>PGPASSFILE</> environment variable to specify the
+       Add a <envar>PGPASSFILE</envar> environment variable to specify the
        password file's filename (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>lo_create()</>, that is similar to
-       <function>lo_creat()</> but allows the OID of the large object
+       Add <function>lo_create()</function>, that is similar to
+       <function>lo_creat()</function> but allows the OID of the large object
        to be specified (Tom)
       </para>
      </listitem>
@@ -5191,7 +5191,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Fix <application>pgxs</> to support building against a relocated
+       Fix <application>pgxs</application> to support building against a relocated
        installation
       </para>
      </listitem>
@@ -5238,10 +5238,10 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Allow <application>pg_config</> to be compiled using MSVC (Andrew)
+       Allow <application>pg_config</application> to be compiled using MSVC (Andrew)
       </para>
       <para>
-       This is required to build DBD::Pg using <application>MSVC</>.
+       This is required to build DBD::Pg using <application>MSVC</application>.
       </para>
      </listitem>
 
@@ -5264,15 +5264,15 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Modify <filename>postgresql.conf</> to use documentation defaults
-       <literal>on</>/<literal>off</> rather than
-       <literal>true</>/<literal>false</> (Bruce)
+       Modify <filename>postgresql.conf</filename> to use documentation defaults
+       <literal>on</literal>/<literal>off</literal> rather than
+       <literal>true</literal>/<literal>false</literal> (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Enhance <application>pg_config</> to be able to report more
+       Enhance <application>pg_config</application> to be able to report more
        build-time values (Tom)
       </para>
      </listitem>
@@ -5304,11 +5304,11 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
       </para>
 
       <para>
-       In previous releases, <filename>gist.h</> contained both the
+       In previous releases, <filename>gist.h</filename> contained both the
        public GiST API (intended for use by authors of GiST index
        implementations) as well as some private declarations used by
        the implementation of GiST itself. The latter have been moved
-       to a separate file, <filename>gist_private.h</>. Most GiST
+       to a separate file, <filename>gist_private.h</filename>. Most GiST
        index implementations should be unaffected.
       </para>
      </listitem>
@@ -5320,10 +5320,10 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
       <para>
        GiST methods are now always invoked in a short-lived memory
-       context. Therefore, memory allocated via <function>palloc()</>
+       context. Therefore, memory allocated via <function>palloc()</function>
        will be reclaimed automatically, so GiST index implementations
        do not need to manually release allocated memory via
-       <function>pfree()</>.
+       <function>pfree()</function>.
       </para>
      </listitem>
     </itemizedlist>
@@ -5336,7 +5336,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Add <filename>/contrib/pg_buffercache</> contrib module (Mark
+       Add <filename>/contrib/pg_buffercache</filename> contrib module (Mark
        Kirkwood)
       </para>
       <para>
@@ -5347,28 +5347,28 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Remove <filename>/contrib/array</> because it is obsolete (Tom)
+       Remove <filename>/contrib/array</filename> because it is obsolete (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Clean up the <filename>/contrib/lo</> module (Tom)
+       Clean up the <filename>/contrib/lo</filename> module (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move <filename>/contrib/findoidjoins</> to
-       <filename>/src/tools</> (Tom)
+       Move <filename>/contrib/findoidjoins</filename> to
+       <filename>/src/tools</filename> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove the <literal>&lt;&lt;</>, <literal>&gt;&gt;</>,
-       <literal>&amp;&lt;</>, and <literal>&amp;&gt;</> operators from
-       <filename>/contrib/cube</>
+       Remove the <literal>&lt;&lt;</literal>, <literal>&gt;&gt;</literal>,
+       <literal>&amp;&lt;</literal>, and <literal>&amp;&gt;</literal> operators from
+       <filename>/contrib/cube</filename>
       </para>
       <para>
        These operators were not useful.
@@ -5377,13 +5377,13 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Improve <filename>/contrib/btree_gist</> (Janko Richter)
+       Improve <filename>/contrib/btree_gist</filename> (Janko Richter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve <filename>/contrib/pgbench</> (Tomoaki Sato, Tatsuo)
+       Improve <filename>/contrib/pgbench</filename> (Tomoaki Sato, Tatsuo)
       </para>
       <para>
        There is now a facility for testing with SQL command scripts given
@@ -5393,7 +5393,7 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
      <listitem>
       <para>
-       Improve <filename>/contrib/pgcrypto</> (Marko Kreen)
+       Improve <filename>/contrib/pgcrypto</filename> (Marko Kreen)
       </para>
 
       <itemizedlist>
@@ -5421,16 +5421,16 @@ SELECT CURRENT_TIMESTAMP AT TIME ZONE 'Europe/London';
 
        <listitem>
         <para>
-         Take build parameters (OpenSSL, zlib) from <filename>configure</> result
+         Take build parameters (OpenSSL, zlib) from <filename>configure</filename> result
         </para>
         <para>
-         There is no need to edit the <filename>Makefile</> anymore.
+         There is no need to edit the <filename>Makefile</filename> anymore.
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Remove support for <filename>libmhash</> and <filename>libmcrypt</>
+         Remove support for <filename>libmhash</filename> and <filename>libmcrypt</filename>
         </para>
        </listitem>
 
diff --git a/doc/src/sgml/release-8.2.sgml b/doc/src/sgml/release-8.2.sgml
index c00cbd3467..51239f9b9d 100644
--- a/doc/src/sgml/release-8.2.sgml
+++ b/doc/src/sgml/release-8.2.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 8.2.22.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 8.2.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -30,14 +30,14 @@
 
    <para>
     However, a longstanding error was discovered in the definition of the
-    <literal>information_schema.referential_constraints</> view.  If you
+    <literal>information_schema.referential_constraints</literal> view.  If you
     rely on correct results from that view, you should replace its
     definition as explained in the first changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -49,7 +49,7 @@
 
     <listitem>
      <para>
-      Fix bugs in <literal>information_schema.referential_constraints</> view
+      Fix bugs in <literal>information_schema.referential_constraints</literal> view
       (Tom Lane)
      </para>
 
@@ -62,13 +62,13 @@
      </para>
 
      <para>
-      Since the view definition is installed by <application>initdb</>,
+      Since the view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can (as a superuser) drop the
-      <literal>information_schema</> schema then re-create it by sourcing
-      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      <literal>information_schema</literal> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</replaceable>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)  This must be repeated in each database
       to be fixed.
      </para>
     </listitem>
@@ -76,12 +76,12 @@
     <listitem>
      <para>
       Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
-      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      SELECT * FROM src</literal> or <literal>INSERT INTO dest SELECT * FROM src</literal>
       (Tom Lane)
      </para>
 
      <para>
-      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</command>,
       attempts to copy its data verbatim to another table could produce
       corrupt results in certain corner cases.
       The problem can only manifest in this precise form in 8.4 and later,
@@ -98,22 +98,22 @@
 
      <para>
       The typical symptom was transient errors like <quote>missing chunk
-      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      number 0 for toast value NNNNN in pg_toast_2619</quote>, where the cited
       toast table would always belong to a system catalog.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve locale support in <type>money</> type's input and output
+      Improve locale support in <type>money</type> type's input and output
       (Tom Lane)
      </para>
 
      <para>
       Aside from not supporting all standard
-      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</varname></link>
       formatting options, the input and output functions were inconsistent,
-      meaning there were locales in which dumped <type>money</> values could
+      meaning there were locales in which dumped <type>money</type> values could
       not be re-read.
      </para>
     </listitem>
@@ -121,15 +121,15 @@
     <listitem>
      <para>
       Don't let <link
-      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
-      affect <literal>CASE foo WHEN NULL ...</> constructs
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</varname></link>
+      affect <literal>CASE foo WHEN NULL ...</literal> constructs
       (Heikki Linnakangas)
      </para>
 
      <para>
-      <varname>transform_null_equals</> is only supposed to affect
-      <literal>foo = NULL</> expressions written directly by the user, not
-      equality checks generated internally by this form of <literal>CASE</>.
+      <varname>transform_null_equals</varname> is only supposed to affect
+      <literal>foo = NULL</literal> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</literal>.
      </para>
     </listitem>
 
@@ -141,14 +141,14 @@
 
      <para>
       For a cascading foreign key that references its own table, a row update
-      will fire both the <literal>ON UPDATE</> trigger and the
-      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
-      trigger must execute first, else the <literal>CHECK</> will check a
+      will fire both the <literal>ON UPDATE</literal> trigger and the
+      <literal>CHECK</literal> trigger as one event.  The <literal>ON UPDATE</literal>
+      trigger must execute first, else the <literal>CHECK</literal> will check a
       non-final state of the row and possibly throw an inappropriate error.
       However, the firing order of these triggers is determined by their
       names, which generally sort in creation order since the triggers have
       auto-generated names following the convention
-      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      <quote>RI_ConstraintTrigger_NNNN</quote>.  A proper fix would require
       modifying that convention, which we will do in 9.2, but it seems risky
       to change it in existing releases.  So this patch just changes the
       creation order of the triggers.  Users encountering this type of error
@@ -159,7 +159,7 @@
 
     <listitem>
      <para>
-      Preserve blank lines within commands in <application>psql</>'s command
+      Preserve blank lines within commands in <application>psql</application>'s command
       history (Robert Haas)
      </para>
 
@@ -171,7 +171,7 @@
 
     <listitem>
      <para>
-      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      Use the preferred version of <application>xsubpp</application> to build PL/Perl,
       not necessarily the operating system's main copy
       (David Wheeler and Alex Hunsaker)
      </para>
@@ -179,7 +179,7 @@
 
     <listitem>
      <para>
-      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</function>
       (Robert Haas)
      </para>
     </listitem>
@@ -210,15 +210,15 @@
      </para>
 
      <para>
-      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
-      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Map <quote>Central America Standard Time</quote> to <literal>CST6</literal>, not
+      <literal>CST6CDT</literal>, because DST is generally not observed anywhere in
       Central America.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011n
+      Update time zone data files to <application>tzdata</application> release 2011n
       for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
       also historical corrections for Alaska and British East Africa.
      </para>
@@ -240,11 +240,11 @@
   <para>
    This release contains a variety of fixes from 8.2.21.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.2.X release series in December 2011.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -255,7 +255,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -279,7 +279,7 @@
 
     <listitem>
      <para>
-      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</command>
       (Noah Misch)
      </para>
 
@@ -297,7 +297,7 @@
       There was a window wherein a new backend process could read a stale init
       file but miss the inval messages that would tell it the data is stale.
       The result would be bizarre failures in catalog accesses, typically
-      <quote>could not read block 0 in file ...</> later during startup.
+      <quote>could not read block 0 in file ...</quote> later during startup.
      </para>
     </listitem>
 
@@ -346,13 +346,13 @@
 
     <listitem>
      <para>
-      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+      Fix dump bug for <literal>VALUES</literal> in a view (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+      Disallow <literal>SELECT FOR UPDATE/SHARE</literal> on sequences (Tom Lane)
      </para>
 
      <para>
@@ -370,18 +370,18 @@
     <listitem>
      <para>
       Fix portability bugs in use of credentials control messages for
-      <quote>peer</> authentication (Tom Lane)
+      <quote>peer</quote> authentication (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+      Fix typo in <function>pg_srand48</function> seed initialization (Andres Freund)
      </para>
 
      <para>
       This led to failure to use all bits of the provided seed.  This function
-      is not used on most platforms (only those without <function>srandom</>),
+      is not used on most platforms (only those without <function>srandom</function>),
       and the potential security exposure from a less-random-than-expected
       seed seems minimal in any case.
      </para>
@@ -389,25 +389,25 @@
 
     <listitem>
      <para>
-      Avoid integer overflow when the sum of <literal>LIMIT</> and
-      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+      Avoid integer overflow when the sum of <literal>LIMIT</literal> and
+      <literal>OFFSET</literal> values exceeds 2^63 (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add overflow checks to <type>int4</> and <type>int8</> versions of
-      <function>generate_series()</> (Robert Haas)
+      Add overflow checks to <type>int4</type> and <type>int8</type> versions of
+      <function>generate_series()</function> (Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+      Fix trailing-zero removal in <function>to_char()</function> (Marti Raudsepp)
      </para>
 
      <para>
-      In a format with <literal>FM</> and no digit positions
+      In a format with <literal>FM</literal> and no digit positions
       after the decimal point, zeroes to the left of the decimal point could
       be removed incorrectly.
      </para>
@@ -415,41 +415,41 @@
 
     <listitem>
      <para>
-      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      Fix <function>pg_size_pretty()</function> to avoid overflow for inputs close to
       2^63 (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s counting of script file line numbers during
-      <literal>COPY</> from a different file (Tom Lane)
+      Fix <application>psql</application>'s counting of script file line numbers during
+      <literal>COPY</literal> from a different file (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
-      <varname>standard_conforming_strings</> (Tom Lane)
+      Fix <application>pg_restore</application>'s direct-to-database mode for
+      <varname>standard_conforming_strings</varname> (Tom Lane)
      </para>
 
      <para>
-      <application>pg_restore</> could emit incorrect commands when restoring
+      <application>pg_restore</application> could emit incorrect commands when restoring
       directly to a database server from an archive file that had been made
-      with <varname>standard_conforming_strings</> set to <literal>on</>.
+      with <varname>standard_conforming_strings</varname> set to <literal>on</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      Fix write-past-buffer-end and memory leak in <application>libpq</application>'s
       LDAP service lookup code (Albe Laurenz)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, avoid failures when using nonblocking I/O
+      In <application>libpq</application>, avoid failures when using nonblocking I/O
       and an SSL connection (Martin Pihlak, Tom Lane)
      </para>
     </listitem>
@@ -461,14 +461,14 @@
      </para>
 
      <para>
-      In particular, the response to a server report of <function>fork()</>
+      In particular, the response to a server report of <function>fork()</function>
       failure during SSL connection startup is now saner.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      Make <application>ecpglib</application> write <type>double</type> values with 15 digits
       precision (Akira Kurosawa)
      </para>
     </listitem>
@@ -480,7 +480,7 @@
      </para>
 
      <para>
-      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      <filename>contrib/pg_crypto</filename>'s blowfish encryption code could give
       wrong results on platforms where char is signed (which is most),
       leading to encrypted passwords being weaker than they should be.
      </para>
@@ -488,13 +488,13 @@
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+      Fix memory leak in <filename>contrib/seg</filename> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgstatindex()</> to give consistent results for empty
+      Fix <function>pgstatindex()</function> to give consistent results for empty
       indexes (Tom Lane)
      </para>
     </listitem>
@@ -526,7 +526,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011i
+      Update time zone data files to <application>tzdata</application> release 2011i
       for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
      </para>
     </listitem>
@@ -547,7 +547,7 @@
   <para>
    This release contains a variety of fixes from 8.2.20.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -556,7 +556,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -582,15 +582,15 @@
 
     <listitem>
      <para>
-      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</> trigger
+      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</literal> trigger
       handling when there was a concurrent update to the target tuple
       (Tom Lane)
      </para>
 
      <para>
       This bug has been observed to result in intermittent <quote>cannot
-      extract system attribute from virtual tuple</> failures while trying to
-      do <literal>UPDATE RETURNING ctid</>.  There is a very small probability
+      extract system attribute from virtual tuple</quote> failures while trying to
+      do <literal>UPDATE RETURNING ctid</literal>.  There is a very small probability
       of more serious errors, such as generating incorrect index entries for
       the updated tuple.
      </para>
@@ -598,13 +598,13 @@
 
     <listitem>
      <para>
-      Disallow <command>DROP TABLE</> when there are pending deferred trigger
+      Disallow <command>DROP TABLE</command> when there are pending deferred trigger
       events for the table (Tom Lane)
      </para>
 
      <para>
-      Formerly the <command>DROP</> would go through, leading to
-      <quote>could not open relation with OID nnn</> errors when the
+      Formerly the <command>DROP</command> would go through, leading to
+      <quote>could not open relation with OID nnn</quote> errors when the
       triggers were eventually fired.
      </para>
     </listitem>
@@ -617,7 +617,7 @@
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to cope with long lines (over 1KB) in
+      Fix <application>pg_restore</application> to cope with long lines (over 1KB) in
       TOC files (Tom Lane)
      </para>
     </listitem>
@@ -649,14 +649,14 @@
 
     <listitem>
      <para>
-      Fix path separator used by <application>pg_regress</> on Cygwin
+      Fix path separator used by <application>pg_regress</application> on Cygwin
       (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011f
+      Update time zone data files to <application>tzdata</application> release 2011f
       for DST law changes in Chile, Cuba, Falkland Islands, Morocco, Samoa,
       and Turkey; also historical corrections for South Australia, Alaska,
       and Hawaii.
@@ -679,7 +679,7 @@
   <para>
    This release contains a variety of fixes from 8.2.19.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -688,7 +688,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -700,15 +700,15 @@
 
     <listitem>
      <para>
-      Avoid failures when <command>EXPLAIN</> tries to display a simple-form
-      <literal>CASE</> expression (Tom Lane)
+      Avoid failures when <command>EXPLAIN</command> tries to display a simple-form
+      <literal>CASE</literal> expression (Tom Lane)
      </para>
 
      <para>
-      If the <literal>CASE</>'s test expression was a constant, the planner
-      could simplify the <literal>CASE</> into a form that confused the
+      If the <literal>CASE</literal>'s test expression was a constant, the planner
+      could simplify the <literal>CASE</literal> into a form that confused the
       expression-display code, resulting in <quote>unexpected CASE WHEN
-      clause</> errors.
+      clause</quote> errors.
      </para>
     </listitem>
 
@@ -733,44 +733,44 @@
      </para>
 
      <para>
-      The <type>date</> type supports a wider range of dates than can be
-      represented by the <type>timestamp</> types, but the planner assumed it
+      The <type>date</type> type supports a wider range of dates than can be
+      represented by the <type>timestamp</type> types, but the planner assumed it
       could always convert a date to timestamp with impunity.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s text output for large objects (BLOBs)
-      when <varname>standard_conforming_strings</> is on (Tom Lane)
+      Fix <application>pg_restore</application>'s text output for large objects (BLOBs)
+      when <varname>standard_conforming_strings</varname> is on (Tom Lane)
      </para>
 
      <para>
       Although restoring directly to a database worked correctly, string
-      escaping was incorrect if <application>pg_restore</> was asked for
-      SQL text output and <varname>standard_conforming_strings</> had been
+      escaping was incorrect if <application>pg_restore</application> was asked for
+      SQL text output and <varname>standard_conforming_strings</varname> had been
       enabled in the source database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix erroneous parsing of <type>tsquery</> values containing
+      Fix erroneous parsing of <type>tsquery</type> values containing
       <literal>... &amp; !(subexpression) | ...</literal> (Tom Lane)
      </para>
 
      <para>
       Queries containing this combination of operators were not executed
-      correctly.  The same error existed in <filename>contrib/intarray</>'s
-      <type>query_int</> type and <filename>contrib/ltree</>'s
-      <type>ltxtquery</> type.
+      correctly.  The same error existed in <filename>contrib/intarray</filename>'s
+      <type>query_int</type> type and <filename>contrib/ltree</filename>'s
+      <type>ltxtquery</type> type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix buffer overrun in <filename>contrib/intarray</>'s input function
-      for the <type>query_int</> type (Apple)
+      Fix buffer overrun in <filename>contrib/intarray</filename>'s input function
+      for the <type>query_int</type> type (Apple)
      </para>
 
      <para>
@@ -782,16 +782,16 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/seg</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/seg</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>seg</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>seg</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.  (This is identical to the bug that was fixed in
-      <filename>contrib/cube</> in the previous update.)
+      <filename>contrib/cube</filename> in the previous update.)
      </para>
     </listitem>
 
@@ -811,7 +811,7 @@
   <para>
    This release contains a variety of fixes from 8.2.18.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -820,7 +820,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -833,17 +833,17 @@
     <listitem>
      <para>
       Force the default
-      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>
-      to be <literal>fdatasync</> on Linux (Tom Lane, Marti Raudsepp)
+      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>
+      to be <literal>fdatasync</literal> on Linux (Tom Lane, Marti Raudsepp)
      </para>
 
      <para>
-      The default on Linux has actually been <literal>fdatasync</> for many
-      years, but recent kernel changes caused <productname>PostgreSQL</> to
-      choose <literal>open_datasync</> instead.  This choice did not result
+      The default on Linux has actually been <literal>fdatasync</literal> for many
+      years, but recent kernel changes caused <productname>PostgreSQL</productname> to
+      choose <literal>open_datasync</literal> instead.  This choice did not result
       in any performance improvement, and caused outright failures on
-      certain filesystems, notably <literal>ext4</> with the
-      <literal>data=journal</> mount option.
+      certain filesystems, notably <literal>ext4</literal> with the
+      <literal>data=journal</literal> mount option.
      </para>
     </listitem>
 
@@ -853,7 +853,7 @@
      </para>
 
      <para>
-      This could result in <quote>bad buffer id: 0</> failures or
+      This could result in <quote>bad buffer id: 0</quote> failures or
       corruption of index contents during replication.
      </para>
     </listitem>
@@ -867,19 +867,19 @@
 
     <listitem>
      <para>
-      Add support for detecting register-stack overrun on <literal>IA64</>
+      Add support for detecting register-stack overrun on <literal>IA64</literal>
       (Tom Lane)
      </para>
 
      <para>
-      The <literal>IA64</> architecture has two hardware stacks.  Full
+      The <literal>IA64</literal> architecture has two hardware stacks.  Full
       prevention of stack-overrun failures requires checking both.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a check for stack overflow in <function>copyObject()</> (Tom Lane)
+      Add a check for stack overflow in <function>copyObject()</function> (Tom Lane)
      </para>
 
      <para>
@@ -895,7 +895,7 @@
      </para>
 
      <para>
-      It is possible to have a <quote>concurrent</> page split in a
+      It is possible to have a <quote>concurrent</quote> page split in a
       temporary index, if for example there is an open cursor scanning the
       index when an insertion is done.  GiST failed to detect this case and
       hence could deliver wrong results when execution of the cursor
@@ -905,7 +905,7 @@
 
     <listitem>
      <para>
-      Avoid memory leakage while <command>ANALYZE</>'ing complex index
+      Avoid memory leakage while <command>ANALYZE</command>'ing complex index
       expressions (Tom Lane)
      </para>
     </listitem>
@@ -917,14 +917,14 @@
      </para>
 
      <para>
-      An index declared like <literal>create index i on t (foo(t.*))</>
+      An index declared like <literal>create index i on t (foo(t.*))</literal>
       would not automatically get dropped when its table was dropped.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not <quote>inline</> a SQL function with multiple <literal>OUT</>
+      Do not <quote>inline</quote> a SQL function with multiple <literal>OUT</literal>
       parameters (Tom Lane)
      </para>
 
@@ -936,15 +936,15 @@
 
     <listitem>
      <para>
-      Behave correctly if <literal>ORDER BY</>, <literal>LIMIT</>,
-      <literal>FOR UPDATE</>, or <literal>WITH</> is attached to the
-      <literal>VALUES</> part of <literal>INSERT ... VALUES</> (Tom Lane)
+      Behave correctly if <literal>ORDER BY</literal>, <literal>LIMIT</literal>,
+      <literal>FOR UPDATE</literal>, or <literal>WITH</literal> is attached to the
+      <literal>VALUES</literal> part of <literal>INSERT ... VALUES</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix constant-folding of <literal>COALESCE()</> expressions (Tom Lane)
+      Fix constant-folding of <literal>COALESCE()</literal> expressions (Tom Lane)
      </para>
 
      <para>
@@ -955,11 +955,11 @@
 
     <listitem>
      <para>
-      Add print functionality for <structname>InhRelation</> nodes (Tom Lane)
+      Add print functionality for <structname>InhRelation</structname> nodes (Tom Lane)
      </para>
 
      <para>
-      This avoids a failure when <varname>debug_print_parse</> is enabled
+      This avoids a failure when <varname>debug_print_parse</varname> is enabled
       and certain types of query are executed.
      </para>
     </listitem>
@@ -978,14 +978,14 @@
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s handling of <quote>simple</>
+      Fix <application>PL/pgSQL</application>'s handling of <quote>simple</quote>
       expressions to not fail in recursion or error-recovery cases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</>'s handling of set-returning functions
+      Fix <application>PL/Python</application>'s handling of set-returning functions
       (Jan Urbanski)
      </para>
 
@@ -997,22 +997,22 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/cube</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/cube</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>cube</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>cube</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't emit <quote>identifier will be truncated</> notices in
-      <filename>contrib/dblink</> except when creating new connections
+      Don't emit <quote>identifier will be truncated</quote> notices in
+      <filename>contrib/dblink</filename> except when creating new connections
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -1020,20 +1020,20 @@
     <listitem>
      <para>
       Fix potential coredump on missing public key in
-      <filename>contrib/pgcrypto</> (Marti Raudsepp)
+      <filename>contrib/pgcrypto</filename> (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/xml2</>'s XPath query functions
+      Fix memory leak in <filename>contrib/xml2</filename>'s XPath query functions
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010o
+      Update time zone data files to <application>tzdata</application> release 2010o
       for DST law changes in Fiji and Samoa;
       also historical corrections for Hong Kong.
      </para>
@@ -1055,7 +1055,7 @@
   <para>
    This release contains a variety of fixes from 8.2.17.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -1064,7 +1064,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -1084,7 +1084,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -1113,7 +1113,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -1135,7 +1135,7 @@
 
     <listitem>
      <para>
-      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</>) as non-fatal on
+      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</literal>) as non-fatal on
       Windows (Magnus Hagander)
      </para>
 
@@ -1149,7 +1149,7 @@
 
     <listitem>
      <para>
-      Fix possible duplicate scans of <literal>UNION ALL</> member relations
+      Fix possible duplicate scans of <literal>UNION ALL</literal> member relations
       (Tom Lane)
      </para>
     </listitem>
@@ -1201,7 +1201,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -1227,7 +1227,7 @@
 
     <listitem>
      <para>
-      Fix <varname>log_line_prefix</>'s <literal>%i</> escape,
+      Fix <varname>log_line_prefix</varname>'s <literal>%i</literal> escape,
       which could produce junk early in backend startup (Tom Lane)
      </para>
     </listitem>
@@ -1235,28 +1235,28 @@
     <listitem>
      <para>
       Fix possible data corruption in <command>ALTER TABLE ... SET
-      TABLESPACE</> when archiving is enabled (Jeff Davis)
+      TABLESPACE</command> when archiving is enabled (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>CREATE DATABASE</> and <command>ALTER DATABASE ... SET
-      TABLESPACE</> to be interrupted by query-cancel (Guillaume Lelarge)
+      Allow <command>CREATE DATABASE</command> and <command>ALTER DATABASE ... SET
+      TABLESPACE</command> to be interrupted by query-cancel (Guillaume Lelarge)
      </para>
     </listitem>
 
     <listitem>
      <para>
       In PL/Python, defend against null pointer results from
-      <function>PyCObject_AsVoidPtr</> and <function>PyCObject_FromVoidPtr</>
+      <function>PyCObject_AsVoidPtr</function> and <function>PyCObject_FromVoidPtr</function>
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -1264,30 +1264,30 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle connection names longer than
+      Fix <filename>contrib/dblink</filename> to handle connection names longer than
       62 bytes correctly (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <function>hstore(text, text)</>
-      function to <filename>contrib/hstore</> (Robert Haas)
+      Add <function>hstore(text, text)</function>
+      function to <filename>contrib/hstore</filename> (Robert Haas)
      </para>
 
      <para>
       This function is the recommended substitute for the now-deprecated
-      <literal>=&gt;</> operator.  It was back-patched so that future-proofed
+      <literal>=&gt;</literal> operator.  It was back-patched so that future-proofed
       code can be used with older server versions.  Note that the patch will
-      be effective only after <filename>contrib/hstore</> is installed or
+      be effective only after <filename>contrib/hstore</filename> is installed or
       reinstalled in a particular database.  Users might prefer to execute
-      the <command>CREATE FUNCTION</> command by hand, instead.
+      the <command>CREATE FUNCTION</command> command by hand, instead.
      </para>
     </listitem>
 
@@ -1300,7 +1300,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010l
+      Update time zone data files to <application>tzdata</application> release 2010l
       for DST law changes in Egypt and Palestine; also historical corrections
       for Finland.
      </para>
@@ -1315,7 +1315,7 @@
 
     <listitem>
      <para>
-      Make Windows' <quote>N. Central Asia Standard Time</> timezone map to
+      Make Windows' <quote>N. Central Asia Standard Time</quote> timezone map to
       Asia/Novosibirsk, not Asia/Almaty (Magnus Hagander)
      </para>
 
@@ -1341,7 +1341,7 @@
   <para>
    This release contains a variety of fixes from 8.2.16.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -1350,7 +1350,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -1362,19 +1362,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -1383,19 +1383,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -1419,10 +1419,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -1430,7 +1430,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -1442,7 +1442,7 @@
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -1455,15 +1455,15 @@
 
     <listitem>
      <para>
-      Prevent infinite recursion in <application>psql</> when expanding
+      Prevent infinite recursion in <application>psql</application> when expanding
       a variable that refers to itself (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\copy</> to not add spaces around
-      a dot within <literal>\copy (select ...)</> (Tom)
+      Fix <application>psql</application>'s <literal>\copy</literal> to not add spaces around
+      a dot within <literal>\copy (select ...)</literal> (Tom)
      </para>
 
      <para>
@@ -1474,7 +1474,7 @@
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -1482,7 +1482,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -1514,14 +1514,14 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010j
+      Update time zone data files to <application>tzdata</application> release 2010j
       for DST law changes in Argentina, Australian Antarctic, Bangladesh,
       Mexico, Morocco, Pakistan, Palestine, Russia, Syria, Tunisia;
       also historical corrections for Taiwan.
      </para>
 
      <para>
-      Also, add <literal>PKST</> (Pakistan Summer Time) to the default set of
+      Also, add <literal>PKST</literal> (Pakistan Summer Time) to the default set of
       timezone abbreviations.
      </para>
     </listitem>
@@ -1542,7 +1542,7 @@
   <para>
    This release contains a variety of fixes from 8.2.15.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -1551,7 +1551,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -1563,7 +1563,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -1619,8 +1619,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -1646,7 +1646,7 @@
 
     <listitem>
      <para>
-      Fix the <literal>STOP WAL LOCATION</> entry in backup history files to
+      Fix the <literal>STOP WAL LOCATION</literal> entry in backup history files to
       report the next WAL segment's name when the end location is exactly at a
       segment boundary (Itagaki Takahiro)
      </para>
@@ -1668,23 +1668,23 @@
      <para>
       Improve constraint exclusion processing of boolean-variable cases,
       in particular make it possible to exclude a partition that has a
-      <quote>bool_column = false</> constraint (Tom)
+      <quote>bool_column = false</quote> constraint (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -1692,35 +1692,35 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible infinite loop if <function>SSL_read</> or
-      <function>SSL_write</> fails without setting <varname>errno</> (Tom)
+      Fix possible infinite loop if <function>SSL_read</function> or
+      <function>SSL_write</function> fails without setting <varname>errno</varname> (Tom)
      </para>
 
      <para>
       This is reportedly possible with some Windows versions of
-      <application>openssl</>.
+      <application>openssl</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>numericlocale</> option to not
+      Fix <application>psql</application>'s <literal>numericlocale</literal> option to not
       format strings it shouldn't in latex and troff output formats (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>psql</> return the correct exit status (3) when
-      <literal>ON_ERROR_STOP</> and <literal>--single-transaction</> are
-      both specified and an error occurs during the implied <command>COMMIT</>
+      Make <application>psql</application> return the correct exit status (3) when
+      <literal>ON_ERROR_STOP</literal> and <literal>--single-transaction</literal> are
+      both specified and an error occurs during the implied <command>COMMIT</command>
       (Bruce)
      </para>
     </listitem>
@@ -1741,7 +1741,7 @@
 
     <listitem>
      <para>
-      Add <literal>volatile</> markings in PL/Python to avoid possible
+      Add <literal>volatile</literal> markings in PL/Python to avoid possible
       compiler-specific misbehavior (Zdenek Kotala)
      </para>
     </listitem>
@@ -1753,28 +1753,28 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted crashes in <filename>contrib/xml2</> caused by sloppy
+      Fix assorted crashes in <filename>contrib/xml2</filename> caused by sloppy
       memory management (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make building of <filename>contrib/xml2</> more robust on Windows
+      Make building of <filename>contrib/xml2</filename> more robust on Windows
       (Andrew)
      </para>
     </listitem>
@@ -1785,14 +1785,14 @@
      </para>
 
      <para>
-      One known symptom of this bug is that rows in <structname>pg_listener</>
+      One known symptom of this bug is that rows in <structname>pg_listener</structname>
       could be dropped under heavy load.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010e
+      Update time zone data files to <application>tzdata</application> release 2010e
       for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.
      </para>
     </listitem>
@@ -1813,7 +1813,7 @@
   <para>
    This release contains a variety of fixes from 8.2.14.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -1822,7 +1822,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.14,
-    see <xref linkend="release-8-2-14">.
+    see <xref linkend="release-8-2-14"/>.
    </para>
 
   </sect2>
@@ -1864,14 +1864,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -1890,7 +1890,7 @@
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -1948,7 +1948,7 @@
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -1958,13 +1958,13 @@
     <listitem>
      <para>
       Fix processing of ownership dependencies during <literal>CREATE OR
-      REPLACE FUNCTION</> (Tom)
+      REPLACE FUNCTION</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug with calling <literal>plperl</> from <literal>plperlu</> or vice
+      Fix bug with calling <literal>plperl</literal> from <literal>plperlu</literal> or vice
       versa (Tom)
      </para>
 
@@ -1984,7 +1984,7 @@
     <listitem>
      <para>
       Ensure that Perl arrays are properly converted to
-      <productname>PostgreSQL</> arrays when returned by a set-returning
+      <productname>PostgreSQL</productname> arrays when returned by a set-returning
       PL/Perl function (Andrew Dunstan, Abhijit Menon-Sen)
      </para>
 
@@ -2001,20 +2001,20 @@
 
     <listitem>
      <para>
-      Ensure <application>psql</>'s flex module is compiled with the correct
+      Ensure <application>psql</application>'s flex module is compiled with the correct
       system header definitions (Tom)
      </para>
 
      <para>
       This fixes build failures on platforms where
-      <literal>--enable-largefile</> causes incompatible changes in the
+      <literal>--enable-largefile</literal> causes incompatible changes in the
       generated code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -2027,14 +2027,14 @@
      </para>
 
      <para>
-      This includes adding <literal>IDT</> and <literal>SGT</> to the default
+      This includes adding <literal>IDT</literal> and <literal>SGT</literal> to the default
       timezone abbreviation set.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009s
+      Update time zone data files to <application>tzdata</application> release 2009s
       for DST law changes in Antarctica, Argentina, Bangladesh, Fiji,
       Novokuznetsk, Pakistan, Palestine, Samoa, Syria; also historical
       corrections for Hong Kong.
@@ -2057,7 +2057,7 @@
   <para>
    This release contains a variety of fixes from 8.2.13.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -2065,10 +2065,10 @@
 
    <para>
     A dump/restore is not required for those running 8.2.X.
-    However, if you have any hash indexes on <type>interval</> columns,
-    you must <command>REINDEX</> them after updating to 8.2.14.
+    However, if you have any hash indexes on <type>interval</type> columns,
+    you must <command>REINDEX</command> them after updating to 8.2.14.
     Also, if you are upgrading from a version earlier than 8.2.11,
-    see <xref linkend="release-8-2-11">.
+    see <xref linkend="release-8-2-11"/>.
    </para>
 
   </sect2>
@@ -2080,7 +2080,7 @@
 
     <listitem>
      <para>
-      Force WAL segment switch during <function>pg_start_backup()</>
+      Force WAL segment switch during <function>pg_start_backup()</function>
       (Heikki)
      </para>
 
@@ -2091,26 +2091,26 @@
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>LOAD</> of an already-loaded loadable module
+      Make <command>LOAD</command> of an already-loaded loadable module
       into a no-op (Tom)
      </para>
 
      <para>
-      Formerly, <command>LOAD</> would attempt to unload and re-load the
+      Formerly, <command>LOAD</command> would attempt to unload and re-load the
       module, but this is unsafe and not all that useful.
      </para>
     </listitem>
@@ -2145,32 +2145,32 @@
 
     <listitem>
      <para>
-      Fix hash calculation for data type <type>interval</> (Tom)
+      Fix hash calculation for data type <type>interval</type> (Tom)
      </para>
 
      <para>
       This corrects wrong results for hash joins on interval values.
       It also changes the contents of hash indexes on interval columns.
-      If you have any such indexes, you must <command>REINDEX</> them
+      If you have any such indexes, you must <command>REINDEX</command> them
       after updating.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Treat <function>to_char(..., 'TH')</> as an uppercase ordinal
-      suffix with <literal>'HH'</>/<literal>'HH12'</> (Heikki)
+      Treat <function>to_char(..., 'TH')</function> as an uppercase ordinal
+      suffix with <literal>'HH'</literal>/<literal>'HH12'</literal> (Heikki)
      </para>
 
      <para>
-      It was previously handled as <literal>'th'</> (lowercase).
+      It was previously handled as <literal>'th'</literal> (lowercase).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -2187,7 +2187,7 @@
 
     <listitem>
      <para>
-      Fix <type>money</> data type to work in locales where currency
+      Fix <type>money</type> data type to work in locales where currency
       amounts have no fractional digits, e.g. Japan (Itagaki Takahiro)
      </para>
     </listitem>
@@ -2195,7 +2195,7 @@
     <listitem>
      <para>
       Properly round datetime input like
-      <literal>00:12:57.9999999999999999999999999999</> (Tom)
+      <literal>00:12:57.9999999999999999999999999999</literal> (Tom)
      </para>
     </listitem>
 
@@ -2228,14 +2228,14 @@
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to not go into an infinite loop if
-      <filename>postgresql.conf</> is empty (Jeff Davis)
+      Fix <application>pg_ctl</application> to not go into an infinite loop if
+      <filename>postgresql.conf</filename> is empty (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/hstore</> throw an error when a key or
+      Make <filename>contrib/hstore</filename> throw an error when a key or
       value is too long to fit in its data structure, rather than
       silently truncating it (Andrew Gierth)
      </para>
@@ -2243,15 +2243,15 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s <function>xslt_process()</> to
+      Fix <filename>contrib/xml2</filename>'s <function>xslt_process()</function> to
       properly handle the maximum number of parameters (twenty) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -2264,7 +2264,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009l
+      Update time zone data files to <application>tzdata</application> release 2009l
       for DST law changes in Bangladesh, Egypt, Jordan, Pakistan,
       Argentina/San_Luis, Cuba, Jordan (historical correction only),
       Mauritius, Morocco, Palestine, Syria, Tunisia.
@@ -2287,7 +2287,7 @@
   <para>
    This release contains a variety of fixes from 8.2.12.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -2296,7 +2296,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.11,
-    see <xref linkend="release-8-2-11">.
+    see <xref linkend="release-8-2-11"/>.
    </para>
 
   </sect2>
@@ -2315,7 +2315,7 @@
       This change extends fixes made in the last two minor releases for
       related failure scenarios.  The previous fixes were narrowly tailored
       for the original problem reports, but we have now recognized that
-      <emphasis>any</> error thrown by an encoding conversion function could
+      <emphasis>any</emphasis> error thrown by an encoding conversion function could
       potentially lead to infinite recursion while trying to report the
       error.  The solution therefore is to disable translation and encoding
       conversion and report the plain-ASCII form of any error message,
@@ -2326,7 +2326,7 @@
 
     <listitem>
      <para>
-      Disallow <command>CREATE CONVERSION</> with the wrong encodings
+      Disallow <command>CREATE CONVERSION</command> with the wrong encodings
       for the specified conversion function (Heikki)
      </para>
 
@@ -2339,40 +2339,40 @@
 
     <listitem>
      <para>
-      Fix core dump when <function>to_char()</> is given format codes that
+      Fix core dump when <function>to_char()</function> is given format codes that
       are inappropriate for the type of the data argument (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible failure in <filename>contrib/tsearch2</> when C locale is
+      Fix possible failure in <filename>contrib/tsearch2</filename> when C locale is
       used with a multi-byte encoding (Teodor)
      </para>
 
      <para>
-      Crashes were possible on platforms where <type>wchar_t</> is narrower
-      than <type>int</>; Windows in particular.
+      Crashes were possible on platforms where <type>wchar_t</type> is narrower
+      than <type>int</type>; Windows in particular.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix extreme inefficiency in <filename>contrib/tsearch2</> parser's
-      handling of an email-like string containing multiple <literal>@</>
+      Fix extreme inefficiency in <filename>contrib/tsearch2</filename> parser's
+      handling of an email-like string containing multiple <literal>@</literal>
       characters (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix decompilation of <literal>CASE WHEN</> with an implicit coercion
+      Fix decompilation of <literal>CASE WHEN</literal> with an implicit coercion
       (Tom)
      </para>
 
      <para>
       This mistake could lead to Assert failures in an Assert-enabled build,
-      or an <quote>unexpected CASE WHEN clause</> error message in other
+      or an <quote>unexpected CASE WHEN clause</quote> error message in other
       cases, when trying to examine or dump a view.
      </para>
     </listitem>
@@ -2383,24 +2383,24 @@
      </para>
 
      <para>
-      If <command>CLUSTER</> or a rewriting variant of <command>ALTER TABLE</>
+      If <command>CLUSTER</command> or a rewriting variant of <command>ALTER TABLE</command>
       were executed by someone other than the table owner, the
-      <structname>pg_type</> entry for the table's TOAST table would end up
+      <structname>pg_type</structname> entry for the table's TOAST table would end up
       marked as owned by that someone.  This caused no immediate problems,
       since the permissions on the TOAST rowtype aren't examined by any
       ordinary database operation.  However, it could lead to unexpected
       failures if one later tried to drop the role that issued the command
-      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</>
-      warnings from <application>pg_dump</> after having done so (in 8.3).
+      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</quote>
+      warnings from <application>pg_dump</application> after having done so (in 8.3).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL to not treat <literal>INTO</> after <command>INSERT</> as
+      Fix PL/pgSQL to not treat <literal>INTO</literal> after <command>INSERT</command> as
       an INTO-variables clause anywhere in the string, not only at the start;
-      in particular, don't fail for <command>INSERT INTO</> within
-      <command>CREATE RULE</> (Tom)
+      in particular, don't fail for <command>INSERT INTO</command> within
+      <command>CREATE RULE</command> (Tom)
      </para>
     </listitem>
 
@@ -2418,21 +2418,21 @@
 
     <listitem>
      <para>
-      Retry failed calls to <function>CallNamedPipe()</> on Windows
+      Retry failed calls to <function>CallNamedPipe()</function> on Windows
       (Steve Marshall, Magnus)
      </para>
 
      <para>
       It appears that this function can sometimes fail transiently;
       we previously treated any failure as a hard error, which could
-      confuse <command>LISTEN</>/<command>NOTIFY</> as well as other
+      confuse <command>LISTEN</command>/<command>NOTIFY</command> as well as other
       operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>MUST</> (Mauritius Island Summer Time) to the default list
+      Add <literal>MUST</literal> (Mauritius Island Summer Time) to the default list
       of known timezone abbreviations (Xavier Bugaud)
      </para>
     </listitem>
@@ -2453,7 +2453,7 @@
   <para>
    This release contains a variety of fixes from 8.2.11.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -2462,7 +2462,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.11,
-    see <xref linkend="release-8-2-11">.
+    see <xref linkend="release-8-2-11"/>.
    </para>
 
   </sect2>
@@ -2474,13 +2474,13 @@
 
     <listitem>
      <para>
-      Improve handling of URLs in <function>headline()</> function (Teodor)
+      Improve handling of URLs in <function>headline()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of overlength headlines in <function>headline()</>
+      Improve handling of overlength headlines in <function>headline()</function>
       function (Teodor)
      </para>
     </listitem>
@@ -2497,7 +2497,7 @@
      <para>
       Fix possible Assert failure if a statement executed in PL/pgSQL is
       rewritten into another kind of statement, for example if an
-      <command>INSERT</> is rewritten into an <command>UPDATE</> (Heikki)
+      <command>INSERT</command> is rewritten into an <command>UPDATE</command> (Heikki)
      </para>
     </listitem>
 
@@ -2507,7 +2507,7 @@
      </para>
 
      <para>
-      This primarily affects domains that are declared with <literal>CHECK</>
+      This primarily affects domains that are declared with <literal>CHECK</literal>
       constraints involving user-defined stable or immutable functions.  Such
       functions typically fail if no snapshot has been set.
      </para>
@@ -2522,14 +2522,14 @@
 
     <listitem>
      <para>
-      Avoid unnecessary locking of small tables in <command>VACUUM</>
+      Avoid unnecessary locking of small tables in <command>VACUUM</command>
       (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix a problem that made <literal>UPDATE RETURNING tableoid</>
+      Fix a problem that made <literal>UPDATE RETURNING tableoid</literal>
       return zero instead of the correct OID (Tom)
      </para>
     </listitem>
@@ -2542,13 +2542,13 @@
 
      <para>
       This could result in bad plans for queries like
-      <literal>... from a left join b on a.a1 = b.b1 where a.a1 = 42 ...</>
+      <literal>... from a left join b on a.a1 = b.b1 where a.a1 = 42 ...</literal>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve optimizer's handling of long <literal>IN</> lists (Tom)
+      Improve optimizer's handling of long <literal>IN</literal> lists (Tom)
      </para>
 
      <para>
@@ -2581,37 +2581,37 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s
-      <function>dblink_get_result(text,bool)</> function (Joe)
+      Fix <filename>contrib/dblink</filename>'s
+      <function>dblink_get_result(text,bool)</function> function (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible garbage output from <filename>contrib/sslinfo</> functions
+      Fix possible garbage output from <filename>contrib/sslinfo</filename> functions
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>configure</> script to properly report failure when
+      Fix <application>configure</application> script to properly report failure when
       unable to obtain linkage information for PL/Perl (Andrew)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make all documentation reference <literal>pgsql-bugs</> and/or
-      <literal>pgsql-hackers</> as appropriate, instead of the
-      now-decommissioned <literal>pgsql-ports</> and <literal>pgsql-patches</>
+      Make all documentation reference <literal>pgsql-bugs</literal> and/or
+      <literal>pgsql-hackers</literal> as appropriate, instead of the
+      now-decommissioned <literal>pgsql-ports</literal> and <literal>pgsql-patches</literal>
       mailing lists (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009a (for
+      Update time zone data files to <application>tzdata</application> release 2009a (for
       Kathmandu and historical DST corrections in Switzerland, Cuba)
      </para>
     </listitem>
@@ -2632,7 +2632,7 @@
   <para>
    This release contains a variety of fixes from 8.2.10.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -2641,8 +2641,8 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
-    see <xref linkend="release-8-2-7">.  Also, if you were running a previous
-    8.2.X release, it is recommended to <command>REINDEX</> all GiST
+    see <xref linkend="release-8-2-7"/>.  Also, if you were running a previous
+    8.2.X release, it is recommended to <command>REINDEX</command> all GiST
     indexes after the upgrade.
    </para>
 
@@ -2656,13 +2656,13 @@
     <listitem>
      <para>
       Fix GiST index corruption due to marking the wrong index entry
-      <quote>dead</> after a deletion (Teodor)
+      <quote>dead</quote> after a deletion (Teodor)
      </para>
 
      <para>
       This would result in index searches failing to find rows they
       should have found.  Corrupted indexes can be fixed with
-      <command>REINDEX</>.
+      <command>REINDEX</command>.
      </para>
     </listitem>
 
@@ -2674,7 +2674,7 @@
 
      <para>
       We have addressed similar issues before, but it would still fail if
-      the <quote>character has no equivalent</> message itself couldn't
+      the <quote>character has no equivalent</quote> message itself couldn't
       be converted.  The fix is to disable localization and send the plain
       ASCII error message when we detect such a situation.
      </para>
@@ -2689,8 +2689,8 @@
 
     <listitem>
      <para>
-      Improve optimization of <replaceable>expression</> <literal>IN</>
-      (<replaceable>expression-list</>) queries (Tom, per an idea from Robert
+      Improve optimization of <replaceable>expression</replaceable> <literal>IN</literal>
+      (<replaceable>expression-list</replaceable>) queries (Tom, per an idea from Robert
       Haas)
      </para>
 
@@ -2703,13 +2703,13 @@
 
     <listitem>
      <para>
-      Fix mis-expansion of rule queries when a sub-<literal>SELECT</> appears
-      in a function call in <literal>FROM</>,  a multi-row <literal>VALUES</>
-      list, or a <literal>RETURNING</> list (Tom)
+      Fix mis-expansion of rule queries when a sub-<literal>SELECT</literal> appears
+      in a function call in <literal>FROM</literal>,  a multi-row <literal>VALUES</literal>
+      list, or a <literal>RETURNING</literal> list (Tom)
      </para>
 
      <para>
-      The usual symptom of this problem is an <quote>unrecognized node type</>
+      The usual symptom of this problem is an <quote>unrecognized node type</quote>
       error.
      </para>
     </listitem>
@@ -2729,9 +2729,9 @@
 
     <listitem>
      <para>
-      Prevent possible collision of <structfield>relfilenode</> numbers
+      Prevent possible collision of <structfield>relfilenode</structfield> numbers
       when moving a table to another tablespace with <command>ALTER SET
-      TABLESPACE</> (Heikki)
+      TABLESPACE</command> (Heikki)
      </para>
 
      <para>
@@ -2750,14 +2750,14 @@
     <listitem>
      <para>
       Fix improper display of fractional seconds in interval values when
-      using a non-ISO datestyle in an <option>--enable-integer-datetimes</>
+      using a non-ISO datestyle in an <option>--enable-integer-datetimes</option>
       build (Ron Mayer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>SPI_getvalue</> and <function>SPI_getbinval</>
+      Ensure <function>SPI_getvalue</function> and <function>SPI_getbinval</function>
       behave correctly when the passed tuple and tuple descriptor have
       different numbers of columns (Tom)
      </para>
@@ -2771,31 +2771,31 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s parsing of <command>CREATE ROLE</> (Michael)
+      Fix <application>ecpg</application>'s parsing of <command>CREATE ROLE</command> (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix recent breakage of <literal>pg_ctl restart</> (Tom)
+      Fix recent breakage of <literal>pg_ctl restart</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <filename>pg_control</> is opened in binary mode
+      Ensure <filename>pg_control</filename> is opened in binary mode
       (Itagaki Takahiro)
      </para>
 
      <para>
-      <application>pg_controldata</> and <application>pg_resetxlog</>
+      <application>pg_controldata</application> and <application>pg_resetxlog</application>
       did this incorrectly, and so could fail on Windows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008i (for
+      Update time zone data files to <application>tzdata</application> release 2008i (for
       DST law changes in Argentina, Brazil, Mauritius, Syria)
      </para>
     </listitem>
@@ -2816,7 +2816,7 @@
   <para>
    This release contains a variety of fixes from 8.2.9.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -2825,7 +2825,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
-    see <xref linkend="release-8-2-7">.
+    see <xref linkend="release-8-2-7"/>.
    </para>
 
   </sect2>
@@ -2847,12 +2847,12 @@
 
     <listitem>
      <para>
-      Fix potential miscalculation of <structfield>datfrozenxid</> (Alvaro)
+      Fix potential miscalculation of <structfield>datfrozenxid</structfield> (Alvaro)
      </para>
 
      <para>
       This error may explain some recent reports of failure to remove old
-      <structname>pg_clog</> data.
+      <structname>pg_clog</structname> data.
      </para>
     </listitem>
 
@@ -2864,7 +2864,7 @@
      <para>
       This responds to reports that the counters could overflow in
       sufficiently long transactions, leading to unexpected <quote>lock is
-      already held</> errors.
+      already held</quote> errors.
      </para>
     </listitem>
 
@@ -2877,7 +2877,7 @@
     <listitem>
      <para>
       Fix missed permissions checks when a view contains a simple
-      <literal>UNION ALL</> construct (Heikki)
+      <literal>UNION ALL</literal> construct (Heikki)
      </para>
 
      <para>
@@ -2889,12 +2889,12 @@
     <listitem>
      <para>
       Add checks in executor startup to ensure that the tuples produced by an
-      <command>INSERT</> or <command>UPDATE</> will match the target table's
+      <command>INSERT</command> or <command>UPDATE</command> will match the target table's
       current rowtype (Tom)
      </para>
 
      <para>
-      <command>ALTER COLUMN TYPE</>, followed by re-use of a previously
+      <command>ALTER COLUMN TYPE</command>, followed by re-use of a previously
       cached plan, could produce this type of situation.  The check protects
       against data corruption and/or crashes that could ensue.
      </para>
@@ -2902,29 +2902,29 @@
 
     <listitem>
      <para>
-      Fix possible repeated drops during <command>DROP OWNED</> (Tom)
+      Fix possible repeated drops during <command>DROP OWNED</command> (Tom)
      </para>
 
      <para>
       This would typically result in strange errors such as <quote>cache
-      lookup failed for relation NNN</>.
+      lookup failed for relation NNN</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>AT TIME ZONE</> to first try to interpret its timezone
+      Fix <literal>AT TIME ZONE</literal> to first try to interpret its timezone
       argument as a timezone abbreviation, and only try it as a full timezone
       name if that fails, rather than the other way around as formerly (Tom)
      </para>
 
      <para>
       The timestamp input functions have always resolved ambiguous zone names
-      in this order.  Making <literal>AT TIME ZONE</> do so as well improves
+      in this order.  Making <literal>AT TIME ZONE</literal> do so as well improves
       consistency, and fixes a compatibility bug introduced in 8.1:
       in ambiguous cases we now behave the same as 8.0 and before did,
-      since in the older versions <literal>AT TIME ZONE</> accepted
-      <emphasis>only</> abbreviations.
+      since in the older versions <literal>AT TIME ZONE</literal> accepted
+      <emphasis>only</emphasis> abbreviations.
      </para>
     </listitem>
 
@@ -2951,14 +2951,14 @@
     <listitem>
      <para>
       Allow spaces in the suffix part of an LDAP URL in
-      <filename>pg_hba.conf</> (Tom)
+      <filename>pg_hba.conf</filename> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix bug in backwards scanning of a cursor on a <literal>SELECT DISTINCT
-      ON</> query (Tom)
+      ON</literal> query (Tom)
      </para>
     </listitem>
 
@@ -2976,21 +2976,21 @@
 
     <listitem>
      <para>
-      Fix planner to estimate that <literal>GROUP BY</> expressions yielding
+      Fix planner to estimate that <literal>GROUP BY</literal> expressions yielding
       boolean results always result in two groups, regardless of the
       expressions' contents (Tom)
      </para>
 
      <para>
       This is very substantially more accurate than the regular <literal>GROUP
-      BY</> estimate for certain boolean tests like <replaceable>col</>
-      <literal>IS NULL</>.
+      BY</literal> estimate for certain boolean tests like <replaceable>col</replaceable>
+      <literal>IS NULL</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable
+      Fix PL/pgSQL to not fail when a <literal>FOR</literal> loop's target variable
       is a record containing composite-type fields (Tom)
      </para>
     </listitem>
@@ -3005,28 +3005,28 @@
     <listitem>
      <para>
       On Windows, work around a Microsoft bug by preventing
-      <application>libpq</> from trying to send more than 64kB per system call
+      <application>libpq</application> from trying to send more than 64kB per system call
       (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       error reporting after failure to send a SQL command (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to properly preserve postmaster
-      command-line arguments across a <literal>restart</> (Bruce)
+      Fix <application>pg_ctl</application> to properly preserve postmaster
+      command-line arguments across a <literal>restart</literal> (Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008f (for
+      Update time zone data files to <application>tzdata</application> release 2008f (for
       DST law changes in Argentina, Bahamas, Brazil, Mauritius, Morocco,
       Pakistan, Palestine, and Paraguay)
      </para>
@@ -3048,7 +3048,7 @@
   <para>
    This release contains one serious and one minor bug fix over 8.2.8.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -3057,7 +3057,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
-    see <xref linkend="release-8-2-7">.
+    see <xref linkend="release-8-2-7"/>.
    </para>
 
   </sect2>
@@ -3069,18 +3069,18 @@
 
     <listitem>
      <para>
-      Make <function>pg_get_ruledef()</> parenthesize negative constants (Tom)
+      Make <function>pg_get_ruledef()</function> parenthesize negative constants (Tom)
      </para>
 
      <para>
       Before this fix, a negative constant in a view or rule might be dumped
-      as, say, <literal>-42::integer</>, which is subtly incorrect: it should
-      be <literal>(-42)::integer</> due to operator precedence rules.
+      as, say, <literal>-42::integer</literal>, which is subtly incorrect: it should
+      be <literal>(-42)::integer</literal> due to operator precedence rules.
       Usually this would make little difference, but it could interact with
       another recent patch to cause
-      <productname>PostgreSQL</> to reject what had been a valid
-      <command>SELECT DISTINCT</> view query.  Since this could result in
-      <application>pg_dump</> output failing to reload, it is being treated
+      <productname>PostgreSQL</productname> to reject what had been a valid
+      <command>SELECT DISTINCT</command> view query.  Since this could result in
+      <application>pg_dump</application> output failing to reload, it is being treated
       as a high-priority fix.  The only released versions in which dump
       output is actually incorrect are 8.3.1 and 8.2.7.
      </para>
@@ -3088,13 +3088,13 @@
 
     <listitem>
      <para>
-      Make <command>ALTER AGGREGATE ... OWNER TO</> update
-      <structname>pg_shdepend</> (Tom)
+      Make <command>ALTER AGGREGATE ... OWNER TO</command> update
+      <structname>pg_shdepend</structname> (Tom)
      </para>
 
      <para>
       This oversight could lead to problems if the aggregate was later
-      involved in a <command>DROP OWNED</> or <command>REASSIGN OWNED</>
+      involved in a <command>DROP OWNED</command> or <command>REASSIGN OWNED</command>
       operation.
      </para>
     </listitem>
@@ -3115,7 +3115,7 @@
   <para>
    This release contains a variety of fixes from 8.2.7.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -3124,7 +3124,7 @@
    <para>
     A dump/restore is not required for those running 8.2.X.
     However, if you are upgrading from a version earlier than 8.2.7,
-    see <xref linkend="release-8-2-7">.
+    see <xref linkend="release-8-2-7"/>.
    </para>
 
   </sect2>
@@ -3144,7 +3144,7 @@
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</> so that the new
+      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</command> so that the new
       column is correctly checked to see if it's been initialized to all
       non-nulls (Brendan Jurd)
      </para>
@@ -3156,16 +3156,16 @@
 
     <listitem>
      <para>
-      Fix possible <command>CREATE TABLE</> failure when inheriting the
-      <quote>same</> constraint from multiple parent relations that
+      Fix possible <command>CREATE TABLE</command> failure when inheriting the
+      <quote>same</quote> constraint from multiple parent relations that
       inherited that constraint from a common ancestor (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to show the alias, if any, attached
-      to the target table of an <command>UPDATE</> or <command>DELETE</>
+      Fix <function>pg_get_ruledef()</function> to show the alias, if any, attached
+      to the target table of an <command>UPDATE</command> or <command>DELETE</command>
       (Tom)
      </para>
     </listitem>
@@ -3200,14 +3200,14 @@
     <listitem>
      <para>
       Fix conversions between ISO-8859-5 and other encodings to handle
-      Cyrillic <quote>Yo</> characters (<literal>e</> and <literal>E</> with
+      Cyrillic <quote>Yo</quote> characters (<literal>e</literal> and <literal>E</literal> with
       two dots) (Sergey Burladyan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several datatype input functions, notably <function>array_in()</>,
+      Fix several datatype input functions, notably <function>array_in()</function>,
       that were allowing unused bytes in their results to contain
       uninitialized, unpredictable values (Tom)
      </para>
@@ -3215,7 +3215,7 @@
      <para>
       This could lead to failures in which two apparently identical literal
       values were not seen as equal, resulting in the parser complaining
-      about unmatched <literal>ORDER BY</> and <literal>DISTINCT</>
+      about unmatched <literal>ORDER BY</literal> and <literal>DISTINCT</literal>
       expressions.
      </para>
     </listitem>
@@ -3223,24 +3223,24 @@
     <listitem>
      <para>
       Fix a corner case in regular-expression substring matching
-      (<literal>substring(<replaceable>string</> from
-      <replaceable>pattern</>)</literal>) (Tom)
+      (<literal>substring(<replaceable>string</replaceable> from
+      <replaceable>pattern</replaceable>)</literal>) (Tom)
      </para>
 
      <para>
       The problem occurs when there is a match to the pattern overall but
       the user has specified a parenthesized subexpression and that
       subexpression hasn't got a match.  An example is
-      <literal>substring('foo' from 'foo(bar)?')</>.
-      This should return NULL, since <literal>(bar)</> isn't matched, but
+      <literal>substring('foo' from 'foo(bar)?')</literal>.
+      This should return NULL, since <literal>(bar)</literal> isn't matched, but
       it was mistakenly returning the whole-pattern match instead (ie,
-      <literal>foo</>).
+      <literal>foo</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008c (for
+      Update time zone data files to <application>tzdata</application> release 2008c (for
       DST law changes in Morocco, Iraq, Choibalsan, Pakistan, Syria, Cuba, and
       Argentina/San_Luis)
      </para>
@@ -3248,47 +3248,47 @@
 
     <listitem>
      <para>
-      Fix incorrect result from <application>ecpg</>'s
-      <function>PGTYPEStimestamp_sub()</> function (Michael)
+      Fix incorrect result from <application>ecpg</application>'s
+      <function>PGTYPEStimestamp_sub()</function> function (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix broken GiST comparison function for <filename>contrib/tsearch2</>'s
-      <type>tsquery</> type (Teodor)
+      Fix broken GiST comparison function for <filename>contrib/tsearch2</filename>'s
+      <type>tsquery</type> type (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes in <filename>contrib/cube</> functions (Tom)
+      Fix possible crashes in <filename>contrib/cube</filename> functions (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix core dump in <filename>contrib/xml2</>'s
-      <function>xpath_table()</> function when the input query returns a
+      Fix core dump in <filename>contrib/xml2</filename>'s
+      <function>xpath_table()</function> function when the input query returns a
       NULL value (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s makefile to not override
-      <literal>CFLAGS</> (Tom)
+      Fix <filename>contrib/xml2</filename>'s makefile to not override
+      <literal>CFLAGS</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>DatumGetBool</> macro to not fail with <application>gcc</>
+      Fix <literal>DatumGetBool</literal> macro to not fail with <application>gcc</application>
       4.3 (Tom)
      </para>
 
      <para>
-      This problem affects <quote>old style</> (V0) C functions that
+      This problem affects <quote>old style</quote> (V0) C functions that
       return boolean.  The fix is already in 8.3, but the need to
       back-patch it was not realized at the time.
      </para>
@@ -3310,7 +3310,7 @@
   <para>
    This release contains a variety of fixes from 8.2.6.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -3318,7 +3318,7 @@
 
    <para>
     A dump/restore is not required for those running 8.2.X.
-    However, you might need to <command>REINDEX</> indexes on textual
+    However, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the Windows locale
     issue described below.
    </para>
@@ -3342,34 +3342,34 @@
       over two years ago, but Windows with UTF-8 uses a separate code
       path that was not updated.  If you are using a locale that
       considers some non-identical strings as equal, you may need to
-      <command>REINDEX</> to fix existing indexes on textual columns.
+      <command>REINDEX</command> to fix existing indexes on textual columns.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Repair potential deadlock between concurrent <command>VACUUM FULL</>
+      Repair potential deadlock between concurrent <command>VACUUM FULL</command>
       operations on different system catalogs (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix longstanding <command>LISTEN</>/<command>NOTIFY</>
+      Fix longstanding <command>LISTEN</command>/<command>NOTIFY</command>
       race condition (Tom)
      </para>
 
      <para>
       In rare cases a session that had just executed a
-      <command>LISTEN</> might not get a notification, even though
+      <command>LISTEN</command> might not get a notification, even though
       one would be expected because the concurrent transaction executing
-      <command>NOTIFY</> was observed to commit later.
+      <command>NOTIFY</command> was observed to commit later.
      </para>
 
      <para>
       A side effect of the fix is that a transaction that has executed
-      a not-yet-committed <command>LISTEN</> command will not see any
-      row in <structname>pg_listener</> for the <command>LISTEN</>,
+      a not-yet-committed <command>LISTEN</command> command will not see any
+      row in <structname>pg_listener</structname> for the <command>LISTEN</command>,
       should it choose to look; formerly it would have.  This behavior
       was never documented one way or the other, but it is possible that
       some applications depend on the old behavior.
@@ -3378,14 +3378,14 @@
 
     <listitem>
      <para>
-      Disallow <command>LISTEN</> and <command>UNLISTEN</> within a
+      Disallow <command>LISTEN</command> and <command>UNLISTEN</command> within a
       prepared transaction (Tom)
      </para>
 
      <para>
       This was formerly allowed but trying to do it had various unpleasant
       consequences, notably that the originating backend could not exit
-      as long as an <command>UNLISTEN</> remained uncommitted.
+      as long as an <command>UNLISTEN</command> remained uncommitted.
      </para>
     </listitem>
 
@@ -3426,14 +3426,14 @@
 
     <listitem>
      <para>
-      Fix <quote>unrecognized node type</> error in some variants of
-      <command>ALTER OWNER</> (Tom)
+      Fix <quote>unrecognized node type</quote> error in some variants of
+      <command>ALTER OWNER</command> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structname>pg_stat_activity</>.<structfield>waiting</> flag
+      Ensure <structname>pg_stat_activity</structname>.<structfield>waiting</structfield> flag
       is cleared when a lock wait is aborted (Tom)
      </para>
     </listitem>
@@ -3451,20 +3451,20 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008a
+      Update time zone data files to <application>tzdata</application> release 2008a
       (in particular, recent Chile changes); adjust timezone abbreviation
-      <literal>VET</> (Venezuela) to mean UTC-4:30, not UTC-4:00 (Tom)
+      <literal>VET</literal> (Venezuela) to mean UTC-4:30, not UTC-4:00 (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to correctly extract the postmaster's port
+      Fix <application>pg_ctl</application> to correctly extract the postmaster's port
       number from command-line options (Itagaki Takahiro, Tom)
      </para>
 
      <para>
-      Previously, <literal>pg_ctl start -w</> could try to contact the
+      Previously, <literal>pg_ctl start -w</literal> could try to contact the
       postmaster on the wrong port, leading to bogus reports of startup
       failure.
      </para>
@@ -3472,31 +3472,31 @@
 
     <listitem>
      <para>
-      Use <option>-fwrapv</> to defend against possible misoptimization
-      in recent <application>gcc</> versions (Tom)
+      Use <option>-fwrapv</option> to defend against possible misoptimization
+      in recent <application>gcc</application> versions (Tom)
      </para>
 
      <para>
-      This is known to be necessary when building <productname>PostgreSQL</>
-      with <application>gcc</> 4.3 or later.
+      This is known to be necessary when building <productname>PostgreSQL</productname>
+      with <application>gcc</application> 4.3 or later.
      </para>
     </listitem>
 
 
     <listitem>
      <para>
-      Correctly enforce <varname>statement_timeout</> values longer
-      than <literal>INT_MAX</> microseconds (about 35 minutes) (Tom)
+      Correctly enforce <varname>statement_timeout</varname> values longer
+      than <literal>INT_MAX</literal> microseconds (about 35 minutes) (Tom)
      </para>
 
      <para>
-      This bug affects only builds with <option>--enable-integer-datetimes</>.
+      This bug affects only builds with <option>--enable-integer-datetimes</option>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>unexpected PARAM_SUBLINK ID</> planner error when
+      Fix <quote>unexpected PARAM_SUBLINK ID</quote> planner error when
       constant-folding simplifies a sub-select (Tom)
      </para>
     </listitem>
@@ -3504,7 +3504,7 @@
     <listitem>
      <para>
       Fix logical errors in constraint-exclusion handling of <literal>IS
-      NULL</> and <literal>NOT</> expressions (Tom)
+      NULL</literal> and <literal>NOT</literal> expressions (Tom)
      </para>
 
      <para>
@@ -3515,7 +3515,7 @@
 
     <listitem>
      <para>
-      Fix another cause of <quote>failed to build any N-way joins</>
+      Fix another cause of <quote>failed to build any N-way joins</quote>
       planner errors (Tom)
      </para>
 
@@ -3539,8 +3539,8 @@
 
     <listitem>
      <para>
-      Fix display of constant expressions in <literal>ORDER BY</>
-      and <literal>GROUP BY</> (Tom)
+      Fix display of constant expressions in <literal>ORDER BY</literal>
+      and <literal>GROUP BY</literal> (Tom)
      </para>
 
      <para>
@@ -3552,7 +3552,7 @@
 
     <listitem>
      <para>
-      Fix <application>libpq</> to handle NOTICE messages correctly
+      Fix <application>libpq</application> to handle NOTICE messages correctly
       during COPY OUT (Tom)
      </para>
 
@@ -3580,7 +3580,7 @@
    This release contains a variety of fixes from 8.2.5,
    including fixes for significant security issues.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -3600,7 +3600,7 @@
     <listitem>
      <para>
       Prevent functions in indexes from executing with the privileges of
-      the user running <command>VACUUM</>, <command>ANALYZE</>, etc (Tom)
+      the user running <command>VACUUM</command>, <command>ANALYZE</command>, etc (Tom)
      </para>
 
      <para>
@@ -3611,18 +3611,18 @@
       (Note that triggers, defaults, check constraints, etc. pose the
       same type of risk.)  But functions in indexes pose extra danger
       because they will be executed by routine maintenance operations
-      such as <command>VACUUM FULL</>, which are commonly performed
+      such as <command>VACUUM FULL</command>, which are commonly performed
       automatically under a superuser account.  For example, a nefarious user
       can execute code with superuser privileges by setting up a
       trojan-horse index definition and waiting for the next routine vacuum.
       The fix arranges for standard maintenance operations
-      (including <command>VACUUM</>, <command>ANALYZE</>, <command>REINDEX</>,
-      and <command>CLUSTER</>) to execute as the table owner rather than
+      (including <command>VACUUM</command>, <command>ANALYZE</command>, <command>REINDEX</command>,
+      and <command>CLUSTER</command>) to execute as the table owner rather than
       the calling user, using the same privilege-switching mechanism already
-      used for <literal>SECURITY DEFINER</> functions.  To prevent bypassing
+      used for <literal>SECURITY DEFINER</literal> functions.  To prevent bypassing
       this security measure, execution of <command>SET SESSION
-      AUTHORIZATION</> and <command>SET ROLE</> is now forbidden within a
-      <literal>SECURITY DEFINER</> context.  (CVE-2007-6600)
+      AUTHORIZATION</command> and <command>SET ROLE</command> is now forbidden within a
+      <literal>SECURITY DEFINER</literal> context.  (CVE-2007-6600)
      </para>
     </listitem>
 
@@ -3642,13 +3642,13 @@
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
 
      <para>
       The fix that appeared for this in 8.2.5 was incomplete, as it plugged
-      the hole for only some <filename>dblink</> functions.  (CVE-2007-6601,
+      the hole for only some <filename>dblink</filename> functions.  (CVE-2007-6601,
       CVE-2007-3278)
      </para>
     </listitem>
@@ -3662,13 +3662,13 @@
     <listitem>
      <para>
       Fix GIN index build to work properly when
-      <varname>maintenance_work_mem</> is 4GB or more (Tom)
+      <varname>maintenance_work_mem</varname> is 4GB or more (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2007k
+      Update time zone data files to <application>tzdata</application> release 2007k
       (in particular, recent Argentina changes) (Tom)
      </para>
     </listitem>
@@ -3690,22 +3690,22 @@
     <listitem>
      <para>
       Fix planner failure in some cases of <literal>WHERE false AND var IN
-      (SELECT ...)</> (Tom)
+      (SELECT ...)</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE TABLE ... SERIAL</> and
-      <command>ALTER SEQUENCE ... OWNED BY</> not change the
-      <function>currval()</> state of the sequence (Tom)
+      Make <command>CREATE TABLE ... SERIAL</command> and
+      <command>ALTER SEQUENCE ... OWNED BY</command> not change the
+      <function>currval()</function> state of the sequence (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Preserve the tablespace and storage parameters of indexes that are
-      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</> (Tom)
+      rebuilt by <command>ALTER TABLE ... ALTER COLUMN TYPE</command> (Tom)
      </para>
     </listitem>
 
@@ -3724,28 +3724,28 @@
 
     <listitem>
      <para>
-      Make <command>VACUUM</> not use all of <varname>maintenance_work_mem</>
+      Make <command>VACUUM</command> not use all of <varname>maintenance_work_mem</varname>
       when the table is too small for it to be useful (Alvaro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential crash in <function>translate()</> when using a multibyte
+      Fix potential crash in <function>translate()</function> when using a multibyte
       database encoding (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <function>corr()</> return the correct result for negative
+      Make <function>corr()</function> return the correct result for negative
       correlation values (Neil)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow in <literal>extract(epoch from interval)</> for intervals
+      Fix overflow in <literal>extract(epoch from interval)</literal> for intervals
       exceeding 68 years (Tom)
      </para>
     </listitem>
@@ -3759,13 +3759,13 @@
 
     <listitem>
      <para>
-      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</>
-      as <literal>int</> rather than <literal>char</> (Tom)
+      Fix PL/Perl to cope when platform's Perl defines type <literal>bool</literal>
+      as <literal>int</literal> rather than <literal>char</literal> (Tom)
      </para>
 
      <para>
       While this could theoretically happen anywhere, no standard build of
-      Perl did things this way ... until <productname>macOS</> 10.5.
+      Perl did things this way ... until <productname>macOS</productname> 10.5.
      </para>
     </listitem>
 
@@ -3784,73 +3784,73 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to correctly handle inheritance child tables
+      Fix <application>pg_dump</application> to correctly handle inheritance child tables
       that have default expressions different from their parent's (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</> crash when <varname>PGPASSFILE</> refers
+      Fix <application>libpq</application> crash when <varname>PGPASSFILE</varname> refers
       to a file that is not a plain file (Martin Pitt)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <application>ecpg</> parser fixes (Michael)
+      <application>ecpg</application> parser fixes (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pgcrypto</> defend against
-      <application>OpenSSL</> libraries that fail on keys longer than 128
+      Make <filename>contrib/pgcrypto</filename> defend against
+      <application>OpenSSL</application> libraries that fail on keys longer than 128
       bits; which is the case at least on some Solaris versions (Marko Kreen)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/tablefunc</>'s <function>crosstab()</> handle
+      Make <filename>contrib/tablefunc</filename>'s <function>crosstab()</function> handle
       NULL rowid as a category in its own right, rather than crashing (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <type>tsvector</> and <type>tsquery</> output routines to
+      Fix <type>tsvector</type> and <type>tsquery</type> output routines to
       escape backslashes correctly (Teodor, Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash of <function>to_tsvector()</> on huge input strings (Teodor)
+      Fix crash of <function>to_tsvector()</function> on huge input strings (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require a specific version of <productname>Autoconf</> to be used
-      when re-generating the <command>configure</> script (Peter)
+      Require a specific version of <productname>Autoconf</productname> to be used
+      when re-generating the <command>configure</command> script (Peter)
      </para>
 
      <para>
       This affects developers and packagers only.  The change was made
       to prevent accidental use of untested combinations of
-      <productname>Autoconf</> and <productname>PostgreSQL</> versions.
+      <productname>Autoconf</productname> and <productname>PostgreSQL</productname> versions.
       You can remove the version check if you really want to use a
-      different <productname>Autoconf</> version, but it's
+      different <productname>Autoconf</productname> version, but it's
       your responsibility whether the result works or not.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update <function>gettimeofday</> configuration check so that
-      <productname>PostgreSQL</> can be built on newer versions of
-      <productname>MinGW</> (Magnus)
+      Update <function>gettimeofday</function> configuration check so that
+      <productname>PostgreSQL</productname> can be built on newer versions of
+      <productname>MinGW</productname> (Magnus)
      </para>
     </listitem>
 
@@ -3870,7 +3870,7 @@
   <para>
    This release contains a variety of fixes from 8.2.4.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -3890,48 +3890,48 @@
     <listitem>
      <para>
       Prevent index corruption when a transaction inserts rows and
-      then aborts close to the end of a concurrent <command>VACUUM</>
+      then aborts close to the end of a concurrent <command>VACUUM</command>
       on the same table (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>ALTER DOMAIN ADD CONSTRAINT</> for cases involving
+      Fix <literal>ALTER DOMAIN ADD CONSTRAINT</literal> for cases involving
       domains over domains (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE DOMAIN ... DEFAULT NULL</> work properly (Tom)
+      Make <command>CREATE DOMAIN ... DEFAULT NULL</command> work properly (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix some planner problems with outer joins, notably poor
-      size estimation for <literal>t1 LEFT JOIN t2 WHERE t2.col IS NULL</>
+      size estimation for <literal>t1 LEFT JOIN t2 WHERE t2.col IS NULL</literal>
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow the <type>interval</> data type to accept input consisting only of
+      Allow the <type>interval</type> data type to accept input consisting only of
       milliseconds or microseconds (Neil)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow timezone name to appear before the year in <type>timestamp</> input (Tom)
+      Allow timezone name to appear before the year in <type>timestamp</type> input (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fixes for <acronym>GIN</> indexes used by <filename>/contrib/tsearch2</> (Teodor)
+      Fixes for <acronym>GIN</acronym> indexes used by <filename>/contrib/tsearch2</filename> (Teodor)
      </para>
     </listitem>
 
@@ -3943,7 +3943,7 @@
 
     <listitem>
      <para>
-      Fix excessive logging of <acronym>SSL</> error messages (Tom)
+      Fix excessive logging of <acronym>SSL</acronym> error messages (Tom)
      </para>
     </listitem>
 
@@ -3956,7 +3956,7 @@
 
     <listitem>
      <para>
-      Fix crash when <varname>log_min_error_statement</> logging runs out
+      Fix crash when <varname>log_min_error_statement</varname> logging runs out
       of memory (Tom)
      </para>
     </listitem>
@@ -3969,13 +3969,13 @@
 
     <listitem>
      <para>
-      Fix <function>stddev_pop(numeric)</> and <function>var_pop(numeric)</> (Tom)
+      Fix <function>stddev_pop(numeric)</function> and <function>var_pop(numeric)</function> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>REINDEX</> and <command>CLUSTER</> from failing
+      Prevent <command>REINDEX</command> and <command>CLUSTER</command> from failing
       due to attempting to process temporary tables of other sessions (Alvaro)
      </para>
     </listitem>
@@ -3994,39 +3994,39 @@
 
     <listitem>
      <para>
-      Make <command>pg_ctl -w</> work properly in Windows service mode (Dave Page)
+      Make <command>pg_ctl -w</command> work properly in Windows service mode (Dave Page)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory allocation bug when using <application>MIT Kerberos</> on Windows (Magnus)
+      Fix memory allocation bug when using <application>MIT Kerberos</application> on Windows (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Suppress timezone name (<literal>%Z</>) in log timestamps on Windows
+      Suppress timezone name (<literal>%Z</literal>) in log timestamps on Windows
       because of possible encoding mismatches (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Restrict <filename>/contrib/pgstattuple</> functions to superusers, for security reasons (Tom)
+      Restrict <filename>/contrib/pgstattuple</filename> functions to superusers, for security reasons (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not let <filename>/contrib/intarray</> try to make its GIN opclass
+      Do not let <filename>/contrib/intarray</filename> try to make its GIN opclass
       the default (this caused problems at dump/restore) (Tom)
      </para>
     </listitem>
@@ -4048,7 +4048,7 @@
    This release contains a variety of fixes from 8.2.3,
    including a security fix.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -4068,56 +4068,56 @@
     <listitem>
      <para>
       Support explicit placement of the temporary-table schema within
-      <varname>search_path</>, and disable searching it for functions
+      <varname>search_path</varname>, and disable searching it for functions
       and operators (Tom)
      </para>
 
      <para>
       This is needed to allow a security-definer function to set a
-      truly secure value of <varname>search_path</>.  Without it,
+      truly secure value of <varname>search_path</varname>.  Without it,
       an unprivileged SQL user can use temporary objects to execute code
       with the privileges of the security-definer function (CVE-2007-2138).
-      See <command>CREATE FUNCTION</> for more information.
+      See <command>CREATE FUNCTION</command> for more information.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <varname>shared_preload_libraries</> for Windows
+      Fix <varname>shared_preload_libraries</varname> for Windows
       by forcing reload in each backend (Korry Douglas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>to_char()</> so it properly upper/lower cases localized day or month
+      Fix <function>to_char()</function> so it properly upper/lower cases localized day or month
       names (Pavel Stehule)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <filename>/contrib/tsearch2</> crash fixes (Teodor)
+      <filename>/contrib/tsearch2</filename> crash fixes (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require <command>COMMIT PREPARED</> to be executed in the same
+      Require <command>COMMIT PREPARED</command> to be executed in the same
       database as the transaction was prepared in (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>pg_dump</> to do binary backups larger than two gigabytes
+      Allow <command>pg_dump</command> to do binary backups larger than two gigabytes
       on Windows (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      New traditional (Taiwan) Chinese <acronym>FAQ</> (Zhou Daojing)
+      New traditional (Taiwan) Chinese <acronym>FAQ</acronym> (Zhou Daojing)
      </para>
     </listitem>
 
@@ -4129,8 +4129,8 @@
 
     <listitem>
      <para>
-      Fix potential-data-corruption bug in how <command>VACUUM FULL</> handles
-      <command>UPDATE</> chains (Tom, Pavan Deolasee)
+      Fix potential-data-corruption bug in how <command>VACUUM FULL</command> handles
+      <command>UPDATE</command> chains (Tom, Pavan Deolasee)
      </para>
     </listitem>
 
@@ -4142,8 +4142,8 @@
 
     <listitem>
      <para>
-      Fix <command>pg_dump</> so it can dump a serial column's sequence
-      using <option>-t</> when not also dumping the owning table
+      Fix <command>pg_dump</command> so it can dump a serial column's sequence
+      using <option>-t</option> when not also dumping the owning table
       (Tom)
      </para>
     </listitem>
@@ -4158,7 +4158,7 @@
     <listitem>
      <para>
       Fix possible wrong answers or crash when a PL/pgSQL function tries
-      to <literal>RETURN</> from within an <literal>EXCEPTION</> block
+      to <literal>RETURN</literal> from within an <literal>EXCEPTION</literal> block
       (Tom)
      </para>
     </listitem>
@@ -4191,7 +4191,7 @@
   <para>
    This release contains two fixes from 8.2.2.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -4238,7 +4238,7 @@
    This release contains a variety of fixes from 8.2.1, including
    a security fix.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -4286,8 +4286,8 @@
 
     <listitem>
      <para>
-      Properly handle <function>to_char('CC')</> for years ending in
-      <literal>00</> (Tom)
+      Properly handle <function>to_char('CC')</function> for years ending in
+      <literal>00</literal> (Tom)
      </para>
 
      <para>
@@ -4297,41 +4297,41 @@
 
     <listitem>
      <para>
-      <filename>/contrib/tsearch2</> localization improvements (Tatsuo, Teodor)
+      <filename>/contrib/tsearch2</filename> localization improvements (Tatsuo, Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect permission check in
-      <literal>information_schema.key_column_usage</> view (Tom)
+      <literal>information_schema.key_column_usage</literal> view (Tom)
      </para>
 
      <para>
-      The symptom is <quote>relation with OID nnnnn does not exist</> errors.
-      To get this fix without using <command>initdb</>, use <command>CREATE OR
-      REPLACE VIEW</> to install the corrected definition found in
-      <filename>share/information_schema.sql</>.  Note you will need to do
+      The symptom is <quote>relation with OID nnnnn does not exist</quote> errors.
+      To get this fix without using <command>initdb</command>, use <command>CREATE OR
+      REPLACE VIEW</command> to install the corrected definition found in
+      <filename>share/information_schema.sql</filename>.  Note you will need to do
       this in each database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <command>VACUUM</> performance for databases with many tables (Tom)
+      Improve <command>VACUUM</command> performance for databases with many tables (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix for rare Assert() crash triggered by <literal>UNION</> (Tom)
+      Fix for rare Assert() crash triggered by <literal>UNION</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix potentially incorrect results from index searches using
-      <literal>ROW</> inequality conditions (Tom)
+      <literal>ROW</literal> inequality conditions (Tom)
      </para>
     </listitem>
 
@@ -4344,7 +4344,7 @@
 
     <listitem>
      <para>
-      Fix bogus <quote>permission denied</> failures occurring on Windows
+      Fix bogus <quote>permission denied</quote> failures occurring on Windows
       due to attempts to fsync already-deleted files (Magnus, Tom)
      </para>
     </listitem>
@@ -4395,7 +4395,7 @@
   <para>
    This release contains a variety of fixes from 8.2.
    For information about new features in the 8.2 major release, see
-   <xref linkend="release-8-2">.
+   <xref linkend="release-8-2"/>.
   </para>
 
   <sect2>
@@ -4414,21 +4414,21 @@
 
     <listitem>
      <para>
-      Fix crash with <literal>SELECT</> ... <literal>LIMIT ALL</> (also
-      <literal>LIMIT NULL</>) (Tom)
+      Fix crash with <literal>SELECT</literal> ... <literal>LIMIT ALL</literal> (also
+      <literal>LIMIT NULL</literal>) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <filename>Several /contrib/tsearch2</> fixes (Teodor)
+      <filename>Several /contrib/tsearch2</filename> fixes (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
       On Windows, make log messages coming from the operating system use
-      <acronym>ASCII</> encoding (Hiroshi Saito)
+      <acronym>ASCII</acronym> encoding (Hiroshi Saito)
      </para>
 
      <para>
@@ -4439,8 +4439,8 @@
 
     <listitem>
      <para>
-      Fix Windows linking of <application>pg_dump</> using
-      <filename>win32.mak</>
+      Fix Windows linking of <application>pg_dump</application> using
+      <filename>win32.mak</filename>
       (Hiroshi Saito)
      </para>
     </listitem>
@@ -4469,13 +4469,13 @@
 
     <listitem>
      <para>
-      Improve build speed of <acronym>PDF</> documentation (Peter)
+      Improve build speed of <acronym>PDF</acronym> documentation (Peter)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Re-add <acronym>JST</> (Japan) timezone abbreviation (Tom)
+      Re-add <acronym>JST</acronym> (Japan) timezone abbreviation (Tom)
      </para>
     </listitem>
 
@@ -4487,8 +4487,8 @@
 
     <listitem>
      <para>
-      Have <application>psql</> print multi-byte combining characters as
-      before, rather than output as <literal>\u</> (Tom)
+      Have <application>psql</application> print multi-byte combining characters as
+      before, rather than output as <literal>\u</literal> (Tom)
      </para>
     </listitem>
 
@@ -4498,19 +4498,19 @@
      </para>
 
      <para>
-      This improves <application>psql</> <literal>\d</> performance also.
+      This improves <application>psql</application> <literal>\d</literal> performance also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dumpall</> assume that databases have public
-      <literal>CONNECT</> privilege, when dumping from a pre-8.2 server (Tom)
+      Make <application>pg_dumpall</application> assume that databases have public
+      <literal>CONNECT</literal> privilege, when dumping from a pre-8.2 server (Tom)
      </para>
 
      <para>
       This preserves the previous behavior that anyone can connect to a
-      database if allowed by <filename>pg_hba.conf</>.
+      database if allowed by <filename>pg_hba.conf</filename>.
      </para>
     </listitem>
 
@@ -4541,14 +4541,14 @@
        Query language enhancements including <command>INSERT/UPDATE/DELETE
        RETURNING</command>, multirow <literal>VALUES</literal> lists, and
        optional target-table alias in
-       <command>UPDATE</>/<command>DELETE</command>
+       <command>UPDATE</command>/<command>DELETE</command>
       </para>
      </listitem>
 
      <listitem>
       <para>
        Index creation without blocking concurrent
-       <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>
+       <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>
        operations
       </para>
      </listitem>
@@ -4659,13 +4659,13 @@
      <listitem>
       <para>
        Set <link
-       linkend="guc-escape-string-warning"><varname>escape_string_warning</></link>
-       to <literal>on</> by default (Bruce)
+       linkend="guc-escape-string-warning"><varname>escape_string_warning</varname></link>
+       to <literal>on</literal> by default (Bruce)
       </para>
 
       <para>
        This issues a warning if backslash escapes are used in
-       <link linkend="sql-syntax-strings">non-escape (non-<literal>E''</>)
+       <link linkend="sql-syntax-strings">non-escape (non-<literal>E''</literal>)
        strings</link>.
       </para>
      </listitem>
@@ -4673,8 +4673,8 @@
      <listitem>
       <para>
        Change the <link linkend="sql-syntax-row-constructors">row
-       constructor syntax</link> (<literal>ROW(...)</>) so that
-       list elements <literal>foo.*</> will be expanded to a list
+       constructor syntax</link> (<literal>ROW(...)</literal>) so that
+       list elements <literal>foo.*</literal> will be expanded to a list
        of their member fields, rather than creating a nested
        row type field as formerly (Tom)
       </para>
@@ -4682,15 +4682,15 @@
       <para>
        The new behavior is substantially more useful since it
        allows, for example, triggers to check for data changes
-       with <literal>IF row(new.*) IS DISTINCT FROM row(old.*)</>.
-       The old behavior is still available by omitting <literal>.*</>.
+       with <literal>IF row(new.*) IS DISTINCT FROM row(old.*)</literal>.
+       The old behavior is still available by omitting <literal>.*</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Make <link linkend="row-wise-comparison">row comparisons</link>
-       follow <acronym>SQL</> standard semantics and allow them
+       follow <acronym>SQL</acronym> standard semantics and allow them
        to be used in index scans (Tom)
       </para>
 
@@ -4704,13 +4704,13 @@
 
      <listitem>
       <para>
-       Make <link linkend="functions-comparison">row <literal>IS <optional>NOT</> NULL</literal></link>
-       tests follow <acronym>SQL</> standard semantics (Tom)
+       Make <link linkend="functions-comparison">row <literal>IS <optional>NOT</optional> NULL</literal></link>
+       tests follow <acronym>SQL</acronym> standard semantics (Tom)
       </para>
 
       <para>
        The former behavior conformed to the standard for simple cases
-       with <literal>IS NULL</>, but <literal>IS NOT NULL</> would return
+       with <literal>IS NULL</literal>, but <literal>IS NOT NULL</literal> would return
        true if any row field was non-null, whereas the standard says it
        should return true only when all fields are non-null.
       </para>
@@ -4718,12 +4718,12 @@
 
      <listitem>
       <para>
-       Make <link linkend="SQL-SET-CONSTRAINTS"><command>SET
-       CONSTRAINT</></link> affect only one constraint (Kris Jurka)
+       Make <link linkend="sql-set-constraints"><command>SET
+       CONSTRAINT</command></link> affect only one constraint (Kris Jurka)
       </para>
 
       <para>
-       In previous releases, <command>SET CONSTRAINT</> modified
+       In previous releases, <command>SET CONSTRAINT</command> modified
        all constraints with a matching name.  In this release,
        the schema search path is used to modify only the first
        matching constraint.  A schema specification is also
@@ -4733,14 +4733,14 @@
 
      <listitem>
       <para>
-       Remove <literal>RULE</> permission for tables, for security reasons
+       Remove <literal>RULE</literal> permission for tables, for security reasons
        (Tom)
       </para>
 
       <para>
        As of this release, only a table's owner can create or modify
        rules for the table.  For backwards compatibility,
-       <command>GRANT</>/<command>REVOKE RULE</> is still accepted,
+       <command>GRANT</command>/<command>REVOKE RULE</command> is still accepted,
        but it does nothing.
       </para>
      </listitem>
@@ -4769,14 +4769,14 @@
 
      <listitem>
       <para>
-       Make command-line options of <application>postmaster</>
-       and <link linkend="app-postgres"><application>postgres</></link>
+       Make command-line options of <application>postmaster</application>
+       and <link linkend="app-postgres"><application>postgres</application></link>
        identical (Peter)
       </para>
 
       <para>
        This allows the postmaster to pass arguments to each backend
-       without using <literal>-o</>.  Note that some options are now
+       without using <literal>-o</literal>.  Note that some options are now
        only available as long-form options, because there were conflicting
        single-letter options.
       </para>
@@ -4784,13 +4784,13 @@
 
      <listitem>
       <para>
-       Deprecate use of <application>postmaster</> symbolic link (Peter)
+       Deprecate use of <application>postmaster</application> symbolic link (Peter)
       </para>
 
       <para>
-       <application>postmaster</> and <application>postgres</>
+       <application>postmaster</application> and <application>postgres</application>
        commands now act identically, with the behavior determined
-       by command-line options.  The <application>postmaster</> symbolic link is
+       by command-line options.  The <application>postmaster</application> symbolic link is
        kept for compatibility, but is not really needed.
       </para>
      </listitem>
@@ -4798,12 +4798,12 @@
      <listitem>
       <para>
        Change <link
-       linkend="guc-log-duration"><varname>log_duration</></link>
+       linkend="guc-log-duration"><varname>log_duration</varname></link>
        to output even if the query is not output (Tom)
       </para>
 
       <para>
-       In prior releases, <varname>log_duration</> only printed if
+       In prior releases, <varname>log_duration</varname> only printed if
        the query appeared earlier in the log.
       </para>
      </listitem>
@@ -4811,15 +4811,15 @@
      <listitem>
       <para>
        Make <link
-       linkend="functions-formatting"><function>to_char(time)</></link>
+       linkend="functions-formatting"><function>to_char(time)</function></link>
        and <link
-       linkend="functions-formatting"><function>to_char(interval)</></link>
-       treat <literal>HH</> and <literal>HH12</> as 12-hour
+       linkend="functions-formatting"><function>to_char(interval)</function></link>
+       treat <literal>HH</literal> and <literal>HH12</literal> as 12-hour
        intervals
       </para>
 
       <para>
-       Most applications should use <literal>HH24</> unless they
+       Most applications should use <literal>HH24</literal> unless they
        want a 12-hour display.
       </para>
      </listitem>
@@ -4827,19 +4827,19 @@
      <listitem>
       <para>
        Zero unmasked bits in conversion from <link
-       linkend="datatype-inet"><type>INET</></link> to <link
-       linkend="datatype-inet"><type>CIDR</></link> (Tom)
+       linkend="datatype-inet"><type>INET</type></link> to <link
+       linkend="datatype-inet"><type>CIDR</type></link> (Tom)
       </para>
 
       <para>
        This ensures that the converted value is actually valid for
-       <type>CIDR</>.
+       <type>CIDR</type>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <varname>australian_timezones</> configuration variable
+       Remove <varname>australian_timezones</varname> configuration variable
        (Joachim Wieland)
       </para>
 
@@ -4857,35 +4857,35 @@
       <para>
        This might eliminate the need to set unrealistically small
        values of <link
-       linkend="guc-random-page-cost"><varname>random_page_cost</></link>.
-       If you have been using a very small <varname>random_page_cost</>,
+       linkend="guc-random-page-cost"><varname>random_page_cost</varname></link>.
+       If you have been using a very small <varname>random_page_cost</varname>,
        please recheck your test cases.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change behavior of <command>pg_dump</> <literal>-n</> and
-       <literal>-t</> options.  (Greg Sabino Mullane)
+       Change behavior of <command>pg_dump</command> <literal>-n</literal> and
+       <literal>-t</literal> options.  (Greg Sabino Mullane)
       </para>
       <para>
-       See the <command>pg_dump</> manual page for details.
+       See the <command>pg_dump</command> manual page for details.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change <link linkend="libpq"><application>libpq</></link>
-       <function>PQdsplen()</> to return a useful value (Martijn
+       Change <link linkend="libpq"><application>libpq</application></link>
+       <function>PQdsplen()</function> to return a useful value (Martijn
        van Oosterhout)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Declare <link linkend="libpq"><application>libpq</></link>
-       <function>PQgetssl()</> as returning <literal>void *</>,
-       rather than <literal>SSL *</> (Martijn van Oosterhout)
+       Declare <link linkend="libpq"><application>libpq</application></link>
+       <function>PQgetssl()</function> as returning <literal>void *</literal>,
+       rather than <literal>SSL *</literal> (Martijn van Oosterhout)
       </para>
 
       <para>
@@ -4897,7 +4897,7 @@
      <listitem>
       <para>
        C-language loadable modules must now include a
-       <link linkend="xfunc-c-dynload"><literal>PG_MODULE_MAGIC</></link>
+       <link linkend="xfunc-c-dynload"><literal>PG_MODULE_MAGIC</literal></link>
        macro call for version compatibility checking
        (Martijn van Oosterhout)
       </para>
@@ -4923,12 +4923,12 @@
 
      <listitem>
       <para>
-       In <filename>contrib/xml2/</>, rename <function>xml_valid()</> to
-       <function>xml_is_well_formed()</> (Tom)
+       In <filename>contrib/xml2/</filename>, rename <function>xml_valid()</function> to
+       <function>xml_is_well_formed()</function> (Tom)
       </para>
 
       <para>
-       <function>xml_valid()</> will remain for backward compatibility,
+       <function>xml_valid()</function> will remain for backward compatibility,
        but its behavior will change to do schema checking in a future
        release.
       </para>
@@ -4936,7 +4936,7 @@
 
      <listitem>
       <para>
-       Remove <filename>contrib/ora2pg/</>, now at <ulink
+       Remove <filename>contrib/ora2pg/</filename>, now at <ulink
        url="http://www.samse.fr/GPL/ora2pg"></ulink>
       </para>
      </listitem>
@@ -4944,21 +4944,21 @@
      <listitem>
       <para>
        Remove contrib modules that have been migrated to PgFoundry:
-       <filename>adddepend</>, <filename>dbase</>, <filename>dbmirror</>,
-       <filename>fulltextindex</>, <filename>mac</>, <filename>userlock</>
+       <filename>adddepend</filename>, <filename>dbase</filename>, <filename>dbmirror</filename>,
+       <filename>fulltextindex</filename>, <filename>mac</filename>, <filename>userlock</filename>
       </para>
      </listitem>
 
      <listitem>
       <para>
        Remove abandoned contrib modules:
-       <filename>mSQL-interface</>, <filename>tips</>
+       <filename>mSQL-interface</filename>, <filename>tips</filename>
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <acronym>QNX</> and <acronym>BEOS</> ports (Bruce)
+       Remove <acronym>QNX</acronym> and <acronym>BEOS</acronym> ports (Bruce)
       </para>
 
       <para>
@@ -5002,7 +5002,7 @@
      <listitem>
       <para>
        Improve efficiency of <link
-       linkend="functions-comparisons"><literal>IN</>
+       linkend="functions-comparisons"><literal>IN</literal>
        (list-of-expressions)</link> clauses (Tom)
       </para>
      </listitem>
@@ -5022,9 +5022,9 @@
 
      <listitem>
       <para>
-       Add <literal>FILLFACTOR</> to <link
-       linkend="SQL-CREATETABLE">table</link> and <link
-       linkend="SQL-CREATEINDEX">index</link> creation (ITAGAKI
+       Add <literal>FILLFACTOR</literal> to <link
+       linkend="sql-createtable">table</link> and <link
+       linkend="sql-createindex">index</link> creation (ITAGAKI
        Takahiro)
       </para>
 
@@ -5038,8 +5038,8 @@
      <listitem>
       <para>
        Increase default values for <link
-       linkend="guc-shared-buffers"><varname>shared_buffers</></link>
-       and <varname>max_fsm_pages</>
+       linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
+       and <varname>max_fsm_pages</varname>
        (Andrew)
       </para>
      </listitem>
@@ -5074,8 +5074,8 @@
      <listitem>
       <para>
        Improve the optimizer's selectivity estimates for <link
-       linkend="functions-like"><literal>LIKE</></link>, <link
-       linkend="functions-like"><literal>ILIKE</></link>, and
+       linkend="functions-like"><literal>LIKE</literal></link>, <link
+       linkend="functions-like"><literal>ILIKE</literal></link>, and
        <link linkend="functions-posix-regexp">regular expression</link>
        operations (Tom)
       </para>
@@ -5085,7 +5085,7 @@
       <para>
        Improve planning of joins to <link linkend="ddl-inherit">inherited
        tables</link> and <link linkend="queries-union"><literal>UNION
-       ALL</></link> views (Tom)
+       ALL</literal></link> views (Tom)
       </para>
      </listitem>
 
@@ -5093,18 +5093,18 @@
       <para>
        Allow <link linkend="guc-constraint-exclusion">constraint
        exclusion</link> to be applied to <link
-       linkend="ddl-inherit">inherited</link> <command>UPDATE</> and
-       <command>DELETE</> queries (Tom)
+       linkend="ddl-inherit">inherited</link> <command>UPDATE</command> and
+       <command>DELETE</command> queries (Tom)
       </para>
 
       <para>
-       <command>SELECT</> already honored constraint exclusion.
+       <command>SELECT</command> already honored constraint exclusion.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve planning of constant <literal>WHERE</> clauses, such as
+       Improve planning of constant <literal>WHERE</literal> clauses, such as
        a condition that depends only on variables inherited from an
        outer query level (Tom)
       </para>
@@ -5113,7 +5113,7 @@
      <listitem>
       <para>
        Protocol-level unnamed prepared statements are re-planned
-       for each set of <literal>BIND</> values (Tom)
+       for each set of <literal>BIND</literal> values (Tom)
       </para>
 
       <para>
@@ -5132,13 +5132,13 @@
      <listitem>
       <para>
        Avoid extra scan of tables without indexes during <link
-       linkend="SQL-VACUUM"><command>VACUUM</></link> (Greg Stark)
+       linkend="sql-vacuum"><command>VACUUM</command></link> (Greg Stark)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve multicolumn <link linkend="GiST"><acronym>GiST</></link>
+       Improve multicolumn <link linkend="gist"><acronym>GiST</acronym></link>
        indexing (Oleg, Teodor)
       </para>
      </listitem>
@@ -5167,7 +5167,7 @@
        This is valuable for keeping warm standby slave servers
        in sync with the master.  Transaction log file switching now also happens
        automatically during <link
-       linkend="functions-admin"><function>pg_stop_backup()</></link>.
+       linkend="functions-admin"><function>pg_stop_backup()</function></link>.
        This ensures that all
        transaction log files needed for recovery can be archived immediately.
       </para>
@@ -5175,26 +5175,26 @@
 
      <listitem>
       <para>
-       Add <acronym>WAL</> informational functions (Simon)
+       Add <acronym>WAL</acronym> informational functions (Simon)
       </para>
 
       <para>
        Add functions for interrogating the current transaction log insertion
-       point and determining <acronym>WAL</> filenames from the
-       hex <acronym>WAL</> locations displayed by <link
-       linkend="functions-admin"><function>pg_stop_backup()</></link>
+       point and determining <acronym>WAL</acronym> filenames from the
+       hex <acronym>WAL</acronym> locations displayed by <link
+       linkend="functions-admin"><function>pg_stop_backup()</function></link>
        and related functions.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve recovery from a crash during <acronym>WAL</> replay (Simon)
+       Improve recovery from a crash during <acronym>WAL</acronym> replay (Simon)
       </para>
 
       <para>
-       The server now does periodic checkpoints during <acronym>WAL</>
-       recovery, so if there is a crash, future <acronym>WAL</>
+       The server now does periodic checkpoints during <acronym>WAL</acronym>
+       recovery, so if there is a crash, future <acronym>WAL</acronym>
        recovery is shortened.  This also eliminates the need for
        warm standby servers to replay the entire log since the
        base backup if they crash.
@@ -5203,7 +5203,7 @@
 
      <listitem>
       <para>
-       Improve reliability of long-term <acronym>WAL</> replay
+       Improve reliability of long-term <acronym>WAL</acronym> replay
        (Heikki, Simon, Tom)
       </para>
 
@@ -5218,7 +5218,7 @@
      <listitem>
       <para>
        Add <link
-       linkend="guc-archive-timeout"><varname>archive_timeout</></link>
+       linkend="guc-archive-timeout"><varname>archive_timeout</varname></link>
        to force transaction log file switches at a given interval (Simon)
       </para>
 
@@ -5229,46 +5229,46 @@
 
      <listitem>
       <para>
-       Add native <link linkend="auth-ldap"><acronym>LDAP</></link>
+       Add native <link linkend="auth-ldap"><acronym>LDAP</acronym></link>
        authentication (Magnus Hagander)
       </para>
 
       <para>
        This is particularly useful for platforms that do not
-       support <acronym>PAM</>, such as Windows.
+       support <acronym>PAM</acronym>, such as Windows.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add <link linkend="sql-grant-description-objects"><literal>GRANT
-       CONNECT ON DATABASE</></link> (Gevik Babakhani)
+       CONNECT ON DATABASE</literal></link> (Gevik Babakhani)
       </para>
 
       <para>
        This gives SQL-level control over database access.  It works as
        an additional filter on top of the existing
-       <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+       <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
        controls.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <link linkend="ssl-tcp"><acronym>SSL</>
-       Certificate Revocation List</link> (<acronym>CRL</>) files
+       Add support for <link linkend="ssl-tcp"><acronym>SSL</acronym>
+       Certificate Revocation List</link> (<acronym>CRL</acronym>) files
        (Libor Hoho&scaron;)
       </para>
 
       <para>
-       The server and <application>libpq</> both recognize <acronym>CRL</>
+       The server and <application>libpq</application> both recognize <acronym>CRL</acronym>
        files now.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <link linkend="GiST"><acronym>GiST</></link> indexes are
+       <link linkend="gist"><acronym>GiST</acronym></link> indexes are
        now clusterable (Teodor)
       </para>
      </listitem>
@@ -5280,7 +5280,7 @@
 
       <para>
        <link
-       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</></link>
+       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</literal></link>
        now shows autovacuum activity.
       </para>
      </listitem>
@@ -5304,7 +5304,7 @@
 
       <para>
        These values now appear in the <link
-       linkend="monitoring-stats-views-table"><literal>pg_stat_*_tables</></link>
+       linkend="monitoring-stats-views-table"><literal>pg_stat_*_tables</literal></link>
        system views.
       </para>
      </listitem>
@@ -5312,44 +5312,44 @@
      <listitem>
       <para>
        Improve performance of statistics monitoring, especially
-       <varname>stats_command_string</>
+       <varname>stats_command_string</varname>
        (Tom, Bruce)
       </para>
 
       <para>
-       This release enables <varname>stats_command_string</> by
+       This release enables <varname>stats_command_string</varname> by
        default, now that its overhead is minimal.  This means
        <link
-       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</></link>
+       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</literal></link>
        will now show all active queries by default.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a <literal>waiting</> column to <link
-       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</></link>
+       Add a <literal>waiting</literal> column to <link
+       linkend="monitoring-stats-views-table"><literal>pg_stat_activity</literal></link>
        (Tom)
       </para>
 
       <para>
-       This allows <structname>pg_stat_activity</> to show all the
-       information included in the <application>ps</> display.
+       This allows <structname>pg_stat_activity</structname> to show all the
+       information included in the <application>ps</application> display.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add configuration parameter <link
-       linkend="guc-update-process-title"><varname>update_process_title</></link>
-       to control whether the <application>ps</> display is updated
+       linkend="guc-update-process-title"><varname>update_process_title</varname></link>
+       to control whether the <application>ps</application> display is updated
        for every command (Bruce)
       </para>
 
       <para>
-       On platforms where it is expensive to update the <application>ps</>
+       On platforms where it is expensive to update the <application>ps</application>
        display, it might be worthwhile to turn this off and rely solely on
-       <structname>pg_stat_activity</> for status information.
+       <structname>pg_stat_activity</structname> for status information.
       </para>
      </listitem>
 
@@ -5361,15 +5361,15 @@
 
       <para>
        For example, you can now set <link
-       linkend="guc-shared-buffers"><varname>shared_buffers</></link>
-       to <literal>32MB</> rather than mentally converting sizes.
+       linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
+       to <literal>32MB</literal> rather than mentally converting sizes.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add support for <link linkend="config-setting">include
-       directives</link> in <filename>postgresql.conf</> (Joachim
+       directives</link> in <filename>postgresql.conf</filename> (Joachim
        Wieland)
       </para>
      </listitem>
@@ -5384,21 +5384,21 @@
        Such logging now shows statement names, bind parameter
        values, and the text of the query being executed.  Also,
        the query text is properly included in logged error messages
-       when enabled by <varname>log_min_error_statement</>.
+       when enabled by <varname>log_min_error_statement</varname>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Prevent <link
-       linkend="guc-max-stack-depth"><varname>max_stack_depth</></link>
+       linkend="guc-max-stack-depth"><varname>max_stack_depth</varname></link>
        from being set to unsafe values
       </para>
 
       <para>
        On platforms where we can determine the actual kernel stack depth
        limit (which is most), make sure that the initial default value of
-       <varname>max_stack_depth</> is safe, and reject attempts to set it
+       <varname>max_stack_depth</varname> is safe, and reject attempts to set it
        to unsafely large values.
       </para>
      </listitem>
@@ -5418,14 +5418,14 @@
 
      <listitem>
       <para>
-       Fix <quote>failed to re-find parent key</> errors in
-       <command>VACUUM</> (Tom)
+       Fix <quote>failed to re-find parent key</quote> errors in
+       <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Clean out <filename>pg_internal.init</> cache files during server
+       Clean out <filename>pg_internal.init</filename> cache files during server
        restart (Simon)
       </para>
 
@@ -5438,7 +5438,7 @@
      <listitem>
       <para>
        Fix race condition for truncation of a large relation across a
-       gigabyte boundary by <command>VACUUM</> (Tom)
+       gigabyte boundary by <command>VACUUM</command> (Tom)
       </para>
      </listitem>
 
@@ -5475,15 +5475,15 @@
 
      <listitem>
       <para>
-       Add <link linkend="SQL-INSERT"><command>INSERT</></link>/<link
-       linkend="SQL-UPDATE"><command>UPDATE</></link>/<link
-       linkend="SQL-DELETE"><command>DELETE</></link>
-       <literal>RETURNING</> (Jonah Harris, Tom)
+       Add <link linkend="sql-insert"><command>INSERT</command></link>/<link
+       linkend="sql-update"><command>UPDATE</command></link>/<link
+       linkend="sql-delete"><command>DELETE</command></link>
+       <literal>RETURNING</literal> (Jonah Harris, Tom)
       </para>
 
       <para>
        This allows these commands to return values, such as the
-       computed serial key for a new row.  In the <command>UPDATE</>
+       computed serial key for a new row.  In the <command>UPDATE</command>
        case, values from the updated version of the row are returned.
       </para>
      </listitem>
@@ -5491,23 +5491,23 @@
      <listitem>
       <para>
        Add support for multiple-row <link
-       linkend="queries-values"><literal>VALUES</></link> clauses,
+       linkend="queries-values"><literal>VALUES</literal></link> clauses,
        per SQL standard (Joe, Tom)
       </para>
 
       <para>
-       This allows <command>INSERT</> to insert multiple rows of
+       This allows <command>INSERT</command> to insert multiple rows of
        constants, or queries to generate result sets using constants.
        For example, <literal>INSERT ...  VALUES (...), (...),
-       ....</>, and <literal>SELECT * FROM (VALUES (...), (...),
-       ....) AS alias(f1, ...)</>.
+       ....</literal>, and <literal>SELECT * FROM (VALUES (...), (...),
+       ....) AS alias(f1, ...)</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-UPDATE"><command>UPDATE</></link>
-       and <link linkend="SQL-DELETE"><command>DELETE</></link>
+       Allow <link linkend="sql-update"><command>UPDATE</command></link>
+       and <link linkend="sql-delete"><command>DELETE</command></link>
        to use an alias for the target table (Atsushi Ogawa)
       </para>
 
@@ -5519,7 +5519,7 @@
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-UPDATE"><command>UPDATE</></link>
+       Allow <link linkend="sql-update"><command>UPDATE</command></link>
        to set multiple columns with a list of values (Susanne
        Ebrecht)
       </para>
@@ -5527,7 +5527,7 @@
       <para>
        This is basically a short-hand for assigning the columns
        and values in pairs.  The syntax is <literal>UPDATE tab
-       SET (<replaceable>column</>, ...) = (<replaceable>val</>, ...)</>.
+       SET (<replaceable>column</replaceable>, ...) = (<replaceable>val</replaceable>, ...)</literal>.
       </para>
      </listitem>
 
@@ -5546,12 +5546,12 @@
 
      <listitem>
       <para>
-       Add <link linkend="SQL-TRUNCATE"><literal>CASCADE</></link>
-       option to <command>TRUNCATE</> (Joachim Wieland)
+       Add <link linkend="sql-truncate"><literal>CASCADE</literal></link>
+       option to <command>TRUNCATE</command> (Joachim Wieland)
       </para>
 
       <para>
-       This causes <command>TRUNCATE</> to automatically include all tables
+       This causes <command>TRUNCATE</command> to automatically include all tables
        that reference the specified table(s) via foreign keys.  While
        convenient, this is a dangerous tool &mdash; use with caution!
       </para>
@@ -5559,8 +5559,8 @@
 
      <listitem>
       <para>
-       Support <literal>FOR UPDATE</> and <literal>FOR SHARE</>
-       in the same <link linkend="SQL-INSERT"><literal>SELECT</></link>
+       Support <literal>FOR UPDATE</literal> and <literal>FOR SHARE</literal>
+       in the same <link linkend="sql-insert"><literal>SELECT</literal></link>
        command (Tom)
       </para>
      </listitem>
@@ -5568,21 +5568,21 @@
      <listitem>
       <para>
        Add <link linkend="functions-comparisons"><literal>IS NOT
-       DISTINCT FROM</></link> (Pavel Stehule)
+       DISTINCT FROM</literal></link> (Pavel Stehule)
       </para>
 
       <para>
-       This operator is similar to equality (<literal>=</>), but
+       This operator is similar to equality (<literal>=</literal>), but
        evaluates to true when both left and right operands are
-       <literal>NULL</>, and to false when just one is, rather than
-       yielding <literal>NULL</> in these cases.
+       <literal>NULL</literal>, and to false when just one is, rather than
+       yielding <literal>NULL</literal> in these cases.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Improve the length output used by <link
-       linkend="queries-union"><literal>UNION</></link>/<literal>INTERSECT</>/<literal>EXCEPT</>
+       linkend="queries-union"><literal>UNION</literal></link>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>
        (Tom)
       </para>
 
@@ -5594,13 +5594,13 @@
 
      <listitem>
       <para>
-       Allow <link linkend="functions-like"><literal>ILIKE</></link>
+       Allow <link linkend="functions-like"><literal>ILIKE</literal></link>
        to work for multi-byte encodings (Tom)
       </para>
 
       <para>
-       Internally, <literal>ILIKE</> now calls <function>lower()</>
-       and then uses <literal>LIKE</>.  Locale-specific regular
+       Internally, <literal>ILIKE</literal> now calls <function>lower()</function>
+       and then uses <literal>LIKE</literal>.  Locale-specific regular
        expression patterns still do not work in these encodings.
       </para>
      </listitem>
@@ -5608,39 +5608,39 @@
      <listitem>
       <para>
        Enable <link
-       linkend="guc-standard-conforming-strings"><varname>standard_conforming_strings</></link>
-       to be turned <literal>on</> (Kevin Grittner)
+       linkend="guc-standard-conforming-strings"><varname>standard_conforming_strings</varname></link>
+       to be turned <literal>on</literal> (Kevin Grittner)
       </para>
 
       <para>
        This allows backslash escaping in strings to be disabled,
-       making <productname>PostgreSQL</> more
-       standards-compliant.  The default is <literal>off</> for backwards
-       compatibility, but future releases will default this to <literal>on</>.
+       making <productname>PostgreSQL</productname> more
+       standards-compliant.  The default is <literal>off</literal> for backwards
+       compatibility, but future releases will default this to <literal>on</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Do not flatten subqueries that contain <literal>volatile</>
+       Do not flatten subqueries that contain <literal>volatile</literal>
        functions in their target lists (Jaime Casanova)
       </para>
 
       <para>
        This prevents surprising behavior due to multiple evaluation
-       of a <literal>volatile</> function (such as <function>random()</>
-       or <function>nextval()</>).  It might cause performance
+       of a <literal>volatile</literal> function (such as <function>random()</function>
+       or <function>nextval()</function>).  It might cause performance
        degradation in the presence of functions that are unnecessarily
-       marked as <literal>volatile</>.
+       marked as <literal>volatile</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add system views <link
-       linkend="view-pg-prepared-statements"><literal>pg_prepared_statements</></link>
+       linkend="view-pg-prepared-statements"><literal>pg_prepared_statements</literal></link>
        and <link
-       linkend="view-pg-cursors"><literal>pg_cursors</></link>
+       linkend="view-pg-cursors"><literal>pg_cursors</literal></link>
        to show prepared statements and open cursors (Joachim Wieland, Neil)
       </para>
 
@@ -5652,32 +5652,32 @@
      <listitem>
       <para>
        Support portal parameters in <link
-       linkend="SQL-EXPLAIN"><command>EXPLAIN</></link> and <link
-       linkend="SQL-EXECUTE"><command>EXECUTE</></link> (Tom)
+       linkend="sql-explain"><command>EXPLAIN</command></link> and <link
+       linkend="sql-execute"><command>EXECUTE</command></link> (Tom)
       </para>
 
       <para>
-       This allows, for example, <acronym>JDBC</> <literal>?</> parameters to
+       This allows, for example, <acronym>JDBC</acronym> <literal>?</literal> parameters to
        work in these commands.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       If <acronym>SQL</>-level <link
-       linkend="SQL-PREPARE"><command>PREPARE</></link> parameters
+       If <acronym>SQL</acronym>-level <link
+       linkend="sql-prepare"><command>PREPARE</command></link> parameters
        are unspecified, infer their types from the content of the
        query (Neil)
       </para>
 
       <para>
-       Protocol-level <command>PREPARE</> already did this.
+       Protocol-level <command>PREPARE</command> already did this.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <literal>LIMIT</> and <literal>OFFSET</> to exceed
+       Allow <literal>LIMIT</literal> and <literal>OFFSET</literal> to exceed
        two billion (Dhanaraj M)
       </para>
      </listitem>
@@ -5692,8 +5692,8 @@
 
      <listitem>
       <para>
-       Add <literal>TABLESPACE</> clause to <link
-       linkend="SQL-CREATETABLEAS"><command>CREATE TABLE AS</></link>
+       Add <literal>TABLESPACE</literal> clause to <link
+       linkend="sql-createtableas"><command>CREATE TABLE AS</command></link>
        (Neil)
       </para>
 
@@ -5704,8 +5704,8 @@
 
      <listitem>
       <para>
-       Add <literal>ON COMMIT</> clause to <link
-       linkend="SQL-CREATETABLEAS"><command>CREATE TABLE AS</></link>
+       Add <literal>ON COMMIT</literal> clause to <link
+       linkend="sql-createtableas"><command>CREATE TABLE AS</command></link>
        (Neil)
       </para>
 
@@ -5718,13 +5718,13 @@
 
      <listitem>
       <para>
-       Add <literal>INCLUDING CONSTRAINTS</> to <link
-       linkend="SQL-CREATETABLE"><command>CREATE TABLE LIKE</></link>
+       Add <literal>INCLUDING CONSTRAINTS</literal> to <link
+       linkend="sql-createtable"><command>CREATE TABLE LIKE</command></link>
        (Greg Stark)
       </para>
 
       <para>
-       This allows easy copying of <literal>CHECK</> constraints to a new
+       This allows easy copying of <literal>CHECK</literal> constraints to a new
        table.
       </para>
      </listitem>
@@ -5732,7 +5732,7 @@
      <listitem>
       <para>
        Allow the creation of placeholder (shell) <link
-       linkend="SQL-CREATETYPE">types</link> (Martijn van Oosterhout)
+       linkend="sql-createtype">types</link> (Martijn van Oosterhout)
       </para>
 
       <para>
@@ -5740,14 +5740,14 @@
        any of the details of the type.  Making a shell type is useful
        because it allows cleaner declaration of the type's input/output
        functions, which must exist before the type can be defined <quote>for
-       real</>.  The syntax is <command>CREATE TYPE <replaceable
-       class="parameter">typename</replaceable></>.
+       real</quote>.  The syntax is <command>CREATE TYPE <replaceable
+       class="parameter">typename</replaceable></command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <link linkend="SQL-CREATEAGGREGATE">Aggregate functions</link>
+       <link linkend="sql-createaggregate">Aggregate functions</link>
        now support multiple input parameters (Sergey Koposov, Tom)
       </para>
      </listitem>
@@ -5755,13 +5755,13 @@
      <listitem>
       <para>
        Add new aggregate creation <link
-       linkend="SQL-CREATEAGGREGATE">syntax</link> (Tom)
+       linkend="sql-createaggregate">syntax</link> (Tom)
       </para>
 
       <para>
        The new syntax is <command>CREATE AGGREGATE
-       <replaceable>aggname</> (<replaceable>input_type</>)
-       (<replaceable>parameter_list</>)</command>.  This more
+       <replaceable>aggname</replaceable> (<replaceable>input_type</replaceable>)
+       (<replaceable>parameter_list</replaceable>)</command>.  This more
        naturally supports the new multi-parameter aggregate
        functionality.  The previous syntax is still supported.
       </para>
@@ -5770,77 +5770,77 @@
      <listitem>
       <para>
        Add <link
-       linkend="SQL-ALTERROLE"><command>ALTER ROLE PASSWORD NULL</></link>
+       linkend="sql-alterrole"><command>ALTER ROLE PASSWORD NULL</command></link>
        to remove a previously set role password (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>DROP</> object <literal>IF EXISTS</> for many
+       Add <command>DROP</command> object <literal>IF EXISTS</literal> for many
        object types (Andrew)
       </para>
 
       <para>
-       This allows <command>DROP</> operations on non-existent
+       This allows <command>DROP</command> operations on non-existent
        objects without generating an error.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-DROP-OWNED"><literal>DROP OWNED</></link>
+       Add <link linkend="sql-drop-owned"><literal>DROP OWNED</literal></link>
        to drop all objects owned by a role (Alvaro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-REASSIGN-OWNED"><literal>REASSIGN
-       OWNED</></link> to reassign ownership of all objects owned
+       Add <link linkend="sql-reassign-owned"><literal>REASSIGN
+       OWNED</literal></link> to reassign ownership of all objects owned
        by a role (Alvaro)
       </para>
 
       <para>
-       This, and <literal>DROP OWNED</> above, facilitate dropping
+       This, and <literal>DROP OWNED</literal> above, facilitate dropping
        roles.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-GRANT"><command>GRANT ON SEQUENCE</></link>
+       Add <link linkend="sql-grant"><command>GRANT ON SEQUENCE</command></link>
        syntax (Bruce)
       </para>
 
       <para>
        This was added for setting sequence-specific permissions.
-       <literal>GRANT ON TABLE</> for sequences is still supported
+       <literal>GRANT ON TABLE</literal> for sequences is still supported
        for backward compatibility.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-GRANT"><literal>USAGE</></link>
-       permission for sequences that allows only <function>currval()</>
-       and <function>nextval()</>, not <function>setval()</>
+       Add <link linkend="sql-grant"><literal>USAGE</literal></link>
+       permission for sequences that allows only <function>currval()</function>
+       and <function>nextval()</function>, not <function>setval()</function>
        (Bruce)
       </para>
 
       <para>
-       <literal>USAGE</> permission allows more fine-grained
-       control over sequence access.  Granting <literal>USAGE</>
+       <literal>USAGE</literal> permission allows more fine-grained
+       control over sequence access.  Granting <literal>USAGE</literal>
        allows users to increment
        a sequence, but prevents them from setting the sequence to
-       an arbitrary value using <function>setval()</>.
+       an arbitrary value using <function>setval()</function>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-ALTERTABLE"><literal>ALTER TABLE
-       [ NO ] INHERIT</></link> (Greg Stark)
+       Add <link linkend="sql-altertable"><literal>ALTER TABLE
+       [ NO ] INHERIT</literal></link> (Greg Stark)
       </para>
 
       <para>
@@ -5852,7 +5852,7 @@
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-COMMENT">comments</link> on global
+       Allow <link linkend="sql-comment">comments</link> on global
        objects to be stored globally (Kris Jurka)
       </para>
 
@@ -5881,8 +5881,8 @@
       </para>
 
       <para>
-       The new syntax is <link linkend="SQL-CREATEINDEX"><command>CREATE
-       INDEX CONCURRENTLY</></link>.  The default behavior is
+       The new syntax is <link linkend="sql-createindex"><command>CREATE
+       INDEX CONCURRENTLY</command></link>.  The default behavior is
        still to block table modification while an index is being
        created.
       </para>
@@ -5902,20 +5902,20 @@
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-COPY"><command>COPY</></link> to
-       dump a <command>SELECT</> query (Zoltan Boszormenyi, Karel
+       Allow <link linkend="sql-copy"><command>COPY</command></link> to
+       dump a <command>SELECT</command> query (Zoltan Boszormenyi, Karel
        Zak)
       </para>
 
       <para>
-       This allows <command>COPY</> to dump arbitrary <acronym>SQL</>
-       queries. The syntax is <literal>COPY (SELECT ...) TO</>.
+       This allows <command>COPY</command> to dump arbitrary <acronym>SQL</acronym>
+       queries. The syntax is <literal>COPY (SELECT ...) TO</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make the <link linkend="SQL-COPY"><command>COPY</></link>
+       Make the <link linkend="sql-copy"><command>COPY</command></link>
        command return a command tag that includes the number of
        rows copied (Volkan YAZICI)
       </para>
@@ -5923,29 +5923,29 @@
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-VACUUM"><command>VACUUM</></link>
+       Allow <link linkend="sql-vacuum"><command>VACUUM</command></link>
        to expire rows without being affected by other concurrent
-       <command>VACUUM</> operations (Hannu Krossing, Alvaro, Tom)
+       <command>VACUUM</command> operations (Hannu Krossing, Alvaro, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <link linkend="APP-INITDB"><application>initdb</></link>
+       Make <link linkend="app-initdb"><application>initdb</application></link>
        detect the operating system locale and set the default
-       <varname>DateStyle</> accordingly (Peter)
+       <varname>DateStyle</varname> accordingly (Peter)
       </para>
 
       <para>
        This makes it more likely that the installed
-       <filename>postgresql.conf</> <varname>DateStyle</> value will
+       <filename>postgresql.conf</filename> <varname>DateStyle</varname> value will
        be as desired.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Reduce number of progress messages displayed by <application>initdb</> (Tom)
+       Reduce number of progress messages displayed by <application>initdb</application> (Tom)
       </para>
      </listitem>
 
@@ -5960,13 +5960,13 @@
      <listitem>
       <para>
        Allow full timezone names in <link
-       linkend="datatype-datetime"><type>timestamp</></link> input values
+       linkend="datatype-datetime"><type>timestamp</type></link> input values
        (Joachim Wieland)
       </para>
 
       <para>
        For example, <literal>'2006-05-24 21:11
-       America/New_York'::timestamptz</>.
+       America/New_York'::timestamptz</literal>.
       </para>
      </listitem>
 
@@ -5978,16 +5978,16 @@
       <para>
        A desired set of timezone abbreviations can be chosen via the
        configuration parameter <link
-       linkend="guc-timezone-abbreviations"><varname>timezone_abbreviations</></link>.
+       linkend="guc-timezone-abbreviations"><varname>timezone_abbreviations</varname></link>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add <link
-       linkend="view-pg-timezone-abbrevs"><varname>pg_timezone_abbrevs</></link>
+       linkend="view-pg-timezone-abbrevs"><varname>pg_timezone_abbrevs</varname></link>
        and <link
-       linkend="view-pg-timezone-names"><varname>pg_timezone_names</></link>
+       linkend="view-pg-timezone-names"><varname>pg_timezone_names</varname></link>
        views to show supported timezones (Magnus Hagander)
       </para>
      </listitem>
@@ -5995,27 +5995,27 @@
      <listitem>
       <para>
        Add <link
-       linkend="functions-datetime-table"><function>clock_timestamp()</></link>,
+       linkend="functions-datetime-table"><function>clock_timestamp()</function></link>,
        <link
-       linkend="functions-datetime-table"><function>statement_timestamp()</></link>,
+       linkend="functions-datetime-table"><function>statement_timestamp()</function></link>,
        and <link
-       linkend="functions-datetime-table"><function>transaction_timestamp()</></link>
+       linkend="functions-datetime-table"><function>transaction_timestamp()</function></link>
        (Bruce)
       </para>
 
       <para>
-       <function>clock_timestamp()</> is the current wall-clock time,
-       <function>statement_timestamp()</> is the time the current
+       <function>clock_timestamp()</function> is the current wall-clock time,
+       <function>statement_timestamp()</function> is the time the current
        statement arrived at the server, and
-       <function>transaction_timestamp()</> is an alias for
-       <function>now()</>.
+       <function>transaction_timestamp()</function> is an alias for
+       <function>now()</function>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Allow <link
-       linkend="functions-formatting"><function>to_char()</></link>
+       linkend="functions-formatting"><function>to_char()</function></link>
        to print localized month and day names (Euler Taveira de
        Oliveira)
       </para>
@@ -6024,23 +6024,23 @@
      <listitem>
       <para>
        Allow <link
-       linkend="functions-formatting"><function>to_char(time)</></link>
+       linkend="functions-formatting"><function>to_char(time)</function></link>
        and <link
-       linkend="functions-formatting"><function>to_char(interval)</></link>
-       to output <acronym>AM</>/<acronym>PM</> specifications
+       linkend="functions-formatting"><function>to_char(interval)</function></link>
+       to output <acronym>AM</acronym>/<acronym>PM</acronym> specifications
        (Bruce)
       </para>
 
       <para>
        Intervals and times are treated as 24-hour periods, e.g.
-       <literal>25 hours</> is considered <acronym>AM</>.
+       <literal>25 hours</literal> is considered <acronym>AM</acronym>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add new function <link
-       linkend="functions-datetime-table"><function>justify_interval()</></link>
+       linkend="functions-datetime-table"><function>justify_interval()</function></link>
        to adjust interval units (Mark Dilger)
       </para>
      </listitem>
@@ -6071,7 +6071,7 @@
 
      <listitem>
       <para>
-       Allow arrays to contain <literal>NULL</> elements (Tom)
+       Allow arrays to contain <literal>NULL</literal> elements (Tom)
       </para>
      </listitem>
 
@@ -6090,13 +6090,13 @@
      <listitem>
       <para>
        New built-in <link linkend="functions-array">operators</link>
-       for array-subset comparisons (<literal>@&gt;</>,
-       <literal>&lt;@</>, <literal>&amp;&amp;</>) (Teodor, Tom)
+       for array-subset comparisons (<literal>@&gt;</literal>,
+       <literal>&lt;@</literal>, <literal>&amp;&amp;</literal>) (Teodor, Tom)
       </para>
 
       <para>
        These operators can be indexed for many data types using
-       <acronym>GiST</> or <acronym>GIN</> indexes.
+       <acronym>GiST</acronym> or <acronym>GIN</acronym> indexes.
       </para>
      </listitem>
 
@@ -6104,15 +6104,15 @@
       <para>
        Add convenient arithmetic <link
        linkend="cidr-inet-operators-table">operations</link> on
-       <type>INET</>/<type>CIDR</> values (Stephen R. van den
+       <type>INET</type>/<type>CIDR</type> values (Stephen R. van den
        Berg)
       </para>
 
       <para>
-       The new operators are <literal>&amp;</> (and), <literal>|</>
-       (or), <literal>~</> (not), <type>inet</> <literal>+</> <type>int8</>,
-       <type>inet</> <literal>-</> <type>int8</>, and
-       <type>inet</> <literal>-</> <type>inet</>.
+       The new operators are <literal>&amp;</literal> (and), <literal>|</literal>
+       (or), <literal>~</literal> (not), <type>inet</type> <literal>+</literal> <type>int8</type>,
+       <type>inet</type> <literal>-</literal> <type>int8</type>, and
+       <type>inet</type> <literal>-</literal> <type>inet</type>.
       </para>
      </listitem>
 
@@ -6124,12 +6124,12 @@
       </para>
 
       <para>
-       The new functions are <function>var_pop()</>,
-       <function>var_samp()</>, <function>stddev_pop()</>, and
-       <function>stddev_samp()</>.  <function>var_samp()</> and
-       <function>stddev_samp()</> are merely renamings of the
-       existing aggregates <function>variance()</> and
-       <function>stddev()</>.  The latter names remain available
+       The new functions are <function>var_pop()</function>,
+       <function>var_samp()</function>, <function>stddev_pop()</function>, and
+       <function>stddev_samp()</function>.  <function>var_samp()</function> and
+       <function>stddev_samp()</function> are merely renamings of the
+       existing aggregates <function>variance()</function> and
+       <function>stddev()</function>.  The latter names remain available
        for backward compatibility.
       </para>
      </listitem>
@@ -6142,19 +6142,19 @@
       </para>
 
       <para>
-       New functions:  <function>regr_intercept()</>,
-       <function>regr_slope()</>, <function>regr_r2()</>,
-       <function>corr()</>, <function>covar_samp()</>,
-       <function>covar_pop()</>, <function>regr_avgx()</>,
-       <function>regr_avgy()</>, <function>regr_sxy()</>,
-       <function>regr_sxx()</>, <function>regr_syy()</>,
-       <function>regr_count()</>.
+       New functions:  <function>regr_intercept()</function>,
+       <function>regr_slope()</function>, <function>regr_r2()</function>,
+       <function>corr()</function>, <function>covar_samp()</function>,
+       <function>covar_pop()</function>, <function>regr_avgx()</function>,
+       <function>regr_avgy()</function>, <function>regr_sxy()</function>,
+       <function>regr_sxx()</function>, <function>regr_syy()</function>,
+       <function>regr_count()</function>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-CREATEDOMAIN">domains</link> to be
+       Allow <link linkend="sql-createdomain">domains</link> to be
        based on other domains (Tom)
       </para>
      </listitem>
@@ -6162,7 +6162,7 @@
      <listitem>
       <para>
        Properly enforce domain <link
-       linkend="ddl-constraints"><literal>CHECK</></link> constraints
+       linkend="ddl-constraints"><literal>CHECK</literal></link> constraints
        everywhere (Neil, Tom)
       </para>
 
@@ -6177,24 +6177,24 @@
      <listitem>
       <para>
        Fix problems with dumping renamed <link
-       linkend="datatype-serial"><type>SERIAL</></link> columns
+       linkend="datatype-serial"><type>SERIAL</type></link> columns
        (Tom)
       </para>
 
       <para>
-       The fix is to dump a <type>SERIAL</> column by explicitly
-       specifying its <literal>DEFAULT</> and sequence elements,
-       and reconstructing the <type>SERIAL</> column on reload
-       using a new <link linkend="SQL-ALTERSEQUENCE"><command>ALTER
-       SEQUENCE OWNED BY</></link> command.  This also allows
-       dropping a <type>SERIAL</> column specification.
+       The fix is to dump a <type>SERIAL</type> column by explicitly
+       specifying its <literal>DEFAULT</literal> and sequence elements,
+       and reconstructing the <type>SERIAL</type> column on reload
+       using a new <link linkend="sql-altersequence"><command>ALTER
+       SEQUENCE OWNED BY</command></link> command.  This also allows
+       dropping a <type>SERIAL</type> column specification.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add a server-side sleep function <link
-       linkend="functions-datetime-delay"><function>pg_sleep()</></link>
+       linkend="functions-datetime-delay"><function>pg_sleep()</function></link>
        (Joachim Wieland)
       </para>
      </listitem>
@@ -6202,7 +6202,7 @@
      <listitem>
       <para>
        Add all comparison operators for the <link
-       linkend="datatype-oid"><type>tid</></link> (tuple id) data
+       linkend="datatype-oid"><type>tid</type></link> (tuple id) data
        type (Mark Kirkwood, Greg Stark, Tom)
       </para>
      </listitem>
@@ -6217,12 +6217,12 @@
 
      <listitem>
       <para>
-       Add <literal>TG_table_name</> and <literal>TG_table_schema</> to
+       Add <literal>TG_table_name</literal> and <literal>TG_table_schema</literal> to
        trigger parameters (Andrew)
       </para>
 
       <para>
-       <literal>TG_relname</> is now deprecated.  Comparable
+       <literal>TG_relname</literal> is now deprecated.  Comparable
        changes have been made in the trigger parameters for the other
        PLs as well.
       </para>
@@ -6230,29 +6230,29 @@
 
      <listitem>
       <para>
-       Allow <literal>FOR</> statements to return values to scalars
+       Allow <literal>FOR</literal> statements to return values to scalars
        as well as records and row types (Pavel Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a <literal>BY</> clause to the <literal>FOR</> loop,
+       Add a <literal>BY</literal> clause to the <literal>FOR</literal> loop,
        to control the iteration increment (Jaime Casanova)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>STRICT</> to <link
+       Add <literal>STRICT</literal> to <link
        linkend="plpgsql-statements-sql-onerow"><command>SELECT
-       INTO</></link> (Matt Miller)
+       INTO</command></link> (Matt Miller)
       </para>
 
       <para>
-       <literal>STRICT</> mode throws an exception if more or less
-       than one row is returned by the <command>SELECT</>, for
-       <productname>Oracle PL/SQL</> compatibility.
+       <literal>STRICT</literal> mode throws an exception if more or less
+       than one row is returned by the <command>SELECT</command>, for
+       <productname>Oracle PL/SQL</productname> compatibility.
       </para>
      </listitem>
 
@@ -6266,7 +6266,7 @@
 
      <listitem>
       <para>
-       Add <literal>table_name</> and <literal>table_schema</> to
+       Add <literal>table_name</literal> and <literal>table_schema</literal> to
        trigger parameters (Adam Sj&oslash;gren)
       </para>
      </listitem>
@@ -6279,7 +6279,7 @@
 
      <listitem>
       <para>
-       Make <literal>$_TD</> trigger data a global variable (Andrew)
+       Make <literal>$_TD</literal> trigger data a global variable (Andrew)
       </para>
 
       <para>
@@ -6312,13 +6312,13 @@
      <listitem>
       <para>
        Named parameters are passed as ordinary variables, as well as in the
-       <literal>args[]</> array (Sven Suursoho)
+       <literal>args[]</literal> array (Sven Suursoho)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>table_name</> and <literal>table_schema</> to
+       Add <literal>table_name</literal> and <literal>table_schema</literal> to
        trigger parameters (Andrew)
       </para>
      </listitem>
@@ -6331,14 +6331,14 @@
 
      <listitem>
       <para>
-       Return result-set as <literal>list</>, <literal>iterator</>,
-       or <literal>generator </>(Sven Suursoho)
+       Return result-set as <literal>list</literal>, <literal>iterator</literal>,
+       or <literal>generator </literal>(Sven Suursoho)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow functions to return <literal>void</> (Neil)
+       Allow functions to return <literal>void</literal> (Neil)
       </para>
      </listitem>
 
@@ -6353,40 +6353,40 @@
    </sect3>
 
    <sect3>
-    <title><link linkend="APP-PSQL"><application>psql</></link> Changes</title>
+    <title><link linkend="app-psql"><application>psql</application></link> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Add new command <literal>\password</> for changing role
+       Add new command <literal>\password</literal> for changing role
        password with client-side password encryption (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <literal>\c</> to connect to a new host and port
+       Allow <literal>\c</literal> to connect to a new host and port
        number (David, Volkan YAZICI)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add tablespace display to <literal>\l+</> (Philip Yarra)
+       Add tablespace display to <literal>\l+</literal> (Philip Yarra)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve <literal>\df</> slash command to include the argument
-       names and modes (<literal>OUT</> or <literal>INOUT</>) of
+       Improve <literal>\df</literal> slash command to include the argument
+       names and modes (<literal>OUT</literal> or <literal>INOUT</literal>) of
        the function (David Fetter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support binary <command>COPY</> (Andreas Pflug)
+       Support binary <command>COPY</command> (Andreas Pflug)
       </para>
      </listitem>
 
@@ -6397,21 +6397,21 @@
       </para>
 
       <para>
-       Use option <literal>-1</> or <literal>--single-transaction</>.
+       Use option <literal>-1</literal> or <literal>--single-transaction</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support for automatically retrieving <command>SELECT</>
+       Support for automatically retrieving <command>SELECT</command>
        results in batches using a cursor (Chris Mair)
       </para>
 
       <para>
        This is enabled using <command>\set FETCH_COUNT
-       <replaceable>n</></command>. This
+       <replaceable>n</replaceable></command>. This
        feature allows large result sets to be retrieved in
-       <application>psql</> without attempting to buffer the entire
+       <application>psql</application> without attempting to buffer the entire
        result set in memory.
       </para>
      </listitem>
@@ -6451,8 +6451,8 @@
      <listitem>
       <para>
        Report both the returned data and the command status tag
-       for <command>INSERT</>/<command>UPDATE</>/<command>DELETE
-       RETURNING</> (Tom)
+       for <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE
+       RETURNING</command> (Tom)
       </para>
      </listitem>
 
@@ -6461,31 +6461,31 @@
    </sect3>
 
    <sect3>
-    <title><link linkend="APP-PGDUMP"><application>pg_dump</></link> Changes</title>
+    <title><link linkend="app-pgdump"><application>pg_dump</application></link> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
        Allow complex selection of objects to be included or excluded
-       by <application>pg_dump</> (Greg Sabino Mullane)
+       by <application>pg_dump</application> (Greg Sabino Mullane)
       </para>
 
       <para>
-       <application>pg_dump</> now supports multiple <literal>-n</>
-       (schema) and <literal>-t</> (table) options, and adds
-       <literal>-N</> and <literal>-T</> options to exclude objects.
+       <application>pg_dump</application> now supports multiple <literal>-n</literal>
+       (schema) and <literal>-t</literal> (table) options, and adds
+       <literal>-N</literal> and <literal>-T</literal> options to exclude objects.
        Also, the arguments of these switches can now be wild-card expressions
        rather than single object names, for example
-       <literal>-t 'foo*'</>, and a schema can be part of
-       a <literal>-t</> or <literal>-T</> switch, for example
-       <literal>-t schema1.table1</>.
+       <literal>-t 'foo*'</literal>, and a schema can be part of
+       a <literal>-t</literal> or <literal>-T</literal> switch, for example
+       <literal>-t schema1.table1</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="APP-PGRESTORE"><application>pg_restore</></link>
-       <literal>--no-data-for-failed-tables</> option to suppress
+       Add <link linkend="app-pgrestore"><application>pg_restore</application></link>
+       <literal>--no-data-for-failed-tables</literal> option to suppress
        loading data if table creation failed (i.e., the table already
        exists) (Martin Pitt)
       </para>
@@ -6493,13 +6493,13 @@
 
      <listitem>
       <para>
-       Add <link linkend="APP-PGRESTORE"><application>pg_restore</></link>
+       Add <link linkend="app-pgrestore"><application>pg_restore</application></link>
        option to run the entire session in a single transaction
        (Simon)
       </para>
 
       <para>
-       Use option <literal>-1</> or <literal>--single-transaction</>.
+       Use option <literal>-1</literal> or <literal>--single-transaction</literal>.
       </para>
      </listitem>
 
@@ -6508,27 +6508,27 @@
    </sect3>
 
    <sect3>
-    <title><link linkend="libpq"><application>libpq</></link> Changes</title>
+    <title><link linkend="libpq"><application>libpq</application></link> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
        Add <link
-       linkend="libpq-misc"><function>PQencryptPassword()</></link>
+       linkend="libpq-misc"><function>PQencryptPassword()</function></link>
        to encrypt passwords (Tom)
       </para>
 
       <para>
        This allows passwords to be sent pre-encrypted for commands
-       like <link linkend="SQL-ALTERROLE"><command>ALTER ROLE ...
-       PASSWORD</></link>.
+       like <link linkend="sql-alterrole"><command>ALTER ROLE ...
+       PASSWORD</command></link>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add function <link
-       linkend="libpq-threading"><function>PQisthreadsafe()</></link>
+       linkend="libpq-threading"><function>PQisthreadsafe()</function></link>
        (Bruce)
       </para>
 
@@ -6541,9 +6541,9 @@
      <listitem>
       <para>
        Add <link
-       linkend="libpq-exec-main"><function>PQdescribePrepared()</></link>,
+       linkend="libpq-exec-main"><function>PQdescribePrepared()</function></link>,
        <link
-       linkend="libpq-exec-main"><function>PQdescribePortal()</></link>,
+       linkend="libpq-exec-main"><function>PQdescribePortal()</function></link>,
        and related functions to return information about previously
        prepared statements and open cursors (Volkan YAZICI)
       </para>
@@ -6551,9 +6551,9 @@
 
      <listitem>
       <para>
-       Allow <link linkend="libpq-ldap"><acronym>LDAP</></link> lookups
+       Allow <link linkend="libpq-ldap"><acronym>LDAP</acronym></link> lookups
        from <link
-       linkend="libpq-pgservice"><filename>pg_service.conf</></link>
+       linkend="libpq-pgservice"><filename>pg_service.conf</filename></link>
        (Laurenz Albe)
       </para>
      </listitem>
@@ -6561,7 +6561,7 @@
      <listitem>
       <para>
        Allow a hostname in <link
-       linkend="libpq-pgpass"><filename>~/.pgpass</></link>
+       linkend="libpq-pgpass"><filename>~/.pgpass</filename></link>
        to match the default socket directory (Bruce)
       </para>
 
@@ -6577,19 +6577,19 @@
    </sect3>
 
    <sect3>
-    <title><link linkend="ecpg"><application>ecpg</></link> Changes</title>
+    <title><link linkend="ecpg"><application>ecpg</application></link> Changes</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow <link linkend="SQL-SHOW"><command>SHOW</></link> to
+       Allow <link linkend="sql-show"><command>SHOW</command></link> to
        put its result into a variable (Joachim Wieland)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <link linkend="SQL-COPY"><command>COPY TO STDOUT</></link>
+       Add <link linkend="sql-copy"><command>COPY TO STDOUT</command></link>
        (Joachim Wieland)
       </para>
      </listitem>
@@ -6611,28 +6611,28 @@
    </sect3>
 
    <sect3>
-    <title><application>Windows</> Port</title>
+    <title><application>Windows</application> Port</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow <acronym>MSVC</> to compile the <productname>PostgreSQL</>
+       Allow <acronym>MSVC</acronym> to compile the <productname>PostgreSQL</productname>
        server (Magnus, Hiroshi Saito)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <acronym>MSVC</> support for utility commands and <link
-       linkend="APP-PGDUMP"><application>pg_dump</></link> (Hiroshi
+       Add <acronym>MSVC</acronym> support for utility commands and <link
+       linkend="app-pgdump"><application>pg_dump</application></link> (Hiroshi
        Saito)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for Windows code pages <literal>1253</>,
-       <literal>1254</>, <literal>1255</>, and <literal>1257</>
+       Add support for Windows code pages <literal>1253</literal>,
+       <literal>1254</literal>, <literal>1255</literal>, and <literal>1257</literal>
        (Kris Jurka)
       </para>
      </listitem>
@@ -6670,7 +6670,7 @@
 
      <listitem>
       <para>
-       Add <link linkend="GIN"><acronym>GIN</></link> (Generalized
+       Add <link linkend="gin"><acronym>GIN</acronym></link> (Generalized
        Inverted iNdex) index access method (Teodor, Oleg)
       </para>
      </listitem>
@@ -6682,7 +6682,7 @@
 
       <para>
        Rtree has been re-implemented using <link
-       linkend="GiST"><acronym>GiST</></link>. Among other
+       linkend="gist"><acronym>GiST</acronym></link>. Among other
        differences, this means that rtree indexes now have support
        for crash recovery via write-ahead logging (WAL).
       </para>
@@ -6698,12 +6698,12 @@
      <listitem>
       <para>
        Add a configure flag to allow libedit to be preferred over
-       <acronym>GNU</> readline (Bruce)
+       <acronym>GNU</acronym> readline (Bruce)
       </para>
 
       <para>
        Use configure <link
-       linkend="configure"><literal>--with-libedit-preferred</></link>.
+       linkend="configure"><literal>--with-libedit-preferred</literal></link>.
       </para>
      </listitem>
 
@@ -6722,21 +6722,21 @@
 
      <listitem>
       <para>
-       Add support for <productname>Solaris x86_64</> using the
-       <productname>Solaris</> compiler (Pierre Girard, Theo
+       Add support for <productname>Solaris x86_64</productname> using the
+       <productname>Solaris</productname> compiler (Pierre Girard, Theo
        Schlossnagle, Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <application>DTrace</> support (Robert Lor)
+       Add <application>DTrace</application> support (Robert Lor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>PG_VERSION_NUM</> for use by third-party
+       Add <literal>PG_VERSION_NUM</literal> for use by third-party
        applications wanting to test the backend version in C using &gt;
        and &lt; comparisons (Bruce)
       </para>
@@ -6744,37 +6744,37 @@
 
      <listitem>
       <para>
-       Add <literal>XLOG_BLCKSZ</> as independent from <literal>BLCKSZ</>
+       Add <literal>XLOG_BLCKSZ</literal> as independent from <literal>BLCKSZ</literal>
        (Mark Wong)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>LWLOCK_STATS</> define to report locking
+       Add <literal>LWLOCK_STATS</literal> define to report locking
        activity (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Emit warnings for unknown <application>configure</> options
+       Emit warnings for unknown <application>configure</application> options
        (Martijn van Oosterhout)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add server support for <quote>plugin</> libraries
+       Add server support for <quote>plugin</quote> libraries
        that can be used for add-on tasks such as debugging and performance
        measurement (Korry Douglas)
       </para>
 
       <para>
        This consists of two features: a table of <quote>rendezvous
-       variables</> that allows separately-loaded shared libraries to
+       variables</quote> that allows separately-loaded shared libraries to
        communicate, and a new configuration parameter <link
-       linkend="guc-local-preload-libraries"><varname>local_preload_libraries</></link>
+       linkend="guc-local-preload-libraries"><varname>local_preload_libraries</varname></link>
        that allows libraries to be loaded into specific sessions without
        explicit cooperation from the client application.  This allows
        external add-ons to implement features such as a PL/pgSQL debugger.
@@ -6784,27 +6784,27 @@
      <listitem>
       <para>
        Rename existing configuration parameter
-       <varname>preload_libraries</> to <link
-       linkend="guc-shared-preload-libraries"><varname>shared_preload_libraries</></link>
+       <varname>preload_libraries</varname> to <link
+       linkend="guc-shared-preload-libraries"><varname>shared_preload_libraries</varname></link>
        (Tom)
       </para>
 
       <para>
        This was done for clarity in comparison to
-       <varname>local_preload_libraries</>.
+       <varname>local_preload_libraries</varname>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add new configuration parameter <link
-       linkend="guc-server-version-num"><varname>server_version_num</></link>
+       linkend="guc-server-version-num"><varname>server_version_num</varname></link>
        (Greg Sabino Mullane)
       </para>
 
       <para>
        This is like <varname>server_version</varname>, but is an
-       integer, e.g.  <literal>80200</>. This allows applications to
+       integer, e.g.  <literal>80200</literal>. This allows applications to
        make version checks more easily.
       </para>
      </listitem>
@@ -6812,7 +6812,7 @@
      <listitem>
       <para>
        Add a configuration parameter <link
-       linkend="guc-seq-page-cost"><varname>seq_page_cost</></link>
+       linkend="guc-seq-page-cost"><varname>seq_page_cost</varname></link>
        (Tom)
       </para>
      </listitem>
@@ -6839,11 +6839,11 @@
 
       <para>
        New <link linkend="xfunc-c-dynload">functions</link>
-       <function>_PG_init()</> and <function>_PG_fini()</> are
+       <function>_PG_init()</function> and <function>_PG_fini()</function> are
        called if the library defines such symbols.  Hence we no
        longer need to specify an initialization function in
-       <varname>shared_preload_libraries</>; we can assume that
-       the library used the <function>_PG_init()</> convention
+       <varname>shared_preload_libraries</varname>; we can assume that
+       the library used the <function>_PG_init()</function> convention
        instead.
       </para>
      </listitem>
@@ -6851,7 +6851,7 @@
      <listitem>
       <para>
        Add <link
-       linkend="xfunc-c-dynload"><literal>PG_MODULE_MAGIC</></link>
+       linkend="xfunc-c-dynload"><literal>PG_MODULE_MAGIC</literal></link>
        header block to all shared object files (Martijn van
        Oosterhout)
       </para>
@@ -6870,7 +6870,7 @@
 
      <listitem>
       <para>
-       New <link linkend="datatype-xml"><acronym>XML</></link>
+       New <link linkend="datatype-xml"><acronym>XML</acronym></link>
        documentation section (Bruce)
       </para>
      </listitem>
@@ -6892,7 +6892,7 @@
 
        <listitem>
         <para>
-         multibyte encoding support, including <acronym>UTF8</>
+         multibyte encoding support, including <acronym>UTF8</acronym>
         </para>
        </listitem>
        <listitem>
@@ -6912,13 +6912,13 @@
        </listitem>
        <listitem>
         <para>
-         Ispell dictionaries now recognize <application>MySpell</>
-         format, used by <application>OpenOffice</>
+         Ispell dictionaries now recognize <application>MySpell</application>
+         format, used by <application>OpenOffice</application>
         </para>
        </listitem>
        <listitem>
         <para>
-         <acronym>GIN</> support
+         <acronym>GIN</acronym> support
         </para>
        </listitem>
 
@@ -6928,13 +6928,13 @@
 
      <listitem>
       <para>
-       Add adminpack module containing <application>Pgadmin</> administration
+       Add adminpack module containing <application>Pgadmin</application> administration
        functions (Dave)
       </para>
 
       <para>
        These functions provide additional file system access
-       routines not present in the default <productname>PostgreSQL</>
+       routines not present in the default <productname>PostgreSQL</productname>
        server.
       </para>
      </listitem>
@@ -6945,7 +6945,7 @@
       </para>
 
       <para>
-       Reports information about the current connection's <acronym>SSL</>
+       Reports information about the current connection's <acronym>SSL</acronym>
        certificate.
       </para>
      </listitem>
@@ -6972,9 +6972,9 @@
       </para>
 
       <para>
-       This new implementation supports <acronym>EAN13</>, <acronym>UPC</>,
-       <acronym>ISBN</> (books), <acronym>ISMN</> (music), and
-       <acronym>ISSN</> (serials).
+       This new implementation supports <acronym>EAN13</acronym>, <acronym>UPC</acronym>,
+       <acronym>ISBN</acronym> (books), <acronym>ISMN</acronym> (music), and
+       <acronym>ISSN</acronym> (serials).
       </para>
      </listitem>
 
@@ -7034,9 +7034,9 @@
       </para>
 
       <para>
-       New functions are <function>cube(float[])</>,
-       <function>cube(float[], float[])</>, and
-       <function>cube_subset(cube, int4[])</>.
+       New functions are <function>cube(float[])</function>,
+       <function>cube(float[], float[])</function>, and
+       <function>cube_subset(cube, int4[])</function>.
       </para>
      </listitem>
 
@@ -7049,8 +7049,8 @@
 
      <listitem>
       <para>
-       New operators for array-subset comparisons (<literal>@&gt;</>,
-       <literal>&lt;@</>, <literal>&amp;&amp;</>) (Tom)
+       New operators for array-subset comparisons (<literal>@&gt;</literal>,
+       <literal>&lt;@</literal>, <literal>&amp;&amp;</literal>) (Tom)
       </para>
 
       <para>
diff --git a/doc/src/sgml/release-8.3.sgml b/doc/src/sgml/release-8.3.sgml
index a82410d057..2e10bc4982 100644
--- a/doc/src/sgml/release-8.3.sgml
+++ b/doc/src/sgml/release-8.3.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 8.3.22.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 8.3.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -30,7 +30,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -42,7 +42,7 @@
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -63,19 +63,19 @@
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -86,13 +86,13 @@
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -110,26 +110,26 @@
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
@@ -149,15 +149,15 @@
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -181,11 +181,11 @@
   <para>
    This release contains a variety of fixes from 8.3.21.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.3.X release series in February 2013.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -199,7 +199,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -212,13 +212,13 @@
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane)
      </para>
 
      <para>
-      Fix <command>CREATE INDEX CONCURRENTLY</> to use
+      Fix <command>CREATE INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       resulting in corrupt concurrently-created indexes.
      </para>
@@ -226,8 +226,8 @@
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
@@ -249,8 +249,8 @@
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
      </para>
     </listitem>
 
@@ -268,10 +268,10 @@
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -279,7 +279,7 @@
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
@@ -292,14 +292,14 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -313,7 +313,7 @@
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -321,7 +321,7 @@
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -349,7 +349,7 @@
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -362,8 +362,8 @@
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -373,33 +373,33 @@
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -410,41 +410,41 @@
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -455,7 +455,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -477,11 +477,11 @@
   <para>
    This release contains a variety of fixes from 8.3.20.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.3.X release series in February 2013.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -495,7 +495,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -524,22 +524,22 @@
      </para>
 
      <para>
-      If we revoke a grant option from some role <replaceable>X</>, but
-      <replaceable>X</> still holds that option via a grant from someone
+      If we revoke a grant option from some role <replaceable>X</replaceable>, but
+      <replaceable>X</replaceable> still holds that option via a grant from someone
       else, we should not recursively revoke the corresponding privilege
-      from role(s) <replaceable>Y</> that <replaceable>X</> had granted it
+      from role(s) <replaceable>Y</replaceable> that <replaceable>X</replaceable> had granted it
       to.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>SIGFPE</> when PL/Perl is in use (Andres Freund)
+      Fix handling of <literal>SIGFPE</literal> when PL/Perl is in use (Andres Freund)
      </para>
 
      <para>
-      Perl resets the process's <literal>SIGFPE</> handler to
-      <literal>SIG_IGN</>, which could result in crashes later on.  Restore
+      Perl resets the process's <literal>SIGFPE</literal> handler to
+      <literal>SIG_IGN</literal>, which could result in crashes later on.  Restore
       the normal Postgres signal handler after initializing PL/Perl.
      </para>
     </listitem>
@@ -558,7 +558,7 @@
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -566,7 +566,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -587,11 +587,11 @@
   <para>
    This release contains a variety of fixes from 8.3.19.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.3.X release series in February 2013.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -605,7 +605,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -622,7 +622,7 @@
      </para>
 
      <para>
-      <function>xml_parse()</> would attempt to fetch external files or
+      <function>xml_parse()</function> would attempt to fetch external files or
       URLs as needed to resolve DTD and entity references in an XML value,
       thus allowing unprivileged database users to attempt to fetch data
       with the privileges of the database server.  While the external data
@@ -635,22 +635,22 @@
 
     <listitem>
      <para>
-      Prevent access to external files/URLs via <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Peter Eisentraut)
+      Prevent access to external files/URLs via <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Peter Eisentraut)
      </para>
 
      <para>
-      <application>libxslt</> offers the ability to read and write both
+      <application>libxslt</application> offers the ability to read and write both
       files and URLs through stylesheet commands, thus allowing
       unprivileged database users to both read and write data with the
       privileges of the database server.  Disable that through proper use
-      of <application>libxslt</>'s security options.  (CVE-2012-3488)
+      of <application>libxslt</application>'s security options.  (CVE-2012-3488)
      </para>
 
      <para>
-      Also, remove <function>xslt_process()</>'s ability to fetch documents
+      Also, remove <function>xslt_process()</function>'s ability to fetch documents
       and stylesheets from external files/URLs.  While this was a
-      documented <quote>feature</>, it was long regarded as a bad idea.
+      documented <quote>feature</quote>, it was long regarded as a bad idea.
       The fix for CVE-2012-3489 broke that capability, and rather than
       expend effort on trying to fix it, we're just going to summarily
       remove it.
@@ -678,22 +678,22 @@
      </para>
 
      <para>
-      If <command>ALTER SEQUENCE</> was executed on a freshly created or
-      reset sequence, and then precisely one <function>nextval()</> call
+      If <command>ALTER SEQUENCE</command> was executed on a freshly created or
+      reset sequence, and then precisely one <function>nextval()</function> call
       was made on it, and then the server crashed, WAL replay would restore
       the sequence to a state in which it appeared that no
-      <function>nextval()</> had been done, thus allowing the first
+      <function>nextval()</function> had been done, thus allowing the first
       sequence value to be returned again by the next
-      <function>nextval()</> call.  In particular this could manifest for
-      <type>serial</> columns, since creation of a serial column's sequence
-      includes an <command>ALTER SEQUENCE OWNED BY</> step.
+      <function>nextval()</function> call.  In particular this could manifest for
+      <type>serial</type> columns, since creation of a serial column's sequence
+      includes an <command>ALTER SEQUENCE OWNED BY</command> step.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure the <filename>backup_label</> file is fsync'd after
-      <function>pg_start_backup()</> (Dave Kerr)
+      Ensure the <filename>backup_label</filename> file is fsync'd after
+      <function>pg_start_backup()</function> (Dave Kerr)
      </para>
     </listitem>
 
@@ -718,7 +718,7 @@
      <para>
       The original coding could allow inconsistent behavior in some cases;
       in particular, an autovacuum could get canceled after less than
-      <literal>deadlock_timeout</> grace period.
+      <literal>deadlock_timeout</literal> grace period.
      </para>
     </listitem>
 
@@ -730,7 +730,7 @@
 
     <listitem>
      <para>
-      Fix log collector so that <literal>log_truncate_on_rotation</> works
+      Fix log collector so that <literal>log_truncate_on_rotation</literal> works
       during the very first log rotation after server start (Tom Lane)
      </para>
     </listitem>
@@ -738,24 +738,24 @@
     <listitem>
      <para>
       Ensure that a whole-row reference to a subquery doesn't include any
-      extra <literal>GROUP BY</> or <literal>ORDER BY</> columns (Tom Lane)
+      extra <literal>GROUP BY</literal> or <literal>ORDER BY</literal> columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow copying whole-row references in <literal>CHECK</>
-      constraints and index definitions during <command>CREATE TABLE</>
+      Disallow copying whole-row references in <literal>CHECK</literal>
+      constraints and index definitions during <command>CREATE TABLE</command>
       (Tom Lane)
      </para>
 
      <para>
-      This situation can arise in <command>CREATE TABLE</> with
-      <literal>LIKE</> or <literal>INHERITS</>.  The copied whole-row
+      This situation can arise in <command>CREATE TABLE</command> with
+      <literal>LIKE</literal> or <literal>INHERITS</literal>.  The copied whole-row
       variable was incorrectly labeled with the row type of the original
       table not the new one.  Rejecting the case seems reasonable for
-      <literal>LIKE</>, since the row types might well diverge later.  For
-      <literal>INHERITS</> we should ideally allow it, with an implicit
+      <literal>LIKE</literal>, since the row types might well diverge later.  For
+      <literal>INHERITS</literal> we should ideally allow it, with an implicit
       coercion to the parent table's row type; but that will require more
       work than seems safe to back-patch.
      </para>
@@ -763,7 +763,7 @@
 
     <listitem>
      <para>
-      Fix memory leak in <literal>ARRAY(SELECT ...)</> subqueries (Heikki
+      Fix memory leak in <literal>ARRAY(SELECT ...)</literal> subqueries (Heikki
       Linnakangas, Tom Lane)
      </para>
     </listitem>
@@ -775,21 +775,21 @@
 
      <para>
       The code could get confused by quantified parenthesized
-      subexpressions, such as <literal>^(foo)?bar</>.  This would lead to
+      subexpressions, such as <literal>^(foo)?bar</literal>.  This would lead to
       incorrect index optimization of searches for such patterns.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report errors properly in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Tom Lane)
+      Report errors properly in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012e
+      Update time zone data files to <application>tzdata</application> release 2012e
       for DST law changes in Morocco and Tokelau
      </para>
     </listitem>
@@ -810,7 +810,7 @@
   <para>
    This release contains a variety of fixes from 8.3.18.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -822,7 +822,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -835,12 +835,12 @@
     <listitem>
      <para>
       Fix incorrect password transformation in
-      <filename>contrib/pgcrypto</>'s DES <function>crypt()</> function
+      <filename>contrib/pgcrypto</filename>'s DES <function>crypt()</function> function
       (Solar Designer)
      </para>
 
      <para>
-      If a password string contained the byte value <literal>0x80</>, the
+      If a password string contained the byte value <literal>0x80</literal>, the
       remainder of the password was ignored, causing the password to be much
       weaker than it appeared.  With this fix, the rest of the string is
       properly included in the DES hash.  Any stored password values that are
@@ -851,7 +851,7 @@
 
     <listitem>
      <para>
-      Ignore <literal>SECURITY DEFINER</> and <literal>SET</> attributes for
+      Ignore <literal>SECURITY DEFINER</literal> and <literal>SET</literal> attributes for
       a procedural language's call handler (Tom Lane)
      </para>
 
@@ -863,7 +863,7 @@
 
     <listitem>
      <para>
-      Allow numeric timezone offsets in <type>timestamp</> input to be up to
+      Allow numeric timezone offsets in <type>timestamp</type> input to be up to
       16 hours away from UTC (Tom Lane)
      </para>
 
@@ -889,7 +889,7 @@
 
     <listitem>
      <para>
-      Fix <type>text</> to <type>name</> and <type>char</> to <type>name</>
+      Fix <type>text</type> to <type>name</type> and <type>char</type> to <type>name</type>
       casts to perform string truncation correctly in multibyte encodings
       (Karl Schnaitter)
      </para>
@@ -897,19 +897,19 @@
 
     <listitem>
      <para>
-      Fix memory copying bug in <function>to_tsquery()</> (Heikki Linnakangas)
+      Fix memory copying bug in <function>to_tsquery()</function> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow session startup when <structname>pg_attribute</> is very large
+      Fix slow session startup when <structname>pg_attribute</structname> is very large
       (Tom Lane)
      </para>
 
      <para>
-      If <structname>pg_attribute</> exceeds one-fourth of
-      <varname>shared_buffers</>, cache rebuilding code that is sometimes
+      If <structname>pg_attribute</structname> exceeds one-fourth of
+      <varname>shared_buffers</varname>, cache rebuilding code that is sometimes
       needed during session start would trigger the synchronized-scan logic,
       causing it to take many times longer than normal.  The problem was
       particularly acute if many new sessions were starting at once.
@@ -930,8 +930,8 @@
 
     <listitem>
      <para>
-      Ensure the Windows implementation of <function>PGSemaphoreLock()</>
-      clears <varname>ImmediateInterruptOK</> before returning (Tom Lane)
+      Ensure the Windows implementation of <function>PGSemaphoreLock()</function>
+      clears <varname>ImmediateInterruptOK</varname> before returning (Tom Lane)
      </para>
 
      <para>
@@ -964,7 +964,7 @@
 
      <para>
       Previously, infinite recursion in a function invoked by
-      auto-<command>ANALYZE</> could crash worker processes.
+      auto-<command>ANALYZE</command> could crash worker processes.
      </para>
     </listitem>
 
@@ -983,25 +983,25 @@
     <listitem>
      <para>
       Fix logging collector to ensure it will restart file rotation
-      after receiving <systemitem>SIGHUP</> (Tom Lane)
+      after receiving <systemitem>SIGHUP</systemitem> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL's <command>GET DIAGNOSTICS</> command when the target
+      Fix PL/pgSQL's <command>GET DIAGNOSTICS</command> command when the target
       is the function's first variable (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several performance problems in <application>pg_dump</> when
+      Fix several performance problems in <application>pg_dump</application> when
       the database contains many objects (Jeff Janes, Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> could get very slow if the database contained
+      <application>pg_dump</application> could get very slow if the database contained
       many schemas, or if many objects are in dependency loops, or if there
       are many owned sequences.
      </para>
@@ -1009,14 +1009,14 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s <function>dblink_exec()</> to not leak
+      Fix <filename>contrib/dblink</filename>'s <function>dblink_exec()</function> to not leak
       temporary database connections upon error (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012c
+      Update time zone data files to <application>tzdata</application> release 2012c
       for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland
       Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
       also historical corrections for Canada.
@@ -1039,7 +1039,7 @@
   <para>
    This release contains a variety of fixes from 8.3.17.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -1051,7 +1051,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.3.17,
-    see <xref linkend="release-8-3-17">.
+    see <xref linkend="release-8-3-17"/>.
    </para>
 
   </sect2>
@@ -1064,26 +1064,26 @@
     <listitem>
      <para>
       Require execute permission on the trigger function for
-      <command>CREATE TRIGGER</> (Robert Haas)
+      <command>CREATE TRIGGER</command> (Robert Haas)
      </para>
 
      <para>
       This missing check could allow another user to execute a trigger
       function with forged input data, by installing it on a table he owns.
       This is only of significance for trigger functions marked
-      <literal>SECURITY DEFINER</>, since otherwise trigger functions run
+      <literal>SECURITY DEFINER</literal>, since otherwise trigger functions run
       as the table owner anyway.  (CVE-2012-0866)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Convert newlines to spaces in names written in <application>pg_dump</>
+      Convert newlines to spaces in names written in <application>pg_dump</application>
       comments (Robert Haas)
      </para>
 
      <para>
-      <application>pg_dump</> was incautious about sanitizing object names
+      <application>pg_dump</application> was incautious about sanitizing object names
       that are emitted within SQL comments in its output script.  A name
       containing a newline would at least render the script syntactically
       incorrect.  Maliciously crafted object names could present a SQL
@@ -1099,10 +1099,10 @@
 
      <para>
       An index page split caused by an insertion could sometimes cause a
-      concurrently-running <command>VACUUM</> to miss removing index entries
+      concurrently-running <command>VACUUM</command> to miss removing index entries
       that it should remove.  After the corresponding table rows are removed,
       the dangling index entries would cause errors (such as <quote>could not
-      read block N in file ...</>) or worse, silently wrong query results
+      read block N in file ...</quote>) or worse, silently wrong query results
       after unrelated rows are re-inserted at the now-free table locations.
       This bug has been present since release 8.2, but occurs so infrequently
       that it was not diagnosed until now.  If you have reason to suspect
@@ -1114,16 +1114,16 @@
     <listitem>
      <para>
       Allow non-existent values for some settings in <command>ALTER
-      USER/DATABASE SET</> (Heikki Linnakangas)
+      USER/DATABASE SET</command> (Heikki Linnakangas)
      </para>
 
      <para>
-      Allow <varname>default_text_search_config</>,
-      <varname>default_tablespace</>, and <varname>temp_tablespaces</> to be
+      Allow <varname>default_text_search_config</varname>,
+      <varname>default_tablespace</varname>, and <varname>temp_tablespaces</varname> to be
       set to names that are not known.  This is because they might be known
       in another database where the setting is intended to be used, or for the
       tablespace cases because the tablespace might not be created yet.  The
-      same issue was previously recognized for <varname>search_path</>, and
+      same issue was previously recognized for <varname>search_path</varname>, and
       these settings now act like that one.
      </para>
     </listitem>
@@ -1145,7 +1145,7 @@
 
     <listitem>
      <para>
-      Fix regular expression back-references with <literal>*</> attached
+      Fix regular expression back-references with <literal>*</literal> attached
       (Tom Lane)
      </para>
 
@@ -1159,18 +1159,18 @@
       A similar problem still afflicts back-references that are embedded in a
       larger quantified expression, rather than being the immediate subject
       of the quantifier.  This will be addressed in a future
-      <productname>PostgreSQL</> release.
+      <productname>PostgreSQL</productname> release.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix recently-introduced memory leak in processing of
-      <type>inet</>/<type>cidr</> values (Heikki Linnakangas)
+      <type>inet</type>/<type>cidr</type> values (Heikki Linnakangas)
      </para>
 
      <para>
-      A patch in the December 2011 releases of <productname>PostgreSQL</>
+      A patch in the December 2011 releases of <productname>PostgreSQL</productname>
       caused memory leakage in these operations, which could be significant
       in scenarios such as building a btree index on such a column.
      </para>
@@ -1201,32 +1201,32 @@
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>'s handling of inherited table columns
+      Improve <application>pg_dump</application>'s handling of inherited table columns
       (Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> mishandled situations where a child column has
+      <application>pg_dump</application> mishandled situations where a child column has
       a different default expression than its parent column.  If the default
       is textually identical to the parent's default, but not actually the
       same (for instance, because of schema search path differences) it would
       not be recognized as different, so that after dump and restore the
       child would be allowed to inherit the parent's default.  Child columns
-      that are <literal>NOT NULL</> where their parent is not could also be
+      that are <literal>NOT NULL</literal> where their parent is not could also be
       restored subtly incorrectly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
+      Fix <application>pg_restore</application>'s direct-to-database mode for
       INSERT-style table data (Tom Lane)
      </para>
 
      <para>
       Direct-to-database restores from archive files made with
-      <option>--inserts</> or <option>--column-inserts</> options fail when
-      using <application>pg_restore</> from a release dated September or
+      <option>--inserts</option> or <option>--column-inserts</option> options fail when
+      using <application>pg_restore</application> from a release dated September or
       December 2011, as a result of an oversight in a fix for another
       problem.  The archive file itself is not at fault, and text-mode
       output is okay.
@@ -1235,8 +1235,8 @@
 
     <listitem>
      <para>
-      Fix error in <filename>contrib/intarray</>'s <literal>int[] &amp;
-      int[]</> operator (Guillaume Lelarge)
+      Fix error in <filename>contrib/intarray</filename>'s <literal>int[] &amp;
+      int[]</literal> operator (Guillaume Lelarge)
      </para>
 
      <para>
@@ -1248,8 +1248,8 @@
 
     <listitem>
      <para>
-      Fix error detection in <filename>contrib/pgcrypto</>'s
-      <function>encrypt_iv()</> and <function>decrypt_iv()</>
+      Fix error detection in <filename>contrib/pgcrypto</filename>'s
+      <function>encrypt_iv()</function> and <function>decrypt_iv()</function>
       (Marko Kreen)
      </para>
 
@@ -1261,26 +1261,26 @@
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <filename>contrib/test_parser</>
+      Fix one-byte buffer overrun in <filename>contrib/test_parser</filename>
       (Paul Guyot)
      </para>
 
      <para>
       The code would try to read one more byte than it should, which would
       crash in corner cases.
-      Since <filename>contrib/test_parser</> is only example code, this is
+      Since <filename>contrib/test_parser</filename> is only example code, this is
       not a security issue in itself, but bad example code is still bad.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <function>__sync_lock_test_and_set()</> for spinlocks on ARM, if
+      Use <function>__sync_lock_test_and_set()</function> for spinlocks on ARM, if
       available (Martin Pitt)
      </para>
 
      <para>
-      This function replaces our previous use of the <literal>SWPB</>
+      This function replaces our previous use of the <literal>SWPB</literal>
       instruction, which is deprecated and not available on ARMv6 and later.
       Reports suggest that the old code doesn't fail in an obvious way on
       recent ARM boards, but simply doesn't interlock concurrent accesses,
@@ -1290,7 +1290,7 @@
 
     <listitem>
      <para>
-      Use <option>-fexcess-precision=standard</> option when building with
+      Use <option>-fexcess-precision=standard</option> option when building with
       gcc versions that accept it (Andrew Dunstan)
      </para>
 
@@ -1327,7 +1327,7 @@
   <para>
    This release contains a variety of fixes from 8.3.16.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -1339,14 +1339,14 @@
 
    <para>
     However, a longstanding error was discovered in the definition of the
-    <literal>information_schema.referential_constraints</> view.  If you
+    <literal>information_schema.referential_constraints</literal> view.  If you
     rely on correct results from that view, you should replace its
     definition as explained in the first changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -1358,7 +1358,7 @@
 
     <listitem>
      <para>
-      Fix bugs in <literal>information_schema.referential_constraints</> view
+      Fix bugs in <literal>information_schema.referential_constraints</literal> view
       (Tom Lane)
      </para>
 
@@ -1371,13 +1371,13 @@
      </para>
 
      <para>
-      Since the view definition is installed by <application>initdb</>,
+      Since the view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can (as a superuser) drop the
-      <literal>information_schema</> schema then re-create it by sourcing
-      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      <literal>information_schema</literal> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</replaceable>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)  This must be repeated in each database
       to be fixed.
      </para>
     </listitem>
@@ -1385,12 +1385,12 @@
     <listitem>
      <para>
       Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
-      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      SELECT * FROM src</literal> or <literal>INSERT INTO dest SELECT * FROM src</literal>
       (Tom Lane)
      </para>
 
      <para>
-      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</command>,
       attempts to copy its data verbatim to another table could produce
       corrupt results in certain corner cases.
       The problem can only manifest in this precise form in 8.4 and later,
@@ -1407,36 +1407,36 @@
 
      <para>
       The typical symptom was transient errors like <quote>missing chunk
-      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      number 0 for toast value NNNNN in pg_toast_2619</quote>, where the cited
       toast table would always belong to a system catalog.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
-      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      Make <function>DatumGetInetP()</function> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</function>, that does
       not (Heikki Linnakangas)
      </para>
 
      <para>
       This change affects no core code, but might prevent crashes in add-on
-      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      code that expects <function>DatumGetInetP()</function> to produce an unpacked
       datum as per usual convention.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve locale support in <type>money</> type's input and output
+      Improve locale support in <type>money</type> type's input and output
       (Tom Lane)
      </para>
 
      <para>
       Aside from not supporting all standard
-      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</varname></link>
       formatting options, the input and output functions were inconsistent,
-      meaning there were locales in which dumped <type>money</> values could
+      meaning there were locales in which dumped <type>money</type> values could
       not be re-read.
      </para>
     </listitem>
@@ -1444,15 +1444,15 @@
     <listitem>
      <para>
       Don't let <link
-      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
-      affect <literal>CASE foo WHEN NULL ...</> constructs
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</varname></link>
+      affect <literal>CASE foo WHEN NULL ...</literal> constructs
       (Heikki Linnakangas)
      </para>
 
      <para>
-      <varname>transform_null_equals</> is only supposed to affect
-      <literal>foo = NULL</> expressions written directly by the user, not
-      equality checks generated internally by this form of <literal>CASE</>.
+      <varname>transform_null_equals</varname> is only supposed to affect
+      <literal>foo = NULL</literal> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</literal>.
      </para>
     </listitem>
 
@@ -1464,14 +1464,14 @@
 
      <para>
       For a cascading foreign key that references its own table, a row update
-      will fire both the <literal>ON UPDATE</> trigger and the
-      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
-      trigger must execute first, else the <literal>CHECK</> will check a
+      will fire both the <literal>ON UPDATE</literal> trigger and the
+      <literal>CHECK</literal> trigger as one event.  The <literal>ON UPDATE</literal>
+      trigger must execute first, else the <literal>CHECK</literal> will check a
       non-final state of the row and possibly throw an inappropriate error.
       However, the firing order of these triggers is determined by their
       names, which generally sort in creation order since the triggers have
       auto-generated names following the convention
-      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      <quote>RI_ConstraintTrigger_NNNN</quote>.  A proper fix would require
       modifying that convention, which we will do in 9.2, but it seems risky
       to change it in existing releases.  So this patch just changes the
       creation order of the triggers.  Users encountering this type of error
@@ -1494,7 +1494,7 @@
 
     <listitem>
      <para>
-      Preserve blank lines within commands in <application>psql</>'s command
+      Preserve blank lines within commands in <application>psql</application>'s command
       history (Robert Haas)
      </para>
 
@@ -1506,14 +1506,14 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts between
+      Fix <application>pg_dump</application> to dump user-defined casts between
       auto-generated types, such as table rowtypes (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      Use the preferred version of <application>xsubpp</application> to build PL/Perl,
       not necessarily the operating system's main copy
       (David Wheeler and Alex Hunsaker)
      </para>
@@ -1521,19 +1521,19 @@
 
     <listitem>
      <para>
-      Fix incorrect coding in <filename>contrib/dict_int</> and
-      <filename>contrib/dict_xsyn</> (Tom Lane)
+      Fix incorrect coding in <filename>contrib/dict_int</filename> and
+      <filename>contrib/dict_xsyn</filename> (Tom Lane)
      </para>
 
      <para>
       Some functions incorrectly assumed that memory returned by
-      <function>palloc()</> is guaranteed zeroed.
+      <function>palloc()</function> is guaranteed zeroed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</function>
       (Robert Haas)
      </para>
     </listitem>
@@ -1564,15 +1564,15 @@
      </para>
 
      <para>
-      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
-      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Map <quote>Central America Standard Time</quote> to <literal>CST6</literal>, not
+      <literal>CST6CDT</literal>, because DST is generally not observed anywhere in
       Central America.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011n
+      Update time zone data files to <application>tzdata</application> release 2011n
       for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
       also historical corrections for Alaska and British East Africa.
      </para>
@@ -1594,7 +1594,7 @@
   <para>
    This release contains a variety of fixes from 8.3.15.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -1603,7 +1603,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -1638,7 +1638,7 @@
 
     <listitem>
      <para>
-      Fix possible buffer overrun in <function>tsvector_concat()</>
+      Fix possible buffer overrun in <function>tsvector_concat()</function>
       (Tom Lane)
      </para>
 
@@ -1650,14 +1650,14 @@
 
     <listitem>
      <para>
-      Fix crash in <function>xml_recv</> when processing a
-      <quote>standalone</> parameter (Tom Lane)
+      Fix crash in <function>xml_recv</function> when processing a
+      <quote>standalone</quote> parameter (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</command>
       and in SJIS-2004 encoding conversion (Noah Misch)
      </para>
 
@@ -1675,7 +1675,7 @@
       There was a window wherein a new backend process could read a stale init
       file but miss the inval messages that would tell it the data is stale.
       The result would be bizarre failures in catalog accesses, typically
-      <quote>could not read block 0 in file ...</> later during startup.
+      <quote>could not read block 0 in file ...</quote> later during startup.
      </para>
     </listitem>
 
@@ -1724,13 +1724,13 @@
 
     <listitem>
      <para>
-      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+      Fix dump bug for <literal>VALUES</literal> in a view (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+      Disallow <literal>SELECT FOR UPDATE/SHARE</literal> on sequences (Tom Lane)
      </para>
 
      <para>
@@ -1747,7 +1747,7 @@
 
     <listitem>
      <para>
-      Fix cases where <command>CLUSTER</> might attempt to access
+      Fix cases where <command>CLUSTER</command> might attempt to access
       already-removed TOAST data (Tom Lane)
      </para>
     </listitem>
@@ -1755,7 +1755,7 @@
     <listitem>
      <para>
       Fix portability bugs in use of credentials control messages for
-      <quote>peer</> authentication (Tom Lane)
+      <quote>peer</quote> authentication (Tom Lane)
      </para>
     </listitem>
 
@@ -1767,18 +1767,18 @@
 
      <para>
       The typical symptom of this problem was <quote>The function requested is
-      not supported</> errors during SSPI login.
+      not supported</quote> errors during SSPI login.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+      Fix typo in <function>pg_srand48</function> seed initialization (Andres Freund)
      </para>
 
      <para>
       This led to failure to use all bits of the provided seed.  This function
-      is not used on most platforms (only those without <function>srandom</>),
+      is not used on most platforms (only those without <function>srandom</function>),
       and the potential security exposure from a less-random-than-expected
       seed seems minimal in any case.
      </para>
@@ -1786,25 +1786,25 @@
 
     <listitem>
      <para>
-      Avoid integer overflow when the sum of <literal>LIMIT</> and
-      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+      Avoid integer overflow when the sum of <literal>LIMIT</literal> and
+      <literal>OFFSET</literal> values exceeds 2^63 (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add overflow checks to <type>int4</> and <type>int8</> versions of
-      <function>generate_series()</> (Robert Haas)
+      Add overflow checks to <type>int4</type> and <type>int8</type> versions of
+      <function>generate_series()</function> (Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+      Fix trailing-zero removal in <function>to_char()</function> (Marti Raudsepp)
      </para>
 
      <para>
-      In a format with <literal>FM</> and no digit positions
+      In a format with <literal>FM</literal> and no digit positions
       after the decimal point, zeroes to the left of the decimal point could
       be removed incorrectly.
      </para>
@@ -1812,48 +1812,48 @@
 
     <listitem>
      <para>
-      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      Fix <function>pg_size_pretty()</function> to avoid overflow for inputs close to
       2^63 (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</>, support silent mode for service registrations
+      In <application>pg_ctl</application>, support silent mode for service registrations
       on Windows (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s counting of script file line numbers during
-      <literal>COPY</> from a different file (Tom Lane)
+      Fix <application>psql</application>'s counting of script file line numbers during
+      <literal>COPY</literal> from a different file (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
-      <varname>standard_conforming_strings</> (Tom Lane)
+      Fix <application>pg_restore</application>'s direct-to-database mode for
+      <varname>standard_conforming_strings</varname> (Tom Lane)
      </para>
 
      <para>
-      <application>pg_restore</> could emit incorrect commands when restoring
+      <application>pg_restore</application> could emit incorrect commands when restoring
       directly to a database server from an archive file that had been made
-      with <varname>standard_conforming_strings</> set to <literal>on</>.
+      with <varname>standard_conforming_strings</varname> set to <literal>on</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      Fix write-past-buffer-end and memory leak in <application>libpq</application>'s
       LDAP service lookup code (Albe Laurenz)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, avoid failures when using nonblocking I/O
+      In <application>libpq</application>, avoid failures when using nonblocking I/O
       and an SSL connection (Martin Pihlak, Tom Lane)
      </para>
     </listitem>
@@ -1865,28 +1865,28 @@
      </para>
 
      <para>
-      In particular, the response to a server report of <function>fork()</>
+      In particular, the response to a server report of <function>fork()</function>
       failure during SSL connection startup is now saner.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Improve <application>libpq</application>'s error reporting for SSL failures (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      Make <application>ecpglib</application> write <type>double</type> values with 15 digits
       precision (Akira Kurosawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      In <application>ecpglib</application>, be sure <literal>LC_NUMERIC</literal> setting is
       restored after an error (Michael Meskes)
      </para>
     </listitem>
@@ -1898,7 +1898,7 @@
      </para>
 
      <para>
-      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      <filename>contrib/pg_crypto</filename>'s blowfish encryption code could give
       wrong results on platforms where char is signed (which is most),
       leading to encrypted passwords being weaker than they should be.
      </para>
@@ -1906,13 +1906,13 @@
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+      Fix memory leak in <filename>contrib/seg</filename> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgstatindex()</> to give consistent results for empty
+      Fix <function>pgstatindex()</function> to give consistent results for empty
       indexes (Tom Lane)
      </para>
     </listitem>
@@ -1944,7 +1944,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011i
+      Update time zone data files to <application>tzdata</application> release 2011i
       for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
      </para>
     </listitem>
@@ -1965,7 +1965,7 @@
   <para>
    This release contains a variety of fixes from 8.3.14.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -1974,7 +1974,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -2013,15 +2013,15 @@
 
     <listitem>
      <para>
-      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</> trigger
+      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</literal> trigger
       handling when there was a concurrent update to the target tuple
       (Tom Lane)
      </para>
 
      <para>
       This bug has been observed to result in intermittent <quote>cannot
-      extract system attribute from virtual tuple</> failures while trying to
-      do <literal>UPDATE RETURNING ctid</>.  There is a very small probability
+      extract system attribute from virtual tuple</quote> failures while trying to
+      do <literal>UPDATE RETURNING ctid</literal>.  There is a very small probability
       of more serious errors, such as generating incorrect index entries for
       the updated tuple.
      </para>
@@ -2029,13 +2029,13 @@
 
     <listitem>
      <para>
-      Disallow <command>DROP TABLE</> when there are pending deferred trigger
+      Disallow <command>DROP TABLE</command> when there are pending deferred trigger
       events for the table (Tom Lane)
      </para>
 
      <para>
-      Formerly the <command>DROP</> would go through, leading to
-      <quote>could not open relation with OID nnn</> errors when the
+      Formerly the <command>DROP</command> would go through, leading to
+      <quote>could not open relation with OID nnn</quote> errors when the
       triggers were eventually fired.
      </para>
     </listitem>
@@ -2048,7 +2048,7 @@
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to cope with long lines (over 1KB) in
+      Fix <application>pg_restore</application> to cope with long lines (over 1KB) in
       TOC files (Tom Lane)
      </para>
     </listitem>
@@ -2080,14 +2080,14 @@
 
     <listitem>
      <para>
-      Fix version-incompatibility problem with <application>libintl</> on
+      Fix version-incompatibility problem with <application>libintl</application> on
       Windows (Hiroshi Inoue)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix usage of <application>xcopy</> in Windows build scripts to
+      Fix usage of <application>xcopy</application> in Windows build scripts to
       work correctly under Windows 7 (Andrew Dunstan)
      </para>
 
@@ -2098,14 +2098,14 @@
 
     <listitem>
      <para>
-      Fix path separator used by <application>pg_regress</> on Cygwin
+      Fix path separator used by <application>pg_regress</application> on Cygwin
       (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011f
+      Update time zone data files to <application>tzdata</application> release 2011f
       for DST law changes in Chile, Cuba, Falkland Islands, Morocco, Samoa,
       and Turkey; also historical corrections for South Australia, Alaska,
       and Hawaii.
@@ -2128,7 +2128,7 @@
   <para>
    This release contains a variety of fixes from 8.3.13.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -2137,7 +2137,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -2149,15 +2149,15 @@
 
     <listitem>
      <para>
-      Avoid failures when <command>EXPLAIN</> tries to display a simple-form
-      <literal>CASE</> expression (Tom Lane)
+      Avoid failures when <command>EXPLAIN</command> tries to display a simple-form
+      <literal>CASE</literal> expression (Tom Lane)
      </para>
 
      <para>
-      If the <literal>CASE</>'s test expression was a constant, the planner
-      could simplify the <literal>CASE</> into a form that confused the
+      If the <literal>CASE</literal>'s test expression was a constant, the planner
+      could simplify the <literal>CASE</literal> into a form that confused the
       expression-display code, resulting in <quote>unexpected CASE WHEN
-      clause</> errors.
+      clause</quote> errors.
      </para>
     </listitem>
 
@@ -2182,44 +2182,44 @@
      </para>
 
      <para>
-      The <type>date</> type supports a wider range of dates than can be
-      represented by the <type>timestamp</> types, but the planner assumed it
+      The <type>date</type> type supports a wider range of dates than can be
+      represented by the <type>timestamp</type> types, but the planner assumed it
       could always convert a date to timestamp with impunity.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s text output for large objects (BLOBs)
-      when <varname>standard_conforming_strings</> is on (Tom Lane)
+      Fix <application>pg_restore</application>'s text output for large objects (BLOBs)
+      when <varname>standard_conforming_strings</varname> is on (Tom Lane)
      </para>
 
      <para>
       Although restoring directly to a database worked correctly, string
-      escaping was incorrect if <application>pg_restore</> was asked for
-      SQL text output and <varname>standard_conforming_strings</> had been
+      escaping was incorrect if <application>pg_restore</application> was asked for
+      SQL text output and <varname>standard_conforming_strings</varname> had been
       enabled in the source database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix erroneous parsing of <type>tsquery</> values containing
+      Fix erroneous parsing of <type>tsquery</type> values containing
       <literal>... &amp; !(subexpression) | ...</literal> (Tom Lane)
      </para>
 
      <para>
       Queries containing this combination of operators were not executed
-      correctly.  The same error existed in <filename>contrib/intarray</>'s
-      <type>query_int</> type and <filename>contrib/ltree</>'s
-      <type>ltxtquery</> type.
+      correctly.  The same error existed in <filename>contrib/intarray</filename>'s
+      <type>query_int</type> type and <filename>contrib/ltree</filename>'s
+      <type>ltxtquery</type> type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix buffer overrun in <filename>contrib/intarray</>'s input function
-      for the <type>query_int</> type (Apple)
+      Fix buffer overrun in <filename>contrib/intarray</filename>'s input function
+      for the <type>query_int</type> type (Apple)
      </para>
 
      <para>
@@ -2231,16 +2231,16 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/seg</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/seg</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>seg</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>seg</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.  (This is identical to the bug that was fixed in
-      <filename>contrib/cube</> in the previous update.)
+      <filename>contrib/cube</filename> in the previous update.)
      </para>
     </listitem>
 
@@ -2260,7 +2260,7 @@
   <para>
    This release contains a variety of fixes from 8.3.12.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -2269,7 +2269,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -2282,17 +2282,17 @@
     <listitem>
      <para>
       Force the default
-      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>
-      to be <literal>fdatasync</> on Linux (Tom Lane, Marti Raudsepp)
+      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>
+      to be <literal>fdatasync</literal> on Linux (Tom Lane, Marti Raudsepp)
      </para>
 
      <para>
-      The default on Linux has actually been <literal>fdatasync</> for many
-      years, but recent kernel changes caused <productname>PostgreSQL</> to
-      choose <literal>open_datasync</> instead.  This choice did not result
+      The default on Linux has actually been <literal>fdatasync</literal> for many
+      years, but recent kernel changes caused <productname>PostgreSQL</productname> to
+      choose <literal>open_datasync</literal> instead.  This choice did not result
       in any performance improvement, and caused outright failures on
-      certain filesystems, notably <literal>ext4</> with the
-      <literal>data=journal</> mount option.
+      certain filesystems, notably <literal>ext4</literal> with the
+      <literal>data=journal</literal> mount option.
      </para>
     </listitem>
 
@@ -2302,7 +2302,7 @@
      </para>
 
      <para>
-      This could result in <quote>bad buffer id: 0</> failures or
+      This could result in <quote>bad buffer id: 0</quote> failures or
       corruption of index contents during replication.
      </para>
     </listitem>
@@ -2321,7 +2321,7 @@
      </para>
 
      <para>
-      The effective <varname>vacuum_cost_limit</> for an autovacuum worker
+      The effective <varname>vacuum_cost_limit</varname> for an autovacuum worker
       could drop to nearly zero if it processed enough tables, causing it
       to run extremely slowly.
      </para>
@@ -2329,19 +2329,19 @@
 
     <listitem>
      <para>
-      Add support for detecting register-stack overrun on <literal>IA64</>
+      Add support for detecting register-stack overrun on <literal>IA64</literal>
       (Tom Lane)
      </para>
 
      <para>
-      The <literal>IA64</> architecture has two hardware stacks.  Full
+      The <literal>IA64</literal> architecture has two hardware stacks.  Full
       prevention of stack-overrun failures requires checking both.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a check for stack overflow in <function>copyObject()</> (Tom Lane)
+      Add a check for stack overflow in <function>copyObject()</function> (Tom Lane)
      </para>
 
      <para>
@@ -2357,7 +2357,7 @@
      </para>
 
      <para>
-      It is possible to have a <quote>concurrent</> page split in a
+      It is possible to have a <quote>concurrent</quote> page split in a
       temporary index, if for example there is an open cursor scanning the
       index when an insertion is done.  GiST failed to detect this case and
       hence could deliver wrong results when execution of the cursor
@@ -2367,7 +2367,7 @@
 
     <listitem>
      <para>
-      Avoid memory leakage while <command>ANALYZE</>'ing complex index
+      Avoid memory leakage while <command>ANALYZE</command>'ing complex index
       expressions (Tom Lane)
      </para>
     </listitem>
@@ -2379,14 +2379,14 @@
      </para>
 
      <para>
-      An index declared like <literal>create index i on t (foo(t.*))</>
+      An index declared like <literal>create index i on t (foo(t.*))</literal>
       would not automatically get dropped when its table was dropped.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not <quote>inline</> a SQL function with multiple <literal>OUT</>
+      Do not <quote>inline</quote> a SQL function with multiple <literal>OUT</literal>
       parameters (Tom Lane)
      </para>
 
@@ -2398,15 +2398,15 @@
 
     <listitem>
      <para>
-      Behave correctly if <literal>ORDER BY</>, <literal>LIMIT</>,
-      <literal>FOR UPDATE</>, or <literal>WITH</> is attached to the
-      <literal>VALUES</> part of <literal>INSERT ... VALUES</> (Tom Lane)
+      Behave correctly if <literal>ORDER BY</literal>, <literal>LIMIT</literal>,
+      <literal>FOR UPDATE</literal>, or <literal>WITH</literal> is attached to the
+      <literal>VALUES</literal> part of <literal>INSERT ... VALUES</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix constant-folding of <literal>COALESCE()</> expressions (Tom Lane)
+      Fix constant-folding of <literal>COALESCE()</literal> expressions (Tom Lane)
      </para>
 
      <para>
@@ -2418,7 +2418,7 @@
     <listitem>
      <para>
       Fix postmaster crash when connection acceptance
-      (<function>accept()</> or one of the calls made immediately after it)
+      (<function>accept()</function> or one of the calls made immediately after it)
       fails, and the postmaster was compiled with GSSAPI support (Alexander
       Chernikov)
      </para>
@@ -2426,7 +2426,7 @@
 
     <listitem>
      <para>
-      Fix missed unlink of temporary files when <varname>log_temp_files</>
+      Fix missed unlink of temporary files when <varname>log_temp_files</varname>
       is active (Tom Lane)
      </para>
 
@@ -2438,11 +2438,11 @@
 
     <listitem>
      <para>
-      Add print functionality for <structname>InhRelation</> nodes (Tom Lane)
+      Add print functionality for <structname>InhRelation</structname> nodes (Tom Lane)
      </para>
 
      <para>
-      This avoids a failure when <varname>debug_print_parse</> is enabled
+      This avoids a failure when <varname>debug_print_parse</varname> is enabled
       and certain types of query are executed.
      </para>
     </listitem>
@@ -2461,14 +2461,14 @@
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s handling of <quote>simple</>
+      Fix <application>PL/pgSQL</application>'s handling of <quote>simple</quote>
       expressions to not fail in recursion or error-recovery cases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</>'s handling of set-returning functions
+      Fix <application>PL/Python</application>'s handling of set-returning functions
       (Jan Urbanski)
      </para>
 
@@ -2480,22 +2480,22 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/cube</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/cube</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>cube</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>cube</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't emit <quote>identifier will be truncated</> notices in
-      <filename>contrib/dblink</> except when creating new connections
+      Don't emit <quote>identifier will be truncated</quote> notices in
+      <filename>contrib/dblink</filename> except when creating new connections
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -2503,20 +2503,20 @@
     <listitem>
      <para>
       Fix potential coredump on missing public key in
-      <filename>contrib/pgcrypto</> (Marti Raudsepp)
+      <filename>contrib/pgcrypto</filename> (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/xml2</>'s XPath query functions
+      Fix memory leak in <filename>contrib/xml2</filename>'s XPath query functions
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010o
+      Update time zone data files to <application>tzdata</application> release 2010o
       for DST law changes in Fiji and Samoa;
       also historical corrections for Hong Kong.
      </para>
@@ -2538,7 +2538,7 @@
   <para>
    This release contains a variety of fixes from 8.3.11.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -2547,7 +2547,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -2567,7 +2567,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -2596,7 +2596,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -2605,7 +2605,7 @@
 
     <listitem>
      <para>
-      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</>) as non-fatal on
+      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</literal>) as non-fatal on
       Windows (Magnus Hagander)
      </para>
 
@@ -2627,13 +2627,13 @@
       This is a back-patch of an 8.4 fix that was missed in the 8.3 branch.
       This corrects an error introduced in 8.3.8 that could cause incorrect
       results for outer joins when the inner relation is an inheritance tree
-      or <literal>UNION ALL</> subquery.
+      or <literal>UNION ALL</literal> subquery.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible duplicate scans of <literal>UNION ALL</> member relations
+      Fix possible duplicate scans of <literal>UNION ALL</literal> member relations
       (Tom Lane)
      </para>
     </listitem>
@@ -2655,7 +2655,7 @@
      </para>
 
      <para>
-      If a plan is prepared while <command>CREATE INDEX CONCURRENTLY</> is
+      If a plan is prepared while <command>CREATE INDEX CONCURRENTLY</command> is
       in progress for one of the referenced tables, it is supposed to be
       re-planned once the index is ready for use.  This was not happening
       reliably.
@@ -2709,7 +2709,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -2746,7 +2746,7 @@
 
     <listitem>
      <para>
-      Fix <varname>log_line_prefix</>'s <literal>%i</> escape,
+      Fix <varname>log_line_prefix</varname>'s <literal>%i</literal> escape,
       which could produce junk early in backend startup (Tom Lane)
      </para>
     </listitem>
@@ -2754,35 +2754,35 @@
     <listitem>
      <para>
       Fix possible data corruption in <command>ALTER TABLE ... SET
-      TABLESPACE</> when archiving is enabled (Jeff Davis)
+      TABLESPACE</command> when archiving is enabled (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>CREATE DATABASE</> and <command>ALTER DATABASE ... SET
-      TABLESPACE</> to be interrupted by query-cancel (Guillaume Lelarge)
+      Allow <command>CREATE DATABASE</command> and <command>ALTER DATABASE ... SET
+      TABLESPACE</command> to be interrupted by query-cancel (Guillaume Lelarge)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle operator classes and families
+      Fix <command>REASSIGN OWNED</command> to handle operator classes and families
       (Asko Tiidumaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible core dump when comparing two empty <type>tsquery</> values
+      Fix possible core dump when comparing two empty <type>tsquery</type> values
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>LIKE</>'s handling of patterns containing <literal>%</>
-      followed by <literal>_</> (Tom Lane)
+      Fix <literal>LIKE</literal>'s handling of patterns containing <literal>%</literal>
+      followed by <literal>_</literal> (Tom Lane)
      </para>
 
      <para>
@@ -2794,14 +2794,14 @@
     <listitem>
      <para>
       In PL/Python, defend against null pointer results from
-      <function>PyCObject_AsVoidPtr</> and <function>PyCObject_FromVoidPtr</>
+      <function>PyCObject_AsVoidPtr</function> and <function>PyCObject_FromVoidPtr</function>
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make psql recognize <command>DISCARD ALL</> as a command that should
+      Make psql recognize <command>DISCARD ALL</command> as a command that should
       not be encased in a transaction block in autocommit-off mode
       (Itagaki Takahiro)
      </para>
@@ -2809,14 +2809,14 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to process data from <literal>RETURNING</>
+      Fix <application>ecpg</application> to process data from <literal>RETURNING</literal>
       clauses correctly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -2824,30 +2824,30 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle connection names longer than
+      Fix <filename>contrib/dblink</filename> to handle connection names longer than
       62 bytes correctly (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <function>hstore(text, text)</>
-      function to <filename>contrib/hstore</> (Robert Haas)
+      Add <function>hstore(text, text)</function>
+      function to <filename>contrib/hstore</filename> (Robert Haas)
      </para>
 
      <para>
       This function is the recommended substitute for the now-deprecated
-      <literal>=&gt;</> operator.  It was back-patched so that future-proofed
+      <literal>=&gt;</literal> operator.  It was back-patched so that future-proofed
       code can be used with older server versions.  Note that the patch will
-      be effective only after <filename>contrib/hstore</> is installed or
+      be effective only after <filename>contrib/hstore</filename> is installed or
       reinstalled in a particular database.  Users might prefer to execute
-      the <command>CREATE FUNCTION</> command by hand, instead.
+      the <command>CREATE FUNCTION</command> command by hand, instead.
      </para>
     </listitem>
 
@@ -2860,7 +2860,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010l
+      Update time zone data files to <application>tzdata</application> release 2010l
       for DST law changes in Egypt and Palestine; also historical corrections
       for Finland.
      </para>
@@ -2875,7 +2875,7 @@
 
     <listitem>
      <para>
-      Make Windows' <quote>N. Central Asia Standard Time</> timezone map to
+      Make Windows' <quote>N. Central Asia Standard Time</quote> timezone map to
       Asia/Novosibirsk, not Asia/Almaty (Magnus Hagander)
      </para>
 
@@ -2901,7 +2901,7 @@
   <para>
    This release contains a variety of fixes from 8.3.10.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -2910,7 +2910,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -2922,19 +2922,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -2943,19 +2943,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -2980,7 +2980,7 @@
      <para>
       This avoids failures if the function's code is invalid without the
       setting; an example is that SQL functions may not parse if the
-      <varname>search_path</> is not correct.
+      <varname>search_path</varname> is not correct.
      </para>
     </listitem>
 
@@ -2992,10 +2992,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -3003,7 +3003,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -3016,13 +3016,13 @@
     <listitem>
      <para>
       Ensure the archiver process responds to changes in
-      <varname>archive_command</> as soon as possible (Tom)
+      <varname>archive_command</varname> as soon as possible (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -3035,15 +3035,15 @@
 
     <listitem>
      <para>
-      Prevent infinite recursion in <application>psql</> when expanding
+      Prevent infinite recursion in <application>psql</application> when expanding
       a variable that refers to itself (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\copy</> to not add spaces around
-      a dot within <literal>\copy (select ...)</> (Tom)
+      Fix <application>psql</application>'s <literal>\copy</literal> to not add spaces around
+      a dot within <literal>\copy (select ...)</literal> (Tom)
      </para>
 
      <para>
@@ -3054,15 +3054,15 @@
 
     <listitem>
      <para>
-      Fix unnecessary <quote>GIN indexes do not support whole-index scans</>
-      errors for unsatisfiable queries using <filename>contrib/intarray</>
+      Fix unnecessary <quote>GIN indexes do not support whole-index scans</quote>
+      errors for unsatisfiable queries using <filename>contrib/intarray</filename>
       operators (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -3070,7 +3070,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -3102,14 +3102,14 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010j
+      Update time zone data files to <application>tzdata</application> release 2010j
       for DST law changes in Argentina, Australian Antarctic, Bangladesh,
       Mexico, Morocco, Pakistan, Palestine, Russia, Syria, Tunisia;
       also historical corrections for Taiwan.
      </para>
 
      <para>
-      Also, add <literal>PKST</> (Pakistan Summer Time) to the default set of
+      Also, add <literal>PKST</literal> (Pakistan Summer Time) to the default set of
       timezone abbreviations.
      </para>
     </listitem>
@@ -3130,7 +3130,7 @@
   <para>
    This release contains a variety of fixes from 8.3.9.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -3139,7 +3139,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -3151,7 +3151,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -3214,8 +3214,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -3241,7 +3241,7 @@
 
     <listitem>
      <para>
-      Fix assorted crashes in <type>xml</> processing caused by sloppy
+      Fix assorted crashes in <type>xml</type> processing caused by sloppy
       memory management (Tom)
      </para>
 
@@ -3261,7 +3261,7 @@
 
     <listitem>
      <para>
-      Fix the <literal>STOP WAL LOCATION</> entry in backup history files to
+      Fix the <literal>STOP WAL LOCATION</literal> entry in backup history files to
       report the next WAL segment's name when the end location is exactly at a
       segment boundary (Itagaki Takahiro)
      </para>
@@ -3283,23 +3283,23 @@
      <para>
       Improve constraint exclusion processing of boolean-variable cases,
       in particular make it possible to exclude a partition that has a
-      <quote>bool_column = false</> constraint (Tom)
+      <quote>bool_column = false</quote> constraint (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -3307,49 +3307,49 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible infinite loop if <function>SSL_read</> or
-      <function>SSL_write</> fails without setting <varname>errno</> (Tom)
+      Fix possible infinite loop if <function>SSL_read</function> or
+      <function>SSL_write</function> fails without setting <varname>errno</varname> (Tom)
      </para>
 
      <para>
       This is reportedly possible with some Windows versions of
-      <application>openssl</>.
+      <application>openssl</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <acronym>GSSAPI</> authentication on local connections,
+      Disallow <acronym>GSSAPI</acronym> authentication on local connections,
       since it requires a hostname to function correctly (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</> report the proper SQLSTATE if the connection
+      Make <application>ecpg</application> report the proper SQLSTATE if the connection
       disappears (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>numericlocale</> option to not
+      Fix <application>psql</application>'s <literal>numericlocale</literal> option to not
       format strings it shouldn't in latex and troff output formats (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>psql</> return the correct exit status (3) when
-      <literal>ON_ERROR_STOP</> and <literal>--single-transaction</> are
-      both specified and an error occurs during the implied <command>COMMIT</>
+      Make <application>psql</application> return the correct exit status (3) when
+      <literal>ON_ERROR_STOP</literal> and <literal>--single-transaction</literal> are
+      both specified and an error occurs during the implied <command>COMMIT</command>
       (Bruce)
      </para>
     </listitem>
@@ -3370,7 +3370,7 @@
 
     <listitem>
      <para>
-      Add <literal>volatile</> markings in PL/Python to avoid possible
+      Add <literal>volatile</literal> markings in PL/Python to avoid possible
       compiler-specific misbehavior (Zdenek Kotala)
      </para>
     </listitem>
@@ -3382,43 +3382,43 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow zero-dimensional arrays in <filename>contrib/ltree</> operations
+      Allow zero-dimensional arrays in <filename>contrib/ltree</filename> operations
       (Tom)
      </para>
 
      <para>
       This case was formerly rejected as an error, but it's more convenient to
       treat it the same as a zero-element array.  In particular this avoids
-      unnecessary failures when an <type>ltree</> operation is applied to the
-      result of <literal>ARRAY(SELECT ...)</> and the sub-select returns no
+      unnecessary failures when an <type>ltree</type> operation is applied to the
+      result of <literal>ARRAY(SELECT ...)</literal> and the sub-select returns no
       rows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted crashes in <filename>contrib/xml2</> caused by sloppy
+      Fix assorted crashes in <filename>contrib/xml2</filename> caused by sloppy
       memory management (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make building of <filename>contrib/xml2</> more robust on Windows
+      Make building of <filename>contrib/xml2</filename> more robust on Windows
       (Andrew)
      </para>
     </listitem>
@@ -3429,14 +3429,14 @@
      </para>
 
      <para>
-      One known symptom of this bug is that rows in <structname>pg_listener</>
+      One known symptom of this bug is that rows in <structname>pg_listener</structname>
       could be dropped under heavy load.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010e
+      Update time zone data files to <application>tzdata</application> release 2010e
       for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.
      </para>
     </listitem>
@@ -3457,7 +3457,7 @@
   <para>
    This release contains a variety of fixes from 8.3.8.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -3466,7 +3466,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.8,
-    see <xref linkend="release-8-3-8">.
+    see <xref linkend="release-8-3-8"/>.
    </para>
 
   </sect2>
@@ -3514,14 +3514,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -3540,7 +3540,7 @@
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -3617,7 +3617,7 @@
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -3650,19 +3650,19 @@
     <listitem>
      <para>
       Fix processing of ownership dependencies during <literal>CREATE OR
-      REPLACE FUNCTION</> (Tom)
+      REPLACE FUNCTION</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect handling of <literal>WHERE</>
-      <replaceable>x</>=<replaceable>x</> conditions (Tom)
+      Fix incorrect handling of <literal>WHERE</literal>
+      <replaceable>x</replaceable>=<replaceable>x</replaceable> conditions (Tom)
      </para>
 
      <para>
       In some cases these could get ignored as redundant, but they aren't
-      &mdash; they're equivalent to <replaceable>x</> <literal>IS NOT NULL</>.
+      &mdash; they're equivalent to <replaceable>x</replaceable> <literal>IS NOT NULL</literal>.
      </para>
     </listitem>
 
@@ -3674,7 +3674,7 @@
 
     <listitem>
      <para>
-      Fix encoding handling in <type>xml</> binary input (Heikki)
+      Fix encoding handling in <type>xml</type> binary input (Heikki)
      </para>
 
      <para>
@@ -3685,7 +3685,7 @@
 
     <listitem>
      <para>
-      Fix bug with calling <literal>plperl</> from <literal>plperlu</> or vice
+      Fix bug with calling <literal>plperl</literal> from <literal>plperlu</literal> or vice
       versa (Tom)
      </para>
 
@@ -3705,7 +3705,7 @@
     <listitem>
      <para>
       Ensure that Perl arrays are properly converted to
-      <productname>PostgreSQL</> arrays when returned by a set-returning
+      <productname>PostgreSQL</productname> arrays when returned by a set-returning
       PL/Perl function (Andrew Dunstan, Abhijit Menon-Sen)
      </para>
 
@@ -3722,7 +3722,7 @@
 
     <listitem>
      <para>
-      In <filename>contrib/pg_standby</>, disable triggering failover with a
+      In <filename>contrib/pg_standby</filename>, disable triggering failover with a
       signal on Windows (Fujii Masao)
      </para>
 
@@ -3734,20 +3734,20 @@
 
     <listitem>
      <para>
-      Ensure <application>psql</>'s flex module is compiled with the correct
+      Ensure <application>psql</application>'s flex module is compiled with the correct
       system header definitions (Tom)
      </para>
 
      <para>
       This fixes build failures on platforms where
-      <literal>--enable-largefile</> causes incompatible changes in the
+      <literal>--enable-largefile</literal> causes incompatible changes in the
       generated code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -3760,14 +3760,14 @@
      </para>
 
      <para>
-      This includes adding <literal>IDT</> and <literal>SGT</> to the default
+      This includes adding <literal>IDT</literal> and <literal>SGT</literal> to the default
       timezone abbreviation set.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009s
+      Update time zone data files to <application>tzdata</application> release 2009s
       for DST law changes in Antarctica, Argentina, Bangladesh, Fiji,
       Novokuznetsk, Pakistan, Palestine, Samoa, Syria; also historical
       corrections for Hong Kong.
@@ -3790,7 +3790,7 @@
   <para>
    This release contains a variety of fixes from 8.3.7.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -3798,10 +3798,10 @@
 
    <para>
     A dump/restore is not required for those running 8.3.X.
-    However, if you have any hash indexes on <type>interval</> columns,
-    you must <command>REINDEX</> them after updating to 8.3.8.
+    However, if you have any hash indexes on <type>interval</type> columns,
+    you must <command>REINDEX</command> them after updating to 8.3.8.
     Also, if you are upgrading from a version earlier than 8.3.5,
-    see <xref linkend="release-8-3-5">.
+    see <xref linkend="release-8-3-5"/>.
    </para>
 
   </sect2>
@@ -3818,13 +3818,13 @@
 
      <para>
       This bug led to the often-reported <quote>could not reattach
-      to shared memory</> error message.
+      to shared memory</quote> error message.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Force WAL segment switch during <function>pg_start_backup()</>
+      Force WAL segment switch during <function>pg_start_backup()</function>
       (Heikki)
      </para>
 
@@ -3835,26 +3835,26 @@
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>LOAD</> of an already-loaded loadable module
+      Make <command>LOAD</command> of an already-loaded loadable module
       into a no-op (Tom)
      </para>
 
      <para>
-      Formerly, <command>LOAD</> would attempt to unload and re-load the
+      Formerly, <command>LOAD</command> would attempt to unload and re-load the
       module, but this is unsafe and not all that useful.
      </para>
     </listitem>
@@ -3881,8 +3881,8 @@
 
     <listitem>
      <para>
-      Prevent <varname>synchronize_seqscans</> from changing the results of
-      scrollable and <literal>WITH HOLD</> cursors (Tom)
+      Prevent <varname>synchronize_seqscans</varname> from changing the results of
+      scrollable and <literal>WITH HOLD</literal> cursors (Tom)
      </para>
     </listitem>
 
@@ -3896,32 +3896,32 @@
 
     <listitem>
      <para>
-      Fix hash calculation for data type <type>interval</> (Tom)
+      Fix hash calculation for data type <type>interval</type> (Tom)
      </para>
 
      <para>
       This corrects wrong results for hash joins on interval values.
       It also changes the contents of hash indexes on interval columns.
-      If you have any such indexes, you must <command>REINDEX</> them
+      If you have any such indexes, you must <command>REINDEX</command> them
       after updating.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Treat <function>to_char(..., 'TH')</> as an uppercase ordinal
-      suffix with <literal>'HH'</>/<literal>'HH12'</> (Heikki)
+      Treat <function>to_char(..., 'TH')</function> as an uppercase ordinal
+      suffix with <literal>'HH'</literal>/<literal>'HH12'</literal> (Heikki)
      </para>
 
      <para>
-      It was previously handled as <literal>'th'</> (lowercase).
+      It was previously handled as <literal>'th'</literal> (lowercase).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -3938,14 +3938,14 @@
 
     <listitem>
      <para>
-      Fix <type>money</> data type to work in locales where currency
+      Fix <type>money</type> data type to work in locales where currency
       amounts have no fractional digits, e.g. Japan (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>LIKE</> for case where pattern contains <literal>%_</>
+      Fix <literal>LIKE</literal> for case where pattern contains <literal>%_</literal>
       (Tom)
      </para>
     </listitem>
@@ -3953,7 +3953,7 @@
     <listitem>
      <para>
       Properly round datetime input like
-      <literal>00:12:57.9999999999999999999999999999</> (Tom)
+      <literal>00:12:57.9999999999999999999999999999</literal> (Tom)
      </para>
     </listitem>
 
@@ -3972,8 +3972,8 @@
 
     <listitem>
      <para>
-      Ensure that a <quote>fast shutdown</> request will forcibly terminate
-      open sessions, even if a <quote>smart shutdown</> was already in progress
+      Ensure that a <quote>fast shutdown</quote> request will forcibly terminate
+      open sessions, even if a <quote>smart shutdown</quote> was already in progress
       (Fujii Masao)
      </para>
     </listitem>
@@ -4000,35 +4000,35 @@
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to not go into an infinite loop if
-      <filename>postgresql.conf</> is empty (Jeff Davis)
+      Fix <application>pg_ctl</application> to not go into an infinite loop if
+      <filename>postgresql.conf</filename> is empty (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>'s efficiency when there are
+      Improve <application>pg_dump</application>'s efficiency when there are
       many large objects (Tamas Vincze)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>SIGUSR1</>, not <literal>SIGQUIT</>, as the
-      failover signal for <application>pg_standby</> (Heikki)
+      Use <literal>SIGUSR1</literal>, not <literal>SIGQUIT</literal>, as the
+      failover signal for <application>pg_standby</application> (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_standby</>'s <literal>maxretries</> option
+      Make <application>pg_standby</application>'s <literal>maxretries</literal> option
       behave as documented (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/hstore</> throw an error when a key or
+      Make <filename>contrib/hstore</filename> throw an error when a key or
       value is too long to fit in its data structure, rather than
       silently truncating it (Andrew Gierth)
      </para>
@@ -4036,15 +4036,15 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s <function>xslt_process()</> to
+      Fix <filename>contrib/xml2</filename>'s <function>xslt_process()</function> to
       properly handle the maximum number of parameters (twenty) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -4057,7 +4057,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009l
+      Update time zone data files to <application>tzdata</application> release 2009l
       for DST law changes in Bangladesh, Egypt, Jordan, Pakistan,
       Argentina/San_Luis, Cuba, Jordan (historical correction only),
       Mauritius, Morocco, Palestine, Syria, Tunisia.
@@ -4080,7 +4080,7 @@
   <para>
    This release contains a variety of fixes from 8.3.6.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -4089,7 +4089,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.5,
-    see <xref linkend="release-8-3-5">.
+    see <xref linkend="release-8-3-5"/>.
    </para>
 
   </sect2>
@@ -4108,7 +4108,7 @@
       This change extends fixes made in the last two minor releases for
       related failure scenarios.  The previous fixes were narrowly tailored
       for the original problem reports, but we have now recognized that
-      <emphasis>any</> error thrown by an encoding conversion function could
+      <emphasis>any</emphasis> error thrown by an encoding conversion function could
       potentially lead to infinite recursion while trying to report the
       error.  The solution therefore is to disable translation and encoding
       conversion and report the plain-ASCII form of any error message,
@@ -4119,7 +4119,7 @@
 
     <listitem>
      <para>
-      Disallow <command>CREATE CONVERSION</> with the wrong encodings
+      Disallow <command>CREATE CONVERSION</command> with the wrong encodings
       for the specified conversion function (Heikki)
      </para>
 
@@ -4132,19 +4132,19 @@
 
     <listitem>
      <para>
-      Fix <function>xpath()</> to not modify the path expression unless
+      Fix <function>xpath()</function> to not modify the path expression unless
       necessary, and to make a saner attempt at it when necessary (Andrew)
      </para>
 
      <para>
-      The SQL standard suggests that <function>xpath</> should work on data
-      that is a document fragment, but <application>libxml</> doesn't support
+      The SQL standard suggests that <function>xpath</function> should work on data
+      that is a document fragment, but <application>libxml</application> doesn't support
       that, and indeed it's not clear that this is sensible according to the
-      XPath standard.  <function>xpath</> attempted to work around this
+      XPath standard.  <function>xpath</function> attempted to work around this
       mismatch by modifying both the data and the path expression, but the
       modification was buggy and could cause valid searches to fail.  Now,
-      <function>xpath</> checks whether the data is in fact a well-formed
-      document, and if so invokes <application>libxml</> with no change to the
+      <function>xpath</function> checks whether the data is in fact a well-formed
+      document, and if so invokes <application>libxml</application> with no change to the
       data or path expression.  Otherwise, a different modification method
       that is somewhat less likely to fail is used.
      </para>
@@ -4155,15 +4155,15 @@
        seems likely that no real solution is possible.  This patch should
        therefore be viewed as a band-aid to keep from breaking existing
        applications unnecessarily.  It is likely that
-       <productname>PostgreSQL</> 8.4 will simply reject use of
-       <function>xpath</> on data that is not a well-formed document.
+       <productname>PostgreSQL</productname> 8.4 will simply reject use of
+       <function>xpath</function> on data that is not a well-formed document.
       </para>
      </note>
     </listitem>
 
     <listitem>
      <para>
-      Fix core dump when <function>to_char()</> is given format codes that
+      Fix core dump when <function>to_char()</function> is given format codes that
       are inappropriate for the type of the data argument (Tom)
      </para>
     </listitem>
@@ -4175,40 +4175,40 @@
      </para>
 
      <para>
-      Crashes were possible on platforms where <type>wchar_t</> is narrower
-      than <type>int</>; Windows in particular.
+      Crashes were possible on platforms where <type>wchar_t</type> is narrower
+      than <type>int</type>; Windows in particular.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix extreme inefficiency in text search parser's handling of an
-      email-like string containing multiple <literal>@</> characters (Heikki)
+      email-like string containing multiple <literal>@</literal> characters (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner problem with sub-<command>SELECT</> in the output list
+      Fix planner problem with sub-<command>SELECT</command> in the output list
       of a larger subquery (Tom)
      </para>
 
      <para>
       The known symptom of this bug is a <quote>failed to locate grouping
-      columns</> error that is dependent on the datatype involved;
+      columns</quote> error that is dependent on the datatype involved;
       but there could be other issues as well.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix decompilation of <literal>CASE WHEN</> with an implicit coercion
+      Fix decompilation of <literal>CASE WHEN</literal> with an implicit coercion
       (Tom)
      </para>
 
      <para>
       This mistake could lead to Assert failures in an Assert-enabled build,
-      or an <quote>unexpected CASE WHEN clause</> error message in other
+      or an <quote>unexpected CASE WHEN clause</quote> error message in other
       cases, when trying to examine or dump a view.
      </para>
     </listitem>
@@ -4219,38 +4219,38 @@
      </para>
 
      <para>
-      If <command>CLUSTER</> or a rewriting variant of <command>ALTER TABLE</>
+      If <command>CLUSTER</command> or a rewriting variant of <command>ALTER TABLE</command>
       were executed by someone other than the table owner, the
-      <structname>pg_type</> entry for the table's TOAST table would end up
+      <structname>pg_type</structname> entry for the table's TOAST table would end up
       marked as owned by that someone.  This caused no immediate problems,
       since the permissions on the TOAST rowtype aren't examined by any
       ordinary database operation.  However, it could lead to unexpected
       failures if one later tried to drop the role that issued the command
-      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</>
-      warnings from <application>pg_dump</> after having done so (in 8.3).
+      (in 8.1 or 8.2), or <quote>owner of data type appears to be invalid</quote>
+      warnings from <application>pg_dump</application> after having done so (in 8.3).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Change <command>UNLISTEN</> to exit quickly if the current session has
-      never executed any <command>LISTEN</> command (Tom)
+      Change <command>UNLISTEN</command> to exit quickly if the current session has
+      never executed any <command>LISTEN</command> command (Tom)
      </para>
 
      <para>
       Most of the time this is not a particularly useful optimization, but
-      since <command>DISCARD ALL</> invokes <command>UNLISTEN</>, the previous
+      since <command>DISCARD ALL</command> invokes <command>UNLISTEN</command>, the previous
       coding caused a substantial performance problem for applications that
-      made heavy use of <command>DISCARD ALL</>.
+      made heavy use of <command>DISCARD ALL</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL to not treat <literal>INTO</> after <command>INSERT</> as
+      Fix PL/pgSQL to not treat <literal>INTO</literal> after <command>INSERT</command> as
       an INTO-variables clause anywhere in the string, not only at the start;
-      in particular, don't fail for <command>INSERT INTO</> within
-      <command>CREATE RULE</> (Tom)
+      in particular, don't fail for <command>INSERT INTO</command> within
+      <command>CREATE RULE</command> (Tom)
      </para>
     </listitem>
 
@@ -4268,21 +4268,21 @@
 
     <listitem>
      <para>
-      Retry failed calls to <function>CallNamedPipe()</> on Windows
+      Retry failed calls to <function>CallNamedPipe()</function> on Windows
       (Steve Marshall, Magnus)
      </para>
 
      <para>
       It appears that this function can sometimes fail transiently;
       we previously treated any failure as a hard error, which could
-      confuse <command>LISTEN</>/<command>NOTIFY</> as well as other
+      confuse <command>LISTEN</command>/<command>NOTIFY</command> as well as other
       operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>MUST</> (Mauritius Island Summer Time) to the default list
+      Add <literal>MUST</literal> (Mauritius Island Summer Time) to the default list
       of known timezone abbreviations (Xavier Bugaud)
      </para>
     </listitem>
@@ -4303,7 +4303,7 @@
   <para>
    This release contains a variety of fixes from 8.3.5.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -4312,7 +4312,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.5,
-    see <xref linkend="release-8-3-5">.
+    see <xref linkend="release-8-3-5"/>.
    </para>
 
   </sect2>
@@ -4324,7 +4324,7 @@
 
     <listitem>
      <para>
-      Make <command>DISCARD ALL</> release advisory locks, in addition
+      Make <command>DISCARD ALL</command> release advisory locks, in addition
       to everything it already did (Tom)
      </para>
 
@@ -4347,13 +4347,13 @@
 
     <listitem>
      <para>
-      Fix crash of <literal>xmlconcat(NULL)</> (Peter)
+      Fix crash of <literal>xmlconcat(NULL)</literal> (Peter)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <literal>ispell</> dictionary if high-bit-set
+      Fix possible crash in <literal>ispell</literal> dictionary if high-bit-set
       characters are used as flags (Teodor)
      </para>
 
@@ -4365,7 +4365,7 @@
 
     <listitem>
      <para>
-      Fix misordering of <application>pg_dump</> output for composite types
+      Fix misordering of <application>pg_dump</application> output for composite types
       (Tom)
      </para>
 
@@ -4377,13 +4377,13 @@
 
     <listitem>
      <para>
-      Improve handling of URLs in <function>headline()</> function (Teodor)
+      Improve handling of URLs in <function>headline()</function> function (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of overlength headlines in <function>headline()</>
+      Improve handling of overlength headlines in <function>headline()</function>
       function (Teodor)
      </para>
     </listitem>
@@ -4400,7 +4400,7 @@
      <para>
       Fix possible Assert failure if a statement executed in PL/pgSQL is
       rewritten into another kind of statement, for example if an
-      <command>INSERT</> is rewritten into an <command>UPDATE</> (Heikki)
+      <command>INSERT</command> is rewritten into an <command>UPDATE</command> (Heikki)
      </para>
     </listitem>
 
@@ -4410,7 +4410,7 @@
      </para>
 
      <para>
-      This primarily affects domains that are declared with <literal>CHECK</>
+      This primarily affects domains that are declared with <literal>CHECK</literal>
       constraints involving user-defined stable or immutable functions.  Such
       functions typically fail if no snapshot has been set.
      </para>
@@ -4425,7 +4425,7 @@
 
     <listitem>
      <para>
-      Avoid unnecessary locking of small tables in <command>VACUUM</>
+      Avoid unnecessary locking of small tables in <command>VACUUM</command>
       (Heikki)
      </para>
     </listitem>
@@ -4433,21 +4433,21 @@
     <listitem>
      <para>
       Fix a problem that sometimes kept <command>ALTER TABLE ENABLE/DISABLE
-      RULE</> from being recognized by active sessions (Tom)
+      RULE</command> from being recognized by active sessions (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix a problem that made <literal>UPDATE RETURNING tableoid</>
+      Fix a problem that made <literal>UPDATE RETURNING tableoid</literal>
       return zero instead of the correct OID (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow functions declared as taking <type>ANYARRAY</> to work on
-      the <structname>pg_statistic</> columns of that type (Tom)
+      Allow functions declared as taking <type>ANYARRAY</type> to work on
+      the <structname>pg_statistic</structname> columns of that type (Tom)
      </para>
 
      <para>
@@ -4463,13 +4463,13 @@
 
      <para>
       This could result in bad plans for queries like
-      <literal>... from a left join b on a.a1 = b.b1 where a.a1 = 42 ...</>
+      <literal>... from a left join b on a.a1 = b.b1 where a.a1 = 42 ...</literal>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve optimizer's handling of long <literal>IN</> lists (Tom)
+      Improve optimizer's handling of long <literal>IN</literal> lists (Tom)
      </para>
 
      <para>
@@ -4521,21 +4521,21 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s
-      <function>dblink_get_result(text,bool)</> function (Joe)
+      Fix <filename>contrib/dblink</filename>'s
+      <function>dblink_get_result(text,bool)</function> function (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible garbage output from <filename>contrib/sslinfo</> functions
+      Fix possible garbage output from <filename>contrib/sslinfo</filename> functions
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect behavior of <filename>contrib/tsearch2</> compatibility
+      Fix incorrect behavior of <filename>contrib/tsearch2</filename> compatibility
       trigger when it's fired more than once in a command (Teodor)
      </para>
     </listitem>
@@ -4554,29 +4554,29 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s handling of varchar structs (Michael)
+      Fix <application>ecpg</application>'s handling of varchar structs (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>configure</> script to properly report failure when
+      Fix <application>configure</application> script to properly report failure when
       unable to obtain linkage information for PL/Perl (Andrew)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make all documentation reference <literal>pgsql-bugs</> and/or
-      <literal>pgsql-hackers</> as appropriate, instead of the
-      now-decommissioned <literal>pgsql-ports</> and <literal>pgsql-patches</>
+      Make all documentation reference <literal>pgsql-bugs</literal> and/or
+      <literal>pgsql-hackers</literal> as appropriate, instead of the
+      now-decommissioned <literal>pgsql-ports</literal> and <literal>pgsql-patches</literal>
       mailing lists (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009a (for
+      Update time zone data files to <application>tzdata</application> release 2009a (for
       Kathmandu and historical DST corrections in Switzerland, Cuba)
      </para>
     </listitem>
@@ -4597,7 +4597,7 @@
   <para>
    This release contains a variety of fixes from 8.3.4.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -4606,8 +4606,8 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
-    see <xref linkend="release-8-3-1">.  Also, if you were running a previous
-    8.3.X release, it is recommended to <command>REINDEX</> all GiST
+    see <xref linkend="release-8-3-1"/>.  Also, if you were running a previous
+    8.3.X release, it is recommended to <command>REINDEX</command> all GiST
     indexes after the upgrade.
    </para>
 
@@ -4621,13 +4621,13 @@
     <listitem>
      <para>
       Fix GiST index corruption due to marking the wrong index entry
-      <quote>dead</> after a deletion (Teodor)
+      <quote>dead</quote> after a deletion (Teodor)
      </para>
 
      <para>
       This would result in index searches failing to find rows they
       should have found.  Corrupted indexes can be fixed with
-      <command>REINDEX</>.
+      <command>REINDEX</command>.
      </para>
     </listitem>
 
@@ -4639,7 +4639,7 @@
 
      <para>
       We have addressed similar issues before, but it would still fail if
-      the <quote>character has no equivalent</> message itself couldn't
+      the <quote>character has no equivalent</quote> message itself couldn't
       be converted.  The fix is to disable localization and send the plain
       ASCII error message when we detect such a situation.
      </para>
@@ -4647,7 +4647,7 @@
 
     <listitem>
      <para>
-      Fix possible crash in <type>bytea</>-to-XML mapping (Michael McMaster)
+      Fix possible crash in <type>bytea</type>-to-XML mapping (Michael McMaster)
      </para>
     </listitem>
 
@@ -4660,8 +4660,8 @@
 
     <listitem>
      <para>
-      Improve optimization of <replaceable>expression</> <literal>IN</>
-      (<replaceable>expression-list</>) queries (Tom, per an idea from Robert
+      Improve optimization of <replaceable>expression</replaceable> <literal>IN</literal>
+      (<replaceable>expression-list</replaceable>) queries (Tom, per an idea from Robert
       Haas)
      </para>
 
@@ -4674,20 +4674,20 @@
 
     <listitem>
      <para>
-      Fix mis-expansion of rule queries when a sub-<literal>SELECT</> appears
-      in a function call in <literal>FROM</>,  a multi-row <literal>VALUES</>
-      list, or a <literal>RETURNING</> list (Tom)
+      Fix mis-expansion of rule queries when a sub-<literal>SELECT</literal> appears
+      in a function call in <literal>FROM</literal>,  a multi-row <literal>VALUES</literal>
+      list, or a <literal>RETURNING</literal> list (Tom)
      </para>
 
      <para>
-      The usual symptom of this problem is an <quote>unrecognized node type</>
+      The usual symptom of this problem is an <quote>unrecognized node type</quote>
       error.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Assert failure during rescan of an <literal>IS NULL</>
+      Fix Assert failure during rescan of an <literal>IS NULL</literal>
       search of a GiST index (Teodor)
      </para>
     </listitem>
@@ -4707,7 +4707,7 @@
 
     <listitem>
      <para>
-      Force a checkpoint before <command>CREATE DATABASE</> starts to copy
+      Force a checkpoint before <command>CREATE DATABASE</command> starts to copy
       files (Heikki)
      </para>
 
@@ -4719,9 +4719,9 @@
 
     <listitem>
      <para>
-      Prevent possible collision of <structfield>relfilenode</> numbers
+      Prevent possible collision of <structfield>relfilenode</structfield> numbers
       when moving a table to another tablespace with <command>ALTER SET
-      TABLESPACE</> (Heikki)
+      TABLESPACE</command> (Heikki)
      </para>
 
      <para>
@@ -4740,21 +4740,21 @@
     <listitem>
      <para>
       Fix improper display of fractional seconds in interval values when
-      using a non-ISO datestyle in an <option>--enable-integer-datetimes</>
+      using a non-ISO datestyle in an <option>--enable-integer-datetimes</option>
       build (Ron Mayer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <literal>ILIKE</> compare characters case-insensitively
+      Make <literal>ILIKE</literal> compare characters case-insensitively
       even when they're escaped (Andrew)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <command>DISCARD</> is handled properly by statement logging (Tom)
+      Ensure <command>DISCARD</command> is handled properly by statement logging (Tom)
      </para>
     </listitem>
 
@@ -4767,7 +4767,7 @@
 
     <listitem>
      <para>
-      Ensure <function>SPI_getvalue</> and <function>SPI_getbinval</>
+      Ensure <function>SPI_getvalue</function> and <function>SPI_getbinval</function>
       behave correctly when the passed tuple and tuple descriptor have
       different numbers of columns (Tom)
      </para>
@@ -4781,15 +4781,15 @@
 
     <listitem>
      <para>
-      Mark <varname>SessionReplicationRole</> as <literal>PGDLLIMPORT</>
-      so it can be used by <application>Slony</> on Windows (Magnus)
+      Mark <varname>SessionReplicationRole</varname> as <literal>PGDLLIMPORT</literal>
+      so it can be used by <application>Slony</application> on Windows (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix small memory leak when using <application>libpq</>'s
-      <literal>gsslib</> parameter (Magnus)
+      Fix small memory leak when using <application>libpq</application>'s
+      <literal>gsslib</literal> parameter (Magnus)
      </para>
 
      <para>
@@ -4800,38 +4800,38 @@
 
     <listitem>
      <para>
-      Ensure <application>libgssapi</> is linked into <application>libpq</>
+      Ensure <application>libgssapi</application> is linked into <application>libpq</application>
       if needed (Markus Schaaf)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s parsing of <command>CREATE ROLE</> (Michael)
+      Fix <application>ecpg</application>'s parsing of <command>CREATE ROLE</command> (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix recent breakage of <literal>pg_ctl restart</> (Tom)
+      Fix recent breakage of <literal>pg_ctl restart</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <filename>pg_control</> is opened in binary mode
+      Ensure <filename>pg_control</filename> is opened in binary mode
       (Itagaki Takahiro)
      </para>
 
      <para>
-      <application>pg_controldata</> and <application>pg_resetxlog</>
+      <application>pg_controldata</application> and <application>pg_resetxlog</application>
       did this incorrectly, and so could fail on Windows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008i (for
+      Update time zone data files to <application>tzdata</application> release 2008i (for
       DST law changes in Argentina, Brazil, Mauritius, Syria)
      </para>
     </listitem>
@@ -4852,7 +4852,7 @@
   <para>
    This release contains a variety of fixes from 8.3.3.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -4861,7 +4861,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
-    see <xref linkend="release-8-3-1">.
+    see <xref linkend="release-8-3-1"/>.
    </para>
 
   </sect2>
@@ -4888,41 +4888,41 @@
 
      <para>
       This error created a risk of corruption in system
-      catalogs that are consulted by <command>VACUUM</>: dead tuple versions
+      catalogs that are consulted by <command>VACUUM</command>: dead tuple versions
       might be removed too soon.  The impact of this on actual database
       operations would be minimal, since the system doesn't follow MVCC
       rules while examining catalogs, but it might result in transiently
-      wrong output from <application>pg_dump</> or other client programs.
+      wrong output from <application>pg_dump</application> or other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential miscalculation of <structfield>datfrozenxid</> (Alvaro)
+      Fix potential miscalculation of <structfield>datfrozenxid</structfield> (Alvaro)
      </para>
 
      <para>
       This error may explain some recent reports of failure to remove old
-      <structname>pg_clog</> data.
+      <structname>pg_clog</structname> data.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect HOT updates after <structname>pg_class</> is reindexed
+      Fix incorrect HOT updates after <structname>pg_class</structname> is reindexed
       (Tom)
      </para>
 
      <para>
-      Corruption of <structname>pg_class</> could occur if <literal>REINDEX
-      TABLE pg_class</> was followed in the same session by an <literal>ALTER
-      TABLE RENAME</> or <literal>ALTER TABLE SET SCHEMA</> command.
+      Corruption of <structname>pg_class</structname> could occur if <literal>REINDEX
+      TABLE pg_class</literal> was followed in the same session by an <literal>ALTER
+      TABLE RENAME</literal> or <literal>ALTER TABLE SET SCHEMA</literal> command.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix missed <quote>combo cid</> case (Karl Schnaitter)
+      Fix missed <quote>combo cid</quote> case (Karl Schnaitter)
      </para>
 
      <para>
@@ -4946,7 +4946,7 @@
      <para>
       This responds to reports that the counters could overflow in
       sufficiently long transactions, leading to unexpected <quote>lock is
-      already held</> errors.
+      already held</quote> errors.
      </para>
     </listitem>
 
@@ -4972,7 +4972,7 @@
     <listitem>
      <para>
       Fix missed permissions checks when a view contains a simple
-      <literal>UNION ALL</> construct (Heikki)
+      <literal>UNION ALL</literal> construct (Heikki)
      </para>
 
      <para>
@@ -4984,7 +4984,7 @@
     <listitem>
      <para>
       Add checks in executor startup to ensure that the tuples produced by an
-      <command>INSERT</> or <command>UPDATE</> will match the target table's
+      <command>INSERT</command> or <command>UPDATE</command> will match the target table's
       current rowtype (Tom)
      </para>
 
@@ -4996,12 +4996,12 @@
 
     <listitem>
      <para>
-      Fix possible repeated drops during <command>DROP OWNED</> (Tom)
+      Fix possible repeated drops during <command>DROP OWNED</command> (Tom)
      </para>
 
      <para>
       This would typically result in strange errors such as <quote>cache
-      lookup failed for relation NNN</>.
+      lookup failed for relation NNN</quote>.
      </para>
     </listitem>
 
@@ -5013,7 +5013,7 @@
 
     <listitem>
      <para>
-      Fix <function>xmlserialize()</> to raise error properly for
+      Fix <function>xmlserialize()</function> to raise error properly for
       unacceptable target data type (Tom)
      </para>
     </listitem>
@@ -5026,7 +5026,7 @@
 
      <para>
       Certain characters occurring in configuration files would always cause
-      <quote>invalid byte sequence for encoding</> failures.
+      <quote>invalid byte sequence for encoding</quote> failures.
      </para>
     </listitem>
 
@@ -5039,18 +5039,18 @@
 
     <listitem>
      <para>
-      Fix <literal>AT TIME ZONE</> to first try to interpret its timezone
+      Fix <literal>AT TIME ZONE</literal> to first try to interpret its timezone
       argument as a timezone abbreviation, and only try it as a full timezone
       name if that fails, rather than the other way around as formerly (Tom)
      </para>
 
      <para>
       The timestamp input functions have always resolved ambiguous zone names
-      in this order.  Making <literal>AT TIME ZONE</> do so as well improves
+      in this order.  Making <literal>AT TIME ZONE</literal> do so as well improves
       consistency, and fixes a compatibility bug introduced in 8.1:
       in ambiguous cases we now behave the same as 8.0 and before did,
-      since in the older versions <literal>AT TIME ZONE</> accepted
-      <emphasis>only</> abbreviations.
+      since in the older versions <literal>AT TIME ZONE</literal> accepted
+      <emphasis>only</emphasis> abbreviations.
      </para>
     </listitem>
 
@@ -5077,26 +5077,26 @@
     <listitem>
      <para>
       Allow spaces in the suffix part of an LDAP URL in
-      <filename>pg_hba.conf</> (Tom)
+      <filename>pg_hba.conf</filename> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix bug in backwards scanning of a cursor on a <literal>SELECT DISTINCT
-      ON</> query (Tom)
+      ON</literal> query (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner bug that could improperly push down <literal>IS NULL</>
+      Fix planner bug that could improperly push down <literal>IS NULL</literal>
       tests below an outer join (Tom)
      </para>
 
      <para>
-      This was triggered by occurrence of <literal>IS NULL</> tests for
-      the same relation in all arms of an upper <literal>OR</> clause.
+      This was triggered by occurrence of <literal>IS NULL</literal> tests for
+      the same relation in all arms of an upper <literal>OR</literal> clause.
      </para>
     </listitem>
 
@@ -5114,21 +5114,21 @@
 
     <listitem>
      <para>
-      Fix planner to estimate that <literal>GROUP BY</> expressions yielding
+      Fix planner to estimate that <literal>GROUP BY</literal> expressions yielding
       boolean results always result in two groups, regardless of the
       expressions' contents (Tom)
      </para>
 
      <para>
       This is very substantially more accurate than the regular <literal>GROUP
-      BY</> estimate for certain boolean tests like <replaceable>col</>
-      <literal>IS NULL</>.
+      BY</literal> estimate for certain boolean tests like <replaceable>col</replaceable>
+      <literal>IS NULL</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL to not fail when a <literal>FOR</> loop's target variable
+      Fix PL/pgSQL to not fail when a <literal>FOR</literal> loop's target variable
       is a record containing composite-type fields (Tom)
      </para>
     </listitem>
@@ -5142,49 +5142,49 @@
 
     <listitem>
      <para>
-      Improve performance of <function>PQescapeBytea()</> (Rudolf Leitgeb)
+      Improve performance of <function>PQescapeBytea()</function> (Rudolf Leitgeb)
      </para>
     </listitem>
 
     <listitem>
      <para>
       On Windows, work around a Microsoft bug by preventing
-      <application>libpq</> from trying to send more than 64kB per system call
+      <application>libpq</application> from trying to send more than 64kB per system call
       (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to handle variables properly in <command>SET</>
+      Fix <application>ecpg</application> to handle variables properly in <command>SET</command>
       commands (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       error reporting after failure to send a SQL command (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to properly preserve postmaster
-      command-line arguments across a <literal>restart</> (Bruce)
+      Fix <application>pg_ctl</application> to properly preserve postmaster
+      command-line arguments across a <literal>restart</literal> (Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous WAL file cutoff point calculation in
-      <application>pg_standby</> (Simon)
+      <application>pg_standby</application> (Simon)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008f (for
+      Update time zone data files to <application>tzdata</application> release 2008f (for
       DST law changes in Argentina, Bahamas, Brazil, Mauritius, Morocco,
       Pakistan, Palestine, and Paraguay)
      </para>
@@ -5206,7 +5206,7 @@
   <para>
    This release contains one serious and one minor bug fix over 8.3.2.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -5215,7 +5215,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
-    see <xref linkend="release-8-3-1">.
+    see <xref linkend="release-8-3-1"/>.
    </para>
 
   </sect2>
@@ -5227,18 +5227,18 @@
 
     <listitem>
      <para>
-      Make <function>pg_get_ruledef()</> parenthesize negative constants (Tom)
+      Make <function>pg_get_ruledef()</function> parenthesize negative constants (Tom)
      </para>
 
      <para>
       Before this fix, a negative constant in a view or rule might be dumped
-      as, say, <literal>-42::integer</>, which is subtly incorrect: it should
-      be <literal>(-42)::integer</> due to operator precedence rules.
+      as, say, <literal>-42::integer</literal>, which is subtly incorrect: it should
+      be <literal>(-42)::integer</literal> due to operator precedence rules.
       Usually this would make little difference, but it could interact with
       another recent patch to cause
-      <productname>PostgreSQL</> to reject what had been a valid
-      <command>SELECT DISTINCT</> view query.  Since this could result in
-      <application>pg_dump</> output failing to reload, it is being treated
+      <productname>PostgreSQL</productname> to reject what had been a valid
+      <command>SELECT DISTINCT</command> view query.  Since this could result in
+      <application>pg_dump</application> output failing to reload, it is being treated
       as a high-priority fix.  The only released versions in which dump
       output is actually incorrect are 8.3.1 and 8.2.7.
      </para>
@@ -5246,13 +5246,13 @@
 
     <listitem>
      <para>
-      Make <command>ALTER AGGREGATE ... OWNER TO</> update
-      <structname>pg_shdepend</> (Tom)
+      Make <command>ALTER AGGREGATE ... OWNER TO</command> update
+      <structname>pg_shdepend</structname> (Tom)
      </para>
 
      <para>
       This oversight could lead to problems if the aggregate was later
-      involved in a <command>DROP OWNED</> or <command>REASSIGN OWNED</>
+      involved in a <command>DROP OWNED</command> or <command>REASSIGN OWNED</command>
       operation.
      </para>
     </listitem>
@@ -5273,7 +5273,7 @@
   <para>
    This release contains a variety of fixes from 8.3.1.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -5282,7 +5282,7 @@
    <para>
     A dump/restore is not required for those running 8.3.X.
     However, if you are upgrading from a version earlier than 8.3.1,
-    see <xref linkend="release-8-3-1">.
+    see <xref linkend="release-8-3-1"/>.
    </para>
 
   </sect2>
@@ -5303,19 +5303,19 @@
     <listitem>
      <para>
       Fix incorrect archive truncation point calculation for the
-      <literal>%r</> macro in <varname>restore_command</> parameters
+      <literal>%r</literal> macro in <varname>restore_command</varname> parameters
       (Simon)
      </para>
 
      <para>
       This could lead to data loss if a warm-standby script relied on
-      <literal>%r</> to decide when to throw away WAL segment files.
+      <literal>%r</literal> to decide when to throw away WAL segment files.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</> so that the new
+      Fix <command>ALTER TABLE ADD COLUMN ... PRIMARY KEY</command> so that the new
       column is correctly checked to see if it's been initialized to all
       non-nulls (Brendan Jurd)
      </para>
@@ -5327,31 +5327,31 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> so that it works on procedural
+      Fix <command>REASSIGN OWNED</command> so that it works on procedural
       languages too (Alvaro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix problems with <command>SELECT FOR UPDATE/SHARE</> occurring as a
-      subquery in a query with a non-<command>SELECT</> top-level operation
+      Fix problems with <command>SELECT FOR UPDATE/SHARE</command> occurring as a
+      subquery in a query with a non-<command>SELECT</command> top-level operation
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <command>CREATE TABLE</> failure when inheriting the
-      <quote>same</> constraint from multiple parent relations that
+      Fix possible <command>CREATE TABLE</command> failure when inheriting the
+      <quote>same</quote> constraint from multiple parent relations that
       inherited that constraint from a common ancestor (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to show the alias, if any, attached
-      to the target table of an <command>UPDATE</> or <command>DELETE</>
+      Fix <function>pg_get_ruledef()</function> to show the alias, if any, attached
+      to the target table of an <command>UPDATE</command> or <command>DELETE</command>
       (Tom)
      </para>
     </listitem>
@@ -5377,13 +5377,13 @@
 
     <listitem>
      <para>
-      Fix broken GiST comparison function for <type>tsquery</> (Teodor)
+      Fix broken GiST comparison function for <type>tsquery</type> (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>tsvector_update_trigger()</> and <function>ts_stat()</>
+      Fix <function>tsvector_update_trigger()</function> and <function>ts_stat()</function>
       to accept domains over the types they expect to work with (Tom)
      </para>
     </listitem>
@@ -5404,7 +5404,7 @@
     <listitem>
      <para>
       Fix race conditions between delayed unlinks and <command>DROP
-      DATABASE</> (Heikki)
+      DATABASE</command> (Heikki)
      </para>
 
      <para>
@@ -5431,11 +5431,11 @@
     <listitem>
      <para>
       Fix possible crash due to incorrect plan generated for an
-      <literal><replaceable>x</> IN (SELECT <replaceable>y</>
-      FROM ...)</literal> clause when <replaceable>x</> and <replaceable>y</>
+      <literal><replaceable>x</replaceable> IN (SELECT <replaceable>y</replaceable>
+      FROM ...)</literal> clause when <replaceable>x</replaceable> and <replaceable>y</replaceable>
       have different data types; and make sure the behavior is semantically
-      correct when the conversion from <replaceable>y</>'s type to
-      <replaceable>x</>'s type is lossy (Tom)
+      correct when the conversion from <replaceable>y</replaceable>'s type to
+      <replaceable>x</replaceable>'s type is lossy (Tom)
      </para>
     </listitem>
 
@@ -5456,15 +5456,15 @@
 
     <listitem>
      <para>
-      Fix planner failure when an indexable <function>MIN</> or
-      <function>MAX</> aggregate is used with <literal>DISTINCT</> or
-      <literal>ORDER BY</> (Tom)
+      Fix planner failure when an indexable <function>MIN</function> or
+      <function>MAX</function> aggregate is used with <literal>DISTINCT</literal> or
+      <literal>ORDER BY</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner to ensure it never uses a <quote>physical tlist</> for a
+      Fix planner to ensure it never uses a <quote>physical tlist</quote> for a
       plan node that is feeding a Sort node (Tom)
      </para>
 
@@ -5488,7 +5488,7 @@
 
     <listitem>
      <para>
-      Make <function>TransactionIdIsCurrentTransactionId()</> use binary
+      Make <function>TransactionIdIsCurrentTransactionId()</function> use binary
       search instead of linear search when checking child-transaction XIDs
       (Heikki)
      </para>
@@ -5502,14 +5502,14 @@
     <listitem>
      <para>
       Fix conversions between ISO-8859-5 and other encodings to handle
-      Cyrillic <quote>Yo</> characters (<literal>e</> and <literal>E</> with
+      Cyrillic <quote>Yo</quote> characters (<literal>e</literal> and <literal>E</literal> with
       two dots) (Sergey Burladyan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several datatype input functions, notably <function>array_in()</>,
+      Fix several datatype input functions, notably <function>array_in()</function>,
       that were allowing unused bytes in their results to contain
       uninitialized, unpredictable values (Tom)
      </para>
@@ -5517,7 +5517,7 @@
      <para>
       This could lead to failures in which two apparently identical literal
       values were not seen as equal, resulting in the parser complaining
-      about unmatched <literal>ORDER BY</> and <literal>DISTINCT</>
+      about unmatched <literal>ORDER BY</literal> and <literal>DISTINCT</literal>
       expressions.
      </para>
     </listitem>
@@ -5525,18 +5525,18 @@
     <listitem>
      <para>
       Fix a corner case in regular-expression substring matching
-      (<literal>substring(<replaceable>string</> from
-      <replaceable>pattern</>)</literal>) (Tom)
+      (<literal>substring(<replaceable>string</replaceable> from
+      <replaceable>pattern</replaceable>)</literal>) (Tom)
      </para>
 
      <para>
       The problem occurs when there is a match to the pattern overall but
       the user has specified a parenthesized subexpression and that
       subexpression hasn't got a match.  An example is
-      <literal>substring('foo' from 'foo(bar)?')</>.
-      This should return NULL, since <literal>(bar)</> isn't matched, but
+      <literal>substring('foo' from 'foo(bar)?')</literal>.
+      This should return NULL, since <literal>(bar)</literal> isn't matched, but
       it was mistakenly returning the whole-pattern match instead (ie,
-      <literal>foo</>).
+      <literal>foo</literal>).
      </para>
     </listitem>
 
@@ -5549,7 +5549,7 @@
 
     <listitem>
      <para>
-      Improve <command>ANALYZE</>'s handling of in-doubt tuples (those
+      Improve <command>ANALYZE</command>'s handling of in-doubt tuples (those
       inserted or deleted by a not-yet-committed transaction) so that the
       counts it reports to the stats collector are more likely to be correct
       (Pavan Deolasee)
@@ -5558,14 +5558,14 @@
 
     <listitem>
      <para>
-      Fix <application>initdb</> to reject a relative path for its
-      <literal>--xlogdir</> (<literal>-X</>) option (Tom)
+      Fix <application>initdb</application> to reject a relative path for its
+      <literal>--xlogdir</literal> (<literal>-X</literal>) option (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>psql</> print tab characters as an appropriate
+      Make <application>psql</application> print tab characters as an appropriate
       number of spaces, rather than <literal>\x09</literal> as was done in
       8.3.0 and 8.3.1 (Bruce)
      </para>
@@ -5573,7 +5573,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008c (for
+      Update time zone data files to <application>tzdata</application> release 2008c (for
       DST law changes in Morocco, Iraq, Choibalsan, Pakistan, Syria, Cuba, and
       Argentina/San_Luis)
      </para>
@@ -5581,44 +5581,44 @@
 
     <listitem>
      <para>
-      Add <function>ECPGget_PGconn()</> function to
-      <application>ecpglib</> (Michael)
+      Add <function>ECPGget_PGconn()</function> function to
+      <application>ecpglib</application> (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect result from <application>ecpg</>'s
-      <function>PGTYPEStimestamp_sub()</> function (Michael)
+      Fix incorrect result from <application>ecpg</application>'s
+      <function>PGTYPEStimestamp_sub()</function> function (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of continuation line markers in <application>ecpg</>
+      Fix handling of continuation line markers in <application>ecpg</application>
       (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes in <filename>contrib/cube</> functions (Tom)
+      Fix possible crashes in <filename>contrib/cube</filename> functions (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix core dump in <filename>contrib/xml2</>'s
-      <function>xpath_table()</> function when the input query returns a
+      Fix core dump in <filename>contrib/xml2</filename>'s
+      <function>xpath_table()</function> function when the input query returns a
       NULL value (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s makefile to not override
-      <literal>CFLAGS</>, and make it auto-configure properly for
-      <application>libxslt</> present or not (Tom)
+      Fix <filename>contrib/xml2</filename>'s makefile to not override
+      <literal>CFLAGS</literal>, and make it auto-configure properly for
+      <application>libxslt</application> present or not (Tom)
      </para>
     </listitem>
 
@@ -5638,7 +5638,7 @@
   <para>
    This release contains a variety of fixes from 8.3.0.
    For information about new features in the 8.3 major release, see
-   <xref linkend="release-8-3">.
+   <xref linkend="release-8-3"/>.
   </para>
 
   <sect2>
@@ -5646,7 +5646,7 @@
 
    <para>
     A dump/restore is not required for those running 8.3.X.
-    However, you might need to <command>REINDEX</> indexes on textual
+    However, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the Windows locale
     issue described below.
    </para>
@@ -5670,17 +5670,17 @@
       over two years ago, but Windows with UTF-8 uses a separate code
       path that was not updated.  If you are using a locale that
       considers some non-identical strings as equal, you may need to
-      <command>REINDEX</> to fix existing indexes on textual columns.
+      <command>REINDEX</command> to fix existing indexes on textual columns.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Repair corner-case bugs in <command>VACUUM FULL</> (Tom)
+      Repair corner-case bugs in <command>VACUUM FULL</command> (Tom)
      </para>
 
      <para>
-      A potential deadlock between concurrent <command>VACUUM FULL</>
+      A potential deadlock between concurrent <command>VACUUM FULL</command>
       operations on different system catalogs was introduced in 8.2.
       This has now been corrected.  8.3 made this worse because the
       deadlock could occur within a critical code section, making it
@@ -5688,13 +5688,13 @@
      </para>
 
      <para>
-      Also, a <command>VACUUM FULL</> that failed partway through
+      Also, a <command>VACUUM FULL</command> that failed partway through
       vacuuming a system catalog could result in cache corruption in
       concurrent database sessions.
      </para>
 
      <para>
-      Another <command>VACUUM FULL</> bug introduced in 8.3 could
+      Another <command>VACUUM FULL</command> bug introduced in 8.3 could
       result in a crash or out-of-memory report when dealing with
       pages containing no live tuples.
      </para>
@@ -5702,13 +5702,13 @@
 
     <listitem>
      <para>
-      Fix misbehavior of foreign key checks involving <type>character</>
-      or <type>bit</> columns (Tom)
+      Fix misbehavior of foreign key checks involving <type>character</type>
+      or <type>bit</type> columns (Tom)
      </para>
 
      <para>
       If the referencing column were of a different but compatible type
-      (for instance <type>varchar</>), the constraint was enforced incorrectly.
+      (for instance <type>varchar</type>), the constraint was enforced incorrectly.
      </para>
     </listitem>
 
@@ -5726,7 +5726,7 @@
 
      <para>
       This bug affected only protocol-level prepare operations, not
-      SQL <command>PREPARE</>, and so tended to be seen only with
+      SQL <command>PREPARE</command>, and so tended to be seen only with
       JDBC, DBI, and other client-side drivers that use prepared
       statements heavily.
      </para>
@@ -5748,21 +5748,21 @@
 
     <listitem>
      <para>
-      Fix longstanding <command>LISTEN</>/<command>NOTIFY</>
+      Fix longstanding <command>LISTEN</command>/<command>NOTIFY</command>
       race condition (Tom)
      </para>
 
      <para>
       In rare cases a session that had just executed a
-      <command>LISTEN</> might not get a notification, even though
+      <command>LISTEN</command> might not get a notification, even though
       one would be expected because the concurrent transaction executing
-      <command>NOTIFY</> was observed to commit later.
+      <command>NOTIFY</command> was observed to commit later.
      </para>
 
      <para>
       A side effect of the fix is that a transaction that has executed
-      a not-yet-committed <command>LISTEN</> command will not see any
-      row in <structname>pg_listener</> for the <command>LISTEN</>,
+      a not-yet-committed <command>LISTEN</command> command will not see any
+      row in <structname>pg_listener</structname> for the <command>LISTEN</command>,
       should it choose to look; formerly it would have.  This behavior
       was never documented one way or the other, but it is possible that
       some applications depend on the old behavior.
@@ -5771,14 +5771,14 @@
 
     <listitem>
      <para>
-      Disallow <command>LISTEN</> and <command>UNLISTEN</> within a
+      Disallow <command>LISTEN</command> and <command>UNLISTEN</command> within a
       prepared transaction (Tom)
      </para>
 
      <para>
       This was formerly allowed but trying to do it had various unpleasant
       consequences, notably that the originating backend could not exit
-      as long as an <command>UNLISTEN</> remained uncommitted.
+      as long as an <command>UNLISTEN</command> remained uncommitted.
      </para>
     </listitem>
 
@@ -5803,20 +5803,20 @@
 
     <listitem>
      <para>
-      Fix incorrect comparison of <type>tsquery</> values (Teodor)
+      Fix incorrect comparison of <type>tsquery</type> values (Teodor)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect behavior of <literal>LIKE</> with non-ASCII characters
+      Fix incorrect behavior of <literal>LIKE</literal> with non-ASCII characters
       in single-byte encodings (Rolf Jentsch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disable <function>xmlvalidate</> (Tom)
+      Disable <function>xmlvalidate</function> (Tom)
      </para>
 
      <para>
@@ -5835,8 +5835,8 @@
 
     <listitem>
      <para>
-      Make <function>encode(<replaceable>bytea</>, 'escape')</> convert all
-      high-bit-set byte values into <literal>\</><replaceable>nnn</> octal
+      Make <function>encode(<replaceable>bytea</replaceable>, 'escape')</function> convert all
+      high-bit-set byte values into <literal>\</literal><replaceable>nnn</replaceable> octal
       escape sequences (Tom)
      </para>
 
@@ -5844,7 +5844,7 @@
       This is necessary to avoid encoding problems when the database
       encoding is multi-byte.  This change could pose compatibility issues
       for applications that are expecting specific results from
-      <function>encode</>.
+      <function>encode</function>.
      </para>
     </listitem>
 
@@ -5860,21 +5860,21 @@
 
     <listitem>
      <para>
-      Fix <quote>unrecognized node type</> error in some variants of
-      <command>ALTER OWNER</> (Tom)
+      Fix <quote>unrecognized node type</quote> error in some variants of
+      <command>ALTER OWNER</command> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid tablespace permissions errors in <command>CREATE TABLE LIKE
-      INCLUDING INDEXES</> (Tom)
+      INCLUDING INDEXES</command> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structname>pg_stat_activity</>.<structfield>waiting</> flag
+      Ensure <structname>pg_stat_activity</structname>.<structfield>waiting</structfield> flag
       is cleared when a lock wait is aborted (Tom)
      </para>
     </listitem>
@@ -5892,26 +5892,26 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2008a
+      Update time zone data files to <application>tzdata</application> release 2008a
       (in particular, recent Chile changes); adjust timezone abbreviation
-      <literal>VET</> (Venezuela) to mean UTC-4:30, not UTC-4:00 (Tom)
+      <literal>VET</literal> (Venezuela) to mean UTC-4:30, not UTC-4:00 (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> problems with arrays (Michael)
+      Fix <application>ecpg</application> problems with arrays (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to correctly extract the postmaster's port
+      Fix <application>pg_ctl</application> to correctly extract the postmaster's port
       number from command-line options (Itagaki Takahiro, Tom)
      </para>
 
      <para>
-      Previously, <literal>pg_ctl start -w</> could try to contact the
+      Previously, <literal>pg_ctl start -w</literal> could try to contact the
       postmaster on the wrong port, leading to bogus reports of startup
       failure.
      </para>
@@ -5919,19 +5919,19 @@
 
     <listitem>
      <para>
-      Use <option>-fwrapv</> to defend against possible misoptimization
-      in recent <application>gcc</> versions (Tom)
+      Use <option>-fwrapv</option> to defend against possible misoptimization
+      in recent <application>gcc</application> versions (Tom)
      </para>
 
      <para>
-      This is known to be necessary when building <productname>PostgreSQL</>
-      with <application>gcc</> 4.3 or later.
+      This is known to be necessary when building <productname>PostgreSQL</productname>
+      with <application>gcc</application> 4.3 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Enable building <filename>contrib/uuid-ossp</> with MSVC (Hiroshi Saito)
+      Enable building <filename>contrib/uuid-ossp</filename> with MSVC (Hiroshi Saito)
      </para>
     </listitem>
 
@@ -5954,7 +5954,7 @@
    <para>
     With significant new functionality and performance enhancements,
     this release represents a major leap forward for
-    <productname>PostgreSQL</>. This was made possible by a growing
+    <productname>PostgreSQL</productname>. This was made possible by a growing
     community that has dramatically accelerated the pace of
     development. This release adds the following major features:
    </para>
@@ -5988,13 +5988,13 @@
 
     <listitem>
      <para>
-      Universally Unique Identifier (<type>UUID</>) data type
+      Universally Unique Identifier (<type>UUID</type>) data type
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add control over whether <literal>NULL</>s sort first or last
+      Add control over whether <literal>NULL</literal>s sort first or last
      </para>
     </listitem>
 
@@ -6032,7 +6032,7 @@
 
     <listitem>
      <para>
-      Support Security Service Provider Interface (<acronym>SSPI</>) for
+      Support Security Service Provider Interface (<acronym>SSPI</acronym>) for
       authentication on Windows
      </para>
     </listitem>
@@ -6046,8 +6046,8 @@
 
     <listitem>
      <para>
-      Allow the whole <productname>PostgreSQL</> distribution to be compiled
-      with <productname>Microsoft Visual C++</>
+      Allow the whole <productname>PostgreSQL</productname> distribution to be compiled
+      with <productname>Microsoft Visual C++</productname>
      </para>
     </listitem>
 
@@ -6076,8 +6076,8 @@
 
     <listitem>
      <para>
-      Heap-Only Tuples (<acronym>HOT</>) accelerate space reuse for
-      most <command>UPDATE</>s and <command>DELETE</>s
+      Heap-Only Tuples (<acronym>HOT</acronym>) accelerate space reuse for
+      most <command>UPDATE</command>s and <command>DELETE</command>s
      </para>
     </listitem>
 
@@ -6091,7 +6091,7 @@
     <listitem>
      <para>
       Using non-persistent transaction IDs for read-only transactions
-      reduces overhead and <command>VACUUM</> requirements
+      reduces overhead and <command>VACUUM</command> requirements
      </para>
     </listitem>
 
@@ -6116,7 +6116,7 @@
 
     <listitem>
      <para>
-      <literal>ORDER BY ... LIMIT</> can be done without sorting
+      <literal>ORDER BY ... LIMIT</literal> can be done without sorting
      </para>
     </listitem>
 
@@ -6148,14 +6148,14 @@
      <listitem>
       <para>
        Non-character data types are no longer automatically cast to
-       <type>TEXT</> (Peter, Tom)
+       <type>TEXT</type> (Peter, Tom)
       </para>
 
       <para>
        Previously, if a non-character value was supplied to an operator or
-       function that requires <type>text</> input, it was automatically
-       cast to <type>text</>, for most (though not all) built-in data types.
-       This no longer happens: an explicit cast to <type>text</> is now
+       function that requires <type>text</type> input, it was automatically
+       cast to <type>text</type>, for most (though not all) built-in data types.
+       This no longer happens: an explicit cast to <type>text</type> is now
        required for all non-character-string types.  For example, these
        expressions formerly worked:
 
@@ -6164,15 +6164,15 @@ substr(current_date, 1, 4)
 23 LIKE '2%'
 </programlisting>
 
-       but will now draw <quote>function does not exist</> and <quote>operator
-       does not exist</> errors respectively.  Use an explicit cast instead:
+       but will now draw <quote>function does not exist</quote> and <quote>operator
+       does not exist</quote> errors respectively.  Use an explicit cast instead:
 
 <programlisting>
 substr(current_date::text, 1, 4)
 23::text LIKE '2%'
 </programlisting>
 
-       (Of course, you can use the more verbose <literal>CAST()</> syntax too.)
+       (Of course, you can use the more verbose <literal>CAST()</literal> syntax too.)
        The reason for the change is that these automatic casts too often caused
        surprising behavior.  An example is that in previous releases, this
        expression was accepted but did not do what was expected:
@@ -6183,35 +6183,35 @@ current_date &lt; 2017-11-17
 
        This is actually comparing a date to an integer, which should be
        (and now is) rejected &mdash; but in the presence of automatic
-       casts both sides were cast to <type>text</> and a textual comparison
-       was done, because the <literal>text &lt; text</> operator was able
-       to match the expression when no other <literal>&lt;</> operator could.
+       casts both sides were cast to <type>text</type> and a textual comparison
+       was done, because the <literal>text &lt; text</literal> operator was able
+       to match the expression when no other <literal>&lt;</literal> operator could.
       </para>
 
       <para>
-       Types <type>char(<replaceable>n</>)</type> and
-       <type>varchar(<replaceable>n</>)</type> still cast to <type>text</>
-       automatically.  Also, automatic casting to <type>text</> still works for
-       inputs to the concatenation (<literal>||</>) operator, so long as least
+       Types <type>char(<replaceable>n</replaceable>)</type> and
+       <type>varchar(<replaceable>n</replaceable>)</type> still cast to <type>text</type>
+       automatically.  Also, automatic casting to <type>text</type> still works for
+       inputs to the concatenation (<literal>||</literal>) operator, so long as least
        one input is a character-string type.
       </para>
      </listitem>
 
      <listitem>
       <para>
-        Full text search features from <filename>contrib/tsearch2</> have
+        Full text search features from <filename>contrib/tsearch2</filename> have
         been moved into the core server, with some minor syntax changes
       </para>
 
       <para>
-       <filename>contrib/tsearch2</> now contains a compatibility
+       <filename>contrib/tsearch2</filename> now contains a compatibility
        interface.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <literal>ARRAY(SELECT ...)</literal>, where the <command>SELECT</>
+       <literal>ARRAY(SELECT ...)</literal>, where the <command>SELECT</command>
        returns no rows, now returns an empty array, rather than NULL
        (Tom)
       </para>
@@ -6233,8 +6233,8 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       <literal>ORDER BY ... USING</> <replaceable>operator</> must now
-       use a less-than or greater-than <replaceable>operator</> that is
+       <literal>ORDER BY ... USING</literal> <replaceable>operator</replaceable> must now
+       use a less-than or greater-than <replaceable>operator</replaceable> that is
        defined in a btree operator class
       </para>
 
@@ -6251,7 +6251,7 @@ current_date &lt; 2017-11-17
 
       <para>
        Previously <command>SET LOCAL</command>'s effects were lost
-       after subtransaction commit (<command>RELEASE SAVEPOINT</>
+       after subtransaction commit (<command>RELEASE SAVEPOINT</command>
        or exit from a PL/pgSQL exception block).
       </para>
      </listitem>
@@ -6263,15 +6263,15 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       For example, <literal>"BEGIN; DROP DATABASE; COMMIT"</> will now be
+       For example, <literal>"BEGIN; DROP DATABASE; COMMIT"</literal> will now be
        rejected even if submitted as a single query message.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <command>ROLLBACK</> outside a transaction block now
-       issues <literal>NOTICE</> instead of <literal>WARNING</> (Bruce)
+       <command>ROLLBACK</command> outside a transaction block now
+       issues <literal>NOTICE</literal> instead of <literal>WARNING</literal> (Bruce)
       </para>
      </listitem>
 
@@ -6282,15 +6282,15 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       Formerly, these commands accepted <literal>schema.relation</> but
+       Formerly, these commands accepted <literal>schema.relation</literal> but
        ignored the schema part, which was confusing.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <command>ALTER SEQUENCE</> no longer affects the sequence's
-       <function>currval()</> state (Tom)
+       <command>ALTER SEQUENCE</command> no longer affects the sequence's
+       <function>currval()</function> state (Tom)
       </para>
      </listitem>
 
@@ -6314,16 +6314,16 @@ current_date &lt; 2017-11-17
 
       <para>
        For example, <function>pg_database_size()</function> now requires
-       <literal>CONNECT</> permission, which is granted to everyone by
+       <literal>CONNECT</literal> permission, which is granted to everyone by
        default. <function>pg_tablespace_size()</function> requires
-       <literal>CREATE</> permission in the tablespace, or is allowed if
+       <literal>CREATE</literal> permission in the tablespace, or is allowed if
        the tablespace is the default tablespace for the database.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove the undocumented <literal>!!=</> (not in) operator (Tom)
+       Remove the undocumented <literal>!!=</literal> (not in) operator (Tom)
       </para>
 
       <para>
@@ -6339,7 +6339,7 @@ current_date &lt; 2017-11-17
 
       <para>
        If application code was computing and storing hash values using
-       internal <productname>PostgreSQL</> hashing functions, the hash
+       internal <productname>PostgreSQL</productname> hashing functions, the hash
        values must be regenerated.
       </para>
      </listitem>
@@ -6351,8 +6351,8 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       The new <function>SET_VARSIZE()</> macro <emphasis>must</> be used
-       to set the length of generated <type>varlena</> values. Also, it
+       The new <function>SET_VARSIZE()</function> macro <emphasis>must</emphasis> be used
+       to set the length of generated <type>varlena</type> values. Also, it
        might be necessary to expand (<quote>de-TOAST</quote>) input values
        in more cases.
       </para>
@@ -6361,7 +6361,7 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Continuous archiving no longer reports each successful archive
-       operation to the server logs unless <literal>DEBUG</> level is used
+       operation to the server logs unless <literal>DEBUG</literal> level is used
        (Simon)
       </para>
      </listitem>
@@ -6381,18 +6381,18 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       <varname>bgwriter_lru_percent</>,
-       <varname>bgwriter_all_percent</>,
-       <varname>bgwriter_all_maxpages</>,
-       <varname>stats_start_collector</>, and
-       <varname>stats_reset_on_server_start</> are removed.
-       <varname>redirect_stderr</> is renamed to
-       <varname>logging_collector</>.
-       <varname>stats_command_string</> is renamed to
-       <varname>track_activities</>.
-       <varname>stats_block_level</> and <varname>stats_row_level</>
-       are merged into <varname>track_counts</>.
-       A new boolean configuration parameter, <varname>archive_mode</>,
+       <varname>bgwriter_lru_percent</varname>,
+       <varname>bgwriter_all_percent</varname>,
+       <varname>bgwriter_all_maxpages</varname>,
+       <varname>stats_start_collector</varname>, and
+       <varname>stats_reset_on_server_start</varname> are removed.
+       <varname>redirect_stderr</varname> is renamed to
+       <varname>logging_collector</varname>.
+       <varname>stats_command_string</varname> is renamed to
+       <varname>track_activities</varname>.
+       <varname>stats_block_level</varname> and <varname>stats_row_level</varname>
+       are merged into <varname>track_counts</varname>.
+       A new boolean configuration parameter, <varname>archive_mode</varname>,
        controls archiving. Autovacuum's default settings have changed.
       </para>
      </listitem>
@@ -6403,7 +6403,7 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       We now always start the collector process, unless <acronym>UDP</>
+       We now always start the collector process, unless <acronym>UDP</acronym>
        socket creation fails.
       </para>
      </listitem>
@@ -6421,7 +6421,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Commenting out a parameter in <filename>postgresql.conf</> now
+       Commenting out a parameter in <filename>postgresql.conf</filename> now
        causes it to revert to its default value (Joachim Wieland)
       </para>
 
@@ -6461,12 +6461,12 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       On most platforms, <literal>C</> locale is the only locale that
+       On most platforms, <literal>C</literal> locale is the only locale that
        will work with any database encoding.  Other locale settings imply
        a specific encoding and will misbehave if the database encoding
        is something different.  (Typical symptoms include bogus textual
-       sort order and wrong results from <function>upper()</> or
-       <function>lower()</>.)  The server now rejects attempts to create
+       sort order and wrong results from <function>upper()</function> or
+       <function>lower()</function>.)  The server now rejects attempts to create
        databases that have an incompatible encoding.
       </para>
      </listitem>
@@ -6503,7 +6503,7 @@ current_date &lt; 2017-11-17
        <listitem>
         <para>
          <function>convert_from(bytea, name)</function> returns
-         <type>text</> &mdash; converts the first argument from the named
+         <type>text</type> &mdash; converts the first argument from the named
          encoding to the database encoding
         </para>
        </listitem>
@@ -6511,7 +6511,7 @@ current_date &lt; 2017-11-17
        <listitem>
         <para>
          <function>convert_to(text, name)</function> returns
-         <type>bytea</> &mdash; converts the first argument from the
+         <type>bytea</type> &mdash; converts the first argument from the
          database encoding to the named encoding
         </para>
        </listitem>
@@ -6519,7 +6519,7 @@ current_date &lt; 2017-11-17
        <listitem>
         <para>
          <function>length(bytea, name)</function> returns
-         <type>integer</> &mdash; gives the length of the first
+         <type>integer</type> &mdash; gives the length of the first
          argument in characters in the named encoding
         </para>
        </listitem>
@@ -6582,10 +6582,10 @@ current_date &lt; 2017-11-17
        database consistency at risk; the worst case is that after a crash the
        last few reportedly-committed transactions might not be committed after
        all.
-       This feature is enabled by turning off <varname>synchronous_commit</>
+       This feature is enabled by turning off <varname>synchronous_commit</varname>
        (which can be done per-session or per-transaction, if some transactions
        are critical and others are not).
-       <varname>wal_writer_delay</> can be adjusted to control the maximum
+       <varname>wal_writer_delay</varname> can be adjusted to control the maximum
        delay before transactions actually reach disk.
       </para>
      </listitem>
@@ -6609,19 +6609,19 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Heap-Only Tuples (<acronym>HOT</>) accelerate space reuse for most
-       <command>UPDATE</>s and <command>DELETE</>s (Pavan Deolasee, with
+       Heap-Only Tuples (<acronym>HOT</acronym>) accelerate space reuse for most
+       <command>UPDATE</command>s and <command>DELETE</command>s (Pavan Deolasee, with
        ideas from many others)
       </para>
 
       <para>
-       <command>UPDATE</>s and <command>DELETE</>s leave dead tuples
-       behind, as do failed <command>INSERT</>s.  Previously only
-       <command>VACUUM</> could reclaim space taken by dead tuples. With
-       <acronym>HOT</> dead tuple space can be automatically reclaimed at
-       the time of <command>INSERT</> or <command>UPDATE</> if no changes
+       <command>UPDATE</command>s and <command>DELETE</command>s leave dead tuples
+       behind, as do failed <command>INSERT</command>s.  Previously only
+       <command>VACUUM</command> could reclaim space taken by dead tuples. With
+       <acronym>HOT</acronym> dead tuple space can be automatically reclaimed at
+       the time of <command>INSERT</command> or <command>UPDATE</command> if no changes
        are made to indexed columns.  This allows for more consistent
-       performance.  Also, <acronym>HOT</> avoids adding duplicate index
+       performance.  Also, <acronym>HOT</acronym> avoids adding duplicate index
        entries.
       </para>
      </listitem>
@@ -6655,13 +6655,13 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Using non-persistent transaction IDs for read-only transactions
-       reduces overhead and <command>VACUUM</> requirements (Florian Pflug)
+       reduces overhead and <command>VACUUM</command> requirements (Florian Pflug)
       </para>
 
       <para>
        Non-persistent transaction IDs do not increment the global
        transaction counter. Therefore, they reduce the load on
-       <structname>pg_clog</> and increase the time between forced
+       <structname>pg_clog</structname> and increase the time between forced
        vacuums to prevent transaction ID wraparound.
        Other performance
        improvements were also made that should improve concurrency.
@@ -6674,7 +6674,7 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       There was formerly a hard limit of 2<superscript>32</>
+       There was formerly a hard limit of 2<superscript>32</superscript>
        (4 billion) commands per transaction.  Now only commands that
        actually changed the database count, so while this limit still
        exists, it should be significantly less annoying.
@@ -6683,7 +6683,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Create a dedicated <acronym>WAL</> writer process to off-load
+       Create a dedicated <acronym>WAL</acronym> writer process to off-load
        work from backends (Simon)
       </para>
      </listitem>
@@ -6696,7 +6696,7 @@ current_date &lt; 2017-11-17
 
       <para>
        Unless WAL archiving is enabled, the system now avoids WAL writes
-       for <command>CLUSTER</command> and just <function>fsync()</>s the
+       for <command>CLUSTER</command> and just <function>fsync()</function>s the
        table at the end of the command.  It also does the same for
        <command>COPY</command> if the table was created in the same
        transaction.
@@ -6720,22 +6720,22 @@ current_date &lt; 2017-11-17
        middle of the table (where another sequential scan is already
        in-progress) and wrapping around to the beginning to finish.  This
        can affect the order of returned rows in a query that does not
-       specify <literal>ORDER BY</>.  The <varname>synchronize_seqscans</>
+       specify <literal>ORDER BY</literal>.  The <varname>synchronize_seqscans</varname>
        configuration parameter can be used to disable this if necessary.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <literal>ORDER BY ... LIMIT</> can be done without sorting
+       <literal>ORDER BY ... LIMIT</literal> can be done without sorting
        (Greg Stark)
       </para>
 
       <para>
        This is done by sequentially scanning the table and tracking just
-       the <quote>top N</> candidate rows, rather than performing a
+       the <quote>top N</quote> candidate rows, rather than performing a
        full sort of the entire table.  This is useful when there is no
-       matching index and the <literal>LIMIT</> is not large.
+       matching index and the <literal>LIMIT</literal> is not large.
       </para>
      </listitem>
 
@@ -6805,7 +6805,7 @@ current_date &lt; 2017-11-17
       <para>
        Previously PL/pgSQL functions that referenced temporary tables
        would fail if the temporary table was dropped and recreated
-       between function invocations, unless <literal>EXECUTE</> was
+       between function invocations, unless <literal>EXECUTE</literal> was
        used.  This improvement fixes that problem and many related issues.
       </para>
      </listitem>
@@ -6830,7 +6830,7 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Place temporary tables' TOAST tables in special schemas named
-       <literal>pg_toast_temp_<replaceable>nnn</></literal> (Tom)
+       <literal>pg_toast_temp_<replaceable>nnn</replaceable></literal> (Tom)
       </para>
 
       <para>
@@ -6860,7 +6860,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Fix <command>CREATE CONSTRAINT TRIGGER</>
+       Fix <command>CREATE CONSTRAINT TRIGGER</command>
        to convert old-style foreign key trigger definitions into regular
        foreign key constraints (Tom)
       </para>
@@ -6868,17 +6868,17 @@ current_date &lt; 2017-11-17
       <para>
        This will ease porting of foreign key constraints carried forward from
        pre-7.3 databases, if they were never converted using
-       <filename>contrib/adddepend</>.
+       <filename>contrib/adddepend</filename>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <literal>DEFAULT NULL</> to override inherited defaults (Tom)
+       Fix <literal>DEFAULT NULL</literal> to override inherited defaults (Tom)
       </para>
 
       <para>
-       <literal>DEFAULT NULL</> was formerly considered a noise phrase, but it
+       <literal>DEFAULT NULL</literal> was formerly considered a noise phrase, but it
        should (and now does) override non-null defaults that would otherwise
        be inherited from a parent table or domain.
       </para>
@@ -6998,9 +6998,9 @@ current_date &lt; 2017-11-17
       <para>
        This avoids Windows-specific problems with localized time zone
        names that are in the wrong encoding. There is a new
-       <varname>log_timezone</> parameter that controls the timezone
+       <varname>log_timezone</varname> parameter that controls the timezone
        used in log messages, independently of the client-visible
-       <varname>timezone</> parameter.
+       <varname>timezone</varname> parameter.
       </para>
      </listitem>
 
@@ -7031,7 +7031,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add <literal>n_live_tuples</> and <literal>n_dead_tuples</> columns
+       Add <literal>n_live_tuples</literal> and <literal>n_dead_tuples</literal> columns
        to <literal>pg_stat_all_tables</literal> and related views (Glen
        Parker)
       </para>
@@ -7039,8 +7039,8 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Merge <varname>stats_block_level</> and <varname>stats_row_level</>
-       parameters into a single parameter <varname>track_counts</>, which
+       Merge <varname>stats_block_level</varname> and <varname>stats_row_level</varname>
+       parameters into a single parameter <varname>track_counts</varname>, which
        controls all messages sent to the statistics collector process
        (Tom)
       </para>
@@ -7070,7 +7070,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Support Security Service Provider Interface (<acronym>SSPI</>) for
+       Support Security Service Provider Interface (<acronym>SSPI</acronym>) for
        authentication on Windows (Magnus)
       </para>
      </listitem>
@@ -7094,14 +7094,14 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add <varname>ssl_ciphers</> parameter to control accepted SSL ciphers
+       Add <varname>ssl_ciphers</varname> parameter to control accepted SSL ciphers
        (Victor Wagner)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a Kerberos realm parameter, <varname>krb_realm</> (Magnus)
+       Add a Kerberos realm parameter, <varname>krb_realm</varname> (Magnus)
       </para>
      </listitem>
 
@@ -7110,7 +7110,7 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title>Write-Ahead Log (<acronym>WAL</>) and Continuous Archiving</title>
+    <title>Write-Ahead Log (<acronym>WAL</acronym>) and Continuous Archiving</title>
     <itemizedlist>
 
      <listitem>
@@ -7133,7 +7133,7 @@ current_date &lt; 2017-11-17
       <para>
        This change allows a warm standby server to pass the name of the earliest
        still-needed WAL file to the recovery script, allowing automatic removal
-       of no-longer-needed WAL files.  This is done using <literal>%r</> in
+       of no-longer-needed WAL files.  This is done using <literal>%r</literal> in
        the <varname>restore_command</varname> parameter of
        <filename>recovery.conf</filename>.
       </para>
@@ -7141,14 +7141,14 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       New boolean configuration parameter, <varname>archive_mode</>,
+       New boolean configuration parameter, <varname>archive_mode</varname>,
        controls archiving (Simon)
       </para>
 
       <para>
-       Previously setting <varname>archive_command</> to an empty string
-       turned off archiving. Now <varname>archive_mode</> turns archiving
-       on and off, independently of <varname>archive_command</>. This is
+       Previously setting <varname>archive_command</varname> to an empty string
+       turned off archiving. Now <varname>archive_mode</varname> turns archiving
+       on and off, independently of <varname>archive_command</varname>. This is
        useful for stopping archiving temporarily.
       </para>
      </listitem>
@@ -7169,40 +7169,40 @@ current_date &lt; 2017-11-17
 
       <para>
        Text search has been improved, moved into the core code, and is now
-       installed by default.  <filename>contrib/tsearch2</> now contains
+       installed by default.  <filename>contrib/tsearch2</filename> now contains
        a compatibility interface.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add control over whether <literal>NULL</>s sort first or last (Teodor, Tom)
+       Add control over whether <literal>NULL</literal>s sort first or last (Teodor, Tom)
       </para>
 
       <para>
-       The syntax is <literal>ORDER BY ... NULLS FIRST/LAST</>.
+       The syntax is <literal>ORDER BY ... NULLS FIRST/LAST</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow per-column ascending/descending (<literal>ASC</>/<literal>DESC</>)
+       Allow per-column ascending/descending (<literal>ASC</literal>/<literal>DESC</literal>)
        ordering options for indexes (Teodor, Tom)
       </para>
 
       <para>
-       Previously a query using <literal>ORDER BY</> with mixed
-       <literal>ASC</>/<literal>DESC</> specifiers could not fully use
+       Previously a query using <literal>ORDER BY</literal> with mixed
+       <literal>ASC</literal>/<literal>DESC</literal> specifiers could not fully use
        an index. Now an index can be fully used in such cases if the
        index was created with matching
-       <literal>ASC</>/<literal>DESC</> specifications.
-       <literal>NULL</> sort order within an index can be controlled, too.
+       <literal>ASC</literal>/<literal>DESC</literal> specifications.
+       <literal>NULL</literal> sort order within an index can be controlled, too.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <literal>col IS NULL</> to use an index (Teodor)
+       Allow <literal>col IS NULL</literal> to use an index (Teodor)
       </para>
      </listitem>
 
@@ -7213,8 +7213,8 @@ current_date &lt; 2017-11-17
 
       <para>
        This eliminates the need to reference a primary key to
-       <command>UPDATE</> or <command>DELETE</> rows returned by a cursor.
-       The syntax is <literal>UPDATE/DELETE WHERE CURRENT OF</>.
+       <command>UPDATE</command> or <command>DELETE</command> rows returned by a cursor.
+       The syntax is <literal>UPDATE/DELETE WHERE CURRENT OF</literal>.
       </para>
      </listitem>
 
@@ -7243,7 +7243,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Allow <literal>UNION</> and related constructs to return a domain
+       Allow <literal>UNION</literal> and related constructs to return a domain
        type, when all inputs are of that domain type (Tom)
       </para>
 
@@ -7271,7 +7271,7 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Improve optimizer logic for detecting when variables are equal
-       in a <literal>WHERE</> clause (Tom)
+       in a <literal>WHERE</literal> clause (Tom)
       </para>
 
       <para>
@@ -7318,8 +7318,8 @@ current_date &lt; 2017-11-17
 
       <para>
        For example, functions can now set their own
-       <varname>search_path</> to prevent unexpected behavior if a
-       different <varname>search_path</> exists at run-time.  Security
+       <varname>search_path</varname> to prevent unexpected behavior if a
+       different <varname>search_path</varname> exists at run-time.  Security
        definer functions should set <varname>search_path</varname> to
        avoid security loopholes.
       </para>
@@ -7367,7 +7367,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Make <command>CREATE/DROP/RENAME DATABASE</> wait briefly for
+       Make <command>CREATE/DROP/RENAME DATABASE</command> wait briefly for
        conflicting backends to exit before failing (Tom)
       </para>
 
@@ -7385,7 +7385,7 @@ current_date &lt; 2017-11-17
       <para>
        This allows replication systems to disable triggers and rewrite
        rules as a group without modifying the system catalogs directly.
-       The behavior is controlled by <command>ALTER TABLE</> and a new
+       The behavior is controlled by <command>ALTER TABLE</command> and a new
        parameter <varname>session_replication_role</varname>.
       </para>
      </listitem>
@@ -7397,7 +7397,7 @@ current_date &lt; 2017-11-17
 
       <para>
        This allows a user-defined type to take a modifier, like
-       <type>ssnum(7)</>.  Previously only built-in
+       <type>ssnum(7)</type>.  Previously only built-in
        data types could have modifiers.
       </para>
      </listitem>
@@ -7419,7 +7419,7 @@ current_date &lt; 2017-11-17
       <para>
        While this is reasonably safe, some administrators might wish to
        revoke the privilege. It is controlled by
-       <structname>pg_pltemplate</>.<structfield>tmpldbacreate</>.
+       <structname>pg_pltemplate</structname>.<structfield>tmpldbacreate</structfield>.
       </para>
      </listitem>
 
@@ -7465,7 +7465,7 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Add new <command>CLUSTER</command> syntax: <literal>CLUSTER
-       <replaceable>table</> USING <replaceable>index</></literal>
+       <replaceable>table</replaceable> USING <replaceable>index</replaceable></literal>
        (Holger Schurig)
      </para>
 
@@ -7483,7 +7483,7 @@ current_date &lt; 2017-11-17
 
       <para>
        References to subplan outputs are now always shown correctly,
-       instead of using <literal>?column<replaceable>N</>?</literal>
+       instead of using <literal>?column<replaceable>N</replaceable>?</literal>
        for complicated cases.
       </para>
      </listitem>
@@ -7527,19 +7527,19 @@ current_date &lt; 2017-11-17
       <para>
        This feature provides convenient support for fields that have a
        small, fixed set of allowed values.  An example of creating an
-       <literal>ENUM</> type is
-       <literal>CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy')</>.
+       <literal>ENUM</literal> type is
+       <literal>CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy')</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Universally Unique Identifier (<type>UUID</>) data type (Gevik
+       Universally Unique Identifier (<type>UUID</type>) data type (Gevik
        Babakhani, Neil)
       </para>
 
       <para>
-       This closely matches <acronym>RFC</> 4122.
+       This closely matches <acronym>RFC</acronym> 4122.
       </para>
      </listitem>
 
@@ -7549,7 +7549,7 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       This greatly increases the range of supported <type>MONEY</>
+       This greatly increases the range of supported <type>MONEY</type>
        values.
       </para>
      </listitem>
@@ -7557,13 +7557,13 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Fix <type>float4</type>/<type>float8</type> to handle
-       <literal>Infinity</> and <literal>NAN</> (Not A Number)
+       <literal>Infinity</literal> and <literal>NAN</literal> (Not A Number)
        consistently (Bruce)
       </para>
 
       <para>
        The code formerly was not consistent about distinguishing
-       <literal>Infinity</> from overflow conditions.
+       <literal>Infinity</literal> from overflow conditions.
       </para>
      </listitem>
 
@@ -7576,7 +7576,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Prevent <command>COPY</> from using digits and lowercase letters as
+       Prevent <command>COPY</command> from using digits and lowercase letters as
        delimiters (Tom)
       </para>
      </listitem>
@@ -7613,7 +7613,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Implement <function>width_bucket()</function> for the <type>float8</>
+       Implement <function>width_bucket()</function> for the <type>float8</type>
        data type (Neil)
       </para>
      </listitem>
@@ -7636,34 +7636,34 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add <literal>isodow</> option to <function>EXTRACT()</> and
-       <function>date_part()</> (Bruce)
+       Add <literal>isodow</literal> option to <function>EXTRACT()</function> and
+       <function>date_part()</function> (Bruce)
       </para>
 
       <para>
        This returns the day of the week, with Sunday as seven.
-       (<literal>dow</> returns Sunday as zero.)
+       (<literal>dow</literal> returns Sunday as zero.)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>ID</> (ISO day of week) and <literal>IDDD</> (ISO
-       day of year) format codes for <function>to_char()</>,
-       <function>to_date()</>, and <function>to_timestamp()</> (Brendan
+       Add <literal>ID</literal> (ISO day of week) and <literal>IDDD</literal> (ISO
+       day of year) format codes for <function>to_char()</function>,
+       <function>to_date()</function>, and <function>to_timestamp()</function> (Brendan
        Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <function>to_timestamp()</> and <function>to_date()</>
+       Make <function>to_timestamp()</function> and <function>to_date()</function>
        assume <literal>TM</literal> (trim) option for potentially
        variable-width fields (Bruce)
       </para>
 
       <para>
-       This matches <productname>Oracle</>'s behavior.
+       This matches <productname>Oracle</productname>'s behavior.
       </para>
      </listitem>
 
@@ -7671,7 +7671,7 @@ current_date &lt; 2017-11-17
       <para>
        Fix off-by-one conversion error in
        <function>to_date()</function>/<function>to_timestamp()</function>
-       <literal>D</> (non-ISO day of week) fields (Bruce)
+       <literal>D</literal> (non-ISO day of week) fields (Bruce)
       </para>
      </listitem>
 
@@ -7757,7 +7757,7 @@ current_date &lt; 2017-11-17
 
       <para>
        This adds convenient syntax for PL/pgSQL set-returning functions
-       that want to return the result of a query.  <command>RETURN QUERY</>
+       that want to return the result of a query.  <command>RETURN QUERY</command>
        is easier and more efficient than a loop
        around <command>RETURN NEXT</command>.
       </para>
@@ -7770,7 +7770,7 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       For example, <literal>myfunc.myvar</>. This is particularly
+       For example, <literal>myfunc.myvar</literal>. This is particularly
        useful for specifying variables in a query where the variable
        name might match a column name.
       </para>
@@ -7790,11 +7790,11 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Tighten requirements for <literal>FOR</literal> loop
-       <literal>STEP</> values (Tom)
+       <literal>STEP</literal> values (Tom)
       </para>
 
       <para>
-       Prevent non-positive <literal>STEP</> values, and handle
+       Prevent non-positive <literal>STEP</literal> values, and handle
        loop overflows.
       </para>
      </listitem>
@@ -7831,7 +7831,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Allow type-name arguments to PL/Tcl <function>spi_prepare</> to
+       Allow type-name arguments to PL/Tcl <function>spi_prepare</function> to
        be data type aliases in addition to names found in
        <literal>pg_type</literal> (Andrew)
       </para>
@@ -7852,7 +7852,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Fix PL/Tcl problems with thread-enabled <filename>libtcl</> spawning
+       Fix PL/Tcl problems with thread-enabled <filename>libtcl</filename> spawning
        multiple threads within the backend (Steve Marshall, Paul Bayer,
        Doug Knight)
       </para>
@@ -7867,7 +7867,7 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title><link linkend="APP-PSQL"><application>psql</></link></title>
+    <title><link linkend="app-psql"><application>psql</application></link></title>
     <itemizedlist>
 
      <listitem>
@@ -7907,20 +7907,20 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Allow <literal>\pset</literal>, <literal>\t</literal>, and
-       <literal>\x</literal> to specify <literal>on</> or <literal>off</>,
+       <literal>\x</literal> to specify <literal>on</literal> or <literal>off</literal>,
        rather than just toggling (Chad Wagner)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>\sleep</> capability (Jan)
+       Add <literal>\sleep</literal> capability (Jan)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Enable <literal>\timing</> output for <literal>\copy</> (Andrew)
+       Enable <literal>\timing</literal> output for <literal>\copy</literal> (Andrew)
       </para>
      </listitem>
 
@@ -7933,20 +7933,20 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Flush <literal>\o</> output after each backslash command (Tom)
+       Flush <literal>\o</literal> output after each backslash command (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Correctly detect and report errors while reading a <literal>-f</>
+       Correctly detect and report errors while reading a <literal>-f</literal>
        input file (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <literal>-u</> option (this option has long been deprecated)
+       Remove <literal>-u</literal> option (this option has long been deprecated)
        (Tom)
       </para>
      </listitem>
@@ -7956,12 +7956,12 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+    <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Add <literal>--tablespaces-only</> and <literal>--roles-only</>
+       Add <literal>--tablespaces-only</literal> and <literal>--roles-only</literal>
        options to <application>pg_dumpall</application> (Dave Page)
       </para>
      </listitem>
@@ -7980,7 +7980,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Allow <application>pg_dumpall</> to accept an initial-connection
+       Allow <application>pg_dumpall</application> to accept an initial-connection
        database name rather than the default
        <literal>template1</literal> (Dave Page)
       </para>
@@ -7988,7 +7988,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       In <literal>-n</> and <literal>-t</> switches, always match
+       In <literal>-n</literal> and <literal>-t</literal> switches, always match
        <literal>$</literal> literally (Tom)
       </para>
      </listitem>
@@ -8001,7 +8001,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Remove <literal>-u</> option (this option has long been deprecated)
+       Remove <literal>-u</literal> option (this option has long been deprecated)
        (Tom)
       </para>
      </listitem>
@@ -8016,7 +8016,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       In <application>initdb</>, allow the location of the
+       In <application>initdb</application>, allow the location of the
        <filename>pg_xlog</filename> directory to be specified
        (Euler Taveira de Oliveira)
       </para>
@@ -8024,19 +8024,19 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Enable server core dump generation in <application>pg_regress</>
+       Enable server core dump generation in <application>pg_regress</application>
        on supported operating systems (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a <literal>-t</> (timeout) parameter to <application>pg_ctl</>
+       Add a <literal>-t</literal> (timeout) parameter to <application>pg_ctl</application>
        (Bruce)
       </para>
 
       <para>
-       This controls how long <application>pg_ctl</> will wait when waiting
+       This controls how long <application>pg_ctl</application> will wait when waiting
        for server startup or shutdown.  Formerly the timeout was hard-wired
        as 60 seconds.
       </para>
@@ -8044,28 +8044,28 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add a <application>pg_ctl</> option to control generation
+       Add a <application>pg_ctl</application> option to control generation
        of server core dumps (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow Control-C to cancel <application>clusterdb</>,
-       <application>reindexdb</>, and <application>vacuumdb</> (Itagaki
+       Allow Control-C to cancel <application>clusterdb</application>,
+       <application>reindexdb</application>, and <application>vacuumdb</application> (Itagaki
        Takahiro, Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Suppress command tag output for <application>createdb</>,
-       <application>createuser</>, <application>dropdb</>, and
-       <application>dropuser</> (Peter)
+       Suppress command tag output for <application>createdb</application>,
+       <application>createuser</application>, <application>dropdb</application>, and
+       <application>dropuser</application> (Peter)
       </para>
 
       <para>
-       The <literal>--quiet</> option is ignored and will be removed in 8.4.
+       The <literal>--quiet</literal> option is ignored and will be removed in 8.4.
        Progress messages when acting on all databases now go to stdout
        instead of stderr because they are not actually errors.
       </para>
@@ -8076,33 +8076,33 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title><link linkend="libpq"><application>libpq</></link></title>
+    <title><link linkend="libpq"><application>libpq</application></link></title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Interpret the <literal>dbName</> parameter of
-       <function>PQsetdbLogin()</> as a <literal>conninfo</> string if
+       Interpret the <literal>dbName</literal> parameter of
+       <function>PQsetdbLogin()</function> as a <literal>conninfo</literal> string if
        it contains an equals sign (Andrew)
       </para>
 
       <para>
-       This allows use of <literal>conninfo</> strings in client
-       programs that still use <literal>PQsetdbLogin()</>.
+       This allows use of <literal>conninfo</literal> strings in client
+       programs that still use <literal>PQsetdbLogin()</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support a global <acronym>SSL</> configuration file (Victor
+       Support a global <acronym>SSL</acronym> configuration file (Victor
        Wagner)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add environment variable <varname>PGSSLKEY</> to control
-       <acronym>SSL</> hardware keys (Victor Wagner)
+       Add environment variable <varname>PGSSLKEY</varname> to control
+       <acronym>SSL</acronym> hardware keys (Victor Wagner)
       </para>
      </listitem>
 
@@ -8147,7 +8147,7 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title><link linkend="ecpg"><application>ecpg</></link></title>
+    <title><link linkend="ecpg"><application>ecpg</application></link></title>
     <itemizedlist>
 
      <listitem>
@@ -8183,13 +8183,13 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title><application>Windows</> Port</title>
+    <title><application>Windows</application> Port</title>
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow the whole <productname>PostgreSQL</> distribution to be compiled
-       with <productname>Microsoft Visual C++</> (Magnus and others)
+       Allow the whole <productname>PostgreSQL</productname> distribution to be compiled
+       with <productname>Microsoft Visual C++</productname> (Magnus and others)
       </para>
 
       <para>
@@ -8226,7 +8226,7 @@ current_date &lt; 2017-11-17
    </sect3>
 
    <sect3>
-    <title>Server Programming Interface (<acronym>SPI</>)</title>
+    <title>Server Programming Interface (<acronym>SPI</acronym>)</title>
     <itemizedlist>
 
      <listitem>
@@ -8236,7 +8236,7 @@ current_date &lt; 2017-11-17
 
       <para>
        Allow access to the cursor-related planning options, and add
-       <command>FETCH</>/<command>MOVE</> routines.
+       <command>FETCH</command>/<command>MOVE</command> routines.
       </para>
      </listitem>
 
@@ -8247,15 +8247,15 @@ current_date &lt; 2017-11-17
       </para>
 
       <para>
-       The macro <literal>SPI_ERROR_CURSOR</> still exists but will
+       The macro <literal>SPI_ERROR_CURSOR</literal> still exists but will
        never be returned.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       SPI plan pointers are now declared as <literal>SPIPlanPtr</> instead of
-       <literal>void *</> (Tom)
+       SPI plan pointers are now declared as <literal>SPIPlanPtr</literal> instead of
+       <literal>void *</literal> (Tom)
       </para>
 
       <para>
@@ -8274,35 +8274,35 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add <application>configure</> option <literal>--enable-profiling</>
-       to enable code profiling (works only with <application>gcc</>)
+       Add <application>configure</application> option <literal>--enable-profiling</literal>
+       to enable code profiling (works only with <application>gcc</application>)
        (Korry Douglas and Nikhil Sontakke)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <application>configure</> option <literal>--with-system-tzdata</>
+       Add <application>configure</application> option <literal>--with-system-tzdata</literal>
        to use the operating system's time zone database (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <acronym>PGXS</> so extensions can be built against PostgreSQL
-       installations whose <application>pg_config</> program does not
-       appear first in the <varname>PATH</> (Tom)
+       Fix <acronym>PGXS</acronym> so extensions can be built against PostgreSQL
+       installations whose <application>pg_config</application> program does not
+       appear first in the <varname>PATH</varname> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Support <command>gmake draft</command> when building the
-       <acronym>SGML</> documentation (Bruce)
+       <acronym>SGML</acronym> documentation (Bruce)
       </para>
 
       <para>
-       Unless <literal>draft</> is used, the documentation build will
+       Unless <literal>draft</literal> is used, the documentation build will
        now be repeated if necessary to ensure the index is up-to-date.
       </para>
      </listitem>
@@ -8317,9 +8317,9 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Rename macro <literal>DLLIMPORT</> to <literal>PGDLLIMPORT</> to
+       Rename macro <literal>DLLIMPORT</literal> to <literal>PGDLLIMPORT</literal> to
        avoid conflicting with third party includes (like Tcl) that
-       define <literal>DLLIMPORT</> (Magnus)
+       define <literal>DLLIMPORT</literal> (Magnus)
       </para>
      </listitem>
 
@@ -8332,15 +8332,15 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Update GIN <function>extractQuery()</> API to allow signalling
+       Update GIN <function>extractQuery()</function> API to allow signalling
        that nothing can satisfy the query (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move <literal>NAMEDATALEN</> definition from
-       <filename>postgres_ext.h</> to <filename>pg_config_manual.h</>
+       Move <literal>NAMEDATALEN</literal> definition from
+       <filename>postgres_ext.h</filename> to <filename>pg_config_manual.h</filename>
        (Peter)
       </para>
      </listitem>
@@ -8364,7 +8364,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Create a function variable <literal>join_search_hook</> to let plugins
+       Create a function variable <literal>join_search_hook</literal> to let plugins
        override the join search order portion of the planner (Julius
        Stroffek)
       </para>
@@ -8372,7 +8372,7 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add <function>tas()</> support for Renesas' M32R processor
+       Add <function>tas()</function> support for Renesas' M32R processor
        (Kazuhiro Inaoka)
       </para>
      </listitem>
@@ -8388,14 +8388,14 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Change the on-disk representation of the <type>NUMERIC</type>
-       data type so that the <structfield>sign_dscale</> word comes
+       data type so that the <structfield>sign_dscale</structfield> word comes
        before the weight (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Use <acronym>SYSV</> semaphores rather than POSIX on Darwin
+       Use <acronym>SYSV</acronym> semaphores rather than POSIX on Darwin
        &gt;= 6.0, i.e., macOS 10.2 and up (Chris Marcellino)
       </para>
      </listitem>
@@ -8432,8 +8432,8 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Move <filename>contrib</> <filename>README</> content into the
-       main <productname>PostgreSQL</> documentation (Albert Cervera i
+       Move <filename>contrib</filename> <filename>README</filename> content into the
+       main <productname>PostgreSQL</productname> documentation (Albert Cervera i
        Areny)
       </para>
      </listitem>
@@ -8455,11 +8455,11 @@ current_date &lt; 2017-11-17
      <listitem>
       <para>
        Add <filename>contrib/uuid-ossp</filename> module for generating
-       <type>UUID</> values using the OSSP UUID library (Peter)
+       <type>UUID</type> values using the OSSP UUID library (Peter)
       </para>
 
       <para>
-       Use <application>configure</>
+       Use <application>configure</application>
        <literal>--with-ossp-uuid</literal> to activate. This takes
        advantage of the new <type>UUID</type> builtin type.
       </para>
@@ -8477,14 +8477,14 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Allow <application>contrib/pgbench</> to set the fillfactor (Pavan
+       Allow <application>contrib/pgbench</application> to set the fillfactor (Pavan
        Deolasee)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add timestamps to <application>contrib/pgbench</> <literal>-l</>
+       Add timestamps to <application>contrib/pgbench</application> <literal>-l</literal>
        (Greg Smith)
       </para>
      </listitem>
@@ -8498,13 +8498,13 @@ current_date &lt; 2017-11-17
 
      <listitem>
       <para>
-       Add GIN support for <filename>contrib/hstore</> (Teodor)
+       Add GIN support for <filename>contrib/hstore</filename> (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add GIN support for <filename>contrib/pg_trgm</> (Guillaume Smet, Teodor)
+       Add GIN support for <filename>contrib/pg_trgm</filename> (Guillaume Smet, Teodor)
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/release-8.4.sgml b/doc/src/sgml/release-8.4.sgml
index 16004edb74..6e6efa3bd1 100644
--- a/doc/src/sgml/release-8.4.sgml
+++ b/doc/src/sgml/release-8.4.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 8.4.21.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 8.4.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -36,7 +36,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 8.4.19,
-    see <xref linkend="release-8-4-19">.
+    see <xref linkend="release-8-4-19"/>.
    </para>
 
   </sect2>
@@ -48,15 +48,15 @@
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -76,7 +76,7 @@
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -103,13 +103,13 @@
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -124,7 +124,7 @@
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -137,7 +137,7 @@
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -150,19 +150,19 @@
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -170,7 +170,7 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -182,7 +182,7 @@
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
@@ -190,7 +190,7 @@
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -199,16 +199,16 @@
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -216,7 +216,7 @@
     <listitem>
      <para>
       On Windows, allow new sessions to absorb values of PGC_BACKEND
-      parameters (such as <xref linkend="guc-log-connections">) from the
+      parameters (such as <xref linkend="guc-log-connections"/>) from the
       configuration file (Amit Kapila)
      </para>
 
@@ -232,15 +232,15 @@
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -251,17 +251,17 @@
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -269,27 +269,27 @@
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -297,20 +297,20 @@
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -331,11 +331,11 @@
   <para>
    This release contains a variety of fixes from 8.4.20.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.4.X release series in July 2014.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -349,7 +349,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.19,
-    see <xref linkend="release-8-4-19">.
+    see <xref linkend="release-8-4-19"/>.
    </para>
 
   </sect2>
@@ -387,7 +387,7 @@
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -400,35 +400,35 @@
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -450,11 +450,11 @@
   <para>
    This release contains a variety of fixes from 8.4.19.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 8.4.X release series in July 2014.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -468,7 +468,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.19,
-    see <xref linkend="release-8-4-19">.
+    see <xref linkend="release-8-4-19"/>.
    </para>
 
   </sect2>
@@ -480,19 +480,19 @@
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -505,7 +505,7 @@
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -525,7 +525,7 @@
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -539,12 +539,12 @@
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -571,7 +571,7 @@
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -583,35 +583,35 @@
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -626,7 +626,7 @@
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -654,25 +654,25 @@
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -696,7 +696,7 @@
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -710,19 +710,19 @@
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -730,21 +730,21 @@
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -769,12 +769,12 @@
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -782,51 +782,51 @@
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -837,7 +837,7 @@
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
@@ -851,21 +851,21 @@
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -874,20 +874,20 @@
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -909,7 +909,7 @@
   <para>
    This release contains a variety of fixes from 8.4.18.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -927,7 +927,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 8.4.17,
-    see <xref linkend="release-8-4-17">.
+    see <xref linkend="release-8-4-17"/>.
    </para>
 
   </sect2>
@@ -939,13 +939,13 @@
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
@@ -957,12 +957,12 @@
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
@@ -979,8 +979,8 @@
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -997,7 +997,7 @@
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
@@ -1015,13 +1015,13 @@
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
@@ -1035,7 +1035,7 @@
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -1049,7 +1049,7 @@
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -1060,10 +1060,10 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -1073,21 +1073,21 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -1110,7 +1110,7 @@
   <para>
    This release contains a variety of fixes from 8.4.17.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -1122,7 +1122,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.17,
-    see <xref linkend="release-8-4-17">.
+    see <xref linkend="release-8-4-17"/>.
    </para>
 
   </sect2>
@@ -1139,7 +1139,7 @@
      </para>
 
      <para>
-      <productname>PostgreSQL</> case-folds non-ASCII characters only
+      <productname>PostgreSQL</productname> case-folds non-ASCII characters only
       when using a single-byte server encoding.
      </para>
     </listitem>
@@ -1153,7 +1153,7 @@
 
     <listitem>
      <para>
-      Fix memory overcommit bug when <varname>work_mem</> is using more
+      Fix memory overcommit bug when <varname>work_mem</varname> is using more
       than 24GB of memory (Stephen Frost)
      </para>
     </listitem>
@@ -1171,29 +1171,29 @@
      </para>
 
      <para>
-      Previously tests like <literal>col IS NOT TRUE</> and <literal>col IS
-      NOT FALSE</> did not properly factor in NULL values when estimating
+      Previously tests like <literal>col IS NOT TRUE</literal> and <literal>col IS
+      NOT FALSE</literal> did not properly factor in NULL values when estimating
       plan costs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent pushing down <literal>WHERE</> clauses into unsafe
-      <literal>UNION/INTERSECT</> subqueries (Tom Lane)
+      Prevent pushing down <literal>WHERE</literal> clauses into unsafe
+      <literal>UNION/INTERSECT</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Subqueries of a <literal>UNION</> or <literal>INTERSECT</> that
+      Subqueries of a <literal>UNION</literal> or <literal>INTERSECT</literal> that
       contain set-returning functions or volatile functions in their
-      <literal>SELECT</> lists could be improperly optimized, leading to
+      <literal>SELECT</literal> lists could be improperly optimized, leading to
       run-time errors or incorrect query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare case of <quote>failed to locate grouping columns</>
+      Fix rare case of <quote>failed to locate grouping columns</quote>
       planner failure (Tom Lane)
      </para>
     </listitem>
@@ -1208,13 +1208,13 @@
     <listitem>
      <para>
       Fix possible deadlock during concurrent <command>CREATE INDEX
-      CONCURRENTLY</> operations (Tom Lane)
+      CONCURRENTLY</command> operations (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>regexp_matches()</> handling of zero-length matches
+      Fix <function>regexp_matches()</function> handling of zero-length matches
       (Jeevan Chalke)
      </para>
 
@@ -1238,14 +1238,14 @@
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgp_pub_decrypt()</> so it works for secret keys with
+      Fix <function>pgp_pub_decrypt()</function> so it works for secret keys with
       passwords (Marko Kreen)
      </para>
     </listitem>
@@ -1260,21 +1260,21 @@
     <listitem>
      <para>
       Avoid possible failure when performing transaction control commands (e.g
-      <command>ROLLBACK</>) in prepared queries (Tom Lane)
+      <command>ROLLBACK</command>) in prepared queries (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that floating-point data input accepts standard spellings
-      of <quote>infinity</> on all platforms (Tom Lane)
+      of <quote>infinity</quote> on all platforms (Tom Lane)
      </para>
 
      <para>
-      The C99 standard says that allowable spellings are <literal>inf</>,
-      <literal>+inf</>, <literal>-inf</>, <literal>infinity</>,
-      <literal>+infinity</>, and <literal>-infinity</>.  Make sure we
-      recognize these even if the platform's <function>strtod</> function
+      The C99 standard says that allowable spellings are <literal>inf</literal>,
+      <literal>+inf</literal>, <literal>-inf</literal>, <literal>infinity</literal>,
+      <literal>+infinity</literal>, and <literal>-infinity</literal>.  Make sure we
+      recognize these even if the platform's <function>strtod</function> function
       doesn't.
      </para>
     </listitem>
@@ -1288,7 +1288,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013d
+      Update time zone data files to <application>tzdata</application> release 2013d
       for DST law changes in Israel, Morocco, Palestine, and Paraguay.
       Also, historical zone data corrections for Macquarie Island.
      </para>
@@ -1310,7 +1310,7 @@
   <para>
    This release contains a variety of fixes from 8.4.16.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -1323,13 +1323,13 @@
    <para>
     However, this release corrects several errors in management of GiST
     indexes.  After installing this update, it is advisable to
-    <command>REINDEX</> any GiST indexes that meet one or more of the
+    <command>REINDEX</command> any GiST indexes that meet one or more of the
     conditions described below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -1347,41 +1347,41 @@
 
      <para>
       This avoids a scenario wherein random numbers generated by
-      <filename>contrib/pgcrypto</> functions might be relatively easy for
+      <filename>contrib/pgcrypto</filename> functions might be relatively easy for
       another database user to guess.  The risk is only significant when
-      the postmaster is configured with <varname>ssl</> = <literal>on</>
+      the postmaster is configured with <varname>ssl</varname> = <literal>on</literal>
       but most connections don't use SSL encryption.  (CVE-2013-1900)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix GiST indexes to not use <quote>fuzzy</> geometric comparisons when
+      Fix GiST indexes to not use <quote>fuzzy</quote> geometric comparisons when
       it's not appropriate to do so (Alexander Korotkov)
      </para>
 
      <para>
-      The core geometric types perform comparisons using <quote>fuzzy</>
-      equality, but <function>gist_box_same</> must do exact comparisons,
+      The core geometric types perform comparisons using <quote>fuzzy</quote>
+      equality, but <function>gist_box_same</function> must do exact comparisons,
       else GiST indexes using it might become inconsistent.  After installing
-      this update, users should <command>REINDEX</> any GiST indexes on
-      <type>box</>, <type>polygon</>, <type>circle</>, or <type>point</>
-      columns, since all of these use <function>gist_box_same</>.
+      this update, users should <command>REINDEX</command> any GiST indexes on
+      <type>box</type>, <type>polygon</type>, <type>circle</type>, or <type>point</type>
+      columns, since all of these use <function>gist_box_same</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous range-union and penalty logic in GiST indexes that use
-      <filename>contrib/btree_gist</> for variable-width data types, that is
-      <type>text</>, <type>bytea</>, <type>bit</>, and <type>numeric</>
+      <filename>contrib/btree_gist</filename> for variable-width data types, that is
+      <type>text</type>, <type>bytea</type>, <type>bit</type>, and <type>numeric</type>
       columns (Tom Lane)
      </para>
 
      <para>
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in useless
-      index bloat.  Users are advised to <command>REINDEX</> such indexes
+      index bloat.  Users are advised to <command>REINDEX</command> such indexes
       after installing this update.
      </para>
     </listitem>
@@ -1396,7 +1396,7 @@
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in indexes
       that are unnecessarily inefficient to search.  Users are advised to
-      <command>REINDEX</> multi-column GiST indexes after installing this
+      <command>REINDEX</command> multi-column GiST indexes after installing this
       update.
      </para>
     </listitem>
@@ -1417,27 +1417,27 @@
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to use ASCII-only case-folding rules where
+      Fix <function>to_char()</function> to use ASCII-only case-folding rules where
       appropriate (Tom Lane)
      </para>
 
      <para>
       This fixes misbehavior of some template patterns that should be
-      locale-independent, but mishandled <quote><literal>I</></quote> and
-      <quote><literal>i</></quote> in Turkish locales.
+      locale-independent, but mishandled <quote><literal>I</literal></quote> and
+      <quote><literal>i</literal></quote> in Turkish locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</>
+      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove useless <quote>picksplit doesn't support secondary split</> log
+      Remove useless <quote>picksplit doesn't support secondary split</quote> log
       messages (Josh Hansen, Tom Lane)
      </para>
 
@@ -1458,28 +1458,28 @@
 
     <listitem>
      <para>
-      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</> function
+      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</function> function
       (Alex Hunsaker, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to handle database names containing
-      <quote><literal>=</></quote> correctly (Heikki Linnakangas)
+      Fix <application>pg_dumpall</application> to handle database names containing
+      <quote><literal>=</literal></quote> correctly (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <application>pg_dump</> when an incorrect connection
+      Avoid crash in <application>pg_dump</application> when an incorrect connection
       string is given (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore invalid indexes in <application>pg_dump</> (Michael Paquier)
+      Ignore invalid indexes in <application>pg_dump</application> (Michael Paquier)
      </para>
 
      <para>
@@ -1488,24 +1488,24 @@
       a uniqueness condition not satisfied by the table's data.  Also, if the
       index creation is in fact still in progress, it seems reasonable to
       consider it to be an uncommitted DDL change, which
-      <application>pg_dump</> wouldn't be expected to dump anyway.
+      <application>pg_dump</application> wouldn't be expected to dump anyway.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s <function>similarity()</> function
+      Fix <filename>contrib/pg_trgm</filename>'s <function>similarity()</function> function
       to return zero for trigram-less strings (Tom Lane)
      </para>
 
      <para>
-      Previously it returned <literal>NaN</> due to internal division by zero.
+      Previously it returned <literal>NaN</literal> due to internal division by zero.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013b
+      Update time zone data files to <application>tzdata</application> release 2013b
       for DST law changes in Chile, Haiti, Morocco, Paraguay, and some
       Russian areas.  Also, historical zone data corrections for numerous
       places.
@@ -1513,12 +1513,12 @@
 
      <para>
       Also, update the time zone abbreviation files for recent changes in
-      Russia and elsewhere: <literal>CHOT</>, <literal>GET</>,
-      <literal>IRKT</>, <literal>KGT</>, <literal>KRAT</>, <literal>MAGT</>,
-      <literal>MAWT</>, <literal>MSK</>, <literal>NOVT</>, <literal>OMST</>,
-      <literal>TKT</>, <literal>VLAT</>, <literal>WST</>, <literal>YAKT</>,
-      <literal>YEKT</> now follow their current meanings, and
-      <literal>VOLT</> (Europe/Volgograd) and <literal>MIST</>
+      Russia and elsewhere: <literal>CHOT</literal>, <literal>GET</literal>,
+      <literal>IRKT</literal>, <literal>KGT</literal>, <literal>KRAT</literal>, <literal>MAGT</literal>,
+      <literal>MAWT</literal>, <literal>MSK</literal>, <literal>NOVT</literal>, <literal>OMST</literal>,
+      <literal>TKT</literal>, <literal>VLAT</literal>, <literal>WST</literal>, <literal>YAKT</literal>,
+      <literal>YEKT</literal> now follow their current meanings, and
+      <literal>VOLT</literal> (Europe/Volgograd) and <literal>MIST</literal>
       (Antarctica/Macquarie) are added to the default abbreviations list.
      </para>
     </listitem>
@@ -1539,7 +1539,7 @@
   <para>
    This release contains a variety of fixes from 8.4.15.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -1551,7 +1551,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -1563,7 +1563,7 @@
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -1596,19 +1596,19 @@
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -1620,13 +1620,13 @@
     <listitem>
      <para>
       Fix error in <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       implementation (Andres Freund)
      </para>
 
      <para>
       In installations that have existed for more than <link
-      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</></link>
+      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</varname></link>
       transactions, this mistake prevented autovacuum from using partial-table
       scans, so that a full-table scan would always happen instead.
      </para>
@@ -1634,13 +1634,13 @@
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -1653,7 +1653,7 @@
 
     <listitem>
      <para>
-      Reject out-of-range dates in <function>to_date()</> (Hitoshi Harada)
+      Reject out-of-range dates in <function>to_date()</function> (Hitoshi Harada)
      </para>
     </listitem>
 
@@ -1664,41 +1664,41 @@
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> use translated messages properly
+      Make <application>ecpglib</application> use translated messages properly
       (Chen Huajun)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly install <application>ecpg_compat</> and
-      <application>pgtypes</> libraries on MSVC (Jiang Guiqing)
+      Properly install <application>ecpg_compat</application> and
+      <application>pgtypes</application> libraries on MSVC (Jiang Guiqing)
      </para>
     </listitem>
 
@@ -1717,15 +1717,15 @@
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -1749,7 +1749,7 @@
   <para>
    This release contains a variety of fixes from 8.4.14.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -1761,7 +1761,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -1774,13 +1774,13 @@
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane)
      </para>
 
      <para>
-      Fix <command>CREATE INDEX CONCURRENTLY</> to use
+      Fix <command>CREATE INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       resulting in corrupt concurrently-created indexes.
      </para>
@@ -1788,8 +1788,8 @@
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
@@ -1811,8 +1811,8 @@
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
      </para>
     </listitem>
 
@@ -1830,10 +1830,10 @@
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -1841,7 +1841,7 @@
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
@@ -1854,7 +1854,7 @@
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to handle inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to handle inherited check
       constraints properly (Pavan Deolasee)
      </para>
 
@@ -1866,14 +1866,14 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -1887,7 +1887,7 @@
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -1895,7 +1895,7 @@
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -1923,7 +1923,7 @@
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -1936,8 +1936,8 @@
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -1947,33 +1947,33 @@
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -1984,41 +1984,41 @@
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -2029,7 +2029,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -2051,7 +2051,7 @@
   <para>
    This release contains a variety of fixes from 8.4.13.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -2063,7 +2063,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -2081,7 +2081,7 @@
 
      <para>
       These errors could result in wrong answers from queries that scan the
-      same <literal>WITH</> subquery multiple times.
+      same <literal>WITH</literal> subquery multiple times.
      </para>
     </listitem>
 
@@ -2104,22 +2104,22 @@
      </para>
 
      <para>
-      If we revoke a grant option from some role <replaceable>X</>, but
-      <replaceable>X</> still holds that option via a grant from someone
+      If we revoke a grant option from some role <replaceable>X</replaceable>, but
+      <replaceable>X</replaceable> still holds that option via a grant from someone
       else, we should not recursively revoke the corresponding privilege
-      from role(s) <replaceable>Y</> that <replaceable>X</> had granted it
+      from role(s) <replaceable>Y</replaceable> that <replaceable>X</replaceable> had granted it
       to.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>SIGFPE</> when PL/Perl is in use (Andres Freund)
+      Fix handling of <literal>SIGFPE</literal> when PL/Perl is in use (Andres Freund)
      </para>
 
      <para>
-      Perl resets the process's <literal>SIGFPE</> handler to
-      <literal>SIG_IGN</>, which could result in crashes later on.  Restore
+      Perl resets the process's <literal>SIGFPE</literal> handler to
+      <literal>SIG_IGN</literal>, which could result in crashes later on.  Restore
       the normal Postgres signal handler after initializing PL/Perl.
      </para>
     </listitem>
@@ -2138,7 +2138,7 @@
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -2146,7 +2146,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -2167,7 +2167,7 @@
   <para>
    This release contains a variety of fixes from 8.4.12.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -2179,7 +2179,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -2196,7 +2196,7 @@
      </para>
 
      <para>
-      <function>xml_parse()</> would attempt to fetch external files or
+      <function>xml_parse()</function> would attempt to fetch external files or
       URLs as needed to resolve DTD and entity references in an XML value,
       thus allowing unprivileged database users to attempt to fetch data
       with the privileges of the database server.  While the external data
@@ -2209,22 +2209,22 @@
 
     <listitem>
      <para>
-      Prevent access to external files/URLs via <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Peter Eisentraut)
+      Prevent access to external files/URLs via <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Peter Eisentraut)
      </para>
 
      <para>
-      <application>libxslt</> offers the ability to read and write both
+      <application>libxslt</application> offers the ability to read and write both
       files and URLs through stylesheet commands, thus allowing
       unprivileged database users to both read and write data with the
       privileges of the database server.  Disable that through proper use
-      of <application>libxslt</>'s security options.  (CVE-2012-3488)
+      of <application>libxslt</application>'s security options.  (CVE-2012-3488)
      </para>
 
      <para>
-      Also, remove <function>xslt_process()</>'s ability to fetch documents
+      Also, remove <function>xslt_process()</function>'s ability to fetch documents
       and stylesheets from external files/URLs.  While this was a
-      documented <quote>feature</>, it was long regarded as a bad idea.
+      documented <quote>feature</quote>, it was long regarded as a bad idea.
       The fix for CVE-2012-3489 broke that capability, and rather than
       expend effort on trying to fix it, we're just going to summarily
       remove it.
@@ -2252,22 +2252,22 @@
      </para>
 
      <para>
-      If <command>ALTER SEQUENCE</> was executed on a freshly created or
-      reset sequence, and then precisely one <function>nextval()</> call
+      If <command>ALTER SEQUENCE</command> was executed on a freshly created or
+      reset sequence, and then precisely one <function>nextval()</function> call
       was made on it, and then the server crashed, WAL replay would restore
       the sequence to a state in which it appeared that no
-      <function>nextval()</> had been done, thus allowing the first
+      <function>nextval()</function> had been done, thus allowing the first
       sequence value to be returned again by the next
-      <function>nextval()</> call.  In particular this could manifest for
-      <type>serial</> columns, since creation of a serial column's sequence
-      includes an <command>ALTER SEQUENCE OWNED BY</> step.
+      <function>nextval()</function> call.  In particular this could manifest for
+      <type>serial</type> columns, since creation of a serial column's sequence
+      includes an <command>ALTER SEQUENCE OWNED BY</command> step.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure the <filename>backup_label</> file is fsync'd after
-      <function>pg_start_backup()</> (Dave Kerr)
+      Ensure the <filename>backup_label</filename> file is fsync'd after
+      <function>pg_start_backup()</function> (Dave Kerr)
      </para>
     </listitem>
 
@@ -2292,7 +2292,7 @@
      <para>
       The original coding could allow inconsistent behavior in some cases;
       in particular, an autovacuum could get canceled after less than
-      <literal>deadlock_timeout</> grace period.
+      <literal>deadlock_timeout</literal> grace period.
      </para>
     </listitem>
 
@@ -2304,15 +2304,15 @@
 
     <listitem>
      <para>
-      Fix log collector so that <literal>log_truncate_on_rotation</> works
+      Fix log collector so that <literal>log_truncate_on_rotation</literal> works
       during the very first log rotation after server start (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>WITH</> attached to a nested set operation
-      (<literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</>)
+      Fix <literal>WITH</literal> attached to a nested set operation
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
       (Tom Lane)
      </para>
     </listitem>
@@ -2320,24 +2320,24 @@
     <listitem>
      <para>
       Ensure that a whole-row reference to a subquery doesn't include any
-      extra <literal>GROUP BY</> or <literal>ORDER BY</> columns (Tom Lane)
+      extra <literal>GROUP BY</literal> or <literal>ORDER BY</literal> columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow copying whole-row references in <literal>CHECK</>
-      constraints and index definitions during <command>CREATE TABLE</>
+      Disallow copying whole-row references in <literal>CHECK</literal>
+      constraints and index definitions during <command>CREATE TABLE</command>
       (Tom Lane)
      </para>
 
      <para>
-      This situation can arise in <command>CREATE TABLE</> with
-      <literal>LIKE</> or <literal>INHERITS</>.  The copied whole-row
+      This situation can arise in <command>CREATE TABLE</command> with
+      <literal>LIKE</literal> or <literal>INHERITS</literal>.  The copied whole-row
       variable was incorrectly labeled with the row type of the original
       table not the new one.  Rejecting the case seems reasonable for
-      <literal>LIKE</>, since the row types might well diverge later.  For
-      <literal>INHERITS</> we should ideally allow it, with an implicit
+      <literal>LIKE</literal>, since the row types might well diverge later.  For
+      <literal>INHERITS</literal> we should ideally allow it, with an implicit
       coercion to the parent table's row type; but that will require more
       work than seems safe to back-patch.
      </para>
@@ -2345,7 +2345,7 @@
 
     <listitem>
      <para>
-      Fix memory leak in <literal>ARRAY(SELECT ...)</> subqueries (Heikki
+      Fix memory leak in <literal>ARRAY(SELECT ...)</literal> subqueries (Heikki
       Linnakangas, Tom Lane)
      </para>
     </listitem>
@@ -2357,7 +2357,7 @@
 
      <para>
       The code could get confused by quantified parenthesized
-      subexpressions, such as <literal>^(foo)?bar</>.  This would lead to
+      subexpressions, such as <literal>^(foo)?bar</literal>.  This would lead to
       incorrect index optimization of searches for such patterns.
      </para>
     </listitem>
@@ -2365,22 +2365,22 @@
     <listitem>
      <para>
       Fix bugs with parsing signed
-      <replaceable>hh</><literal>:</><replaceable>mm</> and
-      <replaceable>hh</><literal>:</><replaceable>mm</><literal>:</><replaceable>ss</>
-      fields in <type>interval</> constants (Amit Kapila, Tom Lane)
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable> and
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable><literal>:</literal><replaceable>ss</replaceable>
+      fields in <type>interval</type> constants (Amit Kapila, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report errors properly in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Tom Lane)
+      Report errors properly in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012e
+      Update time zone data files to <application>tzdata</application> release 2012e
       for DST law changes in Morocco and Tokelau
      </para>
     </listitem>
@@ -2401,7 +2401,7 @@
   <para>
    This release contains a variety of fixes from 8.4.11.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -2413,7 +2413,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -2426,12 +2426,12 @@
     <listitem>
      <para>
       Fix incorrect password transformation in
-      <filename>contrib/pgcrypto</>'s DES <function>crypt()</> function
+      <filename>contrib/pgcrypto</filename>'s DES <function>crypt()</function> function
       (Solar Designer)
      </para>
 
      <para>
-      If a password string contained the byte value <literal>0x80</>, the
+      If a password string contained the byte value <literal>0x80</literal>, the
       remainder of the password was ignored, causing the password to be much
       weaker than it appeared.  With this fix, the rest of the string is
       properly included in the DES hash.  Any stored password values that are
@@ -2442,7 +2442,7 @@
 
     <listitem>
      <para>
-      Ignore <literal>SECURITY DEFINER</> and <literal>SET</> attributes for
+      Ignore <literal>SECURITY DEFINER</literal> and <literal>SET</literal> attributes for
       a procedural language's call handler (Tom Lane)
      </para>
 
@@ -2454,7 +2454,7 @@
 
     <listitem>
      <para>
-      Allow numeric timezone offsets in <type>timestamp</> input to be up to
+      Allow numeric timezone offsets in <type>timestamp</type> input to be up to
       16 hours away from UTC (Tom Lane)
      </para>
 
@@ -2480,7 +2480,7 @@
 
     <listitem>
      <para>
-      Fix <type>text</> to <type>name</> and <type>char</> to <type>name</>
+      Fix <type>text</type> to <type>name</type> and <type>char</type> to <type>name</type>
       casts to perform string truncation correctly in multibyte encodings
       (Karl Schnaitter)
      </para>
@@ -2488,7 +2488,7 @@
 
     <listitem>
      <para>
-      Fix memory copying bug in <function>to_tsquery()</> (Heikki Linnakangas)
+      Fix memory copying bug in <function>to_tsquery()</function> (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -2502,7 +2502,7 @@
       This bug concerns sub-SELECTs that reference variables coming from the
       nullable side of an outer join of the surrounding query.
       In 9.1, queries affected by this bug would fail with <quote>ERROR:
-      Upper-level PlaceHolderVar found where not expected</>.  But in 9.0 and
+      Upper-level PlaceHolderVar found where not expected</quote>.  But in 9.0 and
       8.4, you'd silently get possibly-wrong answers, since the value
       transmitted into the subquery wouldn't go to null when it should.
      </para>
@@ -2510,13 +2510,13 @@
 
     <listitem>
      <para>
-      Fix slow session startup when <structname>pg_attribute</> is very large
+      Fix slow session startup when <structname>pg_attribute</structname> is very large
       (Tom Lane)
      </para>
 
      <para>
-      If <structname>pg_attribute</> exceeds one-fourth of
-      <varname>shared_buffers</>, cache rebuilding code that is sometimes
+      If <structname>pg_attribute</structname> exceeds one-fourth of
+      <varname>shared_buffers</varname>, cache rebuilding code that is sometimes
       needed during session start would trigger the synchronized-scan logic,
       causing it to take many times longer than normal.  The problem was
       particularly acute if many new sessions were starting at once.
@@ -2537,8 +2537,8 @@
 
     <listitem>
      <para>
-      Ensure the Windows implementation of <function>PGSemaphoreLock()</>
-      clears <varname>ImmediateInterruptOK</> before returning (Tom Lane)
+      Ensure the Windows implementation of <function>PGSemaphoreLock()</function>
+      clears <varname>ImmediateInterruptOK</varname> before returning (Tom Lane)
      </para>
 
      <para>
@@ -2565,12 +2565,12 @@
 
     <listitem>
      <para>
-      Fix <command>COPY FROM</> to properly handle null marker strings that
+      Fix <command>COPY FROM</command> to properly handle null marker strings that
       correspond to invalid encoding (Tom Lane)
      </para>
 
      <para>
-      A null marker string such as <literal>E'\\0'</> should work, and did
+      A null marker string such as <literal>E'\\0'</literal> should work, and did
       work in the past, but the case got broken in 8.4.
      </para>
     </listitem>
@@ -2583,7 +2583,7 @@
 
      <para>
       Previously, infinite recursion in a function invoked by
-      auto-<command>ANALYZE</> could crash worker processes.
+      auto-<command>ANALYZE</command> could crash worker processes.
      </para>
     </listitem>
 
@@ -2602,7 +2602,7 @@
     <listitem>
      <para>
       Fix logging collector to ensure it will restart file rotation
-      after receiving <systemitem>SIGHUP</> (Tom Lane)
+      after receiving <systemitem>SIGHUP</systemitem> (Tom Lane)
      </para>
     </listitem>
 
@@ -2615,33 +2615,33 @@
 
     <listitem>
      <para>
-      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</> command (Joe
+      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</command> command (Joe
       Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL's <command>GET DIAGNOSTICS</> command when the target
+      Fix PL/pgSQL's <command>GET DIAGNOSTICS</command> command when the target
       is the function's first variable (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential access off the end of memory in <application>psql</>'s
-      expanded display (<command>\x</>) mode (Peter Eisentraut)
+      Fix potential access off the end of memory in <application>psql</application>'s
+      expanded display (<command>\x</command>) mode (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several performance problems in <application>pg_dump</> when
+      Fix several performance problems in <application>pg_dump</application> when
       the database contains many objects (Jeff Janes, Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> could get very slow if the database contained
+      <application>pg_dump</application> could get very slow if the database contained
       many schemas, or if many objects are in dependency loops, or if there
       are many owned sequences.
      </para>
@@ -2649,21 +2649,21 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s <function>dblink_exec()</> to not leak
+      Fix <filename>contrib/dblink</filename>'s <function>dblink_exec()</function> to not leak
       temporary database connections upon error (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to report the correct connection name in
+      Fix <filename>contrib/dblink</filename> to report the correct connection name in
       error messages (Kyotaro Horiguchi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012c
+      Update time zone data files to <application>tzdata</application> release 2012c
       for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland
       Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
       also historical corrections for Canada.
@@ -2686,7 +2686,7 @@
   <para>
    This release contains a variety of fixes from 8.4.10.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -2698,7 +2698,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.10,
-    see <xref linkend="release-8-4-10">.
+    see <xref linkend="release-8-4-10"/>.
    </para>
 
   </sect2>
@@ -2711,14 +2711,14 @@
     <listitem>
      <para>
       Require execute permission on the trigger function for
-      <command>CREATE TRIGGER</> (Robert Haas)
+      <command>CREATE TRIGGER</command> (Robert Haas)
      </para>
 
      <para>
       This missing check could allow another user to execute a trigger
       function with forged input data, by installing it on a table he owns.
       This is only of significance for trigger functions marked
-      <literal>SECURITY DEFINER</>, since otherwise trigger functions run
+      <literal>SECURITY DEFINER</literal>, since otherwise trigger functions run
       as the table owner anyway.  (CVE-2012-0866)
      </para>
     </listitem>
@@ -2730,7 +2730,7 @@
      </para>
 
      <para>
-      Both <application>libpq</> and the server truncated the common name
+      Both <application>libpq</application> and the server truncated the common name
       extracted from an SSL certificate at 32 bytes.  Normally this would
       cause nothing worse than an unexpected verification failure, but there
       are some rather-implausible scenarios in which it might allow one
@@ -2745,12 +2745,12 @@
 
     <listitem>
      <para>
-      Convert newlines to spaces in names written in <application>pg_dump</>
+      Convert newlines to spaces in names written in <application>pg_dump</application>
       comments (Robert Haas)
      </para>
 
      <para>
-      <application>pg_dump</> was incautious about sanitizing object names
+      <application>pg_dump</application> was incautious about sanitizing object names
       that are emitted within SQL comments in its output script.  A name
       containing a newline would at least render the script syntactically
       incorrect.  Maliciously crafted object names could present a SQL
@@ -2766,10 +2766,10 @@
 
      <para>
       An index page split caused by an insertion could sometimes cause a
-      concurrently-running <command>VACUUM</> to miss removing index entries
+      concurrently-running <command>VACUUM</command> to miss removing index entries
       that it should remove.  After the corresponding table rows are removed,
       the dangling index entries would cause errors (such as <quote>could not
-      read block N in file ...</>) or worse, silently wrong query results
+      read block N in file ...</quote>) or worse, silently wrong query results
       after unrelated rows are re-inserted at the now-free table locations.
       This bug has been present since release 8.2, but occurs so infrequently
       that it was not diagnosed until now.  If you have reason to suspect
@@ -2795,16 +2795,16 @@
     <listitem>
      <para>
       Allow non-existent values for some settings in <command>ALTER
-      USER/DATABASE SET</> (Heikki Linnakangas)
+      USER/DATABASE SET</command> (Heikki Linnakangas)
      </para>
 
      <para>
-      Allow <varname>default_text_search_config</>,
-      <varname>default_tablespace</>, and <varname>temp_tablespaces</> to be
+      Allow <varname>default_text_search_config</varname>,
+      <varname>default_tablespace</varname>, and <varname>temp_tablespaces</varname> to be
       set to names that are not known.  This is because they might be known
       in another database where the setting is intended to be used, or for the
       tablespace cases because the tablespace might not be created yet.  The
-      same issue was previously recognized for <varname>search_path</>, and
+      same issue was previously recognized for <varname>search_path</varname>, and
       these settings now act like that one.
      </para>
     </listitem>
@@ -2842,7 +2842,7 @@
 
     <listitem>
      <para>
-      Fix regular expression back-references with <literal>*</> attached
+      Fix regular expression back-references with <literal>*</literal> attached
       (Tom Lane)
      </para>
 
@@ -2856,18 +2856,18 @@
       A similar problem still afflicts back-references that are embedded in a
       larger quantified expression, rather than being the immediate subject
       of the quantifier.  This will be addressed in a future
-      <productname>PostgreSQL</> release.
+      <productname>PostgreSQL</productname> release.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix recently-introduced memory leak in processing of
-      <type>inet</>/<type>cidr</> values (Heikki Linnakangas)
+      <type>inet</type>/<type>cidr</type> values (Heikki Linnakangas)
      </para>
 
      <para>
-      A patch in the December 2011 releases of <productname>PostgreSQL</>
+      A patch in the December 2011 releases of <productname>PostgreSQL</productname>
       caused memory leakage in these operations, which could be significant
       in scenarios such as building a btree index on such a column.
      </para>
@@ -2875,8 +2875,8 @@
 
     <listitem>
      <para>
-      Fix dangling pointer after <command>CREATE TABLE AS</>/<command>SELECT
-      INTO</> in a SQL-language function (Tom Lane)
+      Fix dangling pointer after <command>CREATE TABLE AS</command>/<command>SELECT
+      INTO</command> in a SQL-language function (Tom Lane)
      </para>
 
      <para>
@@ -2910,32 +2910,32 @@
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>'s handling of inherited table columns
+      Improve <application>pg_dump</application>'s handling of inherited table columns
       (Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> mishandled situations where a child column has
+      <application>pg_dump</application> mishandled situations where a child column has
       a different default expression than its parent column.  If the default
       is textually identical to the parent's default, but not actually the
       same (for instance, because of schema search path differences) it would
       not be recognized as different, so that after dump and restore the
       child would be allowed to inherit the parent's default.  Child columns
-      that are <literal>NOT NULL</> where their parent is not could also be
+      that are <literal>NOT NULL</literal> where their parent is not could also be
       restored subtly incorrectly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
+      Fix <application>pg_restore</application>'s direct-to-database mode for
       INSERT-style table data (Tom Lane)
      </para>
 
      <para>
       Direct-to-database restores from archive files made with
-      <option>--inserts</> or <option>--column-inserts</> options fail when
-      using <application>pg_restore</> from a release dated September or
+      <option>--inserts</option> or <option>--column-inserts</option> options fail when
+      using <application>pg_restore</application> from a release dated September or
       December 2011, as a result of an oversight in a fix for another
       problem.  The archive file itself is not at fault, and text-mode
       output is okay.
@@ -2944,8 +2944,8 @@
 
     <listitem>
      <para>
-      Allow <literal>AT</> option in <application>ecpg</>
-      <literal>DEALLOCATE</> statements (Michael Meskes)
+      Allow <literal>AT</literal> option in <application>ecpg</application>
+      <literal>DEALLOCATE</literal> statements (Michael Meskes)
      </para>
 
      <para>
@@ -2956,8 +2956,8 @@
 
     <listitem>
      <para>
-      Fix error in <filename>contrib/intarray</>'s <literal>int[] &amp;
-      int[]</> operator (Guillaume Lelarge)
+      Fix error in <filename>contrib/intarray</filename>'s <literal>int[] &amp;
+      int[]</literal> operator (Guillaume Lelarge)
      </para>
 
      <para>
@@ -2969,8 +2969,8 @@
 
     <listitem>
      <para>
-      Fix error detection in <filename>contrib/pgcrypto</>'s
-      <function>encrypt_iv()</> and <function>decrypt_iv()</>
+      Fix error detection in <filename>contrib/pgcrypto</filename>'s
+      <function>encrypt_iv()</function> and <function>decrypt_iv()</function>
       (Marko Kreen)
      </para>
 
@@ -2982,26 +2982,26 @@
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <filename>contrib/test_parser</>
+      Fix one-byte buffer overrun in <filename>contrib/test_parser</filename>
       (Paul Guyot)
      </para>
 
      <para>
       The code would try to read one more byte than it should, which would
       crash in corner cases.
-      Since <filename>contrib/test_parser</> is only example code, this is
+      Since <filename>contrib/test_parser</filename> is only example code, this is
       not a security issue in itself, but bad example code is still bad.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <function>__sync_lock_test_and_set()</> for spinlocks on ARM, if
+      Use <function>__sync_lock_test_and_set()</function> for spinlocks on ARM, if
       available (Martin Pitt)
      </para>
 
      <para>
-      This function replaces our previous use of the <literal>SWPB</>
+      This function replaces our previous use of the <literal>SWPB</literal>
       instruction, which is deprecated and not available on ARMv6 and later.
       Reports suggest that the old code doesn't fail in an obvious way on
       recent ARM boards, but simply doesn't interlock concurrent accesses,
@@ -3011,7 +3011,7 @@
 
     <listitem>
      <para>
-      Use <option>-fexcess-precision=standard</> option when building with
+      Use <option>-fexcess-precision=standard</option> option when building with
       gcc versions that accept it (Andrew Dunstan)
      </para>
 
@@ -3048,7 +3048,7 @@
   <para>
    This release contains a variety of fixes from 8.4.9.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -3060,14 +3060,14 @@
 
    <para>
     However, a longstanding error was discovered in the definition of the
-    <literal>information_schema.referential_constraints</> view.  If you
+    <literal>information_schema.referential_constraints</literal> view.  If you
     rely on correct results from that view, you should replace its
     definition as explained in the first changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 8.4.8,
-    see <xref linkend="release-8-4-8">.
+    see <xref linkend="release-8-4-8"/>.
    </para>
 
   </sect2>
@@ -3079,7 +3079,7 @@
 
     <listitem>
      <para>
-      Fix bugs in <literal>information_schema.referential_constraints</> view
+      Fix bugs in <literal>information_schema.referential_constraints</literal> view
       (Tom Lane)
      </para>
 
@@ -3092,13 +3092,13 @@
      </para>
 
      <para>
-      Since the view definition is installed by <application>initdb</>,
+      Since the view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can (as a superuser) drop the
-      <literal>information_schema</> schema then re-create it by sourcing
-      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      <literal>information_schema</literal> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</replaceable>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)  This must be repeated in each database
       to be fixed.
      </para>
     </listitem>
@@ -3112,19 +3112,19 @@
      <para>
       This could result in transiently failing to find index entries after
       a crash, or on a hot-standby server.  The problem would be repaired
-      by the next <command>VACUUM</> of the index, however.
+      by the next <command>VACUUM</command> of the index, however.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
-      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      SELECT * FROM src</literal> or <literal>INSERT INTO dest SELECT * FROM src</literal>
       (Tom Lane)
      </para>
 
      <para>
-      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</command>,
       attempts to copy its data verbatim to another table could produce
       corrupt results in certain corner cases.
       The problem can only manifest in this precise form in 8.4 and later,
@@ -3141,7 +3141,7 @@
 
      <para>
       The typical symptom was transient errors like <quote>missing chunk
-      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      number 0 for toast value NNNNN in pg_toast_2619</quote>, where the cited
       toast table would always belong to a system catalog.
      </para>
     </listitem>
@@ -3157,7 +3157,7 @@
       or modified the function, leading to misbehavior when the function was
       used.  Note that merely installing this update will not fix the missing
       dependency entries; to do that, you'd need to <command>CREATE OR
-      REPLACE</> each such function afterwards.  If you have functions whose
+      REPLACE</command> each such function afterwards.  If you have functions whose
       defaults depend on non-built-in objects, doing so is recommended.
      </para>
     </listitem>
@@ -3171,29 +3171,29 @@
 
     <listitem>
      <para>
-      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
-      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      Make <function>DatumGetInetP()</function> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</function>, that does
       not (Heikki Linnakangas)
      </para>
 
      <para>
       This change affects no core code, but might prevent crashes in add-on
-      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      code that expects <function>DatumGetInetP()</function> to produce an unpacked
       datum as per usual convention.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve locale support in <type>money</> type's input and output
+      Improve locale support in <type>money</type> type's input and output
       (Tom Lane)
      </para>
 
      <para>
       Aside from not supporting all standard
-      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</varname></link>
       formatting options, the input and output functions were inconsistent,
-      meaning there were locales in which dumped <type>money</> values could
+      meaning there were locales in which dumped <type>money</type> values could
       not be re-read.
      </para>
     </listitem>
@@ -3201,15 +3201,15 @@
     <listitem>
      <para>
       Don't let <link
-      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
-      affect <literal>CASE foo WHEN NULL ...</> constructs
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</varname></link>
+      affect <literal>CASE foo WHEN NULL ...</literal> constructs
       (Heikki Linnakangas)
      </para>
 
      <para>
-      <varname>transform_null_equals</> is only supposed to affect
-      <literal>foo = NULL</> expressions written directly by the user, not
-      equality checks generated internally by this form of <literal>CASE</>.
+      <varname>transform_null_equals</varname> is only supposed to affect
+      <literal>foo = NULL</literal> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</literal>.
      </para>
     </listitem>
 
@@ -3221,14 +3221,14 @@
 
      <para>
       For a cascading foreign key that references its own table, a row update
-      will fire both the <literal>ON UPDATE</> trigger and the
-      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
-      trigger must execute first, else the <literal>CHECK</> will check a
+      will fire both the <literal>ON UPDATE</literal> trigger and the
+      <literal>CHECK</literal> trigger as one event.  The <literal>ON UPDATE</literal>
+      trigger must execute first, else the <literal>CHECK</literal> will check a
       non-final state of the row and possibly throw an inappropriate error.
       However, the firing order of these triggers is determined by their
       names, which generally sort in creation order since the triggers have
       auto-generated names following the convention
-      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      <quote>RI_ConstraintTrigger_NNNN</quote>.  A proper fix would require
       modifying that convention, which we will do in 9.2, but it seems risky
       to change it in existing releases.  So this patch just changes the
       creation order of the triggers.  Users encountering this type of error
@@ -3257,13 +3257,13 @@
 
      <para>
       Formerly, these would not be displayed correctly in the
-      <structname>pg_settings</> view.
+      <structname>pg_settings</structname> view.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Preserve blank lines within commands in <application>psql</>'s command
+      Preserve blank lines within commands in <application>psql</application>'s command
       history (Robert Haas)
      </para>
 
@@ -3275,14 +3275,14 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts between
+      Fix <application>pg_dump</application> to dump user-defined casts between
       auto-generated types, such as table rowtypes (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      Use the preferred version of <application>xsubpp</application> to build PL/Perl,
       not necessarily the operating system's main copy
       (David Wheeler and Alex Hunsaker)
      </para>
@@ -3290,19 +3290,19 @@
 
     <listitem>
      <para>
-      Fix incorrect coding in <filename>contrib/dict_int</> and
-      <filename>contrib/dict_xsyn</> (Tom Lane)
+      Fix incorrect coding in <filename>contrib/dict_int</filename> and
+      <filename>contrib/dict_xsyn</filename> (Tom Lane)
      </para>
 
      <para>
       Some functions incorrectly assumed that memory returned by
-      <function>palloc()</> is guaranteed zeroed.
+      <function>palloc()</function> is guaranteed zeroed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</function>
       (Robert Haas)
      </para>
     </listitem>
@@ -3333,15 +3333,15 @@
      </para>
 
      <para>
-      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
-      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Map <quote>Central America Standard Time</quote> to <literal>CST6</literal>, not
+      <literal>CST6CDT</literal>, because DST is generally not observed anywhere in
       Central America.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011n
+      Update time zone data files to <application>tzdata</application> release 2011n
       for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
       also historical corrections for Alaska and British East Africa.
      </para>
@@ -3363,7 +3363,7 @@
   <para>
    This release contains a variety of fixes from 8.4.8.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -3375,7 +3375,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 8.4.8,
-    see <xref linkend="release-8-4-8">.
+    see <xref linkend="release-8-4-8"/>.
    </para>
 
   </sect2>
@@ -3410,7 +3410,7 @@
 
     <listitem>
      <para>
-      Fix possible buffer overrun in <function>tsvector_concat()</>
+      Fix possible buffer overrun in <function>tsvector_concat()</function>
       (Tom Lane)
      </para>
 
@@ -3422,14 +3422,14 @@
 
     <listitem>
      <para>
-      Fix crash in <function>xml_recv</> when processing a
-      <quote>standalone</> parameter (Tom Lane)
+      Fix crash in <function>xml_recv</function> when processing a
+      <quote>standalone</quote> parameter (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <function>pg_options_to_table</> return NULL for an option with no
+      Make <function>pg_options_to_table</function> return NULL for an option with no
       value (Tom Lane)
      </para>
 
@@ -3440,7 +3440,7 @@
 
     <listitem>
      <para>
-      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</command>
       and in SJIS-2004 encoding conversion (Noah Misch)
      </para>
 
@@ -3469,7 +3469,7 @@
       There was a window wherein a new backend process could read a stale init
       file but miss the inval messages that would tell it the data is stale.
       The result would be bizarre failures in catalog accesses, typically
-      <quote>could not read block 0 in file ...</> later during startup.
+      <quote>could not read block 0 in file ...</quote> later during startup.
      </para>
     </listitem>
 
@@ -3490,7 +3490,7 @@
      <para>
       Fix incorrect memory accounting (leading to possible memory bloat) in
       tuplestores supporting holdable cursors and plpgsql's <literal>RETURN
-      NEXT</> command (Tom Lane)
+      NEXT</literal> command (Tom Lane)
      </para>
     </listitem>
 
@@ -3526,7 +3526,7 @@
 
     <listitem>
      <para>
-      Allow nested <literal>EXISTS</> queries to be optimized properly (Tom
+      Allow nested <literal>EXISTS</literal> queries to be optimized properly (Tom
       Lane)
      </para>
     </listitem>
@@ -3546,12 +3546,12 @@
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to handle gating Result nodes within
+      Fix <command>EXPLAIN</command> to handle gating Result nodes within
       inner-indexscan subplans (Tom Lane)
      </para>
 
      <para>
-      The usual symptom of this oversight was <quote>bogus varno</> errors.
+      The usual symptom of this oversight was <quote>bogus varno</quote> errors.
      </para>
     </listitem>
 
@@ -3567,13 +3567,13 @@
 
     <listitem>
      <para>
-      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+      Fix dump bug for <literal>VALUES</literal> in a view (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+      Disallow <literal>SELECT FOR UPDATE/SHARE</literal> on sequences (Tom Lane)
      </para>
 
      <para>
@@ -3583,8 +3583,8 @@
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> so that it always updates
-      <literal>pg_class</>.<literal>reltuples</>/<literal>relpages</> (Tom
+      Fix <command>VACUUM</command> so that it always updates
+      <literal>pg_class</literal>.<literal>reltuples</literal>/<literal>relpages</literal> (Tom
       Lane)
      </para>
 
@@ -3603,7 +3603,7 @@
 
     <listitem>
      <para>
-      Fix cases where <command>CLUSTER</> might attempt to access
+      Fix cases where <command>CLUSTER</command> might attempt to access
       already-removed TOAST data (Tom Lane)
      </para>
     </listitem>
@@ -3611,7 +3611,7 @@
     <listitem>
      <para>
       Fix portability bugs in use of credentials control messages for
-      <quote>peer</> authentication (Tom Lane)
+      <quote>peer</quote> authentication (Tom Lane)
      </para>
     </listitem>
 
@@ -3623,13 +3623,13 @@
 
      <para>
       The typical symptom of this problem was <quote>The function requested is
-      not supported</> errors during SSPI login.
+      not supported</quote> errors during SSPI login.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Throw an error if <filename>pg_hba.conf</> contains <literal>hostssl</>
+      Throw an error if <filename>pg_hba.conf</filename> contains <literal>hostssl</literal>
       but SSL is disabled (Tom Lane)
      </para>
 
@@ -3641,12 +3641,12 @@
 
     <listitem>
      <para>
-      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+      Fix typo in <function>pg_srand48</function> seed initialization (Andres Freund)
      </para>
 
      <para>
       This led to failure to use all bits of the provided seed.  This function
-      is not used on most platforms (only those without <function>srandom</>),
+      is not used on most platforms (only those without <function>srandom</function>),
       and the potential security exposure from a less-random-than-expected
       seed seems minimal in any case.
      </para>
@@ -3654,25 +3654,25 @@
 
     <listitem>
      <para>
-      Avoid integer overflow when the sum of <literal>LIMIT</> and
-      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+      Avoid integer overflow when the sum of <literal>LIMIT</literal> and
+      <literal>OFFSET</literal> values exceeds 2^63 (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add overflow checks to <type>int4</> and <type>int8</> versions of
-      <function>generate_series()</> (Robert Haas)
+      Add overflow checks to <type>int4</type> and <type>int8</type> versions of
+      <function>generate_series()</function> (Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+      Fix trailing-zero removal in <function>to_char()</function> (Marti Raudsepp)
      </para>
 
      <para>
-      In a format with <literal>FM</> and no digit positions
+      In a format with <literal>FM</literal> and no digit positions
       after the decimal point, zeroes to the left of the decimal point could
       be removed incorrectly.
      </para>
@@ -3680,7 +3680,7 @@
 
     <listitem>
      <para>
-      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      Fix <function>pg_size_pretty()</function> to avoid overflow for inputs close to
       2^63 (Tom Lane)
      </para>
     </listitem>
@@ -3698,59 +3698,59 @@
 
     <listitem>
      <para>
-      Correctly handle quotes in locale names during <application>initdb</>
+      Correctly handle quotes in locale names during <application>initdb</application>
       (Heikki Linnakangas)
      </para>
 
      <para>
       The case can arise with some Windows locales, such as <quote>People's
-      Republic of China</>.
+      Republic of China</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to preserve toast tables' relfrozenxids
+      Fix <application>pg_upgrade</application> to preserve toast tables' relfrozenxids
       during an upgrade from 8.3 (Bruce Momjian)
      </para>
 
      <para>
-      Failure to do this could lead to <filename>pg_clog</> files being
+      Failure to do this could lead to <filename>pg_clog</filename> files being
       removed too soon after the upgrade.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</>, support silent mode for service registrations
+      In <application>pg_ctl</application>, support silent mode for service registrations
       on Windows (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s counting of script file line numbers during
-      <literal>COPY</> from a different file (Tom Lane)
+      Fix <application>psql</application>'s counting of script file line numbers during
+      <literal>COPY</literal> from a different file (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
-      <varname>standard_conforming_strings</> (Tom Lane)
+      Fix <application>pg_restore</application>'s direct-to-database mode for
+      <varname>standard_conforming_strings</varname> (Tom Lane)
      </para>
 
      <para>
-      <application>pg_restore</> could emit incorrect commands when restoring
+      <application>pg_restore</application> could emit incorrect commands when restoring
       directly to a database server from an archive file that had been made
-      with <varname>standard_conforming_strings</> set to <literal>on</>.
+      with <varname>standard_conforming_strings</varname> set to <literal>on</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Be more user-friendly about unsupported cases for parallel
-      <application>pg_restore</> (Tom Lane)
+      <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
@@ -3761,14 +3761,14 @@
 
     <listitem>
      <para>
-      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      Fix write-past-buffer-end and memory leak in <application>libpq</application>'s
       LDAP service lookup code (Albe Laurenz)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, avoid failures when using nonblocking I/O
+      In <application>libpq</application>, avoid failures when using nonblocking I/O
       and an SSL connection (Martin Pihlak, Tom Lane)
      </para>
     </listitem>
@@ -3780,36 +3780,36 @@
      </para>
 
      <para>
-      In particular, the response to a server report of <function>fork()</>
+      In particular, the response to a server report of <function>fork()</function>
       failure during SSL connection startup is now saner.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Improve <application>libpq</application>'s error reporting for SSL failures (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>PQsetvalue()</> to avoid possible crash when adding a new
-      tuple to a <structname>PGresult</> originally obtained from a server
+      Fix <function>PQsetvalue()</function> to avoid possible crash when adding a new
+      tuple to a <structname>PGresult</structname> originally obtained from a server
       query (Andrew Chernow)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      Make <application>ecpglib</application> write <type>double</type> values with 15 digits
       precision (Akira Kurosawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      In <application>ecpglib</application>, be sure <literal>LC_NUMERIC</literal> setting is
       restored after an error (Michael Meskes)
      </para>
     </listitem>
@@ -3821,7 +3821,7 @@
      </para>
 
      <para>
-      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      <filename>contrib/pg_crypto</filename>'s blowfish encryption code could give
       wrong results on platforms where char is signed (which is most),
       leading to encrypted passwords being weaker than they should be.
      </para>
@@ -3829,13 +3829,13 @@
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+      Fix memory leak in <filename>contrib/seg</filename> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgstatindex()</> to give consistent results for empty
+      Fix <function>pgstatindex()</function> to give consistent results for empty
       indexes (Tom Lane)
      </para>
     </listitem>
@@ -3867,7 +3867,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011i
+      Update time zone data files to <application>tzdata</application> release 2011i
       for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
      </para>
     </listitem>
@@ -3888,7 +3888,7 @@
   <para>
    This release contains a variety of fixes from 8.4.7.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -3900,10 +3900,10 @@
 
    <para>
     However, if your installation was upgraded from a previous major
-    release by running <application>pg_upgrade</>, you should take
+    release by running <application>pg_upgrade</application>, you should take
     action to prevent possible data loss due to a now-fixed bug in
-    <application>pg_upgrade</>.  The recommended solution is to run
-    <command>VACUUM FREEZE</> on all TOAST tables.
+    <application>pg_upgrade</application>.  The recommended solution is to run
+    <command>VACUUM FREEZE</command> on all TOAST tables.
     More information is available at <ulink
     url="http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix">
     http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix</ulink>.
@@ -3911,7 +3911,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -3923,36 +3923,36 @@
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s handling of TOAST tables
+      Fix <application>pg_upgrade</application>'s handling of TOAST tables
       (Bruce Momjian)
      </para>
 
      <para>
-      The <structname>pg_class</>.<structfield>relfrozenxid</> value for
+      The <structname>pg_class</structname>.<structfield>relfrozenxid</structfield> value for
       TOAST tables was not correctly copied into the new installation
-      during <application>pg_upgrade</>.  This could later result in
-      <literal>pg_clog</> files being discarded while they were still
+      during <application>pg_upgrade</application>.  This could later result in
+      <literal>pg_clog</literal> files being discarded while they were still
       needed to validate tuples in the TOAST tables, leading to
-      <quote>could not access status of transaction</> failures.
+      <quote>could not access status of transaction</quote> failures.
      </para>
 
      <para>
       This error poses a significant risk of data loss for installations
-      that have been upgraded with <application>pg_upgrade</>.  This patch
-      corrects the problem for future uses of <application>pg_upgrade</>,
+      that have been upgraded with <application>pg_upgrade</application>.  This patch
+      corrects the problem for future uses of <application>pg_upgrade</application>,
       but does not in itself cure the issue in installations that have been
-      processed with a buggy version of <application>pg_upgrade</>.
+      processed with a buggy version of <application>pg_upgrade</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Suppress incorrect <quote>PD_ALL_VISIBLE flag was incorrectly set</>
+      Suppress incorrect <quote>PD_ALL_VISIBLE flag was incorrectly set</quote>
       warning (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>VACUUM</> would sometimes issue this warning in cases that
+      <command>VACUUM</command> would sometimes issue this warning in cases that
       are actually valid.
      </para>
     </listitem>
@@ -3986,15 +3986,15 @@
 
     <listitem>
      <para>
-      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</> trigger
+      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</literal> trigger
       handling when there was a concurrent update to the target tuple
       (Tom Lane)
      </para>
 
      <para>
       This bug has been observed to result in intermittent <quote>cannot
-      extract system attribute from virtual tuple</> failures while trying to
-      do <literal>UPDATE RETURNING ctid</>.  There is a very small probability
+      extract system attribute from virtual tuple</quote> failures while trying to
+      do <literal>UPDATE RETURNING ctid</literal>.  There is a very small probability
       of more serious errors, such as generating incorrect index entries for
       the updated tuple.
      </para>
@@ -4002,13 +4002,13 @@
 
     <listitem>
      <para>
-      Disallow <command>DROP TABLE</> when there are pending deferred trigger
+      Disallow <command>DROP TABLE</command> when there are pending deferred trigger
       events for the table (Tom Lane)
      </para>
 
      <para>
-      Formerly the <command>DROP</> would go through, leading to
-      <quote>could not open relation with OID nnn</> errors when the
+      Formerly the <command>DROP</command> would go through, leading to
+      <quote>could not open relation with OID nnn</quote> errors when the
       triggers were eventually fired.
      </para>
     </listitem>
@@ -4053,7 +4053,7 @@
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to cope with long lines (over 1KB) in
+      Fix <application>pg_restore</application> to cope with long lines (over 1KB) in
       TOC files (Tom Lane)
      </para>
     </listitem>
@@ -4085,14 +4085,14 @@
 
     <listitem>
      <para>
-      Fix version-incompatibility problem with <application>libintl</> on
+      Fix version-incompatibility problem with <application>libintl</application> on
       Windows (Hiroshi Inoue)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix usage of <application>xcopy</> in Windows build scripts to
+      Fix usage of <application>xcopy</application> in Windows build scripts to
       work correctly under Windows 7 (Andrew Dunstan)
      </para>
 
@@ -4103,14 +4103,14 @@
 
     <listitem>
      <para>
-      Fix path separator used by <application>pg_regress</> on Cygwin
+      Fix path separator used by <application>pg_regress</application> on Cygwin
       (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011f
+      Update time zone data files to <application>tzdata</application> release 2011f
       for DST law changes in Chile, Cuba, Falkland Islands, Morocco, Samoa,
       and Turkey; also historical corrections for South Australia, Alaska,
       and Hawaii.
@@ -4133,7 +4133,7 @@
   <para>
    This release contains a variety of fixes from 8.4.6.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -4142,7 +4142,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -4154,15 +4154,15 @@
 
     <listitem>
      <para>
-      Avoid failures when <command>EXPLAIN</> tries to display a simple-form
-      <literal>CASE</> expression (Tom Lane)
+      Avoid failures when <command>EXPLAIN</command> tries to display a simple-form
+      <literal>CASE</literal> expression (Tom Lane)
      </para>
 
      <para>
-      If the <literal>CASE</>'s test expression was a constant, the planner
-      could simplify the <literal>CASE</> into a form that confused the
+      If the <literal>CASE</literal>'s test expression was a constant, the planner
+      could simplify the <literal>CASE</literal> into a form that confused the
       expression-display code, resulting in <quote>unexpected CASE WHEN
-      clause</> errors.
+      clause</quote> errors.
      </para>
     </listitem>
 
@@ -4187,44 +4187,44 @@
      </para>
 
      <para>
-      The <type>date</> type supports a wider range of dates than can be
-      represented by the <type>timestamp</> types, but the planner assumed it
+      The <type>date</type> type supports a wider range of dates than can be
+      represented by the <type>timestamp</type> types, but the planner assumed it
       could always convert a date to timestamp with impunity.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s text output for large objects (BLOBs)
-      when <varname>standard_conforming_strings</> is on (Tom Lane)
+      Fix <application>pg_restore</application>'s text output for large objects (BLOBs)
+      when <varname>standard_conforming_strings</varname> is on (Tom Lane)
      </para>
 
      <para>
       Although restoring directly to a database worked correctly, string
-      escaping was incorrect if <application>pg_restore</> was asked for
-      SQL text output and <varname>standard_conforming_strings</> had been
+      escaping was incorrect if <application>pg_restore</application> was asked for
+      SQL text output and <varname>standard_conforming_strings</varname> had been
       enabled in the source database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix erroneous parsing of <type>tsquery</> values containing
+      Fix erroneous parsing of <type>tsquery</type> values containing
       <literal>... &amp; !(subexpression) | ...</literal> (Tom Lane)
      </para>
 
      <para>
       Queries containing this combination of operators were not executed
-      correctly.  The same error existed in <filename>contrib/intarray</>'s
-      <type>query_int</> type and <filename>contrib/ltree</>'s
-      <type>ltxtquery</> type.
+      correctly.  The same error existed in <filename>contrib/intarray</filename>'s
+      <type>query_int</type> type and <filename>contrib/ltree</filename>'s
+      <type>ltxtquery</type> type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix buffer overrun in <filename>contrib/intarray</>'s input function
-      for the <type>query_int</> type (Apple)
+      Fix buffer overrun in <filename>contrib/intarray</filename>'s input function
+      for the <type>query_int</type> type (Apple)
      </para>
 
      <para>
@@ -4236,16 +4236,16 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/seg</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/seg</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>seg</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>seg</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.  (This is identical to the bug that was fixed in
-      <filename>contrib/cube</> in the previous update.)
+      <filename>contrib/cube</filename> in the previous update.)
      </para>
     </listitem>
 
@@ -4265,7 +4265,7 @@
   <para>
    This release contains a variety of fixes from 8.4.5.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -4274,7 +4274,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -4287,17 +4287,17 @@
     <listitem>
      <para>
       Force the default
-      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>
-      to be <literal>fdatasync</> on Linux (Tom Lane, Marti Raudsepp)
+      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>
+      to be <literal>fdatasync</literal> on Linux (Tom Lane, Marti Raudsepp)
      </para>
 
      <para>
-      The default on Linux has actually been <literal>fdatasync</> for many
-      years, but recent kernel changes caused <productname>PostgreSQL</> to
-      choose <literal>open_datasync</> instead.  This choice did not result
+      The default on Linux has actually been <literal>fdatasync</literal> for many
+      years, but recent kernel changes caused <productname>PostgreSQL</productname> to
+      choose <literal>open_datasync</literal> instead.  This choice did not result
       in any performance improvement, and caused outright failures on
-      certain filesystems, notably <literal>ext4</> with the
-      <literal>data=journal</> mount option.
+      certain filesystems, notably <literal>ext4</literal> with the
+      <literal>data=journal</literal> mount option.
      </para>
     </listitem>
 
@@ -4307,7 +4307,7 @@
      </para>
 
      <para>
-      This could result in <quote>bad buffer id: 0</> failures or
+      This could result in <quote>bad buffer id: 0</quote> failures or
       corruption of index contents during replication.
      </para>
     </listitem>
@@ -4326,7 +4326,7 @@
      </para>
 
      <para>
-      The effective <varname>vacuum_cost_limit</> for an autovacuum worker
+      The effective <varname>vacuum_cost_limit</varname> for an autovacuum worker
       could drop to nearly zero if it processed enough tables, causing it
       to run extremely slowly.
      </para>
@@ -4334,19 +4334,19 @@
 
     <listitem>
      <para>
-      Add support for detecting register-stack overrun on <literal>IA64</>
+      Add support for detecting register-stack overrun on <literal>IA64</literal>
       (Tom Lane)
      </para>
 
      <para>
-      The <literal>IA64</> architecture has two hardware stacks.  Full
+      The <literal>IA64</literal> architecture has two hardware stacks.  Full
       prevention of stack-overrun failures requires checking both.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a check for stack overflow in <function>copyObject()</> (Tom Lane)
+      Add a check for stack overflow in <function>copyObject()</function> (Tom Lane)
      </para>
 
      <para>
@@ -4362,7 +4362,7 @@
      </para>
 
      <para>
-      It is possible to have a <quote>concurrent</> page split in a
+      It is possible to have a <quote>concurrent</quote> page split in a
       temporary index, if for example there is an open cursor scanning the
       index when an insertion is done.  GiST failed to detect this case and
       hence could deliver wrong results when execution of the cursor
@@ -4389,16 +4389,16 @@
 
      <para>
       Certain cases where a large number of tuples needed to be read in
-      advance, but <varname>work_mem</> was large enough to allow them all
+      advance, but <varname>work_mem</varname> was large enough to allow them all
       to be held in memory, were unexpectedly slow.
-      <function>percent_rank()</>, <function>cume_dist()</> and
-      <function>ntile()</> in particular were subject to this problem.
+      <function>percent_rank()</function>, <function>cume_dist()</function> and
+      <function>ntile()</function> in particular were subject to this problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid memory leakage while <command>ANALYZE</>'ing complex index
+      Avoid memory leakage while <command>ANALYZE</command>'ing complex index
       expressions (Tom Lane)
      </para>
     </listitem>
@@ -4410,14 +4410,14 @@
      </para>
 
      <para>
-      An index declared like <literal>create index i on t (foo(t.*))</>
+      An index declared like <literal>create index i on t (foo(t.*))</literal>
       would not automatically get dropped when its table was dropped.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not <quote>inline</> a SQL function with multiple <literal>OUT</>
+      Do not <quote>inline</quote> a SQL function with multiple <literal>OUT</literal>
       parameters (Tom Lane)
      </para>
 
@@ -4429,15 +4429,15 @@
 
     <listitem>
      <para>
-      Behave correctly if <literal>ORDER BY</>, <literal>LIMIT</>,
-      <literal>FOR UPDATE</>, or <literal>WITH</> is attached to the
-      <literal>VALUES</> part of <literal>INSERT ... VALUES</> (Tom Lane)
+      Behave correctly if <literal>ORDER BY</literal>, <literal>LIMIT</literal>,
+      <literal>FOR UPDATE</literal>, or <literal>WITH</literal> is attached to the
+      <literal>VALUES</literal> part of <literal>INSERT ... VALUES</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix constant-folding of <literal>COALESCE()</> expressions (Tom Lane)
+      Fix constant-folding of <literal>COALESCE()</literal> expressions (Tom Lane)
      </para>
 
      <para>
@@ -4449,7 +4449,7 @@
     <listitem>
      <para>
       Fix postmaster crash when connection acceptance
-      (<function>accept()</> or one of the calls made immediately after it)
+      (<function>accept()</function> or one of the calls made immediately after it)
       fails, and the postmaster was compiled with GSSAPI support (Alexander
       Chernikov)
      </para>
@@ -4457,7 +4457,7 @@
 
     <listitem>
      <para>
-      Fix missed unlink of temporary files when <varname>log_temp_files</>
+      Fix missed unlink of temporary files when <varname>log_temp_files</varname>
       is active (Tom Lane)
      </para>
 
@@ -4469,11 +4469,11 @@
 
     <listitem>
      <para>
-      Add print functionality for <structname>InhRelation</> nodes (Tom Lane)
+      Add print functionality for <structname>InhRelation</structname> nodes (Tom Lane)
      </para>
 
      <para>
-      This avoids a failure when <varname>debug_print_parse</> is enabled
+      This avoids a failure when <varname>debug_print_parse</varname> is enabled
       and certain types of query are executed.
      </para>
     </listitem>
@@ -4493,20 +4493,20 @@
     <listitem>
      <para>
       Fix incorrect calculation of transaction status in
-      <application>ecpg</> (Itagaki Takahiro)
+      <application>ecpg</application> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s handling of <quote>simple</>
+      Fix <application>PL/pgSQL</application>'s handling of <quote>simple</quote>
       expressions to not fail in recursion or error-recovery cases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</>'s handling of set-returning functions
+      Fix <application>PL/Python</application>'s handling of set-returning functions
       (Jan Urbanski)
      </para>
 
@@ -4518,22 +4518,22 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/cube</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/cube</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>cube</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>cube</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't emit <quote>identifier will be truncated</> notices in
-      <filename>contrib/dblink</> except when creating new connections
+      Don't emit <quote>identifier will be truncated</quote> notices in
+      <filename>contrib/dblink</filename> except when creating new connections
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -4541,20 +4541,20 @@
     <listitem>
      <para>
       Fix potential coredump on missing public key in
-      <filename>contrib/pgcrypto</> (Marti Raudsepp)
+      <filename>contrib/pgcrypto</filename> (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/xml2</>'s XPath query functions
+      Fix memory leak in <filename>contrib/xml2</filename>'s XPath query functions
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010o
+      Update time zone data files to <application>tzdata</application> release 2010o
       for DST law changes in Fiji and Samoa;
       also historical corrections for Hong Kong.
      </para>
@@ -4576,7 +4576,7 @@
   <para>
    This release contains a variety of fixes from 8.4.4.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -4585,7 +4585,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -4605,7 +4605,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -4634,7 +4634,7 @@
 
     <listitem>
      <para>
-      Prevent possible crashes in <function>pg_get_expr()</> by disallowing
+      Prevent possible crashes in <function>pg_get_expr()</function> by disallowing
       it from being called with an argument that is not one of the system
       catalog columns it's intended to be used with
       (Heikki Linnakangas, Tom Lane)
@@ -4643,7 +4643,7 @@
 
     <listitem>
      <para>
-      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</>) as non-fatal on
+      Treat exit code 128 (<literal>ERROR_WAIT_NO_CHILDREN</literal>) as non-fatal on
       Windows (Magnus Hagander)
      </para>
 
@@ -4669,7 +4669,7 @@
 
     <listitem>
      <para>
-      Fix possible duplicate scans of <literal>UNION ALL</> member relations
+      Fix possible duplicate scans of <literal>UNION ALL</literal> member relations
       (Tom Lane)
      </para>
     </listitem>
@@ -4694,18 +4694,18 @@
 
     <listitem>
      <para>
-      Fix mishandling of cross-type <literal>IN</> comparisons (Tom Lane)
+      Fix mishandling of cross-type <literal>IN</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       This could result in failures if the planner tried to implement an
-      <literal>IN</> join with a sort-then-unique-then-plain-join plan.
+      <literal>IN</literal> join with a sort-then-unique-then-plain-join plan.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix computation of <command>ANALYZE</> statistics for <type>tsvector</>
+      Fix computation of <command>ANALYZE</command> statistics for <type>tsvector</type>
       columns (Jan Urbanski)
      </para>
 
@@ -4717,8 +4717,8 @@
 
     <listitem>
      <para>
-      Improve planner's estimate of memory used by <function>array_agg()</>,
-      <function>string_agg()</>, and similar aggregate functions
+      Improve planner's estimate of memory used by <function>array_agg()</function>,
+      <function>string_agg()</function>, and similar aggregate functions
       (Hitoshi Harada)
      </para>
 
@@ -4734,7 +4734,7 @@
      </para>
 
      <para>
-      If a plan is prepared while <command>CREATE INDEX CONCURRENTLY</> is
+      If a plan is prepared while <command>CREATE INDEX CONCURRENTLY</command> is
       in progress for one of the referenced tables, it is supposed to be
       re-planned once the index is ready for use.  This was not happening
       reliably.
@@ -4812,7 +4812,7 @@
     <listitem>
      <para>
       Take care to fsync the contents of lockfiles (both
-      <filename>postmaster.pid</> and the socket lockfile) while writing them
+      <filename>postmaster.pid</filename> and the socket lockfile) while writing them
       (Tom Lane)
      </para>
 
@@ -4849,7 +4849,7 @@
 
     <listitem>
      <para>
-      Fix <varname>log_line_prefix</>'s <literal>%i</> escape,
+      Fix <varname>log_line_prefix</varname>'s <literal>%i</literal> escape,
       which could produce junk early in backend startup (Tom Lane)
      </para>
     </listitem>
@@ -4861,7 +4861,7 @@
      </para>
 
      <para>
-      In particular, <literal>fillfactor</> would be read as zero if any
+      In particular, <literal>fillfactor</literal> would be read as zero if any
       other reloption had been set for the table, leading to serious bloat.
      </para>
     </listitem>
@@ -4869,49 +4869,49 @@
     <listitem>
      <para>
       Fix inheritance count tracking in <command>ALTER TABLE ... ADD
-      CONSTRAINT</> (Robert Haas)
+      CONSTRAINT</command> (Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix possible data corruption in <command>ALTER TABLE ... SET
-      TABLESPACE</> when archiving is enabled (Jeff Davis)
+      TABLESPACE</command> when archiving is enabled (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>CREATE DATABASE</> and <command>ALTER DATABASE ... SET
-      TABLESPACE</> to be interrupted by query-cancel (Guillaume Lelarge)
+      Allow <command>CREATE DATABASE</command> and <command>ALTER DATABASE ... SET
+      TABLESPACE</command> to be interrupted by query-cancel (Guillaume Lelarge)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <command>CREATE INDEX</>'s checking of whether proposed index
+      Improve <command>CREATE INDEX</command>'s checking of whether proposed index
       expressions are immutable (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle operator classes and families
+      Fix <command>REASSIGN OWNED</command> to handle operator classes and families
       (Asko Tiidumaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible core dump when comparing two empty <type>tsquery</> values
+      Fix possible core dump when comparing two empty <type>tsquery</type> values
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>LIKE</>'s handling of patterns containing <literal>%</>
-      followed by <literal>_</> (Tom Lane)
+      Fix <literal>LIKE</literal>'s handling of patterns containing <literal>%</literal>
+      followed by <literal>_</literal> (Tom Lane)
      </para>
 
      <para>
@@ -4926,7 +4926,7 @@
      </para>
 
      <para>
-      Input such as <literal>'J100000'::date</> worked before 8.4,
+      Input such as <literal>'J100000'::date</literal> worked before 8.4,
       but was unintentionally broken by added error-checking.
      </para>
     </listitem>
@@ -4934,7 +4934,7 @@
     <listitem>
      <para>
       Fix PL/pgSQL to throw an error, not crash, if a cursor is closed within
-      a <literal>FOR</> loop that is iterating over that cursor
+      a <literal>FOR</literal> loop that is iterating over that cursor
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -4942,22 +4942,22 @@
     <listitem>
      <para>
       In PL/Python, defend against null pointer results from
-      <function>PyCObject_AsVoidPtr</> and <function>PyCObject_FromVoidPtr</>
+      <function>PyCObject_AsVoidPtr</function> and <function>PyCObject_FromVoidPtr</function>
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, fix full SSL certificate verification for the
-      case where both <literal>host</> and <literal>hostaddr</> are specified
+      In <application>libpq</application>, fix full SSL certificate verification for the
+      case where both <literal>host</literal> and <literal>hostaddr</literal> are specified
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make psql recognize <command>DISCARD ALL</> as a command that should
+      Make psql recognize <command>DISCARD ALL</command> as a command that should
       not be encased in a transaction block in autocommit-off mode
       (Itagaki Takahiro)
      </para>
@@ -4965,19 +4965,19 @@
 
     <listitem>
      <para>
-      Fix some issues in <application>pg_dump</>'s handling of SQL/MED objects
+      Fix some issues in <application>pg_dump</application>'s handling of SQL/MED objects
       (Tom Lane)
      </para>
 
      <para>
-      Notably, <application>pg_dump</> would always fail if run by a
+      Notably, <application>pg_dump</application> would always fail if run by a
       non-superuser, which was not intended.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_dump</> and <application>pg_restore</>'s
+      Improve <application>pg_dump</application> and <application>pg_restore</application>'s
       handling of non-seekable archive files (Tom Lane, Robert Haas)
      </para>
 
@@ -4989,31 +4989,31 @@
     <listitem>
      <para>
       Improve parallel pg_restore's ability to cope with selective restore
-      (<literal>-L</> option) (Tom Lane)
+      (<literal>-L</literal> option) (Tom Lane)
      </para>
 
      <para>
-      The original code tended to fail if the <literal>-L</> file commanded
+      The original code tended to fail if the <literal>-L</literal> file commanded
       a non-default restore ordering.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to process data from <literal>RETURNING</>
+      Fix <application>ecpg</application> to process data from <literal>RETURNING</literal>
       clauses correctly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some memory leaks in <application>ecpg</> (Zoltan Boszormenyi)
+      Fix some memory leaks in <application>ecpg</application> (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of tables containing
+      Improve <filename>contrib/dblink</filename>'s handling of tables containing
       dropped columns (Tom Lane)
      </para>
     </listitem>
@@ -5021,30 +5021,30 @@
     <listitem>
      <para>
       Fix connection leak after <quote>duplicate connection name</quote>
-      errors in <filename>contrib/dblink</> (Itagaki Takahiro)
+      errors in <filename>contrib/dblink</filename> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle connection names longer than
+      Fix <filename>contrib/dblink</filename> to handle connection names longer than
       62 bytes correctly (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <function>hstore(text, text)</>
-      function to <filename>contrib/hstore</> (Robert Haas)
+      Add <function>hstore(text, text)</function>
+      function to <filename>contrib/hstore</filename> (Robert Haas)
      </para>
 
      <para>
       This function is the recommended substitute for the now-deprecated
-      <literal>=&gt;</> operator.  It was back-patched so that future-proofed
+      <literal>=&gt;</literal> operator.  It was back-patched so that future-proofed
       code can be used with older server versions.  Note that the patch will
-      be effective only after <filename>contrib/hstore</> is installed or
+      be effective only after <filename>contrib/hstore</filename> is installed or
       reinstalled in a particular database.  Users might prefer to execute
-      the <command>CREATE FUNCTION</> command by hand, instead.
+      the <command>CREATE FUNCTION</command> command by hand, instead.
      </para>
     </listitem>
 
@@ -5057,7 +5057,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010l
+      Update time zone data files to <application>tzdata</application> release 2010l
       for DST law changes in Egypt and Palestine; also historical corrections
       for Finland.
      </para>
@@ -5072,7 +5072,7 @@
 
     <listitem>
      <para>
-      Make Windows' <quote>N. Central Asia Standard Time</> timezone map to
+      Make Windows' <quote>N. Central Asia Standard Time</quote> timezone map to
       Asia/Novosibirsk, not Asia/Almaty (Magnus Hagander)
      </para>
 
@@ -5098,7 +5098,7 @@
   <para>
    This release contains a variety of fixes from 8.4.3.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -5107,7 +5107,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -5119,19 +5119,19 @@
 
     <listitem>
      <para>
-      Enforce restrictions in <literal>plperl</> using an opmask applied to
-      the whole interpreter, instead of using <filename>Safe.pm</>
+      Enforce restrictions in <literal>plperl</literal> using an opmask applied to
+      the whole interpreter, instead of using <filename>Safe.pm</filename>
       (Tim Bunce, Andrew Dunstan)
      </para>
 
      <para>
-      Recent developments have convinced us that <filename>Safe.pm</> is too
-      insecure to rely on for making <literal>plperl</> trustable.  This
-      change removes use of <filename>Safe.pm</> altogether, in favor of using
+      Recent developments have convinced us that <filename>Safe.pm</filename> is too
+      insecure to rely on for making <literal>plperl</literal> trustable.  This
+      change removes use of <filename>Safe.pm</filename> altogether, in favor of using
       a separate interpreter with an opcode mask that is always applied.
       Pleasant side effects of the change include that it is now possible to
-      use Perl's <literal>strict</> pragma in a natural way in
-      <literal>plperl</>, and that Perl's <literal>$a</> and <literal>$b</>
+      use Perl's <literal>strict</literal> pragma in a natural way in
+      <literal>plperl</literal>, and that Perl's <literal>$a</literal> and <literal>$b</literal>
       variables work as expected in sort routines, and that function
       compilation is significantly faster.  (CVE-2010-1169)
      </para>
@@ -5140,19 +5140,19 @@
     <listitem>
      <para>
       Prevent PL/Tcl from executing untrustworthy code from
-      <structname>pltcl_modules</> (Tom)
+      <structname>pltcl_modules</structname> (Tom)
      </para>
 
      <para>
       PL/Tcl's feature for autoloading Tcl code from a database table
       could be exploited for trojan-horse attacks, because there was no
       restriction on who could create or insert into that table.  This change
-      disables the feature unless <structname>pltcl_modules</> is owned by a
+      disables the feature unless <structname>pltcl_modules</structname> is owned by a
       superuser.  (However, the permissions on the table are not checked, so
       installations that really need a less-than-secure modules table can
       still grant suitable privileges to trusted non-superusers.)  Also,
-      prevent loading code into the unrestricted <quote>normal</> Tcl
-      interpreter unless we are really going to execute a <literal>pltclu</>
+      prevent loading code into the unrestricted <quote>normal</quote> Tcl
+      interpreter unless we are really going to execute a <literal>pltclu</literal>
       function.  (CVE-2010-1170)
      </para>
     </listitem>
@@ -5160,16 +5160,16 @@
     <listitem>
      <para>
       Fix data corruption during WAL replay of
-      <literal>ALTER ... SET TABLESPACE</> (Tom)
+      <literal>ALTER ... SET TABLESPACE</literal> (Tom)
      </para>
 
      <para>
-      When <varname>archive_mode</> is on, <literal>ALTER ... SET TABLESPACE</>
+      When <varname>archive_mode</varname> is on, <literal>ALTER ... SET TABLESPACE</literal>
       generates a WAL record whose replay logic was incorrect.  It could write
       the data to the wrong place, leading to possibly-unrecoverable data
       corruption.  Data corruption would be observed on standby slaves, and
       could occur on the master as well if a database crash and recovery
-      occurred after committing the <literal>ALTER</> and before the next
+      occurred after committing the <literal>ALTER</literal> and before the next
       checkpoint.
      </para>
     </listitem>
@@ -5194,20 +5194,20 @@
      <para>
       This avoids failures if the function's code is invalid without the
       setting; an example is that SQL functions may not parse if the
-      <varname>search_path</> is not correct.
+      <varname>search_path</varname> is not correct.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do constraint exclusion for inherited <command>UPDATE</> and
-      <command>DELETE</> target tables when
-      <varname>constraint_exclusion</> = <literal>partition</> (Tom)
+      Do constraint exclusion for inherited <command>UPDATE</command> and
+      <command>DELETE</command> target tables when
+      <varname>constraint_exclusion</varname> = <literal>partition</literal> (Tom)
      </para>
 
      <para>
       Due to an oversight, this setting previously only caused constraint
-      exclusion to be checked in <command>SELECT</> commands.
+      exclusion to be checked in <command>SELECT</command> commands.
      </para>
     </listitem>
 
@@ -5219,10 +5219,10 @@
 
      <para>
       Previously, if an unprivileged user ran <literal>ALTER USER ... RESET
-      ALL</> for himself, or <literal>ALTER DATABASE ... RESET ALL</> for
+      ALL</literal> for himself, or <literal>ALTER DATABASE ... RESET ALL</literal> for
       a database he owns, this would remove all special parameter settings
       for the user or database, even ones that are only supposed to be
-      changeable by a superuser.  Now, the <command>ALTER</> will only
+      changeable by a superuser.  Now, the <command>ALTER</command> will only
       remove the parameters that the user has permission to change.
      </para>
     </listitem>
@@ -5230,7 +5230,7 @@
     <listitem>
      <para>
       Avoid possible crash during backend shutdown if shutdown occurs
-      when a <literal>CONTEXT</> addition would be made to log entries (Tom)
+      when a <literal>CONTEXT</literal> addition would be made to log entries (Tom)
      </para>
 
      <para>
@@ -5242,8 +5242,8 @@
 
     <listitem>
      <para>
-      Fix erroneous handling of <literal>%r</> parameter in
-      <varname>recovery_end_command</> (Heikki)
+      Fix erroneous handling of <literal>%r</literal> parameter in
+      <varname>recovery_end_command</varname> (Heikki)
      </para>
 
      <para>
@@ -5254,20 +5254,20 @@
     <listitem>
      <para>
       Ensure the archiver process responds to changes in
-      <varname>archive_command</> as soon as possible (Tom)
+      <varname>archive_command</varname> as soon as possible (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL's <literal>CASE</> statement to not fail when the
+      Fix PL/pgSQL's <literal>CASE</literal> statement to not fail when the
       case expression is a query that returns no rows (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update PL/Perl's <filename>ppport.h</> for modern Perl versions
+      Update PL/Perl's <filename>ppport.h</filename> for modern Perl versions
       (Andrew)
      </para>
     </listitem>
@@ -5286,15 +5286,15 @@
 
     <listitem>
      <para>
-      Prevent infinite recursion in <application>psql</> when expanding
+      Prevent infinite recursion in <application>psql</application> when expanding
       a variable that refers to itself (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\copy</> to not add spaces around
-      a dot within <literal>\copy (select ...)</> (Tom)
+      Fix <application>psql</application>'s <literal>\copy</literal> to not add spaces around
+      a dot within <literal>\copy (select ...)</literal> (Tom)
      </para>
 
      <para>
@@ -5305,23 +5305,23 @@
 
     <listitem>
      <para>
-      Avoid formatting failure in <application>psql</> when running in a
-      locale context that doesn't match the <varname>client_encoding</>
+      Avoid formatting failure in <application>psql</application> when running in a
+      locale context that doesn't match the <varname>client_encoding</varname>
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unnecessary <quote>GIN indexes do not support whole-index scans</>
-      errors for unsatisfiable queries using <filename>contrib/intarray</>
+      Fix unnecessary <quote>GIN indexes do not support whole-index scans</quote>
+      errors for unsatisfiable queries using <filename>contrib/intarray</filename>
       operators (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgstattuple</> functions respond to cancel
+      Ensure that <filename>contrib/pgstattuple</filename> functions respond to cancel
       interrupts promptly (Tatsuhito Kasahara)
      </para>
     </listitem>
@@ -5329,7 +5329,7 @@
     <listitem>
      <para>
       Make server startup deal properly with the case that
-      <function>shmget()</> returns <literal>EINVAL</> for an existing
+      <function>shmget()</function> returns <literal>EINVAL</literal> for an existing
       shared memory segment (Tom)
      </para>
 
@@ -5361,14 +5361,14 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010j
+      Update time zone data files to <application>tzdata</application> release 2010j
       for DST law changes in Argentina, Australian Antarctic, Bangladesh,
       Mexico, Morocco, Pakistan, Palestine, Russia, Syria, Tunisia;
       also historical corrections for Taiwan.
      </para>
 
      <para>
-      Also, add <literal>PKST</> (Pakistan Summer Time) to the default set of
+      Also, add <literal>PKST</literal> (Pakistan Summer Time) to the default set of
       timezone abbreviations.
      </para>
     </listitem>
@@ -5389,7 +5389,7 @@
   <para>
    This release contains a variety of fixes from 8.4.2.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -5398,7 +5398,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you are upgrading from a version earlier than 8.4.2,
-    see <xref linkend="release-8-4-2">.
+    see <xref linkend="release-8-4-2"/>.
    </para>
 
   </sect2>
@@ -5410,7 +5410,7 @@
 
     <listitem>
      <para>
-      Add new configuration parameter <varname>ssl_renegotiation_limit</> to
+      Add new configuration parameter <varname>ssl_renegotiation_limit</varname> to
       control how often we do session key renegotiation for an SSL connection
       (Magnus)
      </para>
@@ -5446,7 +5446,7 @@
     <listitem>
      <para>
       Fix possible crash due to overenthusiastic invalidation of cached
-      plan for <command>ROLLBACK</> (Tom)
+      plan for <command>ROLLBACK</command> (Tom)
      </para>
     </listitem>
 
@@ -5492,8 +5492,8 @@
 
     <listitem>
      <para>
-      Make <function>substring()</> for <type>bit</> types treat any negative
-      length as meaning <quote>all the rest of the string</> (Tom)
+      Make <function>substring()</function> for <type>bit</type> types treat any negative
+      length as meaning <quote>all the rest of the string</quote> (Tom)
      </para>
 
      <para>
@@ -5533,12 +5533,12 @@
 
     <listitem>
      <para>
-      Avoid failure when <command>EXPLAIN</> has to print a FieldStore or
+      Avoid failure when <command>EXPLAIN</command> has to print a FieldStore or
       assignment ArrayRef expression (Tom)
      </para>
 
      <para>
-      These cases can arise now that <command>EXPLAIN VERBOSE</> tries to
+      These cases can arise now that <command>EXPLAIN VERBOSE</command> tries to
       print plan node target lists.
      </para>
     </listitem>
@@ -5547,7 +5547,7 @@
      <para>
       Avoid an unnecessary coercion failure in some cases where an undecorated
       literal string appears in a subquery within
-      <command>UNION</>/<command>INTERSECT</>/<command>EXCEPT</> (Tom)
+      <command>UNION</command>/<command>INTERSECT</command>/<command>EXCEPT</command> (Tom)
      </para>
 
      <para>
@@ -5564,7 +5564,7 @@
 
     <listitem>
      <para>
-      Fix the <literal>STOP WAL LOCATION</> entry in backup history files to
+      Fix the <literal>STOP WAL LOCATION</literal> entry in backup history files to
       report the next WAL segment's name when the end location is exactly at a
       segment boundary (Itagaki Takahiro)
      </para>
@@ -5573,7 +5573,7 @@
     <listitem>
      <para>
       Always pass the catalog ID to an option validator function specified in
-      <command>CREATE FOREIGN DATA WRAPPER</> (Martin Pihlak)
+      <command>CREATE FOREIGN DATA WRAPPER</command> (Martin Pihlak)
      </para>
     </listitem>
 
@@ -5591,7 +5591,7 @@
 
     <listitem>
      <para>
-      Add support for doing <literal>FULL JOIN ON FALSE</> (Tom)
+      Add support for doing <literal>FULL JOIN ON FALSE</literal> (Tom)
      </para>
 
      <para>
@@ -5604,13 +5604,13 @@
      <para>
       Improve constraint exclusion processing of boolean-variable cases,
       in particular make it possible to exclude a partition that has a
-      <quote>bool_column = false</> constraint (Tom)
+      <quote>bool_column = false</quote> constraint (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent treating an <literal>INOUT</> cast as representing binary
+      Prevent treating an <literal>INOUT</literal> cast as representing binary
       compatibility (Heikki)
      </para>
     </listitem>
@@ -5623,24 +5623,24 @@
 
      <para>
       This is more useful than before and helps to prevent confusion when
-      a <command>REVOKE</> generates multiple messages, which formerly
+      a <command>REVOKE</command> generates multiple messages, which formerly
       appeared to be duplicates.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When reading <filename>pg_hba.conf</> and related files, do not treat
-      <literal>@something</> as a file inclusion request if the <literal>@</>
-      appears inside quote marks; also, never treat <literal>@</> by itself
+      When reading <filename>pg_hba.conf</filename> and related files, do not treat
+      <literal>@something</literal> as a file inclusion request if the <literal>@</literal>
+      appears inside quote marks; also, never treat <literal>@</literal> by itself
       as a file inclusion request (Tom)
      </para>
 
      <para>
       This prevents erratic behavior if a role or database name starts with
-      <literal>@</>.  If you need to include a file whose path name
+      <literal>@</literal>.  If you need to include a file whose path name
       contains spaces, you can still do so, but you must write
-      <literal>@"/path to/file"</> rather than putting the quotes around
+      <literal>@"/path to/file"</literal> rather than putting the quotes around
       the whole construct.
      </para>
     </listitem>
@@ -5648,83 +5648,83 @@
     <listitem>
      <para>
       Prevent infinite loop on some platforms if a directory is named as
-      an inclusion target in <filename>pg_hba.conf</> and related files
+      an inclusion target in <filename>pg_hba.conf</filename> and related files
       (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible infinite loop if <function>SSL_read</> or
-      <function>SSL_write</> fails without setting <varname>errno</> (Tom)
+      Fix possible infinite loop if <function>SSL_read</function> or
+      <function>SSL_write</function> fails without setting <varname>errno</varname> (Tom)
      </para>
 
      <para>
       This is reportedly possible with some Windows versions of
-      <application>openssl</>.
+      <application>openssl</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <acronym>GSSAPI</> authentication on local connections,
+      Disallow <acronym>GSSAPI</acronym> authentication on local connections,
       since it requires a hostname to function correctly (Magnus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Protect <application>ecpg</> against applications freeing strings
+      Protect <application>ecpg</application> against applications freeing strings
       unexpectedly (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</> report the proper SQLSTATE if the connection
+      Make <application>ecpg</application> report the proper SQLSTATE if the connection
       disappears (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix translation of cell contents in <application>psql</> <literal>\d</>
+      Fix translation of cell contents in <application>psql</application> <literal>\d</literal>
       output (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>numericlocale</> option to not
+      Fix <application>psql</application>'s <literal>numericlocale</literal> option to not
       format strings it shouldn't in latex and troff output formats (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix a small per-query memory leak in <application>psql</> (Tom)
+      Fix a small per-query memory leak in <application>psql</application> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>psql</> return the correct exit status (3) when
-      <literal>ON_ERROR_STOP</> and <literal>--single-transaction</> are
-      both specified and an error occurs during the implied <command>COMMIT</>
+      Make <application>psql</application> return the correct exit status (3) when
+      <literal>ON_ERROR_STOP</literal> and <literal>--single-transaction</literal> are
+      both specified and an error occurs during the implied <command>COMMIT</command>
       (Bruce)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s output of permissions for foreign servers
+      Fix <application>pg_dump</application>'s output of permissions for foreign servers
       (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in parallel <application>pg_restore</> due to
+      Fix possible crash in parallel <application>pg_restore</application> due to
       out-of-range dependency IDs (Tom)
      </para>
     </listitem>
@@ -5745,7 +5745,7 @@
 
     <listitem>
      <para>
-      Add <literal>volatile</> markings in PL/Python to avoid possible
+      Add <literal>volatile</literal> markings in PL/Python to avoid possible
       compiler-specific misbehavior (Zdenek Kotala)
      </para>
     </listitem>
@@ -5757,55 +5757,55 @@
 
      <para>
       The only known symptom of this oversight is that the Tcl
-      <literal>clock</> command misbehaves if using Tcl 8.5 or later.
+      <literal>clock</literal> command misbehaves if using Tcl 8.5 or later.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <function>ExecutorEnd</> from being run on portals created
+      Prevent <function>ExecutorEnd</function> from being run on portals created
       within a failed transaction or subtransaction (Tom)
      </para>
 
      <para>
       This is known to cause issues when using
-      <filename>contrib/auto_explain</>.
+      <filename>contrib/auto_explain</filename>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <filename>contrib/dblink</> when too many key
-      columns are specified to a <function>dblink_build_sql_*</> function
+      Prevent crash in <filename>contrib/dblink</filename> when too many key
+      columns are specified to a <function>dblink_build_sql_*</function> function
       (Rushabh Lathia, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow zero-dimensional arrays in <filename>contrib/ltree</> operations
+      Allow zero-dimensional arrays in <filename>contrib/ltree</filename> operations
       (Tom)
      </para>
 
      <para>
       This case was formerly rejected as an error, but it's more convenient to
       treat it the same as a zero-element array.  In particular this avoids
-      unnecessary failures when an <type>ltree</> operation is applied to the
-      result of <literal>ARRAY(SELECT ...)</> and the sub-select returns no
+      unnecessary failures when an <type>ltree</type> operation is applied to the
+      result of <literal>ARRAY(SELECT ...)</literal> and the sub-select returns no
       rows.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted crashes in <filename>contrib/xml2</> caused by sloppy
+      Fix assorted crashes in <filename>contrib/xml2</filename> caused by sloppy
       memory management (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make building of <filename>contrib/xml2</> more robust on Windows
+      Make building of <filename>contrib/xml2</filename> more robust on Windows
       (Andrew)
      </para>
     </listitem>
@@ -5816,7 +5816,7 @@
      </para>
 
      <para>
-      One known symptom of this bug is that rows in <structname>pg_listener</>
+      One known symptom of this bug is that rows in <structname>pg_listener</structname>
       could be dropped under heavy load.
      </para>
     </listitem>
@@ -5835,7 +5835,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010e
+      Update time zone data files to <application>tzdata</application> release 2010e
       for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa.
      </para>
     </listitem>
@@ -5856,7 +5856,7 @@
   <para>
    This release contains a variety of fixes from 8.4.1.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -5865,7 +5865,7 @@
    <para>
     A dump/restore is not required for those running 8.4.X.
     However, if you have any hash indexes,
-    you should <command>REINDEX</> them after updating to 8.4.2,
+    you should <command>REINDEX</command> them after updating to 8.4.2,
     to repair possible damage.
    </para>
 
@@ -5911,7 +5911,7 @@
       preserve the ordering.  So application of either of those operations
       could lead to permanent corruption of an index, in the sense that
       searches might fail to find entries that are present.  To deal with
-      this, it is recommended to <literal>REINDEX</> any hash indexes you may
+      this, it is recommended to <literal>REINDEX</literal> any hash indexes you may
       have after installing this update.
      </para>
     </listitem>
@@ -5930,14 +5930,14 @@
 
     <listitem>
      <para>
-      Prevent signals from interrupting <literal>VACUUM</> at unsafe times
+      Prevent signals from interrupting <literal>VACUUM</literal> at unsafe times
       (Alvaro)
      </para>
 
      <para>
-      This fix prevents a PANIC if a <literal>VACUUM FULL</> is canceled
+      This fix prevents a PANIC if a <literal>VACUUM FULL</literal> is canceled
       after it's already committed its tuple movements, as well as transient
-      errors if a plain <literal>VACUUM</> is interrupted after having
+      errors if a plain <literal>VACUUM</literal> is interrupted after having
       truncated the table.
      </para>
     </listitem>
@@ -5956,14 +5956,14 @@
 
     <listitem>
      <para>
-      Fix crash if a <literal>DROP</> is attempted on an internally-dependent
+      Fix crash if a <literal>DROP</literal> is attempted on an internally-dependent
       object (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very rare crash in <type>inet</>/<type>cidr</> comparisons (Chris
+      Fix very rare crash in <type>inet</type>/<type>cidr</type> comparisons (Chris
       Mikkelson)
      </para>
     </listitem>
@@ -5991,7 +5991,7 @@
 
     <listitem>
      <para>
-      Fix memory leak in postmaster when re-parsing <filename>pg_hba.conf</>
+      Fix memory leak in postmaster when re-parsing <filename>pg_hba.conf</filename>
       (Tom)
      </para>
     </listitem>
@@ -6010,8 +6010,8 @@
 
     <listitem>
      <para>
-      Make <literal>FOR UPDATE/SHARE</> in the primary query not propagate
-      into <literal>WITH</> queries (Tom)
+      Make <literal>FOR UPDATE/SHARE</literal> in the primary query not propagate
+      into <literal>WITH</literal> queries (Tom)
      </para>
 
      <para>
@@ -6019,18 +6019,18 @@
 <programlisting>
 WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 </programlisting>
-      the <literal>FOR UPDATE</> will now affect <literal>bar</> but not
-      <literal>foo</>.  This is more useful and consistent than the original
-      8.4 behavior, which tried to propagate <literal>FOR UPDATE</> into the
-      <literal>WITH</> query but always failed due to assorted implementation
-      restrictions.  It also follows the design rule that <literal>WITH</>
+      the <literal>FOR UPDATE</literal> will now affect <literal>bar</literal> but not
+      <literal>foo</literal>.  This is more useful and consistent than the original
+      8.4 behavior, which tried to propagate <literal>FOR UPDATE</literal> into the
+      <literal>WITH</literal> query but always failed due to assorted implementation
+      restrictions.  It also follows the design rule that <literal>WITH</literal>
       queries are executed as if independent of the main query.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug with a <literal>WITH RECURSIVE</> query immediately inside
+      Fix bug with a <literal>WITH RECURSIVE</literal> query immediately inside
       another one (Tom)
      </para>
     </listitem>
@@ -6056,7 +6056,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     <listitem>
      <para>
       Fix wrong search results for a multi-column GIN index with
-      <literal>fastupdate</> enabled (Teodor)
+      <literal>fastupdate</literal> enabled (Teodor)
      </para>
     </listitem>
 
@@ -6066,7 +6066,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      </para>
 
      <para>
-      These bugs were masked when <varname>full_page_writes</> was on, but
+      These bugs were masked when <varname>full_page_writes</varname> was on, but
       with it off a WAL replay failure was certain if a crash occurred before
       the next checkpoint.
      </para>
@@ -6104,7 +6104,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <para>
       The previous code is known to fail with the combination of the Linux
-      <literal>pam_krb5</> PAM module with Microsoft Active Directory as the
+      <literal>pam_krb5</literal> PAM module with Microsoft Active Directory as the
       domain controller.  It might have problems elsewhere too, since it was
       making unjustified assumptions about what arguments the PAM stack would
       pass to it.
@@ -6127,7 +6127,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     <listitem>
      <para>
       Ensure that domain constraints are enforced in constructs like
-      <literal>ARRAY[...]::domain</>, where the domain is over an array type
+      <literal>ARRAY[...]::domain</literal>, where the domain is over an array type
       (Heikki)
      </para>
     </listitem>
@@ -6153,7 +6153,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix <literal>CREATE TABLE</> to properly merge default expressions
+      Fix <literal>CREATE TABLE</literal> to properly merge default expressions
       coming from different inheritance parent tables (Tom)
      </para>
 
@@ -6175,39 +6175,39 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     <listitem>
      <para>
       Fix processing of ownership dependencies during <literal>CREATE OR
-      REPLACE FUNCTION</> (Tom)
+      REPLACE FUNCTION</literal> (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect handling of <literal>WHERE</>
-      <replaceable>x</>=<replaceable>x</> conditions (Tom)
+      Fix incorrect handling of <literal>WHERE</literal>
+      <replaceable>x</replaceable>=<replaceable>x</replaceable> conditions (Tom)
      </para>
 
      <para>
       In some cases these could get ignored as redundant, but they aren't
-      &mdash; they're equivalent to <replaceable>x</> <literal>IS NOT NULL</>.
+      &mdash; they're equivalent to <replaceable>x</replaceable> <literal>IS NOT NULL</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect plan construction when using hash aggregation to implement
-      <literal>DISTINCT</> for textually identical volatile expressions (Tom)
+      <literal>DISTINCT</literal> for textually identical volatile expressions (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Assert failure for a volatile <literal>SELECT DISTINCT ON</>
+      Fix Assert failure for a volatile <literal>SELECT DISTINCT ON</literal>
       expression (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_stat()</> to not fail on an empty <type>tsvector</>
+      Fix <function>ts_stat()</function> to not fail on an empty <type>tsvector</type>
       value (Tom)
      </para>
     </listitem>
@@ -6220,7 +6220,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix encoding handling in <type>xml</> binary input (Heikki)
+      Fix encoding handling in <type>xml</type> binary input (Heikki)
      </para>
 
      <para>
@@ -6231,7 +6231,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix bug with calling <literal>plperl</> from <literal>plperlu</> or vice
+      Fix bug with calling <literal>plperl</literal> from <literal>plperlu</literal> or vice
       versa (Tom)
      </para>
 
@@ -6251,7 +6251,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     <listitem>
      <para>
       Ensure that Perl arrays are properly converted to
-      <productname>PostgreSQL</> arrays when returned by a set-returning
+      <productname>PostgreSQL</productname> arrays when returned by a set-returning
       PL/Perl function (Andrew Dunstan, Abhijit Menon-Sen)
      </para>
 
@@ -6268,43 +6268,43 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix <application>ecpg</> problem with comments in <literal>DECLARE
-      CURSOR</> statements (Michael)
+      Fix <application>ecpg</application> problem with comments in <literal>DECLARE
+      CURSOR</literal> statements (Michael)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to not treat recently-added keywords as
+      Fix <application>ecpg</application> to not treat recently-added keywords as
       reserved words (Tom)
      </para>
 
      <para>
-      This affected the keywords <literal>CALLED</>, <literal>CATALOG</>,
-      <literal>DEFINER</>, <literal>ENUM</>, <literal>FOLLOWING</>,
-      <literal>INVOKER</>, <literal>OPTIONS</>, <literal>PARTITION</>,
-      <literal>PRECEDING</>, <literal>RANGE</>, <literal>SECURITY</>,
-      <literal>SERVER</>, <literal>UNBOUNDED</>, and <literal>WRAPPER</>.
+      This affected the keywords <literal>CALLED</literal>, <literal>CATALOG</literal>,
+      <literal>DEFINER</literal>, <literal>ENUM</literal>, <literal>FOLLOWING</literal>,
+      <literal>INVOKER</literal>, <literal>OPTIONS</literal>, <literal>PARTITION</literal>,
+      <literal>PRECEDING</literal>, <literal>RANGE</literal>, <literal>SECURITY</literal>,
+      <literal>SERVER</literal>, <literal>UNBOUNDED</literal>, and <literal>WRAPPER</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Re-allow regular expression special characters in <application>psql</>'s
-      <literal>\df</> function name parameter (Tom)
+      Re-allow regular expression special characters in <application>psql</application>'s
+      <literal>\df</literal> function name parameter (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/fuzzystrmatch</>, correct the calculation of
-      <function>levenshtein</> distances with non-default costs (Marcin Mank)
+      In <filename>contrib/fuzzystrmatch</filename>, correct the calculation of
+      <function>levenshtein</function> distances with non-default costs (Marcin Mank)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pg_standby</>, disable triggering failover with a
+      In <filename>contrib/pg_standby</filename>, disable triggering failover with a
       signal on Windows (Fujii Masao)
      </para>
 
@@ -6316,35 +6316,35 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Put <literal>FREEZE</> and <literal>VERBOSE</> options in the right
-      order in the <literal>VACUUM</> command that
-      <filename>contrib/vacuumdb</> produces (Heikki)
+      Put <literal>FREEZE</literal> and <literal>VERBOSE</literal> options in the right
+      order in the <literal>VACUUM</literal> command that
+      <filename>contrib/vacuumdb</filename> produces (Heikki)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible leak of connections when <filename>contrib/dblink</>
+      Fix possible leak of connections when <filename>contrib/dblink</filename>
       encounters an error (Tatsuhito Kasahara)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <application>psql</>'s flex module is compiled with the correct
+      Ensure <application>psql</application>'s flex module is compiled with the correct
       system header definitions (Tom)
      </para>
 
      <para>
       This fixes build failures on platforms where
-      <literal>--enable-largefile</> causes incompatible changes in the
+      <literal>--enable-largefile</literal> causes incompatible changes in the
       generated code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the postmaster ignore any <literal>application_name</> parameter in
+      Make the postmaster ignore any <literal>application_name</literal> parameter in
       connection request packets, to improve compatibility with future libpq
       versions (Tom)
      </para>
@@ -6357,14 +6357,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      </para>
 
      <para>
-      This includes adding <literal>IDT</> to the default
+      This includes adding <literal>IDT</literal> to the default
       timezone abbreviation set.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009s
+      Update time zone data files to <application>tzdata</application> release 2009s
       for DST law changes in Antarctica, Argentina, Bangladesh, Fiji,
       Novokuznetsk, Pakistan, Palestine, Samoa, Syria; also historical
       corrections for Hong Kong.
@@ -6387,7 +6387,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
   <para>
    This release contains a variety of fixes from 8.4.
    For information about new features in the 8.4 major release, see
-   <xref linkend="release-8-4">.
+   <xref linkend="release-8-4"/>.
   </para>
 
   <sect2>
@@ -6418,7 +6418,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix <quote>cannot make new WAL entries during recovery</> error (Tom)
+      Fix <quote>cannot make new WAL entries during recovery</quote> error (Tom)
      </para>
     </listitem>
 
@@ -6435,39 +6435,39 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Disallow <command>RESET ROLE</> and <command>RESET SESSION
-      AUTHORIZATION</> inside security-definer functions (Tom, Heikki)
+      Disallow <command>RESET ROLE</command> and <command>RESET SESSION
+      AUTHORIZATION</command> inside security-definer functions (Tom, Heikki)
      </para>
 
      <para>
       This covers a case that was missed in the previous patch that
-      disallowed <command>SET ROLE</> and <command>SET SESSION
-      AUTHORIZATION</> inside security-definer functions.
+      disallowed <command>SET ROLE</command> and <command>SET SESSION
+      AUTHORIZATION</command> inside security-definer functions.
       (See CVE-2007-6600)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>LOAD</> of an already-loaded loadable module
+      Make <command>LOAD</command> of an already-loaded loadable module
       into a no-op (Tom)
      </para>
 
      <para>
-      Formerly, <command>LOAD</> would attempt to unload and re-load the
+      Formerly, <command>LOAD</command> would attempt to unload and re-load the
       module, but this is unsafe and not all that useful.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make window function <literal>PARTITION BY</> and <literal>ORDER BY</>
+      Make window function <literal>PARTITION BY</literal> and <literal>ORDER BY</literal>
       items always be interpreted as simple expressions (Tom)
      </para>
 
      <para>
       In 8.4.0 these lists were parsed following the rules used for
-      top-level <literal>GROUP BY</> and <literal>ORDER BY</> lists.
+      top-level <literal>GROUP BY</literal> and <literal>ORDER BY</literal> lists.
       But this was not correct per the SQL standard, and it led to possible
       circularity.
      </para>
@@ -6479,8 +6479,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      </para>
 
      <para>
-      These led to wrong query results in some cases where <literal>IN</>
-      or <literal>EXISTS</> was used together with another join.
+      These led to wrong query results in some cases where <literal>IN</literal>
+      or <literal>EXISTS</literal> was used together with another join.
      </para>
     </listitem>
 
@@ -6492,8 +6492,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <para>
       An example is
-      <literal>SELECT COUNT(ss.*) FROM ... LEFT JOIN (SELECT ...) ss ON ...</>.
-      Here, <literal>ss.*</> would be treated as <literal>ROW(NULL,NULL,...)</>
+      <literal>SELECT COUNT(ss.*) FROM ... LEFT JOIN (SELECT ...) ss ON ...</literal>.
+      Here, <literal>ss.*</literal> would be treated as <literal>ROW(NULL,NULL,...)</literal>
       for null-extended join rows, which is not the same as a simple NULL.
       Now it is treated as a simple NULL.
      </para>
@@ -6506,7 +6506,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <para>
       This bug led to the often-reported <quote>could not reattach
-      to shared memory</> error message.
+      to shared memory</quote> error message.
      </para>
     </listitem>
 
@@ -6530,36 +6530,36 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Ensure that a <quote>fast shutdown</> request will forcibly terminate
-      open sessions, even if a <quote>smart shutdown</> was already in progress
+      Ensure that a <quote>fast shutdown</quote> request will forcibly terminate
+      open sessions, even if a <quote>smart shutdown</quote> was already in progress
       (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid memory leak for <function>array_agg()</> in <literal>GROUP BY</>
+      Avoid memory leak for <function>array_agg()</function> in <literal>GROUP BY</literal>
       queries (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Treat <function>to_char(..., 'TH')</> as an uppercase ordinal
-      suffix with <literal>'HH'</>/<literal>'HH12'</> (Heikki)
+      Treat <function>to_char(..., 'TH')</function> as an uppercase ordinal
+      suffix with <literal>'HH'</literal>/<literal>'HH12'</literal> (Heikki)
      </para>
 
      <para>
-      It was previously handled as <literal>'th'</> (lowercase).
+      It was previously handled as <literal>'th'</literal> (lowercase).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Include the fractional part in the result of
-      <function>EXTRACT(second)</> and
-      <function>EXTRACT(milliseconds)</> for
-      <type>time</> and <type>time with time zone</> inputs (Tom)
+      <function>EXTRACT(second)</function> and
+      <function>EXTRACT(milliseconds)</function> for
+      <type>time</type> and <type>time with time zone</type> inputs (Tom)
      </para>
 
      <para>
@@ -6570,8 +6570,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix overflow for <literal>INTERVAL '<replaceable>x</> ms'</literal>
-      when <replaceable>x</> is more than 2 million and integer
+      Fix overflow for <literal>INTERVAL '<replaceable>x</replaceable> ms'</literal>
+      when <replaceable>x</replaceable> is more than 2 million and integer
       datetimes are in use (Alex Hunsaker)
      </para>
     </listitem>
@@ -6589,13 +6589,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix a typo that disabled <varname>commit_delay</> (Jeff Janes)
+      Fix a typo that disabled <varname>commit_delay</varname> (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Output early-startup messages to <filename>postmaster.log</> if the
+      Output early-startup messages to <filename>postmaster.log</filename> if the
       server is started in silent mode (Tom)
      </para>
 
@@ -6619,33 +6619,33 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Fix <application>pg_ctl</> to not go into an infinite loop if
-      <filename>postgresql.conf</> is empty (Jeff Davis)
+      Fix <application>pg_ctl</application> to not go into an infinite loop if
+      <filename>postgresql.conf</filename> is empty (Jeff Davis)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several errors in <application>pg_dump</>'s
-      <literal>--binary-upgrade</> mode (Bruce, Tom)
+      Fix several errors in <application>pg_dump</application>'s
+      <literal>--binary-upgrade</literal> mode (Bruce, Tom)
      </para>
 
      <para>
-      <literal>pg_dump --binary-upgrade</> is used by pg_migrator.
+      <literal>pg_dump --binary-upgrade</literal> is used by pg_migrator.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/xml2</>'s <function>xslt_process()</> to
+      Fix <filename>contrib/xml2</filename>'s <function>xslt_process()</function> to
       properly handle the maximum number of parameters (twenty) (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve robustness of <application>libpq</>'s code to recover
-      from errors during <command>COPY FROM STDIN</> (Tom)
+      Improve robustness of <application>libpq</application>'s code to recover
+      from errors during <command>COPY FROM STDIN</command> (Tom)
      </para>
     </listitem>
 
@@ -6658,14 +6658,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Work around gcc bug that causes <quote>floating-point exception</>
-      instead of <quote>division by zero</> on some platforms (Tom)
+      Work around gcc bug that causes <quote>floating-point exception</quote>
+      instead of <quote>division by zero</quote> on some platforms (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2009l
+      Update time zone data files to <application>tzdata</application> release 2009l
       for DST law changes in Bangladesh, Egypt, Mauritius.
      </para>
     </listitem>
@@ -6687,7 +6687,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
    <title>Overview</title>
 
    <para>
-    After many years of development, <productname>PostgreSQL</> has
+    After many years of development, <productname>PostgreSQL</productname> has
     become feature-complete in many areas.   This release shows a
     targeted approach to adding features (e.g., authentication,
     monitoring, space reuse), and adds capabilities defined in the
@@ -6742,7 +6742,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
     <listitem>
      <para>
-      Improved join performance for <literal>EXISTS</> and <literal>NOT EXISTS</> queries
+      Improved join performance for <literal>EXISTS</literal> and <literal>NOT EXISTS</literal> queries
      </para>
     </listitem>
 
@@ -6825,15 +6825,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       </para>
 
       <para>
-       Previously this was selected by <application>configure</>'s
-       <option>--enable-integer-datetimes</> option.  To retain
-       the old behavior, build with <option>--disable-integer-datetimes</>.
+       Previously this was selected by <application>configure</application>'s
+       <option>--enable-integer-datetimes</option> option.  To retain
+       the old behavior, build with <option>--disable-integer-datetimes</option>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <application>ipcclean</> utility command (Bruce)
+       Remove <application>ipcclean</application> utility command (Bruce)
       </para>
 
       <para>
@@ -6853,50 +6853,50 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      <listitem>
       <para>
        Change default setting for
-       <literal>log_min_messages</> to <literal>warning</> (previously
-       it was <literal>notice</>) to reduce log file volume (Tom)
+       <literal>log_min_messages</literal> to <literal>warning</literal> (previously
+       it was <literal>notice</literal>) to reduce log file volume (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change default setting for <literal>max_prepared_transactions</> to
+       Change default setting for <literal>max_prepared_transactions</literal> to
        zero (previously it was 5) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <literal>debug_print_parse</>, <literal>debug_print_rewritten</>,
-       and <literal>debug_print_plan</>
-       output appear at <literal>LOG</> message level, not
-       <literal>DEBUG1</> as formerly (Tom)
+       Make <literal>debug_print_parse</literal>, <literal>debug_print_rewritten</literal>,
+       and <literal>debug_print_plan</literal>
+       output appear at <literal>LOG</literal> message level, not
+       <literal>DEBUG1</literal> as formerly (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <literal>debug_pretty_print</> default to <literal>on</> (Tom)
+       Make <literal>debug_pretty_print</literal> default to <literal>on</literal> (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <varname>explain_pretty_print</> parameter (no longer needed) (Tom)
+       Remove <varname>explain_pretty_print</varname> parameter (no longer needed) (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <varname>log_temp_files</> settable by superusers only, like other
+       Make <varname>log_temp_files</varname> settable by superusers only, like other
        logging options (Simon Riggs)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove automatic appending of the epoch timestamp when no <literal>%</>
-       escapes are present in <literal>log_filename</> (Robert Haas)
+       Remove automatic appending of the epoch timestamp when no <literal>%</literal>
+       escapes are present in <literal>log_filename</literal> (Robert Haas)
       </para>
 
       <para>
@@ -6907,22 +6907,22 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Remove <varname>log_restartpoints</> from <filename>recovery.conf</>;
-       instead use <varname>log_checkpoints</> (Simon)
+       Remove <varname>log_restartpoints</varname> from <filename>recovery.conf</filename>;
+       instead use <varname>log_checkpoints</varname> (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <varname>krb_realm</> and <varname>krb_server_hostname</>;
-       these are now set in <filename>pg_hba.conf</> instead (Magnus)
+       Remove <varname>krb_realm</varname> and <varname>krb_server_hostname</varname>;
+       these are now set in <filename>pg_hba.conf</filename> instead (Magnus)
       </para>
      </listitem>
 
      <listitem>
       <para>
        There are also significant changes in <link
-       linkend="release-8-4-pg-hba-conf"><filename>pg_hba.conf</></link>,
+       linkend="release-8-4-pg-hba-conf"><filename>pg_hba.conf</filename></link>,
        as described below.
       </para>
      </listitem>
@@ -6938,12 +6938,12 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Change <command>TRUNCATE</> and <command>LOCK</> to
+       Change <command>TRUNCATE</command> and <command>LOCK</command> to
        apply to child tables of the specified table(s) (Peter)
       </para>
 
       <para>
-       These commands now accept an <literal>ONLY</> option that prevents
+       These commands now accept an <literal>ONLY</literal> option that prevents
        processing child tables; this option must be used if the old
        behavior is needed.
       </para>
@@ -6951,8 +6951,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       <command>SELECT DISTINCT</> and
-       <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</>
+       <command>SELECT DISTINCT</command> and
+       <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>
        no longer always produce sorted output (Tom)
       </para>
 
@@ -6961,17 +6961,17 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        by means of Sort/Unique processing (i.e., sort then remove adjacent
        duplicates).  Now they can be implemented by hashing, which will not
        produce sorted output.  If an application relied on the output being
-       in sorted order, the recommended fix is to add an <literal>ORDER BY</>
+       in sorted order, the recommended fix is to add an <literal>ORDER BY</literal>
        clause.  As a short-term workaround, the previous behavior can be
-       restored by disabling <literal>enable_hashagg</>, but that is a very
-       performance-expensive fix.  <literal>SELECT DISTINCT ON</> never uses
+       restored by disabling <literal>enable_hashagg</literal>, but that is a very
+       performance-expensive fix.  <literal>SELECT DISTINCT ON</literal> never uses
        hashing, however, so its behavior is unchanged.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Force child tables to inherit <literal>CHECK</> constraints from parents
+       Force child tables to inherit <literal>CHECK</literal> constraints from parents
        (Alex Hunsaker, Nikhil Sontakke, Tom)
       </para>
 
@@ -6985,14 +6985,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Disallow negative <literal>LIMIT</> or <literal>OFFSET</>
+       Disallow negative <literal>LIMIT</literal> or <literal>OFFSET</literal>
        values, rather than treating them as zero (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Disallow <command>LOCK TABLE</> outside a transaction block
+       Disallow <command>LOCK TABLE</command> outside a transaction block
        (Tom)
       </para>
 
@@ -7004,12 +7004,12 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Sequences now contain an additional <structfield>start_value</> column
+       Sequences now contain an additional <structfield>start_value</structfield> column
        (Zoltan Boszormenyi)
       </para>
 
       <para>
-       This supports <command>ALTER SEQUENCE ... RESTART</>.
+       This supports <command>ALTER SEQUENCE ... RESTART</command>.
       </para>
      </listitem>
 
@@ -7025,14 +7025,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Make <type>numeric</> zero raised to a fractional power return
-       <literal>0</>, rather than throwing an error, and make
-       <type>numeric</> zero raised to the zero power return <literal>1</>,
+       Make <type>numeric</type> zero raised to a fractional power return
+       <literal>0</literal>, rather than throwing an error, and make
+       <type>numeric</type> zero raised to the zero power return <literal>1</literal>,
        rather than error (Bruce)
       </para>
 
       <para>
-       This matches the longstanding <type>float8</> behavior.
+       This matches the longstanding <type>float8</type> behavior.
       </para>
      </listitem>
 
@@ -7042,7 +7042,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       </para>
 
       <para>
-       The changed behavior is more <acronym>IEEE</>-standard
+       The changed behavior is more <acronym>IEEE</acronym>-standard
        compliant.
       </para>
      </listitem>
@@ -7050,7 +7050,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      <listitem>
       <para>
        Throw an error if an escape character is the last character in
-       a <literal>LIKE</> pattern (i.e., it has nothing to escape) (Tom)
+       a <literal>LIKE</literal> pattern (i.e., it has nothing to escape) (Tom)
       </para>
 
       <para>
@@ -7061,8 +7061,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Remove <literal>~=~</> and <literal>~&lt;&gt;~</> operators
-       formerly used for <literal>LIKE</> index comparisons (Tom)
+       Remove <literal>~=~</literal> and <literal>~&lt;&gt;~</literal> operators
+       formerly used for <literal>LIKE</literal> index comparisons (Tom)
       </para>
 
       <para>
@@ -7072,7 +7072,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       <function>xpath()</> now passes its arguments to <application>libxml</>
+       <function>xpath()</function> now passes its arguments to <application>libxml</application>
        without any changes (Andrew)
       </para>
 
@@ -7085,7 +7085,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Make <function>xmlelement()</> format attribute values just like
+       Make <function>xmlelement()</function> format attribute values just like
        content values (Peter)
       </para>
 
@@ -7098,13 +7098,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Rewrite memory management for <application>libxml</>-using functions
+       Rewrite memory management for <application>libxml</application>-using functions
        (Tom)
       </para>
 
       <para>
        This change should avoid some compatibility problems with use of
-       <application>libxml</> in PL/Perl and other add-on code.
+       <application>libxml</application> in PL/Perl and other add-on code.
       </para>
      </listitem>
 
@@ -7129,8 +7129,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        <varname>DateStyle</> no longer controls <type>interval</> output
-        formatting; instead there is a new variable <varname>IntervalStyle</>
+        <varname>DateStyle</varname> no longer controls <type>interval</type> output
+        formatting; instead there is a new variable <varname>IntervalStyle</varname>
         (Ron Mayer)
        </para>
       </listitem>
@@ -7138,7 +7138,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Improve consistency of handling of fractional seconds in
-        <type>timestamp</> and <type>interval</> output (Ron Mayer)
+        <type>timestamp</type> and <type>interval</type> output (Ron Mayer)
        </para>
 
        <para>
@@ -7149,15 +7149,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <function>to_char()</>'s localized month/day names depend
-        on <varname>LC_TIME</>, not <varname>LC_MESSAGES</> (Euler
+        Make <function>to_char()</function>'s localized month/day names depend
+        on <varname>LC_TIME</varname>, not <varname>LC_MESSAGES</varname> (Euler
         Taveira de Oliveira)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Cause <function>to_date()</> and <function>to_timestamp()</>
+        Cause <function>to_date()</function> and <function>to_timestamp()</function>
         to more consistently report errors for invalid input (Brendan
         Jurd)
        </para>
@@ -7171,15 +7171,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Fix <function>to_timestamp()</> to not require upper/lower case
-        matching for meridian (<literal>AM</>/<literal>PM</>) and era
-        (<literal>BC</>/<literal>AD</>) format designations  (Brendan
+        Fix <function>to_timestamp()</function> to not require upper/lower case
+        matching for meridian (<literal>AM</literal>/<literal>PM</literal>) and era
+        (<literal>BC</literal>/<literal>AD</literal>) format designations  (Brendan
         Jurd)
        </para>
 
        <para>
-        For example, input value <literal>ad</> now matches the format
-        string <literal>AD</>.
+        For example, input value <literal>ad</literal> now matches the format
+        string <literal>AD</literal>.
        </para>
       </listitem>
 
@@ -7217,8 +7217,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow <command>SELECT DISTINCT</> and
-       <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> to
+       Allow <command>SELECT DISTINCT</command> and
+       <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> to
        use hashing (Tom)
       </para>
 
@@ -7235,12 +7235,12 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <para>
        This work formalizes our previous ad-hoc treatment of <literal>IN
-       (SELECT ...)</> clauses, and extends it to <literal>EXISTS</> and
-       <literal>NOT EXISTS</> clauses.  It should result in significantly
-       better planning of <literal>EXISTS</> and <literal>NOT EXISTS</>
-       queries.  In general, logically equivalent <literal>IN</> and
-       <literal>EXISTS</> clauses should now have similar performance,
-       whereas previously <literal>IN</> often won.
+       (SELECT ...)</literal> clauses, and extends it to <literal>EXISTS</literal> and
+       <literal>NOT EXISTS</literal> clauses.  It should result in significantly
+       better planning of <literal>EXISTS</literal> and <literal>NOT EXISTS</literal>
+       queries.  In general, logically equivalent <literal>IN</literal> and
+       <literal>EXISTS</literal> clauses should now have similar performance,
+       whereas previously <literal>IN</literal> often won.
       </para>
      </listitem>
 
@@ -7258,7 +7258,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Improve the performance of <function>text_position()</> and
+       Improve the performance of <function>text_position()</function> and
        related functions by using Boyer-Moore-Horspool searching (David
        Rowley)
       </para>
@@ -7283,26 +7283,26 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Increase the default value of <varname>default_statistics_target</>
-       from <literal>10</> to <literal>100</> (Greg Sabino Mullane,
+       Increase the default value of <varname>default_statistics_target</varname>
+       from <literal>10</literal> to <literal>100</literal> (Greg Sabino Mullane,
        Tom)
       </para>
 
       <para>
-       The maximum value was also increased from <literal>1000</> to
-       <literal>10000</>.
+       The maximum value was also increased from <literal>1000</literal> to
+       <literal>10000</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Perform <varname>constraint_exclusion</> checking by default
-       in queries involving inheritance or <literal>UNION ALL</> (Tom)
+       Perform <varname>constraint_exclusion</varname> checking by default
+       in queries involving inheritance or <literal>UNION ALL</literal> (Tom)
       </para>
 
       <para>
-       A new <varname>constraint_exclusion</> setting,
-       <literal>partition</>, was added to specify this behavior.
+       A new <varname>constraint_exclusion</varname> setting,
+       <literal>partition</literal>, was added to specify this behavior.
       </para>
      </listitem>
 
@@ -7313,15 +7313,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <para>
        The amount of read-ahead is controlled by
-       <varname>effective_io_concurrency</>.  This feature is available only
-       if the kernel has <function>posix_fadvise()</> support.
+       <varname>effective_io_concurrency</varname>.  This feature is available only
+       if the kernel has <function>posix_fadvise()</function> support.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Inline simple set-returning <acronym>SQL</> functions in
-       <literal>FROM</> clauses (Richard Rowell)
+       Inline simple set-returning <acronym>SQL</acronym> functions in
+       <literal>FROM</literal> clauses (Richard Rowell)
       </para>
      </listitem>
 
@@ -7336,7 +7336,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      <listitem>
       <para>
        Reduce volume of temporary data in multi-batch hash joins
-       by suppressing <quote>physical tlist</> optimization (Michael
+       by suppressing <quote>physical tlist</quote> optimization (Michael
        Henderson, Ramon Lawrence)
       </para>
      </listitem>
@@ -7344,7 +7344,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      <listitem>
       <para>
        Avoid waiting for idle-in-transaction sessions during
-       <command>CREATE INDEX CONCURRENTLY</> (Simon)
+       <command>CREATE INDEX CONCURRENTLY</command> (Simon)
       </para>
      </listitem>
 
@@ -7368,15 +7368,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Convert many <filename>postgresql.conf</> settings to enumerated
-        values so that <literal>pg_settings</> can display the valid
+        Convert many <filename>postgresql.conf</filename> settings to enumerated
+        values so that <literal>pg_settings</literal> can display the valid
         values (Magnus)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <varname>cursor_tuple_fraction</> parameter to control the
+        Add <varname>cursor_tuple_fraction</varname> parameter to control the
         fraction of a cursor's rows that the planner assumes will be
         fetched (Robert Hell)
        </para>
@@ -7385,7 +7385,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Allow underscores in the names of custom variable
-        classes in <filename>postgresql.conf</> (Tom)
+        classes in <filename>postgresql.conf</filename> (Tom)
        </para>
       </listitem>
 
@@ -7399,12 +7399,12 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Remove support for the (insecure) <literal>crypt</> authentication method
+        Remove support for the (insecure) <literal>crypt</literal> authentication method
         (Magnus)
        </para>
 
        <para>
-        This effectively obsoletes pre-<productname>PostgreSQL</> 7.2 client
+        This effectively obsoletes pre-<productname>PostgreSQL</productname> 7.2 client
         libraries, as there is no longer any non-plaintext password method that
         they can use.
        </para>
@@ -7412,21 +7412,21 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Support regular expressions in <filename>pg_ident.conf</>
+        Support regular expressions in <filename>pg_ident.conf</filename>
         (Magnus)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <productname>Kerberos</>/<acronym>GSSAPI</> parameters
+        Allow <productname>Kerberos</productname>/<acronym>GSSAPI</acronym> parameters
         to be changed without restarting the postmaster (Magnus)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <acronym>SSL</> certificate chains in server certificate
+        Support <acronym>SSL</acronym> certificate chains in server certificate
         file (Andrew Gierth)
        </para>
 
@@ -7440,8 +7440,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Report appropriate error message for combination of <literal>MD5</>
-        authentication and <varname>db_user_namespace</> enabled (Bruce)
+        Report appropriate error message for combination of <literal>MD5</literal>
+        authentication and <varname>db_user_namespace</varname> enabled (Bruce)
        </para>
       </listitem>
      </itemizedlist>
@@ -7449,26 +7449,26 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4 id="release-8-4-pg-hba-conf">
-     <title><filename>pg_hba.conf</></title>
+     <title><filename>pg_hba.conf</filename></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Change all authentication options to use <literal>name=value</>
+        Change all authentication options to use <literal>name=value</literal>
         syntax (Magnus)
        </para>
 
        <para>
-        This makes incompatible changes to the <literal>ldap</>,
-        <literal>pam</> and <literal>ident</> authentication methods. All
-        <filename>pg_hba.conf</> entries with these methods need to be
+        This makes incompatible changes to the <literal>ldap</literal>,
+        <literal>pam</literal> and <literal>ident</literal> authentication methods. All
+        <filename>pg_hba.conf</filename> entries with these methods need to be
         rewritten using the new format.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <literal>ident sameuser</> option, instead making that
+        Remove the <literal>ident sameuser</literal> option, instead making that
         behavior the default if no usermap is specified (Magnus)
        </para>
       </listitem>
@@ -7480,14 +7480,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        </para>
 
        <para>
-        Previously a usermap was only supported for <literal>ident</>
+        Previously a usermap was only supported for <literal>ident</literal>
         authentication.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>clientcert</> option to control requesting of a
+        Add <literal>clientcert</literal> option to control requesting of a
         client certificate (Magnus)
        </para>
 
@@ -7499,13 +7499,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <literal>cert</> authentication method to allow
-        <emphasis>user</> authentication via <acronym>SSL</> certificates
+        Add <literal>cert</literal> authentication method to allow
+        <emphasis>user</emphasis> authentication via <acronym>SSL</acronym> certificates
         (Magnus)
        </para>
 
        <para>
-        Previously <acronym>SSL</> certificates could only verify that
+        Previously <acronym>SSL</acronym> certificates could only verify that
         the client had access to a certificate, not authenticate a
         user.
        </para>
@@ -7513,20 +7513,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Allow <literal>krb5</>, <literal>gssapi</> and <literal>sspi</>
-        realm and <literal>krb5</> host settings to be specified in
-        <filename>pg_hba.conf</> (Magnus)
+        Allow <literal>krb5</literal>, <literal>gssapi</literal> and <literal>sspi</literal>
+        realm and <literal>krb5</literal> host settings to be specified in
+        <filename>pg_hba.conf</filename> (Magnus)
        </para>
 
        <para>
-        These override the settings in <filename>postgresql.conf</>.
+        These override the settings in <filename>postgresql.conf</filename>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <varname>include_realm</> parameter for <literal>krb5</>,
-        <literal>gssapi</>, and <literal>sspi</> methods (Magnus)
+        Add <varname>include_realm</varname> parameter for <literal>krb5</literal>,
+        <literal>gssapi</literal>, and <literal>sspi</literal> methods (Magnus)
        </para>
 
        <para>
@@ -7537,7 +7537,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Parse <filename>pg_hba.conf</> fully when it is loaded,
+        Parse <filename>pg_hba.conf</filename> fully when it is loaded,
         so that errors are reported immediately (Magnus)
        </para>
 
@@ -7552,15 +7552,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Show all parsing errors in <filename>pg_hba.conf</> instead of
+        Show all parsing errors in <filename>pg_hba.conf</filename> instead of
         aborting after the first one (Selena Deckelmann)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>ident</> authentication over Unix-domain sockets
-        on <productname>Solaris</> (Garick Hamlin)
+        Support <literal>ident</literal> authentication over Unix-domain sockets
+        on <productname>Solaris</productname> (Garick Hamlin)
        </para>
       </listitem>
 
@@ -7574,7 +7574,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Provide an option to <function>pg_start_backup()</> to force its
+        Provide an option to <function>pg_start_backup()</function> to force its
         implied checkpoint to finish as quickly as possible (Tom)
        </para>
 
@@ -7586,13 +7586,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <function>pg_stop_backup()</> wait for modified <acronym>WAL</>
+        Make <function>pg_stop_backup()</function> wait for modified <acronym>WAL</acronym>
         files to be archived (Simon)
        </para>
 
        <para>
         This guarantees that the backup is valid at the time
-        <function>pg_stop_backup()</> completes.
+        <function>pg_stop_backup()</function> completes.
        </para>
       </listitem>
 
@@ -7606,22 +7606,22 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Delay <quote>smart</> shutdown while a continuous archiving base backup
+        Delay <quote>smart</quote> shutdown while a continuous archiving base backup
         is in progress (Laurenz Albe)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Cancel a continuous archiving base backup if <quote>fast</> shutdown
+        Cancel a continuous archiving base backup if <quote>fast</quote> shutdown
         is requested (Laurenz Albe)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <filename>recovery.conf</> boolean variables to take the
-        same range of string values as <filename>postgresql.conf</>
+        Allow <filename>recovery.conf</filename> boolean variables to take the
+        same range of string values as <filename>postgresql.conf</filename>
         boolean variables
         (Bruce)
        </para>
@@ -7637,20 +7637,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <function>pg_conf_load_time()</> to report when
-        the <productname>PostgreSQL</> configuration files were last loaded
+        Add <function>pg_conf_load_time()</function> to report when
+        the <productname>PostgreSQL</productname> configuration files were last loaded
         (George Gensure)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>pg_terminate_backend()</> to safely terminate a
-        backend (the <literal>SIGTERM</> signal works also) (Tom, Bruce)
+        Add <function>pg_terminate_backend()</function> to safely terminate a
+        backend (the <literal>SIGTERM</literal> signal works also) (Tom, Bruce)
        </para>
 
        <para>
-        While it's always been possible to <literal>SIGTERM</> a single
+        While it's always been possible to <literal>SIGTERM</literal> a single
         backend, this was previously considered unsupported; and testing
         of the case found some bugs that are now fixed.
        </para>
@@ -7664,30 +7664,30 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
        <para>
         Function statistics appear in a new system view,
-        <literal>pg_stat_user_functions</>.  Tracking is controlled
-        by the new parameter <varname>track_functions</>.
+        <literal>pg_stat_user_functions</literal>.  Tracking is controlled
+        by the new parameter <varname>track_functions</varname>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow specification of the maximum query string size in
-        <literal>pg_stat_activity</> via new
-        <varname>track_activity_query_size</> parameter (Thomas Lee)
+        <literal>pg_stat_activity</literal> via new
+        <varname>track_activity_query_size</varname> parameter (Thomas Lee)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Increase the maximum line length sent to <application>syslog</>, in
+        Increase the maximum line length sent to <application>syslog</application>, in
         hopes of improving performance (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add read-only configuration variables <varname>segment_size</>,
-        <varname>wal_block_size</>, and <varname>wal_segment_size</>
+        Add read-only configuration variables <varname>segment_size</varname>,
+        <varname>wal_block_size</varname>, and <varname>wal_segment_size</varname>
         (Bernd Helmle)
        </para>
       </listitem>
@@ -7701,7 +7701,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <function>pg_stat_get_activity(pid)</> function to return
+        Add <function>pg_stat_get_activity(pid)</function> function to return
         information about a specific process id (Magnus)
        </para>
       </listitem>
@@ -7709,14 +7709,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Allow the location of the server's statistics file to be specified
-        via <varname>stats_temp_directory</> (Magnus)
+        via <varname>stats_temp_directory</varname> (Magnus)
        </para>
 
        <para>
         This allows the statistics file to be placed in a
-        <acronym>RAM</>-resident directory to reduce I/O requirements.
+        <acronym>RAM</acronym>-resident directory to reduce I/O requirements.
         On startup/shutdown, the file is copied to its traditional location
-        (<literal>$PGDATA/global/</>) so it is preserved across restarts.
+        (<literal>$PGDATA/global/</literal>) so it is preserved across restarts.
        </para>
       </listitem>
 
@@ -7732,45 +7732,45 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add support for <literal>WINDOW</> functions (Hitoshi Harada)
+       Add support for <literal>WINDOW</literal> functions (Hitoshi Harada)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <literal>WITH</> clauses (CTEs), including <literal>WITH
-       RECURSIVE</> (Yoshiyuki Asaba, Tatsuo Ishii, Tom)
+       Add support for <literal>WITH</literal> clauses (CTEs), including <literal>WITH
+       RECURSIVE</literal> (Yoshiyuki Asaba, Tatsuo Ishii, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <command>TABLE</> command (Peter)
+       Add <command>TABLE</command> command (Peter)
       </para>
 
       <para>
-       <literal>TABLE tablename</> is a SQL standard short-hand for
-       <literal>SELECT * FROM tablename</>.
+       <literal>TABLE tablename</literal> is a SQL standard short-hand for
+       <literal>SELECT * FROM tablename</literal>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <literal>AS</> to be optional when specifying a
-       <command>SELECT</> (or <literal>RETURNING</>) column output
+       Allow <literal>AS</literal> to be optional when specifying a
+       <command>SELECT</command> (or <literal>RETURNING</literal>) column output
        label (Hiroshi Saito)
       </para>
 
       <para>
        This works so long as the column label is not any
-       <productname>PostgreSQL</> keyword; otherwise <literal>AS</> is still
+       <productname>PostgreSQL</productname> keyword; otherwise <literal>AS</literal> is still
        needed.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Support set-returning functions in <command>SELECT</> result lists
+       Support set-returning functions in <command>SELECT</command> result lists
        even for functions that return their result via a tuplestore (Tom)
       </para>
 
@@ -7789,22 +7789,22 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow <command>SELECT FOR UPDATE</>/<literal>SHARE</> to work
+       Allow <command>SELECT FOR UPDATE</command>/<literal>SHARE</literal> to work
        on inheritance trees (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add infrastructure for <acronym>SQL/MED</> (Martin Pihlak,
+       Add infrastructure for <acronym>SQL/MED</acronym> (Martin Pihlak,
        Peter)
       </para>
 
       <para>
-       There are no remote or external <acronym>SQL/MED</> capabilities
+       There are no remote or external <acronym>SQL/MED</acronym> capabilities
        yet, but this change provides a standardized and future-proof
        system for managing connection information for modules like
-       <filename>dblink</> and <filename>plproxy</>.
+       <filename>dblink</filename> and <filename>plproxy</filename>.
       </para>
      </listitem>
 
@@ -7827,7 +7827,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <para>
        This allows constructs such as
-       <literal>row(1, 1.1) = any (array[row(7, 7.7), row(1, 1.0)])</>.
+       <literal>row(1, 1.1) = any (array[row(7, 7.7), row(1, 1.0)])</literal>.
        This is particularly useful in recursive queries.
       </para>
      </listitem>
@@ -7835,14 +7835,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
      <listitem>
       <para>
        Add support for Unicode string literal and identifier specifications
-       using code points, e.g. <literal>U&amp;'d\0061t\+000061'</>
+       using code points, e.g. <literal>U&amp;'d\0061t\+000061'</literal>
        (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Reject <literal>\000</> in string literals and <command>COPY</> data
+       Reject <literal>\000</literal> in string literals and <command>COPY</command> data
        (Tom)
       </para>
 
@@ -7866,37 +7866,37 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </itemizedlist>
 
     <sect4>
-     <title><command>TRUNCATE</></title>
+     <title><command>TRUNCATE</command></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Support statement-level <literal>ON TRUNCATE</> triggers (Simon)
+        Support statement-level <literal>ON TRUNCATE</literal> triggers (Simon)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>RESTART</>/<literal>CONTINUE IDENTITY</> options
-        for <command>TRUNCATE TABLE</>
+        Add <literal>RESTART</literal>/<literal>CONTINUE IDENTITY</literal> options
+        for <command>TRUNCATE TABLE</command>
         (Zoltan Boszormenyi)
        </para>
 
        <para>
         The start value of a sequence can be changed by <command>ALTER
-        SEQUENCE START WITH</>.
+        SEQUENCE START WITH</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <command>TRUNCATE tab1, tab1</> to succeed (Bruce)
+        Allow <command>TRUNCATE tab1, tab1</command> to succeed (Bruce)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a separate <command>TRUNCATE</> permission (Robert Haas)
+        Add a separate <command>TRUNCATE</command> permission (Robert Haas)
        </para>
       </listitem>
 
@@ -7905,38 +7905,38 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><command>EXPLAIN</></title>
+     <title><command>EXPLAIN</command></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Make <command>EXPLAIN VERBOSE</> show the output columns of each
+        Make <command>EXPLAIN VERBOSE</command> show the output columns of each
         plan node (Tom)
        </para>
 
        <para>
-        Previously <command>EXPLAIN VERBOSE</> output an internal
+        Previously <command>EXPLAIN VERBOSE</command> output an internal
         representation of the query plan.  (That behavior is now
-        available via <varname>debug_print_plan</>.)
+        available via <varname>debug_print_plan</varname>.)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>EXPLAIN</> identify subplans and initplans with
+        Make <command>EXPLAIN</command> identify subplans and initplans with
         individual labels (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>EXPLAIN</> honor <varname>debug_print_plan</> (Tom)
+        Make <command>EXPLAIN</command> honor <varname>debug_print_plan</varname> (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <command>EXPLAIN</> on <command>CREATE TABLE AS</> (Peter)
+        Allow <command>EXPLAIN</command> on <command>CREATE TABLE AS</command> (Peter)
        </para>
       </listitem>
 
@@ -7945,25 +7945,25 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><literal>LIMIT</>/<literal>OFFSET</></title>
+     <title><literal>LIMIT</literal>/<literal>OFFSET</literal></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow sub-selects in <literal>LIMIT</> and <literal>OFFSET</> (Tom)
+        Allow sub-selects in <literal>LIMIT</literal> and <literal>OFFSET</literal> (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <acronym>SQL</>-standard syntax for
-        <literal>LIMIT</>/<literal>OFFSET</> capabilities (Peter)
+        Add <acronym>SQL</acronym>-standard syntax for
+        <literal>LIMIT</literal>/<literal>OFFSET</literal> capabilities (Peter)
        </para>
 
        <para>
         To wit,
         <literal>OFFSET num {ROW|ROWS} FETCH {FIRST|NEXT} [num] {ROW|ROWS}
-        ONLY</>.
+        ONLY</literal>.
        </para>
       </listitem>
 
@@ -7986,20 +7986,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Refactor multi-object <command>DROP</> operations to reduce the
-       need for <literal>CASCADE</> (Alex Hunsaker)
+       Refactor multi-object <command>DROP</command> operations to reduce the
+       need for <literal>CASCADE</literal> (Alex Hunsaker)
       </para>
 
       <para>
-       For example, if table <literal>B</> has a dependency on table
-       <literal>A</>, the command <literal>DROP TABLE A, B</> no longer
-       requires the <literal>CASCADE</> option.
+       For example, if table <literal>B</literal> has a dependency on table
+       <literal>A</literal>, the command <literal>DROP TABLE A, B</literal> no longer
+       requires the <literal>CASCADE</literal> option.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix various problems with concurrent <command>DROP</> commands
+       Fix various problems with concurrent <command>DROP</command> commands
        by ensuring that locks are taken before we begin to drop dependencies
        of an object (Tom)
       </para>
@@ -8007,15 +8007,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Improve reporting of dependencies during <command>DROP</>
+       Improve reporting of dependencies during <command>DROP</command>
        commands (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>WITH [NO] DATA</> clause to <command>CREATE TABLE
-       AS</>, per the <acronym>SQL</> standard (Peter, Tom)
+       Add <literal>WITH [NO] DATA</literal> clause to <command>CREATE TABLE
+       AS</command>, per the <acronym>SQL</acronym> standard (Peter, Tom)
       </para>
      </listitem>
 
@@ -8027,14 +8027,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow <command>CREATE AGGREGATE</> to use an <type>internal</>
+       Allow <command>CREATE AGGREGATE</command> to use an <type>internal</type>
        transition datatype (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>LIKE</> clause to <command>CREATE TYPE</> (Tom)
+       Add <literal>LIKE</literal> clause to <command>CREATE TYPE</command> (Tom)
       </para>
 
       <para>
@@ -8045,7 +8045,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow specification of the type category and <quote>preferred</>
+       Allow specification of the type category and <quote>preferred</quote>
        status for user-defined base types (Tom)
       </para>
 
@@ -8057,7 +8057,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow <command>CREATE OR REPLACE VIEW</> to add columns to the
+       Allow <command>CREATE OR REPLACE VIEW</command> to add columns to the
        end of a view (Robert Haas)
       </para>
      </listitem>
@@ -8065,25 +8065,25 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </itemizedlist>
 
     <sect4>
-     <title><command>ALTER</></title>
+     <title><command>ALTER</command></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <command>ALTER TYPE RENAME</> (Petr Jelinek)
+        Add <command>ALTER TYPE RENAME</command> (Petr Jelinek)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <command>ALTER SEQUENCE ... RESTART</> (with no parameter) to
+        Add <command>ALTER SEQUENCE ... RESTART</command> (with no parameter) to
         reset a sequence to its initial value (Zoltan Boszormenyi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Modify the <command>ALTER TABLE</> syntax to allow all reasonable
+        Modify the <command>ALTER TABLE</command> syntax to allow all reasonable
         combinations for tables, indexes, sequences, and views (Tom)
        </para>
 
@@ -8093,28 +8093,28 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
         <itemizedlist>
          <listitem>
           <para>
-           <command>ALTER SEQUENCE OWNER TO</>
+           <command>ALTER SEQUENCE OWNER TO</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>ALTER VIEW ALTER COLUMN SET/DROP DEFAULT</>
+           <command>ALTER VIEW ALTER COLUMN SET/DROP DEFAULT</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>ALTER VIEW OWNER TO</>
+           <command>ALTER VIEW OWNER TO</command>
           </para>
          </listitem>
          <listitem>
           <para>
-           <command>ALTER VIEW SET SCHEMA</>
+           <command>ALTER VIEW SET SCHEMA</command>
           </para>
          </listitem>
         </itemizedlist>
 
         There is no actual new functionality here, but formerly
-        you had to say <command>ALTER TABLE</> to do these things,
+        you had to say <command>ALTER TABLE</command> to do these things,
         which was confusing.
        </para>
       </listitem>
@@ -8122,24 +8122,24 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Add support for the syntax <command>ALTER TABLE ... ALTER COLUMN
-        ... SET DATA TYPE</> (Peter)
+        ... SET DATA TYPE</command> (Peter)
        </para>
 
        <para>
-        This is <acronym>SQL</>-standard syntax for functionality that
+        This is <acronym>SQL</acronym>-standard syntax for functionality that
         was already supported.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>ALTER TABLE SET WITHOUT OIDS</> rewrite the table
-        to physically remove <type>OID</> values (Tom)
+        Make <command>ALTER TABLE SET WITHOUT OIDS</command> rewrite the table
+        to physically remove <type>OID</type> values (Tom)
        </para>
 
        <para>
-        Also, add <command>ALTER TABLE SET WITH OIDS</> to rewrite the
-        table to add <type>OID</>s.
+        Also, add <command>ALTER TABLE SET WITH OIDS</command> to rewrite the
+        table to add <type>OID</type>s.
        </para>
       </listitem>
 
@@ -8154,7 +8154,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Improve reporting of
-        <command>CREATE</>/<command>DROP</>/<command>RENAME DATABASE</>
+        <command>CREATE</command>/<command>DROP</command>/<command>RENAME DATABASE</command>
         failure when uncommitted prepared transactions are the cause
         (Tom)
        </para>
@@ -8162,7 +8162,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <varname>LC_COLLATE</> and <varname>LC_CTYPE</> into
+        Make <varname>LC_COLLATE</varname> and <varname>LC_CTYPE</varname> into
         per-database settings (Radek Strnad, Heikki)
        </para>
 
@@ -8175,20 +8175,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Improve checks that the database encoding, collation
-        (<varname>LC_COLLATE</>), and character classes
-        (<varname>LC_CTYPE</>) match (Heikki, Tom)
+        (<varname>LC_COLLATE</varname>), and character classes
+        (<varname>LC_CTYPE</varname>) match (Heikki, Tom)
        </para>
 
        <para>
         Note in particular that a new database's encoding and locale
-        settings can be changed only when copying from <literal>template0</>.
+        settings can be changed only when copying from <literal>template0</literal>.
         This prevents possibly copying data that doesn't match the settings.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <command>ALTER DATABASE SET TABLESPACE</> to move a database
+        Add <command>ALTER DATABASE SET TABLESPACE</command> to move a database
         to a new tablespace (Guillaume Lelarge, Bernd Helmle)
        </para>
       </listitem>
@@ -8206,8 +8206,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add a <literal>VERBOSE</> option to the <command>CLUSTER</> command and
-       <application>clusterdb</> (Jim Cox)
+       Add a <literal>VERBOSE</literal> option to the <command>CLUSTER</command> command and
+       <application>clusterdb</application> (Jim Cox)
       </para>
      </listitem>
 
@@ -8261,8 +8261,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        <literal>xxx_pattern_ops</> indexes can now be used for simple
-        equality comparisons, not only for <literal>LIKE</> (Tom)
+        <literal>xxx_pattern_ops</literal> indexes can now be used for simple
+        equality comparisons, not only for <literal>LIKE</literal> (Tom)
        </para>
       </listitem>
 
@@ -8276,19 +8276,19 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Remove the requirement to use <literal>@@@</> when doing
-        <acronym>GIN</> weighted lookups on full text indexes (Tom, Teodor)
+        Remove the requirement to use <literal>@@@</literal> when doing
+        <acronym>GIN</acronym> weighted lookups on full text indexes (Tom, Teodor)
        </para>
 
        <para>
-        The normal <literal>@@</> text search operator can be used
+        The normal <literal>@@</literal> text search operator can be used
         instead.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add an optimizer selectivity function for <literal>@@</> text
+        Add an optimizer selectivity function for <literal>@@</literal> text
         search operations (Jan Urbanski)
        </para>
       </listitem>
@@ -8302,7 +8302,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Support multi-column <acronym>GIN</> indexes (Teodor Sigaev)
+        Support multi-column <acronym>GIN</acronym> indexes (Teodor Sigaev)
        </para>
       </listitem>
 
@@ -8317,18 +8317,18 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><command>VACUUM</></title>
+     <title><command>VACUUM</command></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Track free space in separate per-relation <quote>fork</> files (Heikki)
+        Track free space in separate per-relation <quote>fork</quote> files (Heikki)
        </para>
 
        <para>
-        Free space discovered by <command>VACUUM</> is now recorded in
-        <filename>*_fsm</> files, rather than in a fixed-sized shared memory
-        area.  The <varname>max_fsm_pages</> and <varname>max_fsm_relations</>
+        Free space discovered by <command>VACUUM</command> is now recorded in
+        <filename>*_fsm</filename> files, rather than in a fixed-sized shared memory
+        area.  The <varname>max_fsm_pages</varname> and <varname>max_fsm_relations</varname>
         settings have been removed, greatly simplifying administration of
         free space management.
        </para>
@@ -8341,16 +8341,16 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        </para>
 
        <para>
-        This allows <command>VACUUM</> to avoid scanning all of
+        This allows <command>VACUUM</command> to avoid scanning all of
         a table when only a portion of the table needs vacuuming.
-        The visibility map is stored in per-relation <quote>fork</> files.
+        The visibility map is stored in per-relation <quote>fork</quote> files.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <varname>vacuum_freeze_table_age</> parameter to control
-        when <command>VACUUM</> should ignore the visibility map and
+        Add <varname>vacuum_freeze_table_age</varname> parameter to control
+        when <command>VACUUM</command> should ignore the visibility map and
         do a full table scan to freeze tuples (Heikki)
        </para>
       </listitem>
@@ -8361,15 +8361,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        </para>
 
        <para>
-        This improves <command>VACUUM</>'s ability to reclaim space
+        This improves <command>VACUUM</command>'s ability to reclaim space
         in the presence of long-running transactions.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add ability to specify per-relation autovacuum and <acronym>TOAST</>
-        parameters in <command>CREATE TABLE</> (Alvaro, Euler Taveira de
+        Add ability to specify per-relation autovacuum and <acronym>TOAST</acronym>
+        parameters in <command>CREATE TABLE</command> (Alvaro, Euler Taveira de
         Oliveira)
        </para>
 
@@ -8380,7 +8380,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <literal>--freeze</> option to <application>vacuumdb</>
+        Add <literal>--freeze</literal> option to <application>vacuumdb</application>
         (Bruce)
        </para>
       </listitem>
@@ -8397,20 +8397,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add a <literal>CaseSensitive</> option for text search synonym
+       Add a <literal>CaseSensitive</literal> option for text search synonym
        dictionaries (Simon)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve the precision of <type>NUMERIC</> division (Tom)
+       Improve the precision of <type>NUMERIC</type> division (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add basic arithmetic operators for <type>int2</> with <type>int8</>
+       Add basic arithmetic operators for <type>int2</type> with <type>int8</type>
        (Tom)
       </para>
 
@@ -8421,22 +8421,22 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Allow <type>UUID</> input to accept an optional hyphen after
+       Allow <type>UUID</type> input to accept an optional hyphen after
        every fourth digit (Robert Haas)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <literal>on</>/<literal>off</> as input for the boolean data type
+       Allow <literal>on</literal>/<literal>off</literal> as input for the boolean data type
        (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow spaces around <literal>NaN</> in the input string for
-       type <type>numeric</> (Sam Mason)
+       Allow spaces around <literal>NaN</literal> in the input string for
+       type <type>numeric</type> (Sam Mason)
       </para>
      </listitem>
 
@@ -8448,53 +8448,53 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Reject year <literal>0 BC</> and years <literal>000</> and
-        <literal>0000</> (Tom)
+        Reject year <literal>0 BC</literal> and years <literal>000</literal> and
+        <literal>0000</literal> (Tom)
        </para>
 
        <para>
-        Previously these were interpreted as <literal>1 BC</>.
-        (Note: years <literal>0</> and <literal>00</> are still assumed to be
+        Previously these were interpreted as <literal>1 BC</literal>.
+        (Note: years <literal>0</literal> and <literal>00</literal> are still assumed to be
         the year 2000.)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Include <literal>SGT</> (Singapore time) in the default list of
+        Include <literal>SGT</literal> (Singapore time) in the default list of
         known time zone abbreviations (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>infinity</> and <literal>-infinity</> as
-        values of type <type>date</> (Tom)
+        Support <literal>infinity</literal> and <literal>-infinity</literal> as
+        values of type <type>date</type> (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make parsing of <type>interval</> literals more standard-compliant
+        Make parsing of <type>interval</type> literals more standard-compliant
         (Tom, Ron Mayer)
        </para>
 
        <para>
-        For example, <literal>INTERVAL '1' YEAR</> now does what it's
+        For example, <literal>INTERVAL '1' YEAR</literal> now does what it's
         supposed to.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <type>interval</> fractional-seconds precision to be specified
-        after the <literal>second</> keyword, for <acronym>SQL</> standard
+        Allow <type>interval</type> fractional-seconds precision to be specified
+        after the <literal>second</literal> keyword, for <acronym>SQL</acronym> standard
         compliance (Tom)
        </para>
 
        <para>
         Formerly the precision had to be specified after the keyword
-        <type>interval</>.  (For backwards compatibility, this syntax is still
+        <type>interval</type>.  (For backwards compatibility, this syntax is still
         supported, though deprecated.)  Data type definitions will now be
         output using the standard format.
        </para>
@@ -8502,26 +8502,26 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Support the <acronym>IS0 8601</> <type>interval</> syntax (Ron
+        Support the <acronym>IS0 8601</acronym> <type>interval</type> syntax (Ron
         Mayer, Kevin Grittner)
        </para>
 
        <para>
-        For example, <literal>INTERVAL 'P1Y2M3DT4H5M6.7S'</> is now
+        For example, <literal>INTERVAL 'P1Y2M3DT4H5M6.7S'</literal> is now
         supported.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <varname>IntervalStyle</> parameter
-        which controls how <type>interval</> values are output (Ron Mayer)
+        Add <varname>IntervalStyle</varname> parameter
+        which controls how <type>interval</type> values are output (Ron Mayer)
        </para>
 
        <para>
-        Valid values are:  <literal>postgres</>, <literal>postgres_verbose</>,
-        <literal>sql_standard</>, <literal>iso_8601</>.  This setting also
-        controls the handling of negative <type>interval</> input when only
+        Valid values are:  <literal>postgres</literal>, <literal>postgres_verbose</literal>,
+        <literal>sql_standard</literal>, <literal>iso_8601</literal>.  This setting also
+        controls the handling of negative <type>interval</type> input when only
         some fields have positive/negative designations.
        </para>
       </listitem>
@@ -8529,7 +8529,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Improve consistency of handling of fractional seconds in
-        <type>timestamp</> and <type>interval</> output (Ron Mayer)
+        <type>timestamp</type> and <type>interval</type> output (Ron Mayer)
        </para>
       </listitem>
 
@@ -8543,38 +8543,38 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Improve the handling of casts applied to <literal>ARRAY[]</>
-        constructs, such as <literal>ARRAY[...]::integer[]</>
+        Improve the handling of casts applied to <literal>ARRAY[]</literal>
+        constructs, such as <literal>ARRAY[...]::integer[]</literal>
         (Brendan Jurd)
        </para>
 
        <para>
-        Formerly <productname>PostgreSQL</> attempted to determine a data type
-        for the <literal>ARRAY[]</> construct without reference to the ensuing
+        Formerly <productname>PostgreSQL</productname> attempted to determine a data type
+        for the <literal>ARRAY[]</literal> construct without reference to the ensuing
         cast.  This could fail unnecessarily in many cases, in particular when
-        the <literal>ARRAY[]</> construct was empty or contained only
-        ambiguous entries such as <literal>NULL</>.  Now the cast is consulted
+        the <literal>ARRAY[]</literal> construct was empty or contained only
+        ambiguous entries such as <literal>NULL</literal>.  Now the cast is consulted
         to determine the type that the array elements must be.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <acronym>SQL</>-syntax <type>ARRAY</> dimensions optional
-        to match the <acronym>SQL</> standard (Peter)
+        Make <acronym>SQL</acronym>-syntax <type>ARRAY</type> dimensions optional
+        to match the <acronym>SQL</acronym> standard (Peter)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>array_ndims()</> to return the number
+        Add <function>array_ndims()</function> to return the number
         of dimensions of an array (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>array_length()</> to return the length
+        Add <function>array_length()</function> to return the length
         of an array for a specified dimension (Jim Nasby, Robert
         Haas, Peter Eisentraut)
        </para>
@@ -8582,7 +8582,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add aggregate function <function>array_agg()</>, which
+        Add aggregate function <function>array_agg()</function>, which
         returns all aggregated values as a single array (Robert Haas,
         Jeff Davis, Peter)
        </para>
@@ -8590,25 +8590,25 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <function>unnest()</>, which converts an array to
+        Add <function>unnest()</function>, which converts an array to
         individual row values (Tom)
        </para>
 
        <para>
-        This is the opposite of <function>array_agg()</>.
+        This is the opposite of <function>array_agg()</function>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>array_fill()</> to create arrays initialized with
+        Add <function>array_fill()</function> to create arrays initialized with
         a value (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>generate_subscripts()</> to simplify generating
+        Add <function>generate_subscripts()</function> to simplify generating
         the range of an array's subscripts (Pavel Stehule)
        </para>
       </listitem>
@@ -8618,19 +8618,19 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title>Wide-Value Storage (<acronym>TOAST</>)</title>
+     <title>Wide-Value Storage (<acronym>TOAST</acronym>)</title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Consider <acronym>TOAST</> compression on values as short as
+        Consider <acronym>TOAST</acronym> compression on values as short as
         32 bytes (previously 256 bytes) (Greg Stark)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Require 25% minimum space savings before using <acronym>TOAST</>
+        Require 25% minimum space savings before using <acronym>TOAST</acronym>
         compression (previously 20% for small values and any-savings-at-all
         for large values) (Greg)
        </para>
@@ -8638,7 +8638,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Improve <acronym>TOAST</> heuristics for rows that have a mix of large
+        Improve <acronym>TOAST</acronym> heuristics for rows that have a mix of large
         and small toastable fields, so that we prefer to push large values out
         of line and don't compress small values unnecessarily (Greg, Tom)
        </para>
@@ -8656,52 +8656,52 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Document that <function>setseed()</> allows values from
-       <literal>-1</> to <literal>1</> (not just <literal>0</> to
-       <literal>1</>), and enforce the valid range (Kris Jurka)
+       Document that <function>setseed()</function> allows values from
+       <literal>-1</literal> to <literal>1</literal> (not just <literal>0</literal> to
+       <literal>1</literal>), and enforce the valid range (Kris Jurka)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add server-side function <function>lo_import(filename, oid)</>
+       Add server-side function <function>lo_import(filename, oid)</function>
        (Tatsuo)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>quote_nullable()</>, which behaves like
-       <function>quote_literal()</> but returns the string <literal>NULL</> for
+       Add <function>quote_nullable()</function>, which behaves like
+       <function>quote_literal()</function> but returns the string <literal>NULL</literal> for
        a null argument (Brendan Jurd)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve full text search <function>headline()</> function to
+       Improve full text search <function>headline()</function> function to
        allow extracting several fragments of text (Sushant Sinha)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>suppress_redundant_updates_trigger()</> trigger
+       Add <function>suppress_redundant_updates_trigger()</function> trigger
        function to avoid overhead for non-data-changing updates (Andrew)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <function>div(numeric, numeric)</> to perform <type>numeric</>
+       Add <function>div(numeric, numeric)</function> to perform <type>numeric</type>
        division without rounding (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <type>timestamp</> and <type>timestamptz</> versions of
-       <function>generate_series()</> (Hitoshi Harada)
+       Add <type>timestamp</type> and <type>timestamptz</type> versions of
+       <function>generate_series()</function> (Hitoshi Harada)
       </para>
      </listitem>
 
@@ -8713,54 +8713,54 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Implement <function>current_query()</> for use by functions
+        Implement <function>current_query()</function> for use by functions
         that need to know the currently running query (Tomas Doran)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>pg_get_keywords()</> to return a list of the
+        Add <function>pg_get_keywords()</function> to return a list of the
         parser keywords (Dave Page)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>pg_get_functiondef()</> to see a function's
+        Add <function>pg_get_functiondef()</function> to see a function's
         definition (Abhijit Menon-Sen)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow the second argument of <function>pg_get_expr()</> to be zero
+        Allow the second argument of <function>pg_get_expr()</function> to be zero
         when deparsing an expression that does not contain variables (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Modify <function>pg_relation_size()</> to use <literal>regclass</>
+        Modify <function>pg_relation_size()</function> to use <literal>regclass</literal>
         (Heikki)
        </para>
 
        <para>
-        <function>pg_relation_size(data_type_name)</> no longer works.
+        <function>pg_relation_size(data_type_name)</function> no longer works.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>boot_val</> and <literal>reset_val</> columns to
-        <literal>pg_settings</> output (Greg Smith)
+        Add <literal>boot_val</literal> and <literal>reset_val</literal> columns to
+        <literal>pg_settings</literal> output (Greg Smith)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add source file name and line number columns to
-        <literal>pg_settings</> output for variables set in a configuration
+        <literal>pg_settings</literal> output for variables set in a configuration
         file (Magnus, Alvaro)
        </para>
 
@@ -8771,26 +8771,26 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add support for <varname>CURRENT_CATALOG</>,
-        <varname>CURRENT_SCHEMA</>, <varname>SET CATALOG</>, <varname>SET
-        SCHEMA</> (Peter)
+        Add support for <varname>CURRENT_CATALOG</varname>,
+        <varname>CURRENT_SCHEMA</varname>, <varname>SET CATALOG</varname>, <varname>SET
+        SCHEMA</varname> (Peter)
        </para>
 
        <para>
-        These provide <acronym>SQL</>-standard syntax for existing features.
+        These provide <acronym>SQL</acronym>-standard syntax for existing features.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>pg_typeof()</> which returns the data type
+        Add <function>pg_typeof()</function> which returns the data type
         of any value (Brendan Jurd)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <function>version()</> return information about whether
+        Make <function>version()</function> return information about whether
         the server is a 32- or 64-bit binary (Bruce)
        </para>
       </listitem>
@@ -8798,7 +8798,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Fix the behavior of information schema columns
-        <structfield>is_insertable_into</> and <structfield>is_updatable</> to
+        <structfield>is_insertable_into</structfield> and <structfield>is_updatable</structfield> to
         be consistent (Peter)
        </para>
       </listitem>
@@ -8806,13 +8806,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Improve the behavior of information schema
-        <structfield>datetime_precision</> columns (Peter)
+        <structfield>datetime_precision</structfield> columns (Peter)
        </para>
 
        <para>
-        These columns now show zero for <type>date</> columns, and 6
-        (the default precision) for <type>time</>, <type>timestamp</>, and
-        <type>interval</> without a declared precision, rather than showing
+        These columns now show zero for <type>date</type> columns, and 6
+        (the default precision) for <type>time</type>, <type>timestamp</type>, and
+        <type>interval</type> without a declared precision, rather than showing
         null as formerly.
        </para>
       </listitem>
@@ -8820,28 +8820,28 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Convert remaining builtin set-returning functions to use
-        <literal>OUT</> parameters (Jaime Casanova)
+        <literal>OUT</literal> parameters (Jaime Casanova)
        </para>
 
        <para>
         This makes it possible to call these functions without specifying
-        a column list:  <function>pg_show_all_settings()</>,
-        <function>pg_lock_status()</>, <function>pg_prepared_xact()</>,
-        <function>pg_prepared_statement()</>, <function>pg_cursor()</>
+        a column list:  <function>pg_show_all_settings()</function>,
+        <function>pg_lock_status()</function>, <function>pg_prepared_xact()</function>,
+        <function>pg_prepared_statement()</function>, <function>pg_cursor()</function>
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <function>pg_*_is_visible()</> and
-        <function>has_*_privilege()</> functions return <literal>NULL</>
+        Make <function>pg_*_is_visible()</function> and
+        <function>has_*_privilege()</function> functions return <literal>NULL</literal>
         for invalid OIDs, rather than reporting an error (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Extend <function>has_*_privilege()</> functions to allow inquiring
+        Extend <function>has_*_privilege()</function> functions to allow inquiring
         about the OR of multiple privileges in one call (Stephen
         Frost, Tom)
        </para>
@@ -8849,8 +8849,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <function>has_column_privilege()</> and
-        <function>has_any_column_privilege()</> functions (Stephen
+        Add <function>has_column_privilege()</function> and
+        <function>has_any_column_privilege()</function> functions (Stephen
         Frost, Tom)
        </para>
       </listitem>
@@ -8883,16 +8883,16 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add <command>CREATE FUNCTION ... RETURNS TABLE</> clause (Pavel
+        Add <command>CREATE FUNCTION ... RETURNS TABLE</command> clause (Pavel
         Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <acronym>SQL</>-language functions to return the output
-        of an <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>
-        <literal>RETURNING</> clause (Tom)
+        Allow <acronym>SQL</acronym>-language functions to return the output
+        of an <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>
+        <literal>RETURNING</literal> clause (Tom)
        </para>
       </listitem>
 
@@ -8906,38 +8906,38 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Support <literal>EXECUTE USING</> for easier insertion of data
+        Support <literal>EXECUTE USING</literal> for easier insertion of data
         values into a dynamic query string (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow looping over the results of a cursor using a <literal>FOR</>
+        Allow looping over the results of a cursor using a <literal>FOR</literal>
         loop (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>RETURN QUERY EXECUTE</> (Pavel
+        Support <literal>RETURN QUERY EXECUTE</literal> (Pavel
         Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve the <literal>RAISE</> command (Pavel Stehule)
+        Improve the <literal>RAISE</literal> command (Pavel Stehule)
 
         <itemizedlist>
          <listitem>
           <para>
-           Support <literal>DETAIL</> and <literal>HINT</> fields
+           Support <literal>DETAIL</literal> and <literal>HINT</literal> fields
           </para>
          </listitem>
          <listitem>
           <para>
-           Support specification of the <literal>SQLSTATE</> error code
+           Support specification of the <literal>SQLSTATE</literal> error code
           </para>
          </listitem>
          <listitem>
@@ -8947,7 +8947,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
          </listitem>
          <listitem>
           <para>
-           Allow <literal>RAISE</> without parameters in an exception
+           Allow <literal>RAISE</literal> without parameters in an exception
            block to re-throw the current error
           </para>
          </listitem>
@@ -8957,45 +8957,45 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Allow specification of <varname>SQLSTATE</> codes
-        in <literal>EXCEPTION</> lists (Pavel Stehule)
+        Allow specification of <varname>SQLSTATE</varname> codes
+        in <literal>EXCEPTION</literal> lists (Pavel Stehule)
        </para>
 
        <para>
-        This is useful for handling custom <varname>SQLSTATE</> codes.
+        This is useful for handling custom <varname>SQLSTATE</varname> codes.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support the <literal>CASE</> statement (Pavel Stehule)
+        Support the <literal>CASE</literal> statement (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>RETURN QUERY</> set the special <literal>FOUND</> and
-        <command>GET DIAGNOSTICS</> <literal>ROW_COUNT</> variables
+        Make <command>RETURN QUERY</command> set the special <literal>FOUND</literal> and
+        <command>GET DIAGNOSTICS</command> <literal>ROW_COUNT</literal> variables
         (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>FETCH</> and <command>MOVE</> set the
-        <command>GET DIAGNOSTICS</> <literal>ROW_COUNT</> variable
+        Make <command>FETCH</command> and <command>MOVE</command> set the
+        <command>GET DIAGNOSTICS</command> <literal>ROW_COUNT</literal> variable
         (Andrew Gierth)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>EXIT</> without a label always exit the innermost
+        Make <command>EXIT</command> without a label always exit the innermost
         loop (Tom)
        </para>
 
        <para>
-        Formerly, if there were a <literal>BEGIN</> block more closely nested
+        Formerly, if there were a <literal>BEGIN</literal> block more closely nested
         than any loop, it would exit that block instead.  The new behavior
         matches Oracle(TM) and is also what was previously stated by our own
         documentation.
@@ -9009,11 +9009,11 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        </para>
 
        <para>
-        In particular, the format string in <command>RAISE</> now works
+        In particular, the format string in <command>RAISE</command> now works
         the same as any other string literal, including being subject
-        to <varname>standard_conforming_strings</>.  This change also
+        to <varname>standard_conforming_strings</varname>.  This change also
         fixes other cases in which valid commands would fail when
-        <varname>standard_conforming_strings</> is on.
+        <varname>standard_conforming_strings</varname> is on.
        </para>
       </listitem>
 
@@ -9037,28 +9037,28 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Fix <literal>pg_ctl restart</> to preserve command-line arguments
+       Fix <literal>pg_ctl restart</literal> to preserve command-line arguments
        (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <literal>-w</>/<literal>--no-password</> option that
+       Add <literal>-w</literal>/<literal>--no-password</literal> option that
        prevents password prompting in all utilities that have a
-       <literal>-W</>/<literal>--password</> option (Peter)
+       <literal>-W</literal>/<literal>--password</literal> option (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Remove <option>-q</> (quiet) option of <application>createdb</>,
-       <application>createuser</>, <application>dropdb</>,
-       <application>dropuser</> (Peter)
+       Remove <option>-q</option> (quiet) option of <application>createdb</application>,
+       <application>createuser</application>, <application>dropdb</application>,
+       <application>dropuser</application> (Peter)
       </para>
 
       <para>
-       These options have had no effect since <productname>PostgreSQL</>
+       These options have had no effect since <productname>PostgreSQL</productname>
        8.3.
       </para>
      </listitem>
@@ -9066,41 +9066,41 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </itemizedlist>
 
     <sect4>
-     <title><application>psql</></title>
+     <title><application>psql</application></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Remove verbose startup banner; now just suggest <literal>help</>
+        Remove verbose startup banner; now just suggest <literal>help</literal>
         (Joshua Drake)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <literal>help</> show common backslash commands (Greg
+        Make <literal>help</literal> show common backslash commands (Greg
         Sabino Mullane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>\pset format wrapped</> mode to wrap output to the
-        screen width, or file/pipe output too if <literal>\pset columns</>
+        Add <literal>\pset format wrapped</literal> mode to wrap output to the
+        screen width, or file/pipe output too if <literal>\pset columns</literal>
         is set (Bryce Nesbitt)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow all supported spellings of boolean values in <command>\pset</>,
-        rather than just <literal>on</> and <literal>off</> (Bruce)
+        Allow all supported spellings of boolean values in <command>\pset</command>,
+        rather than just <literal>on</literal> and <literal>off</literal> (Bruce)
        </para>
 
        <para>
-        Formerly, any string other than <quote>off</> was silently taken
-        to mean <literal>true</>.  <application>psql</> will now complain
-        about unrecognized spellings (but still take them as <literal>true</>).
+        Formerly, any string other than <quote>off</quote> was silently taken
+        to mean <literal>true</literal>.  <application>psql</application> will now complain
+        about unrecognized spellings (but still take them as <literal>true</literal>).
        </para>
       </listitem>
 
@@ -9130,8 +9130,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add optional <literal>on</>/<literal>off</> argument for
-        <command>\timing</> (David Fetter)
+        Add optional <literal>on</literal>/<literal>off</literal> argument for
+        <command>\timing</command> (David Fetter)
        </para>
       </listitem>
 
@@ -9144,20 +9144,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <command>\l</> show database access privileges (Andrew Gilligan)
+        Make <command>\l</command> show database access privileges (Andrew Gilligan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>\l+</> show database sizes, if permissions
+        Make <command>\l+</command> show database sizes, if permissions
         allow (Andrew Gilligan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <command>\ef</> command to edit function definitions
+        Add the <command>\ef</command> command to edit function definitions
         (Abhijit Menon-Sen)
        </para>
       </listitem>
@@ -9167,28 +9167,28 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><application>psql</> \d* commands</title>
+     <title><application>psql</application> \d* commands</title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Make <command>\d*</> commands that do not have a pattern argument
-        show system objects only if the <literal>S</> modifier is specified
+        Make <command>\d*</command> commands that do not have a pattern argument
+        show system objects only if the <literal>S</literal> modifier is specified
         (Greg Sabino Mullane, Bruce)
        </para>
 
        <para>
         The former behavior was inconsistent across different variants
-        of <command>\d</>, and in most cases it provided no easy way to see
+        of <command>\d</command>, and in most cases it provided no easy way to see
         just user objects.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <command>\d*</> commands to work with older
-        <productname>PostgreSQL</> server versions (back to 7.4),
+        Improve <command>\d*</command> commands to work with older
+        <productname>PostgreSQL</productname> server versions (back to 7.4),
         not only the current server version
         (Guillaume Lelarge)
        </para>
@@ -9196,14 +9196,14 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <command>\d</> show foreign-key constraints that reference
+        Make <command>\d</command> show foreign-key constraints that reference
         the selected table (Kenneth D'Souza)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>\d</> on a sequence show its column values
+        Make <command>\d</command> on a sequence show its column values
         (Euler Taveira de Oliveira)
        </para>
       </listitem>
@@ -9211,43 +9211,43 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       <listitem>
        <para>
         Add column storage type and other relation options to the
-        <command>\d+</> display (Gregory Stark, Euler Taveira de
+        <command>\d+</command> display (Gregory Stark, Euler Taveira de
         Oliveira)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show relation size in <command>\dt+</> output (Dickson S.
+        Show relation size in <command>\dt+</command> output (Dickson S.
         Guedes)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show the possible values of <literal>enum</> types in <command>\dT+</>
+        Show the possible values of <literal>enum</literal> types in <command>\dT+</command>
         (David Fetter)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <command>\dC</> to accept a wildcard pattern, which matches
+        Allow <command>\dC</command> to accept a wildcard pattern, which matches
         either datatype involved in the cast (Tom)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a function type column to <command>\df</>'s output, and add
+        Add a function type column to <command>\df</command>'s output, and add
         options to list only selected types of functions (David Fetter)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <command>\df</> not hide functions that take or return
-        type <type>cstring</> (Tom)
+        Make <command>\df</command> not hide functions that take or return
+        type <type>cstring</type> (Tom)
        </para>
 
        <para>
@@ -9263,13 +9263,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><application>pg_dump</></title>
+     <title><application>pg_dump</application></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Add a <literal>--no-tablespaces</> option to
-        <application>pg_dump</>/<application>pg_dumpall</>/<application>pg_restore</>
+        Add a <literal>--no-tablespaces</literal> option to
+        <application>pg_dump</application>/<application>pg_dumpall</application>/<application>pg_restore</application>
         so that dumps can be restored to clusters that have non-matching
         tablespace layouts (Gavin Roy)
        </para>
@@ -9277,23 +9277,23 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Remove <option>-d</> and <option>-D</> options from
-        <application>pg_dump</> and <application>pg_dumpall</> (Tom)
+        Remove <option>-d</option> and <option>-D</option> options from
+        <application>pg_dump</application> and <application>pg_dumpall</application> (Tom)
        </para>
 
        <para>
         These options were too frequently confused with the option to
-        select a database name in other <productname>PostgreSQL</>
+        select a database name in other <productname>PostgreSQL</productname>
         client applications.  The functionality is still available,
         but you must now spell out the long option name
-        <option>--inserts</> or <option>--column-inserts</>.
+        <option>--inserts</option> or <option>--column-inserts</option>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <option>-i</>/<option>--ignore-version</> option from
-        <application>pg_dump</> and <application>pg_dumpall</> (Tom)
+        Remove <option>-i</option>/<option>--ignore-version</option> option from
+        <application>pg_dump</application> and <application>pg_dumpall</application> (Tom)
        </para>
 
        <para>
@@ -9305,15 +9305,15 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Disable <varname>statement_timeout</> during dump and restore
+        Disable <varname>statement_timeout</varname> during dump and restore
         (Joshua Drake)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pg_dump</>/<application>pg_dumpall</> option
-        <option>--lock-wait-timeout</> (David Gould)
+        Add <application>pg_dump</application>/<application>pg_dumpall</application> option
+        <option>--lock-wait-timeout</option> (David Gould)
        </para>
 
        <para>
@@ -9324,7 +9324,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Reorder <application>pg_dump</> <literal>--data-only</> output
+        Reorder <application>pg_dump</application> <literal>--data-only</literal> output
         to dump tables referenced by foreign keys before
         the referencing tables (Tom)
        </para>
@@ -9332,27 +9332,27 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        <para>
         This allows data loads when foreign keys are already present.
         If circular references make a safe ordering impossible, a
-        <literal>NOTICE</> is issued.
+        <literal>NOTICE</literal> is issued.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_dump</>, <application>pg_dumpall</>, and
-        <application>pg_restore</> to use a specified role (Benedek
+        Allow <application>pg_dump</application>, <application>pg_dumpall</application>, and
+        <application>pg_restore</application> to use a specified role (Benedek
         L&aacute;szl&oacute;)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_restore</> to use multiple concurrent
+        Allow <application>pg_restore</application> to use multiple concurrent
         connections to do the restore (Andrew)
        </para>
 
        <para>
         The number of concurrent connections is controlled by the option
-        <literal>--jobs</>.  This is supported only for custom-format archives.
+        <literal>--jobs</literal>.  This is supported only for custom-format archives.
        </para>
       </listitem>
 
@@ -9366,24 +9366,24 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     <title>Programming Tools</title>
 
     <sect4>
-     <title><application>libpq</></title>
+     <title><application>libpq</application></title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow the <type>OID</> to be specified when importing a large
-        object, via new function <function>lo_import_with_oid()</> (Tatsuo)
+        Allow the <type>OID</type> to be specified when importing a large
+        object, via new function <function>lo_import_with_oid()</function> (Tatsuo)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <quote>events</> support (Andrew Chernow, Merlin Moncure)
+        Add <quote>events</quote> support (Andrew Chernow, Merlin Moncure)
        </para>
 
        <para>
         This adds the ability to register callbacks to manage private
-        data associated with <structname>PGconn</> and <structname>PGresult</>
+        data associated with <structname>PGconn</structname> and <structname>PGresult</structname>
         objects.
        </para>
       </listitem>
@@ -9397,18 +9397,18 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Make <function>PQexecParams()</> and related functions return
-        <varname>PGRES_EMPTY_QUERY</> for an empty query (Tom)
+        Make <function>PQexecParams()</function> and related functions return
+        <varname>PGRES_EMPTY_QUERY</varname> for an empty query (Tom)
        </para>
 
        <para>
-        They previously returned <varname>PGRES_COMMAND_OK</>.
+        They previously returned <varname>PGRES_COMMAND_OK</varname>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Document how to avoid the overhead of <function>WSACleanup()</>
+        Document how to avoid the overhead of <function>WSACleanup()</function>
         on Windows (Andrew Chernow)
        </para>
       </listitem>
@@ -9434,22 +9434,22 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><application>libpq</> <acronym>SSL</> (Secure Sockets Layer)
+     <title><application>libpq</application> <acronym>SSL</acronym> (Secure Sockets Layer)
       support</title>
      <itemizedlist>
 
       <listitem>
        <para>
-        Fix certificate validation for <acronym>SSL</> connections
+        Fix certificate validation for <acronym>SSL</acronym> connections
         (Magnus)
        </para>
 
        <para>
-        <application>libpq</> now supports verifying both the certificate
-        and the name of the server when making <acronym>SSL</>
+        <application>libpq</application> now supports verifying both the certificate
+        and the name of the server when making <acronym>SSL</acronym>
         connections. If a root certificate is not available to use for
-        verification, <acronym>SSL</> connections will fail. The
-        <literal>sslmode</> parameter is used to enable certificate
+        verification, <acronym>SSL</acronym> connections will fail. The
+        <literal>sslmode</literal> parameter is used to enable certificate
         verification and set the level of checking.
         The default is still not to do any verification, allowing connections
         to SSL-enabled servers without requiring a root certificate on the
@@ -9463,7 +9463,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
        </para>
 
        <para>
-        If a certificate <acronym>CN</> starts with <literal>*</>, it will
+        If a certificate <acronym>CN</acronym> starts with <literal>*</literal>, it will
         be treated as a wildcard when matching the hostname, allowing the
         use of the same certificate for multiple servers.
        </para>
@@ -9478,21 +9478,21 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add a <function>PQinitOpenSSL</> function to allow greater control
+        Add a <function>PQinitOpenSSL</function> function to allow greater control
         over OpenSSL/libcrypto initialization (Andrew Chernow)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>libpq</> unregister its <application>OpenSSL</>
+        Make <application>libpq</application> unregister its <application>OpenSSL</application>
         callbacks when no database connections remain open
         (Bruce, Magnus, Russell Smith)
        </para>
 
        <para>
         This is required for applications that unload the libpq library,
-        otherwise invalid <application>OpenSSL</> callbacks will remain.
+        otherwise invalid <application>OpenSSL</application> callbacks will remain.
        </para>
       </listitem>
 
@@ -9501,7 +9501,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title><application>ecpg</></title>
+     <title><application>ecpg</application></title>
      <itemizedlist>
 
       <listitem>
@@ -9527,7 +9527,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
     </sect4>
 
     <sect4>
-     <title>Server Programming Interface (<acronym>SPI</>)</title>
+     <title>Server Programming Interface (<acronym>SPI</acronym>)</title>
      <itemizedlist>
 
       <listitem>
@@ -9539,8 +9539,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Add new <varname>SPI_OK_REWRITTEN</> return code for
-        <function>SPI_execute()</> (Heikki)
+        Add new <varname>SPI_OK_REWRITTEN</varname> return code for
+        <function>SPI_execute()</function> (Heikki)
        </para>
 
        <para>
@@ -9551,12 +9551,12 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
       <listitem>
        <para>
-        Remove unnecessary inclusions from <filename>executor/spi.h</> (Tom)
+        Remove unnecessary inclusions from <filename>executor/spi.h</filename> (Tom)
        </para>
 
        <para>
-        SPI-using modules might need to add some <literal>#include</>
-        lines if they were depending on <filename>spi.h</> to include
+        SPI-using modules might need to add some <literal>#include</literal>
+        lines if they were depending on <filename>spi.h</filename> to include
         things for them.
        </para>
       </listitem>
@@ -9573,13 +9573,13 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Update build system to use <productname>Autoconf</> 2.61 (Peter)
+       Update build system to use <productname>Autoconf</productname> 2.61 (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require <productname>GNU bison</> for source code builds (Peter)
+       Require <productname>GNU bison</productname> for source code builds (Peter)
       </para>
 
       <para>
@@ -9590,63 +9590,63 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add <application>pg_config</> <literal>--htmldir</> option
+       Add <application>pg_config</application> <literal>--htmldir</literal> option
        (Peter)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Pass <type>float4</> by value inside the server (Zoltan
+       Pass <type>float4</type> by value inside the server (Zoltan
        Boszormenyi)
       </para>
 
       <para>
-       Add <application>configure</> option
-       <literal>--disable-float4-byval</> to use the old behavior.
+       Add <application>configure</application> option
+       <literal>--disable-float4-byval</literal> to use the old behavior.
        External C functions that use old-style (version 0) call convention
-       and pass or return <type>float4</> values will be broken by this
-       change, so you may need the <application>configure</> option if you
+       and pass or return <type>float4</type> values will be broken by this
+       change, so you may need the <application>configure</application> option if you
        have such functions and don't want to update them.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Pass <type>float8</>, <type>int8</>, and related datatypes
+       Pass <type>float8</type>, <type>int8</type>, and related datatypes
        by value inside the server on 64-bit platforms (Zoltan Boszormenyi)
       </para>
 
       <para>
-       Add <application>configure</> option
-       <literal>--disable-float8-byval</> to use the old behavior.
+       Add <application>configure</application> option
+       <literal>--disable-float8-byval</literal> to use the old behavior.
        As above, this change might break old-style external C functions.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add configure options <literal>--with-segsize</>,
-       <literal>--with-blocksize</>, <literal>--with-wal-blocksize</>,
-       <literal>--with-wal-segsize</> (Zdenek Kotala, Tom)
+       Add configure options <literal>--with-segsize</literal>,
+       <literal>--with-blocksize</literal>, <literal>--with-wal-blocksize</literal>,
+       <literal>--with-wal-segsize</literal> (Zdenek Kotala, Tom)
       </para>
 
       <para>
        This simplifies build-time control over several constants that
        previously could only be changed by editing
-       <filename>pg_config_manual.h</>.
+       <filename>pg_config_manual.h</filename>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow threaded builds on <productname>Solaris</> 2.5 (Bruce)
+       Allow threaded builds on <productname>Solaris</productname> 2.5 (Bruce)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Use the system's <function>getopt_long()</> on <productname>Solaris</>
+       Use the system's <function>getopt_long()</function> on <productname>Solaris</productname>
        (Zdenek Kotala, Tom)
       </para>
 
@@ -9658,16 +9658,16 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add support for the <productname>Sun Studio</> compiler on
-       <productname>Linux</> (Julius Stroffek)
+       Add support for the <productname>Sun Studio</productname> compiler on
+       <productname>Linux</productname> (Julius Stroffek)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Append the major version number to the backend <application>gettext</>
-       domain, and the <literal>soname</> major version number to
-       libraries' <application>gettext</> domain (Peter)
+       Append the major version number to the backend <application>gettext</application>
+       domain, and the <literal>soname</literal> major version number to
+       libraries' <application>gettext</application> domain (Peter)
       </para>
 
       <para>
@@ -9677,21 +9677,21 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add support for code coverage testing with <application>gcov</>
+       Add support for code coverage testing with <application>gcov</application>
        (Michelle Caisse)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow out-of-tree builds on <productname>Mingw</> and
-       <productname>Cygwin</> (Richard Evans)
+       Allow out-of-tree builds on <productname>Mingw</productname> and
+       <productname>Cygwin</productname> (Richard Evans)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix the use of <productname>Mingw</> as a cross-compiling source
+       Fix the use of <productname>Mingw</productname> as a cross-compiling source
        platform (Peter)
       </para>
      </listitem>
@@ -9710,20 +9710,20 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
       </para>
 
       <para>
-       This adds support for daylight saving time (<acronym>DST</>)
+       This adds support for daylight saving time (<acronym>DST</acronym>)
        calculations beyond the year 2038.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Deprecate use of platform's <type>time_t</> data type (Tom)
+       Deprecate use of platform's <type>time_t</type> data type (Tom)
       </para>
 
       <para>
-       Some platforms have migrated to 64-bit <type>time_t</>, some have
+       Some platforms have migrated to 64-bit <type>time_t</type>, some have
        not, and Windows can't make up its mind what it's doing.  Define
-       <type>pg_time_t</> to have the same meaning as <type>time_t</>,
+       <type>pg_time_t</type> to have the same meaning as <type>time_t</type>,
        but always be 64 bits (unless the platform has no 64-bit integer type),
        and use that type in all module APIs and on-disk data formats.
       </para>
@@ -9745,7 +9745,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Improve <application>gettext</> support to allow better translation
+       Improve <application>gettext</application> support to allow better translation
        of plurals (Peter)
       </para>
      </listitem>
@@ -9758,44 +9758,44 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add more <application>DTrace</> probes (Robert Lor)
+       Add more <application>DTrace</application> probes (Robert Lor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Enable <application>DTrace</> support on <application>macOS
-       Leopard</> and other non-Solaris platforms (Robert Lor)
+       Enable <application>DTrace</application> support on <application>macOS
+       Leopard</application> and other non-Solaris platforms (Robert Lor)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Simplify and standardize conversions between C strings and
-       <type>text</> datums, by providing common functions for the purpose
+       <type>text</type> datums, by providing common functions for the purpose
        (Brendan Jurd, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Clean up the <filename>include/catalog/</> header files so that
+       Clean up the <filename>include/catalog/</filename> header files so that
        frontend programs can include them without including
-       <filename>postgres.h</>
+       <filename>postgres.h</filename>
        (Zdenek Kotala)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <type>name</> char-aligned, and suppress zero-padding of
-       <type>name</> entries in indexes (Tom)
+       Make <type>name</type> char-aligned, and suppress zero-padding of
+       <type>name</type> entries in indexes (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Recover better if dynamically-loaded code executes <function>exit()</>
+       Recover better if dynamically-loaded code executes <function>exit()</function>
        (Tom)
       </para>
      </listitem>
@@ -9816,55 +9816,55 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add <function>shmem_startup_hook()</> for custom shared memory
+       Add <function>shmem_startup_hook()</function> for custom shared memory
        requirements (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Replace the index access method <function>amgetmulti</> entry point
-       with <function>amgetbitmap</>, and extend the API for
-       <function>amgettuple</> to support run-time determination of
+       Replace the index access method <function>amgetmulti</function> entry point
+       with <function>amgetbitmap</function>, and extend the API for
+       <function>amgettuple</function> to support run-time determination of
        operator lossiness (Heikki, Tom, Teodor)
       </para>
 
       <para>
-       The API for GIN and GiST opclass <function>consistent</> functions
+       The API for GIN and GiST opclass <function>consistent</function> functions
        has been extended as well.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for partial-match searches in <acronym>GIN</> indexes
+       Add support for partial-match searches in <acronym>GIN</acronym> indexes
        (Teodor Sigaev, Oleg Bartunov)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Replace <structname>pg_class</> column <structfield>reltriggers</>
-       with boolean <structfield>relhastriggers</> (Simon)
+       Replace <structname>pg_class</structname> column <structfield>reltriggers</structfield>
+       with boolean <structfield>relhastriggers</structfield> (Simon)
       </para>
 
       <para>
-       Also remove unused <structname>pg_class</> columns
-       <structfield>relukeys</>, <structfield>relfkeys</>, and
-       <structfield>relrefs</>.
+       Also remove unused <structname>pg_class</structname> columns
+       <structfield>relukeys</structfield>, <structfield>relfkeys</structfield>, and
+       <structfield>relrefs</structfield>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add a <structfield>relistemp</> column to <structname>pg_class</>
+       Add a <structfield>relistemp</structfield> column to <structname>pg_class</structname>
        to ease identification of temporary tables (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Move platform <acronym>FAQ</>s into the main documentation
+       Move platform <acronym>FAQ</acronym>s into the main documentation
        (Peter)
       </para>
      </listitem>
@@ -9878,7 +9878,7 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add support for the <literal>KOI8U</> (Ukrainian) encoding
+       Add support for the <literal>KOI8U</literal> (Ukrainian) encoding
        (Peter)
       </para>
      </listitem>
@@ -9895,8 +9895,8 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Fix problem when setting <varname>LC_MESSAGES</> on
-       <application>MSVC</>-built systems (Hiroshi Inoue, Hiroshi
+       Fix problem when setting <varname>LC_MESSAGES</varname> on
+       <application>MSVC</application>-built systems (Hiroshi Inoue, Hiroshi
        Saito, Magnus)
       </para>
      </listitem>
@@ -9912,65 +9912,65 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add <filename>contrib/auto_explain</> to automatically run
-       <command>EXPLAIN</> on queries exceeding a specified duration
+       Add <filename>contrib/auto_explain</filename> to automatically run
+       <command>EXPLAIN</command> on queries exceeding a specified duration
        (Itagaki Takahiro, Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <filename>contrib/btree_gin</> to allow GIN indexes to
+       Add <filename>contrib/btree_gin</filename> to allow GIN indexes to
        handle more datatypes (Oleg, Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <filename>contrib/citext</> to provide a case-insensitive,
+       Add <filename>contrib/citext</filename> to provide a case-insensitive,
        multibyte-aware text data type (David Wheeler)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <filename>contrib/pg_stat_statements</> for server-wide
+       Add <filename>contrib/pg_stat_statements</filename> for server-wide
        tracking of statement execution statistics (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add duration and query mode options to <filename>contrib/pgbench</>
+       Add duration and query mode options to <filename>contrib/pgbench</filename>
        (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <filename>contrib/pgbench</> use table names
-       <structname>pgbench_accounts</>, <structname>pgbench_branches</>,
-       <structname>pgbench_history</>, and <structname>pgbench_tellers</>,
-       rather than just <structname>accounts</>, <structname>branches</>,
-       <structname>history</>, and <structname>tellers</> (Tom)
+       Make <filename>contrib/pgbench</filename> use table names
+       <structname>pgbench_accounts</structname>, <structname>pgbench_branches</structname>,
+       <structname>pgbench_history</structname>, and <structname>pgbench_tellers</structname>,
+       rather than just <structname>accounts</structname>, <structname>branches</structname>,
+       <structname>history</structname>, and <structname>tellers</structname> (Tom)
       </para>
 
       <para>
        This is to reduce the risk of accidentally destroying real data
-       by running <application>pgbench</>.
+       by running <application>pgbench</application>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <filename>contrib/pgstattuple</> to handle tables and
+       Fix <filename>contrib/pgstattuple</filename> to handle tables and
        indexes with over 2 billion pages (Tatsuhito Kasahara)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       In <filename>contrib/fuzzystrmatch</>, add a version of the
+       In <filename>contrib/fuzzystrmatch</filename>, add a version of the
        Levenshtein string-distance function that allows the user to
        specify the costs of insertion, deletion, and substitution
        (Volkan Yazici)
@@ -9979,28 +9979,28 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Make <filename>contrib/ltree</> support multibyte encodings
+       Make <filename>contrib/ltree</filename> support multibyte encodings
        (laser)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Enable <filename>contrib/dblink</> to use connection information
+       Enable <filename>contrib/dblink</filename> to use connection information
        stored in the SQL/MED catalogs (Joe Conway)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve <filename>contrib/dblink</>'s reporting of errors from
+       Improve <filename>contrib/dblink</filename>'s reporting of errors from
        the remote server (Joe Conway)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <filename>contrib/dblink</> set <varname>client_encoding</>
+       Make <filename>contrib/dblink</filename> set <varname>client_encoding</varname>
        to match the local database's encoding (Joe Conway)
       </para>
 
@@ -10012,9 +10012,9 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Make sure <filename>contrib/dblink</> uses a password supplied
+       Make sure <filename>contrib/dblink</filename> uses a password supplied
        by the user, and not accidentally taken from the server's
-       <filename>.pgpass</> file (Joe Conway)
+       <filename>.pgpass</filename> file (Joe Conway)
       </para>
 
       <para>
@@ -10024,51 +10024,51 @@ WITH w AS (SELECT * FROM foo) SELECT * FROM w, bar ... FOR UPDATE
 
      <listitem>
       <para>
-       Add <function>fsm_page_contents()</>
-       to <filename>contrib/pageinspect</> (Heikki)
+       Add <function>fsm_page_contents()</function>
+       to <filename>contrib/pageinspect</filename> (Heikki)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Modify <function>get_raw_page()</> to support free space map
-       (<filename>*_fsm</>) files.  Also update
-       <filename>contrib/pg_freespacemap</>.
+       Modify <function>get_raw_page()</function> to support free space map
+       (<filename>*_fsm</filename>) files.  Also update
+       <filename>contrib/pg_freespacemap</filename>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for multibyte encodings to <filename>contrib/pg_trgm</>
+       Add support for multibyte encodings to <filename>contrib/pg_trgm</filename>
        (Teodor)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Rewrite <filename>contrib/intagg</> to use new
-       functions <function>array_agg()</> and <function>unnest()</>
+       Rewrite <filename>contrib/intagg</filename> to use new
+       functions <function>array_agg()</function> and <function>unnest()</function>
        (Tom)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <filename>contrib/pg_standby</> recover all available WAL before
+       Make <filename>contrib/pg_standby</filename> recover all available WAL before
        failover (Fujii Masao, Simon, Heikki)
       </para>
 
       <para>
        To make this work safely, you now need to set the new
-       <literal>recovery_end_command</> option in <filename>recovery.conf</>
-       to clean up the trigger file after failover. <application>pg_standby</>
+       <literal>recovery_end_command</literal> option in <filename>recovery.conf</filename>
+       to clean up the trigger file after failover. <application>pg_standby</application>
        will no longer remove the trigger file itself.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <filename>contrib/pg_standby</>'s <option>-l</> option is now a no-op,
+       <filename>contrib/pg_standby</filename>'s <option>-l</option> option is now a no-op,
        because it is unsafe to use a symlink (Simon)
       </para>
      </listitem>
diff --git a/doc/src/sgml/release-9.0.sgml b/doc/src/sgml/release-9.0.sgml
index e7d2ffddaf..9e90f5a7f3 100644
--- a/doc/src/sgml/release-9.0.sgml
+++ b/doc/src/sgml/release-9.0.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 9.0.22.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 9.0.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -30,7 +30,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.18,
-    see <xref linkend="release-9-0-18">.
+    see <xref linkend="release-9-0-18"/>.
    </para>
 
   </sect2>
@@ -42,8 +42,8 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -69,13 +69,13 @@
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -93,7 +93,7 @@
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -108,13 +108,13 @@
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -126,14 +126,14 @@
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -141,21 +141,21 @@
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -168,7 +168,7 @@
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -212,22 +212,22 @@
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -240,9 +240,9 @@
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -263,12 +263,12 @@
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -288,7 +288,7 @@
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -321,30 +321,30 @@
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -352,61 +352,61 @@
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
 
      <para>
       When dumping functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -415,23 +415,23 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -439,14 +439,14 @@
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -458,38 +458,38 @@
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -509,11 +509,11 @@
   <para>
    This release contains a small number of fixes from 9.0.21.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.0.X release series in September 2015.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -527,7 +527,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.18,
-    see <xref linkend="release-9-0-18">.
+    see <xref linkend="release-9-0-18"/>.
    </para>
 
   </sect2>
@@ -544,7 +544,7 @@
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -555,13 +555,13 @@
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -583,11 +583,11 @@
   <para>
    This release contains a small number of fixes from 9.0.20.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.0.X release series in September 2015.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -601,7 +601,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.18,
-    see <xref linkend="release-9-0-18">.
+    see <xref linkend="release-9-0-18"/>.
    </para>
 
   </sect2>
@@ -613,12 +613,12 @@
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -632,29 +632,29 @@
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -677,11 +677,11 @@
   <para>
    This release contains a variety of fixes from 9.0.19.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.0.X release series in September 2015.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -695,7 +695,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.18,
-    see <xref linkend="release-9-0-18">.
+    see <xref linkend="release-9-0-18"/>.
    </para>
 
   </sect2>
@@ -727,7 +727,7 @@
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -737,7 +737,7 @@
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -747,15 +747,15 @@
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -786,7 +786,7 @@
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -814,7 +814,7 @@
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -822,7 +822,7 @@
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -836,14 +836,14 @@
 
     <listitem>
      <para>
-      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</quote> error
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -863,13 +863,13 @@
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
@@ -910,9 +910,9 @@
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
@@ -925,20 +925,20 @@
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -951,7 +951,7 @@
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
@@ -960,14 +960,14 @@
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -976,25 +976,25 @@
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -1007,37 +1007,37 @@
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -1049,7 +1049,7 @@
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -1057,28 +1057,28 @@
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -1086,7 +1086,7 @@
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -1098,7 +1098,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -1121,7 +1121,7 @@
   <para>
    This release contains a variety of fixes from 9.0.18.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -1133,7 +1133,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.18,
-    see <xref linkend="release-9-0-18">.
+    see <xref linkend="release-9-0-18"/>.
    </para>
 
   </sect2>
@@ -1145,15 +1145,15 @@
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -1163,27 +1163,27 @@
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -1191,12 +1191,12 @@
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -1237,7 +1237,7 @@
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -1263,21 +1263,21 @@
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -1289,22 +1289,22 @@
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -1312,12 +1312,12 @@
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -1327,7 +1327,7 @@
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -1339,7 +1339,7 @@
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -1352,19 +1352,19 @@
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -1384,7 +1384,7 @@
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -1415,14 +1415,14 @@
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -1431,7 +1431,7 @@
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -1444,8 +1444,8 @@
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -1471,7 +1471,7 @@
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -1491,19 +1491,19 @@
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -1511,14 +1511,14 @@
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -1527,7 +1527,7 @@
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -1541,32 +1541,32 @@
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -1574,14 +1574,14 @@
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -1589,32 +1589,32 @@
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -1624,7 +1624,7 @@
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -1632,17 +1632,17 @@
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -1650,9 +1650,9 @@
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
@@ -1666,7 +1666,7 @@
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
@@ -1674,7 +1674,7 @@
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -1686,7 +1686,7 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -1695,24 +1695,24 @@
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -1739,29 +1739,29 @@
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -1773,15 +1773,15 @@
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -1793,9 +1793,9 @@
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -1804,21 +1804,21 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -1847,7 +1847,7 @@
   <para>
    This release contains a variety of fixes from 9.0.17.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -1865,7 +1865,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.0.15,
-    see <xref linkend="release-9-0-15">.
+    see <xref linkend="release-9-0-15"/>.
    </para>
 
   </sect2>
@@ -1877,15 +1877,15 @@
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -1917,7 +1917,7 @@
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -1944,13 +1944,13 @@
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -1965,7 +1965,7 @@
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -1978,7 +1978,7 @@
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -1991,19 +1991,19 @@
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -2011,7 +2011,7 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -2023,7 +2023,7 @@
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
@@ -2031,7 +2031,7 @@
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -2040,16 +2040,16 @@
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -2069,7 +2069,7 @@
     <listitem>
      <para>
       On Windows, allow new sessions to absorb values of PGC_BACKEND
-      parameters (such as <xref linkend="guc-log-connections">) from the
+      parameters (such as <xref linkend="guc-log-connections"/>) from the
       configuration file (Amit Kapila)
      </para>
 
@@ -2085,15 +2085,15 @@
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -2104,17 +2104,17 @@
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -2122,15 +2122,15 @@
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -2138,20 +2138,20 @@
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -2159,20 +2159,20 @@
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -2193,7 +2193,7 @@
   <para>
    This release contains a variety of fixes from 9.0.16.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -2205,7 +2205,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.15,
-    see <xref linkend="release-9-0-15">.
+    see <xref linkend="release-9-0-15"/>.
    </para>
 
   </sect2>
@@ -2232,7 +2232,7 @@
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -2256,7 +2256,7 @@
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -2269,17 +2269,17 @@
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -2305,26 +2305,26 @@
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -2346,7 +2346,7 @@
   <para>
    This release contains a variety of fixes from 9.0.15.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -2358,7 +2358,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.15,
-    see <xref linkend="release-9-0-15">.
+    see <xref linkend="release-9-0-15"/>.
    </para>
 
   </sect2>
@@ -2370,19 +2370,19 @@
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -2395,7 +2395,7 @@
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -2415,7 +2415,7 @@
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -2429,12 +2429,12 @@
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -2461,7 +2461,7 @@
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -2473,35 +2473,35 @@
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -2516,7 +2516,7 @@
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -2536,20 +2536,20 @@
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -2572,25 +2572,25 @@
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -2614,7 +2614,7 @@
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -2634,26 +2634,26 @@
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -2661,21 +2661,21 @@
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -2700,12 +2700,12 @@
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -2713,51 +2713,51 @@
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -2768,7 +2768,7 @@
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
@@ -2782,28 +2782,28 @@
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -2812,20 +2812,20 @@
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -2847,7 +2847,7 @@
   <para>
    This release contains a variety of fixes from 9.0.14.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -2865,7 +2865,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.0.13,
-    see <xref linkend="release-9-0-13">.
+    see <xref linkend="release-9-0-13"/>.
    </para>
 
   </sect2>
@@ -2877,13 +2877,13 @@
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
@@ -2895,18 +2895,18 @@
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -2932,7 +2932,7 @@
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -2954,8 +2954,8 @@
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -2972,7 +2972,7 @@
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
@@ -2990,13 +2990,13 @@
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
@@ -3010,7 +3010,7 @@
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -3024,7 +3024,7 @@
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -3035,10 +3035,10 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -3048,21 +3048,21 @@
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -3085,7 +3085,7 @@
   <para>
    This release contains a variety of fixes from 9.0.13.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -3097,7 +3097,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.13,
-    see <xref linkend="release-9-0-13">.
+    see <xref linkend="release-9-0-13"/>.
    </para>
 
   </sect2>
@@ -3114,7 +3114,7 @@
      </para>
 
      <para>
-      <productname>PostgreSQL</> case-folds non-ASCII characters only
+      <productname>PostgreSQL</productname> case-folds non-ASCII characters only
       when using a single-byte server encoding.
      </para>
     </listitem>
@@ -3122,7 +3122,7 @@
     <listitem>
      <para>
       Fix checkpoint memory leak in background writer when <literal>wal_level =
-      hot_standby</> (Naoya Anzai)
+      hot_standby</literal> (Naoya Anzai)
      </para>
     </listitem>
 
@@ -3135,7 +3135,7 @@
 
     <listitem>
      <para>
-      Fix memory overcommit bug when <varname>work_mem</> is using more
+      Fix memory overcommit bug when <varname>work_mem</varname> is using more
       than 24GB of memory (Stephen Frost)
      </para>
     </listitem>
@@ -3160,29 +3160,29 @@
      </para>
 
      <para>
-      Previously tests like <literal>col IS NOT TRUE</> and <literal>col IS
-      NOT FALSE</> did not properly factor in NULL values when estimating
+      Previously tests like <literal>col IS NOT TRUE</literal> and <literal>col IS
+      NOT FALSE</literal> did not properly factor in NULL values when estimating
       plan costs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent pushing down <literal>WHERE</> clauses into unsafe
-      <literal>UNION/INTERSECT</> subqueries (Tom Lane)
+      Prevent pushing down <literal>WHERE</literal> clauses into unsafe
+      <literal>UNION/INTERSECT</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Subqueries of a <literal>UNION</> or <literal>INTERSECT</> that
+      Subqueries of a <literal>UNION</literal> or <literal>INTERSECT</literal> that
       contain set-returning functions or volatile functions in their
-      <literal>SELECT</> lists could be improperly optimized, leading to
+      <literal>SELECT</literal> lists could be improperly optimized, leading to
       run-time errors or incorrect query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare case of <quote>failed to locate grouping columns</>
+      Fix rare case of <quote>failed to locate grouping columns</quote>
       planner failure (Tom Lane)
      </para>
     </listitem>
@@ -3196,37 +3196,37 @@
 
     <listitem>
      <para>
-      Properly record index comments created using <literal>UNIQUE</>
-      and <literal>PRIMARY KEY</> syntax (Andres Freund)
+      Properly record index comments created using <literal>UNIQUE</literal>
+      and <literal>PRIMARY KEY</literal> syntax (Andres Freund)
      </para>
 
      <para>
-      This fixes a parallel <application>pg_restore</> failure.
+      This fixes a parallel <application>pg_restore</application> failure.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REINDEX TABLE</> and <command>REINDEX DATABASE</>
+      Fix <command>REINDEX TABLE</command> and <command>REINDEX DATABASE</command>
       to properly revalidate constraints and mark invalidated indexes as
       valid (Noah Misch)
      </para>
 
      <para>
-      <command>REINDEX INDEX</> has always worked properly.
+      <command>REINDEX INDEX</command> has always worked properly.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix possible deadlock during concurrent <command>CREATE INDEX
-      CONCURRENTLY</> operations (Tom Lane)
+      CONCURRENTLY</command> operations (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>regexp_matches()</> handling of zero-length matches
+      Fix <function>regexp_matches()</function> handling of zero-length matches
       (Jeevan Chalke)
      </para>
 
@@ -3250,14 +3250,14 @@
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>ALTER DEFAULT PRIVILEGES</> to operate on schemas
+      Allow <command>ALTER DEFAULT PRIVILEGES</command> to operate on schemas
       without requiring CREATE permission (Tom Lane)
      </para>
     </listitem>
@@ -3269,16 +3269,16 @@
 
      <para>
       Specifically, lessen keyword restrictions for role names, language
-      names, <command>EXPLAIN</> and <command>COPY</> options, and
-      <command>SET</> values.  This allows <literal>COPY ... (FORMAT
-      BINARY)</> to work as expected; previously <literal>BINARY</> needed
+      names, <command>EXPLAIN</command> and <command>COPY</command> options, and
+      <command>SET</command> values.  This allows <literal>COPY ... (FORMAT
+      BINARY)</literal> to work as expected; previously <literal>BINARY</literal> needed
       to be quoted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgp_pub_decrypt()</> so it works for secret keys with
+      Fix <function>pgp_pub_decrypt()</function> so it works for secret keys with
       passwords (Marko Kreen)
      </para>
     </listitem>
@@ -3292,7 +3292,7 @@
 
     <listitem>
      <para>
-      Ensure that <command>VACUUM ANALYZE</> still runs the ANALYZE phase
+      Ensure that <command>VACUUM ANALYZE</command> still runs the ANALYZE phase
       if its attempt to truncate the file is cancelled due to lock conflicts
       (Kevin Grittner)
      </para>
@@ -3308,14 +3308,14 @@
     <listitem>
      <para>
       Ensure that floating-point data input accepts standard spellings
-      of <quote>infinity</> on all platforms (Tom Lane)
+      of <quote>infinity</quote> on all platforms (Tom Lane)
      </para>
 
      <para>
-      The C99 standard says that allowable spellings are <literal>inf</>,
-      <literal>+inf</>, <literal>-inf</>, <literal>infinity</>,
-      <literal>+infinity</>, and <literal>-infinity</>.  Make sure we
-      recognize these even if the platform's <function>strtod</> function
+      The C99 standard says that allowable spellings are <literal>inf</literal>,
+      <literal>+inf</literal>, <literal>-inf</literal>, <literal>infinity</literal>,
+      <literal>+infinity</literal>, and <literal>-infinity</literal>.  Make sure we
+      recognize these even if the platform's <function>strtod</function> function
       doesn't.
      </para>
     </listitem>
@@ -3329,7 +3329,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013d
+      Update time zone data files to <application>tzdata</application> release 2013d
       for DST law changes in Israel, Morocco, Palestine, and Paraguay.
       Also, historical zone data corrections for Macquarie Island.
      </para>
@@ -3351,7 +3351,7 @@
   <para>
    This release contains a variety of fixes from 9.0.12.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -3364,13 +3364,13 @@
    <para>
     However, this release corrects several errors in management of GiST
     indexes.  After installing this update, it is advisable to
-    <command>REINDEX</> any GiST indexes that meet one or more of the
+    <command>REINDEX</command> any GiST indexes that meet one or more of the
     conditions described below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -3388,7 +3388,7 @@
 
      <para>
       A connection request containing a database name that begins with
-      <quote><literal>-</></quote> could be crafted to damage or destroy
+      <quote><literal>-</literal></quote> could be crafted to damage or destroy
       files within the server's data directory, even if the request is
       eventually rejected.  (CVE-2013-1899)
      </para>
@@ -3402,41 +3402,41 @@
 
      <para>
       This avoids a scenario wherein random numbers generated by
-      <filename>contrib/pgcrypto</> functions might be relatively easy for
+      <filename>contrib/pgcrypto</filename> functions might be relatively easy for
       another database user to guess.  The risk is only significant when
-      the postmaster is configured with <varname>ssl</> = <literal>on</>
+      the postmaster is configured with <varname>ssl</varname> = <literal>on</literal>
       but most connections don't use SSL encryption.  (CVE-2013-1900)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix GiST indexes to not use <quote>fuzzy</> geometric comparisons when
+      Fix GiST indexes to not use <quote>fuzzy</quote> geometric comparisons when
       it's not appropriate to do so (Alexander Korotkov)
      </para>
 
      <para>
-      The core geometric types perform comparisons using <quote>fuzzy</>
-      equality, but <function>gist_box_same</> must do exact comparisons,
+      The core geometric types perform comparisons using <quote>fuzzy</quote>
+      equality, but <function>gist_box_same</function> must do exact comparisons,
       else GiST indexes using it might become inconsistent.  After installing
-      this update, users should <command>REINDEX</> any GiST indexes on
-      <type>box</>, <type>polygon</>, <type>circle</>, or <type>point</>
-      columns, since all of these use <function>gist_box_same</>.
+      this update, users should <command>REINDEX</command> any GiST indexes on
+      <type>box</type>, <type>polygon</type>, <type>circle</type>, or <type>point</type>
+      columns, since all of these use <function>gist_box_same</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous range-union and penalty logic in GiST indexes that use
-      <filename>contrib/btree_gist</> for variable-width data types, that is
-      <type>text</>, <type>bytea</>, <type>bit</>, and <type>numeric</>
+      <filename>contrib/btree_gist</filename> for variable-width data types, that is
+      <type>text</type>, <type>bytea</type>, <type>bit</type>, and <type>numeric</type>
       columns (Tom Lane)
      </para>
 
      <para>
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in useless
-      index bloat.  Users are advised to <command>REINDEX</> such indexes
+      index bloat.  Users are advised to <command>REINDEX</command> such indexes
       after installing this update.
      </para>
     </listitem>
@@ -3451,21 +3451,21 @@
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in indexes
       that are unnecessarily inefficient to search.  Users are advised to
-      <command>REINDEX</> multi-column GiST indexes after installing this
+      <command>REINDEX</command> multi-column GiST indexes after installing this
       update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>gist_point_consistent</>
+      Fix <function>gist_point_consistent</function>
       to handle fuzziness consistently (Alexander Korotkov)
      </para>
 
      <para>
-      Index scans on GiST indexes on <type>point</> columns would sometimes
+      Index scans on GiST indexes on <type>point</type> columns would sometimes
       yield results different from a sequential scan, because
-      <function>gist_point_consistent</> disagreed with the underlying
+      <function>gist_point_consistent</function> disagreed with the underlying
       operator code about whether to do comparisons exactly or fuzzily.
      </para>
     </listitem>
@@ -3476,21 +3476,21 @@
      </para>
 
      <para>
-      This bug could result in <quote>incorrect local pin count</> errors
+      This bug could result in <quote>incorrect local pin count</quote> errors
       during replay, making recovery impossible.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix race condition in <command>DELETE RETURNING</> (Tom Lane)
+      Fix race condition in <command>DELETE RETURNING</command> (Tom Lane)
      </para>
 
      <para>
-      Under the right circumstances, <command>DELETE RETURNING</> could
+      Under the right circumstances, <command>DELETE RETURNING</command> could
       attempt to fetch data from a shared buffer that the current process
       no longer has any pin on.  If some other process changed the buffer
-      meanwhile, this would lead to garbage <literal>RETURNING</> output, or
+      meanwhile, this would lead to garbage <literal>RETURNING</literal> output, or
       even a crash.
      </para>
     </listitem>
@@ -3511,28 +3511,28 @@
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to use ASCII-only case-folding rules where
+      Fix <function>to_char()</function> to use ASCII-only case-folding rules where
       appropriate (Tom Lane)
      </para>
 
      <para>
       This fixes misbehavior of some template patterns that should be
-      locale-independent, but mishandled <quote><literal>I</></quote> and
-      <quote><literal>i</></quote> in Turkish locales.
+      locale-independent, but mishandled <quote><literal>I</literal></quote> and
+      <quote><literal>i</literal></quote> in Turkish locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</>
+      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix logic error when a single transaction does <command>UNLISTEN</>
-      then <command>LISTEN</> (Tom Lane)
+      Fix logic error when a single transaction does <command>UNLISTEN</command>
+      then <command>LISTEN</command> (Tom Lane)
      </para>
 
      <para>
@@ -3543,7 +3543,7 @@
 
     <listitem>
      <para>
-      Remove useless <quote>picksplit doesn't support secondary split</> log
+      Remove useless <quote>picksplit doesn't support secondary split</quote> log
       messages (Josh Hansen, Tom Lane)
      </para>
 
@@ -3564,29 +3564,29 @@
 
     <listitem>
      <para>
-      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</> function
+      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</function> function
       (Alex Hunsaker, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to handle database names containing
-      <quote><literal>=</></quote> correctly (Heikki Linnakangas)
+      Fix <application>pg_dumpall</application> to handle database names containing
+      <quote><literal>=</literal></quote> correctly (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <application>pg_dump</> when an incorrect connection
+      Avoid crash in <application>pg_dump</application> when an incorrect connection
       string is given (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore invalid indexes in <application>pg_dump</> and
-      <application>pg_upgrade</> (Michael Paquier, Bruce Momjian)
+      Ignore invalid indexes in <application>pg_dump</application> and
+      <application>pg_upgrade</application> (Michael Paquier, Bruce Momjian)
      </para>
 
      <para>
@@ -3595,26 +3595,26 @@
       a uniqueness condition not satisfied by the table's data.  Also, if the
       index creation is in fact still in progress, it seems reasonable to
       consider it to be an uncommitted DDL change, which
-      <application>pg_dump</> wouldn't be expected to dump anyway.
-      <application>pg_upgrade</> now also skips invalid indexes rather than
+      <application>pg_dump</application> wouldn't be expected to dump anyway.
+      <application>pg_upgrade</application> now also skips invalid indexes rather than
       failing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s <function>similarity()</> function
+      Fix <filename>contrib/pg_trgm</filename>'s <function>similarity()</function> function
       to return zero for trigram-less strings (Tom Lane)
      </para>
 
      <para>
-      Previously it returned <literal>NaN</> due to internal division by zero.
+      Previously it returned <literal>NaN</literal> due to internal division by zero.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013b
+      Update time zone data files to <application>tzdata</application> release 2013b
       for DST law changes in Chile, Haiti, Morocco, Paraguay, and some
       Russian areas.  Also, historical zone data corrections for numerous
       places.
@@ -3622,12 +3622,12 @@
 
      <para>
       Also, update the time zone abbreviation files for recent changes in
-      Russia and elsewhere: <literal>CHOT</>, <literal>GET</>,
-      <literal>IRKT</>, <literal>KGT</>, <literal>KRAT</>, <literal>MAGT</>,
-      <literal>MAWT</>, <literal>MSK</>, <literal>NOVT</>, <literal>OMST</>,
-      <literal>TKT</>, <literal>VLAT</>, <literal>WST</>, <literal>YAKT</>,
-      <literal>YEKT</> now follow their current meanings, and
-      <literal>VOLT</> (Europe/Volgograd) and <literal>MIST</>
+      Russia and elsewhere: <literal>CHOT</literal>, <literal>GET</literal>,
+      <literal>IRKT</literal>, <literal>KGT</literal>, <literal>KRAT</literal>, <literal>MAGT</literal>,
+      <literal>MAWT</literal>, <literal>MSK</literal>, <literal>NOVT</literal>, <literal>OMST</literal>,
+      <literal>TKT</literal>, <literal>VLAT</literal>, <literal>WST</literal>, <literal>YAKT</literal>,
+      <literal>YEKT</literal> now follow their current meanings, and
+      <literal>VOLT</literal> (Europe/Volgograd) and <literal>MIST</literal>
       (Antarctica/Macquarie) are added to the default abbreviations list.
      </para>
     </listitem>
@@ -3648,7 +3648,7 @@
   <para>
    This release contains a variety of fixes from 9.0.11.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -3660,7 +3660,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -3672,7 +3672,7 @@
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -3742,19 +3742,19 @@
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -3766,13 +3766,13 @@
     <listitem>
      <para>
       Fix error in <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       implementation (Andres Freund)
      </para>
 
      <para>
       In installations that have existed for more than <link
-      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</></link>
+      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</varname></link>
       transactions, this mistake prevented autovacuum from using partial-table
       scans, so that a full-table scan would always happen instead.
      </para>
@@ -3780,13 +3780,13 @@
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -3799,7 +3799,7 @@
 
     <listitem>
      <para>
-      Reject out-of-range dates in <function>to_date()</> (Hitoshi Harada)
+      Reject out-of-range dates in <function>to_date()</function> (Hitoshi Harada)
      </para>
     </listitem>
 
@@ -3810,55 +3810,55 @@
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to deal with invalid indexes safely
+      Fix <application>pg_upgrade</application> to deal with invalid indexes safely
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> use translated messages properly
+      Make <application>ecpglib</application> use translated messages properly
       (Chen Huajun)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly install <application>ecpg_compat</> and
-      <application>pgtypes</> libraries on MSVC (Jiang Guiqing)
+      Properly install <application>ecpg_compat</application> and
+      <application>pgtypes</application> libraries on MSVC (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Include our version of <function>isinf()</> in
-      <application>libecpg</> if it's not provided by the system
+      Include our version of <function>isinf()</function> in
+      <application>libecpg</application> if it's not provided by the system
       (Jiang Guiqing)
      </para>
     </listitem>
@@ -3878,15 +3878,15 @@
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -3910,7 +3910,7 @@
   <para>
    This release contains a variety of fixes from 9.0.10.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -3922,7 +3922,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -3935,13 +3935,13 @@
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane)
      </para>
 
      <para>
-      Fix <command>CREATE INDEX CONCURRENTLY</> to use
+      Fix <command>CREATE INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       resulting in corrupt concurrently-created indexes.
      </para>
@@ -3949,8 +3949,8 @@
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
@@ -3987,13 +3987,13 @@
 
      <para>
       This oversight could prevent subsequent execution of certain
-      operations such as <command>CREATE INDEX CONCURRENTLY</>.
+      operations such as <command>CREATE INDEX CONCURRENTLY</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid bogus <quote>out-of-sequence timeline ID</> errors in standby
+      Avoid bogus <quote>out-of-sequence timeline ID</quote> errors in standby
       mode (Heikki Linnakangas)
      </para>
     </listitem>
@@ -4026,8 +4026,8 @@
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
      </para>
     </listitem>
 
@@ -4045,10 +4045,10 @@
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -4056,7 +4056,7 @@
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
@@ -4069,7 +4069,7 @@
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to handle inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to handle inherited check
       constraints properly (Pavan Deolasee)
      </para>
 
@@ -4081,14 +4081,14 @@
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -4102,7 +4102,7 @@
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -4110,7 +4110,7 @@
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -4132,14 +4132,14 @@
     <listitem>
      <para>
       Fix failure to advance XID epoch if XID wraparound happens during a
-      checkpoint and <varname>wal_level</> is <literal>hot_standby</>
+      checkpoint and <varname>wal_level</varname> is <literal>hot_standby</literal>
       (Tom Lane, Andres Freund)
      </para>
 
      <para>
       While this mistake had no particular impact on
       <productname>PostgreSQL</productname> itself, it was bad for
-      applications that rely on <function>txid_current()</> and related
+      applications that rely on <function>txid_current()</function> and related
       functions: the TXID value would appear to go backwards.
      </para>
     </listitem>
@@ -4153,7 +4153,7 @@
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -4166,8 +4166,8 @@
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -4177,33 +4177,33 @@
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -4214,48 +4214,48 @@
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s <function>ecpg_get_data</> function to
+      Fix <application>ecpg</application>'s <function>ecpg_get_data</function> function to
       handle arrays properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -4266,7 +4266,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -4288,7 +4288,7 @@
   <para>
    This release contains a variety of fixes from 9.0.9.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -4300,7 +4300,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -4318,7 +4318,7 @@
 
      <para>
       These errors could result in wrong answers from queries that scan the
-      same <literal>WITH</> subquery multiple times.
+      same <literal>WITH</literal> subquery multiple times.
      </para>
     </listitem>
 
@@ -4341,10 +4341,10 @@
      </para>
 
      <para>
-      If we revoke a grant option from some role <replaceable>X</>, but
-      <replaceable>X</> still holds that option via a grant from someone
+      If we revoke a grant option from some role <replaceable>X</replaceable>, but
+      <replaceable>X</replaceable> still holds that option via a grant from someone
       else, we should not recursively revoke the corresponding privilege
-      from role(s) <replaceable>Y</> that <replaceable>X</> had granted it
+      from role(s) <replaceable>Y</replaceable> that <replaceable>X</replaceable> had granted it
       to.
      </para>
     </listitem>
@@ -4358,12 +4358,12 @@
 
     <listitem>
      <para>
-      Fix handling of <literal>SIGFPE</> when PL/Perl is in use (Andres Freund)
+      Fix handling of <literal>SIGFPE</literal> when PL/Perl is in use (Andres Freund)
      </para>
 
      <para>
-      Perl resets the process's <literal>SIGFPE</> handler to
-      <literal>SIG_IGN</>, which could result in crashes later on.  Restore
+      Perl resets the process's <literal>SIGFPE</literal> handler to
+      <literal>SIG_IGN</literal>, which could result in crashes later on.  Restore
       the normal Postgres signal handler after initializing PL/Perl.
      </para>
     </listitem>
@@ -4382,7 +4382,7 @@
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -4390,26 +4390,26 @@
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s handling of line endings on Windows
+      Fix <application>pg_upgrade</application>'s handling of line endings on Windows
       (Andrew Dunstan)
      </para>
 
      <para>
-      Previously, <application>pg_upgrade</> might add or remove carriage
+      Previously, <application>pg_upgrade</application> might add or remove carriage
       returns in places such as function bodies.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On Windows, make <application>pg_upgrade</> use backslash path
+      On Windows, make <application>pg_upgrade</application> use backslash path
       separators in the scripts it emits (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -4430,7 +4430,7 @@
   <para>
    This release contains a variety of fixes from 9.0.8.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -4442,7 +4442,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -4459,7 +4459,7 @@
      </para>
 
      <para>
-      <function>xml_parse()</> would attempt to fetch external files or
+      <function>xml_parse()</function> would attempt to fetch external files or
       URLs as needed to resolve DTD and entity references in an XML value,
       thus allowing unprivileged database users to attempt to fetch data
       with the privileges of the database server.  While the external data
@@ -4472,22 +4472,22 @@
 
     <listitem>
      <para>
-      Prevent access to external files/URLs via <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Peter Eisentraut)
+      Prevent access to external files/URLs via <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Peter Eisentraut)
      </para>
 
      <para>
-      <application>libxslt</> offers the ability to read and write both
+      <application>libxslt</application> offers the ability to read and write both
       files and URLs through stylesheet commands, thus allowing
       unprivileged database users to both read and write data with the
       privileges of the database server.  Disable that through proper use
-      of <application>libxslt</>'s security options.  (CVE-2012-3488)
+      of <application>libxslt</application>'s security options.  (CVE-2012-3488)
      </para>
 
      <para>
-      Also, remove <function>xslt_process()</>'s ability to fetch documents
+      Also, remove <function>xslt_process()</function>'s ability to fetch documents
       and stylesheets from external files/URLs.  While this was a
-      documented <quote>feature</>, it was long regarded as a bad idea.
+      documented <quote>feature</quote>, it was long regarded as a bad idea.
       The fix for CVE-2012-3489 broke that capability, and rather than
       expend effort on trying to fix it, we're just going to summarily
       remove it.
@@ -4515,21 +4515,21 @@
      </para>
 
      <para>
-      If <command>ALTER SEQUENCE</> was executed on a freshly created or
-      reset sequence, and then precisely one <function>nextval()</> call
+      If <command>ALTER SEQUENCE</command> was executed on a freshly created or
+      reset sequence, and then precisely one <function>nextval()</function> call
       was made on it, and then the server crashed, WAL replay would restore
       the sequence to a state in which it appeared that no
-      <function>nextval()</> had been done, thus allowing the first
+      <function>nextval()</function> had been done, thus allowing the first
       sequence value to be returned again by the next
-      <function>nextval()</> call.  In particular this could manifest for
-      <type>serial</> columns, since creation of a serial column's sequence
-      includes an <command>ALTER SEQUENCE OWNED BY</> step.
+      <function>nextval()</function> call.  In particular this could manifest for
+      <type>serial</type> columns, since creation of a serial column's sequence
+      includes an <command>ALTER SEQUENCE OWNED BY</command> step.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>txid_current()</> to report the correct epoch when not
+      Fix <function>txid_current()</function> to report the correct epoch when not
       in hot standby (Heikki Linnakangas)
      </para>
 
@@ -4546,14 +4546,14 @@
 
      <para>
       This mistake led to failures reported as <quote>out-of-order XID
-      insertion in KnownAssignedXids</>.
+      insertion in KnownAssignedXids</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure the <filename>backup_label</> file is fsync'd after
-      <function>pg_start_backup()</> (Dave Kerr)
+      Ensure the <filename>backup_label</filename> file is fsync'd after
+      <function>pg_start_backup()</function> (Dave Kerr)
      </para>
     </listitem>
 
@@ -4564,7 +4564,7 @@
 
      <para>
       WAL sender background processes neglected to establish a
-      <systemitem>SIGALRM</> handler, meaning they would wait forever in
+      <systemitem>SIGALRM</systemitem> handler, meaning they would wait forever in
       some corner cases where a timeout ought to happen.
      </para>
     </listitem>
@@ -4583,15 +4583,15 @@
 
     <listitem>
      <para>
-      Fix <literal>LISTEN</>/<literal>NOTIFY</> to cope better with I/O
+      Fix <literal>LISTEN</literal>/<literal>NOTIFY</literal> to cope better with I/O
       problems, such as out of disk space (Tom Lane)
      </para>
 
      <para>
       After a write failure, all subsequent attempts to send more
-      <literal>NOTIFY</> messages would fail with messages like
-      <quote>Could not read from file "pg_notify/<replaceable>nnnn</>" at
-      offset <replaceable>nnnnn</>: Success</quote>.
+      <literal>NOTIFY</literal> messages would fail with messages like
+      <quote>Could not read from file "pg_notify/<replaceable>nnnn</replaceable>" at
+      offset <replaceable>nnnnn</replaceable>: Success</quote>.
      </para>
     </listitem>
 
@@ -4604,7 +4604,7 @@
      <para>
       The original coding could allow inconsistent behavior in some cases;
       in particular, an autovacuum could get canceled after less than
-      <literal>deadlock_timeout</> grace period.
+      <literal>deadlock_timeout</literal> grace period.
      </para>
     </listitem>
 
@@ -4616,15 +4616,15 @@
 
     <listitem>
      <para>
-      Fix log collector so that <literal>log_truncate_on_rotation</> works
+      Fix log collector so that <literal>log_truncate_on_rotation</literal> works
       during the very first log rotation after server start (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>WITH</> attached to a nested set operation
-      (<literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</>)
+      Fix <literal>WITH</literal> attached to a nested set operation
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
       (Tom Lane)
      </para>
     </listitem>
@@ -4632,24 +4632,24 @@
     <listitem>
      <para>
       Ensure that a whole-row reference to a subquery doesn't include any
-      extra <literal>GROUP BY</> or <literal>ORDER BY</> columns (Tom Lane)
+      extra <literal>GROUP BY</literal> or <literal>ORDER BY</literal> columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow copying whole-row references in <literal>CHECK</>
-      constraints and index definitions during <command>CREATE TABLE</>
+      Disallow copying whole-row references in <literal>CHECK</literal>
+      constraints and index definitions during <command>CREATE TABLE</command>
       (Tom Lane)
      </para>
 
      <para>
-      This situation can arise in <command>CREATE TABLE</> with
-      <literal>LIKE</> or <literal>INHERITS</>.  The copied whole-row
+      This situation can arise in <command>CREATE TABLE</command> with
+      <literal>LIKE</literal> or <literal>INHERITS</literal>.  The copied whole-row
       variable was incorrectly labeled with the row type of the original
       table not the new one.  Rejecting the case seems reasonable for
-      <literal>LIKE</>, since the row types might well diverge later.  For
-      <literal>INHERITS</> we should ideally allow it, with an implicit
+      <literal>LIKE</literal>, since the row types might well diverge later.  For
+      <literal>INHERITS</literal> we should ideally allow it, with an implicit
       coercion to the parent table's row type; but that will require more
       work than seems safe to back-patch.
      </para>
@@ -4657,7 +4657,7 @@
 
     <listitem>
      <para>
-      Fix memory leak in <literal>ARRAY(SELECT ...)</> subqueries (Heikki
+      Fix memory leak in <literal>ARRAY(SELECT ...)</literal> subqueries (Heikki
       Linnakangas, Tom Lane)
      </para>
     </listitem>
@@ -4669,7 +4669,7 @@
 
      <para>
       The code could get confused by quantified parenthesized
-      subexpressions, such as <literal>^(foo)?bar</>.  This would lead to
+      subexpressions, such as <literal>^(foo)?bar</literal>.  This would lead to
       incorrect index optimization of searches for such patterns.
      </para>
     </listitem>
@@ -4677,9 +4677,9 @@
     <listitem>
      <para>
       Fix bugs with parsing signed
-      <replaceable>hh</><literal>:</><replaceable>mm</> and
-      <replaceable>hh</><literal>:</><replaceable>mm</><literal>:</><replaceable>ss</>
-      fields in <type>interval</> constants (Amit Kapila, Tom Lane)
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable> and
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable><literal>:</literal><replaceable>ss</replaceable>
+      fields in <type>interval</type> constants (Amit Kapila, Tom Lane)
      </para>
     </listitem>
 
@@ -4708,14 +4708,14 @@
 
     <listitem>
      <para>
-      Report errors properly in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Tom Lane)
+      Report errors properly in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012e
+      Update time zone data files to <application>tzdata</application> release 2012e
       for DST law changes in Morocco and Tokelau
      </para>
     </listitem>
@@ -4736,7 +4736,7 @@
   <para>
    This release contains a variety of fixes from 9.0.7.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -4748,7 +4748,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -4761,12 +4761,12 @@
     <listitem>
      <para>
       Fix incorrect password transformation in
-      <filename>contrib/pgcrypto</>'s DES <function>crypt()</> function
+      <filename>contrib/pgcrypto</filename>'s DES <function>crypt()</function> function
       (Solar Designer)
      </para>
 
      <para>
-      If a password string contained the byte value <literal>0x80</>, the
+      If a password string contained the byte value <literal>0x80</literal>, the
       remainder of the password was ignored, causing the password to be much
       weaker than it appeared.  With this fix, the rest of the string is
       properly included in the DES hash.  Any stored password values that are
@@ -4777,7 +4777,7 @@
 
     <listitem>
      <para>
-      Ignore <literal>SECURITY DEFINER</> and <literal>SET</> attributes for
+      Ignore <literal>SECURITY DEFINER</literal> and <literal>SET</literal> attributes for
       a procedural language's call handler (Tom Lane)
      </para>
 
@@ -4789,7 +4789,7 @@
 
     <listitem>
      <para>
-      Allow numeric timezone offsets in <type>timestamp</> input to be up to
+      Allow numeric timezone offsets in <type>timestamp</type> input to be up to
       16 hours away from UTC (Tom Lane)
      </para>
 
@@ -4815,7 +4815,7 @@
 
     <listitem>
      <para>
-      Fix <type>text</> to <type>name</> and <type>char</> to <type>name</>
+      Fix <type>text</type> to <type>name</type> and <type>char</type> to <type>name</type>
       casts to perform string truncation correctly in multibyte encodings
       (Karl Schnaitter)
      </para>
@@ -4823,13 +4823,13 @@
 
     <listitem>
      <para>
-      Fix memory copying bug in <function>to_tsquery()</> (Heikki Linnakangas)
+      Fix memory copying bug in <function>to_tsquery()</function> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>txid_current()</> reports the correct epoch when
+      Ensure <function>txid_current()</function> reports the correct epoch when
       executed in hot standby (Simon Riggs)
      </para>
     </listitem>
@@ -4844,7 +4844,7 @@
       This bug concerns sub-SELECTs that reference variables coming from the
       nullable side of an outer join of the surrounding query.
       In 9.1, queries affected by this bug would fail with <quote>ERROR:
-      Upper-level PlaceHolderVar found where not expected</>.  But in 9.0 and
+      Upper-level PlaceHolderVar found where not expected</quote>.  But in 9.0 and
       8.4, you'd silently get possibly-wrong answers, since the value
       transmitted into the subquery wouldn't go to null when it should.
      </para>
@@ -4852,13 +4852,13 @@
 
     <listitem>
      <para>
-      Fix slow session startup when <structname>pg_attribute</> is very large
+      Fix slow session startup when <structname>pg_attribute</structname> is very large
       (Tom Lane)
      </para>
 
      <para>
-      If <structname>pg_attribute</> exceeds one-fourth of
-      <varname>shared_buffers</>, cache rebuilding code that is sometimes
+      If <structname>pg_attribute</structname> exceeds one-fourth of
+      <varname>shared_buffers</varname>, cache rebuilding code that is sometimes
       needed during session start would trigger the synchronized-scan logic,
       causing it to take many times longer than normal.  The problem was
       particularly acute if many new sessions were starting at once.
@@ -4879,8 +4879,8 @@
 
     <listitem>
      <para>
-      Ensure the Windows implementation of <function>PGSemaphoreLock()</>
-      clears <varname>ImmediateInterruptOK</> before returning (Tom Lane)
+      Ensure the Windows implementation of <function>PGSemaphoreLock()</function>
+      clears <varname>ImmediateInterruptOK</varname> before returning (Tom Lane)
      </para>
 
      <para>
@@ -4907,12 +4907,12 @@
 
     <listitem>
      <para>
-      Fix <command>COPY FROM</> to properly handle null marker strings that
+      Fix <command>COPY FROM</command> to properly handle null marker strings that
       correspond to invalid encoding (Tom Lane)
      </para>
 
      <para>
-      A null marker string such as <literal>E'\\0'</> should work, and did
+      A null marker string such as <literal>E'\\0'</literal> should work, and did
       work in the past, but the case got broken in 8.4.
      </para>
     </listitem>
@@ -4925,7 +4925,7 @@
 
      <para>
       Previously, infinite recursion in a function invoked by
-      auto-<command>ANALYZE</> could crash worker processes.
+      auto-<command>ANALYZE</command> could crash worker processes.
      </para>
     </listitem>
 
@@ -4944,7 +4944,7 @@
     <listitem>
      <para>
       Fix logging collector to ensure it will restart file rotation
-      after receiving <systemitem>SIGHUP</> (Tom Lane)
+      after receiving <systemitem>SIGHUP</systemitem> (Tom Lane)
      </para>
     </listitem>
 
@@ -4957,33 +4957,33 @@
 
     <listitem>
      <para>
-      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</> command (Joe
+      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</command> command (Joe
       Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL's <command>GET DIAGNOSTICS</> command when the target
+      Fix PL/pgSQL's <command>GET DIAGNOSTICS</command> command when the target
       is the function's first variable (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential access off the end of memory in <application>psql</>'s
-      expanded display (<command>\x</>) mode (Peter Eisentraut)
+      Fix potential access off the end of memory in <application>psql</application>'s
+      expanded display (<command>\x</command>) mode (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several performance problems in <application>pg_dump</> when
+      Fix several performance problems in <application>pg_dump</application> when
       the database contains many objects (Jeff Janes, Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> could get very slow if the database contained
+      <application>pg_dump</application> could get very slow if the database contained
       many schemas, or if many objects are in dependency loops, or if there
       are many owned sequences.
      </para>
@@ -4991,7 +4991,7 @@
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for the case that a database stored in a
+      Fix <application>pg_upgrade</application> for the case that a database stored in a
       non-default tablespace contains a table in the cluster's default
       tablespace (Bruce Momjian)
      </para>
@@ -4999,41 +4999,41 @@
 
     <listitem>
      <para>
-      In <application>ecpg</>, fix rare memory leaks and possible overwrite
-      of one byte after the <structname>sqlca_t</> structure (Peter Eisentraut)
+      In <application>ecpg</application>, fix rare memory leaks and possible overwrite
+      of one byte after the <structname>sqlca_t</structname> structure (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s <function>dblink_exec()</> to not leak
+      Fix <filename>contrib/dblink</filename>'s <function>dblink_exec()</function> to not leak
       temporary database connections upon error (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to report the correct connection name in
+      Fix <filename>contrib/dblink</filename> to report the correct connection name in
       error messages (Kyotaro Horiguchi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/vacuumlo</> to use multiple transactions when
+      Fix <filename>contrib/vacuumlo</filename> to use multiple transactions when
       dropping many large objects (Tim Lewis, Robert Haas, Tom Lane)
      </para>
 
      <para>
-      This change avoids exceeding <varname>max_locks_per_transaction</> when
+      This change avoids exceeding <varname>max_locks_per_transaction</varname> when
       many objects need to be dropped.  The behavior can be adjusted with the
-      new <literal>-l</> (limit) option.
+      new <literal>-l</literal> (limit) option.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012c
+      Update time zone data files to <application>tzdata</application> release 2012c
       for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland
       Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
       also historical corrections for Canada.
@@ -5056,7 +5056,7 @@
   <para>
    This release contains a variety of fixes from 9.0.6.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -5068,7 +5068,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.6,
-    see <xref linkend="release-9-0-6">.
+    see <xref linkend="release-9-0-6"/>.
    </para>
 
   </sect2>
@@ -5081,14 +5081,14 @@
     <listitem>
      <para>
       Require execute permission on the trigger function for
-      <command>CREATE TRIGGER</> (Robert Haas)
+      <command>CREATE TRIGGER</command> (Robert Haas)
      </para>
 
      <para>
       This missing check could allow another user to execute a trigger
       function with forged input data, by installing it on a table he owns.
       This is only of significance for trigger functions marked
-      <literal>SECURITY DEFINER</>, since otherwise trigger functions run
+      <literal>SECURITY DEFINER</literal>, since otherwise trigger functions run
       as the table owner anyway.  (CVE-2012-0866)
      </para>
     </listitem>
@@ -5100,7 +5100,7 @@
      </para>
 
      <para>
-      Both <application>libpq</> and the server truncated the common name
+      Both <application>libpq</application> and the server truncated the common name
       extracted from an SSL certificate at 32 bytes.  Normally this would
       cause nothing worse than an unexpected verification failure, but there
       are some rather-implausible scenarios in which it might allow one
@@ -5115,12 +5115,12 @@
 
     <listitem>
      <para>
-      Convert newlines to spaces in names written in <application>pg_dump</>
+      Convert newlines to spaces in names written in <application>pg_dump</application>
       comments (Robert Haas)
      </para>
 
      <para>
-      <application>pg_dump</> was incautious about sanitizing object names
+      <application>pg_dump</application> was incautious about sanitizing object names
       that are emitted within SQL comments in its output script.  A name
       containing a newline would at least render the script syntactically
       incorrect.  Maliciously crafted object names could present a SQL
@@ -5136,10 +5136,10 @@
 
      <para>
       An index page split caused by an insertion could sometimes cause a
-      concurrently-running <command>VACUUM</> to miss removing index entries
+      concurrently-running <command>VACUUM</command> to miss removing index entries
       that it should remove.  After the corresponding table rows are removed,
       the dangling index entries would cause errors (such as <quote>could not
-      read block N in file ...</>) or worse, silently wrong query results
+      read block N in file ...</quote>) or worse, silently wrong query results
       after unrelated rows are re-inserted at the now-free table locations.
       This bug has been present since release 8.2, but occurs so infrequently
       that it was not diagnosed until now.  If you have reason to suspect
@@ -5158,7 +5158,7 @@
       that the contents were transiently invalid.  In hot standby mode this
       can result in a query that's executing in parallel seeing garbage data.
       Various symptoms could result from that, but the most common one seems
-      to be <quote>invalid memory alloc request size</>.
+      to be <quote>invalid memory alloc request size</quote>.
      </para>
     </listitem>
 
@@ -5176,13 +5176,13 @@
 
     <listitem>
      <para>
-      Fix <command>CLUSTER</>/<command>VACUUM FULL</> handling of toast
+      Fix <command>CLUSTER</command>/<command>VACUUM FULL</command> handling of toast
       values owned by recently-updated rows (Tom Lane)
      </para>
 
      <para>
       This oversight could lead to <quote>duplicate key value violates unique
-      constraint</> errors being reported against the toast table's index
+      constraint</quote> errors being reported against the toast table's index
       during one of these commands.
      </para>
     </listitem>
@@ -5204,11 +5204,11 @@
     <listitem>
      <para>
       Support foreign data wrappers and foreign servers in
-      <command>REASSIGN OWNED</> (Alvaro Herrera)
+      <command>REASSIGN OWNED</command> (Alvaro Herrera)
      </para>
 
      <para>
-      This command failed with <quote>unexpected classid</> errors if
+      This command failed with <quote>unexpected classid</quote> errors if
       it needed to change the ownership of any such objects.
      </para>
     </listitem>
@@ -5216,16 +5216,16 @@
     <listitem>
      <para>
       Allow non-existent values for some settings in <command>ALTER
-      USER/DATABASE SET</> (Heikki Linnakangas)
+      USER/DATABASE SET</command> (Heikki Linnakangas)
      </para>
 
      <para>
-      Allow <varname>default_text_search_config</>,
-      <varname>default_tablespace</>, and <varname>temp_tablespaces</> to be
+      Allow <varname>default_text_search_config</varname>,
+      <varname>default_tablespace</varname>, and <varname>temp_tablespaces</varname> to be
       set to names that are not known.  This is because they might be known
       in another database where the setting is intended to be used, or for the
       tablespace cases because the tablespace might not be created yet.  The
-      same issue was previously recognized for <varname>search_path</>, and
+      same issue was previously recognized for <varname>search_path</varname>, and
       these settings now act like that one.
      </para>
     </listitem>
@@ -5249,7 +5249,7 @@
     <listitem>
      <para>
       Recover from errors occurring during WAL replay of <command>DROP
-      TABLESPACE</> (Tom Lane)
+      TABLESPACE</command> (Tom Lane)
      </para>
 
      <para>
@@ -5271,7 +5271,7 @@
 
      <para>
       Sometimes a lock would be logged as being held by <quote>transaction
-      zero</>.  This is at least known to produce assertion failures on
+      zero</quote>.  This is at least known to produce assertion failures on
       slave servers, and might be the cause of more serious problems.
      </para>
     </listitem>
@@ -5293,7 +5293,7 @@
 
     <listitem>
      <para>
-      Prevent emitting misleading <quote>consistent recovery state reached</>
+      Prevent emitting misleading <quote>consistent recovery state reached</quote>
       log message at the beginning of crash recovery (Heikki Linnakangas)
      </para>
     </listitem>
@@ -5301,7 +5301,7 @@
     <listitem>
      <para>
       Fix initial value of
-      <structname>pg_stat_replication</>.<structfield>replay_location</>
+      <structname>pg_stat_replication</structname>.<structfield>replay_location</structfield>
       (Fujii Masao)
      </para>
 
@@ -5313,7 +5313,7 @@
 
     <listitem>
      <para>
-      Fix regular expression back-references with <literal>*</> attached
+      Fix regular expression back-references with <literal>*</literal> attached
       (Tom Lane)
      </para>
 
@@ -5327,18 +5327,18 @@
       A similar problem still afflicts back-references that are embedded in a
       larger quantified expression, rather than being the immediate subject
       of the quantifier.  This will be addressed in a future
-      <productname>PostgreSQL</> release.
+      <productname>PostgreSQL</productname> release.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix recently-introduced memory leak in processing of
-      <type>inet</>/<type>cidr</> values (Heikki Linnakangas)
+      <type>inet</type>/<type>cidr</type> values (Heikki Linnakangas)
      </para>
 
      <para>
-      A patch in the December 2011 releases of <productname>PostgreSQL</>
+      A patch in the December 2011 releases of <productname>PostgreSQL</productname>
       caused memory leakage in these operations, which could be significant
       in scenarios such as building a btree index on such a column.
      </para>
@@ -5346,8 +5346,8 @@
 
     <listitem>
      <para>
-      Fix dangling pointer after <command>CREATE TABLE AS</>/<command>SELECT
-      INTO</> in a SQL-language function (Tom Lane)
+      Fix dangling pointer after <command>CREATE TABLE AS</command>/<command>SELECT
+      INTO</command> in a SQL-language function (Tom Lane)
      </para>
 
      <para>
@@ -5381,32 +5381,32 @@
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>'s handling of inherited table columns
+      Improve <application>pg_dump</application>'s handling of inherited table columns
       (Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> mishandled situations where a child column has
+      <application>pg_dump</application> mishandled situations where a child column has
       a different default expression than its parent column.  If the default
       is textually identical to the parent's default, but not actually the
       same (for instance, because of schema search path differences) it would
       not be recognized as different, so that after dump and restore the
       child would be allowed to inherit the parent's default.  Child columns
-      that are <literal>NOT NULL</> where their parent is not could also be
+      that are <literal>NOT NULL</literal> where their parent is not could also be
       restored subtly incorrectly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
+      Fix <application>pg_restore</application>'s direct-to-database mode for
       INSERT-style table data (Tom Lane)
      </para>
 
      <para>
       Direct-to-database restores from archive files made with
-      <option>--inserts</> or <option>--column-inserts</> options fail when
-      using <application>pg_restore</> from a release dated September or
+      <option>--inserts</option> or <option>--column-inserts</option> options fail when
+      using <application>pg_restore</application> from a release dated September or
       December 2011, as a result of an oversight in a fix for another
       problem.  The archive file itself is not at fault, and text-mode
       output is okay.
@@ -5415,20 +5415,20 @@
 
     <listitem>
      <para>
-      Allow <application>pg_upgrade</> to process tables containing
-      <type>regclass</> columns (Bruce Momjian)
+      Allow <application>pg_upgrade</application> to process tables containing
+      <type>regclass</type> columns (Bruce Momjian)
      </para>
 
      <para>
-      Since <application>pg_upgrade</> now takes care to preserve
-      <structname>pg_class</> OIDs, there was no longer any reason for this
+      Since <application>pg_upgrade</application> now takes care to preserve
+      <structname>pg_class</structname> OIDs, there was no longer any reason for this
       restriction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>libpq</> ignore <literal>ENOTDIR</> errors
+      Make <application>libpq</application> ignore <literal>ENOTDIR</literal> errors
       when looking for an SSL client certificate file
       (Magnus Hagander)
      </para>
@@ -5436,21 +5436,21 @@
      <para>
       This allows SSL connections to be established, though without a
       certificate, even when the user's home directory is set to something
-      like <literal>/dev/null</>.
+      like <literal>/dev/null</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some more field alignment issues in <application>ecpg</>'s SQLDA area
+      Fix some more field alignment issues in <application>ecpg</application>'s SQLDA area
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <literal>AT</> option in <application>ecpg</>
-      <literal>DEALLOCATE</> statements (Michael Meskes)
+      Allow <literal>AT</literal> option in <application>ecpg</application>
+      <literal>DEALLOCATE</literal> statements (Michael Meskes)
      </para>
 
      <para>
@@ -5468,7 +5468,7 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/auto_explain</>'s JSON output mode to produce
+      Fix <filename>contrib/auto_explain</filename>'s JSON output mode to produce
       valid JSON (Andrew Dunstan)
      </para>
 
@@ -5480,8 +5480,8 @@
 
     <listitem>
      <para>
-      Fix error in <filename>contrib/intarray</>'s <literal>int[] &amp;
-      int[]</> operator (Guillaume Lelarge)
+      Fix error in <filename>contrib/intarray</filename>'s <literal>int[] &amp;
+      int[]</literal> operator (Guillaume Lelarge)
      </para>
 
      <para>
@@ -5493,8 +5493,8 @@
 
     <listitem>
      <para>
-      Fix error detection in <filename>contrib/pgcrypto</>'s
-      <function>encrypt_iv()</> and <function>decrypt_iv()</>
+      Fix error detection in <filename>contrib/pgcrypto</filename>'s
+      <function>encrypt_iv()</function> and <function>decrypt_iv()</function>
       (Marko Kreen)
      </para>
 
@@ -5506,26 +5506,26 @@
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <filename>contrib/test_parser</>
+      Fix one-byte buffer overrun in <filename>contrib/test_parser</filename>
       (Paul Guyot)
      </para>
 
      <para>
       The code would try to read one more byte than it should, which would
       crash in corner cases.
-      Since <filename>contrib/test_parser</> is only example code, this is
+      Since <filename>contrib/test_parser</filename> is only example code, this is
       not a security issue in itself, but bad example code is still bad.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <function>__sync_lock_test_and_set()</> for spinlocks on ARM, if
+      Use <function>__sync_lock_test_and_set()</function> for spinlocks on ARM, if
       available (Martin Pitt)
      </para>
 
      <para>
-      This function replaces our previous use of the <literal>SWPB</>
+      This function replaces our previous use of the <literal>SWPB</literal>
       instruction, which is deprecated and not available on ARMv6 and later.
       Reports suggest that the old code doesn't fail in an obvious way on
       recent ARM boards, but simply doesn't interlock concurrent accesses,
@@ -5535,7 +5535,7 @@
 
     <listitem>
      <para>
-      Use <option>-fexcess-precision=standard</> option when building with
+      Use <option>-fexcess-precision=standard</option> option when building with
       gcc versions that accept it (Andrew Dunstan)
      </para>
 
@@ -5572,7 +5572,7 @@
   <para>
    This release contains a variety of fixes from 9.0.5.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -5584,14 +5584,14 @@
 
    <para>
     However, a longstanding error was discovered in the definition of the
-    <literal>information_schema.referential_constraints</> view.  If you
+    <literal>information_schema.referential_constraints</literal> view.  If you
     rely on correct results from that view, you should replace its
     definition as explained in the first changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.0.4,
-    see <xref linkend="release-9-0-4">.
+    see <xref linkend="release-9-0-4"/>.
    </para>
 
   </sect2>
@@ -5603,7 +5603,7 @@
 
     <listitem>
      <para>
-      Fix bugs in <literal>information_schema.referential_constraints</> view
+      Fix bugs in <literal>information_schema.referential_constraints</literal> view
       (Tom Lane)
      </para>
 
@@ -5616,20 +5616,20 @@
      </para>
 
      <para>
-      Since the view definition is installed by <application>initdb</>,
+      Since the view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can (as a superuser) drop the
-      <literal>information_schema</> schema then re-create it by sourcing
-      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      <literal>information_schema</literal> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</replaceable>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)  This must be repeated in each database
       to be fixed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash during <command>UPDATE</> or <command>DELETE</> that
+      Fix possible crash during <command>UPDATE</command> or <command>DELETE</command> that
       joins to the output of a scalar-returning function (Tom Lane)
      </para>
 
@@ -5648,19 +5648,19 @@
      <para>
       This could result in transiently failing to find index entries after
       a crash, or on a hot-standby server.  The problem would be repaired
-      by the next <command>VACUUM</> of the index, however.
+      by the next <command>VACUUM</command> of the index, however.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
-      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      SELECT * FROM src</literal> or <literal>INSERT INTO dest SELECT * FROM src</literal>
       (Tom Lane)
      </para>
 
      <para>
-      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</command>,
       attempts to copy its data verbatim to another table could produce
       corrupt results in certain corner cases.
       The problem can only manifest in this precise form in 8.4 and later,
@@ -5690,7 +5690,7 @@
 
      <para>
       The typical symptom was transient errors like <quote>missing chunk
-      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      number 0 for toast value NNNNN in pg_toast_2619</quote>, where the cited
       toast table would always belong to a system catalog.
      </para>
     </listitem>
@@ -5706,7 +5706,7 @@
       or modified the function, leading to misbehavior when the function was
       used.  Note that merely installing this update will not fix the missing
       dependency entries; to do that, you'd need to <command>CREATE OR
-      REPLACE</> each such function afterwards.  If you have functions whose
+      REPLACE</command> each such function afterwards.  If you have functions whose
       defaults depend on non-built-in objects, doing so is recommended.
      </para>
     </listitem>
@@ -5732,29 +5732,29 @@
 
     <listitem>
      <para>
-      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
-      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      Make <function>DatumGetInetP()</function> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</function>, that does
       not (Heikki Linnakangas)
      </para>
 
      <para>
       This change affects no core code, but might prevent crashes in add-on
-      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      code that expects <function>DatumGetInetP()</function> to produce an unpacked
       datum as per usual convention.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve locale support in <type>money</> type's input and output
+      Improve locale support in <type>money</type> type's input and output
       (Tom Lane)
      </para>
 
      <para>
       Aside from not supporting all standard
-      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</varname></link>
       formatting options, the input and output functions were inconsistent,
-      meaning there were locales in which dumped <type>money</> values could
+      meaning there were locales in which dumped <type>money</type> values could
       not be re-read.
      </para>
     </listitem>
@@ -5762,15 +5762,15 @@
     <listitem>
      <para>
       Don't let <link
-      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
-      affect <literal>CASE foo WHEN NULL ...</> constructs
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</varname></link>
+      affect <literal>CASE foo WHEN NULL ...</literal> constructs
       (Heikki Linnakangas)
      </para>
 
      <para>
-      <varname>transform_null_equals</> is only supposed to affect
-      <literal>foo = NULL</> expressions written directly by the user, not
-      equality checks generated internally by this form of <literal>CASE</>.
+      <varname>transform_null_equals</varname> is only supposed to affect
+      <literal>foo = NULL</literal> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</literal>.
      </para>
     </listitem>
 
@@ -5782,14 +5782,14 @@
 
      <para>
       For a cascading foreign key that references its own table, a row update
-      will fire both the <literal>ON UPDATE</> trigger and the
-      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
-      trigger must execute first, else the <literal>CHECK</> will check a
+      will fire both the <literal>ON UPDATE</literal> trigger and the
+      <literal>CHECK</literal> trigger as one event.  The <literal>ON UPDATE</literal>
+      trigger must execute first, else the <literal>CHECK</literal> will check a
       non-final state of the row and possibly throw an inappropriate error.
       However, the firing order of these triggers is determined by their
       names, which generally sort in creation order since the triggers have
       auto-generated names following the convention
-      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      <quote>RI_ConstraintTrigger_NNNN</quote>.  A proper fix would require
       modifying that convention, which we will do in 9.2, but it seems risky
       to change it in existing releases.  So this patch just changes the
       creation order of the triggers.  Users encountering this type of error
@@ -5818,20 +5818,20 @@
 
      <para>
       Formerly, these would not be displayed correctly in the
-      <structname>pg_settings</> view.
+      <structname>pg_settings</structname> view.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect field alignment in <application>ecpg</>'s SQLDA area
+      Fix incorrect field alignment in <application>ecpg</application>'s SQLDA area
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Preserve blank lines within commands in <application>psql</>'s command
+      Preserve blank lines within commands in <application>psql</application>'s command
       history (Robert Haas)
      </para>
 
@@ -5843,14 +5843,14 @@
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts between
+      Fix <application>pg_dump</application> to dump user-defined casts between
       auto-generated types, such as table rowtypes (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Assorted fixes for <application>pg_upgrade</> (Bruce Momjian)
+      Assorted fixes for <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
@@ -5861,7 +5861,7 @@
 
     <listitem>
      <para>
-      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      Use the preferred version of <application>xsubpp</application> to build PL/Perl,
       not necessarily the operating system's main copy
       (David Wheeler and Alex Hunsaker)
      </para>
@@ -5869,26 +5869,26 @@
 
     <listitem>
      <para>
-      Fix incorrect coding in <filename>contrib/dict_int</> and
-      <filename>contrib/dict_xsyn</> (Tom Lane)
+      Fix incorrect coding in <filename>contrib/dict_int</filename> and
+      <filename>contrib/dict_xsyn</filename> (Tom Lane)
      </para>
 
      <para>
       Some functions incorrectly assumed that memory returned by
-      <function>palloc()</> is guaranteed zeroed.
+      <function>palloc()</function> is guaranteed zeroed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted errors in <filename>contrib/unaccent</>'s configuration
+      Fix assorted errors in <filename>contrib/unaccent</filename>'s configuration
       file parsing (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</function>
       (Robert Haas)
      </para>
     </listitem>
@@ -5926,15 +5926,15 @@
      </para>
 
      <para>
-      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
-      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Map <quote>Central America Standard Time</quote> to <literal>CST6</literal>, not
+      <literal>CST6CDT</literal>, because DST is generally not observed anywhere in
       Central America.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011n
+      Update time zone data files to <application>tzdata</application> release 2011n
       for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
       also historical corrections for Alaska and British East Africa.
      </para>
@@ -5956,7 +5956,7 @@
   <para>
    This release contains a variety of fixes from 9.0.4.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -5968,7 +5968,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.0.4,
-    see <xref linkend="release-9-0-4">.
+    see <xref linkend="release-9-0-4"/>.
    </para>
 
   </sect2>
@@ -5980,8 +5980,8 @@
 
     <listitem>
      <para>
-      Fix catalog cache invalidation after a <command>VACUUM FULL</> or
-      <command>CLUSTER</> on a system catalog (Tom Lane)
+      Fix catalog cache invalidation after a <command>VACUUM FULL</command> or
+      <command>CLUSTER</command> on a system catalog (Tom Lane)
      </para>
 
      <para>
@@ -6001,7 +6001,7 @@
 
      <para>
       These mistakes could lead to transient failures after a <command>VACUUM
-      FULL</> or <command>CLUSTER</> on a system catalog.
+      FULL</command> or <command>CLUSTER</command> on a system catalog.
      </para>
     </listitem>
 
@@ -6030,7 +6030,7 @@
 
     <listitem>
      <para>
-      Fix possible buffer overrun in <function>tsvector_concat()</>
+      Fix possible buffer overrun in <function>tsvector_concat()</function>
       (Tom Lane)
      </para>
 
@@ -6042,14 +6042,14 @@
 
     <listitem>
      <para>
-      Fix crash in <function>xml_recv</> when processing a
-      <quote>standalone</> parameter (Tom Lane)
+      Fix crash in <function>xml_recv</function> when processing a
+      <quote>standalone</quote> parameter (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <function>pg_options_to_table</> return NULL for an option with no
+      Make <function>pg_options_to_table</function> return NULL for an option with no
       value (Tom Lane)
      </para>
 
@@ -6060,7 +6060,7 @@
 
     <listitem>
      <para>
-      Avoid possibly accessing off the end of memory in <command>ANALYZE</>
+      Avoid possibly accessing off the end of memory in <command>ANALYZE</command>
       and in SJIS-2004 encoding conversion (Noah Misch)
      </para>
 
@@ -6071,7 +6071,7 @@
 
     <listitem>
      <para>
-      Protect <function>pg_stat_reset_shared()</> against NULL input (Magnus
+      Protect <function>pg_stat_reset_shared()</function> against NULL input (Magnus
       Hagander)
      </para>
     </listitem>
@@ -6111,7 +6111,7 @@
       There was a window wherein a new backend process could read a stale init
       file but miss the inval messages that would tell it the data is stale.
       The result would be bizarre failures in catalog accesses, typically
-      <quote>could not read block 0 in file ...</> later during startup.
+      <quote>could not read block 0 in file ...</quote> later during startup.
      </para>
     </listitem>
 
@@ -6131,7 +6131,7 @@
     <listitem>
      <para>
       Fix memory leak when encoding conversion has to be done on incoming
-      command strings and <command>LISTEN</> is active (Tom Lane)
+      command strings and <command>LISTEN</command> is active (Tom Lane)
      </para>
     </listitem>
 
@@ -6139,20 +6139,20 @@
      <para>
       Fix incorrect memory accounting (leading to possible memory bloat) in
       tuplestores supporting holdable cursors and plpgsql's <literal>RETURN
-      NEXT</> command (Tom Lane)
+      NEXT</literal> command (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix trigger <literal>WHEN</> conditions when both <literal>BEFORE</> and
-      <literal>AFTER</> triggers exist (Tom Lane)
+      Fix trigger <literal>WHEN</literal> conditions when both <literal>BEFORE</literal> and
+      <literal>AFTER</literal> triggers exist (Tom Lane)
      </para>
 
      <para>
-      Evaluation of <literal>WHEN</> conditions for <literal>AFTER ROW
-      UPDATE</> triggers could crash if there had been a <literal>BEFORE
-      ROW</> trigger fired for the same update.
+      Evaluation of <literal>WHEN</literal> conditions for <literal>AFTER ROW
+      UPDATE</literal> triggers could crash if there had been a <literal>BEFORE
+      ROW</literal> trigger fired for the same update.
      </para>
     </listitem>
 
@@ -6202,7 +6202,7 @@
 
     <listitem>
      <para>
-      Allow nested <literal>EXISTS</> queries to be optimized properly (Tom
+      Allow nested <literal>EXISTS</literal> queries to be optimized properly (Tom
       Lane)
      </para>
     </listitem>
@@ -6222,19 +6222,19 @@
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to handle gating Result nodes within
+      Fix <command>EXPLAIN</command> to handle gating Result nodes within
       inner-indexscan subplans (Tom Lane)
      </para>
 
      <para>
-      The usual symptom of this oversight was <quote>bogus varno</> errors.
+      The usual symptom of this oversight was <quote>bogus varno</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix btree preprocessing of <replaceable>indexedcol</> <literal>IS
-      NULL</> conditions (Dean Rasheed)
+      Fix btree preprocessing of <replaceable>indexedcol</replaceable> <literal>IS
+      NULL</literal> conditions (Dean Rasheed)
      </para>
 
      <para>
@@ -6257,13 +6257,13 @@
 
     <listitem>
      <para>
-      Fix dump bug for <literal>VALUES</> in a view (Tom Lane)
+      Fix dump bug for <literal>VALUES</literal> in a view (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow <literal>SELECT FOR UPDATE/SHARE</> on sequences (Tom Lane)
+      Disallow <literal>SELECT FOR UPDATE/SHARE</literal> on sequences (Tom Lane)
      </para>
 
      <para>
@@ -6273,8 +6273,8 @@
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> so that it always updates
-      <literal>pg_class</>.<literal>reltuples</>/<literal>relpages</> (Tom
+      Fix <command>VACUUM</command> so that it always updates
+      <literal>pg_class</literal>.<literal>reltuples</literal>/<literal>relpages</literal> (Tom
       Lane)
      </para>
 
@@ -6293,7 +6293,7 @@
 
     <listitem>
      <para>
-      Fix cases where <command>CLUSTER</> might attempt to access
+      Fix cases where <command>CLUSTER</command> might attempt to access
       already-removed TOAST data (Tom Lane)
      </para>
     </listitem>
@@ -6308,7 +6308,7 @@
     <listitem>
      <para>
       Fix portability bugs in use of credentials control messages for
-      <quote>peer</> authentication (Tom Lane)
+      <quote>peer</quote> authentication (Tom Lane)
      </para>
     </listitem>
 
@@ -6320,20 +6320,20 @@
 
      <para>
       The typical symptom of this problem was <quote>The function requested is
-      not supported</> errors during SSPI login.
+      not supported</quote> errors during SSPI login.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix failure when adding a new variable of a custom variable class to
-      <filename>postgresql.conf</> (Tom Lane)
+      <filename>postgresql.conf</filename> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Throw an error if <filename>pg_hba.conf</> contains <literal>hostssl</>
+      Throw an error if <filename>pg_hba.conf</filename> contains <literal>hostssl</literal>
       but SSL is disabled (Tom Lane)
      </para>
 
@@ -6345,19 +6345,19 @@
 
     <listitem>
      <para>
-      Fix failure when <command>DROP OWNED BY</> attempts to remove default
+      Fix failure when <command>DROP OWNED BY</command> attempts to remove default
       privileges on sequences (Shigeru Hanada)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix typo in <function>pg_srand48</> seed initialization (Andres Freund)
+      Fix typo in <function>pg_srand48</function> seed initialization (Andres Freund)
      </para>
 
      <para>
       This led to failure to use all bits of the provided seed.  This function
-      is not used on most platforms (only those without <function>srandom</>),
+      is not used on most platforms (only those without <function>srandom</function>),
       and the potential security exposure from a less-random-than-expected
       seed seems minimal in any case.
      </para>
@@ -6365,25 +6365,25 @@
 
     <listitem>
      <para>
-      Avoid integer overflow when the sum of <literal>LIMIT</> and
-      <literal>OFFSET</> values exceeds 2^63 (Heikki Linnakangas)
+      Avoid integer overflow when the sum of <literal>LIMIT</literal> and
+      <literal>OFFSET</literal> values exceeds 2^63 (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add overflow checks to <type>int4</> and <type>int8</> versions of
-      <function>generate_series()</> (Robert Haas)
+      Add overflow checks to <type>int4</type> and <type>int8</type> versions of
+      <function>generate_series()</function> (Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix trailing-zero removal in <function>to_char()</> (Marti Raudsepp)
+      Fix trailing-zero removal in <function>to_char()</function> (Marti Raudsepp)
      </para>
 
      <para>
-      In a format with <literal>FM</> and no digit positions
+      In a format with <literal>FM</literal> and no digit positions
       after the decimal point, zeroes to the left of the decimal point could
       be removed incorrectly.
      </para>
@@ -6391,7 +6391,7 @@
 
     <listitem>
      <para>
-      Fix <function>pg_size_pretty()</> to avoid overflow for inputs close to
+      Fix <function>pg_size_pretty()</function> to avoid overflow for inputs close to
       2^63 (Tom Lane)
      </para>
     </listitem>
@@ -6409,19 +6409,19 @@
 
     <listitem>
      <para>
-      Correctly handle quotes in locale names during <application>initdb</>
+      Correctly handle quotes in locale names during <application>initdb</application>
       (Heikki Linnakangas)
      </para>
 
      <para>
       The case can arise with some Windows locales, such as <quote>People's
-      Republic of China</>.
+      Republic of China</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, avoid dumping orphaned temporary tables
+      In <application>pg_upgrade</application>, avoid dumping orphaned temporary tables
       (Bruce Momjian)
      </para>
 
@@ -6433,54 +6433,54 @@
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to preserve toast tables' relfrozenxids
+      Fix <application>pg_upgrade</application> to preserve toast tables' relfrozenxids
       during an upgrade from 8.3 (Bruce Momjian)
      </para>
 
      <para>
-      Failure to do this could lead to <filename>pg_clog</> files being
+      Failure to do this could lead to <filename>pg_clog</filename> files being
       removed too soon after the upgrade.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, fix the <literal>-l</> (log) option to
+      In <application>pg_upgrade</application>, fix the <literal>-l</literal> (log) option to
       work on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</>, support silent mode for service registrations
+      In <application>pg_ctl</application>, support silent mode for service registrations
       on Windows (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s counting of script file line numbers during
-      <literal>COPY</> from a different file (Tom Lane)
+      Fix <application>psql</application>'s counting of script file line numbers during
+      <literal>COPY</literal> from a different file (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
-      <varname>standard_conforming_strings</> (Tom Lane)
+      Fix <application>pg_restore</application>'s direct-to-database mode for
+      <varname>standard_conforming_strings</varname> (Tom Lane)
      </para>
 
      <para>
-      <application>pg_restore</> could emit incorrect commands when restoring
+      <application>pg_restore</application> could emit incorrect commands when restoring
       directly to a database server from an archive file that had been made
-      with <varname>standard_conforming_strings</> set to <literal>on</>.
+      with <varname>standard_conforming_strings</varname> set to <literal>on</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Be more user-friendly about unsupported cases for parallel
-      <application>pg_restore</> (Tom Lane)
+      <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
@@ -6491,14 +6491,14 @@
 
     <listitem>
      <para>
-      Fix write-past-buffer-end and memory leak in <application>libpq</>'s
+      Fix write-past-buffer-end and memory leak in <application>libpq</application>'s
       LDAP service lookup code (Albe Laurenz)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, avoid failures when using nonblocking I/O
+      In <application>libpq</application>, avoid failures when using nonblocking I/O
       and an SSL connection (Martin Pihlak, Tom Lane)
      </para>
     </listitem>
@@ -6510,36 +6510,36 @@
      </para>
 
      <para>
-      In particular, the response to a server report of <function>fork()</>
+      In particular, the response to a server report of <function>fork()</function>
       failure during SSL connection startup is now saner.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s error reporting for SSL failures (Tom
+      Improve <application>libpq</application>'s error reporting for SSL failures (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>PQsetvalue()</> to avoid possible crash when adding a new
-      tuple to a <structname>PGresult</> originally obtained from a server
+      Fix <function>PQsetvalue()</function> to avoid possible crash when adding a new
+      tuple to a <structname>PGresult</structname> originally obtained from a server
       query (Andrew Chernow)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> write <type>double</> values with 15 digits
+      Make <application>ecpglib</application> write <type>double</type> values with 15 digits
       precision (Akira Kurosawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpglib</>, be sure <literal>LC_NUMERIC</> setting is
+      In <application>ecpglib</application>, be sure <literal>LC_NUMERIC</literal> setting is
       restored after an error (Michael Meskes)
      </para>
     </listitem>
@@ -6551,7 +6551,7 @@
      </para>
 
      <para>
-      <filename>contrib/pg_crypto</>'s blowfish encryption code could give
+      <filename>contrib/pg_crypto</filename>'s blowfish encryption code could give
       wrong results on platforms where char is signed (which is most),
       leading to encrypted passwords being weaker than they should be.
      </para>
@@ -6559,13 +6559,13 @@
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/seg</> (Heikki Linnakangas)
+      Fix memory leak in <filename>contrib/seg</filename> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgstatindex()</> to give consistent results for empty
+      Fix <function>pgstatindex()</function> to give consistent results for empty
       indexes (Tom Lane)
      </para>
     </listitem>
@@ -6585,7 +6585,7 @@
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011i
+      Update time zone data files to <application>tzdata</application> release 2011i
       for DST law changes in Canada, Egypt, Russia, Samoa, and South Sudan.
      </para>
     </listitem>
@@ -6606,7 +6606,7 @@
   <para>
    This release contains a variety of fixes from 9.0.3.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -6618,10 +6618,10 @@
 
    <para>
     However, if your installation was upgraded from a previous major
-    release by running <application>pg_upgrade</>, you should take
+    release by running <application>pg_upgrade</application>, you should take
     action to prevent possible data loss due to a now-fixed bug in
-    <application>pg_upgrade</>.  The recommended solution is to run
-    <command>VACUUM FREEZE</> on all TOAST tables.
+    <application>pg_upgrade</application>.  The recommended solution is to run
+    <command>VACUUM FREEZE</command> on all TOAST tables.
     More information is available at <ulink
     url="http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix">
     http://wiki.postgresql.org/wiki/20110408pg_upgrade_fix</ulink>.
@@ -6636,36 +6636,36 @@
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s handling of TOAST tables
+      Fix <application>pg_upgrade</application>'s handling of TOAST tables
       (Bruce Momjian)
      </para>
 
      <para>
-      The <structname>pg_class</>.<structfield>relfrozenxid</> value for
+      The <structname>pg_class</structname>.<structfield>relfrozenxid</structfield> value for
       TOAST tables was not correctly copied into the new installation
-      during <application>pg_upgrade</>.  This could later result in
-      <literal>pg_clog</> files being discarded while they were still
+      during <application>pg_upgrade</application>.  This could later result in
+      <literal>pg_clog</literal> files being discarded while they were still
       needed to validate tuples in the TOAST tables, leading to
-      <quote>could not access status of transaction</> failures.
+      <quote>could not access status of transaction</quote> failures.
      </para>
 
      <para>
       This error poses a significant risk of data loss for installations
-      that have been upgraded with <application>pg_upgrade</>.  This patch
-      corrects the problem for future uses of <application>pg_upgrade</>,
+      that have been upgraded with <application>pg_upgrade</application>.  This patch
+      corrects the problem for future uses of <application>pg_upgrade</application>,
       but does not in itself cure the issue in installations that have been
-      processed with a buggy version of <application>pg_upgrade</>.
+      processed with a buggy version of <application>pg_upgrade</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Suppress incorrect <quote>PD_ALL_VISIBLE flag was incorrectly set</>
+      Suppress incorrect <quote>PD_ALL_VISIBLE flag was incorrectly set</quote>
       warning (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>VACUUM</> would sometimes issue this warning in cases that
+      <command>VACUUM</command> would sometimes issue this warning in cases that
       are actually valid.
      </para>
     </listitem>
@@ -6680,8 +6680,8 @@
       All retryable conflict errors now have an error code that indicates
       that a retry is possible.  Also, session closure due to the database
       being dropped on the master is now reported as
-      <literal>ERRCODE_DATABASE_DROPPED</>, rather than
-      <literal>ERRCODE_ADMIN_SHUTDOWN</>, so that connection poolers can
+      <literal>ERRCODE_DATABASE_DROPPED</literal>, rather than
+      <literal>ERRCODE_ADMIN_SHUTDOWN</literal>, so that connection poolers can
       handle the situation correctly.
      </para>
     </listitem>
@@ -6726,15 +6726,15 @@
 
     <listitem>
      <para>
-      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</> trigger
+      Fix dangling-pointer problem in <literal>BEFORE ROW UPDATE</literal> trigger
       handling when there was a concurrent update to the target tuple
       (Tom Lane)
      </para>
 
      <para>
       This bug has been observed to result in intermittent <quote>cannot
-      extract system attribute from virtual tuple</> failures while trying to
-      do <literal>UPDATE RETURNING ctid</>.  There is a very small probability
+      extract system attribute from virtual tuple</quote> failures while trying to
+      do <literal>UPDATE RETURNING ctid</literal>.  There is a very small probability
       of more serious errors, such as generating incorrect index entries for
       the updated tuple.
      </para>
@@ -6742,25 +6742,25 @@
 
     <listitem>
      <para>
-      Disallow <command>DROP TABLE</> when there are pending deferred trigger
+      Disallow <command>DROP TABLE</command> when there are pending deferred trigger
       events for the table (Tom Lane)
      </para>
 
      <para>
-      Formerly the <command>DROP</> would go through, leading to
-      <quote>could not open relation with OID nnn</> errors when the
+      Formerly the <command>DROP</command> would go through, leading to
+      <quote>could not open relation with OID nnn</quote> errors when the
       triggers were eventually fired.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <quote>replication</> as a user name in
-      <filename>pg_hba.conf</> (Andrew Dunstan)
+      Allow <quote>replication</quote> as a user name in
+      <filename>pg_hba.conf</filename> (Andrew Dunstan)
      </para>
 
      <para>
-      <quote>replication</> is special in the database name column, but it
+      <quote>replication</quote> is special in the database name column, but it
       was mistakenly also treated as special in the user name column.
      </para>
     </listitem>
@@ -6781,13 +6781,13 @@
 
     <listitem>
      <para>
-      Fix handling of <literal>SELECT FOR UPDATE</> in a sub-SELECT
+      Fix handling of <literal>SELECT FOR UPDATE</literal> in a sub-SELECT
       (Tom Lane)
      </para>
 
      <para>
       This bug typically led to <quote>cannot extract system attribute from
-      virtual tuple</> errors.
+      virtual tuple</quote> errors.
      </para>
     </listitem>
 
@@ -6813,7 +6813,7 @@
 
     <listitem>
      <para>
-      Allow <application>libpq</>'s SSL initialization to succeed when
+      Allow <application>libpq</application>'s SSL initialization to succeed when
       user's home directory is unavailable (Tom Lane)
      </para>
 
@@ -6826,34 +6826,34 @@
 
     <listitem>
      <para>
-      Fix <application>libpq</> to return a useful error message for errors
-      detected in <function>conninfo_array_parse</> (Joseph Adams)
+      Fix <application>libpq</application> to return a useful error message for errors
+      detected in <function>conninfo_array_parse</function> (Joseph Adams)
      </para>
 
      <para>
       A typo caused the library to return NULL, rather than the
-      <structname>PGconn</> structure containing the error message, to the
+      <structname>PGconn</structname> structure containing the error message, to the
       application.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> preprocessor's handling of float constants
+      Fix <application>ecpg</application> preprocessor's handling of float constants
       (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parallel <application>pg_restore</> to handle comments on
+      Fix parallel <application>pg_restore</application> to handle comments on
       POST_DATA items correctly (Arnd Hannemann)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to cope with long lines (over 1KB) in
+      Fix <application>pg_restore</application> to cope with long lines (over 1KB) in
       TOC files (Tom Lane)
      </para>
     </listitem>
@@ -6899,14 +6899,14 @@
 
     <listitem>
      <para>
-      Fix version-incompatibility problem with <application>libintl</> on
+      Fix version-incompatibility problem with <application>libintl</application> on
       Windows (Hiroshi Inoue)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix usage of <application>xcopy</> in Windows build scripts to
+      Fix usage of <application>xcopy</application> in Windows build scripts to
       work correctly under Windows 7 (Andrew Dunstan)
      </para>
 
@@ -6917,14 +6917,14 @@
 
     <listitem>
      <para>
-      Fix path separator used by <application>pg_regress</> on Cygwin
+      Fix path separator used by <application>pg_regress</application> on Cygwin
       (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011f
+      Update time zone data files to <application>tzdata</application> release 2011f
       for DST law changes in Chile, Cuba, Falkland Islands, Morocco, Samoa,
       and Turkey; also historical corrections for South Australia, Alaska,
       and Hawaii.
@@ -6947,7 +6947,7 @@
   <para>
    This release contains a variety of fixes from 9.0.2.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -6966,7 +6966,7 @@
 
     <listitem>
      <para>
-      Before exiting <application>walreceiver</>, ensure all the received WAL
+      Before exiting <application>walreceiver</application>, ensure all the received WAL
       is fsync'd to disk (Heikki Linnakangas)
      </para>
 
@@ -6978,27 +6978,27 @@
 
     <listitem>
      <para>
-      Avoid excess fsync activity in <application>walreceiver</>
+      Avoid excess fsync activity in <application>walreceiver</application>
       (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>ALTER TABLE</> revalidate uniqueness and exclusion
+      Make <command>ALTER TABLE</command> revalidate uniqueness and exclusion
       constraints when needed (Noah Misch)
      </para>
 
      <para>
       This was broken in 9.0 by a change that was intended to suppress
-      revalidation during <command>VACUUM FULL</> and <command>CLUSTER</>,
-      but unintentionally affected <command>ALTER TABLE</> as well.
+      revalidation during <command>VACUUM FULL</command> and <command>CLUSTER</command>,
+      but unintentionally affected <command>ALTER TABLE</command> as well.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix EvalPlanQual for <command>UPDATE</> of an inheritance tree in which
+      Fix EvalPlanQual for <command>UPDATE</command> of an inheritance tree in which
       the tables are not all alike (Tom Lane)
      </para>
 
@@ -7013,15 +7013,15 @@
 
     <listitem>
      <para>
-      Avoid failures when <command>EXPLAIN</> tries to display a simple-form
-      <literal>CASE</> expression (Tom Lane)
+      Avoid failures when <command>EXPLAIN</command> tries to display a simple-form
+      <literal>CASE</literal> expression (Tom Lane)
      </para>
 
      <para>
-      If the <literal>CASE</>'s test expression was a constant, the planner
-      could simplify the <literal>CASE</> into a form that confused the
+      If the <literal>CASE</literal>'s test expression was a constant, the planner
+      could simplify the <literal>CASE</literal> into a form that confused the
       expression-display code, resulting in <quote>unexpected CASE WHEN
-      clause</> errors.
+      clause</quote> errors.
      </para>
     </listitem>
 
@@ -7046,8 +7046,8 @@
      </para>
 
      <para>
-      The <type>date</> type supports a wider range of dates than can be
-      represented by the <type>timestamp</> types, but the planner assumed it
+      The <type>date</type> type supports a wider range of dates than can be
+      represented by the <type>timestamp</type> types, but the planner assumed it
       could always convert a date to timestamp with impunity.
      </para>
     </listitem>
@@ -7060,29 +7060,29 @@
 
     <listitem>
      <para>
-      Remove <application>ecpg</>'s fixed length limit for constants defining
+      Remove <application>ecpg</application>'s fixed length limit for constants defining
       an array dimension (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix erroneous parsing of <type>tsquery</> values containing
+      Fix erroneous parsing of <type>tsquery</type> values containing
       <literal>... &amp; !(subexpression) | ...</literal> (Tom Lane)
      </para>
 
      <para>
       Queries containing this combination of operators were not executed
-      correctly.  The same error existed in <filename>contrib/intarray</>'s
-      <type>query_int</> type and <filename>contrib/ltree</>'s
-      <type>ltxtquery</> type.
+      correctly.  The same error existed in <filename>contrib/intarray</filename>'s
+      <type>query_int</type> type and <filename>contrib/ltree</filename>'s
+      <type>ltxtquery</type> type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix buffer overrun in <filename>contrib/intarray</>'s input function
-      for the <type>query_int</> type (Apple)
+      Fix buffer overrun in <filename>contrib/intarray</filename>'s input function
+      for the <type>query_int</type> type (Apple)
      </para>
 
      <para>
@@ -7094,16 +7094,16 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/seg</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/seg</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>seg</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>seg</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.  (This is identical to the bug that was fixed in
-      <filename>contrib/cube</> in the previous update.)
+      <filename>contrib/cube</filename> in the previous update.)
      </para>
     </listitem>
 
@@ -7123,7 +7123,7 @@
   <para>
    This release contains a variety of fixes from 9.0.1.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -7143,23 +7143,23 @@
     <listitem>
      <para>
       Force the default
-      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>
-      to be <literal>fdatasync</> on Linux (Tom Lane, Marti Raudsepp)
+      <link linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>
+      to be <literal>fdatasync</literal> on Linux (Tom Lane, Marti Raudsepp)
      </para>
 
      <para>
-      The default on Linux has actually been <literal>fdatasync</> for many
-      years, but recent kernel changes caused <productname>PostgreSQL</> to
-      choose <literal>open_datasync</> instead.  This choice did not result
+      The default on Linux has actually been <literal>fdatasync</literal> for many
+      years, but recent kernel changes caused <productname>PostgreSQL</productname> to
+      choose <literal>open_datasync</literal> instead.  This choice did not result
       in any performance improvement, and caused outright failures on
-      certain filesystems, notably <literal>ext4</> with the
-      <literal>data=journal</> mount option.
+      certain filesystems, notably <literal>ext4</literal> with the
+      <literal>data=journal</literal> mount option.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>too many KnownAssignedXids</> error during Hot Standby
+      Fix <quote>too many KnownAssignedXids</quote> error during Hot Standby
       replay (Heikki Linnakangas)
      </para>
     </listitem>
@@ -7188,7 +7188,7 @@
      </para>
 
      <para>
-      This could result in <quote>bad buffer id: 0</> failures or
+      This could result in <quote>bad buffer id: 0</quote> failures or
       corruption of index contents during replication.
      </para>
     </listitem>
@@ -7214,7 +7214,7 @@
      </para>
 
      <para>
-      The effective <varname>vacuum_cost_limit</> for an autovacuum worker
+      The effective <varname>vacuum_cost_limit</varname> for an autovacuum worker
       could drop to nearly zero if it processed enough tables, causing it
       to run extremely slowly.
      </para>
@@ -7240,19 +7240,19 @@
 
     <listitem>
      <para>
-      Add support for detecting register-stack overrun on <literal>IA64</>
+      Add support for detecting register-stack overrun on <literal>IA64</literal>
       (Tom Lane)
      </para>
 
      <para>
-      The <literal>IA64</> architecture has two hardware stacks.  Full
+      The <literal>IA64</literal> architecture has two hardware stacks.  Full
       prevention of stack-overrun failures requires checking both.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a check for stack overflow in <function>copyObject()</> (Tom Lane)
+      Add a check for stack overflow in <function>copyObject()</function> (Tom Lane)
      </para>
 
      <para>
@@ -7268,7 +7268,7 @@
      </para>
 
      <para>
-      It is possible to have a <quote>concurrent</> page split in a
+      It is possible to have a <quote>concurrent</quote> page split in a
       temporary index, if for example there is an open cursor scanning the
       index when an insertion is done.  GiST failed to detect this case and
       hence could deliver wrong results when execution of the cursor
@@ -7295,16 +7295,16 @@
 
      <para>
       Certain cases where a large number of tuples needed to be read in
-      advance, but <varname>work_mem</> was large enough to allow them all
+      advance, but <varname>work_mem</varname> was large enough to allow them all
       to be held in memory, were unexpectedly slow.
-      <function>percent_rank()</>, <function>cume_dist()</> and
-      <function>ntile()</> in particular were subject to this problem.
+      <function>percent_rank()</function>, <function>cume_dist()</function> and
+      <function>ntile()</function> in particular were subject to this problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid memory leakage while <command>ANALYZE</>'ing complex index
+      Avoid memory leakage while <command>ANALYZE</command>'ing complex index
       expressions (Tom Lane)
      </para>
     </listitem>
@@ -7316,21 +7316,21 @@
      </para>
 
      <para>
-      An index declared like <literal>create index i on t (foo(t.*))</>
+      An index declared like <literal>create index i on t (foo(t.*))</literal>
       would not automatically get dropped when its table was dropped.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add missing support in <command>DROP OWNED BY</> for removing foreign
+      Add missing support in <command>DROP OWNED BY</command> for removing foreign
       data wrapper/server privileges belonging to a user (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Do not <quote>inline</> a SQL function with multiple <literal>OUT</>
+      Do not <quote>inline</quote> a SQL function with multiple <literal>OUT</literal>
       parameters (Tom Lane)
      </para>
 
@@ -7349,28 +7349,28 @@
 
     <listitem>
      <para>
-      Behave correctly if <literal>ORDER BY</>, <literal>LIMIT</>,
-      <literal>FOR UPDATE</>, or <literal>WITH</> is attached to the
-      <literal>VALUES</> part of <literal>INSERT ... VALUES</> (Tom Lane)
+      Behave correctly if <literal>ORDER BY</literal>, <literal>LIMIT</literal>,
+      <literal>FOR UPDATE</literal>, or <literal>WITH</literal> is attached to the
+      <literal>VALUES</literal> part of <literal>INSERT ... VALUES</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <literal>OFF</> keyword unreserved (Heikki Linnakangas)
+      Make the <literal>OFF</literal> keyword unreserved (Heikki Linnakangas)
      </para>
 
      <para>
-      This prevents problems with using <literal>off</> as a variable name in
-      <application>PL/pgSQL</>.  That worked before 9.0, but was now broken
-      because <application>PL/pgSQL</> now treats all core reserved words
+      This prevents problems with using <literal>off</literal> as a variable name in
+      <application>PL/pgSQL</application>.  That worked before 9.0, but was now broken
+      because <application>PL/pgSQL</application> now treats all core reserved words
       as reserved.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix constant-folding of <literal>COALESCE()</> expressions (Tom Lane)
+      Fix constant-folding of <literal>COALESCE()</literal> expressions (Tom Lane)
      </para>
 
      <para>
@@ -7381,7 +7381,7 @@
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failure
+      Fix <quote>could not find pathkey item to sort</quote> planner failure
       with comparison of whole-row Vars (Tom Lane)
      </para>
     </listitem>
@@ -7389,7 +7389,7 @@
     <listitem>
      <para>
       Fix postmaster crash when connection acceptance
-      (<function>accept()</> or one of the calls made immediately after it)
+      (<function>accept()</function> or one of the calls made immediately after it)
       fails, and the postmaster was compiled with GSSAPI support (Alexander
       Chernikov)
      </para>
@@ -7408,7 +7408,7 @@
 
     <listitem>
      <para>
-      Fix missed unlink of temporary files when <varname>log_temp_files</>
+      Fix missed unlink of temporary files when <varname>log_temp_files</varname>
       is active (Tom Lane)
      </para>
 
@@ -7420,11 +7420,11 @@
 
     <listitem>
      <para>
-      Add print functionality for <structname>InhRelation</> nodes (Tom Lane)
+      Add print functionality for <structname>InhRelation</structname> nodes (Tom Lane)
      </para>
 
      <para>
-      This avoids a failure when <varname>debug_print_parse</> is enabled
+      This avoids a failure when <varname>debug_print_parse</varname> is enabled
       and certain types of query are executed.
      </para>
     </listitem>
@@ -7444,46 +7444,46 @@
     <listitem>
      <para>
       Fix incorrect calculation of transaction status in
-      <application>ecpg</> (Itagaki Takahiro)
+      <application>ecpg</application> (Itagaki Takahiro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix errors in <application>psql</>'s Unicode-escape support (Tom Lane)
+      Fix errors in <application>psql</application>'s Unicode-escape support (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Speed up parallel <application>pg_restore</> when the archive
+      Speed up parallel <application>pg_restore</application> when the archive
       contains many large objects (blobs) (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s handling of <quote>simple</>
+      Fix <application>PL/pgSQL</application>'s handling of <quote>simple</quote>
       expressions to not fail in recursion or error-recovery cases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/pgSQL</>'s error reporting for no-such-column
+      Fix <application>PL/pgSQL</application>'s error reporting for no-such-column
       cases (Tom Lane)
      </para>
 
      <para>
       As of 9.0, it would sometimes report <quote>missing FROM-clause entry
-      for table foo</> when <quote>record foo has no field bar</> would be
+      for table foo</quote> when <quote>record foo has no field bar</quote> would be
       more appropriate.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> to honor typmod (i.e., length or
+      Fix <application>PL/Python</application> to honor typmod (i.e., length or
       precision restrictions) when assigning to tuple fields (Tom Lane)
      </para>
 
@@ -7494,7 +7494,7 @@
 
     <listitem>
      <para>
-      Fix <application>PL/Python</>'s handling of set-returning functions
+      Fix <application>PL/Python</application>'s handling of set-returning functions
       (Jan Urbanski)
      </para>
 
@@ -7506,22 +7506,22 @@
 
     <listitem>
      <para>
-      Fix bug in <filename>contrib/cube</>'s GiST picksplit algorithm
+      Fix bug in <filename>contrib/cube</filename>'s GiST picksplit algorithm
       (Alexander Korotkov)
      </para>
 
      <para>
       This could result in considerable inefficiency, though not actually
-      incorrect answers, in a GiST index on a <type>cube</> column.
-      If you have such an index, consider <command>REINDEX</>ing it after
+      incorrect answers, in a GiST index on a <type>cube</type> column.
+      If you have such an index, consider <command>REINDEX</command>ing it after
       installing this update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't emit <quote>identifier will be truncated</> notices in
-      <filename>contrib/dblink</> except when creating new connections
+      Don't emit <quote>identifier will be truncated</quote> notices in
+      <filename>contrib/dblink</filename> except when creating new connections
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -7529,26 +7529,26 @@
     <listitem>
      <para>
       Fix potential coredump on missing public key in
-      <filename>contrib/pgcrypto</> (Marti Raudsepp)
+      <filename>contrib/pgcrypto</filename> (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix buffer overrun in <filename>contrib/pg_upgrade</> (Hernan Gonzalez)
+      Fix buffer overrun in <filename>contrib/pg_upgrade</filename> (Hernan Gonzalez)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in <filename>contrib/xml2</>'s XPath query functions
+      Fix memory leak in <filename>contrib/xml2</filename>'s XPath query functions
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2010o
+      Update time zone data files to <application>tzdata</application> release 2010o
       for DST law changes in Fiji and Samoa;
       also historical corrections for Hong Kong.
      </para>
@@ -7570,7 +7570,7 @@
   <para>
    This release contains a variety of fixes from 9.0.0.
    For information about new features in the 9.0 major release, see
-   <xref linkend="release-9-0">.
+   <xref linkend="release-9-0"/>.
   </para>
 
   <sect2>
@@ -7597,7 +7597,7 @@
       This change prevents security problems that can be caused by subverting
       Perl or Tcl code that will be executed later in the same session under
       another SQL user identity (for example, within a <literal>SECURITY
-      DEFINER</> function).  Most scripting languages offer numerous ways that
+      DEFINER</literal> function).  Most scripting languages offer numerous ways that
       that might be done, such as redefining standard functions or operators
       called by the target function.  Without this change, any SQL user with
       Perl or Tcl language usage rights can do essentially anything with the
@@ -7626,7 +7626,7 @@
 
     <listitem>
      <para>
-      Improve <function>pg_get_expr()</> security fix so that the function
+      Improve <function>pg_get_expr()</function> security fix so that the function
       can still be used on the output of a sub-select (Tom Lane)
      </para>
     </listitem>
@@ -7651,7 +7651,7 @@
 
     <listitem>
      <para>
-      Fix possible duplicate scans of <literal>UNION ALL</> member relations
+      Fix possible duplicate scans of <literal>UNION ALL</literal> member relations
       (Tom Lane)
      </para>
     </listitem>
@@ -7676,14 +7676,14 @@
      </para>
 
      <para>
-      Input such as <literal>'J100000'::date</> worked before 8.4,
+      Input such as <literal>'J100000'::date</literal> worked before 8.4,
       but was unintentionally broken by added error-checking.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make psql recognize <command>DISCARD ALL</> as a command that should
+      Make psql recognize <command>DISCARD ALL</command> as a command that should
       not be encased in a transaction block in autocommit-off mode
       (Itagaki Takahiro)
      </para>
@@ -7714,12 +7714,12 @@
 
    <para>
     This release of
-    <productname>PostgreSQL</> adds features that have been requested
+    <productname>PostgreSQL</productname> adds features that have been requested
     for years, such as easy-to-use replication, a mass permission-changing
     facility, and anonymous code blocks. While past major releases have
     been conservative in their scope, this release shows a
     bold new desire to provide facilities that new and existing
-    users of <productname>PostgreSQL</> will embrace. This has all
+    users of <productname>PostgreSQL</productname> will embrace. This has all
     been done with few incompatibilities. Major enhancements include:
    </para>
 
@@ -7732,7 +7732,7 @@
      <para>
       Built-in replication based on log shipping.  This advance consists of
       two features: Streaming Replication, allowing continuous archive
-      (<acronym>WAL</>) files to be streamed over a network connection to a
+      (<acronym>WAL</acronym>) files to be streamed over a network connection to a
       standby server, and Hot Standby, allowing continuous archive standby
       servers to execute read-only queries.  The net effect is to support a
       single master with multiple read-only slave servers.
@@ -7742,10 +7742,10 @@
     <listitem>
      <para>
       Easier database object permissions management. <link
-      linkend="SQL-GRANT"><command>GRANT</>/<command>REVOKE IN
-      SCHEMA</></link> supports mass permissions changes on existing objects,
-      while <link linkend="SQL-ALTERDEFAULTPRIVILEGES"><command>ALTER DEFAULT
-      PRIVILEGES</></link> allows control of privileges for objects created in
+      linkend="sql-grant"><command>GRANT</command>/<command>REVOKE IN
+      SCHEMA</command></link> supports mass permissions changes on existing objects,
+      while <link linkend="sql-alterdefaultprivileges"><command>ALTER DEFAULT
+      PRIVILEGES</command></link> allows control of privileges for objects created in
       the future.  Large objects (BLOBs) now support permissions management as
       well.
      </para>
@@ -7754,8 +7754,8 @@
     <listitem>
      <para>
       Broadly enhanced stored procedure support.
-      The <link linkend="SQL-DO"><command>DO</></link> statement supports
-      ad-hoc or <quote>anonymous</> code blocks.
+      The <link linkend="sql-do"><command>DO</command></link> statement supports
+      ad-hoc or <quote>anonymous</quote> code blocks.
       Functions can now be called using named parameters.
       <link linkend="plpgsql">PL/pgSQL</link> is now installed by default, and
       <link linkend="plperl">PL/Perl</link> and <link
@@ -7767,14 +7767,14 @@
     <listitem>
      <para>
       Full support for <link linkend="install-windows">64-bit
-      <productname>Windows</></link>.
+      <productname>Windows</productname></link>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       More advanced reporting queries, including additional windowing options
-      (<literal>PRECEDING</> and <literal>FOLLOWING</>) and the ability to
+      (<literal>PRECEDING</literal> and <literal>FOLLOWING</literal>) and the ability to
       control the order in which values are fed to aggregate functions.
      </para>
     </listitem>
@@ -7783,14 +7783,14 @@
      <para>
       New trigger features, including
       SQL-standard-compliant <link
-      linkend="SQL-CREATETRIGGER">per-column triggers</link> and
+      linkend="sql-createtrigger">per-column triggers</link> and
       conditional trigger execution.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <link linkend="SQL-CREATETABLE-compatibility">Deferrable
+      <link linkend="sql-createtable-compatibility">Deferrable
       unique constraints</link>. Mass updates to unique keys are now possible
       without trickery.
      </para>
@@ -7808,7 +7808,7 @@
      <para>
       New and enhanced security features, including RADIUS authentication,
       LDAP authentication improvements, and a new contrib module
-      <link linkend="passwordcheck"><filename>passwordcheck</></link>
+      <link linkend="passwordcheck"><filename>passwordcheck</filename></link>
       for testing password strength.
      </para>
     </listitem>
@@ -7816,10 +7816,10 @@
     <listitem>
      <para>
       New high-performance implementation of the
-      <link linkend="SQL-LISTEN"><command>LISTEN</></link>/<link
-      linkend="SQL-NOTIFY"><command>NOTIFY</></link> feature.
+      <link linkend="sql-listen"><command>LISTEN</command></link>/<link
+      linkend="sql-notify"><command>NOTIFY</command></link> feature.
       Pending events are now stored in a memory-based queue rather than
-      a table.  Also, a <quote>payload</> string can be sent with each
+      a table.  Also, a <quote>payload</quote> string can be sent with each
       event, rather than transmitting just an event name as before.
      </para>
     </listitem>
@@ -7827,7 +7827,7 @@
     <listitem>
      <para>
       New implementation of
-      <link linkend="SQL-VACUUM"><command>VACUUM FULL</></link>.
+      <link linkend="sql-vacuum"><command>VACUUM FULL</command></link>.
       This command now rewrites the entire table and indexes, rather than
       moving individual rows to compact space.  It is substantially faster
       in most cases, and no longer results in index bloat.
@@ -7837,7 +7837,7 @@
     <listitem>
      <para>
       New contrib module
-      <link linkend="pgupgrade"><filename>pg_upgrade</></link>
+      <link linkend="pgupgrade"><filename>pg_upgrade</filename></link>
       to support in-place upgrades from 8.3 or 8.4 to 9.0.
      </para>
     </listitem>
@@ -7853,7 +7853,7 @@
 
     <listitem>
      <para>
-      <link linkend="SQL-EXPLAIN "><command>EXPLAIN</></link> enhancements.
+      <link linkend="sql-explain"><command>EXPLAIN</command></link> enhancements.
       The output is now available in JSON, XML, or YAML format, and includes
       buffer utilization and other data not previously available.
      </para>
@@ -7861,7 +7861,7 @@
 
     <listitem>
      <para>
-      <link linkend="hstore"><filename>hstore</></link> improvements,
+      <link linkend="hstore"><filename>hstore</filename></link> improvements,
       including new functions and greater data capacity.
      </para>
     </listitem>
@@ -7901,34 +7901,34 @@
 
     <listitem>
      <para>
-      Remove server parameter <varname>add_missing_from</>, which was
+      Remove server parameter <varname>add_missing_from</varname>, which was
       defaulted to off for many years (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove server parameter <varname>regex_flavor</>, which
+      Remove server parameter <varname>regex_flavor</varname>, which
       was defaulted to <link
-      linkend="posix-syntax-details"><literal>advanced</></link>
+      linkend="posix-syntax-details"><literal>advanced</literal></link>
       for many years (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <link linkend="guc-archive-mode"><varname>archive_mode</></link>
+      <link linkend="guc-archive-mode"><varname>archive_mode</varname></link>
       now only affects <link
-      linkend="guc-archive-command"><varname>archive_command</></link>;
+      linkend="guc-archive-command"><varname>archive_command</varname></link>;
       a new setting, <link
-      linkend="guc-wal-level"><varname>wal_level</></link>, affects
+      linkend="guc-wal-level"><varname>wal_level</varname></link>, affects
       the contents of the write-ahead log (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <link linkend="guc-log-temp-files"><varname>log_temp_files</></link>
+      <link linkend="guc-log-temp-files"><varname>log_temp_files</varname></link>
       now uses default file size units of kilobytes (Robert Haas)
      </para>
     </listitem>
@@ -7967,13 +7967,13 @@
 
     <listitem>
      <para>
-      <link linkend="datatype-binary"><type>bytea</></link> output now
+      <link linkend="datatype-binary"><type>bytea</type></link> output now
       appears in hex format by default (Peter Eisentraut)
      </para>
 
      <para>
       The server parameter <link
-      linkend="guc-bytea-output"><varname>bytea_output</></link> can be
+      linkend="guc-bytea-output"><varname>bytea_output</varname></link> can be
       used to select the traditional output format if needed for
       compatibility.
      </para>
@@ -7995,18 +7995,18 @@
    <listitem>
     <para>
      Improve standards compliance of <link
-     linkend="functions-similarto-regexp"><literal>SIMILAR TO</></link>
-     patterns and SQL-style <function>substring()</> patterns (Tom Lane)
+     linkend="functions-similarto-regexp"><literal>SIMILAR TO</literal></link>
+     patterns and SQL-style <function>substring()</function> patterns (Tom Lane)
     </para>
 
     <para>
-     This includes treating <literal>?</> and <literal>{...}</> as
+     This includes treating <literal>?</literal> and <literal>{...}</literal> as
      pattern metacharacters, while they were simple literal characters
      before; that corresponds to new features added in SQL:2008.
-     Also, <literal>^</> and <literal>$</> are now treated as simple
+     Also, <literal>^</literal> and <literal>$</literal> are now treated as simple
      literal characters; formerly they were treated as metacharacters,
      as if the pattern were following POSIX rather than SQL rules.
-     Also, in SQL-standard <function>substring()</>, use of parentheses
+     Also, in SQL-standard <function>substring()</function>, use of parentheses
      for nesting no longer interferes with capturing of a substring.
      Also, processing of bracket expressions (character classes) is
      now more standards-compliant.
@@ -8016,14 +8016,14 @@
    <listitem>
     <para>
      Reject negative length values in 3-parameter <link
-     linkend="functions-string-sql"><function>substring()</></link>
+     linkend="functions-string-sql"><function>substring()</function></link>
      for bit strings, per the SQL standard (Tom Lane)
     </para>
    </listitem>
 
    <listitem>
     <para>
-     Make <function>date_trunc</> truncate rather than round when reducing
+     Make <function>date_trunc</function> truncate rather than round when reducing
      precision of fractional seconds (Tom Lane)
     </para>
 
@@ -8044,7 +8044,7 @@
 
     <listitem>
      <para>
-      Tighten enforcement of column name consistency during <command>RENAME</>
+      Tighten enforcement of column name consistency during <command>RENAME</command>
       when a child table inherits the same column from multiple unrelated
       parents (KaiGai Kohei)
      </para>
@@ -8100,8 +8100,8 @@
       situations.  Although it's recommended that functions encountering this
       type of error be modified to remove the conflict, the old behavior can
       be restored if necessary via the configuration parameter <link
-      linkend="plpgsql-var-subst"><varname>plpgsql.variable_conflict</></link>,
-      or via the per-function option <literal>#variable_conflict</>.
+      linkend="plpgsql-var-subst"><varname>plpgsql.variable_conflict</varname></link>,
+      or via the per-function option <literal>#variable_conflict</literal>.
      </para>
     </listitem>
 
@@ -8126,8 +8126,8 @@
 
      <para>
       For example, if a column of the result type is declared as
-      <literal>NUMERIC(30,2)</>, it is no longer acceptable to return a
-      <literal>NUMERIC</> of some other precision in that column.  Previous
+      <literal>NUMERIC(30,2)</literal>, it is no longer acceptable to return a
+      <literal>NUMERIC</literal> of some other precision in that column.  Previous
       versions neglected to check the type modifier and would thus allow
       result rows that didn't actually conform to the declared restrictions.
      </para>
@@ -8141,33 +8141,33 @@
 
      <para>
       Formerly, a statement like
-      <literal>SELECT ... INTO <replaceable>rec</>.<replaceable>fld</> FROM ...</literal>
+      <literal>SELECT ... INTO <replaceable>rec</replaceable>.<replaceable>fld</replaceable> FROM ...</literal>
       was treated as a scalar assignment even if the record field
-      <replaceable>fld</> was of composite type.  Now it is treated as a
-      record assignment, the same as when the <literal>INTO</> target is a
+      <replaceable>fld</replaceable> was of composite type.  Now it is treated as a
+      record assignment, the same as when the <literal>INTO</literal> target is a
       regular variable of composite type.  So the values to be assigned to the
       field's subfields should be written as separate columns of the
-      <command>SELECT</> list, not as a <literal>ROW(...)</> construct as in
+      <command>SELECT</command> list, not as a <literal>ROW(...)</literal> construct as in
       previous versions.
      </para>
 
      <para>
       If you need to do this in a way that will work in both 9.0 and previous
       releases, you can write something like
-      <literal><replaceable>rec</>.<replaceable>fld</> := ROW(...) FROM ...</literal>.
+      <literal><replaceable>rec</replaceable>.<replaceable>fld</replaceable> := ROW(...) FROM ...</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove PL/pgSQL's <literal>RENAME</> declaration (Tom Lane)
+      Remove PL/pgSQL's <literal>RENAME</literal> declaration (Tom Lane)
      </para>
 
      <para>
-      Instead of <literal>RENAME</>, use <link
-      linkend="plpgsql-declaration-alias"><literal>ALIAS</></link>,
+      Instead of <literal>RENAME</literal>, use <link
+      linkend="plpgsql-declaration-alias"><literal>ALIAS</literal></link>,
       which can now create an alias for any variable, not only dollar sign
-      parameter names (such as <literal>$1</>) as before.
+      parameter names (such as <literal>$1</literal>) as before.
      </para>
     </listitem>
    </itemizedlist>
@@ -8181,11 +8181,11 @@
 
     <listitem>
      <para>
-      Deprecate use of <literal>=&gt;</> as an operator name (Robert Haas)
+      Deprecate use of <literal>=&gt;</literal> as an operator name (Robert Haas)
      </para>
 
      <para>
-      Future versions of <productname>PostgreSQL</> will probably reject
+      Future versions of <productname>PostgreSQL</productname> will probably reject
       this operator name entirely, in order to support the SQL-standard
       notation for named function parameters.  For the moment, it is
       still allowed, but a warning is emitted when such an operator is
@@ -8240,7 +8240,7 @@
 
       <para>
        This feature is called Hot Standby. There are new
-       <filename>postgresql.conf</> and <filename>recovery.conf</>
+       <filename>postgresql.conf</filename> and <filename>recovery.conf</filename>
        settings to control this feature, as well as extensive
        <link linkend="hot-standby">documentation</link>.
       </para>
@@ -8248,18 +8248,18 @@
 
      <listitem>
       <para>
-       Allow write-ahead log (<acronym>WAL</>) data to be streamed to a
+       Allow write-ahead log (<acronym>WAL</acronym>) data to be streamed to a
        standby server (Fujii Masao, Heikki Linnakangas)
       </para>
 
       <para>
        This feature is called Streaming Replication.
-       Previously <acronym>WAL</> data could be sent to standby servers only
-       in units of entire <acronym>WAL</> files (normally 16 megabytes each).
+       Previously <acronym>WAL</acronym> data could be sent to standby servers only
+       in units of entire <acronym>WAL</acronym> files (normally 16 megabytes each).
        Streaming Replication eliminates this inefficiency and allows updates
        on the master to be propagated to standby servers with very little
-       delay.  There are new <filename>postgresql.conf</> and
-       <filename>recovery.conf</> settings to control this feature, as well as
+       delay.  There are new <filename>postgresql.conf</filename> and
+       <filename>recovery.conf</filename> settings to control this feature, as well as
        extensive <link linkend="streaming-replication">documentation</link>.
       </para>
      </listitem>
@@ -8267,9 +8267,9 @@
      <listitem>
       <para>
        Add <link
-       linkend="functions-recovery-info-table"><function>pg_last_xlog_receive_location()</></link>
-       and <function>pg_last_xlog_replay_location()</>, which
-       can be used to monitor standby server <acronym>WAL</>
+       linkend="functions-recovery-info-table"><function>pg_last_xlog_receive_location()</function></link>
+       and <function>pg_last_xlog_replay_location()</function>, which
+       can be used to monitor standby server <acronym>WAL</acronym>
        activity (Simon Riggs, Fujii Masao, Heikki Linnakangas)
       </para>
      </listitem>
@@ -8286,9 +8286,9 @@
      <listitem>
       <para>
        Allow per-tablespace values to be set for sequential and random page
-       cost estimates (<varname>seq_page_cost</>/<varname>random_page_cost</>)
-       via <link linkend="SQL-ALTERTABLESPACE"><command>ALTER TABLESPACE
-       ... SET/RESET</></link> (Robert Haas)
+       cost estimates (<varname>seq_page_cost</varname>/<varname>random_page_cost</varname>)
+       via <link linkend="sql-altertablespace"><command>ALTER TABLESPACE
+       ... SET/RESET</command></link> (Robert Haas)
       </para>
      </listitem>
 
@@ -8299,8 +8299,8 @@
       </para>
 
       <para>
-       <command>UPDATE</>, <command>DELETE</>, and <command>SELECT FOR
-       UPDATE/SHARE</> queries that involve joins will now behave much better
+       <command>UPDATE</command>, <command>DELETE</command>, and <command>SELECT FOR
+       UPDATE/SHARE</command> queries that involve joins will now behave much better
        when encountering freshly-updated rows.
       </para>
      </listitem>
@@ -8308,7 +8308,7 @@
      <listitem>
       <para>
        Improve performance of <link
-       linkend="SQL-TRUNCATE"><command>TRUNCATE</></link> when
+       linkend="sql-truncate"><command>TRUNCATE</command></link> when
        the table was created or truncated earlier in the same transaction
        (Tom Lane)
       </para>
@@ -8345,12 +8345,12 @@
 
      <listitem>
       <para>
-       Allow <literal>IS NOT NULL</> restrictions to use indexes (Tom Lane)
+       Allow <literal>IS NOT NULL</literal> restrictions to use indexes (Tom Lane)
       </para>
 
       <para>
        This is particularly useful for finding
-       <function>MAX()</>/<function>MIN()</> values in indexes that
+       <function>MAX()</function>/<function>MIN()</function> values in indexes that
        contain many null values.
       </para>
      </listitem>
@@ -8358,7 +8358,7 @@
      <listitem>
       <para>
        Improve the optimizer's choices about when to use materialize nodes,
-       and when to use sorting versus hashing for <literal>DISTINCT</>
+       and when to use sorting versus hashing for <literal>DISTINCT</literal>
        (Tom Lane)
       </para>
      </listitem>
@@ -8366,7 +8366,7 @@
      <listitem>
       <para>
        Improve the optimizer's equivalence detection for expressions involving
-       <type>boolean</> <literal>&lt;&gt;</> operators (Tom Lane)
+       <type>boolean</type> <literal>&lt;&gt;</literal> operators (Tom Lane)
       </para>
      </listitem>
     </itemizedlist>
@@ -8387,7 +8387,7 @@
        While the Genetic Query Optimizer (GEQO) still selects
        random plans, it now always selects the same random plans for identical
        queries, thus giving more consistent performance. You can modify <link
-       linkend="guc-geqo-seed"><varname>geqo_seed</></link> to experiment with
+       linkend="guc-geqo-seed"><varname>geqo_seed</varname></link> to experiment with
        alternative plans.
       </para>
      </listitem>
@@ -8398,7 +8398,7 @@
       </para>
 
       <para>
-       This avoids the rare error <quote>failed to make a valid plan</>,
+       This avoids the rare error <quote>failed to make a valid plan</quote>,
        and should also improve planning speed.
       </para>
      </listitem>
@@ -8414,7 +8414,7 @@
 
      <listitem>
       <para>
-       Improve <link linkend="SQL-ANALYZE"><command>ANALYZE</></link>
+       Improve <link linkend="sql-analyze"><command>ANALYZE</command></link>
        to support inheritance-tree statistics (Tom Lane)
       </para>
 
@@ -8451,14 +8451,14 @@
      <listitem>
       <para>
        Allow setting of number-of-distinct-values statistics using <link
-       linkend="SQL-ALTERTABLE"><command>ALTER TABLE</></link>
+       linkend="sql-altertable"><command>ALTER TABLE</command></link>
        (Robert Haas)
       </para>
 
       <para>
        This allows users to override the estimated number or percentage of
        distinct values for a column. This statistic is normally computed by
-       <command>ANALYZE</>, but the estimate can be poor, especially on tables
+       <command>ANALYZE</command>, but the estimate can be poor, especially on tables
        with very large numbers of rows.
       </para>
      </listitem>
@@ -8475,7 +8475,7 @@
      <listitem>
       <para>
        Add support for <link
-       linkend="auth-radius"><acronym>RADIUS</></link> (Remote
+       linkend="auth-radius"><acronym>RADIUS</acronym></link> (Remote
        Authentication Dial In User Service) authentication
        (Magnus Hagander)
       </para>
@@ -8483,28 +8483,28 @@
 
      <listitem>
       <para>
-       Allow <link linkend="auth-ldap"><acronym>LDAP</></link>
+       Allow <link linkend="auth-ldap"><acronym>LDAP</acronym></link>
        (Lightweight Directory Access Protocol) authentication
-       to operate in <quote>search/bind</> mode
+       to operate in <quote>search/bind</quote> mode
        (Robert Fleming, Magnus Hagander)
       </para>
 
       <para>
        This allows the user to be looked up first, then the system uses
-       the <acronym>DN</> (Distinguished Name) returned for that user.
+       the <acronym>DN</acronym> (Distinguished Name) returned for that user.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add <link
-       linkend="auth-pg-hba-conf"><literal>samehost</></link>
-       and <literal>samenet</> designations to
-       <filename>pg_hba.conf</> (Stef Walter)
+       linkend="auth-pg-hba-conf"><literal>samehost</literal></link>
+       and <literal>samenet</literal> designations to
+       <filename>pg_hba.conf</filename> (Stef Walter)
       </para>
 
       <para>
-       These match the server's <acronym>IP</> address and subnet address
+       These match the server's <acronym>IP</acronym> address and subnet address
        respectively.
       </para>
      </listitem>
@@ -8530,7 +8530,7 @@
        Add the ability for clients to set an <link
        linkend="libpq-connect-application-name">application
        name</link>, which is displayed in
-       <structname>pg_stat_activity</> (Dave Page)
+       <structname>pg_stat_activity</structname> (Dave Page)
       </para>
 
       <para>
@@ -8541,8 +8541,8 @@
 
      <listitem>
       <para>
-       Add a SQLSTATE option (<literal>%e</>) to <link
-       linkend="guc-log-line-prefix"><varname>log_line_prefix</></link>
+       Add a SQLSTATE option (<literal>%e</literal>) to <link
+       linkend="guc-log-line-prefix"><varname>log_line_prefix</varname></link>
        (Guillaume Smet)
       </para>
 
@@ -8555,7 +8555,7 @@
 
      <listitem>
       <para>
-       Write to the Windows event log in <acronym>UTF16</> encoding
+       Write to the Windows event log in <acronym>UTF16</acronym> encoding
        (Itagaki Takahiro)
       </para>
 
@@ -8577,7 +8577,7 @@
      <listitem>
       <para>
        Add <link
-       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset_shared('bgwriter')</></link>
+       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset_shared('bgwriter')</function></link>
        to reset the cluster-wide shared statistics for the
        background writer (Greg Smith)
       </para>
@@ -8586,8 +8586,8 @@
      <listitem>
       <para>
        Add <link
-       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset_single_table_counters()</></link>
-       and <function>pg_stat_reset_single_function_counters()</>
+       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset_single_table_counters()</function></link>
+       and <function>pg_stat_reset_single_function_counters()</function>
        to allow resetting the statistics counters for individual
        tables and functions (Magnus Hagander)
       </para>
@@ -8612,10 +8612,10 @@
       <para>
        Previously only per-database and per-role settings were possible,
        not combinations. All role and database settings are now stored
-       in the new <structname>pg_db_role_setting</> system catalog. A new
-       <application>psql</> command <literal>\drds</> shows these settings.
-       The legacy system views <structname>pg_roles</>,
-       <structname>pg_shadow</>, and <structname>pg_user</>
+       in the new <structname>pg_db_role_setting</structname> system catalog. A new
+       <application>psql</application> command <literal>\drds</literal> shows these settings.
+       The legacy system views <structname>pg_roles</structname>,
+       <structname>pg_shadow</structname>, and <structname>pg_user</structname>
        do not show combination settings, and therefore no longer
        completely represent the configuration for a user or database.
       </para>
@@ -8624,9 +8624,9 @@
      <listitem>
       <para>
        Add server parameter <link
-       linkend="guc-bonjour"><varname>bonjour</></link>, which
+       linkend="guc-bonjour"><varname>bonjour</varname></link>, which
        controls whether a Bonjour-enabled server advertises
-       itself via <productname>Bonjour</> (Tom Lane)
+       itself via <productname>Bonjour</productname> (Tom Lane)
       </para>
 
       <para>
@@ -8639,7 +8639,7 @@
      <listitem>
       <para>
        Add server parameter <link
-       linkend="guc-enable-material"><varname>enable_material</></link>, which
+       linkend="guc-enable-material"><varname>enable_material</varname></link>, which
        controls the use of materialize nodes in the optimizer
        (Robert Haas)
       </para>
@@ -8654,7 +8654,7 @@
      <listitem>
       <para>
        Change server parameter <link
-       linkend="guc-log-temp-files"><varname>log_temp_files</></link> to
+       linkend="guc-log-temp-files"><varname>log_temp_files</varname></link> to
        use default file size units of kilobytes (Robert Haas)
       </para>
 
@@ -8666,14 +8666,14 @@
 
      <listitem>
       <para>
-       Log changes of parameter values when <filename>postgresql.conf</> is
+       Log changes of parameter values when <filename>postgresql.conf</filename> is
        reloaded (Peter Eisentraut)
       </para>
 
       <para>
        This lets administrators and security staff audit changes of database
        settings, and is also very convenient for checking the effects of
-       <filename>postgresql.conf</> edits.
+       <filename>postgresql.conf</filename> edits.
       </para>
      </listitem>
 
@@ -8685,10 +8685,10 @@
 
       <para>
        Non-superusers can no longer issue <command>ALTER
-       ROLE</>/<command>DATABASE SET</> for parameters that are not currently
+       ROLE</command>/<command>DATABASE SET</command> for parameters that are not currently
        known to the server.  This allows the server to correctly check that
        superuser-only parameters are only set by superusers.  Previously,
-       the <literal>SET</> would be allowed and then ignored at session start,
+       the <literal>SET</literal> would be allowed and then ignored at session start,
        making superuser-only custom parameters much less useful than they
        should be.
       </para>
@@ -8707,25 +8707,25 @@
 
     <listitem>
      <para>
-      Perform <link linkend="SQL-FOR-UPDATE-SHARE"><command>SELECT
-      FOR UPDATE</>/<literal>SHARE</></link> processing after
-      applying <literal>LIMIT</>, so the number of rows returned
+      Perform <link linkend="sql-for-update-share"><command>SELECT
+      FOR UPDATE</command>/<literal>SHARE</literal></link> processing after
+      applying <literal>LIMIT</literal>, so the number of rows returned
       is always predictable (Tom Lane)
      </para>
 
      <para>
       Previously, changes made by concurrent transactions could cause a
-      <command>SELECT FOR UPDATE</> to unexpectedly return fewer rows than
-      specified by its <literal>LIMIT</>. <literal>FOR UPDATE</> in combination
-      with <literal>ORDER BY</> can still produce surprising results, but that
-      can be corrected by placing <literal>FOR UPDATE</> in a subquery.
+      <command>SELECT FOR UPDATE</command> to unexpectedly return fewer rows than
+      specified by its <literal>LIMIT</literal>. <literal>FOR UPDATE</literal> in combination
+      with <literal>ORDER BY</literal> can still produce surprising results, but that
+      can be corrected by placing <literal>FOR UPDATE</literal> in a subquery.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Allow mixing of traditional and SQL-standard <link
-      linkend="SQL-LIMIT"><literal>LIMIT</>/<literal>OFFSET</></link>
+      linkend="sql-limit"><literal>LIMIT</literal>/<literal>OFFSET</literal></link>
       syntax (Tom Lane)
      </para>
     </listitem>
@@ -8733,20 +8733,20 @@
     <listitem>
      <para>
       Extend the supported frame options in <link
-      linkend="SQL-WINDOW">window functions</link> (Hitoshi
+      linkend="sql-window">window functions</link> (Hitoshi
       Harada)
      </para>
 
      <para>
-      Frames can now start with <literal>CURRENT ROW</>, and the <literal>ROWS
-      <replaceable>n</> PRECEDING</>/<literal>FOLLOWING</> options are now
+      Frames can now start with <literal>CURRENT ROW</literal>, and the <literal>ROWS
+      <replaceable>n</replaceable> PRECEDING</literal>/<literal>FOLLOWING</literal> options are now
       supported.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>SELECT INTO</> and <command>CREATE TABLE AS</> return
+      Make <command>SELECT INTO</command> and <command>CREATE TABLE AS</command> return
       row counts to the client in their command tags
       (Boszormenyi Zoltan)
      </para>
@@ -8769,7 +8769,7 @@
       <para>
        Support Unicode surrogate pairs (dual 16-bit representation) in
        <link
-       linkend="sql-syntax-strings-uescape"><literal>U&amp;</></link>
+       linkend="sql-syntax-strings-uescape"><literal>U&amp;</literal></link>
        strings and identifiers (Peter Eisentraut)
       </para>
      </listitem>
@@ -8777,7 +8777,7 @@
      <listitem>
       <para>
        Support Unicode escapes in <link
-       linkend="sql-syntax-strings-escape"><literal>E'...'</></link>
+       linkend="sql-syntax-strings-escape"><literal>E'...'</literal></link>
        strings (Marko Kreen)
       </para>
      </listitem>
@@ -8795,36 +8795,36 @@
 
     <listitem>
      <para>
-      Speed up <link linkend="SQL-CREATEDATABASE"><command>CREATE
-      DATABASE</></link> by deferring flushes to disk (Andres
+      Speed up <link linkend="sql-createdatabase"><command>CREATE
+      DATABASE</command></link> by deferring flushes to disk (Andres
       Freund, Greg Stark)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <link linkend="SQL-COMMENT">comments</link> on
+      Allow <link linkend="sql-comment">comments</link> on
       columns of tables, views, and composite types only, not other
-      relation types such as indexes and <acronym>TOAST</> tables (Tom Lane)
+      relation types such as indexes and <acronym>TOAST</acronym> tables (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Allow the creation of <link
-      linkend="SQL-CREATETYPE-enum">enumerated types</link> containing
+      linkend="sql-createtype-enum">enumerated types</link> containing
       no values (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Let values of columns having storage type <literal>MAIN</> remain on
+      Let values of columns having storage type <literal>MAIN</literal> remain on
       the main heap page unless the row cannot fit on a page (Kevin Grittner)
      </para>
 
      <para>
-      Previously <literal>MAIN</> values were forced out to <acronym>TOAST</>
+      Previously <literal>MAIN</literal> values were forced out to <acronym>TOAST</acronym>
       tables until the row size was less than one-quarter of the page size.
      </para>
     </listitem>
@@ -8832,26 +8832,26 @@
    </itemizedlist>
 
    <sect4>
-    <title><command>ALTER TABLE</></title>
+    <title><command>ALTER TABLE</command></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Implement <literal>IF EXISTS</> for <literal>ALTER TABLE DROP COLUMN</>
-       and <literal>ALTER TABLE DROP CONSTRAINT </> (Andres Freund)
+       Implement <literal>IF EXISTS</literal> for <literal>ALTER TABLE DROP COLUMN</literal>
+       and <literal>ALTER TABLE DROP CONSTRAINT </literal> (Andres Freund)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <command>ALTER TABLE</> commands that rewrite tables to skip
-       <acronym>WAL</> logging (Itagaki Takahiro)
+       Allow <command>ALTER TABLE</command> commands that rewrite tables to skip
+       <acronym>WAL</acronym> logging (Itagaki Takahiro)
       </para>
 
       <para>
        Such operations either produce a new copy of the table or are rolled
-       back, so <acronym>WAL</> archiving can be skipped, unless running in
+       back, so <acronym>WAL</acronym> archiving can be skipped, unless running in
        continuous archiving mode.  This reduces I/O overhead and improves
        performance.
       </para>
@@ -8859,8 +8859,8 @@
 
      <listitem>
       <para>
-       Fix failure of <literal>ALTER TABLE <replaceable>table</> ADD COLUMN
-       <replaceable>col</> serial</literal> when done by non-owner of table
+       Fix failure of <literal>ALTER TABLE <replaceable>table</replaceable> ADD COLUMN
+       <replaceable>col</replaceable> serial</literal> when done by non-owner of table
        (Tom Lane)
       </para>
      </listitem>
@@ -8870,14 +8870,14 @@
    </sect4>
 
    <sect4>
-    <title><link linkend="SQL-CREATETABLE"><command>CREATE TABLE</></link></title>
+    <title><link linkend="sql-createtable"><command>CREATE TABLE</command></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Add support for copying <literal>COMMENTS</> and <literal>STORAGE</>
-       settings in <command>CREATE TABLE ... LIKE</> commands
+       Add support for copying <literal>COMMENTS</literal> and <literal>STORAGE</literal>
+       settings in <command>CREATE TABLE ... LIKE</command> commands
        (Itagaki Takahiro)
       </para>
      </listitem>
@@ -8885,14 +8885,14 @@
      <listitem>
       <para>
        Add a shortcut for copying all properties in <command>CREATE
-       TABLE ... LIKE</> commands (Itagaki Takahiro)
+       TABLE ... LIKE</command> commands (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add the SQL-standard
-       <literal>CREATE TABLE ... OF <replaceable>type</></literal> command
+       <literal>CREATE TABLE ... OF <replaceable>type</replaceable></literal> command
        (Peter Eisentraut)
       </para>
 
@@ -8914,16 +8914,16 @@
 
      <listitem>
       <para>
-       Add <link linkend="SQL-CREATETABLE-compatibility">deferrable
+       Add <link linkend="sql-createtable-compatibility">deferrable
        unique constraints</link> (Dean Rasheed)
       </para>
 
       <para>
        This allows mass updates, such as
-       <literal>UPDATE tab SET col = col + 1</>,
+       <literal>UPDATE tab SET col = col + 1</literal>,
        to work reliably
        on columns that have unique indexes or are marked as primary keys.
-       If the constraint is specified as <literal>DEFERRABLE</> it will be
+       If the constraint is specified as <literal>DEFERRABLE</literal> it will be
        checked at the end of the statement, rather than after each row is
        updated. The constraint check can also be deferred until the end of the
        current transaction, allowing such updates to be spread over multiple
@@ -8941,8 +8941,8 @@
       <para>
        Exclusion constraints generalize uniqueness constraints by allowing
        arbitrary comparison operators, not just equality.  They are created
-       with the <link linkend="SQL-CREATETABLE-EXCLUDE"><command>CREATE
-       TABLE CONSTRAINT ... EXCLUDE</></link> clause.
+       with the <link linkend="sql-createtable-exclude"><command>CREATE
+       TABLE CONSTRAINT ... EXCLUDE</command></link> clause.
        The most common use of exclusion constraints is to specify that column
        entries must not overlap, rather than simply not be equal.  This is
        useful for time periods and other ranges, as well as arrays.
@@ -8959,7 +8959,7 @@
 
       <para>
        For example, a uniqueness constraint violation might now report
-       <literal>Key (x)=(2) already exists</>.
+       <literal>Key (x)=(2) already exists</literal>.
       </para>
      </listitem>
 
@@ -8976,8 +8976,8 @@
       <para>
        Add the ability to make mass permission changes across a whole
        schema using the new <link
-       linkend="SQL-GRANT"><command>GRANT</>/<command>REVOKE
-       IN SCHEMA</></link> clause (Petr Jelinek)
+       linkend="sql-grant"><command>GRANT</command>/<command>REVOKE
+       IN SCHEMA</command></link> clause (Petr Jelinek)
       </para>
 
       <para>
@@ -8989,8 +8989,8 @@
 
      <listitem>
       <para>
-       Add <link linkend="SQL-ALTERDEFAULTPRIVILEGES"><command>ALTER
-       DEFAULT PRIVILEGES</></link> command to control privileges
+       Add <link linkend="sql-alterdefaultprivileges"><command>ALTER
+       DEFAULT PRIVILEGES</command></link> command to control privileges
        of objects created later (Petr Jelinek)
       </para>
 
@@ -9005,7 +9005,7 @@
      <listitem>
       <para>
        Add the ability to control large object (BLOB) permissions with
-       <command>GRANT</>/<command>REVOKE</> (KaiGai Kohei)
+       <command>GRANT</command>/<command>REVOKE</command> (KaiGai Kohei)
       </para>
 
       <para>
@@ -9028,8 +9028,8 @@
 
     <listitem>
      <para>
-      Make <link linkend="SQL-LISTEN"><command>LISTEN</></link>/<link
-      linkend="SQL-NOTIFY"><command>NOTIFY</></link> store pending events
+      Make <link linkend="sql-listen"><command>LISTEN</command></link>/<link
+      linkend="sql-notify"><command>NOTIFY</command></link> store pending events
       in a memory queue, rather than in a system table (Joachim
       Wieland)
      </para>
@@ -9042,21 +9042,21 @@
 
     <listitem>
      <para>
-      Allow <link linkend="SQL-NOTIFY"><command>NOTIFY</></link>
-      to pass an optional <quote>payload</> string to listeners
+      Allow <link linkend="sql-notify"><command>NOTIFY</command></link>
+      to pass an optional <quote>payload</quote> string to listeners
       (Joachim Wieland)
      </para>
 
      <para>
       This greatly improves the usefulness of
-      <command>LISTEN</>/<command>NOTIFY</> as a
+      <command>LISTEN</command>/<command>NOTIFY</command> as a
       general-purpose event queue system.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <link linkend="SQL-CLUSTER"><command>CLUSTER</></link>
+      Allow <link linkend="sql-cluster"><command>CLUSTER</command></link>
       on all per-database system catalogs (Tom Lane)
      </para>
 
@@ -9068,30 +9068,30 @@
    </itemizedlist>
 
    <sect4>
-    <title><link linkend="SQL-COPY"><command>COPY</></link></title>
+    <title><link linkend="sql-copy"><command>COPY</command></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Accept <literal>COPY ... CSV FORCE QUOTE *</>
+       Accept <literal>COPY ... CSV FORCE QUOTE *</literal>
        (Itagaki Takahiro)
       </para>
 
       <para>
-       Now <literal>*</> can be used as shorthand for <quote>all columns</>
-       in the <literal>FORCE QUOTE</> clause.
+       Now <literal>*</literal> can be used as shorthand for <quote>all columns</quote>
+       in the <literal>FORCE QUOTE</literal> clause.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new <command>COPY</> syntax that allows options to be
+       Add new <command>COPY</command> syntax that allows options to be
        specified inside parentheses (Robert Haas, Emmanuel Cecchet)
       </para>
 
       <para>
-       This allows greater flexibility for future <command>COPY</> options.
+       This allows greater flexibility for future <command>COPY</command> options.
        The old syntax is still supported, but only for pre-existing options.
       </para>
      </listitem>
@@ -9101,27 +9101,27 @@
    </sect4>
 
    <sect4>
-    <title><link linkend="SQL-EXPLAIN"><command>EXPLAIN</></link></title>
+    <title><link linkend="sql-explain"><command>EXPLAIN</command></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow <command>EXPLAIN</> to output in <acronym>XML</>,
-       <acronym>JSON</>, or <acronym>YAML</> format (Robert Haas, Greg
+       Allow <command>EXPLAIN</command> to output in <acronym>XML</acronym>,
+       <acronym>JSON</acronym>, or <acronym>YAML</acronym> format (Robert Haas, Greg
        Sabino Mullane)
       </para>
 
       <para>
        The new output formats are easily machine-readable, supporting the
-       development of new tools for analysis of <command>EXPLAIN</> output.
+       development of new tools for analysis of <command>EXPLAIN</command> output.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new <literal>BUFFERS</> option to report query
-       buffer usage during <command>EXPLAIN ANALYZE</> (Itagaki Takahiro)
+       Add new <literal>BUFFERS</literal> option to report query
+       buffer usage during <command>EXPLAIN ANALYZE</command> (Itagaki Takahiro)
       </para>
 
       <para>
@@ -9134,19 +9134,19 @@
 
      <listitem>
       <para>
-       Add hash usage information to <command>EXPLAIN</> output (Robert
+       Add hash usage information to <command>EXPLAIN</command> output (Robert
        Haas)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new <command>EXPLAIN</> syntax that allows options to be
+       Add new <command>EXPLAIN</command> syntax that allows options to be
        specified inside parentheses (Robert Haas)
       </para>
 
       <para>
-       This allows greater flexibility for future <command>EXPLAIN</> options.
+       This allows greater flexibility for future <command>EXPLAIN</command> options.
        The old syntax is still supported, but only for pre-existing options.
       </para>
      </listitem>
@@ -9156,13 +9156,13 @@
    </sect4>
 
    <sect4>
-    <title><link linkend="SQL-VACUUM"><command>VACUUM</></link></title>
+    <title><link linkend="sql-vacuum"><command>VACUUM</command></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Change <command>VACUUM FULL</> to rewrite the entire table and
+       Change <command>VACUUM FULL</command> to rewrite the entire table and
        rebuild its indexes, rather than moving individual rows around to
        compact space (Itagaki Takahiro, Tom Lane)
       </para>
@@ -9170,7 +9170,7 @@
       <para>
        The previous method was usually slower and caused index bloat.
        Note that the new method will use more disk space transiently
-       during <command>VACUUM FULL</>; potentially as much as twice
+       during <command>VACUUM FULL</command>; potentially as much as twice
        the space normally occupied by the table and its indexes.
       </para>
 
@@ -9178,12 +9178,12 @@
 
      <listitem>
       <para>
-       Add new <command>VACUUM</> syntax that allows options to be
+       Add new <command>VACUUM</command> syntax that allows options to be
        specified inside parentheses (Itagaki Takahiro)
       </para>
 
       <para>
-       This allows greater flexibility for future <command>VACUUM</> options.
+       This allows greater flexibility for future <command>VACUUM</command> options.
        The old syntax is still supported, but only for pre-existing options.
       </para>
      </listitem>
@@ -9200,7 +9200,7 @@
      <listitem>
       <para>
        Allow an index to be named automatically by omitting the index name in
-       <link linkend="SQL-CREATEINDEX"><command>CREATE INDEX</></link>
+       <link linkend="sql-createindex"><command>CREATE INDEX</command></link>
        (Tom Lane)
       </para>
      </listitem>
@@ -9228,22 +9228,22 @@
 
      <listitem>
       <para>
-       Add <literal>point_ops</> operator class for <acronym>GiST</>
+       Add <literal>point_ops</literal> operator class for <acronym>GiST</acronym>
       (Teodor Sigaev)
       </para>
 
       <para>
-       This feature permits <acronym>GiST</> indexing of <type>point</>
+       This feature permits <acronym>GiST</acronym> indexing of <type>point</type>
        columns.  The index can be used for several types of queries
-       such as <replaceable>point</> <literal>&lt;@</> <replaceable>polygon</>
+       such as <replaceable>point</replaceable> <literal>&lt;@</literal> <replaceable>polygon</replaceable>
        (point is in polygon).  This should make many
-       <productname>PostGIS</> queries faster.
+       <productname>PostGIS</productname> queries faster.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Use red-black binary trees for <acronym>GIN</> index creation
+       Use red-black binary trees for <acronym>GIN</acronym> index creation
        (Teodor Sigaev)
       </para>
 
@@ -9267,16 +9267,16 @@
 
     <listitem>
      <para>
-      Allow <link linkend="datatype-binary"><type>bytea</></link> values
+      Allow <link linkend="datatype-binary"><type>bytea</type></link> values
       to be written in hex notation (Peter Eisentraut)
      </para>
 
      <para>
       The server parameter <link
-      linkend="guc-bytea-output"><varname>bytea_output</></link> controls
-      whether hex or traditional format is used for <type>bytea</>
-      output.  Libpq's <function>PQescapeByteaConn()</> function automatically
-      uses the hex format when connected to <productname>PostgreSQL</> 9.0
+      linkend="guc-bytea-output"><varname>bytea_output</varname></link> controls
+      whether hex or traditional format is used for <type>bytea</type>
+      output.  Libpq's <function>PQescapeByteaConn()</function> function automatically
+      uses the hex format when connected to <productname>PostgreSQL</productname> 9.0
       or newer servers.  However, pre-9.0 libpq versions will not
       correctly process hex format from newer servers.
      </para>
@@ -9293,20 +9293,20 @@
      <para>
       Allow server parameter <link
       linkend="guc-extra-float-digits">extra_float_digits</link>
-      to be increased to <literal>3</> (Tom Lane)
+      to be increased to <literal>3</literal> (Tom Lane)
      </para>
 
      <para>
-      The previous maximum <varname>extra_float_digits</> setting was
-      <literal>2</>.  There are cases where 3 digits are needed to dump and
-      restore <type>float4</> values exactly.  <application>pg_dump</> will
+      The previous maximum <varname>extra_float_digits</varname> setting was
+      <literal>2</literal>.  There are cases where 3 digits are needed to dump and
+      restore <type>float4</type> values exactly.  <application>pg_dump</application> will
       now use the setting of 3 when dumping from a server that allows it.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Tighten input checking for <type>int2vector</> values (Caleb
+      Tighten input checking for <type>int2vector</type> values (Caleb
       Welton)
      </para>
     </listitem>
@@ -9320,14 +9320,14 @@
 
      <listitem>
       <para>
-       Add prefix support in <literal>synonym</> dictionaries
+       Add prefix support in <literal>synonym</literal> dictionaries
        (Teodor Sigaev)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add <firstterm>filtering</> dictionaries (Teodor Sigaev)
+       Add <firstterm>filtering</firstterm> dictionaries (Teodor Sigaev)
       </para>
 
       <para>
@@ -9344,7 +9344,7 @@
 
      <listitem>
       <para>
-       Use more standards-compliant rules for parsing <acronym>URL</> tokens
+       Use more standards-compliant rules for parsing <acronym>URL</acronym> tokens
        (Tom Lane)
       </para>
      </listitem>
@@ -9367,9 +9367,9 @@
      </para>
 
      <para>
-      For example, if a function is defined to take parameters <literal>a</>
-      and <literal>b</>, it can be called with <literal>func(a := 7, b
-      := 12)</> or <literal>func(b := 12, a := 7)</>.
+      For example, if a function is defined to take parameters <literal>a</literal>
+      and <literal>b</literal>, it can be called with <literal>func(a := 7, b
+      := 12)</literal> or <literal>func(b := 12, a := 7)</literal>.
      </para>
     </listitem>
 
@@ -9377,24 +9377,24 @@
      <para>
       Support locale-specific <link
       linkend="functions-posix-regexp">regular expression</link>
-      processing with <acronym>UTF-8</> server encoding (Tom Lane)
+      processing with <acronym>UTF-8</acronym> server encoding (Tom Lane)
      </para>
 
      <para>
       Locale-specific regular expression functionality includes
       case-insensitive matching and locale-specific character classes.
-      Previously, these features worked correctly for non-<acronym>ASCII</>
+      Previously, these features worked correctly for non-<acronym>ASCII</acronym>
       characters only if the database used a single-byte server encoding (such
       as LATIN1).  They will still misbehave in multi-byte encodings other
-      than <acronym>UTF-8</>.
+      than <acronym>UTF-8</acronym>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Add support for scientific notation in <link
-      linkend="functions-formatting"><function>to_char()</></link>
-      (<link linkend="functions-formatting-numeric-table"><literal>EEEE</>
+      linkend="functions-formatting"><function>to_char()</function></link>
+      (<link linkend="functions-formatting-numeric-table"><literal>EEEE</literal>
       specification</link>)
       (Pavel Stehule, Brendan Jurd)
      </para>
@@ -9402,21 +9402,21 @@
 
     <listitem>
      <para>
-      Make <function>to_char()</> honor <link
-      linkend="functions-formatting-datetimemod-table"><literal>FM</></link>
-      (fill mode) in <literal>Y</>, <literal>YY</>, and
-      <literal>YYY</> specifications (Bruce Momjian, Tom Lane)
+      Make <function>to_char()</function> honor <link
+      linkend="functions-formatting-datetimemod-table"><literal>FM</literal></link>
+      (fill mode) in <literal>Y</literal>, <literal>YY</literal>, and
+      <literal>YYY</literal> specifications (Bruce Momjian, Tom Lane)
      </para>
 
      <para>
-      It was already honored by <literal>YYYY</>.
+      It was already honored by <literal>YYYY</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to output localized numeric and monetary
-      strings in the correct encoding on <productname>Windows</>
+      Fix <function>to_char()</function> to output localized numeric and monetary
+      strings in the correct encoding on <productname>Windows</productname>
       (Hiroshi Inoue, Itagaki Takahiro, Bruce Momjian)
      </para>
     </listitem>
@@ -9429,12 +9429,12 @@
      </para>
 
      <para>
-      The polygon <literal>&amp;&amp;</> (overlaps) operator formerly just
+      The polygon <literal>&amp;&amp;</literal> (overlaps) operator formerly just
       checked to see if the two polygons' bounding boxes overlapped.  It now
-      does a more correct check.  The polygon <literal>@&gt;</> and
-      <literal>&lt;@</> (contains/contained by) operators formerly checked
+      does a more correct check.  The polygon <literal>@&gt;</literal> and
+      <literal>&lt;@</literal> (contains/contained by) operators formerly checked
       to see if one polygon's vertexes were all contained in the other;
-      this can wrongly report <quote>true</> for some non-convex polygons.
+      this can wrongly report <quote>true</quote> for some non-convex polygons.
       Now they check that all line segments of one polygon are contained in
       the other.
      </para>
@@ -9450,12 +9450,12 @@
      <listitem>
       <para>
        Allow aggregate functions to use <link
-       linkend="syntax-aggregates"><literal>ORDER BY</></link> (Andrew Gierth)
+       linkend="syntax-aggregates"><literal>ORDER BY</literal></link> (Andrew Gierth)
       </para>
 
       <para>
        For example, this is now supported: <literal>array_agg(a ORDER BY
-       b)</>.  This is useful with aggregates for which the order of input
+       b)</literal>.  This is useful with aggregates for which the order of input
        values is significant, and eliminates the need to use a nonstandard
        subquery to determine the ordering.
       </para>
@@ -9463,7 +9463,7 @@
 
      <listitem>
       <para>
-       Multi-argument aggregate functions can now use <literal>DISTINCT</>
+       Multi-argument aggregate functions can now use <literal>DISTINCT</literal>
        (Andrew Gierth)
       </para>
      </listitem>
@@ -9471,7 +9471,7 @@
      <listitem>
       <para>
        Add the <link
-       linkend="functions-aggregate-table"><function>string_agg()</></link>
+       linkend="functions-aggregate-table"><function>string_agg()</function></link>
        aggregate function to combine values into a single
        string (Pavel Stehule)
       </para>
@@ -9479,15 +9479,15 @@
 
      <listitem>
       <para>
-       Aggregate functions that are called with <literal>DISTINCT</> are
+       Aggregate functions that are called with <literal>DISTINCT</literal> are
        now passed NULL values if the aggregate transition function is
-       not marked as <literal>STRICT</> (Andrew Gierth)
+       not marked as <literal>STRICT</literal> (Andrew Gierth)
       </para>
 
       <para>
-       For example, <literal>agg(DISTINCT x)</> might pass a NULL <literal>x</>
-       value to <function>agg()</>.  This is more consistent with the behavior
-       in non-<literal>DISTINCT</> cases.
+       For example, <literal>agg(DISTINCT x)</literal> might pass a NULL <literal>x</literal>
+       value to <function>agg()</function>.  This is more consistent with the behavior
+       in non-<literal>DISTINCT</literal> cases.
       </para>
      </listitem>
 
@@ -9503,9 +9503,9 @@
      <listitem>
       <para>
        Add <link
-       linkend="functions-binarystring-other"><function>get_bit()</></link>
-       and <function>set_bit()</> functions for <type>bit</>
-       strings, mirroring those for <type>bytea</> (Leonardo
+       linkend="functions-binarystring-other"><function>get_bit()</function></link>
+       and <function>set_bit()</function> functions for <type>bit</type>
+       strings, mirroring those for <type>bytea</type> (Leonardo
        F)
       </para>
      </listitem>
@@ -9513,8 +9513,8 @@
      <listitem>
       <para>
        Implement <link
-       linkend="functions-string-sql"><function>OVERLAY()</></link>
-       (replace) for <type>bit</> strings and <type>bytea</>
+       linkend="functions-string-sql"><function>OVERLAY()</function></link>
+       (replace) for <type>bit</type> strings and <type>bytea</type>
        (Leonardo F)
       </para>
      </listitem>
@@ -9531,9 +9531,9 @@
      <listitem>
       <para>
        Add <link
-       linkend="functions-admin-dbsize"><function>pg_table_size()</></link>
-       and <function>pg_indexes_size()</> to provide a more
-       user-friendly interface to the <function>pg_relation_size()</>
+       linkend="functions-admin-dbsize"><function>pg_table_size()</function></link>
+       and <function>pg_indexes_size()</function> to provide a more
+       user-friendly interface to the <function>pg_relation_size()</function>
        function (Bernd Helmle)
       </para>
      </listitem>
@@ -9541,7 +9541,7 @@
      <listitem>
       <para>
        Add <link
-       linkend="functions-info-access-table"><function>has_sequence_privilege()</></link>
+       linkend="functions-info-access-table"><function>has_sequence_privilege()</function></link>
        for sequence permission checking (Abhijit Menon-Sen)
       </para>
      </listitem>
@@ -9556,15 +9556,15 @@
 
      <listitem>
       <para>
-       Make the <literal>information_schema</> views correctly display maximum
-       octet lengths for <type>char</> and <type>varchar</> columns (Peter
+       Make the <literal>information_schema</literal> views correctly display maximum
+       octet lengths for <type>char</type> and <type>varchar</type> columns (Peter
        Eisentraut)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Speed up <literal>information_schema</> privilege views
+       Speed up <literal>information_schema</literal> privilege views
        (Joachim Wieland)
       </para>
      </listitem>
@@ -9581,7 +9581,7 @@
      <listitem>
       <para>
        Support execution of anonymous code blocks using the <link
-       linkend="SQL-DO"><command>DO</></link> statement
+       linkend="sql-do"><command>DO</command></link> statement
        (Petr Jelinek, Joshua Tolley, Hannu Valtonen)
       </para>
 
@@ -9595,28 +9595,28 @@
      <listitem>
       <para>
        Implement SQL-standard-compliant <link
-       linkend="SQL-CREATETRIGGER">per-column triggers</link>
+       linkend="sql-createtrigger">per-column triggers</link>
        (Itagaki Takahiro)
       </para>
 
       <para>
        Such triggers are fired only when the specified column(s) are affected
-       by the query, e.g. appear in an <command>UPDATE</>'s <literal>SET</>
+       by the query, e.g. appear in an <command>UPDATE</command>'s <literal>SET</literal>
        list.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add the <literal>WHEN</> clause to <link
-       linkend="SQL-CREATETRIGGER"><command>CREATE TRIGGER</></link>
+       Add the <literal>WHEN</literal> clause to <link
+       linkend="sql-createtrigger"><command>CREATE TRIGGER</command></link>
        to allow control over whether a trigger is fired (Itagaki
        Takahiro)
       </para>
 
       <para>
        While the same type of check can always be performed inside the
-       trigger, doing it in an external <literal>WHEN</> clause can have
+       trigger, doing it in an external <literal>WHEN</literal> clause can have
        performance benefits.
       </para>
      </listitem>
@@ -9634,8 +9634,8 @@
 
     <listitem>
      <para>
-      Add the <literal>OR REPLACE</> clause to <link
-      linkend="SQL-CREATELANGUAGE"><command>CREATE LANGUAGE</></link>
+      Add the <literal>OR REPLACE</literal> clause to <link
+      linkend="sql-createlanguage"><command>CREATE LANGUAGE</command></link>
       (Tom Lane)
      </para>
 
@@ -9677,8 +9677,8 @@
        The default behavior is now to throw an error when there is a conflict,
        so as to avoid surprising behaviors.  This can be modified, via the
        configuration parameter <link
-       linkend="plpgsql-var-subst"><varname>plpgsql.variable_conflict</></link>
-       or the per-function option <literal>#variable_conflict</>, to allow
+       linkend="plpgsql-var-subst"><varname>plpgsql.variable_conflict</varname></link>
+       or the per-function option <literal>#variable_conflict</literal>, to allow
        either the variable or the query-supplied column to be used.  In any
        case PL/pgSQL will no longer attempt to substitute variables in places
        where they would not be syntactically valid.
@@ -9731,7 +9731,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
       <para>
        Formerly, input parameters were treated as being declared
-       <literal>CONST</>, so the function's code could not change their
+       <literal>CONST</literal>, so the function's code could not change their
        values.  This restriction has been removed to simplify
        porting of functions from other DBMSes that do not impose the
        equivalent restriction.  An input parameter now acts like a local
@@ -9747,26 +9747,26 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Add <replaceable>count</> and <literal>ALL</> options to <command>MOVE
-       FORWARD</>/<literal>BACKWARD</> in PL/pgSQL (Pavel Stehule)
+       Add <replaceable>count</replaceable> and <literal>ALL</literal> options to <command>MOVE
+       FORWARD</command>/<literal>BACKWARD</literal> in PL/pgSQL (Pavel Stehule)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow PL/pgSQL's <literal>WHERE CURRENT OF</> to use a cursor
+       Allow PL/pgSQL's <literal>WHERE CURRENT OF</literal> to use a cursor
        variable (Tom Lane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow PL/pgSQL's <command>OPEN <replaceable>cursor</> FOR EXECUTE</> to
+       Allow PL/pgSQL's <command>OPEN <replaceable>cursor</replaceable> FOR EXECUTE</command> to
        use parameters (Pavel Stehule, Itagaki Takahiro)
       </para>
 
       <para>
-       This is accomplished with a new <literal>USING</> clause.
+       This is accomplished with a new <literal>USING</literal> clause.
       </para>
      </listitem>
 
@@ -9782,28 +9782,28 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Add new PL/Perl functions: <link
-       linkend="plperl-utility-functions"><function>quote_literal()</></link>,
-       <function>quote_nullable()</>, <function>quote_ident()</>,
-       <function>encode_bytea()</>, <function>decode_bytea()</>,
-       <function>looks_like_number()</>,
-       <function>encode_array_literal()</>,
-       <function>encode_array_constructor()</> (Tim Bunce)
+       linkend="plperl-utility-functions"><function>quote_literal()</function></link>,
+       <function>quote_nullable()</function>, <function>quote_ident()</function>,
+       <function>encode_bytea()</function>, <function>decode_bytea()</function>,
+       <function>looks_like_number()</function>,
+       <function>encode_array_literal()</function>,
+       <function>encode_array_constructor()</function> (Tim Bunce)
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add server parameter <link
-       linkend="guc-plperl-on-init"><varname>plperl.on_init</></link> to
+       linkend="guc-plperl-on-init"><varname>plperl.on_init</varname></link> to
        specify a PL/Perl initialization function (Tim
        Bunce)
       </para>
 
       <para>
        <link
-       linkend="guc-plperl-on-plperl-init"><varname>plperl.on_plperl_init</></link>
+       linkend="guc-plperl-on-plperl-init"><varname>plperl.on_plperl_init</varname></link>
        and <link
-       linkend="guc-plperl-on-plperl-init"><varname>plperl.on_plperlu_init</></link>
+       linkend="guc-plperl-on-plperl-init"><varname>plperl.on_plperlu_init</varname></link>
        are also available for initialization that is specific to the trusted
        or untrusted language respectively.
       </para>
@@ -9811,29 +9811,29 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Support <command>END</> blocks in PL/Perl (Tim Bunce)
+       Support <command>END</command> blocks in PL/Perl (Tim Bunce)
       </para>
 
       <para>
-       <command>END</> blocks do not currently allow database access.
+       <command>END</command> blocks do not currently allow database access.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <command>use strict</> in PL/Perl (Tim Bunce)
+       Allow <command>use strict</command> in PL/Perl (Tim Bunce)
       </para>
 
       <para>
-       Perl <literal>strict</> checks can also be globally enabled with the
+       Perl <literal>strict</literal> checks can also be globally enabled with the
        new server parameter <link
-       linkend="guc-plperl-use-strict"><varname>plperl.use_strict</></link>.
+       linkend="guc-plperl-use-strict"><varname>plperl.use_strict</varname></link>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <command>require</> in PL/Perl (Tim Bunce)
+       Allow <command>require</command> in PL/Perl (Tim Bunce)
       </para>
 
       <para>
@@ -9845,7 +9845,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Allow <command>use feature</> in PL/Perl if Perl version 5.10 or
+       Allow <command>use feature</command> in PL/Perl if Perl version 5.10 or
        later is used (Tim Bunce)
       </para>
      </listitem>
@@ -9879,13 +9879,13 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Improve <type>bytea</> support in PL/Python (Caleb Welton)
+       Improve <type>bytea</type> support in PL/Python (Caleb Welton)
       </para>
 
       <para>
-       <type>Bytea</> values passed into PL/Python are now represented as
-       binary, rather than the PostgreSQL <type>bytea</> text format.
-       <type>Bytea</> values containing null bytes are now also output
+       <type>Bytea</type> values passed into PL/Python are now represented as
+       binary, rather than the PostgreSQL <type>bytea</type> text format.
+       <type>Bytea</type> values containing null bytes are now also output
        properly from PL/Python.  Passing of boolean, integer, and float
        values was also improved.
       </para>
@@ -9906,14 +9906,14 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Add <application>Python</> 3 support to PL/Python (Peter Eisentraut)
+       Add <application>Python</application> 3 support to PL/Python (Peter Eisentraut)
       </para>
 
       <para>
        The new server-side language is called <link
-       linkend="plpython-python23"><literal>plpython3u</></link>.  This
+       linkend="plpython-python23"><literal>plpython3u</literal></link>.  This
        cannot be used in the same session with the
-       <application>Python</> 2 server-side language.
+       <application>Python</application> 2 server-side language.
       </para>
      </listitem>
 
@@ -9936,8 +9936,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
     <listitem>
     <para>
-     Add an <option>--analyze-only</> option to <link
-     linkend="APP-VACUUMDB"><command>vacuumdb</></link>, to analyze without
+     Add an <option>--analyze-only</option> option to <link
+     linkend="app-vacuumdb"><command>vacuumdb</command></link>, to analyze without
      vacuuming (Bruce Momjian)
      </para>
     </listitem>
@@ -9945,21 +9945,21 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
    </itemizedlist>
 
    <sect4>
-    <title><link linkend="APP-PSQL"><application>psql</></link></title>
+    <title><link linkend="app-psql"><application>psql</application></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Add support for quoting/escaping the values of <application>psql</>
-       <link linkend="APP-PSQL-variables">variables</link> as SQL strings or
+       Add support for quoting/escaping the values of <application>psql</application>
+       <link linkend="app-psql-variables">variables</link> as SQL strings or
        identifiers (Pavel Stehule, Robert Haas)
       </para>
 
       <para>
-       For example, <literal>:'var'</> will produce the value of
-       <literal>var</> quoted and properly escaped as a literal string, while
-       <literal>:"var"</> will produce its value quoted and escaped as an
+       For example, <literal>:'var'</literal> will produce the value of
+       <literal>var</literal> quoted and properly escaped as a literal string, while
+       <literal>:"var"</literal> will produce its value quoted and escaped as an
        identifier.
       </para>
      </listitem>
@@ -9967,11 +9967,11 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Ignore a leading UTF-8-encoded Unicode byte-order marker in
-       script files read by <application>psql</> (Itagaki Takahiro)
+       script files read by <application>psql</application> (Itagaki Takahiro)
       </para>
 
       <para>
-       This is enabled when the client encoding is <acronym>UTF-8</>.
+       This is enabled when the client encoding is <acronym>UTF-8</acronym>.
        It improves compatibility with certain editors, mostly on Windows,
        that insist on inserting such markers.
       </para>
@@ -9979,57 +9979,57 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Fix <command>psql --file -</> to properly honor <link
-       linkend="R1-APP-PSQL-3"><option>--single-transaction</></link>
+       Fix <command>psql --file -</command> to properly honor <link
+       linkend="r1-app-psql-3"><option>--single-transaction</option></link>
        (Bruce Momjian)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Avoid overwriting of <application>psql</>'s command-line history when
-       two <application>psql</> sessions are run concurrently (Tom Lane)
+       Avoid overwriting of <application>psql</application>'s command-line history when
+       two <application>psql</application> sessions are run concurrently (Tom Lane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Improve <application>psql</>'s tab completion support (Itagaki
+       Improve <application>psql</application>'s tab completion support (Itagaki
        Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Show <literal>\timing</> output when it is enabled, regardless of
-       <quote>quiet</> mode (Peter Eisentraut)
+       Show <literal>\timing</literal> output when it is enabled, regardless of
+       <quote>quiet</quote> mode (Peter Eisentraut)
       </para>
      </listitem>
 
     </itemizedlist>
 
     <sect5>
-    <title><application>psql</> Display</title>
+    <title><application>psql</application> Display</title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Improve display of wrapped columns in <application>psql</> (Roger
+        Improve display of wrapped columns in <application>psql</application> (Roger
         Leigh)
        </para>
 
        <para>
         This behavior is now the default.
         The previous formatting is available by using <command>\pset linestyle
-        old-ascii</>.
+        old-ascii</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>psql</> to use fancy Unicode line-drawing
-        characters via <command>\pset linestyle unicode</> (Roger Leigh)
+        Allow <application>psql</application> to use fancy Unicode line-drawing
+        characters via <command>\pset linestyle unicode</command> (Roger Leigh)
        </para>
       </listitem>
 
@@ -10038,27 +10038,27 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     </sect5>
 
     <sect5>
-     <title><application>psql</> <link
-     linkend="APP-PSQL-meta-commands"><command>\d</></link>
+     <title><application>psql</application> <link
+     linkend="app-psql-meta-commands"><command>\d</command></link>
      Commands</title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Make <command>\d</> show child tables that inherit from the specified
+        Make <command>\d</command> show child tables that inherit from the specified
         parent (Damien Clochard)
        </para>
 
        <para>
-        <command>\d</> shows only the number of child tables, while
-        <command>\d+</> shows the names of all child tables.
+        <command>\d</command> shows only the number of child tables, while
+        <command>\d+</command> shows the names of all child tables.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show definitions of index columns in <command>\d index_name</>
+        Show definitions of index columns in <command>\d index_name</command>
         (Khee Chin)
        </para>
 
@@ -10070,7 +10070,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
       <listitem>
        <para>
         Show a view's defining query only in
-        <command>\d+</>, not in <command>\d</> (Peter Eisentraut)
+        <command>\d+</command>, not in <command>\d</command> (Peter Eisentraut)
        </para>
 
        <para>
@@ -10084,33 +10084,33 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
    </sect4>
 
    <sect4>
-    <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+    <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Make <application>pg_dump</>/<application>pg_restore</>
-       <link linkend="pg-dump-options"><option>--clean</></link>
+       Make <application>pg_dump</application>/<application>pg_restore</application>
+       <link linkend="pg-dump-options"><option>--clean</option></link>
        also remove large objects (Itagaki Takahiro)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <application>pg_dump</> to properly dump large objects when
-       <literal>standard_conforming_strings</> is enabled (Tom Lane)
+       Fix <application>pg_dump</application> to properly dump large objects when
+       <literal>standard_conforming_strings</literal> is enabled (Tom Lane)
       </para>
 
       <para>
        The previous coding could fail when dumping to an archive file
-       and then generating script output from <application>pg_restore</>.
+       and then generating script output from <application>pg_restore</application>.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       <application>pg_restore</> now emits large-object data in hex format
+       <application>pg_restore</application> now emits large-object data in hex format
        when generating script output (Tom Lane)
       </para>
 
@@ -10123,16 +10123,16 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Allow <application>pg_dump</> to dump comments attached to columns
+       Allow <application>pg_dump</application> to dump comments attached to columns
        of composite types (Taro Minowa (Higepon))
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <application>pg_dump</> <link
-       linkend="pg-dump-options"><option>--verbose</></link>
-       output the <application>pg_dump</> and server versions
+       Make <application>pg_dump</application> <link
+       linkend="pg-dump-options"><option>--verbose</option></link>
+       output the <application>pg_dump</application> and server versions
        in text output mode (Jim Cox, Tom Lane)
       </para>
 
@@ -10143,7 +10143,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       <application>pg_restore</> now complains if any command-line arguments
+       <application>pg_restore</application> now complains if any command-line arguments
        remain after the switches and optional file name (Tom Lane)
       </para>
 
@@ -10158,28 +10158,28 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
    <sect4>
     <title><link
-    linkend="app-pg-ctl"><application>pg_ctl</></link></title>
+    linkend="app-pg-ctl"><application>pg_ctl</application></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Allow <application>pg_ctl</> to be used safely to start the
-       <application>postmaster</> during a system reboot (Tom Lane)
+       Allow <application>pg_ctl</application> to be used safely to start the
+       <application>postmaster</application> during a system reboot (Tom Lane)
       </para>
 
       <para>
-       Previously, <application>pg_ctl</>'s parent process could have been
-       mistakenly identified as a running <application>postmaster</> based on
-       a stale <application>postmaster</> lock file, resulting in a transient
+       Previously, <application>pg_ctl</application>'s parent process could have been
+       mistakenly identified as a running <application>postmaster</application> based on
+       a stale <application>postmaster</application> lock file, resulting in a transient
        failure to start the database.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Give <application>pg_ctl</> the ability to initialize the database
-       (by invoking <application>initdb</>) (Zdenek Kotala)
+       Give <application>pg_ctl</application> the ability to initialize the database
+       (by invoking <application>initdb</application>) (Zdenek Kotala)
       </para>
      </listitem>
 
@@ -10190,25 +10190,25 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
   </sect3>
 
   <sect3>
-   <title><application>Development Tools</></title>
+   <title><application>Development Tools</application></title>
 
    <sect4>
-    <title><link linkend="libpq"><application>libpq</></link></title>
+    <title><link linkend="libpq"><application>libpq</application></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Add new <application>libpq</> functions
+       Add new <application>libpq</application> functions
        <link
-       linkend="libpq-connect"><function>PQconnectdbParams()</></link>
-       and <function>PQconnectStartParams()</> (Guillaume
+       linkend="libpq-connect"><function>PQconnectdbParams()</function></link>
+       and <function>PQconnectStartParams()</function> (Guillaume
        Lelarge)
       </para>
 
       <para>
-       These functions are similar to <function>PQconnectdb()</> and
-       <function>PQconnectStart()</> except that they accept a null-terminated
+       These functions are similar to <function>PQconnectdb()</function> and
+       <function>PQconnectStart()</function> except that they accept a null-terminated
        array of connection options, rather than requiring all options to
        be provided in a single string.
       </para>
@@ -10216,22 +10216,22 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Add <application>libpq</> functions <link
-       linkend="libpq-exec-escape-string"><function>PQescapeLiteral()</></link>
-       and <function>PQescapeIdentifier()</> (Robert Haas)
+       Add <application>libpq</application> functions <link
+       linkend="libpq-exec-escape-string"><function>PQescapeLiteral()</function></link>
+       and <function>PQescapeIdentifier()</function> (Robert Haas)
       </para>
 
       <para>
        These functions return appropriately quoted and escaped SQL string
        literals and identifiers. The caller is not required to pre-allocate
-       the string result, as is required by <function>PQescapeStringConn()</>.
+       the string result, as is required by <function>PQescapeStringConn()</function>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add support for a per-user service file (<link
-       linkend="libpq-pgservice"><filename>.pg_service.conf</></link>),
+       linkend="libpq-pgservice"><filename>.pg_service.conf</filename></link>),
        which is checked before the site-wide service file
        (Peter Eisentraut)
       </para>
@@ -10239,7 +10239,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Properly report an error if the specified <application>libpq</> service
+       Properly report an error if the specified <application>libpq</application> service
        cannot be found (Peter Eisentraut)
       </para>
      </listitem>
@@ -10258,15 +10258,15 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Avoid extra system calls to block and unblock <literal>SIGPIPE</>
-       in <application>libpq</>, on platforms that offer alternative methods
+       Avoid extra system calls to block and unblock <literal>SIGPIPE</literal>
+       in <application>libpq</application>, on platforms that offer alternative methods
        (Jeremy Kerr)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       When a <link linkend="libpq-pgpass"><filename>.pgpass</></link>-supplied
+       When a <link linkend="libpq-pgpass"><filename>.pgpass</filename></link>-supplied
        password fails, mention where the password came from in the error
        message (Bruce Momjian)
       </para>
@@ -10288,22 +10288,22 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
    </sect4>
 
    <sect4>
-    <title><link linkend="ecpg"><application>ecpg</></link></title>
+    <title><link linkend="ecpg"><application>ecpg</application></link></title>
 
     <itemizedlist>
 
      <listitem>
       <para>
-       Add <link linkend="ecpg-descriptors"><acronym>SQLDA</></link>
-       (SQL Descriptor Area) support to <application>ecpg</>
+       Add <link linkend="ecpg-descriptors"><acronym>SQLDA</acronym></link>
+       (SQL Descriptor Area) support to <application>ecpg</application>
        (Boszormenyi Zoltan)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add the <link linkend="ecpg-descriptors"><command>DESCRIBE</>
-       [ <literal>OUTPUT</> ]</link> statement to <application>ecpg</>
+       Add the <link linkend="ecpg-descriptors"><command>DESCRIBE</command>
+       [ <literal>OUTPUT</literal> ]</link> statement to <application>ecpg</application>
        (Boszormenyi Zoltan)
       </para>
      </listitem>
@@ -10317,28 +10317,28 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Add the <literal>string</> data type in <application>ecpg</>
+       Add the <literal>string</literal> data type in <application>ecpg</application>
        Informix-compatibility mode (Boszormenyi Zoltan)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>ecpg</> to use <literal>new</> and <literal>old</>
+       Allow <application>ecpg</application> to use <literal>new</literal> and <literal>old</literal>
        variable names without restriction (Michael Meskes)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <application>ecpg</> to use variable names in
-       <function>free()</> (Michael Meskes)
+       Allow <application>ecpg</application> to use variable names in
+       <function>free()</function> (Michael Meskes)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Make <function>ecpg_dynamic_type()</> return zero for non-SQL3 data
+       Make <function>ecpg_dynamic_type()</function> return zero for non-SQL3 data
        types (Michael Meskes)
       </para>
 
@@ -10350,41 +10350,41 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Support <type>long long</> types on platforms that already have 64-bit
-       <type>long</> (Michael Meskes)
+       Support <type>long long</type> types on platforms that already have 64-bit
+       <type>long</type> (Michael Meskes)
       </para>
      </listitem>
 
      </itemizedlist>
 
      <sect5>
-      <title><application>ecpg</> Cursors</title>
+      <title><application>ecpg</application> Cursors</title>
 
       <itemizedlist>
 
       <listitem>
        <para>
-        Add out-of-scope cursor support in <application>ecpg</>'s native mode
+        Add out-of-scope cursor support in <application>ecpg</application>'s native mode
         (Boszormenyi Zoltan)
        </para>
 
        <para>
-        This allows <command>DECLARE</> to use variables that are not in
-        scope when <command>OPEN</> is called. This facility already existed
-        in <application>ecpg</>'s Informix-compatibility mode.
+        This allows <command>DECLARE</command> to use variables that are not in
+        scope when <command>OPEN</command> is called. This facility already existed
+        in <application>ecpg</application>'s Informix-compatibility mode.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow dynamic cursor names in <application>ecpg</> (Boszormenyi Zoltan)
+        Allow dynamic cursor names in <application>ecpg</application> (Boszormenyi Zoltan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>ecpg</> to use noise words <literal>FROM</> and
-        <literal>IN</> in <command>FETCH</> and <command>MOVE</> (Boszormenyi
+        Allow <application>ecpg</application> to use noise words <literal>FROM</literal> and
+        <literal>IN</literal> in <command>FETCH</command> and <command>MOVE</command> (Boszormenyi
         Zoltan)
        </para>
       </listitem>
@@ -10409,8 +10409,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <para>
       The thread-safety option can be disabled with <link
-      linkend="configure"><literal>configure</></link>
-      <option>--disable-thread-safety</>.
+      linkend="configure"><literal>configure</literal></link>
+      <option>--disable-thread-safety</option>.
      </para>
     </listitem>
 
@@ -10421,12 +10421,12 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      </para>
 
      <para>
-      Now that <filename>/proc/self/oom_adj</> allows disabling
-      of the <productname>Linux</> out-of-memory (<acronym>OOM</>)
+      Now that <filename>/proc/self/oom_adj</filename> allows disabling
+      of the <productname>Linux</productname> out-of-memory (<acronym>OOM</acronym>)
       killer, it's recommendable to disable OOM kills for the postmaster.
       It may then be desirable to re-enable OOM kills for the postmaster's
       child processes.  The new compile-time option <link
-      linkend="linux-memory-overcommit"><literal>LINUX_OOM_ADJ</></link>
+      linkend="linux-memory-overcommit"><literal>LINUX_OOM_ADJ</literal></link>
       allows the killer to be reactivated for child processes.
      </para>
     </listitem>
@@ -10440,31 +10440,31 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       New <filename>Makefile</> targets <link
-       linkend="build"><literal>world</></link>,
-       <literal>install-world</>, and <literal>installcheck-world</>
+       New <filename>Makefile</filename> targets <link
+       linkend="build"><literal>world</literal></link>,
+       <literal>install-world</literal>, and <literal>installcheck-world</literal>
        (Andrew Dunstan)
       </para>
 
       <para>
-       These are similar to the existing <literal>all</>, <literal>install</>,
-       and <literal>installcheck</> targets, but they also build the
-       <acronym>HTML</> documentation, build and test <filename>contrib</>,
-       and test server-side languages and <application>ecpg</>.
+       These are similar to the existing <literal>all</literal>, <literal>install</literal>,
+       and <literal>installcheck</literal> targets, but they also build the
+       <acronym>HTML</acronym> documentation, build and test <filename>contrib</filename>,
+       and test server-side languages and <application>ecpg</application>.
       </para>
      </listitem>
 
      <listitem>
       <para>
        Add data and documentation installation location control to
-       <acronym>PGXS</> Makefiles (Mark Cave-Ayland)
+       <acronym>PGXS</acronym> Makefiles (Mark Cave-Ayland)
       </para>
      </listitem>
 
     <listitem>
      <para>
-      Add Makefile rules to build the <productname>PostgreSQL</> documentation
-      as a single <acronym>HTML</> file or as a single plain-text file
+      Add Makefile rules to build the <productname>PostgreSQL</productname> documentation
+      as a single <acronym>HTML</acronym> file or as a single plain-text file
       (Peter Eisentraut, Bruce Momjian)
      </para>
     </listitem>
@@ -10482,12 +10482,12 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
       <para>
        Support compiling on <link
        linkend="install-windows">64-bit
-       <productname>Windows</></link> and running in 64-bit
+       <productname>Windows</productname></link> and running in 64-bit
        mode (Tsutomu Yamada, Magnus Hagander)
       </para>
 
       <para>
-       This allows for large shared memory sizes on <productname>Windows</>.
+       This allows for large shared memory sizes on <productname>Windows</productname>.
       </para>
      </listitem>
 
@@ -10495,7 +10495,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
       <para>
        Support server builds using <link
        linkend="install-windows-full"><productname>Visual Studio
-       2008</></link> (Magnus Hagander)
+       2008</productname></link> (Magnus Hagander)
       </para>
      </listitem>
 
@@ -10518,8 +10518,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      </para>
 
      <para>
-      For example, the prebuilt <acronym>HTML</> documentation is now in
-      <filename>doc/src/sgml/html/</>; the manual pages are packaged
+      For example, the prebuilt <acronym>HTML</acronym> documentation is now in
+      <filename>doc/src/sgml/html/</filename>; the manual pages are packaged
       similarly.
      </para>
     </listitem>
@@ -10543,13 +10543,13 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       User-defined constraint triggers now have entries in
-      <structname>pg_constraint</> as well as <structname>pg_trigger</>
+      <structname>pg_constraint</structname> as well as <structname>pg_trigger</structname>
       (Tom Lane)
      </para>
 
      <para>
       Because of this change,
-      <structname>pg_constraint</>.<structfield>pgconstrname</> is now
+      <structname>pg_constraint</structname>.<structfield>pgconstrname</structfield> is now
       redundant and has been removed.
      </para>
     </listitem>
@@ -10557,8 +10557,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add system catalog columns
-      <structname>pg_constraint</>.<structfield>conindid</> and
-      <structname>pg_trigger</>.<structfield>tgconstrindid</>
+      <structname>pg_constraint</structname>.<structfield>conindid</structfield> and
+      <structname>pg_trigger</structname>.<structfield>tgconstrindid</structfield>
       to better document the use of indexes for constraint
       enforcement (Tom Lane)
      </para>
@@ -10578,7 +10578,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
     <listitem>
      <para>
-      Improve source code test coverage, including <filename>contrib</>, PL/Python,
+      Improve source code test coverage, including <filename>contrib</filename>, PL/Python,
       and PL/Perl (Peter Eisentraut, Andrew Dunstan)
      </para>
     </listitem>
@@ -10598,7 +10598,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Automatically generate the initial contents of
-      <structname>pg_attribute</> for <quote>bootstrapped</> catalogs
+      <structname>pg_attribute</structname> for <quote>bootstrapped</quote> catalogs
       (John Naylor)
      </para>
 
@@ -10610,8 +10610,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Split the processing of
-      <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> operations out
-      of <filename>execMain.c</> (Marko Tiikkaja)
+      <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> operations out
+      of <filename>execMain.c</filename> (Marko Tiikkaja)
      </para>
 
      <para>
@@ -10622,7 +10622,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
     <listitem>
      <para>
-      Simplify translation of <application>psql</>'s SQL help text
+      Simplify translation of <application>psql</application>'s SQL help text
       (Peter Eisentraut)
      </para>
     </listitem>
@@ -10641,8 +10641,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add a new <link
-      linkend="errcodes-table"><literal>ERRCODE_INVALID_PASSWORD</></link>
-      <literal>SQLSTATE</> error code (Bruce Momjian)
+      linkend="errcodes-table"><literal>ERRCODE_INVALID_PASSWORD</literal></link>
+      <literal>SQLSTATE</literal> error code (Bruce Momjian)
      </para>
     </listitem>
 
@@ -10661,23 +10661,23 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add new documentation <link linkend="non-durability">section</link>
-      about running <productname>PostgreSQL</> in non-durable mode
+      about running <productname>PostgreSQL</productname> in non-durable mode
       to improve performance (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Restructure the <acronym>HTML</> documentation
-      <filename>Makefile</> rules to make their dependency checks work
+      Restructure the <acronym>HTML</acronym> documentation
+      <filename>Makefile</filename> rules to make their dependency checks work
       correctly, avoiding unnecessary rebuilds (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <productname>DocBook</> <acronym>XSL</> stylesheets for man page
-      building, rather than <productname>Docbook2X</> (Peter Eisentraut)
+      Use <productname>DocBook</productname> <acronym>XSL</acronym> stylesheets for man page
+      building, rather than <productname>Docbook2X</productname> (Peter Eisentraut)
      </para>
 
      <para>
@@ -10711,22 +10711,22 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <itemizedlist>
      <listitem>
       <para>
-       Require <application>Autoconf</> 2.63 to build
-       <application>configure</> (Peter Eisentraut)
+       Require <application>Autoconf</application> 2.63 to build
+       <application>configure</application> (Peter Eisentraut)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require <application>Flex</> 2.5.31 or later to build
-       from a <acronym>CVS</> checkout (Tom Lane)
+       Require <application>Flex</application> 2.5.31 or later to build
+       from a <acronym>CVS</acronym> checkout (Tom Lane)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Require <application>Perl</> version 5.8 or later to build
-       from a <acronym>CVS</> checkout (John Naylor, Andrew Dunstan)
+       Require <application>Perl</application> version 5.8 or later to build
+       from a <acronym>CVS</acronym> checkout (John Naylor, Andrew Dunstan)
       </para>
      </listitem>
 
@@ -10741,25 +10741,25 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Use a more modern <acronym>API</> for <application>Bonjour</> (Tom Lane)
+       Use a more modern <acronym>API</acronym> for <application>Bonjour</application> (Tom Lane)
       </para>
 
       <para>
-       Bonjour support now requires <productname>macOS</> 10.3 or later.
+       Bonjour support now requires <productname>macOS</productname> 10.3 or later.
        The older API has been deprecated by Apple.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add spinlock support for the <productname>SuperH</>
+       Add spinlock support for the <productname>SuperH</productname>
        architecture (Nobuhiro Iwamatsu)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow non-<application>GCC</> compilers to use inline functions if
+       Allow non-<application>GCC</application> compilers to use inline functions if
        they support them (Kurt Harriman)
       </para>
      </listitem>
@@ -10773,14 +10773,14 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Restructure use of <literal>LDFLAGS</> to be more consistent
+       Restructure use of <literal>LDFLAGS</literal> to be more consistent
        across platforms (Tom Lane)
       </para>
 
       <para>
-       <literal>LDFLAGS</> is now used for linking both executables and shared
-       libraries, and we add on <literal>LDFLAGS_EX</> when linking
-       executables, or <literal>LDFLAGS_SL</> when linking shared libraries.
+       <literal>LDFLAGS</literal> is now used for linking both executables and shared
+       libraries, and we add on <literal>LDFLAGS_EX</literal> when linking
+       executables, or <literal>LDFLAGS_SL</literal> when linking shared libraries.
       </para>
      </listitem>
 
@@ -10795,15 +10795,15 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Make backend header files safe to include in <productname>C++</>
+       Make backend header files safe to include in <productname>C++</productname>
        (Kurt Harriman, Peter Eisentraut)
       </para>
 
       <para>
        These changes remove keyword conflicts that previously made
-       <productname>C++</> usage difficult in backend code.  However, there
-       are still other complexities when using <productname>C++</> for backend
-       functions. <literal>extern "C" { }</> is still necessary in
+       <productname>C++</productname> usage difficult in backend code.  However, there
+       are still other complexities when using <productname>C++</productname> for backend
+       functions. <literal>extern "C" { }</literal> is still necessary in
        appropriate places, and memory management and error handling are
        still problematic.
       </para>
@@ -10812,15 +10812,15 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Add <link
-       linkend="xaggr"><function>AggCheckCallContext()</></link>
-       for use in detecting if a <productname>C</> function is
+       linkend="xaggr"><function>AggCheckCallContext()</function></link>
+       for use in detecting if a <productname>C</productname> function is
        being called as an aggregate (Hitoshi Harada)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Change calling convention for <function>SearchSysCache()</> and related
+       Change calling convention for <function>SearchSysCache()</function> and related
        functions to avoid hard-wiring the maximum number of cache keys
        (Robert Haas)
       </para>
@@ -10833,8 +10833,8 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
      <listitem>
       <para>
-       Require calls of <function>fastgetattr()</> and
-       <function>heap_getattr()</> backend macros to provide a non-NULL fourth
+       Require calls of <function>fastgetattr()</function> and
+       <function>heap_getattr()</function> backend macros to provide a non-NULL fourth
        argument (Robert Haas)
       </para>
      </listitem>
@@ -10842,7 +10842,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Custom typanalyze functions should no longer rely on
-       <structname>VacAttrStats</>.<structfield>attr</> to determine the type
+       <structname>VacAttrStats</structname>.<structfield>attr</structfield> to determine the type
        of data they will be passed (Tom Lane)
       </para>
 
@@ -10888,7 +10888,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
     <listitem>
      <para>
-      Add <link linkend="pgupgrade"><filename>contrib/pg_upgrade</></link>
+      Add <link linkend="pgupgrade"><filename>contrib/pg_upgrade</filename></link>
       to support in-place upgrades (Bruce Momjian)
      </para>
 
@@ -10903,15 +10903,15 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Add support for preserving relation <link
-       linkend="catalog-pg-class"><structname>relfilenode</></link> values
+       linkend="catalog-pg-class"><structname>relfilenode</structname></link> values
        during binary upgrades (Bruce Momjian)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for preserving <structname>pg_type</>
-       and <structname>pg_enum</> OIDs during binary upgrades
+       Add support for preserving <structname>pg_type</structname>
+       and <structname>pg_enum</structname> OIDs during binary upgrades
        (Bruce Momjian)
       </para>
      </listitem>
@@ -10919,7 +10919,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
      <listitem>
       <para>
        Move data files within tablespaces into
-       <productname>PostgreSQL</>-version-specific subdirectories
+       <productname>PostgreSQL</productname>-version-specific subdirectories
        (Bruce Momjian)
       </para>
 
@@ -10941,22 +10941,22 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
 
     <listitem>
      <para>
-      Add multithreading option (<option>-j</>) to <link
-      linkend="pgbench"><filename>contrib/pgbench</></link>
+      Add multithreading option (<option>-j</option>) to <link
+      linkend="pgbench"><filename>contrib/pgbench</filename></link>
       (Itagaki Takahiro)
      </para>
 
      <para>
-      This allows multiple <acronym>CPU</>s to be used by pgbench,
+      This allows multiple <acronym>CPU</acronym>s to be used by pgbench,
       reducing the risk of pgbench itself becoming the test bottleneck.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <command>\shell</> and <command>\setshell</> meta
+      Add <command>\shell</command> and <command>\setshell</command> meta
       commands to <link
-      linkend="pgbench"><filename>contrib/pgbench</></link>
+      linkend="pgbench"><filename>contrib/pgbench</filename></link>
       (Michael Paquier)
      </para>
     </listitem>
@@ -10964,20 +10964,20 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       New features for <link
-      linkend="dict-xsyn"><filename>contrib/dict_xsyn</></link>
+      linkend="dict-xsyn"><filename>contrib/dict_xsyn</filename></link>
       (Sergey Karpov)
      </para>
 
      <para>
-      The new options are <literal>matchorig</>, <literal>matchsynonyms</>,
-      and <literal>keepsynonyms</>.
+      The new options are <literal>matchorig</literal>, <literal>matchsynonyms</literal>,
+      and <literal>keepsynonyms</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Add full text dictionary <link
-      linkend="unaccent"><filename>contrib/unaccent</></link>
+      linkend="unaccent"><filename>contrib/unaccent</filename></link>
       (Teodor Sigaev)
      </para>
 
@@ -10990,24 +10990,24 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add <link
-      linkend="CONTRIB-DBLINK-GET-NOTIFY"><function>dblink_get_notify()</></link>
-      to <filename>contrib/dblink</> (Marcus Kempe)
+      linkend="contrib-dblink-get-notify"><function>dblink_get_notify()</function></link>
+      to <filename>contrib/dblink</filename> (Marcus Kempe)
      </para>
 
      <para>
-      This allows asynchronous notifications in <productname>dblink</>.
+      This allows asynchronous notifications in <productname>dblink</productname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s handling of dropped columns
+      Improve <filename>contrib/dblink</filename>'s handling of dropped columns
       (Tom Lane)
      </para>
 
      <para>
       This affects <link
-      linkend="CONTRIB-DBLINK-BUILD-SQL-INSERT"><function>dblink_build_sql_insert()</></link>
+      linkend="contrib-dblink-build-sql-insert"><function>dblink_build_sql_insert()</function></link>
       and related functions.  These functions now number columns according
       to logical not physical column numbers.
      </para>
@@ -11016,23 +11016,23 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Greatly increase <link
-      linkend="hstore"><filename>contrib/hstore</></link>'s data
+      linkend="hstore"><filename>contrib/hstore</filename></link>'s data
       length limit, and add B-tree and hash support so <literal>GROUP
-      BY</> and <literal>DISTINCT</> operations are possible on
-      <type>hstore</> columns (Andrew Gierth)
+      BY</literal> and <literal>DISTINCT</literal> operations are possible on
+      <type>hstore</type> columns (Andrew Gierth)
      </para>
 
      <para>
       New functions and operators were also added.  These improvements
-      make <type>hstore</> a full-function key-value store embedded in
-      <productname>PostgreSQL</>.
+      make <type>hstore</type> a full-function key-value store embedded in
+      <productname>PostgreSQL</productname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Add <link
-      linkend="passwordcheck"><filename>contrib/passwordcheck</></link>
+      linkend="passwordcheck"><filename>contrib/passwordcheck</filename></link>
       to support site-specific password strength policies (Laurenz
       Albe)
      </para>
@@ -11046,7 +11046,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add <link
-      linkend="pgarchivecleanup"><filename>contrib/pg_archivecleanup</></link>
+      linkend="pgarchivecleanup"><filename>contrib/pg_archivecleanup</filename></link>
       tool (Simon Riggs)
      </para>
 
@@ -11060,7 +11060,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add query text to <link
-      linkend="auto-explain"><filename>contrib/auto_explain</></link>
+      linkend="auto-explain"><filename>contrib/auto_explain</filename></link>
       output (Andrew Dunstan)
      </para>
     </listitem>
@@ -11068,7 +11068,7 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Add buffer access counters to <link
-      linkend="pgstatstatements"><filename>contrib/pg_stat_statements</></link>
+      linkend="pgstatstatements"><filename>contrib/pg_stat_statements</filename></link>
       (Itagaki Takahiro)
      </para>
     </listitem>
@@ -11076,10 +11076,10 @@ if TG_OP = 'INSERT' and NEW.col1 = ... then
     <listitem>
      <para>
       Update <link
-      linkend="server-start"><filename>contrib/start-scripts/linux</></link>
-      to use <filename>/proc/self/oom_adj</> to disable the
-      <link linkend="linux-memory-overcommit"><productname>Linux</>
-      out-of-memory</link> (<acronym>OOM</>) killer (Alex
+      linkend="server-start"><filename>contrib/start-scripts/linux</filename></link>
+      to use <filename>/proc/self/oom_adj</filename> to disable the
+      <link linkend="linux-memory-overcommit"><productname>Linux</productname>
+      out-of-memory</link> (<acronym>OOM</acronym>) killer (Alex
       Hunsaker, Tom Lane)
      </para>
     </listitem>
diff --git a/doc/src/sgml/release-9.1.sgml b/doc/src/sgml/release-9.1.sgml
index 0454f849d4..ad5998e495 100644
--- a/doc/src/sgml/release-9.1.sgml
+++ b/doc/src/sgml/release-9.1.sgml
@@ -12,11 +12,11 @@
   <para>
    This release contains a variety of fixes from 9.1.23.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 9.1.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -30,7 +30,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -68,13 +68,13 @@
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
@@ -82,15 +82,15 @@
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -112,7 +112,7 @@
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -126,7 +126,7 @@
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -137,26 +137,26 @@
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -170,17 +170,17 @@
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -193,15 +193,15 @@
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -222,11 +222,11 @@
   <para>
    This release contains a variety of fixes from 9.1.22.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.1.X release series in September 2016.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -240,7 +240,7 @@
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -253,17 +253,17 @@
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -277,7 +277,7 @@
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -286,22 +286,22 @@
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -311,40 +311,40 @@
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -355,12 +355,12 @@
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -370,7 +370,7 @@
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -383,12 +383,12 @@
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -397,12 +397,12 @@
 
     <listitem>
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -410,8 +410,8 @@
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -423,7 +423,7 @@
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -451,8 +451,8 @@
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -465,21 +465,21 @@
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -491,13 +491,13 @@ Branch: REL9_1_STABLE [d56c02f1a] 2016-06-19 13:45:03 -0400
 Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 -->
      <para>
-      Revert to the old heuristic timeout for <literal>pg_ctl start -w</>
+      Revert to the old heuristic timeout for <literal>pg_ctl start -w</literal>
       (Tom Lane)
      </para>
 
      <para>
       The new method adopted as of release 9.1.20 does not work
-      when <varname>silent_mode</> is enabled, so go back to the old way.
+      when <varname>silent_mode</varname> is enabled, so go back to the old way.
      </para>
     </listitem>
 
@@ -530,7 +530,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -542,7 +542,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -564,11 +564,11 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
   <para>
    This release contains a variety of fixes from 9.1.21.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.1.X release series in September 2016.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -582,7 +582,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -604,7 +604,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -613,7 +613,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -621,8 +621,8 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -634,28 +634,28 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -663,23 +663,23 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -692,12 +692,12 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -705,9 +705,9 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -729,7 +729,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
   <para>
    This release contains a variety of fixes from 9.1.20.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -741,7 +741,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -754,56 +754,56 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -829,27 +829,27 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -863,20 +863,20 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
@@ -897,21 +897,21 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -935,7 +935,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
   <para>
    This release contains a variety of fixes from 9.1.19.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -947,7 +947,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -972,25 +972,25 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -999,7 +999,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -1018,21 +1018,21 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -1041,7 +1041,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -1063,14 +1063,14 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -1122,7 +1122,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -1135,14 +1135,14 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -1155,7 +1155,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -1181,13 +1181,13 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -1195,15 +1195,15 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -1211,21 +1211,21 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -1233,23 +1233,23 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -1257,18 +1257,18 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -1278,44 +1278,44 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -1323,22 +1323,22 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -1346,42 +1346,42 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -1393,19 +1393,19 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -1413,11 +1413,11 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -1426,7 +1426,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -1448,7 +1448,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
   <para>
    This release contains a variety of fixes from 9.1.18.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -1460,7 +1460,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -1472,8 +1472,8 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -1499,13 +1499,13 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -1523,7 +1523,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -1535,7 +1535,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
      </para>
 
      <para>
-      This substantially improves performance when <application>pg_dump</>
+      This substantially improves performance when <application>pg_dump</application>
       tries to dump a large number of tables.
      </para>
     </listitem>
@@ -1550,13 +1550,13 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -1568,14 +1568,14 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -1583,21 +1583,21 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -1610,7 +1610,7 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -1654,22 +1654,22 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -1682,9 +1682,9 @@ Branch: REL9_1_STABLE [354b3a3ac] 2016-06-19 14:01:17 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -1723,12 +1723,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -1748,7 +1748,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -1781,44 +1781,44 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -1830,7 +1830,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -1838,68 +1838,68 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
 
      <para>
       When dumping functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -1908,18 +1908,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -1927,11 +1927,11 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -1939,14 +1939,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -1958,38 +1958,38 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -2009,7 +2009,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a small number of fixes from 9.1.17.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -2021,7 +2021,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -2038,7 +2038,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -2049,13 +2049,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -2077,7 +2077,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a small number of fixes from 9.1.16.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -2089,7 +2089,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.16,
-    see <xref linkend="release-9-1-16">.
+    see <xref linkend="release-9-1-16"/>.
    </para>
 
   </sect2>
@@ -2101,12 +2101,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -2120,29 +2120,29 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -2165,7 +2165,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.15.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -2176,14 +2176,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.14,
-    see <xref linkend="release-9-1-14">.
+    see <xref linkend="release-9-1-14"/>.
    </para>
 
   </sect2>
@@ -2215,7 +2215,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -2225,7 +2225,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -2235,15 +2235,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -2252,16 +2252,16 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -2269,16 +2269,16 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -2306,7 +2306,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -2334,7 +2334,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -2342,7 +2342,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -2356,14 +2356,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</quote> error
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -2383,13 +2383,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
@@ -2430,18 +2430,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -2454,20 +2454,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -2480,20 +2480,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -2501,14 +2501,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -2517,25 +2517,25 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -2548,38 +2548,38 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -2592,14 +2592,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -2611,7 +2611,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -2619,28 +2619,28 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -2648,15 +2648,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -2668,7 +2668,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -2691,7 +2691,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.14.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -2703,7 +2703,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.14,
-    see <xref linkend="release-9-1-14">.
+    see <xref linkend="release-9-1-14"/>.
    </para>
 
   </sect2>
@@ -2715,15 +2715,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -2733,27 +2733,27 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -2761,12 +2761,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -2807,7 +2807,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -2833,21 +2833,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -2855,14 +2855,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Ensure that unlogged tables are copied correctly
-      during <command>CREATE DATABASE</> or <command>ALTER DATABASE SET
-      TABLESPACE</> (Pavan Deolasee, Andres Freund)
+      during <command>CREATE DATABASE</command> or <command>ALTER DATABASE SET
+      TABLESPACE</command> (Pavan Deolasee, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>DROP</>'s dependency searching to correctly handle the
+      Fix <command>DROP</command>'s dependency searching to correctly handle the
       case where a table column is recursively visited before its table
       (Petr Jelinek, Tom Lane)
      </para>
@@ -2870,7 +2870,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       This case is only known to arise when an extension creates both a
       datatype and a table using that datatype.  The faulty code might
-      refuse a <command>DROP EXTENSION</> unless <literal>CASCADE</> is
+      refuse a <command>DROP EXTENSION</command> unless <literal>CASCADE</literal> is
       specified, which should not be required.
      </para>
     </listitem>
@@ -2882,22 +2882,22 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -2905,12 +2905,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -2920,7 +2920,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -2932,7 +2932,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -2945,19 +2945,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -2977,7 +2977,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -3008,14 +3008,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -3024,7 +3024,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -3037,8 +3037,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -3064,7 +3064,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -3097,19 +3097,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -3117,14 +3117,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -3133,7 +3133,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -3147,32 +3147,32 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -3180,14 +3180,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -3195,32 +3195,32 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -3230,7 +3230,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -3238,17 +3238,17 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -3256,16 +3256,16 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <application>pg_dump</> when the database
+      Improve performance of <application>pg_dump</application> when the database
       contains many instances of multiple dependency paths between the same
       two objects (Tom Lane)
      </para>
@@ -3280,21 +3280,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix upgrade-from-unpackaged script for <filename>contrib/citext</>
+      Fix upgrade-from-unpackaged script for <filename>contrib/citext</filename>
       (Tom Lane)
      </para>
     </listitem>
@@ -3302,7 +3302,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -3314,7 +3314,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -3322,7 +3322,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix file descriptor leak in <filename>contrib/pg_test_fsync</>
+      Fix file descriptor leak in <filename>contrib/pg_test_fsync</filename>
       (Jeff Janes)
      </para>
 
@@ -3334,24 +3334,24 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -3359,7 +3359,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Mark some <filename>contrib</> I/O functions with correct volatility
+      Mark some <filename>contrib</filename> I/O functions with correct volatility
       properties (Tom Lane)
      </para>
 
@@ -3393,29 +3393,29 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -3427,15 +3427,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -3447,9 +3447,9 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -3458,21 +3458,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -3501,7 +3501,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.13.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -3519,7 +3519,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.11,
-    see <xref linkend="release-9-1-11">.
+    see <xref linkend="release-9-1-11"/>.
    </para>
 
   </sect2>
@@ -3531,15 +3531,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -3570,7 +3570,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix feedback status when <xref linkend="guc-hot-standby-feedback"> is
+      Fix feedback status when <xref linkend="guc-hot-standby-feedback"/> is
       turned off on-the-fly (Simon Riggs)
      </para>
     </listitem>
@@ -3578,14 +3578,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failures
-      with <literal>UNION ALL</> over subqueries reading from tables with
+      Fix <quote>could not find pathkey item to sort</quote> planner failures
+      with <literal>UNION ALL</literal> over subqueries reading from tables with
       inheritance children (Tom Lane)
      </para>
     </listitem>
@@ -3613,13 +3613,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -3634,7 +3634,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -3647,14 +3647,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Prevent foreign tables from being created with OIDS
-      when <xref linkend="guc-default-with-oids"> is true
+      when <xref linkend="guc-default-with-oids"/> is true
       (Etsuro Fujita)
      </para>
     </listitem>
@@ -3668,19 +3668,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -3688,7 +3688,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3700,14 +3700,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix client host name lookup when processing <filename>pg_hba.conf</>
+      Fix client host name lookup when processing <filename>pg_hba.conf</filename>
       entries that specify host names instead of IP addresses (Tom Lane)
      </para>
 
@@ -3722,7 +3722,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -3731,16 +3731,16 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -3760,7 +3760,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       On Windows, allow new sessions to absorb values of PGC_BACKEND
-      parameters (such as <xref linkend="guc-log-connections">) from the
+      parameters (such as <xref linkend="guc-log-connections"/>) from the
       configuration file (Amit Kapila)
      </para>
 
@@ -3776,15 +3776,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -3795,17 +3795,17 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -3813,15 +3813,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -3829,20 +3829,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -3850,20 +3850,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -3884,7 +3884,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.12.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -3896,7 +3896,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.11,
-    see <xref linkend="release-9-1-11">.
+    see <xref linkend="release-9-1-11"/>.
    </para>
 
   </sect2>
@@ -3923,7 +3923,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -3947,7 +3947,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -3960,17 +3960,17 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -3989,8 +3989,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <application>walsender</>'s failure to shut down cleanly when client
-      is <application>pg_receivexlog</> (Fujii Masao)
+      Fix <application>walsender</application>'s failure to shut down cleanly when client
+      is <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -4003,13 +4003,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
@@ -4022,14 +4022,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -4051,7 +4051,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.11.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -4063,7 +4063,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.11,
-    see <xref linkend="release-9-1-11">.
+    see <xref linkend="release-9-1-11"/>.
    </para>
 
   </sect2>
@@ -4075,19 +4075,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -4100,7 +4100,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -4120,7 +4120,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -4134,12 +4134,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -4166,7 +4166,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -4178,35 +4178,35 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -4221,7 +4221,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -4241,20 +4241,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -4272,8 +4272,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      When <literal>pause_at_recovery_target</>
-      and <literal>recovery_target_inclusive</> are both set, ensure the
+      When <literal>pause_at_recovery_target</literal>
+      and <literal>recovery_target_inclusive</literal> are both set, ensure the
       target record is applied before pausing, not after (Heikki
       Linnakangas)
      </para>
@@ -4286,7 +4286,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
@@ -4299,19 +4299,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -4335,7 +4335,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -4355,7 +4355,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
@@ -4369,19 +4369,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -4389,21 +4389,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -4428,12 +4428,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -4441,8 +4441,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix placement of permissions checks in <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> (Andres Freund, Magnus Hagander)
+      Fix placement of permissions checks in <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> (Andres Freund, Magnus Hagander)
      </para>
 
      <para>
@@ -4453,31 +4453,31 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
@@ -4485,7 +4485,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possible incorrect printing of filenames
-      in <application>pg_basebackup</>'s verbose mode (Magnus Hagander)
+      in <application>pg_basebackup</application>'s verbose mode (Magnus Hagander)
      </para>
     </listitem>
 
@@ -4498,20 +4498,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -4522,7 +4522,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
@@ -4536,28 +4536,28 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -4566,20 +4566,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -4601,7 +4601,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.10.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -4619,7 +4619,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.9,
-    see <xref linkend="release-9-1-9">.
+    see <xref linkend="release-9-1-9"/>.
    </para>
 
   </sect2>
@@ -4631,13 +4631,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
@@ -4649,18 +4649,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -4686,7 +4686,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -4708,8 +4708,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -4726,7 +4726,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
@@ -4756,13 +4756,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
@@ -4776,7 +4776,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -4790,7 +4790,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -4801,10 +4801,10 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -4814,28 +4814,28 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <application>ecpg</> search for quoted cursor names
+      Make <application>ecpg</application> search for quoted cursor names
       case-sensitively (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -4858,7 +4858,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.9.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -4870,7 +4870,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.9,
-    see <xref linkend="release-9-1-9">.
+    see <xref linkend="release-9-1-9"/>.
    </para>
 
   </sect2>
@@ -4887,7 +4887,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      <productname>PostgreSQL</> case-folds non-ASCII characters only
+      <productname>PostgreSQL</productname> case-folds non-ASCII characters only
       when using a single-byte server encoding.
      </para>
     </listitem>
@@ -4895,7 +4895,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix checkpoint memory leak in background writer when <literal>wal_level =
-      hot_standby</> (Naoya Anzai)
+      hot_standby</literal> (Naoya Anzai)
      </para>
     </listitem>
 
@@ -4908,7 +4908,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix memory overcommit bug when <varname>work_mem</> is using more
+      Fix memory overcommit bug when <varname>work_mem</varname> is using more
       than 24GB of memory (Stephen Frost)
      </para>
     </listitem>
@@ -4939,46 +4939,46 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Previously tests like <literal>col IS NOT TRUE</> and <literal>col IS
-      NOT FALSE</> did not properly factor in NULL values when estimating
+      Previously tests like <literal>col IS NOT TRUE</literal> and <literal>col IS
+      NOT FALSE</literal> did not properly factor in NULL values when estimating
       plan costs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent pushing down <literal>WHERE</> clauses into unsafe
-      <literal>UNION/INTERSECT</> subqueries (Tom Lane)
+      Prevent pushing down <literal>WHERE</literal> clauses into unsafe
+      <literal>UNION/INTERSECT</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Subqueries of a <literal>UNION</> or <literal>INTERSECT</> that
+      Subqueries of a <literal>UNION</literal> or <literal>INTERSECT</literal> that
       contain set-returning functions or volatile functions in their
-      <literal>SELECT</> lists could be improperly optimized, leading to
+      <literal>SELECT</literal> lists could be improperly optimized, leading to
       run-time errors or incorrect query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare case of <quote>failed to locate grouping columns</>
+      Fix rare case of <quote>failed to locate grouping columns</quote>
       planner failure (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> of foreign tables with dropped columns (Andrew Dunstan)
+      Fix <application>pg_dump</application> of foreign tables with dropped columns (Andrew Dunstan)
      </para>
 
      <para>
-      Previously such cases could cause a <application>pg_upgrade</> error.
+      Previously such cases could cause a <application>pg_upgrade</application> error.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reorder <application>pg_dump</> processing of extension-related
+      Reorder <application>pg_dump</application> processing of extension-related
       rules and event triggers (Joe Conway)
      </para>
     </listitem>
@@ -4986,7 +4986,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Force dumping of extension tables if specified by <command>pg_dump
-      -t</> or <literal>-n</> (Joe Conway)
+      -t</command> or <literal>-n</literal> (Joe Conway)
      </para>
     </listitem>
 
@@ -4999,19 +4999,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>pg_restore -l</> with the directory archive to display
+      Fix <command>pg_restore -l</command> with the directory archive to display
       the correct format name (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly record index comments created using <literal>UNIQUE</>
-      and <literal>PRIMARY KEY</> syntax (Andres Freund)
+      Properly record index comments created using <literal>UNIQUE</literal>
+      and <literal>PRIMARY KEY</literal> syntax (Andres Freund)
      </para>
 
      <para>
-      This fixes a parallel <application>pg_restore</> failure.
+      This fixes a parallel <application>pg_restore</application> failure.
      </para>
     </listitem>
 
@@ -5041,26 +5041,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>REINDEX TABLE</> and <command>REINDEX DATABASE</>
+      Fix <command>REINDEX TABLE</command> and <command>REINDEX DATABASE</command>
       to properly revalidate constraints and mark invalidated indexes as
       valid (Noah Misch)
      </para>
 
      <para>
-      <command>REINDEX INDEX</> has always worked properly.
+      <command>REINDEX INDEX</command> has always worked properly.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix possible deadlock during concurrent <command>CREATE INDEX
-      CONCURRENTLY</> operations (Tom Lane)
+      CONCURRENTLY</command> operations (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>regexp_matches()</> handling of zero-length matches
+      Fix <function>regexp_matches()</function> handling of zero-length matches
       (Jeevan Chalke)
      </para>
 
@@ -5084,14 +5084,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>ALTER DEFAULT PRIVILEGES</> to operate on schemas
+      Allow <command>ALTER DEFAULT PRIVILEGES</command> to operate on schemas
       without requiring CREATE permission (Tom Lane)
      </para>
     </listitem>
@@ -5103,24 +5103,24 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Specifically, lessen keyword restrictions for role names, language
-      names, <command>EXPLAIN</> and <command>COPY</> options, and
-      <command>SET</> values.  This allows <literal>COPY ... (FORMAT
-      BINARY)</> to work as expected; previously <literal>BINARY</> needed
+      names, <command>EXPLAIN</command> and <command>COPY</command> options, and
+      <command>SET</command> values.  This allows <literal>COPY ... (FORMAT
+      BINARY)</literal> to work as expected; previously <literal>BINARY</literal> needed
       to be quoted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgp_pub_decrypt()</> so it works for secret keys with
+      Fix <function>pgp_pub_decrypt()</function> so it works for secret keys with
       passwords (Marko Kreen)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_upgrade</> use <literal>pg_dump
-      --quote-all-identifiers</> to avoid problems with keyword changes
+      Make <application>pg_upgrade</application> use <literal>pg_dump
+      --quote-all-identifiers</literal> to avoid problems with keyword changes
       between releases (Tom Lane)
      </para>
     </listitem>
@@ -5134,7 +5134,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Ensure that <command>VACUUM ANALYZE</> still runs the ANALYZE phase
+      Ensure that <command>VACUUM ANALYZE</command> still runs the ANALYZE phase
       if its attempt to truncate the file is cancelled due to lock conflicts
       (Kevin Grittner)
      </para>
@@ -5143,21 +5143,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Avoid possible failure when performing transaction control commands (e.g
-      <command>ROLLBACK</>) in prepared queries (Tom Lane)
+      <command>ROLLBACK</command>) in prepared queries (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that floating-point data input accepts standard spellings
-      of <quote>infinity</> on all platforms (Tom Lane)
+      of <quote>infinity</quote> on all platforms (Tom Lane)
      </para>
 
      <para>
-      The C99 standard says that allowable spellings are <literal>inf</>,
-      <literal>+inf</>, <literal>-inf</>, <literal>infinity</>,
-      <literal>+infinity</>, and <literal>-infinity</>.  Make sure we
-      recognize these even if the platform's <function>strtod</> function
+      The C99 standard says that allowable spellings are <literal>inf</literal>,
+      <literal>+inf</literal>, <literal>-inf</literal>, <literal>infinity</literal>,
+      <literal>+infinity</literal>, and <literal>-infinity</literal>.  Make sure we
+      recognize these even if the platform's <function>strtod</function> function
       doesn't.
      </para>
     </listitem>
@@ -5171,7 +5171,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013d
+      Update time zone data files to <application>tzdata</application> release 2013d
       for DST law changes in Israel, Morocco, Palestine, and Paraguay.
       Also, historical zone data corrections for Macquarie Island.
      </para>
@@ -5193,7 +5193,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.8.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -5206,13 +5206,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
    <para>
     However, this release corrects several errors in management of GiST
     indexes.  After installing this update, it is advisable to
-    <command>REINDEX</> any GiST indexes that meet one or more of the
+    <command>REINDEX</command> any GiST indexes that meet one or more of the
     conditions described below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.6,
-    see <xref linkend="release-9-1-6">.
+    see <xref linkend="release-9-1-6"/>.
    </para>
 
   </sect2>
@@ -5230,7 +5230,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       A connection request containing a database name that begins with
-      <quote><literal>-</></quote> could be crafted to damage or destroy
+      <quote><literal>-</literal></quote> could be crafted to damage or destroy
       files within the server's data directory, even if the request is
       eventually rejected.  (CVE-2013-1899)
      </para>
@@ -5244,9 +5244,9 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This avoids a scenario wherein random numbers generated by
-      <filename>contrib/pgcrypto</> functions might be relatively easy for
+      <filename>contrib/pgcrypto</filename> functions might be relatively easy for
       another database user to guess.  The risk is only significant when
-      the postmaster is configured with <varname>ssl</> = <literal>on</>
+      the postmaster is configured with <varname>ssl</varname> = <literal>on</literal>
       but most connections don't use SSL encryption.  (CVE-2013-1900)
      </para>
     </listitem>
@@ -5259,7 +5259,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       An unprivileged database user could exploit this mistake to call
-      <function>pg_start_backup()</> or <function>pg_stop_backup()</>,
+      <function>pg_start_backup()</function> or <function>pg_stop_backup()</function>,
       thus possibly interfering with creation of routine backups.
       (CVE-2013-1901)
      </para>
@@ -5267,32 +5267,32 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix GiST indexes to not use <quote>fuzzy</> geometric comparisons when
+      Fix GiST indexes to not use <quote>fuzzy</quote> geometric comparisons when
       it's not appropriate to do so (Alexander Korotkov)
      </para>
 
      <para>
-      The core geometric types perform comparisons using <quote>fuzzy</>
-      equality, but <function>gist_box_same</> must do exact comparisons,
+      The core geometric types perform comparisons using <quote>fuzzy</quote>
+      equality, but <function>gist_box_same</function> must do exact comparisons,
       else GiST indexes using it might become inconsistent.  After installing
-      this update, users should <command>REINDEX</> any GiST indexes on
-      <type>box</>, <type>polygon</>, <type>circle</>, or <type>point</>
-      columns, since all of these use <function>gist_box_same</>.
+      this update, users should <command>REINDEX</command> any GiST indexes on
+      <type>box</type>, <type>polygon</type>, <type>circle</type>, or <type>point</type>
+      columns, since all of these use <function>gist_box_same</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous range-union and penalty logic in GiST indexes that use
-      <filename>contrib/btree_gist</> for variable-width data types, that is
-      <type>text</>, <type>bytea</>, <type>bit</>, and <type>numeric</>
+      <filename>contrib/btree_gist</filename> for variable-width data types, that is
+      <type>text</type>, <type>bytea</type>, <type>bit</type>, and <type>numeric</type>
       columns (Tom Lane)
      </para>
 
      <para>
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in useless
-      index bloat.  Users are advised to <command>REINDEX</> such indexes
+      index bloat.  Users are advised to <command>REINDEX</command> such indexes
       after installing this update.
      </para>
     </listitem>
@@ -5307,21 +5307,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in indexes
       that are unnecessarily inefficient to search.  Users are advised to
-      <command>REINDEX</> multi-column GiST indexes after installing this
+      <command>REINDEX</command> multi-column GiST indexes after installing this
       update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>gist_point_consistent</>
+      Fix <function>gist_point_consistent</function>
       to handle fuzziness consistently (Alexander Korotkov)
      </para>
 
      <para>
-      Index scans on GiST indexes on <type>point</> columns would sometimes
+      Index scans on GiST indexes on <type>point</type> columns would sometimes
       yield results different from a sequential scan, because
-      <function>gist_point_consistent</> disagreed with the underlying
+      <function>gist_point_consistent</function> disagreed with the underlying
       operator code about whether to do comparisons exactly or fuzzily.
      </para>
     </listitem>
@@ -5332,21 +5332,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      This bug could result in <quote>incorrect local pin count</> errors
+      This bug could result in <quote>incorrect local pin count</quote> errors
       during replay, making recovery impossible.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix race condition in <command>DELETE RETURNING</> (Tom Lane)
+      Fix race condition in <command>DELETE RETURNING</command> (Tom Lane)
      </para>
 
      <para>
-      Under the right circumstances, <command>DELETE RETURNING</> could
+      Under the right circumstances, <command>DELETE RETURNING</command> could
       attempt to fetch data from a shared buffer that the current process
       no longer has any pin on.  If some other process changed the buffer
-      meanwhile, this would lead to garbage <literal>RETURNING</> output, or
+      meanwhile, this would lead to garbage <literal>RETURNING</literal> output, or
       even a crash.
      </para>
     </listitem>
@@ -5367,28 +5367,28 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to use ASCII-only case-folding rules where
+      Fix <function>to_char()</function> to use ASCII-only case-folding rules where
       appropriate (Tom Lane)
      </para>
 
      <para>
       This fixes misbehavior of some template patterns that should be
-      locale-independent, but mishandled <quote><literal>I</></quote> and
-      <quote><literal>i</></quote> in Turkish locales.
+      locale-independent, but mishandled <quote><literal>I</literal></quote> and
+      <quote><literal>i</literal></quote> in Turkish locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</>
+      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix logic error when a single transaction does <command>UNLISTEN</>
-      then <command>LISTEN</> (Tom Lane)
+      Fix logic error when a single transaction does <command>UNLISTEN</command>
+      then <command>LISTEN</command> (Tom Lane)
      </para>
 
      <para>
@@ -5406,7 +5406,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Remove useless <quote>picksplit doesn't support secondary split</> log
+      Remove useless <quote>picksplit doesn't support secondary split</quote> log
       messages (Josh Hansen, Tom Lane)
      </para>
 
@@ -5427,29 +5427,29 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</> function
+      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</function> function
       (Alex Hunsaker, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to handle database names containing
-      <quote><literal>=</></quote> correctly (Heikki Linnakangas)
+      Fix <application>pg_dumpall</application> to handle database names containing
+      <quote><literal>=</literal></quote> correctly (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <application>pg_dump</> when an incorrect connection
+      Avoid crash in <application>pg_dump</application> when an incorrect connection
       string is given (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore invalid indexes in <application>pg_dump</> and
-      <application>pg_upgrade</> (Michael Paquier, Bruce Momjian)
+      Ignore invalid indexes in <application>pg_dump</application> and
+      <application>pg_upgrade</application> (Michael Paquier, Bruce Momjian)
      </para>
 
      <para>
@@ -5458,15 +5458,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       a uniqueness condition not satisfied by the table's data.  Also, if the
       index creation is in fact still in progress, it seems reasonable to
       consider it to be an uncommitted DDL change, which
-      <application>pg_dump</> wouldn't be expected to dump anyway.
-      <application>pg_upgrade</> now also skips invalid indexes rather than
+      <application>pg_dump</application> wouldn't be expected to dump anyway.
+      <application>pg_upgrade</application> now also skips invalid indexes rather than
       failing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_basebackup</>, include only the current server
+      In <application>pg_basebackup</application>, include only the current server
       version's subdirectory when backing up a tablespace (Heikki
       Linnakangas)
      </para>
@@ -5474,26 +5474,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Add a server version check in <application>pg_basebackup</> and
-      <application>pg_receivexlog</>, so they fail cleanly with version
+      Add a server version check in <application>pg_basebackup</application> and
+      <application>pg_receivexlog</application>, so they fail cleanly with version
       combinations that won't work (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s <function>similarity()</> function
+      Fix <filename>contrib/pg_trgm</filename>'s <function>similarity()</function> function
       to return zero for trigram-less strings (Tom Lane)
      </para>
 
      <para>
-      Previously it returned <literal>NaN</> due to internal division by zero.
+      Previously it returned <literal>NaN</literal> due to internal division by zero.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013b
+      Update time zone data files to <application>tzdata</application> release 2013b
       for DST law changes in Chile, Haiti, Morocco, Paraguay, and some
       Russian areas.  Also, historical zone data corrections for numerous
       places.
@@ -5501,12 +5501,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Also, update the time zone abbreviation files for recent changes in
-      Russia and elsewhere: <literal>CHOT</>, <literal>GET</>,
-      <literal>IRKT</>, <literal>KGT</>, <literal>KRAT</>, <literal>MAGT</>,
-      <literal>MAWT</>, <literal>MSK</>, <literal>NOVT</>, <literal>OMST</>,
-      <literal>TKT</>, <literal>VLAT</>, <literal>WST</>, <literal>YAKT</>,
-      <literal>YEKT</> now follow their current meanings, and
-      <literal>VOLT</> (Europe/Volgograd) and <literal>MIST</>
+      Russia and elsewhere: <literal>CHOT</literal>, <literal>GET</literal>,
+      <literal>IRKT</literal>, <literal>KGT</literal>, <literal>KRAT</literal>, <literal>MAGT</literal>,
+      <literal>MAWT</literal>, <literal>MSK</literal>, <literal>NOVT</literal>, <literal>OMST</literal>,
+      <literal>TKT</literal>, <literal>VLAT</literal>, <literal>WST</literal>, <literal>YAKT</literal>,
+      <literal>YEKT</literal> now follow their current meanings, and
+      <literal>VOLT</literal> (Europe/Volgograd) and <literal>MIST</literal>
       (Antarctica/Macquarie) are added to the default abbreviations list.
      </para>
     </listitem>
@@ -5527,7 +5527,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.7.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -5539,7 +5539,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.6,
-    see <xref linkend="release-9-1-6">.
+    see <xref linkend="release-9-1-6"/>.
    </para>
 
   </sect2>
@@ -5551,7 +5551,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -5635,19 +5635,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -5659,13 +5659,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix error in <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       implementation (Andres Freund)
      </para>
 
      <para>
       In installations that have existed for more than <link
-      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</></link>
+      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</varname></link>
       transactions, this mistake prevented autovacuum from using partial-table
       scans, so that a full-table scan would always happen instead.
      </para>
@@ -5673,13 +5673,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -5699,13 +5699,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Reject out-of-range dates in <function>to_date()</> (Hitoshi Harada)
+      Reject out-of-range dates in <function>to_date()</function> (Hitoshi Harada)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_extension_config_dump()</> to handle
+      Fix <function>pg_extension_config_dump()</function> to handle
       extension-update cases properly (Tom Lane)
      </para>
 
@@ -5729,13 +5729,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
@@ -5743,61 +5743,61 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix possible error if a relation file is removed while
-      <application>pg_basebackup</> is running (Heikki Linnakangas)
+      <application>pg_basebackup</application> is running (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> exclude data of unlogged tables when
+      Make <application>pg_dump</application> exclude data of unlogged tables when
       running on a hot-standby server (Magnus Hagander)
      </para>
 
      <para>
       This would fail anyway because the data is not available on the standby
       server, so it seems most convenient to assume
-      <option>--no-unlogged-table-data</> automatically.
+      <option>--no-unlogged-table-data</option> automatically.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to deal with invalid indexes safely
+      Fix <application>pg_upgrade</application> to deal with invalid indexes safely
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> use translated messages properly
+      Make <application>ecpglib</application> use translated messages properly
       (Chen Huajun)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly install <application>ecpg_compat</> and
-      <application>pgtypes</> libraries on MSVC (Jiang Guiqing)
+      Properly install <application>ecpg_compat</application> and
+      <application>pgtypes</application> libraries on MSVC (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Include our version of <function>isinf()</> in
-      <application>libecpg</> if it's not provided by the system
+      Include our version of <function>isinf()</function> in
+      <application>libecpg</application> if it's not provided by the system
       (Jiang Guiqing)
      </para>
     </listitem>
@@ -5817,15 +5817,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -5849,7 +5849,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.6.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -5861,7 +5861,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.6,
-    see <xref linkend="release-9-1-6">.
+    see <xref linkend="release-9-1-6"/>.
    </para>
 
   </sect2>
@@ -5874,13 +5874,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane)
      </para>
 
      <para>
-      Fix <command>CREATE INDEX CONCURRENTLY</> to use
+      Fix <command>CREATE INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       resulting in corrupt concurrently-created indexes.
      </para>
@@ -5888,8 +5888,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
@@ -5926,13 +5926,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This oversight could prevent subsequent execution of certain
-      operations such as <command>CREATE INDEX CONCURRENTLY</>.
+      operations such as <command>CREATE INDEX CONCURRENTLY</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid bogus <quote>out-of-sequence timeline ID</> errors in standby
+      Avoid bogus <quote>out-of-sequence timeline ID</quote> errors in standby
       mode (Heikki Linnakangas)
      </para>
     </listitem>
@@ -5990,20 +5990,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>SELECT DISTINCT</> with index-optimized
-      <function>MIN</>/<function>MAX</> on an inheritance tree (Tom Lane)
+      Fix <command>SELECT DISTINCT</command> with index-optimized
+      <function>MIN</function>/<function>MAX</function> on an inheritance tree (Tom Lane)
      </para>
 
      <para>
       The planner would fail with <quote>failed to re-find MinMaxAggInfo
-      record</> given this combination of factors.
+      record</quote> given this combination of factors.
      </para>
     </listitem>
 
@@ -6021,10 +6021,10 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -6032,12 +6032,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
       In very unusual circumstances, this oversight could result in passing
-      incorrect data to a trigger <literal>WHEN</> condition, or to the
+      incorrect data to a trigger <literal>WHEN</literal> condition, or to the
       precheck logic for a foreign-key enforcement trigger.  That could
       result in a crash, or in an incorrect decision about whether to
       fire the trigger.
@@ -6046,7 +6046,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to handle inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to handle inherited check
       constraints properly (Pavan Deolasee)
      </para>
 
@@ -6058,7 +6058,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>ALTER EXTENSION SET SCHEMA</>'s failure  to move some
+      Fix <command>ALTER EXTENSION SET SCHEMA</command>'s failure  to move some
       subsidiary objects into the new schema (&Aacute;lvaro Herrera, Dimitri
       Fontaine)
      </para>
@@ -6066,14 +6066,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -6087,7 +6087,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -6095,7 +6095,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -6117,14 +6117,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix failure to advance XID epoch if XID wraparound happens during a
-      checkpoint and <varname>wal_level</> is <literal>hot_standby</>
+      checkpoint and <varname>wal_level</varname> is <literal>hot_standby</literal>
       (Tom Lane, Andres Freund)
      </para>
 
      <para>
       While this mistake had no particular impact on
       <productname>PostgreSQL</productname> itself, it was bad for
-      applications that rely on <function>txid_current()</> and related
+      applications that rely on <function>txid_current()</function> and related
       functions: the TXID value would appear to go backwards.
      </para>
     </listitem>
@@ -6132,7 +6132,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix display of
-      <structname>pg_stat_replication</>.<structfield>sync_state</> at a
+      <structname>pg_stat_replication</structname>.<structfield>sync_state</structfield> at a
       page boundary (Kyotaro Horiguchi)
      </para>
     </listitem>
@@ -6146,7 +6146,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -6159,8 +6159,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -6170,15 +6170,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> dump <literal>SEQUENCE SET</> items in
+      Make <application>pg_dump</application> dump <literal>SEQUENCE SET</literal> items in
       the data not pre-data section of the archive (Tom Lane)
      </para>
 
@@ -6190,25 +6190,25 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -6219,67 +6219,67 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <literal>tar</> files emitted by <application>pg_basebackup</> to
+      Fix <literal>tar</literal> files emitted by <application>pg_basebackup</application> to
       be POSIX conformant (Brian Weaver, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s <function>ecpg_get_data</> function to
+      Fix <application>ecpg</application>'s <function>ecpg_get_data</function> function to
       handle arrays properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <literal>make install</> for an extension creates the
-      <filename>extension</> installation directory (C&eacute;dric Villemain)
+      Ensure that <literal>make install</literal> for an extension creates the
+      <filename>extension</filename> installation directory (C&eacute;dric Villemain)
      </para>
 
      <para>
-      Previously, this step was missed if <varname>MODULEDIR</> was set in
+      Previously, this step was missed if <varname>MODULEDIR</varname> was set in
       the extension's Makefile.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -6290,7 +6290,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -6312,7 +6312,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.5.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -6323,14 +6323,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
    </para>
 
    <para>
-    However, you may need to perform <command>REINDEX</> operations to
+    However, you may need to perform <command>REINDEX</command> operations to
     recover from the effects of the data corruption bug described in the
     first changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.4,
-    see <xref linkend="release-9-1-4">.
+    see <xref linkend="release-9-1-4"/>.
    </para>
 
   </sect2>
@@ -6354,7 +6354,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       likely to occur on standby slave servers since those perform much
       more WAL replay.  There is a low probability of corruption of btree
       and GIN indexes.  There is a much higher probability of corruption of
-      table <quote>visibility maps</>.  Fortunately, visibility maps are
+      table <quote>visibility maps</quote>.  Fortunately, visibility maps are
       non-critical data in 9.1, so the worst consequence of such corruption
       in 9.1 installations is transient inefficiency of vacuuming.  Table
       data proper cannot be corrupted by this bug.
@@ -6363,18 +6363,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       While no index corruption due to this bug is known to have occurred
       in the field, as a precautionary measure it is recommended that
-      production installations <command>REINDEX</> all btree and GIN
+      production installations <command>REINDEX</command> all btree and GIN
       indexes at a convenient time after upgrading to 9.1.6.
      </para>
 
      <para>
       Also, if you intend to do an in-place upgrade to 9.2.X, before doing
-      so it is recommended to perform a <command>VACUUM</> of all tables
+      so it is recommended to perform a <command>VACUUM</command> of all tables
       while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will ensure that any lingering wrong data in the
       visibility maps is corrected before 9.2.X can depend on it.  <link
-      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</></link>
+      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</varname></link>
       can be adjusted to reduce the performance impact of vacuuming, while
       causing it to take longer to finish.
      </para>
@@ -6388,15 +6388,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       These errors could result in wrong answers from queries that scan the
-      same <literal>WITH</> subquery multiple times.
+      same <literal>WITH</literal> subquery multiple times.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix misbehavior when <link
-      linkend="guc-default-transaction-isolation"><varname>default_transaction_isolation</></link>
-      is set to <literal>serializable</> (Kevin Grittner, Tom Lane, Heikki
+      linkend="guc-default-transaction-isolation"><varname>default_transaction_isolation</varname></link>
+      is set to <literal>serializable</literal> (Kevin Grittner, Tom Lane, Heikki
       Linnakangas)
      </para>
 
@@ -6409,7 +6409,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Improve selectivity estimation for text search queries involving
-      prefixes, i.e. <replaceable>word</><literal>:*</> patterns  (Tom Lane)
+      prefixes, i.e. <replaceable>word</replaceable><literal>:*</literal> patterns  (Tom Lane)
      </para>
     </listitem>
 
@@ -6432,10 +6432,10 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      If we revoke a grant option from some role <replaceable>X</>, but
-      <replaceable>X</> still holds that option via a grant from someone
+      If we revoke a grant option from some role <replaceable>X</replaceable>, but
+      <replaceable>X</replaceable> still holds that option via a grant from someone
       else, we should not recursively revoke the corresponding privilege
-      from role(s) <replaceable>Y</> that <replaceable>X</> had granted it
+      from role(s) <replaceable>Y</replaceable> that <replaceable>X</replaceable> had granted it
       to.
      </para>
     </listitem>
@@ -6448,7 +6448,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This situation creates circular dependencies that confuse
-      <application>pg_dump</> and probably other things.  It's confusing
+      <application>pg_dump</application> and probably other things.  It's confusing
       for humans too, so disallow it.
      </para>
     </listitem>
@@ -6462,7 +6462,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <application>configure</> probe for <function>mbstowcs_l</> (Tom
+      Make <application>configure</application> probe for <function>mbstowcs_l</function> (Tom
       Lane)
      </para>
 
@@ -6473,12 +6473,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix handling of <literal>SIGFPE</> when PL/Perl is in use (Andres Freund)
+      Fix handling of <literal>SIGFPE</literal> when PL/Perl is in use (Andres Freund)
      </para>
 
      <para>
-      Perl resets the process's <literal>SIGFPE</> handler to
-      <literal>SIG_IGN</>, which could result in crashes later on.  Restore
+      Perl resets the process's <literal>SIGFPE</literal> handler to
+      <literal>SIG_IGN</literal>, which could result in crashes later on.  Restore
       the normal Postgres signal handler after initializing PL/Perl.
      </para>
     </listitem>
@@ -6497,7 +6497,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -6505,45 +6505,45 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix bugs in <filename>contrib/pg_trgm</>'s <literal>LIKE</> pattern
+      Fix bugs in <filename>contrib/pg_trgm</filename>'s <literal>LIKE</literal> pattern
       analysis code (Fujii Masao)
      </para>
 
      <para>
-      <literal>LIKE</> queries using a trigram index could produce wrong
-      results if the pattern contained <literal>LIKE</> escape characters.
+      <literal>LIKE</literal> queries using a trigram index could produce wrong
+      results if the pattern contained <literal>LIKE</literal> escape characters.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s handling of line endings on Windows
+      Fix <application>pg_upgrade</application>'s handling of line endings on Windows
       (Andrew Dunstan)
      </para>
 
      <para>
-      Previously, <application>pg_upgrade</> might add or remove carriage
+      Previously, <application>pg_upgrade</application> might add or remove carriage
       returns in places such as function bodies.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On Windows, make <application>pg_upgrade</> use backslash path
+      On Windows, make <application>pg_upgrade</application> use backslash path
       separators in the scripts it emits (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove unnecessary dependency on <application>pg_config</> from
-      <application>pg_upgrade</> (Peter Eisentraut)
+      Remove unnecessary dependency on <application>pg_config</application> from
+      <application>pg_upgrade</application> (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -6564,7 +6564,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.4.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -6576,7 +6576,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.4,
-    see <xref linkend="release-9-1-4">.
+    see <xref linkend="release-9-1-4"/>.
    </para>
 
   </sect2>
@@ -6593,7 +6593,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      <function>xml_parse()</> would attempt to fetch external files or
+      <function>xml_parse()</function> would attempt to fetch external files or
       URLs as needed to resolve DTD and entity references in an XML value,
       thus allowing unprivileged database users to attempt to fetch data
       with the privileges of the database server.  While the external data
@@ -6606,22 +6606,22 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent access to external files/URLs via <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Peter Eisentraut)
+      Prevent access to external files/URLs via <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Peter Eisentraut)
      </para>
 
      <para>
-      <application>libxslt</> offers the ability to read and write both
+      <application>libxslt</application> offers the ability to read and write both
       files and URLs through stylesheet commands, thus allowing
       unprivileged database users to both read and write data with the
       privileges of the database server.  Disable that through proper use
-      of <application>libxslt</>'s security options.  (CVE-2012-3488)
+      of <application>libxslt</application>'s security options.  (CVE-2012-3488)
      </para>
 
      <para>
-      Also, remove <function>xslt_process()</>'s ability to fetch documents
+      Also, remove <function>xslt_process()</function>'s ability to fetch documents
       and stylesheets from external files/URLs.  While this was a
-      documented <quote>feature</>, it was long regarded as a bad idea.
+      documented <quote>feature</quote>, it was long regarded as a bad idea.
       The fix for CVE-2012-3489 broke that capability, and rather than
       expend effort on trying to fix it, we're just going to summarily
       remove it.
@@ -6649,21 +6649,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      If <command>ALTER SEQUENCE</> was executed on a freshly created or
-      reset sequence, and then precisely one <function>nextval()</> call
+      If <command>ALTER SEQUENCE</command> was executed on a freshly created or
+      reset sequence, and then precisely one <function>nextval()</function> call
       was made on it, and then the server crashed, WAL replay would restore
       the sequence to a state in which it appeared that no
-      <function>nextval()</> had been done, thus allowing the first
+      <function>nextval()</function> had been done, thus allowing the first
       sequence value to be returned again by the next
-      <function>nextval()</> call.  In particular this could manifest for
-      <type>serial</> columns, since creation of a serial column's sequence
-      includes an <command>ALTER SEQUENCE OWNED BY</> step.
+      <function>nextval()</function> call.  In particular this could manifest for
+      <type>serial</type> columns, since creation of a serial column's sequence
+      includes an <command>ALTER SEQUENCE OWNED BY</command> step.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix race condition in <literal>enum</>-type value comparisons (Robert
+      Fix race condition in <literal>enum</literal>-type value comparisons (Robert
       Haas, Tom Lane)
      </para>
 
@@ -6675,7 +6675,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <function>txid_current()</> to report the correct epoch when not
+      Fix <function>txid_current()</function> to report the correct epoch when not
       in hot standby (Heikki Linnakangas)
      </para>
 
@@ -6692,7 +6692,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       The master might improperly choose pseudo-servers such as
-      <application>pg_receivexlog</> or <application>pg_basebackup</>
+      <application>pg_receivexlog</application> or <application>pg_basebackup</application>
       as the synchronous standby, and then wait indefinitely for them.
      </para>
     </listitem>
@@ -6705,14 +6705,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This mistake led to failures reported as <quote>out-of-order XID
-      insertion in KnownAssignedXids</>.
+      insertion in KnownAssignedXids</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure the <filename>backup_label</> file is fsync'd after
-      <function>pg_start_backup()</> (Dave Kerr)
+      Ensure the <filename>backup_label</filename> file is fsync'd after
+      <function>pg_start_backup()</function> (Dave Kerr)
      </para>
     </listitem>
 
@@ -6723,7 +6723,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       WAL sender background processes neglected to establish a
-      <systemitem>SIGALRM</> handler, meaning they would wait forever in
+      <systemitem>SIGALRM</systemitem> handler, meaning they would wait forever in
       some corner cases where a timeout ought to happen.
      </para>
     </listitem>
@@ -6742,15 +6742,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <literal>LISTEN</>/<literal>NOTIFY</> to cope better with I/O
+      Fix <literal>LISTEN</literal>/<literal>NOTIFY</literal> to cope better with I/O
       problems, such as out of disk space (Tom Lane)
      </para>
 
      <para>
       After a write failure, all subsequent attempts to send more
-      <literal>NOTIFY</> messages would fail with messages like
-      <quote>Could not read from file "pg_notify/<replaceable>nnnn</>" at
-      offset <replaceable>nnnnn</>: Success</quote>.
+      <literal>NOTIFY</literal> messages would fail with messages like
+      <quote>Could not read from file "pg_notify/<replaceable>nnnn</replaceable>" at
+      offset <replaceable>nnnnn</replaceable>: Success</quote>.
      </para>
     </listitem>
 
@@ -6763,7 +6763,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       The original coding could allow inconsistent behavior in some cases;
       in particular, an autovacuum could get canceled after less than
-      <literal>deadlock_timeout</> grace period.
+      <literal>deadlock_timeout</literal> grace period.
      </para>
     </listitem>
 
@@ -6775,15 +6775,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix log collector so that <literal>log_truncate_on_rotation</> works
+      Fix log collector so that <literal>log_truncate_on_rotation</literal> works
       during the very first log rotation after server start (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>WITH</> attached to a nested set operation
-      (<literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</>)
+      Fix <literal>WITH</literal> attached to a nested set operation
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
       (Tom Lane)
      </para>
     </listitem>
@@ -6791,44 +6791,44 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Ensure that a whole-row reference to a subquery doesn't include any
-      extra <literal>GROUP BY</> or <literal>ORDER BY</> columns (Tom Lane)
+      extra <literal>GROUP BY</literal> or <literal>ORDER BY</literal> columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix dependencies generated during <literal>ALTER TABLE ... ADD
-      CONSTRAINT USING INDEX</> (Tom Lane)
+      CONSTRAINT USING INDEX</literal> (Tom Lane)
      </para>
 
      <para>
-      This command left behind a redundant <structname>pg_depend</> entry
+      This command left behind a redundant <structname>pg_depend</structname> entry
       for the index, which could confuse later operations, notably
-      <literal>ALTER TABLE ... ALTER COLUMN TYPE</> on one of the indexed
+      <literal>ALTER TABLE ... ALTER COLUMN TYPE</literal> on one of the indexed
       columns.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to work on extensions (Alvaro Herrera)
+      Fix <command>REASSIGN OWNED</command> to work on extensions (Alvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow copying whole-row references in <literal>CHECK</>
-      constraints and index definitions during <command>CREATE TABLE</>
+      Disallow copying whole-row references in <literal>CHECK</literal>
+      constraints and index definitions during <command>CREATE TABLE</command>
       (Tom Lane)
      </para>
 
      <para>
-      This situation can arise in <command>CREATE TABLE</> with
-      <literal>LIKE</> or <literal>INHERITS</>.  The copied whole-row
+      This situation can arise in <command>CREATE TABLE</command> with
+      <literal>LIKE</literal> or <literal>INHERITS</literal>.  The copied whole-row
       variable was incorrectly labeled with the row type of the original
       table not the new one.  Rejecting the case seems reasonable for
-      <literal>LIKE</>, since the row types might well diverge later.  For
-      <literal>INHERITS</> we should ideally allow it, with an implicit
+      <literal>LIKE</literal>, since the row types might well diverge later.  For
+      <literal>INHERITS</literal> we should ideally allow it, with an implicit
       coercion to the parent table's row type; but that will require more
       work than seems safe to back-patch.
      </para>
@@ -6836,7 +6836,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix memory leak in <literal>ARRAY(SELECT ...)</> subqueries (Heikki
+      Fix memory leak in <literal>ARRAY(SELECT ...)</literal> subqueries (Heikki
       Linnakangas, Tom Lane)
      </para>
     </listitem>
@@ -6860,7 +6860,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       The code could get confused by quantified parenthesized
-      subexpressions, such as <literal>^(foo)?bar</>.  This would lead to
+      subexpressions, such as <literal>^(foo)?bar</literal>.  This would lead to
       incorrect index optimization of searches for such patterns.
      </para>
     </listitem>
@@ -6868,26 +6868,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix bugs with parsing signed
-      <replaceable>hh</><literal>:</><replaceable>mm</> and
-      <replaceable>hh</><literal>:</><replaceable>mm</><literal>:</><replaceable>ss</>
-      fields in <type>interval</> constants (Amit Kapila, Tom Lane)
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable> and
+      <replaceable>hh</replaceable><literal>:</literal><replaceable>mm</replaceable><literal>:</literal><replaceable>ss</replaceable>
+      fields in <type>interval</type> constants (Amit Kapila, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to better handle views containing partial
-      <literal>GROUP BY</> lists (Tom Lane)
+      Fix <application>pg_dump</application> to better handle views containing partial
+      <literal>GROUP BY</literal> lists (Tom Lane)
      </para>
 
      <para>
-      A view that lists only a primary key column in <literal>GROUP BY</>,
+      A view that lists only a primary key column in <literal>GROUP BY</literal>,
       but uses other table columns as if they were grouped, gets marked as
       depending on the primary key.  Improper handling of such primary key
-      dependencies in <application>pg_dump</> resulted in poorly-ordered
+      dependencies in <application>pg_dump</application> resulted in poorly-ordered
       dumps, which at best would be inefficient to restore and at worst
       could result in outright failure of a parallel
-      <application>pg_restore</> run.
+      <application>pg_restore</application> run.
      </para>
     </listitem>
 
@@ -6923,14 +6923,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Report errors properly in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Tom Lane)
+      Report errors properly in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012e
+      Update time zone data files to <application>tzdata</application> release 2012e
       for DST law changes in Morocco and Tokelau
      </para>
     </listitem>
@@ -6951,7 +6951,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.3.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -6962,20 +6962,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
    </para>
 
    <para>
-    However, if you use the <type>citext</> data type, and you upgraded
-    from a previous major release by running <application>pg_upgrade</>,
-    you should run <literal>CREATE EXTENSION citext FROM unpackaged</>
-    to avoid collation-related failures in <type>citext</> operations.
+    However, if you use the <type>citext</type> data type, and you upgraded
+    from a previous major release by running <application>pg_upgrade</application>,
+    you should run <literal>CREATE EXTENSION citext FROM unpackaged</literal>
+    to avoid collation-related failures in <type>citext</type> operations.
     The same is necessary if you restore a dump from a pre-9.1 database
-    that contains an instance of the <type>citext</> data type.
-    If you've already run the <command>CREATE EXTENSION</> command before
+    that contains an instance of the <type>citext</type> data type.
+    If you've already run the <command>CREATE EXTENSION</command> command before
     upgrading to 9.1.4, you will instead need to do manual catalog updates
     as explained in the third changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.1.2,
-    see <xref linkend="release-9-1-2">.
+    see <xref linkend="release-9-1-2"/>.
    </para>
 
   </sect2>
@@ -6988,12 +6988,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix incorrect password transformation in
-      <filename>contrib/pgcrypto</>'s DES <function>crypt()</> function
+      <filename>contrib/pgcrypto</filename>'s DES <function>crypt()</function> function
       (Solar Designer)
      </para>
 
      <para>
-      If a password string contained the byte value <literal>0x80</>, the
+      If a password string contained the byte value <literal>0x80</literal>, the
       remainder of the password was ignored, causing the password to be much
       weaker than it appeared.  With this fix, the rest of the string is
       properly included in the DES hash.  Any stored password values that are
@@ -7004,7 +7004,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Ignore <literal>SECURITY DEFINER</> and <literal>SET</> attributes for
+      Ignore <literal>SECURITY DEFINER</literal> and <literal>SET</literal> attributes for
       a procedural language's call handler (Tom Lane)
      </para>
 
@@ -7016,16 +7016,16 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <filename>contrib/citext</>'s upgrade script fix collations of
-      <type>citext</> arrays and domains over <type>citext</>
+      Make <filename>contrib/citext</filename>'s upgrade script fix collations of
+      <type>citext</type> arrays and domains over <type>citext</type>
       (Tom Lane)
      </para>
 
      <para>
-      Release 9.1.2 provided a fix for collations of <type>citext</> columns
+      Release 9.1.2 provided a fix for collations of <type>citext</type> columns
       and indexes in databases upgraded or reloaded from pre-9.1
       installations, but that fix was incomplete: it neglected to handle arrays
-      and domains over <type>citext</>.  This release extends the module's
+      and domains over <type>citext</type>.  This release extends the module's
       upgrade script to handle these cases.  As before, if you have already
       run the upgrade script, you'll need to run the collation update
       commands by hand instead.  See the 9.1.2 release notes for more
@@ -7035,7 +7035,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Allow numeric timezone offsets in <type>timestamp</> input to be up to
+      Allow numeric timezone offsets in <type>timestamp</type> input to be up to
       16 hours away from UTC (Tom Lane)
      </para>
 
@@ -7061,7 +7061,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <type>text</> to <type>name</> and <type>char</> to <type>name</>
+      Fix <type>text</type> to <type>name</type> and <type>char</type> to <type>name</type>
       casts to perform string truncation correctly in multibyte encodings
       (Karl Schnaitter)
      </para>
@@ -7069,13 +7069,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix memory copying bug in <function>to_tsquery()</> (Heikki Linnakangas)
+      Fix memory copying bug in <function>to_tsquery()</function> (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <function>txid_current()</> reports the correct epoch when
+      Ensure <function>txid_current()</function> reports the correct epoch when
       executed in hot standby (Simon Riggs)
      </para>
     </listitem>
@@ -7090,7 +7090,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       This bug concerns sub-SELECTs that reference variables coming from the
       nullable side of an outer join of the surrounding query.
       In 9.1, queries affected by this bug would fail with <quote>ERROR:
-      Upper-level PlaceHolderVar found where not expected</>.  But in 9.0 and
+      Upper-level PlaceHolderVar found where not expected</quote>.  But in 9.0 and
       8.4, you'd silently get possibly-wrong answers, since the value
       transmitted into the subquery wouldn't go to null when it should.
      </para>
@@ -7098,26 +7098,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix planning of <literal>UNION ALL</> subqueries with output columns
+      Fix planning of <literal>UNION ALL</literal> subqueries with output columns
       that are not simple variables (Tom Lane)
      </para>
 
      <para>
       Planning of such cases got noticeably worse in 9.1 as a result of a
       misguided fix for <quote>MergeAppend child's targetlist doesn't match
-      MergeAppend</> errors.  Revert that fix and do it another way.
+      MergeAppend</quote> errors.  Revert that fix and do it another way.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow session startup when <structname>pg_attribute</> is very large
+      Fix slow session startup when <structname>pg_attribute</structname> is very large
       (Tom Lane)
      </para>
 
      <para>
-      If <structname>pg_attribute</> exceeds one-fourth of
-      <varname>shared_buffers</>, cache rebuilding code that is sometimes
+      If <structname>pg_attribute</structname> exceeds one-fourth of
+      <varname>shared_buffers</varname>, cache rebuilding code that is sometimes
       needed during session start would trigger the synchronized-scan logic,
       causing it to take many times longer than normal.  The problem was
       particularly acute if many new sessions were starting at once.
@@ -7138,8 +7138,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Ensure the Windows implementation of <function>PGSemaphoreLock()</>
-      clears <varname>ImmediateInterruptOK</> before returning (Tom Lane)
+      Ensure the Windows implementation of <function>PGSemaphoreLock()</function>
+      clears <varname>ImmediateInterruptOK</varname> before returning (Tom Lane)
      </para>
 
      <para>
@@ -7166,31 +7166,31 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>COPY FROM</> to properly handle null marker strings that
+      Fix <command>COPY FROM</command> to properly handle null marker strings that
       correspond to invalid encoding (Tom Lane)
      </para>
 
      <para>
-      A null marker string such as <literal>E'\\0'</> should work, and did
+      A null marker string such as <literal>E'\\0'</literal> should work, and did
       work in the past, but the case got broken in 8.4.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN VERBOSE</> for writable CTEs containing
-      <literal>RETURNING</> clauses (Tom Lane)
+      Fix <command>EXPLAIN VERBOSE</command> for writable CTEs containing
+      <literal>RETURNING</literal> clauses (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>PREPARE TRANSACTION</> to work correctly in the presence
+      Fix <command>PREPARE TRANSACTION</command> to work correctly in the presence
       of advisory locks (Tom Lane)
      </para>
 
      <para>
-      Historically, <command>PREPARE TRANSACTION</> has simply ignored any
+      Historically, <command>PREPARE TRANSACTION</command> has simply ignored any
       session-level advisory locks the session holds, but this case was
       accidentally broken in 9.1.
      </para>
@@ -7205,14 +7205,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Ignore missing schemas during non-interactive assignments of
-      <varname>search_path</> (Tom Lane)
+      <varname>search_path</varname> (Tom Lane)
      </para>
 
      <para>
       This re-aligns 9.1's behavior with that of older branches.  Previously
       9.1 would throw an error for nonexistent schemas mentioned in
-      <varname>search_path</> settings obtained from places such as
-      <command>ALTER DATABASE SET</>.
+      <varname>search_path</varname> settings obtained from places such as
+      <command>ALTER DATABASE SET</command>.
      </para>
     </listitem>
 
@@ -7223,7 +7223,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      This includes cases such as a rewriting <command>ALTER TABLE</> within
+      This includes cases such as a rewriting <command>ALTER TABLE</command> within
       an extension update script, since that uses a transient table behind
       the scenes.
      </para>
@@ -7237,7 +7237,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Previously, infinite recursion in a function invoked by
-      auto-<command>ANALYZE</> could crash worker processes.
+      auto-<command>ANALYZE</command> could crash worker processes.
      </para>
     </listitem>
 
@@ -7256,13 +7256,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix logging collector to ensure it will restart file rotation
-      after receiving <systemitem>SIGHUP</> (Tom Lane)
+      after receiving <systemitem>SIGHUP</systemitem> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>too many LWLocks taken</> failure in GiST indexes (Heikki
+      Fix <quote>too many LWLocks taken</quote> failure in GiST indexes (Heikki
       Linnakangas)
      </para>
     </listitem>
@@ -7296,35 +7296,35 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix error handling in <application>pg_basebackup</>
+      Fix error handling in <application>pg_basebackup</application>
       (Thomas Ogrisegg, Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>walsender</> to not go into a busy loop if connection
+      Fix <application>walsender</application> to not go into a busy loop if connection
       is terminated (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</> command (Joe
+      Fix memory leak in PL/pgSQL's <command>RETURN NEXT</command> command (Joe
       Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix PL/pgSQL's <command>GET DIAGNOSTICS</> command when the target
+      Fix PL/pgSQL's <command>GET DIAGNOSTICS</command> command when the target
       is the function's first variable (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that PL/Perl package-qualifies the <varname>_TD</> variable
+      Ensure that PL/Perl package-qualifies the <varname>_TD</varname> variable
       (Alex Hunsaker)
      </para>
 
@@ -7349,19 +7349,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix potential access off the end of memory in <application>psql</>'s
-      expanded display (<command>\x</>) mode (Peter Eisentraut)
+      Fix potential access off the end of memory in <application>psql</application>'s
+      expanded display (<command>\x</command>) mode (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several performance problems in <application>pg_dump</> when
+      Fix several performance problems in <application>pg_dump</application> when
       the database contains many objects (Jeff Janes, Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> could get very slow if the database contained
+      <application>pg_dump</application> could get very slow if the database contained
       many schemas, or if many objects are in dependency loops, or if there
       are many owned sequences.
      </para>
@@ -7369,14 +7369,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix memory and file descriptor leaks in <application>pg_restore</>
+      Fix memory and file descriptor leaks in <application>pg_restore</application>
       when reading a directory-format archive (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for the case that a database stored in a
+      Fix <application>pg_upgrade</application> for the case that a database stored in a
       non-default tablespace contains a table in the cluster's default
       tablespace (Bruce Momjian)
      </para>
@@ -7384,41 +7384,41 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      In <application>ecpg</>, fix rare memory leaks and possible overwrite
-      of one byte after the <structname>sqlca_t</> structure (Peter Eisentraut)
+      In <application>ecpg</application>, fix rare memory leaks and possible overwrite
+      of one byte after the <structname>sqlca_t</structname> structure (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</>'s <function>dblink_exec()</> to not leak
+      Fix <filename>contrib/dblink</filename>'s <function>dblink_exec()</function> to not leak
       temporary database connections upon error (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to report the correct connection name in
+      Fix <filename>contrib/dblink</filename> to report the correct connection name in
       error messages (Kyotaro Horiguchi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/vacuumlo</> to use multiple transactions when
+      Fix <filename>contrib/vacuumlo</filename> to use multiple transactions when
       dropping many large objects (Tim Lewis, Robert Haas, Tom Lane)
      </para>
 
      <para>
-      This change avoids exceeding <varname>max_locks_per_transaction</> when
+      This change avoids exceeding <varname>max_locks_per_transaction</varname> when
       many objects need to be dropped.  The behavior can be adjusted with the
-      new <literal>-l</> (limit) option.
+      new <literal>-l</literal> (limit) option.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012c
+      Update time zone data files to <application>tzdata</application> release 2012c
       for DST law changes in Antarctica, Armenia, Chile, Cuba, Falkland
       Islands, Gaza, Haiti, Hebron, Morocco, Syria, and Tokelau Islands;
       also historical corrections for Canada.
@@ -7441,7 +7441,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.2.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -7453,7 +7453,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.1.2,
-    see <xref linkend="release-9-1-2">.
+    see <xref linkend="release-9-1-2"/>.
    </para>
 
   </sect2>
@@ -7466,14 +7466,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Require execute permission on the trigger function for
-      <command>CREATE TRIGGER</> (Robert Haas)
+      <command>CREATE TRIGGER</command> (Robert Haas)
      </para>
 
      <para>
       This missing check could allow another user to execute a trigger
       function with forged input data, by installing it on a table he owns.
       This is only of significance for trigger functions marked
-      <literal>SECURITY DEFINER</>, since otherwise trigger functions run
+      <literal>SECURITY DEFINER</literal>, since otherwise trigger functions run
       as the table owner anyway.  (CVE-2012-0866)
      </para>
     </listitem>
@@ -7485,7 +7485,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Both <application>libpq</> and the server truncated the common name
+      Both <application>libpq</application> and the server truncated the common name
       extracted from an SSL certificate at 32 bytes.  Normally this would
       cause nothing worse than an unexpected verification failure, but there
       are some rather-implausible scenarios in which it might allow one
@@ -7500,12 +7500,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Convert newlines to spaces in names written in <application>pg_dump</>
+      Convert newlines to spaces in names written in <application>pg_dump</application>
       comments (Robert Haas)
      </para>
 
      <para>
-      <application>pg_dump</> was incautious about sanitizing object names
+      <application>pg_dump</application> was incautious about sanitizing object names
       that are emitted within SQL comments in its output script.  A name
       containing a newline would at least render the script syntactically
       incorrect.  Maliciously crafted object names could present a SQL
@@ -7521,10 +7521,10 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       An index page split caused by an insertion could sometimes cause a
-      concurrently-running <command>VACUUM</> to miss removing index entries
+      concurrently-running <command>VACUUM</command> to miss removing index entries
       that it should remove.  After the corresponding table rows are removed,
       the dangling index entries would cause errors (such as <quote>could not
-      read block N in file ...</>) or worse, silently wrong query results
+      read block N in file ...</quote>) or worse, silently wrong query results
       after unrelated rows are re-inserted at the now-free table locations.
       This bug has been present since release 8.2, but occurs so infrequently
       that it was not diagnosed until now.  If you have reason to suspect
@@ -7543,22 +7543,22 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       that the contents were transiently invalid.  In hot standby mode this
       can result in a query that's executing in parallel seeing garbage data.
       Various symptoms could result from that, but the most common one seems
-      to be <quote>invalid memory alloc request size</>.
+      to be <quote>invalid memory alloc request size</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of data-modifying <literal>WITH</> subplans in
-      <literal>READ COMMITTED</> rechecking (Tom Lane)
+      Fix handling of data-modifying <literal>WITH</literal> subplans in
+      <literal>READ COMMITTED</literal> rechecking (Tom Lane)
      </para>
 
      <para>
-      A <literal>WITH</> clause containing
-      <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> would crash
-      if the parent <command>UPDATE</> or <command>DELETE</> command needed
+      A <literal>WITH</literal> clause containing
+      <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> would crash
+      if the parent <command>UPDATE</command> or <command>DELETE</command> command needed
       to be re-evaluated at one or more rows due to concurrent updates
-      in <literal>READ COMMITTED</> mode.
+      in <literal>READ COMMITTED</literal> mode.
      </para>
     </listitem>
 
@@ -7589,13 +7589,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <command>CLUSTER</>/<command>VACUUM FULL</> handling of toast
+      Fix <command>CLUSTER</command>/<command>VACUUM FULL</command> handling of toast
       values owned by recently-updated rows (Tom Lane)
      </para>
 
      <para>
       This oversight could lead to <quote>duplicate key value violates unique
-      constraint</> errors being reported against the toast table's index
+      constraint</quote> errors being reported against the toast table's index
       during one of these commands.
      </para>
     </listitem>
@@ -7617,11 +7617,11 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Support foreign data wrappers and foreign servers in
-      <command>REASSIGN OWNED</> (Alvaro Herrera)
+      <command>REASSIGN OWNED</command> (Alvaro Herrera)
      </para>
 
      <para>
-      This command failed with <quote>unexpected classid</> errors if
+      This command failed with <quote>unexpected classid</quote> errors if
       it needed to change the ownership of any such objects.
      </para>
     </listitem>
@@ -7629,24 +7629,24 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Allow non-existent values for some settings in <command>ALTER
-      USER/DATABASE SET</> (Heikki Linnakangas)
+      USER/DATABASE SET</command> (Heikki Linnakangas)
      </para>
 
      <para>
-      Allow <varname>default_text_search_config</>,
-      <varname>default_tablespace</>, and <varname>temp_tablespaces</> to be
+      Allow <varname>default_text_search_config</varname>,
+      <varname>default_tablespace</varname>, and <varname>temp_tablespaces</varname> to be
       set to names that are not known.  This is because they might be known
       in another database where the setting is intended to be used, or for the
       tablespace cases because the tablespace might not be created yet.  The
-      same issue was previously recognized for <varname>search_path</>, and
+      same issue was previously recognized for <varname>search_path</varname>, and
       these settings now act like that one.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>unsupported node type</> error caused by <literal>COLLATE</>
-      in an <command>INSERT</> expression (Tom Lane)
+      Fix <quote>unsupported node type</quote> error caused by <literal>COLLATE</literal>
+      in an <command>INSERT</command> expression (Tom Lane)
      </para>
     </listitem>
 
@@ -7669,7 +7669,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Recover from errors occurring during WAL replay of <command>DROP
-      TABLESPACE</> (Tom Lane)
+      TABLESPACE</command> (Tom Lane)
      </para>
 
      <para>
@@ -7691,7 +7691,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Sometimes a lock would be logged as being held by <quote>transaction
-      zero</>.  This is at least known to produce assertion failures on
+      zero</quote>.  This is at least known to produce assertion failures on
       slave servers, and might be the cause of more serious problems.
      </para>
     </listitem>
@@ -7713,7 +7713,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Prevent emitting misleading <quote>consistent recovery state reached</>
+      Prevent emitting misleading <quote>consistent recovery state reached</quote>
       log message at the beginning of crash recovery (Heikki Linnakangas)
      </para>
     </listitem>
@@ -7721,7 +7721,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix initial value of
-      <structname>pg_stat_replication</>.<structfield>replay_location</>
+      <structname>pg_stat_replication</structname>.<structfield>replay_location</structfield>
       (Fujii Masao)
      </para>
 
@@ -7733,7 +7733,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix regular expression back-references with <literal>*</> attached
+      Fix regular expression back-references with <literal>*</literal> attached
       (Tom Lane)
      </para>
 
@@ -7747,18 +7747,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       A similar problem still afflicts back-references that are embedded in a
       larger quantified expression, rather than being the immediate subject
       of the quantifier.  This will be addressed in a future
-      <productname>PostgreSQL</> release.
+      <productname>PostgreSQL</productname> release.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix recently-introduced memory leak in processing of
-      <type>inet</>/<type>cidr</> values (Heikki Linnakangas)
+      <type>inet</type>/<type>cidr</type> values (Heikki Linnakangas)
      </para>
 
      <para>
-      A patch in the December 2011 releases of <productname>PostgreSQL</>
+      A patch in the December 2011 releases of <productname>PostgreSQL</productname>
       caused memory leakage in these operations, which could be significant
       in scenarios such as building a btree index on such a column.
      </para>
@@ -7767,7 +7767,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Fix planner's ability to push down index-expression restrictions
-      through <literal>UNION ALL</> (Tom Lane)
+      through <literal>UNION ALL</literal> (Tom Lane)
      </para>
 
      <para>
@@ -7778,19 +7778,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix planning of <literal>WITH</> clauses referenced in
-      <command>UPDATE</>/<command>DELETE</> on an inherited table
+      Fix planning of <literal>WITH</literal> clauses referenced in
+      <command>UPDATE</command>/<command>DELETE</command> on an inherited table
       (Tom Lane)
      </para>
 
      <para>
-      This bug led to <quote>could not find plan for CTE</> failures.
+      This bug led to <quote>could not find plan for CTE</quote> failures.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix GIN cost estimation to handle <literal>column IN (...)</>
+      Fix GIN cost estimation to handle <literal>column IN (...)</literal>
       index conditions (Marti Raudsepp)
      </para>
 
@@ -7813,8 +7813,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix dangling pointer after <command>CREATE TABLE AS</>/<command>SELECT
-      INTO</> in a SQL-language function (Tom Lane)
+      Fix dangling pointer after <command>CREATE TABLE AS</command>/<command>SELECT
+      INTO</command> in a SQL-language function (Tom Lane)
      </para>
 
      <para>
@@ -7853,14 +7853,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This function crashes when handed a typeglob or certain read-only
-      objects such as <literal>$^V</>.  Make plperl avoid passing those to
+      objects such as <literal>$^V</literal>.  Make plperl avoid passing those to
       it.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, don't dump contents of an extension's
+      In <application>pg_dump</application>, don't dump contents of an extension's
       configuration tables if the extension itself is not being dumped
       (Tom Lane)
      </para>
@@ -7868,32 +7868,32 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>'s handling of inherited table columns
+      Improve <application>pg_dump</application>'s handling of inherited table columns
       (Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> mishandled situations where a child column has
+      <application>pg_dump</application> mishandled situations where a child column has
       a different default expression than its parent column.  If the default
       is textually identical to the parent's default, but not actually the
       same (for instance, because of schema search path differences) it would
       not be recognized as different, so that after dump and restore the
       child would be allowed to inherit the parent's default.  Child columns
-      that are <literal>NOT NULL</> where their parent is not could also be
+      that are <literal>NOT NULL</literal> where their parent is not could also be
       restored subtly incorrectly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s direct-to-database mode for
+      Fix <application>pg_restore</application>'s direct-to-database mode for
       INSERT-style table data (Tom Lane)
      </para>
 
      <para>
       Direct-to-database restores from archive files made with
-      <option>--inserts</> or <option>--column-inserts</> options fail when
-      using <application>pg_restore</> from a release dated September or
+      <option>--inserts</option> or <option>--column-inserts</option> options fail when
+      using <application>pg_restore</application> from a release dated September or
       December 2011, as a result of an oversight in a fix for another
       problem.  The archive file itself is not at fault, and text-mode
       output is okay.
@@ -7902,8 +7902,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Teach <application>pg_upgrade</> to handle renaming of
-      <application>plpython</>'s shared library (Bruce Momjian)
+      Teach <application>pg_upgrade</application> to handle renaming of
+      <application>plpython</application>'s shared library (Bruce Momjian)
      </para>
 
      <para>
@@ -7914,20 +7914,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Allow <application>pg_upgrade</> to process tables containing
-      <type>regclass</> columns (Bruce Momjian)
+      Allow <application>pg_upgrade</application> to process tables containing
+      <type>regclass</type> columns (Bruce Momjian)
      </para>
 
      <para>
-      Since <application>pg_upgrade</> now takes care to preserve
-      <structname>pg_class</> OIDs, there was no longer any reason for this
+      Since <application>pg_upgrade</application> now takes care to preserve
+      <structname>pg_class</structname> OIDs, there was no longer any reason for this
       restriction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>libpq</> ignore <literal>ENOTDIR</> errors
+      Make <application>libpq</application> ignore <literal>ENOTDIR</literal> errors
       when looking for an SSL client certificate file
       (Magnus Hagander)
      </para>
@@ -7935,21 +7935,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       This allows SSL connections to be established, though without a
       certificate, even when the user's home directory is set to something
-      like <literal>/dev/null</>.
+      like <literal>/dev/null</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some more field alignment issues in <application>ecpg</>'s SQLDA area
+      Fix some more field alignment issues in <application>ecpg</application>'s SQLDA area
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <literal>AT</> option in <application>ecpg</>
-      <literal>DEALLOCATE</> statements (Michael Meskes)
+      Allow <literal>AT</literal> option in <application>ecpg</application>
+      <literal>DEALLOCATE</literal> statements (Michael Meskes)
      </para>
 
      <para>
@@ -7967,7 +7967,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/auto_explain</>'s JSON output mode to produce
+      Fix <filename>contrib/auto_explain</filename>'s JSON output mode to produce
       valid JSON (Andrew Dunstan)
      </para>
 
@@ -7979,8 +7979,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix error in <filename>contrib/intarray</>'s <literal>int[] &amp;
-      int[]</> operator (Guillaume Lelarge)
+      Fix error in <filename>contrib/intarray</filename>'s <literal>int[] &amp;
+      int[]</literal> operator (Guillaume Lelarge)
      </para>
 
      <para>
@@ -7992,8 +7992,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix error detection in <filename>contrib/pgcrypto</>'s
-      <function>encrypt_iv()</> and <function>decrypt_iv()</>
+      Fix error detection in <filename>contrib/pgcrypto</filename>'s
+      <function>encrypt_iv()</function> and <function>decrypt_iv()</function>
       (Marko Kreen)
      </para>
 
@@ -8005,26 +8005,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <filename>contrib/test_parser</>
+      Fix one-byte buffer overrun in <filename>contrib/test_parser</filename>
       (Paul Guyot)
      </para>
 
      <para>
       The code would try to read one more byte than it should, which would
       crash in corner cases.
-      Since <filename>contrib/test_parser</> is only example code, this is
+      Since <filename>contrib/test_parser</filename> is only example code, this is
       not a security issue in itself, but bad example code is still bad.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <function>__sync_lock_test_and_set()</> for spinlocks on ARM, if
+      Use <function>__sync_lock_test_and_set()</function> for spinlocks on ARM, if
       available (Martin Pitt)
      </para>
 
      <para>
-      This function replaces our previous use of the <literal>SWPB</>
+      This function replaces our previous use of the <literal>SWPB</literal>
       instruction, which is deprecated and not available on ARMv6 and later.
       Reports suggest that the old code doesn't fail in an obvious way on
       recent ARM boards, but simply doesn't interlock concurrent accesses,
@@ -8034,7 +8034,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Use <option>-fexcess-precision=standard</> option when building with
+      Use <option>-fexcess-precision=standard</option> option when building with
       gcc versions that accept it (Andrew Dunstan)
      </para>
 
@@ -8078,7 +8078,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a variety of fixes from 9.1.1.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -8090,19 +8090,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
    <para>
     However, a longstanding error was discovered in the definition of the
-    <literal>information_schema.referential_constraints</> view.  If you
+    <literal>information_schema.referential_constraints</literal> view.  If you
     rely on correct results from that view, you should replace its
     definition as explained in the first changelog item below.
    </para>
 
    <para>
-    Also, if you use the <type>citext</> data type, and you upgraded
-    from a previous major release by running <application>pg_upgrade</>,
-    you should run <literal>CREATE EXTENSION citext FROM unpackaged</>
-    to avoid collation-related failures in <type>citext</> operations.
+    Also, if you use the <type>citext</type> data type, and you upgraded
+    from a previous major release by running <application>pg_upgrade</application>,
+    you should run <literal>CREATE EXTENSION citext FROM unpackaged</literal>
+    to avoid collation-related failures in <type>citext</type> operations.
     The same is necessary if you restore a dump from a pre-9.1 database
-    that contains an instance of the <type>citext</> data type.
-    If you've already run the <command>CREATE EXTENSION</> command before
+    that contains an instance of the <type>citext</type> data type.
+    If you've already run the <command>CREATE EXTENSION</command> command before
     upgrading to 9.1.2, you will instead need to do manual catalog updates
     as explained in the second changelog item.
    </para>
@@ -8116,7 +8116,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix bugs in <literal>information_schema.referential_constraints</> view
+      Fix bugs in <literal>information_schema.referential_constraints</literal> view
       (Tom Lane)
      </para>
 
@@ -8129,50 +8129,50 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Since the view definition is installed by <application>initdb</>,
+      Since the view definition is installed by <application>initdb</application>,
       merely upgrading will not fix the problem.  If you need to fix this
       in an existing installation, you can (as a superuser) drop the
-      <literal>information_schema</> schema then re-create it by sourcing
-      <filename><replaceable>SHAREDIR</>/information_schema.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)  This must be repeated in each database
+      <literal>information_schema</literal> schema then re-create it by sourcing
+      <filename><replaceable>SHAREDIR</replaceable>/information_schema.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)  This must be repeated in each database
       to be fixed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/citext</>'s upgrade script fix collations of
-      <type>citext</> columns and indexes (Tom Lane)
+      Make <filename>contrib/citext</filename>'s upgrade script fix collations of
+      <type>citext</type> columns and indexes (Tom Lane)
      </para>
 
      <para>
-      Existing <type>citext</> columns and indexes aren't correctly marked as
-      being of a collatable data type during <application>pg_upgrade</> from
-      a pre-9.1 server, or when a pre-9.1 dump containing the <type>citext</>
+      Existing <type>citext</type> columns and indexes aren't correctly marked as
+      being of a collatable data type during <application>pg_upgrade</application> from
+      a pre-9.1 server, or when a pre-9.1 dump containing the <type>citext</type>
       type is loaded into a 9.1 server.
       That leads to operations on these columns failing with errors
       such as <quote>could not determine which collation to use for string
-      comparison</>.  This change allows them to be fixed by the same
-      script that upgrades the <type>citext</> module into a proper 9.1
-      extension during <literal>CREATE EXTENSION citext FROM unpackaged</>.
+      comparison</quote>.  This change allows them to be fixed by the same
+      script that upgrades the <type>citext</type> module into a proper 9.1
+      extension during <literal>CREATE EXTENSION citext FROM unpackaged</literal>.
      </para>
 
      <para>
       If you have a previously-upgraded database that is suffering from this
-      problem, and you already ran the <command>CREATE EXTENSION</> command,
-      you can manually run (as superuser) the <command>UPDATE</> commands
+      problem, and you already ran the <command>CREATE EXTENSION</command> command,
+      you can manually run (as superuser) the <command>UPDATE</command> commands
       found at the end of
-      <filename><replaceable>SHAREDIR</>/extension/citext--unpackaged--1.0.sql</filename>.
-      (Run <literal>pg_config --sharedir</> if you're uncertain where
-      <replaceable>SHAREDIR</> is.)
+      <filename><replaceable>SHAREDIR</replaceable>/extension/citext--unpackaged--1.0.sql</filename>.
+      (Run <literal>pg_config --sharedir</literal> if you're uncertain where
+      <replaceable>SHAREDIR</replaceable> is.)
       There is no harm in doing this again if unsure.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash during <command>UPDATE</> or <command>DELETE</> that
+      Fix possible crash during <command>UPDATE</command> or <command>DELETE</command> that
       joins to the output of a scalar-returning function (Tom Lane)
      </para>
 
@@ -8191,19 +8191,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <para>
       This could result in transiently failing to find index entries after
       a crash, or on a hot-standby server.  The problem would be repaired
-      by the next <command>VACUUM</> of the index, however.
+      by the next <command>VACUUM</command> of the index, however.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix TOAST-related data corruption during <literal>CREATE TABLE dest AS
-      SELECT * FROM src</> or <literal>INSERT INTO dest SELECT * FROM src</>
+      SELECT * FROM src</literal> or <literal>INSERT INTO dest SELECT * FROM src</literal>
       (Tom Lane)
      </para>
 
      <para>
-      If a table has been modified by <command>ALTER TABLE ADD COLUMN</>,
+      If a table has been modified by <command>ALTER TABLE ADD COLUMN</command>,
       attempts to copy its data verbatim to another table could produce
       corrupt results in certain corner cases.
       The problem can only manifest in this precise form in 8.4 and later,
@@ -8233,7 +8233,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       The typical symptom was transient errors like <quote>missing chunk
-      number 0 for toast value NNNNN in pg_toast_2619</>, where the cited
+      number 0 for toast value NNNNN in pg_toast_2619</quote>, where the cited
       toast table would always belong to a system catalog.
      </para>
     </listitem>
@@ -8249,7 +8249,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       or modified the function, leading to misbehavior when the function was
       used.  Note that merely installing this update will not fix the missing
       dependency entries; to do that, you'd need to <command>CREATE OR
-      REPLACE</> each such function afterwards.  If you have functions whose
+      REPLACE</command> each such function afterwards.  If you have functions whose
       defaults depend on non-built-in objects, doing so is recommended.
      </para>
     </listitem>
@@ -8262,7 +8262,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       This bug is known to lead to <quote>variable not found in subplan target
-      list</> planner errors, and could possibly result in wrong query output
+      list</quote> planner errors, and could possibly result in wrong query output
       when outer joins are involved.
      </para>
     </listitem>
@@ -8275,13 +8275,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Previously these could fail with <quote>could not find pathkey item to
-      sort</> planner errors.
+      sort</quote> planner errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>MergeAppend child's targetlist doesn't match MergeAppend</>
+      Fix <quote>MergeAppend child's targetlist doesn't match MergeAppend</quote>
       planner errors (Tom Lane)
      </para>
     </listitem>
@@ -8296,7 +8296,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       In 9.1.0, an indexable operator that has a non-collatable left-hand
       input type and a collatable right-hand input type would not be
       recognized as matching the left-hand column's index.  An example is
-      the <type>hstore</> <literal>?</> <type>text</> operator.
+      the <type>hstore</type> <literal>?</literal> <type>text</type> operator.
      </para>
     </listitem>
 
@@ -8321,29 +8321,29 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <function>DatumGetInetP()</> unpack inet datums that have a 1-byte
-      header, and add a new macro, <function>DatumGetInetPP()</>, that does
+      Make <function>DatumGetInetP()</function> unpack inet datums that have a 1-byte
+      header, and add a new macro, <function>DatumGetInetPP()</function>, that does
       not (Heikki Linnakangas)
      </para>
 
      <para>
       This change affects no core code, but might prevent crashes in add-on
-      code that expects <function>DatumGetInetP()</> to produce an unpacked
+      code that expects <function>DatumGetInetP()</function> to produce an unpacked
       datum as per usual convention.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve locale support in <type>money</> type's input and output
+      Improve locale support in <type>money</type> type's input and output
       (Tom Lane)
      </para>
 
      <para>
       Aside from not supporting all standard
-      <link linkend="guc-lc-monetary"><varname>lc_monetary</></link>
+      <link linkend="guc-lc-monetary"><varname>lc_monetary</varname></link>
       formatting options, the input and output functions were inconsistent,
-      meaning there were locales in which dumped <type>money</> values could
+      meaning there were locales in which dumped <type>money</type> values could
       not be re-read.
      </para>
     </listitem>
@@ -8351,15 +8351,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Don't let <link
-      linkend="guc-transform-null-equals"><varname>transform_null_equals</></link>
-      affect <literal>CASE foo WHEN NULL ...</> constructs
+      linkend="guc-transform-null-equals"><varname>transform_null_equals</varname></link>
+      affect <literal>CASE foo WHEN NULL ...</literal> constructs
       (Heikki Linnakangas)
      </para>
 
      <para>
-      <varname>transform_null_equals</> is only supposed to affect
-      <literal>foo = NULL</> expressions written directly by the user, not
-      equality checks generated internally by this form of <literal>CASE</>.
+      <varname>transform_null_equals</varname> is only supposed to affect
+      <literal>foo = NULL</literal> expressions written directly by the user, not
+      equality checks generated internally by this form of <literal>CASE</literal>.
      </para>
     </listitem>
 
@@ -8371,14 +8371,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       For a cascading foreign key that references its own table, a row update
-      will fire both the <literal>ON UPDATE</> trigger and the
-      <literal>CHECK</> trigger as one event.  The <literal>ON UPDATE</>
-      trigger must execute first, else the <literal>CHECK</> will check a
+      will fire both the <literal>ON UPDATE</literal> trigger and the
+      <literal>CHECK</literal> trigger as one event.  The <literal>ON UPDATE</literal>
+      trigger must execute first, else the <literal>CHECK</literal> will check a
       non-final state of the row and possibly throw an inappropriate error.
       However, the firing order of these triggers is determined by their
       names, which generally sort in creation order since the triggers have
       auto-generated names following the convention
-      <quote>RI_ConstraintTrigger_NNNN</>.  A proper fix would require
+      <quote>RI_ConstraintTrigger_NNNN</quote>.  A proper fix would require
       modifying that convention, which we will do in 9.2, but it seems risky
       to change it in existing releases.  So this patch just changes the
       creation order of the triggers.  Users encountering this type of error
@@ -8389,8 +8389,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix <literal>IF EXISTS</> to work correctly in <command>DROP OPERATOR
-      FAMILY</> (Robert Haas)
+      Fix <literal>IF EXISTS</literal> to work correctly in <command>DROP OPERATOR
+      FAMILY</command> (Robert Haas)
      </para>
     </listitem>
 
@@ -8413,15 +8413,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Relation rowtypes and automatically-generated array types do not need to
-      have their own extension membership entries in <structname>pg_depend</>,
+      have their own extension membership entries in <structname>pg_depend</structname>,
       and creating such entries complicates matters for extension upgrades.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Cope with invalid pre-existing <varname>search_path</> settings during
-      <command>CREATE EXTENSION</> (Tom Lane)
+      Cope with invalid pre-existing <varname>search_path</varname> settings during
+      <command>CREATE EXTENSION</command> (Tom Lane)
      </para>
     </listitem>
 
@@ -8453,14 +8453,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Ensure walsender processes respond promptly to <systemitem>SIGTERM</>
+      Ensure walsender processes respond promptly to <systemitem>SIGTERM</systemitem>
       (Magnus Hagander)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Exclude <filename>postmaster.opts</> from base backups
+      Exclude <filename>postmaster.opts</filename> from base backups
       (Magnus Hagander)
      </para>
     </listitem>
@@ -8473,20 +8473,20 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Formerly, these would not be displayed correctly in the
-      <structname>pg_settings</> view.
+      <structname>pg_settings</structname> view.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect field alignment in <application>ecpg</>'s SQLDA area
+      Fix incorrect field alignment in <application>ecpg</application>'s SQLDA area
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Preserve blank lines within commands in <application>psql</>'s command
+      Preserve blank lines within commands in <application>psql</application>'s command
       history (Robert Haas)
      </para>
 
@@ -8498,41 +8498,41 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Avoid platform-specific infinite loop in <application>pg_dump</>
+      Avoid platform-specific infinite loop in <application>pg_dump</application>
       (Steve Singer)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix compression of plain-text output format in <application>pg_dump</>
+      Fix compression of plain-text output format in <application>pg_dump</application>
       (Adrian Klaver and Tom Lane)
      </para>
 
      <para>
-      <application>pg_dump</> has historically understood <literal>-Z</> with
-      no <literal>-F</> switch to mean that it should emit a gzip-compressed
+      <application>pg_dump</application> has historically understood <literal>-Z</literal> with
+      no <literal>-F</literal> switch to mean that it should emit a gzip-compressed
       version of its plain text output.  Restore that behavior.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts between
+      Fix <application>pg_dump</application> to dump user-defined casts between
       auto-generated types, such as table rowtypes (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix missed quoting of foreign server names in <application>pg_dump</>
+      Fix missed quoting of foreign server names in <application>pg_dump</application>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Assorted fixes for <application>pg_upgrade</> (Bruce Momjian)
+      Assorted fixes for <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
@@ -8556,15 +8556,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <para>
       Restore the pre-9.1 behavior that PL/Perl functions returning
-      <type>void</> ignore the result value of their last Perl statement;
+      <type>void</type> ignore the result value of their last Perl statement;
       9.1.0 would throw an error if that statement returned a reference.
       Also, make sure it works to return a string value for a composite type,
       so long as the string meets the type's input format.
       In addition, throw errors for attempts to return Perl arrays or hashes
       when the function's declared result type is not an array or composite
       type, respectively.  (Pre-9.1 versions rather uselessly returned
-      strings like <literal>ARRAY(0x221a9a0)</> or
-      <literal>HASH(0x221aa90)</> in such cases.)
+      strings like <literal>ARRAY(0x221a9a0)</literal> or
+      <literal>HASH(0x221aa90)</literal> in such cases.)
      </para>
     </listitem>
 
@@ -8577,7 +8577,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Use the preferred version of <application>xsubpp</> to build PL/Perl,
+      Use the preferred version of <application>xsubpp</application> to build PL/Perl,
       not necessarily the operating system's main copy
       (David Wheeler and Alex Hunsaker)
      </para>
@@ -8599,14 +8599,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Change all the <filename>contrib</> extension script files to report
-      a useful error message if they are fed to <application>psql</>
+      Change all the <filename>contrib</filename> extension script files to report
+      a useful error message if they are fed to <application>psql</application>
       (Andrew Dunstan and Tom Lane)
      </para>
 
      <para>
       This should help teach people about the new method of using
-      <command>CREATE EXTENSION</> to load these files.  In most cases,
+      <command>CREATE EXTENSION</command> to load these files.  In most cases,
       sourcing the scripts directly would fail anyway, but with
       harder-to-interpret messages.
      </para>
@@ -8614,19 +8614,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix incorrect coding in <filename>contrib/dict_int</> and
-      <filename>contrib/dict_xsyn</> (Tom Lane)
+      Fix incorrect coding in <filename>contrib/dict_int</filename> and
+      <filename>contrib/dict_xsyn</filename> (Tom Lane)
      </para>
 
      <para>
       Some functions incorrectly assumed that memory returned by
-      <function>palloc()</> is guaranteed zeroed.
+      <function>palloc()</function> is guaranteed zeroed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove <filename>contrib/sepgsql</> tests from the regular regression
+      Remove <filename>contrib/sepgsql</filename> tests from the regular regression
       test mechanism (Tom Lane)
      </para>
 
@@ -8639,14 +8639,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix assorted errors in <filename>contrib/unaccent</>'s configuration
+      Fix assorted errors in <filename>contrib/unaccent</filename>'s configuration
       file parsing (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Honor query cancel interrupts promptly in <function>pgstatindex()</>
+      Honor query cancel interrupts promptly in <function>pgstatindex()</function>
       (Robert Haas)
      </para>
     </listitem>
@@ -8660,7 +8660,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Revert unintentional enabling of <literal>WAL_DEBUG</> (Robert Haas)
+      Revert unintentional enabling of <literal>WAL_DEBUG</literal> (Robert Haas)
      </para>
 
      <para>
@@ -8695,15 +8695,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </para>
 
      <para>
-      Map <quote>Central America Standard Time</> to <literal>CST6</>, not
-      <literal>CST6CDT</>, because DST is generally not observed anywhere in
+      Map <quote>Central America Standard Time</quote> to <literal>CST6</literal>, not
+      <literal>CST6CDT</literal>, because DST is generally not observed anywhere in
       Central America.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2011n
+      Update time zone data files to <application>tzdata</application> release 2011n
       for DST law changes in Brazil, Cuba, Fiji, Palestine, Russia, and Samoa;
       also historical corrections for Alaska and British East Africa.
      </para>
@@ -8725,7 +8725,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
   <para>
    This release contains a small number of fixes from 9.1.0.
    For information about new features in the 9.1 major release, see
-   <xref linkend="release-9-1">.
+   <xref linkend="release-9-1"/>.
   </para>
 
   <sect2>
@@ -8744,7 +8744,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Make <function>pg_options_to_table</> return NULL for an option with no
+      Make <function>pg_options_to_table</function> return NULL for an option with no
       value (Tom Lane)
      </para>
 
@@ -8768,8 +8768,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Fix explicit reference to <literal>pg_temp</> schema in <command>CREATE
-      TEMPORARY TABLE</> (Robert Haas)
+      Fix explicit reference to <literal>pg_temp</literal> schema in <command>CREATE
+      TEMPORARY TABLE</command> (Robert Haas)
      </para>
 
      <para>
@@ -8794,9 +8794,9 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
    <title>Overview</title>
 
    <para>
-    This release shows <productname>PostgreSQL</> moving beyond the
+    This release shows <productname>PostgreSQL</productname> moving beyond the
     traditional relational-database feature set with new, ground-breaking
-    functionality that is unique to <productname>PostgreSQL</>.
+    functionality that is unique to <productname>PostgreSQL</productname>.
     The streaming replication feature introduced in release 9.0 is
     significantly enhanced by adding a synchronous-replication option,
     streaming backups, and monitoring improvements.
@@ -8816,7 +8816,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Add support for <link linkend="SQL-CREATEFOREIGNTABLE">foreign
+      Add support for <link linkend="sql-createforeigntable">foreign
       tables</link>
      </para>
     </listitem>
@@ -8831,7 +8831,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     <listitem>
      <para>
       Add <link linkend="extend-extensions">extensions</link> which
-      simplify packaging of additions to <productname>PostgreSQL</>
+      simplify packaging of additions to <productname>PostgreSQL</productname>
      </para>
     </listitem>
 
@@ -8844,32 +8844,32 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
     <listitem>
      <para>
-      Support unlogged tables using the <literal>UNLOGGED</>
-      option in <link linkend="SQL-CREATETABLE"><command>CREATE
-      TABLE</></link>
+      Support unlogged tables using the <literal>UNLOGGED</literal>
+      option in <link linkend="sql-createtable"><command>CREATE
+      TABLE</command></link>
      </para>
     </listitem>
 
     <listitem>
      <para>
       Allow data-modification commands
-      (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>) in
-      <link linkend="queries-with"><literal>WITH</></link> clauses
+      (<command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>) in
+      <link linkend="queries-with"><literal>WITH</literal></link> clauses
      </para>
     </listitem>
 
     <listitem>
      <para>
       Add nearest-neighbor (order-by-operator) searching to <link
-      linkend="GiST"><acronym>GiST</> indexes</link>
+      linkend="gist"><acronym>GiST</acronym> indexes</link>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add a <link linkend="SQL-SECURITY-LABEL"><command>SECURITY
-      LABEL</></link> command and support for
-      <link linkend="sepgsql"><acronym>SELinux</> permissions control</link>
+      Add a <link linkend="sql-security-label"><command>SECURITY
+      LABEL</command></link> command and support for
+      <link linkend="sepgsql"><acronym>SELinux</acronym> permissions control</link>
      </para>
     </listitem>
 
@@ -8912,7 +8912,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Change the default value of <link
-       linkend="guc-standard-conforming-strings"><varname>standard_conforming_strings</></link>
+       linkend="guc-standard-conforming-strings"><varname>standard_conforming_strings</varname></link>
        to on (Robert Haas)
       </para>
 
@@ -8920,8 +8920,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
        By default, backslashes are now ordinary characters in string literals,
        not escape characters.  This change removes a long-standing
        incompatibility with the SQL standard.  <link
-       linkend="guc-escape-string-warning"><varname>escape_string_warning</></link>
-       has produced warnings about this usage for years.  <literal>E''</>
+       linkend="guc-escape-string-warning"><varname>escape_string_warning</varname></link>
+       has produced warnings about this usage for years.  <literal>E''</literal>
        strings are the proper way to embed backslash escapes in strings and are
        unaffected by this change.
       </para>
@@ -8955,12 +8955,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <para>
        For example, disallow
-       <literal><replaceable>composite_value</>.text</literal> and
-       <literal>text(<replaceable>composite_value</>)</literal>.
+       <literal><replaceable>composite_value</replaceable>.text</literal> and
+       <literal>text(<replaceable>composite_value</replaceable>)</literal>.
        Unintentional uses of this syntax have frequently resulted in bug
        reports; although it was not a bug, it seems better to go back to
        rejecting such expressions.
-       The <literal>CAST</> and <literal>::</> syntaxes are still available
+       The <literal>CAST</literal> and <literal>::</literal> syntaxes are still available
        for use when a cast of an entire composite value is actually intended.
       </para>
      </listitem>
@@ -8972,10 +8972,10 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <para>
        When a domain is based on an array type, it is allowed to <quote>look
-       through</> the domain type to access the array elements, including
+       through</quote> the domain type to access the array elements, including
        subscripting the domain value to fetch or assign an element.
        Assignment to an element of such a domain value, for instance via
-       <literal>UPDATE ... SET domaincol[5] = ...</>, will now result in
+       <literal>UPDATE ... SET domaincol[5] = ...</literal>, will now result in
        rechecking the domain type's constraints, whereas before the checks
        were skipped.
       </para>
@@ -8993,7 +8993,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Change <link
-       linkend="array-functions-table"><function>string_to_array()</></link>
+       linkend="array-functions-table"><function>string_to_array()</function></link>
        to return an empty array for a zero-length string (Pavel
        Stehule)
       </para>
@@ -9006,8 +9006,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Change <link
-       linkend="array-functions-table"><function>string_to_array()</></link>
-       so a <literal>NULL</> separator splits the string into characters
+       linkend="array-functions-table"><function>string_to_array()</function></link>
+       so a <literal>NULL</literal> separator splits the string into characters
        (Pavel Stehule)
       </para>
 
@@ -9031,8 +9031,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       </para>
 
       <para>
-       Triggers can now be fired in three cases: <literal>BEFORE</>,
-       <literal>AFTER</>, or <literal>INSTEAD OF</> some action.
+       Triggers can now be fired in three cases: <literal>BEFORE</literal>,
+       <literal>AFTER</literal>, or <literal>INSTEAD OF</literal> some action.
        Trigger function authors should verify that their logic behaves
        sanely in all three cases.
       </para>
@@ -9040,7 +9040,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <listitem>
       <para>
-        Require superuser or <literal>CREATEROLE</> permissions in order to
+        Require superuser or <literal>CREATEROLE</literal> permissions in order to
         set comments on roles (Tom Lane)
       </para>
      </listitem>
@@ -9057,12 +9057,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Change <link
-       linkend="functions-recovery-info-table"><function>pg_last_xlog_receive_location()</></link>
+       linkend="functions-recovery-info-table"><function>pg_last_xlog_receive_location()</function></link>
        so it never moves backwards (Fujii Masao)
       </para>
 
       <para>
-       Previously, the value of <function>pg_last_xlog_receive_location()</>
+       Previously, the value of <function>pg_last_xlog_receive_location()</function>
        could move backward when streaming replication is restarted.
       </para>
      </listitem>
@@ -9070,7 +9070,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Have logging of replication connections honor <link
-       linkend="guc-log-connections"><varname>log_connections</></link>
+       linkend="guc-log-connections"><varname>log_connections</varname></link>
        (Magnus Hagander)
       </para>
 
@@ -9090,12 +9090,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <listitem>
       <para>
-       Change PL/pgSQL's <literal>RAISE</> command without parameters
+       Change PL/pgSQL's <literal>RAISE</literal> command without parameters
        to be catchable by the attached exception block (Piyush Newe)
       </para>
 
       <para>
-       Previously <literal>RAISE</> in a code block was always scoped to
+       Previously <literal>RAISE</literal> in a code block was always scoped to
        an attached exception block, so it was uncatchable at the same
        scope.
       </para>
@@ -9154,7 +9154,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        All contrib modules are now installed with <link
-       linkend="SQL-CREATEEXTENSION"><command>CREATE EXTENSION</></link>
+       linkend="sql-createextension"><command>CREATE EXTENSION</command></link>
        rather than by manually invoking their SQL scripts
        (Dimitri Fontaine, Tom Lane)
       </para>
@@ -9164,7 +9164,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
        module, use <literal>CREATE EXTENSION ... FROM unpackaged</literal>
        to wrap the existing contrib module's objects into an extension.  When
        updating from a pre-9.0 version, drop the contrib module's objects
-       using its old uninstall script, then use <literal>CREATE EXTENSION</>.
+       using its old uninstall script, then use <literal>CREATE EXTENSION</literal>.
       </para>
      </listitem>
 
@@ -9180,26 +9180,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Make <link
-       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset()</></link>
+       linkend="monitoring-stats-funcs-table"><function>pg_stat_reset()</function></link>
        reset all database-level statistics (Tomas Vondra)
       </para>
 
       <para>
-       Some <structname>pg_stat_database</> counters were not being reset.
+       Some <structname>pg_stat_database</structname> counters were not being reset.
       </para>
      </listitem>
 
      <listitem>
       <para>
         Fix some <link
-        linkend="infoschema-triggers"><structname>information_schema.triggers</></link>
+        linkend="infoschema-triggers"><structname>information_schema.triggers</structname></link>
         column names to match the new SQL-standard names (Dean Rasheed)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Treat <application>ECPG</> cursor names as case-insensitive
+       Treat <application>ECPG</application> cursor names as case-insensitive
        (Zoltan Boszormenyi)
       </para>
      </listitem>
@@ -9228,9 +9228,9 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Support unlogged tables using the <literal>UNLOGGED</>
-        option in <link linkend="SQL-CREATETABLE"><command>CREATE
-        TABLE</></link> (Robert Haas)
+        Support unlogged tables using the <literal>UNLOGGED</literal>
+        option in <link linkend="sql-createtable"><command>CREATE
+        TABLE</command></link> (Robert Haas)
        </para>
 
        <para>
@@ -9244,8 +9244,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Allow <literal>FULL OUTER JOIN</literal> to be implemented as a
-        hash join, and allow either side of a <literal>LEFT OUTER JOIN</>
-        or <literal>RIGHT OUTER JOIN</> to be hashed (Tom Lane)
+        hash join, and allow either side of a <literal>LEFT OUTER JOIN</literal>
+        or <literal>RIGHT OUTER JOIN</literal> to be hashed (Tom Lane)
        </para>
 
        <para>
@@ -9270,7 +9270,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Improve performance of <link
-        linkend="guc-commit-siblings"><varname>commit_siblings</></link>
+        linkend="guc-commit-siblings"><varname>commit_siblings</varname></link>
         (Greg Smith)
        </para>
 
@@ -9289,7 +9289,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Avoid leaving data files open after <quote>blind writes</>
+        Avoid leaving data files open after <quote>blind writes</quote>
         (Alvaro Herrera)
        </para>
 
@@ -9317,7 +9317,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
        <para>
         This allows better optimization of queries that use <literal>ORDER
-        BY</>, <literal>LIMIT</>, or <literal>MIN</>/<literal>MAX</> with
+        BY</literal>, <literal>LIMIT</literal>, or <literal>MIN</literal>/<literal>MAX</literal> with
         inherited tables.
        </para>
       </listitem>
@@ -9346,34 +9346,34 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Support host names and host suffixes
-        (e.g. <literal>.example.com</>) in <link
-        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+        (e.g. <literal>.example.com</literal>) in <link
+        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         (Peter Eisentraut)
        </para>
 
        <para>
-        Previously only host <acronym>IP</> addresses and <acronym>CIDR</>
+        Previously only host <acronym>IP</acronym> addresses and <acronym>CIDR</acronym>
         values were supported.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support the key word <literal>all</> in the host column of <link
-        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+        Support the key word <literal>all</literal> in the host column of <link
+        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         (Peter Eisentraut)
        </para>
 
        <para>
-        Previously people used <literal>0.0.0.0/0</> or <literal>::/0</>
+        Previously people used <literal>0.0.0.0/0</literal> or <literal>::/0</literal>
         for this.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Reject <literal>local</> lines in <link
-        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+        Reject <literal>local</literal> lines in <link
+        linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         on platforms that don't support Unix-socket connections
         (Magnus Hagander)
        </para>
@@ -9386,14 +9386,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Allow <link linkend="gssapi-auth"><acronym>GSSAPI</></link>
+        Allow <link linkend="gssapi-auth"><acronym>GSSAPI</acronym></link>
         to be used to authenticate to servers via <link
-        linkend="sspi-auth"><acronym>SSPI</></link> (Christian Ullrich)
+        linkend="sspi-auth"><acronym>SSPI</acronym></link> (Christian Ullrich)
        </para>
 
        <para>
-        Specifically this allows Unix-based <acronym>GSSAPI</> clients
-        to do <acronym>SSPI</> authentication with Windows servers.
+        Specifically this allows Unix-based <acronym>GSSAPI</acronym> clients
+        to do <acronym>SSPI</acronym> authentication with Windows servers.
        </para>
       </listitem>
 
@@ -9414,14 +9414,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Rewrite <link linkend="auth-peer"><acronym>peer</></link>
+        Rewrite <link linkend="auth-peer"><acronym>peer</acronym></link>
         authentication to avoid use of credential control messages (Tom Lane)
        </para>
 
        <para>
         This change makes the peer authentication code simpler and
         better-performing.  However, it requires the platform to provide the
-        <function>getpeereid</> function or an equivalent socket operation.
+        <function>getpeereid</function> function or an equivalent socket operation.
         So far as is known, the only platform for which peer authentication
         worked before and now will not is pre-5.0 NetBSD.
        </para>
@@ -9440,19 +9440,19 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
        <para>
         Add details to the logging of restartpoints and checkpoints,
         which is controlled by <link
-        linkend="guc-log-checkpoints"><varname>log_checkpoints</></link>
+        linkend="guc-log-checkpoints"><varname>log_checkpoints</varname></link>
         (Fujii Masao, Greg Smith)
        </para>
 
        <para>
-        New details include <acronym>WAL</> file and sync activity.
+        New details include <acronym>WAL</acronym> file and sync activity.
        </para>
       </listitem>
 
       <listitem>
        <para>
          Add <link
-         linkend="guc-log-file-mode"><varname>log_file_mode</></link>
+         linkend="guc-log-file-mode"><varname>log_file_mode</varname></link>
          which controls the permissions on log files created by the
          logging collector (Martin Pihlak)
        </para>
@@ -9460,7 +9460,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Reduce the default maximum line length for <application>syslog</>
+        Reduce the default maximum line length for <application>syslog</application>
         logging to 900 bytes plus prefixes (Noah Misch)
        </para>
 
@@ -9482,7 +9482,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add <structfield>client_hostname</structfield> column to <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</></link>
+        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</structname></link>
         (Peter Eisentraut)
        </para>
 
@@ -9494,7 +9494,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_xact_*</></link>
+        linkend="monitoring-stats-views-table"><structname>pg_stat_xact_*</structname></link>
         statistics functions and views (Joel Jacobson)
        </para>
 
@@ -9515,15 +9515,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
        <para>
          Add columns showing the number of vacuum and analyze operations
          in <link
-         linkend="monitoring-stats-views-table"><structname>pg_stat_*_tables</></link>
+         linkend="monitoring-stats-views-table"><structname>pg_stat_*_tables</structname></link>
          views (Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <structfield>buffers_backend_fsync</> column to <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_bgwriter</></link>
+        Add <structfield>buffers_backend_fsync</structfield> column to <link
+        linkend="monitoring-stats-views-table"><structname>pg_stat_bgwriter</structname></link>
         (Greg Smith)
        </para>
 
@@ -9545,13 +9545,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Provide auto-tuning of <link
-        linkend="guc-wal-buffers"><varname>wal_buffers</></link> (Greg
+        linkend="guc-wal-buffers"><varname>wal_buffers</varname></link> (Greg
         Smith)
        </para>
 
        <para>
-        By default, the value of <varname>wal_buffers</> is now chosen
-        automatically based on the value of <varname>shared_buffers</>.
+        By default, the value of <varname>wal_buffers</varname> is now chosen
+        automatically based on the value of <varname>shared_buffers</varname>.
        </para>
       </listitem>
 
@@ -9598,7 +9598,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
        <link linkend="guc-synchronous-standby-names"><varname>synchronous_standby_names</varname></link>
        setting.  Synchronous replication can be enabled or disabled on a
        per-transaction basis using the
-       <link linkend="guc-synchronous-commit"><varname>synchronous_commit</></link>
+       <link linkend="guc-synchronous-commit"><varname>synchronous_commit</varname></link>
        setting.
       </para>
      </listitem>
@@ -9619,13 +9619,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Add
-       <varname>replication_timeout</>
+       <varname>replication_timeout</varname>
        setting (Fujii Masao, Heikki Linnakangas)
       </para>
 
       <para>
        Replication connections that are idle for more than the
-       <varname>replication_timeout</> interval will be terminated
+       <varname>replication_timeout</varname> interval will be terminated
        automatically.  Formerly, a failed connection was typically not
        detected until the TCP timeout elapsed, which is inconveniently
        long in many situations.
@@ -9635,7 +9635,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Add command-line tool <link
-       linkend="app-pgbasebackup"><application>pg_basebackup</></link>
+       linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
        for creating a new standby server or database backup (Magnus
        Hagander)
       </para>
@@ -9643,7 +9643,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <listitem>
       <para>
-       Add a <link linkend="SQL-CREATEROLE">replication permission</link>
+       Add a <link linkend="sql-createrole">replication permission</link>
        for roles (Magnus Hagander)
       </para>
 
@@ -9667,8 +9667,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add system view <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_replication</></link>
-        which displays activity of <acronym>WAL</> sender processes (Itagaki
+        linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
+        which displays activity of <acronym>WAL</acronym> sender processes (Itagaki
         Takahiro, Simon Riggs)
        </para>
 
@@ -9680,7 +9680,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add monitoring function <link
-        linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</></link>
+        linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</function></link>
         (Fujii Masao)
        </para>
 
@@ -9702,7 +9702,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
        Add configuration parameter <link
-       linkend="guc-hot-standby-feedback"><varname>hot_standby_feedback</></link>
+       linkend="guc-hot-standby-feedback"><varname>hot_standby_feedback</varname></link>
        to enable standbys to postpone cleanup of old row versions on the
        primary (Simon Riggs)
       </para>
@@ -9715,7 +9715,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add the <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_database_conflicts</></link>
+        linkend="monitoring-stats-views-table"><structname>pg_stat_database_conflicts</structname></link>
         system view to show queries that have been canceled and the
         reason (Magnus Hagander)
        </para>
@@ -9728,8 +9728,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Add a <structfield>conflicts</> count to <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_database</></link>
+        Add a <structfield>conflicts</structfield> count to <link
+        linkend="monitoring-stats-views-table"><structname>pg_stat_database</structname></link>
         (Magnus Hagander)
        </para>
 
@@ -9754,7 +9754,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add <link
-        linkend="errcodes-table"><literal>ERRCODE_T_R_DATABASE_DROPPED</></link>
+        linkend="errcodes-table"><literal>ERRCODE_T_R_DATABASE_DROPPED</literal></link>
         error code to report recovery conflicts due to dropped databases
         (Tatsuo Ishii)
        </para>
@@ -9780,18 +9780,18 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
        <para>
         The new functions are <link
-        linkend="functions-recovery-control-table"><function>pg_xlog_replay_pause()</></link>,
+        linkend="functions-recovery-control-table"><function>pg_xlog_replay_pause()</function></link>,
         <link
-        linkend="functions-recovery-control-table"><function>pg_xlog_replay_resume()</></link>,
+        linkend="functions-recovery-control-table"><function>pg_xlog_replay_resume()</function></link>,
         and the status function <link
-        linkend="functions-recovery-control-table"><function>pg_is_xlog_replay_paused()</></link>.
+        linkend="functions-recovery-control-table"><function>pg_is_xlog_replay_paused()</function></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <filename>recovery.conf</> setting
-        <varname>pause_at_recovery_target</>
+        Add <filename>recovery.conf</filename> setting
+        <varname>pause_at_recovery_target</varname>
         to pause recovery at target (Simon Riggs)
        </para>
 
@@ -9804,14 +9804,14 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add the ability to create named restore points using <link
-        linkend="functions-admin-backup-table"><function>pg_create_restore_point()</></link>
+        linkend="functions-admin-backup-table"><function>pg_create_restore_point()</function></link>
         (Jaime Casanova)
        </para>
 
        <para>
         These named restore points can be specified as recovery
-        targets using the new <filename>recovery.conf</> setting
-        <link linkend="recovery-target-name"><varname>recovery_target_name</></link>.
+        targets using the new <filename>recovery.conf</filename> setting
+        <link linkend="recovery-target-name"><varname>recovery_target_name</varname></link>.
        </para>
       </listitem>
 
@@ -9830,7 +9830,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add <link
-        linkend="guc-restart-after-crash"><varname>restart_after_crash</></link>
+        linkend="guc-restart-after-crash"><varname>restart_after_crash</varname></link>
         setting which disables automatic server restart after a backend
         crash (Robert Haas)
        </para>
@@ -9844,8 +9844,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Allow <link
-        linkend="recovery-config"><filename>recovery.conf</></link>
-        to use the same quoting behavior as <filename>postgresql.conf</>
+        linkend="recovery-config"><filename>recovery.conf</filename></link>
+        to use the same quoting behavior as <filename>postgresql.conf</filename>
         (Dimitri Fontaine)
        </para>
 
@@ -9877,7 +9877,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
         single MVCC snapshot would be used for the entire transaction, which
         allowed certain documented anomalies.  The old snapshot isolation
         behavior is still available by requesting the <link
-        linkend="xact-repeatable-read"><literal>REPEATABLE READ</></link>
+        linkend="xact-repeatable-read"><literal>REPEATABLE READ</literal></link>
         isolation level.
        </para>
       </listitem>
@@ -9885,30 +9885,30 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Allow data-modification commands
-        (<command>INSERT</>/<command>UPDATE</>/<command>DELETE</>) in
-        <link linkend="queries-with"><literal>WITH</></link> clauses
+        (<command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>) in
+        <link linkend="queries-with"><literal>WITH</literal></link> clauses
         (Marko Tiikkaja, Hitoshi Harada)
        </para>
 
        <para>
-        These commands can use <literal>RETURNING</> to pass data up to the
+        These commands can use <literal>RETURNING</literal> to pass data up to the
         containing query.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="queries-with"><literal>WITH</></link>
-        clauses to be attached to <command>INSERT</>, <command>UPDATE</>,
-        <command>DELETE</> statements (Marko Tiikkaja, Hitoshi Harada)
+        Allow <link linkend="queries-with"><literal>WITH</literal></link>
+        clauses to be attached to <command>INSERT</command>, <command>UPDATE</command>,
+        <command>DELETE</command> statements (Marko Tiikkaja, Hitoshi Harada)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow non-<link linkend="queries-group"><literal>GROUP
-        BY</></link> columns in the query target list when the primary
-        key is specified in the <literal>GROUP BY</> clause (Peter
+        BY</literal></link> columns in the query target list when the primary
+        key is specified in the <literal>GROUP BY</literal> clause (Peter
         Eisentraut)
        </para>
 
@@ -9920,13 +9920,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Allow use of the key word <literal>DISTINCT</> in <link
-        linkend="queries-union"><literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</></link>
+        Allow use of the key word <literal>DISTINCT</literal> in <link
+        linkend="queries-union"><literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal></link>
         clauses (Tom Lane)
        </para>
 
        <para>
-        <literal>DISTINCT</> is the default behavior so use of this
+        <literal>DISTINCT</literal> is the default behavior so use of this
         key word is redundant, but the SQL standard allows it.
        </para>
       </listitem>
@@ -9934,13 +9934,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Fix ordinary queries with rules to use the same snapshot behavior
-        as <command>EXPLAIN ANALYZE</> (Marko Tiikkaja)
+        as <command>EXPLAIN ANALYZE</command> (Marko Tiikkaja)
        </para>
 
        <para>
-        Previously <command>EXPLAIN ANALYZE</> used slightly different
+        Previously <command>EXPLAIN ANALYZE</command> used slightly different
         snapshot timing for queries involving rules.  The
-        <command>EXPLAIN ANALYZE</> behavior was judged to be more logical.
+        <command>EXPLAIN ANALYZE</command> behavior was judged to be more logical.
        </para>
       </listitem>
 
@@ -9962,7 +9962,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
         Previously collation (the sort ordering of text strings) could only be
         chosen at database creation.
         Collation can now be set per column, domain, index, or
-        expression, via the SQL-standard <literal>COLLATE</> clause.
+        expression, via the SQL-standard <literal>COLLATE</literal> clause.
        </para>
       </listitem>
 
@@ -9980,30 +9980,30 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add <link linkend="extend-extensions">extensions</link> which
-        simplify packaging of additions to <productname>PostgreSQL</>
+        simplify packaging of additions to <productname>PostgreSQL</productname>
         (Dimitri Fontaine, Tom Lane)
        </para>
 
        <para>
         Extensions are controlled by the new <link
-        linkend="SQL-CREATEEXTENSION"><command>CREATE</></link>/<link
-        linkend="SQL-ALTEREXTENSION"><command>ALTER</></link>/<link
-        linkend="SQL-DROPEXTENSION"><command>DROP EXTENSION</></link>
+        linkend="sql-createextension"><command>CREATE</command></link>/<link
+        linkend="sql-alterextension"><command>ALTER</command></link>/<link
+        linkend="sql-dropextension"><command>DROP EXTENSION</command></link>
         commands.  This replaces ad-hoc methods of grouping objects that
-        are added to a <productname>PostgreSQL</> installation.
+        are added to a <productname>PostgreSQL</productname> installation.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for <link linkend="SQL-CREATEFOREIGNTABLE">foreign
+        Add support for <link linkend="sql-createforeigntable">foreign
         tables</link> (Shigeru Hanada, Robert Haas, Jan Urbanski,
         Heikki Linnakangas)
        </para>
 
        <para>
         This allows data stored outside the database to be used like
-        native <productname>PostgreSQL</>-stored data.  Foreign tables
+        native <productname>PostgreSQL</productname>-stored data.  Foreign tables
         are currently read-only, however.
        </para>
       </listitem>
@@ -10011,15 +10011,15 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      <listitem>
       <para>
          Allow new values to be added to an existing enum type via
-         <link linkend="SQL-ALTERTYPE"><command>ALTER TYPE</></link> (Andrew
+         <link linkend="sql-altertype"><command>ALTER TYPE</command></link> (Andrew
          Dunstan)
       </para>
      </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERTYPE"><command>ALTER TYPE ...
-        ADD/DROP/ALTER/RENAME ATTRIBUTE</></link> (Peter Eisentraut)
+        Add <link linkend="sql-altertype"><command>ALTER TYPE ...
+        ADD/DROP/ALTER/RENAME ATTRIBUTE</command></link> (Peter Eisentraut)
        </para>
 
        <para>
@@ -10030,28 +10030,28 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
      </itemizedlist>
 
     <sect4>
-     <title><command>ALTER</> Object</title>
+     <title><command>ALTER</command> Object</title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <literal>RESTRICT</>/<literal>CASCADE</> to <link
-        linkend="SQL-ALTERTYPE"><command>ALTER TYPE</></link> operations
+        Add <literal>RESTRICT</literal>/<literal>CASCADE</literal> to <link
+        linkend="sql-altertype"><command>ALTER TYPE</command></link> operations
         on typed tables (Peter Eisentraut)
        </para>
 
        <para>
         This controls
-        <literal>ADD</>/<literal>DROP</>/<literal>ALTER</>/<literal>RENAME
-        ATTRIBUTE</> cascading behavior.
+        <literal>ADD</literal>/<literal>DROP</literal>/<literal>ALTER</literal>/<literal>RENAME
+        ATTRIBUTE</literal> cascading behavior.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>ALTER TABLE <replaceable>name</> {OF | NOT OF}
-        <replaceable>type</></literal>
+        Support <literal>ALTER TABLE <replaceable>name</replaceable> {OF | NOT OF}
+        <replaceable>type</replaceable></literal>
         (Noah Misch)
        </para>
 
@@ -10064,7 +10064,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add support for more object types in <command>ALTER ... SET
-        SCHEMA</> commands (Dimitri Fontaine)
+        SCHEMA</command> commands (Dimitri Fontaine)
        </para>
 
        <para>
@@ -10079,7 +10079,7 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-CREATETABLE"><command>CREATE/ALTER TABLE</></link></title>
+     <title><link linkend="sql-createtable"><command>CREATE/ALTER TABLE</command></link></title>
 
      <itemizedlist>
 
@@ -10098,13 +10098,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Allow <command>ALTER TABLE</>
+        Allow <command>ALTER TABLE</command>
         to add foreign keys without validation (Simon Riggs)
        </para>
 
        <para>
-        The new option is called <literal>NOT VALID</>.  The constraint's
-        state can later be modified to <literal>VALIDATED</> and validation
+        The new option is called <literal>NOT VALID</literal>.  The constraint's
+        state can later be modified to <literal>VALIDATED</literal> and validation
         checks performed. Together these allow you to add a foreign key
         with minimal impact on read and write operations.
        </para>
@@ -10112,23 +10112,23 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-ALTERTABLE"><command>ALTER TABLE
+        Allow <link linkend="sql-altertable"><command>ALTER TABLE
         ... SET DATA TYPE</command></link> to avoid table rewrites in
         appropriate cases (Noah Misch, Robert Haas)
        </para>
 
        <para>
-        For example, converting a <type>varchar</> column to
-        <type>text</> no longer requires a rewrite of the table.
+        For example, converting a <type>varchar</type> column to
+        <type>text</type> no longer requires a rewrite of the table.
         However, increasing the length constraint on a
-        <type>varchar</> column still requires a table rewrite.
+        <type>varchar</type> column still requires a table rewrite.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATETABLE"><command>CREATE TABLE IF
-        NOT EXISTS</></link> syntax (Robert Haas)
+        Add <link linkend="sql-createtable"><command>CREATE TABLE IF
+        NOT EXISTS</command></link> syntax (Robert Haas)
        </para>
 
        <para>
@@ -10162,8 +10162,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
       <listitem>
        <para>
-        Add a <link linkend="SQL-SECURITY-LABEL"><command>SECURITY
-        LABEL</></link> command (KaiGai Kohei)
+        Add a <link linkend="sql-security-label"><command>SECURITY
+        LABEL</command></link> command (KaiGai Kohei)
        </para>
 
        <para>
@@ -10196,8 +10196,8 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
 
      <listitem>
       <para>
-       Make <link linkend="SQL-TRUNCATE"><command>TRUNCATE ... RESTART
-       IDENTITY</></link> restart sequences transactionally (Steve
+       Make <link linkend="sql-truncate"><command>TRUNCATE ... RESTART
+       IDENTITY</command></link> restart sequences transactionally (Steve
        Singer)
       </para>
 
@@ -10211,26 +10211,26 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="SQL-COPY"><command>COPY</></link></title>
+     <title><link linkend="sql-copy"><command>COPY</command></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <literal>ENCODING</> option to <link
-        linkend="SQL-COPY"><command>COPY TO/FROM</></link> (Hitoshi
+        Add <literal>ENCODING</literal> option to <link
+        linkend="sql-copy"><command>COPY TO/FROM</command></link> (Hitoshi
         Harada, Itagaki Takahiro)
        </para>
 
        <para>
-        This allows the encoding of the <command>COPY</> file to be
+        This allows the encoding of the <command>COPY</command> file to be
         specified separately from client encoding.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add bidirectional <link linkend="SQL-COPY"><command>COPY</></link>
+        Add bidirectional <link linkend="sql-copy"><command>COPY</command></link>
         protocol support (Fujii Masao)
        </para>
 
@@ -10244,13 +10244,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-EXPLAIN"><command>EXPLAIN</></link></title>
+     <title><link linkend="sql-explain"><command>EXPLAIN</command></link></title>
 
       <itemizedlist>
 
       <listitem>
        <para>
-        Make <command>EXPLAIN VERBOSE</> show the function call expression
+        Make <command>EXPLAIN VERBOSE</command> show the function call expression
         in a <literal>FunctionScan</literal> node (Tom Lane)
        </para>
       </listitem>
@@ -10260,21 +10260,21 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-VACUUM"><command>VACUUM</></link></title>
+     <title><link linkend="sql-vacuum"><command>VACUUM</command></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
         Add additional details to the output of <link
-        linkend="SQL-VACUUM"><command>VACUUM FULL VERBOSE</></link>
-        and <link linkend="SQL-CLUSTER"><command>CLUSTER VERBOSE</></link>
+        linkend="sql-vacuum"><command>VACUUM FULL VERBOSE</command></link>
+        and <link linkend="sql-cluster"><command>CLUSTER VERBOSE</command></link>
         (Itagaki Takahiro)
        </para>
 
        <para>
         New information includes the live and dead tuple count and
-        whether <command>CLUSTER</> is using an index to rebuild.
+        whether <command>CLUSTER</command> is using an index to rebuild.
        </para>
       </listitem>
 
@@ -10294,13 +10294,13 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-CLUSTER"><command>CLUSTER</></link></title>
+     <title><link linkend="sql-cluster"><command>CLUSTER</command></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <command>CLUSTER</> to sort the table rather than scanning
+        Allow <command>CLUSTER</command> to sort the table rather than scanning
         the index when it seems likely to be cheaper (Leonardo Francalanci)
        </para>
       </listitem>
@@ -10317,12 +10317,12 @@ Branch: REL9_0_STABLE [9d6af7367] 2015-08-15 11:02:34 -0400
       <listitem>
        <para>
         Add nearest-neighbor (order-by-operator) searching to <link
-        linkend="GiST"><acronym>GiST</> indexes</link> (Teodor Sigaev, Tom Lane)
+        linkend="gist"><acronym>GiST</acronym> indexes</link> (Teodor Sigaev, Tom Lane)
        </para>
 
        <para>
-        This allows <acronym>GiST</> indexes to quickly return the
-        <replaceable>N</> closest values in a query with <literal>LIMIT</>.
+        This allows <acronym>GiST</acronym> indexes to quickly return the
+        <replaceable>N</replaceable> closest values in a query with <literal>LIMIT</literal>.
         For example
 <programlisting><![CDATA[
 SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
@@ -10334,19 +10334,19 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Allow <link linkend="GIN"><acronym>GIN</> indexes</link> to index null
+        Allow <link linkend="gin"><acronym>GIN</acronym> indexes</link> to index null
         and empty values (Tom Lane)
        </para>
 
        <para>
-        This allows full <acronym>GIN</> index scans, and fixes various
+        This allows full <acronym>GIN</acronym> index scans, and fixes various
         corner cases in which GIN scans would fail.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="GIN"><acronym>GIN</> indexes</link> to
+        Allow <link linkend="gin"><acronym>GIN</acronym> indexes</link> to
         better recognize duplicate search entries (Tom Lane)
        </para>
 
@@ -10358,12 +10358,12 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Fix <link linkend="GiST"><acronym>GiST</> indexes</link> to be fully
+        Fix <link linkend="gist"><acronym>GiST</acronym> indexes</link> to be fully
         crash-safe (Heikki Linnakangas)
        </para>
 
        <para>
-        Previously there were rare cases where a <command>REINDEX</>
+        Previously there were rare cases where a <command>REINDEX</command>
         would be required (you would be informed).
        </para>
       </listitem>
@@ -10381,19 +10381,19 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Allow <type>numeric</> to use a more compact, two-byte header
+       Allow <type>numeric</type> to use a more compact, two-byte header
        in common cases (Robert Haas)
       </para>
 
       <para>
-       Previously all <type>numeric</> values had four-byte headers;
+       Previously all <type>numeric</type> values had four-byte headers;
        this change saves on disk storage.
       </para>
      </listitem>
 
      <listitem>
       <para>
-        Add support for dividing <type>money</> by <type>money</>
+        Add support for dividing <type>money</type> by <type>money</type>
         (Andy Balholm)
       </para>
      </listitem>
@@ -10431,9 +10431,9 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       </para>
 
       <para>
-       This avoids possible <quote>could not identify a comparison function</>
+       This avoids possible <quote>could not identify a comparison function</quote>
        failures at runtime, if it is possible to implement the query without
-       sorting.  Also, <command>ANALYZE</> won't try to use inappropriate
+       sorting.  Also, <command>ANALYZE</command> won't try to use inappropriate
        statistics-gathering methods for columns of such composite types.
       </para>
      </listitem>
@@ -10447,15 +10447,15 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-        Add support for casting between <type>money</> and <type>numeric</>
+        Add support for casting between <type>money</type> and <type>numeric</type>
         (Andy Balholm)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for casting from <type>int4</> and <type>int8</>
-       to <type>money</> (Joey Adams)
+       Add support for casting from <type>int4</type> and <type>int8</type>
+       to <type>money</type> (Joey Adams)
       </para>
      </listitem>
 
@@ -10476,15 +10476,15 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     </sect4>
 
     <sect4>
-     <title><link linkend="functions-xml"><acronym>XML</></link></title>
+     <title><link linkend="functions-xml"><acronym>XML</acronym></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <acronym>XML</> function <link
-        linkend="xml-exists"><literal>XMLEXISTS</></link> and <link
-        linkend="xml-exists"><function>xpath_exists()</></link>
+        Add <acronym>XML</acronym> function <link
+        linkend="xml-exists"><literal>XMLEXISTS</literal></link> and <link
+        linkend="xml-exists"><function>xpath_exists()</function></link>
         functions (Mike Fowler)
        </para>
 
@@ -10495,17 +10495,17 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Add <acronym>XML</> functions <link
-        linkend="xml-is-well-formed"><function>xml_is_well_formed()</></link>,
+        Add <acronym>XML</acronym> functions <link
+        linkend="xml-is-well-formed"><function>xml_is_well_formed()</function></link>,
         <link
-        linkend="xml-is-well-formed"><function>xml_is_well_formed_document()</></link>,
+        linkend="xml-is-well-formed"><function>xml_is_well_formed_document()</function></link>,
         <link
-        linkend="xml-is-well-formed"><function>xml_is_well_formed_content()</></link>
+        linkend="xml-is-well-formed"><function>xml_is_well_formed_content()</function></link>
         (Mike Fowler)
        </para>
 
        <para>
-        These check whether the input is properly-formed <acronym>XML</>.
+        These check whether the input is properly-formed <acronym>XML</acronym>.
         They provide functionality that was previously available only in
         the deprecated <filename>contrib/xml2</filename> module.
        </para>
@@ -10525,8 +10525,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add SQL function <link
-        linkend="format"><function>format(text, ...)</></link>, which
-        behaves analogously to C's <function>printf()</> (Pavel Stehule,
+        linkend="format"><function>format(text, ...)</function></link>, which
+        behaves analogously to C's <function>printf()</function> (Pavel Stehule,
         Robert Haas)
        </para>
 
@@ -10539,13 +10539,13 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add string functions <link
-        linkend="functions-string-other"><function>concat()</></link>,
+        linkend="functions-string-other"><function>concat()</function></link>,
         <link
-        linkend="functions-string-other"><function>concat_ws()</></link>,
-        <link linkend="functions-string-other"><function>left()</></link>,
-        <link linkend="functions-string-other"><function>right()</></link>,
+        linkend="functions-string-other"><function>concat_ws()</function></link>,
+        <link linkend="functions-string-other"><function>left()</function></link>,
+        <link linkend="functions-string-other"><function>right()</function></link>,
         and <link
-        linkend="functions-string-other"><function>reverse()</></link>
+        linkend="functions-string-other"><function>reverse()</function></link>
         (Pavel Stehule)
        </para>
 
@@ -10557,7 +10557,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          Add function <link
-         linkend="functions-admin-genfile"><function>pg_read_binary_file()</></link>
+         linkend="functions-admin-genfile"><function>pg_read_binary_file()</function></link>
          to read binary files (Dimitri Fontaine, Itagaki Takahiro)
        </para>
       </listitem>
@@ -10565,7 +10565,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          Add a single-parameter version of function <link
-         linkend="functions-admin-genfile"><function>pg_read_file()</></link>
+         linkend="functions-admin-genfile"><function>pg_read_file()</function></link>
          to read an entire file (Dimitri Fontaine, Itagaki Takahiro)
        </para>
       </listitem>
@@ -10573,9 +10573,9 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          Add three-parameter forms of <link
-         linkend="array-functions-table"><function>array_to_string()</></link>
+         linkend="array-functions-table"><function>array_to_string()</function></link>
          and <link
-         linkend="array-functions-table"><function>string_to_array()</></link>
+         linkend="array-functions-table"><function>string_to_array()</function></link>
          for null value processing control (Pavel Stehule)
        </para>
       </listitem>
@@ -10590,7 +10590,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add the <link
-        linkend="functions-info-catalog-table"><function>pg_describe_object()</></link>
+        linkend="functions-info-catalog-table"><function>pg_describe_object()</function></link>
         function (Alvaro Herrera)
        </para>
 
@@ -10619,10 +10619,10 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add variable <link
-        linkend="guc-quote-all-identifiers"><varname>quote_all_identifiers</></link>
-        to force the quoting of all identifiers in <command>EXPLAIN</>
+        linkend="guc-quote-all-identifiers"><varname>quote_all_identifiers</varname></link>
+        to force the quoting of all identifiers in <command>EXPLAIN</command>
         and in system catalog functions like <link
-        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</></link>
+        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</function></link>
         (Robert Haas)
        </para>
 
@@ -10635,7 +10635,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add columns to the <link
-        linkend="infoschema-sequences"><structname>information_schema.sequences</></link>
+        linkend="infoschema-sequences"><structname>information_schema.sequences</structname></link>
         system view (Peter Eisentraut)
        </para>
 
@@ -10647,8 +10647,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Allow <literal>public</> as a pseudo-role name in <link
-        linkend="functions-info-access-table"><function>has_table_privilege()</></link>
+        Allow <literal>public</literal> as a pseudo-role name in <link
+        linkend="functions-info-access-table"><function>has_table_privilege()</function></link>
         and related functions (Alvaro Herrera)
        </para>
 
@@ -10668,8 +10668,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Support <link linkend="SQL-CREATETRIGGER"><literal>INSTEAD
-        OF</></link> triggers on views (Dean Rasheed)
+        Support <link linkend="sql-createtrigger"><literal>INSTEAD
+        OF</literal></link> triggers on views (Dean Rasheed)
        </para>
 
        <para>
@@ -10694,7 +10694,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add <link linkend="plpgsql-foreach-array"><command>FOREACH IN
-        ARRAY</></link> to PL/pgSQL
+        ARRAY</command></link> to PL/pgSQL
         (Pavel Stehule)
        </para>
 
@@ -10734,7 +10734,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
        </para>
 
        <para>
-        PL/Perl functions can now be declared to accept type <type>record</>.
+        PL/Perl functions can now be declared to accept type <type>record</type>.
         The behavior is the same as for any named composite type.
        </para>
       </listitem>
@@ -10776,7 +10776,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
        </para>
 
        <para>
-        PL/Python can now return multiple <literal>OUT</> parameters
+        PL/Python can now return multiple <literal>OUT</literal> parameters
         and record sets.
        </para>
       </listitem>
@@ -10816,10 +10816,10 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
        <para>
         These functions are <link
-        linkend="plpython-util"><literal>plpy.quote_ident</></link>,
-        <link linkend="plpython-util"><literal>plpy.quote_literal</></link>,
+        linkend="plpython-util"><literal>plpy.quote_ident</literal></link>,
+        <link linkend="plpython-util"><literal>plpy.quote_literal</literal></link>,
         and <link
-        linkend="plpython-util"><literal>plpy.quote_nullable</></link>.
+        linkend="plpython-util"><literal>plpy.quote_nullable</literal></link>.
        </para>
       </listitem>
 
@@ -10831,7 +10831,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Report PL/Python errors from iterators with <literal>PLy_elog</> (Jan
+         Report PL/Python errors from iterators with <literal>PLy_elog</literal> (Jan
          Urbanski)
        </para>
       </listitem>
@@ -10843,7 +10843,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
        <para>
         Exception classes were previously not available in
-        <literal>plpy</> under Python 3.
+        <literal>plpy</literal> under Python 3.
        </para>
       </listitem>
 
@@ -10860,7 +10860,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-        Mark <application>createlang</> and <application>droplang</>
+        Mark <application>createlang</application> and <application>droplang</application>
         as deprecated now that they just invoke extension commands (Tom
         Lane)
       </para>
@@ -10869,64 +10869,64 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PSQL"><application>psql</></link></title>
+     <title><link linkend="app-psql"><application>psql</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-         Add <application>psql</> command <literal>\conninfo</>
+         Add <application>psql</application> command <literal>\conninfo</literal>
          to show current connection information (David Christensen)
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Add <application>psql</> command <literal>\sf</> to
+         Add <application>psql</application> command <literal>\sf</literal> to
          show a function's definition (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Add <application>psql</> command <literal>\dL</> to list
+         Add <application>psql</application> command <literal>\dL</literal> to list
          languages (Fernando Ike)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <option>S</> (<quote>system</>) option to <application>psql</>'s
-        <literal>\dn</> (list schemas) command (Tom Lane)
+        Add the <option>S</option> (<quote>system</quote>) option to <application>psql</application>'s
+        <literal>\dn</literal> (list schemas) command (Tom Lane)
        </para>
 
        <para>
-        <literal>\dn</> without <literal>S</> now suppresses system
+        <literal>\dn</literal> without <literal>S</literal> now suppresses system
         schemas.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>psql</>'s <literal>\e</> and <literal>\ef</>
+        Allow <application>psql</application>'s <literal>\e</literal> and <literal>\ef</literal>
         commands to accept a line number to be used to position the
         cursor in the editor (Pavel Stehule)
        </para>
 
        <para>
         This is passed to the editor according to the
-        <envar>PSQL_EDITOR_LINENUMBER_ARG</> environment variable.
+        <envar>PSQL_EDITOR_LINENUMBER_ARG</envar> environment variable.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Have <application>psql</> set the client encoding from the
+        Have <application>psql</application> set the client encoding from the
         operating system locale by default (Heikki Linnakangas)
        </para>
 
        <para>
-        This only happens if the <envar>PGCLIENTENCODING</> environment
+        This only happens if the <envar>PGCLIENTENCODING</envar> environment
         variable is not set.
        </para>
       </listitem>
@@ -10940,8 +10940,8 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Make <literal>\dt+</literal> report <function>pg_table_size</>
-        instead of <function>pg_relation_size</> when talking to 9.0 or
+        Make <literal>\dt+</literal> report <function>pg_table_size</function>
+        instead of <function>pg_relation_size</function> when talking to 9.0 or
         later servers (Bernd Helmle)
        </para>
 
@@ -10963,29 +10963,29 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-         Add <link linkend="APP-PGDUMP"><application>pg_dump</></link>
+         Add <link linkend="app-pgdump"><application>pg_dump</application></link>
          and <link
-         linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link>
-         option <option>--quote-all-identifiers</> to force quoting
+         linkend="app-pg-dumpall"><application>pg_dumpall</application></link>
+         option <option>--quote-all-identifiers</option> to force quoting
          of all identifiers (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>directory</> format to <application>pg_dump</>
+        Add <literal>directory</literal> format to <application>pg_dump</application>
         (Joachim Wieland, Heikki Linnakangas)
        </para>
 
        <para>
-        This is internally similar to the <literal>tar</>
-        <application>pg_dump</> format.
+        This is internally similar to the <literal>tar</literal>
+        <application>pg_dump</application> format.
        </para>
       </listitem>
 
@@ -10994,27 +10994,27 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PG-CTL"><application>pg_ctl</></link></title>
+     <title><link linkend="app-pg-ctl"><application>pg_ctl</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Fix <application>pg_ctl</>
+        Fix <application>pg_ctl</application>
         so it no longer incorrectly reports that the server is not
         running (Bruce Momjian)
        </para>
 
        <para>
         Previously this could happen if the server was running but
-        <application>pg_ctl</> could not authenticate.
+        <application>pg_ctl</application> could not authenticate.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>pg_ctl</> start's <quote>wait</quote>
-        (<option>-w</>) option (Bruce Momjian, Tom Lane)
+        Improve <application>pg_ctl</application> start's <quote>wait</quote>
+        (<option>-w</option>) option (Bruce Momjian, Tom Lane)
        </para>
 
        <para>
@@ -11027,7 +11027,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Add <literal>promote</> option to <application>pg_ctl</> to
+         Add <literal>promote</literal> option to <application>pg_ctl</application> to
          switch a standby server to primary (Fujii Masao)
        </para>
       </listitem>
@@ -11039,23 +11039,23 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
    </sect3>
 
    <sect3>
-    <title><application>Development Tools</></title>
+    <title><application>Development Tools</application></title>
 
     <sect4>
-     <title><link linkend="libpq"><application>libpq</></link></title>
+     <title><link linkend="libpq"><application>libpq</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
         Add a libpq connection option <link
-        linkend="libpq-connect-client-encoding"><literal>client_encoding</></link>
-        which behaves like the <envar>PGCLIENTENCODING</> environment
+        linkend="libpq-connect-client-encoding"><literal>client_encoding</literal></link>
+        which behaves like the <envar>PGCLIENTENCODING</envar> environment
         variable (Heikki Linnakangas)
        </para>
 
        <para>
-        The value <literal>auto</> sets the client encoding based on
+        The value <literal>auto</literal> sets the client encoding based on
         the operating system locale.
        </para>
       </listitem>
@@ -11063,13 +11063,13 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add <link
-        linkend="libpq-pqlibversion"><function>PQlibVersion()</></link>
+        linkend="libpq-pqlibversion"><function>PQlibVersion()</function></link>
         function which returns the libpq library version (Magnus
         Hagander)
        </para>
 
        <para>
-        libpq already had <function>PQserverVersion()</> which returns
+        libpq already had <function>PQserverVersion()</function> which returns
         the server version.
        </para>
       </listitem>
@@ -11079,22 +11079,22 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
         Allow libpq-using clients to
         check the user name of the server process
         when connecting via Unix-domain sockets, with the new <link
-        linkend="libpq-connect-requirepeer"><literal>requirepeer</></link>
+        linkend="libpq-connect-requirepeer"><literal>requirepeer</literal></link>
         connection option
         (Peter Eisentraut)
        </para>
 
        <para>
-        <productname>PostgreSQL</> already allowed servers to check
+        <productname>PostgreSQL</productname> already allowed servers to check
         the client user name when connecting via Unix-domain sockets.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="libpq-pqping"><function>PQping()</></link>
+        Add <link linkend="libpq-pqping"><function>PQping()</function></link>
         and <link
-        linkend="libpq-pqpingparams"><function>PQpingParams()</></link>
+        linkend="libpq-pqpingparams"><function>PQpingParams()</function></link>
         to libpq (Bruce Momjian, Tom Lane)
        </para>
 
@@ -11109,7 +11109,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
     </sect4>
 
     <sect4>
-     <title><link linkend="ecpg"><application>ECPG</></link></title>
+     <title><link linkend="ecpg"><application>ECPG</application></link></title>
 
      <itemizedlist>
 
@@ -11123,7 +11123,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Make <application>ecpglib</> write <type>double</> values with a
+        Make <application>ecpglib</application> write <type>double</type> values with a
         precision of 15 digits, not 14 as formerly (Akira Kurosawa)
        </para>
       </listitem>
@@ -11140,7 +11140,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Use <literal>+Olibmerrno</> compile flag with HP-UX C compilers
+        Use <literal>+Olibmerrno</literal> compile flag with HP-UX C compilers
         that accept it (Ibrar Ahmed)
        </para>
 
@@ -11163,15 +11163,15 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
        </para>
 
        <para>
-        This allows for faster compiles.  Also, <literal>make -k</>
+        This allows for faster compiles.  Also, <literal>make -k</literal>
         now works more consistently.
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Require <acronym>GNU</> <link
-         linkend="install-requirements"><application>make</></link>
+         Require <acronym>GNU</acronym> <link
+         linkend="install-requirements"><application>make</application></link>
          3.80 or newer (Peter Eisentraut)
        </para>
 
@@ -11182,7 +11182,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Add <literal>make maintainer-check</> target
+        Add <literal>make maintainer-check</literal> target
         (Peter Eisentraut)
        </para>
 
@@ -11195,15 +11195,15 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Support <literal>make check</> in <filename>contrib</>
+        Support <literal>make check</literal> in <filename>contrib</filename>
         (Peter Eisentraut)
        </para>
 
        <para>
-        Formerly only <literal>make installcheck</> worked, but now
+        Formerly only <literal>make installcheck</literal> worked, but now
         there is support for testing in a temporary installation.
-        The top-level <literal>make check-world</> target now includes
-        testing <filename>contrib</> this way.
+        The top-level <literal>make check-world</literal> target now includes
+        testing <filename>contrib</filename> this way.
        </para>
       </listitem>
 
@@ -11219,7 +11219,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          On Windows, allow <link
-         linkend="app-pg-ctl"><application>pg_ctl</></link> to register
+         linkend="app-pg-ctl"><application>pg_ctl</application></link> to register
          the service as auto-start or start-on-demand (Quan Zongliang)
        </para>
       </listitem>
@@ -11231,7 +11231,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
        </para>
 
        <para>
-        <productname>minidumps</> can now be generated by non-debug
+        <productname>minidumps</productname> can now be generated by non-debug
         Windows binaries and analyzed by standard debugging tools.
        </para>
       </listitem>
@@ -11287,7 +11287,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Add missing <function>get_<replaceable>object</>_oid()</function> functions, for consistency
+         Add missing <function>get_<replaceable>object</replaceable>_oid()</function> functions, for consistency
          (Robert Haas)
        </para>
       </listitem>
@@ -11302,13 +11302,13 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Add support for DragonFly <acronym>BSD</> (Rumko)
+         Add support for DragonFly <acronym>BSD</acronym> (Rumko)
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Expose <function>quote_literal_cstr()</> for backend use
+         Expose <function>quote_literal_cstr()</function> for backend use
          (Robert Haas)
        </para>
       </listitem>
@@ -11321,22 +11321,22 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
        <para>
         Regression tests were previously always run with
-        <literal>SQL_ASCII</> encoding.
+        <literal>SQL_ASCII</literal> encoding.
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Add <application>src/tools/git_changelog</> to replace
-         <application>cvs2cl</> and <application>pgcvslog</> (Robert
+         Add <application>src/tools/git_changelog</application> to replace
+         <application>cvs2cl</application> and <application>pgcvslog</application> (Robert
          Haas, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>git-external-diff</> script to
-        <filename>src/tools</> (Bruce Momjian)
+        Add <application>git-external-diff</application> script to
+        <filename>src/tools</filename> (Bruce Momjian)
        </para>
 
        <para>
@@ -11391,7 +11391,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Modify <filename>contrib</> modules and procedural
+       Modify <filename>contrib</filename> modules and procedural
        languages to install via the new <link
        linkend="extend-extensions">extension</link> mechanism (Tom Lane,
        Dimitri Fontaine)
@@ -11400,21 +11400,21 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Add <link linkend="file-fdw"><filename>contrib/file_fdw</></link>
+       Add <link linkend="file-fdw"><filename>contrib/file_fdw</filename></link>
        foreign-data wrapper (Shigeru Hanada)
       </para>
 
       <para>
        Foreign tables using this foreign data wrapper can read flat files
-       in a manner very similar to <command>COPY</>.
+       in a manner very similar to <command>COPY</command>.
       </para>
      </listitem>
 
      <listitem>
       <para>
         Add nearest-neighbor search support to <link
-        linkend="pgtrgm"><filename>contrib/pg_trgm</></link> and <link
-        linkend="btree-gist"><filename>contrib/btree_gist</></link>
+        linkend="pgtrgm"><filename>contrib/pg_trgm</filename></link> and <link
+        linkend="btree-gist"><filename>contrib/btree_gist</filename></link>
         (Teodor Sigaev)
       </para>
      </listitem>
@@ -11422,7 +11422,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
         Add <link
-        linkend="btree-gist"><filename>contrib/btree_gist</></link>
+        linkend="btree-gist"><filename>contrib/btree_gist</filename></link>
         support for searching on not-equals (Jeff Davis)
       </para>
      </listitem>
@@ -11430,25 +11430,25 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
         Fix <link
-        linkend="fuzzystrmatch"><filename>contrib/fuzzystrmatch</></link>'s
-        <function>levenshtein()</> function to handle multibyte characters
+        linkend="fuzzystrmatch"><filename>contrib/fuzzystrmatch</filename></link>'s
+        <function>levenshtein()</function> function to handle multibyte characters
         (Alexander Korotkov)
       </para>
      </listitem>
 
      <listitem>
       <para>
-        Add <function>ssl_cipher()</> and <function>ssl_version()</>
+        Add <function>ssl_cipher()</function> and <function>ssl_version()</function>
         functions to <link
-        linkend="sslinfo"><filename>contrib/sslinfo</></link> (Robert
+        linkend="sslinfo"><filename>contrib/sslinfo</filename></link> (Robert
         Haas)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Fix <link linkend="intarray"><filename>contrib/intarray</></link>
-       and <link linkend="hstore"><filename>contrib/hstore</></link>
+       Fix <link linkend="intarray"><filename>contrib/intarray</filename></link>
+       and <link linkend="hstore"><filename>contrib/hstore</filename></link>
        to give consistent results with indexed empty arrays (Tom Lane)
       </para>
 
@@ -11460,7 +11460,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Allow <link linkend="intarray"><filename>contrib/intarray</></link>
+       Allow <link linkend="intarray"><filename>contrib/intarray</filename></link>
        to work properly on multidimensional arrays (Tom Lane)
       </para>
      </listitem>
@@ -11468,7 +11468,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
        In
-       <link linkend="intarray"><filename>contrib/intarray</></link>,
+       <link linkend="intarray"><filename>contrib/intarray</filename></link>,
        avoid errors complaining about the presence of nulls in cases where no
        nulls are actually present (Tom Lane)
       </para>
@@ -11477,7 +11477,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
        In
-       <link linkend="intarray"><filename>contrib/intarray</></link>,
+       <link linkend="intarray"><filename>contrib/intarray</filename></link>,
        fix behavior of containment operators with respect to empty arrays
        (Tom Lane)
       </para>
@@ -11490,10 +11490,10 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Remove <link linkend="xml2"><filename>contrib/xml2</></link>'s
+       Remove <link linkend="xml2"><filename>contrib/xml2</filename></link>'s
        arbitrary limit on the number of
-       <replaceable>parameter</>=<replaceable>value</> pairs that can be
-       handled by <function>xslt_process()</> (Pavel Stehule)
+       <replaceable>parameter</replaceable>=<replaceable>value</replaceable> pairs that can be
+       handled by <function>xslt_process()</function> (Pavel Stehule)
       </para>
 
       <para>
@@ -11503,7 +11503,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       In <link linkend="pageinspect"><filename>contrib/pageinspect</></link>,
+       In <link linkend="pageinspect"><filename>contrib/pageinspect</filename></link>,
        fix heap_page_item to return infomasks as 32-bit values (Alvaro Herrera)
       </para>
 
@@ -11522,13 +11522,13 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Add <link linkend="sepgsql"><filename>contrib/sepgsql</></link>
-        to interface permission checks with <acronym>SELinux</> (KaiGai Kohei)
+        Add <link linkend="sepgsql"><filename>contrib/sepgsql</filename></link>
+        to interface permission checks with <acronym>SELinux</acronym> (KaiGai Kohei)
        </para>
 
        <para>
         This uses the new <link
-        linkend="SQL-SECURITY-LABEL"><command>SECURITY LABEL</></link>
+        linkend="sql-security-label"><command>SECURITY LABEL</command></link>
         facility.
        </para>
       </listitem>
@@ -11536,7 +11536,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Add contrib module <link
-        linkend="auth-delay"><filename>auth_delay</></link> (KaiGai
+        linkend="auth-delay"><filename>auth_delay</filename></link> (KaiGai
         Kohei)
        </para>
 
@@ -11549,7 +11549,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-        Add <filename>dummy_seclabel</>
+        Add <filename>dummy_seclabel</filename>
         contrib module (KaiGai Kohei)
        </para>
 
@@ -11569,17 +11569,17 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Add support for <literal>LIKE</> and <literal>ILIKE</> index
+         Add support for <literal>LIKE</literal> and <literal>ILIKE</literal> index
          searches to <link
-         linkend="pgtrgm"><filename>contrib/pg_trgm</></link> (Alexander
+         linkend="pgtrgm"><filename>contrib/pg_trgm</filename></link> (Alexander
          Korotkov)
        </para>
       </listitem>
 
       <listitem>
        <para>
-         Add <function>levenshtein_less_equal()</> function to <link
-         linkend="fuzzystrmatch"><filename>contrib/fuzzystrmatch</></link>,
+         Add <function>levenshtein_less_equal()</function> function to <link
+         linkend="fuzzystrmatch"><filename>contrib/fuzzystrmatch</filename></link>,
          which is optimized for small distances (Alexander Korotkov)
        </para>
       </listitem>
@@ -11587,7 +11587,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
         Improve performance of index lookups on <link
-        linkend="seg"><filename>contrib/seg</></link> columns (Alexander
+        linkend="seg"><filename>contrib/seg</filename></link> columns (Alexander
         Korotkov)
        </para>
       </listitem>
@@ -11595,7 +11595,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          Improve performance of <link
-         linkend="pgupgrade"><application>pg_upgrade</></link> for
+         linkend="pgupgrade"><application>pg_upgrade</application></link> for
          databases with many relations (Bruce Momjian)
        </para>
       </listitem>
@@ -11603,7 +11603,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <listitem>
        <para>
          Add flag to <link
-         linkend="pgbench"><filename>contrib/pgbench</></link> to
+         linkend="pgbench"><filename>contrib/pgbench</filename></link> to
          report per-statement latencies (Florian Pflug)
        </para>
       </listitem>
@@ -11619,29 +11619,29 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
       <listitem>
        <para>
-         Move <filename>src/tools/test_fsync</> to <link
-         linkend="pgtestfsync"><filename>contrib/pg_test_fsync</></link>
+         Move <filename>src/tools/test_fsync</filename> to <link
+         linkend="pgtestfsync"><filename>contrib/pg_test_fsync</filename></link>
          (Bruce Momjian, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>O_DIRECT</> support to <link
-        linkend="pgtestfsync"><filename>contrib/pg_test_fsync</></link>
+        Add <literal>O_DIRECT</literal> support to <link
+        linkend="pgtestfsync"><filename>contrib/pg_test_fsync</filename></link>
         (Bruce Momjian)
        </para>
 
        <para>
-        This matches the use of <literal>O_DIRECT</> by <link
-        linkend="guc-wal-sync-method"><varname>wal_sync_method</></link>.
+        This matches the use of <literal>O_DIRECT</literal> by <link
+        linkend="guc-wal-sync-method"><varname>wal_sync_method</varname></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
          Add new tests to <link
-         linkend="pgtestfsync"><filename>contrib/pg_test_fsync</></link>
+         linkend="pgtestfsync"><filename>contrib/pg_test_fsync</filename></link>
          (Bruce Momjian)
        </para>
       </listitem>
@@ -11659,7 +11659,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-        Extensive <link linkend="ecpg"><application>ECPG</></link>
+        Extensive <link linkend="ecpg"><application>ECPG</application></link>
         documentation improvements (Satoshi Nagayasu)
       </para>
      </listitem>
@@ -11674,7 +11674,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
        Add documentation for <link
-       linkend="guc-exit-on-error"><varname>exit_on_error</></link>
+       linkend="guc-exit-on-error"><varname>exit_on_error</varname></link>
        (Robert Haas)
       </para>
 
@@ -11686,7 +11686,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
        Add documentation for <link
-       linkend="functions-info-catalog-table"><function>pg_options_to_table()</></link>
+       linkend="functions-info-catalog-table"><function>pg_options_to_table()</function></link>
        (Josh Berkus)
       </para>
 
@@ -11699,7 +11699,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
       <para>
        Document that it is possible to access all composite type
        fields using <link
-       linkend="field-selection"><literal>(compositeval).*</></link>
+       linkend="field-selection"><literal>(compositeval).*</literal></link>
        syntax (Peter Eisentraut)
       </para>
      </listitem>
@@ -11707,16 +11707,16 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
      <listitem>
       <para>
        Document that <link
-       linkend="functions-string-other"><function>translate()</></link>
-       removes characters in <literal>from</> that don't have a
-       corresponding <literal>to</> character (Josh Kupershmidt)
+       linkend="functions-string-other"><function>translate()</function></link>
+       removes characters in <literal>from</literal> that don't have a
+       corresponding <literal>to</literal> character (Josh Kupershmidt)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Merge documentation for <command>CREATE CONSTRAINT TRIGGER</> and <link
-       linkend="SQL-CREATETRIGGER"><command>CREATE TRIGGER</></link>
+       Merge documentation for <command>CREATE CONSTRAINT TRIGGER</command> and <link
+       linkend="sql-createtrigger"><command>CREATE TRIGGER</command></link>
        (Alvaro Herrera)
       </para>
      </listitem>
@@ -11741,12 +11741,12 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 
      <listitem>
       <para>
-       Handle non-ASCII characters consistently in <filename>HISTORY</> file
+       Handle non-ASCII characters consistently in <filename>HISTORY</filename> file
        (Peter Eisentraut)
       </para>
 
       <para>
-       While the <filename>HISTORY</> file is in English, we do have to deal
+       While the <filename>HISTORY</filename> file is in English, we do have to deal
        with non-ASCII letters in contributor names.  These are now
        transliterated so that they are reasonably legible without assumptions
        about character set.
diff --git a/doc/src/sgml/release-9.2.sgml b/doc/src/sgml/release-9.2.sgml
index 14fafc0e96..1f2240f158 100644
--- a/doc/src/sgml/release-9.2.sgml
+++ b/doc/src/sgml/release-9.2.sgml
@@ -1,6 +1,376 @@
 <!-- doc/src/sgml/release-9.2.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-2-24">
+  <title>Release 9.2.24</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.2.23.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2"/>.
+  </para>
+
+  <para>
+   This is expected to be the last <productname>PostgreSQL</productname>
+   release in the 9.2.X series.  Users are encouraged to update to a newer
+   release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.24</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.22,
+    see <xref linkend="release-9-2-22"/>.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-2-23">
+  <title>Release 9.2.23</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-31</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 9.2.22.
+   For information about new features in the 9.2 major release, see
+   <xref linkend="release-9-2"/>.
+  </para>
+
+  <para>
+   The <productname>PostgreSQL</productname> community will stop releasing updates
+   for the 9.2.X release series in September 2017.
+   Users are encouraged to update to a newer release branch soon.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.2.23</title>
+
+   <para>
+    A dump/restore is not required for those running 9.2.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.2.22,
+    see <xref linkend="release-9-2-22"/>.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Show foreign tables
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
+      view (Peter Eisentraut)
+     </para>
+
+     <para>
+      All other relevant <structname>information_schema</structname> views include
+      foreign tables, but this one ignored them.
+     </para>
+
+     <para>
+      Since this view definition is installed by <application>initdb</application>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can, as a superuser, do this
+      in <application>psql</application>:
+<programlisting>
+SET search_path TO information_schema;
+CREATE OR REPLACE VIEW table_privileges AS
+    SELECT CAST(u_grantor.rolname AS sql_identifier) AS grantor,
+           CAST(grantee.rolname AS sql_identifier) AS grantee,
+           CAST(current_database() AS sql_identifier) AS table_catalog,
+           CAST(nc.nspname AS sql_identifier) AS table_schema,
+           CAST(c.relname AS sql_identifier) AS table_name,
+           CAST(c.prtype AS character_data) AS privilege_type,
+           CAST(
+             CASE WHEN
+                  -- object owner always has grant options
+                  pg_has_role(grantee.oid, c.relowner, 'USAGE')
+                  OR c.grantable
+                  THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_grantable,
+           CAST(CASE WHEN c.prtype = 'SELECT' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS with_hierarchy
+
+    FROM (
+            SELECT oid, relname, relnamespace, relkind, relowner, (aclexplode(coalesce(relacl, acldefault('r', relowner)))).* FROM pg_class
+         ) AS c (oid, relname, relnamespace, relkind, relowner, grantor, grantee, prtype, grantable),
+         pg_namespace nc,
+         pg_authid u_grantor,
+         (
+           SELECT oid, rolname FROM pg_authid
+           UNION ALL
+           SELECT 0::oid, 'PUBLIC'
+         ) AS grantee (oid, rolname)
+
+    WHERE c.relnamespace = nc.oid
+          AND c.relkind IN ('r', 'v', 'f')
+          AND c.grantee = grantee.oid
+          AND c.grantor = u_grantor.oid
+          AND c.prtype IN ('INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER')
+          AND (pg_has_role(u_grantor.oid, 'USAGE')
+               OR pg_has_role(grantee.oid, 'USAGE')
+               OR grantee.rolname = 'PUBLIC');
+</programlisting>
+      This must be repeated in each database to be fixed,
+      including <literal>template0</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Clean up handling of a fatal exit (e.g., due to receipt
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
+     </para>
+
+     <para>
+      This situation could result in an assertion failure.  In production
+      builds, the exit would still occur, but it would log an unexpected
+      message about <quote>cannot drop active portal</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove assertion that could trigger during a fatal exit (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly identify columns that are of a range type or domain type over
+      a composite type or domain type being searched for (Tom Lane)
+     </para>
+
+     <para>
+      Certain <command>ALTER</command> commands that change the definition of a
+      composite type or domain type are supposed to fail if there are any
+      stored values of that type in the database, because they lack the
+      infrastructure needed to update or check such values.  Previously,
+      these checks could miss relevant values that are wrapped inside range
+      types or sub-domains, possibly allowing the database to become
+      inconsistent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
+      clauses without attached C variables (Michael Meskes)
+     </para>
+
+     <para>
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
+      rather than using it to define values to be returned to the client.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve selection of compiler flags for PL/Perl on Windows (Tom Lane)
+     </para>
+
+     <para>
+      This fix avoids possible crashes of PL/Perl due to inconsistent
+      assumptions about the width of <type>time_t</type> values.
+      A side-effect that may be visible to extension developers is
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-2-22">
   <title>Release 9.2.22</title>
 
@@ -12,11 +382,11 @@
   <para>
    This release contains a variety of fixes from 9.2.21.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.2.X release series in September 2017.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -35,7 +405,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.20,
-    see <xref linkend="release-9-2-20">.
+    see <xref linkend="release-9-2-20"/>.
    </para>
 
   </sect2>
@@ -48,7 +418,7 @@
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -56,11 +426,11 @@
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -75,15 +445,15 @@
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -114,15 +484,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -136,7 +506,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -150,16 +520,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -205,7 +575,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"/> on
       Solaris (Tom Lane)
      </para>
     </listitem>
@@ -237,28 +607,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -267,56 +637,56 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -327,22 +697,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -353,14 +723,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -371,21 +741,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -393,7 +763,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -405,8 +775,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"/> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -418,7 +788,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -438,27 +808,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -478,11 +848,11 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.2.20.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <para>
-   The <productname>PostgreSQL</> community will stop releasing updates
+   The <productname>PostgreSQL</productname> community will stop releasing updates
    for the 9.2.X release series in September 2017.
    Users are encouraged to update to a newer release branch soon.
   </para>
@@ -501,7 +871,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.20,
-    see <xref linkend="release-9-2-20">.
+    see <xref linkend="release-9-2-20"/>.
    </para>
 
   </sect2>
@@ -514,18 +884,18 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -536,7 +906,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       By itself, this patch will only fix the behavior in newly initdb'd
       databases.  If you wish to apply this change in an existing database,
       follow the corrected procedure shown in the changelog entry for
-      CVE-2017-7547, in <xref linkend="release-9-2-22">.
+      CVE-2017-7547, in <xref linkend="release-9-2-22"/>.
      </para>
     </listitem>
 
@@ -549,7 +919,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -563,7 +933,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -576,7 +946,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -584,7 +954,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -599,19 +969,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -619,27 +989,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -653,33 +1023,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -697,21 +1067,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -726,20 +1096,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -751,19 +1121,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
@@ -798,7 +1168,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -812,9 +1182,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -827,16 +1197,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
-      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones"/>).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
      </para>
@@ -858,7 +1228,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.2.19.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -876,7 +1246,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -889,15 +1259,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -906,13 +1276,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
-      Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      Previously, this was skipped when <xref linkend="guc-wal-level"/>
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -929,7 +1299,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      In corner cases, a spurious <quote>out-of-sequence TLI</> error
+      In corner cases, a spurious <quote>out-of-sequence TLI</quote> error
       could be reported during recovery.
      </para>
     </listitem>
@@ -975,13 +1345,13 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
      <para>
       Previously, non-default settings
-      of <xref linkend="guc-default-tablespace"> could result in broken
+      of <xref linkend="guc-default-tablespace"/> could result in broken
       indexes.
      </para>
     </listitem>
@@ -993,15 +1363,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1034,12 +1404,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1054,15 +1424,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1073,33 +1443,33 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1111,8 +1481,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1124,28 +1494,28 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1164,21 +1534,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1190,23 +1560,23 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1217,8 +1587,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
@@ -1245,7 +1615,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1270,7 +1640,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.18.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -1282,7 +1652,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -1320,71 +1690,71 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
-      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+      Fix <command>EXPLAIN</command> to emit valid XML when
+      <xref linkend="guc-track-io-timing"/> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -1406,7 +1776,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -1420,7 +1790,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -1431,30 +1801,30 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -1462,8 +1832,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -1484,17 +1854,17 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -1507,15 +1877,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -1536,7 +1906,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.17.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -1548,7 +1918,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -1561,17 +1931,17 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -1585,7 +1955,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -1594,22 +1964,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -1619,40 +1989,40 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -1663,12 +2033,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -1678,7 +2048,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -1691,19 +2061,19 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -1712,12 +2082,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -1725,8 +2095,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -1738,7 +2108,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -1773,8 +2143,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -1787,29 +2157,29 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -1843,7 +2213,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -1855,7 +2225,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -1877,7 +2247,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.16.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -1889,7 +2259,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -1911,7 +2281,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -1920,7 +2290,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -1934,10 +2304,10 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -1945,8 +2315,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -1958,28 +2328,28 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -1987,7 +2357,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
@@ -2008,22 +2378,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -2036,12 +2406,12 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -2049,9 +2419,9 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -2073,7 +2443,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.15.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -2085,7 +2455,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -2098,56 +2468,56 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -2173,27 +2543,27 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -2207,20 +2577,20 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
@@ -2241,21 +2611,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -2279,7 +2649,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.14.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -2291,7 +2661,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -2316,25 +2686,25 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -2343,7 +2713,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -2362,21 +2732,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -2385,7 +2755,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -2407,14 +2777,14 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -2466,7 +2836,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -2479,14 +2849,14 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -2499,7 +2869,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -2525,13 +2895,13 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -2539,15 +2909,15 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -2555,21 +2925,21 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -2577,23 +2947,23 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -2601,18 +2971,18 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -2622,44 +2992,44 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -2668,22 +3038,22 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -2691,29 +3061,29 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -2721,42 +3091,42 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -2768,19 +3138,19 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -2788,11 +3158,11 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -2801,7 +3171,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -2823,7 +3193,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
   <para>
    This release contains a variety of fixes from 9.2.13.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -2835,7 +3205,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -2847,8 +3217,8 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -2874,13 +3244,13 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -2898,7 +3268,7 @@ Branch: REL9_2_STABLE [38bec1805] 2017-01-25 07:02:25 +0900
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -2916,7 +3286,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      </para>
 
      <para>
-      This substantially improves performance when <application>pg_dump</>
+      This substantially improves performance when <application>pg_dump</application>
       tries to dump a large number of tables.
      </para>
     </listitem>
@@ -2931,13 +3301,13 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -2949,14 +3319,14 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -2964,21 +3334,21 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -2991,7 +3361,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -3043,22 +3413,22 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -3071,9 +3441,9 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -3081,7 +3451,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -3102,12 +3472,12 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -3127,7 +3497,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -3164,7 +3534,7 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -3172,44 +3542,44 @@ Branch: REL9_1_STABLE [9b1b9446f] 2015-08-27 12:22:10 -0400
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -3226,14 +3596,14 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <filename>contrib/sepgsql</>'s handling of <command>SELECT INTO</>
+      Fix <filename>contrib/sepgsql</filename>'s handling of <command>SELECT INTO</command>
       statements (Kohei KaiGai)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3241,64 +3611,64 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -3306,11 +3676,11 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -3319,18 +3689,18 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -3338,11 +3708,11 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -3350,14 +3720,14 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -3369,38 +3739,38 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -3420,7 +3790,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
   <para>
    This release contains a small number of fixes from 9.2.12.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -3432,7 +3802,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -3449,7 +3819,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -3460,13 +3830,13 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -3488,7 +3858,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
   <para>
    This release contains a small number of fixes from 9.2.11.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -3500,7 +3870,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.11,
-    see <xref linkend="release-9-2-11">.
+    see <xref linkend="release-9-2-11"/>.
    </para>
 
   </sect2>
@@ -3512,12 +3882,12 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -3531,36 +3901,36 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -3583,7 +3953,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
   <para>
    This release contains a variety of fixes from 9.2.10.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -3594,14 +3964,14 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.10,
-    see <xref linkend="release-9-2-10">.
+    see <xref linkend="release-9-2-10"/>.
    </para>
 
   </sect2>
@@ -3633,7 +4003,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -3643,7 +4013,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -3653,15 +4023,15 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -3670,16 +4040,16 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -3687,16 +4057,16 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -3738,7 +4108,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -3766,7 +4136,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -3774,7 +4144,7 @@ Branch: REL9_2_STABLE [e90a629e1] 2015-09-22 14:58:38 -0700
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -3795,14 +4165,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</> error
+      Avoid <quote>cannot GetMultiXactIdMembers() during recovery</quote> error
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -3822,19 +4192,19 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -3881,18 +4251,18 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -3905,20 +4275,20 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -3931,20 +4301,20 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -3952,14 +4322,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -3968,32 +4338,32 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -4006,38 +4376,38 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -4050,14 +4420,14 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -4069,7 +4439,7 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -4077,28 +4447,28 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -4106,8 +4476,8 @@ Branch: REL9_0_STABLE [850e1a566] 2015-05-18 17:44:21 -0300
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
@@ -4119,18 +4489,18 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix failure in <application>pg_receivexlog</> (Andres Freund)
+      Fix failure in <application>pg_receivexlog</application> (Andres Freund)
      </para>
 
      <para>
       A patch merge mistake in 9.2.10 led to <quote>could not create archive
-      status file</> errors.
+      status file</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -4142,7 +4512,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -4165,7 +4535,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.9.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -4177,16 +4547,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.9,
-    see <xref linkend="release-9-2-9">.
+    see <xref linkend="release-9-2-9"/>.
    </para>
 
   </sect2>
@@ -4198,15 +4568,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -4216,27 +4586,27 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -4244,12 +4614,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -4290,7 +4660,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -4315,35 +4685,35 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -4351,14 +4721,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Ensure that unlogged tables are copied correctly
-      during <command>CREATE DATABASE</> or <command>ALTER DATABASE SET
-      TABLESPACE</> (Pavan Deolasee, Andres Freund)
+      during <command>CREATE DATABASE</command> or <command>ALTER DATABASE SET
+      TABLESPACE</command> (Pavan Deolasee, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>DROP</>'s dependency searching to correctly handle the
+      Fix <command>DROP</command>'s dependency searching to correctly handle the
       case where a table column is recursively visited before its table
       (Petr Jelinek, Tom Lane)
      </para>
@@ -4366,7 +4736,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This case is only known to arise when an extension creates both a
       datatype and a table using that datatype.  The faulty code might
-      refuse a <command>DROP EXTENSION</> unless <literal>CASCADE</> is
+      refuse a <command>DROP EXTENSION</command> unless <literal>CASCADE</literal> is
       specified, which should not be required.
      </para>
     </listitem>
@@ -4378,22 +4748,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -4401,12 +4771,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -4416,7 +4786,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -4442,7 +4812,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -4455,19 +4825,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -4480,7 +4850,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Matching would often fail when the number of allowed iterations is
-      limited by a <literal>?</> quantifier or a bound expression.
+      limited by a <literal>?</literal> quantifier or a bound expression.
      </para>
     </listitem>
 
@@ -4499,7 +4869,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -4530,14 +4900,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -4551,7 +4921,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      In some contexts, constructs like <literal>row_to_json(tab.*)</> may
+      In some contexts, constructs like <literal>row_to_json(tab.*)</literal> may
       not produce the expected column names.  This is fixed properly as of
       9.4; in older branches, just ensure that we produce some nonempty
       name.  (In some cases this will be the underlying table's column name
@@ -4563,19 +4933,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix mishandling of system columns,
-      particularly <structfield>tableoid</>, in FDW queries (Etsuro Fujita)
+      particularly <structfield>tableoid</structfield>, in FDW queries (Etsuro Fujita)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid doing <literal><replaceable>indexed_column</> = ANY
-      (<replaceable>array</>)</literal> as an index qualifier if that leads
+      Avoid doing <literal><replaceable>indexed_column</replaceable> = ANY
+      (<replaceable>array</replaceable>)</literal> as an index qualifier if that leads
       to an inferior plan (Andrew Gierth)
      </para>
 
      <para>
-      In some cases, <literal>= ANY</> conditions applied to non-first index
+      In some cases, <literal>= ANY</literal> conditions applied to non-first index
       columns would be done as index conditions even though it would be
       better to use them as simple filter conditions.
      </para>
@@ -4584,7 +4954,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -4597,8 +4967,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -4624,7 +4994,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -4657,12 +5027,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
@@ -4676,7 +5046,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -4684,14 +5054,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -4700,7 +5070,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -4714,32 +5084,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -4747,14 +5117,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -4762,32 +5132,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -4797,7 +5167,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -4805,17 +5175,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -4823,16 +5193,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <application>pg_dump</> when the database
+      Improve performance of <application>pg_dump</application> when the database
       contains many instances of multiple dependency paths between the same
       two objects (Tom Lane)
      </para>
@@ -4840,7 +5210,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to restore its ability to dump from
+      Fix <application>pg_dumpall</application> to restore its ability to dump from
       pre-8.1 servers (Gilles Darold)
      </para>
     </listitem>
@@ -4854,28 +5224,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix failure of <filename>contrib/auto_explain</> to print per-node
-      timing information when doing <command>EXPLAIN ANALYZE</> (Tom Lane)
+      Fix failure of <filename>contrib/auto_explain</filename> to print per-node
+      timing information when doing <command>EXPLAIN ANALYZE</command> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix upgrade-from-unpackaged script for <filename>contrib/citext</>
+      Fix upgrade-from-unpackaged script for <filename>contrib/citext</filename>
       (Tom Lane)
      </para>
     </listitem>
@@ -4883,7 +5253,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -4895,7 +5265,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -4903,7 +5273,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix file descriptor leak in <filename>contrib/pg_test_fsync</>
+      Fix file descriptor leak in <filename>contrib/pg_test_fsync</filename>
       (Jeff Janes)
      </para>
 
@@ -4915,24 +5285,24 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -4940,7 +5310,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Mark some <filename>contrib</> I/O functions with correct volatility
+      Mark some <filename>contrib</filename> I/O functions with correct volatility
       properties (Tom Lane)
      </para>
 
@@ -4974,29 +5344,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -5008,15 +5378,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -5028,9 +5398,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -5039,21 +5409,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -5082,7 +5452,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.8.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -5100,7 +5470,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.6,
-    see <xref linkend="release-9-2-6">.
+    see <xref linkend="release-9-2-6"/>.
    </para>
 
   </sect2>
@@ -5112,15 +5482,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -5158,7 +5528,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix feedback status when <xref linkend="guc-hot-standby-feedback"> is
+      Fix feedback status when <xref linkend="guc-hot-standby-feedback"/> is
       turned off on-the-fly (Simon Riggs)
      </para>
     </listitem>
@@ -5166,7 +5536,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -5178,14 +5548,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This oversight could result in <quote>variable not found in subplan
-      target lists</> errors, or in silently wrong query results.
+      target lists</quote> errors, or in silently wrong query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failures
-      with <literal>UNION ALL</> over subqueries reading from tables with
+      Fix <quote>could not find pathkey item to sort</quote> planner failures
+      with <literal>UNION ALL</literal> over subqueries reading from tables with
       inheritance children (Tom Lane)
      </para>
     </listitem>
@@ -5206,7 +5576,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Improve planner to drop constant-NULL inputs
-      of <literal>AND</>/<literal>OR</> when possible (Tom Lane)
+      of <literal>AND</literal>/<literal>OR</literal> when possible (Tom Lane)
      </para>
 
      <para>
@@ -5218,13 +5588,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix identification of input type category in <function>to_json()</>
+      Fix identification of input type category in <function>to_json()</function>
       and friends (Tom Lane)
      </para>
 
      <para>
-      This is known to have led to inadequate quoting of <type>money</>
-      fields in the <type>JSON</> result, and there may have been wrong
+      This is known to have led to inadequate quoting of <type>money</type>
+      fields in the <type>JSON</type> result, and there may have been wrong
       results for other data types as well.
      </para>
     </listitem>
@@ -5239,13 +5609,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -5260,7 +5630,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -5273,14 +5643,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Prevent foreign tables from being created with OIDS
-      when <xref linkend="guc-default-with-oids"> is true
+      when <xref linkend="guc-default-with-oids"/> is true
       (Etsuro Fujita)
      </para>
     </listitem>
@@ -5294,19 +5664,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -5314,7 +5684,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -5326,14 +5696,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix client host name lookup when processing <filename>pg_hba.conf</>
+      Fix client host name lookup when processing <filename>pg_hba.conf</filename>
       entries that specify host names instead of IP addresses (Tom Lane)
      </para>
 
@@ -5347,21 +5717,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Allow the root user to use <literal>postgres -C variable</> and
-      <literal>postgres --describe-config</> (MauMau)
+      Allow the root user to use <literal>postgres -C variable</literal> and
+      <literal>postgres --describe-config</literal> (MauMau)
      </para>
 
      <para>
       The prohibition on starting the server as root does not need to extend
       to these operations, and relaxing it prevents failure
-      of <application>pg_ctl</> in some scenarios.
+      of <application>pg_ctl</application> in some scenarios.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -5370,16 +5740,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -5399,7 +5769,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       On Windows, allow new sessions to absorb values of PGC_BACKEND
-      parameters (such as <xref linkend="guc-log-connections">) from the
+      parameters (such as <xref linkend="guc-log-connections"/>) from the
       configuration file (Amit Kapila)
      </para>
 
@@ -5415,15 +5785,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -5434,17 +5804,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -5452,15 +5822,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -5468,52 +5838,52 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for cases where the new server creates
+      Fix <application>pg_upgrade</application> for cases where the new server creates
       a TOAST table but the old version did not (Bruce Momjian)
      </para>
 
      <para>
-      This rare situation would manifest as <quote>relation OID mismatch</>
+      This rare situation would manifest as <quote>relation OID mismatch</quote>
       errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <filename>contrib/auto_explain</> from changing the output of
-      a user's <command>EXPLAIN</> (Tom Lane)
+      Prevent <filename>contrib/auto_explain</filename> from changing the output of
+      a user's <command>EXPLAIN</command> (Tom Lane)
      </para>
 
      <para>
-      If <filename>auto_explain</> is active, it could cause
-      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</> command to nonetheless
+      If <filename>auto_explain</filename> is active, it could cause
+      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal> command to nonetheless
       print timing information.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in <filename>contrib/dblink</>
+      Fix query-lifespan memory leak in <filename>contrib/dblink</filename>
       (MauMau, Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -5522,27 +5892,27 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Prevent use of already-freed memory in
-      <filename>contrib/pgstattuple</>'s <function>pgstat_heap()</>
+      <filename>contrib/pgstattuple</filename>'s <function>pgstat_heap()</function>
       (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -5563,7 +5933,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.7.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -5575,7 +5945,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.6,
-    see <xref linkend="release-9-2-6">.
+    see <xref linkend="release-9-2-6"/>.
    </para>
 
   </sect2>
@@ -5602,7 +5972,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -5626,7 +5996,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -5639,17 +6009,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -5668,8 +6038,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>walsender</>'s failure to shut down cleanly when client
-      is <application>pg_receivexlog</> (Fujii Masao)
+      Fix <application>walsender</application>'s failure to shut down cleanly when client
+      is <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -5689,13 +6059,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
@@ -5708,13 +6078,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix tracking of <application>psql</> script line numbers
-      during <literal>\copy</> from out-of-line data
+      Fix tracking of <application>psql</application> script line numbers
+      during <literal>\copy</literal> from out-of-line data
       (Kumar Rajeev Rastogi, Amit Khandekar)
      </para>
 
      <para>
-      <literal>\copy ... from</> incremented the script file line number
+      <literal>\copy ... from</literal> incremented the script file line number
       for each data line, even if the data was not coming from the script
       file.  This mistake resulted in wrong line numbers being reported for
       any errors occurring later in the same script file.
@@ -5723,14 +6093,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -5752,7 +6122,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.6.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -5764,7 +6134,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.6,
-    see <xref linkend="release-9-2-6">.
+    see <xref linkend="release-9-2-6"/>.
    </para>
 
   </sect2>
@@ -5776,19 +6146,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -5801,7 +6171,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -5821,7 +6191,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -5835,12 +6205,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -5867,7 +6237,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -5879,35 +6249,35 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -5922,7 +6292,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -5942,20 +6312,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -5973,8 +6343,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      When <literal>pause_at_recovery_target</>
-      and <literal>recovery_target_inclusive</> are both set, ensure the
+      When <literal>pause_at_recovery_target</literal>
+      and <literal>recovery_target_inclusive</literal> are both set, ensure the
       target record is applied before pausing, not after (Heikki
       Linnakangas)
      </para>
@@ -5987,7 +6357,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
@@ -6000,19 +6370,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -6036,7 +6406,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -6056,7 +6426,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
@@ -6070,19 +6440,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>UPDATE/DELETE</> of an inherited target table
-      that has <literal>UNION ALL</> subqueries (Tom Lane)
+      Fix <literal>UPDATE/DELETE</literal> of an inherited target table
+      that has <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Without this fix, <literal>UNION ALL</> subqueries aren't correctly
+      Without this fix, <literal>UNION ALL</literal> subqueries aren't correctly
       inserted into the update plans for inheritance child tables after the
       first one, typically resulting in no update happening for those child
       table(s).
@@ -6091,12 +6461,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -6104,21 +6474,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -6150,12 +6520,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -6163,8 +6533,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix placement of permissions checks in <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> (Andres Freund, Magnus Hagander)
+      Fix placement of permissions checks in <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> (Andres Freund, Magnus Hagander)
      </para>
 
      <para>
@@ -6175,44 +6545,44 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <literal>*</>-qualification of named parameters in SQL-language
+      Fix <literal>*</literal>-qualification of named parameters in SQL-language
       functions (Tom Lane)
      </para>
 
      <para>
       Given a composite-type parameter
-      named <literal>foo</>, <literal>$1.*</> worked fine,
-      but <literal>foo.*</> not so much.
+      named <literal>foo</literal>, <literal>$1.*</literal> worked fine,
+      but <literal>foo.*</literal> not so much.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
@@ -6220,14 +6590,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix incorrect translation handling in
-      some <application>psql</> <literal>\d</> commands
+      some <application>psql</application> <literal>\d</literal> commands
       (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <application>pg_basebackup</>'s background process is killed
+      Ensure <application>pg_basebackup</application>'s background process is killed
       when exiting its foreground process (Magnus Hagander)
      </para>
     </listitem>
@@ -6235,7 +6605,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible incorrect printing of filenames
-      in <application>pg_basebackup</>'s verbose mode (Magnus Hagander)
+      in <application>pg_basebackup</application>'s verbose mode (Magnus Hagander)
      </para>
     </listitem>
 
@@ -6248,20 +6618,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -6272,15 +6642,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_stat_statement</>'s handling
-      of <literal>CURRENT_DATE</> and related constructs (Kyotaro
+      Fix <filename>contrib/pg_stat_statement</filename>'s handling
+      of <literal>CURRENT_DATE</literal> and related constructs (Kyotaro
       Horiguchi)
      </para>
     </listitem>
@@ -6294,28 +6664,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -6324,20 +6694,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -6359,7 +6729,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.5.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -6377,7 +6747,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.4,
-    see <xref linkend="release-9-2-4">.
+    see <xref linkend="release-9-2-4"/>.
    </para>
 
   </sect2>
@@ -6389,19 +6759,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
       need to happen before actual loss occurs, but it's not zero.  In 9.2.0
       and later, the probability of loss is higher, and it's also possible
-      to get <quote>could not access status of transaction</> errors as a
+      to get <quote>could not access status of transaction</quote> errors as a
       consequence of this bug.  Users upgrading from releases 9.0.4 or 8.4.8
       or earlier are not affected, but all later versions contain the bug.
      </para>
@@ -6409,18 +6779,18 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -6451,13 +6821,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This could lead to corruption of the lock data structures in shared
-      memory, causing <quote>lock already held</> and other odd errors.
+      memory, causing <quote>lock already held</quote> and other odd errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -6468,14 +6838,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure an anti-wraparound <command>VACUUM</> counts a page as scanned
+      Ensure an anti-wraparound <command>VACUUM</command> counts a page as scanned
       when it's only verified that no tuples need freezing (Sergey
       Burladyan, Jeff Janes)
      </para>
 
      <para>
       This bug could result in failing to
-      advance <structfield>relfrozenxid</>, so that the table would still be
+      advance <structfield>relfrozenxid</structfield>, so that the table would still be
       thought to need another anti-wraparound vacuum.  In the worst case the
       database might even shut down to prevent wraparound.
      </para>
@@ -6494,15 +6864,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <quote>unexpected spgdoinsert() failure</> error during SP-GiST
+      Fix <quote>unexpected spgdoinsert() failure</quote> error during SP-GiST
       index creation (Teodor Sigaev)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -6519,14 +6889,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect planning in cases where the same non-strict expression
-      appears in multiple <literal>WHERE</> and outer <literal>JOIN</>
+      appears in multiple <literal>WHERE</literal> and outer <literal>JOIN</literal>
       equality clauses (Tom Lane)
      </para>
     </listitem>
@@ -6594,13 +6964,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
@@ -6614,7 +6984,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -6628,7 +6998,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -6639,10 +7009,10 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -6652,28 +7022,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>ecpg</> search for quoted cursor names
+      Make <application>ecpg</application> search for quoted cursor names
       case-sensitively (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -6696,7 +7066,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.4.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -6708,7 +7078,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.4,
-    see <xref linkend="release-9-2-4">.
+    see <xref linkend="release-9-2-4"/>.
    </para>
 
   </sect2>
@@ -6725,7 +7095,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      <productname>PostgreSQL</> case-folds non-ASCII characters only
+      <productname>PostgreSQL</productname> case-folds non-ASCII characters only
       when using a single-byte server encoding.
      </para>
     </listitem>
@@ -6740,7 +7110,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix checkpoint memory leak in background writer when <literal>wal_level =
-      hot_standby</> (Naoya Anzai)
+      hot_standby</literal> (Naoya Anzai)
      </para>
     </listitem>
 
@@ -6753,7 +7123,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix memory overcommit bug when <varname>work_mem</> is using more
+      Fix memory overcommit bug when <varname>work_mem</varname> is using more
       than 24GB of memory (Stephen Frost)
      </para>
     </listitem>
@@ -6795,58 +7165,58 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      Previously tests like <literal>col IS NOT TRUE</> and <literal>col IS
-      NOT FALSE</> did not properly factor in NULL values when estimating
+      Previously tests like <literal>col IS NOT TRUE</literal> and <literal>col IS
+      NOT FALSE</literal> did not properly factor in NULL values when estimating
       plan costs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix accounting for qualifier evaluation costs in <literal>UNION ALL</>
+      Fix accounting for qualifier evaluation costs in <literal>UNION ALL</literal>
       and inheritance queries (Tom Lane)
      </para>
 
      <para>
       This fixes cases where suboptimal query plans could be chosen if
-      some <literal>WHERE</> clauses are expensive to calculate.
+      some <literal>WHERE</literal> clauses are expensive to calculate.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent pushing down <literal>WHERE</> clauses into unsafe
-      <literal>UNION/INTERSECT</> subqueries (Tom Lane)
+      Prevent pushing down <literal>WHERE</literal> clauses into unsafe
+      <literal>UNION/INTERSECT</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Subqueries of a <literal>UNION</> or <literal>INTERSECT</> that
+      Subqueries of a <literal>UNION</literal> or <literal>INTERSECT</literal> that
       contain set-returning functions or volatile functions in their
-      <literal>SELECT</> lists could be improperly optimized, leading to
+      <literal>SELECT</literal> lists could be improperly optimized, leading to
       run-time errors or incorrect query results.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare case of <quote>failed to locate grouping columns</>
+      Fix rare case of <quote>failed to locate grouping columns</quote>
       planner failure (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> of foreign tables with dropped columns (Andrew Dunstan)
+      Fix <application>pg_dump</application> of foreign tables with dropped columns (Andrew Dunstan)
      </para>
 
      <para>
-      Previously such cases could cause a <application>pg_upgrade</> error.
+      Previously such cases could cause a <application>pg_upgrade</application> error.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reorder <application>pg_dump</> processing of extension-related
+      Reorder <application>pg_dump</application> processing of extension-related
       rules and event triggers (Joe Conway)
      </para>
     </listitem>
@@ -6854,7 +7224,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Force dumping of extension tables if specified by <command>pg_dump
-      -t</> or <literal>-n</> (Joe Conway)
+      -t</command> or <literal>-n</literal> (Joe Conway)
      </para>
     </listitem>
 
@@ -6867,25 +7237,25 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>pg_restore -l</> with the directory archive to display
+      Fix <command>pg_restore -l</command> with the directory archive to display
       the correct format name (Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly record index comments created using <literal>UNIQUE</>
-      and <literal>PRIMARY KEY</> syntax (Andres Freund)
+      Properly record index comments created using <literal>UNIQUE</literal>
+      and <literal>PRIMARY KEY</literal> syntax (Andres Freund)
      </para>
 
      <para>
-      This fixes a parallel <application>pg_restore</> failure.
+      This fixes a parallel <application>pg_restore</application> failure.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Cause <command>pg_basebackup -x</> with an empty xlog directory
+      Cause <command>pg_basebackup -x</command> with an empty xlog directory
       to throw an error rather than crashing (Magnus Hagander, Haruka
       Takatsuka)
      </para>
@@ -6924,13 +7294,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REINDEX TABLE</> and <command>REINDEX DATABASE</>
+      Fix <command>REINDEX TABLE</command> and <command>REINDEX DATABASE</command>
       to properly revalidate constraints and mark invalidated indexes as
       valid (Noah Misch)
      </para>
 
      <para>
-      <command>REINDEX INDEX</> has always worked properly.
+      <command>REINDEX INDEX</command> has always worked properly.
      </para>
     </listitem>
 
@@ -6943,7 +7313,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible deadlock during concurrent <command>CREATE INDEX
-      CONCURRENTLY</> operations (Tom Lane)
+      CONCURRENTLY</command> operations (Tom Lane)
      </para>
     </listitem>
 
@@ -6955,7 +7325,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <function>regexp_matches()</> handling of zero-length matches
+      Fix <function>regexp_matches()</function> handling of zero-length matches
       (Jeevan Chalke)
      </para>
 
@@ -6979,14 +7349,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <command>ALTER DEFAULT PRIVILEGES</> to operate on schemas
+      Allow <command>ALTER DEFAULT PRIVILEGES</command> to operate on schemas
       without requiring CREATE permission (Tom Lane)
      </para>
     </listitem>
@@ -6998,31 +7368,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Specifically, lessen keyword restrictions for role names, language
-      names, <command>EXPLAIN</> and <command>COPY</> options, and
-      <command>SET</> values.  This allows <literal>COPY ... (FORMAT
-      BINARY)</> to work as expected; previously <literal>BINARY</> needed
+      names, <command>EXPLAIN</command> and <command>COPY</command> options, and
+      <command>SET</command> values.  This allows <literal>COPY ... (FORMAT
+      BINARY)</literal> to work as expected; previously <literal>BINARY</literal> needed
       to be quoted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Print proper line number during <command>COPY</> failure (Heikki
+      Print proper line number during <command>COPY</command> failure (Heikki
       Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pgp_pub_decrypt()</> so it works for secret keys with
+      Fix <function>pgp_pub_decrypt()</function> so it works for secret keys with
       passwords (Marko Kreen)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_upgrade</> use <literal>pg_dump
-      --quote-all-identifiers</> to avoid problems with keyword changes
+      Make <application>pg_upgrade</application> use <literal>pg_dump
+      --quote-all-identifiers</literal> to avoid problems with keyword changes
       between releases (Tom Lane)
      </para>
     </listitem>
@@ -7036,7 +7406,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <command>VACUUM ANALYZE</> still runs the ANALYZE phase
+      Ensure that <command>VACUUM ANALYZE</command> still runs the ANALYZE phase
       if its attempt to truncate the file is cancelled due to lock conflicts
       (Kevin Grittner)
      </para>
@@ -7045,28 +7415,28 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Avoid possible failure when performing transaction control commands (e.g
-      <command>ROLLBACK</>) in prepared queries (Tom Lane)
+      <command>ROLLBACK</command>) in prepared queries (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that floating-point data input accepts standard spellings
-      of <quote>infinity</> on all platforms (Tom Lane)
+      of <quote>infinity</quote> on all platforms (Tom Lane)
      </para>
 
      <para>
-      The C99 standard says that allowable spellings are <literal>inf</>,
-      <literal>+inf</>, <literal>-inf</>, <literal>infinity</>,
-      <literal>+infinity</>, and <literal>-infinity</>.  Make sure we
-      recognize these even if the platform's <function>strtod</> function
+      The C99 standard says that allowable spellings are <literal>inf</literal>,
+      <literal>+inf</literal>, <literal>-inf</literal>, <literal>infinity</literal>,
+      <literal>+infinity</literal>, and <literal>-infinity</literal>.  Make sure we
+      recognize these even if the platform's <function>strtod</function> function
       doesn't.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid unnecessary reporting when <varname>track_activities</> is off
+      Avoid unnecessary reporting when <varname>track_activities</varname> is off
       (Tom Lane)
      </para>
     </listitem>
@@ -7080,7 +7450,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent crash when <application>psql</>'s <envar>PSQLRC</> variable
+      Prevent crash when <application>psql</application>'s <envar>PSQLRC</envar> variable
       contains a tilde (Bruce Momjian)
      </para>
     </listitem>
@@ -7093,7 +7463,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013d
+      Update time zone data files to <application>tzdata</application> release 2013d
       for DST law changes in Israel, Morocco, Palestine, and Paraguay.
       Also, historical zone data corrections for Macquarie Island.
      </para>
@@ -7115,7 +7485,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.3.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -7128,13 +7498,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    <para>
     However, this release corrects several errors in management of GiST
     indexes.  After installing this update, it is advisable to
-    <command>REINDEX</> any GiST indexes that meet one or more of the
+    <command>REINDEX</command> any GiST indexes that meet one or more of the
     conditions described below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.2.2,
-    see <xref linkend="release-9-2-2">.
+    see <xref linkend="release-9-2-2"/>.
    </para>
 
   </sect2>
@@ -7152,7 +7522,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A connection request containing a database name that begins with
-      <quote><literal>-</></quote> could be crafted to damage or destroy
+      <quote><literal>-</literal></quote> could be crafted to damage or destroy
       files within the server's data directory, even if the request is
       eventually rejected.  (CVE-2013-1899)
      </para>
@@ -7166,9 +7536,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This avoids a scenario wherein random numbers generated by
-      <filename>contrib/pgcrypto</> functions might be relatively easy for
+      <filename>contrib/pgcrypto</filename> functions might be relatively easy for
       another database user to guess.  The risk is only significant when
-      the postmaster is configured with <varname>ssl</> = <literal>on</>
+      the postmaster is configured with <varname>ssl</varname> = <literal>on</literal>
       but most connections don't use SSL encryption.  (CVE-2013-1900)
      </para>
     </listitem>
@@ -7181,7 +7551,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       An unprivileged database user could exploit this mistake to call
-      <function>pg_start_backup()</> or <function>pg_stop_backup()</>,
+      <function>pg_start_backup()</function> or <function>pg_stop_backup()</function>,
       thus possibly interfering with creation of routine backups.
       (CVE-2013-1901)
      </para>
@@ -7189,32 +7559,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix GiST indexes to not use <quote>fuzzy</> geometric comparisons when
+      Fix GiST indexes to not use <quote>fuzzy</quote> geometric comparisons when
       it's not appropriate to do so (Alexander Korotkov)
      </para>
 
      <para>
-      The core geometric types perform comparisons using <quote>fuzzy</>
-      equality, but <function>gist_box_same</> must do exact comparisons,
+      The core geometric types perform comparisons using <quote>fuzzy</quote>
+      equality, but <function>gist_box_same</function> must do exact comparisons,
       else GiST indexes using it might become inconsistent.  After installing
-      this update, users should <command>REINDEX</> any GiST indexes on
-      <type>box</>, <type>polygon</>, <type>circle</>, or <type>point</>
-      columns, since all of these use <function>gist_box_same</>.
+      this update, users should <command>REINDEX</command> any GiST indexes on
+      <type>box</type>, <type>polygon</type>, <type>circle</type>, or <type>point</type>
+      columns, since all of these use <function>gist_box_same</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix erroneous range-union and penalty logic in GiST indexes that use
-      <filename>contrib/btree_gist</> for variable-width data types, that is
-      <type>text</>, <type>bytea</>, <type>bit</>, and <type>numeric</>
+      <filename>contrib/btree_gist</filename> for variable-width data types, that is
+      <type>text</type>, <type>bytea</type>, <type>bit</type>, and <type>numeric</type>
       columns (Tom Lane)
      </para>
 
      <para>
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in useless
-      index bloat.  Users are advised to <command>REINDEX</> such indexes
+      index bloat.  Users are advised to <command>REINDEX</command> such indexes
       after installing this update.
      </para>
     </listitem>
@@ -7229,21 +7599,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       These errors could result in inconsistent indexes in which some keys
       that are present would not be found by searches, and also in indexes
       that are unnecessarily inefficient to search.  Users are advised to
-      <command>REINDEX</> multi-column GiST indexes after installing this
+      <command>REINDEX</command> multi-column GiST indexes after installing this
       update.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>gist_point_consistent</>
+      Fix <function>gist_point_consistent</function>
       to handle fuzziness consistently (Alexander Korotkov)
      </para>
 
      <para>
-      Index scans on GiST indexes on <type>point</> columns would sometimes
+      Index scans on GiST indexes on <type>point</type> columns would sometimes
       yield results different from a sequential scan, because
-      <function>gist_point_consistent</> disagreed with the underlying
+      <function>gist_point_consistent</function> disagreed with the underlying
       operator code about whether to do comparisons exactly or fuzzily.
      </para>
     </listitem>
@@ -7254,7 +7624,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This bug could result in <quote>incorrect local pin count</> errors
+      This bug could result in <quote>incorrect local pin count</quote> errors
       during replay, making recovery impossible.
      </para>
     </listitem>
@@ -7262,7 +7632,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Ensure we do crash recovery before entering archive recovery, if the
-      database was not stopped cleanly and a <filename>recovery.conf</> file
+      database was not stopped cleanly and a <filename>recovery.conf</filename> file
       is present (Heikki Linnakangas, Kyotaro Horiguchi, Mitsumasa Kondo)
      </para>
 
@@ -7282,14 +7652,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix race condition in <command>DELETE RETURNING</> (Tom Lane)
+      Fix race condition in <command>DELETE RETURNING</command> (Tom Lane)
      </para>
 
      <para>
-      Under the right circumstances, <command>DELETE RETURNING</> could
+      Under the right circumstances, <command>DELETE RETURNING</command> could
       attempt to fetch data from a shared buffer that the current process
       no longer has any pin on.  If some other process changed the buffer
-      meanwhile, this would lead to garbage <literal>RETURNING</> output, or
+      meanwhile, this would lead to garbage <literal>RETURNING</literal> output, or
       even a crash.
      </para>
     </listitem>
@@ -7310,20 +7680,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <function>to_char()</> to use ASCII-only case-folding rules where
+      Fix <function>to_char()</function> to use ASCII-only case-folding rules where
       appropriate (Tom Lane)
      </para>
 
      <para>
       This fixes misbehavior of some template patterns that should be
-      locale-independent, but mishandled <quote><literal>I</></quote> and
-      <quote><literal>i</></quote> in Turkish locales.
+      locale-independent, but mishandled <quote><literal>I</literal></quote> and
+      <quote><literal>i</literal></quote> in Turkish locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</>
+      Fix unwanted rejection of timestamp <literal>1999-12-31 24:00:00</literal>
       (Tom Lane)
      </para>
     </listitem>
@@ -7337,8 +7707,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix logic error when a single transaction does <command>UNLISTEN</>
-      then <command>LISTEN</> (Tom Lane)
+      Fix logic error when a single transaction does <command>UNLISTEN</command>
+      then <command>LISTEN</command> (Tom Lane)
      </para>
 
      <para>
@@ -7356,14 +7726,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix performance issue in <literal>EXPLAIN (ANALYZE, TIMING OFF)</>
+      Fix performance issue in <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal>
       (Pavel Stehule)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove useless <quote>picksplit doesn't support secondary split</> log
+      Remove useless <quote>picksplit doesn't support secondary split</quote> log
       messages (Josh Hansen, Tom Lane)
      </para>
 
@@ -7378,7 +7748,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Remove vestigial secondary-split support in
-      <function>gist_box_picksplit()</> (Tom Lane)
+      <function>gist_box_picksplit()</function> (Tom Lane)
      </para>
 
      <para>
@@ -7397,29 +7767,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</> function
+      Eliminate memory leaks in PL/Perl's <function>spi_prepare()</function> function
       (Alex Hunsaker, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to handle database names containing
-      <quote><literal>=</></quote> correctly (Heikki Linnakangas)
+      Fix <application>pg_dumpall</application> to handle database names containing
+      <quote><literal>=</literal></quote> correctly (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <application>pg_dump</> when an incorrect connection
+      Avoid crash in <application>pg_dump</application> when an incorrect connection
       string is given (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore invalid indexes in <application>pg_dump</> and
-      <application>pg_upgrade</> (Michael Paquier, Bruce Momjian)
+      Ignore invalid indexes in <application>pg_dump</application> and
+      <application>pg_upgrade</application> (Michael Paquier, Bruce Momjian)
      </para>
 
      <para>
@@ -7428,15 +7798,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       a uniqueness condition not satisfied by the table's data.  Also, if the
       index creation is in fact still in progress, it seems reasonable to
       consider it to be an uncommitted DDL change, which
-      <application>pg_dump</> wouldn't be expected to dump anyway.
-      <application>pg_upgrade</> now also skips invalid indexes rather than
+      <application>pg_dump</application> wouldn't be expected to dump anyway.
+      <application>pg_upgrade</application> now also skips invalid indexes rather than
       failing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_basebackup</>, include only the current server
+      In <application>pg_basebackup</application>, include only the current server
       version's subdirectory when backing up a tablespace (Heikki
       Linnakangas)
      </para>
@@ -7444,16 +7814,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Add a server version check in <application>pg_basebackup</> and
-      <application>pg_receivexlog</>, so they fail cleanly with version
+      Add a server version check in <application>pg_basebackup</application> and
+      <application>pg_receivexlog</application>, so they fail cleanly with version
       combinations that won't work (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/dblink</> to handle inconsistent settings of
-      <varname>DateStyle</> or <varname>IntervalStyle</> safely (Daniel
+      Fix <filename>contrib/dblink</filename> to handle inconsistent settings of
+      <varname>DateStyle</varname> or <varname>IntervalStyle</varname> safely (Daniel
       Farina, Tom Lane)
      </para>
 
@@ -7461,7 +7831,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       Previously, if the remote server had different settings of these
       parameters, ambiguous dates might be read incorrectly.  This fix
       ensures that datetime and interval columns fetched by a
-      <filename>dblink</> query will be interpreted correctly.  Note however
+      <filename>dblink</filename> query will be interpreted correctly.  Note however
       that inconsistent settings are still risky, since literal values
       appearing in SQL commands sent to the remote server might be
       interpreted differently than they would be locally.
@@ -7470,25 +7840,25 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s <function>similarity()</> function
+      Fix <filename>contrib/pg_trgm</filename>'s <function>similarity()</function> function
       to return zero for trigram-less strings (Tom Lane)
      </para>
 
      <para>
-      Previously it returned <literal>NaN</> due to internal division by zero.
+      Previously it returned <literal>NaN</literal> due to internal division by zero.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Enable building <productname>PostgreSQL</> with Microsoft Visual
+      Enable building <productname>PostgreSQL</productname> with Microsoft Visual
       Studio 2012 (Brar Piening, Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013b
+      Update time zone data files to <application>tzdata</application> release 2013b
       for DST law changes in Chile, Haiti, Morocco, Paraguay, and some
       Russian areas.  Also, historical zone data corrections for numerous
       places.
@@ -7496,12 +7866,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Also, update the time zone abbreviation files for recent changes in
-      Russia and elsewhere: <literal>CHOT</>, <literal>GET</>,
-      <literal>IRKT</>, <literal>KGT</>, <literal>KRAT</>, <literal>MAGT</>,
-      <literal>MAWT</>, <literal>MSK</>, <literal>NOVT</>, <literal>OMST</>,
-      <literal>TKT</>, <literal>VLAT</>, <literal>WST</>, <literal>YAKT</>,
-      <literal>YEKT</> now follow their current meanings, and
-      <literal>VOLT</> (Europe/Volgograd) and <literal>MIST</>
+      Russia and elsewhere: <literal>CHOT</literal>, <literal>GET</literal>,
+      <literal>IRKT</literal>, <literal>KGT</literal>, <literal>KRAT</literal>, <literal>MAGT</literal>,
+      <literal>MAWT</literal>, <literal>MSK</literal>, <literal>NOVT</literal>, <literal>OMST</literal>,
+      <literal>TKT</literal>, <literal>VLAT</literal>, <literal>WST</literal>, <literal>YAKT</literal>,
+      <literal>YEKT</literal> now follow their current meanings, and
+      <literal>VOLT</literal> (Europe/Volgograd) and <literal>MIST</literal>
       (Antarctica/Macquarie) are added to the default abbreviations list.
      </para>
     </listitem>
@@ -7522,7 +7892,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.2.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -7534,7 +7904,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
    <para>
     However, if you are upgrading from a version earlier than 9.2.2,
-    see <xref linkend="release-9-2-2">.
+    see <xref linkend="release-9-2-2"/>.
    </para>
 
   </sect2>
@@ -7546,7 +7916,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent execution of <function>enum_recv</> from SQL (Tom Lane)
+      Prevent execution of <function>enum_recv</function> from SQL (Tom Lane)
      </para>
 
      <para>
@@ -7573,7 +7943,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This mistake could result in incorrect <quote>WAL ends before end of
-      online backup</> errors.
+      online backup</quote> errors.
      </para>
     </listitem>
 
@@ -7655,8 +8025,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Improve performance of <function>SPI_execute</> and related
-      functions, thereby improving PL/pgSQL's <literal>EXECUTE</>
+      Improve performance of <function>SPI_execute</function> and related
+      functions, thereby improving PL/pgSQL's <literal>EXECUTE</literal>
       (Heikki Linnakangas, Tom Lane)
      </para>
 
@@ -7691,20 +8061,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix intermittent crash in <literal>DROP INDEX CONCURRENTLY</> (Tom Lane)
+      Fix intermittent crash in <literal>DROP INDEX CONCURRENTLY</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix potential corruption of shared-memory lock table during
-      <command>CREATE/DROP INDEX CONCURRENTLY</> (Tom Lane)
+      <command>CREATE/DROP INDEX CONCURRENTLY</command> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>COPY</>'s multiple-tuple-insertion code for the case of
+      Fix <command>COPY</command>'s multiple-tuple-insertion code for the case of
       a tuple larger than page size minus fillfactor (Heikki Linnakangas)
      </para>
 
@@ -7716,19 +8086,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Protect against race conditions when scanning
-      <structname>pg_tablespace</> (Stephen Frost, Tom Lane)
+      <structname>pg_tablespace</structname> (Stephen Frost, Tom Lane)
      </para>
 
      <para>
-      <command>CREATE DATABASE</> and <command>DROP DATABASE</> could
+      <command>CREATE DATABASE</command> and <command>DROP DATABASE</command> could
       misbehave if there were concurrent updates of
-      <structname>pg_tablespace</> entries.
+      <structname>pg_tablespace</structname> entries.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>DROP OWNED</> from trying to drop whole databases or
+      Prevent <command>DROP OWNED</command> from trying to drop whole databases or
       tablespaces (&Aacute;lvaro Herrera)
      </para>
 
@@ -7740,13 +8110,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix error in <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       implementation (Andres Freund)
      </para>
 
      <para>
       In installations that have existed for more than <link
-      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</></link>
+      linkend="guc-vacuum-freeze-min-age"><varname>vacuum_freeze_min_age</varname></link>
       transactions, this mistake prevented autovacuum from using partial-table
       scans, so that a full-table scan would always happen instead.
      </para>
@@ -7754,13 +8124,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Prevent misbehavior when a <symbol>RowExpr</> or <symbol>XmlExpr</>
+      Prevent misbehavior when a <symbol>RowExpr</symbol> or <symbol>XmlExpr</symbol>
       is parse-analyzed twice (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This mistake could be user-visible in contexts such as
-      <literal>CREATE TABLE LIKE INCLUDING INDEXES</>.
+      <literal>CREATE TABLE LIKE INCLUDING INDEXES</literal>.
      </para>
     </listitem>
 
@@ -7778,7 +8148,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       There were some issues with default privileges for types, and
-      <application>pg_dump</> failed to dump such privileges at all.
+      <application>pg_dump</application> failed to dump such privileges at all.
      </para>
     </listitem>
 
@@ -7798,13 +8168,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Reject out-of-range dates in <function>to_date()</> (Hitoshi Harada)
+      Reject out-of-range dates in <function>to_date()</function> (Hitoshi Harada)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_extension_config_dump()</> to handle
+      Fix <function>pg_extension_config_dump()</function> to handle
       extension-update cases properly (Tom Lane)
      </para>
 
@@ -7822,7 +8192,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       The previous coding resulted in sometimes omitting the first line in
-      the <literal>CONTEXT</> traceback for the error.
+      the <literal>CONTEXT</literal> traceback for the error.
      </para>
     </listitem>
 
@@ -7840,13 +8210,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This bug affected <application>psql</> and some other client programs.
+      This bug affected <application>psql</application> and some other client programs.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</>'s <command>\?</> command
+      Fix possible crash in <application>psql</application>'s <command>\?</command> command
       when not connected to a database (Meng Qingzhong)
      </para>
     </listitem>
@@ -7854,74 +8224,74 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible error if a relation file is removed while
-      <application>pg_basebackup</> is running (Heikki Linnakangas)
+      <application>pg_basebackup</application> is running (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Tolerate timeline switches while <literal>pg_basebackup -X fetch</>
+      Tolerate timeline switches while <literal>pg_basebackup -X fetch</literal>
       is backing up a standby server (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> exclude data of unlogged tables when
+      Make <application>pg_dump</application> exclude data of unlogged tables when
       running on a hot-standby server (Magnus Hagander)
      </para>
 
      <para>
       This would fail anyway because the data is not available on the standby
       server, so it seems most convenient to assume
-      <option>--no-unlogged-table-data</> automatically.
+      <option>--no-unlogged-table-data</option> automatically.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to deal with invalid indexes safely
+      Fix <application>pg_upgrade</application> to deal with invalid indexes safely
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s -O/-o options (Marti Raudsepp)
+      Fix <application>pg_upgrade</application>'s -O/-o options (Marti Raudsepp)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <application>libpq</>'s
-      <function>PQprintTuples</> (Xi Wang)
+      Fix one-byte buffer overrun in <application>libpq</application>'s
+      <function>PQprintTuples</function> (Xi Wang)
      </para>
 
      <para>
       This ancient function is not used anywhere by
-      <productname>PostgreSQL</> itself, but it might still be used by some
+      <productname>PostgreSQL</productname> itself, but it might still be used by some
       client code.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpglib</> use translated messages properly
+      Make <application>ecpglib</application> use translated messages properly
       (Chen Huajun)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Properly install <application>ecpg_compat</> and
-      <application>pgtypes</> libraries on MSVC (Jiang Guiqing)
+      Properly install <application>ecpg_compat</application> and
+      <application>pgtypes</application> libraries on MSVC (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Include our version of <function>isinf()</> in
-      <application>libecpg</> if it's not provided by the system
+      Include our version of <function>isinf()</function> in
+      <application>libecpg</application> if it's not provided by the system
       (Jiang Guiqing)
      </para>
     </listitem>
@@ -7941,15 +8311,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>pgxs</> build executables with the right
-      <literal>.exe</> suffix when cross-compiling for Windows
+      Make <application>pgxs</application> build executables with the right
+      <literal>.exe</literal> suffix when cross-compiling for Windows
       (Zoltan Boszormenyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add new timezone abbreviation <literal>FET</> (Tom Lane)
+      Add new timezone abbreviation <literal>FET</literal> (Tom Lane)
      </para>
 
      <para>
@@ -7973,7 +8343,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.1.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -7984,14 +8354,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </para>
 
    <para>
-    However, you may need to perform <command>REINDEX</> operations to
+    However, you may need to perform <command>REINDEX</command> operations to
     correct problems in concurrently-built indexes, as described in the first
     changelog item below.
    </para>
 
    <para>
     Also, if you are upgrading from version 9.2.0,
-    see <xref linkend="release-9-2-1">.
+    see <xref linkend="release-9-2-1"/>.
    </para>
 
   </sect2>
@@ -8004,22 +8374,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix multiple bugs associated with <command>CREATE/DROP INDEX
-      CONCURRENTLY</> (Andres Freund, Tom Lane, Simon Riggs, Pavan Deolasee)
+      CONCURRENTLY</command> (Andres Freund, Tom Lane, Simon Riggs, Pavan Deolasee)
      </para>
 
      <para>
-      An error introduced while adding <command>DROP INDEX CONCURRENTLY</>
+      An error introduced while adding <command>DROP INDEX CONCURRENTLY</command>
       allowed incorrect indexing decisions to be made during the initial
-      phase of <command>CREATE INDEX CONCURRENTLY</>; so that indexes built
+      phase of <command>CREATE INDEX CONCURRENTLY</command>; so that indexes built
       by that command could be corrupt.  It is recommended that indexes
-      built in 9.2.X with <command>CREATE INDEX CONCURRENTLY</> be rebuilt
+      built in 9.2.X with <command>CREATE INDEX CONCURRENTLY</command> be rebuilt
       after applying this update.
      </para>
 
      <para>
-      In addition, fix <command>CREATE/DROP INDEX CONCURRENTLY</> to use
+      In addition, fix <command>CREATE/DROP INDEX CONCURRENTLY</command> to use
       in-place updates when changing the state of an index's
-      <structname>pg_index</> row.  This prevents race conditions that could
+      <structname>pg_index</structname> row.  This prevents race conditions that could
       cause concurrent sessions to miss updating the target index, thus
       again resulting in corrupt concurrently-created indexes.
      </para>
@@ -8027,33 +8397,33 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       Also, fix various other operations to ensure that they ignore
       invalid indexes resulting from a failed <command>CREATE INDEX
-      CONCURRENTLY</> command.  The most important of these is
-      <command>VACUUM</>, because an auto-vacuum could easily be launched
+      CONCURRENTLY</command> command.  The most important of these is
+      <command>VACUUM</command>, because an auto-vacuum could easily be launched
       on the table before corrective action can be taken to fix or remove
       the invalid index.
      </para>
 
      <para>
-      Also fix <command>DROP INDEX CONCURRENTLY</> to not disable
+      Also fix <command>DROP INDEX CONCURRENTLY</command> to not disable
       insertions into the target index until all queries using it are done.
      </para>
 
      <para>
-      Also fix misbehavior if <command>DROP INDEX CONCURRENTLY</> is
+      Also fix misbehavior if <command>DROP INDEX CONCURRENTLY</command> is
       canceled: the previous coding could leave an un-droppable index behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correct predicate locking for <command>DROP INDEX CONCURRENTLY</>
+      Correct predicate locking for <command>DROP INDEX CONCURRENTLY</command>
       (Kevin Grittner)
      </para>
 
      <para>
       Previously, SSI predicate locks were processed at the wrong time,
       possibly leading to incorrect behavior of serializable transactions
-      executing in parallel with the <command>DROP</>.
+      executing in parallel with the <command>DROP</command>.
      </para>
     </listitem>
 
@@ -8111,13 +8481,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This oversight could prevent subsequent execution of certain
-      operations such as <command>CREATE INDEX CONCURRENTLY</>.
+      operations such as <command>CREATE INDEX CONCURRENTLY</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid bogus <quote>out-of-sequence timeline ID</> errors in standby
+      Avoid bogus <quote>out-of-sequence timeline ID</quote> errors in standby
       mode (Heikki Linnakangas)
      </para>
     </listitem>
@@ -8137,20 +8507,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix the syslogger process to not fail when
-      <varname>log_rotation_age</> exceeds 2^31 milliseconds (about 25 days)
+      <varname>log_rotation_age</varname> exceeds 2^31 milliseconds (about 25 days)
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>WaitLatch()</> to return promptly when the requested
+      Fix <function>WaitLatch()</function> to return promptly when the requested
       timeout expires (Jeff Janes, Tom Lane)
      </para>
 
      <para>
       With the previous coding, a steady stream of non-wait-terminating
-      interrupts could delay return from <function>WaitLatch()</>
+      interrupts could delay return from <function>WaitLatch()</function>
       indefinitely.  This has been shown to be a problem for the autovacuum
       launcher process, and might cause trouble elsewhere as well.
      </para>
@@ -8203,8 +8573,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       The planner could derive incorrect constraints from a clause equating
       a non-strict construct to something else, for example
-      <literal>WHERE COALESCE(foo, 0) = 0</>
-      when <literal>foo</> is coming from the nullable side of an outer join.
+      <literal>WHERE COALESCE(foo, 0) = 0</literal>
+      when <literal>foo</literal> is coming from the nullable side of an outer join.
       9.2 showed this type of error in more cases than previous releases,
       but the basic bug has been there for a long time.
      </para>
@@ -8212,13 +8582,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>SELECT DISTINCT</> with index-optimized
-      <function>MIN</>/<function>MAX</> on an inheritance tree (Tom Lane)
+      Fix <command>SELECT DISTINCT</command> with index-optimized
+      <function>MIN</function>/<function>MAX</function> on an inheritance tree (Tom Lane)
      </para>
 
      <para>
       The planner would fail with <quote>failed to re-find MinMaxAggInfo
-      record</> given this combination of factors.
+      record</quote> given this combination of factors.
      </para>
     </listitem>
 
@@ -8238,7 +8608,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A strict join clause can be sufficient to establish an
-      <replaceable>x</> <literal>IS NOT NULL</> predicate, for example.
+      <replaceable>x</replaceable> <literal>IS NOT NULL</literal> predicate, for example.
       This fixes a planner regression in 9.2, since previous versions could
       make comparable deductions.
      </para>
@@ -8265,10 +8635,10 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      </para>
 
      <para>
-      This affects multicolumn <literal>NOT IN</> subplans, such as
-      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</>
-      when for instance <literal>b</> and <literal>y</> are <type>int4</>
-      and <type>int8</> respectively.  This mistake led to wrong answers
+      This affects multicolumn <literal>NOT IN</literal> subplans, such as
+      <literal>WHERE (a, b) NOT IN (SELECT x, y FROM ...)</literal>
+      when for instance <literal>b</literal> and <literal>y</literal> are <type>int4</type>
+      and <type>int8</type> respectively.  This mistake led to wrong answers
       or crashes depending on the specific datatypes involved.
      </para>
     </listitem>
@@ -8281,8 +8651,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       This oversight could result in wrong answers from merge joins whose
       inner side is an index scan using an
-      <literal><replaceable>indexed_column</> =
-      ANY(<replaceable>array</>)</literal> condition.
+      <literal><replaceable>indexed_column</replaceable> =
+      ANY(<replaceable>array</replaceable>)</literal> condition.
      </para>
     </listitem>
 
@@ -8306,12 +8676,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Acquire buffer lock when re-fetching the old tuple for an
-      <literal>AFTER ROW UPDATE/DELETE</> trigger (Andres Freund)
+      <literal>AFTER ROW UPDATE/DELETE</literal> trigger (Andres Freund)
      </para>
 
      <para>
       In very unusual circumstances, this oversight could result in passing
-      incorrect data to a trigger <literal>WHEN</> condition, or to the
+      incorrect data to a trigger <literal>WHEN</literal> condition, or to the
       precheck logic for a foreign-key enforcement trigger.  That could
       result in a crash, or in an incorrect decision about whether to
       fire the trigger.
@@ -8320,7 +8690,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to handle inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to handle inherited check
       constraints properly (Pavan Deolasee)
      </para>
 
@@ -8332,7 +8702,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER EXTENSION SET SCHEMA</>'s failure  to move some
+      Fix <command>ALTER EXTENSION SET SCHEMA</command>'s failure  to move some
       subsidiary objects into the new schema (&Aacute;lvaro Herrera, Dimitri
       Fontaine)
      </para>
@@ -8340,7 +8710,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Handle <command>CREATE TABLE AS EXECUTE</> correctly in extended query
+      Handle <command>CREATE TABLE AS EXECUTE</command> correctly in extended query
       protocol (Tom Lane)
      </para>
     </listitem>
@@ -8348,7 +8718,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Don't modify the input parse tree in <command>DROP RULE IF NOT
-      EXISTS</> and <command>DROP TRIGGER IF NOT EXISTS</> (Tom Lane)
+      EXISTS</command> and <command>DROP TRIGGER IF NOT EXISTS</command> (Tom Lane)
      </para>
 
      <para>
@@ -8359,14 +8729,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to handle grants on tablespaces
+      Fix <command>REASSIGN OWNED</command> to handle grants on tablespaces
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore incorrect <structname>pg_attribute</> entries for system
+      Ignore incorrect <structname>pg_attribute</structname> entries for system
       columns for views (Tom Lane)
      </para>
 
@@ -8380,7 +8750,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</>
+      Fix rule printing to dump <literal>INSERT INTO <replaceable>table</replaceable>
       DEFAULT VALUES</literal> correctly (Tom Lane)
      </para>
     </listitem>
@@ -8388,7 +8758,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Guard against stack overflow when there are too many
-      <literal>UNION</>/<literal>INTERSECT</>/<literal>EXCEPT</> clauses
+      <literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal> clauses
       in a query (Tom Lane)
      </para>
     </listitem>
@@ -8410,22 +8780,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix failure to advance XID epoch if XID wraparound happens during a
-      checkpoint and <varname>wal_level</> is <literal>hot_standby</>
+      checkpoint and <varname>wal_level</varname> is <literal>hot_standby</literal>
       (Tom Lane, Andres Freund)
      </para>
 
      <para>
       While this mistake had no particular impact on
       <productname>PostgreSQL</productname> itself, it was bad for
-      applications that rely on <function>txid_current()</> and related
+      applications that rely on <function>txid_current()</function> and related
       functions: the TXID value would appear to go backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_terminate_backend()</> and
-      <function>pg_cancel_backend()</> to not throw error for a non-existent
+      Fix <function>pg_terminate_backend()</function> and
+      <function>pg_cancel_backend()</function> to not throw error for a non-existent
       target process (Josh Kupershmidt)
      </para>
 
@@ -8438,7 +8808,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix display of
-      <structname>pg_stat_replication</>.<structfield>sync_state</> at a
+      <structname>pg_stat_replication</structname>.<structfield>sync_state</structfield> at a
       page boundary (Kyotaro Horiguchi)
      </para>
     </listitem>
@@ -8452,7 +8822,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Formerly, this would result in something quite unhelpful, such as
-      <quote>Non-recoverable failure in name resolution</>.
+      <quote>Non-recoverable failure in name resolution</quote>.
      </para>
     </listitem>
 
@@ -8477,8 +8847,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> more robust about reading the
-      <filename>postmaster.pid</> file (Heikki Linnakangas)
+      Make <application>pg_ctl</application> more robust about reading the
+      <filename>postmaster.pid</filename> file (Heikki Linnakangas)
      </para>
 
      <para>
@@ -8488,45 +8858,45 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix possible crash in <application>psql</> if incorrectly-encoded data
-      is presented and the <varname>client_encoding</> setting is a
+      Fix possible crash in <application>psql</application> if incorrectly-encoded data
+      is presented and the <varname>client_encoding</varname> setting is a
       client-only encoding, such as SJIS (Jiang Guiqing)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> dump <literal>SEQUENCE SET</> items in
+      Make <application>pg_dump</application> dump <literal>SEQUENCE SET</literal> items in
       the data not pre-data section of the archive (Tom Lane)
      </para>
 
      <para>
       This fixes an undesirable inconsistency between the meanings of
-      <option>--data-only</> and <option>--section=data</>, and also fixes
+      <option>--data-only</option> and <option>--section=data</option>, and also fixes
       dumping of sequences that are marked as extension configuration tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s handling of <command>DROP DATABASE</>
-      commands in <option>--clean</> mode (Guillaume Lelarge)
+      Fix <application>pg_dump</application>'s handling of <command>DROP DATABASE</command>
+      commands in <option>--clean</option> mode (Guillaume Lelarge)
      </para>
 
      <para>
-      Beginning in 9.2.0, <literal>pg_dump --clean</> would issue a
-      <command>DROP DATABASE</> command, which was either useless or
+      Beginning in 9.2.0, <literal>pg_dump --clean</literal> would issue a
+      <command>DROP DATABASE</command> command, which was either useless or
       dangerous depending on the usage scenario.  It no longer does that.
-      This change also fixes the combination of <option>--clean</> and
-      <option>--create</> to work sensibly, i.e., emit <command>DROP
-      DATABASE</> then <command>CREATE DATABASE</> before reconnecting to the
+      This change also fixes the combination of <option>--clean</option> and
+      <option>--create</option> to work sensibly, i.e., emit <command>DROP
+      DATABASE</command> then <command>CREATE DATABASE</command> before reconnecting to the
       target database.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> for views with circular dependencies and
+      Fix <application>pg_dump</application> for views with circular dependencies and
       no relation options (Tom Lane)
      </para>
 
@@ -8534,31 +8904,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       The previous fix to dump relation options when a view is
       involved in a circular dependency didn't work right for the case
       that the view has no options; it emitted <literal>ALTER VIEW foo
-      SET ()</> which is invalid syntax.
+      SET ()</literal> which is invalid syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in the <filename>restore.sql</> script emitted by
-      <application>pg_dump</> in <literal>tar</> output format (Tom Lane)
+      Fix bugs in the <filename>restore.sql</filename> script emitted by
+      <application>pg_dump</application> in <literal>tar</literal> output format (Tom Lane)
      </para>
 
      <para>
       The script would fail outright on tables whose names include
       upper-case characters.  Also, make the script capable of restoring
-      data in <option>--inserts</> mode as well as the regular COPY mode.
+      data in <option>--inserts</option> mode as well as the regular COPY mode.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> to accept POSIX-conformant
-      <literal>tar</> files (Brian Weaver, Tom Lane)
+      Fix <application>pg_restore</application> to accept POSIX-conformant
+      <literal>tar</literal> files (Brian Weaver, Tom Lane)
      </para>
 
      <para>
-      The original coding of <application>pg_dump</>'s <literal>tar</>
+      The original coding of <application>pg_dump</application>'s <literal>tar</literal>
       output mode produced files that are not fully conformant with the
       POSIX standard.  This has been corrected for version 9.3.  This
       patch updates previous branches so that they will accept both the
@@ -8569,82 +8939,82 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Fix <literal>tar</> files emitted by <application>pg_basebackup</> to
+      Fix <literal>tar</literal> files emitted by <application>pg_basebackup</application> to
       be POSIX conformant (Brian Weaver, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_resetxlog</> to locate <filename>postmaster.pid</>
+      Fix <application>pg_resetxlog</application> to locate <filename>postmaster.pid</filename>
       correctly when given a relative path to the data directory (Tom Lane)
      </para>
 
      <para>
-      This mistake could lead to <application>pg_resetxlog</> not noticing
+      This mistake could lead to <application>pg_resetxlog</application> not noticing
       that there is an active postmaster using the data directory.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s <function>lo_import()</> and
-      <function>lo_export()</> functions to report file I/O errors properly
+      Fix <application>libpq</application>'s <function>lo_import()</function> and
+      <function>lo_export()</function> functions to report file I/O errors properly
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of nested structure pointer
+      Fix <application>ecpg</application>'s processing of nested structure pointer
       variables (Muhammad Usama)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s <function>ecpg_get_data</> function to
+      Fix <application>ecpg</application>'s <function>ecpg_get_data</function> function to
       handle arrays properly (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <application>pg_upgrade</> from trying to process TOAST tables
+      Prevent <application>pg_upgrade</application> from trying to process TOAST tables
       for system catalogs (Bruce Momjian)
      </para>
 
      <para>
-      This fixes an error seen when the <literal>information_schema</> has
+      This fixes an error seen when the <literal>information_schema</literal> has
       been dropped and recreated.  Other failures were also possible.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>pg_upgrade</> performance by setting
-      <varname>synchronous_commit</> to <literal>off</> in the new cluster
+      Improve <application>pg_upgrade</application> performance by setting
+      <varname>synchronous_commit</varname> to <literal>off</literal> in the new cluster
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/pageinspect</>'s btree page inspection
+      Make <filename>contrib/pageinspect</filename>'s btree page inspection
       functions take buffer locks while examining pages (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Work around unportable behavior of <literal>malloc(0)</> and
-      <literal>realloc(NULL, 0)</> (Tom Lane)
+      Work around unportable behavior of <literal>malloc(0)</literal> and
+      <literal>realloc(NULL, 0)</literal> (Tom Lane)
      </para>
 
      <para>
-      On platforms where these calls return <literal>NULL</>, some code
+      On platforms where these calls return <literal>NULL</literal>, some code
       mistakenly thought that meant out-of-memory.
-      This is known to have broken <application>pg_dump</> for databases
+      This is known to have broken <application>pg_dump</application> for databases
       containing no user-defined aggregates.  There might be other cases
       as well.
      </para>
@@ -8652,19 +9022,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Ensure that <literal>make install</> for an extension creates the
-      <filename>extension</> installation directory (C&eacute;dric Villemain)
+      Ensure that <literal>make install</literal> for an extension creates the
+      <filename>extension</filename> installation directory (C&eacute;dric Villemain)
      </para>
 
      <para>
-      Previously, this step was missed if <varname>MODULEDIR</> was set in
+      Previously, this step was missed if <varname>MODULEDIR</varname> was set in
       the extension's Makefile.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgxs</> support for building loadable modules on AIX
+      Fix <application>pgxs</application> support for building loadable modules on AIX
       (Tom Lane)
      </para>
 
@@ -8675,7 +9045,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012j
+      Update time zone data files to <application>tzdata</application> release 2012j
       for DST law changes in Cuba, Israel, Jordan, Libya, Palestine, Western
       Samoa, and portions of Brazil.
      </para>
@@ -8697,7 +9067,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
   <para>
    This release contains a variety of fixes from 9.2.0.
    For information about new features in the 9.2 major release, see
-   <xref linkend="release-9-2">.
+   <xref linkend="release-9-2"/>.
   </para>
 
   <sect2>
@@ -8708,8 +9078,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </para>
 
    <para>
-    However, you may need to perform <command>REINDEX</> and/or
-    <command>VACUUM</> operations to recover from the effects of the data
+    However, you may need to perform <command>REINDEX</command> and/or
+    <command>VACUUM</command> operations to recover from the effects of the data
     corruption bug described in the first changelog item below.
    </para>
 
@@ -8734,7 +9104,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       likely to occur on standby slave servers since those perform much
       more WAL replay.  There is a low probability of corruption of btree
       and GIN indexes.  There is a much higher probability of corruption
-      of table <quote>visibility maps</>, which might lead to wrong answers
+      of table <quote>visibility maps</quote>, which might lead to wrong answers
       from index-only scans.  Table data proper cannot be corrupted by this
       bug.
      </para>
@@ -8742,16 +9112,16 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <para>
       While no index corruption due to this bug is known to have occurred
       in the field, as a precautionary measure it is recommended that
-      production installations <command>REINDEX</> all btree and GIN
+      production installations <command>REINDEX</command> all btree and GIN
       indexes at a convenient time after upgrading to 9.2.1.
      </para>
 
      <para>
-      Also, it is recommended to perform a <command>VACUUM</> of all tables
+      Also, it is recommended to perform a <command>VACUUM</command> of all tables
       while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any incorrect visibility map data.  <link
-      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</></link>
+      linkend="guc-vacuum-cost-delay"><varname>vacuum_cost_delay</varname></link>
       can be adjusted to reduce the performance impact of vacuuming, while
       causing it to take longer to finish.
      </para>
@@ -8760,14 +9130,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Fix possible incorrect sorting of output from queries involving
-      <literal>WHERE <replaceable>indexed_column</> IN
-      (<replaceable>list_of_values</>)</literal> (Tom Lane)
+      <literal>WHERE <replaceable>indexed_column</replaceable> IN
+      (<replaceable>list_of_values</replaceable>)</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix planner failure for queries involving <literal>GROUP BY</>
+      Fix planner failure for queries involving <literal>GROUP BY</literal>
       expressions along with window functions and aggregates (Tom Lane)
      </para>
     </listitem>
@@ -8779,7 +9149,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       This error could result in wrong answers from queries that scan the
-      same <literal>WITH</> subquery multiple times.
+      same <literal>WITH</literal> subquery multiple times.
      </para>
     </listitem>
 
@@ -8792,7 +9162,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     <listitem>
      <para>
       Improve selectivity estimation for text search queries involving
-      prefixes, i.e. <replaceable>word</><literal>:*</> patterns  (Tom Lane)
+      prefixes, i.e. <replaceable>word</replaceable><literal>:*</literal> patterns  (Tom Lane)
      </para>
     </listitem>
 
@@ -8803,14 +9173,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       A command that needed no locks other than ones its transaction already
-      had might fail to notice a concurrent <command>GRANT</> or
-      <command>REVOKE</> that committed since the start of its transaction.
+      had might fail to notice a concurrent <command>GRANT</command> or
+      <command>REVOKE</command> that committed since the start of its transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</> to not fail when a column is a domain over an
+      Fix <command>ANALYZE</command> to not fail when a column is a domain over an
       array type (Tom Lane)
      </para>
     </listitem>
@@ -8829,7 +9199,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
      <para>
       Some Linux distributions contain an incorrect version of
-      <filename>pthread.h</> that results in incorrect compiled code in
+      <filename>pthread.h</filename> that results in incorrect compiled code in
       PL/Perl, leading to crashes if a PL/Perl function calls another one
       that throws an error.
      </para>
@@ -8837,14 +9207,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
     <listitem>
      <para>
-      Remove unnecessary dependency on <application>pg_config</> from
-      <application>pg_upgrade</> (Peter Eisentraut)
+      Remove unnecessary dependency on <application>pg_config</application> from
+      <application>pg_upgrade</application> (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2012f
+      Update time zone data files to <application>tzdata</application> release 2012f
       for DST law changes in Fiji
      </para>
     </listitem>
@@ -8878,7 +9248,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow queries to retrieve data only from indexes, avoiding heap
-        access (<firstterm>index-only scans</>)
+        access (<firstterm>index-only scans</firstterm>)
        </para>
       </listitem>
 
@@ -8900,14 +9270,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Allow streaming replication slaves to forward data to other slaves
         (<link linkend="cascading-replication"><firstterm>cascading
-        replication</></link>)
+        replication</firstterm></link>)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         to make base backups from standby servers
        </para>
       </listitem>
@@ -8915,14 +9285,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         tool to archive WAL file changes as they are written
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <link linkend="SPGiST">SP-GiST</link> (Space-Partitioned
+        Add the <link linkend="spgist">SP-GiST</link> (Space-Partitioned
         GiST) index access method
        </para>
       </listitem>
@@ -8943,14 +9313,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="SQL-CREATEVIEW"><literal>security_barrier</></link>
+        linkend="sql-createview"><literal>security_barrier</literal></link>
         option for views
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>libpq</> connection strings to have the format of a
+        Allow <application>libpq</application> connection strings to have the format of a
         <link linkend="libpq-connstring"><acronym>URI</acronym></link>
        </para>
       </listitem>
@@ -8958,7 +9328,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link linkend="libpq-single-row-mode">single-row processing
-        mode</link> to <application>libpq</> for better handling of large
+        mode</link> to <application>libpq</application> for better handling of large
         result sets
        </para>
       </listitem>
@@ -8993,8 +9363,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Remove the <structfield>spclocation</> field from <link
-        linkend="catalog-pg-tablespace"><structname>pg_tablespace</></link>
+        Remove the <structfield>spclocation</structfield> field from <link
+        linkend="catalog-pg-tablespace"><structname>pg_tablespace</structname></link>
         (Magnus Hagander)
        </para>
 
@@ -9004,23 +9374,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         a tablespace.  This change allows tablespace directories to be moved
         while the server is down, by manually adjusting the symbolic links.
         To replace this field, we have added <link
-        linkend="functions-info-catalog-table"><function>pg_tablespace_location()</></link>
+        linkend="functions-info-catalog-table"><function>pg_tablespace_location()</function></link>
         to allow querying of the symbolic links.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Move <type>tsvector</> most-common-element statistics to new
-        <link linkend="view-pg-stats"><structname>pg_stats</></link> columns
+        Move <type>tsvector</type> most-common-element statistics to new
+        <link linkend="view-pg-stats"><structname>pg_stats</structname></link> columns
         (Alexander Korotkov)
        </para>
 
        <para>
-        Consult <structfield>most_common_elems</>
-        and <structfield>most_common_elem_freqs</> for the data formerly
-        available in <structfield>most_common_vals</>
-        and <structfield>most_common_freqs</> for a <type>tsvector</> column.
+        Consult <structfield>most_common_elems</structfield>
+        and <structfield>most_common_elem_freqs</structfield> for the data formerly
+        available in <structfield>most_common_vals</structfield>
+        and <structfield>most_common_freqs</structfield> for a <type>tsvector</type> column.
        </para>
       </listitem>
 
@@ -9035,14 +9405,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Remove <link linkend="hstore">hstore</link>'s <literal>=&gt;</>
+        Remove <link linkend="hstore">hstore</link>'s <literal>=&gt;</literal>
         operator (Robert Haas)
        </para>
 
        <para>
-        Users should now use <function>hstore(text, text)</>.  Since
+        Users should now use <function>hstore(text, text)</function>.  Since
         <productname>PostgreSQL</productname> 9.0, a warning message has been
-        emitted when an operator named <literal>=&gt;</> is created because
+        emitted when an operator named <literal>=&gt;</literal> is created because
         the <acronym>SQL</acronym> standard reserves that token for
         another use.
        </para>
@@ -9051,7 +9421,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Ensure that <link
-        linkend="functions-xml-processing"><function>xpath()</></link>
+        linkend="functions-xml-processing"><function>xpath()</function></link>
         escapes special characters in string values (Florian Pflug)
        </para>
 
@@ -9064,13 +9434,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make <link
-        linkend="functions-admin-dbobject"><function>pg_relation_size()</></link>
+        linkend="functions-admin-dbobject"><function>pg_relation_size()</function></link>
         and friends return NULL if the object does not exist (Phil Sorber)
        </para>
 
        <para>
         This prevents queries that call these functions from returning
-        errors immediately after a concurrent <command>DROP</>.
+        errors immediately after a concurrent <command>DROP</command>.
        </para>
       </listitem>
 
@@ -9078,7 +9448,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Make <link
         linkend="functions-datetime-extract"><function>EXTRACT(EPOCH FROM
-        <replaceable>timestamp without time zone</>)</function></link>
+        <replaceable>timestamp without time zone</replaceable>)</function></link>
         measure the epoch from local midnight, not <acronym>UTC</acronym>
         midnight (Tom Lane)
        </para>
@@ -9087,17 +9457,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         This change reverts an ill-considered change made in release 7.3.
         Measuring from <acronym>UTC</acronym> midnight was inconsistent
         because it made the result dependent on the <link
-        linkend="guc-timezone"><varname>timezone</></link> setting, which
-        computations for <type>timestamp without time zone</> should not be.
+        linkend="guc-timezone"><varname>timezone</varname></link> setting, which
+        computations for <type>timestamp without time zone</type> should not be.
         The previous behavior remains available by casting the input value
-        to <type>timestamp with time zone</>.
+        to <type>timestamp with time zone</type>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Properly parse time strings with trailing <literal>yesterday</>,
-        <literal>today</>, and <literal>tomorrow</> (Dean Rasheed)
+        Properly parse time strings with trailing <literal>yesterday</literal>,
+        <literal>today</literal>, and <literal>tomorrow</literal> (Dean Rasheed)
        </para>
 
        <para>
@@ -9109,8 +9479,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Fix <link
-        linkend="functions-formatting"><function>to_date()</></link> and
-        <function>to_timestamp()</> to wrap incomplete dates toward 2020
+        linkend="functions-formatting"><function>to_date()</function></link> and
+        <function>to_timestamp()</function> to wrap incomplete dates toward 2020
         (Bruce Momjian)
        </para>
 
@@ -9131,7 +9501,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Prevent  <link linkend="SQL-ALTERDOMAIN"><command>ALTER
+        Prevent  <link linkend="sql-alterdomain"><command>ALTER
         DOMAIN</command></link> from working on non-domain types (Peter
         Eisentraut)
        </para>
@@ -9145,15 +9515,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         No longer forcibly lowercase procedural language names in <link
-        linkend="SQL-CREATEFUNCTION"><command>CREATE FUNCTION</></link>
+        linkend="sql-createfunction"><command>CREATE FUNCTION</command></link>
         (Robert Haas)
        </para>
 
        <para>
         While unquoted language identifiers are still lowercased, strings
         and quoted identifiers are no longer forcibly down-cased.
-        Thus for example <literal>CREATE FUNCTION ... LANGUAGE 'C'</>
-        will no longer work; it must be spelled <literal>'c'</>, or better
+        Thus for example <literal>CREATE FUNCTION ... LANGUAGE 'C'</literal>
+        will no longer work; it must be spelled <literal>'c'</literal>, or better
         omit the quotes.
        </para>
       </listitem>
@@ -9183,15 +9553,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Provide consistent backquote, variable
         expansion, and quoted substring behavior in <link
-        linkend="APP-PSQL"><application>psql</></link> meta-command
+        linkend="app-psql"><application>psql</application></link> meta-command
         arguments (Tom Lane)
        </para>
 
        <para>
         Previously, such references were treated oddly when not separated by
-        whitespace from adjacent text.  For example <literal>'FOO'BAR</> was
-        output as <literal>FOO BAR</> (unexpected insertion of a space) and
-        <literal>FOO'BAR'BAZ</> was output unchanged (not removing the quotes
+        whitespace from adjacent text.  For example <literal>'FOO'BAR</literal> was
+        output as <literal>FOO BAR</literal> (unexpected insertion of a space) and
+        <literal>FOO'BAR'BAZ</literal> was output unchanged (not removing the quotes
         as most would expect).
        </para>
       </listitem>
@@ -9199,9 +9569,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         No longer treat <link
-        linkend="APP-CLUSTERDB"><application>clusterdb</></link>
+        linkend="app-clusterdb"><application>clusterdb</application></link>
         table names as double-quoted; no longer treat <link
-        linkend="APP-REINDEXDB"><application>reindexdb</></link> table
+        linkend="app-reindexdb"><application>reindexdb</application></link> table
         and index names as double-quoted (Bruce Momjian)
        </para>
 
@@ -9213,20 +9583,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        <link linkend="APP-CREATEUSER"><application>createuser</></link>
+        <link linkend="app-createuser"><application>createuser</application></link>
         no longer prompts for option settings by default (Peter Eisentraut)
        </para>
 
        <para>
-        Use <option>--interactive</> to obtain the old behavior.
+        Use <option>--interactive</option> to obtain the old behavior.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Disable prompting for the user name in <link
-        linkend="APP-DROPUSER"><application>dropuser</></link> unless
-        <option>--interactive</> is specified (Peter Eisentraut)
+        linkend="app-dropuser"><application>dropuser</application></link> unless
+        <option>--interactive</option> is specified (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -9248,36 +9618,36 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This allows changing the names and locations of the files that were
-        previously hard-coded as <filename>server.crt</>,
-        <filename>server.key</>, <filename>root.crt</>, and
-        <filename>root.crl</> in the data directory.
-        <emphasis>The server will no longer examine <filename>root.crt</> or
-        <filename>root.crl</> by default</emphasis>; to load these files, the
+        previously hard-coded as <filename>server.crt</filename>,
+        <filename>server.key</filename>, <filename>root.crt</filename>, and
+        <filename>root.crl</filename> in the data directory.
+        <emphasis>The server will no longer examine <filename>root.crt</filename> or
+        <filename>root.crl</filename> by default</emphasis>; to load these files, the
         associated parameters must be set to non-default values.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>silent_mode</> parameter (Heikki Linnakangas)
+        Remove the <varname>silent_mode</varname> parameter (Heikki Linnakangas)
        </para>
 
        <para>
         Similar behavior can be obtained with <command>pg_ctl start
-        -l postmaster.log</>.
+        -l postmaster.log</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>wal_sender_delay</> parameter,
+        Remove the <varname>wal_sender_delay</varname> parameter,
         as it is no longer needed (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove the <varname>custom_variable_classes</> parameter (Tom Lane)
+        Remove the <varname>custom_variable_classes</varname> parameter (Tom Lane)
        </para>
 
        <para>
@@ -9297,19 +9667,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Rename <link
-        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</></link><structfield>.procpid</>
-        to <structfield>pid</>, to match other system tables (Magnus Hagander)
+        linkend="monitoring-stats-views-table"><structname>pg_stat_activity</structname></link><structfield>.procpid</structfield>
+        to <structfield>pid</structfield>, to match other system tables (Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Create a separate <structfield>pg_stat_activity</> column to
+        Create a separate <structfield>pg_stat_activity</structfield> column to
         report process state (Scott Mead, Magnus Hagander)
        </para>
 
        <para>
-        The previous <structfield>query</> and <structfield>query_start</>
+        The previous <structfield>query</structfield> and <structfield>query_start</structfield>
         values now remain available for an idle session, allowing enhanced
         analysis.
        </para>
@@ -9317,8 +9687,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Rename <structname>pg_stat_activity</>.<structfield>current_query</> to
-        <structfield>query</> because it is not cleared when the query
+        Rename <structname>pg_stat_activity</structname>.<structfield>current_query</structfield> to
+        <structfield>query</structfield> because it is not cleared when the query
         completes (Magnus Hagander)
        </para>
       </listitem>
@@ -9326,24 +9696,24 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Change all <acronym>SQL</acronym>-level statistics timing values
-        to be <type>float8</> columns measured in milliseconds (Tom Lane)
+        to be <type>float8</type> columns measured in milliseconds (Tom Lane)
        </para>
 
        <para>
         This change eliminates the designed-in assumption that the values
-        are accurate to microseconds and no more (since the <type>float8</>
+        are accurate to microseconds and no more (since the <type>float8</type>
         values can be fractional).
         The columns affected are
-        <structname>pg_stat_user_functions</>.<structfield>total_time</>,
-        <structname>pg_stat_user_functions</>.<structfield>self_time</>,
-        <structname>pg_stat_xact_user_functions</>.<structfield>total_time</>,
+        <structname>pg_stat_user_functions</structname>.<structfield>total_time</structfield>,
+        <structname>pg_stat_user_functions</structname>.<structfield>self_time</structfield>,
+        <structname>pg_stat_xact_user_functions</structname>.<structfield>total_time</structfield>,
         and
-        <structname>pg_stat_xact_user_functions</>.<structfield>self_time</>.
+        <structname>pg_stat_xact_user_functions</structname>.<structfield>self_time</structfield>.
         The statistics functions underlying these columns now also return
-        <type>float8</> milliseconds, rather than <type>bigint</>
+        <type>float8</type> milliseconds, rather than <type>bigint</type>
         microseconds.
-        <filename>contrib/pg_stat_statements</>'
-        <structfield>total_time</> column is now also measured in
+        <filename>contrib/pg_stat_statements</filename>'
+        <structfield>total_time</structfield> column is now also measured in
         milliseconds.
        </para>
       </listitem>
@@ -9377,7 +9747,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This feature is often called <firstterm>index-only scans</>.
+        This feature is often called <firstterm>index-only scans</firstterm>.
         Heap access can be skipped for heap pages containing only tuples that
         are visible to all sessions, as reported by the visibility map; so
         the benefit applies mainly to mostly-static data.  The visibility map
@@ -9387,7 +9757,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add the <link linkend="SPGiST">SP-GiST</link> (Space-Partitioned
+        Add the <link linkend="spgist">SP-GiST</link> (Space-Partitioned
         GiST) index access method (Teodor Sigaev, Oleg Bartunov, Tom
         Lane)
        </para>
@@ -9449,7 +9819,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Move the frequently accessed members of the <structname>PGPROC</>
+        Move the frequently accessed members of the <structname>PGPROC</structname>
         shared memory array to a separate array (Pavan
         Deolasee, Heikki Linnakangas, Robert Haas)
        </para>
@@ -9494,7 +9864,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make the number of CLOG buffers scale based on <link
-        linkend="guc-shared-buffers"><varname>shared_buffers</></link>
+        linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
         (Robert Haas, Simon Riggs, Tom Lane)
        </para>
       </listitem>
@@ -9555,7 +9925,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         Previously, only <link
-        linkend="guc-wal-writer-delay"><varname>wal_writer_delay</></link>
+        linkend="guc-wal-writer-delay"><varname>wal_writer_delay</varname></link>
         triggered <acronym>WAL</acronym> flushing to disk; now filling a
         <acronym>WAL</acronym> buffer also triggers <acronym>WAL</acronym>
         writes.
@@ -9594,7 +9964,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         In the past, a prepared statement always had a single
-        <quote>generic</> plan that was used for all parameter values, which
+        <quote>generic</quote> plan that was used for all parameter values, which
         was frequently much inferior to the plans used for non-prepared
         statements containing explicit constant values.  Now, the planner
         attempts to generate custom plans for specific parameter values.
@@ -9612,7 +9982,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        The new <quote>parameterized path</> mechanism allows inner
+        The new <quote>parameterized path</quote> mechanism allows inner
         index scans to use values from relations that are more than one join
         level up from the scan.  This can greatly improve performance in
         situations where semantic restrictions (such as outer joins) limit
@@ -9627,7 +9997,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Wrappers can now provide multiple access <quote>paths</> for their
+        Wrappers can now provide multiple access <quote>paths</quote> for their
         tables, allowing more flexibility in join planning.
        </para>
       </listitem>
@@ -9640,14 +10010,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This check is only performed when <link
-        linkend="guc-constraint-exclusion"><varname>constraint_exclusion</></link>
+        linkend="guc-constraint-exclusion"><varname>constraint_exclusion</varname></link>
         is <literal>on</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <literal>indexed_col op ANY(ARRAY[...])</> conditions to be
+        Allow <literal>indexed_col op ANY(ARRAY[...])</literal> conditions to be
         used in plain index scans and index-only scans (Tom Lane)
        </para>
 
@@ -9658,14 +10028,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Support <function>MIN</>/<function>MAX</> index optimizations on
+        Support <function>MIN</function>/<function>MAX</function> index optimizations on
         <type>boolean</type> columns (Marti Raudsepp)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Account for set-returning functions in <command>SELECT</> target
+        Account for set-returning functions in <command>SELECT</command> target
         lists when setting row count estimates (Tom Lane)
        </para>
       </listitem>
@@ -9713,7 +10083,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve statistical estimates for subqueries using
-        <literal>DISTINCT</> (Tom Lane)
+        <literal>DISTINCT</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -9728,13 +10098,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Do not treat role names and <literal>samerole</> specified in <link
+        Do not treat role names and <literal>samerole</literal> specified in <link
         linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         as automatically including superusers (Andrew Dunstan)
        </para>
 
        <para>
-        This makes it easier to use <literal>reject</> lines with group roles.
+        This makes it easier to use <literal>reject</literal> lines with group roles.
        </para>
       </listitem>
 
@@ -9789,7 +10159,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This logging is triggered by <link
-        linkend="guc-log-autovacuum-min-duration"><varname>log_autovacuum_min_duration</></link>.
+        linkend="guc-log-autovacuum-min-duration"><varname>log_autovacuum_min_duration</varname></link>.
        </para>
       </listitem>
 
@@ -9808,7 +10178,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-admin-backup"><function>pg_xlog_location_diff()</></link>
+        linkend="functions-admin-backup"><function>pg_xlog_location_diff()</function></link>
         to simplify WAL location comparisons (Euler Taveira de Oliveira)
        </para>
 
@@ -9826,15 +10196,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         This allows different instances to use the event log
         with different identifiers, by setting the <link
-        linkend="guc-event-source"><varname>event_source</></link>
+        linkend="guc-event-source"><varname>event_source</varname></link>
         server parameter, which is similar to how <link
-        linkend="guc-syslog-ident"><varname>syslog_ident</></link> works.
+        linkend="guc-syslog-ident"><varname>syslog_ident</varname></link> works.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <quote>unexpected EOF</> messages to <literal>DEBUG1</> level,
+        Change <quote>unexpected EOF</quote> messages to <literal>DEBUG1</literal> level,
         except when there is an open transaction (Magnus Hagander)
        </para>
 
@@ -9856,14 +10226,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Track temporary file sizes and file counts in the <link
-        linkend="pg-stat-database-view"><structname>pg_stat_database</></link>
+        linkend="pg-stat-database-view"><structname>pg_stat_database</structname></link>
         system view (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a deadlock counter to the <structname>pg_stat_database</>
+        Add a deadlock counter to the <structname>pg_stat_database</structname>
         system view (Magnus Hagander)
        </para>
       </listitem>
@@ -9871,7 +10241,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a server parameter <link
-        linkend="guc-track-io-timing"><varname>track_io_timing</></link>
+        linkend="guc-track-io-timing"><varname>track_io_timing</varname></link>
         to track I/O timings (Ants Aasma, Robert Haas)
        </para>
       </listitem>
@@ -9879,7 +10249,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Report checkpoint timing information in <link
-        linkend="pg-stat-bgwriter-view"><structname>pg_stat_bgwriter</></link>
+        linkend="pg-stat-bgwriter-view"><structname>pg_stat_bgwriter</structname></link>
         (Greg Smith, Peter Geoghegan)
        </para>
       </listitem>
@@ -9896,7 +10266,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Silently ignore nonexistent schemas specified in <link
-        linkend="guc-search-path"><varname>search_path</></link> (Tom Lane)
+        linkend="guc-search-path"><varname>search_path</varname></link> (Tom Lane)
        </para>
 
        <para>
@@ -9908,12 +10278,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow superusers to set <link
-        linkend="guc-deadlock-timeout"><varname>deadlock_timeout</></link>
+        linkend="guc-deadlock-timeout"><varname>deadlock_timeout</varname></link>
         per-session, not just per-cluster (Noah Misch)
        </para>
 
        <para>
-        This allows <varname>deadlock_timeout</> to be reduced for
+        This allows <varname>deadlock_timeout</varname> to be reduced for
         transactions that are likely to be involved in a deadlock, thus
         detecting the failure more quickly.  Alternatively, increasing the
         value can be used to reduce the chances of a session being chosen for
@@ -9924,7 +10294,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a server parameter <link
-        linkend="guc-temp-file-limit"><varname>temp_file_limit</></link>
+        linkend="guc-temp-file-limit"><varname>temp_file_limit</varname></link>
         to constrain temporary file space usage per session (Mark Kirkwood)
        </para>
       </listitem>
@@ -9945,13 +10315,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="app-postmaster">postmaster</link> <option>-C</>
+        Add <link linkend="app-postmaster">postmaster</link> <option>-C</option>
         option to query configuration parameters (Bruce Momjian)
        </para>
 
        <para>
-        This allows <application>pg_ctl</> to better handle cases where
-        <envar>PGDATA</> or <option>-D</> points to a configuration-only
+        This allows <application>pg_ctl</application> to better handle cases where
+        <envar>PGDATA</envar> or <option>-D</option> points to a configuration-only
         directory.
        </para>
       </listitem>
@@ -9959,14 +10329,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Replace an empty locale name with the implied value in
-        <command>CREATE DATABASE</>
+        <command>CREATE DATABASE</command>
         (Tom Lane)
        </para>
 
        <para>
         This prevents cases where
-        <structname>pg_database</>.<structfield>datcollate</> or
-        <structfield>datctype</> could be interpreted differently after a
+        <structname>pg_database</structname>.<structfield>datcollate</structfield> or
+        <structfield>datctype</structfield> could be interpreted differently after a
         server restart.
        </para>
       </listitem>
@@ -10001,22 +10371,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add an <literal>include_if_exists</> facility for configuration
+        Add an <literal>include_if_exists</literal> facility for configuration
         files (Greg Smith)
        </para>
 
        <para>
-        This works the same as <literal>include</>, except that an error
+        This works the same as <literal>include</literal>, except that an error
         is not thrown if the file is missing.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Identify the server time zone during <application>initdb</>, and set
+        Identify the server time zone during <application>initdb</application>, and set
         <filename>postgresql.conf</filename> entries
-        <link linkend="guc-timezone"><varname>timezone</></link> and
-        <link linkend="guc-log-timezone"><varname>log_timezone</></link>
+        <link linkend="guc-timezone"><varname>timezone</varname></link> and
+        <link linkend="guc-log-timezone"><varname>log_timezone</varname></link>
         accordingly (Tom Lane)
        </para>
 
@@ -10028,7 +10398,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Fix <link
-        linkend="view-pg-settings"><structname>pg_settings</></link> to
+        linkend="view-pg-settings"><structname>pg_settings</structname></link> to
         report <filename>postgresql.conf</filename> line numbers on Windows
         (Tom Lane)
        </para>
@@ -10051,7 +10421,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Allow streaming replication slaves to forward data to other slaves
         (<link linkend="cascading-replication"><firstterm>cascading
-        replication</></link>) (Fujii Masao)
+        replication</firstterm></link>) (Fujii Masao)
        </para>
 
        <para>
@@ -10063,8 +10433,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add new <link
-        linkend="guc-synchronous-commit"><varname>synchronous_commit</></link>
-        mode <literal>remote_write</> (Fujii Masao, Simon Riggs)
+        linkend="guc-synchronous-commit"><varname>synchronous_commit</varname></link>
+        mode <literal>remote_write</literal> (Fujii Masao, Simon Riggs)
        </para>
 
        <para>
@@ -10077,7 +10447,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         tool to archive WAL file changes as they are written, rather
         than waiting for completed WAL files (Magnus Hagander)
        </para>
@@ -10086,7 +10456,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         to make base backups from standby servers (Jun Ishizuka, Fujii Masao)
        </para>
 
@@ -10098,7 +10468,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow streaming of WAL files while <application>pg_basebackup</>
+        Allow streaming of WAL files while <application>pg_basebackup</application>
         is performing a backup (Magnus Hagander)
        </para>
 
@@ -10137,19 +10507,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This change allows better results when a row value is converted to
-        <type>hstore</> or <type>json</> type: the fields of the resulting
+        <type>hstore</type> or <type>json</type> type: the fields of the resulting
         value will now have the expected names.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve column labels used for sub-<command>SELECT</> results
+        Improve column labels used for sub-<command>SELECT</command> results
         (Marti Raudsepp)
        </para>
 
        <para>
-        Previously, the generic label <literal>?column?</> was used.
+        Previously, the generic label <literal>?column?</literal> was used.
        </para>
       </listitem>
 
@@ -10179,7 +10549,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        When a row fails a <literal>CHECK</> or <literal>NOT NULL</>
+        When a row fails a <literal>CHECK</literal> or <literal>NOT NULL</literal>
         constraint, show the row's contents as error detail (Jan
         Kundr&aacute;t)
        </para>
@@ -10207,7 +10577,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This change adds locking that should eliminate <quote>cache lookup
-        failed</> errors in many scenarios.  Also, it is no longer possible
+        failed</quote> errors in many scenarios.  Also, it is no longer possible
         to add relations to a schema that is being concurrently dropped, a
         scenario that formerly led to inconsistent system catalog contents.
        </para>
@@ -10215,8 +10585,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <literal>CONCURRENTLY</> option to <link
-        linkend="SQL-DROPINDEX"><command>DROP INDEX</command></link>
+        Add <literal>CONCURRENTLY</literal> option to <link
+        linkend="sql-dropindex"><command>DROP INDEX</command></link>
         (Simon Riggs)
        </para>
 
@@ -10246,31 +10616,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <link linkend="ddl-constraints"><literal>CHECK</></link>
-        constraints to be declared <literal>NOT VALID</> (&Aacute;lvaro
+        Allow <link linkend="ddl-constraints"><literal>CHECK</literal></link>
+        constraints to be declared <literal>NOT VALID</literal> (&Aacute;lvaro
         Herrera)
        </para>
 
        <para>
-        Adding a <literal>NOT VALID</> constraint does not cause the table to
+        Adding a <literal>NOT VALID</literal> constraint does not cause the table to
         be scanned to verify that existing rows meet the constraint.
         Subsequently, newly added or updated rows are checked.
         Such constraints are ignored by the planner when considering
-        <varname>constraint_exclusion</>, since it is not certain that all
+        <varname>constraint_exclusion</varname>, since it is not certain that all
         rows meet the constraint.
        </para>
 
        <para>
-        The new <command>ALTER TABLE VALIDATE</> command allows <literal>NOT
-        VALID</> constraints to be checked for existing rows, after which
+        The new <command>ALTER TABLE VALIDATE</command> command allows <literal>NOT
+        VALID</literal> constraints to be checked for existing rows, after which
         they are converted into ordinary constraints.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <literal>CHECK</> constraints to be declared <literal>NO
-        INHERIT</> (Nikhil Sontakke, Alex Hunsaker, &Aacute;lvaro Herrera)
+        Allow <literal>CHECK</literal> constraints to be declared <literal>NO
+        INHERIT</literal> (Nikhil Sontakke, Alex Hunsaker, &Aacute;lvaro Herrera)
        </para>
 
        <para>
@@ -10281,7 +10651,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add the ability to <link linkend="SQL-ALTERTABLE">rename</link>
+        Add the ability to <link linkend="sql-altertable">rename</link>
         constraints (Peter Eisentraut)
        </para>
       </listitem>
@@ -10290,32 +10660,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><command>ALTER</></title>
+     <title><command>ALTER</command></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
         Reduce need to rebuild tables and indexes for certain <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE</command></link>
-        ... <literal>ALTER COLUMN TYPE</> operations (Noah Misch)
+        linkend="sql-altertable"><command>ALTER TABLE</command></link>
+        ... <literal>ALTER COLUMN TYPE</literal> operations (Noah Misch)
        </para>
 
        <para>
-        Increasing the length limit for a <type>varchar</> or <type>varbit</>
+        Increasing the length limit for a <type>varchar</type> or <type>varbit</type>
         column, or removing the limit altogether, no longer requires a table
         rewrite.  Similarly, increasing the allowable precision of a
-        <type>numeric</> column, or changing a column from constrained
-        <type>numeric</> to unconstrained <type>numeric</>, no longer
+        <type>numeric</type> column, or changing a column from constrained
+        <type>numeric</type> to unconstrained <type>numeric</type>, no longer
         requires a table rewrite.  Table rewrites are also avoided in similar
-        cases involving the <type>interval</>, <type>timestamp</>, and
-        <type>timestamptz</> types.
+        cases involving the <type>interval</type>, <type>timestamp</type>, and
+        <type>timestamptz</type> types.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Avoid having <link linkend="SQL-ALTERTABLE"><command>ALTER
+        Avoid having <link linkend="sql-altertable"><command>ALTER
         TABLE</command></link> revalidate foreign key constraints in some
         cases where it is not necessary (Noah Misch)
        </para>
@@ -10323,7 +10693,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <literal>IF EXISTS</> options to some <command>ALTER</command>
+        Add <literal>IF EXISTS</literal> options to some <command>ALTER</command>
         commands (Pavel Stehule)
        </para>
 
@@ -10335,17 +10705,17 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERFOREIGNDATAWRAPPER"><command>ALTER
-        FOREIGN DATA WRAPPER</command></link> ... <literal>RENAME</>
-        and <link linkend="SQL-ALTERSERVER"><command>ALTER
-        SERVER</command></link> ... <literal>RENAME</> (Peter Eisentraut)
+        Add <link linkend="sql-alterforeigndatawrapper"><command>ALTER
+        FOREIGN DATA WRAPPER</command></link> ... <literal>RENAME</literal>
+        and <link linkend="sql-alterserver"><command>ALTER
+        SERVER</command></link> ... <literal>RENAME</literal> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERDOMAIN"><command>ALTER
-        DOMAIN</command></link> ... <literal>RENAME</> (Peter Eisentraut)
+        Add <link linkend="sql-alterdomain"><command>ALTER
+        DOMAIN</command></link> ... <literal>RENAME</literal> (Peter Eisentraut)
        </para>
 
        <para>
@@ -10357,11 +10727,11 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Throw an error for <command>ALTER DOMAIN</command> ... <literal>DROP
-        CONSTRAINT</> on a nonexistent constraint (Peter Eisentraut)
+        CONSTRAINT</literal> on a nonexistent constraint (Peter Eisentraut)
        </para>
 
        <para>
-        An <literal>IF EXISTS</> option has been added to provide the
+        An <literal>IF EXISTS</literal> option has been added to provide the
         previous behavior.
        </para>
       </listitem>
@@ -10371,7 +10741,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="SQL-CREATETABLE"><command>CREATE TABLE</></link></title>
+     <title><link linkend="sql-createtable"><command>CREATE TABLE</command></link></title>
 
      <itemizedlist>
 
@@ -10396,8 +10766,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Fix <command>CREATE TABLE</command> ... <literal>AS EXECUTE</>
-        to handle <literal>WITH NO DATA</> and column name specifications
+        Fix <command>CREATE TABLE</command> ... <literal>AS EXECUTE</literal>
+        to handle <literal>WITH NO DATA</literal> and column name specifications
         (Tom Lane)
        </para>
       </listitem>
@@ -10414,14 +10784,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a <link
-        linkend="SQL-CREATEVIEW"><literal>security_barrier</></link>
+        linkend="sql-createview"><literal>security_barrier</literal></link>
         option for views (KaiGai Kohei, Robert Haas)
        </para>
 
        <para>
         This option prevents optimizations that might allow view-protected
         data to be exposed to users, for example pushing a clause involving
-        an insecure function into the <literal>WHERE</> clause of the view.
+        an insecure function into the <literal>WHERE</literal> clause of the view.
         Such views can be expected to perform more poorly than ordinary
         views.
        </para>
@@ -10430,9 +10800,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add a new <link
-        linkend="SQL-CREATEFUNCTION"><literal>LEAKPROOF</></link> function
+        linkend="sql-createfunction"><literal>LEAKPROOF</literal></link> function
         attribute to mark functions that can safely be pushed down
-        into <literal>security_barrier</> views (KaiGai Kohei)
+        into <literal>security_barrier</literal> views (KaiGai Kohei)
        </para>
       </listitem>
 
@@ -10442,8 +10812,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This adds support for the <acronym>SQL</>-conforming
-        <literal>USAGE</> privilege on types and domains.  The intent is
+        This adds support for the <acronym>SQL</acronym>-conforming
+        <literal>USAGE</literal> privilege on types and domains.  The intent is
         to be able to restrict which users can create dependencies on types,
         since such dependencies limit the owner's ability to alter the type.
        </para>
@@ -10459,7 +10829,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         Because the object is being created by <command>SELECT INTO</command>
         or <command>CREATE TABLE AS</command>, the creator would ordinarily
         have insert permissions; but there are corner cases where this is not
-        true, such as when <literal>ALTER DEFAULT PRIVILEGES</> has removed
+        true, such as when <literal>ALTER DEFAULT PRIVILEGES</literal> has removed
         such permissions.
        </para>
       </listitem>
@@ -10477,20 +10847,20 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-VACUUM"><command>VACUUM</></link> to more
+        Allow <link linkend="sql-vacuum"><command>VACUUM</command></link> to more
         easily skip pages that cannot be locked (Simon Riggs, Robert Haas)
        </para>
 
        <para>
-        This change should greatly reduce the incidence of <command>VACUUM</>
-        getting <quote>stuck</> waiting for other sessions.
+        This change should greatly reduce the incidence of <command>VACUUM</command>
+        getting <quote>stuck</quote> waiting for other sessions.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="SQL-EXPLAIN"><command>EXPLAIN</></link>
-        <literal>(BUFFERS)</> count blocks dirtied and written (Robert Haas)
+        Make <link linkend="sql-explain"><command>EXPLAIN</command></link>
+        <literal>(BUFFERS)</literal> count blocks dirtied and written (Robert Haas)
        </para>
       </listitem>
 
@@ -10508,8 +10878,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This is accomplished by setting the new <literal>TIMING</> option to
-        <literal>FALSE</>.
+        This is accomplished by setting the new <literal>TIMING</literal> option to
+        <literal>FALSE</literal>.
        </para>
       </listitem>
 
@@ -10550,41 +10920,41 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-json"><function>array_to_json()</></link>
-        and <function>row_to_json()</> (Andrew Dunstan)
+        linkend="functions-json"><function>array_to_json()</function></link>
+        and <function>row_to_json()</function> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a <link linkend="datatype-serial"><type>SMALLSERIAL</></link>
+        Add a <link linkend="datatype-serial"><type>SMALLSERIAL</type></link>
         data type (Mike Pultz)
        </para>
 
        <para>
-        This is like <type>SERIAL</>, except it stores the sequence in
-        a two-byte integer column (<type>int2</>).
+        This is like <type>SERIAL</type>, except it stores the sequence in
+        a two-byte integer column (<type>int2</type>).
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-CREATEDOMAIN">domains</link> to be
-        declared <literal>NOT VALID</> (&Aacute;lvaro Herrera)
+        Allow <link linkend="sql-createdomain">domains</link> to be
+        declared <literal>NOT VALID</literal> (&Aacute;lvaro Herrera)
        </para>
 
        <para>
         This option can be set at domain creation time, or via <command>ALTER
-        DOMAIN</command> ... <literal>ADD CONSTRAINT</> ... <literal>NOT
-        VALID</>. <command>ALTER DOMAIN</command> ... <literal>VALIDATE
-        CONSTRAINT</> fully validates the constraint.
+        DOMAIN</command> ... <literal>ADD CONSTRAINT</literal> ... <literal>NOT
+        VALID</literal>. <command>ALTER DOMAIN</command> ... <literal>VALIDATE
+        CONSTRAINT</literal> fully validates the constraint.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Support more locale-specific formatting options for the <link
-        linkend="datatype-money"><type>money</></link> data type (Tom Lane)
+        linkend="datatype-money"><type>money</type></link> data type (Tom Lane)
        </para>
 
        <para>
@@ -10597,22 +10967,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add bitwise <quote>and</>, <quote>or</>, and <quote>not</>
-        operators for the <type>macaddr</> data type (Brendan Jurd)
+        Add bitwise <quote>and</quote>, <quote>or</quote>, and <quote>not</quote>
+        operators for the <type>macaddr</type> data type (Brendan Jurd)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow <link
-        linkend="functions-xml-processing"><function>xpath()</></link> to
+        linkend="functions-xml-processing"><function>xpath()</function></link> to
         return a single-element <acronym>XML</acronym> array when supplied a
         scalar value (Florian Pflug)
        </para>
 
        <para>
         Previously, it returned an empty array.  This change will also
-        cause <function>xpath_exists()</> to return true, not false,
+        cause <function>xpath_exists()</function> to return true, not false,
         for such expressions.
        </para>
       </listitem>
@@ -10636,9 +11006,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow non-superusers to use <link
-        linkend="functions-admin-signal"><function>pg_cancel_backend()</></link>
+        linkend="functions-admin-signal"><function>pg_cancel_backend()</function></link>
         and <link
-        linkend="functions-admin-signal"><function>pg_terminate_backend()</></link>
+        linkend="functions-admin-signal"><function>pg_terminate_backend()</function></link>
         on other sessions belonging to the same user
         (Magnus Hagander, Josh Kupershmidt, Dan Farina)
        </para>
@@ -10658,8 +11028,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
         This allows multiple transactions to share identical views of the
         database state.
         Snapshots are exported via <link
-        linkend="functions-snapshot-synchronization"><function>pg_export_snapshot()</></link>
-        and imported via <link linkend="SQL-SET-TRANSACTION"><command>SET
+        linkend="functions-snapshot-synchronization"><function>pg_export_snapshot()</function></link>
+        and imported via <link linkend="sql-set-transaction"><command>SET
         TRANSACTION SNAPSHOT</command></link>.  Only snapshots from
         currently-running transactions can be imported.
        </para>
@@ -10669,7 +11039,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        <para>
         Support <link
         linkend="functions-info-catalog-table"><literal>COLLATION
-        FOR</></link> on expressions (Peter Eisentraut)
+        FOR</literal></link> on expressions (Peter Eisentraut)
        </para>
 
        <para>
@@ -10680,23 +11050,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add <link
-        linkend="functions-info-schema-table"><function>pg_opfamily_is_visible()</></link>
+        linkend="functions-info-schema-table"><function>pg_opfamily_is_visible()</function></link>
         (Josh Kupershmidt)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add a <type>numeric</> variant of <link
-        linkend="functions-admin-dbsize"><function>pg_size_pretty()</></link>
-        for use with <function>pg_xlog_location_diff()</> (Fujii Masao)
+        Add a <type>numeric</type> variant of <link
+        linkend="functions-admin-dbsize"><function>pg_size_pretty()</function></link>
+        for use with <function>pg_xlog_location_diff()</function> (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link
-        linkend="functions-info-session-table"><function>pg_trigger_depth()</></link>
+        linkend="functions-info-session-table"><function>pg_trigger_depth()</function></link>
         function (Kevin Grittner)
        </para>
 
@@ -10708,8 +11078,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Allow <link
-        linkend="functions-aggregate-table"><function>string_agg()</></link>
-        to process <type>bytea</> values (Pavel Stehule)
+        linkend="functions-aggregate-table"><function>string_agg()</function></link>
+        to process <type>bytea</type> values (Pavel Stehule)
        </para>
       </listitem>
 
@@ -10720,7 +11090,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        For example, <literal>^(\w+)( \1)+$</>.  Previous releases did not
+        For example, <literal>^(\w+)( \1)+$</literal>.  Previous releases did not
         check that the back-reference actually matched the first occurrence.
        </para>
       </listitem>
@@ -10737,22 +11107,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add information schema views
-        <structname>role_udt_grants</>, <structname>udt_privileges</>,
-        and <structname>user_defined_types</> (Peter Eisentraut)
+        <structname>role_udt_grants</structname>, <structname>udt_privileges</structname>,
+        and <structname>user_defined_types</structname> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add composite-type attributes to the
-        information schema <structname>element_types</> view
+        information schema <structname>element_types</structname> view
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Implement <structfield>interval_type</> columns in the information
+        Implement <structfield>interval_type</structfield> columns in the information
         schema (Peter Eisentraut)
        </para>
 
@@ -10764,23 +11134,23 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Implement collation-related columns in the information schema
-        <structname>attributes</>, <structname>columns</>,
-        <structname>domains</>, and <structname>element_types</>
+        <structname>attributes</structname>, <structname>columns</structname>,
+        <structname>domains</structname>, and <structname>element_types</structname>
         views (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Implement the <structfield>with_hierarchy</> column in the
-        information schema <structname>table_privileges</> view (Peter
+        Implement the <structfield>with_hierarchy</structfield> column in the
+        information schema <structname>table_privileges</structname> view (Peter
         Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add display of sequence <literal>USAGE</> privileges to information
+        Add display of sequence <literal>USAGE</literal> privileges to information
         schema (Peter Eisentraut)
        </para>
       </listitem>
@@ -10811,7 +11181,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow the PL/pgSQL <command>OPEN</> cursor command to supply
+        Allow the PL/pgSQL <command>OPEN</command> cursor command to supply
         parameters by name (Yeb Havinga)
        </para>
       </listitem>
@@ -10833,7 +11203,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve performance and memory consumption for long chains of
-        <literal>ELSIF</> clauses (Tom Lane)
+        <literal>ELSIF</literal> clauses (Tom Lane)
        </para>
       </listitem>
 
@@ -10914,31 +11284,31 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <link linkend="APP-INITDB"><application>initdb</></link>
-        options <option>--auth-local</> and <option>--auth-host</>
+        Add <link linkend="app-initdb"><application>initdb</application></link>
+        options <option>--auth-local</option> and <option>--auth-host</option>
         (Peter Eisentraut)
        </para>
 
        <para>
-        This allows separate control of <literal>local</> and
-        <literal>host</> <filename>pg_hba.conf</filename> authentication
-        settings.  <option>--auth</> still controls both.
+        This allows separate control of <literal>local</literal> and
+        <literal>host</literal> <filename>pg_hba.conf</filename> authentication
+        settings.  <option>--auth</option> still controls both.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--replication</>/<option>--no-replication</> flags to
-        <link linkend="APP-CREATEUSER"><application>createuser</></link>
+        Add <option>--replication</option>/<option>--no-replication</option> flags to
+        <link linkend="app-createuser"><application>createuser</application></link>
         to control replication permission (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add the <option>--if-exists</> option to <link
-        linkend="APP-DROPDB"><application>dropdb</></link> and <link
-        linkend="APP-DROPUSER"><application>dropuser</></link> (Josh
+        Add the <option>--if-exists</option> option to <link
+        linkend="app-dropdb"><application>dropdb</application></link> and <link
+        linkend="app-dropuser"><application>dropuser</application></link> (Josh
         Kupershmidt)
        </para>
       </listitem>
@@ -10946,15 +11316,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Give command-line tools the ability to specify the name of the
-        database to connect to, and fall back to <literal>template1</>
-        if a <literal>postgres</> database connection fails (Robert Haas)
+        database to connect to, and fall back to <literal>template1</literal>
+        if a <literal>postgres</literal> database connection fails (Robert Haas)
        </para>
       </listitem>
 
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PSQL"><application>psql</></link></title>
+     <title><link linkend="app-psql"><application>psql</application></link></title>
 
      <itemizedlist>
 
@@ -10965,7 +11335,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This adds the <literal>auto</> option to the <command>\x</>
+        This adds the <literal>auto</literal> option to the <command>\x</command>
         command, which switches to the expanded mode when the normal
         output would be wider than the screen.
        </para>
@@ -10978,32 +11348,32 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        This is done with a new command <command>\ir</>.
+        This is done with a new command <command>\ir</command>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add support for non-<acronym>ASCII</acronym> characters in
-        <application>psql</> variable names (Tom Lane)
+        <application>psql</application> variable names (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for major-version-specific <filename>.psqlrc</> files
+        Add support for major-version-specific <filename>.psqlrc</filename> files
         (Bruce Momjian)
        </para>
 
        <para>
-        <application>psql</> already supported minor-version-specific
-        <filename>.psqlrc</> files.
+        <application>psql</application> already supported minor-version-specific
+        <filename>.psqlrc</filename> files.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Provide environment variable overrides for <application>psql</>
+        Provide environment variable overrides for <application>psql</application>
         history and startup file locations (Andrew Dunstan)
        </para>
 
@@ -11015,15 +11385,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <command>\setenv</> command to modify
+        Add a <command>\setenv</command> command to modify
         the environment variables passed to child processes (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Name <application>psql</>'s temporary editor files with a
-        <filename>.sql</> extension (Peter Eisentraut)
+        Name <application>psql</application>'s temporary editor files with a
+        <filename>.sql</filename> extension (Peter Eisentraut)
        </para>
 
        <para>
@@ -11033,19 +11403,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>psql</> to use zero-byte field and record
+        Allow <application>psql</application> to use zero-byte field and record
         separators (Peter Eisentraut)
        </para>
 
        <para>
         Various shell tools use zero-byte (NUL) separators,
-        e.g. <application>find</>.
+        e.g. <application>find</application>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make the <command>\timing</> option report times for
+        Make the <command>\timing</command> option report times for
         failed queries (Magnus Hagander)
        </para>
 
@@ -11056,13 +11426,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Unify and tighten <application>psql</>'s treatment of <command>\copy</>
-        and SQL <command>COPY</> (Noah Misch)
+        Unify and tighten <application>psql</application>'s treatment of <command>\copy</command>
+        and SQL <command>COPY</command> (Noah Misch)
        </para>
 
        <para>
         This fix makes failure behavior more predictable and honors
-        <command>\set ON_ERROR_ROLLBACK</>.
+        <command>\set ON_ERROR_ROLLBACK</command>.
        </para>
       </listitem>
 
@@ -11076,21 +11446,21 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <itemizedlist>
       <listitem>
        <para>
-        Make <command>\d</> on a sequence show the
+        Make <command>\d</command> on a sequence show the
         table/column name owning it (Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show statistics target for columns in <command>\d+</> (Magnus
+        Show statistics target for columns in <command>\d+</command> (Magnus
         Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show role password expiration dates in <command>\du</>
+        Show role password expiration dates in <command>\du</command>
         (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
@@ -11102,8 +11472,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        These are included in the output of <command>\dC+</>,
-        <command>\dc+</>, <command>\dD+</>, and <command>\dL</> respectively.
+        These are included in the output of <command>\dC+</command>,
+        <command>\dc+</command>, <command>\dD+</command>, and <command>\dL</command> respectively.
        </para>
       </listitem>
 
@@ -11114,15 +11484,15 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        These are included in the output of <command>\des+</>,
-        <command>\det+</>, and <command>\dew+</> for foreign servers, foreign
+        These are included in the output of <command>\des+</command>,
+        <command>\det+</command>, and <command>\dew+</command> for foreign servers, foreign
         tables, and foreign data wrappers respectively.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <command>\dd</> to display comments only for object types
+        Change <command>\dd</command> to display comments only for object types
         without their own backslash command (Josh Kupershmidt)
        </para>
       </listitem>
@@ -11138,9 +11508,9 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        In <application>psql</> tab completion, complete <acronym>SQL</>
+        In <application>psql</application> tab completion, complete <acronym>SQL</acronym>
         keywords in either upper or lower case according to the new <link
-        linkend="APP-PSQL-variables"><literal>COMP_KEYWORD_CASE</></link>
+        linkend="app-psql-variables"><literal>COMP_KEYWORD_CASE</literal></link>
         setting (Peter Eisentraut)
        </para>
       </listitem>
@@ -11179,14 +11549,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add an <option>--exclude-table-data</> option to
-        <application>pg_dump</> (Andrew Dunstan)
+        Add an <option>--exclude-table-data</option> option to
+        <application>pg_dump</application> (Andrew Dunstan)
        </para>
 
        <para>
@@ -11197,13 +11567,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <option>--section</> option to <application>pg_dump</>
-        and <application>pg_restore</> (Andrew Dunstan)
+        Add a <option>--section</option> option to <application>pg_dump</application>
+        and <application>pg_restore</application> (Andrew Dunstan)
        </para>
 
        <para>
-        Valid values are <literal>pre-data</>, <literal>data</>,
-        and <literal>post-data</>. The option can be
+        Valid values are <literal>pre-data</literal>, <literal>data</literal>,
+        and <literal>post-data</literal>. The option can be
         given more than once to select two or more sections.
        </para>
       </listitem>
@@ -11211,7 +11581,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Make <link
-        linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link> dump all
+        linkend="app-pg-dumpall"><application>pg_dumpall</application></link> dump all
         roles first, then all configuration settings on roles (Phil Sorber)
        </para>
 
@@ -11223,8 +11593,8 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_dumpall</> to avoid errors if the
-        <literal>postgres</> database is missing in the new cluster
+        Allow <application>pg_dumpall</application> to avoid errors if the
+        <literal>postgres</literal> database is missing in the new cluster
         (Robert Haas)
        </para>
       </listitem>
@@ -11249,13 +11619,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Tighten rules for when extension configuration tables are dumped
-        by <application>pg_dump</> (Tom Lane)
+        by <application>pg_dump</application> (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_dump</> emit more useful dependency
+        Make <application>pg_dump</application> emit more useful dependency
         information (Tom Lane)
        </para>
 
@@ -11269,7 +11639,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Improve <application>pg_dump</>'s performance when dumping many
+        Improve <application>pg_dump</application>'s performance when dumping many
         database objects (Tom Lane)
        </para>
       </listitem>
@@ -11281,19 +11651,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
    </sect3>
 
     <sect3>
-     <title><link linkend="libpq"><application>libpq</></link></title>
+     <title><link linkend="libpq"><application>libpq</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>libpq</> connection strings to have the format of a
+        Allow <application>libpq</application> connection strings to have the format of a
         <link linkend="libpq-connstring"><acronym>URI</acronym></link>
         (Alexander Shulgin)
        </para>
 
        <para>
-        The syntax begins with <literal>postgres://</>.  This can allow
+        The syntax begins with <literal>postgres://</literal>.  This can allow
         applications to avoid implementing their own parser for URIs
         representing database connections.
        </para>
@@ -11320,30 +11690,30 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Previously, <application>libpq</> always collected the entire query
+        Previously, <application>libpq</application> always collected the entire query
         result in memory before passing it back to the application.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <literal>const</> qualifiers to the declarations of the functions
-        <function>PQconnectdbParams</>, <function>PQconnectStartParams</>,
-        and <function>PQpingParams</> (Lionel Elie Mamane)
+        Add <literal>const</literal> qualifiers to the declarations of the functions
+        <function>PQconnectdbParams</function>, <function>PQconnectStartParams</function>,
+        and <function>PQpingParams</function> (Lionel Elie Mamane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow the <filename>.pgpass</> file to include escaped characters
+        Allow the <filename>.pgpass</filename> file to include escaped characters
         in the password field (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make library functions use <function>abort()</> instead of
-        <function>exit()</> when it is necessary to terminate the process
+        Make library functions use <function>abort()</function> instead of
+        <function>exit()</function> when it is necessary to terminate the process
         (Peter Eisentraut)
        </para>
 
@@ -11388,7 +11758,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Install <filename>plpgsql.h</> into <filename>include/server</> during installation
+        Install <filename>plpgsql.h</filename> into <filename>include/server</filename> during installation
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -11414,14 +11784,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Improve the concurrent transaction regression tests
-        (<application>isolationtester</>) (Noah Misch)
+        (<application>isolationtester</application>) (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Modify <application>thread_test</> to create its test files in
-        the current directory, rather than <filename>/tmp</> (Bruce Momjian)
+        Modify <application>thread_test</application> to create its test files in
+        the current directory, rather than <filename>/tmp</filename> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -11470,7 +11840,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add a <application>pg_upgrade</> test suite (Peter Eisentraut)
+        Add a <application>pg_upgrade</application> test suite (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -11490,14 +11860,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add options to <application>git_changelog</> for use in major
+        Add options to <application>git_changelog</application> for use in major
         release note creation (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support Linux's <filename>/proc/self/oom_score_adj</> API (Tom Lane)
+        Support Linux's <filename>/proc/self/oom_score_adj</filename> API (Tom Lane)
        </para>
       </listitem>
 
@@ -11519,13 +11889,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
        <para>
         This improvement does not apply to
-        <function>dblink_send_query()</>/<function>dblink_get_result()</>.
+        <function>dblink_send_query()</function>/<function>dblink_get_result()</function>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <literal>force_not_null</> option in <link
+        Support <literal>force_not_null</literal> option in <link
         linkend="file-fdw">file_fdw</link> (Shigeru Hanada)
        </para>
       </listitem>
@@ -11533,7 +11903,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Implement dry-run mode for <link
-        linkend="pgarchivecleanup"><application>pg_archivecleanup</></link>
+        linkend="pgarchivecleanup"><application>pg_archivecleanup</application></link>
         (Gabriele Bartolini)
        </para>
 
@@ -11545,29 +11915,29 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add new <link linkend="pgbench">pgbench</link> switches
-        <option>--unlogged-tables</>, <option>--tablespace</>, and
-        <option>--index-tablespace</> (Robert Haas)
+        <option>--unlogged-tables</option>, <option>--tablespace</option>, and
+        <option>--index-tablespace</option> (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Change <link
-        linkend="pgtestfsync"><application>pg_test_fsync</></link> to test
+        linkend="pgtestfsync"><application>pg_test_fsync</application></link> to test
         for a fixed amount of time, rather than a fixed number of cycles
         (Bruce Momjian)
        </para>
 
        <para>
-        The <option>-o</>/cycles option was removed, and
-        <option>-s</>/seconds added.
+        The <option>-o</option>/cycles option was removed, and
+        <option>-s</option>/seconds added.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link
-        linkend="pgtesttiming"><application>pg_test_timing</></link>
+        linkend="pgtesttiming"><application>pg_test_timing</application></link>
         utility to measure clock monotonicity and timing overhead (Ants
         Aasma, Greg Smith)
        </para>
@@ -11584,19 +11954,19 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="pgupgrade"><application>pg_upgrade</></link></title>
+     <title><link linkend="pgupgrade"><application>pg_upgrade</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Adjust <application>pg_upgrade</> environment variables (Bruce
+        Adjust <application>pg_upgrade</application> environment variables (Bruce
         Momjian)
        </para>
 
        <para>
         Rename data, bin, and port environment
-        variables to begin with <literal>PG</>, and support
+        variables to begin with <literal>PG</literal>, and support
         <envar>PGPORTOLD</envar>/<envar>PGPORTNEW</envar>, to replace
         <envar>PGPORT</envar>.
        </para>
@@ -11604,22 +11974,22 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Overhaul <application>pg_upgrade</> logging and failure reporting
+        Overhaul <application>pg_upgrade</application> logging and failure reporting
         (Bruce Momjian)
        </para>
 
        <para>
         Create four append-only log files, and delete them on success.
-        Add <option>-r</>/<option>--retain</> option to unconditionally
-        retain these files.  Also remove <application>pg_upgrade</> options
-        <option>-g</>/<option>-G</>/<option>-l</> options as unnecessary,
+        Add <option>-r</option>/<option>--retain</option> option to unconditionally
+        retain these files.  Also remove <application>pg_upgrade</application> options
+        <option>-g</option>/<option>-G</option>/<option>-l</option> options as unnecessary,
         and tighten log file permissions.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> create a script to incrementally
+        Make <application>pg_upgrade</application> create a script to incrementally
         generate more accurate optimizer statistics (Bruce Momjian)
        </para>
 
@@ -11631,14 +12001,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to upgrade an old cluster that
-        does not have a <literal>postgres</> database (Bruce Momjian)
+        Allow <application>pg_upgrade</application> to upgrade an old cluster that
+        does not have a <literal>postgres</literal> database (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to handle cases where some
+        Allow <application>pg_upgrade</application> to handle cases where some
         old or new databases are missing, as long as they are empty
         (Bruce Momjian)
        </para>
@@ -11646,14 +12016,14 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to handle configuration-only
+        Allow <application>pg_upgrade</application> to handle configuration-only
         directory installations (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>pg_upgrade</>, add <option>-o</>/<option>-O</>
+        In <application>pg_upgrade</application>, add <option>-o</option>/<option>-O</option>
         options to pass parameters to the servers (Bruce Momjian)
        </para>
 
@@ -11664,7 +12034,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Change <application>pg_upgrade</> to use port 50432 by default
+        Change <application>pg_upgrade</application> to use port 50432 by default
         (Bruce Momjian)
        </para>
 
@@ -11675,7 +12045,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Reduce cluster locking in <application>pg_upgrade</> (Bruce
+        Reduce cluster locking in <application>pg_upgrade</application> (Bruce
         Momjian)
        </para>
 
@@ -11690,13 +12060,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
     </sect4>
 
     <sect4>
-     <title><link linkend="pgstatstatements"><application>pg_stat_statements</></link></title>
+     <title><link linkend="pgstatstatements"><application>pg_stat_statements</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>pg_stat_statements</> to aggregate similar
+        Allow <application>pg_stat_statements</application> to aggregate similar
         queries via SQL text normalization (Peter Geoghegan, Tom Lane)
        </para>
 
@@ -11709,13 +12079,13 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Add dirtied and written block counts and read/write times to
-        <application>pg_stat_statements</> (Robert Haas, Ants Aasma)
+        <application>pg_stat_statements</application> (Robert Haas, Ants Aasma)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Prevent <application>pg_stat_statements</> from double-counting
+        Prevent <application>pg_stat_statements</application> from double-counting
         <command>PREPARE</command> and <command>EXECUTE</command> commands
         (Tom Lane)
        </para>
@@ -11731,7 +12101,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
      <itemizedlist>
       <listitem>
        <para>
-        Support <literal>SECURITY LABEL</> on global objects (KaiGai
+        Support <literal>SECURITY LABEL</literal> on global objects (KaiGai
         Kohei, Robert Haas)
        </para>
 
@@ -11756,7 +12126,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Add <function>sepgsql_setcon()</> and related functions to control
+        Add <function>sepgsql_setcon()</function> and related functions to control
         the sepgsql security domain (KaiGai Kohei)
        </para>
       </listitem>
@@ -11785,7 +12155,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
        </para>
 
        <para>
-        Use <command>gmake STYLE=website draft</>.
+        Use <command>gmake STYLE=website draft</command>.
        </para>
       </listitem>
 
@@ -11798,7 +12168,7 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
       <listitem>
        <para>
         Document that user/database names are preserved with double-quoting
-        by command-line tools like <application>vacuumdb</>  (Bruce
+        by command-line tools like <application>vacuumdb</application>  (Bruce
         Momjian)
        </para>
       </listitem>
@@ -11812,12 +12182,12 @@ Branch: REL9_2_STABLE [6b700301c] 2015-02-17 16:03:00 +0100
 
       <listitem>
        <para>
-        Deprecate use of <literal>GLOBAL</> and <literal>LOCAL</> in
-        <command>CREATE TEMP TABLE</> (Noah Misch)
+        Deprecate use of <literal>GLOBAL</literal> and <literal>LOCAL</literal> in
+        <command>CREATE TEMP TABLE</command> (Noah Misch)
        </para>
 
        <para>
-        <productname>PostgreSQL</> has long treated these keyword as no-ops,
+        <productname>PostgreSQL</productname> has long treated these keyword as no-ops,
         and continues to do so; but in future they might mean what the SQL
         standard says they mean, so applications should avoid using them.
        </para>
diff --git a/doc/src/sgml/release-9.3.sgml b/doc/src/sgml/release-9.3.sgml
index e95efefd66..015c2211b0 100644
--- a/doc/src/sgml/release-9.3.sgml
+++ b/doc/src/sgml/release-9.3.sgml
@@ -1,6 +1,919 @@
 <!-- doc/src/sgml/release-9.3.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-3-22">
+  <title>Release 9.3.22</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-03-01</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.21.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.22</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you run an installation in which not all users are mutually
+    trusting, or if you maintain an application or extension that is
+    intended for use in arbitrary situations, it is strongly recommended
+    that you read the documentation changes described in the first changelog
+    entry below, and take suitable steps to ensure that your installation or
+    code is secure.
+   </para>
+
+   <para>
+    Also, the changes described in the second changelog entry below may
+    cause functions used in index expressions or materialized views to fail
+    during auto-analyze, or when reloading from a dump.  After upgrading,
+    monitor the server logs for such problems, and fix affected functions.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.3.18,
+    see <xref linkend="release-9-3-18"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Document how to configure installations and applications to guard
+      against search-path-dependent trojan-horse attacks from other users
+      (Noah Misch)
+     </para>
+
+     <para>
+      Using a <varname>search_path</varname> setting that includes any
+      schemas writable by a hostile user enables that user to capture
+      control of queries and then run arbitrary SQL code with the
+      permissions of the attacked user.  While it is possible to write
+      queries that are proof against such hijacking, it is notationally
+      tedious, and it's very easy to overlook holes.  Therefore, we now
+      recommend configurations in which no untrusted schemas appear in
+      one's search path.  Relevant documentation appears in
+      <xref linkend="ddl-schemas-patterns"/> (for database administrators and users),
+      <xref linkend="libpq-connect"/> (for application authors),
+      <xref linkend="extend-extensions-style"/>  (for extension authors), and
+      <xref linkend="sql-createfunction"/> (for authors
+      of <literal>SECURITY DEFINER</literal> functions).
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid use of insecure <varname>search_path</varname> settings
+      in <application>pg_dump</application> and other client programs
+      (Noah Misch, Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</application>,
+      <application>pg_upgrade</application>,
+      <application>vacuumdb</application> and
+      other <productname>PostgreSQL</productname>-provided applications were
+      themselves vulnerable to the type of hijacking described in the previous
+      changelog entry; since these applications are commonly run by
+      superusers, they present particularly attractive targets.  To make them
+      secure whether or not the installation as a whole has been secured,
+      modify them to include only the <structname>pg_catalog</structname>
+      schema in their <varname>search_path</varname> settings.
+      Autovacuum worker processes now do the same, as well.
+     </para>
+
+     <para>
+      In cases where user-provided functions are indirectly executed by
+      these programs &mdash; for example, user-provided functions in index
+      expressions &mdash; the tighter <varname>search_path</varname> may
+      result in errors, which will need to be corrected by adjusting those
+      user-provided functions to not assume anything about what search path
+      they are invoked under.  That has always been good practice, but now
+      it will be necessary for correct behavior.
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix misbehavior of concurrent-update rechecks with CTE references
+      appearing in subplans (Tom Lane)
+     </para>
+
+     <para>
+      If a CTE (<literal>WITH</literal> clause reference) is used in an
+      InitPlan or SubPlan, and the query requires a recheck due to trying
+      to update or lock a concurrently-updated row, incorrect results could
+      be obtained.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planner failures with overlapping mergejoin clauses in an outer
+      join (Tom Lane)
+     </para>
+
+     <para>
+      These mistakes led to <quote>left and right pathkeys do not match in
+      mergejoin</quote> or <quote>outer pathkeys do not match
+      mergeclauses</quote> planner errors in corner cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair <application>pg_upgrade</application>'s failure to
+      preserve <structfield>relfrozenxid</structfield> for materialized
+      views (Tom Lane, Andres Freund)
+     </para>
+
+     <para>
+      This oversight could lead to data corruption in materialized views
+      after an upgrade, manifesting as <quote>could not access status of
+      transaction</quote> or <quote>found xmin from before
+      relfrozenxid</quote> errors.  The problem would be more likely to
+      occur in seldom-refreshed materialized views, or ones that were
+      maintained only with <command>REFRESH MATERIALIZED VIEW
+      CONCURRENTLY</command>.
+     </para>
+
+     <para>
+      If such corruption is observed, it can be repaired by refreshing the
+      materialized view (without <literal>CONCURRENTLY</literal>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reporting of PL/Python function names in
+      error <literal>CONTEXT</literal> stacks (Tom Lane)
+     </para>
+
+     <para>
+      An error occurring within a nested PL/Python function call (that is,
+      one reached via a SPI query from another PL/Python function) would
+      result in a stack trace showing the inner function's name twice,
+      rather than the expected results.  Also, an error in a nested
+      PL/Python <literal>DO</literal> block could result in a null pointer
+      dereference crash on some platforms.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <filename>contrib/auto_explain</filename>'s
+      <varname>log_min_duration</varname> setting to range up
+      to <literal>INT_MAX</literal>, or about 24 days instead of 35 minutes
+      (Tom Lane)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-21">
+  <title>Release 9.3.21</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-02-08</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.20.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.21</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.18,
+    see <xref linkend="release-9-3-18"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that all temporary files made
+      by <application>pg_upgrade</application> are non-world-readable
+      (Tom Lane, Noah Misch)
+     </para>
+
+     <para>
+      <application>pg_upgrade</application> normally restricts its
+      temporary files to be readable and writable only by the calling user.
+      But the temporary file containing <literal>pg_dumpall -g</literal>
+      output would be group- or world-readable, or even writable, if the
+      user's <literal>umask</literal> setting allows.  In typical usage on
+      multi-user machines, the <literal>umask</literal> and/or the working
+      directory's permissions would be tight enough to prevent problems;
+      but there may be people using <application>pg_upgrade</application>
+      in scenarios where this oversight would permit disclosure of database
+      passwords to unfriendly eyes.
+      (CVE-2018-1053)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix vacuuming of tuples that were updated while key-share locked
+      (Andres Freund, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In some cases <command>VACUUM</command> would fail to remove such
+      tuples even though they are now dead, leading to assorted data
+      corruption scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix inadequate buffer locking in some LSN fetches (Jacob Champion,
+      Asim Praveen, Ashwin Agrawal)
+     </para>
+
+     <para>
+      These errors could result in misbehavior under concurrent load.
+      The potential consequences have not been characterized fully.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary failure in a query on an inheritance tree that
+      occurs concurrently with some child table being removed from the tree
+      by <command>ALTER TABLE NO INHERIT</command> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair failure with correlated sub-<literal>SELECT</literal>
+      inside <literal>VALUES</literal> inside a <literal>LATERAL</literal>
+      subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>could not devise a query plan for the given query</quote>
+      planner failure for some cases involving nested <literal>UNION
+      ALL</literal> inside a lateral subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>has_sequence_privilege()</function> to
+      support <literal>WITH GRANT OPTION</literal> tests,
+      as other privilege-testing functions do (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In databases using UTF8 encoding, ignore any XML declaration that
+      asserts a different encoding (Pavel Stehule, Noah Misch)
+     </para>
+
+     <para>
+      We always store XML strings in the database encoding, so allowing
+      libxml to act on a declaration of another encoding gave wrong results.
+      In encodings other than UTF8, we don't promise to support non-ASCII
+      XML data anyway, so retain the previous behavior for bug compatibility.
+      This change affects only <function>xpath()</function> and related
+      functions; other XML code paths already acted this way.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide for forward compatibility with future minor protocol versions
+      (Robert Haas, Badrul Chowdhury)
+     </para>
+
+     <para>
+      Up to now, <productname>PostgreSQL</productname> servers simply
+      rejected requests to use protocol versions newer than 3.0, so that
+      there was no functional difference between the major and minor parts
+      of the protocol version number.  Allow clients to request versions 3.x
+      without failing, sending back a message showing that the server only
+      understands 3.0.  This makes no difference at the moment, but
+      back-patching this change should allow speedier introduction of future
+      minor protocol upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent stack-overflow crashes when planning extremely deeply
+      nested set operations
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix null-pointer crashes for some types of LDAP URLs appearing
+      in <filename>pg_hba.conf</filename> (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample <function>INSTR()</function> functions in the PL/pgSQL
+      documentation (Yugo Nagata, Tom Lane)
+     </para>
+
+     <para>
+      These functions are stated to
+      be <trademark class="registered">Oracle</trademark> compatible, but
+      they weren't exactly.  In particular, there was a discrepancy in the
+      interpretation of a negative third parameter: Oracle thinks that a
+      negative value indicates the last place where the target substring can
+      begin, whereas our functions took it as the last place where the
+      target can end.  Also, Oracle throws an error for a zero or negative
+      fourth parameter, whereas our functions returned zero.
+     </para>
+
+     <para>
+      The sample code has been adjusted to match Oracle's behavior more
+      precisely.  Users who have copied this code into their applications
+      may wish to update their copies.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</application> to make ACL (permissions),
+      comment, and security label entries reliably identifiable in archive
+      output formats (Tom Lane)
+     </para>
+
+     <para>
+      The <quote>tag</quote> portion of an ACL archive entry was usually
+      just the name of the associated object.  Make it start with the object
+      type instead, bringing ACLs into line with the convention already used
+      for comment and security label archive entries.  Also, fix the
+      comment and security label entries for the whole database, if present,
+      to make their tags start with <literal>DATABASE</literal> so that they
+      also follow this convention.  This prevents false matches in code that
+      tries to identify large-object-related entries by seeing if the tag
+      starts with <literal>LARGE OBJECT</literal>.  That could have resulted
+      in misclassifying entries as data rather than schema, with undesirable
+      results in a schema-only or data-only dump.
+     </para>
+
+     <para>
+      Note that this change has user-visible results in the output
+      of <command>pg_restore --list</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpg</application>, detect indicator arrays that do
+      not have the correct length and report an error (David Rader)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid triggering a libc assertion
+      in <filename>contrib/hstore</filename>, due to use
+      of <function>memcpy()</function> with equal source and destination
+      pointers (Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide modern examples of how to auto-start Postgres on macOS
+      (Tom Lane)
+     </para>
+
+     <para>
+      The scripts in <filename>contrib/start-scripts/osx</filename> use
+      infrastructure that's been deprecated for over a decade, and which no
+      longer works at all in macOS releases of the last couple of years.
+      Add a new subdirectory <filename>contrib/start-scripts/macos</filename>
+      containing scripts that use the newer <application>launchd</application>
+      infrastructure.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect selection of configuration-specific libraries for
+      OpenSSL on Windows (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support linking to MinGW-built versions of libperl (Noah Misch)
+     </para>
+
+     <para>
+      This allows building PL/Perl with some common Perl distributions for
+      Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix MSVC build to test whether 32-bit libperl
+      needs <literal>-D_USE_32BIT_TIME_T</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Available Perl distributions are inconsistent about what they expect,
+      and lack any reliable means of reporting it, so resort to a build-time
+      test on what the library being used actually does.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, install the crash dump handler earlier in postmaster
+      startup (Takayuki Tsunakawa)
+     </para>
+
+     <para>
+      This may allow collection of a core dump for some early-startup
+      failures that did not produce a dump before.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, avoid encoding-conversion-related crashes when emitting
+      messages very early in postmaster startup (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use our existing Motorola 68K spinlock code on OpenBSD as
+      well as NetBSD (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add support for spinlocks on Motorola 88K (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2018c for DST law changes in Brazil, Sao Tome and Principe,
+      plus historical corrections for Bolivia, Japan, and South Sudan.
+      The <literal>US/Pacific-New</literal> zone has been removed (it was
+      only an alias for <literal>America/Los_Angeles</literal> anyway).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-20">
+  <title>Release 9.3.20</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.3.19.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.20</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.18,
+    see <xref linkend="release-9-3-18"/>.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix crash due to rowtype mismatch
+      in <function>json{b}_populate_recordset()</function>
+      (Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      These functions used the result rowtype specified in the <literal>FROM
+      ... AS</literal> clause without checking that it matched the actual
+      rowtype of the supplied tuple value.  If it didn't, that would usually
+      result in a crash, though disclosure of server memory contents seems
+      possible as well.
+      (CVE-2017-15098)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-3-19">
+  <title>Release 9.3.19</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-31</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 9.3.18.
+   For information about new features in the 9.3 major release, see
+   <xref linkend="release-9-3"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.3.19</title>
+
+   <para>
+    A dump/restore is not required for those running 9.3.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.3.18,
+    see <xref linkend="release-9-3-18"/>.
+   </para>
+
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Show foreign tables
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
+      view (Peter Eisentraut)
+     </para>
+
+     <para>
+      All other relevant <structname>information_schema</structname> views include
+      foreign tables, but this one ignored them.
+     </para>
+
+     <para>
+      Since this view definition is installed by <application>initdb</application>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can, as a superuser, do this
+      in <application>psql</application>:
+<programlisting>
+SET search_path TO information_schema;
+CREATE OR REPLACE VIEW table_privileges AS
+    SELECT CAST(u_grantor.rolname AS sql_identifier) AS grantor,
+           CAST(grantee.rolname AS sql_identifier) AS grantee,
+           CAST(current_database() AS sql_identifier) AS table_catalog,
+           CAST(nc.nspname AS sql_identifier) AS table_schema,
+           CAST(c.relname AS sql_identifier) AS table_name,
+           CAST(c.prtype AS character_data) AS privilege_type,
+           CAST(
+             CASE WHEN
+                  -- object owner always has grant options
+                  pg_has_role(grantee.oid, c.relowner, 'USAGE')
+                  OR c.grantable
+                  THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_grantable,
+           CAST(CASE WHEN c.prtype = 'SELECT' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS with_hierarchy
+
+    FROM (
+            SELECT oid, relname, relnamespace, relkind, relowner, (aclexplode(coalesce(relacl, acldefault('r', relowner)))).* FROM pg_class
+         ) AS c (oid, relname, relnamespace, relkind, relowner, grantor, grantee, prtype, grantable),
+         pg_namespace nc,
+         pg_authid u_grantor,
+         (
+           SELECT oid, rolname FROM pg_authid
+           UNION ALL
+           SELECT 0::oid, 'PUBLIC'
+         ) AS grantee (oid, rolname)
+
+    WHERE c.relnamespace = nc.oid
+          AND c.relkind IN ('r', 'v', 'f')
+          AND c.grantee = grantee.oid
+          AND c.grantor = u_grantor.oid
+          AND c.prtype IN ('INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER')
+          AND (pg_has_role(u_grantor.oid, 'USAGE')
+               OR pg_has_role(grantee.oid, 'USAGE')
+               OR grantee.rolname = 'PUBLIC');
+</programlisting>
+      This must be repeated in each database to be fixed,
+      including <literal>template0</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Clean up handling of a fatal exit (e.g., due to receipt
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
+     </para>
+
+     <para>
+      This situation could result in an assertion failure.  In production
+      builds, the exit would still occur, but it would log an unexpected
+      message about <quote>cannot drop active portal</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove assertion that could trigger during a fatal exit (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly identify columns that are of a range type or domain type over
+      a composite type or domain type being searched for (Tom Lane)
+     </para>
+
+     <para>
+      Certain <command>ALTER</command> commands that change the definition of a
+      composite type or domain type are supposed to fail if there are any
+      stored values of that type in the database, because they lack the
+      infrastructure needed to update or check such values.  Previously,
+      these checks could miss relevant values that are wrapped inside range
+      types or sub-domains, possibly allowing the database to become
+      inconsistent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <application>pg_restore</application> when using parallel mode and
+      using a list file to select a subset of items to restore
+      (Fabr&iacute;zio de Royes Mello)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
+      clauses without attached C variables (Michael Meskes)
+     </para>
+
+     <para>
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
+      rather than using it to define values to be returned to the client.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve selection of compiler flags for PL/Perl on Windows (Tom Lane)
+     </para>
+
+     <para>
+      This fix avoids possible crashes of PL/Perl due to inconsistent
+      assumptions about the width of <type>time_t</type> values.
+      A side-effect that may be visible to extension developers is
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-3-18">
   <title>Release 9.3.18</title>
 
@@ -12,7 +925,7 @@
   <para>
    This release contains a variety of fixes from 9.3.17.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -29,7 +942,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.16,
-    see <xref linkend="release-9-3-16">.
+    see <xref linkend="release-9-3-16"/>.
    </para>
 
   </sect2>
@@ -42,7 +955,7 @@
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -50,11 +963,11 @@
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -69,15 +982,15 @@
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -108,15 +1021,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -130,7 +1043,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -144,16 +1057,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -221,7 +1134,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"/> on
       Solaris (Tom Lane)
      </para>
     </listitem>
@@ -253,28 +1166,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -282,7 +1195,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -290,56 +1203,56 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -350,20 +1263,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -376,9 +1289,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -389,8 +1302,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -401,7 +1314,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -414,14 +1327,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -432,14 +1345,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -447,13 +1360,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -461,7 +1374,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -473,8 +1386,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"/> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -486,9 +1399,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -499,7 +1412,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -511,7 +1424,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -531,27 +1444,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -571,7 +1484,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.3.16.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -588,7 +1501,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.16,
-    see <xref linkend="release-9-3-16">.
+    see <xref linkend="release-9-3-16"/>.
    </para>
 
   </sect2>
@@ -601,18 +1514,18 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -623,7 +1536,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       By itself, this patch will only fix the behavior in newly initdb'd
       databases.  If you wish to apply this change in an existing database,
       follow the corrected procedure shown in the changelog entry for
-      CVE-2017-7547, in <xref linkend="release-9-3-18">.
+      CVE-2017-7547, in <xref linkend="release-9-3-18"/>.
      </para>
     </listitem>
 
@@ -636,7 +1549,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -650,17 +1563,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -668,7 +1581,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -681,7 +1594,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -689,7 +1602,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -704,19 +1617,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -724,27 +1637,27 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -758,33 +1671,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -802,21 +1715,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -831,20 +1744,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -856,26 +1769,26 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -888,7 +1801,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -930,7 +1843,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -944,9 +1857,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -959,16 +1872,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
-      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones"/>).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
      </para>
@@ -990,7 +1903,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.3.15.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -1008,7 +1921,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.15,
-    see <xref linkend="release-9-3-15">.
+    see <xref linkend="release-9-3-15"/>.
    </para>
 
   </sect2>
@@ -1021,15 +1934,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1038,13 +1951,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
-      Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      Previously, this was skipped when <xref linkend="guc-wal-level"/>
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1098,13 +2011,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
      <para>
       Previously, non-default settings
-      of <xref linkend="guc-default-tablespace"> could result in broken
+      of <xref linkend="guc-default-tablespace"/> could result in broken
       indexes.
      </para>
     </listitem>
@@ -1116,15 +2029,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1138,7 +2051,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1168,13 +2081,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1182,12 +2095,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1202,15 +2115,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1221,33 +2134,33 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1259,8 +2172,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1272,15 +2185,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1293,14 +2206,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1319,21 +2232,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1345,23 +2258,23 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1372,22 +2285,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -1413,7 +2326,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1438,7 +2351,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.3.14.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -1456,7 +2369,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -1477,7 +2390,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -1485,19 +2398,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -1531,71 +2444,71 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
-      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+      Fix <command>EXPLAIN</command> to emit valid XML when
+      <xref linkend="guc-track-io-timing"/> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -1617,7 +2530,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -1631,7 +2544,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -1642,30 +2555,30 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -1673,8 +2586,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -1685,7 +2598,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -1693,8 +2606,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -1715,17 +2628,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -1738,15 +2651,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -1767,7 +2680,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.3.13.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -1779,7 +2692,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -1792,17 +2705,17 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -1816,7 +2729,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -1825,22 +2738,22 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -1850,40 +2763,40 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -1894,19 +2807,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -1916,8 +2829,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -1931,7 +2844,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -1957,15 +2870,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -1994,12 +2907,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -2008,12 +2921,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -2028,15 +2941,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -2048,7 +2961,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -2083,8 +2996,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -2097,53 +3010,53 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -2151,8 +3064,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -2164,7 +3077,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -2176,7 +3089,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -2197,13 +3110,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -2223,7 +3136,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -2235,7 +3148,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -2257,7 +3170,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
   <para>
    This release contains a variety of fixes from 9.3.12.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -2269,7 +3182,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -2291,7 +3204,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -2300,7 +3213,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -2314,10 +3227,10 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -2325,8 +3238,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -2338,28 +3251,28 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -2367,20 +3280,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -2415,22 +3328,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -2443,19 +3356,19 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -2463,9 +3376,9 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -2487,7 +3400,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
   <para>
    This release contains a variety of fixes from 9.3.11.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -2499,7 +3412,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -2512,56 +3425,56 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -2587,27 +3500,27 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -2621,26 +3534,26 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -2668,21 +3581,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -2706,7 +3619,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
   <para>
    This release contains a variety of fixes from 9.3.10.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -2718,7 +3631,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -2743,25 +3656,25 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -2770,7 +3683,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -2796,21 +3709,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -2819,7 +3732,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -2833,13 +3746,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix planner's handling of <literal>LATERAL</> references (Tom
+      Fix planner's handling of <literal>LATERAL</literal> references (Tom
       Lane)
      </para>
 
      <para>
       This fixes some corner cases that led to <quote>failed to build any
-      N-way joins</> or <quote>could not devise a query plan</> planner
+      N-way joins</quote> or <quote>could not devise a query plan</quote> planner
       failures.
      </para>
     </listitem>
@@ -2861,22 +3774,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Speed up generation of unique table aliases in <command>EXPLAIN</> and
+      Speed up generation of unique table aliases in <command>EXPLAIN</command> and
       rule dumping, and ensure that generated aliases do not
-      exceed <literal>NAMEDATALEN</> (Tom Lane)
+      exceed <literal>NAMEDATALEN</literal> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -2928,7 +3841,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -2941,14 +3854,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -2961,7 +3874,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -2987,13 +3900,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -3001,15 +3914,15 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -3017,21 +3930,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -3039,23 +3952,23 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -3063,18 +3976,18 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -3084,51 +3997,51 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid repeated password prompts during parallel <application>pg_dump</>
+      Avoid repeated password prompts during parallel <application>pg_dump</application>
       (Zeus Kronion)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -3137,22 +4050,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -3160,42 +4073,42 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix premature clearing of <application>libpq</>'s input buffer when
+      Fix premature clearing of <application>libpq</application>'s input buffer when
       socket EOF is seen (Tom Lane)
      </para>
 
      <para>
-      This mistake caused <application>libpq</> to sometimes not report the
+      This mistake caused <application>libpq</application> to sometimes not report the
       backend's final error message before reporting <quote>server closed the
-      connection unexpectedly</>.
+      connection unexpectedly</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3203,36 +4116,36 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -3243,14 +4156,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -3274,19 +4187,19 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -3294,11 +4207,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -3307,7 +4220,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -3329,7 +4242,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
   <para>
    This release contains a variety of fixes from 9.3.9.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -3341,7 +4254,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.9,
-    see <xref linkend="release-9-3-9">.
+    see <xref linkend="release-9-3-9"/>.
    </para>
 
   </sect2>
@@ -3353,13 +4266,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Guard against stack overflows in <type>json</> parsing
+      Guard against stack overflows in <type>json</type> parsing
       (Oskari Saarenmaa)
      </para>
 
      <para>
-      If an application constructs PostgreSQL <type>json</>
-      or <type>jsonb</> values from arbitrary user input, the application's
+      If an application constructs PostgreSQL <type>json</type>
+      or <type>jsonb</type> values from arbitrary user input, the application's
       users can reliably crash the PostgreSQL server, causing momentary
       denial of service.  (CVE-2015-5289)
      </para>
@@ -3367,8 +4280,8 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -3401,13 +4314,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -3425,7 +4338,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -3437,7 +4350,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      This was seen primarily when restoring <application>pg_dump</> output
+      This was seen primarily when restoring <application>pg_dump</application> output
       for databases with many thousands of tables.
      </para>
     </listitem>
@@ -3452,13 +4365,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -3470,7 +4383,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
@@ -3478,15 +4391,15 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid logging complaints when a parameter that can only be set at
-      server start appears multiple times in <filename>postgresql.conf</>,
-      and fix counting of line numbers after an <literal>include_dir</>
+      server start appears multiple times in <filename>postgresql.conf</filename>,
+      and fix counting of line numbers after an <literal>include_dir</literal>
       directive (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3494,21 +4407,21 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -3521,7 +4434,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -3573,22 +4486,22 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -3601,9 +4514,9 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -3611,7 +4524,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -3632,12 +4545,12 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -3664,7 +4577,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -3701,7 +4614,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -3709,44 +4622,44 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -3758,20 +4671,20 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/postgres_fdw</>'s handling of
+      Improve <filename>contrib/postgres_fdw</filename>'s handling of
       collation-related decisions (Tom Lane)
      </para>
 
      <para>
       The main user-visible effect is expected to be that comparisons
-      involving <type>varchar</> columns will be sent to the remote server
+      involving <type>varchar</type> columns will be sent to the remote server
       for execution in more cases than before.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -3779,64 +4692,64 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -3844,11 +4757,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -3857,18 +4770,18 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -3876,11 +4789,11 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -3888,14 +4801,14 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -3907,38 +4820,38 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -3958,7 +4871,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
   <para>
    This release contains a small number of fixes from 9.3.8.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -3970,13 +4883,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading an installation that was previously
-    upgraded using a <application>pg_upgrade</> version between 9.3.0 and
+    upgraded using a <application>pg_upgrade</application> version between 9.3.0 and
     9.3.4 inclusive, see the first changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.7,
-    see <xref linkend="release-9-3-7">.
+    see <xref linkend="release-9-3-7"/>.
    </para>
 
   </sect2>
@@ -3993,52 +4906,52 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      Recent <productname>PostgreSQL</> releases introduced mechanisms to
+      Recent <productname>PostgreSQL</productname> releases introduced mechanisms to
       protect against multixact wraparound, but some of that code did not
       account for the possibility that it would need to run during crash
       recovery, when the database may not be in a consistent state.  This
       could result in failure to restart after a crash, or failure to start
       up a secondary server.  The lingering effects of a previously-fixed
-      bug in <application>pg_upgrade</> could also cause such a failure, in
-      installations that had used <application>pg_upgrade</> versions
+      bug in <application>pg_upgrade</application> could also cause such a failure, in
+      installations that had used <application>pg_upgrade</application> versions
       between 9.3.0 and 9.3.4.
      </para>
 
      <para>
-      The <application>pg_upgrade</> bug in question was that it would
-      set <literal>oldestMultiXid</> to 1 in <filename>pg_control</> even
+      The <application>pg_upgrade</application> bug in question was that it would
+      set <literal>oldestMultiXid</literal> to 1 in <filename>pg_control</filename> even
       if the true value should be higher.  With the fixes introduced in
       this release, such a situation will result in immediate emergency
-      autovacuuming until a correct <literal>oldestMultiXid</> value can be
+      autovacuuming until a correct <literal>oldestMultiXid</literal> value can be
       determined.  If that would pose a hardship, users can avoid it by
-      doing manual vacuuming <emphasis>before</> upgrading to this release.
+      doing manual vacuuming <emphasis>before</emphasis> upgrading to this release.
       In detail:
 
       <orderedlist>
        <listitem>
         <para>
-         Check whether <application>pg_controldata</> reports <quote>Latest
-         checkpoint's oldestMultiXid</> to be 1.  If not, there's nothing
+         Check whether <application>pg_controldata</application> reports <quote>Latest
+         checkpoint's oldestMultiXid</quote> to be 1.  If not, there's nothing
          to do.
         </para>
        </listitem>
        <listitem>
         <para>
-         Look in <filename>PGDATA/pg_multixact/offsets</> to see if there's a
-         file named <filename>0000</>.  If there is, there's nothing to do.
+         Look in <filename>PGDATA/pg_multixact/offsets</filename> to see if there's a
+         file named <filename>0000</filename>.  If there is, there's nothing to do.
         </para>
        </listitem>
        <listitem>
         <para>
          Otherwise, for each table that has
-         <structname>pg_class</>.<structfield>relminmxid</> equal to 1,
-         <command>VACUUM</> that table with
-         both <xref linkend="guc-vacuum-multixact-freeze-min-age">
-         and <xref linkend="guc-vacuum-multixact-freeze-table-age"> set to
+         <structname>pg_class</structname>.<structfield>relminmxid</structfield> equal to 1,
+         <command>VACUUM</command> that table with
+         both <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
+         and <xref linkend="guc-vacuum-multixact-freeze-table-age"/> set to
          zero.  (You can use the vacuum cost delay parameters described
-         in <xref linkend="runtime-config-resource-vacuum-cost"> to reduce
+         in <xref linkend="runtime-config-resource-vacuum-cost"/> to reduce
          the performance consequences for concurrent sessions.)  You must
-         use <productname>PostgreSQL</> 9.3.5 or later to perform this step.
+         use <productname>PostgreSQL</productname> 9.3.5 or later to perform this step.
         </para>
        </listitem>
       </orderedlist>
@@ -4052,7 +4965,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -4063,13 +4976,13 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -4107,7 +5020,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
   <para>
    This release contains a small number of fixes from 9.3.7.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -4119,7 +5032,7 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.3.7,
-    see <xref linkend="release-9-3-7">.
+    see <xref linkend="release-9-3-7"/>.
    </para>
 
   </sect2>
@@ -4131,12 +5044,12 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -4148,28 +5061,28 @@ Branch: REL9_2_STABLE [37f30b251] 2016-04-18 13:19:52 -0400
      </para>
 
      <para>
-      Also apply the same rules in <literal>initdb --sync-only</>.
+      Also apply the same rules in <literal>initdb --sync-only</literal>.
       This case is less critical but it should act similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
@@ -4184,15 +5097,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Allow <application>libpq</> to use TLS protocol versions beyond v1
+      Allow <application>libpq</application> to use TLS protocol versions beyond v1
       (Noah Misch)
      </para>
 
      <para>
-      For a long time, <application>libpq</> was coded so that the only SSL
+      For a long time, <application>libpq</application> was coded so that the only SSL
       protocol it would allow was TLS v1.  Now that newer TLS versions are
       becoming popular, allow it to negotiate the highest commonly-supported
-      TLS version with the server.  (<productname>PostgreSQL</> servers were
+      TLS version with the server.  (<productname>PostgreSQL</productname> servers were
       already capable of such negotiation, so no change is needed on the
       server side.)  This is a back-patch of a change already released in
       9.4.0.
@@ -4215,7 +5128,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
   <para>
    This release contains a variety of fixes from 9.3.6.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -4226,14 +5139,14 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.6,
-    see <xref linkend="release-9-3-6">.
+    see <xref linkend="release-9-3-6"/>.
    </para>
 
   </sect2>
@@ -4265,7 +5178,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -4275,7 +5188,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -4285,15 +5198,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -4308,7 +5221,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       Under certain usage patterns, the existing defenses against this might
-      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      be insufficient, allowing <filename>pg_multixact/members</filename> files to be
       removed too early, resulting in data loss.
       The fix for this includes modifying the server to fail transactions
       that would result in overwriting old multixact member ID data, and
@@ -4320,16 +5233,16 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -4337,16 +5250,16 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -4388,7 +5301,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -4416,7 +5329,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -4424,7 +5337,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -4438,7 +5351,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -4458,19 +5371,19 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -4517,18 +5430,18 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -4548,20 +5461,20 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -4574,20 +5487,20 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -4595,14 +5508,14 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -4611,32 +5524,32 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -4649,38 +5562,38 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -4693,21 +5606,21 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      Avoid possible <application>pg_dump</application> failure when concurrent sessions
       are creating and dropping temporary functions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -4719,7 +5632,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -4727,28 +5640,28 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -4756,15 +5669,15 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -4782,7 +5695,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -4805,7 +5718,7 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
   <para>
    This release contains a variety of fixes from 9.3.5.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -4817,16 +5730,16 @@ Branch: REL9_0_STABLE [4dddf8552] 2015-05-21 20:41:55 -0400
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.5,
-    see <xref linkend="release-9-3-5">.
+    see <xref linkend="release-9-3-5"/>.
    </para>
 
   </sect2>
@@ -4855,15 +5768,15 @@ Branch: REL9_0_STABLE [56b970f2e] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -4883,27 +5796,27 @@ Branch: REL9_0_STABLE [9e05c5063] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -4928,12 +5841,12 @@ Branch: REL9_0_STABLE [0a3ee8a5f] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -4994,7 +5907,7 @@ Branch: REL9_0_STABLE [3a2063369] 2015-01-28 12:33:29 -0500
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -5043,14 +5956,14 @@ Branch: REL9_2_STABLE [6bf343c6e] 2015-01-16 13:10:23 +0200
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
     </listitem>
 
@@ -5065,7 +5978,7 @@ Branch: REL9_0_STABLE [45a607d5c] 2014-11-04 13:24:26 -0500
     <listitem>
      <para>
       Avoid possible data corruption if <command>ALTER DATABASE SET
-      TABLESPACE</> is used to move a database to a new tablespace and then
+      TABLESPACE</command> is used to move a database to a new tablespace and then
       shortly later move it back to its original tablespace (Tom Lane)
      </para>
     </listitem>
@@ -5085,14 +5998,14 @@ Branch: REL9_0_STABLE [73f950fc8] 2014-10-30 13:03:39 -0400
 
     <listitem>
      <para>
-      Avoid corrupting tables when <command>ANALYZE</> inside a transaction
+      Avoid corrupting tables when <command>ANALYZE</command> inside a transaction
       is rolled back (Andres Freund, Tom Lane, Michael Paquier)
      </para>
 
      <para>
       If the failing transaction had earlier removed the last index, rule, or
       trigger from the table, the table would be left in a corrupted state
-      with the relevant <structname>pg_class</> flags not set though they
+      with the relevant <structname>pg_class</structname> flags not set though they
       should be.
      </para>
     </listitem>
@@ -5107,8 +6020,8 @@ Branch: REL9_1_STABLE [d5fef87e9] 2014-10-20 23:47:45 +0200
     <listitem>
      <para>
       Ensure that unlogged tables are copied correctly
-      during <command>CREATE DATABASE</> or <command>ALTER DATABASE SET
-      TABLESPACE</> (Pavan Deolasee, Andres Freund)
+      during <command>CREATE DATABASE</command> or <command>ALTER DATABASE SET
+      TABLESPACE</command> (Pavan Deolasee, Andres Freund)
      </para>
     </listitem>
 
@@ -5120,12 +6033,12 @@ Branch: REL9_3_STABLE [e35db342a] 2014-09-22 16:19:59 -0400
     <listitem>
      <para>
       Fix incorrect processing
-      of <structname>CreateEventTrigStmt</>.<structfield>eventname</> (Petr
+      of <structname>CreateEventTrigStmt</structname>.<structfield>eventname</structfield> (Petr
       Jelinek)
      </para>
 
      <para>
-      This could result in misbehavior if <command>CREATE EVENT TRIGGER</>
+      This could result in misbehavior if <command>CREATE EVENT TRIGGER</command>
       were executed as a prepared query, or via extended query protocol.
      </para>
     </listitem>
@@ -5139,7 +6052,7 @@ Branch: REL9_1_STABLE [94d5d57d5] 2014-11-11 17:00:28 -0500
 
     <listitem>
      <para>
-      Fix <command>DROP</>'s dependency searching to correctly handle the
+      Fix <command>DROP</command>'s dependency searching to correctly handle the
       case where a table column is recursively visited before its table
       (Petr Jelinek, Tom Lane)
      </para>
@@ -5147,7 +6060,7 @@ Branch: REL9_1_STABLE [94d5d57d5] 2014-11-11 17:00:28 -0500
      <para>
       This case is only known to arise when an extension creates both a
       datatype and a table using that datatype.  The faulty code might
-      refuse a <command>DROP EXTENSION</> unless <literal>CASCADE</> is
+      refuse a <command>DROP EXTENSION</command> unless <literal>CASCADE</literal> is
       specified, which should not be required.
      </para>
     </listitem>
@@ -5169,7 +6082,7 @@ Branch: REL9_0_STABLE [5308e085b] 2015-01-15 18:52:38 -0500
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
@@ -5198,8 +6111,8 @@ Branch: REL9_3_STABLE [54a8abc2b] 2015-01-04 15:48:29 -0300
     <listitem>
      <para>
       Fix failure to wait when a transaction tries to acquire a <literal>FOR
-      NO KEY EXCLUSIVE</> tuple lock, while multiple other transactions
-      currently hold <literal>FOR SHARE</> locks (&Aacute;lvaro Herrera)
+      NO KEY EXCLUSIVE</literal> tuple lock, while multiple other transactions
+      currently hold <literal>FOR SHARE</literal> locks (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -5213,15 +6126,15 @@ Branch: REL9_0_STABLE [662eebdc6] 2014-12-11 21:02:41 -0500
 
     <listitem>
      <para>
-      Fix planning of <command>SELECT FOR UPDATE</> when using a partial
+      Fix planning of <command>SELECT FOR UPDATE</command> when using a partial
       index on a child table (Kyotaro Horiguchi)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, <command>SELECT FOR UPDATE</> must
-      also recheck the partial index's <literal>WHERE</> condition when
+      In <literal>READ COMMITTED</literal> mode, <command>SELECT FOR UPDATE</command> must
+      also recheck the partial index's <literal>WHERE</literal> condition when
       rechecking a recently-updated row to see if it still satisfies the
-      query's <literal>WHERE</> condition.  This requirement was missed if the
+      query's <literal>WHERE</literal> condition.  This requirement was missed if the
       index belonged to an inheritance child table, so that it was possible
       to incorrectly return rows that no longer satisfy the query condition.
      </para>
@@ -5237,12 +6150,12 @@ Branch: REL9_0_STABLE [f5e4e92fb] 2014-12-11 19:37:17 -0500
 
     <listitem>
      <para>
-      Fix corner case wherein <command>SELECT FOR UPDATE</> could return a row
+      Fix corner case wherein <command>SELECT FOR UPDATE</command> could return a row
       twice, and possibly miss returning other rows (Tom Lane)
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, a <command>SELECT FOR UPDATE</>
+      In <literal>READ COMMITTED</literal> mode, a <command>SELECT FOR UPDATE</command>
       that is scanning an inheritance tree could incorrectly return a row
       from a prior child table instead of the one it should return from a
       later child table.
@@ -5258,7 +6171,7 @@ Branch: REL9_3_STABLE [939f0fb67] 2015-01-15 13:18:19 -0500
 
     <listitem>
      <para>
-      Improve performance of <command>EXPLAIN</> with large range tables
+      Improve performance of <command>EXPLAIN</command> with large range tables
       (Tom Lane)
      </para>
     </listitem>
@@ -5274,7 +6187,7 @@ Branch: REL9_0_STABLE [4ff49746e] 2014-08-09 13:46:52 -0400
     <listitem>
      <para>
       Reject duplicate column names in the referenced-columns list of
-      a <literal>FOREIGN KEY</> declaration (David Rowley)
+      a <literal>FOREIGN KEY</literal> declaration (David Rowley)
      </para>
 
      <para>
@@ -5291,7 +6204,7 @@ Branch: REL9_3_STABLE [6306d0712] 2014-07-22 13:30:14 -0400
 
     <listitem>
      <para>
-      Re-enable error for <literal>SELECT ... OFFSET -1</> (Tom Lane)
+      Re-enable error for <literal>SELECT ... OFFSET -1</literal> (Tom Lane)
      </para>
 
      <para>
@@ -5328,7 +6241,7 @@ Branch: REL9_3_STABLE [8571ecb24] 2014-12-02 15:02:43 -0500
 
     <listitem>
      <para>
-      Fix <function>json_agg()</> to not return extra trailing right
+      Fix <function>json_agg()</function> to not return extra trailing right
       brackets in its result (Tom Lane)
      </para>
     </listitem>
@@ -5343,7 +6256,7 @@ Branch: REL9_0_STABLE [26f8a4691] 2014-09-11 23:31:06 -0400
 
     <listitem>
      <para>
-      Fix bugs in raising a <type>numeric</> value to a large integral power
+      Fix bugs in raising a <type>numeric</type> value to a large integral power
       (Tom Lane)
      </para>
 
@@ -5364,19 +6277,19 @@ Branch: REL9_0_STABLE [e6550626c] 2014-12-01 15:25:18 -0500
 
     <listitem>
      <para>
-      In <function>numeric_recv()</>, truncate away any fractional digits
-      that would be hidden according to the value's <literal>dscale</> field
+      In <function>numeric_recv()</function>, truncate away any fractional digits
+      that would be hidden according to the value's <literal>dscale</literal> field
       (Tom Lane)
      </para>
 
      <para>
-      A <type>numeric</> value's display scale (<literal>dscale</>) should
+      A <type>numeric</type> value's display scale (<literal>dscale</literal>) should
       never be less than the number of nonzero fractional digits; but
       apparently there's at least one broken client application that
-      transmits binary <type>numeric</> values in which that's true.
+      transmits binary <type>numeric</type> values in which that's true.
       This leads to strange behavior since the extra digits are taken into
       account by arithmetic operations even though they aren't printed.
-      The least risky fix seems to be to truncate away such <quote>hidden</>
+      The least risky fix seems to be to truncate away such <quote>hidden</quote>
       digits on receipt, so that the value is indeed what it prints as.
      </para>
     </listitem>
@@ -5395,7 +6308,7 @@ Branch: REL9_2_STABLE [3359a818c] 2014-09-23 20:25:39 -0400
 
      <para>
       Matching would often fail when the number of allowed iterations is
-      limited by a <literal>?</> quantifier or a bound expression.
+      limited by a <literal>?</literal> quantifier or a bound expression.
      </para>
     </listitem>
 
@@ -5430,7 +6343,7 @@ Branch: REL9_0_STABLE [10059c2da] 2014-10-27 10:51:38 +0200
 
     <listitem>
      <para>
-      Fix bugs in <type>tsquery</> <literal>@&gt;</> <type>tsquery</>
+      Fix bugs in <type>tsquery</type> <literal>@&gt;</literal> <type>tsquery</type>
       operator (Heikki Linnakangas)
      </para>
 
@@ -5487,14 +6400,14 @@ Branch: REL9_0_STABLE [cebb3f032] 2015-01-17 22:37:32 -0500
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -5514,7 +6427,7 @@ Branch: REL9_2_STABLE [19ccaf9d4] 2014-11-10 15:21:26 -0500
      </para>
 
      <para>
-      In some contexts, constructs like <literal>row_to_json(tab.*)</> may
+      In some contexts, constructs like <literal>row_to_json(tab.*)</literal> may
       not produce the expected column names.  This is fixed properly as of
       9.4; in older branches, just ensure that we produce some nonempty
       name.  (In some cases this will be the underlying table's column name
@@ -5532,7 +6445,7 @@ Branch: REL9_2_STABLE [906599f65] 2014-11-22 16:01:15 -0500
     <listitem>
      <para>
       Fix mishandling of system columns,
-      particularly <structfield>tableoid</>, in FDW queries (Etsuro Fujita)
+      particularly <structfield>tableoid</structfield>, in FDW queries (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -5550,7 +6463,7 @@ Branch: REL9_3_STABLE [527ff8baf] 2015-01-30 12:30:43 -0500
      </para>
 
      <para>
-      This patch fixes corner-case <quote>unexpected operator NNNN</> planner
+      This patch fixes corner-case <quote>unexpected operator NNNN</quote> planner
       errors, and improves the selectivity estimates for some other cases.
      </para>
     </listitem>
@@ -5563,13 +6476,13 @@ Branch: REL9_2_STABLE [4586572d7] 2014-10-26 16:12:32 -0400
 
     <listitem>
      <para>
-      Avoid doing <literal><replaceable>indexed_column</> = ANY
-      (<replaceable>array</>)</literal> as an index qualifier if that leads
+      Avoid doing <literal><replaceable>indexed_column</replaceable> = ANY
+      (<replaceable>array</replaceable>)</literal> as an index qualifier if that leads
       to an inferior plan (Andrew Gierth)
      </para>
 
      <para>
-      In some cases, <literal>= ANY</> conditions applied to non-first index
+      In some cases, <literal>= ANY</literal> conditions applied to non-first index
       columns would be done as index conditions even though it would be
       better to use them as simple filter conditions.
      </para>
@@ -5582,9 +6495,9 @@ Branch: REL9_3_STABLE [4e54685d0] 2014-10-20 12:23:48 -0400
 
     <listitem>
      <para>
-      Fix <quote>variable not found in subplan target list</> planner
+      Fix <quote>variable not found in subplan target list</quote> planner
       failure when an inline-able SQL function taking a composite argument
-      is used in a <literal>LATERAL</> subselect and the composite argument
+      is used in a <literal>LATERAL</literal> subselect and the composite argument
       is a lateral reference (Tom Lane)
      </para>
     </listitem>
@@ -5600,7 +6513,7 @@ Branch: REL9_0_STABLE [288f15b7c] 2014-10-01 19:30:41 -0400
     <listitem>
      <para>
       Fix planner problems with nested append relations, such as inherited
-      tables within <literal>UNION ALL</> subqueries (Tom Lane)
+      tables within <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
     </listitem>
 
@@ -5629,8 +6542,8 @@ Branch: REL9_0_STABLE [50a757698] 2014-10-03 13:01:27 -0300
 
     <listitem>
      <para>
-      Exempt tables that have per-table <varname>cost_limit</>
-      and/or <varname>cost_delay</> settings from autovacuum's global cost
+      Exempt tables that have per-table <varname>cost_limit</varname>
+      and/or <varname>cost_delay</varname> settings from autovacuum's global cost
       balancing rules (&Aacute;lvaro Herrera)
      </para>
 
@@ -5664,7 +6577,7 @@ Branch: REL9_0_STABLE [91b4a881c] 2014-07-30 14:42:12 -0400
       the target database, if they met the usual thresholds for
       autovacuuming.  This is at best pretty unexpected; at worst it delays
       response to the wraparound threat.  Fix it so that if autovacuum is
-      turned off, workers <emphasis>only</> do anti-wraparound vacuums and
+      turned off, workers <emphasis>only</emphasis> do anti-wraparound vacuums and
       not any other work.
      </para>
     </listitem>
@@ -5728,12 +6641,12 @@ Branch: REL9_0_STABLE [804983961] 2014-07-29 11:58:17 +0300
     <listitem>
      <para>
       Fix several cases where recovery logic improperly ignored WAL records
-      for <literal>COMMIT/ABORT PREPARED</> (Heikki Linnakangas)
+      for <literal>COMMIT/ABORT PREPARED</literal> (Heikki Linnakangas)
      </para>
 
      <para>
       The most notable oversight was
-      that <varname>recovery_target_xid</> could not be used to stop at
+      that <varname>recovery_target_xid</varname> could not be used to stop at
       a two-phase commit.
      </para>
     </listitem>
@@ -5761,7 +6674,7 @@ Branch: REL9_0_STABLE [83c7bfb9a] 2014-11-06 21:26:21 +0900
 
     <listitem>
      <para>
-      Avoid creating unnecessary <filename>.ready</> marker files for
+      Avoid creating unnecessary <filename>.ready</filename> marker files for
       timeline history files (Fujii Masao)
      </para>
     </listitem>
@@ -5777,8 +6690,8 @@ Branch: REL9_0_STABLE [857a5d6b5] 2014-09-05 02:19:57 +0900
     <listitem>
      <para>
       Fix possible null pointer dereference when an empty prepared statement
-      is used and the <varname>log_statement</> setting is <literal>mod</>
-      or <literal>ddl</> (Fujii Masao)
+      is used and the <varname>log_statement</varname> setting is <literal>mod</literal>
+      or <literal>ddl</literal> (Fujii Masao)
      </para>
     </listitem>
 
@@ -5794,7 +6707,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -5803,7 +6716,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -5847,7 +6760,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -5862,13 +6775,13 @@ Branch: REL9_0_STABLE [9880fea4f] 2014-11-25 17:39:09 +0200
 
     <listitem>
      <para>
-      Fix processing of repeated <literal>dbname</> parameters
-      in <function>PQconnectdbParams()</> (Alex Shulgin)
+      Fix processing of repeated <literal>dbname</literal> parameters
+      in <function>PQconnectdbParams()</function> (Alex Shulgin)
      </para>
 
      <para>
       Unexpected behavior ensued if the first occurrence
-      of <literal>dbname</> contained a connection string or URI to be
+      of <literal>dbname</literal> contained a connection string or URI to be
       expanded.
      </para>
     </listitem>
@@ -5883,12 +6796,12 @@ Branch: REL9_0_STABLE [ac6e87537] 2014-10-22 18:42:01 -0400
 
     <listitem>
      <para>
-      Ensure that <application>libpq</> reports a suitable error message on
+      Ensure that <application>libpq</application> reports a suitable error message on
       unexpected socket EOF (Marko Tiikkaja, Tom Lane)
      </para>
 
      <para>
-      Depending on kernel behavior, <application>libpq</> might return an
+      Depending on kernel behavior, <application>libpq</application> might return an
       empty error string rather than something useful when the server
       unexpectedly closed the socket.
      </para>
@@ -5904,14 +6817,14 @@ Branch: REL9_0_STABLE [49ef4eba2] 2014-10-29 14:35:39 +0200
 
     <listitem>
      <para>
-      Clear any old error message during <function>PQreset()</>
+      Clear any old error message during <function>PQreset()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      If <function>PQreset()</> is called repeatedly, and the connection
+      If <function>PQreset()</function> is called repeatedly, and the connection
       cannot be re-established, error messages from the failed connection
-      attempts kept accumulating in the <structname>PGconn</>'s error
+      attempts kept accumulating in the <structname>PGconn</structname>'s error
       string.
      </para>
     </listitem>
@@ -5927,7 +6840,7 @@ Branch: REL9_0_STABLE [1f3517039] 2014-11-25 14:10:54 +0200
     <listitem>
      <para>
       Properly handle out-of-memory conditions while parsing connection
-      options in <application>libpq</> (Alex Shulgin, Heikki Linnakangas)
+      options in <application>libpq</application> (Alex Shulgin, Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -5941,8 +6854,8 @@ Branch: REL9_0_STABLE [d9a1e9de5] 2014-10-06 21:23:50 -0400
 
     <listitem>
      <para>
-      Fix array overrun in <application>ecpg</>'s version
-      of <function>ParseDateTime()</> (Michael Paquier)
+      Fix array overrun in <application>ecpg</application>'s version
+      of <function>ParseDateTime()</function> (Michael Paquier)
      </para>
     </listitem>
 
@@ -5956,7 +6869,7 @@ Branch: REL9_0_STABLE [d67be559e] 2014-12-05 14:30:55 +0200
 
     <listitem>
      <para>
-      In <application>initdb</>, give a clearer error message if a password
+      In <application>initdb</application>, give a clearer error message if a password
       file is specified but is empty (Mats Erik Andersson)
      </para>
     </listitem>
@@ -5971,12 +6884,12 @@ Branch: REL9_0_STABLE [44c518328] 2014-09-08 16:10:05 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <command>\s</> command to work nicely with
+      Fix <application>psql</application>'s <command>\s</command> command to work nicely with
       libedit, and add pager support (Stepan Rutz, Tom Lane)
      </para>
 
      <para>
-      When using libedit rather than readline, <command>\s</> printed the
+      When using libedit rather than readline, <command>\s</command> printed the
       command history in a fairly unreadable encoded format, and on recent
       libedit versions might fail altogether.  Fix that by printing the
       history ourselves rather than having the library do it.  A pleasant
@@ -5986,7 +6899,7 @@ Branch: REL9_0_STABLE [44c518328] 2014-09-08 16:10:05 -0400
      <para>
       This patch also fixes a bug that caused newline encoding to be applied
       inconsistently when saving the command history with libedit.
-      Multiline history entries written by older <application>psql</>
+      Multiline history entries written by older <application>psql</application>
       versions will be read cleanly with this patch, but perhaps not
       vice versa, depending on the exact libedit versions involved.
      </para>
@@ -6004,17 +6917,17 @@ Branch: REL9_0_STABLE [2600e4436] 2014-12-31 12:17:12 -0500
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -6027,8 +6940,8 @@ Branch: REL9_3_STABLE [4b1953079] 2014-11-28 02:44:40 +0900
 
     <listitem>
      <para>
-      Make <application>psql</>'s <command>\watch</> command display
-      nulls as specified by <command>\pset null</> (Fujii Masao)
+      Make <application>psql</application>'s <command>\watch</command> command display
+      nulls as specified by <command>\pset null</command> (Fujii Masao)
      </para>
     </listitem>
 
@@ -6042,9 +6955,9 @@ Branch: REL9_0_STABLE [1f89fc218] 2014-09-12 11:24:39 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s expanded-mode display to work
-      consistently when using <literal>border</> = 3
-      and <literal>linestyle</> = <literal>ascii</> or <literal>unicode</>
+      Fix <application>psql</application>'s expanded-mode display to work
+      consistently when using <literal>border</literal> = 3
+      and <literal>linestyle</literal> = <literal>ascii</literal> or <literal>unicode</literal>
       (Stephen Frost)
      </para>
     </listitem>
@@ -6058,7 +6971,7 @@ Branch: REL9_3_STABLE [bb1e2426b] 2015-01-05 19:27:09 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle comments on event triggers
+      Fix <application>pg_dump</application> to handle comments on event triggers
       without failing (Tom Lane)
      </para>
     </listitem>
@@ -6072,8 +6985,8 @@ Branch: REL9_3_STABLE [cc609c46f] 2015-01-30 09:01:36 -0600
 
     <listitem>
      <para>
-      Allow parallel <application>pg_dump</> to
-      use <option>--serializable-deferrable</> (Kevin Grittner)
+      Allow parallel <application>pg_dump</application> to
+      use <option>--serializable-deferrable</option> (Kevin Grittner)
      </para>
     </listitem>
 
@@ -6086,7 +6999,7 @@ Branch: REL9_1_STABLE [40c333c39] 2014-07-25 19:48:54 -0400
 
     <listitem>
      <para>
-      Improve performance of <application>pg_dump</> when the database
+      Improve performance of <application>pg_dump</application> when the database
       contains many instances of multiple dependency paths between the same
       two objects (Tom Lane)
      </para>
@@ -6100,7 +7013,7 @@ Branch: REL9_2_STABLE [3c5ce5102] 2014-11-13 18:19:35 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to restore its ability to dump from
+      Fix <application>pg_dumpall</application> to restore its ability to dump from
       pre-8.1 servers (Gilles Darold)
      </para>
     </listitem>
@@ -6130,7 +7043,7 @@ Branch: REL9_0_STABLE [31021e7ba] 2014-10-17 12:49:15 -0400
 
     <listitem>
      <para>
-      Fix core dump in <literal>pg_dump --binary-upgrade</> on zero-column
+      Fix core dump in <literal>pg_dump --binary-upgrade</literal> on zero-column
       composite type (Rushabh Lathia)
      </para>
     </listitem>
@@ -6143,7 +7056,7 @@ Branch: REL9_3_STABLE [26a4e0ed7] 2014-11-15 01:21:11 +0100
     <listitem>
      <para>
       Fix failure to fsync tables in nondefault tablespaces
-      during <application>pg_upgrade</> (Abhijit Menon-Sen, Andres Freund)
+      during <application>pg_upgrade</application> (Abhijit Menon-Sen, Andres Freund)
      </para>
 
      <para>
@@ -6159,7 +7072,7 @@ Branch: REL9_3_STABLE [fca9f349b] 2014-08-07 14:56:13 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, cope with cases where the new cluster
+      In <application>pg_upgrade</application>, cope with cases where the new cluster
       creates a TOAST table for a table that didn't previously have one
       (Bruce Momjian)
      </para>
@@ -6176,8 +7089,8 @@ Branch: REL9_3_STABLE [24ae44914] 2014-08-04 11:45:45 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, don't try to
-      set <literal>autovacuum_multixact_freeze_max_age</> for the old cluster
+      In <application>pg_upgrade</application>, don't try to
+      set <literal>autovacuum_multixact_freeze_max_age</literal> for the old cluster
       (Bruce Momjian)
      </para>
 
@@ -6194,12 +7107,12 @@ Branch: REL9_3_STABLE [5724f491d] 2014-09-11 18:39:46 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve the transaction ID epoch
+      In <application>pg_upgrade</application>, preserve the transaction ID epoch
       (Bruce Momjian)
      </para>
 
      <para>
-      This oversight did not bother <productname>PostgreSQL</> proper,
+      This oversight did not bother <productname>PostgreSQL</productname> proper,
       but could confuse some external replication tools.
      </para>
     </listitem>
@@ -6215,7 +7128,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
@@ -6227,7 +7140,7 @@ Branch: REL9_3_STABLE [9747a9898] 2014-08-02 15:19:45 +0900
 
     <listitem>
      <para>
-      Fix memory leak in <application>pg_receivexlog</> (Fujii Masao)
+      Fix memory leak in <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -6238,7 +7151,7 @@ Branch: REL9_3_STABLE [39217ce41] 2014-08-02 14:59:10 +0900
 
     <listitem>
      <para>
-      Fix unintended suppression of <application>pg_receivexlog</> verbose
+      Fix unintended suppression of <application>pg_receivexlog</application> verbose
       messages (Fujii Masao)
      </para>
     </listitem>
@@ -6251,8 +7164,8 @@ Branch: REL9_2_STABLE [5ff8c2d7d] 2014-09-19 13:19:05 -0400
 
     <listitem>
      <para>
-      Fix failure of <filename>contrib/auto_explain</> to print per-node
-      timing information when doing <command>EXPLAIN ANALYZE</> (Tom Lane)
+      Fix failure of <filename>contrib/auto_explain</filename> to print per-node
+      timing information when doing <command>EXPLAIN ANALYZE</command> (Tom Lane)
      </para>
     </listitem>
 
@@ -6265,7 +7178,7 @@ Branch: REL9_1_STABLE [9807c8220] 2014-08-28 18:21:20 -0400
 
     <listitem>
      <para>
-      Fix upgrade-from-unpackaged script for <filename>contrib/citext</>
+      Fix upgrade-from-unpackaged script for <filename>contrib/citext</filename>
       (Tom Lane)
      </para>
     </listitem>
@@ -6278,7 +7191,7 @@ Branch: REL9_3_STABLE [f44290b7b] 2014-11-04 16:54:59 -0500
     <listitem>
      <para>
       Avoid integer overflow and buffer overrun
-      in <filename>contrib/hstore</>'s <function>hstore_to_json()</>
+      in <filename>contrib/hstore</filename>'s <function>hstore_to_json()</function>
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -6290,7 +7203,7 @@ Branch: REL9_3_STABLE [55c880797] 2014-12-01 11:44:48 -0500
 
     <listitem>
      <para>
-      Fix recognition of numbers in <function>hstore_to_json_loose()</>,
+      Fix recognition of numbers in <function>hstore_to_json_loose()</function>,
       so that JSON numbers and strings are correctly distinguished
       (Andrew Dunstan)
      </para>
@@ -6307,7 +7220,7 @@ Branch: REL9_0_STABLE [9dc2a3fd0] 2014-07-22 11:46:04 -0400
     <listitem>
      <para>
       Fix block number checking
-      in <filename>contrib/pageinspect</>'s <function>get_raw_page()</>
+      in <filename>contrib/pageinspect</filename>'s <function>get_raw_page()</function>
       (Tom Lane)
      </para>
 
@@ -6327,7 +7240,7 @@ Branch: REL9_0_STABLE [ef5a3b957] 2014-11-11 17:22:58 -0500
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</>'s <function>pgp_sym_decrypt()</>
+      Fix <filename>contrib/pgcrypto</filename>'s <function>pgp_sym_decrypt()</function>
       to not fail on messages whose length is 6 less than a power of 2
       (Marko Tiikkaja)
      </para>
@@ -6342,7 +7255,7 @@ Branch: REL9_1_STABLE [a855c90a7] 2014-11-19 12:26:06 -0500
 
     <listitem>
      <para>
-      Fix file descriptor leak in <filename>contrib/pg_test_fsync</>
+      Fix file descriptor leak in <filename>contrib/pg_test_fsync</filename>
       (Jeff Janes)
      </para>
 
@@ -6364,12 +7277,12 @@ Branch: REL9_0_STABLE [dc9a506e6] 2015-01-29 20:18:46 -0500
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
@@ -6384,12 +7297,12 @@ Branch: REL9_0_STABLE [6a694bbab] 2014-11-27 11:13:03 -0500
 
     <listitem>
      <para>
-      Avoid a possible crash in <filename>contrib/xml2</>'s
-      <function>xslt_process()</> (Mark Simonetti)
+      Avoid a possible crash in <filename>contrib/xml2</filename>'s
+      <function>xslt_process()</function> (Mark Simonetti)
      </para>
 
      <para>
-      <application>libxslt</> seems to have an undocumented dependency on
+      <application>libxslt</application> seems to have an undocumented dependency on
       the order in which resources are freed; reorder our calls to avoid a
       crash.
      </para>
@@ -6404,7 +7317,7 @@ Branch: REL9_1_STABLE [7225abf00] 2014-11-05 11:34:25 -0500
 
     <listitem>
      <para>
-      Mark some <filename>contrib</> I/O functions with correct volatility
+      Mark some <filename>contrib</filename> I/O functions with correct volatility
       properties (Tom Lane)
      </para>
 
@@ -6525,10 +7438,10 @@ Branch: REL9_0_STABLE [4c6d0abde] 2014-07-22 11:02:25 -0400
 
      <para>
       With OpenLDAP versions 2.4.24 through 2.4.31,
-      inclusive, <productname>PostgreSQL</> backends can crash at exit.
-      Raise a warning during <application>configure</> based on the
+      inclusive, <productname>PostgreSQL</productname> backends can crash at exit.
+      Raise a warning during <application>configure</application> based on the
       compile-time OpenLDAP version number, and test the crashing scenario
-      in the <filename>contrib/dblink</> regression test.
+      in the <filename>contrib/dblink</filename> regression test.
      </para>
     </listitem>
 
@@ -6542,7 +7455,7 @@ Branch: REL9_0_STABLE [e6841c4d6] 2014-08-18 23:01:23 -0400
 
     <listitem>
      <para>
-      In non-MSVC Windows builds, ensure <filename>libpq.dll</> is installed
+      In non-MSVC Windows builds, ensure <filename>libpq.dll</filename> is installed
       with execute permissions (Noah Misch)
      </para>
     </listitem>
@@ -6559,13 +7472,13 @@ Branch: REL9_0_STABLE [338ff75fc] 2015-01-19 23:44:33 -0500
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -6585,15 +7498,15 @@ Branch: REL9_0_STABLE [870a980aa] 2014-10-16 15:22:26 -0400
      </para>
 
      <para>
-      Previously, <productname>PostgreSQL</> assumed that the UTC offset
-      associated with a time zone abbreviation (such as <literal>EST</>)
+      Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+      associated with a time zone abbreviation (such as <literal>EST</literal>)
       never changes in the usage of any particular locale.  However this
       assumption fails in the real world, so introduce the ability for a
       zone abbreviation to represent a UTC offset that sometimes changes.
       Update the zone abbreviation definition files to make use of this
       feature in timezone locales that have changed the UTC offset of their
       abbreviations since 1970 (according to the IANA timezone database).
-      In such timezones, <productname>PostgreSQL</> will now associate the
+      In such timezones, <productname>PostgreSQL</productname> will now associate the
       correct UTC offset with the abbreviation depending on the given date.
      </para>
     </listitem>
@@ -6618,9 +7531,9 @@ Branch: REL9_0_STABLE [8b70023af] 2014-12-24 16:35:54 -0500
 
      <para>
       Add CST (China Standard Time) to our lists.
-      Remove references to ADT as <quote>Arabia Daylight Time</>, an
+      Remove references to ADT as <quote>Arabia Daylight Time</quote>, an
       abbreviation that's been out of use since 2007; therefore, claiming
-      there is a conflict with <quote>Atlantic Daylight Time</> doesn't seem
+      there is a conflict with <quote>Atlantic Daylight Time</quote> doesn't seem
       especially helpful.
       Fix entirely incorrect GMT offsets for CKT (Cook Islands), FJT, and FJST
       (Fiji); we didn't even have them on the proper side of the date line.
@@ -6647,21 +7560,21 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a.
+      Update time zone data files to <application>tzdata</application> release 2015a.
      </para>
 
      <para>
       The IANA timezone database has adopted abbreviations of the form
-      <literal>A<replaceable>x</>ST</literal>/<literal>A<replaceable>x</>DT</literal>
+      <literal>A<replaceable>x</replaceable>ST</literal>/<literal>A<replaceable>x</replaceable>DT</literal>
       for all Australian time zones, reflecting what they believe to be
       current majority practice Down Under.  These names do not conflict
       with usage elsewhere (other than ACST for Acre Summer Time, which has
       been in disuse since 1994).  Accordingly, adopt these names into
-      our <quote>Default</> timezone abbreviation set.
-      The <quote>Australia</> abbreviation set now contains only CST, EAST,
+      our <quote>Default</quote> timezone abbreviation set.
+      The <quote>Australia</quote> abbreviation set now contains only CST, EAST,
       EST, SAST, SAT, and WST, all of which are thought to be mostly
       historical usage.  Note that SAST has also been changed to be South
-      Africa Standard Time in the <quote>Default</> abbreviation set.
+      Africa Standard Time in the <quote>Default</quote> abbreviation set.
      </para>
 
      <para>
@@ -6690,7 +7603,7 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
   <para>
    This release contains a variety of fixes from 9.3.4.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -6702,7 +7615,7 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
 
    <para>
     However, this release corrects a logic error
-    in <application>pg_upgrade</>, as well as an index corruption problem in
+    in <application>pg_upgrade</application>, as well as an index corruption problem in
     some GiST indexes.  See the first two changelog entries below to find out
     whether your installation has been affected and what steps you should take
     if so.
@@ -6710,7 +7623,7 @@ Branch: REL9_0_STABLE [b6391f587] 2014-10-04 14:18:43 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.4,
-    see <xref linkend="release-9-3-4">.
+    see <xref linkend="release-9-3-4"/>.
    </para>
 
   </sect2>
@@ -6729,15 +7642,15 @@ Branch: REL9_3_STABLE [cc5841809] 2014-06-24 16:11:06 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, remove <filename>pg_multixact</> files
-      left behind by <application>initdb</> (Bruce Momjian)
+      In <application>pg_upgrade</application>, remove <filename>pg_multixact</filename> files
+      left behind by <application>initdb</application> (Bruce Momjian)
      </para>
 
      <para>
-      If you used a pre-9.3.5 version of <application>pg_upgrade</> to
+      If you used a pre-9.3.5 version of <application>pg_upgrade</application> to
       upgrade a database cluster to 9.3, it might have left behind a file
-      <filename>$PGDATA/pg_multixact/offsets/0000</> that should not be
-      there and will eventually cause problems in <command>VACUUM</>.
+      <filename>$PGDATA/pg_multixact/offsets/0000</filename> that should not be
+      there and will eventually cause problems in <command>VACUUM</command>.
       <emphasis>However, in common cases this file is actually valid and
       must not be removed.</emphasis>
       To determine whether your installation has this problem, run this
@@ -6750,9 +7663,9 @@ SELECT EXISTS (SELECT * FROM list WHERE file = '0000') AND
        EXISTS (SELECT * FROM list WHERE file != '0000')
        AS file_0000_removal_required;
 </programlisting>
-      If this query returns <literal>t</>, manually remove the file
-      <filename>$PGDATA/pg_multixact/offsets/0000</>.
-      Do nothing if the query returns <literal>f</>.
+      If this query returns <literal>t</literal>, manually remove the file
+      <filename>$PGDATA/pg_multixact/offsets/0000</filename>.
+      Do nothing if the query returns <literal>f</literal>.
      </para>
     </listitem>
 
@@ -6768,15 +7681,15 @@ Branch: REL8_4_STABLE [e31d77c96] 2014-05-13 15:27:43 +0300
 
     <listitem>
      <para>
-      Correctly initialize padding bytes in <filename>contrib/btree_gist</>
-      indexes on <type>bit</> columns (Heikki Linnakangas)
+      Correctly initialize padding bytes in <filename>contrib/btree_gist</filename>
+      indexes on <type>bit</type> columns (Heikki Linnakangas)
      </para>
 
      <para>
       This error could result in incorrect query results due to values that
       should compare equal not being seen as equal.
-      Users with GiST indexes on <type>bit</> or <type>bit varying</>
-      columns should <command>REINDEX</> those indexes after installing this
+      Users with GiST indexes on <type>bit</type> or <type>bit varying</type>
+      columns should <command>REINDEX</command> those indexes after installing this
       update.
      </para>
     </listitem>
@@ -6861,7 +7774,7 @@ Branch: REL9_3_STABLE [167a2535f] 2014-06-09 15:17:23 -0400
 
     <listitem>
      <para>
-      Fix wraparound handling for <filename>pg_multixact/members</>
+      Fix wraparound handling for <filename>pg_multixact/members</filename>
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -6875,12 +7788,12 @@ Branch: REL9_3_STABLE [9a28c3752] 2014-06-27 14:43:52 -0400
 
     <listitem>
      <para>
-      Truncate <structname>pg_multixact</> during checkpoints, not
-      during <command>VACUUM</> (&Aacute;lvaro Herrera)
+      Truncate <structname>pg_multixact</structname> during checkpoints, not
+      during <command>VACUUM</command> (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      This change ensures that <structname>pg_multixact</> segments can't be
+      This change ensures that <structname>pg_multixact</structname> segments can't be
       removed if they'd still be needed during WAL replay after a crash.
      </para>
     </listitem>
@@ -6911,7 +7824,7 @@ Branch: REL8_4_STABLE [3ada1fab8] 2014-05-05 14:43:55 -0400
     <listitem>
      <para>
       Fix possibly-incorrect cache invalidation during nested calls
-      to <function>ReceiveSharedInvalidMessages</> (Andres Freund)
+      to <function>ReceiveSharedInvalidMessages</function> (Andres Freund)
      </para>
     </listitem>
 
@@ -6937,8 +7850,8 @@ Branch: REL9_1_STABLE [555d0b200] 2014-06-26 10:42:08 -0700
 
     <listitem>
      <para>
-      Fix <quote>could not find pathkey item to sort</> planner failures
-      with <literal>UNION ALL</> over subqueries reading from tables with
+      Fix <quote>could not find pathkey item to sort</quote> planner failures
+      with <literal>UNION ALL</literal> over subqueries reading from tables with
       inheritance children (Tom Lane)
      </para>
     </listitem>
@@ -6977,7 +7890,7 @@ Branch: REL9_2_STABLE [0901dbab3] 2014-04-29 13:12:33 -0400
     <listitem>
      <para>
       Improve planner to drop constant-NULL inputs
-      of <literal>AND</>/<literal>OR</> when possible (Tom Lane)
+      of <literal>AND</literal>/<literal>OR</literal> when possible (Tom Lane)
      </para>
 
      <para>
@@ -6995,8 +7908,8 @@ Branch: REL9_3_STABLE [d359f71ac] 2014-04-03 22:02:27 -0400
 
     <listitem>
      <para>
-      Ensure that the planner sees equivalent <literal>VARIADIC</> and
-      non-<literal>VARIADIC</> function calls as equivalent (Tom Lane)
+      Ensure that the planner sees equivalent <literal>VARIADIC</literal> and
+      non-<literal>VARIADIC</literal> function calls as equivalent (Tom Lane)
      </para>
 
      <para>
@@ -7017,13 +7930,13 @@ Branch: REL9_3_STABLE [a1fc36495] 2014-06-24 21:22:47 -0700
 
     <listitem>
      <para>
-      Fix handling of nested <type>JSON</> objects
-      in <function>json_populate_recordset()</> and friends
+      Fix handling of nested <type>JSON</type> objects
+      in <function>json_populate_recordset()</function> and friends
       (Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A nested <type>JSON</> object could result in previous fields of the
+      A nested <type>JSON</type> object could result in previous fields of the
       parent object not being shown in the output.
      </para>
     </listitem>
@@ -7037,13 +7950,13 @@ Branch: REL9_2_STABLE [25c933c5c] 2014-05-09 12:55:06 -0400
 
     <listitem>
      <para>
-      Fix identification of input type category in <function>to_json()</>
+      Fix identification of input type category in <function>to_json()</function>
       and friends (Tom Lane)
      </para>
 
      <para>
-      This is known to have led to inadequate quoting of <type>money</>
-      fields in the <type>JSON</> result, and there may have been wrong
+      This is known to have led to inadequate quoting of <type>money</type>
+      fields in the <type>JSON</type> result, and there may have been wrong
       results for other data types as well.
      </para>
     </listitem>
@@ -7068,7 +7981,7 @@ Branch: REL8_4_STABLE [70debcf09] 2014-05-01 15:19:23 -0400
       This corrects cases where TOAST pointers could be copied into other
       tables without being dereferenced.  If the original data is later
       deleted, it would lead to errors like <quote>missing chunk number 0
-      for toast value ...</> when the now-dangling pointer is used.
+      for toast value ...</quote> when the now-dangling pointer is used.
      </para>
     </listitem>
 
@@ -7085,7 +7998,7 @@ Branch: REL8_4_STABLE [a81fbcfb3] 2014-07-11 19:12:56 -0400
 
     <listitem>
      <para>
-      Fix <quote>record type has not been registered</> failures with
+      Fix <quote>record type has not been registered</quote> failures with
       whole-row references to the output of Append plan nodes (Tom Lane)
      </para>
     </listitem>
@@ -7121,7 +8034,7 @@ Branch: REL8_4_STABLE [d297c91d4] 2014-06-19 22:14:00 -0400
     <listitem>
      <para>
       Fix query-lifespan memory leak while evaluating the arguments for a
-      function in <literal>FROM</> (Tom Lane)
+      function in <literal>FROM</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -7156,7 +8069,7 @@ Branch: REL8_4_STABLE [f3f40434b] 2014-06-10 22:49:08 -0400
 
     <listitem>
      <para>
-      Fix data encoding error in <filename>hungarian.stop</> (Tom Lane)
+      Fix data encoding error in <filename>hungarian.stop</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -7172,7 +8085,7 @@ Branch: REL9_1_STABLE [dd1a5b09b] 2014-06-24 13:30:41 +0300
     <listitem>
      <para>
       Prevent foreign tables from being created with OIDS
-      when <xref linkend="guc-default-with-oids"> is true
+      when <xref linkend="guc-default-with-oids"/> is true
       (Etsuro Fujita)
      </para>
     </listitem>
@@ -7196,7 +8109,7 @@ Branch: REL8_4_STABLE [80d45ae4e] 2014-06-04 23:27:38 +0200
 
      <para>
       This could cause problems (at least spurious warnings, and at worst an
-      infinite loop) if <command>CREATE INDEX</> or <command>CLUSTER</> were
+      infinite loop) if <command>CREATE INDEX</command> or <command>CLUSTER</command> were
       done later in the same transaction.
      </para>
     </listitem>
@@ -7213,12 +8126,12 @@ Branch: REL8_4_STABLE [82fbd88a7] 2014-04-24 13:30:14 -0400
 
     <listitem>
      <para>
-      Clear <structname>pg_stat_activity</>.<structfield>xact_start</>
-      during <command>PREPARE TRANSACTION</> (Andres Freund)
+      Clear <structname>pg_stat_activity</structname>.<structfield>xact_start</structfield>
+      during <command>PREPARE TRANSACTION</command> (Andres Freund)
      </para>
 
      <para>
-      After the <command>PREPARE</>, the originating session is no longer in
+      After the <command>PREPARE</command>, the originating session is no longer in
       a transaction, so it should not continue to display a transaction
       start time.
      </para>
@@ -7237,7 +8150,7 @@ Branch: REL8_4_STABLE [4b767789d] 2014-07-15 13:24:07 -0400
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to not fail for text search objects
+      Fix <command>REASSIGN OWNED</command> to not fail for text search objects
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -7251,8 +8164,8 @@ Branch: REL9_3_STABLE [e86cfc4bb] 2014-06-27 14:43:45 -0400
 
     <listitem>
      <para>
-      Prevent <structname>pg_class</>.<structfield>relminmxid</> values from
-      going backwards during <command>VACUUM FULL</> (&Aacute;lvaro Herrera)
+      Prevent <structname>pg_class</structname>.<structfield>relminmxid</structfield> values from
+      going backwards during <command>VACUUM FULL</command> (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -7290,7 +8203,7 @@ Branch: REL9_3_STABLE [e31193d49] 2014-05-01 20:22:39 -0400
     <listitem>
      <para>
       Fix dumping of rules/views when subsequent addition of a column has
-      resulted in multiple input columns matching a <literal>USING</>
+      resulted in multiple input columns matching a <literal>USING</literal>
       specification (Tom Lane)
      </para>
     </listitem>
@@ -7305,7 +8218,7 @@ Branch: REL9_3_STABLE [b978ab5f6] 2014-07-19 14:29:05 -0400
     <listitem>
      <para>
       Repair view printing for some cases involving functions
-      in <literal>FROM</> that return a composite type containing dropped
+      in <literal>FROM</literal> that return a composite type containing dropped
       columns (Tom Lane)
      </para>
     </listitem>
@@ -7327,7 +8240,7 @@ Branch: REL8_4_STABLE [969735cf1] 2014-04-05 18:16:24 -0400
 
      <para>
       This ensures that the postmaster will properly clean up after itself
-      if, for example, it receives <systemitem>SIGINT</> while still
+      if, for example, it receives <systemitem>SIGINT</systemitem> while still
       starting up.
      </para>
     </listitem>
@@ -7342,7 +8255,7 @@ Branch: REL9_1_STABLE [b7a424371] 2014-04-02 17:11:34 -0400
 
     <listitem>
      <para>
-      Fix client host name lookup when processing <filename>pg_hba.conf</>
+      Fix client host name lookup when processing <filename>pg_hba.conf</filename>
       entries that specify host names instead of IP addresses (Tom Lane)
      </para>
 
@@ -7363,14 +8276,14 @@ Branch: REL9_2_STABLE [6d25eb314] 2014-04-04 22:03:42 -0400
 
     <listitem>
      <para>
-      Allow the root user to use <literal>postgres -C variable</> and
-      <literal>postgres --describe-config</> (MauMau)
+      Allow the root user to use <literal>postgres -C variable</literal> and
+      <literal>postgres --describe-config</literal> (MauMau)
      </para>
 
      <para>
       The prohibition on starting the server as root does not need to extend
       to these operations, and relaxing it prevents failure
-      of <application>pg_ctl</> in some scenarios.
+      of <application>pg_ctl</application> in some scenarios.
      </para>
     </listitem>
 
@@ -7388,7 +8301,7 @@ Branch: REL8_4_STABLE [95cefd30e] 2014-06-14 09:41:18 -0400
     <listitem>
      <para>
       Secure Unix-domain sockets of temporary postmasters started during
-      <literal>make check</> (Noah Misch)
+      <literal>make check</literal> (Noah Misch)
      </para>
 
      <para>
@@ -7397,16 +8310,16 @@ Branch: REL8_4_STABLE [95cefd30e] 2014-06-14 09:41:18 -0400
       the operating-system user running the test, as we previously noted in
       CVE-2014-0067.  This change defends against that risk by placing the
       server's socket in a temporary, mode 0700 subdirectory
-      of <filename>/tmp</>.  The hazard remains however on platforms where
+      of <filename>/tmp</filename>.  The hazard remains however on platforms where
       Unix sockets are not supported, notably Windows, because then the
       temporary postmaster must accept local TCP connections.
      </para>
 
      <para>
       A useful side effect of this change is to simplify
-      <literal>make check</> testing in builds that
-      override <literal>DEFAULT_PGSOCKET_DIR</>.  Popular non-default values
-      like <filename>/var/run/postgresql</> are often not writable by the
+      <literal>make check</literal> testing in builds that
+      override <literal>DEFAULT_PGSOCKET_DIR</literal>.  Popular non-default values
+      like <filename>/var/run/postgresql</filename> are often not writable by the
       build user, requiring workarounds that will no longer be necessary.
      </para>
     </listitem>
@@ -7454,7 +8367,7 @@ Branch: REL8_4_STABLE [30e434bdf] 2014-04-05 12:41:40 -0400
     <listitem>
      <para>
       On Windows, allow new sessions to absorb values of PGC_BACKEND
-      parameters (such as <xref linkend="guc-log-connections">) from the
+      parameters (such as <xref linkend="guc-log-connections"/>) from the
       configuration file (Amit Kapila)
      </para>
 
@@ -7480,9 +8393,9 @@ Branch: REL8_4_STABLE [e3f273ff6] 2014-04-30 10:39:03 +0300
      </para>
 
      <para>
-      This oversight could cause <application>initdb</>
-      and <application>pg_upgrade</> to fail on Windows, if the installation
-      path contained both spaces and <literal>@</> signs.
+      This oversight could cause <application>initdb</application>
+      and <application>pg_upgrade</application> to fail on Windows, if the installation
+      path contained both spaces and <literal>@</literal> signs.
      </para>
     </listitem>
 
@@ -7498,7 +8411,7 @@ Branch: REL8_4_STABLE [ae41bb4be] 2014-05-30 18:18:32 -0400
 
     <listitem>
      <para>
-      Fix linking of <application>libpython</> on macOS (Tom Lane)
+      Fix linking of <application>libpython</application> on macOS (Tom Lane)
      </para>
 
      <para>
@@ -7519,17 +8432,17 @@ Branch: REL8_4_STABLE [664ac3de7] 2014-05-07 21:38:50 -0400
 
     <listitem>
      <para>
-      Avoid buffer bloat in <application>libpq</> when the server
+      Avoid buffer bloat in <application>libpq</application> when the server
       consistently sends data faster than the client can absorb it
       (Shin-ichi Morita, Tom Lane)
      </para>
 
      <para>
-      <application>libpq</> could be coerced into enlarging its input buffer
+      <application>libpq</application> could be coerced into enlarging its input buffer
       until it runs out of memory (which would be reported misleadingly
-      as <quote>lost synchronization with server</>).  Under ordinary
+      as <quote>lost synchronization with server</quote>).  Under ordinary
       circumstances it's quite far-fetched that data could be continuously
-      transmitted more quickly than the <function>recv()</> loop can
+      transmitted more quickly than the <function>recv()</function> loop can
       absorb it, but this has been observed when the client is artificially
       slowed by scheduler constraints.
      </para>
@@ -7547,7 +8460,7 @@ Branch: REL8_4_STABLE [b4ae2e37d] 2014-04-16 18:59:48 +0200
 
     <listitem>
      <para>
-      Ensure that LDAP lookup attempts in <application>libpq</> time out as
+      Ensure that LDAP lookup attempts in <application>libpq</application> time out as
       intended (Laurenz Albe)
      </para>
     </listitem>
@@ -7570,8 +8483,8 @@ Branch: REL9_0_STABLE [0c2eb989e] 2014-04-09 12:12:32 +0200
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to do the right thing when an array
-      of <type>char *</> is the target for a FETCH statement returning more
+      Fix <application>ecpg</application> to do the right thing when an array
+      of <type>char *</type> is the target for a FETCH statement returning more
       than one row, as well as some other array-handling fixes
       (Ashutosh Bapat)
      </para>
@@ -7585,13 +8498,13 @@ Branch: REL9_3_STABLE [3080bbaa9] 2014-03-29 17:34:03 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to cope with a materialized view that
+      Fix <application>pg_dump</application> to cope with a materialized view that
       depends on a table's primary key (Tom Lane)
      </para>
 
      <para>
       This occurs if the view's query relies on functional dependency to
-      abbreviate a <literal>GROUP BY</> list.  <application>pg_dump</> got
+      abbreviate a <literal>GROUP BY</literal> list.  <application>pg_dump</application> got
       sufficiently confused that it dumped the materialized view as a
       regular view.
      </para>
@@ -7605,7 +8518,7 @@ Branch: REL9_3_STABLE [63817f86b] 2014-03-18 10:38:38 -0400
 
     <listitem>
      <para>
-      Fix parsing of <application>pg_dumpall</>'s <option>-i</> switch
+      Fix parsing of <application>pg_dumpall</application>'s <option>-i</option> switch
       (Tom Lane)
      </para>
     </listitem>
@@ -7623,13 +8536,13 @@ Branch: REL8_4_STABLE [6adddac8a] 2014-06-12 20:14:55 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_restore</>'s processing of old-style large object
+      Fix <application>pg_restore</application>'s processing of old-style large object
       comments (Tom Lane)
      </para>
 
      <para>
       A direct-to-database restore from an archive file generated by a
-      pre-9.0 version of <application>pg_dump</> would usually fail if the
+      pre-9.0 version of <application>pg_dump</application> would usually fail if the
       archive contained more than a few comments for large objects.
      </para>
     </listitem>
@@ -7644,12 +8557,12 @@ Branch: REL9_2_STABLE [759c9fb63] 2014-07-07 13:24:08 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> for cases where the new server creates
+      Fix <application>pg_upgrade</application> for cases where the new server creates
       a TOAST table but the old version did not (Bruce Momjian)
      </para>
 
      <para>
-      This rare situation would manifest as <quote>relation OID mismatch</>
+      This rare situation would manifest as <quote>relation OID mismatch</quote>
       errors.
      </para>
     </listitem>
@@ -7668,9 +8581,9 @@ Branch: REL9_3_STABLE [e7984cca0] 2014-07-21 11:42:05 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>,
-      preserve <structname>pg_database</>.<structfield>datminmxid</>
-      and <structname>pg_class</>.<structfield>relminmxid</> values from the
+      In <application>pg_upgrade</application>,
+      preserve <structname>pg_database</structname>.<structfield>datminmxid</structfield>
+      and <structname>pg_class</structname>.<structfield>relminmxid</structfield> values from the
       old cluster, or insert reasonable values when upgrading from pre-9.3;
       also defend against unreasonable values in the core server
       (Bruce Momjian, &Aacute;lvaro Herrera, Tom Lane)
@@ -7693,13 +8606,13 @@ Branch: REL9_2_STABLE [31f579f09] 2014-05-20 12:20:57 -0400
 
     <listitem>
      <para>
-      Prevent <filename>contrib/auto_explain</> from changing the output of
-      a user's <command>EXPLAIN</> (Tom Lane)
+      Prevent <filename>contrib/auto_explain</filename> from changing the output of
+      a user's <command>EXPLAIN</command> (Tom Lane)
      </para>
 
      <para>
-      If <filename>auto_explain</> is active, it could cause
-      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</> command to nonetheless
+      If <filename>auto_explain</filename> is active, it could cause
+      an <literal>EXPLAIN (ANALYZE, TIMING OFF)</literal> command to nonetheless
       print timing information.
      </para>
     </listitem>
@@ -7714,7 +8627,7 @@ Branch: REL9_2_STABLE [3e2cfa42f] 2014-06-20 12:27:04 -0700
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in <filename>contrib/dblink</>
+      Fix query-lifespan memory leak in <filename>contrib/dblink</filename>
       (MauMau, Joe Conway)
      </para>
     </listitem>
@@ -7731,7 +8644,7 @@ Branch: REL8_4_STABLE [df2e62603] 2014-04-17 12:37:53 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</> functions, ensure sensitive
+      In <filename>contrib/pgcrypto</filename> functions, ensure sensitive
       information is cleared from stack variables before returning
       (Marko Kreen)
      </para>
@@ -7748,7 +8661,7 @@ Branch: REL9_2_STABLE [f6d6b7b1e] 2014-06-30 17:00:40 -0400
     <listitem>
      <para>
       Prevent use of already-freed memory in
-      <filename>contrib/pgstattuple</>'s <function>pgstat_heap()</>
+      <filename>contrib/pgstattuple</filename>'s <function>pgstat_heap()</function>
       (Noah Misch)
      </para>
     </listitem>
@@ -7765,13 +8678,13 @@ Branch: REL8_4_STABLE [fd785441f] 2014-05-29 13:51:18 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/uuid-ossp</>, cache the state of the OSSP UUID
+      In <filename>contrib/uuid-ossp</filename>, cache the state of the OSSP UUID
       library across calls (Tom Lane)
      </para>
 
      <para>
       This improves the efficiency of UUID generation and reduces the amount
-      of entropy drawn from <filename>/dev/urandom</>, on platforms that
+      of entropy drawn from <filename>/dev/urandom</filename>, on platforms that
       have that.
      </para>
     </listitem>
@@ -7789,7 +8702,7 @@ Branch: REL8_4_STABLE [c51da696b] 2014-07-19 15:01:45 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014e
+      Update time zone data files to <application>tzdata</application> release 2014e
       for DST law changes in Crimea, Egypt, and Morocco.
      </para>
     </listitem>
@@ -7810,7 +8723,7 @@ Branch: REL8_4_STABLE [c51da696b] 2014-07-19 15:01:45 -0400
   <para>
    This release contains a variety of fixes from 9.3.3.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -7829,7 +8742,7 @@ Branch: REL8_4_STABLE [c51da696b] 2014-07-19 15:01:45 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.3,
-    see <xref linkend="release-9-3-3">.
+    see <xref linkend="release-9-3-3"/>.
    </para>
 
   </sect2>
@@ -7900,7 +8813,7 @@ Branch: REL9_0_STABLE [7aea1050e] 2014-03-13 12:03:07 -0400
     <listitem>
      <para>
       Avoid race condition in checking transaction commit status during
-      receipt of a <command>NOTIFY</> message (Marko Tiikkaja)
+      receipt of a <command>NOTIFY</command> message (Marko Tiikkaja)
      </para>
 
      <para>
@@ -7918,8 +8831,8 @@ Branch: REL9_3_STABLE [3973034e6] 2014-03-06 11:37:04 -0500
 
     <listitem>
      <para>
-      Allow materialized views to be referenced in <command>UPDATE</>
-      and <command>DELETE</> commands (Michael Paquier)
+      Allow materialized views to be referenced in <command>UPDATE</command>
+      and <command>DELETE</command> commands (Michael Paquier)
      </para>
 
      <para>
@@ -7962,7 +8875,7 @@ Branch: REL8_4_STABLE [dd378dd1e] 2014-02-18 12:44:36 -0500
 
     <listitem>
      <para>
-      Remove incorrect code that tried to allow <literal>OVERLAPS</> with
+      Remove incorrect code that tried to allow <literal>OVERLAPS</literal> with
       single-element row arguments (Joshua Yanovski)
      </para>
 
@@ -7985,17 +8898,17 @@ Branch: REL8_4_STABLE [f043bddfe] 2014-03-06 19:31:22 -0500
 
     <listitem>
      <para>
-      Avoid getting more than <literal>AccessShareLock</> when de-parsing a
+      Avoid getting more than <literal>AccessShareLock</literal> when de-parsing a
       rule or view (Dean Rasheed)
      </para>
 
      <para>
-      This oversight resulted in <application>pg_dump</> unexpectedly
-      acquiring <literal>RowExclusiveLock</> locks on tables mentioned as
-      the targets of <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
+      This oversight resulted in <application>pg_dump</application> unexpectedly
+      acquiring <literal>RowExclusiveLock</literal> locks on tables mentioned as
+      the targets of <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
       commands in rules.  While usually harmless, that could interfere with
       concurrent transactions that tried to acquire, for example,
-      <literal>ShareLock</> on those tables.
+      <literal>ShareLock</literal> on those tables.
      </para>
     </listitem>
 
@@ -8030,9 +8943,9 @@ Branch: REL9_3_STABLE [e8655a77f] 2014-02-21 17:10:49 -0500
     <listitem>
      <para>
       Use non-default selectivity estimates for
-      <literal><replaceable>value</> IN (<replaceable>list</>)</literal> and
-      <literal><replaceable>value</> <replaceable>operator</> ANY
-      (<replaceable>array</>)</literal>
+      <literal><replaceable>value</replaceable> IN (<replaceable>list</replaceable>)</literal> and
+      <literal><replaceable>value</replaceable> <replaceable>operator</replaceable> ANY
+      (<replaceable>array</replaceable>)</literal>
       expressions when the righthand side is a stable expression (Tom Lane)
      </para>
     </listitem>
@@ -8046,16 +8959,16 @@ Branch: REL9_3_STABLE [13ea43ab8] 2014-03-05 13:03:29 -0300
     <listitem>
      <para>
       Remove the correct per-database statistics file during <command>DROP
-      DATABASE</> (Tomas Vondra)
+      DATABASE</command> (Tomas Vondra)
      </para>
 
      <para>
       This fix prevents a permanent leak of statistics file space.
-      Users who have done many <command>DROP DATABASE</> commands since
-      upgrading to <productname>PostgreSQL</> 9.3 may wish to check their
+      Users who have done many <command>DROP DATABASE</command> commands since
+      upgrading to <productname>PostgreSQL</productname> 9.3 may wish to check their
       statistics directory and delete statistics files that do not
       correspond to any existing database.  Please note
-      that <filename>db_0.stat</> should not be removed.
+      that <filename>db_0.stat</filename> should not be removed.
      </para>
     </listitem>
 
@@ -8067,15 +8980,15 @@ Branch: REL9_3_STABLE [dcd1131c8] 2014-03-06 21:40:50 +0200
 
     <listitem>
      <para>
-      Fix <application>walsender</> ping logic to avoid inappropriate
+      Fix <application>walsender</application> ping logic to avoid inappropriate
       disconnects under continuous load (Andres Freund, Heikki Linnakangas)
      </para>
 
      <para>
-      <application>walsender</> failed to send ping messages to the client
+      <application>walsender</application> failed to send ping messages to the client
       if it was constantly busy sending WAL data; but it expected to see
       ping responses despite that, and would therefore disconnect
-      once <xref linkend="guc-wal-sender-timeout"> elapsed.
+      once <xref linkend="guc-wal-sender-timeout"/> elapsed.
      </para>
     </listitem>
 
@@ -8089,8 +9002,8 @@ Branch: REL9_1_STABLE [65e8dbb18] 2014-03-17 20:42:35 +0900
 
     <listitem>
      <para>
-      Fix <application>walsender</>'s failure to shut down cleanly when client
-      is <application>pg_receivexlog</> (Fujii Masao)
+      Fix <application>walsender</application>'s failure to shut down cleanly when client
+      is <application>pg_receivexlog</application> (Fujii Masao)
      </para>
     </listitem>
 
@@ -8131,7 +9044,7 @@ Branch: REL9_3_STABLE [5a7e75849] 2014-02-20 10:46:54 +0200
 
     <listitem>
      <para>
-      Add read-only <xref linkend="guc-data-checksums"> parameter to
+      Add read-only <xref linkend="guc-data-checksums"/> parameter to
       display whether page checksums are enabled (Heikki Linnakangas)
      </para>
 
@@ -8153,13 +9066,13 @@ Branch: REL8_4_STABLE [172c53e92] 2014-03-13 20:59:57 -0400
 
     <listitem>
      <para>
-      Prevent interrupts while reporting non-<literal>ERROR</> messages
+      Prevent interrupts while reporting non-<literal>ERROR</literal> messages
       (Tom Lane)
      </para>
 
      <para>
       This guards against rare server-process freezeups due to recursive
-      entry to <function>syslog()</>, and perhaps other related problems.
+      entry to <function>syslog()</function>, and perhaps other related problems.
      </para>
     </listitem>
 
@@ -8187,13 +9100,13 @@ Branch: REL9_2_STABLE [b315b767f] 2014-03-10 15:47:13 -0400
 
     <listitem>
      <para>
-      Fix tracking of <application>psql</> script line numbers
-      during <literal>\copy</> from out-of-line data
+      Fix tracking of <application>psql</application> script line numbers
+      during <literal>\copy</literal> from out-of-line data
       (Kumar Rajeev Rastogi, Amit Khandekar)
      </para>
 
      <para>
-      <literal>\copy ... from</> incremented the script file line number
+      <literal>\copy ... from</literal> incremented the script file line number
       for each data line, even if the data was not coming from the script
       file.  This mistake resulted in wrong line numbers being reported for
       any errors occurring later in the same script file.
@@ -8208,12 +9121,12 @@ Branch: REL9_3_STABLE [73f0483fd] 2014-03-07 16:36:50 -0500
 
     <listitem>
      <para>
-      Fix <application>contrib/postgres_fdw</> to handle multiple join
+      Fix <application>contrib/postgres_fdw</application> to handle multiple join
       conditions properly (Tom Lane)
      </para>
 
      <para>
-      This oversight could result in sending <literal>WHERE</> clauses to
+      This oversight could result in sending <literal>WHERE</literal> clauses to
       the remote server for execution even though the clauses are not known
       to have the same semantics on the remote server (for example, clauses
       that use non-built-in operators).  The query might succeed anyway,
@@ -8233,7 +9146,7 @@ Branch: REL9_0_STABLE [665515539] 2014-03-16 11:47:37 +0100
 
     <listitem>
      <para>
-      Prevent intermittent <quote>could not reserve shared memory region</>
+      Prevent intermittent <quote>could not reserve shared memory region</quote>
       failures on recent Windows versions (MauMau)
      </para>
     </listitem>
@@ -8250,7 +9163,7 @@ Branch: REL8_4_STABLE [6e6c2c2e1] 2014-03-15 13:36:57 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2014a
+      Update time zone data files to <application>tzdata</application> release 2014a
       for DST law changes in Fiji and Turkey, plus historical changes in
       Israel and Ukraine.
      </para>
@@ -8272,7 +9185,7 @@ Branch: REL8_4_STABLE [6e6c2c2e1] 2014-03-15 13:36:57 -0400
   <para>
    This release contains a variety of fixes from 9.3.2.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -8301,7 +9214,7 @@ Branch: REL8_4_STABLE [6e6c2c2e1] 2014-03-15 13:36:57 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.2,
-    see <xref linkend="release-9-3-2">.
+    see <xref linkend="release-9-3-2"/>.
    </para>
 
   </sect2>
@@ -8323,19 +9236,19 @@ Branch: REL8_4_STABLE [ff35425c8] 2014-02-17 09:33:38 -0500
 
     <listitem>
      <para>
-      Shore up <literal>GRANT ... WITH ADMIN OPTION</> restrictions
+      Shore up <literal>GRANT ... WITH ADMIN OPTION</literal> restrictions
       (Noah Misch)
      </para>
 
      <para>
-      Granting a role without <literal>ADMIN OPTION</> is supposed to
+      Granting a role without <literal>ADMIN OPTION</literal> is supposed to
       prevent the grantee from adding or removing members from the granted
       role, but this restriction was easily bypassed by doing <literal>SET
-      ROLE</> first.  The security impact is mostly that a role member can
+      ROLE</literal> first.  The security impact is mostly that a role member can
       revoke the access of others, contrary to the wishes of his grantor.
       Unapproved role member additions are a lesser concern, since an
       uncooperative role member could provide most of his rights to others
-      anyway by creating views or <literal>SECURITY DEFINER</> functions.
+      anyway by creating views or <literal>SECURITY DEFINER</literal> functions.
       (CVE-2014-0060)
      </para>
     </listitem>
@@ -8358,7 +9271,7 @@ Branch: REL8_4_STABLE [823b9dc25] 2014-02-17 09:33:38 -0500
 
      <para>
       The primary role of PL validator functions is to be called implicitly
-      during <command>CREATE FUNCTION</>, but they are also normal SQL
+      during <command>CREATE FUNCTION</command>, but they are also normal SQL
       functions that a user can call explicitly.  Calling a validator on
       a function actually written in some other language was not checked
       for and could be exploited for privilege-escalation purposes.
@@ -8388,7 +9301,7 @@ Branch: REL8_4_STABLE [e46476133] 2014-02-17 09:33:38 -0500
      <para>
       If the name lookups come to different conclusions due to concurrent
       activity, we might perform some parts of the DDL on a different table
-      than other parts.  At least in the case of <command>CREATE INDEX</>,
+      than other parts.  At least in the case of <command>CREATE INDEX</command>,
       this can be used to cause the permissions checks to be performed
       against a different table than the index creation, allowing for a
       privilege escalation attack.
@@ -8412,12 +9325,12 @@ Branch: REL8_4_STABLE [d0ed1a6c0] 2014-02-17 09:33:39 -0500
      </para>
 
      <para>
-      The <literal>MAXDATELEN</> constant was too small for the longest
-      possible value of type <type>interval</>, allowing a buffer overrun
-      in <function>interval_out()</>.  Although the datetime input
+      The <literal>MAXDATELEN</literal> constant was too small for the longest
+      possible value of type <type>interval</type>, allowing a buffer overrun
+      in <function>interval_out()</function>.  Although the datetime input
       functions were more careful about avoiding buffer overrun, the limit
       was short enough to cause them to reject some valid inputs, such as
-      input containing a very long timezone name.  The <application>ecpg</>
+      input containing a very long timezone name.  The <application>ecpg</application>
       library contained these vulnerabilities along with some of its own.
       (CVE-2014-0063)
      </para>
@@ -8464,7 +9377,7 @@ Branch: REL8_4_STABLE [69d2bc14a] 2014-02-17 11:20:38 -0500
      </para>
 
      <para>
-      Use <function>strlcpy()</> and related functions to provide a clear
+      Use <function>strlcpy()</function> and related functions to provide a clear
       guarantee that fixed-size buffers are not overrun.  Unlike the
       preceding items, it is unclear whether these cases really represent
       live issues, since in most cases there appear to be previous
@@ -8486,16 +9399,16 @@ Branch: REL8_4_STABLE [69d2bc14a] 2014-02-17 11:20:38 -0500
 
     <listitem>
      <para>
-      Avoid crashing if <function>crypt()</> returns NULL (Honza Horak,
+      Avoid crashing if <function>crypt()</function> returns NULL (Honza Horak,
       Bruce Momjian)
      </para>
 
      <para>
-      There are relatively few scenarios in which <function>crypt()</>
-      could return NULL, but <filename>contrib/chkpass</> would crash
+      There are relatively few scenarios in which <function>crypt()</function>
+      could return NULL, but <filename>contrib/chkpass</filename> would crash
       if it did.  One practical case in which this could be an issue is
-      if <application>libc</> is configured to refuse to execute unapproved
-      hashing algorithms (e.g., <quote>FIPS mode</>).
+      if <application>libc</application> is configured to refuse to execute unapproved
+      hashing algorithms (e.g., <quote>FIPS mode</quote>).
       (CVE-2014-0066)
      </para>
     </listitem>
@@ -8512,19 +9425,19 @@ Branch: REL8_4_STABLE [f58663ab1] 2014-02-17 11:24:51 -0500
 
     <listitem>
      <para>
-      Document risks of <literal>make check</> in the regression testing
+      Document risks of <literal>make check</literal> in the regression testing
       instructions (Noah Misch, Tom Lane)
      </para>
 
      <para>
-      Since the temporary server started by <literal>make check</>
-      uses <quote>trust</> authentication, another user on the same machine
+      Since the temporary server started by <literal>make check</literal>
+      uses <quote>trust</quote> authentication, another user on the same machine
       could connect to it as database superuser, and then potentially
       exploit the privileges of the operating-system user who started the
       tests.  A future release will probably incorporate changes in the
       testing procedure to prevent this risk, but some public discussion is
       needed first.  So for the moment, just warn people against using
-      <literal>make check</> when there are untrusted users on the
+      <literal>make check</literal> when there are untrusted users on the
       same machine.
       (CVE-2014-0067)
      </para>
@@ -8545,7 +9458,7 @@ Branch: REL9_3_STABLE [8e9a16ab8] 2013-12-16 11:29:51 -0300
      <para>
       The logic for tuple freezing was unable to handle some cases involving
       freezing of
-      <link linkend="vacuum-for-multixact-wraparound"><firstterm>multixact</>
+      <link linkend="vacuum-for-multixact-wraparound"><firstterm>multixact</firstterm>
       IDs</link>, with the practical effect that shared row-level locks
       might be forgotten once old enough.
      </para>
@@ -8554,7 +9467,7 @@ Branch: REL9_3_STABLE [8e9a16ab8] 2013-12-16 11:29:51 -0300
       Fixing this required changing the WAL record format for tuple
       freezing.  While this is no issue for standalone servers, when using
       replication it means that <emphasis>standby servers must be upgraded
-      to 9.3.3 or later before their masters are</>.  An older standby will
+      to 9.3.3 or later before their masters are</emphasis>.  An older standby will
       be unable to interpret freeze records generated by a newer master, and
       will fail with a PANIC message.  (In such a case, upgrading the
       standby should be sufficient to let it resume execution.)
@@ -8580,9 +9493,9 @@ Branch: REL9_3_STABLE [fb47de2be] 2014-02-13 19:30:30 -0300
       freezing parameters were used for multixact IDs too; but since
       the consumption rates of transaction IDs and multixact IDs can be
       quite different, this did not work very well.  Introduce new settings
-      <xref linkend="guc-vacuum-multixact-freeze-min-age">,
-      <xref linkend="guc-vacuum-multixact-freeze-table-age">, and
-      <xref linkend="guc-autovacuum-multixact-freeze-max-age">
+      <xref linkend="guc-vacuum-multixact-freeze-min-age"/>,
+      <xref linkend="guc-vacuum-multixact-freeze-table-age"/>, and
+      <xref linkend="guc-autovacuum-multixact-freeze-max-age"/>
       to control when to freeze multixacts.
      </para>
     </listitem>
@@ -8612,8 +9525,8 @@ Branch: REL9_3_STABLE [db1014bc4] 2013-12-18 13:31:27 -0300
      <para>
       This oversight could allow referential integrity checks to give false
       positives (for instance, allow deletes that should have been rejected).
-      Applications using the new commands <literal>SELECT FOR KEY SHARE</>
-      and <literal>SELECT FOR NO KEY UPDATE</> might also have suffered
+      Applications using the new commands <literal>SELECT FOR KEY SHARE</literal>
+      and <literal>SELECT FOR NO KEY UPDATE</literal> might also have suffered
       locking failures of this kind.
      </para>
     </listitem>
@@ -8626,7 +9539,7 @@ Branch: REL9_3_STABLE [c6cd27e36] 2013-12-05 12:21:55 -0300
 
     <listitem>
      <para>
-      Prevent <quote>forgetting</> valid row locks when one of several
+      Prevent <quote>forgetting</quote> valid row locks when one of several
       holders of a row lock aborts (&Aacute;lvaro Herrera)
      </para>
 
@@ -8651,8 +9564,8 @@ Branch: REL9_3_STABLE [2dcc48c35] 2013-12-05 17:47:51 -0300
 
      <para>
       This mistake could result in spurious <quote>could not serialize access
-      due to concurrent update</> errors in <literal>REPEATABLE READ</>
-      and <literal>SERIALIZABLE</> transaction isolation modes.
+      due to concurrent update</quote> errors in <literal>REPEATABLE READ</literal>
+      and <literal>SERIALIZABLE</literal> transaction isolation modes.
      </para>
     </listitem>
 
@@ -8665,7 +9578,7 @@ Branch: REL9_3_STABLE [03db79459] 2014-01-02 18:17:07 -0300
     <listitem>
      <para>
       Handle wraparound correctly during extension or truncation
-      of <filename>pg_multixact/members</>
+      of <filename>pg_multixact/members</filename>
       (Andres Freund, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -8678,7 +9591,7 @@ Branch: REL9_3_STABLE [948a3dfbb] 2014-01-02 18:17:29 -0300
 
     <listitem>
      <para>
-      Fix handling of 5-digit filenames in <filename>pg_multixact/members</>
+      Fix handling of 5-digit filenames in <filename>pg_multixact/members</filename>
       (&Aacute;lvaro Herrera)
      </para>
 
@@ -8715,7 +9628,7 @@ Branch: REL9_3_STABLE [85d3b3c3a] 2013-12-19 16:39:59 -0300
 
      <para>
       This fixes a performance regression from pre-9.3 versions when doing
-      <literal>SELECT FOR UPDATE</> followed by <literal>UPDATE/DELETE</>.
+      <literal>SELECT FOR UPDATE</literal> followed by <literal>UPDATE/DELETE</literal>.
      </para>
     </listitem>
 
@@ -8729,7 +9642,7 @@ Branch: REL9_3_STABLE [762bd379a] 2014-02-14 15:18:34 +0200
      <para>
       During archive recovery, prefer highest timeline number when WAL
       segments with the same ID are present in both the archive
-      and <filename>pg_xlog/</> (Kyotaro Horiguchi)
+      and <filename>pg_xlog/</filename> (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -8758,7 +9671,7 @@ Branch: REL8_4_STABLE [9620fede9] 2014-02-12 14:52:32 -0500
      <para>
       The WAL update could be applied to the wrong page, potentially many
       pages past where it should have been.  Aside from corrupting data,
-      this error has been observed to result in significant <quote>bloat</>
+      this error has been observed to result in significant <quote>bloat</quote>
       of standby servers compared to their masters, due to updates being
       applied far beyond where the end-of-file should have been.  This
       failure mode does not appear to be a significant risk during crash
@@ -8787,7 +9700,7 @@ Branch: REL9_0_STABLE [5301c8395] 2014-01-08 14:34:21 +0200
       was already consistent at the start of replay, thus possibly allowing
       hot-standby queries before the database was really consistent.  Other
       symptoms such as <quote>PANIC: WAL contains references to invalid
-      pages</> were also possible.
+      pages</quote> were also possible.
      </para>
     </listitem>
 
@@ -8815,13 +9728,13 @@ Branch: REL9_0_STABLE [5d742b9ce] 2014-01-14 17:35:00 -0500
     <listitem>
      <para>
       Fix improper locking of btree index pages while replaying
-      a <literal>VACUUM</> operation in hot-standby mode (Andres Freund,
+      a <literal>VACUUM</literal> operation in hot-standby mode (Andres Freund,
       Heikki Linnakangas, Tom Lane)
      </para>
 
      <para>
       This error could result in <quote>PANIC: WAL contains references to
-      invalid pages</> failures.
+      invalid pages</quote> failures.
      </para>
     </listitem>
 
@@ -8857,8 +9770,8 @@ Branch: REL9_1_STABLE [0402f2441] 2014-01-08 23:31:01 +0200
 
     <listitem>
      <para>
-      When <literal>pause_at_recovery_target</>
-      and <literal>recovery_target_inclusive</> are both set, ensure the
+      When <literal>pause_at_recovery_target</literal>
+      and <literal>recovery_target_inclusive</literal> are both set, ensure the
       target record is applied before pausing, not after (Heikki
       Linnakangas)
      </para>
@@ -8887,14 +9800,14 @@ Branch: REL9_3_STABLE [478af9b79] 2013-12-13 11:50:25 -0500
     <listitem>
      <para>
       Prevent timeout interrupts from taking control away from mainline
-      code unless <varname>ImmediateInterruptOK</> is set
+      code unless <varname>ImmediateInterruptOK</varname> is set
       (Andres Freund, Tom Lane)
      </para>
 
      <para>
       This is a serious issue for any application making use of statement
       timeouts, as it could cause all manner of strange failures after a
-      timeout occurred.  We have seen reports of <quote>stuck</> spinlocks,
+      timeout occurred.  We have seen reports of <quote>stuck</quote> spinlocks,
       ERRORs being unexpectedly promoted to PANICs, unkillable backends,
       and other misbehaviors.
      </para>
@@ -8917,7 +9830,7 @@ Branch: REL8_4_STABLE [458b20f2d] 2014-01-31 21:41:09 -0500
 
      <para>
       Ensure that signal handlers don't attempt to use the
-      process's <varname>MyProc</> pointer after it's no longer valid.
+      process's <varname>MyProc</varname> pointer after it's no longer valid.
      </para>
     </listitem>
 
@@ -8948,13 +9861,13 @@ Branch: REL8_4_STABLE [01b882fd8] 2014-01-29 20:04:14 -0500
 
     <listitem>
      <para>
-      Fix unsafe references to <varname>errno</> within error reporting
+      Fix unsafe references to <varname>errno</varname> within error reporting
       logic (Christian Kruse)
      </para>
 
      <para>
       This would typically lead to odd behaviors such as missing or
-      inappropriate <literal>HINT</> fields.
+      inappropriate <literal>HINT</literal> fields.
      </para>
     </listitem>
 
@@ -8970,7 +9883,7 @@ Branch: REL8_4_STABLE [d0070ac81] 2014-01-11 16:35:44 -0500
 
     <listitem>
      <para>
-      Fix possible crashes from using <function>ereport()</> too early
+      Fix possible crashes from using <function>ereport()</function> too early
       during server startup (Tom Lane)
      </para>
 
@@ -9014,7 +9927,7 @@ Branch: REL8_4_STABLE [a8a46d846] 2014-02-13 14:24:58 -0500
 
     <listitem>
      <para>
-      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</>
+      Fix length checking for Unicode identifiers (<literal>U&amp;"..."</literal>
       syntax) containing escapes (Tom Lane)
      </para>
 
@@ -9056,7 +9969,7 @@ Branch: REL9_0_STABLE [f2eede9b5] 2014-01-21 23:01:40 -0500
      <para>
       A previous patch allowed such keywords to be used without quoting
       in places such as role identifiers; but it missed cases where a
-      list of role identifiers was permitted, such as <literal>DROP ROLE</>.
+      list of role identifiers was permitted, such as <literal>DROP ROLE</literal>.
      </para>
     </listitem>
 
@@ -9088,7 +10001,7 @@ Branch: REL8_4_STABLE [884c6384a] 2013-12-10 16:10:36 -0500
     <listitem>
      <para>
       Fix possible crash due to invalid plan for nested sub-selects, such
-      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</>
+      as <literal>WHERE (... x IN (SELECT ...) ...) IN (SELECT ...)</literal>
       (Tom Lane)
      </para>
     </listitem>
@@ -9101,13 +10014,13 @@ Branch: REL9_3_STABLE [a4aa854ca] 2014-01-30 14:51:19 -0500
 
     <listitem>
      <para>
-      Fix mishandling of <literal>WHERE</> conditions pulled up from
-      a <literal>LATERAL</> subquery (Tom Lane)
+      Fix mishandling of <literal>WHERE</literal> conditions pulled up from
+      a <literal>LATERAL</literal> subquery (Tom Lane)
      </para>
 
      <para>
       The typical symptom of this bug was a <quote>JOIN qualification
-      cannot refer to other relations</> error, though subtle logic
+      cannot refer to other relations</quote> error, though subtle logic
       errors in created plans seem possible as well.
      </para>
     </listitem>
@@ -9120,8 +10033,8 @@ Branch: REL9_3_STABLE [27ff4cfe7] 2014-01-11 19:03:15 -0500
 
     <listitem>
      <para>
-      Disallow <literal>LATERAL</> references to the target table of
-      an <literal>UPDATE/DELETE</> (Tom Lane)
+      Disallow <literal>LATERAL</literal> references to the target table of
+      an <literal>UPDATE/DELETE</literal> (Tom Lane)
      </para>
 
      <para>
@@ -9139,12 +10052,12 @@ Branch: REL9_2_STABLE [5d545b7ed] 2013-12-14 17:34:00 -0500
 
     <listitem>
      <para>
-      Fix <literal>UPDATE/DELETE</> of an inherited target table
-      that has <literal>UNION ALL</> subqueries (Tom Lane)
+      Fix <literal>UPDATE/DELETE</literal> of an inherited target table
+      that has <literal>UNION ALL</literal> subqueries (Tom Lane)
      </para>
 
      <para>
-      Without this fix, <literal>UNION ALL</> subqueries aren't correctly
+      Without this fix, <literal>UNION ALL</literal> subqueries aren't correctly
       inserted into the update plans for inheritance child tables after the
       first one, typically resulting in no update happening for those child
       table(s).
@@ -9159,7 +10072,7 @@ Branch: REL9_3_STABLE [663f8419b] 2013-12-23 22:18:23 -0500
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</> to not fail on a column that's a domain over
+      Fix <command>ANALYZE</command> to not fail on a column that's a domain over
       a range type (Tom Lane)
      </para>
     </listitem>
@@ -9176,12 +10089,12 @@ Branch: REL8_4_STABLE [00b77771a] 2014-01-11 13:42:11 -0500
 
     <listitem>
      <para>
-      Ensure that <command>ANALYZE</> creates statistics for a table column
-      even when all the values in it are <quote>too wide</> (Tom Lane)
+      Ensure that <command>ANALYZE</command> creates statistics for a table column
+      even when all the values in it are <quote>too wide</quote> (Tom Lane)
      </para>
 
      <para>
-      <command>ANALYZE</> intentionally omits very wide values from its
+      <command>ANALYZE</command> intentionally omits very wide values from its
       histogram and most-common-values calculations, but it neglected to do
       something sane in the case that all the sampled entries are too wide.
      </para>
@@ -9199,14 +10112,14 @@ Branch: REL8_4_STABLE [0fb4e3ceb] 2014-01-18 18:50:47 -0500
 
     <listitem>
      <para>
-      In <literal>ALTER TABLE ... SET TABLESPACE</>, allow the database's
+      In <literal>ALTER TABLE ... SET TABLESPACE</literal>, allow the database's
       default tablespace to be used without a permissions check
       (Stephen Frost)
      </para>
 
      <para>
-      <literal>CREATE TABLE</> has always allowed such usage,
-      but <literal>ALTER TABLE</> didn't get the memo.
+      <literal>CREATE TABLE</literal> has always allowed such usage,
+      but <literal>ALTER TABLE</literal> didn't get the memo.
      </para>
     </listitem>
 
@@ -9234,8 +10147,8 @@ Branch: REL8_4_STABLE [57ac7d8a7] 2014-01-08 20:18:24 -0500
 
     <listitem>
      <para>
-      Fix <quote>cannot accept a set</> error when some arms of
-      a <literal>CASE</> return a set and others don't (Tom Lane)
+      Fix <quote>cannot accept a set</quote> error when some arms of
+      a <literal>CASE</literal> return a set and others don't (Tom Lane)
      </para>
     </listitem>
 
@@ -9316,12 +10229,12 @@ Branch: REL8_4_STABLE [6141983fb] 2014-02-10 10:00:50 +0200
 
     <listitem>
      <para>
-      Fix possible misbehavior in <function>plainto_tsquery()</>
+      Fix possible misbehavior in <function>plainto_tsquery()</function>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      Use <function>memmove()</> not <function>memcpy()</> for copying
+      Use <function>memmove()</function> not <function>memcpy()</function> for copying
       overlapping memory regions.  There have been no field reports of
       this actually causing trouble, but it's certainly risky.
      </para>
@@ -9337,8 +10250,8 @@ Branch: REL9_1_STABLE [026a91f86] 2014-01-07 18:00:36 +0100
 
     <listitem>
      <para>
-      Fix placement of permissions checks in <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> (Andres Freund, Magnus Hagander)
+      Fix placement of permissions checks in <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> (Andres Freund, Magnus Hagander)
      </para>
 
      <para>
@@ -9359,7 +10272,7 @@ Branch: REL8_4_STABLE [69f77d756] 2013-12-15 11:11:11 +0900
 
     <listitem>
      <para>
-      Accept <literal>SHIFT_JIS</> as an encoding name for locale checking
+      Accept <literal>SHIFT_JIS</literal> as an encoding name for locale checking
       purposes (Tatsuo Ishii)
      </para>
     </listitem>
@@ -9373,14 +10286,14 @@ Branch: REL9_2_STABLE [888b56570] 2014-02-03 14:46:57 -0500
 
     <listitem>
      <para>
-      Fix <literal>*</>-qualification of named parameters in SQL-language
+      Fix <literal>*</literal>-qualification of named parameters in SQL-language
       functions (Tom Lane)
      </para>
 
      <para>
       Given a composite-type parameter
-      named <literal>foo</>, <literal>$1.*</> worked fine,
-      but <literal>foo.*</> not so much.
+      named <literal>foo</literal>, <literal>$1.*</literal> worked fine,
+      but <literal>foo.*</literal> not so much.
      </para>
     </listitem>
 
@@ -9396,11 +10309,11 @@ Branch: REL8_4_STABLE [5525529db] 2014-01-23 23:02:30 +0900
 
     <listitem>
      <para>
-      Fix misbehavior of <function>PQhost()</> on Windows (Fujii Masao)
+      Fix misbehavior of <function>PQhost()</function> on Windows (Fujii Masao)
      </para>
 
      <para>
-      It should return <literal>localhost</> if no host has been specified.
+      It should return <literal>localhost</literal> if no host has been specified.
      </para>
     </listitem>
 
@@ -9416,14 +10329,14 @@ Branch: REL8_4_STABLE [7644a7bd8] 2014-02-13 18:45:32 -0500
 
     <listitem>
      <para>
-      Improve error handling in <application>libpq</> and <application>psql</>
-      for failures during <literal>COPY TO STDOUT/FROM STDIN</> (Tom Lane)
+      Improve error handling in <application>libpq</application> and <application>psql</application>
+      for failures during <literal>COPY TO STDOUT/FROM STDIN</literal> (Tom Lane)
      </para>
 
      <para>
       In particular this fixes an infinite loop that could occur in 9.2 and
       up if the server connection was lost during <literal>COPY FROM
-      STDIN</>.  Variants of that scenario might be possible in older
+      STDIN</literal>.  Variants of that scenario might be possible in older
       versions, or with other client applications.
      </para>
     </listitem>
@@ -9438,7 +10351,7 @@ Branch: REL9_2_STABLE [fa28f9cba] 2014-01-04 16:05:23 -0500
     <listitem>
      <para>
       Fix incorrect translation handling in
-      some <application>psql</> <literal>\d</> commands
+      some <application>psql</application> <literal>\d</literal> commands
       (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -9452,7 +10365,7 @@ Branch: REL9_2_STABLE [0ae288d2d] 2014-02-12 14:51:00 +0100
 
     <listitem>
      <para>
-      Ensure <application>pg_basebackup</>'s background process is killed
+      Ensure <application>pg_basebackup</application>'s background process is killed
       when exiting its foreground process (Magnus Hagander)
      </para>
     </listitem>
@@ -9468,7 +10381,7 @@ Branch: REL9_1_STABLE [c6e5c4dd1] 2014-02-09 12:09:55 +0100
     <listitem>
      <para>
       Fix possible incorrect printing of filenames
-      in <application>pg_basebackup</>'s verbose mode (Magnus Hagander)
+      in <application>pg_basebackup</application>'s verbose mode (Magnus Hagander)
      </para>
     </listitem>
 
@@ -9499,7 +10412,7 @@ Branch: REL8_4_STABLE [d68a65b01] 2014-01-09 15:58:37 +0100
 
     <listitem>
      <para>
-      Fix misaligned descriptors in <application>ecpg</> (MauMau)
+      Fix misaligned descriptors in <application>ecpg</application> (MauMau)
      </para>
     </listitem>
 
@@ -9515,7 +10428,7 @@ Branch: REL8_4_STABLE [96de4939c] 2014-01-01 12:44:58 +0100
 
     <listitem>
      <para>
-      In <application>ecpg</>, handle lack of a hostname in the connection
+      In <application>ecpg</application>, handle lack of a hostname in the connection
       parameters properly (Michael Meskes)
      </para>
     </listitem>
@@ -9532,7 +10445,7 @@ Branch: REL8_4_STABLE [6c8b16e30] 2013-12-07 16:56:34 -0800
 
     <listitem>
      <para>
-      Fix performance regression in <filename>contrib/dblink</> connection
+      Fix performance regression in <filename>contrib/dblink</filename> connection
       startup (Joe Conway)
      </para>
 
@@ -9553,7 +10466,7 @@ Branch: REL8_4_STABLE [492b68541] 2014-01-13 15:44:14 +0200
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix incorrect calculation of the check
+      In <filename>contrib/isn</filename>, fix incorrect calculation of the check
       digit for ISMN values (Fabien Coelho)
      </para>
     </listitem>
@@ -9566,7 +10479,7 @@ Branch: REL9_3_STABLE [27902bc91] 2013-12-12 19:07:53 +0900
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgbench</>'s progress logging to avoid overflow
+      Fix <filename>contrib/pgbench</filename>'s progress logging to avoid overflow
       when the scale factor is large (Tatsuo Ishii)
      </para>
     </listitem>
@@ -9580,8 +10493,8 @@ Branch: REL9_2_STABLE [27ab1eb7e] 2014-01-21 16:34:35 -0500
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_stat_statement</>'s handling
-      of <literal>CURRENT_DATE</> and related constructs (Kyotaro
+      Fix <filename>contrib/pg_stat_statement</filename>'s handling
+      of <literal>CURRENT_DATE</literal> and related constructs (Kyotaro
       Horiguchi)
      </para>
     </listitem>
@@ -9595,7 +10508,7 @@ Branch: REL9_3_STABLE [eb3d350db] 2014-02-03 21:30:28 -0500
     <listitem>
      <para>
       Improve lost-connection error handling
-      in <filename>contrib/postgres_fdw</> (Tom Lane)
+      in <filename>contrib/postgres_fdw</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -9628,13 +10541,13 @@ Branch: REL8_4_STABLE [ae3c98b9b] 2014-02-01 15:16:52 -0500
 
     <listitem>
      <para>
-      In Mingw and Cygwin builds, install the <application>libpq</> DLL
-      in the <filename>bin</> directory (Andrew Dunstan)
+      In Mingw and Cygwin builds, install the <application>libpq</application> DLL
+      in the <filename>bin</filename> directory (Andrew Dunstan)
      </para>
 
      <para>
       This duplicates what the MSVC build has long done.  It should fix
-      problems with programs like <application>psql</> failing to start
+      problems with programs like <application>psql</application> failing to start
       because they can't find the DLL.
      </para>
     </listitem>
@@ -9650,7 +10563,7 @@ Branch: REL9_0_STABLE [1c0bf372f] 2014-02-01 16:14:15 -0500
 
     <listitem>
      <para>
-      Avoid using the deprecated <literal>dllwrap</> tool in Cygwin builds
+      Avoid using the deprecated <literal>dllwrap</literal> tool in Cygwin builds
       (Marco Atzeri)
      </para>
     </listitem>
@@ -9679,8 +10592,8 @@ Branch: REL8_4_STABLE [432735cbf] 2014-02-10 20:48:30 -0500
 
     <listitem>
      <para>
-      Don't generate plain-text <filename>HISTORY</>
-      and <filename>src/test/regress/README</> files anymore (Tom Lane)
+      Don't generate plain-text <filename>HISTORY</filename>
+      and <filename>src/test/regress/README</filename> files anymore (Tom Lane)
      </para>
 
      <para>
@@ -9689,7 +10602,7 @@ Branch: REL8_4_STABLE [432735cbf] 2014-02-10 20:48:30 -0500
       the likely audience for plain-text format.  Distribution tarballs
       will still contain files by these names, but they'll just be stubs
       directing the reader to consult the main documentation.
-      The plain-text <filename>INSTALL</> file will still be maintained, as
+      The plain-text <filename>INSTALL</filename> file will still be maintained, as
       there is arguably a use-case for that.
      </para>
     </listitem>
@@ -9706,13 +10619,13 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013i
+      Update time zone data files to <application>tzdata</application> release 2013i
       for DST law changes in Jordan and historical changes in Cuba.
      </para>
 
      <para>
-      In addition, the zones <literal>Asia/Riyadh87</>,
-      <literal>Asia/Riyadh88</>, and <literal>Asia/Riyadh89</> have been
+      In addition, the zones <literal>Asia/Riyadh87</literal>,
+      <literal>Asia/Riyadh88</literal>, and <literal>Asia/Riyadh89</literal> have been
       removed, as they are no longer maintained by IANA, and never
       represented actual civil timekeeping practice.
      </para>
@@ -9734,7 +10647,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
   <para>
    This release contains a variety of fixes from 9.3.1.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -9752,7 +10665,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
    <para>
     Also, if you are upgrading from a version earlier than 9.3.1,
-    see <xref linkend="release-9-3-1">.
+    see <xref linkend="release-9-3-1"/>.
    </para>
 
   </sect2>
@@ -9764,19 +10677,19 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix <command>VACUUM</>'s tests to see whether it can
-      update <structfield>relfrozenxid</> (Andres Freund)
+      Fix <command>VACUUM</command>'s tests to see whether it can
+      update <structfield>relfrozenxid</structfield> (Andres Freund)
      </para>
 
      <para>
-      In some cases <command>VACUUM</> (either manual or autovacuum) could
-      incorrectly advance a table's <structfield>relfrozenxid</> value,
+      In some cases <command>VACUUM</command> (either manual or autovacuum) could
+      incorrectly advance a table's <structfield>relfrozenxid</structfield> value,
       allowing tuples to escape freezing, causing those rows to become
       invisible once 2^31 transactions have elapsed.  The probability of
       data loss is fairly low since multiple incorrect advancements would
       need to happen before actual loss occurs, but it's not zero.  In 9.2.0
       and later, the probability of loss is higher, and it's also possible
-      to get <quote>could not access status of transaction</> errors as a
+      to get <quote>could not access status of transaction</quote> errors as a
       consequence of this bug.  Users upgrading from releases 9.0.4 or 8.4.8
       or earlier are not affected, but all later versions contain the bug.
      </para>
@@ -9784,12 +10697,12 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix any latent corruption but will not be able
       to fix all pre-existing data errors.  However, an installation can be
       presumed safe after performing this vacuuming if it has executed fewer
       than 2^31 update transactions in its lifetime (check this with
-      <literal>SELECT txid_current() < 2^31</>).
+      <literal>SELECT txid_current() &lt; 2^31</literal>).
      </para>
     </listitem>
 
@@ -9801,14 +10714,14 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
      <para>
       These bugs could lead to <quote>could not access status of
-      transaction</> errors, or to duplicate or vanishing rows.
+      transaction</quote> errors, or to duplicate or vanishing rows.
       Users upgrading from releases prior to 9.3.0 are not affected.
      </para>
 
      <para>
       The issue can be ameliorated by, after upgrading, vacuuming all tables
       in all databases while having <link
-      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</></link>
+      linkend="guc-vacuum-freeze-table-age"><varname>vacuum_freeze_table_age</varname></link>
       set to zero.  This will fix latent corruption but will not be able to
       fix all pre-existing data errors.
      </para>
@@ -9824,7 +10737,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix initialization of <filename>pg_clog</> and <filename>pg_subtrans</>
+      Fix initialization of <filename>pg_clog</filename> and <filename>pg_subtrans</filename>
       during hot standby startup (Andres Freund, Heikki Linnakangas)
      </para>
 
@@ -9857,7 +10770,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      <para>
       These bugs could result in incorrect behavior, such as locking or even
       updating the wrong row, in the presence of concurrent updates.
-      Spurious <quote>unable to fetch updated version of tuple</> errors
+      Spurious <quote>unable to fetch updated version of tuple</quote> errors
       were also possible.
      </para>
     </listitem>
@@ -9869,7 +10782,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
      <para>
       This could lead to corruption of the lock data structures in shared
-      memory, causing <quote>lock already held</> and other odd errors.
+      memory, causing <quote>lock already held</quote> and other odd errors.
      </para>
     </listitem>
 
@@ -9886,7 +10799,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Truncate <filename>pg_multixact</> contents during WAL replay
+      Truncate <filename>pg_multixact</filename> contents during WAL replay
       (Andres Freund)
      </para>
 
@@ -9897,14 +10810,14 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Ensure an anti-wraparound <command>VACUUM</> counts a page as scanned
+      Ensure an anti-wraparound <command>VACUUM</command> counts a page as scanned
       when it's only verified that no tuples need freezing (Sergey
       Burladyan, Jeff Janes)
      </para>
 
      <para>
       This bug could result in failing to
-      advance <structfield>relfrozenxid</>, so that the table would still be
+      advance <structfield>relfrozenxid</structfield>, so that the table would still be
       thought to need another anti-wraparound vacuum.  In the worst case the
       database might even shut down to prevent wraparound.
      </para>
@@ -9933,7 +10846,7 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
 
     <listitem>
      <para>
-      Fix <quote>unexpected spgdoinsert() failure</> error during SP-GiST
+      Fix <quote>unexpected spgdoinsert() failure</quote> error during SP-GiST
       index creation (Teodor Sigaev)
      </para>
     </listitem>
@@ -9951,12 +10864,12 @@ Branch: REL8_4_STABLE [c0c2d62ac] 2014-02-14 21:59:56 -0500
      </para>
 
      <para>
-      Historically <productname>PostgreSQL</> has accepted queries like
+      Historically <productname>PostgreSQL</productname> has accepted queries like
 <programlisting>
 SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 </programlisting>
       although a strict reading of the SQL standard would forbid the
-      duplicate usage of table alias <literal>x</>.  A misguided change in
+      duplicate usage of table alias <literal>x</literal>.  A misguided change in
       9.3.0 caused it to reject some such cases that were formerly accepted.
       Restore the previous behavior.
      </para>
@@ -9964,8 +10877,8 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Avoid flattening a subquery whose <literal>SELECT</> list contains a
-      volatile function wrapped inside a sub-<literal>SELECT</> (Tom Lane)
+      Avoid flattening a subquery whose <literal>SELECT</literal> list contains a
+      volatile function wrapped inside a sub-<literal>SELECT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -9982,14 +10895,14 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
      <para>
       This error could lead to incorrect plans for queries involving
-      multiple levels of subqueries within <literal>JOIN</> syntax.
+      multiple levels of subqueries within <literal>JOIN</literal> syntax.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix incorrect planning in cases where the same non-strict expression
-      appears in multiple <literal>WHERE</> and outer <literal>JOIN</>
+      appears in multiple <literal>WHERE</literal> and outer <literal>JOIN</literal>
       equality clauses (Tom Lane)
      </para>
     </listitem>
@@ -10077,20 +10990,20 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix array slicing of <type>int2vector</> and <type>oidvector</> values
+      Fix array slicing of <type>int2vector</type> and <type>oidvector</type> values
       (Tom Lane)
      </para>
 
      <para>
       Expressions of this kind are now implicitly promoted to
-      regular <type>int2</> or <type>oid</> arrays.
+      regular <type>int2</type> or <type>oid</type> arrays.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Return a valid JSON value when converting an empty <type>hstore</> value
-      to <type>json</>
+      Return a valid JSON value when converting an empty <type>hstore</type> value
+      to <type>json</type>
       (Oskari Saarenmaa)
      </para>
     </listitem>
@@ -10105,7 +11018,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
       In some cases, the system would use the simple GMT offset value when
       it should have used the regular timezone setting that had prevailed
       before the simple offset was selected.  This change also causes
-      the <function>timeofday</> function to honor the simple GMT offset
+      the <function>timeofday</function> function to honor the simple GMT offset
       zone.
      </para>
     </listitem>
@@ -10119,7 +11032,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Properly quote generated command lines in <application>pg_ctl</>
+      Properly quote generated command lines in <application>pg_ctl</application>
       (Naoya Anzai and Tom Lane)
      </para>
 
@@ -10130,10 +11043,10 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix <application>pg_dumpall</> to work when a source database
+      Fix <application>pg_dumpall</application> to work when a source database
       sets <link
-      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</></link>
-      via <command>ALTER DATABASE SET</> (Kevin Grittner)
+      linkend="guc-default-transaction-read-only"><varname>default_transaction_read_only</varname></link>
+      via <command>ALTER DATABASE SET</command> (Kevin Grittner)
      </para>
 
      <para>
@@ -10143,19 +11056,19 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Fix <application>pg_isready</> to handle its <option>-d</> option
+      Fix <application>pg_isready</application> to handle its <option>-d</option> option
       properly (Fabr&iacute;zio de Royes Mello and Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of WAL file names in <application>pg_receivexlog</>
+      Fix parsing of WAL file names in <application>pg_receivexlog</application>
       (Heikki Linnakangas)
      </para>
 
      <para>
-      This error made <application>pg_receivexlog</> unable to restart
+      This error made <application>pg_receivexlog</application> unable to restart
       streaming after stopping, once at least 4 GB of WAL had been written.
      </para>
     </listitem>
@@ -10163,34 +11076,34 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
     <listitem>
      <para>
       Report out-of-disk-space failures properly
-      in <application>pg_upgrade</> (Peter Eisentraut)
+      in <application>pg_upgrade</application> (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</> search for quoted cursor names
+      Make <application>ecpg</application> search for quoted cursor names
       case-sensitively (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s processing of lists of variables
-      declared <type>varchar</> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
+      Fix <application>ecpg</application>'s processing of lists of variables
+      declared <type>varchar</type> (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/lo</> defend against incorrect trigger definitions
+      Make <filename>contrib/lo</filename> defend against incorrect trigger definitions
       (Marc Cousin)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2013h
+      Update time zone data files to <application>tzdata</application> release 2013h
       for DST law changes in Argentina, Brazil, Jordan, Libya,
       Liechtenstein, Morocco, and Palestine.  Also, new timezone
       abbreviations WIB, WIT, WITA for Indonesia.
@@ -10213,7 +11126,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
   <para>
    This release contains a variety of fixes from 9.3.0.
    For information about new features in the 9.3 major release, see
-   <xref linkend="release-9-3">.
+   <xref linkend="release-9-3"/>.
   </para>
 
   <sect2>
@@ -10224,7 +11137,7 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
    </para>
 
    <para>
-    However, if you use the <literal>hstore</> extension, see the
+    However, if you use the <literal>hstore</literal> extension, see the
     first changelog entry.
    </para>
 
@@ -10237,18 +11150,18 @@ SELECT ... FROM tab1 x CROSS JOIN (tab2 x CROSS JOIN tab3 y) z
 
     <listitem>
      <para>
-      Ensure new-in-9.3 JSON functionality is added to the <literal>hstore</>
+      Ensure new-in-9.3 JSON functionality is added to the <literal>hstore</literal>
       extension during an update (Andrew Dunstan)
      </para>
 
      <para>
-      Users who upgraded a pre-9.3 database containing <literal>hstore</>
+      Users who upgraded a pre-9.3 database containing <literal>hstore</literal>
       should execute
 <programlisting>
 ALTER EXTENSION hstore UPDATE;
 </programlisting>
       after installing 9.3.1, to add two new JSON functions and a cast.
-      (If <literal>hstore</> is already up to date, this command does
+      (If <literal>hstore</literal> is already up to date, this command does
       nothing.)
      </para>
     </listitem>
@@ -10281,14 +11194,14 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Fix timeline handling bugs in <application>pg_receivexlog</>
+      Fix timeline handling bugs in <application>pg_receivexlog</application>
       (Heikki Linnakangas, Andrew Gierth)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent <command>CREATE FUNCTION</> from checking <command>SET</>
+      Prevent <command>CREATE FUNCTION</command> from checking <command>SET</command>
       variables unless function body checking is enabled (Tom Lane)
      </para>
     </listitem>
@@ -10317,7 +11230,7 @@ ALTER EXTENSION hstore UPDATE;
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.3 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.3 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -10326,7 +11239,7 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Add <link linkend="SQL-CREATEMATERIALIZEDVIEW">materialized
+      Add <link linkend="sql-creatematerializedview">materialized
       views</link>
      </para>
     </listitem>
@@ -10334,29 +11247,29 @@ ALTER EXTENSION hstore UPDATE;
     <listitem>
      <para>
       Make simple views <link
-      linkend="SQL-CREATEVIEW-updatable-views">auto-updatable</link>
+      linkend="sql-createview-updatable-views">auto-updatable</link>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add many features for the <type>JSON</> data type,
+      Add many features for the <type>JSON</type> data type,
       including <link linkend="functions-json">operators and functions</link>
-      to extract elements from <type>JSON</> values
+      to extract elements from <type>JSON</type> values
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Implement <acronym>SQL</>-standard <link
-      linkend="queries-lateral"><literal>LATERAL</></link> option for
-      <literal>FROM</>-clause subqueries and function calls
+      Implement <acronym>SQL</acronym>-standard <link
+      linkend="queries-lateral"><literal>LATERAL</literal></link> option for
+      <literal>FROM</literal>-clause subqueries and function calls
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow <link linkend="SQL-CREATEFOREIGNDATAWRAPPER">foreign data
+      Allow <link linkend="sql-createforeigndatawrapper">foreign data
       wrappers</link> to support writes (inserts/updates/deletes) on foreign
       tables
      </para>
@@ -10364,9 +11277,9 @@ ALTER EXTENSION hstore UPDATE;
 
     <listitem>
      <para>
-      Add a <link linkend="postgres-fdw"><productname>Postgres</> foreign
+      Add a <link linkend="postgres-fdw"><productname>Postgres</productname> foreign
       data wrapper</link> to allow access to
-      other <productname>Postgres</> servers
+      other <productname>Postgres</productname> servers
      </para>
     </listitem>
 
@@ -10411,8 +11324,8 @@ ALTER EXTENSION hstore UPDATE;
 
    <para>
     A dump/restore using <link
-    linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link>, or use
-    of <link linkend="pgupgrade"><application>pg_upgrade</></link>, is
+    linkend="app-pg-dumpall"><application>pg_dumpall</application></link>, or use
+    of <link linkend="pgupgrade"><application>pg_upgrade</application></link>, is
     required for those wishing to migrate data from any previous release.
    </para>
 
@@ -10428,21 +11341,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Rename <varname>replication_timeout</> to <link
-        linkend="guc-wal-sender-timeout"><varname>wal_sender_timeout</></link>
+        Rename <varname>replication_timeout</varname> to <link
+        linkend="guc-wal-sender-timeout"><varname>wal_sender_timeout</varname></link>
         (Amit Kapila)
        </para>
 
        <para>
         This setting controls the <link
-        linkend="wal"><acronym>WAL</></link> sender timeout.
+        linkend="wal"><acronym>WAL</acronym></link> sender timeout.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Require superuser privileges to set <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         because it can now potentially delay other sessions (Simon Riggs)
        </para>
       </listitem>
@@ -10454,7 +11367,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         Users who have set <link
-        linkend="guc-work-mem"><varname>work_mem</></link> based on the
+        linkend="guc-work-mem"><varname>work_mem</varname></link> based on the
         previous behavior may need to revisit that setting.
        </para>
       </listitem>
@@ -10471,7 +11384,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Throw an error if a tuple to be updated or deleted has already been
-        updated or deleted by a <literal>BEFORE</> trigger (Kevin Grittner)
+        updated or deleted by a <literal>BEFORE</literal> trigger (Kevin Grittner)
        </para>
 
        <para>
@@ -10481,7 +11394,7 @@ ALTER EXTENSION hstore UPDATE;
         Now an error is thrown to prevent the inconsistent results from being
         committed.  If this change affects your application, the best solution
         is usually to move the data-propagation actions to
-        an <literal>AFTER</> trigger.
+        an <literal>AFTER</literal> trigger.
        </para>
 
        <para>
@@ -10493,16 +11406,16 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change multicolumn <link linkend="SQL-CREATETABLE"><literal>ON UPDATE
-        SET NULL/SET DEFAULT</></link> foreign key actions to affect
+        Change multicolumn <link linkend="sql-createtable"><literal>ON UPDATE
+        SET NULL/SET DEFAULT</literal></link> foreign key actions to affect
         all columns of the constraint, not just those changed in the
-        <command>UPDATE</> (Tom Lane)
+        <command>UPDATE</command> (Tom Lane)
        </para>
 
        <para>
         Previously, we would set only those referencing columns that
         correspond to referenced columns that were changed by
-        the <command>UPDATE</>.  This was what was required by SQL-92,
+        the <command>UPDATE</command>.  This was what was required by SQL-92,
         but more recent editions of the SQL standard specify the new behavior.
        </para>
       </listitem>
@@ -10510,35 +11423,35 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Force cached plans to be replanned if the <link
-        linkend="guc-search-path"><varname>search_path</></link> changes
+        linkend="guc-search-path"><varname>search_path</varname></link> changes
         (Tom Lane)
        </para>
 
        <para>
         Previously, cached plans already generated in the current session were
         not redone if the query was re-executed with a
-        new <varname>search_path</> setting, resulting in surprising behavior.
+        new <varname>search_path</varname> setting, resulting in surprising behavior.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix <link
-        linkend="functions-formatting-table"><function>to_number()</></link>
+        linkend="functions-formatting-table"><function>to_number()</function></link>
         to properly handle a period used as a thousands separator (Tom Lane)
        </para>
 
        <para>
         Previously, a period was considered to be a decimal point even when
-        the locale says it isn't and the <literal>D</> format code is used to
+        the locale says it isn't and the <literal>D</literal> format code is used to
         specify use of the locale-specific decimal point.  This resulted in
-        wrong answers if <literal>FM</> format was also used.
+        wrong answers if <literal>FM</literal> format was also used.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix <literal>STRICT</> non-set-returning functions that have
+        Fix <literal>STRICT</literal> non-set-returning functions that have
         set-returning functions in their arguments to properly return null
         rows (Tom Lane)
        </para>
@@ -10551,14 +11464,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Store <link linkend="wal"><acronym>WAL</></link> in a continuous
+        Store <link linkend="wal"><acronym>WAL</acronym></link> in a continuous
         stream, rather than skipping the last 16MB segment every 4GB
         (Heikki Linnakangas)
        </para>
 
        <para>
-        Previously, <acronym>WAL</> files with names ending in <literal>FF</>
-        were not used because of this skipping.  If you have <acronym>WAL</>
+        Previously, <acronym>WAL</acronym> files with names ending in <literal>FF</literal>
+        were not used because of this skipping.  If you have <acronym>WAL</acronym>
         backup or restore scripts that took this behavior into account, they
         will need to be adjusted.
        </para>
@@ -10567,15 +11480,15 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         In <link
-        linkend="catalog-pg-constraint"><structname>pg_constraint.confmatchtype</></link>,
-        store the default foreign key match type (non-<literal>FULL</>,
-        non-<literal>PARTIAL</>) as <literal>s</> for <quote>simple</>
+        linkend="catalog-pg-constraint"><structname>pg_constraint.confmatchtype</structname></link>,
+        store the default foreign key match type (non-<literal>FULL</literal>,
+        non-<literal>PARTIAL</literal>) as <literal>s</literal> for <quote>simple</quote>
         (Tom Lane)
        </para>
 
        <para>
-        Previously this case was represented by <literal>u</>
-        for <quote>unspecified</>.
+        Previously this case was represented by <literal>u</literal>
+        for <quote>unspecified</quote>.
        </para>
       </listitem>
 
@@ -10612,10 +11525,10 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         This change improves concurrency and reduces the probability of
         deadlocks when updating tables involved in a foreign-key constraint.
-        <command>UPDATE</>s that do not change any columns referenced in a
-        foreign key now take the new <literal>NO KEY UPDATE</> lock mode on
-        the row, while foreign key checks use the new <literal>KEY SHARE</>
-        lock mode, which does not conflict with <literal>NO KEY UPDATE</>.
+        <command>UPDATE</command>s that do not change any columns referenced in a
+        foreign key now take the new <literal>NO KEY UPDATE</literal> lock mode on
+        the row, while foreign key checks use the new <literal>KEY SHARE</literal>
+        lock mode, which does not conflict with <literal>NO KEY UPDATE</literal>.
         So there is no blocking unless a foreign-key column is changed.
        </para>
       </listitem>
@@ -10623,7 +11536,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add configuration variable <link
-        linkend="guc-lock-timeout"><varname>lock_timeout</></link> to
+        linkend="guc-lock-timeout"><varname>lock_timeout</varname></link> to
         allow limiting how long a session will wait to acquire any one lock
         (Zolt&aacute;n B&ouml;sz&ouml;rm&eacute;nyi)
        </para>
@@ -10640,21 +11553,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="rangetypes-indexing"><acronym>SP-GiST</></link>
+        Add <link linkend="rangetypes-indexing"><acronym>SP-GiST</acronym></link>
         support for range data types (Alexander Korotkov)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="GiST"><acronym>GiST</></link> indexes to be
+        Allow <link linkend="gist"><acronym>GiST</acronym></link> indexes to be
         unlogged (Jeevan Chalke)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve performance of <acronym>GiST</> index insertion by randomizing
+        Improve performance of <acronym>GiST</acronym> index insertion by randomizing
         the choice of which page to descend to when there are multiple equally
         good alternatives (Heikki Linnakangas)
        </para>
@@ -10692,7 +11605,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve optimizer's hash table size estimate for
-        doing <literal>DISTINCT</> via hash aggregation (Tom Lane)
+        doing <literal>DISTINCT</literal> via hash aggregation (Tom Lane)
        </para>
       </listitem>
 
@@ -10722,7 +11635,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-COPY"><command>COPY FREEZE</></link>
+        Add <link linkend="sql-copy"><command>COPY FREEZE</command></link>
         option to avoid the overhead of marking tuples as frozen later
         (Simon Riggs, Jeff Davis)
        </para>
@@ -10731,7 +11644,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve performance of <link
-        linkend="datatype-numeric"><type>NUMERIC</></link> calculations
+        linkend="datatype-numeric"><type>NUMERIC</type></link> calculations
         (Kyotaro Horiguchi)
        </para>
       </listitem>
@@ -10739,20 +11652,20 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve synchronization of sessions waiting for <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         (Peter Geoghegan)
        </para>
 
        <para>
-        This greatly improves the usefulness of <varname>commit_delay</>.
+        This greatly improves the usefulness of <varname>commit_delay</varname>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve performance of the <link
-        linkend="SQL-CREATETABLE"><command>CREATE TEMPORARY TABLE ... ON
-        COMMIT DELETE ROWS</></link> option by not truncating such temporary
+        linkend="sql-createtable"><command>CREATE TEMPORARY TABLE ... ON
+        COMMIT DELETE ROWS</command></link> option by not truncating such temporary
         tables in transactions that haven't touched any temporary tables
         (Heikki Linnakangas)
        </para>
@@ -10777,7 +11690,7 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         This speeds up lock bookkeeping at statement completion in
         multi-statement transactions that hold many locks; it is particularly
-        useful for <application>pg_dump</>.
+        useful for <application>pg_dump</application>.
        </para>
       </listitem>
 
@@ -10789,7 +11702,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         This speeds up sessions that create many tables in successive
-        small transactions, such as a <application>pg_restore</> run.
+        small transactions, such as a <application>pg_restore</application> run.
        </para>
       </listitem>
 
@@ -10818,7 +11731,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         The checksum option can be set during <link
-        linkend="APP-INITDB">initdb</link>.
+        linkend="app-initdb">initdb</link>.
        </para>
       </listitem>
 
@@ -10871,7 +11784,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         When an authentication failure occurs, log the relevant
-        <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</></link>
+        <link linkend="auth-pg-hba-conf"><filename>pg_hba.conf</filename></link>
         line, to ease debugging of unintended failures
         (Magnus Hagander)
        </para>
@@ -10879,23 +11792,23 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Improve <link linkend="auth-ldap"><acronym>LDAP</></link> error
+        Improve <link linkend="auth-ldap"><acronym>LDAP</acronym></link> error
         reporting and documentation (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for specifying <acronym>LDAP</> authentication parameters
-        in <acronym>URL</> format, per RFC 4516 (Peter Eisentraut)
+        Add support for specifying <acronym>LDAP</acronym> authentication parameters
+        in <acronym>URL</acronym> format, per RFC 4516 (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Change the <link
-        linkend="guc-ssl-ciphers"><varname>ssl_ciphers</></link> parameter
-        to start with <literal>DEFAULT</>, rather than <literal>ALL</>,
+        linkend="guc-ssl-ciphers"><varname>ssl_ciphers</varname></link> parameter
+        to start with <literal>DEFAULT</literal>, rather than <literal>ALL</literal>,
         then remove insecure ciphers (Magnus Hagander)
        </para>
 
@@ -10907,12 +11820,12 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Parse and load <link
-        linkend="auth-username-maps"><filename>pg_ident.conf</></link>
+        linkend="auth-username-maps"><filename>pg_ident.conf</filename></link>
         once, not during each connection (Amit Kapila)
        </para>
 
        <para>
-        This is similar to how <filename>pg_hba.conf</> is processed.
+        This is similar to how <filename>pg_hba.conf</filename> is processed.
        </para>
       </listitem>
 
@@ -10932,8 +11845,8 @@ ALTER EXTENSION hstore UPDATE;
        </para>
 
        <para>
-        On Unix-like systems, <function>mmap()</> is now used for most
-        of <productname>PostgreSQL</>'s shared memory.  For most users, this
+        On Unix-like systems, <function>mmap()</function> is now used for most
+        of <productname>PostgreSQL</productname>'s shared memory.  For most users, this
         will eliminate any need to adjust kernel parameters for shared memory.
        </para>
       </listitem>
@@ -10946,8 +11859,8 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         The configuration parameter
-        <varname>unix_socket_directory</> is replaced by <link
-        linkend="guc-unix-socket-directories"><varname>unix_socket_directories</></link>,
+        <varname>unix_socket_directory</varname> is replaced by <link
+        linkend="guc-unix-socket-directories"><varname>unix_socket_directories</varname></link>,
         which accepts a list of directories.
        </para>
       </listitem>
@@ -10960,7 +11873,7 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         Such a directory is specified with <link
-        linkend="config-includes"><varname>include_dir</></link> in the server
+        linkend="config-includes"><varname>include_dir</varname></link> in the server
         configuration file.
        </para>
       </listitem>
@@ -10968,14 +11881,14 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Increase the maximum <link
-        linkend="APP-INITDB">initdb</link>-configured value for <link
-        linkend="guc-shared-buffers"><varname>shared_buffers</></link>
+        linkend="app-initdb">initdb</link>-configured value for <link
+        linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
         to 128MB (Robert Haas)
        </para>
 
        <para>
         This is the maximum value that initdb will attempt to set in <link
-        linkend="config-setting-configuration-file"><filename>postgresql.conf</></link>;
+        linkend="config-setting-configuration-file"><filename>postgresql.conf</filename></link>;
         the previous maximum was 32MB.
        </para>
       </listitem>
@@ -10983,7 +11896,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Remove the <link linkend="guc-external-pid-file">external
-        <acronym>PID</> file</link>, if any, on postmaster exit
+        <acronym>PID</acronym> file</link>, if any, on postmaster exit
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -11015,10 +11928,10 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <acronym>SQL</> functions <link
-        linkend="functions-admin-backup"><function>pg_is_in_backup()</></link>
+        Add <acronym>SQL</acronym> functions <link
+        linkend="functions-admin-backup"><function>pg_is_in_backup()</function></link>
         and <link
-        linkend="functions-admin-backup"><function>pg_backup_start_time()</></link>
+        linkend="functions-admin-backup"><function>pg_backup_start_time()</function></link>
         (Gilles Darold)
        </para>
 
@@ -11030,7 +11943,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve performance of streaming log shipping with <link
-        linkend="guc-synchronous-commit"><varname>synchronous_commit</></link>
+        linkend="guc-synchronous-commit"><varname>synchronous_commit</varname></link>
         disabled (Andres Freund)
        </para>
       </listitem>
@@ -11045,12 +11958,12 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add the last checkpoint's redo location to <link
-        linkend="APP-PGCONTROLDATA"><application>pg_controldata</></link>'s
+        linkend="app-pgcontroldata"><application>pg_controldata</application></link>'s
         output (Fujii Masao)
        </para>
 
        <para>
-        This information is useful for determining which <acronym>WAL</>
+        This information is useful for determining which <acronym>WAL</acronym>
         files are needed for restore.
        </para>
       </listitem>
@@ -11058,7 +11971,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow tools like <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         to run on computers with different architectures (Heikki
         Linnakangas)
        </para>
@@ -11074,9 +11987,9 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
-        <option>--write-recovery-conf</> output a
-        minimal <filename>recovery.conf</> file (Zolt&aacute;n
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+        <option>--write-recovery-conf</option> output a
+        minimal <filename>recovery.conf</filename> file (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi, Magnus Hagander)
        </para>
 
@@ -11088,10 +12001,10 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         and <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>
-        <option>--xlog-method</> to handle streaming timeline switches
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+        <option>--xlog-method</option> to handle streaming timeline switches
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -11099,8 +12012,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link
-        linkend="guc-wal-receiver-timeout"><varname>wal_receiver_timeout</></link>
-        parameter to control the <acronym>WAL</> receiver's timeout
+        linkend="guc-wal-receiver-timeout"><varname>wal_receiver_timeout</varname></link>
+        parameter to control the <acronym>WAL</acronym> receiver's timeout
         (Amit Kapila)
        </para>
 
@@ -11111,7 +12024,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change the <link linkend="wal"><acronym>WAL</></link> record format to
+        Change the <link linkend="wal"><acronym>WAL</acronym></link> record format to
         allow splitting the record header across pages (Heikki Linnakangas)
        </para>
 
@@ -11132,23 +12045,23 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Implement <acronym>SQL</>-standard <link
-        linkend="queries-lateral"><literal>LATERAL</></link> option for
-        <literal>FROM</>-clause subqueries and function calls (Tom Lane)
+        Implement <acronym>SQL</acronym>-standard <link
+        linkend="queries-lateral"><literal>LATERAL</literal></link> option for
+        <literal>FROM</literal>-clause subqueries and function calls (Tom Lane)
        </para>
 
        <para>
-        This feature allows subqueries and functions in <literal>FROM</> to
-        reference columns from other tables in the <literal>FROM</>
-        clause. The <literal>LATERAL</> keyword is optional for functions.
+        This feature allows subqueries and functions in <literal>FROM</literal> to
+        reference columns from other tables in the <literal>FROM</literal>
+        clause. The <literal>LATERAL</literal> keyword is optional for functions.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add support for piping <link
-        linkend="SQL-COPY"><command>COPY</></link> and <link
-        linkend="APP-PSQL"><application>psql</></link> <command>\copy</>
+        linkend="sql-copy"><command>COPY</command></link> and <link
+        linkend="app-psql"><application>psql</application></link> <command>\copy</command>
         data to/from an external program (Etsuro Fujita)
        </para>
       </listitem>
@@ -11156,8 +12069,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow a multirow <link
-        linkend="SQL-VALUES"><literal>VALUES</></link> clause in a rule
-        to reference <literal>OLD</>/<literal>NEW</> (Tom Lane)
+        linkend="sql-values"><literal>VALUES</literal></link> clause in a rule
+        to reference <literal>OLD</literal>/<literal>NEW</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -11184,7 +12097,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-CREATEFOREIGNDATAWRAPPER">foreign data
+        Allow <link linkend="sql-createforeigndatawrapper">foreign data
         wrappers</link> to support writes (inserts/updates/deletes) on foreign
         tables (KaiGai Kohei)
        </para>
@@ -11192,15 +12105,15 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATESCHEMA"><command>CREATE SCHEMA ... IF
-        NOT EXISTS</></link> clause (Fabr&iacute;zio de Royes Mello)
+        Add <link linkend="sql-createschema"><command>CREATE SCHEMA ... IF
+        NOT EXISTS</command></link> clause (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="SQL-REASSIGN-OWNED"><command>REASSIGN
-        OWNED</></link> also change ownership of shared objects
+        Make <link linkend="sql-reassign-owned"><command>REASSIGN
+        OWNED</command></link> also change ownership of shared objects
         (&Aacute;lvaro Herrera)
        </para>
       </listitem>
@@ -11208,28 +12121,28 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link linkend="sql-createaggregate"><command>CREATE
-        AGGREGATE</></link> complain if the given initial value string is not
+        AGGREGATE</command></link> complain if the given initial value string is not
         valid input for the transition datatype (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Suppress <link linkend="SQL-CREATETABLE"><command>CREATE
-        TABLE</></link>'s messages about implicit index and sequence creation
+        Suppress <link linkend="sql-createtable"><command>CREATE
+        TABLE</command></link>'s messages about implicit index and sequence creation
         (Robert Haas)
        </para>
 
        <para>
-        These messages now appear at <literal>DEBUG1</> verbosity, so that
+        These messages now appear at <literal>DEBUG1</literal> verbosity, so that
         they will not be shown by default.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="SQL-DROPTABLE"><command>DROP TABLE IF
-        EXISTS</></link> to succeed when a non-existent schema is specified
+        Allow <link linkend="sql-droptable"><command>DROP TABLE IF
+        EXISTS</command></link> to succeed when a non-existent schema is specified
         in the table name (Bruce Momjian)
        </para>
 
@@ -11256,14 +12169,14 @@ ALTER EXTENSION hstore UPDATE;
      </itemizedlist>
 
     <sect4>
-     <title><command>ALTER</></title>
+     <title><command>ALTER</command></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Support <literal>IF NOT EXISTS</> option in <link
-        linkend="SQL-ALTERTYPE"><command>ALTER TYPE ... ADD VALUE</></link>
+        Support <literal>IF NOT EXISTS</literal> option in <link
+        linkend="sql-altertype"><command>ALTER TYPE ... ADD VALUE</command></link>
         (Andrew Dunstan)
        </para>
 
@@ -11274,22 +12187,22 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="SQL-ALTERROLE"><command>ALTER ROLE ALL
-        SET</></link> to establish settings for all users (Peter Eisentraut)
+        Add <link linkend="sql-alterrole"><command>ALTER ROLE ALL
+        SET</command></link> to establish settings for all users (Peter Eisentraut)
        </para>
 
        <para>
         This allows settings to apply to all users in all databases. <link
-        linkend="SQL-ALTERDATABASE"><command>ALTER DATABASE SET</></link>
+        linkend="sql-alterdatabase"><command>ALTER DATABASE SET</command></link>
         already allowed addition of settings for all users in a single
-        database.  <filename>postgresql.conf</> has a similar effect.
+        database.  <filename>postgresql.conf</filename> has a similar effect.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add support for <link linkend="SQL-ALTERRULE"><command>ALTER RULE
-        ... RENAME</></link> (Ali Dar)
+        Add support for <link linkend="sql-alterrule"><command>ALTER RULE
+        ... RENAME</command></link> (Ali Dar)
        </para>
       </listitem>
 
@@ -11298,13 +12211,13 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="rules-views"><command>VIEWs</></link></title>
+     <title><link linkend="rules-views"><command>VIEWs</command></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATEMATERIALIZEDVIEW">materialized
+        Add <link linkend="sql-creatematerializedview">materialized
         views</link> (Kevin Grittner)
        </para>
 
@@ -11320,7 +12233,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make simple views <link
-        linkend="SQL-CREATEVIEW-updatable-views">auto-updatable</link>
+        linkend="sql-createview-updatable-views">auto-updatable</link>
         (Dean Rasheed)
        </para>
 
@@ -11328,20 +12241,20 @@ ALTER EXTENSION hstore UPDATE;
         Simple views that reference some or all columns from a
         single base table are now updatable by default. More
         complex views can be made updatable using <link
-        linkend="SQL-CREATETRIGGER"><literal>INSTEAD OF</></link> triggers
-        or <link linkend="SQL-CREATERULE"><literal>INSTEAD</></link> rules.
+        linkend="sql-createtrigger"><literal>INSTEAD OF</literal></link> triggers
+        or <link linkend="sql-createrule"><literal>INSTEAD</literal></link> rules.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="SQL-CREATEVIEW"><command>CREATE RECURSIVE
-        VIEW</></link> syntax (Peter Eisentraut)
+        Add <link linkend="sql-createview"><command>CREATE RECURSIVE
+        VIEW</command></link> syntax (Peter Eisentraut)
        </para>
 
        <para>
         Internally this is translated into <command>CREATE VIEW ... WITH
-        RECURSIVE ...</>.
+        RECURSIVE ...</command>.
        </para>
       </listitem>
 
@@ -11374,7 +12287,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Increase the maximum size of <link linkend="largeObjects">large
+        Increase the maximum size of <link linkend="largeobjects">large
         objects</link> from 2GB to 4TB (Nozomi Anzai, Yugo Nagata)
        </para>
 
@@ -11387,8 +12300,8 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow text <link linkend="datatype-timezones">timezone
-        designations</link>, e.g. <quote>America/Chicago</>, in the
-        <quote>T</> field of <acronym>ISO</>-format <type>timestamptz</type>
+        designations</link>, e.g. <quote>America/Chicago</quote>, in the
+        <quote>T</quote> field of <acronym>ISO</acronym>-format <type>timestamptz</type>
         input (Bruce Momjian)
        </para>
       </listitem>
@@ -11396,20 +12309,20 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
    <sect4>
-    <title><link linkend="datatype-json"><type>JSON</></link></title>
+    <title><link linkend="datatype-json"><type>JSON</type></link></title>
 
     <itemizedlist>
 
       <listitem>
        <para>
         Add <link linkend="functions-json">operators and functions</link>
-        to extract elements from <type>JSON</> values (Andrew Dunstan)
+        to extract elements from <type>JSON</type> values (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <type>JSON</> values to be <link
+        Allow <type>JSON</type> values to be <link
         linkend="functions-json">converted into records</link>
         (Andrew Dunstan)
        </para>
@@ -11418,7 +12331,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link linkend="functions-json">functions</link> to convert
-        scalars, records, and <type>hstore</> values to <type>JSON</> (Andrew
+        scalars, records, and <type>hstore</type> values to <type>JSON</type> (Andrew
         Dunstan)
        </para>
       </listitem>
@@ -11438,9 +12351,9 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link
-        linkend="array-functions-table"><function>array_remove()</></link>
+        linkend="array-functions-table"><function>array_remove()</function></link>
         and <link
-        linkend="array-functions-table"><function>array_replace()</></link>
+        linkend="array-functions-table"><function>array_replace()</function></link>
         functions (Marco Nenciarini, Gabriele Bartolini)
        </para>
       </listitem>
@@ -11448,10 +12361,10 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link
-        linkend="functions-string-other"><function>concat()</></link>
+        linkend="functions-string-other"><function>concat()</function></link>
         and <link
-        linkend="functions-string-format"><function>format()</></link>
-        to properly expand <literal>VARIADIC</>-labeled arguments
+        linkend="functions-string-format"><function>format()</function></link>
+        to properly expand <literal>VARIADIC</literal>-labeled arguments
         (Pavel Stehule)
        </para>
       </listitem>
@@ -11459,7 +12372,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve <link
-        linkend="functions-string-format"><function>format()</></link>
+        linkend="functions-string-format"><function>format()</function></link>
         to provide field width and left/right alignment options (Pavel Stehule)
        </para>
       </listitem>
@@ -11467,29 +12380,29 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_char()</></link>,
+        linkend="functions-formatting-table"><function>to_char()</function></link>,
         <link
-        linkend="functions-formatting-table"><function>to_date()</></link>,
+        linkend="functions-formatting-table"><function>to_date()</function></link>,
         and <link
-        linkend="functions-formatting-table"><function>to_timestamp()</></link>
+        linkend="functions-formatting-table"><function>to_timestamp()</function></link>
         handle negative (BC) century values properly
         (Bruce Momjian)
        </para>
 
        <para>
         Previously the behavior was either wrong or inconsistent
-        with positive/<acronym>AD</> handling, e.g. with the format mask
-        <quote>IYYY-IW-DY</>.
+        with positive/<acronym>AD</acronym> handling, e.g. with the format mask
+        <quote>IYYY-IW-DY</quote>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_date()</></link>
+        linkend="functions-formatting-table"><function>to_date()</function></link>
         and <link
-        linkend="functions-formatting-table"><function>to_timestamp()</></link>
-        return proper results when mixing <acronym>ISO</> and Gregorian
+        linkend="functions-formatting-table"><function>to_timestamp()</function></link>
+        return proper results when mixing <acronym>ISO</acronym> and Gregorian
         week/day designations (Bruce Momjian)
        </para>
       </listitem>
@@ -11497,27 +12410,27 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Cause <link
-        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</></link>
-        to start a new line by default after each <literal>SELECT</> target
-        list entry and <literal>FROM</> entry (Marko Tiikkaja)
+        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</function></link>
+        to start a new line by default after each <literal>SELECT</literal> target
+        list entry and <literal>FROM</literal> entry (Marko Tiikkaja)
        </para>
 
        <para>
         This reduces line length in view printing, for instance in <link
-        linkend="APP-PGDUMP"><application>pg_dump</></link> output.
+        linkend="app-pgdump"><application>pg_dump</application></link> output.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix <function>map_sql_value_to_xml_value()</> to print values of
+        Fix <function>map_sql_value_to_xml_value()</function> to print values of
         domain types the same way their base type would be printed
         (Pavel Stehule)
        </para>
 
        <para>
         There are special formatting rules for certain built-in types such as
-        <type>boolean</>; these rules now also apply to domains over these
+        <type>boolean</type>; these rules now also apply to domains over these
         types.
        </para>
       </listitem>
@@ -11536,13 +12449,13 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow PL/pgSQL to use <literal>RETURN</> with a composite-type
+        Allow PL/pgSQL to use <literal>RETURN</literal> with a composite-type
         expression (Asif Rehman)
        </para>
 
        <para>
         Previously, in a function returning a composite type,
-        <literal>RETURN</> could only reference a variable of that type.
+        <literal>RETURN</literal> could only reference a variable of that type.
        </para>
       </listitem>
 
@@ -11557,14 +12470,14 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow PL/pgSQL to access the number of rows processed by
-        <link linkend="SQL-COPY"><command>COPY</></link> (Pavel Stehule)
+        <link linkend="sql-copy"><command>COPY</command></link> (Pavel Stehule)
        </para>
 
        <para>
-        A <command>COPY</> executed in a PL/pgSQL function now updates the
+        A <command>COPY</command> executed in a PL/pgSQL function now updates the
         value retrieved by <link
         linkend="plpgsql-statements-diagnostics"><command>GET DIAGNOSTICS
-        x = ROW_COUNT</></link>.
+        x = ROW_COUNT</command></link>.
        </para>
       </listitem>
 
@@ -11608,9 +12521,9 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Handle <link linkend="spi"><acronym>SPI</></link> errors raised
-        explicitly (with PL/Python's <literal>RAISE</>) the same as
-        internal <acronym>SPI</> errors (Oskari Saarenmaa and Jan Urbanski)
+        Handle <link linkend="spi"><acronym>SPI</acronym></link> errors raised
+        explicitly (with PL/Python's <literal>RAISE</literal>) the same as
+        internal <acronym>SPI</acronym> errors (Oskari Saarenmaa and Jan Urbanski)
        </para>
       </listitem>
 
@@ -11627,7 +12540,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Prevent leakage of <acronym>SPI</> tuple tables during subtransaction
+        Prevent leakage of <acronym>SPI</acronym> tuple tables during subtransaction
         abort (Tom Lane)
        </para>
 
@@ -11638,7 +12551,7 @@ ALTER EXTENSION hstore UPDATE;
         of such tuple tables and release them manually in error-recovery code.
         Failure to do so caused a number of transaction-lifespan memory leakage
         issues in PL/pgSQL and perhaps other SPI clients.  <link
-        linkend="spi-spi-freetupletable"><function>SPI_freetuptable()</></link>
+        linkend="spi-spi-freetupletable"><function>SPI_freetuptable()</function></link>
         now protects itself against multiple freeing requests, so any existing
         code that did take care to clean up shouldn't be broken by this change.
        </para>
@@ -11646,8 +12559,8 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <acronym>SPI</> functions to access the number of rows processed
-        by <link linkend="SQL-COPY"><command>COPY</></link> (Pavel Stehule)
+        Allow <acronym>SPI</acronym> functions to access the number of rows processed
+        by <link linkend="sql-copy"><command>COPY</command></link> (Pavel Stehule)
        </para>
       </listitem>
 
@@ -11663,35 +12576,35 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add command-line utility <link
-        linkend="app-pg-isready"><application>pg_isready</></link> to
+        linkend="app-pg-isready"><application>pg_isready</application></link> to
         check if the server is ready to accept connections (Phil Sorber)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support multiple <option>--table</> arguments for <link
-        linkend="APP-PGRESTORE"><application>pg_restore</></link>,
-        <link linkend="APP-CLUSTERDB"><application>clusterdb</></link>,
-        <link linkend="APP-REINDEXDB"><application>reindexdb</></link>,
-        and <link linkend="APP-VACUUMDB"><application>vacuumdb</></link>
+        Support multiple <option>--table</option> arguments for <link
+        linkend="app-pgrestore"><application>pg_restore</application></link>,
+        <link linkend="app-clusterdb"><application>clusterdb</application></link>,
+        <link linkend="app-reindexdb"><application>reindexdb</application></link>,
+        and <link linkend="app-vacuumdb"><application>vacuumdb</application></link>
         (Josh Kupershmidt)
        </para>
 
        <para>
         This is similar to the way <link
-        linkend="APP-PGDUMP"><application>pg_dump</></link>'s
-        <option>--table</> option works.
+        linkend="app-pgdump"><application>pg_dump</application></link>'s
+        <option>--table</option> option works.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--dbname</> option to <link
-        linkend="APP-PG-DUMPALL"><application>pg_dumpall</></link>, <link
-        linkend="app-pgbasebackup"><application>pg_basebackup</></link>, and
+        Add <option>--dbname</option> option to <link
+        linkend="app-pg-dumpall"><application>pg_dumpall</application></link>, <link
+        linkend="app-pgbasebackup"><application>pg_basebackup</application></link>, and
         <link
-        linkend="app-pgreceivewal"><application>pg_receivexlog</></link>
+        linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
         to allow specifying a connection string (Amit Kapila)
        </para>
       </listitem>
@@ -11699,7 +12612,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add libpq function <link
-        linkend="libpq-pqconninfo"><function>PQconninfo()</></link>
+        linkend="libpq-pqconninfo"><function>PQconninfo()</function></link>
         to return connection information (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi, Magnus Hagander)
        </para>
@@ -11708,27 +12621,27 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="APP-PSQL"><application>psql</></link></title>
+     <title><link linkend="app-psql"><application>psql</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Adjust function cost settings so <application>psql</> tab
+        Adjust function cost settings so <application>psql</application> tab
         completion and pattern searching are more efficient (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>psql</>'s tab completion coverage (Jeff Janes,
+        Improve <application>psql</application>'s tab completion coverage (Jeff Janes,
         Dean Rasheed, Peter Eisentraut, Magnus Hagander)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow the <application>psql</> <option>--single-transaction</>
+        Allow the <application>psql</application> <option>--single-transaction</option>
         mode to work when reading from standard input (Fabien Coelho,
         Robert Haas)
        </para>
@@ -11740,61 +12653,61 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Remove <application>psql</> warning when connecting to an older
+        Remove <application>psql</application> warning when connecting to an older
         server (Peter Eisentraut)
        </para>
 
        <para>
         A warning is still issued when connecting to a server of a newer major
-        version than <application>psql</>'s.
+        version than <application>psql</application>'s.
        </para>
       </listitem>
 
      </itemizedlist>
 
     <sect5>
-     <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+     <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <application>psql</> command <command>\watch</> to repeatedly
+        Add <application>psql</application> command <command>\watch</command> to repeatedly
         execute a SQL command (Will Leinweber)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>psql</> command <command>\gset</> to store query
-        results in <application>psql</> variables (Pavel Stehule)
+        Add <application>psql</application> command <command>\gset</command> to store query
+        results in <application>psql</application> variables (Pavel Stehule)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <acronym>SSL</> information to <application>psql</>'s
-        <command>\conninfo</> command (Alastair Turner)
+        Add <acronym>SSL</acronym> information to <application>psql</application>'s
+        <command>\conninfo</command> command (Alastair Turner)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <quote>Security</> column to <application>psql</>'s
-        <command>\df+</> output (Jon Erdman)
+        Add <quote>Security</quote> column to <application>psql</application>'s
+        <command>\df+</command> output (Jon Erdman)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>psql</> command <command>\l</> to accept a database
+        Allow <application>psql</application> command <command>\l</command> to accept a database
         name pattern (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>, do not allow <command>\connect</> to
+        In <application>psql</application>, do not allow <command>\connect</command> to
         use defaults if there is no active connection (Bruce Momjian)
        </para>
 
@@ -11806,7 +12719,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Properly reset state after failure of a SQL command executed with
-        <application>psql</>'s <literal>\g</> <replaceable>file</>
+        <application>psql</application>'s <literal>\g</literal> <replaceable>file</replaceable>
         (Tom Lane)
        </para>
 
@@ -11827,8 +12740,8 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <literal>latex-longtable</> output format to
-        <application>psql</> (Bruce Momjian)
+        Add a <literal>latex-longtable</literal> output format to
+        <application>psql</application> (Bruce Momjian)
        </para>
 
        <para>
@@ -11838,21 +12751,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <literal>border=3</> output mode to the <application>psql</>
-        <literal>latex</> format (Bruce Momjian)
+        Add a <literal>border=3</literal> output mode to the <application>psql</application>
+        <literal>latex</literal> format (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>'s tuples-only and expanded output modes, no
-        longer emit <quote>(No rows)</> for zero rows (Peter Eisentraut)
+        In <application>psql</application>'s tuples-only and expanded output modes, no
+        longer emit <quote>(No rows)</quote> for zero rows (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        In <application>psql</>'s unaligned, expanded output mode, no longer
+        In <application>psql</application>'s unaligned, expanded output mode, no longer
         print an empty line for zero rows (Peter Eisentraut)
        </para>
       </listitem>
@@ -11864,34 +12777,34 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-PGDUMP"><application>pg_dump</></link></title>
+     <title><link linkend="app-pgdump"><application>pg_dump</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <application>pg_dump</> <option>--jobs</> option to dump tables in
+        Add <application>pg_dump</application> <option>--jobs</option> option to dump tables in
         parallel (Joachim Wieland)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_dump</> output functions in a more predictable
+        Make <application>pg_dump</application> output functions in a more predictable
         order (Joel Jacobson)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix tar files emitted by <application>pg_dump</>
-        to be <acronym>POSIX</> conformant (Brian Weaver, Tom Lane)
+        Fix tar files emitted by <application>pg_dump</application>
+        to be <acronym>POSIX</acronym> conformant (Brian Weaver, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <option>--dbname</> option to <application>pg_dump</>, for
+        Add <option>--dbname</option> option to <application>pg_dump</application>, for
         consistency with other client commands (Heikki Linnakangas)
        </para>
 
@@ -11905,7 +12818,7 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="APP-INITDB"><application>initdb</></link></title>
+     <title><link linkend="app-initdb"><application>initdb</application></link></title>
 
      <itemizedlist>
 
@@ -11916,19 +12829,19 @@ ALTER EXTENSION hstore UPDATE;
 
        <para>
         This insures data integrity in event of a system crash shortly after
-        initdb.  This can be disabled by using <option>--nosync</>.
+        initdb.  This can be disabled by using <option>--nosync</option>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add initdb <option>--sync-only</> option to sync the data directory to durable
+        Add initdb <option>--sync-only</option> option to sync the data directory to durable
         storage (Bruce Momjian)
        </para>
 
        <para>
         This is used by <link
-        linkend="pgupgrade"><application>pg_upgrade</></link>.
+        linkend="pgupgrade"><application>pg_upgrade</application></link>.
        </para>
       </listitem>
 
@@ -11960,14 +12873,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Create a centralized timeout <acronym>API</> (Zolt&aacute;n
+        Create a centralized timeout <acronym>API</acronym> (Zolt&aacute;n
         B&ouml;sz&ouml;rm&eacute;nyi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Create libpgcommon and move <function>pg_malloc()</> and other
+        Create libpgcommon and move <function>pg_malloc()</function> and other
         functions there (&Aacute;lvaro Herrera, Andres Freund)
        </para>
 
@@ -11984,15 +12897,15 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Use <literal>SA_RESTART</> for all signals,
-        including <literal>SIGALRM</> (Tom Lane)
+        Use <literal>SA_RESTART</literal> for all signals,
+        including <literal>SIGALRM</literal> (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Ensure that the correct text domain is used when
-        translating <function>errcontext()</> messages
+        translating <function>errcontext()</function> messages
         (Heikki Linnakangas)
        </para>
       </listitem>
@@ -12005,7 +12918,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Provide support for <quote>static assertions</> that will fail at
+        Provide support for <quote>static assertions</quote> that will fail at
         compile time if some compile-time-constant condition is not met
         (Andres Freund, Tom Lane)
        </para>
@@ -12013,14 +12926,14 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Support <function>Assert()</> in client-side code (Andrew Dunstan)
+        Support <function>Assert()</function> in client-side code (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add decoration to inform the C compiler that some <function>ereport()</>
-        and <function>elog()</> calls do not return (Peter Eisentraut,
+        Add decoration to inform the C compiler that some <function>ereport()</function>
+        and <function>elog()</function> calls do not return (Peter Eisentraut,
         Andres Freund, Tom Lane, Heikki Linnakangas)
        </para>
       </listitem>
@@ -12029,7 +12942,7 @@ ALTER EXTENSION hstore UPDATE;
        <para>
         Allow options to be passed to the regression
         test output comparison utility via <link
-        linkend="regress-evaluation"><envar>PG_REGRESS_DIFF_OPTS</></link>
+        linkend="regress-evaluation"><envar>PG_REGRESS_DIFF_OPTS</envar></link>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12037,43 +12950,43 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add isolation tests for <link
-        linkend="SQL-CREATEINDEX"><command>CREATE INDEX
-        CONCURRENTLY</></link> (Abhijit Menon-Sen)
+        linkend="sql-createindex"><command>CREATE INDEX
+        CONCURRENTLY</command></link> (Abhijit Menon-Sen)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove typedefs for <type>int2</>/<type>int4</> as they are better
-        represented as <type>int16</>/<type>int32</> (Peter Eisentraut)
+        Remove typedefs for <type>int2</type>/<type>int4</type> as they are better
+        represented as <type>int16</type>/<type>int32</type> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix <link linkend="install">install-strip</link> on Mac <productname>OS
-        X</> (Peter Eisentraut)
+        X</productname> (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Remove <link linkend="configure">configure</link> flag
-        <option>--disable-shared</>, as it is no longer supported
+        <option>--disable-shared</option>, as it is no longer supported
         (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Rewrite pgindent in <application>Perl</> (Andrew Dunstan)
+        Rewrite pgindent in <application>Perl</application> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Provide Emacs macro to set Perl formatting to
-        match <productname>PostgreSQL</>'s perltidy settings (Peter Eisentraut)
+        match <productname>PostgreSQL</productname>'s perltidy settings (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -12086,25 +12999,25 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Change the way <literal>UESCAPE</> is lexed, to significantly reduce
+        Change the way <literal>UESCAPE</literal> is lexed, to significantly reduce
         the size of the lexer tables (Heikki Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Centralize <application>flex</> and <application>bison</>
-        <application>make</> rules (Peter Eisentraut)
+        Centralize <application>flex</application> and <application>bison</application>
+        <application>make</application> rules (Peter Eisentraut)
        </para>
 
        <para>
-        This is useful for <application>pgxs</> authors.
+        This is useful for <application>pgxs</application> authors.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change many internal backend functions to return object <type>OID</>s
+        Change many internal backend functions to return object <type>OID</type>s
         rather than void (Dimitri Fontaine)
        </para>
 
@@ -12128,7 +13041,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add function <link
-        linkend="functions-info-catalog-table"><function>pg_identify_object()</></link>
+        linkend="functions-info-catalog-table"><function>pg_identify_object()</function></link>
         to produce a machine-readable description of a database object
         (&Aacute;lvaro Herrera)
        </para>
@@ -12136,7 +13049,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add post-<command>ALTER</>-object server hooks (KaiGai Kohei)
+        Add post-<command>ALTER</command>-object server hooks (KaiGai Kohei)
        </para>
       </listitem>
 
@@ -12150,28 +13063,28 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Provide a tool to help detect timezone abbreviation changes when
-        updating the <filename>src/timezone/data</> files
+        updating the <filename>src/timezone/data</filename> files
         (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pkg-config</> support for <application>libpq</>
-        and <application>ecpg</> libraries (Peter Eisentraut)
+        Add <application>pkg-config</application> support for <application>libpq</application>
+        and <application>ecpg</application> libraries (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <filename>src/tools/backend</>, now that the content is on
-        the <productname>PostgreSQL</> wiki (Bruce Momjian)
+        Remove <filename>src/tools/backend</filename>, now that the content is on
+        the <productname>PostgreSQL</productname> wiki (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Split out <link linkend="wal"><acronym>WAL</></link> reading as
+        Split out <link linkend="wal"><acronym>WAL</acronym></link> reading as
         an independent facility (Heikki Linnakangas, Andres Freund)
        </para>
       </listitem>
@@ -12179,13 +13092,13 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Use a 64-bit integer to represent <link
-        linkend="wal"><acronym>WAL</></link> positions
-        (<structname>XLogRecPtr</>) instead of two 32-bit integers
+        linkend="wal"><acronym>WAL</acronym></link> positions
+        (<structname>XLogRecPtr</structname>) instead of two 32-bit integers
         (Heikki Linnakangas)
        </para>
 
        <para>
-        Generally, tools that need to read the <acronym>WAL</> format
+        Generally, tools that need to read the <acronym>WAL</acronym> format
         will need to be adjusted.
        </para>
       </listitem>
@@ -12200,7 +13113,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Allow <link linkend="plpython">PL/Python</link> on <productname>OS
-        X</> to build against custom versions of <application>Python</>
+        X</productname> to build against custom versions of <application>Python</application>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12216,9 +13129,9 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add a <link linkend="postgres-fdw"><productname>Postgres</> foreign
+        Add a <link linkend="postgres-fdw"><productname>Postgres</productname> foreign
         data wrapper</link> contrib module to allow access to
-        other <productname>Postgres</> servers (Shigeru Hanada)
+        other <productname>Postgres</productname> servers (Shigeru Hanada)
        </para>
 
        <para>
@@ -12228,7 +13141,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Add <link linkend="pgwaldump"><application>pg_xlogdump</></link>
+        Add <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
         contrib program (Andres Freund)
        </para>
       </listitem>
@@ -12236,46 +13149,46 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add support for indexing of regular-expression searches in
-        <link linkend="pgtrgm"><productname>pg_trgm</></link>
+        <link linkend="pgtrgm"><productname>pg_trgm</productname></link>
         (Alexander Korotkov)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <link linkend="pgtrgm"><productname>pg_trgm</></link>'s
+        Improve <link linkend="pgtrgm"><productname>pg_trgm</productname></link>'s
         handling of multibyte characters (Tom Lane)
        </para>
 
        <para>
         On a platform that does not have the wcstombs() or towlower() library
         functions, this could result in an incompatible change in the contents
-        of <productname>pg_trgm</> indexes for non-ASCII data.  In such cases,
-        <command>REINDEX</> those indexes to ensure correct search results.
+        of <productname>pg_trgm</productname> indexes for non-ASCII data.  In such cases,
+        <command>REINDEX</command> those indexes to ensure correct search results.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add a <link linkend="pgstattuple">pgstattuple</link> function to report
-        the size of the pending-insertions list of a <acronym>GIN</> index
+        the size of the pending-insertions list of a <acronym>GIN</acronym> index
         (Fujii Masao)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <link linkend="oid2name"><application>oid2name</></link>,
-        <link linkend="pgbench"><application>pgbench</></link>, and
-        <link linkend="vacuumlo"><application>vacuumlo</></link> set
-        <varname>fallback_application_name</> (Amit Kapila)
+        Make <link linkend="oid2name"><application>oid2name</application></link>,
+        <link linkend="pgbench"><application>pgbench</application></link>, and
+        <link linkend="vacuumlo"><application>vacuumlo</application></link> set
+        <varname>fallback_application_name</varname> (Amit Kapila)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve output of <link
-        linkend="pgtesttiming"><application>pg_test_timing</></link>
+        linkend="pgtesttiming"><application>pg_test_timing</application></link>
         (Bruce Momjian)
        </para>
       </listitem>
@@ -12283,7 +13196,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve output of <link
-        linkend="pgtestfsync"><application>pg_test_fsync</></link>
+        linkend="pgtestfsync"><application>pg_test_fsync</application></link>
         (Peter Geoghegan)
        </para>
       </listitem>
@@ -12295,9 +13208,9 @@ ALTER EXTENSION hstore UPDATE;
        </para>
 
        <para>
-        When using this FDW to define the target of a <application>dblink</>
+        When using this FDW to define the target of a <application>dblink</application>
         connection, instead of using a hard-wired list of connection options,
-        the underlying <application>libpq</> library is consulted to see what
+        the underlying <application>libpq</application> library is consulted to see what
         connection options it supports.
        </para>
       </listitem>
@@ -12305,26 +13218,26 @@ ALTER EXTENSION hstore UPDATE;
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="pgupgrade"><application>pg_upgrade</></link></title>
+     <title><link linkend="pgupgrade"><application>pg_upgrade</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <application>pg_upgrade</> to do dumps and restores in
+        Allow <application>pg_upgrade</application> to do dumps and restores in
         parallel (Bruce Momjian, Andrew Dunstan)
        </para>
 
        <para>
         This allows parallel schema dump/restore of databases, as well as
         parallel copy/link of data files per tablespace.  Use the
-        <option>--jobs</> option to specify the level of parallelism.
+        <option>--jobs</option> option to specify the level of parallelism.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> create Unix-domain sockets in
+        Make <application>pg_upgrade</application> create Unix-domain sockets in
         the current directory (Bruce Momjian, Tom Lane)
        </para>
 
@@ -12336,7 +13249,7 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Make <application>pg_upgrade</> <option>--check</> mode properly
+        Make <application>pg_upgrade</application> <option>--check</option> mode properly
         detect the location of non-default socket directories (Bruce
         Momjian, Tom Lane)
        </para>
@@ -12344,21 +13257,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Improve performance of <application>pg_upgrade</> for databases
+        Improve performance of <application>pg_upgrade</application> for databases
         with many tables (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>pg_upgrade</>'s logs by showing
+        Improve <application>pg_upgrade</application>'s logs by showing
         executed commands (&Aacute;lvaro Herrera)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <application>pg_upgrade</>'s status display during
+        Improve <application>pg_upgrade</application>'s status display during
         copy/link (Bruce Momjian)
        </para>
       </listitem>
@@ -12368,33 +13281,33 @@ ALTER EXTENSION hstore UPDATE;
     </sect4>
 
     <sect4>
-     <title><link linkend="pgbench"><application>pgbench</></link></title>
+     <title><link linkend="pgbench"><application>pgbench</application></link></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <option>--foreign-keys</> option to <application>pgbench</>
+        Add <option>--foreign-keys</option> option to <application>pgbench</application>
         (Jeff Janes)
        </para>
 
        <para>
         This adds foreign key constraints to the standard tables created by
-        <application>pgbench</>, for use in foreign key performance testing.
+        <application>pgbench</application>, for use in foreign key performance testing.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgbench</> to aggregate performance statistics
-        and produce output every <option>--aggregate-interval</>
+        Allow <application>pgbench</application> to aggregate performance statistics
+        and produce output every <option>--aggregate-interval</option>
         seconds (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> <option>--sampling-rate</> option
+        Add <application>pgbench</application> <option>--sampling-rate</option> option
         to control the percentage of transactions logged (Tomas Vondra)
        </para>
       </listitem>
@@ -12402,29 +13315,29 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Reduce and improve the status message output of
-        <application>pgbench</>'s initialization mode (Robert Haas,
+        <application>pgbench</application>'s initialization mode (Robert Haas,
         Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> <option>-q</> mode to print one output
+        Add <application>pgbench</application> <option>-q</option> mode to print one output
         line every five seconds (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Output <application>pgbench</> elapsed and estimated remaining
+        Output <application>pgbench</application> elapsed and estimated remaining
         time during initialization (Tomas Vondra)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgbench</> to use much larger scale factors,
-        by changing relevant columns from <type>integer</> to <type>bigint</>
+        Allow <application>pgbench</application> to use much larger scale factors,
+        by changing relevant columns from <type>integer</type> to <type>bigint</type>
         when the requested scale factor exceeds 20000
         (Greg Smith)
        </para>
@@ -12443,21 +13356,21 @@ ALTER EXTENSION hstore UPDATE;
 
       <listitem>
        <para>
-        Allow <productname>EPUB</>-format documentation to be created
+        Allow <productname>EPUB</productname>-format documentation to be created
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Update <productname>FreeBSD</> kernel configuration documentation
+        Update <productname>FreeBSD</productname> kernel configuration documentation
         (Brad Davis)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <link linkend="tutorial-window"><literal>WINDOW</>
+        Improve <link linkend="tutorial-window"><literal>WINDOW</literal>
         function</link> documentation (Bruce Momjian, Florian Pflug)
        </para>
       </listitem>
@@ -12465,7 +13378,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Add <link linkend="docguide-toolsets">instructions</link> for setting
-        up the documentation tool chain on <productname>macOS</>
+        up the documentation tool chain on <productname>macOS</productname>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -12473,7 +13386,7 @@ ALTER EXTENSION hstore UPDATE;
       <listitem>
        <para>
         Improve <link
-        linkend="guc-commit-delay"><varname>commit_delay</></link>
+        linkend="guc-commit-delay"><varname>commit_delay</varname></link>
         documentation (Peter Geoghegan)
        </para>
       </listitem>
diff --git a/doc/src/sgml/release-9.4.sgml b/doc/src/sgml/release-9.4.sgml
index c616c1a514..ed4de33dd0 100644
--- a/doc/src/sgml/release-9.4.sgml
+++ b/doc/src/sgml/release-9.4.sgml
@@ -1,6 +1,1020 @@
 <!-- doc/src/sgml/release-9.4.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-4-17">
+  <title>Release 9.4.17</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-03-01</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.16.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.17</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you run an installation in which not all users are mutually
+    trusting, or if you maintain an application or extension that is
+    intended for use in arbitrary situations, it is strongly recommended
+    that you read the documentation changes described in the first changelog
+    entry below, and take suitable steps to ensure that your installation or
+    code is secure.
+   </para>
+
+   <para>
+    Also, the changes described in the second changelog entry below may
+    cause functions used in index expressions or materialized views to fail
+    during auto-analyze, or when reloading from a dump.  After upgrading,
+    monitor the server logs for such problems, and fix affected functions.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.4.13,
+    see <xref linkend="release-9-4-13"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Document how to configure installations and applications to guard
+      against search-path-dependent trojan-horse attacks from other users
+      (Noah Misch)
+     </para>
+
+     <para>
+      Using a <varname>search_path</varname> setting that includes any
+      schemas writable by a hostile user enables that user to capture
+      control of queries and then run arbitrary SQL code with the
+      permissions of the attacked user.  While it is possible to write
+      queries that are proof against such hijacking, it is notationally
+      tedious, and it's very easy to overlook holes.  Therefore, we now
+      recommend configurations in which no untrusted schemas appear in
+      one's search path.  Relevant documentation appears in
+      <xref linkend="ddl-schemas-patterns"/> (for database administrators and users),
+      <xref linkend="libpq-connect"/> (for application authors),
+      <xref linkend="extend-extensions-style"/>  (for extension authors), and
+      <xref linkend="sql-createfunction"/> (for authors
+      of <literal>SECURITY DEFINER</literal> functions).
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid use of insecure <varname>search_path</varname> settings
+      in <application>pg_dump</application> and other client programs
+      (Noah Misch, Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</application>,
+      <application>pg_upgrade</application>,
+      <application>vacuumdb</application> and
+      other <productname>PostgreSQL</productname>-provided applications were
+      themselves vulnerable to the type of hijacking described in the previous
+      changelog entry; since these applications are commonly run by
+      superusers, they present particularly attractive targets.  To make them
+      secure whether or not the installation as a whole has been secured,
+      modify them to include only the <structname>pg_catalog</structname>
+      schema in their <varname>search_path</varname> settings.
+      Autovacuum worker processes now do the same, as well.
+     </para>
+
+     <para>
+      In cases where user-provided functions are indirectly executed by
+      these programs &mdash; for example, user-provided functions in index
+      expressions &mdash; the tighter <varname>search_path</varname> may
+      result in errors, which will need to be corrected by adjusting those
+      user-provided functions to not assume anything about what search path
+      they are invoked under.  That has always been good practice, but now
+      it will be necessary for correct behavior.
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix misbehavior of concurrent-update rechecks with CTE references
+      appearing in subplans (Tom Lane)
+     </para>
+
+     <para>
+      If a CTE (<literal>WITH</literal> clause reference) is used in an
+      InitPlan or SubPlan, and the query requires a recheck due to trying
+      to update or lock a concurrently-updated row, incorrect results could
+      be obtained.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planner failures with overlapping mergejoin clauses in an outer
+      join (Tom Lane)
+     </para>
+
+     <para>
+      These mistakes led to <quote>left and right pathkeys do not match in
+      mergejoin</quote> or <quote>outer pathkeys do not match
+      mergeclauses</quote> planner errors in corner cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair <application>pg_upgrade</application>'s failure to
+      preserve <structfield>relfrozenxid</structfield> for materialized
+      views (Tom Lane, Andres Freund)
+     </para>
+
+     <para>
+      This oversight could lead to data corruption in materialized views
+      after an upgrade, manifesting as <quote>could not access status of
+      transaction</quote> or <quote>found xmin from before
+      relfrozenxid</quote> errors.  The problem would be more likely to
+      occur in seldom-refreshed materialized views, or ones that were
+      maintained only with <command>REFRESH MATERIALIZED VIEW
+      CONCURRENTLY</command>.
+     </para>
+
+     <para>
+      If such corruption is observed, it can be repaired by refreshing the
+      materialized view (without <literal>CONCURRENTLY</literal>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reporting of PL/Python function names in
+      error <literal>CONTEXT</literal> stacks (Tom Lane)
+     </para>
+
+     <para>
+      An error occurring within a nested PL/Python function call (that is,
+      one reached via a SPI query from another PL/Python function) would
+      result in a stack trace showing the inner function's name twice,
+      rather than the expected results.  Also, an error in a nested
+      PL/Python <literal>DO</literal> block could result in a null pointer
+      dereference crash on some platforms.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <filename>contrib/auto_explain</filename>'s
+      <varname>log_min_duration</varname> setting to range up
+      to <literal>INT_MAX</literal>, or about 24 days instead of 35 minutes
+      (Tom Lane)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-16">
+  <title>Release 9.4.16</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-02-08</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.15.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.16</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.13,
+    see <xref linkend="release-9-4-13"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that all temporary files made
+      by <application>pg_upgrade</application> are non-world-readable
+      (Tom Lane, Noah Misch)
+     </para>
+
+     <para>
+      <application>pg_upgrade</application> normally restricts its
+      temporary files to be readable and writable only by the calling user.
+      But the temporary file containing <literal>pg_dumpall -g</literal>
+      output would be group- or world-readable, or even writable, if the
+      user's <literal>umask</literal> setting allows.  In typical usage on
+      multi-user machines, the <literal>umask</literal> and/or the working
+      directory's permissions would be tight enough to prevent problems;
+      but there may be people using <application>pg_upgrade</application>
+      in scenarios where this oversight would permit disclosure of database
+      passwords to unfriendly eyes.
+      (CVE-2018-1053)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix vacuuming of tuples that were updated while key-share locked
+      (Andres Freund, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In some cases <command>VACUUM</command> would fail to remove such
+      tuples even though they are now dead, leading to assorted data
+      corruption scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix inadequate buffer locking in some LSN fetches (Jacob Champion,
+      Asim Praveen, Ashwin Agrawal)
+     </para>
+
+     <para>
+      These errors could result in misbehavior under concurrent load.
+      The potential consequences have not been characterized fully.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary failure in a query on an inheritance tree that
+      occurs concurrently with some child table being removed from the tree
+      by <command>ALTER TABLE NO INHERIT</command> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix spurious deadlock failures when multiple sessions are
+      running <command>CREATE INDEX CONCURRENTLY</command> (Jeff Janes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair failure with correlated sub-<literal>SELECT</literal>
+      inside <literal>VALUES</literal> inside a <literal>LATERAL</literal>
+      subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>could not devise a query plan for the given query</quote>
+      planner failure for some cases involving nested <literal>UNION
+      ALL</literal> inside a lateral subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix logical decoding to correctly clean up disk files for crashed
+      transactions (Atsushi Torikoshi)
+     </para>
+
+     <para>
+      Logical decoding may spill WAL records to disk for transactions
+      generating many WAL records.  Normally these files are cleaned up
+      after the transaction's commit or abort record arrives; but if
+      no such record is ever seen, the removal code misbehaved.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix walsender timeout failure and failure to respond to interrupts
+      when processing a large transaction (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>has_sequence_privilege()</function> to
+      support <literal>WITH GRANT OPTION</literal> tests,
+      as other privilege-testing functions do (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In databases using UTF8 encoding, ignore any XML declaration that
+      asserts a different encoding (Pavel Stehule, Noah Misch)
+     </para>
+
+     <para>
+      We always store XML strings in the database encoding, so allowing
+      libxml to act on a declaration of another encoding gave wrong results.
+      In encodings other than UTF8, we don't promise to support non-ASCII
+      XML data anyway, so retain the previous behavior for bug compatibility.
+      This change affects only <function>xpath()</function> and related
+      functions; other XML code paths already acted this way.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide for forward compatibility with future minor protocol versions
+      (Robert Haas, Badrul Chowdhury)
+     </para>
+
+     <para>
+      Up to now, <productname>PostgreSQL</productname> servers simply
+      rejected requests to use protocol versions newer than 3.0, so that
+      there was no functional difference between the major and minor parts
+      of the protocol version number.  Allow clients to request versions 3.x
+      without failing, sending back a message showing that the server only
+      understands 3.0.  This makes no difference at the moment, but
+      back-patching this change should allow speedier introduction of future
+      minor protocol upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with failure to start a parallel worker process
+      (Amit Kapila, Robert Haas)
+     </para>
+
+     <para>
+      Parallel query previously tended to hang indefinitely if a worker
+      could not be started, as the result of <literal>fork()</literal>
+      failure or other low-probability problems.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent stack-overflow crashes when planning extremely deeply
+      nested set operations
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix null-pointer crashes for some types of LDAP URLs appearing
+      in <filename>pg_hba.conf</filename> (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample <function>INSTR()</function> functions in the PL/pgSQL
+      documentation (Yugo Nagata, Tom Lane)
+     </para>
+
+     <para>
+      These functions are stated to
+      be <trademark class="registered">Oracle</trademark> compatible, but
+      they weren't exactly.  In particular, there was a discrepancy in the
+      interpretation of a negative third parameter: Oracle thinks that a
+      negative value indicates the last place where the target substring can
+      begin, whereas our functions took it as the last place where the
+      target can end.  Also, Oracle throws an error for a zero or negative
+      fourth parameter, whereas our functions returned zero.
+     </para>
+
+     <para>
+      The sample code has been adjusted to match Oracle's behavior more
+      precisely.  Users who have copied this code into their applications
+      may wish to update their copies.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</application> to make ACL (permissions),
+      comment, and security label entries reliably identifiable in archive
+      output formats (Tom Lane)
+     </para>
+
+     <para>
+      The <quote>tag</quote> portion of an ACL archive entry was usually
+      just the name of the associated object.  Make it start with the object
+      type instead, bringing ACLs into line with the convention already used
+      for comment and security label archive entries.  Also, fix the
+      comment and security label entries for the whole database, if present,
+      to make their tags start with <literal>DATABASE</literal> so that they
+      also follow this convention.  This prevents false matches in code that
+      tries to identify large-object-related entries by seeing if the tag
+      starts with <literal>LARGE OBJECT</literal>.  That could have resulted
+      in misclassifying entries as data rather than schema, with undesirable
+      results in a schema-only or data-only dump.
+     </para>
+
+     <para>
+      Note that this change has user-visible results in the output
+      of <command>pg_restore --list</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpg</application>, detect indicator arrays that do
+      not have the correct length and report an error (David Rader)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid triggering a libc assertion
+      in <filename>contrib/hstore</filename>, due to use
+      of <function>memcpy()</function> with equal source and destination
+      pointers (Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide modern examples of how to auto-start Postgres on macOS
+      (Tom Lane)
+     </para>
+
+     <para>
+      The scripts in <filename>contrib/start-scripts/osx</filename> use
+      infrastructure that's been deprecated for over a decade, and which no
+      longer works at all in macOS releases of the last couple of years.
+      Add a new subdirectory <filename>contrib/start-scripts/macos</filename>
+      containing scripts that use the newer <application>launchd</application>
+      infrastructure.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect selection of configuration-specific libraries for
+      OpenSSL on Windows (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support linking to MinGW-built versions of libperl (Noah Misch)
+     </para>
+
+     <para>
+      This allows building PL/Perl with some common Perl distributions for
+      Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix MSVC build to test whether 32-bit libperl
+      needs <literal>-D_USE_32BIT_TIME_T</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Available Perl distributions are inconsistent about what they expect,
+      and lack any reliable means of reporting it, so resort to a build-time
+      test on what the library being used actually does.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, install the crash dump handler earlier in postmaster
+      startup (Takayuki Tsunakawa)
+     </para>
+
+     <para>
+      This may allow collection of a core dump for some early-startup
+      failures that did not produce a dump before.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, avoid encoding-conversion-related crashes when emitting
+      messages very early in postmaster startup (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use our existing Motorola 68K spinlock code on OpenBSD as
+      well as NetBSD (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add support for spinlocks on Motorola 88K (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2018c for DST law changes in Brazil, Sao Tome and Principe,
+      plus historical corrections for Bolivia, Japan, and South Sudan.
+      The <literal>US/Pacific-New</literal> zone has been removed (it was
+      only an alias for <literal>America/Los_Angeles</literal> anyway).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-15">
+  <title>Release 9.4.15</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.4.14.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.15</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.13,
+    see <xref linkend="release-9-4-13"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Fix crash due to rowtype mismatch
+      in <function>json{b}_populate_recordset()</function>
+      (Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      These functions used the result rowtype specified in the <literal>FROM
+      ... AS</literal> clause without checking that it matched the actual
+      rowtype of the supplied tuple value.  If it didn't, that would usually
+      result in a crash, though disclosure of server memory contents seems
+      possible as well.
+      (CVE-2017-15098)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-4-14">
+  <title>Release 9.4.14</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-31</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 9.4.13.
+   For information about new features in the 9.4 major release, see
+   <xref linkend="release-9-4"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.4.14</title>
+
+   <para>
+    A dump/restore is not required for those running 9.4.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.4.13,
+    see <xref linkend="release-9-4-13"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Andres Freund <andres@anarazel.de>
+Branch: REL9_4_STABLE [b51c8efc6] 2017-08-24 15:21:32 -0700
+-->
+     <para>
+      Fix failure of walsender processes to respond to shutdown signals
+      (Marco Nenciarini)
+     </para>
+
+     <para>
+      A missed flag update resulted in walsenders continuing to run as long
+      as they had a standby server connected, preventing primary-server
+      shutdown unless immediate shutdown mode is used.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Show foreign tables
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
+      view (Peter Eisentraut)
+     </para>
+
+     <para>
+      All other relevant <structname>information_schema</structname> views include
+      foreign tables, but this one ignored them.
+     </para>
+
+     <para>
+      Since this view definition is installed by <application>initdb</application>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can, as a superuser, do this
+      in <application>psql</application>:
+<programlisting>
+SET search_path TO information_schema;
+CREATE OR REPLACE VIEW table_privileges AS
+    SELECT CAST(u_grantor.rolname AS sql_identifier) AS grantor,
+           CAST(grantee.rolname AS sql_identifier) AS grantee,
+           CAST(current_database() AS sql_identifier) AS table_catalog,
+           CAST(nc.nspname AS sql_identifier) AS table_schema,
+           CAST(c.relname AS sql_identifier) AS table_name,
+           CAST(c.prtype AS character_data) AS privilege_type,
+           CAST(
+             CASE WHEN
+                  -- object owner always has grant options
+                  pg_has_role(grantee.oid, c.relowner, 'USAGE')
+                  OR c.grantable
+                  THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_grantable,
+           CAST(CASE WHEN c.prtype = 'SELECT' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS with_hierarchy
+
+    FROM (
+            SELECT oid, relname, relnamespace, relkind, relowner, (aclexplode(coalesce(relacl, acldefault('r', relowner)))).* FROM pg_class
+         ) AS c (oid, relname, relnamespace, relkind, relowner, grantor, grantee, prtype, grantable),
+         pg_namespace nc,
+         pg_authid u_grantor,
+         (
+           SELECT oid, rolname FROM pg_authid
+           UNION ALL
+           SELECT 0::oid, 'PUBLIC'
+         ) AS grantee (oid, rolname)
+
+    WHERE c.relnamespace = nc.oid
+          AND c.relkind IN ('r', 'v', 'f')
+          AND c.grantee = grantee.oid
+          AND c.grantor = u_grantor.oid
+          AND c.prtype IN ('INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER')
+          AND (pg_has_role(u_grantor.oid, 'USAGE')
+               OR pg_has_role(grantee.oid, 'USAGE')
+               OR grantee.rolname = 'PUBLIC');
+</programlisting>
+      This must be repeated in each database to be fixed,
+      including <literal>template0</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Clean up handling of a fatal exit (e.g., due to receipt
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
+     </para>
+
+     <para>
+      This situation could result in an assertion failure.  In production
+      builds, the exit would still occur, but it would log an unexpected
+      message about <quote>cannot drop active portal</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove assertion that could trigger during a fatal exit (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly identify columns that are of a range type or domain type over
+      a composite type or domain type being searched for (Tom Lane)
+     </para>
+
+     <para>
+      Certain <command>ALTER</command> commands that change the definition of a
+      composite type or domain type are supposed to fail if there are any
+      stored values of that type in the database, because they lack the
+      infrastructure needed to update or check such values.  Previously,
+      these checks could miss relevant values that are wrapped inside range
+      types or sub-domains, possibly allowing the database to become
+      inconsistent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <application>pg_restore</application> when using parallel mode and
+      using a list file to select a subset of items to restore
+      (Fabr&iacute;zio de Royes Mello)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
+      clauses without attached C variables (Michael Meskes)
+     </para>
+
+     <para>
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
+      rather than using it to define values to be returned to the client.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve selection of compiler flags for PL/Perl on Windows (Tom Lane)
+     </para>
+
+     <para>
+      This fix avoids possible crashes of PL/Perl due to inconsistent
+      assumptions about the width of <type>time_t</type> values.
+      A side-effect that may be visible to extension developers is
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-4-13">
   <title>Release 9.4.13</title>
 
@@ -12,7 +1026,7 @@
   <para>
    This release contains a variety of fixes from 9.4.12.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -29,7 +1043,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.12,
-    see <xref linkend="release-9-4-12">.
+    see <xref linkend="release-9-4-12"/>.
    </para>
   </sect2>
 
@@ -41,7 +1055,7 @@
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -49,11 +1063,11 @@
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -68,15 +1082,15 @@
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -107,15 +1121,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -129,7 +1143,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -143,16 +1157,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -160,13 +1174,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -241,7 +1255,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"/> on
       Solaris (Tom Lane)
      </para>
     </listitem>
@@ -273,21 +1287,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -301,7 +1315,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -318,7 +1332,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       Logical decoding crashed on tuples that are wider than 64KB (after
       compression, but with all data in-line).  The case arises only
-      when <literal>REPLICA IDENTITY FULL</> is enabled for a table
+      when <literal>REPLICA IDENTITY FULL</literal> is enabled for a table
       containing such tuples.
      </para>
     </listitem>
@@ -366,7 +1380,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -374,7 +1388,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -382,56 +1396,56 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -442,20 +1456,20 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -468,9 +1482,9 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -481,8 +1495,8 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -493,15 +1507,15 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -514,14 +1528,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -532,14 +1546,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -547,13 +1561,13 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -561,7 +1575,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -573,8 +1587,8 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"/> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -586,9 +1600,9 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -599,7 +1613,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -611,14 +1625,14 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -638,34 +1652,34 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -685,7 +1699,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
   <para>
    This release contains a variety of fixes from 9.4.11.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -702,12 +1716,12 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.11,
-    see <xref linkend="release-9-4-11">.
+    see <xref linkend="release-9-4-11"/>.
    </para>
   </sect2>
 
@@ -719,18 +1733,18 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -741,7 +1755,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
       By itself, this patch will only fix the behavior in newly initdb'd
       databases.  If you wish to apply this change in an existing database,
       follow the corrected procedure shown in the changelog entry for
-      CVE-2017-7547, in <xref linkend="release-9-4-13">.
+      CVE-2017-7547, in <xref linkend="release-9-4-13"/>.
      </para>
     </listitem>
 
@@ -754,7 +1768,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -768,17 +1782,17 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -809,7 +1823,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -822,7 +1836,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -830,21 +1844,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -865,19 +1879,19 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -885,27 +1899,27 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -919,12 +1933,12 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -933,21 +1947,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -959,7 +1973,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -973,13 +1987,13 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -997,21 +2011,21 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -1026,20 +2040,20 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -1051,26 +2065,26 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -1083,7 +2097,7 @@ Branch: REL9_4_STABLE [23a2b818f] 2017-08-05 14:56:40 -0700
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -1133,7 +2147,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -1147,9 +2161,9 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -1162,16 +2176,16 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
-      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones"/>).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
      </para>
@@ -1193,7 +2207,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
   <para>
    This release contains a variety of fixes from 9.4.10.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -1211,7 +2225,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.10,
-    see <xref linkend="release-9-4-10">.
+    see <xref linkend="release-9-4-10"/>.
    </para>
   </sect2>
 
@@ -1223,15 +2237,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1248,19 +2262,19 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
-      Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      Previously, this was skipped when <xref linkend="guc-wal-level"/>
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1326,13 +2340,13 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
      <para>
       Previously, non-default settings
-      of <xref linkend="guc-default-tablespace"> could result in broken
+      of <xref linkend="guc-default-tablespace"/> could result in broken
       indexes.
      </para>
     </listitem>
@@ -1341,7 +2355,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -1357,15 +2371,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1378,7 +2392,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -1391,7 +2405,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1421,13 +2435,13 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1435,12 +2449,12 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1455,15 +2469,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1474,33 +2488,33 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1512,8 +2526,8 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1525,15 +2539,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1546,28 +2560,28 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -1580,15 +2594,15 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1607,21 +2621,21 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1633,23 +2647,23 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1660,22 +2674,22 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -1701,7 +2715,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1726,7 +2740,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
   <para>
    This release contains a variety of fixes from 9.4.9.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -1744,7 +2758,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.6,
-    see <xref linkend="release-9-4-6">.
+    see <xref linkend="release-9-4-6"/>.
    </para>
   </sect2>
 
@@ -1764,7 +2778,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -1772,7 +2786,7 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -1783,20 +2797,20 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
      </para>
 
      <para>
-      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      The typical symptom was <quote>unexpected GIN leaf action</quote> errors
       during WAL replay.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -1830,79 +2844,79 @@ Branch: REL9_2_STABLE [fb50c38e9] 2017-04-17 13:52:42 -0400
 
     <listitem>
      <para>
-      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
-      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</command> on a table
+      with a <literal>PRIMARY KEY</literal> or <literal>REPLICA IDENTITY</literal> index
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
-      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+      Fix <command>EXPLAIN</command> to emit valid XML when
+      <xref linkend="guc-track-io-timing"/> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -1947,7 +2961,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -1966,7 +2980,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       This failure to reset all of the fields of the slot could
-      prevent <command>VACUUM</> from removing dead tuples.
+      prevent <command>VACUUM</command> from removing dead tuples.
      </para>
     </listitem>
 
@@ -1977,7 +2991,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -1991,7 +3005,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       Previously, the same value would be chosen every time, because it was
-      derived from <function>random()</> but <function>srandom()</> had not
+      derived from <function>random()</function> but <function>srandom()</function> had not
       yet been called.  While relatively harmless, this was not the intended
       behavior.
      </para>
@@ -2004,8 +3018,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
-      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</literal> rather
+      than <literal>ERROR_ALREADY_EXISTS</literal> when there is an existing
       segment.  This led to postmaster startup failure due to believing that
       the former was an unrecoverable error.
      </para>
@@ -2014,7 +3028,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -2025,30 +3039,30 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</>'s calculation of average latency
+      Fix <application>pgbench</application>'s calculation of average latency
       (Fabien Coelho)
      </para>
 
      <para>
-      The calculation was incorrect when there were <literal>\sleep</>
+      The calculation was incorrect when there were <literal>\sleep</literal>
       commands in the script, or when the test duration was specified in
       number of transactions rather than total time.
      </para>
@@ -2056,12 +3070,12 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -2069,8 +3083,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -2081,7 +3095,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -2089,15 +3103,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_buffercache</> to work
-      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+      Fix <filename>contrib/pg_buffercache</filename> to work
+      when <varname>shared_buffers</varname> exceeds 256GB (KaiGai Kohei)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -2109,17 +3123,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      When <productname>PostgreSQL</> has been configured
-      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      When <productname>PostgreSQL</productname> has been configured
+      with <option>--enable-tap-tests</option>, <quote>make install</quote> will now
       install the Perl support files for TAP testing where PGXS can find
       them.  This allows non-core extensions to
-      use <literal>$(prove_check)</> without extra tests.
+      use <literal>$(prove_check)</literal> without extra tests.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, include <application>pg_recvlogical</> in a
+      In MSVC builds, include <application>pg_recvlogical</application> in a
       client-only installation (MauMau)
      </para>
     </listitem>
@@ -2140,17 +3154,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -2163,15 +3177,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -2192,7 +3206,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
   <para>
    This release contains a variety of fixes from 9.4.8.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -2204,7 +3218,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.4.6,
-    see <xref linkend="release-9-4-6">.
+    see <xref linkend="release-9-4-6"/>.
    </para>
   </sect2>
 
@@ -2216,17 +3230,17 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -2240,7 +3254,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -2249,22 +3263,22 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -2274,40 +3288,40 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -2318,19 +3332,19 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -2340,8 +3354,8 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -2355,7 +3369,7 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
     <listitem>
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -2381,15 +3395,15 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -2432,12 +3446,12 @@ Branch: REL9_4_STABLE [10ad15f48] 2016-09-01 11:45:16 -0400
 
     <listitem>
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -2453,12 +3467,12 @@ Branch: REL9_2_STABLE [294509ea9] 2016-05-25 19:39:49 -0400
 Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 -->
      <para>
-      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</>
+      Avoid canceling hot-standby queries during <command>VACUUM FREEZE</command>
       (Simon Riggs, &Aacute;lvaro Herrera)
      </para>
 
      <para>
-      <command>VACUUM FREEZE</> on an otherwise-idle master server could
+      <command>VACUUM FREEZE</command> on an otherwise-idle master server could
       result in unnecessary cancellations of queries on its standby
       servers.
      </para>
@@ -2473,15 +3487,15 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -2493,7 +3507,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -2526,7 +3540,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      </para>
 
      <para>
-      This mistake prevented <command>VACUUM</> from completing in some
+      This mistake prevented <command>VACUUM</command> from completing in some
       cases involving corrupt b-tree indexes.
      </para>
     </listitem>
@@ -2540,8 +3554,8 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -2554,53 +3568,53 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -2608,8 +3622,8 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -2621,7 +3635,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -2633,7 +3647,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -2654,13 +3668,13 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -2680,7 +3694,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -2692,7 +3706,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -2714,7 +3728,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
   <para>
    This release contains a variety of fixes from 9.4.7.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -2726,7 +3740,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.4.6,
-    see <xref linkend="release-9-4-6">.
+    see <xref linkend="release-9-4-6"/>.
    </para>
   </sect2>
 
@@ -2747,7 +3761,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -2756,7 +3770,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -2770,10 +3784,10 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -2794,14 +3808,14 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       The memory leak would typically not amount to much in simple queries,
       but it could be very substantial during a large GIN index build with
-      high <varname>maintenance_work_mem</>.
+      high <varname>maintenance_work_mem</varname>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -2813,29 +3827,29 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      Disallow newlines in <command>ALTER SYSTEM</command> parameter values
       (Tom Lane)
      </para>
 
      <para>
       The configuration-file parser doesn't support embedded newlines in
       string literals, so we mustn't allow them in values to be inserted
-      by <command>ALTER SYSTEM</>.
+      by <command>ALTER SYSTEM</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</command> to
       work properly if an index on OID is selected (David Rowley)
      </para>
     </listitem>
@@ -2861,19 +3875,19 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -2881,20 +3895,20 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -2905,22 +3919,22 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -2933,19 +3947,19 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -2953,9 +3967,9 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -2977,7 +3991,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
   <para>
    This release contains a variety of fixes from 9.4.6.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -2989,7 +4003,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.4.6,
-    see <xref linkend="release-9-4-6">.
+    see <xref linkend="release-9-4-6"/>.
    </para>
   </sect2>
 
@@ -3001,29 +4015,29 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bug in <function>json_to_record()</> when a field of its input
+      Fix bug in <function>json_to_record()</function> when a field of its input
       object contains a sub-object with a field name matching one of the
       requested output column names (Tom Lane)
      </para>
@@ -3032,20 +4046,20 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix misformatting of negative time zone offsets
-      by <function>to_char()</>'s <literal>OF</> format code
+      by <function>to_char()</function>'s <literal>OF</literal> format code
       (Thomas Munro, Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ignore <xref linkend="recovery-min-apply-delay"> parameter until
+      Ignore <xref linkend="recovery-min-apply-delay"/> parameter until
       recovery has reached a consistent state (Michael Paquier)
      </para>
 
      <para>
       Previously, standby servers would delay application of WAL records in
-      response to <varname>recovery_min_apply_delay</> even while replaying
+      response to <varname>recovery_min_apply_delay</varname> even while replaying
       the initial portion of WAL needed to make their database state valid.
       Since the standby is useless until it's reached a consistent database
       state, this was deemed unhelpful.
@@ -3054,7 +4068,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
@@ -3066,44 +4080,44 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
      <para>
       Trouble cases included tuples larger than one page when replica
-      identity is <literal>FULL</>, <command>UPDATE</>s that change a
+      identity is <literal>FULL</literal>, <command>UPDATE</command>s that change a
       primary key within a transaction large enough to be spooled to disk,
       incorrect reports of <quote>subxact logged without previous toplevel
-      record</>, and incorrect reporting of a transaction's commit time.
+      record</quote>, and incorrect reporting of a transaction's commit time.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix planner error with nested security barrier views when the outer
-      view has a <literal>WHERE</> clause containing a correlated subquery
+      view has a <literal>WHERE</literal> clause containing a correlated subquery
       (Dean Rasheed)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -3129,27 +4143,27 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -3163,26 +4177,26 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -3210,21 +4224,21 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -3248,7 +4262,7 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
   <para>
    This release contains a variety of fixes from 9.4.5.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -3260,13 +4274,13 @@ Branch: REL9_1_STABLE [de887cc8a] 2016-05-25 19:39:49 -0400
 
    <para>
     However, if you are upgrading an installation that contains any GIN
-    indexes that use the (non-default) <literal>jsonb_path_ops</> operator
+    indexes that use the (non-default) <literal>jsonb_path_ops</literal> operator
     class, see the first changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.4,
-    see <xref linkend="release-9-4-4">.
+    see <xref linkend="release-9-4-4"/>.
    </para>
   </sect2>
 
@@ -3284,19 +4298,19 @@ Branch: REL9_4_STABLE [788e35ac0] 2015-11-05 18:15:48 -0500
 
     <listitem>
      <para>
-      Fix inconsistent hash calculations in <literal>jsonb_path_ops</> GIN
+      Fix inconsistent hash calculations in <literal>jsonb_path_ops</literal> GIN
       indexes (Tom Lane)
      </para>
 
      <para>
-      When processing <type>jsonb</> values that contain both scalars and
+      When processing <type>jsonb</type> values that contain both scalars and
       sub-objects at the same nesting level, for example an array containing
       both scalars and sub-arrays, key hash values could be calculated
       differently than they would be for the same key in a different context.
       This could result in queries not finding entries that they should find.
       Fixing this means that existing indexes may now be inconsistent with the
       new hash calculation code.  Users
-      should <command>REINDEX</> <literal>jsonb_path_ops</> GIN indexes after
+      should <command>REINDEX</command> <literal>jsonb_path_ops</literal> GIN indexes after
       installing this update to make sure that all searches work as expected.
      </para>
     </listitem>
@@ -3326,18 +4340,18 @@ Branch: REL9_1_STABLE [dea6da132] 2015-10-06 17:15:27 -0400
 
     <listitem>
      <para>
-      Perform an immediate shutdown if the <filename>postmaster.pid</> file
+      Perform an immediate shutdown if the <filename>postmaster.pid</filename> file
       is removed (Tom Lane)
      </para>
 
      <para>
       The postmaster now checks every minute or so
-      that <filename>postmaster.pid</> is still there and still contains its
+      that <filename>postmaster.pid</filename> is still there and still contains its
       own PID.  If not, it performs an immediate shutdown, as though it had
-      received <systemitem>SIGQUIT</>.  The main motivation for this change
+      received <systemitem>SIGQUIT</systemitem>.  The main motivation for this change
       is to ensure that failed buildfarm runs will get cleaned up without
       manual intervention; but it also serves to limit the bad effects if a
-      DBA forcibly removes <filename>postmaster.pid</> and then starts a new
+      DBA forcibly removes <filename>postmaster.pid</filename> and then starts a new
       postmaster.
      </para>
     </listitem>
@@ -3354,7 +4368,7 @@ Branch: REL9_1_STABLE [08322daed] 2015-10-31 14:36:58 -0500
 
     <listitem>
      <para>
-      In <literal>SERIALIZABLE</> transaction isolation mode, serialization
+      In <literal>SERIALIZABLE</literal> transaction isolation mode, serialization
       anomalies could be missed due to race conditions during insertions
       (Kevin Grittner, Thomas Munro)
      </para>
@@ -3373,7 +4387,7 @@ Branch: REL9_1_STABLE [5f9a86b35] 2015-12-12 14:19:29 +0100
     <listitem>
      <para>
       Fix failure to emit appropriate WAL records when doing <literal>ALTER
-      TABLE ... SET TABLESPACE</> for unlogged relations (Michael Paquier,
+      TABLE ... SET TABLESPACE</literal> for unlogged relations (Michael Paquier,
       Andres Freund)
      </para>
 
@@ -3427,7 +4441,7 @@ Branch: REL9_1_STABLE [60ba32cb5] 2015-11-20 14:55:29 -0500
 
     <listitem>
      <para>
-      Fix <command>ALTER COLUMN TYPE</> to reconstruct inherited check
+      Fix <command>ALTER COLUMN TYPE</command> to reconstruct inherited check
       constraints properly (Tom Lane)
      </para>
     </listitem>
@@ -3442,7 +4456,7 @@ Branch: REL9_1_STABLE [7e29e7f55] 2015-12-21 19:49:15 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to change ownership of composite types
+      Fix <command>REASSIGN OWNED</command> to change ownership of composite types
       properly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3457,7 +4471,7 @@ Branch: REL9_1_STABLE [ab14c1383] 2015-12-21 19:16:15 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> and <command>ALTER OWNER</> to correctly
+      Fix <command>REASSIGN OWNED</command> and <command>ALTER OWNER</command> to correctly
       update granted-permissions lists when changing owners of data types,
       foreign data wrappers, or foreign servers (Bruce Momjian,
       &Aacute;lvaro Herrera)
@@ -3476,7 +4490,7 @@ Branch: REL9_1_STABLE [f44c5203b] 2015-12-11 18:39:09 -0300
 
     <listitem>
      <para>
-      Fix <command>REASSIGN OWNED</> to ignore foreign user mappings,
+      Fix <command>REASSIGN OWNED</command> to ignore foreign user mappings,
       rather than fail (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3510,13 +4524,13 @@ Branch: REL9_3_STABLE [0a34ff7e9] 2015-12-07 17:41:45 -0500
 
     <listitem>
      <para>
-      Fix planner's handling of <literal>LATERAL</> references (Tom
+      Fix planner's handling of <literal>LATERAL</literal> references (Tom
       Lane)
      </para>
 
      <para>
       This fixes some corner cases that led to <quote>failed to build any
-      N-way joins</> or <quote>could not devise a query plan</> planner
+      N-way joins</quote> or <quote>could not devise a query plan</quote> planner
       failures.
      </para>
     </listitem>
@@ -3566,9 +4580,9 @@ Branch: REL9_3_STABLE [faf18a905] 2015-11-16 13:45:17 -0500
 
     <listitem>
      <para>
-      Speed up generation of unique table aliases in <command>EXPLAIN</> and
+      Speed up generation of unique table aliases in <command>EXPLAIN</command> and
       rule dumping, and ensure that generated aliases do not
-      exceed <literal>NAMEDATALEN</> (Tom Lane)
+      exceed <literal>NAMEDATALEN</literal> (Tom Lane)
      </para>
     </listitem>
 
@@ -3584,8 +4598,8 @@ Branch: REL9_1_STABLE [7b21d1bca] 2015-11-15 14:41:09 -0500
 
     <listitem>
      <para>
-      Fix dumping of whole-row Vars in <literal>ROW()</>
-      and <literal>VALUES()</> lists (Tom Lane)
+      Fix dumping of whole-row Vars in <literal>ROW()</literal>
+      and <literal>VALUES()</literal> lists (Tom Lane)
      </para>
     </listitem>
 
@@ -3598,8 +4612,8 @@ Branch: REL9_4_STABLE [4f33572ee] 2015-10-20 11:06:24 -0700
 
     <listitem>
      <para>
-      Translation of minus-infinity dates and timestamps to <type>json</>
-      or <type>jsonb</> incorrectly rendered them as plus-infinity (Tom Lane)
+      Translation of minus-infinity dates and timestamps to <type>json</type>
+      or <type>jsonb</type> incorrectly rendered them as plus-infinity (Tom Lane)
      </para>
     </listitem>
 
@@ -3615,7 +4629,7 @@ Branch: REL9_1_STABLE [728a2ac21] 2015-11-17 15:47:12 -0500
 
     <listitem>
      <para>
-      Fix possible internal overflow in <type>numeric</> division
+      Fix possible internal overflow in <type>numeric</type> division
       (Dean Rasheed)
      </para>
     </listitem>
@@ -3707,7 +4721,7 @@ Branch: REL9_1_STABLE [b94c2b6a6] 2015-10-16 15:36:17 -0400
 
      <para>
       This causes the code to emit <quote>regular expression is too
-      complex</> errors in some cases that previously used unreasonable
+      complex</quote> errors in some cases that previously used unreasonable
       amounts of time and memory.
      </para>
     </listitem>
@@ -3742,14 +4756,14 @@ Branch: REL9_1_STABLE [b00c79b5b] 2015-10-16 14:43:18 -0400
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -3772,7 +4786,7 @@ Branch: REL9_1_STABLE [b0d858359] 2015-10-13 11:21:33 -0400
 
      <para>
       This oversight resulted in failure to recover from crashes
-      whenever <varname>logging_collector</> is turned on.
+      whenever <varname>logging_collector</varname> is turned on.
      </para>
     </listitem>
 
@@ -3822,13 +4836,13 @@ Branch: REL9_1_STABLE [db462a44e] 2015-12-17 16:55:51 -0500
 
     <listitem>
      <para>
-      In <application>psql</>, ensure that <application>libreadline</>'s idea
+      In <application>psql</application>, ensure that <application>libreadline</application>'s idea
       of the screen size is updated when the terminal window size changes
       (Merlin Moncure)
      </para>
 
      <para>
-      Previously, <application>libreadline</> did not notice if the window
+      Previously, <application>libreadline</application> did not notice if the window
       was resized during query output, leading to strange behavior during
       later input of multiline queries.
      </para>
@@ -3836,8 +4850,8 @@ Branch: REL9_1_STABLE [db462a44e] 2015-12-17 16:55:51 -0500
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
@@ -3854,7 +4868,7 @@ Branch: REL9_1_STABLE [6430a11fa] 2015-11-25 17:31:54 -0500
 
     <listitem>
      <para>
-      Avoid possible crash in <application>psql</>'s <literal>\c</> command
+      Avoid possible crash in <application>psql</application>'s <literal>\c</literal> command
       when previous connection was via Unix socket and command specifies a
       new hostname and same username (Tom Lane)
      </para>
@@ -3872,21 +4886,21 @@ Branch: REL9_1_STABLE [c869a7d5b] 2015-10-12 18:30:37 -0400
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, test child process status directly
+      In <literal>pg_ctl start -w</literal>, test child process status directly
       rather than relying on heuristics (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      Previously, <application>pg_ctl</> relied on an assumption that the new
-      postmaster would always create <filename>postmaster.pid</> within five
+      Previously, <application>pg_ctl</application> relied on an assumption that the new
+      postmaster would always create <filename>postmaster.pid</filename> within five
       seconds.  But that can fail on heavily-loaded systems,
-      causing <application>pg_ctl</> to report incorrectly that the
+      causing <application>pg_ctl</application> to report incorrectly that the
       postmaster failed to start.
      </para>
 
      <para>
       Except on Windows, this change also means that a <literal>pg_ctl start
-      -w</> done immediately after another such command will now reliably
+      -w</literal> done immediately after another such command will now reliably
       fail, whereas previously it would report success if done within two
       seconds of the first command.
      </para>
@@ -3904,23 +4918,23 @@ Branch: REL9_1_STABLE [87deb55a4] 2015-11-08 17:31:24 -0500
 
     <listitem>
      <para>
-      In <literal>pg_ctl start -w</>, don't attempt to use a wildcard listen
+      In <literal>pg_ctl start -w</literal>, don't attempt to use a wildcard listen
       address to connect to the postmaster (Kondo Yuta)
      </para>
 
      <para>
-      On Windows, <application>pg_ctl</> would fail to detect postmaster
-      startup if <varname>listen_addresses</> is set to <literal>0.0.0.0</>
-      or <literal>::</>, because it would try to use that value verbatim as
+      On Windows, <application>pg_ctl</application> would fail to detect postmaster
+      startup if <varname>listen_addresses</varname> is set to <literal>0.0.0.0</literal>
+      or <literal>::</literal>, because it would try to use that value verbatim as
       the address to connect to, which doesn't work.  Instead assume
-      that <literal>127.0.0.1</> or <literal>::1</>, respectively, is the
+      that <literal>127.0.0.1</literal> or <literal>::1</literal>, respectively, is the
       right thing to use.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -3940,18 +4954,18 @@ Branch: REL9_1_STABLE [6df62ef43] 2015-11-23 00:32:01 -0500
 
     <listitem>
      <para>
-      In <application>pg_dump</> and <application>pg_basebackup</>, adopt
+      In <application>pg_dump</application> and <application>pg_basebackup</application>, adopt
       the GNU convention for handling tar-archive members exceeding 8GB
       (Tom Lane)
      </para>
 
      <para>
-      The POSIX standard for <literal>tar</> file format does not allow
+      The POSIX standard for <literal>tar</literal> file format does not allow
       archive member files to exceed 8GB, but most modern implementations
-      of <application>tar</> support an extension that fixes that.  Adopt
-      this extension so that <application>pg_dump</> with <option>-Ft</> no
+      of <application>tar</application> support an extension that fixes that.  Adopt
+      this extension so that <application>pg_dump</application> with <option>-Ft</option> no
       longer fails on tables with more than 8GB of data, and so
-      that <application>pg_basebackup</> can handle files larger than 8GB.
+      that <application>pg_basebackup</application> can handle files larger than 8GB.
       In addition, fix some portability issues that could cause failures for
       members between 4GB and 8GB on some platforms.  Potentially these
       problems could cause unrecoverable data loss due to unreadable backup
@@ -3961,16 +4975,16 @@ Branch: REL9_1_STABLE [6df62ef43] 2015-11-23 00:32:01 -0500
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
@@ -3993,14 +5007,14 @@ Branch: REL9_1_STABLE [e4959fb5c] 2016-01-02 19:04:45 -0500
     <listitem>
      <para>
       Ensure that relation option values are properly quoted
-      in <application>pg_dump</> (Kouhei Sutou, Tom Lane)
+      in <application>pg_dump</application> (Kouhei Sutou, Tom Lane)
      </para>
 
      <para>
       A reloption value that isn't a simple identifier or number could lead
       to dump/reload failures due to syntax errors in CREATE statements
-      issued by <application>pg_dump</>.  This is not an issue with any
-      reloption currently supported by core <productname>PostgreSQL</>, but
+      issued by <application>pg_dump</application>.  This is not an issue with any
+      reloption currently supported by core <productname>PostgreSQL</productname>, but
       extensions could allow reloptions that cause the problem.
      </para>
     </listitem>
@@ -4015,7 +5029,7 @@ Branch: REL9_3_STABLE [534a4159c] 2015-12-23 14:25:31 -0500
 
     <listitem>
      <para>
-      Avoid repeated password prompts during parallel <application>pg_dump</>
+      Avoid repeated password prompts during parallel <application>pg_dump</application>
       (Zeus Kronion)
      </para>
     </listitem>
@@ -4038,14 +5052,14 @@ Branch: REL9_1_STABLE [c36064e43] 2015-11-24 17:18:27 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</>'s file-copying code to handle errors
+      Fix <application>pg_upgrade</application>'s file-copying code to handle errors
       properly on Windows (Bruce Momjian)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -4063,22 +5077,22 @@ Branch: REL9_2_STABLE [4fb9e6109] 2015-12-28 10:50:35 -0300
     <listitem>
      <para>
       Fix failure to localize messages emitted
-      by <application>pg_receivexlog</> and <application>pg_recvlogical</>
+      by <application>pg_receivexlog</application> and <application>pg_recvlogical</application>
       (Ioseph Kim)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -4086,7 +5100,7 @@ Branch: REL9_2_STABLE [4fb9e6109] 2015-12-28 10:50:35 -0300
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
@@ -4101,29 +5115,29 @@ Branch: REL9_3_STABLE [db6e8e162] 2015-11-12 13:03:53 -0500
 
     <listitem>
      <para>
-      Fix premature clearing of <application>libpq</>'s input buffer when
+      Fix premature clearing of <application>libpq</application>'s input buffer when
       socket EOF is seen (Tom Lane)
      </para>
 
      <para>
-      This mistake caused <application>libpq</> to sometimes not report the
+      This mistake caused <application>libpq</application> to sometimes not report the
       backend's final error message before reporting <quote>server closed the
-      connection unexpectedly</>.
+      connection unexpectedly</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
@@ -4139,7 +5153,7 @@ Branch: REL9_1_STABLE [4b58ded74] 2015-12-14 18:48:49 +0200
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory situations
+      Improve <application>libpq</application>'s handling of out-of-memory situations
       (Michael Paquier, Amit Kapila, Heikki Linnakangas)
      </para>
     </listitem>
@@ -4156,7 +5170,7 @@ Branch: REL9_1_STABLE [a9bcd8370] 2015-10-18 10:17:12 +0200
     <listitem>
      <para>
       Fix order of arguments
-      in <application>ecpg</>-generated <literal>typedef</> statements
+      in <application>ecpg</application>-generated <literal>typedef</literal> statements
       (Michael Meskes)
      </para>
     </listitem>
@@ -4173,29 +5187,29 @@ Branch: REL9_1_STABLE [84387496f] 2015-12-01 11:42:52 -0500
 
     <listitem>
      <para>
-      Use <literal>%g</> not <literal>%f</> format
-      in <application>ecpg</>'s <function>PGTYPESnumeric_from_double()</>
+      Use <literal>%g</literal> not <literal>%f</literal> format
+      in <application>ecpg</application>'s <function>PGTYPESnumeric_from_double()</function>
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -4216,15 +5230,15 @@ Branch: REL9_1_STABLE [1b6102eb7] 2015-12-27 13:03:19 -0300
 
     <listitem>
      <para>
-      Ensure that <filename>contrib/pgcrypto</>'s <function>crypt()</>
+      Ensure that <filename>contrib/pgcrypto</filename>'s <function>crypt()</function>
       function can be interrupted by query cancel (Andreas Karlsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>, fix bugs triggered by use
-      of <literal>tableoid</> in data-modifying commands (Etsuro Fujita,
+      In <filename>contrib/postgres_fdw</filename>, fix bugs triggered by use
+      of <literal>tableoid</literal> in data-modifying commands (Etsuro Fujita,
       Robert Haas)
      </para>
     </listitem>
@@ -4246,7 +5260,7 @@ Branch: REL9_2_STABLE [7f94a5c10] 2015-12-10 10:19:31 -0500
 
     <listitem>
      <para>
-      Accept <application>flex</> versions later than 2.5.x
+      Accept <application>flex</application> versions later than 2.5.x
       (Tom Lane, Michael Paquier)
      </para>
 
@@ -4280,19 +5294,19 @@ Branch: REL9_1_STABLE [2a37a103b] 2015-12-11 16:14:48 -0500
 
     <listitem>
      <para>
-      Install our <filename>missing</> script where PGXS builds can find it
+      Install our <filename>missing</filename> script where PGXS builds can find it
       (Jim Nasby)
      </para>
 
      <para>
       This allows sane behavior in a PGXS build done on a machine where build
-      tools such as <application>bison</> are missing.
+      tools such as <application>bison</application> are missing.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -4310,11 +5324,11 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
     <listitem>
      <para>
       Add variant regression test expected-output file to match behavior of
-      current <application>libxml2</> (Tom Lane)
+      current <application>libxml2</application> (Tom Lane)
      </para>
 
      <para>
-      The fix for <application>libxml2</>'s CVE-2015-7499 causes it not to
+      The fix for <application>libxml2</application>'s CVE-2015-7499 causes it not to
       output error context reports in some cases where it used to do so.
       This seems to be a bug, but we'll probably have to live with it for
       some time, so work around it.
@@ -4323,7 +5337,7 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -4345,7 +5359,7 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
   <para>
    This release contains a variety of fixes from 9.4.4.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -4357,7 +5371,7 @@ Branch: REL9_1_STABLE [386dcd539] 2015-12-11 19:08:40 -0500
 
    <para>
     However, if you are upgrading from a version earlier than 9.4.4,
-    see <xref linkend="release-9-4-4">.
+    see <xref linkend="release-9-4-4"/>.
    </para>
   </sect2>
 
@@ -4376,13 +5390,13 @@ Branch: REL9_3_STABLE [f8862172e] 2015-10-05 10:06:34 -0400
 
     <listitem>
      <para>
-      Guard against stack overflows in <type>json</> parsing
+      Guard against stack overflows in <type>json</type> parsing
       (Oskari Saarenmaa)
      </para>
 
      <para>
-      If an application constructs PostgreSQL <type>json</>
-      or <type>jsonb</> values from arbitrary user input, the application's
+      If an application constructs PostgreSQL <type>json</type>
+      or <type>jsonb</type> values from arbitrary user input, the application's
       users can reliably crash the PostgreSQL server, causing momentary
       denial of service.  (CVE-2015-5289)
      </para>
@@ -4401,8 +5415,8 @@ Branch: REL9_0_STABLE [188e081ef] 2015-10-05 10:06:36 -0400
 
     <listitem>
      <para>
-      Fix <filename>contrib/pgcrypto</> to detect and report
-      too-short <function>crypt()</> salts (Josh Kupershmidt)
+      Fix <filename>contrib/pgcrypto</filename> to detect and report
+      too-short <function>crypt()</function> salts (Josh Kupershmidt)
      </para>
 
      <para>
@@ -4447,7 +5461,7 @@ Branch: REL9_4_STABLE [bab959906] 2015-08-02 20:09:05 +0300
     <listitem>
      <para>
       Fix possible deadlock during WAL insertion
-      when <varname>commit_delay</> is set (Heikki Linnakangas)
+      when <varname>commit_delay</varname> is set (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -4478,13 +5492,13 @@ Branch: REL9_0_STABLE [45c69178b] 2015-06-25 14:39:06 -0400
 
     <listitem>
      <para>
-      Fix insertion of relations into the relation cache <quote>init file</>
+      Fix insertion of relations into the relation cache <quote>init file</quote>
       (Tom Lane)
      </para>
 
      <para>
       An oversight in a patch in the most recent minor releases
-      caused <structname>pg_trigger_tgrelid_tgname_index</> to be omitted
+      caused <structname>pg_trigger_tgrelid_tgname_index</structname> to be omitted
       from the init file.  Subsequent sessions detected this, then deemed the
       init file to be broken and silently ignored it, resulting in a
       significant degradation in session startup time.  In addition to fixing
@@ -4524,7 +5538,7 @@ Branch: REL9_0_STABLE [2d4336cf8] 2015-09-30 23:32:23 -0400
 
     <listitem>
      <para>
-      Improve <command>LISTEN</> startup time when there are many unread
+      Improve <command>LISTEN</command> startup time when there are many unread
       notifications (Matt Newell)
      </para>
     </listitem>
@@ -4544,7 +5558,7 @@ Branch: REL9_3_STABLE [1bcc9e60a] 2015-09-25 13:16:31 -0400
      </para>
 
      <para>
-      This was seen primarily when restoring <application>pg_dump</> output
+      This was seen primarily when restoring <application>pg_dump</application> output
       for databases with many thousands of tables.
      </para>
     </listitem>
@@ -4568,7 +5582,7 @@ Branch: REL9_0_STABLE [444b2ebee] 2015-07-28 22:06:32 +0200
       too many bugs in practice, both in the underlying OpenSSL library and
       in our usage of it.  Renegotiation will be removed entirely in 9.5 and
       later.  In the older branches, just change the default value
-      of <varname>ssl_renegotiation_limit</> to zero (disabled).
+      of <varname>ssl_renegotiation_limit</varname> to zero (disabled).
      </para>
     </listitem>
 
@@ -4592,7 +5606,7 @@ Branch: REL9_0_STABLE [eeb0b7830] 2015-10-05 11:57:25 +0200
 
     <listitem>
      <para>
-      Lower the minimum values of the <literal>*_freeze_max_age</> parameters
+      Lower the minimum values of the <literal>*_freeze_max_age</literal> parameters
       (Andres Freund)
      </para>
 
@@ -4615,7 +5629,7 @@ Branch: REL9_0_STABLE [b09446ed7] 2015-08-04 13:12:03 -0400
 
     <listitem>
      <para>
-      Limit the maximum value of <varname>wal_buffers</> to 2GB to avoid
+      Limit the maximum value of <varname>wal_buffers</varname> to 2GB to avoid
       server crashes (Josh Berkus)
      </para>
     </listitem>
@@ -4629,8 +5643,8 @@ Branch: REL9_3_STABLE [5a56c2545] 2015-06-28 18:38:06 -0400
     <listitem>
      <para>
       Avoid logging complaints when a parameter that can only be set at
-      server start appears multiple times in <filename>postgresql.conf</>,
-      and fix counting of line numbers after an <literal>include_dir</>
+      server start appears multiple times in <filename>postgresql.conf</filename>,
+      and fix counting of line numbers after an <literal>include_dir</literal>
       directive (Tom Lane)
      </para>
     </listitem>
@@ -4648,7 +5662,7 @@ Branch: REL9_0_STABLE [a89781e34] 2015-09-21 12:12:16 -0400
 
     <listitem>
      <para>
-      Fix rare internal overflow in multiplication of <type>numeric</> values
+      Fix rare internal overflow in multiplication of <type>numeric</type> values
       (Dean Rasheed)
      </para>
     </listitem>
@@ -4675,8 +5689,8 @@ Branch: REL9_2_STABLE [8dacb29ca] 2015-10-05 10:06:35 -0400
     <listitem>
      <para>
       Guard against hard-to-reach stack overflows involving record types,
-      range types, <type>json</>, <type>jsonb</>, <type>tsquery</>,
-      <type>ltxtquery</> and <type>query_int</> (Noah Misch)
+      range types, <type>json</type>, <type>jsonb</type>, <type>tsquery</type>,
+      <type>ltxtquery</type> and <type>query_int</type> (Noah Misch)
      </para>
     </listitem>
 
@@ -4700,14 +5714,14 @@ Branch: REL9_0_STABLE [92d956f51] 2015-09-07 20:47:06 +0100
 
     <listitem>
      <para>
-      Fix handling of <literal>DOW</> and <literal>DOY</> in datetime input
+      Fix handling of <literal>DOW</literal> and <literal>DOY</literal> in datetime input
       (Greg Stark)
      </para>
 
      <para>
       These tokens aren't meant to be used in datetime values, but previously
       they resulted in opaque internal error messages rather
-      than <quote>invalid input syntax</>.
+      than <quote>invalid input syntax</quote>.
      </para>
     </listitem>
 
@@ -4749,7 +5763,7 @@ Branch: REL9_0_STABLE [b875ca09f] 2015-10-02 15:00:52 -0400
     <listitem>
      <para>
       Add recursion depth protections to regular expression, <literal>SIMILAR
-      TO</>, and <literal>LIKE</> matching (Tom Lane)
+      TO</literal>, and <literal>LIKE</literal> matching (Tom Lane)
      </para>
 
      <para>
@@ -4865,8 +5879,8 @@ Branch: REL9_0_STABLE [bd327627f] 2015-08-04 18:18:47 -0400
 
     <listitem>
      <para>
-      Fix <quote>unexpected out-of-memory situation during sort</> errors
-      when using tuplestores with small <varname>work_mem</> settings (Tom
+      Fix <quote>unexpected out-of-memory situation during sort</quote> errors
+      when using tuplestores with small <varname>work_mem</varname> settings (Tom
       Lane)
      </para>
     </listitem>
@@ -4884,7 +5898,7 @@ Branch: REL9_0_STABLE [36522d627] 2015-07-16 22:57:46 -0400
 
     <listitem>
      <para>
-      Fix very-low-probability stack overrun in <function>qsort</> (Tom Lane)
+      Fix very-low-probability stack overrun in <function>qsort</function> (Tom Lane)
      </para>
     </listitem>
 
@@ -4906,8 +5920,8 @@ Branch: REL9_0_STABLE [d637a899c] 2015-10-04 15:55:07 -0400
 
     <listitem>
      <para>
-      Fix <quote>invalid memory alloc request size</> failure in hash joins
-      with large <varname>work_mem</> settings (Tomas Vondra, Tom Lane)
+      Fix <quote>invalid memory alloc request size</quote> failure in hash joins
+      with large <varname>work_mem</varname> settings (Tomas Vondra, Tom Lane)
      </para>
     </listitem>
 
@@ -4985,9 +5999,9 @@ Branch: REL9_0_STABLE [7b4b57fc4] 2015-08-12 21:19:10 -0400
       These mistakes could lead to incorrect query plans that would give wrong
       answers, or to assertion failures in assert-enabled builds, or to odd
       planner errors such as <quote>could not devise a query plan for the
-      given query</>, <quote>could not find pathkey item to
-      sort</>, <quote>plan should not reference subplan's variable</>,
-      or <quote>failed to assign all NestLoopParams to plan nodes</>.
+      given query</quote>, <quote>could not find pathkey item to
+      sort</quote>, <quote>plan should not reference subplan's variable</quote>,
+      or <quote>failed to assign all NestLoopParams to plan nodes</quote>.
       Thanks are due to Andreas Seltenreich and Piotr Stefaniak for fuzz
       testing that exposed these problems.
      </para>
@@ -5003,7 +6017,7 @@ Branch: REL9_2_STABLE [e538e510e] 2015-06-22 18:53:27 -0400
 
     <listitem>
      <para>
-      Improve planner's performance for <command>UPDATE</>/<command>DELETE</>
+      Improve planner's performance for <command>UPDATE</command>/<command>DELETE</command>
       on large inheritance sets (Tom Lane, Dean Rasheed)
      </para>
     </listitem>
@@ -5045,12 +6059,12 @@ Branch: REL9_0_STABLE [8b53c087d] 2015-08-02 14:54:44 -0400
      <para>
       During postmaster shutdown, ensure that per-socket lock files are
       removed and listen sockets are closed before we remove
-      the <filename>postmaster.pid</> file (Tom Lane)
+      the <filename>postmaster.pid</filename> file (Tom Lane)
      </para>
 
      <para>
       This avoids race-condition failures if an external script attempts to
-      start a new postmaster as soon as <literal>pg_ctl stop</> returns.
+      start a new postmaster as soon as <literal>pg_ctl stop</literal> returns.
      </para>
     </listitem>
 
@@ -5124,7 +6138,7 @@ Branch: REL9_0_STABLE [f527c0a2a] 2015-07-28 17:34:00 -0400
 
     <listitem>
      <para>
-      Do not print a <literal>WARNING</> when an autovacuum worker is already
+      Do not print a <literal>WARNING</literal> when an autovacuum worker is already
       gone when we attempt to signal it, and reduce log verbosity for such
       signals (Tom Lane)
      </para>
@@ -5202,7 +6216,7 @@ Branch: REL9_2_STABLE [f4297f8c5] 2015-07-27 12:32:48 +0300
      </para>
 
      <para>
-      <command>VACUUM</> attempted to recycle such pages, but did so in a
+      <command>VACUUM</command> attempted to recycle such pages, but did so in a
       way that wasn't crash-safe.
      </para>
     </listitem>
@@ -5221,7 +6235,7 @@ Branch: REL9_0_STABLE [40ad78220] 2015-07-23 01:30:19 +0300
     <listitem>
      <para>
       Fix off-by-one error that led to otherwise-harmless warnings
-      about <quote>apparent wraparound</> in subtrans/multixact truncation
+      about <quote>apparent wraparound</quote> in subtrans/multixact truncation
       (Thomas Munro)
      </para>
     </listitem>
@@ -5239,8 +6253,8 @@ Branch: REL9_0_STABLE [e41718fa1] 2015-08-18 19:22:38 -0400
 
     <listitem>
      <para>
-      Fix misreporting of <command>CONTINUE</> and <command>MOVE</> statement
-      types in <application>PL/pgSQL</>'s error context messages
+      Fix misreporting of <command>CONTINUE</command> and <command>MOVE</command> statement
+      types in <application>PL/pgSQL</application>'s error context messages
       (Pavel Stehule, Tom Lane)
      </para>
     </listitem>
@@ -5257,7 +6271,7 @@ Branch: REL9_1_STABLE [ca6c2f863] 2015-09-29 10:52:22 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Perl</> to handle non-<acronym>ASCII</> error
+      Fix <application>PL/Perl</application> to handle non-<acronym>ASCII</acronym> error
       message texts correctly (Alex Hunsaker)
      </para>
     </listitem>
@@ -5280,8 +6294,8 @@ Branch: REL9_1_STABLE [1d190d095] 2015-08-21 12:21:37 -0400
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> crash when returning the string
-      representation of a <type>record</> result (Tom Lane)
+      Fix <application>PL/Python</application> crash when returning the string
+      representation of a <type>record</type> result (Tom Lane)
      </para>
     </listitem>
 
@@ -5298,8 +6312,8 @@ Branch: REL9_0_STABLE [4c11967e7] 2015-07-20 14:18:08 +0200
 
     <listitem>
      <para>
-      Fix some places in <application>PL/Tcl</> that neglected to check for
-      failure of <function>malloc()</> calls (Michael Paquier, &Aacute;lvaro
+      Fix some places in <application>PL/Tcl</application> that neglected to check for
+      failure of <function>malloc()</function> calls (Michael Paquier, &Aacute;lvaro
       Herrera)
      </para>
     </listitem>
@@ -5316,7 +6330,7 @@ Branch: REL9_1_STABLE [2d19a0e97] 2015-08-02 22:12:51 +0300
 
     <listitem>
      <para>
-      In <filename>contrib/isn</>, fix output of ISBN-13 numbers that begin
+      In <filename>contrib/isn</filename>, fix output of ISBN-13 numbers that begin
       with 979 (Fabien Coelho)
      </para>
 
@@ -5335,7 +6349,7 @@ Branch: REL9_4_STABLE [93840f96c] 2015-10-04 17:58:30 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/pg_stat_statements</>' handling of
+      Improve <filename>contrib/pg_stat_statements</filename>' handling of
       query-text garbage collection (Peter Geoghegan)
      </para>
 
@@ -5356,13 +6370,13 @@ Branch: REL9_3_STABLE [b7dcb2dd4] 2015-09-24 12:47:30 -0400
 
     <listitem>
      <para>
-      Improve <filename>contrib/postgres_fdw</>'s handling of
+      Improve <filename>contrib/postgres_fdw</filename>'s handling of
       collation-related decisions (Tom Lane)
      </para>
 
      <para>
       The main user-visible effect is expected to be that comparisons
-      involving <type>varchar</> columns will be sent to the remote server
+      involving <type>varchar</type> columns will be sent to the remote server
       for execution in more cases than before.
      </para>
     </listitem>
@@ -5380,7 +6394,7 @@ Branch: REL9_0_STABLE [2b189c7ec] 2015-07-07 18:45:31 +0300
 
     <listitem>
      <para>
-      Improve <application>libpq</>'s handling of out-of-memory conditions
+      Improve <application>libpq</application>'s handling of out-of-memory conditions
       (Michael Paquier, Heikki Linnakangas)
      </para>
     </listitem>
@@ -5416,7 +6430,7 @@ Branch: REL9_0_STABLE [d278ff3b2] 2015-06-15 14:27:39 +0200
     <listitem>
      <para>
       Fix memory leaks and missing out-of-memory checks
-      in <application>ecpg</> (Michael Paquier)
+      in <application>ecpg</application> (Michael Paquier)
      </para>
     </listitem>
 
@@ -5447,15 +6461,15 @@ Branch: REL9_0_STABLE [98d8c75f9] 2015-09-25 12:20:46 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s code for locale-aware formatting of numeric
+      Fix <application>psql</application>'s code for locale-aware formatting of numeric
       output (Tom Lane)
      </para>
 
      <para>
-      The formatting code invoked by <literal>\pset numericlocale on</>
+      The formatting code invoked by <literal>\pset numericlocale on</literal>
       did the wrong thing for some uncommon cases such as numbers with an
       exponent but no decimal point.  It could also mangle already-localized
-      output from the <type>money</> data type.
+      output from the <type>money</type> data type.
      </para>
     </listitem>
 
@@ -5472,7 +6486,7 @@ Branch: REL9_0_STABLE [6087bf1a1] 2015-07-08 20:44:27 -0400
 
     <listitem>
      <para>
-      Prevent crash in <application>psql</>'s <command>\c</> command when
+      Prevent crash in <application>psql</application>'s <command>\c</command> command when
       there is no current connection (Noah Misch)
      </para>
     </listitem>
@@ -5488,7 +6502,7 @@ Branch: REL9_2_STABLE [3756c65a0] 2015-10-01 16:19:49 -0400
 
     <listitem>
      <para>
-      Make <application>pg_dump</> handle inherited <literal>NOT VALID</>
+      Make <application>pg_dump</application> handle inherited <literal>NOT VALID</literal>
       check constraints correctly (Tom Lane)
      </para>
     </listitem>
@@ -5505,8 +6519,8 @@ Branch: REL9_1_STABLE [af225551e] 2015-07-25 17:16:39 -0400
 
     <listitem>
      <para>
-      Fix selection of default <application>zlib</> compression level
-      in <application>pg_dump</>'s directory output format (Andrew Dunstan)
+      Fix selection of default <application>zlib</application> compression level
+      in <application>pg_dump</application>'s directory output format (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -5523,8 +6537,8 @@ Branch: REL9_0_STABLE [24aed2124] 2015-09-20 20:44:34 -0400
 
     <listitem>
      <para>
-      Ensure that temporary files created during a <application>pg_dump</>
-      run with <acronym>tar</>-format output are not world-readable (Michael
+      Ensure that temporary files created during a <application>pg_dump</application>
+      run with <acronym>tar</acronym>-format output are not world-readable (Michael
       Paquier)
      </para>
     </listitem>
@@ -5542,8 +6556,8 @@ Branch: REL9_0_STABLE [52b07779d] 2015-09-11 15:51:10 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_upgrade</> to support
-      cases where the <literal>postgres</> or <literal>template1</> database
+      Fix <application>pg_dump</application> and <application>pg_upgrade</application> to support
+      cases where the <literal>postgres</literal> or <literal>template1</literal> database
       is in a non-default tablespace (Marti Raudsepp, Bruce Momjian)
      </para>
     </listitem>
@@ -5561,7 +6575,7 @@ Branch: REL9_0_STABLE [298d1f808] 2015-08-10 20:10:16 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle object privileges sanely when
+      Fix <application>pg_dump</application> to handle object privileges sanely when
       dumping from a server too old to have a particular privilege type
       (Tom Lane)
      </para>
@@ -5569,11 +6583,11 @@ Branch: REL9_0_STABLE [298d1f808] 2015-08-10 20:10:16 -0400
      <para>
       When dumping data types from pre-9.2 servers, and when dumping
       functions or procedural languages from pre-7.3
-      servers, <application>pg_dump</> would
-      produce <command>GRANT</>/<command>REVOKE</> commands that revoked the
+      servers, <application>pg_dump</application> would
+      produce <command>GRANT</command>/<command>REVOKE</command> commands that revoked the
       owner's grantable privileges and instead granted all privileges
-      to <literal>PUBLIC</>.  Since the privileges involved are
-      just <literal>USAGE</> and <literal>EXECUTE</>, this isn't a security
+      to <literal>PUBLIC</literal>.  Since the privileges involved are
+      just <literal>USAGE</literal> and <literal>EXECUTE</literal>, this isn't a security
       problem, but it's certainly a surprising representation of the older
       systems' behavior.  Fix it to leave the default privilege state alone
       in these cases.
@@ -5593,12 +6607,12 @@ Branch: REL9_0_STABLE [5d175be17] 2015-08-04 19:34:12 -0400
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump shell types (Tom Lane)
+      Fix <application>pg_dump</application> to dump shell types (Tom Lane)
      </para>
 
      <para>
       Shell types (that is, not-yet-fully-defined types) aren't useful for
-      much, but nonetheless <application>pg_dump</> should dump them.
+      much, but nonetheless <application>pg_dump</application> should dump them.
      </para>
     </listitem>
 
@@ -5614,7 +6628,7 @@ Branch: REL9_1_STABLE [e9a859b54] 2015-07-12 16:25:52 -0400
 
     <listitem>
      <para>
-      Fix assorted minor memory leaks in <application>pg_dump</> and other
+      Fix assorted minor memory leaks in <application>pg_dump</application> and other
       client-side programs (Michael Paquier)
      </para>
     </listitem>
@@ -5628,8 +6642,8 @@ Branch: REL9_4_STABLE [9d6352aaa] 2015-07-03 11:15:27 +0300
 
     <listitem>
      <para>
-      Fix <application>pgbench</>'s progress-report behavior when a query,
-      or <application>pgbench</> itself, gets stuck (Fabien Coelho)
+      Fix <application>pgbench</application>'s progress-report behavior when a query,
+      or <application>pgbench</application> itself, gets stuck (Fabien Coelho)
      </para>
     </listitem>
 
@@ -5658,11 +6672,11 @@ Branch: REL9_0_STABLE [b5a22d8bb] 2015-08-29 16:09:25 -0400
     <listitem>
      <para>
       Fix spinlock assembly code for PPC hardware to be compatible
-      with <acronym>AIX</>'s native assembler (Tom Lane)
+      with <acronym>AIX</acronym>'s native assembler (Tom Lane)
      </para>
 
      <para>
-      Building with <application>gcc</> didn't work if <application>gcc</>
+      Building with <application>gcc</application> didn't work if <application>gcc</application>
       had been configured to use the native assembler, which is becoming more
       common.
      </para>
@@ -5681,7 +6695,7 @@ Branch: REL9_0_STABLE [cdf596b1c] 2015-07-17 03:02:46 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, test the <literal>-qlonglong</> compiler option
+      On <acronym>AIX</acronym>, test the <literal>-qlonglong</literal> compiler option
       rather than just assuming it's safe to use (Noah Misch)
      </para>
     </listitem>
@@ -5699,7 +6713,7 @@ Branch: REL9_0_STABLE [7803d5720] 2015-07-15 21:00:31 -0400
 
     <listitem>
      <para>
-      On <acronym>AIX</>, use <literal>-Wl,-brtllib</> link option to allow
+      On <acronym>AIX</acronym>, use <literal>-Wl,-brtllib</literal> link option to allow
       symbols to be resolved at runtime (Noah Misch)
      </para>
 
@@ -5722,7 +6736,7 @@ Branch: REL9_0_STABLE [2d8c136e7] 2015-07-29 22:54:08 -0400
     <listitem>
      <para>
       Avoid use of inline functions when compiling with
-      32-bit <application>xlc</>, due to compiler bugs (Noah Misch)
+      32-bit <application>xlc</application>, due to compiler bugs (Noah Misch)
      </para>
     </listitem>
 
@@ -5738,7 +6752,7 @@ Branch: REL9_0_STABLE [b185c42c1] 2015-06-30 14:20:37 -0300
 
     <listitem>
      <para>
-      Use <filename>librt</> for <function>sched_yield()</> when necessary,
+      Use <filename>librt</filename> for <function>sched_yield()</function> when necessary,
       which it is on some Solaris versions (Oskari Saarenmaa)
      </para>
     </listitem>
@@ -5752,7 +6766,7 @@ Branch: REL9_4_STABLE [a0104e080] 2015-08-14 20:23:42 -0400
 
     <listitem>
      <para>
-      Translate encoding <literal>UHC</> as Windows code page 949
+      Translate encoding <literal>UHC</literal> as Windows code page 949
       (Noah Misch)
      </para>
 
@@ -5785,12 +6799,12 @@ Branch: REL9_4_STABLE [b2ed1682d] 2015-06-20 12:10:56 -0400
     <listitem>
      <para>
       Fix postmaster startup failure due to not
-      copying <function>setlocale()</>'s return value (Noah Misch)
+      copying <function>setlocale()</function>'s return value (Noah Misch)
      </para>
 
      <para>
       This has been reported on Windows systems with the ANSI code page set
-      to CP936 (<quote>Chinese (Simplified, PRC)</>), and may occur with
+      to CP936 (<quote>Chinese (Simplified, PRC)</quote>), and may occur with
       other multibyte code pages.
      </para>
     </listitem>
@@ -5808,7 +6822,7 @@ Branch: REL9_0_STABLE [341b877d3] 2015-07-07 16:39:25 +0300
 
     <listitem>
      <para>
-      Fix Windows <filename>install.bat</> script to handle target directory
+      Fix Windows <filename>install.bat</filename> script to handle target directory
       names that contain spaces (Heikki Linnakangas)
      </para>
     </listitem>
@@ -5826,9 +6840,9 @@ Branch: REL9_0_STABLE [29ff43adf] 2015-07-05 12:01:02 -0400
 
     <listitem>
      <para>
-      Make the numeric form of the <productname>PostgreSQL</> version number
-      (e.g., <literal>90405</>) readily available to extension Makefiles,
-      as a variable named <varname>VERSION_NUM</> (Michael Paquier)
+      Make the numeric form of the <productname>PostgreSQL</productname> version number
+      (e.g., <literal>90405</literal>) readily available to extension Makefiles,
+      as a variable named <varname>VERSION_NUM</varname> (Michael Paquier)
      </para>
     </listitem>
 
@@ -5845,10 +6859,10 @@ Branch: REL9_0_STABLE [47ac95f37] 2015-10-02 19:16:37 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015g for
+      Update time zone data files to <application>tzdata</application> release 2015g for
       DST law changes in Cayman Islands, Fiji, Moldova, Morocco, Norfolk
       Island, North Korea, Turkey, and Uruguay.  There is a new zone name
-      <literal>America/Fort_Nelson</> for the Canadian Northern Rockies.
+      <literal>America/Fort_Nelson</literal> for the Canadian Northern Rockies.
      </para>
     </listitem>
 
@@ -5868,7 +6882,7 @@ Branch: REL9_0_STABLE [47ac95f37] 2015-10-02 19:16:37 -0400
   <para>
    This release contains a small number of fixes from 9.4.3.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -5880,13 +6894,13 @@ Branch: REL9_0_STABLE [47ac95f37] 2015-10-02 19:16:37 -0400
 
    <para>
     However, if you are upgrading an installation that was previously
-    upgraded using a <application>pg_upgrade</> version between 9.3.0 and
+    upgraded using a <application>pg_upgrade</application> version between 9.3.0 and
     9.3.4 inclusive, see the first changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.2,
-    see <xref linkend="release-9-4-2">.
+    see <xref linkend="release-9-4-2"/>.
    </para>
   </sect2>
 
@@ -5909,50 +6923,50 @@ Branch: REL9_3_STABLE [2a9b01928] 2015-06-05 09:34:15 -0400
      </para>
 
      <para>
-      Recent <productname>PostgreSQL</> releases introduced mechanisms to
+      Recent <productname>PostgreSQL</productname> releases introduced mechanisms to
       protect against multixact wraparound, but some of that code did not
       account for the possibility that it would need to run during crash
       recovery, when the database may not be in a consistent state.  This
       could result in failure to restart after a crash, or failure to start
       up a secondary server.  The lingering effects of a previously-fixed
-      bug in <application>pg_upgrade</> could also cause such a failure, in
-      installations that had used <application>pg_upgrade</> versions
+      bug in <application>pg_upgrade</application> could also cause such a failure, in
+      installations that had used <application>pg_upgrade</application> versions
       between 9.3.0 and 9.3.4.
      </para>
 
      <para>
-      The <application>pg_upgrade</> bug in question was that it would
-      set <literal>oldestMultiXid</> to 1 in <filename>pg_control</> even
+      The <application>pg_upgrade</application> bug in question was that it would
+      set <literal>oldestMultiXid</literal> to 1 in <filename>pg_control</filename> even
       if the true value should be higher.  With the fixes introduced in
       this release, such a situation will result in immediate emergency
-      autovacuuming until a correct <literal>oldestMultiXid</> value can
+      autovacuuming until a correct <literal>oldestMultiXid</literal> value can
       be determined.  If that would pose a hardship, users can avoid it by
-      doing manual vacuuming <emphasis>before</> upgrading to this release.
+      doing manual vacuuming <emphasis>before</emphasis> upgrading to this release.
       In detail:
 
       <orderedlist>
        <listitem>
         <para>
-         Check whether <application>pg_controldata</> reports <quote>Latest
-         checkpoint's oldestMultiXid</> to be 1.  If not, there's nothing
+         Check whether <application>pg_controldata</application> reports <quote>Latest
+         checkpoint's oldestMultiXid</quote> to be 1.  If not, there's nothing
          to do.
         </para>
        </listitem>
        <listitem>
         <para>
-         Look in <filename>PGDATA/pg_multixact/offsets</> to see if there's a
-         file named <filename>0000</>.  If there is, there's nothing to do.
+         Look in <filename>PGDATA/pg_multixact/offsets</filename> to see if there's a
+         file named <filename>0000</filename>.  If there is, there's nothing to do.
         </para>
        </listitem>
        <listitem>
         <para>
          Otherwise, for each table that has
-         <structname>pg_class</>.<structfield>relminmxid</> equal to 1,
-         <command>VACUUM</> that table with
-         both <xref linkend="guc-vacuum-multixact-freeze-min-age">
-         and <xref linkend="guc-vacuum-multixact-freeze-table-age"> set to
+         <structname>pg_class</structname>.<structfield>relminmxid</structfield> equal to 1,
+         <command>VACUUM</command> that table with
+         both <xref linkend="guc-vacuum-multixact-freeze-min-age"/>
+         and <xref linkend="guc-vacuum-multixact-freeze-table-age"/> set to
          zero.  (You can use the vacuum cost delay parameters described
-         in <xref linkend="runtime-config-resource-vacuum-cost"> to reduce
+         in <xref linkend="runtime-config-resource-vacuum-cost"/> to reduce
          the performance consequences for concurrent sessions.)
         </para>
        </listitem>
@@ -5977,7 +6991,7 @@ Branch: REL9_0_STABLE [2fe1939b0] 2015-06-07 15:32:09 -0400
 
      <para>
       With just the wrong timing of concurrent activity, a <command>VACUUM
-      FULL</> on a system catalog might fail to update the <quote>init file</>
+      FULL</command> on a system catalog might fail to update the <quote>init file</quote>
       that's used to avoid cache-loading work for new sessions.  This would
       result in later sessions being unable to access that catalog at all.
       This is a very ancient bug, but it's so hard to trigger that no
@@ -5998,13 +7012,13 @@ Branch: REL9_0_STABLE [dbd99c7f0] 2015-06-05 13:22:27 -0400
     <listitem>
      <para>
       Avoid deadlock between incoming sessions and <literal>CREATE/DROP
-      DATABASE</> (Tom Lane)
+      DATABASE</literal> (Tom Lane)
      </para>
 
      <para>
       A new session starting in a database that is the target of
-      a <command>DROP DATABASE</> command, or is the template for
-      a <command>CREATE DATABASE</> command, could cause the command to wait
+      a <command>DROP DATABASE</command> command, or is the template for
+      a <command>CREATE DATABASE</command> command, could cause the command to wait
       for five seconds and then fail, even if the new session would have
       exited before that.
      </para>
@@ -6049,7 +7063,7 @@ Branch: REL9_3_STABLE [d3fdec6ae] 2015-06-03 11:58:47 -0400
   <para>
    This release contains a small number of fixes from 9.4.2.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -6061,7 +7075,7 @@ Branch: REL9_3_STABLE [d3fdec6ae] 2015-06-03 11:58:47 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.4.2,
-    see <xref linkend="release-9-4-2">.
+    see <xref linkend="release-9-4-2"/>.
    </para>
   </sect2>
 
@@ -6097,12 +7111,12 @@ Branch: REL9_3_STABLE [c2b68b1f7] 2015-05-29 17:02:58 -0400
 
     <listitem>
      <para>
-      Avoid failures while <function>fsync</>'ing data directory during
+      Avoid failures while <function>fsync</function>'ing data directory during
       crash restart (Abhijit Menon-Sen, Tom Lane)
      </para>
 
      <para>
-      In the previous minor releases we added a patch to <function>fsync</>
+      In the previous minor releases we added a patch to <function>fsync</function>
       everything in the data directory after a crash.  Unfortunately its
       response to any error condition was to fail, thereby preventing the
       server from starting up, even when the problem was quite harmless.
@@ -6114,7 +7128,7 @@ Branch: REL9_3_STABLE [c2b68b1f7] 2015-05-29 17:02:58 -0400
      </para>
 
      <para>
-      Also apply the same rules in <literal>initdb --sync-only</>.
+      Also apply the same rules in <literal>initdb --sync-only</literal>.
       This case is less critical but it should act similarly.
      </para>
     </listitem>
@@ -6129,8 +7143,8 @@ Branch: REL9_2_STABLE [f3c67aad4] 2015-05-28 11:24:37 -0400
 
     <listitem>
      <para>
-      Fix <function>pg_get_functiondef()</> to show
-      functions' <literal>LEAKPROOF</> property, if set (Jeevan Chalke)
+      Fix <function>pg_get_functiondef()</function> to show
+      functions' <literal>LEAKPROOF</literal> property, if set (Jeevan Chalke)
      </para>
     </listitem>
 
@@ -6142,7 +7156,7 @@ Branch: REL9_4_STABLE [9b74f32cd] 2015-05-22 10:31:29 -0400
 
     <listitem>
      <para>
-      Fix <function>pushJsonbValue()</> to unpack <type>jbvBinary</>
+      Fix <function>pushJsonbValue()</function> to unpack <type>jbvBinary</type>
       objects (Andrew Dunstan)
      </para>
 
@@ -6164,14 +7178,14 @@ Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
 
     <listitem>
      <para>
-      Remove <application>configure</>'s check prohibiting linking to a
-      threaded <application>libpython</>
-      on <systemitem class="osname">OpenBSD</> (Tom Lane)
+      Remove <application>configure</application>'s check prohibiting linking to a
+      threaded <application>libpython</application>
+      on <systemitem class="osname">OpenBSD</systemitem> (Tom Lane)
      </para>
 
      <para>
       The failure this restriction was meant to prevent seems to not be a
-      problem anymore on current <systemitem class="osname">OpenBSD</>
+      problem anymore on current <systemitem class="osname">OpenBSD</systemitem>
       versions.
      </para>
     </listitem>
@@ -6192,7 +7206,7 @@ Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
   <para>
    This release contains a variety of fixes from 9.4.1.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -6203,14 +7217,14 @@ Branch: REL9_0_STABLE [b06649b7f] 2015-05-26 22:15:00 -0400
    </para>
 
    <para>
-    However, if you use <filename>contrib/citext</>'s
-    <function>regexp_matches()</> functions, see the changelog entry below
+    However, if you use <filename>contrib/citext</filename>'s
+    <function>regexp_matches()</function> functions, see the changelog entry below
     about that.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.4.1,
-    see <xref linkend="release-9-4-1">.
+    see <xref linkend="release-9-4-1"/>.
    </para>
   </sect2>
 
@@ -6282,7 +7296,7 @@ Branch: REL9_0_STABLE [cf893530a] 2015-05-19 18:18:56 -0400
      </para>
 
      <para>
-      Our replacement implementation of <function>snprintf()</> failed to
+      Our replacement implementation of <function>snprintf()</function> failed to
       check for errors reported by the underlying system library calls;
       the main case that might be missed is out-of-memory situations.
       In the worst case this might lead to information exposure, due to our
@@ -6292,7 +7306,7 @@ Branch: REL9_0_STABLE [cf893530a] 2015-05-19 18:18:56 -0400
      </para>
 
      <para>
-      It remains possible that some calls of the <function>*printf()</>
+      It remains possible that some calls of the <function>*printf()</function>
       family of functions are vulnerable to information disclosure if an
       out-of-memory error occurs at just the wrong time.  We judge the risk
       to not be large, but will continue analysis in this area.
@@ -6312,15 +7326,15 @@ Branch: REL9_0_STABLE [b84e5c017] 2015-05-18 10:02:39 -0400
 
     <listitem>
      <para>
-      In <filename>contrib/pgcrypto</>, uniformly report decryption failures
-      as <quote>Wrong key or corrupt data</> (Noah Misch)
+      In <filename>contrib/pgcrypto</filename>, uniformly report decryption failures
+      as <quote>Wrong key or corrupt data</quote> (Noah Misch)
      </para>
 
      <para>
       Previously, some cases of decryption with an incorrect key could report
       other error message texts.  It has been shown that such variance in
       error reports can aid attackers in recovering keys from other systems.
-      While it's unknown whether <filename>pgcrypto</>'s specific behaviors
+      While it's unknown whether <filename>pgcrypto</filename>'s specific behaviors
       are likewise exploitable, it seems better to avoid the risk by using a
       one-size-fits-all message.
       (CVE-2015-3167)
@@ -6370,7 +7384,7 @@ Branch: REL9_3_STABLE [ddebd2119] 2015-05-11 12:16:51 -0400
 
      <para>
       Under certain usage patterns, the existing defenses against this might
-      be insufficient, allowing <filename>pg_multixact/members</> files to be
+      be insufficient, allowing <filename>pg_multixact/members</filename> files to be
       removed too early, resulting in data loss.
       The fix for this includes modifying the server to fail transactions
       that would result in overwriting old multixact member ID data, and
@@ -6391,16 +7405,16 @@ Branch: REL9_1_STABLE [801e250a8] 2015-05-05 15:50:53 -0400
 
     <listitem>
      <para>
-      Fix incorrect declaration of <filename>contrib/citext</>'s
-      <function>regexp_matches()</> functions (Tom Lane)
+      Fix incorrect declaration of <filename>contrib/citext</filename>'s
+      <function>regexp_matches()</function> functions (Tom Lane)
      </para>
 
      <para>
-      These functions should return <type>setof text[]</>, like the core
+      These functions should return <type>setof text[]</type>, like the core
       functions they are wrappers for; but they were incorrectly declared as
-      returning just <type>text[]</>.  This mistake had two results: first,
+      returning just <type>text[]</type>.  This mistake had two results: first,
       if there was no match you got a scalar null result, whereas what you
-      should get is an empty set (zero rows).  Second, the <literal>g</> flag
+      should get is an empty set (zero rows).  Second, the <literal>g</literal> flag
       was effectively ignored, since you would get only one result array even
       if there were multiple matches.
      </para>
@@ -6408,16 +7422,16 @@ Branch: REL9_1_STABLE [801e250a8] 2015-05-05 15:50:53 -0400
      <para>
       While the latter behavior is clearly a bug, there might be applications
       depending on the former behavior; therefore the function declarations
-      will not be changed by default until <productname>PostgreSQL</> 9.5.
+      will not be changed by default until <productname>PostgreSQL</productname> 9.5.
       In pre-9.5 branches, the old behavior exists in version 1.0 of
-      the <literal>citext</> extension, while we have provided corrected
-      declarations in version 1.1 (which is <emphasis>not</> installed by
+      the <literal>citext</literal> extension, while we have provided corrected
+      declarations in version 1.1 (which is <emphasis>not</emphasis> installed by
       default).  To adopt the fix in pre-9.5 branches, execute
-      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</> in each database in
-      which <literal>citext</> is installed.  (You can also <quote>update</>
+      <literal>ALTER EXTENSION citext UPDATE TO '1.1'</literal> in each database in
+      which <literal>citext</literal> is installed.  (You can also <quote>update</quote>
       back to 1.0 if you need to undo that.)  Be aware that either update
       direction will require dropping and recreating any views or rules that
-      use <filename>citext</>'s <function>regexp_matches()</> functions.
+      use <filename>citext</filename>'s <function>regexp_matches()</function> functions.
      </para>
     </listitem>
 
@@ -6429,8 +7443,8 @@ Branch: REL9_4_STABLE [79afe6e66] 2015-02-26 12:34:43 -0500
 
     <listitem>
      <para>
-      Render infinite dates and timestamps as <literal>infinity</> when
-      converting to <type>json</>, rather than throwing an error
+      Render infinite dates and timestamps as <literal>infinity</literal> when
+      converting to <type>json</type>, rather than throwing an error
       (Andrew Dunstan)
      </para>
     </listitem>
@@ -6443,8 +7457,8 @@ Branch: REL9_4_STABLE [997066f44] 2015-05-04 12:43:16 -0400
 
     <listitem>
      <para>
-      Fix <type>json</>/<type>jsonb</>'s <function>populate_record()</>
-      and <function>to_record()</> functions to handle empty input properly
+      Fix <type>json</type>/<type>jsonb</type>'s <function>populate_record()</function>
+      and <function>to_record()</function> functions to handle empty input properly
       (Andrew Dunstan)
      </para>
     </listitem>
@@ -6484,7 +7498,7 @@ Branch: REL9_4_STABLE [79edb2981] 2015-05-03 11:30:24 -0400
     <listitem>
      <para>
       Fix behavior when changing foreign key constraint deferrability status
-      with <literal>ALTER TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      with <literal>ALTER TABLE ... ALTER CONSTRAINT</literal> (Tom Lane)
      </para>
 
      <para>
@@ -6533,7 +7547,7 @@ Branch: REL9_0_STABLE [985da346e] 2015-04-25 16:44:27 -0400
 
      <para>
       This oversight in the planner has been observed to cause <quote>could
-      not find RelOptInfo for given relids</> errors, but it seems possible
+      not find RelOptInfo for given relids</quote> errors, but it seems possible
       that sometimes an incorrect query plan might get past that consistency
       check and result in silently-wrong query output.
      </para>
@@ -6581,7 +7595,7 @@ Branch: REL9_0_STABLE [72bbca27e] 2015-02-10 20:37:31 -0500
 
      <para>
       This oversight has been seen to lead to <quote>failed to join all
-      relations together</> errors in queries involving <literal>LATERAL</>,
+      relations together</quote> errors in queries involving <literal>LATERAL</literal>,
       and that might happen in other cases as well.
      </para>
     </listitem>
@@ -6595,7 +7609,7 @@ Branch: REL9_4_STABLE [f16270ade] 2015-02-25 21:36:40 -0500
     <listitem>
      <para>
       Ensure that row locking occurs properly when the target of
-      an <command>UPDATE</> or <command>DELETE</> is a security-barrier view
+      an <command>UPDATE</command> or <command>DELETE</command> is a security-barrier view
       (Stephen Frost)
      </para>
     </listitem>
@@ -6614,7 +7628,7 @@ Branch: REL9_4_STABLE [fd3dfc236] 2015-04-28 00:18:04 +0200
 
      <para>
       On some platforms, the previous coding could result in errors like
-      <quote>could not fsync file "pg_replslot/...": Bad file descriptor</>.
+      <quote>could not fsync file "pg_replslot/...": Bad file descriptor</quote>.
      </para>
     </listitem>
 
@@ -6631,7 +7645,7 @@ Branch: REL9_0_STABLE [223a94680] 2015-04-23 21:37:09 +0300
     <listitem>
      <para>
       Fix possible deadlock at startup
-      when <literal>max_prepared_transactions</> is too small
+      when <literal>max_prepared_transactions</literal> is too small
       (Heikki Linnakangas)
      </para>
     </listitem>
@@ -6672,7 +7686,7 @@ Branch: REL9_0_STABLE [262fbcb9d] 2015-05-05 09:30:07 -0400
 
     <listitem>
      <para>
-      Recursively <function>fsync()</> the data directory after a crash
+      Recursively <function>fsync()</function> the data directory after a crash
       (Abhijit Menon-Sen, Robert Haas)
      </para>
 
@@ -6714,7 +7728,7 @@ Branch: REL9_4_STABLE [ee0d06c0b] 2015-04-03 00:07:29 -0400
 
      <para>
       This oversight could result in failures in sessions that start
-      concurrently with a <command>VACUUM FULL</> on a system catalog.
+      concurrently with a <command>VACUUM FULL</command> on a system catalog.
      </para>
     </listitem>
 
@@ -6726,7 +7740,7 @@ Branch: REL9_4_STABLE [2897e069c] 2015-03-30 13:05:35 -0400
 
     <listitem>
      <para>
-      Fix crash in <function>BackendIdGetTransactionIds()</> when trying
+      Fix crash in <function>BackendIdGetTransactionIds()</function> when trying
       to get status for a backend process that just exited (Tom Lane)
      </para>
     </listitem>
@@ -6743,13 +7757,13 @@ Branch: REL9_0_STABLE [87b7fcc87] 2015-02-23 16:14:16 +0100
 
     <listitem>
      <para>
-      Cope with unexpected signals in <function>LockBufferForCleanup()</>
+      Cope with unexpected signals in <function>LockBufferForCleanup()</function>
       (Andres Freund)
      </para>
 
      <para>
       This oversight could result in spurious errors about <quote>multiple
-      backends attempting to wait for pincount 1</>.
+      backends attempting to wait for pincount 1</quote>.
      </para>
     </listitem>
 
@@ -6763,7 +7777,7 @@ Branch: REL9_2_STABLE [effcaa4c2] 2015-02-15 23:26:46 -0500
 
     <listitem>
      <para>
-      Fix crash when doing <literal>COPY IN</> to a table with check
+      Fix crash when doing <literal>COPY IN</literal> to a table with check
       constraints that contain whole-row references (Tom Lane)
      </para>
 
@@ -6808,7 +7822,7 @@ Branch: REL9_4_STABLE [16be9737c] 2015-03-23 16:52:17 +0100
 
     <listitem>
      <para>
-      Avoid busy-waiting with short <literal>recovery_min_apply_delay</>
+      Avoid busy-waiting with short <literal>recovery_min_apply_delay</literal>
       values (Andres Freund)
      </para>
     </listitem>
@@ -6874,9 +7888,9 @@ Branch: REL9_0_STABLE [152c94632] 2015-03-29 15:04:38 -0400
      </para>
 
      <para>
-      <command>ANALYZE</> executes index expressions many times; if there are
+      <command>ANALYZE</command> executes index expressions many times; if there are
       slow functions in such an expression, it's desirable to be able to
-      cancel the <command>ANALYZE</> before that loop finishes.
+      cancel the <command>ANALYZE</command> before that loop finishes.
      </para>
     </listitem>
 
@@ -6891,10 +7905,10 @@ Branch: REL9_1_STABLE [4a4fd2b0c] 2015-03-12 13:38:49 -0400
 
     <listitem>
      <para>
-      Ensure <structfield>tableoid</> of a foreign table is reported
-      correctly when a <literal>READ COMMITTED</> recheck occurs after
-      locking rows in <command>SELECT FOR UPDATE</>, <command>UPDATE</>,
-      or <command>DELETE</> (Etsuro Fujita)
+      Ensure <structfield>tableoid</structfield> of a foreign table is reported
+      correctly when a <literal>READ COMMITTED</literal> recheck occurs after
+      locking rows in <command>SELECT FOR UPDATE</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> (Etsuro Fujita)
      </para>
     </listitem>
 
@@ -6940,14 +7954,14 @@ Branch: REL9_0_STABLE [c981e5999] 2015-05-08 19:40:15 -0400
 
     <listitem>
      <para>
-      Recommend setting <literal>include_realm</> to 1 when using
+      Recommend setting <literal>include_realm</literal> to 1 when using
       Kerberos/GSSAPI/SSPI authentication (Stephen Frost)
      </para>
 
      <para>
       Without this, identically-named users from different realms cannot be
       distinguished.  For the moment this is only a documentation change, but
-      it will become the default setting in <productname>PostgreSQL</> 9.5.
+      it will become the default setting in <productname>PostgreSQL</productname> 9.5.
      </para>
     </listitem>
 
@@ -6970,7 +7984,7 @@ Branch: REL9_0_STABLE [e48ce4f33] 2015-02-17 12:49:18 -0500
 
     <listitem>
      <para>
-      Remove code for matching IPv4 <filename>pg_hba.conf</> entries to
+      Remove code for matching IPv4 <filename>pg_hba.conf</filename> entries to
       IPv4-in-IPv6 addresses (Tom Lane)
      </para>
 
@@ -6983,7 +7997,7 @@ Branch: REL9_0_STABLE [e48ce4f33] 2015-02-17 12:49:18 -0500
       crashes on some systems, so let's just remove it rather than fix it.
       (Had we chosen to fix it, that would make for a subtle and potentially
       security-sensitive change in the effective meaning of
-      IPv4 <filename>pg_hba.conf</> entries, which does not seem like a good
+      IPv4 <filename>pg_hba.conf</filename> entries, which does not seem like a good
       thing to do in minor releases.)
      </para>
     </listitem>
@@ -7010,7 +8024,7 @@ Branch: REL9_4_STABLE [a1f4ade01] 2015-04-02 14:39:18 -0400
     <listitem>
      <para>
       After a database crash, don't restart background workers that are
-      marked <literal>BGW_NEVER_RESTART</> (Amit Khandekar)
+      marked <literal>BGW_NEVER_RESTART</literal> (Amit Khandekar)
      </para>
     </listitem>
 
@@ -7025,13 +8039,13 @@ Branch: REL9_1_STABLE [0d36d9f2b] 2015-02-06 11:32:42 +0200
 
     <listitem>
      <para>
-      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</>
+      Report WAL flush, not insert, position in <literal>IDENTIFY_SYSTEM</literal>
       replication command (Heikki Linnakangas)
      </para>
 
      <para>
       This avoids a possible startup failure
-      in <application>pg_receivexlog</>.
+      in <application>pg_receivexlog</application>.
      </para>
     </listitem>
 
@@ -7049,7 +8063,7 @@ Branch: REL9_0_STABLE [78ce2dc8e] 2015-05-07 15:10:01 +0200
      <para>
       While shutting down service on Windows, periodically send status
       updates to the Service Control Manager to prevent it from killing the
-      service too soon; and ensure that <application>pg_ctl</> will wait for
+      service too soon; and ensure that <application>pg_ctl</application> will wait for
       shutdown (Krystian Bigaj)
      </para>
     </listitem>
@@ -7066,7 +8080,7 @@ Branch: REL9_0_STABLE [8878eaaa8] 2015-02-23 13:32:53 +0200
 
     <listitem>
      <para>
-      Reduce risk of network deadlock when using <application>libpq</>'s
+      Reduce risk of network deadlock when using <application>libpq</application>'s
       non-blocking mode (Heikki Linnakangas)
      </para>
 
@@ -7075,12 +8089,12 @@ Branch: REL9_0_STABLE [8878eaaa8] 2015-02-23 13:32:53 +0200
       buffer every so often, in case the server has sent enough response data
       to cause it to block on output.  (A typical scenario is that the server
       is sending a stream of NOTICE messages during <literal>COPY FROM
-      STDIN</>.)  This worked properly in the normal blocking mode, but not
-      so much in non-blocking mode.  We've modified <application>libpq</>
+      STDIN</literal>.)  This worked properly in the normal blocking mode, but not
+      so much in non-blocking mode.  We've modified <application>libpq</application>
       to opportunistically drain input when it can, but a full defense
       against this problem requires application cooperation: the application
       should watch for socket read-ready as well as write-ready conditions,
-      and be sure to call <function>PQconsumeInput()</> upon read-ready.
+      and be sure to call <function>PQconsumeInput()</function> upon read-ready.
      </para>
     </listitem>
 
@@ -7094,7 +8108,7 @@ Branch: REL9_2_STABLE [83c3115dd] 2015-02-21 12:59:43 -0500
 
     <listitem>
      <para>
-      In <application>libpq</>, fix misparsing of empty values in URI
+      In <application>libpq</application>, fix misparsing of empty values in URI
       connection strings (Thomas Fanghaenel)
      </para>
     </listitem>
@@ -7111,7 +8125,7 @@ Branch: REL9_0_STABLE [ce2fcc58e] 2015-02-11 11:30:11 +0100
 
     <listitem>
      <para>
-      Fix array handling in <application>ecpg</> (Michael Meskes)
+      Fix array handling in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
@@ -7127,8 +8141,8 @@ Branch: REL9_0_STABLE [557fcfae3] 2015-04-01 20:00:07 -0300
 
     <listitem>
      <para>
-      Fix <application>psql</> to sanely handle URIs and conninfo strings as
-      the first parameter to <command>\connect</>
+      Fix <application>psql</application> to sanely handle URIs and conninfo strings as
+      the first parameter to <command>\connect</command>
       (David Fetter, Andrew Dunstan, &Aacute;lvaro Herrera)
      </para>
 
@@ -7151,17 +8165,17 @@ Branch: REL9_0_STABLE [396ef6fd8] 2015-03-14 13:43:26 -0400
 
     <listitem>
      <para>
-      Suppress incorrect complaints from <application>psql</> on some
-      platforms that it failed to write <filename>~/.psql_history</> at exit
+      Suppress incorrect complaints from <application>psql</application> on some
+      platforms that it failed to write <filename>~/.psql_history</filename> at exit
       (Tom Lane)
      </para>
 
      <para>
       This misbehavior was caused by a workaround for a bug in very old
-      (pre-2006) versions of <application>libedit</>.  We fixed it by
+      (pre-2006) versions of <application>libedit</application>.  We fixed it by
       removing the workaround, which will cause a similar failure to appear
-      for anyone still using such versions of <application>libedit</>.
-      Recommendation: upgrade that library, or use <application>libreadline</>.
+      for anyone still using such versions of <application>libedit</application>.
+      Recommendation: upgrade that library, or use <application>libreadline</application>.
      </para>
     </listitem>
 
@@ -7177,7 +8191,7 @@ Branch: REL9_0_STABLE [8e70f3c40] 2015-02-10 22:38:29 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</>'s rule for deciding which casts are
+      Fix <application>pg_dump</application>'s rule for deciding which casts are
       system-provided casts that should not be dumped (Tom Lane)
      </para>
     </listitem>
@@ -7193,8 +8207,8 @@ Branch: REL9_1_STABLE [b0d53b2e3] 2015-02-18 11:43:00 -0500
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix failure to honor <literal>-Z</>
-      compression level option together with <literal>-Fd</>
+      In <application>pg_dump</application>, fix failure to honor <literal>-Z</literal>
+      compression level option together with <literal>-Fd</literal>
       (Michael Paquier)
      </para>
     </listitem>
@@ -7210,7 +8224,7 @@ Branch: REL9_1_STABLE [dcb467b8e] 2015-03-02 14:12:43 -0500
 
     <listitem>
      <para>
-      Make <application>pg_dump</> consider foreign key relationships
+      Make <application>pg_dump</application> consider foreign key relationships
       between extension configuration tables while choosing dump order
       (Gilles Darold, Michael Paquier, Stephen Frost)
      </para>
@@ -7230,7 +8244,7 @@ Branch: REL9_3_STABLE [d645273cf] 2015-03-06 13:27:46 -0500
 
     <listitem>
      <para>
-      Avoid possible <application>pg_dump</> failure when concurrent sessions
+      Avoid possible <application>pg_dump</application> failure when concurrent sessions
       are creating and dropping temporary functions (Tom Lane)
      </para>
     </listitem>
@@ -7247,7 +8261,7 @@ Branch: REL9_0_STABLE [7a501bcbf] 2015-02-25 12:01:12 -0500
 
     <listitem>
      <para>
-      Fix dumping of views that are just <literal>VALUES(...)</> but have
+      Fix dumping of views that are just <literal>VALUES(...)</literal> but have
       column aliases (Tom Lane)
      </para>
     </listitem>
@@ -7261,7 +8275,7 @@ Branch: REL9_4_STABLE [70fac4844] 2015-05-01 13:03:23 -0400
     <listitem>
      <para>
       Ensure that a view's replication identity is correctly set
-      to <literal>nothing</> during dump/restore (Marko Tiikkaja)
+      to <literal>nothing</literal> during dump/restore (Marko Tiikkaja)
      </para>
 
      <para>
@@ -7285,7 +8299,7 @@ Branch: REL9_3_STABLE [4e9935979] 2015-05-16 15:16:28 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, force timeline 1 in the new cluster
+      In <application>pg_upgrade</application>, force timeline 1 in the new cluster
       (Bruce Momjian)
      </para>
 
@@ -7307,7 +8321,7 @@ Branch: REL9_0_STABLE [2194aa92b] 2015-05-16 00:10:03 -0400
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check for improperly non-connectable
+      In <application>pg_upgrade</application>, check for improperly non-connectable
       databases before proceeding
       (Bruce Momjian)
      </para>
@@ -7325,8 +8339,8 @@ Branch: REL9_0_STABLE [4ae178f60] 2015-02-11 22:06:04 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, quote directory paths
-      properly in the generated <literal>delete_old_cluster</> script
+      In <application>pg_upgrade</application>, quote directory paths
+      properly in the generated <literal>delete_old_cluster</literal> script
       (Bruce Momjian)
      </para>
     </listitem>
@@ -7343,14 +8357,14 @@ Branch: REL9_0_STABLE [85dac37ee] 2015-02-11 21:02:06 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, preserve database-level freezing info
+      In <application>pg_upgrade</application>, preserve database-level freezing info
       properly
       (Bruce Momjian)
      </para>
 
      <para>
       This oversight could cause missing-clog-file errors for tables within
-      the <literal>postgres</> and <literal>template1</> databases.
+      the <literal>postgres</literal> and <literal>template1</literal> databases.
      </para>
     </listitem>
 
@@ -7366,7 +8380,7 @@ Branch: REL9_0_STABLE [bf22a8e58] 2015-03-30 17:18:10 -0400
 
     <listitem>
      <para>
-      Run <application>pg_upgrade</> and <application>pg_resetxlog</> with
+      Run <application>pg_upgrade</application> and <application>pg_resetxlog</application> with
       restricted privileges on Windows, so that they don't fail when run by
       an administrator (Muhammad Asif Naeem)
      </para>
@@ -7384,8 +8398,8 @@ Branch: REL9_1_STABLE [d7d294f59] 2015-02-17 11:08:40 -0500
 
     <listitem>
      <para>
-      Improve handling of <function>readdir()</> failures when scanning
-      directories in <application>initdb</> and <application>pg_basebackup</>
+      Improve handling of <function>readdir()</function> failures when scanning
+      directories in <application>initdb</application> and <application>pg_basebackup</application>
       (Marco Nenciarini)
      </para>
     </listitem>
@@ -7402,7 +8416,7 @@ Branch: REL9_0_STABLE [40b0c10b7] 2015-03-15 23:22:03 -0400
 
     <listitem>
      <para>
-      Fix slow sorting algorithm in <filename>contrib/intarray</> (Tom Lane)
+      Fix slow sorting algorithm in <filename>contrib/intarray</filename> (Tom Lane)
      </para>
     </listitem>
 
@@ -7450,7 +8464,7 @@ Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015d
+      Update time zone data files to <application>tzdata</application> release 2015d
       for DST law changes in Egypt, Mongolia, and Palestine, plus historical
       changes in Canada and Chile.  Also adopt revised zone abbreviations for
       the America/Adak zone (HST/HDT not HAST/HADT).
@@ -7473,7 +8487,7 @@ Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
   <para>
    This release contains a variety of fixes from 9.4.0.
    For information about new features in the 9.4 major release, see
-   <xref linkend="release-9-4">.
+   <xref linkend="release-9-4"/>.
   </para>
 
   <sect2>
@@ -7485,12 +8499,12 @@ Branch: REL9_0_STABLE [3c3749a3b] 2015-05-15 19:36:20 -0400
 
    <para>
     However, if you are a Windows user and are using the <quote>Norwegian
-    (Bokm&aring;l)</> locale, manual action is needed after the upgrade to
-    replace any <quote>Norwegian (Bokm&aring;l)_Norway</>
-    or <quote>norwegian-bokmal</> locale names stored
-    in <productname>PostgreSQL</> system catalogs with the plain-ASCII
-    alias <quote>Norwegian_Norway</>.  For details see
-    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></>
+    (Bokm&aring;l)</quote> locale, manual action is needed after the upgrade to
+    replace any <quote>Norwegian (Bokm&aring;l)_Norway</quote>
+    or <quote>norwegian-bokmal</quote> locale names stored
+    in <productname>PostgreSQL</productname> system catalogs with the plain-ASCII
+    alias <quote>Norwegian_Norway</quote>.  For details see
+    <ulink url="http://wiki.postgresql.org/wiki/Changes_To_Norwegian_Locale"></ulink>
    </para>
   </sect2>
 
@@ -7518,15 +8532,15 @@ Branch: REL9_0_STABLE [56b970f2e] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <function>to_char()</>
+      Fix buffer overruns in <function>to_char()</function>
       (Bruce Momjian)
      </para>
 
      <para>
-      When <function>to_char()</> processes a numeric formatting template
-      calling for a large number of digits, <productname>PostgreSQL</>
+      When <function>to_char()</function> processes a numeric formatting template
+      calling for a large number of digits, <productname>PostgreSQL</productname>
       would read past the end of a buffer.  When processing a crafted
-      timestamp formatting template, <productname>PostgreSQL</> would write
+      timestamp formatting template, <productname>PostgreSQL</productname> would write
       past the end of a buffer.  Either case could crash the server.
       We have not ruled out the possibility of attacks that lead to
       privilege escalation, though they seem unlikely.
@@ -7546,27 +8560,27 @@ Branch: REL9_0_STABLE [9e05c5063] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overrun in replacement <function>*printf()</> functions
+      Fix buffer overrun in replacement <function>*printf()</function> functions
       (Tom Lane)
      </para>
 
      <para>
-      <productname>PostgreSQL</> includes a replacement implementation
-      of <function>printf</> and related functions.  This code will overrun
+      <productname>PostgreSQL</productname> includes a replacement implementation
+      of <function>printf</function> and related functions.  This code will overrun
       a stack buffer when formatting a floating point number (conversion
-      specifiers <literal>e</>, <literal>E</>, <literal>f</>, <literal>F</>,
-      <literal>g</> or <literal>G</>) with requested precision greater than
+      specifiers <literal>e</literal>, <literal>E</literal>, <literal>f</literal>, <literal>F</literal>,
+      <literal>g</literal> or <literal>G</literal>) with requested precision greater than
       about 500.  This will crash the server, and we have not ruled out the
       possibility of attacks that lead to privilege escalation.
       A database user can trigger such a buffer overrun through
-      the <function>to_char()</> SQL function.  While that is the only
-      affected core <productname>PostgreSQL</> functionality, extension
+      the <function>to_char()</function> SQL function.  While that is the only
+      affected core <productname>PostgreSQL</productname> functionality, extension
       modules that use printf-family functions may be at risk as well.
      </para>
 
      <para>
-      This issue primarily affects <productname>PostgreSQL</> on Windows.
-      <productname>PostgreSQL</> uses the system implementation of these
+      This issue primarily affects <productname>PostgreSQL</productname> on Windows.
+      <productname>PostgreSQL</productname> uses the system implementation of these
       functions where adequate, which it is on other modern platforms.
       (CVE-2015-0242)
      </para>
@@ -7591,12 +8605,12 @@ Branch: REL9_0_STABLE [0a3ee8a5f] 2015-02-02 10:00:52 -0500
 
     <listitem>
      <para>
-      Fix buffer overruns in <filename>contrib/pgcrypto</>
+      Fix buffer overruns in <filename>contrib/pgcrypto</filename>
       (Marko Tiikkaja, Noah Misch)
      </para>
 
      <para>
-      Errors in memory size tracking within the <filename>pgcrypto</>
+      Errors in memory size tracking within the <filename>pgcrypto</filename>
       module permitted stack buffer overruns and improper dependence on the
       contents of uninitialized memory.  The buffer overrun cases can
       crash the server, and we have not ruled out the possibility of
@@ -7657,7 +8671,7 @@ Branch: REL9_0_STABLE [3a2063369] 2015-01-28 12:33:29 -0500
      <para>
       Some server error messages show the values of columns that violate
       a constraint, such as a unique constraint.  If the user does not have
-      <literal>SELECT</> privilege on all columns of the table, this could
+      <literal>SELECT</literal> privilege on all columns of the table, this could
       mean exposing values that the user should not be able to see.  Adjust
       the code so that values are displayed only when they came from the SQL
       command or could be selected by the user.
@@ -7706,20 +8720,20 @@ Branch: REL9_2_STABLE [6bf343c6e] 2015-01-16 13:10:23 +0200
 
     <listitem>
      <para>
-      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</>
+      Cope with the Windows locale named <quote>Norwegian (Bokm&aring;l)</quote>
       (Heikki Linnakangas)
      </para>
 
      <para>
       Non-ASCII locale names are problematic since it's not clear what
       encoding they should be represented in.  Map the troublesome locale
-      name to a plain-ASCII alias, <quote>Norwegian_Norway</>.
+      name to a plain-ASCII alias, <quote>Norwegian_Norway</quote>.
      </para>
 
      <para>
-      9.4.0 mapped the troublesome name to <quote>norwegian-bokmal</>,
+      9.4.0 mapped the troublesome name to <quote>norwegian-bokmal</quote>,
       but that turns out not to work on all Windows configurations.
-      <quote>Norwegian_Norway</> is now recommended instead.
+      <quote>Norwegian_Norway</quote> is now recommended instead.
      </para>
     </listitem>
 
@@ -7740,7 +8754,7 @@ Branch: REL9_0_STABLE [5308e085b] 2015-01-15 18:52:38 -0500
      </para>
 
      <para>
-      In <literal>READ COMMITTED</> mode, queries that lock or update
+      In <literal>READ COMMITTED</literal> mode, queries that lock or update
       recently-updated rows could crash as a result of this bug.
      </para>
     </listitem>
@@ -7769,8 +8783,8 @@ Branch: REL9_3_STABLE [54a8abc2b] 2015-01-04 15:48:29 -0300
     <listitem>
      <para>
       Fix failure to wait when a transaction tries to acquire a <literal>FOR
-      NO KEY EXCLUSIVE</> tuple lock, while multiple other transactions
-      currently hold <literal>FOR SHARE</> locks (&Aacute;lvaro Herrera)
+      NO KEY EXCLUSIVE</literal> tuple lock, while multiple other transactions
+      currently hold <literal>FOR SHARE</literal> locks (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
@@ -7783,7 +8797,7 @@ Branch: REL9_3_STABLE [939f0fb67] 2015-01-15 13:18:19 -0500
 
     <listitem>
      <para>
-      Improve performance of <command>EXPLAIN</> with large range tables
+      Improve performance of <command>EXPLAIN</command> with large range tables
       (Tom Lane)
      </para>
     </listitem>
@@ -7796,41 +8810,41 @@ Branch: REL9_4_STABLE [4cbf390d5] 2015-01-30 14:44:49 -0500
 
     <listitem>
      <para>
-      Fix <type>jsonb</> Unicode escape processing, and in consequence
-      disallow <literal>\u0000</> (Tom Lane)
+      Fix <type>jsonb</type> Unicode escape processing, and in consequence
+      disallow <literal>\u0000</literal> (Tom Lane)
      </para>
 
      <para>
-      Previously, the JSON Unicode escape <literal>\u0000</> was accepted
+      Previously, the JSON Unicode escape <literal>\u0000</literal> was accepted
       and was stored as those six characters; but that is indistinguishable
-      from what is stored for the input <literal>\\u0000</>, resulting in
+      from what is stored for the input <literal>\\u0000</literal>, resulting in
       ambiguity.  Moreover, in cases where de-escaped textual output is
-      expected, such as the <literal>-&gt;&gt;</> operator, the sequence was
-      printed as <literal>\u0000</>, which does not meet the expectation
+      expected, such as the <literal>-&gt;&gt;</literal> operator, the sequence was
+      printed as <literal>\u0000</literal>, which does not meet the expectation
       that JSON escaping would be removed.  (Consistent behavior would
-      require emitting a zero byte, but <productname>PostgreSQL</> does not
+      require emitting a zero byte, but <productname>PostgreSQL</productname> does not
       support zero bytes embedded in text strings.)  9.4.0 included an
       ill-advised attempt to improve this situation by adjusting JSON output
       conversion rules; but of course that could not fix the fundamental
       ambiguity, and it turned out to break other usages of Unicode escape
       sequences.  Revert that, and to avoid the core problem,
-      reject <literal>\u0000</> in <type>jsonb</> input.
+      reject <literal>\u0000</literal> in <type>jsonb</type> input.
      </para>
 
      <para>
-      If a <type>jsonb</> column contains a <literal>\u0000</> value stored
+      If a <type>jsonb</type> column contains a <literal>\u0000</literal> value stored
       with 9.4.0, it will henceforth read out as though it
-      were <literal>\\u0000</>, which is the other valid interpretation of
+      were <literal>\\u0000</literal>, which is the other valid interpretation of
       the data stored by 9.4.0 for this case.
      </para>
 
      <para>
-      The <type>json</> type did not have the storage-ambiguity problem, but
+      The <type>json</type> type did not have the storage-ambiguity problem, but
       it did have the problem of inconsistent de-escaped textual output.
-      Therefore <literal>\u0000</> will now also be rejected
-      in <type>json</> values when conversion to de-escaped form is
+      Therefore <literal>\u0000</literal> will now also be rejected
+      in <type>json</type> values when conversion to de-escaped form is
       required.  This change does not break the ability to
-      store <literal>\u0000</> in <type>json</> columns so long as no
+      store <literal>\u0000</literal> in <type>json</type> columns so long as no
       processing is done on the values.  This is exactly parallel to the
       cases in which non-ASCII Unicode escapes are allowed when the database
       encoding is not UTF8.
@@ -7849,14 +8863,14 @@ Branch: REL9_0_STABLE [cebb3f032] 2015-01-17 22:37:32 -0500
 
     <listitem>
      <para>
-      Fix namespace handling in <function>xpath()</> (Ali Akbar)
+      Fix namespace handling in <function>xpath()</function> (Ali Akbar)
      </para>
 
      <para>
-      Previously, the <type>xml</> value resulting from
-      an <function>xpath()</> call would not have namespace declarations if
+      Previously, the <type>xml</type> value resulting from
+      an <function>xpath()</function> call would not have namespace declarations if
       the namespace declarations were attached to an ancestor element in the
-      input <type>xml</> value, rather than to the specific element being
+      input <type>xml</type> value, rather than to the specific element being
       returned.  Propagate the ancestral declaration so that the result is
       correct when considered in isolation.
      </para>
@@ -7876,7 +8890,7 @@ Branch: REL9_3_STABLE [527ff8baf] 2015-01-30 12:30:43 -0500
      </para>
 
      <para>
-      This patch fixes corner-case <quote>unexpected operator NNNN</> planner
+      This patch fixes corner-case <quote>unexpected operator NNNN</quote> planner
       errors, and improves the selectivity estimates for some other cases.
      </para>
     </listitem>
@@ -7894,7 +8908,7 @@ Branch: REL9_4_STABLE [4e241f7cd] 2014-12-30 14:53:03 +0200
      </para>
 
      <para>
-      9.4.0 could fail with <quote>index row size exceeds maximum</> errors
+      9.4.0 could fail with <quote>index row size exceeds maximum</quote> errors
       for data that previous versions would accept.
      </para>
     </listitem>
@@ -7924,7 +8938,7 @@ Branch: REL9_1_STABLE [37e0f13f2] 2015-01-29 19:37:22 +0200
     <listitem>
      <para>
       Fix possible crash when using
-      nonzero <varname>gin_fuzzy_search_limit</> (Heikki Linnakangas)
+      nonzero <varname>gin_fuzzy_search_limit</varname> (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -7952,7 +8966,7 @@ Branch: REL9_4_STABLE [b337d9657] 2015-01-15 20:52:18 +0200
     <listitem>
      <para>
       Fix incorrect replay of WAL parameter change records that report
-      changes in the <varname>wal_log_hints</> setting (Petr Jelinek)
+      changes in the <varname>wal_log_hints</varname> setting (Petr Jelinek)
      </para>
     </listitem>
 
@@ -7968,7 +8982,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
 
     <listitem>
      <para>
-      Change <quote>pgstat wait timeout</> warning message to be LOG level,
+      Change <quote>pgstat wait timeout</quote> warning message to be LOG level,
       and rephrase it to be more understandable (Tom Lane)
      </para>
 
@@ -7977,7 +8991,7 @@ Branch: REL9_0_STABLE [a1a8d0249] 2015-01-19 23:01:46 -0500
       case, but it occurs often enough on our slower buildfarm members to be
       a nuisance.  Reduce it to LOG level, and expend a bit more effort on
       the wording: it now reads <quote>using stale statistics instead of
-      current ones because stats collector is not responding</>.
+      current ones because stats collector is not responding</quote>.
      </para>
     </listitem>
 
@@ -7993,7 +9007,7 @@ Branch: REL9_0_STABLE [2e4946169] 2015-01-07 22:46:20 -0500
 
     <listitem>
      <para>
-      Warn if macOS's <function>setlocale()</> starts an unwanted extra
+      Warn if macOS's <function>setlocale()</function> starts an unwanted extra
       thread inside the postmaster (Noah Misch)
      </para>
     </listitem>
@@ -8006,18 +9020,18 @@ Branch: REL9_4_STABLE [733728ff3] 2015-01-11 12:35:47 -0500
 
     <listitem>
      <para>
-      Fix <application>libpq</>'s behavior when <filename>/etc/passwd</>
+      Fix <application>libpq</application>'s behavior when <filename>/etc/passwd</filename>
       isn't readable (Tom Lane)
      </para>
 
      <para>
-      While doing <function>PQsetdbLogin()</>, <application>libpq</>
+      While doing <function>PQsetdbLogin()</function>, <application>libpq</application>
       attempts to ascertain the user's operating system name, which on most
-      Unix platforms involves reading <filename>/etc/passwd</>.  As of 9.4,
+      Unix platforms involves reading <filename>/etc/passwd</filename>.  As of 9.4,
       failure to do that was treated as a hard error.  Restore the previous
       behavior, which was to fail only if the application does not provide a
       database role name to connect as.  This supports operation in chroot
-      environments that lack an <filename>/etc/passwd</> file.
+      environments that lack an <filename>/etc/passwd</filename> file.
      </para>
     </listitem>
 
@@ -8033,17 +9047,17 @@ Branch: REL9_0_STABLE [2600e4436] 2014-12-31 12:17:12 -0500
 
     <listitem>
      <para>
-      Improve consistency of parsing of <application>psql</>'s special
+      Improve consistency of parsing of <application>psql</application>'s special
       variables (Tom Lane)
      </para>
 
      <para>
-      Allow variant spellings of <literal>on</> and <literal>off</> (such
-      as <literal>1</>/<literal>0</>) for <literal>ECHO_HIDDEN</>
-      and <literal>ON_ERROR_ROLLBACK</>.  Report a warning for unrecognized
-      values for <literal>COMP_KEYWORD_CASE</>, <literal>ECHO</>,
-      <literal>ECHO_HIDDEN</>, <literal>HISTCONTROL</>,
-      <literal>ON_ERROR_ROLLBACK</>, and <literal>VERBOSITY</>.  Recognize
+      Allow variant spellings of <literal>on</literal> and <literal>off</literal> (such
+      as <literal>1</literal>/<literal>0</literal>) for <literal>ECHO_HIDDEN</literal>
+      and <literal>ON_ERROR_ROLLBACK</literal>.  Report a warning for unrecognized
+      values for <literal>COMP_KEYWORD_CASE</literal>, <literal>ECHO</literal>,
+      <literal>ECHO_HIDDEN</literal>, <literal>HISTCONTROL</literal>,
+      <literal>ON_ERROR_ROLLBACK</literal>, and <literal>VERBOSITY</literal>.  Recognize
       all values for all these variables case-insensitively; previously
       there was a mishmash of case-sensitive and case-insensitive behaviors.
      </para>
@@ -8058,7 +9072,7 @@ Branch: REL9_3_STABLE [bb1e2426b] 2015-01-05 19:27:09 -0500
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to handle comments on event triggers
+      Fix <application>pg_dump</application> to handle comments on event triggers
       without failing (Tom Lane)
      </para>
     </listitem>
@@ -8072,8 +9086,8 @@ Branch: REL9_3_STABLE [cc609c46f] 2015-01-30 09:01:36 -0600
 
     <listitem>
      <para>
-      Allow parallel <application>pg_dump</> to
-      use <option>--serializable-deferrable</> (Kevin Grittner)
+      Allow parallel <application>pg_dump</application> to
+      use <option>--serializable-deferrable</option> (Kevin Grittner)
      </para>
     </listitem>
 
@@ -8088,7 +9102,7 @@ Branch: REL9_1_STABLE [2a0bfa4d6] 2015-01-03 20:54:13 +0100
 
     <listitem>
      <para>
-      Prevent WAL files created by <literal>pg_basebackup -x/-X</> from
+      Prevent WAL files created by <literal>pg_basebackup -x/-X</literal> from
       being archived again when the standby is promoted (Andres Freund)
      </para>
     </listitem>
@@ -8106,12 +9120,12 @@ Branch: REL9_0_STABLE [dc9a506e6] 2015-01-29 20:18:46 -0500
     <listitem>
      <para>
       Handle unexpected query results, especially NULLs, safely in
-      <filename>contrib/tablefunc</>'s <function>connectby()</>
+      <filename>contrib/tablefunc</filename>'s <function>connectby()</function>
       (Michael Paquier)
      </para>
 
      <para>
-      <function>connectby()</> previously crashed if it encountered a NULL
+      <function>connectby()</function> previously crashed if it encountered a NULL
       key value.  It now prints that row but doesn't recurse further.
      </para>
     </listitem>
@@ -8205,14 +9219,14 @@ Branch: REL9_4_STABLE [adb355106] 2015-01-14 11:08:17 -0500
 
     <listitem>
      <para>
-      Allow <varname>CFLAGS</> from <application>configure</>'s environment
-      to override automatically-supplied <varname>CFLAGS</> (Tom Lane)
+      Allow <varname>CFLAGS</varname> from <application>configure</application>'s environment
+      to override automatically-supplied <varname>CFLAGS</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <application>configure</> would add any switches that it
+      Previously, <application>configure</application> would add any switches that it
       chose of its own accord to the end of the
-      user-specified <varname>CFLAGS</> string.  Since most compilers
+      user-specified <varname>CFLAGS</varname> string.  Since most compilers
       process switches left-to-right, this meant that configure's choices
       would override the user-specified flags in case of conflicts.  That
       should work the other way around, so adjust the logic to put the
@@ -8232,13 +9246,13 @@ Branch: REL9_0_STABLE [338ff75fc] 2015-01-19 23:44:33 -0500
 
     <listitem>
      <para>
-      Make <application>pg_regress</> remove any temporary installation it
+      Make <application>pg_regress</application> remove any temporary installation it
       created upon successful exit (Tom Lane)
      </para>
 
      <para>
       This results in a very substantial reduction in disk space usage
-      during <literal>make check-world</>, since that sequence involves
+      during <literal>make check-world</literal>, since that sequence involves
       creation of numerous temporary installations.
      </para>
     </listitem>
@@ -8264,7 +9278,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2015a
+      Update time zone data files to <application>tzdata</application> release 2015a
       for DST law changes in Chile and Mexico, plus historical changes in
       Iceland.
      </para>
@@ -8287,7 +9301,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.4 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.4 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -8296,35 +9310,35 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-       Add <link linkend="datatype-json"><type>jsonb</></link>, a more
-       capable and efficient data type for storing <acronym>JSON</> data
+       Add <link linkend="datatype-json"><type>jsonb</type></link>, a more
+       capable and efficient data type for storing <acronym>JSON</acronym> data
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add new <acronym>SQL</> command <xref linkend="SQL-ALTERSYSTEM">
-       for changing <filename>postgresql.conf</> configuration file entries
+       Add new <acronym>SQL</acronym> command <xref linkend="sql-altersystem"/>
+       for changing <filename>postgresql.conf</filename> configuration file entries
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Reduce lock strength for some <xref linkend="SQL-ALTERTABLE">
+       Reduce lock strength for some <xref linkend="sql-altertable"/>
        commands
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Allow <link linkend="rules-materializedviews">materialized views</>
+       Allow <link linkend="rules-materializedviews">materialized views</link>
        to be refreshed without blocking concurrent reads
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Add support for <link linkend="logicaldecoding">logical decoding</>
+       Add support for <link linkend="logicaldecoding">logical decoding</link>
        of WAL data, to allow database changes to be streamed out in a
        customizable format
       </para>
@@ -8332,7 +9346,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-        Allow <link linkend="bgworker">background worker processes</>
+        Allow <link linkend="bgworker">background worker processes</link>
         to be dynamically registered, started and terminated
       </para>
      </listitem>
@@ -8350,8 +9364,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
   <title>Migration to Version 9.4</title>
 
    <para>
-    A dump/restore using <xref linkend="app-pg-dumpall">, or use
-    of <xref linkend="pgupgrade">, is required for those wishing to migrate
+    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 release.
    </para>
 
@@ -8371,24 +9385,24 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       Previously, an input array string that started with a single-element
       sub-array could later contain multi-element sub-arrays,
-      e.g. <literal>'{{1}, {2,3}}'::int[]</> would be accepted.
+      e.g. <literal>'{{1}, {2,3}}'::int[]</literal> would be accepted.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      When converting values of type <type>date</>, <type>timestamp</>
-      or <type>timestamptz</>
+      When converting values of type <type>date</type>, <type>timestamp</type>
+      or <type>timestamptz</type>
       to <link linkend="datatype-json"><type>JSON</type></link>, render the
       values in a format compliant with ISO 8601 (Andrew Dunstan)
      </para>
 
      <para>
       Previously such values were rendered according to the current
-      <xref linkend="guc-datestyle"> setting; but many JSON processors
+      <xref linkend="guc-datestyle"/> setting; but many JSON processors
       require timestamps to be in ISO 8601 format.  If necessary, the
       previous behavior can be obtained by explicitly casting the datetime
-      value to <type>text</> before passing it to the JSON conversion
+      value to <type>text</type> before passing it to the JSON conversion
       function.
      </para>
     </listitem>
@@ -8396,15 +9410,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       The <link linkend="functions-json-op-table"><type>json</type>
-      <literal>#&gt;</> <type>text[]</></link> path extraction operator now
+      <literal>#&gt;</literal> <type>text[]</type></link> path extraction operator now
       returns its lefthand input, not NULL, if the array is empty (Tom Lane)
      </para>
 
      <para>
       This is consistent with the notion that this represents zero
       applications of the simple field/element extraction
-      operator <literal>-&gt;</>.  Similarly, <type>json</type>
-      <literal>#&gt;&gt;</> <type>text[]</> with an empty array merely
+      operator <literal>-&gt;</literal>.  Similarly, <type>json</type>
+      <literal>#&gt;&gt;</literal> <type>text[]</type> with an empty array merely
       coerces its lefthand input to text.
      </para>
     </listitem>
@@ -8429,26 +9443,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Cause consecutive whitespace in <link
-      linkend="functions-formatting-table"><function>to_timestamp()</></link>
-      and <function>to_date()</> format strings to consume a corresponding
+      linkend="functions-formatting-table"><function>to_timestamp()</function></link>
+      and <function>to_date()</function> format strings to consume a corresponding
       number of characters in the input string (whitespace or not), then
-      conditionally consume adjacent whitespace, if not in <literal>FX</>
+      conditionally consume adjacent whitespace, if not in <literal>FX</literal>
       mode (Jeevan Chalke)
      </para>
 
      <para>
-      Previously, consecutive whitespace characters in a non-<literal>FX</>
+      Previously, consecutive whitespace characters in a non-<literal>FX</literal>
       format string behaved like a single whitespace character and consumed
       all adjacent whitespace in the input string.  For example, previously
       a format string of three spaces would consume only the first space in
-      <literal>' 12'</>, but it will now consume all three characters.
+      <literal>' 12'</literal>, but it will now consume all three characters.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix <link
-      linkend="textsearch-functions-table"><function>ts_rank_cd()</></link>
+      linkend="textsearch-functions-table"><function>ts_rank_cd()</function></link>
       to ignore stripped lexemes (Alex Hill)
      </para>
 
@@ -8462,15 +9476,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       For functions declared to
       take <link linkend="xfunc-sql-variadic-functions"><literal>VARIADIC
-      "any"</></link>, an actual parameter marked as <literal>VARIADIC</>
+      "any"</literal></link>, an actual parameter marked as <literal>VARIADIC</literal>
       must be of a determinable array type (Pavel Stehule)
      </para>
 
      <para>
       Such parameters can no longer be written as an undecorated string
-      literal or <literal>NULL</>; a cast to an appropriate array data type
+      literal or <literal>NULL</literal>; a cast to an appropriate array data type
       will now be required.  Note that this does not affect parameters not
-      marked <literal>VARIADIC</>.
+      marked <literal>VARIADIC</literal>.
      </para>
     </listitem>
 
@@ -8482,8 +9496,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </para>
 
      <para>
-      Constructs like <literal>row_to_json(tab.*)</> now always emit column
-      names that match the column aliases visible for table <literal>tab</>
+      Constructs like <literal>row_to_json(tab.*)</literal> now always emit column
+      names that match the column aliases visible for table <literal>tab</literal>
       at the point of the call.  In previous releases the emitted column
       names would sometimes be the table's actual column names regardless
       of any aliases assigned in the query.
@@ -8492,15 +9506,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      <xref linkend="sql-discard"> now also discards sequence-related state
+      <xref linkend="sql-discard"/> now also discards sequence-related state
       (Fabr&iacute;zio de Royes Mello, Robert Haas)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Rename <link linkend="SQL-EXPLAIN"><command>EXPLAIN
-      ANALYZE</></link>'s <quote>total runtime</quote> output
+      Rename <link linkend="sql-explain"><command>EXPLAIN
+      ANALYZE</command></link>'s <quote>total runtime</quote> output
       to <quote>execution time</quote> (Tom Lane)
      </para>
 
@@ -8512,15 +9526,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      <link linkend="SQL-SHOW"><command>SHOW TIME ZONE</></link> now
-      outputs simple numeric UTC offsets in <acronym>POSIX</> timezone
+      <link linkend="sql-show"><command>SHOW TIME ZONE</command></link> now
+      outputs simple numeric UTC offsets in <acronym>POSIX</acronym> timezone
       format (Tom Lane)
      </para>
 
      <para>
       Previously, such timezone settings were displayed as <link
-      linkend="datatype-interval-output"><type>interval</></link> values.
-      The new output is properly interpreted by <command>SET TIME ZONE</>
+      linkend="datatype-interval-output"><type>interval</type></link> values.
+      The new output is properly interpreted by <command>SET TIME ZONE</command>
       when passed as a simple string, whereas the old output required
       special treatment to be re-parsed correctly.
      </para>
@@ -8529,25 +9543,25 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Foreign data wrappers that support updating foreign tables must
-      consider the possible presence of <literal>AFTER ROW</> triggers
+      consider the possible presence of <literal>AFTER ROW</literal> triggers
       (Noah Misch)
      </para>
 
      <para>
-      When an <literal>AFTER ROW</> trigger is present, all columns of the
+      When an <literal>AFTER ROW</literal> trigger is present, all columns of the
       table must be returned by updating actions, since the trigger might
       inspect any or all of them.  Previously, foreign tables never had
       triggers, so the FDW might optimize away fetching columns not mentioned
-      in the <literal>RETURNING</> clause (if any).
+      in the <literal>RETURNING</literal> clause (if any).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Prevent <link
-      linkend="ddl-constraints-check-constraints"><literal>CHECK</></link>
+      linkend="ddl-constraints-check-constraints"><literal>CHECK</literal></link>
       constraints from referencing system columns, except
-      <structfield>tableoid</> (Amit Kapila)
+      <structfield>tableoid</structfield> (Amit Kapila)
      </para>
 
      <para>
@@ -8565,7 +9579,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <para>
       Previously, there was an undocumented precedence order among
-      the <literal>recovery_target_<replaceable>xxx</></literal> parameters.
+      the <literal>recovery_target_<replaceable>xxx</replaceable></literal> parameters.
      </para>
     </listitem>
 
@@ -8578,15 +9592,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      <para>
       User commands that did their own quote preservation might need
       adjustment.  This is likely to be an issue for commands used in
-      <xref linkend="guc-archive-command">, <xref linkend="restore-command">,
-      and <link linkend="sql-copy"><command>COPY TO/FROM PROGRAM</></link>.
+      <xref linkend="guc-archive-command"/>, <xref linkend="restore-command"/>,
+      and <link linkend="sql-copy"><command>COPY TO/FROM PROGRAM</command></link>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Remove catalog column <link
-      linkend="catalog-pg-class"><structfield>pg_class.reltoastidxid</></link>
+      linkend="catalog-pg-class"><structfield>pg_class.reltoastidxid</structfield></link>
       (Michael Paquier)
      </para>
     </listitem>
@@ -8594,33 +9608,33 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Remove catalog column <link
-      linkend="catalog-pg-rewrite"><structfield>pg_rewrite.ev_attr</></link>
+      linkend="catalog-pg-rewrite"><structfield>pg_rewrite.ev_attr</structfield></link>
       (Kevin Grittner)
      </para>
 
      <para>
       Per-column rules have not been supported since
-      <application>PostgreSQL</> 7.3.
+      <application>PostgreSQL</application> 7.3.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Remove native support for <application>Kerberos</> authentication
-      (<option>--with-krb5</>, etc)
+      Remove native support for <application>Kerberos</application> authentication
+      (<option>--with-krb5</option>, etc)
       (Magnus Hagander)
      </para>
 
      <para>
-      The supported way to use <application>Kerberos</> authentication is
-      with <acronym>GSSAPI</>.  The native code has been deprecated since
-      <productname>PostgreSQL</> 8.3.
+      The supported way to use <application>Kerberos</application> authentication is
+      with <acronym>GSSAPI</acronym>.  The native code has been deprecated since
+      <productname>PostgreSQL</productname> 8.3.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>PL/Python</>, handle domains over arrays like the
+      In <application>PL/Python</application>, handle domains over arrays like the
       underlying array type (Rodolfo Campero)
      </para>
 
@@ -8632,9 +9646,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     <listitem>
      <para>
       Make libpq's <link
-      linkend="libpq-pqconnectdbparams"><function>PQconnectdbParams()</></link>
+      linkend="libpq-pqconnectdbparams"><function>PQconnectdbParams()</function></link>
       and <link
-      linkend="libpq-pqpingparams"><function>PQpingParams()</></link>
+      linkend="libpq-pqpingparams"><function>PQpingParams()</function></link>
       functions process zero-length strings as defaults (Adrian
       Vondendriesch)
      </para>
@@ -8647,27 +9661,27 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
     <listitem>
      <para>
-      Change empty arrays returned by the <xref linkend="intarray"> module
+      Change empty arrays returned by the <xref linkend="intarray"/> module
       to be zero-dimensional arrays (Bruce Momjian)
      </para>
 
      <para>
       Previously, empty arrays were returned as zero-length one-dimensional
       arrays, whose text representation looked the same as zero-dimensional
-      arrays (<literal>{}</>), but they acted differently in array
-      operations.  <application>intarray</>'s behavior in this area now
+      arrays (<literal>{}</literal>), but they acted differently in array
+      operations.  <application>intarray</application>'s behavior in this area now
       matches the built-in array operators.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      <xref linkend="pgupgrade"> now uses <option>-U</>
-      or <option>--username</> to specify the user name (Bruce Momjian)
+      <xref linkend="pgupgrade"/> now uses <option>-U</option>
+      or <option>--username</option> to specify the user name (Bruce Momjian)
      </para>
 
      <para>
-      Previously this option was spelled <option>-u</> or <option>--user</>,
+      Previously this option was spelled <option>-u</option> or <option>--user</option>,
       but that was inconsistent with other tools.
      </para>
     </listitem>
@@ -8697,7 +9711,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        The new <filename>worker_spi</> module shows an example of use
+        The new <filename>worker_spi</filename> module shows an example of use
         of this feature.
        </para>
       </listitem>
@@ -8717,15 +9731,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         During crash recovery or immediate shutdown, send uncatchable
-        termination signals (<systemitem>SIGKILL</>) to child processes
+        termination signals (<systemitem>SIGKILL</systemitem>) to child processes
         that do not shut down promptly (MauMau, &Aacute;lvaro Herrera)
        </para>
 
        <para>
         This reduces the likelihood of leaving orphaned child processes
-        behind after <xref linkend="app-postmaster"> shutdown, as well
+        behind after <xref linkend="app-postmaster"/> shutdown, as well
         as ensuring that crash recovery can proceed if some child processes
-        have become <quote>stuck</>.
+        have become <quote>stuck</quote>.
        </para>
       </listitem>
 
@@ -8737,7 +9751,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <xref linkend="SQL-VACUUM"> properly report dead but
+        Make <xref linkend="sql-vacuum"/> properly report dead but
         not-yet-removable rows to the statistics collector (Hari Babu)
        </para>
 
@@ -8755,14 +9769,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Reduce <link linkend="GIN"><acronym>GIN</></link> index size
+        Reduce <link linkend="gin"><acronym>GIN</acronym></link> index size
         (Alexander Korotkov, Heikki Linnakangas)
        </para>
 
        <para>
-        Indexes upgraded via <xref linkend="pgupgrade"> will work fine
-        but will still be in the old, larger <acronym>GIN</> format.
-        Use <xref linkend="SQL-REINDEX"> to recreate old GIN indexes in the
+        Indexes upgraded via <xref linkend="pgupgrade"/> will work fine
+        but will still be in the old, larger <acronym>GIN</acronym> format.
+        Use <xref linkend="sql-reindex"/> to recreate old GIN indexes in the
         new format.
        </para>
       </listitem>
@@ -8770,16 +9784,16 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of multi-key <link
-        linkend="GIN"><acronym>GIN</></link> lookups (Alexander Korotkov,
+        linkend="gin"><acronym>GIN</acronym></link> lookups (Alexander Korotkov,
         Heikki Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <link linkend="GiST"><acronym>GiST</></link> index support
-        for <link linkend="datatype-inet"><type>inet</></link> and
-        <link linkend="datatype-cidr"><type>cidr</></link> data types
+        Add <link linkend="gist"><acronym>GiST</acronym></link> index support
+        for <link linkend="datatype-inet"><type>inet</type></link> and
+        <link linkend="datatype-cidr"><type>cidr</type></link> data types
         (Emre Hasegeli)
        </para>
 
@@ -8815,7 +9829,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow multiple backends to insert
-        into <link linkend="wal"><acronym>WAL</></link> buffers
+        into <link linkend="wal"><acronym>WAL</acronym></link> buffers
         concurrently (Heikki Linnakangas)
        </para>
 
@@ -8827,7 +9841,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Conditionally write only the modified portion of updated rows to
-        <link linkend="wal"><acronym>WAL</></link> (Amit Kapila)
+        <link linkend="wal"><acronym>WAL</acronym></link> (Amit Kapila)
        </para>
       </listitem>
 
@@ -8842,7 +9856,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of aggregates that
-        use <link linkend="datatype-numeric"><type>numeric</></link> state
+        use <link linkend="datatype-numeric"><type>numeric</type></link> state
         values (Hadi Moshayedi)
        </para>
       </listitem>
@@ -8851,8 +9865,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Attempt to <link linkend="vacuum-for-wraparound">freeze</link>
         tuples when tables are rewritten with <xref
-        linkend="SQL-CLUSTER"> or <link
-        linkend="SQL-VACUUM"><command>VACUUM FULL</></link> (Robert Haas,
+        linkend="sql-cluster"/> or <link
+        linkend="sql-vacuum"><command>VACUUM FULL</command></link> (Robert Haas,
         Andres Freund)
        </para>
 
@@ -8863,8 +9877,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve speed of <xref linkend="SQL-COPY"> with default <link
-        linkend="functions-sequence-table"><function>nextval()</></link>
+        Improve speed of <xref linkend="sql-copy"/> with default <link
+        linkend="functions-sequence-table"><function>nextval()</function></link>
         columns (Simon Riggs)
        </para>
       </listitem>
@@ -8872,7 +9886,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve speed of accessing many different <link
-        linkend="SQL-CREATESEQUENCE">sequences</link> in the same session
+        linkend="sql-createsequence">sequences</link> in the same session
         (David Rowley)
        </para>
       </listitem>
@@ -8886,26 +9900,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Reduce memory allocated by <application>PL/pgSQL</>
-        <xref linkend="SQL-DO"> blocks (Tom Lane)
+        Reduce memory allocated by <application>PL/pgSQL</application>
+        <xref linkend="sql-do"/> blocks (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make the planner more aggressive about extracting restriction clauses
-        from mixed <literal>AND</>/<literal>OR</> clauses (Tom Lane)
+        from mixed <literal>AND</literal>/<literal>OR</literal> clauses (Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Disallow pushing volatile <literal>WHERE</> clauses down
-        into <literal>DISTINCT</> subqueries (Tom Lane)
+        Disallow pushing volatile <literal>WHERE</literal> clauses down
+        into <literal>DISTINCT</literal> subqueries (Tom Lane)
        </para>
 
        <para>
-        Pushing down a <literal>WHERE</> clause can produce a more
+        Pushing down a <literal>WHERE</literal> clause can produce a more
         efficient plan overall, but at the cost of evaluating the clause
         more often than is implied by the text of the query; so don't do it
         if the clause contains any volatile functions.
@@ -8934,32 +9948,32 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="pg-stat-archiver-view"> system view to
-        report <link linkend="wal"><acronym>WAL</></link> archiver activity
+        Add <xref linkend="pg-stat-archiver-view"/> system view to
+        report <link linkend="wal"><acronym>WAL</acronym></link> archiver activity
         (Gabriele Bartolini)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <structfield>n_mod_since_analyze</> columns to
-        <xref linkend="pg-stat-all-tables-view"> and related system views
+        Add <structfield>n_mod_since_analyze</structfield> columns to
+        <xref linkend="pg-stat-all-tables-view"/> and related system views
         (Mark Kirkwood)
        </para>
 
        <para>
         These columns expose the system's estimate of the number of changed
-        tuples since the table's last <xref linkend="sql-analyze">.  This
+        tuples since the table's last <xref linkend="sql-analyze"/>.  This
         estimate drives decisions about when to auto-analyze.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <structfield>backend_xid</> and <structfield>backend_xmin</>
-        columns to the system view <xref linkend="pg-stat-activity-view">,
-        and a <structfield>backend_xmin</> column to
-        <xref linkend="pg-stat-replication-view"> (Christian Kruse)
+        Add <structfield>backend_xid</structfield> and <structfield>backend_xmin</structfield>
+        columns to the system view <xref linkend="pg-stat-activity-view"/>,
+        and a <structfield>backend_xmin</structfield> column to
+        <xref linkend="pg-stat-replication-view"/> (Christian Kruse)
        </para>
       </listitem>
 
@@ -8968,28 +9982,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><acronym>SSL</></title>
+     <title><acronym>SSL</acronym></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add support for <acronym>SSL</> <acronym>ECDH</> key exchange
+        Add support for <acronym>SSL</acronym> <acronym>ECDH</acronym> key exchange
         (Marko Kreen)
        </para>
 
        <para>
         This allows use of Elliptic Curve keys for server authentication.
-        Such keys are faster and have better security than <acronym>RSA</>
+        Such keys are faster and have better security than <acronym>RSA</acronym>
         keys. The new configuration parameter
-        <xref linkend="guc-ssl-ecdh-curve">
-        controls which curve is used for <acronym>ECDH</>.
+        <xref linkend="guc-ssl-ecdh-curve"/>
+        controls which curve is used for <acronym>ECDH</acronym>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve the default <xref linkend="guc-ssl-ciphers"> setting
+        Improve the default <xref linkend="guc-ssl-ciphers"/> setting
         (Marko Kreen)
        </para>
       </listitem>
@@ -8997,29 +10011,29 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         By default, the server not the client now controls the preference
-        order of <acronym>SSL</> ciphers
+        order of <acronym>SSL</acronym> ciphers
         (Marko Kreen)
        </para>
 
        <para>
-        Previously, the order specified by <xref linkend="guc-ssl-ciphers">
+        Previously, the order specified by <xref linkend="guc-ssl-ciphers"/>
         was usually ignored in favor of client-side defaults, which are not
-        configurable in most <productname>PostgreSQL</> clients.  If
+        configurable in most <productname>PostgreSQL</productname> clients.  If
         desired, the old behavior can be restored via the new configuration
-        parameter <xref linkend="guc-ssl-prefer-server-ciphers">.
+        parameter <xref linkend="guc-ssl-prefer-server-ciphers"/>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <xref linkend="guc-log-connections"> show <acronym>SSL</>
+        Make <xref linkend="guc-log-connections"/> show <acronym>SSL</acronym>
         encryption information (Andreas Kunert)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <acronym>SSL</> renegotiation handling (&Aacute;lvaro
+        Improve <acronym>SSL</acronym> renegotiation handling (&Aacute;lvaro
         Herrera)
        </para>
       </listitem>
@@ -9035,20 +10049,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add new <acronym>SQL</> command <xref linkend="SQL-ALTERSYSTEM">
-        for changing <filename>postgresql.conf</> configuration file entries
+        Add new <acronym>SQL</acronym> command <xref linkend="sql-altersystem"/>
+        for changing <filename>postgresql.conf</filename> configuration file entries
         (Amit Kapila)
        </para>
 
        <para>
         Previously such settings could only be changed by manually
-        editing <filename>postgresql.conf</>.
+        editing <filename>postgresql.conf</filename>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <xref linkend="guc-autovacuum-work-mem"> configuration parameter
+        Add <xref linkend="guc-autovacuum-work-mem"/> configuration parameter
         to control the amount of memory used by autovacuum workers
         (Peter Geoghegan)
        </para>
@@ -9056,7 +10070,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="guc-huge-pages"> parameter to allow using huge
+        Add <xref linkend="guc-huge-pages"/> parameter to allow using huge
         memory pages on Linux (Christian Kruse, Richard Poole, Abhijit
         Menon-Sen)
        </para>
@@ -9068,7 +10082,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="guc-max-worker-processes"> parameter
+        Add <xref linkend="guc-max-worker-processes"/> parameter
         to limit the number of background workers (Robert Haas)
        </para>
 
@@ -9080,34 +10094,34 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add superuser-only <xref linkend="guc-session-preload-libraries">
+        Add superuser-only <xref linkend="guc-session-preload-libraries"/>
         parameter to load libraries at session start (Peter Eisentraut)
        </para>
 
        <para>
-        In contrast to <xref linkend="guc-local-preload-libraries">, this
+        In contrast to <xref linkend="guc-local-preload-libraries"/>, this
         parameter can load any shared library, not just those in
-        the <filename>$libdir/plugins</> directory.
+        the <filename>$libdir/plugins</filename> directory.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <xref linkend="guc-wal-log-hints"> parameter to enable WAL
+        Add <xref linkend="guc-wal-log-hints"/> parameter to enable WAL
         logging of hint-bit changes (Sawada Masahiko)
        </para>
 
        <para>
         Hint bit changes are not normally logged, except when checksums are
         enabled.  This is useful for external tools
-        like <application>pg_rewind</>.
+        like <application>pg_rewind</application>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Increase the default settings of <xref linkend="guc-work-mem">
-        and <xref linkend="guc-maintenance-work-mem"> by four times (Bruce
+        Increase the default settings of <xref linkend="guc-work-mem"/>
+        and <xref linkend="guc-maintenance-work-mem"/> by four times (Bruce
         Momjian)
        </para>
 
@@ -9119,7 +10133,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Increase the default setting of <xref
-        linkend="guc-effective-cache-size">
+        linkend="guc-effective-cache-size"/>
         to 4GB (Bruce Momjian, Tom Lane)
        </para>
       </listitem>
@@ -9127,21 +10141,21 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow <function>printf</function>-style space padding to be
-        specified in <xref linkend="guc-log-line-prefix"> (David Rowley)
+        specified in <xref linkend="guc-log-line-prefix"/> (David Rowley)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow terabyte units (<literal>TB</>) to be used when specifying
+        Allow terabyte units (<literal>TB</literal>) to be used when specifying
         configuration variable values (Simon Riggs)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Show <acronym>PID</>s of lock holders and waiters and improve
-        information about relations in <xref linkend="guc-log-lock-waits">
+        Show <acronym>PID</acronym>s of lock holders and waiters and improve
+        information about relations in <xref linkend="guc-log-lock-waits"/>
         log messages (Christian Kruse)
        </para>
       </listitem>
@@ -9153,22 +10167,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        The previous level was <literal>LOG</>, which was too verbose
+        The previous level was <literal>LOG</literal>, which was too verbose
         for libraries loaded per-session.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        On Windows, make <literal>SQL_ASCII</>-encoded databases and server
-        processes (e.g., <xref linkend="app-postmaster">) emit messages in
+        On Windows, make <literal>SQL_ASCII</literal>-encoded databases and server
+        processes (e.g., <xref linkend="app-postmaster"/>) emit messages in
         the character encoding of the server's Windows user locale
         (Alexander Law, Noah Misch)
        </para>
 
        <para>
         Previously these messages were output in the Windows
-        <acronym>ANSI</> code page.
+        <acronym>ANSI</acronym> code page.
        </para>
       </listitem>
 
@@ -9192,14 +10206,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         Replication slots allow preservation of resources like
-        <acronym>WAL</> files on the primary until they are no longer
+        <acronym>WAL</acronym> files on the primary until they are no longer
         needed by standby servers.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add recovery parameter <xref linkend="recovery-min-apply-delay">
+        Add recovery parameter <xref linkend="recovery-min-apply-delay"/>
         to delay replication (Robert Haas, Fabr&iacute;zio de Royes Mello,
         Simon Riggs)
        </para>
@@ -9212,9 +10226,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="recovery-target">
-        option <option>immediate</> to stop <link
-        linkend="wal"><acronym>WAL</></link> recovery as soon as a
+        Add <xref linkend="recovery-target"/>
+        option <option>immediate</option> to stop <link
+        linkend="wal"><acronym>WAL</acronym></link> recovery as soon as a
         consistent state is reached (MauMau, Heikki Linnakangas)
        </para>
       </listitem>
@@ -9226,7 +10240,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         The timestamp reported
-        by <link linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</></link>
+        by <link linkend="functions-recovery-info-table"><function>pg_last_xact_replay_timestamp()</function></link>
         now reflects already-committed records, not transactions about to
         be committed. Recovering to a restore point now replays the restore
         point, rather than stopping just before the restore point.
@@ -9236,34 +10250,34 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         <link
-        linkend="functions-admin-backup-table"><function>pg_switch_xlog()</></link>
-        now clears any unused trailing space in the old <acronym>WAL</> file
+        linkend="functions-admin-backup-table"><function>pg_switch_xlog()</function></link>
+        now clears any unused trailing space in the old <acronym>WAL</acronym> file
         (Heikki Linnakangas)
        </para>
 
        <para>
-        This improves the compression ratio for <acronym>WAL</> files.
+        This improves the compression ratio for <acronym>WAL</acronym> files.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Report failure return codes from <link
-        linkend="archive-recovery-settings">external recovery commands</>
+        linkend="archive-recovery-settings">external recovery commands</link>
         (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Reduce spinlock contention during <acronym>WAL</> replay (Heikki
+        Reduce spinlock contention during <acronym>WAL</acronym> replay (Heikki
         Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Write <acronym>WAL</> records of running transactions more
+        Write <acronym>WAL</acronym> records of running transactions more
         frequently (Andres Freund)
        </para>
 
@@ -9276,12 +10290,12 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </itemizedlist>
 
      <sect4>
-      <title><link linkend="logicaldecoding">Logical Decoding</></title>
+      <title><link linkend="logicaldecoding">Logical Decoding</link></title>
 
       <para>
        Logical decoding allows database changes to be streamed in a
        configurable format. The data is read from
-       the <link linkend="wal"><acronym>WAL</></link> and transformed into the
+       the <link linkend="wal"><acronym>WAL</acronym></link> and transformed into the
        desired target format. To implement this feature, the following changes
        were made:
       </para>
@@ -9290,7 +10304,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Add support for <link linkend="logicaldecoding">logical decoding</>
+         Add support for <link linkend="logicaldecoding">logical decoding</link>
          of WAL data, to allow database changes to be streamed out in a
          customizable format
          (Andres Freund)
@@ -9299,8 +10313,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Add new <xref linkend="guc-wal-level"> setting <option>logical</>
-         to enable logical change-set encoding in <acronym>WAL</> (Andres
+         Add new <xref linkend="guc-wal-level"/> setting <option>logical</option>
+         to enable logical change-set encoding in <acronym>WAL</acronym> (Andres
          Freund)
         </para>
        </listitem>
@@ -9308,7 +10322,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <listitem>
         <para>
          Add table-level parameter <link
-         linkend="catalog-pg-class"><literal>REPLICA IDENTITY</></link>
+         linkend="catalog-pg-class"><literal>REPLICA IDENTITY</literal></link>
          to control logical replication (Andres Freund)
         </para>
        </listitem>
@@ -9316,7 +10330,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <listitem>
         <para>
          Add relation option <link
-         linkend="SQL-CREATETABLE-storage-parameters"><option>user_catalog_table</></link>
+         linkend="sql-createtable-storage-parameters"><option>user_catalog_table</option></link>
          to identify user-created tables involved in logical change-set
          encoding (Andres Freund)
         </para>
@@ -9324,15 +10338,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Add <xref linkend="app-pgrecvlogical"> application to receive
+         Add <xref linkend="app-pgrecvlogical"/> application to receive
          logical-decoding data (Andres Freund)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Add <xref linkend="test-decoding"> module to illustrate logical
-         decoding at the <acronym>SQL</> level (Andres Freund)
+         Add <xref linkend="test-decoding"/> module to illustrate logical
+         decoding at the <acronym>SQL</acronym> level (Andres Freund)
         </para>
        </listitem>
 
@@ -9350,28 +10364,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link linkend="queries-tablefunctions"><literal>WITH
-        ORDINALITY</></link> syntax to number the rows returned from a
-        set-returning function in the <literal>FROM</> clause
+        ORDINALITY</literal></link> syntax to number the rows returned from a
+        set-returning function in the <literal>FROM</literal> clause
         (Andrew Gierth, David Fetter)
        </para>
 
        <para>
         This is particularly useful for functions like
-        <function>unnest()</>.
+        <function>unnest()</function>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add <link linkend="queries-tablefunctions"><literal>ROWS
-        FROM()</></link> syntax to allow horizontal concatenation of
-        set-returning functions in the <literal>FROM</> clause (Andrew Gierth)
+        FROM()</literal></link> syntax to allow horizontal concatenation of
+        set-returning functions in the <literal>FROM</literal> clause (Andrew Gierth)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <xref linkend="SQL-SELECT"> to have
+        Allow <xref linkend="sql-select"/> to have
         an empty target list (Tom Lane)
        </para>
 
@@ -9383,8 +10397,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Ensure that <link linkend="SQL-SELECT"><literal>SELECT ... FOR UPDATE
-        NOWAIT</></link> does not wait in corner cases involving
+        Ensure that <link linkend="sql-select"><literal>SELECT ... FOR UPDATE
+        NOWAIT</literal></link> does not wait in corner cases involving
         already-concurrently-updated tuples (Craig Ringer and Thomas Munro)
        </para>
       </listitem>
@@ -9400,22 +10414,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <link linkend="SQL-DISCARD"><command>DISCARD
-        SEQUENCES</></link> command to discard cached sequence-related state
+        Add <link linkend="sql-discard"><command>DISCARD
+        SEQUENCES</command></link> command to discard cached sequence-related state
         (Fabr&iacute;zio de Royes Mello, Robert Haas)
        </para>
 
        <para>
-        <command>DISCARD ALL</> will now also discard such information.
+        <command>DISCARD ALL</command> will now also discard such information.
        </para>
       </listitem>
 
        <listitem>
         <para>
-         Add <literal>FORCE NULL</> option
-         to <link linkend="SQL-COPY"><command>COPY FROM</></link>, which
+         Add <literal>FORCE NULL</literal> option
+         to <link linkend="sql-copy"><command>COPY FROM</command></link>, which
          causes quoted strings matching the specified null string to be
-         converted to NULLs in <literal>CSV</> mode (Ian Barwick, Michael
+         converted to NULLs in <literal>CSV</literal> mode (Ian Barwick, Michael
          Paquier)
         </para>
 
@@ -9433,35 +10447,35 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <para>
         New warnings are issued for <command>SET
-        LOCAL</>, <command>SET CONSTRAINTS</>, <command>SET TRANSACTION</> and
-        <command>ABORT</> when used outside a transaction block.
+        LOCAL</command>, <command>SET CONSTRAINTS</command>, <command>SET TRANSACTION</command> and
+        <command>ABORT</command> when used outside a transaction block.
        </para>
       </listitem>
 
      </itemizedlist>
 
      <sect4>
-      <title><xref linkend="SQL-EXPLAIN"></title>
+      <title><xref linkend="sql-explain"/></title>
 
       <itemizedlist>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN ANALYZE</> show planning time (Andreas
+         Make <command>EXPLAIN ANALYZE</command> show planning time (Andreas
          Karlsson)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN</> show the grouping columns in Agg and
+         Make <command>EXPLAIN</command> show the grouping columns in Agg and
          Group nodes (Tom Lane)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>EXPLAIN ANALYZE</> show exact and lossy
+         Make <command>EXPLAIN ANALYZE</command> show exact and lossy
          block counts in bitmap heap scans (Etsuro Fujita)
         </para>
        </listitem>
@@ -9477,22 +10491,22 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow a <link linkend="rules-materializedviews">materialized view</>
+        Allow a <link linkend="rules-materializedviews">materialized view</link>
         to be refreshed without blocking other sessions from reading the view
         meanwhile (Kevin Grittner)
        </para>
 
        <para>
         This is done with <link
-        linkend="SQL-REFRESHMATERIALIZEDVIEW"><command>REFRESH MATERIALIZED
-        VIEW CONCURRENTLY</></link>.
+        linkend="sql-refreshmaterializedview"><command>REFRESH MATERIALIZED
+        VIEW CONCURRENTLY</command></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow views to be <link
-        linkend="SQL-CREATEVIEW-updatable-views">automatically
+        linkend="sql-createview-updatable-views">automatically
         updated</link> even if they contain some non-updatable columns
         (Dean Rasheed)
        </para>
@@ -9500,28 +10514,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Previously the presence of non-updatable output columns such as
         expressions, literals, and function calls prevented automatic
-        updates.  Now <command>INSERT</>s, <command>UPDATE</>s and
-        <command>DELETE</>s are supported, provided that they do not
+        updates.  Now <command>INSERT</command>s, <command>UPDATE</command>s and
+        <command>DELETE</command>s are supported, provided that they do not
         attempt to assign new values to any of the non-updatable columns.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow control over whether <command>INSERT</>s and
-        <command>UPDATE</>s can add rows to an auto-updatable view that
+        Allow control over whether <command>INSERT</command>s and
+        <command>UPDATE</command>s can add rows to an auto-updatable view that
         would not appear in the view (Dean Rasheed)
        </para>
 
        <para>
-        This is controlled with the new <xref linkend="SQL-CREATEVIEW">
-        clause <literal>WITH CHECK OPTION</>.
+        This is controlled with the new <xref linkend="sql-createview"/>
+        clause <literal>WITH CHECK OPTION</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <link linkend="rules-privileges">security barrier views</>
+        Allow <link linkend="rules-privileges">security barrier views</link>
         to be automatically updatable (Dean Rasheed)
        </para>
       </listitem>
@@ -9539,60 +10553,60 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Support triggers on <link linkend="SQL-CREATEFOREIGNTABLE">foreign
-        tables</> (Ronan Dunklau)
+        Support triggers on <link linkend="sql-createforeigntable">foreign
+        tables</link> (Ronan Dunklau)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow moving groups of objects from one tablespace to another
-        using the <literal>ALL IN TABLESPACE ... SET TABLESPACE</> form of
-        <xref linkend="SQL-ALTERTABLE">, <xref linkend="SQL-ALTERINDEX">, or
-        <xref linkend="SQL-ALTERMATERIALIZEDVIEW"> (Stephen Frost)
+        using the <literal>ALL IN TABLESPACE ... SET TABLESPACE</literal> form of
+        <xref linkend="sql-altertable"/>, <xref linkend="sql-alterindex"/>, or
+        <xref linkend="sql-altermaterializedview"/> (Stephen Frost)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow changing foreign key constraint deferrability
-        via <xref linkend="SQL-ALTERTABLE"> ... <literal>ALTER
-        CONSTRAINT</> (Simon Riggs)
+        via <xref linkend="sql-altertable"/> ... <literal>ALTER
+        CONSTRAINT</literal> (Simon Riggs)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Reduce lock strength for some <xref linkend="SQL-ALTERTABLE">
+        Reduce lock strength for some <xref linkend="sql-altertable"/>
         commands
         (Simon Riggs, Noah Misch, Robert Haas)
        </para>
 
        <para>
-        Specifically, <literal>VALIDATE CONSTRAINT</>, <literal>CLUSTER
-        ON</>, <literal>SET WITHOUT CLUSTER</>, <literal>ALTER COLUMN
-        SET STATISTICS</>, <literal>ALTER COLUMN</> <literal>SET</>
-        <option>(attribute_option)</>, <literal>ALTER COLUMN RESET</>
-        <option>(attribute_option)</> no longer require <literal>ACCESS
-        EXCLUSIVE</> locks.
+        Specifically, <literal>VALIDATE CONSTRAINT</literal>, <literal>CLUSTER
+        ON</literal>, <literal>SET WITHOUT CLUSTER</literal>, <literal>ALTER COLUMN
+        SET STATISTICS</literal>, <literal>ALTER COLUMN</literal> <literal>SET</literal>
+        <option>(attribute_option)</option>, <literal>ALTER COLUMN RESET</literal>
+        <option>(attribute_option)</option> no longer require <literal>ACCESS
+        EXCLUSIVE</literal> locks.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow tablespace options to be set
-        in <xref linkend="SQL-CREATETABLESPACE"> (Vik Fearing)
+        in <xref linkend="sql-createtablespace"/> (Vik Fearing)
        </para>
 
        <para>
         Formerly these options could only be set
-        via <xref linkend="SQL-ALTERTABLESPACE">.
+        via <xref linkend="sql-altertablespace"/>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <xref linkend="SQL-CREATEAGGREGATE"> to define the estimated
+        Allow <xref linkend="sql-createaggregate"/> to define the estimated
         size of the aggregate's transition state data (Hadi Moshayedi)
        </para>
 
@@ -9604,7 +10618,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Fix <command>DROP IF EXISTS</> to avoid errors for non-existent
+        Fix <command>DROP IF EXISTS</command> to avoid errors for non-existent
         objects in more cases (Pavel Stehule, Dean Rasheed)
        </para>
       </listitem>
@@ -9616,7 +10630,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        Previously, relations once moved into the <literal>pg_catalog</>
+        Previously, relations once moved into the <literal>pg_catalog</literal>
         schema could no longer be modified or dropped.
        </para>
       </listitem>
@@ -9633,14 +10647,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Fully implement the <link
-        linkend="datatype-line"><type>line</></link> data type (Peter
+        linkend="datatype-line"><type>line</type></link> data type (Peter
         Eisentraut)
        </para>
 
        <para>
-        The line <emphasis>segment</> data type (<link
-        linkend="datatype-lseg"><type>lseg</></link>) has always been
-        fully supported.  The previous <type>line</> data type (which was
+        The line <emphasis>segment</emphasis> data type (<link
+        linkend="datatype-lseg"><type>lseg</type></link>) has always been
+        fully supported.  The previous <type>line</type> data type (which was
         enabled only via a compile-time option) is not binary or
         dump-compatible with the new implementation.
        </para>
@@ -9648,17 +10662,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <link linkend="datatype-pg-lsn"><type>pg_lsn</></link>
-        data type to represent a <acronym>WAL</> log sequence number
-        (<acronym>LSN</>) (Robert Haas, Michael Paquier)
+        Add <link linkend="datatype-pg-lsn"><type>pg_lsn</type></link>
+        data type to represent a <acronym>WAL</acronym> log sequence number
+        (<acronym>LSN</acronym>) (Robert Haas, Michael Paquier)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Allow single-point <link
-        linkend="datatype-polygon"><type>polygon</></link>s to be converted
-        to <link linkend="datatype-circle"><type>circle</></link>s
+        linkend="datatype-polygon"><type>polygon</type></link>s to be converted
+        to <link linkend="datatype-circle"><type>circle</type></link>s
         (Bruce Momjian)
        </para>
       </listitem>
@@ -9670,31 +10684,31 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        Previously, <productname>PostgreSQL</> assumed that the UTC offset
-        associated with a time zone abbreviation (such as <literal>EST</>)
+        Previously, <productname>PostgreSQL</productname> assumed that the UTC offset
+        associated with a time zone abbreviation (such as <literal>EST</literal>)
         never changes in the usage of any particular locale.  However this
         assumption fails in the real world, so introduce the ability for a
         zone abbreviation to represent a UTC offset that sometimes changes.
         Update the zone abbreviation definition files to make use of this
         feature in timezone locales that have changed the UTC offset of their
         abbreviations since 1970 (according to the IANA timezone database).
-        In such timezones, <productname>PostgreSQL</> will now associate the
+        In such timezones, <productname>PostgreSQL</productname> will now associate the
         correct UTC offset with the abbreviation depending on the given date.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow 5+ digit years for non-<acronym>ISO</> <link
-        linkend="datatype-datetime"><type>timestamp</></link> and
-        <type>date</> strings, where appropriate (Bruce Momjian)
+        Allow 5+ digit years for non-<acronym>ISO</acronym> <link
+        linkend="datatype-datetime"><type>timestamp</type></link> and
+        <type>date</type> strings, where appropriate (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add checks for overflow/underflow of <link
-        linkend="datatype-datetime"><type>interval</></link> values
+        linkend="datatype-datetime"><type>interval</type></link> values
         (Bruce Momjian)
        </para>
       </listitem>
@@ -9702,14 +10716,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="datatype-json"><acronym>JSON</></link></title>
+     <title><link linkend="datatype-json"><acronym>JSON</acronym></link></title>
 
      <itemizedlist>
 
        <listitem>
         <para>
-         Add <link linkend="datatype-json"><type>jsonb</></link>, a more
-         capable and efficient data type for storing <acronym>JSON</> data
+         Add <link linkend="datatype-json"><type>jsonb</type></link>, a more
+         capable and efficient data type for storing <acronym>JSON</acronym> data
          (Oleg Bartunov, Teodor Sigaev, Alexander
          Korotkov, Peter Geoghegan, Andrew Dunstan)
         </para>
@@ -9717,9 +10731,9 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
         <para>
          This new type allows faster access to values within a JSON
          document, and faster and more useful indexing of JSON columns.
-         Scalar values in <type>jsonb</> documents are stored as appropriate
+         Scalar values in <type>jsonb</type> documents are stored as appropriate
          scalar SQL types, and the JSON document structure is pre-parsed
-         rather than being stored as text as in the original <type>json</>
+         rather than being stored as text as in the original <type>json</type>
          data type.
         </para>
        </listitem>
@@ -9732,18 +10746,18 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
         <para>
          New functions include <link
-         linkend="functions-json-processing-table"><function>json_array_elements_text()</></link>,
-         <function>json_build_array()</>, <function>json_object()</>,
-         <function>json_object_agg()</>, <function>json_to_record()</>,
-         and <function>json_to_recordset()</>.
+         linkend="functions-json-processing-table"><function>json_array_elements_text()</function></link>,
+         <function>json_build_array()</function>, <function>json_object()</function>,
+         <function>json_object_agg()</function>, <function>json_to_record()</function>,
+         and <function>json_to_recordset()</function>.
         </para>
        </listitem>
 
        <listitem>
         <para>
          Add <link
-         linkend="functions-json-processing-table"><function>json_typeof()</></link>
-         to return the data type of a <type>json</> value (Andrew Tipton)
+         linkend="functions-json-processing-table"><function>json_typeof()</function></link>
+         to return the data type of a <type>json</type> value (Andrew Tipton)
         </para>
        </listitem>
 
@@ -9761,13 +10775,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link
-        linkend="functions-datetime-delay"><function>pg_sleep_for(interval)</></link>
-        and <function>pg_sleep_until(timestamp)</> to specify
+        linkend="functions-datetime-delay"><function>pg_sleep_for(interval)</function></link>
+        and <function>pg_sleep_until(timestamp)</function> to specify
         delays more flexibly (Vik Fearing, Julien Rouhaud)
        </para>
 
        <para>
-        The existing <function>pg_sleep()</> function only supports delays
+        The existing <function>pg_sleep()</function> function only supports delays
         specified in seconds.
        </para>
       </listitem>
@@ -9775,7 +10789,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add <link
-        linkend="array-functions-table"><function>cardinality()</></link>
+        linkend="array-functions-table"><function>cardinality()</function></link>
         function for arrays (Marko Tiikkaja)
        </para>
 
@@ -9787,7 +10801,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <acronym>SQL</> functions to allow <link linkend="lo-funcs">large
+        Add <acronym>SQL</acronym> functions to allow <link linkend="lo-funcs">large
         object reads/writes</link> at arbitrary offsets (Pavel Stehule)
        </para>
       </listitem>
@@ -9795,7 +10809,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Allow <link
-        linkend="array-functions-table"><function>unnest()</></link>
+        linkend="array-functions-table"><function>unnest()</function></link>
         to take multiple arguments, which are individually unnested then
         horizontally concatenated (Andrew Gierth)
        </para>
@@ -9803,36 +10817,36 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add functions to construct <type>time</>s, <type>date</>s,
-        <type>timestamp</>s, <type>timestamptz</>s, and <type>interval</>s
+        Add functions to construct <type>time</type>s, <type>date</type>s,
+        <type>timestamp</type>s, <type>timestamptz</type>s, and <type>interval</type>s
         from individual values, rather than strings (Pavel Stehule)
        </para>
 
        <para>
-        These functions' names are prefixed with <literal>make_</>,
-        e.g. <link linkend="functions-datetime-table"><function>make_date()</></link>.
+        These functions' names are prefixed with <literal>make_</literal>,
+        e.g. <link linkend="functions-datetime-table"><function>make_date()</function></link>.
        </para>
       </listitem>
 
       <listitem>
        <para>
         Make <link
-        linkend="functions-formatting-table"><function>to_char()</></link>'s
-        <literal>TZ</> format specifier return a useful value for simple
+        linkend="functions-formatting-table"><function>to_char()</function></link>'s
+        <literal>TZ</literal> format specifier return a useful value for simple
         numeric time zone offsets (Tom Lane)
        </para>
 
        <para>
-        Previously, <literal>to_char(CURRENT_TIMESTAMP, 'TZ')</> returned
-        an empty string if the <literal>timezone</> was set to a constant
-        like <literal>-4</>.
+        Previously, <literal>to_char(CURRENT_TIMESTAMP, 'TZ')</literal> returned
+        an empty string if the <literal>timezone</literal> was set to a constant
+        like <literal>-4</literal>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add timezone offset format specifier <literal>OF</> to <link
-        linkend="functions-formatting-table"><function>to_char()</></link>
+        Add timezone offset format specifier <literal>OF</literal> to <link
+        linkend="functions-formatting-table"><function>to_char()</function></link>
         (Bruce Momjian)
        </para>
       </listitem>
@@ -9840,7 +10854,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Improve the random seed used for <link
-        linkend="functions-math-random-table"><function>random()</></link>
+        linkend="functions-math-random-table"><function>random()</function></link>
         (Honza Horak)
        </para>
       </listitem>
@@ -9848,7 +10862,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Tighten validity checking for Unicode code points in <link
-        linkend="functions-string-other"><function>chr(int)</></link>
+        linkend="functions-string-other"><function>chr(int)</function></link>
         (Tom Lane)
        </para>
 
@@ -9867,18 +10881,18 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add functions for looking up objects in <structname>pg_class</>,
-        <structname>pg_proc</>, <structname>pg_type</>, and
-        <structname>pg_operator</> that do not generate errors for
+        Add functions for looking up objects in <structname>pg_class</structname>,
+        <structname>pg_proc</structname>, <structname>pg_type</structname>, and
+        <structname>pg_operator</structname> that do not generate errors for
         non-existent objects (Yugo Nagata, Nozomi Anzai,
         Robert Haas)
        </para>
 
        <para>
         For example, <link
-        linkend="functions-info-catalog-table"><function>to_regclass()</></link>
-        does a lookup in <structname>pg_class</> similarly to
-        the <type>regclass</> input function, but it returns NULL for a
+        linkend="functions-info-catalog-table"><function>to_regclass()</function></link>
+        does a lookup in <structname>pg_class</structname> similarly to
+        the <type>regclass</type> input function, but it returns NULL for a
         non-existent object instead of failing.
        </para>
       </listitem>
@@ -9886,7 +10900,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add function <link
-        linkend="functions-admin-dblocation"><function>pg_filenode_relation()</></link>
+        linkend="functions-admin-dblocation"><function>pg_filenode_relation()</function></link>
         to allow for more efficient lookup of relation names from filenodes
         (Andres Freund)
        </para>
@@ -9894,8 +10908,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <structfield>parameter_default</> column to <link
-        linkend="infoschema-parameters"><structname>information_schema.parameters</></link>
+        Add <structfield>parameter_default</structfield> column to <link
+        linkend="infoschema-parameters"><structname>information_schema.parameters</structname></link>
         view (Peter Eisentraut)
        </para>
       </listitem>
@@ -9903,7 +10917,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Make <link
-        linkend="infoschema-schemata"><structname>information_schema.schemata</></link>
+        linkend="infoschema-schemata"><structname>information_schema.schemata</structname></link>
         show all accessible schemas (Peter Eisentraut)
        </para>
 
@@ -9925,7 +10939,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Add control over which rows are passed
         into aggregate functions via the <link
-        linkend="syntax-aggregates"><literal>FILTER</></link> clause
+        linkend="syntax-aggregates"><literal>FILTER</literal></link> clause
         (David Fetter)
        </para>
       </listitem>
@@ -9933,7 +10947,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Support ordered-set (<link
-        linkend="syntax-aggregates"><literal>WITHIN GROUP</></link>)
+        linkend="syntax-aggregates"><literal>WITHIN GROUP</literal></link>)
         aggregates (Atri Sharma, Andrew Gierth, Tom Lane)
        </para>
       </listitem>
@@ -9941,11 +10955,11 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add standard ordered-set aggregates <link
-        linkend="functions-orderedset-table"><function>percentile_cont()</></link>,
-        <function>percentile_disc()</>, <function>mode()</>, <link
-        linkend="functions-hypothetical-table"><function>rank()</></link>,
-        <function>dense_rank()</>, <function>percent_rank()</>, and
-        <function>cume_dist()</>
+        linkend="functions-orderedset-table"><function>percentile_cont()</function></link>,
+        <function>percentile_disc()</function>, <function>mode()</function>, <link
+        linkend="functions-hypothetical-table"><function>rank()</function></link>,
+        <function>dense_rank()</function>, <function>percent_rank()</function>, and
+        <function>cume_dist()</function>
         (Atri Sharma, Andrew Gierth)
        </para>
       </listitem>
@@ -9953,7 +10967,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Support <link
-        linkend="xfunc-sql-variadic-functions"><literal>VARIADIC</></link>
+        linkend="xfunc-sql-variadic-functions"><literal>VARIADIC</literal></link>
         aggregate functions (Tom Lane)
        </para>
       </listitem>
@@ -9965,7 +10979,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
        <para>
         This allows proper declaration in SQL of aggregates like the built-in
-        aggregate <function>array_agg()</>.
+        aggregate <function>array_agg()</function>.
        </para>
       </listitem>
 
@@ -9982,20 +10996,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
      <listitem>
       <para>
-       Add event trigger support to <link linkend="plperl">PL/Perl</>
-       and <link linkend="pltcl">PL/Tcl</> (Dimitri Fontaine)
+       Add event trigger support to <link linkend="plperl">PL/Perl</link>
+       and <link linkend="pltcl">PL/Tcl</link> (Dimitri Fontaine)
       </para>
      </listitem>
 
      <listitem>
       <para>
-       Convert <link linkend="datatype-numeric"><type>numeric</></link>
-       values to <type>decimal</> in <link linkend="plpython">PL/Python</link>
+       Convert <link linkend="datatype-numeric"><type>numeric</type></link>
+       values to <type>decimal</type> in <link linkend="plpython">PL/Python</link>
        (Szymon Guz, Ronan Dunklau)
       </para>
 
       <para>
-       Previously such values were converted to Python <type>float</> values,
+       Previously such values were converted to Python <type>float</type> values,
        risking loss of precision.
       </para>
      </listitem>
@@ -10011,7 +11025,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        <para>
         Add ability to retrieve the current PL/pgSQL call stack
         using <link linkend="plpgsql-call-stack"><command>GET
-        DIAGNOSTICS</></link>
+        DIAGNOSTICS</command></link>
         (Pavel Stehule, Stephen Frost)
        </para>
       </listitem>
@@ -10019,17 +11033,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Add option <link
-        linkend="plpgsql-statements-sql-onerow"><option>print_strict_params</></link>
+        linkend="plpgsql-statements-sql-onerow"><option>print_strict_params</option></link>
         to display the parameters passed to a query that violated a
-        <literal>STRICT</> constraint (Marko Tiikkaja)
+        <literal>STRICT</literal> constraint (Marko Tiikkaja)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Add variables <link
-        linkend="plpgsql-extra-checks"><varname>plpgsql.extra_warnings</></link>
-        and <varname>plpgsql.extra_errors</> to enable additional PL/pgSQL
+        linkend="plpgsql-extra-checks"><varname>plpgsql.extra_warnings</varname></link>
+        and <varname>plpgsql.extra_errors</varname> to enable additional PL/pgSQL
         warnings and errors (Marko Tiikkaja, Petr Jelinek)
        </para>
 
@@ -10045,13 +11059,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
    </sect3>
 
    <sect3>
-    <title><link linkend="libpq"><application>libpq</></link></title>
+    <title><link linkend="libpq"><application>libpq</application></link></title>
      <itemizedlist>
 
       <listitem>
        <para>
         Make libpq's <link
-        linkend="libpq-pqconndefaults"><function>PQconndefaults()</></link>
+        linkend="libpq-pqconndefaults"><function>PQconndefaults()</function></link>
         function ignore invalid service files (Steve Singer, Bruce Momjian)
        </para>
 
@@ -10063,7 +11077,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Accept <acronym>TLS</> protocol versions beyond <literal>TLSv1</>
+        Accept <acronym>TLS</acronym> protocol versions beyond <literal>TLSv1</literal>
         in libpq (Marko Kreen)
        </para>
       </listitem>
@@ -10079,15 +11093,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="APP-CREATEUSER"> option <option>-g</>
+        Add <xref linkend="app-createuser"/> option <option>-g</option>
         to specify role membership (Christopher Browne)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <xref linkend="APP-VACUUMDB">
-        option <option>--analyze-in-stages</> to analyze in stages of
+        Add <xref linkend="app-vacuumdb"/>
+        option <option>--analyze-in-stages</option> to analyze in stages of
         increasing granularity (Peter Eisentraut)
        </para>
 
@@ -10098,15 +11112,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <link linkend="app-pgresetwal"><application>pg_resetxlog</></>
-        with option <option>-n</> output current and potentially changed
+        Make <link linkend="app-pgresetwal"><application>pg_resetxlog</application></link>
+        with option <option>-n</option> output current and potentially changed
         values (Rajeev Rastogi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <xref linkend="app-initdb"> throw error for incorrect locale
+        Make <xref linkend="app-initdb"/> throw error for incorrect locale
         settings, rather than silently falling back to a default choice
         (Tom Lane)
        </para>
@@ -10114,21 +11128,21 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <xref linkend="app-pg-ctl"> return exit code <literal>4</> for
+        Make <xref linkend="app-pg-ctl"/> return exit code <literal>4</literal> for
         an inaccessible data directory (Amit Kapila, Bruce Momjian)
        </para>
 
        <para>
         This behavior more closely matches the Linux Standard Base
-        (<acronym>LSB</>) Core Specification.
+        (<acronym>LSB</acronym>) Core Specification.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        On Windows, ensure that a non-absolute <option>-D</> path
+        On Windows, ensure that a non-absolute <option>-D</option> path
         specification is interpreted relative
-        to <xref linkend="app-pg-ctl">'s current directory
+        to <xref linkend="app-pg-ctl"/>'s current directory
         (Kumar Rajeev Rastogi)
        </para>
 
@@ -10140,7 +11154,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow <function>sizeof()</> in <link linkend="ecpg">ECPG</link>
+        Allow <function>sizeof()</function> in <link linkend="ecpg">ECPG</link>
         C array definitions (Michael Meskes)
        </para>
       </listitem>
@@ -10148,7 +11162,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Make <link linkend="ecpg">ECPG</link> properly handle nesting
-        of C-style comments in both C and <acronym>SQL</> text
+        of C-style comments in both C and <acronym>SQL</acronym> text
         (Michael Meskes)
        </para>
       </listitem>
@@ -10156,21 +11170,21 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </itemizedlist>
 
     <sect4>
-     <title><xref linkend="APP-PSQL"></title>
+     <title><xref linkend="app-psql"/></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Suppress <quote>No rows</quote> output in <application>psql</> <link
-        linkend="APP-PSQL-meta-commands"><option>expanded</></link>
+        Suppress <quote>No rows</quote> output in <application>psql</application> <link
+        linkend="app-psql-meta-commands"><option>expanded</option></link>
         mode when the footer is disabled (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow Control-C to abort <application>psql</> when it's hung at
+        Allow Control-C to abort <application>psql</application> when it's hung at
         connection startup (Peter Eisentraut)
        </para>
       </listitem>
@@ -10178,28 +11192,28 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
      </itemizedlist>
 
      <sect5>
-      <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+      <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
       <itemizedlist>
 
        <listitem>
         <para>
-         Make <application>psql</>'s <command>\db+</> show tablespace options
+         Make <application>psql</application>'s <command>\db+</command> show tablespace options
          (Magnus Hagander)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\do+</> display the functions
+         Make <command>\do+</command> display the functions
          that implement the operators (Marko Tiikkaja)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\d+</> output an
-         <literal>OID</> line only if an <literal>oid</literal> column
+         Make <command>\d+</command> output an
+         <literal>OID</literal> line only if an <literal>oid</literal> column
          exists in the table (Bruce Momjian)
         </para>
 
@@ -10211,7 +11225,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Make <command>\d</> show disabled system triggers (Bruce
+         Make <command>\d</command> show disabled system triggers (Bruce
          Momjian)
         </para>
 
@@ -10223,55 +11237,55 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
        <listitem>
         <para>
-         Fix <command>\copy</> to no longer require
-         a space between <literal>stdin</> and a semicolon (Etsuro Fujita)
+         Fix <command>\copy</command> to no longer require
+         a space between <literal>stdin</literal> and a semicolon (Etsuro Fujita)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Output the row count at the end of <command>\copy</>, just
-         like <command>COPY</> already did (Kumar Rajeev Rastogi)
+         Output the row count at the end of <command>\copy</command>, just
+         like <command>COPY</command> already did (Kumar Rajeev Rastogi)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Fix <command>\conninfo</> to display the
-         server's <acronym>IP</> address for connections using
-         <literal>hostaddr</> (Fujii Masao)
+         Fix <command>\conninfo</command> to display the
+         server's <acronym>IP</acronym> address for connections using
+         <literal>hostaddr</literal> (Fujii Masao)
         </para>
 
         <para>
-         Previously <command>\conninfo</> could not display the server's
-         <acronym>IP</> address in such cases.
+         Previously <command>\conninfo</command> could not display the server's
+         <acronym>IP</acronym> address in such cases.
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Show the <acronym>SSL</> protocol version in
-         <command>\conninfo</> (Marko Kreen)
+         Show the <acronym>SSL</acronym> protocol version in
+         <command>\conninfo</command> (Marko Kreen)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Add tab completion for <command>\pset</>
+         Add tab completion for <command>\pset</command>
          (Pavel Stehule)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Allow <command>\pset</> with no arguments
+         Allow <command>\pset</command> with no arguments
          to show all settings (Gilles Darold)
         </para>
        </listitem>
 
        <listitem>
         <para>
-         Make <command>\s</> display the name of the history file it wrote
+         Make <command>\s</command> display the name of the history file it wrote
          without converting it to an absolute path (Tom Lane)
         </para>
 
@@ -10288,14 +11302,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><xref linkend="APP-PGDUMP"></title>
+     <title><xref linkend="app-pgdump"/></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Allow <xref linkend="APP-PGRESTORE"> options
-        <option>-I</>, <option>-P</>, <option>-T</> and <option>-n</>
+        Allow <xref linkend="app-pgrestore"/> options
+        <option>-I</option>, <option>-P</option>, <option>-T</option> and <option>-n</option>
         to be specified multiple times (Heikki Linnakangas)
        </para>
 
@@ -10306,17 +11320,17 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Optionally add <literal>IF EXISTS</> clauses to the <command>DROP</>
+        Optionally add <literal>IF EXISTS</literal> clauses to the <command>DROP</command>
         commands emitted when removing old objects during a restore (Pavel
         Stehule)
        </para>
 
        <para>
         This change prevents unnecessary errors when removing old objects.
-        The new <option>--if-exists</> option
-        for <xref linkend="APP-PGDUMP">, <xref linkend="APP-PG-DUMPALL">,
-        and <xref linkend="APP-PGRESTORE"> is only available
-        when <option>--clean</> is also specified.
+        The new <option>--if-exists</option> option
+        for <xref linkend="app-pgdump"/>, <xref linkend="app-pg-dumpall"/>,
+        and <xref linkend="app-pgrestore"/> is only available
+        when <option>--clean</option> is also specified.
        </para>
       </listitem>
 
@@ -10325,26 +11339,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><xref linkend="app-pgbasebackup"></title>
+     <title><xref linkend="app-pgbasebackup"/></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Add <application>pg_basebackup</> option <option>--xlogdir</>
-        to specify the <filename>pg_xlog</> directory location (Haribabu
+        Add <application>pg_basebackup</application> option <option>--xlogdir</option>
+        to specify the <filename>pg_xlog</filename> directory location (Haribabu
         Kommi)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pg_basebackup</> to relocate tablespaces in
+        Allow <application>pg_basebackup</application> to relocate tablespaces in
         the backup copy (Steeve Lennmark)
        </para>
 
        <para>
-        This is particularly useful for using <application>pg_basebackup</>
+        This is particularly useful for using <application>pg_basebackup</application>
         on the same machine as the primary.
        </para>
       </listitem>
@@ -10355,8 +11369,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
        </para>
 
        <para>
-        This can be controlled with the <application>pg_basebackup</>
-        <option>--max-rate</> parameter.
+        This can be controlled with the <application>pg_basebackup</application>
+        <option>--max-rate</option> parameter.
        </para>
       </listitem>
 
@@ -10387,13 +11401,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         No longer require function prototypes for functions marked with the
-        <link linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</></link>
+        <link linkend="xfunc-c"><function>PG_FUNCTION_INFO_V1</function></link>
         macro (Peter Eisentraut)
        </para>
 
        <para>
         This change eliminates the need to write boilerplate prototypes.
-        Note that the <function>PG_FUNCTION_INFO_V1</> macro must appear
+        Note that the <function>PG_FUNCTION_INFO_V1</function> macro must appear
         before the corresponding function definition to avoid compiler
         warnings.
        </para>
@@ -10401,41 +11415,41 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Remove <varname>SnapshotNow</> and
-        <function>HeapTupleSatisfiesNow()</> (Robert Haas)
+        Remove <varname>SnapshotNow</varname> and
+        <function>HeapTupleSatisfiesNow()</function> (Robert Haas)
        </para>
 
        <para>
         All existing uses have been switched to more appropriate snapshot
-        types.  Catalog scans now use <acronym>MVCC</> snapshots.
+        types.  Catalog scans now use <acronym>MVCC</acronym> snapshots.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add an <acronym>API</> to allow memory allocations over one gigabyte
+        Add an <acronym>API</acronym> to allow memory allocations over one gigabyte
         (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <function>psprintf()</> to simplify memory allocation during
+        Add <function>psprintf()</function> to simplify memory allocation during
         string composition (Peter Eisentraut, Tom Lane)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support <function>printf()</> size modifier <literal>z</> to
-        print <type>size_t</> values (Andres Freund)
+        Support <function>printf()</function> size modifier <literal>z</literal> to
+        print <type>size_t</type> values (Andres Freund)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Change <acronym>API</> of <function>appendStringInfoVA()</>
-        to better use <function>vsnprintf()</> (David Rowley, Tom Lane)
+        Change <acronym>API</acronym> of <function>appendStringInfoVA()</function>
+        to better use <function>vsnprintf()</function> (David Rowley, Tom Lane)
        </para>
       </listitem>
 
@@ -10455,7 +11469,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve spinlock speed on x86_64 <acronym>CPU</>s (Heikki
+        Improve spinlock speed on x86_64 <acronym>CPU</acronym>s (Heikki
         Linnakangas)
        </para>
       </listitem>
@@ -10463,56 +11477,56 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Remove spinlock support for unsupported platforms
-        <productname>SINIX</>, <productname>Sun3</>, and
-        <productname>NS32K</> (Robert Haas)
+        <productname>SINIX</productname>, <productname>Sun3</productname>, and
+        <productname>NS32K</productname> (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <acronym>IRIX</> port (Robert Haas)
+        Remove <acronym>IRIX</acronym> port (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Reduce the number of semaphores required by
-        <option>--disable-spinlocks</> builds (Robert Haas)
+        <option>--disable-spinlocks</option> builds (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Rewrite <application>duplicate_oids</> Unix shell script in
-        <application>Perl</> (Andrew Dunstan)
+        Rewrite <application>duplicate_oids</application> Unix shell script in
+        <application>Perl</application> (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add Test Anything Protocol (<acronym>TAP</>) tests for client
+        Add Test Anything Protocol (<acronym>TAP</acronym>) tests for client
         programs (Peter Eisentraut)
        </para>
 
        <para>
-        Currently, these tests are run by <literal>make check-world</>
-        only if the <option>--enable-tap-tests</> option was given
-        to <application>configure</>.
+        Currently, these tests are run by <literal>make check-world</literal>
+        only if the <option>--enable-tap-tests</option> option was given
+        to <application>configure</application>.
         This might become the default behavior in some future release.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add make targets <option>check-tests</> and
-        <option>installcheck-tests</>, which allow selection of individual
+        Add make targets <option>check-tests</option> and
+        <option>installcheck-tests</option>, which allow selection of individual
         tests to be run (Andrew Dunstan)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Remove <option>maintainer-check</> makefile rule (Peter Eisentraut)
+        Remove <option>maintainer-check</option> makefile rule (Peter Eisentraut)
        </para>
 
        <para>
@@ -10522,7 +11536,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve support for <envar>VPATH</> builds of <acronym>PGXS</>
+        Improve support for <envar>VPATH</envar> builds of <acronym>PGXS</acronym>
         modules  (C&eacute;dric Villemain, Andrew Dunstan, Peter Eisentraut)
        </para>
       </listitem>
@@ -10535,8 +11549,8 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add a <application>configure</> flag that appends custom text to the
-        <envar>PG_VERSION</> string (Oskari Saarenmaa)
+        Add a <application>configure</application> flag that appends custom text to the
+        <envar>PG_VERSION</envar> string (Oskari Saarenmaa)
        </para>
 
        <para>
@@ -10546,46 +11560,46 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve DocBook <acronym>XML</> validity (Peter Eisentraut)
+        Improve DocBook <acronym>XML</acronym> validity (Peter Eisentraut)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Fix various minor security and sanity issues reported by the
-        <productname>Coverity</> scanner (Stephen Frost)
+        <productname>Coverity</productname> scanner (Stephen Frost)
        </para>
       </listitem>
 
       <listitem>
        <para>
         Improve detection of invalid memory usage when testing
-        <productname>PostgreSQL</> with <application>Valgrind</>
+        <productname>PostgreSQL</productname> with <application>Valgrind</application>
         (Noah Misch)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve sample <application>Emacs</> configuration file
-        <filename>emacs.samples</> (Peter Eisentraut)
+        Improve sample <application>Emacs</application> configuration file
+        <filename>emacs.samples</filename> (Peter Eisentraut)
        </para>
 
        <para>
-        Also add <filename>.dir-locals.el</> to the top of the source tree.
+        Also add <filename>.dir-locals.el</filename> to the top of the source tree.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <application>pgindent</> to accept a command-line list
+        Allow <application>pgindent</application> to accept a command-line list
         of typedefs (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <application>pgindent</> smarter about blank lines
+        Make <application>pgindent</application> smarter about blank lines
         around preprocessor conditionals (Bruce Momjian)
        </para>
       </listitem>
@@ -10593,14 +11607,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Avoid most uses of <command>dlltool</command>
-        in <productname>Cygwin</> and
-        <productname>Mingw</> builds (Marco Atzeri, Hiroshi Inoue)
+        in <productname>Cygwin</productname> and
+        <productname>Mingw</productname> builds (Marco Atzeri, Hiroshi Inoue)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Support client-only installs in <acronym>MSVC</> (Windows) builds
+        Support client-only installs in <acronym>MSVC</acronym> (Windows) builds
         (MauMau)
        </para>
       </listitem>
@@ -10616,7 +11630,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <xref linkend="pgprewarm"> extension to preload relation data
+        Add <xref linkend="pgprewarm"/> extension to preload relation data
         into the shared buffer cache at server start (Robert Haas)
        </para>
 
@@ -10627,26 +11641,26 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add <acronym>UUID</> random number generator
-        <function>gen_random_uuid()</> to <xref linkend="pgcrypto">
+        Add <acronym>UUID</acronym> random number generator
+        <function>gen_random_uuid()</function> to <xref linkend="pgcrypto"/>
         (Oskari Saarenmaa)
        </para>
 
        <para>
-        This allows creation of version 4 <acronym>UUID</>s without
-        requiring installation of <xref linkend="uuid-ossp">.
+        This allows creation of version 4 <acronym>UUID</acronym>s without
+        requiring installation of <xref linkend="uuid-ossp"/>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Allow <xref linkend="uuid-ossp"> to work with
-        the <systemitem>BSD</> or <systemitem>e2fsprogs</> UUID libraries,
-        not only the <systemitem>OSSP</> UUID library (Matteo Beccati)
+        Allow <xref linkend="uuid-ossp"/> to work with
+        the <systemitem>BSD</systemitem> or <systemitem>e2fsprogs</systemitem> UUID libraries,
+        not only the <systemitem>OSSP</systemitem> UUID library (Matteo Beccati)
        </para>
 
        <para>
-        This improves the <application>uuid-ossp</> module's portability
+        This improves the <application>uuid-ossp</application> module's portability
         since it no longer has to have the increasingly-obsolete OSSP
         library.  The module's name is now rather a misnomer, but we won't
         change it.
@@ -10655,21 +11669,21 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add option to <xref linkend="auto-explain"> to include trigger
+        Add option to <xref linkend="auto-explain"/> to include trigger
         execution time (Horiguchi Kyotaro)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Fix <xref linkend="pgstattuple"> to not report rows from
+        Fix <xref linkend="pgstattuple"/> to not report rows from
         uncommitted transactions as dead (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Make <xref linkend="pgstattuple"> functions
+        Make <xref linkend="pgstattuple"/> functions
         use <type>regclass</type>-type arguments (Satoshi Nagayasu)
        </para>
 
@@ -10681,14 +11695,14 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Improve consistency of <xref linkend="pgrowlocks"> output to honor
+        Improve consistency of <xref linkend="pgrowlocks"/> output to honor
         snapshot rules more consistently (Robert Haas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Improve <xref linkend="pgtrgm">'s choice of trigrams for indexed
+        Improve <xref linkend="pgtrgm"/>'s choice of trigrams for indexed
         regular expression searches (Alexander Korotkov)
        </para>
 
@@ -10700,15 +11714,15 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow <link linkend="pgwaldump"><application>pg_xlogdump</></>
-        to report a live log stream with <option>--follow</>
+        Allow <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
+        to report a live log stream with <option>--follow</option>
         (Heikki Linnakangas)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Store <xref linkend="cube"> data more compactly (Stas Kelvich)
+        Store <xref linkend="cube"/> data more compactly (Stas Kelvich)
        </para>
 
        <para>
@@ -10719,7 +11733,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Reduce <xref linkend="vacuumlo"> client-side memory usage by using
+        Reduce <xref linkend="vacuumlo"/> client-side memory usage by using
         a cursor (Andrew Dunstan)
        </para>
       </listitem>
@@ -10727,13 +11741,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
       <listitem>
        <para>
         Dramatically reduce memory consumption
-        in <xref linkend="pgupgrade"> (Bruce Momjian)
+        in <xref linkend="pgupgrade"/> (Bruce Momjian)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Pass <xref linkend="pgupgrade">'s user name (<option>-U</>) option to
+        Pass <xref linkend="pgupgrade"/>'s user name (<option>-U</option>) option to
         generated analyze scripts (Bruce Momjian)
        </para>
       </listitem>
@@ -10741,37 +11755,37 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </itemizedlist>
 
     <sect4>
-     <title><xref linkend="pgbench"></title>
+     <title><xref linkend="pgbench"/></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Remove line length limit for <application>pgbench</> scripts (Sawada
+        Remove line length limit for <application>pgbench</application> scripts (Sawada
         Masahiko)
        </para>
 
        <para>
-        The previous line limit was <envar>BUFSIZ</>.
+        The previous line limit was <envar>BUFSIZ</envar>.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add long option names to <application>pgbench</> (Fabien Coelho)
+        Add long option names to <application>pgbench</application> (Fabien Coelho)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> option <option>--rate</> to control
+        Add <application>pgbench</application> option <option>--rate</option> to control
         the transaction rate (Fabien Coelho)
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Add <application>pgbench</> option <option>--progress</> to
+        Add <application>pgbench</application> option <option>--progress</option> to
         print periodic progress reports
         (Fabien Coelho)
        </para>
@@ -10782,13 +11796,13 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
     </sect4>
 
     <sect4>
-     <title><xref linkend="pgstatstatements"></title>
+     <title><xref linkend="pgstatstatements"/></title>
 
      <itemizedlist>
 
       <listitem>
        <para>
-        Make <application>pg_stat_statements</> use a file, rather than
+        Make <application>pg_stat_statements</application> use a file, rather than
         shared memory, for query text storage (Peter Geoghegan)
        </para>
 
@@ -10800,7 +11814,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Allow reporting of <application>pg_stat_statements</>'s internal
+        Allow reporting of <application>pg_stat_statements</application>'s internal
         query hash identifier (Daniel Farina, Sameer Thakur, Peter
         Geoghegan)
        </para>
@@ -10808,7 +11822,7 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Add the ability to retrieve all <application>pg_stat_statements</>
+        Add the ability to retrieve all <application>pg_stat_statements</application>
         information except the query text (Peter Geoghegan)
        </para>
 
@@ -10821,20 +11835,20 @@ Branch: REL9_4_STABLE [c2b06ab17] 2015-01-30 22:45:58 -0500
 
       <listitem>
        <para>
-        Make <application>pg_stat_statements</> ignore <command>DEALLOCATE</>
+        Make <application>pg_stat_statements</application> ignore <command>DEALLOCATE</command>
         commands (Fabien Coelho)
        </para>
 
        <para>
-        It already ignored <command>PREPARE</>, as well as planning time in
+        It already ignored <command>PREPARE</command>, as well as planning time in
         general, so this seems more consistent.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        Save the statistics file into <filename>$PGDATA/pg_stat</> at server
-        shutdown, rather than <filename>$PGDATA/global</> (Fujii Masao)
+        Save the statistics file into <filename>$PGDATA/pg_stat</filename> at server
+        shutdown, rather than <filename>$PGDATA/global</filename> (Fujii Masao)
        </para>
       </listitem>
 
diff --git a/doc/src/sgml/release-9.5.sgml b/doc/src/sgml/release-9.5.sgml
index ceece4b8a5..acd400da62 100644
--- a/doc/src/sgml/release-9.5.sgml
+++ b/doc/src/sgml/release-9.5.sgml
@@ -1,6 +1,1145 @@
 <!-- doc/src/sgml/release-9.5.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-5-12">
+  <title>Release 9.5.12</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-03-01</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.11.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.12</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you run an installation in which not all users are mutually
+    trusting, or if you maintain an application or extension that is
+    intended for use in arbitrary situations, it is strongly recommended
+    that you read the documentation changes described in the first changelog
+    entry below, and take suitable steps to ensure that your installation or
+    code is secure.
+   </para>
+
+   <para>
+    Also, the changes described in the second changelog entry below may
+    cause functions used in index expressions or materialized views to fail
+    during auto-analyze, or when reloading from a dump.  After upgrading,
+    monitor the server logs for such problems, and fix affected functions.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.10,
+    see <xref linkend="release-9-5-10"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Document how to configure installations and applications to guard
+      against search-path-dependent trojan-horse attacks from other users
+      (Noah Misch)
+     </para>
+
+     <para>
+      Using a <varname>search_path</varname> setting that includes any
+      schemas writable by a hostile user enables that user to capture
+      control of queries and then run arbitrary SQL code with the
+      permissions of the attacked user.  While it is possible to write
+      queries that are proof against such hijacking, it is notationally
+      tedious, and it's very easy to overlook holes.  Therefore, we now
+      recommend configurations in which no untrusted schemas appear in
+      one's search path.  Relevant documentation appears in
+      <xref linkend="ddl-schemas-patterns"/> (for database administrators and users),
+      <xref linkend="libpq-connect"/> (for application authors),
+      <xref linkend="extend-extensions-style"/>  (for extension authors), and
+      <xref linkend="sql-createfunction"/> (for authors
+      of <literal>SECURITY DEFINER</literal> functions).
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid use of insecure <varname>search_path</varname> settings
+      in <application>pg_dump</application> and other client programs
+      (Noah Misch, Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</application>,
+      <application>pg_upgrade</application>,
+      <application>vacuumdb</application> and
+      other <productname>PostgreSQL</productname>-provided applications were
+      themselves vulnerable to the type of hijacking described in the previous
+      changelog entry; since these applications are commonly run by
+      superusers, they present particularly attractive targets.  To make them
+      secure whether or not the installation as a whole has been secured,
+      modify them to include only the <structname>pg_catalog</structname>
+      schema in their <varname>search_path</varname> settings.
+      Autovacuum worker processes now do the same, as well.
+     </para>
+
+     <para>
+      In cases where user-provided functions are indirectly executed by
+      these programs &mdash; for example, user-provided functions in index
+      expressions &mdash; the tighter <varname>search_path</varname> may
+      result in errors, which will need to be corrected by adjusting those
+      user-provided functions to not assume anything about what search path
+      they are invoked under.  That has always been good practice, but now
+      it will be necessary for correct behavior.
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix misbehavior of concurrent-update rechecks with CTE references
+      appearing in subplans (Tom Lane)
+     </para>
+
+     <para>
+      If a CTE (<literal>WITH</literal> clause reference) is used in an
+      InitPlan or SubPlan, and the query requires a recheck due to trying
+      to update or lock a concurrently-updated row, incorrect results could
+      be obtained.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planner failures with overlapping mergejoin clauses in an outer
+      join (Tom Lane)
+     </para>
+
+     <para>
+      These mistakes led to <quote>left and right pathkeys do not match in
+      mergejoin</quote> or <quote>outer pathkeys do not match
+      mergeclauses</quote> planner errors in corner cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair <application>pg_upgrade</application>'s failure to
+      preserve <structfield>relfrozenxid</structfield> for materialized
+      views (Tom Lane, Andres Freund)
+     </para>
+
+     <para>
+      This oversight could lead to data corruption in materialized views
+      after an upgrade, manifesting as <quote>could not access status of
+      transaction</quote> or <quote>found xmin from before
+      relfrozenxid</quote> errors.  The problem would be more likely to
+      occur in seldom-refreshed materialized views, or ones that were
+      maintained only with <command>REFRESH MATERIALIZED VIEW
+      CONCURRENTLY</command>.
+     </para>
+
+     <para>
+      If such corruption is observed, it can be repaired by refreshing the
+      materialized view (without <literal>CONCURRENTLY</literal>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reporting of PL/Python function names in
+      error <literal>CONTEXT</literal> stacks (Tom Lane)
+     </para>
+
+     <para>
+      An error occurring within a nested PL/Python function call (that is,
+      one reached via a SPI query from another PL/Python function) would
+      result in a stack trace showing the inner function's name twice,
+      rather than the expected results.  Also, an error in a nested
+      PL/Python <literal>DO</literal> block could result in a null pointer
+      dereference crash on some platforms.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <filename>contrib/auto_explain</filename>'s
+      <varname>log_min_duration</varname> setting to range up
+      to <literal>INT_MAX</literal>, or about 24 days instead of 35 minutes
+      (Tom Lane)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-11">
+  <title>Release 9.5.11</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-02-08</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.10.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.11</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.5.10,
+    see <xref linkend="release-9-5-10"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that all temporary files made
+      by <application>pg_upgrade</application> are non-world-readable
+      (Tom Lane, Noah Misch)
+     </para>
+
+     <para>
+      <application>pg_upgrade</application> normally restricts its
+      temporary files to be readable and writable only by the calling user.
+      But the temporary file containing <literal>pg_dumpall -g</literal>
+      output would be group- or world-readable, or even writable, if the
+      user's <literal>umask</literal> setting allows.  In typical usage on
+      multi-user machines, the <literal>umask</literal> and/or the working
+      directory's permissions would be tight enough to prevent problems;
+      but there may be people using <application>pg_upgrade</application>
+      in scenarios where this oversight would permit disclosure of database
+      passwords to unfriendly eyes.
+      (CVE-2018-1053)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix vacuuming of tuples that were updated while key-share locked
+      (Andres Freund, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In some cases <command>VACUUM</command> would fail to remove such
+      tuples even though they are now dead, leading to assorted data
+      corruption scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix inadequate buffer locking in some LSN fetches (Jacob Champion,
+      Asim Praveen, Ashwin Agrawal)
+     </para>
+
+     <para>
+      These errors could result in misbehavior under concurrent load.
+      The potential consequences have not been characterized fully.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect query results from cases involving flattening of
+      subqueries whose outputs are used in <literal>GROUPING SETS</literal>
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary failure in a query on an inheritance tree that
+      occurs concurrently with some child table being removed from the tree
+      by <command>ALTER TABLE NO INHERIT</command> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix spurious deadlock failures when multiple sessions are
+      running <command>CREATE INDEX CONCURRENTLY</command> (Jeff Janes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix failures when an inheritance tree contains foreign child tables
+      (Etsuro Fujita)
+     </para>
+
+     <para>
+      A mix of regular and foreign tables in an inheritance tree resulted in
+      creation of incorrect plans for <command>UPDATE</command>
+      and <command>DELETE</command> queries.  This led to visible failures in
+      some cases, notably when there are row-level triggers on a foreign
+      child table.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair failure with correlated sub-<literal>SELECT</literal>
+      inside <literal>VALUES</literal> inside a <literal>LATERAL</literal>
+      subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>could not devise a query plan for the given query</quote>
+      planner failure for some cases involving nested <literal>UNION
+      ALL</literal> inside a lateral subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix logical decoding to correctly clean up disk files for crashed
+      transactions (Atsushi Torikoshi)
+     </para>
+
+     <para>
+      Logical decoding may spill WAL records to disk for transactions
+      generating many WAL records.  Normally these files are cleaned up
+      after the transaction's commit or abort record arrives; but if
+      no such record is ever seen, the removal code misbehaved.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix walsender timeout failure and failure to respond to interrupts
+      when processing a large transaction (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>has_sequence_privilege()</function> to
+      support <literal>WITH GRANT OPTION</literal> tests,
+      as other privilege-testing functions do (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In databases using UTF8 encoding, ignore any XML declaration that
+      asserts a different encoding (Pavel Stehule, Noah Misch)
+     </para>
+
+     <para>
+      We always store XML strings in the database encoding, so allowing
+      libxml to act on a declaration of another encoding gave wrong results.
+      In encodings other than UTF8, we don't promise to support non-ASCII
+      XML data anyway, so retain the previous behavior for bug compatibility.
+      This change affects only <function>xpath()</function> and related
+      functions; other XML code paths already acted this way.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide for forward compatibility with future minor protocol versions
+      (Robert Haas, Badrul Chowdhury)
+     </para>
+
+     <para>
+      Up to now, <productname>PostgreSQL</productname> servers simply
+      rejected requests to use protocol versions newer than 3.0, so that
+      there was no functional difference between the major and minor parts
+      of the protocol version number.  Allow clients to request versions 3.x
+      without failing, sending back a message showing that the server only
+      understands 3.0.  This makes no difference at the moment, but
+      back-patching this change should allow speedier introduction of future
+      minor protocol upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with failure to start a parallel worker process
+      (Amit Kapila, Robert Haas)
+     </para>
+
+     <para>
+      Parallel query previously tended to hang indefinitely if a worker
+      could not be started, as the result of <literal>fork()</literal>
+      failure or other low-probability problems.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe alignment assumptions when working
+      with <type>__int128</type> (Tom Lane)
+     </para>
+
+     <para>
+      Typically, compilers assume that <type>__int128</type> variables are
+      aligned on 16-byte boundaries, but our memory allocation
+      infrastructure isn't prepared to guarantee that, and increasing the
+      setting of MAXALIGN seems infeasible for multiple reasons.  Adjust the
+      code to allow use of <type>__int128</type> only when we can tell the
+      compiler to assume lesser alignment.  The only known symptom of this
+      problem so far is crashes in some parallel aggregation queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent stack-overflow crashes when planning extremely deeply
+      nested set operations
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix null-pointer crashes for some types of LDAP URLs appearing
+      in <filename>pg_hba.conf</filename> (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample <function>INSTR()</function> functions in the PL/pgSQL
+      documentation (Yugo Nagata, Tom Lane)
+     </para>
+
+     <para>
+      These functions are stated to
+      be <trademark class="registered">Oracle</trademark> compatible, but
+      they weren't exactly.  In particular, there was a discrepancy in the
+      interpretation of a negative third parameter: Oracle thinks that a
+      negative value indicates the last place where the target substring can
+      begin, whereas our functions took it as the last place where the
+      target can end.  Also, Oracle throws an error for a zero or negative
+      fourth parameter, whereas our functions returned zero.
+     </para>
+
+     <para>
+      The sample code has been adjusted to match Oracle's behavior more
+      precisely.  Users who have copied this code into their applications
+      may wish to update their copies.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</application> to make ACL (permissions),
+      comment, and security label entries reliably identifiable in archive
+      output formats (Tom Lane)
+     </para>
+
+     <para>
+      The <quote>tag</quote> portion of an ACL archive entry was usually
+      just the name of the associated object.  Make it start with the object
+      type instead, bringing ACLs into line with the convention already used
+      for comment and security label archive entries.  Also, fix the
+      comment and security label entries for the whole database, if present,
+      to make their tags start with <literal>DATABASE</literal> so that they
+      also follow this convention.  This prevents false matches in code that
+      tries to identify large-object-related entries by seeing if the tag
+      starts with <literal>LARGE OBJECT</literal>.  That could have resulted
+      in misclassifying entries as data rather than schema, with undesirable
+      results in a schema-only or data-only dump.
+     </para>
+
+     <para>
+      Note that this change has user-visible results in the output
+      of <command>pg_restore --list</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename <application>pg_rewind</application>'s
+      <function>copy_file_range</function> function to avoid conflict
+      with new Linux system call of that name (Andres Freund)
+     </para>
+
+     <para>
+      This change prevents build failures with newer glibc versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpg</application>, detect indicator arrays that do
+      not have the correct length and report an error (David Rader)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid triggering a libc assertion
+      in <filename>contrib/hstore</filename>, due to use
+      of <function>memcpy()</function> with equal source and destination
+      pointers (Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide modern examples of how to auto-start Postgres on macOS
+      (Tom Lane)
+     </para>
+
+     <para>
+      The scripts in <filename>contrib/start-scripts/osx</filename> use
+      infrastructure that's been deprecated for over a decade, and which no
+      longer works at all in macOS releases of the last couple of years.
+      Add a new subdirectory <filename>contrib/start-scripts/macos</filename>
+      containing scripts that use the newer <application>launchd</application>
+      infrastructure.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect selection of configuration-specific libraries for
+      OpenSSL on Windows (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support linking to MinGW-built versions of libperl (Noah Misch)
+     </para>
+
+     <para>
+      This allows building PL/Perl with some common Perl distributions for
+      Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix MSVC build to test whether 32-bit libperl
+      needs <literal>-D_USE_32BIT_TIME_T</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Available Perl distributions are inconsistent about what they expect,
+      and lack any reliable means of reporting it, so resort to a build-time
+      test on what the library being used actually does.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, install the crash dump handler earlier in postmaster
+      startup (Takayuki Tsunakawa)
+     </para>
+
+     <para>
+      This may allow collection of a core dump for some early-startup
+      failures that did not produce a dump before.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, avoid encoding-conversion-related crashes when emitting
+      messages very early in postmaster startup (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use our existing Motorola 68K spinlock code on OpenBSD as
+      well as NetBSD (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add support for spinlocks on Motorola 88K (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2018c for DST law changes in Brazil, Sao Tome and Principe,
+      plus historical corrections for Bolivia, Japan, and South Sudan.
+      The <literal>US/Pacific-New</literal> zone has been removed (it was
+      only an alias for <literal>America/Los_Angeles</literal> anyway).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-10">
+  <title>Release 9.5.10</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.5.9.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.10</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the fourth changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.5.8,
+    see <xref linkend="release-9-5-8"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that <literal>INSERT ... ON CONFLICT DO UPDATE</literal> checks
+      table permissions and RLS policies in all cases (Dean Rasheed)
+     </para>
+
+     <para>
+      The update path of <literal>INSERT ... ON CONFLICT DO UPDATE</literal>
+      requires <literal>SELECT</literal> permission on the columns of the
+      arbiter index, but it failed to check for that in the case of an
+      arbiter specified by constraint name.
+      In addition, for a table with row level security enabled, it failed to
+      check updated rows against the table's <literal>SELECT</literal>
+      policies (regardless of how the arbiter index was specified).
+      (CVE-2017-15099)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash due to rowtype mismatch
+      in <function>json{b}_populate_recordset()</function>
+      (Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      These functions used the result rowtype specified in the <literal>FROM
+      ... AS</literal> clause without checking that it matched the actual
+      rowtype of the supplied tuple value.  If it didn't, that would usually
+      result in a crash, though disclosure of server memory contents seems
+      possible as well.
+      (CVE-2017-15098)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when determining relation distinctness (David Rowley)
+     </para>
+
+     <para>
+      This allows the intended optimization to occur when a subquery has
+      a result column of type <type>varchar</type>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix missing temp-install prerequisites
+      for <literal>check</literal>-like Make targets (Noah Misch)
+     </para>
+
+     <para>
+      Some non-default test procedures that are meant to work
+      like <literal>make check</literal> failed to ensure that the temporary
+      installation was up to date.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-5-9">
+  <title>Release 9.5.9</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-31</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 9.5.8.
+   For information about new features in the 9.5 major release, see
+   <xref linkend="release-9-5"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.5.9</title>
+
+   <para>
+    A dump/restore is not required for those running 9.5.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.5.8,
+    see <xref linkend="release-9-5-8"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Show foreign tables
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
+      view (Peter Eisentraut)
+     </para>
+
+     <para>
+      All other relevant <structname>information_schema</structname> views include
+      foreign tables, but this one ignored them.
+     </para>
+
+     <para>
+      Since this view definition is installed by <application>initdb</application>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can, as a superuser, do this
+      in <application>psql</application>:
+<programlisting>
+SET search_path TO information_schema;
+CREATE OR REPLACE VIEW table_privileges AS
+    SELECT CAST(u_grantor.rolname AS sql_identifier) AS grantor,
+           CAST(grantee.rolname AS sql_identifier) AS grantee,
+           CAST(current_database() AS sql_identifier) AS table_catalog,
+           CAST(nc.nspname AS sql_identifier) AS table_schema,
+           CAST(c.relname AS sql_identifier) AS table_name,
+           CAST(c.prtype AS character_data) AS privilege_type,
+           CAST(
+             CASE WHEN
+                  -- object owner always has grant options
+                  pg_has_role(grantee.oid, c.relowner, 'USAGE')
+                  OR c.grantable
+                  THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_grantable,
+           CAST(CASE WHEN c.prtype = 'SELECT' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS with_hierarchy
+
+    FROM (
+            SELECT oid, relname, relnamespace, relkind, relowner, (aclexplode(coalesce(relacl, acldefault('r', relowner)))).* FROM pg_class
+         ) AS c (oid, relname, relnamespace, relkind, relowner, grantor, grantee, prtype, grantable),
+         pg_namespace nc,
+         pg_authid u_grantor,
+         (
+           SELECT oid, rolname FROM pg_authid
+           UNION ALL
+           SELECT 0::oid, 'PUBLIC'
+         ) AS grantee (oid, rolname)
+
+    WHERE c.relnamespace = nc.oid
+          AND c.relkind IN ('r', 'v', 'f')
+          AND c.grantee = grantee.oid
+          AND c.grantor = u_grantor.oid
+          AND c.prtype IN ('INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER')
+          AND (pg_has_role(u_grantor.oid, 'USAGE')
+               OR pg_has_role(grantee.oid, 'USAGE')
+               OR grantee.rolname = 'PUBLIC');
+</programlisting>
+      This must be repeated in each database to be fixed,
+      including <literal>template0</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Clean up handling of a fatal exit (e.g., due to receipt
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
+     </para>
+
+     <para>
+      This situation could result in an assertion failure.  In production
+      builds, the exit would still occur, but it would log an unexpected
+      message about <quote>cannot drop active portal</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Remove assertion that could trigger during a fatal exit (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly identify columns that are of a range type or domain type over
+      a composite type or domain type being searched for (Tom Lane)
+     </para>
+
+     <para>
+      Certain <command>ALTER</command> commands that change the definition of a
+      composite type or domain type are supposed to fail if there are any
+      stored values of that type in the database, because they lack the
+      infrastructure needed to update or check such values.  Previously,
+      these checks could miss relevant values that are wrapped inside range
+      types or sub-domains, possibly allowing the database to become
+      inconsistent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash in <application>pg_restore</application> when using parallel mode and
+      using a list file to select a subset of items to restore
+      (Fabr&iacute;zio de Royes Mello)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
+      clauses without attached C variables (Michael Meskes)
+     </para>
+
+     <para>
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
+      rather than using it to define values to be returned to the client.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Improve selection of compiler flags for PL/Perl on Windows (Tom Lane)
+     </para>
+
+     <para>
+      This fix avoids possible crashes of PL/Perl due to inconsistent
+      assumptions about the width of <type>time_t</type> values.
+      A side-effect that may be visible to extension developers is
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <literal>make check</literal> to behave correctly when invoked via a
+      non-GNU make program (Thomas Munro)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-5-8">
   <title>Release 9.5.8</title>
 
@@ -12,7 +1151,7 @@
   <para>
    This release contains a variety of fixes from 9.5.7.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -29,7 +1168,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.5.7,
-    see <xref linkend="release-9-5-7">.
+    see <xref linkend="release-9-5-7"/>.
    </para>
   </sect2>
 
@@ -41,7 +1180,7 @@
     <listitem>
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -49,11 +1188,11 @@
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -68,15 +1207,15 @@
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -107,15 +1246,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -129,7 +1268,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -143,16 +1282,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -160,13 +1299,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -175,12 +1314,12 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Correct the documentation about the process for upgrading standby
-      servers with <application>pg_upgrade</> (Bruce Momjian)
+      servers with <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
       The previous documentation instructed users to start/stop the primary
-      server after running <application>pg_upgrade</> but before syncing
+      server after running <application>pg_upgrade</application> but before syncing
       the standby servers.  This sequence is unsafe.
      </para>
     </listitem>
@@ -254,7 +1393,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"/> on
       Solaris (Tom Lane)
      </para>
     </listitem>
@@ -286,21 +1425,21 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -314,7 +1453,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -362,7 +1501,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -370,7 +1509,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -378,19 +1517,19 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dangling pointer in <command>ALTER TABLE</> when there is a
+      Fix dangling pointer in <command>ALTER TABLE</command> when there is a
       comment on a constraint belonging to the table (David Rowley)
      </para>
 
@@ -402,44 +1541,44 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -450,20 +1589,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -476,9 +1615,9 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -489,8 +1628,8 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -501,15 +1640,15 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -522,14 +1661,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -540,14 +1679,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -555,13 +1694,13 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
     <listitem>
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -569,7 +1708,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -581,20 +1720,20 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_rewind</> to correctly handle files exceeding 2GB
+      Fix <application>pg_rewind</application> to correctly handle files exceeding 2GB
       (Kuntal Ghosh, Michael Paquier)
      </para>
 
      <para>
-      Ordinarily such files won't appear in <productname>PostgreSQL</> data
+      Ordinarily such files won't appear in <productname>PostgreSQL</productname> data
       directories, but they could be present in some cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"/> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -606,16 +1745,16 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Fix <application>pg_xlogdump</>'s computation of WAL record length
+      Fix <application>pg_xlogdump</application>'s computation of WAL record length
       (Andres Freund)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -626,7 +1765,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -638,14 +1777,14 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
     <listitem>
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -672,34 +1811,34 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -719,7 +1858,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
   <para>
    This release contains a variety of fixes from 9.5.6.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -736,12 +1875,12 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.5.6,
-    see <xref linkend="release-9-5-6">.
+    see <xref linkend="release-9-5-6"/>.
    </para>
   </sect2>
 
@@ -753,18 +1892,18 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
     <listitem>
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -775,7 +1914,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
       By itself, this patch will only fix the behavior in newly initdb'd
       databases.  If you wish to apply this change in an existing database,
       follow the corrected procedure shown in the changelog entry for
-      CVE-2017-7547, in <xref linkend="release-9-5-8">.
+      CVE-2017-7547, in <xref linkend="release-9-5-8"/>.
      </para>
     </listitem>
 
@@ -788,7 +1927,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -802,17 +1941,17 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -843,7 +1982,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -856,7 +1995,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -864,14 +2003,14 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
@@ -885,7 +2024,7 @@ Branch: REL9_2_STABLE [1188b9b2c] 2017-08-02 15:07:21 -0400
 
     <listitem>
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -902,14 +2041,14 @@ Author: Andrew Gierth <rhodiumtoad@postgresql.org>
 Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 -->
      <para>
-      Fix crash or wrong answers when a <literal>GROUPING SETS</> column's
+      Fix crash or wrong answers when a <literal>GROUPING SETS</literal> column's
       data type is hashable but not sortable (Pavan Deolasee)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid applying <quote>physical targetlist</> optimization to custom
+      Avoid applying <quote>physical targetlist</quote> optimization to custom
       scans (Dmitry Ivanov, Tom Lane)
      </para>
 
@@ -922,13 +2061,13 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Use the correct sub-expression when applying a <literal>FOR ALL</>
+      Use the correct sub-expression when applying a <literal>FOR ALL</literal>
       row-level-security policy (Stephen Frost)
      </para>
 
      <para>
-      In some cases the <literal>WITH CHECK</> restriction would be applied
-      when the <literal>USING</> restriction is more appropriate.
+      In some cases the <literal>WITH CHECK</literal> restriction would be applied
+      when the <literal>USING</literal> restriction is more appropriate.
      </para>
     </listitem>
 
@@ -942,19 +2081,19 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -962,20 +2101,20 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Avoid dangling pointer in <command>COPY ... TO</> when row-level
+      Avoid dangling pointer in <command>COPY ... TO</command> when row-level
       security is active for the source table (Tom Lane)
      </para>
 
@@ -987,8 +2126,8 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Avoid accessing an already-closed relcache entry in <command>CLUSTER</>
-      and <command>VACUUM FULL</> (Tom Lane)
+      Avoid accessing an already-closed relcache entry in <command>CLUSTER</command>
+      and <command>VACUUM FULL</command> (Tom Lane)
      </para>
 
      <para>
@@ -999,14 +2138,14 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -1020,12 +2159,12 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -1034,21 +2173,21 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -1060,14 +2199,14 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <function>pg_get_object_address()</> to handle members of operator
+      Fix <function>pg_get_object_address()</function> to handle members of operator
       families correctly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -1081,13 +2220,13 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -1105,21 +2244,21 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -1134,20 +2273,20 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
 
     <listitem>
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -1159,26 +2298,26 @@ Branch: REL9_5_STABLE [7be3678a8] 2017-04-24 07:53:05 +0100
     <listitem>
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -1197,7 +2336,7 @@ Branch: REL9_4_STABLE [f14bf0a8f] 2017-05-06 22:19:56 -0400
 Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 -->
      <para>
-      In <filename>contrib/postgres_fdw</>,
+      In <filename>contrib/postgres_fdw</filename>,
       transmit query cancellation requests to the remote server
       (Michael Paquier, Etsuro Fujita)
      </para>
@@ -1228,7 +2367,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -1242,9 +2381,9 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -1257,16 +2396,16 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
-      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones"/>).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
      </para>
@@ -1288,7 +2427,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
   <para>
    This release contains a variety of fixes from 9.5.5.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -1306,7 +2445,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.5.5,
-    see <xref linkend="release-9-5-5">.
+    see <xref linkend="release-9-5-5"/>.
    </para>
   </sect2>
 
@@ -1318,15 +2457,15 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
     <listitem>
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -1343,7 +2482,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
@@ -1353,7 +2492,7 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
      </para>
 
      <para>
-      The WAL record emitted for a BRIN <quote>revmap</> page when moving an
+      The WAL record emitted for a BRIN <quote>revmap</quote> page when moving an
       index tuple to a different page was incorrect.  Replay would make the
       related portion of the index useless, forcing it to be recomputed.
      </para>
@@ -1361,13 +2500,13 @@ Branch: REL9_3_STABLE [3aa16b117] 2017-05-06 22:17:35 -0400
 
     <listitem>
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
-      Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      Previously, this was skipped when <xref linkend="guc-wal-level"/>
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -1438,13 +2577,13 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
 
     <listitem>
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
      <para>
       Previously, non-default settings
-      of <xref linkend="guc-default-tablespace"> could result in broken
+      of <xref linkend="guc-default-tablespace"/> could result in broken
       indexes.
      </para>
     </listitem>
@@ -1453,7 +2592,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -1469,29 +2608,29 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</> when child
+      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</command> when child
       table has different column ordering than the parent
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      Failure to adjust the column numbering in the <literal>USING</>
+      Failure to adjust the column numbering in the <literal>USING</literal>
       expression led to errors,
-      typically <quote>attribute <replaceable>N</> has wrong type</quote>.
+      typically <quote>attribute <replaceable>N</replaceable> has wrong type</quote>.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -1504,7 +2643,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
 
     <listitem>
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -1517,7 +2656,7 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
     <listitem>
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -1529,8 +2668,8 @@ Branch: REL9_4_STABLE [30e3cb307] 2016-11-17 13:31:30 -0300
     <listitem>
      <para>
       Fix commit timestamp mechanism to not fail when queried about
-      the special XIDs <literal>FrozenTransactionId</>
-      and <literal>BootstrapTransactionId</> (Craig Ringer)
+      the special XIDs <literal>FrozenTransactionId</literal>
+      and <literal>BootstrapTransactionId</literal> (Craig Ringer)
      </para>
     </listitem>
 
@@ -1568,28 +2707,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
      <para>
       The symptom was spurious <quote>ON CONFLICT is not supported on table
-      ... used as a catalog table</> errors when the target
-      of <command>INSERT ... ON CONFLICT</> is a view with cascade option.
+      ... used as a catalog table</quote> errors when the target
+      of <command>INSERT ... ON CONFLICT</command> is a view with cascade option.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix incorrect <quote>target lists can have at most <replaceable>N</>
-      entries</quote> complaint when using <literal>ON CONFLICT</> with
+      Fix incorrect <quote>target lists can have at most <replaceable>N</replaceable>
+      entries</quote> complaint when using <literal>ON CONFLICT</literal> with
       wide tables (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -1597,12 +2736,12 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -1617,15 +2756,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
     <listitem>
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -1636,20 +2775,20 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
@@ -1657,27 +2796,27 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Improve speed of user-defined aggregates that
-      use <function>array_append()</> as transition function (Tom Lane)
+      use <function>array_append()</function> as transition function (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible crash in <function>array_position()</>
-      or <function>array_positions()</> when processing arrays of records
+      Fix possible crash in <function>array_position()</function>
+      or <function>array_positions()</function> when processing arrays of records
       (Junseok Yang)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -1689,8 +2828,8 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -1703,7 +2842,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Disable transform that attempted to remove no-op <literal>AT TIME
-      ZONE</> conversions (Tom Lane)
+      ZONE</literal> conversions (Tom Lane)
      </para>
 
      <para>
@@ -1714,15 +2853,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -1742,28 +2881,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -1776,15 +2915,15 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -1792,7 +2931,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
     <listitem>
      <para>
       Fix possible mishandling of expanded arrays in domain check
-      constraints and <literal>CASE</> execution (Tom Lane)
+      constraints and <literal>CASE</literal> execution (Tom Lane)
      </para>
 
      <para>
@@ -1824,21 +2963,21 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -1850,23 +2989,23 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -1877,28 +3016,28 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix portability problems in <filename>contrib/pageinspect</>'s
+      Fix portability problems in <filename>contrib/pageinspect</filename>'s
       functions for GIN indexes (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -1925,7 +3064,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -1950,7 +3089,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
   <para>
    This release contains a variety of fixes from 9.5.4.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -1968,7 +3107,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
 
    <para>
     Also, if you are upgrading from a version earlier than 9.5.2,
-    see <xref linkend="release-9-5-2">.
+    see <xref linkend="release-9-5-2"/>.
    </para>
   </sect2>
 
@@ -1988,7 +3127,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -1996,7 +3135,7 @@ Branch: REL9_2_STABLE [60314e28e] 2016-12-13 19:08:09 -0600
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -2014,7 +3153,7 @@ Branch: REL9_4_STABLE [a69443564] 2016-09-03 13:28:53 -0400
      </para>
 
      <para>
-      The typical symptom was <quote>unexpected GIN leaf action</> errors
+      The typical symptom was <quote>unexpected GIN leaf action</quote> errors
       during WAL replay.
      </para>
     </listitem>
@@ -2029,13 +3168,13 @@ Branch: REL9_4_STABLE [8778da2af] 2016-09-09 15:54:29 -0300
 Branch: REL9_3_STABLE [dfe7121df] 2016-09-09 15:54:29 -0300
 -->
      <para>
-      Fix <command>SELECT FOR UPDATE/SHARE</> to correctly lock tuples that
+      Fix <command>SELECT FOR UPDATE/SHARE</command> to correctly lock tuples that
       have been updated by a subsequently-aborted transaction
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      In 9.5 and later, the <command>SELECT</> would sometimes fail to
+      In 9.5 and later, the <command>SELECT</command> would sometimes fail to
       return such tuples at all.  A failure has not been proven to occur in
       earlier releases, but might be possible with concurrent updates.
      </para>
@@ -2071,13 +3210,13 @@ Branch: REL9_5_STABLE [94bc30725] 2016-08-17 17:03:36 -0700
 -->
      <para>
       Fix deletion of speculatively inserted TOAST tuples when backing out
-      of <command>INSERT ... ON CONFLICT</> (Oskari Saarenmaa)
+      of <command>INSERT ... ON CONFLICT</command> (Oskari Saarenmaa)
      </para>
 
      <para>
       In the race condition where two transactions try to insert conflicting
       tuples at about the same time, the loser would fail with
-      an <quote>attempted to delete invisible tuple</> error if its
+      an <quote>attempted to delete invisible tuple</quote> error if its
       insertion included any TOAST'ed fields.
      </para>
     </listitem>
@@ -2085,7 +3224,7 @@ Branch: REL9_5_STABLE [94bc30725] 2016-08-17 17:03:36 -0700
     <listitem>
      <para>
       Don't throw serialization errors for self-conflicting insertions
-      in <command>INSERT ... ON CONFLICT</> (Thomas Munro, Peter Geoghegan)
+      in <command>INSERT ... ON CONFLICT</command> (Thomas Munro, Peter Geoghegan)
      </para>
     </listitem>
 
@@ -2123,29 +3262,29 @@ Branch: REL9_5_STABLE [46bd14a10] 2016-08-24 22:20:01 -0400
 Branch: REL9_4_STABLE [566afa15c] 2016-08-24 22:20:01 -0400
 -->
      <para>
-      Fix query-lifespan memory leak in a bulk <command>UPDATE</> on a table
-      with a <literal>PRIMARY KEY</> or <literal>REPLICA IDENTITY</> index
+      Fix query-lifespan memory leak in a bulk <command>UPDATE</command> on a table
+      with a <literal>PRIMARY KEY</literal> or <literal>REPLICA IDENTITY</literal> index
       (Tom Lane)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>COPY</> with a column name list from a table that has
+      Fix <command>COPY</command> with a column name list from a table that has
       row-level security enabled (Adam Brightwell)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
-      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+      Fix <command>EXPLAIN</command> to emit valid XML when
+      <xref linkend="guc-track-io-timing"/> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
@@ -2160,20 +3299,20 @@ Branch: REL9_2_STABLE [ceb005319] 2016-08-12 12:13:04 -0400
 -->
      <para>
       Suppress printing of zeroes for unmeasured times
-      in <command>EXPLAIN</> (Maksim Milyutin)
+      in <command>EXPLAIN</command> (Maksim Milyutin)
      </para>
 
      <para>
       Certain option combinations resulted in printing zero values for times
       that actually aren't ever measured in that combination.  Our general
-      policy in <command>EXPLAIN</> is not to print such fields at all, so
+      policy in <command>EXPLAIN</command> is not to print such fields at all, so
       do that consistently in all cases.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix statistics update for <command>TRUNCATE</> in a prepared
+      Fix statistics update for <command>TRUNCATE</command> in a prepared
       transaction (Stas Kelvich)
      </para>
     </listitem>
@@ -2190,37 +3329,37 @@ Branch: REL9_2_STABLE [eaf6fe7fa] 2016-09-09 11:45:40 +0100
 Branch: REL9_1_STABLE [3ed7f54bc] 2016-09-09 11:46:03 +0100
 -->
      <para>
-      Fix timeout length when <command>VACUUM</> is waiting for exclusive
+      Fix timeout length when <command>VACUUM</command> is waiting for exclusive
       table lock so that it can truncate the table (Simon Riggs)
      </para>
 
      <para>
       The timeout was meant to be 50 milliseconds, but it was actually only
-      50 microseconds, causing <command>VACUUM</> to give up on truncation
+      50 microseconds, causing <command>VACUUM</command> to give up on truncation
       much more easily than intended.  Set it to the intended value.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
     <listitem>
      <para>
       Show a sensible value
-      in <structname>pg_settings</>.<structfield>unit</>
-      for <varname>min_wal_size</> and <varname>max_wal_size</> (Tom Lane)
+      in <structname>pg_settings</structname>.<structfield>unit</structfield>
+      for <varname>min_wal_size</varname> and <varname>max_wal_size</varname> (Tom Lane)
      </para>
     </listitem>
 
@@ -2236,15 +3375,15 @@ Branch: REL9_1_STABLE [7e01c8ef3] 2016-08-14 15:06:02 -0400
 -->
      <para>
       Remove artificial restrictions on the values accepted
-      by <function>numeric_in()</> and <function>numeric_recv()</>
+      by <function>numeric_in()</function> and <function>numeric_recv()</function>
       (Tom Lane)
      </para>
 
      <para>
       We allow numeric values up to the limit of the storage format (more
-      than <literal>1e100000</>), so it seems fairly pointless
-      that <function>numeric_in()</> rejected scientific-notation exponents
-      above 1000.  Likewise, it was silly for <function>numeric_recv()</> to
+      than <literal>1e100000</literal>), so it seems fairly pointless
+      that <function>numeric_in()</function> rejected scientific-notation exponents
+      above 1000.  Likewise, it was silly for <function>numeric_recv()</function> to
       reject more than 1000 digits in an input value.
      </para>
     </listitem>
@@ -2264,7 +3403,7 @@ Branch: REL9_1_STABLE [7e01c8ef3] 2016-08-14 15:06:02 -0400
      </para>
 
      <para>
-      With <xref linkend="guc-track-commit-timestamp"> turned on, old
+      With <xref linkend="guc-track-commit-timestamp"/> turned on, old
       commit timestamps became inaccessible after a clean server restart.
      </para>
     </listitem>
@@ -2290,7 +3429,7 @@ Branch: REL9_5_STABLE [da9659f87] 2016-08-22 15:30:37 -0400
 
      <para>
       In the worst case, this could result in a corrupt btree index, which
-      would need to be rebuilt using <command>REINDEX</>.  However, the
+      would need to be rebuilt using <command>REINDEX</command>.  However, the
       situation is believed to be rare.
      </para>
     </listitem>
@@ -2324,7 +3463,7 @@ Branch: REL9_2_STABLE [823df401d] 2016-08-31 08:52:13 -0400
 Branch: REL9_1_STABLE [e3439a455] 2016-08-31 08:52:13 -0400
 -->
      <para>
-      Disallow starting a standalone backend with <literal>standby_mode</>
+      Disallow starting a standalone backend with <literal>standby_mode</literal>
       turned on (Michael Paquier)
      </para>
 
@@ -2350,7 +3489,7 @@ Branch: REL9_4_STABLE [690a2fb90] 2016-08-17 13:15:04 -0700
 
      <para>
       This failure to reset all of the fields of the slot could
-      prevent <command>VACUUM</> from removing dead tuples.
+      prevent <command>VACUUM</command> from removing dead tuples.
      </para>
     </listitem>
 
@@ -2361,7 +3500,7 @@ Branch: REL9_4_STABLE [690a2fb90] 2016-08-17 13:15:04 -0700
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -2387,7 +3526,7 @@ Branch: REL9_4_STABLE [32cdf680f] 2016-09-23 09:54:11 -0400
 
      <para>
       Previously, the same value would be chosen every time, because it was
-      derived from <function>random()</> but <function>srandom()</> had not
+      derived from <function>random()</function> but <function>srandom()</function> had not
       yet been called.  While relatively harmless, this was not the intended
       behavior.
      </para>
@@ -2407,8 +3546,8 @@ Branch: REL9_4_STABLE [c23b2523d] 2016-09-20 12:12:36 -0400
      </para>
 
      <para>
-      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</> rather
-      than <literal>ERROR_ALREADY_EXISTS</> when there is an existing
+      Windows sometimes returns <literal>ERROR_ACCESS_DENIED</literal> rather
+      than <literal>ERROR_ALREADY_EXISTS</literal> when there is an existing
       segment.  This led to postmaster startup failure due to believing that
       the former was an unrecoverable error.
      </para>
@@ -2422,8 +3561,8 @@ Branch: REL9_6_STABLE Release: REL9_6_0 [c81c71d88] 2016-08-18 14:48:51 -0400
 Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
 -->
      <para>
-      Fix <application>PL/pgSQL</> to not misbehave with parameters and
-      local variables of type <type>int2vector</> or <type>oidvector</>
+      Fix <application>PL/pgSQL</application> to not misbehave with parameters and
+      local variables of type <type>int2vector</type> or <type>oidvector</type>
       (Tom Lane)
      </para>
     </listitem>
@@ -2431,7 +3570,7 @@ Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
     <listitem>
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -2442,12 +3581,12 @@ Branch: REL9_5_STABLE [a8fc19505] 2016-08-18 14:48:51 -0400
 
     <listitem>
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
@@ -2463,7 +3602,7 @@ Branch: REL9_2_STABLE [a4a3fac16] 2016-09-18 14:00:13 +0300
 Branch: REL9_1_STABLE [ed29d2de2] 2016-09-18 14:07:30 +0300
 -->
      <para>
-      Make <application>ecpg</>'s <option>--help</> and <option>--version</>
+      Make <application>ecpg</application>'s <option>--help</option> and <option>--version</option>
       options work consistently with our other executables (Haribabu Kommi)
      </para>
     </listitem>
@@ -2481,12 +3620,12 @@ Branch: REL9_5_STABLE [b93d37474] 2016-09-21 13:16:20 +0300
 Branch: REL9_4_STABLE [f16d4a241] 2016-09-21 13:16:24 +0300
 -->
      <para>
-      Fix <application>pgbench</>'s calculation of average latency
+      Fix <application>pgbench</application>'s calculation of average latency
       (Fabien Coelho)
      </para>
 
      <para>
-      The calculation was incorrect when there were <literal>\sleep</>
+      The calculation was incorrect when there were <literal>\sleep</literal>
       commands in the script, or when the test duration was specified in
       number of transactions rather than total time.
      </para>
@@ -2494,7 +3633,7 @@ Branch: REL9_4_STABLE [f16d4a241] 2016-09-21 13:16:24 +0300
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, check library loadability in name order
+      In <application>pg_upgrade</application>, check library loadability in name order
       (Tom Lane)
      </para>
 
@@ -2516,12 +3655,12 @@ Branch: REL9_3_STABLE [f39bb487d] 2016-09-23 13:49:27 -0400
 Branch: REL9_2_STABLE [53b29d986] 2016-09-23 13:49:27 -0400
 -->
      <para>
-      In <application>pg_dump</>, never dump range constructor functions
+      In <application>pg_dump</application>, never dump range constructor functions
       (Tom Lane)
      </para>
 
      <para>
-      This oversight led to <application>pg_upgrade</> failures with
+      This oversight led to <application>pg_upgrade</application> failures with
       extensions containing range types, due to duplicate creation of the
       constructor functions.
      </para>
@@ -2535,9 +3674,9 @@ Branch: REL9_6_STABLE Release: REL9_6_0 [a88cee90f] 2016-09-08 10:48:03 -0400
 Branch: REL9_5_STABLE [142a110b3] 2016-09-08 10:48:03 -0400
 -->
      <para>
-      In <application>pg_dump</> with <option>-C</>,
-      suppress <literal>TABLESPACE</> clause of <command>CREATE DATABASE</>
-      if <option>--no-tablespaces</> is specified (Tom Lane)
+      In <application>pg_dump</application> with <option>-C</option>,
+      suppress <literal>TABLESPACE</literal> clause of <command>CREATE DATABASE</command>
+      if <option>--no-tablespaces</option> is specified (Tom Lane)
      </para>
     </listitem>
 
@@ -2550,27 +3689,27 @@ Branch: REL9_5_STABLE [9050e5c89] 2016-08-29 12:18:57 +0100
 Branch: REL9_5_STABLE [3aa233f82] 2016-08-29 18:12:04 -0300
 -->
      <para>
-      Make <application>pg_receivexlog</> work correctly
-      with <option>--synchronous</> without slots (Gabriele Bartolini)
+      Make <application>pg_receivexlog</application> work correctly
+      with <option>--synchronous</option> without slots (Gabriele Bartolini)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Disallow specifying both <option>--source-server</>
-      and <option>--source-target</> options to <application>pg_rewind</>
+      Disallow specifying both <option>--source-server</option>
+      and <option>--source-target</option> options to <application>pg_rewind</application>
       (Michael Banck)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <application>pg_rewind</> turn off <varname>synchronous_commit</>
+      Make <application>pg_rewind</application> turn off <varname>synchronous_commit</varname>
       in its session on the source server (Michael Banck, Michael Paquier)
      </para>
 
      <para>
-      This allows <application>pg_rewind</> to work even when the source
+      This allows <application>pg_rewind</application> to work even when the source
       server is using synchronous replication that is not working for some
       reason.
      </para>
@@ -2578,8 +3717,8 @@ Branch: REL9_5_STABLE [3aa233f82] 2016-08-29 18:12:04 -0300
 
     <listitem>
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -2598,7 +3737,7 @@ Branch: REL9_4_STABLE [314a25fb3] 2016-08-29 14:38:17 +0900
 Branch: REL9_3_STABLE [5833306dd] 2016-08-29 15:51:30 +0900
 -->
      <para>
-      Fix <application>pg_xlogdump</> to cope with a WAL file that begins
+      Fix <application>pg_xlogdump</application> to cope with a WAL file that begins
       with a continuation record spanning more than one page (Pavan
       Deolasee)
      </para>
@@ -2613,8 +3752,8 @@ Branch: REL9_5_STABLE [60b6d99da] 2016-09-15 09:30:36 -0400
 Branch: REL9_4_STABLE [1336bd986] 2016-09-15 09:22:52 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_buffercache</> to work
-      when <varname>shared_buffers</> exceeds 256GB (KaiGai Kohei)
+      Fix <filename>contrib/pg_buffercache</filename> to work
+      when <varname>shared_buffers</varname> exceeds 256GB (KaiGai Kohei)
      </para>
     </listitem>
 
@@ -2630,8 +3769,8 @@ Branch: REL9_2_STABLE [60bb1bb12] 2016-08-17 15:51:11 -0400
 Branch: REL9_1_STABLE [9942376a5] 2016-08-17 15:51:11 -0400
 -->
      <para>
-      Fix <filename>contrib/intarray/bench/bench.pl</> to print the results
-      of the <command>EXPLAIN</> it does when given the <option>-e</> option
+      Fix <filename>contrib/intarray/bench/bench.pl</filename> to print the results
+      of the <command>EXPLAIN</command> it does when given the <option>-e</option> option
       (Daniel Gustafsson)
      </para>
     </listitem>
@@ -2665,11 +3804,11 @@ Branch: REL9_4_STABLE [5d41f27a9] 2016-09-23 15:50:00 -0400
      </para>
 
      <para>
-      When <productname>PostgreSQL</> has been configured
-      with <option>--enable-tap-tests</>, <quote>make install</> will now
+      When <productname>PostgreSQL</productname> has been configured
+      with <option>--enable-tap-tests</option>, <quote>make install</quote> will now
       install the Perl support files for TAP testing where PGXS can find
       them.  This allows non-core extensions to
-      use <literal>$(prove_check)</> without extra tests.
+      use <literal>$(prove_check)</literal> without extra tests.
      </para>
     </listitem>
 
@@ -2682,7 +3821,7 @@ Branch: REL9_5_STABLE [52acf020a] 2016-09-19 14:27:08 -0400
 Branch: REL9_4_STABLE [ca93b816f] 2016-09-19 14:27:13 -0400
 -->
      <para>
-      In MSVC builds, include <application>pg_recvlogical</> in a
+      In MSVC builds, include <application>pg_recvlogical</application> in a
       client-only installation (MauMau)
      </para>
     </listitem>
@@ -2722,17 +3861,17 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
       If a dynamic time zone abbreviation does not match any entry in the
       referenced time zone, treat it as equivalent to the time zone name.
       This avoids unexpected failures when IANA removes abbreviations from
-      their time zone database, as they did in <application>tzdata</>
+      their time zone database, as they did in <application>tzdata</application>
       release 2016f and seem likely to do again in the future.  The
       consequences were not limited to not recognizing the individual
       abbreviation; any mismatch caused
-      the <structname>pg_timezone_abbrevs</> view to fail altogether.
+      the <structname>pg_timezone_abbrevs</structname> view to fail altogether.
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -2745,15 +3884,15 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -2774,7 +3913,7 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
   <para>
    This release contains a variety of fixes from 9.5.3.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -2786,7 +3925,7 @@ Branch: REL9_1_STABLE [380dad29d] 2016-09-02 17:29:32 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.5.2,
-    see <xref linkend="release-9-5-2">.
+    see <xref linkend="release-9-5-2"/>.
    </para>
   </sect2>
 
@@ -2807,17 +3946,17 @@ Branch: REL9_1_STABLE [5327b764a] 2016-08-08 10:33:47 -0400
 -->
      <para>
       Fix possible mis-evaluation of
-      nested <literal>CASE</>-<literal>WHEN</> expressions (Heikki
+      nested <literal>CASE</literal>-<literal>WHEN</literal> expressions (Heikki
       Linnakangas, Michael Paquier, Tom Lane)
      </para>
 
      <para>
-      A <literal>CASE</> expression appearing within the test value
-      subexpression of another <literal>CASE</> could become confused about
+      A <literal>CASE</literal> expression appearing within the test value
+      subexpression of another <literal>CASE</literal> could become confused about
       whether its own test value was null or not.  Also, inlining of a SQL
       function implementing the equality operator used by
-      a <literal>CASE</> expression could result in passing the wrong test
-      value to functions called within a <literal>CASE</> expression in the
+      a <literal>CASE</literal> expression could result in passing the wrong test
+      value to functions called within a <literal>CASE</literal> expression in the
       SQL function's body.  If the test values were of different data
       types, a crash might result; moreover such situations could be abused
       to allow disclosure of portions of server memory.  (CVE-2016-5423)
@@ -2878,7 +4017,7 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
      </para>
 
      <para>
-      Numerous places in <application>vacuumdb</> and other client programs
+      Numerous places in <application>vacuumdb</application> and other client programs
       could become confused by database and role names containing double
       quotes or backslashes.  Tighten up quoting rules to make that safe.
       Also, ensure that when a conninfo string is used as a database name
@@ -2887,22 +4026,22 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
 
      <para>
       Fix handling of paired double quotes
-      in <application>psql</>'s <command>\connect</>
-      and <command>\password</> commands to match the documentation.
+      in <application>psql</application>'s <command>\connect</command>
+      and <command>\password</command> commands to match the documentation.
      </para>
 
      <para>
-      Introduce a new <option>-reuse-previous</> option
-      in <application>psql</>'s <command>\connect</> command to allow
+      Introduce a new <option>-reuse-previous</option> option
+      in <application>psql</application>'s <command>\connect</command> command to allow
       explicit control of whether to re-use connection parameters from a
       previous connection.  (Without this, the choice is based on whether
       the database name looks like a conninfo string, as before.)  This
       allows secure handling of database names containing special
-      characters in <application>pg_dumpall</> scripts.
+      characters in <application>pg_dumpall</application> scripts.
      </para>
 
      <para>
-      <application>pg_dumpall</> now refuses to deal with database and role
+      <application>pg_dumpall</application> now refuses to deal with database and role
       names containing carriage returns or newlines, as it seems impractical
       to quote those characters safely on Windows.  In future we may reject
       such names on the server side, but that step has not been taken yet.
@@ -2912,7 +4051,7 @@ Branch: REL9_1_STABLE [aed766ab5] 2016-08-08 10:07:53 -0400
       These are considered security fixes because crafted object names
       containing special characters could have been used to execute
       commands with superuser privileges the next time a superuser
-      executes <application>pg_dumpall</> or other routine maintenance
+      executes <application>pg_dumpall</application> or other routine maintenance
       operations.  (CVE-2016-5424)
      </para>
     </listitem>
@@ -2934,18 +4073,18 @@ Branch: REL9_2_STABLE [7b8526e5d] 2016-07-28 16:09:15 -0400
 Branch: REL9_1_STABLE [c0e5096fc] 2016-07-28 16:09:15 -0400
 -->
      <para>
-      Fix corner-case misbehaviors for <literal>IS NULL</>/<literal>IS NOT
-      NULL</> applied to nested composite values (Andrew Gierth, Tom Lane)
+      Fix corner-case misbehaviors for <literal>IS NULL</literal>/<literal>IS NOT
+      NULL</literal> applied to nested composite values (Andrew Gierth, Tom Lane)
      </para>
 
      <para>
-      The SQL standard specifies that <literal>IS NULL</> should return
+      The SQL standard specifies that <literal>IS NULL</literal> should return
       TRUE for a row of all null values (thus <literal>ROW(NULL,NULL) IS
-      NULL</> yields TRUE), but this is not meant to apply recursively
-      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</> yields FALSE).
+      NULL</literal> yields TRUE), but this is not meant to apply recursively
+      (thus <literal>ROW(NULL, ROW(NULL,NULL)) IS NULL</literal> yields FALSE).
       The core executor got this right, but certain planner optimizations
       treated the test as recursive (thus producing TRUE in both cases),
-      and <filename>contrib/postgres_fdw</> could produce remote queries
+      and <filename>contrib/postgres_fdw</filename> could produce remote queries
       that misbehaved similarly.
      </para>
     </listitem>
@@ -2957,8 +4096,8 @@ Branch: master [eae1ad9b6] 2016-05-23 19:23:36 -0400
 Branch: REL9_5_STABLE [e504d915b] 2016-05-23 19:23:36 -0400
 -->
      <para>
-      Fix <quote>unrecognized node type</> error for <command>INSERT ... ON
-      CONFLICT</> within a recursive CTE (a <literal>WITH</> item) (Peter
+      Fix <quote>unrecognized node type</quote> error for <command>INSERT ... ON
+      CONFLICT</command> within a recursive CTE (a <literal>WITH</literal> item) (Peter
       Geoghegan)
      </para>
     </listitem>
@@ -2970,7 +4109,7 @@ Branch: master [26e66184d] 2016-05-11 16:20:23 -0400
 Branch: REL9_5_STABLE [58d802410] 2016-05-11 16:20:03 -0400
 -->
      <para>
-      Fix <command>INSERT ... ON CONFLICT</> to successfully match index
+      Fix <command>INSERT ... ON CONFLICT</command> to successfully match index
       expressions or index predicates that are simplified during the
       planner's expression preprocessing phase (Tom Lane)
      </para>
@@ -2984,7 +4123,7 @@ Branch: REL9_5_STABLE [31ce32ade] 2016-07-04 16:09:11 -0400
 -->
      <para>
       Correctly handle violations of exclusion constraints that apply to
-      the target table of an <literal>INSERT ... ON CONFLICT</> command,
+      the target table of an <literal>INSERT ... ON CONFLICT</literal> command,
       but are not one of the selected arbiter indexes (Tom Lane)
      </para>
 
@@ -3001,7 +4140,7 @@ Branch: master [8a13d5e6d] 2016-05-11 17:06:53 -0400
 Branch: REL9_5_STABLE [428484ce1] 2016-05-11 17:06:53 -0400
 -->
      <para>
-      Fix <command>INSERT ... ON CONFLICT</> to not fail if the target
+      Fix <command>INSERT ... ON CONFLICT</command> to not fail if the target
       table has a unique index on OID (Tom Lane)
      </para>
     </listitem>
@@ -3017,7 +4156,7 @@ Branch: REL9_2_STABLE [f66e0fec3] 2016-06-16 17:16:53 -0400
 Branch: REL9_1_STABLE [7b97dafa2] 2016-06-16 17:16:58 -0400
 -->
      <para>
-      Make the <type>inet</> and <type>cidr</> data types properly reject
+      Make the <type>inet</type> and <type>cidr</type> data types properly reject
       IPv6 addresses with too many colon-separated fields (Tom Lane)
      </para>
     </listitem>
@@ -3033,8 +4172,8 @@ Branch: REL9_2_STABLE [89b301104] 2016-07-16 14:42:37 -0400
 Branch: REL9_1_STABLE [608cc0c41] 2016-07-16 14:42:37 -0400
 -->
      <para>
-      Prevent crash in <function>close_ps()</>
-      (the <type>point</> <literal>##</> <type>lseg</> operator)
+      Prevent crash in <function>close_ps()</function>
+      (the <type>point</type> <literal>##</literal> <type>lseg</type> operator)
       for NaN input coordinates (Tom Lane)
      </para>
 
@@ -3052,7 +4191,7 @@ Branch: REL9_4_STABLE [b25d87f91] 2016-07-01 11:40:22 -0400
 Branch: REL9_3_STABLE [b0f20c2ea] 2016-07-01 11:40:22 -0400
 -->
      <para>
-      Avoid possible crash in <function>pg_get_expr()</> when inconsistent
+      Avoid possible crash in <function>pg_get_expr()</function> when inconsistent
       values are passed to it (Michael Paquier, Thomas Munro)
      </para>
     </listitem>
@@ -3068,12 +4207,12 @@ Branch: REL9_2_STABLE [b0134fe84] 2016-08-08 11:13:45 -0400
 Branch: REL9_1_STABLE [d555d2642] 2016-08-08 11:13:51 -0400
 -->
      <para>
-      Fix several one-byte buffer over-reads in <function>to_number()</>
+      Fix several one-byte buffer over-reads in <function>to_number()</function>
       (Peter Eisentraut)
      </para>
 
      <para>
-      In several cases the <function>to_number()</> function would read one
+      In several cases the <function>to_number()</function> function would read one
       more character than it should from the input string.  There is a
       small chance of a crash, if the input happens to be adjacent to the
       end of memory.
@@ -3090,8 +4229,8 @@ Branch: REL9_3_STABLE [17bfef80e] 2016-06-27 15:57:21 -0400
 -->
      <para>
       Do not run the planner on the query contained in <literal>CREATE
-      MATERIALIZED VIEW</> or <literal>CREATE TABLE AS</>
-      when <literal>WITH NO DATA</> is specified (Michael Paquier,
+      MATERIALIZED VIEW</literal> or <literal>CREATE TABLE AS</literal>
+      when <literal>WITH NO DATA</literal> is specified (Michael Paquier,
       Tom Lane)
      </para>
 
@@ -3114,7 +4253,7 @@ Branch: REL9_1_STABLE [37276017f] 2016-07-15 17:49:49 -0700
 -->
      <para>
       Avoid unsafe intermediate state during expensive paths
-      through <function>heap_update()</> (Masahiko Sawada, Andres Freund)
+      through <function>heap_update()</function> (Masahiko Sawada, Andres Freund)
      </para>
 
      <para>
@@ -3154,8 +4293,8 @@ Branch: REL9_4_STABLE [166873dd0] 2016-07-15 14:17:20 -0400
 Branch: REL9_3_STABLE [6c243f90a] 2016-07-15 14:17:20 -0400
 -->
      <para>
-      Avoid unnecessary <quote>could not serialize access</> errors when
-      acquiring <literal>FOR KEY SHARE</> row locks in serializable mode
+      Avoid unnecessary <quote>could not serialize access</quote> errors when
+      acquiring <literal>FOR KEY SHARE</literal> row locks in serializable mode
       (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3169,14 +4308,14 @@ Branch: master [9eaf5be50] 2016-06-03 18:07:14 -0400
 Branch: REL9_5_STABLE [8355897ff] 2016-06-03 18:07:14 -0400
 -->
      <para>
-      Make sure <quote>expanded</> datums returned by a plan node are
+      Make sure <quote>expanded</quote> datums returned by a plan node are
       read-only (Tom Lane)
      </para>
 
      <para>
       This avoids failures in some cases where the result of a lower plan
       node is referenced in multiple places in upper nodes.  So far as
-      core <productname>PostgreSQL</> is concerned, only array values
+      core <productname>PostgreSQL</productname> is concerned, only array values
       returned by PL/pgSQL functions are at risk; but extensions might
       use expanded datums for other things.
      </para>
@@ -3197,7 +4336,7 @@ Branch: REL9_3_STABLE [dafdcbb6c] 2016-06-22 11:55:32 -0400
 Branch: REL9_2_STABLE [dd41661d2] 2016-06-22 11:55:35 -0400
 -->
      <para>
-      Avoid crash in <literal>postgres -C</> when the specified variable
+      Avoid crash in <literal>postgres -C</literal> when the specified variable
       has a null string value (Michael Paquier)
      </para>
     </listitem>
@@ -3293,12 +4432,12 @@ Branch: REL9_2_STABLE [4cf0978ea] 2016-05-24 15:47:51 -0400
 Branch: REL9_1_STABLE [5551dac59] 2016-05-24 15:47:51 -0400
 -->
      <para>
-      Avoid consuming a transaction ID during <command>VACUUM</>
+      Avoid consuming a transaction ID during <command>VACUUM</command>
       (Alexander Korotkov)
      </para>
 
      <para>
-      Some cases in <command>VACUUM</> unnecessarily caused an XID to be
+      Some cases in <command>VACUUM</command> unnecessarily caused an XID to be
       assigned to the current transaction.  Normally this is negligible,
       but if one is up against the XID wraparound limit, consuming more
       XIDs during anti-wraparound vacuums is a very bad thing.
@@ -3321,7 +4460,7 @@ Branch: REL9_3_STABLE [28f294afd] 2016-06-24 18:29:28 -0400
 
      <para>
       The usual symptom of this bug is errors
-      like <quote>MultiXactId <replaceable>NNN</> has not been created
+      like <quote>MultiXactId <replaceable>NNN</replaceable> has not been created
       yet -- apparent wraparound</quote>.
      </para>
     </listitem>
@@ -3337,8 +4476,8 @@ Branch: REL9_2_STABLE [3201709de] 2016-06-06 17:44:18 -0400
 Branch: REL9_1_STABLE [32ceb8dfb] 2016-06-06 17:44:18 -0400
 -->
      <para>
-      When a manual <command>ANALYZE</> specifies a column list, don't
-      reset the table's <literal>changes_since_analyze</> counter
+      When a manual <command>ANALYZE</command> specifies a column list, don't
+      reset the table's <literal>changes_since_analyze</literal> counter
       (Tom Lane)
      </para>
 
@@ -3359,7 +4498,7 @@ Branch: REL9_2_STABLE [127d73009] 2016-08-07 18:52:02 -0400
 Branch: REL9_1_STABLE [a449ad095] 2016-08-07 18:52:02 -0400
 -->
      <para>
-      Fix <command>ANALYZE</>'s overestimation of <literal>n_distinct</>
+      Fix <command>ANALYZE</command>'s overestimation of <literal>n_distinct</literal>
       for a unique or nearly-unique column with many null entries (Tom
       Lane)
      </para>
@@ -3423,7 +4562,7 @@ Branch: REL9_4_STABLE [98d5f366b] 2016-08-06 14:28:38 -0400
      </para>
 
      <para>
-      This mistake prevented <command>VACUUM</> from completing in some
+      This mistake prevented <command>VACUUM</command> from completing in some
       cases involving corrupt b-tree indexes.
      </para>
     </listitem>
@@ -3435,7 +4574,7 @@ Branch: master [8cf739de8] 2016-06-24 16:57:36 -0400
 Branch: REL9_5_STABLE [07f69137b] 2016-06-24 16:57:36 -0400
 -->
      <para>
-      Fix building of large (bigger than <varname>shared_buffers</>)
+      Fix building of large (bigger than <varname>shared_buffers</varname>)
       hash indexes (Tom Lane)
      </para>
 
@@ -3469,9 +4608,9 @@ Branch: master [8a859691d] 2016-06-05 11:53:06 -0400
 Branch: REL9_5_STABLE [a7aa61ffe] 2016-06-05 11:53:06 -0400
 -->
      <para>
-      Fix possible crash during a nearest-neighbor (<literal>ORDER BY</>
-      distance) indexscan on a <filename>contrib/btree_gist</> index on
-      an <type>interval</> column (Peter Geoghegan)
+      Fix possible crash during a nearest-neighbor (<literal>ORDER BY</literal>
+      distance) indexscan on a <filename>contrib/btree_gist</filename> index on
+      an <type>interval</type> column (Peter Geoghegan)
      </para>
     </listitem>
 
@@ -3482,7 +4621,7 @@ Branch: master [975ad4e60] 2016-05-30 14:47:22 -0400
 Branch: REL9_5_STABLE [2973d7d02] 2016-05-30 14:47:22 -0400
 -->
      <para>
-      Fix <quote>PANIC: failed to add BRIN tuple</> error when attempting
+      Fix <quote>PANIC: failed to add BRIN tuple</quote> error when attempting
       to update a BRIN index entry (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -3505,8 +4644,8 @@ Branch: master [baebab3ac] 2016-07-12 18:07:03 -0400
 Branch: REL9_5_STABLE [a0943dbbe] 2016-07-12 18:06:50 -0400
 -->
      <para>
-      Fix PL/pgSQL's handling of the <literal>INTO</> clause
-      within <command>IMPORT FOREIGN SCHEMA</> commands (Tom Lane)
+      Fix PL/pgSQL's handling of the <literal>INTO</literal> clause
+      within <command>IMPORT FOREIGN SCHEMA</command> commands (Tom Lane)
      </para>
     </listitem>
 
@@ -3521,8 +4660,8 @@ Branch: REL9_2_STABLE [6c0be49b2] 2016-07-17 09:39:51 -0400
 Branch: REL9_1_STABLE [84d679204] 2016-07-17 09:41:08 -0400
 -->
      <para>
-      Fix <filename>contrib/btree_gin</> to handle the smallest
-      possible <type>bigint</> value correctly (Peter Eisentraut)
+      Fix <filename>contrib/btree_gin</filename> to handle the smallest
+      possible <type>bigint</type> value correctly (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -3544,7 +4683,7 @@ Branch: REL9_1_STABLE [1f63b0e09] 2016-08-05 18:58:36 -0400
      <para>
       It's planned to switch to two-part instead of three-part server
       version numbers for releases after 9.6.  Make sure
-      that <function>PQserverVersion()</> returns the correct value for
+      that <function>PQserverVersion()</function> returns the correct value for
       such cases.
      </para>
     </listitem>
@@ -3560,7 +4699,7 @@ Branch: REL9_2_STABLE [295edbecf] 2016-08-01 15:08:48 +0200
 Branch: REL9_1_STABLE [c15f502b6] 2016-08-01 15:08:36 +0200
 -->
      <para>
-      Fix <application>ecpg</>'s code for <literal>unsigned long long</>
+      Fix <application>ecpg</application>'s code for <literal>unsigned long long</literal>
       array elements (Michael Meskes)
      </para>
     </listitem>
@@ -3575,8 +4714,8 @@ Branch: REL9_3_STABLE [6693c9d7b] 2016-08-02 12:49:09 -0400
 Branch: REL9_2_STABLE [a5a7caaa1] 2016-08-02 12:49:15 -0400
 -->
      <para>
-      In <application>pg_dump</> with both <option>-c</> and <option>-C</>
-      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</>
+      In <application>pg_dump</application> with both <option>-c</option> and <option>-C</option>
+      options, avoid emitting an unwanted <literal>CREATE SCHEMA public</literal>
       command (David Johnston, Tom Lane)
      </para>
     </listitem>
@@ -3594,15 +4733,15 @@ Branch: REL9_4_STABLE [53c2601a5] 2016-06-03 11:29:20 -0400
 Branch: REL9_3_STABLE [4a21c6fd7] 2016-06-03 11:29:20 -0400
 -->
      <para>
-      Improve handling of <systemitem>SIGTERM</>/control-C in
-      parallel <application>pg_dump</> and <application>pg_restore</> (Tom
+      Improve handling of <systemitem>SIGTERM</systemitem>/control-C in
+      parallel <application>pg_dump</application> and <application>pg_restore</application> (Tom
       Lane)
      </para>
 
      <para>
       Make sure that the worker processes will exit promptly, and also arrange
       to send query-cancel requests to the connected backends, in case they
-      are doing something long-running such as a <command>CREATE INDEX</>.
+      are doing something long-running such as a <command>CREATE INDEX</command>.
      </para>
     </listitem>
 
@@ -3615,17 +4754,17 @@ Branch: REL9_4_STABLE [ea274b2f4] 2016-05-25 12:39:57 -0400
 Branch: REL9_3_STABLE [1c8205159] 2016-05-25 12:39:57 -0400
 -->
      <para>
-      Fix error reporting in parallel <application>pg_dump</>
-      and <application>pg_restore</> (Tom Lane)
+      Fix error reporting in parallel <application>pg_dump</application>
+      and <application>pg_restore</application> (Tom Lane)
      </para>
 
      <para>
-      Previously, errors reported by <application>pg_dump</>
-      or <application>pg_restore</> worker processes might never make it to
+      Previously, errors reported by <application>pg_dump</application>
+      or <application>pg_restore</application> worker processes might never make it to
       the user's console, because the messages went through the master
       process, and there were various deadlock scenarios that would prevent
       the master process from passing on the messages.  Instead, just print
-      everything to <literal>stderr</>.  In some cases this will result in
+      everything to <literal>stderr</literal>.  In some cases this will result in
       duplicate messages (for instance, if all the workers report a server
       shutdown), but that seems better than no message.
      </para>
@@ -3640,8 +4779,8 @@ Branch: REL9_4_STABLE [d32bc204c] 2016-05-26 10:50:42 -0400
 Branch: REL9_3_STABLE [b9784e1f7] 2016-05-26 10:50:46 -0400
 -->
      <para>
-      Ensure that parallel <application>pg_dump</>
-      or <application>pg_restore</> on Windows will shut down properly
+      Ensure that parallel <application>pg_dump</application>
+      or <application>pg_restore</application> on Windows will shut down properly
       after an error (Kyotaro Horiguchi)
      </para>
 
@@ -3658,13 +4797,13 @@ Branch: master [d74048def] 2016-05-26 22:14:23 +0200
 Branch: REL9_5_STABLE [47e596976] 2016-05-26 22:18:04 +0200
 -->
      <para>
-      Make parallel <application>pg_dump</> fail cleanly when run against a
+      Make parallel <application>pg_dump</application> fail cleanly when run against a
       standby server (Magnus Hagander)
      </para>
 
      <para>
       This usage is not supported
-      unless <option>--no-synchronized-snapshots</> is specified, but the
+      unless <option>--no-synchronized-snapshots</option> is specified, but the
       error was not handled very well.
      </para>
     </listitem>
@@ -3678,7 +4817,7 @@ Branch: REL9_4_STABLE [f2f18a37c] 2016-05-26 11:51:16 -0400
 Branch: REL9_3_STABLE [99565a1ef] 2016-05-26 11:51:20 -0400
 -->
      <para>
-      Make <application>pg_dump</> behave better when built without zlib
+      Make <application>pg_dump</application> behave better when built without zlib
       support (Kyotaro Horiguchi)
      </para>
 
@@ -3699,7 +4838,7 @@ Branch: REL9_2_STABLE [a21617759] 2016-08-01 17:38:00 +0900
 Branch: REL9_1_STABLE [366f4a962] 2016-08-01 17:38:05 +0900
 -->
      <para>
-      Make <application>pg_basebackup</> accept <literal>-Z 0</> as
+      Make <application>pg_basebackup</application> accept <literal>-Z 0</literal> as
       specifying no compression (Fujii Masao)
      </para>
     </listitem>
@@ -3745,13 +4884,13 @@ Branch: REL9_4_STABLE [c2651cd24] 2016-05-27 10:40:20 -0400
 Branch: REL9_3_STABLE [1f1e70a87] 2016-05-27 10:40:20 -0400
 -->
      <para>
-      Be more predictable about reporting <quote>statement timeout</>
-      versus <quote>lock timeout</> (Tom Lane)
+      Be more predictable about reporting <quote>statement timeout</quote>
+      versus <quote>lock timeout</quote> (Tom Lane)
      </para>
 
      <para>
       On heavily loaded machines, the regression tests sometimes failed due
-      to reporting <quote>lock timeout</> even though the statement timeout
+      to reporting <quote>lock timeout</quote> even though the statement timeout
       should have occurred first.
      </para>
     </listitem>
@@ -3804,7 +4943,7 @@ Branch: REL9_1_STABLE [d70df7867] 2016-07-19 17:53:31 -0400
 -->
      <para>
       Update our copy of the timezone code to match
-      IANA's <application>tzcode</> release 2016c (Tom Lane)
+      IANA's <application>tzcode</application> release 2016c (Tom Lane)
      </para>
 
      <para>
@@ -3825,7 +4964,7 @@ Branch: REL9_2_STABLE [7822792f7] 2016-08-05 12:58:58 -0400
 Branch: REL9_1_STABLE [a44388ffe] 2016-08-05 12:59:02 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016f
+      Update time zone data files to <application>tzdata</application> release 2016f
       for DST law changes in Kemerovo and Novosibirsk, plus historical
       corrections for Azerbaijan, Belarus, and Morocco.
      </para>
@@ -3847,7 +4986,7 @@ Branch: REL9_1_STABLE [a44388ffe] 2016-08-05 12:59:02 -0400
   <para>
    This release contains a variety of fixes from 9.5.2.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -3859,7 +4998,7 @@ Branch: REL9_1_STABLE [a44388ffe] 2016-08-05 12:59:02 -0400
 
    <para>
     However, if you are upgrading from a version earlier than 9.5.2,
-    see <xref linkend="release-9-5-2">.
+    see <xref linkend="release-9-5-2"/>.
    </para>
   </sect2>
 
@@ -3889,7 +5028,7 @@ Branch: REL9_1_STABLE [9b676fd49] 2016-05-07 00:09:37 -0400
       using OpenSSL within a single process and not all the code involved
       follows the same rules for when to clear the error queue.
       Failures have been reported specifically when a client application
-      uses SSL connections in <application>libpq</> concurrently with
+      uses SSL connections in <application>libpq</application> concurrently with
       SSL connections using the PHP, Python, or Ruby wrappers for OpenSSL.
       It's possible for similar problems to arise within the server as well,
       if an extension module establishes an outgoing SSL connection.
@@ -3907,7 +5046,7 @@ Branch: REL9_2_STABLE [ad2d32b57] 2016-04-21 20:05:58 -0400
 Branch: REL9_1_STABLE [6882dbd34] 2016-04-21 20:05:58 -0400
 -->
      <para>
-      Fix <quote>failed to build any <replaceable>N</>-way joins</quote>
+      Fix <quote>failed to build any <replaceable>N</replaceable>-way joins</quote>
       planner error with a full join enclosed in the right-hand side of a
       left join (Tom Lane)
      </para>
@@ -3929,10 +5068,10 @@ Branch: REL9_2_STABLE [f02cb8c9a] 2016-04-29 20:19:38 -0400
 
      <para>
       Given a three-or-more-way equivalence class of variables, such
-      as <literal>X.X = Y.Y = Z.Z</>, it was possible for the planner to omit
+      as <literal>X.X = Y.Y = Z.Z</literal>, it was possible for the planner to omit
       some of the tests needed to enforce that all the variables are actually
       equal, leading to join rows being output that didn't satisfy
-      the <literal>WHERE</> clauses.  For various reasons, erroneous plans
+      the <literal>WHERE</literal> clauses.  For various reasons, erroneous plans
       were seldom selected in practice, so that this bug has gone undetected
       for a long time.
      </para>
@@ -3946,12 +5085,12 @@ Branch: REL9_5_STABLE [81deadd31] 2016-04-21 23:17:36 -0400
 -->
      <para>
       Fix corner-case parser failures occurring
-      when <xref linkend="guc-operator-precedence-warning"> is turned on
+      when <xref linkend="guc-operator-precedence-warning"/> is turned on
       (Tom Lane)
      </para>
 
      <para>
-      An example is that <literal>SELECT (ARRAY[])::text[]</> gave an error,
+      An example is that <literal>SELECT (ARRAY[])::text[]</literal> gave an error,
       though it worked without the parentheses.
      </para>
     </listitem>
@@ -3983,7 +5122,7 @@ Branch: REL9_4_STABLE [ef35afa35] 2016-04-20 14:25:15 -0400
      <para>
       The memory leak would typically not amount to much in simple queries,
       but it could be very substantial during a large GIN index build with
-      high <varname>maintenance_work_mem</>.
+      high <varname>maintenance_work_mem</varname>.
      </para>
     </listitem>
 
@@ -3998,8 +5137,8 @@ Branch: REL9_2_STABLE [11247dd99] 2016-05-06 12:09:20 -0400
 Branch: REL9_1_STABLE [7bad282c3] 2016-05-06 12:09:20 -0400
 -->
      <para>
-      Fix possible misbehavior of <literal>TH</>, <literal>th</>,
-      and <literal>Y,YYY</> format codes in <function>to_timestamp()</>
+      Fix possible misbehavior of <literal>TH</literal>, <literal>th</literal>,
+      and <literal>Y,YYY</literal> format codes in <function>to_timestamp()</function>
       (Tom Lane)
      </para>
 
@@ -4020,9 +5159,9 @@ Branch: REL9_2_STABLE [c7c145e4f] 2016-04-21 14:20:18 -0400
 Branch: REL9_1_STABLE [663624e60] 2016-04-21 14:20:18 -0400
 -->
      <para>
-      Fix dumping of rules and views in which the <replaceable>array</>
-      argument of a <literal><replaceable>value</> <replaceable>operator</>
-      ANY (<replaceable>array</>)</literal> construct is a sub-SELECT
+      Fix dumping of rules and views in which the <replaceable>array</replaceable>
+      argument of a <literal><replaceable>value</replaceable> <replaceable>operator</replaceable>
+      ANY (<replaceable>array</replaceable>)</literal> construct is a sub-SELECT
       (Tom Lane)
      </para>
     </listitem>
@@ -4035,14 +5174,14 @@ Branch: REL9_5_STABLE [f3d17491c] 2016-04-04 18:05:23 -0400
 Branch: REL9_4_STABLE [28148e258] 2016-04-04 18:05:24 -0400
 -->
      <para>
-      Disallow newlines in <command>ALTER SYSTEM</> parameter values
+      Disallow newlines in <command>ALTER SYSTEM</command> parameter values
       (Tom Lane)
      </para>
 
      <para>
       The configuration-file parser doesn't support embedded newlines in
       string literals, so we mustn't allow them in values to be inserted
-      by <command>ALTER SYSTEM</>.
+      by <command>ALTER SYSTEM</command>.
      </para>
     </listitem>
 
@@ -4054,7 +5193,7 @@ Branch: REL9_5_STABLE [8f8e65d34] 2016-04-15 12:11:27 -0400
 Branch: REL9_4_STABLE [8eed31ffb] 2016-04-15 12:11:27 -0400
 -->
      <para>
-      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</> to
+      Fix <command>ALTER TABLE ... REPLICA IDENTITY USING INDEX</command> to
       work properly if an index on OID is selected (David Rowley)
      </para>
     </listitem>
@@ -4113,13 +5252,13 @@ Branch: REL9_2_STABLE [1b22368ff] 2016-04-20 23:48:13 -0400
 Branch: REL9_1_STABLE [4c1c9f80b] 2016-04-20 23:48:13 -0400
 -->
      <para>
-      Make <application>pg_regress</> use a startup timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if that's set (Tom Lane)
+      Make <application>pg_regress</application> use a startup timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if that's set (Tom Lane)
      </para>
 
      <para>
       This is for consistency with a behavior recently added
-      to <application>pg_ctl</>; it eases automated testing on slow machines.
+      to <application>pg_ctl</application>; it eases automated testing on slow machines.
      </para>
     </listitem>
 
@@ -4134,7 +5273,7 @@ Branch: REL9_2_STABLE [6bb42d520] 2016-04-13 18:57:52 -0400
 Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to correctly restore extension
+      Fix <application>pg_upgrade</application> to correctly restore extension
       membership for operator families containing only one operator class
       (Tom Lane)
      </para>
@@ -4142,7 +5281,7 @@ Branch: REL9_1_STABLE [3ef1f3a3e] 2016-04-13 18:57:52 -0400
      <para>
       In such a case, the operator family was restored into the new database,
       but it was no longer marked as part of the extension.  This had no
-      immediate ill effects, but would cause later <application>pg_dump</>
+      immediate ill effects, but would cause later <application>pg_dump</application>
       runs to emit output that would cause (harmless) errors on restore.
      </para>
     </listitem>
@@ -4156,13 +5295,13 @@ Branch: REL9_4_STABLE [e1aecebc0] 2016-05-06 22:05:51 -0400
 Branch: REL9_3_STABLE [e1d88f983] 2016-05-06 22:05:51 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to not fail when new-cluster TOAST rules
+      Fix <application>pg_upgrade</application> to not fail when new-cluster TOAST rules
       differ from old (Tom Lane)
      </para>
 
      <para>
-      <application>pg_upgrade</> had special-case code to handle the
-      situation where the new <productname>PostgreSQL</> version thinks that
+      <application>pg_upgrade</application> had special-case code to handle the
+      situation where the new <productname>PostgreSQL</productname> version thinks that
       a table should have a TOAST table while the old version did not.  That
       code was broken, so remove it, and instead do nothing in such cases;
       there seems no reason to believe that we can't get along fine without
@@ -4192,7 +5331,7 @@ Branch: REL9_2_STABLE [b24f7e280] 2016-04-18 13:33:07 -0400
 -->
      <para>
       Reduce the number of SysV semaphores used by a build configured with
-      <option>--disable-spinlocks</> (Tom Lane)
+      <option>--disable-spinlocks</option> (Tom Lane)
      </para>
     </listitem>
 
@@ -4207,8 +5346,8 @@ Branch: REL9_2_STABLE [0f5491283] 2016-04-23 16:53:15 -0400
 Branch: REL9_1_STABLE [cbff4b708] 2016-04-23 16:53:15 -0400
 -->
      <para>
-      Rename internal function <function>strtoi()</>
-      to <function>strtoint()</> to avoid conflict with a NetBSD library
+      Rename internal function <function>strtoi()</function>
+      to <function>strtoint()</function> to avoid conflict with a NetBSD library
       function (Thomas Munro)
      </para>
     </listitem>
@@ -4230,8 +5369,8 @@ Branch: REL9_2_STABLE [b5ebc513d] 2016-04-21 16:59:13 -0400
 Branch: REL9_1_STABLE [9028f404e] 2016-04-21 16:59:17 -0400
 -->
      <para>
-      Fix reporting of errors from <function>bind()</>
-      and <function>listen()</> system calls on Windows (Tom Lane)
+      Fix reporting of errors from <function>bind()</function>
+      and <function>listen()</function> system calls on Windows (Tom Lane)
      </para>
     </listitem>
 
@@ -4286,7 +5425,7 @@ Branch: REL9_4_STABLE [c238a4101] 2016-04-22 05:20:07 -0400
 Branch: REL9_3_STABLE [ab5c6d01f] 2016-04-22 05:20:18 -0400
 -->
      <para>
-      Fix <function>putenv()</> to work properly with Visual Studio 2013
+      Fix <function>putenv()</function> to work properly with Visual Studio 2013
       (Michael Paquier)
      </para>
     </listitem>
@@ -4302,12 +5441,12 @@ Branch: REL9_2_STABLE [b4b06931e] 2016-03-29 11:54:58 -0400
 Branch: REL9_1_STABLE [6cd30292b] 2016-03-29 11:54:58 -0400
 -->
      <para>
-      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</>
+      Avoid possibly-unsafe use of Windows' <function>FormatMessage()</function>
       function (Christian Ullrich)
      </para>
 
      <para>
-      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</> flag where
+      Use the <literal>FORMAT_MESSAGE_IGNORE_INSERTS</literal> flag where
       appropriate.  No live bug is known to exist here, but it seems like a
       good idea to be careful.
      </para>
@@ -4324,9 +5463,9 @@ Branch: REL9_2_STABLE [29d154e36] 2016-05-05 20:09:27 -0400
 Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016d
+      Update time zone data files to <application>tzdata</application> release 2016d
       for DST law changes in Russia and Venezuela.  There are new zone
-      names <literal>Europe/Kirov</> and <literal>Asia/Tomsk</> to reflect
+      names <literal>Europe/Kirov</literal> and <literal>Asia/Tomsk</literal> to reflect
       the fact that these regions now have different time zone histories from
       adjacent regions.
      </para>
@@ -4348,7 +5487,7 @@ Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
   <para>
    This release contains a variety of fixes from 9.5.1.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -4359,7 +5498,7 @@ Branch: REL9_1_STABLE [bfc39da64] 2016-05-05 20:09:32 -0400
    </para>
 
    <para>
-    However, you may need to <command>REINDEX</> some indexes after applying
+    However, you may need to <command>REINDEX</command> some indexes after applying
     the update, as per the first changelog entry below.
    </para>
   </sect2>
@@ -4377,39 +5516,39 @@ Branch: REL9_5_STABLE [8aa6e9780] 2016-03-23 16:04:35 -0400
 
     <listitem>
      <para>
-      Disable abbreviated keys for string sorting in non-<literal>C</>
+      Disable abbreviated keys for string sorting in non-<literal>C</literal>
       locales (Robert Haas)
      </para>
 
      <para>
-      <productname>PostgreSQL</> 9.5 introduced logic for speeding up
+      <productname>PostgreSQL</productname> 9.5 introduced logic for speeding up
       comparisons of string data types by using the standard C library
-      function <function>strxfrm()</> as a substitute
-      for <function>strcoll()</>.  It now emerges that most versions of
+      function <function>strxfrm()</function> as a substitute
+      for <function>strcoll()</function>.  It now emerges that most versions of
       glibc (Linux's implementation of the C library) have buggy
-      implementations of <function>strxfrm()</> that, in some locales,
+      implementations of <function>strxfrm()</function> that, in some locales,
       can produce string comparison results that do not
-      match <function>strcoll()</>.  Until this problem can be better
-      characterized, disable the optimization in all non-<literal>C</>
-      locales.  (<literal>C</> locale is safe since it uses
-      neither <function>strcoll()</> nor <function>strxfrm()</>.)
+      match <function>strcoll()</function>.  Until this problem can be better
+      characterized, disable the optimization in all non-<literal>C</literal>
+      locales.  (<literal>C</literal> locale is safe since it uses
+      neither <function>strcoll()</function> nor <function>strxfrm()</function>.)
      </para>
 
      <para>
       Unfortunately, this problem affects not only sorting but also entry
       ordering in B-tree indexes, which means that B-tree indexes
-      on <type>text</>, <type>varchar</>, or <type>char</> columns may now
+      on <type>text</type>, <type>varchar</type>, or <type>char</type> columns may now
       be corrupt if they sort according to an affected locale and were
-      built or modified under <productname>PostgreSQL</> 9.5.0 or 9.5.1.
-      Users should <command>REINDEX</> indexes that might be affected.
+      built or modified under <productname>PostgreSQL</productname> 9.5.0 or 9.5.1.
+      Users should <command>REINDEX</command> indexes that might be affected.
      </para>
 
      <para>
       It is not possible at this time to give an exhaustive list of
-      known-affected locales.  <literal>C</> locale is known safe, and
+      known-affected locales.  <literal>C</literal> locale is known safe, and
       there is no evidence of trouble in English-based locales such
-      as <literal>en_US</>, but some other popular locales such
-      as <literal>de_DE</> are affected in most glibc versions.
+      as <literal>en_US</literal>, but some other popular locales such
+      as <literal>de_DE</literal> are affected in most glibc versions.
      </para>
     </listitem>
 
@@ -4442,14 +5581,14 @@ Branch: REL9_5_STABLE [bf78a6f10] 2016-03-28 10:57:46 -0300
     <listitem>
      <para>
       Add must-be-superuser checks to some
-      new <filename>contrib/pageinspect</> functions (Andreas Seltenreich)
+      new <filename>contrib/pageinspect</filename> functions (Andreas Seltenreich)
      </para>
 
      <para>
-      Most functions in the <filename>pageinspect</> extension that
-      inspect <type>bytea</> values disallow calls by non-superusers,
-      but <function>brin_page_type()</> and <function>brin_metapage_info()</>
-      failed to do so.  Passing contrived <type>bytea</> values to them might
+      Most functions in the <filename>pageinspect</filename> extension that
+      inspect <type>bytea</type> values disallow calls by non-superusers,
+      but <function>brin_page_type()</function> and <function>brin_metapage_info()</function>
+      failed to do so.  Passing contrived <type>bytea</type> values to them might
       crash the server or disclose a few bytes of server memory.  Add the
       missing permissions checks to prevent misuse.
       (CVE-2016-3065)
@@ -4464,15 +5603,15 @@ Branch: REL9_5_STABLE [bf7ced5e2] 2016-03-03 09:50:38 +0000
 
     <listitem>
      <para>
-      Fix incorrect handling of indexed <literal>ROW()</> comparisons
+      Fix incorrect handling of indexed <literal>ROW()</literal> comparisons
       (Simon Riggs)
      </para>
 
      <para>
       Flaws in a minor optimization introduced in 9.5 caused incorrect
-      results if the <literal>ROW()</> comparison matches the index ordering
+      results if the <literal>ROW()</literal> comparison matches the index ordering
       partially but not exactly (for example, differing column order, or the
-      index contains both <literal>ASC</> and <literal>DESC</> columns).
+      index contains both <literal>ASC</literal> and <literal>DESC</literal> columns).
       Pending a better solution, the optimization has been removed.
      </para>
     </listitem>
@@ -4490,15 +5629,15 @@ Branch: REL9_1_STABLE [d485d9581] 2016-03-09 14:51:02 -0500
     <listitem>
      <para>
       Fix incorrect handling of NULL index entries in
-      indexed <literal>ROW()</> comparisons (Tom Lane)
+      indexed <literal>ROW()</literal> comparisons (Tom Lane)
      </para>
 
      <para>
       An index search using a row comparison such as <literal>ROW(a, b) &gt;
-      ROW('x', 'y')</> would stop upon reaching a NULL entry in
-      the <structfield>b</> column, ignoring the fact that there might be
-      non-NULL <structfield>b</> values associated with later values
-      of <structfield>a</>.
+      ROW('x', 'y')</literal> would stop upon reaching a NULL entry in
+      the <structfield>b</structfield> column, ignoring the fact that there might be
+      non-NULL <structfield>b</structfield> values associated with later values
+      of <structfield>a</structfield>.
      </para>
     </listitem>
 
@@ -4521,7 +5660,7 @@ Branch: REL9_1_STABLE [d0e47bcd4] 2016-03-09 18:53:54 -0800
     <listitem>
      <para>
       Avoid unlikely data-loss scenarios due to renaming files without
-      adequate <function>fsync()</> calls before and after (Michael Paquier,
+      adequate <function>fsync()</function> calls before and after (Michael Paquier,
       Tomas Vondra, Andres Freund)
      </para>
     </listitem>
@@ -4535,14 +5674,14 @@ Branch: REL9_5_STABLE [d8d5a00b1] 2016-03-22 17:56:06 -0400
     <listitem>
      <para>
       Fix incorrect behavior when rechecking a just-modified row in a query
-      that does <command>SELECT FOR UPDATE/SHARE</> and contains some
+      that does <command>SELECT FOR UPDATE/SHARE</command> and contains some
       relations that need not be locked (Tom Lane)
      </para>
 
      <para>
       Rows from non-locked relations were incorrectly treated as containing
       all NULLs during the recheck, which could result in incorrectly
-      deciding that the updated row no longer passes the <literal>WHERE</>
+      deciding that the updated row no longer passes the <literal>WHERE</literal>
       condition, or in incorrectly outputting NULLs.
      </para>
     </listitem>
@@ -4556,7 +5695,7 @@ Branch: REL9_4_STABLE [597e41e45] 2016-03-02 23:31:39 -0500
 
     <listitem>
      <para>
-      Fix bug in <function>json_to_record()</> when a field of its input
+      Fix bug in <function>json_to_record()</function> when a field of its input
       object contains a sub-object with a field name matching one of the
       requested output column names (Tom Lane)
      </para>
@@ -4571,7 +5710,7 @@ Branch: REL9_5_STABLE [68d68ff83] 2016-02-21 10:40:39 -0500
     <listitem>
      <para>
       Fix nonsense result from two-argument form
-      of <function>jsonb_object()</> when called with empty arrays
+      of <function>jsonb_object()</function> when called with empty arrays
       (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
@@ -4584,7 +5723,7 @@ Branch: REL9_5_STABLE [5f95521b3] 2016-03-23 10:43:24 -0400
 
     <listitem>
      <para>
-      Fix misbehavior in <function>jsonb_set()</> when converting a path
+      Fix misbehavior in <function>jsonb_set()</function> when converting a path
       array element into an integer for use as an array subscript
       (Michael Paquier)
      </para>
@@ -4600,7 +5739,7 @@ Branch: REL9_4_STABLE [17a250b18] 2016-03-17 15:50:33 -0400
     <listitem>
      <para>
       Fix misformatting of negative time zone offsets
-      by <function>to_char()</>'s <literal>OF</> format code
+      by <function>to_char()</function>'s <literal>OF</literal> format code
       (Thomas Munro, Tom Lane)
      </para>
     </listitem>
@@ -4614,7 +5753,7 @@ Branch: REL9_5_STABLE [3f14d8d59] 2016-03-15 18:04:48 -0400
     <listitem>
      <para>
       Fix possible incorrect logging of waits done by
-      <command>INSERT ... ON CONFLICT</> (Peter Geoghegan)
+      <command>INSERT ... ON CONFLICT</command> (Peter Geoghegan)
      </para>
 
      <para>
@@ -4632,13 +5771,13 @@ Branch: REL9_4_STABLE [a9613ee69] 2016-03-06 02:43:26 +0900
 
     <listitem>
      <para>
-      Ignore <xref linkend="recovery-min-apply-delay"> parameter until
+      Ignore <xref linkend="recovery-min-apply-delay"/> parameter until
       recovery has reached a consistent state (Michael Paquier)
      </para>
 
      <para>
       Previously, standby servers would delay application of WAL records in
-      response to <varname>recovery_min_apply_delay</> even while replaying
+      response to <varname>recovery_min_apply_delay</varname> even while replaying
       the initial portion of WAL needed to make their database state valid.
       Since the standby is useless until it's reached a consistent database
       state, this was deemed unhelpful.
@@ -4657,7 +5796,7 @@ Branch: REL9_1_STABLE [ca32f125b] 2016-02-19 08:35:02 +0000
 
     <listitem>
      <para>
-      Correctly handle cases where <literal>pg_subtrans</> is close to XID
+      Correctly handle cases where <literal>pg_subtrans</literal> is close to XID
       wraparound during server startup (Jeff Janes)
      </para>
     </listitem>
@@ -4693,10 +5832,10 @@ Branch: REL9_5_STABLE [f8a75881f] 2016-03-02 23:43:42 -0800
 
      <para>
       Trouble cases included tuples larger than one page when replica
-      identity is <literal>FULL</>, <command>UPDATE</>s that change a
+      identity is <literal>FULL</literal>, <command>UPDATE</command>s that change a
       primary key within a transaction large enough to be spooled to disk,
       incorrect reports of <quote>subxact logged without previous toplevel
-      record</>, and incorrect reporting of a transaction's commit time.
+      record</quote>, and incorrect reporting of a transaction's commit time.
      </para>
     </listitem>
 
@@ -4710,7 +5849,7 @@ Branch: REL9_4_STABLE [9b69d5c1d] 2016-02-29 12:34:33 +0000
     <listitem>
      <para>
       Fix planner error with nested security barrier views when the outer
-      view has a <literal>WHERE</> clause containing a correlated subquery
+      view has a <literal>WHERE</literal> clause containing a correlated subquery
       (Dean Rasheed)
      </para>
     </listitem>
@@ -4739,7 +5878,7 @@ Branch: REL9_1_STABLE [7d6c58aa1] 2016-02-28 23:40:35 -0500
 
     <listitem>
      <para>
-      Fix corner-case crash due to trying to free <function>localeconv()</>
+      Fix corner-case crash due to trying to free <function>localeconv()</function>
       output strings more than once (Tom Lane)
      </para>
     </listitem>
@@ -4756,14 +5895,14 @@ Branch: REL9_1_STABLE [fe747b741] 2016-03-06 19:21:03 -0500
 
     <listitem>
      <para>
-      Fix parsing of affix files for <literal>ispell</> dictionaries
+      Fix parsing of affix files for <literal>ispell</literal> dictionaries
       (Tom Lane)
      </para>
 
      <para>
       The code could go wrong if the affix file contained any characters
       whose byte length changes during case-folding, for
-      example <literal>I</> in Turkish UTF8 locales.
+      example <literal>I</literal> in Turkish UTF8 locales.
      </para>
     </listitem>
 
@@ -4779,7 +5918,7 @@ Branch: REL9_1_STABLE [e56acbe2a] 2016-02-10 19:30:12 -0500
 
     <listitem>
      <para>
-      Avoid use of <function>sscanf()</> to parse <literal>ispell</>
+      Avoid use of <function>sscanf()</function> to parse <literal>ispell</literal>
       dictionary files (Artur Zakirov)
      </para>
 
@@ -4843,7 +5982,7 @@ Branch: REL9_1_STABLE [b4895bf79] 2016-03-04 11:57:40 -0500
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion logic to handle multibyte
+      Fix <application>psql</application>'s tab completion logic to handle multibyte
       characters properly (Kyotaro Horiguchi, Robert Haas)
      </para>
     </listitem>
@@ -4859,12 +5998,12 @@ Branch: REL9_1_STABLE [2d61d88d8] 2016-03-14 11:31:49 -0400
 
     <listitem>
      <para>
-      Fix <application>psql</>'s tab completion for
-      <literal>SECURITY LABEL</> (Tom Lane)
+      Fix <application>psql</application>'s tab completion for
+      <literal>SECURITY LABEL</literal> (Tom Lane)
      </para>
 
      <para>
-      Pressing TAB after <literal>SECURITY LABEL</> might cause a crash
+      Pressing TAB after <literal>SECURITY LABEL</literal> might cause a crash
       or offering of inappropriate keywords.
      </para>
     </listitem>
@@ -4881,8 +6020,8 @@ Branch: REL9_1_STABLE [f97664cf5] 2016-02-10 20:34:48 -0500
 
     <listitem>
      <para>
-      Make <application>pg_ctl</> accept a wait timeout from the
-      <envar>PGCTLTIMEOUT</> environment variable, if none is specified on
+      Make <application>pg_ctl</application> accept a wait timeout from the
+      <envar>PGCTLTIMEOUT</envar> environment variable, if none is specified on
       the command line (Noah Misch)
      </para>
 
@@ -4906,12 +6045,12 @@ Branch: REL9_1_STABLE [5a39c7395] 2016-03-07 10:41:11 -0500
     <listitem>
      <para>
       Fix incorrect test for Windows service status
-      in <application>pg_ctl</> (Manuel Mathar)
+      in <application>pg_ctl</application> (Manuel Mathar)
      </para>
 
      <para>
       The previous set of minor releases attempted to
-      fix <application>pg_ctl</> to properly determine whether to send log
+      fix <application>pg_ctl</application> to properly determine whether to send log
       messages to Window's Event Log, but got the test backwards.
      </para>
     </listitem>
@@ -4928,8 +6067,8 @@ Branch: REL9_1_STABLE [1965a8ce1] 2016-03-16 23:18:08 -0400
 
     <listitem>
      <para>
-      Fix <application>pgbench</> to correctly handle the combination
-      of <literal>-C</> and <literal>-M prepared</> options (Tom Lane)
+      Fix <application>pgbench</application> to correctly handle the combination
+      of <literal>-C</literal> and <literal>-M prepared</literal> options (Tom Lane)
      </para>
     </listitem>
 
@@ -4943,7 +6082,7 @@ Branch: REL9_3_STABLE [bf26c4f44] 2016-02-18 18:32:26 -0500
 
     <listitem>
      <para>
-      In <application>pg_upgrade</>, skip creating a deletion script when
+      In <application>pg_upgrade</application>, skip creating a deletion script when
       the new data directory is inside the old data directory (Bruce
       Momjian)
      </para>
@@ -5001,7 +6140,7 @@ Branch: REL9_1_STABLE [0f359c7de] 2016-02-18 15:40:36 -0500
     <listitem>
      <para>
       Fix multiple mistakes in the statistics returned
-      by <filename>contrib/pgstattuple</>'s <function>pgstatindex()</>
+      by <filename>contrib/pgstattuple</filename>'s <function>pgstatindex()</function>
       function (Tom Lane)
      </para>
     </listitem>
@@ -5018,7 +6157,7 @@ Branch: REL9_1_STABLE [2aa9fd963] 2016-03-19 18:59:41 -0400
 
     <listitem>
      <para>
-      Remove dependency on <literal>psed</> in MSVC builds, since it's no
+      Remove dependency on <literal>psed</literal> in MSVC builds, since it's no
       longer provided by core Perl (Michael Paquier, Andrew Dunstan)
      </para>
     </listitem>
@@ -5035,7 +6174,7 @@ Branch: REL9_1_STABLE [e5fd35cc5] 2016-03-25 19:03:54 -0400
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016c
+      Update time zone data files to <application>tzdata</application> release 2016c
       for DST law changes in Azerbaijan, Chile, Haiti, Palestine, and Russia
       (Altai, Astrakhan, Kirov, Sakhalin, Ulyanovsk regions), plus
       historical corrections for Lithuania, Moldova, and Russia
@@ -5059,7 +6198,7 @@ Branch: REL9_1_STABLE [e5fd35cc5] 2016-03-25 19:03:54 -0400
   <para>
    This release contains a variety of fixes from 9.5.0.
    For information about new features in the 9.5 major release, see
-   <xref linkend="release-9-5">.
+   <xref linkend="release-9-5"/>.
   </para>
 
   <sect2>
@@ -5119,7 +6258,7 @@ Branch: REL9_5_STABLE [87dbc72a7] 2016-02-08 11:03:37 +0100
 
     <listitem>
      <para>
-      Avoid pushdown of <literal>HAVING</> clauses when grouping sets are
+      Avoid pushdown of <literal>HAVING</literal> clauses when grouping sets are
       used (Andrew Gierth)
      </para>
     </listitem>
@@ -5132,7 +6271,7 @@ Branch: REL9_5_STABLE [82406d6ff] 2016-02-07 14:57:24 -0500
 
     <listitem>
      <para>
-      Fix deparsing of <literal>ON CONFLICT</> arbiter <literal>WHERE</>
+      Fix deparsing of <literal>ON CONFLICT</literal> arbiter <literal>WHERE</literal>
       clauses (Peter Geoghegan)
      </para>
     </listitem>
@@ -5149,14 +6288,14 @@ Branch: REL9_1_STABLE [b043df093] 2016-01-26 15:38:33 -0500
 
     <listitem>
      <para>
-      Make <literal>%h</> and <literal>%r</> escapes
-      in <varname>log_line_prefix</> work for messages emitted due
-      to <varname>log_connections</> (Tom Lane)
+      Make <literal>%h</literal> and <literal>%r</literal> escapes
+      in <varname>log_line_prefix</varname> work for messages emitted due
+      to <varname>log_connections</varname> (Tom Lane)
      </para>
 
      <para>
-      Previously, <literal>%h</>/<literal>%r</> started to work just after a
-      new session had emitted the <quote>connection received</> log message;
+      Previously, <literal>%h</literal>/<literal>%r</literal> started to work just after a
+      new session had emitted the <quote>connection received</quote> log message;
       now they work for that message too.
      </para>
     </listitem>
@@ -5190,8 +6329,8 @@ Branch: REL9_1_STABLE [ed5f57218] 2016-01-29 10:28:03 +0100
 
     <listitem>
      <para>
-      Fix <application>psql</>'s <literal>\det</> command to interpret its
-      pattern argument the same way as other <literal>\d</> commands with
+      Fix <application>psql</application>'s <literal>\det</literal> command to interpret its
+      pattern argument the same way as other <literal>\d</literal> commands with
       potentially schema-qualified patterns do (Reece Hart)
      </para>
     </listitem>
@@ -5208,7 +6347,7 @@ Branch: REL9_1_STABLE [b96f6f444] 2016-01-07 11:59:08 -0300
 
     <listitem>
      <para>
-      In <application>pg_ctl</> on Windows, check service status to decide
+      In <application>pg_ctl</application> on Windows, check service status to decide
       where to send output, rather than checking if standard output is a
       terminal (Michael Paquier)
      </para>
@@ -5226,7 +6365,7 @@ Branch: REL9_1_STABLE [5108013db] 2016-01-13 18:55:27 -0500
 
     <listitem>
      <para>
-      Fix assorted corner-case bugs in <application>pg_dump</>'s processing
+      Fix assorted corner-case bugs in <application>pg_dump</application>'s processing
       of extension member objects (Tom Lane)
      </para>
     </listitem>
@@ -5240,7 +6379,7 @@ Branch: REL9_5_STABLE [1e910cf5b] 2016-01-22 20:04:35 -0300
     <listitem>
      <para>
       Fix improper quoting of domain constraint names
-      in <application>pg_dump</> (Elvis Pranskevichus)
+      in <application>pg_dump</application> (Elvis Pranskevichus)
      </para>
     </listitem>
 
@@ -5256,9 +6395,9 @@ Branch: REL9_1_STABLE [9c704632c] 2016-02-04 00:26:10 -0500
 
     <listitem>
      <para>
-      Make <application>pg_dump</> mark a view's triggers as needing to be
+      Make <application>pg_dump</application> mark a view's triggers as needing to be
       processed after its rule, to prevent possible failure during
-      parallel <application>pg_restore</> (Tom Lane)
+      parallel <application>pg_restore</application> (Tom Lane)
      </para>
     </listitem>
 
@@ -5274,7 +6413,7 @@ Branch: REL9_1_STABLE [4c8b07d3c] 2016-02-03 09:25:34 -0500
 
     <listitem>
      <para>
-      Install guards in <application>pgbench</> against corner-case overflow
+      Install guards in <application>pgbench</application> against corner-case overflow
       conditions during evaluation of script-specified division or modulo
       operators (Fabien Coelho, Michael Paquier)
      </para>
@@ -5288,7 +6427,7 @@ Branch: REL9_5_STABLE [7ef311eb4] 2016-01-05 17:25:12 -0300
 
     <listitem>
      <para>
-      Suppress useless warning message when <application>pg_receivexlog</>
+      Suppress useless warning message when <application>pg_receivexlog</application>
       connects to a pre-9.4 server (Marco Nenciarini)
      </para>
     </listitem>
@@ -5306,15 +6445,15 @@ Branch: REL9_5_STABLE [5ef26b8de] 2016-01-11 20:06:47 -0500
 
     <listitem>
      <para>
-      Avoid dump/reload problems when using both <application>plpython2</>
-      and <application>plpython3</> (Tom Lane)
+      Avoid dump/reload problems when using both <application>plpython2</application>
+      and <application>plpython3</application> (Tom Lane)
      </para>
 
      <para>
-      In principle, both versions of <application>PL/Python</> can be used in
+      In principle, both versions of <application>PL/Python</application> can be used in
       the same database, though not in the same session (because the two
-      versions of <application>libpython</> cannot safely be used concurrently).
-      However, <application>pg_restore</> and <application>pg_upgrade</> both
+      versions of <application>libpython</application> cannot safely be used concurrently).
+      However, <application>pg_restore</application> and <application>pg_upgrade</application> both
       do things that can fall foul of the same-session restriction.  Work
       around that by changing the timing of the check.
      </para>
@@ -5331,7 +6470,7 @@ Branch: REL9_5_STABLE [a66c1fcdd] 2016-01-08 11:39:28 -0500
 
     <listitem>
      <para>
-      Fix <application>PL/Python</> regression tests to pass with Python 3.5
+      Fix <application>PL/Python</application> regression tests to pass with Python 3.5
       (Peter Eisentraut)
      </para>
     </listitem>
@@ -5348,16 +6487,16 @@ Branch: REL9_1_STABLE [b1f591c50] 2016-02-05 20:23:19 -0500
 
     <listitem>
      <para>
-      Prevent certain <application>PL/Java</> parameters from being set by
+      Prevent certain <application>PL/Java</application> parameters from being set by
       non-superusers (Noah Misch)
      </para>
 
      <para>
-      This change mitigates a <application>PL/Java</> security bug
-      (CVE-2016-0766), which was fixed in <application>PL/Java</> by marking
+      This change mitigates a <application>PL/Java</application> security bug
+      (CVE-2016-0766), which was fixed in <application>PL/Java</application> by marking
       these parameters as superuser-only.  To fix the security hazard for
-      sites that update <productname>PostgreSQL</> more frequently
-      than <application>PL/Java</>, make the core code aware of them also.
+      sites that update <productname>PostgreSQL</productname> more frequently
+      than <application>PL/Java</application>, make the core code aware of them also.
      </para>
     </listitem>
 
@@ -5374,14 +6513,14 @@ Branch: REL9_4_STABLE [33b26426e] 2016-02-08 11:10:14 +0100
 
     <listitem>
      <para>
-      Fix <application>ecpg</>-supplied header files to not contain comments
+      Fix <application>ecpg</application>-supplied header files to not contain comments
       continued from a preprocessor directive line onto the next line
       (Michael Meskes)
      </para>
 
      <para>
-      Such a comment is rejected by <application>ecpg</>.  It's not yet clear
-      whether <application>ecpg</> itself should be changed.
+      Such a comment is rejected by <application>ecpg</application>.  It's not yet clear
+      whether <application>ecpg</application> itself should be changed.
      </para>
     </listitem>
 
@@ -5395,8 +6534,8 @@ Branch: REL9_3_STABLE [1f2b195eb] 2016-02-03 01:39:08 -0500
 
     <listitem>
      <para>
-      Fix <function>hstore_to_json_loose()</>'s test for whether
-      an <type>hstore</> value can be converted to a JSON number (Tom Lane)
+      Fix <function>hstore_to_json_loose()</function>'s test for whether
+      an <type>hstore</type> value can be converted to a JSON number (Tom Lane)
      </para>
 
      <para>
@@ -5417,8 +6556,8 @@ Branch: REL9_4_STABLE [2099b911d] 2016-02-04 22:27:47 -0500
 
     <listitem>
      <para>
-      In <filename>contrib/postgres_fdw</>, fix bugs triggered by use
-      of <literal>tableoid</> in data-modifying commands (Etsuro Fujita,
+      In <filename>contrib/postgres_fdw</filename>, fix bugs triggered by use
+      of <literal>tableoid</literal> in data-modifying commands (Etsuro Fujita,
       Robert Haas)
      </para>
     </listitem>
@@ -5431,7 +6570,7 @@ Branch: REL9_5_STABLE [47acf3add] 2016-01-22 11:53:06 -0500
 
     <listitem>
      <para>
-      Fix ill-advised restriction of <literal>NAMEDATALEN</> to be less
+      Fix ill-advised restriction of <literal>NAMEDATALEN</literal> to be less
       than 256 (Robert Haas, Tom Lane)
      </para>
     </listitem>
@@ -5468,7 +6607,7 @@ Branch: REL9_1_STABLE [b1bc38144] 2016-01-19 23:30:28 -0500
 
     <listitem>
      <para>
-      Ensure that <filename>dynloader.h</> is included in the installed
+      Ensure that <filename>dynloader.h</filename> is included in the installed
       header files in MSVC builds (Bruce Momjian, Michael Paquier)
      </para>
     </listitem>
@@ -5485,7 +6624,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Update time zone data files to <application>tzdata</> release 2016a for
+      Update time zone data files to <application>tzdata</application> release 2016a for
       DST law changes in Cayman Islands, Metlakatla, and Trans-Baikal
       Territory (Zabaykalsky Krai), plus historical corrections for Pakistan.
      </para>
@@ -5508,7 +6647,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.5 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.5 include:
    </para>
 
    <!-- This list duplicates items below, but without authors or details-->
@@ -5517,31 +6656,31 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Allow <link linkend="sql-on-conflict"><command>INSERT</></>s
+      Allow <link linkend="sql-on-conflict"><command>INSERT</command></link>s
       that would generate constraint conflicts to be turned into
-      <command>UPDATE</>s or ignored
+      <command>UPDATE</command>s or ignored
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <literal>GROUP BY</> analysis features <link
-      linkend="queries-grouping-sets"><literal>GROUPING SETS</></>,
-      <link linkend="queries-grouping-sets"><literal>CUBE</></> and
-      <link linkend="queries-grouping-sets"><literal>ROLLUP</></>
+      Add <literal>GROUP BY</literal> analysis features <link
+      linkend="queries-grouping-sets"><literal>GROUPING SETS</literal></link>,
+      <link linkend="queries-grouping-sets"><literal>CUBE</literal></link> and
+      <link linkend="queries-grouping-sets"><literal>ROLLUP</literal></link>
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Add <link linkend="ddl-rowsecurity">row-level security control</>
+      Add <link linkend="ddl-rowsecurity">row-level security control</link>
      </para>
     </listitem>
 
     <listitem>
      <para>
       Create mechanisms for tracking
-      the <link linkend="replication-origins">progress of replication</>,
+      the <link linkend="replication-origins">progress of replication</link>,
       including methods for identifying the origin of individual changes
       during logical replication
      </para>
@@ -5549,7 +6688,7 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 
     <listitem>
      <para>
-      Add <link linkend="BRIN">Block Range Indexes</> (<acronym>BRIN</>)
+      Add <link linkend="brin">Block Range Indexes</link> (<acronym>BRIN</acronym>)
      </para>
     </listitem>
 
@@ -5578,8 +6717,8 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
   <title>Migration to Version 9.5</title>
 
    <para>
-    A dump/restore using <xref linkend="app-pg-dumpall">, or use
-    of <xref linkend="pgupgrade">, is required for those wishing to migrate
+    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 release.
    </para>
 
@@ -5595,24 +6734,24 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 2015-03-11 [c6b3c93] Tom Lane: Make operator precedence follow the SQL standar..
 -->
      <para>
-      Adjust <link linkend="sql-precedence">operator precedence</>
-      to match the <acronym>SQL</> standard (Tom Lane)
+      Adjust <link linkend="sql-precedence">operator precedence</link>
+      to match the <acronym>SQL</acronym> standard (Tom Lane)
      </para>
 
      <para>
       The precedence of <literal>&lt;=</literal>, <literal>&gt;=</literal>
       and <literal>&lt;&gt;</literal> has been reduced to match that of
       <literal>&lt;</literal>, <literal>&gt;</literal>
-      and <literal>=</literal>.  The precedence of <literal>IS</> tests
-      (e.g., <replaceable>x</> <literal>IS NULL</>) has been reduced to be
+      and <literal>=</literal>.  The precedence of <literal>IS</literal> tests
+      (e.g., <replaceable>x</replaceable> <literal>IS NULL</literal>) has been reduced to be
       just below these six comparison operators.
-      Also, multi-keyword operators beginning with <literal>NOT</> now have
+      Also, multi-keyword operators beginning with <literal>NOT</literal> now have
       the precedence of their base operator (for example, <literal>NOT
-      BETWEEN</> now has the same precedence as <literal>BETWEEN</>) whereas
-      before they had inconsistent precedence, behaving like <literal>NOT</>
+      BETWEEN</literal> now has the same precedence as <literal>BETWEEN</literal>) whereas
+      before they had inconsistent precedence, behaving like <literal>NOT</literal>
       with respect to their left operand but like their base operator with
       respect to their right operand.  The new configuration
-      parameter <xref linkend="guc-operator-precedence-warning"> can be
+      parameter <xref linkend="guc-operator-precedence-warning"/> can be
       enabled to warn about queries in which these precedence changes result
       in different parsing choices.
      </para>
@@ -5623,8 +6762,8 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 2015-03-31 [0badb06] Bruce ..: pg_ctl:  change default shutdown mode from 'sma..
 -->
      <para>
-      Change <xref linkend="app-pg-ctl">'s default shutdown mode from
-      <literal>smart</> to <literal>fast</> (Bruce Momjian)
+      Change <xref linkend="app-pg-ctl"/>'s default shutdown mode from
+      <literal>smart</literal> to <literal>fast</literal> (Bruce Momjian)
      </para>
 
      <para>
@@ -5639,18 +6778,18 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Use assignment cast behavior for data type conversions
-      in <application>PL/pgSQL</> assignments, rather than converting to and
+      in <application>PL/pgSQL</application> assignments, rather than converting to and
       from text (Tom Lane)
      </para>
 
      <para>
       This change causes conversions of Booleans to strings to
-      produce <literal>true</> or <literal>false</>, not <literal>t</>
-      or <literal>f</>.  Other type conversions may succeed in more cases
-      than before; for example, assigning a numeric value <literal>3.9</> to
+      produce <literal>true</literal> or <literal>false</literal>, not <literal>t</literal>
+      or <literal>f</literal>.  Other type conversions may succeed in more cases
+      than before; for example, assigning a numeric value <literal>3.9</literal> to
       an integer variable will now assign 4 rather than failing.  If no
       assignment-grade cast is defined for the particular source and
-      destination types, <application>PL/pgSQL</> will fall back to its old
+      destination types, <application>PL/pgSQL</application> will fall back to its old
       I/O conversion behavior.
      </para>
     </listitem>
@@ -5661,13 +6800,13 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Allow characters in <link linkend="libpq-connect-options">server
-      command-line options</> to be escaped with a backslash (Andres Freund)
+      command-line options</link> to be escaped with a backslash (Andres Freund)
      </para>
 
      <para>
       Formerly, spaces in the options string always separated options, so
       there was no way to include a space in an option value.  Including
-      a backslash in an option value now requires writing <literal>\\</>.
+      a backslash in an option value now requires writing <literal>\\</literal>.
      </para>
     </listitem>
 
@@ -5677,9 +6816,9 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 -->
      <para>
       Change the default value of the GSSAPI <link
-      linkend="gssapi-auth"><varname>include_realm</></> parameter to 1, so
-      that by default the realm is not removed from a <acronym>GSS</>
-      or <acronym>SSPI</> principal name (Stephen Frost)
+      linkend="gssapi-auth"><varname>include_realm</varname></link> parameter to 1, so
+      that by default the realm is not removed from a <acronym>GSS</acronym>
+      or <acronym>SSPI</acronym> principal name (Stephen Frost)
      </para>
     </listitem>
 
@@ -5690,9 +6829,9 @@ Branch: REL9_1_STABLE [6887d72d0] 2016-02-05 10:59:39 -0500
 2015-06-29 [d661532] Heikki..: Also trigger restartpoints based on max_wal_siz..
 -->
      <para>
-      Replace configuration parameter <varname>checkpoint_segments</>
-      with <xref linkend="guc-min-wal-size">
-      and <xref linkend="guc-max-wal-size"> (Heikki Linnakangas)
+      Replace configuration parameter <varname>checkpoint_segments</varname>
+      with <xref linkend="guc-min-wal-size"/>
+      and <xref linkend="guc-max-wal-size"/> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -5712,13 +6851,13 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2014-06-18 [df8b7bc] Tom Lane: Improve our mechanism for controlling the Linux..
 -->
        <para>
-        Control the Linux <acronym>OOM</> killer via new environment
+        Control the Linux <acronym>OOM</acronym> killer via new environment
         variables <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</envar></link>
         and <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</></>,
-        instead of compile-time options <literal>LINUX_OOM_SCORE_ADJ</> and
-        <literal>LINUX_OOM_ADJ</>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</envar></link>,
+        instead of compile-time options <literal>LINUX_OOM_SCORE_ADJ</literal> and
+        <literal>LINUX_OOM_ADJ</literal>
         (Gurjeet Singh)
        </para>
       </listitem>
@@ -5730,7 +6869,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 -->
      <para>
       Decommission server configuration
-      parameter <varname>ssl_renegotiation_limit</>, which was deprecated
+      parameter <varname>ssl_renegotiation_limit</varname>, which was deprecated
       in earlier releases (Andres Freund)
      </para>
 
@@ -5738,8 +6877,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
       While SSL renegotiation is a good idea in theory, it has caused enough
       bugs to be considered a net negative in practice, and it is due to be
       removed from future versions of the relevant standards.  We have
-      therefore removed support for it from <productname>PostgreSQL</>.
-      The <varname>ssl_renegotiation_limit</> parameter still exists, but
+      therefore removed support for it from <productname>PostgreSQL</productname>.
+      The <varname>ssl_renegotiation_limit</varname> parameter still exists, but
       cannot be set to anything but zero (disabled).  It's not documented
       anymore, either.
      </para>
@@ -5750,7 +6889,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2014-11-05 [525a489] Tom Lane: Remove the last vestige of server-side autocomm..
 -->
      <para>
-      Remove server configuration parameter <varname>autocommit</>, which
+      Remove server configuration parameter <varname>autocommit</varname>, which
       was already deprecated and non-operational (Tom Lane)
      </para>
     </listitem>
@@ -5760,8 +6899,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-03-06 [bb8582a] Peter ..: Remove rolcatupdate
 -->
      <para>
-      Remove the <link linkend="catalog-pg-authid"><structname>pg_authid</></>
-      catalog's <structfield>rolcatupdate</> field, as it had no usefulness
+      Remove the <link linkend="catalog-pg-authid"><structname>pg_authid</structname></link>
+      catalog's <structfield>rolcatupdate</structfield> field, as it had no usefulness
       (Adam Brightwell)
      </para>
     </listitem>
@@ -5772,8 +6911,8 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 -->
      <para>
       The <link
-      linkend="monitoring-stats-views-table"><structname>pg_stat_replication</></link>
-      system view's <structfield>sent</> field is now NULL, not zero, when
+      linkend="monitoring-stats-views-table"><structname>pg_stat_replication</structname></link>
+      system view's <structfield>sent</structfield> field is now NULL, not zero, when
       it has no valid value (Magnus Hagander)
      </para>
     </listitem>
@@ -5783,13 +6922,13 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-07-17 [89ddd29] Andrew..: Support JSON negative array subscripts everywh..
 -->
      <para>
-      Allow <type>json</> and <type>jsonb</> array extraction operators to
+      Allow <type>json</type> and <type>jsonb</type> array extraction operators to
       accept negative subscripts, which count from the end of JSON arrays
       (Peter Geoghegan, Andrew Dunstan)
      </para>
 
      <para>
-      Previously, these operators returned <literal>NULL</> for negative
+      Previously, these operators returned <literal>NULL</literal> for negative
       subscripts.
      </para>
     </listitem>
@@ -5822,12 +6961,12 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-05-15 [b0b7be6] Alvaro..: Add BRIN infrastructure for "inclusion" opclasses
 -->
        <para>
-        Add <link linkend="BRIN">Block Range Indexes</> (<acronym>BRIN</>)
+        Add <link linkend="brin">Block Range Indexes</link> (<acronym>BRIN</acronym>)
         (&Aacute;lvaro Herrera)
        </para>
 
        <para>
-        <acronym>BRIN</> indexes store only summary data (such as minimum
+        <acronym>BRIN</acronym> indexes store only summary data (such as minimum
         and maximum values) for ranges of heap blocks.  They are therefore
         very compact and cheap to update; but if the data is naturally
         clustered, they can still provide substantial speedup of searches.
@@ -5841,7 +6980,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
        <para>
         Allow queries to perform accurate distance filtering of
         bounding-box-indexed objects (polygons, circles) using <link
-        linkend="GiST">GiST</> indexes (Alexander Korotkov, Heikki
+        linkend="gist">GiST</link> indexes (Alexander Korotkov, Heikki
         Linnakangas)
        </para>
 
@@ -5861,7 +7000,7 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 2015-03-30 [0633a60] Heikki..: Add index-only scan support to range type GiST ..
 -->
        <para>
-        Allow <link linkend="GiST">GiST</> indexes to perform index-only
+        Allow <link linkend="gist">GiST</link> indexes to perform index-only
         scans (Anastasia Lubennikova, Heikki Linnakangas, Andreas Karlsson)
        </para>
       </listitem>
@@ -5871,15 +7010,15 @@ max_wal_size = (3 * checkpoint_segments) * 16MB
 Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
-        Add configuration parameter <xref linkend="guc-gin-pending-list-limit">
-        to control the size of <acronym>GIN</> pending lists (Fujii Masao)
+        Add configuration parameter <xref linkend="guc-gin-pending-list-limit"/>
+        to control the size of <acronym>GIN</acronym> pending lists (Fujii Masao)
        </para>
 
        <para>
         This value can also be set on a per-index basis as an index storage
         parameter.  Previously the pending-list size was controlled
-        by <xref linkend="guc-work-mem">, which was awkward because
-        appropriate values for <varname>work_mem</> are often much too large
+        by <xref linkend="guc-work-mem"/>, which was awkward because
+        appropriate values for <varname>work_mem</varname> are often much too large
         for this purpose.
        </para>
       </listitem>
@@ -5890,7 +7029,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Issue a warning during the creation of <link
-        linkend="indexes-types">hash</> indexes because they are not
+        linkend="indexes-types">hash</link> indexes because they are not
         crash-safe (Bruce Momjian)
        </para>
       </listitem>
@@ -5911,8 +7050,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-13 [78efd5c] Robert..: Extend abbreviated key infrastructure to datum ..
 -->
        <para>
-        Improve the speed of sorting of <type>varchar</>, <type>text</>,
-        and <type>numeric</> fields via <quote>abbreviated</> keys
+        Improve the speed of sorting of <type>varchar</type>, <type>text</type>,
+        and <type>numeric</type> fields via <quote>abbreviated</quote> keys
         (Peter Geoghegan, Andrew Gierth, Robert Haas)
        </para>
       </listitem>
@@ -5924,8 +7063,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Extend the infrastructure that allows sorting to be performed by
         inlined, non-<acronym>SQL</acronym>-callable comparison functions to
-        cover <command>CREATE INDEX</>, <command>REINDEX</>, and
-        <command>CLUSTER</> (Peter Geoghegan)
+        cover <command>CREATE INDEX</command>, <command>REINDEX</command>, and
+        <command>CLUSTER</command> (Peter Geoghegan)
        </para>
       </listitem>
 
@@ -5986,7 +7125,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
        <para>
         This particularly addresses scalability problems when running on
-        systems with multiple <acronym>CPU</> sockets.
+        systems with multiple <acronym>CPU</acronym> sockets.
        </para>
       </listitem>
 
@@ -6006,7 +7145,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow pushdown of query restrictions into subqueries with <link
-        linkend="tutorial-window">window functions</>, where appropriate
+        linkend="tutorial-window">window functions</link>, where appropriate
         (David Rowley)
        </para>
       </listitem>
@@ -6029,7 +7168,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Teach the planner to use statistics obtained from an expression
         index on a boolean-returning function, when a matching function call
-        appears in <literal>WHERE</> (Tom Lane)
+        appears in <literal>WHERE</literal> (Tom Lane)
        </para>
       </listitem>
 
@@ -6038,7 +7177,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-09-23 [cfb2024] Tom Lane: Make ANALYZE compute basic statistics even for..
 -->
        <para>
-        Make <command>ANALYZE</> compute basic statistics (null fraction and
+        Make <command>ANALYZE</command> compute basic statistics (null fraction and
         average column width) even for columns whose data type lacks an
         equality function (Oleksandr Shulgin)
        </para>
@@ -6052,7 +7191,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 
 -->
        <para>
-        Speed up <acronym>CRC</> (cyclic redundancy check) computations
+        Speed up <acronym>CRC</acronym> (cyclic redundancy check) computations
         and switch to CRC-32C (Abhijit Menon-Sen, Heikki Linnakangas)
        </para>
       </listitem>
@@ -6072,7 +7211,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-01 [9f03ca9] Robert..: Avoid copying index tuples when building an ind..
 -->
        <para>
-        Speed up <command>CREATE INDEX</> by avoiding unnecessary memory
+        Speed up <command>CREATE INDEX</command> by avoiding unnecessary memory
         copies (Robert Haas)
        </para>
       </listitem>
@@ -6106,7 +7245,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add per-table autovacuum logging control via new
-        <varname>log_autovacuum_min_duration</> storage parameter
+        <varname>log_autovacuum_min_duration</varname> storage parameter
         (Michael Paquier)
        </para>
       </listitem>
@@ -6116,13 +7255,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-29 [51adcaa] Andres..: Add cluster_name GUC which is included in proce..
 -->
        <para>
-        Add new configuration parameter <xref linkend="guc-cluster-name">
+        Add new configuration parameter <xref linkend="guc-cluster-name"/>
         (Thomas Munro)
        </para>
 
        <para>
         This string, typically set in <link
-        linkend="config-setting-configuration-file"><filename>postgresql.conf</></>,
+        linkend="config-setting-configuration-file"><filename>postgresql.conf</filename></link>,
         allows clients to identify the cluster.  This name also appears
         in the process title of all server processes, allowing for easier
         identification of processes belonging to the same cluster.
@@ -6135,7 +7274,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Prevent non-superusers from changing <xref
-        linkend="guc-log-disconnections"> on connection startup (Fujii Masao)
+        linkend="guc-log-disconnections"/> on connection startup (Fujii Masao)
        </para>
       </listitem>
 
@@ -6144,7 +7283,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><acronym>SSL</></title>
+     <title><acronym>SSL</acronym></title>
 
      <itemizedlist>
 
@@ -6154,13 +7293,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Check <link linkend="libpq-ssl"><quote>Subject Alternative
-        Names</></> in <acronym>SSL</> server certificates, if present
+        Names</quote></link> in <acronym>SSL</acronym> server certificates, if present
         (Alexey Klyukin)
        </para>
 
        <para>
         When they are present, this replaces checks against the certificate's
-        <quote>Common Name</>.
+        <quote>Common Name</quote>.
        </para>
       </listitem>
 
@@ -6170,8 +7309,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add system view <link
-        linkend="pg-stat-ssl-view"><structname>pg_stat_ssl</></> to report
-        <acronym>SSL</> connection information (Magnus Hagander)
+        linkend="pg-stat-ssl-view"><structname>pg_stat_ssl</structname></link> to report
+        <acronym>SSL</acronym> connection information (Magnus Hagander)
        </para>
       </listitem>
 
@@ -6180,22 +7319,22 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-03 [91fa7b4] Heikki..: Add API functions to libpq to interrogate SSL ..
 -->
        <para>
-        Add <application>libpq</> functions to return <acronym>SSL</>
+        Add <application>libpq</application> functions to return <acronym>SSL</acronym>
         information in an implementation-independent way (Heikki Linnakangas)
        </para>
 
        <para>
-        While <link linkend="libpq-pqgetssl"><function>PQgetssl()</></> can
-        still be used to call <productname>OpenSSL</> functions, it is now
+        While <link linkend="libpq-pqgetssl"><function>PQgetssl()</function></link> can
+        still be used to call <productname>OpenSSL</productname> functions, it is now
         considered deprecated because future versions
-        of <application>libpq</> might support other <acronym>SSL</>
+        of <application>libpq</application> might support other <acronym>SSL</acronym>
         implementations.  When possible, use the new
         functions <link
-        linkend="libpq-pqsslattribute"><function>PQsslAttribute()</></>, <link
-        linkend="libpq-pqsslattributenames"><function>PQsslAttributeNames()</></>,
-        and <link linkend="libpq-pqsslinuse"><function>PQsslInUse()</></>
-        to obtain <acronym>SSL</> information in
-        an <acronym>SSL</>-implementation-independent way.
+        linkend="libpq-pqsslattribute"><function>PQsslAttribute()</function></link>, <link
+        linkend="libpq-pqsslattributenames"><function>PQsslAttributeNames()</function></link>,
+        and <link linkend="libpq-pqsslinuse"><function>PQsslInUse()</function></link>
+        to obtain <acronym>SSL</acronym> information in
+        an <acronym>SSL</acronym>-implementation-independent way.
        </para>
       </listitem>
 
@@ -6204,7 +7343,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [8a0d34e4] Peter ..: libpq: Don't overwrite existing OpenSSL thread..
 -->
        <para>
-        Make <application>libpq</> honor any <productname>OpenSSL</>
+        Make <application>libpq</application> honor any <productname>OpenSSL</productname>
         thread callbacks (Jan Urbanski)
        </para>
 
@@ -6229,20 +7368,20 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-29 [d661532] Heikki..: Also trigger restartpoints based on max_wal_siz..
 -->
        <para>
-        Replace configuration parameter <varname>checkpoint_segments</>
-        with <xref linkend="guc-min-wal-size">
-        and <xref linkend="guc-max-wal-size"> (Heikki Linnakangas)
+        Replace configuration parameter <varname>checkpoint_segments</varname>
+        with <xref linkend="guc-min-wal-size"/>
+        and <xref linkend="guc-max-wal-size"/> (Heikki Linnakangas)
        </para>
 
        <para>
-        This change allows the allocation of a large number of <acronym>WAL</>
+        This change allows the allocation of a large number of <acronym>WAL</acronym>
         files without keeping them after they are no longer needed.
-        Therefore the default for <varname>max_wal_size</> has been set
-        to <literal>1GB</>, much larger than the old default
-        for <varname>checkpoint_segments</>.
+        Therefore the default for <varname>max_wal_size</varname> has been set
+        to <literal>1GB</literal>, much larger than the old default
+        for <varname>checkpoint_segments</varname>.
         Also note that standby servers perform restartpoints to try to limit
-        their WAL space consumption to <varname>max_wal_size</>; previously
-        they did not pay any attention to <varname>checkpoint_segments</>.
+        their WAL space consumption to <varname>max_wal_size</varname>; previously
+        they did not pay any attention to <varname>checkpoint_segments</varname>.
        </para>
       </listitem>
 
@@ -6251,18 +7390,18 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-18 [df8b7bc] Tom Lane: Improve our mechanism for controlling the Linux..
 -->
        <para>
-        Control the Linux <acronym>OOM</> killer via new environment
+        Control the Linux <acronym>OOM</acronym> killer via new environment
         variables <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_FILE</envar></link>
         and <link
-        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</></>
+        linkend="linux-memory-overcommit"><envar>PG_OOM_ADJUST_VALUE</envar></link>
         (Gurjeet Singh)
        </para>
 
        <para>
-        The previous <acronym>OOM</> control infrastructure involved
-        compile-time options <literal>LINUX_OOM_SCORE_ADJ</> and
-        <literal>LINUX_OOM_ADJ</>, which are no longer supported.
+        The previous <acronym>OOM</acronym> control infrastructure involved
+        compile-time options <literal>LINUX_OOM_SCORE_ADJ</literal> and
+        <literal>LINUX_OOM_ADJ</literal>, which are no longer supported.
         The new behavior is available in all builds.
        </para>
       </listitem>
@@ -6274,14 +7413,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Allow recording of transaction
         commit time stamps when configuration parameter <xref
-        linkend="guc-track-commit-timestamp">
+        linkend="guc-track-commit-timestamp"/>
         is enabled (&Aacute;lvaro Herrera, Petr Jel&iacute;nek)
        </para>
 
        <para>
         Time stamp information can be accessed using functions <link
-        linkend="functions-commit-timestamp"><function>pg_xact_commit_timestamp()</></>
-        and <function>pg_last_committed_xact()</>.
+        linkend="functions-commit-timestamp"><function>pg_xact_commit_timestamp()</function></link>
+        and <function>pg_last_committed_xact()</function>.
        </para>
       </listitem>
 
@@ -6290,8 +7429,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-22 [584e35d] Peter ..: Change local_preload_libraries to PGC_USERSET
 -->
        <para>
-        Allow <xref linkend="guc-local-preload-libraries"> to be set
-        by <command>ALTER ROLE SET</> (Peter Eisentraut, Kyotaro Horiguchi)
+        Allow <xref linkend="guc-local-preload-libraries"/> to be set
+        by <command>ALTER ROLE SET</command> (Peter Eisentraut, Kyotaro Horiguchi)
        </para>
       </listitem>
 
@@ -6300,7 +7439,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-03 [a75fb9b] Alvaro..: Have autovacuum workers listen to SIGHUP, too
 -->
        <para>
-        Allow <link linkend="autovacuum">autovacuum workers</>
+        Allow <link linkend="autovacuum">autovacuum workers</link>
         to respond to configuration parameter changes during a run
         (Michael Paquier)
        </para>
@@ -6311,7 +7450,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-20 [3bdcf6a] Andres..: Don't allow to disable backend assertions via t..
 -->
        <para>
-        Make configuration parameter <xref linkend="guc-debug-assertions">
+        Make configuration parameter <xref linkend="guc-debug-assertions"/>
         read-only (Andres Freund)
        </para>
 
@@ -6319,7 +7458,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         This means that assertions can no longer be turned
         off if they were enabled at compile time, allowing for more
         efficient code optimization.  This change also removes the <link
-        linkend="app-postgres-options">postgres</> <option>-A</> option.
+        linkend="app-postgres-options">postgres</link> <option>-A</option> option.
        </para>
       </listitem>
 
@@ -6328,7 +7467,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-18 [7feaccc] Peter ..: Allow setting effective_io_concurrency even on..
 -->
        <para>
-        Allow setting <xref linkend="guc-effective-io-concurrency"> on
+        Allow setting <xref linkend="guc-effective-io-concurrency"/> on
         systems where it has no effect (Peter Eisentraut)
        </para>
       </listitem>
@@ -6340,7 +7479,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add system view <link
-        linkend="view-pg-file-settings"><structname>pg_file_settings</></>
+        linkend="view-pg-file-settings"><structname>pg_file_settings</structname></link>
         to show the contents of the server's configuration files
         (Sawada Masahiko)
        </para>
@@ -6351,8 +7490,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-14 [a486e35] Peter ..: Add pg_settings.pending_restart column
 -->
        <para>
-        Add <structname>pending_restart</> to the system view <link
-        linkend="view-pg-settings"><structname>pg_settings</></> to
+        Add <structname>pending_restart</structname> to the system view <link
+        linkend="view-pg-settings"><structname>pg_settings</structname></link> to
         indicate a change has been made but will not take effect until a
         database restart (Peter Eisentraut)
        </para>
@@ -6363,14 +7502,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-02 [bd3b7a9] Fujii ..: Support ALTER SYSTEM RESET command.
 -->
        <para>
-        Allow <link linkend="SQL-ALTERSYSTEM"><command>ALTER SYSTEM</></>
-        values to be reset with <command>ALTER SYSTEM RESET</> (Vik
+        Allow <link linkend="sql-altersystem"><command>ALTER SYSTEM</command></link>
+        values to be reset with <command>ALTER SYSTEM RESET</command> (Vik
         Fearing)
        </para>
 
        <para>
         This command removes the specified setting
-        from <filename>postgresql.auto.conf</>.
+        from <filename>postgresql.auto.conf</filename>.
        </para>
       </listitem>
 
@@ -6391,7 +7530,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Create mechanisms for tracking
-        the <link linkend="replication-origins">progress of replication</>,
+        the <link linkend="replication-origins">progress of replication</link>,
         including methods for identifying the origin of individual changes
         during logical replication (Andres Freund)
        </para>
@@ -6423,14 +7562,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-15 [51c11a7] Andres..: Remove pause_at_recovery_target recovery.conf s..
 -->
        <para>
-        Add <link linkend="recovery-config"><filename>recovery.conf</></>
+        Add <link linkend="recovery-config"><filename>recovery.conf</filename></link>
         parameter <link
-        linkend="recovery-target-action"><varname>recovery_target_action</></>
+        linkend="recovery-target-action"><varname>recovery_target_action</varname></link>
         to control post-recovery activity (Petr Jel&iacute;nek)
        </para>
 
        <para>
-        This replaces the old parameter <varname>pause_at_recovery_target</>.
+        This replaces the old parameter <varname>pause_at_recovery_target</varname>.
        </para>
       </listitem>
 
@@ -6439,9 +7578,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [ffd3774] Heikki..: Add archive_mode='always' option.
 -->
        <para>
-        Add new <xref linkend="guc-archive-mode"> value
-        <literal>always</> to allow standbys to always archive received
-        <acronym>WAL</> files (Fujii Masao)
+        Add new <xref linkend="guc-archive-mode"/> value
+        <literal>always</literal> to allow standbys to always archive received
+        <acronym>WAL</acronym> files (Fujii Masao)
        </para>
       </listitem>
 
@@ -6451,8 +7590,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add configuration
-        parameter <xref linkend="guc-wal-retrieve-retry-interval"> to
-        control <acronym>WAL</> read retry after failure
+        parameter <xref linkend="guc-wal-retrieve-retry-interval"/> to
+        control <acronym>WAL</acronym> read retry after failure
         (Alexey Vasiliev, Michael Paquier)
        </para>
 
@@ -6466,14 +7605,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-11 [57aa5b2] Fujii ..: Add GUC to enable compression of full page imag..
 -->
        <para>
-        Allow compression of full-page images stored in <acronym>WAL</>
+        Allow compression of full-page images stored in <acronym>WAL</acronym>
         (Rahila Syed, Michael Paquier)
        </para>
 
        <para>
         This feature reduces WAL volume, at the cost of more CPU time spent
         on WAL logging and WAL replay.  It is controlled by a new
-        configuration parameter <xref linkend="guc-wal-compression">, which
+        configuration parameter <xref linkend="guc-wal-compression"/>, which
         currently is off by default.
        </para>
       </listitem>
@@ -6483,7 +7622,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-08 [de76884] Heikki..: At promotion, archive last segment from old tim..
 -->
        <para>
-        Archive <acronym>WAL</> files with suffix <literal>.partial</>
+        Archive <acronym>WAL</acronym> files with suffix <literal>.partial</literal>
         during standby promotion (Heikki Linnakangas)
        </para>
       </listitem>
@@ -6494,15 +7633,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add configuration parameter <xref
-        linkend="guc-log-replication-commands">
+        linkend="guc-log-replication-commands"/>
         to log replication commands (Fujii Masao)
        </para>
 
        <para>
         By default, replication commands, e.g. <link
-        linkend="protocol-replication"><literal>IDENTIFY_SYSTEM</></>,
-        are not logged, even when <xref linkend="guc-log-statement"> is set
-        to <literal>all</>.
+        linkend="protocol-replication"><literal>IDENTIFY_SYSTEM</literal></link>,
+        are not logged, even when <xref linkend="guc-log-statement"/> is set
+        to <literal>all</literal>.
        </para>
       </listitem>
 
@@ -6512,12 +7651,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Report the processes holding replication slots in <link
-        linkend="view-pg-replication-slots"><structname>pg_replication_slots</></>
+        linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
         (Craig Ringer)
        </para>
 
        <para>
-        The new output column is <structname>active_pid</>.
+        The new output column is <structname>active_pid</structname>.
        </para>
       </listitem>
 
@@ -6526,9 +7665,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-25 [b3fc672] Heikki..: Allow using connection URI in primary_conninfo.
 -->
        <para>
-        Allow <filename>recovery.conf</>'s <link
-        linkend="primary-conninfo"><varname>primary_conninfo</></> setting to
-        use connection <acronym>URI</>s, e.g. <literal>postgres://</>
+        Allow <filename>recovery.conf</filename>'s <link
+        linkend="primary-conninfo"><varname>primary_conninfo</varname></link> setting to
+        use connection <acronym>URI</acronym>s, e.g. <literal>postgres://</literal>
         (Alexander Shulgin)
        </para>
       </listitem>
@@ -6548,16 +7687,16 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-08 [2c8f483] Andres..: Represent columns requiring insert and update p..
 -->
        <para>
-        Allow <link linkend="sql-on-conflict"><command>INSERT</></>s
+        Allow <link linkend="sql-on-conflict"><command>INSERT</command></link>s
         that would generate constraint conflicts to be turned into
-        <command>UPDATE</>s or ignored (Peter Geoghegan, Heikki
+        <command>UPDATE</command>s or ignored (Peter Geoghegan, Heikki
         Linnakangas, Andres Freund)
        </para>
 
        <para>
-        The syntax is <command>INSERT ... ON CONFLICT DO NOTHING/UPDATE</>.
+        The syntax is <command>INSERT ... ON CONFLICT DO NOTHING/UPDATE</command>.
         This is the Postgres implementation of the popular
-        <command>UPSERT</> command.
+        <command>UPSERT</command> command.
        </para>
       </listitem>
 
@@ -6566,10 +7705,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-16 [f3d3118] Andres..: Support GROUPING SETS, CUBE and ROLLUP.
 -->
        <para>
-        Add <literal>GROUP BY</> analysis features <link
-        linkend="queries-grouping-sets"><literal>GROUPING SETS</></>,
-        <link linkend="queries-grouping-sets"><literal>CUBE</></> and
-        <link linkend="queries-grouping-sets"><literal>ROLLUP</></>
+        Add <literal>GROUP BY</literal> analysis features <link
+        linkend="queries-grouping-sets"><literal>GROUPING SETS</literal></link>,
+        <link linkend="queries-grouping-sets"><literal>CUBE</literal></link> and
+        <link linkend="queries-grouping-sets"><literal>ROLLUP</literal></link>
         (Andrew Gierth, Atri Sharma)
        </para>
       </listitem>
@@ -6580,13 +7719,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow setting multiple target columns in
-        an <link linkend="SQL-UPDATE"><command>UPDATE</></> from the result of
+        an <link linkend="sql-update"><command>UPDATE</command></link> from the result of
         a single sub-SELECT (Tom Lane)
        </para>
 
        <para>
         This is accomplished using the syntax <command>UPDATE tab SET
-        (col1, col2, ...) = (SELECT ...)</>.
+        (col1, col2, ...) = (SELECT ...)</command>.
        </para>
       </listitem>
 
@@ -6595,13 +7734,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-07 [df630b0] Alvaro..: Implement SKIP LOCKED for row-level locks
 -->
        <para>
-        Add <link linkend="SQL-SELECT"><command>SELECT</></> option
-        <literal>SKIP LOCKED</> to skip locked rows (Thomas Munro)
+        Add <link linkend="sql-select"><command>SELECT</command></link> option
+        <literal>SKIP LOCKED</literal> to skip locked rows (Thomas Munro)
        </para>
 
        <para>
         This does not throw an error for locked rows like
-        <literal>NOWAIT</> does.
+        <literal>NOWAIT</literal> does.
        </para>
       </listitem>
 
@@ -6610,8 +7749,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [f6d208d] Simon ..: TABLESAMPLE, SQL Standard and extensible
 -->
        <para>
-        Add <link linkend="SQL-SELECT"><command>SELECT</></> option
-        <literal>TABLESAMPLE</> to return a subset of a table (Petr
+        Add <link linkend="sql-select"><command>SELECT</command></link> option
+        <literal>TABLESAMPLE</literal> to return a subset of a table (Petr
         Jel&iacute;nek)
        </para>
 
@@ -6619,7 +7758,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         This feature supports the SQL-standard table sampling methods.
         In addition, there are provisions
         for <link linkend="tablesample-method">user-defined
-        table sampling methods</>.
+        table sampling methods</link>.
        </para>
       </listitem>
 
@@ -6648,13 +7787,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add more details about sort ordering in <link
-        linkend="SQL-EXPLAIN"><command>EXPLAIN</></> output (Marius Timmer,
+        linkend="sql-explain"><command>EXPLAIN</command></link> output (Marius Timmer,
         Lukas Kreft, Arne Scheffer)
        </para>
 
        <para>
-        Details include <literal>COLLATE</>, <literal>DESC</>,
-        <literal>USING</>, and <literal>NULLS FIRST</><literal>/LAST</>.
+        Details include <literal>COLLATE</literal>, <literal>DESC</literal>,
+        <literal>USING</literal>, and <literal>NULLS FIRST</literal><literal>/LAST</literal>.
        </para>
       </listitem>
 
@@ -6663,7 +7802,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-18 [35192f0] Alvaro..: Have VACUUM log number of skipped pages due to ..
 -->
        <para>
-        Make <link linkend="SQL-VACUUM"><command>VACUUM</></> log the
+        Make <link linkend="sql-vacuum"><command>VACUUM</command></link> log the
         number of pages skipped due to pins (Jim Nasby)
        </para>
       </listitem>
@@ -6673,15 +7812,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-20 [d42358e] Alvaro..: Have TRUNCATE update pgstat tuple counters
 -->
        <para>
-        Make <link linkend="SQL-TRUNCATE"><command>TRUNCATE</></> properly
-        update the <literal>pg_stat</>* tuple counters (Alexander Shulgin)
+        Make <link linkend="sql-truncate"><command>TRUNCATE</command></link> properly
+        update the <literal>pg_stat</literal>* tuple counters (Alexander Shulgin)
        </para>
       </listitem>
 
        </itemizedlist>
 
        <sect4>
-        <title><xref linkend="SQL-REINDEX"></title>
+        <title><xref linkend="sql-reindex"/></title>
 
         <itemizedlist>
 
@@ -6690,8 +7829,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-09 [fe263d1] Simon ..: REINDEX SCHEMA
 -->
        <para>
-        Allow <command>REINDEX</> to reindex an entire schema using the
-        <literal>SCHEMA</> option (Sawada Masahiko)
+        Allow <command>REINDEX</command> to reindex an entire schema using the
+        <literal>SCHEMA</literal> option (Sawada Masahiko)
        </para>
       </listitem>
 
@@ -6700,7 +7839,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [ecd222e] Fujii ..: Support VERBOSE option in REINDEX command.
 -->
        <para>
-        Add <literal>VERBOSE</> option to <command>REINDEX</> (Sawada
+        Add <literal>VERBOSE</literal> option to <command>REINDEX</command> (Sawada
         Masahiko)
        </para>
       </listitem>
@@ -6710,8 +7849,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-09 [ae4e688] Simon ..: Silence REINDEX
 -->
        <para>
-        Prevent <command>REINDEX DATABASE</> and <command>SCHEMA</>
-        from outputting object names, unless <literal>VERBOSE</> is used
+        Prevent <command>REINDEX DATABASE</command> and <command>SCHEMA</command>
+        from outputting object names, unless <literal>VERBOSE</literal> is used
         (Simon Riggs)
        </para>
       </listitem>
@@ -6721,7 +7860,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [17d436d] Fujii ..: Remove obsolete FORCE option from REINDEX.
 -->
        <para>
-        Remove obsolete <literal>FORCE</> option from <command>REINDEX</>
+        Remove obsolete <literal>FORCE</literal> option from <command>REINDEX</command>
         (Fujii Masao)
        </para>
       </listitem>
@@ -6741,7 +7880,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-19 [491c029] Stephe..: Row-Level Security Policies (RLS)
 -->
        <para>
-        Add  <link linkend="ddl-rowsecurity">row-level security control</>
+        Add  <link linkend="ddl-rowsecurity">row-level security control</link>
         (Craig Ringer, KaiGai Kohei, Adam Brightwell, Dean Rasheed,
         Stephen Frost)
        </para>
@@ -6749,11 +7888,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         This feature allows row-by-row control over which users can add,
         modify, or even see rows in a table.  This is controlled by new
-        commands <link linkend="SQL-CREATEPOLICY"><command>CREATE</></>/<link
-        linkend="SQL-ALTERPOLICY"><command>ALTER</></>/<link
-        linkend="SQL-DROPPOLICY"><command>DROP POLICY</></> and <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... ENABLE/DISABLE
-        ROW SECURITY</></>.
+        commands <link linkend="sql-createpolicy"><command>CREATE</command></link>/<link
+        linkend="sql-alterpolicy"><command>ALTER</command></link>/<link
+        linkend="sql-droppolicy"><command>DROP POLICY</command></link> and <link
+        linkend="sql-altertable"><command>ALTER TABLE ... ENABLE/DISABLE
+        ROW SECURITY</command></link>.
        </para>
       </listitem>
 
@@ -6764,8 +7903,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         Allow changing of the <acronym>WAL</acronym>
         logging status of a table after creation with <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... SET LOGGED /
-        UNLOGGED</></> (Fabr&iacute;zio de Royes Mello)
+        linkend="sql-altertable"><command>ALTER TABLE ... SET LOGGED /
+        UNLOGGED</command></link> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6776,12 +7915,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-13 [e39b6f9] Andrew..: Add CINE option for CREATE TABLE AS and CREATE ..
 -->
        <para>
-        Add <literal>IF NOT EXISTS</> clause to <link
-        linkend="SQL-CREATETABLEAS"><command>CREATE TABLE AS</></>,
-        <link linkend="SQL-CREATEINDEX"><command>CREATE INDEX</></>,
-        <link linkend="SQL-CREATESEQUENCE"><command>CREATE SEQUENCE</></>,
-        and <link linkend="SQL-CREATEMATERIALIZEDVIEW"><command>CREATE
-        MATERIALIZED VIEW</></> (Fabr&iacute;zio de Royes Mello)
+        Add <literal>IF NOT EXISTS</literal> clause to <link
+        linkend="sql-createtableas"><command>CREATE TABLE AS</command></link>,
+        <link linkend="sql-createindex"><command>CREATE INDEX</command></link>,
+        <link linkend="sql-createsequence"><command>CREATE SEQUENCE</command></link>,
+        and <link linkend="sql-creatematerializedview"><command>CREATE
+        MATERIALIZED VIEW</command></link> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6790,9 +7929,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-24 [1d8198b] Bruce ..: Add support for ALTER TABLE IF EXISTS ... RENAM..
 -->
        <para>
-        Add support for <literal>IF EXISTS</> to <link
-        linkend="SQL-ALTERTABLE"><command>ALTER TABLE ... RENAME
-        CONSTRAINT</></> (Bruce Momjian)
+        Add support for <literal>IF EXISTS</literal> to <link
+        linkend="sql-altertable"><command>ALTER TABLE ... RENAME
+        CONSTRAINT</command></link> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -6801,17 +7940,17 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-09 [31eae60] Alvaro..: Allow CURRENT/SESSION_USER to be used in certai..
 -->
        <para>
-        Allow some DDL commands to accept <literal>CURRENT_USER</>
-        or <literal>SESSION_USER</>, meaning the current user or session
+        Allow some DDL commands to accept <literal>CURRENT_USER</literal>
+        or <literal>SESSION_USER</literal>, meaning the current user or session
         user, in place of a specific user name (Kyotaro Horiguchi,
         &Aacute;lvaro Herrera)
        </para>
 
        <para>
         This feature is now supported in
-        <xref linkend="SQL-ALTERUSER">, <xref linkend="SQL-ALTERGROUP">,
-        <xref linkend="SQL-ALTERROLE">, <xref linkend="SQL-GRANT">,
-        and <command>ALTER <replaceable>object</> OWNER TO</> commands.
+        <xref linkend="sql-alteruser"/>, <xref linkend="sql-altergroup"/>,
+        <xref linkend="sql-alterrole"/>, <xref linkend="sql-grant"/>,
+        and <command>ALTER <replaceable>object</replaceable> OWNER TO</command> commands.
        </para>
       </listitem>
 
@@ -6820,8 +7959,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-23 [7eca575] Alvaro..: get_object_address: separate domain constraints..
 -->
        <para>
-        Support comments on <link linkend="SQL-CREATEDOMAIN">domain
-        constraints</> (&Aacute;lvaro Herrera)
+        Support comments on <link linkend="sql-createdomain">domain
+        constraints</link> (&Aacute;lvaro Herrera)
        </para>
       </listitem>
 
@@ -6840,14 +7979,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-11 [fa26424] Stephe..: Allow LOCK TABLE .. ROW EXCLUSIVE MODE with IN..
 -->
        <para>
-        Allow <link linkend="SQL-LOCK"><command>LOCK TABLE ... ROW EXCLUSIVE
-        MODE</></> for those with <command>INSERT</> privileges on the
+        Allow <link linkend="sql-lock"><command>LOCK TABLE ... ROW EXCLUSIVE
+        MODE</command></link> for those with <command>INSERT</command> privileges on the
         target table (Stephen Frost)
        </para>
 
        <para>
-        Previously this command required <command>UPDATE</>, <command>DELETE</>,
-        or <command>TRUNCATE</> privileges.
+        Previously this command required <command>UPDATE</command>, <command>DELETE</command>,
+        or <command>TRUNCATE</command> privileges.
        </para>
       </listitem>
 
@@ -6856,7 +7995,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-23 [e5f455f] Tom Lane: Apply table and domain CHECK constraints in nam.
 -->
        <para>
-        Apply table and domain <literal>CHECK</> constraints in order by name
+        Apply table and domain <literal>CHECK</literal> constraints in order by name
         (Tom Lane)
        </para>
 
@@ -6872,16 +8011,16 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow <link
-        linkend="SQL-CREATEDATABASE"><command>CREATE</></>/<link
-        linkend="SQL-ALTERDATABASE"><command>ALTER DATABASE</></>
-        to manipulate <structname>datistemplate</> and
-        <structname>datallowconn</> (Vik Fearing)
+        linkend="sql-createdatabase"><command>CREATE</command></link>/<link
+        linkend="sql-alterdatabase"><command>ALTER DATABASE</command></link>
+        to manipulate <structname>datistemplate</structname> and
+        <structname>datallowconn</structname> (Vik Fearing)
        </para>
 
        <para>
         This allows these per-database settings to be
         changed without manually modifying the <link
-        linkend="catalog-pg-database"><structname>pg_database</></>
+        linkend="catalog-pg-database"><structname>pg_database</structname></link>
         system catalog.
        </para>
       </listitem>
@@ -6898,7 +8037,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-10 [59efda3] Tom Lane: Implement IMPORT FOREIGN SCHEMA.
 -->
        <para>
-        Add support for <xref linkend="SQL-IMPORTFOREIGNSCHEMA">
+        Add support for <xref linkend="sql-importforeignschema"/>
         (Ronan Dunklau, Michael Paquier, Tom Lane)
        </para>
 
@@ -6913,7 +8052,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-17 [fc2ac1f] Tom Lane: Allow CHECK constraints to be placed on foreign..
 -->
        <para>
-        Allow <literal>CHECK</> constraints to be placed on foreign tables
+        Allow <literal>CHECK</literal> constraints to be placed on foreign tables
         (Shigeru Hanada, Etsuro Fujita)
        </para>
 
@@ -6922,7 +8061,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
         and are not enforced locally.  However, they are assumed to hold for
         purposes of query optimization, such
         as <link linkend="ddl-partitioning-constraint-exclusion">constraint
-        exclusion</>.
+        exclusion</link>.
        </para>
       </listitem>
 
@@ -6938,7 +8077,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        <para>
         To let this work naturally, foreign tables are now allowed to have
         check constraints marked as not valid, and to set storage
-        and <type>OID</> characteristics, even though these operations are
+        and <type>OID</type> characteristics, even though these operations are
         effectively no-ops for a foreign table.
        </para>
       </listitem>
@@ -6968,14 +8107,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-11 [b488c58] Alvaro..: Allow on-the-fly capture of DDL event details
 -->
         <para>
-         Whenever a <literal>ddl_command_end</> event trigger is installed,
-         capture details of <acronym>DDL</> activity for it to inspect
+         Whenever a <literal>ddl_command_end</literal> event trigger is installed,
+         capture details of <acronym>DDL</acronym> activity for it to inspect
          (&Aacute;lvaro Herrera)
         </para>
 
         <para>
          This information is available through a set-returning function <link
-         linkend="pg-event-trigger-ddl-command-end-functions"><function>pg_event_trigger_ddl_commands()</></link>,
+         linkend="pg-event-trigger-ddl-command-end-functions"><function>pg_event_trigger_ddl_commands()</function></link>,
          or by inspection of C data structures if that function doesn't
          provide enough detail.
         </para>
@@ -6987,7 +8126,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Allow event triggers on table rewrites caused by <link
-         linkend="SQL-ALTERTABLE"><command>ALTER TABLE</></> (Dimitri
+         linkend="sql-altertable"><command>ALTER TABLE</command></link> (Dimitri
          Fontaine)
         </para>
        </listitem>
@@ -6998,10 +8137,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Add event trigger support for database-level <link
-         linkend="SQL-COMMENT"><command>COMMENT</></>, <link
-         linkend="SQL-SECURITY-LABEL"><command>SECURITY LABEL</></>,
-         and <link linkend="SQL-GRANT"><command>GRANT</></>/<link
-         linkend="SQL-REVOKE"><command>REVOKE</></> (&Aacute;lvaro Herrera)
+         linkend="sql-comment"><command>COMMENT</command></link>, <link
+         linkend="sql-security-label"><command>SECURITY LABEL</command></link>,
+         and <link linkend="sql-grant"><command>GRANT</command></link>/<link
+         linkend="sql-revoke"><command>REVOKE</command></link> (&Aacute;lvaro Herrera)
         </para>
        </listitem>
 
@@ -7012,7 +8151,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Add columns to the output of <link
-         linkend="pg-event-trigger-sql-drop-functions"><function>pg_event_trigger_dropped_objects</></>
+         linkend="pg-event-trigger-sql-drop-functions"><function>pg_event_trigger_dropped_objects</function></link>
          (&Aacute;lvaro Herrera)
         </para>
 
@@ -7037,12 +8176,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-09 [57b1085] Peter ..: Allow empty content in xml type
 -->
       <para>
-       Allow the <link linkend="datatype-xml"><type>xml</></> data type
+       Allow the <link linkend="datatype-xml"><type>xml</type></link> data type
        to accept empty or all-whitespace content values (Peter Eisentraut)
       </para>
 
       <para>
-       This is required by the <acronym>SQL</>/<acronym>XML</>
+       This is required by the <acronym>SQL</acronym>/<acronym>XML</acronym>
        specification.
       </para>
      </listitem>
@@ -7052,8 +8191,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-21 [6f04368] Peter ..: Allow input format xxxx-xxxx-xxxx for macaddr ..
 -->
       <para>
-       Allow <link linkend="datatype-macaddr"><type>macaddr</></> input
-       using the format <literal>xxxx-xxxx-xxxx</> (Herwin Weststrate)
+       Allow <link linkend="datatype-macaddr"><type>macaddr</type></link> input
+       using the format <literal>xxxx-xxxx-xxxx</literal> (Herwin Weststrate)
       </para>
      </listitem>
 
@@ -7063,15 +8202,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Disallow non-SQL-standard syntax for <link
-       linkend="datatype-interval-input"><type>interval</></link> with
+       linkend="datatype-interval-input"><type>interval</type></link> with
        both precision and field specifications (Bruce Momjian)
       </para>
 
       <para>
        Per the standard, such type specifications should be written as,
-       for example, <literal>INTERVAL MINUTE TO SECOND(2)</>.
-       <productname>PostgreSQL</> formerly allowed this to be written as
-       <literal>INTERVAL(2) MINUTE TO SECOND</>, but it must now be
+       for example, <literal>INTERVAL MINUTE TO SECOND(2)</literal>.
+       <productname>PostgreSQL</productname> formerly allowed this to be written as
+       <literal>INTERVAL(2) MINUTE TO SECOND</literal>, but it must now be
        written in the standard way.
       </para>
      </listitem>
@@ -7082,8 +8221,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add selectivity estimators for <link
-       linkend="datatype-inet"><type>inet</></>/<link
-       linkend="datatype-cidr"><type>cidr</></> operators and improve
+       linkend="datatype-inet"><type>inet</type></link>/<link
+       linkend="datatype-cidr"><type>cidr</type></link> operators and improve
        estimators for text search functions (Emre Hasegeli, Tom Lane)
       </para>
      </listitem>
@@ -7095,9 +8234,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add data
-       types <link linkend="datatype-oid-table"><type>regrole</></link>
-       and <link linkend="datatype-oid-table"><type>regnamespace</></link>
-       to simplify entering and pretty-printing the <type>OID</> of a role
+       types <link linkend="datatype-oid-table"><type>regrole</type></link>
+       and <link linkend="datatype-oid-table"><type>regnamespace</type></link>
+       to simplify entering and pretty-printing the <type>OID</type> of a role
        or namespace (Kyotaro Horiguchi)
       </para>
      </listitem>
@@ -7105,7 +8244,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="datatype-json"><acronym>JSON</></link></title>
+     <title><link linkend="datatype-json"><acronym>JSON</acronym></link></title>
 
      <itemizedlist>
 
@@ -7115,10 +8254,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-31 [37def42] Andrew..: Rename jsonb_replace to jsonb_set and allow it ..
 -->
        <para>
-        Add <type>jsonb</> functions <link
-        linkend="functions-json-processing-table"><function>jsonb_set()</></>
+        Add <type>jsonb</type> functions <link
+        linkend="functions-json-processing-table"><function>jsonb_set()</function></link>
         and <link
-        linkend="functions-json-processing-table"><function>jsonb_pretty()</></>
+        linkend="functions-json-processing-table"><function>jsonb_pretty()</function></link>
         (Dmitry Dolgov, Andrew Dunstan, Petr Jel&iacute;nek)
        </para>
       </listitem>
@@ -7128,23 +8267,23 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-12 [7e354ab] Andrew..: Add several generator functions for jsonb that ..
 -->
        <para>
-        Add <type>jsonb</> generator functions <link
-        linkend="functions-json-creation-table"><function>to_jsonb()</></>,
+        Add <type>jsonb</type> generator functions <link
+        linkend="functions-json-creation-table"><function>to_jsonb()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_object()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_object()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_build_object()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_build_object()</function></link>,
         <link
-        linkend="functions-json-creation-table"><function>jsonb_build_array()</></>,
+        linkend="functions-json-creation-table"><function>jsonb_build_array()</function></link>,
         <link
-        linkend="functions-aggregate-table"><function>jsonb_agg()</></>,
+        linkend="functions-aggregate-table"><function>jsonb_agg()</function></link>,
         and <link
-        linkend="functions-aggregate-table"><function>jsonb_object_agg()</></>
+        linkend="functions-aggregate-table"><function>jsonb_object_agg()</function></link>
         (Andrew Dunstan)
        </para>
 
        <para>
-        Equivalent functions already existed for type <type>json</>.
+        Equivalent functions already existed for type <type>json</type>.
        </para>
       </listitem>
 
@@ -7154,8 +8293,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Reduce casting requirements to/from <link
-        linkend="datatype-json"><type>json</></> and <link
-        linkend="datatype-json"><type>jsonb</></> (Tom Lane)
+        linkend="datatype-json"><type>json</type></link> and <link
+        linkend="datatype-json"><type>jsonb</type></link> (Tom Lane)
        </para>
       </listitem>
 
@@ -7164,9 +8303,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-11 [908e234] Andrew..: Rename jsonb - text[] operator to #- to avoid a..
 -->
        <para>
-        Allow <type>text</>, <type>text</> array, and <type>integer</>
-        values to be <link linkend="functions-jsonb-op-table">subtracted</>
-        from <type>jsonb</> documents (Dmitry Dolgov, Andrew Dunstan)
+        Allow <type>text</type>, <type>text</type> array, and <type>integer</type>
+        values to be <link linkend="functions-jsonb-op-table">subtracted</link>
+        from <type>jsonb</type> documents (Dmitry Dolgov, Andrew Dunstan)
        </para>
       </listitem>
 
@@ -7175,8 +8314,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-12 [c694701] Andrew..: Additional functions and operators for jsonb
 -->
        <para>
-        Add <type>jsonb</> <link
-        linkend="functions-jsonb-op-table"><literal>||</></> operator
+        Add <type>jsonb</type> <link
+        linkend="functions-jsonb-op-table"><literal>||</literal></link> operator
         (Dmitry Dolgov, Andrew Dunstan)
        </para>
       </listitem>
@@ -7187,9 +8326,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="functions-json-processing-table"><function>json_strip_nulls()</></>
+        linkend="functions-json-processing-table"><function>json_strip_nulls()</function></link>
         and <link
-        linkend="functions-json-processing-table"><function>jsonb_strip_nulls()</></>
+        linkend="functions-json-processing-table"><function>jsonb_strip_nulls()</function></link>
         functions to remove JSON null values from documents
         (Andrew Dunstan)
        </para>
@@ -7211,8 +8350,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-11 [1871c89] Fujii ..: Add generate_series(numeric, numeric).
 -->
        <para>
-        Add <link linkend="functions-srf"><function>generate_series()</></>
-        for <type>numeric</> values (Plato Malugin)
+        Add <link linkend="functions-srf"><function>generate_series()</function></link>
+        for <type>numeric</type> values (Plato Malugin)
        </para>
       </listitem>
 
@@ -7222,8 +8361,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow <link
-        linkend="functions-aggregate-table"><function>array_agg()</></> and
-        <function>ARRAY()</> to take arrays as inputs (Ali Akbar, Tom Lane)
+        linkend="functions-aggregate-table"><function>array_agg()</function></link> and
+        <function>ARRAY()</function> to take arrays as inputs (Ali Akbar, Tom Lane)
        </para>
       </listitem>
 
@@ -7234,9 +8373,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add functions <link
-        linkend="array-functions-table"><function>array_position()</></>
+        linkend="array-functions-table"><function>array_position()</function></link>
         and <link
-        linkend="array-functions-table"><function>array_positions()</></>
+        linkend="array-functions-table"><function>array_positions()</function></link>
         to return subscripts of array values (Pavel Stehule)
        </para>
       </listitem>
@@ -7246,8 +8385,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-15 [4520ba6] Heikki..: Add point <-> polygon distance operator.
 -->
        <para>
-        Add a <type>point</>-to-<type>polygon</> distance operator
-        <link linkend="functions-geometry-op-table">&lt;-&gt;</>
+        Add a <type>point</type>-to-<type>polygon</type> distance operator
+        <link linkend="functions-geometry-op-table">&lt;-&gt;</link>
         (Alexander Korotkov)
        </para>
       </listitem>
@@ -7258,8 +8397,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow multibyte characters as escapes in <link
-        linkend="functions-similarto-regexp"><literal>SIMILAR TO</></>
-        and <link linkend="functions-string-sql"><literal>SUBSTRING</></>
+        linkend="functions-similarto-regexp"><literal>SIMILAR TO</literal></link>
+        and <link linkend="functions-string-sql"><literal>SUBSTRING</literal></link>
         (Jeff Davis)
        </para>
 
@@ -7274,7 +8413,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add a <link
-        linkend="functions-math-func-table"><function>width_bucket()</></>
+        linkend="functions-math-func-table"><function>width_bucket()</function></link>
         variant that supports any sortable data type and non-uniform bucket
         widths (Petr Jel&iacute;nek)
        </para>
@@ -7285,8 +8424,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-28 [cb2acb1] Heikki..: Add missing_ok option to the SQL functions for..
 -->
        <para>
-        Add an optional <replaceable>missing_ok</> argument to <link
-        linkend="functions-admin-genfile-table"><function>pg_read_file()</></>
+        Add an optional <replaceable>missing_ok</replaceable> argument to <link
+        linkend="functions-admin-genfile-table"><function>pg_read_file()</function></link>
         and related functions (Michael Paquier, Heikki Linnakangas)
        </para>
       </listitem>
@@ -7296,14 +8435,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-10 [865f14a] Robert..: Allow named parameters to be specified using =>..
 -->
        <para>
-        Allow <link linkend="sql-syntax-calling-funcs"><literal>=&gt;</></>
+        Allow <link linkend="sql-syntax-calling-funcs"><literal>=&gt;</literal></link>
         to specify named parameters in function calls (Pavel Stehule)
        </para>
 
        <para>
-        Previously only <literal>:=</> could be used.  This requires removing
-        the possibility for <literal>=&gt;</> to be a user-defined operator.
-        Creation of user-defined <literal>=&gt;</> operators has been issuing
+        Previously only <literal>:=</literal> could be used.  This requires removing
+        the possibility for <literal>=&gt;</literal> to be a user-defined operator.
+        Creation of user-defined <literal>=&gt;</literal> operators has been issuing
         warnings since PostgreSQL 9.0.
        </para>
       </listitem>
@@ -7313,7 +8452,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-25 [06bf0dd] Tom Lane: Upgrade src/port/rint.c to be POSIX-compliant.
 -->
        <para>
-        Add <acronym>POSIX</>-compliant rounding for platforms that use
+        Add <acronym>POSIX</acronym>-compliant rounding for platforms that use
         PostgreSQL-supplied rounding functions (Pedro Gimeno Fortea)
        </para>
       </listitem>
@@ -7332,11 +8471,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add function <link
-        linkend="functions-info-object-table"><function>pg_get_object_address()</></>
-        to return <type>OID</>s that uniquely
+        linkend="functions-info-object-table"><function>pg_get_object_address()</function></link>
+        to return <type>OID</type>s that uniquely
         identify an object, and function <link
-        linkend="functions-info-object-table"><function>pg_identify_object_as_address()</></>
-        to return object information based on <type>OID</>s (&Aacute;lvaro
+        linkend="functions-info-object-table"><function>pg_identify_object_as_address()</function></link>
+        to return object information based on <type>OID</type>s (&Aacute;lvaro
         Herrera)
        </para>
       </listitem>
@@ -7347,11 +8486,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Loosen security checks for viewing queries in <link
-        linkend="pg-stat-activity-view"><structname>pg_stat_activity</></>,
+        linkend="pg-stat-activity-view"><structname>pg_stat_activity</structname></link>,
         executing <link
-        linkend="functions-admin-signal-table"><function>pg_cancel_backend()</></>,
+        linkend="functions-admin-signal-table"><function>pg_cancel_backend()</function></link>,
         and executing <link
-        linkend="functions-admin-signal-table"><function>pg_terminate_backend()</></>
+        linkend="functions-admin-signal-table"><function>pg_terminate_backend()</function></link>
         (Stephen Frost)
        </para>
 
@@ -7367,7 +8506,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="monitoring-stats-funcs-table"><function>pg_stat_get_snapshot_timestamp()</></>
+        linkend="monitoring-stats-funcs-table"><function>pg_stat_get_snapshot_timestamp()</function></link>
         to output the time stamp of the statistics snapshot (Matt Kelly)
        </para>
 
@@ -7383,7 +8522,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add <link
-        linkend="vacuum-for-multixact-wraparound"><function>mxid_age()</></>
+        linkend="vacuum-for-multixact-wraparound"><function>mxid_age()</function></link>
         to compute multi-xid age (Bruce Momjian)
        </para>
       </listitem>
@@ -7401,9 +8540,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-28 [6c40f83] Tom Lane: Add min and max aggregates for inet/cidr data t..
 -->
        <para>
-        Add <function>min()</>/<function>max()</> aggregates
-        for <link linkend="datatype-inet"><type>inet</></>/<link
-        linkend="datatype-cidr"><type>cidr</></> data types (Haribabu
+        Add <function>min()</function>/<function>max()</function> aggregates
+        for <link linkend="datatype-inet"><type>inet</type></link>/<link
+        linkend="datatype-cidr"><type>cidr</type></link> data types (Haribabu
         Kommi)
        </para>
       </listitem>
@@ -7436,12 +8575,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Improve support for composite types in <link
-       linkend="plpython"><application>PL/Python</></> (Ed Behn, Ronan
+       linkend="plpython"><application>PL/Python</application></link> (Ed Behn, Ronan
        Dunklau)
       </para>
 
       <para>
-       This allows <application>PL/Python</> functions to return arrays
+       This allows <application>PL/Python</application> functions to return arrays
        of composite types.
       </para>
      </listitem>
@@ -7452,7 +8591,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Reduce lossiness of <link
-       linkend="plpython"><application>PL/Python</></> floating-point value
+       linkend="plpython"><application>PL/Python</application></link> floating-point value
        conversions (Marko Kreen)
       </para>
      </listitem>
@@ -7462,19 +8601,19 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-26 [cac7658] Peter ..: Add transforms feature
 -->
       <para>
-       Allow specification of conversion routines between <acronym>SQL</>
+       Allow specification of conversion routines between <acronym>SQL</acronym>
        data types and data types of procedural languages (Peter Eisentraut)
       </para>
 
       <para>
        This change adds new commands <link
-       linkend="SQL-CREATETRANSFORM"><command>CREATE</></>/<link
-       linkend="SQL-DROPTRANSFORM"><command>DROP TRANSFORM</></>.
+       linkend="sql-createtransform"><command>CREATE</command></link>/<link
+       linkend="sql-droptransform"><command>DROP TRANSFORM</command></link>.
        This also adds optional transformations between the <link
-       linkend="hstore"><application>hstore</></> and <link
-       linkend="ltree"><application>ltree</></> types to/from <link
-       linkend="plperl"><application>PL/Perl</></> and <link
-       linkend="plpython"><application>PL/Python</></>.
+       linkend="hstore"><application>hstore</application></link> and <link
+       linkend="ltree"><application>ltree</application></link> types to/from <link
+       linkend="plperl"><application>PL/Perl</application></link> and <link
+       linkend="plpython"><application>PL/Python</application></link>.
       </para>
      </listitem>
 
@@ -7493,7 +8632,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-02-16 [9e3ad1a] Tom Lane: Use fast path in plpgsql's RETURN/RETURN NEXT i..
 -->
       <para>
-       Improve <link linkend="plpgsql"><application>PL/pgSQL</></> array
+       Improve <link linkend="plpgsql"><application>PL/pgSQL</application></link> array
        performance (Tom Lane)
       </para>
      </listitem>
@@ -7503,8 +8642,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-25 [a4847fc] Tom Lane: Add an ASSERT statement in plpgsql.
 -->
       <para>
-       Add an <link linkend="plpgsql-statements-assert"><command>ASSERT</></>
-       statement in <application>PL/pgSQL</> (Pavel Stehule)
+       Add an <link linkend="plpgsql-statements-assert"><command>ASSERT</command></link>
+       statement in <application>PL/pgSQL</application> (Pavel Stehule)
       </para>
      </listitem>
 
@@ -7513,7 +8652,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-25 [bb1b8f6] Tom Lane: De-reserve most statement-introducing keywords ..
 -->
       <para>
-       Allow more <link linkend="plpgsql"><application>PL/pgSQL</></>
+       Allow more <link linkend="plpgsql"><application>PL/pgSQL</application></link>
        keywords to be used as identifiers (Tom Lane)
       </para>
      </listitem>
@@ -7538,11 +8677,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Move <link
-       linkend="pgarchivecleanup"><application>pg_archivecleanup</></>,
-       <link linkend="pgtestfsync"><application>pg_test_fsync</></>,
-       <link linkend="pgtesttiming"><application>pg_test_timing</></>,
-       and <link linkend="pgwaldump"><application>pg_xlogdump</></>
-       from <filename>contrib</> to <filename>src/bin</> (Peter Eisentraut)
+       linkend="pgarchivecleanup"><application>pg_archivecleanup</application></link>,
+       <link linkend="pgtestfsync"><application>pg_test_fsync</application></link>,
+       <link linkend="pgtesttiming"><application>pg_test_timing</application></link>,
+       and <link linkend="pgwaldump"><application>pg_xlogdump</application></link>
+       from <filename>contrib</filename> to <filename>src/bin</filename> (Peter Eisentraut)
       </para>
 
       <para>
@@ -7556,7 +8695,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-23 [61081e7] Heikki..: Add pg_rewind, for re-synchronizing a master se..
 -->
       <para>
-       Add <link linkend="app-pgrewind"><application>pg_rewind</></>,
+       Add <link linkend="app-pgrewind"><application>pg_rewind</application></link>,
        which allows re-synchronizing a master server after failback
        (Heikki Linnakangas)
       </para>
@@ -7568,13 +8707,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow <link
-       linkend="app-pgreceivewal"><application>pg_receivexlog</></>
+       linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
        to manage physical replication slots (Michael Paquier)
       </para>
 
       <para>
-       This is controlled via new <option>--create-slot</> and
-       <option>--drop-slot</> options.
+       This is controlled via new <option>--create-slot</option> and
+       <option>--drop-slot</option> options.
       </para>
      </listitem>
 
@@ -7584,13 +8723,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow <link
-       linkend="app-pgreceivewal"><application>pg_receivexlog</></>
-       to synchronously flush <acronym>WAL</> to storage using new
-       <option>--synchronous</> option (Furuya Osamu, Fujii Masao)
+       linkend="app-pgreceivewal"><application>pg_receivexlog</application></link>
+       to synchronously flush <acronym>WAL</acronym> to storage using new
+       <option>--synchronous</option> option (Furuya Osamu, Fujii Masao)
       </para>
 
       <para>
-       Without this, <acronym>WAL</> files are fsync'ed only on close.
+       Without this, <acronym>WAL</acronym> files are fsync'ed only on close.
       </para>
      </listitem>
 
@@ -7599,8 +8738,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-01-23 [a179232] Alvaro..: vacuumdb: enable parallel mode
 -->
       <para>
-       Allow <link linkend="APP-VACUUMDB"><application>vacuumdb</></> to
-       vacuum in parallel using new <option>--jobs</> option (Dilip Kumar)
+       Allow <link linkend="app-vacuumdb"><application>vacuumdb</application></link> to
+       vacuum in parallel using new <option>--jobs</option> option (Dilip Kumar)
       </para>
      </listitem>
 
@@ -7609,7 +8748,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-11-12 [5094da9] Alvaro..: vacuumdb: don't prompt for passwords over and ..
 -->
       <para>
-       In <link linkend="APP-VACUUMDB"><application>vacuumdb</></>, do not
+       In <link linkend="app-vacuumdb"><application>vacuumdb</application></link>, do not
        prompt for the same password repeatedly when multiple connections
        are necessary (Haribabu Kommi, Michael Paquier)
       </para>
@@ -7620,8 +8759,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [458a077] Fujii ..: Support &#8211;&#8211;verbose option in reindexdb.
 -->
       <para>
-       Add <option>--verbose</> option to <link
-       linkend="APP-REINDEXDB"><application>reindexdb</></> (Sawada
+       Add <option>--verbose</option> option to <link
+       linkend="app-reindexdb"><application>reindexdb</application></link> (Sawada
        Masahiko)
       </para>
      </listitem>
@@ -7631,10 +8770,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-12 [72d422a] Andrew..: Map basebackup tablespaces using a tablespace_..
 -->
       <para>
-       Make <link linkend="app-pgbasebackup"><application>pg_basebackup</></>
-       use a tablespace mapping file when using <application>tar</> format,
+       Make <link linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
+       use a tablespace mapping file when using <application>tar</application> format,
        to support symbolic links and file paths of 100+ characters in length
-       on <systemitem class="osname">MS Windows</> (Amit Kapila)
+       on <systemitem class="osname">MS Windows</systemitem> (Amit Kapila)
       </para>
      </listitem>
 
@@ -7644,15 +8783,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-19 [bdd5726] Andres..: Add the capability to display summary statistic..
 -->
       <para>
-       Add <link linkend="pgwaldump"><application>pg_xlogdump</></> option
-       <option>--stats</> to display summary statistics (Abhijit Menon-Sen)
+       Add <link linkend="pgwaldump"><application>pg_xlogdump</application></link> option
+       <option>--stats</option> to display summary statistics (Abhijit Menon-Sen)
       </para>
      </listitem>
 
     </itemizedlist>
 
      <sect4>
-      <title><xref linkend="APP-PSQL"></title>
+      <title><xref linkend="app-psql"/></title>
 
       <itemizedlist>
 
@@ -7661,7 +8800,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-31 [9d9991c] Bruce ..: psql:  add asciidoc output format
 -->
         <para>
-         Allow <application>psql</> to produce AsciiDoc output (Szymon Guz)
+         Allow <application>psql</application> to produce AsciiDoc output (Szymon Guz)
         </para>
        </listitem>
 
@@ -7670,14 +8809,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-10 [5b214c5] Fujii ..: Add new ECHO mode 'errors' that displays only ..
 -->
         <para>
-         Add an <literal>errors</> mode that displays only failed commands
-         to <application>psql</>'s <varname>ECHO</> variable
+         Add an <literal>errors</literal> mode that displays only failed commands
+         to <application>psql</application>'s <varname>ECHO</varname> variable
          (Pavel Stehule)
         </para>
 
         <para>
-         This behavior can also be selected with <application>psql</>'s
-         <option>-b</> option.
+         This behavior can also be selected with <application>psql</application>'s
+         <option>-b</option> option.
         </para>
        </listitem>
 
@@ -7687,12 +8826,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Provide separate column, header, and border linestyle control
-         in <application>psql</>'s unicode linestyle (Pavel Stehule)
+         in <application>psql</application>'s unicode linestyle (Pavel Stehule)
         </para>
 
         <para>
          Single or double lines are supported; the default is
-         <literal>single</>.
+         <literal>single</literal>.
         </para>
        </listitem>
 
@@ -7701,8 +8840,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-02 [51bb795] Andres..: Add psql PROMPT variable showing which line of ..
 -->
         <para>
-         Add new option <literal>%l</> in <application>psql</>'s <link
-         linkend="APP-PSQL-variables"><envar>PROMPT</></> variables
+         Add new option <literal>%l</literal> in <application>psql</application>'s <link
+         linkend="app-psql-variables"><envar>PROMPT</envar></link> variables
          to display the current multiline statement line number
          (Sawada Masahiko)
         </para>
@@ -7713,8 +8852,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-28 [7655f4c] Andrew..: Add a pager_min_lines setting to psql
 -->
         <para>
-         Add <literal>\pset</> option <link
-         linkend="APP-PSQL-meta-commands"><varname>pager_min_lines</></>
+         Add <literal>\pset</literal> option <link
+         linkend="app-psql-meta-commands"><varname>pager_min_lines</varname></link>
          to control pager invocation (Andrew Dunstan)
         </para>
        </listitem>
@@ -7724,7 +8863,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-21 [4077fb4] Andrew..: Fix an error in psql that overcounted output l..
 -->
         <para>
-         Improve <application>psql</> line counting used when deciding
+         Improve <application>psql</application> line counting used when deciding
          to invoke the pager (Andrew Dunstan)
         </para>
        </listitem>
@@ -7735,8 +8874,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-12-08 [e90371d] Tom Lane: Make failure to open psql log-file fatal.
 -->
         <para>
-         <application>psql</> now fails if the file specified by
-         an <option>--output</> or <option>--log-file</> switch cannot be
+         <application>psql</application> now fails if the file specified by
+         an <option>--output</option> or <option>--log-file</option> switch cannot be
          written (Tom Lane, Daniel V&eacute;rit&eacute;)
         </para>
 
@@ -7750,8 +8889,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-12 [bd40951] Andres..: Minimal psql tab completion support for SET se..
 -->
         <para>
-         Add <application>psql</> tab completion when setting the
-         <xref linkend="guc-search-path"> variable (Jeff Janes)
+         Add <application>psql</application> tab completion when setting the
+         <xref linkend="guc-search-path"/> variable (Jeff Janes)
         </para>
 
         <para>
@@ -7764,7 +8903,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-23 [631e7f6] Heikki..: Improve tab-completion of DROP and ALTER ENABLE..
 -->
         <para>
-         Improve <application>psql</>'s tab completion for triggers and rules
+         Improve <application>psql</application>'s tab completion for triggers and rules
          (Andreas Karlsson)
         </para>
        </listitem>
@@ -7772,7 +8911,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
       </itemizedlist>
 
      <sect5>
-      <title><link linkend="APP-PSQL-meta-commands">Backslash Commands</link></title>
+      <title><link linkend="app-psql-meta-commands">Backslash Commands</link></title>
 
       <itemizedlist>
 
@@ -7781,17 +8920,17 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-10 [07c8651] Andres..: Add new psql help topics, accessible to both..
 -->
         <para>
-         Add <application>psql</> <command>\?</> help sections
-         <literal>variables</> and <literal>options</> (Pavel Stehule)
+         Add <application>psql</application> <command>\?</command> help sections
+         <literal>variables</literal> and <literal>options</literal> (Pavel Stehule)
         </para>
 
         <para>
-         <literal>\? variables</> shows <application>psql</>'s special
-         variables and <literal>\? options</> shows the command-line options.
-         <command>\? commands</> shows the meta-commands, which is the
+         <literal>\? variables</literal> shows <application>psql</application>'s special
+         variables and <literal>\? options</literal> shows the command-line options.
+         <command>\? commands</command> shows the meta-commands, which is the
          traditional output and remains the default.  These help displays
          can also be obtained with the command-line
-         option <literal>--help=<replaceable>section</></literal>.
+         option <literal>--help=<replaceable>section</replaceable></literal>.
         </para>
        </listitem>
 
@@ -7800,7 +8939,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [ee80f04] Alvaro..: psql: Show tablespace size in \db+
 -->
         <para>
-         Show tablespace size in <application>psql</>'s <literal>\db+</>
+         Show tablespace size in <application>psql</application>'s <literal>\db+</literal>
          (Fabr&iacute;zio de Royes Mello)
         </para>
        </listitem>
@@ -7810,7 +8949,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-09 [a6f3c1f] Magnus..: Show owner of types in psql \dT+
 -->
         <para>
-         Show data type owners in <application>psql</>'s <literal>\dT+</>
+         Show data type owners in <application>psql</application>'s <literal>\dT+</literal>
          (Magnus Hagander)
         </para>
        </listitem>
@@ -7820,13 +8959,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-04 [f6f654f] Fujii ..: Allow \watch to display query execution time if..
 -->
         <para>
-         Allow <application>psql</>'s <command>\watch</> to output
-         <command>\timing</> information (Fujii Masao)
+         Allow <application>psql</application>'s <command>\watch</command> to output
+         <command>\timing</command> information (Fujii Masao)
         </para>
 
         <para>
-         Also prevent <option>--echo-hidden</> from echoing
-         <command>\watch</> queries, since that is generally unwanted.
+         Also prevent <option>--echo-hidden</option> from echoing
+         <command>\watch</command> queries, since that is generally unwanted.
         </para>
        </listitem>
 
@@ -7835,8 +8974,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-22 [eca2b9b] Andrew..: Rework echo_hidden for \sf and \ef from commit ..
 -->
         <para>
-         Make <application>psql</>'s <literal>\sf</> and <literal>\ef</>
-         commands honor <envar>ECHO_HIDDEN</> (Andrew Dunstan)
+         Make <application>psql</application>'s <literal>\sf</literal> and <literal>\ef</literal>
+         commands honor <envar>ECHO_HIDDEN</envar> (Andrew Dunstan)
         </para>
        </listitem>
 
@@ -7845,8 +8984,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-12 [e15c4ab] Fujii ..: Add tab-completion for \unset and valid setting..
 -->
         <para>
-         Improve <application>psql</> tab completion for <command>\set</>,
-         <command>\unset</>, and <literal>:variable</> names (Pavel
+         Improve <application>psql</application> tab completion for <command>\set</command>,
+         <command>\unset</command>, and <literal>:variable</literal> names (Pavel
          Stehule)
         </para>
        </listitem>
@@ -7857,7 +8996,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
         <para>
          Allow tab completion of role names
-         in <application>psql</> <literal>\c</> commands (Ian Barwick)
+         in <application>psql</application> <literal>\c</literal> commands (Ian Barwick)
         </para>
        </listitem>
 
@@ -7868,7 +9007,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><xref linkend="APP-PGDUMP"></title>
+     <title><xref linkend="app-pgdump"/></title>
 
      <itemizedlist>
 
@@ -7877,15 +9016,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-17 [be1cc8f] Simon ..: Add pg_dump &#8211;&#8211;snapshot option
 -->
        <para>
-        Allow <application>pg_dump</> to share a snapshot taken by another
-        session using <option>--snapshot</> (Simon Riggs, Michael Paquier)
+        Allow <application>pg_dump</application> to share a snapshot taken by another
+        session using <option>--snapshot</option> (Simon Riggs, Michael Paquier)
        </para>
 
        <para>
         The remote snapshot must have been exported by
-        <function>pg_export_snapshot()</> or logical replication slot
+        <function>pg_export_snapshot()</function> or logical replication slot
         creation.  This can be used to share a consistent snapshot
-        across multiple <application>pg_dump</> processes.
+        across multiple <application>pg_dump</application> processes.
        </para>
       </listitem>
 
@@ -7910,13 +9049,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-07 [7700597] Tom Lane: In pg_dump, show server and pg_dump versions w..
 -->
        <para>
-        Make <application>pg_dump</> always print the server and
-        <application>pg_dump</> versions (Jing Wang)
+        Make <application>pg_dump</application> always print the server and
+        <application>pg_dump</application> versions (Jing Wang)
        </para>
 
        <para>
         Previously, version information was only printed in
-        <option>--verbose</> mode.
+        <option>--verbose</option> mode.
        </para>
       </listitem>
 
@@ -7925,9 +9064,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-06-04 [232cd63] Fujii ..: Remove -i/-ignore-version option from pg_dump..
 -->
        <para>
-        Remove the long-ignored <option>-i</>/<option>--ignore-version</>
-        option from <application>pg_dump</>, <application>pg_dumpall</>,
-        and <application>pg_restore</> (Fujii Masao)
+        Remove the long-ignored <option>-i</option>/<option>--ignore-version</option>
+        option from <application>pg_dump</application>, <application>pg_dumpall</application>,
+        and <application>pg_restore</application> (Fujii Masao)
        </para>
       </listitem>
 
@@ -7936,7 +9075,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><xref linkend="app-pg-ctl"></title>
+     <title><xref linkend="app-pg-ctl"/></title>
 
      <itemizedlist>
 
@@ -7945,7 +9084,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-25 [ebe30ad] Bruce ..: pg_ctl, pg_upgrade:  allow multiple -o/-O opti..
 -->
        <para>
-        Support multiple <application>pg_ctl</> <option>-o</> options,
+        Support multiple <application>pg_ctl</application> <option>-o</option> options,
         concatenating their values (Bruce Momjian)
        </para>
       </listitem>
@@ -7955,13 +9094,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-17 [c0e4520] Magnus..: Add option to pg_ctl to choose event source for..
 -->
        <para>
-        Allow control of <application>pg_ctl</>'s event source logging
-        on <systemitem class="osname">MS Windows</> (MauMau)
+        Allow control of <application>pg_ctl</application>'s event source logging
+        on <systemitem class="osname">MS Windows</systemitem> (MauMau)
        </para>
 
        <para>
-        This only controls <application>pg_ctl</>, not the server, which
-        has separate settings in <filename>postgresql.conf</>.
+        This only controls <application>pg_ctl</application>, not the server, which
+        has separate settings in <filename>postgresql.conf</filename>.
        </para>
       </listitem>
 
@@ -7971,14 +9110,14 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         If the server's listen address is set to a wildcard value
-        (<literal>0.0.0.0</> in IPv4 or <literal>::</> in IPv6), connect via
+        (<literal>0.0.0.0</literal> in IPv4 or <literal>::</literal> in IPv6), connect via
         the loopback address rather than trying to use the wildcard address
         literally (Kondo Yuta)
        </para>
 
        <para>
         This fix primarily affects Windows, since on other platforms
-        <application>pg_ctl</> will prefer to use a Unix-domain socket.
+        <application>pg_ctl</application> will prefer to use a Unix-domain socket.
        </para>
       </listitem>
 
@@ -7987,7 +9126,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><xref linkend="pgupgrade"></title>
+     <title><xref linkend="pgupgrade"/></title>
 
      <itemizedlist>
 
@@ -7996,13 +9135,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-14 [9fa8b0e] Peter ..: Move pg_upgrade from contrib/ to src/bin/
 -->
        <para>
-        Move <application>pg_upgrade</> from <filename>contrib</> to
-        <filename>src/bin</> (Peter Eisentraut)
+        Move <application>pg_upgrade</application> from <filename>contrib</filename> to
+        <filename>src/bin</filename> (Peter Eisentraut)
        </para>
 
        <para>
         In connection with this change, the functionality previously
-        provided by the <application>pg_upgrade_support</> module has been
+        provided by the <application>pg_upgrade_support</application> module has been
         moved into the core server.
        </para>
       </listitem>
@@ -8012,8 +9151,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-08-25 [ebe30ad] Bruce ..: pg_ctl, pg_upgrade:  allow multiple -o/-O optio..
 -->
        <para>
-        Support multiple <application>pg_upgrade</>
-        <option>-o</>/<option>-O</> options,
+        Support multiple <application>pg_upgrade</application>
+        <option>-o</option>/<option>-O</option> options,
         concatenating their values (Bruce Momjian)
        </para>
       </listitem>
@@ -8024,7 +9163,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Improve database collation comparisons in
-        <application>pg_upgrade</> (Heikki Linnakangas)
+        <application>pg_upgrade</application> (Heikki Linnakangas)
        </para>
       </listitem>
 
@@ -8042,7 +9181,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
     </sect4>
 
     <sect4>
-     <title><xref linkend="pgbench"></title>
+     <title><xref linkend="pgbench"/></title>
 
      <itemizedlist>
 
@@ -8051,7 +9190,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-13 [81134af] Peter ..: Move pgbench from contrib/ to src/bin/
 -->
        <para>
-        Move pgbench from <filename>contrib</> to <filename>src/bin</>
+        Move pgbench from <filename>contrib</filename> to <filename>src/bin</filename>
         (Peter Eisentraut)
        </para>
       </listitem>
@@ -8062,7 +9201,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Fix calculation of TPS number <quote>excluding connections
-        establishing</> (Tatsuo Ishii, Fabien Coelho)
+        establishing</quote> (Tatsuo Ishii, Fabien Coelho)
        </para>
 
        <para>
@@ -8084,7 +9223,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
        </para>
 
        <para>
-        This is controlled by a new <option>--latency-limit</> option.
+        This is controlled by a new <option>--latency-limit</option> option.
        </para>
       </listitem>
 
@@ -8094,7 +9233,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow pgbench to generate Gaussian/exponential distributions
-        using <command>\setrandom</> (Kondo Mitsumasa, Fabien Coelho)
+        using <command>\setrandom</command> (Kondo Mitsumasa, Fabien Coelho)
        </para>
       </listitem>
 
@@ -8103,9 +9242,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-02 [878fdcb] Robert..: pgbench: Add a real expression syntax to \set
 -->
        <para>
-        Allow <application>pgbench</>'s <command>\set</> command to handle
+        Allow <application>pgbench</application>'s <command>\set</command> command to handle
         arithmetic expressions containing more than one operator, and add
-        <literal>%</> (modulo) to the set of operators it supports
+        <literal>%</literal> (modulo) to the set of operators it supports
         (Robert Haas, Fabien Coelho)
        </para>
       </listitem>
@@ -8126,7 +9265,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-20 [2c03216] Heikki..: Revamp the WAL record format.
 -->
        <para>
-        Simplify <link linkend="wal"><acronym>WAL</></> record format
+        Simplify <link linkend="wal"><acronym>WAL</acronym></link> record format
         (Heikki Linnakangas)
        </para>
 
@@ -8151,7 +9290,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-09-25 [b64d92f] Andres..: Add a basic atomic ops API abstracting away pla..
 -->
        <para>
-        Add atomic memory operations <acronym>API</> (Andres Freund)
+        Add atomic memory operations <acronym>API</acronym> (Andres Freund)
        </para>
       </listitem>
 
@@ -8189,13 +9328,13 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Foreign tables can now take part in <command>INSERT ... ON CONFLICT
-        DO NOTHING</> queries (Peter Geoghegan, Heikki Linnakangas,
+        DO NOTHING</command> queries (Peter Geoghegan, Heikki Linnakangas,
         Andres Freund)
        </para>
 
        <para>
         Foreign data wrappers must be modified to handle this.
-        <command>INSERT ... ON CONFLICT DO UPDATE</> is not supported on
+        <command>INSERT ... ON CONFLICT DO UPDATE</command> is not supported on
         foreign tables.
        </para>
       </listitem>
@@ -8205,7 +9344,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-18 [4a14f13] Tom Lane: Improve hash_create's API for selecting simple-..
 -->
        <para>
-        Improve <function>hash_create()</>'s API for selecting
+        Improve <function>hash_create()</function>'s API for selecting
         simple-binary-key hash functions (Teodor Sigaev, Tom Lane)
        </para>
       </listitem>
@@ -8226,8 +9365,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-06-28 [a6d488c] Andres..: Remove Alpha and Tru64 support.
 -->
        <para>
-        Remove <productname>Alpha</> (<acronym>CPU</>) and <systemitem
-        class="osname">Tru64</> (OS) ports (Andres Freund)
+        Remove <productname>Alpha</productname> (<acronym>CPU</acronym>) and <systemitem
+        class="osname">Tru64</systemitem> (OS) ports (Andres Freund)
        </para>
       </listitem>
 
@@ -8237,11 +9376,11 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Remove swap-byte-based spinlock implementation for
-        <acronym>ARM</>v5 and earlier <acronym>CPU</>s (Robert Haas)
+        <acronym>ARM</acronym>v5 and earlier <acronym>CPU</acronym>s (Robert Haas)
        </para>
 
        <para>
-        <acronym>ARM</>v5's weak memory ordering made this locking
+        <acronym>ARM</acronym>v5's weak memory ordering made this locking
         implementation unsafe.  Spinlock support is still possible on
         newer gcc implementations with atomics support.
        </para>
@@ -8267,10 +9406,10 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Change index operator class for columns <link
-        linkend="catalog-pg-seclabel"><structname>pg_seclabel</></>.<structname>provider</>
+        linkend="catalog-pg-seclabel"><structname>pg_seclabel</structname></link>.<structname>provider</structname>
         and <link
-        linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</></>.<structname>provider</>
-        to be <literal>text_pattern_ops</> (Tom Lane)
+        linkend="catalog-pg-shseclabel"><structname>pg_shseclabel</structname></link>.<structname>provider</structname>
+        to be <literal>text_pattern_ops</literal> (Tom Lane)
        </para>
 
        <para>
@@ -8303,8 +9442,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Allow higher-precision time stamp resolution on <systemitem
-        class="osname">Windows 8</>, <systemitem class="osname">Windows
-        Server 2012</>, and later Windows systems (Craig Ringer)
+        class="osname">Windows 8</systemitem>, <systemitem class="osname">Windows
+        Server 2012</systemitem>, and later Windows systems (Craig Ringer)
        </para>
       </listitem>
 
@@ -8313,8 +9452,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-03-18 [f9dead5] Alvaro..: Install shared libraries to bin/ in Windows un..
 -->
        <para>
-        Install shared libraries to <filename>bin</> in <systemitem
-        class="osname">MS Windows</> (Peter Eisentraut, Michael Paquier)
+        Install shared libraries to <filename>bin</filename> in <systemitem
+        class="osname">MS Windows</systemitem> (Peter Eisentraut, Michael Paquier)
        </para>
       </listitem>
 
@@ -8323,8 +9462,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-04-16 [22d0053] Alvaro..: MSVC: install src/test/modules together with c..
 -->
        <para>
-        Install <filename>src/test/modules</> together with
-        <filename>contrib</> on <productname>MSVC</> builds (Michael
+        Install <filename>src/test/modules</filename> together with
+        <filename>contrib</filename> on <productname>MSVC</productname> builds (Michael
         Paquier)
        </para>
       </listitem>
@@ -8334,9 +9473,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-12 [8d9a0e8] Magnus..: Support &#8211;&#8211;with-extra-version equivalent functi..
 -->
        <para>
-        Allow <link linkend="install-procedure">configure</>'s
-        <option>--with-extra-version</> option to be honored by the
-        <productname>MSVC</> build (Michael Paquier)
+        Allow <link linkend="install-procedure">configure</link>'s
+        <option>--with-extra-version</option> option to be honored by the
+        <productname>MSVC</productname> build (Michael Paquier)
        </para>
       </listitem>
 
@@ -8345,7 +9484,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [91f03ba] Noah M..: MSVC: Recognize PGFILEDESC in contrib and conv..
 -->
        <para>
-        Pass <envar>PGFILEDESC</> into <productname>MSVC</> contrib builds
+        Pass <envar>PGFILEDESC</envar> into <productname>MSVC</productname> contrib builds
         (Michael Paquier)
        </para>
       </listitem>
@@ -8355,8 +9494,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-07-14 [c4a448e] Noah M..: MSVC: Apply icons to all binaries having them ..
 -->
        <para>
-        Add icons to all <productname>MSVC</>-built binaries and version
-        information to all <systemitem class="osname">MS Windows</>
+        Add icons to all <productname>MSVC</productname>-built binaries and version
+        information to all <systemitem class="osname">MS Windows</systemitem>
         binaries (Noah Misch)
        </para>
 
@@ -8371,12 +9510,12 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
        <para>
         Add optional-argument support to the internal
-        <function>getopt_long()</> implementation (Michael Paquier,
+        <function>getopt_long()</function> implementation (Michael Paquier,
         Andres Freund)
        </para>
 
        <para>
-        This is used by the <productname>MSVC</> build.
+        This is used by the <productname>MSVC</productname> build.
        </para>
       </listitem>
 
@@ -8398,7 +9537,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
       <para>
        Add statistics for minimum, maximum,
        mean, and standard deviation times to <link
-       linkend="pgstatstatements-columns"><application>pg_stat_statements</></>
+       linkend="pgstatstatements-columns"><application>pg_stat_statements</application></link>
        (Mitsumasa Kondo, Andrew Dunstan)
       </para>
      </listitem>
@@ -8408,8 +9547,8 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-10-01 [32984d8] Heikki..: Add functions for dealing with PGP armor heade..
 -->
       <para>
-       Add <link linkend="pgcrypto"><application>pgcrypto</></> function
-       <function>pgp_armor_headers()</> to extract <productname>PGP</>
+       Add <link linkend="pgcrypto"><application>pgcrypto</application></link> function
+       <function>pgp_armor_headers()</function> to extract <productname>PGP</productname>
        armor headers (Marko Tiikkaja, Heikki Linnakangas)
       </para>
      </listitem>
@@ -8420,7 +9559,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow empty replacement strings in <link
-       linkend="unaccent"><application>unaccent</></> (Mohammad Alhashash)
+       linkend="unaccent"><application>unaccent</application></link> (Mohammad Alhashash)
       </para>
 
       <para>
@@ -8435,7 +9574,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Allow multicharacter source strings in <link
-       linkend="unaccent"><application>unaccent</></> (Tom Lane)
+       linkend="unaccent"><application>unaccent</application></link> (Tom Lane)
       </para>
 
       <para>
@@ -8451,9 +9590,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-15 [149f6f1] Simon ..: TABLESAMPLE system_time(limit)
 -->
       <para>
-       Add <filename>contrib</> modules <link
-       linkend="tsm-system-rows"><application>tsm_system_rows</></> and
-       <link linkend="tsm-system-time"><application>tsm_system_time</></>
+       Add <filename>contrib</filename> modules <link
+       linkend="tsm-system-rows"><application>tsm_system_rows</application></link> and
+       <link linkend="tsm-system-time"><application>tsm_system_time</application></link>
        to allow additional table sampling methods (Petr Jel&iacute;nek)
       </para>
      </listitem>
@@ -8463,9 +9602,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-11-21 [3a82bc6] Heikki..: Add pageinspect functions for inspecting GIN in..
 -->
       <para>
-       Add <link linkend="GIN"><acronym>GIN</></>
+       Add <link linkend="gin"><acronym>GIN</acronym></link>
        index inspection functions to <link
-       linkend="pageinspect"><application>pageinspect</></> (Heikki
+       linkend="pageinspect"><application>pageinspect</application></link> (Heikki
        Linnakangas, Peter Geoghegan, Michael Paquier)
       </para>
      </listitem>
@@ -8476,7 +9615,7 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 -->
       <para>
        Add information about buffer pins to <link
-       linkend="pgbuffercache"><application>pg_buffercache</></> display
+       linkend="pgbuffercache"><application>pg_buffercache</application></link> display
        (Andres Freund)
       </para>
      </listitem>
@@ -8486,9 +9625,9 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2015-05-13 [5850b20] Andres..: Add pgstattuple_approx() to the pgstattuple ext..
 -->
       <para>
-       Allow <link linkend="pgstattuple"><application>pgstattuple</></>
+       Allow <link linkend="pgstattuple"><application>pgstattuple</application></link>
        to report approximate answers with less overhead using
-       <function>pgstattuple_approx()</> (Abhijit Menon-Sen)
+       <function>pgstattuple_approx()</function> (Abhijit Menon-Sen)
       </para>
      </listitem>
 
@@ -8498,15 +9637,15 @@ Add GUC and storage parameter to set the maximum size of GIN pending list.
 2014-12-01 [df761e3] Alvaro..: Move security_label test
 -->
       <para>
-       Move <application>dummy_seclabel</>, <application>test_shm_mq</>,
-       <application>test_parser</>, and <application>worker_spi</>
-       from <filename>contrib</> to <filename>src/test/modules</>
+       Move <application>dummy_seclabel</application>, <application>test_shm_mq</application>,
+       <application>test_parser</application>, and <application>worker_spi</application>
+       from <filename>contrib</filename> to <filename>src/test/modules</filename>
        (&Aacute;lvaro Herrera)
       </para>
 
       <para>
        These modules are only meant for server testing, so they do not need
-       to be built or installed when packaging <productname>PostgreSQL</>.
+       to be built or installed when packaging <productname>PostgreSQL</productname>.
       </para>
      </listitem>
 
diff --git a/doc/src/sgml/release-9.6.sgml b/doc/src/sgml/release-9.6.sgml
index 078ac87841..f364aebeb5 100644
--- a/doc/src/sgml/release-9.6.sgml
+++ b/doc/src/sgml/release-9.6.sgml
@@ -1,6 +1,1536 @@
 <!-- doc/src/sgml/release-9.6.sgml -->
 <!-- See header comment in release.sgml about typical markup -->
 
+ <sect1 id="release-9-6-8">
+  <title>Release 9.6.8</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-03-01</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.6.7.
+   For information about new features in the 9.6 major release, see
+   <xref linkend="release-9-6"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.6.8</title>
+
+   <para>
+    A dump/restore is not required for those running 9.6.X.
+   </para>
+
+   <para>
+    However, if you run an installation in which not all users are mutually
+    trusting, or if you maintain an application or extension that is
+    intended for use in arbitrary situations, it is strongly recommended
+    that you read the documentation changes described in the first changelog
+    entry below, and take suitable steps to ensure that your installation or
+    code is secure.
+   </para>
+
+   <para>
+    Also, the changes described in the second changelog entry below may
+    cause functions used in index expressions or materialized views to fail
+    during auto-analyze, or when reloading from a dump.  After upgrading,
+    monitor the server logs for such problems, and fix affected functions.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.6.7,
+    see <xref linkend="release-9-6-7"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Document how to configure installations and applications to guard
+      against search-path-dependent trojan-horse attacks from other users
+      (Noah Misch)
+     </para>
+
+     <para>
+      Using a <varname>search_path</varname> setting that includes any
+      schemas writable by a hostile user enables that user to capture
+      control of queries and then run arbitrary SQL code with the
+      permissions of the attacked user.  While it is possible to write
+      queries that are proof against such hijacking, it is notationally
+      tedious, and it's very easy to overlook holes.  Therefore, we now
+      recommend configurations in which no untrusted schemas appear in
+      one's search path.  Relevant documentation appears in
+      <xref linkend="ddl-schemas-patterns"/> (for database administrators and users),
+      <xref linkend="libpq-connect"/> (for application authors),
+      <xref linkend="extend-extensions-style"/>  (for extension authors), and
+      <xref linkend="sql-createfunction"/> (for authors
+      of <literal>SECURITY DEFINER</literal> functions).
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid use of insecure <varname>search_path</varname> settings
+      in <application>pg_dump</application> and other client programs
+      (Noah Misch, Tom Lane)
+     </para>
+
+     <para>
+      <application>pg_dump</application>,
+      <application>pg_upgrade</application>,
+      <application>vacuumdb</application> and
+      other <productname>PostgreSQL</productname>-provided applications were
+      themselves vulnerable to the type of hijacking described in the previous
+      changelog entry; since these applications are commonly run by
+      superusers, they present particularly attractive targets.  To make them
+      secure whether or not the installation as a whole has been secured,
+      modify them to include only the <structname>pg_catalog</structname>
+      schema in their <varname>search_path</varname> settings.
+      Autovacuum worker processes now do the same, as well.
+     </para>
+
+     <para>
+      In cases where user-provided functions are indirectly executed by
+      these programs &mdash; for example, user-provided functions in index
+      expressions &mdash; the tighter <varname>search_path</varname> may
+      result in errors, which will need to be corrected by adjusting those
+      user-provided functions to not assume anything about what search path
+      they are invoked under.  That has always been good practice, but now
+      it will be necessary for correct behavior.
+      (CVE-2018-1058)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix misbehavior of concurrent-update rechecks with CTE references
+      appearing in subplans (Tom Lane)
+     </para>
+
+     <para>
+      If a CTE (<literal>WITH</literal> clause reference) is used in an
+      InitPlan or SubPlan, and the query requires a recheck due to trying
+      to update or lock a concurrently-updated row, incorrect results could
+      be obtained.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix planner failures with overlapping mergejoin clauses in an outer
+      join (Tom Lane)
+     </para>
+
+     <para>
+      These mistakes led to <quote>left and right pathkeys do not match in
+      mergejoin</quote> or <quote>outer pathkeys do not match
+      mergeclauses</quote> planner errors in corner cases.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair <application>pg_upgrade</application>'s failure to
+      preserve <structfield>relfrozenxid</structfield> for materialized
+      views (Tom Lane, Andres Freund)
+     </para>
+
+     <para>
+      This oversight could lead to data corruption in materialized views
+      after an upgrade, manifesting as <quote>could not access status of
+      transaction</quote> or <quote>found xmin from before
+      relfrozenxid</quote> errors.  The problem would be more likely to
+      occur in seldom-refreshed materialized views, or ones that were
+      maintained only with <command>REFRESH MATERIALIZED VIEW
+      CONCURRENTLY</command>.
+     </para>
+
+     <para>
+      If such corruption is observed, it can be repaired by refreshing the
+      materialized view (without <literal>CONCURRENTLY</literal>).
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect reporting of PL/Python function names in
+      error <literal>CONTEXT</literal> stacks (Tom Lane)
+     </para>
+
+     <para>
+      An error occurring within a nested PL/Python function call (that is,
+      one reached via a SPI query from another PL/Python function) would
+      result in a stack trace showing the inner function's name twice,
+      rather than the expected results.  Also, an error in a nested
+      PL/Python <literal>DO</literal> block could result in a null pointer
+      dereference crash on some platforms.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <filename>contrib/auto_explain</filename>'s
+      <varname>log_min_duration</varname> setting to range up
+      to <literal>INT_MAX</literal>, or about 24 days instead of 35 minutes
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Mark assorted GUC variables as <literal>PGDLLIMPORT</literal>, to
+      ease porting extension modules to Windows (Metin Doslu)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-6-7">
+  <title>Release 9.6.7</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2018-02-08</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.6.6.
+   For information about new features in the 9.6 major release, see
+   <xref linkend="release-9-6"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.6.7</title>
+
+   <para>
+    A dump/restore is not required for those running 9.6.X.
+   </para>
+
+   <para>
+    However,
+    if you use <filename>contrib/cube</filename>'s <literal>~&gt;</literal>
+    operator, see the entry below about that.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.6.6,
+    see <xref linkend="release-9-6-6"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that all temporary files made
+      by <application>pg_upgrade</application> are non-world-readable
+      (Tom Lane, Noah Misch)
+     </para>
+
+     <para>
+      <application>pg_upgrade</application> normally restricts its
+      temporary files to be readable and writable only by the calling user.
+      But the temporary file containing <literal>pg_dumpall -g</literal>
+      output would be group- or world-readable, or even writable, if the
+      user's <literal>umask</literal> setting allows.  In typical usage on
+      multi-user machines, the <literal>umask</literal> and/or the working
+      directory's permissions would be tight enough to prevent problems;
+      but there may be people using <application>pg_upgrade</application>
+      in scenarios where this oversight would permit disclosure of database
+      passwords to unfriendly eyes.
+      (CVE-2018-1053)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix vacuuming of tuples that were updated while key-share locked
+      (Andres Freund, &Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      In some cases <command>VACUUM</command> would fail to remove such
+      tuples even though they are now dead, leading to assorted data
+      corruption scenarios.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Ensure that vacuum will always clean up the pending-insertions list of
+      a GIN index (Masahiko Sawada)
+     </para>
+
+     <para>
+      This is necessary to ensure that dead index entries get removed.
+      The old code got it backwards, allowing vacuum to skip the cleanup if
+      some other process were running cleanup concurrently, thus risking
+      invalid entries being left behind in the index.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix inadequate buffer locking in some LSN fetches (Jacob Champion,
+      Asim Praveen, Ashwin Agrawal)
+     </para>
+
+     <para>
+      These errors could result in misbehavior under concurrent load.
+      The potential consequences have not been characterized fully.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect query results from cases involving flattening of
+      subqueries whose outputs are used in <literal>GROUPING SETS</literal>
+      (Heikki Linnakangas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unnecessary failure in a query on an inheritance tree that
+      occurs concurrently with some child table being removed from the tree
+      by <command>ALTER TABLE NO INHERIT</command> (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix spurious deadlock failures when multiple sessions are
+      running <command>CREATE INDEX CONCURRENTLY</command> (Jeff Janes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix failures when an inheritance tree contains foreign child tables
+      (Etsuro Fujita)
+     </para>
+
+     <para>
+      A mix of regular and foreign tables in an inheritance tree resulted in
+      creation of incorrect plans for <command>UPDATE</command>
+      and <command>DELETE</command> queries.  This led to visible failures in
+      some cases, notably when there are row-level triggers on a foreign
+      child table.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Repair failure with correlated sub-<literal>SELECT</literal>
+      inside <literal>VALUES</literal> inside a <literal>LATERAL</literal>
+      subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <quote>could not devise a query plan for the given query</quote>
+      planner failure for some cases involving nested <literal>UNION
+      ALL</literal> inside a lateral subquery (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix logical decoding to correctly clean up disk files for crashed
+      transactions (Atsushi Torikoshi)
+     </para>
+
+     <para>
+      Logical decoding may spill WAL records to disk for transactions
+      generating many WAL records.  Normally these files are cleaned up
+      after the transaction's commit or abort record arrives; but if
+      no such record is ever seen, the removal code misbehaved.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix walsender timeout failure and failure to respond to interrupts
+      when processing a large transaction (Petr Jelinek)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>has_sequence_privilege()</function> to
+      support <literal>WITH GRANT OPTION</literal> tests,
+      as other privilege-testing functions do (Joe Conway)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In databases using UTF8 encoding, ignore any XML declaration that
+      asserts a different encoding (Pavel Stehule, Noah Misch)
+     </para>
+
+     <para>
+      We always store XML strings in the database encoding, so allowing
+      libxml to act on a declaration of another encoding gave wrong results.
+      In encodings other than UTF8, we don't promise to support non-ASCII
+      XML data anyway, so retain the previous behavior for bug compatibility.
+      This change affects only <function>xpath()</function> and related
+      functions; other XML code paths already acted this way.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide for forward compatibility with future minor protocol versions
+      (Robert Haas, Badrul Chowdhury)
+     </para>
+
+     <para>
+      Up to now, <productname>PostgreSQL</productname> servers simply
+      rejected requests to use protocol versions newer than 3.0, so that
+      there was no functional difference between the major and minor parts
+      of the protocol version number.  Allow clients to request versions 3.x
+      without failing, sending back a message showing that the server only
+      understands 3.0.  This makes no difference at the moment, but
+      back-patching this change should allow speedier introduction of future
+      minor protocol upgrades.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Cope with failure to start a parallel worker process
+      (Amit Kapila, Robert Haas)
+     </para>
+
+     <para>
+      Parallel query previously tended to hang indefinitely if a worker
+      could not be started, as the result of <literal>fork()</literal>
+      failure or other low-probability problems.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix collection of <command>EXPLAIN</command> statistics from parallel
+      workers (Amit Kapila, Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid unsafe alignment assumptions when working
+      with <type>__int128</type> (Tom Lane)
+     </para>
+
+     <para>
+      Typically, compilers assume that <type>__int128</type> variables are
+      aligned on 16-byte boundaries, but our memory allocation
+      infrastructure isn't prepared to guarantee that, and increasing the
+      setting of MAXALIGN seems infeasible for multiple reasons.  Adjust the
+      code to allow use of <type>__int128</type> only when we can tell the
+      compiler to assume lesser alignment.  The only known symptom of this
+      problem so far is crashes in some parallel aggregation queries.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent stack-overflow crashes when planning extremely deeply
+      nested set operations
+      (<literal>UNION</literal>/<literal>INTERSECT</literal>/<literal>EXCEPT</literal>)
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix null-pointer crashes for some types of LDAP URLs appearing
+      in <filename>pg_hba.conf</filename> (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample <function>INSTR()</function> functions in the PL/pgSQL
+      documentation (Yugo Nagata, Tom Lane)
+     </para>
+
+     <para>
+      These functions are stated to
+      be <trademark class="registered">Oracle</trademark> compatible, but
+      they weren't exactly.  In particular, there was a discrepancy in the
+      interpretation of a negative third parameter: Oracle thinks that a
+      negative value indicates the last place where the target substring can
+      begin, whereas our functions took it as the last place where the
+      target can end.  Also, Oracle throws an error for a zero or negative
+      fourth parameter, whereas our functions returned zero.
+     </para>
+
+     <para>
+      The sample code has been adjusted to match Oracle's behavior more
+      precisely.  Users who have copied this code into their applications
+      may wish to update their copies.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_dump</application> to make ACL (permissions),
+      comment, and security label entries reliably identifiable in archive
+      output formats (Tom Lane)
+     </para>
+
+     <para>
+      The <quote>tag</quote> portion of an ACL archive entry was usually
+      just the name of the associated object.  Make it start with the object
+      type instead, bringing ACLs into line with the convention already used
+      for comment and security label archive entries.  Also, fix the
+      comment and security label entries for the whole database, if present,
+      to make their tags start with <literal>DATABASE</literal> so that they
+      also follow this convention.  This prevents false matches in code that
+      tries to identify large-object-related entries by seeing if the tag
+      starts with <literal>LARGE OBJECT</literal>.  That could have resulted
+      in misclassifying entries as data rather than schema, with undesirable
+      results in a schema-only or data-only dump.
+     </para>
+
+     <para>
+      Note that this change has user-visible results in the output
+      of <command>pg_restore --list</command>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Rename <application>pg_rewind</application>'s
+      <function>copy_file_range</function> function to avoid conflict
+      with new Linux system call of that name (Andres Freund)
+     </para>
+
+     <para>
+      This change prevents build failures with newer glibc versions.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <application>ecpg</application>, detect indicator arrays that do
+      not have the correct length and report an error (David Rader)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Change the behavior of <filename>contrib/cube</filename>'s
+      <type>cube</type> <literal>~&gt;</literal> <type>int</type>
+      operator to make it compatible with KNN search (Alexander Korotkov)
+     </para>
+
+     <para>
+      The meaning of the second argument (the dimension selector) has been
+      changed to make it predictable which value is selected even when
+      dealing with cubes of varying dimensionalities.
+     </para>
+
+     <para>
+      This is an incompatible change, but since the point of the operator
+      was to be used in KNN searches, it seems rather useless as-is.
+      After installing this update, any expression indexes or materialized
+      views using this operator will need to be reindexed/refreshed.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Avoid triggering a libc assertion
+      in <filename>contrib/hstore</filename>, due to use
+      of <function>memcpy()</function> with equal source and destination
+      pointers (Tomas Vondra)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect display of tuples' null bitmaps
+      in <filename>contrib/pageinspect</filename> (Maksim Milyutin)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In <filename>contrib/postgres_fdw</filename>, avoid
+      <quote>outer pathkeys do not match mergeclauses</quote>
+      planner error when constructing a plan involving a remote join
+      (Robert Haas)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Provide modern examples of how to auto-start Postgres on macOS
+      (Tom Lane)
+     </para>
+
+     <para>
+      The scripts in <filename>contrib/start-scripts/osx</filename> use
+      infrastructure that's been deprecated for over a decade, and which no
+      longer works at all in macOS releases of the last couple of years.
+      Add a new subdirectory <filename>contrib/start-scripts/macos</filename>
+      containing scripts that use the newer <application>launchd</application>
+      infrastructure.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect selection of configuration-specific libraries for
+      OpenSSL on Windows (Andrew Dunstan)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Support linking to MinGW-built versions of libperl (Noah Misch)
+     </para>
+
+     <para>
+      This allows building PL/Perl with some common Perl distributions for
+      Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix MSVC build to test whether 32-bit libperl
+      needs <literal>-D_USE_32BIT_TIME_T</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Available Perl distributions are inconsistent about what they expect,
+      and lack any reliable means of reporting it, so resort to a build-time
+      test on what the library being used actually does.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, install the crash dump handler earlier in postmaster
+      startup (Takayuki Tsunakawa)
+     </para>
+
+     <para>
+      This may allow collection of a core dump for some early-startup
+      failures that did not produce a dump before.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      On Windows, avoid encoding-conversion-related crashes when emitting
+      messages very early in postmaster startup (Takayuki Tsunakawa)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Use our existing Motorola 68K spinlock code on OpenBSD as
+      well as NetBSD (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Add support for spinlocks on Motorola 88K (David Carlier)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2018c for DST law changes in Brazil, Sao Tome and Principe,
+      plus historical corrections for Bolivia, Japan, and South Sudan.
+      The <literal>US/Pacific-New</literal> zone has been removed (it was
+      only an alias for <literal>America/Los_Angeles</literal> anyway).
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-6-6">
+  <title>Release 9.6.6</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-11-09</para>
+  </formalpara>
+
+  <para>
+   This release contains a variety of fixes from 9.6.5.
+   For information about new features in the 9.6 major release, see
+   <xref linkend="release-9-6"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.6.6</title>
+
+   <para>
+    A dump/restore is not required for those running 9.6.X.
+   </para>
+
+   <para>
+    However, if you use BRIN indexes, see the fourth changelog entry below.
+   </para>
+
+   <para>
+    Also, if you are upgrading from a version earlier than 9.6.4,
+    see <xref linkend="release-9-6-4"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+     <para>
+      Ensure that <literal>INSERT ... ON CONFLICT DO UPDATE</literal> checks
+      table permissions and RLS policies in all cases (Dean Rasheed)
+     </para>
+
+     <para>
+      The update path of <literal>INSERT ... ON CONFLICT DO UPDATE</literal>
+      requires <literal>SELECT</literal> permission on the columns of the
+      arbiter index, but it failed to check for that in the case of an
+      arbiter specified by constraint name.
+      In addition, for a table with row level security enabled, it failed to
+      check updated rows against the table's <literal>SELECT</literal>
+      policies (regardless of how the arbiter index was specified).
+      (CVE-2017-15099)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash due to rowtype mismatch
+      in <function>json{b}_populate_recordset()</function>
+      (Michael Paquier, Tom Lane)
+     </para>
+
+     <para>
+      These functions used the result rowtype specified in the <literal>FROM
+      ... AS</literal> clause without checking that it matched the actual
+      rowtype of the supplied tuple value.  If it didn't, that would usually
+      result in a crash, though disclosure of server memory contents seems
+      possible as well.
+      (CVE-2017-15098)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix sample server-start scripts to become <literal>$PGUSER</literal>
+      before opening <literal>$PGLOG</literal> (Noah Misch)
+     </para>
+
+     <para>
+      Previously, the postmaster log file was opened while still running as
+      root.  The database owner could therefore mount an attack against
+      another system user by making <literal>$PGLOG</literal> be a symbolic
+      link to some other file, which would then become corrupted by appending
+      log messages.
+     </para>
+
+     <para>
+      By default, these scripts are not installed anywhere.  Users who have
+      made use of them will need to manually recopy them, or apply the same
+      changes to their modified versions.  If the
+      existing <literal>$PGLOG</literal> file is root-owned, it will need to
+      be removed or renamed out of the way before restarting the server with
+      the corrected script.
+      (CVE-2017-12172)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix BRIN index summarization to handle concurrent table extension
+      correctly (&Aacute;lvaro Herrera)
+     </para>
+
+     <para>
+      Previously, a race condition allowed some table rows to be omitted from
+      the index.  It may be necessary to reindex existing BRIN indexes to
+      recover from past occurrences of this problem.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix possible failures during concurrent updates of a BRIN index
+      (Tom Lane)
+     </para>
+
+     <para>
+      These race conditions could result in errors like <quote>invalid index
+      offnum</quote> or <quote>inconsistent range map</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix crash when logical decoding is invoked from a SPI-using function,
+      in particular any function written in a PL language
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect query results when multiple <literal>GROUPING
+      SETS</literal> columns contain the same simple variable (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix incorrect parallelization decisions for nested queries
+      (Amit Kapila, Kuntal Ghosh)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix parallel query handling to not fail when a recently-used role is
+      dropped (Amit Kapila)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>json_build_array()</function>,
+      <function>json_build_object()</function>, and their <type>jsonb</type>
+      equivalents to handle explicit <literal>VARIADIC</literal> arguments
+      correctly (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [7769fc000] 2017-09-27 17:05:53 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [07ea925e2] 2017-09-27 17:05:53 -0400
+Branch: REL9_6_STABLE [def03e4bf] 2017-09-27 17:05:53 -0400
+Branch: REL9_5_STABLE [ad56dbd6c] 2017-09-27 17:05:53 -0400
+Branch: REL9_4_STABLE [c38575edc] 2017-09-27 17:05:53 -0400
+Branch: REL9_3_STABLE [2e82fba0e] 2017-09-27 17:05:54 -0400
+Branch: REL9_2_STABLE [72d4fd08e] 2017-09-27 17:05:54 -0400
+-->
+     <para>
+      Properly reject attempts to convert infinite float values to
+      type <type>numeric</type> (Tom Lane, KaiGai Kohei)
+     </para>
+
+     <para>
+      Previously the behavior was platform-dependent.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix corner-case crashes when columns have been added to the end of a
+      view (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Record proper dependencies when a view or rule
+      contains <structname>FieldSelect</structname>
+      or <structname>FieldStore</structname> expression nodes (Tom Lane)
+     </para>
+
+     <para>
+      Lack of these dependencies could allow a column or data
+      type <command>DROP</command> to go through when it ought to fail,
+      thereby causing later uses of the view or rule to get errors.
+      This patch does not do anything to protect existing views/rules,
+      only ones created in the future.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Correctly detect hashability of range data types (Tom Lane)
+     </para>
+
+     <para>
+      The planner mistakenly assumed that any range type could be hashed
+      for use in hash joins or hash aggregation, but actually it must check
+      whether the range's subtype has hash support.  This does not affect any
+      of the built-in range types, since they're all hashable anyway.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [6f44fe7f1] 2017-09-17 15:28:51 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [244b4a37e] 2017-09-17 15:28:51 -0400
+Branch: REL9_6_STABLE [86e4ebb9a] 2017-09-17 15:28:51 -0400
+Branch: REL9_5_STABLE [eeff68396] 2017-09-17 15:28:51 -0400
+-->
+     <para>
+      Correctly ignore <structname>RelabelType</structname> expression nodes
+      when determining relation distinctness (David Rowley)
+     </para>
+
+     <para>
+      This allows the intended optimization to occur when a subquery has
+      a result column of type <type>varchar</type>.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent sharing transition states between ordered-set aggregates
+      (David Rowley)
+     </para>
+
+     <para>
+      This causes a crash with the built-in ordered-set aggregates, and
+      probably with user-written ones as well.  v11 and later will include
+      provisions for dealing with such cases safely, but in released
+      branches, just disable the optimization.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Prevent <varname>idle_in_transaction_session_timeout</varname> from
+      being ignored when a <varname>statement_timeout</varname> occurred
+      earlier (Lukas Fittl)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix low-probability loss of <command>NOTIFY</command> messages due to
+      XID wraparound (Marko Tiikkaja, Tom Lane)
+     </para>
+
+     <para>
+      If a session executed no queries, but merely listened for
+      notifications, for more than 2 billion transactions, it started to miss
+      some notifications from concurrently-committing transactions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [899bd785c] 2017-09-25 16:09:19 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [4621c7f7a] 2017-09-25 16:09:19 -0400
+Branch: REL9_6_STABLE [175061222] 2017-09-25 16:09:20 -0400
+Branch: REL9_5_STABLE [05297416f] 2017-09-25 16:09:20 -0400
+Branch: REL9_4_STABLE [3a07a6f3e] 2017-09-25 16:09:20 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [5ea96efaa] 2017-09-26 13:42:53 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [d29f30d8c] 2017-09-26 13:43:00 -0400
+Branch: REL9_6_STABLE [12ac252f9] 2017-09-26 13:43:07 -0400
+Branch: REL9_5_STABLE [06852f215] 2017-09-26 13:43:12 -0400
+Branch: REL9_4_STABLE [e5c058e2e] 2017-09-26 13:43:17 -0400
+-->
+     <para>
+      Avoid <systemitem>SIGBUS</systemitem> crash on Linux when a DSM memory
+      request exceeds the space available in <systemitem>tmpfs</systemitem>
+      (Thomas Munro)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Reduce the frequency of data flush requests during bulk file copies to
+      avoid performance problems on macOS, particularly with its new APFS
+      file system (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [27c6619e9] 2017-09-17 14:50:01 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [66fe509be] 2017-09-17 14:50:01 -0400
+Branch: REL9_6_STABLE [c0d21bdb8] 2017-09-17 14:50:01 -0400
+Branch: REL9_5_STABLE [825fac5d3] 2017-09-17 14:50:01 -0400
+Branch: REL9_4_STABLE [bc0974703] 2017-09-17 14:50:01 -0400
+Branch: REL9_3_STABLE [b1be33593] 2017-09-17 14:50:01 -0400
+Branch: REL9_2_STABLE [4cd6cd21d] 2017-09-17 14:50:01 -0400
+-->
+     <para>
+      Prevent low-probability crash in processing of nested trigger firings
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Allow <command>COPY</command>'s <literal>FREEZE</literal> option to
+      work when the transaction isolation level is <literal>REPEATABLE
+      READ</literal> or higher (Noah Misch)
+     </para>
+
+     <para>
+      This case was unintentionally broken by a previous bug fix.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [aa6b7b72d] 2017-09-22 17:10:36 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [3d7f11a0f] 2017-09-23 10:03:05 -0400
+Branch: REL9_6_STABLE [a1f30ecc5] 2017-09-23 10:03:36 -0400
+Branch: REL9_5_STABLE [acae13faa] 2017-09-23 10:04:55 -0400
+Branch: REL9_4_STABLE [9bf049946] 2017-09-23 10:05:28 -0400
+Branch: REL9_3_STABLE [e0f5710c5] 2017-09-23 10:05:40 -0400
+Branch: REL9_2_STABLE [2eb84e54a] 2017-09-23 10:14:30 -0400
+-->
+     <para>
+      Correctly restore the umask setting when file creation fails
+      in <command>COPY</command> or <function>lo_export()</function>
+      (Peter Eisentraut)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [714805010] 2017-09-21 18:13:11 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [a2b1eb234] 2017-09-21 18:13:11 -0400
+Branch: REL9_6_STABLE [ea31541f5] 2017-09-21 18:13:11 -0400
+Branch: REL9_5_STABLE [122289a66] 2017-09-21 18:13:11 -0400
+Branch: REL9_4_STABLE [b572b435c] 2017-09-21 18:13:11 -0400
+Branch: REL9_3_STABLE [a09d8be7d] 2017-09-21 18:13:11 -0400
+Branch: REL9_2_STABLE [e56facd8b] 2017-09-21 18:13:11 -0400
+-->
+     <para>
+      Give a better error message for duplicate column names
+      in <command>ANALYZE</command> (Nathan Bossart)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Robert Haas <rhaas@postgresql.org>
+Branch: master [81276fdd3] 2017-09-14 17:19:04 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [a2a61f633] 2017-09-14 16:44:01 -0400
+Branch: REL9_6_STABLE [353328ad1] 2017-09-14 16:47:11 -0400
+-->
+     <para>
+      Add missing cases in <function>GetCommandLogLevel()</function>,
+      preventing errors when certain SQL commands are used while
+      <varname>log_statement</varname> is set to <literal>ddl</literal>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: REL9_6_STABLE [2ac598874] 2017-10-17 12:15:08 -0400
+Branch: REL9_5_STABLE [9e20276e1] 2017-10-17 12:15:08 -0400
+Branch: REL9_4_STABLE [38f17e8ee] 2017-10-17 12:15:08 -0400
+Branch: REL9_3_STABLE [06b2a73ed] 2017-10-17 12:15:08 -0400
+-->
+     <para>
+      Fix mis-parsing of the last line in a
+      non-newline-terminated <filename>pg_hba.conf</filename> file
+      (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <function>AggGetAggref()</function> to return the
+      correct <structname>Aggref</structname> nodes to aggregate final
+      functions whose transition calculations have been merged (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Stephen Frost <sfrost@snowman.net>
+Branch: master [d2e40b310] 2017-09-13 20:02:09 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [68a7c24fd] 2017-09-13 20:04:43 -0400
+Branch: REL9_6_STABLE [caae416aa] 2017-09-13 20:02:27 -0400
+-->
+     <para>
+      Fix <application>pg_dump</application> to ensure that it
+      emits <command>GRANT</command> commands in a valid order
+      (Stephen Frost)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>pg_basebackup</application>'s matching of tablespace
+      paths to canonicalize both paths before comparing (Michael Paquier)
+     </para>
+
+     <para>
+      This is particularly helpful on Windows.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix <application>libpq</application> to not require user's home
+      directory to exist (Tom Lane)
+     </para>
+
+     <para>
+      In v10, failure to find the home directory while trying to
+      read <filename>~/.pgpass</filename> was treated as a hard error,
+      but it should just cause that file to not be found.  Both v10 and
+      previous release branches made the same mistake when
+      reading <filename>~/.pg_service.conf</filename>, though this was less
+      obvious since that file is not sought unless a service name is
+      specified.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [2e70d6b5e] 2017-08-29 15:18:01 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [b481b39b8] 2017-08-29 15:18:01 -0400
+Branch: REL9_6_STABLE [bc95e5874] 2017-08-29 15:18:01 -0400
+Branch: REL9_5_STABLE [dfd1042c6] 2017-08-29 15:18:01 -0400
+Branch: REL9_4_STABLE [1c53722ff] 2017-08-29 15:18:01 -0400
+Branch: REL9_3_STABLE [d391fb6c3] 2017-08-29 15:18:01 -0400
+Branch: REL9_2_STABLE [a07058a6d] 2017-08-29 15:18:01 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [9d6b160d7] 2017-09-01 15:14:46 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [f2fe1cbef] 2017-09-01 15:14:18 -0400
+Branch: REL9_6_STABLE [3a0f8e7d3] 2017-09-01 15:14:18 -0400
+Branch: REL9_5_STABLE [1305186de] 2017-09-01 15:14:18 -0400
+Branch: REL9_4_STABLE [53863ebeb] 2017-09-01 15:14:18 -0400
+Branch: REL9_3_STABLE [dd344de67] 2017-09-01 15:14:18 -0400
+Branch: REL9_2_STABLE [f60a236ba] 2017-09-01 15:14:18 -0400
+-->
+     <para>
+      Fix <application>libpq</application> to guard against integer
+      overflow in the row count of a <structname>PGresult</structname>
+      (Michael Paquier)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [35e156882] 2017-09-12 04:53:36 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [75fbf8ad1] 2017-09-18 23:07:18 +0200
+Branch: REL9_6_STABLE [59b5a3e5c] 2017-09-18 23:07:34 +0200
+Branch: REL9_5_STABLE [3a5aa7de3] 2017-09-18 23:07:44 +0200
+Branch: REL9_4_STABLE [e5b8b771e] 2017-09-18 23:08:17 +0200
+Branch: REL9_3_STABLE [149cfdb3a] 2017-09-18 23:08:24 +0200
+-->
+     <para>
+      Fix <application>ecpg</application>'s handling of out-of-scope cursor
+      declarations with pointer or array variables (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      In ecpglib, correctly handle backslashes in string literals depending
+      on whether <varname>standard_conforming_strings</varname> is set
+      (Tsunakawa Takayuki)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Make ecpglib's Informix-compatibility mode ignore fractional digits in
+      integer input strings, as expected (Gao Zengqi, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [a772624b1] 2017-08-26 12:57:21 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [38d7cb67f] 2017-09-14 00:47:03 +0200
+Branch: REL9_6_STABLE [839ee1811] 2017-09-14 01:17:03 +0200
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [04fbe0e45] 2017-08-26 19:11:58 +0200
+Branch: REL_10_STABLE Release: REL_10_0 [eaf7001eb] 2017-09-14 00:47:08 +0200
+Branch: REL9_6_STABLE [407e66078] 2017-09-14 01:17:15 +0200
+-->
+     <para>
+      Fix <application>ecpg</application>'s regression tests to work reliably
+      on Windows (Christian Ullrich, Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Fix missing temp-install prerequisites
+      for <literal>check</literal>-like Make targets (Noah Misch)
+     </para>
+
+     <para>
+      Some non-default test procedures that are meant to work
+      like <literal>make check</literal> failed to ensure that the temporary
+      installation was up to date.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [47f849a3c] 2017-09-22 00:04:29 -0400
+Branch: REL_10_STABLE Release: REL_10_0 [3876b16ce] 2017-09-22 00:04:21 -0400
+Branch: REL9_6_STABLE [e25f4401d] 2017-09-22 00:04:21 -0400
+Branch: REL9_5_STABLE [89f02e17a] 2017-09-22 00:04:21 -0400
+Branch: REL9_4_STABLE [dbd6099fb] 2017-09-22 00:04:21 -0400
+Branch: REL9_3_STABLE [2020f90bf] 2017-09-22 00:04:21 -0400
+Branch: REL9_2_STABLE [a07105afa] 2017-09-22 00:04:21 -0400
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [24a1897ab] 2017-10-23 17:54:09 -0400
+Branch: REL_10_STABLE [dffe7fbc2] 2017-10-23 17:54:09 -0400
+Branch: REL9_6_STABLE [173b7a4a7] 2017-10-23 17:54:09 -0400
+Branch: REL9_5_STABLE [4b433a8b0] 2017-10-23 17:54:09 -0400
+Branch: REL9_4_STABLE [876e076eb] 2017-10-23 17:54:09 -0400
+Branch: REL9_3_STABLE [9c74dd2d5] 2017-10-23 17:54:09 -0400
+Branch: REL9_2_STABLE [1317d1301] 2017-10-23 17:54:09 -0400
+-->
+     <para>
+      Sync our copy of the timezone library with IANA release tzcode2017c
+      (Tom Lane)
+     </para>
+
+     <para>
+      This fixes various issues; the only one likely to be user-visible
+      is that the default DST rules for a POSIX-style zone name, if
+      no <filename>posixrules</filename> file exists in the timezone data
+      directory, now match current US law rather than what it was a dozen
+      years ago.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Update time zone data files to <application>tzdata</application>
+      release 2017c for DST law changes in Fiji, Namibia, Northern Cyprus,
+      Sudan, Tonga, and Turks &amp; Caicos Islands, plus historical
+      corrections for Alaska, Apia, Burma, Calcutta, Detroit, Ireland,
+      Namibia, and Pago Pago.
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
+ <sect1 id="release-9-6-5">
+  <title>Release 9.6.5</title>
+
+  <formalpara>
+  <title>Release date:</title>
+  <para>2017-08-31</para>
+  </formalpara>
+
+  <para>
+   This release contains a small number of fixes from 9.6.4.
+   For information about new features in the 9.6 major release, see
+   <xref linkend="release-9-6"/>.
+  </para>
+
+  <sect2>
+   <title>Migration to Version 9.6.5</title>
+
+   <para>
+    A dump/restore is not required for those running 9.6.X.
+   </para>
+
+   <para>
+    However, if you are upgrading from a version earlier than 9.6.4,
+    see <xref linkend="release-9-6-4"/>.
+   </para>
+  </sect2>
+
+  <sect2>
+   <title>Changes</title>
+
+   <itemizedlist>
+
+    <listitem>
+<!--
+Author: Peter Eisentraut <peter_e@gmx.net>
+Branch: master [0659465ca] 2017-08-15 19:27:22 -0400
+Branch: REL_10_STABLE [3ea58216d] 2017-08-15 19:30:35 -0400
+Branch: REL9_6_STABLE [dce90c7c8] 2017-08-15 19:31:06 -0400
+Branch: REL9_5_STABLE [dbeefe64f] 2017-08-15 19:32:00 -0400
+Branch: REL9_4_STABLE [52427015a] 2017-08-15 19:32:41 -0400
+Branch: REL9_3_STABLE [9f0f4efc2] 2017-08-15 19:32:52 -0400
+Branch: REL9_2_STABLE [98e6784aa] 2017-08-15 19:33:04 -0400
+-->
+     <para>
+      Show foreign tables
+      in <structname>information_schema</structname>.<structname>table_privileges</structname>
+      view (Peter Eisentraut)
+     </para>
+
+     <para>
+      All other relevant <structname>information_schema</structname> views include
+      foreign tables, but this one ignored them.
+     </para>
+
+     <para>
+      Since this view definition is installed by <application>initdb</application>,
+      merely upgrading will not fix the problem.  If you need to fix this
+      in an existing installation, you can, as a superuser, do this
+      in <application>psql</application>:
+<programlisting>
+SET search_path TO information_schema;
+CREATE OR REPLACE VIEW table_privileges AS
+    SELECT CAST(u_grantor.rolname AS sql_identifier) AS grantor,
+           CAST(grantee.rolname AS sql_identifier) AS grantee,
+           CAST(current_database() AS sql_identifier) AS table_catalog,
+           CAST(nc.nspname AS sql_identifier) AS table_schema,
+           CAST(c.relname AS sql_identifier) AS table_name,
+           CAST(c.prtype AS character_data) AS privilege_type,
+           CAST(
+             CASE WHEN
+                  -- object owner always has grant options
+                  pg_has_role(grantee.oid, c.relowner, 'USAGE')
+                  OR c.grantable
+                  THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_grantable,
+           CAST(CASE WHEN c.prtype = 'SELECT' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS with_hierarchy
+
+    FROM (
+            SELECT oid, relname, relnamespace, relkind, relowner, (aclexplode(coalesce(relacl, acldefault('r', relowner)))).* FROM pg_class
+         ) AS c (oid, relname, relnamespace, relkind, relowner, grantor, grantee, prtype, grantable),
+         pg_namespace nc,
+         pg_authid u_grantor,
+         (
+           SELECT oid, rolname FROM pg_authid
+           UNION ALL
+           SELECT 0::oid, 'PUBLIC'
+         ) AS grantee (oid, rolname)
+
+    WHERE c.relnamespace = nc.oid
+          AND c.relkind IN ('r', 'v', 'f')
+          AND c.grantee = grantee.oid
+          AND c.grantor = u_grantor.oid
+          AND c.prtype IN ('INSERT', 'SELECT', 'UPDATE', 'DELETE', 'TRUNCATE', 'REFERENCES', 'TRIGGER')
+          AND (pg_has_role(u_grantor.oid, 'USAGE')
+               OR pg_has_role(grantee.oid, 'USAGE')
+               OR grantee.rolname = 'PUBLIC');
+</programlisting>
+      This must be repeated in each database to be fixed,
+      including <literal>template0</literal>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [5b6289c1e] 2017-08-14 15:43:20 -0400
+Branch: REL9_6_STABLE [624b6f328] 2017-08-14 15:43:20 -0400
+Branch: REL9_5_STABLE [51684bad9] 2017-08-14 15:43:20 -0400
+Branch: REL9_4_STABLE [daafb11ff] 2017-08-14 15:43:20 -0400
+Branch: REL9_3_STABLE [cd184273b] 2017-08-14 15:43:20 -0400
+Branch: REL9_2_STABLE [8ae41ceae] 2017-08-14 15:43:20 -0400
+-->
+     <para>
+      Clean up handling of a fatal exit (e.g., due to receipt
+      of <systemitem>SIGTERM</systemitem>) that occurs while trying to execute
+      a <command>ROLLBACK</command> of a failed transaction (Tom Lane)
+     </para>
+
+     <para>
+      This situation could result in an assertion failure.  In production
+      builds, the exit would still occur, but it would log an unexpected
+      message about <quote>cannot drop active portal</quote>.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [004a9702e] 2017-08-13 16:15:14 -0400
+Branch: REL9_6_STABLE [a64b5a992] 2017-08-13 16:15:14 -0400
+Branch: REL9_5_STABLE [425be3ac9] 2017-08-13 16:15:14 -0400
+Branch: REL9_4_STABLE [5a3688dc8] 2017-08-13 16:15:14 -0400
+Branch: REL9_3_STABLE [bb11ff2bc] 2017-08-13 16:15:14 -0400
+Branch: REL9_2_STABLE [5069017fe] 2017-08-13 16:15:14 -0400
+-->
+     <para>
+      Remove assertion that could trigger during a fatal exit (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [749c7c417] 2017-08-09 17:03:09 -0400
+Branch: REL9_6_STABLE [e2e398473] 2017-08-09 17:03:09 -0400
+Branch: REL9_5_STABLE [d1c1d90e1] 2017-08-09 17:03:09 -0400
+Branch: REL9_4_STABLE [95a0a8d2a] 2017-08-09 17:03:09 -0400
+Branch: REL9_3_STABLE [06931a9c0] 2017-08-09 17:03:10 -0400
+Branch: REL9_2_STABLE [4e704aac1] 2017-08-09 17:03:10 -0400
+-->
+     <para>
+      Correctly identify columns that are of a range type or domain type over
+      a composite type or domain type being searched for (Tom Lane)
+     </para>
+
+     <para>
+      Certain <command>ALTER</command> commands that change the definition of a
+      composite type or domain type are supposed to fail if there are any
+      stored values of that type in the database, because they lack the
+      infrastructure needed to update or check such values.  Previously,
+      these checks could miss relevant values that are wrapped inside range
+      types or sub-domains, possibly allowing the database to become
+      inconsistent.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [9bf4068cc] 2017-08-08 19:18:22 -0400
+Branch: REL9_6_STABLE [fe578cbd4] 2017-08-08 19:18:23 -0400
+-->
+     <para>
+      Prevent crash when passing fixed-length pass-by-reference data types
+      to parallel worker processes (Tom Lane)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master [b1c2d76a2] 2017-08-19 13:39:51 -0400
+Branch: REL_10_STABLE [1c3869c0b] 2017-08-19 13:39:52 -0400
+Branch: REL9_6_STABLE [41803d55a] 2017-08-19 13:39:38 -0400
+Branch: REL9_5_STABLE [258aac0b2] 2017-08-19 13:39:38 -0400
+Branch: REL9_4_STABLE [59dde9fed] 2017-08-19 13:39:38 -0400
+Branch: REL9_3_STABLE [ece4bd901] 2017-08-19 13:39:38 -0400
+-->
+     <para>
+      Fix crash in <application>pg_restore</application> when using parallel mode and
+      using a list file to select a subset of items to restore
+      (Fabr&iacute;zio de Royes Mello)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master Release: REL_10_STABLE [ea0ca75d5] 2017-08-14 11:29:34 +0200
+Branch: REL9_6_STABLE [3d7a1e2b9] 2017-08-16 13:28:14 +0200
+Branch: REL9_5_STABLE [f2ed2d0a1] 2017-08-16 13:28:37 +0200
+Branch: REL9_4_STABLE [bd502753a] 2017-08-16 13:29:00 +0200
+Branch: REL9_3_STABLE [f8bc6b2f6] 2017-08-16 13:30:09 +0200
+Branch: REL9_2_STABLE [60b135c82] 2017-08-16 13:30:20 +0200
+-->
+     <para>
+      Change <application>ecpg</application>'s parser to allow <literal>RETURNING</literal>
+      clauses without attached C variables (Michael Meskes)
+     </para>
+
+     <para>
+      This allows <application>ecpg</application> programs to contain SQL constructs
+      that use <literal>RETURNING</literal> internally (for example, inside a CTE)
+      rather than using it to define values to be returned to the client.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Michael Meskes <meskes@postgresql.org>
+Branch: master [a4619b26a] 2017-08-15 17:14:52 +0200
+Branch: REL_10_STABLE [a6b174f55] 2017-08-16 13:27:21 +0200
+Branch: REL9_6_STABLE [954490fec] 2017-08-16 13:28:10 +0200
+-->
+     <para>
+      Change <application>ecpg</application>'s parser to recognize backslash
+      continuation of C preprocessor command lines (Michael Meskes)
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [5a5c2feca] 2017-08-14 11:48:59 -0400
+Branch: REL9_6_STABLE [3883be3ea] 2017-08-14 11:48:59 -0400
+Branch: REL9_5_STABLE [1621a7553] 2017-08-14 11:48:59 -0400
+Branch: REL9_4_STABLE [01de7ea85] 2017-08-14 11:48:59 -0400
+Branch: REL9_3_STABLE [25169b948] 2017-08-14 11:48:59 -0400
+Branch: REL9_2_STABLE [e3335ec0b] 2017-08-14 11:48:59 -0400
+Branch: master [b5178c5d0] 2017-08-17 13:13:47 -0400
+Branch: REL_10_STABLE [1d7a479d2] 2017-08-17 13:13:56 -0400
+Branch: REL9_6_STABLE [c34331488] 2017-08-17 13:14:06 -0400
+Branch: REL9_5_STABLE [bff216d87] 2017-08-17 13:14:11 -0400
+Branch: REL9_4_STABLE [4f862351d] 2017-08-17 13:15:15 -0400
+Branch: REL9_3_STABLE [bc4404405] 2017-08-17 13:15:36 -0400
+Branch: REL9_2_STABLE [f7e4783dd] 2017-08-17 13:15:46 -0400
+-->
+     <para>
+      Improve selection of compiler flags for PL/Perl on Windows (Tom Lane)
+     </para>
+
+     <para>
+      This fix avoids possible crashes of PL/Perl due to inconsistent
+      assumptions about the width of <type>time_t</type> values.
+      A side-effect that may be visible to extension developers is
+      that <literal>_USE_32BIT_TIME_T</literal> is no longer defined globally
+      in <productname>PostgreSQL</productname> Windows builds.  This is not expected
+      to cause problems, because type <type>time_t</type> is not used
+      in any <productname>PostgreSQL</productname> API definitions.
+     </para>
+    </listitem>
+
+    <listitem>
+<!--
+Author: Tom Lane <tgl@sss.pgh.pa.us>
+Branch: master Release: REL_10_STABLE [a76200de8] 2017-08-09 12:05:53 -0400
+Branch: REL9_6_STABLE [fc2aafe4a] 2017-08-09 12:06:08 -0400
+Branch: REL9_5_STABLE [a784d5f21] 2017-08-09 12:06:14 -0400
+-->
+     <para>
+      Fix <literal>make check</literal> to behave correctly when invoked via a
+      non-GNU make program (Thomas Munro)
+     </para>
+    </listitem>
+
+   </itemizedlist>
+
+  </sect2>
+ </sect1>
+
  <sect1 id="release-9-6-4">
   <title>Release 9.6.4</title>
 
@@ -12,7 +1542,7 @@
   <para>
    This release contains a variety of fixes from 9.6.3.
    For information about new features in the 9.6 major release, see
-   <xref linkend="release-9-6">.
+   <xref linkend="release-9-6"/>.
   </para>
 
   <sect2>
@@ -29,7 +1559,7 @@
 
    <para>
     Also, if you are upgrading from a version earlier than 9.6.3,
-    see <xref linkend="release-9-6-3">.
+    see <xref linkend="release-9-6-3"/>.
    </para>
   </sect2>
 
@@ -50,7 +1580,7 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
 -->
      <para>
       Further restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Noah Misch)
      </para>
@@ -58,11 +1588,11 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
      <para>
       The fix for CVE-2017-7486 was incorrect: it allowed a user
       to see the options in her own user mapping, even if she did not
-      have <literal>USAGE</> permission on the associated foreign server.
+      have <literal>USAGE</literal> permission on the associated foreign server.
       Such options might include a password that had been provided by the
       server owner rather than the user herself.
-      Since <structname>information_schema.user_mapping_options</> does not
-      show the options in such cases, <structname>pg_user_mappings</>
+      Since <structname>information_schema.user_mapping_options</structname> does not
+      show the options in such cases, <structname>pg_user_mappings</structname>
       should not either.
       (CVE-2017-7547)
      </para>
@@ -77,15 +1607,15 @@ Branch: REL9_2_STABLE [e255e97a2] 2017-08-07 07:09:32 -0700
       <step>
        <para>
         Restart the postmaster after adding <literal>allow_system_table_mods
-        = true</> to <filename>postgresql.conf</>.  (In versions
-        supporting <command>ALTER SYSTEM</>, you can use that to make the
+        = true</literal> to <filename>postgresql.conf</filename>.  (In versions
+        supporting <command>ALTER SYSTEM</command>, you can use that to make the
         configuration change, but you'll still need a restart.)
        </para>
       </step>
 
       <step>
        <para>
-        In <emphasis>each</> database of the cluster,
+        In <emphasis>each</emphasis> database of the cluster,
         run the following commands as superuser:
 <programlisting>
 SET search_path = pg_catalog;
@@ -116,15 +1646,15 @@ CREATE OR REPLACE VIEW pg_user_mappings AS
 
       <step>
        <para>
-        Do not forget to include the <literal>template0</>
-        and <literal>template1</> databases, or the vulnerability will still
-        exist in databases you create later.  To fix <literal>template0</>,
+        Do not forget to include the <literal>template0</literal>
+        and <literal>template1</literal> databases, or the vulnerability will still
+        exist in databases you create later.  To fix <literal>template0</literal>,
         you'll need to temporarily make it accept connections.
-        In <productname>PostgreSQL</> 9.5 and later, you can use
+        In <productname>PostgreSQL</productname> 9.5 and later, you can use
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS true;
 </programlisting>
-        and then after fixing <literal>template0</>, undo that with
+        and then after fixing <literal>template0</literal>, undo that with
 <programlisting>
 ALTER DATABASE template0 WITH ALLOW_CONNECTIONS false;
 </programlisting>
@@ -138,7 +1668,7 @@ UPDATE pg_database SET datallowconn = false WHERE datname = 'template0';
 
       <step>
        <para>
-        Finally, remove the <literal>allow_system_table_mods</> configuration
+        Finally, remove the <literal>allow_system_table_mods</literal> configuration
         setting, and again restart the postmaster.
        </para>
       </step>
@@ -161,16 +1691,16 @@ Branch: REL9_2_STABLE [06651648a] 2017-08-07 17:04:17 +0300
      </para>
 
      <para>
-      <application>libpq</> ignores empty password specifications, and does
+      <application>libpq</application> ignores empty password specifications, and does
       not transmit them to the server.  So, if a user's password has been
       set to the empty string, it's impossible to log in with that password
-      via <application>psql</> or other <application>libpq</>-based
+      via <application>psql</application> or other <application>libpq</application>-based
       clients.  An administrator might therefore believe that setting the
       password to empty is equivalent to disabling password login.
-      However, with a modified or non-<application>libpq</>-based client,
+      However, with a modified or non-<application>libpq</application>-based client,
       logging in could be possible, depending on which authentication
       method is configured.  In particular the most common
-      method, <literal>md5</>, accepted empty passwords.
+      method, <literal>md5</literal>, accepted empty passwords.
       Change the server to reject empty passwords in all cases.
       (CVE-2017-7546)
      </para>
@@ -185,13 +1715,13 @@ Branch: REL9_5_STABLE [873741c68] 2017-08-07 10:19:21 -0400
 Branch: REL9_4_STABLE [f1cda6d6c] 2017-08-07 10:19:22 -0400
 -->
      <para>
-      Make <function>lo_put()</> check for <literal>UPDATE</> privilege on
+      Make <function>lo_put()</function> check for <literal>UPDATE</literal> privilege on
       the target large object (Tom Lane, Michael Paquier)
      </para>
 
      <para>
-      <function>lo_put()</> should surely require the same permissions
-      as <function>lowrite()</>, but the check was missing, allowing any
+      <function>lo_put()</function> should surely require the same permissions
+      as <function>lowrite()</function>, but the check was missing, allowing any
       user to change the data in a large object.
       (CVE-2017-7548)
      </para>
@@ -206,12 +1736,12 @@ Branch: REL9_5_STABLE [fd376afc9] 2017-06-15 12:30:02 -0400
 -->
      <para>
       Correct the documentation about the process for upgrading standby
-      servers with <application>pg_upgrade</> (Bruce Momjian)
+      servers with <application>pg_upgrade</application> (Bruce Momjian)
      </para>
 
      <para>
       The previous documentation instructed users to start/stop the primary
-      server after running <application>pg_upgrade</> but before syncing
+      server after running <application>pg_upgrade</application> but before syncing
       the standby servers.  This sequence is unsafe.
      </para>
     </listitem>
@@ -359,7 +1889,7 @@ Branch: REL9_3_STABLE [cc154d9a0] 2017-06-28 12:30:16 -0400
 Branch: REL9_2_STABLE [5e7447132] 2017-06-28 12:30:16 -0400
 -->
      <para>
-      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"> on
+      Fix code for setting <xref linkend="guc-tcp-keepalives-idle"/> on
       Solaris (Tom Lane)
      </para>
     </listitem>
@@ -418,7 +1948,7 @@ Branch: REL9_2_STABLE [81bf7b5b1] 2017-06-21 14:13:58 -0700
 -->
      <para>
       Fix possible creation of an invalid WAL segment when a standby is
-      promoted just after it processes an <literal>XLOG_SWITCH</> WAL
+      promoted just after it processes an <literal>XLOG_SWITCH</literal> WAL
       record (Andres Freund)
      </para>
     </listitem>
@@ -432,7 +1962,7 @@ Branch: REL9_5_STABLE [446914f6b] 2017-06-30 12:00:03 -0400
 Branch: REL9_4_STABLE [5aa8db014] 2017-06-30 12:00:03 -0400
 -->
      <para>
-      Fix <application>walsender</> to exit promptly when client requests
+      Fix <application>walsender</application> to exit promptly when client requests
       shutdown (Tom Lane)
      </para>
     </listitem>
@@ -452,7 +1982,7 @@ Branch: REL9_3_STABLE [45d067d50] 2017-06-05 19:18:16 -0700
 Branch: REL9_2_STABLE [133b1920c] 2017-06-05 19:18:16 -0700
 -->
      <para>
-      Fix <systemitem>SIGHUP</> and <systemitem>SIGUSR1</> handling in
+      Fix <systemitem>SIGHUP</systemitem> and <systemitem>SIGUSR1</systemitem> handling in
       walsender processes (Petr Jelinek, Andres Freund)
      </para>
     </listitem>
@@ -482,7 +2012,7 @@ Branch: REL9_3_STABLE [cb59949f6] 2017-06-26 17:31:56 -0400
 Branch: REL9_2_STABLE [e96adaacd] 2017-06-26 17:31:56 -0400
 -->
      <para>
-      Fix unnecessarily slow restarts of <application>walreceiver</>
+      Fix unnecessarily slow restarts of <application>walreceiver</application>
       processes due to race condition in postmaster (Tom Lane)
      </para>
     </listitem>
@@ -601,7 +2131,7 @@ Branch: REL9_3_STABLE [aea1a3f0e] 2017-07-12 18:00:04 -0400
 Branch: REL9_2_STABLE [75670ec37] 2017-07-12 18:00:04 -0400
 -->
      <para>
-      Fix cases where an <command>INSERT</> or <command>UPDATE</> assigns
+      Fix cases where an <command>INSERT</command> or <command>UPDATE</command> assigns
       to more than one element of a column that is of domain-over-array
       type (Tom Lane)
      </para>
@@ -617,7 +2147,7 @@ Branch: REL9_4_STABLE [dc777f9db] 2017-06-27 17:51:11 -0400
 Branch: REL9_3_STABLE [66dee28b4] 2017-06-27 17:51:11 -0400
 -->
      <para>
-      Allow window functions to be used in sub-<literal>SELECT</>s that
+      Allow window functions to be used in sub-<literal>SELECT</literal>s that
       are within the arguments of an aggregate function (Tom Lane)
      </para>
     </listitem>
@@ -629,7 +2159,7 @@ Branch: master [7086be6e3] 2017-07-24 15:57:24 -0400
 Branch: REL9_6_STABLE [971faefc2] 2017-07-24 16:24:42 -0400
 -->
      <para>
-      Ensure that a view's <literal>CHECK OPTIONS</> clause is enforced
+      Ensure that a view's <literal>CHECK OPTIONS</literal> clause is enforced
       properly when the underlying table is a foreign table (Etsuro Fujita)
      </para>
 
@@ -651,12 +2181,12 @@ Branch: REL9_2_STABLE [da9165686] 2017-05-26 15:16:59 -0400
 -->
      <para>
       Move autogenerated array types out of the way during
-      <command>ALTER ... RENAME</> (Vik Fearing)
+      <command>ALTER ... RENAME</command> (Vik Fearing)
      </para>
 
      <para>
       Previously, we would rename a conflicting autogenerated array type
-      out of the way during <command>CREATE</>; this fix extends that
+      out of the way during <command>CREATE</command>; this fix extends that
       behavior to renaming operations.
      </para>
     </listitem>
@@ -669,7 +2199,7 @@ Branch: REL9_6_STABLE [b35cce914] 2017-05-15 11:33:44 -0400
 Branch: REL9_5_STABLE [53a1aa9f9] 2017-05-15 11:33:45 -0400
 -->
      <para>
-      Fix dangling pointer in <command>ALTER TABLE</> when there is a
+      Fix dangling pointer in <command>ALTER TABLE</command> when there is a
       comment on a constraint belonging to the table (David Rowley)
      </para>
 
@@ -690,8 +2220,8 @@ Branch: REL9_3_STABLE [b7d1bc820] 2017-08-03 21:29:36 -0400
 Branch: REL9_2_STABLE [22eb38caa] 2017-08-03 21:42:46 -0400
 -->
      <para>
-      Ensure that <command>ALTER USER ... SET</> accepts all the syntax
-      variants that <command>ALTER ROLE ... SET</> does (Peter Eisentraut)
+      Ensure that <command>ALTER USER ... SET</command> accepts all the syntax
+      variants that <command>ALTER ROLE ... SET</command> does (Peter Eisentraut)
      </para>
     </listitem>
 
@@ -702,18 +2232,18 @@ Branch: master [86705aa8c] 2017-08-03 13:24:48 -0400
 Branch: REL9_6_STABLE [1f220c390] 2017-08-03 13:25:32 -0400
 -->
      <para>
-      Allow a foreign table's <literal>CHECK</> constraints to be
-      initially <literal>NOT VALID</> (Amit Langote)
+      Allow a foreign table's <literal>CHECK</literal> constraints to be
+      initially <literal>NOT VALID</literal> (Amit Langote)
      </para>
 
      <para>
-      <command>CREATE TABLE</> silently drops <literal>NOT VALID</>
-      specifiers for <literal>CHECK</> constraints, reasoning that the
+      <command>CREATE TABLE</command> silently drops <literal>NOT VALID</literal>
+      specifiers for <literal>CHECK</literal> constraints, reasoning that the
       table must be empty so the constraint can be validated immediately.
-      But this is wrong for <command>CREATE FOREIGN TABLE</>, where there's
+      But this is wrong for <command>CREATE FOREIGN TABLE</command>, where there's
       no reason to suppose that the underlying table is empty, and even if
       it is it's no business of ours to decide that the constraint can be
-      treated as valid going forward.  Skip this <quote>optimization</> for
+      treated as valid going forward.  Skip this <quote>optimization</quote> for
       foreign tables.
      </para>
     </listitem>
@@ -730,14 +2260,14 @@ Branch: REL9_2_STABLE [ac93a78b0] 2017-06-16 11:46:26 +0300
 -->
      <para>
       Properly update dependency info when changing a datatype I/O
-      function's argument or return type from <type>opaque</> to the
+      function's argument or return type from <type>opaque</type> to the
       correct type (Heikki Linnakangas)
      </para>
 
      <para>
-      <command>CREATE TYPE</> updates I/O functions declared in this
+      <command>CREATE TYPE</command> updates I/O functions declared in this
       long-obsolete style, but it forgot to record a dependency on the
-      type, allowing a subsequent <command>DROP TYPE</> to leave broken
+      type, allowing a subsequent <command>DROP TYPE</command> to leave broken
       function definitions behind.
      </para>
     </listitem>
@@ -749,7 +2279,7 @@ Branch: master [34aebcf42] 2017-06-02 19:11:15 -0700
 Branch: REL9_6_STABLE [8a7cd781e] 2017-06-02 19:11:23 -0700
 -->
      <para>
-      Allow parallelism in the query plan when <command>COPY</> copies from
+      Allow parallelism in the query plan when <command>COPY</command> copies from
       a query's result (Andres Freund)
      </para>
     </listitem>
@@ -765,8 +2295,8 @@ Branch: REL9_3_STABLE [11854dee0] 2017-07-12 22:04:08 +0300
 Branch: REL9_2_STABLE [40ba61b44] 2017-07-12 22:04:15 +0300
 -->
      <para>
-      Reduce memory usage when <command>ANALYZE</> processes
-      a <type>tsvector</> column (Heikki Linnakangas)
+      Reduce memory usage when <command>ANALYZE</command> processes
+      a <type>tsvector</type> column (Heikki Linnakangas)
      </para>
     </listitem>
 
@@ -782,7 +2312,7 @@ Branch: REL9_2_STABLE [798d2321e] 2017-05-21 13:05:17 -0400
 -->
      <para>
       Fix unnecessary precision loss and sloppy rounding when multiplying
-      or dividing <type>money</> values by integers or floats (Tom Lane)
+      or dividing <type>money</type> values by integers or floats (Tom Lane)
      </para>
     </listitem>
 
@@ -798,7 +2328,7 @@ Branch: REL9_2_STABLE [a047270d5] 2017-05-24 15:28:35 -0400
 -->
      <para>
       Tighten checks for whitespace in functions that parse identifiers,
-      such as <function>regprocedurein()</> (Tom Lane)
+      such as <function>regprocedurein()</function> (Tom Lane)
      </para>
 
      <para>
@@ -824,13 +2354,13 @@ Branch: REL9_3_STABLE [0d8f015e7] 2017-07-31 12:38:35 -0400
 Branch: REL9_2_STABLE [456c7dff2] 2017-07-31 12:38:35 -0400
 -->
      <para>
-      Use relevant <literal>#define</> symbols from Perl while
-      compiling <application>PL/Perl</> (Ashutosh Sharma, Tom Lane)
+      Use relevant <literal>#define</literal> symbols from Perl while
+      compiling <application>PL/Perl</application> (Ashutosh Sharma, Tom Lane)
      </para>
 
      <para>
       This avoids portability problems, typically manifesting as
-      a <quote>handshake</> mismatch during library load, when working with
+      a <quote>handshake</quote> mismatch during library load, when working with
       recent Perl versions.
      </para>
     </listitem>
@@ -845,7 +2375,7 @@ Branch: REL9_4_STABLE [1fe1fc449] 2017-06-07 14:04:49 +0300
 Branch: REL9_3_STABLE [f2fa0c651] 2017-06-07 14:04:44 +0300
 -->
      <para>
-      In <application>libpq</>, reset GSS/SASL and SSPI authentication
+      In <application>libpq</application>, reset GSS/SASL and SSPI authentication
       state properly after a failed connection attempt (Michael Paquier)
      </para>
 
@@ -867,9 +2397,9 @@ Branch: REL9_3_STABLE [6bc710f6d] 2017-05-17 12:24:19 -0400
 Branch: REL9_2_STABLE [07477130e] 2017-05-17 12:24:19 -0400
 -->
      <para>
-      In <application>psql</>, fix failure when <command>COPY FROM STDIN</>
+      In <application>psql</application>, fix failure when <command>COPY FROM STDIN</command>
       is ended with a keyboard EOF signal and then another <command>COPY
-      FROM STDIN</> is attempted (Thomas Munro)
+      FROM STDIN</command> is attempted (Thomas Munro)
      </para>
 
      <para>
@@ -888,8 +2418,8 @@ Branch: REL9_4_STABLE [b93217653] 2017-08-03 17:36:43 -0400
 Branch: REL9_3_STABLE [035bb8222] 2017-08-03 17:36:23 -0400
 -->
      <para>
-      Fix <application>pg_dump</> and <application>pg_restore</> to
-      emit <command>REFRESH MATERIALIZED VIEW</> commands last (Tom Lane)
+      Fix <application>pg_dump</application> and <application>pg_restore</application> to
+      emit <command>REFRESH MATERIALIZED VIEW</command> commands last (Tom Lane)
      </para>
 
      <para>
@@ -911,8 +2441,8 @@ Branch: REL9_5_STABLE [12f1e523a] 2017-08-03 14:55:17 -0400
 Branch: REL9_4_STABLE [69ad12b58] 2017-08-03 14:55:17 -0400
 -->
      <para>
-      Improve <application>pg_dump</>/<application>pg_restore</>'s
-      reporting of error conditions originating in <application>zlib</>
+      Improve <application>pg_dump</application>/<application>pg_restore</application>'s
+      reporting of error conditions originating in <application>zlib</application>
       (Vladimir Kunschikov, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -927,7 +2457,7 @@ Branch: REL9_4_STABLE [502ead3d6] 2017-07-22 20:20:10 -0400
 Branch: REL9_3_STABLE [68a22bc69] 2017-07-22 20:20:10 -0400
 -->
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to
       drop event triggers as expected (Tom Lane)
      </para>
 
@@ -945,8 +2475,8 @@ Branch: master [4500edc7e] 2017-06-28 10:33:57 -0400
 Branch: REL9_6_STABLE [a2de017b3] 2017-06-28 10:34:01 -0400
 -->
      <para>
-      Fix <application>pg_dump</> with the <option>--clean</> option to not
-      fail when the <literal>public</> schema doesn't exist (Stephen Frost)
+      Fix <application>pg_dump</application> with the <option>--clean</option> option to not
+      fail when the <literal>public</literal> schema doesn't exist (Stephen Frost)
      </para>
     </listitem>
 
@@ -961,7 +2491,7 @@ Branch: REL9_3_STABLE [a561254e4] 2017-05-26 12:51:05 -0400
 Branch: REL9_2_STABLE [f62e1eff5] 2017-05-26 12:51:06 -0400
 -->
      <para>
-      Fix <application>pg_dump</> to not emit invalid SQL for an empty
+      Fix <application>pg_dump</application> to not emit invalid SQL for an empty
       operator class (Daniel Gustafsson)
      </para>
     </listitem>
@@ -977,7 +2507,7 @@ Branch: REL9_3_STABLE [2943c04f7] 2017-06-19 11:03:16 -0400
 Branch: REL9_2_STABLE [c10cbf77a] 2017-06-19 11:03:21 -0400
 -->
      <para>
-      Fix <application>pg_dump</> output to stdout on Windows (Kuntal Ghosh)
+      Fix <application>pg_dump</application> output to stdout on Windows (Kuntal Ghosh)
      </para>
 
      <para>
@@ -997,14 +2527,14 @@ Branch: REL9_3_STABLE [b6d640047] 2017-07-24 15:16:31 -0400
 Branch: REL9_2_STABLE [d9874fde8] 2017-07-24 15:16:31 -0400
 -->
      <para>
-      Fix <function>pg_get_ruledef()</> to print correct output for
-      the <literal>ON SELECT</> rule of a view whose columns have been
+      Fix <function>pg_get_ruledef()</function> to print correct output for
+      the <literal>ON SELECT</literal> rule of a view whose columns have been
       renamed (Tom Lane)
      </para>
 
      <para>
-      In some corner cases, <application>pg_dump</> relies
-      on <function>pg_get_ruledef()</> to dump views, so that this error
+      In some corner cases, <application>pg_dump</application> relies
+      on <function>pg_get_ruledef()</function> to dump views, so that this error
       could result in dump/reload failures.
      </para>
     </listitem>
@@ -1020,7 +2550,7 @@ Branch: REL9_3_STABLE [e947838ae] 2017-07-20 11:29:36 -0400
 -->
      <para>
       Fix dumping of outer joins with empty constraints, such as the result
-      of a <literal>NATURAL LEFT JOIN</> with no common columns (Tom Lane)
+      of a <literal>NATURAL LEFT JOIN</literal> with no common columns (Tom Lane)
      </para>
     </listitem>
 
@@ -1035,7 +2565,7 @@ Branch: REL9_3_STABLE [0ecc407d9] 2017-07-13 19:24:44 -0400
 Branch: REL9_2_STABLE [bccfb1776] 2017-07-13 19:24:44 -0400
 -->
      <para>
-      Fix dumping of function expressions in the <literal>FROM</> clause in
+      Fix dumping of function expressions in the <literal>FROM</literal> clause in
       cases where the expression does not deparse into something that looks
       like a function call (Tom Lane)
      </para>
@@ -1052,7 +2582,7 @@ Branch: REL9_3_STABLE [f3633689f] 2017-07-14 16:03:23 +0300
 Branch: REL9_2_STABLE [4b994a96c] 2017-07-14 16:03:27 +0300
 -->
      <para>
-      Fix <application>pg_basebackup</> output to stdout on Windows
+      Fix <application>pg_basebackup</application> output to stdout on Windows
       (Haribabu Kommi)
      </para>
 
@@ -1070,12 +2600,12 @@ Branch: REL9_6_STABLE [73fbf3d3d] 2017-07-21 22:04:55 -0400
 Branch: REL9_5_STABLE [ed367be64] 2017-07-21 22:05:07 -0400
 -->
      <para>
-      Fix <application>pg_rewind</> to correctly handle files exceeding 2GB
+      Fix <application>pg_rewind</application> to correctly handle files exceeding 2GB
       (Kuntal Ghosh, Michael Paquier)
      </para>
 
      <para>
-      Ordinarily such files won't appear in <productname>PostgreSQL</> data
+      Ordinarily such files won't appear in <productname>PostgreSQL</productname> data
       directories, but they could be present in some cases.
      </para>
     </listitem>
@@ -1091,8 +2621,8 @@ Branch: REL9_3_STABLE [5c890645d] 2017-06-20 13:20:02 -0400
 Branch: REL9_2_STABLE [65beccae5] 2017-06-20 13:20:02 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to ensure that the ending WAL record
-      does not have <xref linkend="guc-wal-level"> = <literal>minimum</>
+      Fix <application>pg_upgrade</application> to ensure that the ending WAL record
+      does not have <xref linkend="guc-wal-level"/> = <literal>minimum</literal>
       (Bruce Momjian)
      </para>
 
@@ -1110,7 +2640,7 @@ Branch: REL9_6_STABLE [d3ca4b4b4] 2017-06-05 16:10:07 -0700
 Branch: REL9_5_STABLE [25653c171] 2017-06-05 16:10:07 -0700
 -->
      <para>
-      Fix <application>pg_xlogdump</>'s computation of WAL record length
+      Fix <application>pg_xlogdump</application>'s computation of WAL record length
       (Andres Freund)
      </para>
     </listitem>
@@ -1130,9 +2660,9 @@ Branch: REL9_4_STABLE [a648fc70a] 2017-07-21 14:20:43 -0400
 Branch: REL9_3_STABLE [6d9de660d] 2017-07-21 14:20:43 -0400
 -->
      <para>
-      In <filename>postgres_fdw</>, re-establish connections to remote
-      servers after <command>ALTER SERVER</> or <command>ALTER USER
-      MAPPING</> commands (Kyotaro Horiguchi)
+      In <filename>postgres_fdw</filename>, re-establish connections to remote
+      servers after <command>ALTER SERVER</command> or <command>ALTER USER
+      MAPPING</command> commands (Kyotaro Horiguchi)
      </para>
 
      <para>
@@ -1151,7 +2681,7 @@ Branch: REL9_4_STABLE [c02c450cf] 2017-06-07 15:40:35 -0400
 Branch: REL9_3_STABLE [fc267a0c3] 2017-06-07 15:41:05 -0400
 -->
      <para>
-      In <filename>postgres_fdw</>, allow cancellation of remote
+      In <filename>postgres_fdw</filename>, allow cancellation of remote
       transaction control commands (Robert Haas, Rafia Sabih)
      </para>
 
@@ -1170,7 +2700,7 @@ Branch: REL9_5_STABLE [6f2fe2468] 2017-05-11 14:51:38 -0400
 Branch: REL9_4_STABLE [5c633f76b] 2017-05-11 14:51:46 -0400
 -->
      <para>
-      Increase <literal>MAX_SYSCACHE_CALLBACKS</> to provide more room for
+      Increase <literal>MAX_SYSCACHE_CALLBACKS</literal> to provide more room for
       extensions (Tom Lane)
      </para>
     </listitem>
@@ -1186,7 +2716,7 @@ Branch: REL9_3_STABLE [cee7238de] 2017-06-01 13:32:56 -0400
 Branch: REL9_2_STABLE [a378b9bc2] 2017-06-01 13:32:56 -0400
 -->
      <para>
-      Always use <option>-fPIC</>, not <option>-fpic</>, when building
+      Always use <option>-fPIC</option>, not <option>-fpic</option>, when building
       shared libraries with gcc (Tom Lane)
      </para>
 
@@ -1213,8 +2743,8 @@ Branch: REL9_3_STABLE [da30fa603] 2017-06-05 20:40:47 -0400
 Branch: REL9_2_STABLE [f964a7c5a] 2017-06-05 20:41:01 -0400
 -->
      <para>
-      In MSVC builds, handle the case where the <application>openssl</>
-      library is not within a <filename>VC</> subdirectory (Andrew Dunstan)
+      In MSVC builds, handle the case where the <application>openssl</application>
+      library is not within a <filename>VC</filename> subdirectory (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -1229,13 +2759,13 @@ Branch: REL9_3_STABLE [2c7d2114b] 2017-05-12 10:24:16 -0400
 Branch: REL9_2_STABLE [614f83c12] 2017-05-12 10:24:36 -0400
 -->
      <para>
-      In MSVC builds, add proper include path for <application>libxml2</>
+      In MSVC builds, add proper include path for <application>libxml2</application>
       header files (Andrew Dunstan)
      </para>
 
      <para>
       This fixes a former need to move things around in standard Windows
-      installations of <application>libxml2</>.
+      installations of <application>libxml2</application>.
      </para>
     </listitem>
 
@@ -1251,7 +2781,7 @@ Branch: REL9_2_STABLE [4885e5c88] 2017-07-23 23:53:55 -0700
 -->
      <para>
       In MSVC builds, recognize a Tcl library that is
-      named <filename>tcl86.lib</> (Noah Misch)
+      named <filename>tcl86.lib</filename> (Noah Misch)
      </para>
     </listitem>
 
@@ -1272,8 +2802,8 @@ Branch: REL9_5_STABLE [7eb4124da] 2017-07-16 11:27:07 -0400
 Branch: REL9_4_STABLE [9c3f502b4] 2017-07-16 11:27:15 -0400
 -->
      <para>
-      In MSVC builds, honor <literal>PROVE_FLAGS</> settings
-      on <filename>vcregress.pl</>'s command line (Andrew Dunstan)
+      In MSVC builds, honor <literal>PROVE_FLAGS</literal> settings
+      on <filename>vcregress.pl</filename>'s command line (Andrew Dunstan)
      </para>
     </listitem>
 
@@ -1293,7 +2823,7 @@ Branch: REL9_4_STABLE [9c3f502b4] 2017-07-16 11:27:15 -0400
   <para>
    This release contains a variety of fixes from 9.6.2.
    For information about new features in the 9.6 major release, see
-   <xref linkend="release-9-6">.
+   <xref linkend="release-9-6"/>.
   </para>
 
   <sect2>
@@ -1310,12 +2840,12 @@ Branch: REL9_4_STABLE [9c3f502b4] 2017-07-16 11:27:15 -0400
 
    <para>
     Also, if you are using third-party replication tools that depend
-    on <quote>logical decoding</>, see the fourth changelog entry below.
+    on <quote>logical decoding</quote>, see the fourth changelog entry below.
    </para>
 
    <para>
     Also, if you are upgrading from a version earlier than 9.6.2,
-    see <xref linkend="release-9-6-2">.
+    see <xref linkend="release-9-6-2"/>.
    </para>
   </sect2>
 
@@ -1336,18 +2866,18 @@ Branch: REL9_2_STABLE [99cbb0bd9] 2017-05-08 07:24:28 -0700
 -->
      <para>
       Restrict visibility
-      of <structname>pg_user_mappings</>.<structfield>umoptions</>, to
+      of <structname>pg_user_mappings</structname>.<structfield>umoptions</structfield>, to
       protect passwords stored as user mapping options
       (Michael Paquier, Feike Steenbergen)
      </para>
 
      <para>
       The previous coding allowed the owner of a foreign server object,
-      or anyone he has granted server <literal>USAGE</> permission to,
+      or anyone he has granted server <literal>USAGE</literal> permission to,
       to see the options for all user mappings associated with that server.
       This might well include passwords for other users.
       Adjust the view definition to match the behavior of
-      <structname>information_schema.user_mapping_options</>, namely that
+      <structname>information_schema.user_mapping_options</structname>, namely that
       these options are visible to the user being mapped, or if the mapping
       is for <literal>PUBLIC</literal> and the current user is the server
       owner, or if the current user is a superuser.
@@ -1358,7 +2888,7 @@ Branch: REL9_2_STABLE [99cbb0bd9] 2017-05-08 07:24:28 -0700
       By itself, this patch will only fix the behavior in newly initdb'd
       databases.  If you wish to apply this change in an existing database,
       follow the corrected procedure shown in the changelog entry for
-      CVE-2017-7547, in <xref linkend="release-9-6-4">.
+      CVE-2017-7547, in <xref linkend="release-9-6-4"/>.
      </para>
     </listitem>
 
@@ -1386,7 +2916,7 @@ Branch: REL9_3_STABLE [703da1795] 2017-05-08 11:19:08 -0400
      <para>
       Some selectivity estimation functions in the planner will apply
       user-defined operators to values obtained
-      from <structname>pg_statistic</>, such as most common values and
+      from <structname>pg_statistic</structname>, such as most common values and
       histogram entries.  This occurs before table permissions are checked,
       so a nefarious user could exploit the behavior to obtain these values
       for table columns he does not have permission to read.  To fix,
@@ -1408,17 +2938,17 @@ Branch: REL9_4_STABLE [ed36c1fe1] 2017-05-08 07:24:27 -0700
 Branch: REL9_3_STABLE [3eab81127] 2017-05-08 07:24:28 -0700
 -->
      <para>
-      Restore <application>libpq</>'s recognition of
-      the <envar>PGREQUIRESSL</> environment variable (Daniel Gustafsson)
+      Restore <application>libpq</application>'s recognition of
+      the <envar>PGREQUIRESSL</envar> environment variable (Daniel Gustafsson)
      </para>
 
      <para>
       Processing of this environment variable was unintentionally dropped
-      in <productname>PostgreSQL</> 9.3, but its documentation remained.
+      in <productname>PostgreSQL</productname> 9.3, but its documentation remained.
       This creates a security hazard, since users might be relying on the
       environment variable to force SSL-encrypted connections, but that
       would no longer be guaranteed.  Restore handling of the variable,
-      but give it lower priority than <envar>PGSSLMODE</>, to avoid
+      but give it lower priority than <envar>PGSSLMODE</envar>, to avoid
       breaking configurations that work correctly with post-9.3 code.
       (CVE-2017-7485)
      </para>
@@ -1469,7 +2999,7 @@ Branch: REL9_3_STABLE [6bd7816e7] 2017-03-14 12:08:14 -0400
 Branch: REL9_2_STABLE [b2ae1d6c4] 2017-03-14 12:10:36 -0400
 -->
      <para>
-      Fix possible corruption of <quote>init forks</> of unlogged indexes
+      Fix possible corruption of <quote>init forks</quote> of unlogged indexes
       (Robert Haas, Michael Paquier)
      </para>
 
@@ -1491,7 +3021,7 @@ Branch: REL9_3_STABLE [856580873] 2017-04-23 13:10:57 -0400
 Branch: REL9_2_STABLE [952e33b05] 2017-04-23 13:10:58 -0400
 -->
      <para>
-      Fix incorrect reconstruction of <structname>pg_subtrans</> entries
+      Fix incorrect reconstruction of <structname>pg_subtrans</structname> entries
       when a standby server replays a prepared but uncommitted two-phase
       transaction (Tom Lane)
      </para>
@@ -1499,7 +3029,7 @@ Branch: REL9_2_STABLE [952e33b05] 2017-04-23 13:10:58 -0400
      <para>
       In most cases this turned out to have no visible ill effects, but in
       corner cases it could result in circular references
-      in <structname>pg_subtrans</>, potentially causing infinite loops
+      in <structname>pg_subtrans</structname>, potentially causing infinite loops
       in queries that examine rows modified by the two-phase transaction.
      </para>
     </listitem>
@@ -1513,7 +3043,7 @@ Branch: REL9_5_STABLE [feb659cce] 2017-02-22 08:29:44 +0900
 Branch: REL9_4_STABLE [a3eb715a3] 2017-02-22 08:29:57 +0900
 -->
      <para>
-      Avoid possible crash in <application>walsender</> due to failure
+      Avoid possible crash in <application>walsender</application> due to failure
       to initialize a string buffer (Stas Kelvich, Fujii Masao)
      </para>
     </listitem>
@@ -1561,7 +3091,7 @@ Branch: REL9_5_STABLE [dba1f310a] 2017-04-24 12:16:58 -0400
 Branch: REL9_4_STABLE [436b560b8] 2017-04-24 12:16:58 -0400
 -->
      <para>
-      Fix postmaster's handling of <function>fork()</> failure for a
+      Fix postmaster's handling of <function>fork()</function> failure for a
       background worker process (Tom Lane)
      </para>
 
@@ -1579,7 +3109,7 @@ Branch: master [89deca582] 2017-04-07 12:18:38 -0400
 Branch: REL9_6_STABLE [c0a493e17] 2017-04-07 12:18:38 -0400
 -->
      <para>
-      Fix possible <quote>no relation entry for relid 0</> error when
+      Fix possible <quote>no relation entry for relid 0</quote> error when
       planning nested set operations (Tom Lane)
      </para>
     </listitem>
@@ -1607,7 +3137,7 @@ Branch: REL9_6_STABLE [6c73b390b] 2017-04-17 15:29:00 -0400
 Branch: REL9_5_STABLE [6f0f98bb0] 2017-04-17 15:29:00 -0400
 -->
      <para>
-      Avoid applying <quote>physical targetlist</> optimization to custom
+      Avoid applying <quote>physical targetlist</quote> optimization to custom
       scans (Dmitry Ivanov, Tom Lane)
      </para>
 
@@ -1626,13 +3156,13 @@ Branch: REL9_6_STABLE [92b15224b] 2017-05-06 21:46:41 -0400
 Branch: REL9_5_STABLE [d617c7629] 2017-05-06 21:46:56 -0400
 -->
      <para>
-      Use the correct sub-expression when applying a <literal>FOR ALL</>
+      Use the correct sub-expression when applying a <literal>FOR ALL</literal>
       row-level-security policy (Stephen Frost)
      </para>
 
      <para>
-      In some cases the <literal>WITH CHECK</> restriction would be applied
-      when the <literal>USING</> restriction is more appropriate.
+      In some cases the <literal>WITH CHECK</literal> restriction would be applied
+      when the <literal>USING</literal> restriction is more appropriate.
      </para>
     </listitem>
 
@@ -1655,7 +3185,7 @@ Branch: REL9_2_STABLE [c9d6c564f] 2017-05-02 18:05:54 -0400
       Due to lack of a cache flush step between commands in an extension
       script file, non-utility queries might not see the effects of an
       immediately preceding catalog change, such as <command>ALTER TABLE
-      ... RENAME</>.
+      ... RENAME</command>.
      </para>
     </listitem>
 
@@ -1671,12 +3201,12 @@ Branch: REL9_2_STABLE [27a8c8033] 2017-02-12 16:05:23 -0500
 -->
      <para>
       Skip tablespace privilege checks when <command>ALTER TABLE ... ALTER
-      COLUMN TYPE</> rebuilds an existing index (Noah Misch)
+      COLUMN TYPE</command> rebuilds an existing index (Noah Misch)
      </para>
 
      <para>
       The command failed if the calling user did not currently have
-      <literal>CREATE</> privilege for the tablespace containing the index.
+      <literal>CREATE</literal> privilege for the tablespace containing the index.
       That behavior seems unhelpful, so skip the check, allowing the
       index to be rebuilt where it is.
      </para>
@@ -1693,13 +3223,13 @@ Branch: REL9_3_STABLE [954744f7a] 2017-04-28 14:53:56 -0400
 Branch: REL9_2_STABLE [f60f0c8fe] 2017-04-28 14:55:42 -0400
 -->
      <para>
-      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</> to not recurse
-      to child tables when the constraint is marked <literal>NO INHERIT</>
+      Fix <command>ALTER TABLE ... VALIDATE CONSTRAINT</command> to not recurse
+      to child tables when the constraint is marked <literal>NO INHERIT</literal>
       (Amit Langote)
      </para>
 
      <para>
-      This fix prevents unwanted <quote>constraint does not exist</> failures
+      This fix prevents unwanted <quote>constraint does not exist</quote> failures
       when no matching constraint is present in the child tables.
      </para>
     </listitem>
@@ -1712,7 +3242,7 @@ Branch: REL9_6_STABLE [943140d57] 2017-03-06 16:50:47 -0500
 Branch: REL9_5_STABLE [420d9ec0a] 2017-03-06 16:50:47 -0500
 -->
      <para>
-      Avoid dangling pointer in <command>COPY ... TO</> when row-level
+      Avoid dangling pointer in <command>COPY ... TO</command> when row-level
       security is active for the source table (Tom Lane)
      </para>
 
@@ -1730,8 +3260,8 @@ Branch: REL9_6_STABLE [68f7b91e5] 2017-03-04 16:09:33 -0500
 Branch: REL9_5_STABLE [807df31d1] 2017-03-04 16:09:33 -0500
 -->
      <para>
-      Avoid accessing an already-closed relcache entry in <command>CLUSTER</>
-      and <command>VACUUM FULL</> (Tom Lane)
+      Avoid accessing an already-closed relcache entry in <command>CLUSTER</command>
+      and <command>VACUUM FULL</command> (Tom Lane)
      </para>
 
      <para>
@@ -1753,14 +3283,14 @@ Branch: master [64ae420b2] 2017-03-17 14:35:54 +0000
 Branch: REL9_6_STABLE [733488dc6] 2017-03-17 14:46:15 +0000
 -->
      <para>
-      Fix <command>VACUUM</> to account properly for pages that could not
+      Fix <command>VACUUM</command> to account properly for pages that could not
       be scanned due to conflicting page pins (Andrew Gierth)
      </para>
 
      <para>
       This tended to lead to underestimation of the number of tuples in
       the table.  In the worst case of a small heavily-contended
-      table, <command>VACUUM</> could incorrectly report that the table
+      table, <command>VACUUM</command> could incorrectly report that the table
       contained no tuples, leading to very bad planning choices.
      </para>
     </listitem>
@@ -1788,13 +3318,13 @@ Branch: master [d5286aa90] 2017-03-21 16:23:10 +0300
 Branch: REL9_6_STABLE [a4d07d2e9] 2017-03-21 16:24:10 +0300
 -->
      <para>
-      Fix incorrect support for certain <type>box</> operators in SP-GiST
+      Fix incorrect support for certain <type>box</type> operators in SP-GiST
       (Nikita Glukhov)
      </para>
 
      <para>
-      SP-GiST index scans using the operators <literal>&amp;&lt;</>
-      <literal>&amp;&gt;</> <literal>&amp;&lt;|</> and <literal>|&amp;&gt;</>
+      SP-GiST index scans using the operators <literal>&amp;&lt;</literal>
+      <literal>&amp;&gt;</literal> <literal>&amp;&lt;|</literal> and <literal>|&amp;&gt;</literal>
       would yield incorrect answers.
      </para>
     </listitem>
@@ -1808,12 +3338,12 @@ Branch: REL9_5_STABLE [d68a2b20a] 2017-04-05 23:51:28 -0400
 Branch: REL9_4_STABLE [8851bcf88] 2017-04-05 23:51:28 -0400
 -->
      <para>
-      Fix integer-overflow problems in <type>interval</> comparison (Kyotaro
+      Fix integer-overflow problems in <type>interval</type> comparison (Kyotaro
       Horiguchi, Tom Lane)
      </para>
 
      <para>
-      The comparison operators for type <type>interval</> could yield wrong
+      The comparison operators for type <type>interval</type> could yield wrong
       answers for intervals larger than about 296000 years.  Indexes on
       columns containing such large values should be reindexed, since they
       may be corrupt.
@@ -1831,13 +3361,13 @@ Branch: REL9_3_STABLE [6e86b448f] 2017-05-04 21:31:12 -0400
 Branch: REL9_2_STABLE [a48d47908] 2017-05-04 22:39:23 -0400
 -->
      <para>
-      Fix <function>cursor_to_xml()</> to produce valid output
-      with <replaceable>tableforest</> = false
+      Fix <function>cursor_to_xml()</function> to produce valid output
+      with <replaceable>tableforest</replaceable> = false
       (Thomas Munro, Peter Eisentraut)
      </para>
 
      <para>
-      Previously it failed to produce a wrapping <literal>&lt;table&gt;</>
+      Previously it failed to produce a wrapping <literal>&lt;table&gt;</literal>
       element.
      </para>
     </listitem>
@@ -1855,8 +3385,8 @@ Branch: REL9_5_STABLE [cf73c6bfc] 2017-02-09 15:49:57 -0500
 Branch: REL9_4_STABLE [86ef376bb] 2017-02-09 15:49:58 -0500
 -->
      <para>
-      Fix roundoff problems in <function>float8_timestamptz()</>
-      and <function>make_interval()</> (Tom Lane)
+      Fix roundoff problems in <function>float8_timestamptz()</function>
+      and <function>make_interval()</function> (Tom Lane)
      </para>
 
      <para>
@@ -1876,7 +3406,7 @@ Branch: REL9_6_STABLE [1ec36a9eb] 2017-04-16 20:49:40 -0400
 Branch: REL9_5_STABLE [b6e6ae1dc] 2017-04-16 20:50:31 -0400
 -->
      <para>
-      Fix <function>pg_get_object_address()</> to handle members of operator
+      Fix <function>pg_get_object_address()</function> to handle members of operator
       families correctly (&Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -1888,12 +3418,12 @@ Branch: master [78874531b] 2017-03-24 13:53:40 +0300
 Branch: REL9_6_STABLE [8de6278d3] 2017-03-24 13:55:02 +0300
 -->
      <para>
-      Fix cancelling of <function>pg_stop_backup()</> when attempting to stop
+      Fix cancelling of <function>pg_stop_backup()</function> when attempting to stop
       a non-exclusive backup (Michael Paquier, David Steele)
      </para>
 
      <para>
-      If <function>pg_stop_backup()</> was cancelled while waiting for a
+      If <function>pg_stop_backup()</function> was cancelled while waiting for a
       non-exclusive backup to end, related state was left inconsistent;
       a new exclusive backup could not be started, and there were other minor
       problems.
@@ -1917,7 +3447,7 @@ Branch: REL9_3_STABLE [07987304d] 2017-05-07 11:35:05 -0400
 Branch: REL9_2_STABLE [9061680f0] 2017-05-07 11:35:11 -0400
 -->
      <para>
-      Improve performance of <structname>pg_timezone_names</> view
+      Improve performance of <structname>pg_timezone_names</structname> view
       (Tom Lane, David Rowley)
      </para>
     </listitem>
@@ -1947,13 +3477,13 @@ Branch: REL9_3_STABLE [3f613c6a4] 2017-02-21 17:51:28 -0500
 Branch: REL9_2_STABLE [775227590] 2017-02-21 17:51:28 -0500
 -->
      <para>
-      Fix sloppy handling of corner-case errors from <function>lseek()</>
-      and <function>close()</> (Tom Lane)
+      Fix sloppy handling of corner-case errors from <function>lseek()</function>
+      and <function>close()</function> (Tom Lane)
      </para>
 
      <para>
       Neither of these system calls are likely to fail in typical situations,
-      but if they did, <filename>fd.c</> could get quite confused.
+      but if they did, <filename>fd.c</filename> could get quite confused.
      </para>
     </listitem>
 
@@ -1994,8 +3524,8 @@ Branch: REL9_3_STABLE [04207ef76] 2017-03-13 20:52:05 +0100
 Branch: REL9_2_STABLE [d8c207437] 2017-03-13 20:52:16 +0100
 -->
      <para>
-      Fix <application>ecpg</> to support <command>COMMIT PREPARED</>
-      and <command>ROLLBACK PREPARED</> (Masahiko Sawada)
+      Fix <application>ecpg</application> to support <command>COMMIT PREPARED</command>
+      and <command>ROLLBACK PREPARED</command> (Masahiko Sawada)
      </para>
     </listitem>
 
@@ -2011,7 +3541,7 @@ Branch: REL9_2_STABLE [731afc91f] 2017-03-10 10:52:01 +0100
 -->
      <para>
       Fix a double-free error when processing dollar-quoted string literals
-      in <application>ecpg</> (Michael Meskes)
+      in <application>ecpg</application> (Michael Meskes)
      </para>
     </listitem>
 
@@ -2021,8 +3551,8 @@ Author: Teodor Sigaev <teodor@sigaev.ru>
 Branch: REL9_6_STABLE [2ed391f95] 2017-03-24 19:23:13 +0300
 -->
      <para>
-      Fix <application>pgbench</> to handle the combination
-      of <option>--connect</> and <option>--rate</> options correctly
+      Fix <application>pgbench</application> to handle the combination
+      of <option>--connect</option> and <option>--rate</option> options correctly
       (Fabien Coelho)
      </para>
     </listitem>
@@ -2034,8 +3564,8 @@ Branch: master [ef2662394] 2017-03-07 11:36:42 -0500
 Branch: REL9_6_STABLE [0e2c85d13] 2017-03-07 11:36:35 -0500
 -->
      <para>
-      Fix <application>pgbench</> to honor the long-form option
-      spelling <option>--builtin</>, as per its documentation (Tom Lane)
+      Fix <application>pgbench</application> to honor the long-form option
+      spelling <option>--builtin</option>, as per its documentation (Tom Lane)
      </para>
     </listitem>
 
@@ -2046,15 +3576,15 @@ Branch: master [330b84d8c] 2017-03-06 23:29:02 -0500
 Branch: REL9_6_STABLE [e961341cc] 2017-03-06 23:29:08 -0500
 -->
      <para>
-      Fix <application>pg_dump</>/<application>pg_restore</> to correctly
-      handle privileges for the <literal>public</> schema when
-      using <option>--clean</> option (Stephen Frost)
+      Fix <application>pg_dump</application>/<application>pg_restore</application> to correctly
+      handle privileges for the <literal>public</literal> schema when
+      using <option>--clean</option> option (Stephen Frost)
      </para>
 
      <para>
       Other schemas start out with no privileges granted,
-      but <literal>public</> does not; this requires special-case treatment
-      when it is dropped and restored due to the <option>--clean</> option.
+      but <literal>public</literal> does not; this requires special-case treatment
+      when it is dropped and restored due to the <option>--clean</option> option.
      </para>
     </listitem>
 
@@ -2069,7 +3599,7 @@ Branch: REL9_3_STABLE [783acfd4d] 2017-03-06 19:33:59 -0500
 Branch: REL9_2_STABLE [0ab75448e] 2017-03-06 19:33:59 -0500
 -->
      <para>
-      In <application>pg_dump</>, fix incorrect schema and owner marking for
+      In <application>pg_dump</application>, fix incorrect schema and owner marking for
       comments and security labels of some types of database objects
       (Giuseppe Broccolo, Tom Lane)
      </para>
@@ -2089,12 +3619,12 @@ Branch: master [39370e6a0] 2017-02-17 15:06:28 -0500
 Branch: REL9_6_STABLE [4e8b2fd33] 2017-02-17 15:06:34 -0500
 -->
      <para>
-      Fix typo in <application>pg_dump</>'s query for initial privileges
+      Fix typo in <application>pg_dump</application>'s query for initial privileges
       of a procedural language (Peter Eisentraut)
      </para>
 
      <para>
-      This resulted in <application>pg_dump</> always believing that the
+      This resulted in <application>pg_dump</application> always believing that the
       language had no initial privileges.  Since that's true for most
       procedural languages, ill effects from this bug are probably rare.
      </para>
@@ -2111,13 +3641,13 @@ Branch: REL9_3_STABLE [0c0a95c2f] 2017-03-10 14:15:09 -0500
 Branch: REL9_2_STABLE [e6d2ba419] 2017-03-10 14:15:09 -0500
 -->
      <para>
-      Avoid emitting an invalid list file in <literal>pg_restore -l</>
+      Avoid emitting an invalid list file in <literal>pg_restore -l</literal>
       when SQL object names contain newlines (Tom Lane)
      </para>
 
      <para>
       Replace newlines by spaces, which is sufficient to make the output
-      valid for <literal>pg_restore -L</>'s purposes.
+      valid for <literal>pg_restore -L</literal>'s purposes.
      </para>
     </listitem>
 
@@ -2132,8 +3662,8 @@ Branch: REL9_3_STABLE [7f831f09b] 2017-03-06 17:04:29 -0500
 Branch: REL9_2_STABLE [e864cd25b] 2017-03-06 17:04:55 -0500
 -->
      <para>
-      Fix <application>pg_upgrade</> to transfer comments and security labels
-      attached to <quote>large objects</> (blobs) (Stephen Frost)
+      Fix <application>pg_upgrade</application> to transfer comments and security labels
+      attached to <quote>large objects</quote> (blobs) (Stephen Frost)
      </para>
 
      <para>
@@ -2154,13 +3684,13 @@ Branch: REL9_2_STABLE [0276da5eb] 2017-03-12 19:36:28 -0400
 -->
      <para>
       Improve error handling
-      in <filename>contrib/adminpack</>'s <function>pg_file_write()</>
+      in <filename>contrib/adminpack</filename>'s <function>pg_file_write()</function>
       function (Noah Misch)
      </para>
 
      <para>
       Notably, it failed to detect errors reported
-      by <function>fclose()</>.
+      by <function>fclose()</function>.
      </para>
     </listitem>
 
@@ -2175,7 +3705,7 @@ Branch: REL9_3_STABLE [f6cfc14e5] 2017-03-11 13:33:22 -0800
 Branch: REL9_2_STABLE [c4613c3f4] 2017-03-11 13:33:30 -0800
 -->
      <para>
-      In <filename>contrib/dblink</>, avoid leaking the previous unnamed
+      In <filename>contrib/dblink</filename>, avoid leaking the previous unnamed
       connection when establishing a new unnamed connection (Joe Conway)
      </para>
     </listitem>
@@ -2200,7 +3730,7 @@ Branch: REL9_4_STABLE [b179684c7] 2017-04-13 17:18:35 -0400
 Branch: REL9_3_STABLE [5be58cc89] 2017-04-13 17:18:35 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_trgm</>'s extraction of trigrams from regular
+      Fix <filename>contrib/pg_trgm</filename>'s extraction of trigrams from regular
       expressions (Tom Lane)
      </para>
 
@@ -2218,7 +3748,7 @@ Branch: master [332bec1e6] 2017-04-24 22:50:07 -0400
 Branch: REL9_6_STABLE [86e640a69] 2017-04-26 09:14:21 -0400
 -->
      <para>
-      In <filename>contrib/postgres_fdw</>, allow join conditions that
+      In <filename>contrib/postgres_fdw</filename>, allow join conditions that
       contain shippable extension-provided functions to be pushed to the
       remote server (David Rowley, Ashutosh Bapat)
      </para>
@@ -2276,7 +3806,7 @@ Branch: REL9_3_STABLE [dc93cafca] 2017-05-01 11:54:02 -0400
 Branch: REL9_2_STABLE [c96ccc40e] 2017-05-01 11:54:08 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2017b
+      Update time zone data files to <application>tzdata</application> release 2017b
       for DST law changes in Chile, Haiti, and Mongolia, plus historical
       corrections for Ecuador, Kazakhstan, Liberia, and Spain.
       Switch to numeric abbreviations for numerous time zones in South
@@ -2290,9 +3820,9 @@ Branch: REL9_2_STABLE [c96ccc40e] 2017-05-01 11:54:08 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
     </listitem>
@@ -2314,16 +3844,16 @@ Branch: REL9_2_STABLE [82e7d3dfd] 2017-05-07 11:57:41 -0400
 
      <para>
       The Microsoft MSVC build scripts neglected to install
-      the <filename>posixrules</> file in the timezone directory tree.
+      the <filename>posixrules</filename> file in the timezone directory tree.
       This resulted in the timezone code falling back to its built-in
       rule about what DST behavior to assume for a POSIX-style time zone
       name.  For historical reasons that still corresponds to the DST rules
       the USA was using before 2007 (i.e., change on first Sunday in April
       and last Sunday in October).  With this fix, a POSIX-style zone name
       will use the current and historical DST transition dates of
-      the <literal>US/Eastern</> zone.  If you don't want that, remove
-      the <filename>posixrules</> file, or replace it with a copy of some
-      other zone file (see <xref linkend="datatype-timezones">).  Note that
+      the <literal>US/Eastern</literal> zone.  If you don't want that, remove
+      the <filename>posixrules</filename> file, or replace it with a copy of some
+      other zone file (see <xref linkend="datatype-timezones"/>).  Note that
       due to caching, you may need to restart the server to get such changes
       to take effect.
      </para>
@@ -2345,7 +3875,7 @@ Branch: REL9_2_STABLE [82e7d3dfd] 2017-05-07 11:57:41 -0400
   <para>
    This release contains a variety of fixes from 9.6.1.
    For information about new features in the 9.6 major release, see
-   <xref linkend="release-9-6">.
+   <xref linkend="release-9-6"/>.
   </para>
 
   <sect2>
@@ -2363,7 +3893,7 @@ Branch: REL9_2_STABLE [82e7d3dfd] 2017-05-07 11:57:41 -0400
 
    <para>
     Also, if you are upgrading from a version earlier than 9.6.1,
-    see <xref linkend="release-9-6-1">.
+    see <xref linkend="release-9-6-1"/>.
    </para>
   </sect2>
 
@@ -2384,15 +3914,15 @@ Branch: REL9_2_STABLE [bcd7b47c2] 2017-02-06 13:20:25 -0500
 -->
      <para>
       Fix a race condition that could cause indexes built
-      with <command>CREATE INDEX CONCURRENTLY</> to be corrupt
+      with <command>CREATE INDEX CONCURRENTLY</command> to be corrupt
       (Pavan Deolasee, Tom Lane)
      </para>
 
      <para>
-      If <command>CREATE INDEX CONCURRENTLY</> was used to build an index
+      If <command>CREATE INDEX CONCURRENTLY</command> was used to build an index
       that depends on a column not previously indexed, then rows
       updated by transactions that ran concurrently with
-      the <command>CREATE INDEX</> command could have received incorrect
+      the <command>CREATE INDEX</command> command could have received incorrect
       index entries.  If you suspect this may have happened, the most
       reliable solution is to rebuild affected indexes after installing
       this update.
@@ -2416,7 +3946,7 @@ Branch: REL9_4_STABLE [3e844a34b] 2016-11-15 15:55:36 -0500
       Backends failed to account for this snapshot when advertising their
       oldest xmin, potentially allowing concurrent vacuuming operations to
       remove data that was still needed.  This led to transient failures
-      along the lines of <quote>cache lookup failed for relation 1255</>.
+      along the lines of <quote>cache lookup failed for relation 1255</quote>.
      </para>
     </listitem>
 
@@ -2432,7 +3962,7 @@ Branch: REL9_5_STABLE [ed8e8b814] 2017-01-09 18:19:29 -0300
      </para>
 
      <para>
-      The WAL record emitted for a BRIN <quote>revmap</> page when moving an
+      The WAL record emitted for a BRIN <quote>revmap</quote> page when moving an
       index tuple to a different page was incorrect.  Replay would make the
       related portion of the index useless, forcing it to be recomputed.
      </para>
@@ -2449,13 +3979,13 @@ Branch: REL9_3_STABLE [8e403f215] 2016-12-08 14:16:47 -0500
 Branch: REL9_2_STABLE [a00ac6299] 2016-12-08 14:19:25 -0500
 -->
      <para>
-      Unconditionally WAL-log creation of the <quote>init fork</> for an
+      Unconditionally WAL-log creation of the <quote>init fork</quote> for an
       unlogged table (Michael Paquier)
      </para>
 
      <para>
-      Previously, this was skipped when <xref linkend="guc-wal-level">
-      = <literal>minimal</>, but actually it's necessary even in that case
+      Previously, this was skipped when <xref linkend="guc-wal-level"/>
+      = <literal>minimal</literal>, but actually it's necessary even in that case
       to ensure that the unlogged table is properly reset to empty after a
       crash.
      </para>
@@ -2537,8 +4067,8 @@ Branch: master [93eb619cd] 2016-12-17 02:22:15 +0900
 Branch: REL9_6_STABLE [6c75fb6b3] 2016-12-17 02:25:47 +0900
 -->
      <para>
-      Disallow setting the <replaceable>num_sync</> field to zero in
-      <xref linkend="guc-synchronous-standby-names"> (Fujii Masao)
+      Disallow setting the <replaceable>num_sync</replaceable> field to zero in
+      <xref linkend="guc-synchronous-standby-names"/> (Fujii Masao)
      </para>
 
      <para>
@@ -2588,7 +4118,7 @@ Branch: REL9_6_STABLE [20064c0ec] 2017-01-29 23:05:09 -0500
 -->
      <para>
       Fix tracking of initial privileges for extension member objects so
-      that it works correctly with <command>ALTER EXTENSION ... ADD/DROP</>
+      that it works correctly with <command>ALTER EXTENSION ... ADD/DROP</command>
       (Stephen Frost)
      </para>
 
@@ -2596,7 +4126,7 @@ Branch: REL9_6_STABLE [20064c0ec] 2017-01-29 23:05:09 -0500
       An object's current privileges at the time it is added to the
       extension will now be considered its default privileges; only
       later changes in its privileges will be dumped by
-      subsequent <application>pg_dump</> runs.
+      subsequent <application>pg_dump</application> runs.
      </para>
     </listitem>
 
@@ -2611,13 +4141,13 @@ Branch: REL9_3_STABLE [8f67a6c22] 2016-11-23 13:45:56 -0500
 Branch: REL9_2_STABLE [05975ab0a] 2016-11-23 13:45:56 -0500
 -->
      <para>
-      Make sure <command>ALTER TABLE</> preserves index tablespace
+      Make sure <command>ALTER TABLE</command> preserves index tablespace
       assignments when rebuilding indexes (Tom Lane, Michael Paquier)
      </para>
 
      <para>
       Previously, non-default settings
-      of <xref linkend="guc-default-tablespace"> could result in broken
+      of <xref linkend="guc-default-tablespace"/> could result in broken
       indexes.
      </para>
     </listitem>
@@ -2633,7 +4163,7 @@ Branch: REL9_4_STABLE [3a9a8c408] 2016-10-26 17:05:06 -0400
      <para>
       Fix incorrect updating of trigger function properties when changing a
       foreign-key constraint's deferrability properties with <command>ALTER
-      TABLE ... ALTER CONSTRAINT</> (Tom Lane)
+      TABLE ... ALTER CONSTRAINT</command> (Tom Lane)
      </para>
 
      <para>
@@ -2658,8 +4188,8 @@ Branch: REL9_2_STABLE [6a363a4c2] 2016-11-25 13:44:48 -0500
      </para>
 
      <para>
-      This avoids <quote>could not find trigger <replaceable>NNN</></quote>
-      or <quote>relation <replaceable>NNN</> has no triggers</quote> errors.
+      This avoids <quote>could not find trigger <replaceable>NNN</replaceable></quote>
+      or <quote>relation <replaceable>NNN</replaceable> has no triggers</quote> errors.
      </para>
     </listitem>
 
@@ -2671,15 +4201,15 @@ Branch: REL9_6_STABLE [4e563a1f6] 2017-01-09 19:26:58 -0300
 Branch: REL9_5_STABLE [4d4ab6ccd] 2017-01-09 19:26:58 -0300
 -->
      <para>
-      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</> when child
+      Fix <command>ALTER TABLE ... SET DATA TYPE ... USING</command> when child
       table has different column ordering than the parent
       (&Aacute;lvaro Herrera)
      </para>
 
      <para>
-      Failure to adjust the column numbering in the <literal>USING</>
+      Failure to adjust the column numbering in the <literal>USING</literal>
       expression led to errors,
-      typically <quote>attribute <replaceable>N</> has wrong type</quote>.
+      typically <quote>attribute <replaceable>N</replaceable> has wrong type</quote>.
      </para>
     </listitem>
 
@@ -2695,7 +4225,7 @@ Branch: REL9_2_STABLE [6c4cf2be8] 2017-01-04 18:00:12 -0500
 -->
      <para>
       Fix processing of OID column when a table with OIDs is associated to
-      a parent with OIDs via <command>ALTER TABLE ... INHERIT</> (Amit
+      a parent with OIDs via <command>ALTER TABLE ... INHERIT</command> (Amit
       Langote)
      </para>
 
@@ -2713,8 +4243,8 @@ Branch: master [1ead0208b] 2016-12-22 16:23:38 -0500
 Branch: REL9_6_STABLE [68330c8b4] 2016-12-22 16:23:34 -0500
 -->
      <para>
-      Ensure that <command>CREATE TABLE ... LIKE ... WITH OIDS</> creates
-      a table with OIDs, whether or not the <literal>LIKE</>-referenced
+      Ensure that <command>CREATE TABLE ... LIKE ... WITH OIDS</command> creates
+      a table with OIDs, whether or not the <literal>LIKE</literal>-referenced
       table(s) have OIDs (Tom Lane)
      </para>
     </listitem>
@@ -2728,7 +4258,7 @@ Branch: REL9_5_STABLE [78a98b767] 2016-12-21 17:02:47 +0000
 Branch: REL9_4_STABLE [cad24980e] 2016-12-21 17:03:54 +0000
 -->
      <para>
-      Fix <command>CREATE OR REPLACE VIEW</> to update the view query
+      Fix <command>CREATE OR REPLACE VIEW</command> to update the view query
       before attempting to apply the new view options (Dean Rasheed)
      </para>
 
@@ -2749,7 +4279,7 @@ Branch: REL9_3_STABLE [0e3aadb68] 2016-12-22 17:09:00 -0500
 -->
      <para>
       Report correct object identity during <command>ALTER TEXT SEARCH
-      CONFIGURATION</> (Artur Zakirov)
+      CONFIGURATION</command> (Artur Zakirov)
      </para>
 
      <para>
@@ -2767,8 +4297,8 @@ Branch: REL9_5_STABLE [7816d1356] 2016-11-24 15:39:55 -0300
 -->
      <para>
       Fix commit timestamp mechanism to not fail when queried about
-      the special XIDs <literal>FrozenTransactionId</>
-      and <literal>BootstrapTransactionId</> (Craig Ringer)
+      the special XIDs <literal>FrozenTransactionId</literal>
+      and <literal>BootstrapTransactionId</literal> (Craig Ringer)
      </para>
     </listitem>
 
@@ -2789,8 +4319,8 @@ Branch: REL9_5_STABLE [6e00ba1e1] 2016-11-10 15:00:58 -0500
 
      <para>
       The symptom was spurious <quote>ON CONFLICT is not supported on table
-      ... used as a catalog table</> errors when the target
-      of <command>INSERT ... ON CONFLICT</> is a view with cascade option.
+      ... used as a catalog table</quote> errors when the target
+      of <command>INSERT ... ON CONFLICT</command> is a view with cascade option.
      </para>
     </listitem>
 
@@ -2802,8 +4332,8 @@ Branch: REL9_6_STABLE [da05d0ebc] 2016-12-04 15:02:46 -0500
 Branch: REL9_5_STABLE [25c06a1ed] 2016-12-04 15:02:48 -0500
 -->
      <para>
-      Fix incorrect <quote>target lists can have at most <replaceable>N</>
-      entries</quote> complaint when using <literal>ON CONFLICT</> with
+      Fix incorrect <quote>target lists can have at most <replaceable>N</replaceable>
+      entries</quote> complaint when using <literal>ON CONFLICT</literal> with
       wide tables (Tom Lane)
      </para>
     </listitem>
@@ -2815,8 +4345,8 @@ Branch: master [da8f3ebf3] 2016-11-02 14:32:13 -0400
 Branch: REL9_6_STABLE [f4d865f22] 2016-11-02 14:32:13 -0400
 -->
      <para>
-      Fix spurious <quote>query provides a value for a dropped column</>
-      errors during <command>INSERT</> or <command>UPDATE</> on a table
+      Fix spurious <quote>query provides a value for a dropped column</quote>
+      errors during <command>INSERT</command> or <command>UPDATE</command> on a table
       with a dropped column (Tom Lane)
      </para>
     </listitem>
@@ -2831,13 +4361,13 @@ Branch: REL9_4_STABLE [44c8b4fcd] 2016-11-20 14:26:19 -0500
 Branch: REL9_3_STABLE [71db302ec] 2016-11-20 14:26:19 -0500
 -->
      <para>
-      Prevent multicolumn expansion of <replaceable>foo</><literal>.*</> in
-      an <command>UPDATE</> source expression (Tom Lane)
+      Prevent multicolumn expansion of <replaceable>foo</replaceable><literal>.*</literal> in
+      an <command>UPDATE</command> source expression (Tom Lane)
      </para>
 
      <para>
       This led to <quote>UPDATE target count mismatch --- internal
-      error</>.  Now the syntax is understood as a whole-row variable,
+      error</quote>.  Now the syntax is understood as a whole-row variable,
       as it would be in other contexts.
      </para>
     </listitem>
@@ -2854,12 +4384,12 @@ Branch: REL9_2_STABLE [082d1fb9e] 2016-12-09 12:01:14 -0500
 -->
      <para>
       Ensure that column typmods are determined accurately for
-      multi-row <literal>VALUES</> constructs (Tom Lane)
+      multi-row <literal>VALUES</literal> constructs (Tom Lane)
      </para>
 
      <para>
       This fixes problems occurring when the first value in a column has a
-      determinable typmod (e.g., length for a <type>varchar</> value) but
+      determinable typmod (e.g., length for a <type>varchar</type> value) but
       later values don't share the same limit.
      </para>
     </listitem>
@@ -2883,8 +4413,8 @@ Branch: REL9_2_STABLE [6e2c21ec5] 2016-12-21 17:39:33 -0500
       Normally, a Unicode surrogate leading character must be followed by a
       Unicode surrogate trailing character, but the check for this was
       missed if the leading character was the last character in a Unicode
-      string literal (<literal>U&amp;'...'</>) or Unicode identifier
-      (<literal>U&amp;"..."</>).
+      string literal (<literal>U&amp;'...'</literal>) or Unicode identifier
+      (<literal>U&amp;"..."</literal>).
      </para>
     </listitem>
 
@@ -2895,7 +4425,7 @@ Branch: master [db80acfc9] 2016-12-20 09:20:17 +0200
 Branch: REL9_6_STABLE [ce92fc4e2] 2016-12-20 09:20:30 +0200
 -->
      <para>
-      Fix execution of <literal>DISTINCT</> and ordered aggregates when
+      Fix execution of <literal>DISTINCT</literal> and ordered aggregates when
       multiple such aggregates are able to share the same transition state
       (Heikki Linnakangas)
      </para>
@@ -2910,7 +4440,7 @@ Branch: master [260443847] 2016-12-19 13:49:50 -0500
 Branch: REL9_6_STABLE [3f07eff10] 2016-12-19 13:49:45 -0500
 -->
      <para>
-      Fix implementation of phrase search operators in <type>tsquery</>
+      Fix implementation of phrase search operators in <type>tsquery</type>
       (Tom Lane)
      </para>
 
@@ -2939,7 +4469,7 @@ Branch: REL9_2_STABLE [fe6120f9b] 2017-01-26 12:17:47 -0500
 -->
      <para>
       Ensure that a purely negative text search query, such
-      as <literal>!foo</>, matches empty <type>tsvector</>s (Tom Dunstan)
+      as <literal>!foo</literal>, matches empty <type>tsvector</type>s (Tom Dunstan)
      </para>
 
      <para>
@@ -2959,7 +4489,7 @@ Branch: REL9_3_STABLE [79e1a9efa] 2016-12-11 13:09:57 -0500
 Branch: REL9_2_STABLE [f4ccee408] 2016-12-11 13:09:57 -0500
 -->
      <para>
-      Prevent crash when <function>ts_rewrite()</> replaces a non-top-level
+      Prevent crash when <function>ts_rewrite()</function> replaces a non-top-level
       subtree with an empty query (Artur Zakirov)
      </para>
     </listitem>
@@ -2975,7 +4505,7 @@ Branch: REL9_3_STABLE [407d513df] 2016-10-30 17:35:43 -0400
 Branch: REL9_2_STABLE [606e16a7f] 2016-10-30 17:35:43 -0400
 -->
      <para>
-      Fix performance problems in <function>ts_rewrite()</> (Tom Lane)
+      Fix performance problems in <function>ts_rewrite()</function> (Tom Lane)
      </para>
     </listitem>
 
@@ -2990,7 +4520,7 @@ Branch: REL9_3_STABLE [77a22f898] 2016-10-30 15:24:40 -0400
 Branch: REL9_2_STABLE [b0f8a273e] 2016-10-30 15:24:40 -0400
 -->
      <para>
-      Fix <function>ts_rewrite()</>'s handling of nested NOT operators
+      Fix <function>ts_rewrite()</function>'s handling of nested NOT operators
       (Tom Lane)
      </para>
     </listitem>
@@ -3004,7 +4534,7 @@ Branch: REL9_5_STABLE [7151e72d7] 2016-10-30 12:27:41 -0400
 -->
      <para>
       Improve speed of user-defined aggregates that
-      use <function>array_append()</> as transition function (Tom Lane)
+      use <function>array_append()</function> as transition function (Tom Lane)
      </para>
     </listitem>
 
@@ -3019,7 +4549,7 @@ Branch: REL9_3_STABLE [ee9cb284a] 2017-01-05 11:33:51 -0500
 Branch: REL9_2_STABLE [e0d59c6ef] 2017-01-05 11:33:51 -0500
 -->
      <para>
-      Fix <function>array_fill()</> to handle empty arrays properly (Tom Lane)
+      Fix <function>array_fill()</function> to handle empty arrays properly (Tom Lane)
      </para>
     </listitem>
 
@@ -3031,8 +4561,8 @@ Branch: REL9_6_STABLE [79c89f1f4] 2016-12-09 12:42:17 -0300
 Branch: REL9_5_STABLE [581b09c72] 2016-12-09 12:42:17 -0300
 -->
      <para>
-      Fix possible crash in <function>array_position()</>
-      or <function>array_positions()</> when processing arrays of records
+      Fix possible crash in <function>array_position()</function>
+      or <function>array_positions()</function> when processing arrays of records
       (Junseok Yang)
      </para>
     </listitem>
@@ -3048,7 +4578,7 @@ Branch: REL9_3_STABLE [e71fe8470] 2016-12-16 12:53:22 +0200
 Branch: REL9_2_STABLE [c8f8ed5c2] 2016-12-16 12:53:27 +0200
 -->
      <para>
-      Fix one-byte buffer overrun in <function>quote_literal_cstr()</>
+      Fix one-byte buffer overrun in <function>quote_literal_cstr()</function>
       (Heikki Linnakangas)
      </para>
 
@@ -3069,8 +4599,8 @@ Branch: REL9_3_STABLE [f64b11fa0] 2017-01-17 17:32:20 +0900
 Branch: REL9_2_STABLE [c73157ca0] 2017-01-17 17:32:45 +0900
 -->
      <para>
-      Prevent multiple calls of <function>pg_start_backup()</>
-      and <function>pg_stop_backup()</> from running concurrently (Michael
+      Prevent multiple calls of <function>pg_start_backup()</function>
+      and <function>pg_stop_backup()</function> from running concurrently (Michael
       Paquier)
      </para>
 
@@ -3089,7 +4619,7 @@ Branch: REL9_5_STABLE [74e67bbad] 2017-01-18 15:21:52 -0500
 -->
      <para>
       Disable transform that attempted to remove no-op <literal>AT TIME
-      ZONE</> conversions (Tom Lane)
+      ZONE</literal> conversions (Tom Lane)
      </para>
 
      <para>
@@ -3109,15 +4639,15 @@ Branch: REL9_3_STABLE [583599839] 2016-12-27 15:43:54 -0500
 Branch: REL9_2_STABLE [beae7d5f0] 2016-12-27 15:43:55 -0500
 -->
      <para>
-      Avoid discarding <type>interval</>-to-<type>interval</> casts
+      Avoid discarding <type>interval</type>-to-<type>interval</type> casts
       that aren't really no-ops (Tom Lane)
      </para>
 
      <para>
       In some cases, a cast that should result in zeroing out
-      low-order <type>interval</> fields was mistakenly deemed to be a
+      low-order <type>interval</type> fields was mistakenly deemed to be a
       no-op and discarded.  An example is that casting from <type>INTERVAL
-      MONTH</> to <type>INTERVAL YEAR</> failed to clear the months field.
+      MONTH</type> to <type>INTERVAL YEAR</type> failed to clear the months field.
      </para>
     </listitem>
 
@@ -3153,7 +4683,7 @@ Branch: master [4212cb732] 2016-12-06 11:11:54 -0500
 Branch: REL9_6_STABLE [ebe5dc9e0] 2016-12-06 11:43:12 -0500
 -->
      <para>
-      Allow statements prepared with <command>PREPARE</> to be given
+      Allow statements prepared with <command>PREPARE</command> to be given
       parallel plans (Amit Kapila, Tobias Bussmann)
      </para>
     </listitem>
@@ -3222,7 +4752,7 @@ Branch: REL9_6_STABLE [7defc3b97] 2016-11-10 11:31:56 -0500
 -->
      <para>
       Fix the plan generated for sorted partial aggregation with a constant
-      <literal>GROUP BY</> clause (Tom Lane)
+      <literal>GROUP BY</literal> clause (Tom Lane)
      </para>
     </listitem>
 
@@ -3233,8 +4763,8 @@ Branch: master [1f542a2ea] 2016-12-13 13:20:37 -0500
 Branch: REL9_6_STABLE [997a2994e] 2016-12-13 13:20:16 -0500
 -->
      <para>
-      Fix <quote>could not find plan for CTE</> planner error when dealing
-      with a <literal>UNION ALL</> containing CTE references (Tom Lane)
+      Fix <quote>could not find plan for CTE</quote> planner error when dealing
+      with a <literal>UNION ALL</literal> containing CTE references (Tom Lane)
      </para>
     </listitem>
 
@@ -3251,7 +4781,7 @@ Branch: REL9_6_STABLE [b971a98ce] 2017-02-02 19:11:27 -0500
 
      <para>
       The typical consequence of this mistake was a <quote>plan should not
-      reference subplan's variable</> error.
+      reference subplan's variable</quote> error.
      </para>
     </listitem>
 
@@ -3282,7 +4812,7 @@ Branch: master [bec96c82f] 2017-01-19 12:06:21 -0500
 Branch: REL9_6_STABLE [fd081cabf] 2017-01-19 12:06:27 -0500
 -->
      <para>
-      Fix <application>pg_dump</> to emit the data of a sequence that is
+      Fix <application>pg_dump</application> to emit the data of a sequence that is
       marked as an extension configuration table (Michael Paquier)
      </para>
     </listitem>
@@ -3294,14 +4824,14 @@ Branch: master [e2090d9d2] 2017-01-31 16:24:11 -0500
 Branch: REL9_6_STABLE [eb5e9d90d] 2017-01-31 16:24:14 -0500
 -->
      <para>
-      Fix mishandling of <command>ALTER DEFAULT PRIVILEGES ... REVOKE</>
-      in <application>pg_dump</> (Stephen Frost)
+      Fix mishandling of <command>ALTER DEFAULT PRIVILEGES ... REVOKE</command>
+      in <application>pg_dump</application> (Stephen Frost)
      </para>
 
      <para>
-      <application>pg_dump</> missed issuing the
-      required <literal>REVOKE</> commands in cases where <command>ALTER
-      DEFAULT PRIVILEGES</> had been used to reduce privileges to less than
+      <application>pg_dump</application> missed issuing the
+      required <literal>REVOKE</literal> commands in cases where <command>ALTER
+      DEFAULT PRIVILEGES</command> had been used to reduce privileges to less than
       they would normally be.
      </para>
     </listitem>
@@ -3323,7 +4853,7 @@ Branch: REL9_3_STABLE [fc03f7dd1] 2016-12-21 13:47:28 -0500
 Branch: REL9_2_STABLE [59a389891] 2016-12-21 13:47:32 -0500
 -->
      <para>
-      Fix <application>pg_dump</> to dump user-defined casts and transforms
+      Fix <application>pg_dump</application> to dump user-defined casts and transforms
       that use built-in functions (Stephen Frost)
      </para>
     </listitem>
@@ -3337,15 +4867,15 @@ Branch: REL9_5_STABLE [a7864037d] 2016-11-17 14:59:23 -0500
 Branch: REL9_4_STABLE [e69b532be] 2016-11-17 14:59:26 -0500
 -->
      <para>
-      Fix <application>pg_restore</> with <option>--create --if-exists</>
+      Fix <application>pg_restore</application> with <option>--create --if-exists</option>
       to behave more sanely if an archive contains
-      unrecognized <command>DROP</> commands (Tom Lane)
+      unrecognized <command>DROP</command> commands (Tom Lane)
      </para>
 
      <para>
       This doesn't fix any live bug, but it may improve the behavior in
-      future if <application>pg_restore</> is used with an archive
-      generated by a later <application>pg_dump</> version.
+      future if <application>pg_restore</application> is used with an archive
+      generated by a later <application>pg_dump</application> version.
      </para>
     </listitem>
 
@@ -3358,7 +4888,7 @@ Branch: REL9_5_STABLE [bc53d7130] 2016-12-19 10:16:02 +0100
 Branch: REL9_4_STABLE [f6508827a] 2016-12-19 10:16:12 +0100
 -->
      <para>
-      Fix <application>pg_basebackup</>'s rate limiting in the presence of
+      Fix <application>pg_basebackup</application>'s rate limiting in the presence of
       slow I/O (Antonin Houska)
      </para>
 
@@ -3377,8 +4907,8 @@ Branch: REL9_5_STABLE [6d779e05a] 2016-11-07 15:03:56 +0100
 Branch: REL9_4_STABLE [5556420d4] 2016-11-07 15:04:23 +0100
 -->
      <para>
-      Fix <application>pg_basebackup</>'s handling of
-      symlinked <filename>pg_stat_tmp</> and <filename>pg_replslot</>
+      Fix <application>pg_basebackup</application>'s handling of
+      symlinked <filename>pg_stat_tmp</filename> and <filename>pg_replslot</filename>
       subdirectories (Magnus Hagander, Michael Paquier)
      </para>
     </listitem>
@@ -3394,7 +4924,7 @@ Branch: REL9_3_STABLE [92929a3e3] 2016-10-27 12:00:05 -0400
 Branch: REL9_2_STABLE [629575fa2] 2016-10-27 12:14:07 -0400
 -->
      <para>
-      Fix possible <application>pg_basebackup</> failure on standby
+      Fix possible <application>pg_basebackup</application> failure on standby
       server when including WAL files (Amit Kapila, Robert Haas)
      </para>
     </listitem>
@@ -3406,10 +4936,10 @@ Branch: master [dbdfd114f] 2016-11-25 18:36:10 -0500
 Branch: REL9_6_STABLE [255bcd27f] 2016-11-25 18:36:10 -0500
 -->
      <para>
-      Improve <application>initdb</> to insert the correct
+      Improve <application>initdb</application> to insert the correct
       platform-specific default values for
-      the <replaceable>xxx</><literal>_flush_after</> parameters
-      into <filename>postgresql.conf</> (Fabien Coelho, Tom Lane)
+      the <replaceable>xxx</replaceable><literal>_flush_after</literal> parameters
+      into <filename>postgresql.conf</filename> (Fabien Coelho, Tom Lane)
      </para>
 
      <para>
@@ -3427,7 +4957,7 @@ Branch: REL9_5_STABLE [c472f2a33] 2016-12-22 15:01:39 -0500
 -->
      <para>
       Fix possible mishandling of expanded arrays in domain check
-      constraints and <literal>CASE</> execution (Tom Lane)
+      constraints and <literal>CASE</literal> execution (Tom Lane)
      </para>
 
      <para>
@@ -3483,14 +5013,14 @@ Branch: REL9_3_STABLE [9c0b04f18] 2016-11-06 14:43:14 -0500
 Branch: REL9_2_STABLE [92b7b1058] 2016-11-06 14:43:14 -0500
 -->
      <para>
-      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</>
+      Fix PL/Tcl to support triggers on tables that have <literal>.tupno</literal>
       as a column name (Tom Lane)
      </para>
 
      <para>
       This matches the (previously undocumented) behavior of
-      PL/Tcl's <command>spi_exec</> and <command>spi_execp</> commands,
-      namely that a magic <literal>.tupno</> column is inserted only if
+      PL/Tcl's <command>spi_exec</command> and <command>spi_execp</command> commands,
+      namely that a magic <literal>.tupno</literal> column is inserted only if
       there isn't a real column named that.
      </para>
     </listitem>
@@ -3506,7 +5036,7 @@ Branch: REL9_3_STABLE [46b6f3fff] 2016-11-15 16:17:19 -0500
 Branch: REL9_2_STABLE [13aa9af37] 2016-11-15 16:17:19 -0500
 -->
      <para>
-      Allow DOS-style line endings in <filename>~/.pgpass</> files,
+      Allow DOS-style line endings in <filename>~/.pgpass</filename> files,
       even on Unix (Vik Fearing)
      </para>
 
@@ -3527,7 +5057,7 @@ Branch: REL9_3_STABLE [1df8b3fe8] 2016-12-22 08:32:25 +0100
 Branch: REL9_2_STABLE [501c91074] 2016-12-22 08:34:07 +0100
 -->
      <para>
-      Fix one-byte buffer overrun if <application>ecpg</> is given a file
+      Fix one-byte buffer overrun if <application>ecpg</application> is given a file
       name that ends with a dot (Takayuki Tsunakawa)
      </para>
     </listitem>
@@ -3540,11 +5070,11 @@ Branch: REL9_6_STABLE [6a8c67f50] 2016-12-25 16:04:47 -0500
 -->
      <para>
       Fix incorrect error reporting for duplicate data
-      in <application>psql</>'s <command>\crosstabview</> (Tom Lane)
+      in <application>psql</application>'s <command>\crosstabview</command> (Tom Lane)
      </para>
 
      <para>
-      <application>psql</> sometimes quoted the wrong row and/or column
+      <application>psql</application> sometimes quoted the wrong row and/or column
       values when complaining about multiple entries for the same crosstab
       cell.
      </para>
@@ -3561,8 +5091,8 @@ Branch: REL9_3_STABLE [2022d594d] 2016-12-23 21:01:48 -0500
 Branch: REL9_2_STABLE [26b55d669] 2016-12-23 21:01:51 -0500
 -->
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER DEFAULT
-      PRIVILEGES</> (Gilles Darold, Stephen Frost)
+      Fix <application>psql</application>'s tab completion for <command>ALTER DEFAULT
+      PRIVILEGES</command> (Gilles Darold, Stephen Frost)
      </para>
     </listitem>
 
@@ -3573,8 +5103,8 @@ Branch: master [404e66758] 2016-11-28 11:51:30 -0500
 Branch: REL9_6_STABLE [28735cc72] 2016-11-28 11:51:35 -0500
 -->
      <para>
-      Fix <application>psql</>'s tab completion for <command>ALTER TABLE t
-      ALTER c DROP ...</> (Kyotaro Horiguchi)
+      Fix <application>psql</application>'s tab completion for <command>ALTER TABLE t
+      ALTER c DROP ...</command> (Kyotaro Horiguchi)
      </para>
     </listitem>
 
@@ -3589,9 +5119,9 @@ Branch: REL9_3_STABLE [82eb5c514] 2016-12-07 12:19:56 -0500
 Branch: REL9_2_STABLE [1ec5cc025] 2016-12-07 12:19:57 -0500
 -->
      <para>
-      In <application>psql</>, treat an empty or all-blank setting of
-      the <envar>PAGER</> environment variable as meaning <quote>no
-      pager</> (Tom Lane)
+      In <application>psql</application>, treat an empty or all-blank setting of
+      the <envar>PAGER</envar> environment variable as meaning <quote>no
+      pager</quote> (Tom Lane)
      </para>
 
      <para>
@@ -3611,8 +5141,8 @@ Branch: REL9_3_STABLE [9b8507bfa] 2016-12-22 09:47:25 -0800
 Branch: REL9_2_STABLE [44de099f8] 2016-12-22 09:46:46 -0800
 -->
      <para>
-      Improve <filename>contrib/dblink</>'s reporting of
-      low-level <application>libpq</> errors, such as out-of-memory
+      Improve <filename>contrib/dblink</filename>'s reporting of
+      low-level <application>libpq</application> errors, such as out-of-memory
       (Joe Conway)
      </para>
     </listitem>
@@ -3627,14 +5157,14 @@ Branch: REL9_4_STABLE [cb687e0ac] 2016-12-22 09:19:08 -0800
 Branch: REL9_3_STABLE [bd46cce21] 2016-12-22 09:18:50 -0800
 -->
      <para>
-      Teach <filename>contrib/dblink</> to ignore irrelevant server options
-      when it uses a <filename>contrib/postgres_fdw</> foreign server as
+      Teach <filename>contrib/dblink</filename> to ignore irrelevant server options
+      when it uses a <filename>contrib/postgres_fdw</filename> foreign server as
       the source of connection options (Corey Huinker)
      </para>
 
      <para>
       Previously, if the foreign server object had options that were not
-      also <application>libpq</> connection options, an error occurred.
+      also <application>libpq</application> connection options, an error occurred.
      </para>
     </listitem>
 
@@ -3648,7 +5178,7 @@ Branch: REL9_6_STABLE [2a8783e44] 2016-11-02 00:09:28 -0400
 Branch: REL9_5_STABLE [af636d7b5] 2016-11-02 00:09:28 -0400
 -->
      <para>
-      Fix portability problems in <filename>contrib/pageinspect</>'s
+      Fix portability problems in <filename>contrib/pageinspect</filename>'s
       functions for GIN indexes (Peter Eisentraut, Tom Lane)
      </para>
     </listitem>
@@ -3737,7 +5267,7 @@ Branch: REL9_3_STABLE [2b133be04] 2017-01-30 11:41:02 -0500
 Branch: REL9_2_STABLE [ef878cc2c] 2017-01-30 11:41:09 -0500
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016j
+      Update time zone data files to <application>tzdata</application> release 2016j
       for DST law changes in northern Cyprus (adding a new zone
       Asia/Famagusta), Russia (adding a new zone Europe/Saratov), Tonga,
       and Antarctica/Casey.
@@ -3762,7 +5292,7 @@ Branch: REL9_2_STABLE [ef878cc2c] 2017-01-30 11:41:09 -0500
   <para>
    This release contains a variety of fixes from 9.6.0.
    For information about new features in the 9.6 major release, see
-   <xref linkend="release-9-6">.
+   <xref linkend="release-9-6"/>.
   </para>
 
   <sect2>
@@ -3804,7 +5334,7 @@ Branch: REL9_3_STABLE [1c02ee314] 2016-10-19 15:00:34 +0300
       crash recovery, or to be written incorrectly on a standby server.
       Bogus entries in a free space map could lead to attempts to access
       pages that have been truncated away from the relation itself, typically
-      producing errors like <quote>could not read block <replaceable>XXX</>:
+      producing errors like <quote>could not read block <replaceable>XXX</replaceable>:
       read only 0 of 8192 bytes</quote>.  Checksum failures in the
       visibility map are also possible, if checksumming is enabled.
      </para>
@@ -3812,7 +5342,7 @@ Branch: REL9_3_STABLE [1c02ee314] 2016-10-19 15:00:34 +0300
      <para>
       Procedures for determining whether there is a problem and repairing it
       if so are discussed at
-      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Free_Space_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -3823,7 +5353,7 @@ Branch: master [5afcd2aa7] 2016-09-30 20:40:55 -0400
 Branch: REL9_6_STABLE [b6d906073] 2016-09-30 20:39:06 -0400
 -->
      <para>
-      Fix possible data corruption when <application>pg_upgrade</> rewrites
+      Fix possible data corruption when <application>pg_upgrade</application> rewrites
       a relation visibility map into 9.6 format (Tom Lane)
      </para>
 
@@ -3833,20 +5363,20 @@ Branch: REL9_6_STABLE [b6d906073] 2016-09-30 20:39:06 -0400
       Windows, the old map was read using text mode, leading to incorrect
       results if the map happened to contain consecutive bytes that matched
       a carriage return/line feed sequence.  The latter error would almost
-      always lead to a <application>pg_upgrade</> failure due to the map
+      always lead to a <application>pg_upgrade</application> failure due to the map
       file appearing to be the wrong length.
      </para>
 
      <para>
       If you are using a big-endian machine (many non-Intel architectures
-      are big-endian) and have used <application>pg_upgrade</> to upgrade
+      are big-endian) and have used <application>pg_upgrade</application> to upgrade
       from a pre-9.6 release, you should assume that all visibility maps are
       incorrect and need to be regenerated.  It is sufficient to truncate
       each relation's visibility map
-      with <filename>contrib/pg_visibility</>'s
-      <function>pg_truncate_visibility_map()</> function.
+      with <filename>contrib/pg_visibility</filename>'s
+      <function>pg_truncate_visibility_map()</function> function.
       For more information see
-      <ulink url="https://wiki.postgresql.org/wiki/Visibility_Map_Problems"></>.
+      <ulink url="https://wiki.postgresql.org/wiki/Visibility_Map_Problems"></ulink>.
      </para>
     </listitem>
 
@@ -3859,7 +5389,7 @@ Branch: REL9_5_STABLE [65d85b8f9] 2016-10-23 18:36:13 -0400
 -->
      <para>
       Don't throw serialization errors for self-conflicting insertions
-      in <command>INSERT ... ON CONFLICT</> (Thomas Munro, Peter Geoghegan)
+      in <command>INSERT ... ON CONFLICT</command> (Thomas Munro, Peter Geoghegan)
      </para>
     </listitem>
 
@@ -3871,7 +5401,7 @@ Branch: REL9_6_STABLE [a5f0bd77a] 2016-10-17 12:13:35 +0300
 -->
      <para>
       Fix use-after-free hazard in execution of aggregate functions
-      using <literal>DISTINCT</> (Peter Geoghegan)
+      using <literal>DISTINCT</literal> (Peter Geoghegan)
      </para>
 
      <para>
@@ -3906,7 +5436,7 @@ Branch: REL9_6_STABLE [190765a05] 2016-10-03 16:23:02 -0400
 Branch: REL9_5_STABLE [647a86e37] 2016-10-03 16:23:12 -0400
 -->
      <para>
-      Fix <command>COPY</> with a column name list from a table that has
+      Fix <command>COPY</command> with a column name list from a table that has
       row-level security enabled (Adam Brightwell)
      </para>
     </listitem>
@@ -3922,14 +5452,14 @@ Branch: REL9_3_STABLE [edb514306] 2016-10-20 17:18:09 -0400
 Branch: REL9_2_STABLE [f17c26dbd] 2016-10-20 17:18:14 -0400
 -->
      <para>
-      Fix <command>EXPLAIN</> to emit valid XML when
-      <xref linkend="guc-track-io-timing"> is on (Markus Winand)
+      Fix <command>EXPLAIN</command> to emit valid XML when
+      <xref linkend="guc-track-io-timing"/> is on (Markus Winand)
      </para>
 
      <para>
       Previously the XML output-format option produced syntactically invalid
-      tags such as <literal>&lt;I/O-Read-Time&gt;</>.  That is now
-      rendered as <literal>&lt;I-O-Read-Time&gt;</>.
+      tags such as <literal>&lt;I/O-Read-Time&gt;</literal>.  That is now
+      rendered as <literal>&lt;I-O-Read-Time&gt;</literal>.
      </para>
     </listitem>
 
@@ -3941,7 +5471,7 @@ Branch: REL9_6_STABLE [03f2bf70a] 2016-10-13 19:46:06 -0400
 Branch: REL9_5_STABLE [3cd504254] 2016-10-13 19:45:58 -0400
 -->
      <para>
-      Fix statistics update for <command>TRUNCATE</> in a prepared
+      Fix statistics update for <command>TRUNCATE</command> in a prepared
       transaction (Stas Kelvich)
      </para>
     </listitem>
@@ -3963,16 +5493,16 @@ Branch: REL9_3_STABLE [f0bf0f233] 2016-10-13 17:05:15 -0400
 Branch: REL9_2_STABLE [6f2db29ec] 2016-10-13 17:05:15 -0400
 -->
      <para>
-      Fix bugs in merging inherited <literal>CHECK</> constraints while
+      Fix bugs in merging inherited <literal>CHECK</literal> constraints while
       creating or altering a table (Tom Lane, Amit Langote)
      </para>
 
      <para>
-      Allow identical <literal>CHECK</> constraints to be added to a parent
+      Allow identical <literal>CHECK</literal> constraints to be added to a parent
       and child table in either order.  Prevent merging of a valid
-      constraint from the parent table with a <literal>NOT VALID</>
+      constraint from the parent table with a <literal>NOT VALID</literal>
       constraint on the child.  Likewise, prevent merging of a <literal>NO
-      INHERIT</> child constraint with an inherited constraint.
+      INHERIT</literal> child constraint with an inherited constraint.
      </para>
     </listitem>
 
@@ -3985,8 +5515,8 @@ Branch: REL9_5_STABLE [f50fa46cc] 2016-10-03 16:40:27 -0400
 -->
      <para>
       Show a sensible value
-      in <structname>pg_settings</>.<structfield>unit</>
-      for <varname>min_wal_size</> and <varname>max_wal_size</> (Tom Lane)
+      in <structname>pg_settings</structname>.<structfield>unit</structfield>
+      for <varname>min_wal_size</varname> and <varname>max_wal_size</varname> (Tom Lane)
      </para>
     </listitem>
 
@@ -3997,7 +5527,7 @@ Branch: master [9c4cc9e2c] 2016-10-13 00:25:48 -0400
 Branch: REL9_6_STABLE [0e9e64c07] 2016-10-13 00:25:28 -0400
 -->
      <para>
-      Fix replacement of array elements in <function>jsonb_set()</>
+      Fix replacement of array elements in <function>jsonb_set()</function>
       (Tom Lane)
      </para>
 
@@ -4041,7 +5571,7 @@ Branch: REL9_5_STABLE [7a2fa5774] 2016-10-24 09:38:28 -0300
      </para>
 
      <para>
-      With <xref linkend="guc-track-commit-timestamp"> turned on, old
+      With <xref linkend="guc-track-commit-timestamp"/> turned on, old
       commit timestamps became inaccessible after a clean server restart.
      </para>
     </listitem>
@@ -4085,7 +5615,7 @@ Branch: REL9_4_STABLE [6d3cbbf59] 2016-10-13 15:07:11 -0400
      </para>
 
      <para>
-      This avoids possible failures during <function>munmap()</> on systems
+      This avoids possible failures during <function>munmap()</function> on systems
       with atypical default huge page sizes.  Except in crash-recovery
       cases, there were no ill effects other than a log message.
      </para>
@@ -4111,7 +5641,7 @@ Branch: REL9_1_STABLE [e84e4761f] 2016-10-07 12:53:51 +0300
 -->
      <para>
       Don't try to share SSL contexts across multiple connections
-      in <application>libpq</> (Heikki Linnakangas)
+      in <application>libpq</application> (Heikki Linnakangas)
      </para>
 
      <para>
@@ -4132,12 +5662,12 @@ Branch: REL9_2_STABLE [7397f62e7] 2016-10-10 10:35:58 -0400
 Branch: REL9_1_STABLE [fb6825fe5] 2016-10-10 10:35:58 -0400
 -->
      <para>
-      Avoid corner-case memory leak in <application>libpq</> (Tom Lane)
+      Avoid corner-case memory leak in <application>libpq</application> (Tom Lane)
      </para>
 
      <para>
       The reported problem involved leaking an error report
-      during <function>PQreset()</>, but there might be related cases.
+      during <function>PQreset()</function>, but there might be related cases.
      </para>
     </listitem>
 
@@ -4149,7 +5679,7 @@ Branch: REL9_6_STABLE [bac56dbe0] 2016-10-03 10:07:39 -0400
 Branch: REL9_5_STABLE [0f259bd17] 2016-10-03 10:07:39 -0400
 -->
      <para>
-      In <application>pg_upgrade</>, check library loadability in name order
+      In <application>pg_upgrade</application>, check library loadability in name order
       (Tom Lane)
      </para>
 
@@ -4167,13 +5697,13 @@ Branch: master [e8bdee277] 2016-10-02 14:31:28 -0400
 Branch: REL9_6_STABLE [f40334b85] 2016-10-02 14:31:28 -0400
 -->
      <para>
-      Fix <application>pg_upgrade</> to work correctly for extensions
+      Fix <application>pg_upgrade</application> to work correctly for extensions
       containing index access methods (Tom Lane)
      </para>
 
      <para>
       To allow this, the server has been extended to support <command>ALTER
-      EXTENSION ADD/DROP ACCESS METHOD</>.  That functionality should have
+      EXTENSION ADD/DROP ACCESS METHOD</command>.  That functionality should have
       been included in the original patch to support dynamic creation of
       access methods, but it was overlooked.
      </para>
@@ -4186,7 +5716,7 @@ Branch: master [f002ed2b8] 2016-09-30 20:40:56 -0400
 Branch: REL9_6_STABLE [53fbeed40] 2016-09-30 20:40:27 -0400
 -->
      <para>
-      Improve error reporting in <application>pg_upgrade</>'s file
+      Improve error reporting in <application>pg_upgrade</application>'s file
       copying/linking/rewriting steps (Tom Lane, &Aacute;lvaro Herrera)
      </para>
     </listitem>
@@ -4198,7 +5728,7 @@ Branch: master [4806f26f9] 2016-10-07 09:51:18 -0400
 Branch: REL9_6_STABLE [1749332ec] 2016-10-07 09:51:28 -0400
 -->
      <para>
-      Fix <application>pg_dump</> to work against pre-7.4 servers
+      Fix <application>pg_dump</application> to work against pre-7.4 servers
       (Amit Langote, Tom Lane)
      </para>
     </listitem>
@@ -4211,8 +5741,8 @@ Branch: REL9_6_STABLE [2933ed036] 2016-10-07 14:35:41 +0300
 Branch: REL9_5_STABLE [010a1b561] 2016-10-07 14:35:45 +0300
 -->
      <para>
-      Disallow specifying both <option>--source-server</>
-      and <option>--source-target</> options to <application>pg_rewind</>
+      Disallow specifying both <option>--source-server</option>
+      and <option>--source-target</option> options to <application>pg_rewind</application>
       (Michael Banck)
      </para>
     </listitem>
@@ -4225,12 +5755,12 @@ Branch: REL9_6_STABLE [aab809664] 2016-10-06 13:34:38 +0300
 Branch: REL9_5_STABLE [69da71254] 2016-10-06 13:34:32 +0300
 -->
      <para>
-      Make <application>pg_rewind</> turn off <varname>synchronous_commit</>
+      Make <application>pg_rewind</application> turn off <varname>synchronous_commit</varname>
       in its session on the source server (Michael Banck, Michael Paquier)
      </para>
 
      <para>
-      This allows <application>pg_rewind</> to work even when the source
+      This allows <application>pg_rewind</application> to work even when the source
       server is using synchronous replication that is not working for some
       reason.
      </para>
@@ -4246,8 +5776,8 @@ Branch: REL9_4_STABLE [da3f71a08] 2016-09-30 11:22:49 +0200
 Branch: REL9_3_STABLE [4bff35cca] 2016-09-30 11:23:25 +0200
 -->
      <para>
-      In <application>pg_xlogdump</>, retry opening new WAL segments when
-      using <option>--follow</> option (Magnus Hagander)
+      In <application>pg_xlogdump</application>, retry opening new WAL segments when
+      using <option>--follow</option> option (Magnus Hagander)
      </para>
 
      <para>
@@ -4263,7 +5793,7 @@ Branch: master [9a109452d] 2016-10-01 16:32:54 -0400
 Branch: REL9_6_STABLE [f4e787c82] 2016-10-01 16:32:55 -0400
 -->
      <para>
-      Fix <filename>contrib/pg_visibility</> to report the correct TID for
+      Fix <filename>contrib/pg_visibility</filename> to report the correct TID for
       a corrupt tuple that has been the subject of a rolled-back update
       (Tom Lane)
      </para>
@@ -4277,7 +5807,7 @@ Branch: REL9_6_STABLE [68fb75e10] 2016-10-01 13:35:20 -0400
 -->
      <para>
       Fix makefile dependencies so that parallel make
-      of <application>PL/Python</> by itself will succeed reliably
+      of <application>PL/Python</application> by itself will succeed reliably
       (Pavel Raiskup)
      </para>
     </listitem>
@@ -4315,7 +5845,7 @@ Branch: REL9_2_STABLE [a03339aef] 2016-10-19 17:57:01 -0400
 Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
      <para>
-      Update time zone data files to <application>tzdata</> release 2016h
+      Update time zone data files to <application>tzdata</application> release 2016h
       for DST law changes in Palestine and Turkey, plus historical
       corrections for Turkey and some regions of Russia.
       Switch to numeric abbreviations for some time zones in Antarctica,
@@ -4328,15 +5858,15 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
       or no currency among the local population.  They are in process of
       reversing that policy in favor of using numeric UTC offsets in zones
       where there is no evidence of real-world use of an English
-      abbreviation.  At least for the time being, <productname>PostgreSQL</>
+      abbreviation.  At least for the time being, <productname>PostgreSQL</productname>
       will continue to accept such removed abbreviations for timestamp input.
-      But they will not be shown in the <structname>pg_timezone_names</>
+      But they will not be shown in the <structname>pg_timezone_names</structname>
       view nor used for output.
      </para>
 
      <para>
-      In this update, <literal>AMT</> is no longer shown as being in use to
-      mean Armenia Time.  Therefore, we have changed the <literal>Default</>
+      In this update, <literal>AMT</literal> is no longer shown as being in use to
+      mean Armenia Time.  Therefore, we have changed the <literal>Default</literal>
       abbreviation set to interpret it as Amazon Time, thus UTC-4 not UTC+4.
      </para>
     </listitem>
@@ -4358,7 +5888,7 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
    <title>Overview</title>
 
    <para>
-    Major enhancements in <productname>PostgreSQL</> 9.6 include:
+    Major enhancements in <productname>PostgreSQL</productname> 9.6 include:
    </para>
 
    <!-- Items in this list summarize one or more items below -->
@@ -4392,15 +5922,15 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 
     <listitem>
      <para>
-      <filename>postgres_fdw</> now supports remote joins, sorts,
-      <command>UPDATE</>s, and <command>DELETE</>s
+      <filename>postgres_fdw</filename> now supports remote joins, sorts,
+      <command>UPDATE</command>s, and <command>DELETE</command>s
      </para>
     </listitem>
 
     <listitem>
      <para>
       Substantial performance improvements, especially in the area of
-      scalability on multi-<acronym>CPU</>-socket servers
+      scalability on multi-<acronym>CPU</acronym>-socket servers
      </para>
     </listitem>
 
@@ -4417,8 +5947,8 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
   <title>Migration to Version 9.6</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
+    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 release.
    </para>
 
@@ -4435,7 +5965,7 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         Improve the <link
-        linkend="pg-stat-activity-view"><structname>pg_stat_activity</></link>
+        linkend="pg-stat-activity-view"><structname>pg_stat_activity</structname></link>
         view's information about what a process is waiting for (Amit
         Kapila, Ildus Kurbangaliev)
        </para>
@@ -4443,10 +5973,10 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
        <para>
         Historically a process has only been shown as waiting if it was
         waiting for a heavyweight lock.  Now waits for lightweight locks
-        and buffer pins are also shown in <structname>pg_stat_activity</>.
+        and buffer pins are also shown in <structname>pg_stat_activity</structname>.
         Also, the type of lock being waited for is now visible.
-        These changes replace the <structfield>waiting</> column with
-        <structfield>wait_event_type</> and <structfield>wait_event</>.
+        These changes replace the <structfield>waiting</structfield> column with
+        <structfield>wait_event_type</structfield> and <structfield>wait_event</structfield>.
        </para>
       </listitem>
 
@@ -4456,14 +5986,14 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         In <link
-        linkend="functions-formatting-table"><function>to_char()</></>,
+        linkend="functions-formatting-table"><function>to_char()</function></link>,
         do not count a minus sign (when needed) as part of the field
         width for time-related fields (Bruce Momjian)
        </para>
 
        <para>
-        For example, <literal>to_char('-4 years'::interval, 'YY')</>
-        now returns <literal>-04</>, rather than <literal>-4</>.
+        For example, <literal>to_char('-4 years'::interval, 'YY')</literal>
+        now returns <literal>-04</literal>, rather than <literal>-4</literal>.
        </para>
       </listitem>
 
@@ -4473,18 +6003,18 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 -->
        <para>
         Make <link
-        linkend="functions-datetime-table"><function>extract()</></> behave
+        linkend="functions-datetime-table"><function>extract()</function></link> behave
         more reasonably with infinite inputs (Vitaly Burovoy)
        </para>
 
        <para>
-        Historically the <function>extract()</> function just returned
+        Historically the <function>extract()</function> function just returned
         zero given an infinite timestamp, regardless of the given
         field name.  Make it return <literal>infinity</literal>
         or <literal>-infinity</literal> as appropriate when the
         requested field is one that is monotonically increasing (e.g,
-        <literal>year</>, <literal>epoch</>), or <literal>NULL</> when
-        it is not (e.g., <literal>day</>, <literal>hour</>).  Also,
+        <literal>year</literal>, <literal>epoch</literal>), or <literal>NULL</literal> when
+        it is not (e.g., <literal>day</literal>, <literal>hour</literal>).  Also,
         throw the expected error for bad field names.
        </para>
       </listitem>
@@ -4495,9 +6025,9 @@ Branch: REL9_1_STABLE [22cf97635] 2016-10-19 17:57:06 -0400
 This commit is also listed under libpq and psql
 -->
        <para>
-        Remove PL/pgSQL's <quote>feature</> that suppressed the
-        innermost line of <literal>CONTEXT</> for messages emitted by
-        <command>RAISE</> commands (Pavel Stehule)
+        Remove PL/pgSQL's <quote>feature</quote> that suppressed the
+        innermost line of <literal>CONTEXT</literal> for messages emitted by
+        <command>RAISE</command> commands (Pavel Stehule)
        </para>
 
        <para>
@@ -4512,13 +6042,13 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Fix the default text search parser to allow leading digits
-        in <literal>email</> and <literal>host</> tokens (Artur Zakirov)
+        in <literal>email</literal> and <literal>host</literal> tokens (Artur Zakirov)
        </para>
 
        <para>
         In most cases this will result in few changes in the parsing of
         text.  But if you have data where such addresses occur frequently,
-        it may be worth rebuilding dependent <type>tsvector</> columns
+        it may be worth rebuilding dependent <type>tsvector</type> columns
         and indexes so that addresses of this form will be found properly
         by text searches.
        </para>
@@ -4530,8 +6060,8 @@ This commit is also listed under libpq and psql
 2016-03-16 [9a206d063] Improve script generating unaccent rules
 -->
        <para>
-        Extend <link linkend="unaccent"><filename>contrib/unaccent</></>'s
-        standard <filename>unaccent.rules</> file to handle all diacritics
+        Extend <link linkend="unaccent"><filename>contrib/unaccent</filename></link>'s
+        standard <filename>unaccent.rules</filename> file to handle all diacritics
         known to Unicode, and to expand ligatures correctly (Thomas Munro,
         L&eacute;onard Benedetti)
        </para>
@@ -4540,7 +6070,7 @@ This commit is also listed under libpq and psql
         The previous version neglected to convert some less-common letters
         with diacritic marks.  Also, ligatures are now expanded into
         separate letters.  Installations that use this rules file may wish
-        to rebuild <type>tsvector</> columns and indexes that depend on the
+        to rebuild <type>tsvector</type> columns and indexes that depend on the
         result.
        </para>
       </listitem>
@@ -4551,15 +6081,15 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Remove the long-deprecated
-        <literal>CREATEUSER</>/<literal>NOCREATEUSER</> options from
-        <command>CREATE ROLE</> and allied commands (Tom Lane)
+        <literal>CREATEUSER</literal>/<literal>NOCREATEUSER</literal> options from
+        <command>CREATE ROLE</command> and allied commands (Tom Lane)
        </para>
 
        <para>
-        <literal>CREATEUSER</> actually meant <literal>SUPERUSER</>,
+        <literal>CREATEUSER</literal> actually meant <literal>SUPERUSER</literal>,
         for ancient backwards-compatibility reasons.  This has been a
         constant source of confusion for people who (reasonably) expect
-        it to mean <literal>CREATEROLE</>.  It has been deprecated for
+        it to mean <literal>CREATEROLE</literal>.  It has been deprecated for
         ten years now, so fix the problem by removing it.
        </para>
       </listitem>
@@ -4571,13 +6101,13 @@ This commit is also listed under libpq and psql
 2016-05-08 [7df974ee0] Disallow superuser names starting with 'pg_' in initdb
 -->
        <para>
-        Treat role names beginning with <literal>pg_</> as reserved
+        Treat role names beginning with <literal>pg_</literal> as reserved
         (Stephen Frost)
        </para>
 
        <para>
         User creation of such role names is now disallowed.  This prevents
-        conflicts with built-in roles created by <application>initdb</>.
+        conflicts with built-in roles created by <application>initdb</application>.
        </para>
       </listitem>
 
@@ -4587,16 +6117,16 @@ This commit is also listed under libpq and psql
 -->
        <para>
         Change a column name in the
-        <structname>information_schema</>.<structname>routines</>
-        view from <structfield>result_cast_character_set_name</>
-        to <structfield>result_cast_char_set_name</> (Cl&eacute;ment
+        <structname>information_schema</structname>.<structname>routines</structname>
+        view from <structfield>result_cast_character_set_name</structfield>
+        to <structfield>result_cast_char_set_name</structfield> (Cl&eacute;ment
         Pr&eacute;vost)
        </para>
 
        <para>
         The SQL:2011 standard specifies the longer name, but that appears
         to be a mistake, because adjacent column names use the shorter
-        style, as do other <structname>information_schema</> views.
+        style, as do other <structname>information_schema</structname> views.
        </para>
       </listitem>
 
@@ -4605,7 +6135,7 @@ This commit is also listed under libpq and psql
 2015-12-08 [d5563d7df] psql: Support multiple -c and -f options, and allow mixi
 -->
        <para>
-        <application>psql</>'s <option>-c</option> option no longer implies
+        <application>psql</application>'s <option>-c</option> option no longer implies
         <option>--no-psqlrc</option>
         (Pavel Stehule, Catalin Iacob)
        </para>
@@ -4614,7 +6144,7 @@ This commit is also listed under libpq and psql
         Write <option>--no-psqlrc</option> (or its
         abbreviation <option>-X</option>) explicitly to obtain the old
         behavior.  Scripts so modified will still work with old
-        versions of <application>psql</>.
+        versions of <application>psql</application>.
        </para>
       </listitem>
 
@@ -4623,7 +6153,7 @@ This commit is also listed under libpq and psql
 2015-07-02 [5671aaca8] Improve pg_restore's -t switch to match all types of rel
 -->
        <para>
-        Improve <application>pg_restore</>'s <option>-t</option> option to
+        Improve <application>pg_restore</application>'s <option>-t</option> option to
         match all types of relations, not only plain tables (Craig Ringer)
        </para>
       </listitem>
@@ -4633,17 +6163,17 @@ This commit is also listed under libpq and psql
 2016-02-12 [59a884e98] Change delimiter used for display of NextXID
 -->
        <para>
-        Change the display format used for <literal>NextXID</> in
-        <application>pg_controldata</> and related places (Joe Conway,
+        Change the display format used for <literal>NextXID</literal> in
+        <application>pg_controldata</application> and related places (Joe Conway,
         Bruce Momjian)
        </para>
 
        <para>
         Display epoch-and-transaction-ID values in the format
-        <replaceable>number</><literal>:</><replaceable>number</>.
+        <replaceable>number</replaceable><literal>:</literal><replaceable>number</replaceable>.
         The previous format
-        <replaceable>number</><literal>/</><replaceable>number</> was
-        confusingly similar to that used for <acronym>LSN</>s.
+        <replaceable>number</replaceable><literal>/</literal><replaceable>number</replaceable> was
+        confusingly similar to that used for <acronym>LSN</acronym>s.
        </para>
       </listitem>
 
@@ -4661,8 +6191,8 @@ and many others in the same vein
         Many of the standard extensions have been updated to allow their
         functions to be executed within parallel query worker processes.
         These changes will not take effect in
-        databases <application>pg_upgrade</>'d from prior versions unless
-        you apply <command>ALTER EXTENSION UPDATE</> to each such extension
+        databases <application>pg_upgrade</application>'d from prior versions unless
+        you apply <command>ALTER EXTENSION UPDATE</command> to each such extension
         (in each database of a cluster).
        </para>
       </listitem>
@@ -4723,7 +6253,7 @@ and many others in the same vein
        </para>
 
        <para>
-        With 9.6, <productname>PostgreSQL</> introduces initial support
+        With 9.6, <productname>PostgreSQL</productname> introduces initial support
         for parallel execution of large queries.  Only strictly read-only
         queries where the driving table is accessed via a sequential scan
         can be parallelized.  Hash joins and nested loops can be performed
@@ -4735,12 +6265,12 @@ and many others in the same vein
        <para>
         Parallel query execution is not (yet) enabled by default.
         To allow it, set the new configuration
-        parameter <xref linkend="guc-max-parallel-workers-per-gather"> to a
+        parameter <xref linkend="guc-max-parallel-workers-per-gather"/> to a
         value larger than zero.  Additional control over use of parallelism
         is available through other new configuration parameters
-        <xref linkend="guc-force-parallel-mode">,
-        <xref linkend="guc-parallel-setup-cost">, <xref
-        linkend="guc-parallel-tuple-cost">, and
+        <xref linkend="guc-force-parallel-mode"/>,
+        <xref linkend="guc-parallel-setup-cost"/>, <xref
+        linkend="guc-parallel-tuple-cost"/>, and
         <literal>min_parallel_relation_size</literal>.
        </para>
       </listitem>
@@ -4769,8 +6299,8 @@ and many others in the same vein
 2015-09-02 [30bb26b5e] Allow usage of huge maintenance_work_mem for GIN build.
 -->
        <para>
-        Allow <link linkend="GIN"><acronym>GIN</></> index builds to
-        make effective use of <xref linkend="guc-maintenance-work-mem">
+        Allow <link linkend="gin"><acronym>GIN</acronym></link> index builds to
+        make effective use of <xref linkend="guc-maintenance-work-mem"/>
         settings larger than 1 GB (Robert Abraham, Teodor Sigaev)
        </para>
       </listitem>
@@ -4797,7 +6327,7 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-admin-index"><function>gin_clean_pending_list()</></>
+        linkend="functions-admin-index"><function>gin_clean_pending_list()</function></link>
         function to allow manual invocation of pending-list cleanup for a
         GIN index (Jeff Janes)
        </para>
@@ -4815,7 +6345,7 @@ and many others in the same vein
 -->
        <para>
         Improve handling of dead index tuples in <link
-        linkend="GiST">GiST</> indexes (Anastasia Lubennikova)
+        linkend="gist">GiST</link> indexes (Anastasia Lubennikova)
        </para>
 
        <para>
@@ -4831,8 +6361,8 @@ and many others in the same vein
 2016-03-30 [acdf2a8b3] Introduce SP-GiST operator class over box.
 -->
        <para>
-        Add an <link linkend="SPGiST">SP-GiST</link> operator class for
-        type <type>box</> (Alexander Lebedev)
+        Add an <link linkend="spgist">SP-GiST</link> operator class for
+        type <type>box</type> (Alexander Lebedev)
        </para>
       </listitem>
 
@@ -4858,10 +6388,10 @@ and many others in the same vein
        </para>
 
        <para>
-        The new approach makes better use of the <acronym>CPU</> cache
+        The new approach makes better use of the <acronym>CPU</acronym> cache
         for typical cache sizes and data volumes.  Where necessary,
         the behavior can be adjusted via the new configuration parameter
-        <xref linkend="guc-replacement-sort-tuples">.
+        <literal>replacement_sort_tuples</literal>.
        </para>
       </listitem>
 
@@ -4883,17 +6413,17 @@ and many others in the same vein
 2016-02-17 [f1f5ec1ef] Reuse abbreviated keys in ordered [set] aggregates.
 -->
        <para>
-        Speed up sorting of <type>uuid</>, <type>bytea</>, and
-        <type>char(n)</> fields by using <quote>abbreviated</> keys
+        Speed up sorting of <type>uuid</type>, <type>bytea</type>, and
+        <type>char(n)</type> fields by using <quote>abbreviated</quote> keys
         (Peter Geoghegan)
        </para>
 
        <para>
         Support for abbreviated keys has also been
         added to the non-default operator classes <link
-        linkend="indexes-opclass"><literal>text_pattern_ops</></>,
-        <literal>varchar_pattern_ops</>, and
-        <literal>bpchar_pattern_ops</>.  Processing of ordered-set
+        linkend="indexes-opclass"><literal>text_pattern_ops</literal></link>,
+        <literal>varchar_pattern_ops</literal>, and
+        <literal>bpchar_pattern_ops</literal>.  Processing of ordered-set
         aggregates can also now exploit abbreviated keys.
        </para>
       </listitem>
@@ -4903,8 +6433,8 @@ and many others in the same vein
 2015-12-16 [b648b7034] Speed up CREATE INDEX CONCURRENTLY's TID sort.
 -->
        <para>
-        Speed up <command>CREATE INDEX CONCURRENTLY</> by treating
-        <acronym>TID</>s as 64-bit integers during sorting (Peter
+        Speed up <command>CREATE INDEX CONCURRENTLY</command> by treating
+        <acronym>TID</acronym>s as 64-bit integers during sorting (Peter
         Geoghegan)
        </para>
       </listitem>
@@ -4924,7 +6454,7 @@ and many others in the same vein
 2015-09-03 [4aec49899] Assorted code review for recent ProcArrayLock patch.
 -->
        <para>
-        Reduce contention for the <literal>ProcArrayLock</> (Amit Kapila,
+        Reduce contention for the <literal>ProcArrayLock</literal> (Amit Kapila,
         Robert Haas)
        </para>
       </listitem>
@@ -4955,7 +6485,7 @@ and many others in the same vein
 -->
        <para>
         Use atomic operations, rather than a spinlock, to protect an
-        <literal>LWLock</>'s wait queue (Andres Freund)
+        <literal>LWLock</literal>'s wait queue (Andres Freund)
        </para>
       </listitem>
 
@@ -4965,7 +6495,7 @@ and many others in the same vein
 -->
        <para>
         Partition the shared hash table freelist to reduce contention on
-        multi-<acronym>CPU</>-socket servers (Aleksander Alekseev)
+        multi-<acronym>CPU</acronym>-socket servers (Aleksander Alekseev)
        </para>
       </listitem>
 
@@ -5001,14 +6531,14 @@ and many others in the same vein
 2016-04-04 [391159e03] Partially revert commit 3d3bf62f30200500637b24fdb7b992a9
 -->
        <para>
-        Improve <command>ANALYZE</>'s estimates for columns with many nulls
+        Improve <command>ANALYZE</command>'s estimates for columns with many nulls
         (Tomas Vondra, Alex Shulgin)
        </para>
 
        <para>
-        Previously <command>ANALYZE</> tended to underestimate the number
-        of non-<literal>NULL</> distinct values in a column with many
-        <literal>NULL</>s, and was also inaccurate in computing the
+        Previously <command>ANALYZE</command> tended to underestimate the number
+        of non-<literal>NULL</literal> distinct values in a column with many
+        <literal>NULL</literal>s, and was also inaccurate in computing the
         most-common values.
        </para>
       </listitem>
@@ -5035,13 +6565,13 @@ and many others in the same vein
        </para>
 
        <para>
-        If a table <literal>t</> has a foreign key restriction, say
-        <literal>(a,b) REFERENCES r (x,y)</>, then a <literal>WHERE</>
-        condition such as <literal>t.a = r.x AND t.b = r.y</> cannot
-        select more than one <literal>r</> row per <literal>t</> row.
-        The planner formerly considered these <literal>AND</> conditions
+        If a table <literal>t</literal> has a foreign key restriction, say
+        <literal>(a,b) REFERENCES r (x,y)</literal>, then a <literal>WHERE</literal>
+        condition such as <literal>t.a = r.x AND t.b = r.y</literal> cannot
+        select more than one <literal>r</literal> row per <literal>t</literal> row.
+        The planner formerly considered these <literal>AND</literal> conditions
         to be independent and would often drastically misestimate
-        selectivity as a result.  Now it compares the <literal>WHERE</>
+        selectivity as a result.  Now it compares the <literal>WHERE</literal>
         conditions to applicable foreign key constraints and produces
         better estimates.
        </para>
@@ -5052,7 +6582,7 @@ and many others in the same vein
     </sect4>
 
     <sect4>
-     <title><command>VACUUM</></title>
+     <title><command>VACUUM</command></title>
 
      <itemizedlist>
 
@@ -5082,7 +6612,7 @@ and many others in the same vein
 
        <para>
         If necessary, vacuum can be forced to process all-frozen
-        pages using the new <literal>DISABLE_PAGE_SKIPPING</> option.
+        pages using the new <literal>DISABLE_PAGE_SKIPPING</literal> option.
         Normally this should never be needed, but it might help in
         recovering from visibility-map corruption.
        </para>
@@ -5093,7 +6623,7 @@ and many others in the same vein
 2015-12-30 [e84290823] Avoid useless truncation attempts during VACUUM.
 -->
        <para>
-        Avoid useless heap-truncation attempts during <command>VACUUM</>
+        Avoid useless heap-truncation attempts during <command>VACUUM</command>
         (Jeff Janes, Tom Lane)
        </para>
 
@@ -5122,19 +6652,19 @@ and many others in the same vein
 2016-08-07 [9ee1cf04a] Fix TOAST access failure in RETURNING queries.
 -->
        <para>
-        Allow old <acronym>MVCC</> snapshots to be invalidated after a
+        Allow old <acronym>MVCC</acronym> snapshots to be invalidated after a
         configurable timeout (Kevin Grittner)
        </para>
 
        <para>
         Normally, deleted tuples cannot be physically removed by
-        vacuuming until the last transaction that could <quote>see</>
+        vacuuming until the last transaction that could <quote>see</quote>
         them is gone.  A transaction that stays open for a long
         time can thus cause considerable table bloat because
         space cannot be recycled.  This feature allows setting
         a time-based limit, via the new configuration parameter
-        <xref linkend="guc-old-snapshot-threshold">, on how long an
-        <acronym>MVCC</> snapshot is guaranteed to be valid.  After that,
+        <xref linkend="guc-old-snapshot-threshold"/>, on how long an
+        <acronym>MVCC</acronym> snapshot is guaranteed to be valid.  After that,
         dead tuples are candidates for removal.  A transaction using an
         outdated snapshot will get an error if it attempts to read a page
         that potentially could have contained such data.
@@ -5146,12 +6676,12 @@ and many others in the same vein
 2016-02-11 [d4c3a156c] Remove GROUP BY columns that are functionally dependent
 -->
        <para>
-        Ignore <literal>GROUP BY</> columns that are
+        Ignore <literal>GROUP BY</literal> columns that are
         functionally dependent on other columns (David Rowley)
        </para>
 
        <para>
-        If a <literal>GROUP BY</> clause includes all columns of a
+        If a <literal>GROUP BY</literal> clause includes all columns of a
         non-deferred primary key, as well as other columns of the same
         table, those other columns are redundant and can be dropped
         from the grouping.  This saves computation in many common cases.
@@ -5164,17 +6694,17 @@ and many others in the same vein
 -->
        <para>
         Allow use of an <link linkend="indexes-index-only-scans">index-only
-        scan</link> on a partial index when the index's <literal>WHERE</>
+        scan</link> on a partial index when the index's <literal>WHERE</literal>
         clause references columns that are not indexed (Tomas Vondra,
         Kyotaro Horiguchi)
        </para>
 
        <para>
         For example, an index defined by <command>CREATE INDEX tidx_partial
-        ON t(b) WHERE a &gt; 0</> can now be used for an index-only scan by
-        a query that specifies <literal>WHERE a &gt; 0</> and does not
-        otherwise use <literal>a</>.  Previously this was disallowed
-        because <literal>a</> is not listed as an index column.
+        ON t(b) WHERE a &gt; 0</command> can now be used for an index-only scan by
+        a query that specifies <literal>WHERE a &gt; 0</literal> and does not
+        otherwise use <literal>a</literal>.  Previously this was disallowed
+        because <literal>a</literal> is not listed as an index column.
        </para>
 
       </listitem>
@@ -5214,7 +6744,7 @@ and many others in the same vein
        </para>
 
        <para>
-        <productname>PostgreSQL</> writes data to the kernel's disk cache,
+        <productname>PostgreSQL</productname> writes data to the kernel's disk cache,
         from where it will be flushed to physical storage in due time.
         Many operating systems are not smart about managing this and allow
         large amounts of dirty data to accumulate before deciding to flush
@@ -5225,21 +6755,21 @@ and many others in the same vein
        </para>
 
        <para>
-        On Linux, <function>sync_file_range()</> is used for this purpose,
+        On Linux, <function>sync_file_range()</function> is used for this purpose,
         and the feature is on by default on Linux because that function has
         few downsides.  This flushing capability is also available on other
-        platforms if they have <function>msync()</>
-        or <function>posix_fadvise()</>, but those interfaces have some
+        platforms if they have <function>msync()</function>
+        or <function>posix_fadvise()</function>, but those interfaces have some
         undesirable side-effects so the feature is disabled by default on
         non-Linux platforms.
        </para>
 
        <para>
         The new configuration parameters <xref
-        linkend="guc-backend-flush-after">, <xref
-        linkend="guc-bgwriter-flush-after">, <xref
-        linkend="guc-checkpoint-flush-after">, and <xref
-        linkend="guc-wal-writer-flush-after"> control this behavior.
+        linkend="guc-backend-flush-after"/>, <xref
+        linkend="guc-bgwriter-flush-after"/>, <xref
+        linkend="guc-checkpoint-flush-after"/>, and <xref
+        linkend="guc-wal-writer-flush-after"/> control this behavior.
        </para>
       </listitem>
 
@@ -5254,7 +6784,7 @@ and many others in the same vein
        </para>
 
        <para>
-        For example, <command>SELECT AVG(x), VARIANCE(x) FROM tab</> can use
+        For example, <command>SELECT AVG(x), VARIANCE(x) FROM tab</command> can use
         a single per-row computation for both aggregates.
        </para>
       </listitem>
@@ -5265,7 +6795,7 @@ and many others in the same vein
 -->
        <para>
         Speed up visibility tests for recently-created tuples by checking
-        the current transaction's snapshot, not <structname>pg_clog</>, to
+        the current transaction's snapshot, not <structname>pg_clog</structname>, to
         decide if the source transaction should be considered committed
         (Jeff Janes, Tom Lane)
        </para>
@@ -5291,9 +6821,9 @@ and many others in the same vein
        </para>
 
        <para>
-        Two-phase commit information is now written only to <acronym>WAL</>
-        during <command>PREPARE TRANSACTION</>, and will be read back from
-        <acronym>WAL</> during <command>COMMIT PREPARED</> if that happens
+        Two-phase commit information is now written only to <acronym>WAL</acronym>
+        during <command>PREPARE TRANSACTION</command>, and will be read back from
+        <acronym>WAL</acronym> during <command>COMMIT PREPARED</command> if that happens
         soon thereafter.  A separate state file is created only if the
         pending transaction does not get committed or aborted by the time
         of the next checkpoint.
@@ -5324,8 +6854,8 @@ and many others in the same vein
 2016-02-06 [aa2387e2f] Improve speed of timestamp/time/date output functions.
 -->
        <para>
-        Improve speed of the output functions for <type>timestamp</>,
-        <type>time</>, and <type>date</> data types (David Rowley,
+        Improve speed of the output functions for <type>timestamp</type>,
+        <type>time</type>, and <type>date</type> data types (David Rowley,
         Andres Freund)
        </para>
       </listitem>
@@ -5336,7 +6866,7 @@ and many others in the same vein
 -->
        <para>
         Avoid some unnecessary cancellations of hot-standby queries
-        during replay of actions that take <literal>AccessExclusive</>
+        during replay of actions that take <literal>AccessExclusive</literal>
         locks (Jeff Janes)
        </para>
       </listitem>
@@ -5370,8 +6900,8 @@ and many others in the same vein
 2015-07-05 [6c82d8d1f] Further reduce overhead for passing plpgsql variables to
 -->
        <para>
-        Speed up expression evaluation in <application>PL/pgSQL</> by
-        keeping <literal>ParamListInfo</> entries for simple variables
+        Speed up expression evaluation in <application>PL/pgSQL</application> by
+        keeping <literal>ParamListInfo</literal> entries for simple variables
         valid at all times (Tom Lane)
        </para>
       </listitem>
@@ -5381,7 +6911,7 @@ and many others in the same vein
 2015-07-06 [4f33621f3] Don't set SO_SNDBUF on recent Windows versions that have
 -->
        <para>
-        Avoid reducing the <literal>SO_SNDBUF</> setting below its default
+        Avoid reducing the <literal>SO_SNDBUF</literal> setting below its default
         on recent Windows versions (Chen Huajun)
        </para>
       </listitem>
@@ -5391,7 +6921,7 @@ and many others in the same vein
 2016-08-17 [9b33c7e80] Disable update_process_title by default on Windows
 -->
        <para>
-        Disable <xref linkend="guc-update-process-title"> by default on
+        Disable <xref linkend="guc-update-process-title"/> by default on
         Windows (Takayuki Tsunakawa)
        </para>
 
@@ -5417,8 +6947,8 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="pg-stat-progress-vacuum-view"><structname>pg_stat_progress_vacuum</></link>
-        system view to provide progress reporting for <command>VACUUM</>
+        linkend="pg-stat-progress-vacuum-view"><structname>pg_stat_progress_vacuum</structname></link>
+        system view to provide progress reporting for <command>VACUUM</command>
         operations (Amit Langote, Robert Haas, Vinayak Pokale, Rahila Syed)
        </para>
       </listitem>
@@ -5429,11 +6959,11 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-controldata"><function>pg_control_system()</></>,
-        <function>pg_control_checkpoint()</>,
-        <function>pg_control_recovery()</>, and
-        <function>pg_control_init()</> functions to expose fields of
-        <filename>pg_control</> to <acronym>SQL</> (Joe Conway, Michael
+        linkend="functions-controldata"><function>pg_control_system()</function></link>,
+        <function>pg_control_checkpoint()</function>,
+        <function>pg_control_recovery()</function>, and
+        <function>pg_control_init()</function> functions to expose fields of
+        <filename>pg_control</filename> to <acronym>SQL</acronym> (Joe Conway, Michael
         Paquier)
        </para>
       </listitem>
@@ -5443,15 +6973,15 @@ and many others in the same vein
 2016-02-17 [a5c43b886] Add new system view, pg_config
 -->
        <para>
-        Add <link linkend="view-pg-config"><structname>pg_config</></link>
+        Add <link linkend="view-pg-config"><structname>pg_config</structname></link>
         system view (Joe Conway)
        </para>
 
        <para>
         This view exposes the same information available from
-        the <application>pg_config</> command-line utility,
+        the <application>pg_config</application> command-line utility,
         namely assorted compile-time configuration information for
-        <productname>PostgreSQL</>.
+        <productname>PostgreSQL</productname>.
        </para>
       </listitem>
 
@@ -5460,8 +6990,8 @@ and many others in the same vein
 2015-08-10 [3f811c2d6] Add confirmed_flush column to pg_replication_slots.
 -->
        <para>
-        Add a <structfield>confirmed_flush_lsn</> column to the <link
-        linkend="view-pg-replication-slots"><structname>pg_replication_slots</></link>
+        Add a <structfield>confirmed_flush_lsn</structfield> column to the <link
+        linkend="view-pg-replication-slots"><structname>pg_replication_slots</structname></link>
         system view (Marko Tiikkaja)
        </para>
       </listitem>
@@ -5474,9 +7004,9 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="pg-stat-wal-receiver-view"><structname>pg_stat_wal_receiver</></link>
+        linkend="pg-stat-wal-receiver-view"><structname>pg_stat_wal_receiver</structname></link>
         system view to provide information about the state of a hot-standby
-        server's <acronym>WAL</> receiver process (Michael Paquier)
+        server's <acronym>WAL</acronym> receiver process (Michael Paquier)
        </para>
       </listitem>
 
@@ -5486,7 +7016,7 @@ and many others in the same vein
 -->
        <para>
         Add <link
-        linkend="functions-info-session-table"><function>pg_blocking_pids()</></>
+        linkend="functions-info-session-table"><function>pg_blocking_pids()</function></link>
         function to reliably identify which sessions block which others
         (Tom Lane)
        </para>
@@ -5495,7 +7025,7 @@ and many others in the same vein
         This function returns an array of the process IDs of any
         sessions that are blocking the session with the given process ID.
         Historically users have obtained such information using a self-join
-        on the <structname>pg_locks</> view.  However, it is unreasonably
+        on the <structname>pg_locks</structname> view.  However, it is unreasonably
         tedious to do it that way with any modicum of correctness, and
         the addition of parallel queries has made the old approach entirely
         impractical, since locks might be held or awaited by child worker
@@ -5509,7 +7039,7 @@ and many others in the same vein
 -->
        <para>
         Add function <link
-        linkend="functions-admin-backup-table"><function>pg_current_xlog_flush_location()</></>
+        linkend="functions-admin-backup-table"><function>pg_current_xlog_flush_location()</function></link>
         to expose the current transaction log flush location (Tomas Vondra)
        </para>
       </listitem>
@@ -5520,8 +7050,8 @@ and many others in the same vein
 -->
        <para>
         Add function <link
-        linkend="functions-info-session-table"><function>pg_notification_queue_usage()</></>
-        to report how full the <command>NOTIFY</> queue is (Brendan Jurd)
+        linkend="functions-info-session-table"><function>pg_notification_queue_usage()</function></link>
+        to report how full the <command>NOTIFY</command> queue is (Brendan Jurd)
        </para>
       </listitem>
 
@@ -5537,7 +7067,7 @@ and many others in the same vein
         The memory usage dump that is output to the postmaster log during an
         out-of-memory failure now summarizes statistics when there are a
         large number of memory contexts, rather than possibly generating
-        a very large report.  There is also a <quote>grand total</>
+        a very large report.  There is also a <quote>grand total</quote>
         summary line now.
        </para>
       </listitem>
@@ -5547,7 +7077,7 @@ and many others in the same vein
     </sect4>
 
     <sect4>
-     <title><acronym>Authentication</></title>
+     <title><acronym>Authentication</acronym></title>
 
      <itemizedlist>
 
@@ -5556,15 +7086,15 @@ and many others in the same vein
 2016-04-08 [34c33a1f0] Add BSD authentication method.
 -->
        <para>
-        Add a <link linkend="auth-bsd"><acronym>BSD</> authentication
+        Add a <link linkend="auth-bsd"><acronym>BSD</acronym> authentication
         method</link> to allow use of
-        the <systemitem class="osname">BSD</> Authentication service for
-        <productname>PostgreSQL</> client authentication (Marisa Emerson)
+        the <systemitem class="osname">BSD</systemitem> Authentication service for
+        <productname>PostgreSQL</productname> client authentication (Marisa Emerson)
        </para>
 
        <para>
         BSD Authentication is currently only available on <systemitem
-        class="osname">OpenBSD</>.
+        class="osname">OpenBSD</systemitem>.
        </para>
       </listitem>
 
@@ -5573,9 +7103,9 @@ and many others in the same vein
 2016-04-08 [2f1d2b7a7] Set PAM_RHOST item for PAM authentication
 -->
        <para>
-        When using <link linkend="auth-pam"><acronym>PAM</>
+        When using <link linkend="auth-pam"><acronym>PAM</acronym>
         authentication</link>, provide the client IP address or host name
-        to <acronym>PAM</> modules via the <literal>PAM_RHOST</> item
+        to <acronym>PAM</acronym> modules via the <literal>PAM_RHOST</literal> item
         (Grzegorz Sampolski)
        </para>
       </listitem>
@@ -5591,7 +7121,7 @@ and many others in the same vein
 
        <para>
         All ordinarily-reachable password authentication failure cases
-        should now provide specific <literal>DETAIL</> fields in the log.
+        should now provide specific <literal>DETAIL</literal> fields in the log.
        </para>
       </listitem>
 
@@ -5600,7 +7130,7 @@ and many others in the same vein
 2015-09-06 [643beffe8] Support RADIUS passwords up to 128 characters
 -->
        <para>
-        Support <link linkend="auth-radius"><acronym>RADIUS</> passwords</>
+        Support <link linkend="auth-radius"><acronym>RADIUS</acronym> passwords</link>
         up to 128 characters long (Marko Tiikkaja)
        </para>
       </listitem>
@@ -5610,11 +7140,11 @@ and many others in the same vein
 2016-04-08 [35e2e357c] Add authentication parameters compat_realm and upn_usena
 -->
        <para>
-        Add new <link linkend="sspi-auth"><acronym>SSPI</>
+        Add new <link linkend="sspi-auth"><acronym>SSPI</acronym>
         authentication</link> parameters
-        <varname>compat_realm</> and <varname>upn_username</> to control
-        whether <productname>NetBIOS</> or <productname>Kerberos</>
-        realm names and user names are used during <acronym>SSPI</>
+        <varname>compat_realm</varname> and <varname>upn_username</varname> to control
+        whether <productname>NetBIOS</productname> or <productname>Kerberos</productname>
+        realm names and user names are used during <acronym>SSPI</acronym>
         authentication (Christian Ullrich)
        </para>
       </listitem>
@@ -5639,7 +7169,7 @@ and many others in the same vein
 
        <para>
         This behavior is controlled by the new configuration parameter
-        <xref linkend="guc-idle-in-transaction-session-timeout">.  It can
+        <xref linkend="guc-idle-in-transaction-session-timeout"/>.  It can
         be useful to prevent forgotten transactions from holding locks
         or preventing vacuum cleanup for too long.
        </para>
@@ -5651,7 +7181,7 @@ and many others in the same vein
 -->
        <para>
         Raise the maximum allowed value
-        of <xref linkend="guc-checkpoint-timeout"> to 24 hours (Simon Riggs)
+        of <xref linkend="guc-checkpoint-timeout"/> to 24 hours (Simon Riggs)
        </para>
       </listitem>
 
@@ -5660,7 +7190,7 @@ and many others in the same vein
 2015-09-08 [1aba62ec6] Allow per-tablespace effective_io_concurrency
 -->
        <para>
-        Allow <varname>effective_io_concurrency</> to be set per-tablespace
+        Allow <varname>effective_io_concurrency</varname> to be set per-tablespace
         to support cases where different tablespaces have different I/O
         characteristics (Julien Rouhaud)
        </para>
@@ -5672,7 +7202,7 @@ and many others in the same vein
 2015-09-07 [b1e1862a1] Coordinate log_line_prefix options 'm' and 'n' to share
 -->
        <para>
-        Add <xref linkend="guc-log-line-prefix"> option <literal>%n</> to
+        Add <xref linkend="guc-log-line-prefix"/> option <literal>%n</literal> to
         print the current time in Unix epoch form, with milliseconds (Tomas
         Vondra, Jeff Davis)
        </para>
@@ -5684,10 +7214,10 @@ and many others in the same vein
 2016-03-16 [fc201dfd9] Add syslog_split_messages parameter
 -->
        <para>
-        Add <xref linkend="guc-syslog-sequence-numbers"> and <xref
-        linkend="guc-syslog-split-messages"> configuration parameters
+        Add <xref linkend="guc-syslog-sequence-numbers"/> and <xref
+        linkend="guc-syslog-split-messages"/> configuration parameters
         to provide more control over the message format when logging to
-        <systemitem>syslog</> (Peter Eisentraut)
+        <systemitem>syslog</systemitem> (Peter Eisentraut)
        </para>
       </listitem>
 
@@ -5696,16 +7226,16 @@ and many others in the same vein
 2016-03-18 [b555ed810] Merge wal_level "archive" and "hot_standby" into new nam
 -->
        <para>
-        Merge the <literal>archive</> and <literal>hot_standby</> values
-        of the <xref linkend="guc-wal-level"> configuration parameter
-        into a single new value <literal>replica</> (Peter Eisentraut)
+        Merge the <literal>archive</literal> and <literal>hot_standby</literal> values
+        of the <xref linkend="guc-wal-level"/> configuration parameter
+        into a single new value <literal>replica</literal> (Peter Eisentraut)
        </para>
 
        <para>
         Making a distinction between these settings is no longer useful,
         and merging them is a step towards a planned future simplification
         of replication setup.  The old names are still accepted but are
-        converted to <literal>replica</> internally.
+        converted to <literal>replica</literal> internally.
        </para>
       </listitem>
 
@@ -5714,15 +7244,15 @@ and many others in the same vein
 2016-02-02 [7d17e683f] Add support for systemd service notifications
 -->
        <para>
-        Add configure option <option>--with-systemd</> to enable
-        calling <function>sd_notify()</> at server start and stop (Peter
+        Add configure option <option>--with-systemd</option> to enable
+        calling <function>sd_notify()</function> at server start and stop (Peter
         Eisentraut)
        </para>
 
        <para>
-        This allows the use of <application>systemd</> service units of
-        type <literal>notify</>, which greatly simplifies the management
-        of <productname>PostgreSQL</> under <application>systemd</>.
+        This allows the use of <application>systemd</application> service units of
+        type <literal>notify</literal>, which greatly simplifies the management
+        of <productname>PostgreSQL</productname> under <application>systemd</application>.
        </para>
       </listitem>
 
@@ -5731,17 +7261,17 @@ and many others in the same vein
 2016-03-19 [9a83564c5] Allow SSL server key file to have group read access if o
 -->
        <para>
-        Allow the server's <acronym>SSL</> key file to have group read
-        access if it is owned by <literal>root</> (Christoph Berg)
+        Allow the server's <acronym>SSL</acronym> key file to have group read
+        access if it is owned by <literal>root</literal> (Christoph Berg)
        </para>
 
        <para>
         Formerly, we insisted the key file be owned by the
-        user running the <productname>PostgreSQL</> server, but
+        user running the <productname>PostgreSQL</productname> server, but
         that is inconvenient on some systems (such as <systemitem
-        class="osname">Debian</>) that are configured to manage
+        class="osname">Debian</systemitem>) that are configured to manage
         certificates centrally.  Therefore, allow the case where the key
-        file is owned by <literal>root</> and has group read access.
+        file is owned by <literal>root</literal> and has group read access.
         It is up to the operating system administrator to ensure that
         the group does not include any untrusted users.
        </para>
@@ -5806,8 +7336,8 @@ XXX this is pending backpatch, may need to remove
 2016-04-26 [c6ff84b06] Emit invalidations to standby for transactions without x
 -->
        <para>
-        Ensure that invalidation messages are recorded in <acronym>WAL</>
-        even when issued by a transaction that has no <acronym>XID</>
+        Ensure that invalidation messages are recorded in <acronym>WAL</acronym>
+        even when issued by a transaction that has no <acronym>XID</acronym>
         assigned (Andres Freund)
        </para>
 
@@ -5823,7 +7353,7 @@ XXX this is pending backpatch, may need to remove
 2016-04-28 [e2c79e14d] Prevent multiple cleanup process for pending list in GIN
 -->
        <para>
-        Prevent multiple processes from trying to clean a <acronym>GIN</>
+        Prevent multiple processes from trying to clean a <acronym>GIN</acronym>
         index's pending list concurrently (Teodor Sigaev, Jeff Janes)
        </para>
 
@@ -5859,7 +7389,7 @@ XXX this is pending backpatch, may need to remove
        <para>
         The number of standby servers that must acknowledge a commit
         before it is considered complete is now configurable as part of
-        the <xref linkend="guc-synchronous-standby-names"> parameter.
+        the <xref linkend="guc-synchronous-standby-names"/> parameter.
        </para>
       </listitem>
 
@@ -5868,13 +7398,13 @@ XXX this is pending backpatch, may need to remove
 2016-03-29 [314cbfc5d] Add new replication mode synchronous_commit = 'remote_ap
 -->
        <para>
-        Add new setting <literal>remote_apply</> for configuration
-        parameter <xref linkend="guc-synchronous-commit"> (Thomas Munro)
+        Add new setting <literal>remote_apply</literal> for configuration
+        parameter <xref linkend="guc-synchronous-commit"/> (Thomas Munro)
        </para>
 
        <para>
         In this mode, the master waits for the transaction to be
-        <emphasis>applied</> on the standby server, not just written
+        <emphasis>applied</emphasis> on the standby server, not just written
         to disk.  That means that you can count on a transaction started
         on the standby to see all commits previously acknowledged by
         the master.
@@ -5889,14 +7419,14 @@ XXX this is pending backpatch, may need to remove
        <para>
         Add a feature to the replication
         protocol, and a corresponding option to <link
-        linkend="functions-replication-table"><function>pg_create_physical_replication_slot()</></>,
-        to allow reserving <acronym>WAL</> immediately when creating a
+        linkend="functions-replication-table"><function>pg_create_physical_replication_slot()</function></link>,
+        to allow reserving <acronym>WAL</acronym> immediately when creating a
         replication slot (Gurjeet Singh, Michael Paquier)
        </para>
 
        <para>
         This allows the creation of a replication slot to guarantee
-        that all the <acronym>WAL</> needed for a base backup will be
+        that all the <acronym>WAL</acronym> needed for a base backup will be
         available.
        </para>
       </listitem>
@@ -5907,13 +7437,13 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a <option>--slot</option> option to
-        <link linkend="app-pgbasebackup"><application>pg_basebackup</></>
+        <link linkend="app-pgbasebackup"><application>pg_basebackup</application></link>
         (Peter Eisentraut)
        </para>
 
        <para>
-        This lets <application>pg_basebackup</> use a replication
-        slot defined for <acronym>WAL</> streaming.  After the base
+        This lets <application>pg_basebackup</application> use a replication
+        slot defined for <acronym>WAL</acronym> streaming.  After the base
         backup completes, selecting the same slot for regular streaming
         replication allows seamless startup of the new standby server.
        </para>
@@ -5926,8 +7456,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Extend <link
-        linkend="functions-admin-backup-table"><function>pg_start_backup()</></>
-        and <function>pg_stop_backup()</> to support non-exclusive backups
+        linkend="functions-admin-backup-table"><function>pg_start_backup()</function></link>
+        and <function>pg_stop_backup()</function> to support non-exclusive backups
         (Magnus Hagander)
        </para>
       </listitem>
@@ -5947,14 +7477,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow functions that return sets of tuples to return simple
-        <literal>NULL</>s (Andrew Gierth, Tom Lane)
+        <literal>NULL</literal>s (Andrew Gierth, Tom Lane)
        </para>
 
        <para>
-        In the context of <literal>SELECT FROM function(...)</>, a function
+        In the context of <literal>SELECT FROM function(...)</literal>, a function
         that returned a set of composite values was previously not allowed
-        to return a plain <literal>NULL</> value as part of the set.
-        Now that is allowed and interpreted as a row of <literal>NULL</>s.
+        to return a plain <literal>NULL</literal> value as part of the set.
+        Now that is allowed and interpreted as a row of <literal>NULL</literal>s.
         This avoids corner-case errors with, for example, unnesting an
         array of composite values.
        </para>
@@ -5966,14 +7496,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Fully support array subscripts and field selections in the
-        target column list of an <command>INSERT</> with multiple
-        <literal>VALUES</> rows (Tom Lane)
+        target column list of an <command>INSERT</command> with multiple
+        <literal>VALUES</literal> rows (Tom Lane)
        </para>
 
        <para>
         Previously, such cases failed if the same target column was
         mentioned more than once, e.g., <literal>INSERT INTO tab (x[1],
-        x[2]) VALUES (...)</>.
+        x[2]) VALUES (...)</literal>.
        </para>
       </listitem>
 
@@ -5983,16 +7513,16 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [d543170f2] Don't split up SRFs when choosing to postpone SELECT out
 -->
        <para>
-        When appropriate, postpone evaluation of <command>SELECT</>
-        output expressions until after an <literal>ORDER BY</> sort
+        When appropriate, postpone evaluation of <command>SELECT</command>
+        output expressions until after an <literal>ORDER BY</literal> sort
         (Konstantin Knizhnik)
        </para>
 
        <para>
         This change ensures that volatile or expensive functions in the
         output list are executed in the order suggested by <literal>ORDER
-        BY</>, and that they are not evaluated more times than required
-        when there is a <literal>LIMIT</> clause.  Previously, these
+        BY</literal>, and that they are not evaluated more times than required
+        when there is a <literal>LIMIT</literal> clause.  Previously, these
         properties held if the ordering was performed by an index scan or
         pre-merge-join sort, but not if it was performed by a top-level
         sort.
@@ -6010,9 +7540,9 @@ XXX this is pending backpatch, may need to remove
        </para>
 
        <para>
-        This change allows command tags, e.g. <command>SELECT</>, to
+        This change allows command tags, e.g. <command>SELECT</command>, to
         correctly report tuple counts larger than 4 billion.  This also
-        applies to PL/pgSQL's <command>GET DIAGNOSTICS ... ROW_COUNT</>
+        applies to PL/pgSQL's <command>GET DIAGNOSTICS ... ROW_COUNT</command>
         command.
        </para>
       </listitem>
@@ -6023,17 +7553,17 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Avoid doing encoding conversions by converting through the
-        <literal>MULE_INTERNAL</> encoding (Tom Lane)
+        <literal>MULE_INTERNAL</literal> encoding (Tom Lane)
        </para>
 
        <para>
         Previously, many conversions for Cyrillic and Central
         European single-byte encodings were done by converting to a
-        related <literal>MULE_INTERNAL</> coding scheme and then to the
+        related <literal>MULE_INTERNAL</literal> coding scheme and then to the
         destination encoding.  Aside from being inefficient, this meant
         that when the conversion encountered an untranslatable character,
         the error message would confusingly complain about failure to
-        convert to or from <literal>MULE_INTERNAL</>, rather than the
+        convert to or from <literal>MULE_INTERNAL</literal>, rather than the
         user-visible encoding.
        </para>
       </listitem>
@@ -6052,7 +7582,7 @@ XXX this is pending backpatch, may need to remove
        <para>
         Previously, the foreign join pushdown infrastructure left the
         question of security entirely up to individual foreign data
-        wrappers, but that made it too easy for an <acronym>FDW</> to
+        wrappers, but that made it too easy for an <acronym>FDW</acronym> to
         inadvertently create subtle security holes.  So, make it the core
         code's job to determine which role ID will access each table,
         and do not attempt join pushdown unless the role is the same for
@@ -6074,13 +7604,13 @@ XXX this is pending backpatch, may need to remove
 2015-11-27 [92e38182d] COPY (INSERT/UPDATE/DELETE .. RETURNING ..)
 -->
        <para>
-        Allow <command>COPY</> to copy the output of an
-        <literal>INSERT</>/<literal>UPDATE</>/<literal>DELETE</>
-        ... <literal>RETURNING</> query (Marko Tiikkaja)
+        Allow <command>COPY</command> to copy the output of an
+        <literal>INSERT</literal>/<literal>UPDATE</literal>/<literal>DELETE</literal>
+        ... <literal>RETURNING</literal> query (Marko Tiikkaja)
        </para>
 
        <para>
-        Previously, an intermediate <acronym>CTE</> had to be written to
+        Previously, an intermediate <acronym>CTE</acronym> had to be written to
         get this result.
        </para>
       </listitem>
@@ -6090,16 +7620,16 @@ XXX this is pending backpatch, may need to remove
 2016-04-05 [f2fcad27d] Support ALTER THING .. DEPENDS ON EXTENSION
 -->
        <para>
-        Introduce <command>ALTER <replaceable>object</> DEPENDS ON
+        Introduce <command>ALTER <replaceable>object</replaceable> DEPENDS ON
         EXTENSION</command> (Abhijit Menon-Sen)
        </para>
 
        <para>
         This command allows a database object to be marked as depending
         on an extension, so that it will be dropped automatically if
-        the extension is dropped (without needing <literal>CASCADE</>).
+        the extension is dropped (without needing <literal>CASCADE</literal>).
         However, the object is not part of the extension, and thus will
-        be dumped separately by <application>pg_dump</>.
+        be dumped separately by <application>pg_dump</application>.
        </para>
       </listitem>
 
@@ -6108,7 +7638,7 @@ XXX this is pending backpatch, may need to remove
 2015-11-19 [bc4996e61] Make ALTER .. SET SCHEMA do nothing, instead of throwing
 -->
        <para>
-        Make <command>ALTER <replaceable>object</> SET SCHEMA</> do nothing
+        Make <command>ALTER <replaceable>object</replaceable> SET SCHEMA</command> do nothing
         when the object is already in the requested schema, rather than
         throwing an error as it historically has for most object types
         (Marti Raudsepp)
@@ -6132,8 +7662,8 @@ XXX this is pending backpatch, may need to remove
 2015-07-29 [2cd40adb8] Add IF NOT EXISTS processing to ALTER TABLE ADD COLUMN
 -->
        <para>
-        Add an <option>IF NOT EXISTS</> option to <command>ALTER TABLE
-        ADD COLUMN</> (Fabr&iacute;zio de Royes Mello)
+        Add an <option>IF NOT EXISTS</option> option to <command>ALTER TABLE
+        ADD COLUMN</command> (Fabr&iacute;zio de Royes Mello)
        </para>
       </listitem>
 
@@ -6143,7 +7673,7 @@ XXX this is pending backpatch, may need to remove
 2016-03-10 [fcb4bfddb] Reduce lock level for altering fillfactor
 -->
        <para>
-        Reduce the lock strength needed by <command>ALTER TABLE</>
+        Reduce the lock strength needed by <command>ALTER TABLE</command>
         when setting fillfactor and autovacuum-related relation options
         (Fabr&iacute;zio de Royes Mello, Simon Riggs)
        </para>
@@ -6155,7 +7685,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Introduce <link linkend="sql-create-access-method"><command>CREATE
-        ACCESS METHOD</></> to allow extensions to create index access
+        ACCESS METHOD</command></link> to allow extensions to create index access
         methods (Alexander Korotkov, Petr Jel&iacute;nek)
        </para>
       </listitem>
@@ -6165,7 +7695,7 @@ XXX this is pending backpatch, may need to remove
 2015-10-03 [b67aaf21e] Add CASCADE support for CREATE EXTENSION.
 -->
        <para>
-        Add a <literal>CASCADE</> option to <command>CREATE
+        Add a <literal>CASCADE</literal> option to <command>CREATE
         EXTENSION</command> to automatically create any extensions the
         requested one depends on (Petr Jel&iacute;nek)
        </para>
@@ -6176,7 +7706,7 @@ XXX this is pending backpatch, may need to remove
 2015-10-05 [b943f502b] Have CREATE TABLE LIKE add OID column if any LIKEd table
 -->
        <para>
-        Make <command>CREATE TABLE ... LIKE</> include an <type>OID</>
+        Make <command>CREATE TABLE ... LIKE</command> include an <type>OID</type>
         column if any source table has one (Bruce Momjian)
        </para>
       </listitem>
@@ -6186,14 +7716,14 @@ XXX this is pending backpatch, may need to remove
 2015-12-16 [f27a6b15e] Mark CHECK constraints declared NOT VALID valid if creat
 -->
        <para>
-        If a <literal>CHECK</> constraint is declared <literal>NOT VALID</>
+        If a <literal>CHECK</literal> constraint is declared <literal>NOT VALID</literal>
         in a table creation command, automatically mark it as valid
         (Amit Langote, Amul Sul)
        </para>
 
        <para>
         This is safe because the table has no existing rows.  This matches
-        the longstanding behavior of <literal>FOREIGN KEY</> constraints.
+        the longstanding behavior of <literal>FOREIGN KEY</literal> constraints.
        </para>
       </listitem>
 
@@ -6202,16 +7732,16 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [c94959d41] Fix DROP OPERATOR to reset oprcom/oprnegate links to the
 -->
        <para>
-        Fix <command>DROP OPERATOR</> to clear
-        <structname>pg_operator</>.<structfield>oprcom</> and
-        <structname>pg_operator</>.<structfield>oprnegate</> links to
+        Fix <command>DROP OPERATOR</command> to clear
+        <structname>pg_operator</structname>.<structfield>oprcom</structfield> and
+        <structname>pg_operator</structname>.<structfield>oprnegate</structfield> links to
         the dropped operator (Roma Sokolov)
        </para>
 
        <para>
         Formerly such links were left as-is, which could pose a problem
         in the somewhat unlikely event that the dropped operator's
-        <type>OID</> was reused for another operator.
+        <type>OID</type> was reused for another operator.
        </para>
       </listitem>
 
@@ -6220,13 +7750,13 @@ XXX this is pending backpatch, may need to remove
 2016-07-11 [4d042999f] Print a given subplan only once in EXPLAIN.
 -->
        <para>
-        Do not show the same subplan twice in <command>EXPLAIN</> output
+        Do not show the same subplan twice in <command>EXPLAIN</command> output
         (Tom Lane)
        </para>
 
        <para>
         In certain cases, typically involving SubPlan nodes in index
-        conditions, <command>EXPLAIN</> would print data for the same
+        conditions, <command>EXPLAIN</command> would print data for the same
         subplan twice.
        </para>
       </listitem>
@@ -6237,7 +7767,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Disallow creation of indexes on system columns, except for
-        <type>OID</> columns (David Rowley)
+        <type>OID</type> columns (David Rowley)
        </para>
 
        <para>
@@ -6271,8 +7801,8 @@ XXX this is pending backpatch, may need to remove
         checks that would throw an error if they were called by a
         non-superuser.  This forced the use of superuser roles for
         some relatively pedestrian tasks.  The hard-wired error checks
-        are now gone in favor of making <application>initdb</> revoke the
-        default public <literal>EXECUTE</> privilege on these functions.
+        are now gone in favor of making <application>initdb</application> revoke the
+        default public <literal>EXECUTE</literal> privilege on these functions.
         This allows installations to choose to grant usage of such
         functions to trusted roles that do not need all superuser
         privileges.
@@ -6290,7 +7820,7 @@ XXX this is pending backpatch, may need to remove
        </para>
 
        <para>
-        Currently the only such role is <literal>pg_signal_backend</>,
+        Currently the only such role is <literal>pg_signal_backend</literal>,
         but more are expected to be added in future.
        </para>
       </listitem>
@@ -6312,19 +7842,19 @@ XXX this is pending backpatch, may need to remove
 2016-06-27 [6734a1cac] Change predecence of phrase operator.
 -->
        <para>
-        Improve <link linkend="textsearch">full-text search</> to support
+        Improve <link linkend="textsearch">full-text search</link> to support
         searching for phrases, that is, lexemes appearing adjacent to each
         other in a specific order, or with a specified distance between
         them (Teodor Sigaev, Oleg Bartunov, Dmitry Ivanov)
        </para>
 
        <para>
-        A phrase-search query can be specified in <type>tsquery</>
-        input using the new operators <literal>&lt;-&gt;</> and
-        <literal>&lt;<replaceable>N</>&gt;</literal>.  The former means
+        A phrase-search query can be specified in <type>tsquery</type>
+        input using the new operators <literal>&lt;-&gt;</literal> and
+        <literal>&lt;<replaceable>N</replaceable>&gt;</literal>.  The former means
         that the lexemes before and after it must appear adjacent to
         each other in that order.  The latter means they must be exactly
-        <replaceable>N</> lexemes apart.
+        <replaceable>N</replaceable> lexemes apart.
        </para>
       </listitem>
 
@@ -6334,7 +7864,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow omitting one or both boundaries in an array slice specifier,
-        e.g. <literal>array_col[3:]</> (Yury Zhuravlev)
+        e.g. <literal>array_col[3:]</literal> (Yury Zhuravlev)
        </para>
 
        <para>
@@ -6355,19 +7885,19 @@ XXX this is pending backpatch, may need to remove
 
        <para>
         This change prevents unexpected out-of-range errors for
-        <type>timestamp with time zone</> values very close to the
-        implementation limits.  Previously, the <quote>same</> value might
-        be accepted or not depending on the <varname>timezone</> setting,
+        <type>timestamp with time zone</type> values very close to the
+        implementation limits.  Previously, the <quote>same</quote> value might
+        be accepted or not depending on the <varname>timezone</varname> setting,
         meaning that a dump and reload could fail on a value that had been
         accepted when presented.  Now the limits are enforced according
-        to the equivalent <acronym>UTC</> time, not local time, so as to
-        be independent of <varname>timezone</>.
+        to the equivalent <acronym>UTC</acronym> time, not local time, so as to
+        be independent of <varname>timezone</varname>.
        </para>
 
        <para>
-        Also, <productname>PostgreSQL</> is now more careful to detect
+        Also, <productname>PostgreSQL</productname> is now more careful to detect
         overflow in operations that compute new date or timestamp values,
-        such as <type>date</> <literal>+</> <type>integer</>.
+        such as <type>date</type> <literal>+</literal> <type>integer</type>.
        </para>
       </listitem>
 
@@ -6376,14 +7906,14 @@ XXX this is pending backpatch, may need to remove
 2016-03-30 [50861cd68] Improve portability of I/O behavior for the geometric ty
 -->
        <para>
-        For geometric data types, make sure <literal>infinity</> and
-        <literal>NaN</> component values are treated consistently during
+        For geometric data types, make sure <literal>infinity</literal> and
+        <literal>NaN</literal> component values are treated consistently during
         input and output (Tom Lane)
        </para>
 
        <para>
         Such values will now always print the same as they would in
-        a simple <type>float8</> column, and be accepted the same way
+        a simple <type>float8</type> column, and be accepted the same way
         on input.  Previously the behavior was platform-dependent.
        </para>
       </listitem>
@@ -6396,8 +7926,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Upgrade
-        the <link linkend="textsearch-ispell-dictionary"><literal>ispell</></>
-        dictionary type to handle modern <productname>Hunspell</> files and
+        the <link linkend="textsearch-ispell-dictionary"><literal>ispell</literal></link>
+        dictionary type to handle modern <productname>Hunspell</productname> files and
         support more languages (Artur Zakirov)
        </para>
       </listitem>
@@ -6408,7 +7938,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Implement look-behind constraints
-        in <link linkend="functions-posix-regexp">regular expressions</>
+        in <link linkend="functions-posix-regexp">regular expressions</link>
         (Tom Lane)
        </para>
 
@@ -6427,12 +7957,12 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In regular expressions, if an apparent three-digit octal escape
-        <literal>\</><replaceable>nnn</> would exceed 377 (255 decimal),
+        <literal>\</literal><replaceable>nnn</replaceable> would exceed 377 (255 decimal),
         assume it is a two-digit octal escape instead (Tom Lane)
        </para>
 
        <para>
-        This makes the behavior match current <application>Tcl</> releases.
+        This makes the behavior match current <application>Tcl</application> releases.
        </para>
       </listitem>
 
@@ -6441,8 +7971,8 @@ XXX this is pending backpatch, may need to remove
 2015-11-07 [c5e86ea93] Add "xid <> xid" and "xid <> int4" operators.
 -->
        <para>
-        Add transaction ID operators <type>xid</> <literal>&lt;&gt;</>
-        <type>xid</> and <type>xid</> <literal>&lt;&gt;</> <type>int4</>,
+        Add transaction ID operators <type>xid</type> <literal>&lt;&gt;</literal>
+        <type>xid</type> and <type>xid</type> <literal>&lt;&gt;</literal> <type>int4</type>,
         for consistency with the corresponding equality operators
         (Michael Paquier)
        </para>
@@ -6463,9 +7993,9 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add <link
-        linkend="functions-json-processing-table"><function>jsonb_insert()</></>
-        function to insert a new element into a <type>jsonb</> array,
-        or a not-previously-existing key into a <type>jsonb</> object
+        linkend="functions-json-processing-table"><function>jsonb_insert()</function></link>
+        function to insert a new element into a <type>jsonb</type> array,
+        or a not-previously-existing key into a <type>jsonb</type> object
         (Dmitry Dolgov)
        </para>
       </listitem>
@@ -6476,9 +8006,9 @@ XXX this is pending backpatch, may need to remove
 2016-05-05 [18a02ad2a] Fix corner-case loss of precision in numeric pow() calcu
 -->
        <para>
-        Improve the accuracy of the <function>ln()</>, <function>log()</>,
-        <function>exp()</>, and <function>pow()</> functions for type
-        <type>numeric</> (Dean Rasheed)
+        Improve the accuracy of the <function>ln()</function>, <function>log()</function>,
+        <function>exp()</function>, and <function>pow()</function> functions for type
+        <type>numeric</type> (Dean Rasheed)
        </para>
       </listitem>
 
@@ -6488,8 +8018,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a <link
-        linkend="functions-math-func-table"><function>scale(numeric)</></>
-        function to extract the display scale of a <type>numeric</> value
+        linkend="functions-math-func-table"><function>scale(numeric)</function></link>
+        function to extract the display scale of a <type>numeric</type> value
         (Marko Tiikkaja)
        </para>
       </listitem>
@@ -6504,8 +8034,8 @@ XXX this is pending backpatch, may need to remove
 
        <para>
         For example, <link
-        linkend="functions-math-trig-table"><function>sind()</></>
-        measures its argument in degrees, whereas <function>sin()</>
+        linkend="functions-math-trig-table"><function>sind()</function></link>
+        measures its argument in degrees, whereas <function>sin()</function>
         measures in radians.  These functions go to some lengths to
         deliver exact results for values where an exact result can be
         expected, for instance <literal>sind(30) = 0.5</literal>.
@@ -6517,15 +8047,15 @@ XXX this is pending backpatch, may need to remove
 2016-01-22 [fd5200c3d] Improve cross-platform consistency of Inf/NaN handling i
 -->
        <para>
-        Ensure that trigonometric functions handle <literal>infinity</>
-        and <literal>NaN</> inputs per the <acronym>POSIX</> standard
+        Ensure that trigonometric functions handle <literal>infinity</literal>
+        and <literal>NaN</literal> inputs per the <acronym>POSIX</acronym> standard
         (Dean Rasheed)
        </para>
 
        <para>
-        The <acronym>POSIX</> standard says that these functions should
-        return <literal>NaN</> for <literal>NaN</> input, and should throw
-        an error for out-of-range inputs including <literal>infinity</>.
+        The <acronym>POSIX</acronym> standard says that these functions should
+        return <literal>NaN</literal> for <literal>NaN</literal> input, and should throw
+        an error for out-of-range inputs including <literal>infinity</literal>.
         Previously our behavior varied across platforms.
        </para>
       </listitem>
@@ -6536,9 +8066,9 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Make <link
-        linkend="functions-datetime-table"><function>to_timestamp(float8)</></>
-        convert float <literal>infinity</> to
-        timestamp <literal>infinity</> (Vitaly Burovoy)
+        linkend="functions-datetime-table"><function>to_timestamp(float8)</function></link>
+        convert float <literal>infinity</literal> to
+        timestamp <literal>infinity</literal> (Vitaly Burovoy)
        </para>
 
        <para>
@@ -6552,15 +8082,15 @@ XXX this is pending backpatch, may need to remove
 2016-05-05 [0b9a23443] Rename tsvector delete() to ts_delete(), and filter() to
 -->
        <para>
-        Add new functions for <type>tsvector</> data (Stas Kelvich)
+        Add new functions for <type>tsvector</type> data (Stas Kelvich)
        </para>
 
        <para>
         The new functions are <link
-        linkend="textsearch-functions-table"><function>ts_delete()</></>,
-        <function>ts_filter()</>, <function>unnest()</>,
-        <function>tsvector_to_array()</>, <function>array_to_tsvector()</>,
-        and a variant of <function>setweight()</> that sets the weight
+        linkend="textsearch-functions-table"><function>ts_delete()</function></link>,
+        <function>ts_filter()</function>, <function>unnest()</function>,
+        <function>tsvector_to_array()</function>, <function>array_to_tsvector()</function>,
+        and a variant of <function>setweight()</function> that sets the weight
         only for specified lexeme(s).
        </para>
       </listitem>
@@ -6570,11 +8100,11 @@ XXX this is pending backpatch, may need to remove
 2015-09-17 [9acb9007d] Fix oversight in tsearch type check
 -->
        <para>
-        Allow <link linkend="textsearch-statistics"><function>ts_stat()</></>
-        and <link linkend="textsearch-update-triggers"><function>tsvector_update_trigger()</></>
+        Allow <link linkend="textsearch-statistics"><function>ts_stat()</function></link>
+        and <link linkend="textsearch-update-triggers"><function>tsvector_update_trigger()</function></link>
         to operate on values that are of types binary-compatible with the
         expected argument type, not just exactly that type; for example
-        allow <type>citext</> where <type>text</> is expected (Teodor
+        allow <type>citext</type> where <type>text</type> is expected (Teodor
         Sigaev)
        </para>
       </listitem>
@@ -6585,14 +8115,14 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add variadic functions <link
-        linkend="functions-comparison-func-table"><function>num_nulls()</></>
-        and <function>num_nonnulls()</> that count the number of their
+        linkend="functions-comparison-func-table"><function>num_nulls()</function></link>
+        and <function>num_nonnulls()</function> that count the number of their
         arguments that are null or non-null (Marko Tiikkaja)
        </para>
 
        <para>
-        An example usage is <literal>CHECK(num_nonnulls(a,b,c) = 1)</>
-        which asserts that exactly one of a,b,c is not <literal>NULL</>.
+        An example usage is <literal>CHECK(num_nonnulls(a,b,c) = 1)</literal>
+        which asserts that exactly one of a,b,c is not <literal>NULL</literal>.
         These functions can also be used to count the number of null or
         nonnull elements in an array.
        </para>
@@ -6604,8 +8134,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add function <link
-        linkend="functions-string-other"><function>parse_ident()</></>
-        to split a qualified, possibly quoted <acronym>SQL</> identifier
+        linkend="functions-string-other"><function>parse_ident()</function></link>
+        to split a qualified, possibly quoted <acronym>SQL</acronym> identifier
         into its parts (Pavel Stehule)
        </para>
       </listitem>
@@ -6616,15 +8146,15 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link
-        linkend="functions-formatting-table"><function>to_number()</></>,
-        interpret a <literal>V</> format code as dividing by 10 to the
-        power of the number of digits following <literal>V</> (Bruce
+        linkend="functions-formatting-table"><function>to_number()</function></link>,
+        interpret a <literal>V</literal> format code as dividing by 10 to the
+        power of the number of digits following <literal>V</literal> (Bruce
         Momjian)
        </para>
 
        <para>
         This makes it operate in an inverse fashion to
-        <function>to_char()</>.
+        <function>to_char()</function>.
        </para>
       </listitem>
 
@@ -6634,8 +8164,8 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Make the <link
-        linkend="functions-info-catalog-table"><function>to_reg*()</></>
-        functions accept type <type>text</> not <type>cstring</>
+        linkend="functions-info-catalog-table"><function>to_reg*()</function></link>
+        functions accept type <type>text</type> not <type>cstring</type>
         (Petr Korobeinikov)
        </para>
 
@@ -6651,16 +8181,16 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add <link
-        linkend="functions-admin-dbsize"><function>pg_size_bytes()</></>
+        linkend="functions-admin-dbsize"><function>pg_size_bytes()</function></link>
         function to convert human-readable size strings to numbers (Pavel
         Stehule, Vitaly Burovoy, Dean Rasheed)
        </para>
 
        <para>
         This function converts strings like those produced by
-        <function>pg_size_pretty()</> into bytes.  An example
+        <function>pg_size_pretty()</function> into bytes.  An example
         usage is <literal>SELECT oid::regclass FROM pg_class WHERE
-        pg_total_relation_size(oid) &gt; pg_size_bytes('10 GB')</>.
+        pg_total_relation_size(oid) &gt; pg_size_bytes('10 GB')</literal>.
        </para>
       </listitem>
 
@@ -6670,7 +8200,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link
-        linkend="functions-admin-dbsize"><function>pg_size_pretty()</></>,
+        linkend="functions-admin-dbsize"><function>pg_size_pretty()</function></link>,
         format negative numbers similarly to positive ones (Adrian
         Vondendriesch)
        </para>
@@ -6686,14 +8216,14 @@ XXX this is pending backpatch, may need to remove
 2015-07-02 [10fb48d66] Add an optional missing_ok argument to SQL function curr
 -->
        <para>
-        Add an optional <replaceable>missing_ok</> argument to the <link
-        linkend="functions-admin-set-table"><function>current_setting()</></>
+        Add an optional <replaceable>missing_ok</replaceable> argument to the <link
+        linkend="functions-admin-set-table"><function>current_setting()</function></link>
         function (David Christensen)
        </para>
 
        <para>
         This allows avoiding an error for an unrecognized parameter
-        name, instead returning a <literal>NULL</>.
+        name, instead returning a <literal>NULL</literal>.
        </para>
       </listitem>
 
@@ -6705,16 +8235,16 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Change various catalog-inspection functions to return
-        <literal>NULL</> for invalid input (Michael Paquier)
+        <literal>NULL</literal> for invalid input (Michael Paquier)
        </para>
 
        <para>
         <link
-        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</></>
-        now returns <literal>NULL</> if given an invalid view <type>OID</>,
-        and several similar functions likewise return <literal>NULL</> for
+        linkend="functions-info-catalog-table"><function>pg_get_viewdef()</function></link>
+        now returns <literal>NULL</literal> if given an invalid view <type>OID</type>,
+        and several similar functions likewise return <literal>NULL</literal> for
         bad input.  Previously, such cases usually led to <quote>cache
-        lookup failed</> errors, which are not meant to occur in
+        lookup failed</quote> errors, which are not meant to occur in
         user-facing cases.
        </para>
       </listitem>
@@ -6725,13 +8255,13 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Fix <link
-        linkend="pg-replication-origin-xact-reset"><function>pg_replication_origin_xact_reset()</></>
+        linkend="pg-replication-origin-xact-reset"><function>pg_replication_origin_xact_reset()</function></link>
         to not have any arguments (Fujii Masao)
        </para>
 
        <para>
         The documentation said that it has no arguments, and the C code did
-        not expect any arguments, but the entry in <structname>pg_proc</>
+        not expect any arguments, but the entry in <structname>pg_proc</structname>
         mistakenly specified two arguments.
        </para>
       </listitem>
@@ -6751,7 +8281,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         In <link linkend="plpgsql">PL/pgSQL</link>, detect mismatched
-        <command>CONTINUE</> and <command>EXIT</> statements while
+        <command>CONTINUE</command> and <command>EXIT</command> statements while
         compiling a function, rather than at execution time
         (Jim Nasby)
        </para>
@@ -6764,7 +8294,7 @@ XXX this is pending backpatch, may need to remove
 2016-07-02 [3a4a33ad4] PL/Python: Report argument parsing errors using exceptio
 -->
        <para>
-        Extend <application>PL/Python</>'s error-reporting and
+        Extend <application>PL/Python</application>'s error-reporting and
         message-reporting functions to allow specifying additional message
         fields besides the primary error message (Pavel Stehule)
        </para>
@@ -6776,7 +8306,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Allow PL/Python functions to call themselves recursively
-        via <application>SPI</>, and fix the behavior when multiple
+        via <application>SPI</application>, and fix the behavior when multiple
         set-returning PL/Python functions are called within one query
         (Alexey Grishchenko, Tom Lane)
        </para>
@@ -6798,14 +8328,14 @@ XXX this is pending backpatch, may need to remove
 2016-03-02 [e2609323e] Make PL/Tcl require Tcl 8.4 or later.
 -->
        <para>
-        Modernize <application>PL/Tcl</> to use Tcl's <quote>object</>
-        <acronym>API</>s instead of simple strings (Jim Nasby, Karl
+        Modernize <application>PL/Tcl</application> to use Tcl's <quote>object</quote>
+        <acronym>API</acronym>s instead of simple strings (Jim Nasby, Karl
         Lehenbauer)
        </para>
 
        <para>
         This can improve performance substantially in some cases.
-        Note that <application>PL/Tcl</> now requires Tcl 8.4 or later.
+        Note that <application>PL/Tcl</application> now requires Tcl 8.4 or later.
        </para>
       </listitem>
 
@@ -6815,8 +8345,8 @@ XXX this is pending backpatch, may need to remove
 2016-03-25 [cd37bb785] Improve PL/Tcl errorCode facility by providing decoded n
 -->
        <para>
-        In <application>PL/Tcl</>, make database-reported errors return
-        additional information in Tcl's <varname>errorCode</> global
+        In <application>PL/Tcl</application>, make database-reported errors return
+        additional information in Tcl's <varname>errorCode</varname> global
         variable (Jim Nasby, Tom Lane)
        </para>
 
@@ -6831,15 +8361,15 @@ XXX this is pending backpatch, may need to remove
 2016-03-02 [c8c7c93de] Fix PL/Tcl's encoding conversion logic.
 -->
        <para>
-        Fix <application>PL/Tcl</> to perform encoding conversion between
-        the database encoding and <literal>UTF-8</>, which is what Tcl
+        Fix <application>PL/Tcl</application> to perform encoding conversion between
+        the database encoding and <literal>UTF-8</literal>, which is what Tcl
         expects (Tom Lane)
        </para>
 
        <para>
         Previously, strings were passed through without conversion,
-        leading to misbehavior with non-<literal>ASCII</> characters when
-        the database encoding was not <literal>UTF-8</>.
+        leading to misbehavior with non-<literal>ASCII</literal> characters when
+        the database encoding was not <literal>UTF-8</literal>.
        </para>
       </listitem>
 
@@ -6858,7 +8388,7 @@ XXX this is pending backpatch, may need to remove
 -->
        <para>
         Add a nonlocalized version of
-        the <link linkend="protocol-error-fields">severity field</> in
+        the <link linkend="protocol-error-fields">severity field</link> in
         error and notice messages (Tom Lane)
        </para>
 
@@ -6875,17 +8405,17 @@ XXX this is pending backpatch, may need to remove
 This commit is also listed under psql and PL/pgSQL
 -->
        <para>
-        Introduce a feature in <application>libpq</> whereby the
-        <literal>CONTEXT</> field of messages can be suppressed, either
+        Introduce a feature in <application>libpq</application> whereby the
+        <literal>CONTEXT</literal> field of messages can be suppressed, either
         always or only for non-error messages (Pavel Stehule)
        </para>
 
        <para>
         The default behavior of <link
-        linkend="libpq-pqerrormessage"><function>PQerrorMessage()</></>
-        is now to print <literal>CONTEXT</>
+        linkend="libpq-pqerrormessage"><function>PQerrorMessage()</function></link>
+        is now to print <literal>CONTEXT</literal>
         only for errors.  The new function <link
-        linkend="libpq-pqseterrorcontextvisibility"><function>PQsetErrorContextVisibility()</></>
+        linkend="libpq-pqseterrorcontextvisibility"><function>PQsetErrorContextVisibility()</function></link>
         can be used to adjust this.
        </para>
       </listitem>
@@ -6895,14 +8425,14 @@ This commit is also listed under psql and PL/pgSQL
 2016-04-03 [e3161b231] Add libpq support for recreating an error message with d
 -->
        <para>
-        Add support in <application>libpq</> for regenerating an error
+        Add support in <application>libpq</application> for regenerating an error
         message with a different verbosity level (Alex Shulgin)
        </para>
 
        <para>
         This is done with the new function <link
-        linkend="libpq-pqresultverboseerrormessage"><function>PQresultVerboseErrorMessage()</></>.
-        This supports <application>psql</>'s new <literal>\errverbose</>
+        linkend="libpq-pqresultverboseerrormessage"><function>PQresultVerboseErrorMessage()</function></link>.
+        This supports <application>psql</application>'s new <literal>\errverbose</literal>
         feature, and may be useful for other clients as well.
        </para>
       </listitem>
@@ -6912,13 +8442,13 @@ This commit is also listed under psql and PL/pgSQL
 2015-11-27 [40cb21f70] Improve PQhost() to return useful data for default Unix-
 -->
        <para>
-        Improve <application>libpq</>'s <link
-        linkend="libpq-pqhost"><function>PQhost()</></> function to return
+        Improve <application>libpq</application>'s <link
+        linkend="libpq-pqhost"><function>PQhost()</function></link> function to return
         useful data for default Unix-socket connections (Tom Lane)
        </para>
 
        <para>
-        Previously it would return <literal>NULL</> if no explicit host
+        Previously it would return <literal>NULL</literal> if no explicit host
         specification had been given; now it returns the default socket
         directory path.
        </para>
@@ -6929,7 +8459,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-02-16 [fc1ae7d2e] Change ecpg lexer to accept comments with line breaks in
 -->
        <para>
-        Fix <application>ecpg</>'s lexer to handle line breaks within
+        Fix <application>ecpg</application>'s lexer to handle line breaks within
         comments starting on preprocessor directive lines (Michael Meskes)
        </para>
       </listitem>
@@ -6948,9 +8478,9 @@ This commit is also listed under psql and PL/pgSQL
 2015-09-14 [d02426029] Check existency of table/schema for -t/-n option (pg_dum
 -->
        <para>
-        Add a <option>--strict-names</> option
-        to <link linkend="APP-PGDUMP"><application>pg_dump</></>
-        and <link linkend="APP-PGRESTORE"><application>pg_restore</></>
+        Add a <option>--strict-names</option> option
+        to <link linkend="app-pgdump"><application>pg_dump</application></link>
+        and <link linkend="app-pgrestore"><application>pg_restore</application></link>
         (Pavel Stehule)
        </para>
 
@@ -6970,7 +8500,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-05-06 [e1b120a8c] Only issue LOCK TABLE commands when necessary
 -->
        <para>
-        In <application>pg_dump</>, dump locally-made changes of privilege
+        In <application>pg_dump</application>, dump locally-made changes of privilege
         assignments for system objects (Stephen Frost)
        </para>
 
@@ -6978,7 +8508,7 @@ This commit is also listed under psql and PL/pgSQL
         While it has always been possible for a superuser to change
         the privilege assignments for built-in or extension-created
         objects, such changes were formerly lost in a dump and reload.
-        Now, <application>pg_dump</> recognizes and dumps such changes.
+        Now, <application>pg_dump</application> recognizes and dumps such changes.
         (This works only when dumping from a 9.6 or later server, however.)
        </para>
       </listitem>
@@ -6988,7 +8518,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-09-08 [31eb14504] Allow pg_dump to dump non-extension members of an extens
 -->
        <para>
-        Allow <application>pg_dump</> to dump non-extension-owned objects
+        Allow <application>pg_dump</application> to dump non-extension-owned objects
         that are within an extension-owned schema
         (Mart&iacute;n Marqu&eacute;s)
        </para>
@@ -7004,7 +8534,7 @@ This commit is also listed under psql and PL/pgSQL
 2016-04-06 [3b3fcc4ee] pg_dump: Add table qualifications to some tags
 -->
        <para>
-        In <application>pg_dump</> output, include the table name in object
+        In <application>pg_dump</application> output, include the table name in object
         tags for object types that are only uniquely named per-table
         (for example, triggers) (Peter Eisentraut)
        </para>
@@ -7013,7 +8543,7 @@ This commit is also listed under psql and PL/pgSQL
     </itemizedlist>
 
      <sect4>
-      <title><xref linkend="APP-PSQL"></title>
+      <title><xref linkend="app-psql"/></title>
 
       <itemizedlist>
 
@@ -7029,7 +8559,7 @@ this commit is also listed in the compatibility section
 
        <para>
         The specified operations are carried out in the order in which the
-        options are given, and then <application>psql</> terminates.
+        options are given, and then <application>psql</application> terminates.
        </para>
       </listitem>
 
@@ -7038,7 +8568,7 @@ this commit is also listed in the compatibility section
 2016-04-08 [c09b18f21] Support \crosstabview in psql
 -->
        <para>
-        Add a <command>\crosstabview</> command that prints the results of
+        Add a <command>\crosstabview</command> command that prints the results of
         a query in a cross-tabulated display (Daniel V&eacute;rit&eacute;)
        </para>
 
@@ -7054,13 +8584,13 @@ this commit is also listed in the compatibility section
 2016-04-03 [3cc38ca7d] Add psql \errverbose command to see last server error at
 -->
        <para>
-        Add an <literal>\errverbose</> command that shows the last server
+        Add an <literal>\errverbose</literal> command that shows the last server
         error at full verbosity (Alex Shulgin)
        </para>
 
        <para>
         This is useful after getting an unexpected error &mdash; you
-        no longer need to adjust the <varname>VERBOSITY</> variable and
+        no longer need to adjust the <varname>VERBOSITY</varname> variable and
         recreate the failure in order to see error fields that are not
         shown by default.
        </para>
@@ -7072,13 +8602,13 @@ this commit is also listed in the compatibility section
 2016-05-06 [9b66aa006] Fix psql's \ev and \sv commands so that they handle view
 -->
        <para>
-        Add <literal>\ev</> and <literal>\sv</> commands for editing and
+        Add <literal>\ev</literal> and <literal>\sv</literal> commands for editing and
         showing view definitions (Petr Korobeinikov)
        </para>
 
        <para>
-        These are parallel to the existing <literal>\ef</> and
-        <literal>\sf</> commands for functions.
+        These are parallel to the existing <literal>\ef</literal> and
+        <literal>\sf</literal> commands for functions.
        </para>
       </listitem>
 
@@ -7087,7 +8617,7 @@ this commit is also listed in the compatibility section
 2016-04-04 [2bbe9112a] Add a \gexec command to psql for evaluation of computed
 -->
        <para>
-        Add a <command>\gexec</> command that executes a query and
+        Add a <command>\gexec</command> command that executes a query and
         re-submits the result(s) as new queries (Corey Huinker)
        </para>
       </listitem>
@@ -7097,9 +8627,9 @@ this commit is also listed in the compatibility section
 2015-10-05 [2145a7660] psql:  allow \pset C in setting the title, matches \C
 -->
        <para>
-        Allow <literal>\pset C <replaceable>string</></literal>
+        Allow <literal>\pset C <replaceable>string</replaceable></literal>
         to set the table title, for consistency with <literal>\C
-        <replaceable>string</></literal> (Bruce Momjian)
+        <replaceable>string</replaceable></literal> (Bruce Momjian)
        </para>
       </listitem>
 
@@ -7108,7 +8638,7 @@ this commit is also listed in the compatibility section
 2016-03-11 [69ab7b9d6] psql: Don't automatically use expanded format when there
 -->
        <para>
-        In <literal>\pset expanded auto</> mode, do not use expanded
+        In <literal>\pset expanded auto</literal> mode, do not use expanded
         format for query results with only one column (Andreas Karlsson,
         Robert Haas)
        </para>
@@ -7120,16 +8650,16 @@ this commit is also listed in the compatibility section
 2016-06-15 [9901d8ac2] Use strftime("%c") to format timestamps in psql's \watch
 -->
        <para>
-        Improve the headers output by the <command>\watch</> command
+        Improve the headers output by the <command>\watch</command> command
         (Michael Paquier, Tom Lane)
        </para>
 
        <para>
-        Include the <command>\pset title</> string if one has
+        Include the <command>\pset title</command> string if one has
         been set, and shorten the prefabricated part of the
-        header to be <literal><replaceable>timestamp</> (every
-        <replaceable>N</>s)</literal>.  Also, the timestamp format now
-        obeys <application>psql</>'s locale environment.
+        header to be <literal><replaceable>timestamp</replaceable> (every
+        <replaceable>N</replaceable>s)</literal>.  Also, the timestamp format now
+        obeys <application>psql</application>'s locale environment.
        </para>
       </listitem>
 
@@ -7177,7 +8707,7 @@ this commit is also listed in the compatibility section
 2015-07-07 [275f05c99] Add psql PROMPT variable showing the pid of the connecte
 -->
        <para>
-        Add a <literal>PROMPT</> option <literal>%p</> to insert the
+        Add a <literal>PROMPT</literal> option <literal>%p</literal> to insert the
         process ID of the connected backend (Julien Rouhaud)
        </para>
       </listitem>
@@ -7188,13 +8718,13 @@ this commit is also listed in the compatibility section
 This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
-        Introduce a feature whereby the <literal>CONTEXT</> field of
+        Introduce a feature whereby the <literal>CONTEXT</literal> field of
         messages can be suppressed, either always or only for non-error
         messages (Pavel Stehule)
        </para>
 
        <para>
-        Printing <literal>CONTEXT</> only for errors is now the default
+        Printing <literal>CONTEXT</literal> only for errors is now the default
         behavior.  This can be changed by setting the special variable
         <varname>SHOW_CONTEXT</varname>.
        </para>
@@ -7205,7 +8735,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-07-11 [a670c24c3] Improve output of psql's \df+ command.
 -->
        <para>
-        Make <command>\df+</> show function access privileges and
+        Make <command>\df+</command> show function access privileges and
         parallel-safety attributes (Michael Paquier)
        </para>
       </listitem>
@@ -7215,7 +8745,7 @@ This commit is also listed under libpq and PL/pgSQL
     </sect4>
 
     <sect4>
-     <title><xref linkend="pgbench"></title>
+     <title><xref linkend="pgbench"/></title>
 
      <itemizedlist>
 
@@ -7224,7 +8754,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-20 [68ab8e8ba] SQL commands in pgbench scripts are now ended by semicol
 -->
        <para>
-        SQL commands in <application>pgbench</> scripts are now ended by
+        SQL commands in <application>pgbench</application> scripts are now ended by
         semicolons, not newlines (Kyotaro Horiguchi, Tom Lane)
        </para>
 
@@ -7233,7 +8763,7 @@ This commit is also listed under libpq and PL/pgSQL
         Existing custom scripts will need to be modified to add a semicolon
         at the end of each line that does not have one already.  (Doing so
         does not break the script for use with older versions
-        of <application>pgbench</>.)
+        of <application>pgbench</application>.)
        </para>
       </listitem>
 
@@ -7246,7 +8776,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Support floating-point arithmetic, as well as some <link
-        linkend="pgbench-builtin-functions">built-in functions</>, in
+        linkend="pgbench-builtin-functions">built-in functions</link>, in
         expressions in backslash commands (Fabien Coelho)
        </para>
       </listitem>
@@ -7256,18 +8786,18 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-29 [ad9566470] pgbench: Remove \setrandom.
 -->
        <para>
-        Replace <command>\setrandom</> with built-in functions (Fabien
+        Replace <command>\setrandom</command> with built-in functions (Fabien
         Coelho)
        </para>
 
        <para>
         The new built-in functions include <link
-        linkend="pgbench-functions"><function>random()</></>,
-        <function>random_exponential()</>, and
-        <function>random_gaussian()</>, which perform the same work as
-        <command>\setrandom</>, but are easier to use since they can be
+        linkend="pgbench-functions"><function>random()</function></link>,
+        <function>random_exponential()</function>, and
+        <function>random_gaussian()</function>, which perform the same work as
+        <command>\setrandom</command>, but are easier to use since they can be
         embedded in larger expressions.  Since these additions have made
-        <command>\setrandom</> obsolete, remove it.
+        <command>\setrandom</command> obsolete, remove it.
        </para>
       </listitem>
 
@@ -7282,8 +8812,8 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        This is done with the new <option>-b</> switch, which works
-        similarly to <option>-f</> for custom scripts.
+        This is done with the new <option>-b</option> switch, which works
+        similarly to <option>-f</option> for custom scripts.
        </para>
       </listitem>
 
@@ -7298,7 +8828,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        When multiple scripts are specified, each <application>pgbench</>
+        When multiple scripts are specified, each <application>pgbench</application>
         transaction randomly chooses one to execute.  Formerly this was
         always done with uniform probability, but now different selection
         probabilities can be specified for different scripts.
@@ -7325,7 +8855,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-16 [1def9063c] pgbench progress with timestamp
 -->
        <para>
-        Add a <option>--progress-timestamp</> option to report progress
+        Add a <option>--progress-timestamp</option> option to report progress
         with Unix epoch timestamps, instead of time since the run started
         (Fabien Coelho)
        </para>
@@ -7336,8 +8866,8 @@ This commit is also listed under libpq and PL/pgSQL
 2015-07-03 [ba3deeefb] Lift the limitation that # of clients must be a multiple
 -->
        <para>
-        Allow the number of client connections (<option>-c</>) to not
-        be an exact multiple of the number of threads (<option>-j</>)
+        Allow the number of client connections (<option>-c</option>) to not
+        be an exact multiple of the number of threads (<option>-j</option>)
         (Fabien Coelho)
        </para>
       </listitem>
@@ -7347,13 +8877,13 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-09 [accf7616f] pgbench: When -T is used, don't wait for transactions be
 -->
        <para>
-        When the <option>-T</> option is used, stop promptly at the end
+        When the <option>-T</option> option is used, stop promptly at the end
         of the specified time (Fabien Coelho)
        </para>
 
        <para>
         Previously, specifying a low transaction rate could cause
-        <application>pgbench</> to wait significantly longer than
+        <application>pgbench</application> to wait significantly longer than
         specified.
        </para>
       </listitem>
@@ -7374,15 +8904,15 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-17 [66d947b9d] Adjust behavior of single-user -j mode for better initdb
 -->
        <para>
-        Improve error reporting during <application>initdb</>'s
+        Improve error reporting during <application>initdb</application>'s
         post-bootstrap phase (Tom Lane)
        </para>
 
        <para>
         Previously, an error here led to reporting the entire input
-        file as the <quote>failing query</>; now just the current
+        file as the <quote>failing query</quote>; now just the current
         query is reported.  To get the desired behavior, queries in
-        <application>initdb</>'s input files must be separated by blank
+        <application>initdb</application>'s input files must be separated by blank
         lines.
        </para>
       </listitem>
@@ -7393,7 +8923,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-08-30 [d9720e437] Fix initdb misbehavior when user mis-enters superuser pa
 -->
        <para>
-        Speed up <application>initdb</> by using just one
+        Speed up <application>initdb</application> by using just one
         standalone-backend session for all the post-bootstrap steps
         (Tom Lane)
        </para>
@@ -7404,7 +8934,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-01 [e50cda784] Use pg_rewind when target timeline was switched
 -->
        <para>
-        Improve <link linkend="app-pgrewind"><application>pg_rewind</></>
+        Improve <link linkend="app-pgrewind"><application>pg_rewind</application></link>
         so that it can work when the target timeline changes (Alexander
         Korotkov)
        </para>
@@ -7430,7 +8960,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Remove obsolete
-        <function>heap_formtuple</>/<function>heap_modifytuple</>/<function>heap_deformtuple</>
+        <function>heap_formtuple</function>/<function>heap_modifytuple</function>/<function>heap_deformtuple</function>
         functions (Peter Geoghegan)
        </para>
       </listitem>
@@ -7440,16 +8970,16 @@ This commit is also listed under libpq and PL/pgSQL
 2016-08-27 [b9fe6cbc8] Add macros to make AllocSetContextCreate() calls simpler
 -->
        <para>
-        Add macros to make <function>AllocSetContextCreate()</> calls simpler
+        Add macros to make <function>AllocSetContextCreate()</function> calls simpler
         and safer (Tom Lane)
        </para>
 
        <para>
         Writing out the individual sizing parameters for a memory context
         is now deprecated in favor of using one of the new
-        macros <symbol>ALLOCSET_DEFAULT_SIZES</>,
-        <symbol>ALLOCSET_SMALL_SIZES</>,
-        or <symbol>ALLOCSET_START_SMALL_SIZES</>.
+        macros <symbol>ALLOCSET_DEFAULT_SIZES</symbol>,
+        <symbol>ALLOCSET_SMALL_SIZES</symbol>,
+        or <symbol>ALLOCSET_START_SMALL_SIZES</symbol>.
         Existing code continues to work, however.
        </para>
       </listitem>
@@ -7459,7 +8989,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-08-05 [de6fd1c89] Rely on inline functions even if that causes warnings in
 -->
        <para>
-        Unconditionally use <literal>static inline</> functions in header
+        Unconditionally use <literal>static inline</literal> functions in header
         files (Andres Freund)
        </para>
 
@@ -7480,7 +9010,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-05-06 [6bd356c33] Add TAP tests for pg_dump
 -->
        <para>
-        Improve <application>TAP</> testing infrastructure (Michael
+        Improve <application>TAP</application> testing infrastructure (Michael
         Paquier, Craig Ringer, &Aacute;lvaro Herrera, Stephen Frost)
        </para>
 
@@ -7495,7 +9025,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-11 [aa65de042] When trace_lwlocks is used, identify individual lwlocks
 -->
        <para>
-        Make <varname>trace_lwlocks</> identify individual locks by name
+        Make <varname>trace_lwlocks</varname> identify individual locks by name
         (Robert Haas)
        </para>
       </listitem>
@@ -7507,7 +9037,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-01-05 [4f18010af] Convert psql's tab completion for backslash commands to
 -->
        <para>
-        Improve <application>psql</>'s tab-completion code infrastructure
+        Improve <application>psql</application>'s tab-completion code infrastructure
         (Thomas Munro, Michael Paquier)
        </para>
 
@@ -7522,7 +9052,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-01-05 [efa318bcf] Make pg_shseclabel available in early backend startup
 -->
        <para>
-        Nail the <structname>pg_shseclabel</> system catalog into cache,
+        Nail the <structname>pg_shseclabel</structname> system catalog into cache,
         so that it is available for access during connection authentication
         (Adam Brightwell)
        </para>
@@ -7541,21 +9071,21 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Restructure <link linkend="indexam">index access
-        method <acronym>API</></> to hide most of it at
-        the <application>C</> level (Alexander Korotkov, Andrew Gierth)
+        method <acronym>API</acronym></link> to hide most of it at
+        the <application>C</application> level (Alexander Korotkov, Andrew Gierth)
        </para>
 
        <para>
-        This change modernizes the index <acronym>AM API</> to look more
+        This change modernizes the index <acronym>AM API</acronym> to look more
         like the designs we have adopted for foreign data wrappers and
-        tablesample handlers.  This simplifies the <application>C</> code
+        tablesample handlers.  This simplifies the <application>C</application> code
         and makes it much more practical to define index access methods in
         installable extensions.  A consequence is that most of the columns
-        of the <structname>pg_am</> system catalog have disappeared.
+        of the <structname>pg_am</structname> system catalog have disappeared.
         New <link linkend="functions-info-catalog-table">inspection
         functions</link> have been added to allow SQL queries to determine
         index AM properties that used to be discoverable
-        from <structname>pg_am</>.
+        from <structname>pg_am</structname>.
        </para>
       </listitem>
 
@@ -7565,14 +9095,14 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add <link
-        linkend="catalog-pg-init-privs"><structname>pg_init_privs</></>
+        linkend="catalog-pg-init-privs"><structname>pg_init_privs</structname></link>
         system catalog to hold original privileges
-        of <application>initdb</>-created and extension-created objects
+        of <application>initdb</application>-created and extension-created objects
         (Stephen Frost)
        </para>
 
        <para>
-        This infrastructure allows <application>pg_dump</> to dump changes
+        This infrastructure allows <application>pg_dump</application> to dump changes
         that an installation may have made in privileges attached to
         system objects.  Formerly, such changes would be lost in a dump
         and reload, but now they are preserved.
@@ -7584,14 +9114,14 @@ This commit is also listed under libpq and PL/pgSQL
 2016-02-04 [c1772ad92] Change the way that LWLocks for extensions are allocated
 -->
        <para>
-        Change the way that extensions allocate custom <literal>LWLocks</>
+        Change the way that extensions allocate custom <literal>LWLocks</literal>
         (Amit Kapila, Robert Haas)
        </para>
 
        <para>
-        The <function>RequestAddinLWLocks()</> function is removed,
-        and replaced by <function>RequestNamedLWLockTranche()</>.
-        This allows better identification of custom <literal>LWLocks</>,
+        The <function>RequestAddinLWLocks()</function> function is removed,
+        and replaced by <function>RequestNamedLWLockTranche()</function>.
+        This allows better identification of custom <literal>LWLocks</literal>,
         and is less error-prone.
        </para>
       </listitem>
@@ -7615,7 +9145,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        This change allows <application>FDW</>s or custom scan providers
+        This change allows <application>FDW</application>s or custom scan providers
         to store data in a plan tree in a more convenient format than
         was previously possible.
        </para>
@@ -7632,7 +9162,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Make the planner deal with post-scan/join query steps by generating
-        and comparing <literal>Paths</>, replacing a lot of ad-hoc logic
+        and comparing <literal>Paths</literal>, replacing a lot of ad-hoc logic
         (Tom Lane)
        </para>
 
@@ -7682,7 +9212,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-24 [c1156411a] Move psql's psqlscan.l into src/fe_utils.
 -->
        <para>
-        Separate out <application>psql</>'s <application>flex</> lexer to
+        Separate out <application>psql</application>'s <application>flex</application> lexer to
         make it usable by other client programs (Tom Lane, Kyotaro
         Horiguchi)
        </para>
@@ -7691,12 +9221,12 @@ This commit is also listed under libpq and PL/pgSQL
         This eliminates code duplication for programs that need to be able
         to parse SQL commands well enough to identify command boundaries.
         Doing that in full generality is more painful than one could
-        wish, and up to now only <application>psql</> has really gotten
+        wish, and up to now only <application>psql</application> has really gotten
         it right among our supported client programs.
        </para>
 
        <para>
-        A new source-code subdirectory <filename>src/fe_utils/</> has
+        A new source-code subdirectory <filename>src/fe_utils/</filename> has
         been created to hold this and other code that is shared across
         our client programs.  Formerly such sharing was accomplished by
         symbolic linking or copying source files at build time, which
@@ -7709,7 +9239,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-21 [98a64d0bd] Introduce WaitEventSet API.
 -->
        <para>
-        Introduce <literal>WaitEventSet</> <acronym>API</> to allow
+        Introduce <literal>WaitEventSet</literal> <acronym>API</acronym> to allow
         efficient waiting for event sets that usually do not change from
         one wait to the next (Andres Freund, Amit Kapila)
        </para>
@@ -7720,16 +9250,16 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-01 [65578341a] Add Generic WAL interface
 -->
        <para>
-        Add a generic interface for writing <acronym>WAL</> records
+        Add a generic interface for writing <acronym>WAL</acronym> records
         (Alexander Korotkov, Petr Jel&iacute;nek, Markus Nullmeier)
        </para>
 
        <para>
-        This change allows extensions to write <acronym>WAL</> records for
+        This change allows extensions to write <acronym>WAL</acronym> records for
         changes to pages using a standard layout.  The problem of needing to
-        replay <acronym>WAL</> without access to the extension is solved by
+        replay <acronym>WAL</acronym> without access to the extension is solved by
         having generic replay code.  This allows extensions to implement,
-        for example, index access methods and have <acronym>WAL</>
+        for example, index access methods and have <acronym>WAL</acronym>
         support for them.
        </para>
       </listitem>
@@ -7739,13 +9269,13 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-06 [3fe3511d0] Generic Messages for Logical Decoding
 -->
        <para>
-        Support generic <acronym>WAL</> messages for logical decoding
+        Support generic <acronym>WAL</acronym> messages for logical decoding
         (Petr Jel&iacute;nek, Andres Freund)
        </para>
 
        <para>
         This feature allows extensions to insert data into the
-        <acronym>WAL</> stream that can be read by logical-decoding
+        <acronym>WAL</acronym> stream that can be read by logical-decoding
         plugins, but is not connected to physical data restoration.
        </para>
       </listitem>
@@ -7757,12 +9287,12 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Allow SP-GiST operator classes to store an arbitrary
-        <quote>traversal value</> while descending the index (Alexander
+        <quote>traversal value</quote> while descending the index (Alexander
         Lebedev, Teodor Sigaev)
        </para>
 
        <para>
-        This is somewhat like the <quote>reconstructed value</>, but it
+        This is somewhat like the <quote>reconstructed value</quote>, but it
         could be any arbitrary chunk of data, not necessarily of the same
         data type as the indexed column.
        </para>
@@ -7773,12 +9303,12 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-04 [66229ac00] Introduce a LOG_SERVER_ONLY ereport level, which is neve
 -->
        <para>
-        Introduce a <literal>LOG_SERVER_ONLY</> message level for
-        <function>ereport()</> (David Steele)
+        Introduce a <literal>LOG_SERVER_ONLY</literal> message level for
+        <function>ereport()</function> (David Steele)
        </para>
 
        <para>
-        This level acts like <literal>LOG</> except that the message is
+        This level acts like <literal>LOG</literal> except that the message is
         never sent to the client.  It is meant for use in auditing and
         similar applications.
        </para>
@@ -7789,14 +9319,14 @@ This commit is also listed under libpq and PL/pgSQL
 2016-07-01 [548af97fc] Provide and use a makefile target to build all generated
 -->
        <para>
-        Provide a <filename>Makefile</> target to build all generated
+        Provide a <filename>Makefile</filename> target to build all generated
         headers (Michael Paquier, Tom Lane)
        </para>
 
        <para>
-        <literal>submake-generated-headers</> can now be invoked to ensure
+        <literal>submake-generated-headers</literal> can now be invoked to ensure
         that generated backend header files are up-to-date.  This is
-        useful in subdirectories that might be built <quote>standalone</>.
+        useful in subdirectories that might be built <quote>standalone</quote>.
        </para>
       </listitem>
 
@@ -7825,8 +9355,8 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-13 [7a8d87483] Rename auto_explain.sample_ratio to sample_rate
 -->
        <para>
-        Add configuration parameter <literal>auto_explain.sample_rate</> to
-        allow <link linkend="auto-explain"><filename>contrib/auto_explain</></>
+        Add configuration parameter <literal>auto_explain.sample_rate</literal> to
+        allow <link linkend="auto-explain"><filename>contrib/auto_explain</filename></link>
         to capture just a configurable fraction of all queries (Craig
         Ringer, Julien Rouhaud)
        </para>
@@ -7842,7 +9372,7 @@ This commit is also listed under libpq and PL/pgSQL
 2016-04-01 [9ee014fc8] Bloom index contrib module
 -->
        <para>
-        Add <link linkend="bloom"><filename>contrib/bloom</></> module that
+        Add <link linkend="bloom"><filename>contrib/bloom</filename></link> module that
         implements an index access method based on Bloom filtering (Teodor
         Sigaev, Alexander Korotkov)
        </para>
@@ -7860,7 +9390,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-12-28 [81ee726d8] Code and docs review for cube kNN support.
 -->
        <para>
-        In <link linkend="cube"><filename>contrib/cube</></>, introduce
+        In <link linkend="cube"><filename>contrib/cube</filename></link>, introduce
         distance operators for cubes, and support kNN-style searches in
         GiST indexes on cube columns (Stas Kelvich)
        </para>
@@ -7871,19 +9401,19 @@ This commit is also listed under libpq and PL/pgSQL
 2016-02-03 [41d2c081c] Make hstore_to_jsonb_loose match hstore_to_json_loose on
 -->
        <para>
-        Make <filename>contrib/hstore</>'s <link
-        linkend="hstore-func-table"><function>hstore_to_jsonb_loose()</></>
-        and <function>hstore_to_json_loose()</> functions agree on what
+        Make <filename>contrib/hstore</filename>'s <link
+        linkend="hstore-func-table"><function>hstore_to_jsonb_loose()</function></link>
+        and <function>hstore_to_json_loose()</function> functions agree on what
         is a number (Tom Lane)
        </para>
 
        <para>
-        Previously, <function>hstore_to_jsonb_loose()</> would convert
-        numeric-looking strings to <acronym>JSON</> numbers, rather than
-        strings, even if they did not exactly match the <acronym>JSON</>
+        Previously, <function>hstore_to_jsonb_loose()</function> would convert
+        numeric-looking strings to <acronym>JSON</acronym> numbers, rather than
+        strings, even if they did not exactly match the <acronym>JSON</acronym>
         syntax specification for numbers.  This was inconsistent with
-        <function>hstore_to_json_loose()</>, so tighten the test to match
-        the <acronym>JSON</> syntax.
+        <function>hstore_to_json_loose()</function>, so tighten the test to match
+        the <acronym>JSON</acronym> syntax.
        </para>
       </listitem>
 
@@ -7893,7 +9423,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add selectivity estimation functions for
-        <link linkend="intarray"><filename>contrib/intarray</></> operators
+        <link linkend="intarray"><filename>contrib/intarray</filename></link> operators
         to improve plans for queries using those operators (Yury Zhuravlev,
         Alexander Korotkov)
        </para>
@@ -7905,10 +9435,10 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Make <link
-        linkend="pageinspect"><filename>contrib/pageinspect</></>'s
-        <function>heap_page_items()</> function show the raw data in each
-        tuple, and add new functions <function>tuple_data_split()</> and
-        <function>heap_page_item_attrs()</> for inspection of individual
+        linkend="pageinspect"><filename>contrib/pageinspect</filename></link>'s
+        <function>heap_page_items()</function> function show the raw data in each
+        tuple, and add new functions <function>tuple_data_split()</function> and
+        <function>heap_page_item_attrs()</function> for inspection of individual
         tuple fields (Nikolay Shaplov)
        </para>
       </listitem>
@@ -7918,9 +9448,9 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-09 [188f359d3] pgcrypto: support changing S2K iteration count
 -->
        <para>
-        Add an optional <literal>S2K</> iteration count parameter to
-        <link linkend="pgcrypto"><filename>contrib/pgcrypto</></>'s
-        <function>pgp_sym_encrypt()</> function (Jeff Janes)
+        Add an optional <literal>S2K</literal> iteration count parameter to
+        <link linkend="pgcrypto"><filename>contrib/pgcrypto</filename></link>'s
+        <function>pgp_sym_encrypt()</function> function (Jeff Janes)
        </para>
       </listitem>
 
@@ -7929,8 +9459,8 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-16 [f576b17cd] Add word_similarity to pg_trgm contrib module.
 -->
        <para>
-        Add support for <quote>word similarity</> to
-        <link linkend="pgtrgm"><filename>contrib/pg_trgm</></>
+        Add support for <quote>word similarity</quote> to
+        <link linkend="pgtrgm"><filename>contrib/pg_trgm</filename></link>
         (Alexander Korotkov, Artur Zakirov)
        </para>
 
@@ -7947,14 +9477,14 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add configuration parameter
-        <varname>pg_trgm.similarity_threshold</> for
-        <filename>contrib/pg_trgm</>'s similarity threshold (Artur Zakirov)
+        <varname>pg_trgm.similarity_threshold</varname> for
+        <filename>contrib/pg_trgm</filename>'s similarity threshold (Artur Zakirov)
        </para>
 
        <para>
         This threshold has always been configurable, but formerly it was
-        controlled by special-purpose functions <function>set_limit()</>
-        and <function>show_limit()</>.  Those are now deprecated.
+        controlled by special-purpose functions <function>set_limit()</function>
+        and <function>show_limit()</function>.  Those are now deprecated.
        </para>
       </listitem>
 
@@ -7963,7 +9493,7 @@ This commit is also listed under libpq and PL/pgSQL
 2015-07-20 [97f301464] This supports the triconsistent function for pg_trgm GIN
 -->
        <para>
-        Improve <filename>contrib/pg_trgm</>'s GIN operator class to
+        Improve <filename>contrib/pg_trgm</filename>'s GIN operator class to
         speed up index searches in which both common and rare keys appear
         (Jeff Janes)
        </para>
@@ -7975,7 +9505,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Improve performance of similarity searches in
-        <filename>contrib/pg_trgm</> GIN indexes (Christophe Fornaroli)
+        <filename>contrib/pg_trgm</filename> GIN indexes (Christophe Fornaroli)
        </para>
       </listitem>
 
@@ -7986,7 +9516,7 @@ This commit is also listed under libpq and PL/pgSQL
 -->
        <para>
         Add <link
-        linkend="pgvisibility"><filename>contrib/pg_visibility</></> module
+        linkend="pgvisibility"><filename>contrib/pg_visibility</filename></link> module
         to allow examining table visibility maps (Robert Haas)
        </para>
       </listitem>
@@ -7996,9 +9526,9 @@ This commit is also listed under libpq and PL/pgSQL
 2015-09-07 [49124613f] contrib/sslinfo: add ssl_extension_info SRF
 -->
        <para>
-        Add <link linkend="sslinfo"><function>ssl_extension_info()</></>
-        function to <filename>contrib/sslinfo</>, to print information
-        about <acronym>SSL</> extensions present in the <literal>X509</>
+        Add <link linkend="sslinfo"><function>ssl_extension_info()</function></link>
+        function to <filename>contrib/sslinfo</filename>, to print information
+        about <acronym>SSL</acronym> extensions present in the <literal>X509</literal>
         certificate used for the current connection (Dmitry Voronin)
        </para>
       </listitem>
@@ -8006,7 +9536,7 @@ This commit is also listed under libpq and PL/pgSQL
     </itemizedlist>
 
     <sect4>
-     <title><link linkend="postgres-fdw"><filename>postgres_fdw</></></title>
+     <title><link linkend="postgres-fdw"><filename>postgres_fdw</filename></link></title>
 
      <itemizedlist>
 
@@ -8053,12 +9583,12 @@ This commit is also listed under libpq and PL/pgSQL
 2016-03-18 [0bf3ae88a] Directly modify foreign tables.
 -->
        <para>
-        When feasible, perform <command>UPDATE</> or <command>DELETE</>
+        When feasible, perform <command>UPDATE</command> or <command>DELETE</command>
         entirely on the remote server (Etsuro Fujita)
        </para>
 
        <para>
-        Formerly, remote updates involved sending a <command>SELECT FOR UPDATE</>
+        Formerly, remote updates involved sending a <command>SELECT FOR UPDATE</command>
         command and then updating or deleting the selected rows one-by-one.
         While that is still necessary if the operation requires any local
         processing, it can now be done remotely if all elements of the
@@ -8076,7 +9606,7 @@ This commit is also listed under libpq and PL/pgSQL
        </para>
 
        <para>
-        Formerly, <filename>postgres_fdw</> always fetched 100 rows at
+        Formerly, <filename>postgres_fdw</filename> always fetched 100 rows at
         a time from remote queries; now that behavior is configurable.
        </para>
       </listitem>
diff --git a/doc/src/sgml/release-old.sgml b/doc/src/sgml/release-old.sgml
index d4de6b1357..d55209d85b 100644
--- a/doc/src/sgml/release-old.sgml
+++ b/doc/src/sgml/release-old.sgml
@@ -15,7 +15,7 @@
   </para>
 
   <para>
-   This is expected to be the last <productname>PostgreSQL</> release
+   This is expected to be the last <productname>PostgreSQL</productname> release
    in the 7.3.X series.  Users are encouraged to update to a newer
    release branch soon.
   </para>
@@ -26,7 +26,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -39,7 +39,7 @@
     <listitem>
      <para>
       Prevent functions in indexes from executing with the privileges of
-      the user running <command>VACUUM</>, <command>ANALYZE</>, etc (Tom)
+      the user running <command>VACUUM</command>, <command>ANALYZE</command>, etc (Tom)
      </para>
 
      <para>
@@ -50,60 +50,60 @@
       (Note that triggers, defaults, check constraints, etc. pose the
       same type of risk.)  But functions in indexes pose extra danger
       because they will be executed by routine maintenance operations
-      such as <command>VACUUM FULL</>, which are commonly performed
+      such as <command>VACUUM FULL</command>, which are commonly performed
       automatically under a superuser account.  For example, a nefarious user
       can execute code with superuser privileges by setting up a
       trojan-horse index definition and waiting for the next routine vacuum.
       The fix arranges for standard maintenance operations
-      (including <command>VACUUM</>, <command>ANALYZE</>, <command>REINDEX</>,
-      and <command>CLUSTER</>) to execute as the table owner rather than
+      (including <command>VACUUM</command>, <command>ANALYZE</command>, <command>REINDEX</command>,
+      and <command>CLUSTER</command>) to execute as the table owner rather than
       the calling user, using the same privilege-switching mechanism already
-      used for <literal>SECURITY DEFINER</> functions.  To prevent bypassing
+      used for <literal>SECURITY DEFINER</literal> functions.  To prevent bypassing
       this security measure, execution of <command>SET SESSION
-      AUTHORIZATION</> and <command>SET ROLE</> is now forbidden within a
-      <literal>SECURITY DEFINER</> context.  (CVE-2007-6600)
+      AUTHORIZATION</command> and <command>SET ROLE</command> is now forbidden within a
+      <literal>SECURITY DEFINER</literal> context.  (CVE-2007-6600)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
 
      <para>
       The fix that appeared for this in 7.3.20 was incomplete, as it plugged
-      the hole for only some <filename>dblink</> functions.  (CVE-2007-6601,
+      the hole for only some <filename>dblink</filename> functions.  (CVE-2007-6601,
       CVE-2007-3278)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix potential crash in <function>translate()</> when using a multibyte
+      Fix potential crash in <function>translate()</function> when using a multibyte
       database encoding (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <filename>contrib/tablefunc</>'s <function>crosstab()</> handle
+      Make <filename>contrib/tablefunc</filename>'s <function>crosstab()</function> handle
       NULL rowid as a category in its own right, rather than crashing (Joe)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require a specific version of <productname>Autoconf</> to be used
-      when re-generating the <command>configure</> script (Peter)
+      Require a specific version of <productname>Autoconf</productname> to be used
+      when re-generating the <command>configure</command> script (Peter)
      </para>
 
      <para>
       This affects developers and packagers only.  The change was made
       to prevent accidental use of untested combinations of
-      <productname>Autoconf</> and <productname>PostgreSQL</> versions.
+      <productname>Autoconf</productname> and <productname>PostgreSQL</productname> versions.
       You can remove the version check if you really want to use a
-      different <productname>Autoconf</> version, but it's
+      different <productname>Autoconf</productname> version, but it's
       your responsibility whether the result works or not.
      </para>
     </listitem>
@@ -131,7 +131,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -144,27 +144,27 @@
     <listitem>
      <para>
       Prevent index corruption when a transaction inserts rows and
-      then aborts close to the end of a concurrent <command>VACUUM</>
+      then aborts close to the end of a concurrent <command>VACUUM</command>
       on the same table (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Make <command>CREATE DOMAIN ... DEFAULT NULL</> work properly (Tom)
+      Make <command>CREATE DOMAIN ... DEFAULT NULL</command> work properly (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Fix crash when <varname>log_min_error_statement</> logging runs out
+      Fix crash when <varname>log_min_error_statement</varname> logging runs out
       of memory (Tom)
      </para>
     </listitem>
 
     <listitem>
      <para>
-      Require non-superusers who use <filename>/contrib/dblink</> to use only
+      Require non-superusers who use <filename>/contrib/dblink</filename> to use only
       password authentication, as a security measure (Joe)
      </para>
     </listitem>
@@ -193,7 +193,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -206,22 +206,22 @@
     <listitem>
     <para>
      Support explicit placement of the temporary-table schema within
-     <varname>search_path</>, and disable searching it for functions
+     <varname>search_path</varname>, and disable searching it for functions
      and operators (Tom)
     </para>
     <para>
      This is needed to allow a security-definer function to set a
-     truly secure value of <varname>search_path</>.  Without it,
+     truly secure value of <varname>search_path</varname>.  Without it,
      an unprivileged SQL user can use temporary objects to execute code
      with the privileges of the security-definer function (CVE-2007-2138).
-     See <command>CREATE FUNCTION</> for more information.
+     See <command>CREATE FUNCTION</command> for more information.
     </para>
     </listitem>
 
     <listitem>
     <para>
-     Fix potential-data-corruption bug in how <command>VACUUM FULL</> handles
-     <command>UPDATE</> chains (Tom, Pavan Deolasee)
+     Fix potential-data-corruption bug in how <command>VACUUM FULL</command> handles
+     <command>UPDATE</command> chains (Tom, Pavan Deolasee)
     </para>
     </listitem>
 
@@ -249,7 +249,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -310,7 +310,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -322,13 +322,13 @@
 
     <listitem>
      <para>
-      <function>to_number()</> and <function>to_char(numeric)</>
-      are now <literal>STABLE</>, not <literal>IMMUTABLE</>, for
-      new <application>initdb</> installs (Tom)
+      <function>to_number()</function> and <function>to_char(numeric)</function>
+      are now <literal>STABLE</literal>, not <literal>IMMUTABLE</literal>, for
+      new <application>initdb</application> installs (Tom)
      </para>
 
      <para>
-      This is because <varname>lc_numeric</> can potentially
+      This is because <varname>lc_numeric</varname> can potentially
       change the output of these functions.
      </para>
     </listitem>
@@ -339,7 +339,7 @@
      </para>
 
      <para>
-      This improves <application>psql</> <literal>\d</> performance also.
+      This improves <application>psql</application> <literal>\d</literal> performance also.
      </para>
     </listitem>
 
@@ -366,7 +366,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
   </sect2>
@@ -376,7 +376,7 @@
 
 <itemizedlist>
 <listitem><para>Fix corner cases in pattern matching for
- <application>psql</>'s <literal>\d</> commands</para></listitem>
+ <application>psql</application>'s <literal>\d</literal> commands</para></listitem>
 <listitem><para>Fix index-corrupting bugs in /contrib/ltree
  (Teodor)</para></listitem>
 <listitem><para>Back-port 7.4 spinlock code to improve performance and support
@@ -409,7 +409,7 @@
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
 
    <para>
@@ -419,9 +419,9 @@
     into SQL commands, you should examine them as soon as possible to
     ensure that they are using recommended escaping techniques.  In
     most cases, applications should be using subroutines provided by
-    libraries or drivers (such as <application>libpq</>'s
-    <function>PQescapeStringConn()</>) to perform string escaping,
-    rather than relying on <foreignphrase>ad hoc</> code to do it.
+    libraries or drivers (such as <application>libpq</application>'s
+    <function>PQescapeStringConn()</function>) to perform string escaping,
+    rather than relying on <foreignphrase>ad hoc</foreignphrase> code to do it.
    </para>
   </sect2>
 
@@ -431,46 +431,46 @@
 <itemizedlist>
 <listitem><para>Change the server to reject invalidly-encoded multibyte
 characters in all cases (Tatsuo, Tom)</para>
-<para>While <productname>PostgreSQL</> has been moving in this direction for
+<para>While <productname>PostgreSQL</productname> has been moving in this direction for
 some time, the checks are now applied uniformly to all encodings and all
 textual input, and are now always errors not merely warnings.  This change
 defends against SQL-injection attacks of the type described in CVE-2006-2313.
 </para></listitem>
 
-<listitem><para>Reject unsafe uses of <literal>\'</> in string literals</para>
+<listitem><para>Reject unsafe uses of <literal>\'</literal> in string literals</para>
 <para>As a server-side defense against SQL-injection attacks of the type
-described in CVE-2006-2314, the server now only accepts <literal>''</> and not
-<literal>\'</> as a representation of ASCII single quote in SQL string
-literals.  By default, <literal>\'</> is rejected only when
-<varname>client_encoding</> is set to a client-only encoding (SJIS, BIG5, GBK,
+described in CVE-2006-2314, the server now only accepts <literal>''</literal> and not
+<literal>\'</literal> as a representation of ASCII single quote in SQL string
+literals.  By default, <literal>\'</literal> is rejected only when
+<varname>client_encoding</varname> is set to a client-only encoding (SJIS, BIG5, GBK,
 GB18030, or UHC), which is the scenario in which SQL injection is possible.
-A new configuration parameter <varname>backslash_quote</> is available to
+A new configuration parameter <varname>backslash_quote</varname> is available to
 adjust this behavior when needed.  Note that full security against
 CVE-2006-2314 might require client-side changes; the purpose of
-<varname>backslash_quote</> is in part to make it obvious that insecure
+<varname>backslash_quote</varname> is in part to make it obvious that insecure
 clients are insecure.
 </para></listitem>
 
-<listitem><para>Modify <application>libpq</>'s string-escaping routines to be
+<listitem><para>Modify <application>libpq</application>'s string-escaping routines to be
 aware of encoding considerations</para>
-<para>This fixes <application>libpq</>-using applications for the security
+<para>This fixes <application>libpq</application>-using applications for the security
 issues described in CVE-2006-2313 and CVE-2006-2314.
-Applications that use multiple <productname>PostgreSQL</> connections
-concurrently should migrate to <function>PQescapeStringConn()</> and
-<function>PQescapeByteaConn()</> to ensure that escaping is done correctly
+Applications that use multiple <productname>PostgreSQL</productname> connections
+concurrently should migrate to <function>PQescapeStringConn()</function> and
+<function>PQescapeByteaConn()</function> to ensure that escaping is done correctly
 for the settings in use in each database connection.  Applications that
-do string escaping <quote>by hand</> should be modified to rely on library
+do string escaping <quote>by hand</quote> should be modified to rely on library
 routines instead.
 </para></listitem>
 
 <listitem><para>Fix some incorrect encoding conversion functions</para>
-<para><function>win1251_to_iso</>, <function>alt_to_iso</>,
-<function>euc_tw_to_big5</>, <function>euc_tw_to_mic</>,
-<function>mic_to_euc_tw</> were all broken to varying
+<para><function>win1251_to_iso</function>, <function>alt_to_iso</function>,
+<function>euc_tw_to_big5</function>, <function>euc_tw_to_mic</function>,
+<function>mic_to_euc_tw</function> were all broken to varying
 extents.
 </para></listitem>
 
-<listitem><para>Clean up stray remaining uses of <literal>\'</> in strings
+<listitem><para>Clean up stray remaining uses of <literal>\'</literal> in strings
 (Bruce, Jan)</para></listitem>
 
 <listitem><para>Fix server to use custom DH SSL parameters correctly (Michael
@@ -500,7 +500,7 @@ Fuhr)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.13,
-    see <xref linkend="release-7-3-13">.
+    see <xref linkend="release-7-3-13"/>.
    </para>
   </sect2>
 
@@ -510,7 +510,7 @@ Fuhr)</para></listitem>
 <itemizedlist>
 
 <listitem><para>Fix potential crash in <command>SET
-SESSION AUTHORIZATION</> (CVE-2006-0553)</para>
+SESSION AUTHORIZATION</command> (CVE-2006-0553)</para>
 <para>An unprivileged user could crash the server process, resulting in
 momentary denial of service to other users, if the server has been compiled
 with Asserts enabled (which is not the default).
@@ -525,14 +525,14 @@ created in 7.3.11 release.
 </para></listitem>
 
 <listitem><para>Fix race condition that could lead to <quote>file already
-exists</> errors during pg_clog file creation
+exists</quote> errors during pg_clog file creation
 (Tom)</para></listitem>
 
 <listitem><para>Fix to allow restoring dumps that have cross-schema
 references to custom operators (Tom)</para></listitem>
 
-<listitem><para>Portability fix for testing presence of <function>finite</>
-and <function>isinf</> during configure (Tom)</para></listitem>
+<listitem><para>Portability fix for testing presence of <function>finite</function>
+and <function>isinf</function> during configure (Tom)</para></listitem>
 
 </itemizedlist>
 
@@ -557,10 +557,10 @@ and <function>isinf</> during configure (Tom)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
-    see <xref linkend="release-7-3-10">.
-    Also, you might need to <command>REINDEX</> indexes on textual
+    see <xref linkend="release-7-3-10"/>.
+    Also, you might need to <command>REINDEX</command> indexes on textual
     columns after updating, if you are affected by the locale or
-    <application>plperl</> issues described below.
+    <application>plperl</application> issues described below.
    </para>
   </sect2>
 
@@ -571,28 +571,28 @@ and <function>isinf</> during configure (Tom)</para></listitem>
 
 <listitem><para>Fix character string comparison for locales that consider
 different character combinations as equal, such as Hungarian (Tom)</para>
-<para>This might require <command>REINDEX</> to fix existing indexes on
+<para>This might require <command>REINDEX</command> to fix existing indexes on
 textual columns.</para></listitem>
 
 <listitem><para>Set locale environment variables during postmaster startup
-to ensure that <application>plperl</> won't change the locale later</para>
-<para>This fixes a problem that occurred if the <application>postmaster</> was
+to ensure that <application>plperl</application> won't change the locale later</para>
+<para>This fixes a problem that occurred if the <application>postmaster</application> was
 started with environment variables specifying a different locale than what
-<application>initdb</> had been told.  Under these conditions, any use of
-<application>plperl</> was likely to lead to corrupt indexes.  You might need
-<command>REINDEX</> to fix existing indexes on
+<application>initdb</application> had been told.  Under these conditions, any use of
+<application>plperl</application> was likely to lead to corrupt indexes.  You might need
+<command>REINDEX</command> to fix existing indexes on
 textual columns if this has happened to you.</para></listitem>
 
 <listitem><para>Fix longstanding bug in strpos() and regular expression
 handling in certain rarely used Asian multi-byte character sets (Tatsuo)
 </para></listitem>
 
-<listitem><para>Fix bug in <filename>/contrib/pgcrypto</> gen_salt,
+<listitem><para>Fix bug in <filename>/contrib/pgcrypto</filename> gen_salt,
 which caused it not to use all available salt space for MD5 and
 XDES algorithms (Marko Kreen, Solar Designer)</para>
 <para>Salts for Blowfish and standard DES are unaffected.</para></listitem>
 
-<listitem><para>Fix <filename>/contrib/dblink</> to throw an error,
+<listitem><para>Fix <filename>/contrib/dblink</filename> to throw an error,
 rather than crashing, when the number of columns specified is different from
 what's actually returned by the query (Joe)</para></listitem>
 
@@ -619,7 +619,7 @@ what's actually returned by the query (Joe)</para></listitem>
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
-    see <xref linkend="release-7-3-10">.
+    see <xref linkend="release-7-3-10"/>.
    </para>
   </sect2>
 
@@ -634,13 +634,13 @@ for the wrong page, leading to an Assert failure or data
 corruption.</para>
 </listitem>
 
-<listitem><para><filename>/contrib/ltree</> fixes (Teodor)</para></listitem>
+<listitem><para><filename>/contrib/ltree</filename> fixes (Teodor)</para></listitem>
 
 <listitem><para>Fix longstanding planning error for outer joins</para>
 <para>This bug sometimes caused a bogus error <quote>RIGHT JOIN is
-only supported with merge-joinable join conditions</>.</para></listitem>
+only supported with merge-joinable join conditions</quote>.</para></listitem>
 
-<listitem><para>Prevent core dump in <application>pg_autovacuum</> when a
+<listitem><para>Prevent core dump in <application>pg_autovacuum</application> when a
 table has been dropped</para></listitem>
 
 </itemizedlist>
@@ -666,7 +666,7 @@ table has been dropped</para></listitem>
    <para>
     A dump/restore is not required for those running 7.3.X.  However,
     if you are upgrading from a version earlier than 7.3.10,
-    see <xref linkend="release-7-3-10">.
+    see <xref linkend="release-7-3-10"/>.
    </para>
   </sect2>
 
@@ -674,25 +674,25 @@ table has been dropped</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Fix error that allowed <command>VACUUM</> to remove
-<literal>ctid</> chains too soon, and add more checking in code that follows
-<literal>ctid</> links</para>
+<listitem><para>Fix error that allowed <command>VACUUM</command> to remove
+<literal>ctid</literal> chains too soon, and add more checking in code that follows
+<literal>ctid</literal> links</para>
 <para>This fixes a long-standing problem that could cause crashes in very rare
 circumstances.</para></listitem>
-<listitem><para>Fix <type>CHAR()</> to properly pad spaces to the specified
+<listitem><para>Fix <type>CHAR()</type> to properly pad spaces to the specified
 length when using a multiple-byte character set (Yoshiyuki Asaba)</para>
-<para>In prior releases, the padding of <type>CHAR()</> was incorrect
+<para>In prior releases, the padding of <type>CHAR()</type> was incorrect
 because it only padded to the specified number of bytes without
 considering how many characters were stored.</para></listitem>
 <listitem><para>Fix missing rows in queries like <literal>UPDATE a=... WHERE
-a...</> with GiST index on column <literal>a</></para></listitem>
+a...</literal> with GiST index on column <literal>a</literal></para></listitem>
 <listitem><para>Improve checking for partially-written WAL
 pages</para></listitem>
 <listitem><para>Improve robustness of signal handling when SSL is
 enabled</para></listitem>
 <listitem><para>Various memory leakage fixes</para></listitem>
 <listitem><para>Various portability improvements</para></listitem>
-<listitem><para>Fix PL/pgSQL to handle <literal>var := var</> correctly when
+<listitem><para>Fix PL/pgSQL to handle <literal>var := var</literal> correctly when
 the variable is of pass-by-reference type</para></listitem>
 </itemizedlist>
 
@@ -754,17 +754,17 @@ COMMIT;
    </para>
 
    <para>
-    The above procedure must be carried out in <emphasis>each</> database
-    of an installation, including <literal>template1</>, and ideally
-    including <literal>template0</> as well.  If you do not fix the
+    The above procedure must be carried out in <emphasis>each</emphasis> database
+    of an installation, including <literal>template1</literal>, and ideally
+    including <literal>template0</literal> as well.  If you do not fix the
     template databases then any subsequently created databases will contain
-    the same error.  <literal>template1</> can be fixed in the same way
-    as any other database, but fixing <literal>template0</> requires
+    the same error.  <literal>template1</literal> can be fixed in the same way
+    as any other database, but fixing <literal>template0</literal> requires
     additional steps.  First, from any database issue:
 <programlisting>
 UPDATE pg_database SET datallowconn = true WHERE datname = 'template0';
 </programlisting>
-     Next connect to <literal>template0</> and perform the above repair
+     Next connect to <literal>template0</literal> and perform the above repair
      procedure.  Finally, do:
 <programlisting>
 -- re-freeze template0:
@@ -792,34 +792,34 @@ VACUUM</para>
 freshly-inserted data, although the scenario seems of very low probability.
 There are no known cases of it having caused more than an Assert failure.
 </para></listitem>
-<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</> values</para>
+<listitem><para>Fix comparisons of <type>TIME WITH TIME ZONE</type> values</para>
 <para>
 The comparison code was wrong in the case where the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
-NOTE: if you have an index on a <type>TIME WITH TIME ZONE</> column,
-it will need to be <command>REINDEX</>ed after installing this update, because
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
+NOTE: if you have an index on a <type>TIME WITH TIME ZONE</type> column,
+it will need to be <command>REINDEX</command>ed after installing this update, because
 the fix corrects the sort order of column values.
 </para></listitem>
-<listitem><para>Fix <function>EXTRACT(EPOCH)</> for
-<type>TIME WITH TIME ZONE</> values</para></listitem>
+<listitem><para>Fix <function>EXTRACT(EPOCH)</function> for
+<type>TIME WITH TIME ZONE</type> values</para></listitem>
 <listitem><para>Fix mis-display of negative fractional seconds in
-<type>INTERVAL</> values</para>
+<type>INTERVAL</type> values</para>
 <para>
 This error only occurred when the
-<literal>--enable-integer-datetimes</> configuration switch had been used.
+<literal>--enable-integer-datetimes</literal> configuration switch had been used.
 </para></listitem>
 <listitem><para>Additional buffer overrun checks in plpgsql
 (Neil)</para></listitem>
-<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</>
+<listitem><para>Fix pg_dump to dump trigger names containing <literal>%</literal>
 correctly (Neil)</para></listitem>
-<listitem><para>Prevent <function>to_char(interval)</> from dumping core for
+<listitem><para>Prevent <function>to_char(interval)</function> from dumping core for
 month-related formats</para></listitem>
-<listitem><para>Fix <filename>contrib/pgcrypto</> for newer OpenSSL builds
+<listitem><para>Fix <filename>contrib/pgcrypto</filename> for newer OpenSSL builds
 (Marko Kreen)</para></listitem>
 <listitem><para>Still more 64-bit fixes for
-<filename>contrib/intagg</></para></listitem>
+<filename>contrib/intagg</filename></para></listitem>
 <listitem><para>Prevent incorrect optimization of functions returning
-<type>RECORD</></para></listitem>
+<type>RECORD</type></para></listitem>
 </itemizedlist>
 
  </sect2>
@@ -850,11 +850,11 @@ month-related formats</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Disallow <command>LOAD</> to non-superusers</para>
+<listitem><para>Disallow <command>LOAD</command> to non-superusers</para>
 <para>
 On platforms that will automatically execute initialization functions of a
 shared library (this includes at least Windows and ELF-based Unixen),
-<command>LOAD</> can be used to make the server execute arbitrary code.
+<command>LOAD</command> can be used to make the server execute arbitrary code.
 Thanks to NGS Software for reporting this.</para></listitem>
 <listitem><para>Check that creator of an aggregate function has the right to
 execute the specified transition functions</para>
@@ -909,7 +909,7 @@ datestyles</para></listitem>
 <listitem><para>Repair possible failure to update hint bits on disk</para>
 <para>
 Under rare circumstances this oversight could lead to
-<quote>could not access transaction status</> failures, which qualifies
+<quote>could not access transaction status</quote> failures, which qualifies
 it as a potential-data-loss bug.
 </para></listitem>
 <listitem><para>Ensure that hashed outer join does not miss tuples</para>
@@ -1264,13 +1264,13 @@ operations on bytea columns (Joe)</para></listitem>
 
 <itemizedlist>
 <listitem><para>Restore creation of OID column in CREATE TABLE AS / SELECT INTO</para></listitem>
-<listitem><para>Fix <application>pg_dump</> core dump when dumping views having comments</para></listitem>
+<listitem><para>Fix <application>pg_dump</application> core dump when dumping views having comments</para></listitem>
 <listitem><para>Dump DEFERRABLE/INITIALLY DEFERRED constraints properly</para></listitem>
 <listitem><para>Fix UPDATE when child table's column numbering differs from parent</para></listitem>
 <listitem><para>Increase default value of max_fsm_relations</para></listitem>
 <listitem><para>Fix problem when fetching backwards in a cursor for a single-row query</para></listitem>
 <listitem><para>Make backward fetch work properly with cursor on SELECT DISTINCT query</para></listitem>
-<listitem><para>Fix problems with loading <application>pg_dump</> files containing contrib/lo usage</para></listitem>
+<listitem><para>Fix problems with loading <application>pg_dump</application> files containing contrib/lo usage</para></listitem>
 <listitem><para>Fix problem with all-numeric user names</para></listitem>
 <listitem><para>Fix possible memory leak and core dump during disconnect in libpgtcl</para></listitem>
 <listitem><para>Make plpython's spi_execute command handle nulls properly (Andrew Bosma)</para></listitem>
@@ -1328,7 +1328,7 @@ operations on bytea columns (Joe)</para></listitem>
 
 <itemizedlist>
 <listitem><para>Fix a core dump of COPY TO when client/server encodings don't match (Tom)</para></listitem>
-<listitem><para>Allow <application>pg_dump</> to work with pre-7.2 servers (Philip)</para></listitem>
+<listitem><para>Allow <application>pg_dump</application> to work with pre-7.2 servers (Philip)</para></listitem>
 <listitem><para>contrib/adddepend fixes (Tom)</para></listitem>
 <listitem><para>Fix problem with deletion of per-user/per-database config settings (Tom)</para></listitem>
 <listitem><para>contrib/vacuumlo fix (Tom)</para></listitem>
@@ -1418,7 +1418,7 @@ operations on bytea columns (Joe)</para></listitem>
       <productname>PostgreSQL</productname> now records object
       dependencies, which allows improvements in many areas.
       <command>DROP</command> statements now take either
-      <literal>CASCADE</> or <literal>RESTRICT</> to control whether
+      <literal>CASCADE</literal> or <literal>RESTRICT</literal> to control whether
       dependent objects are also dropped.
      </para>
     </listitem>
@@ -1458,7 +1458,7 @@ operations on bytea columns (Joe)</para></listitem>
     <listitem>
      <para>
       A large number of interfaces have been moved to <ulink
-      url="http://gborg.postgresql.org">http://gborg.postgresql.org</>
+      url="http://gborg.postgresql.org">http://gborg.postgresql.org</ulink>
       where they can be developed and released independently.
      </para>
     </listitem>
@@ -1469,9 +1469,9 @@ operations on bytea columns (Joe)</para></listitem>
     <listitem>
      <para>
       By default, functions can now take up to 32 parameters, and
-      identifiers can be up to 63 bytes long.  Also, <literal>OPAQUE</>
-      is now deprecated: there are specific <quote>pseudo-datatypes</>
-      to represent each of the former meanings of <literal>OPAQUE</>
+      identifiers can be up to 63 bytes long.  Also, <literal>OPAQUE</literal>
+      is now deprecated: there are specific <quote>pseudo-datatypes</quote>
+      to represent each of the former meanings of <literal>OPAQUE</literal>
       in function argument and result types.
      </para>
     </listitem>
@@ -1484,12 +1484,12 @@ operations on bytea columns (Joe)</para></listitem>
   <title>Migration to Version 7.3</title>
 
   <para>
-   A dump/restore using <application>pg_dump</> is required for those
+   A dump/restore using <application>pg_dump</application> is required for those
    wishing to migrate data from any previous release. If your
    application examines the system catalogs, additional changes will
    be required due to the introduction of schemas in 7.3; for more
    information, see: <ulink
-   url="http://developer.postgresql.org/~momjian/upgrade_tips_7.3"></>.
+   url="http://developer.postgresql.org/~momjian/upgrade_tips_7.3"></ulink>.
   </para>
 
   <para>
@@ -1538,7 +1538,7 @@ operations on bytea columns (Joe)</para></listitem>
    <listitem>
     <para>
      <type>serial</type> columns are no longer automatically
-     <literal>UNIQUE</>; thus, an index will not automatically be
+     <literal>UNIQUE</literal>; thus, an index will not automatically be
      created.
     </para>
    </listitem>
@@ -1724,7 +1724,7 @@ operations on bytea columns (Joe)</para></listitem>
 <itemizedlist>
 <listitem><para>Have COPY TO output embedded carriage returns and newlines as \r and \n (Tom)</para></listitem>
 <listitem><para>Allow DELIMITER in COPY FROM to be 8-bit clean (Tatsuo)</para></listitem>
-<listitem><para>Make <application>pg_dump</> use ALTER TABLE ADD PRIMARY KEY, for performance (Neil)</para></listitem>
+<listitem><para>Make <application>pg_dump</application> use ALTER TABLE ADD PRIMARY KEY, for performance (Neil)</para></listitem>
 <listitem><para>Disable brackets in multistatement rules (Bruce)</para></listitem>
 <listitem><para>Disable VACUUM from being called inside a function (Bruce)</para></listitem>
 <listitem><para>Allow dropdb and other scripts to use identifiers with spaces (Bruce)</para></listitem>
@@ -1736,7 +1736,7 @@ operations on bytea columns (Joe)</para></listitem>
 <listitem><para>Add 'SET LOCAL var = value' to set configuration variables for a single transaction (Tom)</para></listitem>
 <listitem><para>Allow ANALYZE to run in a transaction (Bruce)</para></listitem>
 <listitem><para>Improve COPY syntax using new WITH clauses, keep backward compatibility (Bruce)</para></listitem>
-<listitem><para>Fix <application>pg_dump</> to consistently output tags in non-ASCII dumps (Bruce)</para></listitem>
+<listitem><para>Fix <application>pg_dump</application> to consistently output tags in non-ASCII dumps (Bruce)</para></listitem>
 <listitem><para>Make foreign key constraints clearer in dump file (Rod)</para></listitem>
 <listitem><para>Add COMMENT ON CONSTRAINT (Rod)</para></listitem>
 <listitem><para>Allow COPY TO/FROM to specify column names (Brent Verner)</para></listitem>
@@ -1745,9 +1745,9 @@ operations on bytea columns (Joe)</para></listitem>
 <listitem><para>Generate failure on short COPY lines rather than pad NULLs (Neil)</para></listitem>
 <listitem><para>Fix CLUSTER to preserve all table attributes (Alvaro Herrera)</para></listitem>
 <listitem><para>New pg_settings table to view/modify GUC settings (Joe)</para></listitem>
-<listitem><para>Add smart quoting, portability improvements to <application>pg_dump</> output (Peter)</para></listitem>
+<listitem><para>Add smart quoting, portability improvements to <application>pg_dump</application> output (Peter)</para></listitem>
 <listitem><para>Dump serial columns out as SERIAL (Tom)</para></listitem>
-<listitem><para>Enable large file support, &gt;2G for <application>pg_dump</> (Peter, Philip Warner, Bruce)</para></listitem>
+<listitem><para>Enable large file support, &gt;2G for <application>pg_dump</application> (Peter, Philip Warner, Bruce)</para></listitem>
 <listitem><para>Disallow TRUNCATE on tables that are involved in referential constraints (Rod)</para></listitem>
 <listitem><para>Have TRUNCATE also auto-truncate the toast table of the relation (Tom)</para></listitem>
 <listitem><para>Add clusterdb utility that will auto-cluster an entire database based on previous CLUSTER operations (Alvaro Herrera)</para></listitem>
@@ -2020,15 +2020,15 @@ VACUUM</para>
 freshly-inserted data, although the scenario seems of very low probability.
 There are no known cases of it having caused more than an Assert failure.
 </para></listitem>
-<listitem><para>Fix <function>EXTRACT(EPOCH)</> for
-<type>TIME WITH TIME ZONE</> values</para></listitem>
+<listitem><para>Fix <function>EXTRACT(EPOCH)</function> for
+<type>TIME WITH TIME ZONE</type> values</para></listitem>
 <listitem><para>Additional buffer overrun checks in plpgsql
 (Neil)</para></listitem>
 <listitem><para>Fix pg_dump to dump index names and trigger names containing
-<literal>%</> correctly (Neil)</para></listitem>
-<listitem><para>Prevent <function>to_char(interval)</> from dumping core for
+<literal>%</literal> correctly (Neil)</para></listitem>
+<listitem><para>Prevent <function>to_char(interval)</function> from dumping core for
 month-related formats</para></listitem>
-<listitem><para>Fix <filename>contrib/pgcrypto</> for newer OpenSSL builds
+<listitem><para>Fix <filename>contrib/pgcrypto</filename> for newer OpenSSL builds
 (Marko Kreen)</para></listitem>
 </itemizedlist>
 
@@ -2060,11 +2060,11 @@ month-related formats</para></listitem>
    <title>Changes</title>
 
 <itemizedlist>
-<listitem><para>Disallow <command>LOAD</> to non-superusers</para>
+<listitem><para>Disallow <command>LOAD</command> to non-superusers</para>
 <para>
 On platforms that will automatically execute initialization functions of a
 shared library (this includes at least Windows and ELF-based Unixen),
-<command>LOAD</> can be used to make the server execute arbitrary code.
+<command>LOAD</command> can be used to make the server execute arbitrary code.
 Thanks to NGS Software for reporting this.</para></listitem>
 <listitem><para>Add needed STRICT marking to some contrib functions (Kris
 Jurka)</para></listitem>
@@ -2111,7 +2111,7 @@ datestyles</para></listitem>
 <listitem><para>Repair possible failure to update hint bits on disk</para>
 <para>
 Under rare circumstances this oversight could lead to
-<quote>could not access transaction status</> failures, which qualifies
+<quote>could not access transaction status</quote> failures, which qualifies
 it as a potential-data-loss bug.
 </para></listitem>
 <listitem><para>Ensure that hashed outer join does not miss tuples</para>
@@ -2247,7 +2247,7 @@ since <productname>PostgreSQL</productname> 7.1.
 <listitem><para>Handle pre-1970 date values in newer versions of glibc (Tom)</para></listitem>
 <listitem><para>Fix possible hang during server shutdown</para></listitem>
 <listitem><para>Prevent spinlock hangs on SMP PPC machines (Tomoyuki Niijima)</para></listitem>
-<listitem><para>Fix <application>pg_dump</> to properly dump FULL JOIN USING (Tom)</para></listitem>
+<listitem><para>Fix <application>pg_dump</application> to properly dump FULL JOIN USING (Tom)</para></listitem>
 </itemizedlist>
  </sect2>
 </sect1>
@@ -2281,7 +2281,7 @@ since <productname>PostgreSQL</productname> 7.1.
 <listitem><para>Allow EXECUTE of "CREATE TABLE AS ... SELECT" in PL/pgSQL (Tom)</para></listitem>
 <listitem><para>Fix for compressed transaction log id wraparound (Tom)</para></listitem>
 <listitem><para>Fix PQescapeBytea/PQunescapeBytea so that they handle bytes &gt; 0x7f (Tatsuo)</para></listitem>
-<listitem><para>Fix for psql and <application>pg_dump</> crashing when invoked with non-existent long options (Tatsuo)</para></listitem>
+<listitem><para>Fix for psql and <application>pg_dump</application> crashing when invoked with non-existent long options (Tatsuo)</para></listitem>
 <listitem><para>Fix crash when invoking geometric operators (Tom)</para></listitem>
 <listitem><para>Allow OPEN cursor(args) (Tom)</para></listitem>
 <listitem><para>Fix for rtree_gist index build (Teodor)</para></listitem>
@@ -2354,7 +2354,7 @@ since <productname>PostgreSQL</productname> 7.1.
   <title>Overview</title>
 
   <para>
-   This release improves <productname>PostgreSQL</> for use in
+   This release improves <productname>PostgreSQL</productname> for use in
    high-volume applications.
   </para>
 
@@ -2368,7 +2368,7 @@ since <productname>PostgreSQL</productname> 7.1.
     <listitem>
      <para>
       Vacuuming no longer locks tables, thus allowing normal user
-      access during the vacuum.  A new <command>VACUUM FULL</>
+      access during the vacuum.  A new <command>VACUUM FULL</command>
       command does old-style vacuum by locking the table and
       shrinking the on-disk copy of the table.
      </para>
@@ -2400,7 +2400,7 @@ since <productname>PostgreSQL</productname> 7.1.
     <listitem>
      <para>
       The system now computes histogram column statistics during
-      <command>ANALYZE</>, allowing much better optimizer choices.
+      <command>ANALYZE</command>, allowing much better optimizer choices.
      </para>
     </listitem>
    </varlistentry>
@@ -2472,15 +2472,15 @@ since <productname>PostgreSQL</productname> 7.1.
 
    <listitem>
     <para>
-     The <filename>pg_hba.conf</> and <filename>pg_ident.conf</>
+     The <filename>pg_hba.conf</filename> and <filename>pg_ident.conf</filename>
      configuration is now only reloaded after receiving a
-     <systemitem>SIGHUP</> signal, not with each connection.
+     <systemitem>SIGHUP</systemitem> signal, not with each connection.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     The function <filename>octet_length()</> now returns the uncompressed data length.
+     The function <filename>octet_length()</filename> now returns the uncompressed data length.
     </para>
    </listitem>
 
@@ -2693,7 +2693,7 @@ since <productname>PostgreSQL</productname> 7.1.
   <sect3>
    <title>Internationalization</title>
 <itemizedlist>
-<listitem><para>National language support in psql, <application>pg_dump</>, libpq, and server (Peter E)</para></listitem>
+<listitem><para>National language support in psql, <application>pg_dump</application>, libpq, and server (Peter E)</para></listitem>
 <listitem><para>Message translations in Chinese (simplified, traditional), Czech, French, German, Hungarian, Russian, Swedish (Peter E, Serguei A. Mokhov, Karel Zak, Weiping He, Zhenbang Wei, Kovacs Zoltan)</para></listitem>
 <listitem><para>Make trim, ltrim, rtrim, btrim, lpad, rpad, translate multibyte aware (Tatsuo)</para></listitem>
 <listitem><para>Add LATIN5,6,7,8,9,10 support (Tatsuo)</para></listitem>
@@ -2705,7 +2705,7 @@ since <productname>PostgreSQL</productname> 7.1.
   </sect3>
 
   <sect3>
-   <title><application>PL/pgSQL</></title>
+   <title><application>PL/pgSQL</application></title>
 <itemizedlist>
 <listitem><para>Now uses portals for SELECT loops, allowing huge result sets (Jan)</para></listitem>
 <listitem><para>CURSOR and REFCURSOR support (Jan)</para></listitem>
@@ -2745,7 +2745,7 @@ since <productname>PostgreSQL</productname> 7.1.
   </sect3>
 
   <sect3>
-   <title><application>psql</></title>
+   <title><application>psql</application></title>
 <itemizedlist>
 <listitem><para>\d displays indexes in unique, primary groupings (Christopher Kings-Lynne)</para></listitem>
 <listitem><para>Allow trailing semicolons in backslash commands (Greg Sabino Mullane)</para></listitem>
@@ -2756,7 +2756,7 @@ since <productname>PostgreSQL</productname> 7.1.
   </sect3>
 
   <sect3>
-   <title><application>libpq</></title>
+   <title><application>libpq</application></title>
 <itemizedlist>
 <listitem><para>New function PQescapeString() to escape quotes in command strings (Florian Weimer)</para></listitem>
 <listitem><para>New function PQescapeBytea() escapes binary strings for use as SQL string literals</para></listitem>
@@ -2818,7 +2818,7 @@ since <productname>PostgreSQL</productname> 7.1.
   </sect3>
 
   <sect3>
-   <title><application>ECPG</></title>
+   <title><application>ECPG</application></title>
 <itemizedlist>
 <listitem><para>EXECUTE ... INTO implemented (Christof Petig)</para></listitem>
 <listitem><para>Multiple row descriptor support (e.g. CARDINALITY) (Christof Petig)</para></listitem>
@@ -2839,7 +2839,7 @@ since <productname>PostgreSQL</productname> 7.1.
 <listitem><para>Python fix fetchone() (Gerhard Haring)</para></listitem>
 <listitem><para>Use UTF, Unicode in Tcl where appropriate (Vsevolod Lobko, Reinhard Max)</para></listitem>
 <listitem><para>Add Tcl COPY TO/FROM (ljb)</para></listitem>
-<listitem><para>Prevent output of default index op class in <application>pg_dump</> (Tom)</para></listitem>
+<listitem><para>Prevent output of default index op class in <application>pg_dump</application> (Tom)</para></listitem>
 <listitem><para>Fix libpgeasy memory leak (Bruce)</para></listitem>
 </itemizedlist>
   </sect3>
@@ -3547,9 +3547,9 @@ ecpg changes (Michael)
     <listitem>
      <para>
       SQL92 join syntax is now supported, though only as
-      <literal>INNER JOIN</> for this release. <literal>JOIN</>,
-      <literal>NATURAL JOIN</>, <literal>JOIN</>/<literal>USING</>,
-      and <literal>JOIN</>/<literal>ON</> are available, as are
+      <literal>INNER JOIN</literal> for this release. <literal>JOIN</literal>,
+      <literal>NATURAL JOIN</literal>, <literal>JOIN</literal>/<literal>USING</literal>,
+      and <literal>JOIN</literal>/<literal>ON</literal> are available, as are
       column correlation names.
      </para>
     </listitem>
@@ -3959,7 +3959,7 @@ New multibyte encodings
 
   <para>
    This is basically a cleanup release for 6.5.2.  We have added a new
-   <application>PgAccess</> that was missing in 6.5.2, and installed an NT-specific fix.
+   <application>PgAccess</application> that was missing in 6.5.2, and installed an NT-specific fix.
   </para>
 
 
@@ -4209,7 +4209,7 @@ Add Win1250 (Czech) support (Pavel Behal)
      <listitem>
       <para>
        We continue to expand our port list, this time including
-       <systemitem class="osname">Windows NT</>/<systemitem>ix86</> and <systemitem class="osname">NetBSD</>/<systemitem>arm32</>.
+       <systemitem class="osname">Windows NT</systemitem>/<systemitem>ix86</systemitem> and <systemitem class="osname">NetBSD</systemitem>/<systemitem>arm32</systemitem>.
       </para>
      </listitem>
     </varlistentry>
@@ -4234,7 +4234,7 @@ Add Win1250 (Czech) support (Pavel Behal)
       <para>
        New and updated material is present throughout the
        documentation. New <acronym>FAQ</acronym>s have been
-       contributed for <systemitem class="osname">SGI</> and <systemitem class="osname">AIX</> platforms.
+       contributed for <systemitem class="osname">SGI</systemitem> and <systemitem class="osname">AIX</systemitem> platforms.
        The <citetitle>Tutorial</citetitle> has introductory information
        on <acronym>SQL</acronym> from Stefan Simkovics.
        For the <citetitle>User's Guide</citetitle>, there are
@@ -4926,7 +4926,7 @@ Correctly handles function calls on the left side of BETWEEN and LIKE clauses.
 </para>
 <para>
 A dump/restore is NOT required for those running 6.3 or 6.3.1.  A
-<literal>make distclean</>, <literal>make</>, and <literal>make install</> is all that is required.
+<literal>make distclean</literal>, <literal>make</literal>, and <literal>make install</literal> is all that is required.
 This last step should be performed while the postmaster is not running.
 You should re-link any custom applications that use <productname>PostgreSQL</productname> libraries.
 </para>
@@ -5003,7 +5003,7 @@ Improvements to the configuration autodetection for installation.
 </para>
 <para>
 A dump/restore is NOT required for those running 6.3.  A
-<literal>make distclean</>, <literal>make</>, and <literal>make install</> is all that is required.
+<literal>make distclean</literal>, <literal>make</literal>, and <literal>make install</literal> is all that is required.
 This last step should be performed while the postmaster is not running.
 You should re-link any custom applications that use <productname>PostgreSQL</productname> libraries.
 </para>
@@ -5128,7 +5128,7 @@ Better identify tcl and tk libs and includes(Bruce)
   </para>
   <para>
    Third, <type>char()</type> fields will now allow faster access than <type>varchar()</type> or
-   <type>text</type>. Specifically, the <type>text</> and <type>varchar()</type> have a penalty for access to
+   <type>text</type>. Specifically, the <type>text</type> and <type>varchar()</type> have a penalty for access to
    any columns after the first column of this type.  <type>char()</type> used to also
    have this access penalty, but it no longer does.  This might suggest that
    you redesign some of your tables, especially if you have short character
@@ -5470,7 +5470,7 @@ to dump the 6.1 database.
 </sect2>
 
 <sect2>
-<title>Migration from version 1.<replaceable>x</> to version 6.2</title>
+<title>Migration from version 1.<replaceable>x</replaceable> to version 6.2</title>
 
 <para>
 Those migrating from earlier 1.* releases should first upgrade to 1.09
@@ -5689,11 +5689,11 @@ optimizer which uses <firstterm>genetic</firstterm>
 </para>
 
 <para>
- The <quote>random</> results in the random test should cause the
+ The <quote>random</quote> results in the random test should cause the
  <quote>random</quote> test to be <quote>failed</quote>, since the
  regression tests are evaluated using a simple diff. However,
- <quote>random</> does not seem to produce random results on my test
- machine (Linux/<application>gcc</>/i686).
+ <quote>random</quote> does not seem to produce random results on my test
+ machine (Linux/<application>gcc</application>/i686).
 </para>
 
 <sect2>
@@ -5990,16 +5990,16 @@ and a script to convert old <acronym>ASCII</acronym> files.
 <note>
 <para>
 The following notes are for the benefit of users who want to migrate
-databases from <productname>Postgres95</> 1.01 and 1.02 to <productname>Postgres95</> 1.02.1.
+databases from <productname>Postgres95</productname> 1.01 and 1.02 to <productname>Postgres95</productname> 1.02.1.
 </para>
 <para>
-If you are starting afresh with <productname>Postgres95</> 1.02.1 and do not need
+If you are starting afresh with <productname>Postgres95</productname> 1.02.1 and do not need
 to migrate old databases, you do not need to read any further.
 </para>
 </note>
 
 <para>
-In order to upgrade older <productname>Postgres95</> version 1.01 or 1.02 databases to
+In order to upgrade older <productname>Postgres95</productname> version 1.01 or 1.02 databases to
 version 1.02.1, the following steps are required:
 </para>
 <procedure>
@@ -6013,7 +6013,7 @@ Start up a new 1.02.1 postmaster
 Add the new built-in functions and operators of 1.02.1 to 1.01 or 1.02
   databases.  This is done by running the new 1.02.1 server against
   your own 1.01 or 1.02 database and applying the queries attached at
-  the end of the file.   This can be done easily through <command>psql</>.  If your
+  the end of the file.   This can be done easily through <command>psql</command>.  If your
   1.01 or 1.02 database is named <literal>testdb</literal> and you have cut the commands
   from the end of this file and saved them in <filename>addfunc.sql</filename>:
 <programlisting>
@@ -6044,7 +6044,7 @@ sed 's/^\.$/\\./g' &lt;in_file &gt;out_file
 </programlisting>
 </para>
 <para>
-If you are loading an older binary copy or non-<systemitem>stdout</> copy, there is no
+If you are loading an older binary copy or non-<systemitem>stdout</systemitem> copy, there is no
 end-of-data character, and hence no conversion necessary.
 
 <programlisting>
@@ -6135,15 +6135,15 @@ Contributors (apologies to any missed)
 
 <para>
 The following notes are for the benefit of users who want to migrate
-databases from <productname>Postgres95</> 1.0 to <productname>Postgres95</> 1.01.
+databases from <productname>Postgres95</productname> 1.0 to <productname>Postgres95</productname> 1.01.
 </para>
 <para>
-If you are starting afresh with <productname>Postgres95</> 1.01 and do not need
+If you are starting afresh with <productname>Postgres95</productname> 1.01 and do not need
 to migrate old databases, you do not need to read any further.
 </para>
 <para>
-In order to <productname>Postgres95</> version 1.01 with databases created with
-<productname>Postgres95</> version 1.0, the following steps are required:
+In order to <productname>Postgres95</productname> version 1.01 with databases created with
+<productname>Postgres95</productname> version 1.0, the following steps are required:
 </para>
 <procedure>
 <step>
@@ -6555,103 +6555,3 @@ The following bugs have been fixed in postgres95-beta-0.02:
 Initial release.
 </para>
 </sect1>
-
-<![IGNORE[
-  <sect1 id="timing-results">
-   <title>Timing Results</title>
-
-   <para>
-    These timing results are from running the regression test with the commands
-
-<programlisting>
-% cd src/test/regress
-% make all
-% time make runtest
-</programlisting>
-   </para>
-   <para>
-    Timing under Linux 2.0.27 seems to have a roughly 5% variation from run
-    to run, presumably due to the scheduling vagaries of multitasking systems.
-   </para>
-
-   <sect2>
-    <title>Version 6.5</title>
-
-    <para>
-     As has been the case for previous releases, timing between
-     releases is not directly comparable since new regression tests
-     have been added. In general, 6.5 is faster than previous
-     releases.
-    </para>
-
-    <para>
-     Timing with <function>fsync()</function> disabled:
-
-<literallayout class="monospaced">
-Time   System
-02:00  Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
-04:38  Sparc Ultra 1 143MHz, 64MB, Solaris 2.6
-</literallayout>
-    </para>
-
-    <para>
-     Timing with <function>fsync()</function> enabled:
-
-<literallayout class="monospaced">
-Time   System
-04:21  Dual Pentium Pro 180, 224MB, UW-SCSI, Linux 2.0.36, gcc 2.7.2.3 -O2 -m486
-</literallayout>
-
-     For the <systemitem class="osname">Linux</systemitem> system above, using <acronym>UW-SCSI</acronym> disks rather than (older) <acronym>IDE</acronym>
-     disks leads to a 50% improvement in speed on the regression test.
-    </para>
-   </sect2>
-
-<sect2>
-<title>Version 6.4beta</title>
-
-<para>
-The times for this release are not directly comparable to those for previous releases
-since some additional regression tests have been included.
-In general, however, 6.4 should be slightly faster than the previous release (thanks, Bruce!).
-</para>
-<para>
-<literallayout class="monospaced">
-Time   System
-02:26  Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
-</literallayout>
-</para>
-</sect2>
-
-<sect2>
-<title>Version 6.3</title>
-
-<para>
-The times for this release are not directly comparable to those for previous releases
-since some additional regression tests have been included and some obsolete tests involving
-time travel have been removed.
-In general, however, 6.3 is substantially faster than previous releases (thanks, Bruce!).
-</para>
-<para>
-<programlisting>
-  Time   System
-  02:30  Dual Pentium Pro 180, 96MB, UW-SCSI, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
-  04:12  Dual Pentium Pro 180, 96MB, EIDE, Linux 2.0.30, gcc 2.7.2.1 -O2 -m486
-</programlisting>
-</para>
-</sect2>
-
-<sect2>
-<title>Version 6.1</title>
-
-<para>
-<programlisting>
-  Time   System
-  06:12  Pentium Pro 180, 32MB, EIDE, Linux 2.0.30, gcc 2.7.2 -O2 -m486
-  12:06  P-100, 48MB, Linux 2.0.29, gcc
-  39:58  Sparc IPC 32MB, Solaris 2.5, gcc 2.7.2.1 -O -g
-</programlisting>
-</para>
-</sect2>
-</sect1>
-]]>
diff --git a/doc/src/sgml/release.sgml b/doc/src/sgml/release.sgml
index f1f4e91252..a815a48b8d 100644
--- a/doc/src/sgml/release.sgml
+++ b/doc/src/sgml/release.sgml
@@ -44,7 +44,7 @@ For new features, add links to the documentation sections.
 
   <para>
    The release notes contain the significant changes in each
-   <productname>PostgreSQL</> release, with major features and migration
+   <productname>PostgreSQL</productname> release, with major features and migration
    issues listed at the top.  The release notes do not contain changes
    that affect only a few users or changes that are internal and therefore not
    user-visible.  For example, the optimizer is improved in almost every
diff --git a/doc/src/sgml/replication-origins.sgml b/doc/src/sgml/replication-origins.sgml
index 317ca9a1df..a03ce76e2e 100644
--- a/doc/src/sgml/replication-origins.sgml
+++ b/doc/src/sgml/replication-origins.sgml
@@ -83,7 +83,7 @@
   replication and inefficiencies. Replication origins provide an optional
   mechanism to recognize and prevent that. When configured using the functions
   referenced in the previous paragraph, every change and transaction passed to
-  output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin">)
+  output plugin callbacks (see <xref linkend="logicaldecoding-output-plugin"/>)
   generated by the session is tagged with the replication origin of the
   generating session.  This allows treating them differently in the output
   plugin, e.g. ignoring all but locally-originating rows.  Additionally
diff --git a/doc/src/sgml/rowtypes.sgml b/doc/src/sgml/rowtypes.sgml
index 9d6768e006..3f24293175 100644
--- a/doc/src/sgml/rowtypes.sgml
+++ b/doc/src/sgml/rowtypes.sgml
@@ -12,7 +12,7 @@
  </indexterm>
 
  <para>
-  A <firstterm>composite type</> represents the structure of a row or record;
+  A <firstterm>composite type</firstterm> represents the structure of a row or record;
   it is essentially just a list of field names and their data types.
   <productname>PostgreSQL</productname> allows  composite types to be
   used in many of the same ways that simple types can be used.  For example, a
@@ -36,11 +36,11 @@ CREATE TYPE inventory_item AS (
     price           numeric
 );
 </programlisting>
-  The syntax is comparable to <command>CREATE TABLE</>, except that only
+  The syntax is comparable to <command>CREATE TABLE</command>, except that only
   field names and types can be specified; no constraints (such as <literal>NOT
-  NULL</>) can presently be included.  Note that the <literal>AS</> keyword
+  NULL</literal>) can presently be included.  Note that the <literal>AS</literal> keyword
   is essential; without it, the system will think a different kind
-  of <command>CREATE TYPE</> command is meant, and you will get odd syntax
+  of <command>CREATE TYPE</command> command is meant, and you will get odd syntax
   errors.
  </para>
 
@@ -78,14 +78,15 @@ CREATE TABLE inventory_item (
     price           numeric CHECK (price &gt; 0)
 );
 </programlisting>
-  then the same <literal>inventory_item</> composite type shown above would
+  then the same <literal>inventory_item</literal> composite type shown above would
   come into being as a
   byproduct, and could be used just as above.  Note however an important
   restriction of the current implementation: since no constraints are
   associated with a composite type, the constraints shown in the table
-  definition <emphasis>do not apply</> to values of the composite type
-  outside the table.  (A partial workaround is to use domain
-  types as members of composite types.)
+  definition <emphasis>do not apply</emphasis> to values of the composite type
+  outside the table.  (To work around this, create a domain over the composite
+  type, and apply the desired constraints as <literal>CHECK</literal>
+  constraints of the domain.)
  </para>
  </sect2>
 
@@ -111,7 +112,7 @@ CREATE TABLE inventory_item (
 <programlisting>
 '("fuzzy dice",42,1.99)'
 </programlisting>
-   which would be a valid value of the <literal>inventory_item</> type
+   which would be a valid value of the <literal>inventory_item</literal> type
    defined above.  To make a field be NULL, write no characters at all
    in its position in the list.  For example, this constant specifies
    a NULL third field:
@@ -128,7 +129,7 @@ CREATE TABLE inventory_item (
   <para>
    (These constants are actually only a special case of
    the generic type constants discussed in <xref
-   linkend="sql-syntax-constants-generic">.  The constant is initially
+   linkend="sql-syntax-constants-generic"/>.  The constant is initially
    treated as a string and passed to the composite-type input conversion
    routine.  An explicit type specification might be necessary to tell
    which type to convert the constant to.)
@@ -150,8 +151,8 @@ ROW('', 42, NULL)
 ('fuzzy dice', 42, 1.99)
 ('', 42, NULL)
 </programlisting>
-  The <literal>ROW</> expression syntax is discussed in more detail in <xref
-  linkend="sql-syntax-row-constructors">.
+  The <literal>ROW</literal> expression syntax is discussed in more detail in <xref
+  linkend="sql-syntax-row-constructors"/>.
  </para>
  </sect2>
 
@@ -163,15 +164,15 @@ ROW('', 42, NULL)
   name, much like selecting a field from a table name.  In fact, it's so
   much like selecting from a table name that you often have to use parentheses
   to keep from confusing the parser.  For example, you might try to select
-  some subfields from our <literal>on_hand</> example table with something
+  some subfields from our <literal>on_hand</literal> example table with something
   like:
 
 <programlisting>
 SELECT item.name FROM on_hand WHERE item.price &gt; 9.99;
 </programlisting>
 
-  This will not work since the name <literal>item</> is taken to be a table
-  name, not a column name of <literal>on_hand</>, per SQL syntax rules.
+  This will not work since the name <literal>item</literal> is taken to be a table
+  name, not a column name of <literal>on_hand</literal>, per SQL syntax rules.
   You must write it like this:
 
 <programlisting>
@@ -186,7 +187,7 @@ SELECT (on_hand.item).name FROM on_hand WHERE (on_hand.item).price &gt; 9.99;
 </programlisting>
 
   Now the parenthesized object is correctly interpreted as a reference to
-  the <literal>item</> column, and then the subfield can be selected from it.
+  the <literal>item</literal> column, and then the subfield can be selected from it.
  </para>
 
  <para>
@@ -202,8 +203,8 @@ SELECT (my_func(...)).field FROM ...
  </para>
 
  <para>
-  The special field name <literal>*</> means <quote>all fields</>, as
-  further explained in <xref linkend="rowtypes-usage">.
+  The special field name <literal>*</literal> means <quote>all fields</quote>, as
+  further explained in <xref linkend="rowtypes-usage"/>.
  </para>
  </sect2>
 
@@ -221,7 +222,7 @@ INSERT INTO mytab (complex_col) VALUES((1.1,2.2));
 UPDATE mytab SET complex_col = ROW(1.1,2.2) WHERE ...;
 </programlisting>
 
-  The first example omits <literal>ROW</>, the second uses it; we
+  The first example omits <literal>ROW</literal>, the second uses it; we
   could have done it either way.
  </para>
 
@@ -234,12 +235,12 @@ UPDATE mytab SET complex_col.r = (complex_col).r + 1 WHERE ...;
 
   Notice here that we don't need to (and indeed cannot)
   put parentheses around the column name appearing just after
-  <literal>SET</>, but we do need parentheses when referencing the same
+  <literal>SET</literal>, but we do need parentheses when referencing the same
   column in the expression to the right of the equal sign.
  </para>
 
  <para>
-  And we can specify subfields as targets for <command>INSERT</>, too:
+  And we can specify subfields as targets for <command>INSERT</command>, too:
 
 <programlisting>
 INSERT INTO mytab (complex_col.r, complex_col.i) VALUES(1.1, 2.2);
@@ -260,10 +261,10 @@ INSERT INTO mytab (complex_col.r, complex_col.i) VALUES(1.1, 2.2);
   </para>
 
   <para>
-   In <productname>PostgreSQL</>, a reference to a table name (or alias)
+   In <productname>PostgreSQL</productname>, a reference to a table name (or alias)
    in a query is effectively a reference to the composite value of the
    table's current row.  For example, if we had a table
-   <structname>inventory_item</> as shown
+   <structname>inventory_item</structname> as shown
    <link linkend="rowtypes-declaring">above</link>, we could write:
 <programlisting>
 SELECT c FROM inventory_item c;
@@ -278,12 +279,12 @@ SELECT c FROM inventory_item c;
 </programlisting>
    Note however that simple names are matched to column names before table
    names, so this example works only because there is no column
-   named <structfield>c</> in the query's tables.
+   named <structfield>c</structfield> in the query's tables.
   </para>
 
   <para>
    The ordinary qualified-column-name
-   syntax <replaceable>table_name</><literal>.</><replaceable>column_name</>
+   syntax <replaceable>table_name</replaceable><literal>.</literal><replaceable>column_name</replaceable>
    can be understood as applying <link linkend="field-selection">field
    selection</link> to the composite value of the table's current row.
    (For efficiency reasons, it's not actually implemented that way.)
@@ -306,13 +307,13 @@ SELECT c.* FROM inventory_item c;
 <programlisting>
 SELECT c.name, c.supplier_id, c.price FROM inventory_item c;
 </programlisting>
-   <productname>PostgreSQL</> will apply this expansion behavior to
+   <productname>PostgreSQL</productname> will apply this expansion behavior to
    any composite-valued expression, although as shown <link
    linkend="rowtypes-accessing">above</link>, you need to write parentheses
-   around the value that <literal>.*</> is applied to whenever it's not a
-   simple table name.  For example, if <function>myfunc()</> is a function
-   returning a composite type with columns <structfield>a</>,
-   <structfield>b</>, and <structfield>c</>, then these two queries have the
+   around the value that <literal>.*</literal> is applied to whenever it's not a
+   simple table name.  For example, if <function>myfunc()</function> is a function
+   returning a composite type with columns <structfield>a</structfield>,
+   <structfield>b</structfield>, and <structfield>c</structfield>, then these two queries have the
    same result:
 <programlisting>
 SELECT (myfunc(x)).* FROM some_table;
@@ -322,33 +323,38 @@ SELECT (myfunc(x)).a, (myfunc(x)).b, (myfunc(x)).c FROM some_table;
 
   <tip>
    <para>
-    <productname>PostgreSQL</> handles column expansion by
+    <productname>PostgreSQL</productname> handles column expansion by
     actually transforming the first form into the second.  So, in this
-    example, <function>myfunc()</> would get invoked three times per row
+    example, <function>myfunc()</function> would get invoked three times per row
     with either syntax.  If it's an expensive function you may wish to
     avoid that, which you can do with a query like:
 <programlisting>
-SELECT (m).* FROM (SELECT myfunc(x) AS m FROM some_table OFFSET 0) ss;
+SELECT m.* FROM some_table, LATERAL myfunc(x) AS m;
 </programlisting>
-    The <literal>OFFSET 0</> clause keeps the optimizer
-    from <quote>flattening</> the sub-select to arrive at the form with
-    multiple calls of <function>myfunc()</>.
+    Placing the function in
+    a <literal>LATERAL</literal> <literal>FROM</literal> item keeps it from
+    being invoked more than once per row.  <literal>m.*</literal> is still
+    expanded into <literal>m.a, m.b, m.c</literal>, but now those variables
+    are just references to the output of the <literal>FROM</literal> item.
+    (The <literal>LATERAL</literal> keyword is optional here, but we show it
+    to clarify that the function is getting <structfield>x</structfield>
+    from <structname>some_table</structname>.)
    </para>
   </tip>
 
   <para>
-   The <replaceable>composite_value</><literal>.*</> syntax results in
+   The <replaceable>composite_value</replaceable><literal>.*</literal> syntax results in
    column expansion of this kind when it appears at the top level of
-   a <link linkend="queries-select-lists"><command>SELECT</> output
-   list</link>, a <link linkend="dml-returning"><literal>RETURNING</>
-   list</link> in <command>INSERT</>/<command>UPDATE</>/<command>DELETE</>,
-   a <link linkend="queries-values"><literal>VALUES</> clause</link>, or
+   a <link linkend="queries-select-lists"><command>SELECT</command> output
+   list</link>, a <link linkend="dml-returning"><literal>RETURNING</literal>
+   list</link> in <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command>,
+   a <link linkend="queries-values"><literal>VALUES</literal> clause</link>, or
    a <link linkend="sql-syntax-row-constructors">row constructor</link>.
    In all other contexts (including when nested inside one of those
-   constructs), attaching <literal>.*</> to a composite value does not
-   change the value, since it means <quote>all columns</> and so the
+   constructs), attaching <literal>.*</literal> to a composite value does not
+   change the value, since it means <quote>all columns</quote> and so the
    same composite value is produced again.  For example,
-   if <function>somefunc()</> accepts a composite-valued argument,
+   if <function>somefunc()</function> accepts a composite-valued argument,
    these queries are the same:
 
 <programlisting>
@@ -356,16 +362,16 @@ SELECT somefunc(c.*) FROM inventory_item c;
 SELECT somefunc(c) FROM inventory_item c;
 </programlisting>
 
-   In both cases, the current row of <structname>inventory_item</> is
+   In both cases, the current row of <structname>inventory_item</structname> is
    passed to the function as a single composite-valued argument.
-   Even though <literal>.*</> does nothing in such cases, using it is good
+   Even though <literal>.*</literal> does nothing in such cases, using it is good
    style, since it makes clear that a composite value is intended.  In
-   particular, the parser will consider <literal>c</> in <literal>c.*</> to
+   particular, the parser will consider <literal>c</literal> in <literal>c.*</literal> to
    refer to a table name or alias, not to a column name, so that there is
-   no ambiguity; whereas without <literal>.*</>, it is not clear
-   whether <literal>c</> means a table name or a column name, and in fact
+   no ambiguity; whereas without <literal>.*</literal>, it is not clear
+   whether <literal>c</literal> means a table name or a column name, and in fact
    the column-name interpretation will be preferred if there is a column
-   named <literal>c</>.
+   named <literal>c</literal>.
   </para>
 
   <para>
@@ -376,27 +382,27 @@ SELECT * FROM inventory_item c ORDER BY c;
 SELECT * FROM inventory_item c ORDER BY c.*;
 SELECT * FROM inventory_item c ORDER BY ROW(c.*);
 </programlisting>
-   All of these <literal>ORDER BY</> clauses specify the row's composite
+   All of these <literal>ORDER BY</literal> clauses specify the row's composite
    value, resulting in sorting the rows according to the rules described
-   in <xref linkend="composite-type-comparison">.  However,
-   if <structname>inventory_item</> contained a column
-   named <structfield>c</>, the first case would be different from the
+   in <xref linkend="composite-type-comparison"/>.  However,
+   if <structname>inventory_item</structname> contained a column
+   named <structfield>c</structfield>, the first case would be different from the
    others, as it would mean to sort by that column only.  Given the column
    names previously shown, these queries are also equivalent to those above:
 <programlisting>
 SELECT * FROM inventory_item c ORDER BY ROW(c.name, c.supplier_id, c.price);
 SELECT * FROM inventory_item c ORDER BY (c.name, c.supplier_id, c.price);
 </programlisting>
-   (The last case uses a row constructor with the key word <literal>ROW</>
+   (The last case uses a row constructor with the key word <literal>ROW</literal>
    omitted.)
   </para>
 
   <para>
    Another special syntactical behavior associated with composite values is
-   that we can use <firstterm>functional notation</> for extracting a field
+   that we can use <firstterm>functional notation</firstterm> for extracting a field
    of a composite value.  The simple way to explain this is that
-   the notations <literal><replaceable>field</>(<replaceable>table</>)</>
-   and <literal><replaceable>table</>.<replaceable>field</></>
+   the notations <literal><replaceable>field</replaceable>(<replaceable>table</replaceable>)</literal>
+   and <literal><replaceable>table</replaceable>.<replaceable>field</replaceable></literal>
    are interchangeable.  For example, these queries are equivalent:
 
 <programlisting>
@@ -418,7 +424,7 @@ SELECT c.somefunc FROM inventory_item c;
   <para>
    This equivalence between functional notation and field notation
    makes it possible to use functions on composite types to implement
-   <quote>computed fields</>.
+   <quote>computed fields</quote>.
    <indexterm>
     <primary>computed field</primary>
    </indexterm>
@@ -427,7 +433,7 @@ SELECT c.somefunc FROM inventory_item c;
     <secondary>computed</secondary>
    </indexterm>
    An application using the last query above wouldn't need to be directly
-   aware that <literal>somefunc</> isn't a real column of the table.
+   aware that <literal>somefunc</literal> isn't a real column of the table.
   </para>
 
   <tip>
@@ -438,7 +444,7 @@ SELECT c.somefunc FROM inventory_item c;
     interpretation will be preferred, so that such a function could not be
     called without tricks.  One way to force the function interpretation is
     to schema-qualify the function name, that is, write
-    <literal><replaceable>schema</>.<replaceable>func</>(<replaceable>compositevalue</>)</literal>.
+    <literal><replaceable>schema</replaceable>.<replaceable>func</replaceable>(<replaceable>compositevalue</replaceable>)</literal>.
    </para>
   </tip>
  </sect2>
@@ -450,8 +456,8 @@ SELECT c.somefunc FROM inventory_item c;
    The external text representation of a composite value consists of items that
    are interpreted according to the I/O conversion rules for the individual
    field types, plus decoration that indicates the composite structure.
-   The decoration consists of parentheses (<literal>(</> and <literal>)</>)
-   around the whole value, plus commas (<literal>,</>) between adjacent
+   The decoration consists of parentheses (<literal>(</literal> and <literal>)</literal>)
+   around the whole value, plus commas (<literal>,</literal>) between adjacent
    items.  Whitespace outside the parentheses is ignored, but within the
    parentheses it is considered part of the field value, and might or might not be
    significant depending on the input conversion rules for the field data type.
@@ -466,7 +472,7 @@ SELECT c.somefunc FROM inventory_item c;
   <para>
    As shown previously, when writing a composite value you can write double
    quotes around any individual field value.
-   You <emphasis>must</> do so if the field value would otherwise
+   You <emphasis>must</emphasis> do so if the field value would otherwise
    confuse the composite-value parser.  In particular, fields containing
    parentheses, commas, double quotes, or backslashes must be double-quoted.
    To put a double quote or backslash in a quoted composite field value,
@@ -481,7 +487,7 @@ SELECT c.somefunc FROM inventory_item c;
   <para>
    A completely empty field value (no characters at all between the commas
    or parentheses) represents a NULL.  To write a value that is an empty
-   string rather than NULL, write <literal>""</>.
+   string rather than NULL, write <literal>""</literal>.
   </para>
 
   <para>
@@ -497,7 +503,7 @@ SELECT c.somefunc FROM inventory_item c;
    Remember that what you write in an SQL command will first be interpreted
    as a string literal, and then as a composite.  This doubles the number of
    backslashes you need (assuming escape string syntax is used).
-   For example, to insert a <type>text</> field
+   For example, to insert a <type>text</type> field
    containing a double quote and a backslash in a composite
    value, you'd need to write:
 <programlisting>
@@ -505,23 +511,23 @@ INSERT ... VALUES (E'("\\"\\\\")');
 </programlisting>
    The string-literal processor removes one level of backslashes, so that
    what arrives at the composite-value parser looks like
-   <literal>("\"\\")</>.  In turn, the string
-   fed to the <type>text</> data type's input routine
-   becomes <literal>"\</>.  (If we were working
+   <literal>("\"\\")</literal>.  In turn, the string
+   fed to the <type>text</type> data type's input routine
+   becomes <literal>"\</literal>.  (If we were working
    with a data type whose input routine also treated backslashes specially,
-   <type>bytea</> for example, we might need as many as eight backslashes
+   <type>bytea</type> for example, we might need as many as eight backslashes
    in the command to get one backslash into the stored composite field.)
-   Dollar quoting (see <xref linkend="sql-syntax-dollar-quoting">) can be
+   Dollar quoting (see <xref linkend="sql-syntax-dollar-quoting"/>) can be
    used to avoid the need to double backslashes.
   </para>
  </note>
 
  <tip>
   <para>
-   The <literal>ROW</> constructor syntax is usually easier to work with
+   The <literal>ROW</literal> constructor syntax is usually easier to work with
    than the composite-literal syntax when writing composite values in SQL
    commands.
-   In <literal>ROW</>, individual field values are written the same way
+   In <literal>ROW</literal>, individual field values are written the same way
    they would be written when not members of a composite.
   </para>
  </tip>
diff --git a/doc/src/sgml/rules.sgml b/doc/src/sgml/rules.sgml
index bcbc170335..3372b1ac2b 100644
--- a/doc/src/sgml/rules.sgml
+++ b/doc/src/sgml/rules.sgml
@@ -29,8 +29,8 @@
      execution.  It is very powerful, and can be used for many things
      such as query language procedures, views, and versions.  The
      theoretical foundations and the power of this rule system are
-     also discussed in <xref linkend="STON90b"> and <xref
-     linkend="ONG90">.
+     also discussed in <xref linkend="ston90b"/> and <xref
+     linkend="ong90"/>.
 </para>
 
 <sect1 id="querytree">
@@ -99,7 +99,7 @@
     <varlistentry>
     <term>
         the range table
-      <indexterm><primary>range table</></>
+      <indexterm><primary>range table</primary></indexterm>
     </term>
     <listitem>
     <para>
@@ -150,7 +150,7 @@
     <varlistentry>
     <term>
         the target list
-    <indexterm><primary>target list</></>
+    <indexterm><primary>target list</primary></indexterm>
     </term>
     <listitem>
     <para>
@@ -167,18 +167,18 @@
 
     <para>
         <command>DELETE</command> commands don't need a normal target list
-        because they don't produce any result.  Instead, the rule system
-        adds a special <acronym>CTID</> entry to the empty target list,
+        because they don't produce any result.  Instead, the planner
+        adds a special <acronym>CTID</acronym> entry to the empty target list,
         to allow the executor to find the row to be deleted.
-        (<acronym>CTID</> is added when the result relation is an ordinary
-        table.  If it is a view, a whole-row variable is added instead,
-        as described in <xref linkend="rules-views-update">.)
+        (<acronym>CTID</acronym> is added when the result relation is an ordinary
+        table.  If it is a view, a whole-row variable is added instead, by
+        the rule system, as described in <xref linkend="rules-views-update"/>.)
     </para>
 
     <para>
         For <command>INSERT</command> commands, the target list describes
         the new rows that should go into the result relation. It consists of the
-        expressions in the <literal>VALUES</> clause or the ones from the
+        expressions in the <literal>VALUES</literal> clause or the ones from the
         <command>SELECT</command> clause in <literal>INSERT
         ... SELECT</literal>.  The first step of the rewrite process adds
         target list entries for any columns that were not assigned to by
@@ -193,8 +193,8 @@
         rule system, it contains just the expressions from the <literal>SET
         column = expression</literal> part of the command.  The planner will
         handle missing columns by inserting expressions that copy the values
-        from the old row into the new one.  Just as for <command>DELETE</>,
-        the rule system adds a <acronym>CTID</> or whole-row variable so that
+        from the old row into the new one.  Just as for <command>DELETE</command>,
+        a <acronym>CTID</acronym> or whole-row variable is added so that
         the executor can identify the old row to be updated.
     </para>
 
@@ -218,7 +218,7 @@
         this expression is a Boolean that tells whether the operation
         (<command>INSERT</command>, <command>UPDATE</command>,
         <command>DELETE</command>, or <command>SELECT</command>) for the
-        final result row should be executed or not. It corresponds to the <literal>WHERE</> clause
+        final result row should be executed or not. It corresponds to the <literal>WHERE</literal> clause
         of an <acronym>SQL</acronym> statement.
     </para>
     </listitem>
@@ -230,18 +230,18 @@
     </term>
     <listitem>
     <para>
-        The query's join tree shows the structure of the <literal>FROM</> clause.
+        The query's join tree shows the structure of the <literal>FROM</literal> clause.
         For a simple query like <literal>SELECT ... FROM a, b, c</literal>, the join tree is just
-        a list of the <literal>FROM</> items, because we are allowed to join them in
-        any order.  But when <literal>JOIN</> expressions, particularly outer joins,
+        a list of the <literal>FROM</literal> items, because we are allowed to join them in
+        any order.  But when <literal>JOIN</literal> expressions, particularly outer joins,
         are used, we have to join in the order shown by the joins.
-        In that case, the join tree shows the structure of the <literal>JOIN</> expressions.  The
-        restrictions associated with particular <literal>JOIN</> clauses (from <literal>ON</> or
-        <literal>USING</> expressions) are stored as qualification expressions attached
+        In that case, the join tree shows the structure of the <literal>JOIN</literal> expressions.  The
+        restrictions associated with particular <literal>JOIN</literal> clauses (from <literal>ON</literal> or
+        <literal>USING</literal> expressions) are stored as qualification expressions attached
         to those join-tree nodes.  It turns out to be convenient to store
-        the top-level <literal>WHERE</> expression as a qualification attached to the
+        the top-level <literal>WHERE</literal> expression as a qualification attached to the
         top-level join-tree item, too.  So really the join tree represents
-        both the <literal>FROM</> and <literal>WHERE</> clauses of a <command>SELECT</command>.
+        both the <literal>FROM</literal> and <literal>WHERE</literal> clauses of a <command>SELECT</command>.
     </para>
     </listitem>
     </varlistentry>
@@ -252,7 +252,7 @@
     </term>
     <listitem>
     <para>
-        The other parts of the query tree like the <literal>ORDER BY</>
+        The other parts of the query tree like the <literal>ORDER BY</literal>
         clause aren't of interest here. The rule system
         substitutes some entries there while applying rules, but that
         doesn't have much to do with the fundamentals of the rule
@@ -274,8 +274,8 @@
 </indexterm>
 
 <indexterm zone="rules-views">
- <primary>view</>
- <secondary>implementation through rules</>
+ <primary>view</primary>
+ <secondary>implementation through rules</secondary>
 </indexterm>
 
 <para>
@@ -313,7 +313,7 @@ CREATE RULE "_RETURN" AS ON SELECT TO myview DO INSTEAD
 </indexterm>
 
 <para>
-    Rules <literal>ON SELECT</> are applied to all queries as the last step, even
+    Rules <literal>ON SELECT</literal> are applied to all queries as the last step, even
     if the command given is an <command>INSERT</command>,
     <command>UPDATE</command> or <command>DELETE</command>. And they
     have different semantics from rules on the other command types in that they modify the
@@ -322,10 +322,10 @@ CREATE RULE "_RETURN" AS ON SELECT TO myview DO INSTEAD
 </para>
 
 <para>
-    Currently, there can be only one action in an <literal>ON SELECT</> rule, and it must
-    be an unconditional <command>SELECT</> action that is <literal>INSTEAD</>. This restriction was
+    Currently, there can be only one action in an <literal>ON SELECT</literal> rule, and it must
+    be an unconditional <command>SELECT</command> action that is <literal>INSTEAD</literal>. This restriction was
     required to make rules safe enough to open them for ordinary users, and
-    it restricts <literal>ON SELECT</> rules to act like views.
+    it restricts <literal>ON SELECT</literal> rules to act like views.
 </para>
 
 <para>
@@ -423,12 +423,12 @@ CREATE VIEW shoe_ready AS
 
     The <command>CREATE VIEW</command> command for the
     <literal>shoelace</literal> view (which is the simplest one we
-    have) will create a relation <literal>shoelace</> and an entry in
+    have) will create a relation <literal>shoelace</literal> and an entry in
     <structname>pg_rewrite</structname> that tells that there is a
-    rewrite rule that must be applied whenever the relation <literal>shoelace</>
+    rewrite rule that must be applied whenever the relation <literal>shoelace</literal>
     is referenced in a query's range table.  The rule has no rule
-    qualification (discussed later, with the non-<command>SELECT</> rules, since
-    <command>SELECT</> rules currently cannot have them) and it is <literal>INSTEAD</>. Note
+    qualification (discussed later, with the non-<command>SELECT</command> rules, since
+    <command>SELECT</command> rules currently cannot have them) and it is <literal>INSTEAD</literal>. Note
     that rule qualifications are not the same as query qualifications.
     The action of our rule has a query qualification.
     The action of the rule is one query tree that is a copy of the
@@ -438,7 +438,7 @@ CREATE VIEW shoe_ready AS
     <note>
     <para>
     The two extra range
-    table entries for <literal>NEW</> and <literal>OLD</> that you can see in
+    table entries for <literal>NEW</literal> and <literal>OLD</literal> that you can see in
     the <structname>pg_rewrite</structname> entry aren't of interest
     for <command>SELECT</command> rules.
     </para>
@@ -533,7 +533,7 @@ SELECT shoelace.sl_name, shoelace.sl_avail,
 </programlisting>
 
      There is one difference however: the subquery's range table has two
-     extra entries <literal>shoelace old</> and <literal>shoelace new</>.  These entries don't
+     extra entries <literal>shoelace old</literal> and <literal>shoelace new</literal>.  These entries don't
      participate directly in the query, since they aren't referenced by
      the subquery's join tree or target list.  The rewriter uses them
      to store the access privilege check information that was originally present
@@ -548,8 +548,8 @@ SELECT shoelace.sl_name, shoelace.sl_avail,
     the remaining range-table entries in the top query (in this example there
     are no more), and it will recursively check the range-table entries in
     the added subquery to see if any of them reference views.  (But it
-    won't expand <literal>old</> or <literal>new</> &mdash; otherwise we'd have infinite recursion!)
-    In this example, there are no rewrite rules for <literal>shoelace_data</> or <literal>unit</>,
+    won't expand <literal>old</literal> or <literal>new</literal> &mdash; otherwise we'd have infinite recursion!)
+    In this example, there are no rewrite rules for <literal>shoelace_data</literal> or <literal>unit</literal>,
     so rewriting is complete and the above is the final result given to
     the planner.
 </para>
@@ -671,8 +671,8 @@ SELECT shoe_ready.shoename, shoe_ready.sh_avail,
     command other than a <command>SELECT</command>, the result
     relation points to the range-table entry where the result should
     go.  Everything else is absolutely the same.  So having two tables
-    <literal>t1</> and <literal>t2</> with columns <literal>a</> and
-    <literal>b</>, the query trees for the two statements:
+    <literal>t1</literal> and <literal>t2</literal> with columns <literal>a</literal> and
+    <literal>b</literal>, the query trees for the two statements:
 
 <programlisting>
 SELECT t2.b FROM t1, t2 WHERE t1.a = t2.a;
@@ -685,27 +685,27 @@ UPDATE t1 SET b = t2.b FROM t2 WHERE t1.a = t2.a;
     <itemizedlist>
         <listitem>
         <para>
-            The range tables contain entries for the tables <literal>t1</> and <literal>t2</>.
+            The range tables contain entries for the tables <literal>t1</literal> and <literal>t2</literal>.
         </para>
         </listitem>
 
         <listitem>
         <para>
             The target lists contain one variable that points to column
-            <literal>b</> of the range table entry for table <literal>t2</>.
+            <literal>b</literal> of the range table entry for table <literal>t2</literal>.
         </para>
         </listitem>
 
         <listitem>
         <para>
-            The qualification expressions compare the columns <literal>a</> of both
+            The qualification expressions compare the columns <literal>a</literal> of both
             range-table entries for equality.
         </para>
         </listitem>
 
         <listitem>
         <para>
-            The join trees show a simple join between <literal>t1</> and <literal>t2</>.
+            The join trees show a simple join between <literal>t1</literal> and <literal>t2</literal>.
         </para>
         </listitem>
     </itemizedlist>
@@ -714,7 +714,7 @@ UPDATE t1 SET b = t2.b FROM t2 WHERE t1.a = t2.a;
    <para>
     The consequence is, that both query trees result in similar
     execution plans: They are both joins over the two tables. For the
-    <command>UPDATE</command> the missing columns from <literal>t1</> are added to
+    <command>UPDATE</command> the missing columns from <literal>t1</literal> are added to
     the target list by the planner and the final query tree will read
     as:
 
@@ -736,7 +736,7 @@ SELECT t1.a, t2.b FROM t1, t2 WHERE t1.a = t2.a;
     one is a <command>SELECT</command> command and the other is an
     <command>UPDATE</command> is handled higher up in the executor, where
     it knows that this is an <command>UPDATE</command>, and it knows that
-    this result should go into table <literal>t1</>. But which of the rows
+    this result should go into table <literal>t1</literal>. But which of the rows
     that are there has to be replaced by the new row?
 </para>
 
@@ -744,12 +744,12 @@ SELECT t1.a, t2.b FROM t1, t2 WHERE t1.a = t2.a;
     To resolve this problem, another entry is added to the target list
     in <command>UPDATE</command> (and also in
     <command>DELETE</command>) statements: the current tuple ID
-    (<acronym>CTID</>).<indexterm><primary>CTID</></>
+    (<acronym>CTID</acronym>).<indexterm><primary>CTID</primary></indexterm>
     This is a system column containing the
     file block number and position in the block for the row. Knowing
-    the table, the <acronym>CTID</> can be used to retrieve the
-    original row of <literal>t1</> to be updated.  After adding the
-    <acronym>CTID</> to the target list, the query actually looks like:
+    the table, the <acronym>CTID</acronym> can be used to retrieve the
+    original row of <literal>t1</literal> to be updated.  After adding the
+    <acronym>CTID</acronym> to the target list, the query actually looks like:
 
 <programlisting>
 SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
@@ -759,9 +759,9 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
     the stage. Old table rows aren't overwritten, and this
     is why <command>ROLLBACK</command> is fast. In an <command>UPDATE</command>,
     the new result row is inserted into the table (after stripping the
-    <acronym>CTID</>) and in the row header of the old row, which the
-    <acronym>CTID</> pointed to, the <literal>cmax</> and
-    <literal>xmax</> entries are set to the current command counter
+    <acronym>CTID</acronym>) and in the row header of the old row, which the
+    <acronym>CTID</acronym> pointed to, the <literal>cmax</literal> and
+    <literal>xmax</literal> entries are set to the current command counter
     and current transaction ID. Thus the old row is hidden, and after
     the transaction commits the vacuum cleaner can eventually remove
     the dead row.
@@ -780,7 +780,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
     The above demonstrates how the rule system incorporates view
     definitions into the original query tree. In the second example, a
     simple <command>SELECT</command> from one view created a final
-    query tree that is a join of 4 tables (<literal>unit</> was used twice with
+    query tree that is a join of 4 tables (<literal>unit</literal> was used twice with
     different names).
 </para>
 
@@ -811,7 +811,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
     <command>DELETE</command>?  Doing the substitutions
     described above would give a query tree in which the result
     relation points at a subquery range-table entry, which will not
-    work.  There are several ways in which <productname>PostgreSQL</>
+    work.  There are several ways in which <productname>PostgreSQL</productname>
     can support the appearance of updating a view, however.
 </para>
 
@@ -821,20 +821,20 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
     underlying base relation so that the <command>INSERT</command>,
     <command>UPDATE</command>, or <command>DELETE</command> is applied to
     the base relation in the appropriate way.  Views that are
-    <quote>simple enough</> for this are called <firstterm>automatically
-    updatable</>.  For detailed information on the kinds of view that can
-    be automatically updated, see <xref linkend="sql-createview">.
+    <quote>simple enough</quote> for this are called <firstterm>automatically
+    updatable</firstterm>.  For detailed information on the kinds of view that can
+    be automatically updated, see <xref linkend="sql-createview"/>.
 </para>
 
 <para>
     Alternatively, the operation may be handled by a user-provided
-    <literal>INSTEAD OF</> trigger on the view.
+    <literal>INSTEAD OF</literal> trigger on the view.
     Rewriting works slightly differently
     in this case.  For <command>INSERT</command>, the rewriter does
     nothing at all with the view, leaving it as the result relation
     for the query.  For <command>UPDATE</command> and
     <command>DELETE</command>, it's still necessary to expand the
-    view query to produce the <quote>old</> rows that the command will
+    view query to produce the <quote>old</quote> rows that the command will
     attempt to update or delete.  So the view is expanded as normal,
     but another unexpanded range-table entry is added to the query
     to represent the view in its capacity as the result relation.
@@ -843,33 +843,33 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
 <para>
     The problem that now arises is how to identify the rows to be
     updated in the view. Recall that when the result relation
-    is a table, a special <acronym>CTID</> entry is added to the target
+    is a table, a special <acronym>CTID</acronym> entry is added to the target
     list to identify the physical locations of the rows to be updated.
     This does not work if the result relation is a view, because a view
-    does not have any <acronym>CTID</>, since its rows do not have
+    does not have any <acronym>CTID</acronym>, since its rows do not have
     actual physical locations. Instead, for an <command>UPDATE</command>
-    or <command>DELETE</command> operation, a special <literal>wholerow</>
+    or <command>DELETE</command> operation, a special <literal>wholerow</literal>
     entry is added to the target list, which expands to include all
     columns from the view. The executor uses this value to supply the
-    <quote>old</> row to the <literal>INSTEAD OF</> trigger.  It is
+    <quote>old</quote> row to the <literal>INSTEAD OF</literal> trigger.  It is
     up to the trigger to work out what to update based on the old and
     new row values.
 </para>
 
 <para>
-    Another possibility is for the user to define <literal>INSTEAD</>
+    Another possibility is for the user to define <literal>INSTEAD</literal>
     rules that specify substitute actions for <command>INSERT</command>,
     <command>UPDATE</command>, and <command>DELETE</command> commands on
     a view. These rules will rewrite the command, typically into a command
     that updates one or more tables, rather than views. That is the topic
-    of <xref linkend="rules-update">.
+    of <xref linkend="rules-update"/>.
 </para>
 
 <para>
     Note that rules are evaluated first, rewriting the original query
     before it is planned and executed. Therefore, if a view has
-    <literal>INSTEAD OF</> triggers as well as rules on <command>INSERT</>,
-    <command>UPDATE</>, or <command>DELETE</>, then the rules will be
+    <literal>INSTEAD OF</literal> triggers as well as rules on <command>INSERT</command>,
+    <command>UPDATE</command>, or <command>DELETE</command>, then the rules will be
     evaluated first, and depending on the result, the triggers may not be
     used at all.
 </para>
@@ -883,7 +883,7 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
 </para>
 
 <para>
-    If there are no <literal>INSTEAD</> rules or <literal>INSTEAD OF</>
+    If there are no <literal>INSTEAD</literal> rules or <literal>INSTEAD OF</literal>
     triggers for the view, and the rewriter cannot automatically rewrite
     the query as an update on the underlying base relation, an error will
     be thrown because the executor cannot update a view as such.
@@ -902,13 +902,13 @@ SELECT t1.a, t2.b, t1.ctid FROM t1, t2 WHERE t1.a = t2.a;
 </indexterm>
 
 <indexterm zone="rules-materializedviews">
- <primary>materialized view</>
- <secondary>implementation through rules</>
+ <primary>materialized view</primary>
+ <secondary>implementation through rules</secondary>
 </indexterm>
 
 <indexterm zone="rules-materializedviews">
- <primary>view</>
- <secondary>materialized</>
+ <primary>view</primary>
+ <secondary>materialized</secondary>
 </indexterm>
 
 <para>
@@ -970,7 +970,7 @@ CREATE MATERIALIZED VIEW sales_summary AS
       invoice_date,
       sum(invoice_amt)::numeric(13,2) as sales_amt
     FROM invoice
-    WHERE invoice_date < CURRENT_DATE
+    WHERE invoice_date &lt; CURRENT_DATE
     GROUP BY
       seller_no,
       invoice_date
@@ -1030,7 +1030,7 @@ SELECT count(*) FROM words WHERE word = 'caterpiler';
 (1 row)
 </programlisting>
 
-    With <command>EXPLAIN ANALYZE</>, we see:
+    With <command>EXPLAIN ANALYZE</command>, we see:
 
 <programlisting>
  Aggregate  (cost=21763.99..21764.00 rows=1 width=0) (actual time=188.180..188.181 rows=1 loops=1)
@@ -1058,7 +1058,7 @@ SELECT count(*) FROM words WHERE word = 'caterpiler';
     have wanted.  Again using <literal>file_fdw</literal>:
 
 <programlisting>
-SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
+SELECT word FROM words ORDER BY word &lt;-&gt; 'caterpiler' LIMIT 10;
 
      word     
 ---------------
@@ -1104,7 +1104,7 @@ SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
 </sect1>
 
 <sect1 id="rules-update">
-<title>Rules on <command>INSERT</>, <command>UPDATE</>, and <command>DELETE</></title>
+<title>Rules on <command>INSERT</command>, <command>UPDATE</command>, and <command>DELETE</command></title>
 
 <indexterm zone="rules-update">
  <primary>rule</primary>
@@ -1122,8 +1122,8 @@ SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
 </indexterm>
 
 <para>
-    Rules that are defined on <command>INSERT</>, <command>UPDATE</>,
-    and <command>DELETE</> are significantly different from the view rules
+    Rules that are defined on <command>INSERT</command>, <command>UPDATE</command>,
+    and <command>DELETE</command> are significantly different from the view rules
     described in the previous section. First, their <command>CREATE
     RULE</command> command allows more:
 
@@ -1142,13 +1142,13 @@ SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
 
         <listitem>
         <para>
-            They can be <literal>INSTEAD</> or <literal>ALSO</> (the default).
+            They can be <literal>INSTEAD</literal> or <literal>ALSO</literal> (the default).
         </para>
         </listitem>
 
         <listitem>
         <para>
-            The pseudorelations <literal>NEW</> and <literal>OLD</> become useful.
+            The pseudorelations <literal>NEW</literal> and <literal>OLD</literal> become useful.
         </para>
         </listitem>
 
@@ -1167,7 +1167,7 @@ SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
 <caution>
  <para>
   In many cases, tasks that could be performed by rules
-  on <command>INSERT</>/<command>UPDATE</>/<command>DELETE</> are better done
+  on <command>INSERT</command>/<command>UPDATE</command>/<command>DELETE</command> are better done
   with triggers.  Triggers are notationally a bit more complicated, but their
   semantics are much simpler to understand.  Rules tend to have surprising
   results when the original query contains volatile functions: volatile
@@ -1177,9 +1177,9 @@ SELECT word FROM words ORDER BY word <-> 'caterpiler' LIMIT 10;
 
  <para>
   Also, there are some cases that are not supported by these types of rules at
-  all, notably including <literal>WITH</> clauses in the original query and
-  multiple-assignment sub-<literal>SELECT</>s in the <literal>SET</> list
-  of <command>UPDATE</> queries.  This is because copying these constructs
+  all, notably including <literal>WITH</literal> clauses in the original query and
+  multiple-assignment sub-<literal>SELECT</literal>s in the <literal>SET</literal> list
+  of <command>UPDATE</command> queries.  This is because copying these constructs
   into a rule query would result in multiple evaluations of the sub-query,
   contrary to the express intent of the query's author.
  </para>
@@ -1198,8 +1198,8 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
 </programlisting>
 
     in mind.
-    In the following, <firstterm>update rules</> means rules that are defined
-    on <command>INSERT</>, <command>UPDATE</>, or <command>DELETE</>.
+    In the following, <firstterm>update rules</firstterm> means rules that are defined
+    on <command>INSERT</command>, <command>UPDATE</command>, or <command>DELETE</command>.
 </para>
 
 <para>
@@ -1208,16 +1208,16 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
     object and event given in the <command>CREATE RULE</command> command.
     For update rules, the rule system creates a list of query trees.
     Initially the query-tree list is empty.
-    There can be zero (<literal>NOTHING</> key word), one, or multiple actions.
+    There can be zero (<literal>NOTHING</literal> key word), one, or multiple actions.
     To simplify, we will look at a rule with one action. This rule
-    can have a qualification or not and it can be <literal>INSTEAD</> or
-    <literal>ALSO</> (the default).
+    can have a qualification or not and it can be <literal>INSTEAD</literal> or
+    <literal>ALSO</literal> (the default).
 </para>
 
 <para>
     What is a rule qualification? It is a restriction that tells
     when the actions of the rule should be done and when not. This
-    qualification can only reference the pseudorelations <literal>NEW</> and/or <literal>OLD</>,
+    qualification can only reference the pseudorelations <literal>NEW</literal> and/or <literal>OLD</literal>,
     which basically represent the relation that was given as object (but with a
     special meaning).
 </para>
@@ -1228,8 +1228,8 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
 
     <variablelist>
      <varlistentry>
-      <term>No qualification, with either <literal>ALSO</> or
-      <literal>INSTEAD</></term>
+      <term>No qualification, with either <literal>ALSO</literal> or
+      <literal>INSTEAD</literal></term>
       <listitem>
        <para>
         the query tree from the rule action with the original query
@@ -1239,7 +1239,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
      </varlistentry>
 
      <varlistentry>
-      <term>Qualification given and <literal>ALSO</></term>
+      <term>Qualification given and <literal>ALSO</literal></term>
       <listitem>
        <para>
         the query tree from the rule action with the rule
@@ -1250,7 +1250,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
      </varlistentry>
 
      <varlistentry>
-      <term>Qualification given and <literal>INSTEAD</></term>
+      <term>Qualification given and <literal>INSTEAD</literal></term>
       <listitem>
        <para>
         the query tree from the rule action with the rule
@@ -1262,17 +1262,17 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
      </varlistentry>
     </variablelist>
 
-    Finally, if the rule is <literal>ALSO</>, the unchanged original query tree is
-    added to the list. Since only qualified <literal>INSTEAD</> rules already add the
+    Finally, if the rule is <literal>ALSO</literal>, the unchanged original query tree is
+    added to the list. Since only qualified <literal>INSTEAD</literal> rules already add the
     original query tree, we end up with either one or two output query trees
     for a rule with one action.
 </para>
 
 <para>
-    For <literal>ON INSERT</> rules, the original query (if not suppressed by <literal>INSTEAD</>)
+    For <literal>ON INSERT</literal> rules, the original query (if not suppressed by <literal>INSTEAD</literal>)
     is done before any actions added by rules.  This allows the actions to
-    see the inserted row(s).  But for <literal>ON UPDATE</> and <literal>ON
-    DELETE</> rules, the original query is done after the actions added by rules.
+    see the inserted row(s).  But for <literal>ON UPDATE</literal> and <literal>ON
+    DELETE</literal> rules, the original query is done after the actions added by rules.
     This ensures that the actions can see the to-be-updated or to-be-deleted
     rows; otherwise, the actions might do nothing because they find no rows
     matching their qualifications.
@@ -1293,12 +1293,12 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
     The query trees found in the actions of the
     <structname>pg_rewrite</structname> system catalog are only
     templates. Since they can reference the range-table entries for
-    <literal>NEW</> and <literal>OLD</>, some substitutions have to be made before they can be
-    used. For any reference to <literal>NEW</>, the target list of the original
+    <literal>NEW</literal> and <literal>OLD</literal>, some substitutions have to be made before they can be
+    used. For any reference to <literal>NEW</literal>, the target list of the original
     query is searched for a corresponding entry. If found, that
-    entry's expression replaces the reference. Otherwise, <literal>NEW</> means the
-    same as <literal>OLD</> (for an <command>UPDATE</command>) or is replaced by
-    a null value (for an <command>INSERT</command>). Any reference to <literal>OLD</> is
+    entry's expression replaces the reference. Otherwise, <literal>NEW</literal> means the
+    same as <literal>OLD</literal> (for an <command>UPDATE</command>) or is replaced by
+    a null value (for an <command>INSERT</command>). Any reference to <literal>OLD</literal> is
     replaced by a reference to the range-table entry that is the
     result relation.
 </para>
@@ -1313,7 +1313,7 @@ CREATE [ OR REPLACE ] RULE <replaceable class="parameter">name</replaceable> AS
 <title>A First Rule Step by Step</title>
 
 <para>
-    Say we want to trace changes to the <literal>sl_avail</> column in the
+    Say we want to trace changes to the <literal>sl_avail</literal> column in the
     <literal>shoelace_data</literal> relation. So we set up a log table
     and a rule that conditionally writes a log entry when an
     <command>UPDATE</command> is performed on
@@ -1367,7 +1367,7 @@ UPDATE shoelace_data SET sl_avail = 6
  WHERE shoelace_data.sl_name = 'sl7';
 </programlisting>
 
-    There is a rule <literal>log_shoelace</literal> that is <literal>ON UPDATE</> with the rule
+    There is a rule <literal>log_shoelace</literal> that is <literal>ON UPDATE</literal> with the rule
     qualification expression:
 
 <programlisting>
@@ -1384,15 +1384,15 @@ INSERT INTO shoelace_log VALUES (
 </programlisting>
 
     (This looks a little strange since you cannot normally write
-    <literal>INSERT ... VALUES ... FROM</>.  The <literal>FROM</>
+    <literal>INSERT ... VALUES ... FROM</literal>.  The <literal>FROM</literal>
     clause here is just to indicate that there are range-table entries
-    in the query tree for <literal>new</> and <literal>old</>.
+    in the query tree for <literal>new</literal> and <literal>old</literal>.
     These are needed so that they can be referenced by variables in
     the <command>INSERT</command> command's query tree.)
 </para>
 
 <para>
-    The rule is a qualified <literal>ALSO</> rule, so the rule system
+    The rule is a qualified <literal>ALSO</literal> rule, so the rule system
     has to return two query trees: the modified rule action and the original
     query tree. In step 1, the range table of the original query is
     incorporated into the rule's action query tree. This results in:
@@ -1406,7 +1406,7 @@ INSERT INTO shoelace_log VALUES (
 </programlisting>
 
     In step 2, the rule qualification is added to it, so the result set
-    is restricted to rows where <literal>sl_avail</> changes:
+    is restricted to rows where <literal>sl_avail</literal> changes:
 
 <programlisting>
 INSERT INTO shoelace_log VALUES (
@@ -1417,10 +1417,10 @@ INSERT INTO shoelace_log VALUES (
  <emphasis>WHERE new.sl_avail &lt;&gt; old.sl_avail</emphasis>;
 </programlisting>
 
-    (This looks even stranger, since <literal>INSERT ... VALUES</> doesn't have
-    a <literal>WHERE</> clause either, but the planner and executor will have no
+    (This looks even stranger, since <literal>INSERT ... VALUES</literal> doesn't have
+    a <literal>WHERE</literal> clause either, but the planner and executor will have no
     difficulty with it.  They need to support this same functionality
-    anyway for <literal>INSERT ... SELECT</>.)
+    anyway for <literal>INSERT ... SELECT</literal>.)
    </para>
 
    <para>
@@ -1440,7 +1440,7 @@ INSERT INTO shoelace_log VALUES (
    </para>
 
    <para>
-    Step 4 replaces references to <literal>NEW</> by the target list entries from the
+    Step 4 replaces references to <literal>NEW</literal> by the target list entries from the
     original query tree or by the matching variable references
     from the result relation:
 
@@ -1457,7 +1457,7 @@ INSERT INTO shoelace_log VALUES (
    </para>
 
    <para>
-    Step 5 changes <literal>OLD</> references into result relation references:
+    Step 5 changes <literal>OLD</literal> references into result relation references:
 
 <programlisting>
 INSERT INTO shoelace_log VALUES (
@@ -1471,7 +1471,7 @@ INSERT INTO shoelace_log VALUES (
    </para>
 
    <para>
-    That's it.  Since the rule is <literal>ALSO</>, we also output the
+    That's it.  Since the rule is <literal>ALSO</literal>, we also output the
     original query tree.  In short, the output from the rule system
     is a list of two query trees that correspond to these statements:
 
@@ -1502,8 +1502,8 @@ UPDATE shoelace_data SET sl_color = 'green'
 
     no log entry would get written.  In that case, the original query
     tree does not contain a target list entry for
-    <literal>sl_avail</>, so <literal>NEW.sl_avail</> will get
-    replaced by <literal>shoelace_data.sl_avail</>.  Thus, the extra
+    <literal>sl_avail</literal>, so <literal>NEW.sl_avail</literal> will get
+    replaced by <literal>shoelace_data.sl_avail</literal>.  Thus, the extra
     command generated by the rule is:
 
 <programlisting>
@@ -1527,8 +1527,8 @@ UPDATE shoelace_data SET sl_avail = 0
  WHERE sl_color = 'black';
 </programlisting>
 
-    four rows in fact get updated (<literal>sl1</>, <literal>sl2</>, <literal>sl3</>, and <literal>sl4</>).
-    But <literal>sl3</> already has <literal>sl_avail = 0</>.   In this case, the original
+    four rows in fact get updated (<literal>sl1</literal>, <literal>sl2</literal>, <literal>sl3</literal>, and <literal>sl4</literal>).
+    But <literal>sl3</literal> already has <literal>sl_avail = 0</literal>.   In this case, the original
     query trees qualification is different and that results
     in the extra query tree:
 
@@ -1559,7 +1559,7 @@ SELECT shoelace_data.sl_name, 0,
 <sect2 id="rules-update-views">
 <title>Cooperation with Views</title>
 
-<indexterm zone="rules-update-views"><primary>view</><secondary>updating</></>
+<indexterm zone="rules-update-views"><primary>view</primary><secondary>updating</secondary></indexterm>
 
 <para>
     A simple way to protect view relations from the mentioned
@@ -1579,7 +1579,7 @@ CREATE RULE shoe_del_protect AS ON DELETE TO shoe
     If someone now tries to do any of these operations on the view
     relation <literal>shoe</literal>, the rule system will
     apply these rules. Since the rules have
-    no actions and are <literal>INSTEAD</>, the resulting list of
+    no actions and are <literal>INSTEAD</literal>, the resulting list of
     query trees will be empty and the whole query will become
     nothing because there is nothing left to be optimized or
     executed after the rule system is done with it.
@@ -1621,8 +1621,8 @@ CREATE RULE shoelace_del AS ON DELETE TO shoelace
    </para>
 
    <para>
-    If you want to support <literal>RETURNING</> queries on the view,
-    you need to make the rules include <literal>RETURNING</> clauses that
+    If you want to support <literal>RETURNING</literal> queries on the view,
+    you need to make the rules include <literal>RETURNING</literal> clauses that
     compute the view rows.  This is usually pretty trivial for views on a
     single table, but it's a bit tedious for join views such as
     <literal>shoelace</literal>.  An example for the insert case is:
@@ -1643,9 +1643,9 @@ CREATE RULE shoelace_ins AS ON INSERT TO shoelace
             FROM unit u WHERE shoelace_data.sl_unit = u.un_name);
 </programlisting>
 
-    Note that this one rule supports both <command>INSERT</> and
-    <command>INSERT RETURNING</> queries on the view &mdash; the
-    <literal>RETURNING</> clause is simply ignored for <command>INSERT</>.
+    Note that this one rule supports both <command>INSERT</command> and
+    <command>INSERT RETURNING</command> queries on the view &mdash; the
+    <literal>RETURNING</literal> clause is simply ignored for <command>INSERT</command>.
    </para>
 
    <para>
@@ -1785,7 +1785,7 @@ UPDATE shoelace_data
    AND shoelace_data.sl_name = shoelace.sl_name;
 </programlisting>
 
-    Again it's an <literal>INSTEAD</> rule and the previous query tree is trashed.
+    Again it's an <literal>INSTEAD</literal> rule and the previous query tree is trashed.
     Note that this query still uses the view <literal>shoelace</literal>.
     But the rule system isn't finished with this step, so it continues
     and applies the <literal>_RETURN</literal> rule on it, and we get:
@@ -2041,16 +2041,16 @@ GRANT SELECT ON phone_number TO assistant;
 </programlisting>
 
     Nobody except that user (and the database superusers) can access the
-    <literal>phone_data</> table. But because of the <command>GRANT</>,
+    <literal>phone_data</literal> table. But because of the <command>GRANT</command>,
     the assistant can run a <command>SELECT</command> on the
-    <literal>phone_number</> view. The rule system will rewrite the
-    <command>SELECT</command> from <literal>phone_number</> into a
-    <command>SELECT</command> from <literal>phone_data</>.
+    <literal>phone_number</literal> view. The rule system will rewrite the
+    <command>SELECT</command> from <literal>phone_number</literal> into a
+    <command>SELECT</command> from <literal>phone_data</literal>.
     Since the user is the owner of
-    <literal>phone_number</> and therefore the owner of the rule, the
-    read access to <literal>phone_data</> is now checked against the user's
+    <literal>phone_number</literal> and therefore the owner of the rule, the
+    read access to <literal>phone_data</literal> is now checked against the user's
     privileges and the query is permitted. The check for accessing
-    <literal>phone_number</> is also performed, but this is done
+    <literal>phone_number</literal> is also performed, but this is done
     against the invoking user, so nobody but the user and the
     assistant can use it.
 </para>
@@ -2059,19 +2059,19 @@ GRANT SELECT ON phone_number TO assistant;
     The privileges are checked rule by rule. So the assistant is for now the
     only one who can see the public phone numbers. But the assistant can set up
     another view and grant access to that to the public. Then, anyone
-    can see the <literal>phone_number</> data through the assistant's view.
+    can see the <literal>phone_number</literal> data through the assistant's view.
     What the assistant cannot do is to create a view that directly
-    accesses <literal>phone_data</>.  (Actually the assistant can, but it will not work since
+    accesses <literal>phone_data</literal>.  (Actually the assistant can, but it will not work since
     every access will be denied during the permission checks.)
     And as soon as the user notices that the assistant opened
-    their <literal>phone_number</> view, the user can revoke the assistant's access. Immediately, any
+    their <literal>phone_number</literal> view, the user can revoke the assistant's access. Immediately, any
     access to the assistant's view would fail.
 </para>
 
 <para>
     One might think that this rule-by-rule checking is a security
     hole, but in fact it isn't.   But if it did not work this way, the assistant
-    could set up a table with the same columns as <literal>phone_number</> and
+    could set up a table with the same columns as <literal>phone_number</literal> and
     copy the data to there once per day. Then it's the assistant's own data and
     the assistant can grant access to everyone they want. A
     <command>GRANT</command> command means, <quote>I trust you</quote>.
@@ -2090,9 +2090,9 @@ CREATE VIEW phone_number AS
     SELECT person, phone FROM phone_data WHERE phone NOT LIKE '412%';
 </programlisting>
     This view might seem secure, since the rule system will rewrite any
-    <command>SELECT</command> from <literal>phone_number</> into a
-    <command>SELECT</command> from <literal>phone_data</> and add the
-    qualification that only entries where <literal>phone</> does not begin
+    <command>SELECT</command> from <literal>phone_number</literal> into a
+    <command>SELECT</command> from <literal>phone_data</literal> and add the
+    qualification that only entries where <literal>phone</literal> does not begin
     with 412 are wanted.  But if the user can create their own functions,
     it is not difficult to convince the planner to execute the user-defined
     function prior to the <function>NOT LIKE</function> expression.
@@ -2107,7 +2107,7 @@ $$ LANGUAGE plpgsql COST 0.0000000000000000000001;
 
 SELECT * FROM phone_number WHERE tricky(person, phone);
 </programlisting>
-    Every person and phone number in the <literal>phone_data</> table will be
+    Every person and phone number in the <literal>phone_data</literal> table will be
     printed as a <literal>NOTICE</literal>, because the planner will choose to
     execute the inexpensive <function>tricky</function> function before the
     more expensive <function>NOT LIKE</function>.  Even if the user is
@@ -2119,17 +2119,17 @@ SELECT * FROM phone_number WHERE tricky(person, phone);
 <para>
     Similar considerations apply to update rules. In the examples of
     the previous section, the owner of the tables in the example
-    database could grant the privileges <literal>SELECT</>,
-    <literal>INSERT</>, <literal>UPDATE</>, and <literal>DELETE</> on
-    the <literal>shoelace</> view to someone else, but only
-    <literal>SELECT</> on <literal>shoelace_log</>. The rule action to
+    database could grant the privileges <literal>SELECT</literal>,
+    <literal>INSERT</literal>, <literal>UPDATE</literal>, and <literal>DELETE</literal> on
+    the <literal>shoelace</literal> view to someone else, but only
+    <literal>SELECT</literal> on <literal>shoelace_log</literal>. The rule action to
     write log entries will still be executed successfully, and that
     other user could see the log entries.  But they could not create fake
     entries, nor could they manipulate or remove existing ones.  In this
     case, there is no possibility of subverting the rules by convincing
     the planner to alter the order of operations, because the only rule
-    which references <literal>shoelace_log</> is an unqualified
-    <literal>INSERT</>.  This might not be true in more complex scenarios.
+    which references <literal>shoelace_log</literal> is an unqualified
+    <literal>INSERT</literal>.  This might not be true in more complex scenarios.
 </para>
 
 <para>
@@ -2189,7 +2189,7 @@ CREATE VIEW phone_number WITH (security_barrier) AS
 
 <para>
     The <productname>PostgreSQL</productname> server returns a command
-    status string, such as <literal>INSERT 149592 1</>, for each
+    status string, such as <literal>INSERT 149592 1</literal>, for each
     command it receives.  This is simple enough when there are no rules
     involved, but what happens when the query is rewritten by rules?
 </para>
@@ -2200,10 +2200,10 @@ CREATE VIEW phone_number WITH (security_barrier) AS
     <itemizedlist>
      <listitem>
       <para>
-       If there is no unconditional <literal>INSTEAD</> rule for the query, then
+       If there is no unconditional <literal>INSTEAD</literal> rule for the query, then
        the originally given query will be executed, and its command
        status will be returned as usual.  (But note that if there were
-       any conditional <literal>INSTEAD</> rules, the negation of their qualifications
+       any conditional <literal>INSTEAD</literal> rules, the negation of their qualifications
        will have been added to the original query.  This might reduce the
        number of rows it processes, and if so the reported status will
        be affected.)
@@ -2212,10 +2212,10 @@ CREATE VIEW phone_number WITH (security_barrier) AS
 
      <listitem>
       <para>
-       If there is any unconditional <literal>INSTEAD</> rule for the query, then
+       If there is any unconditional <literal>INSTEAD</literal> rule for the query, then
        the original query will not be executed at all.  In this case,
        the server will return the command status for the last query
-       that was inserted by an <literal>INSTEAD</> rule (conditional or
+       that was inserted by an <literal>INSTEAD</literal> rule (conditional or
        unconditional) and is of the same command type
        (<command>INSERT</command>, <command>UPDATE</command>, or
        <command>DELETE</command>) as the original query.  If no query
@@ -2228,7 +2228,7 @@ CREATE VIEW phone_number WITH (security_barrier) AS
 </para>
 
 <para>
-    The programmer can ensure that any desired <literal>INSTEAD</> rule is the one
+    The programmer can ensure that any desired <literal>INSTEAD</literal> rule is the one
     that sets the command status in the second case, by giving it the
     alphabetically last rule name among the active rules, so that it
     gets applied last.
@@ -2253,7 +2253,7 @@ CREATE VIEW phone_number WITH (security_barrier) AS
     implemented using the <productname>PostgreSQL</productname>
     rule system.  One of the things that cannot be implemented by
     rules are some kinds of constraints, especially foreign keys. It is possible
-    to place a qualified rule that rewrites a command to <literal>NOTHING</>
+    to place a qualified rule that rewrites a command to <literal>NOTHING</literal>
     if the value of a column does not appear in another table.
     But then the data is silently thrown away and that's
     not a good idea. If checks for valid values are required,
@@ -2264,7 +2264,7 @@ CREATE VIEW phone_number WITH (security_barrier) AS
 <para>
     In this chapter, we focused on using rules to update views. All of
     the update rule examples in this chapter can also be implemented
-    using <literal>INSTEAD OF</> triggers on the views.  Writing such
+    using <literal>INSTEAD OF</literal> triggers on the views.  Writing such
     triggers is often easier than writing rules, particularly if complex
     logic is required to perform the update.
 </para>
@@ -2298,8 +2298,8 @@ CREATE TABLE software (
 </programlisting>
 
     Both tables have many thousands of rows and the indexes on
-    <structfield>hostname</> are unique.  The rule or trigger should
-    implement a constraint that deletes rows from <literal>software</>
+    <structfield>hostname</structfield> are unique.  The rule or trigger should
+    implement a constraint that deletes rows from <literal>software</literal>
     that reference a deleted computer.  The trigger would use this command:
 
 <programlisting>
@@ -2307,8 +2307,8 @@ DELETE FROM software WHERE hostname = $1;
 </programlisting>
 
     Since the trigger is called for each individual row deleted from
-    <literal>computer</>, it can prepare and save the plan for this
-    command and pass the <structfield>hostname</> value in the
+    <literal>computer</literal>, it can prepare and save the plan for this
+    command and pass the <structfield>hostname</structfield> value in the
     parameter.  The rule would be written as:
 
 <programlisting>
@@ -2324,7 +2324,7 @@ CREATE RULE computer_del AS ON DELETE TO computer
 DELETE FROM computer WHERE hostname = 'mypc.local.net';
 </programlisting>
 
-    the table <literal>computer</> is scanned by index (fast), and the
+    the table <literal>computer</literal> is scanned by index (fast), and the
     command issued by the trigger would also use an index scan (also fast).
     The extra command from the rule would be:
 
@@ -2348,8 +2348,8 @@ Nestloop
 
    <para>
     With the next delete we want to get rid of all the 2000 computers
-    where the <structfield>hostname</> starts with
-    <literal>old</>. There are two possible commands to do that. One
+    where the <structfield>hostname</structfield> starts with
+    <literal>old</literal>. There are two possible commands to do that. One
     is:
 
 <programlisting>
@@ -2389,17 +2389,17 @@ Nestloop
 </literallayout>
 
     This shows, that the planner does not realize that the
-    qualification for <structfield>hostname</> in
-    <literal>computer</> could also be used for an index scan on
-    <literal>software</> when there are multiple qualification
-    expressions combined with <literal>AND</>, which is what it does
+    qualification for <structfield>hostname</structfield> in
+    <literal>computer</literal> could also be used for an index scan on
+    <literal>software</literal> when there are multiple qualification
+    expressions combined with <literal>AND</literal>, which is what it does
     in the regular-expression version of the command. The trigger will
     get invoked once for each of the 2000 old computers that have to be
     deleted, and that will result in one index scan over
-    <literal>computer</> and 2000 index scans over
-    <literal>software</>. The rule implementation will do it with two
+    <literal>computer</literal> and 2000 index scans over
+    <literal>software</literal>. The rule implementation will do it with two
     commands that use indexes.  And it depends on the overall size of
-    the table <literal>software</> whether the rule will still be faster in the
+    the table <literal>software</literal> whether the rule will still be faster in the
     sequential scan situation. 2000 command executions from the trigger over the SPI
     manager take some time, even if all the index blocks will soon be in the cache.
 </para>
@@ -2412,7 +2412,7 @@ DELETE FROM computer WHERE manufacturer = 'bim';
 </programlisting>
 
     Again this could result in many rows to be deleted from
-    <literal>computer</>. So the trigger will again run many commands
+    <literal>computer</literal>. So the trigger will again run many commands
     through the executor.  The command generated by the rule will be:
 
 <programlisting>
@@ -2421,7 +2421,7 @@ DELETE FROM software WHERE computer.manufacturer = 'bim'
 </programlisting>
 
     The plan for that command will again be the nested loop over two
-    index scans, only using a different index on <literal>computer</>:
+    index scans, only using a different index on <literal>computer</literal>:
 
 <programlisting>
 Nestloop
@@ -2434,8 +2434,8 @@ Nestloop
     in a command.
 </para>
 
-<![IGNORE[
 <!-- What's happening with this?  If it doesn't come back, remove this section. -->
+<!--
 <para>
     Another situation is cases on <command>UPDATE</command> where it depends on the
     change of an attribute if an action should be performed or
@@ -2456,7 +2456,7 @@ Nestloop
     if the attribute isn't touched. So the rule, qualified or not,
     will only do its scans if there ever could be something to do.
 </para>
-]]>
+-->
 
 <para>
     The summary is, rules will only be significantly slower than
diff --git a/doc/src/sgml/runtime.sgml b/doc/src/sgml/runtime.sgml
index 6d57525515..71f02300c2 100644
--- a/doc/src/sgml/runtime.sgml
+++ b/doc/src/sgml/runtime.sgml
@@ -60,7 +60,7 @@
    during initialization is called
    <literal>template1</literal>.  As the name suggests, this will be used
    as a template for subsequently created databases; it should not be
-   used for actual work.  (See <xref linkend="managing-databases"> for
+   used for actual work.  (See <xref linkend="managing-databases"/> for
    information about creating new databases within a cluster.)
   </para>
 
@@ -73,12 +73,12 @@
    <filename>/usr/local/pgsql/data</filename> or
    <filename>/var/lib/pgsql/data</filename> are popular. To initialize a
    database cluster, use the command <xref
-   linkend="app-initdb">,<indexterm><primary>initdb</></> which is
+   linkend="app-initdb"/>,<indexterm><primary>initdb</primary></indexterm> which is
    installed with <productname>PostgreSQL</productname>. The desired
    file system location of your database cluster is indicated by the
    <option>-D</option> option, for example:
 <screen>
-<prompt>$</> <userinput>initdb -D /usr/local/pgsql/data</userinput>
+<prompt>$</prompt> <userinput>initdb -D /usr/local/pgsql/data</userinput>
 </screen>
    Note that you must execute this command while logged into the
    <productname>PostgreSQL</productname> user account, which is
@@ -95,14 +95,14 @@
 
   <para>
    Alternatively, you can run <command>initdb</command> via
-   the <xref linkend="app-pg-ctl">
-   program<indexterm><primary>pg_ctl</></> like so:
+   the <xref linkend="app-pg-ctl"/>
+   program<indexterm><primary>pg_ctl</primary></indexterm> like so:
 <screen>
-<prompt>$</> <userinput>pg_ctl -D /usr/local/pgsql/data initdb</userinput>
+<prompt>$</prompt> <userinput>pg_ctl -D /usr/local/pgsql/data initdb</userinput>
 </screen>
    This may be more intuitive if you are
    using <command>pg_ctl</command> for starting and stopping the
-   server (see <xref linkend="server-start">), so
+   server (see <xref linkend="server-start"/>), so
    that <command>pg_ctl</command> would be the sole command you use
    for managing the database server instance.
   </para>
@@ -148,43 +148,43 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
    <command>initdb</command>'s <option>-W</option>, <option>--pwprompt</option>
    or <option>--pwfile</option> options to assign a password to the
    database superuser.<indexterm>
-     <primary>password</>
-     <secondary>of the superuser</>
+     <primary>password</primary>
+     <secondary>of the superuser</secondary>
    </indexterm>
-   Also, specify <option>-A md5</> or
-   <option>-A password</> so that the default <literal>trust</> authentication
+   Also, specify <option>-A md5</option> or
+   <option>-A password</option> so that the default <literal>trust</literal> authentication
    mode is not used; or modify the generated <filename>pg_hba.conf</filename>
    file after running <command>initdb</command>, but
-   <emphasis>before</> you start the server for the first time. (Other
+   <emphasis>before</emphasis> you start the server for the first time. (Other
    reasonable approaches include using <literal>peer</literal> authentication
    or file system permissions to restrict connections. See <xref
-   linkend="client-authentication"> for more information.)
+   linkend="client-authentication"/> for more information.)
   </para>
 
   <para>
    <command>initdb</command> also initializes the default
-   locale<indexterm><primary>locale</></> for the database cluster.
+   locale<indexterm><primary>locale</primary></indexterm> for the database cluster.
    Normally, it will just take the locale settings in the environment
    and apply them to the initialized database.  It is possible to
    specify a different locale for the database; more information about
-   that can be found in <xref linkend="locale">.  The default sort order used
+   that can be found in <xref linkend="locale"/>.  The default sort order used
    within the particular database cluster is set by
    <command>initdb</command>, and while you can create new databases using
    different sort order, the order used in the template databases that initdb
    creates cannot be changed without dropping and recreating them.
    There is also a performance impact for using locales
-   other than <literal>C</> or <literal>POSIX</>. Therefore, it is
+   other than <literal>C</literal> or <literal>POSIX</literal>. Therefore, it is
    important to make this choice correctly the first time.
   </para>
 
   <para>
    <command>initdb</command> also sets the default character set encoding
    for the database cluster.  Normally this should be chosen to match the
-   locale setting.  For details see <xref linkend="multibyte">.
+   locale setting.  For details see <xref linkend="multibyte"/>.
   </para>
 
   <para>
-   Non-<literal>C</> and non-<literal>POSIX</> locales rely on the
+   Non-<literal>C</literal> and non-<literal>POSIX</literal> locales rely on the
    operating system's collation library for character set ordering.
    This controls the ordering of keys stored in indexes.  For this reason,
    a cluster cannot switch to an incompatible collation library version,
@@ -201,14 +201,14 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
 
    <para>
     Many installations create their database clusters on file systems
-    (volumes) other than the machine's <quote>root</> volume.  If you
+    (volumes) other than the machine's <quote>root</quote> volume.  If you
     choose to do this, it is not advisable to try to use the secondary
     volume's topmost directory (mount point) as the data directory.
     Best practice is to create a directory within the mount-point
     directory that is owned by the <productname>PostgreSQL</productname>
     user, and then create the data directory within that.  This avoids
     permissions problems, particularly for operations such
-    as <application>pg_upgrade</>, and it also ensures clean failures if
+    as <application>pg_upgrade</application>, and it also ensures clean failures if
     the secondary volume is taken offline.
    </para>
 
@@ -220,30 +220,30 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
    <indexterm zone="creating-cluster-nfs">
     <primary>Network File Systems</primary>
    </indexterm>
-   <indexterm><primary><acronym>NFS</></><see>Network File Systems</></>
-   <indexterm><primary>Network Attached Storage (<acronym>NAS</>)</><see>Network File Systems</></>
+   <indexterm><primary><acronym>NFS</acronym></primary><see>Network File Systems</see></indexterm>
+   <indexterm><primary>Network Attached Storage (<acronym>NAS</acronym>)</primary><see>Network File Systems</see></indexterm>
 
    <para>
     Many installations create their database clusters on network file
-    systems.  Sometimes this is done via <acronym>NFS</>, or by using a
-    Network Attached Storage (<acronym>NAS</>) device that uses
-    <acronym>NFS</> internally.  <productname>PostgreSQL</> does nothing
-    special for <acronym>NFS</> file systems, meaning it assumes
-    <acronym>NFS</> behaves exactly like locally-connected drives.
-    If the client or server <acronym>NFS</> implementation does not
+    systems.  Sometimes this is done via <acronym>NFS</acronym>, or by using a
+    Network Attached Storage (<acronym>NAS</acronym>) device that uses
+    <acronym>NFS</acronym> internally.  <productname>PostgreSQL</productname> does nothing
+    special for <acronym>NFS</acronym> file systems, meaning it assumes
+    <acronym>NFS</acronym> behaves exactly like locally-connected drives.
+    If the client or server <acronym>NFS</acronym> implementation does not
     provide standard file system semantics, this can
     cause reliability problems (see <ulink
     url="http://www.time-travellers.org/shane/papers/NFS_considered_harmful.html"></ulink>).
-    Specifically, delayed (asynchronous) writes to the <acronym>NFS</>
+    Specifically, delayed (asynchronous) writes to the <acronym>NFS</acronym>
     server can cause data corruption problems.  If possible, mount the
-    <acronym>NFS</> file system synchronously (without caching) to avoid
-    this hazard.  Also, soft-mounting the <acronym>NFS</> file system is
+    <acronym>NFS</acronym> file system synchronously (without caching) to avoid
+    this hazard.  Also, soft-mounting the <acronym>NFS</acronym> file system is
     not recommended.
    </para>
 
    <para>
-    Storage Area Networks (<acronym>SAN</>) typically use communication
-    protocols other than <acronym>NFS</>, and may or may not be subject
+    Storage Area Networks (<acronym>SAN</acronym>) typically use communication
+    protocols other than <acronym>NFS</acronym>, and may or may not be subject
     to hazards of this sort.  It's advisable to consult the vendor's
     documentation concerning data consistency guarantees.
     <productname>PostgreSQL</productname> cannot be more reliable than
@@ -260,7 +260,7 @@ postgres$ <userinput>initdb -D /usr/local/pgsql/data</userinput>
   <para>
    Before anyone can access the database, you must start the database
    server. The database server program is called
-   <command>postgres</command>.<indexterm><primary>postgres</></>
+   <command>postgres</command>.<indexterm><primary>postgres</primary></indexterm>
    The <command>postgres</command> program must know where to
    find the data it is supposed to use. This is done with the
    <option>-D</option> option. Thus, the simplest way to start the
@@ -281,24 +281,24 @@ $ <userinput>postgres -D /usr/local/pgsql/data</userinput>
 <screen>
 $ <userinput>postgres -D /usr/local/pgsql/data &gt;logfile 2&gt;&amp;1 &amp;</userinput>
 </screen>
-   It is important to store the server's <systemitem>stdout</> and
-   <systemitem>stderr</> output somewhere, as shown above. It will help
+   It is important to store the server's <systemitem>stdout</systemitem> and
+   <systemitem>stderr</systemitem> output somewhere, as shown above. It will help
    for auditing purposes and to diagnose problems. (See <xref
-   linkend="logfile-maintenance"> for a more thorough discussion of log
+   linkend="logfile-maintenance"/> for a more thorough discussion of log
    file handling.)
   </para>
 
   <para>
    The <command>postgres</command> program also takes a number of other
    command-line options. For more information, see the
-   <xref linkend="app-postgres"> reference page
-   and <xref linkend="runtime-config"> below.
+   <xref linkend="app-postgres"/> reference page
+   and <xref linkend="runtime-config"/> below.
   </para>
 
   <para>
    This shell syntax can get tedious quickly.  Therefore the wrapper
    program
-   <xref linkend="app-pg-ctl"><indexterm><primary>pg_ctl</primary></indexterm>
+   <xref linkend="app-pg-ctl"/><indexterm><primary>pg_ctl</primary></indexterm>
    is provided to simplify some tasks.  For example:
 <programlisting>
 pg_ctl start -l logfile
@@ -312,13 +312,13 @@ pg_ctl start -l logfile
   <para>
    Normally, you will want to start the database server when the
    computer boots.<indexterm>
-     <primary>booting</>
-     <secondary>starting the server during</>
+     <primary>booting</primary>
+     <secondary>starting the server during</secondary>
    </indexterm>
    Autostart scripts are operating-system-specific.
    There are a few distributed with
    <productname>PostgreSQL</productname> in the
-   <filename>contrib/start-scripts</> directory. Installing one will require
+   <filename>contrib/start-scripts</filename> directory. Installing one will require
    root privileges.
   </para>
 
@@ -327,7 +327,7 @@ pg_ctl start -l logfile
    at boot time. Many systems have a file
    <filename>/etc/rc.local</filename> or
    <filename>/etc/rc.d/rc.local</filename>. Others use <filename>init.d</filename> or
-   <filename>rc.d</> directories. Whatever you do, the server must be
+   <filename>rc.d</filename> directories. Whatever you do, the server must be
    run by the <productname>PostgreSQL</productname> user account
    <emphasis>and not by root</emphasis> or any other user. Therefore you
    probably should form your commands using
@@ -348,7 +348,7 @@ su postgres -c 'pg_ctl start -D /usr/local/pgsql/data -l serverlog'
       For <productname>FreeBSD</productname>, look at the file
       <filename>contrib/start-scripts/freebsd</filename> in the
       <productname>PostgreSQL</productname> source distribution.
-      <indexterm><primary>FreeBSD</><secondary>start script</secondary></>
+      <indexterm><primary>FreeBSD</primary><secondary>start script</secondary></indexterm>
      </para>
     </listitem>
 
@@ -356,7 +356,7 @@ su postgres -c 'pg_ctl start -D /usr/local/pgsql/data -l serverlog'
      <para>
       On <productname>OpenBSD</productname>, add the following lines
       to the file <filename>/etc/rc.local</filename>:
-      <indexterm><primary>OpenBSD</><secondary>start script</secondary></>
+      <indexterm><primary>OpenBSD</primary><secondary>start script</secondary></indexterm>
 <programlisting>
 if [ -x /usr/local/pgsql/bin/pg_ctl -a -x /usr/local/pgsql/bin/postgres ]; then
     su -l postgres -c '/usr/local/pgsql/bin/pg_ctl start -s -l /var/postgresql/log -D /usr/local/pgsql/data'
@@ -369,7 +369,7 @@ fi
     <listitem>
      <para>
       On <productname>Linux</productname> systems either add
-      <indexterm><primary>Linux</><secondary>start script</secondary></>
+      <indexterm><primary>Linux</primary><secondary>start script</secondary></indexterm>
 <programlisting>
 /usr/local/pgsql/bin/pg_ctl start -l logfile -D /usr/local/pgsql/data
 </programlisting>
@@ -421,7 +421,7 @@ WantedBy=multi-user.target
       <productname>FreeBSD</productname> or
       <productname>Linux</productname> start scripts, depending on
       preference.
-      <indexterm><primary>NetBSD</><secondary>start script</secondary></>
+      <indexterm><primary>NetBSD</primary><secondary>start script</secondary></indexterm>
      </para>
     </listitem>
 
@@ -430,12 +430,12 @@ WantedBy=multi-user.target
       On <productname>Solaris</productname>, create a file called
       <filename>/etc/init.d/postgresql</filename> that contains
       the following line:
-      <indexterm><primary>Solaris</><secondary>start script</secondary></>
+      <indexterm><primary>Solaris</primary><secondary>start script</secondary></indexterm>
 <programlisting>
 su - postgres -c "/usr/local/pgsql/bin/pg_ctl start -l logfile -D /usr/local/pgsql/data"
 </programlisting>
-      Then, create a symbolic link to it in <filename>/etc/rc3.d</> as
-      <filename>S99postgresql</>.
+      Then, create a symbolic link to it in <filename>/etc/rc3.d</filename> as
+      <filename>S99postgresql</filename>.
      </para>
     </listitem>
    </itemizedlist>
@@ -494,7 +494,7 @@ DETAIL:  Failed system call was shmget(key=5440001, size=4011376640, 03600).
      mean that you do not have System-V-style shared memory support
      configured into your kernel at all. As a temporary workaround, you
      can try starting the server with a smaller-than-normal number of
-     buffers (<xref linkend="guc-shared-buffers">). You will eventually want
+     buffers (<xref linkend="guc-shared-buffers"/>). You will eventually want
      to reconfigure your kernel to increase the allowed shared memory
      size. You might also see this message when trying to start multiple
      servers on the same machine, if their total space requested
@@ -509,24 +509,24 @@ DETAIL:  Failed system call was semget(5440126, 17, 03600).
 </screen>
      does <emphasis>not</emphasis> mean you've run out of disk
      space. It means your kernel's limit on the number of <systemitem
-     class="osname">System V</> semaphores is smaller than the number
+     class="osname">System V</systemitem> semaphores is smaller than the number
      <productname>PostgreSQL</productname> wants to create. As above,
      you might be able to work around the problem by starting the
      server with a reduced number of allowed connections
-     (<xref linkend="guc-max-connections">), but you'll eventually want to
+     (<xref linkend="guc-max-connections"/>), but you'll eventually want to
      increase the kernel limit.
     </para>
 
     <para>
-     If you get an <quote>illegal system call</> error, it is likely that
+     If you get an <quote>illegal system call</quote> error, it is likely that
      shared memory or semaphores are not supported in your kernel at
      all. In that case your only option is to reconfigure the kernel to
      enable these features.
     </para>
 
     <para>
-     Details about configuring <systemitem class="osname">System V</>
-     <acronym>IPC</> facilities are given in <xref linkend="sysvipc">.
+     Details about configuring <systemitem class="osname">System V</systemitem>
+     <acronym>IPC</acronym> facilities are given in <xref linkend="sysvipc"/>.
     </para>
    </sect2>
 
@@ -574,7 +574,7 @@ psql: could not connect to server: No such file or directory
      does <emphasis>not</emphasis> mean that the server got your
      connection request and rejected it. That case will produce a
      different message, as shown in <xref
-     linkend="client-authentication-problems">.) Other error messages
+     linkend="client-authentication-problems"/>.) Other error messages
      such as <computeroutput>Connection timed out</computeroutput> might
      indicate more fundamental problems, like lack of network
      connectivity.
@@ -586,10 +586,10 @@ psql: could not connect to server: No such file or directory
   <title>Managing Kernel Resources</title>
 
   <para>
-   <productname>PostgreSQL</> can sometimes exhaust various operating system
+   <productname>PostgreSQL</productname> can sometimes exhaust various operating system
    resource limits, especially when multiple copies of the server are running
    on the same system, or in very large installations.  This section explains
-   the kernel resources used by <productname>PostgreSQL</> and the steps you
+   the kernel resources used by <productname>PostgreSQL</productname> and the steps you
    can take to resolve problems related to kernel resource consumption.
   </para>
 
@@ -605,27 +605,27 @@ psql: could not connect to server: No such file or directory
    </indexterm>
 
    <para>
-    <productname>PostgreSQL</> requires the operating system to provide
-    inter-process communication (<acronym>IPC</>) features, specifically
+    <productname>PostgreSQL</productname> requires the operating system to provide
+    inter-process communication (<acronym>IPC</acronym>) features, specifically
     shared memory and semaphores.  Unix-derived systems typically provide
-    <quote><systemitem class="osname">System V</></> <acronym>IPC</>,
-    <quote><systemitem class="osname">POSIX</></> <acronym>IPC</>, or both.
-    <systemitem class="osname">Windows</> has its own implementation of
+    <quote><systemitem class="osname">System V</systemitem></quote> <acronym>IPC</acronym>,
+    <quote><systemitem class="osname">POSIX</systemitem></quote> <acronym>IPC</acronym>, or both.
+    <systemitem class="osname">Windows</systemitem> has its own implementation of
     these features and is not discussed here.
    </para>
 
    <para>
     The complete lack of these facilities is usually manifested by an
-    <quote><errorname>Illegal system call</></quote> error upon server
+    <quote><errorname>Illegal system call</errorname></quote> error upon server
     start.  In that case there is no alternative but to reconfigure your
-    kernel.  <productname>PostgreSQL</> won't work without them.
+    kernel.  <productname>PostgreSQL</productname> won't work without them.
     This situation is rare, however, among modern operating systems.
    </para>
 
    <para>
-    Upon starting the server, <productname>PostgreSQL</> normally allocates
+    Upon starting the server, <productname>PostgreSQL</productname> normally allocates
     a very small amount of System V shared memory, as well as a much larger
-    amount of POSIX (<function>mmap</>) shared memory.
+    amount of POSIX (<function>mmap</function>) shared memory.
     In addition a significant number of semaphores, which can be either
     System V or POSIX style, are created at server startup.  Currently,
     POSIX semaphores are used on Linux and FreeBSD systems while other
@@ -634,7 +634,7 @@ psql: could not connect to server: No such file or directory
 
    <note>
     <para>
-     Prior to <productname>PostgreSQL</> 9.3, only System V shared memory
+     Prior to <productname>PostgreSQL</productname> 9.3, only System V shared memory
      was used, so the amount of System V shared memory required to start the
      server was much larger.  If you are running an older version of the
      server, please consult the documentation for your server version.
@@ -642,91 +642,91 @@ psql: could not connect to server: No such file or directory
    </note>
 
    <para>
-    System V <acronym>IPC</> features are typically constrained by
+    System V <acronym>IPC</acronym> features are typically constrained by
     system-wide allocation limits.
-    When <productname>PostgreSQL</> exceeds one of these limits,
+    When <productname>PostgreSQL</productname> exceeds one of these limits,
     the server will refuse to start and
     should leave an instructive error message describing the problem
     and what to do about it. (See also <xref
-    linkend="server-start-failures">.) The relevant kernel
+    linkend="server-start-failures"/>.) The relevant kernel
     parameters are named consistently across different systems; <xref
-    linkend="sysvipc-parameters"> gives an overview. The methods to set
+    linkend="sysvipc-parameters"/> gives an overview. The methods to set
     them, however, vary. Suggestions for some platforms are given below.
    </para>
 
    <table id="sysvipc-parameters">
-    <title><systemitem class="osname">System V</> <acronym>IPC</> Parameters</title>
+    <title><systemitem class="osname">System V</systemitem> <acronym>IPC</acronym> Parameters</title>
 
     <tgroup cols="3">
      <thead>
       <row>
-       <entry>Name</>
-       <entry>Description</>
-       <entry>Values needed to run one <productname>PostgreSQL</> instance</>
+       <entry>Name</entry>
+       <entry>Description</entry>
+       <entry>Values needed to run one <productname>PostgreSQL</productname> instance</entry>
       </row>
      </thead>
 
      <tbody>
       <row>
-       <entry><varname>SHMMAX</></>
-       <entry>Maximum size of shared memory segment (bytes)</>
+       <entry><varname>SHMMAX</varname></entry>
+       <entry>Maximum size of shared memory segment (bytes)</entry>
        <entry>at least 1kB, but the default is usually much higher</entry>
       </row>
 
       <row>
-       <entry><varname>SHMMIN</></>
-       <entry>Minimum size of shared memory segment (bytes)</>
-       <entry>1</>
+       <entry><varname>SHMMIN</varname></entry>
+       <entry>Minimum size of shared memory segment (bytes)</entry>
+       <entry>1</entry>
       </row>
 
       <row>
-       <entry><varname>SHMALL</></>
-       <entry>Total amount of shared memory available (bytes or pages)</>
+       <entry><varname>SHMALL</varname></entry>
+       <entry>Total amount of shared memory available (bytes or pages)</entry>
        <entry>same as <varname>SHMMAX</varname> if bytes,
         or <literal>ceil(SHMMAX/PAGE_SIZE)</literal> if pages,
-        plus room for other applications</>
+        plus room for other applications</entry>
       </row>
 
       <row>
-       <entry><varname>SHMSEG</></>
-       <entry>Maximum number of shared memory segments per process</>
-       <entry>only 1 segment is needed, but the default is much higher</>
+       <entry><varname>SHMSEG</varname></entry>
+       <entry>Maximum number of shared memory segments per process</entry>
+       <entry>only 1 segment is needed, but the default is much higher</entry>
       </row>
 
        <row>
-        <entry><varname>SHMMNI</></>
-        <entry>Maximum number of shared memory segments system-wide</>
-        <entry>like <varname>SHMSEG</> plus room for other applications</>
+        <entry><varname>SHMMNI</varname></entry>
+        <entry>Maximum number of shared memory segments system-wide</entry>
+        <entry>like <varname>SHMSEG</varname> plus room for other applications</entry>
        </row>
 
        <row>
-        <entry><varname>SEMMNI</></>
-        <entry>Maximum number of semaphore identifiers (i.e., sets)</>
-        <entry>at least <literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16)</literal> plus room for other applications</>
+        <entry><varname>SEMMNI</varname></entry>
+        <entry>Maximum number of semaphore identifiers (i.e., sets)</entry>
+        <entry>at least <literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16)</literal> plus room for other applications</entry>
        </row>
 
        <row>
-        <entry><varname>SEMMNS</></>
-        <entry>Maximum number of semaphores system-wide</>
-        <entry><literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16) * 17</literal> plus room for other applications</>
+        <entry><varname>SEMMNS</varname></entry>
+        <entry>Maximum number of semaphores system-wide</entry>
+        <entry><literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16) * 17</literal> plus room for other applications</entry>
        </row>
 
        <row>
-        <entry><varname>SEMMSL</></>
-        <entry>Maximum number of semaphores per set</>
-        <entry>at least 17</>
+        <entry><varname>SEMMSL</varname></entry>
+        <entry>Maximum number of semaphores per set</entry>
+        <entry>at least 17</entry>
        </row>
 
        <row>
-        <entry><varname>SEMMAP</></>
-        <entry>Number of entries in semaphore map</>
-        <entry>see text</>
+        <entry><varname>SEMMAP</varname></entry>
+        <entry>Number of entries in semaphore map</entry>
+        <entry>see text</entry>
        </row>
 
        <row>
-        <entry><varname>SEMVMX</></>
-        <entry>Maximum value of semaphore</>
-        <entry>at least 1000 (The default is often 32767; do not change unless necessary)</>
+        <entry><varname>SEMVMX</varname></entry>
+        <entry>Maximum value of semaphore</entry>
+        <entry>at least 1000 (The default is often 32767; do not change unless necessary)</entry>
        </row>
 
      </tbody>
@@ -734,54 +734,54 @@ psql: could not connect to server: No such file or directory
    </table>
 
    <para>
-    <productname>PostgreSQL</> requires a few bytes of System V shared memory
+    <productname>PostgreSQL</productname> requires a few bytes of System V shared memory
     (typically 48 bytes, on 64-bit platforms) for each copy of the server.
     On most modern operating systems, this amount can easily be allocated.
     However, if you are running many copies of the server, or if other
     applications are also using System V shared memory, it may be necessary to
-    increase <varname>SHMALL</>, which is the total amount of System V shared
-    memory system-wide.  Note that <varname>SHMALL</> is measured in pages
+    increase <varname>SHMALL</varname>, which is the total amount of System V shared
+    memory system-wide.  Note that <varname>SHMALL</varname> is measured in pages
     rather than bytes on many systems.
    </para>
 
    <para>
     Less likely to cause problems is the minimum size for shared
-    memory segments (<varname>SHMMIN</>), which should be at most
-    approximately 32 bytes for <productname>PostgreSQL</> (it is
+    memory segments (<varname>SHMMIN</varname>), which should be at most
+    approximately 32 bytes for <productname>PostgreSQL</productname> (it is
     usually just 1). The maximum number of segments system-wide
-    (<varname>SHMMNI</>) or per-process (<varname>SHMSEG</>) are unlikely
+    (<varname>SHMMNI</varname>) or per-process (<varname>SHMSEG</varname>) are unlikely
     to cause a problem unless your system has them set to zero.
    </para>
 
    <para>
     When using System V semaphores,
-    <productname>PostgreSQL</> uses one semaphore per allowed connection
-    (<xref linkend="guc-max-connections">), allowed autovacuum worker process
-    (<xref linkend="guc-autovacuum-max-workers">) and allowed background
-    process (<xref linkend="guc-max-worker-processes">), in sets of 16.
+    <productname>PostgreSQL</productname> uses one semaphore per allowed connection
+    (<xref linkend="guc-max-connections"/>), allowed autovacuum worker process
+    (<xref linkend="guc-autovacuum-max-workers"/>) and allowed background
+    process (<xref linkend="guc-max-worker-processes"/>), in sets of 16.
     Each such set will
     also contain a 17th semaphore which contains a <quote>magic
     number</quote>, to detect collision with semaphore sets used by
     other applications. The maximum number of semaphores in the system
-    is set by <varname>SEMMNS</>, which consequently must be at least
-    as high as <varname>max_connections</> plus
-    <varname>autovacuum_max_workers</> plus <varname>max_worker_processes</>,
+    is set by <varname>SEMMNS</varname>, which consequently must be at least
+    as high as <varname>max_connections</varname> plus
+    <varname>autovacuum_max_workers</varname> plus <varname>max_worker_processes</varname>,
     plus one extra for each 16
     allowed connections plus workers (see the formula in <xref
-    linkend="sysvipc-parameters">).  The parameter <varname>SEMMNI</>
+    linkend="sysvipc-parameters"/>).  The parameter <varname>SEMMNI</varname>
     determines the limit on the number of semaphore sets that can
     exist on the system at one time.  Hence this parameter must be at
-    least <literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16)</>.
+    least <literal>ceil((max_connections + autovacuum_max_workers + max_worker_processes + 5) / 16)</literal>.
     Lowering the number
     of allowed connections is a temporary workaround for failures,
     which are usually confusingly worded <quote>No space
-    left on device</>, from the function <function>semget</>.
+    left on device</quote>, from the function <function>semget</function>.
    </para>
 
    <para>
     In some cases it might also be necessary to increase
-    <varname>SEMMAP</> to be at least on the order of
-    <varname>SEMMNS</>. This parameter defines the size of the semaphore
+    <varname>SEMMAP</varname> to be at least on the order of
+    <varname>SEMMNS</varname>. This parameter defines the size of the semaphore
     resource map, in which each contiguous block of available semaphores
     needs an entry. When a semaphore set is freed it is either added to
     an existing entry that is adjacent to the freed block or it is
@@ -792,17 +792,17 @@ psql: could not connect to server: No such file or directory
    </para>
 
    <para>
-    Various other settings related to <quote>semaphore undo</>, such as
-    <varname>SEMMNU</> and <varname>SEMUME</>, do not affect
-    <productname>PostgreSQL</>.
+    Various other settings related to <quote>semaphore undo</quote>, such as
+    <varname>SEMMNU</varname> and <varname>SEMUME</varname>, do not affect
+    <productname>PostgreSQL</productname>.
    </para>
 
    <para>
     When using POSIX semaphores, the number of semaphores needed is the
     same as for System V, that is one semaphore per allowed connection
-    (<xref linkend="guc-max-connections">), allowed autovacuum worker process
-    (<xref linkend="guc-autovacuum-max-workers">) and allowed background
-    process (<xref linkend="guc-max-worker-processes">).
+    (<xref linkend="guc-max-connections"/>), allowed autovacuum worker process
+    (<xref linkend="guc-autovacuum-max-workers"/>) and allowed background
+    process (<xref linkend="guc-max-worker-processes"/>).
     On the platforms where this option is preferred, there is no specific
     kernel limit on the number of POSIX semaphores.
    </para>
@@ -810,8 +810,8 @@ psql: could not connect to server: No such file or directory
 
     <variablelist>
      <varlistentry>
-      <term><systemitem class="osname">AIX</>
-      <indexterm><primary>AIX</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">AIX</systemitem>
+      <indexterm><primary>AIX</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
@@ -833,8 +833,8 @@ psql: could not connect to server: No such file or directory
 
 
      <varlistentry>
-      <term><systemitem class="osname">FreeBSD</>
-      <indexterm><primary>FreeBSD</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">FreeBSD</systemitem>
+      <indexterm><primary>FreeBSD</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
@@ -861,8 +861,8 @@ kern.ipc.semmnu=256
 </programlisting>
         After modifying these values a reboot is required for the new
         settings to take effect.
-        (Note: FreeBSD does not use <varname>SEMMAP</>.  Older versions
-        would accept but ignore a setting for <literal>kern.ipc.semmap</>;
+        (Note: FreeBSD does not use <varname>SEMMAP</varname>.  Older versions
+        would accept but ignore a setting for <literal>kern.ipc.semmap</literal>;
         newer versions reject it altogether.)
        </para>
 
@@ -874,8 +874,8 @@ kern.ipc.semmnu=256
        </para>
 
        <para>
-        If running in FreeBSD jails by enabling <application>sysctl</>'s
-        <literal>security.jail.sysvipc_allowed</>, <application>postmaster</>s
+        If running in FreeBSD jails by enabling <application>sysctl</application>'s
+        <literal>security.jail.sysvipc_allowed</literal>, <application>postmaster</application>s
         running in different jails should be run by different operating system
         users.  This improves security because it prevents non-root users
         from interfering with shared memory or semaphores in different jails,
@@ -886,19 +886,19 @@ kern.ipc.semmnu=256
        </para>
 
        <para>
-        <systemitem class="osname">FreeBSD</> versions before 4.0 work like
-        <systemitem class="osname">OpenBSD</> (see below).
+        <systemitem class="osname">FreeBSD</systemitem> versions before 4.0 work like
+        <systemitem class="osname">OpenBSD</systemitem> (see below).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">NetBSD</>
-      <indexterm><primary>NetBSD</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">NetBSD</systemitem>
+      <indexterm><primary>NetBSD</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
-        In <systemitem class="osname">NetBSD</> 5.0 and later,
+        In <systemitem class="osname">NetBSD</systemitem> 5.0 and later,
         IPC parameters can be adjusted using <command>sysctl</command>,
         for example:
 <screen>
@@ -916,24 +916,24 @@ kern.ipc.semmnu=256
        </para>
 
        <para>
-        <systemitem class="osname">NetBSD</> versions before 5.0 work like
-        <systemitem class="osname">OpenBSD</> (see below), except that
-        parameters should be set with the keyword <literal>options</> not
-        <literal>option</>.
+        <systemitem class="osname">NetBSD</systemitem> versions before 5.0 work like
+        <systemitem class="osname">OpenBSD</systemitem> (see below), except that
+        parameters should be set with the keyword <literal>options</literal> not
+        <literal>option</literal>.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">OpenBSD</>
-      <indexterm><primary>OpenBSD</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">OpenBSD</systemitem>
+      <indexterm><primary>OpenBSD</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
-        The options <varname>SYSVSHM</> and <varname>SYSVSEM</> need
+        The options <varname>SYSVSHM</varname> and <varname>SYSVSEM</varname> need
         to be enabled when the kernel is compiled. (They are by
         default.) The maximum size of shared memory is determined by
-        the option <varname>SHMMAXPGS</> (in pages). The following
+        the option <varname>SHMMAXPGS</varname> (in pages). The following
         shows an example of how to set the various parameters:
 <programlisting>
 option        SYSVSHM
@@ -958,30 +958,30 @@ option        SEMMAP=256
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">HP-UX</>
-      <indexterm><primary>HP-UX</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">HP-UX</systemitem>
+      <indexterm><primary>HP-UX</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
         The default settings tend to suffice for normal installations.
-        On <productname>HP-UX</> 10, the factory default for
-        <varname>SEMMNS</> is 128, which might be too low for larger
+        On <productname>HP-UX</productname> 10, the factory default for
+        <varname>SEMMNS</varname> is 128, which might be too low for larger
         database sites.
        </para>
        <para>
-        <acronym>IPC</> parameters can be set in the <application>System
-        Administration Manager</> (<acronym>SAM</>) under
+        <acronym>IPC</acronym> parameters can be set in the <application>System
+        Administration Manager</application> (<acronym>SAM</acronym>) under
         <menuchoice><guimenu>Kernel
-        Configuration</><guimenuitem>Configurable Parameters</></>. Choose
-        <guibutton>Create A New Kernel</> when you're done.
+        Configuration</guimenu><guimenuitem>Configurable Parameters</guimenuitem></menuchoice>. Choose
+        <guibutton>Create A New Kernel</guibutton> when you're done.
        </para>
       </listitem>
      </varlistentry>
 
 
      <varlistentry>
-      <term><systemitem class="osname">Linux</>
-      <indexterm><primary>Linux</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">Linux</systemitem>
+      <indexterm><primary>Linux</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
@@ -1023,13 +1023,13 @@ option        SEMMAP=256
 
 
      <varlistentry>
-      <term><systemitem class="osname">macOS</>
-      <indexterm><primary>macOS</><secondary>IPC configuration</></>
+      <term><systemitem class="osname">macOS</systemitem>
+      <indexterm><primary>macOS</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
         The recommended method for configuring shared memory in macOS
-        is to create a file named <filename>/etc/sysctl.conf</>,
+        is to create a file named <filename>/etc/sysctl.conf</filename>,
         containing variable assignments such as:
 <programlisting>
 kern.sysv.shmmax=4194304
@@ -1039,32 +1039,32 @@ kern.sysv.shmseg=8
 kern.sysv.shmall=1024
 </programlisting>
         Note that in some macOS versions,
-        <emphasis>all five</> shared-memory parameters must be set in
-        <filename>/etc/sysctl.conf</>, else the values will be ignored.
+        <emphasis>all five</emphasis> shared-memory parameters must be set in
+        <filename>/etc/sysctl.conf</filename>, else the values will be ignored.
        </para>
 
        <para>
         Beware that recent releases of macOS ignore attempts to set
-        <varname>SHMMAX</> to a value that isn't an exact multiple of 4096.
+        <varname>SHMMAX</varname> to a value that isn't an exact multiple of 4096.
        </para>
 
        <para>
-        <varname>SHMALL</> is measured in 4 kB pages on this platform.
+        <varname>SHMALL</varname> is measured in 4 kB pages on this platform.
        </para>
 
        <para>
         In older macOS versions, you will need to reboot to have changes in the
         shared memory parameters take effect.  As of 10.5 it is possible to
-        change all but <varname>SHMMNI</> on the fly, using
-        <application>sysctl</>.  But it's still best to set up your preferred
-        values via <filename>/etc/sysctl.conf</>, so that the values will be
+        change all but <varname>SHMMNI</varname> on the fly, using
+        <application>sysctl</application>.  But it's still best to set up your preferred
+        values via <filename>/etc/sysctl.conf</filename>, so that the values will be
         kept across reboots.
        </para>
 
        <para>
-        The file <filename>/etc/sysctl.conf</> is only honored in macOS
+        The file <filename>/etc/sysctl.conf</filename> is only honored in macOS
         10.3.9 and later.  If you are running a previous 10.3.x release,
-        you must edit the file <filename>/etc/rc</>
+        you must edit the file <filename>/etc/rc</filename>
         and change the values in the following commands:
 <programlisting>
 sysctl -w kern.sysv.shmmax
@@ -1074,27 +1074,27 @@ sysctl -w kern.sysv.shmseg
 sysctl -w kern.sysv.shmall
 </programlisting>
         Note that
-        <filename>/etc/rc</> is usually overwritten by macOS system updates,
+        <filename>/etc/rc</filename> is usually overwritten by macOS system updates,
         so you should expect to have to redo these edits after each update.
        </para>
 
        <para>
         In macOS 10.2 and earlier, instead edit these commands in the file
-        <filename>/System/Library/StartupItems/SystemTuning/SystemTuning</>.
+        <filename>/System/Library/StartupItems/SystemTuning/SystemTuning</filename>.
        </para>
       </listitem>
      </varlistentry>
 
 
      <varlistentry>
-      <term><systemitem class="osname">Solaris</> 2.6 to 2.9 (Solaris
+      <term><systemitem class="osname">Solaris</systemitem> 2.6 to 2.9 (Solaris
       6 to Solaris 9)
-      <indexterm><primary>Solaris</><secondary>IPC configuration</></>
+      <indexterm><primary>Solaris</primary><secondary>IPC configuration</secondary></indexterm>
       </term>
       <listitem>
        <para>
         The relevant settings can be changed in
-        <filename>/etc/system</>, for example:
+        <filename>/etc/system</filename>, for example:
 <programlisting>
 set shmsys:shminfo_shmmax=0x2000000
 set shmsys:shminfo_shmmin=1
@@ -1114,30 +1114,30 @@ set semsys:seminfo_semmsl=32
      </varlistentry>
 
      <varlistentry>
-      <term><systemitem class="osname">Solaris</> 2.10 (Solaris
+      <term><systemitem class="osname">Solaris</systemitem> 2.10 (Solaris
       10) and later</term>
-      <term><systemitem class="osname">OpenSolaris</></term>
+      <term><systemitem class="osname">OpenSolaris</systemitem></term>
       <listitem>
        <para>
         In Solaris 10 and later, and OpenSolaris, the default shared memory and
         semaphore settings are good enough for most
-        <productname>PostgreSQL</> applications.  Solaris now defaults
-        to a <varname>SHMMAX</> of one-quarter of system <acronym>RAM</>.
+        <productname>PostgreSQL</productname> applications.  Solaris now defaults
+        to a <varname>SHMMAX</varname> of one-quarter of system <acronym>RAM</acronym>.
         To further adjust this setting, use a project setting associated
-        with the <literal>postgres</> user.  For example, run the
-        following as <literal>root</>:
+        with the <literal>postgres</literal> user.  For example, run the
+        following as <literal>root</literal>:
 <programlisting>
 projadd -c "PostgreSQL DB User" -K "project.max-shm-memory=(privileged,8GB,deny)" -U postgres -G postgres user.postgres
 </programlisting>
        </para>
 
        <para>
-        This command adds the <literal>user.postgres</> project and
-        sets the shared memory maximum for the <literal>postgres</>
+        This command adds the <literal>user.postgres</literal> project and
+        sets the shared memory maximum for the <literal>postgres</literal>
         user to 8GB, and takes effect the next time that user logs
-        in, or when you restart <productname>PostgreSQL</> (not reload).
-        The above assumes that <productname>PostgreSQL</> is run by
-        the <literal>postgres</> user in the <literal>postgres</>
+        in, or when you restart <productname>PostgreSQL</productname> (not reload).
+        The above assumes that <productname>PostgreSQL</productname> is run by
+        the <literal>postgres</literal> user in the <literal>postgres</literal>
         group.  No server reboot is required.
        </para>
 
@@ -1152,11 +1152,11 @@ project.max-msg-ids=(priv,4096,deny)
        </para>
 
        <para>
-        Additionally, if you are running <productname>PostgreSQL</>
+        Additionally, if you are running <productname>PostgreSQL</productname>
         inside a zone, you may need to raise the zone resource usage
         limits as well.  See "Chapter2:  Projects and Tasks" in the
-        <citetitle>System Administrator's Guide</> for more
-        information on <literal>projects</> and <command>prctl</>.
+        <citetitle>System Administrator's Guide</citetitle> for more
+        information on <literal>projects</literal> and <command>prctl</command>.
        </para>
       </listitem>
      </varlistentry>
@@ -1259,7 +1259,7 @@ RemoveIPC=no
     limit can only be changed by the root user. The system call
     <function>setrlimit</function> is responsible for setting these
     parameters. The shell's built-in command <command>ulimit</command>
-    (Bourne shells) or <command>limit</command> (<application>csh</>) is
+    (Bourne shells) or <command>limit</command> (<application>csh</application>) is
     used to control the resource limits from the command line. On
     BSD-derived systems the file <filename>/etc/login.conf</filename>
     controls the various resource limits set during login. See the
@@ -1320,8 +1320,8 @@ default:\
     processes to open large numbers of files; if more than a few
     processes do so then the system-wide limit can easily be exceeded.
     If you find this happening, and you do not want to alter the
-    system-wide limit, you can set <productname>PostgreSQL</>'s <xref
-    linkend="guc-max-files-per-process"> configuration parameter to
+    system-wide limit, you can set <productname>PostgreSQL</productname>'s <xref
+    linkend="guc-max-files-per-process"/> configuration parameter to
     limit the consumption of open files.
    </para>
   </sect2>
@@ -1380,36 +1380,36 @@ Out of Memory: Killed process 12345 (postgres).
     system running out of memory, you can avoid the problem by changing
     your configuration.  In some cases, it may help to lower memory-related
     configuration parameters, particularly
-    <link linkend="guc-shared-buffers"><varname>shared_buffers</></link>
-    and <link linkend="guc-work-mem"><varname>work_mem</></link>.  In
+    <link linkend="guc-shared-buffers"><varname>shared_buffers</varname></link>
+    and <link linkend="guc-work-mem"><varname>work_mem</varname></link>.  In
     other cases, the problem may be caused by allowing too many connections
     to the database server itself.  In many cases, it may be better to reduce
-    <link linkend="guc-max-connections"><varname>max_connections</></link>
+    <link linkend="guc-max-connections"><varname>max_connections</varname></link>
     and instead make use of external connection-pooling software.
    </para>
 
    <para>
     On Linux 2.6 and later, it is possible to modify the
-    kernel's behavior so that it will not <quote>overcommit</> memory.
+    kernel's behavior so that it will not <quote>overcommit</quote> memory.
     Although this setting will not prevent the <ulink
-    url="http://lwn.net/Articles/104179/">OOM killer</> from being invoked
+    url="http://lwn.net/Articles/104179/">OOM killer</ulink> from being invoked
     altogether, it will lower the chances significantly and will therefore
     lead to more robust system behavior.  This is done by selecting strict
     overcommit mode via <command>sysctl</command>:
 <programlisting>
 sysctl -w vm.overcommit_memory=2
 </programlisting>
-    or placing an equivalent entry in <filename>/etc/sysctl.conf</>.
+    or placing an equivalent entry in <filename>/etc/sysctl.conf</filename>.
     You might also wish to modify the related setting
-    <varname>vm.overcommit_ratio</>.  For details see the kernel documentation
+    <varname>vm.overcommit_ratio</varname>.  For details see the kernel documentation
     file <ulink url="https://www.kernel.org/doc/Documentation/vm/overcommit-accounting"></ulink>.
    </para>
 
    <para>
     Another approach, which can be used with or without altering
-    <varname>vm.overcommit_memory</>, is to set the process-specific
-    <firstterm>OOM score adjustment</> value for the postmaster process to
-    <literal>-1000</>, thereby guaranteeing it will not be targeted by the OOM
+    <varname>vm.overcommit_memory</varname>, is to set the process-specific
+    <firstterm>OOM score adjustment</firstterm> value for the postmaster process to
+    <literal>-1000</literal>, thereby guaranteeing it will not be targeted by the OOM
     killer.  The simplest way to do this is to execute
 <programlisting>
 echo -1000 > /proc/self/oom_score_adj
@@ -1426,33 +1426,33 @@ export PG_OOM_ADJUST_VALUE=0
     These settings will cause postmaster child processes to run with the
     normal OOM score adjustment of zero, so that the OOM killer can still
     target them at need.  You could use some other value for
-    <envar>PG_OOM_ADJUST_VALUE</> if you want the child processes to run
-    with some other OOM score adjustment.  (<envar>PG_OOM_ADJUST_VALUE</>
+    <envar>PG_OOM_ADJUST_VALUE</envar> if you want the child processes to run
+    with some other OOM score adjustment.  (<envar>PG_OOM_ADJUST_VALUE</envar>
     can also be omitted, in which case it defaults to zero.)  If you do not
-    set <envar>PG_OOM_ADJUST_FILE</>, the child processes will run with the
+    set <envar>PG_OOM_ADJUST_FILE</envar>, the child processes will run with the
     same OOM score adjustment as the postmaster, which is unwise since the
     whole point is to ensure that the postmaster has a preferential setting.
    </para>
 
    <para>
-    Older Linux kernels do not offer <filename>/proc/self/oom_score_adj</>,
+    Older Linux kernels do not offer <filename>/proc/self/oom_score_adj</filename>,
     but may have a previous version of the same functionality called
-    <filename>/proc/self/oom_adj</>.  This works the same except the disable
-    value is <literal>-17</> not <literal>-1000</>.
+    <filename>/proc/self/oom_adj</filename>.  This works the same except the disable
+    value is <literal>-17</literal> not <literal>-1000</literal>.
    </para>
 
    <note>
    <para>
     Some vendors' Linux 2.4 kernels are reported to have early versions
     of the 2.6 overcommit <command>sysctl</command> parameter.  However, setting
-    <literal>vm.overcommit_memory</> to 2
+    <literal>vm.overcommit_memory</literal> to 2
     on a 2.4 kernel that does not have the relevant code will make
     things worse, not better.  It is recommended that you inspect
     the actual kernel source code (see the function
-    <function>vm_enough_memory</> in the file <filename>mm/mmap.c</>)
+    <function>vm_enough_memory</function> in the file <filename>mm/mmap.c</filename>)
     to verify what is supported in your kernel before you try this in a 2.4
-    installation.  The presence of the <filename>overcommit-accounting</>
-    documentation file should <emphasis>not</> be taken as evidence that the
+    installation.  The presence of the <filename>overcommit-accounting</filename>
+    documentation file should <emphasis>not</emphasis> be taken as evidence that the
     feature is there.  If in any doubt, consult a kernel expert or your
     kernel vendor.
    </para>
@@ -1465,7 +1465,7 @@ export PG_OOM_ADJUST_VALUE=0
    <para>
     Using huge pages reduces overhead when using large contiguous chunks of
     memory, as <productname>PostgreSQL</productname> does, particularly when
-    using large values of <xref linkend="guc-shared-buffers">.  To use this
+    using large values of <xref linkend="guc-shared-buffers"/>.  To use this
     feature in <productname>PostgreSQL</productname> you need a kernel
     with <varname>CONFIG_HUGETLBFS=y</varname> and
     <varname>CONFIG_HUGETLB_PAGE=y</varname>. You will also have to adjust
@@ -1473,7 +1473,7 @@ export PG_OOM_ADJUST_VALUE=0
     number of huge pages needed, start <productname>PostgreSQL</productname>
     without huge pages enabled and check the
     postmaster's <varname>VmPeak</varname> value, as well as the system's
-    huge page size, using the <filename>/proc</> file system.  This might
+    huge page size, using the <filename>/proc</filename> file system.  This might
     look like:
 <programlisting>
 $ <userinput>head -1 $PGDATA/postmaster.pid</userinput>
@@ -1509,17 +1509,17 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
    <para>
     It may also be necessary to give the database server's operating system
     user permission to use huge pages by setting
-    <varname>vm.hugetlb_shm_group</> via <application>sysctl</>, and/or
-    give permission to lock memory with <command>ulimit -l</>.
+    <varname>vm.hugetlb_shm_group</varname> via <application>sysctl</application>, and/or
+    give permission to lock memory with <command>ulimit -l</command>.
    </para>
 
    <para>
     The default behavior for huge pages in
     <productname>PostgreSQL</productname> is to use them when possible and
     to fall back to normal pages when failing. To enforce the use of huge
-    pages, you can set <xref linkend="guc-huge-pages">
-    to <literal>on</literal> in <filename>postgresql.conf</>.
-    Note that with this setting <productname>PostgreSQL</> will fail to
+    pages, you can set <xref linkend="guc-huge-pages"/>
+    to <literal>on</literal> in <filename>postgresql.conf</filename>.
+    Note that with this setting <productname>PostgreSQL</productname> will fail to
     start if not enough huge pages are available.
    </para>
 
@@ -1537,7 +1537,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
   <title>Shutting Down the Server</title>
 
   <indexterm zone="server-shutdown">
-   <primary>shutdown</>
+   <primary>shutdown</primary>
   </indexterm>
 
   <para>
@@ -1547,7 +1547,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
 
    <variablelist>
     <varlistentry>
-     <term><systemitem>SIGTERM</systemitem><indexterm><primary>SIGTERM</></></term>
+     <term><systemitem>SIGTERM</systemitem><indexterm><primary>SIGTERM</primary></indexterm></term>
      <listitem>
       <para>
        This is the <firstterm>Smart Shutdown</firstterm> mode.
@@ -1566,7 +1566,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
     </varlistentry>
 
     <varlistentry>
-     <term><systemitem>SIGINT</systemitem><indexterm><primary>SIGINT</></></term>
+     <term><systemitem>SIGINT</systemitem><indexterm><primary>SIGINT</primary></indexterm></term>
      <listitem>
       <para>
        This is the <firstterm>Fast Shutdown</firstterm> mode.
@@ -1581,7 +1581,7 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
     </varlistentry>
 
     <varlistentry>
-     <term><systemitem>SIGQUIT</systemitem><indexterm><primary>SIGQUIT</></></term>
+     <term><systemitem>SIGQUIT</systemitem><indexterm><primary>SIGQUIT</primary></indexterm></term>
      <listitem>
       <para>
       This is the <firstterm>Immediate Shutdown</firstterm> mode.
@@ -1600,11 +1600,11 @@ $ <userinput>grep Huge /proc/meminfo</userinput>
   </para>
 
   <para>
-   The <xref linkend="app-pg-ctl"> program provides a convenient
+   The <xref linkend="app-pg-ctl"/> program provides a convenient
    interface for sending these signals to shut down the server.
-   Alternatively, you can send the signal directly using <command>kill</>
+   Alternatively, you can send the signal directly using <command>kill</command>
    on non-Windows systems.
-   The <acronym>PID</> of the <command>postgres</command> process can be
+   The <acronym>PID</acronym> of the <command>postgres</command> process can be
    found using the <command>ps</command> program, or from the file
    <filename>postmaster.pid</filename> in the data directory. For
    example, to do a fast shutdown:
@@ -1628,15 +1628,15 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
 
   <para>
    To terminate an individual session while allowing other sessions to
-   continue, use <function>pg_terminate_backend()</> (see <xref
-   linkend="functions-admin-signal-table">) or send a
-   <systemitem>SIGTERM</> signal to the child process associated with
+   continue, use <function>pg_terminate_backend()</function> (see <xref
+   linkend="functions-admin-signal-table"/>) or send a
+   <systemitem>SIGTERM</systemitem> signal to the child process associated with
    the session.
   </para>
  </sect1>
 
  <sect1 id="upgrading">
-  <title>Upgrading a <productname>PostgreSQL</> Cluster</title>
+  <title>Upgrading a <productname>PostgreSQL</productname> Cluster</title>
 
   <indexterm zone="upgrading">
    <primary>upgrading</primary>
@@ -1649,7 +1649,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
 
   <para>
    This section discusses how to upgrade your database data from one
-   <productname>PostgreSQL</> release to a newer one.
+   <productname>PostgreSQL</productname> release to a newer one.
   </para>
 
   <para>
@@ -1676,11 +1676,11 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
   </para>
 
   <para>
-   For <emphasis>major</> releases of <productname>PostgreSQL</>, the
+   For <emphasis>major</emphasis> releases of <productname>PostgreSQL</productname>, the
    internal data storage format is subject to change, thus complicating
    upgrades.  The traditional method for moving data to a new major version
    is to dump and reload the database, though this can be slow.  A
-   faster method is <xref linkend="pgupgrade">.  Replication methods are
+   faster method is <xref linkend="pgupgrade"/>.  Replication methods are
    also available, as discussed below.
   </para>
 
@@ -1688,7 +1688,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
    New major versions also typically introduce some user-visible
    incompatibilities, so application programming changes might be required.
    All user-visible changes are listed in the release notes (<xref
-   linkend="release">);  pay particular attention to the section
+   linkend="release"/>);  pay particular attention to the section
    labeled "Migration".  If you are upgrading across several major
    versions, be sure to read the release notes for each intervening
    version.
@@ -1698,7 +1698,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
    Cautious users will want to test their client applications on the new
    version before switching over fully; therefore, it's often a good idea to
    set up concurrent installations of old and new versions.  When
-   testing a <productname>PostgreSQL</> major upgrade, consider the
+   testing a <productname>PostgreSQL</productname> major upgrade, consider the
    following categories of possible changes:
   </para>
 
@@ -1728,7 +1728,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
     <term>Library API</term>
     <listitem>
      <para>
-      Typically libraries like <application>libpq</> only add new
+      Typically libraries like <application>libpq</application> only add new
       functionality, again unless mentioned in the release notes.
      </para>
     </listitem>
@@ -1757,13 +1757,13 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
   </variablelist>
 
   <sect2 id="upgrading-via-pgdumpall">
-   <title>Upgrading Data via <application>pg_dumpall</></title>
+   <title>Upgrading Data via <application>pg_dumpall</application></title>
 
    <para>
     One upgrade method is to dump data from one major version of
-    <productname>PostgreSQL</> and reload it in another &mdash;  to do
-    this, you must use a <emphasis>logical</> backup tool like
-    <application>pg_dumpall</>; file system
+    <productname>PostgreSQL</productname> and reload it in another &mdash;  to do
+    this, you must use a <emphasis>logical</emphasis> backup tool like
+    <application>pg_dumpall</application>; file system
     level backup methods will not work. (There are checks in place that prevent
     you from using a data directory with an incompatible version of
     <productname>PostgreSQL</productname>, so no great harm can be done by
@@ -1771,18 +1771,18 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
    </para>
 
    <para>
-    It is recommended that you use the <application>pg_dump</> and
-    <application>pg_dumpall</> programs from the <emphasis>newer</>
+    It is recommended that you use the <application>pg_dump</application> and
+    <application>pg_dumpall</application> programs from the <emphasis>newer</emphasis>
     version of
-    <productname>PostgreSQL</>, to take advantage of enhancements
+    <productname>PostgreSQL</productname>, to take advantage of enhancements
     that might have been made in these programs.  Current releases of the
     dump programs can read data from any server version back to 7.0.
    </para>
 
    <para>
     These instructions assume that your existing installation is under the
-    <filename>/usr/local/pgsql</> directory, and that the data area is in
-    <filename>/usr/local/pgsql/data</>.  Substitute your paths
+    <filename>/usr/local/pgsql</filename> directory, and that the data area is in
+    <filename>/usr/local/pgsql/data</filename>.  Substitute your paths
     appropriately.
    </para>
 
@@ -1792,9 +1792,9 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
       If making a backup, make sure that your database is not being updated.
       This does not affect the integrity of the backup, but the changed
       data would of course not be included. If necessary, edit the
-      permissions in the file <filename>/usr/local/pgsql/data/pg_hba.conf</>
+      permissions in the file <filename>/usr/local/pgsql/data/pg_hba.conf</filename>
       (or equivalent) to disallow access from everyone except you.
-      See <xref linkend="client-authentication"> for additional information on
+      See <xref linkend="client-authentication"/> for additional information on
       access control.
      </para>
 
@@ -1806,14 +1806,14 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
 
       To back up your database installation, type:
 <screen>
-<userinput>pg_dumpall &gt; <replaceable>outputfile</></userinput>
+<userinput>pg_dumpall &gt; <replaceable>outputfile</replaceable></userinput>
 </screen>
      </para>
 
      <para>
       To make the backup, you can use the <application>pg_dumpall</application>
       command from the version you are currently running;  see <xref
-      linkend="backup-dump-all"> for more details.  For best
+      linkend="backup-dump-all"/> for more details.  For best
       results, however, try to use the <application>pg_dumpall</application>
       command from <productname>PostgreSQL</productname> &version;,
       since this version contains bug fixes and improvements over older
@@ -1830,16 +1830,16 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
      <para>
       Shut down the old server:
 <screen>
-<userinput>pg_ctl stop</>
+<userinput>pg_ctl stop</userinput>
 </screen>
-      On systems that have <productname>PostgreSQL</> started at boot time,
+      On systems that have <productname>PostgreSQL</productname> started at boot time,
       there is probably a start-up file that will accomplish the same thing. For
-      example, on a <systemitem class="osname">Red Hat Linux</> system one
+      example, on a <systemitem class="osname">Red Hat Linux</systemitem> system one
       might find that this works:
 <screen>
 <userinput>/etc/rc.d/init.d/postgresql stop</userinput>
 </screen>
-      See <xref linkend="runtime"> for details about starting and
+      See <xref linkend="runtime"/> for details about starting and
       stopping the server.
      </para>
     </step>
@@ -1853,7 +1853,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
       in mind the directory might consume significant disk space.  To rename
       the directory, use a command like this:
 <screen>
-<userinput>mv /usr/local/pgsql /usr/local/pgsql.old</>
+<userinput>mv /usr/local/pgsql /usr/local/pgsql.old</userinput>
 </screen>
      (Be sure to move the directory as a single unit so relative paths
      remain unchanged.)
@@ -1863,8 +1863,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
     <step>
      <para>
       Install the new version of <productname>PostgreSQL</productname> as
-      outlined in <![%standalone-include[the next section.]]>
-      <![%standalone-ignore[<xref linkend="install-procedure">.]]>
+      outlined in <xref linkend="install-procedure"/>.
      </para>
     </step>
 
@@ -1874,15 +1873,15 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
       execute these commands while logged in to the special database user
       account (which you already have if you are upgrading).
 <programlisting>
-<userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</>
+<userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</userinput>
 </programlisting>
      </para>
     </step>
 
     <step>
      <para>
-      Restore your previous <filename>pg_hba.conf</> and any
-      <filename>postgresql.conf</> modifications.
+      Restore your previous <filename>pg_hba.conf</filename> and any
+      <filename>postgresql.conf</filename> modifications.
      </para>
     </step>
 
@@ -1891,7 +1890,7 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
       Start the database server, again using the special database user
       account:
 <programlisting>
-<userinput>/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data</>
+<userinput>/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data</userinput>
 </programlisting>
      </para>
     </step>
@@ -1900,9 +1899,9 @@ $ <userinput>kill -INT `head -1 /usr/local/pgsql/data/postmaster.pid`</userinput
      <para>
       Finally, restore your data from backup with:
 <screen>
-<userinput>/usr/local/pgsql/bin/psql -d postgres -f <replaceable>outputfile</></userinput>
+<userinput>/usr/local/pgsql/bin/psql -d postgres -f <replaceable>outputfile</replaceable></userinput>
 </screen>
-      using the <emphasis>new</> <application>psql</>.
+      using the <emphasis>new</emphasis> <application>psql</application>.
      </para>
     </step>
    </procedure>
@@ -1921,16 +1920,16 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   </sect2>
 
   <sect2 id="upgrading-via-pg-upgrade">
-   <title>Upgrading Data via <application>pg_upgrade</></title>
+   <title>Upgrading Data via <application>pg_upgrade</application></title>
 
    <para>
-    The <xref linkend="pgupgrade"> module allows an installation to
-    be migrated in-place from one major <productname>PostgreSQL</>
+    The <xref linkend="pgupgrade"/> module allows an installation to
+    be migrated in-place from one major <productname>PostgreSQL</productname>
     version to another.  Upgrades can be performed in minutes,
-    particularly with <option>--link</> mode.  It requires steps similar to
-    <application>pg_dumpall</> above, e.g.  starting/stopping the server,
-    running <application>initdb</>.  The <application>pg_upgrade</> <link
-    linkend="pgupgrade">documentation</> outlines the necessary steps.
+    particularly with <option>--link</option> mode.  It requires steps similar to
+    <application>pg_dumpall</application> above, e.g.  starting/stopping the server,
+    running <application>initdb</application>.  The <application>pg_upgrade</application> <link
+    linkend="pgupgrade">documentation</link> outlines the necessary steps.
    </para>
 
   </sect2>
@@ -1940,12 +1939,12 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
 
    <para>
     It is also possible to use certain replication methods, such as
-    <productname>Slony</>, to create a standby server with the updated version of
-    <productname>PostgreSQL</>.  This is possible because Slony supports
+    <productname>Slony</productname>, to create a standby server with the updated version of
+    <productname>PostgreSQL</productname>.  This is possible because Slony supports
     replication between different major versions of
-    <productname>PostgreSQL</>.  The standby can be on the same computer or
+    <productname>PostgreSQL</productname>.  The standby can be on the same computer or
     a different computer.  Once it has synced up with the master server
-    (running the older version of <productname>PostgreSQL</>), you can
+    (running the older version of <productname>PostgreSQL</productname>), you can
     switch masters and make the standby the master and shut down the older
     database instance.  Such a switch-over results in only several seconds
     of downtime for an upgrade.
@@ -1967,28 +1966,28 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    server is down, it is possible for a local user to spoof the normal
    server by starting their own server.  The spoof server could read
    passwords and queries sent by clients, but could not return any data
-   because the <varname>PGDATA</> directory would still be secure because
+   because the <varname>PGDATA</varname> directory would still be secure because
    of directory permissions. Spoofing is possible because any user can
    start a database server; a client cannot identify an invalid server
    unless it is specially configured.
   </para>
 
   <para>
-   One way to prevent spoofing of <literal>local</>
+   One way to prevent spoofing of <literal>local</literal>
    connections is to use a Unix domain socket directory (<xref
-   linkend="guc-unix-socket-directories">) that has write permission only
+   linkend="guc-unix-socket-directories"/>) that has write permission only
    for a trusted local user.  This prevents a malicious user from creating
    their own socket file in that directory.  If you are concerned that
-   some applications might still reference <filename>/tmp</> for the
+   some applications might still reference <filename>/tmp</filename> for the
    socket file and hence be vulnerable to spoofing, during operating system
-   startup create a symbolic link <filename>/tmp/.s.PGSQL.5432</> that points
+   startup create a symbolic link <filename>/tmp/.s.PGSQL.5432</filename> that points
    to the relocated socket file.  You also might need to modify your
-   <filename>/tmp</> cleanup script to prevent removal of the symbolic link.
+   <filename>/tmp</filename> cleanup script to prevent removal of the symbolic link.
   </para>
 
   <para>
-   Another option for <literal>local</> connections is for clients to use
-   <link linkend="libpq-connect-requirepeer"><literal>requirepeer</></>
+   Another option for <literal>local</literal> connections is for clients to use
+   <link linkend="libpq-connect-requirepeer"><literal>requirepeer</literal></link>
    to specify the required owner of the server process connected to
    the socket.
   </para>
@@ -1997,12 +1996,12 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    To prevent spoofing on TCP connections, the best solution is to use
    SSL certificates and make sure that clients check the server's certificate.
    To do that, the server
-   must be configured to accept only <literal>hostssl</> connections (<xref
-   linkend="auth-pg-hba-conf">) and have SSL key and certificate files
-   (<xref linkend="ssl-tcp">). The TCP client must connect using
-   <literal>sslmode=verify-ca</> or
-   <literal>verify-full</> and have the appropriate root certificate
-   file installed (<xref linkend="libq-ssl-certificates">).
+   must be configured to accept only <literal>hostssl</literal> connections (<xref
+   linkend="auth-pg-hba-conf"/>) and have SSL key and certificate files
+   (<xref linkend="ssl-tcp"/>). The TCP client must connect using
+   <literal>sslmode=verify-ca</literal> or
+   <literal>verify-full</literal> and have the appropriate root certificate
+   file installed (<xref linkend="libq-ssl-certificates"/>).
   </para>
  </sect1>
 
@@ -2024,16 +2023,18 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   <variablelist>
 
   <varlistentry>
-   <term>Password Storage Encryption</term>
+   <term>Password Encryption</term>
    <listitem>
 
     <para>
-     By default, database user passwords are stored as MD5 hashes, so
-     the administrator cannot determine the actual password assigned
-     to the user. If MD5 encryption is used for client authentication,
-     the unencrypted password is never even temporarily present on the
-     server because the client MD5-encrypts it before being sent
-     across the network.
+     Database user passwords are stored as hashes (determined by the setting
+     <xref linkend="guc-password-encryption"/>), so the administrator cannot
+     determine the actual password assigned to the user. If SCRAM or MD5
+     encryption is used for client authentication, the unencrypted password is
+     never even temporarily present on the server because the client encrypts
+     it before being sent across the network. SCRAM is preferred, because it
+     is an Internet standard and is more secure than the PostgreSQL-specific
+     MD5 authentication protocol.
     </para>
    </listitem>
   </varlistentry>
@@ -2043,7 +2044,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
 
    <listitem>
     <para>
-     The <xref linkend="pgcrypto"> module allows certain fields to be
+     The <xref linkend="pgcrypto"/> module allows certain fields to be
      stored encrypted.
      This is useful if only some of the data is sensitive.
      The client supplies the decryption key and the data is decrypted
@@ -2087,24 +2088,6 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    </listitem>
   </varlistentry>
 
-  <varlistentry>
-   <term>Encrypting Passwords Across A Network</term>
-
-   <listitem>
-     <para>
-      The <literal>MD5</> authentication method double-encrypts the
-      password on the client before sending it to the server. It first
-      MD5-encrypts it based on the user name, and then encrypts it
-      based on a random salt sent by the server when the database
-      connection was made. It is this double-encrypted value that is
-      sent over the network to the server. Double-encryption not only
-      prevents the password from being discovered, it also prevents
-      another connection from using the same encrypted password to
-      connect to the database server at a later time.
-     </para>
-    </listitem>
-  </varlistentry>
-
   <varlistentry>
    <term>Encrypting Data Across A Network</term>
 
@@ -2112,12 +2095,12 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
      <para>
       SSL connections encrypt all data sent across the network: the
       password, the queries, and the data returned. The
-      <filename>pg_hba.conf</> file allows administrators to specify
-      which hosts can use non-encrypted connections (<literal>host</>)
+      <filename>pg_hba.conf</filename> file allows administrators to specify
+      which hosts can use non-encrypted connections (<literal>host</literal>)
       and which require SSL-encrypted connections
-      (<literal>hostssl</>). Also, clients can specify that they
-      connect to servers only via SSL. <application>Stunnel</> or
-      <application>SSH</> can also be used to encrypt transmissions.
+      (<literal>hostssl</literal>). Also, clients can specify that they
+      connect to servers only via SSL. <application>Stunnel</application> or
+      <application>SSH</application> can also be used to encrypt transmissions.
      </para>
     </listitem>
   </varlistentry>
@@ -2132,7 +2115,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
      on each side, but this provides stronger verification of identity
      than the mere use of passwords. It prevents a computer from
      pretending to be the server just long enough to read the password
-     sent by the client. It also helps prevent <quote>man in the middle</>
+     sent by the client. It also helps prevent <quote>man in the middle</quote>
      attacks where a computer between the client and server pretends to
      be the server and reads and passes all data between the client and
      server.
@@ -2167,32 +2150,32 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   </indexterm>
 
   <para>
-   <productname>PostgreSQL</> has native support for using
-   <acronym>SSL</> connections to encrypt client/server communications
+   <productname>PostgreSQL</productname> has native support for using
+   <acronym>SSL</acronym> connections to encrypt client/server communications
    for increased security. This requires that
    <productname>OpenSSL</productname> is installed on both client and
-   server systems and that support in <productname>PostgreSQL</> is
-   enabled at build time (see <xref linkend="installation">).
+   server systems and that support in <productname>PostgreSQL</productname> is
+   enabled at build time (see <xref linkend="installation"/>).
   </para>
 
   <para>
-   With <acronym>SSL</> support compiled in, the
-   <productname>PostgreSQL</> server can be started with
-   <acronym>SSL</> enabled by setting the parameter
-   <xref linkend="guc-ssl"> to <literal>on</> in
-   <filename>postgresql.conf</>.  The server will listen for both normal
-   and <acronym>SSL</> connections on the same TCP port, and will negotiate
-   with any connecting client on whether to use <acronym>SSL</>.  By
+   With <acronym>SSL</acronym> support compiled in, the
+   <productname>PostgreSQL</productname> server can be started with
+   <acronym>SSL</acronym> enabled by setting the parameter
+   <xref linkend="guc-ssl"/> to <literal>on</literal> in
+   <filename>postgresql.conf</filename>.  The server will listen for both normal
+   and <acronym>SSL</acronym> connections on the same TCP port, and will negotiate
+   with any connecting client on whether to use <acronym>SSL</acronym>.  By
    default, this is at the client's option; see <xref
-   linkend="auth-pg-hba-conf"> about how to set up the server to require
-   use of <acronym>SSL</> for some or all connections.
+   linkend="auth-pg-hba-conf"/> about how to set up the server to require
+   use of <acronym>SSL</acronym> for some or all connections.
   </para>
 
   <para>
    <productname>PostgreSQL</productname> reads the system-wide
    <productname>OpenSSL</productname> configuration file. By default, this
    file is named <filename>openssl.cnf</filename> and is located in the
-   directory reported by <literal>openssl version -d</>.
+   directory reported by <literal>openssl version -d</literal>.
    This default can be overridden by setting environment variable
    <envar>OPENSSL_CONF</envar> to the name of the desired configuration file.
   </para>
@@ -2202,14 +2185,14 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    and authentication algorithms, of varying strength.  While a list of
    ciphers can be specified in the <productname>OpenSSL</productname>
    configuration file, you can specify ciphers specifically for use by
-   the database server by modifying <xref linkend="guc-ssl-ciphers"> in
-   <filename>postgresql.conf</>.
+   the database server by modifying <xref linkend="guc-ssl-ciphers"/> in
+   <filename>postgresql.conf</filename>.
   </para>
 
   <note>
    <para>
     It is possible to have authentication without encryption overhead by
-    using <literal>NULL-SHA</> or <literal>NULL-MD5</> ciphers.  However,
+    using <literal>NULL-SHA</literal> or <literal>NULL-MD5</literal> ciphers.  However,
     a man-in-the-middle could read and pass communications between client
     and server.  Also, encryption overhead is minimal compared to the
     overhead of authentication.  For these reasons NULL ciphers are not
@@ -2218,12 +2201,12 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   </note>
 
   <para>
-   To start in <acronym>SSL</> mode, files containing the server certificate
+   To start in <acronym>SSL</acronym> mode, files containing the server certificate
    and private key must exist.  By default, these files are expected to be
-   named <filename>server.crt</> and <filename>server.key</>, respectively, in
+   named <filename>server.crt</filename> and <filename>server.key</filename>, respectively, in
    the server's data directory, but other names and locations can be specified
-   using the configuration parameters <xref linkend="guc-ssl-cert-file">
-   and <xref linkend="guc-ssl-key-file">.
+   using the configuration parameters <xref linkend="guc-ssl-cert-file"/>
+   and <xref linkend="guc-ssl-key-file"/>.
   </para>
 
   <para>
@@ -2248,70 +2231,68 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   </para>
 
   <para>
-   In some cases, the server certificate might be signed by an
-   <quote>intermediate</> certificate authority, rather than one that is
-   directly trusted by clients.  To use such a certificate, append the
-   certificate of the signing authority to the <filename>server.crt</> file,
-   then its parent authority's certificate, and so on up to a certificate
-   authority, <quote>root</> or <quote>intermediate</>, that is trusted by
-   clients, i.e. signed by a certificate in the clients'
-   <filename>root.crt</filename> files.
+   The first certificate in <filename>server.crt</filename> must be the
+   server's certificate because it must match the server's private key.
+   The certificates of <quote>intermediate</quote> certificate authorities
+   can also be appended to the file.  Doing this avoids the necessity of
+   storing intermediate certificates on clients, assuming the root and
+   intermediate certificates were created with <literal>v3_ca</literal>
+   extensions.  This allows easier expiration of intermediate certificates.
+  </para>
+
+  <para>
+   It is not necessary to add the root certificate to
+   <filename>server.crt</filename>.  Instead, clients must have the root
+   certificate of the server's certificate chain.
   </para>
 
   <sect2 id="ssl-client-certificates">
    <title>Using Client Certificates</title>
 
   <para>
-   To require the client to supply a trusted certificate, place
-   certificates of the certificate authorities (<acronym>CA</acronym>s)
-   you trust in the file <filename>root.crt</filename> in the data
-   directory, set the parameter <xref linkend="guc-ssl-ca-file"> in
-   <filename>postgresql.conf</filename> to <literal>root.crt</literal>,
-   and add the authentication option <literal>clientcert=1</literal> to the
-   appropriate <literal>hostssl</> line(s) in <filename>pg_hba.conf</>.
-   A certificate will then be requested from the client during
-   SSL connection startup.  (See <xref linkend="libpq-ssl"> for a
-   description of how to set up certificates on the client.)  The server will
+   To require the client to supply a trusted certificate,
+   place certificates of the root certificate authorities
+   (<acronym>CA</acronym>s) you trust in a file in the data
+   directory, set the parameter <xref linkend="guc-ssl-ca-file"/> in
+   <filename>postgresql.conf</filename> to the new file name, and add the
+   authentication option <literal>clientcert=1</literal> to the appropriate
+   <literal>hostssl</literal> line(s) in <filename>pg_hba.conf</filename>.
+   A certificate will then be requested from the client during SSL
+   connection startup.  (See <xref linkend="libpq-ssl"/> for a description
+   of how to set up certificates on the client.)  The server will
    verify that the client's certificate is signed by one of the trusted
    certificate authorities.
   </para>
 
   <para>
-   If intermediate <acronym>CA</>s appear in
-   <filename>root.crt</filename>, the file must also contain certificate
-   chains to their root <acronym>CA</>s.  Certificate Revocation List
-   (CRL) entries
-   are also checked if the parameter <xref linkend="guc-ssl-crl-file"> is set.
+   Intermediate certificates that chain up to existing root certificates
+   can also appear in the <xref linkend="guc-ssl-ca-file"/> file if
+   you wish to avoid storing them on clients (assuming the root and
+   intermediate certificates were created with <literal>v3_ca</literal>
+   extensions).  Certificate Revocation List (CRL) entries are also
+   checked if the parameter <xref linkend="guc-ssl-crl-file"/> is set.
    <!-- If this URL changes replace it with a URL to www.archive.org. -->
    (See <ulink
-   url="http://h71000.www7.hp.com/doc/83final/ba554_90007/ch04s02.html"></>
+   url="http://h71000.www7.hp.com/doc/83final/ba554_90007/ch04s02.html"></ulink>
    for diagrams showing SSL certificate usage.)
   </para>
 
   <para>
    The <literal>clientcert</literal> authentication option is available for
-   all authentication methods, but only in <filename>pg_hba.conf</> lines
-   specified as <literal>hostssl</>.  When <literal>clientcert</literal> is
+   all authentication methods, but only in <filename>pg_hba.conf</filename> lines
+   specified as <literal>hostssl</literal>.  When <literal>clientcert</literal> is
    not specified or is set to 0, the server will still verify any presented
    client certificates against its CA file, if one is configured &mdash; but
    it will not insist that a client certificate be presented.
   </para>
 
-  <para>
-   Note that the server's <filename>root.crt</filename> lists the top-level
-   CAs that are considered trusted for signing client certificates.
-   In principle it need
-   not list the CA that signed the server's certificate, though in most cases
-   that CA would also be trusted for client certificates.
-  </para>
-
   <para>
    If you are setting up client certificates, you may wish to use
-   the <literal>cert</> authentication method, so that the certificates
+   the <literal>cert</literal> authentication method, so that the certificates
    control user authentication as well as providing connection security.
-   See <xref linkend="auth-cert"> for details.  (It is not necessary to
+   See <xref linkend="auth-cert"/> for details.  (It is not necessary to
    specify <literal>clientcert=1</literal> explicitly when using
-   the <literal>cert</> authentication method.)
+   the <literal>cert</literal> authentication method.)
   </para>
   </sect2>
 
@@ -2319,9 +2300,9 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
    <title>SSL Server File Usage</title>
 
    <para>
-    <xref linkend="ssl-file-usage"> summarizes the files that are
+    <xref linkend="ssl-file-usage"/> summarizes the files that are
     relevant to the SSL setup on the server.  (The shown file names are default
-    or typical names.  The locally configured names could be different.)
+    names.  The locally configured names could be different.)
    </para>
 
   <table id="ssl-file-usage">
@@ -2338,27 +2319,27 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
     <tbody>
 
      <row>
-      <entry><xref linkend="guc-ssl-cert-file"> (<filename>$PGDATA/server.crt</>)</entry>
+      <entry><xref linkend="guc-ssl-cert-file"/> (<filename>$PGDATA/server.crt</filename>)</entry>
       <entry>server certificate</entry>
       <entry>sent to client to indicate server's identity</entry>
      </row>
 
      <row>
-      <entry><xref linkend="guc-ssl-key-file"> (<filename>$PGDATA/server.key</>)</entry>
+      <entry><xref linkend="guc-ssl-key-file"/> (<filename>$PGDATA/server.key</filename>)</entry>
       <entry>server private key</entry>
       <entry>proves server certificate was sent by the owner; does not indicate
       certificate owner is trustworthy</entry>
      </row>
 
      <row>
-      <entry><xref linkend="guc-ssl-ca-file"> (<filename>$PGDATA/root.crt</>)</entry>
+      <entry><xref linkend="guc-ssl-ca-file"/></entry>
       <entry>trusted certificate authorities</entry>
       <entry>checks that client certificate is
       signed by a trusted certificate authority</entry>
      </row>
 
      <row>
-      <entry><xref linkend="guc-ssl-crl-file"> (<filename>$PGDATA/root.crl</>)</entry>
+      <entry><xref linkend="guc-ssl-crl-file"/></entry>
       <entry>certificates revoked by certificate authorities</entry>
       <entry>client certificate must not be on this list</entry>
      </row>
@@ -2369,7 +2350,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
 
    <para>
     The server reads these files at server start and whenever the server
-    configuration is reloaded.  On <systemitem class="osname">Windows</>
+    configuration is reloaded.  On <systemitem class="osname">Windows</systemitem>
     systems, they are also re-read whenever a new backend process is spawned
     for a new client connection.
    </para>
@@ -2378,7 +2359,7 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
     If an error in these files is detected at server start, the server will
     refuse to start.  But if an error is detected during a configuration
     reload, the files are ignored and the old SSL configuration continues to
-    be used.  On <systemitem class="osname">Windows</> systems, if an error in
+    be used.  On <systemitem class="osname">Windows</systemitem> systems, if an error in
     these files is detected at backend start, that backend will be unable to
     establish an SSL connection.  In all these cases, the error condition is
     reported in the server log.
@@ -2386,15 +2367,16 @@ pg_dumpall -p 5432 | psql -d postgres -p 5433
   </sect2>
 
   <sect2 id="ssl-certificate-creation">
-   <title>Creating a Self-signed Certificate</title>
+   <title>Creating Certificates</title>
 
    <para>
-     To create a quick self-signed certificate for the server, valid for 365
+     To create a simple self-signed certificate for the server, valid for 365
      days, use the following <productname>OpenSSL</productname> command,
-     replacing <replaceable>yourdomain.com</> with the server's host name:
+     replacing <replaceable>dbhost.yourdomain.com</replaceable> with the
+     server's host name:
 <programlisting>
 openssl req -new -x509 -days 365 -nodes -text -out server.crt \
-  -keyout server.key -subj "/CN=<replaceable>yourdomain.com</>"
+  -keyout server.key -subj "/CN=<replaceable>dbhost.yourdomain.com</replaceable>"
 </programlisting>
     Then do:
 <programlisting>
@@ -2403,18 +2385,90 @@ chmod og-rwx server.key
     because the server will reject the file if its permissions are more
     liberal than this.
     For more details on how to create your server private key and
-    certificate, refer to the <productname>OpenSSL</> documentation.
+    certificate, refer to the <productname>OpenSSL</productname> documentation.
    </para>
 
    <para>
-    A self-signed certificate can be used for testing, but a certificate
-    signed by a certificate authority (<acronym>CA</>) (either one of the
-    global <acronym>CAs</> or a local one) should be used in production
-    so that clients can verify the server's identity. If all the clients
-    are local to the organization, using a local <acronym>CA</> is
-    recommended.
+    While a self-signed certificate can be used for testing, a certificate
+    signed by a certificate authority (<acronym>CA</acronym>) (usually an
+    enterprise-wide root <acronym>CA</acronym>) should be used in production.
    </para>
 
+   <para>
+    To create a server certificate whose identity can be validated
+    by clients, first create a certificate signing request
+    (<acronym>CSR</acronym>) and a public/private key file:
+<programlisting>
+openssl req -new -nodes -text -out root.csr \
+  -keyout root.key -subj "/CN=<replaceable>root.yourdomain.com</replaceable>"
+chmod og-rwx root.key
+</programlisting>
+    Then, sign the request with the key to create a root certificate
+    authority (using the default <productname>OpenSSL</productname>
+    configuration file location on <productname>Linux</productname>):
+<programlisting>
+openssl x509 -req -in root.csr -text -days 3650 \
+  -extfile /etc/ssl/openssl.cnf -extensions v3_ca \
+  -signkey root.key -out root.crt
+</programlisting>
+    Finally, create a server certificate signed by the new root certificate
+    authority:
+<programlisting>
+openssl req -new -nodes -text -out server.csr \
+  -keyout server.key -subj "/CN=<replaceable>dbhost.yourdomain.com</replaceable>"
+chmod og-rwx server.key
+
+openssl x509 -req -in server.csr -text -days 365 \
+  -CA root.crt -CAkey root.key -CAcreateserial \
+  -out server.crt
+</programlisting>
+    <filename>server.crt</filename> and <filename>server.key</filename>
+    should be stored on the server, and <filename>root.crt</filename> should
+    be stored on the client so the client can verify that the server's leaf
+    certificate was signed by its trusted root certificate. 
+    <filename>root.key</filename> should be stored offline for use in
+    creating future certificates.
+   </para>
+
+   <para>
+    It is also possible to create a chain of trust that includes
+    intermediate certificates:
+<programlisting>
+# root
+openssl req -new -nodes -text -out root.csr \
+  -keyout root.key -subj "/CN=<replaceable>root.yourdomain.com</replaceable>"
+chmod og-rwx root.key
+openssl x509 -req -in root.csr -text -days 3650 \
+  -extfile /etc/ssl/openssl.cnf -extensions v3_ca \
+  -signkey root.key -out root.crt
+
+# intermediate
+openssl req -new -nodes -text -out intermediate.csr \
+  -keyout intermediate.key -subj "/CN=<replaceable>intermediate.yourdomain.com</replaceable>"
+chmod og-rwx intermediate.key
+openssl x509 -req -in intermediate.csr -text -days 1825 \
+  -extfile /etc/ssl/openssl.cnf -extensions v3_ca \
+  -CA root.crt -CAkey root.key -CAcreateserial \
+  -out intermediate.crt
+
+# leaf
+openssl req -new -nodes -text -out server.csr \
+  -keyout server.key -subj "/CN=<replaceable>dbhost.yourdomain.com</replaceable>"
+chmod og-rwx server.key
+openssl x509 -req -in server.csr -text -days 365 \
+  -CA intermediate.crt -CAkey intermediate.key -CAcreateserial \
+  -out server.crt
+</programlisting>
+    <filename>server.crt</filename> and
+    <filename>intermediate.crt</filename> should be concatenated
+    into a certificate file bundle and stored on the server.
+    <filename>server.key</filename> should also be stored on the server.
+    <filename>root.crt</filename> should be stored on the client so
+    the client can verify that the server's leaf certificate was signed
+    by a chain of certificates linked to its trusted root certificate.
+    <filename>root.key</filename> and <filename>intermediate.key</filename>
+    should be stored offline for use in creating future certificates.
+   </para>
   </sect2>
 
  </sect1>
@@ -2512,8 +2566,8 @@ ssh -L 63333:db.foo.com:5432 joe@shell.foo.com
  </sect1>
 
  <sect1 id="event-log-registration">
-  <title>Registering <application>Event Log</> on <systemitem
-  class="osname">Windows</></title>
+  <title>Registering <application>Event Log</application> on <systemitem
+  class="osname">Windows</systemitem></title>
 
   <indexterm zone="event-log-registration">
    <primary>event log</primary>
@@ -2521,11 +2575,11 @@ ssh -L 63333:db.foo.com:5432 joe@shell.foo.com
   </indexterm>
 
   <para>
-   To register a <systemitem class="osname">Windows</>
-   <application>event log</> library with the operating system,
+   To register a <systemitem class="osname">Windows</systemitem>
+   <application>event log</application> library with the operating system,
    issue this command:
 <screen>
-<userinput>regsvr32 <replaceable>pgsql_library_directory</>/pgevent.dll</>
+<userinput>regsvr32 <replaceable>pgsql_library_directory</replaceable>/pgevent.dll</userinput>
 </screen>
    This creates registry entries used by the event viewer, under the default
    event source named <literal>PostgreSQL</literal>.
@@ -2533,25 +2587,25 @@ ssh -L 63333:db.foo.com:5432 joe@shell.foo.com
 
   <para>
    To specify a different event source name (see
-   <xref linkend="guc-event-source">), use the <literal>/n</literal>
+   <xref linkend="guc-event-source"/>), use the <literal>/n</literal>
    and <literal>/i</literal> options:
 <screen>
-<userinput>regsvr32 /n /i:<replaceable>event_source_name</> <replaceable>pgsql_library_directory</>/pgevent.dll</>
+<userinput>regsvr32 /n /i:<replaceable>event_source_name</replaceable> <replaceable>pgsql_library_directory</replaceable>/pgevent.dll</userinput>
 </screen>
   </para>
 
   <para>
-   To unregister the <application>event log</> library from
+   To unregister the <application>event log</application> library from
    the operating system, issue this command:
 <screen>
-<userinput>regsvr32 /u [/i:<replaceable>event_source_name</>] <replaceable>pgsql_library_directory</>/pgevent.dll</>
+<userinput>regsvr32 /u [/i:<replaceable>event_source_name</replaceable>] <replaceable>pgsql_library_directory</replaceable>/pgevent.dll</userinput>
 </screen>
   </para>
 
   <note>
    <para>
     To enable event logging in the database server, modify
-    <xref linkend="guc-log-destination"> to include
+    <xref linkend="guc-log-destination"/> to include
     <literal>eventlog</literal> in <filename>postgresql.conf</filename>.
    </para>
   </note>
diff --git a/doc/src/sgml/seg.sgml b/doc/src/sgml/seg.sgml
index 5d1f546b53..d07329f5d1 100644
--- a/doc/src/sgml/seg.sgml
+++ b/doc/src/sgml/seg.sgml
@@ -8,9 +8,9 @@
  </indexterm>
 
  <para>
-  This module implements a data type <type>seg</> for
+  This module implements a data type <type>seg</type> for
   representing line segments, or floating point intervals.
-  <type>seg</> can represent uncertainty in the interval endpoints,
+  <type>seg</type> can represent uncertainty in the interval endpoints,
   making it especially useful for representing laboratory measurements.
  </para>
 
@@ -86,46 +86,46 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
    Optional certainty indicators (<literal>&lt;</literal>,
    <literal>&gt;</literal> or <literal>~</literal>) can be stored as well.
    (Certainty indicators are ignored by all the built-in operators, however.)
-   <xref linkend="seg-repr-table"> gives an overview of allowed
-   representations; <xref linkend="seg-input-examples"> shows some
+   <xref linkend="seg-repr-table"/> gives an overview of allowed
+   representations; <xref linkend="seg-input-examples"/> shows some
    examples.
   </para>
 
   <para>
-   In <xref linkend="seg-repr-table">, <replaceable>x</>, <replaceable>y</>, and
-   <replaceable>delta</> denote
-   floating-point numbers.  <replaceable>x</> and <replaceable>y</>, but
-   not <replaceable>delta</>, can be preceded by a certainty indicator.
+   In <xref linkend="seg-repr-table"/>, <replaceable>x</replaceable>, <replaceable>y</replaceable>, and
+   <replaceable>delta</replaceable> denote
+   floating-point numbers.  <replaceable>x</replaceable> and <replaceable>y</replaceable>, but
+   not <replaceable>delta</replaceable>, can be preceded by a certainty indicator.
   </para>
 
   <table id="seg-repr-table">
-   <title><type>seg</> External Representations</title>
+   <title><type>seg</type> External Representations</title>
    <tgroup cols="2">
     <tbody>
      <row>
-      <entry><literal><replaceable>x</></literal></entry>
+      <entry><literal><replaceable>x</replaceable></literal></entry>
       <entry>Single value (zero-length interval)
       </entry>
      </row>
      <row>
-      <entry><literal><replaceable>x</> .. <replaceable>y</></literal></entry>
-      <entry>Interval from <replaceable>x</> to <replaceable>y</>
+      <entry><literal><replaceable>x</replaceable> .. <replaceable>y</replaceable></literal></entry>
+      <entry>Interval from <replaceable>x</replaceable> to <replaceable>y</replaceable>
       </entry>
      </row>
      <row>
-      <entry><literal><replaceable>x</> (+-) <replaceable>delta</></literal></entry>
-      <entry>Interval from <replaceable>x</> - <replaceable>delta</> to
-      <replaceable>x</> + <replaceable>delta</>
+      <entry><literal><replaceable>x</replaceable> (+-) <replaceable>delta</replaceable></literal></entry>
+      <entry>Interval from <replaceable>x</replaceable> - <replaceable>delta</replaceable> to
+      <replaceable>x</replaceable> + <replaceable>delta</replaceable>
       </entry>
      </row>
      <row>
-      <entry><literal><replaceable>x</> ..</literal></entry>
-      <entry>Open interval with lower bound <replaceable>x</>
+      <entry><literal><replaceable>x</replaceable> ..</literal></entry>
+      <entry>Open interval with lower bound <replaceable>x</replaceable>
       </entry>
      </row>
      <row>
-      <entry><literal>.. <replaceable>x</></literal></entry>
-      <entry>Open interval with upper bound <replaceable>x</>
+      <entry><literal>.. <replaceable>x</replaceable></literal></entry>
+      <entry>Open interval with upper bound <replaceable>x</replaceable>
       </entry>
      </row>
     </tbody>
@@ -133,7 +133,7 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   </table>
 
   <table id="seg-input-examples">
-   <title>Examples of Valid <type>seg</> Input</title>
+   <title>Examples of Valid <type>seg</type> Input</title>
    <tgroup cols="2">
     <tbody>
      <row>
@@ -146,8 +146,8 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
       <entry><literal>~5.0</literal></entry>
       <entry>
        Creates a zero-length segment and records
-       <literal>~</> in the data.  <literal>~</literal> is ignored
-       by <type>seg</> operations, but
+       <literal>~</literal> in the data.  <literal>~</literal> is ignored
+       by <type>seg</type> operations, but
        is preserved as a comment.
       </entry>
      </row>
@@ -169,7 +169,7 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
       <entry><literal>5(+-)0.3</literal></entry>
       <entry>
         Creates an interval <literal>4.7 .. 5.3</literal>.
-        Note that the <literal>(+-)</> notation isn't preserved.
+        Note that the <literal>(+-)</literal> notation isn't preserved.
       </entry>
      </row>
      <row>
@@ -197,17 +197,17 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   </table>
 
   <para>
-   Because <literal>...</> is widely used in data sources, it is allowed
-   as an alternative spelling of <literal>..</>.  Unfortunately, this
+   Because <literal>...</literal> is widely used in data sources, it is allowed
+   as an alternative spelling of <literal>..</literal>.  Unfortunately, this
    creates a parsing ambiguity: it is not clear whether the upper bound
-   in <literal>0...23</> is meant to be <literal>23</> or <literal>0.23</>.
+   in <literal>0...23</literal> is meant to be <literal>23</literal> or <literal>0.23</literal>.
    This is resolved by requiring at least one digit before the decimal
-   point in all numbers in <type>seg</> input.
+   point in all numbers in <type>seg</type> input.
   </para>
 
   <para>
-   As a sanity check, <type>seg</> rejects intervals with the lower bound
-   greater than the upper, for example <literal>5 .. 2</>.
+   As a sanity check, <type>seg</type> rejects intervals with the lower bound
+   greater than the upper, for example <literal>5 .. 2</literal>.
   </para>
 
  </sect2>
@@ -216,7 +216,7 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   <title>Precision</title>
 
   <para>
-   <type>seg</> values are stored internally as pairs of 32-bit floating point
+   <type>seg</type> values are stored internally as pairs of 32-bit floating point
    numbers. This means that numbers with more than 7 significant digits
    will be truncated.
   </para>
@@ -235,9 +235,9 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   <title>Usage</title>
 
   <para>
-   The <filename>seg</> module includes a GiST index operator class for
-   <type>seg</> values.
-   The operators supported by the GiST operator class are shown in <xref linkend="seg-gist-operators">.
+   The <filename>seg</filename> module includes a GiST index operator class for
+   <type>seg</type> values.
+   The operators supported by the GiST operator class are shown in <xref linkend="seg-gist-operators"/>.
   </para>
 
   <table id="seg-gist-operators">
@@ -304,8 +304,8 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   </table>
 
   <para>
-   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</> and <literal>&lt;@</> were
-   respectively called <literal>@</> and <literal>~</>.  These names are still available, but are
+   (Before PostgreSQL 8.2, the containment operators <literal>@&gt;</literal> and <literal>&lt;@</literal> were
+   respectively called <literal>@</literal> and <literal>~</literal>.  These names are still available, but are
    deprecated and will eventually be retired.  Notice that the old names
    are reversed from the convention formerly followed by the core geometric
    data types!)
@@ -349,11 +349,11 @@ test=&gt; select '6.25 .. 6.50'::seg as "pH";
   <title>Notes</title>
 
   <para>
-   For examples of usage, see the regression test <filename>sql/seg.sql</>.
+   For examples of usage, see the regression test <filename>sql/seg.sql</filename>.
   </para>
 
   <para>
-   The mechanism that converts <literal>(+-)</> to regular ranges
+   The mechanism that converts <literal>(+-)</literal> to regular ranges
    isn't completely accurate in determining the number of significant digits
    for the boundaries.  For example, it adds an extra digit to the lower
    boundary if the resulting interval includes a power of ten:
@@ -369,7 +369,7 @@ postgres=&gt; select '10(+-)1'::seg as seg;
   <para>
    The performance of an R-tree index can largely depend on the initial
    order of input values. It may be very helpful to sort the input table
-   on the <type>seg</> column; see the script <filename>sort-segments.pl</>
+   on the <type>seg</type> column; see the script <filename>sort-segments.pl</filename>
    for an example.
   </para>
  </sect2>
diff --git a/doc/src/sgml/sepgsql.sgml b/doc/src/sgml/sepgsql.sgml
index 0b611eeeca..f8c99e1b00 100644
--- a/doc/src/sgml/sepgsql.sgml
+++ b/doc/src/sgml/sepgsql.sgml
@@ -8,8 +8,8 @@
  </indexterm>
 
  <para>
-  <filename>sepgsql</> is a loadable module that supports label-based
-  mandatory access control (MAC) based on <productname>SELinux</> security
+  <filename>sepgsql</filename> is a loadable module that supports label-based
+  mandatory access control (MAC) based on <productname>SELinux</productname> security
   policy.
  </para>
 
@@ -17,7 +17,7 @@
    <para>
      The current implementation has significant limitations, and does not
      enforce mandatory access control for all actions.  See
-     <xref linkend="sepgsql-limitations">.
+     <xref linkend="sepgsql-limitations"/>.
    </para>
  </warning>
 
@@ -25,10 +25,10 @@
   <title>Overview</title>
 
   <para>
-   This module integrates with <productname>SELinux</> to provide an
+   This module integrates with <productname>SELinux</productname> to provide an
    additional layer of security checking above and beyond what is normally
    provided by <productname>PostgreSQL</productname>.  From the perspective of
-   <productname>SELinux</>, this module allows
+   <productname>SELinux</productname>, this module allows
    <productname>PostgreSQL</productname> to function as a user-space object
    manager.  Each table or function access initiated by a DML query will be
    checked against the system security policy.  This check is in addition to
@@ -39,7 +39,7 @@
   <para>
    <productname>SELinux</productname> access control decisions are made using
    security labels, which are represented by strings such as
-   <literal>system_u:object_r:sepgsql_table_t:s0</>.  Each access control
+   <literal>system_u:object_r:sepgsql_table_t:s0</literal>.  Each access control
    decision involves two labels: the label of the subject attempting to
    perform the action, and the label of the object on which the operation is
    to be performed.  Since these labels can be applied to any sort of object,
@@ -51,7 +51,7 @@
   </para>
 
   <para>
-   The <xref linkend="sql-security-label"> statement allows assignment of
+   The <xref linkend="sql-security-label"/> statement allows assignment of
    a security label to a database object.
   </para>
 
@@ -60,17 +60,17 @@
   <title>Installation</title>
 
   <para>
-    <filename>sepgsql</> can only be used on <productname>Linux</productname>
+    <filename>sepgsql</filename> can only be used on <productname>Linux</productname>
     2.6.28 or higher with <productname>SELinux</productname> enabled.
     It is not available on any other platform.  You will also need
-    <productname>libselinux</> 2.1.10 or higher and
-    <productname>selinux-policy</> 3.9.13 or higher (although some
+    <productname>libselinux</productname> 2.1.10 or higher and
+    <productname>selinux-policy</productname> 3.9.13 or higher (although some
     distributions may backport the necessary rules into older policy
     versions).
   </para>
 
   <para>
-   The <command>sestatus</> command allows you to check the status of
+   The <command>sestatus</command> command allows you to check the status of
    <productname>SELinux</productname>.  A typical display is:
 <screen>
 $ sestatus
@@ -81,20 +81,20 @@ Mode from config file:          enforcing
 Policy version:                 24
 Policy from config file:        targeted
 </screen>
-   If <productname>SELinux</> is disabled or not installed, you must set
+   If <productname>SELinux</productname> is disabled or not installed, you must set
    that product up first before installing this module.
   </para>
 
   <para>
-   To build this module, include the option <literal>--with-selinux</> in
-   your PostgreSQL <literal>configure</> command.  Be sure that the
-   <filename>libselinux-devel</> RPM is installed at build time.
+   To build this module, include the option <literal>--with-selinux</literal> in
+   your PostgreSQL <literal>configure</literal> command.  Be sure that the
+   <filename>libselinux-devel</filename> RPM is installed at build time.
   </para>
 
   <para>
-   To use this module, you must include <literal>sepgsql</>
-   in the <xref linkend="guc-shared-preload-libraries"> parameter in
-   <filename>postgresql.conf</>.  The module will not function correctly
+   To use this module, you must include <literal>sepgsql</literal>
+   in the <xref linkend="guc-shared-preload-libraries"/> parameter in
+   <filename>postgresql.conf</filename>.  The module will not function correctly
    if loaded in any other manner.  Once the module is loaded, you
    should execute <filename>sepgsql.sql</filename> in each database.
    This will install functions needed for security label management, and
@@ -103,7 +103,7 @@ Policy from config file:        targeted
 
   <para>
    Here is an example showing how to initialize a fresh database cluster
-   with <filename>sepgsql</> functions and security labels installed.
+   with <filename>sepgsql</filename> functions and security labels installed.
    Adjust the paths shown as appropriate for your installation:
   </para>
 
@@ -124,7 +124,7 @@ $ for DBNAME in template0 template1 postgres; do
   <para>
    Please note that you may see some or all of the following notifications
    depending on the particular versions you have of
-   <productname>libselinux</> and <productname>selinux-policy</>:
+   <productname>libselinux</productname> and <productname>selinux-policy</productname>:
 <screen>
 /etc/selinux/targeted/contexts/sepgsql_contexts:  line 33 has invalid object type db_blobs
 /etc/selinux/targeted/contexts/sepgsql_contexts:  line 36 has invalid object type db_language
@@ -147,38 +147,38 @@ $ for DBNAME in template0 template1 postgres; do
 
   <para>
    Due to the nature of <productname>SELinux</productname>, running the
-   regression tests for <filename>sepgsql</> requires several extra
+   regression tests for <filename>sepgsql</filename> requires several extra
    configuration steps, some of which must be done as root.
    The regression tests will not be run by an ordinary
-   <literal>make check</> or <literal>make installcheck</> command; you must
+   <literal>make check</literal> or <literal>make installcheck</literal> command; you must
    set up the configuration and then invoke the test script manually.
-   The tests must be run in the <filename>contrib/sepgsql</> directory
+   The tests must be run in the <filename>contrib/sepgsql</filename> directory
    of a configured PostgreSQL build tree.  Although they require a build tree,
    the tests are designed to be executed against an installed server,
-   that is they are comparable to <literal>make installcheck</> not
-   <literal>make check</>.
+   that is they are comparable to <literal>make installcheck</literal> not
+   <literal>make check</literal>.
   </para>
 
   <para>
    First, set up <filename>sepgsql</filename> in a working database
-   according to the instructions in <xref linkend="sepgsql-installation">.
+   according to the instructions in <xref linkend="sepgsql-installation"/>.
    Note that the current operating system user must be able to connect to the
    database as superuser without password authentication.
   </para>
 
   <para>
    Second, build and install the policy package for the regression test.
-   The <filename>sepgsql-regtest</> policy is a special purpose policy package
+   The <filename>sepgsql-regtest</filename> policy is a special purpose policy package
    which provides a set of rules to be allowed during the regression tests.
    It should be built from the policy source file
-   <filename>sepgsql-regtest.te</>, which is done using
+   <filename>sepgsql-regtest.te</filename>, which is done using
    <command>make</command> with a Makefile supplied by SELinux.
    You will need to locate the appropriate
    Makefile on your system; the path shown below is only an example.
    Once built, install this policy package using the
-   <command>semodule</> command, which loads supplied policy packages
+   <command>semodule</command> command, which loads supplied policy packages
    into the kernel.  If the package is correctly installed,
-   <literal><command>semodule</> -l</> should list <literal>sepgsql-regtest</literal> as an
+   <literal><command>semodule</command> -l</literal> should list <literal>sepgsql-regtest</literal> as an
    available policy package:
   </para>
 
@@ -191,12 +191,12 @@ sepgsql-regtest 1.07
 </screen>
 
   <para>
-   Third, turn on <literal>sepgsql_regression_test_mode</>.
-   For security reasons, the rules in <filename>sepgsql-regtest</>
+   Third, turn on <literal>sepgsql_regression_test_mode</literal>.
+   For security reasons, the rules in <filename>sepgsql-regtest</filename>
    are not enabled by default;
    the <literal>sepgsql_regression_test_mode</literal> parameter enables
    the rules needed to launch the regression tests.
-   It can be turned on using the <command>setsebool</> command:
+   It can be turned on using the <command>setsebool</command> command:
   </para>
 
 <screen>
@@ -206,7 +206,7 @@ sepgsql_regression_test_mode --> on
 </screen>
 
   <para>
-   Fourth, verify your shell is operating in the <literal>unconfined_t</>
+   Fourth, verify your shell is operating in the <literal>unconfined_t</literal>
    domain:
   </para>
 <screen>
@@ -215,7 +215,7 @@ unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
 </screen>
 
   <para>
-   See <xref linkend="sepgsql-resources"> for details on adjusting your
+   See <xref linkend="sepgsql-resources"/> for details on adjusting your
    working domain, if necessary.
   </para>
 
@@ -229,7 +229,7 @@ $ ./test_sepgsql
   <para>
    This script will attempt to verify that you have done all the configuration
    steps correctly, and then it will run the regression tests for the
-   <filename>sepgsql</> module.
+   <filename>sepgsql</filename> module.
   </para>
 
   <para>
@@ -242,7 +242,7 @@ $ sudo setsebool sepgsql_regression_test_mode off
 </screen>
 
   <para>
-   You might prefer to remove the <filename>sepgsql-regtest</> policy
+   You might prefer to remove the <filename>sepgsql-regtest</filename> policy
    entirely:
   </para>
 
@@ -257,22 +257,22 @@ $ sudo semodule -r sepgsql-regtest
   <variablelist>
    <varlistentry id="guc-sepgsql-permissive" xreflabel="sepgsql.permissive">
     <term>
-     <varname>sepgsql.permissive</> (<type>boolean</type>)
+     <varname>sepgsql.permissive</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>sepgsql.permissive</> configuration parameter</primary>
+      <primary><varname>sepgsql.permissive</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
      <para>
-      This parameter enables <filename>sepgsql</> to function
+      This parameter enables <filename>sepgsql</filename> to function
       in permissive mode, regardless of the system setting.
       The default is off.
-      This parameter can only be set in the <filename>postgresql.conf</>
+      This parameter can only be set in the <filename>postgresql.conf</filename>
       file or on the server command line.
      </para>
 
      <para>
-      When this parameter is on, <filename>sepgsql</> functions
+      When this parameter is on, <filename>sepgsql</filename> functions
       in permissive mode, even if SELinux in general is working in enforcing
       mode.  This parameter is primarily useful for testing purposes.
      </para>
@@ -281,9 +281,9 @@ $ sudo semodule -r sepgsql-regtest
    </varlistentry>
    <varlistentry id="guc-sepgsql-debug-audit" xreflabel="sepgsql.debug_audit">
     <term>
-     <varname>sepgsql.debug_audit</> (<type>boolean</>)
+     <varname>sepgsql.debug_audit</varname> (<type>boolean</type>)
      <indexterm>
-      <primary><varname>sepgsql.debug_audit</> configuration parameter</>
+      <primary><varname>sepgsql.debug_audit</varname> configuration parameter</primary>
      </indexterm>
     </term>
     <listitem>
@@ -295,7 +295,7 @@ $ sudo semodule -r sepgsql-regtest
      </para>
 
      <para>
-      The security policy of <productname>SELinux</> also has rules to
+      The security policy of <productname>SELinux</productname> also has rules to
       control whether or not particular accesses are logged.
       By default, access violations are logged, but allowed
       accesses are not.
@@ -315,13 +315,13 @@ $ sudo semodule -r sepgsql-regtest
   <sect3>
    <title>Controlled Object Classes</title>
    <para>
-    The security model of <productname>SELinux</> describes all the access
+    The security model of <productname>SELinux</productname> describes all the access
     control rules as relationships between a subject entity (typically,
     a client of the database) and an object entity (such as a database
     object), each of which is
     identified by a security label.  If access to an unlabeled object is
     attempted, the object is treated as if it were assigned the label
-    <literal>unlabeled_t</>.
+    <literal>unlabeled_t</literal>.
    </para>
 
    <para>
@@ -349,67 +349,67 @@ $ sudo semodule -r sepgsql-regtest
    <title>DML Permissions</title>
 
    <para>
-    For tables, <literal>db_table:select</>, <literal>db_table:insert</>,
-    <literal>db_table:update</> or <literal>db_table:delete</> are
+    For tables, <literal>db_table:select</literal>, <literal>db_table:insert</literal>,
+    <literal>db_table:update</literal> or <literal>db_table:delete</literal> are
     checked for all the referenced target tables depending on the kind of
-    statement; in addition, <literal>db_table:select</> is also checked for
+    statement; in addition, <literal>db_table:select</literal> is also checked for
     all the tables that contain columns referenced in the
-    <literal>WHERE</> or <literal>RETURNING</> clause, as a data source
-    for <literal>UPDATE</>, and so on.
+    <literal>WHERE</literal> or <literal>RETURNING</literal> clause, as a data source
+    for <literal>UPDATE</literal>, and so on.
    </para>
 
    <para>
     Column-level permissions will also be checked for each referenced column.
-    <literal>db_column:select</> is checked on not only the columns being
-    read using <literal>SELECT</>, but those being referenced in other DML
-    statements; <literal>db_column:update</> or <literal>db_column:insert</>
-    will also be checked for columns being modified by <literal>UPDATE</> or
-    <literal>INSERT</>.
+    <literal>db_column:select</literal> is checked on not only the columns being
+    read using <literal>SELECT</literal>, but those being referenced in other DML
+    statements; <literal>db_column:update</literal> or <literal>db_column:insert</literal>
+    will also be checked for columns being modified by <literal>UPDATE</literal> or
+    <literal>INSERT</literal>.
    </para>
 
    <para>
    For example, consider:
 <synopsis>
-UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
+UPDATE t1 SET x = 2, y = func1(y) WHERE z = 100;
 </synopsis>
 
-    Here, <literal>db_column:update</> will be checked for
-    <literal>t1.x</>, since it is being updated,
-    <literal>db_column:{select update}</> will be checked for
-    <literal>t1.y</>, since it is both updated and referenced, and
-    <literal>db_column:select</> will be checked for <literal>t1.z</>, since
+    Here, <literal>db_column:update</literal> will be checked for
+    <literal>t1.x</literal>, since it is being updated,
+    <literal>db_column:{select update}</literal> will be checked for
+    <literal>t1.y</literal>, since it is both updated and referenced, and
+    <literal>db_column:select</literal> will be checked for <literal>t1.z</literal>, since
     it is only referenced.
-    <literal>db_table:{select update}</> will also be checked
+    <literal>db_table:{select update}</literal> will also be checked
     at the table level.
    </para>
 
    <para>
-    For sequences, <literal>db_sequence:get_value</> is checked when we
-    reference a sequence object using <literal>SELECT</>; however, note that we
+    For sequences, <literal>db_sequence:get_value</literal> is checked when we
+    reference a sequence object using <literal>SELECT</literal>; however, note that we
     do not currently check permissions on execution of corresponding functions
-    such as <literal>lastval()</>.
+    such as <literal>lastval()</literal>.
    </para>
 
    <para>
-    For views, <literal>db_view:expand</> will be checked, then any other
+    For views, <literal>db_view:expand</literal> will be checked, then any other
     required permissions will be checked on the objects being
     expanded from the view, individually.
    </para>
 
    <para>
-    For functions, <literal>db_procedure:{execute}</> will be checked when
+    For functions, <literal>db_procedure:{execute}</literal> will be checked when
     user tries to execute a function as a part of query, or using fast-path
     invocation. If this function is a trusted procedure, it also checks
-    <literal>db_procedure:{entrypoint}</> permission to check whether it
+    <literal>db_procedure:{entrypoint}</literal> permission to check whether it
     can perform as entry point of trusted procedure.
    </para>
 
    <para>
-    In order to access any schema object, <literal>db_schema:search</>
+    In order to access any schema object, <literal>db_schema:search</literal>
     permission is required on the containing schema.  When an object is
     referenced without schema qualification, schemas on which this
     permission is not present will not be searched (just as if the user did
-    not have <literal>USAGE</> privilege on the schema).  If an explicit schema
+    not have <literal>USAGE</literal> privilege on the schema).  If an explicit schema
     qualification is present, an error will occur if the user does not have
     the requisite permission on the named schema.
    </para>
@@ -425,22 +425,22 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
     The default database privilege system allows database superusers to
     modify system catalogs using DML commands, and reference or modify
     toast tables.  These operations are prohibited when
-    <filename>sepgsql</> is enabled.
+    <filename>sepgsql</filename> is enabled.
    </para>
   </sect3>
 
   <sect3>
    <title>DDL Permissions</title>
    <para>
-    <productname>SELinux</> defines several permissions to control common
+    <productname>SELinux</productname> defines several permissions to control common
     operations for each object type; such as creation, alter, drop and
     relabel of security label. In addition, several object types have
     special permissions to control their characteristic operations; such as
     addition or deletion of name entries within a particular schema.
    </para>
    <para>
-    Creating a new database object requires <literal>create</> permission.
-    <productname>SELinux</> will grant or deny this permission based on the
+    Creating a new database object requires <literal>create</literal> permission.
+    <productname>SELinux</productname> will grant or deny this permission based on the
     client's security label and the proposed security label for the new
     object.  In some cases, additional privileges are required:
    </para>
@@ -448,13 +448,13 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
    <itemizedlist>
     <listitem>
      <para>
-      <xref linkend="sql-createdatabase"> additionally requires
-      <literal>getattr</> permission for the source or template database.
+      <xref linkend="sql-createdatabase"/> additionally requires
+      <literal>getattr</literal> permission for the source or template database.
      </para>
     </listitem>
     <listitem>
      <para>
-      Creating a schema object additionally requires <literal>add_name</>
+      Creating a schema object additionally requires <literal>add_name</literal>
       permission on the parent schema.
      </para>
     </listitem>
@@ -467,23 +467,23 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
     </listitem>
     <listitem>
      <para>
-      Creating a function marked as <literal>LEAKPROOF</> additionally
-      requires <literal>install</> permission.  (This permission is also
-      checked when <literal>LEAKPROOF</> is set for an existing function.)
+      Creating a function marked as <literal>LEAKPROOF</literal> additionally
+      requires <literal>install</literal> permission.  (This permission is also
+      checked when <literal>LEAKPROOF</literal> is set for an existing function.)
      </para>
     </listitem>
    </itemizedlist>
 
    <para>
-    When <literal>DROP</> command is executed, <literal>drop</> will be
+    When <literal>DROP</literal> command is executed, <literal>drop</literal> will be
     checked on the object being removed.  Permissions will be also checked for
-    objects dropped indirectly via <literal>CASCADE</>.  Deletion of objects
+    objects dropped indirectly via <literal>CASCADE</literal>.  Deletion of objects
     contained within a particular schema (tables, views, sequences and
-    procedures) additionally requires <literal>remove_name</> on the schema.
+    procedures) additionally requires <literal>remove_name</literal> on the schema.
    </para>
 
    <para>
-    When <literal>ALTER</> command is executed, <literal>setattr</> will be
+    When <literal>ALTER</literal> command is executed, <literal>setattr</literal> will be
     checked on the object being modified for each object types, except for
     subsidiary objects such as the indexes or triggers of a table, where
     permissions are instead checked on the parent object.  In some cases,
@@ -494,25 +494,25 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
     <listitem>
      <para>
       Moving an object to a new schema additionally requires
-      <literal>remove_name</> permission on the old schema and
-      <literal>add_name</> permission on the new one.
+      <literal>remove_name</literal> permission on the old schema and
+      <literal>add_name</literal> permission on the new one.
      </para>
     </listitem>
     <listitem>
      <para>
-      Setting the <literal>LEAKPROOF</> attribute on a function requires
-      <literal>install</> permission.
+      Setting the <literal>LEAKPROOF</literal> attribute on a function requires
+      <literal>install</literal> permission.
      </para>
     </listitem>
     <listitem>
      <para>
-      Using <xref linkend="sql-security-label"> on an object additionally
-      requires <literal>relabelfrom</> permission for the object in
-      conjunction with its old security label and <literal>relabelto</>
+      Using <xref linkend="sql-security-label"/> on an object additionally
+      requires <literal>relabelfrom</literal> permission for the object in
+      conjunction with its old security label and <literal>relabelto</literal>
       permission for the object in conjunction with its new security label.
       (In cases where multiple label providers are installed and the user
       tries to set a security label, but it is not managed by
-      <productname>SELinux</>, only <literal>setattr</> should be checked here.
+      <productname>SELinux</productname>, only <literal>setattr</literal> should be checked here.
       This is currently not done due to implementation restrictions.)
      </para>
     </listitem>
@@ -524,7 +524,7 @@ UPDATE t1 SET x = 2, y = md5sum(y) WHERE z = 100;
    <title>Trusted Procedures</title>
    <para>
     Trusted procedures are similar to security definer functions or setuid
-    commands. <productname>SELinux</> provides a feature to allow trusted
+    commands. <productname>SELinux</productname> provides a feature to allow trusted
     code to run using a security label different from that of the client,
     generally for the purpose of providing highly controlled access to
     sensitive data (e.g. rows might be omitted, or the precision of stored
@@ -569,8 +569,8 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
 </screen>
 
    <para>
-    In this case, a regular user cannot reference <literal>customer.credit</>
-    directly, but a trusted procedure <literal>show_credit</> allows the user
+    In this case, a regular user cannot reference <literal>customer.credit</literal>
+    directly, but a trusted procedure <literal>show_credit</literal> allows the user
     to print the credit card numbers of customers with some of the digits
     masked out.
    </para>
@@ -582,8 +582,8 @@ postgres=# SELECT cid, cname, show_credit(cid) FROM customer;
     It is possible to use SELinux's dynamic domain transition feature
     to switch the security label of the client process, the client domain,
     to a new context, if that is allowed by the security policy.
-    The client domain needs the <literal>setcurrent</> permission and also
-    <literal>dyntransition</> from the old to the new domain.
+    The client domain needs the <literal>setcurrent</literal> permission and also
+    <literal>dyntransition</literal> from the old to the new domain.
    </para>
    <para>
     Dynamic domain transitions should be considered carefully, because they
@@ -612,7 +612,7 @@ ERROR:  SELinux: security policy violation
 </screen>
    <para>
     In this example above we were allowed to switch from the larger MCS
-    range <literal>c1.c1023</> to the smaller range <literal>c1.c4</>, but
+    range <literal>c1.c1023</literal> to the smaller range <literal>c1.c4</literal>, but
     switching back was denied.
    </para>
    <para>
@@ -641,7 +641,7 @@ ERROR:  SELinux: security policy violation
   <sect3>
    <title>Miscellaneous</title>
    <para>
-    We reject the <xref linkend="sql-load"> command across the board, because
+    We reject the <xref linkend="sql-load"/> command across the board, because
     any module loaded could easily circumvent security policy enforcement.
    </para>
 
@@ -651,7 +651,7 @@ ERROR:  SELinux: security policy violation
  <sect2 id="sepgsql-functions">
   <title>Sepgsql Functions</title>
   <para>
-   <xref linkend="sepgsql-functions-table"> shows the available functions.
+   <xref linkend="sepgsql-functions-table"/> shows the available functions.
   </para>
 
   <table id="sepgsql-functions-table">
@@ -726,7 +726,7 @@ ERROR:  SELinux: security policy violation
     <term>Row-level access control</term>
     <listitem>
      <para>
-      <productname>PostgreSQL</> supports row-level access, but
+      <productname>PostgreSQL</productname> supports row-level access, but
       <filename>sepgsql</filename> does not.
      </para>
     </listitem>
@@ -736,7 +736,7 @@ ERROR:  SELinux: security policy violation
     <term>Covert channels</term>
     <listitem>
      <para>
-      <filename>sepgsql</> does not try to hide the existence of
+      <filename>sepgsql</filename> does not try to hide the existence of
       a certain object, even if the user is not allowed to reference it.
       For example, we can infer the existence of an invisible object as
       a result of primary key conflicts, foreign key violations, and so on,
@@ -762,17 +762,17 @@ ERROR:  SELinux: security policy violation
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><ulink url="http://docs.fedoraproject.org/selinux-user-guide/">Fedora SELinux User Guide</ulink></term>
+    <term><ulink url="https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/7/html/SELinux_Users_and_Administrators_Guide/">SELinux User's and Administrator's Guide</ulink></term>
     <listitem>
      <para>
       This document provides a wide spectrum of knowledge to administer
-      <productname>SELinux</> on your systems.
-      It focuses primarily on Fedora, but is not limited to Fedora.
+      <productname>SELinux</productname> on your systems.
+      It focuses primarily on Red Hat operating systems, but is not limited to them.
      </para>
     </listitem>
    </varlistentry>
    <varlistentry>
-    <term><ulink url="http://docs.fedoraproject.org/selinux-faq">Fedora SELinux FAQ</ulink></term>
+    <term><ulink url="https://fedoraproject.org/wiki/SELinux_FAQ">Fedora SELinux FAQ</ulink></term>
     <listitem>
      <para>
       This document answers frequently asked questions about
diff --git a/doc/src/sgml/sourcerepo.sgml b/doc/src/sgml/sourcerepo.sgml
index dd9da5a7b0..aaeacb14c5 100644
--- a/doc/src/sgml/sourcerepo.sgml
+++ b/doc/src/sgml/sourcerepo.sgml
@@ -18,18 +18,18 @@
 
   <para>
    Note that building <productname>PostgreSQL</productname> from the source
-   repository requires reasonably up-to-date versions of <application>bison</>,
-   <application>flex</>, and <application>Perl</>. These tools are not needed
+   repository requires reasonably up-to-date versions of <application>bison</application>,
+   <application>flex</application>, and <application>Perl</application>. These tools are not needed
    to build from a distribution tarball, because the files that these tools
    are used to build are included in the tarball.  Other tool requirements
-   are the same as shown in <xref linkend="install-requirements">.
+   are the same as shown in <xref linkend="install-requirements"/>.
   </para>
 
  <sect1 id="git">
-  <title>Getting The Source via <productname>Git</></title>
+  <title>Getting The Source via <productname>Git</productname></title>
 
   <para>
-   With <productname>Git</> you will make a copy of the entire code repository
+   With <productname>Git</productname> you will make a copy of the entire code repository
    on your local machine, so you will have access to all history and branches
    offline. This is the fastest and most flexible way to develop or test
    patches.
@@ -40,9 +40,9 @@
 
    <step>
     <para>
-     You will need an installed version of <productname>Git</>, which you can
-     get from <ulink url="http://git-scm.com"></ulink>. Many systems already
-     have a recent version of <application>Git</> installed by default, or
+     You will need an installed version of <productname>Git</productname>, which you can
+     get from <ulink url="https://git-scm.com"></ulink>. Many systems already
+     have a recent version of <application>Git</application> installed by default, or
      available in their package distribution system.
     </para>
    </step>
@@ -52,32 +52,29 @@
      To begin using the Git repository, make a clone of the official mirror:
 
 <programlisting>
-git clone git://git.postgresql.org/git/postgresql.git
+git clone https://git.postgresql.org/git/postgresql.git
 </programlisting>
 
      This will copy the full repository to your local machine, so it may take
      a while to complete, especially if you have a slow Internet connection.
-     The files will be placed in a new subdirectory <filename>postgresql</> of
+     The files will be placed in a new subdirectory <filename>postgresql</filename> of
      your current directory.
     </para>
 
     <para>
-     The Git mirror can also be reached via the HTTP protocol, if for example
-     a firewall is blocking access to the Git protocol. Just change the URL
-     prefix to <literal>https</>, as in:
+     The Git mirror can also be reached via the Git protocol. Just change the URL
+     prefix to <literal>git</literal>, as in:
 
 <programlisting>
-git clone https://git.postgresql.org/git/postgresql.git
+git clone git://git.postgresql.org/git/postgresql.git
 </programlisting>
 
-     The HTTP protocol is less efficient than the Git protocol, so it will be
-     slower to use.
     </para>
    </step>
 
    <step>
     <para>
-     Whenever you want to get the latest updates in the system, <command>cd</>
+     Whenever you want to get the latest updates in the system, <command>cd</command>
      into the repository, and run:
 
 <programlisting>
@@ -88,9 +85,9 @@ git fetch
   </procedure>
 
   <para>
-   <productname>Git</> can do a lot more things than just fetch the source. For
-   more information, consult the <productname>Git</> man pages, or see the
-   website at <ulink url="http://git-scm.com"></>.
+   <productname>Git</productname> can do a lot more things than just fetch the source. For
+   more information, consult the <productname>Git</productname> man pages, or see the
+   website at <ulink url="https://git-scm.com"></ulink>.
   </para>
  </sect1>
 
diff --git a/doc/src/sgml/sources.sgml b/doc/src/sgml/sources.sgml
index 877fcedbb3..8870ee938a 100644
--- a/doc/src/sgml/sources.sgml
+++ b/doc/src/sgml/sources.sgml
@@ -14,8 +14,8 @@
 
    <para>
     Layout rules (brace positioning, etc) follow BSD conventions.  In
-    particular, curly braces for the controlled blocks of <literal>if</>,
-    <literal>while</>, <literal>switch</>, etc go on their own lines.
+    particular, curly braces for the controlled blocks of <literal>if</literal>,
+    <literal>while</literal>, <literal>switch</literal>, etc go on their own lines.
    </para>
 
    <para>
@@ -26,7 +26,7 @@
    </para>
 
    <para>
-    Do not use C++ style comments (<literal>//</> comments).  Strict ANSI C
+    Do not use C++ style comments (<literal>//</literal> comments).  Strict ANSI C
     compilers do not accept them.  For the same reason, do not use C++
     extensions such as declaring new variables mid-block.
    </para>
@@ -40,7 +40,7 @@
  */
 </programlisting>
     Note that comment blocks that begin in column 1 will be preserved as-is
-    by <application>pgindent</>, but it will re-flow indented comment blocks
+    by <application>pgindent</application>, but it will re-flow indented comment blocks
     as though they were plain text.  If you want to preserve the line breaks
     in an indented block, add dashes like this:
 <programlisting>
@@ -55,10 +55,10 @@
    <para>
     While submitted patches do not absolutely have to follow these formatting
     rules, it's a good idea to do so.  Your code will get run through
-    <application>pgindent</> before the next release, so there's no point in
+    <application>pgindent</application> before the next release, so there's no point in
     making it look nice under some other set of formatting conventions.
     A good rule of thumb for patches is <quote>make the new code look like
-    the existing code around it</>.
+    the existing code around it</quote>.
    </para>
 
    <para>
@@ -92,37 +92,37 @@ less -x4
 
    <para>
     Error, warning, and log messages generated within the server code
-    should be created using <function>ereport</>, or its older cousin
-    <function>elog</>.  The use of this function is complex enough to
+    should be created using <function>ereport</function>, or its older cousin
+    <function>elog</function>.  The use of this function is complex enough to
     require some explanation.
    </para>
 
    <para>
     There are two required elements for every message: a severity level
-    (ranging from <literal>DEBUG</> to <literal>PANIC</>) and a primary
+    (ranging from <literal>DEBUG</literal> to <literal>PANIC</literal>) and a primary
     message text.  In addition there are optional elements, the most
     common of which is an error identifier code that follows the SQL spec's
     SQLSTATE conventions.
-    <function>ereport</> itself is just a shell function, that exists
+    <function>ereport</function> itself is just a shell function, that exists
     mainly for the syntactic convenience of making message generation
     look like a function call in the C source code.  The only parameter
-    accepted directly by <function>ereport</> is the severity level.
+    accepted directly by <function>ereport</function> is the severity level.
     The primary message text and any optional message elements are
-    generated by calling auxiliary functions, such as <function>errmsg</>,
-    within the <function>ereport</> call.
+    generated by calling auxiliary functions, such as <function>errmsg</function>,
+    within the <function>ereport</function> call.
    </para>
 
    <para>
-    A typical call to <function>ereport</> might look like this:
+    A typical call to <function>ereport</function> might look like this:
 <programlisting>
 ereport(ERROR,
         (errcode(ERRCODE_DIVISION_BY_ZERO),
          errmsg("division by zero")));
 </programlisting>
-    This specifies error severity level <literal>ERROR</> (a run-of-the-mill
-    error).  The <function>errcode</> call specifies the SQLSTATE error code
-    using a macro defined in <filename>src/include/utils/errcodes.h</>.  The
-    <function>errmsg</> call provides the primary message text.  Notice the
+    This specifies error severity level <literal>ERROR</literal> (a run-of-the-mill
+    error).  The <function>errcode</function> call specifies the SQLSTATE error code
+    using a macro defined in <filename>src/include/utils/errcodes.h</filename>.  The
+    <function>errmsg</function> call provides the primary message text.  Notice the
     extra set of parentheses surrounding the auxiliary function calls &mdash;
     these are annoying but syntactically necessary.
    </para>
@@ -139,90 +139,90 @@ ereport(ERROR,
                  "You might need to add explicit typecasts.")));
 </programlisting>
     This illustrates the use of format codes to embed run-time values into
-    a message text.  Also, an optional <quote>hint</> message is provided.
+    a message text.  Also, an optional <quote>hint</quote> message is provided.
    </para>
 
    <para>
-    If the severity level is <literal>ERROR</> or higher,
-    <function>ereport</> aborts the execution of the user-defined
+    If the severity level is <literal>ERROR</literal> or higher,
+    <function>ereport</function> aborts the execution of the user-defined
     function and does not return to the caller. If the severity level is
-    lower than <literal>ERROR</>, <function>ereport</> returns normally.
+    lower than <literal>ERROR</literal>, <function>ereport</function> returns normally.
    </para>
 
    <para>
-    The available auxiliary routines for <function>ereport</> are:
+    The available auxiliary routines for <function>ereport</function> are:
   <itemizedlist>
    <listitem>
     <para>
      <function>errcode(sqlerrcode)</function> specifies the SQLSTATE error identifier
      code for the condition.  If this routine is not called, the error
      identifier defaults to
-     <literal>ERRCODE_INTERNAL_ERROR</> when the error severity level is
-     <literal>ERROR</> or higher, <literal>ERRCODE_WARNING</> when the
-     error level is <literal>WARNING</>, otherwise (for <literal>NOTICE</>
-     and below) <literal>ERRCODE_SUCCESSFUL_COMPLETION</>.
+     <literal>ERRCODE_INTERNAL_ERROR</literal> when the error severity level is
+     <literal>ERROR</literal> or higher, <literal>ERRCODE_WARNING</literal> when the
+     error level is <literal>WARNING</literal>, otherwise (for <literal>NOTICE</literal>
+     and below) <literal>ERRCODE_SUCCESSFUL_COMPLETION</literal>.
      While these defaults are often convenient, always think whether they
-     are appropriate before omitting the <function>errcode()</> call.
+     are appropriate before omitting the <function>errcode()</function> call.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errmsg(const char *msg, ...)</function> specifies the primary error
      message text, and possibly run-time values to insert into it.  Insertions
-     are specified by <function>sprintf</>-style format codes.  In addition to
-     the standard format codes accepted by <function>sprintf</>, the format
-     code <literal>%m</> can be used to insert the error message returned
-     by <function>strerror</> for the current value of <literal>errno</>.
+     are specified by <function>sprintf</function>-style format codes.  In addition to
+     the standard format codes accepted by <function>sprintf</function>, the format
+     code <literal>%m</literal> can be used to insert the error message returned
+     by <function>strerror</function> for the current value of <literal>errno</literal>.
      <footnote>
       <para>
-       That is, the value that was current when the <function>ereport</> call
-       was reached; changes of <literal>errno</> within the auxiliary reporting
+       That is, the value that was current when the <function>ereport</function> call
+       was reached; changes of <literal>errno</literal> within the auxiliary reporting
        routines will not affect it.  That would not be true if you were to
-       write <literal>strerror(errno)</> explicitly in <function>errmsg</>'s
+       write <literal>strerror(errno)</literal> explicitly in <function>errmsg</function>'s
        parameter list; accordingly, do not do so.
       </para>
      </footnote>
-     <literal>%m</> does not require any
-     corresponding entry in the parameter list for <function>errmsg</>.
-     Note that the message string will be run through <function>gettext</>
+     <literal>%m</literal> does not require any
+     corresponding entry in the parameter list for <function>errmsg</function>.
+     Note that the message string will be run through <function>gettext</function>
      for possible localization before format codes are processed.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errmsg_internal(const char *msg, ...)</function> is the same as
-     <function>errmsg</>, except that the message string will not be
+     <function>errmsg</function>, except that the message string will not be
      translated nor included in the internationalization message dictionary.
-     This should be used for <quote>cannot happen</> cases that are probably
+     This should be used for <quote>cannot happen</quote> cases that are probably
      not worth expending translation effort on.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errmsg_plural(const char *fmt_singular, const char *fmt_plural,
-     unsigned long n, ...)</function> is like <function>errmsg</>, but with
+     unsigned long n, ...)</function> is like <function>errmsg</function>, but with
      support for various plural forms of the message.
-     <replaceable>fmt_singular</> is the English singular format,
-     <replaceable>fmt_plural</> is the English plural format,
-     <replaceable>n</> is the integer value that determines which plural
+     <replaceable>fmt_singular</replaceable> is the English singular format,
+     <replaceable>fmt_plural</replaceable> is the English plural format,
+     <replaceable>n</replaceable> is the integer value that determines which plural
      form is needed, and the remaining arguments are formatted according
      to the selected format string.  For more information see
-     <xref linkend="nls-guidelines">.
+     <xref linkend="nls-guidelines"/>.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errdetail(const char *msg, ...)</function> supplies an optional
-     <quote>detail</> message; this is to be used when there is additional
+     <quote>detail</quote> message; this is to be used when there is additional
      information that seems inappropriate to put in the primary message.
      The message string is processed in just the same way as for
-     <function>errmsg</>.
+     <function>errmsg</function>.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errdetail_internal(const char *msg, ...)</function> is the same
-     as <function>errdetail</>, except that the message string will not be
+     as <function>errdetail</function>, except that the message string will not be
      translated nor included in the internationalization message dictionary.
      This should be used for detail messages that are not worth expending
      translation effort on, for instance because they are too technical to be
@@ -232,18 +232,18 @@ ereport(ERROR,
    <listitem>
     <para>
      <function>errdetail_plural(const char *fmt_singular, const char *fmt_plural,
-     unsigned long n, ...)</function> is like <function>errdetail</>, but with
+     unsigned long n, ...)</function> is like <function>errdetail</function>, but with
      support for various plural forms of the message.
-     For more information see <xref linkend="nls-guidelines">.
+     For more information see <xref linkend="nls-guidelines"/>.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errdetail_log(const char *msg, ...)</function> is the same as
-     <function>errdetail</> except that this string goes only to the server
-     log, never to the client.  If both <function>errdetail</> (or one of
+     <function>errdetail</function> except that this string goes only to the server
+     log, never to the client.  If both <function>errdetail</function> (or one of
      its equivalents above) and
-     <function>errdetail_log</> are used then one string goes to the client
+     <function>errdetail_log</function> are used then one string goes to the client
      and the other to the log.  This is useful for error details that are
      too security-sensitive or too bulky to include in the report
      sent to the client.
@@ -253,31 +253,31 @@ ereport(ERROR,
     <para>
      <function>errdetail_log_plural(const char *fmt_singular, const char
      *fmt_plural, unsigned long n, ...)</function> is like
-     <function>errdetail_log</>, but with support for various plural forms of
+     <function>errdetail_log</function>, but with support for various plural forms of
      the message.
-     For more information see <xref linkend="nls-guidelines">.
+     For more information see <xref linkend="nls-guidelines"/>.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errhint(const char *msg, ...)</function> supplies an optional
-     <quote>hint</> message; this is to be used when offering suggestions
+     <quote>hint</quote> message; this is to be used when offering suggestions
      about how to fix the problem, as opposed to factual details about
      what went wrong.
      The message string is processed in just the same way as for
-     <function>errmsg</>.
+     <function>errmsg</function>.
     </para>
    </listitem>
    <listitem>
     <para>
      <function>errcontext(const char *msg, ...)</function> is not normally called
-     directly from an <function>ereport</> message site; rather it is used
-     in <literal>error_context_stack</> callback functions to provide
+     directly from an <function>ereport</function> message site; rather it is used
+     in <literal>error_context_stack</literal> callback functions to provide
      information about the context in which an error occurred, such as the
      current location in a PL function.
      The message string is processed in just the same way as for
-     <function>errmsg</>.  Unlike the other auxiliary functions, this can
-     be called more than once per <function>ereport</> call; the successive
+     <function>errmsg</function>.  Unlike the other auxiliary functions, this can
+     be called more than once per <function>ereport</function> call; the successive
      strings thus supplied are concatenated with separating newlines.
     </para>
    </listitem>
@@ -309,9 +309,9 @@ ereport(ERROR,
      specifies a table constraint whose name, table name, and schema name
      should be included as auxiliary fields in the error report.  Indexes
      should be considered to be constraints for this purpose, whether or
-     not they have an associated <structname>pg_constraint</> entry.  Be
+     not they have an associated <structname>pg_constraint</structname> entry.  Be
      careful to pass the underlying heap relation, not the index itself, as
-     <literal>rel</>.
+     <literal>rel</literal>.
     </para>
    </listitem>
    <listitem>
@@ -330,17 +330,17 @@ ereport(ERROR,
    </listitem>
    <listitem>
     <para>
-     <function>errcode_for_file_access()</> is a convenience function that
+     <function>errcode_for_file_access()</function> is a convenience function that
      selects an appropriate SQLSTATE error identifier for a failure in a
      file-access-related system call.  It uses the saved
-     <literal>errno</> to determine which error code to generate.
-     Usually this should be used in combination with <literal>%m</> in the
+     <literal>errno</literal> to determine which error code to generate.
+     Usually this should be used in combination with <literal>%m</literal> in the
      primary error message text.
     </para>
    </listitem>
    <listitem>
     <para>
-     <function>errcode_for_socket_access()</> is a convenience function that
+     <function>errcode_for_socket_access()</function> is a convenience function that
      selects an appropriate SQLSTATE error identifier for a failure in a
      socket-related system call.
     </para>
@@ -348,7 +348,7 @@ ereport(ERROR,
    <listitem>
     <para>
      <function>errhidestmt(bool hide_stmt)</function> can be called to specify
-     suppression of the <literal>STATEMENT:</> portion of a message in the
+     suppression of the <literal>STATEMENT:</literal> portion of a message in the
      postmaster log.  Generally this is appropriate if the message text
      includes the current statement already.
     </para>
@@ -356,7 +356,7 @@ ereport(ERROR,
    <listitem>
     <para>
      <function>errhidecontext(bool hide_ctx)</function> can be called to
-     specify suppression of the <literal>CONTEXT:</> portion of a message in
+     specify suppression of the <literal>CONTEXT:</literal> portion of a message in
      the postmaster log.  This should only be used for verbose debugging
      messages where the repeated inclusion of context would bloat the log
      volume too much.
@@ -367,24 +367,24 @@ ereport(ERROR,
 
    <note>
     <para>
-     At most one of the functions <function>errtable</>,
-     <function>errtablecol</>, <function>errtableconstraint</>,
-     <function>errdatatype</>, or <function>errdomainconstraint</> should
-     be used in an <function>ereport</> call.  These functions exist to
+     At most one of the functions <function>errtable</function>,
+     <function>errtablecol</function>, <function>errtableconstraint</function>,
+     <function>errdatatype</function>, or <function>errdomainconstraint</function> should
+     be used in an <function>ereport</function> call.  These functions exist to
      allow applications to extract the name of a database object associated
      with the error condition without having to examine the
      potentially-localized error message text.
      These functions should be used in error reports for which it's likely
      that applications would wish to have automatic error handling.  As of
-     <productname>PostgreSQL</> 9.3, complete coverage exists only for
+     <productname>PostgreSQL</productname> 9.3, complete coverage exists only for
      errors in SQLSTATE class 23 (integrity constraint violation), but this
      is likely to be expanded in future.
     </para>
    </note>
 
    <para>
-    There is an older function <function>elog</> that is still heavily used.
-    An <function>elog</> call:
+    There is an older function <function>elog</function> that is still heavily used.
+    An <function>elog</function> call:
 <programlisting>
 elog(level, "format string", ...);
 </programlisting>
@@ -394,17 +394,17 @@ ereport(level, (errmsg_internal("format string", ...)));
 </programlisting>
     Notice that the SQLSTATE error code is always defaulted, and the message
     string is not subject to translation.
-    Therefore, <function>elog</> should be used only for internal errors and
+    Therefore, <function>elog</function> should be used only for internal errors and
     low-level debug logging.  Any message that is likely to be of interest to
-    ordinary users should go through <function>ereport</>.  Nonetheless,
-    there are enough internal <quote>cannot happen</> error checks in the
-    system that <function>elog</> is still widely used; it is preferred for
+    ordinary users should go through <function>ereport</function>.  Nonetheless,
+    there are enough internal <quote>cannot happen</quote> error checks in the
+    system that <function>elog</function> is still widely used; it is preferred for
     those messages for its notational simplicity.
    </para>
 
    <para>
     Advice about writing good error messages can be found in
-    <xref linkend="error-style-guide">.
+    <xref linkend="error-style-guide"/>.
    </para>
   </sect1>
 
@@ -414,7 +414,7 @@ ereport(level, (errmsg_internal("format string", ...)));
    <para>
     This style guide is offered in the hope of maintaining a consistent,
     user-friendly style throughout all the messages generated by
-    <productname>PostgreSQL</>.
+    <productname>PostgreSQL</productname>.
    </para>
 
   <simplesect>
@@ -643,7 +643,7 @@ cannot open file "%s"
    </para>
 
    <para>
-    Rationale: Otherwise no one will know what <quote>foo.bar.baz</>
+    Rationale: Otherwise no one will know what <quote>foo.bar.baz</quote>
     refers to.
    </para>
 
@@ -853,7 +853,7 @@ BETTER: unrecognized node type: 42
 
    <para>
     Keep in mind that error message texts need to be translated into other
-    languages.  Follow the guidelines in <xref linkend="nls-guidelines">
+    languages.  Follow the guidelines in <xref linkend="nls-guidelines"/>
     to avoid making life difficult for translators.
    </para>
   </simplesect>
@@ -866,7 +866,7 @@ BETTER: unrecognized node type: 42
    <simplesect>
     <title>C Standard</title>
     <para>
-     Code in <productname>PostgreSQL</> should only rely on language
+     Code in <productname>PostgreSQL</productname> should only rely on language
      features available in the C89 standard. That means a conforming
      C89 compiler has to be able to compile postgres, at least aside
      from a few platform dependent pieces. Features from later
@@ -874,7 +874,7 @@ BETTER: unrecognized node type: 42
      used, if a fallback is provided.
     </para>
     <para>
-     For example <literal>static inline</> and
+     For example <literal>static inline</literal> and
      <literal>_StaticAssert()</literal> are currently used, even
      though they are from newer revisions of the C standard. If not
      available we respectively fall back to defining the functions
@@ -886,7 +886,7 @@ BETTER: unrecognized node type: 42
    <simplesect>
     <title>Function-Like Macros and Inline Functions</title>
     <para>
-     Both, macros with arguments and <literal>static inline</>
+     Both, macros with arguments and <literal>static inline</literal>
      functions, may be used. The latter are preferable if there are
      multiple-evaluation hazards when written as a macro, as e.g. the
      case with
@@ -914,7 +914,7 @@ MemoryContextSwitchTo(MemoryContext context)
 }
 #endif   /* FRONTEND */
 </programlisting>
-     In this example <literal>CurrentMemoryContext</>, which is only
+     In this example <literal>CurrentMemoryContext</literal>, which is only
      available in the backend, is referenced and the function thus
      hidden with a <literal>#ifndef FRONTEND</literal>. This rule
      exists because some compilers emit references to symbols
@@ -957,12 +957,30 @@ handle_sighup(SIGNAL_ARGS)
     errno = save_errno;
 }
 </programlisting>
-     <varname>errno</> is saved and restored because
-     <function>SetLatch()</> might change it. If that were not done
+     <varname>errno</varname> is saved and restored because
+     <function>SetLatch()</function> might change it. If that were not done
      interrupted code that's currently inspecting <varname>errno</varname> might see the wrong
      value.
     </para>
    </simplesect>
 
+   <simplesect>
+    <title>Calling Function Pointers</title>
+
+    <para>
+     For clarity, it is preferred to explicitly dereference a function pointer
+     when calling the pointed-to function if the pointer is a simple variable,
+     for example:
+<programlisting>
+(*emit_log_hook) (edata);
+</programlisting>
+     (even though <literal>emit_log_hook(edata)</literal> would also work).
+     When the function pointer is part of a structure, then the extra
+     punctuation can and usually should be omitted, for example:
+<programlisting>
+paramInfo->paramFetch(paramInfo, paramId);
+</programlisting>
+    </para>
+   </simplesect>
   </sect1>
  </chapter>
diff --git a/doc/src/sgml/spgist.sgml b/doc/src/sgml/spgist.sgml
index cd4a8d07c4..51bb60c92a 100644
--- a/doc/src/sgml/spgist.sgml
+++ b/doc/src/sgml/spgist.sgml
@@ -1,6 +1,6 @@
 <!-- doc/src/sgml/spgist.sgml -->
 
-<chapter id="SPGiST">
+<chapter id="spgist">
 <title>SP-GiST Indexes</title>
 
    <indexterm>
@@ -57,9 +57,9 @@
  <title>Built-in Operator Classes</title>
 
  <para>
-  The core <productname>PostgreSQL</> distribution
+  The core <productname>PostgreSQL</productname> distribution
   includes the <acronym>SP-GiST</acronym> operator classes shown in
-  <xref linkend="spgist-builtin-opclasses-table">.
+  <xref linkend="spgist-builtin-opclasses-table"/>.
  </para>
 
   <table id="spgist-builtin-opclasses-table">
@@ -74,92 +74,128 @@
     </thead>
     <tbody>
      <row>
-      <entry><literal>kd_point_ops</></entry>
-      <entry><type>point</></entry>
+      <entry><literal>kd_point_ops</literal></entry>
+      <entry><type>point</type></entry>
       <entry>
-       <literal>&lt;&lt;</>
-       <literal>&lt;@</>
-       <literal>&lt;^</>
-       <literal>&gt;&gt;</>
-       <literal>&gt;^</>
-       <literal>~=</>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&lt;^</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&gt;^</literal>
+       <literal>~=</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>quad_point_ops</></entry>
-      <entry><type>point</></entry>
+      <entry><literal>quad_point_ops</literal></entry>
+      <entry><type>point</type></entry>
       <entry>
-       <literal>&lt;&lt;</>
-       <literal>&lt;@</>
-       <literal>&lt;^</>
-       <literal>&gt;&gt;</>
-       <literal>&gt;^</>
-       <literal>~=</>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&lt;^</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&gt;^</literal>
+       <literal>~=</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>range_ops</></entry>
+      <entry><literal>range_ops</literal></entry>
       <entry>any range type</entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&lt;</>
-       <literal>&amp;&gt;</>
-       <literal>-|-</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;@</>
-       <literal>=</>
-       <literal>&gt;&gt;</>
-       <literal>@&gt;</>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>-|-</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;@</literal>
+       <literal>=</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>@&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>box_ops</></entry>
-      <entry><type>box</></entry>
+      <entry><literal>box_ops</literal></entry>
+      <entry><type>box</type></entry>
       <entry>
-       <literal>&lt;&lt;</>
-       <literal>&amp;&lt;</>
-       <literal>&amp;&amp;</>
-       <literal>&amp;&gt;</>
-       <literal>&gt;&gt;</>
-       <literal>~=</>
-       <literal>@&gt;</>
-       <literal>&lt;@</>
-       <literal>&amp;&lt;|</>
-       <literal>&lt;&lt;|</>
+       <literal>&lt;&lt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>~=</literal>
+       <literal>@&gt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&lt;&lt;|</literal>
        <literal>|&gt;&gt;</literal>
-       <literal>|&amp;&gt;</>
+       <literal>|&amp;&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>text_ops</></entry>
-      <entry><type>text</></entry>
+      <entry><literal>poly_ops</literal></entry>
+      <entry><type>polygon</type></entry>
       <entry>
-       <literal>&lt;</>
-       <literal>&lt;=</>
-       <literal>=</>
-       <literal>&gt;</>
-       <literal>&gt;=</>
-       <literal>~&lt;=~</>
-       <literal>~&lt;~</>
-       <literal>~&gt;=~</>
-       <literal>~&gt;~</>
+       <literal>&lt;&lt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>~=</literal>
+       <literal>@&gt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&lt;&lt;|</literal>
+       <literal>|&gt;&gt;</literal>
+       <literal>|&amp;&gt;</literal>
+      </entry>
+     </row>
+     <row>
+      <entry><literal>poly_ops</literal></entry>
+      <entry><type>polygon</type></entry>
+      <entry>
+       <literal>&lt;&lt;</literal>
+       <literal>&amp;&lt;</literal>
+       <literal>&amp;&amp;</literal>
+       <literal>&amp;&gt;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>~=</literal>
+       <literal>@&gt;</literal>
+       <literal>&lt;@</literal>
+       <literal>&amp;&lt;|</literal>
+       <literal>&lt;&lt;|</literal>
+       <literal>|&gt;&gt;</literal>
+       <literal>|&amp;&gt;</literal>
       </entry>
      </row>
      <row>
-      <entry><literal>inet_ops</></entry>
-      <entry><type>inet</>, <type>cidr</></entry>
+      <entry><literal>text_ops</literal></entry>
+      <entry><type>text</type></entry>
       <entry>
-       <literal>&amp;&amp;</>
-       <literal>&gt;&gt;</>
-       <literal>&gt;&gt;=</>
-       <literal>&gt;</>
-       <literal>&gt;=</>
-       <literal>&lt;&gt;</>
-       <literal>&lt;&lt;</>
-       <literal>&lt;&lt;=</>
-       <literal>&lt;</>
-       <literal>&lt;=</>
-       <literal>=</>
+       <literal>&lt;</literal>
+       <literal>&lt;=</literal>
+       <literal>=</literal>
+       <literal>&gt;</literal>
+       <literal>&gt;=</literal>
+       <literal>~&lt;=~</literal>
+       <literal>~&lt;~</literal>
+       <literal>~&gt;=~</literal>
+       <literal>~&gt;~</literal>
+      </entry>
+     </row>
+     <row>
+      <entry><literal>inet_ops</literal></entry>
+      <entry><type>inet</type>, <type>cidr</type></entry>
+      <entry>
+       <literal>&amp;&amp;</literal>
+       <literal>&gt;&gt;</literal>
+       <literal>&gt;&gt;=</literal>
+       <literal>&gt;</literal>
+       <literal>&gt;=</literal>
+       <literal>&lt;&gt;</literal>
+       <literal>&lt;&lt;</literal>
+       <literal>&lt;&lt;=</literal>
+       <literal>&lt;</literal>
+       <literal>&lt;=</literal>
+       <literal>=</literal>
       </entry>
      </row>
     </tbody>
@@ -167,8 +203,8 @@
   </table>
 
  <para>
-  Of the two operator classes for type <type>point</>,
-  <literal>quad_point_ops</> is the default.  <literal>kd_point_ops</>
+  Of the two operator classes for type <type>point</type>,
+  <literal>quad_point_ops</literal> is the default.  <literal>kd_point_ops</literal>
   supports the same operators but uses a different index data structure which
   may offer better performance in some applications.
  </para>
@@ -199,15 +235,15 @@
  <para>
   Inner tuples are more complex, since they are branching points in the
   search tree.  Each inner tuple contains a set of one or more
-  <firstterm>nodes</>, which represent groups of similar leaf values.
+  <firstterm>nodes</firstterm>, which represent groups of similar leaf values.
   A node contains a downlink that leads either to another, lower-level inner
   tuple, or to a short list of leaf tuples that all lie on the same index page.
-  Each node normally has a <firstterm>label</> that describes it; for example,
+  Each node normally has a <firstterm>label</firstterm> that describes it; for example,
   in a radix tree the node label could be the next character of the string
   value.  (Alternatively, an operator class can omit the node labels, if it
   works with a fixed set of nodes for all inner tuples;
-  see <xref linkend="spgist-null-labels">.)
-  Optionally, an inner tuple can have a <firstterm>prefix</> value
+  see <xref linkend="spgist-null-labels"/>.)
+  Optionally, an inner tuple can have a <firstterm>prefix</firstterm> value
   that describes all its members.  In a radix tree this could be the common
   prefix of the represented strings.  The prefix value is not necessarily
   really a prefix, but can be any data needed by the operator class;
@@ -223,7 +259,7 @@
   operator classes to manage level counting while descending the tree.
   There is also support for incrementally reconstructing the represented
   value when that is needed, and for passing down additional data (called
-  <firstterm>traverse values</>) during a tree descent.
+  <firstterm>traverse values</firstterm>) during a tree descent.
  </para>
 
  <note>
@@ -240,38 +276,40 @@
 
  <para>
   There are five user-defined methods that an index operator class for
-  <acronym>SP-GiST</acronym> must provide.  All five follow the convention
-  of accepting two <type>internal</> arguments, the first of which is a
-  pointer to a C struct containing input values for the support method,
-  while the second argument is a pointer to a C struct where output values
-  must be placed.  Four of the methods just return <type>void</>, since
-  all their results appear in the output struct; but
-  <function>leaf_consistent</> additionally returns a <type>boolean</> result.
+  <acronym>SP-GiST</acronym> must provide, and one is optional.  All five
+  mandatory methods follow the convention of accepting two <type>internal</type>
+  arguments, the first of which is a pointer to a C struct containing input
+  values for the support method, while the second argument is a pointer to a
+  C struct where output values must be placed.  Four of the mandatory methods just
+  return <type>void</type>, since all their results appear in the output struct; but
+  <function>leaf_consistent</function> additionally returns a <type>boolean</type> result.
   The methods must not modify any fields of their input structs.  In all
   cases, the output struct is initialized to zeroes before calling the
-  user-defined method.
+  user-defined method.  Optional sixth method <function>compress</function>
+  accepts datum to be indexed as the only argument and returns value suitable
+  for physical storage in leaf tuple.
  </para>
 
  <para>
-  The five user-defined methods are:
+  The five mandatory user-defined methods are:
  </para>
 
  <variablelist>
     <varlistentry>
-     <term><function>config</></term>
+     <term><function>config</function></term>
      <listitem>
       <para>
        Returns static information about the index implementation, including
        the data type OIDs of the prefix and node label data types.
       </para>
      <para>
-      The <acronym>SQL</> declaration of the function must look like this:
+      The <acronym>SQL</acronym> declaration of the function must look like this:
 <programlisting>
 CREATE FUNCTION my_config(internal, internal) RETURNS void ...
 </programlisting>
-      The first argument is a pointer to a <structname>spgConfigIn</>
+      The first argument is a pointer to a <structname>spgConfigIn</structname>
       C struct, containing input data for the function.
-      The second argument is a pointer to a <structname>spgConfigOut</>
+      The second argument is a pointer to a <structname>spgConfigOut</structname>
       C struct, which the function must fill with result data.
 <programlisting>
 typedef struct spgConfigIn
@@ -283,46 +321,63 @@ typedef struct spgConfigOut
 {
     Oid         prefixType;     /* Data type of inner-tuple prefixes */
     Oid         labelType;      /* Data type of inner-tuple node labels */
+    Oid         leafType;       /* Data type of leaf-tuple values */
     bool        canReturnData;  /* Opclass can reconstruct original data */
     bool        longValuesOK;   /* Opclass can cope with values &gt; 1 page */
 } spgConfigOut;
 </programlisting>
 
-      <structfield>attType</> is passed in order to support polymorphic
+      <structfield>attType</structfield> is passed in order to support polymorphic
       index operator classes; for ordinary fixed-data-type operator classes, it
       will always have the same value and so can be ignored.
      </para>
 
      <para>
       For operator classes that do not use prefixes,
-      <structfield>prefixType</> can be set to <literal>VOIDOID</>.
+      <structfield>prefixType</structfield> can be set to <literal>VOIDOID</literal>.
       Likewise, for operator classes that do not use node labels,
-      <structfield>labelType</> can be set to <literal>VOIDOID</>.
-      <structfield>canReturnData</> should be set true if the operator class
+      <structfield>labelType</structfield> can be set to <literal>VOIDOID</literal>.
+      <structfield>canReturnData</structfield> should be set true if the operator class
       is capable of reconstructing the originally-supplied index value.
-      <structfield>longValuesOK</> should be set true only when the
-      <structfield>attType</> is of variable length and the operator
+      <structfield>longValuesOK</structfield> should be set true only when the
+      <structfield>attType</structfield> is of variable length and the operator
       class is capable of segmenting long values by repeated suffixing
-      (see <xref linkend="spgist-limits">).
+      (see <xref linkend="spgist-limits"/>).
+     </para>
+
+     <para>
+      <structfield>leafType</structfield> is typically the same as
+      <structfield>attType</structfield>.  For the reasons of backward
+      compatibility, method <function>config</function> can
+      leave <structfield>leafType</structfield> uninitialized; that would
+      give the same effect as setting <structfield>leafType</structfield> equal
+      to <structfield>attType</structfield>.  When <structfield>attType</structfield>
+      and <structfield>leafType</structfield> are different, then optional
+      method <function>compress</function> must be provided.
+      Method <function>compress</function> is responsible
+      for transformation of datums to be indexed from <structfield>attType</structfield>
+      to <structfield>leafType</structfield>.
+      Note: both consistent functions will get <structfield>scankeys</structfield>
+      unchanged, without transformation using <function>compress</function>.
      </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>choose</></term>
+     <term><function>choose</function></term>
      <listitem>
       <para>
         Chooses a method for inserting a new value into an inner tuple.
       </para>
 
      <para>
-      The <acronym>SQL</> declaration of the function must look like this:
+      The <acronym>SQL</acronym> declaration of the function must look like this:
 <programlisting>
 CREATE FUNCTION my_choose(internal, internal) RETURNS void ...
 </programlisting>
-      The first argument is a pointer to a <structname>spgChooseIn</>
+      The first argument is a pointer to a <structname>spgChooseIn</structname>
       C struct, containing input data for the function.
-      The second argument is a pointer to a <structname>spgChooseOut</>
+      The second argument is a pointer to a <structname>spgChooseOut</structname>
       C struct, which the function must fill with result data.
 <programlisting>
 typedef struct spgChooseIn
@@ -380,25 +435,31 @@ typedef struct spgChooseOut
 } spgChooseOut;
 </programlisting>
 
-       <structfield>datum</> is the original datum that was to be inserted
-       into the index.
-       <structfield>leafDatum</> is initially the same as
-       <structfield>datum</>, but can change at lower levels of the tree
+       <structfield>datum</structfield> is the original datum of
+       <structname>spgConfigIn</structname>.<structfield>attType</structfield>
+       type that was to be inserted into the index.
+       <structfield>leafDatum</structfield> is a value of
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield>
+       type which is initially an result of method
+       <function>compress</function> applied to <structfield>datum</structfield>
+       when method <function>compress</function> is provided, or same value as
+       <structfield>datum</structfield> otherwise.
+       <structfield>leafDatum</structfield> can change at lower levels of the tree
        if the <function>choose</function> or <function>picksplit</function>
        methods change it.  When the insertion search reaches a leaf page,
-       the current value of <structfield>leafDatum</> is what will be stored
+       the current value of <structfield>leafDatum</structfield> is what will be stored
        in the newly created leaf tuple.
-       <structfield>level</> is the current inner tuple's level, starting at
+       <structfield>level</structfield> is the current inner tuple's level, starting at
        zero for the root level.
-       <structfield>allTheSame</> is true if the current inner tuple is
+       <structfield>allTheSame</structfield> is true if the current inner tuple is
        marked as containing multiple equivalent nodes
-       (see <xref linkend="spgist-all-the-same">).
-       <structfield>hasPrefix</> is true if the current inner tuple contains
+       (see <xref linkend="spgist-all-the-same"/>).
+       <structfield>hasPrefix</structfield> is true if the current inner tuple contains
        a prefix; if so,
-       <structfield>prefixDatum</> is its value.
-       <structfield>nNodes</> is the number of child nodes contained in the
+       <structfield>prefixDatum</structfield> is its value.
+       <structfield>nNodes</structfield> is the number of child nodes contained in the
        inner tuple, and
-       <structfield>nodeLabels</> is an array of their label values, or
+       <structfield>nodeLabels</structfield> is an array of their label values, or
        NULL if there are no labels.
       </para>
 
@@ -412,80 +473,80 @@ typedef struct spgChooseOut
 
       <para>
        If the new value matches one of the existing child nodes,
-       set <structfield>resultType</> to <literal>spgMatchNode</>.
-       Set <structfield>nodeN</> to the index (from zero) of that node in
+       set <structfield>resultType</structfield> to <literal>spgMatchNode</literal>.
+       Set <structfield>nodeN</structfield> to the index (from zero) of that node in
        the node array.
-       Set <structfield>levelAdd</> to the increment in
-       <structfield>level</> caused by descending through that node,
+       Set <structfield>levelAdd</structfield> to the increment in
+       <structfield>level</structfield> caused by descending through that node,
        or leave it as zero if the operator class does not use levels.
-       Set <structfield>restDatum</> to equal <structfield>datum</>
+       Set <structfield>restDatum</structfield> to equal <structfield>leafDatum</structfield>
        if the operator class does not modify datums from one level to the
        next, or otherwise set it to the modified value to be used as
-       <structfield>leafDatum</> at the next level.
+       <structfield>leafDatum</structfield> at the next level.
       </para>
 
       <para>
        If a new child node must be added,
-       set <structfield>resultType</> to <literal>spgAddNode</>.
-       Set <structfield>nodeLabel</> to the label to be used for the new
-       node, and set <structfield>nodeN</> to the index (from zero) at which
+       set <structfield>resultType</structfield> to <literal>spgAddNode</literal>.
+       Set <structfield>nodeLabel</structfield> to the label to be used for the new
+       node, and set <structfield>nodeN</structfield> to the index (from zero) at which
        to insert the node in the node array.
        After the node has been added, the <function>choose</function>
        function will be called again with the modified inner tuple;
-       that call should result in an <literal>spgMatchNode</> result.
+       that call should result in an <literal>spgMatchNode</literal> result.
       </para>
 
       <para>
        If the new value is inconsistent with the tuple prefix,
-       set <structfield>resultType</> to <literal>spgSplitTuple</>.
+       set <structfield>resultType</structfield> to <literal>spgSplitTuple</literal>.
        This action moves all the existing nodes into a new lower-level
        inner tuple, and replaces the existing inner tuple with a tuple
        having a single downlink pointing to the new lower-level inner tuple.
-       Set <structfield>prefixHasPrefix</> to indicate whether the new
+       Set <structfield>prefixHasPrefix</structfield> to indicate whether the new
        upper tuple should have a prefix, and if so set
-       <structfield>prefixPrefixDatum</> to the prefix value.  This new
+       <structfield>prefixPrefixDatum</structfield> to the prefix value.  This new
        prefix value must be sufficiently less restrictive than the original
        to accept the new value to be indexed.
-       Set <structfield>prefixNNodes</> to the number of nodes needed in the
-       new tuple, and set <structfield>prefixNodeLabels</> to a palloc'd array
+       Set <structfield>prefixNNodes</structfield> to the number of nodes needed in the
+       new tuple, and set <structfield>prefixNodeLabels</structfield> to a palloc'd array
        holding their labels, or to NULL if node labels are not required.
        Note that the total size of the new upper tuple must be no more
        than the total size of the tuple it is replacing; this constrains
        the lengths of the new prefix and new labels.
-       Set <structfield>childNodeN</> to the index (from zero) of the node
+       Set <structfield>childNodeN</structfield> to the index (from zero) of the node
        that will downlink to the new lower-level inner tuple.
-       Set <structfield>postfixHasPrefix</> to indicate whether the new
+       Set <structfield>postfixHasPrefix</structfield> to indicate whether the new
        lower-level inner tuple should have a prefix, and if so set
-       <structfield>postfixPrefixDatum</> to the prefix value.  The
+       <structfield>postfixPrefixDatum</structfield> to the prefix value.  The
        combination of these two prefixes and the downlink node's label
        (if any) must have the same meaning as the original prefix, because
        there is no opportunity to alter the node labels that are moved to
        the new lower-level tuple, nor to change any child index entries.
        After the node has been split, the <function>choose</function>
        function will be called again with the replacement inner tuple.
-       That call may return an <literal>spgAddNode</> result, if no suitable
-       node was created by the <literal>spgSplitTuple</> action.  Eventually
-       <function>choose</function> must return <literal>spgMatchNode</> to
+       That call may return an <literal>spgAddNode</literal> result, if no suitable
+       node was created by the <literal>spgSplitTuple</literal> action.  Eventually
+       <function>choose</function> must return <literal>spgMatchNode</literal> to
        allow the insertion to descend to the next level.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>picksplit</></term>
+     <term><function>picksplit</function></term>
      <listitem>
       <para>
        Decides how to create a new inner tuple over a set of leaf tuples.
       </para>
 
       <para>
-        The <acronym>SQL</> declaration of the function must look like this:
+        The <acronym>SQL</acronym> declaration of the function must look like this:
 <programlisting>
 CREATE FUNCTION my_picksplit(internal, internal) RETURNS void ...
 </programlisting>
-      The first argument is a pointer to a <structname>spgPickSplitIn</>
+      The first argument is a pointer to a <structname>spgPickSplitIn</structname>
       C struct, containing input data for the function.
-      The second argument is a pointer to a <structname>spgPickSplitOut</>
+      The second argument is a pointer to a <structname>spgPickSplitOut</structname>
       C struct, which the function must fill with result data.
 <programlisting>
 typedef struct spgPickSplitIn
@@ -508,76 +569,78 @@ typedef struct spgPickSplitOut
 } spgPickSplitOut;
 </programlisting>
 
-       <structfield>nTuples</> is the number of leaf tuples provided.
-       <structfield>datums</> is an array of their datum values.
-       <structfield>level</> is the current level that all the leaf tuples
+       <structfield>nTuples</structfield> is the number of leaf tuples provided.
+       <structfield>datums</structfield> is an array of their datum values of
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield>
+       type.
+       <structfield>level</structfield> is the current level that all the leaf tuples
        share, which will become the level of the new inner tuple.
       </para>
 
       <para>
-       Set <structfield>hasPrefix</> to indicate whether the new inner
+       Set <structfield>hasPrefix</structfield> to indicate whether the new inner
        tuple should have a prefix, and if so set
-       <structfield>prefixDatum</> to the prefix value.
-       Set <structfield>nNodes</> to indicate the number of nodes that
+       <structfield>prefixDatum</structfield> to the prefix value.
+       Set <structfield>nNodes</structfield> to indicate the number of nodes that
        the new inner tuple will contain, and
-       set <structfield>nodeLabels</> to an array of their label values,
+       set <structfield>nodeLabels</structfield> to an array of their label values,
        or to NULL if node labels are not required.
-       Set <structfield>mapTuplesToNodes</> to an array that gives the index
+       Set <structfield>mapTuplesToNodes</structfield> to an array that gives the index
        (from zero) of the node that each leaf tuple should be assigned to.
-       Set <structfield>leafTupleDatums</> to an array of the values to
+       Set <structfield>leafTupleDatums</structfield> to an array of the values to
        be stored in the new leaf tuples (these will be the same as the
-       input <structfield>datums</> if the operator class does not modify
+       input <structfield>datums</structfield> if the operator class does not modify
        datums from one level to the next).
-       Note that the <function>picksplit</> function is
+       Note that the <function>picksplit</function> function is
        responsible for palloc'ing the
-       <structfield>nodeLabels</>, <structfield>mapTuplesToNodes</> and
-       <structfield>leafTupleDatums</> arrays.
+       <structfield>nodeLabels</structfield>, <structfield>mapTuplesToNodes</structfield> and
+       <structfield>leafTupleDatums</structfield> arrays.
       </para>
 
       <para>
        If more than one leaf tuple is supplied, it is expected that the
-       <function>picksplit</> function will classify them into more than
+       <function>picksplit</function> function will classify them into more than
        one node; otherwise it is not possible to split the leaf tuples
        across multiple pages, which is the ultimate purpose of this
-       operation.  Therefore, if the <function>picksplit</> function
+       operation.  Therefore, if the <function>picksplit</function> function
        ends up placing all the leaf tuples in the same node, the core
        SP-GiST code will override that decision and generate an inner
        tuple in which the leaf tuples are assigned at random to several
        identically-labeled nodes.  Such a tuple is marked
-       <literal>allTheSame</> to signify that this has happened.  The
-       <function>choose</> and <function>inner_consistent</> functions
+       <literal>allTheSame</literal> to signify that this has happened.  The
+       <function>choose</function> and <function>inner_consistent</function> functions
        must take suitable care with such inner tuples.
-       See <xref linkend="spgist-all-the-same"> for more information.
+       See <xref linkend="spgist-all-the-same"/> for more information.
       </para>
 
       <para>
-       <function>picksplit</> can be applied to a single leaf tuple only
-       in the case that the <function>config</> function set
-       <structfield>longValuesOK</> to true and a larger-than-a-page input
+       <function>picksplit</function> can be applied to a single leaf tuple only
+       in the case that the <function>config</function> function set
+       <structfield>longValuesOK</structfield> to true and a larger-than-a-page input
        value has been supplied.  In this case the point of the operation is
        to strip off a prefix and produce a new, shorter leaf datum value.
        The call will be repeated until a leaf datum short enough to fit on
-       a page has been produced.  See <xref linkend="spgist-limits"> for
+       a page has been produced.  See <xref linkend="spgist-limits"/> for
        more information.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>inner_consistent</></term>
+     <term><function>inner_consistent</function></term>
      <listitem>
       <para>
        Returns set of nodes (branches) to follow during tree search.
       </para>
 
       <para>
-       The <acronym>SQL</> declaration of the function must look like this:
+       The <acronym>SQL</acronym> declaration of the function must look like this:
 <programlisting>
 CREATE FUNCTION my_inner_consistent(internal, internal) RETURNS void ...
 </programlisting>
-      The first argument is a pointer to a <structname>spgInnerConsistentIn</>
+      The first argument is a pointer to a <structname>spgInnerConsistentIn</structname>
       C struct, containing input data for the function.
-      The second argument is a pointer to a <structname>spgInnerConsistentOut</>
+      The second argument is a pointer to a <structname>spgInnerConsistentOut</structname>
       C struct, which the function must fill with result data.
 
 <programlisting>
@@ -610,90 +673,92 @@ typedef struct spgInnerConsistentOut
 } spgInnerConsistentOut;
 </programlisting>
 
-       The array <structfield>scankeys</>, of length <structfield>nkeys</>,
+       The array <structfield>scankeys</structfield>, of length <structfield>nkeys</structfield>,
        describes the index search condition(s).  These conditions are
        combined with AND &mdash; only index entries that satisfy all of
-       them are interesting.  (Note that <structfield>nkeys</> = 0 implies
+       them are interesting.  (Note that <structfield>nkeys</structfield> = 0 implies
        that all index entries satisfy the query.)  Usually the consistent
-       function only cares about the <structfield>sk_strategy</> and
-       <structfield>sk_argument</> fields of each array entry, which
+       function only cares about the <structfield>sk_strategy</structfield> and
+       <structfield>sk_argument</structfield> fields of each array entry, which
        respectively give the indexable operator and comparison value.
-       In particular it is not necessary to check <structfield>sk_flags</> to
+       In particular it is not necessary to check <structfield>sk_flags</structfield> to
        see if the comparison value is NULL, because the SP-GiST core code
        will filter out such conditions.
-       <structfield>reconstructedValue</> is the value reconstructed for the
-       parent tuple; it is <literal>(Datum) 0</> at the root level or if the
-       <function>inner_consistent</> function did not provide a value at the
-       parent level.
-       <structfield>traversalValue</> is a pointer to any traverse data
-       passed down from the previous call of <function>inner_consistent</>
+       <structfield>reconstructedValue</structfield> is the value reconstructed for the
+       parent tuple; it is <literal>(Datum) 0</literal> at the root level or if the
+       <function>inner_consistent</function> function did not provide a value at the
+       parent level. <structfield>reconstructedValue</structfield> is always of
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield> type.
+       <structfield>traversalValue</structfield> is a pointer to any traverse data
+       passed down from the previous call of <function>inner_consistent</function>
        on the parent index tuple, or NULL at the root level.
-       <structfield>traversalMemoryContext</> is the memory context in which
+       <structfield>traversalMemoryContext</structfield> is the memory context in which
        to store output traverse values (see below).
-       <structfield>level</> is the current inner tuple's level, starting at
+       <structfield>level</structfield> is the current inner tuple's level, starting at
        zero for the root level.
-       <structfield>returnData</> is <literal>true</> if reconstructed data is
+       <structfield>returnData</structfield> is <literal>true</literal> if reconstructed data is
        required for this query; this will only be so if the
-       <function>config</> function asserted <structfield>canReturnData</>.
-       <structfield>allTheSame</> is true if the current inner tuple is
-       marked <quote>all-the-same</>; in this case all the nodes have the
+       <function>config</function> function asserted <structfield>canReturnData</structfield>.
+       <structfield>allTheSame</structfield> is true if the current inner tuple is
+       marked <quote>all-the-same</quote>; in this case all the nodes have the
        same label (if any) and so either all or none of them match the query
-       (see <xref linkend="spgist-all-the-same">).
-       <structfield>hasPrefix</> is true if the current inner tuple contains
+       (see <xref linkend="spgist-all-the-same"/>).
+       <structfield>hasPrefix</structfield> is true if the current inner tuple contains
        a prefix; if so,
-       <structfield>prefixDatum</> is its value.
-       <structfield>nNodes</> is the number of child nodes contained in the
+       <structfield>prefixDatum</structfield> is its value.
+       <structfield>nNodes</structfield> is the number of child nodes contained in the
        inner tuple, and
-       <structfield>nodeLabels</> is an array of their label values, or
+       <structfield>nodeLabels</structfield> is an array of their label values, or
        NULL if the nodes do not have labels.
       </para>
 
       <para>
-       <structfield>nNodes</> must be set to the number of child nodes that
+       <structfield>nNodes</structfield> must be set to the number of child nodes that
        need to be visited by the search, and
-       <structfield>nodeNumbers</> must be set to an array of their indexes.
+       <structfield>nodeNumbers</structfield> must be set to an array of their indexes.
        If the operator class keeps track of levels, set
-       <structfield>levelAdds</> to an array of the level increments
+       <structfield>levelAdds</structfield> to an array of the level increments
        required when descending to each node to be visited.  (Often these
        increments will be the same for all the nodes, but that's not
        necessarily so, so an array is used.)
        If value reconstruction is needed, set
-       <structfield>reconstructedValues</> to an array of the values
+       <structfield>reconstructedValues</structfield> to an array of the values
+       of <structname>spgConfigOut</structname>.<structfield>leafType</structfield> type
        reconstructed for each child node to be visited; otherwise, leave
-       <structfield>reconstructedValues</> as NULL.
+       <structfield>reconstructedValues</structfield> as NULL.
        If it is desired to pass down additional out-of-band information
-       (<quote>traverse values</>) to lower levels of the tree search,
-       set <structfield>traversalValues</> to an array of the appropriate
+       (<quote>traverse values</quote>) to lower levels of the tree search,
+       set <structfield>traversalValues</structfield> to an array of the appropriate
        traverse values, one for each child node to be visited; otherwise,
-       leave <structfield>traversalValues</> as NULL.
-       Note that the <function>inner_consistent</> function is
+       leave <structfield>traversalValues</structfield> as NULL.
+       Note that the <function>inner_consistent</function> function is
        responsible for palloc'ing the
-       <structfield>nodeNumbers</>, <structfield>levelAdds</>,
-       <structfield>reconstructedValues</>, and
-       <structfield>traversalValues</> arrays in the current memory context.
+       <structfield>nodeNumbers</structfield>, <structfield>levelAdds</structfield>,
+       <structfield>reconstructedValues</structfield>, and
+       <structfield>traversalValues</structfield> arrays in the current memory context.
        However, any output traverse values pointed to by
-       the <structfield>traversalValues</> array should be allocated
-       in <structfield>traversalMemoryContext</>.
+       the <structfield>traversalValues</structfield> array should be allocated
+       in <structfield>traversalMemoryContext</structfield>.
        Each traverse value must be a single palloc'd chunk.
       </para>
      </listitem>
     </varlistentry>
 
     <varlistentry>
-     <term><function>leaf_consistent</></term>
+     <term><function>leaf_consistent</function></term>
      <listitem>
       <para>
        Returns true if a leaf tuple satisfies a query.
       </para>
 
       <para>
-       The <acronym>SQL</> declaration of the function must look like this:
+       The <acronym>SQL</acronym> declaration of the function must look like this:
 <programlisting>
 CREATE FUNCTION my_leaf_consistent(internal, internal) RETURNS bool ...
 </programlisting>
-      The first argument is a pointer to a <structname>spgLeafConsistentIn</>
+      The first argument is a pointer to a <structname>spgLeafConsistentIn</structname>
       C struct, containing input data for the function.
-      The second argument is a pointer to a <structname>spgLeafConsistentOut</>
+      The second argument is a pointer to a <structname>spgLeafConsistentOut</structname>
       C struct, which the function must fill with result data.
 <programlisting>
 typedef struct spgLeafConsistentIn
@@ -716,40 +781,43 @@ typedef struct spgLeafConsistentOut
 } spgLeafConsistentOut;
 </programlisting>
 
-       The array <structfield>scankeys</>, of length <structfield>nkeys</>,
+       The array <structfield>scankeys</structfield>, of length <structfield>nkeys</structfield>,
        describes the index search condition(s).  These conditions are
        combined with AND &mdash; only index entries that satisfy all of
-       them satisfy the query.  (Note that <structfield>nkeys</> = 0 implies
+       them satisfy the query.  (Note that <structfield>nkeys</structfield> = 0 implies
        that all index entries satisfy the query.)  Usually the consistent
-       function only cares about the <structfield>sk_strategy</> and
-       <structfield>sk_argument</> fields of each array entry, which
+       function only cares about the <structfield>sk_strategy</structfield> and
+       <structfield>sk_argument</structfield> fields of each array entry, which
        respectively give the indexable operator and comparison value.
-       In particular it is not necessary to check <structfield>sk_flags</> to
+       In particular it is not necessary to check <structfield>sk_flags</structfield> to
        see if the comparison value is NULL, because the SP-GiST core code
        will filter out such conditions.
-       <structfield>reconstructedValue</> is the value reconstructed for the
-       parent tuple; it is <literal>(Datum) 0</> at the root level or if the
-       <function>inner_consistent</> function did not provide a value at the
-       parent level.
-       <structfield>traversalValue</> is a pointer to any traverse data
-       passed down from the previous call of <function>inner_consistent</>
+       <structfield>reconstructedValue</structfield> is the value reconstructed for the
+       parent tuple; it is <literal>(Datum) 0</literal> at the root level or if the
+       <function>inner_consistent</function> function did not provide a value at the
+       parent level. <structfield>reconstructedValue</structfield> is always of
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield> type. 
+       <structfield>traversalValue</structfield> is a pointer to any traverse data
+       passed down from the previous call of <function>inner_consistent</function>
        on the parent index tuple, or NULL at the root level.
-       <structfield>level</> is the current leaf tuple's level, starting at
+       <structfield>level</structfield> is the current leaf tuple's level, starting at
        zero for the root level.
-       <structfield>returnData</> is <literal>true</> if reconstructed data is
+       <structfield>returnData</structfield> is <literal>true</literal> if reconstructed data is
        required for this query; this will only be so if the
-       <function>config</> function asserted <structfield>canReturnData</>.
-       <structfield>leafDatum</> is the key value stored in the current
-       leaf tuple.
+       <function>config</function> function asserted <structfield>canReturnData</structfield>.
+       <structfield>leafDatum</structfield> is the key value of
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield>
+       stored in the current leaf tuple.
       </para>
 
       <para>
-       The function must return <literal>true</> if the leaf tuple matches the
-       query, or <literal>false</> if not.  In the <literal>true</> case,
-       if <structfield>returnData</> is <literal>true</> then
-       <structfield>leafValue</> must be set to the value originally supplied
-       to be indexed for this leaf tuple.  Also,
-       <structfield>recheck</> may be set to <literal>true</> if the match
+       The function must return <literal>true</literal> if the leaf tuple matches the
+       query, or <literal>false</literal> if not.  In the <literal>true</literal> case,
+       if <structfield>returnData</structfield> is <literal>true</literal> then
+       <structfield>leafValue</structfield> must be set to the value of
+       <structname>spgConfigIn</structname>.<structfield>attType</structfield> type
+       originally supplied to be indexed for this leaf tuple.  Also,
+       <structfield>recheck</structfield> may be set to <literal>true</literal> if the match
        is uncertain and so the operator(s) must be re-applied to the actual
        heap tuple to verify the match.
       </para>
@@ -757,20 +825,40 @@ typedef struct spgLeafConsistentOut
     </varlistentry>
    </variablelist>
 
+ <para>
+  The optional user-defined method is:
+ </para>
+
+ <variablelist>
+    <varlistentry>
+     <term><function>Datum compress(Datum in)</function></term>
+     <listitem>
+      <para>
+       Converts the data item into a format suitable for physical storage in 
+       a leaf tuple of index page.  It accepts
+       <structname>spgConfigIn</structname>.<structfield>attType</structfield>
+       value and return
+       <structname>spgConfigOut</structname>.<structfield>leafType</structfield>
+       value.  Output value should not be toasted.
+      </para>
+     </listitem>
+    </varlistentry>
+  </variablelist>
+
   <para>
    All the SP-GiST support methods are normally called in a short-lived
-   memory context; that is, <varname>CurrentMemoryContext</> will be reset
+   memory context; that is, <varname>CurrentMemoryContext</varname> will be reset
    after processing of each tuple.  It is therefore not very important to
-   worry about pfree'ing everything you palloc.  (The <function>config</>
+   worry about pfree'ing everything you palloc.  (The <function>config</function>
    method is an exception: it should try to avoid leaking memory.  But
-   usually the <function>config</> method need do nothing but assign
+   usually the <function>config</function> method need do nothing but assign
    constants into the passed parameter struct.)
   </para>
 
   <para>
    If the indexed column is of a collatable data type, the index collation
    will be passed to all the support methods, using the standard
-   <function>PG_GET_COLLATION()</> mechanism.
+   <function>PG_GET_COLLATION()</function> mechanism.
   </para>
 
 </sect1>
@@ -794,7 +882,7 @@ typedef struct spgLeafConsistentOut
    trees, in which each level of the tree includes a prefix that is short
    enough to fit on a page, and the final leaf level includes a suffix also
    short enough to fit on a page.  The operator class should set
-   <structfield>longValuesOK</> to TRUE only if it is prepared to arrange for
+   <structfield>longValuesOK</structfield> to true only if it is prepared to arrange for
    this to happen.  Otherwise, the <acronym>SP-GiST</acronym> core will
    reject any request to index a value that is too large to fit
    on an index page.
@@ -814,10 +902,10 @@ typedef struct spgLeafConsistentOut
    links that chain such tuples together.)  If the set of leaf tuples
    grows too large for a page, a split is performed and an intermediate
    inner tuple is inserted.  For this to fix the problem, the new inner
-   tuple <emphasis>must</> divide the set of leaf values into more than one
-   node group.  If the operator class's <function>picksplit</> function
+   tuple <emphasis>must</emphasis> divide the set of leaf values into more than one
+   node group.  If the operator class's <function>picksplit</function> function
    fails to do that, the <acronym>SP-GiST</acronym> core resorts to
-   extraordinary measures described in <xref linkend="spgist-all-the-same">.
+   extraordinary measures described in <xref linkend="spgist-all-the-same"/>.
   </para>
  </sect2>
 
@@ -830,58 +918,58 @@ typedef struct spgLeafConsistentOut
    corresponding to the four quadrants around the inner tuple's centroid
    point.  In such a case the code typically works with the nodes by
    number, and there is no need for explicit node labels.  To suppress
-   node labels (and thereby save some space), the <function>picksplit</>
-   function can return NULL for the <structfield>nodeLabels</> array,
-   and likewise the <function>choose</> function can return NULL for
-   the <structfield>prefixNodeLabels</> array during
-   a <literal>spgSplitTuple</> action.
-   This will in turn result in <structfield>nodeLabels</> being NULL during
-   subsequent calls to <function>choose</> and <function>inner_consistent</>.
+   node labels (and thereby save some space), the <function>picksplit</function>
+   function can return NULL for the <structfield>nodeLabels</structfield> array,
+   and likewise the <function>choose</function> function can return NULL for
+   the <structfield>prefixNodeLabels</structfield> array during
+   a <literal>spgSplitTuple</literal> action.
+   This will in turn result in <structfield>nodeLabels</structfield> being NULL during
+   subsequent calls to <function>choose</function> and <function>inner_consistent</function>.
    In principle, node labels could be used for some inner tuples and omitted
    for others in the same index.
   </para>
 
   <para>
    When working with an inner tuple having unlabeled nodes, it is an error
-   for <function>choose</> to return <literal>spgAddNode</>, since the set
+   for <function>choose</function> to return <literal>spgAddNode</literal>, since the set
    of nodes is supposed to be fixed in such cases.
   </para>
  </sect2>
 
  <sect2 id="spgist-all-the-same">
-  <title><quote>All-the-same</> Inner Tuples</title>
+  <title><quote>All-the-same</quote> Inner Tuples</title>
 
   <para>
    The <acronym>SP-GiST</acronym> core can override the results of the
-   operator class's <function>picksplit</> function when
-   <function>picksplit</> fails to divide the supplied leaf values into
+   operator class's <function>picksplit</function> function when
+   <function>picksplit</function> fails to divide the supplied leaf values into
    at least two node categories.  When this happens, the new inner tuple
    is created with multiple nodes that each have the same label (if any)
-   that <function>picksplit</> gave to the one node it did use, and the
+   that <function>picksplit</function> gave to the one node it did use, and the
    leaf values are divided at random among these equivalent nodes.
-   The <literal>allTheSame</> flag is set on the inner tuple to warn the
-   <function>choose</> and <function>inner_consistent</> functions that the
+   The <literal>allTheSame</literal> flag is set on the inner tuple to warn the
+   <function>choose</function> and <function>inner_consistent</function> functions that the
    tuple does not have the node set that they might otherwise expect.
   </para>
 
   <para>
-   When dealing with an <literal>allTheSame</> tuple, a <function>choose</>
-   result of <literal>spgMatchNode</> is interpreted to mean that the new
+   When dealing with an <literal>allTheSame</literal> tuple, a <function>choose</function>
+   result of <literal>spgMatchNode</literal> is interpreted to mean that the new
    value can be assigned to any of the equivalent nodes; the core code will
-   ignore the supplied  <structfield>nodeN</> value and descend into one
+   ignore the supplied  <structfield>nodeN</structfield> value and descend into one
    of the nodes at random (so as to keep the tree balanced).  It is an
-   error for <function>choose</> to return <literal>spgAddNode</>, since
+   error for <function>choose</function> to return <literal>spgAddNode</literal>, since
    that would make the nodes not all equivalent; the
-   <literal>spgSplitTuple</> action must be used if the value to be inserted
+   <literal>spgSplitTuple</literal> action must be used if the value to be inserted
    doesn't match the existing nodes.
   </para>
 
   <para>
-   When dealing with an <literal>allTheSame</> tuple, the
-   <function>inner_consistent</> function should return either all or none
+   When dealing with an <literal>allTheSame</literal> tuple, the
+   <function>inner_consistent</function> function should return either all or none
    of the nodes as targets for continuing the index search, since they are
    all equivalent.  This may or may not require any special-case code,
-   depending on how much the <function>inner_consistent</> function normally
+   depending on how much the <function>inner_consistent</function> function normally
    assumes about the meaning of the nodes.
   </para>
  </sect2>
@@ -894,9 +982,9 @@ typedef struct spgLeafConsistentOut
  <para>
   The <productname>PostgreSQL</productname> source distribution includes
   several examples of index operator classes for <acronym>SP-GiST</acronym>,
-  as described in <xref linkend="spgist-builtin-opclasses-table">.  Look
-  into <filename>src/backend/access/spgist/</>
-  and <filename>src/backend/utils/adt/</> to see the code.
+  as described in <xref linkend="spgist-builtin-opclasses-table"/>.  Look
+  into <filename>src/backend/access/spgist/</filename>
+  and <filename>src/backend/utils/adt/</filename> to see the code.
  </para>
 
 </sect1>
diff --git a/doc/src/sgml/spi.sgml b/doc/src/sgml/spi.sgml
index 86be87c0fd..0bac342322 100644
--- a/doc/src/sgml/spi.sgml
+++ b/doc/src/sgml/spi.sgml
@@ -42,8 +42,7 @@
   have documented error-return conventions.  Those conventions only apply
   for errors detected within the SPI functions themselves, however.)
   It is possible to recover control after an error by establishing your own
-  subtransaction surrounding SPI calls that might fail.  This is not currently
-  documented because the mechanisms required are still in flux.
+  subtransaction surrounding SPI calls that might fail.
  </para>
 
  <para>
@@ -64,6 +63,7 @@
 
  <refentry id="spi-spi-connect">
   <indexterm><primary>SPI_connect</primary></indexterm>
+  <indexterm><primary>SPI_connect_ext</primary></indexterm>
 
   <refmeta>
    <refentrytitle>SPI_connect</refentrytitle>
@@ -72,12 +72,17 @@
 
   <refnamediv>
    <refname>SPI_connect</refname>
+   <refname>SPI_connect_ext</refname>
    <refpurpose>connect a procedure to the SPI manager</refpurpose>
  </refnamediv>
 
  <refsynopsisdiv>
 <synopsis>
 int SPI_connect(void)
+</synopsis>
+
+ <synopsis>
+int SPI_connect_ext(int <parameter>options</parameter>)
 </synopsis>
  </refsynopsisdiv>
 
@@ -90,6 +95,31 @@ int SPI_connect(void)
    function if you want to execute commands through SPI.  Some utility
    SPI functions can be called from unconnected procedures.
   </para>
+
+  <para>
+   <function>SPI_connect_ext</function> does the same but has an argument that
+   allows passing option flags.  Currently, the following option values are
+   available:
+   <variablelist>
+    <varlistentry>
+     <term><symbol>SPI_OPT_NONATOMIC</symbol></term>
+     <listitem>
+      <para>
+       Sets the SPI connection to be <firstterm>nonatomic</firstterm>, which
+       means that transaction control calls <function>SPI_commit</function>,
+       <function>SPI_rollback</function>, and
+       <function>SPI_start_transaction</function> are allowed.  Otherwise,
+       calling these functions will result in an immediate error.
+      </para>
+     </listitem>
+    </varlistentry>
+   </variablelist>
+  </para>
+
+  <para>
+   <literal>SPI_connect()</literal> is equivalent to
+   <literal>SPI_connect_ext(0)</literal>.
+  </para>
  </refsect1>
 
  <refsect1>
@@ -203,7 +233,7 @@ int SPI_execute(const char * <parameter>command</parameter>, bool <parameter>rea
   <para>
    <function>SPI_execute</function> executes the specified SQL command
    for <parameter>count</parameter> rows.  If <parameter>read_only</parameter>
-   is <literal>true</>, the command must be read-only, and execution overhead
+   is <literal>true</literal>, the command must be read-only, and execution overhead
    is somewhat reduced.
   </para>
 
@@ -225,13 +255,13 @@ SPI_execute("SELECT * FROM foo", true, 5);
 <programlisting>
 SPI_execute("INSERT INTO foo SELECT * FROM bar", false, 5);
 </programlisting>
-   inserts all rows from <structname>bar</>, ignoring the
+   inserts all rows from <structname>bar</structname>, ignoring the
    <parameter>count</parameter> parameter.  However, with
 <programlisting>
 SPI_execute("INSERT INTO foo SELECT * FROM bar RETURNING *", false, 5);
 </programlisting>
    at most 5 rows would be inserted, since execution would stop after the
-   fifth <literal>RETURNING</> result row is retrieved.
+   fifth <literal>RETURNING</literal> result row is retrieved.
   </para>
 
   <para>
@@ -244,26 +274,26 @@ SPI_execute("INSERT INTO foo SELECT * FROM bar RETURNING *", false, 5);
   </para>
 
   <para>
-   When <parameter>read_only</parameter> is <literal>false</>,
+   When <parameter>read_only</parameter> is <literal>false</literal>,
    <function>SPI_execute</function> increments the command
-   counter and computes a new <firstterm>snapshot</> before executing each
+   counter and computes a new <firstterm>snapshot</firstterm> before executing each
    command in the string.  The snapshot does not actually change if the
-   current transaction isolation level is <literal>SERIALIZABLE</> or <literal>REPEATABLE READ</>, but in
-   <literal>READ COMMITTED</> mode the snapshot update allows each command to
+   current transaction isolation level is <literal>SERIALIZABLE</literal> or <literal>REPEATABLE READ</literal>, but in
+   <literal>READ COMMITTED</literal> mode the snapshot update allows each command to
    see the results of newly committed transactions from other sessions.
    This is essential for consistent behavior when the commands are modifying
    the database.
   </para>
 
   <para>
-   When <parameter>read_only</parameter> is <literal>true</>,
+   When <parameter>read_only</parameter> is <literal>true</literal>,
    <function>SPI_execute</function> does not update either the snapshot
-   or the command counter, and it allows only plain <command>SELECT</>
+   or the command counter, and it allows only plain <command>SELECT</command>
    commands to appear in the command string.  The commands are executed
    using the snapshot previously established for the surrounding query.
    This execution mode is somewhat faster than the read/write mode due
    to eliminating per-command overhead.  It also allows genuinely
-   <firstterm>stable</> functions to be built: since successive executions
+   <firstterm>stable</firstterm> functions to be built: since successive executions
    will all use the same snapshot, there will be no change in the results.
   </para>
 
@@ -284,11 +314,11 @@ SPI_execute("INSERT INTO foo SELECT * FROM bar RETURNING *", false, 5);
    then you can use the
    global pointer <literal>SPITupleTable *SPI_tuptable</literal> to
    access the result rows.  Some utility commands (such as
-   <command>EXPLAIN</>) also return row sets, and <literal>SPI_tuptable</>
+   <command>EXPLAIN</command>) also return row sets, and <literal>SPI_tuptable</literal>
    will contain the result in these cases too. Some utility commands
-   (<command>COPY</>, <command>CREATE TABLE AS</>) don't return a row set, so
-   <literal>SPI_tuptable</> is NULL, but they still return the number of
-   rows processed in <varname>SPI_processed</>.
+   (<command>COPY</command>, <command>CREATE TABLE AS</command>) don't return a row set, so
+   <literal>SPI_tuptable</literal> is NULL, but they still return the number of
+   rows processed in <varname>SPI_processed</varname>.
   </para>
 
   <para>
@@ -304,17 +334,17 @@ typedef struct
     HeapTuple  *vals;           /* rows */
 } SPITupleTable;
 </programlisting>
-   <structfield>vals</> is an array of pointers to rows.  (The number
+   <structfield>vals</structfield> is an array of pointers to rows.  (The number
    of valid entries is given by <varname>SPI_processed</varname>.)
-   <structfield>tupdesc</> is a row descriptor which you can pass to
-   SPI functions dealing with rows.  <structfield>tuptabcxt</>,
-   <structfield>alloced</>, and <structfield>free</> are internal
+   <structfield>tupdesc</structfield> is a row descriptor which you can pass to
+   SPI functions dealing with rows.  <structfield>tuptabcxt</structfield>,
+   <structfield>alloced</structfield>, and <structfield>free</structfield> are internal
    fields not intended for use by SPI callers.
   </para>
 
   <para>
    <function>SPI_finish</function> frees all
-   <structname>SPITupleTable</>s allocated during the current
+   <structname>SPITupleTable</structname>s allocated during the current
    procedure.  You can free a particular result table earlier, if you
    are done with it, by calling <function>SPI_freetuptable</function>.
   </para>
@@ -336,7 +366,7 @@ typedef struct
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -345,7 +375,7 @@ typedef struct
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -365,7 +395,7 @@ typedef struct
      <listitem>
       <para>
        if a <command>SELECT</command> (but not <command>SELECT
-       INTO</>) was executed
+       INTO</command>) was executed
       </para>
      </listitem>
     </varlistentry>
@@ -473,7 +503,7 @@ typedef struct
      <term><symbol>SPI_ERROR_COPY</symbol></term>
      <listitem>
       <para>
-       if <command>COPY TO stdout</> or <command>COPY FROM stdin</>
+       if <command>COPY TO stdout</command> or <command>COPY FROM stdin</command>
        was attempted
       </para>
      </listitem>
@@ -484,13 +514,13 @@ typedef struct
      <listitem>
       <para>
        if a transaction manipulation command was attempted
-       (<command>BEGIN</>,
-       <command>COMMIT</>,
-       <command>ROLLBACK</>,
-       <command>SAVEPOINT</>,
-       <command>PREPARE TRANSACTION</>,
-       <command>COMMIT PREPARED</>,
-       <command>ROLLBACK PREPARED</>,
+       (<command>BEGIN</command>,
+       <command>COMMIT</command>,
+       <command>ROLLBACK</command>,
+       <command>SAVEPOINT</command>,
+       <command>PREPARE TRANSACTION</command>,
+       <command>COMMIT PREPARED</command>,
+       <command>ROLLBACK PREPARED</command>,
        or any variant thereof)
       </para>
      </listitem>
@@ -560,7 +590,7 @@ int SPI_exec(const char * <parameter>command</parameter>, long <parameter>count<
    <function>SPI_exec</function> is the same as
    <function>SPI_execute</function>, with the latter's
    <parameter>read_only</parameter> parameter always taken as
-   <literal>false</>.
+   <literal>false</literal>.
   </para>
  </refsect1>
 
@@ -582,7 +612,7 @@ int SPI_exec(const char * <parameter>command</parameter>, long <parameter>count<
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -628,7 +658,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
   <para>
    <function>SPI_execute_with_args</function> executes a command that might
    include references to externally supplied parameters.  The command text
-   refers to a parameter as <literal>$<replaceable>n</></literal>, and
+   refers to a parameter as <literal>$<replaceable>n</replaceable></literal>, and
    the call specifies data types and values for each such symbol.
    <parameter>read_only</parameter> and <parameter>count</parameter> have
    the same interpretation as in <function>SPI_execute</function>.
@@ -642,7 +672,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
   </para>
 
   <para>
-   Similar results can be achieved with <function>SPI_prepare</> followed by
+   Similar results can be achieved with <function>SPI_prepare</function> followed by
    <function>SPI_execute_plan</function>; however, when using this function
    the query plan is always customized to the specific parameter values
    provided.
@@ -670,7 +700,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
     <term><literal>int <parameter>nargs</parameter></literal></term>
     <listitem>
      <para>
-      number of input parameters (<literal>$1</>, <literal>$2</>, etc.)
+      number of input parameters (<literal>$1</literal>, <literal>$2</literal>, etc.)
      </para>
     </listitem>
    </varlistentry>
@@ -707,12 +737,12 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_execute_with_args</function> assumes that no parameters
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding parameter
-      value is non-null, or <literal>'n'</> if the corresponding parameter
+      array should be <literal>'&nbsp;'</literal> if the corresponding parameter
+      value is non-null, or <literal>'n'</literal> if the corresponding parameter
       value is null.  (In the latter case, the actual value in the
       corresponding <parameter>values</parameter> entry doesn't matter.)  Note
       that <parameter>nulls</parameter> is not a text string, just an array:
-      it does not need a <literal>'\0'</> terminator.
+      it does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -720,7 +750,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -729,7 +759,7 @@ int SPI_execute_with_args(const char *<parameter>command</parameter>,
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -796,7 +826,7 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
 
   <para>
    A prepared command can be generalized by writing parameters
-   (<literal>$1</>, <literal>$2</>, etc.) in place of what would be
+   (<literal>$1</literal>, <literal>$2</literal>, etc.) in place of what would be
    constants in a normal command.  The actual values of the parameters
    are then specified when <function>SPI_execute_plan</function> is called.
    This allows the prepared command to be used over a wider range of
@@ -829,7 +859,7 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
     <term><literal>int <parameter>nargs</parameter></literal></term>
     <listitem>
      <para>
-      number of input parameters (<literal>$1</>, <literal>$2</>, etc.)
+      number of input parameters (<literal>$1</literal>, <literal>$2</literal>, etc.)
      </para>
     </listitem>
    </varlistentry>
@@ -851,14 +881,14 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
 
   <para>
    <function>SPI_prepare</function> returns a non-null pointer to an
-   <type>SPIPlan</>, which is an opaque struct representing a prepared
+   <type>SPIPlan</type>, which is an opaque struct representing a prepared
    statement.  On error, <symbol>NULL</symbol> will be returned,
    and <varname>SPI_result</varname> will be set to one of the same
    error codes used by <function>SPI_execute</function>, except that
    it is set to <symbol>SPI_ERROR_ARGUMENT</symbol> if
    <parameter>command</parameter> is <symbol>NULL</symbol>, or if
-   <parameter>nargs</> is less than 0, or if <parameter>nargs</> is
-   greater than 0 and <parameter>argtypes</> is <symbol>NULL</symbol>.
+   <parameter>nargs</parameter> is less than 0, or if <parameter>nargs</parameter> is
+   greater than 0 and <parameter>argtypes</parameter> is <symbol>NULL</symbol>.
   </para>
  </refsect1>
 
@@ -875,23 +905,23 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
    build a generic plan, and if that is not too much more expensive than the
    custom plans, it will start using the generic plan instead of re-planning
    each time.  If this default behavior is unsuitable, you can alter it by
-   passing the <literal>CURSOR_OPT_GENERIC_PLAN</> or
-   <literal>CURSOR_OPT_CUSTOM_PLAN</> flag to
+   passing the <literal>CURSOR_OPT_GENERIC_PLAN</literal> or
+   <literal>CURSOR_OPT_CUSTOM_PLAN</literal> flag to
    <function>SPI_prepare_cursor</function>, to force use of generic or custom
    plans respectively.
   </para>
 
   <para>
    Although the main point of a prepared statement is to avoid repeated parse
-   analysis and planning of the statement, <productname>PostgreSQL</> will
+   analysis and planning of the statement, <productname>PostgreSQL</productname> will
    force re-analysis and re-planning of the statement before using it
    whenever database objects used in the statement have undergone
    definitional (DDL) changes since the previous use of the prepared
-   statement.  Also, if the value of <xref linkend="guc-search-path"> changes
+   statement.  Also, if the value of <xref linkend="guc-search-path"/> changes
    from one use to the next, the statement will be re-parsed using the new
-   <varname>search_path</>.  (This latter behavior is new as of
+   <varname>search_path</varname>.  (This latter behavior is new as of
    <productname>PostgreSQL</productname> 9.3.)  See <xref
-   linkend="sql-prepare"> for more information about the behavior of prepared
+   linkend="sql-prepare"/> for more information about the behavior of prepared
    statements.
   </para>
 
@@ -900,14 +930,14 @@ SPIPlanPtr SPI_prepare(const char * <parameter>command</parameter>, int <paramet
   </para>
 
   <para>
-   <type>SPIPlanPtr</> is declared as a pointer to an opaque struct type in
-   <filename>spi.h</>.  It is unwise to try to access its contents
+   <type>SPIPlanPtr</type> is declared as a pointer to an opaque struct type in
+   <filename>spi.h</filename>.  It is unwise to try to access its contents
    directly, as that makes your code much more likely to break in
    future revisions of <productname>PostgreSQL</productname>.
   </para>
 
   <para>
-   The name <type>SPIPlanPtr</> is somewhat historical, since the data
+   The name <type>SPIPlanPtr</type> is somewhat historical, since the data
    structure no longer necessarily contains an execution plan.
   </para>
  </refsect1>
@@ -941,9 +971,9 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
   <para>
    <function>SPI_prepare_cursor</function> is identical to
    <function>SPI_prepare</function>, except that it also allows specification
-   of the planner's <quote>cursor options</> parameter.  This is a bit mask
+   of the planner's <quote>cursor options</quote> parameter.  This is a bit mask
    having the values shown in <filename>nodes/parsenodes.h</filename>
-   for the <structfield>options</> field of <structname>DeclareCursorStmt</>.
+   for the <structfield>options</structfield> field of <structname>DeclareCursorStmt</structname>.
    <function>SPI_prepare</function> always takes the cursor options as zero.
   </para>
  </refsect1>
@@ -965,7 +995,7 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
     <term><literal>int <parameter>nargs</parameter></literal></term>
     <listitem>
      <para>
-      number of input parameters (<literal>$1</>, <literal>$2</>, etc.)
+      number of input parameters (<literal>$1</literal>, <literal>$2</literal>, etc.)
      </para>
     </listitem>
    </varlistentry>
@@ -1004,7 +1034,7 @@ SPIPlanPtr SPI_prepare_cursor(const char * <parameter>command</parameter>, int <
   <title>Notes</title>
 
   <para>
-   Useful bits to set in <parameter>cursorOptions</> include
+   Useful bits to set in <parameter>cursorOptions</parameter> include
    <symbol>CURSOR_OPT_SCROLL</symbol>,
    <symbol>CURSOR_OPT_NO_SCROLL</symbol>,
    <symbol>CURSOR_OPT_FAST_PLAN</symbol>,
@@ -1262,9 +1292,9 @@ bool SPI_is_cursor_plan(SPIPlanPtr <parameter>plan</parameter>)
    as an argument to <function>SPI_cursor_open</function>, or
    <symbol>false</symbol> if that is not the case. The criteria are that the
    <parameter>plan</parameter> represents one single command and that this
-   command returns tuples to the caller; for example, <command>SELECT</>
-   is allowed unless it contains an <literal>INTO</> clause, and
-   <command>UPDATE</> is allowed only if it contains a <literal>RETURNING</>
+   command returns tuples to the caller; for example, <command>SELECT</command>
+   is allowed unless it contains an <literal>INTO</literal> clause, and
+   <command>UPDATE</command> is allowed only if it contains a <literal>RETURNING</literal>
    clause.
   </para>
  </refsect1>
@@ -1368,12 +1398,12 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_execute_plan</function> assumes that no parameters
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding parameter
-      value is non-null, or <literal>'n'</> if the corresponding parameter
+      array should be <literal>'&nbsp;'</literal> if the corresponding parameter
+      value is non-null, or <literal>'n'</literal> if the corresponding parameter
       value is null.  (In the latter case, the actual value in the
       corresponding <parameter>values</parameter> entry doesn't matter.)  Note
       that <parameter>nulls</parameter> is not a text string, just an array:
-      it does not need a <literal>'\0'</> terminator.
+      it does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -1381,7 +1411,7 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1390,7 +1420,7 @@ int SPI_execute_plan(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -1467,10 +1497,10 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
    prepared by <function>SPI_prepare</function>.
    This function is equivalent to <function>SPI_execute_plan</function>
    except that information about the parameter values to be passed to the
-   query is presented differently.  The <literal>ParamListInfo</>
+   query is presented differently.  The <literal>ParamListInfo</literal>
    representation can be convenient for passing down values that are
    already available in that format.  It also supports use of dynamic
-   parameter sets via hook functions specified in <literal>ParamListInfo</>.
+   parameter sets via hook functions specified in <literal>ParamListInfo</literal>.
   </para>
  </refsect1>
 
@@ -1499,7 +1529,7 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1508,7 +1538,7 @@ int SPI_execute_plan_with_paramlist(SPIPlanPtr <parameter>plan</parameter>,
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -1558,7 +1588,7 @@ int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values<
    <function>SPI_execp</function> is the same as
    <function>SPI_execute_plan</function>, with the latter's
    <parameter>read_only</parameter> parameter always taken as
-   <literal>false</>.
+   <literal>false</literal>.
   </para>
  </refsect1>
 
@@ -1597,12 +1627,12 @@ int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values<
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_execp</function> assumes that no parameters
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding parameter
-      value is non-null, or <literal>'n'</> if the corresponding parameter
+      array should be <literal>'&nbsp;'</literal> if the corresponding parameter
+      value is non-null, or <literal>'n'</literal> if the corresponding parameter
       value is null.  (In the latter case, the actual value in the
       corresponding <parameter>values</parameter> entry doesn't matter.)  Note
       that <parameter>nulls</parameter> is not a text string, just an array:
-      it does not need a <literal>'\0'</> terminator.
+      it does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -1612,7 +1642,7 @@ int SPI_execp(SPIPlanPtr <parameter>plan</parameter>, Datum * <parameter>values<
     <listitem>
      <para>
       maximum number of rows to return,
-      or <literal>0</> for no limit
+      or <literal>0</literal> for no limit
      </para>
     </listitem>
    </varlistentry>
@@ -1729,12 +1759,12 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_cursor_open</function> assumes that no parameters
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding parameter
-      value is non-null, or <literal>'n'</> if the corresponding parameter
+      array should be <literal>'&nbsp;'</literal> if the corresponding parameter
+      value is non-null, or <literal>'n'</literal> if the corresponding parameter
       value is null.  (In the latter case, the actual value in the
       corresponding <parameter>values</parameter> entry doesn't matter.)  Note
       that <parameter>nulls</parameter> is not a text string, just an array:
-      it does not need a <literal>'\0'</> terminator.
+      it does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -1742,7 +1772,7 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -1753,7 +1783,7 @@ Portal SPI_cursor_open(const char * <parameter>name</parameter>, SPIPlanPtr <par
 
   <para>
    Pointer to portal containing the cursor.  Note there is no error
-   return convention; any error will be reported via <function>elog</>.
+   return convention; any error will be reported via <function>elog</function>.
   </para>
  </refsect1>
 </refentry>
@@ -1836,7 +1866,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
     <term><literal>int <parameter>nargs</parameter></literal></term>
     <listitem>
      <para>
-      number of input parameters (<literal>$1</>, <literal>$2</>, etc.)
+      number of input parameters (<literal>$1</literal>, <literal>$2</literal>, etc.)
      </para>
     </listitem>
    </varlistentry>
@@ -1873,12 +1903,12 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_cursor_open_with_args</function> assumes that no parameters
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding parameter
-      value is non-null, or <literal>'n'</> if the corresponding parameter
+      array should be <literal>'&nbsp;'</literal> if the corresponding parameter
+      value is non-null, or <literal>'n'</literal> if the corresponding parameter
       value is null.  (In the latter case, the actual value in the
       corresponding <parameter>values</parameter> entry doesn't matter.)  Note
       that <parameter>nulls</parameter> is not a text string, just an array:
-      it does not need a <literal>'\0'</> terminator.
+      it does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -1886,7 +1916,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
 
@@ -1906,7 +1936,7 @@ Portal SPI_cursor_open_with_args(const char *<parameter>name</parameter>,
 
   <para>
    Pointer to portal containing the cursor.  Note there is no error
-   return convention; any error will be reported via <function>elog</>.
+   return convention; any error will be reported via <function>elog</function>.
   </para>
  </refsect1>
 </refentry>
@@ -1944,10 +1974,10 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
    <function>SPI_prepare</function>.
    This function is equivalent to <function>SPI_cursor_open</function>
    except that information about the parameter values to be passed to the
-   query is presented differently.  The <literal>ParamListInfo</>
+   query is presented differently.  The <literal>ParamListInfo</literal>
    representation can be convenient for passing down values that are
    already available in that format.  It also supports use of dynamic
-   parameter sets via hook functions specified in <literal>ParamListInfo</>.
+   parameter sets via hook functions specified in <literal>ParamListInfo</literal>.
   </para>
 
   <para>
@@ -1991,7 +2021,7 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
    <varlistentry>
     <term><literal>bool <parameter>read_only</parameter></literal></term>
     <listitem>
-     <para><literal>true</> for read-only execution</para>
+     <para><literal>true</literal> for read-only execution</para>
     </listitem>
    </varlistentry>
   </variablelist>
@@ -2002,7 +2032,7 @@ Portal SPI_cursor_open_with_paramlist(const char *<parameter>name</parameter>,
 
   <para>
    Pointer to portal containing the cursor.  Note there is no error
-   return convention; any error will be reported via <function>elog</>.
+   return convention; any error will be reported via <function>elog</function>.
   </para>
  </refsect1>
 </refentry>
@@ -2090,7 +2120,7 @@ void SPI_cursor_fetch(Portal <parameter>portal</parameter>, bool <parameter>forw
   <para>
    <function>SPI_cursor_fetch</function> fetches some rows from a
    cursor.  This is equivalent to a subset of the SQL command
-   <command>FETCH</> (see <function>SPI_scroll_cursor_fetch</function>
+   <command>FETCH</command> (see <function>SPI_scroll_cursor_fetch</function>
    for more functionality).
   </para>
  </refsect1>
@@ -2175,7 +2205,7 @@ void SPI_cursor_move(Portal <parameter>portal</parameter>, bool <parameter>forwa
   <para>
    <function>SPI_cursor_move</function> skips over some number of rows
    in a cursor.  This is equivalent to a subset of the SQL command
-   <command>MOVE</> (see <function>SPI_scroll_cursor_move</function>
+   <command>MOVE</command> (see <function>SPI_scroll_cursor_move</function>
    for more functionality).
   </para>
  </refsect1>
@@ -2250,7 +2280,7 @@ void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirectio
 
   <para>
    <function>SPI_scroll_cursor_fetch</function> fetches some rows from a
-   cursor.  This is equivalent to the SQL command <command>FETCH</>.
+   cursor.  This is equivalent to the SQL command <command>FETCH</command>.
   </para>
  </refsect1>
 
@@ -2308,7 +2338,7 @@ void SPI_scroll_cursor_fetch(Portal <parameter>portal</parameter>, FetchDirectio
   <title>Notes</title>
 
   <para>
-   See the SQL <xref linkend="sql-fetch"> command
+   See the SQL <xref linkend="sql-fetch"/> command
    for details of the interpretation of the
    <parameter>direction</parameter> and
    <parameter>count</parameter> parameters.
@@ -2350,7 +2380,7 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
   <para>
    <function>SPI_scroll_cursor_move</function> skips over some number of rows
    in a cursor.  This is equivalent to the SQL command
-   <command>MOVE</>.
+   <command>MOVE</command>.
   </para>
  </refsect1>
 
@@ -2400,7 +2430,7 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
   <para>
    <varname>SPI_processed</varname> is set as in
    <function>SPI_execute</function> if successful.
-   <varname>SPI_tuptable</varname> is set to <symbol>NULL</>, since
+   <varname>SPI_tuptable</varname> is set to <symbol>NULL</symbol>, since
    no rows are returned by this function.
   </para>
  </refsect1>
@@ -2409,7 +2439,7 @@ void SPI_scroll_cursor_move(Portal <parameter>portal</parameter>, FetchDirection
   <title>Notes</title>
 
   <para>
-   See the SQL <xref linkend="sql-fetch"> command
+   See the SQL <xref linkend="sql-fetch"/> command
    for details of the interpretation of the
    <parameter>direction</parameter> and
    <parameter>count</parameter> parameters.
@@ -2628,7 +2658,7 @@ SPIPlanPtr SPI_saveplan(SPIPlanPtr <parameter>plan</parameter>)
   <para>
    The originally passed-in statement is not freed, so you might wish to do
    <function>SPI_freeplan</function> on it to avoid leaking memory
-   until <function>SPI_finish</>.
+   until <function>SPI_finish</function>.
   </para>
 
   <para>
@@ -2975,7 +3005,7 @@ int SPI_register_trigger_data(TriggerData *<parameter>tdata</parameter>)
 
  <para>
   The functions described here provide an interface for extracting
-  information from result sets returned by <function>SPI_execute</> and
+  information from result sets returned by <function>SPI_execute</function> and
   other SPI functions.
  </para>
 
@@ -3082,7 +3112,7 @@ int SPI_fnumber(TupleDesc <parameter>rowdesc</parameter>, const char * <paramete
 
   <para>
    If <parameter>colname</parameter> refers to a system column (e.g.,
-   <literal>oid</>) then the appropriate negative column number will
+   <literal>oid</literal>) then the appropriate negative column number will
    be returned.  The caller should be careful to test the return value
    for exact equality to <symbol>SPI_ERROR_NOATTRIBUTE</symbol> to
    detect an error; testing the result for less than or equal to 0 is
@@ -3546,6 +3576,59 @@ char * SPI_getnspname(Relation <parameter>rel</parameter>)
  </refsect1>
 </refentry>
 
+<refentry id="spi-spi-result-code-string">
+ <indexterm><primary>SPI_result_code_string</primary></indexterm>
+
+ <refmeta>
+  <refentrytitle>SPI_result_code_string</refentrytitle>
+  <manvolnum>3</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SPI_result_code_string</refname>
+  <refpurpose>return error code as string</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+const char * SPI_result_code_string(int <parameter>code</parameter>);
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <function>SPI_result_code_string</function> returns a string representation
+   of the result code returned by various SPI functions or stored
+   in <varname>SPI_result</varname>.
+  </para>
+ </refsect1>
+
+ <refsect1>
+  <title>Arguments</title>
+
+  <variablelist>
+   <varlistentry>
+    <term><literal>int <parameter>code</parameter></literal></term>
+    <listitem>
+     <para>
+      result code
+     </para>
+    </listitem>
+   </varlistentry>
+  </variablelist>
+ </refsect1>
+
+ <refsect1>
+  <title>Return Value</title>
+
+  <para>
+   A string representation of the result code.
+  </para>
+ </refsect1>
+</refentry>
+
  </sect1>
 
  <sect1 id="spi-memory">
@@ -3564,7 +3647,7 @@ char * SPI_getnspname(Relation <parameter>rel</parameter>)
    to keep track of individual objects to avoid memory leaks; instead
    only a relatively small number of contexts have to be managed.
    <function>palloc</function> and related functions allocate memory
-   from the <quote>current</> context.
+   from the <quote>current</quote> context.
   </para>
 
   <para>
@@ -3890,7 +3973,7 @@ HeapTupleHeader SPI_returntuple(HeapTuple <parameter>row</parameter>, TupleDesc
   <para>
    Note that this should be used for functions that are declared to return
    composite types.  It is not used for triggers; use
-   <function>SPI_copytuple</> for returning a modified row in a trigger.
+   <function>SPI_copytuple</function> for returning a modified row in a trigger.
   </para>
  </refsect1>
 
@@ -4034,12 +4117,12 @@ HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parame
       If <parameter>nulls</parameter> is <symbol>NULL</symbol> then
       <function>SPI_modifytuple</function> assumes that no new values
       are null.  Otherwise, each entry of the <parameter>nulls</parameter>
-      array should be <literal>'&nbsp;'</> if the corresponding new value is
-      non-null, or <literal>'n'</> if the corresponding new value is
+      array should be <literal>'&nbsp;'</literal> if the corresponding new value is
+      non-null, or <literal>'n'</literal> if the corresponding new value is
       null.  (In the latter case, the actual value in the corresponding
       <parameter>values</parameter> entry doesn't matter.)  Note that
       <parameter>nulls</parameter> is not a text string, just an array: it
-      does not need a <literal>'\0'</> terminator.
+      does not need a <literal>'\0'</literal> terminator.
      </para>
     </listitem>
    </varlistentry>
@@ -4062,10 +4145,10 @@ HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parame
      <term><symbol>SPI_ERROR_ARGUMENT</symbol></term>
      <listitem>
       <para>
-       if <parameter>rel</> is <symbol>NULL</>, or if
-       <parameter>row</> is <symbol>NULL</>, or if <parameter>ncols</>
-       is less than or equal to 0, or if <parameter>colnum</> is
-       <symbol>NULL</>, or if <parameter>values</> is <symbol>NULL</>.
+       if <parameter>rel</parameter> is <symbol>NULL</symbol>, or if
+       <parameter>row</parameter> is <symbol>NULL</symbol>, or if <parameter>ncols</parameter>
+       is less than or equal to 0, or if <parameter>colnum</parameter> is
+       <symbol>NULL</symbol>, or if <parameter>values</parameter> is <symbol>NULL</symbol>.
       </para>
      </listitem>
     </varlistentry>
@@ -4074,9 +4157,9 @@ HeapTuple SPI_modifytuple(Relation <parameter>rel</parameter>, HeapTuple <parame
      <term><symbol>SPI_ERROR_NOATTRIBUTE</symbol></term>
      <listitem>
       <para>
-       if <parameter>colnum</> contains an invalid column number (less
+       if <parameter>colnum</parameter> contains an invalid column number (less
        than or equal to 0 or greater than the number of columns in
-       <parameter>row</>)
+       <parameter>row</parameter>)
       </para>
      </listitem>
     </varlistentry>
@@ -4158,7 +4241,7 @@ void SPI_freetuple(HeapTuple <parameter>row</parameter>)
 
  <refnamediv>
   <refname>SPI_freetuptable</refname>
-  <refpurpose>free a row set created by <function>SPI_execute</> or a similar
+  <refpurpose>free a row set created by <function>SPI_execute</function> or a similar
   function</refpurpose>
  </refnamediv>
 
@@ -4174,7 +4257,7 @@ void SPI_freetuptable(SPITupleTable * <parameter>tuptable</parameter>)
   <para>
    <function>SPI_freetuptable</function> frees a row set created by a
    prior SPI command execution function, such as
-   <function>SPI_execute</>.  Therefore, this function is often called
+   <function>SPI_execute</function>.  Therefore, this function is often called
    with the global variable <varname>SPI_tuptable</varname> as
    argument.
   </para>
@@ -4183,14 +4266,14 @@ void SPI_freetuptable(SPITupleTable * <parameter>tuptable</parameter>)
    This function is useful if a SPI procedure needs to execute
    multiple commands and does not want to keep the results of earlier
    commands around until it ends.  Note that any unfreed row sets will
-   be freed anyway at <function>SPI_finish</>.
+   be freed anyway at <function>SPI_finish</function>.
    Also, if a subtransaction is started and then aborted within execution
    of a SPI procedure, SPI automatically frees any row sets created while
    the subtransaction was running.
   </para>
 
   <para>
-   Beginning in <productname>PostgreSQL</> 9.3,
+   Beginning in <productname>PostgreSQL</productname> 9.3,
    <function>SPI_freetuptable</function> contains guard logic to protect
    against duplicate deletion requests for the same row set.  In previous
    releases, duplicate deletions would lead to crashes.
@@ -4272,6 +4355,152 @@ int SPI_freeplan(SPIPlanPtr <parameter>plan</parameter>)
 
  </sect1>
 
+ <sect1 id="spi-transaction">
+  <title>Transaction Management</title>
+
+  <para>
+   It is not possible to run transaction control commands such
+   as <command>COMMIT</command> and <command>ROLLBACK</command> through SPI
+   functions such as <function>SPI_execute</function>.  There are, however,
+   separate interface functions that allow transaction control through SPI.
+  </para>
+
+  <para>
+   It is not generally safe and sensible to start and end transactions in
+   arbitrary user-defined SQL-callable functions without taking into account
+   the context in which they are called.  For example, a transaction boundary
+   in the middle of a function that is part of a complex SQL expression that
+   is part of some SQL command will probably result in obscure internal errors
+   or crashes.  The interface functions presented here are primarily intended
+   to be used by procedural language implementations to support transaction
+   management in procedures that are invoked by the <command>CALL</command>
+   command, taking the context of the <command>CALL</command> invocation into
+   account.  SPI procedures implemented in C can implement the same logic, but
+   the details of that are beyond the scope of this documentation.
+  </para>
+
+<!-- *********************************************** -->
+
+<refentry id="spi-spi-commit">
+ <indexterm><primary>SPI_commit</primary></indexterm>
+
+ <refmeta>
+  <refentrytitle>SPI_commit</refentrytitle>
+  <manvolnum>3</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SPI_commit</refname>
+  <refpurpose>commit the current transaction</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+void SPI_commit(void)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <function>SPI_commit</function> commits the current transaction.  It is
+   approximately equivalent to running the SQL
+   command <command>COMMIT</command>.  After a transaction is committed, a new
+   transaction has to be started
+   using <function>SPI_start_transaction</function> before further database
+   actions can be executed.
+  </para>
+
+  <para>
+   This function can only be executed if the SPI connection has been set as
+   nonatomic in the call to <function>SPI_connect_ext</function>.
+  </para>
+ </refsect1>
+</refentry>
+
+<!-- *********************************************** -->
+
+<refentry id="spi-spi-rollback">
+ <indexterm><primary>SPI_rollback</primary></indexterm>
+
+ <refmeta>
+  <refentrytitle>SPI_rollback</refentrytitle>
+  <manvolnum>3</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SPI_rollback</refname>
+  <refpurpose>abort the current transaction</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+void SPI_rollback(void)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <function>SPI_rollback</function> rolls back the current transaction.  It
+   is approximately equivalent to running the SQL
+   command <command>ROLLBACK</command>.  After a transaction is rolled back, a
+   new transaction has to be started
+   using <function>SPI_start_transaction</function> before further database
+   actions can be executed.
+  </para>
+
+  <para>
+   This function can only be executed if the SPI connection has been set as
+   nonatomic in the call to <function>SPI_connect_ext</function>.
+  </para>
+ </refsect1>
+</refentry>
+
+<!-- *********************************************** -->
+
+<refentry id="spi-spi-start-transaction">
+ <indexterm><primary>SPI_start_transaction</primary></indexterm>
+
+ <refmeta>
+  <refentrytitle>SPI_start_transaction</refentrytitle>
+  <manvolnum>3</manvolnum>
+ </refmeta>
+
+ <refnamediv>
+  <refname>SPI_start_transaction</refname>
+  <refpurpose>start a new transaction</refpurpose>
+ </refnamediv>
+
+ <refsynopsisdiv>
+<synopsis>
+void SPI_start_transaction(void)
+</synopsis>
+ </refsynopsisdiv>
+
+ <refsect1>
+  <title>Description</title>
+
+  <para>
+   <function>SPI_start_transaction</function> starts a new transaction.  It
+   can only be called after <function>SPI_commit</function>
+   or <function>SPI_rollback</function>, as there is no transaction active at
+   that point.  Normally, when an SPI procedure is called, there is already a
+   transaction active, so attempting to start another one before closing out
+   the current one will result in an error.
+  </para>
+
+  <para>
+   This function can only be executed if the SPI connection has been set as
+   nonatomic in the call to <function>SPI_connect_ext</function>.
+  </para>
+ </refsect1>
+</refentry>
+
+ </sect1>
+
  <sect1 id="spi-visibility">
   <title>Visibility of Data Changes</title>
 
@@ -4317,8 +4546,8 @@ INSERT INTO a SELECT * FROM a;
      <para>
       All standard procedural languages set the SPI read-write mode
       depending on the volatility attribute of the function.  Commands of
-      <literal>STABLE</> and <literal>IMMUTABLE</> functions are done in
-      read-only mode, while commands of <literal>VOLATILE</> functions are
+      <literal>STABLE</literal> and <literal>IMMUTABLE</literal> functions are done in
+      read-only mode, while commands of <literal>VOLATILE</literal> functions are
       done in read-write mode.  While authors of C functions are able to
       violate this convention, it's unlikely to be a good idea to do so.
      </para>
@@ -4343,7 +4572,7 @@ INSERT INTO a SELECT * FROM a;
    that were processed by the command.  You can find more complex
    examples for SPI in the source tree in
    <filename>src/test/regress/regress.c</filename> and in the
-   <xref linkend="contrib-spi"> module.
+   <xref linkend="contrib-spi"/> module.
   </para>
 
 <programlisting>
@@ -4352,9 +4581,7 @@ INSERT INTO a SELECT * FROM a;
 #include "executor/spi.h"
 #include "utils/builtins.h"
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 
 int64 execq(text *sql, int cnt);
 
@@ -4399,7 +4626,7 @@ execq(text *sql, int cnt)
     SPI_finish();
     pfree(command);
 
-    return (proc);
+    return proc;
 }
 </programlisting>
 
@@ -4411,7 +4638,7 @@ execq(text *sql, int cnt)
 
   <para>
    This is how you declare the function after having compiled it into
-   a shared library (details are in <xref linkend="dfunc">.):
+   a shared library (details are in <xref linkend="dfunc"/>.):
 
 <programlisting>
 CREATE FUNCTION execq(text, integer) RETURNS int8
diff --git a/doc/src/sgml/sslinfo.sgml b/doc/src/sgml/sslinfo.sgml
index 7bda33efa3..cda09aaafd 100644
--- a/doc/src/sgml/sslinfo.sgml
+++ b/doc/src/sgml/sslinfo.sgml
@@ -8,15 +8,15 @@
  </indexterm>
 
  <para>
-  The <filename>sslinfo</> module provides information about the SSL
+  The <filename>sslinfo</filename> module provides information about the SSL
   certificate that the current client provided when connecting to
-  <productname>PostgreSQL</>.  The module is useless (most functions
+  <productname>PostgreSQL</productname>.  The module is useless (most functions
   will return NULL) if the current connection does not use SSL.
  </para>
 
  <para>
   This extension won't build at all unless the installation was
-  configured with <literal>--with-openssl</>.
+  configured with <literal>--with-openssl</literal>.
  </para>
 
  <sect2>
@@ -32,7 +32,7 @@
     </term>
     <listitem>
     <para>
-     Returns TRUE if current connection to server uses SSL, and FALSE
+     Returns true if current connection to server uses SSL, and false
      otherwise.
     </para>
     </listitem>
@@ -77,8 +77,8 @@
     </term>
     <listitem>
     <para>
-     Returns TRUE if current client has presented a valid SSL client
-     certificate to the server, and FALSE otherwise.  (The server
+     Returns true if current client has presented a valid SSL client
+     certificate to the server, and false otherwise.  (The server
      might or might not be configured to require a client certificate.)
     </para>
     </listitem>
@@ -126,7 +126,7 @@
     </para>
 
     <para>
-     The result looks like <literal>/CN=Somebody /C=Some country/O=Some organization</>.
+     The result looks like <literal>/CN=Somebody /C=Some country/O=Some organization</literal>.
     </para>
     </listitem>
    </varlistentry>
@@ -142,7 +142,7 @@
     <para>
      Returns the full issuer name of the current client certificate, converting
      character data into the current database encoding.  Encoding conversions
-     are handled the same as for <function>ssl_client_dn</>.
+     are handled the same as for <function>ssl_client_dn</function>.
     </para>
     <para>
      The combination of the return value of this function with the
@@ -150,7 +150,7 @@
     </para>
     <para>
      This function is really useful only if you have more than one trusted CA
-     certificate in your server's <filename>root.crt</> file, or if this CA
+     certificate in your server's certificate authority file, or if this CA
      has issued some intermediate certificate authority certificates.
     </para>
     </listitem>
@@ -195,7 +195,7 @@ role
 emailAddress
 </literallayout>
     <para>
-     All of these fields are optional, except <structfield>commonName</>.
+     All of these fields are optional, except <structfield>commonName</structfield>.
      It depends
      entirely on your CA's policy which of them would be included and which
      wouldn't.  The meaning of these fields, however, is strictly defined by
@@ -214,7 +214,7 @@ emailAddress
     </term>
     <listitem>
     <para>
-     Same as <function>ssl_client_dn_field</>, but for the certificate issuer
+     Same as <function>ssl_client_dn_field</function>, but for the certificate issuer
      rather than the certificate subject.
     </para>
     </listitem>
diff --git a/doc/src/sgml/standalone-install.sgml b/doc/src/sgml/standalone-install.sgml
deleted file mode 100644
index 1942f9dc4c..0000000000
--- a/doc/src/sgml/standalone-install.sgml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!-- doc/src/sgml/standalone-install.sgml -->
-
-<!--
-This file helps in generating the INSTALL text file that lives in the
-top level directory of the distribution.
--->
-
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook V4.2//EN" [
-
-<!ENTITY % version SYSTEM "version.sgml">
-%version;
-
-<!--
-The standalone version has some portions that are different from the
-version that is integrated into the full documentation set, in
-particular as regards links. The following are essentially SGML's
-equivalent of C's #ifdef and friends. The other end of this is in
-installation.sgml.
--->
-
- <!ENTITY % standalone-ignore  "IGNORE">
- <!ENTITY % standalone-include "INCLUDE">
-
-<!--
-When you're building the full documentation set, you want to flip the
-IGNORE and INCLUDE.
--->
-]>
diff --git a/doc/src/sgml/standalone-install.xml b/doc/src/sgml/standalone-install.xml
new file mode 100644
index 0000000000..62582effed
--- /dev/null
+++ b/doc/src/sgml/standalone-install.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!--
+This file contains the stand-alone installation instructions that end up in
+the INSTALL file.  This document stitches together parts of the installation
+instructions in the main documentation with some material that only appears
+in the stand-alone version.
+-->
+<article id="installation">
+ <title><productname>PostgreSQL</productname> Installation from Source Code</title>
+
+ <para>
+  This document describes the installation of
+  <productname>PostgreSQL</productname> using this source code distribution.
+ </para>
+
+ <xi:include href="postgres.sgml" xpointer="install-short" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="postgres.sgml" xpointer="install-requirements" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="postgres.sgml" xpointer="install-procedure" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="postgres.sgml" xpointer="install-post" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+
+ <sect1 id="install-getting-started">
+  <title>Getting Started</title>
+
+  <para>
+   The following is a quick summary of how to get <productname>PostgreSQL</productname> up and
+   running once installed. The main documentation contains more information.
+  </para>
+
+  <procedure>
+   <step>
+    <para>
+     Create a user account for the <productname>PostgreSQL</productname>
+     server. This is the user the server will run as. For production
+     use you should create a separate, unprivileged account
+     (<quote>postgres</quote> is commonly used). If you do not have root
+     access or just want to play around, your own user account is
+     enough, but running the server as root is a security risk and
+     will not work.
+<screen><userinput>adduser postgres</userinput></screen>
+    </para>
+   </step>
+
+   <step>
+    <para>
+     Create a database installation with the <command>initdb</command>
+     command. To run <command>initdb</command> you must be logged in to your
+     <productname>PostgreSQL</productname> server account. It will not work as
+     root.
+<screen>root# <userinput>mkdir /usr/local/pgsql/data</userinput>
+root# <userinput>chown postgres /usr/local/pgsql/data</userinput>
+root# <userinput>su - postgres</userinput>
+postgres$ <userinput>/usr/local/pgsql/bin/initdb -D /usr/local/pgsql/data</userinput></screen>
+    </para>
+
+    <para>
+     The <option>-D</option> option specifies the location where the data
+     will be stored. You can use any path you want, it does not have
+     to be under the installation directory. Just make sure that the
+     server account can write to the directory (or create it, if it
+     doesn't already exist) before starting <command>initdb</command>, as
+     illustrated here.
+    </para>
+   </step>
+
+   <step>
+    <para>
+     At this point, if you did not use the <command>initdb</command> <literal>-A</literal>
+     option, you might want to modify <filename>pg_hba.conf</filename> to control
+     local access to the server before you start it.  The default is to
+     trust all local users.
+    </para>
+   </step>
+
+   <step>
+    <para>
+     The previous <command>initdb</command> step should have told you how to
+     start up the database server. Do so now. The command should look
+     something like:
+<programlisting>/usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data</programlisting>
+     This will start the server in the foreground. To put the server
+     in the background use something like:
+<programlisting>nohup /usr/local/pgsql/bin/postgres -D /usr/local/pgsql/data \
+    &lt;/dev/null &gt;&gt;server.log 2&gt;&amp;1 &lt;/dev/null &amp;</programlisting>
+    </para>
+
+    <para>
+     To stop a server running in the background you can type:
+<programlisting>kill `cat /usr/local/pgsql/data/postmaster.pid`</programlisting>
+    </para>
+   </step>
+
+   <step>
+    <para>
+     Create a database:
+<screen><userinput>createdb testdb</userinput></screen>
+     Then enter:
+<screen><userinput>psql testdb</userinput></screen>
+     to connect to that database. At the prompt you can enter SQL
+     commands and start experimenting.
+    </para>
+   </step>
+  </procedure>
+ </sect1>
+
+ <sect1 id="install-whatnow">
+  <title>What Now?</title>
+
+  <para>
+   <itemizedlist>
+    <listitem>
+     <para>
+      The <productname>PostgreSQL</productname> distribution contains a
+      comprehensive documentation set, which you should read sometime.
+      After installation, the documentation can be accessed by
+      pointing your browser to
+      <filename>/usr/local/pgsql/doc/html/index.html</filename>, unless you
+      changed the installation directories.
+     </para>
+
+     <para>
+      The first few chapters of the main documentation are the Tutorial,
+      which should be your first reading if you are completely new to
+      <acronym>SQL</acronym> databases.  If you are familiar with database
+      concepts then you want to proceed with part on server
+      administration, which contains information about how to set up
+      the database server, database users, and authentication.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Usually, you will want to modify your computer so that it will
+      automatically start the database server whenever it boots. Some
+      suggestions for this are in the documentation.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      Run the regression tests against the installed server (using
+      <command>make installcheck</command>). If you didn't run the
+      tests before installation, you should definitely do it now. This
+      is also explained in the documentation.
+     </para>
+    </listitem>
+
+    <listitem>
+     <para>
+      By default, <productname>PostgreSQL</productname> is configured to run on
+      minimal hardware.  This allows it to start up with almost any
+      hardware configuration. The default configuration is, however,
+      not designed for optimum performance. To achieve optimum
+      performance, several server parameters must be adjusted, the two
+      most common being <varname>shared_buffers</varname> and
+      <varname>work_mem</varname>.
+      Other parameters mentioned in the documentation also affect
+      performance.
+     </para>
+    </listitem>
+   </itemizedlist>
+  </para>
+ </sect1>
+
+ <xi:include href="postgres.sgml" xpointer="supported-platforms" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+ <xi:include href="postgres.sgml" xpointer="installation-platform-notes" xmlns:xi="http://www.w3.org/2001/XInclude"/>
+</article>
diff --git a/doc/src/sgml/standalone-profile.xsl b/doc/src/sgml/standalone-profile.xsl
new file mode 100644
index 0000000000..ff464c1654
--- /dev/null
+++ b/doc/src/sgml/standalone-profile.xsl
@@ -0,0 +1,81 @@
+<?xml version='1.0'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+                version="1.0">
+
+<!--
+This is a preprocessing layer to convert the installation instructions into a
+variant without links and references to the main documentation.
+
+- To omit something in the stand-alone INSTALL file, give the element a
+  condition="standalone-ignore" attribute.
+
+- If there is no element that exactly covers what you want to change, wrap it
+  in a <phrase> element, which otherwise does nothing.
+
+- Otherwise, write a custom rule below.
+-->
+
+<xsl:output
+    doctype-public="-//OASIS//DTD DocBook XML V4.2//EN"
+    doctype-system="http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd"/>
+
+<!-- copy everything by default -->
+
+<xsl:template match="@*|node()">
+  <xsl:copy>
+    <xsl:apply-templates select="@*|node()" />
+  </xsl:copy>
+</xsl:template>
+
+<!-- particular conversions -->
+
+<xsl:template match="*[@condition='standalone-ignore']">
+</xsl:template>
+
+<xsl:template match="phrase/text()['chapter']">
+  <xsl:text>document</xsl:text>
+</xsl:template>
+
+<xsl:template match="phrase[@id='install-ldap-links']">
+  <xsl:text>the documentation about client authentication and libpq</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='docguide-toolsets']">
+  <xsl:text>the main documentation's appendix on documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='dynamic-trace']">
+  <xsl:text>the documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='install-windows']">
+  <xsl:text>the documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='pgcrypto']">
+  <xsl:text>pgcrypto</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='plpython-python23']">
+  <xsl:text>the </xsl:text><application>PL/Python</application><xsl:text> documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='regress']">
+  <xsl:text>the file </xsl:text>
+  <filename>src/test/regress/README</filename>
+  <xsl:text> and the documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='upgrading']">
+  <xsl:text>the documentation</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='uuid-ossp']">
+  <xsl:text>uuid-ossp</xsl:text>
+</xsl:template>
+
+<xsl:template match="xref[@linkend='xml2']">
+  <xsl:text>xml2</xsl:text>
+</xsl:template>
+
+</xsl:stylesheet>
diff --git a/doc/src/sgml/start.sgml b/doc/src/sgml/start.sgml
index 1ce1a24e10..5b73557835 100644
--- a/doc/src/sgml/start.sgml
+++ b/doc/src/sgml/start.sgml
@@ -29,7 +29,7 @@
 
    <para>
     If you are installing <productname>PostgreSQL</productname>
-    yourself, then refer to <xref linkend="installation">
+    yourself, then refer to <xref linkend="installation"/>
     for instructions on installation, and return to
     this guide when the installation is complete.  Be sure to follow
     closely the section about setting up the appropriate environment
@@ -162,7 +162,7 @@
 <screen>
 createdb: command not found
 </screen>
-    then <productname>PostgreSQL</> was not installed properly.  Either it was not
+    then <productname>PostgreSQL</productname> was not installed properly.  Either it was not
     installed at all or your shell's search path was not set to include it.
     Try calling the command with an absolute path instead:
 <screen>
@@ -191,17 +191,17 @@ createdb: could not connect to database postgres: could not connect to server: N
 createdb: could not connect to database postgres: FATAL:  role "joe" does not exist
 </screen>
     where your own login name is mentioned.  This will happen if the
-    administrator has not created a <productname>PostgreSQL</> user account
-    for you.  (<productname>PostgreSQL</> user accounts are distinct from
+    administrator has not created a <productname>PostgreSQL</productname> user account
+    for you.  (<productname>PostgreSQL</productname> user accounts are distinct from
     operating system user accounts.)  If you are the administrator, see
-    <xref linkend="user-manag"> for help creating accounts.  You will need to
-    become the operating system user under which <productname>PostgreSQL</>
-    was installed (usually <literal>postgres</>) to create the first user
+    <xref linkend="user-manag"/> for help creating accounts.  You will need to
+    become the operating system user under which <productname>PostgreSQL</productname>
+    was installed (usually <literal>postgres</literal>) to create the first user
     account.  It could also be that you were assigned a
-    <productname>PostgreSQL</> user name that is different from your
-    operating system user name; in that case you need to use the <option>-U</>
-    switch or set the <envar>PGUSER</> environment variable to specify your
-    <productname>PostgreSQL</> user name.
+    <productname>PostgreSQL</productname> user name that is different from your
+    operating system user name; in that case you need to use the <option>-U</option>
+    switch or set the <envar>PGUSER</envar> environment variable to specify your
+    <productname>PostgreSQL</productname> user name.
    </para>
 
    <para>
@@ -268,7 +268,7 @@ createdb: database creation failed: ERROR:  permission denied to create database
 
    <para>
     More about <command>createdb</command> and <command>dropdb</command> can
-    be found in <xref linkend="APP-CREATEDB"> and <xref linkend="APP-DROPDB">
+    be found in <xref linkend="app-createdb"/> and <xref linkend="app-dropdb"/>
     respectively.
    </para>
   </sect1>
@@ -288,7 +288,7 @@ createdb: database creation failed: ERROR:  permission denied to create database
      <listitem>
       <para>
        Running the <productname>PostgreSQL</productname> interactive
-       terminal program, called <application><firstterm>psql</></application>, which allows you
+       terminal program, called <application><firstterm>psql</firstterm></application>, which allows you
        to interactively enter, edit, and execute
        <acronym>SQL</acronym> commands.
       </para>
@@ -298,7 +298,7 @@ createdb: database creation failed: ERROR:  permission denied to create database
       <para>
        Using an existing graphical frontend tool like
        <application>pgAdmin</application> or an office suite with
-       <acronym>ODBC</> or <acronym>JDBC</> support to create and manipulate a
+       <acronym>ODBC</acronym> or <acronym>JDBC</acronym> support to create and manipulate a
        database.  These possibilities are not covered in this
        tutorial.
       </para>
@@ -308,7 +308,7 @@ createdb: database creation failed: ERROR:  permission denied to create database
       <para>
        Writing a custom application, using one of the several
        available language bindings.  These possibilities are discussed
-       further in <xref linkend="client-interfaces">.
+       further in <xref linkend="client-interfaces"/>.
       </para>
      </listitem>
     </itemizedlist>
@@ -402,7 +402,7 @@ mydb=#
     command shell. (For more internal commands, type
     <literal>\?</literal> at the <command>psql</command> prompt.)  The
     full capabilities of <command>psql</command> are documented in
-    <xref linkend="app-psql">.  In this tutorial we will not use these
+    <xref linkend="app-psql"/>.  In this tutorial we will not use these
     features explicitly, but you can use them yourself when it is helpful.
    </para>
 
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index aed2cf8bca..c0e548fa5b 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -21,23 +21,23 @@ directories.
 <para>
 Traditionally, the configuration and data files used by a database
 cluster are stored together within the cluster's data
-directory, commonly referred to as <varname>PGDATA</> (after the name of the
+directory, commonly referred to as <varname>PGDATA</varname> (after the name of the
 environment variable that can be used to define it).  A common location for
-<varname>PGDATA</> is <filename>/var/lib/pgsql/data</>.  Multiple clusters,
+<varname>PGDATA</varname> is <filename>/var/lib/pgsql/data</filename>.  Multiple clusters,
 managed by different server instances, can exist on the same machine.
 </para>
 
 <para>
-The <varname>PGDATA</> directory contains several subdirectories and control
-files, as shown in <xref linkend="pgdata-contents-table">.  In addition to
+The <varname>PGDATA</varname> directory contains several subdirectories and control
+files, as shown in <xref linkend="pgdata-contents-table"/>.  In addition to
 these required items, the cluster configuration files
 <filename>postgresql.conf</filename>, <filename>pg_hba.conf</filename>, and
 <filename>pg_ident.conf</filename> are traditionally stored in
-<varname>PGDATA</>, although it is possible to place them elsewhere.
+<varname>PGDATA</varname>, although it is possible to place them elsewhere.
 </para>
 
 <table tocentry="1" id="pgdata-contents-table">
-<title>Contents of <varname>PGDATA</></title>
+<title>Contents of <varname>PGDATA</varname></title>
 <tgroup cols="2">
 <thead>
 <row>
@@ -51,126 +51,126 @@ Item
 <tbody>
 
 <row>
- <entry><filename>PG_VERSION</></entry>
+ <entry><filename>PG_VERSION</filename></entry>
  <entry>A file containing the major version number of <productname>PostgreSQL</productname></entry>
 </row>
 
 <row>
- <entry><filename>base</></entry>
+ <entry><filename>base</filename></entry>
  <entry>Subdirectory containing per-database subdirectories</entry>
 </row>
 
 <row>
- <entry><filename>current_logfiles</></entry>
+ <entry><filename>current_logfiles</filename></entry>
  <entry>File recording the log file(s) currently written to by the logging
   collector</entry>
 </row>
 
 <row>
- <entry><filename>global</></entry>
+ <entry><filename>global</filename></entry>
  <entry>Subdirectory containing cluster-wide tables, such as
- <structname>pg_database</></entry>
+ <structname>pg_database</structname></entry>
 </row>
 
 <row>
- <entry><filename>pg_commit_ts</></entry>
+ <entry><filename>pg_commit_ts</filename></entry>
  <entry>Subdirectory containing transaction commit timestamp data</entry>
 </row>
 
 <row>
- <entry><filename>pg_dynshmem</></entry>
+ <entry><filename>pg_dynshmem</filename></entry>
  <entry>Subdirectory containing files used by the dynamic shared memory
   subsystem</entry>
 </row>
 
 <row>
- <entry><filename>pg_logical</></entry>
+ <entry><filename>pg_logical</filename></entry>
  <entry>Subdirectory containing status data for logical decoding</entry>
 </row>
 
 <row>
- <entry><filename>pg_multixact</></entry>
+ <entry><filename>pg_multixact</filename></entry>
  <entry>Subdirectory containing multitransaction status data
   (used for shared row locks)</entry>
 </row>
 
 <row>
- <entry><filename>pg_notify</></entry>
+ <entry><filename>pg_notify</filename></entry>
  <entry>Subdirectory containing LISTEN/NOTIFY status data</entry>
 </row>
 
 <row>
- <entry><filename>pg_replslot</></entry>
+ <entry><filename>pg_replslot</filename></entry>
  <entry>Subdirectory containing replication slot data</entry>
 </row>
 
 <row>
- <entry><filename>pg_serial</></entry>
+ <entry><filename>pg_serial</filename></entry>
  <entry>Subdirectory containing information about committed serializable transactions</entry>
 </row>
 
 <row>
- <entry><filename>pg_snapshots</></entry>
+ <entry><filename>pg_snapshots</filename></entry>
  <entry>Subdirectory containing exported snapshots</entry>
 </row>
 
 <row>
- <entry><filename>pg_stat</></entry>
+ <entry><filename>pg_stat</filename></entry>
  <entry>Subdirectory containing permanent files for the statistics
   subsystem</entry>
 </row>
 
 <row>
- <entry><filename>pg_stat_tmp</></entry>
+ <entry><filename>pg_stat_tmp</filename></entry>
  <entry>Subdirectory containing temporary files for the statistics
   subsystem</entry>
 </row>
 
 <row>
- <entry><filename>pg_subtrans</></entry>
+ <entry><filename>pg_subtrans</filename></entry>
  <entry>Subdirectory containing subtransaction status data</entry>
 </row>
 
 <row>
- <entry><filename>pg_tblspc</></entry>
+ <entry><filename>pg_tblspc</filename></entry>
  <entry>Subdirectory containing symbolic links to tablespaces</entry>
 </row>
 
 <row>
- <entry><filename>pg_twophase</></entry>
+ <entry><filename>pg_twophase</filename></entry>
  <entry>Subdirectory containing state files for prepared transactions</entry>
 </row>
 
 <row>
- <entry><filename>pg_wal</></entry>
+ <entry><filename>pg_wal</filename></entry>
  <entry>Subdirectory containing WAL (Write Ahead Log) files</entry>
 </row>
 
 <row>
- <entry><filename>pg_xact</></entry>
+ <entry><filename>pg_xact</filename></entry>
  <entry>Subdirectory containing transaction commit status data</entry>
 </row>
 
 <row>
- <entry><filename>postgresql.auto.conf</></entry>
+ <entry><filename>postgresql.auto.conf</filename></entry>
  <entry>A file used for storing configuration parameters that are set by
 <command>ALTER SYSTEM</command></entry>
 </row>
 
 <row>
- <entry><filename>postmaster.opts</></entry>
+ <entry><filename>postmaster.opts</filename></entry>
  <entry>A file recording the command-line options the server was
 last started with</entry>
 </row>
 
 <row>
- <entry><filename>postmaster.pid</></entry>
+ <entry><filename>postmaster.pid</filename></entry>
  <entry>A lock file recording the current postmaster process ID (PID),
   cluster data directory path,
   postmaster start timestamp,
   port number,
   Unix-domain socket directory path (empty on Windows),
-  first valid listen_address (IP address or <literal>*</>, or empty if
+  first valid listen_address (IP address or <literal>*</literal>, or empty if
   not listening on TCP),
   and shared memory segment ID
   (this file is not present after server shutdown)</entry>
@@ -182,113 +182,113 @@ last started with</entry>
 
 <para>
 For each database in the cluster there is a subdirectory within
-<varname>PGDATA</><filename>/base</>, named after the database's OID in
-<structname>pg_database</>.  This subdirectory is the default location
+<varname>PGDATA</varname><filename>/base</filename>, named after the database's OID in
+<structname>pg_database</structname>.  This subdirectory is the default location
 for the database's files; in particular, its system catalogs are stored
 there.
 </para>
 
 <para>
 Each table and index is stored in a separate file.  For ordinary relations,
-these files are named after the table or index's <firstterm>filenode</> number,
-which can be found in <structname>pg_class</>.<structfield>relfilenode</>. But
+these files are named after the table or index's <firstterm>filenode</firstterm> number,
+which can be found in <structname>pg_class</structname>.<structfield>relfilenode</structfield>. But
 for temporary relations, the file name is of the form
-<literal>t<replaceable>BBB</>_<replaceable>FFF</></>, where <replaceable>BBB</>
-is the backend ID of the backend which created the file, and <replaceable>FFF</>
+<literal>t<replaceable>BBB</replaceable>_<replaceable>FFF</replaceable></literal>, where <replaceable>BBB</replaceable>
+is the backend ID of the backend which created the file, and <replaceable>FFF</replaceable>
 is the filenode number.  In either case, in addition to the main file (a/k/a
-main fork), each table and index has a <firstterm>free space map</> (see <xref
-linkend="storage-fsm">), which stores information about free space available in
+main fork), each table and index has a <firstterm>free space map</firstterm> (see <xref
+linkend="storage-fsm"/>), which stores information about free space available in
 the relation.  The free space map is stored in a file named with the filenode
-number plus the suffix <literal>_fsm</>.  Tables also have a
-<firstterm>visibility map</>, stored in a fork with the suffix <literal>_vm</>,
+number plus the suffix <literal>_fsm</literal>.  Tables also have a
+<firstterm>visibility map</firstterm>, stored in a fork with the suffix <literal>_vm</literal>,
 to track which pages are known to have no dead tuples.  The visibility map is
-described further in <xref linkend="storage-vm">.  Unlogged tables and indexes
+described further in <xref linkend="storage-vm"/>.  Unlogged tables and indexes
 have a third fork, known as the initialization fork, which is stored in a fork
-with the suffix <literal>_init</literal> (see <xref linkend="storage-init">).
+with the suffix <literal>_init</literal> (see <xref linkend="storage-init"/>).
 </para>
 
 <caution>
 <para>
 Note that while a table's filenode often matches its OID, this is
-<emphasis>not</> necessarily the case; some operations, like
-<command>TRUNCATE</>, <command>REINDEX</>, <command>CLUSTER</> and some forms
-of <command>ALTER TABLE</>, can change the filenode while preserving the OID.
+<emphasis>not</emphasis> necessarily the case; some operations, like
+<command>TRUNCATE</command>, <command>REINDEX</command>, <command>CLUSTER</command> and some forms
+of <command>ALTER TABLE</command>, can change the filenode while preserving the OID.
 Avoid assuming that filenode and table OID are the same.
-Also, for certain system catalogs including <structname>pg_class</> itself,
-<structname>pg_class</>.<structfield>relfilenode</> contains zero.  The
+Also, for certain system catalogs including <structname>pg_class</structname> itself,
+<structname>pg_class</structname>.<structfield>relfilenode</structfield> contains zero.  The
 actual filenode number of these catalogs is stored in a lower-level data
-structure, and can be obtained using the <function>pg_relation_filenode()</>
+structure, and can be obtained using the <function>pg_relation_filenode()</function>
 function.
 </para>
 </caution>
 
 <para>
 When a table or index exceeds 1 GB, it is divided into gigabyte-sized
-<firstterm>segments</>.  The first segment's file name is the same as the
+<firstterm>segments</firstterm>.  The first segment's file name is the same as the
 filenode; subsequent segments are named filenode.1, filenode.2, etc.
 This arrangement avoids problems on platforms that have file size limitations.
 (Actually, 1 GB is just the default segment size.  The segment size can be
 adjusted using the configuration option <option>--with-segsize</option>
-when building <productname>PostgreSQL</>.)
+when building <productname>PostgreSQL</productname>.)
 In principle, free space map and visibility map forks could require multiple
 segments as well, though this is unlikely to happen in practice.
 </para>
 
 <para>
 A table that has columns with potentially large entries will have an
-associated <firstterm>TOAST</> table, which is used for out-of-line storage of
+associated <firstterm>TOAST</firstterm> table, which is used for out-of-line storage of
 field values that are too large to keep in the table rows proper.
-<structname>pg_class</>.<structfield>reltoastrelid</> links from a table to
-its <acronym>TOAST</> table, if any.
-See <xref linkend="storage-toast"> for more information.
+<structname>pg_class</structname>.<structfield>reltoastrelid</structfield> links from a table to
+its <acronym>TOAST</acronym> table, if any.
+See <xref linkend="storage-toast"/> for more information.
 </para>
 
 <para>
 The contents of tables and indexes are discussed further in
-<xref linkend="storage-page-layout">.
+<xref linkend="storage-page-layout"/>.
 </para>
 
 <para>
 Tablespaces make the scenario more complicated.  Each user-defined tablespace
-has a symbolic link inside the <varname>PGDATA</><filename>/pg_tblspc</>
+has a symbolic link inside the <varname>PGDATA</varname><filename>/pg_tblspc</filename>
 directory, which points to the physical tablespace directory (i.e., the
-location specified in the tablespace's <command>CREATE TABLESPACE</> command).
+location specified in the tablespace's <command>CREATE TABLESPACE</command> command).
 This symbolic link is named after
 the tablespace's OID.  Inside the physical tablespace directory there is
-a subdirectory with a name that depends on the <productname>PostgreSQL</>
-server version, such as <literal>PG_9.0_201008051</>.  (The reason for using
+a subdirectory with a name that depends on the <productname>PostgreSQL</productname>
+server version, such as <literal>PG_9.0_201008051</literal>.  (The reason for using
 this subdirectory is so that successive versions of the database can use
-the same <command>CREATE TABLESPACE</> location value without conflicts.)
+the same <command>CREATE TABLESPACE</command> location value without conflicts.)
 Within the version-specific subdirectory, there is
 a subdirectory for each database that has elements in the tablespace, named
 after the database's OID.  Tables and indexes are stored within that
 directory, using the filenode naming scheme.
-The <literal>pg_default</> tablespace is not accessed through
-<filename>pg_tblspc</>, but corresponds to
-<varname>PGDATA</><filename>/base</>.  Similarly, the <literal>pg_global</>
-tablespace is not accessed through <filename>pg_tblspc</>, but corresponds to
-<varname>PGDATA</><filename>/global</>.
+The <literal>pg_default</literal> tablespace is not accessed through
+<filename>pg_tblspc</filename>, but corresponds to
+<varname>PGDATA</varname><filename>/base</filename>.  Similarly, the <literal>pg_global</literal>
+tablespace is not accessed through <filename>pg_tblspc</filename>, but corresponds to
+<varname>PGDATA</varname><filename>/global</filename>.
 </para>
 
 <para>
-The <function>pg_relation_filepath()</> function shows the entire path
-(relative to <varname>PGDATA</>) of any relation.  It is often useful
+The <function>pg_relation_filepath()</function> function shows the entire path
+(relative to <varname>PGDATA</varname>) of any relation.  It is often useful
 as a substitute for remembering many of the above rules.  But keep in
 mind that this function just gives the name of the first segment of the
 main fork of the relation &mdash; you may need to append a segment number
-and/or <literal>_fsm</>, <literal>_vm</>, or <literal>_init</> to find all
+and/or <literal>_fsm</literal>, <literal>_vm</literal>, or <literal>_init</literal> to find all
 the files associated with the relation.
 </para>
 
 <para>
 Temporary files (for operations such as sorting more data than can fit in
-memory) are created within <varname>PGDATA</><filename>/base/pgsql_tmp</>,
-or within a <filename>pgsql_tmp</> subdirectory of a tablespace directory
-if a tablespace other than <literal>pg_default</> is specified for them.
+memory) are created within <varname>PGDATA</varname><filename>/base/pgsql_tmp</filename>,
+or within a <filename>pgsql_tmp</filename> subdirectory of a tablespace directory
+if a tablespace other than <literal>pg_default</literal> is specified for them.
 The name of a temporary file has the form
-<filename>pgsql_tmp<replaceable>PPP</>.<replaceable>NNN</></filename>,
-where <replaceable>PPP</> is the PID of the owning backend and
-<replaceable>NNN</> distinguishes different temporary files of that backend.
+<filename>pgsql_tmp<replaceable>PPP</replaceable>.<replaceable>NNN</replaceable></filename>,
+where <replaceable>PPP</replaceable> is the PID of the owning backend and
+<replaceable>NNN</replaceable> distinguishes different temporary files of that backend.
 </para>
 
 </sect1>
@@ -300,10 +300,10 @@ where <replaceable>PPP</> is the PID of the owning backend and
     <indexterm>
      <primary>TOAST</primary>
     </indexterm>
-    <indexterm><primary>sliced bread</><see>TOAST</></indexterm>
+    <indexterm><primary>sliced bread</primary><see>TOAST</see></indexterm>
 
 <para>
-This section provides an overview of <acronym>TOAST</> (The
+This section provides an overview of <acronym>TOAST</acronym> (The
 Oversized-Attribute Storage Technique).
 </para>
 
@@ -314,36 +314,36 @@ not possible to store very large field values directly.  To overcome
 this limitation, large field values are compressed and/or broken up into
 multiple physical rows.  This happens transparently to the user, with only
 small impact on most of the backend code.  The technique is affectionately
-known as <acronym>TOAST</> (or <quote>the best thing since sliced bread</>).
-The <acronym>TOAST</> infrastructure is also used to improve handling of
+known as <acronym>TOAST</acronym> (or <quote>the best thing since sliced bread</quote>).
+The <acronym>TOAST</acronym> infrastructure is also used to improve handling of
 large data values in-memory.
 </para>
 
 <para>
-Only certain data types support <acronym>TOAST</> &mdash; there is no need to
+Only certain data types support <acronym>TOAST</acronym> &mdash; there is no need to
 impose the overhead on data types that cannot produce large field values.
-To support <acronym>TOAST</>, a data type must have a variable-length
-(<firstterm>varlena</>) representation, in which, ordinarily, the first
+To support <acronym>TOAST</acronym>, a data type must have a variable-length
+(<firstterm>varlena</firstterm>) representation, in which, ordinarily, the first
 four-byte word of any stored value contains the total length of the value in
-bytes (including itself).  <acronym>TOAST</> does not constrain the rest
+bytes (including itself).  <acronym>TOAST</acronym> does not constrain the rest
 of the data type's representation.  The special representations collectively
-called <firstterm><acronym>TOAST</>ed values</firstterm> work by modifying or
+called <firstterm><acronym>TOAST</acronym>ed values</firstterm> work by modifying or
 reinterpreting this initial length word.  Therefore, the C-level functions
-supporting a <acronym>TOAST</>-able data type must be careful about how they
-handle potentially <acronym>TOAST</>ed input values: an input might not
+supporting a <acronym>TOAST</acronym>-able data type must be careful about how they
+handle potentially <acronym>TOAST</acronym>ed input values: an input might not
 actually consist of a four-byte length word and contents until after it's
-been <firstterm>detoasted</>.  (This is normally done by invoking
-<function>PG_DETOAST_DATUM</> before doing anything with an input value,
+been <firstterm>detoasted</firstterm>.  (This is normally done by invoking
+<function>PG_DETOAST_DATUM</function> before doing anything with an input value,
 but in some cases more efficient approaches are possible.
-See <xref linkend="xtypes-toast"> for more detail.)
+See <xref linkend="xtypes-toast"/> for more detail.)
 </para>
 
 <para>
-<acronym>TOAST</> usurps two bits of the varlena length word (the high-order
+<acronym>TOAST</acronym> usurps two bits of the varlena length word (the high-order
 bits on big-endian machines, the low-order bits on little-endian machines),
-thereby limiting the logical size of any value of a <acronym>TOAST</>-able
-data type to 1 GB (2<superscript>30</> - 1 bytes).  When both bits are zero,
-the value is an ordinary un-<acronym>TOAST</>ed value of the data type, and
+thereby limiting the logical size of any value of a <acronym>TOAST</acronym>-able
+data type to 1 GB (2<superscript>30</superscript> - 1 bytes).  When both bits are zero,
+the value is an ordinary un-<acronym>TOAST</acronym>ed value of the data type, and
 the remaining bits of the length word give the total datum size (including
 length word) in bytes.  When the highest-order or lowest-order bit is set,
 the value has only a single-byte header instead of the normal four-byte
@@ -357,7 +357,7 @@ additional space savings that is significant compared to short values.
 As a special case, if the remaining bits of a single-byte header are all
 zero (which would be impossible for a self-inclusive length), the value is
 a pointer to out-of-line data, with several possible alternatives as
-described below.  The type and size of such a <firstterm>TOAST pointer</>
+described below.  The type and size of such a <firstterm>TOAST pointer</firstterm>
 are determined by a code stored in the second byte of the datum.
 Lastly, when the highest-order or lowest-order bit is clear but the adjacent
 bit is set, the content of the datum has been compressed and must be
@@ -365,80 +365,80 @@ decompressed before use.  In this case the remaining bits of the four-byte
 length word give the total size of the compressed datum, not the
 original data.  Note that compression is also possible for out-of-line data
 but the varlena header does not tell whether it has occurred &mdash;
-the content of the <acronym>TOAST</> pointer tells that, instead.
+the content of the <acronym>TOAST</acronym> pointer tells that, instead.
 </para>
 
 <para>
-As mentioned, there are multiple types of <acronym>TOAST</> pointer datums.
+As mentioned, there are multiple types of <acronym>TOAST</acronym> pointer datums.
 The oldest and most common type is a pointer to out-of-line data stored in
-a <firstterm><acronym>TOAST</> table</firstterm> that is separate from, but
-associated with, the table containing the <acronym>TOAST</> pointer datum
-itself.  These <firstterm>on-disk</> pointer datums are created by the
-<acronym>TOAST</> management code (in <filename>access/heap/tuptoaster.c</>)
+a <firstterm><acronym>TOAST</acronym> table</firstterm> that is separate from, but
+associated with, the table containing the <acronym>TOAST</acronym> pointer datum
+itself.  These <firstterm>on-disk</firstterm> pointer datums are created by the
+<acronym>TOAST</acronym> management code (in <filename>access/heap/tuptoaster.c</filename>)
 when a tuple to be stored on disk is too large to be stored as-is.
-Further details appear in <xref linkend="storage-toast-ondisk">.
-Alternatively, a <acronym>TOAST</> pointer datum can contain a pointer to
+Further details appear in <xref linkend="storage-toast-ondisk"/>.
+Alternatively, a <acronym>TOAST</acronym> pointer datum can contain a pointer to
 out-of-line data that appears elsewhere in memory.  Such datums are
 necessarily short-lived, and will never appear on-disk, but they are very
 useful for avoiding copying and redundant processing of large data values.
-Further details appear in <xref linkend="storage-toast-inmemory">.
+Further details appear in <xref linkend="storage-toast-inmemory"/>.
 </para>
 
 <para>
 The compression technique used for either in-line or out-of-line compressed
 data is a fairly simple and very fast member
 of the LZ family of compression techniques.  See
-<filename>src/common/pg_lzcompress.c</> for the details.
+<filename>src/common/pg_lzcompress.c</filename> for the details.
 </para>
 
 <sect2 id="storage-toast-ondisk">
  <title>Out-of-line, on-disk TOAST storage</title>
 
 <para>
-If any of the columns of a table are <acronym>TOAST</>-able, the table will
-have an associated <acronym>TOAST</> table, whose OID is stored in the table's
-<structname>pg_class</>.<structfield>reltoastrelid</> entry.  On-disk
-<acronym>TOAST</>ed values are kept in the <acronym>TOAST</> table, as
+If any of the columns of a table are <acronym>TOAST</acronym>-able, the table will
+have an associated <acronym>TOAST</acronym> table, whose OID is stored in the table's
+<structname>pg_class</structname>.<structfield>reltoastrelid</structfield> entry.  On-disk
+<acronym>TOAST</acronym>ed values are kept in the <acronym>TOAST</acronym> table, as
 described in more detail below.
 </para>
 
 <para>
 Out-of-line values are divided (after compression if used) into chunks of at
-most <symbol>TOAST_MAX_CHUNK_SIZE</> bytes (by default this value is chosen
+most <symbol>TOAST_MAX_CHUNK_SIZE</symbol> bytes (by default this value is chosen
 so that four chunk rows will fit on a page, making it about 2000 bytes).
-Each chunk is stored as a separate row in the <acronym>TOAST</> table
+Each chunk is stored as a separate row in the <acronym>TOAST</acronym> table
 belonging to the owning table.  Every
-<acronym>TOAST</> table has the columns <structfield>chunk_id</> (an OID
-identifying the particular <acronym>TOAST</>ed value),
-<structfield>chunk_seq</> (a sequence number for the chunk within its value),
-and <structfield>chunk_data</> (the actual data of the chunk).  A unique index
-on <structfield>chunk_id</> and <structfield>chunk_seq</> provides fast
+<acronym>TOAST</acronym> table has the columns <structfield>chunk_id</structfield> (an OID
+identifying the particular <acronym>TOAST</acronym>ed value),
+<structfield>chunk_seq</structfield> (a sequence number for the chunk within its value),
+and <structfield>chunk_data</structfield> (the actual data of the chunk).  A unique index
+on <structfield>chunk_id</structfield> and <structfield>chunk_seq</structfield> provides fast
 retrieval of the values.  A pointer datum representing an out-of-line on-disk
-<acronym>TOAST</>ed value therefore needs to store the OID of the
-<acronym>TOAST</> table in which to look and the OID of the specific value
-(its <structfield>chunk_id</>).  For convenience, pointer datums also store the
+<acronym>TOAST</acronym>ed value therefore needs to store the OID of the
+<acronym>TOAST</acronym> table in which to look and the OID of the specific value
+(its <structfield>chunk_id</structfield>).  For convenience, pointer datums also store the
 logical datum size (original uncompressed data length) and physical stored size
 (different if compression was applied).  Allowing for the varlena header bytes,
-the total size of an on-disk <acronym>TOAST</> pointer datum is therefore 18
+the total size of an on-disk <acronym>TOAST</acronym> pointer datum is therefore 18
 bytes regardless of the actual size of the represented value.
 </para>
 
 <para>
-The <acronym>TOAST</> management code is triggered only
+The <acronym>TOAST</acronym> management code is triggered only
 when a row value to be stored in a table is wider than
-<symbol>TOAST_TUPLE_THRESHOLD</> bytes (normally 2 kB).
-The <acronym>TOAST</> code will compress and/or move
+<symbol>TOAST_TUPLE_THRESHOLD</symbol> bytes (normally 2 kB).
+The <acronym>TOAST</acronym> code will compress and/or move
 field values out-of-line until the row value is shorter than
-<symbol>TOAST_TUPLE_TARGET</> bytes (also normally 2 kB)
+<symbol>TOAST_TUPLE_TARGET</symbol> bytes (also normally 2 kB, adjustable)
 or no more gains can be had.  During an UPDATE
 operation, values of unchanged fields are normally preserved as-is; so an
-UPDATE of a row with out-of-line values incurs no <acronym>TOAST</> costs if
+UPDATE of a row with out-of-line values incurs no <acronym>TOAST</acronym> costs if
 none of the out-of-line values change.
 </para>
 
 <para>
-The <acronym>TOAST</> management code recognizes four different strategies
-for storing <acronym>TOAST</>-able columns on disk:
+The <acronym>TOAST</acronym> management code recognizes four different strategies
+for storing <acronym>TOAST</acronym>-able columns on disk:
 
    <itemizedlist>
     <listitem>
@@ -447,13 +447,13 @@ for storing <acronym>TOAST</>-able columns on disk:
       out-of-line storage; furthermore it disables use of single-byte headers
       for varlena types.
       This is the only possible strategy for
-      columns of non-<acronym>TOAST</>-able data types.
+      columns of non-<acronym>TOAST</acronym>-able data types.
      </para>
     </listitem>
     <listitem>
      <para>
       <literal>EXTENDED</literal> allows both compression and out-of-line
-      storage.  This is the default for most <acronym>TOAST</>-able data types.
+      storage.  This is the default for most <acronym>TOAST</acronym>-able data types.
       Compression will be attempted first, then out-of-line storage if
       the row is still too big.
      </para>
@@ -478,9 +478,14 @@ for storing <acronym>TOAST</>-able columns on disk:
     </listitem>
    </itemizedlist>
 
-Each <acronym>TOAST</>-able data type specifies a default strategy for columns
+Each <acronym>TOAST</acronym>-able data type specifies a default strategy for columns
 of that data type, but the strategy for a given table column can be altered
-with <link linkend="sql-altertable"><command>ALTER TABLE ... SET STORAGE</></link>.
+with <link linkend="sql-altertable"><command>ALTER TABLE ... SET STORAGE</command></link>.
+</para>
+
+<para>
+<symbol>TOAST_TUPLE_TARGET</symbol> can be adjusted for each table using
+<link linkend="sql-altertable"><command>ALTER TABLE ... SET (toast_tuple_target = N)</command></link>
 </para>
 
 <para>
@@ -488,15 +493,15 @@ This scheme has a number of advantages compared to a more straightforward
 approach such as allowing row values to span pages.  Assuming that queries are
 usually qualified by comparisons against relatively small key values, most of
 the work of the executor will be done using the main row entry. The big values
-of <acronym>TOAST</>ed attributes will only be pulled out (if selected at all)
+of <acronym>TOAST</acronym>ed attributes will only be pulled out (if selected at all)
 at the time the result set is sent to the client. Thus, the main table is much
 smaller and more of its rows fit in the shared buffer cache than would be the
 case without any out-of-line storage. Sort sets shrink also, and sorts will
 more often be done entirely in memory. A little test showed that a table
 containing typical HTML pages and their URLs was stored in about half of the
-raw data size including the <acronym>TOAST</> table, and that the main table
+raw data size including the <acronym>TOAST</acronym> table, and that the main table
 contained only about 10% of the entire data (the URLs and some small HTML
-pages). There was no run time difference compared to an un-<acronym>TOAST</>ed
+pages). There was no run time difference compared to an un-<acronym>TOAST</acronym>ed
 comparison table, in which all the HTML pages were cut down to 7 kB to fit.
 </para>
 
@@ -506,16 +511,16 @@ comparison table, in which all the HTML pages were cut down to 7 kB to fit.
  <title>Out-of-line, in-memory TOAST storage</title>
 
 <para>
-<acronym>TOAST</> pointers can point to data that is not on disk, but is
+<acronym>TOAST</acronym> pointers can point to data that is not on disk, but is
 elsewhere in the memory of the current server process.  Such pointers
 obviously cannot be long-lived, but they are nonetheless useful.  There
 are currently two sub-cases:
-pointers to <firstterm>indirect</> data and
-pointers to <firstterm>expanded</> data.
+pointers to <firstterm>indirect</firstterm> data and
+pointers to <firstterm>expanded</firstterm> data.
 </para>
 
 <para>
-Indirect <acronym>TOAST</> pointers simply point at a non-indirect varlena
+Indirect <acronym>TOAST</acronym> pointers simply point at a non-indirect varlena
 value stored somewhere in memory.  This case was originally created merely
 as a proof of concept, but it is currently used during logical decoding to
 avoid possibly having to create physical tuples exceeding 1 GB (as pulling
@@ -526,34 +531,34 @@ and there is no infrastructure to help with this.
 </para>
 
 <para>
-Expanded <acronym>TOAST</> pointers are useful for complex data types
+Expanded <acronym>TOAST</acronym> pointers are useful for complex data types
 whose on-disk representation is not especially suited for computational
 purposes.  As an example, the standard varlena representation of a
-<productname>PostgreSQL</> array includes dimensionality information, a
+<productname>PostgreSQL</productname> array includes dimensionality information, a
 nulls bitmap if there are any null elements, then the values of all the
 elements in order.  When the element type itself is variable-length, the
-only way to find the <replaceable>N</>'th element is to scan through all the
+only way to find the <replaceable>N</replaceable>'th element is to scan through all the
 preceding elements.  This representation is appropriate for on-disk storage
 because of its compactness, but for computations with the array it's much
-nicer to have an <quote>expanded</> or <quote>deconstructed</>
+nicer to have an <quote>expanded</quote> or <quote>deconstructed</quote>
 representation in which all the element starting locations have been
-identified.  The <acronym>TOAST</> pointer mechanism supports this need by
+identified.  The <acronym>TOAST</acronym> pointer mechanism supports this need by
 allowing a pass-by-reference Datum to point to either a standard varlena
-value (the on-disk representation) or a <acronym>TOAST</> pointer that
+value (the on-disk representation) or a <acronym>TOAST</acronym> pointer that
 points to an expanded representation somewhere in memory.  The details of
 this expanded representation are up to the data type, though it must have
 a standard header and meet the other API requirements given
-in <filename>src/include/utils/expandeddatum.h</>.  C-level functions
+in <filename>src/include/utils/expandeddatum.h</filename>.  C-level functions
 working with the data type can choose to handle either representation.
 Functions that do not know about the expanded representation, but simply
-apply <function>PG_DETOAST_DATUM</> to their inputs, will automatically
+apply <function>PG_DETOAST_DATUM</function> to their inputs, will automatically
 receive the traditional varlena representation; so support for an expanded
 representation can be introduced incrementally, one function at a time.
 </para>
 
 <para>
-<acronym>TOAST</> pointers to expanded values are further broken down
-into <firstterm>read-write</> and <firstterm>read-only</> pointers.
+<acronym>TOAST</acronym> pointers to expanded values are further broken down
+into <firstterm>read-write</firstterm> and <firstterm>read-only</firstterm> pointers.
 The pointed-to representation is the same either way, but a function that
 receives a read-write pointer is allowed to modify the referenced value
 in-place, whereas one that receives a read-only pointer must not; it must
@@ -563,11 +568,11 @@ unnecessary copying of expanded values during query execution.
 </para>
 
 <para>
-For all types of in-memory <acronym>TOAST</> pointer, the <acronym>TOAST</>
+For all types of in-memory <acronym>TOAST</acronym> pointer, the <acronym>TOAST</acronym>
 management code ensures that no such pointer datum can accidentally get
-stored on disk.  In-memory <acronym>TOAST</> pointers are automatically
+stored on disk.  In-memory <acronym>TOAST</acronym> pointers are automatically
 expanded to normal in-line varlena values before storage &mdash; and then
-possibly converted to on-disk <acronym>TOAST</> pointers, if the containing
+possibly converted to on-disk <acronym>TOAST</acronym> pointers, if the containing
 tuple would otherwise be too big.
 </para>
 
@@ -582,36 +587,36 @@ tuple would otherwise be too big.
 <indexterm>
  <primary>Free Space Map</primary>
 </indexterm>
-<indexterm><primary>FSM</><see>Free Space Map</></indexterm>
+<indexterm><primary>FSM</primary><see>Free Space Map</see></indexterm>
 
 <para>
 Each heap and index relation, except for hash indexes, has a Free Space Map
 (FSM) to keep track of available space in the relation. It's stored
 alongside the main relation data in a separate relation fork, named after the
-filenode number of the relation, plus a <literal>_fsm</> suffix. For example,
+filenode number of the relation, plus a <literal>_fsm</literal> suffix. For example,
 if the filenode of a relation is 12345, the FSM is stored in a file called
-<filename>12345_fsm</>, in the same directory as the main relation file.
+<filename>12345_fsm</filename>, in the same directory as the main relation file.
 </para>
 
 <para>
-The Free Space Map is organized as a tree of <acronym>FSM</> pages. The
-bottom level <acronym>FSM</> pages store the free space available on each
+The Free Space Map is organized as a tree of <acronym>FSM</acronym> pages. The
+bottom level <acronym>FSM</acronym> pages store the free space available on each
 heap (or index) page, using one byte to represent each such page. The upper
 levels aggregate information from the lower levels.
 </para>
 
 <para>
-Within each <acronym>FSM</> page is a binary tree, stored in an array with
+Within each <acronym>FSM</acronym> page is a binary tree, stored in an array with
 one byte per node. Each leaf node represents a heap page, or a lower level
-<acronym>FSM</> page. In each non-leaf node, the higher of its children's
+<acronym>FSM</acronym> page. In each non-leaf node, the higher of its children's
 values is stored. The maximum value in the leaf nodes is therefore stored
 at the root.
 </para>
 
 <para>
-See <filename>src/backend/storage/freespace/README</> for more details on
-how the <acronym>FSM</> is structured, and how it's updated and searched.
-The <xref linkend="pgfreespacemap"> module
+See <filename>src/backend/storage/freespace/README</filename> for more details on
+how the <acronym>FSM</acronym> is structured, and how it's updated and searched.
+The <xref linkend="pgfreespacemap"/> module
 can be used to examine the information stored in free space maps.
 </para>
 
@@ -624,7 +629,7 @@ can be used to examine the information stored in free space maps.
 <indexterm>
  <primary>Visibility Map</primary>
 </indexterm>
-<indexterm><primary>VM</><see>Visibility Map</></indexterm>
+<indexterm><primary>VM</primary><see>Visibility Map</see></indexterm>
 
 <para>
 Each heap relation has a Visibility Map
@@ -632,9 +637,9 @@ Each heap relation has a Visibility Map
 visible to all active transactions; it also keeps track of which pages contain
 only frozen tuples.  It's stored
 alongside the main relation data in a separate relation fork, named after the
-filenode number of the relation, plus a <literal>_vm</> suffix. For example,
+filenode number of the relation, plus a <literal>_vm</literal> suffix. For example,
 if the filenode of a relation is 12345, the VM is stored in a file called
-<filename>12345_vm</>, in the same directory as the main relation file.
+<filename>12345_vm</filename>, in the same directory as the main relation file.
 Note that indexes do not have VMs.
 </para>
 
@@ -644,7 +649,7 @@ indicates that the page is all-visible, or in other words that the page does
 not contain any tuples that need to be vacuumed.
 This information can also be used
 by <link linkend="indexes-index-only-scans"><firstterm>index-only
-scans</></link> to answer queries using only the index tuple.
+scans</firstterm></link> to answer queries using only the index tuple.
 The second bit, if set, means that all tuples on the page have been frozen.
 That means that even an anti-wraparound vacuum need not revisit the page.
 </para>
@@ -657,7 +662,7 @@ cleared by any data-modifying operations on a page.
 </para>
 
 <para>
-The <xref linkend="pgvisibility"> module can be used to examine the
+The <xref linkend="pgvisibility"/> module can be used to examine the
 information stored in the visibility map.
 </para>
 
@@ -695,7 +700,7 @@ This section provides an overview of the page format used within
     the item layout rules.
   </para>
 </footnote>
-Sequences and <acronym>TOAST</> tables are formatted just like a regular table.
+Sequences and <acronym>TOAST</acronym> tables are formatted just like a regular table.
 </para>
 
 <para>
@@ -708,17 +713,17 @@ an item is a row; in an index, an item is an index entry.
 </para>
 
 <para>
-Every table and index is stored as an array of <firstterm>pages</> of a
+Every table and index is stored as an array of <firstterm>pages</firstterm> of a
 fixed size (usually 8 kB, although a different page size can be selected
 when compiling the server).  In a table, all the pages are logically
 equivalent, so a particular item (row) can be stored in any page.  In
-indexes, the first page is generally reserved as a <firstterm>metapage</>
+indexes, the first page is generally reserved as a <firstterm>metapage</firstterm>
 holding control information, and there can be different types of pages
 within the index, depending on the index access method.
 </para>
 
 <para>
-<xref linkend="page-table"> shows the overall layout of a page.
+<xref linkend="page-table"/> shows the overall layout of a page.
 There are five parts to each page.
 </para>
 
@@ -773,10 +778,10 @@ data. Empty in ordinary tables.</entry>
  <para>
 
   The first 24 bytes of each page consists of a page header
-  (<structname>PageHeaderData</>). Its format is detailed in <xref
-  linkend="pageheaderdata-table">. The first field tracks the most
+  (<structname>PageHeaderData</structname>). Its format is detailed in <xref
+  linkend="pageheaderdata-table"/>. The first field tracks the most
   recent WAL entry related to this page. The second field contains
-  the page checksum if <xref linkend="app-initdb-data-checksums"> are
+  the page checksum if <xref linkend="app-initdb-data-checksums"/> are
   enabled.  Next is a 2-byte field containing flag bits. This is followed
   by three 2-byte integer fields (<structfield>pd_lower</structfield>,
   <structfield>pd_upper</structfield>, and
@@ -880,7 +885,7 @@ data. Empty in ordinary tables.</entry>
   New item identifiers are allocated
   as needed from the beginning of the unallocated space.
   The number of item identifiers present can be determined by looking at
-  <structfield>pd_lower</>, which is increased to allocate a new identifier.
+  <structfield>pd_lower</structfield>, which is increased to allocate a new identifier.
   Because an item
   identifier is never moved until it is freed, its index can be used on a
   long-term basis to reference an item, even when the item itself is moved
@@ -908,7 +913,7 @@ data. Empty in ordinary tables.</entry>
   b-tree indexes store links to the page's left and right siblings,
   as well as some other data relevant to the index structure.
   Ordinary tables do not use a special section at all (indicated by setting
-  <structfield>pd_special</> to equal the page size).
+  <structfield>pd_special</structfield> to equal the page size).
 
  </para>
 
@@ -918,21 +923,21 @@ data. Empty in ordinary tables.</entry>
   header (occupying 23 bytes on most machines), followed by an optional null
   bitmap, an optional object ID field, and the user data. The header is
   detailed
-  in <xref linkend="heaptupleheaderdata-table">.  The actual user data
+  in <xref linkend="heaptupleheaderdata-table"/>.  The actual user data
   (columns of the row) begins at the offset indicated by
-  <structfield>t_hoff</>, which must always be a multiple of the MAXALIGN
+  <structfield>t_hoff</structfield>, which must always be a multiple of the MAXALIGN
   distance for the platform.
   The null bitmap is
   only present if the <firstterm>HEAP_HASNULL</firstterm> bit is set in
   <structfield>t_infomask</structfield>. If it is present it begins just after
   the fixed header and occupies enough bytes to have one bit per data column
-  (that is, <structfield>t_natts</> bits altogether). In this list of bits, a
+  (that is, <structfield>t_natts</structfield> bits altogether). In this list of bits, a
   1 bit indicates not-null, a 0 bit is a null.  When the bitmap is not
   present, all columns are assumed not-null.
   The object ID is only present if the <firstterm>HEAP_HASOID</firstterm> bit
   is set in <structfield>t_infomask</structfield>.  If present, it appears just
-  before the <structfield>t_hoff</> boundary.  Any padding needed to make
-  <structfield>t_hoff</> a MAXALIGN multiple will appear between the null
+  before the <structfield>t_hoff</structfield> boundary.  Any padding needed to make
+  <structfield>t_hoff</structfield> a MAXALIGN multiple will appear between the null
   bitmap and the object ID.  (This in turn ensures that the object ID is
   suitably aligned.)
 
@@ -1031,8 +1036,8 @@ data. Empty in ordinary tables.</entry>
   All variable-length data types share the common header structure
   <type>struct varlena</type>, which includes the total length of the stored
   value and some flag bits.  Depending on the flags, the data can be either
-  inline or in a <acronym>TOAST</> table;
-  it might be compressed, too (see <xref linkend="storage-toast">).
+  inline or in a <acronym>TOAST</acronym> table;
+  it might be compressed, too (see <xref linkend="storage-toast"/>).
 
  </para>
 </sect1>
diff --git a/doc/src/sgml/stylesheet-common.xsl b/doc/src/sgml/stylesheet-common.xsl
index 658a5ac5e1..6d26e7e5c9 100644
--- a/doc/src/sgml/stylesheet-common.xsl
+++ b/doc/src/sgml/stylesheet-common.xsl
@@ -36,6 +36,7 @@
 <xsl:param name="refentry.generate.title" select="1"></xsl:param>
 <xsl:param name="refentry.xref.manvolnum" select="0"/>
 <xsl:param name="formal.procedures" select="0"></xsl:param>
+<xsl:param name="generate.consistent.ids" select="1"/>
 <xsl:param name="punct.honorific" select="''"></xsl:param>
 <xsl:param name="variablelist.term.break.after">1</xsl:param>
 <xsl:param name="variablelist.term.separator"></xsl:param>
diff --git a/doc/src/sgml/stylesheet-html-common.xsl b/doc/src/sgml/stylesheet-html-common.xsl
index 72fac1e806..17b7230d2c 100644
--- a/doc/src/sgml/stylesheet-html-common.xsl
+++ b/doc/src/sgml/stylesheet-html-common.xsl
@@ -263,4 +263,29 @@ set       toc,title
   </xsl:if>
 </xsl:template>
 
+
+<!-- upper case HTML anchors for backward compatibility -->
+
+<xsl:template name="object.id">
+  <xsl:param name="object" select="."/>
+  <xsl:choose>
+    <xsl:when test="$object/@id">
+      <xsl:value-of select="translate($object/@id, &lowercase;, &uppercase;)"/>
+    </xsl:when>
+    <xsl:when test="$object/@xml:id">
+      <xsl:value-of select="$object/@xml:id"/>
+    </xsl:when>
+    <xsl:when test="$generate.consistent.ids != 0">
+      <!-- Make $object the current node -->
+      <xsl:for-each select="$object">
+        <xsl:text>id-</xsl:text>
+        <xsl:number level="multiple" count="*"/>
+      </xsl:for-each>
+    </xsl:when>
+    <xsl:otherwise>
+      <xsl:value-of select="generate-id($object)"/>
+    </xsl:otherwise>
+  </xsl:choose>
+</xsl:template>
+
 </xsl:stylesheet>
diff --git a/doc/src/sgml/stylesheet-man.xsl b/doc/src/sgml/stylesheet-man.xsl
index e9c407230c..fcb485c293 100644
--- a/doc/src/sgml/stylesheet-man.xsl
+++ b/doc/src/sgml/stylesheet-man.xsl
@@ -12,11 +12,13 @@
 
 <xsl:param name="man.authors.section.enabled">0</xsl:param>
 <xsl:param name="man.copyright.section.enabled">0</xsl:param>
+<xsl:param name="man.endnotes.are.numbered">0</xsl:param> <!-- for performance -->
 <xsl:param name="man.output.base.dir"></xsl:param>
 <xsl:param name="man.output.in.separate.dir" select="1"></xsl:param>
-<xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param>
+<xsl:param name="man.output.quietly" select="1"></xsl:param>
 <xsl:param name="man.th.title.max.length">32</xsl:param> <!-- enough room for "CREATE TEXT SEARCH CONFIGURATION" -->
 <xsl:param name="man.th.extra3.max.length">40</xsl:param> <!-- enough room for "PostgreSQL X.Ydevel Documentation" -->
+<xsl:param name="refentry.meta.get.quietly" select="0"></xsl:param>
 <xsl:param name="refentry.xref.manvolnum" select="1"/> <!-- overridden from stylesheet-common.xsl -->
 
 <!-- Fixup for apostrophe groff output.  See the following references:
@@ -191,6 +193,12 @@
   <xsl:template match="indexterm"/>
 
 
+<!-- https://github.com/docbook/xslt10-stylesheets/issues/59 -->
+<xsl:template match="a/sup">
+  <xsl:apply-templates/>
+</xsl:template>
+
+
 <!-- Gentext customization -->
 
 <!-- see http://www.sagehill.net/docbookxsl/CustomGentext.html -->
diff --git a/doc/src/sgml/syntax.sgml b/doc/src/sgml/syntax.sgml
index a2d136eaf8..f9905fb447 100644
--- a/doc/src/sgml/syntax.sgml
+++ b/doc/src/sgml/syntax.sgml
@@ -75,7 +75,7 @@ INSERT INTO MY_TABLE VALUES (3, 'hi there');
    a <token>SET</token> token to appear in a certain position, and
    this particular variation of <command>INSERT</command> also
    requires a <token>VALUES</token> in order to be complete.  The
-   precise syntax rules for each command are described in <xref linkend="reference">.
+   precise syntax rules for each command are described in <xref linkend="reference"/>.
   </para>
 
   <sect2 id="sql-syntax-identifiers">
@@ -109,7 +109,7 @@ INSERT INTO MY_TABLE VALUES (3, 'hi there');
     same lexical structure, meaning that one cannot know whether a
     token is an identifier or a key word without knowing the language.
     A complete list of key words can be found in <xref
-    linkend="sql-keywords-appendix">.
+    linkend="sql-keywords-appendix"/>.
    </para>
 
    <para>
@@ -119,7 +119,7 @@ INSERT INTO MY_TABLE VALUES (3, 'hi there');
     (<literal>_</literal>).  Subsequent characters in an identifier or
     key word can be letters, underscores, digits
     (<literal>0</literal>-<literal>9</literal>), or dollar signs
-    (<literal>$</>).  Note that dollar signs are not allowed in identifiers
+    (<literal>$</literal>).  Note that dollar signs are not allowed in identifiers
     according to the letter of the SQL standard, so their use might render
     applications less portable.
     The SQL standard will not define a key word that contains
@@ -240,7 +240,7 @@ U&amp;"d!0061t!+000061" UESCAPE '!'
 
    <para>
     The Unicode escape syntax works only when the server encoding is
-    <literal>UTF8</>.  When other server encodings are used, only code
+    <literal>UTF8</literal>.  When other server encodings are used, only code
     points in the ASCII range (up to <literal>\007F</literal>) can be
     specified.  Both the 4-digit and the 6-digit form can be used to
     specify UTF-16 surrogate pairs to compose characters with code
@@ -258,7 +258,7 @@ U&amp;"d!0061t!+000061" UESCAPE '!'
     <productname>PostgreSQL</productname>, but
     <literal>"Foo"</literal> and <literal>"FOO"</literal> are
     different from these three and each other.  (The folding of
-    unquoted names to lower case in <productname>PostgreSQL</> is
+    unquoted names to lower case in <productname>PostgreSQL</productname> is
     incompatible with the SQL standard, which says that unquoted names
     should be folded to upper case.  Thus, <literal>foo</literal>
     should be equivalent to <literal>"FOO"</literal> not
@@ -305,8 +305,8 @@ U&amp;"d!0061t!+000061" UESCAPE '!'
      a single-quote character within a string constant,
      write two adjacent single quotes, e.g.,
      <literal>'Dianne''s horse'</literal>.
-     Note that this is <emphasis>not</> the same as a double-quote
-     character (<literal>"</>). <!-- font-lock sanity: " -->
+     Note that this is <emphasis>not</emphasis> the same as a double-quote
+     character (<literal>"</literal>). <!-- font-lock sanity: " -->
     </para>
 
     <para>
@@ -343,17 +343,17 @@ SELECT 'foo'      'bar';
      </indexterm>
 
     <para>
-     <productname>PostgreSQL</productname> also accepts <quote>escape</>
+     <productname>PostgreSQL</productname> also accepts <quote>escape</quote>
      string constants, which are an extension to the SQL standard.
      An escape string constant is specified by writing the letter
      <literal>E</literal> (upper or lower case) just before the opening single
-     quote, e.g., <literal>E'foo'</>.  (When continuing an escape string
-     constant across lines, write <literal>E</> only before the first opening
+     quote, e.g., <literal>E'foo'</literal>.  (When continuing an escape string
+     constant across lines, write <literal>E</literal> only before the first opening
      quote.)
-     Within an escape string, a backslash character (<literal>\</>) begins a
-     C-like <firstterm>backslash escape</> sequence, in which the combination
+     Within an escape string, a backslash character (<literal>\</literal>) begins a
+     C-like <firstterm>backslash escape</firstterm> sequence, in which the combination
      of backslash and following character(s) represent a special byte
-     value, as shown in <xref linkend="sql-backslash-table">.
+     value, as shown in <xref linkend="sql-backslash-table"/>.
     </para>
 
      <table id="sql-backslash-table">
@@ -361,7 +361,7 @@ SELECT 'foo'      'bar';
       <tgroup cols="2">
       <thead>
        <row>
-        <entry>Backslash Escape Sequence</>
+        <entry>Backslash Escape Sequence</entry>
         <entry>Interpretation</entry>
        </row>
       </thead>
@@ -419,9 +419,9 @@ SELECT 'foo'      'bar';
     <para>
      Any other
      character following a backslash is taken literally. Thus, to
-     include a backslash character, write two backslashes (<literal>\\</>).
+     include a backslash character, write two backslashes (<literal>\\</literal>).
      Also, a single quote can be included in an escape string by writing
-     <literal>\'</literal>, in addition to the normal way of <literal>''</>.
+     <literal>\'</literal>, in addition to the normal way of <literal>''</literal>.
     </para>
 
     <para>
@@ -430,44 +430,44 @@ SELECT 'foo'      'bar';
      valid characters in the server character set encoding.  When the
      server encoding is UTF-8, then the Unicode escapes or the
      alternative Unicode escape syntax, explained
-     in <xref linkend="sql-syntax-strings-uescape">, should be used
+     in <xref linkend="sql-syntax-strings-uescape"/>, should be used
      instead.  (The alternative would be doing the UTF-8 encoding by
      hand and writing out the bytes, which would be very cumbersome.)
     </para>
 
     <para>
      The Unicode escape syntax works fully only when the server
-     encoding is <literal>UTF8</>.  When other server encodings are
+     encoding is <literal>UTF8</literal>.  When other server encodings are
      used, only code points in the ASCII range (up
-     to <literal>\u007F</>) can be specified.  Both the 4-digit and
+     to <literal>\u007F</literal>) can be specified.  Both the 4-digit and
      the 8-digit form can be used to specify UTF-16 surrogate pairs to
      compose characters with code points larger than U+FFFF, although
      the availability of the 8-digit form technically makes this
      unnecessary.  (When surrogate pairs are used when the server
-     encoding is <literal>UTF8</>, they are first combined into a
+     encoding is <literal>UTF8</literal>, they are first combined into a
      single code point that is then encoded in UTF-8.)
     </para>
 
     <caution>
     <para>
      If the configuration parameter
-     <xref linkend="guc-standard-conforming-strings"> is <literal>off</>,
+     <xref linkend="guc-standard-conforming-strings"/> is <literal>off</literal>,
      then <productname>PostgreSQL</productname> recognizes backslash escapes
      in both regular and escape string constants.  However, as of
-     <productname>PostgreSQL</> 9.1, the default is <literal>on</>, meaning
+     <productname>PostgreSQL</productname> 9.1, the default is <literal>on</literal>, meaning
      that backslash escapes are recognized only in escape string constants.
      This behavior is more standards-compliant, but might break applications
      which rely on the historical behavior, where backslash escapes
      were always recognized.  As a workaround, you can set this parameter
-     to <literal>off</>, but it is better to migrate away from using backslash
+     to <literal>off</literal>, but it is better to migrate away from using backslash
      escapes.  If you need to use a backslash escape to represent a special
-     character, write the string constant with an <literal>E</>.
+     character, write the string constant with an <literal>E</literal>.
     </para>
 
     <para>
-     In addition to <varname>standard_conforming_strings</>, the configuration
-     parameters <xref linkend="guc-escape-string-warning"> and
-     <xref linkend="guc-backslash-quote"> govern treatment of backslashes
+     In addition to <varname>standard_conforming_strings</varname>, the configuration
+     parameters <xref linkend="guc-escape-string-warning"/> and
+     <xref linkend="guc-backslash-quote"/> govern treatment of backslashes
      in string constants.
     </para>
     </caution>
@@ -525,13 +525,13 @@ U&amp;'d!0061t!+000061' UESCAPE '!'
 
     <para>
      The Unicode escape syntax works only when the server encoding is
-     <literal>UTF8</>.  When other server encodings are used, only
+     <literal>UTF8</literal>.  When other server encodings are used, only
      code points in the ASCII range (up to <literal>\007F</literal>)
      can be specified.  Both the 4-digit and the 6-digit form can be
      used to specify UTF-16 surrogate pairs to compose characters with
      code points larger than U+FFFF, although the availability of the
      6-digit form technically makes this unnecessary.  (When surrogate
-     pairs are used when the server encoding is <literal>UTF8</>, they
+     pairs are used when the server encoding is <literal>UTF8</literal>, they
      are first combined into a single code point that is then encoded
      in UTF-8.)
     </para>
@@ -539,7 +539,7 @@ U&amp;'d!0061t!+000061' UESCAPE '!'
     <para>
      Also, the Unicode escape syntax for string constants only works
      when the configuration
-     parameter <xref linkend="guc-standard-conforming-strings"> is
+     parameter <xref linkend="guc-standard-conforming-strings"/> is
      turned on.  This is because otherwise this syntax could confuse
      clients that parse the SQL statements to the point that it could
      lead to SQL injections and similar security issues.  If the
@@ -573,7 +573,7 @@ U&amp;'d!0061t!+000061' UESCAPE '!'
      sign, an arbitrary sequence of characters that makes up the
      string content, a dollar sign, the same tag that began this
      dollar quote, and a dollar sign. For example, here are two
-     different ways to specify the string <quote>Dianne's horse</>
+     different ways to specify the string <quote>Dianne's horse</quote>
      using dollar quoting:
 <programlisting>
 $$Dianne's horse$$
@@ -598,11 +598,11 @@ BEGIN
 END;
 $function$
 </programlisting>
-     Here, the sequence <literal>$q$[\t\r\n\v\\]$q$</> represents a
-     dollar-quoted literal string <literal>[\t\r\n\v\\]</>, which will
+     Here, the sequence <literal>$q$[\t\r\n\v\\]$q$</literal> represents a
+     dollar-quoted literal string <literal>[\t\r\n\v\\]</literal>, which will
      be recognized when the function body is executed by
-     <productname>PostgreSQL</>.  But since the sequence does not match
-     the outer dollar quoting delimiter <literal>$function$</>, it is
+     <productname>PostgreSQL</productname>.  But since the sequence does not match
+     the outer dollar quoting delimiter <literal>$function$</literal>, it is
      just some more characters within the constant so far as the outer
      string is concerned.
     </para>
@@ -707,13 +707,13 @@ $function$
      <indexterm><primary>bigint</primary></indexterm>
      <indexterm><primary>numeric</primary></indexterm>
      A numeric constant that contains neither a decimal point nor an
-     exponent is initially presumed to be type <type>integer</> if its
-     value fits in type <type>integer</> (32 bits); otherwise it is
-     presumed to be type <type>bigint</> if its
-     value fits in type <type>bigint</> (64 bits); otherwise it is
-     taken to be type <type>numeric</>.  Constants that contain decimal
+     exponent is initially presumed to be type <type>integer</type> if its
+     value fits in type <type>integer</type> (32 bits); otherwise it is
+     presumed to be type <type>bigint</type> if its
+     value fits in type <type>bigint</type> (64 bits); otherwise it is
+     taken to be type <type>numeric</type>.  Constants that contain decimal
      points and/or exponents are always initially presumed to be type
-     <type>numeric</>.
+     <type>numeric</type>.
     </para>
 
     <para>
@@ -724,7 +724,7 @@ $function$
      force a numeric value to be interpreted as a specific data type
      by casting it.<indexterm><primary>type cast</primary></indexterm>
      For example, you can force a numeric value to be treated as type
-     <type>real</> (<type>float4</>) by writing:
+     <type>real</type> (<type>float4</type>) by writing:
 
 <programlisting>
 REAL '1.23'  -- string style
@@ -772,25 +772,25 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
 <replaceable>typename</replaceable> ( '<replaceable>string</replaceable>' )
 </synopsis>
      but not all type names can be used in this way; see <xref
-     linkend="sql-syntax-type-casts"> for details.
+     linkend="sql-syntax-type-casts"/> for details.
     </para>
 
     <para>
      The <literal>::</literal>, <literal>CAST()</literal>, and
      function-call syntaxes can also be used to specify run-time type
      conversions of arbitrary expressions, as discussed in <xref
-     linkend="sql-syntax-type-casts">.  To avoid syntactic ambiguity, the
-     <literal><replaceable>type</> '<replaceable>string</>'</literal>
+     linkend="sql-syntax-type-casts"/>.  To avoid syntactic ambiguity, the
+     <literal><replaceable>type</replaceable> '<replaceable>string</replaceable>'</literal>
      syntax can only be used to specify the type of a simple literal constant.
      Another restriction on the
-     <literal><replaceable>type</> '<replaceable>string</>'</literal>
+     <literal><replaceable>type</replaceable> '<replaceable>string</replaceable>'</literal>
      syntax is that it does not work for array types; use <literal>::</literal>
      or <literal>CAST()</literal> to specify the type of an array constant.
     </para>
 
     <para>
-     The <literal>CAST()</> syntax conforms to SQL.  The
-     <literal><replaceable>type</> '<replaceable>string</>'</literal>
+     The <literal>CAST()</literal> syntax conforms to SQL.  The
+     <literal><replaceable>type</replaceable> '<replaceable>string</replaceable>'</literal>
      syntax is a generalization of the standard: SQL specifies this syntax only
      for a few data types, but <productname>PostgreSQL</productname> allows it
      for all types.  The syntax with
@@ -827,7 +827,7 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
 
      <listitem>
       <para>
-       A multiple-character operator name cannot end in <literal>+</> or <literal>-</>,
+       A multiple-character operator name cannot end in <literal>+</literal> or <literal>-</literal>,
        unless the name also contains at least one of these characters:
 <literallayout>
 ~ ! @ # % ^ &amp; | ` ?
@@ -885,7 +885,7 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
     <listitem>
      <para>
       Brackets (<literal>[]</literal>) are used to select the elements
-      of an array.  See <xref linkend="arrays"> for more information
+      of an array.  See <xref linkend="arrays"/> for more information
       on arrays.
      </para>
     </listitem>
@@ -909,7 +909,7 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
      <para>
       The colon (<literal>:</literal>) is used to select
       <quote>slices</quote> from arrays. (See <xref
-      linkend="arrays">.)  In certain SQL dialects (such as Embedded
+      linkend="arrays"/>.)  In certain SQL dialects (such as Embedded
       SQL), the colon is used to prefix variable names.
      </para>
     </listitem>
@@ -980,8 +980,8 @@ CAST ( '<replaceable>string</replaceable>' AS <replaceable>type</replaceable> )
    </indexterm>
 
    <para>
-    <xref linkend="sql-precedence-table"> shows the precedence and
-    associativity of the operators in <productname>PostgreSQL</>.
+    <xref linkend="sql-precedence-table"/> shows the precedence and
+    associativity of the operators in <productname>PostgreSQL</productname>.
     Most operators have the same precedence and are left-associative.
     The precedence and associativity of the operators is hard-wired
     into the parser.
@@ -1085,8 +1085,8 @@ SELECT (5 !) - 6;
       <row>
        <entry><token>IS</token> <token>ISNULL</token> <token>NOTNULL</token></entry>
        <entry></entry>
-       <entry><literal>IS TRUE</>, <literal>IS FALSE</>, <literal>IS
-       NULL</>, <literal>IS DISTINCT FROM</>, etc</entry>
+       <entry><literal>IS TRUE</literal>, <literal>IS FALSE</literal>, <literal>IS
+       NULL</literal>, <literal>IS DISTINCT FROM</literal>, etc</entry>
       </row>
 
       <row>
@@ -1121,34 +1121,34 @@ SELECT (5 !) - 6;
 
    <para>
     When a schema-qualified operator name is used in the
-    <literal>OPERATOR</> syntax, as for example in:
+    <literal>OPERATOR</literal> syntax, as for example in:
 <programlisting>
 SELECT 3 OPERATOR(pg_catalog.+) 4;
 </programlisting>
-    the <literal>OPERATOR</> construct is taken to have the default precedence
-    shown in <xref linkend="sql-precedence-table"> for
-    <quote>any other operator</>.  This is true no matter
-    which specific operator appears inside <literal>OPERATOR()</>.
+    the <literal>OPERATOR</literal> construct is taken to have the default precedence
+    shown in <xref linkend="sql-precedence-table"/> for
+    <quote>any other operator</quote>.  This is true no matter
+    which specific operator appears inside <literal>OPERATOR()</literal>.
    </para>
 
    <note>
     <para>
-     <productname>PostgreSQL</> versions before 9.5 used slightly different
+     <productname>PostgreSQL</productname> versions before 9.5 used slightly different
      operator precedence rules.  In particular, <token>&lt;=</token>
      <token>&gt;=</token> and <token>&lt;&gt;</token> used to be treated as
-     generic operators; <literal>IS</> tests used to have higher priority;
-     and <literal>NOT BETWEEN</> and related constructs acted inconsistently,
-     being taken in some cases as having the precedence of <literal>NOT</>
-     rather than <literal>BETWEEN</>.  These rules were changed for better
+     generic operators; <literal>IS</literal> tests used to have higher priority;
+     and <literal>NOT BETWEEN</literal> and related constructs acted inconsistently,
+     being taken in some cases as having the precedence of <literal>NOT</literal>
+     rather than <literal>BETWEEN</literal>.  These rules were changed for better
      compliance with the SQL standard and to reduce confusion from
      inconsistent treatment of logically equivalent constructs.  In most
      cases, these changes will result in no behavioral change, or perhaps
-     in <quote>no such operator</> failures which can be resolved by adding
+     in <quote>no such operator</quote> failures which can be resolved by adding
      parentheses.  However there are corner cases in which a query might
      change behavior without any parsing error being reported.  If you are
      concerned about whether these changes have silently broken something,
      you can test your application with the configuration
-     parameter <xref linkend="guc-operator-precedence-warning"> turned on
+     parameter <xref linkend="guc-operator-precedence-warning"/> turned on
      to see if any warnings are logged.
     </para>
    </note>
@@ -1279,7 +1279,7 @@ SELECT 3 OPERATOR(pg_catalog.+) 4;
      <para>
       Another value expression in parentheses (used to group
       subexpressions and override
-      precedence<indexterm><primary>parenthesis</></>)
+      precedence<indexterm><primary>parenthesis</primary></indexterm>)
      </para>
     </listitem>
    </itemizedlist>
@@ -1290,13 +1290,13 @@ SELECT 3 OPERATOR(pg_catalog.+) 4;
    be classified as an expression but do not follow any general syntax
    rules.  These generally have the semantics of a function or
    operator and are explained in the appropriate location in <xref
-   linkend="functions">.  An example is the <literal>IS NULL</literal>
+   linkend="functions"/>.  An example is the <literal>IS NULL</literal>
    clause.
   </para>
 
   <para>
    We have already discussed constants in <xref
-   linkend="sql-syntax-constants">.  The following sections discuss
+   linkend="sql-syntax-constants"/>.  The following sections discuss
    the remaining options.
   </para>
 
@@ -1319,7 +1319,7 @@ SELECT 3 OPERATOR(pg_catalog.+) 4;
     table (possibly qualified with a schema name), or an alias for a table
     defined by means of a <literal>FROM</literal> clause.
     The correlation name and separating dot can be omitted if the column name
-    is unique across all the tables being used in the current query.  (See also <xref linkend="queries">.)
+    is unique across all the tables being used in the current query.  (See also <xref linkend="queries"/>.)
    </para>
   </sect2>
 
@@ -1376,7 +1376,7 @@ CREATE FUNCTION dept(text) RETURNS dept
 <synopsis>
 <replaceable>expression</replaceable>[<replaceable>subscript</replaceable>]
 </synopsis>
-    or multiple adjacent elements (an <quote>array slice</>) can be extracted
+    or multiple adjacent elements (an <quote>array slice</quote>) can be extracted
     by writing
 <synopsis>
 <replaceable>expression</replaceable>[<replaceable>lower_subscript</replaceable>:<replaceable>upper_subscript</replaceable>]
@@ -1402,7 +1402,7 @@ $1[10:42]
 </programlisting>
 
     The parentheses in the last example are required.
-    See <xref linkend="arrays"> for more about arrays.
+    See <xref linkend="arrays"/> for more about arrays.
    </para>
   </sect2>
 
@@ -1443,8 +1443,8 @@ $1.somecolumn
 </programlisting>
 
     The parentheses are required here to show that
-    <structfield>compositecol</> is a column name not a table name,
-    or that <structname>mytable</> is a table name not a schema name
+    <structfield>compositecol</structfield> is a column name not a table name,
+    or that <structname>mytable</structname> is a table name not a schema name
     in the second case.
    </para>
 
@@ -1455,7 +1455,7 @@ $1.somecolumn
 (compositecol).*
 </programlisting>
     This notation behaves differently depending on context;
-    see <xref linkend="rowtypes-usage"> for details.
+    see <xref linkend="rowtypes-usage"/> for details.
    </para>
   </sect2>
 
@@ -1475,15 +1475,15 @@ $1.somecolumn
      <member><replaceable>expression</replaceable> <replaceable>operator</replaceable> (unary postfix operator)</member>
     </simplelist>
     where the <replaceable>operator</replaceable> token follows the syntax
-    rules of <xref linkend="sql-syntax-operators">, or is one of the
+    rules of <xref linkend="sql-syntax-operators"/>, or is one of the
     key words <token>AND</token>, <token>OR</token>, and
     <token>NOT</token>, or is a qualified operator name in the form:
 <synopsis>
-<literal>OPERATOR(</><replaceable>schema</><literal>.</><replaceable>operatorname</><literal>)</>
+<literal>OPERATOR(</literal><replaceable>schema</replaceable><literal>.</literal><replaceable>operatorname</replaceable><literal>)</literal>
 </synopsis>
     Which particular operators exist and whether
     they are unary or binary depends on what operators have been
-    defined by the system or the user.  <xref linkend="functions">
+    defined by the system or the user.  <xref linkend="functions"/>
     describes the built-in operators.
    </para>
   </sect2>
@@ -1514,13 +1514,13 @@ sqrt(2)
    </para>
 
    <para>
-    The list of built-in functions is in <xref linkend="functions">.
+    The list of built-in functions is in <xref linkend="functions"/>.
     Other functions can be added by the user.
    </para>
 
    <para>
     The arguments can optionally have names attached.
-    See <xref linkend="sql-syntax-calling-funcs"> for details.
+    See <xref linkend="sql-syntax-calling-funcs"/> for details.
    </para>
 
    <note>
@@ -1528,11 +1528,11 @@ sqrt(2)
      A function that takes a single argument of composite type can
      optionally be called using field-selection syntax, and conversely
      field selection can be written in functional style.  That is, the
-     notations <literal>col(table)</> and <literal>table.col</> are
+     notations <literal>col(table)</literal> and <literal>table.col</literal> are
      interchangeable.  This behavior is not SQL-standard but is provided
-     in <productname>PostgreSQL</> because it allows use of functions to
-     emulate <quote>computed fields</>.  For more information see
-     <xref linkend="rowtypes-usage">.
+     in <productname>PostgreSQL</productname> because it allows use of functions to
+     emulate <quote>computed fields</quote>.  For more information see
+     <xref linkend="rowtypes-usage"/>.
     </para>
    </note>
   </sect2>
@@ -1592,7 +1592,7 @@ sqrt(2)
     The fourth form invokes the aggregate once for each input row; since no
     particular input value is specified, it is generally only useful
     for the <function>count(*)</function> aggregate function.
-    The last form is used with <firstterm>ordered-set</> aggregate
+    The last form is used with <firstterm>ordered-set</firstterm> aggregate
     functions, which are described below.
    </para>
 
@@ -1607,7 +1607,7 @@ sqrt(2)
     For example, <literal>count(*)</literal> yields the total number
     of input rows; <literal>count(f1)</literal> yields the number of
     input rows in which <literal>f1</literal> is non-null, since
-    <function>count</> ignores nulls; and
+    <function>count</function> ignores nulls; and
     <literal>count(distinct f1)</literal> yields the number of
     distinct non-null values of <literal>f1</literal>.
    </para>
@@ -1615,14 +1615,14 @@ sqrt(2)
    <para>
     Ordinarily, the input rows are fed to the aggregate function in an
     unspecified order.  In many cases this does not matter; for example,
-    <function>min</> produces the same result no matter what order it
+    <function>min</function> produces the same result no matter what order it
     receives the inputs in.  However, some aggregate functions
-    (such as <function>array_agg</> and <function>string_agg</>) produce
+    (such as <function>array_agg</function> and <function>string_agg</function>) produce
     results that depend on the ordering of the input rows.  When using
-    such an aggregate, the optional <replaceable>order_by_clause</> can be
-    used to specify the desired ordering.  The <replaceable>order_by_clause</>
-    has the same syntax as for a query-level <literal>ORDER BY</> clause, as
-    described in <xref linkend="queries-order">, except that its expressions
+    such an aggregate, the optional <replaceable>order_by_clause</replaceable> can be
+    used to specify the desired ordering.  The <replaceable>order_by_clause</replaceable>
+    has the same syntax as for a query-level <literal>ORDER BY</literal> clause, as
+    described in <xref linkend="queries-order"/>, except that its expressions
     are always just expressions and cannot be output-column names or numbers.
     For example:
 <programlisting>
@@ -1632,7 +1632,7 @@ SELECT array_agg(a ORDER BY b DESC) FROM table;
 
    <para>
     When dealing with multiple-argument aggregate functions, note that the
-    <literal>ORDER BY</> clause goes after all the aggregate arguments.
+    <literal>ORDER BY</literal> clause goes after all the aggregate arguments.
     For example, write this:
 <programlisting>
 SELECT string_agg(a, ',' ORDER BY a) FROM table;
@@ -1642,58 +1642,58 @@ SELECT string_agg(a, ',' ORDER BY a) FROM table;
 SELECT string_agg(a ORDER BY a, ',') FROM table;  -- incorrect
 </programlisting>
     The latter is syntactically valid, but it represents a call of a
-    single-argument aggregate function with two <literal>ORDER BY</> keys
+    single-argument aggregate function with two <literal>ORDER BY</literal> keys
     (the second one being rather useless since it's a constant).
    </para>
 
    <para>
-    If <literal>DISTINCT</> is specified in addition to an
-    <replaceable>order_by_clause</>, then all the <literal>ORDER BY</>
+    If <literal>DISTINCT</literal> is specified in addition to an
+    <replaceable>order_by_clause</replaceable>, then all the <literal>ORDER BY</literal>
     expressions must match regular arguments of the aggregate; that is,
     you cannot sort on an expression that is not included in the
-    <literal>DISTINCT</> list.
+    <literal>DISTINCT</literal> list.
    </para>
 
    <note>
     <para>
-     The ability to specify both <literal>DISTINCT</> and <literal>ORDER BY</>
-     in an aggregate function is a <productname>PostgreSQL</> extension.
+     The ability to specify both <literal>DISTINCT</literal> and <literal>ORDER BY</literal>
+     in an aggregate function is a <productname>PostgreSQL</productname> extension.
     </para>
    </note>
 
    <para>
-    Placing <literal>ORDER BY</> within the aggregate's regular argument
+    Placing <literal>ORDER BY</literal> within the aggregate's regular argument
     list, as described so far, is used when ordering the input rows for
     general-purpose and statistical aggregates, for which ordering is
     optional.  There is a
     subclass of aggregate functions called <firstterm>ordered-set
-    aggregates</> for which an <replaceable>order_by_clause</replaceable>
-    is <emphasis>required</>, usually because the aggregate's computation is
+    aggregates</firstterm> for which an <replaceable>order_by_clause</replaceable>
+    is <emphasis>required</emphasis>, usually because the aggregate's computation is
     only sensible in terms of a specific ordering of its input rows.
     Typical examples of ordered-set aggregates include rank and percentile
     calculations.  For an ordered-set aggregate,
     the <replaceable>order_by_clause</replaceable> is written
-    inside <literal>WITHIN GROUP (...)</>, as shown in the final syntax
+    inside <literal>WITHIN GROUP (...)</literal>, as shown in the final syntax
     alternative above.  The expressions in
     the <replaceable>order_by_clause</replaceable> are evaluated once per
     input row just like regular aggregate arguments, sorted as per
     the <replaceable>order_by_clause</replaceable>'s requirements, and fed
     to the aggregate function as input arguments.  (This is unlike the case
-    for a non-<literal>WITHIN GROUP</> <replaceable>order_by_clause</>,
+    for a non-<literal>WITHIN GROUP</literal> <replaceable>order_by_clause</replaceable>,
     which is not treated as argument(s) to the aggregate function.)  The
-    argument expressions preceding <literal>WITHIN GROUP</>, if any, are
-    called <firstterm>direct arguments</> to distinguish them from
-    the <firstterm>aggregated arguments</> listed in
+    argument expressions preceding <literal>WITHIN GROUP</literal>, if any, are
+    called <firstterm>direct arguments</firstterm> to distinguish them from
+    the <firstterm>aggregated arguments</firstterm> listed in
     the <replaceable>order_by_clause</replaceable>.  Unlike regular aggregate
     arguments, direct arguments are evaluated only once per aggregate call,
     not once per input row.  This means that they can contain variables only
-    if those variables are grouped by <literal>GROUP BY</>; this restriction
+    if those variables are grouped by <literal>GROUP BY</literal>; this restriction
     is the same as if the direct arguments were not inside an aggregate
     expression at all.  Direct arguments are typically used for things like
     percentile fractions, which only make sense as a single value per
     aggregation calculation.  The direct argument list can be empty; in this
-    case, write just <literal>()</> not <literal>(*)</>.
-    (<productname>PostgreSQL</> will actually accept either spelling, but
+    case, write just <literal>()</literal> not <literal>(*)</literal>.
+    (<productname>PostgreSQL</productname> will actually accept either spelling, but
     only the first way conforms to the SQL standard.)
    </para>
 
@@ -1712,8 +1712,8 @@ SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 </programlisting>
 
    which obtains the 50th percentile, or median, value of
-   the <structfield>income</> column from table <structname>households</>.
-   Here, <literal>0.5</> is a direct argument; it would make no sense
+   the <structfield>income</structfield> column from table <structname>households</structname>.
+   Here, <literal>0.5</literal> is a direct argument; it would make no sense
    for the percentile fraction to be a value varying across rows.
    </para>
 
@@ -1725,7 +1725,7 @@ SELECT percentile_cont(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 <programlisting>
 SELECT
     count(*) AS unfiltered,
-    count(*) FILTER (WHERE i < 5) AS filtered
+    count(*) FILTER (WHERE i &lt; 5) AS filtered
 FROM generate_series(1,10) AS s(i);
  unfiltered | filtered
 ------------+----------
@@ -1736,22 +1736,22 @@ FROM generate_series(1,10) AS s(i);
 
    <para>
     The predefined aggregate functions are described in <xref
-    linkend="functions-aggregate">.  Other aggregate functions can be added
+    linkend="functions-aggregate"/>.  Other aggregate functions can be added
     by the user.
    </para>
 
    <para>
     An aggregate expression can only appear in the result list or
-    <literal>HAVING</> clause of a <command>SELECT</> command.
-    It is forbidden in other clauses, such as <literal>WHERE</>,
+    <literal>HAVING</literal> clause of a <command>SELECT</command> command.
+    It is forbidden in other clauses, such as <literal>WHERE</literal>,
     because those clauses are logically evaluated before the results
     of aggregates are formed.
    </para>
 
    <para>
     When an aggregate expression appears in a subquery (see
-    <xref linkend="sql-syntax-scalar-subqueries"> and
-    <xref linkend="functions-subquery">), the aggregate is normally
+    <xref linkend="sql-syntax-scalar-subqueries"/> and
+    <xref linkend="functions-subquery"/>), the aggregate is normally
     evaluated over the rows of the subquery.  But an exception occurs
     if the aggregate's arguments (and <replaceable>filter_clause</replaceable>
     if any) contain only outer-level variables:
@@ -1760,7 +1760,7 @@ FROM generate_series(1,10) AS s(i);
     as a whole is then an outer reference for the subquery it appears in,
     and acts as a constant over any one evaluation of that subquery.
     The restriction about
-    appearing only in the result list or <literal>HAVING</> clause
+    appearing only in the result list or <literal>HAVING</literal> clause
     applies with respect to the query level that the aggregate belongs to.
    </para>
   </sect2>
@@ -1784,7 +1784,7 @@ FROM generate_series(1,10) AS s(i);
     to grouping of the selected rows into a single output row &mdash; each
     row remains separate in the query output.  However the window function
     has access to all the rows that would be part of the current row's
-    group according to the grouping specification (<literal>PARTITION BY</>
+    group according to the grouping specification (<literal>PARTITION BY</literal>
     list) of the window function call.
     The syntax of a window function call is one of the following:
 
@@ -1802,20 +1802,27 @@ FROM generate_series(1,10) AS s(i);
 [ ORDER BY <replaceable class="parameter">expression</replaceable> [ ASC | DESC | USING <replaceable class="parameter">operator</replaceable> ] [ NULLS { FIRST | LAST } ] [, ...] ]
 [ <replaceable class="parameter">frame_clause</replaceable> ]
 </synopsis>
-    and the optional <replaceable class="parameter">frame_clause</replaceable>
+    The optional <replaceable class="parameter">frame_clause</replaceable>
     can be one of
 <synopsis>
-{ RANGE | ROWS } <replaceable>frame_start</>
-{ RANGE | ROWS } BETWEEN <replaceable>frame_start</> AND <replaceable>frame_end</>
+{ RANGE | ROWS | GROUPS } <replaceable>frame_start</replaceable> [ <replaceable>frame_exclusion</replaceable> ]
+{ RANGE | ROWS | GROUPS } BETWEEN <replaceable>frame_start</replaceable> AND <replaceable>frame_end</replaceable> [ <replaceable>frame_exclusion</replaceable> ]
 </synopsis>
-    where <replaceable>frame_start</> and <replaceable>frame_end</> can be
-    one of
+    where <replaceable>frame_start</replaceable>
+    and <replaceable>frame_end</replaceable> can be one of
 <synopsis>
 UNBOUNDED PRECEDING
-<replaceable>value</replaceable> PRECEDING
+<replaceable>offset</replaceable> PRECEDING
 CURRENT ROW
-<replaceable>value</replaceable> FOLLOWING
+<replaceable>offset</replaceable> FOLLOWING
 UNBOUNDED FOLLOWING
+</synopsis>
+    and <replaceable>frame_exclusion</replaceable> can be one of
+<synopsis>
+EXCLUDE CURRENT ROW
+EXCLUDE GROUP
+EXCLUDE TIES
+EXCLUDE NO OTHERS
 </synopsis>
    </para>
 
@@ -1830,85 +1837,160 @@ UNBOUNDED FOLLOWING
     Alternatively, a full <replaceable>window_definition</replaceable> can
     be given within parentheses, using the same syntax as for defining a
     named window in the <literal>WINDOW</literal> clause; see the
-    <xref linkend="sql-select"> reference page for details.  It's worth
-    pointing out that <literal>OVER wname</> is not exactly equivalent to
-    <literal>OVER (wname ...)</>; the latter implies copying and modifying the
+    <xref linkend="sql-select"/> reference page for details.  It's worth
+    pointing out that <literal>OVER wname</literal> is not exactly equivalent to
+    <literal>OVER (wname ...)</literal>; the latter implies copying and modifying the
     window definition, and will be rejected if the referenced window
     specification includes a frame clause.
    </para>
 
    <para>
-    The <literal>PARTITION BY</> clause groups the rows of the query into
-    <firstterm>partitions</>, which are processed separately by the window
-    function.  <literal>PARTITION BY</> works similarly to a query-level
-    <literal>GROUP BY</> clause, except that its expressions are always just
+    The <literal>PARTITION BY</literal> clause groups the rows of the query into
+    <firstterm>partitions</firstterm>, which are processed separately by the window
+    function.  <literal>PARTITION BY</literal> works similarly to a query-level
+    <literal>GROUP BY</literal> clause, except that its expressions are always just
     expressions and cannot be output-column names or numbers.
-    Without <literal>PARTITION BY</>, all rows produced by the query are
+    Without <literal>PARTITION BY</literal>, all rows produced by the query are
     treated as a single partition.
-    The <literal>ORDER BY</> clause determines the order in which the rows
+    The <literal>ORDER BY</literal> clause determines the order in which the rows
     of a partition are processed by the window function.  It works similarly
-    to a query-level <literal>ORDER BY</> clause, but likewise cannot use
-    output-column names or numbers.  Without <literal>ORDER BY</>, rows are
+    to a query-level <literal>ORDER BY</literal> clause, but likewise cannot use
+    output-column names or numbers.  Without <literal>ORDER BY</literal>, rows are
     processed in an unspecified order.
    </para>
 
    <para>
     The <replaceable class="parameter">frame_clause</replaceable> specifies
-    the set of rows constituting the <firstterm>window frame</>, which is a
+    the set of rows constituting the <firstterm>window frame</firstterm>, which is a
     subset of the current partition, for those window functions that act on
-    the frame instead of the whole partition.  The frame can be specified in
-    either <literal>RANGE</> or <literal>ROWS</> mode; in either case, it
-    runs from the <replaceable>frame_start</> to the
-    <replaceable>frame_end</>.  If <replaceable>frame_end</> is omitted,
-    it defaults to <literal>CURRENT ROW</>.
+    the frame instead of the whole partition.  The set of rows in the frame
+    can vary depending on which row is the current row.  The frame can be
+    specified in <literal>RANGE</literal>, <literal>ROWS</literal>
+    or <literal>GROUPS</literal> mode; in each case, it runs from
+    the <replaceable>frame_start</replaceable> to
+    the <replaceable>frame_end</replaceable>.
+    If <replaceable>frame_end</replaceable> is omitted, the end defaults
+    to <literal>CURRENT ROW</literal>.
    </para>
 
    <para>
-    A <replaceable>frame_start</> of <literal>UNBOUNDED PRECEDING</> means
+    A <replaceable>frame_start</replaceable> of <literal>UNBOUNDED PRECEDING</literal> means
     that the frame starts with the first row of the partition, and similarly
-    a <replaceable>frame_end</> of <literal>UNBOUNDED FOLLOWING</> means
+    a <replaceable>frame_end</replaceable> of <literal>UNBOUNDED FOLLOWING</literal> means
     that the frame ends with the last row of the partition.
    </para>
 
    <para>
-    In <literal>RANGE</> mode, a <replaceable>frame_start</> of
-    <literal>CURRENT ROW</> means the frame starts with the current row's
-    first <firstterm>peer</> row (a row that <literal>ORDER BY</> considers
-    equivalent to the current row), while a <replaceable>frame_end</> of
-    <literal>CURRENT ROW</> means the frame ends with the last equivalent
-    <literal>ORDER BY</> peer.  In <literal>ROWS</> mode, <literal>CURRENT ROW</> simply means
-    the current row.
+    In <literal>RANGE</literal> or <literal>GROUPS</literal> mode,
+    a <replaceable>frame_start</replaceable> of
+    <literal>CURRENT ROW</literal> means the frame starts with the current
+    row's first <firstterm>peer</firstterm> row (a row that the
+    window's <literal>ORDER BY</literal> clause sorts as equivalent to the
+    current row), while a <replaceable>frame_end</replaceable> of
+    <literal>CURRENT ROW</literal> means the frame ends with the current
+    row's last peer row.
+    In <literal>ROWS</literal> mode, <literal>CURRENT ROW</literal> simply
+    means the current row.
    </para>
 
    <para>
-    The <replaceable>value</> <literal>PRECEDING</> and
-    <replaceable>value</> <literal>FOLLOWING</> cases are currently only
-    allowed in <literal>ROWS</> mode.  They indicate that the frame starts
-    or ends the specified number of rows before or after the current row.
-    <replaceable>value</replaceable> must be an integer expression not
+    In the <replaceable>offset</replaceable> <literal>PRECEDING</literal>
+    and <replaceable>offset</replaceable> <literal>FOLLOWING</literal> frame
+    options, the <replaceable>offset</replaceable> must be an expression not
     containing any variables, aggregate functions, or window functions.
-    The value must not be null or negative; but it can be zero, which
-    just selects the current row.
+    The meaning of the <replaceable>offset</replaceable> depends on the
+    frame mode:
+    <itemizedlist>
+     <listitem>
+      <para>
+       In <literal>ROWS</literal> mode,
+       the <replaceable>offset</replaceable> must yield a non-null,
+       non-negative integer, and the option means that the frame starts or
+       ends the specified number of rows before or after the current row.
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       In <literal>GROUPS</literal> mode,
+       the <replaceable>offset</replaceable> again must yield a non-null,
+       non-negative integer, and the option means that the frame starts or
+       ends the specified number of <firstterm>peer groups</firstterm>
+       before or after the current row's peer group, where a peer group is a
+       set of rows that are equivalent in the <literal>ORDER BY</literal>
+       ordering.  (If there is no <literal>ORDER BY</literal>, the whole
+       partition is one peer group.)
+      </para>
+     </listitem>
+     <listitem>
+      <para>
+       In <literal>RANGE</literal> mode, these options require that
+       the <literal>ORDER BY</literal> clause specify exactly one column.
+       The <replaceable>offset</replaceable> specifies the maximum
+       difference between the value of that column in the current row and
+       its value in preceding or following rows of the frame.  The data type
+       of the <replaceable>offset</replaceable> expression varies depending
+       on the data type of the ordering column.  For numeric ordering
+       columns it is typically of the same type as the ordering column,
+       but for datetime ordering columns it is an <type>interval</type>.
+       For example, if the ordering column is of type <type>date</type>
+       or <type>timestamp</type>, one could write <literal>RANGE BETWEEN
+       '1 day' PRECEDING AND '10 days' FOLLOWING</literal>.
+       The <replaceable>offset</replaceable> is still required to be
+       non-null and non-negative, though the meaning
+       of <quote>non-negative</quote> depends on its data type.
+      </para>
+     </listitem>
+    </itemizedlist>
+    In any case, the distance to the end of the frame is limited by the
+    distance to the end of the partition, so that for rows near the partition
+    ends the frame might contain fewer rows than elsewhere.
+   </para>
+
+   <para>
+    Notice that in both <literal>ROWS</literal> and <literal>GROUPS</literal>
+    mode, <literal>0 PRECEDING</literal> and <literal>0 FOLLOWING</literal>
+    are equivalent to <literal>CURRENT ROW</literal>.  This normally holds
+    in <literal>RANGE</literal> mode as well, for an appropriate
+    data-type-specific meaning of <quote>zero</quote>.
+   </para>
+
+   <para>
+    The <replaceable>frame_exclusion</replaceable> option allows rows around
+    the current row to be excluded from the frame, even if they would be
+    included according to the frame start and frame end options.
+    <literal>EXCLUDE CURRENT ROW</literal> excludes the current row from the
+    frame.
+    <literal>EXCLUDE GROUP</literal> excludes the current row and its
+    ordering peers from the frame.
+    <literal>EXCLUDE TIES</literal> excludes any peers of the current
+    row from the frame, but not the current row itself.
+    <literal>EXCLUDE NO OTHERS</literal> simply specifies explicitly the
+    default behavior of not excluding the current row or its peers.
    </para>
 
    <para>
-    The default framing option is <literal>RANGE UNBOUNDED PRECEDING</>,
+    The default framing option is <literal>RANGE UNBOUNDED PRECEDING</literal>,
     which is the same as <literal>RANGE BETWEEN UNBOUNDED PRECEDING AND
-    CURRENT ROW</>.  With <literal>ORDER BY</>, this sets the frame to be
+    CURRENT ROW</literal>.  With <literal>ORDER BY</literal>, this sets the frame to be
     all rows from the partition start up through the current row's last
-    <literal>ORDER BY</> peer.  Without <literal>ORDER BY</>, all rows of the partition are
-    included in the window frame, since all rows become peers of the current
-    row.
+    <literal>ORDER BY</literal> peer.  Without <literal>ORDER BY</literal>,
+    this means all rows of the partition are included in the window frame,
+    since all rows become peers of the current row.
    </para>
 
    <para>
     Restrictions are that
-    <replaceable>frame_start</> cannot be <literal>UNBOUNDED FOLLOWING</>,
-    <replaceable>frame_end</> cannot be <literal>UNBOUNDED PRECEDING</>,
-    and the <replaceable>frame_end</> choice cannot appear earlier in the
-    above list than the <replaceable>frame_start</> choice &mdash; for example
-    <literal>RANGE BETWEEN CURRENT ROW AND <replaceable>value</>
+    <replaceable>frame_start</replaceable> cannot be <literal>UNBOUNDED FOLLOWING</literal>,
+    <replaceable>frame_end</replaceable> cannot be <literal>UNBOUNDED PRECEDING</literal>,
+    and the <replaceable>frame_end</replaceable> choice cannot appear earlier in the
+    above list of <replaceable>frame_start</replaceable>
+    and <replaceable>frame_end</replaceable> options than
+    the <replaceable>frame_start</replaceable> choice does &mdash; for example
+    <literal>RANGE BETWEEN CURRENT ROW AND <replaceable>offset</replaceable>
     PRECEDING</literal> is not allowed.
+    But, for example, <literal>ROWS BETWEEN 7 PRECEDING AND 8
+    PRECEDING</literal> is allowed, even though it would never select any
+    rows.
    </para>
 
    <para>
@@ -1921,32 +2003,32 @@ UNBOUNDED FOLLOWING
 
    <para>
     The built-in window functions are described in <xref
-    linkend="functions-window-table">.  Other window functions can be added by
+    linkend="functions-window-table"/>.  Other window functions can be added by
     the user.  Also, any built-in or user-defined general-purpose or
     statistical aggregate can be used as a window function.  (Ordered-set
     and hypothetical-set aggregates cannot presently be used as window functions.)
    </para>
 
    <para>
-    The syntaxes using <literal>*</> are used for calling parameter-less
+    The syntaxes using <literal>*</literal> are used for calling parameter-less
     aggregate functions as window functions, for example
-    <literal>count(*) OVER (PARTITION BY x ORDER BY y)</>.
-    The asterisk (<literal>*</>) is customarily not used for
+    <literal>count(*) OVER (PARTITION BY x ORDER BY y)</literal>.
+    The asterisk (<literal>*</literal>) is customarily not used for
     window-specific functions.  Window-specific functions do not
-    allow <literal>DISTINCT</> or <literal>ORDER BY</> to be used within the
+    allow <literal>DISTINCT</literal> or <literal>ORDER BY</literal> to be used within the
     function argument list.
    </para>
 
    <para>
     Window function calls are permitted only in the <literal>SELECT</literal>
-    list and the <literal>ORDER BY</> clause of the query.
+    list and the <literal>ORDER BY</literal> clause of the query.
    </para>
 
    <para>
     More information about window functions can be found in
-    <xref linkend="tutorial-window">,
-    <xref linkend="functions-window">, and
-    <xref linkend="queries-window">.
+    <xref linkend="tutorial-window"/>,
+    <xref linkend="functions-window"/>, and
+    <xref linkend="queries-window"/>.
    </para>
   </sect2>
 
@@ -1974,7 +2056,7 @@ UNBOUNDED FOLLOWING
 CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable> )
 <replaceable>expression</replaceable>::<replaceable>type</replaceable>
 </synopsis>
-    The <literal>CAST</> syntax conforms to SQL; the syntax with
+    The <literal>CAST</literal> syntax conforms to SQL; the syntax with
     <literal>::</literal> is historical <productname>PostgreSQL</productname>
     usage.
    </para>
@@ -1984,7 +2066,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
     represents a run-time type conversion.  The cast will succeed only
     if a suitable type conversion operation has been defined.  Notice that this
     is subtly different from the use of casts with constants, as shown in
-    <xref linkend="sql-syntax-constants-generic">.  A cast applied to an
+    <xref linkend="sql-syntax-constants-generic"/>.  A cast applied to an
     unadorned string literal represents the initial assignment of a type
     to a literal constant value, and so it will succeed for any type
     (if the contents of the string literal are acceptable input syntax for the
@@ -1996,7 +2078,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
     to the type that a value expression must produce (for example, when it is
     assigned to a table column); the system will automatically apply a
     type cast in such cases.  However, automatic casting is only done for
-    casts that are marked <quote>OK to apply implicitly</>
+    casts that are marked <quote>OK to apply implicitly</quote>
     in the system catalogs.  Other casts must be invoked with
     explicit casting syntax.  This restriction is intended to prevent
     surprising conversions from being applied silently.
@@ -2011,8 +2093,8 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
     However, this only works for types whose names are also valid as
     function names.  For example, <literal>double precision</literal>
     cannot be used this way, but the equivalent <literal>float8</literal>
-    can.  Also, the names <literal>interval</>, <literal>time</>, and
-    <literal>timestamp</> can only be used in this fashion if they are
+    can.  Also, the names <literal>interval</literal>, <literal>time</literal>, and
+    <literal>timestamp</literal> can only be used in this fashion if they are
     double-quoted, because of syntactic conflicts.  Therefore, the use of
     the function-like cast syntax leads to inconsistencies and should
     probably be avoided.
@@ -2025,10 +2107,10 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
      conversion, it will internally invoke a registered function to
      perform the conversion.  By convention, these conversion functions
      have the same name as their output type, and thus the <quote>function-like
-     syntax</> is nothing more than a direct invocation of the underlying
+     syntax</quote> is nothing more than a direct invocation of the underlying
      conversion function.  Obviously, this is not something that a portable
      application should rely on.  For further details see
-     <xref linkend="sql-createcast">.
+     <xref linkend="sql-createcast"/>.
     </para>
    </note>
   </sect2>
@@ -2061,7 +2143,7 @@ CAST ( <replaceable>expression</replaceable> AS <replaceable>type</replaceable>
 
    <para>
     The two common uses of the <literal>COLLATE</literal> clause are
-    overriding the sort order in an <literal>ORDER BY</> clause, for
+    overriding the sort order in an <literal>ORDER BY</literal> clause, for
     example:
 <programlisting>
 SELECT a, b, c FROM tbl WHERE ... ORDER BY a COLLATE "C";
@@ -2071,15 +2153,15 @@ SELECT a, b, c FROM tbl WHERE ... ORDER BY a COLLATE "C";
 <programlisting>
 SELECT * FROM tbl WHERE a &gt; 'foo' COLLATE "C";
 </programlisting>
-    Note that in the latter case the <literal>COLLATE</> clause is
+    Note that in the latter case the <literal>COLLATE</literal> clause is
     attached to an input argument of the operator we wish to affect.
     It doesn't matter which argument of the operator or function call the
-    <literal>COLLATE</> clause is attached to, because the collation that is
+    <literal>COLLATE</literal> clause is attached to, because the collation that is
     applied by the operator or function is derived by considering all
-    arguments, and an explicit <literal>COLLATE</> clause will override the
+    arguments, and an explicit <literal>COLLATE</literal> clause will override the
     collations of all other arguments.  (Attaching non-matching
-    <literal>COLLATE</> clauses to more than one argument, however, is an
-    error.  For more details see <xref linkend="collation">.)
+    <literal>COLLATE</literal> clauses to more than one argument, however, is an
+    error.  For more details see <xref linkend="collation"/>.)
     Thus, this gives the same result as the previous example:
 <programlisting>
 SELECT * FROM tbl WHERE a COLLATE "C" &gt; 'foo';
@@ -2089,8 +2171,8 @@ SELECT * FROM tbl WHERE a COLLATE "C" &gt; 'foo';
 SELECT * FROM tbl WHERE (a &gt; 'foo') COLLATE "C";
 </programlisting>
     because it attempts to apply a collation to the result of the
-    <literal>&gt;</> operator, which is of the non-collatable data type
-    <type>boolean</>.
+    <literal>&gt;</literal> operator, which is of the non-collatable data type
+    <type>boolean</type>.
    </para>
   </sect2>
 
@@ -2104,7 +2186,7 @@ SELECT * FROM tbl WHERE (a &gt; 'foo') COLLATE "C";
    <para>
     A scalar subquery is an ordinary
     <command>SELECT</command> query in parentheses that returns exactly one
-    row with one column.  (See <xref linkend="queries"> for information about writing queries.)
+    row with one column.  (See <xref linkend="queries"/> for information about writing queries.)
     The <command>SELECT</command> query is executed
     and the single returned value is used in the surrounding value expression.
     It is an error to use a query that
@@ -2113,7 +2195,7 @@ SELECT * FROM tbl WHERE (a &gt; 'foo') COLLATE "C";
     there is no error; the scalar result is taken to be null.)
     The subquery can refer to variables from the surrounding query,
     which will act as constants during any one evaluation of the subquery.
-    See also <xref linkend="functions-subquery"> for other expressions involving subqueries.
+    See also <xref linkend="functions-subquery"/> for other expressions involving subqueries.
    </para>
 
    <para>
@@ -2143,8 +2225,8 @@ SELECT name, (SELECT max(pop) FROM cities WHERE cities.state = states.name)
     array value using values for its member elements.  A simple array
     constructor
     consists of the key word <literal>ARRAY</literal>, a left square bracket
-    <literal>[</>, a list of expressions (separated by commas) for the
-    array element values, and finally a right square bracket <literal>]</>.
+    <literal>[</literal>, a list of expressions (separated by commas) for the
+    array element values, and finally a right square bracket <literal>]</literal>.
     For example:
 <programlisting>
 SELECT ARRAY[1,2,3+4];
@@ -2155,8 +2237,8 @@ SELECT ARRAY[1,2,3+4];
 </programlisting>
     By default,
     the array element type is the common type of the member expressions,
-    determined using the same rules as for <literal>UNION</> or
-    <literal>CASE</> constructs (see <xref linkend="typeconv-union-case">).
+    determined using the same rules as for <literal>UNION</literal> or
+    <literal>CASE</literal> constructs (see <xref linkend="typeconv-union-case"/>).
     You can override this by explicitly casting the array constructor to the
     desired type, for example:
 <programlisting>
@@ -2168,7 +2250,7 @@ SELECT ARRAY[1,2,22.7]::integer[];
 </programlisting>
     This has the same effect as casting each expression to the array
     element type individually.
-    For more on casting, see <xref linkend="sql-syntax-type-casts">.
+    For more on casting, see <xref linkend="sql-syntax-type-casts"/>.
    </para>
 
    <para>
@@ -2193,13 +2275,13 @@ SELECT ARRAY[[1,2],[3,4]];
 
     Since multidimensional arrays must be rectangular, inner constructors
     at the same level must produce sub-arrays of identical dimensions.
-    Any cast applied to the outer <literal>ARRAY</> constructor propagates
+    Any cast applied to the outer <literal>ARRAY</literal> constructor propagates
     automatically to all the inner constructors.
   </para>
 
   <para>
     Multidimensional array constructor elements can be anything yielding
-    an array of the proper kind, not only a sub-<literal>ARRAY</> construct.
+    an array of the proper kind, not only a sub-<literal>ARRAY</literal> construct.
     For example:
 <programlisting>
 CREATE TABLE arr(f1 int[], f2 int[]);
@@ -2259,7 +2341,7 @@ SELECT ARRAY(SELECT ARRAY[i, i*2] FROM generate_series(1,5) AS a(i));
   <para>
    The subscripts of an array value built with <literal>ARRAY</literal>
    always begin with one.  For more information about arrays, see
-   <xref linkend="arrays">.
+   <xref linkend="arrays"/>.
   </para>
 
   </sect2>
@@ -2291,7 +2373,7 @@ SELECT ARRAY(SELECT ARRAY[i, i*2] FROM generate_series(1,5) AS a(i));
 <programlisting>
 SELECT ROW(1,2.5,'this is a test');
 </programlisting>
-    The key word <literal>ROW</> is optional when there is more than one
+    The key word <literal>ROW</literal> is optional when there is more than one
     expression in the list.
    </para>
 
@@ -2299,10 +2381,10 @@ SELECT ROW(1,2.5,'this is a test');
     A row constructor can include the syntax
     <replaceable>rowvalue</replaceable><literal>.*</literal>,
     which will be expanded to a list of the elements of the row value,
-    just as occurs when the <literal>.*</> syntax is used at the top level
-    of a <command>SELECT</> list (see <xref linkend="rowtypes-usage">).
-    For example, if table <literal>t</> has
-    columns <literal>f1</> and <literal>f2</>, these are the same:
+    just as occurs when the <literal>.*</literal> syntax is used at the top level
+    of a <command>SELECT</command> list (see <xref linkend="rowtypes-usage"/>).
+    For example, if table <literal>t</literal> has
+    columns <literal>f1</literal> and <literal>f2</literal>, these are the same:
 <programlisting>
 SELECT ROW(t.*, 42) FROM t;
 SELECT ROW(t.f1, t.f2, 42) FROM t;
@@ -2313,19 +2395,19 @@ SELECT ROW(t.f1, t.f2, 42) FROM t;
     <para>
      Before <productname>PostgreSQL</productname> 8.2, the
      <literal>.*</literal> syntax was not expanded in row constructors, so
-     that writing <literal>ROW(t.*, 42)</> created a two-field row whose first
+     that writing <literal>ROW(t.*, 42)</literal> created a two-field row whose first
      field was another row value.  The new behavior is usually more useful.
      If you need the old behavior of nested row values, write the inner
      row value without <literal>.*</literal>, for instance
-     <literal>ROW(t, 42)</>.
+     <literal>ROW(t, 42)</literal>.
     </para>
    </note>
 
    <para>
-    By default, the value created by a <literal>ROW</> expression is of
+    By default, the value created by a <literal>ROW</literal> expression is of
     an anonymous record type.  If necessary, it can be cast to a named
     composite type &mdash; either the row type of a table, or a composite type
-    created with <command>CREATE TYPE AS</>.  An explicit cast might be needed
+    created with <command>CREATE TYPE AS</command>.  An explicit cast might be needed
     to avoid ambiguity.  For example:
 <programlisting>
 CREATE TABLE mytable(f1 int, f2 float, f3 text);
@@ -2366,15 +2448,15 @@ SELECT getf1(CAST(ROW(11,'this is a test',2.5) AS myrowtype));
    in a composite-type table column, or to be passed to a function that
    accepts a composite parameter.  Also,
    it is possible to compare two row values or test a row with
-   <literal>IS NULL</> or <literal>IS NOT NULL</>, for example:
+   <literal>IS NULL</literal> or <literal>IS NOT NULL</literal>, for example:
 <programlisting>
 SELECT ROW(1,2.5,'this is a test') = ROW(1, 3, 'not the same');
 
 SELECT ROW(table.*) IS NULL FROM table;  -- detect all-null rows
 </programlisting>
-   For more detail see <xref linkend="functions-comparisons">.
+   For more detail see <xref linkend="functions-comparisons"/>.
    Row constructors can also be used in connection with subqueries,
-   as discussed in <xref linkend="functions-subquery">.
+   as discussed in <xref linkend="functions-subquery"/>.
   </para>
 
   </sect2>
@@ -2413,18 +2495,18 @@ SELECT somefunc() OR true;
    <para>
     As a consequence, it is unwise to use functions with side effects
     as part of complex expressions.  It is particularly dangerous to
-    rely on side effects or evaluation order in <literal>WHERE</> and <literal>HAVING</> clauses,
+    rely on side effects or evaluation order in <literal>WHERE</literal> and <literal>HAVING</literal> clauses,
     since those clauses are extensively reprocessed as part of
     developing an execution plan.  Boolean
-    expressions (<literal>AND</>/<literal>OR</>/<literal>NOT</> combinations) in those clauses can be reorganized
+    expressions (<literal>AND</literal>/<literal>OR</literal>/<literal>NOT</literal> combinations) in those clauses can be reorganized
     in any manner allowed by the laws of Boolean algebra.
    </para>
 
    <para>
-    When it is essential to force evaluation order, a <literal>CASE</>
-    construct (see <xref linkend="functions-conditional">) can be
+    When it is essential to force evaluation order, a <literal>CASE</literal>
+    construct (see <xref linkend="functions-conditional"/>) can be
     used.  For example, this is an untrustworthy way of trying to
-    avoid division by zero in a <literal>WHERE</> clause:
+    avoid division by zero in a <literal>WHERE</literal> clause:
 <programlisting>
 SELECT ... WHERE x &gt; 0 AND y/x &gt; 1.5;
 </programlisting>
@@ -2432,17 +2514,17 @@ SELECT ... WHERE x &gt; 0 AND y/x &gt; 1.5;
 <programlisting>
 SELECT ... WHERE CASE WHEN x &gt; 0 THEN y/x &gt; 1.5 ELSE false END;
 </programlisting>
-    A <literal>CASE</> construct used in this fashion will defeat optimization
+    A <literal>CASE</literal> construct used in this fashion will defeat optimization
     attempts, so it should only be done when necessary.  (In this particular
     example, it would be better to sidestep the problem by writing
-    <literal>y &gt; 1.5*x</> instead.)
+    <literal>y &gt; 1.5*x</literal> instead.)
    </para>
 
    <para>
-    <literal>CASE</> is not a cure-all for such issues, however.
+    <literal>CASE</literal> is not a cure-all for such issues, however.
     One limitation of the technique illustrated above is that it does not
     prevent early evaluation of constant subexpressions.
-    As described in <xref linkend="xfunc-volatility">, functions and
+    As described in <xref linkend="xfunc-volatility"/>, functions and
     operators marked <literal>IMMUTABLE</literal> can be evaluated when
     the query is planned rather than when it is executed.  Thus for example
 <programlisting>
@@ -2450,8 +2532,8 @@ SELECT CASE WHEN x &gt; 0 THEN x ELSE 1/0 END FROM tab;
 </programlisting>
     is likely to result in a division-by-zero failure due to the planner
     trying to simplify the constant subexpression,
-    even if every row in the table has <literal>x &gt; 0</> so that the
-    <literal>ELSE</> arm would never be entered at run time.
+    even if every row in the table has <literal>x &gt; 0</literal> so that the
+    <literal>ELSE</literal> arm would never be entered at run time.
    </para>
 
    <para>
@@ -2459,17 +2541,17 @@ SELECT CASE WHEN x &gt; 0 THEN x ELSE 1/0 END FROM tab;
     obviously involve constants can occur in queries executed within
     functions, since the values of function arguments and local variables
     can be inserted into queries as constants for planning purposes.
-    Within <application>PL/pgSQL</> functions, for example, using an
-    <literal>IF</>-<literal>THEN</>-<literal>ELSE</> statement to protect
+    Within <application>PL/pgSQL</application> functions, for example, using an
+    <literal>IF</literal>-<literal>THEN</literal>-<literal>ELSE</literal> statement to protect
     a risky computation is much safer than just nesting it in a
-    <literal>CASE</> expression.
+    <literal>CASE</literal> expression.
    </para>
 
    <para>
-    Another limitation of the same kind is that a <literal>CASE</> cannot
+    Another limitation of the same kind is that a <literal>CASE</literal> cannot
     prevent evaluation of an aggregate expression contained within it,
     because aggregate expressions are computed before other
-    expressions in a <literal>SELECT</> list or <literal>HAVING</> clause
+    expressions in a <literal>SELECT</literal> list or <literal>HAVING</literal> clause
     are considered.  For example, the following query can cause a
     division-by-zero error despite seemingly having protected against it:
 <programlisting>
@@ -2478,12 +2560,12 @@ SELECT CASE WHEN min(employees) > 0
        END
     FROM departments;
 </programlisting>
-    The <function>min()</> and <function>avg()</> aggregates are computed
+    The <function>min()</function> and <function>avg()</function> aggregates are computed
     concurrently over all the input rows, so if any row
-    has <structfield>employees</> equal to zero, the division-by-zero error
+    has <structfield>employees</structfield> equal to zero, the division-by-zero error
     will occur before there is any opportunity to test the result of
-    <function>min()</>.  Instead, use a <literal>WHERE</>
-    or <literal>FILTER</> clause to prevent problematic input rows from
+    <function>min()</function>.  Instead, use a <literal>WHERE</literal>
+    or <literal>FILTER</literal> clause to prevent problematic input rows from
     reaching an aggregate function in the first place.
    </para>
   </sect2>
@@ -2547,7 +2629,7 @@ LANGUAGE SQL IMMUTABLE STRICT;
     <literal>b</literal> inputs will be concatenated, and forced to either
     upper or lower case depending on the <literal>uppercase</literal>
     parameter.  The remaining details of this function
-    definition are not important here (see <xref linkend="extend"> for
+    definition are not important here (see <xref linkend="extend"/> for
     more information).
    </para>
 
@@ -2657,7 +2739,7 @@ SELECT concat_lower_or_upper('Hello', 'World', uppercase =&gt; true);
 </screen>
     In the above query, the arguments <literal>a</literal> and
     <literal>b</literal> are specified positionally, while
-    <literal>uppercase</> is specified by name.  In this example,
+    <literal>uppercase</literal> is specified by name.  In this example,
     that adds little except documentation.  With a more complex function
     having numerous parameters that have default values, named or mixed
     notation can save a great deal of writing and reduce chances for error.
diff --git a/doc/src/sgml/tablefunc.sgml b/doc/src/sgml/tablefunc.sgml
index 90f6df9545..007e9c62f5 100644
--- a/doc/src/sgml/tablefunc.sgml
+++ b/doc/src/sgml/tablefunc.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>tablefunc</> module includes various functions that return
+  The <filename>tablefunc</filename> module includes various functions that return
   tables (that is, multiple rows).  These functions are useful both in their
   own right and as examples of how to write C functions that return
   multiple rows.
@@ -18,12 +18,12 @@
   <title>Functions Provided</title>
 
   <para>
-   <xref linkend="tablefunc-functions"> shows the functions provided
+   <xref linkend="tablefunc-functions"/> shows the functions provided
    by the <filename>tablefunc</filename> module.
   </para>
 
   <table id="tablefunc-functions">
-   <title><filename>tablefunc</> Functions</title>
+   <title><filename>tablefunc</filename> Functions</title>
    <tgroup cols="3">
     <thead>
      <row>
@@ -35,46 +35,46 @@
     <tbody>
      <row>
       <entry><function>normal_rand(int numvals, float8 mean, float8 stddev)</function></entry>
-      <entry><type>setof float8</></entry>
+      <entry><type>setof float8</type></entry>
       <entry>
        Produces a set of normally distributed random values
       </entry>
      </row>
      <row>
       <entry><function>crosstab(text sql)</function></entry>
-      <entry><type>setof record</></entry>
+      <entry><type>setof record</type></entry>
       <entry>
-       Produces a <quote>pivot table</> containing
-       row names plus <replaceable>N</> value columns, where
-       <replaceable>N</> is determined by the row type specified in the calling
+       Produces a <quote>pivot table</quote> containing
+       row names plus <replaceable>N</replaceable> value columns, where
+       <replaceable>N</replaceable> is determined by the row type specified in the calling
        query
       </entry>
      </row>
      <row>
-      <entry><function>crosstab<replaceable>N</>(text sql)</function></entry>
-      <entry><type>setof table_crosstab_<replaceable>N</></></entry>
+      <entry><function>crosstab<replaceable>N</replaceable>(text sql)</function></entry>
+      <entry><type>setof table_crosstab_<replaceable>N</replaceable></type></entry>
       <entry>
-       Produces a <quote>pivot table</> containing
-       row names plus <replaceable>N</> value columns.
-       <function>crosstab2</>, <function>crosstab3</>, and
-       <function>crosstab4</> are predefined, but you can create additional
-       <function>crosstab<replaceable>N</></> functions as described below
+       Produces a <quote>pivot table</quote> containing
+       row names plus <replaceable>N</replaceable> value columns.
+       <function>crosstab2</function>, <function>crosstab3</function>, and
+       <function>crosstab4</function> are predefined, but you can create additional
+       <function>crosstab<replaceable>N</replaceable></function> functions as described below
       </entry>
      </row>
      <row>
       <entry><function>crosstab(text source_sql, text category_sql)</function></entry>
-      <entry><type>setof record</></entry>
+      <entry><type>setof record</type></entry>
       <entry>
-       Produces a <quote>pivot table</>
+       Produces a <quote>pivot table</quote>
        with the value columns specified by a second query
       </entry>
      </row>
      <row>
       <entry><function>crosstab(text sql, int N)</function></entry>
-      <entry><type>setof record</></entry>
+      <entry><type>setof record</type></entry>
       <entry>
-       <para>Obsolete version of <function>crosstab(text)</>.
-        The parameter <replaceable>N</> is now ignored, since the number of
+       <para>Obsolete version of <function>crosstab(text)</function>.
+        The parameter <replaceable>N</replaceable> is now ignored, since the number of
         value columns is always determined by the calling query
        </para>
       </entry>
@@ -88,7 +88,7 @@
        </function>
        <indexterm><primary>connectby</primary></indexterm>
       </entry>
-      <entry><type>setof record</></entry>
+      <entry><type>setof record</type></entry>
       <entry>
        Produces a representation of a hierarchical tree structure
       </entry>
@@ -109,7 +109,7 @@ normal_rand(int numvals, float8 mean, float8 stddev) returns setof float8
 </synopsis>
 
     <para>
-     <function>normal_rand</> produces a set of normally distributed random
+     <function>normal_rand</function> produces a set of normally distributed random
      values (Gaussian distribution).
     </para>
 
@@ -157,7 +157,7 @@ crosstab(text sql, int N)
 </synopsis>
 
    <para>
-    The <function>crosstab</> function is used to produce <quote>pivot</>
+    The <function>crosstab</function> function is used to produce <quote>pivot</quote>
     displays, wherein data is listed across the page rather than down.
     For example, we might have data like
 <programlisting>
@@ -176,7 +176,7 @@ row1    val11   val12   val13   ...
 row2    val21   val22   val23   ...
 ...
 </programlisting>
-    The <function>crosstab</> function takes a text parameter that is a SQL
+    The <function>crosstab</function> function takes a text parameter that is a SQL
     query producing raw data formatted in the first way, and produces a table
     formatted in the second way.
    </para>
@@ -209,9 +209,9 @@ row2    val21   val22   val23   ...
    </para>
 
    <para>
-    The <function>crosstab</> function is declared to return <type>setof
+    The <function>crosstab</function> function is declared to return <type>setof
     record</type>, so the actual names and types of the output columns must be
-    defined in the <literal>FROM</> clause of the calling <command>SELECT</>
+    defined in the <literal>FROM</literal> clause of the calling <command>SELECT</command>
     statement, for example:
 <programlisting>
 SELECT * FROM crosstab('...') AS ct(row_name text, category_1 text, category_2 text);
@@ -227,30 +227,30 @@ SELECT * FROM crosstab('...') AS ct(row_name text, category_1 text, category_2 t
    </para>
 
    <para>
-    The <literal>FROM</> clause must define the output as one
-    <structfield>row_name</> column (of the same data type as the first result
-    column of the SQL query) followed by N <structfield>value</> columns
+    The <literal>FROM</literal> clause must define the output as one
+    <structfield>row_name</structfield> column (of the same data type as the first result
+    column of the SQL query) followed by N <structfield>value</structfield> columns
     (all of the same data type as the third result column of the SQL query).
     You can set up as many output value columns as you wish.  The names of the
     output columns are up to you.
    </para>
 
    <para>
-    The <function>crosstab</> function produces one output row for each
+    The <function>crosstab</function> function produces one output row for each
     consecutive group of input rows with the same
     <structfield>row_name</structfield> value.  It fills the output
-    <structfield>value</> columns, left to right, with the
+    <structfield>value</structfield> columns, left to right, with the
     <structfield>value</structfield> fields from these rows.  If there
-    are fewer rows in a group than there are output <structfield>value</>
+    are fewer rows in a group than there are output <structfield>value</structfield>
     columns, the extra output columns are filled with nulls; if there are
     more rows, the extra input rows are skipped.
    </para>
 
    <para>
-    In practice the SQL query should always specify <literal>ORDER BY 1,2</>
+    In practice the SQL query should always specify <literal>ORDER BY 1,2</literal>
     to ensure that the input rows are properly ordered, that is, values with
     the same <structfield>row_name</structfield> are brought together and
-    correctly ordered within the row.  Notice that <function>crosstab</>
+    correctly ordered within the row.  Notice that <function>crosstab</function>
     itself does not pay any attention to the second column of the query
     result; it's just there to be ordered by, to control the order in which
     the third-column values appear across the page.
@@ -286,41 +286,41 @@ AS ct(row_name text, category_1 text, category_2 text, category_3 text);
    </para>
 
    <para>
-    You can avoid always having to write out a <literal>FROM</> clause to
+    You can avoid always having to write out a <literal>FROM</literal> clause to
     define the output columns, by setting up a custom crosstab function that
     has the desired output row type wired into its definition.  This is
     described in the next section.  Another possibility is to embed the
-    required <literal>FROM</> clause in a view definition.
+    required <literal>FROM</literal> clause in a view definition.
    </para>
 
    <note>
     <para>
-     See also the <command><link linkend="APP-PSQL-meta-commands-crosstabview">\crosstabview</link></command>
-     command in <application>psql</>, which provides functionality similar
-     to <function>crosstab()</>.
+     See also the <command><link linkend="app-psql-meta-commands-crosstabview">\crosstabview</link></command>
+     command in <application>psql</application>, which provides functionality similar
+     to <function>crosstab()</function>.
     </para>
    </note>
 
   </sect3>
 
   <sect3>
-   <title><function>crosstab<replaceable>N</>(text)</function></title>
+   <title><function>crosstab<replaceable>N</replaceable>(text)</function></title>
 
    <indexterm>
     <primary>crosstab</primary>
    </indexterm>
 
 <synopsis>
-crosstab<replaceable>N</>(text sql)
+crosstab<replaceable>N</replaceable>(text sql)
 </synopsis>
 
     <para>
-     The <function>crosstab<replaceable>N</></> functions are examples of how
-     to set up custom wrappers for the general <function>crosstab</> function,
+     The <function>crosstab<replaceable>N</replaceable></function> functions are examples of how
+     to set up custom wrappers for the general <function>crosstab</function> function,
      so that you need not write out column names and types in the calling
-     <command>SELECT</> query.  The <filename>tablefunc</> module includes
-     <function>crosstab2</>, <function>crosstab3</>, and
-     <function>crosstab4</>, whose output row types are defined as
+     <command>SELECT</command> query.  The <filename>tablefunc</filename> module includes
+     <function>crosstab2</function>, <function>crosstab3</function>, and
+     <function>crosstab4</function>, whose output row types are defined as
     </para>
 
 <programlisting>
@@ -337,10 +337,10 @@ CREATE TYPE tablefunc_crosstab_N AS (
 
     <para>
      Thus, these functions can be used directly when the input query produces
-     <structfield>row_name</> and <structfield>value</> columns of type
-     <type>text</>, and you want 2, 3, or 4 output values columns.
+     <structfield>row_name</structfield> and <structfield>value</structfield> columns of type
+     <type>text</type>, and you want 2, 3, or 4 output values columns.
      In all other ways they behave exactly as described above for the
-     general <function>crosstab</> function.
+     general <function>crosstab</function> function.
     </para>
 
     <para>
@@ -359,7 +359,7 @@ FROM crosstab3(
     <para>
      These functions are provided mostly for illustration purposes. You
      can create your own return types and functions based on the
-     underlying <function>crosstab()</> function.  There are two ways
+     underlying <function>crosstab()</function> function.  There are two ways
      to do it:
 
     <itemizedlist>
@@ -367,13 +367,13 @@ FROM crosstab3(
       <para>
        Create a composite type describing the desired output columns,
        similar to the examples in
-       <filename>contrib/tablefunc/tablefunc--1.0.sql</>.
+       <filename>contrib/tablefunc/tablefunc--1.0.sql</filename>.
        Then define a
-       unique function name accepting one <type>text</> parameter and returning
-       <type>setof your_type_name</>, but linking to the same underlying
-       <function>crosstab</> C function.  For example, if your source data
-       produces row names that are <type>text</>, and values that are
-       <type>float8</>, and you want 5 value columns:
+       unique function name accepting one <type>text</type> parameter and returning
+       <type>setof your_type_name</type>, but linking to the same underlying
+       <function>crosstab</function> C function.  For example, if your source data
+       produces row names that are <type>text</type>, and values that are
+       <type>float8</type>, and you want 5 value columns:
 <programlisting>
 CREATE TYPE my_crosstab_float8_5_cols AS (
     my_row_name text,
@@ -393,7 +393,7 @@ CREATE OR REPLACE FUNCTION crosstab_float8_5_cols(text)
 
      <listitem>
       <para>
-       Use <literal>OUT</> parameters to define the return type implicitly.
+       Use <literal>OUT</literal> parameters to define the return type implicitly.
        The same example could also be done this way:
 <programlisting>
 CREATE OR REPLACE FUNCTION crosstab_float8_5_cols(
@@ -426,12 +426,12 @@ crosstab(text source_sql, text category_sql)
 </synopsis>
 
    <para>
-    The main limitation of the single-parameter form of <function>crosstab</>
+    The main limitation of the single-parameter form of <function>crosstab</function>
     is that it treats all values in a group alike, inserting each value into
     the first available column.  If you want the value
     columns to correspond to specific categories of data, and some groups
     might not have data for some of the categories, that doesn't work well.
-    The two-parameter form of <function>crosstab</> handles this case by
+    The two-parameter form of <function>crosstab</function> handles this case by
     providing an explicit list of the categories corresponding to the
     output columns.
    </para>
@@ -447,7 +447,7 @@ crosstab(text source_sql, text category_sql)
     <structfield>category</structfield> and <structfield>value</structfield>
     columns must be the last two columns, in that order.  Any columns between
     <structfield>row_name</structfield> and
-    <structfield>category</structfield> are treated as <quote>extra</>.
+    <structfield>category</structfield> are treated as <quote>extra</quote>.
     The <quote>extra</quote> columns are expected to be the same for all rows
     with the same <structfield>row_name</structfield> value.
    </para>
@@ -489,9 +489,9 @@ SELECT DISTINCT cat FROM foo ORDER BY 1;
    </para>
 
    <para>
-    The <function>crosstab</> function is declared to return <type>setof
+    The <function>crosstab</function> function is declared to return <type>setof
     record</type>, so the actual names and types of the output columns must be
-    defined in the <literal>FROM</> clause of the calling <command>SELECT</>
+    defined in the <literal>FROM</literal> clause of the calling <command>SELECT</command>
     statement, for example:
 
 <programlisting>
@@ -512,25 +512,25 @@ row_name   extra   cat1   cat2   cat3   cat4
    </para>
 
    <para>
-    The <literal>FROM</> clause must define the proper number of output
-    columns of the proper data types.  If there are <replaceable>N</>
-    columns in the <parameter>source_sql</> query's result, the first
-    <replaceable>N</>-2 of them must match up with the first
-    <replaceable>N</>-2 output columns.  The remaining output columns
-    must have the type of the last column of the <parameter>source_sql</>
+    The <literal>FROM</literal> clause must define the proper number of output
+    columns of the proper data types.  If there are <replaceable>N</replaceable>
+    columns in the <parameter>source_sql</parameter> query's result, the first
+    <replaceable>N</replaceable>-2 of them must match up with the first
+    <replaceable>N</replaceable>-2 output columns.  The remaining output columns
+    must have the type of the last column of the <parameter>source_sql</parameter>
     query's result, and there must be exactly as many of them as there
     are rows in the <parameter>category_sql</parameter> query's result.
    </para>
 
    <para>
-    The <function>crosstab</> function produces one output row for each
+    The <function>crosstab</function> function produces one output row for each
     consecutive group of input rows with the same
     <structfield>row_name</structfield> value.  The output
-    <structfield>row_name</structfield> column, plus any <quote>extra</>
+    <structfield>row_name</structfield> column, plus any <quote>extra</quote>
     columns, are copied from the first row of the group.  The output
-    <structfield>value</> columns are filled with the
+    <structfield>value</structfield> columns are filled with the
     <structfield>value</structfield> fields from rows having matching
-    <structfield>category</> values.  If a row's <structfield>category</>
+    <structfield>category</structfield> values.  If a row's <structfield>category</structfield>
     does not match any output of the <parameter>category_sql</parameter>
     query, its <structfield>value</structfield> is ignored.  Output
     columns whose matching category is not present in any input row
@@ -539,7 +539,7 @@ row_name   extra   cat1   cat2   cat3   cat4
 
    <para>
     In practice the <parameter>source_sql</parameter> query should always
-    specify <literal>ORDER BY 1</> to ensure that values with the same
+    specify <literal>ORDER BY 1</literal> to ensure that values with the same
     <structfield>row_name</structfield> are brought together.  However,
     ordering of the categories within a group is not important.
     Also, it is essential to be sure that the order of the
@@ -619,7 +619,7 @@ AS
     You can create predefined functions to avoid having to write out
     the result column names and types in each query.  See the examples
     in the previous section.  The underlying C function for this form
-    of <function>crosstab</> is named <literal>crosstab_hash</>.
+    of <function>crosstab</function> is named <literal>crosstab_hash</literal>.
    </para>
 
   </sect3>
@@ -638,15 +638,15 @@ connectby(text relname, text keyid_fld, text parent_keyid_fld
 </synopsis>
 
    <para>
-    The <function>connectby</> function produces a display of hierarchical
+    The <function>connectby</function> function produces a display of hierarchical
     data that is stored in a table.  The table must have a key field that
     uniquely identifies rows, and a parent-key field that references the
-    parent (if any) of each row.  <function>connectby</> can display the
+    parent (if any) of each row.  <function>connectby</function> can display the
     sub-tree descending from any row.
    </para>
 
    <para>
-    <xref linkend="tablefunc-connectby-parameters"> explains the
+    <xref linkend="tablefunc-connectby-parameters"/> explains the
     parameters.
    </para>
 
@@ -694,14 +694,14 @@ connectby(text relname, text keyid_fld, text parent_keyid_fld
 
     <para>
      The key and parent-key fields can be any data type, but they must be
-     the same type.  Note that the <parameter>start_with</> value must be
+     the same type.  Note that the <parameter>start_with</parameter> value must be
      entered as a text string, regardless of the type of the key field.
     </para>
 
     <para>
-     The <function>connectby</> function is declared to return <type>setof
+     The <function>connectby</function> function is declared to return <type>setof
      record</type>, so the actual names and types of the output columns must be
-     defined in the <literal>FROM</> clause of the calling <command>SELECT</>
+     defined in the <literal>FROM</literal> clause of the calling <command>SELECT</command>
      statement, for example:
     </para>
 
@@ -714,15 +714,15 @@ SELECT * FROM connectby('connectby_tree', 'keyid', 'parent_keyid', 'pos', 'row2'
      The first two output columns are used for the current row's key and
      its parent row's key; they must match the type of the table's key field.
      The third output column is the depth in the tree and must be of type
-     <type>integer</>.  If a <parameter>branch_delim</parameter> parameter was
+     <type>integer</type>.  If a <parameter>branch_delim</parameter> parameter was
      given, the next output column is the branch display and must be of type
-     <type>text</>.  Finally, if an <parameter>orderby_fld</parameter>
+     <type>text</type>.  Finally, if an <parameter>orderby_fld</parameter>
      parameter was given, the last output column is a serial number, and must
-     be of type <type>integer</>.
+     be of type <type>integer</type>.
     </para>
 
     <para>
-     The <quote>branch</> output column shows the path of keys taken to
+     The <quote>branch</quote> output column shows the path of keys taken to
      reach the current row.  The keys are separated by the specified
      <parameter>branch_delim</parameter> string.  If no branch display is
      wanted, omit both the <parameter>branch_delim</parameter> parameter
@@ -740,7 +740,7 @@ SELECT * FROM connectby('connectby_tree', 'keyid', 'parent_keyid', 'pos', 'row2'
 
     <para>
      The parameters representing table and field names are copied as-is
-     into the SQL queries that <function>connectby</> generates internally.
+     into the SQL queries that <function>connectby</function> generates internally.
      Therefore, include double quotes if the names are mixed-case or contain
      special characters.  You may also need to schema-qualify the table name.
     </para>
@@ -752,10 +752,10 @@ SELECT * FROM connectby('connectby_tree', 'keyid', 'parent_keyid', 'pos', 'row2'
 
     <para>
      It is important that the <parameter>branch_delim</parameter> string
-     not appear in any key values, else <function>connectby</> may incorrectly
+     not appear in any key values, else <function>connectby</function> may incorrectly
      report an infinite-recursion error.  Note that if
      <parameter>branch_delim</parameter> is not provided, a default value
-     of <literal>~</> is used for recursion detection purposes.
+     of <literal>~</literal> is used for recursion detection purposes.
      <!-- That pretty well sucks.  FIXME -->
     </para>
 
diff --git a/doc/src/sgml/tablesample-method.sgml b/doc/src/sgml/tablesample-method.sgml
index 22f8bbe19a..b84b7ba885 100644
--- a/doc/src/sgml/tablesample-method.sgml
+++ b/doc/src/sgml/tablesample-method.sgml
@@ -12,11 +12,11 @@
  </indexterm>
 
  <para>
-  <productname>PostgreSQL</>'s implementation of the <literal>TABLESAMPLE</>
+  <productname>PostgreSQL</productname>'s implementation of the <literal>TABLESAMPLE</literal>
   clause supports custom table sampling methods, in addition to
-  the <literal>BERNOULLI</> and <literal>SYSTEM</> methods that are required
+  the <literal>BERNOULLI</literal> and <literal>SYSTEM</literal> methods that are required
   by the SQL standard.  The sampling method determines which rows of the
-  table will be selected when the <literal>TABLESAMPLE</> clause is used.
+  table will be selected when the <literal>TABLESAMPLE</literal> clause is used.
  </para>
 
  <para>
@@ -26,18 +26,18 @@
 method_name(internal) RETURNS tsm_handler
 </programlisting>
   The name of the function is the same method name appearing in the
-  <literal>TABLESAMPLE</> clause.  The <type>internal</> argument is a dummy
+  <literal>TABLESAMPLE</literal> clause.  The <type>internal</type> argument is a dummy
   (always having value zero) that simply serves to prevent this function from
   being called directly from a SQL command.
   The result of the function must be a palloc'd struct of
-  type <type>TsmRoutine</>, which contains pointers to support functions for
+  type <type>TsmRoutine</type>, which contains pointers to support functions for
   the sampling method.  These support functions are plain C functions and
   are not visible or callable at the SQL level.  The support functions are
-  described in <xref linkend="tablesample-support-functions">.
+  described in <xref linkend="tablesample-support-functions"/>.
  </para>
 
  <para>
-  In addition to function pointers, the <type>TsmRoutine</> struct must
+  In addition to function pointers, the <type>TsmRoutine</type> struct must
   provide these additional fields:
  </para>
 
@@ -47,9 +47,9 @@ method_name(internal) RETURNS tsm_handler
    <listitem>
     <para>
      This is an OID list containing the data type OIDs of the parameter(s)
-     that will be accepted by the <literal>TABLESAMPLE</> clause when this
+     that will be accepted by the <literal>TABLESAMPLE</literal> clause when this
      sampling method is used.  For example, for the built-in methods, this
-     list contains a single item with value <literal>FLOAT4OID</>, which
+     list contains a single item with value <literal>FLOAT4OID</literal>, which
      represents the sampling percentage.  Custom sampling methods can have
      more or different parameters.
     </para>
@@ -60,11 +60,11 @@ method_name(internal) RETURNS tsm_handler
    <term><literal>bool repeatable_across_queries</literal></term>
    <listitem>
     <para>
-     If <literal>true</>, the sampling method can deliver identical samples
+     If <literal>true</literal>, the sampling method can deliver identical samples
      across successive queries, if the same parameters
-     and <literal>REPEATABLE</> seed value are supplied each time and the
-     table contents have not changed.  When this is <literal>false</>,
-     the <literal>REPEATABLE</> clause is not accepted for use with the
+     and <literal>REPEATABLE</literal> seed value are supplied each time and the
+     table contents have not changed.  When this is <literal>false</literal>,
+     the <literal>REPEATABLE</literal> clause is not accepted for use with the
      sampling method.
     </para>
    </listitem>
@@ -74,10 +74,10 @@ method_name(internal) RETURNS tsm_handler
    <term><literal>bool repeatable_across_scans</literal></term>
    <listitem>
     <para>
-     If <literal>true</>, the sampling method can deliver identical samples
+     If <literal>true</literal>, the sampling method can deliver identical samples
      across successive scans in the same query (assuming unchanging
      parameters, seed value, and snapshot).
-     When this is <literal>false</>, the planner will not select plans that
+     When this is <literal>false</literal>, the planner will not select plans that
      would require scanning the sampled table more than once, since that
      might result in inconsistent query output.
     </para>
@@ -86,16 +86,16 @@ method_name(internal) RETURNS tsm_handler
  </variablelist>
 
  <para>
-  The <type>TsmRoutine</> struct type is declared
-  in <filename>src/include/access/tsmapi.h</>, which see for additional
+  The <type>TsmRoutine</type> struct type is declared
+  in <filename>src/include/access/tsmapi.h</filename>, which see for additional
   details.
  </para>
 
  <para>
   The table sampling methods included in the standard distribution are good
   references when trying to write your own.  Look into
-  the <filename>src/backend/access/tablesample</> subdirectory of the source
-  tree for the built-in sampling methods, and into the <filename>contrib</>
+  the <filename>src/backend/access/tablesample</filename> subdirectory of the source
+  tree for the built-in sampling methods, and into the <filename>contrib</filename>
   subdirectory for add-on methods.
  </para>
 
@@ -103,7 +103,7 @@ method_name(internal) RETURNS tsm_handler
   <title>Sampling Method Support Functions</title>
 
   <para>
-   The TSM handler function returns a palloc'd <type>TsmRoutine</> struct
+   The TSM handler function returns a palloc'd <type>TsmRoutine</type> struct
    containing pointers to the support functions described below.  Most of
    the functions are required, but some are optional, and those pointers can
    be NULL.
@@ -123,16 +123,16 @@ SampleScanGetSampleSize (PlannerInfo *root,
    relation pages that will be read during a sample scan, and the number of
    tuples that will be selected by the scan.  (For example, these might be
    determined by estimating the sampling fraction, and then multiplying
-   the <literal>baserel-&gt;pages</> and <literal>baserel-&gt;tuples</>
+   the <literal>baserel-&gt;pages</literal> and <literal>baserel-&gt;tuples</literal>
    numbers by that, being sure to round the results to integral values.)
-   The <literal>paramexprs</> list holds the expression(s) that are
-   parameters to the <literal>TABLESAMPLE</> clause.  It is recommended to
-   use <function>estimate_expression_value()</> to try to reduce these
+   The <literal>paramexprs</literal> list holds the expression(s) that are
+   parameters to the <literal>TABLESAMPLE</literal> clause.  It is recommended to
+   use <function>estimate_expression_value()</function> to try to reduce these
    expressions to constants, if their values are needed for estimation
    purposes; but the function must provide size estimates even if they cannot
    be reduced, and it should not fail even if the values appear invalid
    (remember that they're only estimates of what the run-time values will be).
-   The <literal>pages</> and <literal>tuples</> parameters are outputs.
+   The <literal>pages</literal> and <literal>tuples</literal> parameters are outputs.
   </para>
 
   <para>
@@ -145,29 +145,29 @@ InitSampleScan (SampleScanState *node,
    Initialize for execution of a SampleScan plan node.
    This is called during executor startup.
    It should perform any initialization needed before processing can start.
-   The <structname>SampleScanState</> node has already been created, but
-   its <structfield>tsm_state</> field is NULL.
-   The <function>InitSampleScan</> function can palloc whatever internal
+   The <structname>SampleScanState</structname> node has already been created, but
+   its <structfield>tsm_state</structfield> field is NULL.
+   The <function>InitSampleScan</function> function can palloc whatever internal
    state data is needed by the sampling method, and store a pointer to
-   it in <literal>node-&gt;tsm_state</>.
+   it in <literal>node-&gt;tsm_state</literal>.
    Information about the table to scan is accessible through other fields
-   of the <structname>SampleScanState</> node (but note that the
-   <literal>node-&gt;ss.ss_currentScanDesc</> scan descriptor is not set
+   of the <structname>SampleScanState</structname> node (but note that the
+   <literal>node-&gt;ss.ss_currentScanDesc</literal> scan descriptor is not set
    up yet).
-   <literal>eflags</> contains flag bits describing the executor's
+   <literal>eflags</literal> contains flag bits describing the executor's
    operating mode for this plan node.
   </para>
 
   <para>
-   When <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</> is true,
+   When <literal>(eflags &amp; EXEC_FLAG_EXPLAIN_ONLY)</literal> is true,
    the scan will not actually be performed, so this function should only do
-   the minimum required to make the node state valid for <command>EXPLAIN</>
-   and <function>EndSampleScan</>.
+   the minimum required to make the node state valid for <command>EXPLAIN</command>
+   and <function>EndSampleScan</function>.
   </para>
 
   <para>
    This function can be omitted (set the pointer to NULL), in which case
-   <function>BeginSampleScan</> must perform all initialization needed
+   <function>BeginSampleScan</function> must perform all initialization needed
    by the sampling method.
   </para>
 
@@ -184,32 +184,32 @@ BeginSampleScan (SampleScanState *node,
    This is called just before the first attempt to fetch a tuple, and
    may be called again if the scan needs to be restarted.
    Information about the table to scan is accessible through fields
-   of the <structname>SampleScanState</> node (but note that the
-   <literal>node-&gt;ss.ss_currentScanDesc</> scan descriptor is not set
+   of the <structname>SampleScanState</structname> node (but note that the
+   <literal>node-&gt;ss.ss_currentScanDesc</literal> scan descriptor is not set
    up yet).
-   The <literal>params</> array, of length <literal>nparams</>, contains the
-   values of the parameters supplied in the <literal>TABLESAMPLE</> clause.
+   The <literal>params</literal> array, of length <literal>nparams</literal>, contains the
+   values of the parameters supplied in the <literal>TABLESAMPLE</literal> clause.
    These will have the number and types specified in the sampling
    method's <literal>parameterTypes</literal> list, and have been checked
    to not be null.
-   <literal>seed</> contains a seed to use for any random numbers generated
+   <literal>seed</literal> contains a seed to use for any random numbers generated
    within the sampling method; it is either a hash derived from the
-   <literal>REPEATABLE</> value if one was given, or the result
-   of <literal>random()</> if not.
+   <literal>REPEATABLE</literal> value if one was given, or the result
+   of <literal>random()</literal> if not.
   </para>
 
   <para>
-   This function may adjust the fields <literal>node-&gt;use_bulkread</>
-   and <literal>node-&gt;use_pagemode</>.
-   If <literal>node-&gt;use_bulkread</> is <literal>true</>, which it is by
+   This function may adjust the fields <literal>node-&gt;use_bulkread</literal>
+   and <literal>node-&gt;use_pagemode</literal>.
+   If <literal>node-&gt;use_bulkread</literal> is <literal>true</literal>, which it is by
    default, the scan will use a buffer access strategy that encourages
    recycling buffers after use.  It might be reasonable to set this
-   to <literal>false</> if the scan will visit only a small fraction of the
+   to <literal>false</literal> if the scan will visit only a small fraction of the
    table's pages.
-   If <literal>node-&gt;use_pagemode</> is <literal>true</>, which it is by
+   If <literal>node-&gt;use_pagemode</literal> is <literal>true</literal>, which it is by
    default, the scan will perform visibility checking in a single pass for
    all tuples on each visited page.  It might be reasonable to set this
-   to <literal>false</> if the scan will select only a small fraction of the
+   to <literal>false</literal> if the scan will select only a small fraction of the
    tuples on each visited page.  That will result in fewer tuple visibility
    checks being performed, though each one will be more expensive because it
    will require more locking.
@@ -219,8 +219,8 @@ BeginSampleScan (SampleScanState *node,
    If the sampling method is
    marked <literal>repeatable_across_scans</literal>, it must be able to
    select the same set of tuples during a rescan as it did originally, that is
-   a fresh call of <function>BeginSampleScan</> must lead to selecting the
-   same tuples as before (if the <literal>TABLESAMPLE</> parameters
+   a fresh call of <function>BeginSampleScan</function> must lead to selecting the
+   same tuples as before (if the <literal>TABLESAMPLE</literal> parameters
    and seed don't change).
   </para>
 
@@ -231,7 +231,7 @@ NextSampleBlock (SampleScanState *node);
 </programlisting>
 
    Returns the block number of the next page to be scanned, or
-   <literal>InvalidBlockNumber</> if no pages remain to be scanned.
+   <literal>InvalidBlockNumber</literal> if no pages remain to be scanned.
   </para>
 
   <para>
@@ -251,34 +251,34 @@ NextSampleTuple (SampleScanState *node,
 </programlisting>
 
    Returns the offset number of the next tuple to be sampled on the
-   specified page, or <literal>InvalidOffsetNumber</> if no tuples remain to
-   be sampled.  <literal>maxoffset</> is the largest offset number in use
+   specified page, or <literal>InvalidOffsetNumber</literal> if no tuples remain to
+   be sampled.  <literal>maxoffset</literal> is the largest offset number in use
    on the page.
   </para>
 
   <note>
    <para>
-    <function>NextSampleTuple</> is not explicitly told which of the offset
-    numbers in the range <literal>1 .. maxoffset</> actually contain valid
+    <function>NextSampleTuple</function> is not explicitly told which of the offset
+    numbers in the range <literal>1 .. maxoffset</literal> actually contain valid
     tuples.  This is not normally a problem since the core code ignores
     requests to sample missing or invisible tuples; that should not result in
     any bias in the sample.  However, if necessary, the function can
-    examine <literal>node-&gt;ss.ss_currentScanDesc-&gt;rs_vistuples[]</>
+    examine <literal>node-&gt;ss.ss_currentScanDesc-&gt;rs_vistuples[]</literal>
     to identify which tuples are valid and visible.  (This
-    requires <literal>node-&gt;use_pagemode</> to be <literal>true</>.)
+    requires <literal>node-&gt;use_pagemode</literal> to be <literal>true</literal>.)
    </para>
   </note>
 
   <note>
    <para>
-    <function>NextSampleTuple</> must <emphasis>not</> assume
-    that <literal>blockno</> is the same page number returned by the most
-    recent <function>NextSampleBlock</> call.  It was returned by some
-    previous <function>NextSampleBlock</> call, but the core code is allowed
-    to call <function>NextSampleBlock</> in advance of actually scanning
+    <function>NextSampleTuple</function> must <emphasis>not</emphasis> assume
+    that <literal>blockno</literal> is the same page number returned by the most
+    recent <function>NextSampleBlock</function> call.  It was returned by some
+    previous <function>NextSampleBlock</function> call, but the core code is allowed
+    to call <function>NextSampleBlock</function> in advance of actually scanning
     pages, so as to support prefetching.  It is OK to assume that once
-    sampling of a given page begins, successive <function>NextSampleTuple</>
-    calls all refer to the same page until <literal>InvalidOffsetNumber</> is
+    sampling of a given page begins, successive <function>NextSampleTuple</function>
+    calls all refer to the same page until <literal>InvalidOffsetNumber</literal> is
     returned.
    </para>
   </note>
diff --git a/doc/src/sgml/tcn.sgml b/doc/src/sgml/tcn.sgml
index 623094183d..8cc55efd29 100644
--- a/doc/src/sgml/tcn.sgml
+++ b/doc/src/sgml/tcn.sgml
@@ -12,16 +12,16 @@
  </indexterm>
 
  <para>
-  The <filename>tcn</> module provides a trigger function that notifies
+  The <filename>tcn</filename> module provides a trigger function that notifies
   listeners of changes to any table on which it is attached.  It must be
-  used as an <literal>AFTER</> trigger <literal>FOR EACH ROW</>.
+  used as an <literal>AFTER</literal> trigger <literal>FOR EACH ROW</literal>.
  </para>
 
  <para>
   Only one parameter may be supplied to the function in a
-  <literal>CREATE TRIGGER</> statement, and that is optional.  If supplied
+  <literal>CREATE TRIGGER</literal> statement, and that is optional.  If supplied
   it will be used for the channel name for the notifications.  If omitted
-  <literal>tcn</> will be used for the channel name.
+  <literal>tcn</literal> will be used for the channel name.
  </para>
 
  <para>
diff --git a/doc/src/sgml/test-decoding.sgml b/doc/src/sgml/test-decoding.sgml
index 4f4fd41e32..310a2d6974 100644
--- a/doc/src/sgml/test-decoding.sgml
+++ b/doc/src/sgml/test-decoding.sgml
@@ -8,13 +8,13 @@
  </indexterm>
 
  <para>
-  <filename>test_decoding</> is an example of a logical decoding
+  <filename>test_decoding</filename> is an example of a logical decoding
   output plugin. It doesn't do anything especially useful, but can serve as
   a starting point for developing your own decoder.
  </para>
 
  <para>
-  <filename>test_decoding</> receives WAL through the logical decoding
+  <filename>test_decoding</filename> receives WAL through the logical decoding
   mechanism and decodes it into text representations of the operations
   performed.
  </para>
diff --git a/doc/src/sgml/textsearch.sgml b/doc/src/sgml/textsearch.sgml
index fe630a66b3..610b7bf033 100644
--- a/doc/src/sgml/textsearch.sgml
+++ b/doc/src/sgml/textsearch.sgml
@@ -16,7 +16,7 @@
 
   <para>
    Full Text Searching (or just <firstterm>text search</firstterm>) provides
-   the capability to identify natural-language <firstterm>documents</> that
+   the capability to identify natural-language <firstterm>documents</firstterm> that
    satisfy a <firstterm>query</firstterm>, and optionally to sort them by
    relevance to the query.  The most common type of search
    is to find all documents containing given <firstterm>query terms</firstterm>
@@ -73,13 +73,13 @@
   <itemizedlist  mark="none">
    <listitem>
     <para>
-     <emphasis>Parsing documents into <firstterm>tokens</></emphasis>. It is
+     <emphasis>Parsing documents into <firstterm>tokens</firstterm></emphasis>. It is
      useful to identify various classes of tokens, e.g., numbers, words,
      complex words, email addresses, so that they can be processed
      differently.  In principle token classes depend on the specific
      application, but for most purposes it is adequate to use a predefined
      set of classes.
-     <productname>PostgreSQL</productname> uses a <firstterm>parser</> to
+     <productname>PostgreSQL</productname> uses a <firstterm>parser</firstterm> to
      perform this step.  A standard parser is provided, and custom parsers
      can be created for specific needs.
     </para>
@@ -87,19 +87,19 @@
 
    <listitem>
     <para>
-     <emphasis>Converting tokens into <firstterm>lexemes</></emphasis>.
+     <emphasis>Converting tokens into <firstterm>lexemes</firstterm></emphasis>.
      A lexeme is a string, just like a token, but it has been
-     <firstterm>normalized</> so that different forms of the same word
+     <firstterm>normalized</firstterm> so that different forms of the same word
      are made alike.  For example, normalization almost always includes
      folding upper-case letters to lower-case, and often involves removal
-     of suffixes (such as <literal>s</> or <literal>es</> in English).
+     of suffixes (such as <literal>s</literal> or <literal>es</literal> in English).
      This allows searches to find variant forms of the
      same word, without tediously entering all the possible variants.
-     Also, this step typically eliminates <firstterm>stop words</>, which
+     Also, this step typically eliminates <firstterm>stop words</firstterm>, which
      are words that are so common that they are useless for searching.
      (In short, then, tokens are raw fragments of the document text, while
      lexemes are words that are believed useful for indexing and searching.)
-     <productname>PostgreSQL</productname> uses <firstterm>dictionaries</> to
+     <productname>PostgreSQL</productname> uses <firstterm>dictionaries</firstterm> to
      perform this step.  Various standard dictionaries are provided, and
      custom ones can be created for specific needs.
     </para>
@@ -112,7 +112,7 @@
      as a sorted array of normalized lexemes. Along with the lexemes it is
      often desirable to store positional information to use for
      <firstterm>proximity ranking</firstterm>, so that a document that
-     contains a more <quote>dense</> region of query words is
+     contains a more <quote>dense</quote> region of query words is
      assigned a higher rank than one with scattered query words.
     </para>
    </listitem>
@@ -132,7 +132,7 @@
 
    <listitem>
     <para>
-     Map synonyms to a single word using <application>Ispell</>.
+     Map synonyms to a single word using <application>Ispell</application>.
     </para>
    </listitem>
 
@@ -145,14 +145,14 @@
    <listitem>
     <para>
      Map different variations of a word to a canonical form using
-     an <application>Ispell</> dictionary.
+     an <application>Ispell</application> dictionary.
     </para>
    </listitem>
 
    <listitem>
     <para>
      Map different variations of a word to a canonical form using
-     <application>Snowball</> stemmer rules.
+     <application>Snowball</application> stemmer rules.
     </para>
    </listitem>
   </itemizedlist>
@@ -160,12 +160,12 @@
   <para>
    A data type <type>tsvector</type> is provided for storing preprocessed
    documents, along with a type <type>tsquery</type> for representing processed
-   queries (<xref linkend="datatype-textsearch">).  There are many
+   queries (<xref linkend="datatype-textsearch"/>).  There are many
    functions and operators available for these data types
-   (<xref linkend="functions-textsearch">), the most important of which is
+   (<xref linkend="functions-textsearch"/>), the most important of which is
    the match operator <literal>@@</literal>, which we introduce in
-   <xref linkend="textsearch-matching">.  Full text searches can be accelerated
-   using indexes (<xref linkend="textsearch-indexes">).
+   <xref linkend="textsearch-matching"/>.  Full text searches can be accelerated
+   using indexes (<xref linkend="textsearch-indexes"/>).
   </para>
 
 
@@ -178,7 +178,7 @@
    </indexterm>
 
    <para>
-    A <firstterm>document</> is the unit of searching in a full text search
+    A <firstterm>document</firstterm> is the unit of searching in a full text search
     system; for example, a magazine article or email message.  The text search
     engine must be able to parse documents and store associations of lexemes
     (key words) with their parent document. Later, these associations are
@@ -226,11 +226,11 @@ WHERE mid = did AND mid = 12;
 
    <para>
     For text search purposes, each document must be reduced to the
-    preprocessed <type>tsvector</> format.  Searching and ranking
-    are performed entirely on the <type>tsvector</> representation
+    preprocessed <type>tsvector</type> format.  Searching and ranking
+    are performed entirely on the <type>tsvector</type> representation
     of a document &mdash; the original text need only be retrieved
     when the document has been selected for display to a user.
-    We therefore often speak of the <type>tsvector</> as being the
+    We therefore often speak of the <type>tsvector</type> as being the
     document, but of course it is only a compact representation of
     the full document.
    </para>
@@ -264,12 +264,12 @@ SELECT 'fat &amp; cow'::tsquery @@ 'a fat cat sat on a mat and ate a fat rat'::t
     text, any more than a <type>tsvector</type> is.  A <type>tsquery</type>
     contains search terms, which must be already-normalized lexemes, and
     may combine multiple terms using AND, OR, NOT, and FOLLOWED BY operators.
-    (For syntax details see <xref linkend="datatype-tsquery">.)  There are
-    functions <function>to_tsquery</>, <function>plainto_tsquery</>,
-    and <function>phraseto_tsquery</>
+    (For syntax details see <xref linkend="datatype-tsquery"/>.)  There are
+    functions <function>to_tsquery</function>, <function>plainto_tsquery</function>,
+    and <function>phraseto_tsquery</function>
     that are helpful in converting user-written text into a proper
     <type>tsquery</type>, primarily by normalizing words appearing in
-    the text.  Similarly, <function>to_tsvector</> is used to parse and
+    the text.  Similarly, <function>to_tsvector</function> is used to parse and
     normalize a document string.  So in practice a text search match would
     look more like this:
 
@@ -289,15 +289,15 @@ SELECT 'fat cats ate fat rats'::tsvector @@ to_tsquery('fat &amp; rat');
  f
 </programlisting>
 
-    since here no normalization of the word <literal>rats</> will occur.
-    The elements of a <type>tsvector</> are lexemes, which are assumed
-    already normalized, so <literal>rats</> does not match <literal>rat</>.
+    since here no normalization of the word <literal>rats</literal> will occur.
+    The elements of a <type>tsvector</type> are lexemes, which are assumed
+    already normalized, so <literal>rats</literal> does not match <literal>rat</literal>.
    </para>
 
    <para>
     The <literal>@@</literal> operator also
     supports <type>text</type> input, allowing explicit conversion of a text
-    string to <type>tsvector</type> or <type>tsquery</> to be skipped
+    string to <type>tsvector</type> or <type>tsquery</type> to be skipped
     in simple cases.  The variants available are:
 
 <programlisting>
@@ -317,19 +317,19 @@ text @@ text
    </para>
 
    <para>
-    Within a <type>tsquery</>, the <literal>&amp;</literal> (AND) operator
+    Within a <type>tsquery</type>, the <literal>&amp;</literal> (AND) operator
     specifies that both its arguments must appear in the document to have a
     match.  Similarly, the <literal>|</literal> (OR) operator specifies that
-    at least one of its arguments must appear, while the <literal>!</> (NOT)
-    operator specifies that its argument must <emphasis>not</> appear in
+    at least one of its arguments must appear, while the <literal>!</literal> (NOT)
+    operator specifies that its argument must <emphasis>not</emphasis> appear in
     order to have a match.
-    For example, the query <literal>fat &amp; ! rat</> matches documents that
-    contain <literal>fat</> but not <literal>rat</>.
+    For example, the query <literal>fat &amp; ! rat</literal> matches documents that
+    contain <literal>fat</literal> but not <literal>rat</literal>.
    </para>
 
    <para>
     Searching for phrases is possible with the help of
-    the <literal>&lt;-&gt;</> (FOLLOWED BY) <type>tsquery</> operator, which
+    the <literal>&lt;-&gt;</literal> (FOLLOWED BY) <type>tsquery</type> operator, which
     matches only if its arguments have matches that are adjacent and in the
     given order.  For example:
 
@@ -346,13 +346,13 @@ SELECT to_tsvector('error is not fatal') @@ to_tsquery('fatal &lt;-&gt; error');
 </programlisting>
 
     There is a more general version of the FOLLOWED BY operator having the
-    form <literal>&lt;<replaceable>N</>&gt;</literal>,
-    where <replaceable>N</> is an integer standing for the difference between
+    form <literal>&lt;<replaceable>N</replaceable>&gt;</literal>,
+    where <replaceable>N</replaceable> is an integer standing for the difference between
     the positions of the matching lexemes.  <literal>&lt;1&gt;</literal> is
-    the same as <literal>&lt;-&gt;</>, while <literal>&lt;2&gt;</literal>
+    the same as <literal>&lt;-&gt;</literal>, while <literal>&lt;2&gt;</literal>
     allows exactly one other lexeme to appear between the matches, and so
-    on.  The <literal>phraseto_tsquery</> function makes use of this
-    operator to construct a <literal>tsquery</> that can match a multi-word
+    on.  The <literal>phraseto_tsquery</literal> function makes use of this
+    operator to construct a <literal>tsquery</literal> that can match a multi-word
     phrase when some of the words are stop words.  For example:
 
 <programlisting>
@@ -374,7 +374,7 @@ SELECT phraseto_tsquery('the cats ate the rats');
    </para>
 
    <para>
-    Parentheses can be used to control nesting of the <type>tsquery</>
+    Parentheses can be used to control nesting of the <type>tsquery</type>
     operators.  Without parentheses, <literal>|</literal> binds least tightly,
     then <literal>&amp;</literal>, then <literal>&lt;-&gt;</literal>,
     and <literal>!</literal> most tightly.
@@ -384,20 +384,20 @@ SELECT phraseto_tsquery('the cats ate the rats');
     It's worth noticing that the AND/OR/NOT operators mean something subtly
     different when they are within the arguments of a FOLLOWED BY operator
     than when they are not, because within FOLLOWED BY the exact position of
-    the match is significant.  For example, normally <literal>!x</> matches
-    only documents that do not contain <literal>x</> anywhere.
-    But <literal>!x &lt;-&gt; y</> matches <literal>y</> if it is not
-    immediately after an <literal>x</>; an occurrence of <literal>x</>
+    the match is significant.  For example, normally <literal>!x</literal> matches
+    only documents that do not contain <literal>x</literal> anywhere.
+    But <literal>!x &lt;-&gt; y</literal> matches <literal>y</literal> if it is not
+    immediately after an <literal>x</literal>; an occurrence of <literal>x</literal>
     elsewhere in the document does not prevent a match.  Another example is
-    that <literal>x &amp; y</> normally only requires that <literal>x</>
-    and <literal>y</> both appear somewhere in the document, but
-    <literal>(x &amp; y) &lt;-&gt; z</> requires <literal>x</>
-    and <literal>y</> to match at the same place, immediately before
-    a <literal>z</>.  Thus this query behaves differently from
-    <literal>x &lt;-&gt; z &amp; y &lt;-&gt; z</>, which will match a
-    document containing two separate sequences <literal>x z</> and
-    <literal>y z</>.  (This specific query is useless as written,
-    since <literal>x</> and <literal>y</> could not match at the same place;
+    that <literal>x &amp; y</literal> normally only requires that <literal>x</literal>
+    and <literal>y</literal> both appear somewhere in the document, but
+    <literal>(x &amp; y) &lt;-&gt; z</literal> requires <literal>x</literal>
+    and <literal>y</literal> to match at the same place, immediately before
+    a <literal>z</literal>.  Thus this query behaves differently from
+    <literal>x &lt;-&gt; z &amp; y &lt;-&gt; z</literal>, which will match a
+    document containing two separate sequences <literal>x z</literal> and
+    <literal>y z</literal>.  (This specific query is useless as written,
+    since <literal>x</literal> and <literal>y</literal> could not match at the same place;
     but with more complex situations such as prefix-match patterns, a query
     of this form could be useful.)
    </para>
@@ -412,26 +412,26 @@ SELECT phraseto_tsquery('the cats ate the rats');
     skip indexing certain words (stop words), process synonyms, and use
     sophisticated parsing, e.g., parse based on more than just white space.
     This functionality is controlled by <firstterm>text search
-    configurations</>.  <productname>PostgreSQL</> comes with predefined
+    configurations</firstterm>.  <productname>PostgreSQL</productname> comes with predefined
     configurations for many languages, and you can easily create your own
-    configurations.  (<application>psql</>'s <command>\dF</> command
+    configurations.  (<application>psql</application>'s <command>\dF</command> command
     shows all available configurations.)
    </para>
 
    <para>
     During installation an appropriate configuration is selected and
-    <xref linkend="guc-default-text-search-config"> is set accordingly
-    in <filename>postgresql.conf</>.  If you are using the same text search
+    <xref linkend="guc-default-text-search-config"/> is set accordingly
+    in <filename>postgresql.conf</filename>.  If you are using the same text search
     configuration for the entire cluster you can use the value in
-    <filename>postgresql.conf</>.  To use different configurations
+    <filename>postgresql.conf</filename>.  To use different configurations
     throughout the cluster but the same configuration within any one database,
-    use <command>ALTER DATABASE ... SET</>.  Otherwise, you can set
+    use <command>ALTER DATABASE ... SET</command>.  Otherwise, you can set
     <varname>default_text_search_config</varname> in each session.
    </para>
 
    <para>
     Each text search function that depends on a configuration has an optional
-    <type>regconfig</> argument, so that the configuration to use can be
+    <type>regconfig</type> argument, so that the configuration to use can be
     specified explicitly.  <varname>default_text_search_config</varname>
     is used only when this argument is omitted.
    </para>
@@ -439,28 +439,28 @@ SELECT phraseto_tsquery('the cats ate the rats');
    <para>
     To make it easier to build custom text search configurations, a
     configuration is built up from simpler database objects.
-    <productname>PostgreSQL</>'s text search facility provides
+    <productname>PostgreSQL</productname>'s text search facility provides
     four types of configuration-related database objects:
    </para>
 
   <itemizedlist  spacing="compact" mark="bullet">
    <listitem>
     <para>
-     <firstterm>Text search parsers</> break documents into tokens
+     <firstterm>Text search parsers</firstterm> break documents into tokens
      and classify each token (for example, as words or numbers).
     </para>
    </listitem>
 
    <listitem>
     <para>
-     <firstterm>Text search dictionaries</> convert tokens to normalized
+     <firstterm>Text search dictionaries</firstterm> convert tokens to normalized
      form and reject stop words.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     <firstterm>Text search templates</> provide the functions underlying
+     <firstterm>Text search templates</firstterm> provide the functions underlying
      dictionaries.  (A dictionary simply specifies a template and a set
      of parameters for the template.)
     </para>
@@ -468,7 +468,7 @@ SELECT phraseto_tsquery('the cats ate the rats');
 
    <listitem>
     <para>
-     <firstterm>Text search configurations</> select a parser and a set
+     <firstterm>Text search configurations</firstterm> select a parser and a set
      of dictionaries to use to normalize the tokens produced by the parser.
     </para>
    </listitem>
@@ -478,8 +478,8 @@ SELECT phraseto_tsquery('the cats ate the rats');
     Text search parsers and templates are built from low-level C functions;
     therefore it requires C programming ability to develop new ones, and
     superuser privileges to install one into a database.  (There are examples
-    of add-on parsers and templates in the <filename>contrib/</> area of the
-    <productname>PostgreSQL</> distribution.)  Since dictionaries and
+    of add-on parsers and templates in the <filename>contrib/</filename> area of the
+    <productname>PostgreSQL</productname> distribution.)  Since dictionaries and
     configurations just parameterize and connect together some underlying
     parsers and templates, no special privilege is needed to create a new
     dictionary or configuration.  Examples of creating custom dictionaries and
@@ -504,8 +504,8 @@ SELECT phraseto_tsquery('the cats ate the rats');
 
    <para>
     It is possible to do a full text search without an index.  A simple query
-    to print the <structname>title</> of each row that contains the word
-    <literal>friend</> in its <structfield>body</> field is:
+    to print the <structname>title</structname> of each row that contains the word
+    <literal>friend</literal> in its <structfield>body</structfield> field is:
 
 <programlisting>
 SELECT title
@@ -513,13 +513,13 @@ FROM pgweb
 WHERE to_tsvector('english', body) @@ to_tsquery('english', 'friend');
 </programlisting>
 
-    This will also find related words such as <literal>friends</>
-    and <literal>friendly</>, since all these are reduced to the same
+    This will also find related words such as <literal>friends</literal>
+    and <literal>friendly</literal>, since all these are reduced to the same
     normalized lexeme.
    </para>
 
    <para>
-    The query above specifies that the <literal>english</> configuration
+    The query above specifies that the <literal>english</literal> configuration
     is to be used to parse and normalize the strings.  Alternatively we
     could omit the configuration parameters:
 
@@ -530,13 +530,13 @@ WHERE to_tsvector(body) @@ to_tsquery('friend');
 </programlisting>
 
     This query will use the configuration set by <xref
-    linkend="guc-default-text-search-config">.
+    linkend="guc-default-text-search-config"/>.
    </para>
 
    <para>
     A more complex example is to
-    select the ten most recent documents that contain <literal>create</> and
-    <literal>table</> in the <structname>title</> or <structname>body</>:
+    select the ten most recent documents that contain <literal>create</literal> and
+    <literal>table</literal> in the <structname>title</structname> or <structname>body</structname>:
 
 <programlisting>
 SELECT title
@@ -565,7 +565,7 @@ LIMIT 10;
 
    <para>
     We can create a <acronym>GIN</acronym> index (<xref
-    linkend="textsearch-indexes">) to speed up text searches:
+    linkend="textsearch-indexes"/>) to speed up text searches:
 
 <programlisting>
 CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', body));
@@ -573,11 +573,11 @@ CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', body));
 
     Notice that the 2-argument version of <function>to_tsvector</function> is
     used.  Only text search functions that specify a configuration name can
-    be used in expression indexes (<xref linkend="indexes-expressional">).
+    be used in expression indexes (<xref linkend="indexes-expressional"/>).
     This is because the index contents must be unaffected by <xref
-    linkend="guc-default-text-search-config">.  If they were affected, the
+    linkend="guc-default-text-search-config"/>.  If they were affected, the
     index contents might be inconsistent because different entries could
-    contain <type>tsvector</>s that were created with different text search
+    contain <type>tsvector</type>s that were created with different text search
     configurations, and there would be no way to guess which was which.  It
     would be impossible to dump and restore such an index correctly.
    </para>
@@ -587,8 +587,8 @@ CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', body));
     used in the index above, only a query reference that uses the 2-argument
     version of <function>to_tsvector</function> with the same configuration
     name will use that index.  That is, <literal>WHERE
-    to_tsvector('english', body) @@ 'a &amp; b'</> can use the index,
-    but <literal>WHERE to_tsvector(body) @@ 'a &amp; b'</> cannot.
+    to_tsvector('english', body) @@ 'a &amp; b'</literal> can use the index,
+    but <literal>WHERE to_tsvector(body) @@ 'a &amp; b'</literal> cannot.
     This ensures that an index will be used only with the same configuration
     used to create the index entries.
    </para>
@@ -601,13 +601,13 @@ CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', body));
 CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector(config_name, body));
 </programlisting>
 
-    where <literal>config_name</> is a column in the <literal>pgweb</>
+    where <literal>config_name</literal> is a column in the <literal>pgweb</literal>
     table.  This allows mixed configurations in the same index while
     recording which configuration was used for each index entry.  This
     would be useful, for example, if the document collection contained
     documents in different languages.  Again,
     queries that are meant to use the index must be phrased to match, e.g.,
-    <literal>WHERE to_tsvector(config_name, body) @@ 'a &amp; b'</>.
+    <literal>WHERE to_tsvector(config_name, body) @@ 'a &amp; b'</literal>.
    </para>
 
    <para>
@@ -619,11 +619,11 @@ CREATE INDEX pgweb_idx ON pgweb USING GIN (to_tsvector('english', title || ' ' |
    </para>
 
    <para>
-    Another approach is to create a separate <type>tsvector</> column
-    to hold the output of <function>to_tsvector</>.  This example is a
+    Another approach is to create a separate <type>tsvector</type> column
+    to hold the output of <function>to_tsvector</function>.  This example is a
     concatenation of <literal>title</literal> and <literal>body</literal>,
-    using <function>coalesce</> to ensure that one field will still be
-    indexed when the other is <literal>NULL</>:
+    using <function>coalesce</function> to ensure that one field will still be
+    indexed when the other is <literal>NULL</literal>:
 
 <programlisting>
 ALTER TABLE pgweb ADD COLUMN textsearchable_index_col tsvector;
@@ -649,11 +649,11 @@ LIMIT 10;
    </para>
 
    <para>
-    When using a separate column to store the <type>tsvector</>
+    When using a separate column to store the <type>tsvector</type>
     representation,
-    it is necessary to create a trigger to keep the <type>tsvector</>
-    column current anytime <literal>title</> or <literal>body</> changes.
-    <xref linkend="textsearch-update-triggers"> explains how to do that.
+    it is necessary to create a trigger to keep the <type>tsvector</type>
+    column current anytime <literal>title</literal> or <literal>body</literal> changes.
+    <xref linkend="textsearch-update-triggers"/> explains how to do that.
    </para>
 
    <para>
@@ -661,13 +661,13 @@ LIMIT 10;
     is that it is not necessary to explicitly specify the text search
     configuration in queries in order to make use of the index.  As shown
     in the example above, the query can depend on
-    <varname>default_text_search_config</>.  Another advantage is that
+    <varname>default_text_search_config</varname>.  Another advantage is that
     searches will be faster, since it will not be necessary to redo the
-    <function>to_tsvector</> calls to verify index matches.  (This is more
+    <function>to_tsvector</function> calls to verify index matches.  (This is more
     important when using a GiST index than a GIN index; see <xref
-    linkend="textsearch-indexes">.)  The expression-index approach is
+    linkend="textsearch-indexes"/>.)  The expression-index approach is
     simpler to set up, however, and it requires less disk space since the
-    <type>tsvector</> representation is not stored explicitly.
+    <type>tsvector</type> representation is not stored explicitly.
    </para>
 
   </sect2>
@@ -701,7 +701,7 @@ LIMIT 10;
    </indexterm>
 
 <synopsis>
-to_tsvector(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>) returns <type>tsvector</>
+to_tsvector(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>text</type>) returns <type>tsvector</type>
 </synopsis>
 
    <para>
@@ -732,14 +732,14 @@ SELECT to_tsvector('english', 'a fat  cat sat on a mat - it ate a fat rats');
     The <function>to_tsvector</function> function internally calls a parser
     which breaks the document text into tokens and assigns a type to
     each token.  For each token, a list of
-    dictionaries (<xref linkend="textsearch-dictionaries">) is consulted,
+    dictionaries (<xref linkend="textsearch-dictionaries"/>) is consulted,
     where the list can vary depending on the token type.  The first dictionary
-    that <firstterm>recognizes</> the token emits one or more normalized
+    that <firstterm>recognizes</firstterm> the token emits one or more normalized
     <firstterm>lexemes</firstterm> to represent the token.  For example,
     <literal>rats</literal> became <literal>rat</literal> because one of the
     dictionaries recognized that the word <literal>rats</literal> is a plural
     form of <literal>rat</literal>.  Some words are recognized as
-    <firstterm>stop words</> (<xref linkend="textsearch-stopwords">), which
+    <firstterm>stop words</firstterm> (<xref linkend="textsearch-stopwords"/>), which
     causes them to be ignored since they occur too frequently to be useful in
     searching.  In our example these are
     <literal>a</literal>, <literal>on</literal>, and <literal>it</literal>.
@@ -749,7 +749,7 @@ SELECT to_tsvector('english', 'a fat  cat sat on a mat - it ate a fat rats');
     (<literal>Space symbols</literal>), meaning space tokens will never be
     indexed. The choices of parser, dictionaries and which types of tokens to
     index are determined by the selected text search configuration (<xref
-    linkend="textsearch-configuration">).  It is possible to have
+    linkend="textsearch-configuration"/>).  It is possible to have
     many different configurations in the same database, and predefined
     configurations are available for various languages. In our example
     we used the default configuration <literal>english</literal> for the
@@ -758,9 +758,9 @@ SELECT to_tsvector('english', 'a fat  cat sat on a mat - it ate a fat rats');
 
    <para>
     The function <function>setweight</function> can be used to label the
-    entries of a <type>tsvector</type> with a given <firstterm>weight</>,
-    where a weight is one of the letters <literal>A</>, <literal>B</>,
-    <literal>C</>, or <literal>D</>.
+    entries of a <type>tsvector</type> with a given <firstterm>weight</firstterm>,
+    where a weight is one of the letters <literal>A</literal>, <literal>B</literal>,
+    <literal>C</literal>, or <literal>D</literal>.
     This is typically used to mark entries coming from
     different parts of a document, such as title versus body.  Later, this
     information can be used for ranking of search results.
@@ -783,9 +783,9 @@ UPDATE tt SET ti =
 
     Here we have used <function>setweight</function> to label the source
     of each lexeme in the finished <type>tsvector</type>, and then merged
-    the labeled <type>tsvector</type> values using the <type>tsvector</>
-    concatenation operator <literal>||</>.  (<xref
-    linkend="textsearch-manipulate-tsvector"> gives details about these
+    the labeled <type>tsvector</type> values using the <type>tsvector</type>
+    concatenation operator <literal>||</literal>.  (<xref
+    linkend="textsearch-manipulate-tsvector"/> gives details about these
     operations.)
    </para>
 
@@ -811,20 +811,20 @@ UPDATE tt SET ti =
    </indexterm>
 
 <synopsis>
-to_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</>
+to_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</type>) returns <type>tsquery</type>
 </synopsis>
 
    <para>
-    <function>to_tsquery</function> creates a <type>tsquery</> value from
+    <function>to_tsquery</function> creates a <type>tsquery</type> value from
     <replaceable>querytext</replaceable>, which must consist of single tokens
-    separated by the <type>tsquery</> operators <literal>&amp;</literal> (AND),
+    separated by the <type>tsquery</type> operators <literal>&amp;</literal> (AND),
     <literal>|</literal> (OR), <literal>!</literal> (NOT), and
     <literal>&lt;-&gt;</literal> (FOLLOWED BY), possibly grouped
     using parentheses.  In other words, the input to
     <function>to_tsquery</function> must already follow the general rules for
-    <type>tsquery</> input, as described in <xref
-    linkend="datatype-tsquery">.  The difference is that while basic
-    <type>tsquery</> input takes the tokens at face value,
+    <type>tsquery</type> input, as described in <xref
+    linkend="datatype-tsquery"/>.  The difference is that while basic
+    <type>tsquery</type> input takes the tokens at face value,
     <function>to_tsquery</function> normalizes each token into a lexeme using
     the specified or default configuration, and discards any tokens that are
     stop words according to the configuration.  For example:
@@ -836,8 +836,8 @@ SELECT to_tsquery('english', 'The &amp; Fat &amp; Rats');
  'fat' &amp; 'rat'
 </screen>
 
-    As in basic <type>tsquery</> input, weight(s) can be attached to each
-    lexeme to restrict it to match only <type>tsvector</> lexemes of those
+    As in basic <type>tsquery</type> input, weight(s) can be attached to each
+    lexeme to restrict it to match only <type>tsvector</type> lexemes of those
     weight(s).  For example:
 
 <screen>
@@ -847,7 +847,7 @@ SELECT to_tsquery('english', 'Fat | Rats:AB');
  'fat' | 'rat':AB
 </screen>
 
-    Also, <literal>*</> can be attached to a lexeme to specify prefix matching:
+    Also, <literal>*</literal> can be attached to a lexeme to specify prefix matching:
 
 <screen>
 SELECT to_tsquery('supern:*A &amp; star:A*B');
@@ -856,7 +856,7 @@ SELECT to_tsquery('supern:*A &amp; star:A*B');
  'supern':*A &amp; 'star':*AB
 </screen>
 
-    Such a lexeme will match any word in a <type>tsvector</> that begins
+    Such a lexeme will match any word in a <type>tsvector</type> that begins
     with the given string.
    </para>
 
@@ -884,13 +884,13 @@ SELECT to_tsquery('''supernovae stars'' &amp; !crab');
    </indexterm>
 
 <synopsis>
-plainto_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</>
+plainto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</type>) returns <type>tsquery</type>
 </synopsis>
 
    <para>
-    <function>plainto_tsquery</> transforms the unformatted text
+    <function>plainto_tsquery</function> transforms the unformatted text
     <replaceable>querytext</replaceable> to a <type>tsquery</type> value.
-    The text is parsed and normalized much as for <function>to_tsvector</>,
+    The text is parsed and normalized much as for <function>to_tsvector</function>,
     then the <literal>&amp;</literal> (AND) <type>tsquery</type> operator is
     inserted between surviving words.
    </para>
@@ -905,7 +905,7 @@ SELECT plainto_tsquery('english', 'The Fat Rats');
  'fat' &amp; 'rat'
 </screen>
 
-    Note that <function>plainto_tsquery</> will not
+    Note that <function>plainto_tsquery</function> will not
     recognize <type>tsquery</type> operators, weight labels,
     or prefix-match labels in its input:
 
@@ -924,16 +924,16 @@ SELECT plainto_tsquery('english', 'The Fat &amp; Rats:C');
    </indexterm>
 
 <synopsis>
-phraseto_tsquery(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">querytext</replaceable> <type>text</>) returns <type>tsquery</>
+phraseto_tsquery(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">querytext</replaceable> <type>text</type>) returns <type>tsquery</type>
 </synopsis>
 
    <para>
-    <function>phraseto_tsquery</> behaves much like
-    <function>plainto_tsquery</>, except that it inserts
+    <function>phraseto_tsquery</function> behaves much like
+    <function>plainto_tsquery</function>, except that it inserts
     the <literal>&lt;-&gt;</literal> (FOLLOWED BY) operator between
     surviving words instead of the <literal>&amp;</literal> (AND) operator.
     Also, stop words are not simply discarded, but are accounted for by
-    inserting <literal>&lt;<replaceable>N</>&gt;</literal> operators rather
+    inserting <literal>&lt;<replaceable>N</replaceable>&gt;</literal> operators rather
     than <literal>&lt;-&gt;</literal> operators.  This function is useful
     when searching for exact lexeme sequences, since the FOLLOWED BY
     operators check lexeme order not just the presence of all the lexemes.
@@ -949,8 +949,8 @@ SELECT phraseto_tsquery('english', 'The Fat Rats');
  'fat' &lt;-&gt; 'rat'
 </screen>
 
-    Like <function>plainto_tsquery</>, the
-    <function>phraseto_tsquery</> function will not
+    Like <function>plainto_tsquery</function>, the
+    <function>phraseto_tsquery</function> function will not
     recognize <type>tsquery</type> operators, weight labels,
     or prefix-match labels in its input:
 
@@ -994,7 +994,7 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
         <primary>ts_rank</primary>
        </indexterm>
 
-       <literal>ts_rank(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal>
+       <literal>ts_rank(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</type>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</type> </optional>) returns <type>float4</type></literal>
       </term>
 
       <listitem>
@@ -1011,7 +1011,7 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
        <primary>ts_rank_cd</primary>
       </indexterm>
 
-       <literal>ts_rank_cd(<optional> <replaceable class="PARAMETER">weights</replaceable> <type>float4[]</>, </optional> <replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">normalization</replaceable> <type>integer</> </optional>) returns <type>float4</></literal>
+       <literal>ts_rank_cd(<optional> <replaceable class="parameter">weights</replaceable> <type>float4[]</type>, </optional> <replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">normalization</replaceable> <type>integer</type> </optional>) returns <type>float4</type></literal>
       </term>
 
       <listitem>
@@ -1020,19 +1020,19 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
         ranking for the given document vector and query, as described in
         Clarke, Cormack, and Tudhope's "Relevance Ranking for One to Three
         Term Queries" in the journal "Information Processing and Management",
-        1999.  Cover density is similar to <function>ts_rank</> ranking
+        1999.  Cover density is similar to <function>ts_rank</function> ranking
         except that the proximity of matching lexemes to each other is
         taken into consideration.
        </para>
 
        <para>
         This function requires lexeme positional information to perform
-        its calculation.  Therefore, it ignores any <quote>stripped</>
-        lexemes in the <type>tsvector</>.  If there are no unstripped
+        its calculation.  Therefore, it ignores any <quote>stripped</quote>
+        lexemes in the <type>tsvector</type>.  If there are no unstripped
         lexemes in the input, the result will be zero.  (See <xref
-        linkend="textsearch-manipulate-tsvector"> for more information
-        about the <function>strip</> function and positional information
-        in <type>tsvector</>s.)
+        linkend="textsearch-manipulate-tsvector"/> for more information
+        about the <function>strip</function> function and positional information
+        in <type>tsvector</type>s.)
        </para>
       </listitem>
      </varlistentry>
@@ -1043,7 +1043,7 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
 
    <para>
     For both these functions,
-    the optional <replaceable class="PARAMETER">weights</replaceable>
+    the optional <replaceable class="parameter">weights</replaceable>
     argument offers the ability to weigh word instances more or less
     heavily depending on how they are labeled.  The weight arrays specify
     how heavily to weigh each category of word, in the order:
@@ -1052,7 +1052,7 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
 {D-weight, C-weight, B-weight, A-weight}
 </synopsis>
 
-    If no <replaceable class="PARAMETER">weights</replaceable> are provided,
+    If no <replaceable class="parameter">weights</replaceable> are provided,
     then these defaults are used:
 
 <programlisting>
@@ -1094,7 +1094,7 @@ SELECT phraseto_tsquery('english', 'The Fat &amp; Rats:C');
      <listitem>
       <para>
        4 divides the rank by the mean harmonic distance between extents
-       (this is implemented only by <function>ts_rank_cd</>)
+       (this is implemented only by <function>ts_rank_cd</function>)
       </para>
      </listitem>
      <listitem>
@@ -1189,7 +1189,7 @@ LIMIT 10;
    <para>
     To present search results it is ideal to show a part of each document and
     how it is related to the query. Usually, search engines show fragments of
-    the document with marked search terms.  <productname>PostgreSQL</>
+    the document with marked search terms.  <productname>PostgreSQL</productname>
     provides a function <function>ts_headline</function> that
     implements this functionality.
    </para>
@@ -1199,7 +1199,7 @@ LIMIT 10;
    </indexterm>
 
 <synopsis>
-ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>, <replaceable class="PARAMETER">query</replaceable> <type>tsquery</> <optional>, <replaceable class="PARAMETER">options</replaceable> <type>text</> </optional>) returns <type>text</>
+ts_headline(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>text</type>, <replaceable class="parameter">query</replaceable> <type>tsquery</type> <optional>, <replaceable class="parameter">options</replaceable> <type>text</type> </optional>) returns <type>text</type>
 </synopsis>
 
    <para>
@@ -1215,13 +1215,13 @@ ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type
    <para>
     If an <replaceable>options</replaceable> string is specified it must
     consist of a comma-separated list of one or more
-    <replaceable>option</><literal>=</><replaceable>value</> pairs.
+    <replaceable>option</replaceable><literal>=</literal><replaceable>value</replaceable> pairs.
     The available options are:
 
     <itemizedlist  spacing="compact" mark="bullet">
      <listitem>
       <para>
-       <literal>StartSel</>, <literal>StopSel</literal>: the strings with
+       <literal>StartSel</literal>, <literal>StopSel</literal>: the strings with
        which to delimit query words appearing in the document, to distinguish
        them from other excerpted words.  You must double-quote these strings
        if they contain spaces or commas.
@@ -1229,7 +1229,7 @@ ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type
      </listitem>
      <listitem>
       <para>
-       <literal>MaxWords</>, <literal>MinWords</literal>: these numbers
+       <literal>MaxWords</literal>, <literal>MinWords</literal>: these numbers
        determine the longest and shortest headlines to output.
       </para>
      </listitem>
@@ -1256,10 +1256,10 @@ ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type
        finds text fragments with as many query words as possible and
        stretches those fragments around the query words.  As a result
        query words are close to the middle of each fragment and have words on
-       each side. Each fragment will be of at most <literal>MaxWords</> and
-       words of length <literal>ShortWord</> or less are dropped at the start
+       each side. Each fragment will be of at most <literal>MaxWords</literal> and
+       words of length <literal>ShortWord</literal> or less are dropped at the start
        and end of each fragment. If not all query words are found in the
-       document, then a single fragment of the first <literal>MinWords</>
+       document, then a single fragment of the first <literal>MinWords</literal>
        in the document will be displayed.
       </para>
      </listitem>
@@ -1271,6 +1271,7 @@ ts_headline(<optional> <replaceable class="PARAMETER">config</replaceable> <type
      </listitem>
     </itemizedlist>
 
+    These option names are recognized case-insensitively.
     Any unspecified options receive these defaults:
 
 <programlisting>
@@ -1312,7 +1313,7 @@ query.',
    </para>
 
    <para>
-    <function>ts_headline</> uses the original document, not a
+    <function>ts_headline</function> uses the original document, not a
     <type>tsvector</type> summary, so it can be slow and should be used with
     care.
    </para>
@@ -1333,11 +1334,11 @@ query.',
    <title>Manipulating Documents</title>
 
    <para>
-    <xref linkend="textsearch-parsing-documents"> showed how raw textual
-    documents can be converted into <type>tsvector</> values.
+    <xref linkend="textsearch-parsing-documents"/> showed how raw textual
+    documents can be converted into <type>tsvector</type> values.
     <productname>PostgreSQL</productname> also provides functions and
     operators that can be used to manipulate documents that are already
-    in <type>tsvector</> form.
+    in <type>tsvector</type> form.
    </para>
 
    <variablelist>
@@ -1349,18 +1350,18 @@ query.',
       <primary>tsvector concatenation</primary>
      </indexterm>
 
-      <literal><type>tsvector</> || <type>tsvector</></literal>
+      <literal><type>tsvector</type> || <type>tsvector</type></literal>
      </term>
 
      <listitem>
       <para>
-       The <type>tsvector</> concatenation operator
+       The <type>tsvector</type> concatenation operator
        returns a vector which combines the lexemes and positional information
        of the two vectors given as arguments.  Positions and weight labels
        are retained during the concatenation.
        Positions appearing in the right-hand vector are offset by the largest
        position mentioned in the left-hand vector, so that the result is
-       nearly equivalent to the result of performing <function>to_tsvector</>
+       nearly equivalent to the result of performing <function>to_tsvector</function>
        on the concatenation of the two original document strings.  (The
        equivalence is not exact, because any stop-words removed from the
        end of the left-hand argument will not affect the result, whereas
@@ -1370,11 +1371,11 @@ query.',
 
       <para>
        One advantage of using concatenation in the vector form, rather than
-       concatenating text before applying <function>to_tsvector</>, is that
+       concatenating text before applying <function>to_tsvector</function>, is that
        you can use different configurations to parse different sections
-       of the document.  Also, because the <function>setweight</> function
+       of the document.  Also, because the <function>setweight</function> function
        marks all lexemes of the given vector the same way, it is necessary
-       to parse the text and do <function>setweight</> before concatenating
+       to parse the text and do <function>setweight</function> before concatenating
        if you want to label different parts of the document with different
        weights.
       </para>
@@ -1388,13 +1389,13 @@ query.',
       <primary>setweight</primary>
      </indexterm>
 
-      <literal>setweight(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>, <replaceable class="PARAMETER">weight</replaceable> <type>"char"</>) returns <type>tsvector</></literal>
+      <literal>setweight(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>, <replaceable class="parameter">weight</replaceable> <type>"char"</type>) returns <type>tsvector</type></literal>
      </term>
 
      <listitem>
       <para>
-       <function>setweight</> returns a copy of the input vector in which every
-       position has been labeled with the given <replaceable>weight</>, either
+       <function>setweight</function> returns a copy of the input vector in which every
+       position has been labeled with the given <replaceable>weight</replaceable>, either
        <literal>A</literal>, <literal>B</literal>, <literal>C</literal>, or
        <literal>D</literal>.  (<literal>D</literal> is the default for new
        vectors and as such is not displayed on output.)  These labels are
@@ -1403,9 +1404,9 @@ query.',
       </para>
 
       <para>
-       Note that weight labels apply to <emphasis>positions</>, not
-       <emphasis>lexemes</>.  If the input vector has been stripped of
-       positions then <function>setweight</> does nothing.
+       Note that weight labels apply to <emphasis>positions</emphasis>, not
+       <emphasis>lexemes</emphasis>.  If the input vector has been stripped of
+       positions then <function>setweight</function> does nothing.
       </para>
      </listitem>
     </varlistentry>
@@ -1416,7 +1417,7 @@ query.',
       <primary>length(tsvector)</primary>
      </indexterm>
 
-      <literal>length(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>integer</></literal>
+      <literal>length(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>) returns <type>integer</type></literal>
      </term>
 
      <listitem>
@@ -1433,7 +1434,7 @@ query.',
       <primary>strip</primary>
      </indexterm>
 
-      <literal>strip(<replaceable class="PARAMETER">vector</replaceable> <type>tsvector</>) returns <type>tsvector</></literal>
+      <literal>strip(<replaceable class="parameter">vector</replaceable> <type>tsvector</type>) returns <type>tsvector</type></literal>
      </term>
 
      <listitem>
@@ -1443,7 +1444,7 @@ query.',
        smaller than an unstripped vector, but it is also less useful.
        Relevance ranking does not work as well on stripped vectors as
        unstripped ones.  Also,
-       the <literal>&lt;-&gt;</> (FOLLOWED BY) <type>tsquery</> operator
+       the <literal>&lt;-&gt;</literal> (FOLLOWED BY) <type>tsquery</type> operator
        will never match stripped input, since it cannot determine the
        distance between lexeme occurrences.
       </para>
@@ -1454,8 +1455,8 @@ query.',
    </variablelist>
 
    <para>
-    A full list of <type>tsvector</>-related functions is available
-    in <xref linkend="textsearch-functions-table">.
+    A full list of <type>tsvector</type>-related functions is available
+    in <xref linkend="textsearch-functions-table"/>.
    </para>
 
   </sect2>
@@ -1464,11 +1465,11 @@ query.',
    <title>Manipulating Queries</title>
 
    <para>
-    <xref linkend="textsearch-parsing-queries"> showed how raw textual
-    queries can be converted into <type>tsquery</> values.
+    <xref linkend="textsearch-parsing-queries"/> showed how raw textual
+    queries can be converted into <type>tsquery</type> values.
     <productname>PostgreSQL</productname> also provides functions and
     operators that can be used to manipulate queries that are already
-    in <type>tsquery</> form.
+    in <type>tsquery</type> form.
    </para>
 
    <variablelist>
@@ -1476,7 +1477,7 @@ query.',
     <varlistentry>
 
      <term>
-      <literal><type>tsquery</> &amp;&amp; <type>tsquery</></literal>
+      <literal><type>tsquery</type> &amp;&amp; <type>tsquery</type></literal>
      </term>
 
      <listitem>
@@ -1490,7 +1491,7 @@ query.',
     <varlistentry>
 
      <term>
-      <literal><type>tsquery</> || <type>tsquery</></literal>
+      <literal><type>tsquery</type> || <type>tsquery</type></literal>
      </term>
 
      <listitem>
@@ -1504,7 +1505,7 @@ query.',
     <varlistentry>
 
      <term>
-      <literal>!! <type>tsquery</></literal>
+      <literal>!! <type>tsquery</type></literal>
      </term>
 
      <listitem>
@@ -1518,15 +1519,15 @@ query.',
     <varlistentry>
 
      <term>
-      <literal><type>tsquery</> &lt;-&gt; <type>tsquery</></literal>
+      <literal><type>tsquery</type> &lt;-&gt; <type>tsquery</type></literal>
      </term>
 
      <listitem>
       <para>
        Returns a query that searches for a match to the first given query
        immediately followed by a match to the second given query, using
-       the <literal>&lt;-&gt;</> (FOLLOWED BY)
-       <type>tsquery</> operator.  For example:
+       the <literal>&lt;-&gt;</literal> (FOLLOWED BY)
+       <type>tsquery</type> operator.  For example:
 
 <screen>
 SELECT to_tsquery('fat') &lt;-&gt; to_tsquery('cat | rat');
@@ -1546,7 +1547,7 @@ SELECT to_tsquery('fat') &lt;-&gt; to_tsquery('cat | rat');
       <primary>tsquery_phrase</primary>
      </indexterm>
 
-      <literal>tsquery_phrase(<replaceable class="PARAMETER">query1</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">query2</replaceable> <type>tsquery</> [, <replaceable class="PARAMETER">distance</replaceable> <type>integer</> ]) returns <type>tsquery</></literal>
+      <literal>tsquery_phrase(<replaceable class="parameter">query1</replaceable> <type>tsquery</type>, <replaceable class="parameter">query2</replaceable> <type>tsquery</type> [, <replaceable class="parameter">distance</replaceable> <type>integer</type> ]) returns <type>tsquery</type></literal>
      </term>
 
      <listitem>
@@ -1554,8 +1555,8 @@ SELECT to_tsquery('fat') &lt;-&gt; to_tsquery('cat | rat');
        Returns a query that searches for a match to the first given query
        followed by a match to the second given query at a distance of at
        <replaceable>distance</replaceable> lexemes, using
-       the <literal>&lt;<replaceable>N</>&gt;</literal>
-       <type>tsquery</> operator.  For example:
+       the <literal>&lt;<replaceable>N</replaceable>&gt;</literal>
+       <type>tsquery</type> operator.  For example:
 
 <screen>
 SELECT tsquery_phrase(to_tsquery('fat'), to_tsquery('cat'), 10);
@@ -1575,13 +1576,13 @@ SELECT tsquery_phrase(to_tsquery('fat'), to_tsquery('cat'), 10);
       <primary>numnode</primary>
      </indexterm>
 
-      <literal>numnode(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>integer</></literal>
+      <literal>numnode(<replaceable class="parameter">query</replaceable> <type>tsquery</type>) returns <type>integer</type></literal>
      </term>
 
      <listitem>
       <para>
        Returns the number of nodes (lexemes plus operators) in a
-       <type>tsquery</>. This function is useful
+       <type>tsquery</type>. This function is useful
        to determine if the <replaceable>query</replaceable> is meaningful
        (returns &gt; 0), or contains only stop words (returns 0).
        Examples:
@@ -1609,12 +1610,12 @@ SELECT numnode('foo &amp; bar'::tsquery);
       <primary>querytree</primary>
      </indexterm>
 
-      <literal>querytree(<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>) returns <type>text</></literal>
+      <literal>querytree(<replaceable class="parameter">query</replaceable> <type>tsquery</type>) returns <type>text</type></literal>
      </term>
 
      <listitem>
       <para>
-       Returns the portion of a <type>tsquery</> that can be used for
+       Returns the portion of a <type>tsquery</type> that can be used for
        searching an index.  This function is useful for detecting
        unindexable queries, for example those containing only stop words
        or only negated terms.  For example:
@@ -1640,18 +1641,18 @@ SELECT querytree(to_tsquery('!defined'));
 
     <para>
      The <function>ts_rewrite</function> family of functions search a
-     given <type>tsquery</> for occurrences of a target
+     given <type>tsquery</type> for occurrences of a target
      subquery, and replace each occurrence with a
      substitute subquery.  In essence this operation is a
-     <type>tsquery</>-specific version of substring replacement.
+     <type>tsquery</type>-specific version of substring replacement.
      A target and substitute combination can be
-     thought of as a <firstterm>query rewrite rule</>.  A collection
+     thought of as a <firstterm>query rewrite rule</firstterm>.  A collection
      of such rewrite rules can be a powerful search aid.
      For example, you can expand the search using synonyms
-     (e.g., <literal>new york</>, <literal>big apple</>, <literal>nyc</>,
-     <literal>gotham</>) or narrow the search to direct the user to some hot
+     (e.g., <literal>new york</literal>, <literal>big apple</literal>, <literal>nyc</literal>,
+     <literal>gotham</literal>) or narrow the search to direct the user to some hot
      topic.  There is some overlap in functionality between this feature
-     and thesaurus dictionaries (<xref linkend="textsearch-thesaurus">).
+     and thesaurus dictionaries (<xref linkend="textsearch-thesaurus"/>).
      However, you can modify a set of rewrite rules on-the-fly without
      reindexing, whereas updating a thesaurus requires reindexing to be
      effective.
@@ -1662,16 +1663,16 @@ SELECT querytree(to_tsquery('!defined'));
      <varlistentry>
 
       <term>
-       <literal>ts_rewrite (<replaceable class="PARAMETER">query</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">target</replaceable> <type>tsquery</>, <replaceable class="PARAMETER">substitute</replaceable> <type>tsquery</>) returns <type>tsquery</></literal>
+       <literal>ts_rewrite (<replaceable class="parameter">query</replaceable> <type>tsquery</type>, <replaceable class="parameter">target</replaceable> <type>tsquery</type>, <replaceable class="parameter">substitute</replaceable> <type>tsquery</type>) returns <type>tsquery</type></literal>
       </term>
 
       <listitem>
        <para>
-        This form of <function>ts_rewrite</> simply applies a single
-        rewrite rule: <replaceable class="PARAMETER">target</replaceable>
-        is replaced by <replaceable class="PARAMETER">substitute</replaceable>
+        This form of <function>ts_rewrite</function> simply applies a single
+        rewrite rule: <replaceable class="parameter">target</replaceable>
+        is replaced by <replaceable class="parameter">substitute</replaceable>
         wherever it appears in <replaceable
-        class="PARAMETER">query</replaceable>.  For example:
+        class="parameter">query</replaceable>.  For example:
 
 <screen>
 SELECT ts_rewrite('a &amp; b'::tsquery, 'a'::tsquery, 'c'::tsquery);
@@ -1686,18 +1687,18 @@ SELECT ts_rewrite('a &amp; b'::tsquery, 'a'::tsquery, 'c'::tsquery);
      <varlistentry>
 
       <term>
-       <literal>ts_rewrite (<replaceable class="PARAMETER">query</> <type>tsquery</>, <replaceable class="PARAMETER">select</> <type>text</>) returns <type>tsquery</></literal>
+       <literal>ts_rewrite (<replaceable class="parameter">query</replaceable> <type>tsquery</type>, <replaceable class="parameter">select</replaceable> <type>text</type>) returns <type>tsquery</type></literal>
       </term>
 
       <listitem>
        <para>
-        This form of <function>ts_rewrite</> accepts a starting
-        <replaceable>query</> and a SQL <replaceable>select</> command, which
-        is given as a text string.  The <replaceable>select</> must yield two
-        columns of <type>tsquery</> type.  For each row of the
-        <replaceable>select</> result, occurrences of the first column value
+        This form of <function>ts_rewrite</function> accepts a starting
+        <replaceable>query</replaceable> and a SQL <replaceable>select</replaceable> command, which
+        is given as a text string.  The <replaceable>select</replaceable> must yield two
+        columns of <type>tsquery</type> type.  For each row of the
+        <replaceable>select</replaceable> result, occurrences of the first column value
         (the target) are replaced by the second column value (the substitute)
-        within the current <replaceable>query</> value.  For example:
+        within the current <replaceable>query</replaceable> value.  For example:
 
 <screen>
 CREATE TABLE aliases (t tsquery PRIMARY KEY, s tsquery);
@@ -1713,7 +1714,7 @@ SELECT ts_rewrite('a &amp; b'::tsquery, 'SELECT t,s FROM aliases');
        <para>
         Note that when multiple rewrite rules are applied in this way,
         the order of application can be important; so in practice you will
-        want the source query to <literal>ORDER BY</> some ordering key.
+        want the source query to <literal>ORDER BY</literal> some ordering key.
        </para>
       </listitem>
      </varlistentry>
@@ -1777,22 +1778,22 @@ SELECT ts_rewrite('a &amp; b'::tsquery,
    </indexterm>
 
    <para>
-    When using a separate column to store the <type>tsvector</> representation
+    When using a separate column to store the <type>tsvector</type> representation
     of your documents, it is necessary to create a trigger to update the
-    <type>tsvector</> column when the document content columns change.
+    <type>tsvector</type> column when the document content columns change.
     Two built-in trigger functions are available for this, or you can write
     your own.
    </para>
 
 <synopsis>
-tsvector_update_trigger(<replaceable class="PARAMETER">tsvector_column_name</replaceable>, <replaceable class="PARAMETER">config_name</replaceable>, <replaceable class="PARAMETER">text_column_name</replaceable> <optional>, ... </optional>)
-tsvector_update_trigger_column(<replaceable class="PARAMETER">tsvector_column_name</replaceable>, <replaceable class="PARAMETER">config_column_name</replaceable>, <replaceable class="PARAMETER">text_column_name</replaceable> <optional>, ... </optional>)
+tsvector_update_trigger(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
+tsvector_update_trigger_column(<replaceable class="parameter">tsvector_column_name</replaceable>, <replaceable class="parameter">config_column_name</replaceable>, <replaceable class="parameter">text_column_name</replaceable> <optional>, ... </optional>)
 </synopsis>
 
    <para>
-    These trigger functions automatically compute a <type>tsvector</>
+    These trigger functions automatically compute a <type>tsvector</type>
     column from one or more textual columns, under the control of
-    parameters specified in the <command>CREATE TRIGGER</> command.
+    parameters specified in the <command>CREATE TRIGGER</command> command.
     An example of their use is:
 
 <screen>
@@ -1819,24 +1820,24 @@ SELECT title, body FROM messages WHERE tsv @@ to_tsquery('title &amp; body');
  title here | the body text is here
 </screen>
 
-    Having created this trigger, any change in <structfield>title</> or
-    <structfield>body</> will automatically be reflected into
-    <structfield>tsv</>, without the application having to worry about it.
+    Having created this trigger, any change in <structfield>title</structfield> or
+    <structfield>body</structfield> will automatically be reflected into
+    <structfield>tsv</structfield>, without the application having to worry about it.
    </para>
 
    <para>
-    The first trigger argument must be the name of the <type>tsvector</>
+    The first trigger argument must be the name of the <type>tsvector</type>
     column to be updated.  The second argument specifies the text search
     configuration to be used to perform the conversion.  For
-    <function>tsvector_update_trigger</>, the configuration name is simply
+    <function>tsvector_update_trigger</function>, the configuration name is simply
     given as the second trigger argument.  It must be schema-qualified as
     shown above, so that the trigger behavior will not change with changes
-    in <varname>search_path</>.  For
-    <function>tsvector_update_trigger_column</>, the second trigger argument
+    in <varname>search_path</varname>.  For
+    <function>tsvector_update_trigger_column</function>, the second trigger argument
     is the name of another table column, which must be of type
-    <type>regconfig</>.  This allows a per-row selection of configuration
+    <type>regconfig</type>.  This allows a per-row selection of configuration
     to be made.  The remaining argument(s) are the names of textual columns
-    (of type <type>text</>, <type>varchar</>, or <type>char</>).  These
+    (of type <type>text</type>, <type>varchar</type>, or <type>char</type>).  These
     will be included in the document in the order given.  NULL values will
     be skipped (but the other columns will still be indexed).
    </para>
@@ -1865,9 +1866,9 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE
 
    <para>
     Keep in mind that it is important to specify the configuration name
-    explicitly when creating <type>tsvector</> values inside triggers,
+    explicitly when creating <type>tsvector</type> values inside triggers,
     so that the column's contents will not be affected by changes to
-    <varname>default_text_search_config</>.  Failure to do this is likely to
+    <varname>default_text_search_config</varname>.  Failure to do this is likely to
     lead to problems such as search results changing after a dump and reload.
    </para>
 
@@ -1881,38 +1882,38 @@ CREATE TRIGGER tsvectorupdate BEFORE INSERT OR UPDATE
    </indexterm>
 
    <para>
-    The function <function>ts_stat</> is useful for checking your
+    The function <function>ts_stat</function> is useful for checking your
     configuration and for finding stop-word candidates.
    </para>
 
 <synopsis>
-ts_stat(<replaceable class="PARAMETER">sqlquery</replaceable> <type>text</>, <optional> <replaceable class="PARAMETER">weights</replaceable> <type>text</>, </optional>
-        OUT <replaceable class="PARAMETER">word</replaceable> <type>text</>, OUT <replaceable class="PARAMETER">ndoc</replaceable> <type>integer</>,
-        OUT <replaceable class="PARAMETER">nentry</replaceable> <type>integer</>) returns <type>setof record</>
+ts_stat(<replaceable class="parameter">sqlquery</replaceable> <type>text</type>, <optional> <replaceable class="parameter">weights</replaceable> <type>text</type>, </optional>
+        OUT <replaceable class="parameter">word</replaceable> <type>text</type>, OUT <replaceable class="parameter">ndoc</replaceable> <type>integer</type>,
+        OUT <replaceable class="parameter">nentry</replaceable> <type>integer</type>) returns <type>setof record</type>
 </synopsis>
 
    <para>
     <replaceable>sqlquery</replaceable> is a text value containing an SQL
     query which must return a single <type>tsvector</type> column.
-    <function>ts_stat</> executes the query and returns statistics about
+    <function>ts_stat</function> executes the query and returns statistics about
     each distinct lexeme (word) contained in the <type>tsvector</type>
     data.  The columns returned are
 
     <itemizedlist  spacing="compact" mark="bullet">
      <listitem>
       <para>
-       <replaceable>word</> <type>text</> &mdash; the value of a lexeme
+       <replaceable>word</replaceable> <type>text</type> &mdash; the value of a lexeme
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>ndoc</> <type>integer</> &mdash; number of documents
-       (<type>tsvector</>s) the word occurred in
+       <replaceable>ndoc</replaceable> <type>integer</type> &mdash; number of documents
+       (<type>tsvector</type>s) the word occurred in
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>nentry</> <type>integer</> &mdash; total number of
+       <replaceable>nentry</replaceable> <type>integer</type> &mdash; total number of
        occurrences of the word
       </para>
      </listitem>
@@ -1931,8 +1932,8 @@ ORDER BY nentry DESC, ndoc DESC, word
 LIMIT 10;
 </programlisting>
 
-    The same, but counting only word occurrences with weight <literal>A</>
-    or <literal>B</>:
+    The same, but counting only word occurrences with weight <literal>A</literal>
+    or <literal>B</literal>:
 
 <programlisting>
 SELECT * FROM ts_stat('SELECT vector FROM apod', 'ab')
@@ -1950,7 +1951,7 @@ LIMIT 10;
 
   <para>
    Text search parsers are responsible for splitting raw document text
-   into <firstterm>tokens</> and identifying each token's type, where
+   into <firstterm>tokens</firstterm> and identifying each token's type, where
    the set of possible types is defined by the parser itself.
    Note that a parser does not modify the text at all &mdash; it simply
    identifies plausible word boundaries.  Because of this limited scope,
@@ -1961,8 +1962,8 @@ LIMIT 10;
   </para>
 
   <para>
-   The built-in parser is named <literal>pg_catalog.default</>.
-   It recognizes 23 token types, shown in <xref linkend="textsearch-default-parser">.
+   The built-in parser is named <literal>pg_catalog.default</literal>.
+   It recognizes 23 token types, shown in <xref linkend="textsearch-default-parser"/>.
   </para>
 
   <table id="textsearch-default-parser">
@@ -1977,119 +1978,119 @@ LIMIT 10;
     </thead>
     <tbody>
      <row>
-      <entry><literal>asciiword</></entry>
+      <entry><literal>asciiword</literal></entry>
       <entry>Word, all ASCII letters</entry>
       <entry><literal>elephant</literal></entry>
      </row>
      <row>
-      <entry><literal>word</></entry>
+      <entry><literal>word</literal></entry>
       <entry>Word, all letters</entry>
       <entry><literal>ma&ntilde;ana</literal></entry>
      </row>
      <row>
-      <entry><literal>numword</></entry>
+      <entry><literal>numword</literal></entry>
       <entry>Word, letters and digits</entry>
       <entry><literal>beta1</literal></entry>
      </row>
      <row>
-      <entry><literal>asciihword</></entry>
+      <entry><literal>asciihword</literal></entry>
       <entry>Hyphenated word, all ASCII</entry>
       <entry><literal>up-to-date</literal></entry>
      </row>
      <row>
-      <entry><literal>hword</></entry>
+      <entry><literal>hword</literal></entry>
       <entry>Hyphenated word, all letters</entry>
       <entry><literal>l&oacute;gico-matem&aacute;tica</literal></entry>
      </row>
      <row>
-      <entry><literal>numhword</></entry>
+      <entry><literal>numhword</literal></entry>
       <entry>Hyphenated word, letters and digits</entry>
       <entry><literal>postgresql-beta1</literal></entry>
      </row>
      <row>
-      <entry><literal>hword_asciipart</></entry>
+      <entry><literal>hword_asciipart</literal></entry>
       <entry>Hyphenated word part, all ASCII</entry>
       <entry><literal>postgresql</literal> in the context <literal>postgresql-beta1</literal></entry>
      </row>
      <row>
-      <entry><literal>hword_part</></entry>
+      <entry><literal>hword_part</literal></entry>
       <entry>Hyphenated word part, all letters</entry>
       <entry><literal>l&oacute;gico</literal> or <literal>matem&aacute;tica</literal>
        in the context <literal>l&oacute;gico-matem&aacute;tica</literal></entry>
      </row>
      <row>
-      <entry><literal>hword_numpart</></entry>
+      <entry><literal>hword_numpart</literal></entry>
       <entry>Hyphenated word part, letters and digits</entry>
       <entry><literal>beta1</literal> in the context
        <literal>postgresql-beta1</literal></entry>
      </row>
      <row>
-      <entry><literal>email</></entry>
+      <entry><literal>email</literal></entry>
       <entry>Email address</entry>
       <entry><literal>foo@example.com</literal></entry>
      </row>
      <row>
-      <entry><literal>protocol</></entry>
+      <entry><literal>protocol</literal></entry>
       <entry>Protocol head</entry>
       <entry><literal>http://</literal></entry>
      </row>
      <row>
-      <entry><literal>url</></entry>
+      <entry><literal>url</literal></entry>
       <entry>URL</entry>
       <entry><literal>example.com/stuff/index.html</literal></entry>
      </row>
      <row>
-      <entry><literal>host</></entry>
+      <entry><literal>host</literal></entry>
       <entry>Host</entry>
       <entry><literal>example.com</literal></entry>
      </row>
      <row>
-      <entry><literal>url_path</></entry>
+      <entry><literal>url_path</literal></entry>
       <entry>URL path</entry>
       <entry><literal>/stuff/index.html</literal>, in the context of a URL</entry>
      </row>
      <row>
-      <entry><literal>file</></entry>
+      <entry><literal>file</literal></entry>
       <entry>File or path name</entry>
       <entry><literal>/usr/local/foo.txt</literal>, if not within a URL</entry>
      </row>
      <row>
-      <entry><literal>sfloat</></entry>
+      <entry><literal>sfloat</literal></entry>
       <entry>Scientific notation</entry>
       <entry><literal>-1.234e56</literal></entry>
      </row>
      <row>
-      <entry><literal>float</></entry>
+      <entry><literal>float</literal></entry>
       <entry>Decimal notation</entry>
       <entry><literal>-1.234</literal></entry>
      </row>
      <row>
-      <entry><literal>int</></entry>
+      <entry><literal>int</literal></entry>
       <entry>Signed integer</entry>
       <entry><literal>-1234</literal></entry>
      </row>
      <row>
-      <entry><literal>uint</></entry>
+      <entry><literal>uint</literal></entry>
       <entry>Unsigned integer</entry>
       <entry><literal>1234</literal></entry>
      </row>
      <row>
-      <entry><literal>version</></entry>
+      <entry><literal>version</literal></entry>
       <entry>Version number</entry>
       <entry><literal>8.3.0</literal></entry>
      </row>
      <row>
-      <entry><literal>tag</></entry>
+      <entry><literal>tag</literal></entry>
       <entry>XML tag</entry>
       <entry><literal>&lt;a href="dictionaries.html"&gt;</literal></entry>
      </row>
      <row>
-      <entry><literal>entity</></entry>
+      <entry><literal>entity</literal></entry>
       <entry>XML entity</entry>
       <entry><literal>&amp;amp;</literal></entry>
      </row>
      <row>
-      <entry><literal>blank</></entry>
+      <entry><literal>blank</literal></entry>
       <entry>Space symbols</entry>
       <entry>(any whitespace or punctuation not otherwise recognized)</entry>
      </row>
@@ -2099,16 +2100,16 @@ LIMIT 10;
 
   <note>
    <para>
-    The parser's notion of a <quote>letter</> is determined by the database's
-    locale setting, specifically <varname>lc_ctype</>.  Words containing
+    The parser's notion of a <quote>letter</quote> is determined by the database's
+    locale setting, specifically <varname>lc_ctype</varname>.  Words containing
     only the basic ASCII letters are reported as a separate token type,
     since it is sometimes useful to distinguish them.  In most European
-    languages, token types <literal>word</> and <literal>asciiword</>
+    languages, token types <literal>word</literal> and <literal>asciiword</literal>
     should be treated alike.
    </para>
 
    <para>
-    <literal>email</> does not support all valid email characters as
+    <literal>email</literal> does not support all valid email characters as
     defined by RFC 5322.  Specifically, the only non-alphanumeric
     characters supported for email user names are period, dash, and
     underscore.
@@ -2154,9 +2155,9 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
 
   <para>
    Dictionaries are used to eliminate words that should not be considered in a
-   search (<firstterm>stop words</>), and to <firstterm>normalize</> words so
+   search (<firstterm>stop words</firstterm>), and to <firstterm>normalize</firstterm> words so
    that different derived forms of the same word will match.  A successfully
-   normalized word is called a <firstterm>lexeme</>.  Aside from
+   normalized word is called a <firstterm>lexeme</firstterm>.  Aside from
    improving search quality, normalization and removal of stop words reduce the
    size of the <type>tsvector</type> representation of a document, thereby
    improving performance.  Normalization does not always have linguistic meaning
@@ -2229,10 +2230,10 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
     </listitem>
     <listitem>
      <para>
-      a single lexeme with the <literal>TSL_FILTER</> flag set, to replace
+      a single lexeme with the <literal>TSL_FILTER</literal> flag set, to replace
       the original token with a new token to be passed to subsequent
       dictionaries (a dictionary that does this is called a
-      <firstterm>filtering dictionary</>)
+      <firstterm>filtering dictionary</firstterm>)
      </para>
     </listitem>
     <listitem>
@@ -2254,7 +2255,7 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
    used to create new dictionaries with custom parameters.  Each predefined
    dictionary template is described below.  If no existing
    template is suitable, it is possible to create new ones; see the
-   <filename>contrib/</> area of the <productname>PostgreSQL</> distribution
+   <filename>contrib/</filename> area of the <productname>PostgreSQL</productname> distribution
    for examples.
   </para>
 
@@ -2267,7 +2268,7 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
    until some dictionary recognizes it as a known word.  If it is identified
    as a stop word, or if no dictionary recognizes the token, it will be
    discarded and not indexed or searched for.
-   Normally, the first dictionary that returns a non-<literal>NULL</>
+   Normally, the first dictionary that returns a non-<literal>NULL</literal>
    output determines the result, and any remaining dictionaries are not
    consulted; but a filtering dictionary can replace the given word
    with a modified word, which is then passed to subsequent dictionaries.
@@ -2277,11 +2278,11 @@ SELECT alias, description, token FROM ts_debug('http://example.com/stuff/index.h
    The general rule for configuring a list of dictionaries
    is to place first the most narrow, most specific dictionary, then the more
    general dictionaries, finishing with a very general dictionary, like
-   a <application>Snowball</> stemmer or <literal>simple</>, which
+   a <application>Snowball</application> stemmer or <literal>simple</literal>, which
    recognizes everything.  For example, for an astronomy-specific search
    (<literal>astro_en</literal> configuration) one could bind token type
    <type>asciiword</type> (ASCII word) to a synonym dictionary of astronomical
-   terms, a general English dictionary and a <application>Snowball</> English
+   terms, a general English dictionary and a <application>Snowball</application> English
    stemmer:
 
 <programlisting>
@@ -2295,7 +2296,7 @@ ALTER TEXT SEARCH CONFIGURATION astro_en
    end where it'd be useless.  Filtering dictionaries are useful to partially
    normalize words to simplify the task of later dictionaries.  For example,
    a filtering dictionary could be used to remove accents from accented
-   letters, as is done by the <xref linkend="unaccent"> module.
+   letters, as is done by the <xref linkend="unaccent"/> module.
   </para>
 
   <sect2 id="textsearch-stopwords">
@@ -2305,7 +2306,7 @@ ALTER TEXT SEARCH CONFIGURATION astro_en
     Stop words are words that are very common, appear in almost every
     document, and have no discrimination value. Therefore, they can be ignored
     in the context of full text searching. For example, every English text
-    contains words like <literal>a</literal> and <literal>the</>, so it is
+    contains words like <literal>a</literal> and <literal>the</literal>, so it is
     useless to store them in an index.  However, stop words do affect the
     positions in <type>tsvector</type>, which in turn affect ranking:
 
@@ -2347,7 +2348,7 @@ SELECT ts_rank_cd (to_tsvector('english','list stop words'), to_tsquery('list &a
    <title>Simple Dictionary</title>
 
    <para>
-    The <literal>simple</> dictionary template operates by converting the
+    The <literal>simple</literal> dictionary template operates by converting the
     input token to lower case and checking it against a file of stop words.
     If it is found in the file then an empty array is returned, causing
     the token to be discarded.  If not, the lower-cased form of the word
@@ -2357,7 +2358,7 @@ SELECT ts_rank_cd (to_tsvector('english','list stop words'), to_tsquery('list &a
    </para>
 
    <para>
-    Here is an example of a dictionary definition using the <literal>simple</>
+    Here is an example of a dictionary definition using the <literal>simple</literal>
     template:
 
 <programlisting>
@@ -2369,11 +2370,11 @@ CREATE TEXT SEARCH DICTIONARY public.simple_dict (
 
     Here, <literal>english</literal> is the base name of a file of stop words.
     The file's full name will be
-    <filename>$SHAREDIR/tsearch_data/english.stop</>,
-    where <literal>$SHAREDIR</> means the
+    <filename>$SHAREDIR/tsearch_data/english.stop</filename>,
+    where <literal>$SHAREDIR</literal> means the
     <productname>PostgreSQL</productname> installation's shared-data directory,
-    often <filename>/usr/local/share/postgresql</> (use <command>pg_config
-    --sharedir</> to determine it if you're not sure).
+    often <filename>/usr/local/share/postgresql</filename> (use <command>pg_config
+    --sharedir</command> to determine it if you're not sure).
     The file format is simply a list
     of words, one per line.  Blank lines and trailing spaces are ignored,
     and upper case is folded to lower case, but no other processing is done
@@ -2397,10 +2398,10 @@ SELECT ts_lexize('public.simple_dict','The');
    </para>
 
    <para>
-    We can also choose to return <literal>NULL</>, instead of the lower-cased
+    We can also choose to return <literal>NULL</literal>, instead of the lower-cased
     word, if it is not found in the stop words file.  This behavior is
-    selected by setting the dictionary's <literal>Accept</> parameter to
-    <literal>false</>.  Continuing the example:
+    selected by setting the dictionary's <literal>Accept</literal> parameter to
+    <literal>false</literal>.  Continuing the example:
 
 <screen>
 ALTER TEXT SEARCH DICTIONARY public.simple_dict ( Accept = false );
@@ -2418,17 +2419,17 @@ SELECT ts_lexize('public.simple_dict','The');
    </para>
 
    <para>
-    With the default setting of <literal>Accept</> = <literal>true</>,
-    it is only useful to place a <literal>simple</> dictionary at the end
+    With the default setting of <literal>Accept</literal> = <literal>true</literal>,
+    it is only useful to place a <literal>simple</literal> dictionary at the end
     of a list of dictionaries, since it will never pass on any token to
-    a following dictionary.  Conversely, <literal>Accept</> = <literal>false</>
+    a following dictionary.  Conversely, <literal>Accept</literal> = <literal>false</literal>
     is only useful when there is at least one following dictionary.
    </para>
 
    <caution>
     <para>
      Most types of dictionaries rely on configuration files, such as files of
-     stop words.  These files <emphasis>must</> be stored in UTF-8 encoding.
+     stop words.  These files <emphasis>must</emphasis> be stored in UTF-8 encoding.
      They will be translated to the actual database encoding, if that is
      different, when they are read into the server.
     </para>
@@ -2439,8 +2440,8 @@ SELECT ts_lexize('public.simple_dict','The');
      Normally, a database session will read a dictionary configuration file
      only once, when it is first used within the session.  If you modify a
      configuration file and want to force existing sessions to pick up the
-     new contents, issue an <command>ALTER TEXT SEARCH DICTIONARY</> command
-     on the dictionary.  This can be a <quote>dummy</> update that doesn't
+     new contents, issue an <command>ALTER TEXT SEARCH DICTIONARY</command> command
+     on the dictionary.  This can be a <quote>dummy</quote> update that doesn't
      actually change any parameter values.
     </para>
    </caution>
@@ -2453,11 +2454,11 @@ SELECT ts_lexize('public.simple_dict','The');
    <para>
     This dictionary template is used to create dictionaries that replace a
     word with a synonym. Phrases are not supported (use the thesaurus
-    template (<xref linkend="textsearch-thesaurus">) for that).  A synonym
+    template (<xref linkend="textsearch-thesaurus"/>) for that).  A synonym
     dictionary can be used to overcome linguistic problems, for example, to
     prevent an English stemmer dictionary from reducing the word <quote>Paris</quote> to
     <quote>pari</quote>.  It is enough to have a <literal>Paris paris</literal> line in the
-    synonym dictionary and put it before the <literal>english_stem</>
+    synonym dictionary and put it before the <literal>english_stem</literal>
     dictionary.  For example:
 
 <screen>
@@ -2483,24 +2484,24 @@ SELECT * FROM ts_debug('english', 'Paris');
    </para>
 
    <para>
-    The only parameter required by the <literal>synonym</> template is
-    <literal>SYNONYMS</>, which is the base name of its configuration file
-    &mdash; <literal>my_synonyms</> in the above example.
+    The only parameter required by the <literal>synonym</literal> template is
+    <literal>SYNONYMS</literal>, which is the base name of its configuration file
+    &mdash; <literal>my_synonyms</literal> in the above example.
     The file's full name will be
-    <filename>$SHAREDIR/tsearch_data/my_synonyms.syn</>
-    (where <literal>$SHAREDIR</> means the
-    <productname>PostgreSQL</> installation's shared-data directory).
+    <filename>$SHAREDIR/tsearch_data/my_synonyms.syn</filename>
+    (where <literal>$SHAREDIR</literal> means the
+    <productname>PostgreSQL</productname> installation's shared-data directory).
     The file format is just one line
     per word to be substituted, with the word followed by its synonym,
     separated by white space.  Blank lines and trailing spaces are ignored.
    </para>
 
    <para>
-    The <literal>synonym</> template also has an optional parameter
-    <literal>CaseSensitive</>, which defaults to <literal>false</>.  When
-    <literal>CaseSensitive</> is <literal>false</>, words in the synonym file
+    The <literal>synonym</literal> template also has an optional parameter
+    <literal>CaseSensitive</literal>, which defaults to <literal>false</literal>.  When
+    <literal>CaseSensitive</literal> is <literal>false</literal>, words in the synonym file
     are folded to lower case, as are input tokens.  When it is
-    <literal>true</>, words and tokens are not folded to lower case,
+    <literal>true</literal>, words and tokens are not folded to lower case,
     but are compared as-is.
    </para>
 
@@ -2511,9 +2512,9 @@ SELECT * FROM ts_debug('english', 'Paris');
     <function>to_tsvector()</function>, but when it is used in
     <function>to_tsquery()</function>, the result will be a query item with
     the prefix match marker (see
-    <xref linkend="textsearch-parsing-queries">).
+    <xref linkend="textsearch-parsing-queries"/>).
     For example, suppose we have these entries in
-    <filename>$SHAREDIR/tsearch_data/synonym_sample.syn</>:
+    <filename>$SHAREDIR/tsearch_data/synonym_sample.syn</filename>:
 <programlisting>
 postgres        pgsql
 postgresql      pgsql
@@ -2573,7 +2574,7 @@ mydb=# SELECT 'indexes are very useful'::tsvector @@ to_tsquery('tst','indices')
    <para>
     Basically a thesaurus dictionary replaces all non-preferred terms by one
     preferred term and, optionally, preserves the original terms for indexing
-    as well.  <productname>PostgreSQL</>'s current implementation of the
+    as well.  <productname>PostgreSQL</productname>'s current implementation of the
     thesaurus dictionary is an extension of the synonym dictionary with added
     <firstterm>phrase</firstterm> support.  A thesaurus dictionary requires
     a configuration file of the following format:
@@ -2597,7 +2598,7 @@ more sample word(s) : more indexed word(s)
     recognize a word. In that case, you should remove the use of the word or
     teach the subdictionary about it.  You can place an asterisk
     (<symbol>*</symbol>) at the beginning of an indexed word to skip applying
-    the subdictionary to it, but all sample words <emphasis>must</> be known
+    the subdictionary to it, but all sample words <emphasis>must</emphasis> be known
     to the subdictionary.
    </para>
 
@@ -2609,16 +2610,16 @@ more sample word(s) : more indexed word(s)
 
    <para>
     Specific stop words recognized by the subdictionary cannot be
-    specified;  instead use <literal>?</> to mark the location where any
-    stop word can appear.  For example, assuming that <literal>a</> and
-    <literal>the</> are stop words according to the subdictionary:
+    specified;  instead use <literal>?</literal> to mark the location where any
+    stop word can appear.  For example, assuming that <literal>a</literal> and
+    <literal>the</literal> are stop words according to the subdictionary:
 
 <programlisting>
 ? one ? two : swsw
 </programlisting>
 
-    matches <literal>a one the two</> and <literal>the one a two</>;
-    both would be replaced by <literal>swsw</>.
+    matches <literal>a one the two</literal> and <literal>the one a two</literal>;
+    both would be replaced by <literal>swsw</literal>.
    </para>
 
    <para>
@@ -2628,7 +2629,7 @@ more sample word(s) : more indexed word(s)
     accumulation.  The thesaurus dictionary must be configured
     carefully. For example, if the thesaurus dictionary is assigned to handle
     only the <literal>asciiword</literal> token, then a thesaurus dictionary
-    definition like <literal>one 7</> will not work since token type
+    definition like <literal>one 7</literal> will not work since token type
     <literal>uint</literal> is not assigned to the thesaurus dictionary.
    </para>
 
@@ -2645,7 +2646,7 @@ more sample word(s) : more indexed word(s)
    <title>Thesaurus Configuration</title>
 
    <para>
-    To define a new thesaurus dictionary, use the <literal>thesaurus</>
+    To define a new thesaurus dictionary, use the <literal>thesaurus</literal>
     template.  For example:
 
 <programlisting>
@@ -2667,8 +2668,8 @@ CREATE TEXT SEARCH DICTIONARY thesaurus_simple (
       <para>
        <literal>mythesaurus</literal> is the base name of the thesaurus
        configuration file.
-       (Its full name will be <filename>$SHAREDIR/tsearch_data/mythesaurus.ths</>,
-       where <literal>$SHAREDIR</> means the installation shared-data
+       (Its full name will be <filename>$SHAREDIR/tsearch_data/mythesaurus.ths</filename>,
+       where <literal>$SHAREDIR</literal> means the installation shared-data
        directory.)
       </para>
      </listitem>
@@ -2752,7 +2753,7 @@ SELECT to_tsquery('''supernova star''');
     Notice that <literal>supernova star</literal> matches <literal>supernovae
     stars</literal> in <literal>thesaurus_astro</literal> because we specified
     the <literal>english_stem</literal> stemmer in the thesaurus definition.
-    The stemmer removed the <literal>e</> and <literal>s</>.
+    The stemmer removed the <literal>e</literal> and <literal>s</literal>.
    </para>
 
    <para>
@@ -2774,21 +2775,21 @@ SELECT plainto_tsquery('supernova star');
   </sect2>
 
   <sect2 id="textsearch-ispell-dictionary">
-   <title><application>Ispell</> Dictionary</title>
+   <title><application>Ispell</application> Dictionary</title>
 
    <para>
-    The <application>Ispell</> dictionary template supports
-    <firstterm>morphological dictionaries</>, which can normalize many
+    The <application>Ispell</application> dictionary template supports
+    <firstterm>morphological dictionaries</firstterm>, which can normalize many
     different linguistic forms of a word into the same lexeme.  For example,
-    an English <application>Ispell</> dictionary can match all declensions and
+    an English <application>Ispell</application> dictionary can match all declensions and
     conjugations of the search term <literal>bank</literal>, e.g.,
-    <literal>banking</>, <literal>banked</>, <literal>banks</>,
-    <literal>banks'</>, and <literal>bank's</>.
+    <literal>banking</literal>, <literal>banked</literal>, <literal>banks</literal>,
+    <literal>banks'</literal>, and <literal>bank's</literal>.
    </para>
 
    <para>
     The standard <productname>PostgreSQL</productname> distribution does
-    not include any <application>Ispell</> configuration files.
+    not include any <application>Ispell</application> configuration files.
     Dictionaries for a large number of languages are available from <ulink
     url="http://ficus-www.cs.ucla.edu/geoff/ispell.html">Ispell</ulink>.
     Also, some more modern dictionary file formats are supported &mdash; <ulink
@@ -2800,15 +2801,15 @@ SELECT plainto_tsquery('supernova star');
    </para>
 
    <para>
-    To create an <application>Ispell</> dictionary perform these steps:
+    To create an <application>Ispell</application> dictionary perform these steps:
    </para>
    <itemizedlist spacing="compact" mark="bullet">
     <listitem>
      <para>
-      download dictionary configuration files. <productname>OpenOffice</>
-      extension files have the <filename>.oxt</> extension. It is necessary
-      to extract <filename>.aff</> and <filename>.dic</> files, change
-      extensions to <filename>.affix</> and <filename>.dict</>. For some
+      download dictionary configuration files. <productname>OpenOffice</productname>
+      extension files have the <filename>.oxt</filename> extension. It is necessary
+      to extract <filename>.aff</filename> and <filename>.dic</filename> files, change
+      extensions to <filename>.affix</filename> and <filename>.dict</filename>. For some
       dictionary files it is also needed to convert characters to the UTF-8
       encoding with commands (for example, for a Norwegian language dictionary):
 <programlisting>
@@ -2819,7 +2820,7 @@ iconv -f ISO_8859-1 -t UTF-8 -o nn_no.dict nn_NO.dic
     </listitem>
     <listitem>
      <para>
-      copy files to the <filename>$SHAREDIR/tsearch_data</> directory
+      copy files to the <filename>$SHAREDIR/tsearch_data</filename> directory
      </para>
     </listitem>
     <listitem>
@@ -2837,10 +2838,10 @@ CREATE TEXT SEARCH DICTIONARY english_hunspell (
    </itemizedlist>
 
    <para>
-    Here, <literal>DictFile</>, <literal>AffFile</>, and <literal>StopWords</>
+    Here, <literal>DictFile</literal>, <literal>AffFile</literal>, and <literal>StopWords</literal>
     specify the base names of the dictionary, affixes, and stop-words files.
     The stop-words file has the same format explained above for the
-    <literal>simple</> dictionary type.  The format of the other files is
+    <literal>simple</literal> dictionary type.  The format of the other files is
     not specified here but is available from the above-mentioned web sites.
    </para>
 
@@ -2851,7 +2852,7 @@ CREATE TEXT SEARCH DICTIONARY english_hunspell (
    </para>
 
    <para>
-    The <filename>.affix</> file of <application>Ispell</> has the following
+    The <filename>.affix</filename> file of <application>Ispell</application> has the following
     structure:
 <programlisting>
 prefixes
@@ -2866,7 +2867,7 @@ flag T:
 </programlisting>
    </para>
    <para>
-    And the <filename>.dict</> file has the following structure:
+    And the <filename>.dict</filename> file has the following structure:
 <programlisting>
 lapse/ADGRS
 lard/DGRS
@@ -2876,14 +2877,14 @@ lark/MRS
    </para>
 
    <para>
-    Format of the <filename>.dict</> file is:
+    Format of the <filename>.dict</filename> file is:
 <programlisting>
 basic_form/affix_class_name
 </programlisting>
    </para>
 
    <para>
-    In the <filename>.affix</> file every affix flag is described in the
+    In the <filename>.affix</filename> file every affix flag is described in the
     following format:
 <programlisting>
 condition > [-stripping_letters,] adding_affix
@@ -2892,12 +2893,12 @@ condition > [-stripping_letters,] adding_affix
 
    <para>
     Here, condition has a format similar to the format of regular expressions.
-    It can use groupings <literal>[...]</> and <literal>[^...]</>.
-    For example, <literal>[AEIOU]Y</> means that the last letter of the word
-    is <literal>"y"</> and the penultimate letter is <literal>"a"</>,
-    <literal>"e"</>, <literal>"i"</>, <literal>"o"</> or <literal>"u"</>.
-    <literal>[^EY]</> means that the last letter is neither <literal>"e"</>
-    nor <literal>"y"</>.
+    It can use groupings <literal>[...]</literal> and <literal>[^...]</literal>.
+    For example, <literal>[AEIOU]Y</literal> means that the last letter of the word
+    is <literal>"y"</literal> and the penultimate letter is <literal>"a"</literal>,
+    <literal>"e"</literal>, <literal>"i"</literal>, <literal>"o"</literal> or <literal>"u"</literal>.
+    <literal>[^EY]</literal> means that the last letter is neither <literal>"e"</literal>
+    nor <literal>"y"</literal>.
    </para>
 
    <para>
@@ -2922,8 +2923,8 @@ SELECT ts_lexize('norwegian_ispell', 'sjokoladefabrikk');
    </para>
 
    <para>
-    <application>MySpell</> format is a subset of <application>Hunspell</>.
-    The <filename>.affix</> file of <application>Hunspell</> has the following
+    <application>MySpell</application> format is a subset of <application>Hunspell</application>.
+    The <filename>.affix</filename> file of <application>Hunspell</application> has the following
     structure:
 <programlisting>
 PFX A Y 1
@@ -2970,8 +2971,8 @@ SFX T   0     est        [^ey]
    </itemizedlist>
 
    <para>
-    The <filename>.dict</> file looks like the <filename>.dict</> file of
-    <application>Ispell</>:
+    The <filename>.dict</filename> file looks like the <filename>.dict</filename> file of
+    <application>Ispell</application>:
 <programlisting>
 larder/M
 lardy/RT
@@ -2982,8 +2983,8 @@ largehearted
 
    <note>
     <para>
-     <application>MySpell</> does not support compound words.
-     <application>Hunspell</> has sophisticated support for compound words. At
+     <application>MySpell</application> does not support compound words.
+     <application>Hunspell</application> has sophisticated support for compound words. At
      present, <productname>PostgreSQL</productname> implements only the basic
      compound word operations of Hunspell.
     </para>
@@ -2992,18 +2993,18 @@ largehearted
   </sect2>
 
   <sect2 id="textsearch-snowball-dictionary">
-   <title><application>Snowball</> Dictionary</title>
+   <title><application>Snowball</application> Dictionary</title>
 
    <para>
-    The <application>Snowball</> dictionary template is based on a project
+    The <application>Snowball</application> dictionary template is based on a project
     by Martin Porter, inventor of the popular Porter's stemming algorithm
     for the English language.  Snowball now provides stemming algorithms for
     many languages (see the <ulink url="http://snowballstem.org/">Snowball
     site</ulink> for more information).  Each algorithm understands how to
     reduce common variant forms of words to a base, or stem, spelling within
-    its language.  A Snowball dictionary requires a <literal>language</>
+    its language.  A Snowball dictionary requires a <literal>language</literal>
     parameter to identify which stemmer to use, and optionally can specify a
-    <literal>stopword</> file name that gives a list of words to eliminate.
+    <literal>stopword</literal> file name that gives a list of words to eliminate.
     (<productname>PostgreSQL</productname>'s standard stopword lists are also
     provided by the Snowball project.)
     For example, there is a built-in definition equivalent to
@@ -3020,7 +3021,7 @@ CREATE TEXT SEARCH DICTIONARY english_stem (
    </para>
 
    <para>
-    A <application>Snowball</> dictionary recognizes everything, whether
+    A <application>Snowball</application> dictionary recognizes everything, whether
     or not it is able to simplify the word, so it should be placed
     at the end of the dictionary list. It is useless to have it
     before any other dictionary because a token will never pass through it to
@@ -3042,12 +3043,12 @@ CREATE TEXT SEARCH DICTIONARY english_stem (
     <function>to_tsvector</function> or <function>to_tsquery</function>
     needs a text search configuration to perform its processing.
     The configuration parameter
-    <xref linkend="guc-default-text-search-config">
+    <xref linkend="guc-default-text-search-config"/>
     specifies the name of the default configuration, which is the
     one used by text search functions if an explicit configuration
     parameter is omitted.
     It can be set in <filename>postgresql.conf</filename>, or set for an
-    individual session using the <command>SET</> command.
+    individual session using the <command>SET</command> command.
    </para>
 
    <para>
@@ -3055,13 +3056,13 @@ CREATE TEXT SEARCH DICTIONARY english_stem (
     you can create custom configurations easily.  To facilitate management
     of text search objects, a set of <acronym>SQL</acronym> commands
     is available, and there are several <application>psql</application> commands that display information
-    about text search objects (<xref linkend="textsearch-psql">).
+    about text search objects (<xref linkend="textsearch-psql"/>).
    </para>
 
    <para>
     As an example we will create a configuration
     <literal>pg</literal>, starting by duplicating the built-in
-    <literal>english</> configuration:
+    <literal>english</literal> configuration:
 
 <programlisting>
 CREATE TEXT SEARCH CONFIGURATION public.pg ( COPY = pg_catalog.english );
@@ -3088,7 +3089,7 @@ CREATE TEXT SEARCH DICTIONARY pg_dict (
 );
 </programlisting>
 
-    Next we register the <productname>Ispell</> dictionary
+    Next we register the <productname>Ispell</productname> dictionary
     <literal>english_ispell</literal>, which has its own configuration files:
 
 <programlisting>
@@ -3101,7 +3102,7 @@ CREATE TEXT SEARCH DICTIONARY english_ispell (
 </programlisting>
 
     Now we can set up the mappings for words in configuration
-    <literal>pg</>:
+    <literal>pg</literal>:
 
 <programlisting>
 ALTER TEXT SEARCH CONFIGURATION pg
@@ -3133,7 +3134,7 @@ version of our software.
 
    <para>
     The next step is to set the session to use the new configuration, which was
-    created in the <literal>public</> schema:
+    created in the <literal>public</literal> schema:
 
 <screen>
 =&gt; \dF
@@ -3177,64 +3178,64 @@ SHOW default_text_search_config;
   </indexterm>
 
 <synopsis>
-ts_debug(<optional> <replaceable class="PARAMETER">config</replaceable> <type>regconfig</>, </optional> <replaceable class="PARAMETER">document</replaceable> <type>text</>,
-         OUT <replaceable class="PARAMETER">alias</> <type>text</>,
-         OUT <replaceable class="PARAMETER">description</> <type>text</>,
-         OUT <replaceable class="PARAMETER">token</> <type>text</>,
-         OUT <replaceable class="PARAMETER">dictionaries</> <type>regdictionary[]</>,
-         OUT <replaceable class="PARAMETER">dictionary</> <type>regdictionary</>,
-         OUT <replaceable class="PARAMETER">lexemes</> <type>text[]</>)
+ts_debug(<optional> <replaceable class="parameter">config</replaceable> <type>regconfig</type>, </optional> <replaceable class="parameter">document</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">alias</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">description</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">token</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">dictionaries</replaceable> <type>regdictionary[]</type>,
+         OUT <replaceable class="parameter">dictionary</replaceable> <type>regdictionary</type>,
+         OUT <replaceable class="parameter">lexemes</replaceable> <type>text[]</type>)
          returns setof record
 </synopsis>
 
   <para>
-   <function>ts_debug</> displays information about every token of
-   <replaceable class="PARAMETER">document</replaceable> as produced by the
+   <function>ts_debug</function> displays information about every token of
+   <replaceable class="parameter">document</replaceable> as produced by the
    parser and processed by the configured dictionaries.  It uses the
    configuration specified by <replaceable
-   class="PARAMETER">config</replaceable>,
+   class="parameter">config</replaceable>,
    or <varname>default_text_search_config</varname> if that argument is
    omitted.
   </para>
 
   <para>
-   <function>ts_debug</> returns one row for each token identified in the text
+   <function>ts_debug</function> returns one row for each token identified in the text
    by the parser.  The columns returned are
 
     <itemizedlist  spacing="compact" mark="bullet">
      <listitem>
       <para>
-       <replaceable>alias</> <type>text</> &mdash; short name of the token type
+       <replaceable>alias</replaceable> <type>text</type> &mdash; short name of the token type
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>description</> <type>text</> &mdash; description of the
+       <replaceable>description</replaceable> <type>text</type> &mdash; description of the
        token type
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>token</> <type>text</> &mdash; text of the token
+       <replaceable>token</replaceable> <type>text</type> &mdash; text of the token
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>dictionaries</> <type>regdictionary[]</> &mdash; the
+       <replaceable>dictionaries</replaceable> <type>regdictionary[]</type> &mdash; the
        dictionaries selected by the configuration for this token type
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>dictionary</> <type>regdictionary</> &mdash; the dictionary
-       that recognized the token, or <literal>NULL</> if none did
+       <replaceable>dictionary</replaceable> <type>regdictionary</type> &mdash; the dictionary
+       that recognized the token, or <literal>NULL</literal> if none did
       </para>
      </listitem>
      <listitem>
       <para>
-       <replaceable>lexemes</> <type>text[]</> &mdash; the lexeme(s) produced
-       by the dictionary that recognized the token, or <literal>NULL</> if
-       none did; an empty array (<literal>{}</>) means it was recognized as a
+       <replaceable>lexemes</replaceable> <type>text[]</type> &mdash; the lexeme(s) produced
+       by the dictionary that recognized the token, or <literal>NULL</literal> if
+       none did; an empty array (<literal>{}</literal>) means it was recognized as a
        stop word
       </para>
      </listitem>
@@ -3307,10 +3308,10 @@ SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
 </screen>
 
   <para>
-   In this example, the word <literal>Brightest</> was recognized by the
+   In this example, the word <literal>Brightest</literal> was recognized by the
    parser as an <literal>ASCII word</literal> (alias <literal>asciiword</literal>).
    For this token type the dictionary list is
-   <literal>english_ispell</> and
+   <literal>english_ispell</literal> and
    <literal>english_stem</literal>. The word was recognized by
    <literal>english_ispell</literal>, which reduced it to the noun
    <literal>bright</literal>. The word <literal>supernovaes</literal> is
@@ -3324,7 +3325,7 @@ SELECT * FROM ts_debug('public.english','The Brightest supernovaes');
   <para>
    The word <literal>The</literal> was recognized by the
    <literal>english_ispell</literal> dictionary as a stop word (<xref
-   linkend="textsearch-stopwords">) and will not be indexed.
+   linkend="textsearch-stopwords"/>) and will not be indexed.
    The spaces are discarded too, since the configuration provides no
    dictionaries at all for them.
   </para>
@@ -3360,14 +3361,14 @@ FROM ts_debug('public.english','The Brightest supernovaes');
   </indexterm>
 
 <synopsis>
-ts_parse(<replaceable class="PARAMETER">parser_name</replaceable> <type>text</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>,
-         OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>) returns <type>setof record</>
-ts_parse(<replaceable class="PARAMETER">parser_oid</replaceable> <type>oid</>, <replaceable class="PARAMETER">document</replaceable> <type>text</>,
-         OUT <replaceable class="PARAMETER">tokid</> <type>integer</>, OUT <replaceable class="PARAMETER">token</> <type>text</>) returns <type>setof record</>
+ts_parse(<replaceable class="parameter">parser_name</replaceable> <type>text</type>, <replaceable class="parameter">document</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">token</replaceable> <type>text</type>) returns <type>setof record</type>
+ts_parse(<replaceable class="parameter">parser_oid</replaceable> <type>oid</type>, <replaceable class="parameter">document</replaceable> <type>text</type>,
+         OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>, OUT <replaceable class="parameter">token</replaceable> <type>text</type>) returns <type>setof record</type>
 </synopsis>
 
   <para>
-   <function>ts_parse</> parses the given <replaceable>document</replaceable>
+   <function>ts_parse</function> parses the given <replaceable>document</replaceable>
    and returns a series of records, one for each token produced by
    parsing. Each record includes a <varname>tokid</varname> showing the
    assigned token type and a <varname>token</varname> which is the text of the
@@ -3391,14 +3392,14 @@ SELECT * FROM ts_parse('default', '123 - a number');
   </indexterm>
 
 <synopsis>
-ts_token_type(<replaceable class="PARAMETER">parser_name</> <type>text</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>,
-              OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>) returns <type>setof record</>
-ts_token_type(<replaceable class="PARAMETER">parser_oid</> <type>oid</>, OUT <replaceable class="PARAMETER">tokid</> <type>integer</>,
-              OUT <replaceable class="PARAMETER">alias</> <type>text</>, OUT <replaceable class="PARAMETER">description</> <type>text</>) returns <type>setof record</>
+ts_token_type(<replaceable class="parameter">parser_name</replaceable> <type>text</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>,
+              OUT <replaceable class="parameter">alias</replaceable> <type>text</type>, OUT <replaceable class="parameter">description</replaceable> <type>text</type>) returns <type>setof record</type>
+ts_token_type(<replaceable class="parameter">parser_oid</replaceable> <type>oid</type>, OUT <replaceable class="parameter">tokid</replaceable> <type>integer</type>,
+              OUT <replaceable class="parameter">alias</replaceable> <type>text</type>, OUT <replaceable class="parameter">description</replaceable> <type>text</type>) returns <type>setof record</type>
 </synopsis>
 
   <para>
-   <function>ts_token_type</> returns a table which describes each type of
+   <function>ts_token_type</function> returns a table which describes each type of
    token the specified parser can recognize.  For each token type, the table
    gives the integer <varname>tokid</varname> that the parser uses to label a
    token of that type, the <varname>alias</varname> that names the token type
@@ -3441,7 +3442,7 @@ SELECT * FROM ts_token_type('default');
    <title>Dictionary Testing</title>
 
    <para>
-    The <function>ts_lexize</> function facilitates dictionary testing.
+    The <function>ts_lexize</function> function facilitates dictionary testing.
    </para>
 
    <indexterm>
@@ -3449,11 +3450,11 @@ SELECT * FROM ts_token_type('default');
    </indexterm>
 
 <synopsis>
-ts_lexize(<replaceable class="PARAMETER">dict</replaceable> <type>regdictionary</>, <replaceable class="PARAMETER">token</replaceable> <type>text</>) returns <type>text[]</>
+ts_lexize(<replaceable class="parameter">dict</replaceable> <type>regdictionary</type>, <replaceable class="parameter">token</replaceable> <type>text</type>) returns <type>text[]</type>
 </synopsis>
 
    <para>
-    <function>ts_lexize</> returns an array of lexemes if the input
+    <function>ts_lexize</function> returns an array of lexemes if the input
     <replaceable>token</replaceable> is known to the dictionary,
     or an empty array if the token
     is known to the dictionary but it is a stop word, or
@@ -3490,9 +3491,9 @@ SELECT ts_lexize('thesaurus_astro','supernovae stars') is null;
 </screen>
 
      The thesaurus dictionary <literal>thesaurus_astro</literal> does know the
-     phrase <literal>supernovae stars</literal>, but <function>ts_lexize</>
+     phrase <literal>supernovae stars</literal>, but <function>ts_lexize</function>
      fails since it does not parse the input text but treats it as a single
-     token. Use <function>plainto_tsquery</> or <function>to_tsvector</> to
+     token. Use <function>plainto_tsquery</function> or <function>to_tsvector</function> to
      test thesaurus dictionaries, for example:
 
 <screen>
@@ -3540,7 +3541,7 @@ SELECT plainto_tsquery('supernovae stars');
      <listitem>
       <para>
        Creates a GIN (Generalized Inverted Index)-based index.
-       The <replaceable>column</replaceable> must be of <type>tsvector</> type.
+       The <replaceable>column</replaceable> must be of <type>tsvector</type> type.
       </para>
      </listitem>
     </varlistentry>
@@ -3560,8 +3561,8 @@ SELECT plainto_tsquery('supernovae stars');
      <listitem>
       <para>
        Creates a GiST (Generalized Search Tree)-based index.
-       The <replaceable>column</replaceable> can be of <type>tsvector</> or
-       <type>tsquery</> type.
+       The <replaceable>column</replaceable> can be of <type>tsvector</type> or
+       <type>tsquery</type> type.
       </para>
      </listitem>
     </varlistentry>
@@ -3575,7 +3576,7 @@ SELECT plainto_tsquery('supernovae stars');
    compressed list of matching locations.  Multi-word searches can find
    the first match, then use the index to remove rows that are lacking
    additional words.  GIN indexes store only the words (lexemes) of
-   <type>tsvector</> values, and not their weight labels.  Thus a table
+   <type>tsvector</type> values, and not their weight labels.  Thus a table
    row recheck is needed when using a query that involves weights.
   </para>
 
@@ -3604,7 +3605,7 @@ SELECT plainto_tsquery('supernovae stars');
 
   <para>
    Note that <acronym>GIN</acronym> index build time can often be improved
-   by increasing <xref linkend="guc-maintenance-work-mem">, while
+   by increasing <xref linkend="guc-maintenance-work-mem"/>, while
    <acronym>GiST</acronym> index build time is not sensitive to that
    parameter.
   </para>
@@ -3614,15 +3615,16 @@ SELECT plainto_tsquery('supernovae stars');
    allows the implementation of very fast searches with online update.
    Partitioning can be done at the database level using table inheritance,
    or by distributing documents over
-   servers and collecting search results using the <xref linkend="dblink">
-   module. The latter is possible because ranking functions use
+   servers and collecting external search results, e.g. via <link
+   linkend="ddl-foreign-data">Foreign Data</link> access.
+   The latter is possible because ranking functions use
    only local information.
   </para>
 
  </sect1>
 
  <sect1 id="textsearch-psql">
-  <title><application>psql</> Support</title>
+  <title><application>psql</application> Support</title>
 
   <para>
    Information about text search configuration objects can be obtained
@@ -3666,7 +3668,7 @@ SELECT plainto_tsquery('supernovae stars');
     <term><literal>\dF<optional>+</optional> <optional>PATTERN</optional></literal></term>
     <listitem>
      <para>
-      List text search configurations (add <literal>+</> for more detail).
+      List text search configurations (add <literal>+</literal> for more detail).
 <screen>
 =&gt; \dF russian
             List of text search configurations
@@ -3707,7 +3709,7 @@ Parser: "pg_catalog.default"
     <term><literal>\dFd<optional>+</optional> <optional>PATTERN</optional></literal></term>
     <listitem>
      <para>
-      List text search dictionaries (add <literal>+</> for more detail).
+      List text search dictionaries (add <literal>+</literal> for more detail).
 <screen>
 =&gt; \dFd
                             List of text search dictionaries
@@ -3738,7 +3740,7 @@ Parser: "pg_catalog.default"
    <term><literal>\dFp<optional>+</optional> <optional>PATTERN</optional></literal></term>
     <listitem>
      <para>
-      List text search parsers (add <literal>+</> for more detail).
+      List text search parsers (add <literal>+</literal> for more detail).
 <screen>
 =&gt; \dFp
         List of text search parsers
@@ -3791,7 +3793,7 @@ Parser: "pg_catalog.default"
    <term><literal>\dFt<optional>+</optional> <optional>PATTERN</optional></literal></term>
     <listitem>
      <para>
-      List text search templates (add <literal>+</> for more detail).
+      List text search templates (add <literal>+</literal> for more detail).
 <screen>
 =&gt; \dFt
                            List of text search templates
@@ -3830,12 +3832,12 @@ Parser: "pg_catalog.default"
      2<superscript>64</superscript></para>
     </listitem>
     <listitem>
-     <para>Position values in <type>tsvector</> must be greater than 0 and
+     <para>Position values in <type>tsvector</type> must be greater than 0 and
      no more than 16,383</para>
     </listitem>
     <listitem>
-     <para>The match distance in a <literal>&lt;<replaceable>N</>&gt;</literal>
-     (FOLLOWED BY) <type>tsquery</> operator cannot be more than
+     <para>The match distance in a <literal>&lt;<replaceable>N</replaceable>&gt;</literal>
+     (FOLLOWED BY) <type>tsquery</type> operator cannot be more than
      16,384</para>
     </listitem>
     <listitem>
@@ -3851,7 +3853,7 @@ Parser: "pg_catalog.default"
   <para>
    For comparison, the <productname>PostgreSQL</productname> 8.1 documentation
    contained 10,441 unique words, a total of 335,420 words, and the most
-   frequent word <quote>postgresql</> was mentioned 6,127 times in 655
+   frequent word <quote>postgresql</quote> was mentioned 6,127 times in 655
    documents.
   </para>
 
diff --git a/doc/src/sgml/trigger.sgml b/doc/src/sgml/trigger.sgml
index 950245d19a..8f83e6a47c 100644
--- a/doc/src/sgml/trigger.sgml
+++ b/doc/src/sgml/trigger.sgml
@@ -11,10 +11,10 @@
    This chapter provides general information about writing trigger functions.
    Trigger functions can be written in most of the available procedural
    languages, including
-   <application>PL/pgSQL</application> (<xref linkend="plpgsql">),
-   <application>PL/Tcl</application> (<xref linkend="pltcl">),
-   <application>PL/Perl</application> (<xref linkend="plperl">), and
-   <application>PL/Python</application> (<xref linkend="plpython">).
+   <application>PL/pgSQL</application> (<xref linkend="plpgsql"/>),
+   <application>PL/Tcl</application> (<xref linkend="pltcl"/>),
+   <application>PL/Perl</application> (<xref linkend="plperl"/>), and
+   <application>PL/Python</application> (<xref linkend="plpython"/>).
    After reading this chapter, you should consult the chapter for
    your favorite procedural language to find out the language-specific
    details of writing a trigger in it.
@@ -41,23 +41,19 @@
     On tables and foreign tables, triggers can be defined to execute either
     before or after any <command>INSERT</command>, <command>UPDATE</command>,
     or <command>DELETE</command> operation, either once per modified row,
-    or once per <acronym>SQL</acronym> statement.  If an
-    <command>INSERT</command> contains an <literal>ON CONFLICT DO UPDATE</>
-    clause, it is possible that the effects of a BEFORE insert trigger and
-    a BEFORE update trigger can both be applied together, if a reference to
-    an <varname>EXCLUDED</> column appears.  <command>UPDATE</command>
-    triggers can moreover be set to fire only if certain columns are
-    mentioned in the <literal>SET</literal> clause of the
-    <command>UPDATE</command> statement.  Triggers can also fire for
-    <command>TRUNCATE</command> statements.  If a trigger event occurs,
+    or once per <acronym>SQL</acronym> statement.
+    <command>UPDATE</command> triggers can moreover be set to fire only if
+    certain columns are mentioned in the <literal>SET</literal> clause of
+    the <command>UPDATE</command> statement.  Triggers can also fire
+    for <command>TRUNCATE</command> statements.  If a trigger event occurs,
     the trigger's function is called at the appropriate time to handle the
-    event.  Foreign tables do not support the TRUNCATE statement at all.
+    event.
    </para>
 
    <para>
     On views, triggers can be defined to execute instead of
     <command>INSERT</command>, <command>UPDATE</command>, or
-    <command>DELETE</command> operations.  <literal>INSTEAD OF</> triggers
+    <command>DELETE</command> operations.  <literal>INSTEAD OF</literal> triggers
     are fired once for each row that needs to be modified in the view.
     It is the responsibility of the
     trigger's function to perform the necessary modifications to the
@@ -71,22 +67,22 @@
    <para>
     The trigger function must be defined before the trigger itself can be
     created.  The trigger function must be declared as a
-    function taking no arguments and returning type <literal>trigger</>.
+    function taking no arguments and returning type <literal>trigger</literal>.
     (The trigger function receives its input through a specially-passed
-    <structname>TriggerData</> structure, not in the form of ordinary function
+    <structname>TriggerData</structname> structure, not in the form of ordinary function
     arguments.)
    </para>
 
    <para>
     Once a suitable trigger function has been created, the trigger is
     established with
-    <xref linkend="sql-createtrigger">.
+    <xref linkend="sql-createtrigger"/>.
     The same trigger function can be used for multiple triggers.
    </para>
 
    <para>
-    <productname>PostgreSQL</productname> offers both <firstterm>per-row</>
-    triggers and <firstterm>per-statement</> triggers.  With a per-row
+    <productname>PostgreSQL</productname> offers both <firstterm>per-row</firstterm>
+    triggers and <firstterm>per-statement</firstterm> triggers.  With a per-row
     trigger, the trigger function
     is invoked once for each row that is affected by the statement
     that fired the trigger. In contrast, a per-statement trigger is
@@ -94,32 +90,29 @@
     regardless of the number of rows affected by that statement. In
     particular, a statement that affects zero rows will still result
     in the execution of any applicable per-statement triggers. These
-    two types of triggers are sometimes called <firstterm>row-level</>
-    triggers and <firstterm>statement-level</> triggers,
+    two types of triggers are sometimes called <firstterm>row-level</firstterm>
+    triggers and <firstterm>statement-level</firstterm> triggers,
     respectively. Triggers on <command>TRUNCATE</command> may only be
-    defined at statement level.  On views, triggers that fire before or
-    after may only be defined at statement level, while triggers that fire
-    instead of an <command>INSERT</command>, <command>UPDATE</command>,
-    or <command>DELETE</command> may only be defined at row level.
+    defined at statement level, not per-row.
    </para>
 
    <para>
     Triggers are also classified according to whether they fire
-    <firstterm>before</>, <firstterm>after</>, or
-    <firstterm>instead of</> the operation. These are referred to
-    as <literal>BEFORE</> triggers, <literal>AFTER</> triggers, and
-    <literal>INSTEAD OF</> triggers respectively.
-    Statement-level <literal>BEFORE</> triggers naturally fire before the
-    statement starts to do anything, while statement-level <literal>AFTER</>
+    <firstterm>before</firstterm>, <firstterm>after</firstterm>, or
+    <firstterm>instead of</firstterm> the operation. These are referred to
+    as <literal>BEFORE</literal> triggers, <literal>AFTER</literal> triggers, and
+    <literal>INSTEAD OF</literal> triggers respectively.
+    Statement-level <literal>BEFORE</literal> triggers naturally fire before the
+    statement starts to do anything, while statement-level <literal>AFTER</literal>
     triggers fire at the very end of the statement.  These types of
     triggers may be defined on tables, views, or foreign tables.  Row-level
-    <literal>BEFORE</> triggers fire immediately before a particular row is
-    operated on, while row-level <literal>AFTER</> triggers fire at the end of
-    the statement (but before any statement-level <literal>AFTER</> triggers).
+    <literal>BEFORE</literal> triggers fire immediately before a particular row is
+    operated on, while row-level <literal>AFTER</literal> triggers fire at the end of
+    the statement (but before any statement-level <literal>AFTER</literal> triggers).
     These types of triggers may only be defined on non-partitioned tables and
-    foreign tables.  Row-level <literal>INSTEAD OF</> triggers may only be
-    defined on views, and fire immediately as each row in the view is
-    identified as needing to be operated on.
+    foreign tables, not views.  <literal>INSTEAD OF</literal> triggers may only be
+    defined on views, and only at row level; they fire immediately as each
+    row in the view is identified as needing to be operated on.
    </para>
 
    <para>
@@ -132,33 +125,57 @@
 
    <para>
     If an <command>INSERT</command> contains an <literal>ON CONFLICT
-    DO UPDATE</> clause, it is possible that the effects of all
-    row-level <literal>BEFORE</> <command>INSERT</command> triggers
-    and all row-level <literal>BEFORE</literal> <command>UPDATE</command> triggers can
+    DO UPDATE</literal> clause, it is possible that the effects of
+    row-level <literal>BEFORE</literal> <command>INSERT</command> triggers and
+    row-level <literal>BEFORE</literal> <command>UPDATE</command> triggers can
     both be applied in a way that is apparent from the final state of
-    the updated row, if an <varname>EXCLUDED</> column is referenced.
-    There need not be an <varname>EXCLUDED</> column reference for
-    both sets of row-level <literal>BEFORE</literal> triggers to execute, though.  The
+    the updated row, if an <varname>EXCLUDED</varname> column is referenced.
+    There need not be an <varname>EXCLUDED</varname> column reference for
+    both sets of row-level <literal>BEFORE</literal> triggers to execute,
+    though.  The
     possibility of surprising outcomes should be considered when there
-    are both <literal>BEFORE</> <command>INSERT</command> and
-    <literal>BEFORE</> <command>UPDATE</command> row-level triggers
-    that both affect a row being inserted/updated (this can still be
-    problematic if the modifications are more or less equivalent if
+    are both <literal>BEFORE</literal> <command>INSERT</command> and
+    <literal>BEFORE</literal> <command>UPDATE</command> row-level triggers
+    that change a row being inserted/updated (this can be
+    problematic even if the modifications are more or less equivalent, if
     they're not also idempotent).  Note that statement-level
     <command>UPDATE</command> triggers are executed when <literal>ON
-    CONFLICT DO UPDATE</> is specified, regardless of whether or not
+    CONFLICT DO UPDATE</literal> is specified, regardless of whether or not
     any rows were affected by the <command>UPDATE</command> (and
     regardless of whether the alternative <command>UPDATE</command>
     path was ever taken).  An <command>INSERT</command> with an
-    <literal>ON CONFLICT DO UPDATE</> clause will execute
-    statement-level <literal>BEFORE</> <command>INSERT</command>
-    triggers first, then statement-level <literal>BEFORE</>
+    <literal>ON CONFLICT DO UPDATE</literal> clause will execute
+    statement-level <literal>BEFORE</literal> <command>INSERT</command>
+    triggers first, then statement-level <literal>BEFORE</literal>
     <command>UPDATE</command> triggers, followed by statement-level
-    <literal>AFTER</> <command>UPDATE</command> triggers and finally
-    statement-level <literal>AFTER</> <command>INSERT</command>
+    <literal>AFTER</literal> <command>UPDATE</command> triggers and finally
+    statement-level <literal>AFTER</literal> <command>INSERT</command>
     triggers.
    </para>
 
+   <para>
+    If an <command>UPDATE</command> on a partitioned table causes a row to move
+    to another partition, it will be performed as a <command>DELETE</command>
+    from the original partition followed by an <command>INSERT</command> into
+    the new partition. In this case, all row-level <literal>BEFORE</literal>
+    <command>UPDATE</command> triggers and all row-level
+    <literal>BEFORE</literal> <command>DELETE</command> triggers are fired on
+    the original partition. Then all row-level <literal>BEFORE</literal>
+    <command>INSERT</command> triggers are fired on the destination partition.
+    The possibility of surprising outcomes should be considered when all these
+    triggers affect the row being moved. As far as <literal>AFTER ROW</literal>
+    triggers are concerned, <literal>AFTER</literal> <command>DELETE</command>
+    and <literal>AFTER</literal> <command>INSERT</command> triggers are
+    applied; but <literal>AFTER</literal> <command>UPDATE</command> triggers
+    are not applied because the <command>UPDATE</command> has been converted to
+    a <command>DELETE</command> and an <command>INSERT</command>. As far as
+    statement-level triggers are concerned, none of the
+    <command>DELETE</command> or <command>INSERT</command> triggers are fired,
+    even if row movement occurs; only the <command>UPDATE</command> triggers
+    defined on the target table used in the <command>UPDATE</command> statement
+    will be fired.
+   </para>
+
    <para>
     Trigger functions invoked by per-statement triggers should always
     return <symbol>NULL</symbol>. Trigger functions invoked by per-row
@@ -170,7 +187,7 @@
     <itemizedlist>
      <listitem>
       <para>
-       It can return <symbol>NULL</> to skip the operation for the
+       It can return <symbol>NULL</symbol> to skip the operation for the
        current row. This instructs the executor to not perform the
        row-level operation that invoked the trigger (the insertion,
        modification, or deletion of a particular table row).
@@ -188,7 +205,7 @@
      </listitem>
     </itemizedlist>
 
-    A row-level <literal>BEFORE</> trigger that does not intend to cause
+    A row-level <literal>BEFORE</literal> trigger that does not intend to cause
     either of these behaviors must be careful to return as its result the same
     row that was passed in (that is, the <varname>NEW</varname> row
     for <command>INSERT</command> and <command>UPDATE</command>
@@ -197,8 +214,8 @@
    </para>
 
    <para>
-    A row-level <literal>INSTEAD OF</> trigger should either return
-    <symbol>NULL</> to indicate that it did not modify any data from
+    A row-level <literal>INSTEAD OF</literal> trigger should either return
+    <symbol>NULL</symbol> to indicate that it did not modify any data from
     the view's underlying base tables, or it should return the view
     row that was passed in (the <varname>NEW</varname> row
     for <command>INSERT</command> and <command>UPDATE</command>
@@ -207,66 +224,66 @@
     used to signal that the trigger performed the necessary data
     modifications in the view.  This will cause the count of the number
     of rows affected by the command to be incremented. For
-    <command>INSERT</> and <command>UPDATE</> operations, the trigger
-    may modify the <varname>NEW</> row before returning it.  This will
+    <command>INSERT</command> and <command>UPDATE</command> operations, the trigger
+    may modify the <varname>NEW</varname> row before returning it.  This will
     change the data returned by
-    <command>INSERT RETURNING</> or <command>UPDATE RETURNING</>,
+    <command>INSERT RETURNING</command> or <command>UPDATE RETURNING</command>,
     and is useful when the view will not show exactly the same data
     that was provided.
    </para>
 
    <para>
     The return value is ignored for row-level triggers fired after an
-    operation, and so they can return <symbol>NULL</>.
+    operation, and so they can return <symbol>NULL</symbol>.
    </para>
 
    <para>
     If more than one trigger is defined for the same event on the same
     relation, the triggers will be fired in alphabetical order by
-    trigger name.  In the case of <literal>BEFORE</> and
-    <literal>INSTEAD OF</> triggers, the possibly-modified row returned by
+    trigger name.  In the case of <literal>BEFORE</literal> and
+    <literal>INSTEAD OF</literal> triggers, the possibly-modified row returned by
     each trigger becomes the input to the next trigger.  If any
-    <literal>BEFORE</> or <literal>INSTEAD OF</> trigger returns
-    <symbol>NULL</>, the operation is abandoned for that row and subsequent
+    <literal>BEFORE</literal> or <literal>INSTEAD OF</literal> trigger returns
+    <symbol>NULL</symbol>, the operation is abandoned for that row and subsequent
     triggers are not fired (for that row).
    </para>
 
    <para>
-    A trigger definition can also specify a Boolean <literal>WHEN</>
+    A trigger definition can also specify a Boolean <literal>WHEN</literal>
     condition, which will be tested to see whether the trigger should
-    be fired.  In row-level triggers the <literal>WHEN</> condition can
+    be fired.  In row-level triggers the <literal>WHEN</literal> condition can
     examine the old and/or new values of columns of the row.  (Statement-level
-    triggers can also have <literal>WHEN</> conditions, although the feature
-    is not so useful for them.)  In a <literal>BEFORE</> trigger, the
-    <literal>WHEN</>
+    triggers can also have <literal>WHEN</literal> conditions, although the feature
+    is not so useful for them.)  In a <literal>BEFORE</literal> trigger, the
+    <literal>WHEN</literal>
     condition is evaluated just before the function is or would be executed,
-    so using <literal>WHEN</> is not materially different from testing the
+    so using <literal>WHEN</literal> is not materially different from testing the
     same condition at the beginning of the trigger function.  However, in
-    an <literal>AFTER</> trigger, the <literal>WHEN</> condition is evaluated
+    an <literal>AFTER</literal> trigger, the <literal>WHEN</literal> condition is evaluated
     just after the row update occurs, and it determines whether an event is
     queued to fire the trigger at the end of statement.  So when an
-    <literal>AFTER</> trigger's
-    <literal>WHEN</> condition does not return true, it is not necessary
+    <literal>AFTER</literal> trigger's
+    <literal>WHEN</literal> condition does not return true, it is not necessary
     to queue an event nor to re-fetch the row at end of statement.  This
     can result in significant speedups in statements that modify many
     rows, if the trigger only needs to be fired for a few of the rows.
-    <literal>INSTEAD OF</> triggers do not support
-    <literal>WHEN</> conditions.
+    <literal>INSTEAD OF</literal> triggers do not support
+    <literal>WHEN</literal> conditions.
    </para>
 
    <para>
-    Typically, row-level <literal>BEFORE</> triggers are used for checking or
+    Typically, row-level <literal>BEFORE</literal> triggers are used for checking or
     modifying the data that will be inserted or updated.  For example,
-    a <literal>BEFORE</> trigger might be used to insert the current time into a
+    a <literal>BEFORE</literal> trigger might be used to insert the current time into a
     <type>timestamp</type> column, or to check that two elements of the row are
-    consistent. Row-level <literal>AFTER</> triggers are most sensibly
+    consistent. Row-level <literal>AFTER</literal> triggers are most sensibly
     used to propagate the updates to other tables, or make consistency
     checks against other tables.  The reason for this division of labor is
-    that an <literal>AFTER</> trigger can be certain it is seeing the final
-    value of the row, while a <literal>BEFORE</> trigger cannot; there might
-    be other <literal>BEFORE</> triggers firing after it.  If you have no
-    specific reason to make a trigger <literal>BEFORE</> or
-    <literal>AFTER</>, the <literal>BEFORE</> case is more efficient, since
+    that an <literal>AFTER</literal> trigger can be certain it is seeing the final
+    value of the row, while a <literal>BEFORE</literal> trigger cannot; there might
+    be other <literal>BEFORE</literal> triggers firing after it.  If you have no
+    specific reason to make a trigger <literal>BEFORE</literal> or
+    <literal>AFTER</literal>, the <literal>BEFORE</literal> case is more efficient, since
     the information about
     the operation doesn't have to be saved until end of statement.
    </para>
@@ -285,8 +302,8 @@
 
    <para>
     <indexterm>
-     <primary>trigger</>
-     <secondary>arguments for trigger functions</>
+     <primary>trigger</primary>
+     <secondary>arguments for trigger functions</secondary>
     </indexterm>
     When a trigger is being defined, arguments can be specified for
     it. The purpose of including arguments in the
@@ -309,13 +326,25 @@
     for making the trigger input data available to the trigger function.
     This input data includes the type of trigger event (e.g.,
     <command>INSERT</command> or <command>UPDATE</command>) as well as any
-    arguments that were listed in <command>CREATE TRIGGER</>.
+    arguments that were listed in <command>CREATE TRIGGER</command>.
     For a row-level trigger, the input data also includes the
     <varname>NEW</varname> row for <command>INSERT</command> and
     <command>UPDATE</command> triggers, and/or the <varname>OLD</varname> row
     for <command>UPDATE</command> and <command>DELETE</command> triggers.
-    Statement-level triggers do not currently have any way to examine the
-    individual row(s) modified by the statement.
+   </para>
+
+   <para>
+    By default, statement-level triggers do not have any way to examine the
+    individual row(s) modified by the statement.  But an <literal>AFTER
+    STATEMENT</literal> trigger can request that <firstterm>transition tables</firstterm>
+    be created to make the sets of affected rows available to the trigger.
+    <literal>AFTER ROW</literal> triggers can also request transition tables, so
+    that they can see the total changes in the table as well as the change in
+    the individual row they are currently being fired for.  The method for
+    examining the transition tables again depends on the programming language
+    that is being used, but the typical approach is to make the transition
+    tables act like read-only temporary tables that can be accessed by SQL
+    commands issued within the trigger function.
    </para>
 
   </sect1>
@@ -337,7 +366,7 @@
        Statement-level triggers follow simple visibility rules: none of
        the changes made by a statement are visible to statement-level
        <literal>BEFORE</literal> triggers, whereas all
-       modifications are visible to statement-level <literal>AFTER</>
+       modifications are visible to statement-level <literal>AFTER</literal>
        triggers.
       </para>
      </listitem>
@@ -346,14 +375,14 @@
       <para>
        The data change (insertion, update, or deletion) causing the
        trigger to fire is naturally <emphasis>not</emphasis> visible
-       to SQL commands executed in a row-level <literal>BEFORE</> trigger,
+       to SQL commands executed in a row-level <literal>BEFORE</literal> trigger,
        because it hasn't happened yet.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       However, SQL commands executed in a row-level <literal>BEFORE</>
+       However, SQL commands executed in a row-level <literal>BEFORE</literal>
        trigger <emphasis>will</emphasis> see the effects of data
        changes for rows previously processed in the same outer
        command.  This requires caution, since the ordering of these
@@ -364,15 +393,15 @@
 
      <listitem>
       <para>
-       Similarly, a row-level <literal>INSTEAD OF</> trigger will see the
+       Similarly, a row-level <literal>INSTEAD OF</literal> trigger will see the
        effects of data changes made by previous firings of <literal>INSTEAD
-       OF</> triggers in the same outer command.
+       OF</literal> triggers in the same outer command.
       </para>
      </listitem>
 
      <listitem>
       <para>
-       When a row-level <literal>AFTER</> trigger is fired, all data
+       When a row-level <literal>AFTER</literal> trigger is fired, all data
        changes made
        by the outer command are already complete, and are visible to
        the invoked trigger function.
@@ -384,15 +413,15 @@
    <para>
     If your trigger function is written in any of the standard procedural
     languages, then the above statements apply only if the function is
-    declared <literal>VOLATILE</>.  Functions that are declared
-    <literal>STABLE</> or <literal>IMMUTABLE</> will not see changes made by
+    declared <literal>VOLATILE</literal>.  Functions that are declared
+    <literal>STABLE</literal> or <literal>IMMUTABLE</literal> will not see changes made by
     the calling command in any case.
    </para>
 
    <para>
     Further information about data visibility rules can be found in
-    <xref linkend="spi-visibility">.  The example in <xref
-    linkend="trigger-example"> contains a demonstration of these rules.
+    <xref linkend="spi-visibility"/>.  The example in <xref
+    linkend="trigger-example"/> contains a demonstration of these rules.
    </para>
   </sect1>
 
@@ -420,14 +449,14 @@
    </para>
 
    <para>
-    Trigger functions must use the <quote>version 1</> function manager
+    Trigger functions must use the <quote>version 1</quote> function manager
     interface.
    </para>
 
    <para>
     When a function is called by the trigger manager, it is not passed
-    any normal arguments, but it is passed a <quote>context</>
-    pointer pointing to a <structname>TriggerData</> structure.  C
+    any normal arguments, but it is passed a <quote>context</quote>
+    pointer pointing to a <structname>TriggerData</structname> structure.  C
     functions can check whether they were called from the trigger
     manager or not by executing the macro:
 <programlisting>
@@ -438,10 +467,10 @@ CALLED_AS_TRIGGER(fcinfo)
 ((fcinfo)-&gt;context != NULL &amp;&amp; IsA((fcinfo)-&gt;context, TriggerData))
 </programlisting>
     If this returns true, then it is safe to cast
-    <literal>fcinfo-&gt;context</> to type <literal>TriggerData
+    <literal>fcinfo-&gt;context</literal> to type <literal>TriggerData
     *</literal> and make use of the pointed-to
-    <structname>TriggerData</> structure.  The function must
-    <emphasis>not</emphasis> alter the <structname>TriggerData</>
+    <structname>TriggerData</structname> structure.  The function must
+    <emphasis>not</emphasis> alter the <structname>TriggerData</structname>
     structure or any of the data it points to.
    </para>
 
@@ -469,7 +498,7 @@ typedef struct TriggerData
 
     <variablelist>
      <varlistentry>
-      <term><structfield>type</></term>
+      <term><structfield>type</structfield></term>
       <listitem>
        <para>
         Always <literal>T_TriggerData</literal>.
@@ -478,7 +507,7 @@ typedef struct TriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_event</></term>
+      <term><structfield>tg_event</structfield></term>
       <listitem>
        <para>
         Describes the event for which the function is called. You can use the
@@ -571,24 +600,24 @@ typedef struct TriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_relation</></term>
+      <term><structfield>tg_relation</structfield></term>
       <listitem>
        <para>
         A pointer to a structure describing the relation that the trigger fired for.
-        Look at <filename>utils/rel.h</> for details about
+        Look at <filename>utils/rel.h</filename> for details about
         this structure.  The most interesting things are
-        <literal>tg_relation-&gt;rd_att</> (descriptor of the relation
-        tuples) and <literal>tg_relation-&gt;rd_rel-&gt;relname</>
-        (relation name; the type is not <type>char*</> but
-        <type>NameData</>; use
-        <literal>SPI_getrelname(tg_relation)</> to get a <type>char*</> if you
+        <literal>tg_relation-&gt;rd_att</literal> (descriptor of the relation
+        tuples) and <literal>tg_relation-&gt;rd_rel-&gt;relname</literal>
+        (relation name; the type is not <type>char*</type> but
+        <type>NameData</type>; use
+        <literal>SPI_getrelname(tg_relation)</literal> to get a <type>char*</type> if you
         need a copy of the name).
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_trigtuple</></term>
+      <term><structfield>tg_trigtuple</structfield></term>
       <listitem>
        <para>
         A pointer to the row for which the trigger was fired. This is
@@ -604,11 +633,11 @@ typedef struct TriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_newtuple</></term>
+      <term><structfield>tg_newtuple</structfield></term>
       <listitem>
        <para>
         A pointer to the new version of the row, if the trigger was
-        fired for an <command>UPDATE</command>, and <symbol>NULL</> if
+        fired for an <command>UPDATE</command>, and <symbol>NULL</symbol> if
         it is for an <command>INSERT</command> or a
         <command>DELETE</command>. This is what you have to return
         from the function if the event is an <command>UPDATE</command>
@@ -620,11 +649,11 @@ typedef struct TriggerData
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_trigger</></term>
+      <term><structfield>tg_trigger</structfield></term>
       <listitem>
        <para>
-        A pointer to a structure of type <structname>Trigger</>,
-        defined in <filename>utils/reltrigger.h</>:
+        A pointer to a structure of type <structname>Trigger</structname>,
+        defined in <filename>utils/reltrigger.h</filename>:
 
 <programlisting>
 typedef struct Trigger
@@ -650,9 +679,9 @@ typedef struct Trigger
 } Trigger;
 </programlisting>
 
-       where <structfield>tgname</> is the trigger's name,
-       <structfield>tgnargs</> is the number of arguments in
-       <structfield>tgargs</>, and <structfield>tgargs</> is an array of
+       where <structfield>tgname</structfield> is the trigger's name,
+       <structfield>tgnargs</structfield> is the number of arguments in
+       <structfield>tgargs</structfield>, and <structfield>tgargs</structfield> is an array of
        pointers to the arguments specified in the <command>CREATE
        TRIGGER</command> statement. The other members are for internal use
        only.
@@ -661,7 +690,7 @@ typedef struct Trigger
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_trigtuplebuf</></term>
+      <term><structfield>tg_trigtuplebuf</structfield></term>
       <listitem>
        <para>
         The buffer containing <structfield>tg_trigtuple</structfield>, or <symbol>InvalidBuffer</symbol> if there
@@ -671,7 +700,7 @@ typedef struct Trigger
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_newtuplebuf</></term>
+      <term><structfield>tg_newtuplebuf</structfield></term>
       <listitem>
        <para>
         The buffer containing <structfield>tg_newtuple</structfield>, or <symbol>InvalidBuffer</symbol> if there
@@ -681,24 +710,24 @@ typedef struct Trigger
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_oldtable</></term>
+      <term><structfield>tg_oldtable</structfield></term>
       <listitem>
        <para>
         A pointer to a structure of type <structname>Tuplestorestate</structname>
         containing zero or more rows in the format specified by
-        <structfield>tg_relation</structfield>, or a <symbol>NULL</> pointer
+        <structfield>tg_relation</structfield>, or a <symbol>NULL</symbol> pointer
         if there is no <literal>OLD TABLE</literal> transition relation.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term><structfield>tg_newtable</></term>
+      <term><structfield>tg_newtable</structfield></term>
       <listitem>
        <para>
         A pointer to a structure of type <structname>Tuplestorestate</structname>
         containing zero or more rows in the format specified by
-        <structfield>tg_relation</structfield>, or a <symbol>NULL</> pointer
+        <structfield>tg_relation</structfield>, or a <symbol>NULL</symbol> pointer
         if there is no <literal>NEW TABLE</literal> transition relation.
        </para>
       </listitem>
@@ -709,15 +738,15 @@ typedef struct Trigger
 
    <para>
     To allow queries issued through SPI to reference transition tables, see
-    <xref linkend="spi-spi-register-trigger-data">.
+    <xref linkend="spi-spi-register-trigger-data"/>.
    </para>
 
    <para>
     A trigger function must return either a
-    <structname>HeapTuple</> pointer or a <symbol>NULL</> pointer
-    (<emphasis>not</> an SQL null value, that is, do not set <parameter>isNull</parameter> true).
+    <structname>HeapTuple</structname> pointer or a <symbol>NULL</symbol> pointer
+    (<emphasis>not</emphasis> an SQL null value, that is, do not set <parameter>isNull</parameter> true).
     Be careful to return either
-    <structfield>tg_trigtuple</> or <structfield>tg_newtuple</>,
+    <structfield>tg_trigtuple</structfield> or <structfield>tg_newtuple</structfield>,
     as appropriate, if you don't want to modify the row being operated on.
    </para>
   </sect1>
@@ -732,10 +761,10 @@ typedef struct Trigger
    </para>
 
    <para>
-    The function <function>trigf</> reports the number of rows in the
-    table <structname>ttest</> and skips the actual operation if the
+    The function <function>trigf</function> reports the number of rows in the
+    table <structname>ttest</structname> and skips the actual operation if the
     command attempts to insert a null value into the column
-    <structfield>x</>. (So the trigger acts as a not-null constraint but
+    <structfield>x</structfield>. (So the trigger acts as a not-null constraint but
     doesn't abort the transaction.)
    </para>
 
@@ -829,10 +858,10 @@ trigf(PG_FUNCTION_ARGS)
 
    <para>
     After you have compiled the source code (see <xref
-    linkend="dfunc">), declare the function and the triggers:
+    linkend="dfunc"/>), declare the function and the triggers:
 <programlisting>
 CREATE FUNCTION trigf() RETURNS trigger
-    AS '<replaceable>filename</>'
+    AS '<replaceable>filename</replaceable>'
     LANGUAGE C;
 
 CREATE TRIGGER tbefore BEFORE INSERT OR UPDATE OR DELETE ON ttest
@@ -915,7 +944,7 @@ DELETE 2
    <para>
     There are more complex examples in
     <filename>src/test/regress/regress.c</filename> and
-    in <xref linkend="contrib-spi">.
+    in <xref linkend="contrib-spi"/>.
    </para>
   </sect1>
  </chapter>
diff --git a/doc/src/sgml/tsm-system-rows.sgml b/doc/src/sgml/tsm-system-rows.sgml
index 93aa536664..3dcd948ff8 100644
--- a/doc/src/sgml/tsm-system-rows.sgml
+++ b/doc/src/sgml/tsm-system-rows.sgml
@@ -8,9 +8,9 @@
  </indexterm>
 
  <para>
-  The <filename>tsm_system_rows</> module provides the table sampling method
+  The <filename>tsm_system_rows</filename> module provides the table sampling method
   <literal>SYSTEM_ROWS</literal>, which can be used in
-  the <literal>TABLESAMPLE</> clause of a <xref linkend="sql-select">
+  the <literal>TABLESAMPLE</literal> clause of a <xref linkend="sql-select"/>
   command.
  </para>
 
@@ -38,7 +38,7 @@
 
   <para>
    Here is an example of selecting a sample of a table with
-   <literal>SYSTEM_ROWS</>.  First install the extension:
+   <literal>SYSTEM_ROWS</literal>.  First install the extension:
   </para>
 
 <programlisting>
@@ -55,7 +55,7 @@ SELECT * FROM my_table TABLESAMPLE SYSTEM_ROWS(100);
 
   <para>
    This command will return a sample of 100 rows from the
-   table <structname>my_table</> (unless the table does not have 100
+   table <structname>my_table</structname> (unless the table does not have 100
    visible rows, in which case all its rows are returned).
   </para>
  </sect2>
diff --git a/doc/src/sgml/tsm-system-time.sgml b/doc/src/sgml/tsm-system-time.sgml
index 3f8ff1a026..fd8e999544 100644
--- a/doc/src/sgml/tsm-system-time.sgml
+++ b/doc/src/sgml/tsm-system-time.sgml
@@ -8,9 +8,9 @@
  </indexterm>
 
  <para>
-  The <filename>tsm_system_time</> module provides the table sampling method
+  The <filename>tsm_system_time</filename> module provides the table sampling method
   <literal>SYSTEM_TIME</literal>, which can be used in
-  the <literal>TABLESAMPLE</> clause of a <xref linkend="sql-select">
+  the <literal>TABLESAMPLE</literal> clause of a <xref linkend="sql-select"/>
   command.
  </para>
 
@@ -40,7 +40,7 @@
 
   <para>
    Here is an example of selecting a sample of a table with
-   <literal>SYSTEM_TIME</>.  First install the extension:
+   <literal>SYSTEM_TIME</literal>.  First install the extension:
   </para>
 
 <programlisting>
@@ -56,7 +56,7 @@ SELECT * FROM my_table TABLESAMPLE SYSTEM_TIME(1000);
   </para>
 
   <para>
-   This command will return as large a sample of <structname>my_table</> as
+   This command will return as large a sample of <structname>my_table</structname> as
    it can read in 1 second (1000 milliseconds).  Of course, if the whole
    table can be read in under 1 second, all its rows will be returned.
   </para>
diff --git a/doc/src/sgml/typeconv.sgml b/doc/src/sgml/typeconv.sgml
index 63d41f03f3..cd7de8fe3f 100644
--- a/doc/src/sgml/typeconv.sgml
+++ b/doc/src/sgml/typeconv.sgml
@@ -26,7 +26,7 @@ can be tailored by using <emphasis>explicit</emphasis> type conversion.
 <para>
 This chapter introduces the <productname>PostgreSQL</productname>
 type conversion mechanisms and conventions.
-Refer to the relevant sections in <xref linkend="datatype"> and <xref linkend="functions">
+Refer to the relevant sections in <xref linkend="datatype"/> and <xref linkend="functions"/>
 for more information on specific data types and allowed functions and
 operators.
 </para>
@@ -40,7 +40,7 @@ has an associated data type which determines its behavior and allowed usage.
 <productname>PostgreSQL</productname> has an extensible type system that is
 more general and flexible than other <acronym>SQL</acronym> implementations.
 Hence, most type conversion behavior in <productname>PostgreSQL</productname>
-is governed by general rules rather than by <foreignphrase>ad hoc</>
+is governed by general rules rather than by <foreignphrase>ad hoc</foreignphrase>
 heuristics.  This allows the use of mixed-type expressions even with
 user-defined types.
 </para>
@@ -124,11 +124,11 @@ with, and perhaps converted to, the types of the target columns.
 <para>
 Since all query results from a unionized <command>SELECT</command> statement
 must appear in a single set of columns, the types of the results of each
-<command>SELECT</> clause must be matched up and converted to a uniform set.
-Similarly, the result expressions of a <literal>CASE</> construct must be
-converted to a common type so that the <literal>CASE</> expression as a whole
-has a known output type.  The same holds for <literal>ARRAY</> constructs,
-and for the <function>GREATEST</> and <function>LEAST</> functions.
+<command>SELECT</command> clause must be matched up and converted to a uniform set.
+Similarly, the result expressions of a <literal>CASE</literal> construct must be
+converted to a common type so that the <literal>CASE</literal> expression as a whole
+has a known output type.  The same holds for <literal>ARRAY</literal> constructs,
+and for the <function>GREATEST</function> and <function>LEAST</function> functions.
 </para>
 </listitem>
 </varlistentry>
@@ -139,7 +139,7 @@ and for the <function>GREATEST</> and <function>LEAST</> functions.
 The system catalogs store information about which conversions, or
 <firstterm>casts</firstterm>, exist between which data types, and how to
 perform those conversions.  Additional casts can be added by the user
-with the <xref linkend="sql-createcast">
+with the <xref linkend="sql-createcast"/>
 command.  (This is usually
 done in conjunction with defining new data types.  The set of casts
 between built-in types has been carefully crafted and is best not
@@ -158,7 +158,7 @@ Data types are divided into several basic <firstterm>type
 categories</firstterm>, including <type>boolean</type>, <type>numeric</type>,
 <type>string</type>, <type>bitstring</type>, <type>datetime</type>,
 <type>timespan</type>, <type>geometric</type>, <type>network</type>, and
-user-defined.  (For a list see <xref linkend="catalog-typcategory-table">;
+user-defined.  (For a list see <xref linkend="catalog-typcategory-table"/>;
 but note it is also possible to create custom type categories.)  Within each
 category there can be one or more <firstterm>preferred types</firstterm>, which
 are preferred when there is a choice of possible types.  With careful selection
@@ -213,7 +213,7 @@ should use this new function and no longer do implicit conversion to use the old
    Note that this procedure is indirectly affected
    by the precedence of the operators involved, since that will determine
    which sub-expressions are taken to be the inputs of which operators.
-   See <xref linkend="sql-precedence"> for more information.
+   See <xref linkend="sql-precedence"/> for more information.
   </para>
 
 <procedure>
@@ -225,7 +225,7 @@ Select the operators to be considered from the
 <classname>pg_operator</classname> system catalog.  If a non-schema-qualified
 operator name was used (the usual case), the operators
 considered are those with the matching name and argument count that are
-visible in the current search path (see <xref linkend="ddl-schemas-path">).
+visible in the current search path (see <xref linkend="ddl-schemas-path"/>).
 If a qualified operator name was given, only operators in the specified
 schema are considered.
 </para>
@@ -345,7 +345,7 @@ Some examples follow.
 <title>Factorial Operator Type Resolution</title>
 
 <para>
-There is only one factorial operator (postfix <literal>!</>)
+There is only one factorial operator (postfix <literal>!</literal>)
 defined in the standard catalog, and it takes an argument of type
 <type>bigint</type>.
 The scanner assigns an initial type of <type>integer</type> to the argument
@@ -423,11 +423,11 @@ type to resolve the unknown-type literals as.
 
 <para>
 The <productname>PostgreSQL</productname> operator catalog has several
-entries for the prefix operator <literal>@</>, all of which implement
+entries for the prefix operator <literal>@</literal>, all of which implement
 absolute-value operations for various numeric data types.  One of these
 entries is for type <type>float8</type>, which is the preferred type in
 the numeric category.  Therefore, <productname>PostgreSQL</productname>
-will use that entry when faced with an <type>unknown</> input:
+will use that entry when faced with an <type>unknown</type> input:
 <screen>
 SELECT @ '-4.5' AS "abs";
  abs
@@ -446,9 +446,9 @@ ERROR:  "-4.5e500" is out of range for type double precision
 </para>
 
 <para>
-On the other hand, the prefix operator <literal>~</> (bitwise negation)
+On the other hand, the prefix operator <literal>~</literal> (bitwise negation)
 is defined only for integer data types, not for <type>float8</type>.  So, if we
-try a similar case with <literal>~</>, we get:
+try a similar case with <literal>~</literal>, we get:
 <screen>
 SELECT ~ '20' AS "negation";
 
@@ -457,7 +457,7 @@ HINT:  Could not choose a best candidate operator. You might need to add
 explicit type casts.
 </screen>
 This happens because the system cannot decide which of the several
-possible <literal>~</> operators should be preferred.  We can help
+possible <literal>~</literal> operators should be preferred.  We can help
 it out with an explicit cast:
 <screen>
 SELECT ~ CAST('20' AS int8) AS "negation";
@@ -485,14 +485,14 @@ SELECT array[1,2] &lt;@ '{1,2,3}' as "is subset";
 (1 row)
 </screen>
 The <productname>PostgreSQL</productname> operator catalog has several
-entries for the infix operator <literal>&lt;@</>, but the only two that
+entries for the infix operator <literal>&lt;@</literal>, but the only two that
 could possibly accept an integer array on the left-hand side are
-array inclusion (<type>anyarray</> <literal>&lt;@</> <type>anyarray</>)
-and range inclusion (<type>anyelement</> <literal>&lt;@</> <type>anyrange</>).
+array inclusion (<type>anyarray</type> <literal>&lt;@</literal> <type>anyarray</type>)
+and range inclusion (<type>anyelement</type> <literal>&lt;@</literal> <type>anyrange</type>).
 Since none of these polymorphic pseudo-types (see <xref
-linkend="datatype-pseudo">) are considered preferred, the parser cannot
+linkend="datatype-pseudo"/>) are considered preferred, the parser cannot
 resolve the ambiguity on that basis.
-However, <xref linkend="op-resol-last-unknown"> tells
+However, <xref linkend="op-resol-last-unknown"/> tells
 it to assume that the unknown-type literal is of the same type as the other
 input, that is, integer array.  Now only one of the two operators can match,
 so array inclusion is selected.  (Had range inclusion been selected, we would
@@ -518,19 +518,19 @@ CREATE TABLE mytable (val mytext);
 SELECT * FROM mytable WHERE val = 'foo';
 </screen>
 This query will not use the custom operator.  The parser will first see if
-there is a <type>mytext</> <literal>=</> <type>mytext</> operator
-(<xref linkend="op-resol-exact-unknown">), which there is not;
-then it will consider the domain's base type <type>text</>, and see if
-there is a <type>text</> <literal>=</> <type>text</> operator
-(<xref linkend="op-resol-exact-domain">), which there is;
-so it resolves the <type>unknown</>-type literal as <type>text</> and
-uses the <type>text</> <literal>=</> <type>text</> operator.
+there is a <type>mytext</type> <literal>=</literal> <type>mytext</type> operator
+(<xref linkend="op-resol-exact-unknown"/>), which there is not;
+then it will consider the domain's base type <type>text</type>, and see if
+there is a <type>text</type> <literal>=</literal> <type>text</type> operator
+(<xref linkend="op-resol-exact-domain"/>), which there is;
+so it resolves the <type>unknown</type>-type literal as <type>text</type> and
+uses the <type>text</type> <literal>=</literal> <type>text</type> operator.
 The only way to get the custom operator to be used is to explicitly cast
 the literal:
 <screen>
 SELECT * FROM mytable WHERE val = text 'foo';
 </screen>
-so that the <type>mytext</> <literal>=</> <type>text</> operator is found
+so that the <type>mytext</type> <literal>=</literal> <type>text</type> operator is found
 immediately according to the exact-match rule.  If the best-match rules
 are reached, they actively discriminate against operators on domain types.
 If they did not, such an operator would create too many ambiguous-operator
@@ -564,7 +564,7 @@ Select the functions to be considered from the
 <classname>pg_proc</classname> system catalog.  If a non-schema-qualified
 function name was used, the functions
 considered are those with the matching name and argument count that are
-visible in the current search path (see <xref linkend="ddl-schemas-path">).
+visible in the current search path (see <xref linkend="ddl-schemas-path"/>).
 If a qualified function name was given, only functions in the specified
 schema are considered.
 </para>
@@ -580,8 +580,8 @@ search path position.
 </step>
 <step performance="optional">
 <para>
-If a function is declared with a <literal>VARIADIC</> array parameter, and
-the call does not use the <literal>VARIADIC</> keyword, then the function
+If a function is declared with a <literal>VARIADIC</literal> array parameter, and
+the call does not use the <literal>VARIADIC</literal> keyword, then the function
 is treated as if the array parameter were replaced by one or more occurrences
 of its element type, as needed to match the call.  After such expansion the
 function might have effective argument types identical to some non-variadic
@@ -599,7 +599,7 @@ search path is used.  If there are two or more such functions in the same
 schema with identical parameter types in the non-defaulted positions (which is
 possible if they have different sets of defaultable parameters), the system
 will not be able to determine which to prefer, and so an <quote>ambiguous
-function call</> error will result if no better match to the call can be
+function call</quote> error will result if no better match to the call can be
 found.
 </para>
 </step>
@@ -626,14 +626,14 @@ an unknown-type literal, or a type that is binary-coercible to the named
 data type, or a type that could be converted to the named data type by
 applying that type's I/O functions (that is, the conversion is either to or
 from one of the standard string types).  When these conditions are met,
-the function call is treated as a form of <literal>CAST</> specification.
+the function call is treated as a form of <literal>CAST</literal> specification.
   <footnote>
    <para>
     The reason for this step is to support function-style cast specifications
     in cases where there is not an actual cast function.  If there is a cast
     function, it is conventionally named after its output type, and so there
     is no need to have a special case.  See
-    <xref linkend="sql-createcast">
+    <xref linkend="sql-createcast"/>
     for additional commentary.
    </para>
   </footnote>
@@ -709,7 +709,7 @@ Otherwise, fail.
 </procedure>
 
 <para>
-Note that the <quote>best match</> rules are identical for operator and
+Note that the <quote>best match</quote> rules are identical for operator and
 function type resolution.
 Some examples follow.
 </para>
@@ -790,7 +790,7 @@ SELECT substr(CAST (varchar '1234' AS text), 3);
 <para>
 <note>
 <para>
-The parser learns from the <structname>pg_cast</> catalog that
+The parser learns from the <structname>pg_cast</structname> catalog that
 <type>text</type> and <type>varchar</type>
 are binary-compatible, meaning that one can be passed to a function that
 accepts the other without doing any physical conversion.  Therefore, no
@@ -809,8 +809,8 @@ HINT:  No function matches the given name and argument types. You might need
 to add explicit type casts.
 </screen>
 
-This does not work because <type>integer</> does not have an implicit cast
-to <type>text</>.  An explicit cast will work, however:
+This does not work because <type>integer</type> does not have an implicit cast
+to <type>text</type>.  An explicit cast will work, however:
 <screen>
 SELECT substr(CAST (1234 AS text), 3);
 
@@ -845,8 +845,8 @@ Check for an exact match with the target.
 <step performance="required">
 <para>
 Otherwise, try to convert the expression to the target type.  This is possible
-if an <firstterm>assignment cast</> between the two types is registered in the
-<structname>pg_cast</> catalog (see <xref linkend="sql-createcast">).
+if an <firstterm>assignment cast</firstterm> between the two types is registered in the
+<structname>pg_cast</structname> catalog (see <xref linkend="sql-createcast"/>).
 Alternatively, if the expression is an unknown-type literal, the contents of
 the literal string will be fed to the input conversion routine for the target
 type.
@@ -857,12 +857,12 @@ type.
 <para>
 Check to see if there is a sizing cast for the target type.  A sizing
 cast is a cast from that type to itself.  If one is found in the
-<structname>pg_cast</> catalog, apply it to the expression before storing
+<structname>pg_cast</structname> catalog, apply it to the expression before storing
 into the destination column.  The implementation function for such a cast
 always takes an extra parameter of type <type>integer</type>, which receives
-the destination column's <structfield>atttypmod</> value (typically its
-declared length, although the interpretation of <structfield>atttypmod</>
-varies for different data types), and it may take a third <type>boolean</>
+the destination column's <structfield>atttypmod</structfield> value (typically its
+declared length, although the interpretation of <structfield>atttypmod</structfield>
+varies for different data types), and it may take a third <type>boolean</type>
 parameter that says whether the cast is explicit or implicit.  The cast
 function
 is responsible for applying any length-dependent semantics such as size
@@ -896,11 +896,11 @@ What has really happened here is that the two unknown literals are resolved
 to <type>text</type> by default, allowing the <literal>||</literal> operator
 to be resolved as <type>text</type> concatenation.  Then the <type>text</type>
 result of the operator is converted to <type>bpchar</type> (<quote>blank-padded
-char</>, the internal name of the <type>character</type> data type) to match the target
+char</quote>, the internal name of the <type>character</type> data type) to match the target
 column type.  (Since the conversion from <type>text</type> to
 <type>bpchar</type> is binary-coercible, this conversion does
 not insert any real function call.)  Finally, the sizing function
-<literal>bpchar(bpchar, integer, boolean)</> is found in the system catalog
+<literal>bpchar(bpchar, integer, boolean)</literal> is found in the system catalog
 and applied to the operator's result and the stored column length.  This
 type-specific function performs the required length check and addition of
 padding spaces.
@@ -942,13 +942,13 @@ padding spaces.
 </indexterm>
 
 <para>
-SQL <literal>UNION</> constructs must match up possibly dissimilar
+SQL <literal>UNION</literal> constructs must match up possibly dissimilar
 types to become a single result set.  The resolution algorithm is
 applied separately to each output column of a union query.  The
-<literal>INTERSECT</> and <literal>EXCEPT</> constructs resolve
-dissimilar types in the same way as <literal>UNION</>.  The
-<literal>CASE</>, <literal>ARRAY</>, <literal>VALUES</>,
-<function>GREATEST</> and <function>LEAST</> constructs use the identical
+<literal>INTERSECT</literal> and <literal>EXCEPT</literal> constructs resolve
+dissimilar types in the same way as <literal>UNION</literal>.  The
+<literal>CASE</literal>, <literal>ARRAY</literal>, <literal>VALUES</literal>,
+<function>GREATEST</function> and <function>LEAST</function> constructs use the identical
 algorithm to match up their component expressions and select a result
 data type.
 </para>
@@ -972,7 +972,7 @@ domain's base type for all subsequent steps.
    <para>
     Somewhat like the treatment of domain inputs for operators and
     functions, this behavior allows a domain type to be preserved through
-    a <literal>UNION</> or similar construct, so long as the user is
+    a <literal>UNION</literal> or similar construct, so long as the user is
     careful to ensure that all inputs are implicitly or explicitly of that
     exact type.  Otherwise the domain's base type will be preferred.
    </para>
@@ -1053,9 +1053,9 @@ SELECT 1.2 AS "numeric" UNION SELECT 1;
      1.2
 (2 rows)
 </screen>
-The literal <literal>1.2</> is of type <type>numeric</>,
-and the <type>integer</type> value <literal>1</> can be cast implicitly to
-<type>numeric</>, so that type is used.
+The literal <literal>1.2</literal> is of type <type>numeric</type>,
+and the <type>integer</type> value <literal>1</literal> can be cast implicitly to
+<type>numeric</type>, so that type is used.
 </para>
 </example>
 
@@ -1072,9 +1072,9 @@ SELECT 1 AS "real" UNION SELECT CAST('2.2' AS REAL);
   2.2
 (2 rows)
 </screen>
-Here, since type <type>real</> cannot be implicitly cast to <type>integer</>,
-but <type>integer</> can be implicitly cast to <type>real</>, the union
-result type is resolved as <type>real</>.
+Here, since type <type>real</type> cannot be implicitly cast to <type>integer</type>,
+but <type>integer</type> can be implicitly cast to <type>real</type>, the union
+result type is resolved as <type>real</type>.
 </para>
 </example>
 </sect1>
@@ -1089,38 +1089,38 @@ result type is resolved as <type>real</>.
 
 <para>
 The rules given in the preceding sections will result in assignment
-of non-<type>unknown</> data types to all expressions in a SQL query,
+of non-<type>unknown</type> data types to all expressions in a SQL query,
 except for unspecified-type literals that appear as simple output
-columns of a <command>SELECT</> command.  For example, in
+columns of a <command>SELECT</command> command.  For example, in
 
 <screen>
 SELECT 'Hello World';
 </screen>
 
 there is nothing to identify what type the string literal should be
-taken as.  In this situation <productname>PostgreSQL</> will fall back
-to resolving the literal's type as <type>text</>.
+taken as.  In this situation <productname>PostgreSQL</productname> will fall back
+to resolving the literal's type as <type>text</type>.
 </para>
 
 <para>
-When the <command>SELECT</> is one arm of a <literal>UNION</>
-(or <literal>INTERSECT</> or <literal>EXCEPT</>) construct, or when it
-appears within <command>INSERT ... SELECT</>, this rule is not applied
+When the <command>SELECT</command> is one arm of a <literal>UNION</literal>
+(or <literal>INTERSECT</literal> or <literal>EXCEPT</literal>) construct, or when it
+appears within <command>INSERT ... SELECT</command>, this rule is not applied
 since rules given in preceding sections take precedence.  The type of an
-unspecified-type literal can be taken from the other <literal>UNION</> arm
+unspecified-type literal can be taken from the other <literal>UNION</literal> arm
 in the first case, or from the destination column in the second case.
 </para>
 
 <para>
-<literal>RETURNING</> lists are treated the same as <command>SELECT</>
+<literal>RETURNING</literal> lists are treated the same as <command>SELECT</command>
 output lists for this purpose.
 </para>
 
 <note>
  <para>
-  Prior to <productname>PostgreSQL</> 10, this rule did not exist, and
-  unspecified-type literals in a <command>SELECT</> output list were
-  left as type <type>unknown</>.  That had assorted bad consequences,
+  Prior to <productname>PostgreSQL</productname> 10, this rule did not exist, and
+  unspecified-type literals in a <command>SELECT</command> output list were
+  left as type <type>unknown</type>.  That had assorted bad consequences,
   so it's been changed.
  </para>
 </note>
diff --git a/doc/src/sgml/unaccent.sgml b/doc/src/sgml/unaccent.sgml
index 2b127e6736..a7f5f53041 100644
--- a/doc/src/sgml/unaccent.sgml
+++ b/doc/src/sgml/unaccent.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  <filename>unaccent</> is a text search dictionary that removes accents
+  <filename>unaccent</filename> is a text search dictionary that removes accents
   (diacritic signs) from lexemes.
   It's a filtering dictionary, which means its output is
   always passed to the next dictionary (if any), unlike the normal
@@ -17,7 +17,7 @@
  </para>
 
  <para>
-  The current implementation of <filename>unaccent</> cannot be used as a
+  The current implementation of <filename>unaccent</filename> cannot be used as a
   normalizing dictionary for the <filename>thesaurus</filename> dictionary.
  </para>
 
@@ -25,17 +25,17 @@
   <title>Configuration</title>
 
   <para>
-   An <literal>unaccent</> dictionary accepts the following options:
+   An <literal>unaccent</literal> dictionary accepts the following options:
   </para>
   <itemizedlist>
    <listitem>
     <para>
-     <literal>RULES</> is the base name of the file containing the list of
+     <literal>RULES</literal> is the base name of the file containing the list of
      translation rules.  This file must be stored in
-     <filename>$SHAREDIR/tsearch_data/</> (where <literal>$SHAREDIR</> means
-     the <productname>PostgreSQL</> installation's shared-data directory).
-     Its name must end in <literal>.rules</> (which is not to be included in
-     the <literal>RULES</> parameter).
+     <filename>$SHAREDIR/tsearch_data/</filename> (where <literal>$SHAREDIR</literal> means
+     the <productname>PostgreSQL</productname> installation's shared-data directory).
+     Its name must end in <literal>.rules</literal> (which is not to be included in
+     the <literal>RULES</literal> parameter).
     </para>
    </listitem>
   </itemizedlist>
@@ -72,15 +72,15 @@
 
    <listitem>
     <para>
-     Actually, each <quote>character</> can be any string not containing
-     whitespace, so <filename>unaccent</> dictionaries could be used for
+     Actually, each <quote>character</quote> can be any string not containing
+     whitespace, so <filename>unaccent</filename> dictionaries could be used for
      other sorts of substring substitutions besides diacritic removal.
     </para>
    </listitem>
 
    <listitem>
     <para>
-     As with other <productname>PostgreSQL</> text search configuration files,
+     As with other <productname>PostgreSQL</productname> text search configuration files,
      the rules file must be stored in UTF-8 encoding.  The data is
      automatically translated into the current database's encoding when
      loaded.  Any lines containing untranslatable characters are silently
@@ -92,8 +92,8 @@
 
   <para>
    A more complete example, which is directly useful for most European
-   languages, can be found in <filename>unaccent.rules</>, which is installed
-   in <filename>$SHAREDIR/tsearch_data/</> when the <filename>unaccent</>
+   languages, can be found in <filename>unaccent.rules</filename>, which is installed
+   in <filename>$SHAREDIR/tsearch_data/</filename> when the <filename>unaccent</filename>
    module is installed.  This rules file translates characters with accents
    to the same characters without accents, and it also expands ligatures
    into the equivalent series of simple characters (for example, &AElig; to
@@ -105,11 +105,11 @@
   <title>Usage</title>
 
   <para>
-   Installing the <literal>unaccent</> extension creates a text
-   search template <literal>unaccent</> and a dictionary <literal>unaccent</>
-   based on it.  The <literal>unaccent</> dictionary has the default
-   parameter setting <literal>RULES='unaccent'</>, which makes it immediately
-   usable with the standard <filename>unaccent.rules</> file.
+   Installing the <literal>unaccent</literal> extension creates a text
+   search template <literal>unaccent</literal> and a dictionary <literal>unaccent</literal>
+   based on it.  The <literal>unaccent</literal> dictionary has the default
+   parameter setting <literal>RULES='unaccent'</literal>, which makes it immediately
+   usable with the standard <filename>unaccent.rules</filename> file.
    If you wish, you can alter the parameter, for example
 
 <programlisting>
@@ -132,7 +132,7 @@ mydb=# select ts_lexize('unaccent','H&ocirc;tel');
 
   <para>
    Here is an example showing how to insert the
-   <filename>unaccent</> dictionary into a text search configuration:
+   <filename>unaccent</filename> dictionary into a text search configuration:
 <programlisting>
 mydb=# CREATE TEXT SEARCH CONFIGURATION fr ( COPY = french );
 mydb=# ALTER TEXT SEARCH CONFIGURATION fr
@@ -163,9 +163,9 @@ mydb=# select ts_headline('fr','H&ocirc;tel de la Mer',to_tsquery('fr','Hotels')
  <title>Functions</title>
 
  <para>
-  The <function>unaccent()</> function removes accents (diacritic signs) from
+  The <function>unaccent()</function> function removes accents (diacritic signs) from
   a given string.  Basically, it's a wrapper around
-  <filename>unaccent</>-type dictionaries, but it can be used outside normal
+  <filename>unaccent</filename>-type dictionaries, but it can be used outside normal
   text search contexts.
  </para>
 
@@ -174,12 +174,12 @@ mydb=# select ts_headline('fr','H&ocirc;tel de la Mer',to_tsquery('fr','Hotels')
  </indexterm>
 
 <synopsis>
-unaccent(<optional><replaceable class="PARAMETER">dictionary</replaceable>, </optional> <replaceable class="PARAMETER">string</replaceable>) returns <type>text</type>
+unaccent(<optional><replaceable class="parameter">dictionary</replaceable>, </optional> <replaceable class="parameter">string</replaceable>) returns <type>text</type>
 </synopsis>
 
  <para>
-  If the <replaceable class="PARAMETER">dictionary</replaceable> argument is
-  omitted, <literal>unaccent</> is assumed.
+  If the <replaceable class="parameter">dictionary</replaceable> argument is
+  omitted, <literal>unaccent</literal> is assumed.
  </para>
 
  <para>
diff --git a/doc/src/sgml/user-manag.sgml b/doc/src/sgml/user-manag.sgml
index 46989f0169..94fd4ebf58 100644
--- a/doc/src/sgml/user-manag.sgml
+++ b/doc/src/sgml/user-manag.sgml
@@ -5,18 +5,18 @@
 
  <para>
   <productname>PostgreSQL</productname> manages database access permissions
-  using the concept of <firstterm>roles</>.  A role can be thought of as
+  using the concept of <firstterm>roles</firstterm>.  A role can be thought of as
   either a database user, or a group of database users, depending on how
   the role is set up.  Roles can own database objects (for example, tables
   and functions) and can assign privileges on those objects to other roles to
   control who has access to which objects.  Furthermore, it is possible
-  to grant <firstterm>membership</> in a role to another role, thus
+  to grant <firstterm>membership</firstterm> in a role to another role, thus
   allowing the member role to use privileges assigned to another role.
  </para>
 
  <para>
-  The concept of roles subsumes the concepts of <quote>users</> and
-  <quote>groups</>.  In <productname>PostgreSQL</productname> versions
+  The concept of roles subsumes the concepts of <quote>users</quote> and
+  <quote>groups</quote>.  In <productname>PostgreSQL</productname> versions
   before 8.1, users and groups were distinct kinds of entities, but now
   there are only roles.  Any role can act as a user, a group, or both.
  </para>
@@ -24,7 +24,7 @@
  <para>
   This chapter describes how to create and manage roles.
   More information about the effects of role privileges on various
-  database objects can be found in <xref linkend="ddl-priv">.
+  database objects can be found in <xref linkend="ddl-priv"/>.
  </para>
 
  <sect1 id="database-roles">
@@ -52,16 +52,16 @@
    maintain a correspondence, but this is not required. Database roles
    are global across a database cluster installation (and not
    per individual database). To create a role use the <xref
-   linkend="sql-createrole"> SQL command:
+   linkend="sql-createrole"/> SQL command:
 <synopsis>
 CREATE ROLE <replaceable>name</replaceable>;
 </synopsis>
    <replaceable>name</replaceable> follows the rules for SQL
    identifiers: either unadorned without special characters, or
    double-quoted.  (In practice, you will usually want to add additional
-   options, such as <literal>LOGIN</>, to the command.  More details appear
+   options, such as <literal>LOGIN</literal>, to the command.  More details appear
    below.)  To remove an existing role, use the analogous
-   <xref linkend="sql-droprole"> command:
+   <xref linkend="sql-droprole"/> command:
 <synopsis>
 DROP ROLE <replaceable>name</replaceable>;
 </synopsis>
@@ -76,8 +76,8 @@ DROP ROLE <replaceable>name</replaceable>;
   </indexterm>
 
   <para>
-   For convenience, the programs <xref linkend="app-createuser">
-   and <xref linkend="app-dropuser"> are provided as wrappers
+   For convenience, the programs <xref linkend="app-createuser"/>
+   and <xref linkend="app-dropuser"/> are provided as wrappers
    around these SQL commands that can be called from the shell command
    line:
 <synopsis>
@@ -87,19 +87,19 @@ dropuser <replaceable>name</replaceable>
   </para>
 
   <para>
-   To determine the set of existing roles, examine the <structname>pg_roles</>
+   To determine the set of existing roles, examine the <structname>pg_roles</structname>
    system catalog, for example
 <synopsis>
 SELECT rolname FROM pg_roles;
 </synopsis>
-   The <xref linkend="app-psql"> program's <literal>\du</> meta-command
+   The <xref linkend="app-psql"/> program's <literal>\du</literal> meta-command
    is also useful for listing the existing roles.
   </para>
 
   <para>
    In order to bootstrap the database system, a freshly initialized
    system always contains one predefined role. This role is always
-   a <quote>superuser</>, and by default (unless altered when running
+   a <quote>superuser</quote>, and by default (unless altered when running
    <command>initdb</command>) it will have the same name as the
    operating system user that initialized the database
    cluster. Customarily, this role will be named
@@ -118,7 +118,7 @@ SELECT rolname FROM pg_roles;
    <option>-U</option> command line option to indicate the role to
    connect as.  Many applications assume the name of the current
    operating system user by default (including
-   <command>createuser</> and <command>psql</>).  Therefore it
+   <command>createuser</command> and <command>psql</command>).  Therefore it
    is often convenient to maintain a naming correspondence between
    roles and operating system users.
   </para>
@@ -126,7 +126,7 @@ SELECT rolname FROM pg_roles;
   <para>
    The set of database roles a given client connection can connect as
    is determined by the client authentication setup, as explained in
-   <xref linkend="client-authentication">. (Thus, a client is not
+   <xref linkend="client-authentication"/>. (Thus, a client is not
    limited to connect as the role matching
    its operating system user, just as a person's login name
    need not match his or her real name.)  Since the role
@@ -145,27 +145,27 @@ SELECT rolname FROM pg_roles;
 
     <variablelist>
      <varlistentry>
-      <term>login privilege<indexterm><primary>login privilege</></></term>
+      <term>login privilege<indexterm><primary>login privilege</primary></indexterm></term>
       <listitem>
        <para>
-        Only roles that have the <literal>LOGIN</> attribute can be used
+        Only roles that have the <literal>LOGIN</literal> attribute can be used
         as the initial role name for a database connection.  A role with
-        the <literal>LOGIN</> attribute can be considered the same
-        as a <quote>database user</>.  To create a role with login privilege,
+        the <literal>LOGIN</literal> attribute can be considered the same
+        as a <quote>database user</quote>.  To create a role with login privilege,
         use either:
 <programlisting>
 CREATE ROLE <replaceable>name</replaceable> LOGIN;
 CREATE USER <replaceable>name</replaceable>;
 </programlisting>
-        (<command>CREATE USER</> is equivalent to <command>CREATE ROLE</>
-        except that <command>CREATE USER</> assumes <literal>LOGIN</> by
-        default, while <command>CREATE ROLE</> does not.)
+        (<command>CREATE USER</command> is equivalent to <command>CREATE ROLE</command>
+        except that <command>CREATE USER</command> includes <literal>LOGIN</literal> by
+        default, while <command>CREATE ROLE</command> does not.)
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term>superuser status<indexterm><primary>superuser</></></term>
+      <term>superuser status<indexterm><primary>superuser</primary></indexterm></term>
       <listitem>
        <para>
         A database superuser bypasses all permission checks, except the right
@@ -179,7 +179,7 @@ CREATE USER <replaceable>name</replaceable>;
      </varlistentry>
 
      <varlistentry>
-      <term>database creation<indexterm><primary>database</><secondary>privilege to create</></></term>
+      <term>database creation<indexterm><primary>database</primary><secondary>privilege to create</secondary></indexterm></term>
       <listitem>
        <para>
         A role must be explicitly given permission to create databases
@@ -191,30 +191,30 @@ CREATE USER <replaceable>name</replaceable>;
      </varlistentry>
 
      <varlistentry>
-      <term>role creation<indexterm><primary>role</><secondary>privilege to create</></></term>
+      <term>role creation<indexterm><primary>role</primary><secondary>privilege to create</secondary></indexterm></term>
       <listitem>
        <para>
         A role must be explicitly given permission to create more roles
         (except for superusers, since those bypass all permission
         checks). To create such a role, use <literal>CREATE ROLE
         <replaceable>name</replaceable> CREATEROLE</literal>.
-        A role with <literal>CREATEROLE</> privilege can alter and drop
+        A role with <literal>CREATEROLE</literal> privilege can alter and drop
         other roles, too, as well as grant or revoke membership in them.
         However, to create, alter, drop, or change membership of a
         superuser role, superuser status is required;
-        <literal>CREATEROLE</> is insufficient for that.
+        <literal>CREATEROLE</literal> is insufficient for that.
        </para>
       </listitem>
      </varlistentry>
 
      <varlistentry>
-      <term>initiating replication<indexterm><primary>role</><secondary>privilege to initiate replication</></></term>
+      <term>initiating replication<indexterm><primary>role</primary><secondary>privilege to initiate replication</secondary></indexterm></term>
       <listitem>
        <para>
         A role must explicitly be given permission to initiate streaming
         replication (except for superusers, since those bypass all permission
         checks). A role used for streaming replication must
-        have <literal>LOGIN</> permission as well. To create such a role, use
+        have <literal>LOGIN</literal> permission as well. To create such a role, use
         <literal>CREATE ROLE <replaceable>name</replaceable> REPLICATION
         LOGIN</literal>.
        </para>
@@ -222,32 +222,32 @@ CREATE USER <replaceable>name</replaceable>;
      </varlistentry>
 
      <varlistentry>
-      <term>password<indexterm><primary>password</></></term>
+      <term>password<indexterm><primary>password</primary></indexterm></term>
       <listitem>
        <para>
         A password is only significant if the client authentication
         method requires the user to supply a password when connecting
-        to the database. The <option>password</> and
-        <option>md5</> authentication methods
+        to the database. The <option>password</option> and
+        <option>md5</option> authentication methods
         make use of passwords. Database passwords are separate from
         operating system passwords. Specify a password upon role
         creation with <literal>CREATE ROLE
-        <replaceable>name</replaceable> PASSWORD '<replaceable>string</>'</literal>.
+        <replaceable>name</replaceable> PASSWORD '<replaceable>string</replaceable>'</literal>.
        </para>
       </listitem>
      </varlistentry>
     </variablelist>
 
     A role's attributes can be modified after creation with
-    <command>ALTER ROLE</command>.<indexterm><primary>ALTER ROLE</></>
-    See the reference pages for the <xref linkend="sql-createrole">
-    and <xref linkend="sql-alterrole"> commands for details.
+    <command>ALTER ROLE</command>.<indexterm><primary>ALTER ROLE</primary></indexterm>
+    See the reference pages for the <xref linkend="sql-createrole"/>
+    and <xref linkend="sql-alterrole"/> commands for details.
    </para>
 
   <tip>
    <para>
-    It is good practice to create a role that has the <literal>CREATEDB</>
-    and <literal>CREATEROLE</> privileges, but is not a superuser, and then
+    It is good practice to create a role that has the <literal>CREATEDB</literal>
+    and <literal>CREATEROLE</literal> privileges, but is not a superuser, and then
     use this role for all routine management of databases and roles.  This
     approach avoids the dangers of operating as a superuser for tasks that
     do not really require it.
@@ -257,7 +257,7 @@ CREATE USER <replaceable>name</replaceable>;
   <para>
    A role can also have role-specific defaults for many of the run-time
    configuration settings described in <xref
-   linkend="runtime-config">.  For example, if for some reason you
+   linkend="runtime-config"/>.  For example, if for some reason you
    want to disable index scans (hint: not a good idea) anytime you
    connect, you can use:
 <programlisting>
@@ -269,9 +269,9 @@ ALTER ROLE myname SET enable_indexscan TO off;
    just before the session started.
    You can still alter this setting during the session; it will only
    be the default. To remove a role-specific default setting, use
-   <literal>ALTER ROLE <replaceable>rolename</> RESET <replaceable>varname</></literal>.
+   <literal>ALTER ROLE <replaceable>rolename</replaceable> RESET <replaceable>varname</replaceable></literal>.
    Note that role-specific defaults attached to roles without
-   <literal>LOGIN</> privilege are fairly useless, since they will never
+   <literal>LOGIN</literal> privilege are fairly useless, since they will never
    be invoked.
   </para>
  </sect1>
@@ -280,7 +280,7 @@ ALTER ROLE myname SET enable_indexscan TO off;
   <title>Role Membership</title>
 
   <indexterm zone="role-membership">
-   <primary>role</><secondary>membership in</>
+   <primary>role</primary><secondary>membership in</secondary>
   </indexterm>
 
   <para>
@@ -288,7 +288,7 @@ ALTER ROLE myname SET enable_indexscan TO off;
    management of privileges: that way, privileges can be granted to, or
    revoked from, a group as a whole.  In <productname>PostgreSQL</productname>
    this is done by creating a role that represents the group, and then
-   granting <firstterm>membership</> in the group role to individual user
+   granting <firstterm>membership</firstterm> in the group role to individual user
    roles.
   </para>
 
@@ -297,14 +297,14 @@ ALTER ROLE myname SET enable_indexscan TO off;
 <synopsis>
 CREATE ROLE <replaceable>name</replaceable>;
 </synopsis>
-   Typically a role being used as a group would not have the <literal>LOGIN</>
+   Typically a role being used as a group would not have the <literal>LOGIN</literal>
    attribute, though you can set it if you wish.
   </para>
 
   <para>
    Once the group role exists, you can add and remove members using the
-   <xref linkend="sql-grant"> and
-   <xref linkend="sql-revoke"> commands:
+   <xref linkend="sql-grant"/> and
+   <xref linkend="sql-revoke"/> commands:
 <synopsis>
 GRANT <replaceable>group_role</replaceable> TO <replaceable>role1</replaceable>, ... ;
 REVOKE <replaceable>group_role</replaceable> FROM <replaceable>role1</replaceable>, ... ;
@@ -319,12 +319,12 @@ REVOKE <replaceable>group_role</replaceable> FROM <replaceable>role1</replaceabl
   <para>
    The members of a group role can use the privileges of the role in two
    ways.  First, every member of a group can explicitly do
-   <xref linkend="sql-set-role"> to
-   temporarily <quote>become</> the group role.  In this state, the
+   <xref linkend="sql-set-role"/> to
+   temporarily <quote>become</quote> the group role.  In this state, the
    database session has access to the privileges of the group role rather
    than the original login role, and any database objects created are
    considered owned by the group role not the login role.  Second, member
-   roles that have the <literal>INHERIT</> attribute automatically have use
+   roles that have the <literal>INHERIT</literal> attribute automatically have use
    of the privileges of roles of which they are members, including any
    privileges inherited by those roles.
    As an example, suppose we have done:
@@ -335,25 +335,25 @@ CREATE ROLE wheel NOINHERIT;
 GRANT admin TO joe;
 GRANT wheel TO admin;
 </programlisting>
-   Immediately after connecting as role <literal>joe</>, a database
-   session will have use of privileges granted directly to <literal>joe</>
-   plus any privileges granted to <literal>admin</>, because <literal>joe</>
-   <quote>inherits</> <literal>admin</>'s privileges.  However, privileges
-   granted to <literal>wheel</> are not available, because even though
-   <literal>joe</> is indirectly a member of <literal>wheel</>, the
-   membership is via <literal>admin</> which has the <literal>NOINHERIT</>
+   Immediately after connecting as role <literal>joe</literal>, a database
+   session will have use of privileges granted directly to <literal>joe</literal>
+   plus any privileges granted to <literal>admin</literal>, because <literal>joe</literal>
+   <quote>inherits</quote> <literal>admin</literal>'s privileges.  However, privileges
+   granted to <literal>wheel</literal> are not available, because even though
+   <literal>joe</literal> is indirectly a member of <literal>wheel</literal>, the
+   membership is via <literal>admin</literal> which has the <literal>NOINHERIT</literal>
    attribute.  After:
 <programlisting>
 SET ROLE admin;
 </programlisting>
    the session would have use of only those privileges granted to
-   <literal>admin</>, and not those granted to <literal>joe</>.  After:
+   <literal>admin</literal>, and not those granted to <literal>joe</literal>.  After:
 <programlisting>
 SET ROLE wheel;
 </programlisting>
    the session would have use of only those privileges granted to
-   <literal>wheel</>, and not those granted to either <literal>joe</>
-   or <literal>admin</>.  The original privilege state can be restored
+   <literal>wheel</literal>, and not those granted to either <literal>joe</literal>
+   or <literal>admin</literal>.  The original privilege state can be restored
    with any of:
 <programlisting>
 SET ROLE joe;
@@ -364,10 +364,10 @@ RESET ROLE;
 
   <note>
    <para>
-    The <command>SET ROLE</> command always allows selecting any role
+    The <command>SET ROLE</command> command always allows selecting any role
     that the original login role is directly or indirectly a member of.
     Thus, in the above example, it is not necessary to become
-    <literal>admin</> before becoming <literal>wheel</>.
+    <literal>admin</literal> before becoming <literal>wheel</literal>.
    </para>
   </note>
 
@@ -376,26 +376,26 @@ RESET ROLE;
     In the SQL standard, there is a clear distinction between users and roles,
     and users do not automatically inherit privileges while roles do.  This
     behavior can be obtained in <productname>PostgreSQL</productname> by giving
-    roles being used as SQL roles the <literal>INHERIT</> attribute, while
-    giving roles being used as SQL users the <literal>NOINHERIT</> attribute.
+    roles being used as SQL roles the <literal>INHERIT</literal> attribute, while
+    giving roles being used as SQL users the <literal>NOINHERIT</literal> attribute.
     However, <productname>PostgreSQL</productname> defaults to giving all roles
-    the <literal>INHERIT</> attribute, for backward compatibility with pre-8.1
+    the <literal>INHERIT</literal> attribute, for backward compatibility with pre-8.1
     releases in which users always had use of permissions granted to groups
     they were members of.
    </para>
   </note>
 
   <para>
-   The role attributes <literal>LOGIN</>, <literal>SUPERUSER</>,
-   <literal>CREATEDB</>, and <literal>CREATEROLE</> can be thought of as
+   The role attributes <literal>LOGIN</literal>, <literal>SUPERUSER</literal>,
+   <literal>CREATEDB</literal>, and <literal>CREATEROLE</literal> can be thought of as
    special privileges, but they are never inherited as ordinary privileges
-   on database objects are.  You must actually <command>SET ROLE</> to a
+   on database objects are.  You must actually <command>SET ROLE</command> to a
    specific role having one of these attributes in order to make use of
    the attribute.  Continuing the above example, we might choose to
-   grant <literal>CREATEDB</> and <literal>CREATEROLE</> to the
-   <literal>admin</> role.  Then a session connecting as role <literal>joe</>
+   grant <literal>CREATEDB</literal> and <literal>CREATEROLE</literal> to the
+   <literal>admin</literal> role.  Then a session connecting as role <literal>joe</literal>
    would not have these privileges immediately, only after doing
-   <command>SET ROLE admin</>.
+   <command>SET ROLE admin</command>.
   </para>
 
   <para>
@@ -403,7 +403,7 @@ RESET ROLE;
 
   <para>
    To destroy a group role, use <xref
-   linkend="sql-droprole">:
+   linkend="sql-droprole"/>:
 <synopsis>
 DROP ROLE <replaceable>name</replaceable>;
 </synopsis>
@@ -418,23 +418,23 @@ DROP ROLE <replaceable>name</replaceable>;
   <para>
    Because roles can own database objects and can hold privileges
    to access other objects, dropping a role is often not just a matter of a
-   quick <xref linkend="sql-droprole">.  Any objects owned by the role must
+   quick <xref linkend="sql-droprole"/>.  Any objects owned by the role must
    first be dropped or reassigned to other owners; and any permissions
    granted to the role must be revoked.
   </para>
 
   <para>
    Ownership of objects can be transferred one at a time
-   using <command>ALTER</> commands, for example:
+   using <command>ALTER</command> commands, for example:
 <programlisting>
 ALTER TABLE bobs_table OWNER TO alice;
 </programlisting>
-   Alternatively, the <xref linkend="sql-reassign-owned"> command can be
+   Alternatively, the <xref linkend="sql-reassign-owned"/> command can be
    used to reassign ownership of all objects owned by the role-to-be-dropped
-   to a single other role.  Because <command>REASSIGN OWNED</> cannot access
+   to a single other role.  Because <command>REASSIGN OWNED</command> cannot access
    objects in other databases, it is necessary to run it in each database
    that contains objects owned by the role.  (Note that the first
-   such <command>REASSIGN OWNED</> will change the ownership of any
+   such <command>REASSIGN OWNED</command> will change the ownership of any
    shared-across-databases objects, that is databases or tablespaces, that
    are owned by the role-to-be-dropped.)
   </para>
@@ -442,20 +442,20 @@ ALTER TABLE bobs_table OWNER TO alice;
   <para>
    Once any valuable objects have been transferred to new owners, any
    remaining objects owned by the role-to-be-dropped can be dropped with
-   the <xref linkend="sql-drop-owned"> command.  Again, this command cannot
+   the <xref linkend="sql-drop-owned"/> command.  Again, this command cannot
    access objects in other databases, so it is necessary to run it in each
    database that contains objects owned by the role.  Also, <command>DROP
-   OWNED</> will not drop entire databases or tablespaces, so it is
+   OWNED</command> will not drop entire databases or tablespaces, so it is
    necessary to do that manually if the role owns any databases or
    tablespaces that have not been transferred to new owners.
   </para>
 
   <para>
-   <command>DROP OWNED</> also takes care of removing any privileges granted
+   <command>DROP OWNED</command> also takes care of removing any privileges granted
    to the target role for objects that do not belong to it.
-   Because <command>REASSIGN OWNED</> does not touch such objects, it's
-   typically necessary to run both <command>REASSIGN OWNED</>
-   and <command>DROP OWNED</> (in that order!) to fully remove the
+   Because <command>REASSIGN OWNED</command> does not touch such objects, it's
+   typically necessary to run both <command>REASSIGN OWNED</command>
+   and <command>DROP OWNED</command> (in that order!) to fully remove the
    dependencies of a role to be dropped.
   </para>
 
@@ -477,7 +477,7 @@ DROP ROLE doomed_role;
   </para>
 
   <para>
-   If <command>DROP ROLE</> is attempted while dependent objects still
+   If <command>DROP ROLE</command> is attempted while dependent objects still
    remain, it will issue messages identifying which objects need to be
    reassigned or dropped.
   </para>
@@ -487,7 +487,7 @@ DROP ROLE doomed_role;
   <title>Default Roles</title>
 
   <indexterm zone="default-roles">
-   <primary>role</>
+   <primary>role</primary>
   </indexterm>
 
   <para>
@@ -499,7 +499,7 @@ DROP ROLE doomed_role;
   </para>
 
   <para>
-   The default roles are described in <xref linkend="default-roles-table">.
+   The default roles are described in <xref linkend="default-roles-table"/>.
    Note that the specific permissions for each of the default roles may
    change in the future as additional capabilities are added.  Administrators
    should monitor the release notes for changes.
@@ -571,14 +571,17 @@ GRANT pg_signal_backend TO admin_user;
  </sect1>
 
  <sect1 id="perm-functions">
-  <title>Function and Trigger Security</title>
+  <title>Function Security</title>
 
   <para>
-   Functions and triggers allow users to insert code into the backend
-   server that other users might execute unintentionally. Hence, both
-   mechanisms permit users to <quote>Trojan horse</quote>
-   others with relative ease. The only real protection is tight
-   control over who can define functions.
+   Functions, triggers and row-level security policies allow users to insert
+   code into the backend server that other users might execute
+   unintentionally. Hence, these mechanisms permit users to <quote>Trojan
+   horse</quote> others with relative ease. The strongest protection is tight
+   control over who can define objects. Where that is infeasible, write
+   queries referring only to objects having trusted owners.  Remove
+   from <varname>search_path</varname> the public schema and any other schemas
+   that permit untrusted users to create objects.
   </para>
 
   <para>
@@ -589,7 +592,7 @@ GRANT pg_signal_backend TO admin_user;
    possible to change the server's internal data structures.
    Hence, among many other things, such functions can circumvent any
    system access controls.  Function languages that allow such access
-   are considered <quote>untrusted</>, and
+   are considered <quote>untrusted</quote>, and
    <productname>PostgreSQL</productname> allows only superusers to
    create functions written in those languages.
   </para>
diff --git a/doc/src/sgml/uuid-ossp.sgml b/doc/src/sgml/uuid-ossp.sgml
index 227d4a839c..b3b816c372 100644
--- a/doc/src/sgml/uuid-ossp.sgml
+++ b/doc/src/sgml/uuid-ossp.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>uuid-ossp</> module provides functions to generate universally
+  The <filename>uuid-ossp</filename> module provides functions to generate universally
   unique identifiers (UUIDs) using one of several standard algorithms.  There
   are also functions to produce certain special UUID constants.
  </para>
@@ -17,7 +17,7 @@
   <title><literal>uuid-ossp</literal> Functions</title>
 
   <para>
-   <xref linkend="uuid-ossp-functions"> shows the functions available to
+   <xref linkend="uuid-ossp-functions"/> shows the functions available to
    generate UUIDs.
    The relevant standards ITU-T Rec. X.667, ISO/IEC 9834-8:2005, and RFC
    4122 specify four algorithms for generating UUIDs, identified by the
@@ -63,8 +63,8 @@
        <para>
         This function generates a version 3 UUID in the given namespace using
         the specified input name.  The namespace should be one of the special
-        constants produced by the <function>uuid_ns_*()</> functions shown
-        in <xref linkend="uuid-ossp-constants">.  (It could be any UUID in theory.)  The name is an identifier
+        constants produced by the <function>uuid_ns_*()</function> functions shown
+        in <xref linkend="uuid-ossp-constants"/>.  (It could be any UUID in theory.)  The name is an identifier
         in the selected namespace.
        </para>
 
@@ -114,7 +114,7 @@ SELECT uuid_generate_v3(uuid_ns_url(), 'http://www.postgresql.org');
       <entry><literal>uuid_nil()</literal></entry>
       <entry>
        <para>
-        A <quote>nil</> UUID constant, which does not occur as a real UUID.
+        A <quote>nil</quote> UUID constant, which does not occur as a real UUID.
        </para>
       </entry>
      </row>
@@ -140,7 +140,7 @@ SELECT uuid_generate_v3(uuid_ns_url(), 'http://www.postgresql.org');
        <para>
         Constant designating the ISO object identifier (OID) namespace for
         UUIDs.  (This pertains to ASN.1 OIDs, which are unrelated to the OIDs
-        used in <productname>PostgreSQL</>.)
+        used in <productname>PostgreSQL</productname>.)
        </para>
       </entry>
      </row>
@@ -159,34 +159,34 @@ SELECT uuid_generate_v3(uuid_ns_url(), 'http://www.postgresql.org');
  </sect2>
 
  <sect2>
-  <title>Building <filename>uuid-ossp</></title>
+  <title>Building <filename>uuid-ossp</filename></title>
 
   <para>
    Historically this module depended on the OSSP UUID library, which accounts
    for the module's name.  While the OSSP UUID library can still be found
    at <ulink url="http://www.ossp.org/pkg/lib/uuid/"></ulink>, it is not well
    maintained, and is becoming increasingly difficult to port to newer
-   platforms.  <filename>uuid-ossp</> can now be built without the OSSP
+   platforms.  <filename>uuid-ossp</filename> can now be built without the OSSP
    library on some platforms.  On FreeBSD, NetBSD, and some other BSD-derived
    platforms, suitable UUID creation functions are included in the
-   core <filename>libc</> library.  On Linux, macOS, and some other
-   platforms, suitable functions are provided in the <filename>libuuid</>
-   library, which originally came from the <literal>e2fsprogs</> project
+   core <filename>libc</filename> library.  On Linux, macOS, and some other
+   platforms, suitable functions are provided in the <filename>libuuid</filename>
+   library, which originally came from the <literal>e2fsprogs</literal> project
    (though on modern Linux it is considered part
-   of <literal>util-linux-ng</>).  When invoking <filename>configure</>,
+   of <literal>util-linux-ng</literal>).  When invoking <filename>configure</filename>,
    specify <option>--with-uuid=bsd</option> to use the BSD functions,
    or <option>--with-uuid=e2fs</option> to
-   use <literal>e2fsprogs</>' <filename>libuuid</>, or
+   use <literal>e2fsprogs</literal>' <filename>libuuid</filename>, or
    <option>--with-uuid=ossp</option> to use the OSSP UUID library.
    More than one of these libraries might be available on a particular
-   machine, so <filename>configure</> does not automatically choose one.
+   machine, so <filename>configure</filename> does not automatically choose one.
   </para>
 
   <note>
    <para>
     If you only need randomly-generated (version 4) UUIDs,
-    consider using the <function>gen_random_uuid()</> function
-    from the <xref linkend="pgcrypto"> module instead.
+    consider using the <function>gen_random_uuid()</function> function
+    from the <xref linkend="pgcrypto"/> module instead.
    </para>
   </note>
  </sect2>
diff --git a/doc/src/sgml/vacuumlo.sgml b/doc/src/sgml/vacuumlo.sgml
index 9da61c93fe..0b4dfc2b17 100644
--- a/doc/src/sgml/vacuumlo.sgml
+++ b/doc/src/sgml/vacuumlo.sgml
@@ -28,17 +28,17 @@
   <title>Description</title>
 
  <para>
-  <application>vacuumlo</> is a simple utility program that will remove any
-  <quote>orphaned</> large objects from a
-  <productname>PostgreSQL</> database.  An orphaned large object (LO) is
-  considered to be any LO whose OID does not appear in any <type>oid</> or
-  <type>lo</> data column of the database.
+  <application>vacuumlo</application> is a simple utility program that will remove any
+  <quote>orphaned</quote> large objects from a
+  <productname>PostgreSQL</productname> database.  An orphaned large object (LO) is
+  considered to be any LO whose OID does not appear in any <type>oid</type> or
+  <type>lo</type> data column of the database.
  </para>
 
  <para>
-  If you use this, you may also be interested in the <function>lo_manage</>
-  trigger in the <xref linkend="lo"> module.
-  <function>lo_manage</> is useful to try
+  If you use this, you may also be interested in the <function>lo_manage</function>
+  trigger in the <xref linkend="lo"/> module.
+  <function>lo_manage</function> is useful to try
   to avoid creating orphaned LOs in the first place.
  </para>
 
@@ -55,13 +55,13 @@
 
   <variablelist>
    <varlistentry>
-    <term><option>-l</option> <replaceable>limit</></term>
+    <term><option>-l</option> <replaceable>limit</replaceable></term>
     <listitem>
      <para>
-      Remove no more than <replaceable>limit</> large objects per
+      Remove no more than <replaceable>limit</replaceable> large objects per
       transaction (default 1000).  Since the server acquires a lock per LO
       removed, removing too many LOs in one transaction risks exceeding
-      <xref linkend="guc-max-locks-per-transaction">.  Set the limit to
+      <xref linkend="guc-max-locks-per-transaction"/>.  Set the limit to
       zero if you want all removals done in a single transaction.
      </para>
     </listitem>
@@ -82,8 +82,8 @@
    </varlistentry>
 
    <varlistentry>
-    <term><option>-V</></term>
-    <term><option>--version</></term>
+    <term><option>-V</option></term>
+    <term><option>--version</option></term>
     <listitem>
      <para>
       Print the <application>vacuumlo</application> version and exit.
@@ -92,8 +92,8 @@
    </varlistentry>
 
    <varlistentry>
-    <term><option>-?</></term>
-    <term><option>--help</></term>
+    <term><option>-?</option></term>
+    <term><option>--help</option></term>
     <listitem>
      <para>
       Show help about <application>vacuumlo</application> command line
@@ -110,29 +110,29 @@
 
   <variablelist>
    <varlistentry>
-    <term><option>-h</option> <replaceable>hostname</></term>
+    <term><option>-h</option> <replaceable>hostname</replaceable></term>
     <listitem>
      <para>Database server's host.</para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><option>-p</option> <replaceable>port</></term>
+    <term><option>-p</option> <replaceable>port</replaceable></term>
     <listitem>
      <para>Database server's port.</para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><option>-U</option> <replaceable>username</></term>
+    <term><option>-U</option> <replaceable>username</replaceable></term>
     <listitem>
      <para>User name to connect as.</para>
     </listitem>
    </varlistentry>
 
    <varlistentry>
-    <term><option>-w</></term>
-    <term><option>--no-password</></term>
+    <term><option>-w</option></term>
+    <term><option>--no-password</option></term>
     <listitem>
      <para>
       Never issue a password prompt.  If the server requires password
@@ -158,7 +158,7 @@
       for a password if the server demands password authentication.
       However, <application>vacuumlo</application> will waste a
       connection attempt finding out that the server wants a password.
-      In some cases it is worth typing <option>-W</> to avoid the extra
+      In some cases it is worth typing <option>-W</option> to avoid the extra
       connection attempt.
      </para>
     </listitem>
@@ -172,10 +172,10 @@
 
   <para>
    <application>vacuumlo</application> works by the following method:
-   First, <application>vacuumlo</> builds a temporary table which contains all
+   First, <application>vacuumlo</application> builds a temporary table which contains all
    of the OIDs of the large objects in the selected database.  It then scans
    through all columns in the database that are of type
-   <type>oid</> or <type>lo</>, and removes matching entries from the temporary
+   <type>oid</type> or <type>lo</type>, and removes matching entries from the temporary
    table.  (Note: Only types with these names are considered; in particular,
    domains over them are not considered.)  The remaining entries in the
    temporary table identify orphaned LOs.  These are removed.
diff --git a/doc/src/sgml/wal.sgml b/doc/src/sgml/wal.sgml
index 940c37b21a..f4bc2d4161 100644
--- a/doc/src/sgml/wal.sgml
+++ b/doc/src/sgml/wal.sgml
@@ -13,7 +13,7 @@
 
   <para>
    Reliability is an important property of any serious database
-   system, and <productname>PostgreSQL</> does everything possible to
+   system, and <productname>PostgreSQL</productname> does everything possible to
    guarantee reliable operation. One aspect of reliable operation is
    that all data recorded by a committed transaction should be stored
    in a nonvolatile area that is safe from power loss, operating
@@ -34,21 +34,21 @@
    First, there is the operating system's buffer cache, which caches
    frequently requested disk blocks and combines disk writes. Fortunately,
    all operating systems give applications a way to force writes from
-   the buffer cache to disk, and <productname>PostgreSQL</> uses those
-   features.  (See the <xref linkend="guc-wal-sync-method"> parameter
+   the buffer cache to disk, and <productname>PostgreSQL</productname> uses those
+   features.  (See the <xref linkend="guc-wal-sync-method"/> parameter
    to adjust how this is done.)
   </para>
 
   <para>
    Next, there might be a cache in the disk drive controller; this is
-   particularly common on <acronym>RAID</> controller cards. Some of
-   these caches are <firstterm>write-through</>, meaning writes are sent
+   particularly common on <acronym>RAID</acronym> controller cards. Some of
+   these caches are <firstterm>write-through</firstterm>, meaning writes are sent
    to the drive as soon as they arrive. Others are
-   <firstterm>write-back</>, meaning data is sent to the drive at
+   <firstterm>write-back</firstterm>, meaning data is sent to the drive at
    some later time. Such caches can be a reliability hazard because the
    memory in the disk controller cache is volatile, and will lose its
    contents in a power failure.  Better controller cards have
-   <firstterm>battery-backup units</> (<acronym>BBU</>s), meaning
+   <firstterm>battery-backup units</firstterm> (<acronym>BBU</acronym>s), meaning
    the card has a battery that
    maintains power to the cache in case of system power loss.  After power
    is restored the data will be written to the disk drives.
@@ -71,22 +71,22 @@
   <itemizedlist>
     <listitem>
       <para>
-        On <productname>Linux</>, IDE and SATA drives can be queried using
+        On <productname>Linux</productname>, IDE and SATA drives can be queried using
         <command>hdparm -I</command>; write caching is enabled if there is
-        a <literal>*</> next to <literal>Write cache</>.  <command>hdparm -W 0</>
+        a <literal>*</literal> next to <literal>Write cache</literal>.  <command>hdparm -W 0</command>
         can be used to turn off write caching.  SCSI drives can be queried
-        using <ulink url="http://sg.danny.cz/sg/sdparm.html"><application>sdparm</></ulink>.
+        using <ulink url="http://sg.danny.cz/sg/sdparm.html"><application>sdparm</application></ulink>.
         Use <command>sdparm --get=WCE</command> to check
-        whether the write cache is enabled and <command>sdparm --clear=WCE</>
+        whether the write cache is enabled and <command>sdparm --clear=WCE</command>
         to disable it.
       </para>
     </listitem>
 
     <listitem>
       <para>
-        On <productname>FreeBSD</>, IDE drives can be queried using
+        On <productname>FreeBSD</productname>, IDE drives can be queried using
         <command>atacontrol</command> and write caching turned off using
-        <literal>hw.ata.wc=0</> in <filename>/boot/loader.conf</>;
+        <literal>hw.ata.wc=0</literal> in <filename>/boot/loader.conf</filename>;
         SCSI drives can be queried using <command>camcontrol identify</command>,
         and the write cache both queried and changed using
         <command>sdparm</command> when available.
@@ -95,20 +95,20 @@
 
     <listitem>
       <para>
-        On <productname>Solaris</>, the disk write cache is controlled by
-        <command>format -e</>.
-        (The Solaris <acronym>ZFS</> file system is safe with disk write-cache
+        On <productname>Solaris</productname>, the disk write cache is controlled by
+        <command>format -e</command>.
+        (The Solaris <acronym>ZFS</acronym> file system is safe with disk write-cache
         enabled because it issues its own disk cache flush commands.)
       </para>
     </listitem>
 
     <listitem>
       <para>
-        On <productname>Windows</>, if <varname>wal_sync_method</> is
-        <literal>open_datasync</> (the default), write caching can be disabled
-        by unchecking <literal>My Computer\Open\<replaceable>disk drive</>\Properties\Hardware\Properties\Policies\Enable write caching on the disk</>.
+        On <productname>Windows</productname>, if <varname>wal_sync_method</varname> is
+        <literal>open_datasync</literal> (the default), write caching can be disabled
+        by unchecking <literal>My Computer\Open\<replaceable>disk drive</replaceable>\Properties\Hardware\Properties\Policies\Enable write caching on the disk</literal>.
         Alternatively, set <varname>wal_sync_method</varname> to
-        <literal>fsync</> or <literal>fsync_writethrough</>, which prevent
+        <literal>fsync</literal> or <literal>fsync_writethrough</literal>, which prevent
         write caching.
       </para>
     </listitem>
@@ -116,24 +116,24 @@
     <listitem>
       <para>
         On <productname>macOS</productname>, write caching can be prevented by
-        setting <varname>wal_sync_method</> to <literal>fsync_writethrough</>.
+        setting <varname>wal_sync_method</varname> to <literal>fsync_writethrough</literal>.
       </para>
     </listitem>
   </itemizedlist>
 
   <para>
-   Recent SATA drives (those following <acronym>ATAPI-6</> or later)
-   offer a drive cache flush command (<command>FLUSH CACHE EXT</>),
+   Recent SATA drives (those following <acronym>ATAPI-6</acronym> or later)
+   offer a drive cache flush command (<command>FLUSH CACHE EXT</command>),
    while SCSI drives have long supported a similar command
-   <command>SYNCHRONIZE CACHE</>.  These commands are not directly
-   accessible to <productname>PostgreSQL</>, but some file systems
-   (e.g., <acronym>ZFS</>, <acronym>ext4</>) can use them to flush
+   <command>SYNCHRONIZE CACHE</command>.  These commands are not directly
+   accessible to <productname>PostgreSQL</productname>, but some file systems
+   (e.g., <acronym>ZFS</acronym>, <acronym>ext4</acronym>) can use them to flush
    data to the platters on write-back-enabled drives.  Unfortunately, such
    file systems behave suboptimally when combined with battery-backup unit
-   (<acronym>BBU</>) disk controllers.  In such setups, the synchronize
+   (<acronym>BBU</acronym>) disk controllers.  In such setups, the synchronize
    command forces all data from the controller cache to the disks,
    eliminating much of the benefit of the BBU.  You can run the
-   <xref linkend="pgtestfsync"> program to see
+   <xref linkend="pgtestfsync"/> program to see
    if you are affected.  If you are affected, the performance benefits
    of the BBU can be regained by turning off write barriers in
    the file system or reconfiguring the disk controller, if that is
@@ -164,22 +164,22 @@
    commonly 512 bytes each.  Every physical read or write operation
    processes a whole sector.
    When a write request arrives at the drive, it might be for some multiple
-   of 512 bytes (<productname>PostgreSQL</> typically writes 8192 bytes, or
+   of 512 bytes (<productname>PostgreSQL</productname> typically writes 8192 bytes, or
    16 sectors, at a time), and the process of writing could fail due
    to power loss at any time, meaning some of the 512-byte sectors were
    written while others were not.  To guard against such failures,
-   <productname>PostgreSQL</> periodically writes full page images to
-   permanent WAL storage <emphasis>before</> modifying the actual page on
-   disk. By doing this, during crash recovery <productname>PostgreSQL</> can
+   <productname>PostgreSQL</productname> periodically writes full page images to
+   permanent WAL storage <emphasis>before</emphasis> modifying the actual page on
+   disk. By doing this, during crash recovery <productname>PostgreSQL</productname> can
    restore partially-written pages from WAL.  If you have file-system software
    that prevents partial page writes (e.g., ZFS),  you can turn off
    this page imaging by turning off the <xref
-   linkend="guc-full-page-writes"> parameter. Battery-Backed Unit
+   linkend="guc-full-page-writes"/> parameter. Battery-Backed Unit
    (BBU) disk controllers do not prevent partial page writes unless
    they guarantee that data is written to the BBU as full (8kB) pages.
   </para>
   <para>
-   <productname>PostgreSQL</> also protects against some kinds of data corruption
+   <productname>PostgreSQL</productname> also protects against some kinds of data corruption
    on storage devices that may occur because of hardware errors or media failure over time,
    such as reading/writing garbage data.
    <itemizedlist>
@@ -195,7 +195,7 @@
      <para>
       Data pages are not currently checksummed by default, though full page images
       recorded in WAL records will be protected; see <link
-      linkend="app-initdb-data-checksums"><application>initdb</></link>
+      linkend="app-initdb-data-checksums"><application>initdb</application></link>
       for details about enabling data page checksums.
      </para>
     </listitem>
@@ -224,7 +224,7 @@
    </itemizedlist>
   </para>
   <para>
-   <productname>PostgreSQL</> does not protect against correctable memory errors
+   <productname>PostgreSQL</productname> does not protect against correctable memory errors
    and it is assumed you will operate using RAM that uses industry standard
    Error Correcting Codes (ECC) or better protection.
   </para>
@@ -267,7 +267,7 @@
      causes file system <emphasis>data</emphasis> to be flushed
      to disk.  Fortunately, data flushing during journaling can
      often be disabled with a file system mount option, e.g.
-     <literal>data=writeback</> on a Linux ext3 file system.
+     <literal>data=writeback</literal> on a Linux ext3 file system.
      Journaled file systems do improve boot speed after a crash.
     </para>
    </tip>
@@ -290,7 +290,7 @@
    <para>
     <acronym>WAL</acronym> also makes it possible to support on-line
     backup and point-in-time recovery, as described in <xref
-    linkend="continuous-archiving">.  By archiving the WAL data we can support
+    linkend="continuous-archiving"/>.  By archiving the WAL data we can support
     reverting to any time instant covered by the available WAL data:
     we simply install a prior physical backup of the database, and
     replay the WAL log just as far as the desired time.  What's more,
@@ -313,7 +313,7 @@
    </indexterm>
 
   <para>
-   <firstterm>Asynchronous commit</> is an option that allows transactions
+   <firstterm>Asynchronous commit</firstterm> is an option that allows transactions
    to complete more quickly, at the cost that the most recent transactions may
    be lost if the database should crash.  In many applications this is an
    acceptable trade-off.
@@ -321,7 +321,7 @@
 
   <para>
    As described in the previous section, transaction commit is normally
-   <firstterm>synchronous</>: the server waits for the transaction's
+   <firstterm>synchronous</firstterm>: the server waits for the transaction's
    <acronym>WAL</acronym> records to be flushed to permanent storage
    before returning a success indication to the client.  The client is
    therefore guaranteed that a transaction reported to be committed will
@@ -367,30 +367,30 @@
    transactions running concurrently.  This allows flexible trade-offs
    between performance and certainty of transaction durability.
    The commit mode is controlled by the user-settable parameter
-   <xref linkend="guc-synchronous-commit">, which can be changed in any of
+   <xref linkend="guc-synchronous-commit"/>, which can be changed in any of
    the ways that a configuration parameter can be set.  The mode used for
    any one transaction depends on the value of
    <varname>synchronous_commit</varname> when transaction commit begins.
   </para>
 
   <para>
-   Certain utility commands, for instance <command>DROP TABLE</>, are
+   Certain utility commands, for instance <command>DROP TABLE</command>, are
    forced to commit synchronously regardless of the setting of
    <varname>synchronous_commit</varname>.  This is to ensure consistency
    between the server's file system and the logical state of the database.
    The commands supporting two-phase commit, such as <command>PREPARE
-   TRANSACTION</>, are also always synchronous.
+   TRANSACTION</command>, are also always synchronous.
   </para>
 
   <para>
    If the database crashes during the risk window between an
    asynchronous commit and the writing of the transaction's
    <acronym>WAL</acronym> records,
-   then changes made during that transaction <emphasis>will</> be lost.
+   then changes made during that transaction <emphasis>will</emphasis> be lost.
    The duration of the
    risk window is limited because a background process (the <quote>WAL
-   writer</>) flushes unwritten <acronym>WAL</acronym> records to disk
-   every <xref linkend="guc-wal-writer-delay"> milliseconds.
+   writer</quote>) flushes unwritten <acronym>WAL</acronym> records to disk
+   every <xref linkend="guc-wal-writer-delay"/> milliseconds.
    The actual maximum duration of the risk window is three times
    <varname>wal_writer_delay</varname> because the WAL writer is
    designed to favor writing whole pages at a time during busy periods.
@@ -405,13 +405,13 @@
 
   <para>
    Asynchronous commit provides behavior different from setting
-   <xref linkend="guc-fsync"> = off.
+   <xref linkend="guc-fsync"/> = off.
    <varname>fsync</varname> is a server-wide
    setting that will alter the behavior of all transactions.  It disables
-   all logic within <productname>PostgreSQL</> that attempts to synchronize
+   all logic within <productname>PostgreSQL</productname> that attempts to synchronize
    writes to different portions of the database, and therefore a system
    crash (that is, a hardware or operating system crash, not a failure of
-   <productname>PostgreSQL</> itself) could result in arbitrarily bad
+   <productname>PostgreSQL</productname> itself) could result in arbitrarily bad
    corruption of the database state.  In many scenarios, asynchronous
    commit provides most of the performance improvement that could be
    obtained by turning off <varname>fsync</varname>, but without the risk
@@ -419,7 +419,7 @@
   </para>
 
   <para>
-   <xref linkend="guc-commit-delay"> also sounds very similar to
+   <xref linkend="guc-commit-delay"/> also sounds very similar to
    asynchronous commit, but it is actually a synchronous commit method
    (in fact, <varname>commit_delay</varname> is ignored during an
    asynchronous commit).  <varname>commit_delay</varname> causes a delay
@@ -437,14 +437,14 @@
   <title><acronym>WAL</acronym> Configuration</title>
 
   <para>
-   There are several <acronym>WAL</>-related configuration parameters that
+   There are several <acronym>WAL</acronym>-related configuration parameters that
    affect database performance. This section explains their use.
-   Consult <xref linkend="runtime-config"> for general information about
+   Consult <xref linkend="runtime-config"/> for general information about
    setting server configuration parameters.
   </para>
 
   <para>
-   <firstterm>Checkpoints</firstterm><indexterm><primary>checkpoint</></>
+   <firstterm>Checkpoints</firstterm><indexterm><primary>checkpoint</primary></indexterm>
    are points in the sequence of transactions at which it is guaranteed
    that the heap and index data files have been updated with all
    information written before that checkpoint.  At checkpoint time, all
@@ -472,15 +472,15 @@
   <para>
    The server's checkpointer process automatically performs
    a checkpoint every so often.  A checkpoint is begun every <xref
-   linkend="guc-checkpoint-timeout"> seconds, or if
-   <xref linkend="guc-max-wal-size"> is about to be exceeded,
+   linkend="guc-checkpoint-timeout"/> seconds, or if
+   <xref linkend="guc-max-wal-size"/> is about to be exceeded,
    whichever comes first.
    The default settings are 5 minutes and 1 GB, respectively.
    If no WAL has been written since the previous checkpoint, new checkpoints
-   will be skipped even if <varname>checkpoint_timeout</> has passed.
+   will be skipped even if <varname>checkpoint_timeout</varname> has passed.
    (If WAL archiving is being used and you want to put a lower limit on how
    often files are archived in order to bound potential data loss, you should
-   adjust the <xref linkend="guc-archive-timeout"> parameter rather than the
+   adjust the <xref linkend="guc-archive-timeout"/> parameter rather than the
    checkpoint parameters.)
    It is also possible to force a checkpoint by using the SQL
    command <command>CHECKPOINT</command>.
@@ -492,7 +492,7 @@
    more often. This allows faster after-crash recovery, since less work
    will need to be redone. However, one must balance this against the
    increased cost of flushing dirty data pages more often. If
-   <xref linkend="guc-full-page-writes"> is set (as is the default), there is
+   <xref linkend="guc-full-page-writes"/> is set (as is the default), there is
    another factor to consider. To ensure data page consistency,
    the first modification of a data page after each checkpoint results in
    logging the entire page content. In that case,
@@ -507,15 +507,15 @@
    extra subsequent WAL traffic as discussed above.  It is therefore
    wise to set the checkpointing parameters high enough so that checkpoints
    don't happen too often.  As a simple sanity check on your checkpointing
-   parameters, you can set the <xref linkend="guc-checkpoint-warning">
+   parameters, you can set the <xref linkend="guc-checkpoint-warning"/>
    parameter.  If checkpoints happen closer together than
-   <varname>checkpoint_warning</> seconds,
+   <varname>checkpoint_warning</varname> seconds,
    a message will be output to the server log recommending increasing
    <varname>max_wal_size</varname>.  Occasional appearance of such
    a message is not cause for alarm, but if it appears often then the
    checkpoint control parameters should be increased. Bulk operations such
-   as large <command>COPY</> transfers might cause a number of such warnings
-   to appear if you have not set <varname>max_wal_size</> high
+   as large <command>COPY</command> transfers might cause a number of such warnings
+   to appear if you have not set <varname>max_wal_size</varname> high
    enough.
   </para>
 
@@ -523,14 +523,14 @@
    To avoid flooding the I/O system with a burst of page writes,
    writing dirty buffers during a checkpoint is spread over a period of time.
    That period is controlled by
-   <xref linkend="guc-checkpoint-completion-target">, which is
+   <xref linkend="guc-checkpoint-completion-target"/>, which is
    given as a fraction of the checkpoint interval.
    The I/O rate is adjusted so that the checkpoint finishes when the
    given fraction of
    <varname>checkpoint_timeout</varname> seconds have elapsed, or before
    <varname>max_wal_size</varname> is exceeded, whichever is sooner.
    With the default value of 0.5,
-   <productname>PostgreSQL</> can be expected to complete each checkpoint
+   <productname>PostgreSQL</productname> can be expected to complete each checkpoint
    in about half the time before the next checkpoint starts.  On a system
    that's very close to maximum I/O throughput during normal operation,
    you might want to increase <varname>checkpoint_completion_target</varname>
@@ -546,23 +546,23 @@
   </para>
 
   <para>
-   On Linux and POSIX platforms <xref linkend="guc-checkpoint-flush-after">
+   On Linux and POSIX platforms <xref linkend="guc-checkpoint-flush-after"/>
    allows to force the OS that pages written by the checkpoint should be
    flushed to disk after a configurable number of bytes.  Otherwise, these
    pages may be kept in the OS's page cache, inducing a stall when
-   <literal>fsync</> is issued at the end of a checkpoint.  This setting will
+   <literal>fsync</literal> is issued at the end of a checkpoint.  This setting will
    often help to reduce transaction latency, but it also can an adverse effect
    on performance; particularly for workloads that are bigger than
-   <xref linkend="guc-shared-buffers">, but smaller than the OS's page cache.
+   <xref linkend="guc-shared-buffers"/>, but smaller than the OS's page cache.
   </para>
 
   <para>
-   The number of WAL segment files in <filename>pg_wal</> directory depends on
-   <varname>min_wal_size</>, <varname>max_wal_size</> and
+   The number of WAL segment files in <filename>pg_wal</filename> directory depends on
+   <varname>min_wal_size</varname>, <varname>max_wal_size</varname> and
    the amount of WAL generated in previous checkpoint cycles. When old log
    segment files are no longer needed, they are removed or recycled (that is,
    renamed to become future segments in the numbered sequence). If, due to a
-   short-term peak of log output rate, <varname>max_wal_size</> is
+   short-term peak of log output rate, <varname>max_wal_size</varname> is
    exceeded, the unneeded segment files will be removed until the system
    gets back under this limit. Below that limit, the system recycles enough
    WAL files to cover the estimated need until the next checkpoint, and
@@ -570,7 +570,7 @@
    of WAL files used in previous checkpoint cycles. The moving average
    is increased immediately if the actual usage exceeds the estimate, so it
    accommodates peak usage rather than average usage to some extent.
-   <varname>min_wal_size</> puts a minimum on the amount of WAL files
+   <varname>min_wal_size</varname> puts a minimum on the amount of WAL files
    recycled for future usage; that much WAL is always recycled for future use,
    even if the system is idle and the WAL usage estimate suggests that little
    WAL is needed.
@@ -578,33 +578,33 @@
 
   <para>
    Independently of <varname>max_wal_size</varname>,
-   <xref linkend="guc-wal-keep-segments"> + 1 most recent WAL files are
+   <xref linkend="guc-wal-keep-segments"/> + 1 most recent WAL files are
    kept at all times. Also, if WAL archiving is used, old segments can not be
    removed or recycled until they are archived. If WAL archiving cannot keep up
    with the pace that WAL is generated, or if <varname>archive_command</varname>
-   fails repeatedly, old WAL files will accumulate in <filename>pg_wal</>
+   fails repeatedly, old WAL files will accumulate in <filename>pg_wal</filename>
    until the situation is resolved. A slow or failed standby server that
    uses a replication slot will have the same effect (see
-   <xref linkend="streaming-replication-slots">).
+   <xref linkend="streaming-replication-slots"/>).
   </para>
 
   <para>
    In archive recovery or standby mode, the server periodically performs
-   <firstterm>restartpoints</>,<indexterm><primary>restartpoint</></>
+   <firstterm>restartpoints</firstterm>,<indexterm><primary>restartpoint</primary></indexterm>
    which are similar to checkpoints in normal operation: the server forces
-   all its state to disk, updates the <filename>pg_control</> file to
+   all its state to disk, updates the <filename>pg_control</filename> file to
    indicate that the already-processed WAL data need not be scanned again,
-   and then recycles any old log segment files in the <filename>pg_wal</>
+   and then recycles any old log segment files in the <filename>pg_wal</filename>
    directory.
    Restartpoints can't be performed more frequently than checkpoints in the
    master because restartpoints can only be performed at checkpoint records.
    A restartpoint is triggered when a checkpoint record is reached if at
-   least <varname>checkpoint_timeout</> seconds have passed since the last
+   least <varname>checkpoint_timeout</varname> seconds have passed since the last
    restartpoint, or if WAL size is about to exceed
-   <varname>max_wal_size</>. However, because of limitations on when a
-   restartpoint can be performed, <varname>max_wal_size</> is often exceeded
+   <varname>max_wal_size</varname>. However, because of limitations on when a
+   restartpoint can be performed, <varname>max_wal_size</varname> is often exceeded
    during recovery, by up to one checkpoint cycle's worth of WAL.
-   (<varname>max_wal_size</> is never a hard limit anyway, so you should
+   (<varname>max_wal_size</varname> is never a hard limit anyway, so you should
    always leave plenty of headroom to avoid running out of disk space.)
   </para>
 
@@ -629,21 +629,21 @@
    not occur often enough to prevent <function>XLogInsertRecord</function>
    from having to do writes.  On such systems
    one should increase the number of <acronym>WAL</acronym> buffers by
-   modifying the <xref linkend="guc-wal-buffers"> parameter.  When
-   <xref linkend="guc-full-page-writes"> is set and the system is very busy,
-   setting <varname>wal_buffers</> higher will help smooth response times
+   modifying the <xref linkend="guc-wal-buffers"/> parameter.  When
+   <xref linkend="guc-full-page-writes"/> is set and the system is very busy,
+   setting <varname>wal_buffers</varname> higher will help smooth response times
    during the period immediately following each checkpoint.
   </para>
 
   <para>
-   The <xref linkend="guc-commit-delay"> parameter defines for how many
+   The <xref linkend="guc-commit-delay"/> parameter defines for how many
    microseconds a group commit leader process will sleep after acquiring a
    lock within <function>XLogFlush</function>, while group commit
    followers queue up behind the leader.  This delay allows other server
    processes to add their commit records to the WAL buffers so that all of
    them will be flushed by the leader's eventual sync operation.  No sleep
-   will occur if <xref linkend="guc-fsync"> is not enabled, or if fewer
-   than <xref linkend="guc-commit-siblings"> other sessions are currently
+   will occur if <xref linkend="guc-fsync"/> is not enabled, or if fewer
+   than <xref linkend="guc-commit-siblings"/> other sessions are currently
    in active transactions; this avoids sleeping when it's unlikely that
    any other session will commit soon.  Note that on some platforms, the
    resolution of a sleep request is ten milliseconds, so that any nonzero
@@ -661,7 +661,7 @@
    be chosen intelligently.  The higher that cost is, the more effective
    <varname>commit_delay</varname> is expected to be in increasing
    transaction throughput, up to a point.  The <xref
-   linkend="pgtestfsync"> program can be used to measure the average time
+   linkend="pgtestfsync"/> program can be used to measure the average time
    in microseconds that a single WAL flush operation takes.  A value of
    half of the average time the program reports it takes to flush after a
    single 8kB write operation is often the most effective setting for
@@ -686,7 +686,7 @@
    will consist only of sessions that reach the point where they need to
    flush their commit records during the window in which the previous
    flush operation (if any) is occurring.  At higher client counts a
-   <quote>gangway effect</> tends to occur, so that the effects of group
+   <quote>gangway effect</quote> tends to occur, so that the effects of group
    commit become significant even when <varname>commit_delay</varname> is
    zero, and thus explicitly setting <varname>commit_delay</varname> tends
    to help less.  Setting <varname>commit_delay</varname> can only help
@@ -698,21 +698,21 @@
   </para>
 
   <para>
-   The <xref linkend="guc-wal-sync-method"> parameter determines how
+   The <xref linkend="guc-wal-sync-method"/> parameter determines how
    <productname>PostgreSQL</productname> will ask the kernel to force
    <acronym>WAL</acronym> updates out to disk.
    All the options should be the same in terms of reliability, with
-   the exception of <literal>fsync_writethrough</>, which can sometimes
+   the exception of <literal>fsync_writethrough</literal>, which can sometimes
    force a flush of the disk cache even when other options do not do so.
    However, it's quite platform-specific which one will be the fastest.
    You can test the speeds of different options using the <xref
-   linkend="pgtestfsync"> program.
+   linkend="pgtestfsync"/> program.
    Note that this parameter is irrelevant if <varname>fsync</varname>
    has been turned off.
   </para>
 
   <para>
-   Enabling the <xref linkend="guc-wal-debug"> configuration parameter
+   Enabling the <xref linkend="guc-wal-debug"/> configuration parameter
    (provided that <productname>PostgreSQL</productname> has been
    compiled with support for it) will result in each
    <function>XLogInsertRecord</function> and <function>XLogFlush</function>
@@ -733,7 +733,7 @@
    required from the administrator except ensuring that the
    disk-space requirements for the <acronym>WAL</acronym> logs are met,
    and that any necessary tuning is done (see <xref
-   linkend="wal-configuration">).
+   linkend="wal-configuration"/>).
   </para>
 
   <para>
@@ -742,7 +742,7 @@
    a Log Sequence Number (<acronym>LSN</acronym>) that is a byte offset into
    the logs, increasing monotonically with each new record.
    <acronym>LSN</acronym> values are returned as the datatype
-   <link linkend="datatype-pg-lsn"><type>pg_lsn</></link>. Values can be
+   <link linkend="datatype-pg-lsn"><type>pg_lsn</type></link>. Values can be
    compared to calculate the volume of <acronym>WAL</acronym> data that
    separates them, so they are used to measure the progress of replication
    and recovery.
@@ -752,13 +752,12 @@
    <acronym>WAL</acronym> logs are stored in the directory
    <filename>pg_wal</filename> under the data directory, as a set of
    segment files, normally each 16 MB in size (but the size can be changed
-   by altering the <option>--with-wal-segsize</> configure option when
-   building the server).  Each segment is divided into pages, normally
-   8 kB each (this size can be changed via the <option>--with-wal-blocksize</>
-   configure option).  The log record headers are described in
-   <filename>access/xlogrecord.h</filename>; the record content is dependent
-   on the type of event that is being logged.  Segment files are given
-   ever-increasing numbers as names, starting at
+   by altering the <option>--wal-segsize</option> initdb option).  Each segment is
+   divided into pages, normally 8 kB each (this size can be changed via the
+   <option>--with-wal-blocksize</option> configure option).  The log record headers
+   are described in <filename>access/xlogrecord.h</filename>; the record
+   content is dependent on the type of event that is being logged.  Segment
+   files are given ever-increasing numbers as names, starting at
    <filename>000000010000000000000000</filename>.  The numbers do not wrap,
    but it will take a very, very long time to exhaust the
    available stock of numbers.
@@ -775,14 +774,14 @@
   <para>
    The aim of <acronym>WAL</acronym> is to ensure that the log is
    written before database records are altered, but this can be subverted by
-   disk drives<indexterm><primary>disk drive</></> that falsely report a
+   disk drives<indexterm><primary>disk drive</primary></indexterm> that falsely report a
    successful write to the kernel,
    when in fact they have only cached the data and not yet stored it
    on the disk.  A power failure in such a situation might lead to
    irrecoverable data corruption.  Administrators should try to ensure
    that disks holding <productname>PostgreSQL</productname>'s
    <acronym>WAL</acronym> log files do not make such false reports.
-   (See <xref linkend="wal-reliability">.)
+   (See <xref linkend="wal-reliability"/>.)
   </para>
 
   <para>
@@ -794,7 +793,7 @@
    scanning forward from the log location indicated in the checkpoint
    record.  Because the entire content of data pages is saved in the
    log on the first page modification after a checkpoint (assuming
-   <xref linkend="guc-full-page-writes"> is not disabled), all pages
+   <xref linkend="guc-full-page-writes"/> is not disabled), all pages
    changed since the checkpoint will be restored to a consistent
    state.
   </para>
diff --git a/doc/src/sgml/xaggr.sgml b/doc/src/sgml/xaggr.sgml
index 79a9f288b2..1514e5c388 100644
--- a/doc/src/sgml/xaggr.sgml
+++ b/doc/src/sgml/xaggr.sgml
@@ -41,10 +41,10 @@
   <para>
    If we define an aggregate that does not use a final function,
    we have an aggregate that computes a running function of
-   the column values from each row.  <function>sum</>  is  an
-   example  of  this  kind  of aggregate.  <function>sum</> starts at
+   the column values from each row.  <function>sum</function>  is  an
+   example  of  this  kind  of aggregate.  <function>sum</function> starts at
    zero and always adds the current  row's  value  to
-   its  running  total.  For example, if we want to make a <function>sum</>
+   its  running  total.  For example, if we want to make a <function>sum</function>
    aggregate to work on a data type for complex numbers,
    we only need the addition function for that data type.
    The aggregate definition would be:
@@ -69,7 +69,7 @@ SELECT sum(a) FROM test_complex;
 </programlisting>
 
    (Notice that we are relying on function overloading: there is more than
-    one aggregate named <function>sum</>, but
+    one aggregate named <function>sum</function>, but
    <productname>PostgreSQL</productname> can figure out which kind
    of sum applies to a column of type <type>complex</type>.)
   </para>
@@ -83,17 +83,17 @@ SELECT sum(a) FROM test_complex;
    value is null.  Ordinarily this would mean that the <literal>sfunc</literal>
    would need to check for a null state-value input.  But for
    <function>sum</function> and some other simple aggregates like
-   <function>max</> and <function>min</>,
+   <function>max</function> and <function>min</function>,
    it is sufficient to insert the first nonnull input value into
    the state variable and then start applying the transition function
    at the second nonnull input value.  <productname>PostgreSQL</productname>
    will do that automatically if the initial state value is null and
-   the transition function is marked <quote>strict</> (i.e., not to be called
+   the transition function is marked <quote>strict</quote> (i.e., not to be called
    for null inputs).
   </para>
 
   <para>
-   Another bit of default behavior for a <quote>strict</> transition function
+   Another bit of default behavior for a <quote>strict</quote> transition function
    is that the previous state value is retained unchanged whenever a
    null input value is encountered.  Thus, null values are ignored.  If you
    need some other behavior for null inputs, do not declare your
@@ -102,7 +102,7 @@ SELECT sum(a) FROM test_complex;
   </para>
 
   <para>
-   <function>avg</> (average) is a more complex example of an aggregate.
+   <function>avg</function> (average) is a more complex example of an aggregate.
    It requires
    two pieces of running state: the sum of the inputs and the count
    of the number of inputs.  The final result is obtained by dividing
@@ -124,16 +124,16 @@ CREATE AGGREGATE avg (float8)
 
   <note>
    <para>
-   <function>float8_accum</> requires a three-element array, not just
+   <function>float8_accum</function> requires a three-element array, not just
    two elements, because it accumulates the sum of squares as well as
    the sum and count of the inputs.  This is so that it can be used for
-   some other aggregates as well as <function>avg</>.
+   some other aggregates as well as <function>avg</function>.
    </para>
   </note>
 
   <para>
-   Aggregate function calls in SQL allow <literal>DISTINCT</>
-   and <literal>ORDER BY</> options that control which rows are fed
+   Aggregate function calls in SQL allow <literal>DISTINCT</literal>
+   and <literal>ORDER BY</literal> options that control which rows are fed
    to the aggregate's transition function and in what order.  These
    options are implemented behind the scenes and are not the concern
    of the aggregate's support functions.
@@ -141,7 +141,7 @@ CREATE AGGREGATE avg (float8)
 
   <para>
    For further details see the
-   <xref linkend="sql-createaggregate">
+   <xref linkend="sql-createaggregate"/>
    command.
   </para>
 
@@ -159,16 +159,16 @@ CREATE AGGREGATE avg (float8)
 
   <para>
    Aggregate functions can optionally support <firstterm>moving-aggregate
-   mode</>, which allows substantially faster execution of aggregate
+   mode</firstterm>, which allows substantially faster execution of aggregate
    functions within windows with moving frame starting points.
-   (See <xref linkend="tutorial-window">
-   and <xref linkend="syntax-window-functions"> for information about use of
+   (See <xref linkend="tutorial-window"/>
+   and <xref linkend="syntax-window-functions"/> for information about use of
    aggregate functions as window functions.)
-   The basic idea is that in addition to a normal <quote>forward</>
+   The basic idea is that in addition to a normal <quote>forward</quote>
    transition function, the aggregate provides an <firstterm>inverse
-   transition function</>, which allows rows to be removed from the
+   transition function</firstterm>, which allows rows to be removed from the
    aggregate's running state value when they exit the window frame.
-   For example a <function>sum</> aggregate, which uses addition as the
+   For example a <function>sum</function> aggregate, which uses addition as the
    forward transition function, would use subtraction as the inverse
    transition function.  Without an inverse transition function, the window
    function mechanism must recalculate the aggregate from scratch each time
@@ -193,7 +193,7 @@ CREATE AGGREGATE avg (float8)
   </para>
 
   <para>
-   As an example, we could extend the <function>sum</> aggregate given above
+   As an example, we could extend the <function>sum</function> aggregate given above
    to support moving-aggregate mode like this:
 
 <programlisting>
@@ -209,10 +209,10 @@ CREATE AGGREGATE sum (complex)
 );
 </programlisting>
 
-   The parameters whose names begin with <literal>m</> define the
+   The parameters whose names begin with <literal>m</literal> define the
    moving-aggregate implementation.  Except for the inverse transition
-   function <literal>minvfunc</>, they correspond to the plain-aggregate
-   parameters without <literal>m</>.
+   function <literal>minvfunc</literal>, they correspond to the plain-aggregate
+   parameters without <literal>m</literal>.
   </para>
 
   <para>
@@ -224,10 +224,10 @@ CREATE AGGREGATE sum (complex)
    current frame starting position.  This convention allows moving-aggregate
    mode to be used in situations where there are some infrequent cases that
    are impractical to reverse out of the running state value.  The inverse
-   transition function can <quote>punt</> on these cases, and yet still come
+   transition function can <quote>punt</quote> on these cases, and yet still come
    out ahead so long as it can work for most cases.  As an example, an
    aggregate working with floating-point numbers might choose to punt when
-   a <literal>NaN</> (not a number) input has to be removed from the running
+   a <literal>NaN</literal> (not a number) input has to be removed from the running
    state value.
   </para>
 
@@ -238,8 +238,8 @@ CREATE AGGREGATE sum (complex)
    in results depending on whether the moving-aggregate mode is used.
    An example of an aggregate for which adding an inverse transition
    function seems easy at first, yet where this requirement cannot be met
-   is <function>sum</> over <type>float4</> or <type>float8</> inputs.  A
-   naive declaration of <function>sum(<type>float8</>)</function> could be
+   is <function>sum</function> over <type>float4</type> or <type>float8</type> inputs.  A
+   naive declaration of <function>sum(<type>float8</type>)</function> could be
 
 <programlisting>
 CREATE AGGREGATE unsafe_sum (float8)
@@ -262,13 +262,13 @@ FROM (VALUES (1, 1.0e20::float8),
              (2, 1.0::float8)) AS v (n,x);
 </programlisting>
 
-   This query returns <literal>0</> as its second result, rather than the
-   expected answer of <literal>1</>.  The cause is the limited precision of
-   floating-point values: adding <literal>1</> to <literal>1e20</> results
-   in <literal>1e20</> again, and so subtracting <literal>1e20</> from that
-   yields <literal>0</>, not <literal>1</>.  Note that this is a limitation
+   This query returns <literal>0</literal> as its second result, rather than the
+   expected answer of <literal>1</literal>.  The cause is the limited precision of
+   floating-point values: adding <literal>1</literal> to <literal>1e20</literal> results
+   in <literal>1e20</literal> again, and so subtracting <literal>1e20</literal> from that
+   yields <literal>0</literal>, not <literal>1</literal>.  Note that this is a limitation
    of floating-point arithmetic in general, not a limitation
-   of <productname>PostgreSQL</>.
+   of <productname>PostgreSQL</productname>.
   </para>
 
  </sect2>
@@ -290,7 +290,7 @@ FROM (VALUES (1, 1.0e20::float8),
    Aggregate functions can use polymorphic
    state transition functions or final functions, so that the same functions
    can be used to implement multiple aggregates.
-   See <xref linkend="extend-types-polymorphic">
+   See <xref linkend="extend-types-polymorphic"/>
    for an explanation of polymorphic functions.
    Going a step further, the aggregate function itself can be specified
    with polymorphic input type(s) and state type, allowing a single
@@ -309,7 +309,7 @@ CREATE AGGREGATE array_accum (anyelement)
    Here, the actual state type for any given aggregate call is the array type
    having the actual input type as elements.  The behavior of the aggregate
    is to concatenate all the inputs into an array of that type.
-   (Note: the built-in aggregate <function>array_agg</> provides similar
+   (Note: the built-in aggregate <function>array_agg</function> provides similar
    functionality, with better performance than this definition would have.)
   </para>
 
@@ -344,19 +344,19 @@ SELECT attrelid::regclass, array_accum(atttypid::regtype)
    polymorphic state type, as in the above example.  This is necessary
    because otherwise the final function cannot be declared sensibly: it
    would need to have a polymorphic result type but no polymorphic argument
-   type, which <command>CREATE FUNCTION</> will reject on the grounds that
+   type, which <command>CREATE FUNCTION</command> will reject on the grounds that
    the result type cannot be deduced from a call.  But sometimes it is
    inconvenient to use a polymorphic state type.  The most common case is
    where the aggregate support functions are to be written in C and the
-   state type should be declared as <type>internal</> because there is
+   state type should be declared as <type>internal</type> because there is
    no SQL-level equivalent for it.  To address this case, it is possible to
-   declare the final function as taking extra <quote>dummy</> arguments
+   declare the final function as taking extra <quote>dummy</quote> arguments
    that match the input arguments of the aggregate.  Such dummy arguments
    are always passed as null values since no specific value is available when the
    final function is called.  Their only use is to allow a polymorphic
    final function's result type to be connected to the aggregate's input
    type(s).  For example, the definition of the built-in
-   aggregate <function>array_agg</> is equivalent to
+   aggregate <function>array_agg</function> is equivalent to
 
 <programlisting>
 CREATE FUNCTION array_agg_transfn(internal, anynonarray)
@@ -373,30 +373,30 @@ CREATE AGGREGATE array_agg (anynonarray)
 );
 </programlisting>
 
-   Here, the <literal>finalfunc_extra</> option specifies that the final
+   Here, the <literal>finalfunc_extra</literal> option specifies that the final
    function receives, in addition to the state value, extra dummy
    argument(s) corresponding to the aggregate's input argument(s).
-   The extra <type>anynonarray</> argument allows the declaration
-   of <function>array_agg_finalfn</> to be valid.
+   The extra <type>anynonarray</type> argument allows the declaration
+   of <function>array_agg_finalfn</function> to be valid.
   </para>
 
   <para>
    An aggregate function can be made to accept a varying number of arguments
-   by declaring its last argument as a <literal>VARIADIC</> array, in much
+   by declaring its last argument as a <literal>VARIADIC</literal> array, in much
    the same fashion as for regular functions; see
-   <xref linkend="xfunc-sql-variadic-functions">.  The aggregate's transition
+   <xref linkend="xfunc-sql-variadic-functions"/>.  The aggregate's transition
    function(s) must have the same array type as their last argument.  The
-   transition function(s) typically would also be marked <literal>VARIADIC</>,
+   transition function(s) typically would also be marked <literal>VARIADIC</literal>,
    but this is not strictly required.
   </para>
 
   <note>
    <para>
     Variadic aggregates are easily misused in connection with
-    the <literal>ORDER BY</> option (see <xref linkend="syntax-aggregates">),
+    the <literal>ORDER BY</literal> option (see <xref linkend="syntax-aggregates"/>),
     since the parser cannot tell whether the wrong number of actual arguments
     have been given in such a combination.  Keep in mind that everything to
-    the right of <literal>ORDER BY</> is a sort key, not an argument to the
+    the right of <literal>ORDER BY</literal> is a sort key, not an argument to the
     aggregate.  For example, in
 <programlisting>
 SELECT myaggregate(a ORDER BY a, b, c) FROM ...
@@ -406,7 +406,7 @@ SELECT myaggregate(a ORDER BY a, b, c) FROM ...
 <programlisting>
 SELECT myaggregate(a, b, c ORDER BY a) FROM ...
 </programlisting>
-    If <literal>myaggregate</> is variadic, both these calls could be
+    If <literal>myaggregate</literal> is variadic, both these calls could be
     perfectly valid.
    </para>
 
@@ -427,19 +427,19 @@ SELECT myaggregate(a, b, c ORDER BY a) FROM ...
   </indexterm>
 
   <para>
-   The aggregates we have been describing so far are <quote>normal</>
-   aggregates.  <productname>PostgreSQL</> also
-   supports <firstterm>ordered-set aggregates</>, which differ from
+   The aggregates we have been describing so far are <quote>normal</quote>
+   aggregates.  <productname>PostgreSQL</productname> also
+   supports <firstterm>ordered-set aggregates</firstterm>, which differ from
    normal aggregates in two key ways.  First, in addition to ordinary
    aggregated arguments that are evaluated once per input row, an
-   ordered-set aggregate can have <quote>direct</> arguments that are
+   ordered-set aggregate can have <quote>direct</quote> arguments that are
    evaluated only once per aggregation operation.  Second, the syntax
    for the ordinary aggregated arguments specifies a sort ordering
    for them explicitly.  An ordered-set aggregate is usually
    used to implement a computation that depends on a specific row
    ordering, for instance rank or percentile, so that the sort ordering
    is a required aspect of any call.  For example, the built-in
-   definition of <function>percentile_disc</> is equivalent to:
+   definition of <function>percentile_disc</function> is equivalent to:
 
 <programlisting>
 CREATE FUNCTION ordered_set_transition(internal, anyelement)
@@ -456,7 +456,7 @@ CREATE AGGREGATE percentile_disc (float8 ORDER BY anyelement)
 );
 </programlisting>
 
-   This aggregate takes a <type>float8</> direct argument (the percentile
+   This aggregate takes a <type>float8</type> direct argument (the percentile
    fraction) and an aggregated input that can be of any sortable data type.
    It could be used to obtain a median household income like this:
 
@@ -467,26 +467,33 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
            50489
 </programlisting>
 
-   Here, <literal>0.5</> is a direct argument; it would make no sense
+   Here, <literal>0.5</literal> is a direct argument; it would make no sense
    for the percentile fraction to be a value varying across rows.
   </para>
 
   <para>
    Unlike the case for normal aggregates, the sorting of input rows for
-   an ordered-set aggregate is <emphasis>not</> done behind the scenes,
+   an ordered-set aggregate is <emphasis>not</emphasis> done behind the scenes,
    but is the responsibility of the aggregate's support functions.
    The typical implementation approach is to keep a reference to
-   a <quote>tuplesort</> object in the aggregate's state value, feed the
+   a <quote>tuplesort</quote> object in the aggregate's state value, feed the
    incoming rows into that object, and then complete the sorting and
    read out the data in the final function.  This design allows the
    final function to perform special operations such as injecting
-   additional <quote>hypothetical</> rows into the data to be sorted.
+   additional <quote>hypothetical</quote> rows into the data to be sorted.
    While normal aggregates can often be implemented with support
    functions written in <application>PL/pgSQL</application> or another
    PL language, ordered-set aggregates generally have to be written in
    C, since their state values aren't definable as any SQL data type.
    (In the above example, notice that the state value is declared as
-   type <type>internal</> &mdash; this is typical.)
+   type <type>internal</type> &mdash; this is typical.)
+   Also, because the final function performs the sort, it is not possible
+   to continue adding input rows by executing the transition function again
+   later.  This means the final function is not <literal>READ_ONLY</literal>;
+   it must be declared in <xref linkend="sql-createaggregate"/>
+   as <literal>READ_WRITE</literal>, or as <literal>SHARABLE</literal> if it's
+   possible for additional final-function calls to make use of the
+   already-sorted state.
   </para>
 
   <para>
@@ -496,9 +503,9 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
    same definition as for normal aggregates, but note that the direct
    arguments (if any) are not provided.  The final function receives
    the last state value, the values of the direct arguments if any,
-   and (if <literal>finalfunc_extra</> is specified) null values
+   and (if <literal>finalfunc_extra</literal> is specified) null values
    corresponding to the aggregated input(s).  As with normal
-   aggregates, <literal>finalfunc_extra</> is only really useful if the
+   aggregates, <literal>finalfunc_extra</literal> is only really useful if the
    aggregate is polymorphic; then the extra dummy argument(s) are needed
    to connect the final function's result type to the aggregate's input
    type(s).
@@ -521,7 +528,7 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 
   <para>
    Optionally, an aggregate function can support <firstterm>partial
-   aggregation</>.  The idea of partial aggregation is to run the aggregate's
+   aggregation</firstterm>.  The idea of partial aggregation is to run the aggregate's
    state transition function over different subsets of the input data
    independently, and then to combine the state values resulting from those
    subsets to produce the same state value that would have resulted from
@@ -536,7 +543,7 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 
   <para>
    To support partial aggregation, the aggregate definition must provide
-   a <firstterm>combine function</>, which takes two values of the
+   a <firstterm>combine function</firstterm>, which takes two values of the
    aggregate's state type (representing the results of aggregating over two
    subsets of the input rows) and produces a new value of the state type,
    representing what the state would have been after aggregating over the
@@ -547,10 +554,10 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
   </para>
 
   <para>
-   As simple examples, <literal>MAX</> and <literal>MIN</> aggregates can be
+   As simple examples, <literal>MAX</literal> and <literal>MIN</literal> aggregates can be
    made to support partial aggregation by specifying the combine function as
    the same greater-of-two or lesser-of-two comparison function that is used
-   as their transition function.  <literal>SUM</> aggregates just need an
+   as their transition function.  <literal>SUM</literal> aggregates just need an
    addition function as combine function.  (Again, this is the same as their
    transition function, unless the state value is wider than the input data
    type.)
@@ -561,26 +568,26 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
    happens to take a value of the state type, not of the underlying input
    type, as its second argument.  In particular, the rules for dealing
    with null values and strict functions are similar.  Also, if the aggregate
-   definition specifies a non-null <literal>initcond</>, keep in mind that
+   definition specifies a non-null <literal>initcond</literal>, keep in mind that
    that will be used not only as the initial state for each partial
    aggregation run, but also as the initial state for the combine function,
    which will be called to combine each partial result into that state.
   </para>
 
   <para>
-   If the aggregate's state type is declared as <type>internal</>, it is
+   If the aggregate's state type is declared as <type>internal</type>, it is
    the combine function's responsibility that its result is allocated in
    the correct memory context for aggregate state values.  This means in
-   particular that when the first input is <literal>NULL</> it's invalid
+   particular that when the first input is <literal>NULL</literal> it's invalid
    to simply return the second input, as that value will be in the wrong
    context and will not have sufficient lifespan.
   </para>
 
   <para>
-   When the aggregate's state type is declared as <type>internal</>, it is
+   When the aggregate's state type is declared as <type>internal</type>, it is
    usually also appropriate for the aggregate definition to provide a
-   <firstterm>serialization function</> and a <firstterm>deserialization
-   function</>, which allow such a state value to be copied from one process
+   <firstterm>serialization function</firstterm> and a <firstterm>deserialization
+   function</firstterm>, which allow such a state value to be copied from one process
    to another.  Without these functions, parallel aggregation cannot be
    performed, and future applications such as local/remote aggregation will
    probably not work either.
@@ -588,11 +595,11 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 
   <para>
    A serialization function must take a single argument of
-   type <type>internal</> and return a result of type <type>bytea</>, which
+   type <type>internal</type> and return a result of type <type>bytea</type>, which
    represents the state value packaged up into a flat blob of bytes.
    Conversely, a deserialization function reverses that conversion.  It must
-   take two arguments of types <type>bytea</> and <type>internal</>, and
-   return a result of type <type>internal</>.  (The second argument is unused
+   take two arguments of types <type>bytea</type> and <type>internal</type>, and
+   return a result of type <type>internal</type>.  (The second argument is unused
    and is always zero, but it is required for type-safety reasons.)  The
    result of the deserialization function should simply be allocated in the
    current memory context, as unlike the combine function's result, it is not
@@ -601,7 +608,7 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
 
   <para>
    Worth noting also is that for an aggregate to be executed in parallel,
-   the aggregate itself must be marked <literal>PARALLEL SAFE</>.  The
+   the aggregate itself must be marked <literal>PARALLEL SAFE</literal>.  The
    parallel-safety markings on its support functions are not consulted.
   </para>
 
@@ -618,31 +625,30 @@ SELECT percentile_disc(0.5) WITHIN GROUP (ORDER BY income) FROM households;
   <para>
    A function written in C can detect that it is being called as an
    aggregate support function by calling
-   <function>AggCheckCallContext</>, for example:
+   <function>AggCheckCallContext</function>, for example:
 <programlisting>
 if (AggCheckCallContext(fcinfo, NULL))
 </programlisting>
-   One reason for checking this is that when it is true for a transition
-   function, the first input
+   One reason for checking this is that when it is true, the first input
    must be a temporary state value and can therefore safely be modified
    in-place rather than allocating a new copy.
-   See <function>int8inc()</> for an example.
-   (This is the <emphasis>only</>
-   case where it is safe for a function to modify a pass-by-reference input.
-   In particular, final functions for normal aggregates must not
-   modify their inputs in any case, because in some cases they will be
-   re-executed on the same final state value.)
+   See <function>int8inc()</function> for an example.
+   (While aggregate transition functions are always allowed to modify
+   the transition value in-place, aggregate final functions are generally
+   discouraged from doing so; if they do so, the behavior must be declared
+   when creating the aggregate.  See <xref linkend="sql-createaggregate"/>
+   for more detail.)
   </para>
 
   <para>
-   The second argument of <function>AggCheckCallContext</> can be used to
+   The second argument of <function>AggCheckCallContext</function> can be used to
    retrieve the memory context in which aggregate state values are being kept.
-   This is useful for transition functions that wish to use <quote>expanded</>
-   objects (see <xref linkend="xtypes-toast">) as their state values.
+   This is useful for transition functions that wish to use <quote>expanded</quote>
+   objects (see <xref linkend="xtypes-toast"/>) as their state values.
    On first call, the transition function should return an expanded object
    whose memory context is a child of the aggregate state context, and then
    keep returning the same expanded object on subsequent calls.  See
-   <function>array_append()</> for an example.  (<function>array_append()</>
+   <function>array_append()</function> for an example.  (<function>array_append()</function>
    is not the transition function of any built-in aggregate, but it is written
    to behave efficiently when used as transition function of a custom
    aggregate.)
@@ -650,12 +656,12 @@ if (AggCheckCallContext(fcinfo, NULL))
 
   <para>
    Another support routine available to aggregate functions written in C
-   is <function>AggGetAggref</>, which returns the <literal>Aggref</>
+   is <function>AggGetAggref</function>, which returns the <literal>Aggref</literal>
    parse node that defines the aggregate call.  This is mainly useful
    for ordered-set aggregates, which can inspect the substructure of
-   the <literal>Aggref</> node to find out what sort ordering they are
+   the <literal>Aggref</literal> node to find out what sort ordering they are
    supposed to implement.  Examples can be found
-   in <filename>orderedsetaggs.c</> in the <productname>PostgreSQL</>
+   in <filename>orderedsetaggs.c</filename> in the <productname>PostgreSQL</productname>
    source code.
   </para>
 
diff --git a/doc/src/sgml/xfunc.sgml b/doc/src/sgml/xfunc.sgml
index cd6dd840ba..bbc3766cc2 100644
--- a/doc/src/sgml/xfunc.sgml
+++ b/doc/src/sgml/xfunc.sgml
@@ -16,24 +16,24 @@
     <listitem>
      <para>
       query language functions (functions written in
-      <acronym>SQL</acronym>) (<xref linkend="xfunc-sql">)
+      <acronym>SQL</acronym>) (<xref linkend="xfunc-sql"/>)
      </para>
     </listitem>
     <listitem>
      <para>
       procedural language functions (functions written in, for
-      example, <application>PL/pgSQL</> or <application>PL/Tcl</>)
-      (<xref linkend="xfunc-pl">)
+      example, <application>PL/pgSQL</application> or <application>PL/Tcl</application>)
+      (<xref linkend="xfunc-pl"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      internal functions (<xref linkend="xfunc-internal">)
+      internal functions (<xref linkend="xfunc-internal"/>)
      </para>
     </listitem>
     <listitem>
      <para>
-      C-language functions (<xref linkend="xfunc-c">)
+      C-language functions (<xref linkend="xfunc-c"/>)
      </para>
     </listitem>
    </itemizedlist>
@@ -63,15 +63,48 @@
 
   <para>
    Throughout this chapter, it can be useful to look at the reference
-   page of the <xref linkend="sql-createfunction"> command to
+   page of the <xref linkend="sql-createfunction"/> command to
    understand the examples better.  Some examples from this chapter
    can be found in <filename>funcs.sql</filename> and
-   <filename>funcs.c</filename> in the <filename>src/tutorial</>
+   <filename>funcs.c</filename> in the <filename>src/tutorial</filename>
    directory in the <productname>PostgreSQL</productname> source
    distribution.
   </para>
   </sect1>
 
+  <sect1 id="xproc">
+   <title>User-defined Procedures</title>
+
+  <indexterm zone="xproc">
+   <primary>procedure</primary>
+   <secondary>user-defined</secondary>
+  </indexterm>
+
+   <para>
+    A procedure is a database object similar to a function.  The difference is
+    that a procedure does not return a value, so there is no return type
+    declaration.  While a function is called as part of a query or DML
+    command, a procedure is called explicitly using
+    the <xref linkend="sql-call"/> statement.
+   </para>
+
+   <para>
+    The explanations on how to define user-defined functions in the rest of
+    this chapter apply to procedures as well, except that
+    the <xref linkend="sql-createprocedure"/> command is used instead, there is
+    no return type, and some other features such as strictness don't apply.
+   </para>
+
+   <para>
+    Collectively, functions and procedures are also known
+    as <firstterm>routines</firstterm><indexterm><primary>routine</primary></indexterm>.
+    There are commands such as <xref linkend="sql-alterroutine"/>
+    and <xref linkend="sql-droproutine"/> that can operate on functions and
+    procedures without having to know which kind it is.  Note, however, that
+    there is no <literal>CREATE ROUTINE</literal> command.
+   </para>
+  </sect1>
+
   <sect1 id="xfunc-sql">
    <title>Query Language (<acronym>SQL</acronym>) Functions</title>
 
@@ -87,7 +120,7 @@
     In the simple (non-set)
     case, the first row of the last query's result will be returned.
     (Bear in mind that <quote>the first row</quote> of a multirow
-    result is not well-defined unless you use <literal>ORDER BY</>.)
+    result is not well-defined unless you use <literal>ORDER BY</literal>.)
     If the last query happens
     to return no rows at all, the null value will be returned.
    </para>
@@ -95,8 +128,8 @@
    <para>
     Alternatively, an SQL function can be declared to return a set (that is,
     multiple rows) by specifying the function's return type as <literal>SETOF
-    <replaceable>sometype</></literal>, or equivalently by declaring it as
-    <literal>RETURNS TABLE(<replaceable>columns</>)</literal>.  In this case
+    <replaceable>sometype</replaceable></literal>, or equivalently by declaring it as
+    <literal>RETURNS TABLE(<replaceable>columns</replaceable>)</literal>.  In this case
     all rows of the last query's result are returned.  Further details appear
     below.
    </para>
@@ -105,9 +138,9 @@
     The body of an SQL function must be a list of SQL
     statements separated by semicolons.  A semicolon after the last
     statement is optional.  Unless the function is declared to return
-    <type>void</>, the last statement must be a <command>SELECT</>,
-    or an <command>INSERT</>, <command>UPDATE</>, or <command>DELETE</>
-    that has a <literal>RETURNING</> clause.
+    <type>void</type>, the last statement must be a <command>SELECT</command>,
+    or an <command>INSERT</command>, <command>UPDATE</command>, or <command>DELETE</command>
+    that has a <literal>RETURNING</literal> clause.
    </para>
 
     <para>
@@ -117,16 +150,16 @@
      modification queries (<command>INSERT</command>,
      <command>UPDATE</command>, and <command>DELETE</command>), as well as
      other SQL commands. (You cannot use transaction control commands, e.g.
-     <command>COMMIT</>, <command>SAVEPOINT</>, and some utility
-     commands, e.g.  <literal>VACUUM</>, in <acronym>SQL</acronym> functions.)
+     <command>COMMIT</command>, <command>SAVEPOINT</command>, and some utility
+     commands, e.g.  <literal>VACUUM</literal>, in <acronym>SQL</acronym> functions.)
      However, the final command
-     must be a <command>SELECT</command> or have a <literal>RETURNING</>
+     must be a <command>SELECT</command> or have a <literal>RETURNING</literal>
      clause that returns whatever is
      specified as the function's return type.  Alternatively, if you
      want to define a SQL function that performs actions but has no
-     useful value to return, you can define it as returning <type>void</>.
+     useful value to return, you can define it as returning <type>void</type>.
      For example, this function removes rows with negative salaries from
-     the <literal>emp</> table:
+     the <literal>emp</literal> table:
 
 <screen>
 CREATE FUNCTION clean_emp() RETURNS void AS '
@@ -147,13 +180,13 @@ SELECT clean_emp();
      <para>
       The entire body of a SQL function is parsed before any of it is
       executed.  While a SQL function can contain commands that alter
-      the system catalogs (e.g., <command>CREATE TABLE</>), the effects
+      the system catalogs (e.g., <command>CREATE TABLE</command>), the effects
       of such commands will not be visible during parse analysis of
       later commands in the function.  Thus, for example,
       <literal>CREATE TABLE foo (...); INSERT INTO foo VALUES(...);</literal>
       will not work as desired if packaged up into a single SQL function,
-      since <structname>foo</> won't exist yet when the <command>INSERT</>
-      command is parsed.  It's recommended to use <application>PL/pgSQL</>
+      since <structname>foo</structname> won't exist yet when the <command>INSERT</command>
+      command is parsed.  It's recommended to use <application>PL/pgSQL</application>
       instead of a SQL function in this type of situation.
      </para>
    </note>
@@ -162,11 +195,11 @@ SELECT clean_emp();
     The syntax of the <command>CREATE FUNCTION</command> command requires
     the function body to be written as a string constant.  It is usually
     most convenient to use dollar quoting (see <xref
-    linkend="sql-syntax-dollar-quoting">) for the string constant.
+    linkend="sql-syntax-dollar-quoting"/>) for the string constant.
     If you choose to use regular single-quoted string constant syntax,
-    you must double single quote marks (<literal>'</>) and backslashes
-    (<literal>\</>) (assuming escape string syntax) in the body of
-    the function (see <xref linkend="sql-syntax-strings">).
+    you must double single quote marks (<literal>'</literal>) and backslashes
+    (<literal>\</literal>) (assuming escape string syntax) in the body of
+    the function (see <xref linkend="sql-syntax-strings"/>).
    </para>
 
    <sect2 id="xfunc-sql-function-arguments">
@@ -189,7 +222,7 @@ SELECT clean_emp();
      is the same as any column name in the current SQL command within the
      function, the column name will take precedence.  To override this,
      qualify the argument name with the name of the function itself, that is
-     <literal><replaceable>function_name</>.<replaceable>argument_name</></literal>.
+     <literal><replaceable>function_name</replaceable>.<replaceable>argument_name</replaceable></literal>.
      (If this would conflict with a qualified column name, again the column
      name wins.  You can avoid the ambiguity by choosing a different alias for
      the table within the SQL command.)
@@ -197,15 +230,15 @@ SELECT clean_emp();
 
     <para>
      In the older numeric approach, arguments are referenced using the syntax
-     <literal>$<replaceable>n</></>: <literal>$1</> refers to the first input
-     argument, <literal>$2</> to the second, and so on.  This will work
+     <literal>$<replaceable>n</replaceable></literal>: <literal>$1</literal> refers to the first input
+     argument, <literal>$2</literal> to the second, and so on.  This will work
      whether or not the particular argument was declared with a name.
     </para>
 
     <para>
      If an argument is of a composite type, then the dot notation,
-     e.g., <literal><replaceable>argname</>.<replaceable>fieldname</></literal> or
-     <literal>$1.<replaceable>fieldname</></literal>, can be used to access attributes of the
+     e.g., <literal><replaceable>argname</replaceable>.<replaceable>fieldname</replaceable></literal> or
+     <literal>$1.<replaceable>fieldname</replaceable></literal>, can be used to access attributes of the
      argument.  Again, you might need to qualify the argument's name with the
      function name to make the form with an argument name unambiguous.
     </para>
@@ -226,7 +259,7 @@ INSERT INTO $1 VALUES (42);
      <para>
       The ability to use names to reference SQL function arguments was added
       in <productname>PostgreSQL</productname> 9.2.  Functions to be used in
-      older servers must use the <literal>$<replaceable>n</></> notation.
+      older servers must use the <literal>$<replaceable>n</replaceable></literal> notation.
      </para>
     </note>
    </sect2>
@@ -258,9 +291,9 @@ SELECT one();
 
     <para>
      Notice that we defined a column alias within the function body for the result of the function
-     (with  the  name <literal>result</>),  but this column alias is not visible
-     outside the function.  Hence,  the  result  is labeled <literal>one</>
-     instead of <literal>result</>.
+     (with  the  name <literal>result</literal>),  but this column alias is not visible
+     outside the function.  Hence,  the  result  is labeled <literal>one</literal>
+     instead of <literal>result</literal>.
     </para>
 
     <para>
@@ -319,11 +352,11 @@ SELECT tf1(17, 100.0);
     </para>
 
     <para>
-     In this example, we chose the name <literal>accountno</> for the first
+     In this example, we chose the name <literal>accountno</literal> for the first
      argument, but this is the same as the name of a column in the
-     <literal>bank</> table.  Within the <command>UPDATE</> command,
-     <literal>accountno</> refers to the column <literal>bank.accountno</>,
-     so <literal>tf1.accountno</> must be used to refer to the argument.
+     <literal>bank</literal> table.  Within the <command>UPDATE</command> command,
+     <literal>accountno</literal> refers to the column <literal>bank.accountno</literal>,
+     so <literal>tf1.accountno</literal> must be used to refer to the argument.
      We could of course avoid this by using a different name for the argument.
     </para>
 
@@ -342,7 +375,7 @@ $$ LANGUAGE SQL;
 </programlisting>
 
      which adjusts the balance and returns the new balance.
-     The same thing could be done in one command using <literal>RETURNING</>:
+     The same thing could be done in one command using <literal>RETURNING</literal>:
 
 <programlisting>
 CREATE FUNCTION tf1 (accountno integer, debit numeric) RETURNS numeric AS $$
@@ -351,6 +384,31 @@ CREATE FUNCTION tf1 (accountno integer, debit numeric) RETURNS numeric AS $$
         WHERE accountno = tf1.accountno
     RETURNING balance;
 $$ LANGUAGE SQL;
+</programlisting>
+    </para>
+
+    <para>
+     A <acronym>SQL</acronym> function must return exactly its declared
+     result type.  This may require inserting an explicit cast.
+     For example, suppose we wanted the
+     previous <function>add_em</function> function to return
+     type <type>float8</type> instead.  This won't work:
+
+<programlisting>
+CREATE FUNCTION add_em(integer, integer) RETURNS float8 AS $$
+    SELECT $1 + $2;
+$$ LANGUAGE SQL;
+</programlisting>
+
+     even though in other contexts <productname>PostgreSQL</productname>
+     would be willing to insert an implicit cast to
+     convert <type>integer</type> to <type>float8</type>.
+     We need to write it as
+
+<programlisting>
+CREATE FUNCTION add_em(integer, integer) RETURNS float8 AS $$
+    SELECT ($1 + $2)::float8;
+$$ LANGUAGE SQL;
 </programlisting>
     </para>
    </sect2>
@@ -394,8 +452,8 @@ SELECT name, double_salary(emp.*) AS dream
     <para>
      Notice the use of the syntax <literal>$1.salary</literal>
      to select one field of the argument row value.  Also notice
-     how the calling <command>SELECT</> command
-     uses <replaceable>table_name</><literal>.*</> to select
+     how the calling <command>SELECT</command> command
+     uses <replaceable>table_name</replaceable><literal>.*</literal> to select
      the entire current row of a table as a composite value.  The table
      row can alternatively be referenced using just the table name,
      like this:
@@ -405,13 +463,13 @@ SELECT name, double_salary(emp) AS dream
     WHERE emp.cubicle ~= point '(2,1)';
 </screen>
      but this usage is deprecated since it's easy to get confused.
-     (See <xref linkend="rowtypes-usage"> for details about these
+     (See <xref linkend="rowtypes-usage"/> for details about these
      two notations for the composite value of a table row.)
     </para>
 
     <para>
      Sometimes it is handy to construct a composite argument value
-     on-the-fly.  This can be done with the <literal>ROW</> construct.
+     on-the-fly.  This can be done with the <literal>ROW</literal> construct.
      For example, we could adjust the data being passed to the function:
 <screen>
 SELECT name, double_salary(ROW(name, salary*1.1, age, cubicle)) AS dream
@@ -452,13 +510,16 @@ $$ LANGUAGE SQL;
       </listitem>
       <listitem>
        <para>
-        You must typecast the expressions to match the
-        definition of the composite type, or you will get errors like this:
+        We must ensure each expression's type matches the corresponding
+        column of the composite type, inserting a cast if necessary.
+        Otherwise we'll get errors like this:
 <screen>
 <computeroutput>
 ERROR:  function declared to return emp returns varchar instead of text at column 1
 </computeroutput>
 </screen>
+        As with the base-type case, the function will not insert any casts
+        automatically.
        </para>
       </listitem>
      </itemizedlist>
@@ -473,11 +534,16 @@ CREATE FUNCTION new_emp() RETURNS emp AS $$
 $$ LANGUAGE SQL;
 </programlisting>
 
-     Here we wrote a <command>SELECT</> that returns just a single
+     Here we wrote a <command>SELECT</command> that returns just a single
      column of the correct composite type.  This isn't really better
      in this situation, but it is a handy alternative in some cases
      &mdash; for example, if we need to compute the result by calling
      another function that returns the desired composite value.
+     Another example is that if we are trying to write a function that
+     returns a domain over composite, rather than a plain composite type,
+     it is always necessary to write it as returning a single column,
+     since there is no other way to produce a value that is exactly of
+     the domain type.
     </para>
 
     <para>
@@ -503,7 +569,7 @@ SELECT * FROM new_emp();
 </screen>
 
      The second way is described more fully in <xref
-     linkend="xfunc-sql-table-functions">.
+     linkend="xfunc-sql-table-functions"/>.
     </para>
 
     <para>
@@ -541,7 +607,7 @@ SELECT name(new_emp());
  None
 </screen>
 
-     As explained in <xref linkend="rowtypes-usage">, the field notation and
+     As explained in <xref linkend="rowtypes-usage"/>, the field notation and
      functional notation are equivalent.
     </para>
 
@@ -564,7 +630,7 @@ SELECT getname(new_emp());
    </sect2>
 
    <sect2 id="xfunc-output-parameters">
-    <title><acronym>SQL</> Functions with Output Parameters</title>
+    <title><acronym>SQL</acronym> Functions with Output Parameters</title>
 
    <indexterm>
     <primary>function</primary>
@@ -573,7 +639,7 @@ SELECT getname(new_emp());
 
     <para>
      An alternative way of describing a function's results is to define it
-     with <firstterm>output parameters</>, as in this example:
+     with <firstterm>output parameters</firstterm>, as in this example:
 
 <screen>
 CREATE FUNCTION add_em (IN x int, IN y int, OUT sum int)
@@ -587,8 +653,8 @@ SELECT add_em(3,7);
 (1 row)
 </screen>
 
-     This is not essentially different from the version of <literal>add_em</>
-     shown in <xref linkend="xfunc-sql-base-functions">.  The real value of
+     This is not essentially different from the version of <literal>add_em</literal>
+     shown in <xref linkend="xfunc-sql-base-functions"/>.  The real value of
      output parameters is that they provide a convenient way of defining
      functions that return several columns.  For example,
 
@@ -639,18 +705,18 @@ DROP FUNCTION sum_n_product (int, int);
     </para>
 
     <para>
-     Parameters can be marked as <literal>IN</> (the default),
-     <literal>OUT</>, <literal>INOUT</>, or <literal>VARIADIC</>.
-     An <literal>INOUT</>
+     Parameters can be marked as <literal>IN</literal> (the default),
+     <literal>OUT</literal>, <literal>INOUT</literal>, or <literal>VARIADIC</literal>.
+     An <literal>INOUT</literal>
      parameter serves as both an input parameter (part of the calling
      argument list) and an output parameter (part of the result record type).
-     <literal>VARIADIC</> parameters are input parameters, but are treated
+     <literal>VARIADIC</literal> parameters are input parameters, but are treated
      specially as described next.
     </para>
    </sect2>
 
    <sect2 id="xfunc-sql-variadic-functions">
-    <title><acronym>SQL</> Functions with Variable Numbers of Arguments</title>
+    <title><acronym>SQL</acronym> Functions with Variable Numbers of Arguments</title>
 
     <indexterm>
      <primary>function</primary>
@@ -663,10 +729,10 @@ DROP FUNCTION sum_n_product (int, int);
 
     <para>
      <acronym>SQL</acronym> functions can be declared to accept
-     variable numbers of arguments, so long as all the <quote>optional</>
+     variable numbers of arguments, so long as all the <quote>optional</quote>
      arguments are of the same data type.  The optional arguments will be
      passed to the function as an array.  The function is declared by
-     marking the last parameter as <literal>VARIADIC</>; this parameter
+     marking the last parameter as <literal>VARIADIC</literal>; this parameter
      must be declared as being of an array type.  For example:
 
 <screen>
@@ -682,7 +748,7 @@ SELECT mleast(10, -1, 5, 4.4);
 </screen>
 
      Effectively, all the actual arguments at or beyond the
-     <literal>VARIADIC</> position are gathered up into a one-dimensional
+     <literal>VARIADIC</literal> position are gathered up into a one-dimensional
      array, as if you had written
 
 <screen>
@@ -691,7 +757,7 @@ SELECT mleast(ARRAY[10, -1, 5, 4.4]);    -- doesn't work
 
      You can't actually write that, though &mdash; or at least, it will
      not match this function definition.  A parameter marked
-     <literal>VARIADIC</> matches one or more occurrences of its element
+     <literal>VARIADIC</literal> matches one or more occurrences of its element
      type, not of its own type.
     </para>
 
@@ -699,7 +765,7 @@ SELECT mleast(ARRAY[10, -1, 5, 4.4]);    -- doesn't work
      Sometimes it is useful to be able to pass an already-constructed array
      to a variadic function; this is particularly handy when one variadic
      function wants to pass on its array parameter to another one.  You can
-     do that by specifying <literal>VARIADIC</> in the call:
+     do that by specifying <literal>VARIADIC</literal> in the call:
 
 <screen>
 SELECT mleast(VARIADIC ARRAY[10, -1, 5, 4.4]);
@@ -707,21 +773,21 @@ SELECT mleast(VARIADIC ARRAY[10, -1, 5, 4.4]);
 
      This prevents expansion of the function's variadic parameter into its
      element type, thereby allowing the array argument value to match
-     normally.  <literal>VARIADIC</> can only be attached to the last
+     normally.  <literal>VARIADIC</literal> can only be attached to the last
      actual argument of a function call.
     </para>
 
     <para>
-     Specifying <literal>VARIADIC</> in the call is also the only way to
+     Specifying <literal>VARIADIC</literal> in the call is also the only way to
      pass an empty array to a variadic function, for example:
 
 <screen>
 SELECT mleast(VARIADIC ARRAY[]::numeric[]);
 </screen>
 
-     Simply writing <literal>SELECT mleast()</> does not work because a
+     Simply writing <literal>SELECT mleast()</literal> does not work because a
      variadic parameter must match at least one actual argument.
-     (You could define a second function also named <literal>mleast</>,
+     (You could define a second function also named <literal>mleast</literal>,
      with no parameters, if you wanted to allow such calls.)
     </para>
 
@@ -729,8 +795,8 @@ SELECT mleast(VARIADIC ARRAY[]::numeric[]);
      The array element parameters generated from a variadic parameter are
      treated as not having any names of their own.  This means it is not
      possible to call a variadic function using named arguments (<xref
-     linkend="sql-syntax-calling-funcs">), except when you specify
-     <literal>VARIADIC</>.  For example, this will work:
+     linkend="sql-syntax-calling-funcs"/>), except when you specify
+     <literal>VARIADIC</literal>.  For example, this will work:
 
 <screen>
 SELECT mleast(VARIADIC arr =&gt; ARRAY[10, -1, 5, 4.4]);
@@ -746,7 +812,7 @@ SELECT mleast(arr =&gt; ARRAY[10, -1, 5, 4.4]);
    </sect2>
 
    <sect2 id="xfunc-sql-parameter-defaults">
-    <title><acronym>SQL</> Functions with Default Values for Arguments</title>
+    <title><acronym>SQL</acronym> Functions with Default Values for Arguments</title>
 
     <indexterm>
      <primary>function</primary>
@@ -804,7 +870,7 @@ ERROR:  function foo() does not exist
     <title><acronym>SQL</acronym> Functions as Table Sources</title>
 
     <para>
-     All SQL functions can be used in the <literal>FROM</> clause of a query,
+     All SQL functions can be used in the <literal>FROM</literal> clause of a query,
      but it is particularly useful for functions returning composite types.
      If the function is defined to return a base type, the table function
      produces a one-column table.  If the function is defined to return
@@ -839,7 +905,7 @@ SELECT *, upper(fooname) FROM getfoo(1) AS t1;
 
     <para>
      Note that we only got one row out of the function.  This is because
-     we did not use <literal>SETOF</>.  That is described in the next section.
+     we did not use <literal>SETOF</literal>.  That is described in the next section.
     </para>
    </sect2>
 
@@ -853,16 +919,16 @@ SELECT *, upper(fooname) FROM getfoo(1) AS t1;
 
     <para>
      When an SQL function is declared as returning <literal>SETOF
-     <replaceable>sometype</></literal>, the function's final
+     <replaceable>sometype</replaceable></literal>, the function's final
      query is executed to completion, and each row it
      outputs is returned as an element of the result set.
     </para>
 
     <para>
-     This feature is normally used when calling the function in the <literal>FROM</>
+     This feature is normally used when calling the function in the <literal>FROM</literal>
      clause.  In this case each row returned by the function becomes
      a row of the table seen by the query.  For example, assume that
-     table <literal>foo</> has the same contents as above, and we say:
+     table <literal>foo</literal> has the same contents as above, and we say:
 
 <programlisting>
 CREATE FUNCTION getfoo(int) RETURNS SETOF foo AS $$
@@ -906,18 +972,18 @@ SELECT * FROM sum_n_product_with_tab(10);
 (4 rows)
 </programlisting>
 
-     The key point here is that you must write <literal>RETURNS SETOF record</>
+     The key point here is that you must write <literal>RETURNS SETOF record</literal>
      to indicate that the function returns multiple rows instead of just one.
      If there is only one output parameter, write that parameter's type
-     instead of <type>record</>.
+     instead of <type>record</type>.
     </para>
 
     <para>
      It is frequently useful to construct a query's result by invoking a
      set-returning function multiple times, with the parameters for each
      invocation coming from successive rows of a table or subquery.  The
-     preferred way to do this is to use the <literal>LATERAL</> key word,
-     which is described in <xref linkend="queries-lateral">.
+     preferred way to do this is to use the <literal>LATERAL</literal> key word,
+     which is described in <xref linkend="queries-lateral"/>.
      Here is an example using a set-returning function to enumerate
      elements of a tree structure:
 
@@ -990,17 +1056,17 @@ SELECT name, listchildren(name) FROM nodes;
 </screen>
 
      In the last <command>SELECT</command>,
-     notice that no output row appears for <literal>Child2</>, <literal>Child3</>, etc.
+     notice that no output row appears for <literal>Child2</literal>, <literal>Child3</literal>, etc.
      This happens because <function>listchildren</function> returns an empty set
      for those arguments, so no result rows are generated.  This is the same
      behavior as we got from an inner join to the function result when using
-     the <literal>LATERAL</> syntax.
+     the <literal>LATERAL</literal> syntax.
     </para>
 
     <para>
-     <productname>PostgreSQL</>'s behavior for a set-returning function in a
+     <productname>PostgreSQL</productname>'s behavior for a set-returning function in a
      query's select list is almost exactly the same as if the set-returning
-     function had been written in a <literal>LATERAL FROM</>-clause item
+     function had been written in a <literal>LATERAL FROM</literal>-clause item
      instead.  For example,
 <programlisting>
 SELECT x, generate_series(1,5) AS g FROM tab;
@@ -1010,20 +1076,20 @@ SELECT x, generate_series(1,5) AS g FROM tab;
 SELECT x, g FROM tab, LATERAL generate_series(1,5) AS g;
 </programlisting>
      It would be exactly the same, except that in this specific example,
-     the planner could choose to put <structname>g</> on the outside of the
-     nestloop join, since <structname>g</> has no actual lateral dependency
-     on <structname>tab</>.  That would result in a different output row
+     the planner could choose to put <structname>g</structname> on the outside of the
+     nestloop join, since <structname>g</structname> has no actual lateral dependency
+     on <structname>tab</structname>.  That would result in a different output row
      order.  Set-returning functions in the select list are always evaluated
      as though they are on the inside of a nestloop join with the rest of
-     the <literal>FROM</> clause, so that the function(s) are run to
-     completion before the next row from the <literal>FROM</> clause is
+     the <literal>FROM</literal> clause, so that the function(s) are run to
+     completion before the next row from the <literal>FROM</literal> clause is
      considered.
     </para>
 
     <para>
      If there is more than one set-returning function in the query's select
      list, the behavior is similar to what you get from putting the functions
-     into a single <literal>LATERAL ROWS FROM( ... )</> <literal>FROM</>-clause
+     into a single <literal>LATERAL ROWS FROM( ... )</literal> <literal>FROM</literal>-clause
      item.  For each row from the underlying query, there is an output row
      using the first result from each function, then an output row using the
      second result, and so on.  If some of the set-returning functions
@@ -1031,48 +1097,48 @@ SELECT x, g FROM tab, LATERAL generate_series(1,5) AS g;
      missing data, so that the total number of rows emitted for one
      underlying row is the same as for the set-returning function that
      produced the most outputs.  Thus the set-returning functions
-     run <quote>in lockstep</> until they are all exhausted, and then
+     run <quote>in lockstep</quote> until they are all exhausted, and then
      execution continues with the next underlying row.
     </para>
 
     <para>
      Set-returning functions can be nested in a select list, although that is
-     not allowed in <literal>FROM</>-clause items.  In such cases, each level
+     not allowed in <literal>FROM</literal>-clause items.  In such cases, each level
      of nesting is treated separately, as though it were
-     a separate <literal>LATERAL ROWS FROM( ... )</> item.  For example, in
+     a separate <literal>LATERAL ROWS FROM( ... )</literal> item.  For example, in
 <programlisting>
 SELECT srf1(srf2(x), srf3(y)), srf4(srf5(z)) FROM tab;
 </programlisting>
-     the set-returning functions <function>srf2</>, <function>srf3</>,
-     and <function>srf5</> would be run in lockstep for each row
-     of <structname>tab</>, and then <function>srf1</> and <function>srf4</>
+     the set-returning functions <function>srf2</function>, <function>srf3</function>,
+     and <function>srf5</function> would be run in lockstep for each row
+     of <structname>tab</structname>, and then <function>srf1</function> and <function>srf4</function>
      would be applied in lockstep to each row produced by the lower
      functions.
     </para>
 
     <para>
      Set-returning functions cannot be used within conditional-evaluation
-     constructs, such as <literal>CASE</> or <literal>COALESCE</>.  For
+     constructs, such as <literal>CASE</literal> or <literal>COALESCE</literal>.  For
      example, consider
 <programlisting>
 SELECT x, CASE WHEN x &gt; 0 THEN generate_series(1, 5) ELSE 0 END FROM tab;
 </programlisting>
      It might seem that this should produce five repetitions of input rows
-     that have <literal>x &gt; 0</>, and a single repetition of those that do
-     not; but actually, because <function>generate_series(1, 5)</> would be
-     run in an implicit <literal>LATERAL FROM</> item before
-     the <literal>CASE</> expression is ever evaluated, it would produce five
+     that have <literal>x &gt; 0</literal>, and a single repetition of those that do
+     not; but actually, because <function>generate_series(1, 5)</function> would be
+     run in an implicit <literal>LATERAL FROM</literal> item before
+     the <literal>CASE</literal> expression is ever evaluated, it would produce five
      repetitions of every input row.  To reduce confusion, such cases produce
      a parse-time error instead.
     </para>
 
     <note>
      <para>
-      If a function's last command is <command>INSERT</>, <command>UPDATE</>,
-      or <command>DELETE</> with <literal>RETURNING</>, that command will
+      If a function's last command is <command>INSERT</command>, <command>UPDATE</command>,
+      or <command>DELETE</command> with <literal>RETURNING</literal>, that command will
       always be executed to completion, even if the function is not declared
-      with <literal>SETOF</> or the calling query does not fetch all the
-      result rows.  Any extra rows produced by the <literal>RETURNING</>
+      with <literal>SETOF</literal> or the calling query does not fetch all the
+      result rows.  Any extra rows produced by the <literal>RETURNING</literal>
       clause are silently dropped, but the commanded table modifications
       still happen (and are all completed before returning from the function).
      </para>
@@ -1080,7 +1146,7 @@ SELECT x, CASE WHEN x &gt; 0 THEN generate_series(1, 5) ELSE 0 END FROM tab;
 
     <note>
      <para>
-      Before <productname>PostgreSQL</> 10, putting more than one
+      Before <productname>PostgreSQL</productname> 10, putting more than one
       set-returning function in the same select list did not behave very
       sensibly unless they always produced equal numbers of rows.  Otherwise,
       what you got was a number of output rows equal to the least common
@@ -1089,10 +1155,10 @@ SELECT x, CASE WHEN x &gt; 0 THEN generate_series(1, 5) ELSE 0 END FROM tab;
       described above; instead, a set-returning function could have at most
       one set-returning argument, and each nest of set-returning functions
       was run independently.  Also, conditional execution (set-returning
-      functions inside <literal>CASE</> etc) was previously allowed,
+      functions inside <literal>CASE</literal> etc) was previously allowed,
       complicating things even more.
-      Use of the <literal>LATERAL</> syntax is recommended when writing
-      queries that need to work in older <productname>PostgreSQL</> versions,
+      Use of the <literal>LATERAL</literal> syntax is recommended when writing
+      queries that need to work in older <productname>PostgreSQL</productname> versions,
       because that will give consistent results across different versions.
       If you have a query that is relying on conditional execution of a
       set-returning function, you may be able to fix it by moving the
@@ -1115,13 +1181,13 @@ END$$ LANGUAGE plpgsql;
 SELECT x, case_generate_series(y &gt; 0, 1, z, 5) FROM tab;
 </programlisting>
       This formulation will work the same in all versions
-      of <productname>PostgreSQL</>.
+      of <productname>PostgreSQL</productname>.
      </para>
     </note>
    </sect2>
 
    <sect2 id="xfunc-sql-functions-returning-table">
-    <title><acronym>SQL</acronym> Functions Returning <literal>TABLE</></title>
+    <title><acronym>SQL</acronym> Functions Returning <literal>TABLE</literal></title>
 
     <indexterm>
      <primary>function</primary>
@@ -1131,12 +1197,12 @@ SELECT x, case_generate_series(y &gt; 0, 1, z, 5) FROM tab;
     <para>
      There is another way to declare a function as returning a set,
      which is to use the syntax
-     <literal>RETURNS TABLE(<replaceable>columns</>)</literal>.
-     This is equivalent to using one or more <literal>OUT</> parameters plus
-     marking the function as returning <literal>SETOF record</> (or
-     <literal>SETOF</> a single output parameter's type, as appropriate).
+     <literal>RETURNS TABLE(<replaceable>columns</replaceable>)</literal>.
+     This is equivalent to using one or more <literal>OUT</literal> parameters plus
+     marking the function as returning <literal>SETOF record</literal> (or
+     <literal>SETOF</literal> a single output parameter's type, as appropriate).
      This notation is specified in recent versions of the SQL standard, and
-     thus may be more portable than using <literal>SETOF</>.
+     thus may be more portable than using <literal>SETOF</literal>.
     </para>
 
     <para>
@@ -1150,9 +1216,9 @@ RETURNS TABLE(sum int, product int) AS $$
 $$ LANGUAGE SQL;
 </programlisting>
 
-     It is not allowed to use explicit <literal>OUT</> or <literal>INOUT</>
-     parameters with the <literal>RETURNS TABLE</> notation &mdash; you must
-     put all the output columns in the <literal>TABLE</> list.
+     It is not allowed to use explicit <literal>OUT</literal> or <literal>INOUT</literal>
+     parameters with the <literal>RETURNS TABLE</literal> notation &mdash; you must
+     put all the output columns in the <literal>TABLE</literal> list.
     </para>
    </sect2>
 
@@ -1164,7 +1230,7 @@ $$ LANGUAGE SQL;
      return the polymorphic types <type>anyelement</type>,
      <type>anyarray</type>, <type>anynonarray</type>,
      <type>anyenum</type>, and <type>anyrange</type>.  See <xref
-     linkend="extend-types-polymorphic"> for a more detailed
+     linkend="extend-types-polymorphic"/> for a more detailed
      explanation of polymorphic functions. Here is a polymorphic
      function <function>make_array</function> that builds up an array
      from two arbitrary data type elements:
@@ -1270,34 +1336,34 @@ SELECT concat_values('|', 1, 4, 2);
     <title><acronym>SQL</acronym> Functions with Collations</title>
 
     <indexterm>
-     <primary>collation</>
-     <secondary>in SQL functions</>
+     <primary>collation</primary>
+     <secondary>in SQL functions</secondary>
     </indexterm>
 
     <para>
      When a SQL function has one or more parameters of collatable data types,
      a collation is identified for each function call depending on the
      collations assigned to the actual arguments, as described in <xref
-     linkend="collation">.  If a collation is successfully identified
+     linkend="collation"/>.  If a collation is successfully identified
      (i.e., there are no conflicts of implicit collations among the arguments)
      then all the collatable parameters are treated as having that collation
      implicitly.  This will affect the behavior of collation-sensitive
      operations within the function.  For example, using the
-     <function>anyleast</> function described above, the result of
+     <function>anyleast</function> function described above, the result of
 <programlisting>
 SELECT anyleast('abc'::text, 'ABC');
 </programlisting>
-     will depend on the database's default collation.  In <literal>C</> locale
-     the result will be <literal>ABC</>, but in many other locales it will
-     be <literal>abc</>.  The collation to use can be forced by adding
-     a <literal>COLLATE</> clause to any of the arguments, for example
+     will depend on the database's default collation.  In <literal>C</literal> locale
+     the result will be <literal>ABC</literal>, but in many other locales it will
+     be <literal>abc</literal>.  The collation to use can be forced by adding
+     a <literal>COLLATE</literal> clause to any of the arguments, for example
 <programlisting>
 SELECT anyleast('abc'::text, 'ABC' COLLATE "C");
 </programlisting>
      Alternatively, if you wish a function to operate with a particular
      collation regardless of what it is called with, insert
-     <literal>COLLATE</> clauses as needed in the function definition.
-     This version of <function>anyleast</> would always use <literal>en_US</>
+     <literal>COLLATE</literal> clauses as needed in the function definition.
+     This version of <function>anyleast</function> would always use <literal>en_US</literal>
      locale to compare strings:
 <programlisting>
 CREATE FUNCTION anyleast (VARIADIC anyarray) RETURNS anyelement AS $$
@@ -1351,31 +1417,31 @@ CREATE FUNCTION test(smallint, double precision) RETURNS ...
     it is not immediately clear which function would be called with
     some trivial input like <literal>test(1, 1.5)</literal>.  The
     currently implemented resolution rules are described in
-    <xref linkend="typeconv">, but it is unwise to design a system that subtly
+    <xref linkend="typeconv"/>, but it is unwise to design a system that subtly
     relies on this behavior.
    </para>
 
    <para>
     A function that takes a single argument of a composite type should
     generally not have the same name as any attribute (field) of that type.
-    Recall that <literal><replaceable>attribute</>(<replaceable>table</>)</literal>
+    Recall that <literal><replaceable>attribute</replaceable>(<replaceable>table</replaceable>)</literal>
     is considered equivalent
-    to <literal><replaceable>table</>.<replaceable>attribute</></literal>.
+    to <literal><replaceable>table</replaceable>.<replaceable>attribute</replaceable></literal>.
     In the case that there is an
     ambiguity between a function on a composite type and an attribute of
     the composite type, the attribute will always be used.  It is possible
     to override that choice by schema-qualifying the function name
-    (that is, <literal><replaceable>schema</>.<replaceable>func</>(<replaceable>table</>)
+    (that is, <literal><replaceable>schema</replaceable>.<replaceable>func</replaceable>(<replaceable>table</replaceable>)
     </literal>) but it's better to
     avoid the problem by not choosing conflicting names.
    </para>
 
    <para>
     Another possible conflict is between variadic and non-variadic functions.
-    For instance, it is possible to create both <literal>foo(numeric)</> and
-    <literal>foo(VARIADIC numeric[])</>.  In this case it is unclear which one
+    For instance, it is possible to create both <literal>foo(numeric)</literal> and
+    <literal>foo(VARIADIC numeric[])</literal>.  In this case it is unclear which one
     should be matched to a call providing a single numeric argument, such as
-    <literal>foo(10.1)</>.  The rule is that the function appearing
+    <literal>foo(10.1)</literal>.  The rule is that the function appearing
     earlier in the search path is used, or if the two functions are in the
     same schema, the non-variadic one is preferred.
    </para>
@@ -1388,15 +1454,15 @@ CREATE FUNCTION test(smallint, double precision) RETURNS ...
     rule is violated, the behavior is not portable.  You might get a
     run-time linker error, or one of the functions will get called
     (usually the internal one).  The alternative form of the
-    <literal>AS</> clause for the SQL <command>CREATE
+    <literal>AS</literal> clause for the SQL <command>CREATE
     FUNCTION</command> command decouples the SQL function name from
     the function name in the C source code.  For instance:
 <programlisting>
 CREATE FUNCTION test(int) RETURNS int
-    AS '<replaceable>filename</>', 'test_1arg'
+    AS '<replaceable>filename</replaceable>', 'test_1arg'
     LANGUAGE C;
 CREATE FUNCTION test(int, int) RETURNS int
-    AS '<replaceable>filename</>', 'test_2arg'
+    AS '<replaceable>filename</replaceable>', 'test_2arg'
     LANGUAGE C;
 </programlisting>
     The names of the C functions here reflect one of many possible conventions.
@@ -1421,17 +1487,17 @@ CREATE FUNCTION test(int, int) RETURNS int
    </indexterm>
 
    <para>
-    Every function has a <firstterm>volatility</> classification, with
-    the possibilities being <literal>VOLATILE</>, <literal>STABLE</>, or
-    <literal>IMMUTABLE</>.  <literal>VOLATILE</> is the default if the
-    <xref linkend="sql-createfunction">
+    Every function has a <firstterm>volatility</firstterm> classification, with
+    the possibilities being <literal>VOLATILE</literal>, <literal>STABLE</literal>, or
+    <literal>IMMUTABLE</literal>.  <literal>VOLATILE</literal> is the default if the
+    <xref linkend="sql-createfunction"/>
     command does not specify a category.  The volatility category is a
     promise to the optimizer about the behavior of the function:
 
    <itemizedlist>
     <listitem>
      <para>
-      A <literal>VOLATILE</> function can do anything, including modifying
+      A <literal>VOLATILE</literal> function can do anything, including modifying
       the database.  It can return different results on successive calls with
       the same arguments.  The optimizer makes no assumptions about the
       behavior of such functions.  A query using a volatile function will
@@ -1440,26 +1506,26 @@ CREATE FUNCTION test(int, int) RETURNS int
     </listitem>
     <listitem>
      <para>
-      A <literal>STABLE</> function cannot modify the database and is
+      A <literal>STABLE</literal> function cannot modify the database and is
       guaranteed to return the same results given the same arguments
       for all rows within a single statement. This category allows the
       optimizer to optimize multiple calls of the function to a single
       call. In particular, it is safe to use an expression containing
       such a function in an index scan condition. (Since an index scan
       will evaluate the comparison value only once, not once at each
-      row, it is not valid to use a <literal>VOLATILE</> function in an
+      row, it is not valid to use a <literal>VOLATILE</literal> function in an
       index scan condition.)
      </para>
     </listitem>
     <listitem>
      <para>
-      An <literal>IMMUTABLE</> function cannot modify the database and is
+      An <literal>IMMUTABLE</literal> function cannot modify the database and is
       guaranteed to return the same results given the same arguments forever.
       This category allows the optimizer to pre-evaluate the function when
       a query calls it with constant arguments.  For example, a query like
-      <literal>SELECT ... WHERE x = 2 + 2</> can be simplified on sight to
-      <literal>SELECT ... WHERE x = 4</>, because the function underlying
-      the integer addition operator is marked <literal>IMMUTABLE</>.
+      <literal>SELECT ... WHERE x = 2 + 2</literal> can be simplified on sight to
+      <literal>SELECT ... WHERE x = 4</literal>, because the function underlying
+      the integer addition operator is marked <literal>IMMUTABLE</literal>.
      </para>
     </listitem>
    </itemizedlist>
@@ -1471,32 +1537,32 @@ CREATE FUNCTION test(int, int) RETURNS int
    </para>
 
    <para>
-    Any function with side-effects <emphasis>must</> be labeled
-    <literal>VOLATILE</>, so that calls to it cannot be optimized away.
+    Any function with side-effects <emphasis>must</emphasis> be labeled
+    <literal>VOLATILE</literal>, so that calls to it cannot be optimized away.
     Even a function with no side-effects needs to be labeled
-    <literal>VOLATILE</> if its value can change within a single query;
-    some examples are <literal>random()</>, <literal>currval()</>,
-    <literal>timeofday()</>.
+    <literal>VOLATILE</literal> if its value can change within a single query;
+    some examples are <literal>random()</literal>, <literal>currval()</literal>,
+    <literal>timeofday()</literal>.
    </para>
 
    <para>
-    Another important example is that the <function>current_timestamp</>
-    family of functions qualify as <literal>STABLE</>, since their values do
+    Another important example is that the <function>current_timestamp</function>
+    family of functions qualify as <literal>STABLE</literal>, since their values do
     not change within a transaction.
    </para>
 
    <para>
-    There is relatively little difference between <literal>STABLE</> and
-    <literal>IMMUTABLE</> categories when considering simple interactive
+    There is relatively little difference between <literal>STABLE</literal> and
+    <literal>IMMUTABLE</literal> categories when considering simple interactive
     queries that are planned and immediately executed: it doesn't matter
     a lot whether a function is executed once during planning or once during
     query execution startup.  But there is a big difference if the plan is
-    saved and reused later.  Labeling a function <literal>IMMUTABLE</> when
+    saved and reused later.  Labeling a function <literal>IMMUTABLE</literal> when
     it really isn't might allow it to be prematurely folded to a constant during
     planning, resulting in a stale value being re-used during subsequent uses
     of the plan.  This is a hazard when using prepared statements or when
     using function languages that cache plans (such as
-    <application>PL/pgSQL</>).
+    <application>PL/pgSQL</application>).
    </para>
 
    <para>
@@ -1504,12 +1570,12 @@ CREATE FUNCTION test(int, int) RETURNS int
     languages, there is a second important property determined by the
     volatility category, namely the visibility of any data changes that have
     been made by the SQL command that is calling the function.  A
-    <literal>VOLATILE</> function will see such changes, a <literal>STABLE</>
-    or <literal>IMMUTABLE</> function will not.  This behavior is implemented
-    using the snapshotting behavior of MVCC (see <xref linkend="mvcc">):
-    <literal>STABLE</> and <literal>IMMUTABLE</> functions use a snapshot
+    <literal>VOLATILE</literal> function will see such changes, a <literal>STABLE</literal>
+    or <literal>IMMUTABLE</literal> function will not.  This behavior is implemented
+    using the snapshotting behavior of MVCC (see <xref linkend="mvcc"/>):
+    <literal>STABLE</literal> and <literal>IMMUTABLE</literal> functions use a snapshot
     established as of the start of the calling query, whereas
-    <literal>VOLATILE</> functions obtain a fresh snapshot at the start of
+    <literal>VOLATILE</literal> functions obtain a fresh snapshot at the start of
     each query they execute.
    </para>
 
@@ -1522,41 +1588,41 @@ CREATE FUNCTION test(int, int) RETURNS int
 
    <para>
     Because of this snapshotting behavior,
-    a function containing only <command>SELECT</> commands can safely be
-    marked <literal>STABLE</>, even if it selects from tables that might be
+    a function containing only <command>SELECT</command> commands can safely be
+    marked <literal>STABLE</literal>, even if it selects from tables that might be
     undergoing modifications by concurrent queries.
     <productname>PostgreSQL</productname> will execute all commands of a
-    <literal>STABLE</> function using the snapshot established for the
+    <literal>STABLE</literal> function using the snapshot established for the
     calling query, and so it will see a fixed view of the database throughout
     that query.
    </para>
 
    <para>
-    The same snapshotting behavior is used for <command>SELECT</> commands
-    within <literal>IMMUTABLE</> functions.  It is generally unwise to select
-    from database tables within an <literal>IMMUTABLE</> function at all,
+    The same snapshotting behavior is used for <command>SELECT</command> commands
+    within <literal>IMMUTABLE</literal> functions.  It is generally unwise to select
+    from database tables within an <literal>IMMUTABLE</literal> function at all,
     since the immutability will be broken if the table contents ever change.
     However, <productname>PostgreSQL</productname> does not enforce that you
     do not do that.
    </para>
 
    <para>
-    A common error is to label a function <literal>IMMUTABLE</> when its
+    A common error is to label a function <literal>IMMUTABLE</literal> when its
     results depend on a configuration parameter.  For example, a function
     that manipulates timestamps might well have results that depend on the
-    <xref linkend="guc-timezone"> setting.  For safety, such functions should
-    be labeled <literal>STABLE</> instead.
+    <xref linkend="guc-timezone"/> setting.  For safety, such functions should
+    be labeled <literal>STABLE</literal> instead.
    </para>
 
    <note>
     <para>
-     <productname>PostgreSQL</productname> requires that <literal>STABLE</>
-     and <literal>IMMUTABLE</> functions contain no SQL commands other
-     than <command>SELECT</> to prevent data modification.
+     <productname>PostgreSQL</productname> requires that <literal>STABLE</literal>
+     and <literal>IMMUTABLE</literal> functions contain no SQL commands other
+     than <command>SELECT</command> to prevent data modification.
      (This is not a completely bulletproof test, since such functions could
-     still call <literal>VOLATILE</> functions that modify the database.
-     If you do that, you will find that the <literal>STABLE</> or
-     <literal>IMMUTABLE</> function does not notice the database changes
+     still call <literal>VOLATILE</literal> functions that modify the database.
+     If you do that, you will find that the <literal>STABLE</literal> or
+     <literal>IMMUTABLE</literal> function does not notice the database changes
      applied by the called function, since they are hidden from its snapshot.)
     </para>
    </note>
@@ -1569,11 +1635,11 @@ CREATE FUNCTION test(int, int) RETURNS int
     <productname>PostgreSQL</productname> allows user-defined functions
     to be written in other languages besides SQL and C.  These other
     languages are generically called <firstterm>procedural
-    languages</firstterm> (<acronym>PL</>s).
+    languages</firstterm> (<acronym>PL</acronym>s).
     Procedural languages aren't built into the
     <productname>PostgreSQL</productname> server; they are offered
     by loadable modules.
-    See <xref linkend="xplang"> and following chapters for more
+    See <xref linkend="xplang"/> and following chapters for more
     information.
    </para>
   </sect1>
@@ -1581,7 +1647,7 @@ CREATE FUNCTION test(int, int) RETURNS int
   <sect1 id="xfunc-internal">
    <title>Internal Functions</title>
 
-   <indexterm zone="xfunc-internal"><primary>function</><secondary>internal</></>
+   <indexterm zone="xfunc-internal"><primary>function</primary><secondary>internal</secondary></indexterm>
 
    <para>
     Internal functions are functions written in C that have been statically
@@ -1597,7 +1663,7 @@ CREATE FUNCTION test(int, int) RETURNS int
    <para>
     Normally, all internal functions present in the
     server are declared during the initialization of the database cluster
-    (see <xref linkend="creating-cluster">),
+    (see <xref linkend="creating-cluster"/>),
     but a user could use <command>CREATE FUNCTION</command>
     to create additional alias names for an internal function.
     Internal functions are declared in <command>CREATE FUNCTION</command>
@@ -1635,8 +1701,8 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
     be made compatible with C, such as C++).  Such functions are
     compiled into dynamically loadable objects (also called shared
     libraries) and are loaded by the server on demand.  The dynamic
-    loading feature is what distinguishes <quote>C language</> functions
-    from <quote>internal</> functions &mdash; the actual coding conventions
+    loading feature is what distinguishes <quote>C language</quote> functions
+    from <quote>internal</quote> functions &mdash; the actual coding conventions
     are essentially the same for both.  (Hence, the standard internal
     function library is a rich source of coding examples for user-defined
     C functions.)
@@ -1683,9 +1749,9 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
      <listitem>
       <para>
        If the name starts with the string <literal>$libdir</literal>,
-       that part is replaced by the <productname>PostgreSQL</> package
+       that part is replaced by the <productname>PostgreSQL</productname> package
         library directory
-       name, which is determined at build time.<indexterm><primary>$libdir</></>
+       name, which is determined at build time.<indexterm><primary>$libdir</primary></indexterm>
       </para>
      </listitem>
 
@@ -1693,7 +1759,7 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
       <para>
        If the name does not contain a directory part, the file is
        searched for in the path specified by the configuration variable
-       <xref linkend="guc-dynamic-library-path">.<indexterm><primary>dynamic_library_path</></>
+       <xref linkend="guc-dynamic-library-path"/>.<indexterm><primary>dynamic_library_path</primary></indexterm>
       </para>
      </listitem>
 
@@ -1742,7 +1808,7 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
      <productname>PostgreSQL</productname> will not compile a C function
      automatically.  The object file must be compiled before it is referenced
      in a <command>CREATE
-     FUNCTION</> command.  See <xref linkend="dfunc"> for additional
+     FUNCTION</command> command.  See <xref linkend="dfunc"/> for additional
      information.
     </para>
    </note>
@@ -1754,23 +1820,16 @@ CREATE FUNCTION square_root(double precision) RETURNS double precision
    <para>
     To ensure that a dynamically loaded object file is not loaded into an
     incompatible server, <productname>PostgreSQL</productname> checks that the
-    file contains a <quote>magic block</> with the appropriate contents.
+    file contains a <quote>magic block</quote> with the appropriate contents.
     This allows the server to detect obvious incompatibilities, such as code
     compiled for a different major version of
-    <productname>PostgreSQL</productname>.  A magic block is required as of
-    <productname>PostgreSQL</productname> 8.2.  To include a magic block,
+    <productname>PostgreSQL</productname>. To include a magic block,
     write this in one (and only one) of the module source files, after having
-    included the header <filename>fmgr.h</>:
+    included the header <filename>fmgr.h</filename>:
 
 <programlisting>
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 </programlisting>
-
-    The <literal>#ifdef</> test can be omitted if the code doesn't
-    need to compile against pre-8.2 <productname>PostgreSQL</productname>
-    releases.
    </para>
 
    <para>
@@ -1797,12 +1856,12 @@ PG_MODULE_MAGIC;
    <para>
     Optionally, a dynamically loaded file can contain initialization and
     finalization functions.  If the file includes a function named
-    <function>_PG_init</>, that function will be called immediately after
+    <function>_PG_init</function>, that function will be called immediately after
     loading the file.  The function receives no parameters and should
     return void.  If the file includes a function named
-    <function>_PG_fini</>, that function will be called immediately before
+    <function>_PG_fini</function>, that function will be called immediately before
     unloading the file.  Likewise, the function receives no parameters and
-    should return void.  Note that <function>_PG_fini</> will only be called
+    should return void.  Note that <function>_PG_fini</function> will only be called
     during an unload of the file, not during process termination.
     (Presently, unloads are disabled and will never occur, but this may
     change in the future.)
@@ -1873,7 +1932,7 @@ typedef int int4;
      means <replaceable>XX</replaceable> <emphasis>bits</emphasis>.  Note
      therefore also that the C type <type>int8</type> is 1 byte in size.  The
      SQL type <type>int8</type> is called <type>int64</type> in C.  See also
-     <xref linkend="xfunc-c-type-table">.)
+     <xref linkend="xfunc-c-type-table"/>.)
     </para>
 
     <para>
@@ -1922,11 +1981,11 @@ typedef struct
 
     <warning>
      <para>
-      <emphasis>Never</> modify the contents of a pass-by-reference input
+      <emphasis>Never</emphasis> modify the contents of a pass-by-reference input
       value.  If you do so you are likely to corrupt on-disk data, since
       the pointer you are given might point directly into a disk buffer.
       The sole exception to this rule is explained in
-      <xref linkend="xaggr">.
+      <xref linkend="xaggr"/>.
      </para>
     </warning>
 
@@ -1941,7 +2000,7 @@ typedef struct {
 } text;
 </programlisting>
 
-     The <literal>[FLEXIBLE_ARRAY_MEMBER]</> notation means that the actual
+     The <literal>[FLEXIBLE_ARRAY_MEMBER]</literal> notation means that the actual
      length of the data part is not specified by this declaration.
     </para>
 
@@ -1949,7 +2008,7 @@ typedef struct {
      When manipulating
      variable-length types, we must  be  careful  to  allocate
      the  correct amount  of memory and set the length field correctly.
-     For example, if we wanted to  store  40  bytes  in  a <structname>text</>
+     For example, if we wanted to  store  40  bytes  in  a <structname>text</structname>
      structure, we might use a code fragment like this:
 
 <programlisting><![CDATA[
@@ -1964,17 +2023,17 @@ memcpy(destination->data, buffer, 40);
 ]]>
 </programlisting>
 
-     <literal>VARHDRSZ</> is the same as <literal>sizeof(int32)</>, but
-     it's considered good style to use the macro <literal>VARHDRSZ</>
+     <literal>VARHDRSZ</literal> is the same as <literal>sizeof(int32)</literal>, but
+     it's considered good style to use the macro <literal>VARHDRSZ</literal>
      to refer to the size of the overhead for a variable-length type.
-     Also, the length field <emphasis>must</> be set using the
-     <literal>SET_VARSIZE</> macro, not by simple assignment.
+     Also, the length field <emphasis>must</emphasis> be set using the
+     <literal>SET_VARSIZE</literal> macro, not by simple assignment.
     </para>
 
     <para>
-     <xref linkend="xfunc-c-type-table"> specifies which C type
+     <xref linkend="xfunc-c-type-table"/> specifies which C type
      corresponds to which SQL type when writing a C-language function
-     that uses a built-in type of <productname>PostgreSQL</>.
+     that uses a built-in type of <productname>PostgreSQL</productname>.
      The <quote>Defined In</quote> column gives the header file that
      needs to be included to get the type definition.  (The actual
      definition might be in a different file that is included by the
@@ -2182,8 +2241,8 @@ PG_FUNCTION_INFO_V1(funcname);
 </programlisting>
      must appear in the same source file.  (Conventionally, it's
      written just before the function itself.)  This macro call is not
-     needed for <literal>internal</>-language functions, since
-     <productname>PostgreSQL</> assumes that all internal functions
+     needed for <literal>internal</literal>-language functions, since
+     <productname>PostgreSQL</productname> assumes that all internal functions
      use the version-1 convention.  It is, however, required for
      dynamically-loaded functions.
     </para>
@@ -2214,9 +2273,7 @@ PG_FUNCTION_INFO_V1(funcname);
 #include "fmgr.h"
 #include "utils/geo_decls.h"
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 
 /* by value */
 
@@ -2341,8 +2398,8 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
      directory of the shared library file (for instance the
      <productname>PostgreSQL</productname> tutorial directory, which
      contains the code for the examples used in this section).
-     (Better style would be to use just <literal>'funcs'</> in the
-     <literal>AS</> clause, after having added
+     (Better style would be to use just <literal>'funcs'</literal> in the
+     <literal>AS</literal> clause, after having added
      <replaceable>DIRECTORY</replaceable> to the search path.  In any
      case, we can omit the system-specific extension for a shared
      library, commonly <literal>.so</literal>.)
@@ -2359,16 +2416,16 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
 
     <para>
      At first glance, the version-1 coding conventions might appear to be just
-     pointless obscurantism, over using plain <literal>C</> calling
-     conventions.  They do however allow to deal with <literal>NULL</>able
+     pointless obscurantism, over using plain <literal>C</literal> calling
+     conventions.  They do however allow to deal with <literal>NULL</literal>able
      arguments/return values, and <quote>toasted</quote> (compressed or
      out-of-line) values.
     </para>
 
     <para>
-     The macro <function>PG_ARGISNULL(<replaceable>n</>)</function>
+     The macro <function>PG_ARGISNULL(<replaceable>n</replaceable>)</function>
      allows a function to test whether each input is null.  (Of course, doing
-     this is only necessary in functions not declared <quote>strict</>.)
+     this is only necessary in functions not declared <quote>strict</quote>.)
      As with the
      <function>PG_GETARG_<replaceable>xxx</replaceable>()</function> macros,
      the input arguments are counted beginning at zero.  Note that one
@@ -2403,16 +2460,16 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
     <literal>ALTER TABLE <replaceable>tablename</replaceable> ALTER
     COLUMN <replaceable>colname</replaceable> SET STORAGE
     <replaceable>storagetype</replaceable></literal>. <replaceable>storagetype</replaceable> is one of
-    <literal>plain</>, <literal>external</>, <literal>extended</literal>,
-     or <literal>main</>.)
+    <literal>plain</literal>, <literal>external</literal>, <literal>extended</literal>,
+     or <literal>main</literal>.)
     </para>
 
     <para>
      Finally, the version-1 function call conventions make it possible
-     to return set results (<xref linkend="xfunc-c-return-set">) and
-     implement trigger functions (<xref linkend="triggers">) and
+     to return set results (<xref linkend="xfunc-c-return-set"/>) and
+     implement trigger functions (<xref linkend="triggers"/>) and
      procedural-language call handlers (<xref
-     linkend="plhandler">).  For more details
+     linkend="plhandler"/>).  For more details
      see <filename>src/backend/utils/fmgr/README</filename> in the
      source distribution.
     </para>
@@ -2442,8 +2499,8 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
       <listitem>
        <para>
         Use <literal>pg_config
-        --includedir-server</literal><indexterm><primary>pg_config</><secondary>with user-defined C functions</></>
-        to find out where the <productname>PostgreSQL</> server header
+        --includedir-server</literal><indexterm><primary>pg_config</primary><secondary>with user-defined C functions</secondary></indexterm>
+        to find out where the <productname>PostgreSQL</productname> server header
         files are installed on your system (or the system that your
         users will be running on).
        </para>
@@ -2453,7 +2510,7 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
        <para>
         Compiling and linking your code so that it can be dynamically
         loaded into <productname>PostgreSQL</productname> always
-        requires special flags.  See <xref linkend="dfunc"> for a
+        requires special flags.  See <xref linkend="dfunc"/> for a
         detailed explanation of how to do it for your particular
         operating system.
        </para>
@@ -2461,8 +2518,8 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
 
       <listitem>
        <para>
-        Remember to define a <quote>magic block</> for your shared library,
-        as described in <xref linkend="xfunc-c-dynload">.
+        Remember to define a <quote>magic block</quote> for your shared library,
+        as described in <xref linkend="xfunc-c-dynload"/>.
        </para>
       </listitem>
 
@@ -2470,7 +2527,7 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
        <para>
         When allocating memory, use the
         <productname>PostgreSQL</productname> functions
-        <function>palloc</function><indexterm><primary>palloc</></> and <function>pfree</function><indexterm><primary>pfree</></>
+        <function>palloc</function><indexterm><primary>palloc</primary></indexterm> and <function>pfree</function><indexterm><primary>pfree</primary></indexterm>
         instead of the corresponding C library functions
         <function>malloc</function> and <function>free</function>.
         The memory allocated by <function>palloc</function> will be
@@ -2481,8 +2538,8 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
 
       <listitem>
        <para>
-        Always zero the bytes of your structures using <function>memset</>
-        (or allocate them with <function>palloc0</> in the first place).
+        Always zero the bytes of your structures using <function>memset</function>
+        (or allocate them with <function>palloc0</function> in the first place).
         Even if you assign to each field of your structure, there might be
         alignment padding (holes in the structure) that contain
         garbage values.  Without this, it's difficult to
@@ -2502,7 +2559,7 @@ CREATE FUNCTION concat_text(text, text) RETURNS text
         (<symbol>PG_FUNCTION_ARGS</symbol>, etc.)  are in
         <filename>fmgr.h</filename>, so you will need to include at
         least these two files.  For portability reasons it's best to
-        include <filename>postgres.h</filename> <emphasis>first</>,
+        include <filename>postgres.h</filename> <emphasis>first</emphasis>,
         before any other system or user header files.  Including
         <filename>postgres.h</filename> will also include
         <filename>elog.h</filename> and <filename>palloc.h</filename>
@@ -2548,15 +2605,13 @@ SELECT name, c_overpaid(emp, 1500) AS overpaid
 </programlisting>
 
      Using the version-1 calling conventions, we can define
-     <function>c_overpaid</> as:
+     <function>c_overpaid</function> as:
 
 <programlisting><![CDATA[
 #include "postgres.h"
 #include "executor/executor.h"  /* for GetAttributeByName() */
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
 
 PG_FUNCTION_INFO_V1(c_overpaid);
 
@@ -2610,7 +2665,7 @@ CREATE FUNCTION c_overpaid(emp, integer) RETURNS boolean
     LANGUAGE C STRICT;
 </programlisting>
 
-     Notice we have used <literal>STRICT</> so that we did not have to
+     Notice we have used <literal>STRICT</literal> so that we did not have to
      check whether the input arguments were NULL.
     </para>
    </sect2>
@@ -2630,87 +2685,87 @@ CREATE FUNCTION c_overpaid(emp, integer) RETURNS boolean
 
     <para>
      There are two ways you can build a composite data value (henceforth
-     a <quote>tuple</>): you can build it from an array of Datum values,
+     a <quote>tuple</quote>): you can build it from an array of Datum values,
      or from an array of C strings that can be passed to the input
      conversion functions of the tuple's column data types.  In either
-     case, you first need to obtain or construct a <structname>TupleDesc</>
+     case, you first need to obtain or construct a <structname>TupleDesc</structname>
      descriptor for the tuple structure.  When working with Datums, you
-     pass the <structname>TupleDesc</> to <function>BlessTupleDesc</>,
-     and then call <function>heap_form_tuple</> for each row.  When working
-     with C strings, you pass the <structname>TupleDesc</> to
-     <function>TupleDescGetAttInMetadata</>, and then call
-     <function>BuildTupleFromCStrings</> for each row.  In the case of a
+     pass the <structname>TupleDesc</structname> to <function>BlessTupleDesc</function>,
+     and then call <function>heap_form_tuple</function> for each row.  When working
+     with C strings, you pass the <structname>TupleDesc</structname> to
+     <function>TupleDescGetAttInMetadata</function>, and then call
+     <function>BuildTupleFromCStrings</function> for each row.  In the case of a
      function returning a set of tuples, the setup steps can all be done
      once during the first call of the function.
     </para>
 
     <para>
      Several helper functions are available for setting up the needed
-     <structname>TupleDesc</>.  The recommended way to do this in most
+     <structname>TupleDesc</structname>.  The recommended way to do this in most
      functions returning composite values is to call:
 <programlisting>
 TypeFuncClass get_call_result_type(FunctionCallInfo fcinfo,
                                    Oid *resultTypeId,
                                    TupleDesc *resultTupleDesc)
 </programlisting>
-     passing the same <literal>fcinfo</> struct passed to the calling function
+     passing the same <literal>fcinfo</literal> struct passed to the calling function
      itself.  (This of course requires that you use the version-1
-     calling conventions.)  <varname>resultTypeId</> can be specified
-     as <literal>NULL</> or as the address of a local variable to receive the
-     function's result type OID.  <varname>resultTupleDesc</> should be the
-     address of a local <structname>TupleDesc</> variable.  Check that the
-     result is <literal>TYPEFUNC_COMPOSITE</>; if so,
-     <varname>resultTupleDesc</> has been filled with the needed
-     <structname>TupleDesc</>.  (If it is not, you can report an error along
+     calling conventions.)  <varname>resultTypeId</varname> can be specified
+     as <literal>NULL</literal> or as the address of a local variable to receive the
+     function's result type OID.  <varname>resultTupleDesc</varname> should be the
+     address of a local <structname>TupleDesc</structname> variable.  Check that the
+     result is <literal>TYPEFUNC_COMPOSITE</literal>; if so,
+     <varname>resultTupleDesc</varname> has been filled with the needed
+     <structname>TupleDesc</structname>.  (If it is not, you can report an error along
      the lines of <quote>function returning record called in context that
      cannot accept type record</quote>.)
     </para>
 
     <tip>
      <para>
-      <function>get_call_result_type</> can resolve the actual type of a
+      <function>get_call_result_type</function> can resolve the actual type of a
       polymorphic function result; so it is useful in functions that return
       scalar polymorphic results, not only functions that return composites.
-      The <varname>resultTypeId</> output is primarily useful for functions
+      The <varname>resultTypeId</varname> output is primarily useful for functions
       returning polymorphic scalars.
      </para>
     </tip>
 
     <note>
      <para>
-      <function>get_call_result_type</> has a sibling
-      <function>get_expr_result_type</>, which can be used to resolve the
+      <function>get_call_result_type</function> has a sibling
+      <function>get_expr_result_type</function>, which can be used to resolve the
       expected output type for a function call represented by an expression
       tree.  This can be used when trying to determine the result type from
       outside the function itself.  There is also
-      <function>get_func_result_type</>, which can be used when only the
+      <function>get_func_result_type</function>, which can be used when only the
       function's OID is available.  However these functions are not able
-      to deal with functions declared to return <structname>record</>, and
-      <function>get_func_result_type</> cannot resolve polymorphic types,
-      so you should preferentially use <function>get_call_result_type</>.
+      to deal with functions declared to return <structname>record</structname>, and
+      <function>get_func_result_type</function> cannot resolve polymorphic types,
+      so you should preferentially use <function>get_call_result_type</function>.
      </para>
     </note>
 
     <para>
      Older, now-deprecated functions for obtaining
-     <structname>TupleDesc</>s are:
+     <structname>TupleDesc</structname>s are:
 <programlisting>
 TupleDesc RelationNameGetTupleDesc(const char *relname)
 </programlisting>
-     to get a <structname>TupleDesc</> for the row type of a named relation,
+     to get a <structname>TupleDesc</structname> for the row type of a named relation,
      and:
 <programlisting>
 TupleDesc TypeGetTupleDesc(Oid typeoid, List *colaliases)
 </programlisting>
-     to get a <structname>TupleDesc</> based on a type OID. This can
-     be used to get a <structname>TupleDesc</> for a base or
+     to get a <structname>TupleDesc</structname> based on a type OID. This can
+     be used to get a <structname>TupleDesc</structname> for a base or
      composite type.  It will not work for a function that returns
-     <structname>record</>, however, and it cannot resolve polymorphic
+     <structname>record</structname>, however, and it cannot resolve polymorphic
      types.
     </para>
 
     <para>
-     Once you have a <structname>TupleDesc</>, call:
+     Once you have a <structname>TupleDesc</structname>, call:
 <programlisting>
 TupleDesc BlessTupleDesc(TupleDesc tupdesc)
 </programlisting>
@@ -2720,8 +2775,8 @@ AttInMetadata *TupleDescGetAttInMetadata(TupleDesc tupdesc)
 </programlisting>
      if you plan to work with C strings.  If you are writing a function
      returning set, you can save the results of these functions in the
-     <structname>FuncCallContext</> structure &mdash; use the
-     <structfield>tuple_desc</> or <structfield>attinmeta</> field
+     <structname>FuncCallContext</structname> structure &mdash; use the
+     <structfield>tuple_desc</structfield> or <structfield>attinmeta</structfield> field
      respectively.
     </para>
 
@@ -2730,7 +2785,7 @@ AttInMetadata *TupleDescGetAttInMetadata(TupleDesc tupdesc)
 <programlisting>
 HeapTuple heap_form_tuple(TupleDesc tupdesc, Datum *values, bool *isnull)
 </programlisting>
-     to build a <structname>HeapTuple</> given user data in Datum form.
+     to build a <structname>HeapTuple</structname> given user data in Datum form.
     </para>
 
     <para>
@@ -2738,24 +2793,24 @@ HeapTuple heap_form_tuple(TupleDesc tupdesc, Datum *values, bool *isnull)
 <programlisting>
 HeapTuple BuildTupleFromCStrings(AttInMetadata *attinmeta, char **values)
 </programlisting>
-     to build a <structname>HeapTuple</> given user data
+     to build a <structname>HeapTuple</structname> given user data
      in C string form.  <parameter>values</parameter> is an array of C strings,
      one for each attribute of the return row. Each C string should be in
      the form expected by the input function of the attribute data
      type. In order to return a null value for one of the attributes,
-     the corresponding pointer in the <parameter>values</> array
-     should be set to <symbol>NULL</>.  This function will need to
+     the corresponding pointer in the <parameter>values</parameter> array
+     should be set to <symbol>NULL</symbol>.  This function will need to
      be called again for each row you return.
     </para>
 
     <para>
      Once you have built a tuple to return from your function, it
-     must be converted into a <type>Datum</>. Use:
+     must be converted into a <type>Datum</type>. Use:
 <programlisting>
 HeapTupleGetDatum(HeapTuple tuple)
 </programlisting>
-     to convert a <structname>HeapTuple</> into a valid Datum.  This
-     <type>Datum</> can be returned directly if you intend to return
+     to convert a <structname>HeapTuple</structname> into a valid Datum.  This
+     <type>Datum</type> can be returned directly if you intend to return
      just a single row, or it can be used as the current return value
      in a set-returning function.
     </para>
@@ -2778,13 +2833,13 @@ HeapTupleGetDatum(HeapTuple tuple)
     </para>
 
     <para>
-     A set-returning function (<acronym>SRF</>) is called
-     once for each item it returns.  The <acronym>SRF</> must
+     A set-returning function (<acronym>SRF</acronym>) is called
+     once for each item it returns.  The <acronym>SRF</acronym> must
      therefore save enough state to remember what it was doing and
      return the next item on each call.
-     The structure <structname>FuncCallContext</> is provided to help
-     control this process.  Within a function, <literal>fcinfo-&gt;flinfo-&gt;fn_extra</>
-     is used to hold a pointer to <structname>FuncCallContext</>
+     The structure <structname>FuncCallContext</structname> is provided to help
+     control this process.  Within a function, <literal>fcinfo-&gt;flinfo-&gt;fn_extra</literal>
+     is used to hold a pointer to <structname>FuncCallContext</structname>
      across calls.
 <programlisting>
 typedef struct FuncCallContext
@@ -2858,9 +2913,9 @@ typedef struct FuncCallContext
     </para>
 
     <para>
-     An <acronym>SRF</> uses several functions and macros that
-     automatically manipulate the <structname>FuncCallContext</>
-     structure (and expect to find it via <literal>fn_extra</>).  Use:
+     An <acronym>SRF</acronym> uses several functions and macros that
+     automatically manipulate the <structname>FuncCallContext</structname>
+     structure (and expect to find it via <literal>fn_extra</literal>).  Use:
 <programlisting>
 SRF_IS_FIRSTCALL()
 </programlisting>
@@ -2869,12 +2924,12 @@ SRF_IS_FIRSTCALL()
 <programlisting>
 SRF_FIRSTCALL_INIT()
 </programlisting>
-     to initialize the <structname>FuncCallContext</>. On every function call,
+     to initialize the <structname>FuncCallContext</structname>. On every function call,
      including the first, use:
 <programlisting>
 SRF_PERCALL_SETUP()
 </programlisting>
-     to properly set up for using the <structname>FuncCallContext</>
+     to properly set up for using the <structname>FuncCallContext</structname>
      and clearing any previously returned data left over from the
      previous pass.
     </para>
@@ -2884,27 +2939,27 @@ SRF_PERCALL_SETUP()
 <programlisting>
 SRF_RETURN_NEXT(funcctx, result)
 </programlisting>
-     to return it to the caller.  (<literal>result</> must be of type
-     <type>Datum</>, either a single value or a tuple prepared as
+     to return it to the caller.  (<literal>result</literal> must be of type
+     <type>Datum</type>, either a single value or a tuple prepared as
      described above.)  Finally, when your function is finished
      returning data, use:
 <programlisting>
 SRF_RETURN_DONE(funcctx)
 </programlisting>
-     to clean up and end the <acronym>SRF</>.
+     to clean up and end the <acronym>SRF</acronym>.
     </para>
 
     <para>
-     The memory context that is current when the <acronym>SRF</> is called is
+     The memory context that is current when the <acronym>SRF</acronym> is called is
      a transient context that will be cleared between calls.  This means
-     that you do not need to call <function>pfree</> on everything
-     you allocated using <function>palloc</>; it will go away anyway.  However, if you want to allocate
+     that you do not need to call <function>pfree</function> on everything
+     you allocated using <function>palloc</function>; it will go away anyway.  However, if you want to allocate
      any data structures to live across calls, you need to put them somewhere
      else.  The memory context referenced by
-     <structfield>multi_call_memory_ctx</> is a suitable location for any
-     data that needs to survive until the <acronym>SRF</> is finished running.  In most
+     <structfield>multi_call_memory_ctx</structfield> is a suitable location for any
+     data that needs to survive until the <acronym>SRF</acronym> is finished running.  In most
      cases, this means that you should switch into
-     <structfield>multi_call_memory_ctx</> while doing the first-call setup.
+     <structfield>multi_call_memory_ctx</structfield> while doing the first-call setup.
     </para>
 
     <warning>
@@ -2915,8 +2970,8 @@ SRF_RETURN_DONE(funcctx)
       <function>PG_GETARG_<replaceable>xxx</replaceable></function> macro)
       in the transient context then the detoasted copies will be freed on
       each cycle. Accordingly, if you keep references to such values in
-      your <structfield>user_fctx</>, you must either copy them into the
-      <structfield>multi_call_memory_ctx</> after detoasting, or ensure
+      your <structfield>user_fctx</structfield>, you must either copy them into the
+      <structfield>multi_call_memory_ctx</structfield> after detoasting, or ensure
       that you detoast the values only in that context.
      </para>
     </warning>
@@ -2970,7 +3025,7 @@ my_set_returning_function(PG_FUNCTION_ARGS)
     </para>
 
     <para>
-     A complete example of a simple <acronym>SRF</> returning a composite type
+     A complete example of a simple <acronym>SRF</acronym> returning a composite type
      looks like:
 <programlisting><![CDATA[
 PG_FUNCTION_INFO_V1(retcomposite);
@@ -3070,7 +3125,7 @@ CREATE TYPE __retcomposite AS (f1 integer, f2 integer, f3 integer);
 
 CREATE OR REPLACE FUNCTION retcomposite(integer, integer)
     RETURNS SETOF __retcomposite
-    AS '<replaceable>filename</>', 'retcomposite'
+    AS '<replaceable>filename</replaceable>', 'retcomposite'
     LANGUAGE C IMMUTABLE STRICT;
 </programlisting>
      A different way is to use OUT parameters:
@@ -3078,15 +3133,15 @@ CREATE OR REPLACE FUNCTION retcomposite(integer, integer)
 CREATE OR REPLACE FUNCTION retcomposite(IN integer, IN integer,
     OUT f1 integer, OUT f2 integer, OUT f3 integer)
     RETURNS SETOF record
-    AS '<replaceable>filename</>', 'retcomposite'
+    AS '<replaceable>filename</replaceable>', 'retcomposite'
     LANGUAGE C IMMUTABLE STRICT;
 </programlisting>
      Notice that in this method the output type of the function is formally
-     an anonymous <structname>record</> type.
+     an anonymous <structname>record</structname> type.
     </para>
 
     <para>
-     The directory <link linkend="tablefunc"><filename>contrib/tablefunc</filename></>
+     The directory <link linkend="tablefunc"><filename>contrib/tablefunc</filename></link>
      module in the source distribution contains more examples of
      set-returning functions.
     </para>
@@ -3100,24 +3155,24 @@ CREATE OR REPLACE FUNCTION retcomposite(IN integer, IN integer,
      return the polymorphic types
      <type>anyelement</type>, <type>anyarray</type>, <type>anynonarray</type>,
      <type>anyenum</type>, and <type>anyrange</type>.
-     See <xref linkend="extend-types-polymorphic"> for a more detailed explanation
+     See <xref linkend="extend-types-polymorphic"/> for a more detailed explanation
      of polymorphic functions. When function arguments or return types
      are defined as polymorphic types, the function author cannot know
      in advance what data type it will be called with, or
-     need to return. There are two routines provided in <filename>fmgr.h</>
+     need to return. There are two routines provided in <filename>fmgr.h</filename>
      to allow a version-1 C function to discover the actual data types
      of its arguments and the type it is expected to return. The routines are
-     called <literal>get_fn_expr_rettype(FmgrInfo *flinfo)</> and
-     <literal>get_fn_expr_argtype(FmgrInfo *flinfo, int argnum)</>.
+     called <literal>get_fn_expr_rettype(FmgrInfo *flinfo)</literal> and
+     <literal>get_fn_expr_argtype(FmgrInfo *flinfo, int argnum)</literal>.
      They return the result or argument type OID, or <symbol>InvalidOid</symbol> if the
      information is not available.
-     The structure <literal>flinfo</> is normally accessed as
-     <literal>fcinfo-&gt;flinfo</>. The parameter <literal>argnum</>
-     is zero based.  <function>get_call_result_type</> can also be used
-     as an alternative to <function>get_fn_expr_rettype</>.
-     There is also <function>get_fn_expr_variadic</>, which can be used to
+     The structure <literal>flinfo</literal> is normally accessed as
+     <literal>fcinfo-&gt;flinfo</literal>. The parameter <literal>argnum</literal>
+     is zero based.  <function>get_call_result_type</function> can also be used
+     as an alternative to <function>get_fn_expr_rettype</function>.
+     There is also <function>get_fn_expr_variadic</function>, which can be used to
      find out whether variadic arguments have been merged into an array.
-     This is primarily useful for <literal>VARIADIC "any"</> functions,
+     This is primarily useful for <literal>VARIADIC "any"</literal> functions,
      since such merging will always have occurred for variadic functions
      taking ordinary array types.
     </para>
@@ -3185,23 +3240,23 @@ CREATE FUNCTION make_array(anyelement) RETURNS anyarray
     <para>
      There is a variant of polymorphism that is only available to C-language
      functions: they can be declared to take parameters of type
-     <literal>"any"</>.  (Note that this type name must be double-quoted,
+     <literal>"any"</literal>.  (Note that this type name must be double-quoted,
      since it's also a SQL reserved word.)  This works like
-     <type>anyelement</> except that it does not constrain different
-     <literal>"any"</> arguments to be the same type, nor do they help
+     <type>anyelement</type> except that it does not constrain different
+     <literal>"any"</literal> arguments to be the same type, nor do they help
      determine the function's result type.  A C-language function can also
-     declare its final parameter to be <literal>VARIADIC "any"</>.  This will
+     declare its final parameter to be <literal>VARIADIC "any"</literal>.  This will
      match one or more actual arguments of any type (not necessarily the same
-     type).  These arguments will <emphasis>not</> be gathered into an array
+     type).  These arguments will <emphasis>not</emphasis> be gathered into an array
      as happens with normal variadic functions; they will just be passed to
-     the function separately.  The <function>PG_NARGS()</> macro and the
+     the function separately.  The <function>PG_NARGS()</function> macro and the
      methods described above must be used to determine the number of actual
      arguments and their types when using this feature.  Also, users of such
-     a function might wish to use the <literal>VARIADIC</> keyword in their
+     a function might wish to use the <literal>VARIADIC</literal> keyword in their
      function call, with the expectation that the function would treat the
      array elements as separate arguments.  The function itself must implement
-     that behavior if wanted, after using <function>get_fn_expr_variadic</> to
-     detect that the actual argument was marked with <literal>VARIADIC</>.
+     that behavior if wanted, after using <function>get_fn_expr_variadic</function> to
+     detect that the actual argument was marked with <literal>VARIADIC</literal>.
     </para>
    </sect2>
 
@@ -3211,22 +3266,22 @@ CREATE FUNCTION make_array(anyelement) RETURNS anyarray
     <para>
      Some function calls can be simplified during planning based on
      properties specific to the function.  For example,
-     <literal>int4mul(n, 1)</> could be simplified to just <literal>n</>.
+     <literal>int4mul(n, 1)</literal> could be simplified to just <literal>n</literal>.
      To define such function-specific optimizations, write a
-     <firstterm>transform function</> and place its OID in the
-     <structfield>protransform</> field of the primary function's
-     <structname>pg_proc</> entry.  The transform function must have the SQL
-     signature <literal>protransform(internal) RETURNS internal</>.  The
-     argument, actually <type>FuncExpr *</>, is a dummy node representing a
+     <firstterm>transform function</firstterm> and place its OID in the
+     <structfield>protransform</structfield> field of the primary function's
+     <structname>pg_proc</structname> entry.  The transform function must have the SQL
+     signature <literal>protransform(internal) RETURNS internal</literal>.  The
+     argument, actually <type>FuncExpr *</type>, is a dummy node representing a
      call to the primary function.  If the transform function's study of the
      expression tree proves that a simplified expression tree can substitute
      for all possible concrete calls represented thereby, build and return
-     that simplified expression.  Otherwise, return a <literal>NULL</>
-     pointer (<emphasis>not</> a SQL null).
+     that simplified expression.  Otherwise, return a <literal>NULL</literal>
+     pointer (<emphasis>not</emphasis> a SQL null).
     </para>
 
     <para>
-     We make no guarantee that <productname>PostgreSQL</> will never call the
+     We make no guarantee that <productname>PostgreSQL</productname> will never call the
      primary function in cases that the transform function could simplify.
      Ensure rigorous equivalence between the simplified expression and an
      actual call to the primary function.
@@ -3246,26 +3301,26 @@ CREATE FUNCTION make_array(anyelement) RETURNS anyarray
      Add-ins can reserve LWLocks and an allocation of shared memory on server
      startup.  The add-in's shared library must be preloaded by specifying
      it in
-     <xref linkend="guc-shared-preload-libraries"><indexterm><primary>shared_preload_libraries</></>.
+     <xref linkend="guc-shared-preload-libraries"/><indexterm><primary>shared_preload_libraries</primary></indexterm>.
      Shared memory is reserved by calling:
 <programlisting>
 void RequestAddinShmemSpace(int size)
 </programlisting>
-     from your <function>_PG_init</> function.
+     from your <function>_PG_init</function> function.
     </para>
     <para>
      LWLocks are reserved by calling:
 <programlisting>
 void RequestNamedLWLockTranche(const char *tranche_name, int num_lwlocks)
 </programlisting>
-     from <function>_PG_init</>.  This will ensure that an array of
-     <literal>num_lwlocks</> LWLocks is available under the name
-     <literal>tranche_name</>.  Use <function>GetNamedLWLockTranche</>
+     from <function>_PG_init</function>.  This will ensure that an array of
+     <literal>num_lwlocks</literal> LWLocks is available under the name
+     <literal>tranche_name</literal>.  Use <function>GetNamedLWLockTranche</function>
      to get a pointer to this array.
     </para>
     <para>
      To avoid possible race-conditions, each backend should use the LWLock
-     <function>AddinShmemInitLock</> when connecting to and initializing
+     <function>AddinShmemInitLock</function> when connecting to and initializing
      its allocation of shared memory, as shown here:
 <programlisting>
 static mystruct *ptr = NULL;
@@ -3288,10 +3343,10 @@ if (!ptr)
     </para>
    </sect2>
 
-   <sect2 id="extend-Cpp">
+   <sect2 id="extend-cpp">
     <title>Using C++ for Extensibility</title>
 
-    <indexterm zone="extend-Cpp">
+    <indexterm zone="extend-cpp">
      <primary>C++</primary>
     </indexterm>
 
@@ -3305,7 +3360,7 @@ if (!ptr)
        <para>
          All functions accessed by the backend must present a C interface
          to the backend;  these C functions can then call C++ functions.
-         For example, <literal>extern C</> linkage is required for
+         For example, <literal>extern C</literal> linkage is required for
          backend-accessed functions.  This is also necessary for any
          functions that are passed as pointers between the backend and
          C++ code.
@@ -3314,30 +3369,30 @@ if (!ptr)
       <listitem>
        <para>
         Free memory using the appropriate deallocation method.  For example,
-        most backend memory is allocated using <function>palloc()</>, so use
-        <function>pfree()</> to free it.  Using C++
-        <function>delete</> in such cases will fail.
+        most backend memory is allocated using <function>palloc()</function>, so use
+        <function>pfree()</function> to free it.  Using C++
+        <function>delete</function> in such cases will fail.
        </para>
       </listitem>
       <listitem>
        <para>
         Prevent exceptions from propagating into the C code (use a catch-all
-        block at the top level of all <literal>extern C</> functions).  This
+        block at the top level of all <literal>extern C</literal> functions).  This
         is necessary even if the C++ code does not explicitly throw any
         exceptions, because events like out-of-memory can still throw
         exceptions.  Any exceptions must be caught and appropriate errors
         passed back to the C interface.  If possible, compile C++ with
-        <option>-fno-exceptions</> to eliminate exceptions entirely; in such
+        <option>-fno-exceptions</option> to eliminate exceptions entirely; in such
         cases, you must check for failures in your C++ code, e.g.  check for
-        NULL returned by <function>new()</>.
+        NULL returned by <function>new()</function>.
        </para>
       </listitem>
       <listitem>
        <para>
         If calling backend functions from C++ code, be sure that the
         C++ call stack contains only plain old data structures
-        (<acronym>POD</>).  This is necessary because backend errors
-        generate a distant <function>longjmp()</> that does not properly
+        (<acronym>POD</acronym>).  This is necessary because backend errors
+        generate a distant <function>longjmp()</function> that does not properly
         unroll a C++ call stack with non-POD objects.
        </para>
       </listitem>
@@ -3346,7 +3401,7 @@ if (!ptr)
 
     <para>
      In summary, it is best to place C++ code behind a wall of
-     <literal>extern C</> functions that interface to the backend,
+     <literal>extern C</literal> functions that interface to the backend,
      and avoid exception, memory, and call stack leakage.
     </para>
    </sect2>
diff --git a/doc/src/sgml/xindex.sgml b/doc/src/sgml/xindex.sgml
index 333a36c456..9f5c0c3fb2 100644
--- a/doc/src/sgml/xindex.sgml
+++ b/doc/src/sgml/xindex.sgml
@@ -12,14 +12,14 @@
    The procedures described thus far let you define new types, new
    functions, and new operators. However, we cannot yet define an
    index on a column of a new data type.  To do this, we must define an
-   <firstterm>operator class</> for the new data type.  Later in this
+   <firstterm>operator class</firstterm> for the new data type.  Later in this
    section, we will illustrate this concept in an example: a new
    operator class for the B-tree index method that stores and sorts
    complex numbers in ascending absolute value order.
   </para>
 
   <para>
-   Operator classes can be grouped into <firstterm>operator families</>
+   Operator classes can be grouped into <firstterm>operator families</firstterm>
    to show the relationships between semantically compatible classes.
    When only a single data type is involved, an operator class is sufficient,
    so we'll focus on that case first and then return to operator families.
@@ -35,24 +35,24 @@
    <productname>PostgreSQL</productname>, but all index methods are
    described in <classname>pg_am</classname>.  It is possible to add a
    new index access method by writing the necessary code and
-   then creating a row in <classname>pg_am</classname> &mdash; but that is
-   beyond the scope of this chapter (see <xref linkend="indexam">).
+   then creating an entry in <classname>pg_am</classname> &mdash; but that is
+   beyond the scope of this chapter (see <xref linkend="indexam"/>).
   </para>
 
   <para>
    The routines for an index method do not directly know anything
    about the data types that the index method will operate on.
    Instead, an <firstterm>operator
-   class</><indexterm><primary>operator class</></indexterm>
+   class</firstterm><indexterm><primary>operator class</primary></indexterm>
    identifies the set of operations that the index method needs to use
    to work with a particular data type.  Operator classes are so
    called because one thing they specify is the set of
-   <literal>WHERE</>-clause operators that can be used with an index
+   <literal>WHERE</literal>-clause operators that can be used with an index
    (i.e., can be converted into an index-scan qualification).  An
    operator class can also specify some <firstterm>support
-   procedures</> that are needed by the internal operations of the
+   procedures</firstterm> that are needed by the internal operations of the
    index method, but do not directly correspond to any
-   <literal>WHERE</>-clause operator that can be used with the index.
+   <literal>WHERE</literal>-clause operator that can be used with the index.
   </para>
 
   <para>
@@ -83,17 +83,17 @@
 
   <para>
    The operators associated with an operator class are identified by
-   <quote>strategy numbers</>, which serve to identify the semantics of
+   <quote>strategy numbers</quote>, which serve to identify the semantics of
    each operator within the context of its operator class.
    For example, B-trees impose a strict ordering on keys, lesser to greater,
-   and so operators like <quote>less than</> and <quote>greater than or equal
-   to</> are interesting with respect to a B-tree.
+   and so operators like <quote>less than</quote> and <quote>greater than or equal
+   to</quote> are interesting with respect to a B-tree.
    Because
    <productname>PostgreSQL</productname> allows the user to define operators,
    <productname>PostgreSQL</productname> cannot look at the name of an operator
-   (e.g., <literal>&lt;</> or <literal>&gt;=</>) and tell what kind of
+   (e.g., <literal>&lt;</literal> or <literal>&gt;=</literal>) and tell what kind of
    comparison it is.  Instead, the index method defines a set of
-   <quote>strategies</>, which can be thought of as generalized operators.
+   <quote>strategies</quote>, which can be thought of as generalized operators.
    Each operator class specifies which actual operator corresponds to each
    strategy for a particular data type and interpretation of the index
    semantics.
@@ -101,7 +101,7 @@
 
   <para>
    The B-tree index method defines five strategies, shown in <xref
-   linkend="xindex-btree-strat-table">.
+   linkend="xindex-btree-strat-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-btree-strat-table">
@@ -140,7 +140,7 @@
 
   <para>
    Hash indexes support only equality comparisons, and so they use only one
-   strategy, shown in <xref linkend="xindex-hash-strat-table">.
+   strategy, shown in <xref linkend="xindex-hash-strat-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-hash-strat-table">
@@ -163,19 +163,19 @@
 
   <para>
    GiST indexes are more flexible: they do not have a fixed set of
-   strategies at all.  Instead, the <quote>consistency</> support routine
+   strategies at all.  Instead, the <quote>consistency</quote> support routine
    of each particular GiST operator class interprets the strategy numbers
    however it likes.  As an example, several of the built-in GiST index
    operator classes index two-dimensional geometric objects, providing
-   the <quote>R-tree</> strategies shown in
-   <xref linkend="xindex-rtree-strat-table">.  Four of these are true
+   the <quote>R-tree</quote> strategies shown in
+   <xref linkend="xindex-rtree-strat-table"/>.  Four of these are true
    two-dimensional tests (overlaps, same, contains, contained by);
    four of them consider only the X direction; and the other four
    provide the same tests in the Y direction.
   </para>
 
    <table tocentry="1" id="xindex-rtree-strat-table">
-    <title>GiST Two-Dimensional <quote>R-tree</> Strategies</title>
+    <title>GiST Two-Dimensional <quote>R-tree</quote> Strategies</title>
     <tgroup cols="2">
      <thead>
       <row>
@@ -242,7 +242,7 @@
    class interpret the strategy numbers according to the operator class's
    definition. As an example, the strategy numbers used by the built-in
    operator classes for points are shown in <xref
-   linkend="xindex-spgist-point-strat-table">.
+   linkend="xindex-spgist-point-strat-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-spgist-point-strat-table">
@@ -289,7 +289,7 @@
    each operator class interpret the strategy numbers according to the
    operator class's definition. As an example, the strategy numbers used by
    the built-in operator class for arrays are shown in
-   <xref linkend="xindex-gin-array-strat-table">.
+   <xref linkend="xindex-gin-array-strat-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-gin-array-strat-table">
@@ -327,8 +327,8 @@
    don't have a fixed set of strategies either.  Instead the support routines
    of each operator class interpret the strategy numbers according to the
    operator class's definition. As an example, the strategy numbers used by
-   the built-in <literal>Minmax</> operator classes are shown in
-   <xref linkend="xindex-brin-minmax-strat-table">.
+   the built-in <literal>Minmax</literal> operator classes are shown in
+   <xref linkend="xindex-brin-minmax-strat-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-brin-minmax-strat-table">
@@ -369,10 +369,10 @@
    Notice that all the operators listed above return Boolean values.  In
    practice, all operators defined as index method search operators must
    return type <type>boolean</type>, since they must appear at the top
-   level of a <literal>WHERE</> clause to be used with an index.
-   (Some index access methods also support <firstterm>ordering operators</>,
+   level of a <literal>WHERE</literal> clause to be used with an index.
+   (Some index access methods also support <firstterm>ordering operators</firstterm>,
    which typically don't return Boolean values; that feature is discussed
-   in <xref linkend="xindex-ordering-ops">.)
+   in <xref linkend="xindex-ordering-ops"/>.)
   </para>
  </sect2>
 
@@ -396,14 +396,17 @@
    functions should play each of these roles for a given data type and
    semantic interpretation.  The index method defines the set
    of functions it needs, and the operator class identifies the correct
-   functions to use by assigning them to the <quote>support function numbers</>
+   functions to use by assigning them to the <quote>support function numbers</quote>
    specified by the index method.
   </para>
 
   <para>
-   B-trees require a single support function, and allow a second one to be
+   B-trees require a comparison support function,
+   and allow two additional support functions to be
    supplied at the operator class author's option, as shown in <xref
-   linkend="xindex-btree-support-table">.
+   linkend="xindex-btree-support-table"/>.
+   The requirements for these support functions are explained further in
+   <xref linkend="btree-support-funcs"/>.
   </para>
 
    <table tocentry="1" id="xindex-btree-support-table">
@@ -426,18 +429,26 @@
       </row>
       <row>
        <entry>
-        Return the addresses of C-callable sort support function(s),
-        as documented in <filename>utils/sortsupport.h</> (optional)
+        Return the addresses of C-callable sort support function(s)
+        (optional)
        </entry>
        <entry>2</entry>
       </row>
+      <row>
+       <entry>
+        Compare a test value to a base value plus/minus an offset, and return
+        true or false according to the comparison result (optional)
+       </entry>
+       <entry>3</entry>
+      </row>
      </tbody>
     </tgroup>
    </table>
 
   <para>
-   Hash indexes require one support function, shown in <xref
-   linkend="xindex-hash-support-table">.
+   Hash indexes require one support function, and allow a second one to be
+   supplied at the operator class author's option, as shown in <xref
+   linkend="xindex-hash-support-table"/>.
   </para>
 
    <table tocentry="1" id="xindex-hash-support-table">
@@ -451,17 +462,26 @@
      </thead>
      <tbody>
       <row>
-       <entry>Compute the hash value for a key</entry>
+       <entry>Compute the 32-bit hash value for a key</entry>
        <entry>1</entry>
       </row>
+      <row>
+       <entry>
+         Compute the 64-bit hash value for a key given a 64-bit salt; if
+         the salt is 0, the low 32 bits of the result must match the value
+         that would have been computed by function 1
+         (optional)
+       </entry>
+       <entry>2</entry>
+      </row>
      </tbody>
     </tgroup>
    </table>
 
   <para>
    GiST indexes have nine support functions, two of which are optional,
-   as shown in <xref linkend="xindex-gist-support-table">.
-   (For more information see <xref linkend="GiST">.)
+   as shown in <xref linkend="xindex-gist-support-table"/>.
+   (For more information see <xref linkend="gist"/>.)
   </para>
 
    <table tocentry="1" id="xindex-gist-support-table">
@@ -476,52 +496,52 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>consistent</></entry>
+       <entry><function>consistent</function></entry>
        <entry>determine whether key satisfies the
         query qualifier</entry>
        <entry>1</entry>
       </row>
       <row>
-       <entry><function>union</></entry>
+       <entry><function>union</function></entry>
        <entry>compute union of a set of keys</entry>
        <entry>2</entry>
       </row>
       <row>
-       <entry><function>compress</></entry>
+       <entry><function>compress</function></entry>
        <entry>compute a compressed representation of a key or value
         to be indexed</entry>
        <entry>3</entry>
       </row>
       <row>
-       <entry><function>decompress</></entry>
+       <entry><function>decompress</function></entry>
        <entry>compute a decompressed representation of a
         compressed key</entry>
        <entry>4</entry>
       </row>
       <row>
-       <entry><function>penalty</></entry>
+       <entry><function>penalty</function></entry>
        <entry>compute penalty for inserting new key into subtree
        with given subtree's key</entry>
        <entry>5</entry>
       </row>
       <row>
-       <entry><function>picksplit</></entry>
+       <entry><function>picksplit</function></entry>
        <entry>determine which entries of a page are to be moved
        to the new page and compute the union keys for resulting pages</entry>
        <entry>6</entry>
       </row>
       <row>
-       <entry><function>equal</></entry>
+       <entry><function>equal</function></entry>
        <entry>compare two keys and return true if they are equal</entry>
        <entry>7</entry>
       </row>
       <row>
-       <entry><function>distance</></entry>
+       <entry><function>distance</function></entry>
        <entry>determine distance from key to query value (optional)</entry>
        <entry>8</entry>
       </row>
       <row>
-       <entry><function>fetch</></entry>
+       <entry><function>fetch</function></entry>
        <entry>compute original representation of a compressed key for
        index-only scans (optional)</entry>
        <entry>9</entry>
@@ -532,8 +552,8 @@
 
   <para>
    SP-GiST indexes require five support functions, as
-   shown in <xref linkend="xindex-spgist-support-table">.
-   (For more information see <xref linkend="SPGiST">.)
+   shown in <xref linkend="xindex-spgist-support-table"/>.
+   (For more information see <xref linkend="spgist"/>.)
   </para>
 
    <table tocentry="1" id="xindex-spgist-support-table">
@@ -548,28 +568,28 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>config</></entry>
+       <entry><function>config</function></entry>
        <entry>provide basic information about the operator class</entry>
        <entry>1</entry>
       </row>
       <row>
-       <entry><function>choose</></entry>
+       <entry><function>choose</function></entry>
        <entry>determine how to insert a new value into an inner tuple</entry>
        <entry>2</entry>
       </row>
       <row>
-       <entry><function>picksplit</></entry>
+       <entry><function>picksplit</function></entry>
        <entry>determine how to partition a set of values</entry>
        <entry>3</entry>
       </row>
       <row>
-       <entry><function>inner_consistent</></entry>
+       <entry><function>inner_consistent</function></entry>
        <entry>determine which sub-partitions need to be searched for a
         query</entry>
        <entry>4</entry>
       </row>
       <row>
-       <entry><function>leaf_consistent</></entry>
+       <entry><function>leaf_consistent</function></entry>
        <entry>determine whether key satisfies the
         query qualifier</entry>
        <entry>5</entry>
@@ -580,8 +600,8 @@
 
   <para>
    GIN indexes have six support functions, three of which are optional,
-   as shown in <xref linkend="xindex-gin-support-table">.
-   (For more information see <xref linkend="GIN">.)
+   as shown in <xref linkend="xindex-gin-support-table"/>.
+   (For more information see <xref linkend="gin"/>.)
   </para>
 
    <table tocentry="1" id="xindex-gin-support-table">
@@ -596,7 +616,7 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>compare</></entry>
+       <entry><function>compare</function></entry>
        <entry>
         compare two keys and return an integer less than zero, zero,
         or greater than zero, indicating whether the first key is less than,
@@ -605,17 +625,17 @@
        <entry>1</entry>
       </row>
       <row>
-       <entry><function>extractValue</></entry>
+       <entry><function>extractValue</function></entry>
        <entry>extract keys from a value to be indexed</entry>
        <entry>2</entry>
       </row>
       <row>
-       <entry><function>extractQuery</></entry>
+       <entry><function>extractQuery</function></entry>
        <entry>extract keys from a query condition</entry>
        <entry>3</entry>
       </row>
       <row>
-       <entry><function>consistent</></entry>
+       <entry><function>consistent</function></entry>
        <entry>
         determine whether value matches query condition (Boolean variant)
         (optional if support function 6 is present)
@@ -623,7 +643,7 @@
        <entry>4</entry>
       </row>
       <row>
-       <entry><function>comparePartial</></entry>
+       <entry><function>comparePartial</function></entry>
        <entry>
         compare partial key from
         query and key from index, and return an integer less than zero, zero,
@@ -633,7 +653,7 @@
        <entry>5</entry>
       </row>
       <row>
-       <entry><function>triConsistent</></entry>
+       <entry><function>triConsistent</function></entry>
        <entry>
         determine whether value matches query condition (ternary variant)
         (optional if support function 4 is present)
@@ -646,9 +666,9 @@
 
   <para>
    BRIN indexes have four basic support functions, as shown in
-   <xref linkend="xindex-brin-support-table">; those basic functions
+   <xref linkend="xindex-brin-support-table"/>; those basic functions
    may require additional support functions to be provided.
-   (For more information see <xref linkend="brin-extensibility">.)
+   (For more information see <xref linkend="brin-extensibility"/>.)
   </para>
 
    <table tocentry="1" id="xindex-brin-support-table">
@@ -663,7 +683,7 @@
      </thead>
      <tbody>
       <row>
-       <entry><function>opcInfo</></entry>
+       <entry><function>opcInfo</function></entry>
        <entry>
         return internal information describing the indexed columns'
         summary data
@@ -671,17 +691,17 @@
        <entry>1</entry>
       </row>
       <row>
-       <entry><function>add_value</></entry>
+       <entry><function>add_value</function></entry>
        <entry>add a new value to an existing summary index tuple</entry>
        <entry>2</entry>
       </row>
       <row>
-       <entry><function>consistent</></entry>
+       <entry><function>consistent</function></entry>
        <entry>determine whether value matches query condition</entry>
        <entry>3</entry>
       </row>
       <row>
-       <entry><function>union</></entry>
+       <entry><function>union</function></entry>
        <entry>
         compute union of two summary tuples
        </entry>
@@ -717,15 +737,15 @@
    operators that sort complex numbers in absolute value order, so we
    choose the name <literal>complex_abs_ops</literal>.  First, we need
    a set of operators.  The procedure for defining operators was
-   discussed in <xref linkend="xoper">.  For an operator class on
+   discussed in <xref linkend="xoper"/>.  For an operator class on
    B-trees, the operators we require are:
 
    <itemizedlist spacing="compact">
-    <listitem><simpara>absolute-value less-than (strategy 1)</></>
-    <listitem><simpara>absolute-value less-than-or-equal (strategy 2)</></>
-    <listitem><simpara>absolute-value equal (strategy 3)</></>
-    <listitem><simpara>absolute-value greater-than-or-equal (strategy 4)</></>
-    <listitem><simpara>absolute-value greater-than (strategy 5)</></>
+    <listitem><simpara>absolute-value less-than (strategy 1)</simpara></listitem>
+    <listitem><simpara>absolute-value less-than-or-equal (strategy 2)</simpara></listitem>
+    <listitem><simpara>absolute-value equal (strategy 3)</simpara></listitem>
+    <listitem><simpara>absolute-value greater-than-or-equal (strategy 4)</simpara></listitem>
+    <listitem><simpara>absolute-value greater-than (strategy 5)</simpara></listitem>
    </itemizedlist>
   </para>
 
@@ -792,8 +812,7 @@ CREATE OPERATOR &lt; (
    It is important to specify the correct commutator and negator operators,
    as well as suitable restriction and join selectivity
    functions, otherwise the optimizer will be unable to make effective
-   use of the index.  Note that the less-than, equal, and
-   greater-than cases should use different selectivity functions.
+   use of the index.
   </para>
 
   <para>
@@ -809,7 +828,7 @@ CREATE OPERATOR &lt; (
      type we'd probably want <literal>=</literal> to be the ordinary
      equality operation for complex numbers (and not the equality of
      the absolute values).  In that case, we'd need to use some other
-     operator name for <function>complex_abs_eq</>.
+     operator name for <function>complex_abs_eq</function>.
     </para>
    </listitem>
 
@@ -886,7 +905,7 @@ CREATE OPERATOR CLASS complex_abs_ops
   <para>
    The above example assumes that you want to make this new operator class the
    default B-tree operator class for the <type>complex</type> data type.
-   If you don't, just leave out the word <literal>DEFAULT</>.
+   If you don't, just leave out the word <literal>DEFAULT</literal>.
   </para>
  </sect2>
 
@@ -909,11 +928,11 @@ CREATE OPERATOR CLASS complex_abs_ops
   <para>
    To handle these needs, <productname>PostgreSQL</productname>
    uses the concept of an <firstterm>operator
-   family</><indexterm><primary>operator family</></indexterm>.
+   family</firstterm><indexterm><primary>operator family</primary></indexterm>.
    An operator family contains one or more operator classes, and can also
    contain indexable operators and corresponding support functions that
    belong to the family as a whole but not to any single class within the
-   family.  We say that such operators and functions are <quote>loose</>
+   family.  We say that such operators and functions are <quote>loose</quote>
    within the family, as opposed to being bound into a specific class.
    Typically each operator class contains single-data-type operators
    while cross-data-type operators are loose in the family.
@@ -939,10 +958,10 @@ CREATE OPERATOR CLASS complex_abs_ops
 
   <para>
    As an example, <productname>PostgreSQL</productname> has a built-in
-   B-tree operator family <literal>integer_ops</>, which includes operator
-   classes <literal>int8_ops</>, <literal>int4_ops</>, and
-   <literal>int2_ops</> for indexes on <type>bigint</> (<type>int8</>),
-   <type>integer</> (<type>int4</>), and <type>smallint</> (<type>int2</>)
+   B-tree operator family <literal>integer_ops</literal>, which includes operator
+   classes <literal>int8_ops</literal>, <literal>int4_ops</literal>, and
+   <literal>int2_ops</literal> for indexes on <type>bigint</type> (<type>int8</type>),
+   <type>integer</type> (<type>int4</type>), and <type>smallint</type> (<type>int2</type>)
    columns respectively.  The family also contains cross-data-type comparison
    operators allowing any two of these types to be compared, so that an index
    on one of these types can be searched using a comparison value of another
@@ -960,7 +979,8 @@ DEFAULT FOR TYPE int8 USING btree FAMILY integer_ops AS
   OPERATOR 4 >= ,
   OPERATOR 5 > ,
   FUNCTION 1 btint8cmp(int8, int8) ,
-  FUNCTION 2 btint8sortsupport(internal) ;
+  FUNCTION 2 btint8sortsupport(internal) ,
+  FUNCTION 3 in_range(int8, int8, int8, boolean, boolean) ;
 
 CREATE OPERATOR CLASS int4_ops
 DEFAULT FOR TYPE int4 USING btree FAMILY integer_ops AS
@@ -971,7 +991,8 @@ DEFAULT FOR TYPE int4 USING btree FAMILY integer_ops AS
   OPERATOR 4 >= ,
   OPERATOR 5 > ,
   FUNCTION 1 btint4cmp(int4, int4) ,
-  FUNCTION 2 btint4sortsupport(internal) ;
+  FUNCTION 2 btint4sortsupport(internal) ,
+  FUNCTION 3 in_range(int4, int4, int4, boolean, boolean) ;
 
 CREATE OPERATOR CLASS int2_ops
 DEFAULT FOR TYPE int2 USING btree FAMILY integer_ops AS
@@ -982,7 +1003,8 @@ DEFAULT FOR TYPE int2 USING btree FAMILY integer_ops AS
   OPERATOR 4 >= ,
   OPERATOR 5 > ,
   FUNCTION 1 btint2cmp(int2, int2) ,
-  FUNCTION 2 btint2sortsupport(internal) ;
+  FUNCTION 2 btint2sortsupport(internal) ,
+  FUNCTION 3 in_range(int2, int2, int2, boolean, boolean) ;
 
 ALTER OPERATOR FAMILY integer_ops USING btree ADD
   -- cross-type comparisons int8 vs int2
@@ -1031,11 +1053,17 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
   OPERATOR 3 = (int2, int4) ,
   OPERATOR 4 >= (int2, int4) ,
   OPERATOR 5 > (int2, int4) ,
-  FUNCTION 1 btint24cmp(int2, int4) ;
+  FUNCTION 1 btint24cmp(int2, int4) ,
+
+  -- cross-type in_range functions
+  FUNCTION 3 in_range(int4, int4, int8, boolean, boolean) ,
+  FUNCTION 3 in_range(int4, int4, int2, boolean, boolean) ,
+  FUNCTION 3 in_range(int2, int2, int8, boolean, boolean) ,
+  FUNCTION 3 in_range(int2, int2, int4, boolean, boolean) ;
 ]]>
 </programlisting>
 
-   Notice that this definition <quote>overloads</> the operator strategy and
+   Notice that this definition <quote>overloads</quote> the operator strategy and
    support function numbers: each number occurs multiple times within the
    family.  This is allowed so long as each instance of a
    particular number has distinct input data types.  The instances that have
@@ -1047,11 +1075,8 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
 
   <para>
    In a B-tree operator family, all the operators in the family must sort
-   compatibly, meaning that the transitive laws hold across all the data types
-   supported by the family: <quote>if A = B and B = C, then A = C</>,
-   and <quote>if A &lt; B and B &lt; C, then A &lt; C</>.  Moreover, implicit
-   or binary coercion casts between types represented in the operator family
-   must not change the associated sort ordering.  For each
+   compatibly, as is specified in detail in <xref linkend="btree-behavior"/>.
+   For each
    operator in the family there must be a support function having the same
    two input data types as the operator.  It is recommended that a family be
    complete, i.e., for each combination of data types, all operators are
@@ -1086,7 +1111,7 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
 
   <para>
    In BRIN, the requirements depends on the framework that provides the
-   operator classes.  For operator classes based on <literal>minmax</>,
+   operator classes.  For operator classes based on <literal>minmax</literal>,
    the behavior required is the same as for B-tree operator families:
    all the operators in the family must sort compatibly, and casts must
    not change the associated sort ordering.
@@ -1120,32 +1145,27 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
   </para>
 
   <para>
-   In particular, there are SQL features such as <literal>ORDER BY</> and
-   <literal>DISTINCT</> that require comparison and sorting of values.
+   In particular, there are SQL features such as <literal>ORDER BY</literal> and
+   <literal>DISTINCT</literal> that require comparison and sorting of values.
    To implement these features on a user-defined data type,
    <productname>PostgreSQL</productname> looks for the default B-tree operator
-   class for the data type.  The <quote>equals</> member of this operator
+   class for the data type.  The <quote>equals</quote> member of this operator
    class defines the system's notion of equality of values for
-   <literal>GROUP BY</> and <literal>DISTINCT</>, and the sort ordering
-   imposed by the operator class defines the default <literal>ORDER BY</>
+   <literal>GROUP BY</literal> and <literal>DISTINCT</literal>, and the sort ordering
+   imposed by the operator class defines the default <literal>ORDER BY</literal>
    ordering.
   </para>
 
-  <para>
-   Comparison of arrays of user-defined types also relies on the semantics
-   defined by the default B-tree operator class.
-  </para>
-
   <para>
    If there is no default B-tree operator class for a data type, the system
    will look for a default hash operator class.  But since that kind of
-   operator class only provides equality, in practice it is only enough
-   to support array equality.
+   operator class only provides equality, it is only able to support grouping
+   not sorting.
   </para>
 
   <para>
    When there is no default operator class for a data type, you will get
-   errors like <quote>could not identify an ordering operator</> if you
+   errors like <quote>could not identify an ordering operator</quote> if you
    try to use these SQL features with the data type.
   </para>
 
@@ -1153,14 +1173,65 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
     <para>
      In <productname>PostgreSQL</productname> versions before 7.4,
      sorting and grouping operations would implicitly use operators named
-     <literal>=</>, <literal>&lt;</>, and <literal>&gt;</>.  The new
+     <literal>=</literal>, <literal>&lt;</literal>, and <literal>&gt;</literal>.  The new
      behavior of relying on default operator classes avoids having to make
      any assumption about the behavior of operators with particular names.
     </para>
    </note>
 
   <para>
-   Another important point is that an operator that
+   Sorting by a non-default B-tree operator class is possible by specifying
+   the class's less-than operator in a <literal>USING</literal> option,
+   for example
+<programlisting>
+SELECT * FROM mytable ORDER BY somecol USING ~&lt;~;
+</programlisting>
+   Alternatively, specifying the class's greater-than operator
+   in <literal>USING</literal> selects a descending-order sort.
+  </para>
+
+  <para>
+   Comparison of arrays of a user-defined type also relies on the semantics
+   defined by the type's default B-tree operator class.  If there is no
+   default B-tree operator class, but there is a default hash operator class,
+   then array equality is supported, but not ordering comparisons.
+  </para>
+
+  <para>
+   Another SQL feature that requires even more data-type-specific knowledge
+   is the <literal>RANGE</literal> <replaceable>offset</replaceable>
+   <literal>PRECEDING</literal>/<literal>FOLLOWING</literal> framing option
+   for window functions (see <xref linkend="syntax-window-functions"/>).
+   For a query such as
+<programlisting>
+SELECT sum(x) OVER (ORDER BY x RANGE BETWEEN 5 PRECEDING AND 10 FOLLOWING)
+  FROM mytable;
+</programlisting>
+   it is not sufficient to know how to order by <literal>x</literal>;
+   the database must also understand how to <quote>subtract 5</quote> or
+   <quote>add 10</quote> to the current row's value of <literal>x</literal>
+   to identify the bounds of the current window frame.  Comparing the
+   resulting bounds to other rows' values of <literal>x</literal> is
+   possible using the comparison operators provided by the B-tree operator
+   class that defines the <literal>ORDER BY</literal> ordering &mdash; but
+   addition and subtraction operators are not part of the operator class, so
+   which ones should be used?  Hard-wiring that choice would be undesirable,
+   because different sort orders (different B-tree operator classes) might
+   need different behavior.  Therefore, a B-tree operator class can specify
+   an <firstterm>in_range</firstterm> support function that encapsulates the
+   addition and subtraction behaviors that make sense for its sort order.
+   It can even provide more than one in_range support function, in case
+   there is more than one data type that makes sense to use as the offset
+   in <literal>RANGE</literal> clauses.
+   If the B-tree operator class associated with the window's <literal>ORDER
+   BY</literal> clause does not have a matching in_range support function,
+   the <literal>RANGE</literal> <replaceable>offset</replaceable>
+   <literal>PRECEDING</literal>/<literal>FOLLOWING</literal>
+   option is not supported.
+  </para>
+
+  <para>
+   Another important point is that an equality operator that
    appears in a hash operator family is a candidate for hash joins,
    hash aggregation, and related optimizations.  The hash operator family
    is essential here since it identifies the hash function(s) to use.
@@ -1172,22 +1243,22 @@ ALTER OPERATOR FAMILY integer_ops USING btree ADD
 
   <para>
    Some index access methods (currently, only GiST) support the concept of
-   <firstterm>ordering operators</>.  What we have been discussing so far
-   are <firstterm>search operators</>.  A search operator is one for which
+   <firstterm>ordering operators</firstterm>.  What we have been discussing so far
+   are <firstterm>search operators</firstterm>.  A search operator is one for which
    the index can be searched to find all rows satisfying
-   <literal>WHERE</>
-   <replaceable>indexed_column</>
-   <replaceable>operator</>
-   <replaceable>constant</>.
+   <literal>WHERE</literal>
+   <replaceable>indexed_column</replaceable>
+   <replaceable>operator</replaceable>
+   <replaceable>constant</replaceable>.
    Note that nothing is promised about the order in which the matching rows
    will be returned.  In contrast, an ordering operator does not restrict the
    set of rows that can be returned, but instead determines their order.
    An ordering operator is one for which the index can be scanned to return
    rows in the order represented by
-   <literal>ORDER BY</>
-   <replaceable>indexed_column</>
-   <replaceable>operator</>
-   <replaceable>constant</>.
+   <literal>ORDER BY</literal>
+   <replaceable>indexed_column</replaceable>
+   <replaceable>operator</replaceable>
+   <replaceable>constant</replaceable>.
    The reason for defining ordering operators that way is that it supports
    nearest-neighbor searches, if the operator is one that measures distance.
    For example, a query like
@@ -1197,7 +1268,7 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
 </programlisting>
    finds the ten places closest to a given target point.  A GiST index
    on the location column can do this efficiently because
-   <literal>&lt;-&gt;</> is an ordering operator.
+   <literal>&lt;-&gt;</literal> is an ordering operator.
   </para>
 
   <para>
@@ -1209,17 +1280,17 @@ SELECT * FROM places ORDER BY location <-> point '(101,456)' LIMIT 10;
    a B-tree operator family that specifies the sort ordering of the result
    data type.  As was stated in the previous section, B-tree operator families
    define <productname>PostgreSQL</productname>'s notion of ordering, so
-   this is a natural representation.  Since the point <literal>&lt;-&gt;</>
-   operator returns <type>float8</>, it could be specified in an operator
+   this is a natural representation.  Since the point <literal>&lt;-&gt;</literal>
+   operator returns <type>float8</type>, it could be specified in an operator
    class creation command like this:
 <programlisting><![CDATA[
 OPERATOR 15    <-> (point, point) FOR ORDER BY float_ops
 ]]>
 </programlisting>
-   where <literal>float_ops</> is the built-in operator family that includes
-   operations on <type>float8</>.  This declaration states that the index
+   where <literal>float_ops</literal> is the built-in operator family that includes
+   operations on <type>float8</type>.  This declaration states that the index
    is able to return rows in order of increasing values of the
-   <literal>&lt;-&gt;</> operator.
+   <literal>&lt;-&gt;</literal> operator.
   </para>
  </sect2>
 
@@ -1235,21 +1306,21 @@ OPERATOR 15    <-> (point, point) FOR ORDER BY float_ops
   <para>
    Normally, declaring an operator as a member of an operator class
    (or family) means that the index method can retrieve exactly the set of rows
-   that satisfy a <literal>WHERE</> condition using the operator.  For example:
+   that satisfy a <literal>WHERE</literal> condition using the operator.  For example:
 <programlisting>
 SELECT * FROM table WHERE integer_column &lt; 4;
 </programlisting>
    can be satisfied exactly by a B-tree index on the integer column.
    But there are cases where an index is useful as an inexact guide to
    the matching rows.  For example, if a GiST index stores only bounding boxes
-   for geometric objects, then it cannot exactly satisfy a <literal>WHERE</>
+   for geometric objects, then it cannot exactly satisfy a <literal>WHERE</literal>
    condition that tests overlap between nonrectangular objects such as
    polygons.  Yet we could use the index to find objects whose bounding
    box overlaps the bounding box of the target object, and then do the
    exact overlap test only on the objects found by the index.  If this
-   scenario applies, the index is said to be <quote>lossy</> for the
+   scenario applies, the index is said to be <quote>lossy</quote> for the
    operator.  Lossy index searches are implemented by having the index
-   method return a <firstterm>recheck</> flag when a row might or might
+   method return a <firstterm>recheck</firstterm> flag when a row might or might
    not really satisfy the query condition.  The core system will then
    test the original query condition on the retrieved row to see whether
    it should be returned as a valid match.  This approach works if
@@ -1266,8 +1337,8 @@ SELECT * FROM table WHERE integer_column &lt; 4;
    the bounding box of a complex object such as a polygon.  In this
    case there's not much value in storing the whole polygon in the index
    entry &mdash; we might as well store just a simpler object of type
-   <type>box</>.  This situation is expressed by the <literal>STORAGE</>
-   option in <command>CREATE OPERATOR CLASS</>: we'd write something like:
+   <type>box</type>.  This situation is expressed by the <literal>STORAGE</literal>
+   option in <command>CREATE OPERATOR CLASS</command>: we'd write something like:
 
 <programlisting>
 CREATE OPERATOR CLASS polygon_ops
@@ -1277,16 +1348,16 @@ CREATE OPERATOR CLASS polygon_ops
 </programlisting>
 
    At present, only the GiST, GIN and BRIN index methods support a
-   <literal>STORAGE</> type that's different from the column data type.
-   The GiST <function>compress</> and <function>decompress</> support
-   routines must deal with data-type conversion when <literal>STORAGE</>
-   is used.  In GIN, the <literal>STORAGE</> type identifies the type of
-   the <quote>key</> values, which normally is different from the type
+   <literal>STORAGE</literal> type that's different from the column data type.
+   The GiST <function>compress</function> and <function>decompress</function> support
+   routines must deal with data-type conversion when <literal>STORAGE</literal>
+   is used.  In GIN, the <literal>STORAGE</literal> type identifies the type of
+   the <quote>key</quote> values, which normally is different from the type
    of the indexed column &mdash; for example, an operator class for
    integer-array columns might have keys that are just integers.  The
-   GIN <function>extractValue</> and <function>extractQuery</> support
+   GIN <function>extractValue</function> and <function>extractQuery</function> support
    routines are responsible for extracting keys from indexed values.
-   BRIN is similar to GIN: the <literal>STORAGE</> type identifies the
+   BRIN is similar to GIN: the <literal>STORAGE</literal> type identifies the
    type of the stored summary values, and operator classes' support
    procedures are responsible for interpreting the summary values
    correctly.
diff --git a/doc/src/sgml/xml2.sgml b/doc/src/sgml/xml2.sgml
index 9bbc9e75d7..0a0f13d02d 100644
--- a/doc/src/sgml/xml2.sgml
+++ b/doc/src/sgml/xml2.sgml
@@ -8,7 +8,7 @@
  </indexterm>
 
  <para>
-  The <filename>xml2</> module provides XPath querying and
+  The <filename>xml2</filename> module provides XPath querying and
   XSLT functionality.
  </para>
 
@@ -16,7 +16,7 @@
   <title>Deprecation Notice</title>
 
   <para>
-   From <productname>PostgreSQL</> 8.3 on, there is XML-related
+   From <productname>PostgreSQL</productname> 8.3 on, there is XML-related
    functionality based on the SQL/XML standard in the core server.
    That functionality covers XML syntax checking and XPath queries,
    which is what this module does, and more, but the API is
@@ -34,9 +34,9 @@
   <title>Description of Functions</title>
 
   <para>
-   <xref linkend="xml2-functions-table"> shows the functions provided by this module.
+   <xref linkend="xml2-functions-table"/> shows the functions provided by this module.
    These functions provide straightforward XML parsing and XPath queries.
-   All arguments are of type <type>text</>, so for brevity that is not shown.
+   All arguments are of type <type>text</type>, so for brevity that is not shown.
   </para>
 
   <table id="xml2-functions-table">
@@ -63,8 +63,8 @@
        <para>
         This parses the document text in its parameter and returns true if the
         document is well-formed XML.  (Note: this is an alias for the standard
-        PostgreSQL function <function>xml_is_well_formed()</>.  The
-        name <function>xml_valid()</> is technically incorrect since validity
+        PostgreSQL function <function>xml_is_well_formed()</function>.  The
+        name <function>xml_valid()</function> is technically incorrect since validity
         and well-formedness have different meanings in XML.)
        </para>
       </entry>
@@ -124,7 +124,7 @@
 &lt;itemtag&gt;Value 2....&lt;/itemtag&gt;
 &lt;/toptag&gt;
 </synopsis>
-        If either <literal>toptag</> or <literal>itemtag</> is an empty string, the relevant tag is omitted.
+        If either <literal>toptag</literal> or <literal>itemtag</literal> is an empty string, the relevant tag is omitted.
        </para>
       </entry>
      </row>
@@ -139,7 +139,7 @@
       </entry>
       <entry>
        <para>
-        Like <function>xpath_nodeset(document, query, toptag, itemtag)</> but result omits both tags.
+        Like <function>xpath_nodeset(document, query, toptag, itemtag)</function> but result omits both tags.
        </para>
       </entry>
      </row>
@@ -154,7 +154,7 @@
       </entry>
       <entry>
        <para>
-        Like <function>xpath_nodeset(document, query, toptag, itemtag)</> but result omits <literal>toptag</literal>.
+        Like <function>xpath_nodeset(document, query, toptag, itemtag)</function> but result omits <literal>toptag</literal>.
        </para>
       </entry>
      </row>
@@ -170,8 +170,8 @@
       <entry>
        <para>
         This function returns multiple values separated by the specified
-        separator, for example <literal>Value 1,Value 2,Value 3</> if
-        separator is <literal>,</>.
+        separator, for example <literal>Value 1,Value 2,Value 3</literal> if
+        separator is <literal>,</literal>.
        </para>
       </entry>
      </row>
@@ -185,7 +185,7 @@
        <type>text</type>
       </entry>
       <entry>
-       This is a wrapper for the above function that uses <literal>,</>
+       This is a wrapper for the above function that uses <literal>,</literal>
        as the separator.
       </entry>
      </row>
@@ -206,12 +206,12 @@ xpath_table(text key, text document, text relation, text xpaths, text criteria)
 </synopsis>
 
   <para>
-   <function>xpath_table</> is a table function that evaluates a set of XPath
+   <function>xpath_table</function> is a table function that evaluates a set of XPath
    queries on each of a set of documents and returns the results as a
    table. The primary key field from the original document table is returned
    as the first column of the result so that the result set
    can readily be used in joins.  The parameters are described in
-   <xref linkend="xml2-xpath-table-parameters">.
+   <xref linkend="xml2-xpath-table-parameters"/>.
   </para>
 
   <table id="xml2-xpath-table-parameters">
@@ -228,7 +228,7 @@ xpath_table(text key, text document, text relation, text xpaths, text criteria)
       <entry><parameter>key</parameter></entry>
       <entry>
        <para>
-        the name of the <quote>key</> field &mdash; this is just a field to be used as
+        the name of the <quote>key</quote> field &mdash; this is just a field to be used as
         the first column of the output table, i.e., it identifies the record from
         which each output row came (see note below about multiple values)
        </para>
@@ -285,7 +285,7 @@ xpath_table(text key, text document, text relation, text xpaths, text criteria)
   </para>
 
   <para>
-   so those parameters can be <emphasis>anything</> valid in those particular
+   so those parameters can be <emphasis>anything</emphasis> valid in those particular
    locations. The result from this SELECT needs to return exactly two
    columns (which it will unless you try to list multiple fields for key
    or document). Beware that this simplistic approach requires that you
@@ -293,8 +293,8 @@ xpath_table(text key, text document, text relation, text xpaths, text criteria)
   </para>
 
   <para>
-   The function has to be used in a <literal>FROM</> expression, with an
-   <literal>AS</> clause to specify the output columns; for example
+   The function has to be used in a <literal>FROM</literal> expression, with an
+   <literal>AS</literal> clause to specify the output columns; for example
 <programlisting>
 SELECT * FROM
 xpath_table('article_id',
@@ -304,8 +304,8 @@ xpath_table('article_id',
             'date_entered > ''2003-01-01'' ')
 AS t(article_id integer, author text, page_count integer, title text);
 </programlisting>
-   The <literal>AS</> clause defines the names and types of the columns in the
-   output table.  The first is the <quote>key</> field and the rest correspond
+   The <literal>AS</literal> clause defines the names and types of the columns in the
+   output table.  The first is the <quote>key</quote> field and the rest correspond
    to the XPath queries.
    If there are more XPath queries than result columns,
    the extra queries will be ignored. If there are more result columns
@@ -313,19 +313,19 @@ AS t(article_id integer, author text, page_count integer, title text);
   </para>
 
   <para>
-   Notice that this example defines the <structname>page_count</> result
+   Notice that this example defines the <structname>page_count</structname> result
    column as an integer.  The function deals internally with string
    representations, so when you say you want an integer in the output, it will
    take the string representation of the XPath result and use PostgreSQL input
-   functions to transform it into an integer (or whatever type the <type>AS</>
+   functions to transform it into an integer (or whatever type the <type>AS</type>
    clause requests). An error will result if it can't do this &mdash; for
    example if the result is empty &mdash; so you may wish to just stick to
-   <type>text</> as the column type if you think your data has any problems.
+   <type>text</type> as the column type if you think your data has any problems.
   </para>
 
   <para>
-   The calling <command>SELECT</> statement doesn't necessarily have to be
-   just <literal>SELECT *</> &mdash; it can reference the output
+   The calling <command>SELECT</command> statement doesn't necessarily have to be
+   just <literal>SELECT *</literal> &mdash; it can reference the output
    columns by name or join them to other tables. The function produces a
    virtual table with which you can perform any operation you wish (e.g.
    aggregation, joining, sorting etc). So we could also have:
@@ -346,7 +346,7 @@ WHERE t.author_id = p.person_id;
    <title>Multivalued Results</title>
 
    <para>
-    The <function>xpath_table</> function assumes that the results of each XPath query
+    The <function>xpath_table</function> function assumes that the results of each XPath query
     might be multivalued, so the number of rows returned by the function
     may not be the same as the number of input documents. The first row
     returned contains the first result from each query, the second row the
@@ -393,8 +393,8 @@ WHERE id = 1 ORDER BY doc_num, line_num
    </para>
 
    <para>
-    To get <literal>doc_num</> on every line, the solution is to use two invocations
-    of <function>xpath_table</> and join the results:
+    To get <literal>doc_num</literal> on every line, the solution is to use two invocations
+    of <function>xpath_table</function> and join the results:
 
 <programlisting>
 SELECT t.*,i.doc_num FROM
@@ -437,15 +437,15 @@ xslt_process(text document, text stylesheet, text paramlist) returns text
 
    <para>
     This function applies the XSL stylesheet to the document and returns
-    the transformed result. The <literal>paramlist</> is a list of parameter
+    the transformed result. The <literal>paramlist</literal> is a list of parameter
     assignments to be used in the transformation, specified in the form
-    <literal>a=1,b=2</>. Note that the
+    <literal>a=1,b=2</literal>. Note that the
     parameter parsing is very simple-minded: parameter values cannot
     contain commas!
    </para>
 
    <para>
-    There is also a two-parameter version of <function>xslt_process</> which
+    There is also a two-parameter version of <function>xslt_process</function> which
     does not pass any parameters to the transformation.
    </para>
   </sect3>
diff --git a/doc/src/sgml/xoper.sgml b/doc/src/sgml/xoper.sgml
index 8568e21216..2aa7cf9b64 100644
--- a/doc/src/sgml/xoper.sgml
+++ b/doc/src/sgml/xoper.sgml
@@ -32,7 +32,7 @@
   <para>
    Here is an example of creating an operator for adding two complex
    numbers.  We assume we've already created the definition of type
-   <type>complex</type> (see <xref linkend="xtypes">).  First we need a
+   <type>complex</type> (see <xref linkend="xtypes"/>).  First we need a
    function that does the work, then we can define the operator:
 
 <programlisting>
@@ -65,12 +65,12 @@ SELECT (a + b) AS c FROM test_complex;
 
   <para>
    We've shown how to create a binary operator here.  To create unary
-   operators, just omit one of <literal>leftarg</> (for left unary) or
-   <literal>rightarg</> (for right unary).  The <literal>procedure</>
+   operators, just omit one of <literal>leftarg</literal> (for left unary) or
+   <literal>rightarg</literal> (for right unary).  The <literal>procedure</literal>
    clause and the argument clauses are the only required items in
-   <command>CREATE OPERATOR</command>.  The <literal>commutator</>
+   <command>CREATE OPERATOR</command>.  The <literal>commutator</literal>
    clause shown in the example is an optional hint to the query
-   optimizer.  Further details about <literal>commutator</> and other
+   optimizer.  Further details about <literal>commutator</literal> and other
    optimizer hints appear in the next section.
   </para>
  </sect1>
@@ -98,16 +98,16 @@ SELECT (a + b) AS c FROM test_complex;
    </para>
 
    <sect2>
-    <title><literal>COMMUTATOR</></title>
+    <title><literal>COMMUTATOR</literal></title>
 
     <para>
-     The <literal>COMMUTATOR</> clause, if provided, names an operator that is the
+     The <literal>COMMUTATOR</literal> clause, if provided, names an operator that is the
      commutator of the operator being defined.  We say that operator A is the
      commutator of operator B if (x A y) equals (y B x) for all possible input
      values x, y.  Notice that B is also the commutator of A.  For example,
-     operators <literal>&lt;</> and <literal>&gt;</> for a particular data type are usually each others'
-     commutators, and operator <literal>+</> is usually commutative with itself.
-     But operator <literal>-</> is usually not commutative with anything.
+     operators <literal>&lt;</literal> and <literal>&gt;</literal> for a particular data type are usually each others'
+     commutators, and operator <literal>+</literal> is usually commutative with itself.
+     But operator <literal>-</literal> is usually not commutative with anything.
     </para>
 
     <para>
@@ -115,23 +115,23 @@ SELECT (a + b) AS c FROM test_complex;
      right operand type of its commutator, and vice versa.  So the name of
      the commutator operator is all that <productname>PostgreSQL</productname>
      needs to be given to look up the commutator, and that's all that needs to
-     be provided in the <literal>COMMUTATOR</> clause.
+     be provided in the <literal>COMMUTATOR</literal> clause.
     </para>
 
     <para>
      It's critical to provide commutator information for operators that
      will be used in indexes and join clauses, because this allows the
-     query optimizer to <quote>flip around</> such a clause to the forms
+     query optimizer to <quote>flip around</quote> such a clause to the forms
      needed for different plan types.  For example, consider a query with
-     a WHERE clause like <literal>tab1.x = tab2.y</>, where <literal>tab1.x</>
-     and <literal>tab2.y</> are of a user-defined type, and suppose that
-     <literal>tab2.y</> is indexed.  The optimizer cannot generate an
+     a WHERE clause like <literal>tab1.x = tab2.y</literal>, where <literal>tab1.x</literal>
+     and <literal>tab2.y</literal> are of a user-defined type, and suppose that
+     <literal>tab2.y</literal> is indexed.  The optimizer cannot generate an
      index scan unless it can determine how to flip the clause around to
-     <literal>tab2.y = tab1.x</>, because the index-scan machinery expects
+     <literal>tab2.y = tab1.x</literal>, because the index-scan machinery expects
      to see the indexed column on the left of the operator it is given.
-     <productname>PostgreSQL</productname> will <emphasis>not</> simply
+     <productname>PostgreSQL</productname> will <emphasis>not</emphasis> simply
      assume that this is a valid transformation &mdash; the creator of the
-     <literal>=</> operator must specify that it is valid, by marking the
+     <literal>=</literal> operator must specify that it is valid, by marking the
      operator with commutator information.
     </para>
 
@@ -145,20 +145,20 @@ SELECT (a + b) AS c FROM test_complex;
      <itemizedlist>
       <listitem>
        <para>
-        One way is to omit the <literal>COMMUTATOR</> clause in the first operator that
+        One way is to omit the <literal>COMMUTATOR</literal> clause in the first operator that
         you define, and then provide one in the second operator's definition.
         Since <productname>PostgreSQL</productname> knows that commutative
         operators come in pairs, when it sees the second definition it will
-        automatically go back and fill in the missing <literal>COMMUTATOR</> clause in
+        automatically go back and fill in the missing <literal>COMMUTATOR</literal> clause in
         the first definition.
        </para>
       </listitem>
 
       <listitem>
        <para>
-        The other, more straightforward way is just to include <literal>COMMUTATOR</> clauses
+        The other, more straightforward way is just to include <literal>COMMUTATOR</literal> clauses
         in both definitions.  When <productname>PostgreSQL</productname> processes
-        the first definition and realizes that <literal>COMMUTATOR</> refers to a nonexistent
+        the first definition and realizes that <literal>COMMUTATOR</literal> refers to a nonexistent
         operator, the system will make a dummy entry for that operator in the
         system catalog.  This dummy entry will have valid data only
         for the operator name, left and right operand types, and result type,
@@ -175,15 +175,15 @@ SELECT (a + b) AS c FROM test_complex;
    </sect2>
 
    <sect2>
-    <title><literal>NEGATOR</></title>
+    <title><literal>NEGATOR</literal></title>
 
     <para>
-     The <literal>NEGATOR</> clause, if provided, names an operator that is the
+     The <literal>NEGATOR</literal> clause, if provided, names an operator that is the
      negator of the operator being defined.  We say that operator A
      is the negator of operator B if both return Boolean results and
      (x A y) equals NOT (x B y) for all possible inputs x, y.
      Notice that B is also the negator of A.
-     For example, <literal>&lt;</> and <literal>&gt;=</> are a negator pair for most data types.
+     For example, <literal>&lt;</literal> and <literal>&gt;=</literal> are a negator pair for most data types.
      An operator can never validly be its own negator.
     </para>
 
@@ -195,15 +195,15 @@ SELECT (a + b) AS c FROM test_complex;
 
    <para>
     An operator's negator must have the same left and/or right operand types
-    as the operator to be defined, so just as with <literal>COMMUTATOR</>, only the operator
-    name need be given in the <literal>NEGATOR</> clause.
+    as the operator to be defined, so just as with <literal>COMMUTATOR</literal>, only the operator
+    name need be given in the <literal>NEGATOR</literal> clause.
    </para>
 
    <para>
     Providing a negator is very helpful to the query optimizer since
-    it allows expressions like <literal>NOT (x = y)</> to be simplified into
-    <literal>x &lt;&gt; y</>.  This comes up more often than you might think, because
-    <literal>NOT</> operations can be inserted as a consequence of other rearrangements.
+    it allows expressions like <literal>NOT (x = y)</literal> to be simplified into
+    <literal>x &lt;&gt; y</literal>.  This comes up more often than you might think, because
+    <literal>NOT</literal> operations can be inserted as a consequence of other rearrangements.
    </para>
 
    <para>
@@ -214,13 +214,13 @@ SELECT (a + b) AS c FROM test_complex;
   </sect2>
 
   <sect2>
-   <title><literal>RESTRICT</></title>
+   <title><literal>RESTRICT</literal></title>
 
    <para>
-    The <literal>RESTRICT</> clause, if provided, names a restriction selectivity
+    The <literal>RESTRICT</literal> clause, if provided, names a restriction selectivity
     estimation function for the operator.  (Note that this is a function
-    name, not an operator name.)  <literal>RESTRICT</> clauses only make sense for
-    binary operators that return <type>boolean</>.  The idea behind a restriction
+    name, not an operator name.)  <literal>RESTRICT</literal> clauses only make sense for
+    binary operators that return <type>boolean</type>.  The idea behind a restriction
     selectivity estimator is to guess what fraction of the rows in a
     table will satisfy a <literal>WHERE</literal>-clause condition of the form:
 <programlisting>
@@ -228,10 +228,10 @@ column OP constant
 </programlisting>
     for the current operator and a particular constant value.
     This assists the optimizer by
-    giving it some idea of how many rows will be eliminated by <literal>WHERE</>
+    giving it some idea of how many rows will be eliminated by <literal>WHERE</literal>
     clauses that have this form.  (What happens if the constant is on
     the left, you might be wondering?  Well, that's one of the things that
-    <literal>COMMUTATOR</> is for...)
+    <literal>COMMUTATOR</literal> is for...)
    </para>
 
    <para>
@@ -240,22 +240,13 @@ column OP constant
     one of the system's standard estimators for many of your own operators.
     These are the standard restriction estimators:
     <simplelist>
-     <member><function>eqsel</> for <literal>=</></member>
-     <member><function>neqsel</> for <literal>&lt;&gt;</></member>
-     <member><function>scalarltsel</> for <literal>&lt;</> or <literal>&lt;=</></member>
-     <member><function>scalargtsel</> for <literal>&gt;</> or <literal>&gt;=</></member>
-   </simplelist>
-    It might seem a little odd that these are the categories, but they
-    make sense if you think about it.  <literal>=</> will typically accept only
-    a small fraction of the rows in a table; <literal>&lt;&gt;</> will typically reject
-    only a small fraction.  <literal>&lt;</> will accept a fraction that depends on
-    where the given constant falls in the range of values for that table
-    column (which, it just so happens, is information collected by
-    <command>ANALYZE</command> and made available to the selectivity estimator).
-    <literal>&lt;=</> will accept a slightly larger fraction than <literal>&lt;</> for the same
-    comparison constant, but they're close enough to not be worth
-    distinguishing, especially since we're not likely to do better than a
-    rough guess anyhow.  Similar remarks apply to <literal>&gt;</> and <literal>&gt;=</>.
+     <member><function>eqsel</function> for <literal>=</literal></member>
+     <member><function>neqsel</function> for <literal>&lt;&gt;</literal></member>
+     <member><function>scalarltsel</function> for <literal>&lt;</literal></member>
+     <member><function>scalarlesel</function> for <literal>&lt;=</literal></member>
+     <member><function>scalargtsel</function> for <literal>&gt;</literal></member>
+     <member><function>scalargesel</function> for <literal>&gt;=</literal></member>
+    </simplelist>
    </para>
 
    <para>
@@ -267,12 +258,14 @@ column OP constant
    </para>
 
    <para>
-    You can use <function>scalarltsel</> and <function>scalargtsel</> for comparisons on data types that
-    have some sensible means of being converted into numeric scalars for
-    range comparisons.  If possible, add the data type to those understood
-    by the function <function>convert_to_scalar()</function> in <filename>src/backend/utils/adt/selfuncs.c</filename>.
+    You can use <function>scalarltsel</function>, <function>scalarlesel</function>,
+    <function>scalargtsel</function> and <function>scalargesel</function> for comparisons on
+    data types that have some sensible means of being converted into numeric
+    scalars for range comparisons.  If possible, add the data type to those
+    understood by the function <function>convert_to_scalar()</function> in
+    <filename>src/backend/utils/adt/selfuncs.c</filename>.
     (Eventually, this function should be replaced by per-data-type functions
-    identified through a column of the <classname>pg_type</> system catalog; but that hasn't happened
+    identified through a column of the <classname>pg_type</classname> system catalog; but that hasn't happened
     yet.)  If you do not do this, things will still work, but the optimizer's
     estimates won't be as good as they could be.
    </para>
@@ -286,15 +279,15 @@ column OP constant
    </sect2>
 
    <sect2>
-    <title><literal>JOIN</></title>
+    <title><literal>JOIN</literal></title>
 
     <para>
-     The <literal>JOIN</> clause, if provided, names a join selectivity
+     The <literal>JOIN</literal> clause, if provided, names a join selectivity
      estimation function for the operator.  (Note that this is a function
-     name, not an operator name.)  <literal>JOIN</> clauses only make sense for
+     name, not an operator name.)  <literal>JOIN</literal> clauses only make sense for
      binary operators that return <type>boolean</type>.  The idea behind a join
      selectivity estimator is to guess what fraction of the rows in a
-     pair of tables will satisfy a <literal>WHERE</>-clause condition of the form:
+     pair of tables will satisfy a <literal>WHERE</literal>-clause condition of the form:
 <programlisting>
 table1.column1 OP table2.column2
 </programlisting>
@@ -308,25 +301,27 @@ table1.column1 OP table2.column2
      a join selectivity estimator function, but will just suggest that
      you use one of the standard estimators if one is applicable:
      <simplelist>
-      <member><function>eqjoinsel</> for <literal>=</></member>
-      <member><function>neqjoinsel</> for <literal>&lt;&gt;</></member>
-      <member><function>scalarltjoinsel</> for <literal>&lt;</> or <literal>&lt;=</></member>
-      <member><function>scalargtjoinsel</> for <literal>&gt;</> or <literal>&gt;=</></member>
-      <member><function>areajoinsel</> for 2D area-based comparisons</member>
-      <member><function>positionjoinsel</> for 2D position-based comparisons</member>
-      <member><function>contjoinsel</> for 2D containment-based comparisons</member>
+      <member><function>eqjoinsel</function> for <literal>=</literal></member>
+      <member><function>neqjoinsel</function> for <literal>&lt;&gt;</literal></member>
+      <member><function>scalarltjoinsel</function> for <literal>&lt;</literal></member>
+      <member><function>scalarlejoinsel</function> for <literal>&lt;=</literal></member>
+      <member><function>scalargtjoinsel</function> for <literal>&gt;</literal></member>
+      <member><function>scalargejoinsel</function> for <literal>&gt;=</literal></member>
+      <member><function>areajoinsel</function> for 2D area-based comparisons</member>
+      <member><function>positionjoinsel</function> for 2D position-based comparisons</member>
+      <member><function>contjoinsel</function> for 2D containment-based comparisons</member>
      </simplelist>
     </para>
    </sect2>
 
    <sect2>
-    <title><literal>HASHES</></title>
+    <title><literal>HASHES</literal></title>
 
     <para>
      The <literal>HASHES</literal> clause, if present, tells the system that
      it is permissible to use the hash join method for a join based on this
-     operator.  <literal>HASHES</> only makes sense for a binary operator that
-     returns <literal>boolean</>, and in practice the operator must represent
+     operator.  <literal>HASHES</literal> only makes sense for a binary operator that
+     returns <literal>boolean</literal>, and in practice the operator must represent
      equality for some data type or pair of data types.
     </para>
 
@@ -341,7 +336,7 @@ table1.column1 OP table2.column2
      hashing for operators that take the same data type on both sides.
      However, sometimes it is possible to design compatible hash functions
      for two or more data types; that is, functions that will generate the
-     same hash codes for <quote>equal</> values, even though the values
+     same hash codes for <quote>equal</quote> values, even though the values
      have different representations.  For example, it's fairly simple
      to arrange this property when hashing integers of different widths.
     </para>
@@ -362,10 +357,10 @@ table1.column1 OP table2.column2
      are machine-dependent ways in which it might fail to do the right thing.
      For example, if your data type is a structure in which there might be
      uninteresting pad bits, you cannot simply pass the whole structure to
-     <function>hash_any</>.  (Unless you write your other operators and
+     <function>hash_any</function>.  (Unless you write your other operators and
      functions to ensure that the unused bits are always zero, which is the
      recommended strategy.)
-     Another example is that on machines that meet the <acronym>IEEE</>
+     Another example is that on machines that meet the <acronym>IEEE</acronym>
      floating-point standard, negative zero and positive zero are different
      values (different bit patterns) but they are defined to compare equal.
      If a float value might contain negative zero then extra steps are needed
@@ -397,8 +392,8 @@ table1.column1 OP table2.column2
      strict, the
      function must also be complete: that is, it should return true or
      false, never null, for any two nonnull inputs.  If this rule is
-     not followed, hash-optimization of <literal>IN</> operations might
-     generate wrong results.  (Specifically, <literal>IN</> might return
+     not followed, hash-optimization of <literal>IN</literal> operations might
+     generate wrong results.  (Specifically, <literal>IN</literal> might return
      false where the correct answer according to the standard would be null;
      or it might yield an error complaining that it wasn't prepared for a
      null result.)
@@ -408,13 +403,13 @@ table1.column1 OP table2.column2
    </sect2>
 
    <sect2>
-    <title><literal>MERGES</></title>
+    <title><literal>MERGES</literal></title>
 
     <para>
      The <literal>MERGES</literal> clause, if present, tells the system that
      it is permissible to use the merge-join method for a join based on this
-     operator.  <literal>MERGES</> only makes sense for a binary operator that
-     returns <literal>boolean</>, and in practice the operator must represent
+     operator.  <literal>MERGES</literal> only makes sense for a binary operator that
+     returns <literal>boolean</literal>, and in practice the operator must represent
      equality for some data type or pair of data types.
     </para>
 
@@ -423,7 +418,7 @@ table1.column1 OP table2.column2
      into order and then scanning them in parallel.  So, both data types must
      be capable of being fully ordered, and the join operator must be one
      that can only succeed for pairs of values that fall at the
-     <quote>same place</>
+     <quote>same place</quote>
      in the sort order.  In practice this means that the join operator must
      behave like equality.  But it is possible to merge-join two
      distinct data types so long as they are logically compatible.  For
@@ -435,7 +430,7 @@ table1.column1 OP table2.column2
 
     <para>
      To be marked <literal>MERGES</literal>, the join operator must appear
-     as an equality member of a <literal>btree</> index operator family.
+     as an equality member of a <literal>btree</literal> index operator family.
      This is not enforced when you create
      the operator, since of course the referencing operator family couldn't
      exist yet.  But the operator will not actually be used for merge joins
@@ -450,7 +445,7 @@ table1.column1 OP table2.column2
      if they are different) that appears in the same operator family.
      If this is not the case, planner errors might occur when the operator
      is used.  Also, it is a good idea (but not strictly required) for
-     a <literal>btree</> operator family that supports multiple data types to provide
+     a <literal>btree</literal> operator family that supports multiple data types to provide
      equality operators for every combination of the data types; this
      allows better optimization.
     </para>
diff --git a/doc/src/sgml/xplang.sgml b/doc/src/sgml/xplang.sgml
index 4460c8f361..4b52210459 100644
--- a/doc/src/sgml/xplang.sgml
+++ b/doc/src/sgml/xplang.sgml
@@ -11,7 +11,7 @@
    <productname>PostgreSQL</productname> allows user-defined functions
    to be written in other languages besides SQL and C.  These other
    languages are generically called <firstterm>procedural
-   languages</firstterm> (<acronym>PL</>s).  For a function
+   languages</firstterm> (<acronym>PL</acronym>s).  For a function
    written in a procedural language, the database server has
    no built-in knowledge about how to interpret the function's source
    text. Instead, the task is passed to a special handler that knows
@@ -27,15 +27,15 @@
   <para>
    There are currently four procedural languages available in the
    standard <productname>PostgreSQL</productname> distribution:
-   <application>PL/pgSQL</application> (<xref linkend="plpgsql">),
-   <application>PL/Tcl</application> (<xref linkend="pltcl">),
-   <application>PL/Perl</application> (<xref linkend="plperl">), and
-   <application>PL/Python</application> (<xref linkend="plpython">).
+   <application>PL/pgSQL</application> (<xref linkend="plpgsql"/>),
+   <application>PL/Tcl</application> (<xref linkend="pltcl"/>),
+   <application>PL/Perl</application> (<xref linkend="plperl"/>), and
+   <application>PL/Python</application> (<xref linkend="plpython"/>).
    There are additional procedural languages available that are not
-   included in the core distribution. <xref linkend="external-projects">
+   included in the core distribution. <xref linkend="external-projects"/>
    has information about finding them. In addition other languages can
    be defined by users; the basics of developing a new procedural
-   language are covered in <xref linkend="plhandler">.
+   language are covered in <xref linkend="plhandler"/>.
   </para>
 
   <sect1 id="xplang-install">
@@ -44,9 +44,9 @@
    <para>
     A procedural language must be <quote>installed</quote> into each
     database where it is to be used.  But procedural languages installed in
-    the database <literal>template1</> are automatically available in all
+    the database <literal>template1</literal> are automatically available in all
     subsequently created databases, since their entries in
-    <literal>template1</> will be copied by <command>CREATE DATABASE</>.
+    <literal>template1</literal> will be copied by <command>CREATE DATABASE</command>.
     So the database administrator can
     decide which languages are available in which databases and can make
     some languages available by default if desired.
@@ -54,8 +54,8 @@
 
    <para>
     For the languages supplied with the standard distribution, it is
-    only necessary to execute <command>CREATE EXTENSION</>
-    <replaceable>language_name</> to install the language into the
+    only necessary to execute <command>CREATE EXTENSION</command>
+    <replaceable>language_name</replaceable> to install the language into the
     current database.
     The manual procedure described below is only recommended for
     installing languages that have not been packaged as extensions.
@@ -70,7 +70,7 @@
      A procedural language is installed in a database in five steps,
      which must be carried out by a database superuser.  In most cases
      the required SQL commands should be packaged as the installation script
-     of an <quote>extension</>, so that <command>CREATE EXTENSION</> can be
+     of an <quote>extension</quote>, so that <command>CREATE EXTENSION</command> can be
      used to execute them.
     </para>
 
@@ -79,7 +79,7 @@
       The shared object for the language handler must be compiled and
       installed into an appropriate library directory.  This works in the same
       way as building and installing modules with regular user-defined C
-      functions does; see <xref linkend="dfunc">.  Often, the language
+      functions does; see <xref linkend="dfunc"/>.  Often, the language
       handler will depend on an external library that provides the actual
       programming language engine; if so, that must be installed as well.
      </para>
@@ -103,9 +103,9 @@ CREATE FUNCTION <replaceable>handler_function_name</replaceable>()
 
     <step performance="optional" id="xplang-install-cr3">
      <para>
-      Optionally, the language handler can provide an <quote>inline</>
+      Optionally, the language handler can provide an <quote>inline</quote>
       handler function that executes anonymous code blocks
-      (<xref linkend="sql-do"> commands)
+      (<xref linkend="sql-do"/> commands)
       written in this language.  If an inline handler function
       is provided by the language, declare it with a command like
 <synopsis>
@@ -119,10 +119,10 @@ CREATE FUNCTION <replaceable>inline_function_name</replaceable>(internal)
 
     <step performance="optional" id="xplang-install-cr4">
      <para>
-      Optionally, the language handler can provide a <quote>validator</>
+      Optionally, the language handler can provide a <quote>validator</quote>
       function that checks a function definition for correctness without
       actually executing it.  The validator function is called by
-      <command>CREATE FUNCTION</> if it exists.  If a validator function
+      <command>CREATE FUNCTION</command> if it exists.  If a validator function
       is provided by the language, declare it with a command like
 <synopsis>
 CREATE FUNCTION <replaceable>validator_function_name</replaceable>(oid)
@@ -165,7 +165,7 @@ CREATE <optional>TRUSTED</optional> <optional>PROCEDURAL</optional> LANGUAGE <re
    </procedure>
 
    <para>
-    <xref linkend="xplang-install-example"> shows how the manual
+    <xref linkend="xplang-install-example"/> shows how the manual
     installation procedure would work with the language
     <application>PL/Perl</application>.
    </para>
@@ -217,13 +217,13 @@ CREATE TRUSTED PROCEDURAL LANGUAGE plperl
     is built and installed into the <quote>library</quote>
     directory; furthermore, the <application>PL/pgSQL</application> language
     itself is installed in all databases.
-    If <application>Tcl</> support is configured in, the handlers for
-    <application>PL/Tcl</> and <application>PL/TclU</> are built and installed
+    If <application>Tcl</application> support is configured in, the handlers for
+    <application>PL/Tcl</application> and <application>PL/TclU</application> are built and installed
     in the library directory, but the language itself is not installed in any
     database by default.
-    Likewise, the <application>PL/Perl</> and <application>PL/PerlU</>
+    Likewise, the <application>PL/Perl</application> and <application>PL/PerlU</application>
     handlers are built and installed if Perl support is configured, and the
-    <application>PL/PythonU</> handler is installed if Python support is
+    <application>PL/PythonU</application> handler is installed if Python support is
     configured, but these languages are not installed by default.
    </para>
 
diff --git a/doc/src/sgml/xtypes.sgml b/doc/src/sgml/xtypes.sgml
index ac0b8a2943..29747a0873 100644
--- a/doc/src/sgml/xtypes.sgml
+++ b/doc/src/sgml/xtypes.sgml
@@ -9,10 +9,10 @@
   </indexterm>
 
   <para>
-   As described in <xref linkend="extend-type-system">,
+   As described in <xref linkend="extend-type-system"/>,
    <productname>PostgreSQL</productname> can be extended to support new
    data types.  This section describes how to define new base types,
-   which are data types defined below the level of the <acronym>SQL</>
+   which are data types defined below the level of the <acronym>SQL</acronym>
    language.  Creating a new base type requires implementing functions
    to operate on the type in a low-level language, usually C.
   </para>
@@ -20,8 +20,8 @@
   <para>
    The examples in this section can be found in
    <filename>complex.sql</filename> and <filename>complex.c</filename>
-   in the <filename>src/tutorial</> directory of the source distribution.
-   See the <filename>README</> file in that directory for instructions
+   in the <filename>src/tutorial</filename> directory of the source distribution.
+   See the <filename>README</filename> file in that directory for instructions
    about running the examples.
   </para>
 
@@ -45,7 +45,7 @@
  </para>
 
  <para>
-  Suppose we want to define a type <type>complex</> that represents
+  Suppose we want to define a type <type>complex</type> that represents
   complex numbers. A natural way to represent a complex number in
   memory would be the following C structure:
 
@@ -57,7 +57,7 @@ typedef struct Complex {
 </programlisting>
 
   We will need to make this a pass-by-reference type, since it's too
-  large to fit into a single <type>Datum</> value.
+  large to fit into a single <type>Datum</type> value.
  </para>
 
  <para>
@@ -130,7 +130,7 @@ complex_out(PG_FUNCTION_ARGS)
   external binary representation is.  Most of the built-in data types
   try to provide a machine-independent binary representation.  For
   <type>complex</type>, we will piggy-back on the binary I/O converters
-  for type <type>float8</>:
+  for type <type>float8</type>:
 
 <programlisting><![CDATA[
 PG_FUNCTION_INFO_V1(complex_recv);
@@ -222,7 +222,7 @@ CREATE TYPE complex (
   <productname>PostgreSQL</productname> automatically provides support
   for arrays of that type.  The array type typically
   has the same name as the base type with the underscore character
-  (<literal>_</>) prepended.
+  (<literal>_</literal>) prepended.
  </para>
 
  <para>
@@ -237,7 +237,7 @@ CREATE TYPE complex (
   If the internal representation of the data type is variable-length, the
   internal representation must follow the standard layout for variable-length
   data: the first four bytes must be a <type>char[4]</type> field which is
-  never accessed directly (customarily named <structfield>vl_len_</>). You
+  never accessed directly (customarily named <structfield>vl_len_</structfield>). You
   must use the <function>SET_VARSIZE()</function> macro to store the total
   size of the datum (including the length field itself) in this field
   and <function>VARSIZE()</function> to retrieve it.  (These macros exist
@@ -246,7 +246,7 @@ CREATE TYPE complex (
 
  <para>
   For further details see the description of the
-  <xref linkend="sql-createtype"> command.
+  <xref linkend="sql-createtype"/> command.
  </para>
 
  <sect2 id="xtypes-toast">
@@ -258,41 +258,41 @@ CREATE TYPE complex (
 
  <para>
   If the values of your data type vary in size (in internal form), it's
-  usually desirable to make the data type <acronym>TOAST</>-able (see <xref
-  linkend="storage-toast">). You should do this even if the values are always
+  usually desirable to make the data type <acronym>TOAST</acronym>-able (see <xref
+  linkend="storage-toast"/>). You should do this even if the values are always
   too small to be compressed or stored externally, because
-  <acronym>TOAST</> can save space on small data too, by reducing header
+  <acronym>TOAST</acronym> can save space on small data too, by reducing header
   overhead.
  </para>
 
  <para>
-  To support <acronym>TOAST</> storage, the C functions operating on the data
+  To support <acronym>TOAST</acronym> storage, the C functions operating on the data
   type must always be careful to unpack any toasted values they are handed
-  by using <function>PG_DETOAST_DATUM</>.  (This detail is customarily hidden
+  by using <function>PG_DETOAST_DATUM</function>.  (This detail is customarily hidden
   by defining type-specific <function>GETARG_DATATYPE_P</function> macros.)
   Then, when running the <command>CREATE TYPE</command> command, specify the
-  internal length as <literal>variable</> and select some appropriate storage
-  option other than <literal>plain</>.
+  internal length as <literal>variable</literal> and select some appropriate storage
+  option other than <literal>plain</literal>.
  </para>
 
  <para>
   If data alignment is unimportant (either just for a specific function or
   because the data type specifies byte alignment anyway) then it's possible
-  to avoid some of the overhead of <function>PG_DETOAST_DATUM</>. You can use
-  <function>PG_DETOAST_DATUM_PACKED</> instead (customarily hidden by
-  defining a <function>GETARG_DATATYPE_PP</> macro) and using the macros
-  <function>VARSIZE_ANY_EXHDR</> and <function>VARDATA_ANY</> to access
+  to avoid some of the overhead of <function>PG_DETOAST_DATUM</function>. You can use
+  <function>PG_DETOAST_DATUM_PACKED</function> instead (customarily hidden by
+  defining a <function>GETARG_DATATYPE_PP</function> macro) and using the macros
+  <function>VARSIZE_ANY_EXHDR</function> and <function>VARDATA_ANY</function> to access
   a potentially-packed datum.
   Again, the data returned by these macros is not aligned even if the data
   type definition specifies an alignment. If the alignment is important you
-  must go through the regular <function>PG_DETOAST_DATUM</> interface.
+  must go through the regular <function>PG_DETOAST_DATUM</function> interface.
  </para>
 
  <note>
   <para>
-   Older code frequently declares <structfield>vl_len_</> as an
-   <type>int32</> field instead of <type>char[4]</>.  This is OK as long as
-   the struct definition has other fields that have at least <type>int32</>
+   Older code frequently declares <structfield>vl_len_</structfield> as an
+   <type>int32</type> field instead of <type>char[4]</type>.  This is OK as long as
+   the struct definition has other fields that have at least <type>int32</type>
    alignment.  But it is dangerous to use such a struct definition when
    working with a potentially unaligned datum; the compiler may take it as
    license to assume the datum actually is aligned, leading to core dumps on
@@ -301,28 +301,28 @@ CREATE TYPE complex (
  </note>
 
  <para>
-  Another feature that's enabled by <acronym>TOAST</> support is the
-  possibility of having an <firstterm>expanded</> in-memory data
+  Another feature that's enabled by <acronym>TOAST</acronym> support is the
+  possibility of having an <firstterm>expanded</firstterm> in-memory data
   representation that is more convenient to work with than the format that
-  is stored on disk.  The regular or <quote>flat</> varlena storage format
+  is stored on disk.  The regular or <quote>flat</quote> varlena storage format
   is ultimately just a blob of bytes; it cannot for example contain
   pointers, since it may get copied to other locations in memory.
   For complex data types, the flat format may be quite expensive to work
-  with, so <productname>PostgreSQL</> provides a way to <quote>expand</>
+  with, so <productname>PostgreSQL</productname> provides a way to <quote>expand</quote>
   the flat format into a representation that is more suited to computation,
   and then pass that format in-memory between functions of the data type.
  </para>
 
  <para>
   To use expanded storage, a data type must define an expanded format that
-  follows the rules given in <filename>src/include/utils/expandeddatum.h</>,
-  and provide functions to <quote>expand</> a flat varlena value into
-  expanded format and <quote>flatten</> the expanded format back to the
+  follows the rules given in <filename>src/include/utils/expandeddatum.h</filename>,
+  and provide functions to <quote>expand</quote> a flat varlena value into
+  expanded format and <quote>flatten</quote> the expanded format back to the
   regular varlena representation.  Then ensure that all C functions for
   the data type can accept either representation, possibly by converting
   one into the other immediately upon receipt.  This does not require fixing
   all existing functions for the data type at once, because the standard
-  <function>PG_DETOAST_DATUM</> macro is defined to convert expanded inputs
+  <function>PG_DETOAST_DATUM</function> macro is defined to convert expanded inputs
   into regular flat format.  Therefore, existing functions that work with
   the flat varlena format will continue to work, though slightly
   inefficiently, with expanded inputs; they need not be converted until and
@@ -344,14 +344,14 @@ CREATE TYPE complex (
   will detoast external, short-header, and compressed varlena inputs, but
   not expanded inputs.  Such a function can be defined as returning a
   pointer to a union of the flat varlena format and the expanded format.
-  Callers can use the <function>VARATT_IS_EXPANDED_HEADER()</> macro to
+  Callers can use the <function>VARATT_IS_EXPANDED_HEADER()</function> macro to
   determine which format they received.
  </para>
 
  <para>
-  The <acronym>TOAST</> infrastructure not only allows regular varlena
+  The <acronym>TOAST</acronym> infrastructure not only allows regular varlena
   values to be distinguished from expanded values, but also
-  distinguishes <quote>read-write</> and <quote>read-only</> pointers to
+  distinguishes <quote>read-write</quote> and <quote>read-only</quote> pointers to
   expanded values.  C functions that only need to examine an expanded
   value, or will only change it in safe and non-semantically-visible ways,
   need not care which type of pointer they receive.  C functions that
@@ -368,7 +368,7 @@ CREATE TYPE complex (
  <para>
   For examples of working with expanded values, see the standard array
   infrastructure, particularly
-  <filename>src/backend/utils/adt/array_expanded.c</>.
+  <filename>src/backend/utils/adt/array_expanded.c</filename>.
  </para>
 
  </sect2>
diff --git a/src/Makefile b/src/Makefile
index 380da92c75..febbcede7d 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -28,6 +28,7 @@ SUBDIRS = \
 	pl \
 	makefiles \
 	test/regress \
+	test/isolation \
 	test/perl
 
 # There are too many interdependencies between the subdirectories, so
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index e8b3a519cb..d980f81046 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -362,12 +362,14 @@ endef
 ifeq ($(enable_tap_tests),yes)
 
 define prove_installcheck
-rm -rf $(CURDIR)/tmp_check/log
+rm -rf '$(CURDIR)'/tmp_check
+$(MKDIR_P) '$(CURDIR)'/tmp_check
 cd $(srcdir) && TESTDIR='$(CURDIR)' PATH="$(bindir):$$PATH" PGPORT='6$(DEF_PGPORT)' top_builddir='$(CURDIR)/$(top_builddir)' PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
 endef
 
 define prove_check
-rm -rf $(CURDIR)/tmp_check/log
+rm -rf '$(CURDIR)'/tmp_check
+$(MKDIR_P) '$(CURDIR)'/tmp_check
 cd $(srcdir) && TESTDIR='$(CURDIR)' $(with_temp_install) PGPORT='6$(DEF_PGPORT)' PG_REGRESS='$(CURDIR)/$(top_builddir)/src/test/regress/pg_regress' $(PROVE) $(PG_PROVE_FLAGS) $(PROVE_FLAGS) $(if $(PROVE_TESTS),$(PROVE_TESTS),t/*.pl)
 endef
 
@@ -404,8 +406,6 @@ STRIP_SHARED_LIB = @STRIP_SHARED_LIB@
 
 DBTOEPUB	= @DBTOEPUB@
 FOP				= @FOP@
-NSGMLS			= @NSGMLS@
-OSX				= @OSX@
 XMLLINT			= @XMLLINT@
 XSLTPROC		= @XSLTPROC@
 
@@ -867,30 +867,50 @@ endif # enable_nls
 #		gcov from foo.gcda (by "make coverage")
 #   foo.c.gcov.out  stdout captured when foo.c.gcov is created, mildly
 #		interesting
-#   lcov.info	lcov tracefile, built from gcda files in one directory,
+#   lcov_test.info
+#		lcov tracefile, built from gcda files in one directory,
 #		later collected by "make coverage-html"
+#   lcov_base.info
+#		tracefile for zero counters for every file, so that
+#		even files that are not touched by tests are counted
+#		for the overall coverage rate
 
 ifeq ($(enable_coverage), yes)
 
-# There is a strange interaction between lcov and existing .gcov
-# output files.  Hence the rm command and the ordering dependency.
+# make coverage -- text output
 
-gcda_files := $(wildcard *.gcda)
+local_gcda_files = $(wildcard *.gcda)
 
-lcov.info: $(gcda_files)
-	rm -f *.gcov .*.gcov
-	$(if $^,$(LCOV) -d . -c -o $@ $(LCOVFLAGS) --gcov-tool $(GCOV))
+coverage: $(local_gcda_files:.gcda=.c.gcov)
 
-%.c.gcov: %.gcda | lcov.info
+%.c.gcov: %.gcda
 	$(GCOV) -b -f -p -o . $(GCOVFLAGS) $*.c >$*.c.gcov.out
 
-coverage: $(gcda_files:.gcda=.c.gcov) lcov.info
+# make coverage-html -- HTML output via lcov
 
 .PHONY: coverage-html
-coverage-html: coverage
+coverage-html: coverage-html-stamp
+
+GENHTML_FLAGS = -q --legend
+GENHTML_TITLE = PostgreSQL $(VERSION)
+
+coverage-html-stamp: lcov_base.info lcov_test.info
 	rm -rf coverage
-	mkdir coverage
-	$(GENHTML) --show-details --legend --output-directory=coverage --title=PostgreSQL --num-spaces=4 --prefix=$(abs_top_srcdir) `find . -name lcov.info -print`
+	$(GENHTML) $(GENHTML_FLAGS) -o coverage --title='$(GENHTML_TITLE)' --num-spaces=4 $(if $(filter no,$(vpath_build)),--prefix='$(abs_top_srcdir)') $^
+	touch $@
+
+LCOV += --gcov-tool $(GCOV)
+LCOVFLAGS = -q --no-external
+
+all_gcno_files = $(shell find . -name '*.gcno' -print)
+
+lcov_base.info: $(all_gcno_files)
+	$(LCOV) $(LCOVFLAGS) -c -i -d . -d $(srcdir) -o $@
+
+all_gcda_files = $(shell find . -name '*.gcda' -print)
+
+lcov_test.info: $(all_gcda_files)
+	$(LCOV) $(LCOVFLAGS) -c -d . -d $(srcdir) -o $@
 
 
 # hook for clean-up
@@ -898,8 +918,8 @@ clean distclean maintainer-clean: clean-coverage
 
 .PHONY: clean-coverage
 clean-coverage:
-	rm -rf coverage
-	rm -f *.gcda *.gcno lcov.info *.gcov .*.gcov *.gcov.out
+	rm -rf coverage coverage-html-stamp
+	rm -f *.gcda *.gcno lcov*.info *.gcov .*.gcov *.gcov.out
 
 
 # User-callable target to reset counts between test runs
diff --git a/src/backend/CMakeLists.txt b/src/backend/CMakeLists.txt
index fcdf74aacd..0d031f1caa 100644
--- a/src/backend/CMakeLists.txt
+++ b/src/backend/CMakeLists.txt
@@ -5,11 +5,13 @@ include_directories(
 )
 
 set(postgres_include_catalog "${PROJECT_SOURCE_DIR}/src/include/catalog")
+set(postgres_include_dir "${PROJECT_SOURCE_DIR}/src/include")
 
 set(gen_fmgrtab_depend
 	utils/Gen_fmgrtab.pl
 	${CMAKE_CURRENT_SOURCE_DIR}/catalog/Catalog.pm
 	${postgres_include_catalog}/pg_proc.h
+	${postgres_include_dir}/access/transam.h
 )
 set(gen_fmgrtab_output
 	${PROJECT_SOURCE_DIR}/src/include/utils/fmgroids.h
@@ -20,7 +22,7 @@ set(gen_fmgrtab_output
 add_custom_command(
 	MAIN_DEPENDENCY ${gen_fmgrtab_depend}
 	OUTPUT ${gen_fmgrtab_output}
-	COMMAND ${PERL_EXECUTABLE} -I${CMAKE_CURRENT_SOURCE_DIR}/catalog Gen_fmgrtab.pl ${postgres_include_catalog}/pg_proc.h
+	COMMAND ${PERL_EXECUTABLE} -I${CMAKE_CURRENT_SOURCE_DIR}/catalog Gen_fmgrtab.pl -I${postgres_include_dir} ${postgres_include_catalog}/pg_proc.h
 	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/utils/fmgroids.h ${PROJECT_SOURCE_DIR}/src/include/utils/fmgroids.h
 	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_CURRENT_SOURCE_DIR}/utils/fmgrprotos.h ${PROJECT_SOURCE_DIR}/src/include/utils/fmgrprotos.h
 	WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/utils
@@ -140,6 +142,7 @@ set(access_SRCS
 	access/common/scankey.c
 	access/common/tupconvert.c
 	access/common/tupdesc.c
+	access/common/session.c
 
 	access/gin/ginutil.c
 	access/gin/gininsert.c
@@ -481,6 +484,7 @@ set(executor_SRCS
 	executor/nodeTableFuncscan.c
 	executor/tstoreReceiver.c
 	executor/spi.c
+	executor/execPartition.c
 )
 
 set(lib_SRCS
@@ -492,6 +496,7 @@ set(lib_SRCS
 	lib/rbtree.c
 	lib/stringinfo.c
 	lib/knapsack.c
+	lib/dshash.c
 )
 
 if(OPENSSL_FOUND)
@@ -631,6 +636,8 @@ set(utils_SRCS
 	utils/adt/xml.c
 	utils/adt/network_spgist.c
 	utils/adt/mac8.c
+	utils/adt/cryptohashes.c
+	utils/adt/expandedrecord.c
 	utils/fmgr/dfmgr.c
 	utils/fmgr/fmgr.c
 	utils/fmgr/funcapi.c
@@ -667,6 +674,8 @@ set(utils_SRCS
 	utils/mb/wchar.c
 	utils/mb/wstrcmp.c
 	utils/mb/wstrncmp.c
+	utils/mmgr/generation.c
+	utils/sort/sharedtuplestore.c
 )
 
 set(nodes_SRCS
@@ -896,6 +905,7 @@ set(storage_SRCS
 	storage/file/buffile.c
 	storage/file/copydir.c
 	storage/file/reinit.c
+	storage/file/sharedfileset.c
 	storage/freespace/freespace.c
 	storage/freespace/fsmpage.c
 	storage/freespace/indexfsm.c
@@ -914,6 +924,7 @@ set(storage_SRCS
 	storage/ipc/sinvaladt.c
 	storage/ipc/standby.c
 	storage/ipc/latch.c
+	storage/ipc/barrier.c
 	storage/large_object/inv_api.c
 	storage/lmgr/lmgr.c # Need some for check s_lock
 	storage/lmgr/lock.c
diff --git a/src/backend/Makefile b/src/backend/Makefile
index bce9d2c3eb..4a28267339 100644
--- a/src/backend/Makefile
+++ b/src/backend/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for the postgres backend
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/backend/Makefile
@@ -39,8 +39,8 @@ OBJS = $(SUBDIROBJS) $(LOCALOBJS) $(top_builddir)/src/port/libpgport_srv.a \
        $(top_builddir)/src/common/libpgcommon_srv.a
 
 # We put libpgport and libpgcommon into OBJS, so remove it from LIBS; also add
-# libldap
-LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE)
+# libldap and ICU
+LIBS := $(filter-out -lpgport -lpgcommon, $(LIBS)) $(LDAP_LIBS_BE) $(ICU_LIBS)
 
 # The backend doesn't need everything that's in LIBS, however
 LIBS := $(filter-out -lz -lreadline -ledit -ltermcap -lncurses -lcurses, $(LIBS))
@@ -58,7 +58,7 @@ ifneq ($(PORTNAME), win32)
 ifneq ($(PORTNAME), aix)
 
 postgres: $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) $(ICU_LIBS) -o $@
+	$(CC) $(CFLAGS) $(LDFLAGS) $(LDFLAGS_EX) $(export_dynamic) $(call expand_subsys,$^) $(LIBS) -o $@
 
 endif
 endif
diff --git a/src/backend/access/brin/brin.c b/src/backend/access/brin/brin.c
index efebeb035a..68b3371665 100644
--- a/src/backend/access/brin/brin.c
+++ b/src/backend/access/brin/brin.c
@@ -4,7 +4,7 @@
  *
  * See src/backend/access/brin/README for details.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -67,7 +67,7 @@ static BrinBuildState *initialize_brin_buildstate(Relation idxRel,
 						   BrinRevmap *revmap, BlockNumber pagesPerRange);
 static void terminate_brin_buildstate(BrinBuildState *state);
 static void brinsummarize(Relation index, Relation heapRel, BlockNumber pageRange,
-			  double *numSummarized, double *numExisting);
+			  bool include_partial, double *numSummarized, double *numExisting);
 static void form_and_insert_tuple(BrinBuildState *state);
 static void union_tuples(BrinDesc *bdesc, BrinMemTuple *a,
 			 BrinTuple *b);
@@ -473,7 +473,8 @@ bringetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 					 */
 					Assert((key->sk_flags & SK_ISNULL) ||
 						   (key->sk_collation ==
-							bdesc->bd_tupdesc->attrs[keyattno - 1]->attcollation));
+							TupleDescAttr(bdesc->bd_tupdesc,
+										  keyattno - 1)->attcollation));
 
 					/* First time this column? look up consistent function */
 					if (consistentFn[keyattno - 1].fn_oid == InvalidOid)
@@ -622,6 +623,7 @@ brinbuildCallback(Relation index,
 	{
 		FmgrInfo   *addValue;
 		BrinValues *col;
+		Form_pg_attribute attr = TupleDescAttr(state->bs_bdesc->bd_tupdesc, i);
 
 		col = &state->bs_dtuple->bt_columns[i];
 		addValue = index_getprocinfo(index, i + 1,
@@ -631,7 +633,7 @@ brinbuildCallback(Relation index,
 		 * Update dtuple state, if and as necessary.
 		 */
 		FunctionCall4Coll(addValue,
-						  state->bs_bdesc->bd_tupdesc->attrs[i]->attcollation,
+						  attr->attcollation,
 						  PointerGetDatum(state->bs_bdesc),
 						  PointerGetDatum(col),
 						  values[i], isnull[i]);
@@ -683,7 +685,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 
 		XLogBeginInsert();
 		XLogRegisterData((char *) &xlrec, SizeOfBrinCreateIdx);
-		XLogRegisterBuffer(0, meta, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, meta, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 		recptr = XLogInsert(RM_BRIN_ID, XLOG_BRIN_CREATE_INDEX);
 
@@ -704,7 +706,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	 * heap blocks in physical order.
 	 */
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, false,
-								   brinbuildCallback, (void *) state);
+								   brinbuildCallback, (void *) state, NULL);
 
 	/* process the final batch */
 	form_and_insert_tuple(state);
@@ -740,7 +742,7 @@ brinbuildempty(Relation index)
 	brin_metapage_init(BufferGetPage(metabuf), BrinGetPagesPerRange(index),
 					   BRIN_CURRENT_VERSION);
 	MarkBufferDirty(metabuf);
-	log_newpage_buffer(metabuf, false);
+	log_newpage_buffer(metabuf, true);
 	END_CRIT_SECTION();
 
 	UnlockReleaseBuffer(metabuf);
@@ -789,7 +791,7 @@ brinvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 
 	brin_vacuum_scan(info->index, info->strategy);
 
-	brinsummarize(info->index, heapRel, BRIN_ALL_BLOCKRANGES,
+	brinsummarize(info->index, heapRel, BRIN_ALL_BLOCKRANGES, false,
 				  &stats->num_index_tuples, &stats->num_index_tuples);
 
 	heap_close(heapRel, AccessShareLock);
@@ -892,7 +894,7 @@ brin_summarize_range(PG_FUNCTION_ARGS)
 
 	/* User must own the index (comparable to privileges needed for VACUUM) */
 	if (!pg_class_ownercheck(indexoid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_INDEX,
 					   RelationGetRelationName(indexRel));
 
 	/*
@@ -907,7 +909,7 @@ brin_summarize_range(PG_FUNCTION_ARGS)
 						RelationGetRelationName(indexRel))));
 
 	/* OK, do it */
-	brinsummarize(indexRel, heapRel, heapBlk, &numSummarized, NULL);
+	brinsummarize(indexRel, heapRel, heapBlk, true, &numSummarized, NULL);
 
 	relation_close(indexRel, ShareUpdateExclusiveLock);
 	relation_close(heapRel, ShareUpdateExclusiveLock);
@@ -963,7 +965,7 @@ brin_desummarize_range(PG_FUNCTION_ARGS)
 
 	/* User must own the index (comparable to privileges needed for VACUUM) */
 	if (!pg_class_ownercheck(indexoid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_INDEX,
 					   RelationGetRelationName(indexRel));
 
 	/*
@@ -1019,12 +1021,12 @@ brin_build_desc(Relation rel)
 	for (keyno = 0; keyno < tupdesc->natts; keyno++)
 	{
 		FmgrInfo   *opcInfoFn;
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, keyno);
 
 		opcInfoFn = index_getprocinfo(rel, keyno + 1, BRIN_PROCNUM_OPCINFO);
 
 		opcinfo[keyno] = (BrinOpcInfo *)
-			DatumGetPointer(FunctionCall1(opcInfoFn,
-										  tupdesc->attrs[keyno]->atttypid));
+			DatumGetPointer(FunctionCall1(opcInfoFn, attr->atttypid));
 		totalstored += opcinfo[keyno]->oi_nstored;
 	}
 
@@ -1127,7 +1129,8 @@ terminate_brin_buildstate(BrinBuildState *state)
 }
 
 /*
- * Summarize the given page range of the given index.
+ * On the given BRIN index, summarize the heap page range that corresponds
+ * to the heap block number given.
  *
  * This routine can run in parallel with insertions into the heap.  To avoid
  * missing those values from the summary tuple, we first insert a placeholder
@@ -1137,6 +1140,12 @@ terminate_brin_buildstate(BrinBuildState *state)
  * update of the index value happens in a loop, so that if somebody updates
  * the placeholder tuple after we read it, we detect the case and try again.
  * This ensures that the concurrently inserted tuples are not lost.
+ *
+ * A further corner case is this routine being asked to summarize the partial
+ * range at the end of the table.  heapNumBlocks is the (possibly outdated)
+ * table size; if we notice that the requested range lies beyond that size,
+ * we re-compute the table size after inserting the placeholder tuple, to
+ * avoid missing pages that were appended recently.
  */
 static void
 summarize_range(IndexInfo *indexInfo, BrinBuildState *state, Relation heapRel,
@@ -1157,6 +1166,33 @@ summarize_range(IndexInfo *indexInfo, BrinBuildState *state, Relation heapRel,
 						   state->bs_rmAccess, &phbuf,
 						   heapBlk, phtup, phsz);
 
+	/*
+	 * Compute range end.  We hold ShareUpdateExclusive lock on table, so it
+	 * cannot shrink concurrently (but it can grow).
+	 */
+	Assert(heapBlk % state->bs_pagesPerRange == 0);
+	if (heapBlk + state->bs_pagesPerRange > heapNumBlks)
+	{
+		/*
+		 * If we're asked to scan what we believe to be the final range on the
+		 * table (i.e. a range that might be partial) we need to recompute our
+		 * idea of what the latest page is after inserting the placeholder
+		 * tuple.  Anyone that grows the table later will update the
+		 * placeholder tuple, so it doesn't matter that we won't scan these
+		 * pages ourselves.  Careful: the table might have been extended
+		 * beyond the current range, so clamp our result.
+		 *
+		 * Fortunately, this should occur infrequently.
+		 */
+		scanNumBlks = Min(RelationGetNumberOfBlocks(heapRel) - heapBlk,
+						  state->bs_pagesPerRange);
+	}
+	else
+	{
+		/* Easy case: range is known to be complete */
+		scanNumBlks = state->bs_pagesPerRange;
+	}
+
 	/*
 	 * Execute the partial heap scan covering the heap blocks in the specified
 	 * page range, summarizing the heap tuples in it.  This scan stops just
@@ -1167,11 +1203,9 @@ summarize_range(IndexInfo *indexInfo, BrinBuildState *state, Relation heapRel,
 	 * by transactions that are still in progress, among other corner cases.
 	 */
 	state->bs_currRangeStart = heapBlk;
-	scanNumBlks = heapBlk + state->bs_pagesPerRange <= heapNumBlks ?
-		state->bs_pagesPerRange : heapNumBlks - heapBlk;
 	IndexBuildHeapRangeScan(heapRel, state->bs_irel, indexInfo, false, true,
 							heapBlk, scanNumBlks,
-							brinbuildCallback, (void *) state);
+							brinbuildCallback, (void *) state, NULL);
 
 	/*
 	 * Now we update the values obtained by the scan with the placeholder
@@ -1232,6 +1266,8 @@ summarize_range(IndexInfo *indexInfo, BrinBuildState *state, Relation heapRel,
  * Summarize page ranges that are not already summarized.  If pageRange is
  * BRIN_ALL_BLOCKRANGES then the whole table is scanned; otherwise, only the
  * page range containing the given heap page number is scanned.
+ * If include_partial is true, then the partial range at the end of the table
+ * is summarized, otherwise not.
  *
  * For each new index tuple inserted, *numSummarized (if not NULL) is
  * incremented; for each existing tuple, *numExisting (if not NULL) is
@@ -1239,56 +1275,57 @@ summarize_range(IndexInfo *indexInfo, BrinBuildState *state, Relation heapRel,
  */
 static void
 brinsummarize(Relation index, Relation heapRel, BlockNumber pageRange,
-			  double *numSummarized, double *numExisting)
+			  bool include_partial, double *numSummarized, double *numExisting)
 {
 	BrinRevmap *revmap;
 	BrinBuildState *state = NULL;
 	IndexInfo  *indexInfo = NULL;
 	BlockNumber heapNumBlocks;
-	BlockNumber heapBlk;
 	BlockNumber pagesPerRange;
 	Buffer		buf;
 	BlockNumber startBlk;
-	BlockNumber endBlk;
-
-	/* determine range of pages to process; nothing to do for an empty table */
-	heapNumBlocks = RelationGetNumberOfBlocks(heapRel);
-	if (heapNumBlocks == 0)
-		return;
 
 	revmap = brinRevmapInitialize(index, &pagesPerRange, NULL);
 
+	/* determine range of pages to process */
+	heapNumBlocks = RelationGetNumberOfBlocks(heapRel);
 	if (pageRange == BRIN_ALL_BLOCKRANGES)
-	{
 		startBlk = 0;
-		endBlk = heapNumBlocks;
-	}
 	else
 	{
 		startBlk = (pageRange / pagesPerRange) * pagesPerRange;
+		heapNumBlocks = Min(heapNumBlocks, startBlk + pagesPerRange);
+	}
+	if (startBlk > heapNumBlocks)
+	{
 		/* Nothing to do if start point is beyond end of table */
-		if (startBlk > heapNumBlocks)
-		{
-			brinRevmapTerminate(revmap);
-			return;
-		}
-		endBlk = startBlk + pagesPerRange;
-		if (endBlk > heapNumBlocks)
-			endBlk = heapNumBlocks;
+		brinRevmapTerminate(revmap);
+		return;
 	}
 
 	/*
 	 * Scan the revmap to find unsummarized items.
 	 */
 	buf = InvalidBuffer;
-	for (heapBlk = startBlk; heapBlk < endBlk; heapBlk += pagesPerRange)
+	for (; startBlk < heapNumBlocks; startBlk += pagesPerRange)
 	{
 		BrinTuple  *tup;
 		OffsetNumber off;
 
+		/*
+		 * Unless requested to summarize even a partial range, go away now if
+		 * we think the next range is partial.  Caller would pass true when it
+		 * is typically run once bulk data loading is done
+		 * (brin_summarize_new_values), and false when it is typically the
+		 * result of arbitrarily-scheduled maintenance command (vacuuming).
+		 */
+		if (!include_partial &&
+			(startBlk + pagesPerRange > heapNumBlocks))
+			break;
+
 		CHECK_FOR_INTERRUPTS();
 
-		tup = brinGetTupleForHeapBlock(revmap, heapBlk, &buf, &off, NULL,
+		tup = brinGetTupleForHeapBlock(revmap, startBlk, &buf, &off, NULL,
 									   BUFFER_LOCK_SHARE, NULL);
 		if (tup == NULL)
 		{
@@ -1301,7 +1338,7 @@ brinsummarize(Relation index, Relation heapRel, BlockNumber pageRange,
 												   pagesPerRange);
 				indexInfo = BuildIndexInfo(index);
 			}
-			summarize_range(indexInfo, state, heapRel, heapBlk, heapNumBlocks);
+			summarize_range(indexInfo, state, heapRel, startBlk, heapNumBlocks);
 
 			/* and re-initialize state for the next range */
 			brin_memtuple_initialize(state->bs_dtuple, state->bs_bdesc);
diff --git a/src/backend/access/brin/brin_inclusion.c b/src/backend/access/brin/brin_inclusion.c
index 9c0a058ccb..25428777f7 100644
--- a/src/backend/access/brin/brin_inclusion.c
+++ b/src/backend/access/brin/brin_inclusion.c
@@ -16,7 +16,7 @@
  * writing is the INET type, where IPv6 values cannot be merged with IPv4
  * values.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -157,7 +157,7 @@ brin_inclusion_add_value(PG_FUNCTION_ARGS)
 	}
 
 	attno = column->bv_attno;
-	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+	attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 
 	/*
 	 * If the recorded value is null, copy the new value (which we know to be
@@ -516,7 +516,7 @@ brin_inclusion_union(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 
 	attno = col_a->bv_attno;
-	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+	attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 
 	/*
 	 * Adjust "allnulls".  If A doesn't have values, just copy the values from
@@ -675,7 +675,7 @@ inclusion_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
 		bool		isNull;
 
 		opfamily = bdesc->bd_index->rd_opfamily[attno - 1];
-		attr = bdesc->bd_tupdesc->attrs[attno - 1];
+		attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 		tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
 								ObjectIdGetDatum(attr->atttypid),
 								ObjectIdGetDatum(subtype),
diff --git a/src/backend/access/brin/brin_minmax.c b/src/backend/access/brin/brin_minmax.c
index 62fd90aabe..0f6aa33a45 100644
--- a/src/backend/access/brin/brin_minmax.c
+++ b/src/backend/access/brin/brin_minmax.c
@@ -2,7 +2,7 @@
  * brin_minmax.c
  *		Implementation of Min/Max opclass for BRIN
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -90,7 +90,7 @@ brin_minmax_add_value(PG_FUNCTION_ARGS)
 	}
 
 	attno = column->bv_attno;
-	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+	attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 
 	/*
 	 * If the recorded value is null, store the new value (which we know to be
@@ -260,7 +260,7 @@ brin_minmax_union(PG_FUNCTION_ARGS)
 		PG_RETURN_VOID();
 
 	attno = col_a->bv_attno;
-	attr = bdesc->bd_tupdesc->attrs[attno - 1];
+	attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 
 	/*
 	 * Adjust "allnulls".  If A doesn't have values, just copy the values from
@@ -347,7 +347,7 @@ minmax_get_strategy_procinfo(BrinDesc *bdesc, uint16 attno, Oid subtype,
 		bool		isNull;
 
 		opfamily = bdesc->bd_index->rd_opfamily[attno - 1];
-		attr = bdesc->bd_tupdesc->attrs[attno - 1];
+		attr = TupleDescAttr(bdesc->bd_tupdesc, attno - 1);
 		tuple = SearchSysCache4(AMOPSTRATEGY, ObjectIdGetDatum(opfamily),
 								ObjectIdGetDatum(attr->atttypid),
 								ObjectIdGetDatum(subtype),
diff --git a/src/backend/access/brin/brin_pageops.c b/src/backend/access/brin/brin_pageops.c
index 80f803e438..60a7025ec5 100644
--- a/src/backend/access/brin/brin_pageops.c
+++ b/src/backend/access/brin/brin_pageops.c
@@ -2,7 +2,7 @@
  * brin_pageops.c
  *		Page-handling routines for BRIN indexes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -113,9 +113,15 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
 
 	/*
 	 * Check that the old tuple wasn't updated concurrently: it might have
-	 * moved someplace else entirely ...
+	 * moved someplace else entirely, and for that matter the whole page
+	 * might've become a revmap page.  Note that in the first two cases
+	 * checked here, the "oldlp" we just calculated is garbage; but
+	 * PageGetItemId() is simple enough that it was safe to do that
+	 * calculation anyway.
 	 */
-	if (!ItemIdIsNormal(oldlp))
+	if (!BRIN_IS_REGULAR_PAGE(oldpage) ||
+		oldoff > PageGetMaxOffsetNumber(oldpage) ||
+		!ItemIdIsNormal(oldlp))
 	{
 		LockBuffer(oldbuf, BUFFER_LOCK_UNLOCK);
 
@@ -470,7 +476,7 @@ brin_page_init(Page page, uint16 type)
 }
 
 /*
- * Initialize a new BRIN index' metapage.
+ * Initialize a new BRIN index's metapage.
  */
 void
 brin_metapage_init(Page page, BlockNumber pagesPerRange, uint16 version)
@@ -491,6 +497,14 @@ brin_metapage_init(Page page, BlockNumber pagesPerRange, uint16 version)
 	 * revmap page to be created when the index is.
 	 */
 	metadata->lastRevmapPage = 0;
+
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
+	 */
+	((PageHeader) page)->pd_lower =
+		((char *) metadata + sizeof(BrinMetaPageData)) - (char *) page;
 }
 
 /*
diff --git a/src/backend/access/brin/brin_revmap.c b/src/backend/access/brin/brin_revmap.c
index 22f2076887..f0dd72ac67 100644
--- a/src/backend/access/brin/brin_revmap.c
+++ b/src/backend/access/brin/brin_revmap.c
@@ -12,7 +12,7 @@
  * the metapage.  When the revmap needs to be expanded, all tuples on the
  * regular BRIN page at that block (if any) are moved out of the way.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -315,7 +315,7 @@ brinGetTupleForHeapBlock(BrinRevmap *revmap, BlockNumber heapBlk,
  *
  * Index must be locked in ShareUpdateExclusiveLock mode.
  *
- * Return FALSE if caller should retry.
+ * Return false if caller should retry.
  */
 bool
 brinRevmapDesummarizeRange(Relation idxrel, BlockNumber heapBlk)
@@ -615,7 +615,7 @@ revmap_physical_extend(BrinRevmap *revmap)
 
 	/*
 	 * Ok, we have now locked the metapage and the target block. Re-initialize
-	 * it as a revmap page.
+	 * the target block as a revmap page, and update the metapage.
 	 */
 	START_CRIT_SECTION();
 
@@ -624,6 +624,17 @@ revmap_physical_extend(BrinRevmap *revmap)
 	MarkBufferDirty(buf);
 
 	metadata->lastRevmapPage = mapBlk;
+
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.  (We must do this here because pre-v11 versions of PG did not
+	 * set the metapage's pd_lower correctly, so a pg_upgraded index might
+	 * contain the wrong value.)
+	 */
+	((PageHeader) metapage)->pd_lower =
+		((char *) metadata + sizeof(BrinMetaPageData)) - (char *) metapage;
+
 	MarkBufferDirty(revmap->rm_metaBuf);
 
 	if (RelationNeedsWAL(revmap->rm_irel))
@@ -635,7 +646,7 @@ revmap_physical_extend(BrinRevmap *revmap)
 
 		XLogBeginInsert();
 		XLogRegisterData((char *) &xlrec, SizeOfBrinRevmapExtend);
-		XLogRegisterBuffer(0, revmap->rm_metaBuf, 0);
+		XLogRegisterBuffer(0, revmap->rm_metaBuf, REGBUF_STANDARD);
 
 		XLogRegisterBuffer(1, buf, REGBUF_WILL_INIT);
 
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
index ed5b4b108d..00316b899c 100644
--- a/src/backend/access/brin/brin_tuple.c
+++ b/src/backend/access/brin/brin_tuple.c
@@ -23,7 +23,7 @@
  * Note the size of the null bitmask may not be the same as that of the
  * datum array.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -559,7 +559,7 @@ brin_deconstruct_tuple(BrinDesc *brdesc,
 			 datumno < brdesc->bd_info[attnum]->oi_nstored;
 			 datumno++)
 		{
-			Form_pg_attribute thisatt = diskdsc->attrs[stored];
+			Form_pg_attribute thisatt = TupleDescAttr(diskdsc, stored);
 
 			if (thisatt->attlen == -1)
 			{
diff --git a/src/backend/access/brin/brin_validate.c b/src/backend/access/brin/brin_validate.c
index b4acf2b6f3..35f6ccacce 100644
--- a/src/backend/access/brin/brin_validate.c
+++ b/src/backend/access/brin/brin_validate.c
@@ -3,7 +3,7 @@
  * brin_validate.c
  *	  Opclass validator for BRIN.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/brin/brin_xlog.c b/src/backend/access/brin/brin_xlog.c
index dff7198a39..b2871e78aa 100644
--- a/src/backend/access/brin/brin_xlog.c
+++ b/src/backend/access/brin/brin_xlog.c
@@ -2,7 +2,7 @@
  * brin_xlog.c
  *		XLog replay routines for BRIN indexes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -234,6 +234,17 @@ brin_xlog_revmap_extend(XLogReaderState *record)
 		metadata->lastRevmapPage = xlrec->targetBlk;
 
 		PageSetLSN(metapg, lsn);
+
+		/*
+		 * Set pd_lower just past the end of the metadata.  This is essential,
+		 * because without doing so, metadata will be lost if xlog.c
+		 * compresses the page.  (We must do this here because pre-v11
+		 * versions of PG did not set the metapage's pd_lower correctly, so a
+		 * pg_upgraded index might contain the wrong value.)
+		 */
+		((PageHeader) metapg)->pd_lower =
+			((char *) metadata + sizeof(BrinMetaPageData)) - (char *) metapg;
+
 		MarkBufferDirty(metabuf);
 	}
 
@@ -331,14 +342,20 @@ void
 brin_mask(char *pagedata, BlockNumber blkno)
 {
 	Page		page = (Page) pagedata;
+	PageHeader	pagehdr = (PageHeader) page;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 
-	if (BRIN_IS_REGULAR_PAGE(page))
+	/*
+	 * Regular brin pages contain unused space which needs to be masked.
+	 * Similarly for meta pages, but mask it only if pd_lower appears to have
+	 * been set correctly.
+	 */
+	if (BRIN_IS_REGULAR_PAGE(page) ||
+		(BRIN_IS_META_PAGE(page) && pagehdr->pd_lower > SizeOfPageHeaderData))
 	{
-		/* Regular brin pages contain unused space which needs to be masked. */
 		mask_unused_space(page);
 	}
 }
diff --git a/src/backend/access/common/Makefile b/src/backend/access/common/Makefile
index fb27944b89..f130b6e350 100644
--- a/src/backend/access/common/Makefile
+++ b/src/backend/access/common/Makefile
@@ -13,6 +13,6 @@ top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
 OBJS = bufmask.o heaptuple.o indextuple.o printsimple.o printtup.o \
-	reloptions.o scankey.o tupconvert.o tupdesc.o
+	reloptions.o scankey.o session.o tupconvert.o tupdesc.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/access/common/bufmask.c b/src/backend/access/common/bufmask.c
index 10253d3354..57021f6ca1 100644
--- a/src/backend/access/common/bufmask.c
+++ b/src/backend/access/common/bufmask.c
@@ -5,7 +5,7 @@
  *	  in a page which can be different when the WAL is generated
  *	  and when the WAL is applied.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * Contains common routines required for masking a page.
  *
@@ -23,15 +23,17 @@
  * mask_page_lsn
  *
  * In consistency checks, the LSN of the two pages compared will likely be
- * different because of concurrent operations when the WAL is generated
- * and the state of the page when WAL is applied.
+ * different because of concurrent operations when the WAL is generated and
+ * the state of the page when WAL is applied. Also, mask out checksum as
+ * masking anything else on page means checksum is not going to match as well.
  */
 void
-mask_page_lsn(Page page)
+mask_page_lsn_and_checksum(Page page)
 {
 	PageHeader	phdr = (PageHeader) page;
 
 	PageXLogRecPtrSet(phdr->pd_lsn, (uint64) MASK_MARKER);
+	phdr->pd_checksum = MASK_MARKER;
 }
 
 /*
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
index 584a202ab5..a2f67f2332 100644
--- a/src/backend/access/common/heaptuple.c
+++ b/src/backend/access/common/heaptuple.c
@@ -45,7 +45,7 @@
  * and we'd like to still refer to them via C struct offsets.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -89,7 +89,6 @@ heap_compute_data_size(TupleDesc tupleDesc,
 	Size		data_length = 0;
 	int			i;
 	int			numberOfAttributes = tupleDesc->natts;
-	Form_pg_attribute *att = tupleDesc->attrs;
 
 	for (i = 0; i < numberOfAttributes; i++)
 	{
@@ -100,7 +99,7 @@ heap_compute_data_size(TupleDesc tupleDesc,
 			continue;
 
 		val = values[i];
-		atti = att[i];
+		atti = TupleDescAttr(tupleDesc, i);
 
 		if (ATT_IS_PACKABLE(atti) &&
 			VARATT_CAN_MAKE_SHORT(DatumGetPointer(val)))
@@ -152,7 +151,6 @@ heap_fill_tuple(TupleDesc tupleDesc,
 	int			bitmask;
 	int			i;
 	int			numberOfAttributes = tupleDesc->natts;
-	Form_pg_attribute *att = tupleDesc->attrs;
 
 #ifdef USE_ASSERT_CHECKING
 	char	   *start = data;
@@ -174,6 +172,7 @@ heap_fill_tuple(TupleDesc tupleDesc,
 
 	for (i = 0; i < numberOfAttributes; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
 		Size		data_length;
 
 		if (bit != NULL)
@@ -201,14 +200,14 @@ heap_fill_tuple(TupleDesc tupleDesc,
 		 * an offset.  This is a bit of a hack.
 		 */
 
-		if (att[i]->attbyval)
+		if (att->attbyval)
 		{
 			/* pass-by-value */
-			data = (char *) att_align_nominal(data, att[i]->attalign);
-			store_att_byval(data, values[i], att[i]->attlen);
-			data_length = att[i]->attlen;
+			data = (char *) att_align_nominal(data, att->attalign);
+			store_att_byval(data, values[i], att->attlen);
+			data_length = att->attlen;
 		}
-		else if (att[i]->attlen == -1)
+		else if (att->attlen == -1)
 		{
 			/* varlena */
 			Pointer		val = DatumGetPointer(values[i]);
@@ -225,7 +224,7 @@ heap_fill_tuple(TupleDesc tupleDesc,
 					ExpandedObjectHeader *eoh = DatumGetEOHP(values[i]);
 
 					data = (char *) att_align_nominal(data,
-													  att[i]->attalign);
+													  att->attalign);
 					data_length = EOH_get_flat_size(eoh);
 					EOH_flatten_into(eoh, data, data_length);
 				}
@@ -243,7 +242,7 @@ heap_fill_tuple(TupleDesc tupleDesc,
 				data_length = VARSIZE_SHORT(val);
 				memcpy(data, val, data_length);
 			}
-			else if (VARLENA_ATT_IS_PACKABLE(att[i]) &&
+			else if (VARLENA_ATT_IS_PACKABLE(att) &&
 					 VARATT_CAN_MAKE_SHORT(val))
 			{
 				/* convert to short varlena -- no alignment */
@@ -255,25 +254,25 @@ heap_fill_tuple(TupleDesc tupleDesc,
 			{
 				/* full 4-byte header varlena */
 				data = (char *) att_align_nominal(data,
-												  att[i]->attalign);
+												  att->attalign);
 				data_length = VARSIZE(val);
 				memcpy(data, val, data_length);
 			}
 		}
-		else if (att[i]->attlen == -2)
+		else if (att->attlen == -2)
 		{
 			/* cstring ... never needs alignment */
 			*infomask |= HEAP_HASVARWIDTH;
-			Assert(att[i]->attalign == 'c');
+			Assert(att->attalign == 'c');
 			data_length = strlen(DatumGetCString(values[i])) + 1;
 			memcpy(data, DatumGetPointer(values[i]), data_length);
 		}
 		else
 		{
 			/* fixed-length pass-by-reference */
-			data = (char *) att_align_nominal(data, att[i]->attalign);
-			Assert(att[i]->attlen > 0);
-			data_length = att[i]->attlen;
+			data = (char *) att_align_nominal(data, att->attalign);
+			Assert(att->attlen > 0);
+			data_length = att->attlen;
 			memcpy(data, DatumGetPointer(values[i]), data_length);
 		}
 
@@ -290,7 +289,7 @@ heap_fill_tuple(TupleDesc tupleDesc,
  */
 
 /* ----------------
- *		heap_attisnull	- returns TRUE iff tuple attribute is not present
+ *		heap_attisnull	- returns true iff tuple attribute is not present
  * ----------------
  */
 bool
@@ -354,7 +353,6 @@ nocachegetattr(HeapTuple tuple,
 			   TupleDesc tupleDesc)
 {
 	HeapTupleHeader tup = tuple->t_data;
-	Form_pg_attribute *att = tupleDesc->attrs;
 	char	   *tp;				/* ptr to data part of tuple */
 	bits8	   *bp = tup->t_bits;	/* ptr to null bitmap in tuple */
 	bool		slow = false;	/* do we have to walk attrs? */
@@ -404,15 +402,15 @@ nocachegetattr(HeapTuple tuple,
 
 	if (!slow)
 	{
+		Form_pg_attribute att;
+
 		/*
 		 * If we get here, there are no nulls up to and including the target
 		 * attribute.  If we have a cached offset, we can use it.
 		 */
-		if (att[attnum]->attcacheoff >= 0)
-		{
-			return fetchatt(att[attnum],
-							tp + att[attnum]->attcacheoff);
-		}
+		att = TupleDescAttr(tupleDesc, attnum);
+		if (att->attcacheoff >= 0)
+			return fetchatt(att, tp + att->attcacheoff);
 
 		/*
 		 * Otherwise, check for non-fixed-length attrs up to and including
@@ -425,7 +423,7 @@ nocachegetattr(HeapTuple tuple,
 
 			for (j = 0; j <= attnum; j++)
 			{
-				if (att[j]->attlen <= 0)
+				if (TupleDescAttr(tupleDesc, j)->attlen <= 0)
 				{
 					slow = true;
 					break;
@@ -448,29 +446,32 @@ nocachegetattr(HeapTuple tuple,
 		 * fixed-width columns, in hope of avoiding future visits to this
 		 * routine.
 		 */
-		att[0]->attcacheoff = 0;
+		TupleDescAttr(tupleDesc, 0)->attcacheoff = 0;
 
 		/* we might have set some offsets in the slow path previously */
-		while (j < natts && att[j]->attcacheoff > 0)
+		while (j < natts && TupleDescAttr(tupleDesc, j)->attcacheoff > 0)
 			j++;
 
-		off = att[j - 1]->attcacheoff + att[j - 1]->attlen;
+		off = TupleDescAttr(tupleDesc, j - 1)->attcacheoff +
+			TupleDescAttr(tupleDesc, j - 1)->attlen;
 
 		for (; j < natts; j++)
 		{
-			if (att[j]->attlen <= 0)
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, j);
+
+			if (att->attlen <= 0)
 				break;
 
-			off = att_align_nominal(off, att[j]->attalign);
+			off = att_align_nominal(off, att->attalign);
 
-			att[j]->attcacheoff = off;
+			att->attcacheoff = off;
 
-			off += att[j]->attlen;
+			off += att->attlen;
 		}
 
 		Assert(j > attnum);
 
-		off = att[attnum]->attcacheoff;
+		off = TupleDescAttr(tupleDesc, attnum)->attcacheoff;
 	}
 	else
 	{
@@ -490,6 +491,8 @@ nocachegetattr(HeapTuple tuple,
 		off = 0;
 		for (i = 0;; i++)		/* loop exit is at "break" */
 		{
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
+
 			if (HeapTupleHasNulls(tuple) && att_isnull(i, bp))
 			{
 				usecache = false;
@@ -497,9 +500,9 @@ nocachegetattr(HeapTuple tuple,
 			}
 
 			/* If we know the next offset, we can skip the rest */
-			if (usecache && att[i]->attcacheoff >= 0)
-				off = att[i]->attcacheoff;
-			else if (att[i]->attlen == -1)
+			if (usecache && att->attcacheoff >= 0)
+				off = att->attcacheoff;
+			else if (att->attlen == -1)
 			{
 				/*
 				 * We can only cache the offset for a varlena attribute if the
@@ -508,11 +511,11 @@ nocachegetattr(HeapTuple tuple,
 				 * either an aligned or unaligned value.
 				 */
 				if (usecache &&
-					off == att_align_nominal(off, att[i]->attalign))
-					att[i]->attcacheoff = off;
+					off == att_align_nominal(off, att->attalign))
+					att->attcacheoff = off;
 				else
 				{
-					off = att_align_pointer(off, att[i]->attalign, -1,
+					off = att_align_pointer(off, att->attalign, -1,
 											tp + off);
 					usecache = false;
 				}
@@ -520,23 +523,23 @@ nocachegetattr(HeapTuple tuple,
 			else
 			{
 				/* not varlena, so safe to use att_align_nominal */
-				off = att_align_nominal(off, att[i]->attalign);
+				off = att_align_nominal(off, att->attalign);
 
 				if (usecache)
-					att[i]->attcacheoff = off;
+					att->attcacheoff = off;
 			}
 
 			if (i == attnum)
 				break;
 
-			off = att_addlength_pointer(off, att[i]->attlen, tp + off);
+			off = att_addlength_pointer(off, att->attlen, tp + off);
 
-			if (usecache && att[i]->attlen <= 0)
+			if (usecache && att->attlen <= 0)
 				usecache = false;
 		}
 	}
 
-	return fetchatt(att[attnum], tp + off);
+	return fetchatt(TupleDescAttr(tupleDesc, attnum), tp + off);
 }
 
 /* ----------------
@@ -935,12 +938,11 @@ heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc,
 {
 	HeapTupleHeader tup = tuple->t_data;
 	bool		hasnulls = HeapTupleHasNulls(tuple);
-	Form_pg_attribute *att = tupleDesc->attrs;
 	int			tdesc_natts = tupleDesc->natts;
 	int			natts;			/* number of atts to extract */
 	int			attnum;
 	char	   *tp;				/* ptr to tuple data */
-	long		off;			/* offset in tuple data */
+	uint32		off;			/* offset in tuple data */
 	bits8	   *bp = tup->t_bits;	/* ptr to null bitmap in tuple */
 	bool		slow = false;	/* can we use/set attcacheoff? */
 
@@ -959,7 +961,7 @@ heap_deform_tuple(HeapTuple tuple, TupleDesc tupleDesc,
 
 	for (attnum = 0; attnum < natts; attnum++)
 	{
-		Form_pg_attribute thisatt = att[attnum];
+		Form_pg_attribute thisatt = TupleDescAttr(tupleDesc, attnum);
 
 		if (hasnulls && att_isnull(attnum, bp))
 		{
@@ -1039,10 +1041,9 @@ slot_deform_tuple(TupleTableSlot *slot, int natts)
 	bool	   *isnull = slot->tts_isnull;
 	HeapTupleHeader tup = tuple->t_data;
 	bool		hasnulls = HeapTupleHasNulls(tuple);
-	Form_pg_attribute *att = tupleDesc->attrs;
 	int			attnum;
 	char	   *tp;				/* ptr to tuple data */
-	long		off;			/* offset in tuple data */
+	uint32		off;			/* offset in tuple data */
 	bits8	   *bp = tup->t_bits;	/* ptr to null bitmap in tuple */
 	bool		slow;			/* can we use/set attcacheoff? */
 
@@ -1068,7 +1069,7 @@ slot_deform_tuple(TupleTableSlot *slot, int natts)
 
 	for (; attnum < natts; attnum++)
 	{
-		Form_pg_attribute thisatt = att[attnum];
+		Form_pg_attribute thisatt = TupleDescAttr(tupleDesc, attnum);
 
 		if (hasnulls && att_isnull(attnum, bp))
 		{
@@ -1209,7 +1210,7 @@ slot_getattr(TupleTableSlot *slot, int attnum, bool *isnull)
 	 * This case should not happen in normal use, but it could happen if we
 	 * are executing a plan cached before the column was dropped.
 	 */
-	if (tupleDesc->attrs[attnum - 1]->attisdropped)
+	if (TupleDescAttr(tupleDesc, attnum - 1)->attisdropped)
 	{
 		*isnull = true;
 		return (Datum) 0;
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
index 37a21057d0..f7103e53bc 100644
--- a/src/backend/access/common/indextuple.c
+++ b/src/backend/access/common/indextuple.c
@@ -4,7 +4,7 @@
  *	   This file contains index tuple accessor and mutator routines,
  *	   as well as various tuple utilities.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -63,7 +63,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
 #ifdef TOAST_INDEX_HACK
 	for (i = 0; i < numberOfAttributes; i++)
 	{
-		Form_pg_attribute att = tupleDescriptor->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(tupleDescriptor, i);
 
 		untoasted_values[i] = values[i];
 		untoasted_free[i] = false;
@@ -209,7 +209,6 @@ nocache_index_getattr(IndexTuple tup,
 					  int attnum,
 					  TupleDesc tupleDesc)
 {
-	Form_pg_attribute *att = tupleDesc->attrs;
 	char	   *tp;				/* ptr to data part of tuple */
 	bits8	   *bp = NULL;		/* ptr to null bitmap in tuple */
 	bool		slow = false;	/* do we have to walk attrs? */
@@ -271,15 +270,15 @@ nocache_index_getattr(IndexTuple tup,
 
 	if (!slow)
 	{
+		Form_pg_attribute att;
+
 		/*
 		 * If we get here, there are no nulls up to and including the target
 		 * attribute.  If we have a cached offset, we can use it.
 		 */
-		if (att[attnum]->attcacheoff >= 0)
-		{
-			return fetchatt(att[attnum],
-							tp + att[attnum]->attcacheoff);
-		}
+		att = TupleDescAttr(tupleDesc, attnum);
+		if (att->attcacheoff >= 0)
+			return fetchatt(att, tp + att->attcacheoff);
 
 		/*
 		 * Otherwise, check for non-fixed-length attrs up to and including
@@ -292,7 +291,7 @@ nocache_index_getattr(IndexTuple tup,
 
 			for (j = 0; j <= attnum; j++)
 			{
-				if (att[j]->attlen <= 0)
+				if (TupleDescAttr(tupleDesc, j)->attlen <= 0)
 				{
 					slow = true;
 					break;
@@ -315,29 +314,32 @@ nocache_index_getattr(IndexTuple tup,
 		 * fixed-width columns, in hope of avoiding future visits to this
 		 * routine.
 		 */
-		att[0]->attcacheoff = 0;
+		TupleDescAttr(tupleDesc, 0)->attcacheoff = 0;
 
 		/* we might have set some offsets in the slow path previously */
-		while (j < natts && att[j]->attcacheoff > 0)
+		while (j < natts && TupleDescAttr(tupleDesc, j)->attcacheoff > 0)
 			j++;
 
-		off = att[j - 1]->attcacheoff + att[j - 1]->attlen;
+		off = TupleDescAttr(tupleDesc, j - 1)->attcacheoff +
+			TupleDescAttr(tupleDesc, j - 1)->attlen;
 
 		for (; j < natts; j++)
 		{
-			if (att[j]->attlen <= 0)
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, j);
+
+			if (att->attlen <= 0)
 				break;
 
-			off = att_align_nominal(off, att[j]->attalign);
+			off = att_align_nominal(off, att->attalign);
 
-			att[j]->attcacheoff = off;
+			att->attcacheoff = off;
 
-			off += att[j]->attlen;
+			off += att->attlen;
 		}
 
 		Assert(j > attnum);
 
-		off = att[attnum]->attcacheoff;
+		off = TupleDescAttr(tupleDesc, attnum)->attcacheoff;
 	}
 	else
 	{
@@ -357,6 +359,8 @@ nocache_index_getattr(IndexTuple tup,
 		off = 0;
 		for (i = 0;; i++)		/* loop exit is at "break" */
 		{
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
+
 			if (IndexTupleHasNulls(tup) && att_isnull(i, bp))
 			{
 				usecache = false;
@@ -364,9 +368,9 @@ nocache_index_getattr(IndexTuple tup,
 			}
 
 			/* If we know the next offset, we can skip the rest */
-			if (usecache && att[i]->attcacheoff >= 0)
-				off = att[i]->attcacheoff;
-			else if (att[i]->attlen == -1)
+			if (usecache && att->attcacheoff >= 0)
+				off = att->attcacheoff;
+			else if (att->attlen == -1)
 			{
 				/*
 				 * We can only cache the offset for a varlena attribute if the
@@ -375,11 +379,11 @@ nocache_index_getattr(IndexTuple tup,
 				 * either an aligned or unaligned value.
 				 */
 				if (usecache &&
-					off == att_align_nominal(off, att[i]->attalign))
-					att[i]->attcacheoff = off;
+					off == att_align_nominal(off, att->attalign))
+					att->attcacheoff = off;
 				else
 				{
-					off = att_align_pointer(off, att[i]->attalign, -1,
+					off = att_align_pointer(off, att->attalign, -1,
 											tp + off);
 					usecache = false;
 				}
@@ -387,23 +391,23 @@ nocache_index_getattr(IndexTuple tup,
 			else
 			{
 				/* not varlena, so safe to use att_align_nominal */
-				off = att_align_nominal(off, att[i]->attalign);
+				off = att_align_nominal(off, att->attalign);
 
 				if (usecache)
-					att[i]->attcacheoff = off;
+					att->attcacheoff = off;
 			}
 
 			if (i == attnum)
 				break;
 
-			off = att_addlength_pointer(off, att[i]->attlen, tp + off);
+			off = att_addlength_pointer(off, att->attlen, tp + off);
 
-			if (usecache && att[i]->attlen <= 0)
+			if (usecache && att->attlen <= 0)
 				usecache = false;
 		}
 	}
 
-	return fetchatt(att[attnum], tp + off);
+	return fetchatt(TupleDescAttr(tupleDesc, attnum), tp + off);
 }
 
 /*
diff --git a/src/backend/access/common/printsimple.c b/src/backend/access/common/printsimple.c
index c863e859fe..3c4d227712 100644
--- a/src/backend/access/common/printsimple.c
+++ b/src/backend/access/common/printsimple.c
@@ -8,7 +8,7 @@
  *	  doesn't handle standalone backends or protocol versions other than
  *	  3.0, because we don't need such handling for current applications.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -34,19 +34,19 @@ printsimple_startup(DestReceiver *self, int operation, TupleDesc tupdesc)
 	int			i;
 
 	pq_beginmessage(&buf, 'T'); /* RowDescription */
-	pq_sendint(&buf, tupdesc->natts, 2);
+	pq_sendint16(&buf, tupdesc->natts);
 
 	for (i = 0; i < tupdesc->natts; ++i)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
 		pq_sendstring(&buf, NameStr(attr->attname));
-		pq_sendint(&buf, 0, 4); /* table oid */
-		pq_sendint(&buf, 0, 2); /* attnum */
-		pq_sendint(&buf, (int) attr->atttypid, 4);
-		pq_sendint(&buf, attr->attlen, 2);
-		pq_sendint(&buf, attr->atttypmod, 4);
-		pq_sendint(&buf, 0, 2); /* format code */
+		pq_sendint32(&buf, 0);	/* table oid */
+		pq_sendint16(&buf, 0);	/* attnum */
+		pq_sendint32(&buf, (int) attr->atttypid);
+		pq_sendint16(&buf, attr->attlen);
+		pq_sendint32(&buf, attr->atttypmod);
+		pq_sendint16(&buf, 0);	/* format code */
 	}
 
 	pq_endmessage(&buf);
@@ -67,16 +67,16 @@ printsimple(TupleTableSlot *slot, DestReceiver *self)
 
 	/* Prepare and send message */
 	pq_beginmessage(&buf, 'D');
-	pq_sendint(&buf, tupdesc->natts, 2);
+	pq_sendint16(&buf, tupdesc->natts);
 
 	for (i = 0; i < tupdesc->natts; ++i)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 		Datum		value;
 
 		if (slot->tts_isnull[i])
 		{
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1);
 			continue;
 		}
 
diff --git a/src/backend/access/common/printtup.c b/src/backend/access/common/printtup.c
index a2ca2d74ae..a1d4415704 100644
--- a/src/backend/access/common/printtup.c
+++ b/src/backend/access/common/printtup.c
@@ -5,7 +5,7 @@
  *	  clients and standalone backends are supported here).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -32,6 +32,10 @@ static bool printtup_internal_20(TupleTableSlot *slot, DestReceiver *self);
 static void printtup_shutdown(DestReceiver *self);
 static void printtup_destroy(DestReceiver *self);
 
+static void SendRowDescriptionCols_2(StringInfo buf, TupleDesc typeinfo,
+						 List *targetlist, int16 *formats);
+static void SendRowDescriptionCols_3(StringInfo buf, TupleDesc typeinfo,
+						 List *targetlist, int16 *formats);
 
 /* ----------------------------------------------------------------
  *		printtup / debugtup support
@@ -57,6 +61,7 @@ typedef struct
 typedef struct
 {
 	DestReceiver pub;			/* publicly-known function pointers */
+	StringInfoData buf;			/* output buffer */
 	Portal		portal;			/* the Portal we are printing from */
 	bool		sendDescrip;	/* send RowDescription at startup? */
 	TupleDesc	attrinfo;		/* The attr info we are set up for */
@@ -127,6 +132,9 @@ printtup_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	DR_printtup *myState = (DR_printtup *) self;
 	Portal		portal = myState->portal;
 
+	/* create buffer to be used for all messages */
+	initStringInfo(&myState->buf);
+
 	/*
 	 * Create a temporary memory context that we can reset once per row to
 	 * recover palloc'd memory.  This avoids any problems with leaks inside
@@ -157,7 +165,8 @@ printtup_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	 * descriptor of the tuples.
 	 */
 	if (myState->sendDescrip)
-		SendRowDescriptionMessage(typeinfo,
+		SendRowDescriptionMessage(&myState->buf,
+								  typeinfo,
 								  FetchPortalTargetList(portal),
 								  portal->formats);
 
@@ -185,61 +194,126 @@ printtup_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
  * send zeroes for the format codes in that case.
  */
 void
-SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist, int16 *formats)
+SendRowDescriptionMessage(StringInfo buf, TupleDesc typeinfo,
+						  List *targetlist, int16 *formats)
 {
-	Form_pg_attribute *attrs = typeinfo->attrs;
 	int			natts = typeinfo->natts;
 	int			proto = PG_PROTOCOL_MAJOR(FrontendProtocol);
+
+	/* tuple descriptor message type */
+	pq_beginmessage_reuse(buf, 'T');
+	/* # of attrs in tuples */
+	pq_sendint16(buf, natts);
+
+	if (proto >= 3)
+		SendRowDescriptionCols_3(buf, typeinfo, targetlist, formats);
+	else
+		SendRowDescriptionCols_2(buf, typeinfo, targetlist, formats);
+
+	pq_endmessage_reuse(buf);
+}
+
+/*
+ * Send description for each column when using v3+ protocol
+ */
+static void
+SendRowDescriptionCols_3(StringInfo buf, TupleDesc typeinfo, List *targetlist, int16 *formats)
+{
+	int			natts = typeinfo->natts;
 	int			i;
-	StringInfoData buf;
 	ListCell   *tlist_item = list_head(targetlist);
 
-	pq_beginmessage(&buf, 'T'); /* tuple descriptor message type */
-	pq_sendint(&buf, natts, 2); /* # of attrs in tuples */
+	/*
+	 * Preallocate memory for the entire message to be sent. That allows to
+	 * use the significantly faster inline pqformat.h functions and to avoid
+	 * reallocations.
+	 *
+	 * Have to overestimate the size of the column-names, to account for
+	 * character set overhead.
+	 */
+	enlargeStringInfo(buf, (NAMEDATALEN * MAX_CONVERSION_GROWTH /* attname */
+							+ sizeof(Oid)	/* resorigtbl */
+							+ sizeof(AttrNumber)	/* resorigcol */
+							+ sizeof(Oid)	/* atttypid */
+							+ sizeof(int16) /* attlen */
+							+ sizeof(int32) /* attypmod */
+							+ sizeof(int16) /* format */
+							) * natts);
 
 	for (i = 0; i < natts; ++i)
 	{
-		Oid			atttypid = attrs[i]->atttypid;
-		int32		atttypmod = attrs[i]->atttypmod;
+		Form_pg_attribute att = TupleDescAttr(typeinfo, i);
+		Oid			atttypid = att->atttypid;
+		int32		atttypmod = att->atttypmod;
+		Oid			resorigtbl;
+		AttrNumber	resorigcol;
+		int16		format;
+
+		/*
+		 * If column is a domain, send the base type and typmod instead.
+		 * Lookup before sending any ints, for efficiency.
+		 */
+		atttypid = getBaseTypeAndTypmod(atttypid, &atttypmod);
 
-		pq_sendstring(&buf, NameStr(attrs[i]->attname));
-		/* column ID info appears in protocol 3.0 and up */
-		if (proto >= 3)
+		/* Do we have a non-resjunk tlist item? */
+		while (tlist_item &&
+			   ((TargetEntry *) lfirst(tlist_item))->resjunk)
+			tlist_item = lnext(tlist_item);
+		if (tlist_item)
 		{
-			/* Do we have a non-resjunk tlist item? */
-			while (tlist_item &&
-				   ((TargetEntry *) lfirst(tlist_item))->resjunk)
-				tlist_item = lnext(tlist_item);
-			if (tlist_item)
-			{
-				TargetEntry *tle = (TargetEntry *) lfirst(tlist_item);
-
-				pq_sendint(&buf, tle->resorigtbl, 4);
-				pq_sendint(&buf, tle->resorigcol, 2);
-				tlist_item = lnext(tlist_item);
-			}
-			else
-			{
-				/* No info available, so send zeroes */
-				pq_sendint(&buf, 0, 4);
-				pq_sendint(&buf, 0, 2);
-			}
+			TargetEntry *tle = (TargetEntry *) lfirst(tlist_item);
+
+			resorigtbl = tle->resorigtbl;
+			resorigcol = tle->resorigcol;
+			tlist_item = lnext(tlist_item);
 		}
-		/* If column is a domain, send the base type and typmod instead */
-		atttypid = getBaseTypeAndTypmod(atttypid, &atttypmod);
-		pq_sendint(&buf, (int) atttypid, sizeof(atttypid));
-		pq_sendint(&buf, attrs[i]->attlen, sizeof(attrs[i]->attlen));
-		pq_sendint(&buf, atttypmod, sizeof(atttypmod));
-		/* format info appears in protocol 3.0 and up */
-		if (proto >= 3)
+		else
 		{
-			if (formats)
-				pq_sendint(&buf, formats[i], 2);
-			else
-				pq_sendint(&buf, 0, 2);
+			/* No info available, so send zeroes */
+			resorigtbl = 0;
+			resorigcol = 0;
 		}
+
+		if (formats)
+			format = formats[i];
+		else
+			format = 0;
+
+		pq_writestring(buf, NameStr(att->attname));
+		pq_writeint32(buf, resorigtbl);
+		pq_writeint16(buf, resorigcol);
+		pq_writeint32(buf, atttypid);
+		pq_writeint16(buf, att->attlen);
+		pq_writeint32(buf, atttypmod);
+		pq_writeint16(buf, format);
+	}
+}
+
+/*
+ * Send description for each column when using v2 protocol
+ */
+static void
+SendRowDescriptionCols_2(StringInfo buf, TupleDesc typeinfo, List *targetlist, int16 *formats)
+{
+	int			natts = typeinfo->natts;
+	int			i;
+
+	for (i = 0; i < natts; ++i)
+	{
+		Form_pg_attribute att = TupleDescAttr(typeinfo, i);
+		Oid			atttypid = att->atttypid;
+		int32		atttypmod = att->atttypmod;
+
+		/* If column is a domain, send the base type and typmod instead */
+		atttypid = getBaseTypeAndTypmod(atttypid, &atttypmod);
+
+		pq_sendstring(buf, NameStr(att->attname));
+		/* column ID only info appears in protocol 3.0 and up */
+		pq_sendint32(buf, atttypid);
+		pq_sendint16(buf, att->attlen);
+		pq_sendint32(buf, atttypmod);
+		/* format info only appears in protocol 3.0 and up */
 	}
-	pq_endmessage(&buf);
 }
 
 /*
@@ -268,18 +342,19 @@ printtup_prepare_info(DR_printtup *myState, TupleDesc typeinfo, int numAttrs)
 	{
 		PrinttupAttrInfo *thisState = myState->myinfo + i;
 		int16		format = (formats ? formats[i] : 0);
+		Form_pg_attribute attr = TupleDescAttr(typeinfo, i);
 
 		thisState->format = format;
 		if (format == 0)
 		{
-			getTypeOutputInfo(typeinfo->attrs[i]->atttypid,
+			getTypeOutputInfo(attr->atttypid,
 							  &thisState->typoutput,
 							  &thisState->typisvarlena);
 			fmgr_info(thisState->typoutput, &thisState->finfo);
 		}
 		else if (format == 1)
 		{
-			getTypeBinaryOutputInfo(typeinfo->attrs[i]->atttypid,
+			getTypeBinaryOutputInfo(attr->atttypid,
 									&thisState->typsend,
 									&thisState->typisvarlena);
 			fmgr_info(thisState->typsend, &thisState->finfo);
@@ -301,7 +376,7 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 	TupleDesc	typeinfo = slot->tts_tupleDescriptor;
 	DR_printtup *myState = (DR_printtup *) self;
 	MemoryContext oldcontext;
-	StringInfoData buf;
+	StringInfo	buf = &myState->buf;
 	int			natts = typeinfo->natts;
 	int			i;
 
@@ -318,9 +393,9 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 	/*
 	 * Prepare a DataRow message (note buffer is in per-row context)
 	 */
-	pq_beginmessage(&buf, 'D');
+	pq_beginmessage_reuse(buf, 'D');
 
-	pq_sendint(&buf, natts, 2);
+	pq_sendint16(buf, natts);
 
 	/*
 	 * send the attributes of this tuple
@@ -332,7 +407,7 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 
 		if (slot->tts_isnull[i])
 		{
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(buf, -1);
 			continue;
 		}
 
@@ -353,7 +428,7 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 			char	   *outputstr;
 
 			outputstr = OutputFunctionCall(&thisState->finfo, attr);
-			pq_sendcountedtext(&buf, outputstr, strlen(outputstr), false);
+			pq_sendcountedtext(buf, outputstr, strlen(outputstr), false);
 		}
 		else
 		{
@@ -361,13 +436,13 @@ printtup(TupleTableSlot *slot, DestReceiver *self)
 			bytea	   *outputbytes;
 
 			outputbytes = SendFunctionCall(&thisState->finfo, attr);
-			pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
-			pq_sendbytes(&buf, VARDATA(outputbytes),
+			pq_sendint32(buf, VARSIZE(outputbytes) - VARHDRSZ);
+			pq_sendbytes(buf, VARDATA(outputbytes),
 						 VARSIZE(outputbytes) - VARHDRSZ);
 		}
 	}
 
-	pq_endmessage(&buf);
+	pq_endmessage_reuse(buf);
 
 	/* Return to caller's context, and flush row's temporary memory */
 	MemoryContextSwitchTo(oldcontext);
@@ -386,7 +461,7 @@ printtup_20(TupleTableSlot *slot, DestReceiver *self)
 	TupleDesc	typeinfo = slot->tts_tupleDescriptor;
 	DR_printtup *myState = (DR_printtup *) self;
 	MemoryContext oldcontext;
-	StringInfoData buf;
+	StringInfo	buf = &myState->buf;
 	int			natts = typeinfo->natts;
 	int			i,
 				j,
@@ -405,7 +480,7 @@ printtup_20(TupleTableSlot *slot, DestReceiver *self)
 	/*
 	 * tell the frontend to expect new tuple data (in ASCII style)
 	 */
-	pq_beginmessage(&buf, 'D');
+	pq_beginmessage_reuse(buf, 'D');
 
 	/*
 	 * send a bitmap of which attributes are not null
@@ -419,13 +494,13 @@ printtup_20(TupleTableSlot *slot, DestReceiver *self)
 		k >>= 1;
 		if (k == 0)				/* end of byte? */
 		{
-			pq_sendint(&buf, j, 1);
+			pq_sendint8(buf, j);
 			j = 0;
 			k = 1 << 7;
 		}
 	}
 	if (k != (1 << 7))			/* flush last partial byte */
-		pq_sendint(&buf, j, 1);
+		pq_sendint8(buf, j);
 
 	/*
 	 * send the attributes of this tuple
@@ -442,10 +517,10 @@ printtup_20(TupleTableSlot *slot, DestReceiver *self)
 		Assert(thisState->format == 0);
 
 		outputstr = OutputFunctionCall(&thisState->finfo, attr);
-		pq_sendcountedtext(&buf, outputstr, strlen(outputstr), true);
+		pq_sendcountedtext(buf, outputstr, strlen(outputstr), true);
 	}
 
-	pq_endmessage(&buf);
+	pq_endmessage_reuse(buf);
 
 	/* Return to caller's context, and flush row's temporary memory */
 	MemoryContextSwitchTo(oldcontext);
@@ -513,14 +588,13 @@ void
 debugStartup(DestReceiver *self, int operation, TupleDesc typeinfo)
 {
 	int			natts = typeinfo->natts;
-	Form_pg_attribute *attinfo = typeinfo->attrs;
 	int			i;
 
 	/*
 	 * show the return type of the tuples
 	 */
 	for (i = 0; i < natts; ++i)
-		printatt((unsigned) i + 1, attinfo[i], NULL);
+		printatt((unsigned) i + 1, TupleDescAttr(typeinfo, i), NULL);
 	printf("\t----\n");
 }
 
@@ -545,12 +619,12 @@ debugtup(TupleTableSlot *slot, DestReceiver *self)
 		attr = slot_getattr(slot, i + 1, &isnull);
 		if (isnull)
 			continue;
-		getTypeOutputInfo(typeinfo->attrs[i]->atttypid,
+		getTypeOutputInfo(TupleDescAttr(typeinfo, i)->atttypid,
 						  &typoutput, &typisvarlena);
 
 		value = OidOutputFunctionCall(typoutput, attr);
 
-		printatt((unsigned) i + 1, typeinfo->attrs[i], value);
+		printatt((unsigned) i + 1, TupleDescAttr(typeinfo, i), value);
 	}
 	printf("\t----\n");
 
@@ -572,7 +646,7 @@ printtup_internal_20(TupleTableSlot *slot, DestReceiver *self)
 	TupleDesc	typeinfo = slot->tts_tupleDescriptor;
 	DR_printtup *myState = (DR_printtup *) self;
 	MemoryContext oldcontext;
-	StringInfoData buf;
+	StringInfo	buf = &myState->buf;
 	int			natts = typeinfo->natts;
 	int			i,
 				j,
@@ -591,7 +665,7 @@ printtup_internal_20(TupleTableSlot *slot, DestReceiver *self)
 	/*
 	 * tell the frontend to expect new tuple data (in binary style)
 	 */
-	pq_beginmessage(&buf, 'B');
+	pq_beginmessage_reuse(buf, 'B');
 
 	/*
 	 * send a bitmap of which attributes are not null
@@ -605,13 +679,13 @@ printtup_internal_20(TupleTableSlot *slot, DestReceiver *self)
 		k >>= 1;
 		if (k == 0)				/* end of byte? */
 		{
-			pq_sendint(&buf, j, 1);
+			pq_sendint8(buf, j);
 			j = 0;
 			k = 1 << 7;
 		}
 	}
 	if (k != (1 << 7))			/* flush last partial byte */
-		pq_sendint(&buf, j, 1);
+		pq_sendint8(buf, j);
 
 	/*
 	 * send the attributes of this tuple
@@ -628,12 +702,12 @@ printtup_internal_20(TupleTableSlot *slot, DestReceiver *self)
 		Assert(thisState->format == 1);
 
 		outputbytes = SendFunctionCall(&thisState->finfo, attr);
-		pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
-		pq_sendbytes(&buf, VARDATA(outputbytes),
+		pq_sendint32(buf, VARSIZE(outputbytes) - VARHDRSZ);
+		pq_sendbytes(buf, VARDATA(outputbytes),
 					 VARSIZE(outputbytes) - VARHDRSZ);
 	}
 
-	pq_endmessage(&buf);
+	pq_endmessage_reuse(buf);
 
 	/* Return to caller's context, and flush row's temporary memory */
 	MemoryContextSwitchTo(oldcontext);
diff --git a/src/backend/access/common/reloptions.c b/src/backend/access/common/reloptions.c
index ec10762529..46276ceff1 100644
--- a/src/backend/access/common/reloptions.c
+++ b/src/backend/access/common/reloptions.c
@@ -3,7 +3,7 @@
  * reloptions.c
  *	  Core support for relation options (pg_class.reloptions)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,6 +23,7 @@
 #include "access/nbtree.h"
 #include "access/reloptions.h"
 #include "access/spgist.h"
+#include "access/tuptoaster.h"
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "commands/tablespace.h"
@@ -290,6 +291,15 @@ static relopt_int intRelOpts[] =
 		},
 		-1, -1, INT_MAX
 	},
+	{
+		{
+			"toast_tuple_target",
+			"Sets the target tuple length at which external columns will be toasted",
+			RELOPT_KIND_HEAP,
+			ShareUpdateExclusiveLock
+		},
+		TOAST_TUPLE_TARGET, 128, TOAST_TUPLE_TARGET_MAIN
+	},
 	{
 		{
 			"pages_per_range",
@@ -582,7 +592,7 @@ add_reloption(relopt_gen *newoption)
  *		(for types other than string)
  */
 static relopt_gen *
-allocate_reloption(bits32 kinds, int type, char *name, char *desc)
+allocate_reloption(bits32 kinds, int type, const char *name, const char *desc)
 {
 	MemoryContext oldcxt;
 	size_t		size;
@@ -630,7 +640,7 @@ allocate_reloption(bits32 kinds, int type, char *name, char *desc)
  *		Add a new boolean reloption
  */
 void
-add_bool_reloption(bits32 kinds, char *name, char *desc, bool default_val)
+add_bool_reloption(bits32 kinds, const char *name, const char *desc, bool default_val)
 {
 	relopt_bool *newoption;
 
@@ -646,7 +656,7 @@ add_bool_reloption(bits32 kinds, char *name, char *desc, bool default_val)
  *		Add a new integer reloption
  */
 void
-add_int_reloption(bits32 kinds, char *name, char *desc, int default_val,
+add_int_reloption(bits32 kinds, const char *name, const char *desc, int default_val,
 				  int min_val, int max_val)
 {
 	relopt_int *newoption;
@@ -665,7 +675,7 @@ add_int_reloption(bits32 kinds, char *name, char *desc, int default_val,
  *		Add a new float reloption
  */
 void
-add_real_reloption(bits32 kinds, char *name, char *desc, double default_val,
+add_real_reloption(bits32 kinds, const char *name, const char *desc, double default_val,
 				   double min_val, double max_val)
 {
 	relopt_real *newoption;
@@ -689,7 +699,7 @@ add_real_reloption(bits32 kinds, char *name, char *desc, double default_val,
  * the validation.
  */
 void
-add_string_reloption(bits32 kinds, char *name, char *desc, char *default_val,
+add_string_reloption(bits32 kinds, const char *name, const char *desc, const char *default_val,
 					 validate_string_relopt validator)
 {
 	relopt_string *newoption;
@@ -742,7 +752,7 @@ add_string_reloption(bits32 kinds, char *name, char *desc, char *default_val,
  * but we declare them as Datums to avoid including array.h in reloptions.h.
  */
 Datum
-transformRelOptions(Datum oldOptions, List *defList, char *namspace,
+transformRelOptions(Datum oldOptions, List *defList, const char *namspace,
 					char *validnsps[], bool ignoreOids, bool isReset)
 {
 	Datum		result;
@@ -786,12 +796,12 @@ transformRelOptions(Datum oldOptions, List *defList, char *namspace,
 				}
 				else if (def->defnamespace == NULL)
 					continue;
-				else if (pg_strcasecmp(def->defnamespace, namspace) != 0)
+				else if (strcmp(def->defnamespace, namspace) != 0)
 					continue;
 
 				kw_len = strlen(def->defname);
 				if (text_len > kw_len && text_str[kw_len] == '=' &&
-					pg_strncasecmp(text_str, def->defname, kw_len) == 0)
+					strncmp(text_str, def->defname, kw_len) == 0)
 					break;
 			}
 			if (!cell)
@@ -839,8 +849,7 @@ transformRelOptions(Datum oldOptions, List *defList, char *namspace,
 				{
 					for (i = 0; validnsps[i]; i++)
 					{
-						if (pg_strcasecmp(def->defnamespace,
-										  validnsps[i]) == 0)
+						if (strcmp(def->defnamespace, validnsps[i]) == 0)
 						{
 							valid = true;
 							break;
@@ -855,7 +864,7 @@ transformRelOptions(Datum oldOptions, List *defList, char *namspace,
 									def->defnamespace)));
 			}
 
-			if (ignoreOids && pg_strcasecmp(def->defname, "oids") == 0)
+			if (ignoreOids && strcmp(def->defname, "oids") == 0)
 				continue;
 
 			/* ignore if not in the same namespace */
@@ -866,7 +875,7 @@ transformRelOptions(Datum oldOptions, List *defList, char *namspace,
 			}
 			else if (def->defnamespace == NULL)
 				continue;
-			else if (pg_strcasecmp(def->defnamespace, namspace) != 0)
+			else if (strcmp(def->defnamespace, namspace) != 0)
 				continue;
 
 			/*
@@ -983,6 +992,7 @@ extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,
 			options = view_reloptions(datum, false);
 			break;
 		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
 			options = index_reloptions(amoptions, datum, false);
 			break;
 		case RELKIND_FOREIGN_TABLE:
@@ -1071,8 +1081,7 @@ parseRelOptions(Datum options, bool validate, relopt_kind kind,
 				int			kw_len = reloptions[j].gen->namelen;
 
 				if (text_len > kw_len && text_str[kw_len] == '=' &&
-					pg_strncasecmp(text_str, reloptions[j].gen->name,
-								   kw_len) == 0)
+					strncmp(text_str, reloptions[j].gen->name, kw_len) == 0)
 				{
 					parse_one_reloption(&reloptions[j], text_str, text_len,
 										validate);
@@ -1251,7 +1260,7 @@ fillRelOptions(void *rdopts, Size basesize,
 
 		for (j = 0; j < numelems; j++)
 		{
-			if (pg_strcasecmp(options[i].gen->name, elems[j].optname) == 0)
+			if (strcmp(options[i].gen->name, elems[j].optname) == 0)
 			{
 				relopt_string *optstring;
 				char	   *itempos = ((char *) rdopts) + elems[j].offset;
@@ -1344,6 +1353,8 @@ default_reloptions(Datum reloptions, bool validate, relopt_kind kind)
 		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, multixact_freeze_table_age)},
 		{"log_autovacuum_min_duration", RELOPT_TYPE_INT,
 		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, log_min_duration)},
+		{"toast_tuple_target", RELOPT_TYPE_INT,
+		offsetof(StdRdOptions, toast_tuple_target)},
 		{"autovacuum_vacuum_scale_factor", RELOPT_TYPE_REAL,
 		offsetof(StdRdOptions, autovacuum) + offsetof(AutoVacOpts, vacuum_scale_factor)},
 		{"autovacuum_analyze_scale_factor", RELOPT_TYPE_REAL,
@@ -1543,9 +1554,9 @@ AlterTableGetRelOptionsLockLevel(List *defList)
 
 		for (i = 0; relOpts[i]; i++)
 		{
-			if (pg_strncasecmp(relOpts[i]->name,
-							   def->defname,
-							   relOpts[i]->namelen + 1) == 0)
+			if (strncmp(relOpts[i]->name,
+						def->defname,
+						relOpts[i]->namelen + 1) == 0)
 			{
 				if (lockmode < relOpts[i]->lockmode)
 					lockmode = relOpts[i]->lockmode;
diff --git a/src/backend/access/common/scankey.c b/src/backend/access/common/scankey.c
index 13edca1f94..781516c56a 100644
--- a/src/backend/access/common/scankey.c
+++ b/src/backend/access/common/scankey.c
@@ -3,7 +3,7 @@
  * scankey.c
  *	  scan key support code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/common/session.c b/src/backend/access/common/session.c
new file mode 100644
index 0000000000..617c3e1e50
--- /dev/null
+++ b/src/backend/access/common/session.c
@@ -0,0 +1,208 @@
+/*-------------------------------------------------------------------------
+ *
+ * session.c
+ *		Encapsulation of user session.
+ *
+ * This is intended to contain data that needs to be shared between backends
+ * performing work for a client session.  In particular such a session is
+ * shared between the leader and worker processes for parallel queries.  At
+ * some later point it might also become useful infrastructure for separating
+ * backends from client connections, e.g. for the purpose of pooling.
+ *
+ * Currently this infrastructure is used to share:
+ * - typemod registry for ephemeral row-types, i.e. BlessTupleDesc etc.
+ *
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
+ *
+ * src/backend/access/common/session.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/session.h"
+#include "storage/lwlock.h"
+#include "storage/shm_toc.h"
+#include "utils/memutils.h"
+#include "utils/typcache.h"
+
+/* Magic number for per-session DSM TOC. */
+#define SESSION_MAGIC						0xabb0fbc9
+
+/*
+ * We want to create a DSA area to store shared state that has the same
+ * lifetime as a session.  So far, it's only used to hold the shared record
+ * type registry.  We don't want it to have to create any DSM segments just
+ * yet in common cases, so we'll give it enough space to hold a very small
+ * SharedRecordTypmodRegistry.
+ */
+#define SESSION_DSA_SIZE					0x30000
+
+/*
+ * Magic numbers for state sharing in the per-session DSM area.
+ */
+#define SESSION_KEY_DSA						UINT64CONST(0xFFFFFFFFFFFF0001)
+#define SESSION_KEY_RECORD_TYPMOD_REGISTRY	UINT64CONST(0xFFFFFFFFFFFF0002)
+
+/* This backend's current session. */
+Session    *CurrentSession = NULL;
+
+/*
+ * Set up CurrentSession to point to an empty Session object.
+ */
+void
+InitializeSession(void)
+{
+	CurrentSession = MemoryContextAllocZero(TopMemoryContext, sizeof(Session));
+}
+
+/*
+ * Initialize the per-session DSM segment if it isn't already initialized, and
+ * return its handle so that worker processes can attach to it.
+ *
+ * Unlike the per-context DSM segment, this segement and its contents are
+ * reused for future parallel queries.
+ *
+ * Return DSM_HANDLE_INVALID if a segment can't be allocated due to lack of
+ * resources.
+ */
+dsm_handle
+GetSessionDsmHandle(void)
+{
+	shm_toc_estimator estimator;
+	shm_toc    *toc;
+	dsm_segment *seg;
+	size_t		typmod_registry_size;
+	size_t		size;
+	void	   *dsa_space;
+	void	   *typmod_registry_space;
+	dsa_area   *dsa;
+	MemoryContext old_context;
+
+	/*
+	 * If we have already created a session-scope DSM segment in this backend,
+	 * return its handle.  The same segment will be used for the rest of this
+	 * backend's lifetime.
+	 */
+	if (CurrentSession->segment != NULL)
+		return dsm_segment_handle(CurrentSession->segment);
+
+	/* Otherwise, prepare to set one up. */
+	old_context = MemoryContextSwitchTo(TopMemoryContext);
+	shm_toc_initialize_estimator(&estimator);
+
+	/* Estimate space for the per-session DSA area. */
+	shm_toc_estimate_keys(&estimator, 1);
+	shm_toc_estimate_chunk(&estimator, SESSION_DSA_SIZE);
+
+	/* Estimate space for the per-session record typmod registry. */
+	typmod_registry_size = SharedRecordTypmodRegistryEstimate();
+	shm_toc_estimate_keys(&estimator, 1);
+	shm_toc_estimate_chunk(&estimator, typmod_registry_size);
+
+	/* Set up segment and TOC. */
+	size = shm_toc_estimate(&estimator);
+	seg = dsm_create(size, DSM_CREATE_NULL_IF_MAXSEGMENTS);
+	if (seg == NULL)
+	{
+		MemoryContextSwitchTo(old_context);
+
+		return DSM_HANDLE_INVALID;
+	}
+	toc = shm_toc_create(SESSION_MAGIC,
+						 dsm_segment_address(seg),
+						 size);
+
+	/* Create per-session DSA area. */
+	dsa_space = shm_toc_allocate(toc, SESSION_DSA_SIZE);
+	dsa = dsa_create_in_place(dsa_space,
+							  SESSION_DSA_SIZE,
+							  LWTRANCHE_SESSION_DSA,
+							  seg);
+	shm_toc_insert(toc, SESSION_KEY_DSA, dsa_space);
+
+
+	/* Create session-scoped shared record typmod registry. */
+	typmod_registry_space = shm_toc_allocate(toc, typmod_registry_size);
+	SharedRecordTypmodRegistryInit((SharedRecordTypmodRegistry *)
+								   typmod_registry_space, seg, dsa);
+	shm_toc_insert(toc, SESSION_KEY_RECORD_TYPMOD_REGISTRY,
+				   typmod_registry_space);
+
+	/*
+	 * If we got this far, we can pin the shared memory so it stays mapped for
+	 * the rest of this backend's life.  If we don't make it this far, cleanup
+	 * callbacks for anything we installed above (ie currently
+	 * SharedRecordTypemodRegistry) will run when the DSM segment is detached
+	 * by CurrentResourceOwner so we aren't left with a broken CurrentSession.
+	 */
+	dsm_pin_mapping(seg);
+	dsa_pin_mapping(dsa);
+
+	/* Make segment and area available via CurrentSession. */
+	CurrentSession->segment = seg;
+	CurrentSession->area = dsa;
+
+	MemoryContextSwitchTo(old_context);
+
+	return dsm_segment_handle(seg);
+}
+
+/*
+ * Attach to a per-session DSM segment provided by a parallel leader.
+ */
+void
+AttachSession(dsm_handle handle)
+{
+	dsm_segment *seg;
+	shm_toc    *toc;
+	void	   *dsa_space;
+	void	   *typmod_registry_space;
+	dsa_area   *dsa;
+	MemoryContext old_context;
+
+	old_context = MemoryContextSwitchTo(TopMemoryContext);
+
+	/* Attach to the DSM segment. */
+	seg = dsm_attach(handle);
+	if (seg == NULL)
+		elog(ERROR, "could not attach to per-session DSM segment");
+	toc = shm_toc_attach(SESSION_MAGIC, dsm_segment_address(seg));
+
+	/* Attach to the DSA area. */
+	dsa_space = shm_toc_lookup(toc, SESSION_KEY_DSA, false);
+	dsa = dsa_attach_in_place(dsa_space, seg);
+
+	/* Make them available via the current session. */
+	CurrentSession->segment = seg;
+	CurrentSession->area = dsa;
+
+	/* Attach to the shared record typmod registry. */
+	typmod_registry_space =
+		shm_toc_lookup(toc, SESSION_KEY_RECORD_TYPMOD_REGISTRY, false);
+	SharedRecordTypmodRegistryAttach((SharedRecordTypmodRegistry *)
+									 typmod_registry_space);
+
+	/* Remain attached until end of backend or DetachSession(). */
+	dsm_pin_mapping(seg);
+	dsa_pin_mapping(dsa);
+
+	MemoryContextSwitchTo(old_context);
+}
+
+/*
+ * Detach from the current session DSM segment.  It's not strictly necessary
+ * to do this explicitly since we'll detach automatically at backend exit, but
+ * if we ever reuse parallel workers it will become important for workers to
+ * detach from one session before attaching to another.  Note that this runs
+ * detach hooks.
+ */
+void
+DetachSession(void)
+{
+	/* Runs detach hooks. */
+	dsm_detach(CurrentSession->segment);
+	CurrentSession->segment = NULL;
+	dsa_detach(CurrentSession->area);
+	CurrentSession->area = NULL;
+}
diff --git a/src/backend/access/common/tupconvert.c b/src/backend/access/common/tupconvert.c
index 57e44375ea..2d0d2f4b32 100644
--- a/src/backend/access/common/tupconvert.c
+++ b/src/backend/access/common/tupconvert.c
@@ -9,7 +9,7 @@
  * executor's "junkfilter" routines, but these functions work on bare
  * HeapTuples rather than TupleTableSlots.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -84,7 +84,7 @@ convert_tuples_by_position(TupleDesc indesc,
 	same = true;
 	for (i = 0; i < n; i++)
 	{
-		Form_pg_attribute att = outdesc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(outdesc, i);
 		Oid			atttypid;
 		int32		atttypmod;
 
@@ -95,7 +95,7 @@ convert_tuples_by_position(TupleDesc indesc,
 		atttypmod = att->atttypmod;
 		for (; j < indesc->natts; j++)
 		{
-			att = indesc->attrs[j];
+			att = TupleDescAttr(indesc, j);
 			if (att->attisdropped)
 				continue;
 			nincols++;
@@ -122,7 +122,7 @@ convert_tuples_by_position(TupleDesc indesc,
 	/* Check for unused input columns */
 	for (; j < indesc->natts; j++)
 	{
-		if (indesc->attrs[j]->attisdropped)
+		if (TupleDescAttr(indesc, j)->attisdropped)
 			continue;
 		nincols++;
 		same = false;			/* we'll complain below */
@@ -149,6 +149,9 @@ convert_tuples_by_position(TupleDesc indesc,
 	{
 		for (i = 0; i < n; i++)
 		{
+			Form_pg_attribute inatt;
+			Form_pg_attribute outatt;
+
 			if (attrMap[i] == (i + 1))
 				continue;
 
@@ -157,10 +160,12 @@ convert_tuples_by_position(TupleDesc indesc,
 			 * also dropped, we needn't convert.  However, attlen and attalign
 			 * must agree.
 			 */
+			inatt = TupleDescAttr(indesc, i);
+			outatt = TupleDescAttr(outdesc, i);
 			if (attrMap[i] == 0 &&
-				indesc->attrs[i]->attisdropped &&
-				indesc->attrs[i]->attlen == outdesc->attrs[i]->attlen &&
-				indesc->attrs[i]->attalign == outdesc->attrs[i]->attalign)
+				inatt->attisdropped &&
+				inatt->attlen == outatt->attlen &&
+				inatt->attalign == outatt->attalign)
 				continue;
 
 			same = false;
@@ -228,6 +233,9 @@ convert_tuples_by_name(TupleDesc indesc,
 		same = true;
 		for (i = 0; i < n; i++)
 		{
+			Form_pg_attribute inatt;
+			Form_pg_attribute outatt;
+
 			if (attrMap[i] == (i + 1))
 				continue;
 
@@ -236,10 +244,12 @@ convert_tuples_by_name(TupleDesc indesc,
 			 * also dropped, we needn't convert.  However, attlen and attalign
 			 * must agree.
 			 */
+			inatt = TupleDescAttr(indesc, i);
+			outatt = TupleDescAttr(outdesc, i);
 			if (attrMap[i] == 0 &&
-				indesc->attrs[i]->attisdropped &&
-				indesc->attrs[i]->attlen == outdesc->attrs[i]->attlen &&
-				indesc->attrs[i]->attalign == outdesc->attrs[i]->attalign)
+				inatt->attisdropped &&
+				inatt->attlen == outatt->attlen &&
+				inatt->attalign == outatt->attalign)
 				continue;
 
 			same = false;
@@ -292,26 +302,27 @@ convert_tuples_by_name_map(TupleDesc indesc,
 	attrMap = (AttrNumber *) palloc0(n * sizeof(AttrNumber));
 	for (i = 0; i < n; i++)
 	{
-		Form_pg_attribute att = outdesc->attrs[i];
+		Form_pg_attribute outatt = TupleDescAttr(outdesc, i);
 		char	   *attname;
 		Oid			atttypid;
 		int32		atttypmod;
 		int			j;
 
-		if (att->attisdropped)
+		if (outatt->attisdropped)
 			continue;			/* attrMap[i] is already 0 */
-		attname = NameStr(att->attname);
-		atttypid = att->atttypid;
-		atttypmod = att->atttypmod;
+		attname = NameStr(outatt->attname);
+		atttypid = outatt->atttypid;
+		atttypmod = outatt->atttypmod;
 		for (j = 0; j < indesc->natts; j++)
 		{
-			att = indesc->attrs[j];
-			if (att->attisdropped)
+			Form_pg_attribute inatt = TupleDescAttr(indesc, j);
+
+			if (inatt->attisdropped)
 				continue;
-			if (strcmp(attname, NameStr(att->attname)) == 0)
+			if (strcmp(attname, NameStr(inatt->attname)) == 0)
 			{
 				/* Found it, check type */
-				if (atttypid != att->atttypid || atttypmod != att->atttypmod)
+				if (atttypid != inatt->atttypid || atttypmod != inatt->atttypmod)
 					ereport(ERROR,
 							(errcode(ERRCODE_DATATYPE_MISMATCH),
 							 errmsg_internal("%s", _(msg)),
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
index 9fd7b4e019..f1f44230cd 100644
--- a/src/backend/access/common/tupdesc.c
+++ b/src/backend/access/common/tupdesc.c
@@ -3,7 +3,7 @@
  * tupdesc.c
  *	  POSTGRES tuple descriptor support code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -19,6 +19,7 @@
 
 #include "postgres.h"
 
+#include "access/hash.h"
 #include "access/htup_details.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
@@ -26,6 +27,7 @@
 #include "parser/parse_type.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
+#include "utils/hashutils.h"
 #include "utils/resowner_private.h"
 #include "utils/syscache.h"
 
@@ -41,8 +43,6 @@ TupleDesc
 CreateTemplateTupleDesc(int natts, bool hasoid)
 {
 	TupleDesc	desc;
-	char	   *stg;
-	int			attroffset;
 
 	/*
 	 * sanity checks
@@ -51,38 +51,18 @@ CreateTemplateTupleDesc(int natts, bool hasoid)
 
 	/*
 	 * Allocate enough memory for the tuple descriptor, including the
-	 * attribute rows, and set up the attribute row pointers.
+	 * attribute rows.
 	 *
-	 * Note: we assume that sizeof(struct tupleDesc) is a multiple of the
-	 * struct pointer alignment requirement, and hence we don't need to insert
-	 * alignment padding between the struct and the array of attribute row
-	 * pointers.
-	 *
-	 * Note: Only the fixed part of pg_attribute rows is included in tuple
-	 * descriptors, so we only need ATTRIBUTE_FIXED_PART_SIZE space per attr.
-	 * That might need alignment padding, however.
+	 * Note: the attribute array stride is sizeof(FormData_pg_attribute),
+	 * since we declare the array elements as FormData_pg_attribute for
+	 * notational convenience.  However, we only guarantee that the first
+	 * ATTRIBUTE_FIXED_PART_SIZE bytes of each entry are valid; most code that
+	 * copies tupdesc entries around copies just that much.  In principle that
+	 * could be less due to trailing padding, although with the current
+	 * definition of pg_attribute there probably isn't any padding.
 	 */
-	attroffset = sizeof(struct tupleDesc) + natts * sizeof(Form_pg_attribute);
-	attroffset = MAXALIGN(attroffset);
-	stg = palloc(attroffset + natts * MAXALIGN(ATTRIBUTE_FIXED_PART_SIZE));
-	desc = (TupleDesc) stg;
-
-	if (natts > 0)
-	{
-		Form_pg_attribute *attrs;
-		int			i;
-
-		attrs = (Form_pg_attribute *) (stg + sizeof(struct tupleDesc));
-		desc->attrs = attrs;
-		stg += attroffset;
-		for (i = 0; i < natts; i++)
-		{
-			attrs[i] = (Form_pg_attribute) stg;
-			stg += MAXALIGN(ATTRIBUTE_FIXED_PART_SIZE);
-		}
-	}
-	else
-		desc->attrs = NULL;
+	desc = (TupleDesc) palloc(offsetof(struct tupleDesc, attrs) +
+							  natts * sizeof(FormData_pg_attribute));
 
 	/*
 	 * Initialize other fields of the tupdesc.
@@ -99,12 +79,9 @@ CreateTemplateTupleDesc(int natts, bool hasoid)
 
 /*
  * CreateTupleDesc
- *		This function allocates a new TupleDesc pointing to a given
+ *		This function allocates a new TupleDesc by copying a given
  *		Form_pg_attribute array.
  *
- * Note: if the TupleDesc is ever freed, the Form_pg_attribute array
- * will not be freed thereby.
- *
  * Tuple type ID information is initially set for an anonymous record type;
  * caller can overwrite this if needed.
  */
@@ -112,20 +89,12 @@ TupleDesc
 CreateTupleDesc(int natts, bool hasoid, Form_pg_attribute *attrs)
 {
 	TupleDesc	desc;
+	int			i;
 
-	/*
-	 * sanity checks
-	 */
-	AssertArg(natts >= 0);
+	desc = CreateTemplateTupleDesc(natts, hasoid);
 
-	desc = (TupleDesc) palloc(sizeof(struct tupleDesc));
-	desc->attrs = attrs;
-	desc->natts = natts;
-	desc->constr = NULL;
-	desc->tdtypeid = RECORDOID;
-	desc->tdtypmod = -1;
-	desc->tdhasoid = hasoid;
-	desc->tdrefcount = -1;		/* assume not reference-counted */
+	for (i = 0; i < natts; ++i)
+		memcpy(TupleDescAttr(desc, i), attrs[i], ATTRIBUTE_FIXED_PART_SIZE);
 
 	return desc;
 }
@@ -145,14 +114,25 @@ CreateTupleDescCopy(TupleDesc tupdesc)
 
 	desc = CreateTemplateTupleDesc(tupdesc->natts, tupdesc->tdhasoid);
 
+	/* Flat-copy the attribute array */
+	memcpy(TupleDescAttr(desc, 0),
+		   TupleDescAttr(tupdesc, 0),
+		   desc->natts * sizeof(FormData_pg_attribute));
+
+	/*
+	 * Since we're not copying constraints and defaults, clear fields
+	 * associated with them.
+	 */
 	for (i = 0; i < desc->natts; i++)
 	{
-		memcpy(desc->attrs[i], tupdesc->attrs[i], ATTRIBUTE_FIXED_PART_SIZE);
-		desc->attrs[i]->attnotnull = false;
-		desc->attrs[i]->atthasdef = false;
-		desc->attrs[i]->attidentity = '\0';
+		Form_pg_attribute att = TupleDescAttr(desc, i);
+
+		att->attnotnull = false;
+		att->atthasdef = false;
+		att->attidentity = '\0';
 	}
 
+	/* We can copy the tuple type identification, too */
 	desc->tdtypeid = tupdesc->tdtypeid;
 	desc->tdtypmod = tupdesc->tdtypmod;
 
@@ -173,11 +153,12 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)
 
 	desc = CreateTemplateTupleDesc(tupdesc->natts, tupdesc->tdhasoid);
 
-	for (i = 0; i < desc->natts; i++)
-	{
-		memcpy(desc->attrs[i], tupdesc->attrs[i], ATTRIBUTE_FIXED_PART_SIZE);
-	}
+	/* Flat-copy the attribute array */
+	memcpy(TupleDescAttr(desc, 0),
+		   TupleDescAttr(tupdesc, 0),
+		   desc->natts * sizeof(FormData_pg_attribute));
 
+	/* Copy the TupleConstr data structure, if any */
 	if (constr)
 	{
 		TupleConstr *cpy = (TupleConstr *) palloc0(sizeof(TupleConstr));
@@ -213,12 +194,50 @@ CreateTupleDescCopyConstr(TupleDesc tupdesc)
 		desc->constr = cpy;
 	}
 
+	/* We can copy the tuple type identification, too */
 	desc->tdtypeid = tupdesc->tdtypeid;
 	desc->tdtypmod = tupdesc->tdtypmod;
 
 	return desc;
 }
 
+/*
+ * TupleDescCopy
+ *		Copy a tuple descriptor into caller-supplied memory.
+ *		The memory may be shared memory mapped at any address, and must
+ *		be sufficient to hold TupleDescSize(src) bytes.
+ *
+ * !!! Constraints and defaults are not copied !!!
+ */
+void
+TupleDescCopy(TupleDesc dst, TupleDesc src)
+{
+	int			i;
+
+	/* Flat-copy the header and attribute array */
+	memcpy(dst, src, TupleDescSize(src));
+
+	/*
+	 * Since we're not copying constraints and defaults, clear fields
+	 * associated with them.
+	 */
+	for (i = 0; i < dst->natts; i++)
+	{
+		Form_pg_attribute att = TupleDescAttr(dst, i);
+
+		att->attnotnull = false;
+		att->atthasdef = false;
+		att->attidentity = '\0';
+	}
+	dst->constr = NULL;
+
+	/*
+	 * Also, assume the destination is not to be ref-counted.  (Copying the
+	 * source's refcount would be wrong in any case.)
+	 */
+	dst->tdrefcount = -1;
+}
+
 /*
  * TupleDescCopyEntry
  *		This function copies a single attribute structure from one tuple
@@ -230,6 +249,9 @@ void
 TupleDescCopyEntry(TupleDesc dst, AttrNumber dstAttno,
 				   TupleDesc src, AttrNumber srcAttno)
 {
+	Form_pg_attribute dstAtt = TupleDescAttr(dst, dstAttno - 1);
+	Form_pg_attribute srcAtt = TupleDescAttr(src, srcAttno - 1);
+
 	/*
 	 * sanity checks
 	 */
@@ -240,8 +262,7 @@ TupleDescCopyEntry(TupleDesc dst, AttrNumber dstAttno,
 	AssertArg(dstAttno >= 1);
 	AssertArg(dstAttno <= dst->natts);
 
-	memcpy(dst->attrs[dstAttno - 1], src->attrs[srcAttno - 1],
-		   ATTRIBUTE_FIXED_PART_SIZE);
+	memcpy(dstAtt, srcAtt, ATTRIBUTE_FIXED_PART_SIZE);
 
 	/*
 	 * Aside from updating the attno, we'd better reset attcacheoff.
@@ -252,13 +273,13 @@ TupleDescCopyEntry(TupleDesc dst, AttrNumber dstAttno,
 	 * by other uses of this function or TupleDescInitEntry.  So we cheat a
 	 * bit to avoid a useless O(N^2) penalty.
 	 */
-	dst->attrs[dstAttno - 1]->attnum = dstAttno;
-	dst->attrs[dstAttno - 1]->attcacheoff = -1;
+	dstAtt->attnum = dstAttno;
+	dstAtt->attcacheoff = -1;
 
 	/* since we're not copying constraints or defaults, clear these */
-	dst->attrs[dstAttno - 1]->attnotnull = false;
-	dst->attrs[dstAttno - 1]->atthasdef = false;
-	dst->attrs[dstAttno - 1]->attidentity = '\0';
+	dstAtt->attnotnull = false;
+	dstAtt->atthasdef = false;
+	dstAtt->attidentity = '\0';
 }
 
 /*
@@ -366,8 +387,8 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
 
 	for (i = 0; i < tupdesc1->natts; i++)
 	{
-		Form_pg_attribute attr1 = tupdesc1->attrs[i];
-		Form_pg_attribute attr2 = tupdesc2->attrs[i];
+		Form_pg_attribute attr1 = TupleDescAttr(tupdesc1, i);
+		Form_pg_attribute attr2 = TupleDescAttr(tupdesc2, i);
 
 		/*
 		 * We do not need to check every single field here: we can disregard
@@ -478,6 +499,31 @@ equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2)
 	return true;
 }
 
+/*
+ * hashTupleDesc
+ *		Compute a hash value for a tuple descriptor.
+ *
+ * If two tuple descriptors would be considered equal by equalTupleDescs()
+ * then their hash value will be equal according to this function.
+ *
+ * Note that currently contents of constraint are not hashed - it'd be a bit
+ * painful to do so, and conflicts just due to constraints are unlikely.
+ */
+uint32
+hashTupleDesc(TupleDesc desc)
+{
+	uint32		s;
+	int			i;
+
+	s = hash_combine(0, hash_uint32(desc->natts));
+	s = hash_combine(s, hash_uint32(desc->tdtypeid));
+	s = hash_combine(s, hash_uint32(desc->tdhasoid));
+	for (i = 0; i < desc->natts; ++i)
+		s = hash_combine(s, hash_uint32(TupleDescAttr(desc, i)->atttypid));
+
+	return s;
+}
+
 /*
  * TupleDescInitEntry
  *		This function initializes a single attribute structure in
@@ -515,7 +561,7 @@ TupleDescInitEntry(TupleDesc desc,
 	/*
 	 * initialize the attribute fields
 	 */
-	att = desc->attrs[attributeNumber - 1];
+	att = TupleDescAttr(desc, attributeNumber - 1);
 
 	att->attrelid = 0;			/* dummy value */
 
@@ -580,7 +626,7 @@ TupleDescInitBuiltinEntry(TupleDesc desc,
 	AssertArg(attributeNumber <= desc->natts);
 
 	/* initialize the attribute fields */
-	att = desc->attrs[attributeNumber - 1];
+	att = TupleDescAttr(desc, attributeNumber - 1);
 	att->attrelid = 0;			/* dummy value */
 
 	/* unlike TupleDescInitEntry, we require an attribute name */
@@ -664,7 +710,7 @@ TupleDescInitEntryCollation(TupleDesc desc,
 	AssertArg(attributeNumber >= 1);
 	AssertArg(attributeNumber <= desc->natts);
 
-	desc->attrs[attributeNumber - 1]->attcollation = collationid;
+	TupleDescAttr(desc, attributeNumber - 1)->attcollation = collationid;
 }
 
 
@@ -704,6 +750,7 @@ BuildDescForRelation(List *schema)
 	{
 		ColumnDef  *entry = lfirst(l);
 		AclResult	aclresult;
+		Form_pg_attribute att;
 
 		/*
 		 * for each entry in the list, get the name and type information from
@@ -730,17 +777,18 @@ BuildDescForRelation(List *schema)
 
 		TupleDescInitEntry(desc, attnum, attname,
 						   atttypid, atttypmod, attdim);
+		att = TupleDescAttr(desc, attnum - 1);
 
 		/* Override TupleDescInitEntry's settings as requested */
 		TupleDescInitEntryCollation(desc, attnum, attcollation);
 		if (entry->storage)
-			desc->attrs[attnum - 1]->attstorage = entry->storage;
+			att->attstorage = entry->storage;
 
 		/* Fill in additional stuff not handled by TupleDescInitEntry */
-		desc->attrs[attnum - 1]->attnotnull = entry->is_not_null;
+		att->attnotnull = entry->is_not_null;
 		has_not_null |= entry->is_not_null;
-		desc->attrs[attnum - 1]->attislocal = entry->is_local;
-		desc->attrs[attnum - 1]->attinhcount = entry->inhcount;
+		att->attislocal = entry->is_local;
+		att->attinhcount = entry->inhcount;
 	}
 
 	if (has_not_null)
diff --git a/src/backend/access/gin/ginarrayproc.c b/src/backend/access/gin/ginarrayproc.c
index a5238c3af5..d0fa4adf87 100644
--- a/src/backend/access/gin/ginarrayproc.c
+++ b/src/backend/access/gin/ginarrayproc.c
@@ -4,7 +4,7 @@
  *	  support functions for GIN's indexing of any array
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
index b02cb8ae58..37070b3b72 100644
--- a/src/backend/access/gin/ginbtree.c
+++ b/src/backend/access/gin/ginbtree.c
@@ -4,7 +4,7 @@
  *	  page utilities routines for the postgres inverted index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -41,7 +41,7 @@ ginTraverseLock(Buffer buffer, bool searchMode)
 	page = BufferGetPage(buffer);
 	if (GinPageIsLeaf(page))
 	{
-		if (searchMode == FALSE)
+		if (searchMode == false)
 		{
 			/* we should relock our page */
 			LockBuffer(buffer, GIN_UNLOCK);
@@ -107,7 +107,7 @@ ginFindLeafPage(GinBtree btree, bool searchMode, Snapshot snapshot)
 		 * ok, page is correctly locked, we should check to move right ..,
 		 * root never has a right link, so small optimization
 		 */
-		while (btree->fullScan == FALSE && stack->blkno != btree->rootBlkno &&
+		while (btree->fullScan == false && stack->blkno != btree->rootBlkno &&
 			   btree->isMoveRight(btree, page))
 		{
 			BlockNumber rightlink = GinPageGetOpaque(page)->rightlink;
diff --git a/src/backend/access/gin/ginbulk.c b/src/backend/access/gin/ginbulk.c
index 4ff149e59a..989c2a0c02 100644
--- a/src/backend/access/gin/ginbulk.c
+++ b/src/backend/access/gin/ginbulk.c
@@ -4,7 +4,7 @@
  *	  routines for fast build of inverted index
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -52,7 +52,7 @@ ginCombineData(RBNode *existing, const RBNode *newdata, void *arg)
 	}
 
 	/* If item pointers are not ordered, they will need to be sorted later */
-	if (eo->shouldSort == FALSE)
+	if (eo->shouldSort == false)
 	{
 		int			res;
 
@@ -60,7 +60,7 @@ ginCombineData(RBNode *existing, const RBNode *newdata, void *arg)
 		Assert(res != 0);
 
 		if (res > 0)
-			eo->shouldSort = TRUE;
+			eo->shouldSort = true;
 	}
 
 	eo->list[eo->count] = en->list[0];
@@ -127,9 +127,10 @@ ginInitBA(BuildAccumulator *accum)
 static Datum
 getDatumCopy(BuildAccumulator *accum, OffsetNumber attnum, Datum value)
 {
-	Form_pg_attribute att = accum->ginstate->origTupdesc->attrs[attnum - 1];
+	Form_pg_attribute att;
 	Datum		res;
 
+	att = TupleDescAttr(accum->ginstate->origTupdesc, attnum - 1);
 	if (att->attbyval)
 		res = value;
 	else
@@ -175,7 +176,7 @@ ginInsertBAEntry(BuildAccumulator *accum,
 			ea->key = getDatumCopy(accum, attnum, key);
 		ea->maxcount = DEF_NPTR;
 		ea->count = 1;
-		ea->shouldSort = FALSE;
+		ea->shouldSort = false;
 		ea->list =
 			(ItemPointerData *) palloc(sizeof(ItemPointerData) * DEF_NPTR);
 		ea->list[0] = *heapptr;
diff --git a/src/backend/access/gin/gindatapage.c b/src/backend/access/gin/gindatapage.c
index 2e5ea47976..f9daaba52e 100644
--- a/src/backend/access/gin/gindatapage.c
+++ b/src/backend/access/gin/gindatapage.c
@@ -4,7 +4,7 @@
  *	  routines for handling GIN posting tree pages.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -235,9 +235,9 @@ dataIsMoveRight(GinBtree btree, Page page)
 	ItemPointer iptr = GinDataPageGetRightBound(page);
 
 	if (GinPageRightMost(page))
-		return FALSE;
+		return false;
 
-	return (ginCompareItemPointers(&btree->itemptr, iptr) > 0) ? TRUE : FALSE;
+	return (ginCompareItemPointers(&btree->itemptr, iptr) > 0) ? true : false;
 }
 
 /*
@@ -1875,9 +1875,9 @@ ginPrepareDataScan(GinBtree btree, Relation index, BlockNumber rootBlkno)
 	btree->fillRoot = ginDataFillRoot;
 	btree->prepareDownlink = dataPrepareDownlink;
 
-	btree->isData = TRUE;
-	btree->fullScan = FALSE;
-	btree->isBuild = FALSE;
+	btree->isData = true;
+	btree->fullScan = false;
+	btree->isBuild = false;
 }
 
 /*
@@ -1919,9 +1919,9 @@ ginScanBeginPostingTree(GinBtree btree, Relation index, BlockNumber rootBlkno,
 
 	ginPrepareDataScan(btree, index, rootBlkno);
 
-	btree->fullScan = TRUE;
+	btree->fullScan = true;
 
-	stack = ginFindLeafPage(btree, TRUE, snapshot);
+	stack = ginFindLeafPage(btree, true, snapshot);
 
 	return stack;
 }
diff --git a/src/backend/access/gin/ginentrypage.c b/src/backend/access/gin/ginentrypage.c
index d5cc70258a..810769718f 100644
--- a/src/backend/access/gin/ginentrypage.c
+++ b/src/backend/access/gin/ginentrypage.c
@@ -4,7 +4,7 @@
  *	  routines for handling GIN entry tree pages.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -30,7 +30,7 @@ static void entrySplitPage(GinBtree btree, Buffer origbuf,
  * Form a tuple for entry tree.
  *
  * If the tuple would be too big to be stored, function throws a suitable
- * error if errorTooBig is TRUE, or returns NULL if errorTooBig is FALSE.
+ * error if errorTooBig is true, or returns NULL if errorTooBig is false.
  *
  * See src/backend/access/gin/README for a description of the index tuple
  * format that is being built here.  We build on the assumption that we
@@ -249,7 +249,7 @@ entryIsMoveRight(GinBtree btree, Page page)
 	GinNullCategory category;
 
 	if (GinPageRightMost(page))
-		return FALSE;
+		return false;
 
 	itup = getRightMostTuple(page);
 	attnum = gintuple_get_attrnum(btree->ginstate, itup);
@@ -258,9 +258,9 @@ entryIsMoveRight(GinBtree btree, Page page)
 	if (ginCompareAttEntries(btree->ginstate,
 							 btree->entryAttnum, btree->entryKey, btree->entryCategory,
 							 attnum, key, category) > 0)
-		return TRUE;
+		return true;
 
-	return FALSE;
+	return false;
 }
 
 /*
@@ -356,7 +356,7 @@ entryLocateLeafEntry(GinBtree btree, GinBtreeStack *stack)
 	if (btree->fullScan)
 	{
 		stack->off = FirstOffsetNumber;
-		return TRUE;
+		return true;
 	}
 
 	low = FirstOffsetNumber;
@@ -762,9 +762,9 @@ ginPrepareEntryScan(GinBtree btree, OffsetNumber attnum,
 	btree->fillRoot = ginEntryFillRoot;
 	btree->prepareDownlink = entryPrepareDownlink;
 
-	btree->isData = FALSE;
-	btree->fullScan = FALSE;
-	btree->isBuild = FALSE;
+	btree->isData = false;
+	btree->fullScan = false;
+	btree->isBuild = false;
 
 	btree->entryAttnum = attnum;
 	btree->entryKey = key;
diff --git a/src/backend/access/gin/ginfast.c b/src/backend/access/gin/ginfast.c
index 59e435465a..615730b8e5 100644
--- a/src/backend/access/gin/ginfast.c
+++ b/src/backend/access/gin/ginfast.c
@@ -7,7 +7,7 @@
  *	  transfer pending entries into the regular index structure.  This
  *	  wins because bulk insertion is much more efficient than retail.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -396,6 +396,16 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 		MarkBufferDirty(buffer);
 	}
 
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.  (We must do this here because pre-v11 versions of PG did not
+	 * set the metapage's pd_lower correctly, so a pg_upgraded index might
+	 * contain the wrong value.)
+	 */
+	((PageHeader) metapage)->pd_lower =
+		((char *) metadata + sizeof(GinMetaPageData)) - (char *) metapage;
+
 	/*
 	 * Write metabuffer, make xlog entry
 	 */
@@ -407,7 +417,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 
 		memcpy(&data.metadata, metadata, sizeof(GinMetaPageData));
 
-		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 		XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta));
 
 		recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE);
@@ -440,8 +450,12 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
 
 	END_CRIT_SECTION();
 
+	/*
+	 * Since it could contend with concurrent cleanup process we cleanup
+	 * pending list not forcibly.
+	 */
 	if (needCleanup)
-		ginInsertCleanup(ginstate, false, true, NULL);
+		ginInsertCleanup(ginstate, false, true, false, NULL);
 }
 
 /*
@@ -572,6 +586,16 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
 			metadata->nPendingHeapTuples = 0;
 		}
 
+		/*
+		 * Set pd_lower just past the end of the metadata.  This is essential,
+		 * because without doing so, metadata will be lost if xlog.c
+		 * compresses the page.  (We must do this here because pre-v11
+		 * versions of PG did not set the metapage's pd_lower correctly, so a
+		 * pg_upgraded index might contain the wrong value.)
+		 */
+		((PageHeader) metapage)->pd_lower =
+			((char *) metadata + sizeof(GinMetaPageData)) - (char *) metapage;
+
 		MarkBufferDirty(metabuffer);
 
 		for (i = 0; i < data.ndeleted; i++)
@@ -586,7 +610,8 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
 			XLogRecPtr	recptr;
 
 			XLogBeginInsert();
-			XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT);
+			XLogRegisterBuffer(0, metabuffer,
+							   REGBUF_WILL_INIT | REGBUF_STANDARD);
 			for (i = 0; i < data.ndeleted; i++)
 				XLogRegisterBuffer(i + 1, buffers[i], REGBUF_WILL_INIT);
 
@@ -727,7 +752,8 @@ processPendingPage(BuildAccumulator *accum, KeyArray *ka,
  */
 void
 ginInsertCleanup(GinState *ginstate, bool full_clean,
-				 bool fill_fsm, IndexBulkDeleteResult *stats)
+				 bool fill_fsm, bool forceCleanup,
+				 IndexBulkDeleteResult *stats)
 {
 	Relation	index = ginstate->index;
 	Buffer		metabuffer,
@@ -744,7 +770,6 @@ ginInsertCleanup(GinState *ginstate, bool full_clean,
 	bool		cleanupFinish = false;
 	bool		fsm_vac = false;
 	Size		workMemory;
-	bool		inVacuum = (stats == NULL);
 
 	/*
 	 * We would like to prevent concurrent cleanup process. For that we will
@@ -753,7 +778,7 @@ ginInsertCleanup(GinState *ginstate, bool full_clean,
 	 * insertion into pending list
 	 */
 
-	if (inVacuum)
+	if (forceCleanup)
 	{
 		/*
 		 * We are called from [auto]vacuum/analyze or gin_clean_pending_list()
@@ -968,7 +993,6 @@ ginInsertCleanup(GinState *ginstate, bool full_clean,
 	if (fsm_vac && fill_fsm)
 		IndexFreeSpaceMapVacuum(index);
 
-
 	/* Clean up temporary space */
 	MemoryContextSwitchTo(oldCtx);
 	MemoryContextDelete(opCtx);
@@ -1011,12 +1035,12 @@ gin_clean_pending_list(PG_FUNCTION_ARGS)
 
 	/* User must own the index (comparable to privileges needed for VACUUM) */
 	if (!pg_class_ownercheck(indexoid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_INDEX,
 					   RelationGetRelationName(indexRel));
 
 	memset(&stats, 0, sizeof(stats));
 	initGinState(&ginstate, indexRel);
-	ginInsertCleanup(&ginstate, true, true, &stats);
+	ginInsertCleanup(&ginstate, true, true, true, &stats);
 
 	index_close(indexRel, AccessShareLock);
 
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
index 56a5bf47b8..6fe67f346d 100644
--- a/src/backend/access/gin/ginget.c
+++ b/src/backend/access/gin/ginget.c
@@ -4,7 +4,7 @@
  *	  fetch tuples from a GIN scan.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -129,7 +129,7 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack,
 
 	/* Locate tupdesc entry for key column (for attbyval/attlen data) */
 	attnum = scanEntry->attnum;
-	attr = btree->ginstate->origTupdesc->attrs[attnum - 1];
+	attr = TupleDescAttr(btree->ginstate->origTupdesc, attnum - 1);
 
 	for (;;)
 	{
@@ -311,7 +311,7 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 	entry->nlist = 0;
 	entry->matchBitmap = NULL;
 	entry->matchResult = NULL;
-	entry->reduceResult = FALSE;
+	entry->reduceResult = false;
 	entry->predictNumberResult = 0;
 
 	/*
@@ -324,9 +324,9 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 	stackEntry = ginFindLeafPage(&btreeEntry, true, snapshot);
 	page = BufferGetPage(stackEntry->buffer);
 	/* ginFindLeafPage() will have already checked snapshot age. */
-	needUnlock = TRUE;
+	needUnlock = true;
 
-	entry->isFinished = TRUE;
+	entry->isFinished = true;
 
 	if (entry->isPartialMatch ||
 		entry->queryCategory == GIN_CAT_EMPTY_QUERY)
@@ -363,7 +363,7 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 		if (entry->matchBitmap && !tbm_is_empty(entry->matchBitmap))
 		{
 			entry->matchIterator = tbm_begin_iterate(entry->matchBitmap);
-			entry->isFinished = FALSE;
+			entry->isFinished = false;
 		}
 	}
 	else if (btreeEntry.findItem(&btreeEntry, stackEntry))
@@ -385,7 +385,7 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 			 * root of posting tree.
 			 */
 			LockBuffer(stackEntry->buffer, GIN_UNLOCK);
-			needUnlock = FALSE;
+			needUnlock = false;
 
 			stack = ginScanBeginPostingTree(&entry->btree, ginstate->index,
 											rootPostingTree, snapshot);
@@ -410,7 +410,7 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 
 			LockBuffer(entry->buffer, GIN_UNLOCK);
 			freeGinBtreeStack(stack);
-			entry->isFinished = FALSE;
+			entry->isFinished = false;
 		}
 		else if (GinGetNPosting(itup) > 0)
 		{
@@ -418,7 +418,7 @@ startScanEntry(GinState *ginstate, GinScanEntry entry, Snapshot snapshot)
 									   &entry->nlist);
 			entry->predictNumberResult = entry->nlist;
 
-			entry->isFinished = FALSE;
+			entry->isFinished = false;
 		}
 	}
 
@@ -565,7 +565,7 @@ startScan(IndexScanDesc scan)
 			for (i = 0; i < so->totalentries; i++)
 			{
 				so->entries[i]->predictNumberResult /= so->totalentries;
-				so->entries[i]->reduceResult = TRUE;
+				so->entries[i]->reduceResult = true;
 			}
 		}
 	}
@@ -666,7 +666,7 @@ entryLoadMoreItems(GinState *ginstate, GinScanEntry entry,
 			{
 				UnlockReleaseBuffer(entry->buffer);
 				entry->buffer = InvalidBuffer;
-				entry->isFinished = TRUE;
+				entry->isFinished = true;
 				return;
 			}
 
@@ -728,7 +728,7 @@ entryLoadMoreItems(GinState *ginstate, GinScanEntry entry,
 
 /*
  * Sets entry->curItem to next heap item pointer > advancePast, for one entry
- * of one scan key, or sets entry->isFinished to TRUE if there are no more.
+ * of one scan key, or sets entry->isFinished to true if there are no more.
  *
  * Item pointers are returned in ascending order.
  *
@@ -775,7 +775,7 @@ entryGetItem(GinState *ginstate, GinScanEntry entry,
 					ItemPointerSetInvalid(&entry->curItem);
 					tbm_end_iterate(entry->matchIterator);
 					entry->matchIterator = NULL;
-					entry->isFinished = TRUE;
+					entry->isFinished = true;
 					break;
 				}
 
@@ -835,7 +835,7 @@ entryGetItem(GinState *ginstate, GinScanEntry entry,
 						   entry->matchResult->offsets[entry->offset]);
 			entry->offset++;
 			gotitem = true;
-		} while (!gotitem || (entry->reduceResult == TRUE && dropItem(entry)));
+		} while (!gotitem || (entry->reduceResult == true && dropItem(entry)));
 	}
 	else if (!BufferIsValid(entry->buffer))
 	{
@@ -848,7 +848,7 @@ entryGetItem(GinState *ginstate, GinScanEntry entry,
 			if (entry->offset >= entry->nlist)
 			{
 				ItemPointerSetInvalid(&entry->curItem);
-				entry->isFinished = TRUE;
+				entry->isFinished = true;
 				break;
 			}
 
@@ -876,7 +876,7 @@ entryGetItem(GinState *ginstate, GinScanEntry entry,
 			entry->curItem = entry->list[entry->offset++];
 
 		} while (ginCompareItemPointers(&entry->curItem, &advancePast) <= 0 ||
-				 (entry->reduceResult == TRUE && dropItem(entry)));
+				 (entry->reduceResult == true && dropItem(entry)));
 	}
 }
 
@@ -891,7 +891,7 @@ entryGetItem(GinState *ginstate, GinScanEntry entry,
  * iff recheck is needed for this item pointer (including the case where the
  * item pointer is a lossy page pointer).
  *
- * If all entry streams are exhausted, sets key->isFinished to TRUE.
+ * If all entry streams are exhausted, sets key->isFinished to true.
  *
  * Item pointers must be returned in ascending order.
  *
@@ -963,7 +963,7 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key,
 	if (allFinished)
 	{
 		/* all entries are finished */
-		key->isFinished = TRUE;
+		key->isFinished = true;
 		return;
 	}
 
@@ -1051,7 +1051,7 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key,
 	 * them. We could pass them as MAYBE as well, but if we're using the
 	 * "shim" implementation of a tri-state consistent function (see
 	 * ginlogic.c), it's better to pass as few MAYBEs as possible. So pass
-	 * them as TRUE.
+	 * them as true.
 	 *
 	 * Note that only lossy-page entries pointing to the current item's page
 	 * should trigger this processing; we might have future lossy pages in the
@@ -1064,7 +1064,7 @@ keyGetItem(GinState *ginstate, MemoryContext tempCtx, GinScanKey key,
 	for (i = 0; i < key->nentries; i++)
 	{
 		entry = key->scanEntry[i];
-		if (entry->isFinished == FALSE &&
+		if (entry->isFinished == false &&
 			ginCompareItemPointers(&entry->curItem, &curPageLossy) == 0)
 		{
 			if (i < key->nuserentries)
@@ -1314,7 +1314,7 @@ scanGetItem(IndexScanDesc scan, ItemPointerData advancePast,
 		}
 	}
 
-	return TRUE;
+	return true;
 }
 
 
@@ -1508,7 +1508,7 @@ collectMatchesForHeapRow(IndexScanDesc scan, pendingPosition *pos)
 
 		memset(key->entryRes, GIN_FALSE, key->nentries);
 	}
-	memset(pos->hasMatchKey, FALSE, so->nkeys);
+	memset(pos->hasMatchKey, false, so->nkeys);
 
 	/*
 	 * Outer loop iterates over multiple pending-list pages when a single heap
diff --git a/src/backend/access/gin/gininsert.c b/src/backend/access/gin/gininsert.c
index 5378011f50..23f7285547 100644
--- a/src/backend/access/gin/gininsert.c
+++ b/src/backend/access/gin/gininsert.c
@@ -4,7 +4,7 @@
  *	  insert routines for the postgres inverted index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -185,7 +185,7 @@ ginEntryInsert(GinState *ginstate,
 	IndexTuple	itup;
 	Page		page;
 
-	insertdata.isDelete = FALSE;
+	insertdata.isDelete = false;
 
 	/* During index build, count the to-be-inserted entry */
 	if (buildStats)
@@ -221,7 +221,7 @@ ginEntryInsert(GinState *ginstate,
 		itup = addItemPointersToLeafTuple(ginstate, itup,
 										  items, nitem, buildStats);
 
-		insertdata.isDelete = TRUE;
+		insertdata.isDelete = true;
 	}
 	else
 	{
@@ -348,7 +348,7 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 		Page		page;
 
 		XLogBeginInsert();
-		XLogRegisterBuffer(0, MetaBuffer, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, MetaBuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 		XLogRegisterBuffer(1, RootBuffer, REGBUF_WILL_INIT);
 
 		recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_CREATE_INDEX);
@@ -391,7 +391,7 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	 * prefers to receive tuples in TID order.
 	 */
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, false,
-								   ginBuildCallback, (void *) &buildstate);
+								   ginBuildCallback, (void *) &buildstate, NULL);
 
 	/* dump remaining entries to the index */
 	oldCtx = MemoryContextSwitchTo(buildstate.tmpCtx);
@@ -447,7 +447,7 @@ ginbuildempty(Relation index)
 	START_CRIT_SECTION();
 	GinInitMetabuffer(MetaBuffer);
 	MarkBufferDirty(MetaBuffer);
-	log_newpage_buffer(MetaBuffer, false);
+	log_newpage_buffer(MetaBuffer, true);
 	GinInitBuffer(RootBuffer, GIN_LEAF);
 	MarkBufferDirty(RootBuffer);
 	log_newpage_buffer(RootBuffer, false);
diff --git a/src/backend/access/gin/ginlogic.c b/src/backend/access/gin/ginlogic.c
index 5b8ad9a25a..2c42d1aa91 100644
--- a/src/backend/access/gin/ginlogic.c
+++ b/src/backend/access/gin/ginlogic.c
@@ -24,7 +24,7 @@
  * is used for.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gin/ginpostinglist.c b/src/backend/access/gin/ginpostinglist.c
index 8d2d31ac72..54c9caffe3 100644
--- a/src/backend/access/gin/ginpostinglist.c
+++ b/src/backend/access/gin/ginpostinglist.c
@@ -4,7 +4,7 @@
  *	  routines for dealing with posting lists.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gin/ginscan.c b/src/backend/access/gin/ginscan.c
index 7ceea7a741..8ade4311df 100644
--- a/src/backend/access/gin/ginscan.c
+++ b/src/backend/access/gin/ginscan.c
@@ -4,7 +4,7 @@
  *	  routines to manage scans of inverted index relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -295,6 +295,7 @@ ginNewScanKey(IndexScanDesc scan)
 		bool	   *partial_matches = NULL;
 		Pointer    *extra_data = NULL;
 		bool	   *nullFlags = NULL;
+		GinNullCategory *categories;
 		int32		searchMode = GIN_SEARCH_MODE_DEFAULT;
 
 		/*
@@ -346,15 +347,12 @@ ginNewScanKey(IndexScanDesc scan)
 		}
 
 		/*
-		 * If the extractQueryFn didn't create a nullFlags array, create one,
-		 * assuming that everything's non-null.  Otherwise, run through the
-		 * array and make sure each value is exactly 0 or 1; this ensures
-		 * binary compatibility with the GinNullCategory representation. While
-		 * at it, detect whether any null keys are present.
+		 * Create GinNullCategory representation.  If the extractQueryFn
+		 * didn't create a nullFlags array, we assume everything is non-null.
+		 * While at it, detect whether any null keys are present.
 		 */
-		if (nullFlags == NULL)
-			nullFlags = (bool *) palloc0(nQueryValues * sizeof(bool));
-		else
+		categories = (GinNullCategory *) palloc0(nQueryValues * sizeof(GinNullCategory));
+		if (nullFlags)
 		{
 			int32		j;
 
@@ -362,17 +360,16 @@ ginNewScanKey(IndexScanDesc scan)
 			{
 				if (nullFlags[j])
 				{
-					nullFlags[j] = true;	/* not any other nonzero value */
+					categories[j] = GIN_CAT_NULL_KEY;
 					hasNullQuery = true;
 				}
 			}
 		}
-		/* now we can use the nullFlags as category codes */
 
 		ginFillScanKey(so, skey->sk_attno,
 					   skey->sk_strategy, searchMode,
 					   skey->sk_argument, nQueryValues,
-					   queryValues, (GinNullCategory *) nullFlags,
+					   queryValues, categories,
 					   partial_matches, extra_data);
 	}
 
diff --git a/src/backend/access/gin/ginutil.c b/src/backend/access/gin/ginutil.c
index 91e4a8cf70..7bac7a1252 100644
--- a/src/backend/access/gin/ginutil.c
+++ b/src/backend/access/gin/ginutil.c
@@ -4,7 +4,7 @@
  *	  Utility routines for the Postgres inverted index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -96,6 +96,8 @@ initGinState(GinState *state, Relation index)
 
 	for (i = 0; i < origTupdesc->natts; i++)
 	{
+		Form_pg_attribute attr = TupleDescAttr(origTupdesc, i);
+
 		if (state->oneCol)
 			state->tupdesc[i] = state->origTupdesc;
 		else
@@ -105,11 +107,11 @@ initGinState(GinState *state, Relation index)
 			TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 1, NULL,
 							   INT2OID, -1, 0);
 			TupleDescInitEntry(state->tupdesc[i], (AttrNumber) 2, NULL,
-							   origTupdesc->attrs[i]->atttypid,
-							   origTupdesc->attrs[i]->atttypmod,
-							   origTupdesc->attrs[i]->attndims);
+							   attr->atttypid,
+							   attr->atttypmod,
+							   attr->attndims);
 			TupleDescInitEntryCollation(state->tupdesc[i], (AttrNumber) 2,
-										origTupdesc->attrs[i]->attcollation);
+										attr->attcollation);
 		}
 
 		/*
@@ -126,13 +128,13 @@ initGinState(GinState *state, Relation index)
 		{
 			TypeCacheEntry *typentry;
 
-			typentry = lookup_type_cache(origTupdesc->attrs[i]->atttypid,
+			typentry = lookup_type_cache(attr->atttypid,
 										 TYPECACHE_CMP_PROC_FINFO);
 			if (!OidIsValid(typentry->cmp_proc_finfo.fn_oid))
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_FUNCTION),
 						 errmsg("could not identify a comparison function for type %s",
-								format_type_be(origTupdesc->attrs[i]->atttypid))));
+								format_type_be(attr->atttypid))));
 			fmgr_info_copy(&(state->compareFn[i]),
 						   &(typentry->cmp_proc_finfo),
 						   CurrentMemoryContext);
@@ -372,6 +374,14 @@ GinInitMetabuffer(Buffer b)
 	metadata->nDataPages = 0;
 	metadata->nEntries = 0;
 	metadata->ginVersion = GIN_CURRENT_VERSION;
+
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
+	 */
+	((PageHeader) page)->pd_lower =
+		((char *) metadata + sizeof(GinMetaPageData)) - (char *) page;
 }
 
 /*
@@ -519,19 +529,10 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum,
 
 	/*
 	 * If the extractValueFn didn't create a nullFlags array, create one,
-	 * assuming that everything's non-null.  Otherwise, run through the array
-	 * and make sure each value is exactly 0 or 1; this ensures binary
-	 * compatibility with the GinNullCategory representation.
+	 * assuming that everything's non-null.
 	 */
 	if (nullFlags == NULL)
 		nullFlags = (bool *) palloc0(*nentries * sizeof(bool));
-	else
-	{
-		for (i = 0; i < *nentries; i++)
-			nullFlags[i] = (nullFlags[i] ? true : false);
-	}
-	/* now we can use the nullFlags as category codes */
-	*categories = (GinNullCategory *) nullFlags;
 
 	/*
 	 * If there's more than one key, sort and unique-ify.
@@ -590,6 +591,13 @@ ginExtractEntries(GinState *ginstate, OffsetNumber attnum,
 		pfree(keydata);
 	}
 
+	/*
+	 * Create GinNullCategory representation from nullFlags.
+	 */
+	*categories = (GinNullCategory *) palloc0(*nentries * sizeof(GinNullCategory));
+	for (i = 0; i < *nentries; i++)
+		(*categories)[i] = (nullFlags[i] ? GIN_CAT_NULL_KEY : GIN_CAT_NORM_KEY);
+
 	return entries;
 }
 
@@ -674,6 +682,16 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
 	metadata->nDataPages = stats->nDataPages;
 	metadata->nEntries = stats->nEntries;
 
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.  (We must do this here because pre-v11 versions of PG did not
+	 * set the metapage's pd_lower correctly, so a pg_upgraded index might
+	 * contain the wrong value.)
+	 */
+	((PageHeader) metapage)->pd_lower =
+		((char *) metadata + sizeof(GinMetaPageData)) - (char *) metapage;
+
 	MarkBufferDirty(metabuffer);
 
 	if (RelationNeedsWAL(index))
@@ -688,7 +706,7 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
 
 		XLogBeginInsert();
 		XLogRegisterData((char *) &data, sizeof(ginxlogUpdateMeta));
-		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 		recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE);
 		PageSetLSN(metapage, recptr);
diff --git a/src/backend/access/gin/ginvacuum.c b/src/backend/access/gin/ginvacuum.c
index 31425e9963..398532d80b 100644
--- a/src/backend/access/gin/ginvacuum.c
+++ b/src/backend/access/gin/ginvacuum.c
@@ -4,7 +4,7 @@
  *	  delete & vacuum routines for the postgres GIN
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -235,7 +235,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot,
 	DataPageDeleteStack *me;
 	Buffer		buffer;
 	Page		page;
-	bool		meDelete = FALSE;
+	bool		meDelete = false;
 	bool		isempty;
 
 	if (isRoot)
@@ -274,7 +274,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot,
 		{
 			PostingItem *pitem = GinDataPageGetPostingItem(page, i);
 
-			if (ginScanToDelete(gvs, PostingItemGetBlockNumber(pitem), FALSE, me, i))
+			if (ginScanToDelete(gvs, PostingItemGetBlockNumber(pitem), false, me, i))
 				i--;
 		}
 	}
@@ -291,7 +291,7 @@ ginScanToDelete(GinVacuumState *gvs, BlockNumber blkno, bool isRoot,
 		{
 			Assert(!isRoot);
 			ginDeletePage(gvs, blkno, me->leftBlkno, me->parent->blkno, myoff, me->parent->isRoot);
-			meDelete = TRUE;
+			meDelete = true;
 		}
 	}
 
@@ -319,7 +319,7 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 {
 	Buffer		buffer;
 	Page		page;
-	bool		hasVoidPage = FALSE;
+	bool		hasVoidPage = false;
 	MemoryContext oldCxt;
 
 	buffer = ReadBufferExtended(gvs->index, MAIN_FORKNUM, blkno,
@@ -339,7 +339,7 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 
 		/* if root is a leaf page, we don't desire further processing */
 		if (GinDataLeafPageIsEmpty(page))
-			hasVoidPage = TRUE;
+			hasVoidPage = true;
 
 		UnlockReleaseBuffer(buffer);
 
@@ -348,8 +348,8 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 	else
 	{
 		OffsetNumber i;
-		bool		hasEmptyChild = FALSE;
-		bool		hasNonEmptyChild = FALSE;
+		bool		hasEmptyChild = false;
+		bool		hasNonEmptyChild = false;
 		OffsetNumber maxoff = GinPageGetOpaque(page)->maxoff;
 		BlockNumber *children = palloc(sizeof(BlockNumber) * (maxoff + 1));
 
@@ -369,10 +369,10 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 
 		for (i = FirstOffsetNumber; i <= maxoff; i++)
 		{
-			if (ginVacuumPostingTreeLeaves(gvs, children[i], FALSE))
-				hasEmptyChild = TRUE;
+			if (ginVacuumPostingTreeLeaves(gvs, children[i], false))
+				hasEmptyChild = true;
 			else
-				hasNonEmptyChild = TRUE;
+				hasNonEmptyChild = true;
 		}
 
 		pfree(children);
@@ -380,12 +380,12 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 		vacuum_delay_point();
 
 		/*
-		 * All subtree is empty - just return TRUE to indicate that parent
+		 * All subtree is empty - just return true to indicate that parent
 		 * must do a cleanup. Unless we are ROOT an there is way to go upper.
 		 */
 
 		if (hasEmptyChild && !hasNonEmptyChild && !isRoot)
-			return TRUE;
+			return true;
 
 		if (hasEmptyChild)
 		{
@@ -399,9 +399,9 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 
 			memset(&root, 0, sizeof(DataPageDeleteStack));
 			root.leftBlkno = InvalidBlockNumber;
-			root.isRoot = TRUE;
+			root.isRoot = true;
 
-			ginScanToDelete(gvs, blkno, TRUE, &root, InvalidOffsetNumber);
+			ginScanToDelete(gvs, blkno, true, &root, InvalidOffsetNumber);
 
 			ptr = root.child;
 
@@ -416,14 +416,14 @@ ginVacuumPostingTreeLeaves(GinVacuumState *gvs, BlockNumber blkno, bool isRoot)
 		}
 
 		/* Here we have deleted all empty subtrees */
-		return FALSE;
+		return false;
 	}
 }
 
 static void
 ginVacuumPostingTree(GinVacuumState *gvs, BlockNumber rootBlkno)
 {
-	ginVacuumPostingTreeLeaves(gvs, rootBlkno, TRUE);
+	ginVacuumPostingTreeLeaves(gvs, rootBlkno, true);
 }
 
 /*
@@ -570,7 +570,7 @@ ginbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 		 * and cleanup any pending inserts
 		 */
 		ginInsertCleanup(&gvs.ginstate, !IsAutoVacuumWorkerProcess(),
-						 false, stats);
+						 false, true, stats);
 	}
 
 	/* we'll re-count the tuples each time */
@@ -683,7 +683,7 @@ ginvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 		if (IsAutoVacuumWorkerProcess())
 		{
 			initGinState(&ginstate, index);
-			ginInsertCleanup(&ginstate, false, true, stats);
+			ginInsertCleanup(&ginstate, false, true, true, stats);
 		}
 		return stats;
 	}
@@ -697,7 +697,7 @@ ginvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
 		stats = (IndexBulkDeleteResult *) palloc0(sizeof(IndexBulkDeleteResult));
 		initGinState(&ginstate, index);
 		ginInsertCleanup(&ginstate, !IsAutoVacuumWorkerProcess(),
-						 false, stats);
+						 false, true, stats);
 	}
 
 	memset(&idxStat, 0, sizeof(idxStat));
diff --git a/src/backend/access/gin/ginvalidate.c b/src/backend/access/gin/ginvalidate.c
index 4c8e563545..1035be4463 100644
--- a/src/backend/access/gin/ginvalidate.c
+++ b/src/backend/access/gin/ginvalidate.c
@@ -3,7 +3,7 @@
  * ginvalidate.c
  *	  Opclass validator for GIN.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gin/ginxlog.c b/src/backend/access/gin/ginxlog.c
index 7ba04e324f..a6e321d77e 100644
--- a/src/backend/access/gin/ginxlog.c
+++ b/src/backend/access/gin/ginxlog.c
@@ -4,7 +4,7 @@
  *	  WAL replay logic for inverted index.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -514,7 +514,7 @@ ginRedoUpdateMetapage(XLogReaderState *record)
 	Assert(BufferGetBlockNumber(metabuffer) == GIN_METAPAGE_BLKNO);
 	metapage = BufferGetPage(metabuffer);
 
-	GinInitPage(metapage, GIN_META, BufferGetPageSize(metabuffer));
+	GinInitMetabuffer(metabuffer);
 	memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
 	PageSetLSN(metapage, lsn);
 	MarkBufferDirty(metabuffer);
@@ -656,7 +656,7 @@ ginRedoDeleteListPages(XLogReaderState *record)
 	Assert(BufferGetBlockNumber(metabuffer) == GIN_METAPAGE_BLKNO);
 	metapage = BufferGetPage(metabuffer);
 
-	GinInitPage(metapage, GIN_META, BufferGetPageSize(metabuffer));
+	GinInitMetabuffer(metabuffer);
 
 	memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
 	PageSetLSN(metapage, lsn);
@@ -768,26 +768,21 @@ void
 gin_mask(char *pagedata, BlockNumber blkno)
 {
 	Page		page = (Page) pagedata;
+	PageHeader	pagehdr = (PageHeader) page;
 	GinPageOpaque opaque;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 	opaque = GinPageGetOpaque(page);
 
 	mask_page_hint_bits(page);
 
 	/*
-	 * GIN metapage doesn't use pd_lower/pd_upper. Other page types do. Hence,
-	 * we need to apply masking for those pages.
+	 * For a GIN_DELETED page, the page is initialized to empty.  Hence, mask
+	 * the whole page content.  For other pages, mask the hole if pd_lower
+	 * appears to have been set correctly.
 	 */
-	if (opaque->flags != GIN_META)
-	{
-		/*
-		 * For GIN_DELETED page, the page is initialized to empty. Hence, mask
-		 * the page content.
-		 */
-		if (opaque->flags & GIN_DELETED)
-			mask_page_content(page);
-		else
-			mask_unused_space(page);
-	}
+	if (opaque->flags & GIN_DELETED)
+		mask_page_content(page);
+	else if (pagehdr->pd_lower > SizeOfPageHeaderData)
+		mask_unused_space(page);
 }
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
index 565525bbdf..51c32e4afe 100644
--- a/src/backend/access/gist/gist.c
+++ b/src/backend/access/gist/gist.c
@@ -4,7 +4,7 @@
  *	  interface routines for the postgres GiST index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -640,7 +640,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
 		}
 
 		stack->page = (Page) BufferGetPage(stack->buffer);
-		stack->lsn = PageGetLSN(stack->page);
+		stack->lsn = xlocked ?
+			PageGetLSN(stack->page) : BufferGetLSNAtomic(stack->buffer);
 		Assert(!RelationNeedsWAL(state.r) || !XLogRecPtrIsInvalid(stack->lsn));
 
 		/*
@@ -890,7 +891,7 @@ gistFindPath(Relation r, BlockNumber child, OffsetNumber *downlinkoffnum)
 			break;
 		}
 
-		top->lsn = PageGetLSN(page);
+		top->lsn = BufferGetLSNAtomic(buffer);
 
 		/*
 		 * If F_FOLLOW_RIGHT is set, the page to the right doesn't have a
@@ -1364,8 +1365,8 @@ gistSplit(Relation r,
 						IndexTupleSize(itup[0]), GiSTPageSize,
 						RelationGetRelationName(r))));
 
-	memset(v.spl_lisnull, TRUE, sizeof(bool) * giststate->tupdesc->natts);
-	memset(v.spl_risnull, TRUE, sizeof(bool) * giststate->tupdesc->natts);
+	memset(v.spl_lisnull, true, sizeof(bool) * giststate->tupdesc->natts);
+	memset(v.spl_risnull, true, sizeof(bool) * giststate->tupdesc->natts);
 	gistSplitByKey(r, page, itup, len, giststate, &v, 0);
 
 	/* form left and right vector */
@@ -1453,12 +1454,23 @@ initGISTstate(Relation index)
 		fmgr_info_copy(&(giststate->unionFn[i]),
 					   index_getprocinfo(index, i + 1, GIST_UNION_PROC),
 					   scanCxt);
-		fmgr_info_copy(&(giststate->compressFn[i]),
-					   index_getprocinfo(index, i + 1, GIST_COMPRESS_PROC),
-					   scanCxt);
-		fmgr_info_copy(&(giststate->decompressFn[i]),
-					   index_getprocinfo(index, i + 1, GIST_DECOMPRESS_PROC),
-					   scanCxt);
+
+		/* opclasses are not required to provide a Compress method */
+		if (OidIsValid(index_getprocid(index, i + 1, GIST_COMPRESS_PROC)))
+			fmgr_info_copy(&(giststate->compressFn[i]),
+						   index_getprocinfo(index, i + 1, GIST_COMPRESS_PROC),
+						   scanCxt);
+		else
+			giststate->compressFn[i].fn_oid = InvalidOid;
+
+		/* opclasses are not required to provide a Decompress method */
+		if (OidIsValid(index_getprocid(index, i + 1, GIST_DECOMPRESS_PROC)))
+			fmgr_info_copy(&(giststate->decompressFn[i]),
+						   index_getprocinfo(index, i + 1, GIST_DECOMPRESS_PROC),
+						   scanCxt);
+		else
+			giststate->decompressFn[i].fn_oid = InvalidOid;
+
 		fmgr_info_copy(&(giststate->penaltyFn[i]),
 					   index_getprocinfo(index, i + 1, GIST_PENALTY_PROC),
 					   scanCxt);
@@ -1468,6 +1480,7 @@ initGISTstate(Relation index)
 		fmgr_info_copy(&(giststate->equalFn[i]),
 					   index_getprocinfo(index, i + 1, GIST_EQUAL_PROC),
 					   scanCxt);
+
 		/* opclasses are not required to provide a Distance method */
 		if (OidIsValid(index_getprocid(index, i + 1, GIST_DISTANCE_PROC)))
 			fmgr_info_copy(&(giststate->distanceFn[i]),
diff --git a/src/backend/access/gist/gistbuild.c b/src/backend/access/gist/gistbuild.c
index 4756a70ae6..434f15f014 100644
--- a/src/backend/access/gist/gistbuild.c
+++ b/src/backend/access/gist/gistbuild.c
@@ -4,7 +4,7 @@
  *	  build algorithm for GiST indexes implementation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -203,7 +203,7 @@ gistbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 	 * Do the heap scan.
 	 */
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
-								   gistBuildCallback, (void *) &buildstate);
+								   gistBuildCallback, (void *) &buildstate, NULL);
 
 	/*
 	 * If buffering was used, flush out all the tuples that are still in the
@@ -238,7 +238,7 @@ gistbuild(Relation heap, Relation index, IndexInfo *indexInfo)
  * and "auto" values.
  */
 void
-gistValidateBufferingOption(char *value)
+gistValidateBufferingOption(const char *value)
 {
 	if (value == NULL ||
 		(strcmp(value, "on") != 0 &&
@@ -295,10 +295,10 @@ gistInitBuffering(GISTBuildState *buildstate)
 	itupMinSize = (Size) MAXALIGN(sizeof(IndexTupleData));
 	for (i = 0; i < index->rd_att->natts; i++)
 	{
-		if (index->rd_att->attrs[i]->attlen < 0)
+		if (TupleDescAttr(index->rd_att, i)->attlen < 0)
 			itupMinSize += VARHDRSZ;
 		else
-			itupMinSize += index->rd_att->attrs[i]->attlen;
+			itupMinSize += TupleDescAttr(index->rd_att, i)->attlen;
 	}
 
 	/* Calculate average and maximal number of index tuples which fit to page */
diff --git a/src/backend/access/gist/gistbuildbuffers.c b/src/backend/access/gist/gistbuildbuffers.c
index 88cee2028d..97033983e3 100644
--- a/src/backend/access/gist/gistbuildbuffers.c
+++ b/src/backend/access/gist/gistbuildbuffers.c
@@ -4,7 +4,7 @@
  *	  node buffer management functions for GiST buffering build algorithm.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
index 760ea0c997..b30b931c3b 100644
--- a/src/backend/access/gist/gistget.c
+++ b/src/backend/access/gist/gistget.c
@@ -4,7 +4,7 @@
  *	  fetch tuples from a GiST scan.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -61,7 +61,7 @@ gistkillitems(IndexScanDesc scan)
 	 * read. killedItems could be not valid so LP_DEAD hints applying is not
 	 * safe.
 	 */
-	if (PageGetLSN(page) != so->curPageLSN)
+	if (BufferGetLSNAtomic(buffer) != so->curPageLSN)
 	{
 		UnlockReleaseBuffer(buffer);
 		so->numKilled = 0;		/* reset counter */
@@ -197,7 +197,7 @@ gistindex_keytest(IndexScanDesc scan,
 
 			gistdentryinit(giststate, key->sk_attno - 1, &de,
 						   datum, r, page, offset,
-						   FALSE, isNull);
+						   false, isNull);
 
 			/*
 			 * Call the Consistent function to evaluate the test.  The
@@ -258,7 +258,7 @@ gistindex_keytest(IndexScanDesc scan,
 
 			gistdentryinit(giststate, key->sk_attno - 1, &de,
 						   datum, r, page, offset,
-						   FALSE, isNull);
+						   false, isNull);
 
 			/*
 			 * Call the Distance function to evaluate the distance.  The
@@ -384,7 +384,7 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
 	 * safe to apply LP_DEAD hints to the page later. This allows us to drop
 	 * the pin for MVCC scans, which allows vacuum to avoid blocking.
 	 */
-	so->curPageLSN = PageGetLSN(page);
+	so->curPageLSN = BufferGetLSNAtomic(buffer);
 
 	/*
 	 * check all tuples on page
@@ -801,11 +801,13 @@ gistgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
  * Can we do index-only scans on the given index column?
  *
  * Opclasses that implement a fetch function support index-only scans.
+ * Opclasses without compression functions also support index-only scans.
  */
 bool
 gistcanreturn(Relation index, int attno)
 {
-	if (OidIsValid(index_getprocid(index, attno, GIST_FETCH_PROC)))
+	if (OidIsValid(index_getprocid(index, attno, GIST_FETCH_PROC)) ||
+		!OidIsValid(index_getprocid(index, attno, GIST_COMPRESS_PROC)))
 		return true;
 	else
 		return false;
diff --git a/src/backend/access/gist/gistproc.c b/src/backend/access/gist/gistproc.c
index 08990f5a1b..97e6dc9910 100644
--- a/src/backend/access/gist/gistproc.c
+++ b/src/backend/access/gist/gistproc.c
@@ -7,7 +7,7 @@
  * This gives R-tree behavior, with Guttman's poly-time split algorithm.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -105,7 +105,7 @@ box_penalty(const BOX *original, const BOX *new)
  * The GiST Consistent method for boxes
  *
  * Should return false if for all data items x below entry,
- * the predicate x op query must be FALSE, where op is the oper
+ * the predicate x op query must be false, where op is the oper
  * corresponding to strategy in the pg_amop table.
  */
 Datum
@@ -122,7 +122,7 @@ gist_box_consistent(PG_FUNCTION_ARGS)
 	*recheck = false;
 
 	if (DatumGetBoxP(entry->key) == NULL || query == NULL)
-		PG_RETURN_BOOL(FALSE);
+		PG_RETURN_BOOL(false);
 
 	/*
 	 * if entry is not leaf, use rtree_internal_consistent, else use
@@ -185,37 +185,9 @@ gist_box_union(PG_FUNCTION_ARGS)
 }
 
 /*
- * GiST Compress methods for boxes
- *
- * do not do anything.
+ * We store boxes as boxes in GiST indexes, so we do not need
+ * compress, decompress, or fetch functions.
  */
-Datum
-gist_box_compress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
-
-/*
- * GiST DeCompress method for boxes (also used for points, polygons
- * and circles)
- *
- * do not do anything --- we just use the stored box as is.
- */
-Datum
-gist_box_decompress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
-
-/*
- * GiST Fetch method for boxes
- * do not do anything --- we just return the stored box as is.
- */
-Datum
-gist_box_fetch(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_POINTER(PG_GETARG_POINTER(0));
-}
 
 /*
  * The GiST Penalty method for boxes (also used for points)
@@ -1084,7 +1056,7 @@ gist_poly_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
@@ -1109,7 +1081,7 @@ gist_poly_consistent(PG_FUNCTION_ARGS)
 	*recheck = true;
 
 	if (DatumGetBoxP(entry->key) == NULL || query == NULL)
-		PG_RETURN_BOOL(FALSE);
+		PG_RETURN_BOOL(false);
 
 	/*
 	 * Since the operators require recheck anyway, we can just use
@@ -1152,7 +1124,7 @@ gist_circle_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(r),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else
 		retval = entry;
@@ -1178,7 +1150,7 @@ gist_circle_consistent(PG_FUNCTION_ARGS)
 	*recheck = true;
 
 	if (DatumGetBoxP(entry->key) == NULL || query == NULL)
-		PG_RETURN_BOOL(FALSE);
+		PG_RETURN_BOOL(false);
 
 	/*
 	 * Since the operators require recheck anyway, we can just use
@@ -1214,7 +1186,7 @@ gist_point_compress(PG_FUNCTION_ARGS)
 		box->high = box->low = *point;
 
 		gistentryinit(*retval, BoxPGetDatum(box),
-					  entry->rel, entry->page, entry->offset, FALSE);
+					  entry->rel, entry->page, entry->offset, false);
 
 		PG_RETURN_POINTER(retval);
 	}
@@ -1243,7 +1215,7 @@ gist_point_fetch(PG_FUNCTION_ARGS)
 	r->y = in->high.y;
 	gistentryinit(*retval, PointerGetDatum(r),
 				  entry->rel, entry->page,
-				  entry->offset, FALSE);
+				  entry->offset, false);
 
 	PG_RETURN_POINTER(retval);
 }
diff --git a/src/backend/access/gist/gistscan.c b/src/backend/access/gist/gistscan.c
index 058544e2ae..4d97ff1d5d 100644
--- a/src/backend/access/gist/gistscan.c
+++ b/src/backend/access/gist/gistscan.c
@@ -4,7 +4,7 @@
  *	  routines to manage scans on GiST index relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/gist/gistsplit.c b/src/backend/access/gist/gistsplit.c
index 617f42c317..a7038cca67 100644
--- a/src/backend/access/gist/gistsplit.c
+++ b/src/backend/access/gist/gistsplit.c
@@ -15,7 +15,7 @@
  * gistSplitByKey() is the entry point to this file.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -125,7 +125,7 @@ findDontCares(Relation r, GISTSTATE *giststate, GISTENTRY *valvec,
 	 * check for nulls
 	 */
 	gistentryinit(entry, spl->splitVector.spl_rdatum, r, NULL,
-				  (OffsetNumber) 0, FALSE);
+				  (OffsetNumber) 0, false);
 	for (i = 0; i < spl->splitVector.spl_nleft; i++)
 	{
 		int			j = spl->splitVector.spl_left[i];
@@ -141,7 +141,7 @@ findDontCares(Relation r, GISTSTATE *giststate, GISTENTRY *valvec,
 
 	/* And conversely for the right-side tuples */
 	gistentryinit(entry, spl->splitVector.spl_ldatum, r, NULL,
-				  (OffsetNumber) 0, FALSE);
+				  (OffsetNumber) 0, false);
 	for (i = 0; i < spl->splitVector.spl_nright; i++)
 	{
 		int			j = spl->splitVector.spl_right[i];
@@ -177,7 +177,7 @@ removeDontCares(OffsetNumber *a, int *len, const bool *dontcare)
 	{
 		OffsetNumber ai = a[i];
 
-		if (dontcare[ai] == FALSE)
+		if (dontcare[ai] == false)
 		{
 			/* re-emit item into a[] */
 			*curwpos = ai;
@@ -213,10 +213,10 @@ placeOne(Relation r, GISTSTATE *giststate, GistSplitVector *v,
 					rpenalty;
 		GISTENTRY	entry;
 
-		gistentryinit(entry, v->spl_lattr[attno], r, NULL, 0, FALSE);
+		gistentryinit(entry, v->spl_lattr[attno], r, NULL, 0, false);
 		lpenalty = gistpenalty(giststate, attno, &entry, v->spl_lisnull[attno],
 							   identry + attno, isnull[attno]);
-		gistentryinit(entry, v->spl_rattr[attno], r, NULL, 0, FALSE);
+		gistentryinit(entry, v->spl_rattr[attno], r, NULL, 0, false);
 		rpenalty = gistpenalty(giststate, attno, &entry, v->spl_risnull[attno],
 							   identry + attno, isnull[attno]);
 
@@ -265,10 +265,10 @@ supportSecondarySplit(Relation r, GISTSTATE *giststate, int attno,
 				entrySL,
 				entrySR;
 
-	gistentryinit(entryL, oldL, r, NULL, 0, FALSE);
-	gistentryinit(entryR, oldR, r, NULL, 0, FALSE);
-	gistentryinit(entrySL, sv->spl_ldatum, r, NULL, 0, FALSE);
-	gistentryinit(entrySR, sv->spl_rdatum, r, NULL, 0, FALSE);
+	gistentryinit(entryL, oldL, r, NULL, 0, false);
+	gistentryinit(entryR, oldR, r, NULL, 0, false);
+	gistentryinit(entrySL, sv->spl_ldatum, r, NULL, 0, false);
+	gistentryinit(entrySR, sv->spl_rdatum, r, NULL, 0, false);
 
 	if (sv->spl_ldatum_exists && sv->spl_rdatum_exists)
 	{
@@ -320,8 +320,8 @@ supportSecondarySplit(Relation r, GISTSTATE *giststate, int attno,
 		SWAPVAR(sv->spl_left, sv->spl_right, off);
 		SWAPVAR(sv->spl_nleft, sv->spl_nright, noff);
 		SWAPVAR(sv->spl_ldatum, sv->spl_rdatum, datum);
-		gistentryinit(entrySL, sv->spl_ldatum, r, NULL, 0, FALSE);
-		gistentryinit(entrySR, sv->spl_rdatum, r, NULL, 0, FALSE);
+		gistentryinit(entrySL, sv->spl_ldatum, r, NULL, 0, false);
+		gistentryinit(entrySR, sv->spl_rdatum, r, NULL, 0, false);
 	}
 
 	if (sv->spl_ldatum_exists)
@@ -396,20 +396,20 @@ genericPickSplit(GISTSTATE *giststate, GistEntryVector *entryvec, GIST_SPLITVEC
  * Calls user picksplit method for attno column to split tuples into
  * two vectors.
  *
- * Returns FALSE if split is complete (there are no more index columns, or
+ * Returns false if split is complete (there are no more index columns, or
  * there is no need to consider them because split is optimal already).
  *
- * Returns TRUE and v->spl_dontcare = NULL if the picksplit result is
+ * Returns true and v->spl_dontcare = NULL if the picksplit result is
  * degenerate (all tuples seem to be don't-cares), so we should just
  * disregard this column and split on the next column(s) instead.
  *
- * Returns TRUE and v->spl_dontcare != NULL if there are don't-care tuples
+ * Returns true and v->spl_dontcare != NULL if there are don't-care tuples
  * that could be relocated based on the next column(s).  The don't-care
  * tuples have been removed from the split and must be reinserted by caller.
  * There is at least one non-don't-care tuple on each side of the split,
  * and union keys for all columns are updated to include just those tuples.
  *
- * A TRUE result implies there is at least one more index column.
+ * A true result implies there is at least one more index column.
  */
 static bool
 gistUserPicksplit(Relation r, GistEntryVector *entryvec, int attno, GistSplitVector *v,
@@ -610,7 +610,7 @@ gistSplitHalf(GIST_SPLITVEC *v, int len)
  * attno: column we are working on (zero-based index)
  *
  * Outside caller must initialize v->spl_lisnull and v->spl_risnull arrays
- * to all-TRUE.  On return, spl_left/spl_nleft contain indexes of tuples
+ * to all-true.  On return, spl_left/spl_nleft contain indexes of tuples
  * to go left, spl_right/spl_nright contain indexes of tuples to go right,
  * spl_lattr/spl_lisnull contain left-side union key values, and
  * spl_rattr/spl_risnull contain right-side union key values.  Other fields
@@ -643,7 +643,7 @@ gistSplitByKey(Relation r, Page page, IndexTuple *itup, int len,
 							  &IsNull);
 		gistdentryinit(giststate, attno, &(entryvec->vector[i]),
 					   datum, r, page, i,
-					   FALSE, IsNull);
+					   false, IsNull);
 		if (IsNull)
 			offNullTuples[nOffNullTuples++] = i;
 	}
@@ -655,7 +655,7 @@ gistSplitByKey(Relation r, Page page, IndexTuple *itup, int len,
 		 * our attention to the next column.  If there's no next column, just
 		 * split page in half.
 		 */
-		v->spl_risnull[attno] = v->spl_lisnull[attno] = TRUE;
+		v->spl_risnull[attno] = v->spl_lisnull[attno] = true;
 
 		if (attno + 1 < giststate->tupdesc->natts)
 			gistSplitByKey(r, page, itup, len, giststate, v, attno + 1);
@@ -672,7 +672,7 @@ gistSplitByKey(Relation r, Page page, IndexTuple *itup, int len,
 		 */
 		v->splitVector.spl_right = offNullTuples;
 		v->splitVector.spl_nright = nOffNullTuples;
-		v->spl_risnull[attno] = TRUE;
+		v->spl_risnull[attno] = true;
 
 		v->splitVector.spl_left = (OffsetNumber *) palloc(len * sizeof(OffsetNumber));
 		v->splitVector.spl_nleft = 0;
diff --git a/src/backend/access/gist/gistutil.c b/src/backend/access/gist/gistutil.c
index b6ccc1a66a..55cccd247a 100644
--- a/src/backend/access/gist/gistutil.c
+++ b/src/backend/access/gist/gistutil.c
@@ -4,7 +4,7 @@
  *	  utilities routines for the postgres GiST index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -179,7 +179,7 @@ gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len,
 						   evec->vector + evec->n,
 						   datum,
 						   NULL, NULL, (OffsetNumber) 0,
-						   FALSE, IsNull);
+						   false, IsNull);
 			evec->n++;
 		}
 
@@ -187,7 +187,7 @@ gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len,
 		if (evec->n == 0)
 		{
 			attr[i] = (Datum) 0;
-			isnull[i] = TRUE;
+			isnull[i] = true;
 		}
 		else
 		{
@@ -204,7 +204,7 @@ gistMakeUnionItVec(GISTSTATE *giststate, IndexTuple *itvec, int len,
 										PointerGetDatum(evec),
 										PointerGetDatum(&attrsize));
 
-			isnull[i] = FALSE;
+			isnull[i] = false;
 		}
 	}
 }
@@ -246,17 +246,17 @@ gistMakeUnionKey(GISTSTATE *giststate, int attno,
 
 	if (isnull1 && isnull2)
 	{
-		*dstisnull = TRUE;
+		*dstisnull = true;
 		*dst = (Datum) 0;
 	}
 	else
 	{
-		if (isnull1 == FALSE && isnull2 == FALSE)
+		if (isnull1 == false && isnull2 == false)
 		{
 			evec->vector[0] = *entry1;
 			evec->vector[1] = *entry2;
 		}
-		else if (isnull1 == FALSE)
+		else if (isnull1 == false)
 		{
 			evec->vector[0] = *entry1;
 			evec->vector[1] = *entry1;
@@ -267,7 +267,7 @@ gistMakeUnionKey(GISTSTATE *giststate, int attno,
 			evec->vector[1] = *entry2;
 		}
 
-		*dstisnull = FALSE;
+		*dstisnull = false;
 		*dst = FunctionCall2Coll(&giststate->unionFn[attno],
 								 giststate->supportCollation[attno],
 								 PointerGetDatum(evec),
@@ -303,7 +303,7 @@ gistDeCompressAtt(GISTSTATE *giststate, Relation r, IndexTuple tuple, Page p,
 		datum = index_getattr(tuple, i + 1, giststate->tupdesc, &isnull[i]);
 		gistdentryinit(giststate, i, &attdata[i],
 					   datum, r, p, o,
-					   FALSE, isnull[i]);
+					   false, isnull[i]);
 	}
 }
 
@@ -313,7 +313,7 @@ gistDeCompressAtt(GISTSTATE *giststate, Relation r, IndexTuple tuple, Page p,
 IndexTuple
 gistgetadjusted(Relation r, IndexTuple oldtup, IndexTuple addtup, GISTSTATE *giststate)
 {
-	bool		neednew = FALSE;
+	bool		neednew = false;
 	GISTENTRY	oldentries[INDEX_MAX_KEYS],
 				addentries[INDEX_MAX_KEYS];
 	bool		oldisnull[INDEX_MAX_KEYS],
@@ -451,7 +451,7 @@ gistchoose(Relation r, Page p, IndexTuple it,	/* it has compressed entry */
 			/* Compute penalty for this column. */
 			datum = index_getattr(itup, j + 1, giststate->tupdesc, &IsNull);
 			gistdentryinit(giststate, j, &entry, datum, r, p, i,
-						   FALSE, IsNull);
+						   false, IsNull);
 			usize = gistpenalty(giststate, j, &entry, IsNull,
 								&identry[j], isnull[j]);
 			if (usize > 0)
@@ -550,6 +550,11 @@ gistdentryinit(GISTSTATE *giststate, int nkey, GISTENTRY *e,
 		GISTENTRY  *dep;
 
 		gistentryinit(*e, k, r, pg, o, l);
+
+		/* there may not be a decompress function in opclass */
+		if (!OidIsValid(giststate->decompressFn[nkey].fn_oid))
+			return;
+
 		dep = (GISTENTRY *)
 			DatumGetPointer(FunctionCall1Coll(&giststate->decompressFn[nkey],
 											  giststate->supportCollation[nkey],
@@ -585,10 +590,14 @@ gistFormTuple(GISTSTATE *giststate, Relation r,
 
 			gistentryinit(centry, attdata[i], r, NULL, (OffsetNumber) 0,
 						  isleaf);
-			cep = (GISTENTRY *)
-				DatumGetPointer(FunctionCall1Coll(&giststate->compressFn[i],
-												  giststate->supportCollation[i],
-												  PointerGetDatum(&centry)));
+			/* there may not be a compress function in opclass */
+			if (OidIsValid(giststate->compressFn[i].fn_oid))
+				cep = (GISTENTRY *)
+					DatumGetPointer(FunctionCall1Coll(&giststate->compressFn[i],
+													  giststate->supportCollation[i],
+													  PointerGetDatum(&centry)));
+			else
+				cep = &centry;
 			compatt[i] = cep->key;
 		}
 	}
@@ -648,6 +657,17 @@ gistFetchTuple(GISTSTATE *giststate, Relation r, IndexTuple tuple)
 			else
 				fetchatt[i] = (Datum) 0;
 		}
+		else if (giststate->compressFn[i].fn_oid == InvalidOid)
+		{
+			/*
+			 * If opclass does not provide compress method that could change
+			 * original value, att is necessarily stored in original form.
+			 */
+			if (!isnull[i])
+				fetchatt[i] = datum;
+			else
+				fetchatt[i] = (Datum) 0;
+		}
 		else
 		{
 			/*
@@ -671,8 +691,8 @@ gistpenalty(GISTSTATE *giststate, int attno,
 {
 	float		penalty = 0.0;
 
-	if (giststate->penaltyFn[attno].fn_strict == FALSE ||
-		(isNullOrig == FALSE && isNullAdd == FALSE))
+	if (giststate->penaltyFn[attno].fn_strict == false ||
+		(isNullOrig == false && isNullAdd == false))
 	{
 		FunctionCall3Coll(&giststate->penaltyFn[attno],
 						  giststate->supportCollation[attno],
@@ -934,6 +954,20 @@ gistproperty(Oid index_oid, int attno,
 								 ObjectIdGetDatum(opcintype),
 								 ObjectIdGetDatum(opcintype),
 								 Int16GetDatum(procno));
+
+	/*
+	 * Special case: even without a fetch function, AMPROP_RETURNABLE is true
+	 * if the opclass has no compress function.
+	 */
+	if (prop == AMPROP_RETURNABLE && !*res)
+	{
+		*res = !SearchSysCacheExists4(AMPROCNUM,
+									  ObjectIdGetDatum(opfamily),
+									  ObjectIdGetDatum(opcintype),
+									  ObjectIdGetDatum(opcintype),
+									  Int16GetDatum(GIST_COMPRESS_PROC));
+	}
+
 	return true;
 }
 
diff --git a/src/backend/access/gist/gistvacuum.c b/src/backend/access/gist/gistvacuum.c
index 77d9d12f0b..22181c6299 100644
--- a/src/backend/access/gist/gistvacuum.c
+++ b/src/backend/access/gist/gistvacuum.c
@@ -4,7 +4,7 @@
  *	  vacuuming routines for the postgres GiST index access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -249,7 +249,7 @@ gistbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 
 				ptr = (GistBDItem *) palloc(sizeof(GistBDItem));
 				ptr->blkno = ItemPointerGetBlockNumber(&(idxtuple->t_tid));
-				ptr->parentlsn = PageGetLSN(page);
+				ptr->parentlsn = BufferGetLSNAtomic(buffer);
 				ptr->next = stack->next;
 				stack->next = ptr;
 
diff --git a/src/backend/access/gist/gistvalidate.c b/src/backend/access/gist/gistvalidate.c
index 42254c5f15..dd87dad386 100644
--- a/src/backend/access/gist/gistvalidate.c
+++ b/src/backend/access/gist/gistvalidate.c
@@ -3,7 +3,7 @@
  * gistvalidate.c
  *	  Opclass validator for GiST.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -258,7 +258,8 @@ gistvalidate(Oid opclassoid)
 		if (opclassgroup &&
 			(opclassgroup->functionset & (((uint64) 1) << i)) != 0)
 			continue;			/* got it */
-		if (i == GIST_DISTANCE_PROC || i == GIST_FETCH_PROC)
+		if (i == GIST_DISTANCE_PROC || i == GIST_FETCH_PROC ||
+			i == GIST_COMPRESS_PROC || i == GIST_DECOMPRESS_PROC)
 			continue;			/* optional methods */
 		ereport(INFO,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
diff --git a/src/backend/access/gist/gistxlog.c b/src/backend/access/gist/gistxlog.c
index 4f4fe8fab5..1e09126978 100644
--- a/src/backend/access/gist/gistxlog.c
+++ b/src/backend/access/gist/gistxlog.c
@@ -4,7 +4,7 @@
  *	  WAL replay logic for GiST.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -352,14 +352,14 @@ gist_mask(char *pagedata, BlockNumber blkno)
 {
 	Page		page = (Page) pagedata;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 	mask_unused_space(page);
 
 	/*
 	 * NSN is nothing but a special purpose LSN. Hence, mask it for the same
-	 * reason as mask_page_lsn.
+	 * reason as mask_page_lsn_and_checksum.
 	 */
 	GistPageSetNSN(page, (uint64) MASK_MARKER);
 
diff --git a/src/backend/access/hash/README b/src/backend/access/hash/README
index c8a0ec78a9..bb90722778 100644
--- a/src/backend/access/hash/README
+++ b/src/backend/access/hash/README
@@ -259,10 +259,11 @@ The reader algorithm is:
 -- then, per read request:
 	reacquire content lock on current page
 	step to next page if necessary (no chaining of content locks, but keep
-     the pin on the primary bucket throughout the scan; we also maintain
-     a pin on the page currently being scanned)
-	get tuple
-	release content lock
+	the pin on the primary bucket throughout the scan)
+	save all the matching tuples from current index page into an items array
+	release pin and content lock (but if it is primary bucket page retain
+	its pin till the end of the scan)
+	get tuple from an item array
 -- at scan shutdown:
 	release all pins still held
 
@@ -270,15 +271,13 @@ Holding the buffer pin on the primary bucket page for the whole scan prevents
 the reader's current-tuple pointer from being invalidated by splits or
 compactions.  (Of course, other buckets can still be split or compacted.)
 
-To keep concurrency reasonably good, we require readers to cope with
-concurrent insertions, which means that they have to be able to re-find
-their current scan position after re-acquiring the buffer content lock on
-page.  Since deletion is not possible while a reader holds the pin on bucket,
-and we assume that heap tuple TIDs are unique, this can be implemented by
-searching for the same heap tuple TID previously returned.  Insertion does
-not move index entries across pages, so the previously-returned index entry
-should always be on the same page, at the same or higher offset number,
-as it was before.
+To minimize lock/unlock traffic, hash index scan always searches the entire
+hash page to identify all the matching items at once, copying their heap tuple
+IDs into backend-local storage. The heap tuple IDs are then processed while not
+holding any page lock within the index thereby, allowing concurrent insertion
+to happen on the same index page without any requirement of re-finding the
+current scan position for the reader. We do continue to hold a pin on the
+bucket page, to protect against concurrent deletions and bucket split.
 
 To allow for scans during a bucket split, if at the start of the scan, the
 bucket is marked as bucket-being-populated, it scan all the tuples in that
@@ -415,23 +414,43 @@ The fourth operation is garbage collection (bulk deletion):
 
 Note that this is designed to allow concurrent splits and scans.  If a split
 occurs, tuples relocated into the new bucket will be visited twice by the
-scan, but that does no harm.  As we release the lock on bucket page during
-cleanup scan of a bucket, it will allow concurrent scan to start on a bucket
-and ensures that scan will always be behind cleanup.  It is must to keep scans
-behind cleanup, else vacuum could decrease the TIDs that are required to
-complete the scan.  Now, as the scan that returns multiple tuples from the
-same bucket page always expect next valid TID to be greater than or equal to
-the current TID, it might miss the tuples.  This holds true for backward scans
-as well (backward scans first traverse each bucket starting from first bucket
-to last overflow page in the chain).  We must be careful about the statistics
-reported by the VACUUM operation.  What we can do is count the number of
-tuples scanned, and believe this in preference to the stored tuple count if
-the stored tuple count and number of buckets did *not* change at any time
-during the scan.  This provides a way of correcting the stored tuple count if
-it gets out of sync for some reason.  But if a split or insertion does occur
-concurrently, the scan count is untrustworthy; instead, subtract the number of
-tuples deleted from the stored tuple count and use that.
-
+scan, but that does no harm.  See also "Interlocking Between Scans and
+VACUUM", below.
+
+We must be careful about the statistics reported by the VACUUM operation.
+What we can do is count the number of tuples scanned, and believe this in
+preference to the stored tuple count if the stored tuple count and number of
+buckets did *not* change at any time during the scan.  This provides a way of
+correcting the stored tuple count if it gets out of sync for some reason.  But
+if a split or insertion does occur concurrently, the scan count is
+untrustworthy; instead, subtract the number of tuples deleted from the stored
+tuple count and use that.
+
+Interlocking Between Scans and VACUUM
+-------------------------------------
+
+Since we release the lock on bucket page during a cleanup scan of a bucket, a
+concurrent scan could start in that bucket before we've finished vacuuming it.
+If a scan gets ahead of cleanup, we could have the following problem: (1) the
+scan sees heap TIDs that are about to be removed before they are processed by
+VACUUM, (2) the scan decides that one or more of those TIDs are dead, (3)
+VACUUM completes, (4) one or more of the TIDs the scan decided were dead are
+reused for an unrelated tuple, and finally (5) the scan wakes up and
+erroneously kills the new tuple.
+
+Note that this requires VACUUM and a scan to be active in the same bucket at
+the same time.  If VACUUM completes before the scan starts, the scan never has
+a chance to see the dead tuples; if the scan completes before the VACUUM
+starts, the heap TIDs can't have been reused meanwhile.  Furthermore, VACUUM
+can't start on a bucket that has an active scan, because the scan holds a pin
+on the primary bucket page, and VACUUM must take a cleanup lock on that page
+in order to begin cleanup.  Therefore, the only way this problem can occur is
+for a scan to start after VACUUM has released the cleanup lock on the bucket
+but before it has processed the entire bucket and then overtake the cleanup
+operation.
+
+Currently, we prevent this using lock chaining: cleanup locks the next page
+in the chain before releasing the lock and pin on the page just processed.
 
 Free Space Management
 ---------------------
diff --git a/src/backend/access/hash/hash.c b/src/backend/access/hash/hash.c
index d89c192862..e337439ada 100644
--- a/src/backend/access/hash/hash.c
+++ b/src/backend/access/hash/hash.c
@@ -3,7 +3,7 @@
  * hash.c
  *	  Implementation of Margo Seltzer's Hashing package for postgres.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -159,7 +159,7 @@ hashbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 
 	/* do the heap scan */
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
-								   hashbuildCallback, (void *) &buildstate);
+								   hashbuildCallback, (void *) &buildstate, NULL);
 
 	if (buildstate.spool)
 	{
@@ -268,65 +268,20 @@ bool
 hashgettuple(IndexScanDesc scan, ScanDirection dir)
 {
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
-	Relation	rel = scan->indexRelation;
-	Buffer		buf;
-	Page		page;
-	OffsetNumber offnum;
-	ItemPointer current;
 	bool		res;
 
 	/* Hash indexes are always lossy since we store only the hash code */
 	scan->xs_recheck = true;
 
-	/*
-	 * We hold pin but not lock on current buffer while outside the hash AM.
-	 * Reacquire the read lock here.
-	 */
-	if (BufferIsValid(so->hashso_curbuf))
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_SHARE);
-
 	/*
 	 * If we've already initialized this scan, we can just advance it in the
 	 * appropriate direction.  If we haven't done so yet, we call a routine to
 	 * get the first item in the scan.
 	 */
-	current = &(so->hashso_curpos);
-	if (ItemPointerIsValid(current))
+	if (!HashScanPosIsValid(so->currPos))
+		res = _hash_first(scan, dir);
+	else
 	{
-		/*
-		 * An insertion into the current index page could have happened while
-		 * we didn't have read lock on it.  Re-find our position by looking
-		 * for the TID we previously returned.  (Because we hold a pin on the
-		 * primary bucket page, no deletions or splits could have occurred;
-		 * therefore we can expect that the TID still exists in the current
-		 * index page, at an offset >= where we were.)
-		 */
-		OffsetNumber maxoffnum;
-
-		buf = so->hashso_curbuf;
-		Assert(BufferIsValid(buf));
-		page = BufferGetPage(buf);
-
-		/*
-		 * We don't need test for old snapshot here as the current buffer is
-		 * pinned, so vacuum can't clean the page.
-		 */
-		maxoffnum = PageGetMaxOffsetNumber(page);
-		for (offnum = ItemPointerGetOffsetNumber(current);
-			 offnum <= maxoffnum;
-			 offnum = OffsetNumberNext(offnum))
-		{
-			IndexTuple	itup;
-
-			itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-			if (ItemPointerEquals(&(so->hashso_heappos), &(itup->t_tid)))
-				break;
-		}
-		if (offnum > maxoffnum)
-			elog(ERROR, "failed to re-find scan position within index \"%s\"",
-				 RelationGetRelationName(rel));
-		ItemPointerSetOffsetNumber(current, offnum);
-
 		/*
 		 * Check to see if we should kill the previously-fetched tuple.
 		 */
@@ -341,16 +296,11 @@ hashgettuple(IndexScanDesc scan, ScanDirection dir)
 			 * entries.
 			 */
 			if (so->killedItems == NULL)
-				so->killedItems = palloc(MaxIndexTuplesPerPage *
-										 sizeof(HashScanPosItem));
+				so->killedItems = (int *)
+					palloc(MaxIndexTuplesPerPage * sizeof(int));
 
 			if (so->numKilled < MaxIndexTuplesPerPage)
-			{
-				so->killedItems[so->numKilled].heapTid = so->hashso_heappos;
-				so->killedItems[so->numKilled].indexOffset =
-					ItemPointerGetOffsetNumber(&(so->hashso_curpos));
-				so->numKilled++;
-			}
+				so->killedItems[so->numKilled++] = so->currPos.itemIndex;
 		}
 
 		/*
@@ -358,30 +308,6 @@ hashgettuple(IndexScanDesc scan, ScanDirection dir)
 		 */
 		res = _hash_next(scan, dir);
 	}
-	else
-		res = _hash_first(scan, dir);
-
-	/*
-	 * Skip killed tuples if asked to.
-	 */
-	if (scan->ignore_killed_tuples)
-	{
-		while (res)
-		{
-			offnum = ItemPointerGetOffsetNumber(current);
-			page = BufferGetPage(so->hashso_curbuf);
-			if (!ItemIdIsDead(PageGetItemId(page, offnum)))
-				break;
-			res = _hash_next(scan, dir);
-		}
-	}
-
-	/* Release read lock on current buffer, but keep it pinned */
-	if (BufferIsValid(so->hashso_curbuf))
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_UNLOCK);
-
-	/* Return current heap TID on success */
-	scan->xs_ctup.t_self = so->hashso_heappos;
 
 	return res;
 }
@@ -396,35 +322,21 @@ hashgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
 	bool		res;
 	int64		ntids = 0;
+	HashScanPosItem *currItem;
 
 	res = _hash_first(scan, ForwardScanDirection);
 
 	while (res)
 	{
-		bool		add_tuple;
+		currItem = &so->currPos.items[so->currPos.itemIndex];
 
 		/*
-		 * Skip killed tuples if asked to.
+		 * _hash_first and _hash_next handle eliminate dead index entries
+		 * whenever scan->ignored_killed_tuples is true.  Therefore, there's
+		 * nothing to do here except add the results to the TIDBitmap.
 		 */
-		if (scan->ignore_killed_tuples)
-		{
-			Page		page;
-			OffsetNumber offnum;
-
-			offnum = ItemPointerGetOffsetNumber(&(so->hashso_curpos));
-			page = BufferGetPage(so->hashso_curbuf);
-			add_tuple = !ItemIdIsDead(PageGetItemId(page, offnum));
-		}
-		else
-			add_tuple = true;
-
-		/* Save tuple ID, and continue scanning */
-		if (add_tuple)
-		{
-			/* Note we mark the tuple ID as requiring recheck */
-			tbm_add_tuples(tbm, &(so->hashso_heappos), 1, true);
-			ntids++;
-		}
+		tbm_add_tuples(tbm, &(currItem->heapTid), 1, true);
+		ntids++;
 
 		res = _hash_next(scan, ForwardScanDirection);
 	}
@@ -448,12 +360,9 @@ hashbeginscan(Relation rel, int nkeys, int norderbys)
 	scan = RelationGetIndexScan(rel, nkeys, norderbys);
 
 	so = (HashScanOpaque) palloc(sizeof(HashScanOpaqueData));
-	so->hashso_curbuf = InvalidBuffer;
+	HashScanPosInvalidate(so->currPos);
 	so->hashso_bucket_buf = InvalidBuffer;
 	so->hashso_split_bucket_buf = InvalidBuffer;
-	/* set position invalid (this will cause _hash_first call) */
-	ItemPointerSetInvalid(&(so->hashso_curpos));
-	ItemPointerSetInvalid(&(so->hashso_heappos));
 
 	so->hashso_buc_populated = false;
 	so->hashso_buc_split = false;
@@ -476,22 +385,17 @@ hashrescan(IndexScanDesc scan, ScanKey scankey, int nscankeys,
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
 	Relation	rel = scan->indexRelation;
 
-	/*
-	 * Before leaving current page, deal with any killed items. Also, ensure
-	 * that we acquire lock on current page before calling _hash_kill_items.
-	 */
-	if (so->numKilled > 0)
+	if (HashScanPosIsValid(so->currPos))
 	{
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_SHARE);
-		_hash_kill_items(scan);
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_UNLOCK);
+		/* Before leaving current page, deal with any killed items */
+		if (so->numKilled > 0)
+			_hash_kill_items(scan);
 	}
 
 	_hash_dropscanbuf(rel, so);
 
 	/* set position invalid (this will cause _hash_first call) */
-	ItemPointerSetInvalid(&(so->hashso_curpos));
-	ItemPointerSetInvalid(&(so->hashso_heappos));
+	HashScanPosInvalidate(so->currPos);
 
 	/* Update scan key, if a new one is given */
 	if (scankey && scan->numberOfKeys > 0)
@@ -514,15 +418,11 @@ hashendscan(IndexScanDesc scan)
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
 	Relation	rel = scan->indexRelation;
 
-	/*
-	 * Before leaving current page, deal with any killed items. Also, ensure
-	 * that we acquire lock on current page before calling _hash_kill_items.
-	 */
-	if (so->numKilled > 0)
+	if (HashScanPosIsValid(so->currPos))
 	{
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_SHARE);
-		_hash_kill_items(scan);
-		LockBuffer(so->hashso_curbuf, BUFFER_LOCK_UNLOCK);
+		/* Before leaving current page, deal with any killed items */
+		if (so->numKilled > 0)
+			_hash_kill_items(scan);
 	}
 
 	_hash_dropscanbuf(rel, so);
@@ -755,16 +655,15 @@ hashvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
  * primary bucket page.  The lock won't necessarily be held continuously,
  * though, because we'll release it when visiting overflow pages.
  *
- * It would be very bad if this function cleaned a page while some other
- * backend was in the midst of scanning it, because hashgettuple assumes
- * that the next valid TID will be greater than or equal to the current
- * valid TID.  There can't be any concurrent scans in progress when we first
- * enter this function because of the cleanup lock we hold on the primary
- * bucket page, but as soon as we release that lock, there might be.  We
- * handle that by conspiring to prevent those scans from passing our cleanup
- * scan.  To do that, we lock the next page in the bucket chain before
- * releasing the lock on the previous page.  (This type of lock chaining is
- * not ideal, so we might want to look for a better solution at some point.)
+ * There can't be any concurrent scans in progress when we first enter this
+ * function because of the cleanup lock we hold on the primary bucket page,
+ * but as soon as we release that lock, there might be.  If those scans got
+ * ahead of our cleanup scan, they might see a tuple before we kill it and
+ * wake up only after VACUUM has completed and the TID has been recycled for
+ * an unrelated tuple.  To avoid that calamity, we prevent scans from passing
+ * our cleanup scan by locking the next page in the bucket chain before
+ * releasing the lock on the previous page.  (This type of lock chaining is not
+ * ideal, so we might want to look for a better solution at some point.)
  *
  * We need to retain a pin on the primary bucket to ensure that no concurrent
  * split can start.
diff --git a/src/backend/access/hash/hash_xlog.c b/src/backend/access/hash/hash_xlog.c
index 67a856c142..b38208e61d 100644
--- a/src/backend/access/hash/hash_xlog.c
+++ b/src/backend/access/hash/hash_xlog.c
@@ -4,7 +4,7 @@
  *	  WAL replay logic for hash index.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -1263,7 +1263,7 @@ hash_mask(char *pagedata, BlockNumber blkno)
 	HashPageOpaque opaque;
 	int			pagetype;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 	mask_unused_space(page);
diff --git a/src/backend/access/hash/hashfunc.c b/src/backend/access/hash/hashfunc.c
index a127f3f8b1..1aa0b25d38 100644
--- a/src/backend/access/hash/hashfunc.c
+++ b/src/backend/access/hash/hashfunc.c
@@ -3,7 +3,7 @@
  * hashfunc.c
  *	  Support functions for hash access method.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -46,18 +46,36 @@ hashchar(PG_FUNCTION_ARGS)
 	return hash_uint32((int32) PG_GETARG_CHAR(0));
 }
 
+Datum
+hashcharextended(PG_FUNCTION_ARGS)
+{
+	return hash_uint32_extended((int32) PG_GETARG_CHAR(0), PG_GETARG_INT64(1));
+}
+
 Datum
 hashint2(PG_FUNCTION_ARGS)
 {
 	return hash_uint32((int32) PG_GETARG_INT16(0));
 }
 
+Datum
+hashint2extended(PG_FUNCTION_ARGS)
+{
+	return hash_uint32_extended((int32) PG_GETARG_INT16(0), PG_GETARG_INT64(1));
+}
+
 Datum
 hashint4(PG_FUNCTION_ARGS)
 {
 	return hash_uint32(PG_GETARG_INT32(0));
 }
 
+Datum
+hashint4extended(PG_FUNCTION_ARGS)
+{
+	return hash_uint32_extended(PG_GETARG_INT32(0), PG_GETARG_INT64(1));
+}
+
 Datum
 hashint8(PG_FUNCTION_ARGS)
 {
@@ -78,18 +96,43 @@ hashint8(PG_FUNCTION_ARGS)
 	return hash_uint32(lohalf);
 }
 
+Datum
+hashint8extended(PG_FUNCTION_ARGS)
+{
+	/* Same approach as hashint8 */
+	int64		val = PG_GETARG_INT64(0);
+	uint32		lohalf = (uint32) val;
+	uint32		hihalf = (uint32) (val >> 32);
+
+	lohalf ^= (val >= 0) ? hihalf : ~hihalf;
+
+	return hash_uint32_extended(lohalf, PG_GETARG_INT64(1));
+}
+
 Datum
 hashoid(PG_FUNCTION_ARGS)
 {
 	return hash_uint32((uint32) PG_GETARG_OID(0));
 }
 
+Datum
+hashoidextended(PG_FUNCTION_ARGS)
+{
+	return hash_uint32_extended((uint32) PG_GETARG_OID(0), PG_GETARG_INT64(1));
+}
+
 Datum
 hashenum(PG_FUNCTION_ARGS)
 {
 	return hash_uint32((uint32) PG_GETARG_OID(0));
 }
 
+Datum
+hashenumextended(PG_FUNCTION_ARGS)
+{
+	return hash_uint32_extended((uint32) PG_GETARG_OID(0), PG_GETARG_INT64(1));
+}
+
 Datum
 hashfloat4(PG_FUNCTION_ARGS)
 {
@@ -116,6 +159,21 @@ hashfloat4(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) &key8, sizeof(key8));
 }
 
+Datum
+hashfloat4extended(PG_FUNCTION_ARGS)
+{
+	float4		key = PG_GETARG_FLOAT4(0);
+	uint64		seed = PG_GETARG_INT64(1);
+	float8		key8;
+
+	/* Same approach as hashfloat4 */
+	if (key == (float4) 0)
+		PG_RETURN_UINT64(seed);
+	key8 = key;
+
+	return hash_any_extended((unsigned char *) &key8, sizeof(key8), seed);
+}
+
 Datum
 hashfloat8(PG_FUNCTION_ARGS)
 {
@@ -132,6 +190,19 @@ hashfloat8(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) &key, sizeof(key));
 }
 
+Datum
+hashfloat8extended(PG_FUNCTION_ARGS)
+{
+	float8		key = PG_GETARG_FLOAT8(0);
+	uint64		seed = PG_GETARG_INT64(1);
+
+	/* Same approach as hashfloat8 */
+	if (key == (float8) 0)
+		PG_RETURN_UINT64(seed);
+
+	return hash_any_extended((unsigned char *) &key, sizeof(key), seed);
+}
+
 Datum
 hashoidvector(PG_FUNCTION_ARGS)
 {
@@ -140,6 +211,16 @@ hashoidvector(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) key->values, key->dim1 * sizeof(Oid));
 }
 
+Datum
+hashoidvectorextended(PG_FUNCTION_ARGS)
+{
+	oidvector  *key = (oidvector *) PG_GETARG_POINTER(0);
+
+	return hash_any_extended((unsigned char *) key->values,
+							 key->dim1 * sizeof(Oid),
+							 PG_GETARG_INT64(1));
+}
+
 Datum
 hashname(PG_FUNCTION_ARGS)
 {
@@ -148,6 +229,15 @@ hashname(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) key, strlen(key));
 }
 
+Datum
+hashnameextended(PG_FUNCTION_ARGS)
+{
+	char	   *key = NameStr(*PG_GETARG_NAME(0));
+
+	return hash_any_extended((unsigned char *) key, strlen(key),
+							 PG_GETARG_INT64(1));
+}
+
 Datum
 hashtext(PG_FUNCTION_ARGS)
 {
@@ -168,6 +258,22 @@ hashtext(PG_FUNCTION_ARGS)
 	return result;
 }
 
+Datum
+hashtextextended(PG_FUNCTION_ARGS)
+{
+	text	   *key = PG_GETARG_TEXT_PP(0);
+	Datum		result;
+
+	/* Same approach as hashtext */
+	result = hash_any_extended((unsigned char *) VARDATA_ANY(key),
+							   VARSIZE_ANY_EXHDR(key),
+							   PG_GETARG_INT64(1));
+
+	PG_FREE_IF_COPY(key, 0);
+
+	return result;
+}
+
 /*
  * hashvarlena() can be used for any varlena datatype in which there are
  * no non-significant bits, ie, distinct bitpatterns never compare as equal.
@@ -187,6 +293,21 @@ hashvarlena(PG_FUNCTION_ARGS)
 	return result;
 }
 
+Datum
+hashvarlenaextended(PG_FUNCTION_ARGS)
+{
+	struct varlena *key = PG_GETARG_VARLENA_PP(0);
+	Datum		result;
+
+	result = hash_any_extended((unsigned char *) VARDATA_ANY(key),
+							   VARSIZE_ANY_EXHDR(key),
+							   PG_GETARG_INT64(1));
+
+	PG_FREE_IF_COPY(key, 0);
+
+	return result;
+}
+
 /*
  * This hash function was written by Bob Jenkins
  * (bob_jenkins@burtleburtle.net), and superficially adapted
@@ -502,7 +623,227 @@ hash_any(register const unsigned char *k, register int keylen)
 }
 
 /*
- * hash_uint32() -- hash a 32-bit value
+ * hash_any_extended() -- hash into a 64-bit value, using an optional seed
+ *		k		: the key (the unaligned variable-length array of bytes)
+ *		len		: the length of the key, counting by bytes
+ *		seed	: a 64-bit seed (0 means no seed)
+ *
+ * Returns a uint64 value.  Otherwise similar to hash_any.
+ */
+Datum
+hash_any_extended(register const unsigned char *k, register int keylen,
+				  uint64 seed)
+{
+	register uint32 a,
+				b,
+				c,
+				len;
+
+	/* Set up the internal state */
+	len = keylen;
+	a = b = c = 0x9e3779b9 + len + 3923095;
+
+	/* If the seed is non-zero, use it to perturb the internal state. */
+	if (seed != 0)
+	{
+		/*
+		 * In essence, the seed is treated as part of the data being hashed,
+		 * but for simplicity, we pretend that it's padded with four bytes of
+		 * zeroes so that the seed constitutes a 12-byte chunk.
+		 */
+		a += (uint32) (seed >> 32);
+		b += (uint32) seed;
+		mix(a, b, c);
+	}
+
+	/* If the source pointer is word-aligned, we use word-wide fetches */
+	if (((uintptr_t) k & UINT32_ALIGN_MASK) == 0)
+	{
+		/* Code path for aligned source data */
+		register const uint32 *ka = (const uint32 *) k;
+
+		/* handle most of the key */
+		while (len >= 12)
+		{
+			a += ka[0];
+			b += ka[1];
+			c += ka[2];
+			mix(a, b, c);
+			ka += 3;
+			len -= 12;
+		}
+
+		/* handle the last 11 bytes */
+		k = (const unsigned char *) ka;
+#ifdef WORDS_BIGENDIAN
+		switch (len)
+		{
+			case 11:
+				c += ((uint32) k[10] << 8);
+				/* fall through */
+			case 10:
+				c += ((uint32) k[9] << 16);
+				/* fall through */
+			case 9:
+				c += ((uint32) k[8] << 24);
+				/* the lowest byte of c is reserved for the length */
+				/* fall through */
+			case 8:
+				b += ka[1];
+				a += ka[0];
+				break;
+			case 7:
+				b += ((uint32) k[6] << 8);
+				/* fall through */
+			case 6:
+				b += ((uint32) k[5] << 16);
+				/* fall through */
+			case 5:
+				b += ((uint32) k[4] << 24);
+				/* fall through */
+			case 4:
+				a += ka[0];
+				break;
+			case 3:
+				a += ((uint32) k[2] << 8);
+				/* fall through */
+			case 2:
+				a += ((uint32) k[1] << 16);
+				/* fall through */
+			case 1:
+				a += ((uint32) k[0] << 24);
+				/* case 0: nothing left to add */
+		}
+#else							/* !WORDS_BIGENDIAN */
+		switch (len)
+		{
+			case 11:
+				c += ((uint32) k[10] << 24);
+				/* fall through */
+			case 10:
+				c += ((uint32) k[9] << 16);
+				/* fall through */
+			case 9:
+				c += ((uint32) k[8] << 8);
+				/* the lowest byte of c is reserved for the length */
+				/* fall through */
+			case 8:
+				b += ka[1];
+				a += ka[0];
+				break;
+			case 7:
+				b += ((uint32) k[6] << 16);
+				/* fall through */
+			case 6:
+				b += ((uint32) k[5] << 8);
+				/* fall through */
+			case 5:
+				b += k[4];
+				/* fall through */
+			case 4:
+				a += ka[0];
+				break;
+			case 3:
+				a += ((uint32) k[2] << 16);
+				/* fall through */
+			case 2:
+				a += ((uint32) k[1] << 8);
+				/* fall through */
+			case 1:
+				a += k[0];
+				/* case 0: nothing left to add */
+		}
+#endif							/* WORDS_BIGENDIAN */
+	}
+	else
+	{
+		/* Code path for non-aligned source data */
+
+		/* handle most of the key */
+		while (len >= 12)
+		{
+#ifdef WORDS_BIGENDIAN
+			a += (k[3] + ((uint32) k[2] << 8) + ((uint32) k[1] << 16) + ((uint32) k[0] << 24));
+			b += (k[7] + ((uint32) k[6] << 8) + ((uint32) k[5] << 16) + ((uint32) k[4] << 24));
+			c += (k[11] + ((uint32) k[10] << 8) + ((uint32) k[9] << 16) + ((uint32) k[8] << 24));
+#else							/* !WORDS_BIGENDIAN */
+			a += (k[0] + ((uint32) k[1] << 8) + ((uint32) k[2] << 16) + ((uint32) k[3] << 24));
+			b += (k[4] + ((uint32) k[5] << 8) + ((uint32) k[6] << 16) + ((uint32) k[7] << 24));
+			c += (k[8] + ((uint32) k[9] << 8) + ((uint32) k[10] << 16) + ((uint32) k[11] << 24));
+#endif							/* WORDS_BIGENDIAN */
+			mix(a, b, c);
+			k += 12;
+			len -= 12;
+		}
+
+		/* handle the last 11 bytes */
+#ifdef WORDS_BIGENDIAN
+		switch (len)			/* all the case statements fall through */
+		{
+			case 11:
+				c += ((uint32) k[10] << 8);
+			case 10:
+				c += ((uint32) k[9] << 16);
+			case 9:
+				c += ((uint32) k[8] << 24);
+				/* the lowest byte of c is reserved for the length */
+			case 8:
+				b += k[7];
+			case 7:
+				b += ((uint32) k[6] << 8);
+			case 6:
+				b += ((uint32) k[5] << 16);
+			case 5:
+				b += ((uint32) k[4] << 24);
+			case 4:
+				a += k[3];
+			case 3:
+				a += ((uint32) k[2] << 8);
+			case 2:
+				a += ((uint32) k[1] << 16);
+			case 1:
+				a += ((uint32) k[0] << 24);
+				/* case 0: nothing left to add */
+		}
+#else							/* !WORDS_BIGENDIAN */
+		switch (len)			/* all the case statements fall through */
+		{
+			case 11:
+				c += ((uint32) k[10] << 24);
+			case 10:
+				c += ((uint32) k[9] << 16);
+			case 9:
+				c += ((uint32) k[8] << 8);
+				/* the lowest byte of c is reserved for the length */
+			case 8:
+				b += ((uint32) k[7] << 24);
+			case 7:
+				b += ((uint32) k[6] << 16);
+			case 6:
+				b += ((uint32) k[5] << 8);
+			case 5:
+				b += k[4];
+			case 4:
+				a += ((uint32) k[3] << 24);
+			case 3:
+				a += ((uint32) k[2] << 16);
+			case 2:
+				a += ((uint32) k[1] << 8);
+			case 1:
+				a += k[0];
+				/* case 0: nothing left to add */
+		}
+#endif							/* WORDS_BIGENDIAN */
+	}
+
+	final(a, b, c);
+
+	/* report the result */
+	PG_RETURN_UINT64(((uint64) b << 32) | c);
+}
+
+/*
+ * hash_uint32() -- hash a 32-bit value to a 32-bit value
  *
  * This has the same result as
  *		hash_any(&k, sizeof(uint32))
@@ -523,3 +864,32 @@ hash_uint32(uint32 k)
 	/* report the result */
 	return UInt32GetDatum(c);
 }
+
+/*
+ * hash_uint32_extended() -- hash a 32-bit value to a 64-bit value, with a seed
+ *
+ * Like hash_uint32, this is a convenience function.
+ */
+Datum
+hash_uint32_extended(uint32 k, uint64 seed)
+{
+	register uint32 a,
+				b,
+				c;
+
+	a = b = c = 0x9e3779b9 + (uint32) sizeof(uint32) + 3923095;
+
+	if (seed != 0)
+	{
+		a += (uint32) (seed >> 32);
+		b += (uint32) seed;
+		mix(a, b, c);
+	}
+
+	a += k;
+
+	final(a, b, c);
+
+	/* report the result */
+	PG_RETURN_UINT64(((uint64) b << 32) | c);
+}
diff --git a/src/backend/access/hash/hashinsert.c b/src/backend/access/hash/hashinsert.c
index dc08db97db..f668dcff0f 100644
--- a/src/backend/access/hash/hashinsert.c
+++ b/src/backend/access/hash/hashinsert.c
@@ -3,7 +3,7 @@
  * hashinsert.c
  *	  Item insertion in hash tables for Postgres.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/hash/hashovfl.c b/src/backend/access/hash/hashovfl.c
index c206e704d4..2033b2f7f9 100644
--- a/src/backend/access/hash/hashovfl.c
+++ b/src/backend/access/hash/hashovfl.c
@@ -3,7 +3,7 @@
  * hashovfl.c
  *	  Overflow page management code for the Postgres hash access method
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -341,9 +341,10 @@ _hash_addovflpage(Relation rel, Buffer metabuf, Buffer buf, bool retain_pin)
 			metap->hashm_mapp[metap->hashm_nmaps] = BufferGetBlockNumber(newmapbuf);
 			metap->hashm_nmaps++;
 			metap->hashm_spares[splitnum]++;
-			MarkBufferDirty(metabuf);
 		}
 
+		MarkBufferDirty(metabuf);
+
 		/*
 		 * for new overflow page, we don't need to explicitly set the bit in
 		 * bitmap page, as by default that will be set to "in use".
diff --git a/src/backend/access/hash/hashpage.c b/src/backend/access/hash/hashpage.c
index 7b2906b0ca..e3c8721d29 100644
--- a/src/backend/access/hash/hashpage.c
+++ b/src/backend/access/hash/hashpage.c
@@ -3,7 +3,7 @@
  * hashpage.c
  *	  Hash table page management code for the Postgres hash access method
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -298,20 +298,20 @@ _hash_dropscanbuf(Relation rel, HashScanOpaque so)
 {
 	/* release pin we hold on primary bucket page */
 	if (BufferIsValid(so->hashso_bucket_buf) &&
-		so->hashso_bucket_buf != so->hashso_curbuf)
+		so->hashso_bucket_buf != so->currPos.buf)
 		_hash_dropbuf(rel, so->hashso_bucket_buf);
 	so->hashso_bucket_buf = InvalidBuffer;
 
 	/* release pin we hold on primary bucket page  of bucket being split */
 	if (BufferIsValid(so->hashso_split_bucket_buf) &&
-		so->hashso_split_bucket_buf != so->hashso_curbuf)
+		so->hashso_split_bucket_buf != so->currPos.buf)
 		_hash_dropbuf(rel, so->hashso_split_bucket_buf);
 	so->hashso_split_bucket_buf = InvalidBuffer;
 
 	/* release any pin we still hold */
-	if (BufferIsValid(so->hashso_curbuf))
-		_hash_dropbuf(rel, so->hashso_curbuf);
-	so->hashso_curbuf = InvalidBuffer;
+	if (BufferIsValid(so->currPos.buf))
+		_hash_dropbuf(rel, so->currPos.buf);
+	so->currPos.buf = InvalidBuffer;
 
 	/* reset split scan */
 	so->hashso_buc_populated = false;
@@ -373,7 +373,7 @@ _hash_init(Relation rel, double num_tuples, ForkNumber forkNum)
 	if (ffactor < 10)
 		ffactor = 10;
 
-	procid = index_getprocid(rel, 1, HASHPROC);
+	procid = index_getprocid(rel, 1, HASHSTANDARD_PROC);
 
 	/*
 	 * We initialize the metapage, the first N bucket pages, and the first
@@ -403,7 +403,7 @@ _hash_init(Relation rel, double num_tuples, ForkNumber forkNum)
 
 		XLogBeginInsert();
 		XLogRegisterData((char *) &xlrec, SizeOfHashInitMetaPage);
-		XLogRegisterBuffer(0, metabuf, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 		recptr = XLogInsert(RM_HASH_ID, XLOG_HASH_INIT_META_PAGE);
 
@@ -592,8 +592,9 @@ _hash_init_metabuffer(Buffer buf, double num_tuples, RegProcedure procid,
 	metap->hashm_firstfree = 0;
 
 	/*
-	 * Set pd_lower just past the end of the metadata.  This is to log full
-	 * page image of metapage in xloginsert.c.
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
 	 */
 	((PageHeader) page)->pd_lower =
 		((char *) metap + sizeof(HashMetaPageData)) - (char *) page;
@@ -991,7 +992,7 @@ _hash_expandtable(Relation rel, Buffer metabuf)
  * for the purpose.  OTOH, adding a splitpoint is a very infrequent operation,
  * so it may not be worth worrying about.
  *
- * Returns TRUE if successful, or FALSE if allocation failed due to
+ * Returns true if successful, or false if allocation failed due to
  * BlockNumber overflow.
  */
 static bool
diff --git a/src/backend/access/hash/hashsearch.c b/src/backend/access/hash/hashsearch.c
index 3e461ad7a0..c692c5b32d 100644
--- a/src/backend/access/hash/hashsearch.c
+++ b/src/backend/access/hash/hashsearch.c
@@ -3,7 +3,7 @@
  * hashsearch.c
  *	  search code for postgres hash tables
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -20,44 +20,105 @@
 #include "pgstat.h"
 #include "utils/rel.h"
 
+static bool _hash_readpage(IndexScanDesc scan, Buffer *bufP,
+			   ScanDirection dir);
+static int _hash_load_qualified_items(IndexScanDesc scan, Page page,
+						   OffsetNumber offnum, ScanDirection dir);
+static inline void _hash_saveitem(HashScanOpaque so, int itemIndex,
+			   OffsetNumber offnum, IndexTuple itup);
+static void _hash_readnext(IndexScanDesc scan, Buffer *bufp,
+			   Page *pagep, HashPageOpaque *opaquep);
 
 /*
  *	_hash_next() -- Get the next item in a scan.
  *
- *		On entry, we have a valid hashso_curpos in the scan, and a
- *		pin and read lock on the page that contains that item.
- *		We find the next item in the scan, if any.
- *		On success exit, we have the page containing the next item
- *		pinned and locked.
+ *		On entry, so->currPos describes the current page, which may
+ *		be pinned but not locked, and so->currPos.itemIndex identifies
+ *		which item was previously returned.
+ *
+ *		On successful exit, scan->xs_ctup.t_self is set to the TID
+ *		of the next heap tuple. so->currPos is updated as needed.
+ *
+ *		On failure exit (no more tuples), we return false with pin
+ *		held on bucket page but no pins or locks held on overflow
+ *		page.
  */
 bool
 _hash_next(IndexScanDesc scan, ScanDirection dir)
 {
 	Relation	rel = scan->indexRelation;
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
+	HashScanPosItem *currItem;
+	BlockNumber blkno;
 	Buffer		buf;
-	Page		page;
-	OffsetNumber offnum;
-	ItemPointer current;
-	IndexTuple	itup;
-
-	/* we still have the buffer pinned and read-locked */
-	buf = so->hashso_curbuf;
-	Assert(BufferIsValid(buf));
+	bool		end_of_scan = false;
 
 	/*
-	 * step to next valid tuple.
+	 * Advance to the next tuple on the current page; or if done, try to read
+	 * data from the next or previous page based on the scan direction. Before
+	 * moving to the next or previous page make sure that we deal with all the
+	 * killed items.
 	 */
-	if (!_hash_step(scan, &buf, dir))
+	if (ScanDirectionIsForward(dir))
+	{
+		if (++so->currPos.itemIndex > so->currPos.lastItem)
+		{
+			if (so->numKilled > 0)
+				_hash_kill_items(scan);
+
+			blkno = so->currPos.nextPage;
+			if (BlockNumberIsValid(blkno))
+			{
+				buf = _hash_getbuf(rel, blkno, HASH_READ, LH_OVERFLOW_PAGE);
+				TestForOldSnapshot(scan->xs_snapshot, rel, BufferGetPage(buf));
+				if (!_hash_readpage(scan, &buf, dir))
+					end_of_scan = true;
+			}
+			else
+				end_of_scan = true;
+		}
+	}
+	else
+	{
+		if (--so->currPos.itemIndex < so->currPos.firstItem)
+		{
+			if (so->numKilled > 0)
+				_hash_kill_items(scan);
+
+			blkno = so->currPos.prevPage;
+			if (BlockNumberIsValid(blkno))
+			{
+				buf = _hash_getbuf(rel, blkno, HASH_READ,
+								   LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
+				TestForOldSnapshot(scan->xs_snapshot, rel, BufferGetPage(buf));
+
+				/*
+				 * We always maintain the pin on bucket page for whole scan
+				 * operation, so releasing the additional pin we have acquired
+				 * here.
+				 */
+				if (buf == so->hashso_bucket_buf ||
+					buf == so->hashso_split_bucket_buf)
+					_hash_dropbuf(rel, buf);
+
+				if (!_hash_readpage(scan, &buf, dir))
+					end_of_scan = true;
+			}
+			else
+				end_of_scan = true;
+		}
+	}
+
+	if (end_of_scan)
+	{
+		_hash_dropscanbuf(rel, so);
+		HashScanPosInvalidate(so->currPos);
 		return false;
+	}
 
-	/* if we're here, _hash_step found a valid tuple */
-	current = &(so->hashso_curpos);
-	offnum = ItemPointerGetOffsetNumber(current);
-	_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
-	page = BufferGetPage(buf);
-	itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-	so->hashso_heappos = itup->t_tid;
+	/* OK, itemIndex says what to return */
+	currItem = &so->currPos.items[so->currPos.itemIndex];
+	scan->xs_ctup.t_self = currItem->heapTid;
 
 	return true;
 }
@@ -212,11 +273,18 @@ _hash_readprev(IndexScanDesc scan,
 /*
  *	_hash_first() -- Find the first item in a scan.
  *
- *		Find the first item in the index that
- *		satisfies the qualification associated with the scan descriptor. On
- *		success, the page containing the current index tuple is read locked
- *		and pinned, and the scan's opaque data entry is updated to
- *		include the buffer.
+ *		We find the first item (or, if backward scan, the last item) in the
+ *		index that satisfies the qualification associated with the scan
+ *		descriptor.
+ *
+ *		On successful exit, if the page containing current index tuple is an
+ *		overflow page, both pin and lock are released whereas if it is a bucket
+ *		page then it is pinned but not locked and data about the matching
+ *		tuple(s) on the page has been loaded into so->currPos,
+ *		scan->xs_ctup.t_self is set to the heap TID of the current tuple.
+ *
+ *		On failure exit (no more tuples), we return false, with pin held on
+ *		bucket page but no pins or locks held on overflow page.
  */
 bool
 _hash_first(IndexScanDesc scan, ScanDirection dir)
@@ -229,15 +297,10 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 	Buffer		buf;
 	Page		page;
 	HashPageOpaque opaque;
-	IndexTuple	itup;
-	ItemPointer current;
-	OffsetNumber offnum;
+	HashScanPosItem *currItem;
 
 	pgstat_count_index_scan(rel);
 
-	current = &(so->hashso_curpos);
-	ItemPointerSetInvalid(current);
-
 	/*
 	 * We do not support hash scans with no index qualification, because we
 	 * would have to read the whole index rather than just one bucket. That
@@ -356,222 +419,300 @@ _hash_first(IndexScanDesc scan, ScanDirection dir)
 			_hash_readnext(scan, &buf, &page, &opaque);
 	}
 
-	/* Now find the first tuple satisfying the qualification */
-	if (!_hash_step(scan, &buf, dir))
+	/* remember which buffer we have pinned, if any */
+	Assert(BufferIsInvalid(so->currPos.buf));
+	so->currPos.buf = buf;
+
+	/* Now find all the tuples satisfying the qualification from a page */
+	if (!_hash_readpage(scan, &buf, dir))
 		return false;
 
-	/* if we're here, _hash_step found a valid tuple */
-	offnum = ItemPointerGetOffsetNumber(current);
-	_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
-	page = BufferGetPage(buf);
-	itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-	so->hashso_heappos = itup->t_tid;
+	/* OK, itemIndex says what to return */
+	currItem = &so->currPos.items[so->currPos.itemIndex];
+	scan->xs_ctup.t_self = currItem->heapTid;
 
+	/* if we're here, _hash_readpage found a valid tuples */
 	return true;
 }
 
 /*
- *	_hash_step() -- step to the next valid item in a scan in the bucket.
- *
- *		If no valid record exists in the requested direction, return
- *		false.  Else, return true and set the hashso_curpos for the
- *		scan to the right thing.
+ *	_hash_readpage() -- Load data from current index page into so->currPos
  *
- *		Here we need to ensure that if the scan has started during split, then
- *		skip the tuples that are moved by split while scanning bucket being
- *		populated and then scan the bucket being split to cover all such
- *		tuples.  This is done to ensure that we don't miss tuples in the scans
- *		that are started during split.
+ *	We scan all the items in the current index page and save them into
+ *	so->currPos if it satisfies the qualification. If no matching items
+ *	are found in the current page, we move to the next or previous page
+ *	in a bucket chain as indicated by the direction.
  *
- *		'bufP' points to the current buffer, which is pinned and read-locked.
- *		On success exit, we have pin and read-lock on whichever page
- *		contains the right item; on failure, we have released all buffers.
+ *	Return true if any matching items are found else return false.
  */
-bool
-_hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir)
+static bool
+_hash_readpage(IndexScanDesc scan, Buffer *bufP, ScanDirection dir)
 {
 	Relation	rel = scan->indexRelation;
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
-	ItemPointer current;
 	Buffer		buf;
 	Page		page;
 	HashPageOpaque opaque;
-	OffsetNumber maxoff;
 	OffsetNumber offnum;
-	BlockNumber blkno;
-	IndexTuple	itup;
-
-	current = &(so->hashso_curpos);
+	uint16		itemIndex;
 
 	buf = *bufP;
+	Assert(BufferIsValid(buf));
 	_hash_checkpage(rel, buf, LH_BUCKET_PAGE | LH_OVERFLOW_PAGE);
 	page = BufferGetPage(buf);
 	opaque = (HashPageOpaque) PageGetSpecialPointer(page);
 
-	/*
-	 * If _hash_step is called from _hash_first, current will not be valid, so
-	 * we can't dereference it.  However, in that case, we presumably want to
-	 * start at the beginning/end of the page...
-	 */
-	maxoff = PageGetMaxOffsetNumber(page);
-	if (ItemPointerIsValid(current))
-		offnum = ItemPointerGetOffsetNumber(current);
-	else
-		offnum = InvalidOffsetNumber;
+	so->currPos.buf = buf;
+	so->currPos.currPage = BufferGetBlockNumber(buf);
 
-	/*
-	 * 'offnum' now points to the last tuple we examined (if any).
-	 *
-	 * continue to step through tuples until: 1) we get to the end of the
-	 * bucket chain or 2) we find a valid tuple.
-	 */
-	do
+	if (ScanDirectionIsForward(dir))
 	{
-		switch (dir)
+		BlockNumber prev_blkno = InvalidBlockNumber;
+
+		for (;;)
 		{
-			case ForwardScanDirection:
-				if (offnum != InvalidOffsetNumber)
-					offnum = OffsetNumberNext(offnum);	/* move forward */
-				else
-				{
-					/* new page, locate starting position by binary search */
-					offnum = _hash_binsearch(page, so->hashso_sk_hash);
-				}
-
-				for (;;)
-				{
-					/*
-					 * check if we're still in the range of items with the
-					 * target hash key
-					 */
-					if (offnum <= maxoff)
-					{
-						Assert(offnum >= FirstOffsetNumber);
-						itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-
-						/*
-						 * skip the tuples that are moved by split operation
-						 * for the scan that has started when split was in
-						 * progress
-						 */
-						if (so->hashso_buc_populated && !so->hashso_buc_split &&
-							(itup->t_info & INDEX_MOVED_BY_SPLIT_MASK))
-						{
-							offnum = OffsetNumberNext(offnum);	/* move forward */
-							continue;
-						}
-
-						if (so->hashso_sk_hash == _hash_get_indextuple_hashkey(itup))
-							break;	/* yes, so exit for-loop */
-					}
-
-					/* Before leaving current page, deal with any killed items */
-					if (so->numKilled > 0)
-						_hash_kill_items(scan);
-
-					/*
-					 * ran off the end of this page, try the next
-					 */
-					_hash_readnext(scan, &buf, &page, &opaque);
-					if (BufferIsValid(buf))
-					{
-						maxoff = PageGetMaxOffsetNumber(page);
-						offnum = _hash_binsearch(page, so->hashso_sk_hash);
-					}
-					else
-					{
-						itup = NULL;
-						break;	/* exit for-loop */
-					}
-				}
+			/* new page, locate starting position by binary search */
+			offnum = _hash_binsearch(page, so->hashso_sk_hash);
+
+			itemIndex = _hash_load_qualified_items(scan, page, offnum, dir);
+
+			if (itemIndex != 0)
 				break;
 
-			case BackwardScanDirection:
-				if (offnum != InvalidOffsetNumber)
-					offnum = OffsetNumberPrev(offnum);	/* move back */
-				else
-				{
-					/* new page, locate starting position by binary search */
-					offnum = _hash_binsearch_last(page, so->hashso_sk_hash);
-				}
-
-				for (;;)
-				{
-					/*
-					 * check if we're still in the range of items with the
-					 * target hash key
-					 */
-					if (offnum >= FirstOffsetNumber)
-					{
-						Assert(offnum <= maxoff);
-						itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
-
-						/*
-						 * skip the tuples that are moved by split operation
-						 * for the scan that has started when split was in
-						 * progress
-						 */
-						if (so->hashso_buc_populated && !so->hashso_buc_split &&
-							(itup->t_info & INDEX_MOVED_BY_SPLIT_MASK))
-						{
-							offnum = OffsetNumberPrev(offnum);	/* move back */
-							continue;
-						}
-
-						if (so->hashso_sk_hash == _hash_get_indextuple_hashkey(itup))
-							break;	/* yes, so exit for-loop */
-					}
-
-					/* Before leaving current page, deal with any killed items */
-					if (so->numKilled > 0)
-						_hash_kill_items(scan);
-
-					/*
-					 * ran off the end of this page, try the next
-					 */
-					_hash_readprev(scan, &buf, &page, &opaque);
-					if (BufferIsValid(buf))
-					{
-						TestForOldSnapshot(scan->xs_snapshot, rel, page);
-						maxoff = PageGetMaxOffsetNumber(page);
-						offnum = _hash_binsearch_last(page, so->hashso_sk_hash);
-					}
-					else
-					{
-						itup = NULL;
-						break;	/* exit for-loop */
-					}
-				}
+			/*
+			 * Could not find any matching tuples in the current page, move to
+			 * the next page. Before leaving the current page, deal with any
+			 * killed items.
+			 */
+			if (so->numKilled > 0)
+				_hash_kill_items(scan);
+
+			/*
+			 * If this is a primary bucket page, hasho_prevblkno is not a real
+			 * block number.
+			 */
+			if (so->currPos.buf == so->hashso_bucket_buf ||
+				so->currPos.buf == so->hashso_split_bucket_buf)
+				prev_blkno = InvalidBlockNumber;
+			else
+				prev_blkno = opaque->hasho_prevblkno;
+
+			_hash_readnext(scan, &buf, &page, &opaque);
+			if (BufferIsValid(buf))
+			{
+				so->currPos.buf = buf;
+				so->currPos.currPage = BufferGetBlockNumber(buf);
+			}
+			else
+			{
+				/*
+				 * Remember next and previous block numbers for scrollable
+				 * cursors to know the start position and return false
+				 * indicating that no more matching tuples were found. Also,
+				 * don't reset currPage or lsn, because we expect
+				 * _hash_kill_items to be called for the old page after this
+				 * function returns.
+				 */
+				so->currPos.prevPage = prev_blkno;
+				so->currPos.nextPage = InvalidBlockNumber;
+				so->currPos.buf = buf;
+				return false;
+			}
+		}
+
+		so->currPos.firstItem = 0;
+		so->currPos.lastItem = itemIndex - 1;
+		so->currPos.itemIndex = 0;
+	}
+	else
+	{
+		BlockNumber next_blkno = InvalidBlockNumber;
+
+		for (;;)
+		{
+			/* new page, locate starting position by binary search */
+			offnum = _hash_binsearch_last(page, so->hashso_sk_hash);
+
+			itemIndex = _hash_load_qualified_items(scan, page, offnum, dir);
+
+			if (itemIndex != MaxIndexTuplesPerPage)
 				break;
 
-			default:
-				/* NoMovementScanDirection */
-				/* this should not be reached */
-				itup = NULL;
+			/*
+			 * Could not find any matching tuples in the current page, move to
+			 * the previous page. Before leaving the current page, deal with
+			 * any killed items.
+			 */
+			if (so->numKilled > 0)
+				_hash_kill_items(scan);
+
+			if (so->currPos.buf == so->hashso_bucket_buf ||
+				so->currPos.buf == so->hashso_split_bucket_buf)
+				next_blkno = opaque->hasho_nextblkno;
+
+			_hash_readprev(scan, &buf, &page, &opaque);
+			if (BufferIsValid(buf))
+			{
+				so->currPos.buf = buf;
+				so->currPos.currPage = BufferGetBlockNumber(buf);
+			}
+			else
+			{
+				/*
+				 * Remember next and previous block numbers for scrollable
+				 * cursors to know the start position and return false
+				 * indicating that no more matching tuples were found. Also,
+				 * don't reset currPage or lsn, because we expect
+				 * _hash_kill_items to be called for the old page after this
+				 * function returns.
+				 */
+				so->currPos.prevPage = InvalidBlockNumber;
+				so->currPos.nextPage = next_blkno;
+				so->currPos.buf = buf;
+				return false;
+			}
+		}
+
+		so->currPos.firstItem = itemIndex;
+		so->currPos.lastItem = MaxIndexTuplesPerPage - 1;
+		so->currPos.itemIndex = MaxIndexTuplesPerPage - 1;
+	}
+
+	if (so->currPos.buf == so->hashso_bucket_buf ||
+		so->currPos.buf == so->hashso_split_bucket_buf)
+	{
+		so->currPos.prevPage = InvalidBlockNumber;
+		so->currPos.nextPage = opaque->hasho_nextblkno;
+		LockBuffer(so->currPos.buf, BUFFER_LOCK_UNLOCK);
+	}
+	else
+	{
+		so->currPos.prevPage = opaque->hasho_prevblkno;
+		so->currPos.nextPage = opaque->hasho_nextblkno;
+		_hash_relbuf(rel, so->currPos.buf);
+		so->currPos.buf = InvalidBuffer;
+	}
+
+	Assert(so->currPos.firstItem <= so->currPos.lastItem);
+	return true;
+}
+
+/*
+ * Load all the qualified items from a current index page
+ * into so->currPos. Helper function for _hash_readpage.
+ */
+static int
+_hash_load_qualified_items(IndexScanDesc scan, Page page,
+						   OffsetNumber offnum, ScanDirection dir)
+{
+	HashScanOpaque so = (HashScanOpaque) scan->opaque;
+	IndexTuple	itup;
+	int			itemIndex;
+	OffsetNumber maxoff;
+
+	maxoff = PageGetMaxOffsetNumber(page);
+
+	if (ScanDirectionIsForward(dir))
+	{
+		/* load items[] in ascending order */
+		itemIndex = 0;
+
+		while (offnum <= maxoff)
+		{
+			Assert(offnum >= FirstOffsetNumber);
+			itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
+
+			/*
+			 * skip the tuples that are moved by split operation for the scan
+			 * that has started when split was in progress. Also, skip the
+			 * tuples that are marked as dead.
+			 */
+			if ((so->hashso_buc_populated && !so->hashso_buc_split &&
+				 (itup->t_info & INDEX_MOVED_BY_SPLIT_MASK)) ||
+				(scan->ignore_killed_tuples &&
+				 (ItemIdIsDead(PageGetItemId(page, offnum)))))
+			{
+				offnum = OffsetNumberNext(offnum);	/* move forward */
+				continue;
+			}
+
+			if (so->hashso_sk_hash == _hash_get_indextuple_hashkey(itup) &&
+				_hash_checkqual(scan, itup))
+			{
+				/* tuple is qualified, so remember it */
+				_hash_saveitem(so, itemIndex, offnum, itup);
+				itemIndex++;
+			}
+			else
+			{
+				/*
+				 * No more matching tuples exist in this page. so, exit while
+				 * loop.
+				 */
 				break;
+			}
+
+			offnum = OffsetNumberNext(offnum);
 		}
 
-		if (itup == NULL)
+		Assert(itemIndex <= MaxIndexTuplesPerPage);
+		return itemIndex;
+	}
+	else
+	{
+		/* load items[] in descending order */
+		itemIndex = MaxIndexTuplesPerPage;
+
+		while (offnum >= FirstOffsetNumber)
 		{
+			Assert(offnum <= maxoff);
+			itup = (IndexTuple) PageGetItem(page, PageGetItemId(page, offnum));
+
 			/*
-			 * We ran off the end of the bucket without finding a match.
-			 * Release the pin on bucket buffers.  Normally, such pins are
-			 * released at end of scan, however scrolling cursors can
-			 * reacquire the bucket lock and pin in the same scan multiple
-			 * times.
+			 * skip the tuples that are moved by split operation for the scan
+			 * that has started when split was in progress. Also, skip the
+			 * tuples that are marked as dead.
 			 */
-			*bufP = so->hashso_curbuf = InvalidBuffer;
-			ItemPointerSetInvalid(current);
-			_hash_dropscanbuf(rel, so);
-			return false;
+			if ((so->hashso_buc_populated && !so->hashso_buc_split &&
+				 (itup->t_info & INDEX_MOVED_BY_SPLIT_MASK)) ||
+				(scan->ignore_killed_tuples &&
+				 (ItemIdIsDead(PageGetItemId(page, offnum)))))
+			{
+				offnum = OffsetNumberPrev(offnum);	/* move back */
+				continue;
+			}
+
+			if (so->hashso_sk_hash == _hash_get_indextuple_hashkey(itup) &&
+				_hash_checkqual(scan, itup))
+			{
+				itemIndex--;
+				/* tuple is qualified, so remember it */
+				_hash_saveitem(so, itemIndex, offnum, itup);
+			}
+			else
+			{
+				/*
+				 * No more matching tuples exist in this page. so, exit while
+				 * loop.
+				 */
+				break;
+			}
+
+			offnum = OffsetNumberPrev(offnum);
 		}
 
-		/* check the tuple quals, loop around if not met */
-	} while (!_hash_checkqual(scan, itup));
+		Assert(itemIndex >= 0);
+		return itemIndex;
+	}
+}
+
+/* Save an index item into so->currPos.items[itemIndex] */
+static inline void
+_hash_saveitem(HashScanOpaque so, int itemIndex,
+			   OffsetNumber offnum, IndexTuple itup)
+{
+	HashScanPosItem *currItem = &so->currPos.items[itemIndex];
 
-	/* if we made it to here, we've found a valid tuple */
-	blkno = BufferGetBlockNumber(buf);
-	*bufP = so->hashso_curbuf = buf;
-	ItemPointerSet(current, blkno, offnum);
-	return true;
+	currItem->heapTid = itup->t_tid;
+	currItem->indexOffset = offnum;
 }
diff --git a/src/backend/access/hash/hashsort.c b/src/backend/access/hash/hashsort.c
index 41d615df8b..b70964f429 100644
--- a/src/backend/access/hash/hashsort.c
+++ b/src/backend/access/hash/hashsort.c
@@ -14,7 +14,7 @@
  * plenty of locality of access.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -82,6 +82,7 @@ _h_spoolinit(Relation heap, Relation index, uint32 num_buckets)
 												   hspool->low_mask,
 												   hspool->max_buckets,
 												   maintenance_work_mem,
+												   NULL,
 												   false);
 
 	return hspool;
diff --git a/src/backend/access/hash/hashutil.c b/src/backend/access/hash/hashutil.c
index 9b803af7c2..4e485cc4b3 100644
--- a/src/backend/access/hash/hashutil.c
+++ b/src/backend/access/hash/hashutil.c
@@ -3,7 +3,7 @@
  * hashutil.c
  *	  Utility code for Postgres hash implementation.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -85,7 +85,7 @@ _hash_datum2hashkey(Relation rel, Datum key)
 	Oid			collation;
 
 	/* XXX assumes index has only one attribute */
-	procinfo = index_getprocinfo(rel, 1, HASHPROC);
+	procinfo = index_getprocinfo(rel, 1, HASHSTANDARD_PROC);
 	collation = rel->rd_indcollation[0];
 
 	return DatumGetUInt32(FunctionCall1Coll(procinfo, collation, key));
@@ -108,10 +108,10 @@ _hash_datum2hashkey_type(Relation rel, Datum key, Oid keytype)
 	hash_proc = get_opfamily_proc(rel->rd_opfamily[0],
 								  keytype,
 								  keytype,
-								  HASHPROC);
+								  HASHSTANDARD_PROC);
 	if (!RegProcedureIsValid(hash_proc))
 		elog(ERROR, "missing support function %d(%u,%u) for index \"%s\"",
-			 HASHPROC, keytype, keytype,
+			 HASHSTANDARD_PROC, keytype, keytype,
 			 RelationGetRelationName(rel));
 	collation = rel->rd_indcollation[0];
 
@@ -522,13 +522,31 @@ _hash_get_newbucket_from_oldbucket(Relation rel, Bucket old_bucket,
  * current page and killed tuples thereon (generally, this should only be
  * called if so->numKilled > 0).
  *
+ * The caller does not have a lock on the page and may or may not have the
+ * page pinned in a buffer.  Note that read-lock is sufficient for setting
+ * LP_DEAD status (which is only a hint).
+ *
+ * The caller must have pin on bucket buffer, but may or may not have pin
+ * on overflow buffer, as indicated by HashScanPosIsPinned(so->currPos).
+ *
  * We match items by heap TID before assuming they are the right ones to
  * delete.
+ *
+ * There are never any scans active in a bucket at the time VACUUM begins,
+ * because VACUUM takes a cleanup lock on the primary bucket page and scans
+ * hold a pin.  A scan can begin after VACUUM leaves the primary bucket page
+ * but before it finishes the entire bucket, but it can never pass VACUUM,
+ * because VACUUM always locks the next page before releasing the lock on
+ * the previous one.  Therefore, we don't have to worry about accidentally
+ * killing a TID that has been reused for an unrelated tuple.
  */
 void
 _hash_kill_items(IndexScanDesc scan)
 {
 	HashScanOpaque so = (HashScanOpaque) scan->opaque;
+	Relation	rel = scan->indexRelation;
+	BlockNumber blkno;
+	Buffer		buf;
 	Page		page;
 	HashPageOpaque opaque;
 	OffsetNumber offnum,
@@ -536,9 +554,11 @@ _hash_kill_items(IndexScanDesc scan)
 	int			numKilled = so->numKilled;
 	int			i;
 	bool		killedsomething = false;
+	bool		havePin = false;
 
 	Assert(so->numKilled > 0);
 	Assert(so->killedItems != NULL);
+	Assert(HashScanPosIsValid(so->currPos));
 
 	/*
 	 * Always reset the scan state, so we don't look for same items on other
@@ -546,20 +566,40 @@ _hash_kill_items(IndexScanDesc scan)
 	 */
 	so->numKilled = 0;
 
-	page = BufferGetPage(so->hashso_curbuf);
+	blkno = so->currPos.currPage;
+	if (HashScanPosIsPinned(so->currPos))
+	{
+		/*
+		 * We already have pin on this buffer, so, all we need to do is
+		 * acquire lock on it.
+		 */
+		havePin = true;
+		buf = so->currPos.buf;
+		LockBuffer(buf, BUFFER_LOCK_SHARE);
+	}
+	else
+		buf = _hash_getbuf(rel, blkno, HASH_READ, LH_OVERFLOW_PAGE);
+
+	page = BufferGetPage(buf);
 	opaque = (HashPageOpaque) PageGetSpecialPointer(page);
 	maxoff = PageGetMaxOffsetNumber(page);
 
 	for (i = 0; i < numKilled; i++)
 	{
-		offnum = so->killedItems[i].indexOffset;
+		int			itemIndex = so->killedItems[i];
+		HashScanPosItem *currItem = &so->currPos.items[itemIndex];
+
+		offnum = currItem->indexOffset;
+
+		Assert(itemIndex >= so->currPos.firstItem &&
+			   itemIndex <= so->currPos.lastItem);
 
 		while (offnum <= maxoff)
 		{
 			ItemId		iid = PageGetItemId(page, offnum);
 			IndexTuple	ituple = (IndexTuple) PageGetItem(page, iid);
 
-			if (ItemPointerEquals(&ituple->t_tid, &so->killedItems[i].heapTid))
+			if (ItemPointerEquals(&ituple->t_tid, &currItem->heapTid))
 			{
 				/* found the item */
 				ItemIdMarkDead(iid);
@@ -578,6 +618,12 @@ _hash_kill_items(IndexScanDesc scan)
 	if (killedsomething)
 	{
 		opaque->hasho_flag |= LH_PAGE_HAS_DEAD_TUPLES;
-		MarkBufferDirtyHint(so->hashso_curbuf, true);
+		MarkBufferDirtyHint(buf, true);
 	}
+
+	if (so->hashso_bucket_buf == so->currPos.buf ||
+		havePin)
+		LockBuffer(so->currPos.buf, BUFFER_LOCK_UNLOCK);
+	else
+		_hash_relbuf(rel, buf);
 }
diff --git a/src/backend/access/hash/hashvalidate.c b/src/backend/access/hash/hashvalidate.c
index 30b29cb100..513a3bbc4c 100644
--- a/src/backend/access/hash/hashvalidate.c
+++ b/src/backend/access/hash/hashvalidate.c
@@ -3,7 +3,7 @@
  * hashvalidate.c
  *	  Opclass validator for hash.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -29,7 +29,7 @@
 #include "utils/syscache.h"
 
 
-static bool check_hash_func_signature(Oid funcid, Oid restype, Oid argtype);
+static bool check_hash_func_signature(Oid funcid, int16 amprocnum, Oid argtype);
 
 
 /*
@@ -105,8 +105,9 @@ hashvalidate(Oid opclassoid)
 		/* Check procedure numbers and function signatures */
 		switch (procform->amprocnum)
 		{
-			case HASHPROC:
-				if (!check_hash_func_signature(procform->amproc, INT4OID,
+			case HASHSTANDARD_PROC:
+			case HASHEXTENDED_PROC:
+				if (!check_hash_func_signature(procform->amproc, procform->amprocnum,
 											   procform->amproclefttype))
 				{
 					ereport(INFO,
@@ -264,19 +265,37 @@ hashvalidate(Oid opclassoid)
  * hacks in the core hash opclass definitions.
  */
 static bool
-check_hash_func_signature(Oid funcid, Oid restype, Oid argtype)
+check_hash_func_signature(Oid funcid, int16 amprocnum, Oid argtype)
 {
 	bool		result = true;
+	Oid			restype;
+	int16		nargs;
 	HeapTuple	tp;
 	Form_pg_proc procform;
 
+	switch (amprocnum)
+	{
+		case HASHSTANDARD_PROC:
+			restype = INT4OID;
+			nargs = 1;
+			break;
+
+		case HASHEXTENDED_PROC:
+			restype = INT8OID;
+			nargs = 2;
+			break;
+
+		default:
+			elog(ERROR, "invalid amprocnum");
+	}
+
 	tp = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
 	if (!HeapTupleIsValid(tp))
 		elog(ERROR, "cache lookup failed for function %u", funcid);
 	procform = (Form_pg_proc) GETSTRUCT(tp);
 
 	if (procform->prorettype != restype || procform->proretset ||
-		procform->pronargs != 1)
+		procform->pronargs != nargs)
 		result = false;
 
 	if (!IsBinaryCoercible(argtype, procform->proargtypes.values[0]))
@@ -290,24 +309,29 @@ check_hash_func_signature(Oid funcid, Oid restype, Oid argtype)
 		 * identity, not just its input type, because hashvarlena() takes
 		 * INTERNAL and allowing any such function seems too scary.
 		 */
-		if (funcid == F_HASHINT4 &&
+		if ((funcid == F_HASHINT4 || funcid == F_HASHINT4EXTENDED) &&
 			(argtype == DATEOID ||
 			 argtype == ABSTIMEOID || argtype == RELTIMEOID ||
 			 argtype == XIDOID || argtype == CIDOID))
 			 /* okay, allowed use of hashint4() */ ;
-		else if (funcid == F_TIMESTAMP_HASH &&
+		else if ((funcid == F_TIMESTAMP_HASH ||
+				  funcid == F_TIMESTAMP_HASH_EXTENDED) &&
 				 argtype == TIMESTAMPTZOID)
 			 /* okay, allowed use of timestamp_hash() */ ;
-		else if (funcid == F_HASHCHAR &&
+		else if ((funcid == F_HASHCHAR || funcid == F_HASHCHAREXTENDED) &&
 				 argtype == BOOLOID)
 			 /* okay, allowed use of hashchar() */ ;
-		else if (funcid == F_HASHVARLENA &&
+		else if ((funcid == F_HASHVARLENA || funcid == F_HASHVARLENAEXTENDED) &&
 				 argtype == BYTEAOID)
 			 /* okay, allowed use of hashvarlena() */ ;
 		else
 			result = false;
 	}
 
+	/* If function takes a second argument, it must be for a 64-bit salt. */
+	if (nargs == 2 && procform->proargtypes.values[1] != INT8OID)
+		result = false;
+
 	ReleaseSysCache(tp);
 	return result;
 }
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 8792f1453c..8a846e7dba 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -3,7 +3,7 @@
  * heapam.c
  *	  heap access method code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1066,11 +1066,11 @@ fastgetattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
 			 (*(isnull) = false),
 			 HeapTupleNoNulls(tup) ?
 			 (
-			  (tupleDesc)->attrs[(attnum) - 1]->attcacheoff >= 0 ?
+			  TupleDescAttr((tupleDesc), (attnum) - 1)->attcacheoff >= 0 ?
 			  (
-			   fetchatt((tupleDesc)->attrs[(attnum) - 1],
+			   fetchatt(TupleDescAttr((tupleDesc), (attnum) - 1),
 						(char *) (tup)->t_data + (tup)->t_data->t_hoff +
-						(tupleDesc)->attrs[(attnum) - 1]->attcacheoff)
+						TupleDescAttr((tupleDesc), (attnum) - 1)->attcacheoff)
 			   )
 			  :
 			  nocachegetattr((tup), (attnum), (tupleDesc))
@@ -1293,7 +1293,8 @@ heap_open(Oid relationId, LOCKMODE lockmode)
 
 	r = relation_open(relationId, lockmode);
 
-	if (r->rd_rel->relkind == RELKIND_INDEX)
+	if (r->rd_rel->relkind == RELKIND_INDEX ||
+		r->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is an index",
@@ -1321,7 +1322,8 @@ heap_openrv(const RangeVar *relation, LOCKMODE lockmode)
 
 	r = relation_openrv(relation, lockmode);
 
-	if (r->rd_rel->relkind == RELKIND_INDEX)
+	if (r->rd_rel->relkind == RELKIND_INDEX ||
+		r->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is an index",
@@ -1353,7 +1355,8 @@ heap_openrv_extended(const RangeVar *relation, LOCKMODE lockmode,
 
 	if (r)
 	{
-		if (r->rd_rel->relkind == RELKIND_INDEX)
+		if (r->rd_rel->relkind == RELKIND_INDEX ||
+			r->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("\"%s\" is an index",
@@ -1379,7 +1382,7 @@ heap_openrv_extended(const RangeVar *relation, LOCKMODE lockmode,
  * heap_beginscan_strat offers an extended API that lets the caller control
  * whether a nondefault buffer access strategy can be used, and whether
  * syncscan can be chosen (possibly resulting in the scan not starting from
- * block zero).  Both of these default to TRUE with plain heap_beginscan.
+ * block zero).  Both of these default to true with plain heap_beginscan.
  *
  * heap_beginscan_bm is an alternative entry point for setting up a
  * HeapScanDesc for a bitmap heap scan.  Although that scan technology is
@@ -1531,21 +1534,6 @@ heap_rescan(HeapScanDesc scan,
 	 * reinitialize scan descriptor
 	 */
 	initscan(scan, key, true);
-
-	/*
-	 * reset parallel scan, if present
-	 */
-	if (scan->rs_parallel != NULL)
-	{
-		ParallelHeapScanDesc parallel_scan;
-
-		/*
-		 * Caller is responsible for making sure that all workers have
-		 * finished the scan before calling this.
-		 */
-		parallel_scan = scan->rs_parallel;
-		pg_atomic_write_u64(&parallel_scan->phs_nallocated, 0);
-	}
 }
 
 /* ----------------
@@ -1639,7 +1627,29 @@ heap_parallelscan_initialize(ParallelHeapScanDesc target, Relation relation,
 	SpinLockInit(&target->phs_mutex);
 	target->phs_startblock = InvalidBlockNumber;
 	pg_atomic_init_u64(&target->phs_nallocated, 0);
-	SerializeSnapshot(snapshot, target->phs_snapshot_data);
+	if (IsMVCCSnapshot(snapshot))
+	{
+		SerializeSnapshot(snapshot, target->phs_snapshot_data);
+		target->phs_snapshot_any = false;
+	}
+	else
+	{
+		Assert(snapshot == SnapshotAny);
+		target->phs_snapshot_any = true;
+	}
+}
+
+/* ----------------
+ *		heap_parallelscan_reinitialize - reset a parallel scan
+ *
+ *		Call this in the leader process.  Caller is responsible for
+ *		making sure that all workers have finished the scan beforehand.
+ * ----------------
+ */
+void
+heap_parallelscan_reinitialize(ParallelHeapScanDesc parallel_scan)
+{
+	pg_atomic_write_u64(&parallel_scan->phs_nallocated, 0);
 }
 
 /* ----------------
@@ -1654,11 +1664,22 @@ heap_beginscan_parallel(Relation relation, ParallelHeapScanDesc parallel_scan)
 	Snapshot	snapshot;
 
 	Assert(RelationGetRelid(relation) == parallel_scan->phs_relid);
-	snapshot = RestoreSnapshot(parallel_scan->phs_snapshot_data);
-	RegisterSnapshot(snapshot);
+
+	if (!parallel_scan->phs_snapshot_any)
+	{
+		/* Snapshot was serialized -- restore it */
+		snapshot = RestoreSnapshot(parallel_scan->phs_snapshot_data);
+		RegisterSnapshot(snapshot);
+	}
+	else
+	{
+		/* SnapshotAny passed by caller (not serialized) */
+		snapshot = SnapshotAny;
+	}
 
 	return heap_beginscan_internal(relation, snapshot, 0, NULL, parallel_scan,
-								   true, true, true, false, false, true);
+								   true, true, true, false, false,
+								   !parallel_scan->phs_snapshot_any);
 }
 
 /* ----------------
@@ -1844,16 +1865,16 @@ heap_getnext(HeapScanDesc scan, ScanDirection direction)
  * against the specified snapshot.
  *
  * If successful (tuple found and passes snapshot time qual), then *userbuf
- * is set to the buffer holding the tuple and TRUE is returned.  The caller
+ * is set to the buffer holding the tuple and true is returned.  The caller
  * must unpin the buffer when done with the tuple.
  *
  * If the tuple is not found (ie, item number references a deleted slot),
- * then tuple->t_data is set to NULL and FALSE is returned.
+ * then tuple->t_data is set to NULL and false is returned.
  *
- * If the tuple is found but fails the time qual check, then FALSE is returned
+ * If the tuple is found but fails the time qual check, then false is returned
  * but tuple->t_data is left pointing to the tuple.
  *
- * keep_buf determines what is done with the buffer in the FALSE-result cases.
+ * keep_buf determines what is done with the buffer in the false-result cases.
  * When the caller specifies keep_buf = true, we retain the pin on the buffer
  * and return it in *userbuf (so the caller must eventually unpin it); when
  * keep_buf = false, the pin is released and *userbuf is set to InvalidBuffer.
@@ -1995,15 +2016,15 @@ heap_fetch(Relation relation,
  * of a HOT chain), and buffer is the buffer holding this tuple.  We search
  * for the first chain member satisfying the given snapshot.  If one is
  * found, we update *tid to reference that tuple's offset number, and
- * return TRUE.  If no match, return FALSE without modifying *tid.
+ * return true.  If no match, return false without modifying *tid.
  *
  * heapTuple is a caller-supplied buffer.  When a match is found, we return
  * the tuple here, in addition to updating *tid.  If no match is found, the
  * contents of this buffer on return are undefined.
  *
  * If all_dead is not NULL, we check non-visible tuples to see if they are
- * globally dead; *all_dead is set TRUE if all members of the HOT chain
- * are vacuumable, FALSE if not.
+ * globally dead; *all_dead is set true if all members of the HOT chain
+ * are vacuumable, false if not.
  *
  * Unlike heap_fetch, the caller must already have pin and (at least) share
  * lock on the buffer; it is still pinned/locked at exit.  Also unlike
@@ -2120,6 +2141,9 @@ heap_hot_search_buffer(ItemPointer tid, Relation relation, Buffer buffer,
 		 * If we can't see it, maybe no one else can either.  At caller
 		 * request, check whether all chain members are dead to all
 		 * transactions.
+		 *
+		 * Note: if you change the criterion here for what is "dead", fix the
+		 * planner's get_actual_variable_range() function to match.
 		 */
 		if (all_dead && *all_dead &&
 			!HeapTupleIsSurelyDead(heapTuple, RecentGlobalXmin))
@@ -2597,15 +2621,17 @@ heap_prepare_insert(Relation relation, HeapTuple tup, TransactionId xid,
 					CommandId cid, int options)
 {
 	/*
-	 * For now, parallel operations are required to be strictly read-only.
-	 * Unlike heap_update() and heap_delete(), an insert should never create a
-	 * combo CID, so it might be possible to relax this restriction, but not
-	 * without more thought and testing.
+	 * Parallel operations are required to be strictly read-only in a parallel
+	 * worker.  Parallel inserts are not safe even in the leader in the
+	 * general case, because group locking means that heavyweight locks for
+	 * relation extension or GIN page locks will not conflict between members
+	 * of a lock group, but we don't prohibit that case here because there are
+	 * useful special cases that we can safely allow, such as CREATE TABLE AS.
 	 */
-	if (IsInParallelMode())
+	if (IsParallelWorker())
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
-				 errmsg("cannot insert tuples during a parallel operation")));
+				 errmsg("cannot insert tuples in a parallel worker")));
 
 	if (relation->rd_rel->relhasoids)
 	{
@@ -4422,7 +4448,7 @@ heap_tuple_attr_equals(TupleDesc tupdesc, int attrnum,
 	else
 	{
 		Assert(attrnum <= tupdesc->natts);
-		att = tupdesc->attrs[attrnum - 1];
+		att = TupleDescAttr(tupdesc, attrnum - 1);
 		return datumIsEqual(value1, value2, att->attbyval, att->attlen);
 	}
 }
@@ -6354,6 +6380,7 @@ heap_inplace_update(Relation relation, HeapTuple tuple)
  */
 static TransactionId
 FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
+				  TransactionId relfrozenxid, TransactionId relminmxid,
 				  TransactionId cutoff_xid, MultiXactId cutoff_multi,
 				  uint16 *flags)
 {
@@ -6380,16 +6407,26 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
 		*flags |= FRM_INVALIDATE_XMAX;
 		return InvalidTransactionId;
 	}
+	else if (MultiXactIdPrecedes(multi, relminmxid))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATA_CORRUPTED),
+				 errmsg_internal("found multixact %u from before relminmxid %u",
+								 multi, relminmxid)));
 	else if (MultiXactIdPrecedes(multi, cutoff_multi))
 	{
 		/*
-		 * This old multi cannot possibly have members still running.  If it
-		 * was a locker only, it can be removed without any further
-		 * consideration; but if it contained an update, we might need to
-		 * preserve it.
+		 * This old multi cannot possibly have members still running, but
+		 * verify just in case.  If it was a locker only, it can be removed
+		 * without any further consideration; but if it contained an update, we
+		 * might need to preserve it.
 		 */
-		Assert(!MultiXactIdIsRunning(multi,
-									 HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)));
+		if (MultiXactIdIsRunning(multi,
+								 HEAP_XMAX_IS_LOCKED_ONLY(t_infomask)))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATA_CORRUPTED),
+					 errmsg_internal("multixact %u from before cutoff %u found to be still running",
+									 multi, cutoff_multi)));
+
 		if (HEAP_XMAX_IS_LOCKED_ONLY(t_infomask))
 		{
 			*flags |= FRM_INVALIDATE_XMAX;
@@ -6403,13 +6440,22 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
 			/* wasn't only a lock, xid needs to be valid */
 			Assert(TransactionIdIsValid(xid));
 
+			if (TransactionIdPrecedes(xid, relfrozenxid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATA_CORRUPTED),
+						 errmsg_internal("found update xid %u from before relfrozenxid %u",
+										 xid, relfrozenxid)));
+
 			/*
 			 * If the xid is older than the cutoff, it has to have aborted,
 			 * otherwise the tuple would have gotten pruned away.
 			 */
 			if (TransactionIdPrecedes(xid, cutoff_xid))
 			{
-				Assert(!TransactionIdDidCommit(xid));
+				if (TransactionIdDidCommit(xid))
+					ereport(ERROR,
+							(errcode(ERRCODE_DATA_CORRUPTED),
+							 errmsg_internal("cannot freeze committed update xid %u", xid)));
 				*flags |= FRM_INVALIDATE_XMAX;
 				xid = InvalidTransactionId; /* not strictly necessary */
 			}
@@ -6481,6 +6527,13 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
 		{
 			TransactionId xid = members[i].xid;
 
+			Assert(TransactionIdIsValid(xid));
+			if (TransactionIdPrecedes(xid, relfrozenxid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATA_CORRUPTED),
+						 errmsg_internal("found update xid %u from before relfrozenxid %u",
+										 xid, relfrozenxid)));
+
 			/*
 			 * It's an update; should we keep it?  If the transaction is known
 			 * aborted or crashed then it's okay to ignore it, otherwise not.
@@ -6509,18 +6562,26 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
 				update_committed = true;
 				update_xid = xid;
 			}
-
-			/*
-			 * Not in progress, not committed -- must be aborted or crashed;
-			 * we can ignore it.
-			 */
+			else
+			{
+				/*
+				 * Not in progress, not committed -- must be aborted or crashed;
+				 * we can ignore it.
+				 */
+			}
 
 			/*
 			 * Since the tuple wasn't marked HEAPTUPLE_DEAD by vacuum, the
-			 * update Xid cannot possibly be older than the xid cutoff.
+			 * update Xid cannot possibly be older than the xid cutoff. The
+			 * presence of such a tuple would cause corruption, so be paranoid
+			 * and check.
 			 */
-			Assert(!TransactionIdIsValid(update_xid) ||
-				   !TransactionIdPrecedes(update_xid, cutoff_xid));
+			if (TransactionIdIsValid(update_xid) &&
+				TransactionIdPrecedes(update_xid, cutoff_xid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATA_CORRUPTED),
+						 errmsg_internal("found update xid %u from before xid cutoff %u",
+										 update_xid, cutoff_xid)));
 
 			/*
 			 * If we determined that it's an Xid corresponding to an update
@@ -6591,7 +6652,7 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
  * Check to see whether any of the XID fields of a tuple (xmin, xmax, xvac)
  * are older than the specified cutoff XID and cutoff MultiXactId.  If so,
  * setup enough state (in the *frz output argument) to later execute and
- * WAL-log what we would need to do, and return TRUE.  Return FALSE if nothing
+ * WAL-log what we would need to do, and return true.  Return false if nothing
  * is to be changed.  In addition, set *totally_frozen_p to true if the tuple
  * will be totally frozen after these operations are performed and false if
  * more freezing will eventually be required.
@@ -6617,8 +6678,9 @@ FreezeMultiXactId(MultiXactId multi, uint16 t_infomask,
  * recovery.  We really need to remove old xids.
  */
 bool
-heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
-						  TransactionId cutoff_multi,
+heap_prepare_freeze_tuple(HeapTupleHeader tuple,
+						  TransactionId relfrozenxid, TransactionId relminmxid,
+						  TransactionId cutoff_xid, TransactionId cutoff_multi,
 						  xl_heap_freeze_tuple *frz, bool *totally_frozen_p)
 {
 	bool		changed = false;
@@ -6635,8 +6697,20 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 	xid = HeapTupleHeaderGetXmin(tuple);
 	if (TransactionIdIsNormal(xid))
 	{
+		if (TransactionIdPrecedes(xid, relfrozenxid))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATA_CORRUPTED),
+					 errmsg_internal("found xmin %u from before relfrozenxid %u",
+									 xid, relfrozenxid)));
+
 		if (TransactionIdPrecedes(xid, cutoff_xid))
 		{
+			if (!TransactionIdDidCommit(xid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATA_CORRUPTED),
+						 errmsg_internal("uncommitted xmin %u from before xid cutoff %u needs to be frozen",
+										 xid, cutoff_xid)));
+
 			frz->t_infomask |= HEAP_XMIN_FROZEN;
 			changed = true;
 		}
@@ -6661,6 +6735,7 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 		uint16		flags;
 
 		newxmax = FreezeMultiXactId(xid, tuple->t_infomask,
+									relfrozenxid, relminmxid,
 									cutoff_xid, cutoff_multi, &flags);
 
 		if (flags & FRM_INVALIDATE_XMAX)
@@ -6710,8 +6785,28 @@ heap_prepare_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
 	}
 	else if (TransactionIdIsNormal(xid))
 	{
+		if (TransactionIdPrecedes(xid, relfrozenxid))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATA_CORRUPTED),
+					 errmsg_internal("found xmax %u from before relfrozenxid %u",
+									 xid, relfrozenxid)));
+
 		if (TransactionIdPrecedes(xid, cutoff_xid))
+		{
+			/*
+			 * If we freeze xmax, make absolutely sure that it's not an XID
+			 * that is important.  (Note, a lock-only xmax can be removed
+			 * independent of committedness, since a committed lock holder has
+			 * released the lock).
+			 */
+			if (!(tuple->t_infomask & HEAP_XMAX_LOCK_ONLY) &&
+				TransactionIdDidCommit(xid))
+				ereport(ERROR,
+						(errcode(ERRCODE_DATA_CORRUPTED),
+						 errmsg_internal("cannot freeze committed xmax %u",
+										 xid)));
 			freeze_xmax = true;
+		}
 		else
 			totally_frozen = false;
 	}
@@ -6816,14 +6911,17 @@ heap_execute_freeze_tuple(HeapTupleHeader tuple, xl_heap_freeze_tuple *frz)
  * Useful for callers like CLUSTER that perform their own WAL logging.
  */
 bool
-heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
-				  TransactionId cutoff_multi)
+heap_freeze_tuple(HeapTupleHeader tuple,
+				  TransactionId relfrozenxid, TransactionId relminmxid,
+				  TransactionId cutoff_xid, TransactionId cutoff_multi)
 {
 	xl_heap_freeze_tuple frz;
 	bool		do_freeze;
 	bool		tuple_totally_frozen;
 
-	do_freeze = heap_prepare_freeze_tuple(tuple, cutoff_xid, cutoff_multi,
+	do_freeze = heap_prepare_freeze_tuple(tuple,
+										  relfrozenxid, relminmxid,
+										  cutoff_xid, cutoff_multi,
 										  &frz, &tuple_totally_frozen);
 
 	/*
@@ -7239,7 +7337,7 @@ heap_tuple_needs_eventual_freeze(HeapTupleHeader tuple)
  * heap_tuple_needs_freeze
  *
  * Check to see whether any of the XID fields of a tuple (xmin, xmax, xvac)
- * are older than the specified cutoff XID or MultiXactId.  If so, return TRUE.
+ * are older than the specified cutoff XID or MultiXactId.  If so, return true.
  *
  * It doesn't matter whether the tuple is alive or dead, we are checking
  * to see if a tuple needs to be removed or frozen to avoid wraparound.
@@ -9165,7 +9263,7 @@ heap_mask(char *pagedata, BlockNumber blkno)
 	Page		page = (Page) pagedata;
 	OffsetNumber off;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 	mask_unused_space(page);
diff --git a/src/backend/access/heap/hio.c b/src/backend/access/heap/hio.c
index 13e3bdca50..0d7bc68339 100644
--- a/src/backend/access/heap/hio.c
+++ b/src/backend/access/heap/hio.c
@@ -3,7 +3,7 @@
  * hio.c
  *	  POSTGRES heap access method input/output code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/heap/pruneheap.c b/src/backend/access/heap/pruneheap.c
index 52231ac417..f67d7d15df 100644
--- a/src/backend/access/heap/pruneheap.c
+++ b/src/backend/access/heap/pruneheap.c
@@ -3,7 +3,7 @@
  * pruneheap.c
  *	  heap page pruning and HOT-chain management code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -39,7 +39,7 @@ typedef struct
 	OffsetNumber redirected[MaxHeapTuplesPerPage * 2];
 	OffsetNumber nowdead[MaxHeapTuplesPerPage];
 	OffsetNumber nowunused[MaxHeapTuplesPerPage];
-	/* marked[i] is TRUE if item i is entered in one of the above arrays */
+	/* marked[i] is true if item i is entered in one of the above arrays */
 	bool		marked[MaxHeapTuplesPerPage + 1];
 } PruneState;
 
@@ -170,7 +170,7 @@ heap_page_prune_opt(Relation relation, Buffer buffer)
  * or RECENTLY_DEAD (see HeapTupleSatisfiesVacuum).
  *
  * If report_stats is true then we send the number of reclaimed heap-only
- * tuples to pgstats.  (This must be FALSE during vacuum, since vacuum will
+ * tuples to pgstats.  (This must be false during vacuum, since vacuum will
  * send its own new total to pgstats, and we don't want this delta applied
  * on top of that.)
  *
diff --git a/src/backend/access/heap/rewriteheap.c b/src/backend/access/heap/rewriteheap.c
index bd560e47e1..7d466c2588 100644
--- a/src/backend/access/heap/rewriteheap.c
+++ b/src/backend/access/heap/rewriteheap.c
@@ -92,7 +92,7 @@
  * heap's TOAST table will go through the normal bufmgr.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * IDENTIFICATION
@@ -407,7 +407,10 @@ rewrite_heap_tuple(RewriteState state,
 	 * While we have our hands on the tuple, we may as well freeze any
 	 * eligible xmin or xmax, so that future VACUUM effort can be saved.
 	 */
-	heap_freeze_tuple(new_tuple->t_data, state->rs_freeze_xid,
+	heap_freeze_tuple(new_tuple->t_data,
+					  state->rs_old_rel->rd_rel->relfrozenxid,
+					  state->rs_old_rel->rd_rel->relminmxid,
+					  state->rs_freeze_xid,
 					  state->rs_cutoff_multi);
 
 	/*
@@ -1013,8 +1016,7 @@ logical_rewrite_log_mapping(RewriteState state, TransactionId xid,
 		src->off = 0;
 		memcpy(src->path, path, sizeof(path));
 		src->vfd = PathNameOpenFile(path,
-									O_CREAT | O_EXCL | O_WRONLY | PG_BINARY,
-									S_IRUSR | S_IWUSR);
+									O_CREAT | O_EXCL | O_WRONLY | PG_BINARY);
 		if (src->vfd < 0)
 			ereport(ERROR,
 					(errcode_for_file_access(),
@@ -1133,8 +1135,7 @@ heap_xlog_logical_rewrite(XLogReaderState *r)
 			 xlrec->mapped_xid, XLogRecGetXid(r));
 
 	fd = OpenTransientFile(path,
-						   O_CREAT | O_WRONLY | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+						   O_CREAT | O_WRONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -1258,7 +1259,7 @@ CheckPointLogicalRewriteHeap(void)
 		}
 		else
 		{
-			int			fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+			int			fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 
 			/*
 			 * The file cannot vanish due to concurrency since this function
diff --git a/src/backend/access/heap/syncscan.c b/src/backend/access/heap/syncscan.c
index 20640cbbaf..054eb066e9 100644
--- a/src/backend/access/heap/syncscan.c
+++ b/src/backend/access/heap/syncscan.c
@@ -36,7 +36,7 @@
  *		ss_report_location	- update current scan location
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/heap/tuptoaster.c b/src/backend/access/heap/tuptoaster.c
index 458180bc95..546f80f05c 100644
--- a/src/backend/access/heap/tuptoaster.c
+++ b/src/backend/access/heap/tuptoaster.c
@@ -4,7 +4,7 @@
  *	  Support routines for external and compressed storage of
  *	  variable size attributes.
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -464,7 +464,6 @@ void
 toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative)
 {
 	TupleDesc	tupleDesc;
-	Form_pg_attribute *att;
 	int			numAttrs;
 	int			i;
 	Datum		toast_values[MaxHeapAttributeNumber];
@@ -489,7 +488,6 @@ toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative)
 	 * least one varlena column, by the way.)
 	 */
 	tupleDesc = rel->rd_att;
-	att = tupleDesc->attrs;
 	numAttrs = tupleDesc->natts;
 
 	Assert(numAttrs <= MaxHeapAttributeNumber);
@@ -501,7 +499,7 @@ toast_delete(Relation rel, HeapTuple oldtup, bool is_speculative)
 	 */
 	for (i = 0; i < numAttrs; i++)
 	{
-		if (att[i]->attlen == -1)
+		if (TupleDescAttr(tupleDesc, i)->attlen == -1)
 		{
 			Datum		value = toast_values[i];
 
@@ -538,7 +536,6 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 {
 	HeapTuple	result_tuple;
 	TupleDesc	tupleDesc;
-	Form_pg_attribute *att;
 	int			numAttrs;
 	int			i;
 
@@ -579,7 +576,6 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 	 * Get the tuple descriptor and break down the tuple(s) into fields.
 	 */
 	tupleDesc = rel->rd_att;
-	att = tupleDesc->attrs;
 	numAttrs = tupleDesc->natts;
 
 	Assert(numAttrs <= MaxHeapAttributeNumber);
@@ -606,6 +602,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 
 	for (i = 0; i < numAttrs; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
 		struct varlena *old_value;
 		struct varlena *new_value;
 
@@ -621,7 +618,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 			 * If the old value is stored on disk, check if it has changed so
 			 * we have to delete it later.
 			 */
-			if (att[i]->attlen == -1 && !toast_oldisnull[i] &&
+			if (att->attlen == -1 && !toast_oldisnull[i] &&
 				VARATT_IS_EXTERNAL_ONDISK(old_value))
 			{
 				if (toast_isnull[i] || !VARATT_IS_EXTERNAL_ONDISK(new_value) ||
@@ -668,12 +665,12 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		/*
 		 * Now look at varlena attributes
 		 */
-		if (att[i]->attlen == -1)
+		if (att->attlen == -1)
 		{
 			/*
 			 * If the table's attribute says PLAIN always, force it so.
 			 */
-			if (att[i]->attstorage == 'p')
+			if (att->attstorage == 'p')
 				toast_action[i] = 'p';
 
 			/*
@@ -687,7 +684,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 			if (VARATT_IS_EXTERNAL(new_value))
 			{
 				toast_oldexternal[i] = new_value;
-				if (att[i]->attstorage == 'p')
+				if (att->attstorage == 'p')
 					new_value = heap_tuple_untoast_attr(new_value);
 				else
 					new_value = heap_tuple_fetch_attr(new_value);
@@ -730,7 +727,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		hoff += sizeof(Oid);
 	hoff = MAXALIGN(hoff);
 	/* now convert to a limit on the tuple data size */
-	maxDataLen = TOAST_TUPLE_TARGET - hoff;
+	maxDataLen = RelationGetToastTupleTarget(rel, TOAST_TUPLE_TARGET) - hoff;
 
 	/*
 	 * Look for attributes with attstorage 'x' to compress.  Also find large
@@ -749,13 +746,15 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		 */
 		for (i = 0; i < numAttrs; i++)
 		{
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
+
 			if (toast_action[i] != ' ')
 				continue;
 			if (VARATT_IS_EXTERNAL(DatumGetPointer(toast_values[i])))
 				continue;		/* can't happen, toast_action would be 'p' */
 			if (VARATT_IS_COMPRESSED(DatumGetPointer(toast_values[i])))
 				continue;
-			if (att[i]->attstorage != 'x' && att[i]->attstorage != 'e')
+			if (att->attstorage != 'x' && att->attstorage != 'e')
 				continue;
 			if (toast_sizes[i] > biggest_size)
 			{
@@ -771,7 +770,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		 * Attempt to compress it inline, if it has attstorage 'x'
 		 */
 		i = biggest_attno;
-		if (att[i]->attstorage == 'x')
+		if (TupleDescAttr(tupleDesc, i)->attstorage == 'x')
 		{
 			old_value = toast_values[i];
 			new_value = toast_compress_datum(old_value);
@@ -841,11 +840,13 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 		 */
 		for (i = 0; i < numAttrs; i++)
 		{
+			Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
+
 			if (toast_action[i] == 'p')
 				continue;
 			if (VARATT_IS_EXTERNAL(DatumGetPointer(toast_values[i])))
 				continue;		/* can't happen, toast_action would be 'p' */
-			if (att[i]->attstorage != 'x' && att[i]->attstorage != 'e')
+			if (att->attstorage != 'x' && att->attstorage != 'e')
 				continue;
 			if (toast_sizes[i] > biggest_size)
 			{
@@ -896,7 +897,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 				continue;		/* can't happen, toast_action would be 'p' */
 			if (VARATT_IS_COMPRESSED(DatumGetPointer(toast_values[i])))
 				continue;
-			if (att[i]->attstorage != 'm')
+			if (TupleDescAttr(tupleDesc, i)->attstorage != 'm')
 				continue;
 			if (toast_sizes[i] > biggest_size)
 			{
@@ -959,7 +960,7 @@ toast_insert_or_update(Relation rel, HeapTuple newtup, HeapTuple oldtup,
 				continue;
 			if (VARATT_IS_EXTERNAL(DatumGetPointer(toast_values[i])))
 				continue;		/* can't happen, toast_action would be 'p' */
-			if (att[i]->attstorage != 'm')
+			if (TupleDescAttr(tupleDesc, i)->attstorage != 'm')
 				continue;
 			if (toast_sizes[i] > biggest_size)
 			{
@@ -1084,7 +1085,6 @@ HeapTuple
 toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc)
 {
 	HeapTuple	new_tuple;
-	Form_pg_attribute *att = tupleDesc->attrs;
 	int			numAttrs = tupleDesc->natts;
 	int			i;
 	Datum		toast_values[MaxTupleAttributeNumber];
@@ -1104,7 +1104,7 @@ toast_flatten_tuple(HeapTuple tup, TupleDesc tupleDesc)
 		/*
 		 * Look at non-null varlena attributes
 		 */
-		if (!toast_isnull[i] && att[i]->attlen == -1)
+		if (!toast_isnull[i] && TupleDescAttr(tupleDesc, i)->attlen == -1)
 		{
 			struct varlena *new_value;
 
@@ -1193,7 +1193,6 @@ toast_flatten_tuple_to_datum(HeapTupleHeader tup,
 	int32		new_data_len;
 	int32		new_tuple_len;
 	HeapTupleData tmptup;
-	Form_pg_attribute *att = tupleDesc->attrs;
 	int			numAttrs = tupleDesc->natts;
 	int			i;
 	bool		has_nulls = false;
@@ -1222,7 +1221,7 @@ toast_flatten_tuple_to_datum(HeapTupleHeader tup,
 		 */
 		if (toast_isnull[i])
 			has_nulls = true;
-		else if (att[i]->attlen == -1)
+		else if (TupleDescAttr(tupleDesc, i)->attlen == -1)
 		{
 			struct varlena *new_value;
 
@@ -1307,7 +1306,6 @@ toast_build_flattened_tuple(TupleDesc tupleDesc,
 							bool *isnull)
 {
 	HeapTuple	new_tuple;
-	Form_pg_attribute *att = tupleDesc->attrs;
 	int			numAttrs = tupleDesc->natts;
 	int			num_to_free;
 	int			i;
@@ -1327,7 +1325,7 @@ toast_build_flattened_tuple(TupleDesc tupleDesc,
 		/*
 		 * Look at non-null varlena attributes
 		 */
-		if (!isnull[i] && att[i]->attlen == -1)
+		if (!isnull[i] && TupleDescAttr(tupleDesc, i)->attlen == -1)
 		{
 			struct varlena *new_value;
 
diff --git a/src/backend/access/heap/visibilitymap.c b/src/backend/access/heap/visibilitymap.c
index 4c2a13aeba..b251e69703 100644
--- a/src/backend/access/heap/visibilitymap.c
+++ b/src/backend/access/heap/visibilitymap.c
@@ -3,7 +3,7 @@
  * visibilitymap.c
  *	  bitmap for tracking visibility of heap tuples
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/index/amapi.c b/src/backend/access/index/amapi.c
index 7b597a072f..f395cb1ab4 100644
--- a/src/backend/access/index/amapi.c
+++ b/src/backend/access/index/amapi.c
@@ -3,7 +3,7 @@
  * amapi.c
  *	  Support routines for API for Postgres index access methods.
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/access/index/amvalidate.c b/src/backend/access/index/amvalidate.c
index 80865e9ff9..24f9927f82 100644
--- a/src/backend/access/index/amvalidate.c
+++ b/src/backend/access/index/amvalidate.c
@@ -3,7 +3,7 @@
  * amvalidate.c
  *	  Support routines for index access methods' amvalidate functions.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -140,9 +140,9 @@ identify_opfamily_groups(CatCList *oprlist, CatCList *proclist)
 
 /*
  * Validate the signature (argument and result types) of an opclass support
- * function.  Return TRUE if OK, FALSE if not.
+ * function.  Return true if OK, false if not.
  *
- * The "..." represents maxargs argument-type OIDs.  If "exact" is TRUE, they
+ * The "..." represents maxargs argument-type OIDs.  If "exact" is true, they
  * must match the function arg types exactly, else only binary-coercibly.
  * In any case the function result type must match restype exactly.
  */
@@ -184,7 +184,7 @@ check_amproc_signature(Oid funcid, Oid restype, bool exact,
 
 /*
  * Validate the signature (argument and result types) of an opclass operator.
- * Return TRUE if OK, FALSE if not.
+ * Return true if OK, false if not.
  *
  * Currently, we can hard-wire this as accepting only binary operators.  Also,
  * we can insist on exact type matches, since the given lefttype/righttype
diff --git a/src/backend/access/index/genam.c b/src/backend/access/index/genam.c
index 05d7da001a..214825114e 100644
--- a/src/backend/access/index/genam.c
+++ b/src/backend/access/index/genam.c
@@ -3,7 +3,7 @@
  * genam.c
  *	  general index access method routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/index/indexam.c b/src/backend/access/index/indexam.c
index bef4255369..91247f0fa5 100644
--- a/src/backend/access/index/indexam.c
+++ b/src/backend/access/index/indexam.c
@@ -3,7 +3,7 @@
  * indexam.c
  *	  general index access method routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -154,7 +154,8 @@ index_open(Oid relationId, LOCKMODE lockmode)
 
 	r = relation_open(relationId, lockmode);
 
-	if (r->rd_rel->relkind != RELKIND_INDEX)
+	if (r->rd_rel->relkind != RELKIND_INDEX &&
+		r->rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is not an index",
@@ -784,7 +785,7 @@ index_can_return(Relation indexRelation, int attno)
 {
 	RELATION_CHECKS;
 
-	/* amcanreturn is optional; assume FALSE if not provided by AM */
+	/* amcanreturn is optional; assume false if not provided by AM */
 	if (indexRelation->rd_amroutine->amcanreturn == NULL)
 		return false;
 
diff --git a/src/backend/access/nbtree/README b/src/backend/access/nbtree/README
index a3f11da8d5..34f78b2f50 100644
--- a/src/backend/access/nbtree/README
+++ b/src/backend/access/nbtree/README
@@ -623,56 +623,3 @@ routines must treat it accordingly.  The actual key stored in the
 item is irrelevant, and need not be stored at all.  This arrangement
 corresponds to the fact that an L&Y non-leaf page has one more pointer
 than key.
-
-Notes to Operator Class Implementors
-------------------------------------
-
-With this implementation, we require each supported combination of
-datatypes to supply us with a comparison procedure via pg_amproc.
-This procedure must take two nonnull values A and B and return an int32 < 0,
-0, or > 0 if A < B, A = B, or A > B, respectively.  The procedure must
-not return INT_MIN for "A < B", since the value may be negated before
-being tested for sign.  A null result is disallowed, too.  See nbtcompare.c
-for examples.
-
-There are some basic assumptions that a btree operator family must satisfy:
-
-An = operator must be an equivalence relation; that is, for all non-null
-values A,B,C of the datatype:
-
-	A = A is true						reflexive law
-	if A = B, then B = A					symmetric law
-	if A = B and B = C, then A = C				transitive law
-
-A < operator must be a strong ordering relation; that is, for all non-null
-values A,B,C:
-
-	A < A is false						irreflexive law
-	if A < B and B < C, then A < C				transitive law
-
-Furthermore, the ordering is total; that is, for all non-null values A,B:
-
-	exactly one of A < B, A = B, and B < A is true		trichotomy law
-
-(The trichotomy law justifies the definition of the comparison support
-procedure, of course.)
-
-The other three operators are defined in terms of these two in the obvious way,
-and must act consistently with them.
-
-For an operator family supporting multiple datatypes, the above laws must hold
-when A,B,C are taken from any datatypes in the family.  The transitive laws
-are the trickiest to ensure, as in cross-type situations they represent
-statements that the behaviors of two or three different operators are
-consistent.  As an example, it would not work to put float8 and numeric into
-an opfamily, at least not with the current semantics that numerics are
-converted to float8 for comparison to a float8.  Because of the limited
-accuracy of float8, this means there are distinct numeric values that will
-compare equal to the same float8 value, and thus the transitive law fails.
-
-It should be fairly clear why a btree index requires these laws to hold within
-a single datatype: without them there is no ordering to arrange the keys with.
-Also, index searches using a key of a different datatype require comparisons
-to behave sanely across two datatypes.  The extensions to three or more
-datatypes within a family are not strictly required by the btree index
-mechanism itself, but the planner relies on them for optimization purposes.
diff --git a/src/backend/access/nbtree/nbtcompare.c b/src/backend/access/nbtree/nbtcompare.c
index 4b131efb87..b1855e8aa8 100644
--- a/src/backend/access/nbtree/nbtcompare.c
+++ b/src/backend/access/nbtree/nbtcompare.c
@@ -3,7 +3,7 @@
  * nbtcompare.c
  *	  Comparison functions for btree access method.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index bf963fcdef..51059c0c7d 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -3,7 +3,7 @@
  * nbtinsert.c
  *	  Item insertion in Lehman and Yao btrees for Postgres.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -99,8 +99,8 @@ static void _bt_vacuum_one_page(Relation rel, Buffer buffer, Relation heapRel);
  *		don't actually insert.
  *
  *		The result value is only significant for UNIQUE_CHECK_PARTIAL:
- *		it must be TRUE if the entry is known unique, else FALSE.
- *		(In the current implementation we'll also return TRUE after a
+ *		it must be true if the entry is known unique, else false.
+ *		(In the current implementation we'll also return true after a
  *		successful UNIQUE_CHECK_YES or UNIQUE_CHECK_EXISTING call, but
  *		that's just a coding artifact.)
  */
@@ -898,7 +898,7 @@ _bt_insertonpg(Relation rel,
 				xlmeta.fastroot = metad->btm_fastroot;
 				xlmeta.fastlevel = metad->btm_fastlevel;
 
-				XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT);
+				XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
 				XLogRegisterBufData(2, (char *) &xlmeta, sizeof(xl_btree_metadata));
 
 				xlinfo = XLOG_BTREE_INSERT_META;
@@ -2032,7 +2032,7 @@ _bt_newroot(Relation rel, Buffer lbuf, Buffer rbuf)
 
 		XLogRegisterBuffer(0, rootbuf, REGBUF_WILL_INIT);
 		XLogRegisterBuffer(1, lbuf, REGBUF_STANDARD);
-		XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 		md.root = rootblknum;
 		md.level = metad->btm_level;
diff --git a/src/backend/access/nbtree/nbtpage.c b/src/backend/access/nbtree/nbtpage.c
index 5c817b6510..92afe2de38 100644
--- a/src/backend/access/nbtree/nbtpage.c
+++ b/src/backend/access/nbtree/nbtpage.c
@@ -4,7 +4,7 @@
  *	  BTree-specific page management code for the Postgres btree access
  *	  method.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -65,8 +65,9 @@ _bt_initmetapage(Page page, BlockNumber rootbknum, uint32 level)
 	metaopaque->btpo_flags = BTP_META;
 
 	/*
-	 * Set pd_lower just past the end of the metadata.  This is not essential
-	 * but it makes the page look compressible to xlog.c.
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
 	 */
 	((PageHeader) page)->pd_lower =
 		((char *) metad + sizeof(BTMetaPageData)) - (char *) page;
@@ -162,7 +163,7 @@ _bt_getroot(Relation rel, int access)
 	metad = BTPageGetMeta(metapg);
 
 	/* sanity-check the metapage */
-	if (!(metaopaque->btpo_flags & BTP_META) ||
+	if (!P_ISMETA(metaopaque) ||
 		metad->btm_magic != BTREE_MAGIC)
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
@@ -241,7 +242,7 @@ _bt_getroot(Relation rel, int access)
 
 			XLogBeginInsert();
 			XLogRegisterBuffer(0, rootbuf, REGBUF_WILL_INIT);
-			XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT);
+			XLogRegisterBuffer(2, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 			md.root = rootblkno;
 			md.level = 0;
@@ -365,7 +366,7 @@ _bt_gettrueroot(Relation rel)
 	metaopaque = (BTPageOpaque) PageGetSpecialPointer(metapg);
 	metad = BTPageGetMeta(metapg);
 
-	if (!(metaopaque->btpo_flags & BTP_META) ||
+	if (!P_ISMETA(metaopaque) ||
 		metad->btm_magic != BTREE_MAGIC)
 		ereport(ERROR,
 				(errcode(ERRCODE_INDEX_CORRUPTED),
@@ -452,7 +453,7 @@ _bt_getrootheight(Relation rel)
 		metad = BTPageGetMeta(metapg);
 
 		/* sanity-check the metapage */
-		if (!(metaopaque->btpo_flags & BTP_META) ||
+		if (!P_ISMETA(metaopaque) ||
 			metad->btm_magic != BTREE_MAGIC)
 			ereport(ERROR,
 					(errcode(ERRCODE_INDEX_CORRUPTED),
@@ -1827,7 +1828,7 @@ _bt_unlink_halfdead_page(Relation rel, Buffer leafbuf, bool *rightsib_empty)
 
 		if (BufferIsValid(metabuf))
 		{
-			XLogRegisterBuffer(4, metabuf, REGBUF_WILL_INIT);
+			XLogRegisterBuffer(4, metabuf, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
 			xlmeta.root = metad->btm_root;
 			xlmeta.level = metad->btm_level;
diff --git a/src/backend/access/nbtree/nbtree.c b/src/backend/access/nbtree/nbtree.c
index 3dbafdd6fc..8158508d8c 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -8,7 +8,7 @@
  *	  This file contains only the public interface routines.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -21,36 +21,19 @@
 #include "access/nbtree.h"
 #include "access/relscan.h"
 #include "access/xlog.h"
-#include "catalog/index.h"
 #include "commands/vacuum.h"
+#include "nodes/execnodes.h"
 #include "pgstat.h"
 #include "storage/condition_variable.h"
 #include "storage/indexfsm.h"
 #include "storage/ipc.h"
 #include "storage/lmgr.h"
 #include "storage/smgr.h"
-#include "tcop/tcopprot.h"		/* pgrminclude ignore */
 #include "utils/builtins.h"
 #include "utils/index_selfuncs.h"
 #include "utils/memutils.h"
 
 
-/* Working state for btbuild and its callback */
-typedef struct
-{
-	bool		isUnique;
-	bool		haveDead;
-	Relation	heapRel;
-	BTSpool    *spool;
-
-	/*
-	 * spool2 is needed only when the index is a unique index. Dead tuples are
-	 * put into spool2 instead of spool in order to avoid uniqueness check.
-	 */
-	BTSpool    *spool2;
-	double		indtuples;
-} BTBuildState;
-
 /* Working state needed by btvacuumpage */
 typedef struct
 {
@@ -104,12 +87,6 @@ typedef struct BTParallelScanDescData
 typedef struct BTParallelScanDescData *BTParallelScanDesc;
 
 
-static void btbuildCallback(Relation index,
-				HeapTuple htup,
-				Datum *values,
-				bool *isnull,
-				bool tupleIsAlive,
-				void *state);
 static void btvacuumscan(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
 			 IndexBulkDeleteCallback callback, void *callback_state,
 			 BTCycleId cycleid);
@@ -166,115 +143,6 @@ bthandler(PG_FUNCTION_ARGS)
 	PG_RETURN_POINTER(amroutine);
 }
 
-/*
- *	btbuild() -- build a new btree index.
- */
-IndexBuildResult *
-btbuild(Relation heap, Relation index, IndexInfo *indexInfo)
-{
-	IndexBuildResult *result;
-	double		reltuples;
-	BTBuildState buildstate;
-
-	buildstate.isUnique = indexInfo->ii_Unique;
-	buildstate.haveDead = false;
-	buildstate.heapRel = heap;
-	buildstate.spool = NULL;
-	buildstate.spool2 = NULL;
-	buildstate.indtuples = 0;
-
-#ifdef BTREE_BUILD_STATS
-	if (log_btree_build_stats)
-		ResetUsage();
-#endif							/* BTREE_BUILD_STATS */
-
-	/*
-	 * We expect to be called exactly once for any index relation. If that's
-	 * not the case, big trouble's what we have.
-	 */
-	if (RelationGetNumberOfBlocks(index) != 0)
-		elog(ERROR, "index \"%s\" already contains data",
-			 RelationGetRelationName(index));
-
-	buildstate.spool = _bt_spoolinit(heap, index, indexInfo->ii_Unique, false);
-
-	/*
-	 * If building a unique index, put dead tuples in a second spool to keep
-	 * them out of the uniqueness check.
-	 */
-	if (indexInfo->ii_Unique)
-		buildstate.spool2 = _bt_spoolinit(heap, index, false, true);
-
-	/* do the heap scan */
-	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
-								   btbuildCallback, (void *) &buildstate);
-
-	/* okay, all heap tuples are indexed */
-	if (buildstate.spool2 && !buildstate.haveDead)
-	{
-		/* spool2 turns out to be unnecessary */
-		_bt_spooldestroy(buildstate.spool2);
-		buildstate.spool2 = NULL;
-	}
-
-	/*
-	 * Finish the build by (1) completing the sort of the spool file, (2)
-	 * inserting the sorted tuples into btree pages and (3) building the upper
-	 * levels.
-	 */
-	_bt_leafbuild(buildstate.spool, buildstate.spool2);
-	_bt_spooldestroy(buildstate.spool);
-	if (buildstate.spool2)
-		_bt_spooldestroy(buildstate.spool2);
-
-#ifdef BTREE_BUILD_STATS
-	if (log_btree_build_stats)
-	{
-		ShowUsage("BTREE BUILD STATS");
-		ResetUsage();
-	}
-#endif							/* BTREE_BUILD_STATS */
-
-	/*
-	 * Return statistics
-	 */
-	result = (IndexBuildResult *) palloc(sizeof(IndexBuildResult));
-
-	result->heap_tuples = reltuples;
-	result->index_tuples = buildstate.indtuples;
-
-	return result;
-}
-
-/*
- * Per-tuple callback from IndexBuildHeapScan
- */
-static void
-btbuildCallback(Relation index,
-				HeapTuple htup,
-				Datum *values,
-				bool *isnull,
-				bool tupleIsAlive,
-				void *state)
-{
-	BTBuildState *buildstate = (BTBuildState *) state;
-
-	/*
-	 * insert the index tuple into the appropriate spool file for subsequent
-	 * processing
-	 */
-	if (tupleIsAlive || buildstate->spool2 == NULL)
-		_bt_spool(buildstate->spool, &htup->t_self, values, isnull);
-	else
-	{
-		/* dead tuples are put into spool2 */
-		buildstate->haveDead = true;
-		_bt_spool(buildstate->spool2, &htup->t_self, values, isnull);
-	}
-
-	buildstate->indtuples += 1;
-}
-
 /*
  *	btbuildempty() -- build an empty btree index in the initialization fork
  */
@@ -298,7 +166,7 @@ btbuildempty(Relation index)
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, BTREE_METAPAGE,
 			  (char *) metapage, true);
 	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-				BTREE_METAPAGE, metapage, false);
+				BTREE_METAPAGE, metapage, true);
 
 	/*
 	 * An immediate sync is required even if we xlog'd the page, because the
diff --git a/src/backend/access/nbtree/nbtsearch.c b/src/backend/access/nbtree/nbtsearch.c
index 642c8943e7..51dca64e13 100644
--- a/src/backend/access/nbtree/nbtsearch.c
+++ b/src/backend/access/nbtree/nbtsearch.c
@@ -4,7 +4,7 @@
  *	  Search code for postgres btrees.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -524,7 +524,7 @@ _bt_compare(Relation rel,
  *		scan->xs_ctup.t_self is set to the heap TID of the current tuple,
  *		and if requested, scan->xs_itup points to a copy of the index tuple.
  *
- * If there are no matching items in the index, we return FALSE, with no
+ * If there are no matching items in the index, we return false, with no
  * pins or locks held.
  *
  * Note that scan->keyData[], and the so->keyData[] scankey built from it,
@@ -1224,7 +1224,7 @@ _bt_readpage(IndexScanDesc scan, ScanDirection dir, OffsetNumber offnum)
 	 * safe to apply LP_DEAD hints to the page later.  This allows us to drop
 	 * the pin for MVCC scans, which allows vacuum to avoid blocking.
 	 */
-	so->currPos.lsn = PageGetLSN(page);
+	so->currPos.lsn = BufferGetLSNAtomic(so->currPos.buf);
 
 	/*
 	 * we must save the page's right-link while scanning it; this tells us
@@ -1336,7 +1336,7 @@ _bt_saveitem(BTScanOpaque so, int itemIndex,
  *
  * For success on a scan using a non-MVCC snapshot we hold a pin, but not a
  * read lock, on that page.  If we do not hold the pin, we set so->currPos.buf
- * to InvalidBuffer.  We return TRUE to indicate success.
+ * to InvalidBuffer.  We return true to indicate success.
  */
 static bool
 _bt_steppage(IndexScanDesc scan, ScanDirection dir)
@@ -1440,10 +1440,10 @@ _bt_steppage(IndexScanDesc scan, ScanDirection dir)
  *
  * On success exit, so->currPos is updated to contain data from the next
  * interesting page.  Caller is responsible to release lock and pin on
- * buffer on success.  We return TRUE to indicate success.
+ * buffer on success.  We return true to indicate success.
  *
  * If there are no more matching records in the given direction, we drop all
- * locks and pins, set so->currPos.buf to InvalidBuffer, and return FALSE.
+ * locks and pins, set so->currPos.buf to InvalidBuffer, and return false.
  */
 static bool
 _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno, ScanDirection dir)
@@ -1486,6 +1486,11 @@ _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno, ScanDirection dir)
 				if (_bt_readpage(scan, dir, P_FIRSTDATAKEY(opaque)))
 					break;
 			}
+			else if (scan->parallel_scan != NULL)
+			{
+				/* allow next page be processed by parallel worker */
+				_bt_parallel_release(scan, opaque->btpo_next);
+			}
 
 			/* nope, keep going */
 			if (scan->parallel_scan != NULL)
@@ -1581,6 +1586,11 @@ _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno, ScanDirection dir)
 				if (_bt_readpage(scan, dir, PageGetMaxOffsetNumber(page)))
 					break;
 			}
+			else if (scan->parallel_scan != NULL)
+			{
+				/* allow next page be processed by parallel worker */
+				_bt_parallel_release(scan, BufferGetBlockNumber(so->currPos.buf));
+			}
 
 			/*
 			 * For parallel scans, get the last page scanned as it is quite
@@ -1608,7 +1618,7 @@ _bt_readnextpage(IndexScanDesc scan, BlockNumber blkno, ScanDirection dir)
 /*
  *	_bt_parallel_readpage() -- Read current page containing valid data for scan
  *
- * On success, release lock and maybe pin on buffer.  We return TRUE to
+ * On success, release lock and maybe pin on buffer.  We return true to
  * indicate success.
  */
 static bool
diff --git a/src/backend/access/nbtree/nbtsort.c b/src/backend/access/nbtree/nbtsort.c
index bf6c03c7b2..521ae6e5f7 100644
--- a/src/backend/access/nbtree/nbtsort.c
+++ b/src/backend/access/nbtree/nbtsort.c
@@ -55,7 +55,7 @@
  * This code isn't concerned about the FSM at all. The caller is responsible
  * for initializing that.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -67,28 +67,168 @@
 #include "postgres.h"
 
 #include "access/nbtree.h"
+#include "access/parallel.h"
+#include "access/relscan.h"
+#include "access/xact.h"
 #include "access/xlog.h"
 #include "access/xloginsert.h"
+#include "catalog/index.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "storage/smgr.h"
-#include "tcop/tcopprot.h"
+#include "tcop/tcopprot.h"		/* pgrminclude ignore */
 #include "utils/rel.h"
 #include "utils/sortsupport.h"
 #include "utils/tuplesort.h"
 
 
+/* Magic numbers for parallel state sharing */
+#define PARALLEL_KEY_BTREE_SHARED		UINT64CONST(0xA000000000000001)
+#define PARALLEL_KEY_TUPLESORT			UINT64CONST(0xA000000000000002)
+#define PARALLEL_KEY_TUPLESORT_SPOOL2	UINT64CONST(0xA000000000000003)
+
+/*
+ * DISABLE_LEADER_PARTICIPATION disables the leader's participation in
+ * parallel index builds.  This may be useful as a debugging aid.
+#undef DISABLE_LEADER_PARTICIPATION
+ */
+
 /*
  * Status record for spooling/sorting phase.  (Note we may have two of
  * these due to the special requirements for uniqueness-checking with
  * dead tuples.)
  */
-struct BTSpool
+typedef struct BTSpool
 {
 	Tuplesortstate *sortstate;	/* state data for tuplesort.c */
 	Relation	heap;
 	Relation	index;
 	bool		isunique;
-};
+} BTSpool;
+
+/*
+ * Status for index builds performed in parallel.  This is allocated in a
+ * dynamic shared memory segment.  Note that there is a separate tuplesort TOC
+ * entry, private to tuplesort.c but allocated by this module on its behalf.
+ */
+typedef struct BTShared
+{
+	/*
+	 * These fields are not modified during the sort.  They primarily exist
+	 * for the benefit of worker processes that need to create BTSpool state
+	 * corresponding to that used by the leader.
+	 */
+	Oid			heaprelid;
+	Oid			indexrelid;
+	bool		isunique;
+	bool		isconcurrent;
+	int			scantuplesortstates;
+
+	/*
+	 * workersdonecv is used to monitor the progress of workers.  All parallel
+	 * participants must indicate that they are done before leader can use
+	 * mutable state that workers maintain during scan (and before leader can
+	 * proceed to tuplesort_performsort()).
+	 */
+	ConditionVariable workersdonecv;
+
+	/*
+	 * mutex protects all fields before heapdesc.
+	 *
+	 * These fields contain status information of interest to B-Tree index
+	 * builds that must work just the same when an index is built in parallel.
+	 */
+	slock_t		mutex;
+
+	/*
+	 * Mutable state that is maintained by workers, and reported back to
+	 * leader at end of parallel scan.
+	 *
+	 * nparticipantsdone is number of worker processes finished.
+	 *
+	 * reltuples is the total number of input heap tuples.
+	 *
+	 * havedead indicates if RECENTLY_DEAD tuples were encountered during
+	 * build.
+	 *
+	 * indtuples is the total number of tuples that made it into the index.
+	 *
+	 * brokenhotchain indicates if any worker detected a broken HOT chain
+	 * during build.
+	 */
+	int			nparticipantsdone;
+	double		reltuples;
+	bool		havedead;
+	double		indtuples;
+	bool		brokenhotchain;
+
+	/*
+	 * This variable-sized field must come last.
+	 *
+	 * See _bt_parallel_estimate_shared().
+	 */
+	ParallelHeapScanDescData heapdesc;
+} BTShared;
+
+/*
+ * Status for leader in parallel index build.
+ */
+typedef struct BTLeader
+{
+	/* parallel context itself */
+	ParallelContext *pcxt;
+
+	/*
+	 * nparticipanttuplesorts is the exact number of worker processes
+	 * successfully launched, plus one leader process if it participates as a
+	 * worker (only DISABLE_LEADER_PARTICIPATION builds avoid leader
+	 * participating as a worker).
+	 */
+	int			nparticipanttuplesorts;
+
+	/*
+	 * Leader process convenience pointers to shared state (leader avoids TOC
+	 * lookups).
+	 *
+	 * btshared is the shared state for entire build.  sharedsort is the
+	 * shared, tuplesort-managed state passed to each process tuplesort.
+	 * sharedsort2 is the corresponding btspool2 shared state, used only when
+	 * building unique indexes.  snapshot is the snapshot used by the scan iff
+	 * an MVCC snapshot is required.
+	 */
+	BTShared   *btshared;
+	Sharedsort *sharedsort;
+	Sharedsort *sharedsort2;
+	Snapshot	snapshot;
+} BTLeader;
+
+/*
+ * Working state for btbuild and its callback.
+ *
+ * When parallel CREATE INDEX is used, there is a BTBuildState for each
+ * participant.
+ */
+typedef struct BTBuildState
+{
+	bool		isunique;
+	bool		havedead;
+	Relation	heap;
+	BTSpool    *spool;
+
+	/*
+	 * spool2 is needed only when the index is a unique index. Dead tuples are
+	 * put into spool2 instead of spool in order to avoid uniqueness check.
+	 */
+	BTSpool    *spool2;
+	double		indtuples;
+
+	/*
+	 * btleader is only present when a parallel index build is performed, and
+	 * only in the leader process. (Actually, only the leader has a
+	 * BTBuildState.  Workers have their own spool and spool2, though.)
+	 */
+	BTLeader   *btleader;
+} BTBuildState;
 
 /*
  * Status record for a btree page being built.  We have one of these
@@ -128,6 +268,14 @@ typedef struct BTWriteState
 } BTWriteState;
 
 
+static double _bt_spools_heapscan(Relation heap, Relation index,
+					BTBuildState *buildstate, IndexInfo *indexInfo);
+static void _bt_spooldestroy(BTSpool *btspool);
+static void _bt_spool(BTSpool *btspool, ItemPointer self,
+		  Datum *values, bool *isnull);
+static void _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2);
+static void _bt_build_callback(Relation index, HeapTuple htup, Datum *values,
+				   bool *isnull, bool tupleIsAlive, void *state);
 static Page _bt_blnewpage(uint32 level);
 static BTPageState *_bt_pagestate(BTWriteState *wstate, uint32 level);
 static void _bt_slideleft(Page page);
@@ -138,45 +286,219 @@ static void _bt_buildadd(BTWriteState *wstate, BTPageState *state,
 static void _bt_uppershutdown(BTWriteState *wstate, BTPageState *state);
 static void _bt_load(BTWriteState *wstate,
 		 BTSpool *btspool, BTSpool *btspool2);
+static void _bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent,
+				   int request);
+static void _bt_end_parallel(BTLeader *btleader);
+static Size _bt_parallel_estimate_shared(Snapshot snapshot);
+static double _bt_parallel_heapscan(BTBuildState *buildstate,
+					  bool *brokenhotchain);
+static void _bt_leader_participate_as_worker(BTBuildState *buildstate);
+static void _bt_parallel_scan_and_sort(BTSpool *btspool, BTSpool *btspool2,
+						   BTShared *btshared, Sharedsort *sharedsort,
+						   Sharedsort *sharedsort2, int sortmem);
 
 
 /*
- * Interface routines
+ *	btbuild() -- build a new btree index.
  */
+IndexBuildResult *
+btbuild(Relation heap, Relation index, IndexInfo *indexInfo)
+{
+	IndexBuildResult *result;
+	BTBuildState buildstate;
+	double		reltuples;
+
+#ifdef BTREE_BUILD_STATS
+	if (log_btree_build_stats)
+		ResetUsage();
+#endif							/* BTREE_BUILD_STATS */
+
+	buildstate.isunique = indexInfo->ii_Unique;
+	buildstate.havedead = false;
+	buildstate.heap = heap;
+	buildstate.spool = NULL;
+	buildstate.spool2 = NULL;
+	buildstate.indtuples = 0;
+	buildstate.btleader = NULL;
+
+	/*
+	 * We expect to be called exactly once for any index relation. If that's
+	 * not the case, big trouble's what we have.
+	 */
+	if (RelationGetNumberOfBlocks(index) != 0)
+		elog(ERROR, "index \"%s\" already contains data",
+			 RelationGetRelationName(index));
+
+	reltuples = _bt_spools_heapscan(heap, index, &buildstate, indexInfo);
+
+	/*
+	 * Finish the build by (1) completing the sort of the spool file, (2)
+	 * inserting the sorted tuples into btree pages and (3) building the upper
+	 * levels.  Finally, it may also be necessary to end use of parallelism.
+	 */
+	_bt_leafbuild(buildstate.spool, buildstate.spool2);
+	_bt_spooldestroy(buildstate.spool);
+	if (buildstate.spool2)
+		_bt_spooldestroy(buildstate.spool2);
+	if (buildstate.btleader)
+		_bt_end_parallel(buildstate.btleader);
+
+	result = (IndexBuildResult *) palloc(sizeof(IndexBuildResult));
+
+	result->heap_tuples = reltuples;
+	result->index_tuples = buildstate.indtuples;
+
+#ifdef BTREE_BUILD_STATS
+	if (log_btree_build_stats)
+	{
+		ShowUsage("BTREE BUILD STATS");
+		ResetUsage();
+	}
+#endif							/* BTREE_BUILD_STATS */
 
+	return result;
+}
 
 /*
- * create and initialize a spool structure
+ * Create and initialize one or two spool structures, and save them in caller's
+ * buildstate argument.  May also fill-in fields within indexInfo used by index
+ * builds.
+ *
+ * Scans the heap, possibly in parallel, filling spools with IndexTuples.  This
+ * routine encapsulates all aspects of managing parallelism.  Caller need only
+ * call _bt_end_parallel() in parallel case after it is done with spool/spool2.
+ *
+ * Returns the total number of heap tuples scanned.
  */
-BTSpool *
-_bt_spoolinit(Relation heap, Relation index, bool isunique, bool isdead)
+static double
+_bt_spools_heapscan(Relation heap, Relation index, BTBuildState *buildstate,
+					IndexInfo *indexInfo)
 {
 	BTSpool    *btspool = (BTSpool *) palloc0(sizeof(BTSpool));
-	int			btKbytes;
+	SortCoordinate coordinate = NULL;
+	double		reltuples = 0;
 
+	/*
+	 * We size the sort area as maintenance_work_mem rather than work_mem to
+	 * speed index creation.  This should be OK since a single backend can't
+	 * run multiple index creations in parallel (see also: notes on
+	 * parallelism and maintenance_work_mem below).
+	 */
 	btspool->heap = heap;
 	btspool->index = index;
-	btspool->isunique = isunique;
+	btspool->isunique = indexInfo->ii_Unique;
+
+	/* Save as primary spool */
+	buildstate->spool = btspool;
+
+	/* Attempt to launch parallel worker scan when required */
+	if (indexInfo->ii_ParallelWorkers > 0)
+		_bt_begin_parallel(buildstate, indexInfo->ii_Concurrent,
+						   indexInfo->ii_ParallelWorkers);
 
 	/*
-	 * We size the sort area as maintenance_work_mem rather than work_mem to
-	 * speed index creation.  This should be OK since a single backend can't
-	 * run multiple index creations in parallel.  Note that creation of a
-	 * unique index actually requires two BTSpool objects.  We expect that the
-	 * second one (for dead tuples) won't get very full, so we give it only
-	 * work_mem.
+	 * If parallel build requested and at least one worker process was
+	 * successfully launched, set up coordination state
 	 */
-	btKbytes = isdead ? work_mem : maintenance_work_mem;
-	btspool->sortstate = tuplesort_begin_index_btree(heap, index, isunique,
-													 btKbytes, false);
+	if (buildstate->btleader)
+	{
+		coordinate = (SortCoordinate) palloc0(sizeof(SortCoordinateData));
+		coordinate->isWorker = false;
+		coordinate->nParticipants =
+			buildstate->btleader->nparticipanttuplesorts;
+		coordinate->sharedsort = buildstate->btleader->sharedsort;
+	}
 
-	return btspool;
+	/*
+	 * Begin serial/leader tuplesort.
+	 *
+	 * In cases where parallelism is involved, the leader receives the same
+	 * share of maintenance_work_mem as a serial sort (it is generally treated
+	 * in the same way as a serial sort once we return).  Parallel worker
+	 * Tuplesortstates will have received only a fraction of
+	 * maintenance_work_mem, though.
+	 *
+	 * We rely on the lifetime of the Leader Tuplesortstate almost not
+	 * overlapping with any worker Tuplesortstate's lifetime.  There may be
+	 * some small overlap, but that's okay because we rely on leader
+	 * Tuplesortstate only allocating a small, fixed amount of memory here.
+	 * When its tuplesort_performsort() is called (by our caller), and
+	 * significant amounts of memory are likely to be used, all workers must
+	 * have already freed almost all memory held by their Tuplesortstates
+	 * (they are about to go away completely, too).  The overall effect is
+	 * that maintenance_work_mem always represents an absolute high watermark
+	 * on the amount of memory used by a CREATE INDEX operation, regardless of
+	 * the use of parallelism or any other factor.
+	 */
+	buildstate->spool->sortstate =
+		tuplesort_begin_index_btree(heap, index, buildstate->isunique,
+									maintenance_work_mem, coordinate,
+									false);
+
+	/*
+	 * If building a unique index, put dead tuples in a second spool to keep
+	 * them out of the uniqueness check.  We expect that the second spool (for
+	 * dead tuples) won't get very full, so we give it only work_mem.
+	 */
+	if (indexInfo->ii_Unique)
+	{
+		BTSpool    *btspool2 = (BTSpool *) palloc0(sizeof(BTSpool));
+		SortCoordinate coordinate2 = NULL;
+
+		/* Initialize secondary spool */
+		btspool2->heap = heap;
+		btspool2->index = index;
+		btspool2->isunique = false;
+		/* Save as secondary spool */
+		buildstate->spool2 = btspool2;
+
+		if (buildstate->btleader)
+		{
+			/*
+			 * Set up non-private state that is passed to
+			 * tuplesort_begin_index_btree() about the basic high level
+			 * coordination of a parallel sort.
+			 */
+			coordinate2 = (SortCoordinate) palloc0(sizeof(SortCoordinateData));
+			coordinate2->isWorker = false;
+			coordinate2->nParticipants =
+				buildstate->btleader->nparticipanttuplesorts;
+			coordinate2->sharedsort = buildstate->btleader->sharedsort2;
+		}
+
+		/*
+		 * We expect that the second one (for dead tuples) won't get very
+		 * full, so we give it only work_mem
+		 */
+		buildstate->spool2->sortstate =
+			tuplesort_begin_index_btree(heap, index, false, work_mem,
+										coordinate2, false);
+	}
+
+	/* Fill spool using either serial or parallel heap scan */
+	if (!buildstate->btleader)
+		reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
+									   _bt_build_callback, (void *) buildstate,
+									   NULL);
+	else
+		reltuples = _bt_parallel_heapscan(buildstate,
+										  &indexInfo->ii_BrokenHotChain);
+
+	/* okay, all heap tuples are spooled */
+	if (buildstate->spool2 && !buildstate->havedead)
+	{
+		/* spool2 turns out to be unnecessary */
+		_bt_spooldestroy(buildstate->spool2);
+		buildstate->spool2 = NULL;
+	}
+
+	return reltuples;
 }
 
 /*
  * clean up a spool structure and its substructures.
  */
-void
+static void
 _bt_spooldestroy(BTSpool *btspool)
 {
 	tuplesort_end(btspool->sortstate);
@@ -186,7 +508,7 @@ _bt_spooldestroy(BTSpool *btspool)
 /*
  * spool an index entry into the sort file.
  */
-void
+static void
 _bt_spool(BTSpool *btspool, ItemPointer self, Datum *values, bool *isnull)
 {
 	tuplesort_putindextuplevalues(btspool->sortstate, btspool->index,
@@ -197,7 +519,7 @@ _bt_spool(BTSpool *btspool, ItemPointer self, Datum *values, bool *isnull)
  * given a spool loaded by successive calls to _bt_spool,
  * create an entire btree.
  */
-void
+static void
 _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2)
 {
 	BTWriteState wstate;
@@ -231,11 +553,34 @@ _bt_leafbuild(BTSpool *btspool, BTSpool *btspool2)
 	_bt_load(&wstate, btspool, btspool2);
 }
 
-
 /*
- * Internal routines.
+ * Per-tuple callback from IndexBuildHeapScan
  */
+static void
+_bt_build_callback(Relation index,
+				   HeapTuple htup,
+				   Datum *values,
+				   bool *isnull,
+				   bool tupleIsAlive,
+				   void *state)
+{
+	BTBuildState *buildstate = (BTBuildState *) state;
 
+	/*
+	 * insert the index tuple into the appropriate spool file for subsequent
+	 * processing
+	 */
+	if (tupleIsAlive || buildstate->spool2 == NULL)
+		_bt_spool(buildstate->spool, &htup->t_self, values, isnull);
+	else
+	{
+		/* dead tuples are put into spool2 */
+		buildstate->havedead = true;
+		_bt_spool(buildstate->spool2, &htup->t_self, values, isnull);
+	}
+
+	buildstate->indtuples += 1;
+}
 
 /*
  * allocate workspace for a new, clean btree page, not linked to any siblings.
@@ -819,3 +1164,488 @@ _bt_load(BTWriteState *wstate, BTSpool *btspool, BTSpool *btspool2)
 		smgrimmedsync(wstate->index->rd_smgr, MAIN_FORKNUM);
 	}
 }
+
+/*
+ * Create parallel context, and launch workers for leader.
+ *
+ * buildstate argument should be initialized (with the exception of the
+ * tuplesort state in spools, which may later be created based on shared
+ * state initially set up here).
+ *
+ * isconcurrent indicates if operation is CREATE INDEX CONCURRENTLY.
+ *
+ * request is the target number of parallel worker processes to launch.
+ *
+ * Sets buildstate's BTLeader, which caller must use to shut down parallel
+ * mode by passing it to _bt_end_parallel() at the very end of its index
+ * build.  If not even a single worker process can be launched, this is
+ * never set, and caller should proceed with a serial index build.
+ */
+static void
+_bt_begin_parallel(BTBuildState *buildstate, bool isconcurrent, int request)
+{
+	ParallelContext *pcxt;
+	int			scantuplesortstates;
+	Snapshot	snapshot;
+	Size		estbtshared;
+	Size		estsort;
+	BTShared   *btshared;
+	Sharedsort *sharedsort;
+	Sharedsort *sharedsort2;
+	BTSpool    *btspool = buildstate->spool;
+	BTLeader   *btleader = (BTLeader *) palloc0(sizeof(BTLeader));
+	bool		leaderparticipates = true;
+
+#ifdef DISABLE_LEADER_PARTICIPATION
+	leaderparticipates = false;
+#endif
+
+	/*
+	 * Enter parallel mode, and create context for parallel build of btree
+	 * index
+	 */
+	EnterParallelMode();
+	Assert(request > 0);
+	pcxt = CreateParallelContext("postgres", "_bt_parallel_build_main",
+								 request, true);
+	scantuplesortstates = leaderparticipates ? request + 1 : request;
+
+	/*
+	 * Prepare for scan of the base relation.  In a normal index build, we use
+	 * SnapshotAny because we must retrieve all tuples and do our own time
+	 * qual checks (because we have to index RECENTLY_DEAD tuples).  In a
+	 * concurrent build, we take a regular MVCC snapshot and index whatever's
+	 * live according to that.
+	 */
+	if (!isconcurrent)
+		snapshot = SnapshotAny;
+	else
+		snapshot = RegisterSnapshot(GetTransactionSnapshot());
+
+	/*
+	 * Estimate size for at least two keys -- our own
+	 * PARALLEL_KEY_BTREE_SHARED workspace, and PARALLEL_KEY_TUPLESORT
+	 * tuplesort workspace
+	 */
+	estbtshared = _bt_parallel_estimate_shared(snapshot);
+	shm_toc_estimate_chunk(&pcxt->estimator, estbtshared);
+	estsort = tuplesort_estimate_shared(scantuplesortstates);
+	shm_toc_estimate_chunk(&pcxt->estimator, estsort);
+
+	/*
+	 * Unique case requires a second spool, and so we may have to account for
+	 * a third shared workspace -- PARALLEL_KEY_TUPLESORT_SPOOL2
+	 */
+	if (!btspool->isunique)
+		shm_toc_estimate_keys(&pcxt->estimator, 2);
+	else
+	{
+		shm_toc_estimate_chunk(&pcxt->estimator, estsort);
+		shm_toc_estimate_keys(&pcxt->estimator, 3);
+	}
+
+	/* Everyone's had a chance to ask for space, so now create the DSM */
+	InitializeParallelDSM(pcxt);
+
+	/* Store shared build state, for which we reserved space */
+	btshared = (BTShared *) shm_toc_allocate(pcxt->toc, estbtshared);
+	/* Initialize immutable state */
+	btshared->heaprelid = RelationGetRelid(btspool->heap);
+	btshared->indexrelid = RelationGetRelid(btspool->index);
+	btshared->isunique = btspool->isunique;
+	btshared->isconcurrent = isconcurrent;
+	btshared->scantuplesortstates = scantuplesortstates;
+	ConditionVariableInit(&btshared->workersdonecv);
+	SpinLockInit(&btshared->mutex);
+	/* Initialize mutable state */
+	btshared->nparticipantsdone = 0;
+	btshared->reltuples = 0.0;
+	btshared->havedead = false;
+	btshared->indtuples = 0.0;
+	btshared->brokenhotchain = false;
+	heap_parallelscan_initialize(&btshared->heapdesc, btspool->heap, snapshot);
+
+	/*
+	 * Store shared tuplesort-private state, for which we reserved space.
+	 * Then, initialize opaque state using tuplesort routine.
+	 */
+	sharedsort = (Sharedsort *) shm_toc_allocate(pcxt->toc, estsort);
+	tuplesort_initialize_shared(sharedsort, scantuplesortstates,
+								pcxt->seg);
+
+	shm_toc_insert(pcxt->toc, PARALLEL_KEY_BTREE_SHARED, btshared);
+	shm_toc_insert(pcxt->toc, PARALLEL_KEY_TUPLESORT, sharedsort);
+
+	/* Unique case requires a second spool, and associated shared state */
+	if (!btspool->isunique)
+		sharedsort2 = NULL;
+	else
+	{
+		/*
+		 * Store additional shared tuplesort-private state, for which we
+		 * reserved space.  Then, initialize opaque state using tuplesort
+		 * routine.
+		 */
+		sharedsort2 = (Sharedsort *) shm_toc_allocate(pcxt->toc, estsort);
+		tuplesort_initialize_shared(sharedsort2, scantuplesortstates,
+									pcxt->seg);
+
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_TUPLESORT_SPOOL2, sharedsort2);
+	}
+
+	/* Launch workers, saving status for leader/caller */
+	LaunchParallelWorkers(pcxt);
+	btleader->pcxt = pcxt;
+	btleader->nparticipanttuplesorts = pcxt->nworkers_launched;
+	if (leaderparticipates)
+		btleader->nparticipanttuplesorts++;
+	btleader->btshared = btshared;
+	btleader->sharedsort = sharedsort;
+	btleader->sharedsort2 = sharedsort2;
+	btleader->snapshot = snapshot;
+
+	/* If no workers were successfully launched, back out (do serial build) */
+	if (pcxt->nworkers_launched == 0)
+	{
+		_bt_end_parallel(btleader);
+		return;
+	}
+
+	/* Save leader state now that it's clear build will be parallel */
+	buildstate->btleader = btleader;
+
+	/* Join heap scan ourselves */
+	if (leaderparticipates)
+		_bt_leader_participate_as_worker(buildstate);
+
+	/*
+	 * Caller needs to wait for all launched workers when we return.  Make
+	 * sure that the failure-to-start case will not hang forever.
+	 */
+	WaitForParallelWorkersToAttach(pcxt);
+}
+
+/*
+ * Shut down workers, destroy parallel context, and end parallel mode.
+ */
+static void
+_bt_end_parallel(BTLeader *btleader)
+{
+	/* Shutdown worker processes */
+	WaitForParallelWorkersToFinish(btleader->pcxt);
+	/* Free last reference to MVCC snapshot, if one was used */
+	if (IsMVCCSnapshot(btleader->snapshot))
+		UnregisterSnapshot(btleader->snapshot);
+	DestroyParallelContext(btleader->pcxt);
+	ExitParallelMode();
+}
+
+/*
+ * Returns size of shared memory required to store state for a parallel
+ * btree index build based on the snapshot its parallel scan will use.
+ */
+static Size
+_bt_parallel_estimate_shared(Snapshot snapshot)
+{
+	if (!IsMVCCSnapshot(snapshot))
+	{
+		Assert(snapshot == SnapshotAny);
+		return sizeof(BTShared);
+	}
+
+	return add_size(offsetof(BTShared, heapdesc) +
+					offsetof(ParallelHeapScanDescData, phs_snapshot_data),
+					EstimateSnapshotSpace(snapshot));
+}
+
+/*
+ * Within leader, wait for end of heap scan.
+ *
+ * When called, parallel heap scan started by _bt_begin_parallel() will
+ * already be underway within worker processes (when leader participates
+ * as a worker, we should end up here just as workers are finishing).
+ *
+ * Fills in fields needed for ambuild statistics, and lets caller set
+ * field indicating that some worker encountered a broken HOT chain.
+ *
+ * Returns the total number of heap tuples scanned.
+ */
+static double
+_bt_parallel_heapscan(BTBuildState *buildstate, bool *brokenhotchain)
+{
+	BTShared   *btshared = buildstate->btleader->btshared;
+	int			nparticipanttuplesorts;
+	double		reltuples;
+
+	nparticipanttuplesorts = buildstate->btleader->nparticipanttuplesorts;
+	for (;;)
+	{
+		SpinLockAcquire(&btshared->mutex);
+		if (btshared->nparticipantsdone == nparticipanttuplesorts)
+		{
+			buildstate->havedead = btshared->havedead;
+			buildstate->indtuples = btshared->indtuples;
+			*brokenhotchain = btshared->brokenhotchain;
+			reltuples = btshared->reltuples;
+			SpinLockRelease(&btshared->mutex);
+			break;
+		}
+		SpinLockRelease(&btshared->mutex);
+
+		ConditionVariableSleep(&btshared->workersdonecv,
+							   WAIT_EVENT_PARALLEL_CREATE_INDEX_SCAN);
+	}
+
+	ConditionVariableCancelSleep();
+
+	return reltuples;
+}
+
+/*
+ * Within leader, participate as a parallel worker.
+ */
+static void
+_bt_leader_participate_as_worker(BTBuildState *buildstate)
+{
+	BTLeader   *btleader = buildstate->btleader;
+	BTSpool    *leaderworker;
+	BTSpool    *leaderworker2;
+	int			sortmem;
+
+	/* Allocate memory and initialize private spool */
+	leaderworker = (BTSpool *) palloc0(sizeof(BTSpool));
+	leaderworker->heap = buildstate->spool->heap;
+	leaderworker->index = buildstate->spool->index;
+	leaderworker->isunique = buildstate->spool->isunique;
+
+	/* Initialize second spool, if required */
+	if (!btleader->btshared->isunique)
+		leaderworker2 = NULL;
+	else
+	{
+		/* Allocate memory for worker's own private secondary spool */
+		leaderworker2 = (BTSpool *) palloc0(sizeof(BTSpool));
+
+		/* Initialize worker's own secondary spool */
+		leaderworker2->heap = leaderworker->heap;
+		leaderworker2->index = leaderworker->index;
+		leaderworker2->isunique = false;
+	}
+
+	/*
+	 * Might as well use reliable figure when doling out maintenance_work_mem
+	 * (when requested number of workers were not launched, this will be
+	 * somewhat higher than it is for other workers).
+	 */
+	sortmem = maintenance_work_mem / btleader->nparticipanttuplesorts;
+
+	/* Perform work common to all participants */
+	_bt_parallel_scan_and_sort(leaderworker, leaderworker2, btleader->btshared,
+							   btleader->sharedsort, btleader->sharedsort2,
+							   sortmem);
+
+#ifdef BTREE_BUILD_STATS
+	if (log_btree_build_stats)
+	{
+		ShowUsage("BTREE BUILD (Leader Partial Spool) STATISTICS");
+		ResetUsage();
+	}
+#endif							/* BTREE_BUILD_STATS */
+}
+
+/*
+ * Perform work within a launched parallel process.
+ */
+void
+_bt_parallel_build_main(dsm_segment *seg, shm_toc *toc)
+{
+	BTSpool    *btspool;
+	BTSpool    *btspool2;
+	BTShared   *btshared;
+	Sharedsort *sharedsort;
+	Sharedsort *sharedsort2;
+	Relation	heapRel;
+	Relation	indexRel;
+	LOCKMODE	heapLockmode;
+	LOCKMODE	indexLockmode;
+	int			sortmem;
+
+#ifdef BTREE_BUILD_STATS
+	if (log_btree_build_stats)
+		ResetUsage();
+#endif							/* BTREE_BUILD_STATS */
+
+	/* Look up shared state */
+	btshared = shm_toc_lookup(toc, PARALLEL_KEY_BTREE_SHARED, false);
+
+	/* Open relations using lock modes known to be obtained by index.c */
+	if (!btshared->isconcurrent)
+	{
+		heapLockmode = ShareLock;
+		indexLockmode = AccessExclusiveLock;
+	}
+	else
+	{
+		heapLockmode = ShareUpdateExclusiveLock;
+		indexLockmode = RowExclusiveLock;
+	}
+
+	/* Open relations within worker */
+	heapRel = heap_open(btshared->heaprelid, heapLockmode);
+	indexRel = index_open(btshared->indexrelid, indexLockmode);
+
+	/* Initialize worker's own spool */
+	btspool = (BTSpool *) palloc0(sizeof(BTSpool));
+	btspool->heap = heapRel;
+	btspool->index = indexRel;
+	btspool->isunique = btshared->isunique;
+
+	/* Look up shared state private to tuplesort.c */
+	sharedsort = shm_toc_lookup(toc, PARALLEL_KEY_TUPLESORT, false);
+	tuplesort_attach_shared(sharedsort, seg);
+	if (!btshared->isunique)
+	{
+		btspool2 = NULL;
+		sharedsort2 = NULL;
+	}
+	else
+	{
+		/* Allocate memory for worker's own private secondary spool */
+		btspool2 = (BTSpool *) palloc0(sizeof(BTSpool));
+
+		/* Initialize worker's own secondary spool */
+		btspool2->heap = btspool->heap;
+		btspool2->index = btspool->index;
+		btspool2->isunique = false;
+		/* Look up shared state private to tuplesort.c */
+		sharedsort2 = shm_toc_lookup(toc, PARALLEL_KEY_TUPLESORT_SPOOL2, false);
+		tuplesort_attach_shared(sharedsort2, seg);
+	}
+
+	/* Perform sorting of spool, and possibly a spool2 */
+	sortmem = maintenance_work_mem / btshared->scantuplesortstates;
+	_bt_parallel_scan_and_sort(btspool, btspool2, btshared, sharedsort,
+							   sharedsort2, sortmem);
+
+#ifdef BTREE_BUILD_STATS
+	if (log_btree_build_stats)
+	{
+		ShowUsage("BTREE BUILD (Worker Partial Spool) STATISTICS");
+		ResetUsage();
+	}
+#endif							/* BTREE_BUILD_STATS */
+
+	index_close(indexRel, indexLockmode);
+	heap_close(heapRel, heapLockmode);
+}
+
+/*
+ * Perform a worker's portion of a parallel sort.
+ *
+ * This generates a tuplesort for passed btspool, and a second tuplesort
+ * state if a second btspool is need (i.e. for unique index builds).  All
+ * other spool fields should already be set when this is called.
+ *
+ * sortmem is the amount of working memory to use within each worker,
+ * expressed in KBs.
+ *
+ * When this returns, workers are done, and need only release resources.
+ */
+static void
+_bt_parallel_scan_and_sort(BTSpool *btspool, BTSpool *btspool2,
+						   BTShared *btshared, Sharedsort *sharedsort,
+						   Sharedsort *sharedsort2, int sortmem)
+{
+	SortCoordinate coordinate;
+	BTBuildState buildstate;
+	HeapScanDesc scan;
+	double		reltuples;
+	IndexInfo  *indexInfo;
+
+	/* Initialize local tuplesort coordination state */
+	coordinate = palloc0(sizeof(SortCoordinateData));
+	coordinate->isWorker = true;
+	coordinate->nParticipants = -1;
+	coordinate->sharedsort = sharedsort;
+
+	/* Begin "partial" tuplesort */
+	btspool->sortstate = tuplesort_begin_index_btree(btspool->heap,
+													 btspool->index,
+													 btspool->isunique,
+													 sortmem, coordinate,
+													 false);
+
+	/*
+	 * Just as with serial case, there may be a second spool.  If so, a
+	 * second, dedicated spool2 partial tuplesort is required.
+	 */
+	if (btspool2)
+	{
+		SortCoordinate coordinate2;
+
+		/*
+		 * We expect that the second one (for dead tuples) won't get very
+		 * full, so we give it only work_mem (unless sortmem is less for
+		 * worker).  Worker processes are generally permitted to allocate
+		 * work_mem independently.
+		 */
+		coordinate2 = palloc0(sizeof(SortCoordinateData));
+		coordinate2->isWorker = true;
+		coordinate2->nParticipants = -1;
+		coordinate2->sharedsort = sharedsort2;
+		btspool2->sortstate =
+			tuplesort_begin_index_btree(btspool->heap, btspool->index, false,
+										Min(sortmem, work_mem), coordinate2,
+										false);
+	}
+
+	/* Fill in buildstate for _bt_build_callback() */
+	buildstate.isunique = btshared->isunique;
+	buildstate.havedead = false;
+	buildstate.heap = btspool->heap;
+	buildstate.spool = btspool;
+	buildstate.spool2 = btspool2;
+	buildstate.indtuples = 0;
+	buildstate.btleader = NULL;
+
+	/* Join parallel scan */
+	indexInfo = BuildIndexInfo(btspool->index);
+	indexInfo->ii_Concurrent = btshared->isconcurrent;
+	scan = heap_beginscan_parallel(btspool->heap, &btshared->heapdesc);
+	reltuples = IndexBuildHeapScan(btspool->heap, btspool->index, indexInfo,
+								   true, _bt_build_callback,
+								   (void *) &buildstate, scan);
+
+	/*
+	 * Execute this worker's part of the sort.
+	 *
+	 * Unlike leader and serial cases, we cannot avoid calling
+	 * tuplesort_performsort() for spool2 if it ends up containing no dead
+	 * tuples (this is disallowed for workers by tuplesort).
+	 */
+	tuplesort_performsort(btspool->sortstate);
+	if (btspool2)
+		tuplesort_performsort(btspool2->sortstate);
+
+	/*
+	 * Done.  Record ambuild statistics, and whether we encountered a broken
+	 * HOT chain.
+	 */
+	SpinLockAcquire(&btshared->mutex);
+	btshared->nparticipantsdone++;
+	btshared->reltuples += reltuples;
+	if (buildstate.havedead)
+		btshared->havedead = true;
+	btshared->indtuples += buildstate.indtuples;
+	if (indexInfo->ii_BrokenHotChain)
+		btshared->brokenhotchain = true;
+	SpinLockRelease(&btshared->mutex);
+
+	/* Notify leader */
+	ConditionVariableSignal(&btshared->workersdonecv);
+
+	/* We can end tuplesorts immediately */
+	tuplesort_end(btspool->sortstate);
+	if (btspool2)
+		tuplesort_end(btspool2->sortstate);
+}
diff --git a/src/backend/access/nbtree/nbtutils.c b/src/backend/access/nbtree/nbtutils.c
index dbfb775dec..752667c885 100644
--- a/src/backend/access/nbtree/nbtutils.c
+++ b/src/backend/access/nbtree/nbtutils.c
@@ -3,7 +3,7 @@
  * nbtutils.c
  *	  Utility code for Postgres btree implementation.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -540,8 +540,8 @@ _bt_start_array_keys(IndexScanDesc scan, ScanDirection dir)
 /*
  * _bt_advance_array_keys() -- Advance to next set of array elements
  *
- * Returns TRUE if there is another set of values to consider, FALSE if not.
- * On TRUE result, the scankeys are initialized with the next set of values.
+ * Returns true if there is another set of values to consider, false if not.
+ * On true result, the scankeys are initialized with the next set of values.
  */
 bool
 _bt_advance_array_keys(IndexScanDesc scan, ScanDirection dir)
@@ -724,7 +724,7 @@ _bt_restore_array_keys(IndexScanDesc scan)
  * for a forward scan; or after the last match for a backward scan.)
  *
  * As a byproduct of this work, we can detect contradictory quals such
- * as "x = 1 AND x > 2".  If we see that, we return so->qual_ok = FALSE,
+ * as "x = 1 AND x > 2".  If we see that, we return so->qual_ok = false,
  * indicating the scan need not be run at all since no tuples can match.
  * (In this case we do not bother completing the output key array!)
  * Again, missing cross-type operators might cause us to fail to prove the
@@ -1020,7 +1020,7 @@ _bt_preprocess_keys(IndexScanDesc scan)
  *
  * If the opfamily doesn't supply a complete set of cross-type operators we
  * may not be able to make the comparison.  If we can make the comparison
- * we store the operator result in *result and return TRUE.  We return FALSE
+ * we store the operator result in *result and return true.  We return false
  * if the comparison could not be made.
  *
  * Note: op always points at the same ScanKey as either leftarg or rightarg.
@@ -1185,8 +1185,8 @@ _bt_compare_scankey_args(IndexScanDesc scan, ScanKey op,
  *
  * Lastly, for ordinary scankeys (not IS NULL/NOT NULL), we check for a
  * NULL comparison value.  Since all btree operators are assumed strict,
- * a NULL means that the qual cannot be satisfied.  We return TRUE if the
- * comparison value isn't NULL, or FALSE if the scan should be abandoned.
+ * a NULL means that the qual cannot be satisfied.  We return true if the
+ * comparison value isn't NULL, or false if the scan should be abandoned.
  *
  * This function is applied to the *input* scankey structure; therefore
  * on a rescan we will be looking at already-processed scankeys.  Hence
@@ -1772,7 +1772,7 @@ _bt_killitems(IndexScanDesc scan)
 			return;
 
 		page = BufferGetPage(buf);
-		if (PageGetLSN(page) == so->currPos.lsn)
+		if (BufferGetLSNAtomic(buf) == so->currPos.lsn)
 			so->currPos.buf = buf;
 		else
 		{
diff --git a/src/backend/access/nbtree/nbtvalidate.c b/src/backend/access/nbtree/nbtvalidate.c
index 5aae53ac68..f24091c0ad 100644
--- a/src/backend/access/nbtree/nbtvalidate.c
+++ b/src/backend/access/nbtree/nbtvalidate.c
@@ -3,7 +3,7 @@
  * nbtvalidate.c
  *	  Opclass validator for btree.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -51,6 +51,7 @@ btvalidate(Oid opclassoid)
 	List	   *grouplist;
 	OpFamilyOpFuncGroup *opclassgroup;
 	List	   *familytypes;
+	int			usefulgroups;
 	int			i;
 	ListCell   *lc;
 
@@ -95,6 +96,14 @@ btvalidate(Oid opclassoid)
 				ok = check_amproc_signature(procform->amproc, VOIDOID, true,
 											1, 1, INTERNALOID);
 				break;
+			case BTINRANGE_PROC:
+				ok = check_amproc_signature(procform->amproc, BOOLOID, true,
+											5, 5,
+											procform->amproclefttype,
+											procform->amproclefttype,
+											procform->amprocrighttype,
+											BOOLOID, BOOLOID);
+				break;
 			default:
 				ereport(INFO,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -165,12 +174,28 @@ btvalidate(Oid opclassoid)
 
 	/* Now check for inconsistent groups of operators/functions */
 	grouplist = identify_opfamily_groups(oprlist, proclist);
+	usefulgroups = 0;
 	opclassgroup = NULL;
 	familytypes = NIL;
 	foreach(lc, grouplist)
 	{
 		OpFamilyOpFuncGroup *thisgroup = (OpFamilyOpFuncGroup *) lfirst(lc);
 
+		/*
+		 * It is possible for an in_range support function to have a RHS type
+		 * that is otherwise irrelevant to the opfamily --- for instance, SQL
+		 * requires the datetime_ops opclass to have range support with an
+		 * interval offset.  So, if this group appears to contain only an
+		 * in_range function, ignore it: it doesn't represent a pair of
+		 * supported types.
+		 */
+		if (thisgroup->operatorset == 0 &&
+			thisgroup->functionset == (1 << BTINRANGE_PROC))
+			continue;
+
+		/* Else count it as a relevant group */
+		usefulgroups++;
+
 		/* Remember the group exactly matching the test opclass */
 		if (thisgroup->lefttype == opcintype &&
 			thisgroup->righttype == opcintype)
@@ -186,8 +211,8 @@ btvalidate(Oid opclassoid)
 
 		/*
 		 * Complain if there seems to be an incomplete set of either operators
-		 * or support functions for this datatype pair.  The only thing that
-		 * is considered optional is the sortsupport function.
+		 * or support functions for this datatype pair.  The only things
+		 * considered optional are the sortsupport and in_range functions.
 		 */
 		if (thisgroup->operatorset !=
 			((1 << BTLessStrategyNumber) |
@@ -234,8 +259,7 @@ btvalidate(Oid opclassoid)
 	 * additional qual clauses from equivalence classes, so it seems
 	 * reasonable to insist that all built-in btree opfamilies be complete.
 	 */
-	if (list_length(grouplist) !=
-		list_length(familytypes) * list_length(familytypes))
+	if (usefulgroups != (list_length(familytypes) * list_length(familytypes)))
 	{
 		ereport(INFO,
 				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
diff --git a/src/backend/access/nbtree/nbtxlog.c b/src/backend/access/nbtree/nbtxlog.c
index 3610c7c7e0..bed1dd2a09 100644
--- a/src/backend/access/nbtree/nbtxlog.c
+++ b/src/backend/access/nbtree/nbtxlog.c
@@ -4,7 +4,7 @@
  *	  WAL replay logic for btrees.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -107,8 +107,9 @@ _bt_restore_meta(XLogReaderState *record, uint8 block_id)
 	pageop->btpo_flags = BTP_META;
 
 	/*
-	 * Set pd_lower just past the end of the metadata.  This is not essential
-	 * but it makes the page look compressible to xlog.c.
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
 	 */
 	((PageHeader) metapg)->pd_lower =
 		((char *) md + sizeof(BTMetaPageData)) - (char *) metapg;
@@ -135,7 +136,7 @@ _bt_clear_incomplete_split(XLogReaderState *record, uint8 block_id)
 		Page		page = (Page) BufferGetPage(buf);
 		BTPageOpaque pageop = (BTPageOpaque) PageGetSpecialPointer(page);
 
-		Assert((pageop->btpo_flags & BTP_INCOMPLETE_SPLIT) != 0);
+		Assert(P_INCOMPLETE_SPLIT(pageop));
 		pageop->btpo_flags &= ~BTP_INCOMPLETE_SPLIT;
 
 		PageSetLSN(page, lsn);
@@ -598,7 +599,7 @@ btree_xlog_delete_get_latestRemovedXid(XLogReaderState *record)
 			UnlockReleaseBuffer(ibuffer);
 			return InvalidTransactionId;
 		}
-		LockBuffer(hbuffer, BUFFER_LOCK_SHARE);
+		LockBuffer(hbuffer, BT_READ);
 		hpage = (Page) BufferGetPage(hbuffer);
 
 		/*
@@ -1034,7 +1035,7 @@ btree_mask(char *pagedata, BlockNumber blkno)
 	Page		page = (Page) pagedata;
 	BTPageOpaque maskopaq;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 	mask_unused_space(page);
diff --git a/src/backend/access/rmgrdesc/brindesc.c b/src/backend/access/rmgrdesc/brindesc.c
index 8eb5275a8b..d464234254 100644
--- a/src/backend/access/rmgrdesc/brindesc.c
+++ b/src/backend/access/rmgrdesc/brindesc.c
@@ -3,7 +3,7 @@
  * brindesc.c
  *	  rmgr descriptor routines for BRIN indexes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/clogdesc.c b/src/backend/access/rmgrdesc/clogdesc.c
index 9181154ffd..4c00d4d1f8 100644
--- a/src/backend/access/rmgrdesc/clogdesc.c
+++ b/src/backend/access/rmgrdesc/clogdesc.c
@@ -3,7 +3,7 @@
  * clogdesc.c
  *	  rmgr descriptor routines for access/transam/clog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/committsdesc.c b/src/backend/access/rmgrdesc/committsdesc.c
index 3e670bd543..b6e210398d 100644
--- a/src/backend/access/rmgrdesc/committsdesc.c
+++ b/src/backend/access/rmgrdesc/committsdesc.c
@@ -3,7 +3,7 @@
  * committsdesc.c
  *	  rmgr descriptor routines for access/transam/commit_ts.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/dbasedesc.c b/src/backend/access/rmgrdesc/dbasedesc.c
index 768242cfd5..39e26d7ed4 100644
--- a/src/backend/access/rmgrdesc/dbasedesc.c
+++ b/src/backend/access/rmgrdesc/dbasedesc.c
@@ -3,7 +3,7 @@
  * dbasedesc.c
  *	  rmgr descriptor routines for commands/dbcommands.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/genericdesc.c b/src/backend/access/rmgrdesc/genericdesc.c
index c4705428f1..4e9bba804d 100644
--- a/src/backend/access/rmgrdesc/genericdesc.c
+++ b/src/backend/access/rmgrdesc/genericdesc.c
@@ -4,7 +4,7 @@
  *	  rmgr descriptor routines for access/transam/generic_xlog.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/rmgrdesc/genericdesc.c
diff --git a/src/backend/access/rmgrdesc/gindesc.c b/src/backend/access/rmgrdesc/gindesc.c
index 02c887496e..3456187e3d 100644
--- a/src/backend/access/rmgrdesc/gindesc.c
+++ b/src/backend/access/rmgrdesc/gindesc.c
@@ -3,7 +3,7 @@
  * gindesc.c
  *	  rmgr descriptor routines for access/transam/gin/ginxlog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/gistdesc.c b/src/backend/access/rmgrdesc/gistdesc.c
index dc0506913c..e5e925e0c5 100644
--- a/src/backend/access/rmgrdesc/gistdesc.c
+++ b/src/backend/access/rmgrdesc/gistdesc.c
@@ -3,7 +3,7 @@
  * gistdesc.c
  *	  rmgr descriptor routines for access/gist/gistxlog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/hashdesc.c b/src/backend/access/rmgrdesc/hashdesc.c
index 3e9236122b..3c53c84f1a 100644
--- a/src/backend/access/rmgrdesc/hashdesc.c
+++ b/src/backend/access/rmgrdesc/hashdesc.c
@@ -3,7 +3,7 @@
  * hashdesc.c
  *	  rmgr descriptor routines for access/hash/hash.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/heapdesc.c b/src/backend/access/rmgrdesc/heapdesc.c
index 44d2d6333f..b00c071cb6 100644
--- a/src/backend/access/rmgrdesc/heapdesc.c
+++ b/src/backend/access/rmgrdesc/heapdesc.c
@@ -3,7 +3,7 @@
  * heapdesc.c
  *	  rmgr descriptor routines for access/heap/heapam.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/logicalmsgdesc.c b/src/backend/access/rmgrdesc/logicalmsgdesc.c
index 0b971c2aee..5b26da1b86 100644
--- a/src/backend/access/rmgrdesc/logicalmsgdesc.c
+++ b/src/backend/access/rmgrdesc/logicalmsgdesc.c
@@ -3,7 +3,7 @@
  * logicalmsgdesc.c
  *	  rmgr descriptor routines for replication/logical/message.c
  *
- * Portions Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/access/rmgrdesc/mxactdesc.c b/src/backend/access/rmgrdesc/mxactdesc.c
index 9c17447744..bd13837bd4 100644
--- a/src/backend/access/rmgrdesc/mxactdesc.c
+++ b/src/backend/access/rmgrdesc/mxactdesc.c
@@ -3,7 +3,7 @@
  * mxactdesc.c
  *	  rmgr descriptor routines for access/transam/multixact.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/nbtdesc.c b/src/backend/access/rmgrdesc/nbtdesc.c
index a3e1331fe2..c8caf56368 100644
--- a/src/backend/access/rmgrdesc/nbtdesc.c
+++ b/src/backend/access/rmgrdesc/nbtdesc.c
@@ -3,7 +3,7 @@
  * nbtdesc.c
  *	  rmgr descriptor routines for access/nbtree/nbtxlog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/relmapdesc.c b/src/backend/access/rmgrdesc/relmapdesc.c
index 4cbdf37c70..5dbec9d94c 100644
--- a/src/backend/access/rmgrdesc/relmapdesc.c
+++ b/src/backend/access/rmgrdesc/relmapdesc.c
@@ -3,7 +3,7 @@
  * relmapdesc.c
  *	  rmgr descriptor routines for utils/cache/relmapper.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/replorigindesc.c b/src/backend/access/rmgrdesc/replorigindesc.c
index c43f850f8e..2719bf4a28 100644
--- a/src/backend/access/rmgrdesc/replorigindesc.c
+++ b/src/backend/access/rmgrdesc/replorigindesc.c
@@ -3,7 +3,7 @@
  * replorigindesc.c
  *	  rmgr descriptor routines for replication/logical/origin.c
  *
- * Portions Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/access/rmgrdesc/seqdesc.c b/src/backend/access/rmgrdesc/seqdesc.c
index 2209f7284e..5c11eb00f0 100644
--- a/src/backend/access/rmgrdesc/seqdesc.c
+++ b/src/backend/access/rmgrdesc/seqdesc.c
@@ -3,7 +3,7 @@
  * seqdesc.c
  *	  rmgr descriptor routines for commands/sequence.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/smgrdesc.c b/src/backend/access/rmgrdesc/smgrdesc.c
index b8174373dd..517de60084 100644
--- a/src/backend/access/rmgrdesc/smgrdesc.c
+++ b/src/backend/access/rmgrdesc/smgrdesc.c
@@ -3,7 +3,7 @@
  * smgrdesc.c
  *	  rmgr descriptor routines for catalog/storage.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/spgdesc.c b/src/backend/access/rmgrdesc/spgdesc.c
index 41ed84b168..92b1392974 100644
--- a/src/backend/access/rmgrdesc/spgdesc.c
+++ b/src/backend/access/rmgrdesc/spgdesc.c
@@ -3,7 +3,7 @@
  * spgdesc.c
  *	  rmgr descriptor routines for access/spgist/spgxlog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/standbydesc.c b/src/backend/access/rmgrdesc/standbydesc.c
index 278546a728..76825a8d9c 100644
--- a/src/backend/access/rmgrdesc/standbydesc.c
+++ b/src/backend/access/rmgrdesc/standbydesc.c
@@ -3,7 +3,7 @@
  * standbydesc.c
  *	  rmgr descriptor routines for storage/ipc/standby.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/tblspcdesc.c b/src/backend/access/rmgrdesc/tblspcdesc.c
index 47c42328f3..d97762687b 100644
--- a/src/backend/access/rmgrdesc/tblspcdesc.c
+++ b/src/backend/access/rmgrdesc/tblspcdesc.c
@@ -3,7 +3,7 @@
  * tblspcdesc.c
  *	  rmgr descriptor routines for commands/tablespace.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/xactdesc.c b/src/backend/access/rmgrdesc/xactdesc.c
index 3aafa79e52..e5eef9ea43 100644
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@ -3,7 +3,7 @@
  * xactdesc.c
  *	  rmgr descriptor routines for access/transam/xact.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/rmgrdesc/xlogdesc.c b/src/backend/access/rmgrdesc/xlogdesc.c
index f72f076017..00741c7b09 100644
--- a/src/backend/access/rmgrdesc/xlogdesc.c
+++ b/src/backend/access/rmgrdesc/xlogdesc.c
@@ -3,7 +3,7 @@
  * xlogdesc.c
  *	  rmgr descriptor routines for access/transam/xlog.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/spgist/spgdoinsert.c b/src/backend/access/spgist/spgdoinsert.c
index b0702a7f92..7bf26f8bae 100644
--- a/src/backend/access/spgist/spgdoinsert.c
+++ b/src/backend/access/spgist/spgdoinsert.c
@@ -4,7 +4,7 @@
  *	  implementation of insert algorithm
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -580,7 +580,7 @@ setRedirectionTuple(SPPageDesc *current, OffsetNumber position,
  * Test to see if the user-defined picksplit function failed to do its job,
  * ie, it put all the leaf tuples into the same node.
  * If so, randomly divide the tuples into several nodes (all with the same
- * label) and return TRUE to select allTheSame mode for this inner tuple.
+ * label) and return true to select allTheSame mode for this inner tuple.
  *
  * (This code is also used to forcibly select allTheSame mode for nulls.)
  *
@@ -1906,14 +1906,37 @@ spgdoinsert(Relation index, SpGistState *state,
 		procinfo = index_getprocinfo(index, 1, SPGIST_CHOOSE_PROC);
 
 	/*
-	 * Since we don't use index_form_tuple in this AM, we have to make sure
+	 * Prepare the leaf datum to insert.
+	 *
+	 * If an optional "compress" method is provided, then call it to form
+	 * the leaf datum from the input datum.  Otherwise store the input datum as
+	 * is.  Since we don't use index_form_tuple in this AM, we have to make sure
 	 * value to be inserted is not toasted; FormIndexDatum doesn't guarantee
-	 * that.
+	 * that.  But we assume the "compress" method to return an untoasted value.
 	 */
-	if (!isnull && state->attType.attlen == -1)
-		datum = PointerGetDatum(PG_DETOAST_DATUM(datum));
+	if (!isnull)
+	{
+		if (OidIsValid(index_getprocid(index, 1, SPGIST_COMPRESS_PROC)))
+		{
+			FmgrInfo   *compressProcinfo = NULL;
+
+			compressProcinfo = index_getprocinfo(index, 1, SPGIST_COMPRESS_PROC);
+			leafDatum = FunctionCall1Coll(compressProcinfo,
+										  index->rd_indcollation[0],
+										  datum);
+		}
+		else
+		{
+			Assert(state->attLeafType.type == state->attType.type);
 
-	leafDatum = datum;
+			if (state->attType.attlen == -1)
+				leafDatum = PointerGetDatum(PG_DETOAST_DATUM(datum));
+			else
+				leafDatum = datum;
+		}
+	}
+	else
+		leafDatum = (Datum) 0;
 
 	/*
 	 * Compute space needed for a leaf tuple containing the given datum.
@@ -1923,7 +1946,7 @@ spgdoinsert(Relation index, SpGistState *state,
 	 */
 	if (!isnull)
 		leafSize = SGLTHDRSZ + sizeof(ItemIdData) +
-			SpGistGetTypeSize(&state->attType, leafDatum);
+			SpGistGetTypeSize(&state->attLeafType, leafDatum);
 	else
 		leafSize = SGDTSIZE + sizeof(ItemIdData);
 
@@ -2138,7 +2161,7 @@ spgdoinsert(Relation index, SpGistState *state,
 					{
 						leafDatum = out.result.matchNode.restDatum;
 						leafSize = SGLTHDRSZ + sizeof(ItemIdData) +
-							SpGistGetTypeSize(&state->attType, leafDatum);
+							SpGistGetTypeSize(&state->attLeafType, leafDatum);
 					}
 
 					/*
diff --git a/src/backend/access/spgist/spginsert.c b/src/backend/access/spgist/spginsert.c
index e4b2c29b0e..34d9b48f15 100644
--- a/src/backend/access/spgist/spginsert.c
+++ b/src/backend/access/spgist/spginsert.c
@@ -5,7 +5,7 @@
  *
  * All the actual insertion logic is in spgdoinsert.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -110,7 +110,7 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 		 * Replay will re-initialize the pages, so don't take full pages
 		 * images.  No other data to log.
 		 */
-		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT);
+		XLogRegisterBuffer(0, metabuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 		XLogRegisterBuffer(1, rootbuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 		XLogRegisterBuffer(2, nullbuffer, REGBUF_WILL_INIT | REGBUF_STANDARD);
 
@@ -138,7 +138,8 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)
 											  ALLOCSET_DEFAULT_SIZES);
 
 	reltuples = IndexBuildHeapScan(heap, index, indexInfo, true,
-								   spgistBuildCallback, (void *) &buildstate);
+								   spgistBuildCallback, (void *) &buildstate,
+								   NULL);
 
 	MemoryContextDelete(buildstate.tmpCtx);
 
@@ -173,7 +174,7 @@ spgbuildempty(Relation index)
 	smgrwrite(index->rd_smgr, INIT_FORKNUM, SPGIST_METAPAGE_BLKNO,
 			  (char *) page, true);
 	log_newpage(&index->rd_smgr->smgr_rnode.node, INIT_FORKNUM,
-				SPGIST_METAPAGE_BLKNO, page, false);
+				SPGIST_METAPAGE_BLKNO, page, true);
 
 	/* Likewise for the root page. */
 	SpGistInitPage(page, SPGIST_LEAF);
diff --git a/src/backend/access/spgist/spgkdtreeproc.c b/src/backend/access/spgist/spgkdtreeproc.c
index 9a2649bf2a..556f3a4e07 100644
--- a/src/backend/access/spgist/spgkdtreeproc.c
+++ b/src/backend/access/spgist/spgkdtreeproc.c
@@ -4,7 +4,7 @@
  *	  implementation of k-d tree over points for SP-GiST
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/spgist/spgquadtreeproc.c b/src/backend/access/spgist/spgquadtreeproc.c
index 773774555f..8700ff3573 100644
--- a/src/backend/access/spgist/spgquadtreeproc.c
+++ b/src/backend/access/spgist/spgquadtreeproc.c
@@ -4,7 +4,7 @@
  *	  implementation of quad tree over points for SP-GiST
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/spgist/spgscan.c b/src/backend/access/spgist/spgscan.c
index 7965b5846d..854032d0cc 100644
--- a/src/backend/access/spgist/spgscan.c
+++ b/src/backend/access/spgist/spgscan.c
@@ -4,7 +4,7 @@
  *	  routines for scanning SP-GiST indexes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -40,7 +40,7 @@ typedef struct ScanStackEntry
 static void
 freeScanStackEntry(SpGistScanOpaque so, ScanStackEntry *stackEntry)
 {
-	if (!so->state.attType.attbyval &&
+	if (!so->state.attLeafType.attbyval &&
 		DatumGetPointer(stackEntry->reconstructedValue) != NULL)
 		pfree(DatumGetPointer(stackEntry->reconstructedValue));
 	if (stackEntry->traversalValue)
@@ -527,8 +527,8 @@ spgWalk(Relation index, SpGistScanOpaque so, bool scanWholeIndex,
 					if (out.reconstructedValues)
 						newEntry->reconstructedValue =
 							datumCopy(out.reconstructedValues[i],
-									  so->state.attType.attbyval,
-									  so->state.attType.attlen);
+									  so->state.attLeafType.attbyval,
+									  so->state.attLeafType.attlen);
 					else
 						newEntry->reconstructedValue = (Datum) 0;
 
diff --git a/src/backend/access/spgist/spgtextproc.c b/src/backend/access/spgist/spgtextproc.c
index 53f298b6c2..f156b2166e 100644
--- a/src/backend/access/spgist/spgtextproc.c
+++ b/src/backend/access/spgist/spgtextproc.c
@@ -29,7 +29,7 @@
  * No new entries ever get pushed into a -2-labeled child, either.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/spgist/spgutils.c b/src/backend/access/spgist/spgutils.c
index 8656af453c..c4278b0160 100644
--- a/src/backend/access/spgist/spgutils.c
+++ b/src/backend/access/spgist/spgutils.c
@@ -4,7 +4,7 @@
  *	  various support functions for SP-GiST
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -112,7 +112,7 @@ spgGetCache(Relation index)
 		 * tupdesc.  We pass this to the opclass config function so that
 		 * polymorphic opclasses are possible.
 		 */
-		atttype = index->rd_att->attrs[0]->atttypid;
+		atttype = TupleDescAttr(index->rd_att, 0)->atttypid;
 
 		/* Call the config function to get config info for the opclass */
 		in.attType = atttype;
@@ -125,6 +125,22 @@ spgGetCache(Relation index)
 
 		/* Get the information we need about each relevant datatype */
 		fillTypeDesc(&cache->attType, atttype);
+
+		if (OidIsValid(cache->config.leafType) &&
+			cache->config.leafType != atttype)
+		{
+			if (!OidIsValid(index_getprocid(index, 1, SPGIST_COMPRESS_PROC)))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("compress method must not defined when leaf type is different from input type")));
+
+			fillTypeDesc(&cache->attLeafType, cache->config.leafType);
+		}
+		else
+		{
+			cache->attLeafType = cache->attType;
+		}
+
 		fillTypeDesc(&cache->attPrefixType, cache->config.prefixType);
 		fillTypeDesc(&cache->attLabelType, cache->config.labelType);
 
@@ -164,6 +180,7 @@ initSpGistState(SpGistState *state, Relation index)
 
 	state->config = cache->config;
 	state->attType = cache->attType;
+	state->attLeafType = cache->attLeafType;
 	state->attPrefixType = cache->attPrefixType;
 	state->attLabelType = cache->attLabelType;
 
@@ -256,15 +273,27 @@ SpGistUpdateMetaPage(Relation index)
 	if (cache != NULL)
 	{
 		Buffer		metabuffer;
-		SpGistMetaPageData *metadata;
 
 		metabuffer = ReadBuffer(index, SPGIST_METAPAGE_BLKNO);
 
 		if (ConditionalLockBuffer(metabuffer))
 		{
-			metadata = SpGistPageGetMeta(BufferGetPage(metabuffer));
+			Page		metapage = BufferGetPage(metabuffer);
+			SpGistMetaPageData *metadata = SpGistPageGetMeta(metapage);
+
 			metadata->lastUsedPages = cache->lastUsedPages;
 
+			/*
+			 * Set pd_lower just past the end of the metadata.  This is
+			 * essential, because without doing so, metadata will be lost if
+			 * xlog.c compresses the page.  (We must do this here because
+			 * pre-v11 versions of PG did not set the metapage's pd_lower
+			 * correctly, so a pg_upgraded index might contain the wrong
+			 * value.)
+			 */
+			((PageHeader) metapage)->pd_lower =
+				((char *) metadata + sizeof(SpGistMetaPageData)) - (char *) metapage;
+
 			MarkBufferDirty(metabuffer);
 			UnlockReleaseBuffer(metabuffer);
 		}
@@ -534,6 +563,14 @@ SpGistInitMetapage(Page page)
 	/* initialize last-used-page cache to empty */
 	for (i = 0; i < SPGIST_CACHED_PAGES; i++)
 		metadata->lastUsedPages.cachedPage[i].blkno = InvalidBlockNumber;
+
+	/*
+	 * Set pd_lower just past the end of the metadata.  This is essential,
+	 * because without doing so, metadata will be lost if xlog.c compresses
+	 * the page.
+	 */
+	((PageHeader) page)->pd_lower =
+		((char *) metadata + sizeof(SpGistMetaPageData)) - (char *) page;
 }
 
 /*
@@ -598,7 +635,7 @@ spgFormLeafTuple(SpGistState *state, ItemPointer heapPtr,
 	/* compute space needed (note result is already maxaligned) */
 	size = SGLTHDRSZ;
 	if (!isnull)
-		size += SpGistGetTypeSize(&state->attType, datum);
+		size += SpGistGetTypeSize(&state->attLeafType, datum);
 
 	/*
 	 * Ensure that we can replace the tuple with a dead tuple later.  This
@@ -614,7 +651,7 @@ spgFormLeafTuple(SpGistState *state, ItemPointer heapPtr,
 	tup->nextOffset = InvalidOffsetNumber;
 	tup->heapPtr = *heapPtr;
 	if (!isnull)
-		memcpyDatum(SGLTDATAPTR(tup), &state->attType, datum);
+		memcpyDatum(SGLTDATAPTR(tup), &state->attLeafType, datum);
 
 	return tup;
 }
diff --git a/src/backend/access/spgist/spgvacuum.c b/src/backend/access/spgist/spgvacuum.c
index d7d5e90ef3..72839cb8f9 100644
--- a/src/backend/access/spgist/spgvacuum.c
+++ b/src/backend/access/spgist/spgvacuum.c
@@ -4,7 +4,7 @@
  *	  vacuum for SP-GiST
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/spgist/spgvalidate.c b/src/backend/access/spgist/spgvalidate.c
index 157cf2a028..8bbed7ff32 100644
--- a/src/backend/access/spgist/spgvalidate.c
+++ b/src/backend/access/spgist/spgvalidate.c
@@ -3,7 +3,7 @@
  * spgvalidate.c
  *	  Opclass validator for SP-GiST.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -22,6 +22,7 @@
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_type.h"
 #include "utils/builtins.h"
+#include "utils/lsyscache.h"
 #include "utils/regproc.h"
 #include "utils/syscache.h"
 
@@ -52,6 +53,10 @@ spgvalidate(Oid opclassoid)
 	OpFamilyOpFuncGroup *opclassgroup;
 	int			i;
 	ListCell   *lc;
+	spgConfigIn	configIn;
+	spgConfigOut configOut;
+	Oid			configOutLefttype = InvalidOid;
+	Oid			configOutRighttype = InvalidOid;
 
 	/* Fetch opclass information */
 	classtup = SearchSysCache1(CLAOID, ObjectIdGetDatum(opclassoid));
@@ -74,6 +79,7 @@ spgvalidate(Oid opclassoid)
 	/* Fetch all operators and support functions of the opfamily */
 	oprlist = SearchSysCacheList1(AMOPSTRATEGY, ObjectIdGetDatum(opfamilyoid));
 	proclist = SearchSysCacheList1(AMPROCNUM, ObjectIdGetDatum(opfamilyoid));
+	grouplist = identify_opfamily_groups(oprlist, proclist);
 
 	/* Check individual support functions */
 	for (i = 0; i < proclist->n_members; i++)
@@ -100,6 +106,40 @@ spgvalidate(Oid opclassoid)
 		switch (procform->amprocnum)
 		{
 			case SPGIST_CONFIG_PROC:
+				ok = check_amproc_signature(procform->amproc, VOIDOID, true,
+											2, 2, INTERNALOID, INTERNALOID);
+				configIn.attType = procform->amproclefttype;
+				memset(&configOut, 0, sizeof(configOut));
+
+				OidFunctionCall2(procform->amproc,
+								 PointerGetDatum(&configIn),
+								 PointerGetDatum(&configOut));
+
+				configOutLefttype = procform->amproclefttype;
+				configOutRighttype = procform->amprocrighttype;
+
+				/*
+				 * When leaf and attribute types are the same, compress function
+				 * is not required and we set corresponding bit in functionset
+				 * for later group consistency check.
+				 */
+				if (!OidIsValid(configOut.leafType) ||
+					configOut.leafType == configIn.attType)
+				{
+					foreach(lc, grouplist)
+					{
+						OpFamilyOpFuncGroup *group = lfirst(lc);
+
+						if (group->lefttype == procform->amproclefttype &&
+							group->righttype == procform->amprocrighttype)
+						{
+							group->functionset |=
+								((uint64) 1) << SPGIST_COMPRESS_PROC;
+							break;
+						}
+					}
+				}
+				break;
 			case SPGIST_CHOOSE_PROC:
 			case SPGIST_PICKSPLIT_PROC:
 			case SPGIST_INNER_CONSISTENT_PROC:
@@ -110,6 +150,15 @@ spgvalidate(Oid opclassoid)
 				ok = check_amproc_signature(procform->amproc, BOOLOID, true,
 											2, 2, INTERNALOID, INTERNALOID);
 				break;
+			case SPGIST_COMPRESS_PROC:
+				if (configOutLefttype != procform->amproclefttype ||
+					configOutRighttype != procform->amprocrighttype)
+					ok = false;
+				else
+					ok = check_amproc_signature(procform->amproc,
+												configOut.leafType, true,
+												1, 1, procform->amproclefttype);
+				break;
 			default:
 				ereport(INFO,
 						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -178,7 +227,6 @@ spgvalidate(Oid opclassoid)
 	}
 
 	/* Now check for inconsistent groups of operators/functions */
-	grouplist = identify_opfamily_groups(oprlist, proclist);
 	opclassgroup = NULL;
 	foreach(lc, grouplist)
 	{
diff --git a/src/backend/access/spgist/spgxlog.c b/src/backend/access/spgist/spgxlog.c
index c440d21715..9e2bd3f811 100644
--- a/src/backend/access/spgist/spgxlog.c
+++ b/src/backend/access/spgist/spgxlog.c
@@ -4,7 +4,7 @@
  *	  WAL replay logic for SP-GiST
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -1033,15 +1033,16 @@ void
 spg_mask(char *pagedata, BlockNumber blkno)
 {
 	Page		page = (Page) pagedata;
+	PageHeader	pagehdr = (PageHeader) page;
 
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_page_hint_bits(page);
 
 	/*
-	 * Any SpGist page other than meta contains unused space which needs to be
-	 * masked.
+	 * Mask the unused space, but only if the page's pd_lower appears to have
+	 * been set correctly.
 	 */
-	if (!SpGistPageIsMeta(page))
+	if (pagehdr->pd_lower > SizeOfPageHeaderData)
 		mask_unused_space(page);
 }
diff --git a/src/backend/access/tablesample/bernoulli.c b/src/backend/access/tablesample/bernoulli.c
index 5f6d478159..1f2a933935 100644
--- a/src/backend/access/tablesample/bernoulli.c
+++ b/src/backend/access/tablesample/bernoulli.c
@@ -13,7 +13,7 @@
  * cutoff value computed from the selection probability by BeginSampleScan.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/tablesample/system.c b/src/backend/access/tablesample/system.c
index e270cbc4a0..f888e04f40 100644
--- a/src/backend/access/tablesample/system.c
+++ b/src/backend/access/tablesample/system.c
@@ -13,7 +13,7 @@
  * cutoff value computed from the selection probability by BeginSampleScan.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/access/tablesample/tablesample.c b/src/backend/access/tablesample/tablesample.c
index 10d2bc91b3..6f62581e87 100644
--- a/src/backend/access/tablesample/tablesample.c
+++ b/src/backend/access/tablesample/tablesample.c
@@ -3,7 +3,7 @@
  * tablesample.c
  *		  Support functions for TABLESAMPLE feature
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/transam/README b/src/backend/access/transam/README
index e7dd19fd7b..ad4083eb6b 100644
--- a/src/backend/access/transam/README
+++ b/src/backend/access/transam/README
@@ -177,13 +177,13 @@ subtransaction level with the same name.  So it's a completely new
 subtransaction as far as the internals are concerned.
 
 Other subsystems are allowed to start "internal" subtransactions, which are
-handled by BeginInternalSubtransaction.  This is to allow implementing
+handled by BeginInternalSubTransaction.  This is to allow implementing
 exception handling, e.g. in PL/pgSQL.  ReleaseCurrentSubTransaction and
 RollbackAndReleaseCurrentSubTransaction allows the subsystem to close said
 subtransactions.  The main difference between this and the savepoint/release
 path is that we execute the complete state transition immediately in each
 subroutine, rather than deferring some work until CommitTransactionCommand.
-Another difference is that BeginInternalSubtransaction is allowed when no
+Another difference is that BeginInternalSubTransaction is allowed when no
 explicit transaction block has been established, while DefineSavepoint is not.
 
 
diff --git a/src/backend/access/transam/README.parallel b/src/backend/access/transam/README.parallel
index 5c33c40ae9..f09a580634 100644
--- a/src/backend/access/transam/README.parallel
+++ b/src/backend/access/transam/README.parallel
@@ -122,9 +122,12 @@ worker.  This includes:
     values are restored, this incidentally sets SessionUserId and OuterUserId
     to the correct values.  This final step restores CurrentUserId.
 
-To prevent undetected or unprincipled deadlocks when running in parallel mode,
-this could should eventually handle heavyweight locks in some way.  This is
-not implemented yet.
+  - State related to pending REINDEX operations, which prevents access to
+    an index that is currently being rebuilt.
+
+To prevent unprincipled deadlocks when running in parallel mode, this code
+also arranges for the leader and all workers to participate in group
+locking.  See src/backend/storage/lmgr/README for more details.
 
 Transaction Integration
 =======================
diff --git a/src/backend/access/transam/clog.c b/src/backend/access/transam/clog.c
index 0a7e2b310f..8b7ff5b0c2 100644
--- a/src/backend/access/transam/clog.c
+++ b/src/backend/access/transam/clog.c
@@ -23,7 +23,7 @@
  * for aborts (whether sync or async), since the post-crash assumption would
  * be that such transactions failed anyway.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/clog.c
@@ -39,7 +39,9 @@
 #include "access/xloginsert.h"
 #include "access/xlogutils.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "pg_trace.h"
+#include "storage/proc.h"
 
 /*
  * Defines for CLOG page sizes.  A page is the same BLCKSZ as is used
@@ -71,6 +73,12 @@
 #define GetLSNIndex(slotno, xid)	((slotno) * CLOG_LSNS_PER_PAGE + \
 	((xid) % (TransactionId) CLOG_XACTS_PER_PAGE) / CLOG_XACTS_PER_LSN_GROUP)
 
+/*
+ * The number of subtransactions below which we consider to apply clog group
+ * update optimization.  Testing reveals that the number higher than this can
+ * hurt performance.
+ */
+#define THRESHOLD_SUBTRANS_CLOG_OPT	5
 
 /*
  * Link to shared-memory data structures for CLOG control
@@ -87,11 +95,17 @@ static void WriteTruncateXlogRec(int pageno, TransactionId oldestXact,
 					 Oid oldestXidDb);
 static void TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
 						   TransactionId *subxids, XidStatus status,
-						   XLogRecPtr lsn, int pageno);
+						   XLogRecPtr lsn, int pageno,
+						   bool all_xact_same_page);
 static void TransactionIdSetStatusBit(TransactionId xid, XidStatus status,
 						  XLogRecPtr lsn, int slotno);
 static void set_status_by_pages(int nsubxids, TransactionId *subxids,
 					XidStatus status, XLogRecPtr lsn);
+static bool TransactionGroupUpdateXidStatus(TransactionId xid,
+								XidStatus status, XLogRecPtr lsn, int pageno);
+static void TransactionIdSetPageStatusInternal(TransactionId xid, int nsubxids,
+								   TransactionId *subxids, XidStatus status,
+								   XLogRecPtr lsn, int pageno);
 
 
 /*
@@ -174,7 +188,7 @@ TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
 		 * Set the parent and all subtransactions in a single call
 		 */
 		TransactionIdSetPageStatus(xid, nsubxids, subxids, status, lsn,
-								   pageno);
+								   pageno, true);
 	}
 	else
 	{
@@ -201,7 +215,7 @@ TransactionIdSetTreeStatus(TransactionId xid, int nsubxids,
 		 */
 		pageno = TransactionIdToPage(xid);
 		TransactionIdSetPageStatus(xid, nsubxids_on_first_page, subxids, status,
-								   lsn, pageno);
+								   lsn, pageno, false);
 
 		/*
 		 * Now work through the rest of the subxids one clog page at a time,
@@ -227,34 +241,110 @@ set_status_by_pages(int nsubxids, TransactionId *subxids,
 	int			offset = 0;
 	int			i = 0;
 
+	Assert(nsubxids > 0);		/* else the pageno fetch above is unsafe */
+
 	while (i < nsubxids)
 	{
 		int			num_on_page = 0;
+		int			nextpageno;
 
-		while (TransactionIdToPage(subxids[i]) == pageno && i < nsubxids)
+		do
 		{
+			nextpageno = TransactionIdToPage(subxids[i]);
+			if (nextpageno != pageno)
+				break;
 			num_on_page++;
 			i++;
-		}
+		} while (i < nsubxids);
 
 		TransactionIdSetPageStatus(InvalidTransactionId,
 								   num_on_page, subxids + offset,
-								   status, lsn, pageno);
+								   status, lsn, pageno, false);
 		offset = i;
-		pageno = TransactionIdToPage(subxids[offset]);
+		pageno = nextpageno;
 	}
 }
 
 /*
- * Record the final state of transaction entries in the commit log for
- * all entries on a single page.  Atomic only on this page.
- *
- * Otherwise API is same as TransactionIdSetTreeStatus()
+ * Record the final state of transaction entries in the commit log for all
+ * entries on a single page.  Atomic only on this page.
  */
 static void
 TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
 						   TransactionId *subxids, XidStatus status,
-						   XLogRecPtr lsn, int pageno)
+						   XLogRecPtr lsn, int pageno,
+						   bool all_xact_same_page)
+{
+	/* Can't use group update when PGPROC overflows. */
+	StaticAssertStmt(THRESHOLD_SUBTRANS_CLOG_OPT <= PGPROC_MAX_CACHED_SUBXIDS,
+					 "group clog threshold less than PGPROC cached subxids");
+
+	/*
+	 * When there is contention on CLogControlLock, we try to group multiple
+	 * updates; a single leader process will perform transaction status
+	 * updates for multiple backends so that the number of times
+	 * CLogControlLock needs to be acquired is reduced.
+	 *
+	 * For this optimization to be safe, the XID in MyPgXact and the subxids
+	 * in MyProc must be the same as the ones for which we're setting the
+	 * status.  Check that this is the case.
+	 *
+	 * For this optimization to be efficient, we shouldn't have too many
+	 * sub-XIDs and all of the XIDs for which we're adjusting clog should be
+	 * on the same page.  Check those conditions, too.
+	 */
+	if (all_xact_same_page && xid == MyPgXact->xid &&
+		nsubxids <= THRESHOLD_SUBTRANS_CLOG_OPT &&
+		nsubxids == MyPgXact->nxids &&
+		memcmp(subxids, MyProc->subxids.xids,
+			   nsubxids * sizeof(TransactionId)) == 0)
+	{
+		/*
+		 * We don't try to do group update optimization if a process has
+		 * overflowed the subxids array in its PGPROC, since in that case we
+		 * don't have a complete list of XIDs for it.
+		 */
+		Assert(THRESHOLD_SUBTRANS_CLOG_OPT <= PGPROC_MAX_CACHED_SUBXIDS);
+
+		/*
+		 * If we can immediately acquire CLogControlLock, we update the status
+		 * of our own XID and release the lock.  If not, try use group XID
+		 * update.  If that doesn't work out, fall back to waiting for the
+		 * lock to perform an update for this transaction only.
+		 */
+		if (LWLockConditionalAcquire(CLogControlLock, LW_EXCLUSIVE))
+		{
+			/* Got the lock without waiting!  Do the update. */
+			TransactionIdSetPageStatusInternal(xid, nsubxids, subxids, status,
+											   lsn, pageno);
+			LWLockRelease(CLogControlLock);
+			return;
+		}
+		else if (TransactionGroupUpdateXidStatus(xid, status, lsn, pageno))
+		{
+			/* Group update mechanism has done the work. */
+			return;
+		}
+
+		/* Fall through only if update isn't done yet. */
+	}
+
+	/* Group update not applicable, or couldn't accept this page number. */
+	LWLockAcquire(CLogControlLock, LW_EXCLUSIVE);
+	TransactionIdSetPageStatusInternal(xid, nsubxids, subxids, status,
+									   lsn, pageno);
+	LWLockRelease(CLogControlLock);
+}
+
+/*
+ * Record the final state of transaction entry in the commit log
+ *
+ * We don't do any locking here; caller must handle that.
+ */
+static void
+TransactionIdSetPageStatusInternal(TransactionId xid, int nsubxids,
+								   TransactionId *subxids, XidStatus status,
+								   XLogRecPtr lsn, int pageno)
 {
 	int			slotno;
 	int			i;
@@ -262,8 +352,7 @@ TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
 	Assert(status == TRANSACTION_STATUS_COMMITTED ||
 		   status == TRANSACTION_STATUS_ABORTED ||
 		   (status == TRANSACTION_STATUS_SUB_COMMITTED && !TransactionIdIsValid(xid)));
-
-	LWLockAcquire(CLogControlLock, LW_EXCLUSIVE);
+	Assert(LWLockHeldByMeInMode(CLogControlLock, LW_EXCLUSIVE));
 
 	/*
 	 * If we're doing an async commit (ie, lsn is valid), then we must wait
@@ -311,8 +400,167 @@ TransactionIdSetPageStatus(TransactionId xid, int nsubxids,
 	}
 
 	ClogCtl->shared->page_dirty[slotno] = true;
+}
+
+/*
+ * When we cannot immediately acquire CLogControlLock in exclusive mode at
+ * commit time, add ourselves to a list of processes that need their XIDs
+ * status update.  The first process to add itself to the list will acquire
+ * CLogControlLock in exclusive mode and set transaction status as required
+ * on behalf of all group members.  This avoids a great deal of contention
+ * around CLogControlLock when many processes are trying to commit at once,
+ * since the lock need not be repeatedly handed off from one committing
+ * process to the next.
+ *
+ * Returns true when transaction status has been updated in clog; returns
+ * false if we decided against applying the optimization because the page
+ * number we need to update differs from those processes already waiting.
+ */
+static bool
+TransactionGroupUpdateXidStatus(TransactionId xid, XidStatus status,
+								XLogRecPtr lsn, int pageno)
+{
+	volatile PROC_HDR *procglobal = ProcGlobal;
+	PGPROC	   *proc = MyProc;
+	uint32		nextidx;
+	uint32		wakeidx;
+
+	/* We should definitely have an XID whose status needs to be updated. */
+	Assert(TransactionIdIsValid(xid));
+
+	/*
+	 * Add ourselves to the list of processes needing a group XID status
+	 * update.
+	 */
+	proc->clogGroupMember = true;
+	proc->clogGroupMemberXid = xid;
+	proc->clogGroupMemberXidStatus = status;
+	proc->clogGroupMemberPage = pageno;
+	proc->clogGroupMemberLsn = lsn;
 
+	nextidx = pg_atomic_read_u32(&procglobal->clogGroupFirst);
+
+	while (true)
+	{
+		/*
+		 * Add the proc to list, if the clog page where we need to update the
+		 * current transaction status is same as group leader's clog page.
+		 *
+		 * There is a race condition here, which is that after doing the below
+		 * check and before adding this proc's clog update to a group, the
+		 * group leader might have already finished the group update for this
+		 * page and becomes group leader of another group. This will lead to a
+		 * situation where a single group can have different clog page
+		 * updates.  This isn't likely and will still work, just maybe a bit
+		 * less efficiently.
+		 */
+		if (nextidx != INVALID_PGPROCNO &&
+			ProcGlobal->allProcs[nextidx].clogGroupMemberPage != proc->clogGroupMemberPage)
+		{
+			proc->clogGroupMember = false;
+			return false;
+		}
+
+		pg_atomic_write_u32(&proc->clogGroupNext, nextidx);
+
+		if (pg_atomic_compare_exchange_u32(&procglobal->clogGroupFirst,
+										   &nextidx,
+										   (uint32) proc->pgprocno))
+			break;
+	}
+
+	/*
+	 * If the list was not empty, the leader will update the status of our
+	 * XID. It is impossible to have followers without a leader because the
+	 * first process that has added itself to the list will always have
+	 * nextidx as INVALID_PGPROCNO.
+	 */
+	if (nextidx != INVALID_PGPROCNO)
+	{
+		int			extraWaits = 0;
+
+		/* Sleep until the leader updates our XID status. */
+		pgstat_report_wait_start(WAIT_EVENT_CLOG_GROUP_UPDATE);
+		for (;;)
+		{
+			/* acts as a read barrier */
+			PGSemaphoreLock(proc->sem);
+			if (!proc->clogGroupMember)
+				break;
+			extraWaits++;
+		}
+		pgstat_report_wait_end();
+
+		Assert(pg_atomic_read_u32(&proc->clogGroupNext) == INVALID_PGPROCNO);
+
+		/* Fix semaphore count for any absorbed wakeups */
+		while (extraWaits-- > 0)
+			PGSemaphoreUnlock(proc->sem);
+		return true;
+	}
+
+	/* We are the leader.  Acquire the lock on behalf of everyone. */
+	LWLockAcquire(CLogControlLock, LW_EXCLUSIVE);
+
+	/*
+	 * Now that we've got the lock, clear the list of processes waiting for
+	 * group XID status update, saving a pointer to the head of the list.
+	 * Trying to pop elements one at a time could lead to an ABA problem.
+	 */
+	nextidx = pg_atomic_exchange_u32(&procglobal->clogGroupFirst,
+									 INVALID_PGPROCNO);
+
+	/* Remember head of list so we can perform wakeups after dropping lock. */
+	wakeidx = nextidx;
+
+	/* Walk the list and update the status of all XIDs. */
+	while (nextidx != INVALID_PGPROCNO)
+	{
+		PGPROC	   *proc = &ProcGlobal->allProcs[nextidx];
+		PGXACT	   *pgxact = &ProcGlobal->allPgXact[nextidx];
+
+		/*
+		 * Overflowed transactions should not use group XID status update
+		 * mechanism.
+		 */
+		Assert(!pgxact->overflowed);
+
+		TransactionIdSetPageStatusInternal(proc->clogGroupMemberXid,
+										   pgxact->nxids,
+										   proc->subxids.xids,
+										   proc->clogGroupMemberXidStatus,
+										   proc->clogGroupMemberLsn,
+										   proc->clogGroupMemberPage);
+
+		/* Move to next proc in list. */
+		nextidx = pg_atomic_read_u32(&proc->clogGroupNext);
+	}
+
+	/* We're done with the lock now. */
 	LWLockRelease(CLogControlLock);
+
+	/*
+	 * Now that we've released the lock, go back and wake everybody up.  We
+	 * don't do this under the lock so as to keep lock hold times to a
+	 * minimum.
+	 */
+	while (wakeidx != INVALID_PGPROCNO)
+	{
+		PGPROC	   *proc = &ProcGlobal->allProcs[wakeidx];
+
+		wakeidx = pg_atomic_read_u32(&proc->clogGroupNext);
+		pg_atomic_write_u32(&proc->clogGroupNext, INVALID_PGPROCNO);
+
+		/* ensure all previous writes are visible before follower continues. */
+		pg_write_barrier();
+
+		proc->clogGroupMember = false;
+
+		if (proc != MyProc)
+			PGSemaphoreUnlock(proc->sem);
+	}
+
+	return true;
 }
 
 /*
@@ -479,7 +727,7 @@ BootStrapCLOG(void)
 
 /*
  * Initialize (or reinitialize) a page of CLOG to zeroes.
- * If writeXlog is TRUE, also emit an XLOG record saying we did this.
+ * If writeXlog is true, also emit an XLOG record saying we did this.
  *
  * The page is not actually written, just set up in shared memory.
  * The slot number of the new page is returned.
diff --git a/src/backend/access/transam/commit_ts.c b/src/backend/access/transam/commit_ts.c
index 60fb9eeb06..04a15e4e29 100644
--- a/src/backend/access/transam/commit_ts.c
+++ b/src/backend/access/transam/commit_ts.c
@@ -15,7 +15,7 @@
  * re-perform the status update on redo; so we need make no additional XLOG
  * entry here.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/commit_ts.c
@@ -531,7 +531,7 @@ BootStrapCommitTs(void)
 
 /*
  * Initialize (or reinitialize) a page of CommitTs to zeroes.
- * If writeXlog is TRUE, also emit an XLOG record saying we did this.
+ * If writeXlog is true, also emit an XLOG record saying we did this.
  *
  * The page is not actually written, just set up in shared memory.
  * The slot number of the new page is returned.
diff --git a/src/backend/access/transam/generic_xlog.c b/src/backend/access/transam/generic_xlog.c
index fbc6810c2f..ce023548ae 100644
--- a/src/backend/access/transam/generic_xlog.c
+++ b/src/backend/access/transam/generic_xlog.c
@@ -4,7 +4,7 @@
  *	 Implementation of generic xlog records.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/generic_xlog.c
@@ -541,7 +541,7 @@ generic_redo(XLogReaderState *record)
 void
 generic_mask(char *page, BlockNumber blkno)
 {
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_unused_space(page);
 }
diff --git a/src/backend/access/transam/multixact.c b/src/backend/access/transam/multixact.c
index 7142ecede0..6d6f2e3016 100644
--- a/src/backend/access/transam/multixact.c
+++ b/src/backend/access/transam/multixact.c
@@ -59,7 +59,7 @@
  * counter does not fall within the wraparound horizon considering the global
  * minimum value.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/multixact.c
@@ -1000,14 +1000,14 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 						 errmsg("database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database \"%s\"",
 								oldest_datname),
 						 errhint("Execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 						 errmsg("database is not accepting commands that generate new MultiXactIds to avoid wraparound data loss in database with OID %u",
 								oldest_datoid),
 						 errhint("Execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		}
 
 		/*
@@ -1031,7 +1031,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 									   oldest_datname,
 									   multiWrapLimit - result),
 						 errhint("Execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 			else
 				ereport(WARNING,
 						(errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used",
@@ -1040,7 +1040,7 @@ GetNewMultiXactId(int nmembers, MultiXactOffset *offset)
 									   oldest_datoid,
 									   multiWrapLimit - result),
 						 errhint("Execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		}
 
 		/* Re-acquire lock and start over */
@@ -1892,7 +1892,7 @@ BootStrapMultiXact(void)
 
 /*
  * Initialize (or reinitialize) a page of MultiXactOffset to zeroes.
- * If writeXlog is TRUE, also emit an XLOG record saying we did this.
+ * If writeXlog is true, also emit an XLOG record saying we did this.
  *
  * The page is not actually written, just set up in shared memory.
  * The slot number of the new page is returned.
@@ -2321,7 +2321,7 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid,
 								   oldest_datname,
 								   multiWrapLimit - curMulti),
 					 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-							 "You might also need to commit or roll back old prepared transactions.")));
+							 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		else
 			ereport(WARNING,
 					(errmsg_plural("database with OID %u must be vacuumed before %u more MultiXactId is used",
@@ -2330,7 +2330,7 @@ SetMultiXactIdLimit(MultiXactId oldest_datminmxid, Oid oldest_datoid,
 								   oldest_datoid,
 								   multiWrapLimit - curMulti),
 					 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-							 "You might also need to commit or roll back old prepared transactions.")));
+							 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 	}
 }
 
diff --git a/src/backend/access/transam/parallel.c b/src/backend/access/transam/parallel.c
index 17b10383e4..9d4efc0f8f 100644
--- a/src/backend/access/transam/parallel.c
+++ b/src/backend/access/transam/parallel.c
@@ -3,7 +3,7 @@
  * parallel.c
  *	  Infrastructure for launching parallel workers
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -14,9 +14,12 @@
 
 #include "postgres.h"
 
+#include "access/nbtree.h"
 #include "access/parallel.h"
+#include "access/session.h"
 #include "access/xact.h"
 #include "access/xlog.h"
+#include "catalog/index.h"
 #include "catalog/namespace.h"
 #include "commands/async.h"
 #include "executor/execParallel.h"
@@ -36,6 +39,7 @@
 #include "utils/memutils.h"
 #include "utils/resowner.h"
 #include "utils/snapmgr.h"
+#include "utils/typcache.h"
 
 
 /*
@@ -51,8 +55,9 @@
 #define PARALLEL_MAGIC						0x50477c7c
 
 /*
- * Magic numbers for parallel state sharing.  Higher-level code should use
- * smaller values, leaving these very large ones for use by this module.
+ * Magic numbers for per-context parallel state sharing.  Higher-level code
+ * should use smaller values, leaving these very large ones for use by this
+ * module.
  */
 #define PARALLEL_KEY_FIXED					UINT64CONST(0xFFFFFFFFFFFF0001)
 #define PARALLEL_KEY_ERROR_QUEUE			UINT64CONST(0xFFFFFFFFFFFF0002)
@@ -63,6 +68,8 @@
 #define PARALLEL_KEY_ACTIVE_SNAPSHOT		UINT64CONST(0xFFFFFFFFFFFF0007)
 #define PARALLEL_KEY_TRANSACTION_STATE		UINT64CONST(0xFFFFFFFFFFFF0008)
 #define PARALLEL_KEY_ENTRYPOINT				UINT64CONST(0xFFFFFFFFFFFF0009)
+#define PARALLEL_KEY_SESSION_DSM			UINT64CONST(0xFFFFFFFFFFFF000A)
+#define PARALLEL_KEY_REINDEX_STATE			UINT64CONST(0xFFFFFFFFFFFF000B)
 
 /* Fixed-size parallel state. */
 typedef struct FixedParallelState
@@ -71,9 +78,11 @@ typedef struct FixedParallelState
 	Oid			database_id;
 	Oid			authenticated_user_id;
 	Oid			current_user_id;
+	Oid			outer_user_id;
 	Oid			temp_namespace_id;
 	Oid			temp_toast_namespace_id;
 	int			sec_context;
+	bool		is_superuser;
 	PGPROC	   *parallel_master_pgproc;
 	pid_t		parallel_master_pid;
 	BackendId	parallel_master_backend_id;
@@ -105,6 +114,9 @@ static FixedParallelState *MyFixedParallelState;
 /* List of active parallel contexts. */
 static dlist_head pcxt_list = DLIST_STATIC_INIT(pcxt_list);
 
+/* Backend-local copy of data from FixedParallelState. */
+static pid_t ParallelMasterPid;
+
 /*
  * List of internal parallel worker entry points.  We need this for
  * reasons explained in LookupParallelWorkerFunction(), below.
@@ -118,6 +130,9 @@ static const struct
 {
 	{
 		"ParallelQueryMain", ParallelQueryMain
+	},
+	{
+		"_bt_parallel_build_main", _bt_parallel_build_main
 	}
 };
 
@@ -125,6 +140,7 @@ static const struct
 static void HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg);
 static void WaitForParallelWorkersToExit(ParallelContext *pcxt);
 static parallel_worker_main_type LookupParallelWorkerFunction(const char *libraryname, const char *funcname);
+static void ParallelWorkerShutdown(int code, Datum arg);
 
 
 /*
@@ -134,7 +150,7 @@ static parallel_worker_main_type LookupParallelWorkerFunction(const char *librar
  */
 ParallelContext *
 CreateParallelContext(const char *library_name, const char *function_name,
-					  int nworkers)
+					  int nworkers, bool serializable_okay)
 {
 	MemoryContext oldcontext;
 	ParallelContext *pcxt;
@@ -155,9 +171,11 @@ CreateParallelContext(const char *library_name, const char *function_name,
 	/*
 	 * If we are running under serializable isolation, we can't use parallel
 	 * workers, at least not until somebody enhances that mechanism to be
-	 * parallel-aware.
+	 * parallel-aware.  Utility statement callers may ask us to ignore this
+	 * restriction because they're always able to safely ignore the fact that
+	 * SIREAD locks do not work with parallelism.
 	 */
-	if (IsolationIsSerializable())
+	if (IsolationIsSerializable() && !serializable_okay)
 		nworkers = 0;
 
 	/* We might be running in a short-lived memory context. */
@@ -194,9 +212,11 @@ InitializeParallelDSM(ParallelContext *pcxt)
 	Size		tsnaplen = 0;
 	Size		asnaplen = 0;
 	Size		tstatelen = 0;
+	Size		reindexlen = 0;
 	Size		segsize = 0;
 	int			i;
 	FixedParallelState *fps;
+	dsm_handle	session_dsm_handle = DSM_HANDLE_INVALID;
 	Snapshot	transaction_snapshot = GetTransactionSnapshot();
 	Snapshot	active_snapshot = GetActiveSnapshot();
 
@@ -211,6 +231,21 @@ InitializeParallelDSM(ParallelContext *pcxt)
 	 * Normally, the user will have requested at least one worker process, but
 	 * if by chance they have not, we can skip a bunch of things here.
 	 */
+	if (pcxt->nworkers > 0)
+	{
+		/* Get (or create) the per-session DSM segment's handle. */
+		session_dsm_handle = GetSessionDsmHandle();
+
+		/*
+		 * If we weren't able to create a per-session DSM segment, then we can
+		 * continue but we can't safely launch any workers because their
+		 * record typmods would be incompatible so they couldn't exchange
+		 * tuples.
+		 */
+		if (session_dsm_handle == DSM_HANDLE_INVALID)
+			pcxt->nworkers = 0;
+	}
+
 	if (pcxt->nworkers > 0)
 	{
 		/* Estimate space for various kinds of state sharing. */
@@ -226,8 +261,11 @@ InitializeParallelDSM(ParallelContext *pcxt)
 		shm_toc_estimate_chunk(&pcxt->estimator, asnaplen);
 		tstatelen = EstimateTransactionStateSpace();
 		shm_toc_estimate_chunk(&pcxt->estimator, tstatelen);
+		shm_toc_estimate_chunk(&pcxt->estimator, sizeof(dsm_handle));
+		reindexlen = EstimateReindexStateSpace();
+		shm_toc_estimate_chunk(&pcxt->estimator, reindexlen);
 		/* If you add more chunks here, you probably need to add keys. */
-		shm_toc_estimate_keys(&pcxt->estimator, 6);
+		shm_toc_estimate_keys(&pcxt->estimator, 8);
 
 		/* Estimate space need for error queues. */
 		StaticAssertStmt(BUFFERALIGN(PARALLEL_ERROR_QUEUE_SIZE) ==
@@ -275,6 +313,8 @@ InitializeParallelDSM(ParallelContext *pcxt)
 		shm_toc_allocate(pcxt->toc, sizeof(FixedParallelState));
 	fps->database_id = MyDatabaseId;
 	fps->authenticated_user_id = GetAuthenticatedUserId();
+	fps->outer_user_id = GetCurrentRoleId();
+	fps->is_superuser = session_auth_is_superuser;
 	GetUserIdAndSecContext(&fps->current_user_id, &fps->sec_context);
 	GetTempNamespaceState(&fps->temp_namespace_id,
 						  &fps->temp_toast_namespace_id);
@@ -294,7 +334,9 @@ InitializeParallelDSM(ParallelContext *pcxt)
 		char	   *tsnapspace;
 		char	   *asnapspace;
 		char	   *tstatespace;
+		char	   *reindexspace;
 		char	   *error_queue_space;
+		char	   *session_dsm_handle_space;
 		char	   *entrypointstate;
 		Size		lnamelen;
 
@@ -322,11 +364,23 @@ InitializeParallelDSM(ParallelContext *pcxt)
 		SerializeSnapshot(active_snapshot, asnapspace);
 		shm_toc_insert(pcxt->toc, PARALLEL_KEY_ACTIVE_SNAPSHOT, asnapspace);
 
+		/* Provide the handle for per-session segment. */
+		session_dsm_handle_space = shm_toc_allocate(pcxt->toc,
+													sizeof(dsm_handle));
+		*(dsm_handle *) session_dsm_handle_space = session_dsm_handle;
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_SESSION_DSM,
+					   session_dsm_handle_space);
+
 		/* Serialize transaction state. */
 		tstatespace = shm_toc_allocate(pcxt->toc, tstatelen);
 		SerializeTransactionState(tstatelen, tstatespace);
 		shm_toc_insert(pcxt->toc, PARALLEL_KEY_TRANSACTION_STATE, tstatespace);
 
+		/* Serialize reindex state. */
+		reindexspace = shm_toc_allocate(pcxt->toc, reindexlen);
+		SerializeReindexState(reindexlen, reindexspace);
+		shm_toc_insert(pcxt->toc, PARALLEL_KEY_REINDEX_STATE, reindexspace);
+
 		/* Allocate space for worker information. */
 		pcxt->worker = palloc0(sizeof(ParallelWorkerInfo) * pcxt->nworkers);
 
@@ -380,8 +434,6 @@ void
 ReinitializeParallelDSM(ParallelContext *pcxt)
 {
 	FixedParallelState *fps;
-	char	   *error_queue_space;
-	int			i;
 
 	/* Wait for any old workers to exit. */
 	if (pcxt->nworkers_launched > 0)
@@ -389,24 +441,36 @@ ReinitializeParallelDSM(ParallelContext *pcxt)
 		WaitForParallelWorkersToFinish(pcxt);
 		WaitForParallelWorkersToExit(pcxt);
 		pcxt->nworkers_launched = 0;
+		if (pcxt->known_attached_workers)
+		{
+			pfree(pcxt->known_attached_workers);
+			pcxt->known_attached_workers = NULL;
+			pcxt->nknown_attached_workers = 0;
+		}
 	}
 
 	/* Reset a few bits of fixed parallel state to a clean state. */
 	fps = shm_toc_lookup(pcxt->toc, PARALLEL_KEY_FIXED, false);
 	fps->last_xlog_end = 0;
 
-	/* Recreate error queues. */
-	error_queue_space =
-		shm_toc_lookup(pcxt->toc, PARALLEL_KEY_ERROR_QUEUE, false);
-	for (i = 0; i < pcxt->nworkers; ++i)
+	/* Recreate error queues (if they exist). */
+	if (pcxt->nworkers > 0)
 	{
-		char	   *start;
-		shm_mq	   *mq;
+		char	   *error_queue_space;
+		int			i;
+
+		error_queue_space =
+			shm_toc_lookup(pcxt->toc, PARALLEL_KEY_ERROR_QUEUE, false);
+		for (i = 0; i < pcxt->nworkers; ++i)
+		{
+			char	   *start;
+			shm_mq	   *mq;
 
-		start = error_queue_space + i * PARALLEL_ERROR_QUEUE_SIZE;
-		mq = shm_mq_create(start, PARALLEL_ERROR_QUEUE_SIZE);
-		shm_mq_set_receiver(mq, MyProc);
-		pcxt->worker[i].error_mqh = shm_mq_attach(mq, pcxt->seg, NULL);
+			start = error_queue_space + i * PARALLEL_ERROR_QUEUE_SIZE;
+			mq = shm_mq_create(start, PARALLEL_ERROR_QUEUE_SIZE);
+			shm_mq_set_receiver(mq, MyProc);
+			pcxt->worker[i].error_mqh = shm_mq_attach(mq, pcxt->seg, NULL);
+		}
 	}
 }
 
@@ -438,6 +502,7 @@ LaunchParallelWorkers(ParallelContext *pcxt)
 	memset(&worker, 0, sizeof(worker));
 	snprintf(worker.bgw_name, BGW_MAXLEN, "parallel worker for PID %d",
 			 MyProcPid);
+	snprintf(worker.bgw_type, BGW_MAXLEN, "parallel worker");
 	worker.bgw_flags =
 		BGWORKER_SHMEM_ACCESS | BGWORKER_BACKEND_DATABASE_CONNECTION
 		| BGWORKER_CLASS_PARALLEL;
@@ -480,15 +545,154 @@ LaunchParallelWorkers(ParallelContext *pcxt)
 			 */
 			any_registrations_failed = true;
 			pcxt->worker[i].bgwhandle = NULL;
-			pfree(pcxt->worker[i].error_mqh);
+			shm_mq_detach(pcxt->worker[i].error_mqh);
 			pcxt->worker[i].error_mqh = NULL;
 		}
 	}
 
+	/*
+	 * Now that nworkers_launched has taken its final value, we can initialize
+	 * known_attached_workers.
+	 */
+	if (pcxt->nworkers_launched > 0)
+	{
+		pcxt->known_attached_workers =
+			palloc0(sizeof(bool) * pcxt->nworkers_launched);
+		pcxt->nknown_attached_workers = 0;
+	}
+
 	/* Restore previous memory context. */
 	MemoryContextSwitchTo(oldcontext);
 }
 
+/*
+ * Wait for all workers to attach to their error queues, and throw an error if
+ * any worker fails to do this.
+ *
+ * Callers can assume that if this function returns successfully, then the
+ * number of workers given by pcxt->nworkers_launched have initialized and
+ * attached to their error queues.  Whether or not these workers are guaranteed
+ * to still be running depends on what code the caller asked them to run;
+ * this function does not guarantee that they have not exited.  However, it
+ * does guarantee that any workers which exited must have done so cleanly and
+ * after successfully performing the work with which they were tasked.
+ *
+ * If this function is not called, then some of the workers that were launched
+ * may not have been started due to a fork() failure, or may have exited during
+ * early startup prior to attaching to the error queue, so nworkers_launched
+ * cannot be viewed as completely reliable.  It will never be less than the
+ * number of workers which actually started, but it might be more.  Any workers
+ * that failed to start will still be discovered by
+ * WaitForParallelWorkersToFinish and an error will be thrown at that time,
+ * provided that function is eventually reached.
+ *
+ * In general, the leader process should do as much work as possible before
+ * calling this function.  fork() failures and other early-startup failures
+ * are very uncommon, and having the leader sit idle when it could be doing
+ * useful work is undesirable.  However, if the leader needs to wait for
+ * all of its workers or for a specific worker, it may want to call this
+ * function before doing so.  If not, it must make some other provision for
+ * the failure-to-start case, lest it wait forever.  On the other hand, a
+ * leader which never waits for a worker that might not be started yet, or
+ * at least never does so prior to WaitForParallelWorkersToFinish(), need not
+ * call this function at all.
+ */
+void
+WaitForParallelWorkersToAttach(ParallelContext *pcxt)
+{
+	int			i;
+
+	/* Skip this if we have no launched workers. */
+	if (pcxt->nworkers_launched == 0)
+		return;
+
+	for (;;)
+	{
+		/*
+		 * This will process any parallel messages that are pending and it may
+		 * also throw an error propagated from a worker.
+		 */
+		CHECK_FOR_INTERRUPTS();
+
+		for (i = 0; i < pcxt->nworkers_launched; ++i)
+		{
+			BgwHandleStatus status;
+			shm_mq	   *mq;
+			int			rc;
+			pid_t		pid;
+
+			if (pcxt->known_attached_workers[i])
+				continue;
+
+			/*
+			 * If error_mqh is NULL, then the worker has already exited
+			 * cleanly.
+			 */
+			if (pcxt->worker[i].error_mqh == NULL)
+			{
+				pcxt->known_attached_workers[i] = true;
+				++pcxt->nknown_attached_workers;
+				continue;
+			}
+
+			status = GetBackgroundWorkerPid(pcxt->worker[i].bgwhandle, &pid);
+			if (status == BGWH_STARTED)
+			{
+				/* Has the worker attached to the error queue? */
+				mq = shm_mq_get_queue(pcxt->worker[i].error_mqh);
+				if (shm_mq_get_sender(mq) != NULL)
+				{
+					/* Yes, so it is known to be attached. */
+					pcxt->known_attached_workers[i] = true;
+					++pcxt->nknown_attached_workers;
+				}
+			}
+			else if (status == BGWH_STOPPED)
+			{
+				/*
+				 * If the worker stopped without attaching to the error queue,
+				 * throw an error.
+				 */
+				mq = shm_mq_get_queue(pcxt->worker[i].error_mqh);
+				if (shm_mq_get_sender(mq) == NULL)
+					ereport(ERROR,
+							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+							 errmsg("parallel worker failed to initialize"),
+							 errhint("More details may be available in the server log.")));
+
+				pcxt->known_attached_workers[i] = true;
+				++pcxt->nknown_attached_workers;
+			}
+			else
+			{
+				/*
+				 * Worker not yet started, so we must wait.  The postmaster
+				 * will notify us if the worker's state changes.  Our latch
+				 * might also get set for some other reason, but if so we'll
+				 * just end up waiting for the same worker again.
+				 */
+				rc = WaitLatch(MyLatch,
+							   WL_LATCH_SET | WL_POSTMASTER_DEATH,
+							   -1, WAIT_EVENT_BGWORKER_STARTUP);
+
+				/* emergency bailout if postmaster has died */
+				if (rc & WL_POSTMASTER_DEATH)
+					proc_exit(1);
+
+				if (rc & WL_LATCH_SET)
+					ResetLatch(MyLatch);
+			}
+		}
+
+		/* If all workers are known to have started, we're done. */
+		if (pcxt->nknown_attached_workers >= pcxt->nworkers_launched)
+		{
+			Assert(pcxt->nknown_attached_workers == pcxt->nworkers_launched);
+			break;
+		}
+	}
+}
+
 /*
  * Wait for all workers to finish computing.
  *
@@ -506,6 +710,7 @@ WaitForParallelWorkersToFinish(ParallelContext *pcxt)
 	for (;;)
 	{
 		bool		anyone_alive = false;
+		int			nfinished = 0;
 		int			i;
 
 		/*
@@ -517,7 +722,15 @@ WaitForParallelWorkersToFinish(ParallelContext *pcxt)
 
 		for (i = 0; i < pcxt->nworkers_launched; ++i)
 		{
-			if (pcxt->worker[i].error_mqh != NULL)
+			/*
+			 * If error_mqh is NULL, then the worker has already exited
+			 * cleanly.  If we have received a message through error_mqh from
+			 * the worker, we know it started up cleanly, and therefore we're
+			 * certain to be notified when it exits.
+			 */
+			if (pcxt->worker[i].error_mqh == NULL)
+				++nfinished;
+			else if (pcxt->known_attached_workers[i])
 			{
 				anyone_alive = true;
 				break;
@@ -525,7 +738,62 @@ WaitForParallelWorkersToFinish(ParallelContext *pcxt)
 		}
 
 		if (!anyone_alive)
-			break;
+		{
+			/* If all workers are known to have finished, we're done. */
+			if (nfinished >= pcxt->nworkers_launched)
+			{
+				Assert(nfinished == pcxt->nworkers_launched);
+				break;
+			}
+
+			/*
+			 * We didn't detect any living workers, but not all workers are
+			 * known to have exited cleanly.  Either not all workers have
+			 * launched yet, or maybe some of them failed to start or
+			 * terminated abnormally.
+			 */
+			for (i = 0; i < pcxt->nworkers_launched; ++i)
+			{
+				pid_t		pid;
+				shm_mq	   *mq;
+
+				/*
+				 * If the worker is BGWH_NOT_YET_STARTED or BGWH_STARTED, we
+				 * should just keep waiting.  If it is BGWH_STOPPED, then
+				 * further investigation is needed.
+				 */
+				if (pcxt->worker[i].error_mqh == NULL ||
+					pcxt->worker[i].bgwhandle == NULL ||
+					GetBackgroundWorkerPid(pcxt->worker[i].bgwhandle,
+										   &pid) != BGWH_STOPPED)
+					continue;
+
+				/*
+				 * Check whether the worker ended up stopped without ever
+				 * attaching to the error queue.  If so, the postmaster was
+				 * unable to fork the worker or it exited without initializing
+				 * properly.  We must throw an error, since the caller may
+				 * have been expecting the worker to do some work before
+				 * exiting.
+				 */
+				mq = shm_mq_get_queue(pcxt->worker[i].error_mqh);
+				if (shm_mq_get_sender(mq) == NULL)
+					ereport(ERROR,
+							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+							 errmsg("parallel worker failed to initialize"),
+							 errhint("More details may be available in the server log.")));
+
+				/*
+				 * The worker is stopped, but is attached to the error queue.
+				 * Unless there's a bug somewhere, this will only happen when
+				 * the worker writes messages and terminates after the
+				 * CHECK_FOR_INTERRUPTS() near the top of this function and
+				 * before the call to GetBackgroundWorkerPid().  In that case,
+				 * or latch should have been set as well and the right things
+				 * will happen on the next pass through the loop.
+				 */
+			}
+		}
 
 		WaitLatch(MyLatch, WL_LATCH_SET, -1,
 				  WAIT_EVENT_PARALLEL_FINISH);
@@ -612,7 +880,7 @@ DestroyParallelContext(ParallelContext *pcxt)
 			{
 				TerminateBackgroundWorker(pcxt->worker[i].bgwhandle);
 
-				pfree(pcxt->worker[i].error_mqh);
+				shm_mq_detach(pcxt->worker[i].error_mqh);
 				pcxt->worker[i].error_mqh = NULL;
 			}
 		}
@@ -782,6 +1050,13 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
 {
 	char		msgtype;
 
+	if (pcxt->known_attached_workers != NULL &&
+		!pcxt->known_attached_workers[i])
+	{
+		pcxt->known_attached_workers[i] = true;
+		pcxt->nknown_attached_workers++;
+	}
+
 	msgtype = pq_getmsgbyte(msg);
 
 	switch (msgtype)
@@ -861,7 +1136,7 @@ HandleParallelMessage(ParallelContext *pcxt, int i, StringInfo msg)
 
 		case 'X':				/* Terminate, indicating clean exit */
 			{
-				pfree(pcxt->worker[i].error_mqh);
+				shm_mq_detach(pcxt->worker[i].error_mqh);
 				pcxt->worker[i].error_mqh = NULL;
 				break;
 			}
@@ -937,7 +1212,9 @@ ParallelWorkerMain(Datum main_arg)
 	char	   *tsnapspace;
 	char	   *asnapspace;
 	char	   *tstatespace;
+	char	   *reindexspace;
 	StringInfoData msgbuf;
+	char	   *session_dsm_handle_space;
 
 	/* Set flag to indicate that we're initializing a parallel worker. */
 	InitializingParallelWorker = true;
@@ -976,11 +1253,16 @@ ParallelWorkerMain(Datum main_arg)
 	fps = shm_toc_lookup(toc, PARALLEL_KEY_FIXED, false);
 	MyFixedParallelState = fps;
 
+	/* Arrange to signal the leader if we exit. */
+	ParallelMasterPid = fps->parallel_master_pid;
+	ParallelMasterBackendId = fps->parallel_master_backend_id;
+	on_shmem_exit(ParallelWorkerShutdown, (Datum) 0);
+
 	/*
-	 * Now that we have a worker number, we can find and attach to the error
-	 * queue provided for us.  That's good, because until we do that, any
-	 * errors that happen here will not be reported back to the process that
-	 * requested that this worker be launched.
+	 * Now we can find and attach to the error queue provided for us.  That's
+	 * good, because until we do that, any errors that happen here will not be
+	 * reported back to the process that requested that this worker be
+	 * launched.
 	 */
 	error_queue_space = shm_toc_lookup(toc, PARALLEL_KEY_ERROR_QUEUE, false);
 	mq = (shm_mq *) (error_queue_space +
@@ -999,8 +1281,8 @@ ParallelWorkerMain(Datum main_arg)
 	 * in this case.
 	 */
 	pq_beginmessage(&msgbuf, 'K');
-	pq_sendint(&msgbuf, (int32) MyProcPid, sizeof(int32));
-	pq_sendint(&msgbuf, (int32) MyCancelKey, sizeof(int32));
+	pq_sendint32(&msgbuf, (int32) MyProcPid);
+	pq_sendint32(&msgbuf, (int32) MyCancelKey);
 	pq_endmessage(&msgbuf);
 
 	/*
@@ -1064,6 +1346,11 @@ ParallelWorkerMain(Datum main_arg)
 	combocidspace = shm_toc_lookup(toc, PARALLEL_KEY_COMBO_CID, false);
 	RestoreComboCIDState(combocidspace);
 
+	/* Attach to the per-session DSM segment and contained objects. */
+	session_dsm_handle_space =
+		shm_toc_lookup(toc, PARALLEL_KEY_SESSION_DSM, false);
+	AttachSession(*(dsm_handle *) session_dsm_handle_space);
+
 	/* Restore transaction snapshot. */
 	tsnapspace = shm_toc_lookup(toc, PARALLEL_KEY_TRANSACTION_SNAPSHOT, false);
 	RestoreTransactionSnapshot(RestoreSnapshot(tsnapspace),
@@ -1079,6 +1366,13 @@ ParallelWorkerMain(Datum main_arg)
 	 */
 	InvalidateSystemCaches();
 
+	/*
+	 * Restore current role id.  Skip verifying whether session user is
+	 * allowed to become this role and blindly restore the leader's state for
+	 * current role.
+	 */
+	SetCurrentRoleId(fps->outer_user_id, fps->is_superuser);
+
 	/* Restore user ID and security context. */
 	SetUserIdAndSecContext(fps->current_user_id, fps->sec_context);
 
@@ -1086,8 +1380,9 @@ ParallelWorkerMain(Datum main_arg)
 	SetTempNamespaceState(fps->temp_namespace_id,
 						  fps->temp_toast_namespace_id);
 
-	/* Set ParallelMasterBackendId so we know how to address temp relations. */
-	ParallelMasterBackendId = fps->parallel_master_backend_id;
+	/* Restore reindex state. */
+	reindexspace = shm_toc_lookup(toc, PARALLEL_KEY_REINDEX_STATE, false);
+	RestoreReindexState(reindexspace);
 
 	/*
 	 * We've initialized all of our state now; nothing should change
@@ -1110,6 +1405,9 @@ ParallelWorkerMain(Datum main_arg)
 	/* Shut down the parallel-worker transaction. */
 	EndParallelWorkerTransaction();
 
+	/* Detach from the per-session DSM segment. */
+	DetachSession();
+
 	/* Report success. */
 	pq_putmessage('X', NULL, 0);
 }
@@ -1130,6 +1428,20 @@ ParallelWorkerReportLastRecEnd(XLogRecPtr last_xlog_end)
 	SpinLockRelease(&fps->mutex);
 }
 
+/*
+ * Make sure the leader tries to read from our error queue one more time.
+ * This guards against the case where we exit uncleanly without sending an
+ * ErrorResponse to the leader, for example because some code calls proc_exit
+ * directly.
+ */
+static void
+ParallelWorkerShutdown(int code, Datum arg)
+{
+	SendProcSignal(ParallelMasterPid,
+				   PROCSIG_PARALLEL_MESSAGE,
+				   ParallelMasterBackendId);
+}
+
 /*
  * Look up (and possibly load) a parallel worker entry point function.
  *
diff --git a/src/backend/access/transam/slru.c b/src/backend/access/transam/slru.c
index 77edc51e1c..87942b4cca 100644
--- a/src/backend/access/transam/slru.c
+++ b/src/backend/access/transam/slru.c
@@ -38,7 +38,7 @@
  * by re-setting the page's page_dirty flag.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/slru.c
@@ -599,7 +599,7 @@ SimpleLruDoesPhysicalPageExist(SlruCtl ctl, int pageno)
 
 	SlruFileName(ctl, path, segno);
 
-	fd = OpenTransientFile(path, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(path, O_RDWR | PG_BINARY);
 	if (fd < 0)
 	{
 		/* expected: file doesn't exist */
@@ -629,7 +629,7 @@ SimpleLruDoesPhysicalPageExist(SlruCtl ctl, int pageno)
  * Physical read of a (previously existing) page into a buffer slot
  *
  * On failure, we cannot just ereport(ERROR) since caller has put state in
- * shared memory that must be undone.  So, we return FALSE and save enough
+ * shared memory that must be undone.  So, we return false and save enough
  * info in static variables to let SlruReportIOError make the report.
  *
  * For now, assume it's not worth keeping a file pointer open across
@@ -654,7 +654,7 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
 	 * SlruPhysicalWritePage).  Hence, if we are InRecovery, allow the case
 	 * where the file doesn't exist, and return zeroes instead.
 	 */
-	fd = OpenTransientFile(path, O_RDWR | PG_BINARY, S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(path, O_RDWR | PG_BINARY);
 	if (fd < 0)
 	{
 		if (errno != ENOENT || !InRecovery)
@@ -705,7 +705,7 @@ SlruPhysicalReadPage(SlruCtl ctl, int pageno, int slotno)
  * Physical write of a page from a buffer slot
  *
  * On failure, we cannot just ereport(ERROR) since caller has put state in
- * shared memory that must be undone.  So, we return FALSE and save enough
+ * shared memory that must be undone.  So, we return false and save enough
  * info in static variables to let SlruReportIOError make the report.
  *
  * For now, assume it's not worth keeping a file pointer open across
@@ -804,8 +804,7 @@ SlruPhysicalWritePage(SlruCtl ctl, int pageno, int slotno, SlruFlush fdata)
 		 * don't use O_EXCL or O_TRUNC or anything like that.
 		 */
 		SlruFileName(ctl, path, segno);
-		fd = OpenTransientFile(path, O_RDWR | O_CREAT | PG_BINARY,
-							   S_IRUSR | S_IWUSR);
+		fd = OpenTransientFile(path, O_RDWR | O_CREAT | PG_BINARY);
 		if (fd < 0)
 		{
 			slru_errcause = SLRU_OPEN_FAILED;
diff --git a/src/backend/access/transam/subtrans.c b/src/backend/access/transam/subtrans.c
index f640661130..4faa21f5ae 100644
--- a/src/backend/access/transam/subtrans.c
+++ b/src/backend/access/transam/subtrans.c
@@ -19,7 +19,7 @@
  * data across crashes.  During database startup, we simply force the
  * currently-active page of SUBTRANS to zeroes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/subtrans.c
diff --git a/src/backend/access/transam/timeline.c b/src/backend/access/transam/timeline.c
index 63db8a981d..61d36050c3 100644
--- a/src/backend/access/transam/timeline.c
+++ b/src/backend/access/transam/timeline.c
@@ -21,7 +21,7 @@
  * The fields are separated by tabs. Lines beginning with # are comments, and
  * are ignored. Empty lines are also ignored.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/timeline.c
@@ -307,8 +307,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
 	unlink(tmppath);
 
 	/* do not use get_sync_bit() here --- want to fsync only at end of fill */
-	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -325,7 +324,7 @@ writeTimeLineHistory(TimeLineID newTLI, TimeLineID parentTLI,
 	else
 		TLHistoryFilePath(path, parentTLI);
 
-	srcfd = OpenTransientFile(path, O_RDONLY, 0);
+	srcfd = OpenTransientFile(path, O_RDONLY);
 	if (srcfd < 0)
 	{
 		if (errno != ENOENT)
@@ -459,8 +458,7 @@ writeTimeLineHistoryFile(TimeLineID tli, char *content, int size)
 	unlink(tmppath);
 
 	/* do not use get_sync_bit() here --- want to fsync only at end of fill */
-	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/access/transam/transam.c b/src/backend/access/transam/transam.c
index 968b232364..52a624c90b 100644
--- a/src/backend/access/transam/transam.c
+++ b/src/backend/access/transam/transam.c
@@ -3,7 +3,7 @@
  * transam.c
  *	  postgres transaction (commit) log interface routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
index ba03d9687e..c479c4881b 100644
--- a/src/backend/access/transam/twophase.c
+++ b/src/backend/access/transam/twophase.c
@@ -3,7 +3,7 @@
  * twophase.c
  *		Two-phase commit support functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -170,9 +170,9 @@ typedef struct GlobalTransactionData
 
 	Oid			owner;			/* ID of user that executed the xact */
 	BackendId	locking_backend;	/* backend currently working on the xact */
-	bool		valid;			/* TRUE if PGPROC entry is in proc array */
-	bool		ondisk;			/* TRUE if prepare state file is on disk */
-	bool		inredo;			/* TRUE if entry was added via xlog_redo */
+	bool		valid;			/* true if PGPROC entry is in proc array */
+	bool		ondisk;			/* true if prepare state file is on disk */
+	bool		inredo;			/* true if entry was added via xlog_redo */
 	char		gid[GIDSIZE];	/* The GID assigned to the prepared xact */
 }			GlobalTransactionData;
 
@@ -1195,7 +1195,7 @@ ReadTwoPhaseFile(TransactionId xid, bool give_warnings)
 
 	TwoPhaseFilePath(path, xid);
 
-	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 	{
 		if (give_warnings)
@@ -1299,7 +1299,8 @@ XlogReadTwoPhaseData(XLogRecPtr lsn, char **buf, int *len)
 	XLogReaderState *xlogreader;
 	char	   *errormsg;
 
-	xlogreader = XLogReaderAllocate(&read_local_xlog_page, NULL);
+	xlogreader = XLogReaderAllocate(wal_segment_size, &read_local_xlog_page,
+									NULL);
 	if (!xlogreader)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -1580,8 +1581,7 @@ RecreateTwoPhaseFile(TransactionId xid, void *content, int len)
 	TwoPhaseFilePath(path, xid);
 
 	fd = OpenTransientFile(path,
-						   O_CREAT | O_TRUNC | O_WRONLY | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+						   O_CREAT | O_TRUNC | O_WRONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -1735,8 +1735,8 @@ restoreTwoPhaseData(void)
 	DIR		   *cldir;
 	struct dirent *clde;
 
-	cldir = AllocateDir(TWOPHASE_DIR);
 	LWLockAcquire(TwoPhaseStateLock, LW_EXCLUSIVE);
+	cldir = AllocateDir(TWOPHASE_DIR);
 	while ((clde = ReadDir(cldir, TWOPHASE_DIR)) != NULL)
 	{
 		if (strlen(clde->d_name) == 8 &&
@@ -2031,14 +2031,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 		if (fromdisk)
 		{
 			ereport(WARNING,
-					(errmsg("removing stale two-phase state file for \"%u\"",
+					(errmsg("removing stale two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 		}
 		else
 		{
 			ereport(WARNING,
-					(errmsg("removing stale two-phase state from shared memory for \"%u\"",
+					(errmsg("removing stale two-phase state from memory for transaction %u",
 							xid)));
 			PrepareRedoRemove(xid, true);
 		}
@@ -2051,14 +2051,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 		if (fromdisk)
 		{
 			ereport(WARNING,
-					(errmsg("removing future two-phase state file for \"%u\"",
+					(errmsg("removing future two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 		}
 		else
 		{
 			ereport(WARNING,
-					(errmsg("removing future two-phase state from memory for \"%u\"",
+					(errmsg("removing future two-phase state from memory for transaction %u",
 							xid)));
 			PrepareRedoRemove(xid, true);
 		}
@@ -2072,7 +2072,7 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 		if (buf == NULL)
 		{
 			ereport(WARNING,
-					(errmsg("removing corrupt two-phase state file for \"%u\"",
+					(errmsg("removing corrupt two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 			return NULL;
@@ -2091,14 +2091,14 @@ ProcessTwoPhaseBuffer(TransactionId xid,
 		if (fromdisk)
 		{
 			ereport(WARNING,
-					(errmsg("removing corrupt two-phase state file for \"%u\"",
+					(errmsg("removing corrupt two-phase state file for transaction %u",
 							xid)));
 			RemoveTwoPhaseFile(xid, true);
 		}
 		else
 		{
 			ereport(WARNING,
-					(errmsg("removing corrupt two-phase state from memory for \"%u\"",
+					(errmsg("removing corrupt two-phase state from memory for transaction %u",
 							xid)));
 			PrepareRedoRemove(xid, true);
 		}
diff --git a/src/backend/access/transam/twophase_rmgr.c b/src/backend/access/transam/twophase_rmgr.c
index 1cd03482d9..6d327e36bc 100644
--- a/src/backend/access/transam/twophase_rmgr.c
+++ b/src/backend/access/transam/twophase_rmgr.c
@@ -3,7 +3,7 @@
  * twophase_rmgr.c
  *	  Two-phase-commit resource managers tables
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/access/transam/varsup.c b/src/backend/access/transam/varsup.c
index 702c8c957f..394843f7e9 100644
--- a/src/backend/access/transam/varsup.c
+++ b/src/backend/access/transam/varsup.c
@@ -3,7 +3,7 @@
  * varsup.c
  *	  postgres OID & XID variables support routines
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/access/transam/varsup.c
@@ -124,14 +124,14 @@ GetNewTransactionId(bool isSubXact)
 						 errmsg("database is not accepting commands to avoid wraparound data loss in database \"%s\"",
 								oldest_datname),
 						 errhint("Stop the postmaster and vacuum that database in single-user mode.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
 						 errmsg("database is not accepting commands to avoid wraparound data loss in database with OID %u",
 								oldest_datoid),
 						 errhint("Stop the postmaster and vacuum that database in single-user mode.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		}
 		else if (TransactionIdFollowsOrEquals(xid, xidWarnLimit))
 		{
@@ -144,14 +144,14 @@ GetNewTransactionId(bool isSubXact)
 								oldest_datname,
 								xidWrapLimit - xid),
 						 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 			else
 				ereport(WARNING,
 						(errmsg("database with OID %u must be vacuumed within %u transactions",
 								oldest_datoid,
 								xidWrapLimit - xid),
 						 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-								 "You might also need to commit or roll back old prepared transactions.")));
+								 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		}
 
 		/* Re-acquire lock and start over */
@@ -403,14 +403,14 @@ SetTransactionIdLimit(TransactionId oldest_datfrozenxid, Oid oldest_datoid)
 							oldest_datname,
 							xidWrapLimit - curXid),
 					 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-							 "You might also need to commit or roll back old prepared transactions.")));
+							 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		else
 			ereport(WARNING,
 					(errmsg("database with OID %u must be vacuumed within %u transactions",
 							oldest_datoid,
 							xidWrapLimit - curXid),
 					 errhint("To avoid a database shutdown, execute a database-wide VACUUM in that database.\n"
-							 "You might also need to commit or roll back old prepared transactions.")));
+							 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 	}
 }
 
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
index 5e7e812200..dbaaf8e005 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -5,7 +5,7 @@
  *
  * See src/backend/access/transam/README for more information.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -145,6 +145,7 @@ typedef enum TBlockState
 	/* transaction block states */
 	TBLOCK_BEGIN,				/* starting transaction block */
 	TBLOCK_INPROGRESS,			/* live transaction */
+	TBLOCK_IMPLICIT_INPROGRESS, /* live transaction after implicit BEGIN */
 	TBLOCK_PARALLEL_INPROGRESS, /* live transaction inside parallel worker */
 	TBLOCK_END,					/* COMMIT received */
 	TBLOCK_ABORT,				/* failed xact, awaiting ROLLBACK */
@@ -218,7 +219,7 @@ static TransactionStateData TopTransactionStateData = {
 	false,						/* entry-time xact r/o state */
 	false,						/* startedInRecovery */
 	false,						/* didLogXid */
-	0,							/* parallelMode */
+	0,							/* parallelModeLevel */
 	NULL						/* link to parent state block */
 };
 
@@ -574,18 +575,10 @@ AssignTransactionId(TransactionState s)
 	 * ResourceOwner.
 	 */
 	currentOwner = CurrentResourceOwner;
-	PG_TRY();
-	{
-		CurrentResourceOwner = s->curTransactionOwner;
-		XactLockTableInsert(s->transactionId);
-	}
-	PG_CATCH();
-	{
-		/* Ensure CurrentResourceOwner is restored on error */
-		CurrentResourceOwner = currentOwner;
-		PG_RE_THROW();
-	}
-	PG_END_TRY();
+	CurrentResourceOwner = s->curTransactionOwner;
+
+	XactLockTableInsert(s->transactionId);
+
 	CurrentResourceOwner = currentOwner;
 
 	/*
@@ -678,8 +671,8 @@ SubTransactionIsActive(SubTransactionId subxid)
 /*
  *	GetCurrentCommandId
  *
- * "used" must be TRUE if the caller intends to use the command ID to mark
- * inserted/updated/deleted tuples.  FALSE means the ID is being fetched
+ * "used" must be true if the caller intends to use the command ID to mark
+ * inserted/updated/deleted tuples.  false means the ID is being fetched
  * for read-only purposes (ie, as a snapshot validity cutoff).  See
  * CommandCounterIncrement() for discussion.
  */
@@ -690,12 +683,12 @@ GetCurrentCommandId(bool used)
 	if (used)
 	{
 		/*
-		 * Forbid setting currentCommandIdUsed in parallel mode, because we
-		 * have no provision for communicating this back to the master.  We
+		 * Forbid setting currentCommandIdUsed in a parallel worker, because
+		 * we have no provision for communicating this back to the master.  We
 		 * could relax this restriction when currentCommandIdUsed was already
 		 * true at the start of the parallel operation.
 		 */
-		Assert(CurrentTransactionState->parallelModeLevel == 0);
+		Assert(!IsParallelWorker());
 		currentCommandIdUsed = true;
 	}
 	return currentCommandId;
@@ -1004,11 +997,12 @@ AtStart_Memory(void)
 	 */
 	if (TransactionAbortContext == NULL)
 		TransactionAbortContext =
-			AllocSetContextCreate(TopMemoryContext,
-								  "TransactionAbortContext",
-								  32 * 1024,
-								  32 * 1024,
-								  32 * 1024);
+			AllocSetContextCreateExtended(TopMemoryContext,
+										  "TransactionAbortContext",
+										  0,
+										  32 * 1024,
+										  32 * 1024,
+										  32 * 1024);
 
 	/*
 	 * We shouldn't have a transaction context already.
@@ -1171,7 +1165,7 @@ RecordTransactionCommit(void)
 		 * vacuum.  Hence we emit a bespoke record for the invalidations. We
 		 * don't want to use that in case a commit record is emitted, so they
 		 * happen synchronously with commits (besides not wanting to emit more
-		 * WAL recoreds).
+		 * WAL records).
 		 */
 		if (nmsgs != 0)
 		{
@@ -2700,6 +2694,7 @@ StartTransactionCommand(void)
 			 * previous CommitTransactionCommand.)
 			 */
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 		case TBLOCK_SUBINPROGRESS:
 			break;
 
@@ -2790,6 +2785,7 @@ CommitTransactionCommand(void)
 			 * counter and return.
 			 */
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 		case TBLOCK_SUBINPROGRESS:
 			CommandCounterIncrement();
 			break;
@@ -3014,10 +3010,12 @@ AbortCurrentTransaction(void)
 			break;
 
 			/*
-			 * if we aren't in a transaction block, we just do the basic abort
-			 * & cleanup transaction.
+			 * If we aren't in a transaction block, we just do the basic abort
+			 * & cleanup transaction.  For this purpose, we treat an implicit
+			 * transaction block as if it were a simple statement.
 			 */
 		case TBLOCK_STARTED:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 			AbortTransaction();
 			CleanupTransaction();
 			s->blockState = TBLOCK_DEFAULT;
@@ -3148,9 +3146,8 @@ AbortCurrentTransaction(void)
  *	completes).  Subtransactions are verboten too.
  *
  *	isTopLevel: passed down from ProcessUtility to determine whether we are
- *	inside a function or multi-query querystring.  (We will always fail if
- *	this is false, but it's convenient to centralize the check here instead of
- *	making callers do it.)
+ *	inside a function.  (We will always fail if this is false, but it's
+ *	convenient to centralize the check here instead of making callers do it.)
  *	stmtType: statement type name, for error messages.
  */
 void
@@ -3183,8 +3180,7 @@ PreventTransactionChain(bool isTopLevel, const char *stmtType)
 		ereport(ERROR,
 				(errcode(ERRCODE_ACTIVE_SQL_TRANSACTION),
 		/* translator: %s represents an SQL statement name */
-				 errmsg("%s cannot be executed from a function or multi-command string",
-						stmtType)));
+				 errmsg("%s cannot be executed from a function", stmtType)));
 
 	/* If we got past IsTransactionBlock test, should be in default state */
 	if (CurrentTransactionState->blockState != TBLOCK_DEFAULT &&
@@ -3344,7 +3340,7 @@ CallXactCallbacks(XactEvent event)
 	XactCallbackItem *item;
 
 	for (item = Xact_callbacks; item; item = item->next)
-		(*item->callback) (event, item->arg);
+		item->callback(event, item->arg);
 }
 
 
@@ -3401,7 +3397,7 @@ CallSubXactCallbacks(SubXactEvent event,
 	SubXactCallbackItem *item;
 
 	for (item = SubXact_callbacks; item; item = item->next)
-		(*item->callback) (event, mySubid, parentSubid, item->arg);
+		item->callback(event, mySubid, parentSubid, item->arg);
 }
 
 
@@ -3428,6 +3424,15 @@ BeginTransactionBlock(void)
 			s->blockState = TBLOCK_BEGIN;
 			break;
 
+			/*
+			 * BEGIN converts an implicit transaction block to a regular one.
+			 * (Note that we allow this even if we've already done some
+			 * commands, which is a bit odd but matches historical practice.)
+			 */
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			s->blockState = TBLOCK_BEGIN;
+			break;
+
 			/*
 			 * Already a transaction block in progress.
 			 */
@@ -3466,7 +3471,7 @@ BeginTransactionBlock(void)
  *		This executes a PREPARE command.
  *
  * Since PREPARE may actually do a ROLLBACK, the result indicates what
- * happened: TRUE for PREPARE, FALSE for ROLLBACK.
+ * happened: true for PREPARE, false for ROLLBACK.
  *
  * Note that we don't actually do anything here except change blockState.
  * The real work will be done in the upcoming PrepareTransaction().
@@ -3474,7 +3479,7 @@ BeginTransactionBlock(void)
  * resource owner, etc while executing inside a Portal.
  */
 bool
-PrepareTransactionBlock(char *gid)
+PrepareTransactionBlock(const char *gid)
 {
 	TransactionState s;
 	bool		result;
@@ -3503,7 +3508,8 @@ PrepareTransactionBlock(char *gid)
 			 * ignore case where we are not in a transaction;
 			 * EndTransactionBlock already issued a warning.
 			 */
-			Assert(s->blockState == TBLOCK_STARTED);
+			Assert(s->blockState == TBLOCK_STARTED ||
+				   s->blockState == TBLOCK_IMPLICIT_INPROGRESS);
 			/* Don't send back a PREPARE result tag... */
 			result = false;
 		}
@@ -3517,7 +3523,7 @@ PrepareTransactionBlock(char *gid)
  *		This executes a COMMIT command.
  *
  * Since COMMIT may actually do a ROLLBACK, the result indicates what
- * happened: TRUE for COMMIT, FALSE for ROLLBACK.
+ * happened: true for COMMIT, false for ROLLBACK.
  *
  * Note that we don't actually do anything here except change blockState.
  * The real work will be done in the upcoming CommitTransactionCommand().
@@ -3541,6 +3547,18 @@ EndTransactionBlock(void)
 			result = true;
 			break;
 
+			/*
+			 * In an implicit transaction block, commit, but issue a warning
+			 * because there was no explicit BEGIN before this.
+			 */
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			ereport(WARNING,
+					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
+					 errmsg("there is no transaction in progress")));
+			s->blockState = TBLOCK_END;
+			result = true;
+			break;
+
 			/*
 			 * We are in a failed transaction block.  Tell
 			 * CommitTransactionCommand it's time to exit the block.
@@ -3705,8 +3723,14 @@ UserAbortTransactionBlock(void)
 			 * WARNING and go to abort state.  The upcoming call to
 			 * CommitTransactionCommand() will then put us back into the
 			 * default state.
+			 *
+			 * We do the same thing with ABORT inside an implicit transaction,
+			 * although in this case we might be rolling back actual database
+			 * state changes.  (It's debatable whether we should issue a
+			 * WARNING in this case, but we have done so historically.)
 			 */
 		case TBLOCK_STARTED:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 			ereport(WARNING,
 					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
 					 errmsg("there is no transaction in progress")));
@@ -3743,12 +3767,64 @@ UserAbortTransactionBlock(void)
 	}
 }
 
+/*
+ * BeginImplicitTransactionBlock
+ *		Start an implicit transaction block if we're not already in one.
+ *
+ * Unlike BeginTransactionBlock, this is called directly from the main loop
+ * in postgres.c, not within a Portal.  So we can just change blockState
+ * without a lot of ceremony.  We do not expect caller to do
+ * CommitTransactionCommand/StartTransactionCommand.
+ */
+void
+BeginImplicitTransactionBlock(void)
+{
+	TransactionState s = CurrentTransactionState;
+
+	/*
+	 * If we are in STARTED state (that is, no transaction block is open),
+	 * switch to IMPLICIT_INPROGRESS state, creating an implicit transaction
+	 * block.
+	 *
+	 * For caller convenience, we consider all other transaction states as
+	 * legal here; otherwise the caller would need its own state check, which
+	 * seems rather pointless.
+	 */
+	if (s->blockState == TBLOCK_STARTED)
+		s->blockState = TBLOCK_IMPLICIT_INPROGRESS;
+}
+
+/*
+ * EndImplicitTransactionBlock
+ *		End an implicit transaction block, if we're in one.
+ *
+ * Like EndTransactionBlock, we just make any needed blockState change here.
+ * The real work will be done in the upcoming CommitTransactionCommand().
+ */
+void
+EndImplicitTransactionBlock(void)
+{
+	TransactionState s = CurrentTransactionState;
+
+	/*
+	 * If we are in IMPLICIT_INPROGRESS state, switch back to STARTED state,
+	 * allowing CommitTransactionCommand to commit whatever happened during
+	 * the implicit transaction block as though it were a single statement.
+	 *
+	 * For caller convenience, we consider all other transaction states as
+	 * legal here; otherwise the caller would need its own state check, which
+	 * seems rather pointless.
+	 */
+	if (s->blockState == TBLOCK_IMPLICIT_INPROGRESS)
+		s->blockState = TBLOCK_STARTED;
+}
+
 /*
  * DefineSavepoint
  *		This executes a SAVEPOINT command.
  */
 void
-DefineSavepoint(char *name)
+DefineSavepoint(const char *name)
 {
 	TransactionState s = CurrentTransactionState;
 
@@ -3780,6 +3856,28 @@ DefineSavepoint(char *name)
 				s->name = MemoryContextStrdup(TopTransactionContext, name);
 			break;
 
+			/*
+			 * We disallow savepoint commands in implicit transaction blocks.
+			 * There would be no great difficulty in allowing them so far as
+			 * this module is concerned, but a savepoint seems inconsistent
+			 * with exec_simple_query's behavior of abandoning the whole query
+			 * string upon error.  Also, the point of an implicit transaction
+			 * block (as opposed to a regular one) is to automatically close
+			 * after an error, so it's hard to see how a savepoint would fit
+			 * into that.
+			 *
+			 * The error messages for this are phrased as if there were no
+			 * active transaction block at all, which is historical but
+			 * perhaps could be improved.
+			 */
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			ereport(ERROR,
+					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
+			/* translator: %s represents an SQL statement name */
+					 errmsg("%s can only be used in transaction blocks",
+							"SAVEPOINT")));
+			break;
+
 			/* These cases are invalid. */
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
@@ -3834,8 +3932,7 @@ ReleaseSavepoint(List *options)
 	switch (s->blockState)
 	{
 			/*
-			 * We can't rollback to a savepoint if there is no savepoint
-			 * defined.
+			 * We can't release a savepoint if there is no savepoint defined.
 			 */
 		case TBLOCK_INPROGRESS:
 			ereport(ERROR,
@@ -3843,6 +3940,15 @@ ReleaseSavepoint(List *options)
 					 errmsg("no such savepoint")));
 			break;
 
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			/* See comment about implicit transactions in DefineSavepoint */
+			ereport(ERROR,
+					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
+			/* translator: %s represents an SQL statement name */
+					 errmsg("%s can only be used in transaction blocks",
+							"RELEASE SAVEPOINT")));
+			break;
+
 			/*
 			 * We are in a non-aborted subtransaction.  This is the only valid
 			 * case.
@@ -3957,6 +4063,15 @@ RollbackToSavepoint(List *options)
 					 errmsg("no such savepoint")));
 			break;
 
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			/* See comment about implicit transactions in DefineSavepoint */
+			ereport(ERROR,
+					(errcode(ERRCODE_NO_ACTIVE_SQL_TRANSACTION),
+			/* translator: %s represents an SQL statement name */
+					 errmsg("%s can only be used in transaction blocks",
+							"ROLLBACK TO SAVEPOINT")));
+			break;
+
 			/*
 			 * There is at least one savepoint, so proceed.
 			 */
@@ -4046,14 +4161,15 @@ RollbackToSavepoint(List *options)
 /*
  * BeginInternalSubTransaction
  *		This is the same as DefineSavepoint except it allows TBLOCK_STARTED,
- *		TBLOCK_END, and TBLOCK_PREPARE states, and therefore it can safely be
- *		used in functions that might be called when not inside a BEGIN block
- *		or when running deferred triggers at COMMIT/PREPARE time.  Also, it
- *		automatically does CommitTransactionCommand/StartTransactionCommand
- *		instead of expecting the caller to do it.
+ *		TBLOCK_IMPLICIT_INPROGRESS, TBLOCK_END, and TBLOCK_PREPARE states,
+ *		and therefore it can safely be used in functions that might be called
+ *		when not inside a BEGIN block or when running deferred triggers at
+ *		COMMIT/PREPARE time.  Also, it automatically does
+ *		CommitTransactionCommand/StartTransactionCommand instead of expecting
+ *		the caller to do it.
  */
 void
-BeginInternalSubTransaction(char *name)
+BeginInternalSubTransaction(const char *name)
 {
 	TransactionState s = CurrentTransactionState;
 
@@ -4076,6 +4192,7 @@ BeginInternalSubTransaction(char *name)
 	{
 		case TBLOCK_STARTED:
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 		case TBLOCK_END:
 		case TBLOCK_PREPARE:
 		case TBLOCK_SUBINPROGRESS:
@@ -4180,6 +4297,7 @@ RollbackAndReleaseCurrentSubTransaction(void)
 		case TBLOCK_DEFAULT:
 		case TBLOCK_STARTED:
 		case TBLOCK_BEGIN:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_INPROGRESS:
@@ -4211,6 +4329,7 @@ RollbackAndReleaseCurrentSubTransaction(void)
 	s = CurrentTransactionState;	/* changed by pop */
 	AssertState(s->blockState == TBLOCK_SUBINPROGRESS ||
 				s->blockState == TBLOCK_INPROGRESS ||
+				s->blockState == TBLOCK_IMPLICIT_INPROGRESS ||
 				s->blockState == TBLOCK_STARTED);
 }
 
@@ -4259,6 +4378,7 @@ AbortOutOfAnyTransaction(void)
 			case TBLOCK_STARTED:
 			case TBLOCK_BEGIN:
 			case TBLOCK_INPROGRESS:
+			case TBLOCK_IMPLICIT_INPROGRESS:
 			case TBLOCK_PARALLEL_INPROGRESS:
 			case TBLOCK_END:
 			case TBLOCK_ABORT_PENDING:
@@ -4369,6 +4489,7 @@ TransactionBlockStatusCode(void)
 		case TBLOCK_BEGIN:
 		case TBLOCK_SUBBEGIN:
 		case TBLOCK_INPROGRESS:
+		case TBLOCK_IMPLICIT_INPROGRESS:
 		case TBLOCK_PARALLEL_INPROGRESS:
 		case TBLOCK_SUBINPROGRESS:
 		case TBLOCK_END:
@@ -4596,6 +4717,9 @@ AbortSubTransaction(void)
 	/* Reset WAL record construction state */
 	XLogResetInsertion();
 
+	/* Cancel condition variable sleep */
+	ConditionVariableCancelSleep();
+
 	/*
 	 * Also clean up any open wait for lock, since the lock manager will choke
 	 * if we try to wait for another lock before doing this.
@@ -5036,6 +5160,8 @@ BlockStateAsString(TBlockState blockState)
 			return "BEGIN";
 		case TBLOCK_INPROGRESS:
 			return "INPROGRESS";
+		case TBLOCK_IMPLICIT_INPROGRESS:
+			return "IMPLICIT_INPROGRESS";
 		case TBLOCK_PARALLEL_INPROGRESS:
 			return "PARALLEL_INPROGRESS";
 		case TBLOCK_END:
diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index df4843f409..47a6c4d895 100644
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -4,7 +4,7 @@
  *		PostgreSQL write-ahead log manager
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/xlog.c
@@ -110,6 +110,8 @@ int			wal_retrieve_retry_interval = 5000;
 bool		XLOG_DEBUG = false;
 #endif
 
+int			wal_segment_size = DEFAULT_XLOG_SEG_SIZE;
+
 /*
  * Number of WAL insertion locks to use. A higher value allows more insertions
  * to happen concurrently, but adds some CPU overhead to flushing the WAL,
@@ -731,14 +733,16 @@ static ControlFileData *ControlFile = NULL;
 	(((recptr) / XLOG_BLCKSZ) % (XLogCtl->XLogCacheBlck + 1))
 
 /*
- * These are the number of bytes in a WAL page and segment usable for WAL data.
+ * These are the number of bytes in a WAL page usable for WAL data.
  */
 #define UsableBytesInPage (XLOG_BLCKSZ - SizeOfXLogShortPHD)
-#define UsableBytesInSegment ((XLOG_SEG_SIZE / XLOG_BLCKSZ) * UsableBytesInPage - (SizeOfXLogLongPHD - SizeOfXLogShortPHD))
 
 /* Convert min_wal_size_mb and max wal_size_mb to equivalent segment count */
-#define ConvertToXSegs(x)	\
-	(x / (XLOG_SEG_SIZE / (1024 * 1024)))
+#define ConvertToXSegs(x, segsize)	\
+	(x / ((segsize) / (1024 * 1024)))
+
+/* The number of bytes in a WAL segment usable for WAL data. */
+static int	UsableBytesInSegment;
 
 /*
  * Private, possibly out-of-date copy of shared LogwrtResult.
@@ -1137,7 +1141,9 @@ XLogInsertRecord(XLogRecData *rdata,
 			EndPos = StartPos + SizeOfXLogRecord;
 			if (StartPos / XLOG_BLCKSZ != EndPos / XLOG_BLCKSZ)
 			{
-				if (EndPos % XLOG_SEG_SIZE == EndPos % XLOG_BLCKSZ)
+				uint64		offset = XLogSegmentOffset(EndPos, wal_segment_size);
+
+				if (offset == EndPos % XLOG_BLCKSZ)
 					EndPos += SizeOfXLogLongPHD;
 				else
 					EndPos += SizeOfXLogShortPHD;
@@ -1170,7 +1176,7 @@ XLogInsertRecord(XLogRecData *rdata,
 			appendBinaryStringInfo(&recordBuf, rdata->data, rdata->len);
 
 		if (!debug_reader)
-			debug_reader = XLogReaderAllocate(NULL, NULL);
+			debug_reader = XLogReaderAllocate(wal_segment_size, NULL, NULL);
 
 		if (!debug_reader)
 		{
@@ -1296,7 +1302,7 @@ ReserveXLogSwitch(XLogRecPtr *StartPos, XLogRecPtr *EndPos, XLogRecPtr *PrevPtr)
 	startbytepos = Insert->CurrBytePos;
 
 	ptr = XLogBytePosToEndRecPtr(startbytepos);
-	if (ptr % XLOG_SEG_SIZE == 0)
+	if (XLogSegmentOffset(ptr, wal_segment_size) == 0)
 	{
 		SpinLockRelease(&Insert->insertpos_lck);
 		*EndPos = *StartPos = ptr;
@@ -1309,8 +1315,8 @@ ReserveXLogSwitch(XLogRecPtr *StartPos, XLogRecPtr *EndPos, XLogRecPtr *PrevPtr)
 	*StartPos = XLogBytePosToRecPtr(startbytepos);
 	*EndPos = XLogBytePosToEndRecPtr(endbytepos);
 
-	segleft = XLOG_SEG_SIZE - ((*EndPos) % XLOG_SEG_SIZE);
-	if (segleft != XLOG_SEG_SIZE)
+	segleft = wal_segment_size - XLogSegmentOffset(*EndPos, wal_segment_size);
+	if (segleft != wal_segment_size)
 	{
 		/* consume the rest of the segment */
 		*EndPos += segleft;
@@ -1323,7 +1329,7 @@ ReserveXLogSwitch(XLogRecPtr *StartPos, XLogRecPtr *EndPos, XLogRecPtr *PrevPtr)
 
 	*PrevPtr = XLogBytePosToRecPtr(prevbytepos);
 
-	Assert((*EndPos) % XLOG_SEG_SIZE == 0);
+	Assert(XLogSegmentOffset(*EndPos, wal_segment_size) == 0);
 	Assert(XLogRecPtrToBytePos(*EndPos) == endbytepos);
 	Assert(XLogRecPtrToBytePos(*StartPos) == startbytepos);
 	Assert(XLogRecPtrToBytePos(*PrevPtr) == prevbytepos);
@@ -1501,7 +1507,7 @@ CopyXLogRecordToWAL(int write_len, bool isLogSwitch, XLogRecData *rdata,
 			pagehdr->xlp_info |= XLP_FIRST_IS_CONTRECORD;
 
 			/* skip over the page header */
-			if (CurrPos % XLogSegSize == 0)
+			if (XLogSegmentOffset(CurrPos, wal_segment_size) == 0)
 			{
 				CurrPos += SizeOfXLogLongPHD;
 				currpos += SizeOfXLogLongPHD;
@@ -1532,16 +1538,16 @@ CopyXLogRecordToWAL(int write_len, bool isLogSwitch, XLogRecData *rdata,
 	 * allocated and zeroed in the WAL buffers so that when the caller (or
 	 * someone else) does XLogWrite(), it can really write out all the zeros.
 	 */
-	if (isLogSwitch && CurrPos % XLOG_SEG_SIZE != 0)
+	if (isLogSwitch && XLogSegmentOffset(CurrPos, wal_segment_size) != 0)
 	{
 		/* An xlog-switch record doesn't contain any data besides the header */
 		Assert(write_len == SizeOfXLogRecord);
 
 		/*
 		 * We do this one page at a time, to make sure we don't deadlock
-		 * against ourselves if wal_buffers < XLOG_SEG_SIZE.
+		 * against ourselves if wal_buffers < wal_segment_size.
 		 */
-		Assert(EndPos % XLogSegSize == 0);
+		Assert(XLogSegmentOffset(EndPos, wal_segment_size) == 0);
 
 		/* Use up all the remaining space on the first page */
 		CurrPos += freespace;
@@ -1866,10 +1872,10 @@ GetXLogBuffer(XLogRecPtr ptr)
 		 * the page header.
 		 */
 		if (ptr % XLOG_BLCKSZ == SizeOfXLogShortPHD &&
-			ptr % XLOG_SEG_SIZE > XLOG_BLCKSZ)
+			XLogSegmentOffset(ptr, wal_segment_size) > XLOG_BLCKSZ)
 			initializedUpto = ptr - SizeOfXLogShortPHD;
 		else if (ptr % XLOG_BLCKSZ == SizeOfXLogLongPHD &&
-				 ptr % XLOG_SEG_SIZE < XLOG_BLCKSZ)
+				 XLogSegmentOffset(ptr, wal_segment_size) < XLOG_BLCKSZ)
 			initializedUpto = ptr - SizeOfXLogLongPHD;
 		else
 			initializedUpto = ptr;
@@ -1939,7 +1945,7 @@ XLogBytePosToRecPtr(uint64 bytepos)
 		seg_offset += fullpages * XLOG_BLCKSZ + bytesleft + SizeOfXLogShortPHD;
 	}
 
-	XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result);
+	XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result, wal_segment_size);
 
 	return result;
 }
@@ -1985,7 +1991,7 @@ XLogBytePosToEndRecPtr(uint64 bytepos)
 			seg_offset += fullpages * XLOG_BLCKSZ + bytesleft + SizeOfXLogShortPHD;
 	}
 
-	XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result);
+	XLogSegNoOffsetToRecPtr(fullsegs, seg_offset, result, wal_segment_size);
 
 	return result;
 }
@@ -2001,9 +2007,9 @@ XLogRecPtrToBytePos(XLogRecPtr ptr)
 	uint32		offset;
 	uint64		result;
 
-	XLByteToSeg(ptr, fullsegs);
+	XLByteToSeg(ptr, fullsegs, wal_segment_size);
 
-	fullpages = (ptr % XLOG_SEG_SIZE) / XLOG_BLCKSZ;
+	fullpages = (XLogSegmentOffset(ptr, wal_segment_size)) / XLOG_BLCKSZ;
 	offset = ptr % XLOG_BLCKSZ;
 
 	if (fullpages == 0)
@@ -2168,12 +2174,12 @@ AdvanceXLInsertBuffer(XLogRecPtr upto, bool opportunistic)
 		/*
 		 * If first page of an XLOG segment file, make it a long header.
 		 */
-		if ((NewPage->xlp_pageaddr % XLogSegSize) == 0)
+		if ((XLogSegmentOffset(NewPage->xlp_pageaddr, wal_segment_size)) == 0)
 		{
 			XLogLongPageHeader NewLongPage = (XLogLongPageHeader) NewPage;
 
 			NewLongPage->xlp_sysid = ControlFile->system_identifier;
-			NewLongPage->xlp_seg_size = XLogSegSize;
+			NewLongPage->xlp_seg_size = wal_segment_size;
 			NewLongPage->xlp_xlog_blcksz = XLOG_BLCKSZ;
 			NewPage->xlp_info |= XLP_LONG_HEADER;
 		}
@@ -2215,12 +2221,18 @@ CalculateCheckpointSegments(void)
 	 * Calculate the distance at which to trigger a checkpoint, to avoid
 	 * exceeding max_wal_size_mb. This is based on two assumptions:
 	 *
-	 * a) we keep WAL for two checkpoint cycles, back to the "prev" checkpoint.
+	 * a) we keep WAL for only one checkpoint cycle (prior to PG11 we kept
+	 *    WAL for two checkpoint cycles to allow us to recover from the
+	 *    secondary checkpoint if the first checkpoint failed, though we
+	 *    only did this on the master anyway, not on standby. Keeping just
+	 *    one checkpoint simplifies processing and reduces disk space in
+	 *    many smaller databases.)
 	 * b) during checkpoint, we consume checkpoint_completion_target *
 	 *	  number of segments consumed between checkpoints.
 	 *-------
 	 */
-	target = (double) ConvertToXSegs(max_wal_size_mb) / (2.0 + CheckPointCompletionTarget);
+	target = (double) ConvertToXSegs(max_wal_size_mb, wal_segment_size) /
+		(1.0 + CheckPointCompletionTarget);
 
 	/* round down */
 	CheckPointSegments = (int) target;
@@ -2260,8 +2272,10 @@ XLOGfileslop(XLogRecPtr PriorRedoPtr)
 	 * correspond to. Always recycle enough segments to meet the minimum, and
 	 * remove enough segments to stay below the maximum.
 	 */
-	minSegNo = PriorRedoPtr / XLOG_SEG_SIZE + ConvertToXSegs(min_wal_size_mb) - 1;
-	maxSegNo = PriorRedoPtr / XLOG_SEG_SIZE + ConvertToXSegs(max_wal_size_mb) - 1;
+	minSegNo = PriorRedoPtr / wal_segment_size +
+		ConvertToXSegs(min_wal_size_mb, wal_segment_size) - 1;
+	maxSegNo = PriorRedoPtr / wal_segment_size +
+		ConvertToXSegs(max_wal_size_mb, wal_segment_size) - 1;
 
 	/*
 	 * Between those limits, recycle enough segments to get us through to the
@@ -2270,27 +2284,13 @@ XLOGfileslop(XLogRecPtr PriorRedoPtr)
 	 * To estimate where the next checkpoint will finish, assume that the
 	 * system runs steadily consuming CheckPointDistanceEstimate bytes between
 	 * every checkpoint.
-	 *
-	 * The reason this calculation is done from the prior checkpoint, not the
-	 * one that just finished, is that this behaves better if some checkpoint
-	 * cycles are abnormally short, like if you perform a manual checkpoint
-	 * right after a timed one. The manual checkpoint will make almost a full
-	 * cycle's worth of WAL segments available for recycling, because the
-	 * segments from the prior's prior, fully-sized checkpoint cycle are no
-	 * longer needed. However, the next checkpoint will make only few segments
-	 * available for recycling, the ones generated between the timed
-	 * checkpoint and the manual one right after that. If at the manual
-	 * checkpoint we only retained enough segments to get us to the next timed
-	 * one, and removed the rest, then at the next checkpoint we would not
-	 * have enough segments around for recycling, to get us to the checkpoint
-	 * after that. Basing the calculations on the distance from the prior redo
-	 * pointer largely fixes that problem.
-	 */
-	distance = (2.0 + CheckPointCompletionTarget) * CheckPointDistanceEstimate;
+	 */
+	distance = (1.0 + CheckPointCompletionTarget) * CheckPointDistanceEstimate;
 	/* add 10% for good measure. */
 	distance *= 1.10;
 
-	recycleSegNo = (XLogSegNo) ceil(((double) PriorRedoPtr + distance) / XLOG_SEG_SIZE);
+	recycleSegNo = (XLogSegNo) ceil(((double) PriorRedoPtr + distance) /
+									wal_segment_size);
 
 	if (recycleSegNo < minSegNo)
 		recycleSegNo = minSegNo;
@@ -2314,7 +2314,7 @@ XLogCheckpointNeeded(XLogSegNo new_segno)
 {
 	XLogSegNo	old_segno;
 
-	XLByteToSeg(RedoRecPtr, old_segno);
+	XLByteToSeg(RedoRecPtr, old_segno, wal_segment_size);
 
 	if (new_segno >= old_segno + (uint64) (CheckPointSegments - 1))
 		return true;
@@ -2324,7 +2324,7 @@ XLogCheckpointNeeded(XLogSegNo new_segno)
 /*
  * Write and/or fsync the log at least as far as WriteRqst indicates.
  *
- * If flexible == TRUE, we don't have to write as far as WriteRqst, but
+ * If flexible == true, we don't have to write as far as WriteRqst, but
  * may stop at any convenient boundary (such as a cache or logfile boundary).
  * This option allows us to avoid uselessly issuing multiple writes when a
  * single one would do.
@@ -2392,7 +2392,8 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 		LogwrtResult.Write = EndPtr;
 		ispartialpage = WriteRqst.Write < LogwrtResult.Write;
 
-		if (!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo))
+		if (!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo,
+							 wal_segment_size))
 		{
 			/*
 			 * Switch to new logfile segment.  We cannot have any pending
@@ -2401,7 +2402,8 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 			Assert(npages == 0);
 			if (openLogFile >= 0)
 				XLogFileClose();
-			XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo);
+			XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo,
+							wal_segment_size);
 
 			/* create/use new log file */
 			use_existent = true;
@@ -2412,7 +2414,8 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 		/* Make sure we have the current logfile open */
 		if (openLogFile < 0)
 		{
-			XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo);
+			XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo,
+							wal_segment_size);
 			openLogFile = XLogFileOpen(openLogSegNo);
 			openLogOff = 0;
 		}
@@ -2422,7 +2425,8 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 		{
 			/* first of group */
 			startidx = curridx;
-			startoffset = (LogwrtResult.Write - XLOG_BLCKSZ) % XLogSegSize;
+			startoffset = XLogSegmentOffset(LogwrtResult.Write - XLOG_BLCKSZ,
+											wal_segment_size);
 		}
 		npages++;
 
@@ -2435,7 +2439,7 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 		last_iteration = WriteRqst.Write <= LogwrtResult.Write;
 
 		finishing_seg = !ispartialpage &&
-			(startoffset + npages * XLOG_BLCKSZ) >= XLogSegSize;
+			(startoffset + npages * XLOG_BLCKSZ) >= wal_segment_size;
 
 		if (last_iteration ||
 			curridx == XLogCtl->XLogCacheBlck ||
@@ -2562,11 +2566,13 @@ XLogWrite(XLogwrtRqst WriteRqst, bool flexible)
 			sync_method != SYNC_METHOD_OPEN_DSYNC)
 		{
 			if (openLogFile >= 0 &&
-				!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo))
+				!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo,
+								 wal_segment_size))
 				XLogFileClose();
 			if (openLogFile < 0)
 			{
-				XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo);
+				XLByteToPrevSeg(LogwrtResult.Write, openLogSegNo,
+								wal_segment_size);
 				openLogFile = XLogFileOpen(openLogSegNo);
 				openLogOff = 0;
 			}
@@ -2939,7 +2945,7 @@ XLogFlush(XLogRecPtr record)
  *
  * This routine is invoked periodically by the background walwriter process.
  *
- * Returns TRUE if there was any work to do, even if we skipped flushing due
+ * Returns true if there was any work to do, even if we skipped flushing due
  * to wal_writer_delay/wal_writer_flush_after.
  */
 bool
@@ -2982,7 +2988,8 @@ XLogBackgroundFlush(void)
 	{
 		if (openLogFile >= 0)
 		{
-			if (!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo))
+			if (!XLByteInPrevSeg(LogwrtResult.Write, openLogSegNo,
+								 wal_segment_size))
 			{
 				XLogFileClose();
 			}
@@ -3134,12 +3141,12 @@ XLogNeedsFlush(XLogRecPtr record)
  *
  * log, seg: identify segment to be created/opened.
  *
- * *use_existent: if TRUE, OK to use a pre-existing file (else, any
- * pre-existing file will be deleted).  On return, TRUE if a pre-existing
+ * *use_existent: if true, OK to use a pre-existing file (else, any
+ * pre-existing file will be deleted).  On return, true if a pre-existing
  * file was used.
  *
- * use_lock: if TRUE, acquire ControlFileLock while moving file into
- * place.  This should be TRUE except during bootstrap log creation.  The
+ * use_lock: if true, acquire ControlFileLock while moving file into
+ * place.  This should be true except during bootstrap log creation.  The
  * caller must *not* hold the lock at call.
  *
  * Returns FD of opened file.
@@ -3161,15 +3168,14 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 	int			fd;
 	int			nbytes;
 
-	XLogFilePath(path, ThisTimeLineID, logsegno);
+	XLogFilePath(path, ThisTimeLineID, logsegno, wal_segment_size);
 
 	/*
 	 * Try to use existent file (checkpoint maker may have created it already)
 	 */
 	if (*use_existent)
 	{
-		fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method),
-						   S_IRUSR | S_IWUSR);
+		fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method));
 		if (fd < 0)
 		{
 			if (errno != ENOENT)
@@ -3194,8 +3200,7 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 	unlink(tmppath);
 
 	/* do not use get_sync_bit() here --- want to fsync only at end of fill */
-	fd = BasicOpenFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
-					   S_IRUSR | S_IWUSR);
+	fd = BasicOpenFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -3215,7 +3220,7 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 	 */
 	zbuffer = (char *) MAXALIGN(zbuffer_raw);
 	memset(zbuffer, 0, XLOG_BLCKSZ);
-	for (nbytes = 0; nbytes < XLogSegSize; nbytes += XLOG_BLCKSZ)
+	for (nbytes = 0; nbytes < wal_segment_size; nbytes += XLOG_BLCKSZ)
 	{
 		errno = 0;
 		pgstat_report_wait_start(WAIT_EVENT_WAL_INIT_WRITE);
@@ -3291,8 +3296,7 @@ XLogFileInit(XLogSegNo logsegno, bool *use_existent, bool use_lock)
 	*use_existent = false;
 
 	/* Now open original target segment (might not be file I just made) */
-	fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method),
-					   S_IRUSR | S_IWUSR);
+	fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method));
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -3332,8 +3336,8 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 	/*
 	 * Open the source file
 	 */
-	XLogFilePath(path, srcTLI, srcsegno);
-	srcfd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	XLogFilePath(path, srcTLI, srcsegno, wal_segment_size);
+	srcfd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 	if (srcfd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -3347,8 +3351,7 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 	unlink(tmppath);
 
 	/* do not use get_sync_bit() here --- want to fsync only at end of fill */
-	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(tmppath, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -3357,7 +3360,7 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
 	/*
 	 * Do the data copying.
 	 */
-	for (nbytes = 0; nbytes < XLogSegSize; nbytes += sizeof(buffer))
+	for (nbytes = 0; nbytes < wal_segment_size; nbytes += sizeof(buffer))
 	{
 		int			nread;
 
@@ -3438,24 +3441,24 @@ XLogFileCopy(XLogSegNo destsegno, TimeLineID srcTLI, XLogSegNo srcsegno,
  * filename while it's being created) and to recycle an old segment.
  *
  * *segno: identify segment to install as (or first possible target).
- * When find_free is TRUE, this is modified on return to indicate the
+ * When find_free is true, this is modified on return to indicate the
  * actual installation location or last segment searched.
  *
  * tmppath: initial name of file to install.  It will be renamed into place.
  *
- * find_free: if TRUE, install the new segment at the first empty segno
- * number at or after the passed numbers.  If FALSE, install the new segment
+ * find_free: if true, install the new segment at the first empty segno
+ * number at or after the passed numbers.  If false, install the new segment
  * exactly where specified, deleting any existing segment file there.
  *
  * max_segno: maximum segment number to install the new file as.  Fail if no
  * free slot is found between *segno and max_segno. (Ignored when find_free
- * is FALSE.)
+ * is false.)
  *
- * use_lock: if TRUE, acquire ControlFileLock while moving file into
- * place.  This should be TRUE except during bootstrap log creation.  The
+ * use_lock: if true, acquire ControlFileLock while moving file into
+ * place.  This should be true except during bootstrap log creation.  The
  * caller must *not* hold the lock at call.
  *
- * Returns TRUE if the file was installed successfully.  FALSE indicates that
+ * Returns true if the file was installed successfully.  false indicates that
  * max_segno limit was exceeded, or an error occurred while renaming the
  * file into place.
  */
@@ -3467,7 +3470,7 @@ InstallXLogFileSegment(XLogSegNo *segno, char *tmppath,
 	char		path[MAXPGPATH];
 	struct stat stat_buf;
 
-	XLogFilePath(path, ThisTimeLineID, *segno);
+	XLogFilePath(path, ThisTimeLineID, *segno, wal_segment_size);
 
 	/*
 	 * We want to be sure that only one process does this at a time.
@@ -3493,7 +3496,7 @@ InstallXLogFileSegment(XLogSegNo *segno, char *tmppath,
 				return false;
 			}
 			(*segno)++;
-			XLogFilePath(path, ThisTimeLineID, *segno);
+			XLogFilePath(path, ThisTimeLineID, *segno, wal_segment_size);
 		}
 	}
 
@@ -3524,10 +3527,9 @@ XLogFileOpen(XLogSegNo segno)
 	char		path[MAXPGPATH];
 	int			fd;
 
-	XLogFilePath(path, ThisTimeLineID, segno);
+	XLogFilePath(path, ThisTimeLineID, segno, wal_segment_size);
 
-	fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method),
-					   S_IRUSR | S_IWUSR);
+	fd = BasicOpenFile(path, O_RDWR | PG_BINARY | get_sync_bit(sync_method));
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
@@ -3551,7 +3553,7 @@ XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,
 	char		path[MAXPGPATH];
 	int			fd;
 
-	XLogFileName(xlogfname, tli, segno);
+	XLogFileName(xlogfname, tli, segno, wal_segment_size);
 
 	switch (source)
 	{
@@ -3563,7 +3565,7 @@ XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,
 
 			restoredFromArchive = RestoreArchivedFile(path, xlogfname,
 													  "RECOVERYXLOG",
-													  XLogSegSize,
+													  wal_segment_size,
 													  InRedo);
 			if (!restoredFromArchive)
 				return -1;
@@ -3571,7 +3573,7 @@ XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,
 
 		case XLOG_FROM_PG_WAL:
 		case XLOG_FROM_STREAM:
-			XLogFilePath(path, tli, segno);
+			XLogFilePath(path, tli, segno, wal_segment_size);
 			restoredFromArchive = false;
 			break;
 
@@ -3593,7 +3595,7 @@ XLogFileRead(XLogSegNo segno, int emode, TimeLineID tli,
 		snprintf(path, MAXPGPATH, XLOGDIR "/%s", xlogfname);
 	}
 
-	fd = BasicOpenFile(path, O_RDONLY | PG_BINARY, 0);
+	fd = BasicOpenFile(path, O_RDONLY | PG_BINARY);
 	if (fd >= 0)
 	{
 		/* Success! */
@@ -3690,7 +3692,7 @@ XLogFileReadAnyTLI(XLogSegNo segno, int emode, int source)
 	}
 
 	/* Couldn't find it.  For simplicity, complain about front timeline */
-	XLogFilePath(path, recoveryTargetTLI, segno);
+	XLogFilePath(path, recoveryTargetTLI, segno, wal_segment_size);
 	errno = ENOENT;
 	ereport(emode,
 			(errcode_for_file_access(),
@@ -3741,9 +3743,11 @@ PreallocXlogFiles(XLogRecPtr endptr)
 	XLogSegNo	_logSegNo;
 	int			lf;
 	bool		use_existent;
+	uint64		offset;
 
-	XLByteToPrevSeg(endptr, _logSegNo);
-	if ((endptr - 1) % XLogSegSize >= (uint32) (0.75 * XLogSegSize))
+	XLByteToPrevSeg(endptr, _logSegNo, wal_segment_size);
+	offset = XLogSegmentOffset(endptr - 1, wal_segment_size);
+	if (offset >= (uint32) (0.75 * wal_segment_size))
 	{
 		_logSegNo++;
 		use_existent = true;
@@ -3760,10 +3764,16 @@ PreallocXlogFiles(XLogRecPtr endptr)
  * existed while the server has been running, as this function always
  * succeeds if no WAL segments have been removed since startup.
  * 'tli' is only used in the error message.
+ *
+ * Note: this function guarantees to keep errno unchanged on return.
+ * This supports callers that use this to possibly deliver a better
+ * error message about a missing file, while still being able to throw
+ * a normal file-access error afterwards, if this does return.
  */
 void
 CheckXLogRemoved(XLogSegNo segno, TimeLineID tli)
 {
+	int			save_errno = errno;
 	XLogSegNo	lastRemovedSegNo;
 
 	SpinLockAcquire(&XLogCtl->info_lck);
@@ -3774,12 +3784,14 @@ CheckXLogRemoved(XLogSegNo segno, TimeLineID tli)
 	{
 		char		filename[MAXFNAMELEN];
 
-		XLogFileName(filename, tli, segno);
+		XLogFileName(filename, tli, segno, wal_segment_size);
+		errno = save_errno;
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("requested WAL segment %s has already been removed",
 						filename)));
 	}
+	errno = save_errno;
 }
 
 /*
@@ -3811,7 +3823,7 @@ UpdateLastRemovedPtr(char *filename)
 	uint32		tli;
 	XLogSegNo	segno;
 
-	XLogFromFileName(filename, &tli, &segno);
+	XLogFromFileName(filename, &tli, &segno, wal_segment_size);
 
 	SpinLockAcquire(&XLogCtl->info_lck);
 	if (segno > XLogCtl->lastRemovedSegNo)
@@ -3833,23 +3845,18 @@ RemoveOldXlogFiles(XLogSegNo segno, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 	struct dirent *xlde;
 	char		lastoff[MAXFNAMELEN];
 
-	xldir = AllocateDir(XLOGDIR);
-	if (xldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open write-ahead log directory \"%s\": %m",
-						XLOGDIR)));
-
 	/*
 	 * Construct a filename of the last segment to be kept. The timeline ID
 	 * doesn't matter, we ignore that in the comparison. (During recovery,
 	 * ThisTimeLineID isn't set, so we can't use that.)
 	 */
-	XLogFileName(lastoff, 0, segno);
+	XLogFileName(lastoff, 0, segno, wal_segment_size);
 
 	elog(DEBUG2, "attempting to remove WAL segments older than log file %s",
 		 lastoff);
 
+	xldir = AllocateDir(XLOGDIR);
+
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
 		/* Ignore files that are not XLOG segments */
@@ -3906,23 +3913,18 @@ RemoveNonParentXlogFiles(XLogRecPtr switchpoint, TimeLineID newTLI)
 	char		switchseg[MAXFNAMELEN];
 	XLogSegNo	endLogSegNo;
 
-	XLByteToPrevSeg(switchpoint, endLogSegNo);
-
-	xldir = AllocateDir(XLOGDIR);
-	if (xldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open write-ahead log directory \"%s\": %m",
-						XLOGDIR)));
+	XLByteToPrevSeg(switchpoint, endLogSegNo, wal_segment_size);
 
 	/*
 	 * Construct a filename of the last segment to be kept.
 	 */
-	XLogFileName(switchseg, newTLI, endLogSegNo);
+	XLogFileName(switchseg, newTLI, endLogSegNo, wal_segment_size);
 
 	elog(DEBUG2, "attempting to remove WAL segments newer than log file %s",
 		 switchseg);
 
+	xldir = AllocateDir(XLOGDIR);
+
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
 		/* Ignore files that are not XLOG segments */
@@ -3974,7 +3976,7 @@ RemoveXlogFile(const char *segname, XLogRecPtr PriorRedoPtr, XLogRecPtr endptr)
 	/*
 	 * Initialize info about where to try to recycle to.
 	 */
-	XLByteToSeg(endptr, endlogSegNo);
+	XLByteToSeg(endptr, endlogSegNo, wal_segment_size);
 	if (PriorRedoPtr == InvalidXLogRecPtr)
 		recycleSegNo = endlogSegNo + 10;
 	else
@@ -4104,11 +4106,6 @@ CleanupBackupHistory(void)
 	char		path[MAXPGPATH + sizeof(XLOGDIR)];
 
 	xldir = AllocateDir(XLOGDIR);
-	if (xldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open write-ahead log directory \"%s\": %m",
-						XLOGDIR)));
 
 	while ((xlde = ReadDir(xldir, XLOGDIR)) != NULL)
 	{
@@ -4192,9 +4189,11 @@ ReadRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr, int emode,
 			XLogSegNo	segno;
 			int32		offset;
 
-			XLByteToSeg(xlogreader->latestPagePtr, segno);
-			offset = xlogreader->latestPagePtr % XLogSegSize;
-			XLogFileName(fname, xlogreader->readPageTLI, segno);
+			XLByteToSeg(xlogreader->latestPagePtr, segno, wal_segment_size);
+			offset = XLogSegmentOffset(xlogreader->latestPagePtr,
+									   wal_segment_size);
+			XLogFileName(fname, xlogreader->readPageTLI, segno,
+						 wal_segment_size);
 			ereport(emode_for_corrupt_record(emode,
 											 RecPtr ? RecPtr : EndRecPtr),
 					(errmsg("unexpected timeline ID %u in log segment %s, offset %u",
@@ -4399,7 +4398,7 @@ WriteControlFile(void)
 	ControlFile->blcksz = BLCKSZ;
 	ControlFile->relseg_size = RELSEG_SIZE;
 	ControlFile->xlog_blcksz = XLOG_BLCKSZ;
-	ControlFile->xlog_seg_size = XLOG_SEG_SIZE;
+	ControlFile->xlog_seg_size = wal_segment_size;
 
 	ControlFile->nameDataLen = NAMEDATALEN;
 	ControlFile->indexMaxKeys = INDEX_MAX_KEYS;
@@ -4428,8 +4427,7 @@ WriteControlFile(void)
 	memcpy(buffer, ControlFile, sizeof(ControlFileData));
 
 	fd = BasicOpenFile(XLOG_CONTROL_FILE,
-					   O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
-					   S_IRUSR | S_IWUSR);
+					   O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
@@ -4467,13 +4465,13 @@ ReadControlFile(void)
 {
 	pg_crc32c	crc;
 	int			fd;
+	static char wal_segsz_str[20];
 
 	/*
 	 * Read data...
 	 */
 	fd = BasicOpenFile(XLOG_CONTROL_FILE,
-					   O_RDWR | PG_BINARY,
-					   S_IRUSR | S_IWUSR);
+					   O_RDWR | PG_BINARY);
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
@@ -4569,13 +4567,6 @@ ReadControlFile(void)
 						   " but the server was compiled with XLOG_BLCKSZ %d.",
 						   ControlFile->xlog_blcksz, XLOG_BLCKSZ),
 				 errhint("It looks like you need to recompile or initdb.")));
-	if (ControlFile->xlog_seg_size != XLOG_SEG_SIZE)
-		ereport(FATAL,
-				(errmsg("database files are incompatible with server"),
-				 errdetail("The database cluster was initialized with XLOG_SEG_SIZE %d,"
-						   " but the server was compiled with XLOG_SEG_SIZE %d.",
-						   ControlFile->xlog_seg_size, XLOG_SEG_SIZE),
-				 errhint("It looks like you need to recompile or initdb.")));
 	if (ControlFile->nameDataLen != NAMEDATALEN)
 		ereport(FATAL,
 				(errmsg("database files are incompatible with server"),
@@ -4637,6 +4628,32 @@ ReadControlFile(void)
 				 errhint("It looks like you need to recompile or initdb.")));
 #endif
 
+	wal_segment_size = ControlFile->xlog_seg_size;
+
+	if (!IsValidWalSegSize(wal_segment_size))
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						errmsg("WAL segment size must be a power of two between 1MB and 1GB, but the control file specifies %d bytes",
+							   wal_segment_size)));
+
+	snprintf(wal_segsz_str, sizeof(wal_segsz_str), "%d", wal_segment_size);
+	SetConfigOption("wal_segment_size", wal_segsz_str, PGC_INTERNAL,
+					PGC_S_OVERRIDE);
+
+	/* check and update variables dependent on wal_segment_size */
+	if (ConvertToXSegs(min_wal_size_mb, wal_segment_size) < 2)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						errmsg("\"min_wal_size\" must be at least twice \"wal_segment_size\".")));
+
+	if (ConvertToXSegs(max_wal_size_mb, wal_segment_size) < 2)
+		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						errmsg("\"max_wal_size\" must be at least twice \"wal_segment_size\".")));
+
+	UsableBytesInSegment =
+		(wal_segment_size / XLOG_BLCKSZ * UsableBytesInPage) -
+		(SizeOfXLogLongPHD - SizeOfXLogShortPHD);
+
+	CalculateCheckpointSegments();
+
 	/* Make the initdb settings visible as GUC variables, too */
 	SetConfigOption("data_checksums", DataChecksumsEnabled() ? "yes" : "no",
 					PGC_INTERNAL, PGC_S_OVERRIDE);
@@ -4654,8 +4671,7 @@ UpdateControlFile(void)
 	FIN_CRC32C(ControlFile->crc);
 
 	fd = BasicOpenFile(XLOG_CONTROL_FILE,
-					   O_RDWR | PG_BINARY,
-					   S_IRUSR | S_IWUSR);
+					   O_RDWR | PG_BINARY);
 	if (fd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
@@ -4757,8 +4773,8 @@ XLOGChooseNumBuffers(void)
 	int			xbuffers;
 
 	xbuffers = NBuffers / 32;
-	if (xbuffers > XLOG_SEG_SIZE / XLOG_BLCKSZ)
-		xbuffers = XLOG_SEG_SIZE / XLOG_BLCKSZ;
+	if (xbuffers > (wal_segment_size / XLOG_BLCKSZ))
+		xbuffers = (wal_segment_size / XLOG_BLCKSZ);
 	if (xbuffers < 8)
 		xbuffers = 8;
 	return xbuffers;
@@ -4799,6 +4815,26 @@ check_wal_buffers(int *newval, void **extra, GucSource source)
 	return true;
 }
 
+/*
+ * Read the control file, set respective GUCs.
+ *
+ * This is to be called during startup, including a crash recovery cycle,
+ * unless in bootstrap mode, where no control file yet exists.  As there's no
+ * usable shared memory yet (its sizing can depend on the contents of the
+ * control file!), first store the contents in local memory. XLOGShmemInit()
+ * will then copy it to shared memory later.
+ *
+ * reset just controls whether previous contents are to be expected (in the
+ * reset case, there's a dangling pointer into old shared memory), or not.
+ */
+void
+LocalProcessControlFile(bool reset)
+{
+	Assert(reset || ControlFile == NULL);
+	ControlFile = palloc(sizeof(ControlFileData));
+	ReadControlFile();
+}
+
 /*
  * Initialization of shared memory for XLOG
  */
@@ -4850,6 +4886,7 @@ XLOGShmemInit(void)
 				foundXLog;
 	char	   *allocptr;
 	int			i;
+	ControlFileData *localControlFile;
 
 #ifdef WAL_DEBUG
 
@@ -4867,11 +4904,14 @@ XLOGShmemInit(void)
 	}
 #endif
 
-	ControlFile = (ControlFileData *)
-		ShmemInitStruct("Control File", sizeof(ControlFileData), &foundCFile);
+
 	XLogCtl = (XLogCtlData *)
 		ShmemInitStruct("XLOG Ctl", XLOGShmemSize(), &foundXLog);
 
+	localControlFile = ControlFile;
+	ControlFile = (ControlFileData *)
+		ShmemInitStruct("Control File", sizeof(ControlFileData), &foundCFile);
+
 	if (foundCFile || foundXLog)
 	{
 		/* both should be present or neither */
@@ -4881,10 +4921,23 @@ XLOGShmemInit(void)
 		WALInsertLocks = XLogCtl->Insert.WALInsertLocks;
 		LWLockRegisterTranche(LWTRANCHE_WAL_INSERT,
 							  "wal_insert");
+
+		if (localControlFile)
+			pfree(localControlFile);
 		return;
 	}
 	memset(XLogCtl, 0, sizeof(XLogCtlData));
 
+	/*
+	 * Already have read control file locally, unless in bootstrap mode. Move
+	 * contents into shared memory.
+	 */
+	if (localControlFile)
+	{
+		memcpy(ControlFile, localControlFile, sizeof(ControlFileData));
+		pfree(localControlFile);
+	}
+
 	/*
 	 * Since XLogCtlData contains XLogRecPtr fields, its sizeof should be a
 	 * multiple of the alignment for same, so no extra alignment padding is
@@ -4933,14 +4986,6 @@ XLOGShmemInit(void)
 	SpinLockInit(&XLogCtl->info_lck);
 	SpinLockInit(&XLogCtl->ulsn_lck);
 	InitSharedLatch(&XLogCtl->recoveryWakeupLatch);
-
-	/*
-	 * If we are not in bootstrap mode, pg_control should already exist. Read
-	 * and validate it immediately (see comments in ReadControlFile() for the
-	 * reasons why).
-	 */
-	if (!IsBootstrapProcessingMode())
-		ReadControlFile();
 }
 
 /*
@@ -5005,7 +5050,7 @@ BootStrapXLOG(void)
 	 * segment with logid=0 logseg=1. The very first WAL segment, 0/0, is not
 	 * used, so that we can use 0/0 to mean "before any valid WAL segment".
 	 */
-	checkPoint.redo = XLogSegSize + SizeOfXLogLongPHD;
+	checkPoint.redo = wal_segment_size + SizeOfXLogLongPHD;
 	checkPoint.ThisTimeLineID = ThisTimeLineID;
 	checkPoint.PrevTimeLineID = ThisTimeLineID;
 	checkPoint.fullPageWrites = fullPageWrites;
@@ -5036,10 +5081,10 @@ BootStrapXLOG(void)
 	page->xlp_magic = XLOG_PAGE_MAGIC;
 	page->xlp_info = XLP_LONG_HEADER;
 	page->xlp_tli = ThisTimeLineID;
-	page->xlp_pageaddr = XLogSegSize;
+	page->xlp_pageaddr = wal_segment_size;
 	longpage = (XLogLongPageHeader) page;
 	longpage->xlp_sysid = sysidentifier;
-	longpage->xlp_seg_size = XLogSegSize;
+	longpage->xlp_seg_size = wal_segment_size;
 	longpage->xlp_xlog_blcksz = XLOG_BLCKSZ;
 
 	/* Insert the initial checkpoint record */
@@ -5129,6 +5174,12 @@ BootStrapXLOG(void)
 	BootStrapMultiXact();
 
 	pfree(buffer);
+
+	/*
+	 * Force control file to be read - in contrast to normal processing we'd
+	 * otherwise never run the checks and GUC related initializations therein.
+	 */
+	ReadControlFile();
 }
 
 static char *
@@ -5265,6 +5316,18 @@ readRecoveryCommandFile(void)
 		{
 			recoveryTarget = RECOVERY_TARGET_TIME;
 
+			if (strcmp(item->value, "epoch") == 0 ||
+				strcmp(item->value, "infinity") == 0 ||
+				strcmp(item->value, "-infinity") == 0 ||
+				strcmp(item->value, "now") == 0 ||
+				strcmp(item->value, "today") == 0 ||
+				strcmp(item->value, "tomorrow") == 0 ||
+				strcmp(item->value, "yesterday") == 0)
+				ereport(FATAL,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("recovery_target_time is not a valid timestamp: \"%s\"",
+								item->value)));
+
 			/*
 			 * Convert the time string given by the user to TimestampTz form.
 			 */
@@ -5503,8 +5566,8 @@ exitArchiveRecovery(TimeLineID endTLI, XLogRecPtr endOfLog)
 	 * they are the same, but if the switch happens exactly at a segment
 	 * boundary, startLogSegNo will be endLogSegNo + 1.
 	 */
-	XLByteToPrevSeg(endOfLog, endLogSegNo);
-	XLByteToSeg(endOfLog, startLogSegNo);
+	XLByteToPrevSeg(endOfLog, endLogSegNo, wal_segment_size);
+	XLByteToSeg(endOfLog, startLogSegNo, wal_segment_size);
 
 	/*
 	 * Initialize the starting WAL segment for the new timeline. If the switch
@@ -5522,7 +5585,7 @@ exitArchiveRecovery(TimeLineID endTLI, XLogRecPtr endOfLog)
 		 * avoid emplacing a bogus file.
 		 */
 		XLogFileCopy(endLogSegNo, endTLI, endLogSegNo,
-					 endOfLog % XLOG_SEG_SIZE);
+					 XLogSegmentOffset(endOfLog, wal_segment_size));
 	}
 	else
 	{
@@ -5546,7 +5609,7 @@ exitArchiveRecovery(TimeLineID endTLI, XLogRecPtr endOfLog)
 	 * Let's just make real sure there are not .ready or .done flags posted
 	 * for the new segment.
 	 */
-	XLogFileName(xlogfname, ThisTimeLineID, startLogSegNo);
+	XLogFileName(xlogfname, ThisTimeLineID, startLogSegNo, wal_segment_size);
 	XLogArchiveCleanup(xlogfname);
 
 	/*
@@ -5610,7 +5673,7 @@ getRecordTimestamp(XLogReaderState *record, TimestampTz *recordXtime)
  * For point-in-time recovery, this function decides whether we want to
  * stop applying the XLOG before the current record.
  *
- * Returns TRUE if we are stopping, FALSE otherwise. If stopping, some
+ * Returns true if we are stopping, false otherwise. If stopping, some
  * information is saved in recoveryStopXid et al for use in annotating the
  * new timeline's history file.
  */
@@ -6215,13 +6278,8 @@ StartupXLOG(void)
 	struct stat st;
 
 	/*
-	 * Read control file and check XLOG status looks valid.
-	 *
-	 * Note: in most control paths, *ControlFile is already valid and we need
-	 * not do ReadControlFile() here, but might as well do it to be sure.
+	 * Verify XLOG status looks valid.
 	 */
-	ReadControlFile();
-
 	if (ControlFile->state < DB_SHUTDOWNED ||
 		ControlFile->state > DB_IN_PRODUCTION ||
 		!XRecOffIsValid(ControlFile->checkPoint))
@@ -6348,7 +6406,7 @@ StartupXLOG(void)
 
 	/* Set up XLOG reader facility */
 	MemSet(&private, 0, sizeof(XLogPageReadPrivate));
-	xlogreader = XLogReaderAllocate(&XLogPageRead, &private);
+	xlogreader = XLogReaderAllocate(wal_segment_size, &XLogPageRead, &private);
 	if (!xlogreader)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -6505,10 +6563,7 @@ StartupXLOG(void)
 				StandbyMode = true;
 		}
 
-		/*
-		 * Get the last valid checkpoint record.  If the latest one according
-		 * to pg_control is broken, try the next-to-last one.
-		 */
+		/* Get the last valid checkpoint record. */
 		checkPointLoc = ControlFile->checkPoint;
 		RedoStartLSN = ControlFile->checkPointCopy.redo;
 		record = ReadCheckpointRecord(xlogreader, checkPointLoc, 1, true);
@@ -6518,30 +6573,17 @@ StartupXLOG(void)
 					(errmsg("checkpoint record is at %X/%X",
 							(uint32) (checkPointLoc >> 32), (uint32) checkPointLoc)));
 		}
-		else if (StandbyMode)
+		else
 		{
 			/*
-			 * The last valid checkpoint record required for a streaming
-			 * recovery exists in neither standby nor the primary.
+			 * We used to attempt to go back to a secondary checkpoint record
+			 * here, but only when not in standby_mode. We now just fail if we
+			 * can't read the last checkpoint because this allows us to
+			 * simplify processing around checkpoints.
 			 */
 			ereport(PANIC,
 					(errmsg("could not locate a valid checkpoint record")));
 		}
-		else
-		{
-			checkPointLoc = ControlFile->prevCheckPoint;
-			record = ReadCheckpointRecord(xlogreader, checkPointLoc, 2, true);
-			if (record != NULL)
-			{
-				ereport(LOG,
-						(errmsg("using previous checkpoint record at %X/%X",
-								(uint32) (checkPointLoc >> 32), (uint32) checkPointLoc)));
-				InRecovery = true;	/* force recovery even if SHUTDOWNED */
-			}
-			else
-				ereport(PANIC,
-						(errmsg("could not locate a valid checkpoint record")));
-		}
 		memcpy(&checkPoint, XLogRecGetData(xlogreader), sizeof(CheckPoint));
 		wasShutdown = ((record->xl_info & ~XLR_INFO_MASK) == XLOG_CHECKPOINT_SHUTDOWN);
 	}
@@ -6607,7 +6649,7 @@ StartupXLOG(void)
 	ereport(DEBUG1,
 			(errmsg_internal("redo record is at %X/%X; shutdown %s",
 							 (uint32) (checkPoint.redo >> 32), (uint32) checkPoint.redo,
-							 wasShutdown ? "TRUE" : "FALSE")));
+							 wasShutdown ? "true" : "false")));
 	ereport(DEBUG1,
 			(errmsg_internal("next transaction ID: %u:%u; next OID: %u",
 							 checkPoint.nextXidEpoch, checkPoint.nextXid,
@@ -6770,7 +6812,6 @@ StartupXLOG(void)
 								recoveryTargetTLI)));
 			ControlFile->state = DB_IN_CRASH_RECOVERY;
 		}
-		ControlFile->prevCheckPoint = ControlFile->checkPoint;
 		ControlFile->checkPoint = checkPointLoc;
 		ControlFile->checkPointCopy = checkPoint;
 		if (InArchiveRecovery)
@@ -7481,7 +7522,7 @@ StartupXLOG(void)
 		XLogRecPtr	pageBeginPtr;
 
 		pageBeginPtr = EndOfLog - (EndOfLog % XLOG_BLCKSZ);
-		Assert(readOff == pageBeginPtr % XLogSegSize);
+		Assert(readOff == XLogSegmentOffset(pageBeginPtr, wal_segment_size));
 
 		firstIdx = XLogRecPtrToBufIdx(EndOfLog);
 
@@ -7544,12 +7585,11 @@ StartupXLOG(void)
 		{
 			if (fast_promote)
 			{
-				checkPointLoc = ControlFile->prevCheckPoint;
+				checkPointLoc = ControlFile->checkPoint;
 
 				/*
 				 * Confirm the last checkpoint is available for us to recover
-				 * from if we fail. Note that we don't check for the secondary
-				 * checkpoint since that isn't available in most base backups.
+				 * from if we fail.
 				 */
 				record = ReadCheckpointRecord(xlogreader, checkPointLoc, 1, false);
 				if (record != NULL)
@@ -7630,13 +7670,14 @@ StartupXLOG(void)
 		 * restored from the archive to begin with, it's expected to have a
 		 * .done file).
 		 */
-		if (EndOfLog % XLOG_SEG_SIZE != 0 && XLogArchivingActive())
+		if (XLogSegmentOffset(EndOfLog, wal_segment_size) != 0 &&
+			XLogArchivingActive())
 		{
 			char		origfname[MAXFNAMELEN];
 			XLogSegNo	endLogSegNo;
 
-			XLByteToPrevSeg(EndOfLog, endLogSegNo);
-			XLogFileName(origfname, EndOfLogTLI, endLogSegNo);
+			XLByteToPrevSeg(EndOfLog, endLogSegNo, wal_segment_size);
+			XLogFileName(origfname, EndOfLogTLI, endLogSegNo, wal_segment_size);
 
 			if (!XLogArchiveIsReadyOrDone(origfname))
 			{
@@ -7644,7 +7685,7 @@ StartupXLOG(void)
 				char		partialfname[MAXFNAMELEN];
 				char		partialpath[MAXPGPATH];
 
-				XLogFilePath(origpath, EndOfLogTLI, endLogSegNo);
+				XLogFilePath(origpath, EndOfLogTLI, endLogSegNo, wal_segment_size);
 				snprintf(partialfname, MAXFNAMELEN, "%s.partial", origfname);
 				snprintf(partialpath, MAXPGPATH, "%s.partial", origpath);
 
@@ -7824,7 +7865,7 @@ CheckRecoveryConsistency(void)
 	/*
 	 * Have we passed our safe starting point? Note that minRecoveryPoint is
 	 * known to be incorrectly set if ControlFile->backupEndRequired, until
-	 * the XLOG_BACKUP_RECORD arrives to advise us of the correct
+	 * the XLOG_BACKUP_END arrives to advise us of the correct
 	 * minRecoveryPoint. All we know prior to that is that we're not
 	 * consistent yet.
 	 */
@@ -8014,7 +8055,7 @@ LocalSetXLogInsertAllowed(void)
  * Subroutine to try to fetch and validate a prior checkpoint record.
  *
  * whichChkpt identifies the checkpoint (merely for reporting purposes).
- * 1 for "primary", 2 for "secondary", 0 for "other" (backup_label)
+ * 1 for "primary", 0 for "other" (backup_label)
  */
 static XLogRecord *
 ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
@@ -8034,10 +8075,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 				ereport(LOG,
 						(errmsg("invalid primary checkpoint link in control file")));
 				break;
-			case 2:
-				ereport(LOG,
-						(errmsg("invalid secondary checkpoint link in control file")));
-				break;
 			default:
 				ereport(LOG,
 						(errmsg("invalid checkpoint link in backup_label file")));
@@ -8059,10 +8096,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 				ereport(LOG,
 						(errmsg("invalid primary checkpoint record")));
 				break;
-			case 2:
-				ereport(LOG,
-						(errmsg("invalid secondary checkpoint record")));
-				break;
 			default:
 				ereport(LOG,
 						(errmsg("invalid checkpoint record")));
@@ -8078,10 +8111,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 				ereport(LOG,
 						(errmsg("invalid resource manager ID in primary checkpoint record")));
 				break;
-			case 2:
-				ereport(LOG,
-						(errmsg("invalid resource manager ID in secondary checkpoint record")));
-				break;
 			default:
 				ereport(LOG,
 						(errmsg("invalid resource manager ID in checkpoint record")));
@@ -8099,10 +8128,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 				ereport(LOG,
 						(errmsg("invalid xl_info in primary checkpoint record")));
 				break;
-			case 2:
-				ereport(LOG,
-						(errmsg("invalid xl_info in secondary checkpoint record")));
-				break;
 			default:
 				ereport(LOG,
 						(errmsg("invalid xl_info in checkpoint record")));
@@ -8118,10 +8143,6 @@ ReadCheckpointRecord(XLogReaderState *xlogreader, XLogRecPtr RecPtr,
 				ereport(LOG,
 						(errmsg("invalid length of primary checkpoint record")));
 				break;
-			case 2:
-				ereport(LOG,
-						(errmsg("invalid length of secondary checkpoint record")));
-				break;
 			default:
 				ereport(LOG,
 						(errmsg("invalid length of checkpoint record")));
@@ -8150,6 +8171,9 @@ InitXLOGAccess(void)
 	ThisTimeLineID = XLogCtl->ThisTimeLineID;
 	Assert(ThisTimeLineID != 0 || IsBootstrapProcessingMode());
 
+	/* set wal_segment_size */
+	wal_segment_size = ControlFile->xlog_seg_size;
+
 	/* Use GetRedoRecPtr to copy the RedoRecPtr safely */
 	(void) GetRedoRecPtr();
 	/* Also update our copy of doPageWrites. */
@@ -8480,7 +8504,7 @@ UpdateCheckPointDistanceEstimate(uint64 nbytes)
 	 * more.
 	 *
 	 * When checkpoints are triggered by max_wal_size, this should converge to
-	 * CheckpointSegments * XLOG_SEG_SIZE,
+	 * CheckpointSegments * wal_segment_size,
 	 *
 	 * Note: This doesn't pay any attention to what caused the checkpoint.
 	 * Checkpoints triggered manually with CHECKPOINT command, or by e.g.
@@ -8646,7 +8670,7 @@ CreateCheckPoint(int flags)
 			LWLockRelease(CheckpointLock);
 			END_CRIT_SECTION();
 			ereport(DEBUG1,
-					(errmsg("checkpoint skipped due to an idle system")));
+					(errmsg("checkpoint skipped because system is idle")));
 			return;
 		}
 	}
@@ -8679,7 +8703,7 @@ CreateCheckPoint(int flags)
 	freespace = INSERT_FREESPACE(curInsert);
 	if (freespace == 0)
 	{
-		if (curInsert % XLogSegSize == 0)
+		if (XLogSegmentOffset(curInsert, wal_segment_size) == 0)
 			curInsert += SizeOfXLogLongPHD;
 		else
 			curInsert += SizeOfXLogShortPHD;
@@ -8854,8 +8878,8 @@ CreateCheckPoint(int flags)
 				(errmsg("concurrent write-ahead log activity while database system is shutting down")));
 
 	/*
-	 * Remember the prior checkpoint's redo pointer, used later to determine
-	 * the point where the log can be truncated.
+	 * Remember the prior checkpoint's redo ptr for
+	 * UpdateCheckPointDistanceEstimate()
 	 */
 	PriorRedoPtr = ControlFile->checkPointCopy.redo;
 
@@ -8865,7 +8889,6 @@ CreateCheckPoint(int flags)
 	LWLockAcquire(ControlFileLock, LW_EXCLUSIVE);
 	if (shutdown)
 		ControlFile->state = DB_SHUTDOWNED;
-	ControlFile->prevCheckPoint = ControlFile->checkPoint;
 	ControlFile->checkPoint = ProcLastRecPtr;
 	ControlFile->checkPointCopy = checkPoint;
 	ControlFile->time = (pg_time_t) time(NULL);
@@ -8903,8 +8926,7 @@ CreateCheckPoint(int flags)
 	smgrpostckpt();
 
 	/*
-	 * Delete old log files (those no longer needed even for previous
-	 * checkpoint or the standbys in XLOG streaming).
+	 * Delete old log files and recycle them
 	 */
 	if (PriorRedoPtr != InvalidXLogRecPtr)
 	{
@@ -8913,7 +8935,8 @@ CreateCheckPoint(int flags)
 		/* Update the average distance between checkpoints. */
 		UpdateCheckPointDistanceEstimate(RedoRecPtr - PriorRedoPtr);
 
-		XLByteToSeg(PriorRedoPtr, _logSegNo);
+		/* Trim from the last checkpoint, not the last - 1 */
+		XLByteToSeg(RedoRecPtr, _logSegNo, wal_segment_size);
 		KeepLogSeg(recptr, &_logSegNo);
 		_logSegNo--;
 		RemoveOldXlogFiles(_logSegNo, PriorRedoPtr, recptr);
@@ -9179,8 +9202,8 @@ CreateRestartPoint(int flags)
 	CheckPointGuts(lastCheckPoint.redo, flags);
 
 	/*
-	 * Remember the prior checkpoint's redo pointer, used later to determine
-	 * the point at which we can truncate the log.
+	 * Remember the prior checkpoint's redo ptr for
+	 * UpdateCheckPointDistanceEstimate()
 	 */
 	PriorRedoPtr = ControlFile->checkPointCopy.redo;
 
@@ -9194,7 +9217,6 @@ CreateRestartPoint(int flags)
 	if (ControlFile->state == DB_IN_ARCHIVE_RECOVERY &&
 		ControlFile->checkPointCopy.redo < lastCheckPoint.redo)
 	{
-		ControlFile->prevCheckPoint = ControlFile->checkPoint;
 		ControlFile->checkPoint = lastCheckPointRecPtr;
 		ControlFile->checkPointCopy = lastCheckPoint;
 		ControlFile->time = (pg_time_t) time(NULL);
@@ -9241,7 +9263,7 @@ CreateRestartPoint(int flags)
 		/* Update the average distance between checkpoints/restartpoints. */
 		UpdateCheckPointDistanceEstimate(RedoRecPtr - PriorRedoPtr);
 
-		XLByteToSeg(PriorRedoPtr, _logSegNo);
+		XLByteToSeg(PriorRedoPtr, _logSegNo, wal_segment_size);
 
 		/*
 		 * Get the current end of xlog replayed or received, whichever is
@@ -9336,7 +9358,7 @@ KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo)
 	XLogSegNo	segno;
 	XLogRecPtr	keep;
 
-	XLByteToSeg(recptr, segno);
+	XLByteToSeg(recptr, segno, wal_segment_size);
 	keep = XLogGetReplicationSlotMinimumLSN();
 
 	/* compute limit for wal_keep_segments first */
@@ -9354,7 +9376,7 @@ KeepLogSeg(XLogRecPtr recptr, XLogSegNo *logSegNo)
 	{
 		XLogSegNo	slotSegNo;
 
-		XLByteToSeg(keep, slotSegNo);
+		XLByteToSeg(keep, slotSegNo, wal_segment_size);
 
 		if (slotSegNo <= 0)
 			segno = 1;
@@ -10137,7 +10159,7 @@ XLogFileNameP(TimeLineID tli, XLogSegNo segno)
 {
 	char	   *result = palloc(MAXFNAMELEN);
 
-	XLogFileName(result, tli, segno);
+	XLogFileName(result, tli, segno, wal_segment_size);
 	return result;
 }
 
@@ -10181,7 +10203,7 @@ XLogFileNameP(TimeLineID tli, XLogSegNo segno)
  */
 XLogRecPtr
 do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
-				   StringInfo labelfile, DIR *tblspcdir, List **tablespaces,
+				   StringInfo labelfile, List **tablespaces,
 				   StringInfo tblspcmapfile, bool infotbssize,
 				   bool needtblspcmapfile)
 {
@@ -10272,6 +10294,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 	PG_ENSURE_ERROR_CLEANUP(pg_start_backup_callback, (Datum) BoolGetDatum(exclusive));
 	{
 		bool		gotUniqueStartpoint = false;
+		DIR		   *tblspcdir;
 		struct dirent *de;
 		tablespaceinfo *ti;
 		int			datadirpathlen;
@@ -10391,8 +10414,8 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 			WALInsertLockRelease();
 		} while (!gotUniqueStartpoint);
 
-		XLByteToSeg(startpoint, _logSegNo);
-		XLogFileName(xlogfilename, starttli, _logSegNo);
+		XLByteToSeg(startpoint, _logSegNo, wal_segment_size);
+		XLogFileName(xlogfilename, starttli, _logSegNo, wal_segment_size);
 
 		/*
 		 * Construct tablespace_map file
@@ -10403,6 +10426,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 		datadirpathlen = strlen(DataDir);
 
 		/* Collect information about all tablespaces */
+		tblspcdir = AllocateDir("pg_tblspc");
 		while ((de = ReadDir(tblspcdir, "pg_tblspc")) != NULL)
 		{
 			char		fullpath[MAXPGPATH + 10];
@@ -10451,7 +10475,6 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 				appendStringInfoChar(&buflinkpath, *s++);
 			}
 
-
 			/*
 			 * Relpath holds the relative path of the tablespace directory
 			 * when it's located within PGDATA, or NULL if it's located
@@ -10486,6 +10509,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 					 errmsg("tablespaces are not supported on this platform")));
 #endif
 		}
+		FreeDir(tblspcdir);
 
 		/*
 		 * Construct backup label file
@@ -10508,6 +10532,7 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 						 backup_started_in_recovery ? "standby" : "master");
 		appendStringInfo(labelfile, "START TIME: %s\n", strfbuf);
 		appendStringInfo(labelfile, "LABEL: %s\n", backupidstr);
+		appendStringInfo(labelfile, "START TIMELINE: %u\n", starttli);
 
 		/*
 		 * Okay, write the file, or return its contents to caller.
@@ -10601,13 +10626,20 @@ do_pg_start_backup(const char *backupidstr, bool fast, TimeLineID *starttli_p,
 	/*
 	 * Mark that start phase has correctly finished for an exclusive backup.
 	 * Session-level locks are updated as well to reflect that state.
+	 *
+	 * Note that CHECK_FOR_INTERRUPTS() must not occur while updating
+	 * backup counters and session-level lock. Otherwise they can be
+	 * updated inconsistently, and which might cause do_pg_abort_backup()
+	 * to fail.
 	 */
 	if (exclusive)
 	{
 		WALInsertLockAcquireExclusive();
 		XLogCtl->Insert.exclusiveBackupState = EXCLUSIVE_BACKUP_IN_PROGRESS;
-		WALInsertLockRelease();
+
+		/* Set session-level lock */
 		sessionBackupState = SESSION_BACKUP_EXCLUSIVE;
+		WALInsertLockRelease();
 	}
 	else
 		sessionBackupState = SESSION_BACKUP_NON_EXCLUSIVE;
@@ -10811,7 +10843,11 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 	}
 
 	/*
-	 * OK to update backup counters and forcePageWrites
+	 * OK to update backup counters, forcePageWrites and session-level lock.
+	 *
+	 * Note that CHECK_FOR_INTERRUPTS() must not occur while updating them.
+	 * Otherwise they can be updated inconsistently, and which might cause
+	 * do_pg_abort_backup() to fail.
 	 */
 	WALInsertLockAcquireExclusive();
 	if (exclusive)
@@ -10835,11 +10871,20 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 	{
 		XLogCtl->Insert.forcePageWrites = false;
 	}
-	WALInsertLockRelease();
 
-	/* Clean up session-level lock */
+	/*
+	 * Clean up session-level lock.
+	 *
+	 * You might think that WALInsertLockRelease() can be called
+	 * before cleaning up session-level lock because session-level
+	 * lock doesn't need to be protected with WAL insertion lock.
+	 * But since CHECK_FOR_INTERRUPTS() can occur in it,
+	 * session-level lock must be cleaned up before it.
+	 */
 	sessionBackupState = SESSION_BACKUP_NONE;
 
+	WALInsertLockRelease();
+
 	/*
 	 * Read and parse the START WAL LOCATION line (this code is pretty crude,
 	 * but we are not expecting any variability in the file format).
@@ -10943,8 +10988,8 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 		 */
 		RequestXLogSwitch(false);
 
-		XLByteToPrevSeg(stoppoint, _logSegNo);
-		XLogFileName(stopxlogfilename, stoptli, _logSegNo);
+		XLByteToPrevSeg(stoppoint, _logSegNo, wal_segment_size);
+		XLogFileName(stopxlogfilename, stoptli, _logSegNo, wal_segment_size);
 
 		/* Use the log timezone here, not the session timezone */
 		stamp_time = (pg_time_t) time(NULL);
@@ -10955,9 +11000,9 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 		/*
 		 * Write the backup history file
 		 */
-		XLByteToSeg(startpoint, _logSegNo);
+		XLByteToSeg(startpoint, _logSegNo, wal_segment_size);
 		BackupHistoryFilePath(histfilepath, stoptli, _logSegNo,
-							  (uint32) (startpoint % XLogSegSize));
+							  startpoint, wal_segment_size);
 		fp = AllocateFile(histfilepath, "w");
 		if (!fp)
 			ereport(ERROR,
@@ -10968,9 +11013,13 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 				(uint32) (startpoint >> 32), (uint32) startpoint, startxlogfilename);
 		fprintf(fp, "STOP WAL LOCATION: %X/%X (file %s)\n",
 				(uint32) (stoppoint >> 32), (uint32) stoppoint, stopxlogfilename);
-		/* transfer remaining lines from label to history file */
+		/*
+		 * Transfer remaining lines including label and start timeline to
+		 * history file.
+		 */
 		fprintf(fp, "%s", remaining);
 		fprintf(fp, "STOP TIME: %s\n", strfbuf);
+		fprintf(fp, "STOP TIMELINE: %u\n", stoptli);
 		if (fflush(fp) || ferror(fp) || FreeFile(fp))
 			ereport(ERROR,
 					(errcode_for_file_access(),
@@ -11011,12 +11060,12 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 		((!backup_started_in_recovery && XLogArchivingActive()) ||
 		 (backup_started_in_recovery && XLogArchivingAlways())))
 	{
-		XLByteToPrevSeg(stoppoint, _logSegNo);
-		XLogFileName(lastxlogfilename, stoptli, _logSegNo);
+		XLByteToPrevSeg(stoppoint, _logSegNo, wal_segment_size);
+		XLogFileName(lastxlogfilename, stoptli, _logSegNo, wal_segment_size);
 
-		XLByteToSeg(startpoint, _logSegNo);
+		XLByteToSeg(startpoint, _logSegNo, wal_segment_size);
 		BackupHistoryFileName(histfilename, stoptli, _logSegNo,
-							  (uint32) (startpoint % XLogSegSize));
+							  startpoint, wal_segment_size);
 
 		seconds_before_warning = 60;
 		waits = 0;
@@ -11077,8 +11126,16 @@ do_pg_stop_backup(char *labelfile, bool waitforarchive, TimeLineID *stoptli_p)
 void
 do_pg_abort_backup(void)
 {
+	/*
+	 * Quick exit if session is not keeping around a non-exclusive backup
+	 * already started.
+	 */
+	if (sessionBackupState == SESSION_BACKUP_NONE)
+		return;
+
 	WALInsertLockAcquireExclusive();
 	Assert(XLogCtl->Insert.nonExclusiveBackups > 0);
+	Assert(sessionBackupState == SESSION_BACKUP_NON_EXCLUSIVE);
 	XLogCtl->Insert.nonExclusiveBackups--;
 
 	if (XLogCtl->Insert.exclusiveBackupState == EXCLUSIVE_BACKUP_NONE &&
@@ -11162,22 +11219,24 @@ GetOldestRestartPoint(XLogRecPtr *oldrecptr, TimeLineID *oldtli)
  * later than the start of the dump, and so if we rely on it as the start
  * point, we will fail to restore a consistent database state.
  *
- * Returns TRUE if a backup_label was found (and fills the checkpoint
+ * Returns true if a backup_label was found (and fills the checkpoint
  * location and its REDO location into *checkPointLoc and RedoStartLSN,
- * respectively); returns FALSE if not. If this backup_label came from a
- * streamed backup, *backupEndRequired is set to TRUE. If this backup_label
- * was created during recovery, *backupFromStandby is set to TRUE.
+ * respectively); returns false if not. If this backup_label came from a
+ * streamed backup, *backupEndRequired is set to true. If this backup_label
+ * was created during recovery, *backupFromStandby is set to true.
  */
 static bool
 read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
 				  bool *backupFromStandby)
 {
 	char		startxlogfilename[MAXFNAMELEN];
-	TimeLineID	tli;
+	TimeLineID	tli_from_walseg, tli_from_file;
 	FILE	   *lfp;
 	char		ch;
 	char		backuptype[20];
 	char		backupfrom[20];
+	char		backuplabel[MAXPGPATH];
+	char		backuptime[128];
 	uint32		hi,
 				lo;
 
@@ -11204,7 +11263,7 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
 	 * format).
 	 */
 	if (fscanf(lfp, "START WAL LOCATION: %X/%X (file %08X%16s)%c",
-			   &hi, &lo, &tli, startxlogfilename, &ch) != 5 || ch != '\n')
+			   &hi, &lo, &tli_from_walseg, startxlogfilename, &ch) != 5 || ch != '\n')
 		ereport(FATAL,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE)));
@@ -11233,6 +11292,43 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
 			*backupFromStandby = true;
 	}
 
+	/*
+	 * Parse START TIME and LABEL. Those are not mandatory fields for
+	 * recovery but checking for their presence is useful for debugging
+	 * and the next sanity checks. Cope also with the fact that the
+	 * result buffers have a pre-allocated size, hence if the backup_label
+	 * file has been generated with strings longer than the maximum assumed
+	 * here an incorrect parsing happens. That's fine as only minor
+	 * consistency checks are done afterwards.
+	 */
+	if (fscanf(lfp, "START TIME: %127[^\n]\n", backuptime) == 1)
+		ereport(DEBUG1,
+				(errmsg("backup time %s in file \"%s\"",
+						backuptime, BACKUP_LABEL_FILE)));
+
+	if (fscanf(lfp, "LABEL: %1023[^\n]\n", backuplabel) == 1)
+		ereport(DEBUG1,
+				(errmsg("backup label %s in file \"%s\"",
+						backuplabel, BACKUP_LABEL_FILE)));
+
+	/*
+	 * START TIMELINE is new as of 11. Its parsing is not mandatory, still
+	 * use it as a sanity check if present.
+	 */
+	if (fscanf(lfp, "START TIMELINE: %u\n", &tli_from_file) == 1)
+	{
+		if (tli_from_walseg != tli_from_file)
+			ereport(FATAL,
+					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					 errmsg("invalid data in file \"%s\"", BACKUP_LABEL_FILE),
+					 errdetail("Timeline ID parsed is %u, but expected %u",
+							   tli_from_file, tli_from_walseg)));
+
+		ereport(DEBUG1,
+				(errmsg("backup timeline %u in file \"%s\"",
+						tli_from_file, BACKUP_LABEL_FILE)));
+	}
+
 	if (ferror(lfp) || FreeFile(lfp))
 		ereport(FATAL,
 				(errcode_for_file_access(),
@@ -11249,8 +11345,8 @@ read_backup_label(XLogRecPtr *checkPointLoc, bool *backupEndRequired,
  * recovering from a backup dump file, and we therefore need to create symlinks
  * as per the information present in tablespace_map file.
  *
- * Returns TRUE if a tablespace_map file was found (and fills the link
- * information for all the tablespace links present in file); returns FALSE
+ * Returns true if a tablespace_map file was found (and fills the link
+ * information for all the tablespace links present in file); returns false
  * if not.
  */
 static bool
@@ -11459,14 +11555,15 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 	uint32		targetPageOff;
 	XLogSegNo	targetSegNo PG_USED_FOR_ASSERTS_ONLY;
 
-	XLByteToSeg(targetPagePtr, targetSegNo);
-	targetPageOff = targetPagePtr % XLogSegSize;
+	XLByteToSeg(targetPagePtr, targetSegNo, wal_segment_size);
+	targetPageOff = XLogSegmentOffset(targetPagePtr, wal_segment_size);
 
 	/*
 	 * See if we need to switch to a new segment because the requested record
 	 * is not in the currently open one.
 	 */
-	if (readFile >= 0 && !XLByteInSeg(targetPagePtr, readSegNo))
+	if (readFile >= 0 &&
+		!XLByteInSeg(targetPagePtr, readSegNo, wal_segment_size))
 	{
 		/*
 		 * Request a restartpoint if we've replayed too much xlog since the
@@ -11487,7 +11584,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 		readSource = 0;
 	}
 
-	XLByteToSeg(targetPagePtr, readSegNo);
+	XLByteToSeg(targetPagePtr, readSegNo, wal_segment_size);
 
 retry:
 	/* See if we need to retrieve more data */
@@ -11527,7 +11624,8 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 		if (((targetPagePtr) / XLOG_BLCKSZ) != (receivedUpto / XLOG_BLCKSZ))
 			readLen = XLOG_BLCKSZ;
 		else
-			readLen = receivedUpto % XLogSegSize - targetPageOff;
+			readLen = XLogSegmentOffset(receivedUpto, wal_segment_size) -
+				targetPageOff;
 	}
 	else
 		readLen = XLOG_BLCKSZ;
@@ -11538,7 +11636,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 	{
 		char		fname[MAXFNAMELEN];
 
-		XLogFileName(fname, curFileTLI, readSegNo);
+		XLogFileName(fname, curFileTLI, readSegNo, wal_segment_size);
 		ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen),
 				(errcode_for_file_access(),
 				 errmsg("could not seek in log segment %s to offset %u: %m",
@@ -11552,7 +11650,7 @@ XLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr, int reqLen,
 		char		fname[MAXFNAMELEN];
 
 		pgstat_report_wait_end();
-		XLogFileName(fname, curFileTLI, readSegNo);
+		XLogFileName(fname, curFileTLI, readSegNo, wal_segment_size);
 		ereport(emode_for_corrupt_record(emode, targetPagePtr + reqLen),
 				(errcode_for_file_access(),
 				 errmsg("could not read from log segment %s, offset %u: %m",
@@ -11682,7 +11780,7 @@ WaitForWALToBecomeAvailable(XLogRecPtr RecPtr, bool randAccess,
 					 * If primary_conninfo is set, launch walreceiver to try
 					 * to stream the missing WAL.
 					 *
-					 * If fetching_ckpt is TRUE, RecPtr points to the initial
+					 * If fetching_ckpt is true, RecPtr points to the initial
 					 * checkpoint location. In that case, we use RedoStartLSN
 					 * as the streaming start position instead of RecPtr, so
 					 * that when we later jump backwards to start redo at
diff --git a/src/backend/access/transam/xlogarchive.c b/src/backend/access/transam/xlogarchive.c
index 7afb73579b..5c6de4989c 100644
--- a/src/backend/access/transam/xlogarchive.c
+++ b/src/backend/access/transam/xlogarchive.c
@@ -4,7 +4,7 @@
  *		Functions for archiving WAL files and restoring from the archive.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/xlogarchive.c
@@ -33,11 +33,11 @@
  * Attempt to retrieve the specified file from off-line archival storage.
  * If successful, fill "path" with its complete path (note that this will be
  * a temp file name that doesn't follow the normal naming convention), and
- * return TRUE.
+ * return true.
  *
  * If not successful, fill "path" with the name of the normal on-line file
  * (which may or may not actually exist, but we'll try to use it), and return
- * FALSE.
+ * false.
  *
  * For fixed-size files, the caller may pass the expected size as an
  * additional crosscheck on successful recovery.  If the file size is not
@@ -134,13 +134,14 @@ RestoreArchivedFile(char *path, const char *xlogfname,
 	if (cleanupEnabled)
 	{
 		GetOldestRestartPoint(&restartRedoPtr, &restartTli);
-		XLByteToSeg(restartRedoPtr, restartSegNo);
-		XLogFileName(lastRestartPointFname, restartTli, restartSegNo);
+		XLByteToSeg(restartRedoPtr, restartSegNo, wal_segment_size);
+		XLogFileName(lastRestartPointFname, restartTli, restartSegNo,
+					 wal_segment_size);
 		/* we shouldn't need anything earlier than last restart point */
 		Assert(strcmp(lastRestartPointFname, xlogfname) <= 0);
 	}
 	else
-		XLogFileName(lastRestartPointFname, 0, 0L);
+		XLogFileName(lastRestartPointFname, 0, 0L, wal_segment_size);
 
 	/*
 	 * construct the command to be executed
@@ -326,7 +327,7 @@ RestoreArchivedFile(char *path, const char *xlogfname,
  * This is currently used for recovery_end_command and archive_cleanup_command.
  */
 void
-ExecuteRecoveryCommand(char *command, char *commandName, bool failOnSignal)
+ExecuteRecoveryCommand(const char *command, const char *commandName, bool failOnSignal)
 {
 	char		xlogRecoveryCmd[MAXPGPATH];
 	char		lastRestartPointFname[MAXPGPATH];
@@ -347,8 +348,9 @@ ExecuteRecoveryCommand(char *command, char *commandName, bool failOnSignal)
 	 * archive, though there is no requirement to do so.
 	 */
 	GetOldestRestartPoint(&restartRedoPtr, &restartTli);
-	XLByteToSeg(restartRedoPtr, restartSegNo);
-	XLogFileName(lastRestartPointFname, restartTli, restartSegNo);
+	XLByteToSeg(restartRedoPtr, restartSegNo, wal_segment_size);
+	XLogFileName(lastRestartPointFname, restartTli, restartSegNo,
+				 wal_segment_size);
 
 	/*
 	 * construct the command to be executed
@@ -423,7 +425,7 @@ ExecuteRecoveryCommand(char *command, char *commandName, bool failOnSignal)
  * in pg_wal (xlogfname), replacing any existing file with the same name.
  */
 void
-KeepFileRestoredFromArchive(char *path, char *xlogfname)
+KeepFileRestoredFromArchive(const char *path, const char *xlogfname)
 {
 	char		xlogfpath[MAXPGPATH];
 	bool		reload = false;
@@ -547,7 +549,7 @@ XLogArchiveNotifySeg(XLogSegNo segno)
 {
 	char		xlog[MAXFNAMELEN];
 
-	XLogFileName(xlog, ThisTimeLineID, segno);
+	XLogFileName(xlog, ThisTimeLineID, segno, wal_segment_size);
 	XLogArchiveNotify(xlog);
 }
 
diff --git a/src/backend/access/transam/xlogfuncs.c b/src/backend/access/transam/xlogfuncs.c
index f9b49ba498..316edbe3c5 100644
--- a/src/backend/access/transam/xlogfuncs.c
+++ b/src/backend/access/transam/xlogfuncs.c
@@ -7,7 +7,7 @@
  * This file contains WAL control and information functions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/xlogfuncs.c
@@ -75,7 +75,6 @@ pg_start_backup(PG_FUNCTION_ARGS)
 	bool		exclusive = PG_GETARG_BOOL(2);
 	char	   *backupidstr;
 	XLogRecPtr	startpoint;
-	DIR		   *dir;
 	SessionBackupState status = get_backup_status();
 
 	backupidstr = text_to_cstring(backupid);
@@ -85,16 +84,10 @@ pg_start_backup(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("a backup is already in progress in this session")));
 
-	/* Make sure we can open the directory with tablespaces in it */
-	dir = AllocateDir("pg_tblspc");
-	if (!dir)
-		ereport(ERROR,
-				(errmsg("could not open directory \"%s\": %m", "pg_tblspc")));
-
 	if (exclusive)
 	{
 		startpoint = do_pg_start_backup(backupidstr, fast, NULL, NULL,
-										dir, NULL, NULL, false, true);
+										NULL, NULL, false, true);
 	}
 	else
 	{
@@ -110,13 +103,11 @@ pg_start_backup(PG_FUNCTION_ARGS)
 		MemoryContextSwitchTo(oldcontext);
 
 		startpoint = do_pg_start_backup(backupidstr, fast, NULL, label_file,
-										dir, NULL, tblspc_map_file, false, true);
+										NULL, tblspc_map_file, false, true);
 
 		before_shmem_exit(nonexclusive_base_backup_cleanup, (Datum) 0);
 	}
 
-	FreeDir(dir);
-
 	PG_RETURN_LSN(startpoint);
 }
 
@@ -489,8 +480,8 @@ pg_walfile_name_offset(PG_FUNCTION_ARGS)
 	/*
 	 * xlogfilename
 	 */
-	XLByteToPrevSeg(locationpoint, xlogsegno);
-	XLogFileName(xlogfilename, ThisTimeLineID, xlogsegno);
+	XLByteToPrevSeg(locationpoint, xlogsegno, wal_segment_size);
+	XLogFileName(xlogfilename, ThisTimeLineID, xlogsegno, wal_segment_size);
 
 	values[0] = CStringGetTextDatum(xlogfilename);
 	isnull[0] = false;
@@ -498,7 +489,7 @@ pg_walfile_name_offset(PG_FUNCTION_ARGS)
 	/*
 	 * offset
 	 */
-	xrecoff = locationpoint % XLogSegSize;
+	xrecoff = XLogSegmentOffset(locationpoint, wal_segment_size);
 
 	values[1] = UInt32GetDatum(xrecoff);
 	isnull[1] = false;
@@ -530,8 +521,8 @@ pg_walfile_name(PG_FUNCTION_ARGS)
 				 errmsg("recovery is in progress"),
 				 errhint("pg_walfile_name() cannot be executed during recovery.")));
 
-	XLByteToPrevSeg(locationpoint, xlogsegno);
-	XLogFileName(xlogfilename, ThisTimeLineID, xlogsegno);
+	XLByteToPrevSeg(locationpoint, xlogsegno, wal_segment_size);
+	XLogFileName(xlogfilename, ThisTimeLineID, xlogsegno, wal_segment_size);
 
 	PG_RETURN_TEXT_P(cstring_to_text(xlogfilename));
 }
diff --git a/src/backend/access/transam/xloginsert.c b/src/backend/access/transam/xloginsert.c
index 3af03ecdb1..5bea073a2b 100644
--- a/src/backend/access/transam/xloginsert.c
+++ b/src/backend/access/transam/xloginsert.c
@@ -9,7 +9,7 @@
  * of XLogRecData structs by a call to XLogRecordAssemble(). See
  * access/transam/README for details.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/xloginsert.c
@@ -584,7 +584,7 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
 		if (include_image)
 		{
 			Page		page = regbuf->page;
-			uint16		compressed_len;
+			uint16		compressed_len = 0;
 
 			/*
 			 * The page needs to be backed up, so calculate its hole length
@@ -797,8 +797,8 @@ XLogRecordAssemble(RmgrId rmid, uint8 info,
 /*
  * Create a compressed version of a backup block image.
  *
- * Returns FALSE if compression fails (i.e., compressed result is actually
- * bigger than original). Otherwise, returns TRUE and sets 'dlen' to
+ * Returns false if compression fails (i.e., compressed result is actually
+ * bigger than original). Otherwise, returns true and sets 'dlen' to
  * the length of compressed block image.
  */
 static bool
@@ -965,7 +965,7 @@ XLogSaveBufferForHint(Buffer buffer, bool buffer_std)
  * log_newpage_buffer instead.
  *
  * If the page follows the standard page layout, with a PageHeader and unused
- * space between pd_lower and pd_upper, set 'page_std' to TRUE. That allows
+ * space between pd_lower and pd_upper, set 'page_std' to true. That allows
  * the unused space to be left out from the WAL record, making it smaller.
  */
 XLogRecPtr
@@ -1002,7 +1002,7 @@ log_newpage(RelFileNode *rnode, ForkNumber forkNum, BlockNumber blkno,
  * function.  This function will set the page LSN.
  *
  * If the page follows the standard page layout, with a PageHeader and unused
- * space between pd_lower and pd_upper, set 'page_std' to TRUE. That allows
+ * space between pd_lower and pd_upper, set 'page_std' to true. That allows
  * the unused space to be left out from the WAL record, making it smaller.
  */
 XLogRecPtr
diff --git a/src/backend/access/transam/xlogreader.c b/src/backend/access/transam/xlogreader.c
index 0781a7b9de..3a86f3497e 100644
--- a/src/backend/access/transam/xlogreader.c
+++ b/src/backend/access/transam/xlogreader.c
@@ -3,7 +3,7 @@
  * xlogreader.c
  *		Generic XLog reading facility
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/backend/access/transam/xlogreader.c
@@ -64,7 +64,8 @@ report_invalid_record(XLogReaderState *state, const char *fmt,...)
  * Returns NULL if the xlogreader couldn't be allocated.
  */
 XLogReaderState *
-XLogReaderAllocate(XLogPageReadCB pagereadfunc, void *private_data)
+XLogReaderAllocate(int wal_segment_size, XLogPageReadCB pagereadfunc,
+				   void *private_data)
 {
 	XLogReaderState *state;
 
@@ -91,6 +92,7 @@ XLogReaderAllocate(XLogPageReadCB pagereadfunc, void *private_data)
 		return NULL;
 	}
 
+	state->wal_segment_size = wal_segment_size;
 	state->read_page = pagereadfunc;
 	/* system_identifier initialized to zeroes above */
 	state->private_data = private_data;
@@ -466,8 +468,8 @@ XLogReadRecord(XLogReaderState *state, XLogRecPtr RecPtr, char **errormsg)
 		(record->xl_info & ~XLR_INFO_MASK) == XLOG_SWITCH)
 	{
 		/* Pretend it extends to end of segment */
-		state->EndRecPtr += XLogSegSize - 1;
-		state->EndRecPtr -= state->EndRecPtr % XLogSegSize;
+		state->EndRecPtr += state->wal_segment_size - 1;
+		state->EndRecPtr -= XLogSegmentOffset(state->EndRecPtr, state->wal_segment_size);
 	}
 
 	if (DecodeXLogRecord(state, record, errormsg))
@@ -509,8 +511,8 @@ ReadPageInternal(XLogReaderState *state, XLogRecPtr pageptr, int reqLen)
 
 	Assert((pageptr % XLOG_BLCKSZ) == 0);
 
-	XLByteToSeg(pageptr, targetSegNo);
-	targetPageOff = (pageptr % XLogSegSize);
+	XLByteToSeg(pageptr, targetSegNo, state->wal_segment_size);
+	targetPageOff = XLogSegmentOffset(pageptr, state->wal_segment_size);
 
 	/* check whether we have all the requested data already */
 	if (targetSegNo == state->readSegNo && targetPageOff == state->readOff &&
@@ -719,16 +721,16 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 
 	Assert((recptr % XLOG_BLCKSZ) == 0);
 
-	XLByteToSeg(recptr, segno);
-	offset = recptr % XLogSegSize;
+	XLByteToSeg(recptr, segno, state->wal_segment_size);
+	offset = XLogSegmentOffset(recptr, state->wal_segment_size);
 
-	XLogSegNoOffsetToRecPtr(segno, offset, recaddr);
+	XLogSegNoOffsetToRecPtr(segno, offset, recaddr, state->wal_segment_size);
 
 	if (hdr->xlp_magic != XLOG_PAGE_MAGIC)
 	{
 		char		fname[MAXFNAMELEN];
 
-		XLogFileName(fname, state->readPageTLI, segno);
+		XLogFileName(fname, state->readPageTLI, segno, state->wal_segment_size);
 
 		report_invalid_record(state,
 							  "invalid magic number %04X in log segment %s, offset %u",
@@ -742,7 +744,7 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 	{
 		char		fname[MAXFNAMELEN];
 
-		XLogFileName(fname, state->readPageTLI, segno);
+		XLogFileName(fname, state->readPageTLI, segno, state->wal_segment_size);
 
 		report_invalid_record(state,
 							  "invalid info bits %04X in log segment %s, offset %u",
@@ -775,10 +777,10 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 								  fhdrident_str, sysident_str);
 			return false;
 		}
-		else if (longhdr->xlp_seg_size != XLogSegSize)
+		else if (longhdr->xlp_seg_size != state->wal_segment_size)
 		{
 			report_invalid_record(state,
-								  "WAL file is from different database system: incorrect XLOG_SEG_SIZE in page header");
+								  "WAL file is from different database system: incorrect segment size in page header");
 			return false;
 		}
 		else if (longhdr->xlp_xlog_blcksz != XLOG_BLCKSZ)
@@ -792,7 +794,7 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 	{
 		char		fname[MAXFNAMELEN];
 
-		XLogFileName(fname, state->readPageTLI, segno);
+		XLogFileName(fname, state->readPageTLI, segno, state->wal_segment_size);
 
 		/* hmm, first page of file doesn't have a long header? */
 		report_invalid_record(state,
@@ -807,7 +809,7 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 	{
 		char		fname[MAXFNAMELEN];
 
-		XLogFileName(fname, state->readPageTLI, segno);
+		XLogFileName(fname, state->readPageTLI, segno, state->wal_segment_size);
 
 		report_invalid_record(state,
 							  "unexpected pageaddr %X/%X in log segment %s, offset %u",
@@ -832,7 +834,7 @@ ValidXLogPageHeader(XLogReaderState *state, XLogRecPtr recptr,
 		{
 			char		fname[MAXFNAMELEN];
 
-			XLogFileName(fname, state->readPageTLI, segno);
+			XLogFileName(fname, state->readPageTLI, segno, state->wal_segment_size);
 
 			report_invalid_record(state,
 								  "out-of-sequence timeline ID %u (after %u) in log segment %s, offset %u",
@@ -1262,7 +1264,13 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
 			{
 				if (blk->data)
 					pfree(blk->data);
-				blk->data_bufsz = blk->data_len;
+
+				/*
+				 * Force the initial request to be BLCKSZ so that we don't
+				 * waste time with lots of trips through this stanza as a
+				 * result of WAL compression.
+				 */
+				blk->data_bufsz = MAXALIGN(Max(blk->data_len, BLCKSZ));
 				blk->data = palloc(blk->data_bufsz);
 			}
 			memcpy(blk->data, ptr, blk->data_len);
@@ -1277,7 +1285,22 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
 		{
 			if (state->main_data)
 				pfree(state->main_data);
-			state->main_data_bufsz = state->main_data_len;
+
+			/*
+			 * main_data_bufsz must be MAXALIGN'ed.  In many xlog record
+			 * types, we omit trailing struct padding on-disk to save a few
+			 * bytes; but compilers may generate accesses to the xlog struct
+			 * that assume that padding bytes are present.  If the palloc
+			 * request is not large enough to include such padding bytes then
+			 * we'll get valgrind complaints due to otherwise-harmless fetches
+			 * of the padding bytes.
+			 *
+			 * In addition, force the initial request to be reasonably large
+			 * so that we don't waste time with lots of trips through this
+			 * stanza.  BLCKSZ / 2 seems like a good compromise choice.
+			 */
+			state->main_data_bufsz = MAXALIGN(Max(state->main_data_len,
+												  BLCKSZ / 2));
 			state->main_data = palloc(state->main_data_bufsz);
 		}
 		memcpy(state->main_data, ptr, state->main_data_len);
@@ -1300,8 +1323,8 @@ DecodeXLogRecord(XLogReaderState *state, XLogRecord *record, char **errormsg)
  * Returns information about the block that a block reference refers to.
  *
  * If the WAL record contains a block reference with the given ID, *rnode,
- * *forknum, and *blknum are filled in (if not NULL), and returns TRUE.
- * Otherwise returns FALSE.
+ * *forknum, and *blknum are filled in (if not NULL), and returns true.
+ * Otherwise returns false.
  */
 bool
 XLogRecGetBlockTag(XLogReaderState *record, uint8 block_id,
diff --git a/src/backend/access/transam/xlogutils.c b/src/backend/access/transam/xlogutils.c
index bbae733d65..89da25c207 100644
--- a/src/backend/access/transam/xlogutils.c
+++ b/src/backend/access/transam/xlogutils.c
@@ -8,7 +8,7 @@
  * None of this code is used during normal system operation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/access/transam/xlogutils.c
@@ -654,7 +654,8 @@ XLogTruncateRelation(RelFileNode rnode, ForkNumber forkNum,
  * frontend).  Probably these should be merged at some point.
  */
 static void
-XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
+XLogRead(char *buf, int segsize, TimeLineID tli, XLogRecPtr startptr,
+		 Size count)
 {
 	char	   *p;
 	XLogRecPtr	recptr;
@@ -666,6 +667,8 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 	static TimeLineID sendTLI = 0;
 	static uint32 sendOff = 0;
 
+	Assert(segsize == wal_segment_size);
+
 	p = buf;
 	recptr = startptr;
 	nbytes = count;
@@ -676,10 +679,10 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 		int			segbytes;
 		int			readbytes;
 
-		startoff = recptr % XLogSegSize;
+		startoff = XLogSegmentOffset(recptr, segsize);
 
 		/* Do we need to switch to a different xlog segment? */
-		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo) ||
+		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo, segsize) ||
 			sendTLI != tli)
 		{
 			char		path[MAXPGPATH];
@@ -687,11 +690,11 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 			if (sendFile >= 0)
 				close(sendFile);
 
-			XLByteToSeg(recptr, sendSegNo);
+			XLByteToSeg(recptr, sendSegNo, segsize);
 
-			XLogFilePath(path, tli, sendSegNo);
+			XLogFilePath(path, tli, sendSegNo, segsize);
 
-			sendFile = BasicOpenFile(path, O_RDONLY | PG_BINARY, 0);
+			sendFile = BasicOpenFile(path, O_RDONLY | PG_BINARY);
 
 			if (sendFile < 0)
 			{
@@ -717,7 +720,7 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 			{
 				char		path[MAXPGPATH];
 
-				XLogFilePath(path, tli, sendSegNo);
+				XLogFilePath(path, tli, sendSegNo, segsize);
 
 				ereport(ERROR,
 						(errcode_for_file_access(),
@@ -728,8 +731,8 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 		}
 
 		/* How many bytes are within this segment? */
-		if (nbytes > (XLogSegSize - startoff))
-			segbytes = XLogSegSize - startoff;
+		if (nbytes > (segsize - startoff))
+			segbytes = segsize - startoff;
 		else
 			segbytes = nbytes;
 
@@ -740,7 +743,7 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 		{
 			char		path[MAXPGPATH];
 
-			XLogFilePath(path, tli, sendSegNo);
+			XLogFilePath(path, tli, sendSegNo, segsize);
 
 			ereport(ERROR,
 					(errcode_for_file_access(),
@@ -798,7 +801,8 @@ XLogRead(char *buf, TimeLineID tli, XLogRecPtr startptr, Size count)
 void
 XLogReadDetermineTimeline(XLogReaderState *state, XLogRecPtr wantPage, uint32 wantLength)
 {
-	const XLogRecPtr lastReadPage = state->readSegNo * XLogSegSize + state->readOff;
+	const XLogRecPtr lastReadPage = state->readSegNo *
+	state->wal_segment_size + state->readOff;
 
 	Assert(wantPage != InvalidXLogRecPtr && wantPage % XLOG_BLCKSZ == 0);
 	Assert(wantLength <= XLOG_BLCKSZ);
@@ -842,7 +846,8 @@ XLogReadDetermineTimeline(XLogReaderState *state, XLogRecPtr wantPage, uint32 wa
 	if (state->currTLIValidUntil != InvalidXLogRecPtr &&
 		state->currTLI != ThisTimeLineID &&
 		state->currTLI != 0 &&
-		(wantPage + wantLength) / XLogSegSize < state->currTLIValidUntil / XLogSegSize)
+		((wantPage + wantLength) / state->wal_segment_size) <
+		(state->currTLIValidUntil / state->wal_segment_size))
 		return;
 
 	/*
@@ -864,9 +869,11 @@ XLogReadDetermineTimeline(XLogReaderState *state, XLogRecPtr wantPage, uint32 wa
 		 */
 		List	   *timelineHistory = readTimeLineHistory(ThisTimeLineID);
 
-		XLogRecPtr	endOfSegment = (((wantPage / XLogSegSize) + 1) * XLogSegSize) - 1;
+		XLogRecPtr	endOfSegment = (((wantPage / state->wal_segment_size) + 1)
+									* state->wal_segment_size) - 1;
 
-		Assert(wantPage / XLogSegSize == endOfSegment / XLogSegSize);
+		Assert(wantPage / state->wal_segment_size ==
+			   endOfSegment / state->wal_segment_size);
 
 		/*
 		 * Find the timeline of the last LSN on the segment containing
@@ -1014,7 +1021,8 @@ read_local_xlog_page(XLogReaderState *state, XLogRecPtr targetPagePtr,
 	 * as 'count', read the whole page anyway. It's guaranteed to be
 	 * zero-padded up to the page boundary if it's incomplete.
 	 */
-	XLogRead(cur_page, *pageTLI, targetPagePtr, XLOG_BLCKSZ);
+	XLogRead(cur_page, state->wal_segment_size, *pageTLI, targetPagePtr,
+			 XLOG_BLCKSZ);
 
 	/* number of valid bytes in the buffer */
 	return count;
diff --git a/src/backend/bootstrap/bootparse.y b/src/backend/bootstrap/bootparse.y
index 2e1fef0350..9e81f9514d 100644
--- a/src/backend/bootstrap/bootparse.y
+++ b/src/backend/bootstrap/bootparse.y
@@ -4,7 +4,7 @@
  * bootparse.y
  *	  yacc grammar for the "bootstrap" mode (BKI file format)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -321,6 +321,8 @@ Boot_DeclareIndexStmt:
 					DefineIndex(relationId,
 								stmt,
 								$4,
+								InvalidOid,
+								InvalidOid,
 								false,
 								false,
 								false,
@@ -365,6 +367,8 @@ Boot_DeclareUniqueIndexStmt:
 					DefineIndex(relationId,
 								stmt,
 								$5,
+								InvalidOid,
+								InvalidOid,
 								false,
 								false,
 								false,
diff --git a/src/backend/bootstrap/bootscanner.l b/src/backend/bootstrap/bootscanner.l
index 6467882fa3..2ce6e524db 100644
--- a/src/backend/bootstrap/bootscanner.l
+++ b/src/backend/bootstrap/bootscanner.l
@@ -4,7 +4,7 @@
  * bootscanner.l
  *	  a lexical scanner for the bootstrap parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -38,6 +38,7 @@
 /* Not needed now that this file is compiled as part of bootparse. */
 /* #include "bootparse.h" */
 
+/* LCOV_EXCL_START */
 
 /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
 #undef fprintf
@@ -72,25 +73,25 @@ arrayid [A-Za-z0-9_]+\[{D}*\]
 
 %%
 
-open			{ return(OPEN); }
+open			{ return OPEN; }
 
-close			{ return(XCLOSE); }
+close			{ return XCLOSE; }
 
-create			{ return(XCREATE); }
+create			{ return XCREATE; }
 
-OID				{ return(OBJ_ID); }
-bootstrap		{ return(XBOOTSTRAP); }
-"shared_relation"	{ return(XSHARED_RELATION); }
-"without_oids"	{ return(XWITHOUT_OIDS); }
-"rowtype_oid"	{ return(XROWTYPE_OID); }
-_null_			{ return(NULLVAL); }
+OID				{ return OBJ_ID; }
+bootstrap		{ return XBOOTSTRAP; }
+"shared_relation"	{ return XSHARED_RELATION; }
+"without_oids"	{ return XWITHOUT_OIDS; }
+"rowtype_oid"	{ return XROWTYPE_OID; }
+_null_			{ return NULLVAL; }
 
-insert			{ return(INSERT_TUPLE); }
+insert			{ return INSERT_TUPLE; }
 
-","				{ return(COMMA); }
-"="				{ return(EQUALS); }
-"("				{ return(LPAREN); }
-")"				{ return(RPAREN); }
+","				{ return COMMA; }
+"="				{ return EQUALS; }
+"("				{ return LPAREN; }
+")"				{ return RPAREN; }
 
 [\n]			{ yyline++; }
 [\t]			;
@@ -99,31 +100,31 @@ insert			{ return(INSERT_TUPLE); }
 ^\#[^\n]* ; /* drop everything after "#" for comments */
 
 
-"declare"		{ return(XDECLARE); }
-"build"			{ return(XBUILD); }
-"indices"		{ return(INDICES); }
-"unique"		{ return(UNIQUE); }
-"index"			{ return(INDEX); }
-"on"			{ return(ON); }
-"using"			{ return(USING); }
-"toast"			{ return(XTOAST); }
-"FORCE"			{ return(XFORCE); }
-"NOT"			{ return(XNOT); }
-"NULL"			{ return(XNULL); }
+"declare"		{ return XDECLARE; }
+"build"			{ return XBUILD; }
+"indices"		{ return INDICES; }
+"unique"		{ return UNIQUE; }
+"index"			{ return INDEX; }
+"on"			{ return ON; }
+"using"			{ return USING; }
+"toast"			{ return XTOAST; }
+"FORCE"			{ return XFORCE; }
+"NOT"			{ return XNOT; }
+"NULL"			{ return XNULL; }
 
 {arrayid}		{
 					yylval.str = MapArrayTypeName(yytext);
-					return(ID);
+					return ID;
 				}
 {id}			{
 					yylval.str = scanstr(yytext);
-					return(ID);
+					return ID;
 				}
 {sid}			{
 					yytext[strlen(yytext)-1] = '\0'; /* strip off quotes */
 					yylval.str = scanstr(yytext+1);
 					yytext[strlen(yytext)] = '"'; /* restore quotes */
-					return(ID);
+					return ID;
 				}
 
 .				{
@@ -134,6 +135,8 @@ insert			{ return(INSERT_TUPLE); }
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 void
 yyerror(const char *message)
 {
diff --git a/src/backend/bootstrap/bootstrap.c b/src/backend/bootstrap/bootstrap.c
index b3f0b3cc92..28ff2f0979 100644
--- a/src/backend/bootstrap/bootstrap.c
+++ b/src/backend/bootstrap/bootstrap.c
@@ -4,7 +4,7 @@
  *	  routines to support running postgres in 'bootstrap' mode
  *	bootstrap mode is used to create the initial template database
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -19,6 +19,7 @@
 
 #include "access/htup_details.h"
 #include "access/xact.h"
+#include "access/xlog_internal.h"
 #include "bootstrap/bootstrap.h"
 #include "catalog/index.h"
 #include "catalog/pg_collation.h"
@@ -222,7 +223,7 @@ AuxiliaryProcessMain(int argc, char *argv[])
 	/* If no -x argument, we are a CheckerProcess */
 	MyAuxProcType = CheckerProcess;
 
-	while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:x:-:")) != -1)
+	while ((flag = getopt(argc, argv, "B:c:d:D:Fkr:x:X:-:")) != -1)
 	{
 		switch (flag)
 		{
@@ -257,6 +258,18 @@ AuxiliaryProcessMain(int argc, char *argv[])
 			case 'x':
 				MyAuxProcType = atoi(optarg);
 				break;
+			case 'X':
+				{
+					int			WalSegSz = strtoul(optarg, NULL, 0);
+
+					if (!IsValidWalSegSize(WalSegSz))
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+								 errmsg("-X requires a power of 2 value between 1MB and 1GB")));
+					SetConfigOption("wal_segment_size", optarg, PGC_INTERNAL,
+									PGC_S_OVERRIDE);
+				}
+				break;
 			case 'c':
 			case '-':
 				{
@@ -308,19 +321,19 @@ AuxiliaryProcessMain(int argc, char *argv[])
 		switch (MyAuxProcType)
 		{
 			case StartupProcess:
-				statmsg = "startup process";
+				statmsg = pgstat_get_backend_desc(B_STARTUP);
 				break;
 			case BgWriterProcess:
-				statmsg = "writer process";
+				statmsg = pgstat_get_backend_desc(B_BG_WRITER);
 				break;
 			case CheckpointerProcess:
-				statmsg = "checkpointer process";
+				statmsg = pgstat_get_backend_desc(B_CHECKPOINTER);
 				break;
 			case WalWriterProcess:
-				statmsg = "wal writer process";
+				statmsg = pgstat_get_backend_desc(B_WAL_WRITER);
 				break;
 			case WalReceiverProcess:
-				statmsg = "wal receiver process";
+				statmsg = pgstat_get_backend_desc(B_WAL_RECEIVER);
 				break;
 			default:
 				statmsg = "??? process";
@@ -609,7 +622,7 @@ boot_openrel(char *relname)
 		if (attrtypes[i] == NULL)
 			attrtypes[i] = AllocateAttribute();
 		memmove((char *) attrtypes[i],
-				(char *) boot_reldesc->rd_att->attrs[i],
+				(char *) TupleDescAttr(boot_reldesc->rd_att, i),
 				ATTRIBUTE_FIXED_PART_SIZE);
 
 		{
@@ -816,7 +829,7 @@ InsertOneValue(char *value, int i)
 
 	elog(DEBUG4, "inserting column %d value \"%s\"", i, value);
 
-	typoid = boot_reldesc->rd_att->attrs[i]->atttypid;
+	typoid = TupleDescAttr(boot_reldesc->rd_att, i)->atttypid;
 
 	boot_get_type_io_data(typoid,
 						  &typlen, &typbyval, &typalign,
@@ -843,10 +856,10 @@ InsertOneNull(int i)
 {
 	elog(DEBUG4, "inserting column %d NULL", i);
 	Assert(i >= 0 && i < MAXATTR);
-	if (boot_reldesc->rd_att->attrs[i]->attnotnull)
+	if (TupleDescAttr(boot_reldesc->rd_att, i)->attnotnull)
 		elog(ERROR,
 			 "NULL value specified for not-null column \"%s\" of relation \"%s\"",
-			 NameStr(boot_reldesc->rd_att->attrs[i]->attname),
+			 NameStr(TupleDescAttr(boot_reldesc->rd_att, i)->attname),
 			 RelationGetRelationName(boot_reldesc));
 	values[i] = PointerGetDatum(NULL);
 	Nulls[i] = true;
@@ -1124,7 +1137,7 @@ build_indices(void)
 		heap = heap_open(ILHead->il_heap, NoLock);
 		ind = index_open(ILHead->il_ind, NoLock);
 
-		index_build(heap, ind, ILHead->il_info, false, false);
+		index_build(heap, ind, ILHead->il_info, false, false, false);
 
 		index_close(ind, NoLock);
 		heap_close(heap, NoLock);
diff --git a/src/backend/catalog/Catalog.pm b/src/backend/catalog/Catalog.pm
index 7abfda3d3a..9ced1547f6 100644
--- a/src/backend/catalog/Catalog.pm
+++ b/src/backend/catalog/Catalog.pm
@@ -4,7 +4,7 @@
 #    Perl module that extracts info from catalog headers into Perl
 #    data structures
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/backend/catalog/Catalog.pm
@@ -16,11 +16,6 @@ package Catalog;
 use strict;
 use warnings;
 
-require Exporter;
-our @ISA       = qw(Exporter);
-our @EXPORT    = ();
-our @EXPORT_OK = qw(Catalogs SplitDataLine RenameTempFile);
-
 # Call this function with an array of names of header files to parse.
 # Returns a nested data structure describing the data in the headers.
 sub Catalogs
@@ -36,11 +31,14 @@ sub Catalogs
 		'int64'         => 'int8',
 		'Oid'           => 'oid',
 		'NameData'      => 'name',
-		'TransactionId' => 'xid');
+		'TransactionId' => 'xid',
+		'XLogRecPtr'    => 'pg_lsn');
 
 	foreach my $input_file (@_)
 	{
 		my %catalog;
+		my $is_varlen     = 0;
+
 		$catalog{columns} = [];
 		$catalog{data}    = [];
 
@@ -162,22 +160,30 @@ sub Catalogs
 				  /BKI_WITHOUT_OIDS/ ? ' without_oids' : '';
 				$catalog{rowtype_oid} =
 				  /BKI_ROWTYPE_OID\((\d+)\)/ ? " rowtype_oid $1" : '';
-				$catalog{schema_macro} = /BKI_SCHEMA_MACRO/ ? 'True' : '';
+				$catalog{schema_macro} = /BKI_SCHEMA_MACRO/ ? 1 : 0;
 				$declaring_attributes = 1;
 			}
 			elsif ($declaring_attributes)
 			{
 				next if (/^{|^$/);
-				next if (/^#/);
+				if (/^#/)
+				{
+					$is_varlen = 1 if /^#ifdef\s+CATALOG_VARLEN/;
+					next;
+				}
 				if (/^}/)
 				{
 					undef $declaring_attributes;
 				}
 				else
 				{
-					my %row;
-					my ($atttype, $attname, $attopt) = split /\s+/, $_;
-					die "parse error ($input_file)" unless $attname;
+					my %column;
+					my @attopts = split /\s+/, $_;
+					my $atttype = shift @attopts;
+					my $attname = shift @attopts;
+					die "parse error ($input_file)"
+					  unless ($attname and $atttype);
+
 					if (exists $RENAME_ATTTYPE{$atttype})
 					{
 						$atttype = $RENAME_ATTTYPE{$atttype};
@@ -185,29 +191,39 @@ sub Catalogs
 					if ($attname =~ /(.*)\[.*\]/)    # array attribute
 					{
 						$attname = $1;
-						$atttype .= '[]';            # variable-length only
+						$atttype .= '[]';
 					}
 
-					$row{'type'} = $atttype;
-					$row{'name'} = $attname;
+					$column{type} = $atttype;
+					$column{name} = $attname;
+					$column{is_varlen} = 1 if $is_varlen;
 
-					if (defined $attopt)
+					foreach my $attopt (@attopts)
 					{
 						if ($attopt eq 'BKI_FORCE_NULL')
 						{
-							$row{'forcenull'} = 1;
+							$column{forcenull} = 1;
 						}
 						elsif ($attopt eq 'BKI_FORCE_NOT_NULL')
 						{
-							$row{'forcenotnull'} = 1;
+							$column{forcenotnull} = 1;
+						}
+						elsif ($attopt =~ /BKI_DEFAULT\((\S+)\)/)
+						{
+							$column{default} = $1;
 						}
 						else
 						{
 							die
 "unknown column option $attopt on column $attname";
 						}
+
+						if ($column{forcenull} and $column{forcenotnull})
+						{
+							die "$attname is forced both null and not null";
+						}
 					}
-					push @{ $catalog{columns} }, \%row;
+					push @{ $catalog{columns} }, \%column;
 				}
 			}
 		}
@@ -239,6 +255,46 @@ sub SplitDataLine
 	return @result;
 }
 
+# Fill in default values of a record using the given schema. It's the
+# caller's responsibility to specify other values beforehand.
+sub AddDefaultValues
+{
+	my ($row, $schema) = @_;
+	my @missing_fields;
+	my $msg;
+
+	foreach my $column (@$schema)
+	{
+		my $attname = $column->{name};
+		my $atttype = $column->{type};
+
+		if (defined $row->{$attname})
+		{
+			;
+		}
+		elsif (defined $column->{default})
+		{
+			$row->{$attname} = $column->{default};
+		}
+		else
+		{
+			# Failed to find a value.
+			push @missing_fields, $attname;
+		}
+	}
+
+	if (@missing_fields)
+	{
+		$msg = "Missing values for: " . join(', ', @missing_fields);
+		$msg .= "\nShowing other values for context:\n";
+		while (my($key, $value) = each %$row)
+		{
+			$msg .= "$key => $value, ";
+		}
+	}
+	return $msg;
+}
+
 # Rename temporary files to final names.
 # Call this function with the final file name and the .tmp extension
 # Note: recommended extension is ".tmp$$", so that parallel make steps
@@ -252,6 +308,39 @@ sub RenameTempFile
 	rename($temp_name, $final_name) || die "rename: $temp_name: $!";
 }
 
+
+# Find a symbol defined in a particular header file and extract the value.
+#
+# The include path has to be passed as a reference to an array.
+sub FindDefinedSymbol
+{
+	my ($catalog_header, $include_path, $symbol) = @_;
+
+	for my $path (@$include_path)
+	{
+
+		# Make sure include path ends in a slash.
+		if (substr($path, -1) ne '/')
+		{
+			$path .= '/';
+		}
+		my $file = $path . $catalog_header;
+		next if !-f $file;
+		open(my $find_defined_symbol, '<', $file) || die "$file: $!";
+		while (<$find_defined_symbol>)
+		{
+			if (/^#define\s+\Q$symbol\E\s+(\S+)/)
+			{
+				return $1;
+			}
+		}
+		close $find_defined_symbol;
+		die "$file: no definition found for $symbol\n";
+	}
+	die "$catalog_header: not found in any include directory\n";
+}
+
+
 # verify the number of fields in the passed-in DATA line
 sub check_natts
 {
diff --git a/src/backend/catalog/Makefile b/src/backend/catalog/Makefile
index fd33426bad..30ca509534 100644
--- a/src/backend/catalog/Makefile
+++ b/src/backend/catalog/Makefile
@@ -45,7 +45,7 @@ POSTGRES_BKI_SRCS = $(addprefix $(top_srcdir)/src/include/catalog/,\
 	pg_default_acl.h pg_init_privs.h pg_seclabel.h pg_shseclabel.h \
 	pg_collation.h pg_partitioned_table.h pg_range.h pg_transform.h \
 	pg_sequence.h pg_publication.h pg_publication_rel.h pg_subscription.h \
-	pg_subscription_rel.h toasting.h indexing.h \
+	pg_subscription_rel.h \
 	toasting.h indexing.h \
     )
 
diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c
index ccde66a7dd..1156627b9e 100644
--- a/src/backend/catalog/aclchk.c
+++ b/src/backend/catalog/aclchk.c
@@ -3,7 +3,7 @@
  * aclchk.c
  *	  Routines to check access control permissions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -86,7 +86,7 @@ typedef struct
 	Oid			nspid;			/* namespace, or InvalidOid if none */
 	/* remaining fields are same as in InternalGrant: */
 	bool		is_grant;
-	GrantObjectType objtype;
+	ObjectType	objtype;
 	bool		all_privs;
 	AclMode		privileges;
 	List	   *grantees;
@@ -116,8 +116,8 @@ static void ExecGrant_Type(InternalGrant *grantStmt);
 static void SetDefaultACLsInSchemas(InternalDefaultACL *iacls, List *nspnames);
 static void SetDefaultACL(InternalDefaultACL *iacls);
 
-static List *objectNamesToOids(GrantObjectType objtype, List *objnames);
-static List *objectsInSchemaToOids(GrantObjectType objtype, List *nspnames);
+static List *objectNamesToOids(ObjectType objtype, List *objnames);
+static List *objectsInSchemaToOids(ObjectType objtype, List *nspnames);
 static List *getRelationsInNamespace(Oid namespaceId, char relkind);
 static void expand_col_privileges(List *colnames, Oid table_oid,
 					  AclMode this_privileges,
@@ -132,9 +132,9 @@ static const char *privilege_to_string(AclMode privilege);
 static AclMode restrict_and_check_grant(bool is_grant, AclMode avail_goptions,
 						 bool all_privs, AclMode privileges,
 						 Oid objectId, Oid grantorId,
-						 AclObjectKind objkind, const char *objname,
+						 ObjectType objtype, const char *objname,
 						 AttrNumber att_number, const char *colname);
-static AclMode pg_aclmask(AclObjectKind objkind, Oid table_oid, AttrNumber attnum,
+static AclMode pg_aclmask(ObjectType objtype, Oid table_oid, AttrNumber attnum,
 		   Oid roleid, AclMode mask, AclMaskHow how);
 static void recordExtensionInitPriv(Oid objoid, Oid classoid, int objsubid,
 						Acl *new_acl);
@@ -236,56 +236,56 @@ merge_acl_with_grant(Acl *old_acl, bool is_grant,
 static AclMode
 restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 						 AclMode privileges, Oid objectId, Oid grantorId,
-						 AclObjectKind objkind, const char *objname,
+						 ObjectType objtype, const char *objname,
 						 AttrNumber att_number, const char *colname)
 {
 	AclMode		this_privileges;
 	AclMode		whole_mask;
 
-	switch (objkind)
+	switch (objtype)
 	{
-		case ACL_KIND_COLUMN:
+		case OBJECT_COLUMN:
 			whole_mask = ACL_ALL_RIGHTS_COLUMN;
 			break;
-		case ACL_KIND_CLASS:
+		case OBJECT_TABLE:
 			whole_mask = ACL_ALL_RIGHTS_RELATION;
 			break;
-		case ACL_KIND_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			whole_mask = ACL_ALL_RIGHTS_SEQUENCE;
 			break;
-		case ACL_KIND_DATABASE:
+		case OBJECT_DATABASE:
 			whole_mask = ACL_ALL_RIGHTS_DATABASE;
 			break;
-		case ACL_KIND_PROC:
+		case OBJECT_FUNCTION:
 			whole_mask = ACL_ALL_RIGHTS_FUNCTION;
 			break;
-		case ACL_KIND_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			whole_mask = ACL_ALL_RIGHTS_LANGUAGE;
 			break;
-		case ACL_KIND_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			whole_mask = ACL_ALL_RIGHTS_LARGEOBJECT;
 			break;
-		case ACL_KIND_NAMESPACE:
-			whole_mask = ACL_ALL_RIGHTS_NAMESPACE;
+		case OBJECT_SCHEMA:
+			whole_mask = ACL_ALL_RIGHTS_SCHEMA;
 			break;
-		case ACL_KIND_TABLESPACE:
+		case OBJECT_TABLESPACE:
 			whole_mask = ACL_ALL_RIGHTS_TABLESPACE;
 			break;
-		case ACL_KIND_FDW:
+		case OBJECT_FDW:
 			whole_mask = ACL_ALL_RIGHTS_FDW;
 			break;
-		case ACL_KIND_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			whole_mask = ACL_ALL_RIGHTS_FOREIGN_SERVER;
 			break;
-		case ACL_KIND_EVENT_TRIGGER:
+		case OBJECT_EVENT_TRIGGER:
 			elog(ERROR, "grantable rights not supported for event triggers");
 			/* not reached, but keep compiler quiet */
 			return ACL_NO_RIGHTS;
-		case ACL_KIND_TYPE:
+		case OBJECT_TYPE:
 			whole_mask = ACL_ALL_RIGHTS_TYPE;
 			break;
 		default:
-			elog(ERROR, "unrecognized object kind: %d", objkind);
+			elog(ERROR, "unrecognized object type: %d", objtype);
 			/* not reached, but keep compiler quiet */
 			return ACL_NO_RIGHTS;
 	}
@@ -297,14 +297,14 @@ restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 	 */
 	if (avail_goptions == ACL_NO_RIGHTS)
 	{
-		if (pg_aclmask(objkind, objectId, att_number, grantorId,
+		if (pg_aclmask(objtype, objectId, att_number, grantorId,
 					   whole_mask | ACL_GRANT_OPTION_FOR(whole_mask),
 					   ACLMASK_ANY) == ACL_NO_RIGHTS)
 		{
-			if (objkind == ACL_KIND_COLUMN && colname)
-				aclcheck_error_col(ACLCHECK_NO_PRIV, objkind, objname, colname);
+			if (objtype == OBJECT_COLUMN && colname)
+				aclcheck_error_col(ACLCHECK_NO_PRIV, objtype, objname, colname);
 			else
-				aclcheck_error(ACLCHECK_NO_PRIV, objkind, objname);
+				aclcheck_error(ACLCHECK_NO_PRIV, objtype, objname);
 		}
 	}
 
@@ -320,7 +320,7 @@ restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 	{
 		if (this_privileges == 0)
 		{
-			if (objkind == ACL_KIND_COLUMN && colname)
+			if (objtype == OBJECT_COLUMN && colname)
 				ereport(WARNING,
 						(errcode(ERRCODE_WARNING_PRIVILEGE_NOT_GRANTED),
 						 errmsg("no privileges were granted for column \"%s\" of relation \"%s\"",
@@ -333,7 +333,7 @@ restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 		}
 		else if (!all_privs && this_privileges != privileges)
 		{
-			if (objkind == ACL_KIND_COLUMN && colname)
+			if (objtype == OBJECT_COLUMN && colname)
 				ereport(WARNING,
 						(errcode(ERRCODE_WARNING_PRIVILEGE_NOT_GRANTED),
 						 errmsg("not all privileges were granted for column \"%s\" of relation \"%s\"",
@@ -349,7 +349,7 @@ restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 	{
 		if (this_privileges == 0)
 		{
-			if (objkind == ACL_KIND_COLUMN && colname)
+			if (objtype == OBJECT_COLUMN && colname)
 				ereport(WARNING,
 						(errcode(ERRCODE_WARNING_PRIVILEGE_NOT_REVOKED),
 						 errmsg("no privileges could be revoked for column \"%s\" of relation \"%s\"",
@@ -362,7 +362,7 @@ restrict_and_check_grant(bool is_grant, AclMode avail_goptions, bool all_privs,
 		}
 		else if (!all_privs && this_privileges != privileges)
 		{
-			if (objkind == ACL_KIND_COLUMN && colname)
+			if (objtype == OBJECT_COLUMN && colname)
 				ereport(WARNING,
 						(errcode(ERRCODE_WARNING_PRIVILEGE_NOT_REVOKED),
 						 errmsg("not all privileges could be revoked for column \"%s\" of relation \"%s\"",
@@ -441,60 +441,68 @@ ExecuteGrantStmt(GrantStmt *stmt)
 
 	/*
 	 * Convert stmt->privileges, a list of AccessPriv nodes, into an AclMode
-	 * bitmask.  Note: objtype can't be ACL_OBJECT_COLUMN.
+	 * bitmask.  Note: objtype can't be OBJECT_COLUMN.
 	 */
 	switch (stmt->objtype)
 	{
+		case OBJECT_TABLE:
 			/*
 			 * Because this might be a sequence, we test both relation and
 			 * sequence bits, and later do a more limited test when we know
 			 * the object type.
 			 */
-		case ACL_OBJECT_RELATION:
 			all_privileges = ACL_ALL_RIGHTS_RELATION | ACL_ALL_RIGHTS_SEQUENCE;
 			errormsg = gettext_noop("invalid privilege type %s for relation");
 			break;
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			all_privileges = ACL_ALL_RIGHTS_SEQUENCE;
 			errormsg = gettext_noop("invalid privilege type %s for sequence");
 			break;
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			all_privileges = ACL_ALL_RIGHTS_DATABASE;
 			errormsg = gettext_noop("invalid privilege type %s for database");
 			break;
-		case ACL_OBJECT_DOMAIN:
+		case OBJECT_DOMAIN:
 			all_privileges = ACL_ALL_RIGHTS_TYPE;
 			errormsg = gettext_noop("invalid privilege type %s for domain");
 			break;
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
 			errormsg = gettext_noop("invalid privilege type %s for function");
 			break;
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			all_privileges = ACL_ALL_RIGHTS_LANGUAGE;
 			errormsg = gettext_noop("invalid privilege type %s for language");
 			break;
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			all_privileges = ACL_ALL_RIGHTS_LARGEOBJECT;
 			errormsg = gettext_noop("invalid privilege type %s for large object");
 			break;
-		case ACL_OBJECT_NAMESPACE:
-			all_privileges = ACL_ALL_RIGHTS_NAMESPACE;
+		case OBJECT_SCHEMA:
+			all_privileges = ACL_ALL_RIGHTS_SCHEMA;
 			errormsg = gettext_noop("invalid privilege type %s for schema");
 			break;
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_PROCEDURE:
+			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
+			errormsg = gettext_noop("invalid privilege type %s for procedure");
+			break;
+		case OBJECT_ROUTINE:
+			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
+			errormsg = gettext_noop("invalid privilege type %s for routine");
+			break;
+		case OBJECT_TABLESPACE:
 			all_privileges = ACL_ALL_RIGHTS_TABLESPACE;
 			errormsg = gettext_noop("invalid privilege type %s for tablespace");
 			break;
-		case ACL_OBJECT_TYPE:
+		case OBJECT_TYPE:
 			all_privileges = ACL_ALL_RIGHTS_TYPE;
 			errormsg = gettext_noop("invalid privilege type %s for type");
 			break;
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			all_privileges = ACL_ALL_RIGHTS_FDW;
 			errormsg = gettext_noop("invalid privilege type %s for foreign-data wrapper");
 			break;
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			all_privileges = ACL_ALL_RIGHTS_FOREIGN_SERVER;
 			errormsg = gettext_noop("invalid privilege type %s for foreign server");
 			break;
@@ -532,7 +540,7 @@ ExecuteGrantStmt(GrantStmt *stmt)
 			 */
 			if (privnode->cols)
 			{
-				if (stmt->objtype != ACL_OBJECT_RELATION)
+				if (stmt->objtype != OBJECT_TABLE)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_GRANT_OPERATION),
 							 errmsg("column privileges are only valid for relations")));
@@ -566,36 +574,38 @@ ExecGrantStmt_oids(InternalGrant *istmt)
 {
 	switch (istmt->objtype)
 	{
-		case ACL_OBJECT_RELATION:
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_TABLE:
+		case OBJECT_SEQUENCE:
 			ExecGrant_Relation(istmt);
 			break;
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			ExecGrant_Database(istmt);
 			break;
-		case ACL_OBJECT_DOMAIN:
-		case ACL_OBJECT_TYPE:
+		case OBJECT_DOMAIN:
+		case OBJECT_TYPE:
 			ExecGrant_Type(istmt);
 			break;
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			ExecGrant_Fdw(istmt);
 			break;
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			ExecGrant_ForeignServer(istmt);
 			break;
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 			ExecGrant_Function(istmt);
 			break;
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			ExecGrant_Language(istmt);
 			break;
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			ExecGrant_Largeobject(istmt);
 			break;
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			ExecGrant_Namespace(istmt);
 			break;
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_TABLESPACE:
 			ExecGrant_Tablespace(istmt);
 			break;
 		default:
@@ -609,7 +619,7 @@ ExecGrantStmt_oids(InternalGrant *istmt)
 	 * the functions a chance to adjust the istmt with privileges actually
 	 * granted.
 	 */
-	if (EventTriggerSupportsGrantObjectType(istmt->objtype))
+	if (EventTriggerSupportsObjectType(istmt->objtype))
 		EventTriggerCollectGrant(istmt);
 }
 
@@ -624,7 +634,7 @@ ExecGrantStmt_oids(InternalGrant *istmt)
  * to fail.
  */
 static List *
-objectNamesToOids(GrantObjectType objtype, List *objnames)
+objectNamesToOids(ObjectType objtype, List *objnames)
 {
 	List	   *objects = NIL;
 	ListCell   *cell;
@@ -633,8 +643,8 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 
 	switch (objtype)
 	{
-		case ACL_OBJECT_RELATION:
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_TABLE:
+		case OBJECT_SEQUENCE:
 			foreach(cell, objnames)
 			{
 				RangeVar   *relvar = (RangeVar *) lfirst(cell);
@@ -644,7 +654,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, relOid);
 			}
 			break;
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			foreach(cell, objnames)
 			{
 				char	   *dbname = strVal(lfirst(cell));
@@ -654,8 +664,8 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, dbid);
 			}
 			break;
-		case ACL_OBJECT_DOMAIN:
-		case ACL_OBJECT_TYPE:
+		case OBJECT_DOMAIN:
+		case OBJECT_TYPE:
 			foreach(cell, objnames)
 			{
 				List	   *typname = (List *) lfirst(cell);
@@ -665,17 +675,17 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, oid);
 			}
 			break;
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			foreach(cell, objnames)
 			{
 				ObjectWithArgs *func = (ObjectWithArgs *) lfirst(cell);
 				Oid			funcid;
 
-				funcid = LookupFuncWithArgs(func, false);
+				funcid = LookupFuncWithArgs(OBJECT_FUNCTION, func, false);
 				objects = lappend_oid(objects, funcid);
 			}
 			break;
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			foreach(cell, objnames)
 			{
 				char	   *langname = strVal(lfirst(cell));
@@ -685,7 +695,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, oid);
 			}
 			break;
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			foreach(cell, objnames)
 			{
 				Oid			lobjOid = oidparse(lfirst(cell));
@@ -699,7 +709,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, lobjOid);
 			}
 			break;
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			foreach(cell, objnames)
 			{
 				char	   *nspname = strVal(lfirst(cell));
@@ -709,7 +719,27 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, oid);
 			}
 			break;
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_PROCEDURE:
+			foreach(cell, objnames)
+			{
+				ObjectWithArgs *func = (ObjectWithArgs *) lfirst(cell);
+				Oid			procid;
+
+				procid = LookupFuncWithArgs(OBJECT_PROCEDURE, func, false);
+				objects = lappend_oid(objects, procid);
+			}
+			break;
+		case OBJECT_ROUTINE:
+			foreach(cell, objnames)
+			{
+				ObjectWithArgs *func = (ObjectWithArgs *) lfirst(cell);
+				Oid			routid;
+
+				routid = LookupFuncWithArgs(OBJECT_ROUTINE, func, false);
+				objects = lappend_oid(objects, routid);
+			}
+			break;
+		case OBJECT_TABLESPACE:
 			foreach(cell, objnames)
 			{
 				char	   *spcname = strVal(lfirst(cell));
@@ -719,7 +749,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, spcoid);
 			}
 			break;
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			foreach(cell, objnames)
 			{
 				char	   *fdwname = strVal(lfirst(cell));
@@ -728,7 +758,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
 				objects = lappend_oid(objects, fdwid);
 			}
 			break;
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			foreach(cell, objnames)
 			{
 				char	   *srvname = strVal(lfirst(cell));
@@ -753,7 +783,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames)
  * no privilege checking on the individual objects here.
  */
 static List *
-objectsInSchemaToOids(GrantObjectType objtype, List *nspnames)
+objectsInSchemaToOids(ObjectType objtype, List *nspnames)
 {
 	List	   *objects = NIL;
 	ListCell   *cell;
@@ -768,7 +798,7 @@ objectsInSchemaToOids(GrantObjectType objtype, List *nspnames)
 
 		switch (objtype)
 		{
-			case ACL_OBJECT_RELATION:
+			case OBJECT_TABLE:
 				objs = getRelationsInNamespace(namespaceId, RELKIND_RELATION);
 				objects = list_concat(objects, objs);
 				objs = getRelationsInNamespace(namespaceId, RELKIND_VIEW);
@@ -780,24 +810,44 @@ objectsInSchemaToOids(GrantObjectType objtype, List *nspnames)
 				objs = getRelationsInNamespace(namespaceId, RELKIND_PARTITIONED_TABLE);
 				objects = list_concat(objects, objs);
 				break;
-			case ACL_OBJECT_SEQUENCE:
+			case OBJECT_SEQUENCE:
 				objs = getRelationsInNamespace(namespaceId, RELKIND_SEQUENCE);
 				objects = list_concat(objects, objs);
 				break;
-			case ACL_OBJECT_FUNCTION:
+			case OBJECT_FUNCTION:
+			case OBJECT_PROCEDURE:
+			case OBJECT_ROUTINE:
 				{
-					ScanKeyData key[1];
+					ScanKeyData key[2];
+					int			keycount;
 					Relation	rel;
 					HeapScanDesc scan;
 					HeapTuple	tuple;
 
-					ScanKeyInit(&key[0],
+					keycount = 0;
+					ScanKeyInit(&key[keycount++],
 								Anum_pg_proc_pronamespace,
 								BTEqualStrategyNumber, F_OIDEQ,
 								ObjectIdGetDatum(namespaceId));
 
+					/*
+					 * When looking for functions, check for return type <>0.
+					 * When looking for procedures, check for return type ==0.
+					 * When looking for routines, don't check the return type.
+					 */
+					if (objtype == OBJECT_FUNCTION)
+						ScanKeyInit(&key[keycount++],
+									Anum_pg_proc_prorettype,
+									BTEqualStrategyNumber, F_OIDNE,
+									InvalidOid);
+					else if (objtype == OBJECT_PROCEDURE)
+						ScanKeyInit(&key[keycount++],
+									Anum_pg_proc_prorettype,
+									BTEqualStrategyNumber, F_OIDEQ,
+									InvalidOid);
+
 					rel = heap_open(ProcedureRelationId, AccessShareLock);
-					scan = heap_beginscan_catalog(rel, 1, key);
+					scan = heap_beginscan_catalog(rel, keycount, key);
 
 					while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
 					{
@@ -943,24 +993,32 @@ ExecAlterDefaultPrivilegesStmt(ParseState *pstate, AlterDefaultPrivilegesStmt *s
 	 */
 	switch (action->objtype)
 	{
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			all_privileges = ACL_ALL_RIGHTS_RELATION;
 			errormsg = gettext_noop("invalid privilege type %s for relation");
 			break;
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			all_privileges = ACL_ALL_RIGHTS_SEQUENCE;
 			errormsg = gettext_noop("invalid privilege type %s for sequence");
 			break;
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
 			errormsg = gettext_noop("invalid privilege type %s for function");
 			break;
-		case ACL_OBJECT_TYPE:
+		case OBJECT_PROCEDURE:
+			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
+			errormsg = gettext_noop("invalid privilege type %s for procedure");
+			break;
+		case OBJECT_ROUTINE:
+			all_privileges = ACL_ALL_RIGHTS_FUNCTION;
+			errormsg = gettext_noop("invalid privilege type %s for routine");
+			break;
+		case OBJECT_TYPE:
 			all_privileges = ACL_ALL_RIGHTS_TYPE;
 			errormsg = gettext_noop("invalid privilege type %s for type");
 			break;
-		case ACL_OBJECT_NAMESPACE:
-			all_privileges = ACL_ALL_RIGHTS_NAMESPACE;
+		case OBJECT_SCHEMA:
+			all_privileges = ACL_ALL_RIGHTS_SCHEMA;
 			errormsg = gettext_noop("invalid privilege type %s for schema");
 			break;
 		default:
@@ -1126,38 +1184,38 @@ SetDefaultACL(InternalDefaultACL *iacls)
 	 */
 	switch (iacls->objtype)
 	{
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			objtype = DEFACLOBJ_RELATION;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_RELATION;
 			break;
 
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			objtype = DEFACLOBJ_SEQUENCE;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_SEQUENCE;
 			break;
 
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			objtype = DEFACLOBJ_FUNCTION;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_FUNCTION;
 			break;
 
-		case ACL_OBJECT_TYPE:
+		case OBJECT_TYPE:
 			objtype = DEFACLOBJ_TYPE;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
 				this_privileges = ACL_ALL_RIGHTS_TYPE;
 			break;
 
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			if (OidIsValid(iacls->nspid))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_GRANT_OPERATION),
 						 errmsg("cannot use IN SCHEMA clause when using GRANT/REVOKE ON SCHEMAS")));
 			objtype = DEFACLOBJ_NAMESPACE;
 			if (iacls->all_privs && this_privileges == ACL_NO_RIGHTS)
-				this_privileges = ACL_ALL_RIGHTS_NAMESPACE;
+				this_privileges = ACL_ALL_RIGHTS_SCHEMA;
 			break;
 
 		default:
@@ -1372,19 +1430,19 @@ RemoveRoleFromObjectACL(Oid roleid, Oid classid, Oid objid)
 		switch (pg_default_acl_tuple->defaclobjtype)
 		{
 			case DEFACLOBJ_RELATION:
-				iacls.objtype = ACL_OBJECT_RELATION;
+				iacls.objtype = OBJECT_TABLE;
 				break;
 			case DEFACLOBJ_SEQUENCE:
-				iacls.objtype = ACL_OBJECT_SEQUENCE;
+				iacls.objtype = OBJECT_SEQUENCE;
 				break;
 			case DEFACLOBJ_FUNCTION:
-				iacls.objtype = ACL_OBJECT_FUNCTION;
+				iacls.objtype = OBJECT_FUNCTION;
 				break;
 			case DEFACLOBJ_TYPE:
-				iacls.objtype = ACL_OBJECT_TYPE;
+				iacls.objtype = OBJECT_TYPE;
 				break;
 			case DEFACLOBJ_NAMESPACE:
-				iacls.objtype = ACL_OBJECT_NAMESPACE;
+				iacls.objtype = OBJECT_SCHEMA;
 				break;
 			default:
 				/* Shouldn't get here */
@@ -1413,35 +1471,35 @@ RemoveRoleFromObjectACL(Oid roleid, Oid classid, Oid objid)
 		switch (classid)
 		{
 			case RelationRelationId:
-				/* it's OK to use RELATION for a sequence */
-				istmt.objtype = ACL_OBJECT_RELATION;
+				/* it's OK to use TABLE for a sequence */
+				istmt.objtype = OBJECT_TABLE;
 				break;
 			case DatabaseRelationId:
-				istmt.objtype = ACL_OBJECT_DATABASE;
+				istmt.objtype = OBJECT_DATABASE;
 				break;
 			case TypeRelationId:
-				istmt.objtype = ACL_OBJECT_TYPE;
+				istmt.objtype = OBJECT_TYPE;
 				break;
 			case ProcedureRelationId:
-				istmt.objtype = ACL_OBJECT_FUNCTION;
+				istmt.objtype = OBJECT_ROUTINE;
 				break;
 			case LanguageRelationId:
-				istmt.objtype = ACL_OBJECT_LANGUAGE;
+				istmt.objtype = OBJECT_LANGUAGE;
 				break;
 			case LargeObjectRelationId:
-				istmt.objtype = ACL_OBJECT_LARGEOBJECT;
+				istmt.objtype = OBJECT_LARGEOBJECT;
 				break;
 			case NamespaceRelationId:
-				istmt.objtype = ACL_OBJECT_NAMESPACE;
+				istmt.objtype = OBJECT_SCHEMA;
 				break;
 			case TableSpaceRelationId:
-				istmt.objtype = ACL_OBJECT_TABLESPACE;
+				istmt.objtype = OBJECT_TABLESPACE;
 				break;
 			case ForeignServerRelationId:
-				istmt.objtype = ACL_OBJECT_FOREIGN_SERVER;
+				istmt.objtype = OBJECT_FOREIGN_SERVER;
 				break;
 			case ForeignDataWrapperRelationId:
-				istmt.objtype = ACL_OBJECT_FDW;
+				istmt.objtype = OBJECT_FDW;
 				break;
 			default:
 				elog(ERROR, "unexpected object class %u", classid);
@@ -1624,7 +1682,7 @@ ExecGrant_Attribute(InternalGrant *istmt, Oid relOid, const char *relname,
 							   &isNull);
 	if (isNull)
 	{
-		old_acl = acldefault(ACL_OBJECT_COLUMN, ownerId);
+		old_acl = acldefault(OBJECT_COLUMN, ownerId);
 		/* There are no old member roles according to the catalogs */
 		noldmembers = 0;
 		oldmembers = NULL;
@@ -1663,7 +1721,7 @@ ExecGrant_Attribute(InternalGrant *istmt, Oid relOid, const char *relname,
 		restrict_and_check_grant(istmt->is_grant, avail_goptions,
 								 (col_privileges == ACL_ALL_RIGHTS_COLUMN),
 								 col_privileges,
-								 relOid, grantorId, ACL_KIND_COLUMN,
+								 relOid, grantorId, OBJECT_COLUMN,
 								 relname, attnum,
 								 NameStr(pg_attribute_tuple->attname));
 
@@ -1766,7 +1824,8 @@ ExecGrant_Relation(InternalGrant *istmt)
 		pg_class_tuple = (Form_pg_class) GETSTRUCT(tuple);
 
 		/* Not sensible to grant on an index */
-		if (pg_class_tuple->relkind == RELKIND_INDEX)
+		if (pg_class_tuple->relkind == RELKIND_INDEX ||
+			pg_class_tuple->relkind == RELKIND_PARTITIONED_INDEX)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("\"%s\" is an index",
@@ -1780,7 +1839,7 @@ ExecGrant_Relation(InternalGrant *istmt)
 							NameStr(pg_class_tuple->relname))));
 
 		/* Used GRANT SEQUENCE on a non-sequence? */
-		if (istmt->objtype == ACL_OBJECT_SEQUENCE &&
+		if (istmt->objtype == OBJECT_SEQUENCE &&
 			pg_class_tuple->relkind != RELKIND_SEQUENCE)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -1804,7 +1863,7 @@ ExecGrant_Relation(InternalGrant *istmt)
 		 * permissions.  The OR of table and sequence permissions were already
 		 * checked.
 		 */
-		if (istmt->objtype == ACL_OBJECT_RELATION)
+		if (istmt->objtype == OBJECT_TABLE)
 		{
 			if (pg_class_tuple->relkind == RELKIND_SEQUENCE)
 			{
@@ -1883,10 +1942,10 @@ ExecGrant_Relation(InternalGrant *istmt)
 			switch (pg_class_tuple->relkind)
 			{
 				case RELKIND_SEQUENCE:
-					old_acl = acldefault(ACL_OBJECT_SEQUENCE, ownerId);
+					old_acl = acldefault(OBJECT_SEQUENCE, ownerId);
 					break;
 				default:
-					old_acl = acldefault(ACL_OBJECT_RELATION, ownerId);
+					old_acl = acldefault(OBJECT_TABLE, ownerId);
 					break;
 			}
 			/* There are no old member roles according to the catalogs */
@@ -1917,7 +1976,7 @@ ExecGrant_Relation(InternalGrant *istmt)
 			bool		replaces[Natts_pg_class];
 			int			nnewmembers;
 			Oid		   *newmembers;
-			AclObjectKind aclkind;
+			ObjectType	objtype;
 
 			/* Determine ID to do the grant as, and available grant options */
 			select_best_grantor(GetUserId(), this_privileges,
@@ -1927,10 +1986,10 @@ ExecGrant_Relation(InternalGrant *istmt)
 			switch (pg_class_tuple->relkind)
 			{
 				case RELKIND_SEQUENCE:
-					aclkind = ACL_KIND_SEQUENCE;
+					objtype = OBJECT_SEQUENCE;
 					break;
 				default:
-					aclkind = ACL_KIND_CLASS;
+					objtype = OBJECT_TABLE;
 					break;
 			}
 
@@ -1941,7 +2000,7 @@ ExecGrant_Relation(InternalGrant *istmt)
 			this_privileges =
 				restrict_and_check_grant(istmt->is_grant, avail_goptions,
 										 istmt->all_privs, this_privileges,
-										 relOid, grantorId, aclkind,
+										 relOid, grantorId, objtype,
 										 NameStr(pg_class_tuple->relname),
 										 0, NULL);
 
@@ -2111,7 +2170,7 @@ ExecGrant_Database(InternalGrant *istmt)
 								RelationGetDescr(relation), &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_DATABASE, ownerId);
+			old_acl = acldefault(OBJECT_DATABASE, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2135,7 +2194,7 @@ ExecGrant_Database(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 datId, grantorId, ACL_KIND_DATABASE,
+									 datId, grantorId, OBJECT_DATABASE,
 									 NameStr(pg_database_tuple->datname),
 									 0, NULL);
 
@@ -2233,7 +2292,7 @@ ExecGrant_Fdw(InternalGrant *istmt)
 								   &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_FDW, ownerId);
+			old_acl = acldefault(OBJECT_FDW, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2257,7 +2316,7 @@ ExecGrant_Fdw(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 fdwid, grantorId, ACL_KIND_FDW,
+									 fdwid, grantorId, OBJECT_FDW,
 									 NameStr(pg_fdw_tuple->fdwname),
 									 0, NULL);
 
@@ -2359,7 +2418,7 @@ ExecGrant_ForeignServer(InternalGrant *istmt)
 								   &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_FOREIGN_SERVER, ownerId);
+			old_acl = acldefault(OBJECT_FOREIGN_SERVER, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2383,7 +2442,7 @@ ExecGrant_ForeignServer(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 srvid, grantorId, ACL_KIND_FOREIGN_SERVER,
+									 srvid, grantorId, OBJECT_FOREIGN_SERVER,
 									 NameStr(pg_server_tuple->srvname),
 									 0, NULL);
 
@@ -2483,7 +2542,7 @@ ExecGrant_Function(InternalGrant *istmt)
 								   &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_FUNCTION, ownerId);
+			old_acl = acldefault(OBJECT_FUNCTION, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2507,7 +2566,7 @@ ExecGrant_Function(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 funcId, grantorId, ACL_KIND_PROC,
+									 funcId, grantorId, OBJECT_FUNCTION,
 									 NameStr(pg_proc_tuple->proname),
 									 0, NULL);
 
@@ -2614,7 +2673,7 @@ ExecGrant_Language(InternalGrant *istmt)
 								   &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_LANGUAGE, ownerId);
+			old_acl = acldefault(OBJECT_LANGUAGE, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2638,7 +2697,7 @@ ExecGrant_Language(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 langId, grantorId, ACL_KIND_LANGUAGE,
+									 langId, grantorId, OBJECT_LANGUAGE,
 									 NameStr(pg_language_tuple->lanname),
 									 0, NULL);
 
@@ -2752,7 +2811,7 @@ ExecGrant_Largeobject(InternalGrant *istmt)
 								RelationGetDescr(relation), &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_LARGEOBJECT, ownerId);
+			old_acl = acldefault(OBJECT_LARGEOBJECT, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2777,7 +2836,7 @@ ExecGrant_Largeobject(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 loid, grantorId, ACL_KIND_LARGEOBJECT,
+									 loid, grantorId, OBJECT_LARGEOBJECT,
 									 loname, 0, NULL);
 
 		/*
@@ -2836,7 +2895,7 @@ ExecGrant_Namespace(InternalGrant *istmt)
 	ListCell   *cell;
 
 	if (istmt->all_privs && istmt->privileges == ACL_NO_RIGHTS)
-		istmt->privileges = ACL_ALL_RIGHTS_NAMESPACE;
+		istmt->privileges = ACL_ALL_RIGHTS_SCHEMA;
 
 	relation = heap_open(NamespaceRelationId, RowExclusiveLock);
 
@@ -2878,7 +2937,7 @@ ExecGrant_Namespace(InternalGrant *istmt)
 								   &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_NAMESPACE, ownerId);
+			old_acl = acldefault(OBJECT_SCHEMA, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -2902,7 +2961,7 @@ ExecGrant_Namespace(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 nspid, grantorId, ACL_KIND_NAMESPACE,
+									 nspid, grantorId, OBJECT_SCHEMA,
 									 NameStr(pg_namespace_tuple->nspname),
 									 0, NULL);
 
@@ -3002,7 +3061,7 @@ ExecGrant_Tablespace(InternalGrant *istmt)
 								RelationGetDescr(relation), &isNull);
 		if (isNull)
 		{
-			old_acl = acldefault(ACL_OBJECT_TABLESPACE, ownerId);
+			old_acl = acldefault(OBJECT_TABLESPACE, ownerId);
 			/* There are no old member roles according to the catalogs */
 			noldmembers = 0;
 			oldmembers = NULL;
@@ -3026,7 +3085,7 @@ ExecGrant_Tablespace(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 tblId, grantorId, ACL_KIND_TABLESPACE,
+									 tblId, grantorId, OBJECT_TABLESPACE,
 									 NameStr(pg_tablespace_tuple->spcname),
 									 0, NULL);
 
@@ -3120,7 +3179,7 @@ ExecGrant_Type(InternalGrant *istmt)
 					 errhint("Set the privileges of the element type instead.")));
 
 		/* Used GRANT DOMAIN on a non-domain? */
-		if (istmt->objtype == ACL_OBJECT_DOMAIN &&
+		if (istmt->objtype == OBJECT_DOMAIN &&
 			pg_type_tuple->typtype != TYPTYPE_DOMAIN)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -3160,7 +3219,7 @@ ExecGrant_Type(InternalGrant *istmt)
 		this_privileges =
 			restrict_and_check_grant(istmt->is_grant, avail_goptions,
 									 istmt->all_privs, istmt->privileges,
-									 typId, grantorId, ACL_KIND_TYPE,
+									 typId, grantorId, OBJECT_TYPE,
 									 NameStr(pg_type_tuple->typname),
 									 0, NULL);
 
@@ -3289,114 +3348,8 @@ privilege_to_string(AclMode privilege)
  * Note: we do not double-quote the %s's below, because many callers
  * supply strings that might be already quoted.
  */
-
-static const char *const no_priv_msg[MAX_ACL_KIND] =
-{
-	/* ACL_KIND_COLUMN */
-	gettext_noop("permission denied for column %s"),
-	/* ACL_KIND_CLASS */
-	gettext_noop("permission denied for relation %s"),
-	/* ACL_KIND_SEQUENCE */
-	gettext_noop("permission denied for sequence %s"),
-	/* ACL_KIND_DATABASE */
-	gettext_noop("permission denied for database %s"),
-	/* ACL_KIND_PROC */
-	gettext_noop("permission denied for function %s"),
-	/* ACL_KIND_OPER */
-	gettext_noop("permission denied for operator %s"),
-	/* ACL_KIND_TYPE */
-	gettext_noop("permission denied for type %s"),
-	/* ACL_KIND_LANGUAGE */
-	gettext_noop("permission denied for language %s"),
-	/* ACL_KIND_LARGEOBJECT */
-	gettext_noop("permission denied for large object %s"),
-	/* ACL_KIND_NAMESPACE */
-	gettext_noop("permission denied for schema %s"),
-	/* ACL_KIND_OPCLASS */
-	gettext_noop("permission denied for operator class %s"),
-	/* ACL_KIND_OPFAMILY */
-	gettext_noop("permission denied for operator family %s"),
-	/* ACL_KIND_COLLATION */
-	gettext_noop("permission denied for collation %s"),
-	/* ACL_KIND_CONVERSION */
-	gettext_noop("permission denied for conversion %s"),
-	/* ACL_KIND_STATISTICS */
-	gettext_noop("permission denied for statistics object %s"),
-	/* ACL_KIND_TABLESPACE */
-	gettext_noop("permission denied for tablespace %s"),
-	/* ACL_KIND_TSDICTIONARY */
-	gettext_noop("permission denied for text search dictionary %s"),
-	/* ACL_KIND_TSCONFIGURATION */
-	gettext_noop("permission denied for text search configuration %s"),
-	/* ACL_KIND_FDW */
-	gettext_noop("permission denied for foreign-data wrapper %s"),
-	/* ACL_KIND_FOREIGN_SERVER */
-	gettext_noop("permission denied for foreign server %s"),
-	/* ACL_KIND_EVENT_TRIGGER */
-	gettext_noop("permission denied for event trigger %s"),
-	/* ACL_KIND_EXTENSION */
-	gettext_noop("permission denied for extension %s"),
-	/* ACL_KIND_PUBLICATION */
-	gettext_noop("permission denied for publication %s"),
-	/* ACL_KIND_SUBSCRIPTION */
-	gettext_noop("permission denied for subscription %s"),
-};
-
-static const char *const not_owner_msg[MAX_ACL_KIND] =
-{
-	/* ACL_KIND_COLUMN */
-	gettext_noop("must be owner of relation %s"),
-	/* ACL_KIND_CLASS */
-	gettext_noop("must be owner of relation %s"),
-	/* ACL_KIND_SEQUENCE */
-	gettext_noop("must be owner of sequence %s"),
-	/* ACL_KIND_DATABASE */
-	gettext_noop("must be owner of database %s"),
-	/* ACL_KIND_PROC */
-	gettext_noop("must be owner of function %s"),
-	/* ACL_KIND_OPER */
-	gettext_noop("must be owner of operator %s"),
-	/* ACL_KIND_TYPE */
-	gettext_noop("must be owner of type %s"),
-	/* ACL_KIND_LANGUAGE */
-	gettext_noop("must be owner of language %s"),
-	/* ACL_KIND_LARGEOBJECT */
-	gettext_noop("must be owner of large object %s"),
-	/* ACL_KIND_NAMESPACE */
-	gettext_noop("must be owner of schema %s"),
-	/* ACL_KIND_OPCLASS */
-	gettext_noop("must be owner of operator class %s"),
-	/* ACL_KIND_OPFAMILY */
-	gettext_noop("must be owner of operator family %s"),
-	/* ACL_KIND_COLLATION */
-	gettext_noop("must be owner of collation %s"),
-	/* ACL_KIND_CONVERSION */
-	gettext_noop("must be owner of conversion %s"),
-	/* ACL_KIND_STATISTICS */
-	gettext_noop("must be owner of statistics object %s"),
-	/* ACL_KIND_TABLESPACE */
-	gettext_noop("must be owner of tablespace %s"),
-	/* ACL_KIND_TSDICTIONARY */
-	gettext_noop("must be owner of text search dictionary %s"),
-	/* ACL_KIND_TSCONFIGURATION */
-	gettext_noop("must be owner of text search configuration %s"),
-	/* ACL_KIND_FDW */
-	gettext_noop("must be owner of foreign-data wrapper %s"),
-	/* ACL_KIND_FOREIGN_SERVER */
-	gettext_noop("must be owner of foreign server %s"),
-	/* ACL_KIND_EVENT_TRIGGER */
-	gettext_noop("must be owner of event trigger %s"),
-	/* ACL_KIND_EXTENSION */
-	gettext_noop("must be owner of extension %s"),
-	/* ACL_KIND_PUBLICATION */
-	gettext_noop("must be owner of publication %s"),
-	/* ACL_KIND_SUBSCRIPTION */
-	gettext_noop("must be owner of subscription %s"),
-};
-
-
 void
-aclcheck_error(AclResult aclerr, AclObjectKind objectkind,
+aclcheck_error(AclResult aclerr, ObjectType objtype,
 			   const char *objectname)
 {
 	switch (aclerr)
@@ -3405,15 +3358,270 @@ aclcheck_error(AclResult aclerr, AclObjectKind objectkind,
 			/* no error, so return to caller */
 			break;
 		case ACLCHECK_NO_PRIV:
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg(no_priv_msg[objectkind], objectname)));
-			break;
+			{
+				const char *msg = "???";
+
+				switch (objtype)
+				{
+					case OBJECT_AGGREGATE:
+						msg = gettext_noop("permission denied for aggregate %s");
+						break;
+					case OBJECT_COLLATION:
+						msg = gettext_noop("permission denied for collation %s");
+						break;
+					case OBJECT_COLUMN:
+						msg = gettext_noop("permission denied for column %s");
+						break;
+					case OBJECT_CONVERSION:
+						msg = gettext_noop("permission denied for conversion %s");
+						break;
+					case OBJECT_DATABASE:
+						msg = gettext_noop("permission denied for database %s");
+						break;
+					case OBJECT_DOMAIN:
+						msg = gettext_noop("permission denied for domain %s");
+						break;
+					case OBJECT_EVENT_TRIGGER:
+						msg = gettext_noop("permission denied for event trigger %s");
+						break;
+					case OBJECT_EXTENSION:
+						msg = gettext_noop("permission denied for extension %s");
+						break;
+					case OBJECT_FDW:
+						msg = gettext_noop("permission denied for foreign-data wrapper %s");
+						break;
+					case OBJECT_FOREIGN_SERVER:
+						msg = gettext_noop("permission denied for foreign server %s");
+						break;
+					case OBJECT_FOREIGN_TABLE:
+						msg = gettext_noop("permission denied for foreign table %s");
+						break;
+					case OBJECT_FUNCTION:
+						msg = gettext_noop("permission denied for function %s");
+						break;
+					case OBJECT_INDEX:
+						msg = gettext_noop("permission denied for index %s");
+						break;
+					case OBJECT_LANGUAGE:
+						msg = gettext_noop("permission denied for language %s");
+						break;
+					case OBJECT_LARGEOBJECT:
+						msg = gettext_noop("permission denied for large object %s");
+						break;
+					case OBJECT_MATVIEW:
+						msg = gettext_noop("permission denied for materialized view %s");
+						break;
+					case OBJECT_OPCLASS:
+						msg = gettext_noop("permission denied for operator class %s");
+						break;
+					case OBJECT_OPERATOR:
+						msg = gettext_noop("permission denied for operator %s");
+						break;
+					case OBJECT_OPFAMILY:
+						msg = gettext_noop("permission denied for operator family %s");
+						break;
+					case OBJECT_POLICY:
+						msg = gettext_noop("permission denied for policy %s");
+						break;
+					case OBJECT_PROCEDURE:
+						msg = gettext_noop("permission denied for procedure %s");
+						break;
+					case OBJECT_PUBLICATION:
+						msg = gettext_noop("permission denied for publication %s");
+						break;
+					case OBJECT_ROUTINE:
+						msg = gettext_noop("permission denied for routine %s");
+						break;
+					case OBJECT_SCHEMA:
+						msg = gettext_noop("permission denied for schema %s");
+						break;
+					case OBJECT_SEQUENCE:
+						msg = gettext_noop("permission denied for sequence %s");
+						break;
+					case OBJECT_STATISTIC_EXT:
+						msg = gettext_noop("permission denied for statistics object %s");
+						break;
+					case OBJECT_SUBSCRIPTION:
+						msg = gettext_noop("permission denied for subscription %s");
+						break;
+					case OBJECT_TABLE:
+						msg = gettext_noop("permission denied for table %s");
+						break;
+					case OBJECT_TABLESPACE:
+						msg = gettext_noop("permission denied for tablespace %s");
+						break;
+					case OBJECT_TSCONFIGURATION:
+						msg = gettext_noop("permission denied for text search configuration %s");
+						break;
+					case OBJECT_TSDICTIONARY:
+						msg = gettext_noop("permission denied for text search dictionary %s");
+						break;
+					case OBJECT_TYPE:
+						msg = gettext_noop("permission denied for type %s");
+						break;
+					case OBJECT_VIEW:
+						msg = gettext_noop("permission denied for view %s");
+						break;
+					/* these currently aren't used */
+					case OBJECT_ACCESS_METHOD:
+					case OBJECT_AMOP:
+					case OBJECT_AMPROC:
+					case OBJECT_ATTRIBUTE:
+					case OBJECT_CAST:
+					case OBJECT_DEFAULT:
+					case OBJECT_DEFACL:
+					case OBJECT_DOMCONSTRAINT:
+					case OBJECT_PUBLICATION_REL:
+					case OBJECT_ROLE:
+					case OBJECT_RULE:
+					case OBJECT_TABCONSTRAINT:
+					case OBJECT_TRANSFORM:
+					case OBJECT_TRIGGER:
+					case OBJECT_TSPARSER:
+					case OBJECT_TSTEMPLATE:
+					case OBJECT_USER_MAPPING:
+						elog(ERROR, "unsupported object type %d", objtype);
+				}
+
+				ereport(ERROR,
+						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+						 errmsg(msg, objectname)));
+				break;
+			}
 		case ACLCHECK_NOT_OWNER:
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg(not_owner_msg[objectkind], objectname)));
-			break;
+			{
+				const char *msg = "???";
+
+				switch (objtype)
+				{
+					case OBJECT_AGGREGATE:
+						msg = gettext_noop("must be owner of aggregate %s");
+						break;
+					case OBJECT_COLLATION:
+						msg = gettext_noop("must be owner of collation %s");
+						break;
+					case OBJECT_CONVERSION:
+						msg = gettext_noop("must be owner of conversion %s");
+						break;
+					case OBJECT_DATABASE:
+						msg = gettext_noop("must be owner of database %s");
+						break;
+					case OBJECT_DOMAIN:
+						msg = gettext_noop("must be owner of domain %s");
+						break;
+					case OBJECT_EVENT_TRIGGER:
+						msg = gettext_noop("must be owner of event trigger %s");
+						break;
+					case OBJECT_EXTENSION:
+						msg = gettext_noop("must be owner of extension %s");
+						break;
+					case OBJECT_FDW:
+						msg = gettext_noop("must be owner of foreign-data wrapper %s");
+						break;
+					case OBJECT_FOREIGN_SERVER:
+						msg = gettext_noop("must be owner of foreign server %s");
+						break;
+					case OBJECT_FOREIGN_TABLE:
+						msg = gettext_noop("must be owner of foreign table %s");
+						break;
+					case OBJECT_FUNCTION:
+						msg = gettext_noop("must be owner of function %s");
+						break;
+					case OBJECT_INDEX:
+						msg = gettext_noop("must be owner of index %s");
+						break;
+					case OBJECT_LANGUAGE:
+						msg = gettext_noop("must be owner of language %s");
+						break;
+					case OBJECT_LARGEOBJECT:
+						msg = gettext_noop("must be owner of large object %s");
+						break;
+					case OBJECT_MATVIEW:
+						msg = gettext_noop("must be owner of materialized view %s");
+						break;
+					case OBJECT_OPCLASS:
+						msg = gettext_noop("must be owner of operator class %s");
+						break;
+					case OBJECT_OPERATOR:
+						msg = gettext_noop("must be owner of operator %s");
+						break;
+					case OBJECT_OPFAMILY:
+						msg = gettext_noop("must be owner of operator family %s");
+						break;
+					case OBJECT_PROCEDURE:
+						msg = gettext_noop("must be owner of procedure %s");
+						break;
+					case OBJECT_PUBLICATION:
+						msg = gettext_noop("must be owner of publication %s");
+						break;
+					case OBJECT_ROUTINE:
+						msg = gettext_noop("must be owner of routine %s");
+						break;
+					case OBJECT_SEQUENCE:
+						msg = gettext_noop("must be owner of sequence %s");
+						break;
+					case OBJECT_SUBSCRIPTION:
+						msg = gettext_noop("must be owner of subscription %s");
+						break;
+					case OBJECT_TABLE:
+						msg = gettext_noop("must be owner of table %s");
+						break;
+					case OBJECT_TYPE:
+						msg = gettext_noop("must be owner of type %s");
+						break;
+					case OBJECT_VIEW:
+						msg = gettext_noop("must be owner of view %s");
+						break;
+					case OBJECT_SCHEMA:
+						msg = gettext_noop("must be owner of schema %s");
+						break;
+					case OBJECT_STATISTIC_EXT:
+						msg = gettext_noop("must be owner of statistics object %s");
+						break;
+					case OBJECT_TABLESPACE:
+						msg = gettext_noop("must be owner of tablespace %s");
+						break;
+					case OBJECT_TSCONFIGURATION:
+						msg = gettext_noop("must be owner of text search configuration %s");
+						break;
+					case OBJECT_TSDICTIONARY:
+						msg = gettext_noop("must be owner of text search dictionary %s");
+						break;
+					/*
+					 * Special cases: For these, the error message talks about
+					 * "relation", because that's where the ownership is
+					 * attached.  See also check_object_ownership().
+					 */
+					case OBJECT_COLUMN:
+					case OBJECT_POLICY:
+					case OBJECT_RULE:
+					case OBJECT_TABCONSTRAINT:
+					case OBJECT_TRIGGER:
+						msg = gettext_noop("must be owner of relation %s");
+						break;
+					/* these currently aren't used */
+					case OBJECT_ACCESS_METHOD:
+					case OBJECT_AMOP:
+					case OBJECT_AMPROC:
+					case OBJECT_ATTRIBUTE:
+					case OBJECT_CAST:
+					case OBJECT_DEFAULT:
+					case OBJECT_DEFACL:
+					case OBJECT_DOMCONSTRAINT:
+					case OBJECT_PUBLICATION_REL:
+					case OBJECT_ROLE:
+					case OBJECT_TRANSFORM:
+					case OBJECT_TSPARSER:
+					case OBJECT_TSTEMPLATE:
+					case OBJECT_USER_MAPPING:
+						elog(ERROR, "unsupported object type %d", objtype);
+				}
+
+				ereport(ERROR,
+						(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+						 errmsg(msg, objectname)));
+				break;
+			}
 		default:
 			elog(ERROR, "unrecognized AclResult: %d", (int) aclerr);
 			break;
@@ -3422,7 +3630,7 @@ aclcheck_error(AclResult aclerr, AclObjectKind objectkind,
 
 
 void
-aclcheck_error_col(AclResult aclerr, AclObjectKind objectkind,
+aclcheck_error_col(AclResult aclerr, ObjectType objtype,
 				   const char *objectname, const char *colname)
 {
 	switch (aclerr)
@@ -3438,9 +3646,7 @@ aclcheck_error_col(AclResult aclerr, AclObjectKind objectkind,
 			break;
 		case ACLCHECK_NOT_OWNER:
 			/* relation msg is OK since columns don't have separate owners */
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg(not_owner_msg[objectkind], objectname)));
+			aclcheck_error(aclerr, objtype, objectname);
 			break;
 		default:
 			elog(ERROR, "unrecognized AclResult: %d", (int) aclerr);
@@ -3458,7 +3664,7 @@ aclcheck_error_type(AclResult aclerr, Oid typeOid)
 {
 	Oid			element_type = get_element_type(typeOid);
 
-	aclcheck_error(aclerr, ACL_KIND_TYPE, format_type_be(element_type ? element_type : typeOid));
+	aclcheck_error(aclerr, OBJECT_TYPE, format_type_be(element_type ? element_type : typeOid));
 }
 
 
@@ -3466,48 +3672,48 @@ aclcheck_error_type(AclResult aclerr, Oid typeOid)
  * Relay for the various pg_*_mask routines depending on object kind
  */
 static AclMode
-pg_aclmask(AclObjectKind objkind, Oid table_oid, AttrNumber attnum, Oid roleid,
+pg_aclmask(ObjectType objtype, Oid table_oid, AttrNumber attnum, Oid roleid,
 		   AclMode mask, AclMaskHow how)
 {
-	switch (objkind)
+	switch (objtype)
 	{
-		case ACL_KIND_COLUMN:
+		case OBJECT_COLUMN:
 			return
 				pg_class_aclmask(table_oid, roleid, mask, how) |
 				pg_attribute_aclmask(table_oid, attnum, roleid, mask, how);
-		case ACL_KIND_CLASS:
-		case ACL_KIND_SEQUENCE:
+		case OBJECT_TABLE:
+		case OBJECT_SEQUENCE:
 			return pg_class_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_DATABASE:
+		case OBJECT_DATABASE:
 			return pg_database_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_PROC:
+		case OBJECT_FUNCTION:
 			return pg_proc_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			return pg_language_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			return pg_largeobject_aclmask_snapshot(table_oid, roleid,
 												   mask, how, NULL);
-		case ACL_KIND_NAMESPACE:
+		case OBJECT_SCHEMA:
 			return pg_namespace_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_STATISTICS:
+		case OBJECT_STATISTIC_EXT:
 			elog(ERROR, "grantable rights not supported for statistics objects");
 			/* not reached, but keep compiler quiet */
 			return ACL_NO_RIGHTS;
-		case ACL_KIND_TABLESPACE:
+		case OBJECT_TABLESPACE:
 			return pg_tablespace_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_FDW:
+		case OBJECT_FDW:
 			return pg_foreign_data_wrapper_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			return pg_foreign_server_aclmask(table_oid, roleid, mask, how);
-		case ACL_KIND_EVENT_TRIGGER:
+		case OBJECT_EVENT_TRIGGER:
 			elog(ERROR, "grantable rights not supported for event triggers");
 			/* not reached, but keep compiler quiet */
 			return ACL_NO_RIGHTS;
-		case ACL_KIND_TYPE:
+		case OBJECT_TYPE:
 			return pg_type_aclmask(table_oid, roleid, mask, how);
 		default:
-			elog(ERROR, "unrecognized objkind: %d",
-				 (int) objkind);
+			elog(ERROR, "unrecognized objtype: %d",
+				 (int) objtype);
 			/* not reached, but keep compiler quiet */
 			return ACL_NO_RIGHTS;
 	}
@@ -3686,10 +3892,10 @@ pg_class_aclmask(Oid table_oid, Oid roleid,
 		switch (classForm->relkind)
 		{
 			case RELKIND_SEQUENCE:
-				acl = acldefault(ACL_OBJECT_SEQUENCE, ownerId);
+				acl = acldefault(OBJECT_SEQUENCE, ownerId);
 				break;
 			default:
-				acl = acldefault(ACL_OBJECT_RELATION, ownerId);
+				acl = acldefault(OBJECT_TABLE, ownerId);
 				break;
 		}
 		aclDatum = (Datum) 0;
@@ -3745,7 +3951,7 @@ pg_database_aclmask(Oid db_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_DATABASE, ownerId);
+		acl = acldefault(OBJECT_DATABASE, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -3799,7 +4005,7 @@ pg_proc_aclmask(Oid proc_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_FUNCTION, ownerId);
+		acl = acldefault(OBJECT_FUNCTION, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -3853,7 +4059,7 @@ pg_language_aclmask(Oid lang_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_LANGUAGE, ownerId);
+		acl = acldefault(OBJECT_LANGUAGE, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -3933,7 +4139,7 @@ pg_largeobject_aclmask_snapshot(Oid lobj_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_LARGEOBJECT, ownerId);
+		acl = acldefault(OBJECT_LARGEOBJECT, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -3996,7 +4202,7 @@ pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
 	{
 		if (pg_database_aclcheck(MyDatabaseId, roleid,
 								 ACL_CREATE_TEMP) == ACLCHECK_OK)
-			return mask & ACL_ALL_RIGHTS_NAMESPACE;
+			return mask & ACL_ALL_RIGHTS_SCHEMA;
 		else
 			return mask & ACL_USAGE;
 	}
@@ -4017,7 +4223,7 @@ pg_namespace_aclmask(Oid nsp_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_NAMESPACE, ownerId);
+		acl = acldefault(OBJECT_SCHEMA, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -4073,7 +4279,7 @@ pg_tablespace_aclmask(Oid spc_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_TABLESPACE, ownerId);
+		acl = acldefault(OBJECT_TABLESPACE, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -4135,7 +4341,7 @@ pg_foreign_data_wrapper_aclmask(Oid fdw_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_FDW, ownerId);
+		acl = acldefault(OBJECT_FDW, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -4197,7 +4403,7 @@ pg_foreign_server_aclmask(Oid srv_oid, Oid roleid,
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_FOREIGN_SERVER, ownerId);
+		acl = acldefault(OBJECT_FOREIGN_SERVER, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -4274,7 +4480,7 @@ pg_type_aclmask(Oid type_oid, Oid roleid, AclMode mask, AclMaskHow how)
 	if (isNull)
 	{
 		/* No ACL, so build default ACL */
-		acl = acldefault(ACL_OBJECT_TYPE, ownerId);
+		acl = acldefault(OBJECT_TYPE, ownerId);
 		aclDatum = (Datum) 0;
 	}
 	else
@@ -5243,7 +5449,7 @@ get_default_acl_internal(Oid roleId, Oid nsp_oid, char objtype)
  * Returns NULL if built-in system defaults should be used
  */
 Acl *
-get_user_default_acl(GrantObjectType objtype, Oid ownerId, Oid nsp_oid)
+get_user_default_acl(ObjectType objtype, Oid ownerId, Oid nsp_oid)
 {
 	Acl		   *result;
 	Acl		   *glob_acl;
@@ -5261,23 +5467,23 @@ get_user_default_acl(GrantObjectType objtype, Oid ownerId, Oid nsp_oid)
 	/* Check if object type is supported in pg_default_acl */
 	switch (objtype)
 	{
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			defaclobjtype = DEFACLOBJ_RELATION;
 			break;
 
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			defaclobjtype = DEFACLOBJ_SEQUENCE;
 			break;
 
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			defaclobjtype = DEFACLOBJ_FUNCTION;
 			break;
 
-		case ACL_OBJECT_TYPE:
+		case OBJECT_TYPE:
 			defaclobjtype = DEFACLOBJ_TYPE;
 			break;
 
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			defaclobjtype = DEFACLOBJ_NAMESPACE;
 			break;
 
@@ -5347,7 +5553,8 @@ recordExtObjInitPriv(Oid objoid, Oid classoid)
 		pg_class_tuple = (Form_pg_class) GETSTRUCT(tuple);
 
 		/* Indexes don't have permissions */
-		if (pg_class_tuple->relkind == RELKIND_INDEX)
+		if (pg_class_tuple->relkind == RELKIND_INDEX ||
+			pg_class_tuple->relkind == RELKIND_PARTITIONED_INDEX)
 			return;
 
 		/* Composite types don't have permissions either */
@@ -5632,7 +5839,8 @@ removeExtObjInitPriv(Oid objoid, Oid classoid)
 		pg_class_tuple = (Form_pg_class) GETSTRUCT(tuple);
 
 		/* Indexes don't have permissions */
-		if (pg_class_tuple->relkind == RELKIND_INDEX)
+		if (pg_class_tuple->relkind == RELKIND_INDEX ||
+			pg_class_tuple->relkind == RELKIND_PARTITIONED_INDEX)
 			return;
 
 		/* Composite types don't have permissions either */
diff --git a/src/backend/catalog/catalog.c b/src/backend/catalog/catalog.c
index 92d943cac7..809749add9 100644
--- a/src/backend/catalog/catalog.c
+++ b/src/backend/catalog/catalog.c
@@ -5,7 +5,7 @@
  *		bits of hard-wired knowledge
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -120,7 +120,7 @@ IsCatalogClass(Oid relid, Form_pg_class reltuple)
 	 * this is noticeably cheaper and doesn't require catalog access.
 	 *
 	 * This test is safe since even an oid wraparound will preserve this
-	 * property (c.f. GetNewObjectId()) and it has the advantage that it works
+	 * property (cf. GetNewObjectId()) and it has the advantage that it works
 	 * correctly even if a user decides to create a relation in the pg_catalog
 	 * namespace.
 	 * ----
@@ -444,7 +444,7 @@ GetNewRelFileNode(Oid reltablespace, Relation pg_class, char relpersistence)
 
 		/* Check for existing file of same name */
 		rpath = relpath(rnode, MAIN_FORKNUM);
-		fd = BasicOpenFile(rpath, O_RDONLY | PG_BINARY, 0);
+		fd = BasicOpenFile(rpath, O_RDONLY | PG_BINARY);
 
 		if (fd >= 0)
 		{
diff --git a/src/backend/catalog/dependency.c b/src/backend/catalog/dependency.c
index 6fffc290fa..b7e39af7a2 100644
--- a/src/backend/catalog/dependency.c
+++ b/src/backend/catalog/dependency.c
@@ -4,7 +4,7 @@
  *	  Routines to support inter-object dependencies.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -582,6 +582,7 @@ findDependentObjects(const ObjectAddress *object,
 				/* FALL THRU */
 
 			case DEPENDENCY_INTERNAL:
+			case DEPENDENCY_INTERNAL_AUTO:
 
 				/*
 				 * This object is part of the internal implementation of
@@ -633,6 +634,14 @@ findDependentObjects(const ObjectAddress *object,
 				 * transform this deletion request into a delete of this
 				 * owning object.
 				 *
+				 * For INTERNAL_AUTO dependencies, we don't enforce this;
+				 * in other words, we don't follow the links back to the
+				 * owning object.
+				 */
+				if (foundDep->deptype == DEPENDENCY_INTERNAL_AUTO)
+					break;
+
+				/*
 				 * First, release caller's lock on this object and get
 				 * deletion lock on the owning object.  (We must release
 				 * caller's lock to avoid deadlock against a concurrent
@@ -675,6 +684,7 @@ findDependentObjects(const ObjectAddress *object,
 				/* And we're done here. */
 				systable_endscan(scan);
 				return;
+
 			case DEPENDENCY_PIN:
 
 				/*
@@ -762,6 +772,7 @@ findDependentObjects(const ObjectAddress *object,
 			case DEPENDENCY_AUTO_EXTENSION:
 				subflags = DEPFLAG_AUTO;
 				break;
+			case DEPENDENCY_INTERNAL_AUTO:
 			case DEPENDENCY_INTERNAL:
 				subflags = DEPFLAG_INTERNAL;
 				break;
@@ -1109,7 +1120,8 @@ doDeletion(const ObjectAddress *object, int flags)
 			{
 				char		relKind = get_rel_relkind(object->objectId);
 
-				if (relKind == RELKIND_INDEX)
+				if (relKind == RELKIND_INDEX ||
+					relKind == RELKIND_PARTITIONED_INDEX)
 				{
 					bool		concurrent = ((flags & PERFORM_DELETION_CONCURRENTLY) != 0);
 
@@ -1713,6 +1725,51 @@ find_expr_references_walker(Node *node,
 		/* Extra work needed here if we ever need this case */
 		elog(ERROR, "already-planned subqueries not supported");
 	}
+	else if (IsA(node, FieldSelect))
+	{
+		FieldSelect *fselect = (FieldSelect *) node;
+		Oid			argtype = getBaseType(exprType((Node *) fselect->arg));
+		Oid			reltype = get_typ_typrelid(argtype);
+
+		/*
+		 * We need a dependency on the specific column named in FieldSelect,
+		 * assuming we can identify the pg_class OID for it.  (Probably we
+		 * always can at the moment, but in future it might be possible for
+		 * argtype to be RECORDOID.)  If we can make a column dependency then
+		 * we shouldn't need a dependency on the column's type; but if we
+		 * can't, make a dependency on the type, as it might not appear
+		 * anywhere else in the expression.
+		 */
+		if (OidIsValid(reltype))
+			add_object_address(OCLASS_CLASS, reltype, fselect->fieldnum,
+							   context->addrs);
+		else
+			add_object_address(OCLASS_TYPE, fselect->resulttype, 0,
+							   context->addrs);
+		/* the collation might not be referenced anywhere else, either */
+		if (OidIsValid(fselect->resultcollid) &&
+			fselect->resultcollid != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, fselect->resultcollid, 0,
+							   context->addrs);
+	}
+	else if (IsA(node, FieldStore))
+	{
+		FieldStore *fstore = (FieldStore *) node;
+		Oid			reltype = get_typ_typrelid(fstore->resulttype);
+
+		/* similar considerations to FieldSelect, but multiple column(s) */
+		if (OidIsValid(reltype))
+		{
+			ListCell   *l;
+
+			foreach(l, fstore->fieldnums)
+				add_object_address(OCLASS_CLASS, reltype, lfirst_int(l),
+								   context->addrs);
+		}
+		else
+			add_object_address(OCLASS_TYPE, fstore->resulttype, 0,
+							   context->addrs);
+	}
 	else if (IsA(node, RelabelType))
 	{
 		RelabelType *relab = (RelabelType *) node;
@@ -1733,16 +1790,24 @@ find_expr_references_walker(Node *node,
 		/* since there is no exposed function, need to depend on type */
 		add_object_address(OCLASS_TYPE, iocoerce->resulttype, 0,
 						   context->addrs);
+		/* the collation might not be referenced anywhere else, either */
+		if (OidIsValid(iocoerce->resultcollid) &&
+			iocoerce->resultcollid != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, iocoerce->resultcollid, 0,
+							   context->addrs);
 	}
 	else if (IsA(node, ArrayCoerceExpr))
 	{
 		ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) node;
 
-		if (OidIsValid(acoerce->elemfuncid))
-			add_object_address(OCLASS_PROC, acoerce->elemfuncid, 0,
-							   context->addrs);
+		/* as above, depend on type */
 		add_object_address(OCLASS_TYPE, acoerce->resulttype, 0,
 						   context->addrs);
+		/* the collation might not be referenced anywhere else, either */
+		if (OidIsValid(acoerce->resultcollid) &&
+			acoerce->resultcollid != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, acoerce->resultcollid, 0,
+							   context->addrs);
 		/* fall through to examine arguments */
 	}
 	else if (IsA(node, ConvertRowtypeExpr))
@@ -1818,6 +1883,22 @@ find_expr_references_walker(Node *node,
 							   context->addrs);
 		return false;
 	}
+	else if (IsA(node, WindowClause))
+	{
+		WindowClause *wc = (WindowClause *) node;
+
+		if (OidIsValid(wc->startInRangeFunc))
+			add_object_address(OCLASS_PROC, wc->startInRangeFunc, 0,
+							   context->addrs);
+		if (OidIsValid(wc->endInRangeFunc))
+			add_object_address(OCLASS_PROC, wc->endInRangeFunc, 0,
+							   context->addrs);
+		if (OidIsValid(wc->inRangeColl) &&
+			wc->inRangeColl != DEFAULT_COLLATION_OID)
+			add_object_address(OCLASS_COLLATION, wc->inRangeColl, 0,
+							   context->addrs);
+		/* fall through to examine substructure */
+	}
 	else if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
diff --git a/src/backend/catalog/genbki.pl b/src/backend/catalog/genbki.pl
index 2eebb061b7..ed90a02303 100644
--- a/src/backend/catalog/genbki.pl
+++ b/src/backend/catalog/genbki.pl
@@ -7,7 +7,7 @@
 #    header files.  The .bki files are used to initialize the postgres
 #    template database.
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/backend/catalog/genbki.pl
@@ -20,7 +20,7 @@
 use warnings;
 
 my @input_files;
-our @include_path;
+my @include_path;
 my $output_path = '';
 my $major_version;
 
@@ -87,9 +87,11 @@
 # NB: make sure that the files used here are known to be part of the .bki
 # file's dependencies by src/backend/catalog/Makefile.
 my $BOOTSTRAP_SUPERUSERID =
-  find_defined_symbol('pg_authid.h', 'BOOTSTRAP_SUPERUSERID');
+  Catalog::FindDefinedSymbol('pg_authid.h', \@include_path,
+							 'BOOTSTRAP_SUPERUSERID');
 my $PG_CATALOG_NAMESPACE =
-  find_defined_symbol('pg_namespace.h', 'PG_CATALOG_NAMESPACE');
+  Catalog::FindDefinedSymbol('pg_namespace.h', \@include_path,
+							 'PG_CATALOG_NAMESPACE');
 
 # Read all the input header files into internal data structures
 my $catalogs = Catalog::Catalogs(@input_files);
@@ -103,7 +105,7 @@
 my %schemapg_entries;
 my @tables_needing_macros;
 my %regprocoids;
-our @types;
+my %types;
 
 # produce output, one catalog at a time
 foreach my $catname (@{ $catalogs->{names} })
@@ -117,16 +119,15 @@
 	  . $catalog->{without_oids}
 	  . $catalog->{rowtype_oid} . "\n";
 
-	my %bki_attr;
 	my @attnames;
 	my $first = 1;
 
 	print $bki " (\n";
-	foreach my $column (@{ $catalog->{columns} })
+	my $schema = $catalog->{columns};
+	foreach my $column (@$schema)
 	{
 		my $attname = $column->{name};
 		my $atttype = $column->{type};
-		$bki_attr{$attname} = $column;
 		push @attnames, $attname;
 
 		if (!$first)
@@ -148,8 +149,9 @@
 	}
 	print $bki "\n )\n";
 
-   # open it, unless bootstrap case (create bootstrap does this automatically)
-	if ($catalog->{bootstrap} eq '')
+	# Open it, unless bootstrap case (create bootstrap does this
+	# automatically)
+	if (!$catalog->{bootstrap})
 	{
 		print $bki "open $catname\n";
 	}
@@ -167,21 +169,23 @@
 			  Catalog::SplitDataLine($row->{bki_values});
 
 			# Perform required substitutions on fields
-			foreach my $att (keys %bki_values)
+			foreach my $column (@$schema)
 			{
+				my $attname = $column->{name};
+				my $atttype = $column->{type};
 
 				# Substitute constant values we acquired above.
 				# (It's intentional that this can apply to parts of a field).
-				$bki_values{$att} =~ s/\bPGUID\b/$BOOTSTRAP_SUPERUSERID/g;
-				$bki_values{$att} =~ s/\bPGNSP\b/$PG_CATALOG_NAMESPACE/g;
+				$bki_values{$attname} =~ s/\bPGUID\b/$BOOTSTRAP_SUPERUSERID/g;
+				$bki_values{$attname} =~ s/\bPGNSP\b/$PG_CATALOG_NAMESPACE/g;
 
 				# Replace regproc columns' values with OIDs.
 				# If we don't have a unique value to substitute,
 				# just do nothing (regprocin will complain).
-				if ($bki_attr{$att}->{type} eq 'regproc')
+				if ($atttype eq 'regproc')
 				{
-					my $procoid = $regprocoids{ $bki_values{$att} };
-					$bki_values{$att} = $procoid
+					my $procoid = $regprocoids{ $bki_values{$attname} };
+					$bki_values{$attname} = $procoid
 					  if defined($procoid) && $procoid ne 'MULTIPLE';
 				}
 			}
@@ -205,7 +209,7 @@
 			{
 				my %type = %bki_values;
 				$type{oid} = $row->{oid};
-				push @types, \%type;
+				$types{ $type{typname} } = \%type;
 			}
 
 			# Write to postgres.bki
@@ -213,16 +217,17 @@
 			printf $bki "insert %s( %s )\n", $oid,
 			  join(' ', @bki_values{@attnames});
 
-		   # Write comments to postgres.description and postgres.shdescription
+			# Write comments to postgres.description and
+			# postgres.shdescription
 			if (defined $row->{descr})
 			{
-				printf $descr "%s\t%s\t0\t%s\n", $row->{oid}, $catname,
-				  $row->{descr};
+				printf $descr "%s\t%s\t0\t%s\n",
+				  $row->{oid}, $catname, $row->{descr};
 			}
 			if (defined $row->{shdescr})
 			{
-				printf $shdescr "%s\t%s\t%s\n", $row->{oid}, $catname,
-				  $row->{shdescr};
+				printf $shdescr "%s\t%s\t%s\n",
+				  $row->{oid}, $catname, $row->{shdescr};
 			}
 		}
 	}
@@ -238,43 +243,37 @@
 
 			# Currently, all bootstrapped relations also need schemapg.h
 			# entries, so skip if the relation isn't to be in schemapg.h.
-			next if $table->{schema_macro} ne 'True';
+			next if !$table->{schema_macro};
 
 			$schemapg_entries{$table_name} = [];
 			push @tables_needing_macros, $table_name;
-			my $is_bootstrap = $table->{bootstrap};
 
 			# Generate entries for user attributes.
 			my $attnum       = 0;
 			my $priornotnull = 1;
-			my @user_attrs   = @{ $table->{columns} };
-			foreach my $attr (@user_attrs)
+			foreach my $attr (@{ $table->{columns} })
 			{
 				$attnum++;
-				my $row = emit_pgattr_row($table_name, $attr, $priornotnull);
-				$row->{attnum}        = $attnum;
-				$row->{attstattarget} = '-1';
-				$priornotnull &= ($row->{attnotnull} eq 't');
+				my %row;
+				$row{attnum}   = $attnum;
+				$row{attrelid} = $table->{relation_oid};
+
+				morph_row_for_pgattr(\%row, $schema, $attr, $priornotnull);
+				$priornotnull &= ($row{attnotnull} eq 't');
 
 				# If it's bootstrapped, put an entry in postgres.bki.
-				if ($is_bootstrap eq ' bootstrap')
-				{
-					bki_insert($row, @attnames);
-				}
+				print_bki_insert(\%row, @attnames) if $table->{bootstrap};
 
 				# Store schemapg entries for later.
-				$row =
-				  emit_schemapg_row($row,
-					grep { $bki_attr{$_}{type} eq 'bool' } @attnames);
-				push @{ $schemapg_entries{$table_name} }, '{ '
-				  . join(
-					', ',             grep { defined $_ }
-					  map $row->{$_}, @attnames) . ' }';
+				morph_row_for_schemapg(\%row, $schema);
+				push @{ $schemapg_entries{$table_name} },
+				  sprintf "{ %s }",
+				    join(', ', grep { defined $_ } @row{@attnames});
 			}
 
 			# Generate entries for system attributes.
 			# We only need postgres.bki entries, not schemapg.h entries.
-			if ($is_bootstrap eq ' bootstrap')
+			if ($table->{bootstrap})
 			{
 				$attnum = 0;
 				my @SYS_ATTRS = (
@@ -288,16 +287,18 @@
 				foreach my $attr (@SYS_ATTRS)
 				{
 					$attnum--;
-					my $row = emit_pgattr_row($table_name, $attr, 1);
-					$row->{attnum}        = $attnum;
-					$row->{attstattarget} = '0';
+					my %row;
+					$row{attnum}        = $attnum;
+					$row{attrelid}      = $table->{relation_oid};
+					$row{attstattarget} = '0';
 
-					# some catalogs don't have oids
+					# Omit the oid column if the catalog doesn't have them
 					next
-					  if $table->{without_oids} eq ' without_oids'
-						  && $row->{attname} eq 'oid';
+					  if $table->{without_oids}
+						  && $attr->{name} eq 'oid';
 
-					bki_insert($row, @attnames);
+					morph_row_for_pgattr(\%row, $schema, $attr, 1);
+					print_bki_insert(\%row, @attnames);
 				}
 			}
 		}
@@ -330,7 +331,7 @@
  * schemapg.h
  *    Schema_pg_xxx macros for use by relcache.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -338,7 +339,7 @@
  *  *** DO NOT EDIT THIS FILE! ***
  *  ******************************
  *
- *  It has been GENERATED by $0
+ *  It has been GENERATED by src/backend/catalog/genbki.pl
  *
  *-------------------------------------------------------------------------
  */
@@ -374,158 +375,122 @@
 #################### Subroutines ########################
 
 
-# Given a system catalog name and a reference to a key-value pair corresponding
-# to the name and type of a column, generate a reference to a hash that
-# represents a pg_attribute entry.  We must also be told whether preceding
-# columns were all not-null.
-sub emit_pgattr_row
+# Given $pgattr_schema (the pg_attribute schema for a catalog sufficient for
+# AddDefaultValues), $attr (the description of a catalog row), and
+# $priornotnull (whether all prior attributes in this catalog are not null),
+# modify the $row hashref for print_bki_insert.  This includes setting data
+# from the corresponding pg_type element and filling in any default values.
+# Any value not handled here must be supplied by caller.
+sub morph_row_for_pgattr
 {
-	my ($table_name, $attr, $priornotnull) = @_;
+	my ($row, $pgattr_schema, $attr, $priornotnull) = @_;
 	my $attname = $attr->{name};
 	my $atttype = $attr->{type};
-	my %row;
 
-	$row{attrelid} = $catalogs->{$table_name}->{relation_oid};
-	$row{attname}  = $attname;
+	$row->{attname} = $attname;
 
-	# Adjust type name for arrays: foo[] becomes _foo
-	# so we can look it up in pg_type
-	if ($atttype =~ /(.+)\[\]$/)
-	{
-		$atttype = '_' . $1;
-	}
+	# Adjust type name for arrays: foo[] becomes _foo, so we can look it up in
+	# pg_type
+	$atttype = '_' . $1 if $atttype =~ /(.+)\[\]$/;
 
 	# Copy the type data from pg_type, and add some type-dependent items
-	foreach my $type (@types)
-	{
-		if (defined $type->{typname} && $type->{typname} eq $atttype)
-		{
-			$row{atttypid}   = $type->{oid};
-			$row{attlen}     = $type->{typlen};
-			$row{attbyval}   = $type->{typbyval};
-			$row{attstorage} = $type->{typstorage};
-			$row{attalign}   = $type->{typalign};
+	my $type = $types{$atttype};
 
-			# set attndims if it's an array type
-			$row{attndims} = $type->{typcategory} eq 'A' ? '1' : '0';
-			$row{attcollation} = $type->{typcollation};
+	$row->{atttypid}   = $type->{oid};
+	$row->{attlen}     = $type->{typlen};
+	$row->{attbyval}   = $type->{typbyval};
+	$row->{attstorage} = $type->{typstorage};
+	$row->{attalign}   = $type->{typalign};
 
-			if (defined $attr->{forcenotnull})
-			{
-				$row{attnotnull} = 't';
-			}
-			elsif (defined $attr->{forcenull})
-			{
-				$row{attnotnull} = 'f';
-			}
-			elsif ($priornotnull)
-			{
+	# set attndims if it's an array type
+	$row->{attndims} = $type->{typcategory} eq 'A' ? '1' : '0';
+	$row->{attcollation} = $type->{typcollation};
 
-				# attnotnull will automatically be set if the type is
-				# fixed-width and prior columns are all NOT NULL ---
-				# compare DefineAttr in bootstrap.c. oidvector and
-				# int2vector are also treated as not-nullable.
-				$row{attnotnull} =
-				    $type->{typname} eq 'oidvector'   ? 't'
-				  : $type->{typname} eq 'int2vector'  ? 't'
-				  : $type->{typlen}  eq 'NAMEDATALEN' ? 't'
-				  : $type->{typlen} > 0 ? 't'
-				  :                       'f';
-			}
-			else
-			{
-				$row{attnotnull} = 'f';
-			}
-			last;
-		}
+	if (defined $attr->{forcenotnull})
+	{
+		$row->{attnotnull} = 't';
+	}
+	elsif (defined $attr->{forcenull})
+	{
+		$row->{attnotnull} = 'f';
 	}
+	elsif ($priornotnull)
+	{
 
-	# Add in default values for pg_attribute
-	my %PGATTR_DEFAULTS = (
-		attcacheoff   => '-1',
-		atttypmod     => '-1',
-		atthasdef     => 'f',
-		attidentity   => '',
-		attisdropped  => 'f',
-		attislocal    => 't',
-		attinhcount   => '0',
-		attacl        => '_null_',
-		attoptions    => '_null_',
-		attfdwoptions => '_null_');
-	return { %PGATTR_DEFAULTS, %row };
+		# attnotnull will automatically be set if the type is
+		# fixed-width and prior columns are all NOT NULL ---
+		# compare DefineAttr in bootstrap.c. oidvector and
+		# int2vector are also treated as not-nullable.
+		$row->{attnotnull} =
+		$type->{typname} eq 'oidvector'   ? 't'
+		: $type->{typname} eq 'int2vector'  ? 't'
+		: $type->{typlen}  eq 'NAMEDATALEN' ? 't'
+		: $type->{typlen} > 0 ? 't'
+		:                       'f';
+	}
+	else
+	{
+		$row->{attnotnull} = 'f';
+	}
+
+	my $error = Catalog::AddDefaultValues($row, $pgattr_schema);
+	if ($error)
+	{
+		die "Failed to form full tuple for pg_attribute: ", $error;
+	}
 }
 
 # Write a pg_attribute entry to postgres.bki
-sub bki_insert
+sub print_bki_insert
 {
 	my $row        = shift;
 	my @attnames   = @_;
 	my $oid        = $row->{oid} ? "OID = $row->{oid} " : '';
-	my $bki_values = join ' ', map { $_ eq '' ? '""' : $_ } map $row->{$_},
-	  @attnames;
+	my $bki_values = join ' ', @{$row}{@attnames};
 	printf $bki "insert %s( %s )\n", $oid, $bki_values;
 }
 
+# Given a row reference, modify it so that it becomes a valid entry for
+# a catalog schema declaration in schemapg.h.
+#
 # The field values of a Schema_pg_xxx declaration are similar, but not
 # quite identical, to the corresponding values in postgres.bki.
-sub emit_schemapg_row
+sub morph_row_for_schemapg
 {
-	my $row        = shift;
-	my @bool_attrs = @_;
-
-	# Replace empty string by zero char constant
-	$row->{attidentity} ||= '\0';
-
-	# Supply appropriate quoting for these fields.
-	$row->{attname}     = q|{"| . $row->{attname} . q|"}|;
-	$row->{attstorage}  = q|'| . $row->{attstorage} . q|'|;
-	$row->{attalign}    = q|'| . $row->{attalign} . q|'|;
-	$row->{attidentity} = q|'| . $row->{attidentity} . q|'|;
-
-	# We don't emit initializers for the variable length fields at all.
-	# Only the fixed-size portions of the descriptors are ever used.
-	delete $row->{attacl};
-	delete $row->{attoptions};
-	delete $row->{attfdwoptions};
-
-	# Expand booleans from 'f'/'t' to 'false'/'true'.
-	# Some values might be other macros (eg FLOAT4PASSBYVAL), don't change.
-	foreach my $attr (@bool_attrs)
-	{
-		$row->{$attr} =
-		    $row->{$attr} eq 't' ? 'true'
-		  : $row->{$attr} eq 'f' ? 'false'
-		  :                        $row->{$attr};
-	}
-	return $row;
-}
+	my $row           = shift;
+	my $pgattr_schema = shift;
 
-# Find a symbol defined in a particular header file and extract the value.
-sub find_defined_symbol
-{
-	my ($catalog_header, $symbol) = @_;
-	for my $path (@include_path)
+	foreach my $column (@$pgattr_schema)
 	{
+		my $attname = $column->{name};
+		my $atttype = $column->{type};
 
-		# Make sure include path ends in a slash.
-		if (substr($path, -1) ne '/')
+		# Some data types have special formatting rules.
+		if ($atttype eq 'name')
 		{
-			$path .= '/';
+			# add {" ... "} quoting
+			$row->{$attname} = sprintf(qq'{"%s"}', $row->{$attname});
 		}
-		my $file = $path . $catalog_header;
-		next if !-f $file;
-		open(my $find_defined_symbol, '<', $file) || die "$file: $!";
-		while (<$find_defined_symbol>)
+		elsif ($atttype eq 'char')
 		{
-			if (/^#define\s+\Q$symbol\E\s+(\S+)/)
-			{
-				return $1;
-			}
+			# Replace empty string by zero char constant; add single quotes
+			$row->{$attname} = '\0' if $row->{$attname} eq q|""|;
+			$row->{$attname} = sprintf("'%s'", $row->{$attname});
 		}
-		close $find_defined_symbol;
-		die "$file: no definition found for $symbol\n";
+
+		# Expand booleans from 'f'/'t' to 'false'/'true'.
+		# Some values might be other macros (eg FLOAT4PASSBYVAL),
+		# don't change.
+		elsif ($atttype eq 'bool')
+		{
+			$row->{$attname} = 'true' if $row->{$attname} eq 't';
+			$row->{$attname} = 'false' if $row->{$attname} eq 'f';
+		}
+
+		# We don't emit initializers for the variable length fields at all.
+		# Only the fixed-size portions of the descriptors are ever used.
+		delete $row->{$attname} if $column->{is_varlen};
 	}
-	die "$catalog_header: not found in any include directory\n";
 }
 
 sub usage
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
index a376b99f1e..cf36ce4add 100644
--- a/src/backend/catalog/heap.c
+++ b/src/backend/catalog/heap.c
@@ -3,7 +3,7 @@
  * heap.c
  *	  code to create and destroy POSTGRES heap relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -103,12 +103,12 @@ static ObjectAddress AddNewRelationType(const char *typeName,
 				   Oid new_row_type,
 				   Oid new_array_type);
 static void RelationRemoveInheritance(Oid relid);
-static Oid StoreRelCheck(Relation rel, char *ccname, Node *expr,
+static Oid StoreRelCheck(Relation rel, const char *ccname, Node *expr,
 			  bool is_validated, bool is_local, int inhcount,
 			  bool is_no_inherit, bool is_internal);
 static void StoreConstraints(Relation rel, List *cooked_constraints,
 				 bool is_internal);
-static bool MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
+static bool MergeWithExistingConstraint(Relation rel, const char *ccname, Node *expr,
 							bool allow_merge, bool is_local,
 							bool is_initially_valid,
 							bool is_no_inherit);
@@ -294,6 +294,7 @@ heap_create(const char *relname,
 		case RELKIND_COMPOSITE_TYPE:
 		case RELKIND_FOREIGN_TABLE:
 		case RELKIND_PARTITIONED_TABLE:
+		case RELKIND_PARTITIONED_INDEX:
 			create_storage = false;
 
 			/*
@@ -431,12 +432,14 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
 	{
 		for (i = 0; i < natts; i++)
 		{
-			if (SystemAttributeByName(NameStr(tupdesc->attrs[i]->attname),
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+			if (SystemAttributeByName(NameStr(attr->attname),
 									  tupdesc->tdhasoid) != NULL)
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_COLUMN),
 						 errmsg("column name \"%s\" conflicts with a system column name",
-								NameStr(tupdesc->attrs[i]->attname))));
+								NameStr(attr->attname))));
 		}
 	}
 
@@ -447,12 +450,12 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
 	{
 		for (j = 0; j < i; j++)
 		{
-			if (strcmp(NameStr(tupdesc->attrs[j]->attname),
-					   NameStr(tupdesc->attrs[i]->attname)) == 0)
+			if (strcmp(NameStr(TupleDescAttr(tupdesc, j)->attname),
+					   NameStr(TupleDescAttr(tupdesc, i)->attname)) == 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_DUPLICATE_COLUMN),
 						 errmsg("column name \"%s\" specified more than once",
-								NameStr(tupdesc->attrs[j]->attname))));
+								NameStr(TupleDescAttr(tupdesc, j)->attname))));
 		}
 	}
 
@@ -461,9 +464,9 @@ CheckAttributeNamesTypes(TupleDesc tupdesc, char relkind,
 	 */
 	for (i = 0; i < natts; i++)
 	{
-		CheckAttributeType(NameStr(tupdesc->attrs[i]->attname),
-						   tupdesc->attrs[i]->atttypid,
-						   tupdesc->attrs[i]->attcollation,
+		CheckAttributeType(NameStr(TupleDescAttr(tupdesc, i)->attname),
+						   TupleDescAttr(tupdesc, i)->atttypid,
+						   TupleDescAttr(tupdesc, i)->attcollation,
 						   NIL, /* assume we're creating a new rowtype */
 						   allow_system_table_mods);
 	}
@@ -545,7 +548,7 @@ CheckAttributeType(const char *attname,
 
 		for (i = 0; i < tupdesc->natts; i++)
 		{
-			Form_pg_attribute attr = tupdesc->attrs[i];
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
 			if (attr->attisdropped)
 				continue;
@@ -678,7 +681,7 @@ AddNewAttributeTuples(Oid new_rel_oid,
 	 */
 	for (i = 0; i < natts; i++)
 	{
-		attr = tupdesc->attrs[i];
+		attr = TupleDescAttr(tupdesc, i);
 		/* Fill in the correct relation OID */
 		attr->attrelid = new_rel_oid;
 		/* Make sure these are OK, too */
@@ -998,15 +1001,15 @@ AddNewRelationType(const char *typeName,
  *	cooked_constraints: list of precooked check constraints and defaults
  *	relkind: relkind for new rel
  *	relpersistence: rel's persistence status (permanent, temp, or unlogged)
- *	shared_relation: TRUE if it's to be a shared relation
- *	mapped_relation: TRUE if the relation will use the relfilenode map
- *	oidislocal: TRUE if oid column (if any) should be marked attislocal
+ *	shared_relation: true if it's to be a shared relation
+ *	mapped_relation: true if the relation will use the relfilenode map
+ *	oidislocal: true if oid column (if any) should be marked attislocal
  *	oidinhcount: attinhcount to assign to oid column (if any)
  *	oncommit: ON COMMIT marking (only relevant if it's a temp table)
  *	reloptions: reloptions in Datum form, or (Datum) 0 if none
- *	use_user_acl: TRUE if should look for user-defined default permissions;
- *		if FALSE, relacl is always set NULL
- *	allow_system_table_mods: TRUE to allow creation in system namespaces
+ *	use_user_acl: true if should look for user-defined default permissions;
+ *		if false, relacl is always set NULL
+ *	allow_system_table_mods: true to allow creation in system namespaces
  *	is_internal: is this a system-generated catalog?
  *
  * Output parameters:
@@ -1140,11 +1143,11 @@ heap_create_with_catalog(const char *relname,
 			case RELKIND_MATVIEW:
 			case RELKIND_FOREIGN_TABLE:
 			case RELKIND_PARTITIONED_TABLE:
-				relacl = get_user_default_acl(ACL_OBJECT_RELATION, ownerid,
+				relacl = get_user_default_acl(OBJECT_TABLE, ownerid,
 											  relnamespace);
 				break;
 			case RELKIND_SEQUENCE:
-				relacl = get_user_default_acl(ACL_OBJECT_SEQUENCE, ownerid,
+				relacl = get_user_default_acl(OBJECT_SEQUENCE, ownerid,
 											  relnamespace);
 				break;
 			default:
@@ -1757,7 +1760,8 @@ heap_drop_with_catalog(Oid relid)
 {
 	Relation	rel;
 	HeapTuple	tuple;
-	Oid			parentOid = InvalidOid;
+	Oid			parentOid = InvalidOid,
+				defaultPartOid = InvalidOid;
 
 	/*
 	 * To drop a partition safely, we must grab exclusive lock on its parent,
@@ -1769,10 +1773,20 @@ heap_drop_with_catalog(Oid relid)
 	 * shared-cache-inval notice that will make them update their index lists.
 	 */
 	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relid));
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for relation %u", relid);
 	if (((Form_pg_class) GETSTRUCT(tuple))->relispartition)
 	{
 		parentOid = get_partition_parent(relid);
 		LockRelationOid(parentOid, AccessExclusiveLock);
+
+		/*
+		 * If this is not the default partition, dropping it will change the
+		 * default partition's partition constraint, so we must lock it.
+		 */
+		defaultPartOid = get_default_partition_oid(parentOid);
+		if (OidIsValid(defaultPartOid) && relid != defaultPartOid)
+			LockRelationOid(defaultPartOid, AccessExclusiveLock);
 	}
 
 	ReleaseSysCache(tuple);
@@ -1823,6 +1837,13 @@ heap_drop_with_catalog(Oid relid)
 	if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
 		RemovePartitionKeyByRelId(relid);
 
+	/*
+	 * If the relation being dropped is the default partition itself,
+	 * invalidate its entry in pg_partitioned_table.
+	 */
+	if (relid == defaultPartOid)
+		update_default_partition_oid(parentOid, InvalidOid);
+
 	/*
 	 * Schedule unlinking of the relation's physical files at commit.
 	 */
@@ -1882,6 +1903,14 @@ heap_drop_with_catalog(Oid relid)
 
 	if (OidIsValid(parentOid))
 	{
+		/*
+		 * If this is not the default partition, the partition constraint of
+		 * the default partition has changed to include the portion of the key
+		 * space previously covered by the dropped partition.
+		 */
+		if (OidIsValid(defaultPartOid) && relid != defaultPartOid)
+			CacheInvalidateRelcacheByRelid(defaultPartOid);
+
 		/*
 		 * Invalidate the parent's relcache so that the partition is no longer
 		 * included in its partition descriptor.
@@ -2011,7 +2040,7 @@ StoreAttrDefault(Relation rel, AttrNumber attnum,
  * The OID of the new constraint is returned.
  */
 static Oid
-StoreRelCheck(Relation rel, char *ccname, Node *expr,
+StoreRelCheck(Relation rel, const char *ccname, Node *expr,
 			  bool is_validated, bool is_local, int inhcount,
 			  bool is_no_inherit, bool is_internal)
 {
@@ -2182,9 +2211,9 @@ StoreConstraints(Relation rel, List *cooked_constraints, bool is_internal)
  * rel: relation to be modified
  * newColDefaults: list of RawColumnDefault structures
  * newConstraints: list of Constraint nodes
- * allow_merge: TRUE if check constraints may be merged with existing ones
- * is_local: TRUE if definition is local, FALSE if it's inherited
- * is_internal: TRUE if result of some internal process, not a user request
+ * allow_merge: true if check constraints may be merged with existing ones
+ * is_local: true if definition is local, false if it's inherited
+ * is_internal: true if result of some internal process, not a user request
  *
  * All entries in newColDefaults will be processed.  Entries in newConstraints
  * will be processed only if they are CONSTR_CHECK type.
@@ -2245,7 +2274,7 @@ AddRelationNewConstraints(Relation rel,
 	foreach(cell, newColDefaults)
 	{
 		RawColumnDefault *colDef = (RawColumnDefault *) lfirst(cell);
-		Form_pg_attribute atp = rel->rd_att->attrs[colDef->attnum - 1];
+		Form_pg_attribute atp = TupleDescAttr(rel->rd_att, colDef->attnum - 1);
 		Oid			defOid;
 
 		expr = cookDefault(pstate, colDef->raw_default,
@@ -2376,7 +2405,8 @@ AddRelationNewConstraints(Relation rel,
 
 			if (list_length(vars) == 1)
 				colname = get_attname(RelationGetRelid(rel),
-									  ((Var *) linitial(vars))->varattno);
+									  ((Var *) linitial(vars))->varattno,
+									  true);
 			else
 				colname = NULL;
 
@@ -2429,13 +2459,13 @@ AddRelationNewConstraints(Relation rel,
  * new one, and either adjust its conislocal/coninhcount settings or throw
  * error as needed.
  *
- * Returns TRUE if merged (constraint is a duplicate), or FALSE if it's
+ * Returns true if merged (constraint is a duplicate), or false if it's
  * got a so-far-unique name, or throws error if conflict.
  *
  * XXX See MergeConstraintsIntoExisting too if you change this code.
  */
 static bool
-MergeWithExistingConstraint(Relation rel, char *ccname, Node *expr,
+MergeWithExistingConstraint(Relation rel, const char *ccname, Node *expr,
 							bool allow_merge, bool is_local,
 							bool is_initially_valid,
 							bool is_no_inherit)
@@ -2632,7 +2662,7 @@ cookDefault(ParseState *pstate,
 			Node *raw_default,
 			Oid atttypid,
 			int32 atttypmod,
-			char *attname)
+			const char *attname)
 {
 	Node	   *expr;
 
@@ -2812,7 +2842,7 @@ RelationTruncateIndexes(Relation heapRelation)
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, currentIndex, indexInfo, false, true);
+		index_build(heapRelation, currentIndex, indexInfo, false, true, false);
 
 		/* We're done with this index */
 		index_close(currentIndex, NoLock);
@@ -3105,9 +3135,6 @@ StorePartitionKey(Relation rel,
 
 	Assert(rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
 
-	tuple = SearchSysCache1(PARTRELID,
-							ObjectIdGetDatum(RelationGetRelid(rel)));
-
 	/* Copy the partition attribute numbers, opclass OIDs into arrays */
 	partattrs_vec = buildint2vector(partattrs, partnatts);
 	partopclass_vec = buildoidvector(partopclass, partnatts);
@@ -3136,6 +3163,7 @@ StorePartitionKey(Relation rel,
 	values[Anum_pg_partitioned_table_partrelid - 1] = ObjectIdGetDatum(RelationGetRelid(rel));
 	values[Anum_pg_partitioned_table_partstrat - 1] = CharGetDatum(strategy);
 	values[Anum_pg_partitioned_table_partnatts - 1] = Int16GetDatum(partnatts);
+	values[Anum_pg_partitioned_table_partdefid - 1] = ObjectIdGetDatum(InvalidOid);
 	values[Anum_pg_partitioned_table_partattrs - 1] = PointerGetDatum(partattrs_vec);
 	values[Anum_pg_partitioned_table_partclass - 1] = PointerGetDatum(partopclass_vec);
 	values[Anum_pg_partitioned_table_partcollation - 1] = PointerGetDatum(partcollation_vec);
@@ -3221,7 +3249,8 @@ RemovePartitionKeyByRelId(Oid relid)
  *		relispartition to true
  *
  * Also, invalidate the parent's relcache, so that the next rebuild will load
- * the new partition's info into its partition descriptor.
+ * the new partition's info into its partition descriptor.  If there is a
+ * default partition, we must invalidate its relcache entry as well.
  */
 void
 StorePartitionBound(Relation rel, Relation parent, PartitionBoundSpec *bound)
@@ -3232,6 +3261,7 @@ StorePartitionBound(Relation rel, Relation parent, PartitionBoundSpec *bound)
 	Datum		new_val[Natts_pg_class];
 	bool		new_null[Natts_pg_class],
 				new_repl[Natts_pg_class];
+	Oid			defaultPartOid;
 
 	/* Update pg_class tuple */
 	classRel = heap_open(RelationRelationId, RowExclusiveLock);
@@ -3269,5 +3299,15 @@ StorePartitionBound(Relation rel, Relation parent, PartitionBoundSpec *bound)
 	heap_freetuple(newtuple);
 	heap_close(classRel, RowExclusiveLock);
 
+	/*
+	 * The partition constraint for the default partition depends on the
+	 * partition bounds of every other partition, so we must invalidate the
+	 * relcache entry for that partition every time a partition is added or
+	 * removed.
+	 */
+	defaultPartOid = get_default_oid_from_partdesc(RelationGetPartitionDesc(parent));
+	if (OidIsValid(defaultPartOid))
+		CacheInvalidateRelcacheByRelid(defaultPartOid);
+
 	CacheInvalidateRelcache(parent);
 }
diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c
index 25c5bead9f..564f2069cf 100644
--- a/src/backend/catalog/index.c
+++ b/src/backend/catalog/index.c
@@ -3,7 +3,7 @@
  * index.c
  *	  code to create and destroy POSTGRES index relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -41,6 +41,8 @@
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint.h"
 #include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_depend.h"
+#include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_tablespace.h"
@@ -54,7 +56,9 @@
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
+#include "optimizer/planner.h"
 #include "parser/parser.h"
+#include "rewrite/rewriteManip.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "storage/predicate.h"
@@ -86,6 +90,18 @@ typedef struct
 				tups_inserted;
 } v_i_state;
 
+/*
+ * Pointer-free representation of variables used when reindexing system
+ * catalogs; we use this to propagate those values to parallel workers.
+ */
+typedef struct
+{
+	Oid			currentlyReindexedHeap;
+	Oid			currentlyReindexedIndex;
+	int			numPendingReindexedIndexes;
+	Oid			pendingReindexedIndexes[FLEXIBLE_ARRAY_MEMBER];
+} SerializedReindexState;
+
 /* non-export function prototypes */
 static bool relationHasPrimaryKey(Relation rel);
 static TupleDesc ConstructTupleDescriptor(Relation heapRelation,
@@ -98,6 +114,7 @@ static void InitializeAttributeOids(Relation indexRelation,
 						int numatts, Oid indexoid);
 static void AppendAttributeTuples(Relation indexRelation, int numatts);
 static void UpdateIndexRelation(Oid indexoid, Oid heapoid,
+					Oid parentIndexId,
 					IndexInfo *indexInfo,
 					Oid *collationOids,
 					Oid *classOids,
@@ -105,7 +122,8 @@ static void UpdateIndexRelation(Oid indexoid, Oid heapoid,
 					bool primary,
 					bool isexclusion,
 					bool immediate,
-					bool isvalid);
+					bool isvalid,
+					bool isready);
 static void index_update_stats(Relation rel,
 				   bool hasindex, bool isprimary,
 				   double reltuples);
@@ -307,7 +325,7 @@ ConstructTupleDescriptor(Relation heapRelation,
 	for (i = 0; i < numatts; i++)
 	{
 		AttrNumber	atnum = indexInfo->ii_KeyAttrNumbers[i];
-		Form_pg_attribute to = indexTupDesc->attrs[i];
+		Form_pg_attribute to = TupleDescAttr(indexTupDesc, i);
 		HeapTuple	tuple;
 		Form_pg_type typeTup;
 		Form_pg_opclass opclassTup;
@@ -333,7 +351,8 @@ ConstructTupleDescriptor(Relation heapRelation,
 				 */
 				if (atnum > natts)	/* safety check */
 					elog(ERROR, "invalid column number %d", atnum);
-				from = heapTupDesc->attrs[AttrNumberGetAttrOffset(atnum)];
+				from = TupleDescAttr(heapTupDesc,
+									 AttrNumberGetAttrOffset(atnum));
 			}
 
 			/*
@@ -495,7 +514,7 @@ InitializeAttributeOids(Relation indexRelation,
 	tupleDescriptor = RelationGetDescr(indexRelation);
 
 	for (i = 0; i < numatts; i += 1)
-		tupleDescriptor->attrs[i]->attrelid = indexoid;
+		TupleDescAttr(tupleDescriptor, i)->attrelid = indexoid;
 }
 
 /* ----------------------------------------------------------------
@@ -524,14 +543,16 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
 
 	for (i = 0; i < numatts; i++)
 	{
+		Form_pg_attribute attr = TupleDescAttr(indexTupDesc, i);
+
 		/*
 		 * There used to be very grotty code here to set these fields, but I
 		 * think it's unnecessary.  They should be set already.
 		 */
-		Assert(indexTupDesc->attrs[i]->attnum == i + 1);
-		Assert(indexTupDesc->attrs[i]->attcacheoff == -1);
+		Assert(attr->attnum == i + 1);
+		Assert(attr->attcacheoff == -1);
 
-		InsertPgAttributeTuple(pg_attribute, indexTupDesc->attrs[i], indstate);
+		InsertPgAttributeTuple(pg_attribute, attr, indstate);
 	}
 
 	CatalogCloseIndexes(indstate);
@@ -548,6 +569,7 @@ AppendAttributeTuples(Relation indexRelation, int numatts)
 static void
 UpdateIndexRelation(Oid indexoid,
 					Oid heapoid,
+					Oid parentIndexOid,
 					IndexInfo *indexInfo,
 					Oid *collationOids,
 					Oid *classOids,
@@ -555,7 +577,8 @@ UpdateIndexRelation(Oid indexoid,
 					bool primary,
 					bool isexclusion,
 					bool immediate,
-					bool isvalid)
+					bool isvalid,
+					bool isready)
 {
 	int2vector *indkey;
 	oidvector  *indcollation;
@@ -629,8 +652,7 @@ UpdateIndexRelation(Oid indexoid,
 	values[Anum_pg_index_indisclustered - 1] = BoolGetDatum(false);
 	values[Anum_pg_index_indisvalid - 1] = BoolGetDatum(isvalid);
 	values[Anum_pg_index_indcheckxmin - 1] = BoolGetDatum(false);
-	/* we set isvalid and isready the same way */
-	values[Anum_pg_index_indisready - 1] = BoolGetDatum(isvalid);
+	values[Anum_pg_index_indisready - 1] = BoolGetDatum(isready);
 	values[Anum_pg_index_indislive - 1] = BoolGetDatum(true);
 	values[Anum_pg_index_indisreplident - 1] = BoolGetDatum(false);
 	values[Anum_pg_index_indkey - 1] = PointerGetDatum(indkey);
@@ -667,6 +689,10 @@ UpdateIndexRelation(Oid indexoid,
  * indexRelationId: normally, pass InvalidOid to let this routine
  *		generate an OID for the index.  During bootstrap this may be
  *		nonzero to specify a preselected OID.
+ * parentIndexRelid: if creating an index partition, the OID of the
+ *		parent index; otherwise InvalidOid.
+ * parentConstraintId: if creating a constraint on a partition, the OID
+ *		of the constraint in the parent; otherwise InvalidOid.
  * relFileNode: normally, pass InvalidOid to get new storage.  May be
  *		nonzero to attach an existing valid build.
  * indexInfo: same info executor uses to insert into the index
@@ -677,19 +703,28 @@ UpdateIndexRelation(Oid indexoid,
  * classObjectId: array of index opclass OIDs, one per index column
  * coloptions: array of per-index-column indoption settings
  * reloptions: AM-specific options
- * isprimary: index is a PRIMARY KEY
- * isconstraint: index is owned by PRIMARY KEY, UNIQUE, or EXCLUSION constraint
- * deferrable: constraint is DEFERRABLE
- * initdeferred: constraint is INITIALLY DEFERRED
+ * flags: bitmask that can include any combination of these bits:
+ *		INDEX_CREATE_IS_PRIMARY
+ *			the index is a primary key
+ *		INDEX_CREATE_ADD_CONSTRAINT:
+ *			invoke index_constraint_create also
+ *		INDEX_CREATE_SKIP_BUILD:
+ *			skip the index_build() step for the moment; caller must do it
+ *			later (typically via reindex_index())
+ *		INDEX_CREATE_CONCURRENT:
+ *			do not lock the table against writers.  The index will be
+ *			marked "invalid" and the caller must take additional steps
+ *			to fix it up.
+ *		INDEX_CREATE_IF_NOT_EXISTS:
+ *			do not throw an error if a relation with the same name
+ *			already exists.
+ *		INDEX_CREATE_PARTITIONED:
+ *			create a partitioned index (table must be partitioned)
+ * constr_flags: flags passed to index_constraint_create
+ *		(only if INDEX_CREATE_ADD_CONSTRAINT is set)
  * allow_system_table_mods: allow table to be a system catalog
- * skip_build: true to skip the index_build() step for the moment; caller
- *		must do it later (typically via reindex_index())
- * concurrent: if true, do not lock the table against writers.  The index
- *		will be marked "invalid" and the caller must take additional steps
- *		to fix it up.
  * is_internal: if true, post creation hook for new index
- * if_not_exists: if true, do not throw an error if a relation with
- *		the same name already exists.
+ * constraintId: if not NULL, receives OID of created constraint
  *
  * Returns the OID of the created index.
  */
@@ -697,6 +732,8 @@ Oid
 index_create(Relation heapRelation,
 			 const char *indexRelationName,
 			 Oid indexRelationId,
+			 Oid parentIndexRelid,
+			 Oid parentConstraintId,
 			 Oid relFileNode,
 			 IndexInfo *indexInfo,
 			 List *indexColNames,
@@ -706,15 +743,11 @@ index_create(Relation heapRelation,
 			 Oid *classObjectId,
 			 int16 *coloptions,
 			 Datum reloptions,
-			 bool isprimary,
-			 bool isconstraint,
-			 bool deferrable,
-			 bool initdeferred,
+			 bits16 flags,
+			 bits16 constr_flags,
 			 bool allow_system_table_mods,
-			 bool skip_build,
-			 bool concurrent,
 			 bool is_internal,
-			 bool if_not_exists)
+			 Oid *constraintId)
 {
 	Oid			heapRelationId = RelationGetRelid(heapRelation);
 	Relation	pg_class;
@@ -726,7 +759,19 @@ index_create(Relation heapRelation,
 	Oid			namespaceId;
 	int			i;
 	char		relpersistence;
-
+	bool		isprimary = (flags & INDEX_CREATE_IS_PRIMARY) != 0;
+	bool		invalid = (flags & INDEX_CREATE_INVALID) != 0;
+	bool		concurrent = (flags & INDEX_CREATE_CONCURRENT) != 0;
+	bool		partitioned = (flags & INDEX_CREATE_PARTITIONED) != 0;
+	char		relkind;
+
+	/* constraint flags can only be set when a constraint is requested */
+	Assert((constr_flags == 0) ||
+		   ((flags & INDEX_CREATE_ADD_CONSTRAINT) != 0));
+	/* partitioned indexes must never be "built" by themselves */
+	Assert(!partitioned || (flags & INDEX_CREATE_SKIP_BUILD));
+
+	relkind = partitioned ? RELKIND_PARTITIONED_INDEX : RELKIND_INDEX;
 	is_exclusion = (indexInfo->ii_ExclusionOps != NULL);
 
 	pg_class = heap_open(RelationRelationId, RowExclusiveLock);
@@ -791,7 +836,7 @@ index_create(Relation heapRelation,
 
 	if (get_relname_relid(indexRelationName, namespaceId))
 	{
-		if (if_not_exists)
+		if ((flags & INDEX_CREATE_IF_NOT_EXISTS) != 0)
 		{
 			ereport(NOTICE,
 					(errcode(ERRCODE_DUPLICATE_TABLE),
@@ -844,9 +889,9 @@ index_create(Relation heapRelation,
 	}
 
 	/*
-	 * create the index relation's relcache entry and physical disk file. (If
-	 * we fail further down, it's the smgr's responsibility to remove the disk
-	 * file again.)
+	 * create the index relation's relcache entry and, if necessary, the
+	 * physical disk file. (If we fail further down, it's the smgr's
+	 * responsibility to remove the disk file again, if any.)
 	 */
 	indexRelation = heap_create(indexRelationName,
 								namespaceId,
@@ -854,7 +899,7 @@ index_create(Relation heapRelation,
 								indexRelationId,
 								relFileNode,
 								indexTupDesc,
-								RELKIND_INDEX,
+								relkind,
 								relpersistence,
 								shared_relation,
 								mapped_relation,
@@ -863,7 +908,7 @@ index_create(Relation heapRelation,
 	Assert(indexRelationId == RelationGetRelid(indexRelation));
 
 	/*
-	 * Obtain exclusive lock on it.  Although no other backends can see it
+	 * Obtain exclusive lock on it.  Although no other transactions can see it
 	 * until we commit, this prevents deadlock-risk complaints from lock
 	 * manager in cases such as CLUSTER.
 	 */
@@ -911,12 +956,18 @@ index_create(Relation heapRelation,
 	 *	  (Or, could define a rule to maintain the predicate) --Nels, Feb '92
 	 * ----------------
 	 */
-	UpdateIndexRelation(indexRelationId, heapRelationId, indexInfo,
+	UpdateIndexRelation(indexRelationId, heapRelationId, parentIndexRelid,
+						indexInfo,
 						collationObjectId, classObjectId, coloptions,
 						isprimary, is_exclusion,
-						!deferrable,
+						(constr_flags & INDEX_CONSTR_CREATE_DEFERRABLE) == 0,
+						!concurrent && !invalid,
 						!concurrent);
 
+	/* update pg_inherits, if needed */
+	if (OidIsValid(parentIndexRelid))
+		StoreSingleInheritance(indexRelationId, parentIndexRelid, 1);
+
 	/*
 	 * Register constraint and dependencies for the index.
 	 *
@@ -940,9 +991,10 @@ index_create(Relation heapRelation,
 		myself.objectId = indexRelationId;
 		myself.objectSubId = 0;
 
-		if (isconstraint)
+		if ((flags & INDEX_CREATE_ADD_CONSTRAINT) != 0)
 		{
 			char		constraintType;
+			ObjectAddress localaddr;
 
 			if (isprimary)
 				constraintType = CONSTRAINT_PRIMARY;
@@ -956,22 +1008,24 @@ index_create(Relation heapRelation,
 				constraintType = 0; /* keep compiler quiet */
 			}
 
-			index_constraint_create(heapRelation,
+			localaddr = index_constraint_create(heapRelation,
 									indexRelationId,
+									parentConstraintId,
 									indexInfo,
 									indexRelationName,
 									constraintType,
-									deferrable,
-									initdeferred,
-									false,	/* already marked primary */
-									false,	/* pg_index entry is OK */
-									false,	/* no old dependencies */
+									constr_flags,
 									allow_system_table_mods,
 									is_internal);
+			if (constraintId)
+				*constraintId = localaddr.objectId;
 		}
 		else
 		{
 			bool		have_simple_col = false;
+			DependencyType	deptype;
+
+			deptype = OidIsValid(parentIndexRelid) ? DEPENDENCY_INTERNAL_AUTO : DEPENDENCY_AUTO;
 
 			/* Create auto dependencies on simply-referenced columns */
 			for (i = 0; i < indexInfo->ii_NumIndexAttrs; i++)
@@ -982,7 +1036,7 @@ index_create(Relation heapRelation,
 					referenced.objectId = heapRelationId;
 					referenced.objectSubId = indexInfo->ii_KeyAttrNumbers[i];
 
-					recordDependencyOn(&myself, &referenced, DEPENDENCY_AUTO);
+					recordDependencyOn(&myself, &referenced, deptype);
 
 					have_simple_col = true;
 				}
@@ -1000,12 +1054,18 @@ index_create(Relation heapRelation,
 				referenced.objectId = heapRelationId;
 				referenced.objectSubId = 0;
 
-				recordDependencyOn(&myself, &referenced, DEPENDENCY_AUTO);
+				recordDependencyOn(&myself, &referenced, deptype);
 			}
+		}
 
-			/* Non-constraint indexes can't be deferrable */
-			Assert(!deferrable);
-			Assert(!initdeferred);
+		/* Store dependency on parent index, if any */
+		if (OidIsValid(parentIndexRelid))
+		{
+			referenced.classId = RelationRelationId;
+			referenced.objectId = parentIndexRelid;
+			referenced.objectSubId = 0;
+
+			recordDependencyOn(&myself, &referenced, DEPENDENCY_INTERNAL_AUTO);
 		}
 
 		/* Store dependency on collations */
@@ -1056,9 +1116,7 @@ index_create(Relation heapRelation,
 	else
 	{
 		/* Bootstrap mode - assert we weren't asked for constraint support */
-		Assert(!isconstraint);
-		Assert(!deferrable);
-		Assert(!initdeferred);
+		Assert((flags & INDEX_CREATE_ADD_CONSTRAINT) == 0);
 	}
 
 	/* Post creation hook for new index */
@@ -1086,15 +1144,16 @@ index_create(Relation heapRelation,
 	 * If this is bootstrap (initdb) time, then we don't actually fill in the
 	 * index yet.  We'll be creating more indexes and classes later, so we
 	 * delay filling them in until just before we're done with bootstrapping.
-	 * Similarly, if the caller specified skip_build then filling the index is
-	 * delayed till later (ALTER TABLE can save work in some cases with this).
-	 * Otherwise, we call the AM routine that constructs the index.
+	 * Similarly, if the caller specified to skip the build then filling the
+	 * index is delayed till later (ALTER TABLE can save work in some cases
+	 * with this).  Otherwise, we call the AM routine that constructs the
+	 * index.
 	 */
 	if (IsBootstrapProcessingMode())
 	{
 		index_register(heapRelationId, indexRelationId, indexInfo);
 	}
-	else if (skip_build)
+	else if ((flags & INDEX_CREATE_SKIP_BUILD) != 0)
 	{
 		/*
 		 * Caller is responsible for filling the index later on.  However,
@@ -1110,7 +1169,8 @@ index_create(Relation heapRelation,
 	}
 	else
 	{
-		index_build(heapRelation, indexRelation, indexInfo, isprimary, false);
+		index_build(heapRelation, indexRelation, indexInfo, isprimary, false,
+					true);
 	}
 
 	/*
@@ -1130,30 +1190,30 @@ index_create(Relation heapRelation,
  *
  * heapRelation: table owning the index (must be suitably locked by caller)
  * indexRelationId: OID of the index
+ * parentConstraintId: if constraint is on a partition, the OID of the
+ *		constraint in the parent.
  * indexInfo: same info executor uses to insert into the index
  * constraintName: what it say (generally, should match name of index)
  * constraintType: one of CONSTRAINT_PRIMARY, CONSTRAINT_UNIQUE, or
  *		CONSTRAINT_EXCLUSION
- * deferrable: constraint is DEFERRABLE
- * initdeferred: constraint is INITIALLY DEFERRED
- * mark_as_primary: if true, set flags to mark index as primary key
- * update_pgindex: if true, update pg_index row (else caller's done that)
- * remove_old_dependencies: if true, remove existing dependencies of index
- *		on table's columns
+ * flags: bitmask that can include any combination of these bits:
+ *		INDEX_CONSTR_CREATE_MARK_AS_PRIMARY: index is a PRIMARY KEY
+ *		INDEX_CONSTR_CREATE_DEFERRABLE: constraint is DEFERRABLE
+ *		INDEX_CONSTR_CREATE_INIT_DEFERRED: constraint is INITIALLY DEFERRED
+ *		INDEX_CONSTR_CREATE_UPDATE_INDEX: update the pg_index row
+ *		INDEX_CONSTR_CREATE_REMOVE_OLD_DEPS: remove existing dependencies
+ *			of index on table's columns
  * allow_system_table_mods: allow table to be a system catalog
  * is_internal: index is constructed due to internal process
  */
 ObjectAddress
 index_constraint_create(Relation heapRelation,
 						Oid indexRelationId,
+						Oid parentConstraintId,
 						IndexInfo *indexInfo,
 						const char *constraintName,
 						char constraintType,
-						bool deferrable,
-						bool initdeferred,
-						bool mark_as_primary,
-						bool update_pgindex,
-						bool remove_old_dependencies,
+						bits16 constr_flags,
 						bool allow_system_table_mods,
 						bool is_internal)
 {
@@ -1161,6 +1221,16 @@ index_constraint_create(Relation heapRelation,
 	ObjectAddress myself,
 				referenced;
 	Oid			conOid;
+	bool		deferrable;
+	bool		initdeferred;
+	bool		mark_as_primary;
+	bool		islocal;
+	bool		noinherit;
+	int			inhcount;
+
+	deferrable = (constr_flags & INDEX_CONSTR_CREATE_DEFERRABLE) != 0;
+	initdeferred = (constr_flags & INDEX_CONSTR_CREATE_INIT_DEFERRED) != 0;
+	mark_as_primary = (constr_flags & INDEX_CONSTR_CREATE_MARK_AS_PRIMARY) != 0;
 
 	/* constraint creation support doesn't work while bootstrapping */
 	Assert(!IsBootstrapProcessingMode());
@@ -1187,10 +1257,23 @@ index_constraint_create(Relation heapRelation,
 	 * has any expressions or predicate, but we'd never be turning such an
 	 * index into a UNIQUE or PRIMARY KEY constraint.
 	 */
-	if (remove_old_dependencies)
+	if (constr_flags & INDEX_CONSTR_CREATE_REMOVE_OLD_DEPS)
 		deleteDependencyRecordsForClass(RelationRelationId, indexRelationId,
 										RelationRelationId, DEPENDENCY_AUTO);
 
+	if (OidIsValid(parentConstraintId))
+	{
+		islocal = false;
+		inhcount = 1;
+		noinherit = false;
+	}
+	else
+	{
+		islocal = true;
+		inhcount = 0;
+		noinherit = true;
+	}
+
 	/*
 	 * Construct a pg_constraint entry.
 	 */
@@ -1218,9 +1301,9 @@ index_constraint_create(Relation heapRelation,
 								   NULL,	/* no check constraint */
 								   NULL,
 								   NULL,
-								   true,	/* islocal */
-								   0,	/* inhcount */
-								   true,	/* noinherit */
+								   islocal,
+								   inhcount,
+								   noinherit,
 								   is_internal);
 
 	/*
@@ -1239,6 +1322,18 @@ index_constraint_create(Relation heapRelation,
 
 	recordDependencyOn(&myself, &referenced, DEPENDENCY_INTERNAL);
 
+	/*
+	 * Also, if this is a constraint on a partition, mark it as depending
+	 * on the constraint in the parent.
+	 */
+	if (OidIsValid(parentConstraintId))
+	{
+		ObjectAddress	parentConstr;
+
+		ObjectAddressSet(parentConstr, ConstraintRelationId, parentConstraintId);
+		recordDependencyOn(&referenced, &parentConstr, DEPENDENCY_INTERNAL_AUTO);
+	}
+
 	/*
 	 * If the constraint is deferrable, create the deferred uniqueness
 	 * checking trigger.  (The trigger will be given an internal dependency on
@@ -1292,7 +1387,8 @@ index_constraint_create(Relation heapRelation,
 	 * is a risk that concurrent readers of the table will miss seeing this
 	 * index at all.
 	 */
-	if (update_pgindex && (mark_as_primary || deferrable))
+	if ((constr_flags & INDEX_CONSTR_CREATE_UPDATE_INDEX) &&
+		(mark_as_primary || deferrable))
 	{
 		Relation	pg_index;
 		HeapTuple	indexTuple;
@@ -1549,9 +1645,10 @@ index_drop(Oid indexId, bool concurrent)
 	}
 
 	/*
-	 * Schedule physical removal of the files
+	 * Schedule physical removal of the files (if any)
 	 */
-	RelationDropStorage(userIndexRelation);
+	if (userIndexRelation->rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
+		RelationDropStorage(userIndexRelation);
 
 	/*
 	 * Close and flush the index's relcache entry, to ensure relcache doesn't
@@ -1595,6 +1692,11 @@ index_drop(Oid indexId, bool concurrent)
 	 */
 	DeleteRelationTuple(indexId);
 
+	/*
+	 * fix INHERITS relation
+	 */
+	DeleteInheritsTuple(indexId, InvalidOid);
+
 	/*
 	 * We are presently too lazy to attempt to compute the new correct value
 	 * of relhasindex (the next VACUUM will fix it if necessary). So there is
@@ -1686,14 +1788,125 @@ BuildIndexInfo(Relation index)
 	/* initialize index-build state to default */
 	ii->ii_Concurrent = false;
 	ii->ii_BrokenHotChain = false;
+	ii->ii_ParallelWorkers = 0;
 
 	/* set up for possible use by index AM */
+	ii->ii_Am = index->rd_rel->relam;
 	ii->ii_AmCache = NULL;
 	ii->ii_Context = CurrentMemoryContext;
 
 	return ii;
 }
 
+/*
+ * CompareIndexInfo
+ *		Return whether the properties of two indexes (in different tables)
+ *		indicate that they have the "same" definitions.
+ *
+ * Note: passing collations and opfamilies separately is a kludge.  Adding
+ * them to IndexInfo may result in better coding here and elsewhere.
+ *
+ * Use convert_tuples_by_name_map(index2, index1) to build the attmap.
+ */
+bool
+CompareIndexInfo(IndexInfo *info1, IndexInfo *info2,
+				 Oid *collations1, Oid *collations2,
+				 Oid *opfamilies1, Oid *opfamilies2,
+				 AttrNumber *attmap, int maplen)
+{
+	int		i;
+
+	if (info1->ii_Unique != info2->ii_Unique)
+		return false;
+
+	/* indexes are only equivalent if they have the same access method */
+	if (info1->ii_Am != info2->ii_Am)
+		return false;
+
+	/* and same number of attributes */
+	if (info1->ii_NumIndexAttrs != info2->ii_NumIndexAttrs)
+		return false;
+
+	/*
+	 * and columns match through the attribute map (actual attribute numbers
+	 * might differ!)  Note that this implies that index columns that are
+	 * expressions appear in the same positions.  We will next compare the
+	 * expressions themselves.
+	 */
+	for (i = 0; i < info1->ii_NumIndexAttrs; i++)
+	{
+		if (maplen < info2->ii_KeyAttrNumbers[i])
+			elog(ERROR, "incorrect attribute map");
+
+		/* ignore expressions at this stage */
+		if ((info1->ii_KeyAttrNumbers[i] != InvalidAttrNumber) &&
+			(attmap[info2->ii_KeyAttrNumbers[i] - 1] !=
+			info1->ii_KeyAttrNumbers[i]))
+			return false;
+
+		if (collations1[i] != collations2[i])
+			return false;
+		if (opfamilies1[i] != opfamilies2[i])
+			return false;
+	}
+
+	/*
+	 * For expression indexes: either both are expression indexes, or neither
+	 * is; if they are, make sure the expressions match.
+	 */
+	if ((info1->ii_Expressions != NIL) != (info2->ii_Expressions != NIL))
+		return false;
+	if (info1->ii_Expressions != NIL)
+	{
+		bool	found_whole_row;
+		Node   *mapped;
+
+		mapped = map_variable_attnos((Node *) info2->ii_Expressions,
+									 1, 0, attmap, maplen,
+									 InvalidOid, &found_whole_row);
+		if (found_whole_row)
+		{
+			/*
+			 * we could throw an error here, but seems out of scope for this
+			 * routine.
+			 */
+			return false;
+		}
+
+		if (!equal(info1->ii_Expressions, mapped))
+			return false;
+	}
+
+	/* Partial index predicates must be identical, if they exist */
+	if ((info1->ii_Predicate == NULL) != (info2->ii_Predicate == NULL))
+		return false;
+	if (info1->ii_Predicate != NULL)
+	{
+		bool	found_whole_row;
+		Node   *mapped;
+
+		mapped = map_variable_attnos((Node *) info2->ii_Predicate,
+									 1, 0, attmap, maplen,
+									 InvalidOid, &found_whole_row);
+		if (found_whole_row)
+		{
+			/*
+			 * we could throw an error here, but seems out of scope for this
+			 * routine.
+			 */
+			return false;
+		}
+		if (!equal(info1->ii_Predicate, mapped))
+			return false;
+	}
+
+	/* No support currently for comparing exclusion indexes. */
+	if (info1->ii_ExclusionOps != NULL || info2->ii_ExclusionOps != NULL)
+		return false;
+
+	return true;
+}
+
 /* ----------------
  *		BuildSpeculativeIndexInfo
  *			Add extra state to IndexInfo record
@@ -1916,6 +2129,9 @@ index_update_stats(Relation rel,
 		elog(ERROR, "could not find tuple for relation %u", relid);
 	rd_rel = (Form_pg_class) GETSTRUCT(tuple);
 
+	/* Should this be a more comprehensive test? */
+	Assert(rd_rel->relkind != RELKIND_PARTITIONED_INDEX);
+
 	/* Apply required updates, if any, to copied tuple */
 
 	dirty = false;
@@ -1991,6 +2207,7 @@ index_update_stats(Relation rel,
  *
  * isprimary tells whether to mark the index as a primary-key index.
  * isreindex indicates we are recreating a previously-existing index.
+ * parallel indicates if parallelism may be useful.
  *
  * Note: when reindexing an existing index, isprimary can be false even if
  * the index is a PK; it's already properly marked and need not be re-marked.
@@ -2004,7 +2221,8 @@ index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
 			bool isprimary,
-			bool isreindex)
+			bool isreindex,
+			bool parallel)
 {
 	IndexBuildResult *stats;
 	Oid			save_userid;
@@ -2019,10 +2237,31 @@ index_build(Relation heapRelation,
 	Assert(PointerIsValid(indexRelation->rd_amroutine->ambuild));
 	Assert(PointerIsValid(indexRelation->rd_amroutine->ambuildempty));
 
-	ereport(DEBUG1,
-			(errmsg("building index \"%s\" on table \"%s\"",
-					RelationGetRelationName(indexRelation),
-					RelationGetRelationName(heapRelation))));
+	/*
+	 * Determine worker process details for parallel CREATE INDEX.  Currently,
+	 * only btree has support for parallel builds.
+	 *
+	 * Note that planner considers parallel safety for us.
+	 */
+	if (parallel && IsNormalProcessingMode() &&
+		indexRelation->rd_rel->relam == BTREE_AM_OID)
+		indexInfo->ii_ParallelWorkers =
+			plan_create_index_workers(RelationGetRelid(heapRelation),
+									  RelationGetRelid(indexRelation));
+
+	if (indexInfo->ii_ParallelWorkers == 0)
+		ereport(DEBUG1,
+				(errmsg("building index \"%s\" on table \"%s\" serially",
+						RelationGetRelationName(indexRelation),
+						RelationGetRelationName(heapRelation))));
+	else
+		ereport(DEBUG1,
+				(errmsg_plural("building index \"%s\" on table \"%s\" with request for %d parallel worker",
+							   "building index \"%s\" on table \"%s\" with request for %d parallel workers",
+							   indexInfo->ii_ParallelWorkers,
+							   RelationGetRelationName(indexRelation),
+							   RelationGetRelationName(heapRelation),
+							   indexInfo->ii_ParallelWorkers)));
 
 	/*
 	 * Switch to the table owner's userid, so that any index functions are run
@@ -2174,13 +2413,14 @@ IndexBuildHeapScan(Relation heapRelation,
 				   IndexInfo *indexInfo,
 				   bool allow_sync,
 				   IndexBuildCallback callback,
-				   void *callback_state)
+				   void *callback_state,
+				   HeapScanDesc scan)
 {
 	return IndexBuildHeapRangeScan(heapRelation, indexRelation,
 								   indexInfo, allow_sync,
 								   false,
 								   0, InvalidBlockNumber,
-								   callback, callback_state);
+								   callback, callback_state, scan);
 }
 
 /*
@@ -2202,11 +2442,11 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 						BlockNumber start_blockno,
 						BlockNumber numblocks,
 						IndexBuildCallback callback,
-						void *callback_state)
+						void *callback_state,
+						HeapScanDesc scan)
 {
 	bool		is_system_catalog;
 	bool		checking_uniqueness;
-	HeapScanDesc scan;
 	HeapTuple	heapTuple;
 	Datum		values[INDEX_MAX_KEYS];
 	bool		isnull[INDEX_MAX_KEYS];
@@ -2216,6 +2456,7 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 	EState	   *estate;
 	ExprContext *econtext;
 	Snapshot	snapshot;
+	bool		need_unregister_snapshot = false;
 	TransactionId OldestXmin;
 	BlockNumber root_blkno = InvalidBlockNumber;
 	OffsetNumber root_offsets[MaxHeapTuplesPerPage];
@@ -2259,27 +2500,59 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 	 * concurrent build, or during bootstrap, we take a regular MVCC snapshot
 	 * and index whatever's live according to that.
 	 */
-	if (IsBootstrapProcessingMode() || indexInfo->ii_Concurrent)
-	{
-		snapshot = RegisterSnapshot(GetTransactionSnapshot());
-		OldestXmin = InvalidTransactionId;	/* not used */
+	OldestXmin = InvalidTransactionId;
+
+	/* okay to ignore lazy VACUUMs here */
+	if (!IsBootstrapProcessingMode() && !indexInfo->ii_Concurrent)
+		OldestXmin = GetOldestXmin(heapRelation, PROCARRAY_FLAGS_VACUUM);
 
-		/* "any visible" mode is not compatible with this */
-		Assert(!anyvisible);
+	if (!scan)
+	{
+		/*
+		 * Serial index build.
+		 *
+		 * Must begin our own heap scan in this case.  We may also need to
+		 * register a snapshot whose lifetime is under our direct control.
+		 */
+		if (!TransactionIdIsValid(OldestXmin))
+		{
+			snapshot = RegisterSnapshot(GetTransactionSnapshot());
+			need_unregister_snapshot = true;
+		}
+		else
+			snapshot = SnapshotAny;
+
+		scan = heap_beginscan_strat(heapRelation,	/* relation */
+									snapshot,	/* snapshot */
+									0,	/* number of keys */
+									NULL,	/* scan key */
+									true,	/* buffer access strategy OK */
+									allow_sync);	/* syncscan OK? */
 	}
 	else
 	{
-		snapshot = SnapshotAny;
-		/* okay to ignore lazy VACUUMs here */
-		OldestXmin = GetOldestXmin(heapRelation, PROCARRAY_FLAGS_VACUUM);
+		/*
+		 * Parallel index build.
+		 *
+		 * Parallel case never registers/unregisters own snapshot.  Snapshot
+		 * is taken from parallel heap scan, and is SnapshotAny or an MVCC
+		 * snapshot, based on same criteria as serial case.
+		 */
+		Assert(!IsBootstrapProcessingMode());
+		Assert(allow_sync);
+		snapshot = scan->rs_snapshot;
 	}
 
-	scan = heap_beginscan_strat(heapRelation,	/* relation */
-								snapshot,	/* snapshot */
-								0,	/* number of keys */
-								NULL,	/* scan key */
-								true,	/* buffer access strategy OK */
-								allow_sync);	/* syncscan OK? */
+	/*
+	 * Must call GetOldestXmin() with SnapshotAny.  Should never call
+	 * GetOldestXmin() with MVCC snapshot. (It's especially worth checking
+	 * this for parallel builds, since ambuild routines that support parallel
+	 * builds must work these details out for themselves.)
+	 */
+	Assert(snapshot == SnapshotAny || IsMVCCSnapshot(snapshot));
+	Assert(snapshot == SnapshotAny ? TransactionIdIsValid(OldestXmin) :
+		   !TransactionIdIsValid(OldestXmin));
+	Assert(snapshot == SnapshotAny || !anyvisible);
 
 	/* set our scan endpoints */
 	if (!allow_sync)
@@ -2610,8 +2883,8 @@ IndexBuildHeapRangeScan(Relation heapRelation,
 
 	heap_endscan(scan);
 
-	/* we can now forget our snapshot, if set */
-	if (IsBootstrapProcessingMode() || indexInfo->ii_Concurrent)
+	/* we can now forget our snapshot, if set and registered by us */
+	if (need_unregister_snapshot)
 		UnregisterSnapshot(snapshot);
 
 	ExecDropSingleTupleTableSlot(slot);
@@ -2854,7 +3127,7 @@ validate_index(Oid heapId, Oid indexId, Snapshot snapshot)
 	state.tuplesort = tuplesort_begin_datum(INT8OID, Int8LessOperator,
 											InvalidOid, false,
 											maintenance_work_mem,
-											false);
+											NULL, false);
 	state.htups = state.itups = state.tups_inserted = 0;
 
 	(void) index_bulk_delete(&ivinfo, NULL,
@@ -3325,6 +3598,14 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,
 	 */
 	iRel = index_open(indexId, AccessExclusiveLock);
 
+	/*
+	 * The case of reindexing partitioned tables and indexes is handled
+	 * differently by upper layers, so this case shouldn't arise.
+	 */
+	if (iRel->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
+		elog(ERROR, "unsupported relation kind for index \"%s\"",
+			 RelationGetRelationName(iRel));
+
 	/*
 	 * Don't allow reindex on temp tables of other backends ... their local
 	 * buffer manager is not going to cope.
@@ -3371,7 +3652,7 @@ reindex_index(Oid indexId, bool skip_constraint_checks, char persistence,
 
 		/* Initialize the index and rebuild */
 		/* Note: we do not need to re-establish pkey setting */
-		index_build(heapRelation, iRel, indexInfo, false, true);
+		index_build(heapRelation, iRel, indexInfo, false, true, true);
 	}
 	PG_CATCH();
 	{
@@ -3524,6 +3805,22 @@ reindex_relation(Oid relid, int flags, int options)
 	 */
 	rel = heap_open(relid, ShareLock);
 
+	/*
+	 * This may be useful when implemented someday; but that day is not today.
+	 * For now, avoid erroring out when called in a multi-table context
+	 * (REINDEX SCHEMA) and happen to come across a partitioned table.  The
+	 * partitions may be reindexed on their own anyway.
+	 */
+	if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+	{
+		ereport(WARNING,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("REINDEX of partitioned tables is not yet implemented, skipping \"%s\"",
+						RelationGetRelationName(rel))));
+		heap_close(rel, ShareLock);
+		return false;
+	}
+
 	toast_relid = rel->rd_rel->reltoastrelid;
 
 	/*
@@ -3647,7 +3944,8 @@ reindex_relation(Oid relid, int flags, int options)
  * When we are busy reindexing a system index, this code provides support
  * for preventing catalog lookups from using that index.  We also make use
  * of this to catch attempted uses of user indexes during reindexing of
- * those indexes.
+ * those indexes.  This information is propagated to parallel workers;
+ * attempting to change it during a parallel operation is not permitted.
  * ----------------------------------------------------------------
  */
 
@@ -3713,6 +4011,7 @@ SetReindexProcessing(Oid heapOid, Oid indexOid)
 static void
 ResetReindexProcessing(void)
 {
+	/* This may be called in leader error path */
 	currentlyReindexedHeap = InvalidOid;
 	currentlyReindexedIndex = InvalidOid;
 }
@@ -3730,6 +4029,8 @@ SetReindexPending(List *indexes)
 	/* Reindexing is not re-entrant. */
 	if (pendingReindexedIndexes)
 		elog(ERROR, "cannot reindex while reindexing");
+	if (IsInParallelMode())
+		elog(ERROR, "cannot modify reindex state during a parallel operation");
 	pendingReindexedIndexes = list_copy(indexes);
 }
 
@@ -3740,6 +4041,8 @@ SetReindexPending(List *indexes)
 static void
 RemoveReindexPending(Oid indexOid)
 {
+	if (IsInParallelMode())
+		elog(ERROR, "cannot modify reindex state during a parallel operation");
 	pendingReindexedIndexes = list_delete_oid(pendingReindexedIndexes,
 											  indexOid);
 }
@@ -3751,5 +4054,59 @@ RemoveReindexPending(Oid indexOid)
 static void
 ResetReindexPending(void)
 {
+	if (IsInParallelMode())
+		elog(ERROR, "cannot modify reindex state during a parallel operation");
 	pendingReindexedIndexes = NIL;
 }
+
+/*
+ * EstimateReindexStateSpace
+ *		Estimate space needed to pass reindex state to parallel workers.
+ */
+Size
+EstimateReindexStateSpace(void)
+{
+	return offsetof(SerializedReindexState, pendingReindexedIndexes)
+		+ mul_size(sizeof(Oid), list_length(pendingReindexedIndexes));
+}
+
+/*
+ * SerializeReindexState
+ *		Serialize reindex state for parallel workers.
+ */
+void
+SerializeReindexState(Size maxsize, char *start_address)
+{
+	SerializedReindexState *sistate = (SerializedReindexState *) start_address;
+	int			c = 0;
+	ListCell   *lc;
+
+	sistate->currentlyReindexedHeap = currentlyReindexedHeap;
+	sistate->currentlyReindexedIndex = currentlyReindexedIndex;
+	sistate->numPendingReindexedIndexes = list_length(pendingReindexedIndexes);
+	foreach(lc, pendingReindexedIndexes)
+		sistate->pendingReindexedIndexes[c++] = lfirst_oid(lc);
+}
+
+/*
+ * RestoreReindexState
+ *		Restore reindex state in a parallel worker.
+ */
+void
+RestoreReindexState(void *reindexstate)
+{
+	SerializedReindexState *sistate = (SerializedReindexState *) reindexstate;
+	int			c = 0;
+	MemoryContext	oldcontext;
+
+	currentlyReindexedHeap = sistate->currentlyReindexedHeap;
+	currentlyReindexedIndex = sistate->currentlyReindexedIndex;
+
+	Assert(pendingReindexedIndexes == NIL);
+	oldcontext = MemoryContextSwitchTo(TopMemoryContext);
+	for (c = 0; c < sistate->numPendingReindexedIndexes; ++c)
+		pendingReindexedIndexes =
+			lappend_oid(pendingReindexedIndexes,
+						sistate->pendingReindexedIndexes[c]);
+	MemoryContextSwitchTo(oldcontext);
+}
diff --git a/src/backend/catalog/indexing.c b/src/backend/catalog/indexing.c
index e5b6bafaff..a84b7da114 100644
--- a/src/backend/catalog/indexing.c
+++ b/src/backend/catalog/indexing.c
@@ -4,7 +4,7 @@
  *	  This file contains routines to support indexes defined on system
  *	  catalogs.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/information_schema.sql b/src/backend/catalog/information_schema.sql
index 236f6be37e..686528c354 100644
--- a/src/backend/catalog/information_schema.sql
+++ b/src/backend/catalog/information_schema.sql
@@ -2,7 +2,7 @@
  * SQL Information Schema
  * as defined in ISO/IEC 9075-11:2011
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/backend/catalog/information_schema.sql
  *
@@ -1413,7 +1413,8 @@ CREATE VIEW routines AS
            CAST(current_database() AS sql_identifier) AS routine_catalog,
            CAST(n.nspname AS sql_identifier) AS routine_schema,
            CAST(p.proname AS sql_identifier) AS routine_name,
-           CAST('FUNCTION' AS character_data) AS routine_type,
+           CAST(CASE WHEN p.prorettype <> 0 THEN 'FUNCTION' ELSE 'PROCEDURE' END
+             AS character_data) AS routine_type,
            CAST(null AS sql_identifier) AS module_catalog,
            CAST(null AS sql_identifier) AS module_schema,
            CAST(null AS sql_identifier) AS module_name,
@@ -1422,7 +1423,8 @@ CREATE VIEW routines AS
            CAST(null AS sql_identifier) AS udt_name,
 
            CAST(
-             CASE WHEN t.typelem <> 0 AND t.typlen = -1 THEN 'ARRAY'
+             CASE WHEN p.prorettype = 0 THEN NULL
+                  WHEN t.typelem <> 0 AND t.typlen = -1 THEN 'ARRAY'
                   WHEN nt.nspname = 'pg_catalog' THEN format_type(t.oid, null)
                   ELSE 'USER-DEFINED' END AS character_data)
              AS data_type,
@@ -1440,7 +1442,7 @@ CREATE VIEW routines AS
            CAST(null AS cardinal_number) AS datetime_precision,
            CAST(null AS character_data) AS interval_type,
            CAST(null AS cardinal_number) AS interval_precision,
-           CAST(current_database() AS sql_identifier) AS type_udt_catalog,
+           CAST(CASE WHEN p.prorettype <> 0 THEN current_database() END AS sql_identifier) AS type_udt_catalog,
            CAST(nt.nspname AS sql_identifier) AS type_udt_schema,
            CAST(t.typname AS sql_identifier) AS type_udt_name,
            CAST(null AS sql_identifier) AS scope_catalog,
@@ -1462,7 +1464,8 @@ CREATE VIEW routines AS
            CAST('GENERAL' AS character_data) AS parameter_style,
            CAST(CASE WHEN p.provolatile = 'i' THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_deterministic,
            CAST('MODIFIES' AS character_data) AS sql_data_access,
-           CAST(CASE WHEN p.proisstrict THEN 'YES' ELSE 'NO' END AS yes_or_no) AS is_null_call,
+           CAST(CASE WHEN p.prorettype <> 0 THEN
+             CASE WHEN p.proisstrict THEN 'YES' ELSE 'NO' END END AS yes_or_no) AS is_null_call,
            CAST(null AS character_data) AS sql_path,
            CAST('YES' AS yes_or_no) AS schema_level_routine,
            CAST(0 AS cardinal_number) AS max_dynamic_result_sets,
@@ -1503,13 +1506,15 @@ CREATE VIEW routines AS
            CAST(null AS cardinal_number) AS result_cast_maximum_cardinality,
            CAST(null AS sql_identifier) AS result_cast_dtd_identifier
 
-    FROM pg_namespace n, pg_proc p, pg_language l,
-         pg_type t, pg_namespace nt
+    FROM (pg_namespace n
+          JOIN pg_proc p ON n.oid = p.pronamespace
+          JOIN pg_language l ON p.prolang = l.oid)
+         LEFT JOIN
+         (pg_type t JOIN pg_namespace nt ON t.typnamespace = nt.oid)
+         ON p.prorettype = t.oid
 
-    WHERE n.oid = p.pronamespace AND p.prolang = l.oid
-          AND p.prorettype = t.oid AND t.typnamespace = nt.oid
-          AND (pg_has_role(p.proowner, 'USAGE')
-               OR has_function_privilege(p.oid, 'EXECUTE'));
+    WHERE (pg_has_role(p.proowner, 'USAGE')
+           OR has_function_privilege(p.oid, 'EXECUTE'));
 
 GRANT SELECT ON routines TO PUBLIC;
 
@@ -1778,7 +1783,8 @@ CREATE VIEW table_constraints AS
            CAST(CASE WHEN c.condeferrable THEN 'YES' ELSE 'NO' END AS yes_or_no)
              AS is_deferrable,
            CAST(CASE WHEN c.condeferred THEN 'YES' ELSE 'NO' END AS yes_or_no)
-             AS initially_deferred
+             AS initially_deferred,
+           CAST('YES' AS yes_or_no) AS enforced
 
     FROM pg_namespace nc,
          pg_namespace nr,
@@ -1807,7 +1813,8 @@ CREATE VIEW table_constraints AS
            CAST(r.relname AS sql_identifier) AS table_name,
            CAST('CHECK' AS character_data) AS constraint_type,
            CAST('NO' AS yes_or_no) AS is_deferrable,
-           CAST('NO' AS yes_or_no) AS initially_deferred
+           CAST('NO' AS yes_or_no) AS initially_deferred,
+           CAST('YES' AS yes_or_no) AS enforced
 
     FROM pg_namespace nr,
          pg_class r,
@@ -2079,8 +2086,12 @@ CREATE VIEW triggers AS
            CAST(current_database() AS sql_identifier) AS event_object_catalog,
            CAST(n.nspname AS sql_identifier) AS event_object_schema,
            CAST(c.relname AS sql_identifier) AS event_object_table,
-           CAST(null AS cardinal_number) AS action_order,
-           -- XXX strange hacks follow
+           CAST(
+             -- To determine action order, partition by schema, table,
+             -- event_manipulation (INSERT/DELETE/UPDATE), ROW/STATEMENT (1),
+             -- BEFORE/AFTER (66), then order by trigger name
+             rank() OVER (PARTITION BY n.oid, c.oid, em.num, t.tgtype & 1, t.tgtype & 66 ORDER BY t.tgname)
+             AS cardinal_number) AS action_order,
            CAST(
              CASE WHEN pg_has_role(c.relowner, 'USAGE')
                THEN (regexp_match(pg_get_triggerdef(t.oid), E'.{35,} WHEN \\((.+)\\) EXECUTE PROCEDURE'))[1]
@@ -2098,8 +2109,8 @@ CREATE VIEW triggers AS
              -- hard-wired refs to TRIGGER_TYPE_BEFORE, TRIGGER_TYPE_INSTEAD
              CASE t.tgtype & 66 WHEN 2 THEN 'BEFORE' WHEN 64 THEN 'INSTEAD OF' ELSE 'AFTER' END
              AS character_data) AS action_timing,
-           CAST(null AS sql_identifier) AS action_reference_old_table,
-           CAST(null AS sql_identifier) AS action_reference_new_table,
+           CAST(tgoldtable AS sql_identifier) AS action_reference_old_table,
+           CAST(tgnewtable AS sql_identifier) AS action_reference_new_table,
            CAST(null AS sql_identifier) AS action_reference_old_row,
            CAST(null AS sql_identifier) AS action_reference_new_row,
            CAST(null AS time_stamp) AS created
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c
index 5d71302ded..65e271a8d1 100644
--- a/src/backend/catalog/namespace.c
+++ b/src/backend/catalog/namespace.c
@@ -9,7 +9,7 @@
  * and implementing search-path-controlled searches.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -95,7 +95,7 @@
  * set up until the first attempt to create something in it.  (The reason for
  * klugery is that we can't create the temp namespace outside a transaction,
  * but initial GUC processing of search_path happens outside a transaction.)
- * activeTempCreationPending is TRUE if "pg_temp" appears first in the string
+ * activeTempCreationPending is true if "pg_temp" appears first in the string
  * but is not reflected in activeCreationNamespace because the namespace isn't
  * set up yet.
  *
@@ -136,7 +136,7 @@ static List *activeSearchPath = NIL;
 /* default place to create stuff; if InvalidOid, no default */
 static Oid	activeCreationNamespace = InvalidOid;
 
-/* if TRUE, activeCreationNamespace is wrong, it should be temp namespace */
+/* if true, activeCreationNamespace is wrong, it should be temp namespace */
 static bool activeTempCreationPending = false;
 
 /* These variables are the values last derived from namespace_search_path: */
@@ -560,7 +560,7 @@ RangeVarGetAndCheckCreationNamespace(RangeVar *relation,
 		/* Check namespace permissions. */
 		aclresult = pg_namespace_aclcheck(nspid, GetUserId(), ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(nspid));
 
 		if (retry)
@@ -585,7 +585,7 @@ RangeVarGetAndCheckCreationNamespace(RangeVar *relation,
 		if (lockmode != NoLock && OidIsValid(relid))
 		{
 			if (!pg_class_ownercheck(relid, GetUserId()))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+				aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relid)),
 							   relation->relname);
 			if (relid != oldrelid)
 				LockRelationOid(relid, lockmode);
@@ -2874,7 +2874,7 @@ LookupExplicitNamespace(const char *nspname, bool missing_ok)
 
 	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   nspname);
 	/* Schema search hook for this lookup */
 	InvokeNamespaceSearchHook(namespaceId, true);
@@ -2911,7 +2911,7 @@ LookupCreationNamespace(const char *nspname)
 
 	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   nspname);
 
 	return namespaceId;
diff --git a/src/backend/catalog/objectaccess.c b/src/backend/catalog/objectaccess.c
index 9d5eb7b9da..65884699c4 100644
--- a/src/backend/catalog/objectaccess.c
+++ b/src/backend/catalog/objectaccess.c
@@ -3,7 +3,7 @@
  * objectaccess.c
  *		functions for object_access_hook on various events
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c
index 6cac2dfd1d..80f561df1c 100644
--- a/src/backend/catalog/objectaddress.c
+++ b/src/backend/catalog/objectaddress.c
@@ -3,7 +3,7 @@
  * objectaddress.c
  *	  functions for working with ObjectAddresses
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -69,13 +69,13 @@
 #include "commands/trigger.h"
 #include "foreign/foreign.h"
 #include "funcapi.h"
-#include "libpq/be-fsstubs.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_func.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteSupport.h"
+#include "storage/large_object.h"
 #include "storage/lmgr.h"
 #include "storage/sinval.h"
 #include "utils/builtins.h"
@@ -104,7 +104,7 @@ typedef struct
 	AttrNumber	attnum_namespace;	/* attnum of namespace field */
 	AttrNumber	attnum_owner;	/* attnum of owner field */
 	AttrNumber	attnum_acl;		/* attnum of acl field */
-	AclObjectKind acl_kind;		/* ACL_KIND_* of this object type */
+	ObjectType	objtype;		/* OBJECT_* of this object type */
 	bool		is_nsp_name_unique; /* can the nsp/name combination (or name
 									 * alone, if there's no namespace) be
 									 * considered a unique identifier for an
@@ -146,7 +146,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_collation_collnamespace,
 		Anum_pg_collation_collowner,
 		InvalidAttrNumber,
-		ACL_KIND_COLLATION,
+		OBJECT_COLLATION,
 		true
 	},
 	{
@@ -170,7 +170,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_conversion_connamespace,
 		Anum_pg_conversion_conowner,
 		InvalidAttrNumber,
-		ACL_KIND_CONVERSION,
+		OBJECT_CONVERSION,
 		true
 	},
 	{
@@ -182,7 +182,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_database_datdba,
 		Anum_pg_database_datacl,
-		ACL_KIND_DATABASE,
+		OBJECT_DATABASE,
 		true
 	},
 	{
@@ -194,7 +194,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,		/* extension doesn't belong to extnamespace */
 		Anum_pg_extension_extowner,
 		InvalidAttrNumber,
-		ACL_KIND_EXTENSION,
+		OBJECT_EXTENSION,
 		true
 	},
 	{
@@ -206,7 +206,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_foreign_data_wrapper_fdwowner,
 		Anum_pg_foreign_data_wrapper_fdwacl,
-		ACL_KIND_FDW,
+		OBJECT_FDW,
 		true
 	},
 	{
@@ -218,7 +218,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_foreign_server_srvowner,
 		Anum_pg_foreign_server_srvacl,
-		ACL_KIND_FOREIGN_SERVER,
+		OBJECT_FOREIGN_SERVER,
 		true
 	},
 	{
@@ -230,7 +230,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_proc_pronamespace,
 		Anum_pg_proc_proowner,
 		Anum_pg_proc_proacl,
-		ACL_KIND_PROC,
+		OBJECT_FUNCTION,
 		false
 	},
 	{
@@ -242,7 +242,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_language_lanowner,
 		Anum_pg_language_lanacl,
-		ACL_KIND_LANGUAGE,
+		OBJECT_LANGUAGE,
 		true
 	},
 	{
@@ -254,7 +254,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_largeobject_metadata_lomowner,
 		Anum_pg_largeobject_metadata_lomacl,
-		ACL_KIND_LARGEOBJECT,
+		OBJECT_LARGEOBJECT,
 		false
 	},
 	{
@@ -266,7 +266,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_opclass_opcnamespace,
 		Anum_pg_opclass_opcowner,
 		InvalidAttrNumber,
-		ACL_KIND_OPCLASS,
+		OBJECT_OPCLASS,
 		true
 	},
 	{
@@ -278,7 +278,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_operator_oprnamespace,
 		Anum_pg_operator_oprowner,
 		InvalidAttrNumber,
-		ACL_KIND_OPER,
+		OBJECT_OPERATOR,
 		false
 	},
 	{
@@ -290,7 +290,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_opfamily_opfnamespace,
 		Anum_pg_opfamily_opfowner,
 		InvalidAttrNumber,
-		ACL_KIND_OPFAMILY,
+		OBJECT_OPFAMILY,
 		true
 	},
 	{
@@ -326,7 +326,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_namespace_nspowner,
 		Anum_pg_namespace_nspacl,
-		ACL_KIND_NAMESPACE,
+		OBJECT_SCHEMA,
 		true
 	},
 	{
@@ -338,7 +338,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_class_relnamespace,
 		Anum_pg_class_relowner,
 		Anum_pg_class_relacl,
-		ACL_KIND_CLASS,
+		OBJECT_TABLE,
 		true
 	},
 	{
@@ -350,7 +350,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_tablespace_spcowner,
 		Anum_pg_tablespace_spcacl,
-		ACL_KIND_TABLESPACE,
+		OBJECT_TABLESPACE,
 		true
 	},
 	{
@@ -392,7 +392,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_event_trigger_evtowner,
 		InvalidAttrNumber,
-		ACL_KIND_EVENT_TRIGGER,
+		OBJECT_EVENT_TRIGGER,
 		true
 	},
 	{
@@ -404,7 +404,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_ts_config_cfgnamespace,
 		Anum_pg_ts_config_cfgowner,
 		InvalidAttrNumber,
-		ACL_KIND_TSCONFIGURATION,
+		OBJECT_TSCONFIGURATION,
 		true
 	},
 	{
@@ -416,7 +416,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_ts_dict_dictnamespace,
 		Anum_pg_ts_dict_dictowner,
 		InvalidAttrNumber,
-		ACL_KIND_TSDICTIONARY,
+		OBJECT_TSDICTIONARY,
 		true
 	},
 	{
@@ -452,7 +452,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_type_typnamespace,
 		Anum_pg_type_typowner,
 		Anum_pg_type_typacl,
-		ACL_KIND_TYPE,
+		OBJECT_TYPE,
 		true
 	},
 	{
@@ -464,7 +464,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_publication_pubowner,
 		InvalidAttrNumber,
-		ACL_KIND_PUBLICATION,
+		OBJECT_PUBLICATION,
 		true
 	},
 	{
@@ -476,7 +476,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		InvalidAttrNumber,
 		Anum_pg_subscription_subowner,
 		InvalidAttrNumber,
-		ACL_KIND_SUBSCRIPTION,
+		OBJECT_SUBSCRIPTION,
 		true
 	},
 	{
@@ -488,7 +488,7 @@ static const ObjectPropertyType ObjectProperty[] =
 		Anum_pg_statistic_ext_stxnamespace,
 		Anum_pg_statistic_ext_stxowner,
 		InvalidAttrNumber,		/* no ACL (same as relation) */
-		ACL_KIND_STATISTICS,
+		OBJECT_STATISTIC_EXT,
 		true
 	}
 };
@@ -566,6 +566,9 @@ static const struct object_type_map
 	{
 		"function", OBJECT_FUNCTION
 	},
+	{
+		"procedure", OBJECT_PROCEDURE
+	},
 	/* OCLASS_TYPE */
 	{
 		"type", OBJECT_TYPE
@@ -884,13 +887,11 @@ get_object_address(ObjectType objtype, Node *object,
 				address = get_object_address_type(objtype, castNode(TypeName, object), missing_ok);
 				break;
 			case OBJECT_AGGREGATE:
-				address.classId = ProcedureRelationId;
-				address.objectId = LookupAggWithArgs(castNode(ObjectWithArgs, object), missing_ok);
-				address.objectSubId = 0;
-				break;
 			case OBJECT_FUNCTION:
+			case OBJECT_PROCEDURE:
+			case OBJECT_ROUTINE:
 				address.classId = ProcedureRelationId;
-				address.objectId = LookupFuncWithArgs(castNode(ObjectWithArgs, object), missing_ok);
+				address.objectId = LookupFuncWithArgs(objtype, castNode(ObjectWithArgs, object), missing_ok);
 				address.objectSubId = 0;
 				break;
 			case OBJECT_OPERATOR:
@@ -1216,7 +1217,8 @@ get_relation_by_qualified_name(ObjectType objtype, List *object,
 	switch (objtype)
 	{
 		case OBJECT_INDEX:
-			if (relation->rd_rel->relkind != RELKIND_INDEX)
+			if (relation->rd_rel->relkind != RELKIND_INDEX &&
+				relation->rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 						 errmsg("\"%s\" is not an index",
@@ -1591,6 +1593,8 @@ get_object_address_opf_member(ObjectType objtype,
 	famaddr = get_object_address_opcf(OBJECT_OPFAMILY, copy, false);
 
 	/* find out left/right type names and OIDs */
+	typenames[0] = typenames[1] = NULL;
+	typeoids[0] = typeoids[1] = InvalidOid;
 	i = 0;
 	foreach(cell, lsecond(object))
 	{
@@ -2025,6 +2029,8 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 	 */
 	if (type == OBJECT_AGGREGATE ||
 		type == OBJECT_FUNCTION ||
+		type == OBJECT_PROCEDURE ||
+		type == OBJECT_ROUTINE ||
 		type == OBJECT_OPERATOR ||
 		type == OBJECT_CAST ||
 		type == OBJECT_AMOP ||
@@ -2168,6 +2174,8 @@ pg_get_object_address(PG_FUNCTION_ARGS)
 			objnode = (Node *) list_make2(name, args);
 			break;
 		case OBJECT_FUNCTION:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 		case OBJECT_AGGREGATE:
 		case OBJECT_OPERATOR:
 			{
@@ -2236,12 +2244,12 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
 		case OBJECT_POLICY:
 		case OBJECT_TABCONSTRAINT:
 			if (!pg_class_ownercheck(RelationGetRelid(relation), roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   RelationGetRelationName(relation));
 			break;
 		case OBJECT_DATABASE:
 			if (!pg_database_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_TYPE:
@@ -2253,63 +2261,65 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
 			break;
 		case OBJECT_AGGREGATE:
 		case OBJECT_FUNCTION:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 			if (!pg_proc_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString((castNode(ObjectWithArgs, object))->objname));
 			break;
 		case OBJECT_OPERATOR:
 			if (!pg_oper_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString((castNode(ObjectWithArgs, object))->objname));
 			break;
 		case OBJECT_SCHEMA:
 			if (!pg_namespace_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_NAMESPACE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_COLLATION:
 			if (!pg_collation_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_COLLATION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_CONVERSION:
 			if (!pg_conversion_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CONVERSION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_EXTENSION:
 			if (!pg_extension_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EXTENSION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_FDW:
 			if (!pg_foreign_data_wrapper_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_FDW,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_FOREIGN_SERVER:
 			if (!pg_foreign_server_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_FOREIGN_SERVER,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_EVENT_TRIGGER:
 			if (!pg_event_trigger_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EVENT_TRIGGER,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_LANGUAGE:
 			if (!pg_language_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_OPCLASS:
 			if (!pg_opclass_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPCLASS,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_OPFAMILY:
 			if (!pg_opfamily_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPFAMILY,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_LARGEOBJECT:
@@ -2339,12 +2349,12 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
 			break;
 		case OBJECT_PUBLICATION:
 			if (!pg_publication_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PUBLICATION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_SUBSCRIPTION:
 			if (!pg_subscription_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_SUBSCRIPTION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_TRANSFORM:
@@ -2358,17 +2368,17 @@ check_object_ownership(Oid roleid, ObjectType objtype, ObjectAddress address,
 			break;
 		case OBJECT_TABLESPACE:
 			if (!pg_tablespace_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   strVal((Value *) object));
 			break;
 		case OBJECT_TSDICTIONARY:
 			if (!pg_ts_dict_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_TSCONFIGURATION:
 			if (!pg_ts_config_ownercheck(address.objectId, roleid))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 							   NameListToString(castNode(List, object)));
 			break;
 		case OBJECT_ROLE:
@@ -2532,12 +2542,22 @@ get_object_attnum_acl(Oid class_id)
 	return prop->attnum_acl;
 }
 
-AclObjectKind
-get_object_aclkind(Oid class_id)
+ObjectType
+get_object_type(Oid class_id, Oid object_id)
 {
 	const ObjectPropertyType *prop = get_object_property_data(class_id);
 
-	return prop->acl_kind;
+	if (prop->objtype == OBJECT_TABLE)
+	{
+		/*
+		 * If the property data says it's a table, dig a little deeper to get
+		 * the real relation kind, so that callers can produce more precise
+		 * error messages.
+		 */
+		return get_relkind_objtype(get_rel_relkind(object_id));
+	}
+	else
+		return prop->objtype;
 }
 
 bool
@@ -2664,8 +2684,9 @@ getObjectDescription(const ObjectAddress *object)
 			getRelationDescription(&buffer, object->objectId);
 			if (object->objectSubId != 0)
 				appendStringInfo(&buffer, _(" column %s"),
-								 get_relid_attribute_name(object->objectId,
-														  object->objectSubId));
+								 get_attname(object->objectId,
+											 object->objectSubId,
+											 false));
 			break;
 
 		case OCLASS_PROC:
@@ -3476,6 +3497,7 @@ getRelationDescription(StringInfo buffer, Oid relid)
 							 relname);
 			break;
 		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
 			appendStringInfo(buffer, _("index %s"),
 							 relname);
 			break;
@@ -3950,6 +3972,7 @@ getRelationTypeDescription(StringInfo buffer, Oid relid, int32 objectSubId)
 			appendStringInfoString(buffer, "table");
 			break;
 		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
 			appendStringInfoString(buffer, "index");
 			break;
 		case RELKIND_SEQUENCE:
@@ -4026,6 +4049,8 @@ getProcedureTypeDescription(StringInfo buffer, Oid procid)
 
 	if (procForm->proisagg)
 		appendStringInfoString(buffer, "aggregate");
+	else if (procForm->prorettype == InvalidOid)
+		appendStringInfoString(buffer, "procedure");
 	else
 		appendStringInfoString(buffer, "function");
 
@@ -4081,8 +4106,8 @@ getObjectIdentityParts(const ObjectAddress *object,
 			{
 				char	   *attr;
 
-				attr = get_relid_attribute_name(object->objectId,
-												object->objectSubId);
+				attr = get_attname(object->objectId, object->objectSubId,
+								   false);
 				appendStringInfo(&buffer, ".%s", quote_identifier(attr));
 				if (objname)
 					*objname = lappend(*objname, attr);
@@ -5051,7 +5076,7 @@ getRelationIdentity(StringInfo buffer, Oid relid, List **object)
 }
 
 /*
- * Auxiliary function to return a TEXT array out of a list of C-strings.
+ * Auxiliary function to build a TEXT array out of a list of C-strings.
  */
 ArrayType *
 strlist_to_textarray(List *list)
@@ -5063,12 +5088,14 @@ strlist_to_textarray(List *list)
 	MemoryContext memcxt;
 	MemoryContext oldcxt;
 
+	/* Work in a temp context; easier than individually pfree'ing the Datums */
 	memcxt = AllocSetContextCreate(CurrentMemoryContext,
 								   "strlist to array",
 								   ALLOCSET_DEFAULT_SIZES);
 	oldcxt = MemoryContextSwitchTo(memcxt);
 
-	datums = palloc(sizeof(text *) * list_length(list));
+	datums = (Datum *) palloc(sizeof(Datum) * list_length(list));
+
 	foreach(cell, list)
 	{
 		char	   *name = lfirst(cell);
@@ -5080,7 +5107,33 @@ strlist_to_textarray(List *list)
 
 	arr = construct_array(datums, list_length(list),
 						  TEXTOID, -1, false, 'i');
+
 	MemoryContextDelete(memcxt);
 
 	return arr;
 }
+
+ObjectType
+get_relkind_objtype(char relkind)
+{
+	switch (relkind)
+	{
+		case RELKIND_RELATION:
+		case RELKIND_PARTITIONED_TABLE:
+			return OBJECT_TABLE;
+		case RELKIND_INDEX:
+			return OBJECT_INDEX;
+		case RELKIND_SEQUENCE:
+			return OBJECT_SEQUENCE;
+		case RELKIND_VIEW:
+			return OBJECT_VIEW;
+		case RELKIND_MATVIEW:
+			return OBJECT_MATVIEW;
+		case RELKIND_FOREIGN_TABLE:
+			return OBJECT_FOREIGN_TABLE;
+		/* other relkinds are not supported here because they don't map to OBJECT_* values */
+		default:
+			elog(ERROR, "unexpected relkind: %d", relkind);
+			return 0;
+	}
+}
diff --git a/src/backend/catalog/partition.c b/src/backend/catalog/partition.c
index c1a307c8d3..fcf7655553 100644
--- a/src/backend/catalog/partition.c
+++ b/src/backend/catalog/partition.c
@@ -3,7 +3,7 @@
  * partition.c
  *		  Partitioning related data structures and functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -15,6 +15,7 @@
 
 #include "postgres.h"
 
+#include "access/hash.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/nbtree.h"
@@ -27,7 +28,9 @@
 #include "catalog/pg_inherits.h"
 #include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_opclass.h"
+#include "catalog/pg_partitioned_table.h"
 #include "catalog/pg_type.h"
+#include "commands/tablecmds.h"
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "nodes/makefuncs.h"
@@ -35,16 +38,19 @@
 #include "nodes/parsenodes.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planmain.h"
+#include "optimizer/prep.h"
 #include "optimizer/var.h"
+#include "parser/parse_coerce.h"
 #include "rewrite/rewriteManip.h"
 #include "storage/lmgr.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/datum.h"
-#include "utils/memutils.h"
 #include "utils/fmgroids.h"
+#include "utils/hashutils.h"
 #include "utils/inval.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/ruleutils.h"
 #include "utils/syscache.h"
@@ -58,37 +64,64 @@
  * In the case of range partitioning, ndatums will typically be far less than
  * 2 * nparts, because a partition's upper bound and the next partition's lower
  * bound are the same in most common cases, and we only store one of them (the
- * upper bound).
+ * upper bound).  In case of hash partitioning, ndatums will be same as the
+ * number of partitions.
+ *
+ * For range and list partitioned tables, datums is an array of datum-tuples
+ * with key->partnatts datums each.  For hash partitioned tables, it is an array
+ * of datum-tuples with 2 datums, modulus and remainder, corresponding to a
+ * given partition.
+ *
+ * The datums in datums array are arranged in increasing order as defined by
+ * functions qsort_partition_rbound_cmp(), qsort_partition_list_value_cmp() and
+ * qsort_partition_hbound_cmp() for range, list and hash partitioned tables
+ * respectively. For range and list partitions this simply means that the
+ * datums in the datums array are arranged in increasing order as defined by
+ * the partition key's operator classes and collations.
  *
  * In the case of list partitioning, the indexes array stores one entry for
  * every datum, which is the index of the partition that accepts a given datum.
  * In case of range partitioning, it stores one entry per distinct range
  * datum, which is the index of the partition for which a given datum
- * is an upper bound.
+ * is an upper bound.  In the case of hash partitioning, the number of the
+ * entries in the indexes array is same as the greatest modulus amongst all
+ * partitions.  For a given partition key datum-tuple, the index of the
+ * partition which would accept that datum-tuple would be given by the entry
+ * pointed by remainder produced when hash value of the datum-tuple is divided
+ * by the greatest modulus.
  */
 
 typedef struct PartitionBoundInfoData
 {
-	char		strategy;		/* list or range bounds? */
+	char		strategy;		/* hash, list or range? */
 	int			ndatums;		/* Length of the datums following array */
-	Datum	  **datums;			/* Array of datum-tuples with key->partnatts
-								 * datums each */
+	Datum	  **datums;
 	PartitionRangeDatumKind **kind; /* The kind of each range bound datum;
-									 * NULL for list partitioned tables */
-	int		   *indexes;		/* Partition indexes; one entry per member of
-								 * the datums array (plus one if range
-								 * partitioned table) */
+									 * NULL for hash and list partitioned
+									 * tables */
+	int		   *indexes;		/* Partition indexes */
 	int			null_index;		/* Index of the null-accepting partition; -1
 								 * if there isn't one */
+	int			default_index;	/* Index of the default partition; -1 if there
+								 * isn't one */
 } PartitionBoundInfoData;
 
 #define partition_bound_accepts_nulls(bi) ((bi)->null_index != -1)
+#define partition_bound_has_default(bi) ((bi)->default_index != -1)
 
 /*
  * When qsort'ing partition bounds after reading from the catalog, each bound
  * is represented with one of the following structs.
  */
 
+/* One bound of a hash partition */
+typedef struct PartitionHashBound
+{
+	int			modulus;
+	int			remainder;
+	int			index;
+} PartitionHashBound;
+
 /* One value coming from some (index'th) list partition */
 typedef struct PartitionListValue
 {
@@ -105,6 +138,7 @@ typedef struct PartitionRangeBound
 	bool		lower;			/* this is the lower (vs upper) bound */
 } PartitionRangeBound;
 
+static int32 qsort_partition_hbound_cmp(const void *a, const void *b);
 static int32 qsort_partition_list_value_cmp(const void *a, const void *b,
 							   void *arg);
 static int32 qsort_partition_rbound_cmp(const void *a, const void *b,
@@ -120,25 +154,44 @@ static void get_range_key_properties(PartitionKey key, int keynum,
 						 ListCell **partexprs_item,
 						 Expr **keyCol,
 						 Const **lower_val, Const **upper_val);
-static List *get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec);
-static List *get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec);
+static List *get_qual_for_hash(Relation parent, PartitionBoundSpec *spec);
+static List *get_qual_for_list(Relation parent, PartitionBoundSpec *spec);
+static List *get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
+				   bool for_default);
+static List *get_range_nulltest(PartitionKey key);
 static List *generate_partition_qual(Relation rel);
 
 static PartitionRangeBound *make_one_range_bound(PartitionKey key, int index,
 					 List *datums, bool lower);
-static int32 partition_rbound_cmp(PartitionKey key,
-					 Datum *datums1, PartitionRangeDatumKind *kind1,
-					 bool lower1, PartitionRangeBound *b2);
-static int32 partition_rbound_datum_cmp(PartitionKey key,
+static int32 partition_hbound_cmp(int modulus1, int remainder1, int modulus2,
+					 int remainder2);
+static int32 partition_rbound_cmp(int partnatts, FmgrInfo *partsupfunc,
+					 Oid *partcollation, Datum *datums1,
+					 PartitionRangeDatumKind *kind1, bool lower1,
+					 PartitionRangeBound *b2);
+static int32 partition_rbound_datum_cmp(FmgrInfo *partsupfunc,
+						   Oid *partcollation,
 						   Datum *rb_datums, PartitionRangeDatumKind *rb_kind,
-						   Datum *tuple_datums);
+						   Datum *tuple_datums, int n_tuple_datums);
 
-static int32 partition_bound_cmp(PartitionKey key,
-					PartitionBoundInfo boundinfo,
-					int offset, void *probe, bool probe_is_bound);
-static int partition_bound_bsearch(PartitionKey key,
+static int partition_list_bsearch(FmgrInfo *partsupfunc, Oid *partcollation,
+					   PartitionBoundInfo boundinfo,
+					   Datum value, bool *is_equal);
+static int partition_range_bsearch(int partnatts, FmgrInfo *partsupfunc,
+						Oid *partcollation,
 						PartitionBoundInfo boundinfo,
-						void *probe, bool probe_is_bound, bool *is_equal);
+						PartitionRangeBound *probe, bool *is_equal);
+static int partition_range_datum_bsearch(FmgrInfo *partsupfunc,
+							  Oid *partcollation,
+							  PartitionBoundInfo boundinfo,
+							  int nvalues, Datum *values, bool *is_equal);
+static int partition_hash_bsearch(PartitionBoundInfo boundinfo,
+					   int modulus, int remainder);
+
+static int	get_partition_bound_num_indexes(PartitionBoundInfo b);
+static int	get_greatest_modulus(PartitionBoundInfo b);
+static uint64 compute_hash_value(int partnatts, FmgrInfo *partsupfunc,
+								 Datum *values, bool *isnull);
 
 /*
  * RelationBuildPartitionDesc
@@ -162,6 +215,10 @@ RelationBuildPartitionDesc(Relation rel)
 	MemoryContext oldcxt;
 
 	int			ndatums = 0;
+	int			default_index = -1;
+
+	/* Hash partitioning specific */
+	PartitionHashBound **hbounds = NULL;
 
 	/* List partitioning specific */
 	PartitionListValue **all_values = NULL;
@@ -213,6 +270,22 @@ RelationBuildPartitionDesc(Relation rel)
 								&isnull);
 		Assert(!isnull);
 		boundspec = (Node *) stringToNode(TextDatumGetCString(datum));
+
+		/*
+		 * Sanity check: If the PartitionBoundSpec says this is the default
+		 * partition, its OID should correspond to whatever's stored in
+		 * pg_partitioned_table.partdefid; if not, the catalog is corrupt.
+		 */
+		if (castNode(PartitionBoundSpec, boundspec)->is_default)
+		{
+			Oid			partdefid;
+
+			partdefid = get_default_partition_oid(RelationGetRelid(rel));
+			if (partdefid != inhrelid)
+				elog(ERROR, "expected partdefid %u, but got %u",
+					 inhrelid, partdefid);
+		}
+
 		boundspecs = lappend(boundspecs, boundspec);
 		partoids = lappend_oid(partoids, inhrelid);
 		ReleaseSysCache(tuple);
@@ -228,7 +301,35 @@ RelationBuildPartitionDesc(Relation rel)
 			oids[i++] = lfirst_oid(cell);
 
 		/* Convert from node to the internal representation */
-		if (key->strategy == PARTITION_STRATEGY_LIST)
+		if (key->strategy == PARTITION_STRATEGY_HASH)
+		{
+			ndatums = nparts;
+			hbounds = (PartitionHashBound **)
+				palloc(nparts * sizeof(PartitionHashBound *));
+
+			i = 0;
+			foreach(cell, boundspecs)
+			{
+				PartitionBoundSpec *spec = castNode(PartitionBoundSpec,
+													lfirst(cell));
+
+				if (spec->strategy != PARTITION_STRATEGY_HASH)
+					elog(ERROR, "invalid strategy in partition bound spec");
+
+				hbounds[i] = (PartitionHashBound *)
+					palloc(sizeof(PartitionHashBound));
+
+				hbounds[i]->modulus = spec->modulus;
+				hbounds[i]->remainder = spec->remainder;
+				hbounds[i]->index = i;
+				i++;
+			}
+
+			/* Sort all the bounds in ascending order */
+			qsort(hbounds, nparts, sizeof(PartitionHashBound *),
+				  qsort_partition_hbound_cmp);
+		}
+		else if (key->strategy == PARTITION_STRATEGY_LIST)
 		{
 			List	   *non_null_values = NIL;
 
@@ -246,6 +347,18 @@ RelationBuildPartitionDesc(Relation rel)
 				if (spec->strategy != PARTITION_STRATEGY_LIST)
 					elog(ERROR, "invalid strategy in partition bound spec");
 
+				/*
+				 * Note the index of the partition bound spec for the default
+				 * partition. There's no datum to add to the list of non-null
+				 * datums for this partition.
+				 */
+				if (spec->is_default)
+				{
+					default_index = i;
+					i++;
+					continue;
+				}
+
 				foreach(c, spec->listdatums)
 				{
 					Const	   *val = castNode(Const, lfirst(c));
@@ -303,21 +416,18 @@ RelationBuildPartitionDesc(Relation rel)
 		}
 		else if (key->strategy == PARTITION_STRATEGY_RANGE)
 		{
-			int			j,
-						k;
+			int			k;
 			PartitionRangeBound **all_bounds,
 					   *prev;
-			bool	   *distinct_indexes;
 
 			all_bounds = (PartitionRangeBound **) palloc0(2 * nparts *
 														  sizeof(PartitionRangeBound *));
-			distinct_indexes = (bool *) palloc(2 * nparts * sizeof(bool));
 
 			/*
 			 * Create a unified list of range bounds across all the
 			 * partitions.
 			 */
-			i = j = 0;
+			i = ndatums = 0;
 			foreach(cell, boundspecs)
 			{
 				PartitionBoundSpec *spec = castNode(PartitionBoundSpec,
@@ -328,30 +438,41 @@ RelationBuildPartitionDesc(Relation rel)
 				if (spec->strategy != PARTITION_STRATEGY_RANGE)
 					elog(ERROR, "invalid strategy in partition bound spec");
 
+				/*
+				 * Note the index of the partition bound spec for the default
+				 * partition. There's no datum to add to the allbounds array
+				 * for this partition.
+				 */
+				if (spec->is_default)
+				{
+					default_index = i++;
+					continue;
+				}
+
 				lower = make_one_range_bound(key, i, spec->lowerdatums,
 											 true);
 				upper = make_one_range_bound(key, i, spec->upperdatums,
 											 false);
-				all_bounds[j] = lower;
-				all_bounds[j + 1] = upper;
-				j += 2;
+				all_bounds[ndatums++] = lower;
+				all_bounds[ndatums++] = upper;
 				i++;
 			}
-			Assert(j == 2 * nparts);
+
+			Assert(ndatums == nparts * 2 ||
+				   (default_index != -1 && ndatums == (nparts - 1) * 2));
 
 			/* Sort all the bounds in ascending order */
-			qsort_arg(all_bounds, 2 * nparts,
+			qsort_arg(all_bounds, ndatums,
 					  sizeof(PartitionRangeBound *),
 					  qsort_partition_rbound_cmp,
 					  (void *) key);
 
-			/*
-			 * Count the number of distinct bounds to allocate an array of
-			 * that size.
-			 */
-			ndatums = 0;
+			/* Save distinct bounds from all_bounds into rbounds. */
+			rbounds = (PartitionRangeBound **)
+				palloc(ndatums * sizeof(PartitionRangeBound *));
+			k = 0;
 			prev = NULL;
-			for (i = 0; i < 2 * nparts; i++)
+			for (i = 0; i < ndatums; i++)
 			{
 				PartitionRangeBound *cur = all_bounds[i];
 				bool		is_distinct = false;
@@ -388,34 +509,18 @@ RelationBuildPartitionDesc(Relation rel)
 				}
 
 				/*
-				 * Count the current bound if it is distinct from the previous
-				 * one.  Also, store if the index i contains a distinct bound
-				 * that we'd like put in the relcache array.
+				 * Only if the bound is distinct save it into a temporary
+				 * array i.e. rbounds which is later copied into boundinfo
+				 * datums array.
 				 */
 				if (is_distinct)
-				{
-					distinct_indexes[i] = true;
-					ndatums++;
-				}
-				else
-					distinct_indexes[i] = false;
+					rbounds[k++] = all_bounds[i];
 
 				prev = cur;
 			}
 
-			/*
-			 * Finally save them in an array from where they will be copied
-			 * into the relcache.
-			 */
-			rbounds = (PartitionRangeBound **) palloc(ndatums *
-													  sizeof(PartitionRangeBound *));
-			k = 0;
-			for (i = 0; i < 2 * nparts; i++)
-			{
-				if (distinct_indexes[i])
-					rbounds[k++] = all_bounds[i];
-			}
-			Assert(k == ndatums);
+			/* Update ndatums to hold the count of distinct datums. */
+			ndatums = k;
 		}
 		else
 			elog(ERROR, "unexpected partition strategy: %d",
@@ -423,9 +528,10 @@ RelationBuildPartitionDesc(Relation rel)
 	}
 
 	/* Now build the actual relcache partition descriptor */
-	rel->rd_pdcxt = AllocSetContextCreate(CacheMemoryContext,
-										  RelationGetRelationName(rel),
-										  ALLOCSET_DEFAULT_SIZES);
+	rel->rd_pdcxt = AllocSetContextCreateExtended(CacheMemoryContext,
+												  RelationGetRelationName(rel),
+												  MEMCONTEXT_COPY_NAME,
+												  ALLOCSET_DEFAULT_SIZES);
 	oldcxt = MemoryContextSwitchTo(rel->rd_pdcxt);
 
 	result = (PartitionDescData *) palloc0(sizeof(PartitionDescData));
@@ -441,6 +547,7 @@ RelationBuildPartitionDesc(Relation rel)
 		boundinfo = (PartitionBoundInfoData *)
 			palloc0(sizeof(PartitionBoundInfoData));
 		boundinfo->strategy = key->strategy;
+		boundinfo->default_index = -1;
 		boundinfo->ndatums = ndatums;
 		boundinfo->null_index = -1;
 		boundinfo->datums = (Datum **) palloc0(ndatums * sizeof(Datum *));
@@ -452,6 +559,42 @@ RelationBuildPartitionDesc(Relation rel)
 
 		switch (key->strategy)
 		{
+			case PARTITION_STRATEGY_HASH:
+				{
+					/* Modulus are stored in ascending order */
+					int			greatest_modulus = hbounds[ndatums - 1]->modulus;
+
+					boundinfo->indexes = (int *) palloc(greatest_modulus *
+														sizeof(int));
+
+					for (i = 0; i < greatest_modulus; i++)
+						boundinfo->indexes[i] = -1;
+
+					for (i = 0; i < nparts; i++)
+					{
+						int			modulus = hbounds[i]->modulus;
+						int			remainder = hbounds[i]->remainder;
+
+						boundinfo->datums[i] = (Datum *) palloc(2 *
+																sizeof(Datum));
+						boundinfo->datums[i][0] = Int32GetDatum(modulus);
+						boundinfo->datums[i][1] = Int32GetDatum(remainder);
+
+						while (remainder < greatest_modulus)
+						{
+							/* overlap? */
+							Assert(boundinfo->indexes[remainder] == -1);
+							boundinfo->indexes[remainder] = i;
+							remainder += modulus;
+						}
+
+						mapping[hbounds[i]->index] = i;
+						pfree(hbounds[i]);
+					}
+					pfree(hbounds);
+					break;
+				}
+
 			case PARTITION_STRATEGY_LIST:
 				{
 					boundinfo->indexes = (int *) palloc(ndatums * sizeof(int));
@@ -493,6 +636,21 @@ RelationBuildPartitionDesc(Relation rel)
 						boundinfo->null_index = mapping[null_index];
 					}
 
+					/* Assign mapped index for the default partition. */
+					if (default_index != -1)
+					{
+						/*
+						 * The default partition accepts any value not
+						 * specified in the lists of other partitions, hence
+						 * it should not get mapped index while assigning
+						 * those for non-null datums.
+						 */
+						Assert(default_index >= 0 &&
+							   mapping[default_index] == -1);
+						mapping[default_index] = next_index++;
+						boundinfo->default_index = mapping[default_index];
+					}
+
 					/* All partition must now have a valid mapping */
 					Assert(next_index == nparts);
 					break;
@@ -547,6 +705,14 @@ RelationBuildPartitionDesc(Relation rel)
 							boundinfo->indexes[i] = mapping[orig_index];
 						}
 					}
+
+					/* Assign mapped index for the default partition. */
+					if (default_index != -1)
+					{
+						Assert(default_index >= 0 && mapping[default_index] == -1);
+						mapping[default_index] = next_index++;
+						boundinfo->default_index = mapping[default_index];
+					}
 					boundinfo->indexes[i] = -1;
 					break;
 				}
@@ -562,8 +728,7 @@ RelationBuildPartitionDesc(Relation rel)
 		 * Now assign OIDs from the original array into mapped indexes of the
 		 * result array.  Order of OIDs in the former is defined by the
 		 * catalog scan that retrieved them, whereas that in the latter is
-		 * defined by canonicalized representation of the list values or the
-		 * range bounds.
+		 * defined by canonicalized representation of the partition bounds.
 		 */
 		for (i = 0; i < nparts; i++)
 			result->oids[mapping[i]] = oids[i];
@@ -597,50 +762,186 @@ partition_bounds_equal(int partnatts, int16 *parttyplen, bool *parttypbyval,
 	if (b1->null_index != b2->null_index)
 		return false;
 
-	for (i = 0; i < b1->ndatums; i++)
+	if (b1->default_index != b2->default_index)
+		return false;
+
+	if (b1->strategy == PARTITION_STRATEGY_HASH)
 	{
-		int			j;
+		int			greatest_modulus = get_greatest_modulus(b1);
+
+		/*
+		 * If two hash partitioned tables have different greatest moduli,
+		 * their partition schemes don't match.
+		 */
+		if (greatest_modulus != get_greatest_modulus(b2))
+			return false;
+
+		/*
+		 * We arrange the partitions in the ascending order of their modulus
+		 * and remainders.  Also every modulus is factor of next larger
+		 * modulus.  Therefore we can safely store index of a given partition
+		 * in indexes array at remainder of that partition.  Also entries at
+		 * (remainder + N * modulus) positions in indexes array are all same
+		 * for (modulus, remainder) specification for any partition.  Thus
+		 * datums array from both the given bounds are same, if and only if
+		 * their indexes array will be same.  So, it suffices to compare
+		 * indexes array.
+		 */
+		for (i = 0; i < greatest_modulus; i++)
+			if (b1->indexes[i] != b2->indexes[i])
+				return false;
+
+#ifdef USE_ASSERT_CHECKING
 
-		for (j = 0; j < partnatts; j++)
+		/*
+		 * Nonetheless make sure that the bounds are indeed same when the
+		 * indexes match.  Hash partition bound stores modulus and remainder
+		 * at b1->datums[i][0] and b1->datums[i][1] position respectively.
+		 */
+		for (i = 0; i < b1->ndatums; i++)
+			Assert((b1->datums[i][0] == b2->datums[i][0] &&
+					b1->datums[i][1] == b2->datums[i][1]));
+#endif
+	}
+	else
+	{
+		for (i = 0; i < b1->ndatums; i++)
 		{
-			/* For range partitions, the bounds might not be finite. */
-			if (b1->kind != NULL)
+			int			j;
+
+			for (j = 0; j < partnatts; j++)
 			{
-				/* The different kinds of bound all differ from each other */
-				if (b1->kind[i][j] != b2->kind[i][j])
-					return false;
+				/* For range partitions, the bounds might not be finite. */
+				if (b1->kind != NULL)
+				{
+					/* The different kinds of bound all differ from each other */
+					if (b1->kind[i][j] != b2->kind[i][j])
+						return false;
 
-				/* Non-finite bounds are equal without further examination. */
-				if (b1->kind[i][j] != PARTITION_RANGE_DATUM_VALUE)
-					continue;
+					/*
+					 * Non-finite bounds are equal without further
+					 * examination.
+					 */
+					if (b1->kind[i][j] != PARTITION_RANGE_DATUM_VALUE)
+						continue;
+				}
+
+				/*
+				 * Compare the actual values. Note that it would be both
+				 * incorrect and unsafe to invoke the comparison operator
+				 * derived from the partitioning specification here.  It would
+				 * be incorrect because we want the relcache entry to be
+				 * updated for ANY change to the partition bounds, not just
+				 * those that the partitioning operator thinks are
+				 * significant.  It would be unsafe because we might reach
+				 * this code in the context of an aborted transaction, and an
+				 * arbitrary partitioning operator might not be safe in that
+				 * context.  datumIsEqual() should be simple enough to be
+				 * safe.
+				 */
+				if (!datumIsEqual(b1->datums[i][j], b2->datums[i][j],
+								  parttypbyval[j], parttyplen[j]))
+					return false;
 			}
 
-			/*
-			 * Compare the actual values. Note that it would be both incorrect
-			 * and unsafe to invoke the comparison operator derived from the
-			 * partitioning specification here.  It would be incorrect because
-			 * we want the relcache entry to be updated for ANY change to the
-			 * partition bounds, not just those that the partitioning operator
-			 * thinks are significant.  It would be unsafe because we might
-			 * reach this code in the context of an aborted transaction, and
-			 * an arbitrary partitioning operator might not be safe in that
-			 * context.  datumIsEqual() should be simple enough to be safe.
-			 */
-			if (!datumIsEqual(b1->datums[i][j], b2->datums[i][j],
-							  parttypbyval[j], parttyplen[j]))
+			if (b1->indexes[i] != b2->indexes[i])
 				return false;
 		}
 
-		if (b1->indexes[i] != b2->indexes[i])
+		/* There are ndatums+1 indexes in case of range partitions */
+		if (b1->strategy == PARTITION_STRATEGY_RANGE &&
+			b1->indexes[i] != b2->indexes[i])
 			return false;
 	}
+	return true;
+}
 
-	/* There are ndatums+1 indexes in case of range partitions */
-	if (b1->strategy == PARTITION_STRATEGY_RANGE &&
-		b1->indexes[i] != b2->indexes[i])
-		return false;
+/*
+ * Return a copy of given PartitionBoundInfo structure. The data types of bounds
+ * are described by given partition key specification.
+ */
+PartitionBoundInfo
+partition_bounds_copy(PartitionBoundInfo src,
+					  PartitionKey key)
+{
+	PartitionBoundInfo dest;
+	int			i;
+	int			ndatums;
+	int			partnatts;
+	int			num_indexes;
 
-	return true;
+	dest = (PartitionBoundInfo) palloc(sizeof(PartitionBoundInfoData));
+
+	dest->strategy = src->strategy;
+	ndatums = dest->ndatums = src->ndatums;
+	partnatts = key->partnatts;
+
+	num_indexes = get_partition_bound_num_indexes(src);
+
+	/* List partitioned tables have only a single partition key. */
+	Assert(key->strategy != PARTITION_STRATEGY_LIST || partnatts == 1);
+
+	dest->datums = (Datum **) palloc(sizeof(Datum *) * ndatums);
+
+	if (src->kind != NULL)
+	{
+		dest->kind = (PartitionRangeDatumKind **) palloc(ndatums *
+														 sizeof(PartitionRangeDatumKind *));
+		for (i = 0; i < ndatums; i++)
+		{
+			dest->kind[i] = (PartitionRangeDatumKind *) palloc(partnatts *
+															   sizeof(PartitionRangeDatumKind));
+
+			memcpy(dest->kind[i], src->kind[i],
+				   sizeof(PartitionRangeDatumKind) * key->partnatts);
+		}
+	}
+	else
+		dest->kind = NULL;
+
+	for (i = 0; i < ndatums; i++)
+	{
+		int			j;
+
+		/*
+		 * For a corresponding to hash partition, datums array will have two
+		 * elements - modulus and remainder.
+		 */
+		bool		hash_part = (key->strategy == PARTITION_STRATEGY_HASH);
+		int			natts = hash_part ? 2 : partnatts;
+
+		dest->datums[i] = (Datum *) palloc(sizeof(Datum) * natts);
+
+		for (j = 0; j < natts; j++)
+		{
+			bool		byval;
+			int			typlen;
+
+			if (hash_part)
+			{
+				typlen = sizeof(int32); /* Always int4 */
+				byval = true;	/* int4 is pass-by-value */
+			}
+			else
+			{
+				byval = key->parttypbyval[j];
+				typlen = key->parttyplen[j];
+			}
+
+			if (dest->kind == NULL ||
+				dest->kind[i][j] == PARTITION_RANGE_DATUM_VALUE)
+				dest->datums[i][j] = datumCopy(src->datums[i][j],
+											   byval, typlen);
+		}
+	}
+
+	dest->indexes = (int *) palloc(sizeof(int) * num_indexes);
+	memcpy(dest->indexes, src->indexes, sizeof(int) * num_indexes);
+
+	dest->null_index = src->null_index;
+	dest->default_index = src->default_index;
+
+	return dest;
 }
 
 /*
@@ -655,25 +956,122 @@ check_new_partition_bound(char *relname, Relation parent,
 {
 	PartitionKey key = RelationGetPartitionKey(parent);
 	PartitionDesc partdesc = RelationGetPartitionDesc(parent);
+	PartitionBoundInfo boundinfo = partdesc->boundinfo;
 	ParseState *pstate = make_parsestate(NULL);
 	int			with = -1;
 	bool		overlap = false;
 
+	if (spec->is_default)
+	{
+		if (boundinfo == NULL || !partition_bound_has_default(boundinfo))
+			return;
+
+		/* Default partition already exists, error out. */
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("partition \"%s\" conflicts with existing default partition \"%s\"",
+						relname, get_rel_name(partdesc->oids[boundinfo->default_index])),
+				 parser_errposition(pstate, spec->location)));
+	}
+
 	switch (key->strategy)
 	{
+		case PARTITION_STRATEGY_HASH:
+			{
+				Assert(spec->strategy == PARTITION_STRATEGY_HASH);
+				Assert(spec->remainder >= 0 && spec->remainder < spec->modulus);
+
+				if (partdesc->nparts > 0)
+				{
+					PartitionBoundInfo boundinfo = partdesc->boundinfo;
+					Datum	  **datums = boundinfo->datums;
+					int			ndatums = boundinfo->ndatums;
+					int			greatest_modulus;
+					int			remainder;
+					int			offset;
+					bool		valid_modulus = true;
+					int			prev_modulus,	/* Previous largest modulus */
+								next_modulus;	/* Next largest modulus */
+
+					/*
+					 * Check rule that every modulus must be a factor of the
+					 * next larger modulus.  For example, if you have a bunch
+					 * of partitions that all have modulus 5, you can add a
+					 * new partition with modulus 10 or a new partition with
+					 * modulus 15, but you cannot add both a partition with
+					 * modulus 10 and a partition with modulus 15, because 10
+					 * is not a factor of 15.
+					 *
+					 * Get the greatest (modulus, remainder) pair contained in
+					 * boundinfo->datums that is less than or equal to the
+					 * (spec->modulus, spec->remainder) pair.
+					 */
+					offset = partition_hash_bsearch(boundinfo,
+													spec->modulus,
+													spec->remainder);
+					if (offset < 0)
+					{
+						next_modulus = DatumGetInt32(datums[0][0]);
+						valid_modulus = (next_modulus % spec->modulus) == 0;
+					}
+					else
+					{
+						prev_modulus = DatumGetInt32(datums[offset][0]);
+						valid_modulus = (spec->modulus % prev_modulus) == 0;
+
+						if (valid_modulus && (offset + 1) < ndatums)
+						{
+							next_modulus = DatumGetInt32(datums[offset + 1][0]);
+							valid_modulus = (next_modulus % spec->modulus) == 0;
+						}
+					}
+
+					if (!valid_modulus)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+								 errmsg("every hash partition modulus must be a factor of the next larger modulus")));
+
+					greatest_modulus = get_greatest_modulus(boundinfo);
+					remainder = spec->remainder;
+
+					/*
+					 * Normally, the lowest remainder that could conflict with
+					 * the new partition is equal to the remainder specified
+					 * for the new partition, but when the new partition has a
+					 * modulus higher than any used so far, we need to adjust.
+					 */
+					if (remainder >= greatest_modulus)
+						remainder = remainder % greatest_modulus;
+
+					/* Check every potentially-conflicting remainder. */
+					do
+					{
+						if (boundinfo->indexes[remainder] != -1)
+						{
+							overlap = true;
+							with = boundinfo->indexes[remainder];
+							break;
+						}
+						remainder += spec->modulus;
+					} while (remainder < greatest_modulus);
+				}
+
+				break;
+			}
+
 		case PARTITION_STRATEGY_LIST:
 			{
 				Assert(spec->strategy == PARTITION_STRATEGY_LIST);
 
 				if (partdesc->nparts > 0)
 				{
-					PartitionBoundInfo boundinfo = partdesc->boundinfo;
 					ListCell   *cell;
 
 					Assert(boundinfo &&
 						   boundinfo->strategy == PARTITION_STRATEGY_LIST &&
 						   (boundinfo->ndatums > 0 ||
-							partition_bound_accepts_nulls(boundinfo)));
+							partition_bound_accepts_nulls(boundinfo) ||
+							partition_bound_has_default(boundinfo)));
 
 					foreach(cell, spec->listdatums)
 					{
@@ -684,9 +1082,11 @@ check_new_partition_bound(char *relname, Relation parent,
 							int			offset;
 							bool		equal;
 
-							offset = partition_bound_bsearch(key, boundinfo,
-															 &val->constvalue,
-															 true, &equal);
+							offset = partition_list_bsearch(key->partsupfunc,
+														key->partcollation,
+															boundinfo,
+															val->constvalue,
+															&equal);
 							if (offset >= 0 && equal)
 							{
 								overlap = true;
@@ -719,8 +1119,9 @@ check_new_partition_bound(char *relname, Relation parent,
 				 * First check if the resulting range would be empty with
 				 * specified lower and upper bounds
 				 */
-				if (partition_rbound_cmp(key, lower->datums, lower->kind, true,
-										 upper) >= 0)
+				if (partition_rbound_cmp(key->partnatts, key->partsupfunc,
+										 key->partcollation, lower->datums,
+										 lower->kind, true, upper) >= 0)
 				{
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
@@ -738,8 +1139,10 @@ check_new_partition_bound(char *relname, Relation parent,
 					int			offset;
 					bool		equal;
 
-					Assert(boundinfo && boundinfo->ndatums > 0 &&
-						   boundinfo->strategy == PARTITION_STRATEGY_RANGE);
+					Assert(boundinfo &&
+						   boundinfo->strategy == PARTITION_STRATEGY_RANGE &&
+						   (boundinfo->ndatums > 0 ||
+							partition_bound_has_default(boundinfo)));
 
 					/*
 					 * Test whether the new lower bound (which is treated
@@ -756,8 +1159,11 @@ check_new_partition_bound(char *relname, Relation parent,
 					 * since the index array is initialised with an extra -1
 					 * at the end.
 					 */
-					offset = partition_bound_bsearch(key, boundinfo, lower,
-													 true, &equal);
+					offset = partition_range_bsearch(key->partnatts,
+													 key->partsupfunc,
+													 key->partcollation,
+													 boundinfo, lower,
+													 &equal);
 
 					if (boundinfo->indexes[offset + 1] < 0)
 					{
@@ -770,10 +1176,19 @@ check_new_partition_bound(char *relname, Relation parent,
 						if (offset + 1 < boundinfo->ndatums)
 						{
 							int32		cmpval;
-
-							cmpval = partition_bound_cmp(key, boundinfo,
-														 offset + 1, upper,
-														 true);
+							Datum 	   *datums;
+							PartitionRangeDatumKind *kind;
+							bool		is_lower;
+
+							datums = boundinfo->datums[offset + 1];
+							kind = boundinfo->kind[offset + 1];
+							is_lower = (boundinfo->indexes[offset + 1] == -1);
+
+							cmpval = partition_rbound_cmp(key->partnatts,
+														  key->partsupfunc,
+														  key->partcollation,
+														  datums, kind,
+														  is_lower, upper);
 							if (cmpval < 0)
 							{
 								/*
@@ -816,6 +1231,157 @@ check_new_partition_bound(char *relname, Relation parent,
 	}
 }
 
+/*
+ * check_default_allows_bound
+ *
+ * This function checks if there exists a row in the default partition that
+ * would properly belong to the new partition being added.  If it finds one,
+ * it throws an error.
+ */
+void
+check_default_allows_bound(Relation parent, Relation default_rel,
+						   PartitionBoundSpec *new_spec)
+{
+	List	   *new_part_constraints;
+	List	   *def_part_constraints;
+	List	   *all_parts;
+	ListCell   *lc;
+
+	new_part_constraints = (new_spec->strategy == PARTITION_STRATEGY_LIST)
+		? get_qual_for_list(parent, new_spec)
+		: get_qual_for_range(parent, new_spec, false);
+	def_part_constraints =
+		get_proposed_default_constraint(new_part_constraints);
+
+	/*
+	 * If the existing constraints on the default partition imply that it will
+	 * not contain any row that would belong to the new partition, we can
+	 * avoid scanning the default partition.
+	 */
+	if (PartConstraintImpliedByRelConstraint(default_rel, def_part_constraints))
+	{
+		ereport(INFO,
+				(errmsg("updated partition constraint for default partition \"%s\" is implied by existing constraints",
+						RelationGetRelationName(default_rel))));
+		return;
+	}
+
+	/*
+	 * Scan the default partition and its subpartitions, and check for rows
+	 * that do not satisfy the revised partition constraints.
+	 */
+	if (default_rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		all_parts = find_all_inheritors(RelationGetRelid(default_rel),
+										AccessExclusiveLock, NULL);
+	else
+		all_parts = list_make1_oid(RelationGetRelid(default_rel));
+
+	foreach(lc, all_parts)
+	{
+		Oid			part_relid = lfirst_oid(lc);
+		Relation	part_rel;
+		Expr	   *constr;
+		Expr	   *partition_constraint;
+		EState	   *estate;
+		HeapTuple	tuple;
+		ExprState  *partqualstate = NULL;
+		Snapshot	snapshot;
+		TupleDesc	tupdesc;
+		ExprContext *econtext;
+		HeapScanDesc scan;
+		MemoryContext oldCxt;
+		TupleTableSlot *tupslot;
+
+		/* Lock already taken above. */
+		if (part_relid != RelationGetRelid(default_rel))
+		{
+			part_rel = heap_open(part_relid, NoLock);
+
+			/*
+			 * If the partition constraints on default partition child imply
+			 * that it will not contain any row that would belong to the new
+			 * partition, we can avoid scanning the child table.
+			 */
+			if (PartConstraintImpliedByRelConstraint(part_rel,
+													 def_part_constraints))
+			{
+				ereport(INFO,
+						(errmsg("updated partition constraint for default partition \"%s\" is implied by existing constraints",
+								RelationGetRelationName(part_rel))));
+
+				heap_close(part_rel, NoLock);
+				continue;
+			}
+		}
+		else
+			part_rel = default_rel;
+
+		/*
+		 * Only RELKIND_RELATION relations (i.e. leaf partitions) need to be
+		 * scanned.
+		 */
+		if (part_rel->rd_rel->relkind != RELKIND_RELATION)
+		{
+			if (part_rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
+				ereport(WARNING,
+						(errcode(ERRCODE_CHECK_VIOLATION),
+						 errmsg("skipped scanning foreign table \"%s\" which is a partition of default partition \"%s\"",
+								RelationGetRelationName(part_rel),
+								RelationGetRelationName(default_rel))));
+
+			if (RelationGetRelid(default_rel) != RelationGetRelid(part_rel))
+				heap_close(part_rel, NoLock);
+
+			continue;
+		}
+
+		tupdesc = CreateTupleDescCopy(RelationGetDescr(part_rel));
+		constr = linitial(def_part_constraints);
+		partition_constraint = (Expr *)
+			map_partition_varattnos((List *) constr,
+									1, part_rel, parent, NULL);
+		estate = CreateExecutorState();
+
+		/* Build expression execution states for partition check quals */
+		partqualstate = ExecPrepareExpr(partition_constraint, estate);
+
+		econtext = GetPerTupleExprContext(estate);
+		snapshot = RegisterSnapshot(GetLatestSnapshot());
+		scan = heap_beginscan(part_rel, snapshot, 0, NULL);
+		tupslot = MakeSingleTupleTableSlot(tupdesc);
+
+		/*
+		 * Switch to per-tuple memory context and reset it for each tuple
+		 * produced, so we don't leak memory.
+		 */
+		oldCxt = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
+
+		while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+		{
+			ExecStoreTuple(tuple, tupslot, InvalidBuffer, false);
+			econtext->ecxt_scantuple = tupslot;
+
+			if (!ExecCheck(partqualstate, econtext))
+				ereport(ERROR,
+						(errcode(ERRCODE_CHECK_VIOLATION),
+						 errmsg("updated partition constraint for default partition \"%s\" would be violated by some row",
+								RelationGetRelationName(default_rel))));
+
+			ResetExprContext(econtext);
+			CHECK_FOR_INTERRUPTS();
+		}
+
+		MemoryContextSwitchTo(oldCxt);
+		heap_endscan(scan);
+		UnregisterSnapshot(snapshot);
+		ExecDropSingleTupleTableSlot(tupslot);
+		FreeExecutorState(estate);
+
+		if (RelationGetRelid(default_rel) != RelationGetRelid(part_rel))
+			heap_close(part_rel, NoLock);	/* keep the lock until commit */
+	}
+}
+
 /*
  * get_partition_parent
  *
@@ -878,14 +1444,19 @@ get_qual_from_partbound(Relation rel, Relation parent,
 
 	switch (key->strategy)
 	{
+		case PARTITION_STRATEGY_HASH:
+			Assert(spec->strategy == PARTITION_STRATEGY_HASH);
+			my_qual = get_qual_for_hash(parent, spec);
+			break;
+
 		case PARTITION_STRATEGY_LIST:
 			Assert(spec->strategy == PARTITION_STRATEGY_LIST);
-			my_qual = get_qual_for_list(key, spec);
+			my_qual = get_qual_for_list(parent, spec);
 			break;
 
 		case PARTITION_STRATEGY_RANGE:
 			Assert(spec->strategy == PARTITION_STRATEGY_RANGE);
-			my_qual = get_qual_for_range(key, spec);
+			my_qual = get_qual_for_range(parent, spec, false);
 			break;
 
 		default:
@@ -898,10 +1469,13 @@ get_qual_from_partbound(Relation rel, Relation parent,
 
 /*
  * map_partition_varattnos - maps varattno of any Vars in expr from the
- * parent attno to partition attno.
+ * attno's of 'from_rel' to the attno's of 'to_rel' partition, each of which
+ * may be either a leaf partition or a partitioned table, but both of which
+ * must be from the same partitioning hierarchy.
  *
- * We must allow for cases where physical attnos of a partition can be
- * different from the parent's.
+ * Even though all of the same column names must be present in all relations
+ * in the hierarchy, and they must also have the same types, the attnos may
+ * be different.
  *
  * If found_whole_row is not NULL, *found_whole_row returns whether a
  * whole-row variable was found in the input expression.
@@ -911,25 +1485,27 @@ get_qual_from_partbound(Relation rel, Relation parent,
  * are working on Lists, so it's less messy to do the casts internally.
  */
 List *
-map_partition_varattnos(List *expr, int target_varno,
-						Relation partrel, Relation parent,
+map_partition_varattnos(List *expr, int fromrel_varno,
+						Relation to_rel, Relation from_rel,
 						bool *found_whole_row)
 {
-	AttrNumber *part_attnos;
-	bool		my_found_whole_row;
+	bool		my_found_whole_row = false;
 
-	if (expr == NIL)
-		return NIL;
+	if (expr != NIL)
+	{
+		AttrNumber *part_attnos;
+
+		part_attnos = convert_tuples_by_name_map(RelationGetDescr(to_rel),
+												 RelationGetDescr(from_rel),
+												 gettext_noop("could not convert row type"));
+		expr = (List *) map_variable_attnos((Node *) expr,
+											fromrel_varno, 0,
+											part_attnos,
+											RelationGetDescr(from_rel)->natts,
+											RelationGetForm(to_rel)->reltype,
+											&my_found_whole_row);
+	}
 
-	part_attnos = convert_tuples_by_name_map(RelationGetDescr(partrel),
-											 RelationGetDescr(parent),
-											 gettext_noop("could not convert row type"));
-	expr = (List *) map_variable_attnos((Node *) expr,
-										target_varno, 0,
-										part_attnos,
-										RelationGetDescr(parent)->natts,
-										RelationGetForm(partrel)->reltype,
-										&my_found_whole_row);
 	if (found_whole_row)
 		*found_whole_row = my_found_whole_row;
 
@@ -955,7 +1531,8 @@ RelationGetPartitionQual(Relation rel)
  * get_partition_qual_relid
  *
  * Returns an expression tree describing the passed-in relation's partition
- * constraint.
+ * constraint. If there is no partition constraint returns NULL; this can
+ * happen if the default partition is the only partition.
  */
 Expr *
 get_partition_qual_relid(Oid relid)
@@ -968,7 +1545,10 @@ get_partition_qual_relid(Oid relid)
 	if (rel->rd_rel->relispartition)
 	{
 		and_args = generate_partition_qual(rel);
-		if (list_length(and_args) > 1)
+
+		if (and_args == NIL)
+			result = NULL;
+		else if (list_length(and_args) > 1)
 			result = makeBoolExpr(AND_EXPR, and_args, -1);
 		else
 			result = linitial(and_args);
@@ -980,181 +1560,6 @@ get_partition_qual_relid(Oid relid)
 	return result;
 }
 
-/*
- * Append OIDs of rel's partitions to the list 'partoids' and for each OID,
- * append pointer rel to the list 'parents'.
- */
-#define APPEND_REL_PARTITION_OIDS(rel, partoids, parents) \
-	do\
-	{\
-		int		i;\
-		for (i = 0; i < (rel)->rd_partdesc->nparts; i++)\
-		{\
-			(partoids) = lappend_oid((partoids), (rel)->rd_partdesc->oids[i]);\
-			(parents) = lappend((parents), (rel));\
-		}\
-	} while(0)
-
-/*
- * RelationGetPartitionDispatchInfo
- *		Returns information necessary to route tuples down a partition tree
- *
- * All the partitions will be locked with lockmode, unless it is NoLock.
- * A list of the OIDs of all the leaf partitions of rel is returned in
- * *leaf_part_oids.
- */
-PartitionDispatch *
-RelationGetPartitionDispatchInfo(Relation rel, int lockmode,
-								 int *num_parted, List **leaf_part_oids)
-{
-	PartitionDispatchData **pd;
-	List	   *all_parts = NIL,
-			   *all_parents = NIL,
-			   *parted_rels,
-			   *parted_rel_parents;
-	ListCell   *lc1,
-			   *lc2;
-	int			i,
-				k,
-				offset;
-
-	/*
-	 * Lock partitions and make a list of the partitioned ones to prepare
-	 * their PartitionDispatch objects below.
-	 *
-	 * Cannot use find_all_inheritors() here, because then the order of OIDs
-	 * in parted_rels list would be unknown, which does not help, because we
-	 * assign indexes within individual PartitionDispatch in an order that is
-	 * predetermined (determined by the order of OIDs in individual partition
-	 * descriptors).
-	 */
-	*num_parted = 1;
-	parted_rels = list_make1(rel);
-	/* Root partitioned table has no parent, so NULL for parent */
-	parted_rel_parents = list_make1(NULL);
-	APPEND_REL_PARTITION_OIDS(rel, all_parts, all_parents);
-	forboth(lc1, all_parts, lc2, all_parents)
-	{
-		Relation	partrel = heap_open(lfirst_oid(lc1), lockmode);
-		Relation	parent = lfirst(lc2);
-		PartitionDesc partdesc = RelationGetPartitionDesc(partrel);
-
-		/*
-		 * If this partition is a partitioned table, add its children to the
-		 * end of the list, so that they are processed as well.
-		 */
-		if (partdesc)
-		{
-			(*num_parted)++;
-			parted_rels = lappend(parted_rels, partrel);
-			parted_rel_parents = lappend(parted_rel_parents, parent);
-			APPEND_REL_PARTITION_OIDS(partrel, all_parts, all_parents);
-		}
-		else
-			heap_close(partrel, NoLock);
-
-		/*
-		 * We keep the partitioned ones open until we're done using the
-		 * information being collected here (for example, see
-		 * ExecEndModifyTable).
-		 */
-	}
-
-	/*
-	 * We want to create two arrays - one for leaf partitions and another for
-	 * partitioned tables (including the root table and internal partitions).
-	 * While we only create the latter here, leaf partition array of suitable
-	 * objects (such as, ResultRelInfo) is created by the caller using the
-	 * list of OIDs we return.  Indexes into these arrays get assigned in a
-	 * breadth-first manner, whereby partitions of any given level are placed
-	 * consecutively in the respective arrays.
-	 */
-	pd = (PartitionDispatchData **) palloc(*num_parted *
-										   sizeof(PartitionDispatchData *));
-	*leaf_part_oids = NIL;
-	i = k = offset = 0;
-	forboth(lc1, parted_rels, lc2, parted_rel_parents)
-	{
-		Relation	partrel = lfirst(lc1);
-		Relation	parent = lfirst(lc2);
-		PartitionKey partkey = RelationGetPartitionKey(partrel);
-		TupleDesc	tupdesc = RelationGetDescr(partrel);
-		PartitionDesc partdesc = RelationGetPartitionDesc(partrel);
-		int			j,
-					m;
-
-		pd[i] = (PartitionDispatch) palloc(sizeof(PartitionDispatchData));
-		pd[i]->reldesc = partrel;
-		pd[i]->key = partkey;
-		pd[i]->keystate = NIL;
-		pd[i]->partdesc = partdesc;
-		if (parent != NULL)
-		{
-			/*
-			 * For every partitioned table other than root, we must store a
-			 * tuple table slot initialized with its tuple descriptor and a
-			 * tuple conversion map to convert a tuple from its parent's
-			 * rowtype to its own. That is to make sure that we are looking at
-			 * the correct row using the correct tuple descriptor when
-			 * computing its partition key for tuple routing.
-			 */
-			pd[i]->tupslot = MakeSingleTupleTableSlot(tupdesc);
-			pd[i]->tupmap = convert_tuples_by_name(RelationGetDescr(parent),
-												   tupdesc,
-												   gettext_noop("could not convert row type"));
-		}
-		else
-		{
-			/* Not required for the root partitioned table */
-			pd[i]->tupslot = NULL;
-			pd[i]->tupmap = NULL;
-		}
-		pd[i]->indexes = (int *) palloc(partdesc->nparts * sizeof(int));
-
-		/*
-		 * Indexes corresponding to the internal partitions are multiplied by
-		 * -1 to distinguish them from those of leaf partitions.  Encountering
-		 * an index >= 0 means we found a leaf partition, which is immediately
-		 * returned as the partition we are looking for.  A negative index
-		 * means we found a partitioned table, whose PartitionDispatch object
-		 * is located at the above index multiplied back by -1.  Using the
-		 * PartitionDispatch object, search is continued further down the
-		 * partition tree.
-		 */
-		m = 0;
-		for (j = 0; j < partdesc->nparts; j++)
-		{
-			Oid			partrelid = partdesc->oids[j];
-
-			if (get_rel_relkind(partrelid) != RELKIND_PARTITIONED_TABLE)
-			{
-				*leaf_part_oids = lappend_oid(*leaf_part_oids, partrelid);
-				pd[i]->indexes[j] = k++;
-			}
-			else
-			{
-				/*
-				 * offset denotes the number of partitioned tables of upper
-				 * levels including those of the current level.  Any partition
-				 * of this table must belong to the next level and hence will
-				 * be placed after the last partitioned table of this level.
-				 */
-				pd[i]->indexes[j] = -(1 + offset + m);
-				m++;
-			}
-		}
-		i++;
-
-		/*
-		 * This counts the number of partitioned tables at upper levels
-		 * including those of the current level.
-		 */
-		offset += m;
-	}
-
-	return pd;
-}
-
 /* Module-local functions */
 
 /*
@@ -1243,18 +1648,60 @@ make_partition_op_expr(PartitionKey key, int keynum,
 	{
 		case PARTITION_STRATEGY_LIST:
 			{
-				ScalarArrayOpExpr *saopexpr;
-
-				/* Build leftop = ANY (rightop) */
-				saopexpr = makeNode(ScalarArrayOpExpr);
-				saopexpr->opno = operoid;
-				saopexpr->opfuncid = get_opcode(operoid);
-				saopexpr->useOr = true;
-				saopexpr->inputcollid = key->partcollation[keynum];
-				saopexpr->args = list_make2(arg1, arg2);
-				saopexpr->location = -1;
-
-				result = (Expr *) saopexpr;
+				List	   *elems = (List *) arg2;
+				int			nelems = list_length(elems);
+
+				Assert(nelems >= 1);
+				Assert(keynum == 0);
+
+				if (nelems > 1 &&
+					!type_is_array(key->parttypid[keynum]))
+				{
+					ArrayExpr  *arrexpr;
+					ScalarArrayOpExpr *saopexpr;
+
+					/* Construct an ArrayExpr for the right-hand inputs */
+					arrexpr = makeNode(ArrayExpr);
+					arrexpr->array_typeid =
+									get_array_type(key->parttypid[keynum]);
+					arrexpr->array_collid = key->parttypcoll[keynum];
+					arrexpr->element_typeid = key->parttypid[keynum];
+					arrexpr->elements = elems;
+					arrexpr->multidims = false;
+					arrexpr->location = -1;
+
+					/* Build leftop = ANY (rightop) */
+					saopexpr = makeNode(ScalarArrayOpExpr);
+					saopexpr->opno = operoid;
+					saopexpr->opfuncid = get_opcode(operoid);
+					saopexpr->useOr = true;
+					saopexpr->inputcollid = key->partcollation[keynum];
+					saopexpr->args = list_make2(arg1, arrexpr);
+					saopexpr->location = -1;
+
+					result = (Expr *) saopexpr;
+				}
+				else
+				{
+					List	   *elemops = NIL;
+					ListCell   *lc;
+
+					foreach (lc, elems)
+					{
+						Expr   *elem = lfirst(lc),
+							   *elemop;
+
+						elemop = make_opclause(operoid,
+											   BOOLOID,
+											   false,
+											   arg1, elem,
+											   InvalidOid,
+											   key->partcollation[keynum]);
+						elemops = lappend(elemops, elemop);
+					}
+
+					result = nelems > 1 ? makeBoolExpr(OR_EXPR, elemops, -1) : linitial(elemops);
+				}
 				break;
 			}
 
@@ -1275,22 +1722,108 @@ make_partition_op_expr(PartitionKey key, int keynum,
 	return result;
 }
 
+/*
+ * get_qual_for_hash
+ *
+ * Returns a CHECK constraint expression to use as a hash partition's
+ * constraint, given the parent relation and partition bound structure.
+ *
+ * The partition constraint for a hash partition is always a call to the
+ * built-in function satisfies_hash_partition().
+ */
+static List *
+get_qual_for_hash(Relation parent, PartitionBoundSpec *spec)
+{
+	PartitionKey key = RelationGetPartitionKey(parent);
+	FuncExpr   *fexpr;
+	Node	   *relidConst;
+	Node	   *modulusConst;
+	Node	   *remainderConst;
+	List	   *args;
+	ListCell   *partexprs_item;
+	int			i;
+
+	/* Fixed arguments. */
+	relidConst = (Node *) makeConst(OIDOID,
+									-1,
+									InvalidOid,
+									sizeof(Oid),
+									ObjectIdGetDatum(RelationGetRelid(parent)),
+									false,
+									true);
+
+	modulusConst = (Node *) makeConst(INT4OID,
+									  -1,
+									  InvalidOid,
+									  sizeof(int32),
+									  Int32GetDatum(spec->modulus),
+									  false,
+									  true);
+
+	remainderConst = (Node *) makeConst(INT4OID,
+										-1,
+										InvalidOid,
+										sizeof(int32),
+										Int32GetDatum(spec->remainder),
+										false,
+										true);
+
+	args = list_make3(relidConst, modulusConst, remainderConst);
+	partexprs_item = list_head(key->partexprs);
+
+	/* Add an argument for each key column. */
+	for (i = 0; i < key->partnatts; i++)
+	{
+		Node	   *keyCol;
+
+		/* Left operand */
+		if (key->partattrs[i] != 0)
+		{
+			keyCol = (Node *) makeVar(1,
+									  key->partattrs[i],
+									  key->parttypid[i],
+									  key->parttypmod[i],
+									  key->parttypcoll[i],
+									  0);
+		}
+		else
+		{
+			keyCol = (Node *) copyObject(lfirst(partexprs_item));
+			partexprs_item = lnext(partexprs_item);
+		}
+
+		args = lappend(args, keyCol);
+	}
+
+	fexpr = makeFuncExpr(F_SATISFIES_HASH_PARTITION,
+						 BOOLOID,
+						 args,
+						 InvalidOid,
+						 InvalidOid,
+						 COERCE_EXPLICIT_CALL);
+
+	return list_make1(fexpr);
+}
+
 /*
  * get_qual_for_list
  *
  * Returns an implicit-AND list of expressions to use as a list partition's
- * constraint, given the partition key and bound structures.
+ * constraint, given the parent relation and partition bound structure.
+ *
+ * The function returns NIL for a default partition when it's the only
+ * partition since in that case there is no constraint.
  */
 static List *
-get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec)
+get_qual_for_list(Relation parent, PartitionBoundSpec *spec)
 {
+	PartitionKey key = RelationGetPartitionKey(parent);
 	List	   *result;
 	Expr	   *keyCol;
-	ArrayExpr  *arr;
 	Expr	   *opexpr;
 	NullTest   *nulltest;
 	ListCell   *cell;
-	List	   *arrelems = NIL;
+	List	   *elems = NIL;
 	bool		list_has_null = false;
 
 	/*
@@ -1310,37 +1843,86 @@ get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec)
 	else
 		keyCol = (Expr *) copyObject(linitial(key->partexprs));
 
-	/* Create list of Consts for the allowed values, excluding any nulls */
-	foreach(cell, spec->listdatums)
+	/*
+	 * For default list partition, collect datums for all the partitions. The
+	 * default partition constraint should check that the partition key is
+	 * equal to none of those.
+	 */
+	if (spec->is_default)
 	{
-		Const	   *val = castNode(Const, lfirst(cell));
+		int			i;
+		int			ndatums = 0;
+		PartitionDesc pdesc = RelationGetPartitionDesc(parent);
+		PartitionBoundInfo boundinfo = pdesc->boundinfo;
 
-		if (val->constisnull)
-			list_has_null = true;
-		else
-			arrelems = lappend(arrelems, copyObject(val));
+		if (boundinfo)
+		{
+			ndatums = boundinfo->ndatums;
+
+			if (partition_bound_accepts_nulls(boundinfo))
+				list_has_null = true;
+		}
+
+		/*
+		 * If default is the only partition, there need not be any partition
+		 * constraint on it.
+		 */
+		if (ndatums == 0 && !list_has_null)
+			return NIL;
+
+		for (i = 0; i < ndatums; i++)
+		{
+			Const	   *val;
+
+			/*
+			 * Construct Const from known-not-null datum.  We must be careful
+			 * to copy the value, because our result has to be able to outlive
+			 * the relcache entry we're copying from.
+			 */
+			val = makeConst(key->parttypid[0],
+							key->parttypmod[0],
+							key->parttypcoll[0],
+							key->parttyplen[0],
+							datumCopy(*boundinfo->datums[i],
+									  key->parttypbyval[0],
+									  key->parttyplen[0]),
+							false,	/* isnull */
+							key->parttypbyval[0]);
+
+			elems = lappend(elems, val);
+		}
+	}
+	else
+	{
+		/*
+		 * Create list of Consts for the allowed values, excluding any nulls.
+		 */
+		foreach(cell, spec->listdatums)
+		{
+			Const	   *val = castNode(Const, lfirst(cell));
+
+			if (val->constisnull)
+				list_has_null = true;
+			else
+				elems = lappend(elems, copyObject(val));
+		}
 	}
 
-	if (arrelems)
+	if (elems)
 	{
-		/* Construct an ArrayExpr for the non-null partition values */
-		arr = makeNode(ArrayExpr);
-		arr->array_typeid = !type_is_array(key->parttypid[0])
-			? get_array_type(key->parttypid[0])
-			: key->parttypid[0];
-		arr->array_collid = key->parttypcoll[0];
-		arr->element_typeid = key->parttypid[0];
-		arr->elements = arrelems;
-		arr->multidims = false;
-		arr->location = -1;
-
-		/* Generate the main expression, i.e., keyCol = ANY (arr) */
+		/*
+		 * Generate the operator expression from the non-null partition
+		 * values.
+		 */
 		opexpr = make_partition_op_expr(key, 0, BTEqualStrategyNumber,
-										keyCol, (Expr *) arr);
+										keyCol, (Expr *) elems);
 	}
 	else
 	{
-		/* If there are no partition values, we don't need an = ANY expr */
+		/*
+		 * If there are no partition values, we don't need an operator
+		 * expression.
+		 */
 		opexpr = NULL;
 	}
 
@@ -1382,6 +1964,18 @@ get_qual_for_list(PartitionKey key, PartitionBoundSpec *spec)
 			result = list_make1(nulltest);
 	}
 
+	/*
+	 * Note that, in general, applying NOT to a constraint expression doesn't
+	 * necessarily invert the set of rows it accepts, because NOT (NULL) is
+	 * NULL.  However, the partition constraints we construct here never
+	 * evaluate to NULL, so applying NOT works as intended.
+	 */
+	if (spec->is_default)
+	{
+		result = list_make1(make_ands_explicit(result));
+		result = list_make1(makeBoolExpr(NOT_EXPR, result, -1));
+	}
+
 	return result;
 }
 
@@ -1438,11 +2032,58 @@ get_range_key_properties(PartitionKey key, int keynum,
 		*upper_val = NULL;
 }
 
+ /*
+  * get_range_nulltest
+  *
+  * A non-default range partition table does not currently allow partition
+  * keys to be null, so emit an IS NOT NULL expression for each key column.
+  */
+static List *
+get_range_nulltest(PartitionKey key)
+{
+	List	   *result = NIL;
+	NullTest   *nulltest;
+	ListCell   *partexprs_item;
+	int			i;
+
+	partexprs_item = list_head(key->partexprs);
+	for (i = 0; i < key->partnatts; i++)
+	{
+		Expr	   *keyCol;
+
+		if (key->partattrs[i] != 0)
+		{
+			keyCol = (Expr *) makeVar(1,
+									  key->partattrs[i],
+									  key->parttypid[i],
+									  key->parttypmod[i],
+									  key->parttypcoll[i],
+									  0);
+		}
+		else
+		{
+			if (partexprs_item == NULL)
+				elog(ERROR, "wrong number of partition key expressions");
+			keyCol = copyObject(lfirst(partexprs_item));
+			partexprs_item = lnext(partexprs_item);
+		}
+
+		nulltest = makeNode(NullTest);
+		nulltest->arg = keyCol;
+		nulltest->nulltesttype = IS_NOT_NULL;
+		nulltest->argisrow = false;
+		nulltest->location = -1;
+		result = lappend(result, nulltest);
+	}
+
+	return result;
+}
+
 /*
  * get_qual_for_range
  *
  * Returns an implicit-AND list of expressions to use as a range partition's
- * constraint, given the partition key and bound structures.
+ * constraint, given the parent relation and partition bound structure.
  *
  * For a multi-column range partition key, say (a, b, c), with (al, bl, cl)
  * as the lower bound tuple and (au, bu, cu) as the upper bound tuple, we
@@ -1476,11 +2117,15 @@ get_range_key_properties(PartitionKey key, int keynum,
  * In most common cases with only one partition column, say a, the following
  * expression tree will be generated: a IS NOT NULL AND a >= al AND a < au
  *
- * If we end up with an empty result list, we return a single-member list
- * containing a constant TRUE, because callers expect a non-empty list.
+ * For default partition, it returns the negation of the constraints of all
+ * the other partitions.
+ *
+ * External callers should pass for_default as false; we set it to true only
+ * when recursing.
  */
 static List *
-get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec)
+get_qual_for_range(Relation parent, PartitionBoundSpec *spec,
+				   bool for_default)
 {
 	List	   *result = NIL;
 	ListCell   *cell1,
@@ -1491,10 +2136,10 @@ get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec)
 				j;
 	PartitionRangeDatum *ldatum,
 			   *udatum;
+	PartitionKey key = RelationGetPartitionKey(parent);
 	Expr	   *keyCol;
 	Const	   *lower_val,
 			   *upper_val;
-	NullTest   *nulltest;
 	List	   *lower_or_arms,
 			   *upper_or_arms;
 	int			num_or_arms,
@@ -1504,44 +2149,94 @@ get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec)
 	bool		need_next_lower_arm,
 				need_next_upper_arm;
 
-	lower_or_start_datum = list_head(spec->lowerdatums);
-	upper_or_start_datum = list_head(spec->upperdatums);
-	num_or_arms = key->partnatts;
-
-	/*
-	 * A range-partitioned table does not currently allow partition keys to be
-	 * null, so emit an IS NOT NULL expression for each key column.
-	 */
-	partexprs_item = list_head(key->partexprs);
-	for (i = 0; i < key->partnatts; i++)
+	if (spec->is_default)
 	{
-		Expr	   *keyCol;
+		List	   *or_expr_args = NIL;
+		PartitionDesc pdesc = RelationGetPartitionDesc(parent);
+		Oid		   *inhoids = pdesc->oids;
+		int			nparts = pdesc->nparts,
+					i;
 
-		if (key->partattrs[i] != 0)
+		for (i = 0; i < nparts; i++)
 		{
-			keyCol = (Expr *) makeVar(1,
-									  key->partattrs[i],
-									  key->parttypid[i],
-									  key->parttypmod[i],
-									  key->parttypcoll[i],
-									  0);
+			Oid			inhrelid = inhoids[i];
+			HeapTuple	tuple;
+			Datum		datum;
+			bool		isnull;
+			PartitionBoundSpec *bspec;
+
+			tuple = SearchSysCache1(RELOID, inhrelid);
+			if (!HeapTupleIsValid(tuple))
+				elog(ERROR, "cache lookup failed for relation %u", inhrelid);
+
+			datum = SysCacheGetAttr(RELOID, tuple,
+									Anum_pg_class_relpartbound,
+									&isnull);
+
+			Assert(!isnull);
+			bspec = (PartitionBoundSpec *)
+				stringToNode(TextDatumGetCString(datum));
+			if (!IsA(bspec, PartitionBoundSpec))
+				elog(ERROR, "expected PartitionBoundSpec");
+
+			if (!bspec->is_default)
+			{
+				List	   *part_qual;
+
+				part_qual = get_qual_for_range(parent, bspec, true);
+
+				/*
+				 * AND the constraints of the partition and add to
+				 * or_expr_args
+				 */
+				or_expr_args = lappend(or_expr_args, list_length(part_qual) > 1
+									   ? makeBoolExpr(AND_EXPR, part_qual, -1)
+									   : linitial(part_qual));
+			}
+			ReleaseSysCache(tuple);
 		}
-		else
+
+		if (or_expr_args != NIL)
 		{
-			if (partexprs_item == NULL)
-				elog(ERROR, "wrong number of partition key expressions");
-			keyCol = copyObject(lfirst(partexprs_item));
-			partexprs_item = lnext(partexprs_item);
+			Expr	   *other_parts_constr;
+
+			/*
+			 * Combine the constraints obtained for non-default partitions
+			 * using OR.  As requested, each of the OR's args doesn't include
+			 * the NOT NULL test for partition keys (which is to avoid its
+			 * useless repetition).  Add the same now.
+			 */
+			other_parts_constr =
+				makeBoolExpr(AND_EXPR,
+							 lappend(get_range_nulltest(key),
+									 list_length(or_expr_args) > 1
+									 ? makeBoolExpr(OR_EXPR, or_expr_args,
+													-1)
+									 : linitial(or_expr_args)),
+							 -1);
+
+			/*
+			 * Finally, the default partition contains everything *NOT*
+			 * contained in the non-default partitions.
+			 */
+			result = list_make1(makeBoolExpr(NOT_EXPR,
+											 list_make1(other_parts_constr), -1));
 		}
 
-		nulltest = makeNode(NullTest);
-		nulltest->arg = keyCol;
-		nulltest->nulltesttype = IS_NOT_NULL;
-		nulltest->argisrow = false;
-		nulltest->location = -1;
-		result = lappend(result, nulltest);
+		return result;
 	}
 
+	lower_or_start_datum = list_head(spec->lowerdatums);
+	upper_or_start_datum = list_head(spec->upperdatums);
+	num_or_arms = key->partnatts;
+
+	/*
+	 * If it is the recursive call for default, we skip the get_range_nulltest
+	 * to avoid accumulating the NullTest on the same keys for each partition.
+	 */
+	if (!for_default)
+		result = get_range_nulltest(key);
+
 	/*
 	 * Iterate over the key columns and check if the corresponding lower and
 	 * upper datums are equal using the btree equality operator for the
@@ -1763,9 +2458,16 @@ get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec)
 						 ? makeBoolExpr(OR_EXPR, upper_or_arms, -1)
 						 : linitial(upper_or_arms));
 
-	/* As noted above, caller expects the list to be non-empty. */
+	/*
+	 * As noted above, for non-default, we return list with constant TRUE. If
+	 * the result is NIL during the recursive call for default, it implies
+	 * this is the only other partition which can hold every value of the key
+	 * except NULL. Hence we return the NullTest result skipped earlier.
+	 */
 	if (result == NIL)
-		result = list_make1(makeBoolConst(true, false));
+		result = for_default
+			? get_range_nulltest(key)
+			: list_make1(makeBoolConst(true, false));
 
 	return result;
 }
@@ -1773,7 +2475,8 @@ get_qual_for_range(PartitionKey key, PartitionBoundSpec *spec)
 /*
  * generate_partition_qual
  *
- * Generate partition predicate from rel's partition bound expression
+ * Generate partition predicate from rel's partition bound expression. The
+ * function returns a NIL list if there is no predicate.
  *
  * Result expression tree is stored CacheMemoryContext to ensure it survives
  * as long as the relcache entry. But we should be running in a less long-lived
@@ -1852,218 +2555,204 @@ generate_partition_qual(Relation rel)
 	return result;
 }
 
-/* ----------------
- *		FormPartitionKeyDatum
- *			Construct values[] and isnull[] arrays for the partition key
- *			of a tuple.
- *
- *	pd				Partition dispatch object of the partitioned table
- *	slot			Heap tuple from which to extract partition key
- *	estate			executor state for evaluating any partition key
- *					expressions (must be non-NULL)
- *	values			Array of partition key Datums (output area)
- *	isnull			Array of is-null indicators (output area)
- *
- * the ecxt_scantuple slot of estate's per-tuple expr context must point to
- * the heap tuple passed in.
- * ----------------
- */
-void
-FormPartitionKeyDatum(PartitionDispatch pd,
-					  TupleTableSlot *slot,
-					  EState *estate,
-					  Datum *values,
-					  bool *isnull)
-{
-	ListCell   *partexpr_item;
-	int			i;
-
-	if (pd->key->partexprs != NIL && pd->keystate == NIL)
-	{
-		/* Check caller has set up context correctly */
-		Assert(estate != NULL &&
-			   GetPerTupleExprContext(estate)->ecxt_scantuple == slot);
-
-		/* First time through, set up expression evaluation state */
-		pd->keystate = ExecPrepareExprList(pd->key->partexprs, estate);
-	}
-
-	partexpr_item = list_head(pd->keystate);
-	for (i = 0; i < pd->key->partnatts; i++)
-	{
-		AttrNumber	keycol = pd->key->partattrs[i];
-		Datum		datum;
-		bool		isNull;
-
-		if (keycol != 0)
-		{
-			/* Plain column; get the value directly from the heap tuple */
-			datum = slot_getattr(slot, keycol, &isNull);
-		}
-		else
-		{
-			/* Expression; need to evaluate it */
-			if (partexpr_item == NULL)
-				elog(ERROR, "wrong number of partition key expressions");
-			datum = ExecEvalExprSwitchContext((ExprState *) lfirst(partexpr_item),
-											  GetPerTupleExprContext(estate),
-											  &isNull);
-			partexpr_item = lnext(partexpr_item);
-		}
-		values[i] = datum;
-		isnull[i] = isNull;
-	}
-
-	if (partexpr_item != NULL)
-		elog(ERROR, "wrong number of partition key expressions");
-}
-
 /*
  * get_partition_for_tuple
- *		Finds a leaf partition for tuple contained in *slot
+ *		Finds partition of relation which accepts the partition key specified
+ *		in values and isnull
  *
- * Returned value is the sequence number of the leaf partition thus found,
- * or -1 if no leaf partition is found for the tuple.  *failed_at is set
- * to the OID of the partitioned table whose partition was not found in
- * the latter case.
+ * Return value is index of the partition (>= 0 and < partdesc->nparts) if one
+ * found or -1 if none found.
  */
 int
-get_partition_for_tuple(PartitionDispatch *pd,
-						TupleTableSlot *slot,
-						EState *estate,
-						PartitionDispatchData **failed_at,
-						TupleTableSlot **failed_slot)
+get_partition_for_tuple(Relation relation, Datum *values, bool *isnull)
 {
-	PartitionDispatch parent;
-	Datum		values[PARTITION_MAX_KEYS];
-	bool		isnull[PARTITION_MAX_KEYS];
-	int			cur_offset,
-				cur_index;
-	int			i,
-				result;
-	ExprContext *ecxt = GetPerTupleExprContext(estate);
-	TupleTableSlot *ecxt_scantuple_old = ecxt->ecxt_scantuple;
+	int			bound_offset;
+	int			part_index = -1;
+	PartitionKey key = RelationGetPartitionKey(relation);
+	PartitionDesc partdesc = RelationGetPartitionDesc(relation);
 
-	/* start with the root partitioned table */
-	parent = pd[0];
-	while (true)
+	/* Route as appropriate based on partitioning strategy. */
+	switch (key->strategy)
 	{
-		PartitionKey key = parent->key;
-		PartitionDesc partdesc = parent->partdesc;
-		TupleTableSlot *myslot = parent->tupslot;
-		TupleConversionMap *map = parent->tupmap;
+		case PARTITION_STRATEGY_HASH:
+			{
+				PartitionBoundInfo boundinfo = partdesc->boundinfo;
+				int			greatest_modulus = get_greatest_modulus(boundinfo);
+				uint64		rowHash = compute_hash_value(key->partnatts,
+														 key->partsupfunc,
+														 values, isnull);
 
-		if (myslot != NULL && map != NULL)
-		{
-			HeapTuple	tuple = ExecFetchSlotTuple(slot);
+				part_index = boundinfo->indexes[rowHash % greatest_modulus];
+			}
+			break;
 
-			ExecClearTuple(myslot);
-			tuple = do_convert_tuple(tuple, map);
-			ExecStoreTuple(tuple, myslot, InvalidBuffer, true);
-			slot = myslot;
-		}
+		case PARTITION_STRATEGY_LIST:
+			if (isnull[0])
+			{
+				if (partition_bound_accepts_nulls(partdesc->boundinfo))
+					part_index = partdesc->boundinfo->null_index;
+			}
+			else
+			{
+				bool		equal = false;
+
+				bound_offset = partition_list_bsearch(key->partsupfunc,
+													  key->partcollation,
+													  partdesc->boundinfo,
+													  values[0], &equal);
+				if (bound_offset >= 0 && equal)
+					part_index = partdesc->boundinfo->indexes[bound_offset];
+			}
+			break;
 
-		/* Quick exit */
-		if (partdesc->nparts == 0)
-		{
-			*failed_at = parent;
-			*failed_slot = slot;
-			result = -1;
-			goto error_exit;
-		}
+		case PARTITION_STRATEGY_RANGE:
+			{
+				bool		equal = false,
+							range_partkey_has_null = false;
+				int			i;
 
-		/*
-		 * Extract partition key from tuple. Expression evaluation machinery
-		 * that FormPartitionKeyDatum() invokes expects ecxt_scantuple to
-		 * point to the correct tuple slot.  The slot might have changed from
-		 * what was used for the parent table if the table of the current
-		 * partitioning level has different tuple descriptor from the parent.
-		 * So update ecxt_scantuple accordingly.
-		 */
-		ecxt->ecxt_scantuple = slot;
-		FormPartitionKeyDatum(parent, slot, estate, values, isnull);
+				/*
+				 * No range includes NULL, so this will be accepted by the
+				 * default partition if there is one, and otherwise rejected.
+				 */
+				for (i = 0; i < key->partnatts; i++)
+				{
+					if (isnull[i])
+					{
+						range_partkey_has_null = true;
+						break;
+					}
+				}
 
-		if (key->strategy == PARTITION_STRATEGY_RANGE)
-		{
-			/*
-			 * Since we cannot route tuples with NULL partition keys through a
-			 * range-partitioned table, simply return that no partition exists
-			 */
-			for (i = 0; i < key->partnatts; i++)
-			{
-				if (isnull[i])
+				if (!range_partkey_has_null)
 				{
-					*failed_at = parent;
-					*failed_slot = slot;
-					result = -1;
-					goto error_exit;
+					bound_offset = partition_range_datum_bsearch(key->partsupfunc,
+																 key->partcollation,
+																 partdesc->boundinfo,
+																 key->partnatts,
+																 values,
+																 &equal);
+
+					/*
+					 * The bound at bound_offset is less than or equal to the
+					 * tuple value, so the bound at offset+1 is the upper
+					 * bound of the partition we're looking for, if there
+					 * actually exists one.
+					 */
+					part_index = partdesc->boundinfo->indexes[bound_offset + 1];
 				}
 			}
-		}
+			break;
 
-		/*
-		 * A null partition key is only acceptable if null-accepting list
-		 * partition exists.
-		 */
-		cur_index = -1;
-		if (isnull[0] && partition_bound_accepts_nulls(partdesc->boundinfo))
-			cur_index = partdesc->boundinfo->null_index;
-		else if (!isnull[0])
-		{
-			/* Else bsearch in partdesc->boundinfo */
-			bool		equal = false;
+		default:
+			elog(ERROR, "unexpected partition strategy: %d",
+				 (int) key->strategy);
+	}
 
-			cur_offset = partition_bound_bsearch(key, partdesc->boundinfo,
-												 values, false, &equal);
-			switch (key->strategy)
-			{
-				case PARTITION_STRATEGY_LIST:
-					if (cur_offset >= 0 && equal)
-						cur_index = partdesc->boundinfo->indexes[cur_offset];
-					else
-						cur_index = -1;
-					break;
+	/*
+	 * part_index < 0 means we failed to find a partition of this parent. Use
+	 * the default partition, if there is one.
+	 */
+	if (part_index < 0)
+		part_index = partdesc->boundinfo->default_index;
 
-				case PARTITION_STRATEGY_RANGE:
+	return part_index;
+}
 
-					/*
-					 * Offset returned is such that the bound at offset is
-					 * found to be less or equal with the tuple. So, the bound
-					 * at offset+1 would be the upper bound.
-					 */
-					cur_index = partdesc->boundinfo->indexes[cur_offset + 1];
-					break;
+/*
+ * Checks if any of the 'attnums' is a partition key attribute for rel
+ *
+ * Sets *used_in_expr if any of the 'attnums' is found to be referenced in some
+ * partition key expression.  It's possible for a column to be both used
+ * directly and as part of an expression; if that happens, *used_in_expr may
+ * end up as either true or false.  That's OK for current uses of this
+ * function, because *used_in_expr is only used to tailor the error message
+ * text.
+ */
+bool
+has_partition_attrs(Relation rel, Bitmapset *attnums,
+					bool *used_in_expr)
+{
+	PartitionKey key;
+	int			partnatts;
+	List	   *partexprs;
+	ListCell   *partexprs_item;
+	int			i;
 
-				default:
-					elog(ERROR, "unexpected partition strategy: %d",
-						 (int) key->strategy);
-			}
-		}
+	if (attnums == NULL || rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		return false;
 
-		/*
-		 * cur_index < 0 means we failed to find a partition of this parent.
-		 * cur_index >= 0 means we either found the leaf partition, or the
-		 * next parent to find a partition of.
-		 */
-		if (cur_index < 0)
+	key = RelationGetPartitionKey(rel);
+	partnatts = get_partition_natts(key);
+	partexprs = get_partition_exprs(key);
+
+	partexprs_item = list_head(partexprs);
+	for (i = 0; i < partnatts; i++)
+	{
+		AttrNumber	partattno = get_partition_col_attnum(key, i);
+
+		if (partattno != 0)
 		{
-			result = -1;
-			*failed_at = parent;
-			*failed_slot = slot;
-			break;
+			if (bms_is_member(partattno - FirstLowInvalidHeapAttributeNumber,
+							  attnums))
+			{
+				if (used_in_expr)
+					*used_in_expr = false;
+				return true;
+			}
 		}
-		else if (parent->indexes[cur_index] >= 0)
+		else
 		{
-			result = parent->indexes[cur_index];
-			break;
+			/* Arbitrary expression */
+			Node	   *expr = (Node *) lfirst(partexprs_item);
+			Bitmapset  *expr_attrs = NULL;
+
+			/* Find all attributes referenced */
+			pull_varattnos(expr, 1, &expr_attrs);
+			partexprs_item = lnext(partexprs_item);
+
+			if (bms_overlap(attnums, expr_attrs))
+			{
+				if (used_in_expr)
+					*used_in_expr = true;
+				return true;
+			}
 		}
-		else
-			parent = pd[-parent->indexes[cur_index]];
 	}
 
-error_exit:
-	ecxt->ecxt_scantuple = ecxt_scantuple_old;
-	return result;
+	return false;
+}
+
+/*
+ * qsort_partition_hbound_cmp
+ *
+ * We sort hash bounds by modulus, then by remainder.
+ */
+static int32
+qsort_partition_hbound_cmp(const void *a, const void *b)
+{
+	PartitionHashBound *h1 = (*(PartitionHashBound *const *) a);
+	PartitionHashBound *h2 = (*(PartitionHashBound *const *) b);
+
+	return partition_hbound_cmp(h1->modulus, h1->remainder,
+								h2->modulus, h2->remainder);
+}
+
+/*
+ * partition_hbound_cmp
+ *
+ * Compares modulus first, then remainder if modulus are equal.
+ */
+static int32
+partition_hbound_cmp(int modulus1, int remainder1, int modulus2, int remainder2)
+{
+	if (modulus1 < modulus2)
+		return -1;
+	if (modulus1 > modulus2)
+		return 1;
+	if (modulus1 == modulus2 && remainder1 != remainder2)
+		return (remainder1 > remainder2) ? 1 : -1;
+	return 0;
 }
 
 /*
@@ -2097,6 +2786,8 @@ make_one_range_bound(PartitionKey key, int index, List *datums, bool lower)
 	ListCell   *lc;
 	int			i;
 
+	Assert(datums != NIL);
+
 	bound = (PartitionRangeBound *) palloc0(sizeof(PartitionRangeBound));
 	bound->index = index;
 	bound->datums = (Datum *) palloc0(key->partnatts * sizeof(Datum));
@@ -2135,15 +2826,21 @@ qsort_partition_rbound_cmp(const void *a, const void *b, void *arg)
 	PartitionRangeBound *b2 = (*(PartitionRangeBound *const *) b);
 	PartitionKey key = (PartitionKey) arg;
 
-	return partition_rbound_cmp(key, b1->datums, b1->kind, b1->lower, b2);
+	return partition_rbound_cmp(key->partnatts, key->partsupfunc,
+								key->partcollation, b1->datums, b1->kind,
+								b1->lower, b2);
 }
 
 /*
  * partition_rbound_cmp
  *
- * Return for two range bounds whether the 1st one (specified in datum1,
+ * Return for two range bounds whether the 1st one (specified in datums1,
  * kind1, and lower1) is <, =, or > the bound specified in *b2.
  *
+ * partnatts, partsupfunc and partcollation give the number of attributes in the
+ * bounds to be compared, comparison function to be used and the collations of
+ * attributes, respectively.
+ *
  * Note that if the values of the two range bounds compare equal, then we take
  * into account whether they are upper or lower bounds, and an upper bound is
  * considered to be smaller than a lower bound. This is important to the way
@@ -2152,7 +2849,7 @@ qsort_partition_rbound_cmp(const void *a, const void *b, void *arg)
  * two contiguous partitions.
  */
 static int32
-partition_rbound_cmp(PartitionKey key,
+partition_rbound_cmp(int partnatts, FmgrInfo *partsupfunc, Oid *partcollation,
 					 Datum *datums1, PartitionRangeDatumKind *kind1,
 					 bool lower1, PartitionRangeBound *b2)
 {
@@ -2162,7 +2859,7 @@ partition_rbound_cmp(PartitionKey key,
 	PartitionRangeDatumKind *kind2 = b2->kind;
 	bool		lower2 = b2->lower;
 
-	for (i = 0; i < key->partnatts; i++)
+	for (i = 0; i < partnatts; i++)
 	{
 		/*
 		 * First, handle cases where the column is unbounded, which should not
@@ -2183,8 +2880,8 @@ partition_rbound_cmp(PartitionKey key,
 			 */
 			break;
 
-		cmpval = DatumGetInt32(FunctionCall2Coll(&key->partsupfunc[i],
-												 key->partcollation[i],
+		cmpval = DatumGetInt32(FunctionCall2Coll(&partsupfunc[i],
+												 partcollation[i],
 												 datums1[i],
 												 datums2[i]));
 		if (cmpval != 0)
@@ -2208,24 +2905,29 @@ partition_rbound_cmp(PartitionKey key,
  *
  * Return whether range bound (specified in rb_datums, rb_kind, and rb_lower)
  * is <, =, or > partition key of tuple (tuple_datums)
+ *
+ * n_tuple_datums, partsupfunc and partcollation give number of attributes in
+ * the bounds to be compared, comparison function to be used and the collations
+ * of attributes resp.
+ *
  */
 static int32
-partition_rbound_datum_cmp(PartitionKey key,
+partition_rbound_datum_cmp(FmgrInfo *partsupfunc, Oid *partcollation,
 						   Datum *rb_datums, PartitionRangeDatumKind *rb_kind,
-						   Datum *tuple_datums)
+						   Datum *tuple_datums, int n_tuple_datums)
 {
 	int			i;
 	int32		cmpval = -1;
 
-	for (i = 0; i < key->partnatts; i++)
+	for (i = 0; i < n_tuple_datums; i++)
 	{
 		if (rb_kind[i] == PARTITION_RANGE_DATUM_MINVALUE)
 			return -1;
 		else if (rb_kind[i] == PARTITION_RANGE_DATUM_MAXVALUE)
 			return 1;
 
-		cmpval = DatumGetInt32(FunctionCall2Coll(&key->partsupfunc[i],
-												 key->partcollation[i],
+		cmpval = DatumGetInt32(FunctionCall2Coll(&partsupfunc[i],
+												 partcollation[i],
 												 rb_datums[i],
 												 tuple_datums[i]));
 		if (cmpval != 0)
@@ -2236,75 +2938,105 @@ partition_rbound_datum_cmp(PartitionKey key,
 }
 
 /*
- * partition_bound_cmp
+ * partition_list_bsearch
+ *		Returns the index of the greatest bound datum that is less than equal
+ * 		to the given value or -1 if all of the bound datums are greater
  *
- * Return whether the bound at offset in boundinfo is <, =, or > the argument
- * specified in *probe.
+ * *is_equal is set to true if the bound datum at the returned index is equal
+ * to the input value.
  */
-static int32
-partition_bound_cmp(PartitionKey key, PartitionBoundInfo boundinfo,
-					int offset, void *probe, bool probe_is_bound)
+static int
+partition_list_bsearch(FmgrInfo *partsupfunc, Oid *partcollation,
+					   PartitionBoundInfo boundinfo,
+					   Datum value, bool *is_equal)
 {
-	Datum	   *bound_datums = boundinfo->datums[offset];
-	int32		cmpval = -1;
+	int			lo,
+				hi,
+				mid;
 
-	switch (key->strategy)
+	lo = -1;
+	hi = boundinfo->ndatums - 1;
+	while (lo < hi)
 	{
-		case PARTITION_STRATEGY_LIST:
-			cmpval = DatumGetInt32(FunctionCall2Coll(&key->partsupfunc[0],
-													 key->partcollation[0],
-													 bound_datums[0],
-													 *(Datum *) probe));
-			break;
+		int32		cmpval;
 
-		case PARTITION_STRATEGY_RANGE:
-			{
-				PartitionRangeDatumKind *kind = boundinfo->kind[offset];
+		mid = (lo + hi + 1) / 2;
+		cmpval = DatumGetInt32(FunctionCall2Coll(&partsupfunc[0],
+												 partcollation[0],
+												 boundinfo->datums[mid][0],
+												 value));
+		if (cmpval <= 0)
+		{
+			lo = mid;
+			*is_equal = (cmpval == 0);
+			if (*is_equal)
+				break;
+		}
+		else
+			hi = mid - 1;
+	}
 
-				if (probe_is_bound)
-				{
-					/*
-					 * We need to pass whether the existing bound is a lower
-					 * bound, so that two equal-valued lower and upper bounds
-					 * are not regarded equal.
-					 */
-					bool		lower = boundinfo->indexes[offset] < 0;
+	return lo;
+}
 
-					cmpval = partition_rbound_cmp(key,
-												  bound_datums, kind, lower,
-												  (PartitionRangeBound *) probe);
-				}
-				else
-					cmpval = partition_rbound_datum_cmp(key,
-														bound_datums, kind,
-														(Datum *) probe);
-				break;
-			}
+/*
+ * partition_range_bsearch
+ *		Returns the index of the greatest range bound that is less than or
+ *		equal to the given range bound or -1 if all of the range bounds are
+ *		greater
+ *
+ * *is_equal is set to true if the range bound at the returned index is equal
+ * to the input range bound
+ */
+static int
+partition_range_bsearch(int partnatts, FmgrInfo *partsupfunc,
+						Oid *partcollation,
+						PartitionBoundInfo boundinfo,
+						PartitionRangeBound *probe, bool *is_equal)
+{
+	int			lo,
+				hi,
+				mid;
 
-		default:
-			elog(ERROR, "unexpected partition strategy: %d",
-				 (int) key->strategy);
+	lo = -1;
+	hi = boundinfo->ndatums - 1;
+	while (lo < hi)
+	{
+		int32		cmpval;
+
+		mid = (lo + hi + 1) / 2;
+		cmpval = partition_rbound_cmp(partnatts, partsupfunc, partcollation,
+									  boundinfo->datums[mid],
+									  boundinfo->kind[mid],
+									  (boundinfo->indexes[mid] == -1),
+									  probe);
+		if (cmpval <= 0)
+		{
+			lo = mid;
+			*is_equal = (cmpval == 0);
+
+			if (*is_equal)
+				break;
+		}
+		else
+			hi = mid - 1;
 	}
 
-	return cmpval;
+	return lo;
 }
 
 /*
- * Binary search on a collection of partition bounds. Returns greatest
- * bound in array boundinfo->datums which is less than or equal to *probe.
- * If all bounds in the array are greater than *probe, -1 is returned.
+ * partition_range_bsearch
+ *		Returns the index of the greatest range bound that is less than or
+ *		equal to the given tuple or -1 if all of the range bounds are greater
  *
- * *probe could either be a partition bound or a Datum array representing
- * the partition key of a tuple being routed; probe_is_bound tells which.
- * We pass that down to the comparison function so that it can interpret the
- * contents of *probe accordingly.
- *
- * *is_equal is set to whether the bound at the returned index is equal with
- * *probe.
+ * *is_equal is set to true if the range bound at the returned index is equal
+ * to the input tuple.
  */
 static int
-partition_bound_bsearch(PartitionKey key, PartitionBoundInfo boundinfo,
-						void *probe, bool probe_is_bound, bool *is_equal)
+partition_range_datum_bsearch(FmgrInfo *partsupfunc, Oid *partcollation,
+							  PartitionBoundInfo boundinfo,
+							  int nvalues, Datum *values, bool *is_equal)
 {
 	int			lo,
 				hi,
@@ -2317,8 +3049,12 @@ partition_bound_bsearch(PartitionKey key, PartitionBoundInfo boundinfo,
 		int32		cmpval;
 
 		mid = (lo + hi + 1) / 2;
-		cmpval = partition_bound_cmp(key, boundinfo, mid, probe,
-									 probe_is_bound);
+		cmpval = partition_rbound_datum_cmp(partsupfunc,
+											partcollation,
+											boundinfo->datums[mid],
+											boundinfo->kind[mid],
+											values,
+											nvalues);
 		if (cmpval <= 0)
 		{
 			lo = mid;
@@ -2333,3 +3069,465 @@ partition_bound_bsearch(PartitionKey key, PartitionBoundInfo boundinfo,
 
 	return lo;
 }
+
+/*
+ * partition_hash_bsearch
+ *		Returns the index of the greatest (modulus, remainder) pair that is
+ *		less than or equal to the given (modulus, remainder) pair or -1 if
+ *		all of them are greater
+ */
+static int
+partition_hash_bsearch(PartitionBoundInfo boundinfo,
+					   int modulus, int remainder)
+{
+	int			lo,
+				hi,
+				mid;
+
+	lo = -1;
+	hi = boundinfo->ndatums - 1;
+	while (lo < hi)
+	{
+		int32		cmpval,
+					bound_modulus,
+					bound_remainder;
+
+		mid = (lo + hi + 1) / 2;
+		bound_modulus = DatumGetInt32(boundinfo->datums[mid][0]);
+		bound_remainder = DatumGetInt32(boundinfo->datums[mid][1]);
+		cmpval = partition_hbound_cmp(bound_modulus, bound_remainder,
+									  modulus, remainder);
+		if (cmpval <= 0)
+		{
+			lo = mid;
+
+			if (cmpval == 0)
+				break;
+		}
+		else
+			hi = mid - 1;
+	}
+
+	return lo;
+}
+
+/*
+ * get_default_oid_from_partdesc
+ *
+ * Given a partition descriptor, return the OID of the default partition, if
+ * one exists; else, return InvalidOid.
+ */
+Oid
+get_default_oid_from_partdesc(PartitionDesc partdesc)
+{
+	if (partdesc && partdesc->boundinfo &&
+		partition_bound_has_default(partdesc->boundinfo))
+		return partdesc->oids[partdesc->boundinfo->default_index];
+
+	return InvalidOid;
+}
+
+/*
+ * get_default_partition_oid
+ *
+ * Given a relation OID, return the OID of the default partition, if one
+ * exists.  Use get_default_oid_from_partdesc where possible, for
+ * efficiency.
+ */
+Oid
+get_default_partition_oid(Oid parentId)
+{
+	HeapTuple	tuple;
+	Oid			defaultPartId = InvalidOid;
+
+	tuple = SearchSysCache1(PARTRELID, ObjectIdGetDatum(parentId));
+
+	if (HeapTupleIsValid(tuple))
+	{
+		Form_pg_partitioned_table part_table_form;
+
+		part_table_form = (Form_pg_partitioned_table) GETSTRUCT(tuple);
+		defaultPartId = part_table_form->partdefid;
+		ReleaseSysCache(tuple);
+	}
+
+	return defaultPartId;
+}
+
+/*
+ * update_default_partition_oid
+ *
+ * Update pg_partition_table.partdefid with a new default partition OID.
+ */
+void
+update_default_partition_oid(Oid parentId, Oid defaultPartId)
+{
+	HeapTuple	tuple;
+	Relation	pg_partitioned_table;
+	Form_pg_partitioned_table part_table_form;
+
+	pg_partitioned_table = heap_open(PartitionedRelationId, RowExclusiveLock);
+
+	tuple = SearchSysCacheCopy1(PARTRELID, ObjectIdGetDatum(parentId));
+
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for partition key of relation %u",
+			 parentId);
+
+	part_table_form = (Form_pg_partitioned_table) GETSTRUCT(tuple);
+	part_table_form->partdefid = defaultPartId;
+	CatalogTupleUpdate(pg_partitioned_table, &tuple->t_self, tuple);
+
+	heap_freetuple(tuple);
+	heap_close(pg_partitioned_table, RowExclusiveLock);
+}
+
+/*
+ * get_proposed_default_constraint
+ *
+ * This function returns the negation of new_part_constraints, which
+ * would be an integral part of the default partition constraints after
+ * addition of the partition to which the new_part_constraints belongs.
+ */
+List *
+get_proposed_default_constraint(List *new_part_constraints)
+{
+	Expr	   *defPartConstraint;
+
+	defPartConstraint = make_ands_explicit(new_part_constraints);
+
+	/*
+	 * Derive the partition constraints of default partition by negating the
+	 * given partition constraints. The partition constraint never evaluates
+	 * to NULL, so negating it like this is safe.
+	 */
+	defPartConstraint = makeBoolExpr(NOT_EXPR,
+									 list_make1(defPartConstraint),
+									 -1);
+	defPartConstraint =
+		(Expr *) eval_const_expressions(NULL,
+										(Node *) defPartConstraint);
+	defPartConstraint = canonicalize_qual(defPartConstraint);
+
+	return list_make1(defPartConstraint);
+}
+
+/*
+ * get_partition_bound_num_indexes
+ *
+ * Returns the number of the entries in the partition bound indexes array.
+ */
+static int
+get_partition_bound_num_indexes(PartitionBoundInfo bound)
+{
+	int			num_indexes;
+
+	Assert(bound);
+
+	switch (bound->strategy)
+	{
+		case PARTITION_STRATEGY_HASH:
+
+			/*
+			 * The number of the entries in the indexes array is same as the
+			 * greatest modulus.
+			 */
+			num_indexes = get_greatest_modulus(bound);
+			break;
+
+		case PARTITION_STRATEGY_LIST:
+			num_indexes = bound->ndatums;
+			break;
+
+		case PARTITION_STRATEGY_RANGE:
+			/* Range partitioned table has an extra index. */
+			num_indexes = bound->ndatums + 1;
+			break;
+
+		default:
+			elog(ERROR, "unexpected partition strategy: %d",
+				 (int) bound->strategy);
+	}
+
+	return num_indexes;
+}
+
+/*
+ * get_greatest_modulus
+ *
+ * Returns the greatest modulus of the hash partition bound. The greatest
+ * modulus will be at the end of the datums array because hash partitions are
+ * arranged in the ascending order of their modulus and remainders.
+ */
+static int
+get_greatest_modulus(PartitionBoundInfo bound)
+{
+	Assert(bound && bound->strategy == PARTITION_STRATEGY_HASH);
+	Assert(bound->datums && bound->ndatums > 0);
+	Assert(DatumGetInt32(bound->datums[bound->ndatums - 1][0]) > 0);
+
+	return DatumGetInt32(bound->datums[bound->ndatums - 1][0]);
+}
+
+/*
+ * compute_hash_value
+ *
+ * Compute the hash value for given not null partition key values.
+ */
+static uint64
+compute_hash_value(int partnatts, FmgrInfo *partsupfunc,
+				   Datum *values, bool *isnull)
+{
+	int			i;
+	uint64		rowHash = 0;
+	Datum		seed = UInt64GetDatum(HASH_PARTITION_SEED);
+
+	for (i = 0; i < partnatts; i++)
+	{
+		if (!isnull[i])
+		{
+			Datum		hash;
+
+			Assert(OidIsValid(partsupfunc[i].fn_oid));
+
+			/*
+			 * Compute hash for each datum value by calling respective
+			 * datatype-specific hash functions of each partition key
+			 * attribute.
+			 */
+			hash = FunctionCall2(&partsupfunc[i], values[i], seed);
+
+			/* Form a single 64-bit hash value */
+			rowHash = hash_combine64(rowHash, DatumGetUInt64(hash));
+		}
+	}
+
+	return rowHash;
+}
+
+/*
+ * satisfies_hash_partition
+ *
+ * This is an SQL-callable function for use in hash partition constraints.
+ * The first three arguments are the parent table OID, modulus, and remainder.
+ * The remaining arguments are the value of the partitioning columns (or
+ * expressions); these are hashed and the results are combined into a single
+ * hash value by calling hash_combine64.
+ *
+ * Returns true if remainder produced when this computed single hash value is
+ * divided by the given modulus is equal to given remainder, otherwise false.
+ *
+ * See get_qual_for_hash() for usage.
+ */
+Datum
+satisfies_hash_partition(PG_FUNCTION_ARGS)
+{
+	typedef struct ColumnsHashData
+	{
+		Oid			relid;
+		int			nkeys;
+		Oid			variadic_type;
+		int16		variadic_typlen;
+		bool		variadic_typbyval;
+		char		variadic_typalign;
+		FmgrInfo	partsupfunc[PARTITION_MAX_KEYS];
+	} ColumnsHashData;
+	Oid			parentId;
+	int			modulus;
+	int			remainder;
+	Datum		seed = UInt64GetDatum(HASH_PARTITION_SEED);
+	ColumnsHashData *my_extra;
+	uint64		rowHash = 0;
+
+	/* Return null if the parent OID, modulus, or remainder is NULL. */
+	if (PG_ARGISNULL(0) || PG_ARGISNULL(1) || PG_ARGISNULL(2))
+		PG_RETURN_NULL();
+	parentId = PG_GETARG_OID(0);
+	modulus = PG_GETARG_INT32(1);
+	remainder = PG_GETARG_INT32(2);
+
+	/* Sanity check modulus and remainder. */
+	if (modulus <= 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("modulus for hash partition must be a positive integer")));
+	if (remainder < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("remainder for hash partition must be a non-negative integer")));
+	if (remainder >= modulus)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+				 errmsg("remainder for hash partition must be less than modulus")));
+
+	/*
+	 * Cache hash function information.
+	 */
+	my_extra = (ColumnsHashData *) fcinfo->flinfo->fn_extra;
+	if (my_extra == NULL || my_extra->relid != parentId)
+	{
+		Relation	parent;
+		PartitionKey key;
+		int			j;
+
+		/* Open parent relation and fetch partition keyinfo */
+		parent = try_relation_open(parentId, AccessShareLock);
+		if (parent == NULL)
+			PG_RETURN_NULL();
+		key = RelationGetPartitionKey(parent);
+
+		/* Reject parent table that is not hash-partitioned. */
+		if (parent->rd_rel->relkind != RELKIND_PARTITIONED_TABLE ||
+			key->strategy != PARTITION_STRATEGY_HASH)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("\"%s\" is not a hash partitioned table",
+							get_rel_name(parentId))));
+
+		if (!get_fn_expr_variadic(fcinfo->flinfo))
+		{
+			int			nargs = PG_NARGS() - 3;
+
+			/* complain if wrong number of column values */
+			if (key->partnatts != nargs)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("number of partitioning columns (%d) does not match number of partition keys provided (%d)",
+								key->partnatts, nargs)));
+
+			/* allocate space for our cache */
+			fcinfo->flinfo->fn_extra =
+				MemoryContextAllocZero(fcinfo->flinfo->fn_mcxt,
+									   offsetof(ColumnsHashData, partsupfunc) +
+									   sizeof(FmgrInfo) * nargs);
+			my_extra = (ColumnsHashData *) fcinfo->flinfo->fn_extra;
+			my_extra->relid = parentId;
+			my_extra->nkeys = key->partnatts;
+
+			/* check argument types and save fmgr_infos */
+			for (j = 0; j < key->partnatts; ++j)
+			{
+				Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, j + 3);
+
+				if (argtype != key->parttypid[j] && !IsBinaryCoercible(argtype, key->parttypid[j]))
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							 errmsg("column %d of the partition key has type \"%s\", but supplied value is of type \"%s\"",
+									j + 1, format_type_be(key->parttypid[j]), format_type_be(argtype))));
+
+				fmgr_info_copy(&my_extra->partsupfunc[j],
+							   &key->partsupfunc[j],
+							   fcinfo->flinfo->fn_mcxt);
+			}
+
+		}
+		else
+		{
+			ArrayType  *variadic_array = PG_GETARG_ARRAYTYPE_P(3);
+
+			/* allocate space for our cache -- just one FmgrInfo in this case */
+			fcinfo->flinfo->fn_extra =
+				MemoryContextAllocZero(fcinfo->flinfo->fn_mcxt,
+									   offsetof(ColumnsHashData, partsupfunc) +
+									   sizeof(FmgrInfo));
+			my_extra = (ColumnsHashData *) fcinfo->flinfo->fn_extra;
+			my_extra->relid = parentId;
+			my_extra->nkeys = key->partnatts;
+			my_extra->variadic_type = ARR_ELEMTYPE(variadic_array);
+			get_typlenbyvalalign(my_extra->variadic_type,
+								 &my_extra->variadic_typlen,
+								 &my_extra->variadic_typbyval,
+								 &my_extra->variadic_typalign);
+
+			/* check argument types */
+			for (j = 0; j < key->partnatts; ++j)
+				if (key->parttypid[j] != my_extra->variadic_type)
+					ereport(ERROR,
+							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							 errmsg("column %d of the partition key has type \"%s\", but supplied value is of type \"%s\"",
+									j + 1,
+									format_type_be(key->parttypid[j]),
+									format_type_be(my_extra->variadic_type))));
+
+			fmgr_info_copy(&my_extra->partsupfunc[0],
+						   &key->partsupfunc[0],
+						   fcinfo->flinfo->fn_mcxt);
+		}
+
+		/* Hold lock until commit */
+		relation_close(parent, NoLock);
+	}
+
+	if (!OidIsValid(my_extra->variadic_type))
+	{
+		int			nkeys = my_extra->nkeys;
+		int			i;
+
+		/*
+		 * For a non-variadic call, neither the number of arguments nor their
+		 * types can change across calls, so avoid the expense of rechecking
+		 * here.
+		 */
+
+		for (i = 0; i < nkeys; i++)
+		{
+			Datum		hash;
+
+			/* keys start from fourth argument of function. */
+			int			argno = i + 3;
+
+			if (PG_ARGISNULL(argno))
+				continue;
+
+			Assert(OidIsValid(my_extra->partsupfunc[i].fn_oid));
+
+			hash = FunctionCall2(&my_extra->partsupfunc[i],
+								 PG_GETARG_DATUM(argno),
+								 seed);
+
+			/* Form a single 64-bit hash value */
+			rowHash = hash_combine64(rowHash, DatumGetUInt64(hash));
+		}
+	}
+	else
+	{
+		ArrayType  *variadic_array = PG_GETARG_ARRAYTYPE_P(3);
+		int			i;
+		int			nelems;
+		Datum	   *datum;
+		bool	   *isnull;
+
+		deconstruct_array(variadic_array,
+						  my_extra->variadic_type,
+						  my_extra->variadic_typlen,
+						  my_extra->variadic_typbyval,
+						  my_extra->variadic_typalign,
+						  &datum, &isnull, &nelems);
+
+		/* complain if wrong number of column values */
+		if (nelems != my_extra->nkeys)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+					 errmsg("number of partitioning columns (%d) does not match number of partition keys provided (%d)",
+							my_extra->nkeys, nelems)));
+
+		for (i = 0; i < nelems; i++)
+		{
+			Datum		hash;
+
+			if (isnull[i])
+				continue;
+
+			Assert(OidIsValid(my_extra->partsupfunc[0].fn_oid));
+
+			hash = FunctionCall2(&my_extra->partsupfunc[0],
+								 datum[i],
+								 seed);
+
+			/* Form a single 64-bit hash value */
+			rowHash = hash_combine64(rowHash, DatumGetUInt64(hash));
+		}
+	}
+
+	PG_RETURN_BOOL(rowHash % modulus == remainder);
+}
diff --git a/src/backend/catalog/pg_aggregate.c b/src/backend/catalog/pg_aggregate.c
index a9204503d3..f14ea26fcb 100644
--- a/src/backend/catalog/pg_aggregate.c
+++ b/src/backend/catalog/pg_aggregate.c
@@ -3,7 +3,7 @@
  * pg_aggregate.c
  *	  routines to support manipulation of the pg_aggregate relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -19,6 +19,7 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_aggregate_fn.h"
 #include "catalog/pg_language.h"
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
@@ -65,6 +66,8 @@ AggregateCreate(const char *aggName,
 				List *aggmfinalfnName,
 				bool finalfnExtraArgs,
 				bool mfinalfnExtraArgs,
+				char finalfnModify,
+				char mfinalfnModify,
 				List *aggsortopName,
 				Oid aggTransType,
 				int32 aggTransSpace,
@@ -656,6 +659,8 @@ AggregateCreate(const char *aggName,
 	values[Anum_pg_aggregate_aggmfinalfn - 1] = ObjectIdGetDatum(mfinalfn);
 	values[Anum_pg_aggregate_aggfinalextra - 1] = BoolGetDatum(finalfnExtraArgs);
 	values[Anum_pg_aggregate_aggmfinalextra - 1] = BoolGetDatum(mfinalfnExtraArgs);
+	values[Anum_pg_aggregate_aggfinalmodify - 1] = CharGetDatum(finalfnModify);
+	values[Anum_pg_aggregate_aggmfinalmodify - 1] = CharGetDatum(mfinalfnModify);
 	values[Anum_pg_aggregate_aggsortop - 1] = ObjectIdGetDatum(sortop);
 	values[Anum_pg_aggregate_aggtranstype - 1] = ObjectIdGetDatum(aggTransType);
 	values[Anum_pg_aggregate_aggtransspace - 1] = Int32GetDatum(aggTransSpace);
@@ -860,7 +865,7 @@ lookup_agg_function(List *fnName,
 	/* Check aggregate creator has permission to call the function */
 	aclresult = pg_proc_aclcheck(fnOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, get_func_name(fnOid));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(fnOid));
 
 	return fnOid;
 }
diff --git a/src/backend/catalog/pg_collation.c b/src/backend/catalog/pg_collation.c
index ca62896ecb..d280869baf 100644
--- a/src/backend/catalog/pg_collation.c
+++ b/src/backend/catalog/pg_collation.c
@@ -3,7 +3,7 @@
  * pg_collation.c
  *	  routines to support manipulation of the pg_collation relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/pg_constraint.c b/src/backend/catalog/pg_constraint.c
index 1336c46d3f..731c5e4317 100644
--- a/src/backend/catalog/pg_constraint.c
+++ b/src/backend/catalog/pg_constraint.c
@@ -3,7 +3,7 @@
  * pg_constraint.c
  *	  routines to support manipulation of the pg_constraint relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -747,6 +747,43 @@ AlterConstraintNamespaces(Oid ownerId, Oid oldNspId,
 	heap_close(conRel, RowExclusiveLock);
 }
 
+/*
+ * ConstraintSetParentConstraint
+ *		Set a partition's constraint as child of its parent table's
+ *
+ * This updates the constraint's pg_constraint row to show it as inherited, and
+ * add a dependency to the parent so that it cannot be removed on its own.
+ */
+void
+ConstraintSetParentConstraint(Oid childConstrId, Oid parentConstrId)
+{
+	Relation		constrRel;
+	Form_pg_constraint constrForm;
+	HeapTuple		tuple,
+					newtup;
+	ObjectAddress	depender;
+	ObjectAddress	referenced;
+
+	constrRel = heap_open(ConstraintRelationId, RowExclusiveLock);
+	tuple = SearchSysCache1(CONSTROID, ObjectIdGetDatum(childConstrId));
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for constraint %u", childConstrId);
+	newtup = heap_copytuple(tuple);
+	constrForm = (Form_pg_constraint) GETSTRUCT(newtup);
+	constrForm->conislocal = false;
+	constrForm->coninhcount++;
+	CatalogTupleUpdate(constrRel, &tuple->t_self, newtup);
+	ReleaseSysCache(tuple);
+
+	ObjectAddressSet(referenced, ConstraintRelationId, parentConstrId);
+	ObjectAddressSet(depender, ConstraintRelationId, childConstrId);
+
+	recordDependencyOn(&depender, &referenced, DEPENDENCY_INTERNAL_AUTO);
+
+	heap_close(constrRel, RowExclusiveLock);
+}
+
+
 /*
  * get_relation_constraint_oid
  *		Find a constraint on the specified relation with the specified name.
@@ -805,6 +842,143 @@ get_relation_constraint_oid(Oid relid, const char *conname, bool missing_ok)
 	return conOid;
 }
 
+/*
+ * get_relation_constraint_attnos
+ *		Find a constraint on the specified relation with the specified name
+ *		and return the constrained columns.
+ *
+ * Returns a Bitmapset of the column attnos of the constrained columns, with
+ * attnos being offset by FirstLowInvalidHeapAttributeNumber so that system
+ * columns can be represented.
+ *
+ * *constraintOid is set to the OID of the constraint, or InvalidOid on
+ * failure.
+ */
+Bitmapset *
+get_relation_constraint_attnos(Oid relid, const char *conname,
+							   bool missing_ok, Oid *constraintOid)
+{
+	Bitmapset  *conattnos = NULL;
+	Relation	pg_constraint;
+	HeapTuple	tuple;
+	SysScanDesc scan;
+	ScanKeyData skey[1];
+
+	/* Set *constraintOid, to avoid complaints about uninitialized vars */
+	*constraintOid = InvalidOid;
+
+	/*
+	 * Fetch the constraint tuple from pg_constraint.  There may be more than
+	 * one match, because constraints are not required to have unique names;
+	 * if so, error out.
+	 */
+	pg_constraint = heap_open(ConstraintRelationId, AccessShareLock);
+
+	ScanKeyInit(&skey[0],
+				Anum_pg_constraint_conrelid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(relid));
+
+	scan = systable_beginscan(pg_constraint, ConstraintRelidIndexId, true,
+							  NULL, 1, skey);
+
+	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+	{
+		Form_pg_constraint con = (Form_pg_constraint) GETSTRUCT(tuple);
+		Datum		adatum;
+		bool		isNull;
+		ArrayType  *arr;
+		int16	   *attnums;
+		int			numcols;
+		int			i;
+
+		/* Check the constraint name */
+		if (strcmp(NameStr(con->conname), conname) != 0)
+			continue;
+		if (OidIsValid(*constraintOid))
+			ereport(ERROR,
+					(errcode(ERRCODE_DUPLICATE_OBJECT),
+					 errmsg("table \"%s\" has multiple constraints named \"%s\"",
+							get_rel_name(relid), conname)));
+
+		*constraintOid = HeapTupleGetOid(tuple);
+
+		/* Extract the conkey array, ie, attnums of constrained columns */
+		adatum = heap_getattr(tuple, Anum_pg_constraint_conkey,
+							  RelationGetDescr(pg_constraint), &isNull);
+		if (isNull)
+			continue;			/* no constrained columns */
+
+		arr = DatumGetArrayTypeP(adatum);	/* ensure not toasted */
+		numcols = ARR_DIMS(arr)[0];
+		if (ARR_NDIM(arr) != 1 ||
+			numcols < 0 ||
+			ARR_HASNULL(arr) ||
+			ARR_ELEMTYPE(arr) != INT2OID)
+			elog(ERROR, "conkey is not a 1-D smallint array");
+		attnums = (int16 *) ARR_DATA_PTR(arr);
+
+		/* Construct the result value */
+		for (i = 0; i < numcols; i++)
+		{
+			conattnos = bms_add_member(conattnos,
+									   attnums[i] - FirstLowInvalidHeapAttributeNumber);
+		}
+	}
+
+	systable_endscan(scan);
+
+	/* If no such constraint exists, complain */
+	if (!OidIsValid(*constraintOid) && !missing_ok)
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("constraint \"%s\" for table \"%s\" does not exist",
+						conname, get_rel_name(relid))));
+
+	heap_close(pg_constraint, AccessShareLock);
+
+	return conattnos;
+}
+
+/*
+ * Return the OID of the constraint associated with the given index in the
+ * given relation; or InvalidOid if no such index is catalogued.
+ */
+Oid
+get_relation_idx_constraint_oid(Oid relationId, Oid indexId)
+{
+	Relation	pg_constraint;
+	SysScanDesc	scan;
+	ScanKeyData	key;
+	HeapTuple	tuple;
+	Oid			constraintId = InvalidOid;
+
+	pg_constraint = heap_open(ConstraintRelationId, AccessShareLock);
+
+	ScanKeyInit(&key,
+				Anum_pg_constraint_conrelid,
+				BTEqualStrategyNumber,
+				F_OIDEQ,
+				ObjectIdGetDatum(relationId));
+	scan = systable_beginscan(pg_constraint, ConstraintRelidIndexId,
+							  true, NULL, 1, &key);
+	while ((tuple = systable_getnext(scan)) != NULL)
+	{
+		Form_pg_constraint	constrForm;
+
+		constrForm = (Form_pg_constraint) GETSTRUCT(tuple);
+		if (constrForm->conindid == indexId)
+		{
+			constraintId = HeapTupleGetOid(tuple);
+			break;
+		}
+	}
+	systable_endscan(scan);
+
+	heap_close(pg_constraint, AccessShareLock);
+	return constraintId;
+}
+
 /*
  * get_domain_constraint_oid
  *		Find a constraint on the specified domain with the specified name.
@@ -958,7 +1132,7 @@ get_primary_key_attnos(Oid relid, bool deferrableOk, Oid *constraintOid)
 
 /*
  * Determine whether a relation can be proven functionally dependent on
- * a set of grouping columns.  If so, return TRUE and add the pg_constraint
+ * a set of grouping columns.  If so, return true and add the pg_constraint
  * OIDs of the constraints needed for the proof to the *constraintDeps list.
  *
  * grouping_columns is a list of grouping expressions, in which columns of
diff --git a/src/backend/catalog/pg_conversion.c b/src/backend/catalog/pg_conversion.c
index 5746dc349a..76fcd8fd9c 100644
--- a/src/backend/catalog/pg_conversion.c
+++ b/src/backend/catalog/pg_conversion.c
@@ -3,7 +3,7 @@
  * pg_conversion.c
  *	  routines to support manipulation of the pg_conversion relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/pg_db_role_setting.c b/src/backend/catalog/pg_db_role_setting.c
index 323471bc83..e123691923 100644
--- a/src/backend/catalog/pg_db_role_setting.c
+++ b/src/backend/catalog/pg_db_role_setting.c
@@ -2,7 +2,7 @@
  * pg_db_role_setting.c
  *		Routines to support manipulation of the pg_db_role_setting relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/catalog/pg_depend.c b/src/backend/catalog/pg_depend.c
index dd6ca3e8f7..2ea05f350b 100644
--- a/src/backend/catalog/pg_depend.c
+++ b/src/backend/catalog/pg_depend.c
@@ -3,7 +3,7 @@
  * pg_depend.c
  *	  routines to support manipulation of the pg_depend relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -490,7 +490,7 @@ getExtensionOfObject(Oid classId, Oid objectId)
  *
  * An ownership marker is an AUTO or INTERNAL dependency from the sequence to the
  * column.  If we find one, store the identity of the owning column
- * into *tableId and *colId and return TRUE; else return FALSE.
+ * into *tableId and *colId and return true; else return false.
  *
  * Note: if there's more than one such pg_depend entry then you get
  * a random one of them returned into the out parameters.  This should
@@ -656,14 +656,19 @@ get_constraint_index(Oid constraintId)
 
 		/*
 		 * We assume any internal dependency of an index on the constraint
-		 * must be what we are looking for.  (The relkind test is just
-		 * paranoia; there shouldn't be any such dependencies otherwise.)
+		 * must be what we are looking for.
 		 */
 		if (deprec->classid == RelationRelationId &&
 			deprec->objsubid == 0 &&
-			deprec->deptype == DEPENDENCY_INTERNAL &&
-			get_rel_relkind(deprec->objid) == RELKIND_INDEX)
+			deprec->deptype == DEPENDENCY_INTERNAL)
 		{
+			char		relkind = get_rel_relkind(deprec->objid);
+
+			/* This is pure paranoia; there shouldn't be any such */
+			if (relkind != RELKIND_INDEX &&
+				relkind != RELKIND_PARTITIONED_INDEX)
+				break;
+
 			indexId = deprec->objid;
 			break;
 		}
diff --git a/src/backend/catalog/pg_enum.c b/src/backend/catalog/pg_enum.c
index fe61d4dacc..fde361f367 100644
--- a/src/backend/catalog/pg_enum.c
+++ b/src/backend/catalog/pg_enum.c
@@ -3,7 +3,7 @@
  * pg_enum.c
  *	  routines to support manipulation of the pg_enum relation
  *
- * Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/catalog/pg_inherits.c b/src/backend/catalog/pg_inherits.c
index 245a374fc9..5a5beb9273 100644
--- a/src/backend/catalog/pg_inherits.c
+++ b/src/backend/catalog/pg_inherits.c
@@ -8,7 +8,7 @@
  * Perhaps someday that code should be moved here, but it'd have to be
  * disentangled from other stuff such as pg_depend updates.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -301,6 +301,11 @@ has_superclass(Oid relationId)
 /*
  * Given two type OIDs, determine whether the first is a complex type
  * (class type) that inherits from the second.
+ *
+ * This essentially asks whether the first type is guaranteed to be coercible
+ * to the second.  Therefore, we allow the first type to be a domain over a
+ * complex type that inherits from the second; that creates no difficulties.
+ * But the second type cannot be a domain.
  */
 bool
 typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId)
@@ -314,9 +319,9 @@ typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId)
 	ListCell   *queue_item;
 
 	/* We need to work with the associated relation OIDs */
-	subclassRelid = typeidTypeRelid(subclassTypeId);
+	subclassRelid = typeOrDomainTypeRelid(subclassTypeId);
 	if (subclassRelid == InvalidOid)
-		return false;			/* not a complex type */
+		return false;			/* not a complex type or domain over one */
 	superclassRelid = typeidTypeRelid(superclassTypeId);
 	if (superclassRelid == InvalidOid)
 		return false;			/* not a complex type */
@@ -400,3 +405,83 @@ typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId)
 
 	return result;
 }
+
+/*
+ * Create a single pg_inherits row with the given data
+ */
+void
+StoreSingleInheritance(Oid relationId, Oid parentOid, int32 seqNumber)
+{
+	Datum		values[Natts_pg_inherits];
+	bool		nulls[Natts_pg_inherits];
+	HeapTuple	tuple;
+	Relation	inhRelation;
+
+	inhRelation = heap_open(InheritsRelationId, RowExclusiveLock);
+
+	/*
+	 * Make the pg_inherits entry
+	 */
+	values[Anum_pg_inherits_inhrelid - 1] = ObjectIdGetDatum(relationId);
+	values[Anum_pg_inherits_inhparent - 1] = ObjectIdGetDatum(parentOid);
+	values[Anum_pg_inherits_inhseqno - 1] = Int32GetDatum(seqNumber);
+
+	memset(nulls, 0, sizeof(nulls));
+
+	tuple = heap_form_tuple(RelationGetDescr(inhRelation), values, nulls);
+
+	CatalogTupleInsert(inhRelation, tuple);
+
+	heap_freetuple(tuple);
+
+	heap_close(inhRelation, RowExclusiveLock);
+}
+
+/*
+ * DeleteInheritsTuple
+ *
+ * Delete pg_inherits tuples with the given inhrelid.  inhparent may be given
+ * as InvalidOid, in which case all tuples matching inhrelid are deleted;
+ * otherwise only delete tuples with the specified inhparent.
+ *
+ * Returns whether at least one row was deleted.
+ */
+bool
+DeleteInheritsTuple(Oid inhrelid, Oid inhparent)
+{
+	bool	found = false;
+	Relation	catalogRelation;
+	ScanKeyData key;
+	SysScanDesc scan;
+	HeapTuple	inheritsTuple;
+
+	/*
+	 * Find pg_inherits entries by inhrelid.
+	 */
+	catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
+	ScanKeyInit(&key,
+				Anum_pg_inherits_inhrelid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(inhrelid));
+	scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
+							  true, NULL, 1, &key);
+
+	while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
+	{
+		Oid			parent;
+
+		/* Compare inhparent if it was given, and do the actual deletion. */
+		parent = ((Form_pg_inherits) GETSTRUCT(inheritsTuple))->inhparent;
+		if (!OidIsValid(inhparent) || parent == inhparent)
+		{
+			CatalogTupleDelete(catalogRelation, &inheritsTuple->t_self);
+			found = true;
+		}
+	}
+
+	/* Done */
+	systable_endscan(scan);
+	heap_close(catalogRelation, RowExclusiveLock);
+
+	return found;
+}
diff --git a/src/backend/catalog/pg_largeobject.c b/src/backend/catalog/pg_largeobject.c
index fc4f4f8c9b..a876473976 100644
--- a/src/backend/catalog/pg_largeobject.c
+++ b/src/backend/catalog/pg_largeobject.c
@@ -3,7 +3,7 @@
  * pg_largeobject.c
  *	  routines to support manipulation of the pg_largeobject relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/pg_namespace.c b/src/backend/catalog/pg_namespace.c
index 3e20d051c2..2cf52be025 100644
--- a/src/backend/catalog/pg_namespace.c
+++ b/src/backend/catalog/pg_namespace.c
@@ -3,7 +3,7 @@
  * pg_namespace.c
  *	  routines to support manipulation of the pg_namespace relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -63,7 +63,7 @@ NamespaceCreate(const char *nspName, Oid ownerId, bool isTemp)
 				 errmsg("schema \"%s\" already exists", nspName)));
 
 	if (!isTemp)
-		nspacl = get_user_default_acl(ACL_OBJECT_NAMESPACE, ownerId,
+		nspacl = get_user_default_acl(OBJECT_SCHEMA, ownerId,
 									  InvalidOid);
 	else
 		nspacl = NULL;
diff --git a/src/backend/catalog/pg_operator.c b/src/backend/catalog/pg_operator.c
index ef81102150..051602d820 100644
--- a/src/backend/catalog/pg_operator.c
+++ b/src/backend/catalog/pg_operator.c
@@ -3,7 +3,7 @@
  * pg_operator.c
  *	  routines to support manipulation of the pg_operator relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -124,7 +124,7 @@ validOperatorName(const char *name)
  *		finds an operator given an exact specification (name, namespace,
  *		left and right type IDs).
  *
- *		*defined is set TRUE if defined (not a shell)
+ *		*defined is set true if defined (not a shell)
  */
 static Oid
 OperatorGet(const char *operatorName,
@@ -164,7 +164,7 @@ OperatorGet(const char *operatorName,
  *		looks up an operator given a possibly-qualified name and
  *		left and right type IDs.
  *
- *		*defined is set TRUE if defined (not a shell)
+ *		*defined is set true if defined (not a shell)
  */
 static Oid
 OperatorLookup(List *operatorName,
@@ -425,7 +425,7 @@ OperatorCreate(const char *operatorName,
 	 */
 	if (OidIsValid(operatorObjectId) &&
 		!pg_oper_ownercheck(operatorObjectId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 					   operatorName);
 
 	/*
@@ -445,7 +445,7 @@ OperatorCreate(const char *operatorName,
 		/* Permission check: must own other operator */
 		if (OidIsValid(commutatorId) &&
 			!pg_oper_ownercheck(commutatorId, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 						   NameListToString(commutatorName));
 
 		/*
@@ -470,7 +470,7 @@ OperatorCreate(const char *operatorName,
 		/* Permission check: must own other operator */
 		if (OidIsValid(negatorId) &&
 			!pg_oper_ownercheck(negatorId, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 						   NameListToString(negatorName));
 	}
 	else
@@ -618,7 +618,7 @@ get_other_operator(List *otherOp, Oid otherLeftTypeId, Oid otherRightTypeId,
 	aclresult = pg_namespace_aclcheck(otherNamespace, GetUserId(),
 									  ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(otherNamespace));
 
 	other_oid = OperatorShellMake(otherName,
diff --git a/src/backend/catalog/pg_proc.c b/src/backend/catalog/pg_proc.c
index 571856e525..b59fadbf76 100644
--- a/src/backend/catalog/pg_proc.c
+++ b/src/backend/catalog/pg_proc.c
@@ -3,7 +3,7 @@
  * pg_proc.c
  *	  routines to support manipulation of the pg_proc relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -262,7 +262,7 @@ ProcedureCreate(const char *procedureName,
 	 */
 	if (parameterCount == 1 &&
 		OidIsValid(parameterTypes->values[0]) &&
-		(relid = typeidTypeRelid(parameterTypes->values[0])) != InvalidOid &&
+		(relid = typeOrDomainTypeRelid(parameterTypes->values[0])) != InvalidOid &&
 		get_attnum(relid, procedureName) != InvalidAttrNumber)
 		ereport(ERROR,
 				(errcode(ERRCODE_DUPLICATE_COLUMN),
@@ -400,7 +400,7 @@ ProcedureCreate(const char *procedureName,
 					 errmsg("function \"%s\" already exists with same argument types",
 							procedureName)));
 		if (!pg_proc_ownercheck(HeapTupleGetOid(oldtup), proowner))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 						   procedureName);
 
 		/*
@@ -582,7 +582,7 @@ ProcedureCreate(const char *procedureName,
 		/* Creating a new procedure */
 
 		/* First, get default permissions and set up proacl */
-		proacl = get_user_default_acl(ACL_OBJECT_FUNCTION, proowner,
+		proacl = get_user_default_acl(OBJECT_FUNCTION, proowner,
 									  procNamespace);
 		if (proacl != NULL)
 			values[Anum_pg_proc_proacl - 1] = PointerGetDatum(proacl);
@@ -857,7 +857,8 @@ fmgr_sql_validator(PG_FUNCTION_ARGS)
 
 	/* Disallow pseudotype result */
 	/* except for RECORD, VOID, or polymorphic */
-	if (get_typtype(proc->prorettype) == TYPTYPE_PSEUDO &&
+	if (proc->prorettype &&
+		get_typtype(proc->prorettype) == TYPTYPE_PSEUDO &&
 		proc->prorettype != RECORDOID &&
 		proc->prorettype != VOIDOID &&
 		!IsPolymorphicType(proc->prorettype))
diff --git a/src/backend/catalog/pg_publication.c b/src/backend/catalog/pg_publication.c
index 3ef7ba8cd5..ba18258ebb 100644
--- a/src/backend/catalog/pg_publication.c
+++ b/src/backend/catalog/pg_publication.c
@@ -3,7 +3,7 @@
  * pg_publication.c
  *		publication C API manipulation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -105,6 +105,15 @@ is_publishable_class(Oid relid, Form_pg_class reltuple)
 		relid >= FirstNormalObjectId;
 }
 
+/*
+ * Another variant of this, taking a Relation.
+ */
+bool
+is_publishable_relation(Relation rel)
+{
+	return is_publishable_class(RelationGetRelid(rel), rel->rd_rel);
+}
+
 
 /*
  * SQL-callable variant of the above
diff --git a/src/backend/catalog/pg_range.c b/src/backend/catalog/pg_range.c
index a3b0fb8838..c902f98606 100644
--- a/src/backend/catalog/pg_range.c
+++ b/src/backend/catalog/pg_range.c
@@ -3,7 +3,7 @@
  * pg_range.c
  *	  routines to support manipulation of the pg_range relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/pg_shdepend.c b/src/backend/catalog/pg_shdepend.c
index 31b09a1da5..faf42b7640 100644
--- a/src/backend/catalog/pg_shdepend.c
+++ b/src/backend/catalog/pg_shdepend.c
@@ -3,7 +3,7 @@
  * pg_shdepend.c
  *	  routines to support manipulation of the pg_shdepend relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/pg_subscription.c b/src/backend/catalog/pg_subscription.c
index fb53d71cd6..8e16d3b7bc 100644
--- a/src/backend/catalog/pg_subscription.c
+++ b/src/backend/catalog/pg_subscription.c
@@ -3,7 +3,7 @@
  * pg_subscription.c
  *		replication subscriptions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/catalog/pg_type.c b/src/backend/catalog/pg_type.c
index 59ffd2104d..660ac5b7c9 100644
--- a/src/backend/catalog/pg_type.c
+++ b/src/backend/catalog/pg_type.c
@@ -3,7 +3,7 @@
  * pg_type.c
  *	  routines to support manipulation of the pg_type relation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -380,7 +380,7 @@ TypeCreate(Oid newTypeOid,
 	else
 		nulls[Anum_pg_type_typdefault - 1] = true;
 
-	typacl = get_user_default_acl(ACL_OBJECT_TYPE, ownerId,
+	typacl = get_user_default_acl(OBJECT_TYPE, ownerId,
 								  typeNamespace);
 	if (typacl != NULL)
 		values[Anum_pg_type_typacl - 1] = PointerGetDatum(typacl);
@@ -413,7 +413,7 @@ TypeCreate(Oid newTypeOid,
 		 * shell type must have been created by same owner
 		 */
 		if (((Form_pg_type) GETSTRUCT(tup))->typowner != ownerId)
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TYPE, typeName);
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TYPE, typeName);
 
 		/* trouble if caller wanted to force the OID */
 		if (OidIsValid(newTypeOid))
@@ -821,9 +821,9 @@ makeArrayTypeName(const char *typeName, Oid typeNamespace)
  * determine the new type's own array type name; else the latter will
  * certainly pick the same name.
  *
- * Returns TRUE if successfully moved the type, FALSE if not.
+ * Returns true if successfully moved the type, false if not.
  *
- * We also return TRUE if the given type is a shell type.  In this case
+ * We also return true if the given type is a shell type.  In this case
  * the type has not been renamed out of the way, but nonetheless it can
  * be expected that TypeCreate will succeed.  This behavior is convenient
  * for most callers --- those that need to distinguish the shell-type case
diff --git a/src/backend/catalog/sql_features.txt b/src/backend/catalog/sql_features.txt
index 8e746f36d4..20d61f3780 100644
--- a/src/backend/catalog/sql_features.txt
+++ b/src/backend/catalog/sql_features.txt
@@ -498,7 +498,7 @@ T616	Null treatment option for LEAD and LAG functions			NO
 T617	FIRST_VALUE and LAST_VALUE function			YES	
 T618	NTH_VALUE function			NO	function exists, but some options missing
 T619	Nested window functions			NO	
-T620	WINDOW clause: GROUPS option			NO	
+T620	WINDOW clause: GROUPS option			YES	
 T621	Enhanced numeric functions			YES	
 T631	IN predicate with one list element			YES	
 T641	Multiple column assignment			NO	only some syntax variants supported
diff --git a/src/backend/catalog/storage.c b/src/backend/catalog/storage.c
index 9a5fde00ca..cff49bae9e 100644
--- a/src/backend/catalog/storage.c
+++ b/src/backend/catalog/storage.c
@@ -3,7 +3,7 @@
  * storage.c
  *	  code to create and destroy physical storage for relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/catalog/system_views.sql b/src/backend/catalog/system_views.sql
index dc40cde424..5652e9ee6d 100644
--- a/src/backend/catalog/system_views.sql
+++ b/src/backend/catalog/system_views.sql
@@ -1,7 +1,7 @@
 /*
  * PostgreSQL System Views
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/backend/catalog/system_views.sql
  *
@@ -1115,12 +1115,14 @@ LANGUAGE INTERNAL
 STRICT IMMUTABLE PARALLEL SAFE
 AS 'jsonb_insert';
 
+--
 -- The default permissions for functions mean that anyone can execute them.
 -- A number of functions shouldn't be executable by just anyone, but rather
 -- than use explicit 'superuser()' checks in those functions, we use the GRANT
 -- system to REVOKE access to those functions at initdb time.  Administrators
 -- can later change who can access these functions, or leave them as only
 -- available to superuser / cluster owner, if they choose.
+--
 REVOKE EXECUTE ON FUNCTION pg_start_backup(text, boolean, boolean) FROM public;
 REVOKE EXECUTE ON FUNCTION pg_stop_backup() FROM public;
 REVOKE EXECUTE ON FUNCTION pg_stop_backup(boolean, boolean) FROM public;
@@ -1138,8 +1140,16 @@ REVOKE EXECUTE ON FUNCTION pg_stat_reset_shared(text) FROM public;
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_single_table_counters(oid) FROM public;
 REVOKE EXECUTE ON FUNCTION pg_stat_reset_single_function_counters(oid) FROM public;
 
+REVOKE EXECUTE ON FUNCTION lo_import(text) FROM public;
+REVOKE EXECUTE ON FUNCTION lo_import(text, oid) FROM public;
+REVOKE EXECUTE ON FUNCTION lo_export(oid, text) FROM public;
+
 REVOKE EXECUTE ON FUNCTION pg_ls_logdir() FROM public;
 REVOKE EXECUTE ON FUNCTION pg_ls_waldir() FROM public;
+
+--
+-- We also set up some things as accessible to standard roles.
+--
 GRANT EXECUTE ON FUNCTION pg_ls_logdir() TO pg_monitor;
 GRANT EXECUTE ON FUNCTION pg_ls_waldir() TO pg_monitor;
 
diff --git a/src/backend/catalog/toasting.c b/src/backend/catalog/toasting.c
index 29756eb14e..8bf2698545 100644
--- a/src/backend/catalog/toasting.c
+++ b/src/backend/catalog/toasting.c
@@ -4,7 +4,7 @@
  *	  This file contains routines to support creation of toast tables
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -235,9 +235,9 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	 * toast :-(.  This is essential for chunk_data because type bytea is
 	 * toastable; hit the other two just to be sure.
 	 */
-	tupdesc->attrs[0]->attstorage = 'p';
-	tupdesc->attrs[1]->attstorage = 'p';
-	tupdesc->attrs[2]->attstorage = 'p';
+	TupleDescAttr(tupdesc, 0)->attstorage = 'p';
+	TupleDescAttr(tupdesc, 1)->attstorage = 'p';
+	TupleDescAttr(tupdesc, 2)->attstorage = 'p';
 
 	/*
 	 * Toast tables for regular relations go in pg_toast; those for temp
@@ -315,6 +315,8 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	indexInfo->ii_ReadyForInserts = true;
 	indexInfo->ii_Concurrent = false;
 	indexInfo->ii_BrokenHotChain = false;
+	indexInfo->ii_ParallelWorkers = 0;
+	indexInfo->ii_Am = BTREE_AM_OID;
 	indexInfo->ii_AmCache = NULL;
 	indexInfo->ii_Context = CurrentMemoryContext;
 
@@ -328,13 +330,13 @@ create_toast_table(Relation rel, Oid toastOid, Oid toastIndexOid,
 	coloptions[1] = 0;
 
 	index_create(toast_rel, toast_idxname, toastIndexOid, InvalidOid,
+				 InvalidOid, InvalidOid,
 				 indexInfo,
 				 list_make2("chunk_id", "chunk_seq"),
 				 BTREE_AM_OID,
 				 rel->rd_rel->reltablespace,
 				 collationObjectId, classObjectId, coloptions, (Datum) 0,
-				 true, false, false, false,
-				 true, false, false, true, false);
+				 INDEX_CREATE_IS_PRIMARY, 0, true, true, NULL);
 
 	heap_close(toast_rel, NoLock);
 
@@ -402,33 +404,33 @@ needs_toast_table(Relation rel)
 	bool		maxlength_unknown = false;
 	bool		has_toastable_attrs = false;
 	TupleDesc	tupdesc;
-	Form_pg_attribute *att;
 	int32		tuple_length;
 	int			i;
 
 	tupdesc = rel->rd_att;
-	att = tupdesc->attrs;
 
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-		if (att[i]->attisdropped)
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+		if (att->attisdropped)
 			continue;
-		data_length = att_align_nominal(data_length, att[i]->attalign);
-		if (att[i]->attlen > 0)
+		data_length = att_align_nominal(data_length, att->attalign);
+		if (att->attlen > 0)
 		{
 			/* Fixed-length types are never toastable */
-			data_length += att[i]->attlen;
+			data_length += att->attlen;
 		}
 		else
 		{
-			int32		maxlen = type_maximum_size(att[i]->atttypid,
-												   att[i]->atttypmod);
+			int32		maxlen = type_maximum_size(att->atttypid,
+												   att->atttypmod);
 
 			if (maxlen < 0)
 				maxlength_unknown = true;
 			else
 				data_length += maxlen;
-			if (att[i]->attstorage != 'p')
+			if (att->attstorage != 'p')
 				has_toastable_attrs = true;
 		}
 	}
diff --git a/src/backend/commands/aggregatecmds.c b/src/backend/commands/aggregatecmds.c
index a63539ab21..a48c3ac572 100644
--- a/src/backend/commands/aggregatecmds.c
+++ b/src/backend/commands/aggregatecmds.c
@@ -4,7 +4,7 @@
  *
  *	  Routines for aggregate-manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,6 +26,7 @@
 #include "catalog/dependency.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_aggregate.h"
+#include "catalog/pg_aggregate_fn.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
 #include "commands/alter.h"
@@ -39,6 +40,9 @@
 #include "utils/syscache.h"
 
 
+static char extractModify(DefElem *defel);
+
+
 /*
  *	DefineAggregate
  *
@@ -67,6 +71,8 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 	List	   *mfinalfuncName = NIL;
 	bool		finalfuncExtraArgs = false;
 	bool		mfinalfuncExtraArgs = false;
+	char		finalfuncModify = 0;
+	char		mfinalfuncModify = 0;
 	List	   *sortoperatorName = NIL;
 	TypeName   *baseType = NULL;
 	TypeName   *transType = NULL;
@@ -97,7 +103,7 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(aggNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(aggNamespace));
 
 	/* Deconstruct the output of the aggr_args grammar production */
@@ -121,33 +127,37 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 		 * sfunc1, stype1, and initcond1 are accepted as obsolete spellings
 		 * for sfunc, stype, initcond.
 		 */
-		if (pg_strcasecmp(defel->defname, "sfunc") == 0)
+		if (strcmp(defel->defname, "sfunc") == 0)
 			transfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "sfunc1") == 0)
+		else if (strcmp(defel->defname, "sfunc1") == 0)
 			transfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "finalfunc") == 0)
+		else if (strcmp(defel->defname, "finalfunc") == 0)
 			finalfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "combinefunc") == 0)
+		else if (strcmp(defel->defname, "combinefunc") == 0)
 			combinefuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "serialfunc") == 0)
+		else if (strcmp(defel->defname, "serialfunc") == 0)
 			serialfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "deserialfunc") == 0)
+		else if (strcmp(defel->defname, "deserialfunc") == 0)
 			deserialfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "msfunc") == 0)
+		else if (strcmp(defel->defname, "msfunc") == 0)
 			mtransfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "minvfunc") == 0)
+		else if (strcmp(defel->defname, "minvfunc") == 0)
 			minvtransfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "mfinalfunc") == 0)
+		else if (strcmp(defel->defname, "mfinalfunc") == 0)
 			mfinalfuncName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "finalfunc_extra") == 0)
+		else if (strcmp(defel->defname, "finalfunc_extra") == 0)
 			finalfuncExtraArgs = defGetBoolean(defel);
-		else if (pg_strcasecmp(defel->defname, "mfinalfunc_extra") == 0)
+		else if (strcmp(defel->defname, "mfinalfunc_extra") == 0)
 			mfinalfuncExtraArgs = defGetBoolean(defel);
-		else if (pg_strcasecmp(defel->defname, "sortop") == 0)
+		else if (strcmp(defel->defname, "finalfunc_modify") == 0)
+			finalfuncModify = extractModify(defel);
+		else if (strcmp(defel->defname, "mfinalfunc_modify") == 0)
+			mfinalfuncModify = extractModify(defel);
+		else if (strcmp(defel->defname, "sortop") == 0)
 			sortoperatorName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "basetype") == 0)
+		else if (strcmp(defel->defname, "basetype") == 0)
 			baseType = defGetTypeName(defel);
-		else if (pg_strcasecmp(defel->defname, "hypothetical") == 0)
+		else if (strcmp(defel->defname, "hypothetical") == 0)
 		{
 			if (defGetBoolean(defel))
 			{
@@ -158,23 +168,23 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 				aggKind = AGGKIND_HYPOTHETICAL;
 			}
 		}
-		else if (pg_strcasecmp(defel->defname, "stype") == 0)
+		else if (strcmp(defel->defname, "stype") == 0)
 			transType = defGetTypeName(defel);
-		else if (pg_strcasecmp(defel->defname, "stype1") == 0)
+		else if (strcmp(defel->defname, "stype1") == 0)
 			transType = defGetTypeName(defel);
-		else if (pg_strcasecmp(defel->defname, "sspace") == 0)
+		else if (strcmp(defel->defname, "sspace") == 0)
 			transSpace = defGetInt32(defel);
-		else if (pg_strcasecmp(defel->defname, "mstype") == 0)
+		else if (strcmp(defel->defname, "mstype") == 0)
 			mtransType = defGetTypeName(defel);
-		else if (pg_strcasecmp(defel->defname, "msspace") == 0)
+		else if (strcmp(defel->defname, "msspace") == 0)
 			mtransSpace = defGetInt32(defel);
-		else if (pg_strcasecmp(defel->defname, "initcond") == 0)
+		else if (strcmp(defel->defname, "initcond") == 0)
 			initval = defGetString(defel);
-		else if (pg_strcasecmp(defel->defname, "initcond1") == 0)
+		else if (strcmp(defel->defname, "initcond1") == 0)
 			initval = defGetString(defel);
-		else if (pg_strcasecmp(defel->defname, "minitcond") == 0)
+		else if (strcmp(defel->defname, "minitcond") == 0)
 			minitval = defGetString(defel);
-		else if (pg_strcasecmp(defel->defname, "parallel") == 0)
+		else if (strcmp(defel->defname, "parallel") == 0)
 			parallel = defGetString(defel);
 		else
 			ereport(WARNING,
@@ -235,6 +245,15 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 					 errmsg("aggregate minitcond must not be specified without mstype")));
 	}
 
+	/*
+	 * Default values for modify flags can only be determined once we know the
+	 * aggKind.
+	 */
+	if (finalfuncModify == 0)
+		finalfuncModify = (aggKind == AGGKIND_NORMAL) ? AGGMODIFY_READ_ONLY : AGGMODIFY_READ_WRITE;
+	if (mfinalfuncModify == 0)
+		mfinalfuncModify = (aggKind == AGGKIND_NORMAL) ? AGGMODIFY_READ_ONLY : AGGMODIFY_READ_WRITE;
+
 	/*
 	 * look up the aggregate's input datatype(s).
 	 */
@@ -288,7 +307,7 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 		interpret_function_parameter_list(pstate,
 										  args,
 										  InvalidOid,
-										  true, /* is an aggregate */
+										  OBJECT_AGGREGATE,
 										  &parameterTypes,
 										  &allParameterTypes,
 										  &parameterModes,
@@ -401,11 +420,11 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 
 	if (parallel)
 	{
-		if (pg_strcasecmp(parallel, "safe") == 0)
+		if (strcmp(parallel, "safe") == 0)
 			proparallel = PROPARALLEL_SAFE;
-		else if (pg_strcasecmp(parallel, "restricted") == 0)
+		else if (strcmp(parallel, "restricted") == 0)
 			proparallel = PROPARALLEL_RESTRICTED;
-		else if (pg_strcasecmp(parallel, "unsafe") == 0)
+		else if (strcmp(parallel, "unsafe") == 0)
 			proparallel = PROPARALLEL_UNSAFE;
 		else
 			ereport(ERROR,
@@ -437,6 +456,8 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 						   mfinalfuncName,	/* final function name */
 						   finalfuncExtraArgs,
 						   mfinalfuncExtraArgs,
+						   finalfuncModify,
+						   mfinalfuncModify,
 						   sortoperatorName,	/* sort operator name */
 						   transTypeId, /* transition data type */
 						   transSpace,	/* transition space */
@@ -446,3 +467,24 @@ DefineAggregate(ParseState *pstate, List *name, List *args, bool oldstyle, List
 						   minitval,	/* initial condition */
 						   proparallel);	/* parallel safe? */
 }
+
+/*
+ * Convert the string form of [m]finalfunc_modify to the catalog representation
+ */
+static char
+extractModify(DefElem *defel)
+{
+	char	   *val = defGetString(defel);
+
+	if (strcmp(val, "read_only") == 0)
+		return AGGMODIFY_READ_ONLY;
+	if (strcmp(val, "sharable") == 0)
+		return AGGMODIFY_SHARABLE;
+	if (strcmp(val, "read_write") == 0)
+		return AGGMODIFY_READ_WRITE;
+	ereport(ERROR,
+			(errcode(ERRCODE_SYNTAX_ERROR),
+			 errmsg("parameter \"%s\" must be READ_ONLY, SHARABLE, or READ_WRITE",
+					defel->defname)));
+	return 0;					/* keep compiler quiet */
+}
diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c
index 4f8147907c..0d63866fb0 100644
--- a/src/backend/commands/alter.c
+++ b/src/backend/commands/alter.c
@@ -3,7 +3,7 @@
  * alter.c
  *	  Drivers for generic alter commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -171,7 +171,7 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
 	AttrNumber	Anum_name = get_object_attnum_name(classId);
 	AttrNumber	Anum_namespace = get_object_attnum_namespace(classId);
 	AttrNumber	Anum_owner = get_object_attnum_owner(classId);
-	AclObjectKind acl_kind = get_object_aclkind(classId);
+	ObjectType	objtype = get_object_type(classId, objectId);
 	HeapTuple	oldtup;
 	HeapTuple	newtup;
 	Datum		datum;
@@ -223,7 +223,7 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
 		ownerId = DatumGetObjectId(datum);
 
 		if (!has_privs_of_role(GetUserId(), DatumGetObjectId(ownerId)))
-			aclcheck_error(ACLCHECK_NOT_OWNER, acl_kind, old_name);
+			aclcheck_error(ACLCHECK_NOT_OWNER, objtype, old_name);
 
 		/* User must have CREATE privilege on the namespace */
 		if (OidIsValid(namespaceId))
@@ -231,7 +231,7 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name)
 			aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(),
 											  ACL_CREATE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+				aclcheck_error(aclresult, OBJECT_SCHEMA,
 							   get_namespace_name(namespaceId));
 		}
 	}
@@ -378,6 +378,8 @@ ExecRenameStmt(RenameStmt *stmt)
 		case OBJECT_OPCLASS:
 		case OBJECT_OPFAMILY:
 		case OBJECT_LANGUAGE:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 		case OBJECT_STATISTIC_EXT:
 		case OBJECT_TSCONFIGURATION:
 		case OBJECT_TSDICTIONARY:
@@ -495,6 +497,8 @@ ExecAlterObjectSchemaStmt(AlterObjectSchemaStmt *stmt,
 		case OBJECT_OPERATOR:
 		case OBJECT_OPCLASS:
 		case OBJECT_OPFAMILY:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 		case OBJECT_STATISTIC_EXT:
 		case OBJECT_TSCONFIGURATION:
 		case OBJECT_TSDICTIONARY:
@@ -659,7 +663,7 @@ AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid)
 	AttrNumber	Anum_name = get_object_attnum_name(classId);
 	AttrNumber	Anum_namespace = get_object_attnum_namespace(classId);
 	AttrNumber	Anum_owner = get_object_attnum_owner(classId);
-	AclObjectKind acl_kind = get_object_aclkind(classId);
+	ObjectType	objtype = get_object_type(classId, objid);
 	Oid			oldNspOid;
 	Datum		name,
 				namespace;
@@ -715,13 +719,13 @@ AlterObjectNamespace_internal(Relation rel, Oid objid, Oid nspOid)
 		ownerId = DatumGetObjectId(owner);
 
 		if (!has_privs_of_role(GetUserId(), ownerId))
-			aclcheck_error(ACLCHECK_NOT_OWNER, acl_kind,
+			aclcheck_error(ACLCHECK_NOT_OWNER, objtype,
 						   NameStr(*(DatumGetName(name))));
 
 		/* User must have CREATE privilege on new namespace */
 		aclresult = pg_namespace_aclcheck(nspOid, GetUserId(), ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(nspOid));
 	}
 
@@ -842,6 +846,8 @@ ExecAlterOwnerStmt(AlterOwnerStmt *stmt)
 		case OBJECT_OPERATOR:
 		case OBJECT_OPCLASS:
 		case OBJECT_OPFAMILY:
+		case OBJECT_PROCEDURE:
+		case OBJECT_ROUTINE:
 		case OBJECT_STATISTIC_EXT:
 		case OBJECT_TABLESPACE:
 		case OBJECT_TSDICTIONARY:
@@ -936,7 +942,7 @@ AlterObjectOwner_internal(Relation rel, Oid objectId, Oid new_ownerId)
 		/* Superusers can bypass permission checks */
 		if (!superuser())
 		{
-			AclObjectKind aclkind = get_object_aclkind(classId);
+			ObjectType objtype = get_object_type(classId, objectId);
 
 			/* must be owner */
 			if (!has_privs_of_role(GetUserId(), old_ownerId))
@@ -957,7 +963,7 @@ AlterObjectOwner_internal(Relation rel, Oid objectId, Oid new_ownerId)
 							 HeapTupleGetOid(oldtup));
 					objname = namebuf;
 				}
-				aclcheck_error(ACLCHECK_NOT_OWNER, aclkind, objname);
+				aclcheck_error(ACLCHECK_NOT_OWNER, objtype, objname);
 			}
 			/* Must be able to become new owner */
 			check_is_member_of_role(GetUserId(), new_ownerId);
@@ -970,7 +976,7 @@ AlterObjectOwner_internal(Relation rel, Oid objectId, Oid new_ownerId)
 				aclresult = pg_namespace_aclcheck(namespaceId, new_ownerId,
 												  ACL_CREATE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					aclcheck_error(aclresult, OBJECT_SCHEMA,
 								   get_namespace_name(namespaceId));
 			}
 		}
diff --git a/src/backend/commands/amcmds.c b/src/backend/commands/amcmds.c
index 7e0a9aa0fd..f2173450ad 100644
--- a/src/backend/commands/amcmds.c
+++ b/src/backend/commands/amcmds.c
@@ -3,7 +3,7 @@
  * amcmds.c
  *	  Routines for SQL commands that manipulate access methods.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/commands/analyze.c b/src/backend/commands/analyze.c
index 2b638271b3..5f21fcb5f4 100644
--- a/src/backend/commands/analyze.c
+++ b/src/backend/commands/analyze.c
@@ -3,7 +3,7 @@
  * analyze.c
  *	  the Postgres statistics generator
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -106,6 +106,10 @@ static Datum ind_fetch_func(VacAttrStatsP stats, int rownum, bool *isNull);
 
 /*
  *	analyze_rel() -- analyze one relation
+ *
+ * relid identifies the relation to analyze.  If relation is supplied, use
+ * the name therein for reporting any failure to open/lock the rel; do not
+ * use it once we've successfully opened the rel, since it might be stale.
  */
 void
 analyze_rel(Oid relid, RangeVar *relation, int options,
@@ -116,6 +120,7 @@ analyze_rel(Oid relid, RangeVar *relation, int options,
 	int			elevel;
 	AcquireSampleRowsFunc acquirefunc = NULL;
 	BlockNumber relpages = 0;
+	bool		rel_lock = true;
 
 	/* Select logging level */
 	if (options & VACOPT_VERBOSE)
@@ -145,14 +150,50 @@ analyze_rel(Oid relid, RangeVar *relation, int options,
 	else
 	{
 		onerel = NULL;
-		if (IsAutoVacuumWorkerProcess() && params->log_min_duration >= 0)
-			ereport(LOG,
+		rel_lock = false;
+	}
+
+	/*
+	 * If we failed to open or lock the relation, emit a log message before
+	 * exiting.
+	 */
+	if (!onerel)
+	{
+		/*
+		 * If the RangeVar is not defined, we do not have enough information
+		 * to provide a meaningful log statement.  Chances are that
+		 * analyze_rel's caller has intentionally not provided this
+		 * information so that this logging is skipped, anyway.
+		 */
+		if (relation == NULL)
+			return;
+
+		/*
+		 * Determine the log level.  For autovacuum logs, we emit a LOG if
+		 * log_autovacuum_min_duration is not disabled.  For manual ANALYZE,
+		 * we emit a WARNING to match the log statements in the permissions
+		 * checks.
+		 */
+		if (!IsAutoVacuumWorkerProcess())
+			elevel = WARNING;
+		else if (params->log_min_duration >= 0)
+			elevel = LOG;
+		else
+			return;
+
+		if (!rel_lock)
+			ereport(elevel,
 					(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
 					 errmsg("skipping analyze of \"%s\" --- lock not available",
 							relation->relname)));
-	}
-	if (!onerel)
+		else
+			ereport(elevel,
+					(errcode(ERRCODE_UNDEFINED_TABLE),
+					 errmsg("skipping analyze of \"%s\" --- relation no longer exists",
+							relation->relname)));
+
 		return;
+	}
 
 	/*
 	 * Check permissions --- this should match vacuum's check!
@@ -202,9 +243,7 @@ analyze_rel(Oid relid, RangeVar *relation, int options,
 	}
 
 	/*
-	 * Check that it's a plain table, materialized view, or foreign table; we
-	 * used to do this in get_rel_oids() but seems safer to check after we've
-	 * locked the relation.
+	 * Check that it's of an analyzable relkind, and set up appropriately.
 	 */
 	if (onerel->rd_rel->relkind == RELKIND_RELATION ||
 		onerel->rd_rel->relkind == RELKIND_MATVIEW)
@@ -370,10 +409,14 @@ do_analyze_rel(Relation onerel, int options, VacuumParams *params,
 	/*
 	 * Determine which columns to analyze
 	 *
-	 * Note that system attributes are never analyzed.
+	 * Note that system attributes are never analyzed, so we just reject them
+	 * at the lookup stage.  We also reject duplicate column mentions.  (We
+	 * could alternatively ignore duplicates, but analyzing a column twice
+	 * won't work; we'd end up making a conflicting update in pg_statistic.)
 	 */
 	if (va_cols != NIL)
 	{
+		Bitmapset  *unique_cols = NULL;
 		ListCell   *le;
 
 		vacattrstats = (VacAttrStats **) palloc(list_length(va_cols) *
@@ -389,6 +432,13 @@ do_analyze_rel(Relation onerel, int options, VacuumParams *params,
 						(errcode(ERRCODE_UNDEFINED_COLUMN),
 						 errmsg("column \"%s\" of relation \"%s\" does not exist",
 								col, RelationGetRelationName(onerel))));
+			if (bms_is_member(i, unique_cols))
+				ereport(ERROR,
+						(errcode(ERRCODE_DUPLICATE_COLUMN),
+						 errmsg("column \"%s\" of relation \"%s\" appears more than once",
+								col, RelationGetRelationName(onerel))));
+			unique_cols = bms_add_member(unique_cols, i);
+
 			vacattrstats[tcnt] = examine_attribute(onerel, i, NULL);
 			if (vacattrstats[tcnt] != NULL)
 				tcnt++;
@@ -526,10 +576,10 @@ do_analyze_rel(Relation onerel, int options, VacuumParams *params,
 
 			stats->rows = rows;
 			stats->tupDesc = onerel->rd_att;
-			(*stats->compute_stats) (stats,
-									 std_fetch_func,
-									 numrows,
-									 totalrows);
+			stats->compute_stats(stats,
+								 std_fetch_func,
+								 numrows,
+								 totalrows);
 
 			/*
 			 * If the appropriate flavor of the n_distinct option is
@@ -830,10 +880,10 @@ compute_index_stats(Relation onerel, double totalrows,
 				stats->exprvals = exprvals + i;
 				stats->exprnulls = exprnulls + i;
 				stats->rowstride = attr_cnt;
-				(*stats->compute_stats) (stats,
-										 ind_fetch_func,
-										 numindexrows,
-										 totalindexrows);
+				stats->compute_stats(stats,
+									 ind_fetch_func,
+									 numindexrows,
+									 totalindexrows);
 
 				/*
 				 * If the n_distinct option is specified, it overrides the
@@ -871,7 +921,7 @@ compute_index_stats(Relation onerel, double totalrows,
 static VacAttrStats *
 examine_attribute(Relation onerel, int attnum, Node *index_expr)
 {
-	Form_pg_attribute attr = onerel->rd_att->attrs[attnum - 1];
+	Form_pg_attribute attr = TupleDescAttr(onerel->rd_att, attnum - 1);
 	HeapTuple	typtuple;
 	VacAttrStats *stats;
 	int			i;
diff --git a/src/backend/commands/async.c b/src/backend/commands/async.c
index bacc08eb84..ee7c6d41b4 100644
--- a/src/backend/commands/async.c
+++ b/src/backend/commands/async.c
@@ -3,7 +3,7 @@
  * async.c
  *	  Asynchronous notification: NOTIFY, LISTEN, UNLISTEN
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -137,7 +137,9 @@
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/ps_status.h"
+#include "utils/snapmgr.h"
 #include "utils/timestamp.h"
+#include "utils/tqual.h"
 
 
 /*
@@ -387,7 +389,8 @@ static bool SignalBackends(void);
 static void asyncQueueReadAllNotifications(void);
 static bool asyncQueueProcessPageEntries(volatile QueuePosition *current,
 							 QueuePosition stop,
-							 char *page_buffer);
+							 char *page_buffer,
+							 Snapshot snapshot);
 static void asyncQueueAdvanceTail(void);
 static void ProcessIncomingNotify(void);
 static bool AsyncExistsPendingNotify(const char *channel, const char *payload);
@@ -798,7 +801,7 @@ PreCommit_Notify(void)
 		}
 	}
 
-	/* Queue any pending notifies */
+	/* Queue any pending notifies (must happen after the above) */
 	if (pendingNotifies)
 	{
 		ListCell   *nextNotify;
@@ -987,7 +990,9 @@ Exec_ListenPreCommit(void)
 	 * have already committed before we started to LISTEN.
 	 *
 	 * Note that we are not yet listening on anything, so we won't deliver any
-	 * notification to the frontend.
+	 * notification to the frontend.  Also, although our transaction might
+	 * have executed NOTIFY, those message(s) aren't queued yet so we can't
+	 * see them in the queue.
 	 *
 	 * This will also advance the global tail pointer if possible.
 	 */
@@ -1744,6 +1749,7 @@ asyncQueueReadAllNotifications(void)
 	volatile QueuePosition pos;
 	QueuePosition oldpos;
 	QueuePosition head;
+	Snapshot	snapshot;
 	bool		advanceTail;
 
 	/* page_buffer must be adequately aligned, so use a union */
@@ -1767,6 +1773,9 @@ asyncQueueReadAllNotifications(void)
 		return;
 	}
 
+	/* Get snapshot we'll use to decide which xacts are still in progress */
+	snapshot = RegisterSnapshot(GetLatestSnapshot());
+
 	/*----------
 	 * Note that we deliver everything that we see in the queue and that
 	 * matches our _current_ listening state.
@@ -1854,7 +1863,8 @@ asyncQueueReadAllNotifications(void)
 			 * while sending the notifications to the frontend.
 			 */
 			reachedStop = asyncQueueProcessPageEntries(&pos, head,
-													   page_buffer.buf);
+													   page_buffer.buf,
+													   snapshot);
 		} while (!reachedStop);
 	}
 	PG_CATCH();
@@ -1882,6 +1892,9 @@ asyncQueueReadAllNotifications(void)
 	/* If we were the laziest backend, try to advance the tail pointer */
 	if (advanceTail)
 		asyncQueueAdvanceTail();
+
+	/* Done with snapshot */
+	UnregisterSnapshot(snapshot);
 }
 
 /*
@@ -1903,7 +1916,8 @@ asyncQueueReadAllNotifications(void)
 static bool
 asyncQueueProcessPageEntries(volatile QueuePosition *current,
 							 QueuePosition stop,
-							 char *page_buffer)
+							 char *page_buffer,
+							 Snapshot snapshot)
 {
 	bool		reachedStop = false;
 	bool		reachedEndOfPage;
@@ -1928,7 +1942,7 @@ asyncQueueProcessPageEntries(volatile QueuePosition *current,
 		/* Ignore messages destined for other databases */
 		if (qe->dboid == MyDatabaseId)
 		{
-			if (TransactionIdIsInProgress(qe->xid))
+			if (XidInMVCCSnapshot(qe->xid, snapshot))
 			{
 				/*
 				 * The source transaction is still in progress, so we can't
@@ -1939,10 +1953,15 @@ asyncQueueProcessPageEntries(volatile QueuePosition *current,
 				 * this advance-then-back-up behavior when dealing with an
 				 * uncommitted message.)
 				 *
-				 * Note that we must test TransactionIdIsInProgress before we
-				 * test TransactionIdDidCommit, else we might return a message
-				 * from a transaction that is not yet visible to snapshots;
-				 * compare the comments at the head of tqual.c.
+				 * Note that we must test XidInMVCCSnapshot before we test
+				 * TransactionIdDidCommit, else we might return a message from
+				 * a transaction that is not yet visible to snapshots; compare
+				 * the comments at the head of tqual.c.
+				 *
+				 * Also, while our own xact won't be listed in the snapshot,
+				 * we need not check for TransactionIdIsCurrentTransactionId
+				 * because our transaction cannot (yet) have queued any
+				 * messages.
 				 */
 				*current = thisentry;
 				reachedStop = true;
@@ -2081,7 +2100,7 @@ NotifyMyFrontEnd(const char *channel, const char *payload, int32 srcPid)
 		StringInfoData buf;
 
 		pq_beginmessage(&buf, 'A');
-		pq_sendint(&buf, srcPid, sizeof(int32));
+		pq_sendint32(&buf, srcPid);
 		pq_sendstring(&buf, channel);
 		if (PG_PROTOCOL_MAJOR(FrontendProtocol) >= 3)
 			pq_sendstring(&buf, payload);
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index f51f8b9492..5d481dd50d 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -6,7 +6,7 @@
  * There is hardly anything left of Paul Brown's original implementation...
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  *
@@ -128,6 +128,14 @@ cluster(ClusterStmt *stmt, bool isTopLevel)
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("cannot cluster temporary tables of other sessions")));
 
+		/*
+		 * Reject clustering a partitioned table.
+		 */
+		if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot cluster a partitioned table")));
+
 		if (stmt->indexname == NULL)
 		{
 			ListCell   *index;
@@ -482,6 +490,12 @@ mark_index_clustered(Relation rel, Oid indexOid, bool is_internal)
 	Relation	pg_index;
 	ListCell   *index;
 
+	/* Disallow applying to a partitioned table */
+	if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot mark index clustered in partitioned table")));
+
 	/*
 	 * If the index is already marked clustered, no need to do anything.
 	 */
@@ -738,6 +752,9 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 	Relation	NewHeap,
 				OldHeap,
 				OldIndex;
+	Relation	relRelation;
+	HeapTuple	reltup;
+	Form_pg_class relform;
 	TupleDesc	oldTupDesc;
 	TupleDesc	newTupDesc;
 	int			natts;
@@ -756,6 +773,7 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 	double		num_tuples = 0,
 				tups_vacuumed = 0,
 				tups_recently_dead = 0;
+	BlockNumber num_pages;
 	int			elevel = verbose ? INFO : DEBUG2;
 	PGRUsage	ru0;
 
@@ -891,7 +909,8 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 	/* Set up sorting if wanted */
 	if (use_sort)
 		tuplesort = tuplesort_begin_cluster(oldTupDesc, OldIndex,
-											maintenance_work_mem, false);
+											maintenance_work_mem,
+											NULL, false);
 	else
 		tuplesort = NULL;
 
@@ -1079,6 +1098,8 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 	/* Reset rd_toastoid just to be tidy --- it shouldn't be looked at again */
 	NewHeap->rd_toastoid = InvalidOid;
 
+	num_pages = RelationGetNumberOfBlocks(NewHeap);
+
 	/* Log what we did */
 	ereport(elevel,
 			(errmsg("\"%s\": found %.0f removable, %.0f nonremovable row versions in %u pages",
@@ -1098,6 +1119,30 @@ copy_heap_data(Oid OIDNewHeap, Oid OIDOldHeap, Oid OIDOldIndex, bool verbose,
 		index_close(OldIndex, NoLock);
 	heap_close(OldHeap, NoLock);
 	heap_close(NewHeap, NoLock);
+
+	/* Update pg_class to reflect the correct values of pages and tuples. */
+	relRelation = heap_open(RelationRelationId, RowExclusiveLock);
+
+	reltup = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(OIDNewHeap));
+	if (!HeapTupleIsValid(reltup))
+		elog(ERROR, "cache lookup failed for relation %u", OIDNewHeap);
+	relform = (Form_pg_class) GETSTRUCT(reltup);
+
+	relform->relpages = num_pages;
+	relform->reltuples = num_tuples;
+
+	/* Don't update the stats for pg_class.  See swap_relation_files. */
+	if (OIDOldHeap != RelationRelationId)
+		CatalogTupleUpdate(relRelation, &reltup->t_self, reltup);
+	else
+		CacheInvalidateRelcacheByTuple(reltup);
+
+	/* Clean up. */
+	heap_freetuple(reltup);
+	heap_close(relRelation, RowExclusiveLock);
+
+	/* Make the update visible */
+	CommandCounterIncrement();
 }
 
 /*
@@ -1714,7 +1759,7 @@ reform_and_rewrite_tuple(HeapTuple tuple,
 	/* Be sure to null out any dropped columns */
 	for (i = 0; i < newTupDesc->natts; i++)
 	{
-		if (newTupDesc->attrs[i]->attisdropped)
+		if (TupleDescAttr(newTupDesc, i)->attisdropped)
 			isnull[i] = true;
 	}
 
diff --git a/src/backend/commands/collationcmds.c b/src/backend/commands/collationcmds.c
index 96a6bc9bf0..d0b5cdb69a 100644
--- a/src/backend/commands/collationcmds.c
+++ b/src/backend/commands/collationcmds.c
@@ -3,7 +3,7 @@
  * collationcmds.c
  *	  collation-related commands support code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -74,7 +74,7 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
 
 	aclresult = pg_namespace_aclcheck(collNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(collNamespace));
 
 	foreach(pl, parameters)
@@ -82,17 +82,17 @@ DefineCollation(ParseState *pstate, List *names, List *parameters, bool if_not_e
 		DefElem    *defel = lfirst_node(DefElem, pl);
 		DefElem   **defelp;
 
-		if (pg_strcasecmp(defel->defname, "from") == 0)
+		if (strcmp(defel->defname, "from") == 0)
 			defelp = &fromEl;
-		else if (pg_strcasecmp(defel->defname, "locale") == 0)
+		else if (strcmp(defel->defname, "locale") == 0)
 			defelp = &localeEl;
-		else if (pg_strcasecmp(defel->defname, "lc_collate") == 0)
+		else if (strcmp(defel->defname, "lc_collate") == 0)
 			defelp = &lccollateEl;
-		else if (pg_strcasecmp(defel->defname, "lc_ctype") == 0)
+		else if (strcmp(defel->defname, "lc_ctype") == 0)
 			defelp = &lcctypeEl;
-		else if (pg_strcasecmp(defel->defname, "provider") == 0)
+		else if (strcmp(defel->defname, "provider") == 0)
 			defelp = &providerEl;
-		else if (pg_strcasecmp(defel->defname, "version") == 0)
+		else if (strcmp(defel->defname, "version") == 0)
 			defelp = &versionEl;
 		else
 		{
@@ -278,7 +278,7 @@ AlterCollation(AlterCollationStmt *stmt)
 	collOid = get_collation_oid(stmt->collname, false);
 
 	if (!pg_collation_ownercheck(collOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_COLLATION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_COLLATION,
 					   NameListToString(stmt->collname));
 
 	tup = SearchSysCacheCopy1(COLLOID, ObjectIdGetDatum(collOid));
@@ -667,7 +667,16 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 	}
 #endif							/* READ_LOCALE_A_OUTPUT */
 
-	/* Load collations known to ICU */
+	/*
+	 * Load collations known to ICU
+	 *
+	 * We use uloc_countAvailable()/uloc_getAvailable() rather than
+	 * ucol_countAvailable()/ucol_getAvailable().  The former returns a full
+	 * set of language+region combinations, whereas the latter only returns
+	 * language+region combinations of they are distinct from the language's
+	 * base collation.  So there might not be a de-DE or en-GB, which would be
+	 * confusing.
+	 */
 #ifdef USE_ICU
 	{
 		int			i;
@@ -676,37 +685,18 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 		 * Start the loop at -1 to sneak in the root locale without too much
 		 * code duplication.
 		 */
-		for (i = -1; i < ucol_countAvailable(); i++)
+		for (i = -1; i < uloc_countAvailable(); i++)
 		{
-			/*
-			 * In ICU 4.2, ucol_getKeywordValuesForLocale() sometimes returns
-			 * values that will not be accepted by uloc_toLanguageTag().  Skip
-			 * loading keyword variants in that version.  (Both
-			 * ucol_getKeywordValuesForLocale() and uloc_toLanguageTag() are
-			 * new in ICU 4.2, so older versions are not supported at all.)
-			 *
-			 * XXX We have no information about ICU 4.3 through 4.7, but we
-			 * know the code below works with 4.8.
-			 */
-#if U_ICU_VERSION_MAJOR_NUM > 4 || (U_ICU_VERSION_MAJOR_NUM == 4 && U_ICU_VERSION_MINOR_NUM > 2)
-#define LOAD_ICU_KEYWORD_VARIANTS
-#endif
-
 			const char *name;
 			char	   *langtag;
 			char	   *icucomment;
 			const char *collcollate;
 			Oid			collid;
-#ifdef LOAD_ICU_KEYWORD_VARIANTS
-			UEnumeration *en;
-			UErrorCode	status;
-			const char *val;
-#endif
 
 			if (i == -1)
 				name = "";		/* ICU root locale */
 			else
-				name = ucol_getAvailable(i);
+				name = uloc_getAvailable(i);
 
 			langtag = get_icu_language_tag(name);
 			collcollate = U_ICU_VERSION_MAJOR_NUM >= 54 ? langtag : name;
@@ -735,58 +725,6 @@ pg_import_system_collations(PG_FUNCTION_ARGS)
 					CreateComments(collid, CollationRelationId, 0,
 								   icucomment);
 			}
-
-			/*
-			 * Add keyword variants, if enabled.
-			 */
-#ifdef LOAD_ICU_KEYWORD_VARIANTS
-			status = U_ZERO_ERROR;
-			en = ucol_getKeywordValuesForLocale("collation", name, TRUE, &status);
-			if (U_FAILURE(status))
-				ereport(ERROR,
-						(errmsg("could not get keyword values for locale \"%s\": %s",
-								name, u_errorName(status))));
-
-			status = U_ZERO_ERROR;
-			uenum_reset(en, &status);
-			while ((val = uenum_next(en, NULL, &status)))
-			{
-				char	   *localeid = psprintf("%s@collation=%s", name, val);
-
-				langtag = get_icu_language_tag(localeid);
-				collcollate = U_ICU_VERSION_MAJOR_NUM >= 54 ? langtag : localeid;
-
-				/*
-				 * Be paranoid about not allowing any non-ASCII strings into
-				 * pg_collation
-				 */
-				if (!is_all_ascii(langtag) || !is_all_ascii(collcollate))
-					continue;
-
-				collid = CollationCreate(psprintf("%s-x-icu", langtag),
-										 nspid, GetUserId(),
-										 COLLPROVIDER_ICU, -1,
-										 collcollate, collcollate,
-										 get_collation_actual_version(COLLPROVIDER_ICU, collcollate),
-										 true, true);
-				if (OidIsValid(collid))
-				{
-					ncreated++;
-
-					CommandCounterIncrement();
-
-					icucomment = get_icu_locale_comment(name);
-					if (icucomment)
-						CreateComments(collid, CollationRelationId, 0,
-									   icucomment);
-				}
-			}
-			if (U_FAILURE(status))
-				ereport(ERROR,
-						(errmsg("could not get keyword values for locale \"%s\": %s",
-								name, u_errorName(status))));
-			uenum_close(en);
-#endif							/* LOAD_ICU_KEYWORD_VARIANTS */
 		}
 	}
 #endif							/* USE_ICU */
diff --git a/src/backend/commands/comment.c b/src/backend/commands/comment.c
index 1c17927c49..2f2e69b4a8 100644
--- a/src/backend/commands/comment.c
+++ b/src/backend/commands/comment.c
@@ -4,7 +4,7 @@
  *
  * PostgreSQL object comments utility code.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/commands/comment.c
@@ -139,7 +139,7 @@ CommentObject(CommentStmt *stmt)
  * existing comment for the specified key.
  */
 void
-CreateComments(Oid oid, Oid classoid, int32 subid, char *comment)
+CreateComments(Oid oid, Oid classoid, int32 subid, const char *comment)
 {
 	Relation	description;
 	ScanKeyData skey[3];
@@ -234,7 +234,7 @@ CreateComments(Oid oid, Oid classoid, int32 subid, char *comment)
  * existing comment for the specified key.
  */
 void
-CreateSharedComments(Oid oid, Oid classoid, char *comment)
+CreateSharedComments(Oid oid, Oid classoid, const char *comment)
 {
 	Relation	shdescription;
 	ScanKeyData skey[2];
diff --git a/src/backend/commands/constraint.c b/src/backend/commands/constraint.c
index e2544e51ed..90f19ad3dd 100644
--- a/src/backend/commands/constraint.c
+++ b/src/backend/commands/constraint.c
@@ -3,7 +3,7 @@
  * constraint.c
  *	  PostgreSQL CONSTRAINT support code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/conversioncmds.c b/src/backend/commands/conversioncmds.c
index 9861d3df22..01a02484a2 100644
--- a/src/backend/commands/conversioncmds.c
+++ b/src/backend/commands/conversioncmds.c
@@ -3,7 +3,7 @@
  * conversioncmds.c
  *	  conversion creation command support code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -55,7 +55,7 @@ CreateConversionCommand(CreateConversionStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceId));
 
 	/* Check the encoding names */
@@ -90,7 +90,7 @@ CreateConversionCommand(CreateConversionStmt *stmt)
 	/* Check we have EXECUTE rights for the function */
 	aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC,
+		aclcheck_error(aclresult, OBJECT_FUNCTION,
 					   NameListToString(func_name));
 
 	/*
diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c
index a258965c20..4562a5121d 100644
--- a/src/backend/commands/copy.c
+++ b/src/backend/commands/copy.c
@@ -3,7 +3,7 @@
  * copy.c
  *		Implements the COPY utility command
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -17,8 +17,6 @@
 #include <ctype.h>
 #include <unistd.h>
 #include <sys/stat.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include "access/heapam.h"
 #include "access/htup_details.h"
@@ -29,6 +27,7 @@
 #include "commands/copy.h"
 #include "commands/defrem.h"
 #include "commands/trigger.h"
+#include "executor/execPartition.h"
 #include "executor/executor.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
@@ -38,6 +37,7 @@
 #include "optimizer/planner.h"
 #include "nodes/makefuncs.h"
 #include "parser/parse_relation.h"
+#include "port/pg_bswap.h"
 #include "rewrite/rewriteHandler.h"
 #include "storage/fd.h"
 #include "tcop/tcopprot.h"
@@ -89,7 +89,7 @@ typedef enum EolType
  * characters, else we might find a false match to a trailing byte. In
  * supported server encodings, there is no possibility of a false match, and
  * it's faster to make useless comparisons to trailing bytes than it is to
- * invoke pg_encoding_mblen() to skip over them. encoding_embeds_ascii is TRUE
+ * invoke pg_encoding_mblen() to skip over them. encoding_embeds_ascii is true
  * when we have to do it the hard way.
  */
 typedef struct CopyStateData
@@ -165,14 +165,10 @@ typedef struct CopyStateData
 	bool		volatile_defexprs;	/* is any of defexprs volatile? */
 	List	   *range_table;
 
-	PartitionDispatch *partition_dispatch_info;
-	int			num_dispatch;	/* Number of entries in the above array */
-	int			num_partitions; /* Number of members in the following arrays */
-	ResultRelInfo *partitions;	/* Per partition result relation */
-	TupleConversionMap **partition_tupconv_maps;
-	TupleTableSlot *partition_tuple_slot;
+	/* Tuple-routing support info */
+	PartitionTupleRouting *partition_tuple_routing;
+
 	TransitionCaptureState *transition_capture;
-	TupleConversionMap **transition_tupconv_maps;
 
 	/*
 	 * These variables are used to reduce overhead in textual COPY FROM.
@@ -358,9 +354,9 @@ SendCopyBegin(CopyState cstate)
 
 		pq_beginmessage(&buf, 'H');
 		pq_sendbyte(&buf, format);	/* overall format */
-		pq_sendint(&buf, natts, 2);
+		pq_sendint16(&buf, natts);
 		for (i = 0; i < natts; i++)
-			pq_sendint(&buf, format, 2);	/* per-column formats */
+			pq_sendint16(&buf, format); /* per-column formats */
 		pq_endmessage(&buf);
 		cstate->copy_dest = COPY_NEW_FE;
 	}
@@ -391,9 +387,9 @@ ReceiveCopyBegin(CopyState cstate)
 
 		pq_beginmessage(&buf, 'G');
 		pq_sendbyte(&buf, format);	/* overall format */
-		pq_sendint(&buf, natts, 2);
+		pq_sendint16(&buf, natts);
 		for (i = 0; i < natts; i++)
-			pq_sendint(&buf, format, 2);	/* per-column formats */
+			pq_sendint16(&buf, format); /* per-column formats */
 		pq_endmessage(&buf);
 		cstate->copy_dest = COPY_NEW_FE;
 		cstate->fe_msgbuf = makeStringInfo();
@@ -671,7 +667,7 @@ CopySendInt32(CopyState cstate, int32 val)
 {
 	uint32		buf;
 
-	buf = htonl((uint32) val);
+	buf = pg_hton32((uint32) val);
 	CopySendData(cstate, &buf, sizeof(buf));
 }
 
@@ -690,7 +686,7 @@ CopyGetInt32(CopyState cstate, int32 *val)
 		*val = 0;				/* suppress compiler warning */
 		return false;
 	}
-	*val = (int32) ntohl(buf);
+	*val = (int32) pg_ntoh32(buf);
 	return true;
 }
 
@@ -702,7 +698,7 @@ CopySendInt16(CopyState cstate, int16 val)
 {
 	uint16		buf;
 
-	buf = htons((uint16) val);
+	buf = pg_hton16((uint16) val);
 	CopySendData(cstate, &buf, sizeof(buf));
 }
 
@@ -719,7 +715,7 @@ CopyGetInt16(CopyState cstate, int16 *val)
 		*val = 0;				/* suppress compiler warning */
 		return false;
 	}
-	*val = (int16) ntohs(buf);
+	*val = (int16) pg_ntoh16(buf);
 	return true;
 }
 
@@ -727,7 +723,7 @@ CopyGetInt16(CopyState cstate, int16 *val)
 /*
  * CopyLoadRawBuf loads some more data into raw_buf
  *
- * Returns TRUE if able to obtain at least one more byte, else FALSE.
+ * Returns true if able to obtain at least one more byte, else false.
  *
  * If raw_buf_index < raw_buf_len, the unprocessed bytes are transferred
  * down to the start of the buffer and then we load more data after that.
@@ -764,7 +760,7 @@ CopyLoadRawBuf(CopyState cstate)
  *	 DoCopy executes the SQL COPY statement
  *
  * Either unload or reload contents of table <relation>, depending on <from>.
- * (<from> = TRUE means we are inserting into the table.)  In the "TO" case
+ * (<from> = true means we are inserting into the table.)  In the "TO" case
  * we also support copying the output of an arbitrary SELECT, INSERT, UPDATE
  * or DELETE query.
  *
@@ -1415,59 +1411,6 @@ BeginCopy(ParseState *pstate,
 					(errcode(ERRCODE_UNDEFINED_COLUMN),
 					 errmsg("table \"%s\" does not have OIDs",
 							RelationGetRelationName(cstate->rel))));
-
-		/*
-		 * If there are any triggers with transition tables on the named
-		 * relation, we need to be prepared to capture transition tuples.
-		 */
-		cstate->transition_capture = MakeTransitionCaptureState(rel->trigdesc);
-
-		/* Initialize state for CopyFrom tuple routing. */
-		if (is_from && rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
-		{
-			PartitionDispatch *partition_dispatch_info;
-			ResultRelInfo *partitions;
-			TupleConversionMap **partition_tupconv_maps;
-			TupleTableSlot *partition_tuple_slot;
-			int			num_parted,
-						num_partitions;
-
-			ExecSetupPartitionTupleRouting(rel,
-										   1,
-										   &partition_dispatch_info,
-										   &partitions,
-										   &partition_tupconv_maps,
-										   &partition_tuple_slot,
-										   &num_parted, &num_partitions);
-			cstate->partition_dispatch_info = partition_dispatch_info;
-			cstate->num_dispatch = num_parted;
-			cstate->partitions = partitions;
-			cstate->num_partitions = num_partitions;
-			cstate->partition_tupconv_maps = partition_tupconv_maps;
-			cstate->partition_tuple_slot = partition_tuple_slot;
-
-			/*
-			 * If we are capturing transition tuples, they may need to be
-			 * converted from partition format back to partitioned table
-			 * format (this is only ever necessary if a BEFORE trigger
-			 * modifies the tuple).
-			 */
-			if (cstate->transition_capture != NULL)
-			{
-				int			i;
-
-				cstate->transition_tupconv_maps = (TupleConversionMap **)
-					palloc0(sizeof(TupleConversionMap *) *
-							cstate->num_partitions);
-				for (i = 0; i < cstate->num_partitions; ++i)
-				{
-					cstate->transition_tupconv_maps[i] =
-						convert_tuples_by_name(RelationGetDescr(cstate->partitions[i].ri_RelationDesc),
-											   RelationGetDescr(rel),
-											   gettext_noop("could not convert row type"));
-				}
-			}
-		}
 	}
 	else
 	{
@@ -1636,12 +1579,13 @@ BeginCopy(ParseState *pstate,
 		foreach(cur, attnums)
 		{
 			int			attnum = lfirst_int(cur);
+			Form_pg_attribute attr = TupleDescAttr(tupDesc, attnum - 1);
 
 			if (!list_member_int(cstate->attnumlist, attnum))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
 						 errmsg("FORCE_QUOTE column \"%s\" not referenced by COPY",
-								NameStr(tupDesc->attrs[attnum - 1]->attname))));
+								NameStr(attr->attname))));
 			cstate->force_quote_flags[attnum - 1] = true;
 		}
 	}
@@ -1658,12 +1602,13 @@ BeginCopy(ParseState *pstate,
 		foreach(cur, attnums)
 		{
 			int			attnum = lfirst_int(cur);
+			Form_pg_attribute attr = TupleDescAttr(tupDesc, attnum - 1);
 
 			if (!list_member_int(cstate->attnumlist, attnum))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
 						 errmsg("FORCE_NOT_NULL column \"%s\" not referenced by COPY",
-								NameStr(tupDesc->attrs[attnum - 1]->attname))));
+								NameStr(attr->attname))));
 			cstate->force_notnull_flags[attnum - 1] = true;
 		}
 	}
@@ -1680,12 +1625,13 @@ BeginCopy(ParseState *pstate,
 		foreach(cur, attnums)
 		{
 			int			attnum = lfirst_int(cur);
+			Form_pg_attribute attr = TupleDescAttr(tupDesc, attnum - 1);
 
 			if (!list_member_int(cstate->attnumlist, attnum))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
 						 errmsg("FORCE_NULL column \"%s\" not referenced by COPY",
-								NameStr(tupDesc->attrs[attnum - 1]->attname))));
+								NameStr(attr->attname))));
 			cstate->force_null_flags[attnum - 1] = true;
 		}
 	}
@@ -1703,12 +1649,13 @@ BeginCopy(ParseState *pstate,
 		foreach(cur, attnums)
 		{
 			int			attnum = lfirst_int(cur);
+			Form_pg_attribute attr = TupleDescAttr(tupDesc, attnum - 1);
 
 			if (!list_member_int(cstate->attnumlist, attnum))
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_COLUMN_REFERENCE),
 						 errmsg_internal("selected column \"%s\" not referenced by COPY",
-										 NameStr(tupDesc->attrs[attnum - 1]->attname))));
+										 NameStr(attr->attname))));
 			cstate->convert_select_flags[attnum - 1] = true;
 		}
 	}
@@ -1875,7 +1822,16 @@ BeginCopyTo(ParseState *pstate,
 						 errmsg("relative path not allowed for COPY to file")));
 
 			oumask = umask(S_IWGRP | S_IWOTH);
-			cstate->copy_file = AllocateFile(cstate->filename, PG_BINARY_W);
+			PG_TRY();
+			{
+				cstate->copy_file = AllocateFile(cstate->filename, PG_BINARY_W);
+			}
+			PG_CATCH();
+			{
+				umask(oumask);
+				PG_RE_THROW();
+			}
+			PG_END_TRY();
 			umask(oumask);
 			if (cstate->copy_file == NULL)
 			{
@@ -1972,7 +1928,6 @@ CopyTo(CopyState cstate)
 {
 	TupleDesc	tupDesc;
 	int			num_phys_attrs;
-	Form_pg_attribute *attr;
 	ListCell   *cur;
 	uint64		processed;
 
@@ -1980,7 +1935,6 @@ CopyTo(CopyState cstate)
 		tupDesc = RelationGetDescr(cstate->rel);
 	else
 		tupDesc = cstate->queryDesc->tupDesc;
-	attr = tupDesc->attrs;
 	num_phys_attrs = tupDesc->natts;
 	cstate->null_print_client = cstate->null_print; /* default */
 
@@ -1994,13 +1948,14 @@ CopyTo(CopyState cstate)
 		int			attnum = lfirst_int(cur);
 		Oid			out_func_oid;
 		bool		isvarlena;
+		Form_pg_attribute attr = TupleDescAttr(tupDesc, attnum - 1);
 
 		if (cstate->binary)
-			getTypeBinaryOutputInfo(attr[attnum - 1]->atttypid,
+			getTypeBinaryOutputInfo(attr->atttypid,
 									&out_func_oid,
 									&isvarlena);
 		else
-			getTypeOutputInfo(attr[attnum - 1]->atttypid,
+			getTypeOutputInfo(attr->atttypid,
 							  &out_func_oid,
 							  &isvarlena);
 		fmgr_info(out_func_oid, &cstate->out_functions[attnum - 1]);
@@ -2057,7 +2012,7 @@ CopyTo(CopyState cstate)
 					CopySendChar(cstate, cstate->delim[0]);
 				hdr_delim = true;
 
-				colname = NameStr(attr[attnum - 1]->attname);
+				colname = NameStr(TupleDescAttr(tupDesc, attnum - 1)->attname);
 
 				CopyAttributeOutCSV(cstate, colname, false,
 									list_length(cstate->attnumlist) == 1);
@@ -2436,13 +2391,25 @@ CopyFrom(CopyState cstate)
 	/*
 	 * Optimize if new relfilenode was created in this subxact or one of its
 	 * committed children and we won't see those rows later as part of an
-	 * earlier scan or command. This ensures that if this subtransaction
-	 * aborts then the frozen rows won't be visible after xact cleanup. Note
+	 * earlier scan or command. The subxact test ensures that if this subxact
+	 * aborts then the frozen rows won't be visible after xact cleanup.  Note
 	 * that the stronger test of exactly which subtransaction created it is
-	 * crucial for correctness of this optimization.
+	 * crucial for correctness of this optimization. The test for an earlier
+	 * scan or command tolerates false negatives. FREEZE causes other sessions
+	 * to see rows they would not see under MVCC, and a false negative merely
+	 * spreads that anomaly to the current session.
 	 */
 	if (cstate->freeze)
 	{
+		/*
+		 * Tolerate one registration for the benefit of FirstXactSnapshot.
+		 * Scan-bearing queries generally create at least two registrations,
+		 * though relying on that is fragile, as is ignoring ActiveSnapshot.
+		 * Clear CatalogSnapshot to avoid counting its registration.  We'll
+		 * still detect ongoing catalog scans, each of which separately
+		 * registers the snapshot it uses.
+		 */
+		InvalidateCatalogSnapshot();
 		if (!ThereAreNoPriorRegisteredSnapshots() || !ThereAreNoReadyPortals())
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TRANSACTION_STATE),
@@ -2477,10 +2444,42 @@ CopyFrom(CopyState cstate)
 	estate->es_range_table = cstate->range_table;
 
 	/* Set up a tuple slot too */
-	myslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(myslot, tupDesc);
+	myslot = ExecInitExtraTupleSlot(estate, tupDesc);
 	/* Triggers might need a slot as well */
-	estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate);
+	estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate, NULL);
+
+	/* Prepare to catch AFTER triggers. */
+	AfterTriggerBeginQuery();
+
+	/*
+	 * If there are any triggers with transition tables on the named relation,
+	 * we need to be prepared to capture transition tuples.
+	 */
+	cstate->transition_capture =
+		MakeTransitionCaptureState(cstate->rel->trigdesc,
+								   RelationGetRelid(cstate->rel),
+								   CMD_INSERT);
+
+	/*
+	 * If the named relation is a partitioned table, initialize state for
+	 * CopyFrom tuple routing.
+	 */
+	if (cstate->rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+	{
+		PartitionTupleRouting *proute;
+
+		proute = cstate->partition_tuple_routing =
+			ExecSetupPartitionTupleRouting(NULL, cstate->rel);
+
+		/*
+		 * If we are capturing transition tuples, they may need to be
+		 * converted from partition format back to partitioned table format
+		 * (this is only ever necessary if a BEFORE trigger modifies the
+		 * tuple).
+		 */
+		if (cstate->transition_capture != NULL)
+			ExecSetupChildParentMapForLeaf(proute);
+	}
 
 	/*
 	 * It's more efficient to prepare a bunch of tuples for insertion, and
@@ -2495,7 +2494,7 @@ CopyFrom(CopyState cstate)
 	if ((resultRelInfo->ri_TrigDesc != NULL &&
 		 (resultRelInfo->ri_TrigDesc->trig_insert_before_row ||
 		  resultRelInfo->ri_TrigDesc->trig_insert_instead_row)) ||
-		cstate->partition_dispatch_info != NULL ||
+		cstate->partition_tuple_routing != NULL ||
 		cstate->volatile_defexprs)
 	{
 		useHeapMultiInsert = false;
@@ -2506,9 +2505,6 @@ CopyFrom(CopyState cstate)
 		bufferedTuples = palloc(MAX_BUFFERED_TUPLES * sizeof(HeapTuple));
 	}
 
-	/* Prepare to catch AFTER triggers. */
-	AfterTriggerBeginQuery();
-
 	/*
 	 * Check BEFORE STATEMENT insertion triggers. It's debatable whether we
 	 * should do this for COPY, since it's not really an "INSERT" statement as
@@ -2573,10 +2569,10 @@ CopyFrom(CopyState cstate)
 		ExecStoreTuple(tuple, slot, InvalidBuffer, false);
 
 		/* Determine the partition to heap_insert the tuple into */
-		if (cstate->partition_dispatch_info)
+		if (cstate->partition_tuple_routing)
 		{
 			int			leaf_part_index;
-			TupleConversionMap *map;
+			PartitionTupleRouting *proute = cstate->partition_tuple_routing;
 
 			/*
 			 * Away we go ... If we end up not finding a partition after all,
@@ -2587,11 +2583,11 @@ CopyFrom(CopyState cstate)
 			 * partition, respectively.
 			 */
 			leaf_part_index = ExecFindPartition(resultRelInfo,
-												cstate->partition_dispatch_info,
+												proute->partition_dispatch_info,
 												slot,
 												estate);
 			Assert(leaf_part_index >= 0 &&
-				   leaf_part_index < cstate->num_partitions);
+				   leaf_part_index < proute->num_partitions);
 
 			/*
 			 * If this tuple is mapped to a partition that is not same as the
@@ -2609,7 +2605,15 @@ CopyFrom(CopyState cstate)
 			 * to the selected partition.
 			 */
 			saved_resultRelInfo = resultRelInfo;
-			resultRelInfo = cstate->partitions + leaf_part_index;
+			resultRelInfo = proute->partitions[leaf_part_index];
+			if (resultRelInfo == NULL)
+			{
+				resultRelInfo = ExecInitPartitionInfo(NULL,
+													  saved_resultRelInfo,
+													  proute, estate,
+													  leaf_part_index);
+				Assert(resultRelInfo != NULL);
+			}
 
 			/* We do not yet have a way to insert into a foreign partition */
 			if (resultRelInfo->ri_FdwRoutine)
@@ -2639,7 +2643,8 @@ CopyFrom(CopyState cstate)
 					 */
 					cstate->transition_capture->tcs_original_insert_tuple = NULL;
 					cstate->transition_capture->tcs_map =
-						cstate->transition_tupconv_maps[leaf_part_index];
+						TupConvMapForLeaf(proute, saved_resultRelInfo,
+										  leaf_part_index);
 				}
 				else
 				{
@@ -2656,23 +2661,10 @@ CopyFrom(CopyState cstate)
 			 * We might need to convert from the parent rowtype to the
 			 * partition rowtype.
 			 */
-			map = cstate->partition_tupconv_maps[leaf_part_index];
-			if (map)
-			{
-				Relation	partrel = resultRelInfo->ri_RelationDesc;
-
-				tuple = do_convert_tuple(tuple, map);
-
-				/*
-				 * We must use the partition's tuple descriptor from this
-				 * point on.  Use a dedicated slot from this point on until
-				 * we're finished dealing with the partition.
-				 */
-				slot = cstate->partition_tuple_slot;
-				Assert(slot != NULL);
-				ExecSetSlotDescriptor(slot, RelationGetDescr(partrel));
-				ExecStoreTuple(tuple, slot, InvalidBuffer, true);
-			}
+			tuple = ConvertPartitionTupleSlot(proute->parent_child_tupconv_maps[leaf_part_index],
+											  tuple,
+											  proute->partition_tuple_slot,
+											  &slot);
 
 			tuple->t_tableOid = RelationGetRelid(resultRelInfo->ri_RelationDesc);
 		}
@@ -2719,7 +2711,7 @@ CopyFrom(CopyState cstate)
 
 				/* Check the constraints of the tuple */
 				if (cstate->rel->rd_att->constr || check_partition_constr)
-					ExecConstraints(resultRelInfo, slot, estate);
+					ExecConstraints(resultRelInfo, slot, estate, true);
 
 				if (useHeapMultiInsert)
 				{
@@ -2820,34 +2812,8 @@ CopyFrom(CopyState cstate)
 	ExecCloseIndices(resultRelInfo);
 
 	/* Close all the partitioned tables, leaf partitions, and their indices */
-	if (cstate->partition_dispatch_info)
-	{
-		int			i;
-
-		/*
-		 * Remember cstate->partition_dispatch_info[0] corresponds to the root
-		 * partitioned table, which we must not try to close, because it is
-		 * the main target table of COPY that will be closed eventually by
-		 * DoCopy().  Also, tupslot is NULL for the root partitioned table.
-		 */
-		for (i = 1; i < cstate->num_dispatch; i++)
-		{
-			PartitionDispatch pd = cstate->partition_dispatch_info[i];
-
-			heap_close(pd->reldesc, NoLock);
-			ExecDropSingleTupleTableSlot(pd->tupslot);
-		}
-		for (i = 0; i < cstate->num_partitions; i++)
-		{
-			ResultRelInfo *resultRelInfo = cstate->partitions + i;
-
-			ExecCloseIndices(resultRelInfo);
-			heap_close(resultRelInfo->ri_RelationDesc, NoLock);
-		}
-
-		/* Release the standalone partition tuple descriptor */
-		ExecDropSingleTupleTableSlot(cstate->partition_tuple_slot);
-	}
+	if (cstate->partition_tuple_routing)
+		ExecCleanupTupleRouting(cstate->partition_tuple_routing);
 
 	/* Close any trigger target relations */
 	ExecCleanUpTriggerState(estate);
@@ -2965,7 +2931,6 @@ BeginCopyFrom(ParseState *pstate,
 	CopyState	cstate;
 	bool		pipe = (filename == NULL);
 	TupleDesc	tupDesc;
-	Form_pg_attribute *attr;
 	AttrNumber	num_phys_attrs,
 				num_defaults;
 	FmgrInfo   *in_functions;
@@ -3000,7 +2965,6 @@ BeginCopyFrom(ParseState *pstate,
 		cstate->range_table = pstate->p_rtable;
 
 	tupDesc = RelationGetDescr(cstate->rel);
-	attr = tupDesc->attrs;
 	num_phys_attrs = tupDesc->natts;
 	num_defaults = 0;
 	volatile_defexprs = false;
@@ -3018,16 +2982,18 @@ BeginCopyFrom(ParseState *pstate,
 
 	for (attnum = 1; attnum <= num_phys_attrs; attnum++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupDesc, attnum - 1);
+
 		/* We don't need info for dropped attributes */
-		if (attr[attnum - 1]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		/* Fetch the input function and typioparam info */
 		if (cstate->binary)
-			getTypeBinaryInputInfo(attr[attnum - 1]->atttypid,
+			getTypeBinaryInputInfo(att->atttypid,
 								   &in_func_oid, &typioparams[attnum - 1]);
 		else
-			getTypeInputInfo(attr[attnum - 1]->atttypid,
+			getTypeInputInfo(att->atttypid,
 							 &in_func_oid, &typioparams[attnum - 1]);
 		fmgr_info(in_func_oid, &in_functions[attnum - 1]);
 
@@ -3269,7 +3235,6 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext,
 			 Datum *values, bool *nulls, Oid *tupleOid)
 {
 	TupleDesc	tupDesc;
-	Form_pg_attribute *attr;
 	AttrNumber	num_phys_attrs,
 				attr_count,
 				num_defaults = cstate->num_defaults;
@@ -3283,7 +3248,6 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext,
 	ExprState **defexprs = cstate->defexprs;
 
 	tupDesc = RelationGetDescr(cstate->rel);
-	attr = tupDesc->attrs;
 	num_phys_attrs = tupDesc->natts;
 	attr_count = list_length(cstate->attnumlist);
 	nfields = file_has_oids ? (attr_count + 1) : attr_count;
@@ -3345,12 +3309,13 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext,
 		{
 			int			attnum = lfirst_int(cur);
 			int			m = attnum - 1;
+			Form_pg_attribute att = TupleDescAttr(tupDesc, m);
 
 			if (fieldno >= fldct)
 				ereport(ERROR,
 						(errcode(ERRCODE_BAD_COPY_FILE_FORMAT),
 						 errmsg("missing data for column \"%s\"",
-								NameStr(attr[m]->attname))));
+								NameStr(att->attname))));
 			string = field_strings[fieldno++];
 
 			if (cstate->convert_select_flags &&
@@ -3384,12 +3349,12 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext,
 				}
 			}
 
-			cstate->cur_attname = NameStr(attr[m]->attname);
+			cstate->cur_attname = NameStr(att->attname);
 			cstate->cur_attval = string;
 			values[m] = InputFunctionCall(&in_functions[m],
 										  string,
 										  typioparams[m],
-										  attr[m]->atttypmod);
+										  att->atttypmod);
 			if (string != NULL)
 				nulls[m] = false;
 			cstate->cur_attname = NULL;
@@ -3468,14 +3433,15 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext,
 		{
 			int			attnum = lfirst_int(cur);
 			int			m = attnum - 1;
+			Form_pg_attribute att = TupleDescAttr(tupDesc, m);
 
-			cstate->cur_attname = NameStr(attr[m]->attname);
+			cstate->cur_attname = NameStr(att->attname);
 			i++;
 			values[m] = CopyReadBinaryAttribute(cstate,
 												i,
 												&in_functions[m],
 												typioparams[m],
-												attr[m]->atttypmod,
+												att->atttypmod,
 												&nulls[m]);
 			cstate->cur_attname = NULL;
 		}
@@ -4705,13 +4671,12 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 	if (attnamelist == NIL)
 	{
 		/* Generate default column list */
-		Form_pg_attribute *attr = tupDesc->attrs;
 		int			attr_count = tupDesc->natts;
 		int			i;
 
 		for (i = 0; i < attr_count; i++)
 		{
-			if (attr[i]->attisdropped)
+			if (TupleDescAttr(tupDesc, i)->attisdropped)
 				continue;
 			attnums = lappend_int(attnums, i + 1);
 		}
@@ -4731,11 +4696,13 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
 			attnum = InvalidAttrNumber;
 			for (i = 0; i < tupDesc->natts; i++)
 			{
-				if (tupDesc->attrs[i]->attisdropped)
+				Form_pg_attribute att = TupleDescAttr(tupDesc, i);
+
+				if (att->attisdropped)
 					continue;
-				if (namestrcmp(&(tupDesc->attrs[i]->attname), name) == 0)
+				if (namestrcmp(&(att->attname), name) == 0)
 				{
-					attnum = tupDesc->attrs[i]->attnum;
+					attnum = att->attnum;
 					break;
 				}
 			}
diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c
index 97f9c55d6e..3d82edbf58 100644
--- a/src/backend/commands/createas.c
+++ b/src/backend/commands/createas.c
@@ -13,7 +13,7 @@
  * we must return a tuples-processed count in the completionTag.  (We no
  * longer do that for CTAS ... WITH NO DATA, however.)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -326,8 +326,8 @@ ExecCreateTableAs(CreateTableAsStmt *stmt, const char *queryString,
 		query = linitial_node(Query, rewritten);
 		Assert(query->commandType == CMD_SELECT);
 
-		/* plan the query --- note we disallow parallelism */
-		plan = pg_plan_query(query, 0, params);
+		/* plan the query */
+		plan = pg_plan_query(query, CURSOR_OPT_PARALLEL_OK, params);
 
 		/*
 		 * Use a snapshot with an updated command ID to ensure this query sees
@@ -468,7 +468,7 @@ intorel_startup(DestReceiver *self, int operation, TupleDesc typeinfo)
 	lc = list_head(into->colNames);
 	for (attnum = 0; attnum < typeinfo->natts; attnum++)
 	{
-		Form_pg_attribute attribute = typeinfo->attrs[attnum];
+		Form_pg_attribute attribute = TupleDescAttr(typeinfo, attnum);
 		ColumnDef  *col;
 		char	   *colname;
 
diff --git a/src/backend/commands/dbcommands.c b/src/backend/commands/dbcommands.c
index e138539035..d1718f04ee 100644
--- a/src/backend/commands/dbcommands.c
+++ b/src/backend/commands/dbcommands.c
@@ -8,7 +8,7 @@
  * stepping on each others' toes.  Formerly we used table-level locks
  * on pg_database, but that's too coarse-grained.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -422,7 +422,7 @@ createdb(ParseState *pstate, const CreatedbStmt *stmt)
 		aclresult = pg_tablespace_aclcheck(dst_deftablespace, GetUserId(),
 										   ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+			aclcheck_error(aclresult, OBJECT_TABLESPACE,
 						   tablespacename);
 
 		/* pg_global must never be the default tablespace */
@@ -822,7 +822,7 @@ dropdb(const char *dbname, bool missing_ok)
 	 * Permission checks
 	 */
 	if (!pg_database_ownercheck(db_id, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 					   dbname);
 
 	/* DROP hook for the database being removed */
@@ -857,8 +857,8 @@ dropdb(const char *dbname, bool missing_ok)
 				(errcode(ERRCODE_OBJECT_IN_USE),
 				 errmsg("database \"%s\" is used by an active logical replication slot",
 						dbname),
-				 errdetail_plural("There is %d active slot",
-								  "There are %d active slots",
+				 errdetail_plural("There is %d active slot.",
+								  "There are %d active slots.",
 								  nslots_active, nslots_active)));
 	}
 
@@ -997,7 +997,7 @@ RenameDatabase(const char *oldname, const char *newname)
 
 	/* must be owner */
 	if (!pg_database_ownercheck(db_id, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 					   oldname);
 
 	/* must have createdb rights */
@@ -1112,7 +1112,7 @@ movedb(const char *dbname, const char *tblspcname)
 	 * Permission checks
 	 */
 	if (!pg_database_ownercheck(db_id, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 					   dbname);
 
 	/*
@@ -1134,7 +1134,7 @@ movedb(const char *dbname, const char *tblspcname)
 	aclresult = pg_tablespace_aclcheck(dst_tblspcoid, GetUserId(),
 									   ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+		aclcheck_error(aclresult, OBJECT_TABLESPACE,
 					   tblspcname);
 
 	/*
@@ -1515,7 +1515,7 @@ AlterDatabase(ParseState *pstate, AlterDatabaseStmt *stmt, bool isTopLevel)
 	dboid = HeapTupleGetOid(tuple);
 
 	if (!pg_database_ownercheck(HeapTupleGetOid(tuple), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 					   stmt->dbname);
 
 	/*
@@ -1583,7 +1583,7 @@ AlterDatabaseSet(AlterDatabaseSetStmt *stmt)
 	shdepLockAndCheckObject(DatabaseRelationId, datid);
 
 	if (!pg_database_ownercheck(datid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 					   stmt->dbname);
 
 	AlterSetting(datid, InvalidOid, stmt->setstmt);
@@ -1646,7 +1646,7 @@ AlterDatabaseOwner(const char *dbname, Oid newOwnerId)
 
 		/* Otherwise, must be owner of the existing object */
 		if (!pg_database_ownercheck(HeapTupleGetOid(tuple), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 						   dbname);
 
 		/* Must be able to become new owner */
@@ -1718,8 +1718,8 @@ AlterDatabaseOwner(const char *dbname, Oid newOwnerId)
 /*
  * Look up info about the database named "name".  If the database exists,
  * obtain the specified lock type on it, fill in any of the remaining
- * parameters that aren't NULL, and return TRUE.  If no such database,
- * return FALSE.
+ * parameters that aren't NULL, and return true.  If no such database,
+ * return false.
  */
 static bool
 get_db_info(const char *name, LOCKMODE lockmode,
@@ -1923,7 +1923,7 @@ remove_dbtablespaces(Oid db_id)
 
 /*
  * Check for existing files that conflict with a proposed new DB OID;
- * return TRUE if there are any
+ * return true if there are any
  *
  * If there were a subdirectory in any tablespace matching the proposed new
  * OID, we'd get a create failure due to the duplicate name ... and then we'd
diff --git a/src/backend/commands/define.c b/src/backend/commands/define.c
index 8eff0ad17b..00b5721f85 100644
--- a/src/backend/commands/define.c
+++ b/src/backend/commands/define.c
@@ -4,7 +4,7 @@
  *	  Support routines for various kinds of object creation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/commands/discard.c b/src/backend/commands/discard.c
index f0dcd87fb8..353ec990af 100644
--- a/src/backend/commands/discard.c
+++ b/src/backend/commands/discard.c
@@ -3,7 +3,7 @@
  * discard.c
  *	  The implementation of the DISCARD command
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/commands/dropcmds.c b/src/backend/commands/dropcmds.c
index 2b30677d6f..fc4ce8d22a 100644
--- a/src/backend/commands/dropcmds.c
+++ b/src/backend/commands/dropcmds.c
@@ -3,7 +3,7 @@
  * dropcmds.c
  *	  handle various "DROP" operations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,6 +26,7 @@
 #include "nodes/makefuncs.h"
 #include "parser/parse_type.h"
 #include "utils/builtins.h"
+#include "utils/lsyscache.h"
 #include "utils/syscache.h"
 
 
@@ -91,21 +92,12 @@ RemoveObjects(DropStmt *stmt)
 		 */
 		if (stmt->removeType == OBJECT_FUNCTION)
 		{
-			Oid			funcOid = address.objectId;
-			HeapTuple	tup;
-
-			tup = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcOid));
-			if (!HeapTupleIsValid(tup)) /* should not happen */
-				elog(ERROR, "cache lookup failed for function %u", funcOid);
-
-			if (((Form_pg_proc) GETSTRUCT(tup))->proisagg)
+			if (get_func_isagg(address.objectId))
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 						 errmsg("\"%s\" is an aggregate function",
 								NameListToString(castNode(ObjectWithArgs, object)->objname)),
 						 errhint("Use DROP AGGREGATE to drop aggregate functions.")));
-
-			ReleaseSysCache(tup);
 		}
 
 		/* Check permissions. */
@@ -338,6 +330,32 @@ does_not_exist_skipping(ObjectType objtype, Node *object)
 				}
 				break;
 			}
+		case OBJECT_PROCEDURE:
+			{
+				ObjectWithArgs *owa = castNode(ObjectWithArgs, object);
+
+				if (!schema_does_not_exist_skipping(owa->objname, &msg, &name) &&
+					!type_in_list_does_not_exist_skipping(owa->objargs, &msg, &name))
+				{
+					msg = gettext_noop("procedure %s(%s) does not exist, skipping");
+					name = NameListToString(owa->objname);
+					args = TypeNameListToString(owa->objargs);
+				}
+				break;
+			}
+		case OBJECT_ROUTINE:
+			{
+				ObjectWithArgs *owa = castNode(ObjectWithArgs, object);
+
+				if (!schema_does_not_exist_skipping(owa->objname, &msg, &name) &&
+					!type_in_list_does_not_exist_skipping(owa->objargs, &msg, &name))
+				{
+					msg = gettext_noop("routine %s(%s) does not exist, skipping");
+					name = NameListToString(owa->objname);
+					args = TypeNameListToString(owa->objargs);
+				}
+				break;
+			}
 		case OBJECT_AGGREGATE:
 			{
 				ObjectWithArgs *owa = castNode(ObjectWithArgs, object);
diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c
index 938133bbe4..549c7ea51d 100644
--- a/src/backend/commands/event_trigger.c
+++ b/src/backend/commands/event_trigger.c
@@ -3,7 +3,7 @@
  * event_trigger.c
  *	  PostgreSQL EVENT TRIGGER support code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -106,8 +106,10 @@ static event_trigger_support_data event_trigger_support[] = {
 	{"OPERATOR CLASS", true},
 	{"OPERATOR FAMILY", true},
 	{"POLICY", true},
+	{"PROCEDURE", true},
 	{"PUBLICATION", true},
 	{"ROLE", false},
+	{"ROUTINE", true},
 	{"RULE", true},
 	{"SCHEMA", true},
 	{"SEQUENCE", true},
@@ -152,13 +154,13 @@ static event_trigger_command_tag_check_result check_table_rewrite_ddl_tag(
 							const char *tag);
 static void error_duplicate_filter_variable(const char *defname);
 static Datum filter_list_to_array(List *filterlist);
-static Oid insert_event_trigger_tuple(char *trigname, char *eventname,
+static Oid insert_event_trigger_tuple(const char *trigname, const char *eventname,
 						   Oid evtOwner, Oid funcoid, List *tags);
 static void validate_ddl_tags(const char *filtervar, List *taglist);
 static void validate_table_rewrite_tags(const char *filtervar, List *taglist);
 static void EventTriggerInvoke(List *fn_oid_list, EventTriggerData *trigdata);
-static const char *stringify_grantobjtype(GrantObjectType objtype);
-static const char *stringify_adefprivs_objtype(GrantObjectType objtype);
+static const char *stringify_grant_objtype(ObjectType objtype);
+static const char *stringify_adefprivs_objtype(ObjectType objtype);
 
 /*
  * Create an event trigger.
@@ -372,7 +374,7 @@ error_duplicate_filter_variable(const char *defname)
  * Insert the new pg_event_trigger row and record dependencies.
  */
 static Oid
-insert_event_trigger_tuple(char *trigname, char *eventname, Oid evtOwner,
+insert_event_trigger_tuple(const char *trigname, const char *eventname, Oid evtOwner,
 						   Oid funcoid, List *taglist)
 {
 	Relation	tgrel;
@@ -517,7 +519,7 @@ AlterEventTrigger(AlterEventTrigStmt *stmt)
 	trigoid = HeapTupleGetOid(tup);
 
 	if (!pg_event_trigger_ownercheck(trigoid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EVENT_TRIGGER,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_EVENT_TRIGGER,
 					   stmt->trigname);
 
 	/* tuple is a copy, so we can modify it below */
@@ -608,7 +610,7 @@ AlterEventTriggerOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 		return;
 
 	if (!pg_event_trigger_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EVENT_TRIGGER,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_EVENT_TRIGGER,
 					   NameStr(form->evtname));
 
 	/* New owner must be a superuser */
@@ -1103,8 +1105,10 @@ EventTriggerSupportsObjectType(ObjectType obtype)
 		case OBJECT_OPERATOR:
 		case OBJECT_OPFAMILY:
 		case OBJECT_POLICY:
+		case OBJECT_PROCEDURE:
 		case OBJECT_PUBLICATION:
 		case OBJECT_PUBLICATION_REL:
+		case OBJECT_ROUTINE:
 		case OBJECT_RULE:
 		case OBJECT_SCHEMA:
 		case OBJECT_SEQUENCE:
@@ -1195,39 +1199,6 @@ EventTriggerSupportsObjectClass(ObjectClass objclass)
 	return false;
 }
 
-bool
-EventTriggerSupportsGrantObjectType(GrantObjectType objtype)
-{
-	switch (objtype)
-	{
-		case ACL_OBJECT_DATABASE:
-		case ACL_OBJECT_TABLESPACE:
-			/* no support for global objects */
-			return false;
-
-		case ACL_OBJECT_COLUMN:
-		case ACL_OBJECT_RELATION:
-		case ACL_OBJECT_SEQUENCE:
-		case ACL_OBJECT_DOMAIN:
-		case ACL_OBJECT_FDW:
-		case ACL_OBJECT_FOREIGN_SERVER:
-		case ACL_OBJECT_FUNCTION:
-		case ACL_OBJECT_LANGUAGE:
-		case ACL_OBJECT_LARGEOBJECT:
-		case ACL_OBJECT_NAMESPACE:
-		case ACL_OBJECT_TYPE:
-			return true;
-
-			/*
-			 * There's intentionally no default: case here; we want the
-			 * compiler to warn if a new ACL class hasn't been handled above.
-			 */
-	}
-
-	/* Shouldn't get here, but if we do, say "no support" */
-	return false;
-}
-
 /*
  * Prepare event trigger state for a new complete query to run, if necessary;
  * returns whether this was done.  If it was, EventTriggerEndCompleteQuery must
@@ -2190,7 +2161,7 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
 				values[i++] = CStringGetTextDatum(cmd->d.grant.istmt->is_grant ?
 												  "GRANT" : "REVOKE");
 				/* object_type */
-				values[i++] = CStringGetTextDatum(stringify_grantobjtype(
+				values[i++] = CStringGetTextDatum(stringify_grant_objtype(
 																		 cmd->d.grant.istmt->objtype));
 				/* schema */
 				nulls[i++] = true;
@@ -2213,84 +2184,164 @@ pg_event_trigger_ddl_commands(PG_FUNCTION_ARGS)
 }
 
 /*
- * Return the GrantObjectType as a string, as it would appear in GRANT and
+ * Return the ObjectType as a string, as it would appear in GRANT and
  * REVOKE commands.
  */
 static const char *
-stringify_grantobjtype(GrantObjectType objtype)
+stringify_grant_objtype(ObjectType objtype)
 {
 	switch (objtype)
 	{
-		case ACL_OBJECT_COLUMN:
+		case OBJECT_COLUMN:
 			return "COLUMN";
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			return "TABLE";
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			return "SEQUENCE";
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			return "DATABASE";
-		case ACL_OBJECT_DOMAIN:
+		case OBJECT_DOMAIN:
 			return "DOMAIN";
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			return "FOREIGN DATA WRAPPER";
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			return "FOREIGN SERVER";
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			return "FUNCTION";
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			return "LANGUAGE";
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			return "LARGE OBJECT";
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			return "SCHEMA";
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_PROCEDURE:
+			return "PROCEDURE";
+		case OBJECT_ROUTINE:
+			return "ROUTINE";
+		case OBJECT_TABLESPACE:
 			return "TABLESPACE";
-		case ACL_OBJECT_TYPE:
+		case OBJECT_TYPE:
 			return "TYPE";
+		/* these currently aren't used */
+		case OBJECT_ACCESS_METHOD:
+		case OBJECT_AGGREGATE:
+		case OBJECT_AMOP:
+		case OBJECT_AMPROC:
+		case OBJECT_ATTRIBUTE:
+		case OBJECT_CAST:
+		case OBJECT_COLLATION:
+		case OBJECT_CONVERSION:
+		case OBJECT_DEFAULT:
+		case OBJECT_DEFACL:
+		case OBJECT_DOMCONSTRAINT:
+		case OBJECT_EVENT_TRIGGER:
+		case OBJECT_EXTENSION:
+		case OBJECT_FOREIGN_TABLE:
+		case OBJECT_INDEX:
+		case OBJECT_MATVIEW:
+		case OBJECT_OPCLASS:
+		case OBJECT_OPERATOR:
+		case OBJECT_OPFAMILY:
+		case OBJECT_POLICY:
+		case OBJECT_PUBLICATION:
+		case OBJECT_PUBLICATION_REL:
+		case OBJECT_ROLE:
+		case OBJECT_RULE:
+		case OBJECT_STATISTIC_EXT:
+		case OBJECT_SUBSCRIPTION:
+		case OBJECT_TABCONSTRAINT:
+		case OBJECT_TRANSFORM:
+		case OBJECT_TRIGGER:
+		case OBJECT_TSCONFIGURATION:
+		case OBJECT_TSDICTIONARY:
+		case OBJECT_TSPARSER:
+		case OBJECT_TSTEMPLATE:
+		case OBJECT_USER_MAPPING:
+		case OBJECT_VIEW:
+			elog(ERROR, "unsupported object type: %d", (int) objtype);
 	}
 
-	elog(ERROR, "unrecognized grant object type: %d", (int) objtype);
 	return "???";				/* keep compiler quiet */
 }
 
 /*
- * Return the GrantObjectType as a string; as above, but use the spelling
+ * Return the ObjectType as a string; as above, but use the spelling
  * in ALTER DEFAULT PRIVILEGES commands instead.  Generally this is just
  * the plural.
  */
 static const char *
-stringify_adefprivs_objtype(GrantObjectType objtype)
+stringify_adefprivs_objtype(ObjectType objtype)
 {
 	switch (objtype)
 	{
-		case ACL_OBJECT_COLUMN:
+		case OBJECT_COLUMN:
 			return "COLUMNS";
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			return "TABLES";
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			return "SEQUENCES";
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			return "DATABASES";
-		case ACL_OBJECT_DOMAIN:
+		case OBJECT_DOMAIN:
 			return "DOMAINS";
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			return "FOREIGN DATA WRAPPERS";
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			return "FOREIGN SERVERS";
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			return "FUNCTIONS";
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			return "LANGUAGES";
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			return "LARGE OBJECTS";
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			return "SCHEMAS";
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_PROCEDURE:
+			return "PROCEDURES";
+		case OBJECT_ROUTINE:
+			return "ROUTINES";
+		case OBJECT_TABLESPACE:
 			return "TABLESPACES";
-		case ACL_OBJECT_TYPE:
+		case OBJECT_TYPE:
 			return "TYPES";
+		/* these currently aren't used */
+		case OBJECT_ACCESS_METHOD:
+		case OBJECT_AGGREGATE:
+		case OBJECT_AMOP:
+		case OBJECT_AMPROC:
+		case OBJECT_ATTRIBUTE:
+		case OBJECT_CAST:
+		case OBJECT_COLLATION:
+		case OBJECT_CONVERSION:
+		case OBJECT_DEFAULT:
+		case OBJECT_DEFACL:
+		case OBJECT_DOMCONSTRAINT:
+		case OBJECT_EVENT_TRIGGER:
+		case OBJECT_EXTENSION:
+		case OBJECT_FOREIGN_TABLE:
+		case OBJECT_INDEX:
+		case OBJECT_MATVIEW:
+		case OBJECT_OPCLASS:
+		case OBJECT_OPERATOR:
+		case OBJECT_OPFAMILY:
+		case OBJECT_POLICY:
+		case OBJECT_PUBLICATION:
+		case OBJECT_PUBLICATION_REL:
+		case OBJECT_ROLE:
+		case OBJECT_RULE:
+		case OBJECT_STATISTIC_EXT:
+		case OBJECT_SUBSCRIPTION:
+		case OBJECT_TABCONSTRAINT:
+		case OBJECT_TRANSFORM:
+		case OBJECT_TRIGGER:
+		case OBJECT_TSCONFIGURATION:
+		case OBJECT_TSDICTIONARY:
+		case OBJECT_TSPARSER:
+		case OBJECT_TSTEMPLATE:
+		case OBJECT_USER_MAPPING:
+		case OBJECT_VIEW:
+			elog(ERROR, "unsupported object type: %d", (int) objtype);
 	}
 
-	elog(ERROR, "unrecognized grant object type: %d", (int) objtype);
 	return "???";				/* keep compiler quiet */
 }
diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
index 7648201218..900fa74e85 100644
--- a/src/backend/commands/explain.c
+++ b/src/backend/commands/explain.c
@@ -3,7 +3,7 @@
  * explain.c
  *	  Explain query execution plans
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * IDENTIFICATION
@@ -19,7 +19,7 @@
 #include "commands/createas.h"
 #include "commands/defrem.h"
 #include "commands/prepare.h"
-#include "executor/hashjoin.h"
+#include "executor/nodeHash.h"
 #include "foreign/fdwapi.h"
 #include "nodes/extensible.h"
 #include "nodes/nodeFuncs.h"
@@ -107,6 +107,7 @@ static void show_tidbitmap_info(BitmapHeapScanState *planstate,
 static void show_instrumentation_count(const char *qlabel, int which,
 						   PlanState *planstate, ExplainState *es);
 static void show_foreignscan_info(ForeignScanState *fsstate, ExplainState *es);
+static void show_eval_params(Bitmapset *bms_params, ExplainState *es);
 static const char *explain_get_index_name(Oid indexId);
 static void show_buffer_usage(ExplainState *es, const BufferUsage *usage);
 static void ExplainIndexScanDetails(Oid indexid, ScanDirection indexorderdir,
@@ -124,10 +125,6 @@ static void ExplainCustomChildren(CustomScanState *css,
 					  List *ancestors, ExplainState *es);
 static void ExplainProperty(const char *qlabel, const char *value,
 				bool numeric, ExplainState *es);
-static void ExplainOpenGroup(const char *objtype, const char *labelname,
-				 bool labeled, ExplainState *es);
-static void ExplainCloseGroup(const char *objtype, const char *labelname,
-				  bool labeled, ExplainState *es);
 static void ExplainDummyGroup(const char *objtype, const char *labelname,
 				  ExplainState *es);
 static void ExplainXMLTag(const char *tagname, int flags, ExplainState *es);
@@ -354,7 +351,7 @@ ExplainOneQuery(Query *query, int cursorOptions,
 	/* if an advisor plugin is present, let it manage things */
 	if (ExplainOneQuery_hook)
 		(*ExplainOneQuery_hook) (query, cursorOptions, into, es,
-								 queryString, params);
+								 queryString, params, queryEnv);
 	else
 	{
 		PlannedStmt *plan;
@@ -400,8 +397,6 @@ ExplainOneUtility(Node *utilityStmt, IntoClause *into, ExplainState *es,
 		 * We have to rewrite the contained SELECT and then pass it back to
 		 * ExplainOneQuery.  It's probably not really necessary to copy the
 		 * contained parsetree another time, but let's be safe.
-		 *
-		 * Like ExecCreateTableAs, disallow parallelism in the plan.
 		 */
 		CreateTableAsStmt *ctas = (CreateTableAsStmt *) utilityStmt;
 		List	   *rewritten;
@@ -409,7 +404,7 @@ ExplainOneUtility(Node *utilityStmt, IntoClause *into, ExplainState *es,
 		rewritten = QueryRewrite(castNode(Query, copyObject(ctas->query)));
 		Assert(list_length(rewritten) == 1);
 		ExplainOneQuery(linitial_node(Query, rewritten),
-						0, ctas->into, es,
+						CURSOR_OPT_PARALLEL_OK, ctas->into, es,
 						queryString, params, queryEnv);
 	}
 	else if (IsA(utilityStmt, DeclareCursorStmt))
@@ -656,17 +651,33 @@ ExplainPrintTriggers(ExplainState *es, QueryDesc *queryDesc)
 	ResultRelInfo *rInfo;
 	bool		show_relname;
 	int			numrels = queryDesc->estate->es_num_result_relations;
-	List	   *targrels = queryDesc->estate->es_trig_target_relations;
+	int			numrootrels = queryDesc->estate->es_num_root_result_relations;
+	List	   *routerels;
+	List	   *targrels;
 	int			nr;
 	ListCell   *l;
 
+	routerels = queryDesc->estate->es_tuple_routing_result_relations;
+	targrels = queryDesc->estate->es_trig_target_relations;
+
 	ExplainOpenGroup("Triggers", "Triggers", false, es);
 
-	show_relname = (numrels > 1 || targrels != NIL);
+	show_relname = (numrels > 1 || numrootrels > 0 ||
+					routerels != NIL || targrels != NIL);
 	rInfo = queryDesc->estate->es_result_relations;
 	for (nr = 0; nr < numrels; rInfo++, nr++)
 		report_triggers(rInfo, show_relname, es);
 
+	rInfo = queryDesc->estate->es_root_result_relations;
+	for (nr = 0; nr < numrootrels; rInfo++, nr++)
+		report_triggers(rInfo, show_relname, es);
+
+	foreach(l, routerels)
+	{
+		rInfo = (ResultRelInfo *) lfirst(l);
+		report_triggers(rInfo, show_relname, es);
+	}
+
 	foreach(l, targrels)
 	{
 		rInfo = (ResultRelInfo *) lfirst(l);
@@ -1434,6 +1445,11 @@ ExplainNode(PlanState *planstate, List *ancestors,
 											   planstate, es);
 				ExplainPropertyInteger("Workers Planned",
 									   gather->num_workers, es);
+
+				/* Show params evaluated at gather node */
+				if (gather->initParam)
+					show_eval_params(gather->initParam, es);
+
 				if (es->analyze)
 				{
 					int			nworkers;
@@ -1456,6 +1472,11 @@ ExplainNode(PlanState *planstate, List *ancestors,
 											   planstate, es);
 				ExplainPropertyInteger("Workers Planned",
 									   gm->num_workers, es);
+
+				/* Show params evaluated at gather-merge node */
+				if (gm->initParam)
+					show_eval_params(gm->initParam, es);
+
 				if (es->analyze)
 				{
 					int			nworkers;
@@ -2279,15 +2300,21 @@ show_tablesample(TableSampleClause *tsc, PlanState *planstate,
 static void
 show_sort_info(SortState *sortstate, ExplainState *es)
 {
-	if (es->analyze && sortstate->sort_Done &&
-		sortstate->tuplesortstate != NULL)
+	if (!es->analyze)
+		return;
+
+	if (sortstate->sort_Done && sortstate->tuplesortstate != NULL)
 	{
 		Tuplesortstate *state = (Tuplesortstate *) sortstate->tuplesortstate;
+		TuplesortInstrumentation stats;
 		const char *sortMethod;
 		const char *spaceType;
 		long		spaceUsed;
 
-		tuplesort_get_stats(state, &sortMethod, &spaceType, &spaceUsed);
+		tuplesort_get_stats(state, &stats);
+		sortMethod = tuplesort_method_name(stats.sortMethod);
+		spaceType = tuplesort_space_type_name(stats.spaceType);
+		spaceUsed = stats.spaceUsed;
 
 		if (es->format == EXPLAIN_FORMAT_TEXT)
 		{
@@ -2302,6 +2329,51 @@ show_sort_info(SortState *sortstate, ExplainState *es)
 			ExplainPropertyText("Sort Space Type", spaceType, es);
 		}
 	}
+
+	if (sortstate->shared_info != NULL)
+	{
+		int			n;
+		bool		opened_group = false;
+
+		for (n = 0; n < sortstate->shared_info->num_workers; n++)
+		{
+			TuplesortInstrumentation *sinstrument;
+			const char *sortMethod;
+			const char *spaceType;
+			long		spaceUsed;
+
+			sinstrument = &sortstate->shared_info->sinstrument[n];
+			if (sinstrument->sortMethod == SORT_TYPE_STILL_IN_PROGRESS)
+				continue;		/* ignore any unfilled slots */
+			sortMethod = tuplesort_method_name(sinstrument->sortMethod);
+			spaceType = tuplesort_space_type_name(sinstrument->spaceType);
+			spaceUsed = sinstrument->spaceUsed;
+
+			if (es->format == EXPLAIN_FORMAT_TEXT)
+			{
+				appendStringInfoSpaces(es->str, es->indent * 2);
+				appendStringInfo(es->str,
+								 "Worker %d:  Sort Method: %s  %s: %ldkB\n",
+								 n, sortMethod, spaceType, spaceUsed);
+			}
+			else
+			{
+				if (!opened_group)
+				{
+					ExplainOpenGroup("Workers", "Workers", false, es);
+					opened_group = true;
+				}
+				ExplainOpenGroup("Worker", NULL, true, es);
+				ExplainPropertyInteger("Worker Number", n, es);
+				ExplainPropertyText("Sort Method", sortMethod, es);
+				ExplainPropertyLong("Sort Space Used", spaceUsed, es);
+				ExplainPropertyText("Sort Space Type", spaceType, es);
+				ExplainCloseGroup("Worker", NULL, true, es);
+			}
+		}
+		if (opened_group)
+			ExplainCloseGroup("Workers", "Workers", false, es);
+	}
 }
 
 /*
@@ -2310,34 +2382,87 @@ show_sort_info(SortState *sortstate, ExplainState *es)
 static void
 show_hash_info(HashState *hashstate, ExplainState *es)
 {
-	HashJoinTable hashtable;
+	HashInstrumentation hinstrument = {0};
+
+	/*
+	 * In a parallel query, the leader process may or may not have run the
+	 * hash join, and even if it did it may not have built a hash table due to
+	 * timing (if it started late it might have seen no tuples in the outer
+	 * relation and skipped building the hash table).  Therefore we have to be
+	 * prepared to get instrumentation data from all participants.
+	 */
+	if (hashstate->hashtable)
+		ExecHashGetInstrumentation(&hinstrument, hashstate->hashtable);
+
+	/*
+	 * Merge results from workers.  In the parallel-oblivious case, the
+	 * results from all participants should be identical, except where
+	 * participants didn't run the join at all so have no data.  In the
+	 * parallel-aware case, we need to consider all the results.  Each worker
+	 * may have seen a different subset of batches and we want to find the
+	 * highest memory usage for any one batch across all batches.
+	 */
+	if (hashstate->shared_info)
+	{
+		SharedHashInfo *shared_info = hashstate->shared_info;
+		int			i;
+
+		for (i = 0; i < shared_info->num_workers; ++i)
+		{
+			HashInstrumentation *worker_hi = &shared_info->hinstrument[i];
+
+			if (worker_hi->nbatch > 0)
+			{
+				/*
+				 * Every participant should agree on the buckets, so to be
+				 * sure we have a value we'll just overwrite each time.
+				 */
+				hinstrument.nbuckets = worker_hi->nbuckets;
+				hinstrument.nbuckets_original = worker_hi->nbuckets_original;
 
-	hashtable = hashstate->hashtable;
+				/*
+				 * Normally every participant should agree on the number of
+				 * batches too, but it's possible for a backend that started
+				 * late and missed the whole join not to have the final nbatch
+				 * number.  So we'll take the largest number.
+				 */
+				hinstrument.nbatch = Max(hinstrument.nbatch, worker_hi->nbatch);
+				hinstrument.nbatch_original = worker_hi->nbatch_original;
+
+				/*
+				 * In a parallel-aware hash join, for now we report the
+				 * maximum peak memory reported by any worker.
+				 */
+				hinstrument.space_peak =
+					Max(hinstrument.space_peak, worker_hi->space_peak);
+			}
+		}
+	}
 
-	if (hashtable)
+	if (hinstrument.nbatch > 0)
 	{
-		long		spacePeakKb = (hashtable->spacePeak + 1023) / 1024;
+		long		spacePeakKb = (hinstrument.space_peak + 1023) / 1024;
 
 		if (es->format != EXPLAIN_FORMAT_TEXT)
 		{
-			ExplainPropertyLong("Hash Buckets", hashtable->nbuckets, es);
+			ExplainPropertyLong("Hash Buckets", hinstrument.nbuckets, es);
 			ExplainPropertyLong("Original Hash Buckets",
-								hashtable->nbuckets_original, es);
-			ExplainPropertyLong("Hash Batches", hashtable->nbatch, es);
+								hinstrument.nbuckets_original, es);
+			ExplainPropertyLong("Hash Batches", hinstrument.nbatch, es);
 			ExplainPropertyLong("Original Hash Batches",
-								hashtable->nbatch_original, es);
+								hinstrument.nbatch_original, es);
 			ExplainPropertyLong("Peak Memory Usage", spacePeakKb, es);
 		}
-		else if (hashtable->nbatch_original != hashtable->nbatch ||
-				 hashtable->nbuckets_original != hashtable->nbuckets)
+		else if (hinstrument.nbatch_original != hinstrument.nbatch ||
+				 hinstrument.nbuckets_original != hinstrument.nbuckets)
 		{
 			appendStringInfoSpaces(es->str, es->indent * 2);
 			appendStringInfo(es->str,
 							 "Buckets: %d (originally %d)  Batches: %d (originally %d)  Memory Usage: %ldkB\n",
-							 hashtable->nbuckets,
-							 hashtable->nbuckets_original,
-							 hashtable->nbatch,
-							 hashtable->nbatch_original,
+							 hinstrument.nbuckets,
+							 hinstrument.nbuckets_original,
+							 hinstrument.nbatch,
+							 hinstrument.nbatch_original,
 							 spacePeakKb);
 		}
 		else
@@ -2345,7 +2470,7 @@ show_hash_info(HashState *hashstate, ExplainState *es)
 			appendStringInfoSpaces(es->str, es->indent * 2);
 			appendStringInfo(es->str,
 							 "Buckets: %d  Batches: %d  Memory Usage: %ldkB\n",
-							 hashtable->nbuckets, hashtable->nbatch,
+							 hinstrument.nbuckets, hinstrument.nbatch,
 							 spacePeakKb);
 		}
 	}
@@ -2429,6 +2554,29 @@ show_foreignscan_info(ForeignScanState *fsstate, ExplainState *es)
 	}
 }
 
+/*
+ * Show initplan params evaluated at Gather or Gather Merge node.
+ */
+static void
+show_eval_params(Bitmapset *bms_params, ExplainState *es)
+{
+	int			paramid = -1;
+	List	   *params = NIL;
+
+	Assert(bms_params);
+
+	while ((paramid = bms_next_member(bms_params, paramid)) >= 0)
+	{
+		char		param[32];
+
+		snprintf(param, sizeof(param), "$%d", paramid);
+		params = lappend(params, pstrdup(param));
+	}
+
+	if (params)
+		ExplainPropertyList("Params Evaluated", params, es);
+}
+
 /*
  * Fetch the name of an index in an EXPLAIN
  *
@@ -3213,7 +3361,7 @@ ExplainPropertyBool(const char *qlabel, bool value, ExplainState *es)
  * If labeled is true, the group members will be labeled properties,
  * while if it's false, they'll be unlabeled objects.
  */
-static void
+void
 ExplainOpenGroup(const char *objtype, const char *labelname,
 				 bool labeled, ExplainState *es)
 {
@@ -3276,7 +3424,7 @@ ExplainOpenGroup(const char *objtype, const char *labelname,
  * Close a group of related objects.
  * Parameters must match the corresponding ExplainOpenGroup call.
  */
-static void
+void
 ExplainCloseGroup(const char *objtype, const char *labelname,
 				  bool labeled, ExplainState *es)
 {
diff --git a/src/backend/commands/extension.c b/src/backend/commands/extension.c
index e4340eed8c..2e4538146d 100644
--- a/src/backend/commands/extension.c
+++ b/src/backend/commands/extension.c
@@ -12,7 +12,7 @@
  * postgresql.conf and recovery.conf.  An extension also has an installation
  * script file, containing SQL commands to create the extension's objects.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1266,8 +1266,8 @@ find_install_path(List *evi_list, ExtensionVersionInfo *evi_target,
 static ObjectAddress
 CreateExtensionInternal(char *extensionName,
 						char *schemaName,
-						char *versionName,
-						char *oldVersionName,
+						const char *versionName,
+						const char *oldVersionName,
 						bool cascade,
 						List *parents,
 						bool is_create)
@@ -2704,13 +2704,13 @@ AlterExtensionNamespace(const char *extensionName, const char *newschema, Oid *o
 	 * check ownership of the individual member objects ...
 	 */
 	if (!pg_extension_ownercheck(extensionOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EXTENSION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_EXTENSION,
 					   extensionName);
 
 	/* Permission check: must have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(nspOid, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE, newschema);
+		aclcheck_error(aclresult, OBJECT_SCHEMA, newschema);
 
 	/*
 	 * If the schema is currently a member of the extension, disallow moving
@@ -2924,7 +2924,7 @@ ExecAlterExtensionStmt(ParseState *pstate, AlterExtensionStmt *stmt)
 
 	/* Permission check: must own extension */
 	if (!pg_extension_ownercheck(extensionOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EXTENSION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_EXTENSION,
 					   stmt->extname);
 
 	/*
@@ -3182,7 +3182,7 @@ ExecAlterExtensionContentsStmt(AlterExtensionContentsStmt *stmt,
 
 	/* Permission check: must own extension */
 	if (!pg_extension_ownercheck(extension.objectId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_EXTENSION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_EXTENSION,
 					   stmt->extname);
 
 	/*
diff --git a/src/backend/commands/foreigncmds.c b/src/backend/commands/foreigncmds.c
index 9ad991507f..5c53aeeaeb 100644
--- a/src/backend/commands/foreigncmds.c
+++ b/src/backend/commands/foreigncmds.c
@@ -3,7 +3,7 @@
  * foreigncmds.c
  *	  foreign-data wrapper/server creation/manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -358,7 +358,7 @@ AlterForeignServerOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 
 			/* Must be owner */
 			if (!pg_foreign_server_ownercheck(srvId, GetUserId()))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_FOREIGN_SERVER,
+				aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FOREIGN_SERVER,
 							   NameStr(form->srvname));
 
 			/* Must be able to become new owner */
@@ -370,7 +370,7 @@ AlterForeignServerOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 			{
 				ForeignDataWrapper *fdw = GetForeignDataWrapper(form->srvfdw);
 
-				aclcheck_error(aclresult, ACL_KIND_FDW, fdw->fdwname);
+				aclcheck_error(aclresult, OBJECT_FDW, fdw->fdwname);
 			}
 		}
 
@@ -907,7 +907,7 @@ CreateForeignServer(CreateForeignServerStmt *stmt)
 
 	aclresult = pg_foreign_data_wrapper_aclcheck(fdw->fdwid, ownerId, ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_FDW, fdw->fdwname);
+		aclcheck_error(aclresult, OBJECT_FDW, fdw->fdwname);
 
 	/*
 	 * Insert tuple into pg_foreign_server.
@@ -1010,7 +1010,7 @@ AlterForeignServer(AlterForeignServerStmt *stmt)
 	 * Only owner or a superuser can ALTER a SERVER.
 	 */
 	if (!pg_foreign_server_ownercheck(srvId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_FOREIGN_SERVER,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FOREIGN_SERVER,
 					   stmt->servername);
 
 	memset(repl_val, 0, sizeof(repl_val));
@@ -1119,10 +1119,10 @@ user_mapping_ddl_aclcheck(Oid umuserid, Oid serverid, const char *servername)
 
 			aclresult = pg_foreign_server_aclcheck(serverid, curuserid, ACL_USAGE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, servername);
+				aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, servername);
 		}
 		else
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_FOREIGN_SERVER,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FOREIGN_SERVER,
 						   servername);
 	}
 }
@@ -1477,7 +1477,7 @@ CreateForeignTable(CreateForeignTableStmt *stmt, Oid relid)
 	server = GetForeignServerByName(stmt->servername, false);
 	aclresult = pg_foreign_server_aclcheck(server->serverid, ownerId, ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, server->servername);
+		aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, server->servername);
 
 	fdw = GetForeignDataWrapper(server->fdwid);
 
@@ -1536,7 +1536,7 @@ ImportForeignSchema(ImportForeignSchemaStmt *stmt)
 	server = GetForeignServerByName(stmt->server_name, false);
 	aclresult = pg_foreign_server_aclcheck(server->serverid, GetUserId(), ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_FOREIGN_SERVER, server->servername);
+		aclcheck_error(aclresult, OBJECT_FOREIGN_SERVER, server->servername);
 
 	/* Check that the schema exists and we have CREATE permissions on it */
 	(void) LookupCreationNamespace(stmt->local_schema);
diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c
index 7de844b2ca..abdfa249c0 100644
--- a/src/backend/commands/functioncmds.c
+++ b/src/backend/commands/functioncmds.c
@@ -5,7 +5,7 @@
  *	  Routines for CREATE and DROP FUNCTION commands and CREATE and DROP
  *	  CAST commands.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -51,6 +51,8 @@
 #include "commands/alter.h"
 #include "commands/defrem.h"
 #include "commands/proclang.h"
+#include "executor/execdesc.h"
+#include "executor/executor.h"
 #include "miscadmin.h"
 #include "optimizer/var.h"
 #include "parser/parse_coerce.h"
@@ -63,6 +65,7 @@
 #include "utils/fmgroids.h"
 #include "utils/guc.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/rel.h"
 #include "utils/syscache.h"
 #include "utils/tqual.h"
@@ -144,7 +147,7 @@ compute_return_type(TypeName *returnType, Oid languageOid,
 		aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(),
 										  ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(namespaceId));
 		address = TypeShellMake(typname, namespaceId, GetUserId());
 		rettype = address.objectId;
@@ -179,7 +182,7 @@ void
 interpret_function_parameter_list(ParseState *pstate,
 								  List *parameters,
 								  Oid languageOid,
-								  bool is_aggregate,
+								  ObjectType objtype,
 								  oidvector **parameterTypes,
 								  ArrayType **allParameterTypes,
 								  ArrayType **parameterModes,
@@ -233,7 +236,7 @@ interpret_function_parameter_list(ParseState *pstate,
 							 errmsg("SQL function cannot accept shell type %s",
 									TypeNameToString(t))));
 				/* We don't allow creating aggregates on shell types either */
-				else if (is_aggregate)
+				else if (objtype == OBJECT_AGGREGATE)
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 							 errmsg("aggregate cannot accept shell type %s",
@@ -262,16 +265,28 @@ interpret_function_parameter_list(ParseState *pstate,
 
 		if (t->setof)
 		{
-			if (is_aggregate)
+			if (objtype == OBJECT_AGGREGATE)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 						 errmsg("aggregates cannot accept set arguments")));
+			else if (objtype == OBJECT_PROCEDURE)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
+						 errmsg("procedures cannot accept set arguments")));
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 						 errmsg("functions cannot accept set arguments")));
 		}
 
+		if (objtype == OBJECT_PROCEDURE)
+		{
+			if (fp->mode == FUNC_PARAM_OUT || fp->mode == FUNC_PARAM_INOUT)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 (errmsg("procedures cannot have OUT parameters"))));
+		}
+
 		/* handle input parameters */
 		if (fp->mode != FUNC_PARAM_OUT && fp->mode != FUNC_PARAM_TABLE)
 		{
@@ -451,6 +466,7 @@ interpret_function_parameter_list(ParseState *pstate,
  */
 static bool
 compute_common_attribute(ParseState *pstate,
+						 bool is_procedure,
 						 DefElem *defel,
 						 DefElem **volatility_item,
 						 DefElem **strict_item,
@@ -463,6 +479,8 @@ compute_common_attribute(ParseState *pstate,
 {
 	if (strcmp(defel->defname, "volatility") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*volatility_item)
 			goto duplicate_error;
 
@@ -470,6 +488,8 @@ compute_common_attribute(ParseState *pstate,
 	}
 	else if (strcmp(defel->defname, "strict") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*strict_item)
 			goto duplicate_error;
 
@@ -484,6 +504,8 @@ compute_common_attribute(ParseState *pstate,
 	}
 	else if (strcmp(defel->defname, "leakproof") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*leakproof_item)
 			goto duplicate_error;
 
@@ -495,6 +517,8 @@ compute_common_attribute(ParseState *pstate,
 	}
 	else if (strcmp(defel->defname, "cost") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*cost_item)
 			goto duplicate_error;
 
@@ -502,6 +526,8 @@ compute_common_attribute(ParseState *pstate,
 	}
 	else if (strcmp(defel->defname, "rows") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*rows_item)
 			goto duplicate_error;
 
@@ -509,6 +535,8 @@ compute_common_attribute(ParseState *pstate,
 	}
 	else if (strcmp(defel->defname, "parallel") == 0)
 	{
+		if (is_procedure)
+			goto procedure_error;
 		if (*parallel_item)
 			goto duplicate_error;
 
@@ -526,6 +554,13 @@ compute_common_attribute(ParseState *pstate,
 			 errmsg("conflicting or redundant options"),
 			 parser_errposition(pstate, defel->location)));
 	return false;				/* keep compiler quiet */
+
+procedure_error:
+	ereport(ERROR,
+			(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
+			 errmsg("invalid attribute in procedure definition"),
+			 parser_errposition(pstate, defel->location)));
+	return false;
 }
 
 static char
@@ -602,20 +637,21 @@ update_proconfig_value(ArrayType *a, List *set_items)
  * attributes.
  */
 static void
-compute_attributes_sql_style(ParseState *pstate,
-							 List *options,
-							 List **as,
-							 char **language,
-							 Node **transform,
-							 bool *windowfunc_p,
-							 char *volatility_p,
-							 bool *strict_p,
-							 bool *security_definer,
-							 bool *leakproof_p,
-							 ArrayType **proconfig,
-							 float4 *procost,
-							 float4 *prorows,
-							 char *parallel_p)
+compute_function_attributes(ParseState *pstate,
+							bool is_procedure,
+							List *options,
+							List **as,
+							char **language,
+							Node **transform,
+							bool *windowfunc_p,
+							char *volatility_p,
+							bool *strict_p,
+							bool *security_definer,
+							bool *leakproof_p,
+							ArrayType **proconfig,
+							float4 *procost,
+							float4 *prorows,
+							char *parallel_p)
 {
 	ListCell   *option;
 	DefElem    *as_item = NULL;
@@ -669,9 +705,15 @@ compute_attributes_sql_style(ParseState *pstate,
 						(errcode(ERRCODE_SYNTAX_ERROR),
 						 errmsg("conflicting or redundant options"),
 						 parser_errposition(pstate, defel->location)));
+			if (is_procedure)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
+						 errmsg("invalid attribute in procedure definition"),
+						 parser_errposition(pstate, defel->location)));
 			windowfunc_item = defel;
 		}
 		else if (compute_common_attribute(pstate,
+										  is_procedure,
 										  defel,
 										  &volatility_item,
 										  &strict_item,
@@ -747,47 +789,6 @@ compute_attributes_sql_style(ParseState *pstate,
 }
 
 
-/*-------------
- *	 Interpret the parameters *parameters and return their contents via
- *	 *isStrict_p and *volatility_p.
- *
- *	These parameters supply optional information about a function.
- *	All have defaults if not specified. Parameters:
- *
- *	 * isStrict means the function should not be called when any NULL
- *	   inputs are present; instead a NULL result value should be assumed.
- *
- *	 * volatility tells the optimizer whether the function's result can
- *	   be assumed to be repeatable over multiple evaluations.
- *------------
- */
-static void
-compute_attributes_with_style(ParseState *pstate, List *parameters, bool *isStrict_p, char *volatility_p)
-{
-	ListCell   *pl;
-
-	foreach(pl, parameters)
-	{
-		DefElem    *param = (DefElem *) lfirst(pl);
-
-		if (pg_strcasecmp(param->defname, "isstrict") == 0)
-			*isStrict_p = defGetBoolean(param);
-		else if (pg_strcasecmp(param->defname, "iscachable") == 0)
-		{
-			/* obsolete spelling of isImmutable */
-			if (defGetBoolean(param))
-				*volatility_p = PROVOLATILE_IMMUTABLE;
-		}
-		else
-			ereport(WARNING,
-					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized function attribute \"%s\" ignored",
-							param->defname),
-					 parser_errposition(pstate, param->location)));
-	}
-}
-
-
 /*
  * For a dynamically linked C language object, the form of the clause is
  *
@@ -855,7 +856,7 @@ interpret_AS_clause(Oid languageOid, const char *languageName,
 
 /*
  * CreateFunction
- *	 Execute a CREATE FUNCTION utility statement.
+ *	 Execute a CREATE FUNCTION (or CREATE PROCEDURE) utility statement.
  */
 ObjectAddress
 CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
@@ -900,10 +901,10 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceId));
 
-	/* default attributes */
+	/* Set default attributes */
 	isWindowFunc = false;
 	isStrict = false;
 	security = false;
@@ -914,13 +915,14 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 	prorows = -1;				/* indicates not set */
 	parallel = PROPARALLEL_UNSAFE;
 
-	/* override attributes from explicit list */
-	compute_attributes_sql_style(pstate,
-								 stmt->options,
-								 &as_clause, &language, &transformDefElem,
-								 &isWindowFunc, &volatility,
-								 &isStrict, &security, &isLeakProof,
-								 &proconfig, &procost, &prorows, &parallel);
+	/* Extract non-default attributes from stmt->options list */
+	compute_function_attributes(pstate,
+								stmt->is_procedure,
+								stmt->options,
+								&as_clause, &language, &transformDefElem,
+								&isWindowFunc, &volatility,
+								&isStrict, &security, &isLeakProof,
+								&proconfig, &procost, &prorows, &parallel);
 
 	/* Look up the language and validate permissions */
 	languageTuple = SearchSysCache1(LANGNAME, PointerGetDatum(language));
@@ -941,14 +943,14 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 
 		aclresult = pg_language_aclcheck(languageOid, GetUserId(), ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_LANGUAGE,
+			aclcheck_error(aclresult, OBJECT_LANGUAGE,
 						   NameStr(languageStruct->lanname));
 	}
 	else
 	{
 		/* if untrusted language, must be superuser */
 		if (!superuser())
-			aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_LANGUAGE,
+			aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_LANGUAGE,
 						   NameStr(languageStruct->lanname));
 	}
 
@@ -990,7 +992,7 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 	interpret_function_parameter_list(pstate,
 									  stmt->parameters,
 									  languageOid,
-									  false,	/* not an aggregate */
+									  stmt->is_procedure ? OBJECT_PROCEDURE : OBJECT_FUNCTION,
 									  &parameterTypes,
 									  &allParameterTypes,
 									  &parameterModes,
@@ -999,7 +1001,14 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 									  &variadicArgType,
 									  &requiredResultType);
 
-	if (stmt->returnType)
+	if (stmt->is_procedure)
+	{
+		Assert(!stmt->returnType);
+
+		prorettype = InvalidOid;
+		returnsSet = false;
+	}
+	else if (stmt->returnType)
 	{
 		/* explicit RETURNS clause */
 		compute_return_type(stmt->returnType, languageOid,
@@ -1045,8 +1054,6 @@ CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt)
 		trftypes = NULL;
 	}
 
-	compute_attributes_with_style(pstate, stmt->withClause, &isStrict, &volatility);
-
 	interpret_AS_clause(languageOid, language, funcname, as_clause,
 						&prosrc_str, &probin_str);
 
@@ -1168,6 +1175,7 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt)
 	HeapTuple	tup;
 	Oid			funcOid;
 	Form_pg_proc procForm;
+	bool		is_procedure;
 	Relation	rel;
 	ListCell   *l;
 	DefElem    *volatility_item = NULL;
@@ -1182,7 +1190,7 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt)
 
 	rel = heap_open(ProcedureRelationId, RowExclusiveLock);
 
-	funcOid = LookupFuncWithArgs(stmt->func, false);
+	funcOid = LookupFuncWithArgs(stmt->objtype, stmt->func, false);
 
 	tup = SearchSysCacheCopy1(PROCOID, ObjectIdGetDatum(funcOid));
 	if (!HeapTupleIsValid(tup)) /* should not happen */
@@ -1192,7 +1200,7 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt)
 
 	/* Permission check: must own function */
 	if (!pg_proc_ownercheck(funcOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, stmt->objtype,
 					   NameListToString(stmt->func->objname));
 
 	if (procForm->proisagg)
@@ -1201,12 +1209,15 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt)
 				 errmsg("\"%s\" is an aggregate function",
 						NameListToString(stmt->func->objname))));
 
+	is_procedure = (procForm->prorettype == InvalidOid);
+
 	/* Examine requested actions. */
 	foreach(l, stmt->actions)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
 		if (compute_common_attribute(pstate,
+									 is_procedure,
 									 defel,
 									 &volatility_item,
 									 &strict_item,
@@ -1472,7 +1483,7 @@ CreateCast(CreateCastStmt *stmt)
 	{
 		Form_pg_proc procstruct;
 
-		funcid = LookupFuncWithArgs(stmt->func, false);
+		funcid = LookupFuncWithArgs(OBJECT_FUNCTION, stmt->func, false);
 
 		tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
 		if (!HeapTupleIsValid(tuple))
@@ -1846,21 +1857,21 @@ CreateTransform(CreateTransformStmt *stmt)
 
 	aclresult = pg_language_aclcheck(langid, GetUserId(), ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_LANGUAGE, stmt->lang);
+		aclcheck_error(aclresult, OBJECT_LANGUAGE, stmt->lang);
 
 	/*
 	 * Get the functions
 	 */
 	if (stmt->fromsql)
 	{
-		fromsqlfuncid = LookupFuncWithArgs(stmt->fromsql, false);
+		fromsqlfuncid = LookupFuncWithArgs(OBJECT_FUNCTION, stmt->fromsql, false);
 
 		if (!pg_proc_ownercheck(fromsqlfuncid, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->fromsql->objname));
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION, NameListToString(stmt->fromsql->objname));
 
 		aclresult = pg_proc_aclcheck(fromsqlfuncid, GetUserId(), ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC, NameListToString(stmt->fromsql->objname));
+			aclcheck_error(aclresult, OBJECT_FUNCTION, NameListToString(stmt->fromsql->objname));
 
 		tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(fromsqlfuncid));
 		if (!HeapTupleIsValid(tuple))
@@ -1879,14 +1890,14 @@ CreateTransform(CreateTransformStmt *stmt)
 
 	if (stmt->tosql)
 	{
-		tosqlfuncid = LookupFuncWithArgs(stmt->tosql, false);
+		tosqlfuncid = LookupFuncWithArgs(OBJECT_FUNCTION, stmt->tosql, false);
 
 		if (!pg_proc_ownercheck(tosqlfuncid, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->tosql->objname));
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION, NameListToString(stmt->tosql->objname));
 
 		aclresult = pg_proc_aclcheck(tosqlfuncid, GetUserId(), ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC, NameListToString(stmt->tosql->objname));
+			aclcheck_error(aclresult, OBJECT_FUNCTION, NameListToString(stmt->tosql->objname));
 
 		tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(tosqlfuncid));
 		if (!HeapTupleIsValid(tuple))
@@ -2071,9 +2082,11 @@ IsThereFunctionInNamespace(const char *proname, int pronargs,
 /*
  * ExecuteDoStmt
  *		Execute inline procedural-language code
+ *
+ * See at ExecuteCallStmt() about the atomic argument.
  */
 void
-ExecuteDoStmt(DoStmt *stmt)
+ExecuteDoStmt(DoStmt *stmt, bool atomic)
 {
 	InlineCodeBlock *codeblock = makeNode(InlineCodeBlock);
 	ListCell   *arg;
@@ -2135,6 +2148,7 @@ ExecuteDoStmt(DoStmt *stmt)
 	codeblock->langOid = HeapTupleGetOid(languageTuple);
 	languageStruct = (Form_pg_language) GETSTRUCT(languageTuple);
 	codeblock->langIsTrusted = languageStruct->lanpltrusted;
+	codeblock->atomic = atomic;
 
 	if (languageStruct->lanpltrusted)
 	{
@@ -2144,14 +2158,14 @@ ExecuteDoStmt(DoStmt *stmt)
 		aclresult = pg_language_aclcheck(codeblock->langOid, GetUserId(),
 										 ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_LANGUAGE,
+			aclcheck_error(aclresult, OBJECT_LANGUAGE,
 						   NameStr(languageStruct->lanname));
 	}
 	else
 	{
 		/* if untrusted language, must be superuser */
 		if (!superuser())
-			aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_LANGUAGE,
+			aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_LANGUAGE,
 						   NameStr(languageStruct->lanname));
 	}
 
@@ -2168,3 +2182,116 @@ ExecuteDoStmt(DoStmt *stmt)
 	/* execute the inline handler */
 	OidFunctionCall1(laninline, PointerGetDatum(codeblock));
 }
+
+/*
+ * Execute CALL statement
+ *
+ * Inside a top-level CALL statement, transaction-terminating commands such as
+ * COMMIT or a PL-specific equivalent are allowed.  The terminology in the SQL
+ * standard is that CALL establishes a non-atomic execution context.  Most
+ * other commands establish an atomic execution context, in which transaction
+ * control actions are not allowed.  If there are nested executions of CALL,
+ * we want to track the execution context recursively, so that the nested
+ * CALLs can also do transaction control.  Note, however, that for example in
+ * CALL -> SELECT -> CALL, the second call cannot do transaction control,
+ * because the SELECT in between establishes an atomic execution context.
+ *
+ * So when ExecuteCallStmt() is called from the top level, we pass in atomic =
+ * false (recall that that means transactions = yes).  We then create a
+ * CallContext node with content atomic = false, which is passed in the
+ * fcinfo->context field to the procedure invocation.  The language
+ * implementation should then take appropriate measures to allow or prevent
+ * transaction commands based on that information, e.g., call
+ * SPI_connect_ext(SPI_OPT_NONATOMIC).  The language should also pass on the
+ * atomic flag to any nested invocations to CALL.
+ *
+ * The expression data structures and execution context that we create
+ * within this function are children of the portalContext of the Portal
+ * that the CALL utility statement runs in.  Therefore, any pass-by-ref
+ * values that we're passing to the procedure will survive transaction
+ * commits that might occur inside the procedure.
+ */
+void
+ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic)
+{
+	ListCell   *lc;
+	FuncExpr   *fexpr;
+	int			nargs;
+	int			i;
+	AclResult	aclresult;
+	FmgrInfo	flinfo;
+	FunctionCallInfoData fcinfo;
+	CallContext *callcontext;
+	EState	   *estate;
+	ExprContext *econtext;
+	HeapTuple	tp;
+
+	fexpr = stmt->funcexpr;
+	Assert(fexpr);
+
+	aclresult = pg_proc_aclcheck(fexpr->funcid, GetUserId(), ACL_EXECUTE);
+	if (aclresult != ACLCHECK_OK)
+		aclcheck_error(aclresult, OBJECT_PROCEDURE, get_func_name(fexpr->funcid));
+
+	nargs = list_length(fexpr->args);
+
+	/* safety check; see ExecInitFunc() */
+	if (nargs > FUNC_MAX_ARGS)
+		ereport(ERROR,
+				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
+				 errmsg_plural("cannot pass more than %d argument to a procedure",
+							   "cannot pass more than %d arguments to a procedure",
+							   FUNC_MAX_ARGS,
+							   FUNC_MAX_ARGS)));
+
+	/* Prep the context object we'll pass to the procedure */
+	callcontext = makeNode(CallContext);
+	callcontext->atomic = atomic;
+
+	/*
+	 * If proconfig is set we can't allow transaction commands because of the
+	 * way the GUC stacking works: The transaction boundary would have to pop
+	 * the proconfig setting off the stack.  That restriction could be lifted
+	 * by redesigning the GUC nesting mechanism a bit.
+	 */
+	tp = SearchSysCache1(PROCOID, ObjectIdGetDatum(fexpr->funcid));
+	if (!HeapTupleIsValid(tp))
+		elog(ERROR, "cache lookup failed for function %u", fexpr->funcid);
+	if (!heap_attisnull(tp, Anum_pg_proc_proconfig))
+		callcontext->atomic = true;
+	ReleaseSysCache(tp);
+
+	/* Initialize function call structure */
+	InvokeFunctionExecuteHook(fexpr->funcid);
+	fmgr_info(fexpr->funcid, &flinfo);
+	InitFunctionCallInfoData(fcinfo, &flinfo, nargs, fexpr->inputcollid, (Node *) callcontext, NULL);
+
+	/*
+	 * Evaluate procedure arguments inside a suitable execution context.  Note
+	 * we can't free this context till the procedure returns.
+	 */
+	estate = CreateExecutorState();
+	estate->es_param_list_info = params;
+	econtext = CreateExprContext(estate);
+
+	i = 0;
+	foreach(lc, fexpr->args)
+	{
+		ExprState  *exprstate;
+		Datum		val;
+		bool		isnull;
+
+		exprstate = ExecPrepareExpr(lfirst(lc), estate);
+
+		val = ExecEvalExprSwitchContext(exprstate, econtext, &isnull);
+
+		fcinfo.arg[i] = val;
+		fcinfo.argnull[i] = isnull;
+
+		i++;
+	}
+
+	FunctionCallInvoke(&fcinfo);
+
+	FreeExecutorState(estate);
+}
diff --git a/src/backend/commands/indexcmds.c b/src/backend/commands/indexcmds.c
index 620704ec49..3e48a58dcb 100644
--- a/src/backend/commands/indexcmds.c
+++ b/src/backend/commands/indexcmds.c
@@ -3,7 +3,7 @@
  * indexcmds.c
  *	  POSTGRES define and remove index code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,7 +23,11 @@
 #include "catalog/catalog.h"
 #include "catalog/index.h"
 #include "catalog/indexing.h"
+#include "catalog/partition.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_constraint_fn.h"
+#include "catalog/pg_inherits.h"
+#include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_opclass.h"
 #include "catalog/pg_opfamily.h"
 #include "catalog/pg_tablespace.h"
@@ -35,6 +39,7 @@
 #include "commands/tablespace.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
+#include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/planner.h"
@@ -42,6 +47,7 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_func.h"
 #include "parser/parse_oper.h"
+#include "rewrite/rewriteManip.h"
 #include "storage/lmgr.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
@@ -67,7 +73,7 @@ static void ComputeIndexAttrs(IndexInfo *indexInfo,
 				  List *attList,
 				  List *exclusionOpNames,
 				  Oid relId,
-				  char *accessMethodName, Oid accessMethodId,
+				  const char *accessMethodName, Oid accessMethodId,
 				  bool amcanorder,
 				  bool isconstraint);
 static char *ChooseIndexName(const char *tabname, Oid namespaceId,
@@ -77,6 +83,7 @@ static char *ChooseIndexNameAddition(List *colnames);
 static List *ChooseIndexColumnNames(List *indexElems);
 static void RangeVarCallbackForReindexIndex(const RangeVar *relation,
 								Oid relId, Oid oldRelId, void *arg);
+static void ReindexPartitionedIndex(Relation parentIdx);
 
 /*
  * CheckIndexCompatible
@@ -115,7 +122,7 @@ static void RangeVarCallbackForReindexIndex(const RangeVar *relation,
  */
 bool
 CheckIndexCompatible(Oid oldId,
-					 char *accessMethodName,
+					 const char *accessMethodName,
 					 List *attributeList,
 					 List *exclusionOpNames)
 {
@@ -183,6 +190,7 @@ CheckIndexCompatible(Oid oldId,
 	indexInfo->ii_ExclusionOps = NULL;
 	indexInfo->ii_ExclusionProcs = NULL;
 	indexInfo->ii_ExclusionStrats = NULL;
+	indexInfo->ii_Am = accessMethodId;
 	indexInfo->ii_AmCache = NULL;
 	indexInfo->ii_Context = CurrentMemoryContext;
 	typeObjectId = (Oid *) palloc(numberOfAttributes * sizeof(Oid));
@@ -242,7 +250,7 @@ CheckIndexCompatible(Oid oldId,
 	for (i = 0; i < old_natts; i++)
 	{
 		if (IsPolymorphicType(get_opclass_input_type(classObjectId[i])) &&
-			irel->rd_att->attrs[i]->atttypid != typeObjectId[i])
+			TupleDescAttr(irel->rd_att, i)->atttypid != typeObjectId[i])
 		{
 			ret = false;
 			break;
@@ -270,7 +278,7 @@ CheckIndexCompatible(Oid oldId,
 
 				op_input_types(indexInfo->ii_ExclusionOps[i], &left, &right);
 				if ((IsPolymorphicType(left) || IsPolymorphicType(right)) &&
-					irel->rd_att->attrs[i]->atttypid != typeObjectId[i])
+					TupleDescAttr(irel->rd_att, i)->atttypid != typeObjectId[i])
 				{
 					ret = false;
 					break;
@@ -292,14 +300,17 @@ CheckIndexCompatible(Oid oldId,
  * 'stmt': IndexStmt describing the properties of the new index.
  * 'indexRelationId': normally InvalidOid, but during bootstrap can be
  *		nonzero to specify a preselected OID for the index.
+ * 'parentIndexId': the OID of the parent index; InvalidOid if not the child
+ *		of a partitioned index.
+ * 'parentConstraintId': the OID of the parent constraint; InvalidOid if not
+ *		the child of a constraint (only used when recursing)
  * 'is_alter_table': this is due to an ALTER rather than a CREATE operation.
  * 'check_rights': check for CREATE rights in namespace and tablespace.  (This
  *		should be true except when ALTER is deleting/recreating an index.)
  * 'check_not_in_use': check for table not already in use in current session.
  *		This should be true unless caller is holding the table open, in which
  *		case the caller had better have checked it earlier.
- * 'skip_build': make the catalog entries but leave the index file empty;
- *		it will be filled later.
+ * 'skip_build': make the catalog entries but don't create the index files
  * 'quiet': suppress the NOTICE chatter ordinarily provided for constraints.
  *
  * Returns the object address of the created index.
@@ -308,6 +319,8 @@ ObjectAddress
 DefineIndex(Oid relationId,
 			IndexStmt *stmt,
 			Oid indexRelationId,
+			Oid parentIndexId,
+			Oid	parentConstraintId,
 			bool is_alter_table,
 			bool check_rights,
 			bool check_not_in_use,
@@ -322,6 +335,7 @@ DefineIndex(Oid relationId,
 	Oid			accessMethodId;
 	Oid			namespaceId;
 	Oid			tablespaceId;
+	Oid			createdConstraintId = InvalidOid;
 	List	   *indexColNames;
 	Relation	rel;
 	Relation	indexRelation;
@@ -330,9 +344,12 @@ DefineIndex(Oid relationId,
 	IndexAmRoutine *amRoutine;
 	bool		amcanorder;
 	amoptions_function amoptions;
+	bool		partitioned;
 	Datum		reloptions;
 	int16	   *coloptions;
 	IndexInfo  *indexInfo;
+	bits16		flags;
+	bits16		constr_flags;
 	int			numberOfAttributes;
 	TransactionId limitXmin;
 	VirtualTransactionId *old_snapshots;
@@ -368,6 +385,10 @@ DefineIndex(Oid relationId,
 	 * this will typically require the caller to have already locked the
 	 * relation.  To avoid lock upgrade hazards, that lock should be at least
 	 * as strong as the one we take here.
+	 *
+	 * NB: If the lock strength here ever changes, code that is run by
+	 * parallel workers under the control of certain particular ambuild
+	 * functions will need to be updated, too.
 	 */
 	lockmode = stmt->concurrent ? ShareUpdateExclusiveLock : ShareLock;
 	rel = heap_open(relationId, lockmode);
@@ -375,11 +396,15 @@ DefineIndex(Oid relationId,
 	relationId = RelationGetRelid(rel);
 	namespaceId = RelationGetNamespace(rel);
 
-	if (rel->rd_rel->relkind != RELKIND_RELATION &&
-		rel->rd_rel->relkind != RELKIND_MATVIEW)
+	/* Ensure that it makes sense to index this kind of relation */
+	switch (rel->rd_rel->relkind)
 	{
-		if (rel->rd_rel->relkind == RELKIND_FOREIGN_TABLE)
-
+		case RELKIND_RELATION:
+		case RELKIND_MATVIEW:
+		case RELKIND_PARTITIONED_TABLE:
+			/* OK */
+			break;
+		case RELKIND_FOREIGN_TABLE:
 			/*
 			 * Custom error message for FOREIGN TABLE since the term is close
 			 * to a regular table and can confuse the user.
@@ -388,15 +413,34 @@ DefineIndex(Oid relationId,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("cannot create index on foreign table \"%s\"",
 							RelationGetRelationName(rel))));
-		else if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("cannot create index on partitioned table \"%s\"",
+					 errmsg("\"%s\" is not a table or materialized view",
 							RelationGetRelationName(rel))));
-		else
+			break;
+	}
+
+	/*
+	 * Establish behavior for partitioned tables, and verify sanity of
+	 * parameters.
+	 *
+	 * We do not build an actual index in this case; we only create a few
+	 * catalog entries.  The actual indexes are built by recursing for each
+	 * partition.
+	 */
+	partitioned = rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE;
+	if (partitioned)
+	{
+		if (stmt->concurrent)
 			ereport(ERROR,
-					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-					 errmsg("\"%s\" is not a table or materialized view",
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot create index on partitioned table \"%s\" concurrently",
+							RelationGetRelationName(rel))));
+		if (stmt->excludeOpNames)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot create exclusion constraints on partitioned table \"%s\"",
 							RelationGetRelationName(rel))));
 	}
 
@@ -430,7 +474,7 @@ DefineIndex(Oid relationId,
 		aclresult = pg_namespace_aclcheck(namespaceId, GetUserId(),
 										  ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(namespaceId));
 	}
 
@@ -457,7 +501,7 @@ DefineIndex(Oid relationId,
 		aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(),
 										   ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+			aclcheck_error(aclresult, OBJECT_TABLESPACE,
 						   get_tablespace_name(tablespaceId));
 	}
 
@@ -573,6 +617,8 @@ DefineIndex(Oid relationId,
 	indexInfo->ii_ReadyForInserts = !stmt->concurrent;
 	indexInfo->ii_Concurrent = stmt->concurrent;
 	indexInfo->ii_BrokenHotChain = false;
+	indexInfo->ii_ParallelWorkers = 0;
+	indexInfo->ii_Am = accessMethodId;
 	indexInfo->ii_AmCache = NULL;
 	indexInfo->ii_Context = CurrentMemoryContext;
 
@@ -593,6 +639,84 @@ DefineIndex(Oid relationId,
 	if (stmt->primary)
 		index_check_primary_key(rel, indexInfo, is_alter_table);
 
+	/*
+	 * If this table is partitioned and we're creating a unique index or a
+	 * primary key, make sure that the indexed columns are part of the
+	 * partition key.  Otherwise it would be possible to violate uniqueness by
+	 * putting values that ought to be unique in different partitions.
+	 *
+	 * We could lift this limitation if we had global indexes, but those have
+	 * their own problems, so this is a useful feature combination.
+	 */
+	if (partitioned && (stmt->unique || stmt->primary))
+	{
+		PartitionKey key = rel->rd_partkey;
+		int			i;
+
+		/*
+		 * A partitioned table can have unique indexes, as long as all the
+		 * columns in the partition key appear in the unique key.  A
+		 * partition-local index can enforce global uniqueness iff the PK
+		 * value completely determines the partition that a row is in.
+		 *
+		 * Thus, verify that all the columns in the partition key appear
+		 * in the unique key definition.
+		 */
+		for (i = 0; i < key->partnatts; i++)
+		{
+			bool	found = false;
+			int		j;
+			const char *constraint_type;
+
+			if (stmt->primary)
+				constraint_type = "PRIMARY KEY";
+			else if (stmt->unique)
+				constraint_type = "UNIQUE";
+			else if (stmt->excludeOpNames != NIL)
+				constraint_type = "EXCLUDE";
+			else
+			{
+				elog(ERROR, "unknown constraint type");
+				constraint_type = NULL; /* keep compiler quiet */
+			}
+
+			/*
+			 * It may be possible to support UNIQUE constraints when partition
+			 * keys are expressions, but is it worth it?  Give up for now.
+			 */
+			if (key->partattrs[i] == 0)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("unsupported %s constraint with partition key definition",
+								constraint_type),
+						 errdetail("%s constraints cannot be used when partition keys include expressions.",
+								constraint_type)));
+
+			for (j = 0; j < indexInfo->ii_NumIndexAttrs; j++)
+			{
+				if (key->partattrs[i] == indexInfo->ii_KeyAttrNumbers[j])
+				{
+					found = true;
+					break;
+				}
+			}
+			if (!found)
+			{
+				Form_pg_attribute att;
+
+				att = TupleDescAttr(RelationGetDescr(rel), key->partattrs[i] - 1);
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("insufficient columns in %s constraint definition",
+								constraint_type),
+						 errdetail("%s constraint on table \"%s\" lacks column \"%s\" which is part of the partition key.",
+								   constraint_type, RelationGetRelationName(rel),
+								   NameStr(att->attname))));
+			}
+		}
+	}
+
+
 	/*
 	 * We disallow indexes on system columns other than OID.  They would not
 	 * necessarily get updated correctly, and they don't seem useful anyway.
@@ -662,20 +786,42 @@ DefineIndex(Oid relationId,
 	Assert(!OidIsValid(stmt->oldNode) || (skip_build && !stmt->concurrent));
 
 	/*
-	 * Make the catalog entries for the index, including constraints. Then, if
-	 * not skip_build || concurrent, actually build the index.
+	 * Make the catalog entries for the index, including constraints. This
+	 * step also actually builds the index, except if caller requested not to
+	 * or in concurrent mode, in which case it'll be done later, or
+	 * doing a partitioned index (because those don't have storage).
 	 */
+	flags = constr_flags = 0;
+	if (stmt->isconstraint)
+		flags |= INDEX_CREATE_ADD_CONSTRAINT;
+	if (skip_build || stmt->concurrent || partitioned)
+		flags |= INDEX_CREATE_SKIP_BUILD;
+	if (stmt->if_not_exists)
+		flags |= INDEX_CREATE_IF_NOT_EXISTS;
+	if (stmt->concurrent)
+		flags |= INDEX_CREATE_CONCURRENT;
+	if (partitioned)
+		flags |= INDEX_CREATE_PARTITIONED;
+	if (stmt->primary)
+		flags |= INDEX_CREATE_IS_PRIMARY;
+	if (partitioned && stmt->relation && !stmt->relation->inh)
+		flags |= INDEX_CREATE_INVALID;
+
+	if (stmt->deferrable)
+		constr_flags |= INDEX_CONSTR_CREATE_DEFERRABLE;
+	if (stmt->initdeferred)
+		constr_flags |= INDEX_CONSTR_CREATE_INIT_DEFERRED;
+
 	indexRelationId =
-		index_create(rel, indexRelationName, indexRelationId, stmt->oldNode,
-					 indexInfo, indexColNames,
+		index_create(rel, indexRelationName, indexRelationId, parentIndexId,
+					 parentConstraintId,
+					 stmt->oldNode, indexInfo, indexColNames,
 					 accessMethodId, tablespaceId,
 					 collationObjectId, classObjectId,
-					 coloptions, reloptions, stmt->primary,
-					 stmt->isconstraint, stmt->deferrable, stmt->initdeferred,
-					 allowSystemTableMods,
-					 skip_build || stmt->concurrent,
-					 stmt->concurrent, !check_rights,
-					 stmt->if_not_exists);
+					 coloptions, reloptions,
+					 flags, constr_flags,
+					 allowSystemTableMods, !check_rights,
+					 &createdConstraintId);
 
 	ObjectAddressSet(address, RelationRelationId, indexRelationId);
 
@@ -690,6 +836,185 @@ DefineIndex(Oid relationId,
 		CreateComments(indexRelationId, RelationRelationId, 0,
 					   stmt->idxcomment);
 
+	if (partitioned)
+	{
+		/*
+		 * Unless caller specified to skip this step (via ONLY), process
+		 * each partition to make sure they all contain a corresponding index.
+		 *
+		 * If we're called internally (no stmt->relation), recurse always.
+		 */
+		if (!stmt->relation || stmt->relation->inh)
+		{
+			PartitionDesc partdesc = RelationGetPartitionDesc(rel);
+			int			nparts = partdesc->nparts;
+			Oid		   *part_oids = palloc(sizeof(Oid) * nparts);
+			bool		invalidate_parent = false;
+			TupleDesc	parentDesc;
+			Oid		   *opfamOids;
+
+			memcpy(part_oids, partdesc->oids, sizeof(Oid) * nparts);
+
+			parentDesc = CreateTupleDescCopy(RelationGetDescr(rel));
+			opfamOids = palloc(sizeof(Oid) * numberOfAttributes);
+			for (i = 0; i < numberOfAttributes; i++)
+				opfamOids[i] = get_opclass_family(classObjectId[i]);
+
+			heap_close(rel, NoLock);
+
+			/*
+			 * For each partition, scan all existing indexes; if one matches
+			 * our index definition and is not already attached to some other
+			 * parent index, attach it to the one we just created.
+			 *
+			 * If none matches, build a new index by calling ourselves
+			 * recursively with the same options (except for the index name).
+			 */
+			for (i = 0; i < nparts; i++)
+			{
+				Oid		childRelid = part_oids[i];
+				Relation childrel;
+				List   *childidxs;
+				ListCell *cell;
+				AttrNumber *attmap;
+				bool	found = false;
+				int		maplen;
+
+				childrel = heap_open(childRelid, lockmode);
+				childidxs = RelationGetIndexList(childrel);
+				attmap =
+					convert_tuples_by_name_map(RelationGetDescr(childrel),
+											   parentDesc,
+											   gettext_noop("could not convert row type"));
+				maplen = parentDesc->natts;
+
+
+				foreach(cell, childidxs)
+				{
+					Oid			cldidxid = lfirst_oid(cell);
+					Relation	cldidx;
+					IndexInfo  *cldIdxInfo;
+
+					/* this index is already partition of another one */
+					if (has_superclass(cldidxid))
+						continue;
+
+					cldidx = index_open(cldidxid, lockmode);
+					cldIdxInfo = BuildIndexInfo(cldidx);
+					if (CompareIndexInfo(cldIdxInfo, indexInfo,
+										 cldidx->rd_indcollation,
+										 collationObjectId,
+										 cldidx->rd_opfamily,
+										 opfamOids,
+										 attmap, maplen))
+					{
+						Oid		cldConstrOid = InvalidOid;
+
+						/*
+						 * Found a match.
+						 *
+						 * If this index is being created in the parent
+						 * because of a constraint, then the child needs to
+						 * have a constraint also, so look for one.  If there
+						 * is no such constraint, this index is no good, so
+						 * keep looking.
+						 */
+						if (createdConstraintId != InvalidOid)
+						{
+							cldConstrOid =
+								get_relation_idx_constraint_oid(childRelid,
+																cldidxid);
+							if (cldConstrOid == InvalidOid)
+							{
+								index_close(cldidx, lockmode);
+								continue;
+							}
+						}
+
+						/* Attach index to parent and we're done. */
+						IndexSetParentIndex(cldidx, indexRelationId);
+						if (createdConstraintId != InvalidOid)
+							ConstraintSetParentConstraint(cldConstrOid,
+														  createdConstraintId);
+
+						if (!IndexIsValid(cldidx->rd_index))
+							invalidate_parent = true;
+
+						found = true;
+						/* keep lock till commit */
+						index_close(cldidx, NoLock);
+						break;
+					}
+
+					index_close(cldidx, lockmode);
+				}
+
+				list_free(childidxs);
+				heap_close(childrel, NoLock);
+
+				/*
+				 * If no matching index was found, create our own.
+				 */
+				if (!found)
+				{
+					IndexStmt  *childStmt = copyObject(stmt);
+					bool		found_whole_row;
+
+					childStmt->whereClause =
+						map_variable_attnos(stmt->whereClause, 1, 0,
+											attmap, maplen,
+											InvalidOid, &found_whole_row);
+					if (found_whole_row)
+						elog(ERROR, "cannot convert whole-row table reference");
+
+					childStmt->idxname = NULL;
+					childStmt->relationId = childRelid;
+					DefineIndex(childRelid, childStmt,
+								InvalidOid,			/* no predefined OID */
+								indexRelationId,	/* this is our child */
+								createdConstraintId,
+								false, check_rights, check_not_in_use,
+								false, quiet);
+				}
+
+				pfree(attmap);
+			}
+
+			/*
+			 * The pg_index row we inserted for this index was marked
+			 * indisvalid=true.  But if we attached an existing index that
+			 * is invalid, this is incorrect, so update our row to
+			 * invalid too.
+			 */
+			if (invalidate_parent)
+			{
+				Relation	pg_index = heap_open(IndexRelationId, RowExclusiveLock);
+				HeapTuple	tup,
+							newtup;
+
+				tup = SearchSysCache1(INDEXRELID,
+									  ObjectIdGetDatum(indexRelationId));
+				if (!tup)
+					elog(ERROR, "cache lookup failed for index %u",
+						 indexRelationId);
+				newtup = heap_copytuple(tup);
+				((Form_pg_index) GETSTRUCT(newtup))->indisvalid = false;
+				CatalogTupleUpdate(pg_index, &tup->t_self, newtup);
+				ReleaseSysCache(tup);
+				heap_close(pg_index, RowExclusiveLock);
+				heap_freetuple(newtup);
+			}
+		}
+		else
+			heap_close(rel, NoLock);
+
+		/*
+		 * Indexes on partitioned tables are not themselves built, so we're
+		 * done here.
+		 */
+		return address;
+	}
+
 	if (!stmt->concurrent)
 	{
 		/* Close the heap and we're done, in the non-concurrent case */
@@ -781,7 +1106,7 @@ DefineIndex(Oid relationId,
 	indexInfo->ii_BrokenHotChain = false;
 
 	/* Now build the index */
-	index_build(rel, indexRelation, indexInfo, stmt->primary, false);
+	index_build(rel, indexRelation, indexInfo, stmt->primary, false, true);
 
 	/* Close both the relations, but keep the locks */
 	heap_close(rel, NoLock);
@@ -840,11 +1165,14 @@ DefineIndex(Oid relationId,
 	 * doing CREATE INDEX CONCURRENTLY, which would see our snapshot as one
 	 * they must wait for.  But first, save the snapshot's xmin to use as
 	 * limitXmin for GetCurrentVirtualXIDs().
+	 *
+	 * Our catalog snapshot could have the same effect, so drop that one too.
 	 */
 	limitXmin = snapshot->xmin;
 
 	PopActiveSnapshot();
 	UnregisterSnapshot(snapshot);
+	InvalidateCatalogSnapshot();
 
 	/*
 	 * The index is now valid in the sense that it contains all currently
@@ -1012,7 +1340,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
 				  List *attList,	/* list of IndexElem's */
 				  List *exclusionOpNames,
 				  Oid relId,
-				  char *accessMethodName,
+				  const char *accessMethodName,
 				  Oid accessMethodId,
 				  bool amcanorder,
 				  bool isconstraint)
@@ -1278,7 +1606,7 @@ ComputeIndexAttrs(IndexInfo *indexInfo,
  */
 Oid
 ResolveOpClass(List *opclass, Oid attrType,
-			   char *accessMethodName, Oid accessMethodId)
+			   const char *accessMethodName, Oid accessMethodId)
 {
 	char	   *schemaname;
 	char	   *opcname;
@@ -1746,7 +2074,7 @@ ChooseIndexColumnNames(List *indexElems)
  * ReindexIndex
  *		Recreate a specific index.
  */
-Oid
+void
 ReindexIndex(RangeVar *indexRelation, int options)
 {
 	Oid			indOid;
@@ -1769,12 +2097,17 @@ ReindexIndex(RangeVar *indexRelation, int options)
 	 * lock on the index.
 	 */
 	irel = index_open(indOid, NoLock);
+
+	if (irel->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
+	{
+		ReindexPartitionedIndex(irel);
+		return;
+	}
+
 	persistence = irel->rd_rel->relpersistence;
 	index_close(irel, NoLock);
 
 	reindex_index(indOid, false, persistence, options);
-
-	return indOid;
 }
 
 /*
@@ -1813,14 +2146,15 @@ RangeVarCallbackForReindexIndex(const RangeVar *relation,
 	relkind = get_rel_relkind(relId);
 	if (!relkind)
 		return;
-	if (relkind != RELKIND_INDEX)
+	if (relkind != RELKIND_INDEX &&
+		relkind != RELKIND_PARTITIONED_INDEX)
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is not an index", relation->relname)));
 
 	/* Check permissions */
 	if (!pg_class_ownercheck(relId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, relation->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_INDEX, relation->relname);
 
 	/* Lock heap before index to avoid deadlock. */
 	if (relId != oldRelId)
@@ -1899,7 +2233,7 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
 		objectOid = get_namespace_oid(objectName, false);
 
 		if (!pg_namespace_ownercheck(objectOid, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_NAMESPACE,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SCHEMA,
 						   objectName);
 	}
 	else
@@ -1911,7 +2245,7 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("can only reindex the currently open database")));
 		if (!pg_database_ownercheck(objectOid, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 						   objectName);
 	}
 
@@ -1957,6 +2291,12 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
 		/*
 		 * Only regular tables and matviews can have indexes, so ignore any
 		 * other kind of relation.
+		 *
+		 * It is tempting to also consider partitioned tables here, but that
+		 * has the problem that if the children are in the same schema, they
+		 * would be processed twice.  Maybe we could have a separate list of
+		 * partitioned tables, and expand that afterwards into relids,
+		 * ignoring any duplicates.
 		 */
 		if (classtuple->relkind != RELKIND_RELATION &&
 			classtuple->relkind != RELKIND_MATVIEW)
@@ -2019,3 +2359,155 @@ ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
 
 	MemoryContextDelete(private_context);
 }
+
+/*
+ *	ReindexPartitionedIndex
+ *		Reindex each child of the given partitioned index.
+ *
+ * Not yet implemented.
+ */
+static void
+ReindexPartitionedIndex(Relation parentIdx)
+{
+	ereport(ERROR,
+			(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+			 errmsg("REINDEX is not yet implemented for partitioned indexes")));
+}
+
+/*
+ * Insert or delete an appropriate pg_inherits tuple to make the given index
+ * be a partition of the indicated parent index.
+ *
+ * This also corrects the pg_depend information for the affected index.
+ */
+void
+IndexSetParentIndex(Relation partitionIdx, Oid parentOid)
+{
+	Relation	pg_inherits;
+	ScanKeyData	key[2];
+	SysScanDesc	scan;
+	Oid			partRelid = RelationGetRelid(partitionIdx);
+	HeapTuple	tuple;
+	bool		fix_dependencies;
+
+	/* Make sure this is an index */
+	Assert(partitionIdx->rd_rel->relkind == RELKIND_INDEX ||
+		   partitionIdx->rd_rel->relkind == RELKIND_PARTITIONED_INDEX);
+
+	/*
+	 * Scan pg_inherits for rows linking our index to some parent.
+	 */
+	pg_inherits = relation_open(InheritsRelationId, RowExclusiveLock);
+	ScanKeyInit(&key[0],
+				Anum_pg_inherits_inhrelid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(partRelid));
+	ScanKeyInit(&key[1],
+				Anum_pg_inherits_inhseqno,
+				BTEqualStrategyNumber, F_INT4EQ,
+				Int32GetDatum(1));
+	scan = systable_beginscan(pg_inherits, InheritsRelidSeqnoIndexId, true,
+							  NULL, 2, key);
+	tuple = systable_getnext(scan);
+
+	if (!HeapTupleIsValid(tuple))
+	{
+		if (parentOid == InvalidOid)
+		{
+			/*
+			 * No pg_inherits row, and no parent wanted: nothing to do in
+			 * this case.
+			 */
+			fix_dependencies = false;
+		}
+		else
+		{
+			Datum	values[Natts_pg_inherits];
+			bool	isnull[Natts_pg_inherits];
+
+			/*
+			 * No pg_inherits row exists, and we want a parent for this index,
+			 * so insert it.
+			 */
+			values[Anum_pg_inherits_inhrelid - 1] = ObjectIdGetDatum(partRelid);
+			values[Anum_pg_inherits_inhparent - 1] =
+				ObjectIdGetDatum(parentOid);
+			values[Anum_pg_inherits_inhseqno - 1] = Int32GetDatum(1);
+			memset(isnull, false, sizeof(isnull));
+
+			tuple = heap_form_tuple(RelationGetDescr(pg_inherits),
+									values, isnull);
+			CatalogTupleInsert(pg_inherits, tuple);
+
+			fix_dependencies = true;
+		}
+	}
+	else
+	{
+		Form_pg_inherits	inhForm = (Form_pg_inherits) GETSTRUCT(tuple);
+
+		if (parentOid == InvalidOid)
+		{
+			/*
+			 * There exists a pg_inherits row, which we want to clear; do so.
+			 */
+			CatalogTupleDelete(pg_inherits, &tuple->t_self);
+			fix_dependencies = true;
+		}
+		else
+		{
+			/*
+			 * A pg_inherits row exists.  If it's the same we want, then we're
+			 * good; if it differs, that amounts to a corrupt catalog and
+			 * should not happen.
+			 */
+			if (inhForm->inhparent != parentOid)
+			{
+				/* unexpected: we should not get called in this case */
+				elog(ERROR, "bogus pg_inherit row: inhrelid %u inhparent %u",
+					 inhForm->inhrelid, inhForm->inhparent);
+			}
+
+			/* already in the right state */
+			fix_dependencies = false;
+		}
+	}
+
+	/* done with pg_inherits */
+	systable_endscan(scan);
+	relation_close(pg_inherits, RowExclusiveLock);
+
+	if (fix_dependencies)
+	{
+		ObjectAddress partIdx;
+
+		/*
+		 * Insert/delete pg_depend rows.  If setting a parent, add an
+		 * INTERNAL_AUTO dependency to the parent index; if making standalone,
+		 * remove all existing rows and put back the regular dependency on the
+		 * table.
+		 */
+		ObjectAddressSet(partIdx, RelationRelationId, partRelid);
+
+		if (OidIsValid(parentOid))
+		{
+			ObjectAddress	parentIdx;
+
+			ObjectAddressSet(parentIdx, RelationRelationId, parentOid);
+			recordDependencyOn(&partIdx, &parentIdx, DEPENDENCY_INTERNAL_AUTO);
+		}
+		else
+		{
+			ObjectAddress	partitionTbl;
+
+			ObjectAddressSet(partitionTbl, RelationRelationId,
+							 partitionIdx->rd_index->indrelid);
+
+			deleteDependencyRecordsForClass(RelationRelationId, partRelid,
+											RelationRelationId,
+											DEPENDENCY_INTERNAL_AUTO);
+
+			recordDependencyOn(&partIdx, &partitionTbl, DEPENDENCY_AUTO);
+		}
+	}
+}
diff --git a/src/backend/commands/lockcmds.c b/src/backend/commands/lockcmds.c
index 9fe9e022b0..6479dcb31b 100644
--- a/src/backend/commands/lockcmds.c
+++ b/src/backend/commands/lockcmds.c
@@ -3,7 +3,7 @@
  * lockcmds.c
  *	  LOCK command support code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -96,7 +96,7 @@ RangeVarCallbackForLockTable(const RangeVar *rv, Oid relid, Oid oldrelid,
 	/* Check permissions. */
 	aclresult = LockTableAclCheck(relid, lockmode);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS, rv->relname);
+		aclcheck_error(aclresult, get_relkind_objtype(get_rel_relkind(relid)), rv->relname);
 }
 
 /*
@@ -127,7 +127,7 @@ LockTableRecurse(Oid reloid, LOCKMODE lockmode, bool nowait)
 
 			if (!relname)
 				continue;		/* child concurrently dropped, just skip it */
-			aclcheck_error(aclresult, ACL_KIND_CLASS, relname);
+			aclcheck_error(aclresult, get_relkind_objtype(get_rel_relkind(childreloid)), relname);
 		}
 
 		/* We have enough rights to lock the relation; do so. */
diff --git a/src/backend/commands/matview.c b/src/backend/commands/matview.c
index 7d57f97442..ab6a889b12 100644
--- a/src/backend/commands/matview.c
+++ b/src/backend/commands/matview.c
@@ -3,7 +3,7 @@
  * matview.c
  *	  materialized view support
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -727,6 +727,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
 			for (i = 0; i < numatts; i++)
 			{
 				int			attnum = indexStruct->indkey.values[i];
+				Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1);
 				Oid			type;
 				Oid			op;
 				const char *colname;
@@ -745,7 +746,7 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
 				if (foundUniqueIndex)
 					appendStringInfoString(&querybuf, " AND ");
 
-				colname = quote_identifier(NameStr((tupdesc->attrs[attnum - 1])->attname));
+				colname = quote_identifier(NameStr(attr->attname));
 				appendStringInfo(&querybuf, "newdata.%s ", colname);
 				type = attnumTypeId(matviewRel, attnum);
 				op = lookup_type_cache(type, TYPECACHE_EQ_OPR)->eq_opr;
diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c
index a31b1acb9c..e4b1369f19 100644
--- a/src/backend/commands/opclasscmds.c
+++ b/src/backend/commands/opclasscmds.c
@@ -4,7 +4,7 @@
  *
  *	  Routines for opclass (and opfamily) manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -18,6 +18,7 @@
 #include <limits.h>
 
 #include "access/genam.h"
+#include "access/hash.h"
 #include "access/heapam.h"
 #include "access/nbtree.h"
 #include "access/htup_details.h"
@@ -238,7 +239,7 @@ get_opclass_oid(Oid amID, List *opclassname, bool missing_ok)
  * Caller must have done permissions checks etc. already.
  */
 static ObjectAddress
-CreateOpFamily(char *amname, char *opfname, Oid namespaceoid, Oid amoid)
+CreateOpFamily(const char *amname, const char *opfname, Oid namespaceoid, Oid amoid)
 {
 	Oid			opfamilyoid;
 	Relation	rel;
@@ -352,7 +353,7 @@ DefineOpClass(CreateOpClassStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceoid));
 
 	/* Get necessary info about access method */
@@ -496,11 +497,11 @@ DefineOpClass(CreateOpClassStmt *stmt)
 				/* XXX this is unnecessary given the superuser check above */
 				/* Caller must own operator and its underlying function */
 				if (!pg_oper_ownercheck(operOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 								   get_opname(operOid));
 				funcOid = get_opcode(operOid);
 				if (!pg_proc_ownercheck(funcOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 								   get_func_name(funcOid));
 #endif
 
@@ -519,12 +520,12 @@ DefineOpClass(CreateOpClassStmt *stmt)
 							 errmsg("invalid procedure number %d,"
 									" must be between 1 and %d",
 									item->number, maxProcNumber)));
-				funcOid = LookupFuncWithArgs(item->name, false);
+				funcOid = LookupFuncWithArgs(OBJECT_FUNCTION, item->name, false);
 #ifdef NOT_USED
 				/* XXX this is unnecessary given the superuser check above */
 				/* Caller must own function */
 				if (!pg_proc_ownercheck(funcOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 								   get_func_name(funcOid));
 #endif
 
@@ -729,7 +730,7 @@ DefineOpFamily(CreateOpFamilyStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceoid));
 
 	/* Get access method OID, throwing an error if it doesn't exist. */
@@ -870,11 +871,11 @@ AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
 				/* XXX this is unnecessary given the superuser check above */
 				/* Caller must own operator and its underlying function */
 				if (!pg_oper_ownercheck(operOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 								   get_opname(operOid));
 				funcOid = get_opcode(operOid);
 				if (!pg_proc_ownercheck(funcOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 								   get_func_name(funcOid));
 #endif
 
@@ -893,12 +894,12 @@ AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid,
 							 errmsg("invalid procedure number %d,"
 									" must be between 1 and %d",
 									item->number, maxProcNumber)));
-				funcOid = LookupFuncWithArgs(item->name, false);
+				funcOid = LookupFuncWithArgs(OBJECT_FUNCTION, item->name, false);
 #ifdef NOT_USED
 				/* XXX this is unnecessary given the superuser check above */
 				/* Caller must own function */
 				if (!pg_proc_ownercheck(funcOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 								   get_func_name(funcOid));
 #endif
 
@@ -1127,9 +1128,11 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid)
 	procform = (Form_pg_proc) GETSTRUCT(proctup);
 
 	/*
-	 * btree comparison procs must be 2-arg procs returning int4, while btree
-	 * sortsupport procs must take internal and return void.  hash support
-	 * procs must be 1-arg procs returning int4.  Otherwise we don't know.
+	 * btree comparison procs must be 2-arg procs returning int4.  btree
+	 * sortsupport procs must take internal and return void.  btree in_range
+	 * procs must be 5-arg procs returning bool.  hash support proc 1 must be
+	 * a 1-arg proc returning int4, while proc 2 must be a 2-arg proc
+	 * returning int8.  Otherwise we don't know.
 	 */
 	if (amoid == BTREE_AM_OID)
 	{
@@ -1169,17 +1172,51 @@ assignProcTypes(OpFamilyMember *member, Oid amoid, Oid typeoid)
 			 * Can't infer lefttype/righttype from proc, so use default rule
 			 */
 		}
+		else if (member->number == BTINRANGE_PROC)
+		{
+			if (procform->pronargs != 5)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("btree in_range procedures must have five arguments")));
+			if (procform->prorettype != BOOLOID)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("btree in_range procedures must return boolean")));
+
+			/*
+			 * If lefttype/righttype isn't specified, use the proc's input
+			 * types (we look at the test-value and offset arguments)
+			 */
+			if (!OidIsValid(member->lefttype))
+				member->lefttype = procform->proargtypes.values[0];
+			if (!OidIsValid(member->righttype))
+				member->righttype = procform->proargtypes.values[2];
+		}
 	}
 	else if (amoid == HASH_AM_OID)
 	{
-		if (procform->pronargs != 1)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-					 errmsg("hash procedures must have one argument")));
-		if (procform->prorettype != INT4OID)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-					 errmsg("hash procedures must return integer")));
+		if (member->number == HASHSTANDARD_PROC)
+		{
+			if (procform->pronargs != 1)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("hash procedure 1 must have one argument")));
+			if (procform->prorettype != INT4OID)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("hash procedure 1 must return integer")));
+		}
+		else if (member->number == HASHEXTENDED_PROC)
+		{
+			if (procform->pronargs != 2)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("hash procedure 2 must have two arguments")));
+			if (procform->prorettype != INT8OID)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("hash procedure 2 must return bigint")));
+		}
 
 		/*
 		 * If lefttype/righttype isn't specified, use the proc's input type
diff --git a/src/backend/commands/operatorcmds.c b/src/backend/commands/operatorcmds.c
index 6674b41eec..585382d758 100644
--- a/src/backend/commands/operatorcmds.c
+++ b/src/backend/commands/operatorcmds.c
@@ -4,7 +4,7 @@
  *
  *	  Routines for operator manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -95,7 +95,7 @@ DefineOperator(List *names, List *parameters)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(oprNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(oprNamespace));
 
 	/*
@@ -105,7 +105,7 @@ DefineOperator(List *names, List *parameters)
 	{
 		DefElem    *defel = (DefElem *) lfirst(pl);
 
-		if (pg_strcasecmp(defel->defname, "leftarg") == 0)
+		if (strcmp(defel->defname, "leftarg") == 0)
 		{
 			typeName1 = defGetTypeName(defel);
 			if (typeName1->setof)
@@ -113,7 +113,7 @@ DefineOperator(List *names, List *parameters)
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 						 errmsg("SETOF type not allowed for operator argument")));
 		}
-		else if (pg_strcasecmp(defel->defname, "rightarg") == 0)
+		else if (strcmp(defel->defname, "rightarg") == 0)
 		{
 			typeName2 = defGetTypeName(defel);
 			if (typeName2->setof)
@@ -121,28 +121,28 @@ DefineOperator(List *names, List *parameters)
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 						 errmsg("SETOF type not allowed for operator argument")));
 		}
-		else if (pg_strcasecmp(defel->defname, "procedure") == 0)
+		else if (strcmp(defel->defname, "procedure") == 0)
 			functionName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "commutator") == 0)
+		else if (strcmp(defel->defname, "commutator") == 0)
 			commutatorName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "negator") == 0)
+		else if (strcmp(defel->defname, "negator") == 0)
 			negatorName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "restrict") == 0)
+		else if (strcmp(defel->defname, "restrict") == 0)
 			restrictionName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "join") == 0)
+		else if (strcmp(defel->defname, "join") == 0)
 			joinName = defGetQualifiedName(defel);
-		else if (pg_strcasecmp(defel->defname, "hashes") == 0)
+		else if (strcmp(defel->defname, "hashes") == 0)
 			canHash = defGetBoolean(defel);
-		else if (pg_strcasecmp(defel->defname, "merges") == 0)
+		else if (strcmp(defel->defname, "merges") == 0)
 			canMerge = defGetBoolean(defel);
 		/* These obsolete options are taken as meaning canMerge */
-		else if (pg_strcasecmp(defel->defname, "sort1") == 0)
+		else if (strcmp(defel->defname, "sort1") == 0)
 			canMerge = true;
-		else if (pg_strcasecmp(defel->defname, "sort2") == 0)
+		else if (strcmp(defel->defname, "sort2") == 0)
 			canMerge = true;
-		else if (pg_strcasecmp(defel->defname, "ltcmp") == 0)
+		else if (strcmp(defel->defname, "ltcmp") == 0)
 			canMerge = true;
-		else if (pg_strcasecmp(defel->defname, "gtcmp") == 0)
+		else if (strcmp(defel->defname, "gtcmp") == 0)
 			canMerge = true;
 		else
 		{
@@ -215,7 +215,7 @@ DefineOperator(List *names, List *parameters)
 	 */
 	aclresult = pg_proc_aclcheck(functionOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC,
+		aclcheck_error(aclresult, OBJECT_FUNCTION,
 					   NameListToString(functionName));
 
 	rettype = get_func_rettype(functionOid);
@@ -281,7 +281,7 @@ ValidateRestrictionEstimator(List *restrictionName)
 	/* Require EXECUTE rights for the estimator */
 	aclresult = pg_proc_aclcheck(restrictionOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC,
+		aclcheck_error(aclresult, OBJECT_FUNCTION,
 					   NameListToString(restrictionName));
 
 	return restrictionOid;
@@ -327,7 +327,7 @@ ValidateJoinEstimator(List *joinName)
 	/* Require EXECUTE rights for the estimator */
 	aclresult = pg_proc_aclcheck(joinOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC,
+		aclcheck_error(aclresult, OBJECT_FUNCTION,
 					   NameListToString(joinName));
 
 	return joinOid;
@@ -420,12 +420,12 @@ AlterOperator(AlterOperatorStmt *stmt)
 		else
 			param = defGetQualifiedName(defel);
 
-		if (pg_strcasecmp(defel->defname, "restrict") == 0)
+		if (strcmp(defel->defname, "restrict") == 0)
 		{
 			restrictionName = param;
 			updateRestriction = true;
 		}
-		else if (pg_strcasecmp(defel->defname, "join") == 0)
+		else if (strcmp(defel->defname, "join") == 0)
 		{
 			joinName = param;
 			updateJoin = true;
@@ -435,13 +435,13 @@ AlterOperator(AlterOperatorStmt *stmt)
 		 * The rest of the options that CREATE accepts cannot be changed.
 		 * Check for them so that we can give a meaningful error message.
 		 */
-		else if (pg_strcasecmp(defel->defname, "leftarg") == 0 ||
-				 pg_strcasecmp(defel->defname, "rightarg") == 0 ||
-				 pg_strcasecmp(defel->defname, "procedure") == 0 ||
-				 pg_strcasecmp(defel->defname, "commutator") == 0 ||
-				 pg_strcasecmp(defel->defname, "negator") == 0 ||
-				 pg_strcasecmp(defel->defname, "hashes") == 0 ||
-				 pg_strcasecmp(defel->defname, "merges") == 0)
+		else if (strcmp(defel->defname, "leftarg") == 0 ||
+				 strcmp(defel->defname, "rightarg") == 0 ||
+				 strcmp(defel->defname, "procedure") == 0 ||
+				 strcmp(defel->defname, "commutator") == 0 ||
+				 strcmp(defel->defname, "negator") == 0 ||
+				 strcmp(defel->defname, "hashes") == 0 ||
+				 strcmp(defel->defname, "merges") == 0)
 		{
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
@@ -457,7 +457,7 @@ AlterOperator(AlterOperatorStmt *stmt)
 
 	/* Check permissions. Must be owner. */
 	if (!pg_oper_ownercheck(oprId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_OPER,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_OPERATOR,
 					   NameStr(oprForm->oprname));
 
 	/*
diff --git a/src/backend/commands/policy.c b/src/backend/commands/policy.c
index 9ced4ee34c..280a14a101 100644
--- a/src/backend/commands/policy.c
+++ b/src/backend/commands/policy.c
@@ -3,7 +3,7 @@
  * policy.c
  *	  Commands for manipulating policies.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/commands/policy.c
@@ -78,7 +78,7 @@ RangeVarCallbackForPolicy(const RangeVar *rv, Oid relid, Oid oldrelid,
 
 	/* Must own relation. */
 	if (!pg_class_ownercheck(relid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, rv->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relid)), rv->relname);
 
 	/* No system table modifications unless explicitly allowed. */
 	if (!allowSystemTableMods && IsSystemClass(relid, classform))
diff --git a/src/backend/commands/portalcmds.c b/src/backend/commands/portalcmds.c
index 46369cf3db..6ecaea1443 100644
--- a/src/backend/commands/portalcmds.c
+++ b/src/backend/commands/portalcmds.c
@@ -9,7 +9,7 @@
  * storage management for portals (but doesn't run any queries in them).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -96,7 +96,7 @@ PerformCursorOpen(DeclareCursorStmt *cstmt, ParamListInfo params,
 	 */
 	portal = CreatePortal(cstmt->portalname, false, false);
 
-	oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+	oldContext = MemoryContextSwitchTo(portal->portalContext);
 
 	plan = copyObject(plan);
 
@@ -277,7 +277,7 @@ PortalCleanup(Portal portal)
 	 * since other mechanisms will take care of releasing executor resources,
 	 * and we can't be sure that ExecutorEnd itself wouldn't fail.
 	 */
-	queryDesc = PortalGetQueryDesc(portal);
+	queryDesc = portal->queryDesc;
 	if (queryDesc)
 	{
 		/*
@@ -294,21 +294,13 @@ PortalCleanup(Portal portal)
 
 			/* We must make the portal's resource owner current */
 			saveResourceOwner = CurrentResourceOwner;
-			PG_TRY();
-			{
-				if (portal->resowner)
-					CurrentResourceOwner = portal->resowner;
-				ExecutorFinish(queryDesc);
-				ExecutorEnd(queryDesc);
-				FreeQueryDesc(queryDesc);
-			}
-			PG_CATCH();
-			{
-				/* Ensure CurrentResourceOwner is restored on error */
-				CurrentResourceOwner = saveResourceOwner;
-				PG_RE_THROW();
-			}
-			PG_END_TRY();
+			if (portal->resowner)
+				CurrentResourceOwner = portal->resowner;
+
+			ExecutorFinish(queryDesc);
+			ExecutorEnd(queryDesc);
+			FreeQueryDesc(queryDesc);
+
 			CurrentResourceOwner = saveResourceOwner;
 		}
 	}
@@ -325,7 +317,7 @@ PortalCleanup(Portal portal)
 void
 PersistHoldablePortal(Portal portal)
 {
-	QueryDesc  *queryDesc = PortalGetQueryDesc(portal);
+	QueryDesc  *queryDesc = portal->queryDesc;
 	Portal		saveActivePortal;
 	ResourceOwner saveResourceOwner;
 	MemoryContext savePortalContext;
@@ -371,7 +363,7 @@ PersistHoldablePortal(Portal portal)
 		ActivePortal = portal;
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
-		PortalContext = PortalGetHeapMemory(portal);
+		PortalContext = portal->portalContext;
 
 		MemoryContextSwitchTo(PortalContext);
 
@@ -397,7 +389,7 @@ PersistHoldablePortal(Portal portal)
 		/* Fetch the result set into the tuplestore */
 		ExecutorRun(queryDesc, ForwardScanDirection, 0L, false);
 
-		(*queryDesc->dest->rDestroy) (queryDesc->dest);
+		queryDesc->dest->rDestroy(queryDesc->dest);
 		queryDesc->dest = NULL;
 
 		/*
@@ -458,10 +450,10 @@ PersistHoldablePortal(Portal portal)
 	PopActiveSnapshot();
 
 	/*
-	 * We can now release any subsidiary memory of the portal's heap context;
+	 * We can now release any subsidiary memory of the portal's context;
 	 * we'll never use it again.  The executor already dropped its context,
-	 * but this will clean up anything that glommed onto the portal's heap via
+	 * but this will clean up anything that glommed onto the portal's context via
 	 * PortalContext.
 	 */
-	MemoryContextDeleteChildren(PortalGetHeapMemory(portal));
+	MemoryContextDeleteChildren(portal->portalContext);
 }
diff --git a/src/backend/commands/prepare.c b/src/backend/commands/prepare.c
index be7222f003..b945b1556a 100644
--- a/src/backend/commands/prepare.c
+++ b/src/backend/commands/prepare.c
@@ -7,7 +7,7 @@
  * accessed via the extended FE/BE query protocol.
  *
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/commands/prepare.c
@@ -239,7 +239,7 @@ ExecuteQuery(ExecuteStmt *stmt, IntoClause *intoClause,
 	portal->visible = false;
 
 	/* Copy the plan's saved query string into the portal's memory */
-	query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
+	query_string = MemoryContextStrdup(portal->portalContext,
 									   entry->plansource->query_string);
 
 	/* Replan if needed, and increment plan refcount for portal */
@@ -399,10 +399,11 @@ EvaluateParams(PreparedStatement *pstmt, List *params,
 	/* we have static list of params, so no hooks needed */
 	paramLI->paramFetch = NULL;
 	paramLI->paramFetchArg = NULL;
+	paramLI->paramCompile = NULL;
+	paramLI->paramCompileArg = NULL;
 	paramLI->parserSetup = NULL;
 	paramLI->parserSetupArg = NULL;
 	paramLI->numParams = num_params;
-	paramLI->paramMask = NULL;
 
 	i = 0;
 	foreach(l, exprstates)
diff --git a/src/backend/commands/proclang.c b/src/backend/commands/proclang.c
index 9d2d43fe6b..2ec96242ae 100644
--- a/src/backend/commands/proclang.c
+++ b/src/backend/commands/proclang.c
@@ -3,7 +3,7 @@
  * proclang.c
  *	  PostgreSQL PROCEDURAL LANGUAGE support code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -97,7 +97,7 @@ CreateProceduralLanguage(CreatePLangStmt *stmt)
 						 errmsg("must be superuser to create procedural language \"%s\"",
 								stmt->plname)));
 			if (!pg_database_ownercheck(MyDatabaseId, GetUserId()))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 							   get_database_name(MyDatabaseId));
 		}
 
@@ -366,7 +366,7 @@ create_proc_lang(const char *languageName, bool replace,
 					(errcode(ERRCODE_DUPLICATE_OBJECT),
 					 errmsg("language \"%s\" already exists", languageName)));
 		if (!pg_language_ownercheck(HeapTupleGetOid(oldtup), languageOwner))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_LANGUAGE,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_LANGUAGE,
 						   languageName);
 
 		/*
@@ -513,7 +513,7 @@ find_language_template(const char *languageName)
 
 
 /*
- * This just returns TRUE if we have a valid template for a given language
+ * This just returns true if we have a valid template for a given language
  */
 bool
 PLTemplateExists(const char *languageName)
diff --git a/src/backend/commands/publicationcmds.c b/src/backend/commands/publicationcmds.c
index 610cb499d2..9c5aa9ebc2 100644
--- a/src/backend/commands/publicationcmds.c
+++ b/src/backend/commands/publicationcmds.c
@@ -3,7 +3,7 @@
  * publicationcmds.c
  *		publication manipulation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -103,7 +103,7 @@ parse_publication_options(List *options,
 			if (!SplitIdentifierString(publish, ',', &publish_list))
 				ereport(ERROR,
 						(errcode(ERRCODE_SYNTAX_ERROR),
-						 errmsg("invalid publish list")));
+						 errmsg("invalid list syntax for \"publish\" option")));
 
 			/* Process the option list. */
 			foreach(lc, publish_list)
@@ -150,7 +150,7 @@ CreatePublication(CreatePublicationStmt *stmt)
 	/* must have CREATE privilege on database */
 	aclresult = pg_database_aclcheck(MyDatabaseId, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_DATABASE,
+		aclcheck_error(aclresult, OBJECT_DATABASE,
 					   get_database_name(MyDatabaseId));
 
 	/* FOR ALL TABLES requires superuser */
@@ -403,7 +403,7 @@ AlterPublication(AlterPublicationStmt *stmt)
 
 	/* must be owner */
 	if (!pg_publication_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PUBLICATION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_PUBLICATION,
 					   stmt->pubname);
 
 	if (stmt->options)
@@ -582,7 +582,7 @@ PublicationAddTables(Oid pubid, List *rels, bool if_not_exists,
 
 		/* Must be owner of the table or superuser. */
 		if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
 
 		obj = publication_add_relation(pubid, rel, if_not_exists);
@@ -649,7 +649,7 @@ AlterPublicationOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 
 		/* Must be owner */
 		if (!pg_publication_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PUBLICATION,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_PUBLICATION,
 						   NameStr(form->pubname));
 
 		/* Must be able to become new owner */
@@ -658,7 +658,7 @@ AlterPublicationOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 		/* New owner must have CREATE privilege on database */
 		aclresult = pg_database_aclcheck(MyDatabaseId, newOwnerId, ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_DATABASE,
+			aclcheck_error(aclresult, OBJECT_DATABASE,
 						   get_database_name(MyDatabaseId));
 
 		if (form->puballtables && !superuser_arg(newOwnerId))
diff --git a/src/backend/commands/schemacmds.c b/src/backend/commands/schemacmds.c
index f9ea73f923..dc6cb46e4e 100644
--- a/src/backend/commands/schemacmds.c
+++ b/src/backend/commands/schemacmds.c
@@ -3,7 +3,7 @@
  * schemacmds.c
  *	  schema creation/manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -94,7 +94,7 @@ CreateSchemaCommand(CreateSchemaStmt *stmt, const char *queryString,
 	 */
 	aclresult = pg_database_aclcheck(MyDatabaseId, saved_uid, ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_DATABASE,
+		aclcheck_error(aclresult, OBJECT_DATABASE,
 					   get_database_name(MyDatabaseId));
 
 	check_is_member_of_role(saved_uid, owner_uid);
@@ -265,13 +265,13 @@ RenameSchema(const char *oldname, const char *newname)
 
 	/* must be owner */
 	if (!pg_namespace_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_NAMESPACE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SCHEMA,
 					   oldname);
 
 	/* must have CREATE privilege on database */
 	aclresult = pg_database_aclcheck(MyDatabaseId, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_DATABASE,
+		aclcheck_error(aclresult, OBJECT_DATABASE,
 					   get_database_name(MyDatabaseId));
 
 	if (!allowSystemTableMods && IsReservedName(newname))
@@ -373,7 +373,7 @@ AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId)
 
 		/* Otherwise, must be owner of the existing object */
 		if (!pg_namespace_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_NAMESPACE,
+			aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SCHEMA,
 						   NameStr(nspForm->nspname));
 
 		/* Must be able to become new owner */
@@ -391,7 +391,7 @@ AlterSchemaOwner_internal(HeapTuple tup, Relation rel, Oid newOwnerId)
 		aclresult = pg_database_aclcheck(MyDatabaseId, GetUserId(),
 										 ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_DATABASE,
+			aclcheck_error(aclresult, OBJECT_DATABASE,
 						   get_database_name(MyDatabaseId));
 
 		memset(repl_null, false, sizeof(repl_null));
diff --git a/src/backend/commands/seclabel.c b/src/backend/commands/seclabel.c
index 5f16d6cf1c..5ee46905d8 100644
--- a/src/backend/commands/seclabel.c
+++ b/src/backend/commands/seclabel.c
@@ -3,7 +3,7 @@
  * seclabel.c
  *	  routines to support security label feature.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
@@ -122,7 +122,7 @@ ExecSecLabelStmt(SecLabelStmt *stmt)
 	}
 
 	/* Provider gets control here, may throw ERROR to veto new label. */
-	(*provider->hook) (&address, stmt->label);
+	provider->hook(&address, stmt->label);
 
 	/* Apply new label. */
 	SetSecurityLabel(&address, provider->provider_name, stmt->label);
diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c
index 62937124ef..ef3ca8c00b 100644
--- a/src/backend/commands/sequence.c
+++ b/src/backend/commands/sequence.c
@@ -3,7 +3,7 @@
  * sequence.c
  *	  PostgreSQL sequences support code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1055,18 +1055,10 @@ lock_and_open_sequence(SeqTable seq)
 		ResourceOwner currentOwner;
 
 		currentOwner = CurrentResourceOwner;
-		PG_TRY();
-		{
-			CurrentResourceOwner = TopTransactionResourceOwner;
-			LockRelationOid(seq->relid, RowExclusiveLock);
-		}
-		PG_CATCH();
-		{
-			/* Ensure CurrentResourceOwner is restored on error */
-			CurrentResourceOwner = currentOwner;
-			PG_RE_THROW();
-		}
-		PG_END_TRY();
+		CurrentResourceOwner = TopTransactionResourceOwner;
+
+		LockRelationOid(seq->relid, RowExclusiveLock);
+
 		CurrentResourceOwner = currentOwner;
 
 		/* Flag that we have a lock in the current xact */
@@ -1941,7 +1933,7 @@ ResetSequenceCaches(void)
 void
 seq_mask(char *page, BlockNumber blkno)
 {
-	mask_page_lsn(page);
+	mask_page_lsn_and_checksum(page);
 
 	mask_unused_space(page);
 }
diff --git a/src/backend/commands/statscmds.c b/src/backend/commands/statscmds.c
index 476505512b..e90a14273b 100644
--- a/src/backend/commands/statscmds.c
+++ b/src/backend/commands/statscmds.c
@@ -3,7 +3,7 @@
  * statscmds.c
  *	  Commands for creating and altering extended statistics objects
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -141,7 +141,7 @@ CreateStatistics(CreateStatsStmt *stmt)
 
 		/* You must own the relation to create stats on it */
 		if (!pg_class_ownercheck(RelationGetRelid(rel), stxowner))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
 	}
 
@@ -180,7 +180,7 @@ CreateStatistics(CreateStatsStmt *stmt)
 		if (!HeapTupleIsValid(atttuple))
 			ereport(ERROR,
 					(errcode(ERRCODE_UNDEFINED_COLUMN),
-					 errmsg("column \"%s\" referenced in statistics does not exist",
+					 errmsg("column \"%s\" does not exist",
 							attname)));
 		attForm = (Form_pg_attribute) GETSTRUCT(atttuple);
 
@@ -195,8 +195,8 @@ CreateStatistics(CreateStatsStmt *stmt)
 		if (type->lt_opr == InvalidOid)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("column \"%s\" cannot be used in statistics because its type has no default btree operator class",
-							attname)));
+					 errmsg("column \"%s\" cannot be used in statistics because its type %s has no default btree operator class",
+							attname, format_type_be(attForm->atttypid))));
 
 		/* Make sure no more than STATS_MAX_DIMENSIONS columns are used */
 		if (numcols >= STATS_MAX_DIMENSIONS)
@@ -242,7 +242,7 @@ CreateStatistics(CreateStatsStmt *stmt)
 	stxkeys = buildint2vector(attnums, numcols);
 
 	/*
-	 * Parse the statistics types.
+	 * Parse the statistics kinds.
 	 */
 	build_ndistinct = false;
 	build_dependencies = false;
@@ -263,7 +263,7 @@ CreateStatistics(CreateStatsStmt *stmt)
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_SYNTAX_ERROR),
-					 errmsg("unrecognized statistic type \"%s\"",
+					 errmsg("unrecognized statistics kind \"%s\"",
 							type)));
 	}
 	/* If no statistic type was specified, build them all. */
diff --git a/src/backend/commands/subscriptioncmds.c b/src/backend/commands/subscriptioncmds.c
index 9bc1d178fc..9de5969302 100644
--- a/src/backend/commands/subscriptioncmds.c
+++ b/src/backend/commands/subscriptioncmds.c
@@ -3,7 +3,7 @@
  * subscriptioncmds.c
  *		subscription catalog manipulation functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -244,7 +244,7 @@ parse_subscription_options(List *options, bool *connect, bool *enabled_given,
 }
 
 /*
- * Auxiliary function to return a text array out of a list of String nodes.
+ * Auxiliary function to build a text array out of a list of String nodes.
  */
 static Datum
 publicationListToArray(List *publist)
@@ -259,12 +259,11 @@ publicationListToArray(List *publist)
 	/* Create memory context for temporary allocations. */
 	memcxt = AllocSetContextCreate(CurrentMemoryContext,
 								   "publicationListToArray to array",
-								   ALLOCSET_DEFAULT_MINSIZE,
-								   ALLOCSET_DEFAULT_INITSIZE,
-								   ALLOCSET_DEFAULT_MAXSIZE);
+								   ALLOCSET_DEFAULT_SIZES);
 	oldcxt = MemoryContextSwitchTo(memcxt);
 
-	datums = palloc(sizeof(text *) * list_length(publist));
+	datums = (Datum *) palloc(sizeof(Datum) * list_length(publist));
+
 	foreach(cell, publist)
 	{
 		char	   *name = strVal(lfirst(cell));
@@ -275,7 +274,7 @@ publicationListToArray(List *publist)
 		{
 			char	   *pname = strVal(lfirst(pcell));
 
-			if (name == pname)
+			if (pcell == cell)
 				break;
 
 			if (strcmp(name, pname) == 0)
@@ -292,6 +291,7 @@ publicationListToArray(List *publist)
 
 	arr = construct_array(datums, list_length(publist),
 						  TEXTOID, -1, false, 'i');
+
 	MemoryContextDelete(memcxt);
 
 	return PointerGetDatum(arr);
@@ -635,7 +635,7 @@ AlterSubscription(AlterSubscriptionStmt *stmt)
 
 	/* must be owner */
 	if (!pg_subscription_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_SUBSCRIPTION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SUBSCRIPTION,
 					   stmt->subname);
 
 	subid = HeapTupleGetOid(tup);
@@ -854,7 +854,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 
 	/* must be owner */
 	if (!pg_subscription_ownercheck(subid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_SUBSCRIPTION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SUBSCRIPTION,
 					   stmt->subname);
 
 	/* DROP hook for the subscription being removed */
@@ -909,9 +909,17 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 	ReleaseSysCache(tup);
 
 	/*
-	 * If we are dropping the replication slot, stop all the subscription
-	 * workers immediately, so that the slot becomes accessible.  Otherwise
-	 * just schedule the stopping for the end of the transaction.
+	 * Stop all the subscription workers immediately.
+	 *
+	 * This is necessary if we are dropping the replication slot, so that the
+	 * slot becomes accessible.
+	 *
+	 * It is also necessary if the subscription is disabled and was disabled
+	 * in the same transaction.  Then the workers haven't seen the disabling
+	 * yet and will still be running, leading to hangs later when we want to
+	 * drop the replication origin.  If the subscription was disabled before
+	 * this transaction, then there shouldn't be any workers left, so this
+	 * won't make a difference.
 	 *
 	 * New workers won't be started because we hold an exclusive lock on the
 	 * subscription till the end of the transaction.
@@ -923,10 +931,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 	{
 		LogicalRepWorker *w = (LogicalRepWorker *) lfirst(lc);
 
-		if (slotname)
-			logicalrep_worker_stop(w->subid, w->relid);
-		else
-			logicalrep_worker_stop_at_commit(w->subid, w->relid);
+		logicalrep_worker_stop(w->subid, w->relid);
 	}
 	list_free(subworkers);
 
@@ -959,7 +964,7 @@ DropSubscription(DropSubscriptionStmt *stmt, bool isTopLevel)
 	load_file("libpqwalreceiver", false);
 
 	initStringInfo(&cmd);
-	appendStringInfo(&cmd, "DROP_REPLICATION_SLOT %s", quote_identifier(slotname));
+	appendStringInfo(&cmd, "DROP_REPLICATION_SLOT %s WAIT", quote_identifier(slotname));
 
 	wrconn = walrcv_connect(conninfo, true, subname, &err);
 	if (wrconn == NULL)
@@ -1017,7 +1022,7 @@ AlterSubscriptionOwner_internal(Relation rel, HeapTuple tup, Oid newOwnerId)
 		return;
 
 	if (!pg_subscription_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_SUBSCRIPTION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SUBSCRIPTION,
 					   NameStr(form->subname));
 
 	/* New owner must be a superuser */
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 513a9ec485..74e020bffc 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -3,7 +3,7 @@
  * tablecmds.c
  *	  Commands for creating and altering table structures and settings
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -168,6 +168,8 @@ typedef struct AlteredTableInfo
 	bool		chgPersistence; /* T if SET LOGGED/UNLOGGED is used */
 	char		newrelpersistence;	/* if above is true */
 	Expr	   *partition_constraint;	/* for attach partition validation */
+	/* true, if validating default due to some other attach/detach */
+	bool		validate_default;
 	/* Objects to rebuild after completing ALTER TYPE operations */
 	List	   *changedConstraintOids;	/* OIDs of constraints to rebuild */
 	List	   *changedConstraintDefs;	/* string definitions of same */
@@ -264,6 +266,12 @@ static const struct dropmsgstrings dropmsgstringarray[] = {
 		gettext_noop("table \"%s\" does not exist, skipping"),
 		gettext_noop("\"%s\" is not a table"),
 	gettext_noop("Use DROP TABLE to remove a table.")},
+	{RELKIND_PARTITIONED_INDEX,
+		ERRCODE_UNDEFINED_OBJECT,
+		gettext_noop("index \"%s\" does not exist"),
+		gettext_noop("index \"%s\" does not exist, skipping"),
+		gettext_noop("\"%s\" is not an index"),
+	gettext_noop("Use DROP INDEX to remove an index.")},
 	{'\0', 0, NULL, NULL, NULL, NULL}
 };
 
@@ -282,6 +290,7 @@ struct DropRelationCallbackState
 #define		ATT_INDEX				0x0008
 #define		ATT_COMPOSITE_TYPE		0x0010
 #define		ATT_FOREIGN_TABLE		0x0020
+#define		ATT_PARTITIONED_INDEX	0x0040
 
 /*
  * Partition tables are expected to be dropped when the parent partitioned
@@ -301,7 +310,7 @@ static void MergeConstraintsIntoExisting(Relation child_rel, Relation parent_rel
 static void StoreCatalogInheritance(Oid relationId, List *supers,
 						bool child_is_partition);
 static void StoreCatalogInheritance1(Oid relationId, Oid parentOid,
-						 int16 seqNumber, Relation inhRelation,
+						 int32 seqNumber, Relation inhRelation,
 						 bool child_is_partition);
 static int	findAttrByName(const char *attributeName, List *schema);
 static void AlterIndexNamespaces(Relation classRel, Relation rel,
@@ -375,9 +384,9 @@ static ObjectAddress ATExecAddIdentity(Relation rel, const char *colName,
 static ObjectAddress ATExecSetIdentity(Relation rel, const char *colName,
 				  Node *def, LOCKMODE lockmode);
 static ObjectAddress ATExecDropIdentity(Relation rel, const char *colName, bool missing_ok, LOCKMODE lockmode);
-static void ATPrepSetStatistics(Relation rel, const char *colName,
+static void ATPrepSetStatistics(Relation rel, const char *colName, int16 colNum,
 					Node *newValue, LOCKMODE lockmode);
-static ObjectAddress ATExecSetStatistics(Relation rel, const char *colName,
+static ObjectAddress ATExecSetStatistics(Relation rel, const char *colName, int16 colNum,
 					Node *newValue, LOCKMODE lockmode);
 static ObjectAddress ATExecSetOptions(Relation rel, const char *colName,
 				 Node *options, bool isReset, LOCKMODE lockmode);
@@ -423,7 +432,8 @@ static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId,
 					 char *cmd, List **wqueue, LOCKMODE lockmode,
 					 bool rewrite);
 static void RebuildConstraintComment(AlteredTableInfo *tab, int pass,
-						 Oid objid, Relation rel, char *conname);
+						 Oid objid, Relation rel, List *domname,
+						 const char *conname);
 static void TryReuseIndex(Oid oldId, IndexStmt *stmt);
 static void TryReuseForeignKey(Oid oldId, Constraint *con);
 static void change_owner_fix_column_acls(Oid relationOid,
@@ -435,14 +445,14 @@ static ObjectAddress ATExecClusterOn(Relation rel, const char *indexName,
 static void ATExecDropCluster(Relation rel, LOCKMODE lockmode);
 static bool ATPrepChangePersistence(Relation rel, bool toLogged);
 static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel,
-					char *tablespacename, LOCKMODE lockmode);
+					const char *tablespacename, LOCKMODE lockmode);
 static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode);
 static void ATExecSetRelOptions(Relation rel, List *defList,
 					AlterTableType operation,
 					LOCKMODE lockmode);
-static void ATExecEnableDisableTrigger(Relation rel, char *trigname,
+static void ATExecEnableDisableTrigger(Relation rel, const char *trigname,
 						   char fires_when, bool skip_system, LOCKMODE lockmode);
-static void ATExecEnableDisableRule(Relation rel, char *rulename,
+static void ATExecEnableDisableRule(Relation rel, const char *rulename,
 						char fires_when, LOCKMODE lockmode);
 static void ATPrepAddInherit(Relation child_rel);
 static ObjectAddress ATExecAddInherit(Relation child_rel, RangeVar *parent, LOCKMODE lockmode);
@@ -465,15 +475,24 @@ static void RangeVarCallbackForDropRelation(const RangeVar *rel, Oid relOid,
 								Oid oldRelOid, void *arg);
 static void RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid,
 								 Oid oldrelid, void *arg);
-static bool is_partition_attr(Relation rel, AttrNumber attnum, bool *used_in_expr);
 static PartitionSpec *transformPartitionSpec(Relation rel, PartitionSpec *partspec, char *strategy);
 static void ComputePartitionAttrs(Relation rel, List *partParams, AttrNumber *partattrs,
-					  List **partexprs, Oid *partopclass, Oid *partcollation);
+					  List **partexprs, Oid *partopclass, Oid *partcollation, char strategy);
 static void CreateInheritance(Relation child_rel, Relation parent_rel);
 static void RemoveInheritance(Relation child_rel, Relation parent_rel);
 static ObjectAddress ATExecAttachPartition(List **wqueue, Relation rel,
 					  PartitionCmd *cmd);
+static void AttachPartitionEnsureIndexes(Relation rel, Relation attachrel);
+static void ValidatePartitionConstraints(List **wqueue, Relation scanrel,
+							 List *scanrel_children,
+							 List *partConstraint,
+							 bool validate_default);
 static ObjectAddress ATExecDetachPartition(Relation rel, RangeVar *name);
+static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relation rel,
+						 RangeVar *name);
+static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl);
+static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx,
+					  Relation partitionTbl);
 
 
 /* ----------------------------------------------------------------
@@ -582,7 +601,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 		aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(),
 										   ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+			aclcheck_error(aclresult, OBJECT_TABLESPACE,
 						   get_tablespace_name(tablespaceId));
 	}
 
@@ -680,8 +699,10 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	foreach(listptr, stmt->tableElts)
 	{
 		ColumnDef  *colDef = lfirst(listptr);
+		Form_pg_attribute attr;
 
 		attnum++;
+		attr = TupleDescAttr(descriptor, attnum - 1);
 
 		if (colDef->raw_default != NULL)
 		{
@@ -693,7 +714,7 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 			rawEnt->attnum = attnum;
 			rawEnt->raw_default = colDef->raw_default;
 			rawDefaults = lappend(rawDefaults, rawEnt);
-			descriptor->attrs[attnum - 1]->atthasdef = true;
+			attr->atthasdef = true;
 		}
 		else if (colDef->cooked_default != NULL)
 		{
@@ -710,11 +731,11 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 			cooked->inhcount = 0;	/* ditto */
 			cooked->is_no_inherit = false;
 			cookedDefaults = lappend(cookedDefaults, cooked);
-			descriptor->attrs[attnum - 1]->atthasdef = true;
+			attr->atthasdef = true;
 		}
 
 		if (colDef->identity)
-			descriptor->attrs[attnum - 1]->attidentity = colDef->identity;
+			attr->attidentity = colDef->identity;
 	}
 
 	/*
@@ -767,8 +788,10 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 	{
 		PartitionBoundSpec *bound;
 		ParseState *pstate;
-		Oid			parentId = linitial_oid(inheritOids);
-		Relation	parent;
+		Oid			parentId = linitial_oid(inheritOids),
+					defaultPartOid;
+		Relation	parent,
+					defaultRel = NULL;
 
 		/* Already have strong enough lock on the parent */
 		parent = heap_open(parentId, NoLock);
@@ -783,6 +806,30 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 					 errmsg("\"%s\" is not partitioned",
 							RelationGetRelationName(parent))));
 
+		/*
+		 * The partition constraint of the default partition depends on the
+		 * partition bounds of every other partition. It is possible that
+		 * another backend might be about to execute a query on the default
+		 * partition table, and that the query relies on previously cached
+		 * default partition constraints. We must therefore take a table lock
+		 * strong enough to prevent all queries on the default partition from
+		 * proceeding until we commit and send out a shared-cache-inval notice
+		 * that will make them update their index lists.
+		 *
+		 * Order of locking: The relation being added won't be visible to
+		 * other backends until it is committed, hence here in
+		 * DefineRelation() the order of locking the default partition and the
+		 * relation being added does not matter. But at all other places we
+		 * need to lock the default relation before we lock the relation being
+		 * added or removed i.e. we should take the lock in same order at all
+		 * the places such that lock parent, lock default partition and then
+		 * lock the partition so as to avoid a deadlock.
+		 */
+		defaultPartOid =
+			get_default_oid_from_partdesc(RelationGetPartitionDesc(parent));
+		if (OidIsValid(defaultPartOid))
+			defaultRel = heap_open(defaultPartOid, AccessExclusiveLock);
+
 		/* Tranform the bound values */
 		pstate = make_parsestate(NULL);
 		pstate->p_sourcetext = queryString;
@@ -791,14 +838,31 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 
 		/*
 		 * Check first that the new partition's bound is valid and does not
-		 * overlap with any of existing partitions of the parent - note that
-		 * it does not return on error.
+		 * overlap with any of existing partitions of the parent.
 		 */
 		check_new_partition_bound(relname, parent, bound);
 
+		/*
+		 * If the default partition exists, its partition constraints will
+		 * change after the addition of this new partition such that it won't
+		 * allow any row that qualifies for this new partition. So, check that
+		 * the existing data in the default partition satisfies the constraint
+		 * as it will exist after adding this partition.
+		 */
+		if (OidIsValid(defaultPartOid))
+		{
+			check_default_allows_bound(parent, defaultRel, bound);
+			/* Keep the lock until commit. */
+			heap_close(defaultRel, NoLock);
+		}
+
 		/* Update the pg_class entry. */
 		StorePartitionBound(rel, parent, bound);
 
+		/* Update the default partition oid */
+		if (bound->is_default)
+			update_default_partition_oid(RelationGetRelid(parent), relationId);
+
 		heap_close(parent, NoLock);
 
 		/*
@@ -842,10 +906,60 @@ DefineRelation(CreateStmt *stmt, char relkind, Oid ownerId,
 
 		ComputePartitionAttrs(rel, stmt->partspec->partParams,
 							  partattrs, &partexprs, partopclass,
-							  partcollation);
+							  partcollation, strategy);
 
 		StorePartitionKey(rel, strategy, partnatts, partattrs, partexprs,
 						  partopclass, partcollation);
+
+		/* make it all visible */
+		CommandCounterIncrement();
+	}
+
+	/*
+	 * If we're creating a partition, create now all the indexes defined in
+	 * the parent.  We can't do it earlier, because DefineIndex wants to know
+	 * the partition key which we just stored.
+	 */
+	if (stmt->partbound)
+	{
+		Oid			parentId = linitial_oid(inheritOids);
+		Relation	parent;
+		List	   *idxlist;
+		ListCell   *cell;
+
+		/* Already have strong enough lock on the parent */
+		parent = heap_open(parentId, NoLock);
+		idxlist = RelationGetIndexList(parent);
+
+		/*
+		 * For each index in the parent table, create one in the partition
+		 */
+		foreach(cell, idxlist)
+		{
+			Relation	idxRel = index_open(lfirst_oid(cell), AccessShareLock);
+			AttrNumber *attmap;
+			IndexStmt  *idxstmt;
+			Oid			constraintOid;
+
+			attmap = convert_tuples_by_name_map(RelationGetDescr(rel),
+												RelationGetDescr(parent),
+												gettext_noop("could not convert row type"));
+			idxstmt =
+				generateClonedIndexStmt(NULL, RelationGetRelid(rel), idxRel,
+										attmap, RelationGetDescr(rel)->natts,
+										&constraintOid);
+			DefineIndex(RelationGetRelid(rel),
+						idxstmt,
+						InvalidOid,
+						RelationGetRelid(idxRel),
+						constraintOid,
+						false, false, false, false, false);
+
+			index_close(idxRel, AccessShareLock);
+		}
+
+		list_free(idxlist);
+		heap_close(parent, NoLock);
 	}
 
 	/*
@@ -1128,10 +1242,13 @@ RangeVarCallbackForDropRelation(const RangeVar *rel, Oid relOid, Oid oldRelOid,
 	 * but RemoveRelations() can only pass one relkind for a given relation.
 	 * It chooses RELKIND_RELATION for both regular and partitioned tables.
 	 * That means we must be careful before giving the wrong type error when
-	 * the relation is RELKIND_PARTITIONED_TABLE.
+	 * the relation is RELKIND_PARTITIONED_TABLE.  An equivalent problem
+	 * exists with indexes.
 	 */
 	if (classform->relkind == RELKIND_PARTITIONED_TABLE)
 		expected_relkind = RELKIND_RELATION;
+	else if (classform->relkind == RELKIND_PARTITIONED_INDEX)
+		expected_relkind = RELKIND_INDEX;
 	else
 		expected_relkind = classform->relkind;
 
@@ -1141,7 +1258,7 @@ RangeVarCallbackForDropRelation(const RangeVar *rel, Oid relOid, Oid oldRelOid,
 	/* Allow DROP to either table owner or schema owner */
 	if (!pg_class_ownercheck(relOid, GetUserId()) &&
 		!pg_namespace_ownercheck(classform->relnamespace, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relOid)),
 					   rel->relname);
 
 	if (!allowSystemTableMods && IsSystemClass(relOid, classform))
@@ -1159,7 +1276,8 @@ RangeVarCallbackForDropRelation(const RangeVar *rel, Oid relOid, Oid oldRelOid,
 	 * we do it the other way around.  No error if we don't find a pg_index
 	 * entry, though --- the relation may have been dropped.
 	 */
-	if (relkind == RELKIND_INDEX && relOid != oldRelOid)
+	if ((relkind == RELKIND_INDEX || relkind == RELKIND_PARTITIONED_INDEX) &&
+		relOid != oldRelOid)
 	{
 		state->heapOid = IndexGetRelation(relOid, true);
 		if (OidIsValid(state->heapOid))
@@ -1251,7 +1369,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 					 errmsg("cannot truncate only a partitioned table"),
-					 errhint("Do not specify the ONLY keyword, or use truncate only on the partitions directly.")));
+					 errhint("Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly.")));
 	}
 
 	/*
@@ -1323,7 +1441,7 @@ ExecuteTruncate(TruncateStmt *stmt)
 
 				/* This check must match AlterSequence! */
 				if (!pg_class_ownercheck(seq_relid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+					aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_SEQUENCE,
 								   RelationGetRelationName(seq_rel));
 
 				seq_relids = lappend_oid(seq_relids, seq_relid);
@@ -1511,7 +1629,7 @@ truncate_check_rel(Relation rel)
 	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
 								  ACL_TRUNCATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
+		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 
 	if (!allowSystemTableMods && IsSystemRelation(rel))
@@ -1797,7 +1915,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 		 * demand that creator of a child table own the parent.
 		 */
 		if (!pg_class_ownercheck(RelationGetRelid(relation), GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(relation->rd_rel->relkind),
 						   RelationGetRelationName(relation));
 
 		/*
@@ -1828,7 +1946,8 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
 		for (parent_attno = 1; parent_attno <= tupleDesc->natts;
 			 parent_attno++)
 		{
-			Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
+			Form_pg_attribute attribute = TupleDescAttr(tupleDesc,
+														parent_attno - 1);
 			char	   *attributeName = NameStr(attribute->attname);
 			int			exist_attno;
 			ColumnDef  *def;
@@ -2254,7 +2373,7 @@ MergeAttributes(List *schema, List *supers, char relpersistence,
  *
  * constraints is a list of CookedConstraint structs for previous constraints.
  *
- * Returns TRUE if merged (constraint is a duplicate), or FALSE if it's
+ * Returns true if merged (constraint is a duplicate), or false if it's
  * got a so-far-unique name, or throws error if conflict.
  */
 static bool
@@ -2300,7 +2419,7 @@ StoreCatalogInheritance(Oid relationId, List *supers,
 						bool child_is_partition)
 {
 	Relation	relation;
-	int16		seqNumber;
+	int32		seqNumber;
 	ListCell   *entry;
 
 	/*
@@ -2341,30 +2460,14 @@ StoreCatalogInheritance(Oid relationId, List *supers,
  */
 static void
 StoreCatalogInheritance1(Oid relationId, Oid parentOid,
-						 int16 seqNumber, Relation inhRelation,
+						 int32 seqNumber, Relation inhRelation,
 						 bool child_is_partition)
 {
-	TupleDesc	desc = RelationGetDescr(inhRelation);
-	Datum		values[Natts_pg_inherits];
-	bool		nulls[Natts_pg_inherits];
 	ObjectAddress childobject,
 				parentobject;
-	HeapTuple	tuple;
-
-	/*
-	 * Make the pg_inherits entry
-	 */
-	values[Anum_pg_inherits_inhrelid - 1] = ObjectIdGetDatum(relationId);
-	values[Anum_pg_inherits_inhparent - 1] = ObjectIdGetDatum(parentOid);
-	values[Anum_pg_inherits_inhseqno - 1] = Int16GetDatum(seqNumber);
 
-	memset(nulls, 0, sizeof(nulls));
-
-	tuple = heap_form_tuple(desc, values, nulls);
-
-	CatalogTupleInsert(inhRelation, tuple);
-
-	heap_freetuple(tuple);
+	/* store the pg_inherits row */
+	StoreSingleInheritance(relationId, parentOid, seqNumber);
 
 	/*
 	 * Store a dependency too
@@ -2488,6 +2591,7 @@ renameatt_check(Oid myrelid, Form_pg_class classform, bool recursing)
 		relkind != RELKIND_MATVIEW &&
 		relkind != RELKIND_COMPOSITE_TYPE &&
 		relkind != RELKIND_INDEX &&
+		relkind != RELKIND_PARTITIONED_INDEX &&
 		relkind != RELKIND_FOREIGN_TABLE &&
 		relkind != RELKIND_PARTITIONED_TABLE)
 		ereport(ERROR,
@@ -2499,7 +2603,7 @@ renameatt_check(Oid myrelid, Form_pg_class classform, bool recursing)
 	 * permissions checking.  only the owner of a class can change its schema.
 	 */
 	if (!pg_class_ownercheck(myrelid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(myrelid)),
 					   NameStr(classform->relname));
 	if (!allowSystemTableMods && IsSystemClass(myrelid, classform))
 		ereport(ERROR,
@@ -2967,7 +3071,8 @@ RenameRelationInternal(Oid myrelid, const char *newrelname, bool is_internal)
 	/*
 	 * Also rename the associated constraint, if any.
 	 */
-	if (targetrelation->rd_rel->relkind == RELKIND_INDEX)
+	if (targetrelation->rd_rel->relkind == RELKIND_INDEX ||
+		targetrelation->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 	{
 		Oid			constraintId = get_index_constraint(myrelid);
 
@@ -3021,6 +3126,7 @@ CheckTableNotInUse(Relation rel, const char *stmt)
 						stmt, RelationGetRelationName(rel))));
 
 	if (rel->rd_rel->relkind != RELKIND_INDEX &&
+		rel->rd_rel->relkind != RELKIND_PARTITIONED_INDEX &&
 		AfterTriggerPendingOnRel(RelationGetRelid(rel)))
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_IN_USE),
@@ -3267,6 +3373,7 @@ AlterTableGetLockLevel(List *cmds)
 			case AT_ProcessedConstraint:	/* becomes AT_AddConstraint */
 			case AT_AddConstraintRecurse:	/* becomes AT_AddConstraint */
 			case AT_ReAddConstraint:	/* becomes AT_AddConstraint */
+			case AT_ReAddDomainConstraint:	/* becomes AT_AddConstraint */
 				if (IsA(cmd->def, Constraint))
 				{
 					Constraint *con = (Constraint *) cmd->def;
@@ -3517,7 +3624,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 		case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
 			ATSimpleRecursion(wqueue, rel, cmd, recurse, lockmode);
 			/* Performs own permission checks */
-			ATPrepSetStatistics(rel, cmd->name, cmd->def, lockmode);
+			ATPrepSetStatistics(rel, cmd->name, cmd->num, cmd->def, lockmode);
 			pass = AT_PASS_MISC;
 			break;
 		case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
@@ -3711,6 +3818,10 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
 			pass = AT_PASS_MISC;
 			break;
 		case AT_AttachPartition:
+			ATSimplePermissions(rel, ATT_TABLE | ATT_PARTITIONED_INDEX);
+			/* No command-specific prep needed */
+			pass = AT_PASS_MISC;
+			break;
 		case AT_DetachPartition:
 			ATSimplePermissions(rel, ATT_TABLE);
 			/* No command-specific prep needed */
@@ -3767,7 +3878,9 @@ ATRewriteCatalogs(List **wqueue, LOCKMODE lockmode)
 			rel = relation_open(tab->relid, NoLock);
 
 			foreach(lcmd, subcmds)
-				ATExecCmd(wqueue, tab, rel, (AlterTableCmd *) lfirst(lcmd), lockmode);
+				ATExecCmd(wqueue, tab, rel,
+						  castNode(AlterTableCmd, lfirst(lcmd)),
+						  lockmode);
 
 			/*
 			 * After the ALTER TYPE pass, do cleanup work (this is not done in
@@ -3840,7 +3953,7 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			address = ATExecSetNotNull(tab, rel, cmd->name, lockmode);
 			break;
 		case AT_SetStatistics:	/* ALTER COLUMN SET STATISTICS */
-			address = ATExecSetStatistics(rel, cmd->name, cmd->def, lockmode);
+			address = ATExecSetStatistics(rel, cmd->name, cmd->num, cmd->def, lockmode);
 			break;
 		case AT_SetOptions:		/* ALTER COLUMN SET ( options ) */
 			address = ATExecSetOptions(rel, cmd->name, cmd->def, false, lockmode);
@@ -3884,6 +3997,13 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 				ATExecAddConstraint(wqueue, tab, rel, (Constraint *) cmd->def,
 									true, true, lockmode);
 			break;
+		case AT_ReAddDomainConstraint:	/* Re-add pre-existing domain check
+										 * constraint */
+			address =
+				AlterDomainAddConstraint(((AlterDomainStmt *) cmd->def)->typeName,
+										 ((AlterDomainStmt *) cmd->def)->def,
+										 NULL);
+			break;
 		case AT_ReAddComment:	/* Re-add existing comment */
 			address = CommentObject((CommentStmt *) cmd->def);
 			break;
@@ -4050,9 +4170,15 @@ ATExecCmd(List **wqueue, AlteredTableInfo *tab, Relation rel,
 			ATExecGenericOptions(rel, (List *) cmd->def);
 			break;
 		case AT_AttachPartition:
-			ATExecAttachPartition(wqueue, rel, (PartitionCmd *) cmd->def);
+			if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+				ATExecAttachPartition(wqueue, rel, (PartitionCmd *) cmd->def);
+			else
+				ATExecAttachPartitionIdx(wqueue, rel,
+										 ((PartitionCmd *) cmd->def)->name);
 			break;
 		case AT_DetachPartition:
+			/* ATPrepCmd ensures it must be a table */
+			Assert(rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
 			ATExecDetachPartition(rel, ((PartitionCmd *) cmd->def)->name);
 			break;
 		default:				/* oops */
@@ -4086,9 +4212,13 @@ ATRewriteTables(AlterTableStmt *parsetree, List **wqueue, LOCKMODE lockmode)
 	{
 		AlteredTableInfo *tab = (AlteredTableInfo *) lfirst(ltab);
 
-		/* Foreign tables have no storage, nor do partitioned tables. */
+		/*
+		 * Foreign tables have no storage, nor do partitioned tables and
+		 * indexes.
+		 */
 		if (tab->relkind == RELKIND_FOREIGN_TABLE ||
-			tab->relkind == RELKIND_PARTITIONED_TABLE)
+			tab->relkind == RELKIND_PARTITIONED_TABLE ||
+			tab->relkind == RELKIND_PARTITIONED_INDEX)
 			continue;
 
 		/*
@@ -4412,8 +4542,9 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 		 */
 		for (i = 0; i < newTupDesc->natts; i++)
 		{
-			if (newTupDesc->attrs[i]->attnotnull &&
-				!newTupDesc->attrs[i]->attisdropped)
+			Form_pg_attribute attr = TupleDescAttr(newTupDesc, i);
+
+			if (attr->attnotnull && !attr->attisdropped)
 				notnull_attrs = lappend_int(notnull_attrs, i);
 		}
 		if (notnull_attrs)
@@ -4477,7 +4608,7 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 		 */
 		for (i = 0; i < newTupDesc->natts; i++)
 		{
-			if (newTupDesc->attrs[i]->attisdropped)
+			if (TupleDescAttr(newTupDesc, i)->attisdropped)
 				dropped_attrs = lappend_int(dropped_attrs, i);
 		}
 
@@ -4551,11 +4682,15 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 				int			attn = lfirst_int(l);
 
 				if (heap_attisnull(tuple, attn + 1))
+				{
+					Form_pg_attribute attr = TupleDescAttr(newTupDesc, attn);
+
 					ereport(ERROR,
 							(errcode(ERRCODE_NOT_NULL_VIOLATION),
 							 errmsg("column \"%s\" contains null values",
-									NameStr(newTupDesc->attrs[attn]->attname)),
+									NameStr(attr->attname)),
 							 errtablecol(oldrel, attn + 1)));
+				}
 			}
 
 			foreach(l, tab->constraints)
@@ -4582,9 +4717,16 @@ ATRewriteTable(AlteredTableInfo *tab, Oid OIDNewHeap, LOCKMODE lockmode)
 			}
 
 			if (partqualstate && !ExecCheck(partqualstate, econtext))
-				ereport(ERROR,
-						(errcode(ERRCODE_CHECK_VIOLATION),
-						 errmsg("partition constraint is violated by some row")));
+			{
+				if (tab->validate_default)
+					ereport(ERROR,
+							(errcode(ERRCODE_CHECK_VIOLATION),
+							 errmsg("updated partition constraint for default partition would be violated by some row")));
+				else
+					ereport(ERROR,
+							(errcode(ERRCODE_CHECK_VIOLATION),
+							 errmsg("partition constraint is violated by some row")));
+			}
 
 			/* Write the tuple out to the new relation */
 			if (newrel)
@@ -4678,6 +4820,9 @@ ATSimplePermissions(Relation rel, int allowed_targets)
 		case RELKIND_INDEX:
 			actual_target = ATT_INDEX;
 			break;
+		case RELKIND_PARTITIONED_INDEX:
+			actual_target = ATT_PARTITIONED_INDEX;
+			break;
 		case RELKIND_COMPOSITE_TYPE:
 			actual_target = ATT_COMPOSITE_TYPE;
 			break;
@@ -4695,7 +4840,7 @@ ATSimplePermissions(Relation rel, int allowed_targets)
 
 	/* Permissions checks */
 	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 
 	if (!allowSystemTableMods && IsSystemRelation(rel))
@@ -4922,7 +5067,7 @@ find_composite_type_dependencies(Oid typeOid, Relation origRelation,
 			continue;
 
 		rel = relation_open(pg_depend->objid, AccessShareLock);
-		att = rel->rd_att->attrs[pg_depend->objsubid - 1];
+		att = TupleDescAttr(rel->rd_att, pg_depend->objsubid - 1);
 
 		if (rel->rd_rel->relkind == RELKIND_RELATION ||
 			rel->rd_rel->relkind == RELKIND_MATVIEW ||
@@ -5027,6 +5172,8 @@ find_typed_table_dependencies(Oid typeOid, const char *typeName, DropBehavior be
  * isn't suitable, throw an error.  Currently, we require that the type
  * originated with CREATE TYPE AS.  We could support any row type, but doing so
  * would require handling a number of extra corner cases in the DDL commands.
+ * (Also, allowing domain-over-composite would open up a can of worms about
+ * whether and how the domain's constraints should apply to derived tables.)
  */
 void
 check_of_type(HeapTuple typetuple)
@@ -5342,7 +5489,21 @@ ATExecAddColumn(List **wqueue, AlteredTableInfo *tab, Relation rel,
 	if (relkind != RELKIND_VIEW && relkind != RELKIND_COMPOSITE_TYPE
 		&& relkind != RELKIND_FOREIGN_TABLE && attribute.attnum > 0)
 	{
-		defval = (Expr *) build_column_default(rel, attribute.attnum);
+		/*
+		 * For an identity column, we can't use build_column_default(),
+		 * because the sequence ownership isn't set yet.  So do it manually.
+		 */
+		if (colDef->identity)
+		{
+			NextValueExpr *nve = makeNode(NextValueExpr);
+
+			nve->seqid = RangeVarGetRelid(colDef->identitySequence, NoLock, false);
+			nve->typeId = typeOid;
+
+			defval = (Expr *) nve;
+		}
+		else
+			defval = (Expr *) build_column_default(rel, attribute.attnum);
 
 		if (!defval && DomainHasConstraints(typeOid))
 		{
@@ -5688,7 +5849,7 @@ ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)
 		AttrNumber	parent_attnum;
 
 		parent_attnum = get_attnum(parentId, colName);
-		if (tupDesc->attrs[parent_attnum - 1]->attnotnull)
+		if (TupleDescAttr(tupDesc, parent_attnum - 1)->attnotnull)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 					 errmsg("column \"%s\" is marked NOT NULL in parent table",
@@ -5701,7 +5862,7 @@ ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)
 	 */
 	if (((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
 	{
-		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = FALSE;
+		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = false;
 
 		CatalogTupleUpdate(attr_rel, &tuple->t_self, tuple);
 
@@ -5721,9 +5882,6 @@ ATExecDropNotNull(Relation rel, const char *colName, LOCKMODE lockmode)
 
 /*
  * ALTER TABLE ALTER COLUMN SET NOT NULL
- *
- * Return the address of the modified column.  If the column was already NOT
- * NULL, InvalidObjectAddress is returned.
  */
 
 static void
@@ -5746,6 +5904,10 @@ ATPrepSetNotNull(Relation rel, bool recurse, bool recursing)
 	}
 }
 
+/*
+ * Return the address of the modified column.  If the column was already NOT
+ * NULL, InvalidObjectAddress is returned.
+ */
 static ObjectAddress
 ATExecSetNotNull(AlteredTableInfo *tab, Relation rel,
 				 const char *colName, LOCKMODE lockmode)
@@ -5782,7 +5944,7 @@ ATExecSetNotNull(AlteredTableInfo *tab, Relation rel,
 	 */
 	if (!((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull)
 	{
-		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = TRUE;
+		((Form_pg_attribute) GETSTRUCT(tuple))->attnotnull = true;
 
 		CatalogTupleUpdate(attr_rel, &tuple->t_self, tuple);
 
@@ -6107,7 +6269,7 @@ ATExecDropIdentity(Relation rel, const char *colName, bool missing_ok, LOCKMODE
  * ALTER TABLE ALTER COLUMN SET STATISTICS
  */
 static void
-ATPrepSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode)
+ATPrepSetStatistics(Relation rel, const char *colName, int16 colNum, Node *newValue, LOCKMODE lockmode)
 {
 	/*
 	 * We do our own permission checking because (a) we want to allow SET
@@ -6118,6 +6280,7 @@ ATPrepSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE
 	if (rel->rd_rel->relkind != RELKIND_RELATION &&
 		rel->rd_rel->relkind != RELKIND_MATVIEW &&
 		rel->rd_rel->relkind != RELKIND_INDEX &&
+		rel->rd_rel->relkind != RELKIND_PARTITIONED_INDEX &&
 		rel->rd_rel->relkind != RELKIND_FOREIGN_TABLE &&
 		rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
 		ereport(ERROR,
@@ -6125,9 +6288,20 @@ ATPrepSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE
 				 errmsg("\"%s\" is not a table, materialized view, index, or foreign table",
 						RelationGetRelationName(rel))));
 
+	/*
+	 * We allow referencing columns by numbers only for indexes, since table
+	 * column numbers could contain gaps if columns are later dropped.
+	 */
+	if (rel->rd_rel->relkind != RELKIND_INDEX &&
+		rel->rd_rel->relkind != RELKIND_PARTITIONED_INDEX &&
+		!colName)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot refer to non-index column by number")));
+
 	/* Permissions checks */
 	if (!pg_class_ownercheck(RelationGetRelid(rel), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 }
 
@@ -6135,7 +6309,7 @@ ATPrepSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE
  * Return value is the address of the modified column
  */
 static ObjectAddress
-ATExecSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE lockmode)
+ATExecSetStatistics(Relation rel, const char *colName, int16 colNum, Node *newValue, LOCKMODE lockmode)
 {
 	int			newtarget;
 	Relation	attrelation;
@@ -6168,13 +6342,27 @@ ATExecSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE
 
 	attrelation = heap_open(AttributeRelationId, RowExclusiveLock);
 
-	tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+	if (colName)
+	{
+		tuple = SearchSysCacheCopyAttName(RelationGetRelid(rel), colName);
+
+		if (!HeapTupleIsValid(tuple))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column \"%s\" of relation \"%s\" does not exist",
+							colName, RelationGetRelationName(rel))));
+	}
+	else
+	{
+		tuple = SearchSysCacheCopyAttNum(RelationGetRelid(rel), colNum);
+
+		if (!HeapTupleIsValid(tuple))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("column number %d of relation \"%s\" does not exist",
+							colNum, RelationGetRelationName(rel))));
+	}
 
-	if (!HeapTupleIsValid(tuple))
-		ereport(ERROR,
-				(errcode(ERRCODE_UNDEFINED_COLUMN),
-				 errmsg("column \"%s\" of relation \"%s\" does not exist",
-						colName, RelationGetRelationName(rel))));
 	attrtuple = (Form_pg_attribute) GETSTRUCT(tuple);
 
 	attnum = attrtuple->attnum;
@@ -6184,6 +6372,15 @@ ATExecSetStatistics(Relation rel, const char *colName, Node *newValue, LOCKMODE
 				 errmsg("cannot alter system column \"%s\"",
 						colName)));
 
+	if ((rel->rd_rel->relkind == RELKIND_INDEX ||
+		 rel->rd_rel->relkind == RELKIND_PARTITIONED_INDEX) &&
+		rel->rd_index->indkey.values[attnum - 1] != 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot alter statistics on non-expression column \"%s\" of index \"%s\"",
+						NameStr(attrtuple->attname), RelationGetRelationName(rel)),
+				 errhint("Alter statistics on table column instead.")));
+
 	attrtuple->attstattarget = newtarget;
 
 	CatalogTupleUpdate(attrelation, &tuple->t_self, tuple);
@@ -6383,68 +6580,6 @@ ATPrepDropColumn(List **wqueue, Relation rel, bool recurse, bool recursing,
 		cmd->subtype = AT_DropColumnRecurse;
 }
 
-/*
- * Checks if attnum is a partition attribute for rel
- *
- * Sets *used_in_expr if attnum is found to be referenced in some partition
- * key expression.  It's possible for a column to be both used directly and
- * as part of an expression; if that happens, *used_in_expr may end up as
- * either true or false.  That's OK for current uses of this function, because
- * *used_in_expr is only used to tailor the error message text.
- */
-static bool
-is_partition_attr(Relation rel, AttrNumber attnum, bool *used_in_expr)
-{
-	PartitionKey key;
-	int			partnatts;
-	List	   *partexprs;
-	ListCell   *partexprs_item;
-	int			i;
-
-	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
-		return false;
-
-	key = RelationGetPartitionKey(rel);
-	partnatts = get_partition_natts(key);
-	partexprs = get_partition_exprs(key);
-
-	partexprs_item = list_head(partexprs);
-	for (i = 0; i < partnatts; i++)
-	{
-		AttrNumber	partattno = get_partition_col_attnum(key, i);
-
-		if (partattno != 0)
-		{
-			if (attnum == partattno)
-			{
-				if (used_in_expr)
-					*used_in_expr = false;
-				return true;
-			}
-		}
-		else
-		{
-			/* Arbitrary expression */
-			Node	   *expr = (Node *) lfirst(partexprs_item);
-			Bitmapset  *expr_attrs = NULL;
-
-			/* Find all attributes referenced */
-			pull_varattnos(expr, 1, &expr_attrs);
-			partexprs_item = lnext(partexprs_item);
-
-			if (bms_is_member(attnum - FirstLowInvalidHeapAttributeNumber,
-							  expr_attrs))
-			{
-				if (used_in_expr)
-					*used_in_expr = true;
-				return true;
-			}
-		}
-	}
-
-	return false;
-}
-
 /*
  * Return value is the address of the dropped column.
  */
@@ -6505,7 +6640,9 @@ ATExecDropColumn(List **wqueue, Relation rel, const char *colName,
 						colName)));
 
 	/* Don't drop columns used in the partition key */
-	if (is_partition_attr(rel, attnum, &is_expr))
+	if (has_partition_attrs(rel,
+							bms_make_singleton(attnum - FirstLowInvalidHeapAttributeNumber),
+							&is_expr))
 	{
 		if (!is_expr)
 			ereport(ERROR,
@@ -6689,6 +6826,8 @@ ATExecAddIndex(AlteredTableInfo *tab, Relation rel,
 	address = DefineIndex(RelationGetRelid(rel),
 						  stmt,
 						  InvalidOid,	/* no predefined OID */
+						  InvalidOid,	/* no parent index */
+						  InvalidOid,	/* no parent constraint */
 						  true, /* is_alter_table */
 						  check_rights,
 						  false,	/* check_not_in_use - we did it already */
@@ -6728,11 +6867,21 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
 	char	   *constraintName;
 	char		constraintType;
 	ObjectAddress address;
+	bits16		flags;
 
 	Assert(IsA(stmt, IndexStmt));
 	Assert(OidIsValid(index_oid));
 	Assert(stmt->isconstraint);
 
+	/*
+	 * Doing this on partitioned tables is not a simple feature to implement,
+	 * so let's punt for now.
+	 */
+	if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables")));
+
 	indexRel = index_open(index_oid, AccessShareLock);
 
 	indexName = pstrdup(RelationGetRelationName(indexRel));
@@ -6772,16 +6921,19 @@ ATExecAddIndexConstraint(AlteredTableInfo *tab, Relation rel,
 		constraintType = CONSTRAINT_UNIQUE;
 
 	/* Create the catalog entries for the constraint */
+	flags = INDEX_CONSTR_CREATE_UPDATE_INDEX |
+		INDEX_CONSTR_CREATE_REMOVE_OLD_DEPS |
+		(stmt->initdeferred ? INDEX_CONSTR_CREATE_INIT_DEFERRED : 0) |
+		(stmt->deferrable ? INDEX_CONSTR_CREATE_DEFERRABLE : 0) |
+		(stmt->primary ? INDEX_CONSTR_CREATE_MARK_AS_PRIMARY : 0);
+
 	address = index_constraint_create(rel,
 									  index_oid,
+									  InvalidOid,
 									  indexInfo,
 									  constraintName,
 									  constraintType,
-									  stmt->deferrable,
-									  stmt->initdeferred,
-									  stmt->primary,
-									  true, /* update pg_index */
-									  true, /* remove old dependencies */
+									  flags,
 									  allowSystemTableMods,
 									  false);	/* is_internal */
 
@@ -7281,13 +7433,15 @@ ATAddForeignKeyConstraint(AlteredTableInfo *tab, Relation rel,
 			CoercionPathType new_pathtype;
 			Oid			old_castfunc;
 			Oid			new_castfunc;
+			Form_pg_attribute attr = TupleDescAttr(tab->oldDesc,
+												   fkattnum[i] - 1);
 
 			/*
 			 * Identify coercion pathways from each of the old and new FK-side
 			 * column types to the right (foreign) operand type of the pfeqop.
 			 * We may assume that pg_constraint.conkey is not changing.
 			 */
-			old_fktype = tab->oldDesc->attrs[fkattnum[i] - 1]->atttypid;
+			old_fktype = attr->atttypid;
 			new_fktype = fktype;
 			old_pathtype = findFkeyCast(pfeqop_right, old_fktype,
 										&old_castfunc);
@@ -8084,7 +8238,7 @@ checkFkeyPermissions(Relation rel, int16 *attnums, int natts)
 		aclresult = pg_attribute_aclcheck(RelationGetRelid(rel), attnums[i],
 										  roleid, ACL_REFERENCES);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_CLASS,
+			aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
 	}
 }
@@ -8202,16 +8356,16 @@ validateForeignKeyConstraint(char *conname,
 	trig.tgoid = InvalidOid;
 	trig.tgname = conname;
 	trig.tgenabled = TRIGGER_FIRES_ON_ORIGIN;
-	trig.tgisinternal = TRUE;
+	trig.tgisinternal = true;
 	trig.tgconstrrelid = RelationGetRelid(pkrel);
 	trig.tgconstrindid = pkindOid;
 	trig.tgconstraint = constraintOid;
-	trig.tgdeferrable = FALSE;
-	trig.tginitdeferred = FALSE;
+	trig.tgdeferrable = false;
+	trig.tginitdeferred = false;
 	/* we needn't fill in remaining fields */
 
 	/*
-	 * See if we can do it with a single LEFT JOIN query.  A FALSE result
+	 * See if we can do it with a single LEFT JOIN query.  A false result
 	 * indicates we must proceed with the fire-the-trigger method.
 	 */
 	if (RI_Initial_Check(&trig, rel, pkrel))
@@ -8724,7 +8878,9 @@ ATPrepAlterColumnType(List **wqueue,
 						colName)));
 
 	/* Don't alter columns used in the partition key */
-	if (is_partition_attr(rel, attnum, &is_expr))
+	if (has_partition_attrs(rel,
+							bms_make_singleton(attnum - FirstLowInvalidHeapAttributeNumber),
+							&is_expr))
 	{
 		if (!is_expr)
 			ereport(ERROR,
@@ -8958,7 +9114,8 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 	ColumnDef  *def = (ColumnDef *) cmd->def;
 	TypeName   *typeName = def->typeName;
 	HeapTuple	heapTup;
-	Form_pg_attribute attTup;
+	Form_pg_attribute attTup,
+				attOldTup;
 	AttrNumber	attnum;
 	HeapTuple	typeTuple;
 	Form_pg_type tform;
@@ -8984,10 +9141,11 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 						colName, RelationGetRelationName(rel))));
 	attTup = (Form_pg_attribute) GETSTRUCT(heapTup);
 	attnum = attTup->attnum;
+	attOldTup = TupleDescAttr(tab->oldDesc, attnum - 1);
 
 	/* Check for multiple ALTER TYPE on same column --- can't cope */
-	if (attTup->atttypid != tab->oldDesc->attrs[attnum - 1]->atttypid ||
-		attTup->atttypmod != tab->oldDesc->attrs[attnum - 1]->atttypmod)
+	if (attTup->atttypid != attOldTup->atttypid ||
+		attTup->atttypmod != attOldTup->atttypmod)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("cannot alter type of column \"%s\" twice",
@@ -9083,7 +9241,8 @@ ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
 				{
 					char		relKind = get_rel_relkind(foundObject.objectId);
 
-					if (relKind == RELKIND_INDEX)
+					if (relKind == RELKIND_INDEX ||
+						relKind == RELKIND_PARTITIONED_INDEX)
 					{
 						Assert(foundObject.objectSubId == 0);
 						if (!list_member_oid(tab->changedIndexOids, foundObject.objectId))
@@ -9515,7 +9674,15 @@ ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab, LOCKMODE lockmode)
 		if (!HeapTupleIsValid(tup)) /* should not happen */
 			elog(ERROR, "cache lookup failed for constraint %u", oldId);
 		con = (Form_pg_constraint) GETSTRUCT(tup);
-		relid = con->conrelid;
+		if (OidIsValid(con->conrelid))
+			relid = con->conrelid;
+		else
+		{
+			/* must be a domain constraint */
+			relid = get_typ_typrelid(getBaseType(con->contypid));
+			if (!OidIsValid(relid))
+				elog(ERROR, "could not identify relation associated with constraint %u", oldId);
+		}
 		confrelid = con->confrelid;
 		conislocal = con->conislocal;
 		ReleaseSysCache(tup);
@@ -9652,7 +9819,7 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, char *cmd,
 
 			foreach(lcmd, stmt->cmds)
 			{
-				AlterTableCmd *cmd = (AlterTableCmd *) lfirst(lcmd);
+				AlterTableCmd *cmd = castNode(AlterTableCmd, lfirst(lcmd));
 
 				if (cmd->subtype == AT_AddIndex)
 				{
@@ -9676,13 +9843,14 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, char *cmd,
 					RebuildConstraintComment(tab,
 											 AT_PASS_OLD_INDEX,
 											 oldId,
-											 rel, indstmt->idxname);
+											 rel,
+											 NIL,
+											 indstmt->idxname);
 				}
 				else if (cmd->subtype == AT_AddConstraint)
 				{
-					Constraint *con;
+					Constraint *con = castNode(Constraint, cmd->def);
 
-					con = castNode(Constraint, cmd->def);
 					con->old_pktable_oid = refRelId;
 					/* rewriting neither side of a FK */
 					if (con->contype == CONSTR_FOREIGN &&
@@ -9696,13 +9864,41 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, char *cmd,
 					RebuildConstraintComment(tab,
 											 AT_PASS_OLD_CONSTR,
 											 oldId,
-											 rel, con->conname);
+											 rel,
+											 NIL,
+											 con->conname);
 				}
 				else
 					elog(ERROR, "unexpected statement subtype: %d",
 						 (int) cmd->subtype);
 			}
 		}
+		else if (IsA(stm, AlterDomainStmt))
+		{
+			AlterDomainStmt *stmt = (AlterDomainStmt *) stm;
+
+			if (stmt->subtype == 'C')	/* ADD CONSTRAINT */
+			{
+				Constraint *con = castNode(Constraint, stmt->def);
+				AlterTableCmd *cmd = makeNode(AlterTableCmd);
+
+				cmd->subtype = AT_ReAddDomainConstraint;
+				cmd->def = (Node *) stmt;
+				tab->subcmds[AT_PASS_OLD_CONSTR] =
+					lappend(tab->subcmds[AT_PASS_OLD_CONSTR], cmd);
+
+				/* recreate any comment on the constraint */
+				RebuildConstraintComment(tab,
+										 AT_PASS_OLD_CONSTR,
+										 oldId,
+										 NULL,
+										 stmt->typeName,
+										 con->conname);
+			}
+			else
+				elog(ERROR, "unexpected statement subtype: %d",
+					 (int) stmt->subtype);
+		}
 		else
 			elog(ERROR, "unexpected statement type: %d",
 				 (int) nodeTag(stm));
@@ -9712,12 +9908,19 @@ ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId, char *cmd,
 }
 
 /*
- * Subroutine for ATPostAlterTypeParse() to recreate a comment entry for
- * a constraint that is being re-added.
+ * Subroutine for ATPostAlterTypeParse() to recreate any existing comment
+ * for a table or domain constraint that is being rebuilt.
+ *
+ * objid is the OID of the constraint.
+ * Pass "rel" for a table constraint, or "domname" (domain's qualified name
+ * as a string list) for a domain constraint.
+ * (We could dig that info, as well as the conname, out of the pg_constraint
+ * entry; but callers already have them so might as well pass them.)
  */
 static void
 RebuildConstraintComment(AlteredTableInfo *tab, int pass, Oid objid,
-						 Relation rel, char *conname)
+						 Relation rel, List *domname,
+						 const char *conname)
 {
 	CommentStmt *cmd;
 	char	   *comment_str;
@@ -9728,12 +9931,23 @@ RebuildConstraintComment(AlteredTableInfo *tab, int pass, Oid objid,
 	if (comment_str == NULL)
 		return;
 
-	/* Build node CommentStmt */
+	/* Build CommentStmt node, copying all input data for safety */
 	cmd = makeNode(CommentStmt);
-	cmd->objtype = OBJECT_TABCONSTRAINT;
-	cmd->object = (Node *) list_make3(makeString(get_namespace_name(RelationGetNamespace(rel))),
-									  makeString(pstrdup(RelationGetRelationName(rel))),
-									  makeString(pstrdup(conname)));
+	if (rel)
+	{
+		cmd->objtype = OBJECT_TABCONSTRAINT;
+		cmd->object = (Node *)
+			list_make3(makeString(get_namespace_name(RelationGetNamespace(rel))),
+					   makeString(pstrdup(RelationGetRelationName(rel))),
+					   makeString(pstrdup(conname)));
+	}
+	else
+	{
+		cmd->objtype = OBJECT_DOMCONSTRAINT;
+		cmd->object = (Node *)
+			list_make2(makeTypeNameFromNameList(copyObject(domname)),
+					   makeString(pstrdup(conname)));
+	}
 	cmd->comment = comment_str;
 
 	/* Append it to list of commands */
@@ -9871,6 +10085,15 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 				newOwnerId = tuple_class->relowner;
 			}
 			break;
+		case RELKIND_PARTITIONED_INDEX:
+			if (recursing)
+				break;
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("cannot change owner of index \"%s\"",
+							NameStr(tuple_class->relname)),
+					 errhint("Change the ownership of the index's table, instead.")));
+			break;
 		case RELKIND_SEQUENCE:
 			if (!recursing &&
 				tuple_class->relowner != newOwnerId)
@@ -9935,7 +10158,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 
 				/* Otherwise, must be owner of the existing object */
 				if (!pg_class_ownercheck(relationOid, GetUserId()))
-					aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+					aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relationOid)),
 								   RelationGetRelationName(target_rel));
 
 				/* Must be able to become new owner */
@@ -9945,7 +10168,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 				aclresult = pg_namespace_aclcheck(namespaceOid, newOwnerId,
 												  ACL_CREATE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+					aclcheck_error(aclresult, OBJECT_SCHEMA,
 								   get_namespace_name(namespaceOid));
 			}
 		}
@@ -9992,6 +10215,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 		 */
 		if (tuple_class->relkind != RELKIND_COMPOSITE_TYPE &&
 			tuple_class->relkind != RELKIND_INDEX &&
+			tuple_class->relkind != RELKIND_PARTITIONED_INDEX &&
 			tuple_class->relkind != RELKIND_TOASTVALUE)
 			changeDependencyOnOwner(RelationRelationId, relationOid,
 									newOwnerId);
@@ -9999,7 +10223,8 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 		/*
 		 * Also change the ownership of the table's row type, if it has one
 		 */
-		if (tuple_class->relkind != RELKIND_INDEX)
+		if (tuple_class->relkind != RELKIND_INDEX &&
+			tuple_class->relkind != RELKIND_PARTITIONED_INDEX)
 			AlterTypeOwnerInternal(tuple_class->reltype, newOwnerId);
 
 		/*
@@ -10008,6 +10233,7 @@ ATExecChangeOwner(Oid relationOid, Oid newOwnerId, bool recursing, LOCKMODE lock
 		 * relation, as well as its toast table (if it has one).
 		 */
 		if (tuple_class->relkind == RELKIND_RELATION ||
+			tuple_class->relkind == RELKIND_PARTITIONED_TABLE ||
 			tuple_class->relkind == RELKIND_MATVIEW ||
 			tuple_class->relkind == RELKIND_TOASTVALUE)
 		{
@@ -10226,7 +10452,7 @@ ATExecDropCluster(Relation rel, LOCKMODE lockmode)
  * ALTER TABLE SET TABLESPACE
  */
 static void
-ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename, LOCKMODE lockmode)
+ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, const char *tablespacename, LOCKMODE lockmode)
 {
 	Oid			tablespaceId;
 
@@ -10240,7 +10466,7 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, char *tablespacename, L
 
 		aclresult = pg_tablespace_aclcheck(tablespaceId, GetUserId(), ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE, tablespacename);
+			aclcheck_error(aclresult, OBJECT_TABLESPACE, tablespacename);
 	}
 
 	/* Save info for Phase 3 to do the real work */
@@ -10316,6 +10542,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
 			(void) view_reloptions(newOptions, true);
 			break;
 		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
 			(void) index_reloptions(rel->rd_amroutine->amoptions, newOptions, true);
 			break;
 		default:
@@ -10338,7 +10565,7 @@ ATExecSetRelOptions(Relation rel, List *defList, AlterTableType operation,
 		{
 			DefElem    *defel = (DefElem *) lfirst(cell);
 
-			if (pg_strcasecmp(defel->defname, "check_option") == 0)
+			if (strcmp(defel->defname, "check_option") == 0)
 				check_option = true;
 		}
 
@@ -10674,7 +10901,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
 		aclresult = pg_tablespace_aclcheck(new_tablespaceoid, GetUserId(),
 										   ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+			aclcheck_error(aclresult, OBJECT_TABLESPACE,
 						   get_tablespace_name(new_tablespaceoid));
 	}
 
@@ -10728,7 +10955,8 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
 			 relForm->relkind != RELKIND_RELATION &&
 			 relForm->relkind != RELKIND_PARTITIONED_TABLE) ||
 			(stmt->objtype == OBJECT_INDEX &&
-			 relForm->relkind != RELKIND_INDEX) ||
+			 relForm->relkind != RELKIND_INDEX &&
+			 relForm->relkind != RELKIND_PARTITIONED_INDEX) ||
 			(stmt->objtype == OBJECT_MATVIEW &&
 			 relForm->relkind != RELKIND_MATVIEW))
 			continue;
@@ -10745,7 +10973,7 @@ AlterTableMoveAll(AlterTableMoveAllStmt *stmt)
 		 * Caller must be considered an owner on the table to move it.
 		 */
 		if (!pg_class_ownercheck(relOid, GetUserId()))
-			aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+			aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relOid)),
 						   NameStr(relForm->relname));
 
 		if (stmt->nowait &&
@@ -10893,7 +11121,7 @@ copy_relation_data(SMgrRelation src, SMgrRelation dst,
  * We just pass this off to trigger.c.
  */
 static void
-ATExecEnableDisableTrigger(Relation rel, char *trigname,
+ATExecEnableDisableTrigger(Relation rel, const char *trigname,
 						   char fires_when, bool skip_system, LOCKMODE lockmode)
 {
 	EnableDisableTrigger(rel, trigname, fires_when, skip_system);
@@ -10905,7 +11133,7 @@ ATExecEnableDisableTrigger(Relation rel, char *trigname,
  * We just pass this off to rewriteDefine.c.
  */
 static void
-ATExecEnableDisableRule(Relation rel, char *rulename,
+ATExecEnableDisableRule(Relation rel, const char *rulename,
 						char fires_when, LOCKMODE lockmode)
 {
 	EnableDisableRule(rel, rulename, fires_when);
@@ -11204,7 +11432,8 @@ MergeAttributesIntoExisting(Relation child_rel, Relation parent_rel)
 
 	for (parent_attno = 1; parent_attno <= parent_natts; parent_attno++)
 	{
-		Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
+		Form_pg_attribute attribute = TupleDescAttr(tupleDesc,
+													parent_attno - 1);
 		char	   *attributeName = NameStr(attribute->attname);
 
 		/* Ignore dropped columns in the parent. */
@@ -11521,45 +11750,18 @@ RemoveInheritance(Relation child_rel, Relation parent_rel)
 	Relation	catalogRelation;
 	SysScanDesc scan;
 	ScanKeyData key[3];
-	HeapTuple	inheritsTuple,
-				attributeTuple,
+	HeapTuple	attributeTuple,
 				constraintTuple;
 	List	   *connames;
-	bool		found = false;
+	bool		found;
 	bool		child_is_partition = false;
 
 	/* If parent_rel is a partitioned table, child_rel must be a partition */
 	if (parent_rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
 		child_is_partition = true;
 
-	/*
-	 * Find and destroy the pg_inherits entry linking the two, or error out if
-	 * there is none.
-	 */
-	catalogRelation = heap_open(InheritsRelationId, RowExclusiveLock);
-	ScanKeyInit(&key[0],
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(child_rel)));
-	scan = systable_beginscan(catalogRelation, InheritsRelidSeqnoIndexId,
-							  true, NULL, 1, key);
-
-	while (HeapTupleIsValid(inheritsTuple = systable_getnext(scan)))
-	{
-		Oid			inhparent;
-
-		inhparent = ((Form_pg_inherits) GETSTRUCT(inheritsTuple))->inhparent;
-		if (inhparent == RelationGetRelid(parent_rel))
-		{
-			CatalogTupleDelete(catalogRelation, &inheritsTuple->t_self);
-			found = true;
-			break;
-		}
-	}
-
-	systable_endscan(scan);
-	heap_close(catalogRelation, RowExclusiveLock);
-
+	found = DeleteInheritsTuple(RelationGetRelid(child_rel),
+								RelationGetRelid(parent_rel));
 	if (!found)
 	{
 		if (child_is_partition)
@@ -11817,7 +12019,7 @@ ATExecAddOf(Relation rel, const TypeName *ofTypename, LOCKMODE lockmode)
 				   *table_attname;
 
 		/* Get the next non-dropped type attribute. */
-		type_attr = typeTupleDesc->attrs[type_attno - 1];
+		type_attr = TupleDescAttr(typeTupleDesc, type_attno - 1);
 		if (type_attr->attisdropped)
 			continue;
 		type_attname = NameStr(type_attr->attname);
@@ -11830,7 +12032,8 @@ ATExecAddOf(Relation rel, const TypeName *ofTypename, LOCKMODE lockmode)
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
 						 errmsg("table is missing column \"%s\"",
 								type_attname)));
-			table_attr = tableTupleDesc->attrs[table_attno++ - 1];
+			table_attr = TupleDescAttr(tableTupleDesc, table_attno - 1);
+			table_attno++;
 		} while (table_attr->attisdropped);
 		table_attname = NameStr(table_attr->attname);
 
@@ -11855,7 +12058,8 @@ ATExecAddOf(Relation rel, const TypeName *ofTypename, LOCKMODE lockmode)
 	/* Any remaining columns at the end of the table had better be dropped. */
 	for (; table_attno <= tableTupleDesc->natts; table_attno++)
 	{
-		Form_pg_attribute table_attr = tableTupleDesc->attrs[table_attno - 1];
+		Form_pg_attribute table_attr = TupleDescAttr(tableTupleDesc,
+													 table_attno - 1);
 
 		if (!table_attr->attisdropped)
 			ereport(ERROR,
@@ -12142,7 +12346,7 @@ ATExecReplicaIdentity(Relation rel, ReplicaIdentityStmt *stmt, LOCKMODE lockmode
 					 errmsg("index \"%s\" cannot be used as replica identity because column %d is a system column",
 							RelationGetRelationName(indexRel), attno)));
 
-		attr = rel->rd_att->attrs[attno - 1];
+		attr = TupleDescAttr(rel->rd_att, attno - 1);
 		if (!attr->attnotnull)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -12987,7 +13191,7 @@ RangeVarCallbackOwnsTable(const RangeVar *relation,
 
 	/* Check permissions */
 	if (!pg_class_ownercheck(relId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, relation->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relId)), relation->relname);
 }
 
 /*
@@ -13009,7 +13213,7 @@ RangeVarCallbackOwnsRelation(const RangeVar *relation,
 		elog(ERROR, "cache lookup failed for relation %u", relId);
 
 	if (!pg_class_ownercheck(relId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relId)),
 					   relation->relname);
 
 	if (!allowSystemTableMods &&
@@ -13045,7 +13249,7 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 
 	/* Must own relation. */
 	if (!pg_class_ownercheck(relid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, rv->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relid)), rv->relname);
 
 	/* No system table modifications unless explicitly allowed. */
 	if (!allowSystemTableMods && IsSystemClass(relid, classform))
@@ -13065,7 +13269,7 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 		aclresult = pg_namespace_aclcheck(classform->relnamespace,
 										  GetUserId(), ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+			aclcheck_error(aclresult, OBJECT_SCHEMA,
 						   get_namespace_name(classform->relnamespace));
 		reltype = ((RenameStmt *) stmt)->renameType;
 	}
@@ -13076,8 +13280,8 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 		reltype = ((AlterTableStmt *) stmt)->relkind;
 	else
 	{
-		reltype = OBJECT_TABLE; /* placate compiler */
 		elog(ERROR, "unrecognized node type: %d", (int) nodeTag(stmt));
+		reltype = OBJECT_TABLE; /* placate compiler */
 	}
 
 	/*
@@ -13112,7 +13316,8 @@ RangeVarCallbackForAlterRelation(const RangeVar *rv, Oid relid, Oid oldrelid,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is not a composite type", rv->relname)));
 
-	if (reltype == OBJECT_INDEX && relkind != RELKIND_INDEX
+	if (reltype == OBJECT_INDEX && relkind != RELKIND_INDEX &&
+		relkind != RELKIND_PARTITIONED_INDEX
 		&& !IsA(stmt, RenameStmt))
 		ereport(ERROR,
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -13167,7 +13372,9 @@ transformPartitionSpec(Relation rel, PartitionSpec *partspec, char *strategy)
 	newspec->location = partspec->location;
 
 	/* Parse partitioning strategy name */
-	if (pg_strcasecmp(partspec->strategy, "list") == 0)
+	if (pg_strcasecmp(partspec->strategy, "hash") == 0)
+		*strategy = PARTITION_STRATEGY_HASH;
+	else if (pg_strcasecmp(partspec->strategy, "list") == 0)
 		*strategy = PARTITION_STRATEGY_LIST;
 	else if (pg_strcasecmp(partspec->strategy, "range") == 0)
 		*strategy = PARTITION_STRATEGY_RANGE;
@@ -13237,10 +13444,12 @@ transformPartitionSpec(Relation rel, PartitionSpec *partspec, char *strategy)
  */
 static void
 ComputePartitionAttrs(Relation rel, List *partParams, AttrNumber *partattrs,
-					  List **partexprs, Oid *partopclass, Oid *partcollation)
+					  List **partexprs, Oid *partopclass, Oid *partcollation,
+					  char strategy)
 {
 	int			attn;
 	ListCell   *lc;
+	Oid			am_oid;
 
 	attn = 0;
 	foreach(lc, partParams)
@@ -13400,90 +13609,299 @@ ComputePartitionAttrs(Relation rel, List *partParams, AttrNumber *partattrs,
 		partcollation[attn] = attcollation;
 
 		/*
-		 * Identify a btree opclass to use. Currently, we use only btree
-		 * operators, which seems enough for list and range partitioning.
+		 * Identify the appropriate operator class.  For list and range
+		 * partitioning, we use a btree operator class; hash partitioning uses
+		 * a hash operator class.
 		 */
+		if (strategy == PARTITION_STRATEGY_HASH)
+			am_oid = HASH_AM_OID;
+		else
+			am_oid = BTREE_AM_OID;
+
 		if (!pelem->opclass)
 		{
-			partopclass[attn] = GetDefaultOpClass(atttype, BTREE_AM_OID);
+			partopclass[attn] = GetDefaultOpClass(atttype, am_oid);
 
 			if (!OidIsValid(partopclass[attn]))
-				ereport(ERROR,
-						(errcode(ERRCODE_UNDEFINED_OBJECT),
-						 errmsg("data type %s has no default btree operator class",
-								format_type_be(atttype)),
-						 errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
+			{
+				if (strategy == PARTITION_STRATEGY_HASH)
+					ereport(ERROR,
+							(errcode(ERRCODE_UNDEFINED_OBJECT),
+							 errmsg("data type %s has no default hash operator class",
+									format_type_be(atttype)),
+							 errhint("You must specify a hash operator class or define a default hash operator class for the data type.")));
+				else
+					ereport(ERROR,
+							(errcode(ERRCODE_UNDEFINED_OBJECT),
+							 errmsg("data type %s has no default btree operator class",
+									format_type_be(atttype)),
+							 errhint("You must specify a btree operator class or define a default btree operator class for the data type.")));
+
+			}
 		}
 		else
 			partopclass[attn] = ResolveOpClass(pelem->opclass,
 											   atttype,
-											   "btree",
-											   BTREE_AM_OID);
+											   am_oid == HASH_AM_OID ? "hash" : "btree",
+											   am_oid);
 
 		attn++;
 	}
 }
 
 /*
- * ALTER TABLE <name> ATTACH PARTITION <partition-name> FOR VALUES
+ * PartConstraintImpliedByRelConstraint
+ *		Does scanrel's existing constraints imply the partition constraint?
  *
- * Return the address of the newly attached partition.
+ * Existing constraints includes its check constraints and column-level
+ * NOT NULL constraints and partConstraint describes the partition constraint.
  */
-static ObjectAddress
-ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
+bool
+PartConstraintImpliedByRelConstraint(Relation scanrel,
+									 List *partConstraint)
 {
-	Relation	attachrel,
-				catalog;
-	List	   *attachrel_children;
-	TupleConstr *attachrel_constr;
-	List	   *partConstraint,
-			   *existConstraint;
-	SysScanDesc scan;
-	ScanKeyData skey;
-	AttrNumber	attno;
-	int			natts;
-	TupleDesc	tupleDesc;
-	bool		skip_validate = false;
-	ObjectAddress address;
-	const char *trigger_name;
-	bool		found_whole_row;
+	List	   *existConstraint = NIL;
+	TupleConstr *constr = RelationGetDescr(scanrel)->constr;
+	int			num_check,
+				i;
 
-	attachrel = heap_openrv(cmd->name, AccessExclusiveLock);
+	if (constr && constr->has_not_null)
+	{
+		int			natts = scanrel->rd_att->natts;
 
-	/*
-	 * Must be owner of both parent and source table -- parent was checked by
-	 * ATSimplePermissions call in ATPrepCmd
-	 */
-	ATSimplePermissions(attachrel, ATT_TABLE | ATT_FOREIGN_TABLE);
+		for (i = 1; i <= natts; i++)
+		{
+			Form_pg_attribute att = TupleDescAttr(scanrel->rd_att, i - 1);
 
-	/* A partition can only have one parent */
-	if (attachrel->rd_rel->relispartition)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("\"%s\" is already a partition",
-						RelationGetRelationName(attachrel))));
+			if (att->attnotnull && !att->attisdropped)
+			{
+				NullTest   *ntest = makeNode(NullTest);
 
-	if (OidIsValid(attachrel->rd_rel->reloftype))
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot attach a typed table as partition")));
+				ntest->arg = (Expr *) makeVar(1,
+											  i,
+											  att->atttypid,
+											  att->atttypmod,
+											  att->attcollation,
+											  0);
+				ntest->nulltesttype = IS_NOT_NULL;
 
-	/*
-	 * Table being attached should not already be part of inheritance; either
-	 * as a child table...
-	 */
-	catalog = heap_open(InheritsRelationId, AccessShareLock);
-	ScanKeyInit(&skey,
-				Anum_pg_inherits_inhrelid,
-				BTEqualStrategyNumber, F_OIDEQ,
-				ObjectIdGetDatum(RelationGetRelid(attachrel)));
-	scan = systable_beginscan(catalog, InheritsRelidSeqnoIndexId, true,
-							  NULL, 1, &skey);
-	if (HeapTupleIsValid(systable_getnext(scan)))
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("cannot attach inheritance child as partition")));
-	systable_endscan(scan);
+				/*
+				 * argisrow=false is correct even for a composite column,
+				 * because attnotnull does not represent a SQL-spec IS NOT
+				 * NULL test in such a case, just IS DISTINCT FROM NULL.
+				 */
+				ntest->argisrow = false;
+				ntest->location = -1;
+				existConstraint = lappend(existConstraint, ntest);
+			}
+		}
+	}
+
+	num_check = (constr != NULL) ? constr->num_check : 0;
+	for (i = 0; i < num_check; i++)
+	{
+		Node	   *cexpr;
+
+		/*
+		 * If this constraint hasn't been fully validated yet, we must ignore
+		 * it here.
+		 */
+		if (!constr->check[i].ccvalid)
+			continue;
+
+		cexpr = stringToNode(constr->check[i].ccbin);
+
+		/*
+		 * Run each expression through const-simplification and
+		 * canonicalization.  It is necessary, because we will be comparing it
+		 * to similarly-processed partition constraint expressions, and may
+		 * fail to detect valid matches without this.
+		 */
+		cexpr = eval_const_expressions(NULL, cexpr);
+		cexpr = (Node *) canonicalize_qual((Expr *) cexpr);
+
+		existConstraint = list_concat(existConstraint,
+									  make_ands_implicit((Expr *) cexpr));
+	}
+
+	if (existConstraint != NIL)
+		existConstraint = list_make1(make_ands_explicit(existConstraint));
+
+	/* And away we go ... */
+	return predicate_implied_by(partConstraint, existConstraint, true);
+}
+
+/*
+ * ValidatePartitionConstraints
+ *
+ * Check whether all rows in the given table obey the given partition
+ * constraint; if so, it can be attached as a partition.  We do this by
+ * scanning the table (or all of its leaf partitions) row by row, except when
+ * the existing constraints are sufficient to prove that the new partitioning
+ * constraint must already hold.
+ */
+static void
+ValidatePartitionConstraints(List **wqueue, Relation scanrel,
+							 List *scanrel_children,
+							 List *partConstraint,
+							 bool validate_default)
+{
+	bool		found_whole_row;
+	ListCell   *lc;
+
+	if (partConstraint == NIL)
+		return;
+
+	/*
+	 * Based on the table's existing constraints, determine if we can skip
+	 * scanning the table to validate the partition constraint.
+	 */
+	if (PartConstraintImpliedByRelConstraint(scanrel, partConstraint))
+	{
+		if (!validate_default)
+			ereport(INFO,
+					(errmsg("partition constraint for table \"%s\" is implied by existing constraints",
+							RelationGetRelationName(scanrel))));
+		else
+			ereport(INFO,
+					(errmsg("updated partition constraint for default partition \"%s\" is implied by existing constraints",
+							RelationGetRelationName(scanrel))));
+		return;
+	}
+
+	/* Constraints proved insufficient, so we need to scan the table. */
+	foreach(lc, scanrel_children)
+	{
+		AlteredTableInfo *tab;
+		Oid			part_relid = lfirst_oid(lc);
+		Relation	part_rel;
+		List	   *my_partconstr = partConstraint;
+
+		/* Lock already taken */
+		if (part_relid != RelationGetRelid(scanrel))
+			part_rel = heap_open(part_relid, NoLock);
+		else
+			part_rel = scanrel;
+
+		/*
+		 * Skip if the partition is itself a partitioned table.  We can only
+		 * ever scan RELKIND_RELATION relations.
+		 */
+		if (part_rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		{
+			if (part_rel != scanrel)
+				heap_close(part_rel, NoLock);
+			continue;
+		}
+
+		if (part_rel != scanrel)
+		{
+			/*
+			 * Adjust the constraint for scanrel so that it matches this
+			 * partition's attribute numbers.
+			 */
+			my_partconstr = map_partition_varattnos(my_partconstr, 1,
+													part_rel, scanrel,
+													&found_whole_row);
+			/* There can never be a whole-row reference here */
+			if (found_whole_row)
+				elog(ERROR, "unexpected whole-row reference found in partition key");
+
+			/* Can we skip scanning this part_rel? */
+			if (PartConstraintImpliedByRelConstraint(part_rel, my_partconstr))
+			{
+				if (!validate_default)
+					ereport(INFO,
+							(errmsg("partition constraint for table \"%s\" is implied by existing constraints",
+									RelationGetRelationName(part_rel))));
+				else
+					ereport(INFO,
+							(errmsg("updated partition constraint for default partition \"%s\" is implied by existing constraints",
+									RelationGetRelationName(part_rel))));
+				heap_close(part_rel, NoLock);
+				continue;
+			}
+		}
+
+		/* Grab a work queue entry. */
+		tab = ATGetQueueEntry(wqueue, part_rel);
+		tab->partition_constraint = (Expr *) linitial(my_partconstr);
+		tab->validate_default = validate_default;
+
+		/* keep our lock until commit */
+		if (part_rel != scanrel)
+			heap_close(part_rel, NoLock);
+	}
+}
+
+/*
+ * ALTER TABLE <name> ATTACH PARTITION <partition-name> FOR VALUES
+ *
+ * Return the address of the newly attached partition.
+ */
+static ObjectAddress
+ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
+{
+	Relation	attachrel,
+				catalog;
+	List	   *attachrel_children;
+	List	   *partConstraint;
+	SysScanDesc scan;
+	ScanKeyData skey;
+	AttrNumber	attno;
+	int			natts;
+	TupleDesc	tupleDesc;
+	ObjectAddress address;
+	const char *trigger_name;
+	bool		found_whole_row;
+	Oid			defaultPartOid;
+	List	   *partBoundConstraint;
+
+	/*
+	 * We must lock the default partition, because attaching a new partition
+	 * will change its partition constraint.
+	 */
+	defaultPartOid =
+		get_default_oid_from_partdesc(RelationGetPartitionDesc(rel));
+	if (OidIsValid(defaultPartOid))
+		LockRelationOid(defaultPartOid, AccessExclusiveLock);
+
+	attachrel = heap_openrv(cmd->name, AccessExclusiveLock);
+
+	/*
+	 * Must be owner of both parent and source table -- parent was checked by
+	 * ATSimplePermissions call in ATPrepCmd
+	 */
+	ATSimplePermissions(attachrel, ATT_TABLE | ATT_FOREIGN_TABLE);
+
+	/* A partition can only have one parent */
+	if (attachrel->rd_rel->relispartition)
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("\"%s\" is already a partition",
+						RelationGetRelationName(attachrel))));
+
+	if (OidIsValid(attachrel->rd_rel->reloftype))
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("cannot attach a typed table as partition")));
+
+	/*
+	 * Table being attached should not already be part of inheritance; either
+	 * as a child table...
+	 */
+	catalog = heap_open(InheritsRelationId, AccessShareLock);
+	ScanKeyInit(&skey,
+				Anum_pg_inherits_inhrelid,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(RelationGetRelid(attachrel)));
+	scan = systable_beginscan(catalog, InheritsRelidSeqnoIndexId, true,
+							  NULL, 1, &skey);
+	if (HeapTupleIsValid(systable_getnext(scan)))
+		ereport(ERROR,
+				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+				 errmsg("cannot attach inheritance child as partition")));
+	systable_endscan(scan);
 
 	/* ...or as a parent table (except the case when it is partitioned) */
 	ScanKeyInit(&skey,
@@ -13504,7 +13922,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 	 * Prevent circularity by seeing if rel is a partition of attachrel. (In
 	 * particular, this disallows making a rel a partition of itself.)
 	 *
-	 * We do that by checking if rel is a member of the list of attachRel's
+	 * We do that by checking if rel is a member of the list of attachrel's
 	 * partitions provided the latter is partitioned at all.  We want to avoid
 	 * having to construct this list again, so we request the strongest lock
 	 * on all partitions.  We need the strongest lock, because we may decide
@@ -13568,7 +13986,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 	natts = tupleDesc->natts;
 	for (attno = 1; attno <= natts; attno++)
 	{
-		Form_pg_attribute attribute = tupleDesc->attrs[attno - 1];
+		Form_pg_attribute attribute = TupleDescAttr(tupleDesc, attno - 1);
 		char	   *attributeName = NameStr(attribute->attname);
 
 		/* Ignore dropped */
@@ -13584,7 +14002,7 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 					 errmsg("table \"%s\" contains column \"%s\" not found in parent \"%s\"",
 							RelationGetRelationName(attachrel), attributeName,
 							RelationGetRelationName(rel)),
-					 errdetail("New partition should contain only the columns present in parent.")));
+					 errdetail("The new partition may contain only the columns present in parent.")));
 	}
 
 	/*
@@ -13603,6 +14021,11 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 	/* OK to create inheritance.  Rest of the checks performed there */
 	CreateInheritance(attachrel, rel);
 
+	/* Update the default partition oid */
+	if (cmd->bound->is_default)
+		update_default_partition_oid(RelationGetRelid(rel),
+									 RelationGetRelid(attachrel));
+
 	/*
 	 * Check that the new partition's bound is valid and does not overlap any
 	 * of existing partitions of the parent - note that it does not return on
@@ -13614,178 +14037,222 @@ ATExecAttachPartition(List **wqueue, Relation rel, PartitionCmd *cmd)
 	/* Update the pg_class entry. */
 	StorePartitionBound(attachrel, rel, cmd->bound);
 
+	/* Ensure there exists a correct set of indexes in the partition. */
+	AttachPartitionEnsureIndexes(rel, attachrel);
+
 	/*
 	 * Generate partition constraint from the partition bound specification.
 	 * If the parent itself is a partition, make sure to include its
 	 * constraint as well.
 	 */
-	partConstraint = list_concat(get_qual_from_partbound(attachrel, rel,
-														 cmd->bound),
+	partBoundConstraint = get_qual_from_partbound(attachrel, rel, cmd->bound);
+	partConstraint = list_concat(partBoundConstraint,
 								 RelationGetPartitionQual(rel));
-	partConstraint = (List *) eval_const_expressions(NULL,
-													 (Node *) partConstraint);
-	partConstraint = (List *) canonicalize_qual((Expr *) partConstraint);
-	partConstraint = list_make1(make_ands_explicit(partConstraint));
 
-	/*
-	 * Adjust the generated constraint to match this partition's attribute
-	 * numbers.
-	 */
-	partConstraint = map_partition_varattnos(partConstraint, 1, attachrel,
-											 rel, &found_whole_row);
-	/* There can never be a whole-row reference here */
-	if (found_whole_row)
-		elog(ERROR, "unexpected whole-row reference found in partition key");
+	/* Skip validation if there are no constraints to validate. */
+	if (partConstraint)
+	{
+		partConstraint =
+			(List *) eval_const_expressions(NULL,
+											(Node *) partConstraint);
+		partConstraint = (List *) canonicalize_qual((Expr *) partConstraint);
+		partConstraint = list_make1(make_ands_explicit(partConstraint));
+
+		/*
+		 * Adjust the generated constraint to match this partition's attribute
+		 * numbers.
+		 */
+		partConstraint = map_partition_varattnos(partConstraint, 1, attachrel,
+												 rel, &found_whole_row);
+		/* There can never be a whole-row reference here */
+		if (found_whole_row)
+			elog(ERROR,
+				 "unexpected whole-row reference found in partition key");
+
+		/* Validate partition constraints against the table being attached. */
+		ValidatePartitionConstraints(wqueue, attachrel, attachrel_children,
+									 partConstraint, false);
+	}
 
 	/*
-	 * Check if we can do away with having to scan the table being attached to
-	 * validate the partition constraint, by *proving* that the existing
-	 * constraints of the table *imply* the partition predicate.  We include
-	 * the table's check constraints and NOT NULL constraints in the list of
-	 * clauses passed to predicate_implied_by().
-	 *
-	 * There is a case in which we cannot rely on just the result of the
-	 * proof.
+	 * Check whether default partition has a row that would fit the partition
+	 * being attached.
 	 */
-	attachrel_constr = tupleDesc->constr;
-	existConstraint = NIL;
-	if (attachrel_constr != NULL)
+	defaultPartOid =
+		get_default_oid_from_partdesc(RelationGetPartitionDesc(rel));
+	if (OidIsValid(defaultPartOid))
 	{
-		int			num_check = attachrel_constr->num_check;
-		int			i;
+		Relation	defaultrel;
+		List	   *defaultrel_children;
+		List	   *defPartConstraint;
 
-		if (attachrel_constr->has_not_null)
-		{
-			int			natts = attachrel->rd_att->natts;
+		/* We already have taken a lock on default partition. */
+		defaultrel = heap_open(defaultPartOid, NoLock);
+		defPartConstraint =
+			get_proposed_default_constraint(partBoundConstraint);
+		defaultrel_children =
+			find_all_inheritors(defaultPartOid,
+								AccessExclusiveLock, NULL);
+		ValidatePartitionConstraints(wqueue, defaultrel,
+									 defaultrel_children,
+									 defPartConstraint, true);
 
-			for (i = 1; i <= natts; i++)
-			{
-				Form_pg_attribute att = attachrel->rd_att->attrs[i - 1];
-
-				if (att->attnotnull && !att->attisdropped)
-				{
-					NullTest   *ntest = makeNode(NullTest);
-
-					ntest->arg = (Expr *) makeVar(1,
-												  i,
-												  att->atttypid,
-												  att->atttypmod,
-												  att->attcollation,
-												  0);
-					ntest->nulltesttype = IS_NOT_NULL;
+		/* keep our lock until commit. */
+		heap_close(defaultrel, NoLock);
+	}
 
-					/*
-					 * argisrow=false is correct even for a composite column,
-					 * because attnotnull does not represent a SQL-spec IS NOT
-					 * NULL test in such a case, just IS DISTINCT FROM NULL.
-					 */
-					ntest->argisrow = false;
-					ntest->location = -1;
-					existConstraint = lappend(existConstraint, ntest);
-				}
-			}
-		}
+	ObjectAddressSet(address, RelationRelationId, RelationGetRelid(attachrel));
 
-		for (i = 0; i < num_check; i++)
-		{
-			Node	   *cexpr;
+	/* keep our lock until commit */
+	heap_close(attachrel, NoLock);
 
-			/*
-			 * If this constraint hasn't been fully validated yet, we must
-			 * ignore it here.
-			 */
-			if (!attachrel_constr->check[i].ccvalid)
-				continue;
+	return address;
+}
 
-			cexpr = stringToNode(attachrel_constr->check[i].ccbin);
+/*
+ * AttachPartitionEnsureIndexes
+ *		subroutine for ATExecAttachPartition to create/match indexes
+ *
+ * Enforce the indexing rule for partitioned tables during ALTER TABLE / ATTACH
+ * PARTITION: every partition must have an index attached to each index on the
+ * partitioned table.
+ */
+static void
+AttachPartitionEnsureIndexes(Relation rel, Relation attachrel)
+{
+	List	   *idxes;
+	List	   *attachRelIdxs;
+	Relation   *attachrelIdxRels;
+	IndexInfo **attachInfos;
+	int			i;
+	ListCell   *cell;
+	MemoryContext cxt;
+	MemoryContext oldcxt;
 
-			/*
-			 * Run each expression through const-simplification and
-			 * canonicalization.  It is necessary, because we will be
-			 * comparing it to similarly-processed qual clauses, and may fail
-			 * to detect valid matches without this.
-			 */
-			cexpr = eval_const_expressions(NULL, cexpr);
-			cexpr = (Node *) canonicalize_qual((Expr *) cexpr);
+	cxt = AllocSetContextCreate(CurrentMemoryContext,
+								"AttachPartitionEnsureIndexes",
+								ALLOCSET_DEFAULT_SIZES);
+	oldcxt = MemoryContextSwitchTo(cxt);
 
-			existConstraint = list_concat(existConstraint,
-										  make_ands_implicit((Expr *) cexpr));
-		}
+	idxes = RelationGetIndexList(rel);
+	attachRelIdxs = RelationGetIndexList(attachrel);
+	attachrelIdxRels = palloc(sizeof(Relation) * list_length(attachRelIdxs));
+	attachInfos = palloc(sizeof(IndexInfo *) * list_length(attachRelIdxs));
 
-		existConstraint = list_make1(make_ands_explicit(existConstraint));
+	/* Build arrays of all existing indexes and their IndexInfos */
+	i = 0;
+	foreach(cell, attachRelIdxs)
+	{
+		Oid			cldIdxId = lfirst_oid(cell);
 
-		/* And away we go ... */
-		if (predicate_implied_by(partConstraint, existConstraint, true))
-			skip_validate = true;
+		attachrelIdxRels[i] = index_open(cldIdxId, AccessShareLock);
+		attachInfos[i] = BuildIndexInfo(attachrelIdxRels[i]);
+		i++;
 	}
 
-	if (skip_validate)
-	{
-		/* No need to scan the table after all. */
-		ereport(INFO,
-				(errmsg("partition constraint for table \"%s\" is implied by existing constraints",
-						RelationGetRelationName(attachrel))));
-	}
-	else
+	/*
+	 * For each index on the partitioned table, find a matching one in the
+	 * partition-to-be; if one is not found, create one.
+	 */
+	foreach(cell, idxes)
 	{
-		/* Constraints proved insufficient, so we need to scan the table. */
-		ListCell   *lc;
+		Oid			idx = lfirst_oid(cell);
+		Relation	idxRel = index_open(idx, AccessShareLock);
+		IndexInfo  *info;
+		AttrNumber *attmap;
+		bool		found = false;
+		Oid			constraintOid;
 
-		foreach(lc, attachrel_children)
+		/*
+		 * Ignore indexes in the partitioned table other than partitioned
+		 * indexes.
+		 */
+		if (idxRel->rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
 		{
-			AlteredTableInfo *tab;
-			Oid			part_relid = lfirst_oid(lc);
-			Relation	part_rel;
-			List	   *my_partconstr = partConstraint;
+			index_close(idxRel, AccessShareLock);
+			continue;
+		}
 
-			/* Lock already taken */
-			if (part_relid != RelationGetRelid(attachrel))
-				part_rel = heap_open(part_relid, NoLock);
-			else
-				part_rel = attachrel;
+		/* construct an indexinfo to compare existing indexes against */
+		info = BuildIndexInfo(idxRel);
+		attmap = convert_tuples_by_name_map(RelationGetDescr(attachrel),
+											RelationGetDescr(rel),
+											gettext_noop("could not convert row type"));
+		constraintOid = get_relation_idx_constraint_oid(RelationGetRelid(rel), idx);
 
-			/*
-			 * Skip if the partition is itself a partitioned table.  We can
-			 * only ever scan RELKIND_RELATION relations.
-			 */
-			if (part_rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
-			{
-				if (part_rel != attachrel)
-					heap_close(part_rel, NoLock);
+		/*
+		 * Scan the list of existing indexes in the partition-to-be, and mark
+		 * the first matching, unattached one we find, if any, as partition of
+		 * the parent index.  If we find one, we're done.
+		 */
+		for (i = 0; i < list_length(attachRelIdxs); i++)
+		{
+			Oid		cldConstrOid = InvalidOid;
+
+			/* does this index have a parent?  if so, can't use it */
+			if (has_superclass(RelationGetRelid(attachrelIdxRels[i])))
 				continue;
-			}
 
-			if (part_rel != attachrel)
+			if (CompareIndexInfo(attachInfos[i], info,
+								 attachrelIdxRels[i]->rd_indcollation,
+								 idxRel->rd_indcollation,
+								 attachrelIdxRels[i]->rd_opfamily,
+								 idxRel->rd_opfamily,
+								 attmap,
+								 RelationGetDescr(rel)->natts))
 			{
 				/*
-				 * Adjust the constraint that we constructed above for
-				 * attachRel so that it matches this partition's attribute
-				 * numbers.
+				 * If this index is being created in the parent because of a
+				 * constraint, then the child needs to have a constraint also,
+				 * so look for one.  If there is no such constraint, this
+				 * index is no good, so keep looking.
 				 */
-				my_partconstr = map_partition_varattnos(my_partconstr, 1,
-														part_rel, attachrel,
-														&found_whole_row);
-				/* There can never be a whole-row reference here */
-				if (found_whole_row)
-					elog(ERROR, "unexpected whole-row reference found in partition key");
-			}
-
-			/* Grab a work queue entry. */
-			tab = ATGetQueueEntry(wqueue, part_rel);
-			tab->partition_constraint = (Expr *) linitial(my_partconstr);
+				if (OidIsValid(constraintOid))
+				{
+					cldConstrOid =
+						get_relation_idx_constraint_oid(RelationGetRelid(attachrel),
+														RelationGetRelid(attachrelIdxRels[i]));
+					/* no dice */
+					if (!OidIsValid(cldConstrOid))
+						continue;
+				}
 
-			/* keep our lock until commit */
-			if (part_rel != attachrel)
-				heap_close(part_rel, NoLock);
+				/* bingo. */
+				IndexSetParentIndex(attachrelIdxRels[i], idx);
+				if (OidIsValid(constraintOid))
+					ConstraintSetParentConstraint(cldConstrOid, constraintOid);
+				found = true;
+				break;
+			}
 		}
-	}
 
-	ObjectAddressSet(address, RelationRelationId, RelationGetRelid(attachrel));
+		/*
+		 * If no suitable index was found in the partition-to-be, create one
+		 * now.
+		 */
+		if (!found)
+		{
+			IndexStmt  *stmt;
+			Oid			constraintOid;
+
+			stmt = generateClonedIndexStmt(NULL, RelationGetRelid(attachrel),
+										   idxRel, attmap,
+										   RelationGetDescr(rel)->natts,
+										   &constraintOid);
+			DefineIndex(RelationGetRelid(attachrel), stmt, InvalidOid,
+						RelationGetRelid(idxRel),
+						constraintOid,
+						false, false, false, false, false);
+		}
 
-	/* keep our lock until commit */
-	heap_close(attachrel, NoLock);
+		index_close(idxRel, AccessShareLock);
+	}
 
-	return address;
+	/* Clean up. */
+	for (i = 0; i < list_length(attachRelIdxs); i++)
+		index_close(attachrelIdxRels[i], AccessShareLock);
+	MemoryContextSwitchTo(oldcxt);
+	MemoryContextDelete(cxt);
 }
 
 /*
@@ -13805,6 +14272,18 @@ ATExecDetachPartition(Relation rel, RangeVar *name)
 				new_null[Natts_pg_class],
 				new_repl[Natts_pg_class];
 	ObjectAddress address;
+	Oid			defaultPartOid;
+	List	   *indexes;
+	ListCell   *cell;
+
+	/*
+	 * We must lock the default partition, because detaching this partition
+	 * will changing its partition constrant.
+	 */
+	defaultPartOid =
+		get_default_oid_from_partdesc(RelationGetPartitionDesc(rel));
+	if (OidIsValid(defaultPartOid))
+		LockRelationOid(defaultPartOid, AccessExclusiveLock);
 
 	partRel = heap_openrv(name, AccessShareLock);
 
@@ -13815,6 +14294,9 @@ ATExecDetachPartition(Relation rel, RangeVar *name)
 	classRel = heap_open(RelationRelationId, RowExclusiveLock);
 	tuple = SearchSysCacheCopy1(RELOID,
 								ObjectIdGetDatum(RelationGetRelid(partRel)));
+	if (!HeapTupleIsValid(tuple))
+		elog(ERROR, "cache lookup failed for relation %u",
+			 RelationGetRelid(partRel));
 	Assert(((Form_pg_class) GETSTRUCT(tuple))->relispartition);
 
 	(void) SysCacheGetAttr(RELOID, tuple, Anum_pg_class_relpartbound,
@@ -13836,6 +14318,42 @@ ATExecDetachPartition(Relation rel, RangeVar *name)
 	heap_freetuple(newtuple);
 	heap_close(classRel, RowExclusiveLock);
 
+	if (OidIsValid(defaultPartOid))
+	{
+		/*
+		 * If the detach relation is the default partition itself, invalidate
+		 * its entry in pg_partitioned_table.
+		 */
+		if (RelationGetRelid(partRel) == defaultPartOid)
+			update_default_partition_oid(RelationGetRelid(rel), InvalidOid);
+		else
+		{
+			/*
+			 * We must invalidate default partition's relcache, for the same
+			 * reasons explained in StorePartitionBound().
+			 */
+			CacheInvalidateRelcacheByRelid(defaultPartOid);
+		}
+	}
+
+	/* detach indexes too */
+	indexes = RelationGetIndexList(partRel);
+	foreach(cell, indexes)
+	{
+		Oid			idxid = lfirst_oid(cell);
+		Relation	idx;
+
+		if (!has_superclass(idxid))
+			continue;
+
+		Assert((IndexGetRelation(get_partition_parent(idxid), false) ==
+			   RelationGetRelid(rel)));
+
+		idx = index_open(idxid, AccessExclusiveLock);
+		IndexSetParentIndex(idx, InvalidOid);
+		relation_close(idx, AccessExclusiveLock);
+	}
+
 	/*
 	 * Invalidate the parent's relcache so that the partition is no longer
 	 * included in its partition descriptor.
@@ -13849,3 +14367,356 @@ ATExecDetachPartition(Relation rel, RangeVar *name)
 
 	return address;
 }
+
+/*
+ * Before acquiring lock on an index, acquire the same lock on the owning
+ * table.
+ */
+struct AttachIndexCallbackState
+{
+	Oid		partitionOid;
+	Oid		parentTblOid;
+	bool	lockedParentTbl;
+};
+
+static void
+RangeVarCallbackForAttachIndex(const RangeVar *rv, Oid relOid, Oid oldRelOid,
+							   void *arg)
+{
+	struct AttachIndexCallbackState *state;
+	Form_pg_class classform;
+	HeapTuple	tuple;
+
+	state = (struct AttachIndexCallbackState *) arg;
+
+	if (!state->lockedParentTbl)
+	{
+		LockRelationOid(state->parentTblOid, AccessShareLock);
+		state->lockedParentTbl = true;
+	}
+
+	/*
+	 * If we previously locked some other heap, and the name we're looking up
+	 * no longer refers to an index on that relation, release the now-useless
+	 * lock.  XXX maybe we should do *after* we verify whether the index does
+	 * not actually belong to the same relation ...
+	 */
+	if (relOid != oldRelOid && OidIsValid(state->partitionOid))
+	{
+		UnlockRelationOid(state->partitionOid, AccessShareLock);
+		state->partitionOid = InvalidOid;
+	}
+
+	/* Didn't find a relation, so no need for locking or permission checks. */
+	if (!OidIsValid(relOid))
+		return;
+
+	tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(relOid));
+	if (!HeapTupleIsValid(tuple))
+		return;					/* concurrently dropped, so nothing to do */
+	classform = (Form_pg_class) GETSTRUCT(tuple);
+	if (classform->relkind != RELKIND_PARTITIONED_INDEX &&
+		classform->relkind != RELKIND_INDEX)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+				 errmsg("\"%s\" is not an index", rv->relname)));
+	ReleaseSysCache(tuple);
+
+	/*
+	 * Since we need only examine the heap's tupledesc, an access share lock
+	 * on it (preventing any DDL) is sufficient.
+	 */
+	state->partitionOid = IndexGetRelation(relOid, false);
+	LockRelationOid(state->partitionOid, AccessShareLock);
+}
+
+/*
+ * ALTER INDEX i1 ATTACH PARTITION i2
+ */
+static ObjectAddress
+ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name)
+{
+	Relation	partIdx;
+	Relation	partTbl;
+	Relation	parentTbl;
+	ObjectAddress address;
+	Oid			partIdxId;
+	Oid			currParent;
+	struct AttachIndexCallbackState state;
+
+	/*
+	 * We need to obtain lock on the index 'name' to modify it, but we also
+	 * need to read its owning table's tuple descriptor -- so we need to lock
+	 * both.  To avoid deadlocks, obtain lock on the table before doing so on
+	 * the index.  Furthermore, we need to examine the parent table of the
+	 * partition, so lock that one too.
+	 */
+	state.partitionOid = InvalidOid;
+	state.parentTblOid = parentIdx->rd_index->indrelid;
+	state.lockedParentTbl = false;
+	partIdxId =
+		RangeVarGetRelidExtended(name, AccessExclusiveLock, false, false,
+								 RangeVarCallbackForAttachIndex,
+								 (void *) &state);
+	/* Not there? */
+	if (!OidIsValid(partIdxId))
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("index \"%s\" does not exist", name->relname)));
+
+	/* no deadlock risk: RangeVarGetRelidExtended already acquired the lock */
+	partIdx = relation_open(partIdxId, AccessExclusiveLock);
+
+	/* we already hold locks on both tables, so this is safe: */
+	parentTbl = relation_open(parentIdx->rd_index->indrelid, AccessShareLock);
+	partTbl = relation_open(partIdx->rd_index->indrelid, NoLock);
+
+	ObjectAddressSet(address, RelationRelationId, RelationGetRelid(partIdx));
+
+	/* Silently do nothing if already in the right state */
+	currParent = !has_superclass(partIdxId) ? InvalidOid :
+		get_partition_parent(partIdxId);
+	if (currParent != RelationGetRelid(parentIdx))
+	{
+		IndexInfo  *childInfo;
+		IndexInfo  *parentInfo;
+		AttrNumber *attmap;
+		bool		found;
+		int			i;
+		PartitionDesc partDesc;
+		Oid			constraintOid,
+					cldConstrId = InvalidOid;
+
+		/*
+		 * If this partition already has an index attached, refuse the operation.
+		 */
+		refuseDupeIndexAttach(parentIdx, partIdx, partTbl);
+
+		if (OidIsValid(currParent))
+			ereport(ERROR,
+					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					 errmsg("cannot attach index \"%s\" as a partition of index \"%s\"",
+							RelationGetRelationName(partIdx),
+							RelationGetRelationName(parentIdx)),
+					 errdetail("Index \"%s\" is already attached to another index.",
+							   RelationGetRelationName(partIdx))));
+
+		/* Make sure it indexes a partition of the other index's table */
+		partDesc = RelationGetPartitionDesc(parentTbl);
+		found = false;
+		for (i = 0; i < partDesc->nparts; i++)
+		{
+			if (partDesc->oids[i] == state.partitionOid)
+			{
+				found = true;
+				break;
+			}
+		}
+		if (!found)
+			ereport(ERROR,
+					(errmsg("cannot attach index \"%s\" as a partition of index \"%s\"",
+							RelationGetRelationName(partIdx),
+							RelationGetRelationName(parentIdx)),
+					 errdetail("Index \"%s\" is not an index on any partition of table \"%s\".",
+							   RelationGetRelationName(partIdx),
+							   RelationGetRelationName(parentTbl))));
+
+		/* Ensure the indexes are compatible */
+		childInfo = BuildIndexInfo(partIdx);
+		parentInfo = BuildIndexInfo(parentIdx);
+		attmap = convert_tuples_by_name_map(RelationGetDescr(partTbl),
+											RelationGetDescr(parentTbl),
+											gettext_noop("could not convert row type"));
+		if (!CompareIndexInfo(childInfo, parentInfo,
+							  partIdx->rd_indcollation,
+							  parentIdx->rd_indcollation,
+							  partIdx->rd_opfamily,
+							  parentIdx->rd_opfamily,
+							  attmap,
+							  RelationGetDescr(partTbl)->natts))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("cannot attach index \"%s\" as a partition of index \"%s\"",
+							RelationGetRelationName(partIdx),
+							RelationGetRelationName(parentIdx)),
+					 errdetail("The index definitions do not match.")));
+
+		/*
+		 * If there is a constraint in the parent, make sure there is one
+		 * in the child too.
+		 */
+		constraintOid = get_relation_idx_constraint_oid(RelationGetRelid(parentTbl),
+														RelationGetRelid(parentIdx));
+
+		if (OidIsValid(constraintOid))
+		{
+			cldConstrId = get_relation_idx_constraint_oid(RelationGetRelid(partTbl),
+														  partIdxId);
+			if (!OidIsValid(cldConstrId))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("cannot attach index \"%s\" as a partition of index \"%s\"",
+								RelationGetRelationName(partIdx),
+								RelationGetRelationName(parentIdx)),
+						 errdetail("The index \"%s\" belongs to a constraint in table \"%s\" but no constraint exists for index \"%s\".",
+								RelationGetRelationName(parentIdx),
+								RelationGetRelationName(parentTbl),
+								RelationGetRelationName(partIdx))));
+		}
+
+		/* All good -- do it */
+		IndexSetParentIndex(partIdx, RelationGetRelid(parentIdx));
+		if (OidIsValid(constraintOid))
+			ConstraintSetParentConstraint(cldConstrId, constraintOid);
+
+		pfree(attmap);
+
+		CommandCounterIncrement();
+
+		validatePartitionedIndex(parentIdx, parentTbl);
+	}
+
+	relation_close(parentTbl, AccessShareLock);
+	/* keep these locks till commit */
+	relation_close(partTbl, NoLock);
+	relation_close(partIdx, NoLock);
+
+	return address;
+}
+
+/*
+ * Verify whether the given partition already contains an index attached
+ * to the given partitioned index.  If so, raise an error.
+ */
+static void
+refuseDupeIndexAttach(Relation parentIdx, Relation partIdx, Relation partitionTbl)
+{
+	Relation		pg_inherits;
+	ScanKeyData		key;
+	HeapTuple		tuple;
+	SysScanDesc		scan;
+
+	pg_inherits = heap_open(InheritsRelationId, AccessShareLock);
+	ScanKeyInit(&key, Anum_pg_inherits_inhparent,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(RelationGetRelid(parentIdx)));
+	scan = systable_beginscan(pg_inherits, InheritsParentIndexId, true,
+							  NULL, 1, &key);
+	while (HeapTupleIsValid(tuple = systable_getnext(scan)))
+	{
+		Form_pg_inherits	inhForm;
+		Oid			tab;
+
+		inhForm = (Form_pg_inherits) GETSTRUCT(tuple);
+		tab = IndexGetRelation(inhForm->inhrelid, false);
+		if (tab == RelationGetRelid(partitionTbl))
+			ereport(ERROR,
+					(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+					 errmsg("cannot attach index \"%s\" as a partition of index \"%s\"",
+							RelationGetRelationName(partIdx),
+							RelationGetRelationName(parentIdx)),
+					 errdetail("Another index is already attached for partition \"%s\".",
+							   RelationGetRelationName(partitionTbl))));
+	}
+
+	systable_endscan(scan);
+	heap_close(pg_inherits, AccessShareLock);
+}
+
+/*
+ * Verify whether the set of attached partition indexes to a parent index on
+ * a partitioned table is complete.  If it is, mark the parent index valid.
+ *
+ * This should be called each time a partition index is attached.
+ */
+static void
+validatePartitionedIndex(Relation partedIdx, Relation partedTbl)
+{
+	Relation		inheritsRel;
+	SysScanDesc		scan;
+	ScanKeyData		key;
+	int				tuples = 0;
+	HeapTuple		inhTup;
+	bool			updated = false;
+
+	Assert(partedIdx->rd_rel->relkind == RELKIND_PARTITIONED_INDEX);
+
+	/*
+	 * Scan pg_inherits for this parent index.  Count each valid index we find
+	 * (verifying the pg_index entry for each), and if we reach the total
+	 * amount we expect, we can mark this parent index as valid.
+	 */
+	inheritsRel = heap_open(InheritsRelationId, AccessShareLock);
+	ScanKeyInit(&key, Anum_pg_inherits_inhparent,
+				BTEqualStrategyNumber, F_OIDEQ,
+				ObjectIdGetDatum(RelationGetRelid(partedIdx)));
+	scan = systable_beginscan(inheritsRel, InheritsParentIndexId, true,
+							  NULL, 1, &key);
+	while ((inhTup = systable_getnext(scan)) != NULL)
+	{
+		Form_pg_inherits inhForm = (Form_pg_inherits) GETSTRUCT(inhTup);
+		HeapTuple		indTup;
+		Form_pg_index	indexForm;
+
+		indTup = SearchSysCache1(INDEXRELID,
+								ObjectIdGetDatum(inhForm->inhrelid));
+		if (!indTup)
+			elog(ERROR, "cache lookup failed for index %u",
+				 inhForm->inhrelid);
+		indexForm = (Form_pg_index) GETSTRUCT(indTup);
+		if (IndexIsValid(indexForm))
+			tuples += 1;
+		ReleaseSysCache(indTup);
+	}
+
+	/* Done with pg_inherits */
+	systable_endscan(scan);
+	heap_close(inheritsRel, AccessShareLock);
+
+	/*
+	 * If we found as many inherited indexes as the partitioned table has
+	 * partitions, we're good; update pg_index to set indisvalid.
+	 */
+	if (tuples == RelationGetPartitionDesc(partedTbl)->nparts)
+	{
+		Relation	idxRel;
+		HeapTuple	newtup;
+
+		idxRel = heap_open(IndexRelationId, RowExclusiveLock);
+
+		newtup = heap_copytuple(partedIdx->rd_indextuple);
+		((Form_pg_index) GETSTRUCT(newtup))->indisvalid = true;
+		updated = true;
+
+		CatalogTupleUpdate(idxRel, &partedIdx->rd_indextuple->t_self, newtup);
+
+		heap_close(idxRel, RowExclusiveLock);
+	}
+
+	/*
+	 * If this index is in turn a partition of a larger index, validating it
+	 * might cause the parent to become valid also.  Try that.
+	 */
+	if (updated &&
+		has_superclass(RelationGetRelid(partedIdx)))
+	{
+		Oid			parentIdxId,
+					parentTblId;
+		Relation	parentIdx,
+					parentTbl;
+
+		/* make sure we see the validation we just did */
+		CommandCounterIncrement();
+
+		parentIdxId = get_partition_parent(RelationGetRelid(partedIdx));
+		parentTblId = get_partition_parent(RelationGetRelid(partedTbl));
+		parentIdx = relation_open(parentIdxId, AccessExclusiveLock);
+		parentTbl = relation_open(parentTblId, AccessExclusiveLock);
+		Assert(!parentIdx->rd_index->indisvalid);
+
+		validatePartitionedIndex(parentIdx, parentTbl);
+
+		relation_close(parentIdx, AccessExclusiveLock);
+		relation_close(parentTbl, AccessExclusiveLock);
+	}
+}
diff --git a/src/backend/commands/tablespace.c b/src/backend/commands/tablespace.c
index 8559c3b6b3..5c450caa4e 100644
--- a/src/backend/commands/tablespace.c
+++ b/src/backend/commands/tablespace.c
@@ -35,7 +35,7 @@
  * and munge the system catalogs of the new database.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -444,13 +444,13 @@ DropTableSpace(DropTableSpaceStmt *stmt)
 
 	/* Must be tablespace owner */
 	if (!pg_tablespace_ownercheck(tablespaceoid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TABLESPACE,
 					   tablespacename);
 
 	/* Disallow drop of the standard tablespaces, even by superuser */
 	if (tablespaceoid == GLOBALTABLESPACE_OID ||
 		tablespaceoid == DEFAULTTABLESPACE_OID)
-		aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_TABLESPACE,
+		aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_TABLESPACE,
 					   tablespacename);
 
 	/* DROP hook for the tablespace being removed */
@@ -655,7 +655,7 @@ create_tablespace_directories(const char *location, const Oid tablespaceoid)
  * does not justify throwing an error that would require manual intervention
  * to get the database running again.
  *
- * Returns TRUE if successful, FALSE if some subdirectory is not empty
+ * Returns true if successful, false if some subdirectory is not empty
  */
 static bool
 destroy_tablespace_directories(Oid tablespaceoid, bool redo)
@@ -941,7 +941,7 @@ RenameTableSpace(const char *oldname, const char *newname)
 
 	/* Must be owner */
 	if (!pg_tablespace_ownercheck(HeapTupleGetOid(newtuple), GetUserId()))
-		aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_TABLESPACE, oldname);
+		aclcheck_error(ACLCHECK_NO_PRIV, OBJECT_TABLESPACE, oldname);
 
 	/* Validate new name */
 	if (!allowSystemTableMods && IsReservedName(newname))
@@ -1017,7 +1017,7 @@ AlterTableSpaceOptions(AlterTableSpaceOptionsStmt *stmt)
 
 	/* Must be owner of the existing object */
 	if (!pg_tablespace_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TABLESPACE,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TABLESPACE,
 					   stmt->tablespacename);
 
 	/* Generate new proposed spcoptions (text array) */
@@ -1232,7 +1232,7 @@ check_temp_tablespaces(char **newval, void **extra, GucSource source)
 			if (aclresult != ACLCHECK_OK)
 			{
 				if (source >= PGC_S_INTERACTIVE)
-					aclcheck_error(aclresult, ACL_KIND_TABLESPACE, curname);
+					aclcheck_error(aclresult, OBJECT_TABLESPACE, curname);
 				continue;
 			}
 
diff --git a/src/backend/commands/trigger.c b/src/backend/commands/trigger.c
index da0850bfd6..fbd176b5d0 100644
--- a/src/backend/commands/trigger.c
+++ b/src/backend/commands/trigger.c
@@ -3,7 +3,7 @@
  * trigger.c
  *	  PostgreSQL TRIGGERs support code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -100,6 +100,7 @@ static void AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 					  List *recheckIndexes, Bitmapset *modifiedCols,
 					  TransitionCaptureState *transition_capture);
 static void AfterTriggerEnlargeQueryState(void);
+static bool before_stmt_triggers_fired(Oid relid, CmdType cmdType);
 
 
 /*
@@ -126,7 +127,7 @@ static void AfterTriggerEnlargeQueryState(void);
  *
  * If isInternal is true then this is an internally-generated trigger.
  * This argument sets the tgisinternal field of the pg_trigger entry, and
- * if TRUE causes us to modify the given trigger name to ensure uniqueness.
+ * if true causes us to modify the given trigger name to ensure uniqueness.
  *
  * When isInternal is not true we require ACL_TRIGGER permissions on the
  * relation, as well as ACL_EXECUTE on the trigger function.  For internal
@@ -234,6 +235,11 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 							RelationGetRelationName(rel)),
 					 errdetail("Foreign tables cannot have TRUNCATE triggers.")));
 
+		/*
+		 * We disallow constraint triggers to protect the assumption that
+		 * triggers on FKs can't be deferred.  See notes with AfterTriggers
+		 * data structures, below.
+		 */
 		if (stmt->isconstraint)
 			ereport(ERROR,
 					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
@@ -278,7 +284,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 		aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
 									  ACL_TRIGGER);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_CLASS,
+			aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 						   RelationGetRelationName(rel));
 
 		if (OidIsValid(constrrelid))
@@ -286,7 +292,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 			aclresult = pg_class_aclcheck(constrrelid, GetUserId(),
 										  ACL_TRIGGER);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_CLASS,
+				aclcheck_error(aclresult, get_relkind_objtype(get_rel_relkind(constrrelid)),
 							   get_rel_name(constrrelid));
 		}
 	}
@@ -416,7 +422,27 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 				 (TRIGGER_FOR_DELETE(tgtype) ? 1 : 0)) != 1)
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("Transition tables cannot be specified for triggers with more than one event")));
+						 errmsg("transition tables cannot be specified for triggers with more than one event")));
+
+			/*
+			 * We currently don't allow column-specific triggers with
+			 * transition tables.  Per spec, that seems to require
+			 * accumulating separate transition tables for each combination of
+			 * columns, which is a lot of work for a rather marginal feature.
+			 */
+			if (stmt->columns != NIL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("transition tables cannot be specified for triggers with column lists")));
+
+			/*
+			 * We disallow constraint triggers with transition tables, to
+			 * protect the assumption that such triggers can't be deferred.
+			 * See notes with AfterTriggers data structures, below.
+			 *
+			 * Currently this is enforced by the grammar, so just Assert here.
+			 */
+			Assert(!stmt->isconstraint);
 
 			if (tt->isNew)
 			{
@@ -566,7 +592,7 @@ CreateTrigger(CreateTrigStmt *stmt, const char *queryString,
 	{
 		aclresult = pg_proc_aclcheck(funcoid, GetUserId(), ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC,
+			aclcheck_error(aclresult, OBJECT_FUNCTION,
 						   NameListToString(stmt->funcname));
 	}
 	funcrettype = get_func_rettype(funcoid);
@@ -1396,7 +1422,7 @@ RangeVarCallbackForRenameTrigger(const RangeVar *rv, Oid relid, Oid oldrelid,
 
 	/* you must own the table to rename one of its triggers */
 	if (!pg_class_ownercheck(relid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, rv->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relid)), rv->relname);
 	if (!allowSystemTableMods && IsSystemClass(relid, form))
 		ereport(ERROR,
 				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
@@ -2085,96 +2111,6 @@ FindTriggerIncompatibleWithInheritance(TriggerDesc *trigdesc)
 	return NULL;
 }
 
-/*
- * Make a TransitionCaptureState object from a given TriggerDesc.  The
- * resulting object holds the flags which control whether transition tuples
- * are collected when tables are modified, and the tuplestores themselves.
- * Note that we copy the flags from a parent table into this struct (rather
- * than using each relation's TriggerDesc directly) so that we can use it to
- * control the collection of transition tuples from child tables.
- *
- * If there are no triggers with transition tables configured for 'trigdesc',
- * then return NULL.
- *
- * The resulting object can be passed to the ExecAR* functions.  The caller
- * should set tcs_map or tcs_original_insert_tuple as appropriate when dealing
- * with child tables.
- */
-TransitionCaptureState *
-MakeTransitionCaptureState(TriggerDesc *trigdesc)
-{
-	TransitionCaptureState *state = NULL;
-
-	if (trigdesc != NULL &&
-		(trigdesc->trig_delete_old_table || trigdesc->trig_update_old_table ||
-		 trigdesc->trig_update_new_table || trigdesc->trig_insert_new_table))
-	{
-		MemoryContext oldcxt;
-		ResourceOwner saveResourceOwner;
-
-		/*
-		 * Normally DestroyTransitionCaptureState should be called after
-		 * executing all AFTER triggers for the current statement.
-		 *
-		 * To handle error cleanup, TransitionCaptureState and the tuplestores
-		 * it contains will live in the current [sub]transaction's memory
-		 * context.  Likewise for the current resource owner, because we also
-		 * want to clean up temporary files spilled to disk by the tuplestore
-		 * in that scenario.  This scope is sufficient, because AFTER triggers
-		 * with transition tables cannot be deferred (only constraint triggers
-		 * can be deferred, and constraint triggers cannot have transition
-		 * tables).  The AFTER trigger queue may contain pointers to this
-		 * TransitionCaptureState, but any such entries will be processed or
-		 * discarded before the end of the current [sub]transaction.
-		 *
-		 * If a future release allows deferred triggers with transition
-		 * tables, we'll need to reconsider the scope of the
-		 * TransitionCaptureState object.
-		 */
-		oldcxt = MemoryContextSwitchTo(CurTransactionContext);
-		saveResourceOwner = CurrentResourceOwner;
-
-		state = (TransitionCaptureState *)
-			palloc0(sizeof(TransitionCaptureState));
-		state->tcs_delete_old_table = trigdesc->trig_delete_old_table;
-		state->tcs_update_old_table = trigdesc->trig_update_old_table;
-		state->tcs_update_new_table = trigdesc->trig_update_new_table;
-		state->tcs_insert_new_table = trigdesc->trig_insert_new_table;
-		PG_TRY();
-		{
-			CurrentResourceOwner = CurTransactionResourceOwner;
-			if (trigdesc->trig_delete_old_table || trigdesc->trig_update_old_table)
-				state->tcs_old_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-			if (trigdesc->trig_insert_new_table)
-				state->tcs_insert_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-			if (trigdesc->trig_update_new_table)
-				state->tcs_update_tuplestore = tuplestore_begin_heap(false, false, work_mem);
-		}
-		PG_CATCH();
-		{
-			CurrentResourceOwner = saveResourceOwner;
-			PG_RE_THROW();
-		}
-		PG_END_TRY();
-		CurrentResourceOwner = saveResourceOwner;
-		MemoryContextSwitchTo(oldcxt);
-	}
-
-	return state;
-}
-
-void
-DestroyTransitionCaptureState(TransitionCaptureState *tcs)
-{
-	if (tcs->tcs_insert_tuplestore != NULL)
-		tuplestore_end(tcs->tcs_insert_tuplestore);
-	if (tcs->tcs_update_tuplestore != NULL)
-		tuplestore_end(tcs->tcs_update_tuplestore);
-	if (tcs->tcs_old_tuplestore != NULL)
-		tuplestore_end(tcs->tcs_old_tuplestore);
-	pfree(tcs);
-}
-
 /*
  * Call a trigger function.
  *
@@ -2294,6 +2230,11 @@ ExecBSInsertTriggers(EState *estate, ResultRelInfo *relinfo)
 	if (!trigdesc->trig_insert_before_statement)
 		return;
 
+	/* no-op if we already fired BS triggers in this context */
+	if (before_stmt_triggers_fired(RelationGetRelid(relinfo->ri_RelationDesc),
+								   CMD_INSERT))
+		return;
+
 	LocTriggerData.type = T_TriggerData;
 	LocTriggerData.tg_event = TRIGGER_EVENT_INSERT |
 		TRIGGER_EVENT_BEFORE;
@@ -2504,6 +2445,11 @@ ExecBSDeleteTriggers(EState *estate, ResultRelInfo *relinfo)
 	if (!trigdesc->trig_delete_before_statement)
 		return;
 
+	/* no-op if we already fired BS triggers in this context */
+	if (before_stmt_triggers_fired(RelationGetRelid(relinfo->ri_RelationDesc),
+								   CMD_DELETE))
+		return;
+
 	LocTriggerData.type = T_TriggerData;
 	LocTriggerData.tg_event = TRIGGER_EVENT_DELETE |
 		TRIGGER_EVENT_BEFORE;
@@ -2716,6 +2662,11 @@ ExecBSUpdateTriggers(EState *estate, ResultRelInfo *relinfo)
 	if (!trigdesc->trig_update_before_statement)
 		return;
 
+	/* no-op if we already fired BS triggers in this context */
+	if (before_stmt_triggers_fired(RelationGetRelid(relinfo->ri_RelationDesc),
+								   CMD_UPDATE))
+		return;
+
 	updatedCols = GetUpdatedColumns(relinfo, estate);
 
 	LocTriggerData.type = T_TriggerData;
@@ -2864,7 +2815,7 @@ ExecBRUpdateTriggers(EState *estate, EPQState *epqstate,
 			return NULL;		/* "do nothing" */
 		}
 	}
-	if (trigtuple != fdw_trigtuple)
+	if (trigtuple != fdw_trigtuple && trigtuple != newtuple)
 		heap_freetuple(trigtuple);
 
 	if (newtuple != slottuple)
@@ -2903,8 +2854,13 @@ ExecARUpdateTriggers(EState *estate, ResultRelInfo *relinfo,
 	{
 		HeapTuple	trigtuple;
 
-		Assert(HeapTupleIsValid(fdw_trigtuple) ^ ItemPointerIsValid(tupleid));
-		if (fdw_trigtuple == NULL)
+		/*
+		 * Note: if the UPDATE is converted into a DELETE+INSERT as part of
+		 * update-partition-key operation, then this function is also called
+		 * separately for DELETE and INSERT to capture transition table rows.
+		 * In such case, either old tuple or new tuple can be NULL.
+		 */
+		if (fdw_trigtuple == NULL && ItemPointerIsValid(tupleid))
 			trigtuple = GetTupleForTrigger(estate,
 										   NULL,
 										   relinfo,
@@ -3295,7 +3251,8 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
 			if (estate->es_trig_oldtup_slot == NULL)
 			{
 				oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
-				estate->es_trig_oldtup_slot = ExecInitExtraTupleSlot(estate);
+				estate->es_trig_oldtup_slot =
+					ExecInitExtraTupleSlot(estate, NULL);
 				MemoryContextSwitchTo(oldContext);
 			}
 			oldslot = estate->es_trig_oldtup_slot;
@@ -3308,7 +3265,8 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
 			if (estate->es_trig_newtup_slot == NULL)
 			{
 				oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
-				estate->es_trig_newtup_slot = ExecInitExtraTupleSlot(estate);
+				estate->es_trig_newtup_slot =
+					ExecInitExtraTupleSlot(estate, NULL);
 				MemoryContextSwitchTo(oldContext);
 			}
 			newslot = estate->es_trig_newtup_slot;
@@ -3338,9 +3296,11 @@ TriggerEnabled(EState *estate, ResultRelInfo *relinfo,
  * during the current transaction tree.  (BEFORE triggers are fired
  * immediately so we don't need any persistent state about them.)  The struct
  * and most of its subsidiary data are kept in TopTransactionContext; however
- * the individual event records are kept in a separate sub-context.  This is
- * done mainly so that it's easy to tell from a memory context dump how much
- * space is being eaten by trigger events.
+ * some data that can be discarded sooner appears in the CurTransactionContext
+ * of the relevant subtransaction.  Also, the individual event records are
+ * kept in a separate sub-context of TopTransactionContext.  This is done
+ * mainly so that it's easy to tell from a memory context dump how much space
+ * is being eaten by trigger events.
  *
  * Because the list of pending events can grow large, we go to some
  * considerable effort to minimize per-event memory consumption.  The event
@@ -3400,6 +3360,13 @@ typedef SetConstraintStateData *SetConstraintState;
  * tuple(s).  This permits storing tuples once regardless of the number of
  * row-level triggers on a foreign table.
  *
+ * Note that we need triggers on foreign tables to be fired in exactly the
+ * order they were queued, so that the tuples come out of the tuplestore in
+ * the right order.  To ensure that, we forbid deferrable (constraint)
+ * triggers on foreign tables.  This also ensures that such triggers do not
+ * get deferred into outer trigger query levels, meaning that it's okay to
+ * destroy the tuplestore at the end of the query level.
+ *
  * Statement-level triggers always bear AFTER_TRIGGER_1CTID, though they
  * require no ctid field.  We lack the flag bit space to neatly represent that
  * distinct case, and it seems unlikely to be worth much trouble.
@@ -3433,7 +3400,7 @@ typedef struct AfterTriggerSharedData
 	Oid			ats_tgoid;		/* the trigger's ID */
 	Oid			ats_relid;		/* the relation it's on */
 	CommandId	ats_firing_id;	/* ID for firing cycle */
-	TransitionCaptureState *ats_transition_capture;
+	struct AfterTriggersTableData *ats_table;	/* transition table access */
 } AfterTriggerSharedData;
 
 typedef struct AfterTriggerEventData *AfterTriggerEvent;
@@ -3505,6 +3472,14 @@ typedef struct AfterTriggerEventList
 #define for_each_event_chunk(eptr, cptr, evtlist) \
 	for_each_chunk(cptr, evtlist) for_each_event(eptr, cptr)
 
+/* Macros for iterating from a start point that might not be list start */
+#define for_each_chunk_from(cptr) \
+	for (; cptr != NULL; cptr = cptr->next)
+#define for_each_event_from(eptr, cptr) \
+	for (; \
+		 (char *) eptr < (cptr)->freeptr; \
+		 eptr = (AfterTriggerEvent) (((char *) eptr) + SizeofTriggerEvent(eptr)))
+
 
 /*
  * All per-transaction data for the AFTER TRIGGERS module.
@@ -3529,60 +3504,108 @@ typedef struct AfterTriggerEventList
  * query_depth is the current depth of nested AfterTriggerBeginQuery calls
  * (-1 when the stack is empty).
  *
- * query_stack[query_depth] is a list of AFTER trigger events queued by the
- * current query (and the query_stack entries below it are lists of trigger
- * events queued by calling queries).  None of these are valid until the
- * matching AfterTriggerEndQuery call occurs.  At that point we fire
- * immediate-mode triggers, and append any deferred events to the main events
- * list.
+ * query_stack[query_depth] is the per-query-level data, including these fields:
+ *
+ * events is a list of AFTER trigger events queued by the current query.
+ * None of these are valid until the matching AfterTriggerEndQuery call
+ * occurs.  At that point we fire immediate-mode triggers, and append any
+ * deferred events to the main events list.
+ *
+ * fdw_tuplestore is a tuplestore containing the foreign-table tuples
+ * needed by events queued by the current query.  (Note: we use just one
+ * tuplestore even though more than one foreign table might be involved.
+ * This is okay because tuplestores don't really care what's in the tuples
+ * they store; but it's possible that someday it'd break.)
+ *
+ * tables is a List of AfterTriggersTableData structs for target tables
+ * of the current query (see below).
  *
- * fdw_tuplestores[query_depth] is a tuplestore containing the foreign tuples
- * needed for the current query.
+ * maxquerydepth is just the allocated length of query_stack.
  *
- * maxquerydepth is just the allocated length of query_stack and the
- * tuplestores.
+ * trans_stack holds per-subtransaction data, including these fields:
  *
- * state_stack is a stack of pointers to saved copies of the SET CONSTRAINTS
- * state data; each subtransaction level that modifies that state first
+ * state is NULL or a pointer to a saved copy of the SET CONSTRAINTS
+ * state data.  Each subtransaction level that modifies that state first
  * saves a copy, which we use to restore the state if we abort.
  *
- * events_stack is a stack of copies of the events head/tail pointers,
+ * events is a copy of the events head/tail pointers,
  * which we use to restore those values during subtransaction abort.
  *
- * depth_stack is a stack of copies of subtransaction-start-time query_depth,
+ * query_depth is the subtransaction-start-time value of query_depth,
  * which we similarly use to clean up at subtransaction abort.
  *
- * firing_stack is a stack of copies of subtransaction-start-time
- * firing_counter.  We use this to recognize which deferred triggers were
- * fired (or marked for firing) within an aborted subtransaction.
+ * firing_counter is the subtransaction-start-time value of firing_counter.
+ * We use this to recognize which deferred triggers were fired (or marked
+ * for firing) within an aborted subtransaction.
  *
  * We use GetCurrentTransactionNestLevel() to determine the correct array
- * index in these stacks.  maxtransdepth is the number of allocated entries in
- * each stack.  (By not keeping our own stack pointer, we can avoid trouble
+ * index in trans_stack.  maxtransdepth is the number of allocated entries in
+ * trans_stack.  (By not keeping our own stack pointer, we can avoid trouble
  * in cases where errors during subxact abort cause multiple invocations
  * of AfterTriggerEndSubXact() at the same nesting depth.)
+ *
+ * We create an AfterTriggersTableData struct for each target table of the
+ * current query, and each operation mode (INSERT/UPDATE/DELETE), that has
+ * either transition tables or statement-level triggers.  This is used to
+ * hold the relevant transition tables, as well as info tracking whether
+ * we already queued the statement triggers.  (We use that info to prevent
+ * firing the same statement triggers more than once per statement, or really
+ * once per transition table set.)  These structs, along with the transition
+ * table tuplestores, live in the (sub)transaction's CurTransactionContext.
+ * That's sufficient lifespan because we don't allow transition tables to be
+ * used by deferrable triggers, so they only need to survive until
+ * AfterTriggerEndQuery.
  */
+typedef struct AfterTriggersQueryData AfterTriggersQueryData;
+typedef struct AfterTriggersTransData AfterTriggersTransData;
+typedef struct AfterTriggersTableData AfterTriggersTableData;
+
 typedef struct AfterTriggersData
 {
 	CommandId	firing_counter; /* next firing ID to assign */
 	SetConstraintState state;	/* the active S C state */
 	AfterTriggerEventList events;	/* deferred-event list */
-	int			query_depth;	/* current query list index */
-	AfterTriggerEventList *query_stack; /* events pending from each query */
-	Tuplestorestate **fdw_tuplestores;	/* foreign tuples for one row from
-										 * each query */
-	int			maxquerydepth;	/* allocated len of above array */
 	MemoryContext event_cxt;	/* memory context for events, if any */
 
-	/* these fields are just for resetting at subtrans abort: */
+	/* per-query-level data: */
+	AfterTriggersQueryData *query_stack;	/* array of structs shown below */
+	int			query_depth;	/* current index in above array */
+	int			maxquerydepth;	/* allocated len of above array */
 
-	SetConstraintState *state_stack;	/* stacked S C states */
-	AfterTriggerEventList *events_stack;	/* stacked list pointers */
-	int		   *depth_stack;	/* stacked query_depths */
-	CommandId  *firing_stack;	/* stacked firing_counters */
-	int			maxtransdepth;	/* allocated len of above arrays */
+	/* per-subtransaction-level data: */
+	AfterTriggersTransData *trans_stack;	/* array of structs shown below */
+	int			maxtransdepth;	/* allocated len of above array */
 } AfterTriggersData;
 
+struct AfterTriggersQueryData
+{
+	AfterTriggerEventList events;	/* events pending from this query */
+	Tuplestorestate *fdw_tuplestore;	/* foreign tuples for said events */
+	List	   *tables;			/* list of AfterTriggersTableData, see below */
+};
+
+struct AfterTriggersTransData
+{
+	/* these fields are just for resetting at subtrans abort: */
+	SetConstraintState state;	/* saved S C state, or NULL if not yet saved */
+	AfterTriggerEventList events;	/* saved list pointer */
+	int			query_depth;	/* saved query_depth */
+	CommandId	firing_counter; /* saved firing_counter */
+};
+
+struct AfterTriggersTableData
+{
+	/* relid + cmdType form the lookup key for these structs: */
+	Oid			relid;			/* target table's OID */
+	CmdType		cmdType;		/* event type, CMD_INSERT/UPDATE/DELETE */
+	bool		closed;			/* true when no longer OK to add tuples */
+	bool		before_trig_done;	/* did we already queue BS triggers? */
+	bool		after_trig_done;	/* did we already queue AS triggers? */
+	AfterTriggerEventList after_trig_events;	/* if so, saved list pointer */
+	Tuplestorestate *old_tuplestore;	/* "old" transition table, if any */
+	Tuplestorestate *new_tuplestore;	/* "new" transition table, if any */
+};
+
 static AfterTriggersData afterTriggers;
 
 static void AfterTriggerExecute(AfterTriggerEvent event,
@@ -3591,50 +3614,46 @@ static void AfterTriggerExecute(AfterTriggerEvent event,
 					Instrumentation *instr,
 					MemoryContext per_tuple_context,
 					TupleTableSlot *trig_tuple_slot1,
-					TupleTableSlot *trig_tuple_slot2,
-					TransitionCaptureState *transition_capture);
+					TupleTableSlot *trig_tuple_slot2);
+static AfterTriggersTableData *GetAfterTriggersTableData(Oid relid,
+						  CmdType cmdType);
+static void AfterTriggerFreeQuery(AfterTriggersQueryData *qs);
 static SetConstraintState SetConstraintStateCreate(int numalloc);
 static SetConstraintState SetConstraintStateCopy(SetConstraintState state);
 static SetConstraintState SetConstraintStateAddItem(SetConstraintState state,
 						  Oid tgoid, bool tgisdeferred);
+static void cancel_prior_stmt_triggers(Oid relid, CmdType cmdType, int tgevent);
 
 
 /*
- * Gets a current query transition tuplestore and initializes it if necessary.
+ * Get the FDW tuplestore for the current trigger query level, creating it
+ * if necessary.
  */
 static Tuplestorestate *
-GetTriggerTransitionTuplestore(Tuplestorestate **tss)
+GetCurrentFDWTuplestore(void)
 {
 	Tuplestorestate *ret;
 
-	ret = tss[afterTriggers.query_depth];
+	ret = afterTriggers.query_stack[afterTriggers.query_depth].fdw_tuplestore;
 	if (ret == NULL)
 	{
 		MemoryContext oldcxt;
 		ResourceOwner saveResourceOwner;
 
 		/*
-		 * Make the tuplestore valid until end of transaction.  This is the
-		 * allocation lifespan of the associated events list, but we really
+		 * Make the tuplestore valid until end of subtransaction.  We really
 		 * only need it until AfterTriggerEndQuery().
 		 */
-		oldcxt = MemoryContextSwitchTo(TopTransactionContext);
+		oldcxt = MemoryContextSwitchTo(CurTransactionContext);
 		saveResourceOwner = CurrentResourceOwner;
-		PG_TRY();
-		{
-			CurrentResourceOwner = TopTransactionResourceOwner;
-			ret = tuplestore_begin_heap(false, false, work_mem);
-		}
-		PG_CATCH();
-		{
-			CurrentResourceOwner = saveResourceOwner;
-			PG_RE_THROW();
-		}
-		PG_END_TRY();
+		CurrentResourceOwner = CurTransactionResourceOwner;
+
+		ret = tuplestore_begin_heap(false, false, work_mem);
+
 		CurrentResourceOwner = saveResourceOwner;
 		MemoryContextSwitchTo(oldcxt);
 
-		tss[afterTriggers.query_depth] = ret;
+		afterTriggers.query_stack[afterTriggers.query_depth].fdw_tuplestore = ret;
 	}
 
 	return ret;
@@ -3780,7 +3799,7 @@ afterTriggerAddEvent(AfterTriggerEventList *events,
 		if (newshared->ats_tgoid == evtshared->ats_tgoid &&
 			newshared->ats_relid == evtshared->ats_relid &&
 			newshared->ats_event == evtshared->ats_event &&
-			newshared->ats_transition_capture == evtshared->ats_transition_capture &&
+			newshared->ats_table == evtshared->ats_table &&
 			newshared->ats_firing_id == 0)
 			break;
 	}
@@ -3812,14 +3831,12 @@ static void
 afterTriggerFreeEventList(AfterTriggerEventList *events)
 {
 	AfterTriggerEventChunk *chunk;
-	AfterTriggerEventChunk *next_chunk;
 
-	for (chunk = events->head; chunk != NULL; chunk = next_chunk)
+	while ((chunk = events->head) != NULL)
 	{
-		next_chunk = chunk->next;
+		events->head = chunk->next;
 		pfree(chunk);
 	}
-	events->head = NULL;
 	events->tail = NULL;
 	events->tailfree = NULL;
 }
@@ -3863,6 +3880,45 @@ afterTriggerRestoreEventList(AfterTriggerEventList *events,
 	}
 }
 
+/* ----------
+ * afterTriggerDeleteHeadEventChunk()
+ *
+ *	Remove the first chunk of events from the query level's event list.
+ *	Keep any event list pointers elsewhere in the query level's data
+ *	structures in sync.
+ * ----------
+ */
+static void
+afterTriggerDeleteHeadEventChunk(AfterTriggersQueryData *qs)
+{
+	AfterTriggerEventChunk *target = qs->events.head;
+	ListCell   *lc;
+
+	Assert(target && target->next);
+
+	/*
+	 * First, update any pointers in the per-table data, so that they won't be
+	 * dangling.  Resetting obsoleted pointers to NULL will make
+	 * cancel_prior_stmt_triggers start from the list head, which is fine.
+	 */
+	foreach(lc, qs->tables)
+	{
+		AfterTriggersTableData *table = (AfterTriggersTableData *) lfirst(lc);
+
+		if (table->after_trig_done &&
+			table->after_trig_events.tail == target)
+		{
+			table->after_trig_events.head = NULL;
+			table->after_trig_events.tail = NULL;
+			table->after_trig_events.tailfree = NULL;
+		}
+	}
+
+	/* Now we can flush the head chunk */
+	qs->events.head = target->next;
+	pfree(target);
+}
+
 
 /* ----------
  * AfterTriggerExecute()
@@ -3892,8 +3948,7 @@ AfterTriggerExecute(AfterTriggerEvent event,
 					FmgrInfo *finfo, Instrumentation *instr,
 					MemoryContext per_tuple_context,
 					TupleTableSlot *trig_tuple_slot1,
-					TupleTableSlot *trig_tuple_slot2,
-					TransitionCaptureState *transition_capture)
+					TupleTableSlot *trig_tuple_slot2)
 {
 	AfterTriggerShared evtshared = GetTriggerSharedData(event);
 	Oid			tgoid = evtshared->ats_tgoid;
@@ -3934,9 +3989,7 @@ AfterTriggerExecute(AfterTriggerEvent event,
 	{
 		case AFTER_TRIGGER_FDW_FETCH:
 			{
-				Tuplestorestate *fdw_tuplestore =
-				GetTriggerTransitionTuplestore
-				(afterTriggers.fdw_tuplestores);
+				Tuplestorestate *fdw_tuplestore = GetCurrentFDWTuplestore();
 
 				if (!tuplestore_gettupleslot(fdw_tuplestore, true, false,
 											 trig_tuple_slot1))
@@ -4006,36 +4059,25 @@ AfterTriggerExecute(AfterTriggerEvent event,
 	}
 
 	/*
-	 * Set up the tuplestore information.
+	 * Set up the tuplestore information to let the trigger have access to
+	 * transition tables.  When we first make a transition table available to
+	 * a trigger, mark it "closed" so that it cannot change anymore.  If any
+	 * additional events of the same type get queued in the current trigger
+	 * query level, they'll go into new transition tables.
 	 */
 	LocTriggerData.tg_oldtable = LocTriggerData.tg_newtable = NULL;
-	if (transition_capture != NULL)
+	if (evtshared->ats_table)
 	{
 		if (LocTriggerData.tg_trigger->tgoldtable)
-			LocTriggerData.tg_oldtable = transition_capture->tcs_old_tuplestore;
-		if (LocTriggerData.tg_trigger->tgnewtable)
 		{
-			/*
-			 * Currently a trigger with transition tables may only be defined
-			 * for a single event type (here AFTER INSERT or AFTER UPDATE, but
-			 * not AFTER INSERT OR ...).
-			 */
-			Assert((TRIGGER_FOR_INSERT(LocTriggerData.tg_trigger->tgtype) != 0) ^
-				   (TRIGGER_FOR_UPDATE(LocTriggerData.tg_trigger->tgtype) != 0));
+			LocTriggerData.tg_oldtable = evtshared->ats_table->old_tuplestore;
+			evtshared->ats_table->closed = true;
+		}
 
-			/*
-			 * Show either the insert or update new tuple images, depending on
-			 * which event type the trigger was registered for.  A single
-			 * statement may have produced both in the case of INSERT ... ON
-			 * CONFLICT ... DO UPDATE, and in that case the event determines
-			 * which tuplestore the trigger sees as the NEW TABLE.
-			 */
-			if (TRIGGER_FOR_INSERT(LocTriggerData.tg_trigger->tgtype))
-				LocTriggerData.tg_newtable =
-					transition_capture->tcs_insert_tuplestore;
-			else
-				LocTriggerData.tg_newtable =
-					transition_capture->tcs_update_tuplestore;
+		if (LocTriggerData.tg_trigger->tgnewtable)
+		{
+			LocTriggerData.tg_newtable = evtshared->ats_table->new_tuplestore;
+			evtshared->ats_table->closed = true;
 		}
 	}
 
@@ -4089,10 +4131,10 @@ AfterTriggerExecute(AfterTriggerEvent event,
  *	If move_list isn't NULL, events that are not to be invoked now are
  *	transferred to move_list.
  *
- *	When immediate_only is TRUE, do not invoke currently-deferred triggers.
- *	(This will be FALSE only at main transaction exit.)
+ *	When immediate_only is true, do not invoke currently-deferred triggers.
+ *	(This will be false only at main transaction exit.)
  *
- *	Returns TRUE if any invokable events were found.
+ *	Returns true if any invokable events were found.
  */
 static bool
 afterTriggerMarkEvents(AfterTriggerEventList *events,
@@ -4156,14 +4198,14 @@ afterTriggerMarkEvents(AfterTriggerEventList *events,
  *	make one locally to cache the info in case there are multiple trigger
  *	events per rel.
  *
- *	When delete_ok is TRUE, it's safe to delete fully-processed events.
+ *	When delete_ok is true, it's safe to delete fully-processed events.
  *	(We are not very tense about that: we simply reset a chunk to be empty
  *	if all its events got fired.  The objective here is just to avoid useless
  *	rescanning of events when a trigger queues new events during transaction
  *	end, so it's not necessary to worry much about the case where only
  *	some events are fired.)
  *
- *	Returns TRUE if no unfired events remain in the list (this allows us
+ *	Returns true if no unfired events remain in the list (this allows us
  *	to avoid repeating afterTriggerMarkEvents).
  */
 static bool
@@ -4245,8 +4287,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 				 * won't try to re-fire it.
 				 */
 				AfterTriggerExecute(event, rel, trigdesc, finfo, instr,
-									per_tuple_context, slot1, slot2,
-									evtshared->ats_transition_capture);
+									per_tuple_context, slot1, slot2);
 
 				/*
 				 * Mark the event as done.
@@ -4270,7 +4311,7 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 			/*
 			 * If it's last chunk, must sync event list's tailfree too.  Note
 			 * that delete_ok must NOT be passed as true if there could be
-			 * stacked AfterTriggerEventList values pointing at this event
+			 * additional AfterTriggerEventList values pointing at this event
 			 * list, since we'd fail to fix their copies of tailfree.
 			 */
 			if (chunk == events->tail)
@@ -4296,6 +4337,159 @@ afterTriggerInvokeEvents(AfterTriggerEventList *events,
 }
 
 
+/*
+ * GetAfterTriggersTableData
+ *
+ * Find or create an AfterTriggersTableData struct for the specified
+ * trigger event (relation + operation type).  Ignore existing structs
+ * marked "closed"; we don't want to put any additional tuples into them,
+ * nor change their stmt-triggers-fired state.
+ *
+ * Note: the AfterTriggersTableData list is allocated in the current
+ * (sub)transaction's CurTransactionContext.  This is OK because
+ * we don't need it to live past AfterTriggerEndQuery.
+ */
+static AfterTriggersTableData *
+GetAfterTriggersTableData(Oid relid, CmdType cmdType)
+{
+	AfterTriggersTableData *table;
+	AfterTriggersQueryData *qs;
+	MemoryContext oldcxt;
+	ListCell   *lc;
+
+	/* Caller should have ensured query_depth is OK. */
+	Assert(afterTriggers.query_depth >= 0 &&
+		   afterTriggers.query_depth < afterTriggers.maxquerydepth);
+	qs = &afterTriggers.query_stack[afterTriggers.query_depth];
+
+	foreach(lc, qs->tables)
+	{
+		table = (AfterTriggersTableData *) lfirst(lc);
+		if (table->relid == relid && table->cmdType == cmdType &&
+			!table->closed)
+			return table;
+	}
+
+	oldcxt = MemoryContextSwitchTo(CurTransactionContext);
+
+	table = (AfterTriggersTableData *) palloc0(sizeof(AfterTriggersTableData));
+	table->relid = relid;
+	table->cmdType = cmdType;
+	qs->tables = lappend(qs->tables, table);
+
+	MemoryContextSwitchTo(oldcxt);
+
+	return table;
+}
+
+
+/*
+ * MakeTransitionCaptureState
+ *
+ * Make a TransitionCaptureState object for the given TriggerDesc, target
+ * relation, and operation type.  The TCS object holds all the state needed
+ * to decide whether to capture tuples in transition tables.
+ *
+ * If there are no triggers in 'trigdesc' that request relevant transition
+ * tables, then return NULL.
+ *
+ * The resulting object can be passed to the ExecAR* functions.  The caller
+ * should set tcs_map or tcs_original_insert_tuple as appropriate when dealing
+ * with child tables.
+ *
+ * Note that we copy the flags from a parent table into this struct (rather
+ * than subsequently using the relation's TriggerDesc directly) so that we can
+ * use it to control collection of transition tuples from child tables.
+ *
+ * Per SQL spec, all operations of the same kind (INSERT/UPDATE/DELETE)
+ * on the same table during one query should share one transition table.
+ * Therefore, the Tuplestores are owned by an AfterTriggersTableData struct
+ * looked up using the table OID + CmdType, and are merely referenced by
+ * the TransitionCaptureState objects we hand out to callers.
+ */
+TransitionCaptureState *
+MakeTransitionCaptureState(TriggerDesc *trigdesc, Oid relid, CmdType cmdType)
+{
+	TransitionCaptureState *state;
+	bool		need_old,
+				need_new;
+	AfterTriggersTableData *table;
+	MemoryContext oldcxt;
+	ResourceOwner saveResourceOwner;
+
+	if (trigdesc == NULL)
+		return NULL;
+
+	/* Detect which table(s) we need. */
+	switch (cmdType)
+	{
+		case CMD_INSERT:
+			need_old = false;
+			need_new = trigdesc->trig_insert_new_table;
+			break;
+		case CMD_UPDATE:
+			need_old = trigdesc->trig_update_old_table;
+			need_new = trigdesc->trig_update_new_table;
+			break;
+		case CMD_DELETE:
+			need_old = trigdesc->trig_delete_old_table;
+			need_new = false;
+			break;
+		default:
+			elog(ERROR, "unexpected CmdType: %d", (int) cmdType);
+			need_old = need_new = false;	/* keep compiler quiet */
+			break;
+	}
+	if (!need_old && !need_new)
+		return NULL;
+
+	/* Check state, like AfterTriggerSaveEvent. */
+	if (afterTriggers.query_depth < 0)
+		elog(ERROR, "MakeTransitionCaptureState() called outside of query");
+
+	/* Be sure we have enough space to record events at this query depth. */
+	if (afterTriggers.query_depth >= afterTriggers.maxquerydepth)
+		AfterTriggerEnlargeQueryState();
+
+	/*
+	 * Find or create an AfterTriggersTableData struct to hold the
+	 * tuplestore(s).  If there's a matching struct but it's marked closed,
+	 * ignore it; we need a newer one.
+	 *
+	 * Note: the AfterTriggersTableData list, as well as the tuplestores, are
+	 * allocated in the current (sub)transaction's CurTransactionContext, and
+	 * the tuplestores are managed by the (sub)transaction's resource owner.
+	 * This is sufficient lifespan because we do not allow triggers using
+	 * transition tables to be deferrable; they will be fired during
+	 * AfterTriggerEndQuery, after which it's okay to delete the data.
+	 */
+	table = GetAfterTriggersTableData(relid, cmdType);
+
+	/* Now create required tuplestore(s), if we don't have them already. */
+	oldcxt = MemoryContextSwitchTo(CurTransactionContext);
+	saveResourceOwner = CurrentResourceOwner;
+	CurrentResourceOwner = CurTransactionResourceOwner;
+
+	if (need_old && table->old_tuplestore == NULL)
+		table->old_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+	if (need_new && table->new_tuplestore == NULL)
+		table->new_tuplestore = tuplestore_begin_heap(false, false, work_mem);
+
+	CurrentResourceOwner = saveResourceOwner;
+	MemoryContextSwitchTo(oldcxt);
+
+	/* Now build the TransitionCaptureState struct, in caller's context */
+	state = (TransitionCaptureState *) palloc0(sizeof(TransitionCaptureState));
+	state->tcs_delete_old_table = trigdesc->trig_delete_old_table;
+	state->tcs_update_old_table = trigdesc->trig_update_old_table;
+	state->tcs_update_new_table = trigdesc->trig_update_new_table;
+	state->tcs_insert_new_table = trigdesc->trig_insert_new_table;
+	state->tcs_private = table;
+
+	return state;
+}
+
+
 /* ----------
  * AfterTriggerBeginXact()
  *
@@ -4319,14 +4513,10 @@ AfterTriggerBeginXact(void)
 	 */
 	Assert(afterTriggers.state == NULL);
 	Assert(afterTriggers.query_stack == NULL);
-	Assert(afterTriggers.fdw_tuplestores == NULL);
 	Assert(afterTriggers.maxquerydepth == 0);
 	Assert(afterTriggers.event_cxt == NULL);
 	Assert(afterTriggers.events.head == NULL);
-	Assert(afterTriggers.state_stack == NULL);
-	Assert(afterTriggers.events_stack == NULL);
-	Assert(afterTriggers.depth_stack == NULL);
-	Assert(afterTriggers.firing_stack == NULL);
+	Assert(afterTriggers.trans_stack == NULL);
 	Assert(afterTriggers.maxtransdepth == 0);
 }
 
@@ -4362,8 +4552,7 @@ AfterTriggerBeginQuery(void)
 void
 AfterTriggerEndQuery(EState *estate)
 {
-	AfterTriggerEventList *events;
-	Tuplestorestate *fdw_tuplestore;
+	AfterTriggersQueryData *qs;
 
 	/* Must be inside a query, too */
 	Assert(afterTriggers.query_depth >= 0);
@@ -4393,38 +4582,103 @@ AfterTriggerEndQuery(EState *estate)
 	 * will instead fire any triggers in a dedicated query level.  Foreign key
 	 * enforcement triggers do add to the current query level, thanks to their
 	 * passing fire_triggers = false to SPI_execute_snapshot().  Other
-	 * C-language triggers might do likewise.  Be careful here: firing a
-	 * trigger could result in query_stack being repalloc'd, so we can't save
-	 * its address across afterTriggerInvokeEvents calls.
+	 * C-language triggers might do likewise.
 	 *
 	 * If we find no firable events, we don't have to increment
 	 * firing_counter.
 	 */
+	qs = &afterTriggers.query_stack[afterTriggers.query_depth];
+
 	for (;;)
 	{
-		events = &afterTriggers.query_stack[afterTriggers.query_depth];
-		if (afterTriggerMarkEvents(events, &afterTriggers.events, true))
+		if (afterTriggerMarkEvents(&qs->events, &afterTriggers.events, true))
 		{
 			CommandId	firing_id = afterTriggers.firing_counter++;
+			AfterTriggerEventChunk *oldtail = qs->events.tail;
 
-			/* OK to delete the immediate events after processing them */
-			if (afterTriggerInvokeEvents(events, firing_id, estate, true))
+			if (afterTriggerInvokeEvents(&qs->events, firing_id, estate, false))
 				break;			/* all fired */
+
+			/*
+			 * Firing a trigger could result in query_stack being repalloc'd,
+			 * so we must recalculate qs after each afterTriggerInvokeEvents
+			 * call.  Furthermore, it's unsafe to pass delete_ok = true here,
+			 * because that could cause afterTriggerInvokeEvents to try to
+			 * access qs->events after the stack has been repalloc'd.
+			 */
+			qs = &afterTriggers.query_stack[afterTriggers.query_depth];
+
+			/*
+			 * We'll need to scan the events list again.  To reduce the cost
+			 * of doing so, get rid of completely-fired chunks.  We know that
+			 * all events were marked IN_PROGRESS or DONE at the conclusion of
+			 * afterTriggerMarkEvents, so any still-interesting events must
+			 * have been added after that, and so must be in the chunk that
+			 * was then the tail chunk, or in later chunks.  So, zap all
+			 * chunks before oldtail.  This is approximately the same set of
+			 * events we would have gotten rid of by passing delete_ok = true.
+			 */
+			Assert(oldtail != NULL);
+			while (qs->events.head != oldtail)
+				afterTriggerDeleteHeadEventChunk(qs);
 		}
 		else
 			break;
 	}
 
-	/* Release query-local storage for events, including tuplestore if any */
-	fdw_tuplestore = afterTriggers.fdw_tuplestores[afterTriggers.query_depth];
-	if (fdw_tuplestore)
+	/* Release query-level-local storage, including tuplestores if any */
+	AfterTriggerFreeQuery(&afterTriggers.query_stack[afterTriggers.query_depth]);
+
+	afterTriggers.query_depth--;
+}
+
+
+/*
+ * AfterTriggerFreeQuery
+ *	Release subsidiary storage for a trigger query level.
+ *	This includes closing down tuplestores.
+ *	Note: it's important for this to be safe if interrupted by an error
+ *	and then called again for the same query level.
+ */
+static void
+AfterTriggerFreeQuery(AfterTriggersQueryData *qs)
+{
+	Tuplestorestate *ts;
+	List	   *tables;
+	ListCell   *lc;
+
+	/* Drop the trigger events */
+	afterTriggerFreeEventList(&qs->events);
+
+	/* Drop FDW tuplestore if any */
+	ts = qs->fdw_tuplestore;
+	qs->fdw_tuplestore = NULL;
+	if (ts)
+		tuplestore_end(ts);
+
+	/* Release per-table subsidiary storage */
+	tables = qs->tables;
+	foreach(lc, tables)
 	{
-		tuplestore_end(fdw_tuplestore);
-		afterTriggers.fdw_tuplestores[afterTriggers.query_depth] = NULL;
+		AfterTriggersTableData *table = (AfterTriggersTableData *) lfirst(lc);
+
+		ts = table->old_tuplestore;
+		table->old_tuplestore = NULL;
+		if (ts)
+			tuplestore_end(ts);
+		ts = table->new_tuplestore;
+		table->new_tuplestore = NULL;
+		if (ts)
+			tuplestore_end(ts);
 	}
-	afterTriggerFreeEventList(&afterTriggers.query_stack[afterTriggers.query_depth]);
 
-	afterTriggers.query_depth--;
+	/*
+	 * Now free the AfterTriggersTableData structs and list cells.  Reset list
+	 * pointer first; if list_free_deep somehow gets an error, better to leak
+	 * that storage than have an infinite loop.
+	 */
+	qs->tables = NIL;
+	list_free_deep(tables);
 }
 
 
@@ -4521,10 +4775,7 @@ AfterTriggerEndXact(bool isCommit)
 	 * large, we let the eventual reset of TopTransactionContext free the
 	 * memory instead of doing it here.
 	 */
-	afterTriggers.state_stack = NULL;
-	afterTriggers.events_stack = NULL;
-	afterTriggers.depth_stack = NULL;
-	afterTriggers.firing_stack = NULL;
+	afterTriggers.trans_stack = NULL;
 	afterTriggers.maxtransdepth = 0;
 
 
@@ -4534,7 +4785,6 @@ AfterTriggerEndXact(bool isCommit)
 	 * memory here.
 	 */
 	afterTriggers.query_stack = NULL;
-	afterTriggers.fdw_tuplestores = NULL;
 	afterTriggers.maxquerydepth = 0;
 	afterTriggers.state = NULL;
 
@@ -4553,48 +4803,28 @@ AfterTriggerBeginSubXact(void)
 	int			my_level = GetCurrentTransactionNestLevel();
 
 	/*
-	 * Allocate more space in the stacks if needed.  (Note: because the
+	 * Allocate more space in the trans_stack if needed.  (Note: because the
 	 * minimum nest level of a subtransaction is 2, we waste the first couple
-	 * entries of each array; not worth the notational effort to avoid it.)
+	 * entries of the array; not worth the notational effort to avoid it.)
 	 */
 	while (my_level >= afterTriggers.maxtransdepth)
 	{
 		if (afterTriggers.maxtransdepth == 0)
 		{
-			MemoryContext old_cxt;
-
-			old_cxt = MemoryContextSwitchTo(TopTransactionContext);
-
-#define DEFTRIG_INITALLOC 8
-			afterTriggers.state_stack = (SetConstraintState *)
-				palloc(DEFTRIG_INITALLOC * sizeof(SetConstraintState));
-			afterTriggers.events_stack = (AfterTriggerEventList *)
-				palloc(DEFTRIG_INITALLOC * sizeof(AfterTriggerEventList));
-			afterTriggers.depth_stack = (int *)
-				palloc(DEFTRIG_INITALLOC * sizeof(int));
-			afterTriggers.firing_stack = (CommandId *)
-				palloc(DEFTRIG_INITALLOC * sizeof(CommandId));
-			afterTriggers.maxtransdepth = DEFTRIG_INITALLOC;
-
-			MemoryContextSwitchTo(old_cxt);
+			/* Arbitrarily initialize for max of 8 subtransaction levels */
+			afterTriggers.trans_stack = (AfterTriggersTransData *)
+				MemoryContextAlloc(TopTransactionContext,
+								   8 * sizeof(AfterTriggersTransData));
+			afterTriggers.maxtransdepth = 8;
 		}
 		else
 		{
-			/* repalloc will keep the stacks in the same context */
+			/* repalloc will keep the stack in the same context */
 			int			new_alloc = afterTriggers.maxtransdepth * 2;
 
-			afterTriggers.state_stack = (SetConstraintState *)
-				repalloc(afterTriggers.state_stack,
-						 new_alloc * sizeof(SetConstraintState));
-			afterTriggers.events_stack = (AfterTriggerEventList *)
-				repalloc(afterTriggers.events_stack,
-						 new_alloc * sizeof(AfterTriggerEventList));
-			afterTriggers.depth_stack = (int *)
-				repalloc(afterTriggers.depth_stack,
-						 new_alloc * sizeof(int));
-			afterTriggers.firing_stack = (CommandId *)
-				repalloc(afterTriggers.firing_stack,
-						 new_alloc * sizeof(CommandId));
+			afterTriggers.trans_stack = (AfterTriggersTransData *)
+				repalloc(afterTriggers.trans_stack,
+						 new_alloc * sizeof(AfterTriggersTransData));
 			afterTriggers.maxtransdepth = new_alloc;
 		}
 	}
@@ -4604,10 +4834,10 @@ AfterTriggerBeginSubXact(void)
 	 * is not saved until/unless changed.  Likewise, we don't make a
 	 * per-subtransaction event context until needed.
 	 */
-	afterTriggers.state_stack[my_level] = NULL;
-	afterTriggers.events_stack[my_level] = afterTriggers.events;
-	afterTriggers.depth_stack[my_level] = afterTriggers.query_depth;
-	afterTriggers.firing_stack[my_level] = afterTriggers.firing_counter;
+	afterTriggers.trans_stack[my_level].state = NULL;
+	afterTriggers.trans_stack[my_level].events = afterTriggers.events;
+	afterTriggers.trans_stack[my_level].query_depth = afterTriggers.query_depth;
+	afterTriggers.trans_stack[my_level].firing_counter = afterTriggers.firing_counter;
 }
 
 /*
@@ -4631,70 +4861,58 @@ AfterTriggerEndSubXact(bool isCommit)
 	{
 		Assert(my_level < afterTriggers.maxtransdepth);
 		/* If we saved a prior state, we don't need it anymore */
-		state = afterTriggers.state_stack[my_level];
+		state = afterTriggers.trans_stack[my_level].state;
 		if (state != NULL)
 			pfree(state);
 		/* this avoids double pfree if error later: */
-		afterTriggers.state_stack[my_level] = NULL;
+		afterTriggers.trans_stack[my_level].state = NULL;
 		Assert(afterTriggers.query_depth ==
-			   afterTriggers.depth_stack[my_level]);
+			   afterTriggers.trans_stack[my_level].query_depth);
 	}
 	else
 	{
 		/*
 		 * Aborting.  It is possible subxact start failed before calling
 		 * AfterTriggerBeginSubXact, in which case we mustn't risk touching
-		 * stack levels that aren't there.
+		 * trans_stack levels that aren't there.
 		 */
 		if (my_level >= afterTriggers.maxtransdepth)
 			return;
 
 		/*
-		 * Release any event lists from queries being aborted, and restore
+		 * Release query-level storage for queries being aborted, and restore
 		 * query_depth to its pre-subxact value.  This assumes that a
 		 * subtransaction will not add events to query levels started in a
 		 * earlier transaction state.
 		 */
-		while (afterTriggers.query_depth > afterTriggers.depth_stack[my_level])
+		while (afterTriggers.query_depth > afterTriggers.trans_stack[my_level].query_depth)
 		{
 			if (afterTriggers.query_depth < afterTriggers.maxquerydepth)
-			{
-				Tuplestorestate *ts;
-
-				ts = afterTriggers.fdw_tuplestores[afterTriggers.query_depth];
-				if (ts)
-				{
-					tuplestore_end(ts);
-					afterTriggers.fdw_tuplestores[afterTriggers.query_depth] = NULL;
-				}
-
-				afterTriggerFreeEventList(&afterTriggers.query_stack[afterTriggers.query_depth]);
-			}
-
+				AfterTriggerFreeQuery(&afterTriggers.query_stack[afterTriggers.query_depth]);
 			afterTriggers.query_depth--;
 		}
 		Assert(afterTriggers.query_depth ==
-			   afterTriggers.depth_stack[my_level]);
+			   afterTriggers.trans_stack[my_level].query_depth);
 
 		/*
 		 * Restore the global deferred-event list to its former length,
 		 * discarding any events queued by the subxact.
 		 */
 		afterTriggerRestoreEventList(&afterTriggers.events,
-									 &afterTriggers.events_stack[my_level]);
+									 &afterTriggers.trans_stack[my_level].events);
 
 		/*
 		 * Restore the trigger state.  If the saved state is NULL, then this
 		 * subxact didn't save it, so it doesn't need restoring.
 		 */
-		state = afterTriggers.state_stack[my_level];
+		state = afterTriggers.trans_stack[my_level].state;
 		if (state != NULL)
 		{
 			pfree(afterTriggers.state);
 			afterTriggers.state = state;
 		}
 		/* this avoids double pfree if error later: */
-		afterTriggers.state_stack[my_level] = NULL;
+		afterTriggers.trans_stack[my_level].state = NULL;
 
 		/*
 		 * Scan for any remaining deferred events that were marked DONE or IN
@@ -4704,7 +4922,7 @@ AfterTriggerEndSubXact(bool isCommit)
 		 * (This essentially assumes that the current subxact includes all
 		 * subxacts started after it.)
 		 */
-		subxact_firing_id = afterTriggers.firing_stack[my_level];
+		subxact_firing_id = afterTriggers.trans_stack[my_level].firing_counter;
 		for_each_event_chunk(event, chunk, afterTriggers.events)
 		{
 			AfterTriggerShared evtshared = GetTriggerSharedData(event);
@@ -4740,12 +4958,9 @@ AfterTriggerEnlargeQueryState(void)
 	{
 		int			new_alloc = Max(afterTriggers.query_depth + 1, 8);
 
-		afterTriggers.query_stack = (AfterTriggerEventList *)
+		afterTriggers.query_stack = (AfterTriggersQueryData *)
 			MemoryContextAlloc(TopTransactionContext,
-							   new_alloc * sizeof(AfterTriggerEventList));
-		afterTriggers.fdw_tuplestores = (Tuplestorestate **)
-			MemoryContextAllocZero(TopTransactionContext,
-								   new_alloc * sizeof(Tuplestorestate *));
+							   new_alloc * sizeof(AfterTriggersQueryData));
 		afterTriggers.maxquerydepth = new_alloc;
 	}
 	else
@@ -4755,27 +4970,22 @@ AfterTriggerEnlargeQueryState(void)
 		int			new_alloc = Max(afterTriggers.query_depth + 1,
 									old_alloc * 2);
 
-		afterTriggers.query_stack = (AfterTriggerEventList *)
+		afterTriggers.query_stack = (AfterTriggersQueryData *)
 			repalloc(afterTriggers.query_stack,
-					 new_alloc * sizeof(AfterTriggerEventList));
-		afterTriggers.fdw_tuplestores = (Tuplestorestate **)
-			repalloc(afterTriggers.fdw_tuplestores,
-					 new_alloc * sizeof(Tuplestorestate *));
-		/* Clear newly-allocated slots for subsequent lazy initialization. */
-		memset(afterTriggers.fdw_tuplestores + old_alloc,
-			   0, (new_alloc - old_alloc) * sizeof(Tuplestorestate *));
+					 new_alloc * sizeof(AfterTriggersQueryData));
 		afterTriggers.maxquerydepth = new_alloc;
 	}
 
-	/* Initialize new query lists to empty */
+	/* Initialize new array entries to empty */
 	while (init_depth < afterTriggers.maxquerydepth)
 	{
-		AfterTriggerEventList *events;
+		AfterTriggersQueryData *qs = &afterTriggers.query_stack[init_depth];
 
-		events = &afterTriggers.query_stack[init_depth];
-		events->head = NULL;
-		events->tail = NULL;
-		events->tailfree = NULL;
+		qs->events.head = NULL;
+		qs->events.tail = NULL;
+		qs->events.tailfree = NULL;
+		qs->fdw_tuplestore = NULL;
+		qs->tables = NIL;
 
 		++init_depth;
 	}
@@ -4873,9 +5083,9 @@ AfterTriggerSetState(ConstraintsSetStmt *stmt)
 	 * save it so it can be restored if the subtransaction aborts.
 	 */
 	if (my_level > 1 &&
-		afterTriggers.state_stack[my_level] == NULL)
+		afterTriggers.trans_stack[my_level].state == NULL)
 	{
-		afterTriggers.state_stack[my_level] =
+		afterTriggers.trans_stack[my_level].state =
 			SetConstraintStateCopy(afterTriggers.state);
 	}
 
@@ -5184,7 +5394,7 @@ AfterTriggerPendingOnRel(Oid relid)
 	 */
 	for (depth = 0; depth <= afterTriggers.query_depth && depth < afterTriggers.maxquerydepth; depth++)
 	{
-		for_each_event_chunk(event, chunk, afterTriggers.query_stack[depth])
+		for_each_event_chunk(event, chunk, afterTriggers.query_stack[depth].events)
 		{
 			AfterTriggerShared evtshared = GetTriggerSharedData(event);
 
@@ -5211,7 +5421,12 @@ AfterTriggerPendingOnRel(Oid relid)
  *	triggers actually need to be queued.  It is also called after each row,
  *	even if there are no triggers for that event, if there are any AFTER
  *	STATEMENT triggers for the statement which use transition tables, so that
- *	the transition tuplestores can be built.
+ *	the transition tuplestores can be built.  Furthermore, if the transition
+ *	capture is happening for UPDATEd rows being moved to another partition due
+ *	to the partition-key being changed, then this function is called once when
+ *	the row is deleted (to capture OLD row), and once when the row is inserted
+ *	into another partition (to capture NEW row).  This is done separately because
+ *	DELETE and INSERT happen on different tables.
  *
  *	Transition tuplestores are built now, rather than when events are pulled
  *	off of the queue because AFTER ROW triggers are allowed to select from the
@@ -5229,7 +5444,7 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 	TriggerDesc *trigdesc = relinfo->ri_TrigDesc;
 	AfterTriggerEventData new_event;
 	AfterTriggerSharedData new_shared;
-	char		relkind = relinfo->ri_RelationDesc->rd_rel->relkind;
+	char		relkind = rel->rd_rel->relkind;
 	int			tgtype_event;
 	int			tgtype_level;
 	int			i;
@@ -5260,13 +5475,26 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 		bool		update_new_table = transition_capture->tcs_update_new_table;
 		bool		insert_new_table = transition_capture->tcs_insert_new_table;;
 
-		if ((event == TRIGGER_EVENT_DELETE && delete_old_table) ||
-			(event == TRIGGER_EVENT_UPDATE && update_old_table))
+		/*
+		 * For INSERT events newtup should be non-NULL, for DELETE events
+		 * oldtup should be non-NULL, whereas for UPDATE events normally both
+		 * oldtup and newtup are non-NULL.  But for UPDATE events fired for
+		 * capturing transition tuples during UPDATE partition-key row
+		 * movement, oldtup is NULL when the event is for a row being inserted,
+		 * whereas newtup is NULL when the event is for a row being deleted.
+		 */
+		Assert(!(event == TRIGGER_EVENT_DELETE && delete_old_table &&
+				 oldtup == NULL));
+		Assert(!(event == TRIGGER_EVENT_INSERT && insert_new_table &&
+				 newtup == NULL));
+
+		if (oldtup != NULL &&
+			((event == TRIGGER_EVENT_DELETE && delete_old_table) ||
+			 (event == TRIGGER_EVENT_UPDATE && update_old_table)))
 		{
 			Tuplestorestate *old_tuplestore;
 
-			Assert(oldtup != NULL);
-			old_tuplestore = transition_capture->tcs_old_tuplestore;
+			old_tuplestore = transition_capture->tcs_private->old_tuplestore;
 
 			if (map != NULL)
 			{
@@ -5278,16 +5506,13 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 			else
 				tuplestore_puttuple(old_tuplestore, oldtup);
 		}
-		if ((event == TRIGGER_EVENT_INSERT && insert_new_table) ||
-			(event == TRIGGER_EVENT_UPDATE && update_new_table))
+		if (newtup != NULL &&
+			((event == TRIGGER_EVENT_INSERT && insert_new_table) ||
+			(event == TRIGGER_EVENT_UPDATE && update_new_table)))
 		{
 			Tuplestorestate *new_tuplestore;
 
-			Assert(newtup != NULL);
-			if (event == TRIGGER_EVENT_INSERT)
-				new_tuplestore = transition_capture->tcs_insert_tuplestore;
-			else
-				new_tuplestore = transition_capture->tcs_update_tuplestore;
+			new_tuplestore = transition_capture->tcs_private->new_tuplestore;
 
 			if (original_insert_tuple != NULL)
 				tuplestore_puttuple(new_tuplestore, original_insert_tuple);
@@ -5302,11 +5527,18 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 				tuplestore_puttuple(new_tuplestore, newtup);
 		}
 
-		/* If transition tables are the only reason we're here, return. */
+		/*
+		 * If transition tables are the only reason we're here, return. As
+		 * mentioned above, we can also be here during update tuple routing in
+		 * presence of transition tables, in which case this function is called
+		 * separately for oldtup and newtup, so we expect exactly one of them
+		 * to be NULL.
+		 */
 		if (trigdesc == NULL ||
 			(event == TRIGGER_EVENT_DELETE && !trigdesc->trig_delete_after_row) ||
 			(event == TRIGGER_EVENT_INSERT && !trigdesc->trig_insert_after_row) ||
-			(event == TRIGGER_EVENT_UPDATE && !trigdesc->trig_update_after_row))
+			(event == TRIGGER_EVENT_UPDATE && !trigdesc->trig_update_after_row) ||
+			(event == TRIGGER_EVENT_UPDATE && ((oldtup == NULL) ^ (newtup == NULL))))
 			return;
 	}
 
@@ -5316,6 +5548,11 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 	 * The event code will be used both as a bitmask and an array offset, so
 	 * validation is important to make sure we don't walk off the edge of our
 	 * arrays.
+	 *
+	 * Also, if we're considering statement-level triggers, check whether we
+	 * already queued a set of them for this event, and cancel the prior set
+	 * if so.  This preserves the behavior that statement-level triggers fire
+	 * just once per statement and fire after row-level triggers.
 	 */
 	switch (event)
 	{
@@ -5334,6 +5571,8 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 				Assert(newtup == NULL);
 				ItemPointerSetInvalid(&(new_event.ate_ctid1));
 				ItemPointerSetInvalid(&(new_event.ate_ctid2));
+				cancel_prior_stmt_triggers(RelationGetRelid(rel),
+										   CMD_INSERT, event);
 			}
 			break;
 		case TRIGGER_EVENT_DELETE:
@@ -5351,6 +5590,8 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 				Assert(newtup == NULL);
 				ItemPointerSetInvalid(&(new_event.ate_ctid1));
 				ItemPointerSetInvalid(&(new_event.ate_ctid2));
+				cancel_prior_stmt_triggers(RelationGetRelid(rel),
+										   CMD_DELETE, event);
 			}
 			break;
 		case TRIGGER_EVENT_UPDATE:
@@ -5368,6 +5609,8 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 				Assert(newtup == NULL);
 				ItemPointerSetInvalid(&(new_event.ate_ctid1));
 				ItemPointerSetInvalid(&(new_event.ate_ctid2));
+				cancel_prior_stmt_triggers(RelationGetRelid(rel),
+										   CMD_UPDATE, event);
 			}
 			break;
 		case TRIGGER_EVENT_TRUNCATE:
@@ -5407,9 +5650,7 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 		{
 			if (fdw_tuplestore == NULL)
 			{
-				fdw_tuplestore =
-					GetTriggerTransitionTuplestore
-					(afterTriggers.fdw_tuplestores);
+				fdw_tuplestore = GetCurrentFDWTuplestore();
 				new_event.ate_flags = AFTER_TRIGGER_FDW_FETCH;
 			}
 			else
@@ -5465,6 +5706,8 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 
 		/*
 		 * Fill in event structure and add it to the current query's queue.
+		 * Note we set ats_table to NULL whenever this trigger doesn't use
+		 * transition tables, to improve sharability of the shared event data.
 		 */
 		new_shared.ats_event =
 			(event & TRIGGER_EVENT_OPMASK) |
@@ -5474,9 +5717,13 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 		new_shared.ats_tgoid = trigger->tgoid;
 		new_shared.ats_relid = RelationGetRelid(rel);
 		new_shared.ats_firing_id = 0;
-		new_shared.ats_transition_capture = transition_capture;
+		if ((trigger->tgoldtable || trigger->tgnewtable) &&
+			transition_capture != NULL)
+			new_shared.ats_table = transition_capture->tcs_private;
+		else
+			new_shared.ats_table = NULL;
 
-		afterTriggerAddEvent(&afterTriggers.query_stack[afterTriggers.query_depth],
+		afterTriggerAddEvent(&afterTriggers.query_stack[afterTriggers.query_depth].events,
 							 &new_event, &new_shared);
 	}
 
@@ -5494,6 +5741,131 @@ AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
 	}
 }
 
+/*
+ * Detect whether we already queued BEFORE STATEMENT triggers for the given
+ * relation + operation, and set the flag so the next call will report "true".
+ */
+static bool
+before_stmt_triggers_fired(Oid relid, CmdType cmdType)
+{
+	bool		result;
+	AfterTriggersTableData *table;
+
+	/* Check state, like AfterTriggerSaveEvent. */
+	if (afterTriggers.query_depth < 0)
+		elog(ERROR, "before_stmt_triggers_fired() called outside of query");
+
+	/* Be sure we have enough space to record events at this query depth. */
+	if (afterTriggers.query_depth >= afterTriggers.maxquerydepth)
+		AfterTriggerEnlargeQueryState();
+
+	/*
+	 * We keep this state in the AfterTriggersTableData that also holds
+	 * transition tables for the relation + operation.  In this way, if we are
+	 * forced to make a new set of transition tables because more tuples get
+	 * entered after we've already fired triggers, we will allow a new set of
+	 * statement triggers to get queued.
+	 */
+	table = GetAfterTriggersTableData(relid, cmdType);
+	result = table->before_trig_done;
+	table->before_trig_done = true;
+	return result;
+}
+
+/*
+ * If we previously queued a set of AFTER STATEMENT triggers for the given
+ * relation + operation, and they've not been fired yet, cancel them.  The
+ * caller will queue a fresh set that's after any row-level triggers that may
+ * have been queued by the current sub-statement, preserving (as much as
+ * possible) the property that AFTER ROW triggers fire before AFTER STATEMENT
+ * triggers, and that the latter only fire once.  This deals with the
+ * situation where several FK enforcement triggers sequentially queue triggers
+ * for the same table into the same trigger query level.  We can't fully
+ * prevent odd behavior though: if there are AFTER ROW triggers taking
+ * transition tables, we don't want to change the transition tables once the
+ * first such trigger has seen them.  In such a case, any additional events
+ * will result in creating new transition tables and allowing new firings of
+ * statement triggers.
+ *
+ * This also saves the current event list location so that a later invocation
+ * of this function can cheaply find the triggers we're about to queue and
+ * cancel them.
+ */
+static void
+cancel_prior_stmt_triggers(Oid relid, CmdType cmdType, int tgevent)
+{
+	AfterTriggersTableData *table;
+	AfterTriggersQueryData *qs = &afterTriggers.query_stack[afterTriggers.query_depth];
+
+	/*
+	 * We keep this state in the AfterTriggersTableData that also holds
+	 * transition tables for the relation + operation.  In this way, if we are
+	 * forced to make a new set of transition tables because more tuples get
+	 * entered after we've already fired triggers, we will allow a new set of
+	 * statement triggers to get queued without canceling the old ones.
+	 */
+	table = GetAfterTriggersTableData(relid, cmdType);
+
+	if (table->after_trig_done)
+	{
+		/*
+		 * We want to start scanning from the tail location that existed just
+		 * before we inserted any statement triggers.  But the events list
+		 * might've been entirely empty then, in which case scan from the
+		 * current head.
+		 */
+		AfterTriggerEvent event;
+		AfterTriggerEventChunk *chunk;
+
+		if (table->after_trig_events.tail)
+		{
+			chunk = table->after_trig_events.tail;
+			event = (AfterTriggerEvent) table->after_trig_events.tailfree;
+		}
+		else
+		{
+			chunk = qs->events.head;
+			event = NULL;
+		}
+
+		for_each_chunk_from(chunk)
+		{
+			if (event == NULL)
+				event = (AfterTriggerEvent) CHUNK_DATA_START(chunk);
+			for_each_event_from(event, chunk)
+			{
+				AfterTriggerShared evtshared = GetTriggerSharedData(event);
+
+				/*
+				 * Exit loop when we reach events that aren't AS triggers for
+				 * the target relation.
+				 */
+				if (evtshared->ats_relid != relid)
+					goto done;
+				if ((evtshared->ats_event & TRIGGER_EVENT_OPMASK) != tgevent)
+					goto done;
+				if (!TRIGGER_FIRED_FOR_STATEMENT(evtshared->ats_event))
+					goto done;
+				if (!TRIGGER_FIRED_AFTER(evtshared->ats_event))
+					goto done;
+				/* OK, mark it DONE */
+				event->ate_flags &= ~AFTER_TRIGGER_IN_PROGRESS;
+				event->ate_flags |= AFTER_TRIGGER_DONE;
+			}
+			/* signal we must reinitialize event ptr for next chunk */
+			event = NULL;
+		}
+	}
+done:
+
+	/* In any case, save current insertion point for next time */
+	table->after_trig_done = true;
+	table->after_trig_events = qs->events;
+}
+
+/*
+ * SQL function pg_trigger_depth()
+ */
 Datum
 pg_trigger_depth(PG_FUNCTION_ARGS)
 {
diff --git a/src/backend/commands/tsearchcmds.c b/src/backend/commands/tsearchcmds.c
index adc7cd67a7..3a843512d1 100644
--- a/src/backend/commands/tsearchcmds.c
+++ b/src/backend/commands/tsearchcmds.c
@@ -4,7 +4,7 @@
  *
  *	  Routines for tsearch manipulation commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -209,27 +209,27 @@ DefineTSParser(List *names, List *parameters)
 	{
 		DefElem    *defel = (DefElem *) lfirst(pl);
 
-		if (pg_strcasecmp(defel->defname, "start") == 0)
+		if (strcmp(defel->defname, "start") == 0)
 		{
 			values[Anum_pg_ts_parser_prsstart - 1] =
 				get_ts_parser_func(defel, Anum_pg_ts_parser_prsstart);
 		}
-		else if (pg_strcasecmp(defel->defname, "gettoken") == 0)
+		else if (strcmp(defel->defname, "gettoken") == 0)
 		{
 			values[Anum_pg_ts_parser_prstoken - 1] =
 				get_ts_parser_func(defel, Anum_pg_ts_parser_prstoken);
 		}
-		else if (pg_strcasecmp(defel->defname, "end") == 0)
+		else if (strcmp(defel->defname, "end") == 0)
 		{
 			values[Anum_pg_ts_parser_prsend - 1] =
 				get_ts_parser_func(defel, Anum_pg_ts_parser_prsend);
 		}
-		else if (pg_strcasecmp(defel->defname, "headline") == 0)
+		else if (strcmp(defel->defname, "headline") == 0)
 		{
 			values[Anum_pg_ts_parser_prsheadline - 1] =
 				get_ts_parser_func(defel, Anum_pg_ts_parser_prsheadline);
 		}
-		else if (pg_strcasecmp(defel->defname, "lextypes") == 0)
+		else if (strcmp(defel->defname, "lextypes") == 0)
 		{
 			values[Anum_pg_ts_parser_prslextype - 1] =
 				get_ts_parser_func(defel, Anum_pg_ts_parser_prslextype);
@@ -428,7 +428,7 @@ DefineTSDictionary(List *names, List *parameters)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceoid));
 
 	/*
@@ -438,7 +438,7 @@ DefineTSDictionary(List *names, List *parameters)
 	{
 		DefElem    *defel = (DefElem *) lfirst(pl);
 
-		if (pg_strcasecmp(defel->defname, "template") == 0)
+		if (strcmp(defel->defname, "template") == 0)
 		{
 			templId = get_ts_template_oid(defGetQualifiedName(defel), false);
 		}
@@ -549,7 +549,7 @@ AlterTSDictionary(AlterTSDictionaryStmt *stmt)
 
 	/* must be owner */
 	if (!pg_ts_dict_ownercheck(dictId, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSDICTIONARY,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TSDICTIONARY,
 					   NameListToString(stmt->dictname));
 
 	/* deserialize the existing set of options */
@@ -580,7 +580,7 @@ AlterTSDictionary(AlterTSDictionaryStmt *stmt)
 			DefElem    *oldel = (DefElem *) lfirst(cell);
 
 			next = lnext(cell);
-			if (pg_strcasecmp(oldel->defname, defel->defname) == 0)
+			if (strcmp(oldel->defname, defel->defname) == 0)
 				dictoptions = list_delete_cell(dictoptions, cell, prev);
 			else
 				prev = cell;
@@ -765,13 +765,13 @@ DefineTSTemplate(List *names, List *parameters)
 	{
 		DefElem    *defel = (DefElem *) lfirst(pl);
 
-		if (pg_strcasecmp(defel->defname, "init") == 0)
+		if (strcmp(defel->defname, "init") == 0)
 		{
 			values[Anum_pg_ts_template_tmplinit - 1] =
 				get_ts_template_func(defel, Anum_pg_ts_template_tmplinit);
 			nulls[Anum_pg_ts_template_tmplinit - 1] = false;
 		}
-		else if (pg_strcasecmp(defel->defname, "lexize") == 0)
+		else if (strcmp(defel->defname, "lexize") == 0)
 		{
 			values[Anum_pg_ts_template_tmpllexize - 1] =
 				get_ts_template_func(defel, Anum_pg_ts_template_tmpllexize);
@@ -980,7 +980,7 @@ DefineTSConfiguration(List *names, List *parameters, ObjectAddress *copied)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(namespaceoid, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(namespaceoid));
 
 	/*
@@ -990,9 +990,9 @@ DefineTSConfiguration(List *names, List *parameters, ObjectAddress *copied)
 	{
 		DefElem    *defel = (DefElem *) lfirst(pl);
 
-		if (pg_strcasecmp(defel->defname, "parser") == 0)
+		if (strcmp(defel->defname, "parser") == 0)
 			prsOid = get_ts_parser_oid(defGetQualifiedName(defel), false);
-		else if (pg_strcasecmp(defel->defname, "copy") == 0)
+		else if (strcmp(defel->defname, "copy") == 0)
 			sourceOid = get_ts_config_oid(defGetQualifiedName(defel), false);
 		else
 			ereport(ERROR,
@@ -1189,7 +1189,7 @@ AlterTSConfiguration(AlterTSConfigurationStmt *stmt)
 
 	/* must be owner */
 	if (!pg_ts_config_ownercheck(HeapTupleGetOid(tup), GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_TSCONFIGURATION,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_TSCONFIGURATION,
 					   NameListToString(stmt->cfgname));
 
 	relMap = heap_open(TSConfigMapRelationId, RowExclusiveLock);
@@ -1251,7 +1251,6 @@ getTokenTypes(Oid prsId, List *tokennames)
 		j = 0;
 		while (list && list[j].lexid)
 		{
-			/* XXX should we use pg_strcasecmp here? */
 			if (strcmp(strVal(val), list[j].alias) == 0)
 			{
 				res[i] = list[j].lexid;
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
index 29ac5d569d..899a5c4cd4 100644
--- a/src/backend/commands/typecmds.c
+++ b/src/backend/commands/typecmds.c
@@ -3,7 +3,7 @@
  * typecmds.c
  *	  Routines for SQL commands that manipulate types (and domains).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -103,7 +103,7 @@ static void checkEnumOwner(HeapTuple tup);
 static char *domainAddConstraint(Oid domainOid, Oid domainNamespace,
 					Oid baseTypeOid,
 					int typMod, Constraint *constr,
-					char *domainName, ObjectAddress *constrAddr);
+					const char *domainName, ObjectAddress *constrAddr);
 static Node *replace_domain_constraint_value(ParseState *pstate,
 								ColumnRef *cref);
 
@@ -190,7 +190,7 @@ DefineType(ParseState *pstate, List *names, List *parameters)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(typeNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(typeNamespace));
 #endif
 
@@ -245,42 +245,42 @@ DefineType(ParseState *pstate, List *names, List *parameters)
 		DefElem    *defel = (DefElem *) lfirst(pl);
 		DefElem   **defelp;
 
-		if (pg_strcasecmp(defel->defname, "like") == 0)
+		if (strcmp(defel->defname, "like") == 0)
 			defelp = &likeTypeEl;
-		else if (pg_strcasecmp(defel->defname, "internallength") == 0)
+		else if (strcmp(defel->defname, "internallength") == 0)
 			defelp = &internalLengthEl;
-		else if (pg_strcasecmp(defel->defname, "input") == 0)
+		else if (strcmp(defel->defname, "input") == 0)
 			defelp = &inputNameEl;
-		else if (pg_strcasecmp(defel->defname, "output") == 0)
+		else if (strcmp(defel->defname, "output") == 0)
 			defelp = &outputNameEl;
-		else if (pg_strcasecmp(defel->defname, "receive") == 0)
+		else if (strcmp(defel->defname, "receive") == 0)
 			defelp = &receiveNameEl;
-		else if (pg_strcasecmp(defel->defname, "send") == 0)
+		else if (strcmp(defel->defname, "send") == 0)
 			defelp = &sendNameEl;
-		else if (pg_strcasecmp(defel->defname, "typmod_in") == 0)
+		else if (strcmp(defel->defname, "typmod_in") == 0)
 			defelp = &typmodinNameEl;
-		else if (pg_strcasecmp(defel->defname, "typmod_out") == 0)
+		else if (strcmp(defel->defname, "typmod_out") == 0)
 			defelp = &typmodoutNameEl;
-		else if (pg_strcasecmp(defel->defname, "analyze") == 0 ||
-				 pg_strcasecmp(defel->defname, "analyse") == 0)
+		else if (strcmp(defel->defname, "analyze") == 0 ||
+				 strcmp(defel->defname, "analyse") == 0)
 			defelp = &analyzeNameEl;
-		else if (pg_strcasecmp(defel->defname, "category") == 0)
+		else if (strcmp(defel->defname, "category") == 0)
 			defelp = &categoryEl;
-		else if (pg_strcasecmp(defel->defname, "preferred") == 0)
+		else if (strcmp(defel->defname, "preferred") == 0)
 			defelp = &preferredEl;
-		else if (pg_strcasecmp(defel->defname, "delimiter") == 0)
+		else if (strcmp(defel->defname, "delimiter") == 0)
 			defelp = &delimiterEl;
-		else if (pg_strcasecmp(defel->defname, "element") == 0)
+		else if (strcmp(defel->defname, "element") == 0)
 			defelp = &elemTypeEl;
-		else if (pg_strcasecmp(defel->defname, "default") == 0)
+		else if (strcmp(defel->defname, "default") == 0)
 			defelp = &defaultValueEl;
-		else if (pg_strcasecmp(defel->defname, "passedbyvalue") == 0)
+		else if (strcmp(defel->defname, "passedbyvalue") == 0)
 			defelp = &byValueEl;
-		else if (pg_strcasecmp(defel->defname, "alignment") == 0)
+		else if (strcmp(defel->defname, "alignment") == 0)
 			defelp = &alignmentEl;
-		else if (pg_strcasecmp(defel->defname, "storage") == 0)
+		else if (strcmp(defel->defname, "storage") == 0)
 			defelp = &storageEl;
-		else if (pg_strcasecmp(defel->defname, "collatable") == 0)
+		else if (strcmp(defel->defname, "collatable") == 0)
 			defelp = &collatableEl;
 		else
 		{
@@ -526,25 +526,25 @@ DefineType(ParseState *pstate, List *names, List *parameters)
 #ifdef NOT_USED
 	/* XXX this is unnecessary given the superuser check above */
 	if (inputOid && !pg_proc_ownercheck(inputOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(inputName));
 	if (outputOid && !pg_proc_ownercheck(outputOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(outputName));
 	if (receiveOid && !pg_proc_ownercheck(receiveOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(receiveName));
 	if (sendOid && !pg_proc_ownercheck(sendOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(sendName));
 	if (typmodinOid && !pg_proc_ownercheck(typmodinOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(typmodinName));
 	if (typmodoutOid && !pg_proc_ownercheck(typmodoutOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(typmodoutName));
 	if (analyzeOid && !pg_proc_ownercheck(analyzeOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC,
+		aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_FUNCTION,
 					   NameListToString(analyzeName));
 #endif
 
@@ -729,6 +729,7 @@ ObjectAddress
 DefineDomain(CreateDomainStmt *stmt)
 {
 	char	   *domainName;
+	char	   *domainArrayName;
 	Oid			domainNamespace;
 	AclResult	aclresult;
 	int16		internalLength;
@@ -757,6 +758,7 @@ DefineDomain(CreateDomainStmt *stmt)
 	Oid			basetypeoid;
 	Oid			old_type_oid;
 	Oid			domaincoll;
+	Oid			domainArrayOid;
 	Form_pg_type baseType;
 	int32		basetypeMod;
 	Oid			baseColl;
@@ -770,7 +772,7 @@ DefineDomain(CreateDomainStmt *stmt)
 	aclresult = pg_namespace_aclcheck(domainNamespace, GetUserId(),
 									  ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(domainNamespace));
 
 	/*
@@ -796,13 +798,16 @@ DefineDomain(CreateDomainStmt *stmt)
 	basetypeoid = HeapTupleGetOid(typeTup);
 
 	/*
-	 * Base type must be a plain base type, another domain, an enum or a range
-	 * type. Domains over pseudotypes would create a security hole.  Domains
-	 * over composite types might be made to work in the future, but not
-	 * today.
+	 * Base type must be a plain base type, a composite type, another domain,
+	 * an enum or a range type.  Domains over pseudotypes would create a
+	 * security hole.  (It would be shorter to code this to just check for
+	 * pseudotypes; but it seems safer to call out the specific typtypes that
+	 * are supported, rather than assume that all future typtypes would be
+	 * automatically supported.)
 	 */
 	typtype = baseType->typtype;
 	if (typtype != TYPTYPE_BASE &&
+		typtype != TYPTYPE_COMPOSITE &&
 		typtype != TYPTYPE_DOMAIN &&
 		typtype != TYPTYPE_ENUM &&
 		typtype != TYPTYPE_RANGE)
@@ -1027,6 +1032,9 @@ DefineDomain(CreateDomainStmt *stmt)
 		}
 	}
 
+	/* Allocate OID for array type */
+	domainArrayOid = AssignTypeArrayOid();
+
 	/*
 	 * Have TypeCreate do all the real work.
 	 */
@@ -1051,7 +1059,7 @@ DefineDomain(CreateDomainStmt *stmt)
 				   analyzeProcedure,	/* analyze procedure */
 				   InvalidOid,	/* no array element type */
 				   false,		/* this isn't an array */
-				   InvalidOid,	/* no arrays for domains (yet) */
+				   domainArrayOid,	/* array type we are about to create */
 				   basetypeoid, /* base type ID */
 				   defaultValue,	/* default type value (text) */
 				   defaultValueBin, /* default type value (binary) */
@@ -1063,6 +1071,48 @@ DefineDomain(CreateDomainStmt *stmt)
 				   typNotNull,	/* Type NOT NULL */
 				   domaincoll); /* type's collation */
 
+	/*
+	 * Create the array type that goes with it.
+	 */
+	domainArrayName = makeArrayTypeName(domainName, domainNamespace);
+
+	/* alignment must be 'i' or 'd' for arrays */
+	alignment = (alignment == 'd') ? 'd' : 'i';
+
+	TypeCreate(domainArrayOid,	/* force assignment of this type OID */
+			   domainArrayName, /* type name */
+			   domainNamespace, /* namespace */
+			   InvalidOid,		/* relation oid (n/a here) */
+			   0,				/* relation kind (ditto) */
+			   GetUserId(),		/* owner's ID */
+			   -1,				/* internal size (always varlena) */
+			   TYPTYPE_BASE,	/* type-type (base type) */
+			   TYPCATEGORY_ARRAY,	/* type-category (array) */
+			   false,			/* array types are never preferred */
+			   delimiter,		/* array element delimiter */
+			   F_ARRAY_IN,		/* input procedure */
+			   F_ARRAY_OUT,		/* output procedure */
+			   F_ARRAY_RECV,	/* receive procedure */
+			   F_ARRAY_SEND,	/* send procedure */
+			   InvalidOid,		/* typmodin procedure - none */
+			   InvalidOid,		/* typmodout procedure - none */
+			   F_ARRAY_TYPANALYZE,	/* analyze procedure */
+			   address.objectId,	/* element type ID */
+			   true,			/* yes this is an array type */
+			   InvalidOid,		/* no further array type */
+			   InvalidOid,		/* base type ID */
+			   NULL,			/* never a default type value */
+			   NULL,			/* binary default isn't sent either */
+			   false,			/* never passed by value */
+			   alignment,		/* see above */
+			   'x',				/* ARRAY is always toastable */
+			   -1,				/* typMod (Domains only) */
+			   0,				/* Array dimensions of typbasetype */
+			   false,			/* Type NOT NULL */
+			   domaincoll);		/* type's collation */
+
+	pfree(domainArrayName);
+
 	/*
 	 * Process constraints which refer to the domain ID returned by TypeCreate
 	 */
@@ -1121,7 +1171,7 @@ DefineEnum(CreateEnumStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(enumNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(enumNamespace));
 
 	/*
@@ -1139,6 +1189,7 @@ DefineEnum(CreateEnumStmt *stmt)
 					 errmsg("type \"%s\" already exists", enumName)));
 	}
 
+	/* Allocate OID for array type */
 	enumArrayOid = AssignTypeArrayOid();
 
 	/* Create the pg_type entry */
@@ -1222,10 +1273,10 @@ DefineEnum(CreateEnumStmt *stmt)
 
 /*
  * AlterEnum
- *		Adds a new label to an existing enum.
+ *		ALTER TYPE on an enum.
  */
 ObjectAddress
-AlterEnum(AlterEnumStmt *stmt)
+AlterEnum(AlterEnumStmt *stmt, bool isTopLevel)
 {
 	Oid			enum_type_oid;
 	TypeName   *typename;
@@ -1243,8 +1294,6 @@ AlterEnum(AlterEnumStmt *stmt)
 	/* Check it's an enum and check user has permission to ALTER the enum */
 	checkEnumOwner(tup);
 
-	ReleaseSysCache(tup);
-
 	if (stmt->oldVal)
 	{
 		/* Rename an existing label */
@@ -1253,6 +1302,27 @@ AlterEnum(AlterEnumStmt *stmt)
 	else
 	{
 		/* Add a new label */
+
+		/*
+		 * Ordinarily we disallow adding values within transaction blocks,
+		 * because we can't cope with enum OID values getting into indexes and
+		 * then having their defining pg_enum entries go away.  However, it's
+		 * okay if the enum type was created in the current transaction, since
+		 * then there can be no such indexes that wouldn't themselves go away
+		 * on rollback.  (We support this case because pg_dump
+		 * --binary-upgrade needs it.)  We test this by seeing if the pg_type
+		 * row has xmin == current XID and is not HEAP_UPDATED.  If it is
+		 * HEAP_UPDATED, we can't be sure whether the type was created or only
+		 * modified in this xact.  So we are disallowing some cases that could
+		 * theoretically be safe; but fortunately pg_dump only needs the
+		 * simplest case.
+		 */
+		if (HeapTupleHeaderGetXmin(tup->t_data) == GetCurrentTransactionId() &&
+			!(tup->t_data->t_infomask & HEAP_UPDATED))
+			 /* safe to do inside transaction block */ ;
+		else
+			PreventTransactionChain(isTopLevel, "ALTER TYPE ... ADD");
+
 		AddEnumLabel(enum_type_oid, stmt->newVal,
 					 stmt->newValNeighbor, stmt->newValIsAfter,
 					 stmt->skipIfNewValExists);
@@ -1262,6 +1332,8 @@ AlterEnum(AlterEnumStmt *stmt)
 
 	ObjectAddressSet(address, TypeRelationId, enum_type_oid);
 
+	ReleaseSysCache(tup);
+
 	return address;
 }
 
@@ -1326,7 +1398,7 @@ DefineRange(CreateRangeStmt *stmt)
 	/* Check we have creation rights in target namespace */
 	aclresult = pg_namespace_aclcheck(typeNamespace, GetUserId(), ACL_CREATE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(typeNamespace));
 
 	/*
@@ -1367,7 +1439,7 @@ DefineRange(CreateRangeStmt *stmt)
 	{
 		DefElem    *defel = (DefElem *) lfirst(lc);
 
-		if (pg_strcasecmp(defel->defname, "subtype") == 0)
+		if (strcmp(defel->defname, "subtype") == 0)
 		{
 			if (OidIsValid(rangeSubtype))
 				ereport(ERROR,
@@ -1376,7 +1448,7 @@ DefineRange(CreateRangeStmt *stmt)
 			/* we can look up the subtype name immediately */
 			rangeSubtype = typenameTypeId(NULL, defGetTypeName(defel));
 		}
-		else if (pg_strcasecmp(defel->defname, "subtype_opclass") == 0)
+		else if (strcmp(defel->defname, "subtype_opclass") == 0)
 		{
 			if (rangeSubOpclassName != NIL)
 				ereport(ERROR,
@@ -1384,7 +1456,7 @@ DefineRange(CreateRangeStmt *stmt)
 						 errmsg("conflicting or redundant options")));
 			rangeSubOpclassName = defGetQualifiedName(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "collation") == 0)
+		else if (strcmp(defel->defname, "collation") == 0)
 		{
 			if (rangeCollationName != NIL)
 				ereport(ERROR,
@@ -1392,7 +1464,7 @@ DefineRange(CreateRangeStmt *stmt)
 						 errmsg("conflicting or redundant options")));
 			rangeCollationName = defGetQualifiedName(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "canonical") == 0)
+		else if (strcmp(defel->defname, "canonical") == 0)
 		{
 			if (rangeCanonicalName != NIL)
 				ereport(ERROR,
@@ -1400,7 +1472,7 @@ DefineRange(CreateRangeStmt *stmt)
 						 errmsg("conflicting or redundant options")));
 			rangeCanonicalName = defGetQualifiedName(defel);
 		}
-		else if (pg_strcasecmp(defel->defname, "subtype_diff") == 0)
+		else if (strcmp(defel->defname, "subtype_diff") == 0)
 		{
 			if (rangeSubtypeDiffName != NIL)
 				ereport(ERROR,
@@ -1970,7 +2042,7 @@ findRangeCanonicalFunction(List *procname, Oid typeOid)
 	/* Also, range type's creator must have permission to call function */
 	aclresult = pg_proc_aclcheck(procOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, get_func_name(procOid));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(procOid));
 
 	return procOid;
 }
@@ -2013,7 +2085,7 @@ findRangeSubtypeDiffFunction(List *procname, Oid subtype)
 	/* Also, range type's creator must have permission to call function */
 	aclresult = pg_proc_aclcheck(procOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, get_func_name(procOid));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(procOid));
 
 	return procOid;
 }
@@ -2324,6 +2396,7 @@ AlterDomainNotNull(List *names, bool notNull)
 				for (i = 0; i < rtc->natts; i++)
 				{
 					int			attnum = rtc->atts[i];
+					Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1);
 
 					if (heap_attisnull(tuple, attnum))
 					{
@@ -2338,7 +2411,7 @@ AlterDomainNotNull(List *names, bool notNull)
 						ereport(ERROR,
 								(errcode(ERRCODE_NOT_NULL_VIOLATION),
 								 errmsg("column \"%s\" of table \"%s\" contains null values",
-										NameStr(tupdesc->attrs[attnum - 1]->attname),
+										NameStr(attr->attname),
 										RelationGetRelationName(testrel)),
 								 errtablecol(testrel, attnum)));
 					}
@@ -2576,7 +2649,7 @@ AlterDomainAddConstraint(List *names, Node *newConstraint,
  * Implements the ALTER DOMAIN .. VALIDATE CONSTRAINT statement.
  */
 ObjectAddress
-AlterDomainValidateConstraint(List *names, char *constrName)
+AlterDomainValidateConstraint(List *names, const char *constrName)
 {
 	TypeName   *typename;
 	Oid			domainoid;
@@ -2722,6 +2795,7 @@ validateDomainConstraint(Oid domainoid, char *ccbin)
 				Datum		d;
 				bool		isNull;
 				Datum		conResult;
+				Form_pg_attribute attr = TupleDescAttr(tupdesc, attnum - 1);
 
 				d = heap_getattr(tuple, attnum, tupdesc, &isNull);
 
@@ -2745,7 +2819,7 @@ validateDomainConstraint(Oid domainoid, char *ccbin)
 					ereport(ERROR,
 							(errcode(ERRCODE_CHECK_VIOLATION),
 							 errmsg("column \"%s\" of table \"%s\" contains values that violate the new constraint",
-									NameStr(tupdesc->attrs[attnum - 1]->attname),
+									NameStr(attr->attname),
 									RelationGetRelationName(testrel)),
 							 errtablecol(testrel, attnum)));
 				}
@@ -2930,7 +3004,7 @@ get_rels_with_domain(Oid domainOid, LOCKMODE lockmode)
 		 */
 		if (pg_depend->objsubid > RelationGetNumberOfAttributes(rtc->rel))
 			continue;
-		pg_att = rtc->rel->rd_att->attrs[pg_depend->objsubid - 1];
+		pg_att = TupleDescAttr(rtc->rel->rd_att, pg_depend->objsubid - 1);
 		if (pg_att->attisdropped || pg_att->atttypid != domainOid)
 			continue;
 
@@ -2986,7 +3060,7 @@ checkDomainOwner(HeapTuple tup)
 static char *
 domainAddConstraint(Oid domainOid, Oid domainNamespace, Oid baseTypeOid,
 					int typMod, Constraint *constr,
-					char *domainName, ObjectAddress *constrAddr)
+					const char *domainName, ObjectAddress *constrAddr)
 {
 	Node	   *expr;
 	char	   *ccsrc;
@@ -3306,7 +3380,7 @@ AlterTypeOwner(List *names, Oid newOwnerId, ObjectType objecttype)
 											  newOwnerId,
 											  ACL_CREATE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+				aclcheck_error(aclresult, OBJECT_SCHEMA,
 							   get_namespace_name(typTup->typnamespace));
 		}
 
@@ -3325,9 +3399,9 @@ AlterTypeOwner(List *names, Oid newOwnerId, ObjectType objecttype)
  * AlterTypeOwner_oid - change type owner unconditionally
  *
  * This function recurses to handle a pg_class entry, if necessary.  It
- * invokes any necessary access object hooks.  If hasDependEntry is TRUE, this
+ * invokes any necessary access object hooks.  If hasDependEntry is true, this
  * function modifies the pg_shdepend entry appropriately (this should be
- * passed as FALSE only for table rowtypes and array types).
+ * passed as false only for table rowtypes and array types).
  *
  * This is used by ALTER TABLE/TYPE OWNER commands, as well as by REASSIGN
  * OWNED BY.  It assumes the caller has done all needed check.
@@ -3493,10 +3567,10 @@ AlterTypeNamespace_oid(Oid typeOid, Oid nspOid, ObjectAddresses *objsMoved)
  * Caller must have already checked privileges.
  *
  * The function automatically recurses to process the type's array type,
- * if any.  isImplicitArray should be TRUE only when doing this internal
+ * if any.  isImplicitArray should be true only when doing this internal
  * recursion (outside callers must never try to move an array type directly).
  *
- * If errorOnTableType is TRUE, the function errors out if the type is
+ * If errorOnTableType is true, the function errors out if the type is
  * a table type.  ALTER TABLE has to be used to move a table to a new
  * namespace.
  *
diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c
index f2941352d7..71c5caa41b 100644
--- a/src/backend/commands/user.c
+++ b/src/backend/commands/user.c
@@ -3,7 +3,7 @@
  * user.c
  *	  Commands for manipulating roles (formerly called users).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/commands/user.c
@@ -939,7 +939,7 @@ AlterRoleSet(AlterRoleSetStmt *stmt)
 			 * ALTER DATABASE ... SET, so use the same permission check.
 			 */
 			if (!pg_database_ownercheck(databaseid, GetUserId()))
-				aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_DATABASE,
+				aclcheck_error(ACLCHECK_NOT_OWNER, OBJECT_DATABASE,
 							   stmt->database);
 		}
 	}
diff --git a/src/backend/commands/vacuum.c b/src/backend/commands/vacuum.c
index faa181207a..7aca69a0ba 100644
--- a/src/backend/commands/vacuum.c
+++ b/src/backend/commands/vacuum.c
@@ -9,7 +9,7 @@
  * in cluster.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -37,6 +37,7 @@
 #include "commands/cluster.h"
 #include "commands/vacuum.h"
 #include "miscadmin.h"
+#include "nodes/makefuncs.h"
 #include "pgstat.h"
 #include "postmaster/autovacuum.h"
 #include "storage/bufmgr.h"
@@ -67,7 +68,8 @@ static BufferAccessStrategy vac_strategy;
 
 
 /* non-export function prototypes */
-static List *get_rel_oids(Oid relid, const RangeVar *vacrel);
+static List *expand_vacuum_rel(VacuumRelation *vrel);
+static List *get_all_vacuum_rels(void);
 static void vac_truncate_clog(TransactionId frozenXID,
 				  MultiXactId minMulti,
 				  TransactionId lastSaneFrozenXid,
@@ -90,9 +92,26 @@ ExecVacuum(VacuumStmt *vacstmt, bool isTopLevel)
 	Assert(vacstmt->options & (VACOPT_VACUUM | VACOPT_ANALYZE));
 	Assert((vacstmt->options & VACOPT_VACUUM) ||
 		   !(vacstmt->options & (VACOPT_FULL | VACOPT_FREEZE)));
-	Assert((vacstmt->options & VACOPT_ANALYZE) || vacstmt->va_cols == NIL);
 	Assert(!(vacstmt->options & VACOPT_SKIPTOAST));
 
+	/*
+	 * Make sure VACOPT_ANALYZE is specified if any column lists are present.
+	 */
+	if (!(vacstmt->options & VACOPT_ANALYZE))
+	{
+		ListCell   *lc;
+
+		foreach(lc, vacstmt->rels)
+		{
+			VacuumRelation *vrel = lfirst_node(VacuumRelation, lc);
+
+			if (vrel->va_cols != NIL)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("ANALYZE option must be specified when a column list is provided")));
+		}
+	}
+
 	/*
 	 * All freeze ages are zero if the FREEZE option is given; otherwise pass
 	 * them as -1 which means to use the default values.
@@ -119,24 +138,22 @@ ExecVacuum(VacuumStmt *vacstmt, bool isTopLevel)
 	params.log_min_duration = -1;
 
 	/* Now go through the common routine */
-	vacuum(vacstmt->options, vacstmt->relation, InvalidOid, &params,
-		   vacstmt->va_cols, NULL, isTopLevel);
+	vacuum(vacstmt->options, vacstmt->rels, &params, NULL, isTopLevel);
 }
 
 /*
- * Primary entry point for VACUUM and ANALYZE commands.
+ * Internal entry point for VACUUM and ANALYZE commands.
  *
  * options is a bitmask of VacuumOption flags, indicating what to do.
  *
- * relid, if not InvalidOid, indicate the relation to process; otherwise,
- * the RangeVar is used.  (The latter must always be passed, because it's
- * used for error messages.)
+ * relations, if not NIL, is a list of VacuumRelation to process; otherwise,
+ * we process all relevant tables in the database.  For each VacuumRelation,
+ * if a valid OID is supplied, the table with that OID is what to process;
+ * otherwise, the VacuumRelation's RangeVar indicates what to process.
  *
  * params contains a set of parameters that can be used to customize the
  * behavior.
  *
- * va_cols is a list of columns to analyze, or NIL to process them all.
- *
  * bstrategy is normally given as NULL, but in autovacuum it can be passed
  * in to use the same buffer strategy object across multiple vacuum() calls.
  *
@@ -146,14 +163,14 @@ ExecVacuum(VacuumStmt *vacstmt, bool isTopLevel)
  * memory context that will not disappear at transaction commit.
  */
 void
-vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
-	   List *va_cols, BufferAccessStrategy bstrategy, bool isTopLevel)
+vacuum(int options, List *relations, VacuumParams *params,
+	   BufferAccessStrategy bstrategy, bool isTopLevel)
 {
+	static bool in_vacuum = false;
+
 	const char *stmttype;
 	volatile bool in_outer_xact,
 				use_own_xacts;
-	List	   *relations;
-	static bool in_vacuum = false;
 
 	Assert(params != NULL);
 
@@ -226,10 +243,29 @@ vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
 	vac_strategy = bstrategy;
 
 	/*
-	 * Build list of relations to process, unless caller gave us one. (If we
-	 * build one, we put it in vac_context for safekeeping.)
+	 * Build list of relation(s) to process, putting any new data in
+	 * vac_context for safekeeping.
 	 */
-	relations = get_rel_oids(relid, relation);
+	if (relations != NIL)
+	{
+		List	   *newrels = NIL;
+		ListCell   *lc;
+
+		foreach(lc, relations)
+		{
+			VacuumRelation *vrel = lfirst_node(VacuumRelation, lc);
+			List	   *sublist;
+			MemoryContext old_context;
+
+			sublist = expand_vacuum_rel(vrel);
+			old_context = MemoryContextSwitchTo(vac_context);
+			newrels = list_concat(newrels, sublist);
+			MemoryContextSwitchTo(old_context);
+		}
+		relations = newrels;
+	}
+	else
+		relations = get_all_vacuum_rels();
 
 	/*
 	 * Decide whether we need to start/commit our own transactions.
@@ -280,7 +316,7 @@ vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
 		CommitTransactionCommand();
 	}
 
-	/* Turn vacuum cost accounting on or off */
+	/* Turn vacuum cost accounting on or off, and set/clear in_vacuum */
 	PG_TRY();
 	{
 		ListCell   *cur;
@@ -297,11 +333,11 @@ vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
 		 */
 		foreach(cur, relations)
 		{
-			Oid			relid = lfirst_oid(cur);
+			VacuumRelation *vrel = lfirst_node(VacuumRelation, cur);
 
 			if (options & VACOPT_VACUUM)
 			{
-				if (!vacuum_rel(relid, relation, options, params))
+				if (!vacuum_rel(vrel->oid, vrel->relation, options, params))
 					continue;
 			}
 
@@ -318,8 +354,8 @@ vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
 					PushActiveSnapshot(GetTransactionSnapshot());
 				}
 
-				analyze_rel(relid, relation, options, params,
-							va_cols, in_outer_xact, vac_strategy);
+				analyze_rel(vrel->oid, vrel->relation, options, params,
+							vrel->va_cols, in_outer_xact, vac_strategy);
 
 				if (use_own_xacts)
 				{
@@ -373,42 +409,55 @@ vacuum(int options, RangeVar *relation, Oid relid, VacuumParams *params,
 }
 
 /*
- * Build a list of Oids for each relation to be processed
+ * Given a VacuumRelation, fill in the table OID if it wasn't specified,
+ * and optionally add VacuumRelations for partitions of the table.
+ *
+ * If a VacuumRelation does not have an OID supplied and is a partitioned
+ * table, an extra entry will be added to the output for each partition.
+ * Presently, only autovacuum supplies OIDs when calling vacuum(), and
+ * it does not want us to expand partitioned tables.
  *
- * The list is built in vac_context so that it will survive across our
- * per-relation transactions.
+ * We take care not to modify the input data structure, but instead build
+ * new VacuumRelation(s) to return.  (But note that they will reference
+ * unmodified parts of the input, eg column lists.)  New data structures
+ * are made in vac_context.
  */
 static List *
-get_rel_oids(Oid relid, const RangeVar *vacrel)
+expand_vacuum_rel(VacuumRelation *vrel)
 {
-	List	   *oid_list = NIL;
+	List	   *vacrels = NIL;
 	MemoryContext oldcontext;
 
-	/* OID supplied by VACUUM's caller? */
-	if (OidIsValid(relid))
+	/* If caller supplied OID, there's nothing we need do here. */
+	if (OidIsValid(vrel->oid))
 	{
 		oldcontext = MemoryContextSwitchTo(vac_context);
-		oid_list = lappend_oid(oid_list, relid);
+		vacrels = lappend(vacrels, vrel);
 		MemoryContextSwitchTo(oldcontext);
 	}
-	else if (vacrel)
+	else
 	{
-		/* Process a specific relation */
+		/* Process a specific relation, and possibly partitions thereof */
 		Oid			relid;
 		HeapTuple	tuple;
 		Form_pg_class classForm;
 		bool		include_parts;
 
 		/*
-		 * Since we don't take a lock here, the relation might be gone, or the
-		 * RangeVar might no longer refer to the OID we look up here.  In the
-		 * former case, VACUUM will do nothing; in the latter case, it will
-		 * process the OID we looked up here, rather than the new one. Neither
-		 * is ideal, but there's little practical alternative, since we're
-		 * going to commit this transaction and begin a new one between now
-		 * and then.
+		 * We transiently take AccessShareLock to protect the syscache lookup
+		 * below, as well as find_all_inheritors's expectation that the caller
+		 * holds some lock on the starting relation.
 		 */
-		relid = RangeVarGetRelid(vacrel, NoLock, false);
+		relid = RangeVarGetRelid(vrel->relation, AccessShareLock, false);
+
+		/*
+		 * Make a returnable VacuumRelation for this rel.
+		 */
+		oldcontext = MemoryContextSwitchTo(vac_context);
+		vacrels = lappend(vacrels, makeVacuumRelation(vrel->relation,
+													  relid,
+													  vrel->va_cols));
+		MemoryContextSwitchTo(oldcontext);
 
 		/*
 		 * To check whether the relation is a partitioned table, fetch its
@@ -422,58 +471,101 @@ get_rel_oids(Oid relid, const RangeVar *vacrel)
 		ReleaseSysCache(tuple);
 
 		/*
-		 * Make relation list entries for this guy and its partitions, if any.
-		 * Note that the list returned by find_all_inheritors() include the
-		 * passed-in OID at its head.  Also note that we did not request a
-		 * lock to be taken to match what would be done otherwise.
+		 * If it is, make relation list entries for its partitions.  Note that
+		 * the list returned by find_all_inheritors() includes the passed-in
+		 * OID, so we have to skip that.  There's no point in taking locks on
+		 * the individual partitions yet, and doing so would just add
+		 * unnecessary deadlock risk.
 		 */
-		oldcontext = MemoryContextSwitchTo(vac_context);
 		if (include_parts)
-			oid_list = list_concat(oid_list,
-								   find_all_inheritors(relid, NoLock, NULL));
-		else
-			oid_list = lappend_oid(oid_list, relid);
-		MemoryContextSwitchTo(oldcontext);
-	}
-	else
-	{
+		{
+			List	   *part_oids = find_all_inheritors(relid, NoLock, NULL);
+			ListCell   *part_lc;
+
+			foreach(part_lc, part_oids)
+			{
+				Oid			part_oid = lfirst_oid(part_lc);
+
+				if (part_oid == relid)
+					continue;	/* ignore original table */
+
+				/*
+				 * We omit a RangeVar since it wouldn't be appropriate to
+				 * complain about failure to open one of these relations
+				 * later.
+				 */
+				oldcontext = MemoryContextSwitchTo(vac_context);
+				vacrels = lappend(vacrels, makeVacuumRelation(NULL,
+															  part_oid,
+															  vrel->va_cols));
+				MemoryContextSwitchTo(oldcontext);
+			}
+		}
+
 		/*
-		 * Process all plain relations and materialized views listed in
-		 * pg_class
+		 * Release lock again.  This means that by the time we actually try to
+		 * process the table, it might be gone or renamed.  In the former case
+		 * we'll silently ignore it; in the latter case we'll process it
+		 * anyway, but we must beware that the RangeVar doesn't necessarily
+		 * identify it anymore.  This isn't ideal, perhaps, but there's little
+		 * practical alternative, since we're typically going to commit this
+		 * transaction and begin a new one between now and then.  Moreover,
+		 * holding locks on multiple relations would create significant risk
+		 * of deadlock.
 		 */
-		Relation	pgclass;
-		HeapScanDesc scan;
-		HeapTuple	tuple;
+		UnlockRelationOid(relid, AccessShareLock);
+	}
 
-		pgclass = heap_open(RelationRelationId, AccessShareLock);
+	return vacrels;
+}
 
-		scan = heap_beginscan_catalog(pgclass, 0, NULL);
+/*
+ * Construct a list of VacuumRelations for all vacuumable rels in
+ * the current database.  The list is built in vac_context.
+ */
+static List *
+get_all_vacuum_rels(void)
+{
+	List	   *vacrels = NIL;
+	Relation	pgclass;
+	HeapScanDesc scan;
+	HeapTuple	tuple;
 
-		while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
-		{
-			Form_pg_class classForm = (Form_pg_class) GETSTRUCT(tuple);
-
-			/*
-			 * We include partitioned tables here; depending on which
-			 * operation is to be performed, caller will decide whether to
-			 * process or ignore them.
-			 */
-			if (classForm->relkind != RELKIND_RELATION &&
-				classForm->relkind != RELKIND_MATVIEW &&
-				classForm->relkind != RELKIND_PARTITIONED_TABLE)
-				continue;
-
-			/* Make a relation list entry for this guy */
-			oldcontext = MemoryContextSwitchTo(vac_context);
-			oid_list = lappend_oid(oid_list, HeapTupleGetOid(tuple));
-			MemoryContextSwitchTo(oldcontext);
-		}
+	pgclass = heap_open(RelationRelationId, AccessShareLock);
+
+	scan = heap_beginscan_catalog(pgclass, 0, NULL);
 
-		heap_endscan(scan);
-		heap_close(pgclass, AccessShareLock);
+	while ((tuple = heap_getnext(scan, ForwardScanDirection)) != NULL)
+	{
+		Form_pg_class classForm = (Form_pg_class) GETSTRUCT(tuple);
+		MemoryContext oldcontext;
+
+		/*
+		 * We include partitioned tables here; depending on which operation is
+		 * to be performed, caller will decide whether to process or ignore
+		 * them.
+		 */
+		if (classForm->relkind != RELKIND_RELATION &&
+			classForm->relkind != RELKIND_MATVIEW &&
+			classForm->relkind != RELKIND_PARTITIONED_TABLE)
+			continue;
+
+		/*
+		 * Build VacuumRelation(s) specifying the table OIDs to be processed.
+		 * We omit a RangeVar since it wouldn't be appropriate to complain
+		 * about failure to open one of these relations later.
+		 */
+		oldcontext = MemoryContextSwitchTo(vac_context);
+		vacrels = lappend(vacrels, makeVacuumRelation(NULL,
+													  HeapTupleGetOid(tuple),
+													  NIL));
+		MemoryContextSwitchTo(oldcontext);
 	}
 
-	return oid_list;
+	heap_endscan(scan);
+	heap_close(pgclass, AccessShareLock);
+
+	return vacrels;
 }
 
 /*
@@ -563,7 +655,8 @@ vacuum_set_xid_limits(Relation rel,
 	{
 		ereport(WARNING,
 				(errmsg("oldest xmin is far in the past"),
-				 errhint("Close open transactions soon to avoid wraparound problems.")));
+				 errhint("Close open transactions soon to avoid wraparound problems.\n"
+						 "You might also need to commit or roll back old prepared transactions, or drop stale replication slots.")));
 		limit = *oldestXmin;
 	}
 
@@ -1212,6 +1305,14 @@ vac_truncate_clog(TransactionId frozenXID,
 /*
  *	vacuum_rel() -- vacuum one heap relation
  *
+ *		relid identifies the relation to vacuum.  If relation is supplied,
+ *		use the name therein for reporting any failure to open/lock the rel;
+ *		do not use it once we've successfully opened the rel, since it might
+ *		be stale.
+ *
+ *		Returns true if it's okay to proceed with a requested ANALYZE
+ *		operation on this table.
+ *
  *		Doing one heap at a time incurs extra overhead, since we need to
  *		check that the heap exists again just before we vacuum it.  The
  *		reason that we do this is so that vacuuming can be spread across
@@ -1230,6 +1331,7 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	Oid			save_userid;
 	int			save_sec_context;
 	int			save_nestlevel;
+	bool		rel_lock = true;
 
 	Assert(params != NULL);
 
@@ -1300,15 +1402,52 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	else
 	{
 		onerel = NULL;
-		if (IsAutoVacuumWorkerProcess() && params->log_min_duration >= 0)
-			ereport(LOG,
-					(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
-					 errmsg("skipping vacuum of \"%s\" --- lock not available",
-							relation->relname)));
+		rel_lock = false;
 	}
 
+	/*
+	 * If we failed to open or lock the relation, emit a log message before
+	 * exiting.
+	 */
 	if (!onerel)
 	{
+		int			elevel = 0;
+
+		/*
+		 * Determine the log level.
+		 *
+		 * If the RangeVar is not defined, we do not have enough information
+		 * to provide a meaningful log statement.  Chances are that
+		 * vacuum_rel's caller has intentionally not provided this information
+		 * so that this logging is skipped, anyway.
+		 *
+		 * Otherwise, for autovacuum logs, we emit a LOG if
+		 * log_autovacuum_min_duration is not disabled.  For manual VACUUM, we
+		 * emit a WARNING to match the log statements in the permission
+		 * checks.
+		 */
+		if (relation != NULL)
+		{
+			if (!IsAutoVacuumWorkerProcess())
+				elevel = WARNING;
+			else if (params->log_min_duration >= 0)
+				elevel = LOG;
+		}
+
+		if (elevel != 0)
+		{
+			if (!rel_lock)
+				ereport(elevel,
+						(errcode(ERRCODE_LOCK_NOT_AVAILABLE),
+						 errmsg("skipping vacuum of \"%s\" --- lock not available",
+								relation->relname)));
+			else
+				ereport(elevel,
+						(errcode(ERRCODE_UNDEFINED_TABLE),
+						 errmsg("skipping vacuum of \"%s\" --- relation no longer exists",
+								relation->relname)));
+		}
+
 		PopActiveSnapshot();
 		CommitTransactionCommand();
 		return false;
@@ -1346,9 +1485,7 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	}
 
 	/*
-	 * Check that it's a vacuumable relation; we used to do this in
-	 * get_rel_oids() but seems safer to check after we've locked the
-	 * relation.
+	 * Check that it's of a vacuumable relkind.
 	 */
 	if (onerel->rd_rel->relkind != RELKIND_RELATION &&
 		onerel->rd_rel->relkind != RELKIND_MATVIEW &&
@@ -1380,17 +1517,16 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	}
 
 	/*
-	 * Ignore partitioned tables as there is no work to be done.  Since we
-	 * release the lock here, it's possible that any partitions added from
-	 * this point on will not get processed, but that seems harmless.
+	 * Silently ignore partitioned tables as there is no work to be done.  The
+	 * useful work is on their child partitions, which have been queued up for
+	 * us separately.
 	 */
 	if (onerel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
 	{
 		relation_close(onerel, lmode);
 		PopActiveSnapshot();
 		CommitTransactionCommand();
-
-		/* It's OK for other commands to look at this table */
+		/* It's OK to proceed with ANALYZE on this table */
 		return true;
 	}
 
@@ -1468,7 +1604,7 @@ vacuum_rel(Oid relid, RangeVar *relation, int options, VacuumParams *params)
 	 * totally unimportant for toast relations.
 	 */
 	if (toast_relid != InvalidOid)
-		vacuum_rel(toast_relid, relation, options, params);
+		vacuum_rel(toast_relid, NULL, options, params);
 
 	/*
 	 * Now release the session-level lock on the master table.
diff --git a/src/backend/commands/vacuumlazy.c b/src/backend/commands/vacuumlazy.c
index e9b4045fe5..cf7f5e1162 100644
--- a/src/backend/commands/vacuumlazy.c
+++ b/src/backend/commands/vacuumlazy.c
@@ -23,7 +23,7 @@
  * the TID array, just enough to hold as many heap tuples as fit on one page.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -355,6 +355,7 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
 									   params->log_min_duration))
 		{
 			StringInfoData buf;
+			char	   *msgfmt;
 
 			TimestampDifference(starttime, endtime, &secs, &usecs);
 
@@ -373,7 +374,11 @@ lazy_vacuum_rel(Relation onerel, int options, VacuumParams *params,
 			 * emitting individual parts of the message when not applicable.
 			 */
 			initStringInfo(&buf);
-			appendStringInfo(&buf, _("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n"),
+			if (aggressive)
+				msgfmt = _("automatic aggressive vacuum of table \"%s.%s.%s\": index scans: %d\n");
+			else
+				msgfmt = _("automatic vacuum of table \"%s.%s.%s\": index scans: %d\n");
+			appendStringInfo(&buf, msgfmt,
 							 get_database_name(MyDatabaseId),
 							 get_namespace_name(RelationGetNamespace(onerel)),
 							 RelationGetRelationName(onerel),
@@ -462,6 +467,8 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 				blkno;
 	HeapTupleData tuple;
 	char	   *relname;
+	TransactionId relfrozenxid = onerel->rd_rel->relfrozenxid;
+	TransactionId relminmxid = onerel->rd_rel->relminmxid;
 	BlockNumber empty_pages,
 				vacuumed_pages;
 	double		num_tuples,
@@ -486,10 +493,16 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 	pg_rusage_init(&ru0);
 
 	relname = RelationGetRelationName(onerel);
-	ereport(elevel,
-			(errmsg("vacuuming \"%s.%s\"",
-					get_namespace_name(RelationGetNamespace(onerel)),
-					relname)));
+	if (aggressive)
+		ereport(elevel,
+				(errmsg("aggressively vacuuming \"%s.%s\"",
+						get_namespace_name(RelationGetNamespace(onerel)),
+						relname)));
+	else
+		ereport(elevel,
+				(errmsg("vacuuming \"%s.%s\"",
+						get_namespace_name(RelationGetNamespace(onerel)),
+						relname)));
 
 	empty_pages = vacuumed_pages = 0;
 	num_tuples = tups_vacuumed = nkeep = nunused = 0;
@@ -993,6 +1006,13 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 					 * tuple, we choose to keep it, because it'll be a lot
 					 * cheaper to get rid of it in the next pruning pass than
 					 * to treat it like an indexed tuple.
+					 *
+					 * If this were to happen for a tuple that actually needed
+					 * to be deleted, we'd be in trouble, because it'd
+					 * possibly leave a tuple below the relation's xmin
+					 * horizon alive.  heap_prepare_freeze_tuple() is prepared
+					 * to detect that case and abort the transaction,
+					 * preventing corruption.
 					 */
 					if (HeapTupleIsHotUpdated(&tuple) ||
 						HeapTupleIsHeapOnly(&tuple))
@@ -1084,8 +1104,10 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 				 * Each non-removable tuple must be checked to see if it needs
 				 * freezing.  Note we already have exclusive buffer lock.
 				 */
-				if (heap_prepare_freeze_tuple(tuple.t_data, FreezeLimit,
-											  MultiXactCutoff, &frozen[nfrozen],
+				if (heap_prepare_freeze_tuple(tuple.t_data,
+											  relfrozenxid, relminmxid,
+											  FreezeLimit, MultiXactCutoff,
+											  &frozen[nfrozen],
 											  &tuple_totally_frozen))
 					frozen[nfrozen++].offset = offnum;
 
@@ -1351,7 +1373,7 @@ lazy_scan_heap(Relation onerel, int options, LVRelStats *vacrelstats,
 									"%u pages are entirely empty.\n",
 									empty_pages),
 					 empty_pages);
-	appendStringInfo(&buf, "%s.", pg_rusage_show(&ru0));
+	appendStringInfo(&buf, _("%s."), pg_rusage_show(&ru0));
 
 	ereport(elevel,
 			(errmsg("\"%s\": found %.0f removable, %.0f nonremovable row versions in %u out of %u pages",
diff --git a/src/backend/commands/variable.c b/src/backend/commands/variable.c
index 3ed1c56e82..9a754dae3f 100644
--- a/src/backend/commands/variable.c
+++ b/src/backend/commands/variable.c
@@ -4,7 +4,7 @@
  *		Routines for handling specialized SET variables.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/commands/view.c b/src/backend/commands/view.c
index f25a5658d6..7d4511c585 100644
--- a/src/backend/commands/view.c
+++ b/src/backend/commands/view.c
@@ -3,7 +3,7 @@
  * view.c
  *	  use rewrite rules to construct views
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -43,11 +43,11 @@ static void checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc);
  * are "local" and "cascaded".
  */
 void
-validateWithCheckOption(char *value)
+validateWithCheckOption(const char *value)
 {
 	if (value == NULL ||
-		(pg_strcasecmp(value, "local") != 0 &&
-		 pg_strcasecmp(value, "cascaded") != 0))
+		(strcmp(value, "local") != 0 &&
+		 strcmp(value, "cascaded") != 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -283,8 +283,8 @@ checkViewTupleDesc(TupleDesc newdesc, TupleDesc olddesc)
 
 	for (i = 0; i < olddesc->natts; i++)
 	{
-		Form_pg_attribute newattr = newdesc->attrs[i];
-		Form_pg_attribute oldattr = olddesc->attrs[i];
+		Form_pg_attribute newattr = TupleDescAttr(newdesc, i);
+		Form_pg_attribute oldattr = TupleDescAttr(olddesc, i);
 
 		/* XXX msg not right, but we don't support DROP COL on view anyway */
 		if (newattr->attisdropped != oldattr->attisdropped)
@@ -485,7 +485,7 @@ DefineView(ViewStmt *stmt, const char *queryString,
 	{
 		DefElem    *defel = (DefElem *) lfirst(cell);
 
-		if (pg_strcasecmp(defel->defname, "check_option") == 0)
+		if (strcmp(defel->defname, "check_option") == 0)
 			check_option = true;
 	}
 
diff --git a/src/backend/executor/Makefile b/src/backend/executor/Makefile
index 083b20f3fe..cc09895fa5 100644
--- a/src/backend/executor/Makefile
+++ b/src/backend/executor/Makefile
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 OBJS = execAmi.o execCurrent.o execExpr.o execExprInterp.o \
        execGrouping.o execIndexing.o execJunk.o \
-       execMain.o execParallel.o execProcnode.o \
+       execMain.o execParallel.o execPartition.o execProcnode.o \
        execReplication.o execScan.o execSRF.o execTuples.o \
        execUtils.o functions.o instrument.o nodeAppend.o nodeAgg.o \
        nodeBitmapAnd.o nodeBitmapOr.o \
diff --git a/src/backend/executor/README b/src/backend/executor/README
index a0045067fb..0d7cd552eb 100644
--- a/src/backend/executor/README
+++ b/src/backend/executor/README
@@ -241,11 +241,13 @@ This is a sketch of control flow for full query processing:
 		CreateExecutorState
 			creates per-query context
 		switch to per-query context to run ExecInitNode
+		AfterTriggerBeginQuery
 		ExecInitNode --- recursively scans plan tree
+			ExecInitNode
+				recurse into subsidiary nodes
 			CreateExprContext
 				creates per-tuple context
 			ExecInitExpr
-		AfterTriggerBeginQuery
 
 	ExecutorRun
 		ExecProcNode --- recursively called in per-query context
diff --git a/src/backend/executor/execAmi.c b/src/backend/executor/execAmi.c
index f1636a5b88..9e78421978 100644
--- a/src/backend/executor/execAmi.c
+++ b/src/backend/executor/execAmi.c
@@ -3,7 +3,7 @@
  * execAmi.c
  *	  miscellaneous executor access method routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/executor/execAmi.c
diff --git a/src/backend/executor/execCurrent.c b/src/backend/executor/execCurrent.c
index f00fce5913..ce7d4ac592 100644
--- a/src/backend/executor/execCurrent.c
+++ b/src/backend/executor/execCurrent.c
@@ -3,7 +3,7 @@
  * execCurrent.c
  *	  executor support for WHERE CURRENT OF cursor
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/executor/execCurrent.c
@@ -32,7 +32,7 @@ static ScanState *search_plan_tree(PlanState *node, Oid table_oid);
  * of the table is currently being scanned by the cursor named by CURRENT OF,
  * and return the row's TID into *current_tid.
  *
- * Returns TRUE if a row was identified.  Returns FALSE if the cursor is valid
+ * Returns true if a row was identified.  Returns false if the cursor is valid
  * for the table but is not currently scanning a row of the table (this is a
  * legal situation in inheritance cases).  Raises error if cursor is not a
  * valid updatable scan of the specified table.
@@ -75,7 +75,7 @@ execCurrentOf(CurrentOfExpr *cexpr,
 				(errcode(ERRCODE_INVALID_CURSOR_STATE),
 				 errmsg("cursor \"%s\" is not a SELECT query",
 						cursor_name)));
-	queryDesc = PortalGetQueryDesc(portal);
+	queryDesc = portal->queryDesc;
 	if (queryDesc == NULL || queryDesc->estate == NULL)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_CURSOR_STATE),
@@ -216,11 +216,14 @@ fetch_cursor_param_value(ExprContext *econtext, int paramId)
 	if (paramInfo &&
 		paramId > 0 && paramId <= paramInfo->numParams)
 	{
-		ParamExternData *prm = &paramInfo->params[paramId - 1];
+		ParamExternData *prm;
+		ParamExternData prmdata;
 
 		/* give hook a chance in case parameter is dynamic */
-		if (!OidIsValid(prm->ptype) && paramInfo->paramFetch != NULL)
-			(*paramInfo->paramFetch) (paramInfo, paramId);
+		if (paramInfo->paramFetch != NULL)
+			prm = paramInfo->paramFetch(paramInfo, paramId, false, &prmdata);
+		else
+			prm = &paramInfo->params[paramId - 1];
 
 		if (OidIsValid(prm->ptype) && !prm->isnull)
 		{
diff --git a/src/backend/executor/execExpr.c b/src/backend/executor/execExpr.c
index 7496189fab..db5fcafbfe 100644
--- a/src/backend/executor/execExpr.c
+++ b/src/backend/executor/execExpr.c
@@ -19,7 +19,7 @@
  *	and "Expression Evaluation" sections.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -43,6 +43,7 @@
 #include "optimizer/planner.h"
 #include "pgstat.h"
 #include "utils/builtins.h"
+#include "utils/datum.h"
 #include "utils/lsyscache.h"
 #include "utils/typcache.h"
 
@@ -55,23 +56,27 @@ typedef struct LastAttnumInfo
 } LastAttnumInfo;
 
 static void ExecReadyExpr(ExprState *state);
-static void ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
+static void ExecInitExprRec(Expr *node, ExprState *state,
 				Datum *resv, bool *resnull);
-static void ExprEvalPushStep(ExprState *es, const ExprEvalStep *s);
 static void ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args,
-			 Oid funcid, Oid inputcollid, PlanState *parent,
+			 Oid funcid, Oid inputcollid,
 			 ExprState *state);
 static void ExecInitExprSlots(ExprState *state, Node *node);
+static void ExecPushExprSlots(ExprState *state, LastAttnumInfo *info);
 static bool get_last_attnums_walker(Node *node, LastAttnumInfo *info);
 static void ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable,
-					PlanState *parent);
+					ExprState *state);
 static void ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref,
-				 PlanState *parent, ExprState *state,
+				 ExprState *state,
 				 Datum *resv, bool *resnull);
 static bool isAssignmentIndirectionExpr(Expr *expr);
 static void ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
-					   PlanState *parent, ExprState *state,
+					   ExprState *state,
 					   Datum *resv, bool *resnull);
+static void ExecBuildAggTransCall(ExprState *state, AggState *aggstate,
+					  ExprEvalStep *scratch,
+					  FunctionCallInfo fcinfo, AggStatePerTrans pertrans,
+					  int transno, int setno, int setoff, bool ishash);
 
 
 /*
@@ -113,7 +118,7 @@ ExprState *
 ExecInitExpr(Expr *node, PlanState *parent)
 {
 	ExprState  *state;
-	ExprEvalStep scratch;
+	ExprEvalStep scratch = {0};
 
 	/* Special case: NULL expression produces a NULL ExprState pointer */
 	if (node == NULL)
@@ -122,12 +127,51 @@ ExecInitExpr(Expr *node, PlanState *parent)
 	/* Initialize ExprState with empty step list */
 	state = makeNode(ExprState);
 	state->expr = node;
+	state->parent = parent;
+	state->ext_params = NULL;
 
 	/* Insert EEOP_*_FETCHSOME steps as needed */
 	ExecInitExprSlots(state, (Node *) node);
 
 	/* Compile the expression proper */
-	ExecInitExprRec(node, parent, state, &state->resvalue, &state->resnull);
+	ExecInitExprRec(node, state, &state->resvalue, &state->resnull);
+
+	/* Finally, append a DONE step */
+	scratch.opcode = EEOP_DONE;
+	ExprEvalPushStep(state, &scratch);
+
+	ExecReadyExpr(state);
+
+	return state;
+}
+
+/*
+ * ExecInitExprWithParams: prepare a standalone expression tree for execution
+ *
+ * This is the same as ExecInitExpr, except that there is no parent PlanState,
+ * and instead we may have a ParamListInfo describing PARAM_EXTERN Params.
+ */
+ExprState *
+ExecInitExprWithParams(Expr *node, ParamListInfo ext_params)
+{
+	ExprState  *state;
+	ExprEvalStep scratch = {0};
+
+	/* Special case: NULL expression produces a NULL ExprState pointer */
+	if (node == NULL)
+		return NULL;
+
+	/* Initialize ExprState with empty step list */
+	state = makeNode(ExprState);
+	state->expr = node;
+	state->parent = NULL;
+	state->ext_params = ext_params;
+
+	/* Insert EEOP_*_FETCHSOME steps as needed */
+	ExecInitExprSlots(state, (Node *) node);
+
+	/* Compile the expression proper */
+	ExecInitExprRec(node, state, &state->resvalue, &state->resnull);
 
 	/* Finally, append a DONE step */
 	scratch.opcode = EEOP_DONE;
@@ -160,7 +204,7 @@ ExprState *
 ExecInitQual(List *qual, PlanState *parent)
 {
 	ExprState  *state;
-	ExprEvalStep scratch;
+	ExprEvalStep scratch = {0};
 	List	   *adjust_jumps = NIL;
 	ListCell   *lc;
 
@@ -172,6 +216,9 @@ ExecInitQual(List *qual, PlanState *parent)
 
 	state = makeNode(ExprState);
 	state->expr = (Expr *) qual;
+	state->parent = parent;
+	state->ext_params = NULL;
+
 	/* mark expression as to be used with ExecQual() */
 	state->flags = EEO_FLAG_IS_QUAL;
 
@@ -198,7 +245,7 @@ ExecInitQual(List *qual, PlanState *parent)
 		Expr	   *node = (Expr *) lfirst(lc);
 
 		/* first evaluate expression */
-		ExecInitExprRec(node, parent, state, &state->resvalue, &state->resnull);
+		ExecInitExprRec(node, state, &state->resvalue, &state->resnull);
 
 		/* then emit EEOP_QUAL to detect if it's false (or null) */
 		scratch.d.qualexpr.jumpdone = -1;
@@ -306,7 +353,7 @@ ExecBuildProjectionInfo(List *targetList,
 {
 	ProjectionInfo *projInfo = makeNode(ProjectionInfo);
 	ExprState  *state;
-	ExprEvalStep scratch;
+	ExprEvalStep scratch = {0};
 	ListCell   *lc;
 
 	projInfo->pi_exprContext = econtext;
@@ -314,6 +361,9 @@ ExecBuildProjectionInfo(List *targetList,
 	projInfo->pi_state.tag.type = T_ExprState;
 	state = &projInfo->pi_state;
 	state->expr = (Expr *) targetList;
+	state->parent = parent;
+	state->ext_params = NULL;
+
 	state->resultslot = slot;
 
 	/* Insert EEOP_*_FETCHSOME steps as needed */
@@ -347,7 +397,7 @@ ExecBuildProjectionInfo(List *targetList,
 				isSafeVar = true;	/* can't check, just assume OK */
 			else if (attnum <= inputDesc->natts)
 			{
-				Form_pg_attribute attr = inputDesc->attrs[attnum - 1];
+				Form_pg_attribute attr = TupleDescAttr(inputDesc, attnum - 1);
 
 				/*
 				 * If user attribute is dropped or has a type mismatch, don't
@@ -398,7 +448,7 @@ ExecBuildProjectionInfo(List *targetList,
 			 * matter) can change between executions.  We instead evaluate
 			 * into the ExprState's resvalue/resnull and then move.
 			 */
-			ExecInitExprRec(tle->expr, parent, state,
+			ExecInitExprRec(tle->expr, state,
 							&state->resvalue, &state->resnull);
 
 			/*
@@ -581,15 +631,14 @@ ExecReadyExpr(ExprState *state)
  * possibly recursing into sub-expressions of node.
  *
  * node - expression to evaluate
- * parent - parent executor node (or NULL if a standalone expression)
  * state - ExprState to whose ->steps to append the necessary operations
  * resv / resnull - where to store the result of the node into
  */
 static void
-ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
+ExecInitExprRec(Expr *node, ExprState *state,
 				Datum *resv, bool *resnull)
 {
-	ExprEvalStep scratch;
+	ExprEvalStep scratch = {0};
 
 	/* Guard against stack overflow due to overly complex expressions */
 	check_stack_depth();
@@ -609,7 +658,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				if (variable->varattno == InvalidAttrNumber)
 				{
 					/* whole-row Var */
-					ExecInitWholeRowVar(&scratch, variable, parent);
+					ExecInitWholeRowVar(&scratch, variable, state);
 				}
 				else if (variable->varattno <= 0)
 				{
@@ -637,20 +686,19 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					/* regular user column */
 					scratch.d.var.attnum = variable->varattno - 1;
 					scratch.d.var.vartype = variable->vartype;
-					/* select EEOP_*_FIRST opcode to force one-time checks */
 					switch (variable->varno)
 					{
 						case INNER_VAR:
-							scratch.opcode = EEOP_INNER_VAR_FIRST;
+							scratch.opcode = EEOP_INNER_VAR;
 							break;
 						case OUTER_VAR:
-							scratch.opcode = EEOP_OUTER_VAR_FIRST;
+							scratch.opcode = EEOP_OUTER_VAR;
 							break;
 
 							/* INDEX_VAR is handled by default case */
 
 						default:
-							scratch.opcode = EEOP_SCAN_VAR_FIRST;
+							scratch.opcode = EEOP_SCAN_VAR;
 							break;
 					}
 				}
@@ -674,6 +722,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 		case T_Param:
 			{
 				Param	   *param = (Param *) node;
+				ParamListInfo params;
 
 				switch (param->paramkind)
 				{
@@ -681,19 +730,41 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 						scratch.opcode = EEOP_PARAM_EXEC;
 						scratch.d.param.paramid = param->paramid;
 						scratch.d.param.paramtype = param->paramtype;
+						ExprEvalPushStep(state, &scratch);
 						break;
 					case PARAM_EXTERN:
-						scratch.opcode = EEOP_PARAM_EXTERN;
-						scratch.d.param.paramid = param->paramid;
-						scratch.d.param.paramtype = param->paramtype;
+
+						/*
+						 * If we have a relevant ParamCompileHook, use it;
+						 * otherwise compile a standard EEOP_PARAM_EXTERN
+						 * step.  ext_params, if supplied, takes precedence
+						 * over info from the parent node's EState (if any).
+						 */
+						if (state->ext_params)
+							params = state->ext_params;
+						else if (state->parent &&
+								 state->parent->state)
+							params = state->parent->state->es_param_list_info;
+						else
+							params = NULL;
+						if (params && params->paramCompile)
+						{
+							params->paramCompile(params, param, state,
+												 resv, resnull);
+						}
+						else
+						{
+							scratch.opcode = EEOP_PARAM_EXTERN;
+							scratch.d.param.paramid = param->paramid;
+							scratch.d.param.paramtype = param->paramtype;
+							ExprEvalPushStep(state, &scratch);
+						}
 						break;
 					default:
 						elog(ERROR, "unrecognized paramkind: %d",
 							 (int) param->paramkind);
 						break;
 				}
-
-				ExprEvalPushStep(state, &scratch);
 				break;
 			}
 
@@ -706,9 +777,9 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				scratch.d.aggref.astate = astate;
 				astate->aggref = aggref;
 
-				if (parent && IsA(parent, AggState))
+				if (state->parent && IsA(state->parent, AggState))
 				{
-					AggState   *aggstate = (AggState *) parent;
+					AggState   *aggstate = (AggState *) state->parent;
 
 					aggstate->aggs = lcons(astate, aggstate->aggs);
 					aggstate->numaggs++;
@@ -728,14 +799,14 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				GroupingFunc *grp_node = (GroupingFunc *) node;
 				Agg		   *agg;
 
-				if (!parent || !IsA(parent, AggState) ||
-					!IsA(parent->plan, Agg))
+				if (!state->parent || !IsA(state->parent, AggState) ||
+					!IsA(state->parent->plan, Agg))
 					elog(ERROR, "GroupingFunc found in non-Agg plan node");
 
 				scratch.opcode = EEOP_GROUPING_FUNC;
-				scratch.d.grouping_func.parent = (AggState *) parent;
+				scratch.d.grouping_func.parent = (AggState *) state->parent;
 
-				agg = (Agg *) (parent->plan);
+				agg = (Agg *) (state->parent->plan);
 
 				if (agg->groupingSets)
 					scratch.d.grouping_func.clauses = grp_node->cols;
@@ -753,9 +824,9 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 
 				wfstate->wfunc = wfunc;
 
-				if (parent && IsA(parent, WindowAggState))
+				if (state->parent && IsA(state->parent, WindowAggState))
 				{
-					WindowAggState *winstate = (WindowAggState *) parent;
+					WindowAggState *winstate = (WindowAggState *) state->parent;
 					int			nfuncs;
 
 					winstate->funcs = lcons(wfstate, winstate->funcs);
@@ -764,9 +835,10 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 						winstate->numaggs++;
 
 					/* for now initialize agg using old style expressions */
-					wfstate->args = ExecInitExprList(wfunc->args, parent);
+					wfstate->args = ExecInitExprList(wfunc->args,
+													 state->parent);
 					wfstate->aggfilter = ExecInitExpr(wfunc->aggfilter,
-													  parent);
+													  state->parent);
 
 					/*
 					 * Complain if the windowfunc's arguments contain any
@@ -795,7 +867,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 			{
 				ArrayRef   *aref = (ArrayRef *) node;
 
-				ExecInitArrayRef(&scratch, aref, parent, state, resv, resnull);
+				ExecInitArrayRef(&scratch, aref, state, resv, resnull);
 				break;
 			}
 
@@ -805,7 +877,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 
 				ExecInitFunc(&scratch, node,
 							 func->args, func->funcid, func->inputcollid,
-							 parent, state);
+							 state);
 				ExprEvalPushStep(state, &scratch);
 				break;
 			}
@@ -816,7 +888,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 
 				ExecInitFunc(&scratch, node,
 							 op->args, op->opfuncid, op->inputcollid,
-							 parent, state);
+							 state);
 				ExprEvalPushStep(state, &scratch);
 				break;
 			}
@@ -827,7 +899,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 
 				ExecInitFunc(&scratch, node,
 							 op->args, op->opfuncid, op->inputcollid,
-							 parent, state);
+							 state);
 
 				/*
 				 * Change opcode of call instruction to EEOP_DISTINCT.
@@ -849,7 +921,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 
 				ExecInitFunc(&scratch, node,
 							 op->args, op->opfuncid, op->inputcollid,
-							 parent, state);
+							 state);
 
 				/*
 				 * Change opcode of call instruction to EEOP_NULLIF.
@@ -883,7 +955,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 											 GetUserId(),
 											 ACL_EXECUTE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_PROC,
+					aclcheck_error(aclresult, OBJECT_FUNCTION,
 								   get_func_name(opexpr->opfuncid));
 				InvokeFunctionExecuteHook(opexpr->opfuncid);
 
@@ -896,7 +968,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 										 opexpr->inputcollid, NULL, NULL);
 
 				/* Evaluate scalar directly into left function argument */
-				ExecInitExprRec(scalararg, parent, state,
+				ExecInitExprRec(scalararg, state,
 								&fcinfo->arg[0], &fcinfo->argnull[0]);
 
 				/*
@@ -905,7 +977,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				 * be overwritten by EEOP_SCALARARRAYOP, and will not be
 				 * passed to any other expression.
 				 */
-				ExecInitExprRec(arrayarg, parent, state, resv, resnull);
+				ExecInitExprRec(arrayarg, state, resv, resnull);
 
 				/* And perform the operation */
 				scratch.opcode = EEOP_SCALARARRAYOP;
@@ -949,7 +1021,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					Expr	   *arg = (Expr *) lfirst(lc);
 
 					/* Evaluate argument into our output variable */
-					ExecInitExprRec(arg, parent, state, resv, resnull);
+					ExecInitExprRec(arg, state, resv, resnull);
 
 					/* Perform the appropriate step type */
 					switch (boolexpr->boolop)
@@ -1009,13 +1081,14 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				SubPlan    *subplan = (SubPlan *) node;
 				SubPlanState *sstate;
 
-				if (!parent)
+				if (!state->parent)
 					elog(ERROR, "SubPlan found with no parent plan");
 
-				sstate = ExecInitSubPlan(subplan, parent);
+				sstate = ExecInitSubPlan(subplan, state->parent);
 
-				/* add SubPlanState nodes to parent->subPlan */
-				parent->subPlan = lappend(parent->subPlan, sstate);
+				/* add SubPlanState nodes to state->parent->subPlan */
+				state->parent->subPlan = lappend(state->parent->subPlan,
+												 sstate);
 
 				scratch.opcode = EEOP_SUBPLAN;
 				scratch.d.subplan.sstate = sstate;
@@ -1029,10 +1102,10 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				AlternativeSubPlan *asplan = (AlternativeSubPlan *) node;
 				AlternativeSubPlanState *asstate;
 
-				if (!parent)
+				if (!state->parent)
 					elog(ERROR, "AlternativeSubPlan found with no parent plan");
 
-				asstate = ExecInitAlternativeSubPlan(asplan, parent);
+				asstate = ExecInitAlternativeSubPlan(asplan, state->parent);
 
 				scratch.opcode = EEOP_ALTERNATIVE_SUBPLAN;
 				scratch.d.alternative_subplan.asstate = asstate;
@@ -1046,7 +1119,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				FieldSelect *fselect = (FieldSelect *) node;
 
 				/* evaluate row/record argument into result area */
-				ExecInitExprRec(fselect->arg, parent, state, resv, resnull);
+				ExecInitExprRec(fselect->arg, state, resv, resnull);
 
 				/* and extract field */
 				scratch.opcode = EEOP_FIELDSELECT;
@@ -1083,7 +1156,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				*descp = NULL;
 
 				/* emit code to evaluate the composite input value */
-				ExecInitExprRec(fstore->arg, parent, state, resv, resnull);
+				ExecInitExprRec(fstore->arg, state, resv, resnull);
 
 				/* next, deform the input tuple into our workspace */
 				scratch.opcode = EEOP_FIELDSTORE_DEFORM;
@@ -1134,7 +1207,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					state->innermost_caseval = &values[fieldnum - 1];
 					state->innermost_casenull = &nulls[fieldnum - 1];
 
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&values[fieldnum - 1],
 									&nulls[fieldnum - 1]);
 
@@ -1158,7 +1231,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				/* relabel doesn't need to do anything at runtime */
 				RelabelType *relabel = (RelabelType *) node;
 
-				ExecInitExprRec(relabel->arg, parent, state, resv, resnull);
+				ExecInitExprRec(relabel->arg, state, resv, resnull);
 				break;
 			}
 
@@ -1171,7 +1244,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				FunctionCallInfo fcinfo_in;
 
 				/* evaluate argument into step's result area */
-				ExecInitExprRec(iocoerce->arg, parent, state, resv, resnull);
+				ExecInitExprRec(iocoerce->arg, state, resv, resnull);
 
 				/*
 				 * Prepare both output and input function calls, to be
@@ -1225,51 +1298,62 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 			{
 				ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) node;
 				Oid			resultelemtype;
+				ExprState  *elemstate;
 
 				/* evaluate argument into step's result area */
-				ExecInitExprRec(acoerce->arg, parent, state, resv, resnull);
+				ExecInitExprRec(acoerce->arg, state, resv, resnull);
 
 				resultelemtype = get_element_type(acoerce->resulttype);
 				if (!OidIsValid(resultelemtype))
 					ereport(ERROR,
 							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 							 errmsg("target type is not an array")));
-				/* Arrays over domains aren't supported yet */
-				Assert(getBaseType(resultelemtype) == resultelemtype);
 
-				scratch.opcode = EEOP_ARRAYCOERCE;
-				scratch.d.arraycoerce.coerceexpr = acoerce;
-				scratch.d.arraycoerce.resultelemtype = resultelemtype;
+				/*
+				 * Construct a sub-expression for the per-element expression;
+				 * but don't ready it until after we check it for triviality.
+				 * We assume it hasn't any Var references, but does have a
+				 * CaseTestExpr representing the source array element values.
+				 */
+				elemstate = makeNode(ExprState);
+				elemstate->expr = acoerce->elemexpr;
+				elemstate->parent = state->parent;
+				elemstate->ext_params = state->ext_params;
 
-				if (OidIsValid(acoerce->elemfuncid))
-				{
-					AclResult	aclresult;
+				elemstate->innermost_caseval = (Datum *) palloc(sizeof(Datum));
+				elemstate->innermost_casenull = (bool *) palloc(sizeof(bool));
 
-					/* Check permission to call function */
-					aclresult = pg_proc_aclcheck(acoerce->elemfuncid,
-												 GetUserId(),
-												 ACL_EXECUTE);
-					if (aclresult != ACLCHECK_OK)
-						aclcheck_error(aclresult, ACL_KIND_PROC,
-									   get_func_name(acoerce->elemfuncid));
-					InvokeFunctionExecuteHook(acoerce->elemfuncid);
+				ExecInitExprRec(acoerce->elemexpr, elemstate,
+								&elemstate->resvalue, &elemstate->resnull);
 
-					/* Set up the primary fmgr lookup information */
-					scratch.d.arraycoerce.elemfunc =
-						(FmgrInfo *) palloc0(sizeof(FmgrInfo));
-					fmgr_info(acoerce->elemfuncid,
-							  scratch.d.arraycoerce.elemfunc);
-					fmgr_info_set_expr((Node *) acoerce,
-									   scratch.d.arraycoerce.elemfunc);
+				if (elemstate->steps_len == 1 &&
+					elemstate->steps[0].opcode == EEOP_CASE_TESTVAL)
+				{
+					/* Trivial, so we need no per-element work at runtime */
+					elemstate = NULL;
+				}
+				else
+				{
+					/* Not trivial, so append a DONE step */
+					scratch.opcode = EEOP_DONE;
+					ExprEvalPushStep(elemstate, &scratch);
+					/* and ready the subexpression */
+					ExecReadyExpr(elemstate);
+				}
+
+				scratch.opcode = EEOP_ARRAYCOERCE;
+				scratch.d.arraycoerce.elemexprstate = elemstate;
+				scratch.d.arraycoerce.resultelemtype = resultelemtype;
 
+				if (elemstate)
+				{
 					/* Set up workspace for array_map */
 					scratch.d.arraycoerce.amstate =
 						(ArrayMapState *) palloc0(sizeof(ArrayMapState));
 				}
 				else
 				{
-					/* Don't need workspace if there's no conversion func */
-					scratch.d.arraycoerce.elemfunc = NULL;
+					/* Don't need workspace if there's no subexpression */
 					scratch.d.arraycoerce.amstate = NULL;
 				}
 
@@ -1282,7 +1366,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				ConvertRowtypeExpr *convert = (ConvertRowtypeExpr *) node;
 
 				/* evaluate argument into step's result area */
-				ExecInitExprRec(convert->arg, parent, state, resv, resnull);
+				ExecInitExprRec(convert->arg, state, resv, resnull);
 
 				/* and push conversion step */
 				scratch.opcode = EEOP_CONVERT_ROWTYPE;
@@ -1316,7 +1400,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					caseval = palloc(sizeof(Datum));
 					casenull = palloc(sizeof(bool));
 
-					ExecInitExprRec(caseExpr->arg, parent, state,
+					ExecInitExprRec(caseExpr->arg, state,
 									caseval, casenull);
 
 					/*
@@ -1367,7 +1451,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					state->innermost_casenull = casenull;
 
 					/* evaluate condition into CASE's result variables */
-					ExecInitExprRec(when->expr, parent, state, resv, resnull);
+					ExecInitExprRec(when->expr, state, resv, resnull);
 
 					state->innermost_caseval = save_innermost_caseval;
 					state->innermost_casenull = save_innermost_casenull;
@@ -1382,7 +1466,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					 * If WHEN result is true, evaluate THEN result, storing
 					 * it into the CASE's result variables.
 					 */
-					ExecInitExprRec(when->result, parent, state, resv, resnull);
+					ExecInitExprRec(when->result, state, resv, resnull);
 
 					/* Emit JUMP step to jump to end of CASE's code */
 					scratch.opcode = EEOP_JUMP;
@@ -1407,7 +1491,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				Assert(caseExpr->defresult);
 
 				/* evaluate ELSE expr into CASE's result variables */
-				ExecInitExprRec(caseExpr->defresult, parent, state,
+				ExecInitExprRec(caseExpr->defresult, state,
 								resv, resnull);
 
 				/* adjust jump targets */
@@ -1476,7 +1560,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				{
 					Expr	   *e = (Expr *) lfirst(lc);
 
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&scratch.d.arrayexpr.elemvalues[elemoff],
 									&scratch.d.arrayexpr.elemnulls[elemoff]);
 					elemoff++;
@@ -1492,7 +1576,6 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				RowExpr    *rowexpr = (RowExpr *) node;
 				int			nelems = list_length(rowexpr->args);
 				TupleDesc	tupdesc;
-				Form_pg_attribute *attrs;
 				int			i;
 				ListCell   *l;
 
@@ -1539,13 +1622,13 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				memset(scratch.d.row.elemnulls, true, sizeof(bool) * nelems);
 
 				/* Set up evaluation, skipping any deleted columns */
-				attrs = tupdesc->attrs;
 				i = 0;
 				foreach(l, rowexpr->args)
 				{
+					Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 					Expr	   *e = (Expr *) lfirst(l);
 
-					if (!attrs[i]->attisdropped)
+					if (!att->attisdropped)
 					{
 						/*
 						 * Guard against ALTER COLUMN TYPE on rowtype since
@@ -1553,12 +1636,12 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 						 * typmod too?	Not sure we can be sure it'll be the
 						 * same.
 						 */
-						if (exprType((Node *) e) != attrs[i]->atttypid)
+						if (exprType((Node *) e) != att->atttypid)
 							ereport(ERROR,
 									(errcode(ERRCODE_DATATYPE_MISMATCH),
 									 errmsg("ROW() column has type %s instead of type %s",
 											format_type_be(exprType((Node *) e)),
-											format_type_be(attrs[i]->atttypid))));
+											format_type_be(att->atttypid))));
 					}
 					else
 					{
@@ -1571,7 +1654,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					}
 
 					/* Evaluate column expr into appropriate workspace slot */
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&scratch.d.row.elemvalues[i],
 									&scratch.d.row.elemnulls[i]);
 					i++;
@@ -1660,9 +1743,9 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					 */
 
 					/* evaluate left and right args directly into fcinfo */
-					ExecInitExprRec(left_expr, parent, state,
+					ExecInitExprRec(left_expr, state,
 									&fcinfo->arg[0], &fcinfo->argnull[0]);
-					ExecInitExprRec(right_expr, parent, state,
+					ExecInitExprRec(right_expr, state,
 									&fcinfo->arg[1], &fcinfo->argnull[1]);
 
 					scratch.opcode = EEOP_ROWCOMPARE_STEP;
@@ -1731,7 +1814,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 					Expr	   *e = (Expr *) lfirst(lc);
 
 					/* evaluate argument, directly into result datum */
-					ExecInitExprRec(e, parent, state, resv, resnull);
+					ExecInitExprRec(e, state, resv, resnull);
 
 					/* if it's not null, skip to end of COALESCE expr */
 					scratch.opcode = EEOP_JUMP_IF_NOT_NULL;
@@ -1813,7 +1896,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				{
 					Expr	   *e = (Expr *) lfirst(lc);
 
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&scratch.d.minmax.values[off],
 									&scratch.d.minmax.nulls[off]);
 					off++;
@@ -1879,7 +1962,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				{
 					Expr	   *e = (Expr *) lfirst(arg);
 
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&scratch.d.xmlexpr.named_argvalue[off],
 									&scratch.d.xmlexpr.named_argnull[off]);
 					off++;
@@ -1890,7 +1973,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				{
 					Expr	   *e = (Expr *) lfirst(arg);
 
-					ExecInitExprRec(e, parent, state,
+					ExecInitExprRec(e, state,
 									&scratch.d.xmlexpr.argvalue[off],
 									&scratch.d.xmlexpr.argnull[off]);
 					off++;
@@ -1928,7 +2011,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				scratch.d.nulltest_row.argdesc = NULL;
 
 				/* first evaluate argument into result variable */
-				ExecInitExprRec(ntest->arg, parent, state,
+				ExecInitExprRec(ntest->arg, state,
 								resv, resnull);
 
 				/* then push the test of that argument */
@@ -1946,7 +2029,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 				 * and will get overwritten by the below EEOP_BOOLTEST_IS_*
 				 * step.
 				 */
-				ExecInitExprRec(btest->arg, parent, state, resv, resnull);
+				ExecInitExprRec(btest->arg, state, resv, resnull);
 
 				switch (btest->booltesttype)
 				{
@@ -1983,7 +2066,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
 			{
 				CoerceToDomain *ctest = (CoerceToDomain *) node;
 
-				ExecInitCoerceToDomain(&scratch, ctest, parent, state,
+				ExecInitCoerceToDomain(&scratch, ctest, state,
 									   resv, resnull);
 				break;
 			}
@@ -2039,7 +2122,7 @@ ExecInitExprRec(Expr *node, PlanState *parent, ExprState *state,
  * Note that this potentially re-allocates es->steps, therefore no pointer
  * into that array may be used while the expression is still being built.
  */
-static void
+void
 ExprEvalPushStep(ExprState *es, const ExprEvalStep *s)
 {
 	if (es->steps_alloc == 0)
@@ -2067,7 +2150,7 @@ ExprEvalPushStep(ExprState *es, const ExprEvalStep *s)
  */
 static void
 ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
-			 Oid inputcollid, PlanState *parent, ExprState *state)
+			 Oid inputcollid, ExprState *state)
 {
 	int			nargs = list_length(args);
 	AclResult	aclresult;
@@ -2079,7 +2162,7 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 	/* Check permission to call function */
 	aclresult = pg_proc_aclcheck(funcid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, get_func_name(funcid));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(funcid));
 	InvokeFunctionExecuteHook(funcid);
 
 	/*
@@ -2119,8 +2202,9 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("set-valued function called in context that cannot accept a set"),
-				 parent ? executor_errposition(parent->state,
-											   exprLocation((Node *) node)) : 0));
+				 state->parent ?
+				 executor_errposition(state->parent->state,
+									  exprLocation((Node *) node)) : 0));
 
 	/* Build code to evaluate arguments directly into the fcinfo struct */
 	argno = 0;
@@ -2141,7 +2225,7 @@ ExecInitFunc(ExprEvalStep *scratch, Expr *node, List *args, Oid funcid,
 		}
 		else
 		{
-			ExecInitExprRec(arg, parent, state,
+			ExecInitExprRec(arg, state,
 							&fcinfo->arg[argno], &fcinfo->argnull[argno]);
 		}
 		argno++;
@@ -2172,30 +2256,45 @@ static void
 ExecInitExprSlots(ExprState *state, Node *node)
 {
 	LastAttnumInfo info = {0, 0, 0};
-	ExprEvalStep scratch;
 
 	/*
 	 * Figure out which attributes we're going to need.
 	 */
 	get_last_attnums_walker(node, &info);
 
+	ExecPushExprSlots(state, &info);
+}
+
+/*
+ * Add steps deforming the ExprState's inner/out/scan slots as much as
+ * indicated by info. This is useful when building an ExprState covering more
+ * than one expression.
+ */
+static void
+ExecPushExprSlots(ExprState *state, LastAttnumInfo *info)
+{
+	ExprEvalStep scratch = {0};
+
+	scratch.resvalue = NULL;
+	scratch.resnull = NULL;
+
 	/* Emit steps as needed */
-	if (info.last_inner > 0)
+	if (info->last_inner > 0)
 	{
 		scratch.opcode = EEOP_INNER_FETCHSOME;
-		scratch.d.fetch.last_var = info.last_inner;
+		scratch.d.fetch.last_var = info->last_inner;
 		ExprEvalPushStep(state, &scratch);
 	}
-	if (info.last_outer > 0)
+	if (info->last_outer > 0)
 	{
 		scratch.opcode = EEOP_OUTER_FETCHSOME;
-		scratch.d.fetch.last_var = info.last_outer;
+		scratch.d.fetch.last_var = info->last_outer;
 		ExprEvalPushStep(state, &scratch);
 	}
-	if (info.last_scan > 0)
+	if (info->last_scan > 0)
 	{
 		scratch.opcode = EEOP_SCAN_FETCHSOME;
-		scratch.d.fetch.last_var = info.last_scan;
+		scratch.d.fetch.last_var = info->last_scan;
 		ExprEvalPushStep(state, &scratch);
 	}
 }
@@ -2253,8 +2352,10 @@ get_last_attnums_walker(Node *node, LastAttnumInfo *info)
  * The caller still has to push the step.
  */
 static void
-ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, PlanState *parent)
+ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, ExprState *state)
 {
+	PlanState  *parent = state->parent;
+
 	/* fill in all but the target */
 	scratch->opcode = EEOP_WHOLEROW;
 	scratch->d.wholerow.var = variable;
@@ -2314,7 +2415,7 @@ ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, PlanState *parent)
 				scratch->d.wholerow.junkFilter =
 					ExecInitJunkFilter(subplan->plan->targetlist,
 									   ExecGetResultType(subplan)->tdhasoid,
-									   ExecInitExtraTupleSlot(parent->state));
+									   ExecInitExtraTupleSlot(parent->state, NULL));
 			}
 		}
 	}
@@ -2324,7 +2425,7 @@ ExecInitWholeRowVar(ExprEvalStep *scratch, Var *variable, PlanState *parent)
  * Prepare evaluation of an ArrayRef expression.
  */
 static void
-ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref, PlanState *parent,
+ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref,
 				 ExprState *state, Datum *resv, bool *resnull)
 {
 	bool		isAssignment = (aref->refassgnexpr != NULL);
@@ -2348,7 +2449,7 @@ ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref, PlanState *parent,
 	 * be overwritten by the final EEOP_ARRAYREF_FETCH/ASSIGN step, which is
 	 * pushed last.
 	 */
-	ExecInitExprRec(aref->refexpr, parent, state, resv, resnull);
+	ExecInitExprRec(aref->refexpr, state, resv, resnull);
 
 	/*
 	 * If refexpr yields NULL, and it's a fetch, then result is NULL.  We can
@@ -2394,7 +2495,7 @@ ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref, PlanState *parent,
 		arefstate->upperprovided[i] = true;
 
 		/* Each subscript is evaluated into subscriptvalue/subscriptnull */
-		ExecInitExprRec(e, parent, state,
+		ExecInitExprRec(e, state,
 						&arefstate->subscriptvalue, &arefstate->subscriptnull);
 
 		/* ... and then ARRAYREF_SUBSCRIPT saves it into step's workspace */
@@ -2427,7 +2528,7 @@ ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref, PlanState *parent,
 		arefstate->lowerprovided[i] = true;
 
 		/* Each subscript is evaluated into subscriptvalue/subscriptnull */
-		ExecInitExprRec(e, parent, state,
+		ExecInitExprRec(e, state,
 						&arefstate->subscriptvalue, &arefstate->subscriptnull);
 
 		/* ... and then ARRAYREF_SUBSCRIPT saves it into step's workspace */
@@ -2481,7 +2582,7 @@ ExecInitArrayRef(ExprEvalStep *scratch, ArrayRef *aref, PlanState *parent,
 		state->innermost_casenull = &arefstate->prevnull;
 
 		/* evaluate replacement value into replacevalue/replacenull */
-		ExecInitExprRec(aref->refassgnexpr, parent, state,
+		ExecInitExprRec(aref->refassgnexpr, state,
 						&arefstate->replacevalue, &arefstate->replacenull);
 
 		state->innermost_caseval = save_innermost_caseval;
@@ -2559,10 +2660,9 @@ isAssignmentIndirectionExpr(Expr *expr)
  */
 static void
 ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
-					   PlanState *parent, ExprState *state,
-					   Datum *resv, bool *resnull)
+					   ExprState *state, Datum *resv, bool *resnull)
 {
-	ExprEvalStep scratch2;
+	ExprEvalStep scratch2 = {0};
 	DomainConstraintRef *constraint_ref;
 	Datum	   *domainval = NULL;
 	bool	   *domainnull = NULL;
@@ -2580,7 +2680,7 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
 	 * if there's constraint failures there'll be errors, otherwise it's what
 	 * needs to be returned.
 	 */
-	ExecInitExprRec(ctest->arg, parent, state, resv, resnull);
+	ExecInitExprRec(ctest->arg, state, resv, resnull);
 
 	/*
 	 * Note: if the argument is of varlena type, it could be a R/W expanded
@@ -2677,7 +2777,7 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
 				state->innermost_domainnull = domainnull;
 
 				/* evaluate check expression value */
-				ExecInitExprRec(con->check_expr, parent, state,
+				ExecInitExprRec(con->check_expr, state,
 								scratch->d.domaincheck.checkvalue,
 								scratch->d.domaincheck.checknull);
 
@@ -2696,3 +2796,543 @@ ExecInitCoerceToDomain(ExprEvalStep *scratch, CoerceToDomain *ctest,
 		}
 	}
 }
+
+/*
+ * Build transition/combine function invocations for all aggregate transition
+ * / combination function invocations in a grouping sets phase. This has to
+ * invoke all sort based transitions in a phase (if doSort is true), all hash
+ * based transitions (if doHash is true), or both (both true).
+ *
+ * The resulting expression will, for each set of transition values, first
+ * check for filters, evaluate aggregate input, check that that input is not
+ * NULL for a strict transition function, and then finally invoke the
+ * transition for each of the concurrently computed grouping sets.
+ */
+ExprState *
+ExecBuildAggTrans(AggState *aggstate, AggStatePerPhase phase,
+				  bool doSort, bool doHash)
+{
+	ExprState  *state = makeNode(ExprState);
+	PlanState  *parent = &aggstate->ss.ps;
+	ExprEvalStep scratch = {0};
+	int			transno = 0;
+	int			setoff = 0;
+	bool		isCombine = DO_AGGSPLIT_COMBINE(aggstate->aggsplit);
+	LastAttnumInfo deform = {0, 0, 0};
+
+	state->expr = (Expr *) aggstate;
+	state->parent = parent;
+
+	scratch.resvalue = &state->resvalue;
+	scratch.resnull = &state->resnull;
+
+	/*
+	 * First figure out which slots, and how many columns from each, we're
+	 * going to need.
+	 */
+	for (transno = 0; transno < aggstate->numtrans; transno++)
+	{
+		AggStatePerTrans pertrans = &aggstate->pertrans[transno];
+
+		get_last_attnums_walker((Node *) pertrans->aggref->aggdirectargs,
+								&deform);
+		get_last_attnums_walker((Node *) pertrans->aggref->args,
+								&deform);
+		get_last_attnums_walker((Node *) pertrans->aggref->aggorder,
+								&deform);
+		get_last_attnums_walker((Node *) pertrans->aggref->aggdistinct,
+								&deform);
+		get_last_attnums_walker((Node *) pertrans->aggref->aggfilter,
+								&deform);
+	}
+	ExecPushExprSlots(state, &deform);
+
+	/*
+	 * Emit instructions for each transition value / grouping set combination.
+	 */
+	for (transno = 0; transno < aggstate->numtrans; transno++)
+	{
+		AggStatePerTrans pertrans = &aggstate->pertrans[transno];
+		int			numInputs = pertrans->numInputs;
+		int			argno;
+		int			setno;
+		FunctionCallInfo trans_fcinfo = &pertrans->transfn_fcinfo;
+		ListCell   *arg;
+		ListCell   *bail;
+		List	   *adjust_bailout = NIL;
+		bool	   *strictnulls = NULL;
+
+		/*
+		 * If filter present, emit. Do so before evaluating the input, to
+		 * avoid potentially unneeded computations, or even worse, unintended
+		 * side-effects.  When combining, all the necessary filtering has
+		 * already been done.
+		 */
+		if (pertrans->aggref->aggfilter && !isCombine)
+		{
+			/* evaluate filter expression */
+			ExecInitExprRec(pertrans->aggref->aggfilter, state,
+							&state->resvalue, &state->resnull);
+			/* and jump out if false */
+			scratch.opcode = EEOP_JUMP_IF_NOT_TRUE;
+			scratch.d.jump.jumpdone = -1;	/* adjust later */
+			ExprEvalPushStep(state, &scratch);
+			adjust_bailout = lappend_int(adjust_bailout,
+										 state->steps_len - 1);
+		}
+
+		/*
+		 * Evaluate arguments to aggregate/combine function.
+		 */
+		argno = 0;
+		if (isCombine)
+		{
+			/*
+			 * Combining two aggregate transition values. Instead of directly
+			 * coming from a tuple the input is a, potentially deserialized,
+			 * transition value.
+			 */
+			TargetEntry *source_tle;
+
+			Assert(pertrans->numSortCols == 0);
+			Assert(list_length(pertrans->aggref->args) == 1);
+
+			strictnulls = trans_fcinfo->argnull + 1;
+			source_tle = (TargetEntry *) linitial(pertrans->aggref->args);
+
+			/*
+			 * deserialfn_oid will be set if we must deserialize the input
+			 * state before calling the combine function.
+			 */
+			if (!OidIsValid(pertrans->deserialfn_oid))
+			{
+				/*
+				 * Start from 1, since the 0th arg will be the transition
+				 * value
+				 */
+				ExecInitExprRec(source_tle->expr, state,
+								&trans_fcinfo->arg[argno + 1],
+								&trans_fcinfo->argnull[argno + 1]);
+			}
+			else
+			{
+				FunctionCallInfo ds_fcinfo = &pertrans->deserialfn_fcinfo;
+
+				/* evaluate argument */
+				ExecInitExprRec(source_tle->expr, state,
+								&ds_fcinfo->arg[0],
+								&ds_fcinfo->argnull[0]);
+
+				/* Dummy second argument for type-safety reasons */
+				ds_fcinfo->arg[1] = PointerGetDatum(NULL);
+				ds_fcinfo->argnull[1] = false;
+
+				/*
+				 * Don't call a strict deserialization function with NULL
+				 * input
+				 */
+				if (pertrans->deserialfn.fn_strict)
+					scratch.opcode = EEOP_AGG_STRICT_DESERIALIZE;
+				else
+					scratch.opcode = EEOP_AGG_DESERIALIZE;
+
+				scratch.d.agg_deserialize.aggstate = aggstate;
+				scratch.d.agg_deserialize.fcinfo_data = ds_fcinfo;
+				scratch.d.agg_deserialize.jumpnull = -1;	/* adjust later */
+				scratch.resvalue = &trans_fcinfo->arg[argno + 1];
+				scratch.resnull = &trans_fcinfo->argnull[argno + 1];
+
+				ExprEvalPushStep(state, &scratch);
+				adjust_bailout = lappend_int(adjust_bailout,
+											 state->steps_len - 1);
+
+				/* restore normal settings of scratch fields */
+				scratch.resvalue = &state->resvalue;
+				scratch.resnull = &state->resnull;
+			}
+			argno++;
+		}
+		else if (pertrans->numSortCols == 0)
+		{
+			/*
+			 * Normal transition function without ORDER BY / DISTINCT.
+			 */
+			strictnulls = trans_fcinfo->argnull + 1;
+
+			foreach(arg, pertrans->aggref->args)
+			{
+				TargetEntry *source_tle = (TargetEntry *) lfirst(arg);
+
+				/*
+				 * Start from 1, since the 0th arg will be the transition
+				 * value
+				 */
+				ExecInitExprRec(source_tle->expr, state,
+								&trans_fcinfo->arg[argno + 1],
+								&trans_fcinfo->argnull[argno + 1]);
+				argno++;
+			}
+		}
+		else if (pertrans->numInputs == 1)
+		{
+			/*
+			 * DISTINCT and/or ORDER BY case, with a single column sorted on.
+			 */
+			TargetEntry *source_tle =
+			(TargetEntry *) linitial(pertrans->aggref->args);
+
+			Assert(list_length(pertrans->aggref->args) == 1);
+
+			ExecInitExprRec(source_tle->expr, state,
+							&state->resvalue,
+							&state->resnull);
+			strictnulls = &state->resnull;
+			argno++;
+		}
+		else
+		{
+			/*
+			 * DISTINCT and/or ORDER BY case, with multiple columns sorted on.
+			 */
+			Datum	   *values = pertrans->sortslot->tts_values;
+			bool	   *nulls = pertrans->sortslot->tts_isnull;
+
+			strictnulls = nulls;
+
+			foreach(arg, pertrans->aggref->args)
+			{
+				TargetEntry *source_tle = (TargetEntry *) lfirst(arg);
+
+				ExecInitExprRec(source_tle->expr, state,
+								&values[argno], &nulls[argno]);
+				argno++;
+			}
+		}
+		Assert(numInputs == argno);
+
+		/*
+		 * For a strict transfn, nothing happens when there's a NULL input; we
+		 * just keep the prior transValue. This is true for both plain and
+		 * sorted/distinct aggregates.
+		 */
+		if (trans_fcinfo->flinfo->fn_strict && numInputs > 0)
+		{
+			scratch.opcode = EEOP_AGG_STRICT_INPUT_CHECK;
+			scratch.d.agg_strict_input_check.nulls = strictnulls;
+			scratch.d.agg_strict_input_check.jumpnull = -1; /* adjust later */
+			scratch.d.agg_strict_input_check.nargs = numInputs;
+			ExprEvalPushStep(state, &scratch);
+			adjust_bailout = lappend_int(adjust_bailout,
+										 state->steps_len - 1);
+		}
+
+		/*
+		 * Call transition function (once for each concurrently evaluated
+		 * grouping set). Do so for both sort and hash based computations, as
+		 * applicable.
+		 */
+		setoff = 0;
+		if (doSort)
+		{
+			int			processGroupingSets = Max(phase->numsets, 1);
+
+			for (setno = 0; setno < processGroupingSets; setno++)
+			{
+				ExecBuildAggTransCall(state, aggstate, &scratch, trans_fcinfo,
+									  pertrans, transno, setno, setoff, false);
+				setoff++;
+			}
+		}
+
+		if (doHash)
+		{
+			int			numHashes = aggstate->num_hashes;
+
+			/* in MIXED mode, there'll be preceding transition values */
+			if (aggstate->aggstrategy != AGG_HASHED)
+				setoff = aggstate->maxsets;
+			else
+				setoff = 0;
+
+			for (setno = 0; setno < numHashes; setno++)
+			{
+				ExecBuildAggTransCall(state, aggstate, &scratch, trans_fcinfo,
+									  pertrans, transno, setno, setoff, true);
+				setoff++;
+			}
+		}
+
+		/* adjust early bail out jump target(s) */
+		foreach(bail, adjust_bailout)
+		{
+			ExprEvalStep *as = &state->steps[lfirst_int(bail)];
+
+			if (as->opcode == EEOP_JUMP_IF_NOT_TRUE)
+			{
+				Assert(as->d.jump.jumpdone == -1);
+				as->d.jump.jumpdone = state->steps_len;
+			}
+			else if (as->opcode == EEOP_AGG_STRICT_INPUT_CHECK)
+			{
+				Assert(as->d.agg_strict_input_check.jumpnull == -1);
+				as->d.agg_strict_input_check.jumpnull = state->steps_len;
+			}
+			else if (as->opcode == EEOP_AGG_STRICT_DESERIALIZE)
+			{
+				Assert(as->d.agg_deserialize.jumpnull == -1);
+				as->d.agg_deserialize.jumpnull = state->steps_len;
+			}
+		}
+	}
+
+	scratch.resvalue = NULL;
+	scratch.resnull = NULL;
+	scratch.opcode = EEOP_DONE;
+	ExprEvalPushStep(state, &scratch);
+
+	ExecReadyExpr(state);
+
+	return state;
+}
+
+/*
+ * Build transition/combine function invocation for a single transition
+ * value. This is separated from ExecBuildAggTrans() because there are
+ * multiple callsites (hash and sort in some grouping set cases).
+ */
+static void
+ExecBuildAggTransCall(ExprState *state, AggState *aggstate,
+					  ExprEvalStep *scratch,
+					  FunctionCallInfo fcinfo, AggStatePerTrans pertrans,
+					  int transno, int setno, int setoff, bool ishash)
+{
+	int			adjust_init_jumpnull = -1;
+	int			adjust_strict_jumpnull = -1;
+	ExprContext *aggcontext;
+
+	if (ishash)
+		aggcontext = aggstate->hashcontext;
+	else
+		aggcontext = aggstate->aggcontexts[setno];
+
+	/*
+	 * If the initial value for the transition state doesn't exist in the
+	 * pg_aggregate table then we will let the first non-NULL value returned
+	 * from the outer procNode become the initial value. (This is useful for
+	 * aggregates like max() and min().) The noTransValue flag signals that we
+	 * still need to do this.
+	 */
+	if (pertrans->numSortCols == 0 &&
+		fcinfo->flinfo->fn_strict &&
+		pertrans->initValueIsNull)
+	{
+		scratch->opcode = EEOP_AGG_INIT_TRANS;
+		scratch->d.agg_init_trans.aggstate = aggstate;
+		scratch->d.agg_init_trans.pertrans = pertrans;
+		scratch->d.agg_init_trans.setno = setno;
+		scratch->d.agg_init_trans.setoff = setoff;
+		scratch->d.agg_init_trans.transno = transno;
+		scratch->d.agg_init_trans.aggcontext = aggcontext;
+		scratch->d.agg_init_trans.jumpnull = -1;	/* adjust later */
+		ExprEvalPushStep(state, scratch);
+
+		/* see comment about jumping out below */
+		adjust_init_jumpnull = state->steps_len - 1;
+	}
+
+	if (pertrans->numSortCols == 0 &&
+		fcinfo->flinfo->fn_strict)
+	{
+		scratch->opcode = EEOP_AGG_STRICT_TRANS_CHECK;
+		scratch->d.agg_strict_trans_check.aggstate = aggstate;
+		scratch->d.agg_strict_trans_check.setno = setno;
+		scratch->d.agg_strict_trans_check.setoff = setoff;
+		scratch->d.agg_strict_trans_check.transno = transno;
+		scratch->d.agg_strict_trans_check.jumpnull = -1;	/* adjust later */
+		ExprEvalPushStep(state, scratch);
+
+		/*
+		 * Note, we don't push into adjust_bailout here - those jump to the
+		 * end of all transition value computations. Here a single transition
+		 * value is NULL, so just skip processing the individual value.
+		 */
+		adjust_strict_jumpnull = state->steps_len - 1;
+	}
+
+	/* invoke appropriate transition implementation */
+	if (pertrans->numSortCols == 0 && pertrans->transtypeByVal)
+		scratch->opcode = EEOP_AGG_PLAIN_TRANS_BYVAL;
+	else if (pertrans->numSortCols == 0)
+		scratch->opcode = EEOP_AGG_PLAIN_TRANS;
+	else if (pertrans->numInputs == 1)
+		scratch->opcode = EEOP_AGG_ORDERED_TRANS_DATUM;
+	else
+		scratch->opcode = EEOP_AGG_ORDERED_TRANS_TUPLE;
+
+	scratch->d.agg_trans.aggstate = aggstate;
+	scratch->d.agg_trans.pertrans = pertrans;
+	scratch->d.agg_trans.setno = setno;
+	scratch->d.agg_trans.setoff = setoff;
+	scratch->d.agg_trans.transno = transno;
+	scratch->d.agg_trans.aggcontext = aggcontext;
+	ExprEvalPushStep(state, scratch);
+
+	/* adjust jumps so they jump till after transition invocation */
+	if (adjust_init_jumpnull != -1)
+	{
+		ExprEvalStep *as = &state->steps[adjust_init_jumpnull];
+
+		Assert(as->d.agg_init_trans.jumpnull == -1);
+		as->d.agg_init_trans.jumpnull = state->steps_len;
+	}
+	if (adjust_strict_jumpnull != -1)
+	{
+		ExprEvalStep *as = &state->steps[adjust_strict_jumpnull];
+
+		Assert(as->d.agg_strict_trans_check.jumpnull == -1);
+		as->d.agg_strict_trans_check.jumpnull = state->steps_len;
+	}
+}
+
+/*
+ * Build equality expression that can be evaluated using ExecQual(), returning
+ * true if the expression context's inner/outer tuple are NOT DISTINCT. I.e
+ * two nulls match, a null and a not-null don't match.
+ *
+ * desc: tuple descriptor of the to-be-compared tuples
+ * numCols: the number of attributes to be examined
+ * keyColIdx: array of attribute column numbers
+ * eqFunctions: array of function oids of the equality functions to use
+ * parent: parent executor node
+ */
+ExprState *
+ExecBuildGroupingEqual(TupleDesc ldesc, TupleDesc rdesc,
+					   int numCols,
+					   AttrNumber *keyColIdx,
+					   Oid *eqfunctions,
+					   PlanState *parent)
+{
+	ExprState  *state = makeNode(ExprState);
+	ExprEvalStep scratch = {0};
+	int			natt;
+	int			maxatt = -1;
+	List	   *adjust_jumps = NIL;
+	ListCell   *lc;
+
+	/*
+	 * When no columns are actually compared, the result's always true. See
+	 * special case in ExecQual().
+	 */
+	if (numCols == 0)
+		return NULL;
+
+	state->expr = NULL;
+	state->flags = EEO_FLAG_IS_QUAL;
+	state->parent = parent;
+
+	scratch.resvalue = &state->resvalue;
+	scratch.resnull = &state->resnull;
+
+	/* compute max needed attribute */
+	for (natt = 0; natt < numCols; natt++)
+	{
+		int			attno = keyColIdx[natt];
+
+		if (attno > maxatt)
+			maxatt = attno;
+	}
+	Assert(maxatt >= 0);
+
+	/* push deform steps */
+	scratch.opcode = EEOP_INNER_FETCHSOME;
+	scratch.d.fetch.last_var = maxatt;
+	ExprEvalPushStep(state, &scratch);
+
+	scratch.opcode = EEOP_OUTER_FETCHSOME;
+	scratch.d.fetch.last_var = maxatt;
+	ExprEvalPushStep(state, &scratch);
+
+	/*
+	 * Start comparing at the last field (least significant sort key). That's
+	 * the most likely to be different if we are dealing with sorted input.
+	 */
+	for (natt = numCols; --natt >= 0;)
+	{
+		int			attno = keyColIdx[natt];
+		Form_pg_attribute latt = TupleDescAttr(ldesc, attno - 1);
+		Form_pg_attribute ratt = TupleDescAttr(rdesc, attno - 1);
+		Oid			foid = eqfunctions[natt];
+		FmgrInfo   *finfo;
+		FunctionCallInfo fcinfo;
+		AclResult	aclresult;
+
+		/* Check permission to call function */
+		aclresult = pg_proc_aclcheck(foid, GetUserId(), ACL_EXECUTE);
+		if (aclresult != ACLCHECK_OK)
+			aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(foid));
+
+		InvokeFunctionExecuteHook(foid);
+
+		/* Set up the primary fmgr lookup information */
+		finfo = palloc0(sizeof(FmgrInfo));
+		fcinfo = palloc0(sizeof(FunctionCallInfoData));
+		fmgr_info(foid, finfo);
+		fmgr_info_set_expr(NULL, finfo);
+		InitFunctionCallInfoData(*fcinfo, finfo, 2,
+								 InvalidOid, NULL, NULL);
+
+		/* left arg */
+		scratch.opcode = EEOP_INNER_VAR;
+		scratch.d.var.attnum = attno - 1;
+		scratch.d.var.vartype = latt->atttypid;
+		scratch.resvalue = &fcinfo->arg[0];
+		scratch.resnull = &fcinfo->argnull[0];
+		ExprEvalPushStep(state, &scratch);
+
+		/* right arg */
+		scratch.opcode = EEOP_OUTER_VAR;
+		scratch.d.var.attnum = attno - 1;
+		scratch.d.var.vartype = ratt->atttypid;
+		scratch.resvalue = &fcinfo->arg[1];
+		scratch.resnull = &fcinfo->argnull[1];
+		ExprEvalPushStep(state, &scratch);
+
+		/* evaluate distinctness */
+		scratch.opcode = EEOP_NOT_DISTINCT;
+		scratch.d.func.finfo = finfo;
+		scratch.d.func.fcinfo_data = fcinfo;
+		scratch.d.func.fn_addr = finfo->fn_addr;
+		scratch.d.func.nargs = 2;
+		scratch.resvalue = &state->resvalue;
+		scratch.resnull = &state->resnull;
+		ExprEvalPushStep(state, &scratch);
+
+		/* then emit EEOP_QUAL to detect if result is false (or null) */
+		scratch.opcode = EEOP_QUAL;
+		scratch.d.qualexpr.jumpdone = -1;
+		scratch.resvalue = &state->resvalue;
+		scratch.resnull = &state->resnull;
+		ExprEvalPushStep(state, &scratch);
+		adjust_jumps = lappend_int(adjust_jumps,
+								   state->steps_len - 1);
+	}
+
+	/* adjust jump targets */
+	foreach(lc, adjust_jumps)
+	{
+		ExprEvalStep *as = &state->steps[lfirst_int(lc)];
+
+		Assert(as->opcode == EEOP_QUAL);
+		Assert(as->d.qualexpr.jumpdone == -1);
+		as->d.qualexpr.jumpdone = state->steps_len;
+	}
+
+	scratch.resvalue = NULL;
+	scratch.resnull = NULL;
+	scratch.opcode = EEOP_DONE;
+	ExprEvalPushStep(state, &scratch);
+
+	ExecReadyExpr(state);
+
+	return state;
+}
diff --git a/src/backend/executor/execExprInterp.c b/src/backend/executor/execExprInterp.c
index f2a52f6213..771b7e3945 100644
--- a/src/backend/executor/execExprInterp.c
+++ b/src/backend/executor/execExprInterp.c
@@ -34,10 +34,8 @@
  *
  * For very simple instructions the overhead of the full interpreter
  * "startup", as minimal as it is, is noticeable.  Therefore
- * ExecReadyInterpretedExpr will choose to implement simple scalar Var
- * and Const expressions using special fast-path routines (ExecJust*).
- * Benchmarking shows anything more complex than those may as well use the
- * "full interpreter".
+ * ExecReadyInterpretedExpr will choose to implement certain simple
+ * opcode patterns using special fast-path routines (ExecJust*).
  *
  * Complex or uncommon instructions are not implemented in-line in
  * ExecInterpExpr(), rather we call out to a helper function appearing later
@@ -48,7 +46,7 @@
  * exported rather than being "static" in this file.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -64,12 +62,15 @@
 #include "executor/execExpr.h"
 #include "executor/nodeSubplan.h"
 #include "funcapi.h"
+#include "utils/memutils.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
 #include "parser/parsetree.h"
 #include "pgstat.h"
 #include "utils/builtins.h"
 #include "utils/date.h"
+#include "utils/datum.h"
+#include "utils/expandedrecord.h"
 #include "utils/lsyscache.h"
 #include "utils/timestamp.h"
 #include "utils/typcache.h"
@@ -97,9 +98,19 @@
  */
 #if defined(EEO_USE_COMPUTED_GOTO)
 
+/* struct for jump target -> opcode lookup table */
+typedef struct ExprEvalOpLookup
+{
+	const void *opcode;
+	ExprEvalOp	op;
+} ExprEvalOpLookup;
+
 /* to make dispatch_table accessible outside ExecInterpExpr() */
 static const void **dispatch_table = NULL;
 
+/* jump target -> opcode lookup table */
+static ExprEvalOpLookup reverse_dispatch_table[EEOP_LAST];
+
 #define EEO_SWITCH()
 #define EEO_CASE(name)		CASE_##name:
 #define EEO_DISPATCH()		goto *((void *) op->opcode)
@@ -139,16 +150,14 @@ static void ExecEvalRowNullInt(ExprState *state, ExprEvalStep *op,
 				   ExprContext *econtext, bool checkisnull);
 
 /* fast-path evaluation functions */
-static Datum ExecJustInnerVarFirst(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustInnerVar(ExprState *state, ExprContext *econtext, bool *isnull);
-static Datum ExecJustOuterVarFirst(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustOuterVar(ExprState *state, ExprContext *econtext, bool *isnull);
-static Datum ExecJustScanVarFirst(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustScanVar(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustConst(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustAssignInnerVar(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustAssignOuterVar(ExprState *state, ExprContext *econtext, bool *isnull);
 static Datum ExecJustAssignScanVar(ExprState *state, ExprContext *econtext, bool *isnull);
+static Datum ExecJustApplyFuncToCase(ExprState *state, ExprContext *econtext, bool *isnull);
 
 
 /*
@@ -172,6 +181,14 @@ ExecReadyInterpretedExpr(ExprState *state)
 	if (state->flags & EEO_FLAG_INTERPRETER_INITIALIZED)
 		return;
 
+	/*
+	 * First time through, check whether attribute matches Var.  Might not be
+	 * ok anymore, due to schema changes. We do that by setting up a callback
+	 * that does checking on the first call, which then sets the evalfunc
+	 * callback to the actual method of execution.
+	 */
+	state->evalfunc = ExecInterpExprStillValid;
+
 	/* DIRECT_THREADED should not already be set */
 	Assert((state->flags & EEO_FLAG_DIRECT_THREADED) == 0);
 
@@ -184,10 +201,8 @@ ExecReadyInterpretedExpr(ExprState *state)
 
 	/*
 	 * Select fast-path evalfuncs for very simple expressions.  "Starting up"
-	 * the full interpreter is a measurable overhead for these.  Plain Vars
-	 * and Const seem to be the only ones where the intrinsic cost is small
-	 * enough that the overhead of ExecInterpExpr matters.  For more complex
-	 * expressions it's cheaper to use ExecInterpExpr always.
+	 * the full interpreter is a measurable overhead for these, and these
+	 * patterns occur often enough to be worth optimizing.
 	 */
 	if (state->steps_len == 3)
 	{
@@ -195,46 +210,53 @@ ExecReadyInterpretedExpr(ExprState *state)
 		ExprEvalOp	step1 = state->steps[1].opcode;
 
 		if (step0 == EEOP_INNER_FETCHSOME &&
-			step1 == EEOP_INNER_VAR_FIRST)
+			step1 == EEOP_INNER_VAR)
 		{
-			state->evalfunc = ExecJustInnerVarFirst;
+			state->evalfunc_private = (void *) ExecJustInnerVar;
 			return;
 		}
 		else if (step0 == EEOP_OUTER_FETCHSOME &&
-				 step1 == EEOP_OUTER_VAR_FIRST)
+				 step1 == EEOP_OUTER_VAR)
 		{
-			state->evalfunc = ExecJustOuterVarFirst;
+			state->evalfunc_private = (void *) ExecJustOuterVar;
 			return;
 		}
 		else if (step0 == EEOP_SCAN_FETCHSOME &&
-				 step1 == EEOP_SCAN_VAR_FIRST)
+				 step1 == EEOP_SCAN_VAR)
 		{
-			state->evalfunc = ExecJustScanVarFirst;
+			state->evalfunc_private = (void *) ExecJustScanVar;
 			return;
 		}
 		else if (step0 == EEOP_INNER_FETCHSOME &&
 				 step1 == EEOP_ASSIGN_INNER_VAR)
 		{
-			state->evalfunc = ExecJustAssignInnerVar;
+			state->evalfunc_private = (void *) ExecJustAssignInnerVar;
 			return;
 		}
 		else if (step0 == EEOP_OUTER_FETCHSOME &&
 				 step1 == EEOP_ASSIGN_OUTER_VAR)
 		{
-			state->evalfunc = ExecJustAssignOuterVar;
+			state->evalfunc_private = (void *) ExecJustAssignOuterVar;
 			return;
 		}
 		else if (step0 == EEOP_SCAN_FETCHSOME &&
 				 step1 == EEOP_ASSIGN_SCAN_VAR)
 		{
-			state->evalfunc = ExecJustAssignScanVar;
+			state->evalfunc_private = (void *) ExecJustAssignScanVar;
+			return;
+		}
+		else if (step0 == EEOP_CASE_TESTVAL &&
+				 step1 == EEOP_FUNCEXPR_STRICT &&
+				 state->steps[0].d.casetest.value)
+		{
+			state->evalfunc_private = (void *) ExecJustApplyFuncToCase;
 			return;
 		}
 	}
 	else if (state->steps_len == 2 &&
 			 state->steps[0].opcode == EEOP_CONST)
 	{
-		state->evalfunc = ExecJustConst;
+		state->evalfunc_private = (void *) ExecJustConst;
 		return;
 	}
 
@@ -258,7 +280,7 @@ ExecReadyInterpretedExpr(ExprState *state)
 	}
 #endif							/* EEO_USE_COMPUTED_GOTO */
 
-	state->evalfunc = ExecInterpExpr;
+	state->evalfunc_private = (void *) ExecInterpExpr;
 }
 
 
@@ -289,11 +311,8 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		&&CASE_EEOP_INNER_FETCHSOME,
 		&&CASE_EEOP_OUTER_FETCHSOME,
 		&&CASE_EEOP_SCAN_FETCHSOME,
-		&&CASE_EEOP_INNER_VAR_FIRST,
 		&&CASE_EEOP_INNER_VAR,
-		&&CASE_EEOP_OUTER_VAR_FIRST,
 		&&CASE_EEOP_OUTER_VAR,
-		&&CASE_EEOP_SCAN_VAR_FIRST,
 		&&CASE_EEOP_SCAN_VAR,
 		&&CASE_EEOP_INNER_SYSVAR,
 		&&CASE_EEOP_OUTER_SYSVAR,
@@ -331,10 +350,12 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		&&CASE_EEOP_BOOLTEST_IS_NOT_FALSE,
 		&&CASE_EEOP_PARAM_EXEC,
 		&&CASE_EEOP_PARAM_EXTERN,
+		&&CASE_EEOP_PARAM_CALLBACK,
 		&&CASE_EEOP_CASE_TESTVAL,
 		&&CASE_EEOP_MAKE_READONLY,
 		&&CASE_EEOP_IOCOERCE,
 		&&CASE_EEOP_DISTINCT,
+		&&CASE_EEOP_NOT_DISTINCT,
 		&&CASE_EEOP_NULLIF,
 		&&CASE_EEOP_SQLVALUEFUNCTION,
 		&&CASE_EEOP_CURRENTOFEXPR,
@@ -363,6 +384,15 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		&&CASE_EEOP_WINDOW_FUNC,
 		&&CASE_EEOP_SUBPLAN,
 		&&CASE_EEOP_ALTERNATIVE_SUBPLAN,
+		&&CASE_EEOP_AGG_STRICT_DESERIALIZE,
+		&&CASE_EEOP_AGG_DESERIALIZE,
+		&&CASE_EEOP_AGG_STRICT_INPUT_CHECK,
+		&&CASE_EEOP_AGG_INIT_TRANS,
+		&&CASE_EEOP_AGG_STRICT_TRANS_CHECK,
+		&&CASE_EEOP_AGG_PLAIN_TRANS_BYVAL,
+		&&CASE_EEOP_AGG_PLAIN_TRANS,
+		&&CASE_EEOP_AGG_ORDERED_TRANS_DATUM,
+		&&CASE_EEOP_AGG_ORDERED_TRANS_TUPLE,
 		&&CASE_EEOP_LAST
 	};
 
@@ -415,22 +445,6 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
-		EEO_CASE(EEOP_INNER_VAR_FIRST)
-		{
-			int			attnum = op->d.var.attnum;
-
-			/*
-			 * First time through, check whether attribute matches Var.  Might
-			 * not be ok anymore, due to schema changes.
-			 */
-			CheckVarSlotCompatibility(innerslot, attnum + 1, op->d.var.vartype);
-
-			/* Skip that check on subsequent evaluations */
-			op->opcode = EEO_OPCODE(EEOP_INNER_VAR);
-
-			/* FALL THROUGH to EEOP_INNER_VAR */
-		}
-
 		EEO_CASE(EEOP_INNER_VAR)
 		{
 			int			attnum = op->d.var.attnum;
@@ -448,18 +462,6 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
-		EEO_CASE(EEOP_OUTER_VAR_FIRST)
-		{
-			int			attnum = op->d.var.attnum;
-
-			/* See EEOP_INNER_VAR_FIRST comments */
-
-			CheckVarSlotCompatibility(outerslot, attnum + 1, op->d.var.vartype);
-			op->opcode = EEO_OPCODE(EEOP_OUTER_VAR);
-
-			/* FALL THROUGH to EEOP_OUTER_VAR */
-		}
-
 		EEO_CASE(EEOP_OUTER_VAR)
 		{
 			int			attnum = op->d.var.attnum;
@@ -473,18 +475,6 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
-		EEO_CASE(EEOP_SCAN_VAR_FIRST)
-		{
-			int			attnum = op->d.var.attnum;
-
-			/* See EEOP_INNER_VAR_FIRST comments */
-
-			CheckVarSlotCompatibility(scanslot, attnum + 1, op->d.var.vartype);
-			op->opcode = EEO_OPCODE(EEOP_SCAN_VAR);
-
-			/* FALL THROUGH to EEOP_SCAN_VAR */
-		}
-
 		EEO_CASE(EEOP_SCAN_VAR)
 		{
 			int			attnum = op->d.var.attnum;
@@ -501,15 +491,17 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_INNER_SYSVAR)
 		{
 			int			attnum = op->d.var.attnum;
+			Datum		d;
 
 			/* these asserts must match defenses in slot_getattr */
 			Assert(innerslot->tts_tuple != NULL);
 			Assert(innerslot->tts_tuple != &(innerslot->tts_minhdr));
-			/* heap_getsysattr has sufficient defenses against bad attnums */
 
-			*op->resvalue = heap_getsysattr(innerslot->tts_tuple, attnum,
-											innerslot->tts_tupleDescriptor,
-											op->resnull);
+			/* heap_getsysattr has sufficient defenses against bad attnums */
+			d = heap_getsysattr(innerslot->tts_tuple, attnum,
+								innerslot->tts_tupleDescriptor,
+								op->resnull);
+			*op->resvalue = d;
 
 			EEO_NEXT();
 		}
@@ -517,15 +509,17 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_OUTER_SYSVAR)
 		{
 			int			attnum = op->d.var.attnum;
+			Datum		d;
 
 			/* these asserts must match defenses in slot_getattr */
 			Assert(outerslot->tts_tuple != NULL);
 			Assert(outerslot->tts_tuple != &(outerslot->tts_minhdr));
 
 			/* heap_getsysattr has sufficient defenses against bad attnums */
-			*op->resvalue = heap_getsysattr(outerslot->tts_tuple, attnum,
-											outerslot->tts_tupleDescriptor,
-											op->resnull);
+			d = heap_getsysattr(outerslot->tts_tuple, attnum,
+								outerslot->tts_tupleDescriptor,
+								op->resnull);
+			*op->resvalue = d;
 
 			EEO_NEXT();
 		}
@@ -533,15 +527,17 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_SCAN_SYSVAR)
 		{
 			int			attnum = op->d.var.attnum;
+			Datum		d;
 
 			/* these asserts must match defenses in slot_getattr */
 			Assert(scanslot->tts_tuple != NULL);
 			Assert(scanslot->tts_tuple != &(scanslot->tts_minhdr));
-			/* heap_getsysattr has sufficient defenses against bad attnums */
 
-			*op->resvalue = heap_getsysattr(scanslot->tts_tuple, attnum,
-											scanslot->tts_tupleDescriptor,
-											op->resnull);
+			/* heap_getsysattr has sufficient defenses against bad attnums */
+			d = heap_getsysattr(scanslot->tts_tuple, attnum,
+								scanslot->tts_tupleDescriptor,
+								op->resnull);
+			*op->resvalue = d;
 
 			EEO_NEXT();
 		}
@@ -641,13 +637,22 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		 * As both STRICT checks and function-usage are noticeable performance
 		 * wise, and function calls are a very hot-path (they also back
 		 * operators!), it's worth having so many separate opcodes.
+		 *
+		 * Note: the reason for using a temporary variable "d", here and in
+		 * other places, is that some compilers think "*op->resvalue = f();"
+		 * requires them to evaluate op->resvalue into a register before
+		 * calling f(), just in case f() is able to modify op->resvalue
+		 * somehow.  The extra line of code can save a useless register spill
+		 * and reload across the function call.
 		 */
 		EEO_CASE(EEOP_FUNCEXPR)
 		{
 			FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
+			Datum		d;
 
 			fcinfo->isnull = false;
-			*op->resvalue = (op->d.func.fn_addr) (fcinfo);
+			d = op->d.func.fn_addr(fcinfo);
+			*op->resvalue = d;
 			*op->resnull = fcinfo->isnull;
 
 			EEO_NEXT();
@@ -658,6 +663,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
 			bool	   *argnull = fcinfo->argnull;
 			int			argno;
+			Datum		d;
 
 			/* strict function, so check for NULL args */
 			for (argno = 0; argno < op->d.func.nargs; argno++)
@@ -669,7 +675,8 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 				}
 			}
 			fcinfo->isnull = false;
-			*op->resvalue = (op->d.func.fn_addr) (fcinfo);
+			d = op->d.func.fn_addr(fcinfo);
+			*op->resvalue = d;
 			*op->resnull = fcinfo->isnull;
 
 	strictfail:
@@ -680,11 +687,13 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		{
 			FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
 			PgStat_FunctionCallUsage fcusage;
+			Datum		d;
 
 			pgstat_init_function_usage(fcinfo, &fcusage);
 
 			fcinfo->isnull = false;
-			*op->resvalue = (op->d.func.fn_addr) (fcinfo);
+			d = op->d.func.fn_addr(fcinfo);
+			*op->resvalue = d;
 			*op->resnull = fcinfo->isnull;
 
 			pgstat_end_function_usage(&fcusage, true);
@@ -698,6 +707,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			PgStat_FunctionCallUsage fcusage;
 			bool	   *argnull = fcinfo->argnull;
 			int			argno;
+			Datum		d;
 
 			/* strict function, so check for NULL args */
 			for (argno = 0; argno < op->d.func.nargs; argno++)
@@ -712,7 +722,8 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			pgstat_init_function_usage(fcinfo, &fcusage);
 
 			fcinfo->isnull = false;
-			*op->resvalue = (op->d.func.fn_addr) (fcinfo);
+			d = op->d.func.fn_addr(fcinfo);
+			*op->resvalue = d;
 			*op->resnull = fcinfo->isnull;
 
 			pgstat_end_function_usage(&fcusage, true);
@@ -1022,6 +1033,13 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
+		EEO_CASE(EEOP_PARAM_CALLBACK)
+		{
+			/* allow an extension module to supply a PARAM_EXTERN value */
+			op->d.cparam.paramfunc(state, op, econtext);
+			EEO_NEXT();
+		}
+
 		EEO_CASE(EEOP_CASE_TESTVAL)
 		{
 			/*
@@ -1113,6 +1131,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			if (!op->d.iocoerce.finfo_in->fn_strict || str != NULL)
 			{
 				FunctionCallInfo fcinfo_in;
+				Datum		d;
 
 				fcinfo_in = op->d.iocoerce.fcinfo_data_in;
 				fcinfo_in->arg[0] = PointerGetDatum(str);
@@ -1120,7 +1139,8 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 				/* second and third arguments are already set up */
 
 				fcinfo_in->isnull = false;
-				*op->resvalue = FunctionCallInvoke(fcinfo_in);
+				d = FunctionCallInvoke(fcinfo_in);
+				*op->resvalue = d;
 
 				/* Should get null result if and only if str is NULL */
 				if (str == NULL)
@@ -1170,7 +1190,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 				Datum		eqresult;
 
 				fcinfo->isnull = false;
-				eqresult = (op->d.func.fn_addr) (fcinfo);
+				eqresult = op->d.func.fn_addr(fcinfo);
 				/* Must invert result of "="; safe to do even if null */
 				*op->resvalue = BoolGetDatum(!DatumGetBool(eqresult));
 				*op->resnull = fcinfo->isnull;
@@ -1179,6 +1199,34 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
+		/* see EEOP_DISTINCT for comments, this is just inverted */
+		EEO_CASE(EEOP_NOT_DISTINCT)
+		{
+			FunctionCallInfo fcinfo = op->d.func.fcinfo_data;
+
+			if (fcinfo->argnull[0] && fcinfo->argnull[1])
+			{
+				*op->resvalue = BoolGetDatum(true);
+				*op->resnull = false;
+			}
+			else if (fcinfo->argnull[0] || fcinfo->argnull[1])
+			{
+				*op->resvalue = BoolGetDatum(false);
+				*op->resnull = false;
+			}
+			else
+			{
+				Datum		eqresult;
+
+				fcinfo->isnull = false;
+				eqresult = op->d.func.fn_addr(fcinfo);
+				*op->resvalue = eqresult;
+				*op->resnull = fcinfo->isnull;
+			}
+
+			EEO_NEXT();
+		}
+
 		EEO_CASE(EEOP_NULLIF)
 		{
 			/*
@@ -1192,7 +1240,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 				Datum		result;
 
 				fcinfo->isnull = false;
-				result = (op->d.func.fn_addr) (fcinfo);
+				result = op->d.func.fn_addr(fcinfo);
 
 				/* if the arguments are equal return null */
 				if (!fcinfo->isnull && DatumGetBool(result))
@@ -1252,7 +1300,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_ARRAYCOERCE)
 		{
 			/* too complex for an inline implementation */
-			ExecEvalArrayCoerce(state, op);
+			ExecEvalArrayCoerce(state, op, econtext);
 
 			EEO_NEXT();
 		}
@@ -1268,6 +1316,7 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 		EEO_CASE(EEOP_ROWCOMPARE_STEP)
 		{
 			FunctionCallInfo fcinfo = op->d.rowcompare_step.fcinfo_data;
+			Datum		d;
 
 			/* force NULL result if strict fn and NULL input */
 			if (op->d.rowcompare_step.finfo->fn_strict &&
@@ -1279,7 +1328,8 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 
 			/* Apply comparison function */
 			fcinfo->isnull = false;
-			*op->resvalue = (op->d.rowcompare_step.fn_addr) (fcinfo);
+			d = op->d.rowcompare_step.fn_addr(fcinfo);
+			*op->resvalue = d;
 
 			/* force NULL result if NULL function result */
 			if (fcinfo->isnull)
@@ -1506,6 +1556,235 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 			EEO_NEXT();
 		}
 
+		/* evaluate a strict aggregate deserialization function */
+		EEO_CASE(EEOP_AGG_STRICT_DESERIALIZE)
+		{
+			bool	   *argnull = op->d.agg_deserialize.fcinfo_data->argnull;
+
+			/* Don't call a strict deserialization function with NULL input */
+			if (argnull[0])
+				EEO_JUMP(op->d.agg_deserialize.jumpnull);
+
+			/* fallthrough */
+		}
+
+		/* evaluate aggregate deserialization function (non-strict portion) */
+		EEO_CASE(EEOP_AGG_DESERIALIZE)
+		{
+			FunctionCallInfo fcinfo = op->d.agg_deserialize.fcinfo_data;
+			AggState   *aggstate = op->d.agg_deserialize.aggstate;
+			MemoryContext oldContext;
+
+			/*
+			 * We run the deserialization functions in per-input-tuple memory
+			 * context.
+			 */
+			oldContext = MemoryContextSwitchTo(aggstate->tmpcontext->ecxt_per_tuple_memory);
+			fcinfo->isnull = false;
+			*op->resvalue = FunctionCallInvoke(fcinfo);
+			*op->resnull = fcinfo->isnull;
+			MemoryContextSwitchTo(oldContext);
+
+			EEO_NEXT();
+		}
+
+		/*
+		 * Check that a strict aggregate transition / combination function's
+		 * input is not NULL.
+		 */
+		EEO_CASE(EEOP_AGG_STRICT_INPUT_CHECK)
+		{
+			int			argno;
+			bool	   *nulls = op->d.agg_strict_input_check.nulls;
+			int			nargs = op->d.agg_strict_input_check.nargs;
+
+			for (argno = 0; argno < nargs; argno++)
+			{
+				if (nulls[argno])
+					EEO_JUMP(op->d.agg_strict_input_check.jumpnull);
+			}
+			EEO_NEXT();
+		}
+
+		/*
+		 * Initialize an aggregate's first value if necessary.
+		 */
+		EEO_CASE(EEOP_AGG_INIT_TRANS)
+		{
+			AggState   *aggstate;
+			AggStatePerGroup pergroup;
+
+			aggstate = op->d.agg_init_trans.aggstate;
+			pergroup = &aggstate->all_pergroups
+				[op->d.agg_init_trans.setoff]
+				[op->d.agg_init_trans.transno];
+
+			/* If transValue has not yet been initialized, do so now. */
+			if (pergroup->noTransValue)
+			{
+				AggStatePerTrans pertrans = op->d.agg_init_trans.pertrans;
+
+				aggstate->curaggcontext = op->d.agg_init_trans.aggcontext;
+				aggstate->current_set = op->d.agg_init_trans.setno;
+
+				ExecAggInitGroup(aggstate, pertrans, pergroup);
+
+				/* copied trans value from input, done this round */
+				EEO_JUMP(op->d.agg_init_trans.jumpnull);
+			}
+
+			EEO_NEXT();
+		}
+
+		/* check that a strict aggregate's input isn't NULL */
+		EEO_CASE(EEOP_AGG_STRICT_TRANS_CHECK)
+		{
+			AggState   *aggstate;
+			AggStatePerGroup pergroup;
+
+			aggstate = op->d.agg_strict_trans_check.aggstate;
+			pergroup = &aggstate->all_pergroups
+				[op->d.agg_strict_trans_check.setoff]
+				[op->d.agg_strict_trans_check.transno];
+
+			if (unlikely(pergroup->transValueIsNull))
+				EEO_JUMP(op->d.agg_strict_trans_check.jumpnull);
+
+			EEO_NEXT();
+		}
+
+		/*
+		 * Evaluate aggregate transition / combine function that has a
+		 * by-value transition type. That's a seperate case from the
+		 * by-reference implementation because it's a bit simpler.
+		 */
+		EEO_CASE(EEOP_AGG_PLAIN_TRANS_BYVAL)
+		{
+			AggState   *aggstate;
+			AggStatePerTrans pertrans;
+			AggStatePerGroup pergroup;
+			FunctionCallInfo fcinfo;
+			MemoryContext oldContext;
+			Datum		newVal;
+
+			aggstate = op->d.agg_trans.aggstate;
+			pertrans = op->d.agg_trans.pertrans;
+
+			pergroup = &aggstate->all_pergroups
+				[op->d.agg_trans.setoff]
+				[op->d.agg_trans.transno];
+
+			Assert(pertrans->transtypeByVal);
+
+			fcinfo = &pertrans->transfn_fcinfo;
+
+			/* cf. select_current_set() */
+			aggstate->curaggcontext = op->d.agg_trans.aggcontext;
+			aggstate->current_set = op->d.agg_trans.setno;
+
+			/* set up aggstate->curpertrans for AggGetAggref() */
+			aggstate->curpertrans = pertrans;
+
+			/* invoke transition function in per-tuple context */
+			oldContext = MemoryContextSwitchTo(aggstate->tmpcontext->ecxt_per_tuple_memory);
+
+			fcinfo->arg[0] = pergroup->transValue;
+			fcinfo->argnull[0] = pergroup->transValueIsNull;
+			fcinfo->isnull = false; /* just in case transfn doesn't set it */
+
+			newVal = FunctionCallInvoke(fcinfo);
+
+			pergroup->transValue = newVal;
+			pergroup->transValueIsNull = fcinfo->isnull;
+
+			MemoryContextSwitchTo(oldContext);
+
+			EEO_NEXT();
+		}
+
+		/*
+		 * Evaluate aggregate transition / combine function that has a
+		 * by-reference transition type.
+		 *
+		 * Could optimize a bit further by splitting off by-reference
+		 * fixed-length types, but currently that doesn't seem worth it.
+		 */
+		EEO_CASE(EEOP_AGG_PLAIN_TRANS)
+		{
+			AggState   *aggstate;
+			AggStatePerTrans pertrans;
+			AggStatePerGroup pergroup;
+			FunctionCallInfo fcinfo;
+			MemoryContext oldContext;
+			Datum		newVal;
+
+			aggstate = op->d.agg_trans.aggstate;
+			pertrans = op->d.agg_trans.pertrans;
+
+			pergroup = &aggstate->all_pergroups
+				[op->d.agg_trans.setoff]
+				[op->d.agg_trans.transno];
+
+			Assert(!pertrans->transtypeByVal);
+
+			fcinfo = &pertrans->transfn_fcinfo;
+
+			/* cf. select_current_set() */
+			aggstate->curaggcontext = op->d.agg_trans.aggcontext;
+			aggstate->current_set = op->d.agg_trans.setno;
+
+			/* set up aggstate->curpertrans for AggGetAggref() */
+			aggstate->curpertrans = pertrans;
+
+			/* invoke transition function in per-tuple context */
+			oldContext = MemoryContextSwitchTo(aggstate->tmpcontext->ecxt_per_tuple_memory);
+
+			fcinfo->arg[0] = pergroup->transValue;
+			fcinfo->argnull[0] = pergroup->transValueIsNull;
+			fcinfo->isnull = false; /* just in case transfn doesn't set it */
+
+			newVal = FunctionCallInvoke(fcinfo);
+
+			/*
+			 * For pass-by-ref datatype, must copy the new value into
+			 * aggcontext and free the prior transValue.  But if transfn
+			 * returned a pointer to its first input, we don't need to do
+			 * anything.  Also, if transfn returned a pointer to a R/W
+			 * expanded object that is already a child of the aggcontext,
+			 * assume we can adopt that value without copying it.
+			 */
+			if (DatumGetPointer(newVal) != DatumGetPointer(pergroup->transValue))
+				newVal = ExecAggTransReparent(aggstate, pertrans,
+											  newVal, fcinfo->isnull,
+											  pergroup->transValue,
+											  pergroup->transValueIsNull);
+
+			pergroup->transValue = newVal;
+			pergroup->transValueIsNull = fcinfo->isnull;
+
+			MemoryContextSwitchTo(oldContext);
+
+			EEO_NEXT();
+		}
+
+		/* process single-column ordered aggregate datum */
+		EEO_CASE(EEOP_AGG_ORDERED_TRANS_DATUM)
+		{
+			/* too complex for an inline implementation */
+			ExecEvalAggOrderedTransDatum(state, op, econtext);
+
+			EEO_NEXT();
+		}
+
+		/* process multi-column ordered aggregate tuple */
+		EEO_CASE(EEOP_AGG_ORDERED_TRANS_TUPLE)
+		{
+			/* too complex for an inline implementation */
+			ExecEvalAggOrderedTransTuple(state, op, econtext);
+
+			EEO_NEXT();
+		}
+
 		EEO_CASE(EEOP_LAST)
 		{
 			/* unreachable */
@@ -1519,6 +1798,78 @@ ExecInterpExpr(ExprState *state, ExprContext *econtext, bool *isnull)
 	return state->resvalue;
 }
 
+/*
+ * Expression evaluation callback that performs extra checks before executing
+ * the expression. Declared extern so other methods of execution can use it
+ * too.
+ */
+Datum
+ExecInterpExprStillValid(ExprState *state, ExprContext *econtext, bool *isNull)
+{
+	/*
+	 * First time through, check whether attribute matches Var.  Might not be
+	 * ok anymore, due to schema changes.
+	 */
+	CheckExprStillValid(state, econtext);
+
+	/* skip the check during further executions */
+	state->evalfunc = (ExprStateEvalFunc) state->evalfunc_private;
+
+	/* and actually execute */
+	return state->evalfunc(state, econtext, isNull);
+}
+
+/*
+ * Check that an expression is still valid in the face of potential schema
+ * changes since the plan has been created.
+ */
+void
+CheckExprStillValid(ExprState *state, ExprContext *econtext)
+{
+	int			i = 0;
+	TupleTableSlot *innerslot;
+	TupleTableSlot *outerslot;
+	TupleTableSlot *scanslot;
+
+	innerslot = econtext->ecxt_innertuple;
+	outerslot = econtext->ecxt_outertuple;
+	scanslot = econtext->ecxt_scantuple;
+
+	for (i = 0; i < state->steps_len; i++)
+	{
+		ExprEvalStep *op = &state->steps[i];
+
+		switch (ExecEvalStepOp(state, op))
+		{
+			case EEOP_INNER_VAR:
+				{
+					int			attnum = op->d.var.attnum;
+
+					CheckVarSlotCompatibility(innerslot, attnum + 1, op->d.var.vartype);
+					break;
+				}
+
+			case EEOP_OUTER_VAR:
+				{
+					int			attnum = op->d.var.attnum;
+
+					CheckVarSlotCompatibility(outerslot, attnum + 1, op->d.var.vartype);
+					break;
+				}
+
+			case EEOP_SCAN_VAR:
+				{
+					int			attnum = op->d.var.attnum;
+
+					CheckVarSlotCompatibility(scanslot, attnum + 1, op->d.var.vartype);
+					break;
+				}
+			default:
+				break;
+		}
+	}
+}
+
 /*
  * Check whether a user attribute in a slot can be referenced by a Var
  * expression.  This should succeed unless there have been schema changes
@@ -1553,7 +1904,7 @@ CheckVarSlotCompatibility(TupleTableSlot *slot, int attnum, Oid vartype)
 			elog(ERROR, "attribute number %d exceeds number of columns %d",
 				 attnum, slot_tupdesc->natts);
 
-		attr = slot_tupdesc->attrs[attnum - 1];
+		attr = TupleDescAttr(slot_tupdesc, attnum - 1);
 
 		if (attr->attisdropped)
 			ereport(ERROR,
@@ -1631,20 +1982,14 @@ ShutdownTupleDescRef(Datum arg)
  * Fast-path functions, for very simple expressions
  */
 
-/* Simple reference to inner Var, first time through */
+/* Simple reference to inner Var */
 static Datum
-ExecJustInnerVarFirst(ExprState *state, ExprContext *econtext, bool *isnull)
+ExecJustInnerVar(ExprState *state, ExprContext *econtext, bool *isnull)
 {
 	ExprEvalStep *op = &state->steps[1];
 	int			attnum = op->d.var.attnum + 1;
 	TupleTableSlot *slot = econtext->ecxt_innertuple;
 
-	/* See ExecInterpExpr()'s comments for EEOP_INNER_VAR_FIRST */
-
-	CheckVarSlotCompatibility(slot, attnum, op->d.var.vartype);
-	op->opcode = EEOP_INNER_VAR;	/* just for cleanliness */
-	state->evalfunc = ExecJustInnerVar;
-
 	/*
 	 * Since we use slot_getattr(), we don't need to implement the FETCHSOME
 	 * step explicitly, and we also needn't Assert that the attnum is in range
@@ -1653,34 +1998,6 @@ ExecJustInnerVarFirst(ExprState *state, ExprContext *econtext, bool *isnull)
 	return slot_getattr(slot, attnum, isnull);
 }
 
-/* Simple reference to inner Var */
-static Datum
-ExecJustInnerVar(ExprState *state, ExprContext *econtext, bool *isnull)
-{
-	ExprEvalStep *op = &state->steps[1];
-	int			attnum = op->d.var.attnum + 1;
-	TupleTableSlot *slot = econtext->ecxt_innertuple;
-
-	/* See comments in ExecJustInnerVarFirst */
-	return slot_getattr(slot, attnum, isnull);
-}
-
-/* Simple reference to outer Var, first time through */
-static Datum
-ExecJustOuterVarFirst(ExprState *state, ExprContext *econtext, bool *isnull)
-{
-	ExprEvalStep *op = &state->steps[1];
-	int			attnum = op->d.var.attnum + 1;
-	TupleTableSlot *slot = econtext->ecxt_outertuple;
-
-	CheckVarSlotCompatibility(slot, attnum, op->d.var.vartype);
-	op->opcode = EEOP_OUTER_VAR;	/* just for cleanliness */
-	state->evalfunc = ExecJustOuterVar;
-
-	/* See comments in ExecJustInnerVarFirst */
-	return slot_getattr(slot, attnum, isnull);
-}
-
 /* Simple reference to outer Var */
 static Datum
 ExecJustOuterVar(ExprState *state, ExprContext *econtext, bool *isnull)
@@ -1689,23 +2006,7 @@ ExecJustOuterVar(ExprState *state, ExprContext *econtext, bool *isnull)
 	int			attnum = op->d.var.attnum + 1;
 	TupleTableSlot *slot = econtext->ecxt_outertuple;
 
-	/* See comments in ExecJustInnerVarFirst */
-	return slot_getattr(slot, attnum, isnull);
-}
-
-/* Simple reference to scan Var, first time through */
-static Datum
-ExecJustScanVarFirst(ExprState *state, ExprContext *econtext, bool *isnull)
-{
-	ExprEvalStep *op = &state->steps[1];
-	int			attnum = op->d.var.attnum + 1;
-	TupleTableSlot *slot = econtext->ecxt_scantuple;
-
-	CheckVarSlotCompatibility(slot, attnum, op->d.var.vartype);
-	op->opcode = EEOP_SCAN_VAR; /* just for cleanliness */
-	state->evalfunc = ExecJustScanVar;
-
-	/* See comments in ExecJustInnerVarFirst */
+	/* See comments in ExecJustInnerVar */
 	return slot_getattr(slot, attnum, isnull);
 }
 
@@ -1717,7 +2018,7 @@ ExecJustScanVar(ExprState *state, ExprContext *econtext, bool *isnull)
 	int			attnum = op->d.var.attnum + 1;
 	TupleTableSlot *slot = econtext->ecxt_scantuple;
 
-	/* See comments in ExecJustInnerVarFirst */
+	/* See comments in ExecJustInnerVar */
 	return slot_getattr(slot, attnum, isnull);
 }
 
@@ -1786,6 +2087,61 @@ ExecJustAssignScanVar(ExprState *state, ExprContext *econtext, bool *isnull)
 	return 0;
 }
 
+/* Evaluate CASE_TESTVAL and apply a strict function to it */
+static Datum
+ExecJustApplyFuncToCase(ExprState *state, ExprContext *econtext, bool *isnull)
+{
+	ExprEvalStep *op = &state->steps[0];
+	FunctionCallInfo fcinfo;
+	bool	   *argnull;
+	int			argno;
+	Datum		d;
+
+	/*
+	 * XXX with some redesign of the CaseTestExpr mechanism, maybe we could
+	 * get rid of this data shuffling?
+	 */
+	*op->resvalue = *op->d.casetest.value;
+	*op->resnull = *op->d.casetest.isnull;
+
+	op++;
+
+	fcinfo = op->d.func.fcinfo_data;
+	argnull = fcinfo->argnull;
+
+	/* strict function, so check for NULL args */
+	for (argno = 0; argno < op->d.func.nargs; argno++)
+	{
+		if (argnull[argno])
+		{
+			*isnull = true;
+			return (Datum) 0;
+		}
+	}
+	fcinfo->isnull = false;
+	d = op->d.func.fn_addr(fcinfo);
+	*isnull = fcinfo->isnull;
+	return d;
+}
+
+#if defined(EEO_USE_COMPUTED_GOTO)
+/*
+ * Comparator used when building address->opcode lookup table for
+ * ExecEvalStepOp() in the threaded dispatch case.
+ */
+static int
+dispatch_compare_ptr(const void *a, const void *b)
+{
+	const ExprEvalOpLookup *la = (const ExprEvalOpLookup *) a;
+	const ExprEvalOpLookup *lb = (const ExprEvalOpLookup *) b;
+
+	if (la->opcode < lb->opcode)
+		return -1;
+	else if (la->opcode > lb->opcode)
+		return 1;
+	return 0;
+}
+#endif
 
 /*
  * Do one-time initialization of interpretation machinery.
@@ -1796,8 +2152,25 @@ ExecInitInterpreter(void)
 #if defined(EEO_USE_COMPUTED_GOTO)
 	/* Set up externally-visible pointer to dispatch table */
 	if (dispatch_table == NULL)
+	{
+		int			i;
+
 		dispatch_table = (const void **)
 			DatumGetPointer(ExecInterpExpr(NULL, NULL, NULL));
+
+		/* build reverse lookup table */
+		for (i = 0; i < EEOP_LAST; i++)
+		{
+			reverse_dispatch_table[i].opcode = dispatch_table[i];
+			reverse_dispatch_table[i].op = (ExprEvalOp) i;
+		}
+
+		/* make it bsearch()able */
+		qsort(reverse_dispatch_table,
+			  EEOP_LAST /* nmembers */ ,
+			  sizeof(ExprEvalOpLookup),
+			  dispatch_compare_ptr);
+	}
 #endif
 }
 
@@ -1806,10 +2179,6 @@ ExecInitInterpreter(void)
  *
  * When direct-threading is in use, ExprState->opcode isn't easily
  * decipherable. This function returns the appropriate enum member.
- *
- * This currently is only supposed to be used in paths that aren't critical
- * performance-wise.  If that changes, we could add an inverse dispatch_table
- * that's sorted on the address, so a binary search can be performed.
  */
 ExprEvalOp
 ExecEvalStepOp(ExprState *state, ExprEvalStep *op)
@@ -1817,16 +2186,17 @@ ExecEvalStepOp(ExprState *state, ExprEvalStep *op)
 #if defined(EEO_USE_COMPUTED_GOTO)
 	if (state->flags & EEO_FLAG_DIRECT_THREADED)
 	{
-		int			i;
-
-		for (i = 0; i < EEOP_LAST; i++)
-		{
-			if ((void *) op->opcode == dispatch_table[i])
-			{
-				return (ExprEvalOp) i;
-			}
-		}
-		elog(ERROR, "unknown opcode");
+		ExprEvalOpLookup key;
+		ExprEvalOpLookup *res;
+
+		key.opcode = (void *) op->opcode;
+		res = bsearch(&key,
+					  reverse_dispatch_table,
+					  EEOP_LAST /* nmembers */ ,
+					  sizeof(ExprEvalOpLookup),
+					  dispatch_compare_ptr);
+		Assert(res);			/* unknown ops shouldn't get looked up */
+		return res->op;
 	}
 #endif
 	return (ExprEvalOp) op->opcode;
@@ -1860,6 +2230,33 @@ ExecEvalParamExec(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 	*op->resnull = prm->isnull;
 }
 
+/*
+ * ExecEvalParamExecParams
+ *
+ * Execute the subplan stored in PARAM_EXEC initplans params, if not executed
+ * till now.
+ */
+void
+ExecEvalParamExecParams(Bitmapset *params, EState *estate)
+{
+	ParamExecData *prm;
+	int			paramid;
+
+	paramid = -1;
+	while ((paramid = bms_next_member(params, paramid)) >= 0)
+	{
+		prm = &(estate->es_param_exec_vals[paramid]);
+
+		if (prm->execPlan != NULL)
+		{
+			/* Parameter not evaluated yet, so go do it */
+			ExecSetParamPlan(prm->execPlan, GetPerTupleExprContext(estate));
+			/* ExecSetParamPlan should have processed this param... */
+			Assert(prm->execPlan == NULL);
+		}
+	}
+}
+
 /*
  * Evaluate a PARAM_EXTERN parameter.
  *
@@ -1874,11 +2271,14 @@ ExecEvalParamExtern(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 	if (likely(paramInfo &&
 			   paramId > 0 && paramId <= paramInfo->numParams))
 	{
-		ParamExternData *prm = &paramInfo->params[paramId - 1];
+		ParamExternData *prm;
+		ParamExternData prmdata;
 
 		/* give hook a chance in case parameter is dynamic */
-		if (!OidIsValid(prm->ptype) && paramInfo->paramFetch != NULL)
-			(*paramInfo->paramFetch) (paramInfo, paramId);
+		if (paramInfo->paramFetch != NULL)
+			prm = paramInfo->paramFetch(paramInfo, paramId, false, &prmdata);
+		else
+			prm = &paramInfo->params[paramId - 1];
 
 		if (likely(OidIsValid(prm->ptype)))
 		{
@@ -2081,7 +2481,7 @@ ExecEvalRowNullInt(ExprState *state, ExprEvalStep *op,
 	for (att = 1; att <= tupDesc->natts; att++)
 	{
 		/* ignore dropped columns */
-		if (tupDesc->attrs[att - 1]->attisdropped)
+		if (TupleDescAttr(tupDesc, att - 1)->attisdropped)
 			continue;
 		if (heap_attisnull(&tmptup, att))
 		{
@@ -2131,14 +2531,6 @@ ExecEvalArrayExpr(ExprState *state, ExprEvalStep *op)
 		Datum	   *dvalues = op->d.arrayexpr.elemvalues;
 		bool	   *dnulls = op->d.arrayexpr.elemnulls;
 
-		/* Shouldn't happen here, but if length is 0, return empty array */
-		if (nelems == 0)
-		{
-			*op->resvalue =
-				PointerGetDatum(construct_empty_array(element_type));
-			return;
-		}
-
 		/* setup for 1-D array of the given length */
 		ndims = 1;
 		dims[0] = nelems;
@@ -2328,11 +2720,9 @@ ExecEvalArrayExpr(ExprState *state, ExprEvalStep *op)
  * Source array is in step's result variable.
  */
 void
-ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op)
+ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 {
-	ArrayCoerceExpr *acoerce = op->d.arraycoerce.coerceexpr;
 	Datum		arraydatum;
-	FunctionCallInfoData locfcinfo;
 
 	/* NULL array -> NULL result */
 	if (*op->resnull)
@@ -2344,7 +2734,7 @@ ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op)
 	 * If it's binary-compatible, modify the element type in the array header,
 	 * but otherwise leave the array as we received it.
 	 */
-	if (!OidIsValid(acoerce->elemfuncid))
+	if (op->d.arraycoerce.elemexprstate == NULL)
 	{
 		/* Detoast input array if necessary, and copy in any case */
 		ArrayType  *array = DatumGetArrayTypePCopy(arraydatum);
@@ -2355,23 +2745,12 @@ ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op)
 	}
 
 	/*
-	 * Use array_map to apply the function to each array element.
-	 *
-	 * We pass on the desttypmod and isExplicit flags whether or not the
-	 * function wants them.
-	 *
-	 * Note: coercion functions are assumed to not use collation.
+	 * Use array_map to apply the sub-expression to each array element.
 	 */
-	InitFunctionCallInfoData(locfcinfo, op->d.arraycoerce.elemfunc, 3,
-							 InvalidOid, NULL, NULL);
-	locfcinfo.arg[0] = arraydatum;
-	locfcinfo.arg[1] = Int32GetDatum(acoerce->resulttypmod);
-	locfcinfo.arg[2] = BoolGetDatum(acoerce->isExplicit);
-	locfcinfo.argnull[0] = false;
-	locfcinfo.argnull[1] = false;
-	locfcinfo.argnull[2] = false;
-
-	*op->resvalue = array_map(&locfcinfo, op->d.arraycoerce.resultelemtype,
+	*op->resvalue = array_map(arraydatum,
+							  op->d.arraycoerce.elemexprstate,
+							  econtext,
+							  op->d.arraycoerce.resultelemtype,
 							  op->d.arraycoerce.amstate);
 }
 
@@ -2471,57 +2850,105 @@ ExecEvalFieldSelect(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 	if (*op->resnull)
 		return;
 
-	/* Get the composite datum and extract its type fields */
 	tupDatum = *op->resvalue;
-	tuple = DatumGetHeapTupleHeader(tupDatum);
 
-	tupType = HeapTupleHeaderGetTypeId(tuple);
-	tupTypmod = HeapTupleHeaderGetTypMod(tuple);
+	/* We can special-case expanded records for speed */
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(tupDatum)))
+	{
+		ExpandedRecordHeader *erh = (ExpandedRecordHeader *) DatumGetEOHP(tupDatum);
 
-	/* Lookup tupdesc if first time through or if type changes */
-	tupDesc = get_cached_rowtype(tupType, tupTypmod,
-								 &op->d.fieldselect.argdesc,
-								 econtext);
+		Assert(erh->er_magic == ER_MAGIC);
 
-	/*
-	 * Find field's attr record.  Note we don't support system columns here: a
-	 * datum tuple doesn't have valid values for most of the interesting
-	 * system columns anyway.
-	 */
-	if (fieldnum <= 0)			/* should never happen */
-		elog(ERROR, "unsupported reference to system column %d in FieldSelect",
-			 fieldnum);
-	if (fieldnum > tupDesc->natts)	/* should never happen */
-		elog(ERROR, "attribute number %d exceeds number of columns %d",
-			 fieldnum, tupDesc->natts);
-	attr = tupDesc->attrs[fieldnum - 1];
-
-	/* Check for dropped column, and force a NULL result if so */
-	if (attr->attisdropped)
-	{
-		*op->resnull = true;
-		return;
+		/* Extract record's TupleDesc */
+		tupDesc = expanded_record_get_tupdesc(erh);
+
+		/*
+		 * Find field's attr record.  Note we don't support system columns
+		 * here: a datum tuple doesn't have valid values for most of the
+		 * interesting system columns anyway.
+		 */
+		if (fieldnum <= 0)		/* should never happen */
+			elog(ERROR, "unsupported reference to system column %d in FieldSelect",
+				 fieldnum);
+		if (fieldnum > tupDesc->natts)	/* should never happen */
+			elog(ERROR, "attribute number %d exceeds number of columns %d",
+				 fieldnum, tupDesc->natts);
+		attr = TupleDescAttr(tupDesc, fieldnum - 1);
+
+		/* Check for dropped column, and force a NULL result if so */
+		if (attr->attisdropped)
+		{
+			*op->resnull = true;
+			return;
+		}
+
+		/* Check for type mismatch --- possible after ALTER COLUMN TYPE? */
+		/* As in CheckVarSlotCompatibility, we should but can't check typmod */
+		if (op->d.fieldselect.resulttype != attr->atttypid)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("attribute %d has wrong type", fieldnum),
+					 errdetail("Table has type %s, but query expects %s.",
+							   format_type_be(attr->atttypid),
+							   format_type_be(op->d.fieldselect.resulttype))));
+
+		/* extract the field */
+		*op->resvalue = expanded_record_get_field(erh, fieldnum,
+												  op->resnull);
 	}
+	else
+	{
+		/* Get the composite datum and extract its type fields */
+		tuple = DatumGetHeapTupleHeader(tupDatum);
 
-	/* Check for type mismatch --- possible after ALTER COLUMN TYPE? */
-	/* As in CheckVarSlotCompatibility, we should but can't check typmod */
-	if (op->d.fieldselect.resulttype != attr->atttypid)
-		ereport(ERROR,
-				(errcode(ERRCODE_DATATYPE_MISMATCH),
-				 errmsg("attribute %d has wrong type", fieldnum),
-				 errdetail("Table has type %s, but query expects %s.",
-						   format_type_be(attr->atttypid),
-						   format_type_be(op->d.fieldselect.resulttype))));
+		tupType = HeapTupleHeaderGetTypeId(tuple);
+		tupTypmod = HeapTupleHeaderGetTypMod(tuple);
 
-	/* heap_getattr needs a HeapTuple not a bare HeapTupleHeader */
-	tmptup.t_len = HeapTupleHeaderGetDatumLength(tuple);
-	tmptup.t_data = tuple;
+		/* Lookup tupdesc if first time through or if type changes */
+		tupDesc = get_cached_rowtype(tupType, tupTypmod,
+									 &op->d.fieldselect.argdesc,
+									 econtext);
+
+		/*
+		 * Find field's attr record.  Note we don't support system columns
+		 * here: a datum tuple doesn't have valid values for most of the
+		 * interesting system columns anyway.
+		 */
+		if (fieldnum <= 0)		/* should never happen */
+			elog(ERROR, "unsupported reference to system column %d in FieldSelect",
+				 fieldnum);
+		if (fieldnum > tupDesc->natts)	/* should never happen */
+			elog(ERROR, "attribute number %d exceeds number of columns %d",
+				 fieldnum, tupDesc->natts);
+		attr = TupleDescAttr(tupDesc, fieldnum - 1);
 
-	/* extract the field */
-	*op->resvalue = heap_getattr(&tmptup,
-								 fieldnum,
-								 tupDesc,
-								 op->resnull);
+		/* Check for dropped column, and force a NULL result if so */
+		if (attr->attisdropped)
+		{
+			*op->resnull = true;
+			return;
+		}
+
+		/* Check for type mismatch --- possible after ALTER COLUMN TYPE? */
+		/* As in CheckVarSlotCompatibility, we should but can't check typmod */
+		if (op->d.fieldselect.resulttype != attr->atttypid)
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("attribute %d has wrong type", fieldnum),
+					 errdetail("Table has type %s, but query expects %s.",
+							   format_type_be(attr->atttypid),
+							   format_type_be(op->d.fieldselect.resulttype))));
+
+		/* heap_getattr needs a HeapTuple not a bare HeapTupleHeader */
+		tmptup.t_len = HeapTupleHeaderGetDatumLength(tuple);
+		tmptup.t_data = tuple;
+
+		/* extract the field */
+		*op->resvalue = heap_getattr(&tmptup,
+									 fieldnum,
+									 tupDesc,
+									 op->resnull);
+	}
 }
 
 /*
@@ -3000,7 +3427,7 @@ ExecEvalScalarArrayOp(ExprState *state, ExprEvalStep *op)
 		else
 		{
 			fcinfo->isnull = false;
-			thisresult = (op->d.scalararrayop.fn_addr) (fcinfo);
+			thisresult = op->d.scalararrayop.fn_addr(fcinfo);
 		}
 
 		/* Combine results per OR or AND semantics */
@@ -3424,8 +3851,12 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 			 * generates an INT4 NULL regardless of the dropped column type).
 			 * If we find a dropped column and cannot verify that case (1)
 			 * holds, we have to use the slow path to check (2) for each row.
+			 *
+			 * If vartype is a domain over composite, just look through that
+			 * to the base composite type.
 			 */
-			var_tupdesc = lookup_rowtype_tupdesc(variable->vartype, -1);
+			var_tupdesc = lookup_rowtype_tupdesc_domain(variable->vartype,
+														-1, false);
 
 			slot_tupdesc = slot->tts_tupleDescriptor;
 
@@ -3441,8 +3872,8 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 
 			for (i = 0; i < var_tupdesc->natts; i++)
 			{
-				Form_pg_attribute vattr = var_tupdesc->attrs[i];
-				Form_pg_attribute sattr = slot_tupdesc->attrs[i];
+				Form_pg_attribute vattr = TupleDescAttr(var_tupdesc, i);
+				Form_pg_attribute sattr = TupleDescAttr(slot_tupdesc, i);
 
 				if (vattr->atttypid == sattr->atttypid)
 					continue;	/* no worries */
@@ -3540,8 +3971,8 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 
 		for (i = 0; i < var_tupdesc->natts; i++)
 		{
-			Form_pg_attribute vattr = var_tupdesc->attrs[i];
-			Form_pg_attribute sattr = tupleDesc->attrs[i];
+			Form_pg_attribute vattr = TupleDescAttr(var_tupdesc, i);
+			Form_pg_attribute sattr = TupleDescAttr(tupleDesc, i);
 
 			if (!vattr->attisdropped)
 				continue;		/* already checked non-dropped cols */
@@ -3579,3 +4010,96 @@ ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op, ExprContext *econtext)
 	*op->resvalue = PointerGetDatum(dtuple);
 	*op->resnull = false;
 }
+
+/*
+ * Transition value has not been initialized. This is the first non-NULL input
+ * value for a group. We use it as the initial value for transValue.
+ */
+void
+ExecAggInitGroup(AggState *aggstate, AggStatePerTrans pertrans, AggStatePerGroup pergroup)
+{
+	FunctionCallInfo fcinfo = &pertrans->transfn_fcinfo;
+	MemoryContext oldContext;
+
+	/*
+	 * We must copy the datum into aggcontext if it is pass-by-ref. We do not
+	 * need to pfree the old transValue, since it's NULL.  (We already checked
+	 * that the agg's input type is binary-compatible with its transtype, so
+	 * straight copy here is OK.)
+	 */
+	oldContext = MemoryContextSwitchTo(
+									   aggstate->curaggcontext->ecxt_per_tuple_memory);
+	pergroup->transValue = datumCopy(fcinfo->arg[1],
+									 pertrans->transtypeByVal,
+									 pertrans->transtypeLen);
+	pergroup->transValueIsNull = false;
+	pergroup->noTransValue = false;
+	MemoryContextSwitchTo(oldContext);
+}
+
+/*
+ * Ensure that the current transition value is a child of the aggcontext,
+ * rather than the per-tuple context.
+ *
+ * NB: This can change the current memory context.
+ */
+Datum
+ExecAggTransReparent(AggState *aggstate, AggStatePerTrans pertrans,
+					 Datum newValue, bool newValueIsNull,
+					 Datum oldValue, bool oldValueIsNull)
+{
+	if (!newValueIsNull)
+	{
+		MemoryContextSwitchTo(aggstate->curaggcontext->ecxt_per_tuple_memory);
+		if (DatumIsReadWriteExpandedObject(newValue,
+										   false,
+										   pertrans->transtypeLen) &&
+			MemoryContextGetParent(DatumGetEOHP(newValue)->eoh_context) == CurrentMemoryContext)
+			 /* do nothing */ ;
+		else
+			newValue = datumCopy(newValue,
+								 pertrans->transtypeByVal,
+								 pertrans->transtypeLen);
+	}
+	if (!oldValueIsNull)
+	{
+		if (DatumIsReadWriteExpandedObject(oldValue,
+										   false,
+										   pertrans->transtypeLen))
+			DeleteExpandedObject(oldValue);
+		else
+			pfree(DatumGetPointer(oldValue));
+	}
+
+	return newValue;
+}
+
+/*
+ * Invoke ordered transition function, with a datum argument.
+ */
+void
+ExecEvalAggOrderedTransDatum(ExprState *state, ExprEvalStep *op,
+							 ExprContext *econtext)
+{
+	AggStatePerTrans pertrans = op->d.agg_trans.pertrans;
+	int			setno = op->d.agg_trans.setno;
+
+	tuplesort_putdatum(pertrans->sortstates[setno],
+					   *op->resvalue, *op->resnull);
+}
+
+/*
+ * Invoke ordered transition function, with a tuple argument.
+ */
+void
+ExecEvalAggOrderedTransTuple(ExprState *state, ExprEvalStep *op,
+							 ExprContext *econtext)
+{
+	AggStatePerTrans pertrans = op->d.agg_trans.pertrans;
+	int			setno = op->d.agg_trans.setno;
+
+	ExecClearTuple(pertrans->sortslot);
+	pertrans->sortslot->tts_nvalid = pertrans->numInputs;
+	ExecStoreVirtualTuple(pertrans->sortslot);
+	tuplesort_puttupleslot(pertrans->sortstates[setno], pertrans->sortslot);
+}
diff --git a/src/backend/executor/execGrouping.c b/src/backend/executor/execGrouping.c
index 07c8852fca..c4d0e04058 100644
--- a/src/backend/executor/execGrouping.c
+++ b/src/backend/executor/execGrouping.c
@@ -7,7 +7,7 @@
  * collation-sensitive, so the code in this file has no support for passing
  * collation settings through from callers.  That may have to change someday.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,6 +23,7 @@
 #include "executor/executor.h"
 #include "miscadmin.h"
 #include "utils/lsyscache.h"
+#include "utils/hashutils.h"
 #include "utils/memutils.h"
 
 static uint32 TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple);
@@ -50,173 +51,34 @@ static int	TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tup
  *		Utility routines for grouping tuples together
  *****************************************************************************/
 
-/*
- * execTuplesMatch
- *		Return true if two tuples match in all the indicated fields.
- *
- * This actually implements SQL's notion of "not distinct".  Two nulls
- * match, a null and a not-null don't match.
- *
- * slot1, slot2: the tuples to compare (must have same columns!)
- * numCols: the number of attributes to be examined
- * matchColIdx: array of attribute column numbers
- * eqFunctions: array of fmgr lookup info for the equality functions to use
- * evalContext: short-term memory context for executing the functions
- *
- * NB: evalContext is reset each time!
- */
-bool
-execTuplesMatch(TupleTableSlot *slot1,
-				TupleTableSlot *slot2,
-				int numCols,
-				AttrNumber *matchColIdx,
-				FmgrInfo *eqfunctions,
-				MemoryContext evalContext)
-{
-	MemoryContext oldContext;
-	bool		result;
-	int			i;
-
-	/* Reset and switch into the temp context. */
-	MemoryContextReset(evalContext);
-	oldContext = MemoryContextSwitchTo(evalContext);
-
-	/*
-	 * We cannot report a match without checking all the fields, but we can
-	 * report a non-match as soon as we find unequal fields.  So, start
-	 * comparing at the last field (least significant sort key). That's the
-	 * most likely to be different if we are dealing with sorted input.
-	 */
-	result = true;
-
-	for (i = numCols; --i >= 0;)
-	{
-		AttrNumber	att = matchColIdx[i];
-		Datum		attr1,
-					attr2;
-		bool		isNull1,
-					isNull2;
-
-		attr1 = slot_getattr(slot1, att, &isNull1);
-
-		attr2 = slot_getattr(slot2, att, &isNull2);
-
-		if (isNull1 != isNull2)
-		{
-			result = false;		/* one null and one not; they aren't equal */
-			break;
-		}
-
-		if (isNull1)
-			continue;			/* both are null, treat as equal */
-
-		/* Apply the type-specific equality function */
-
-		if (!DatumGetBool(FunctionCall2(&eqfunctions[i],
-										attr1, attr2)))
-		{
-			result = false;		/* they aren't equal */
-			break;
-		}
-	}
-
-	MemoryContextSwitchTo(oldContext);
-
-	return result;
-}
-
-/*
- * execTuplesUnequal
- *		Return true if two tuples are definitely unequal in the indicated
- *		fields.
- *
- * Nulls are neither equal nor unequal to anything else.  A true result
- * is obtained only if there are non-null fields that compare not-equal.
- *
- * Parameters are identical to execTuplesMatch.
- */
-bool
-execTuplesUnequal(TupleTableSlot *slot1,
-				  TupleTableSlot *slot2,
-				  int numCols,
-				  AttrNumber *matchColIdx,
-				  FmgrInfo *eqfunctions,
-				  MemoryContext evalContext)
-{
-	MemoryContext oldContext;
-	bool		result;
-	int			i;
-
-	/* Reset and switch into the temp context. */
-	MemoryContextReset(evalContext);
-	oldContext = MemoryContextSwitchTo(evalContext);
-
-	/*
-	 * We cannot report a match without checking all the fields, but we can
-	 * report a non-match as soon as we find unequal fields.  So, start
-	 * comparing at the last field (least significant sort key). That's the
-	 * most likely to be different if we are dealing with sorted input.
-	 */
-	result = false;
-
-	for (i = numCols; --i >= 0;)
-	{
-		AttrNumber	att = matchColIdx[i];
-		Datum		attr1,
-					attr2;
-		bool		isNull1,
-					isNull2;
-
-		attr1 = slot_getattr(slot1, att, &isNull1);
-
-		if (isNull1)
-			continue;			/* can't prove anything here */
-
-		attr2 = slot_getattr(slot2, att, &isNull2);
-
-		if (isNull2)
-			continue;			/* can't prove anything here */
-
-		/* Apply the type-specific equality function */
-
-		if (!DatumGetBool(FunctionCall2(&eqfunctions[i],
-										attr1, attr2)))
-		{
-			result = true;		/* they are unequal */
-			break;
-		}
-	}
-
-	MemoryContextSwitchTo(oldContext);
-
-	return result;
-}
-
-
 /*
  * execTuplesMatchPrepare
- *		Look up the equality functions needed for execTuplesMatch or
- *		execTuplesUnequal, given an array of equality operator OIDs.
- *
- * The result is a palloc'd array.
+ *		Build expression that can be evaluated using ExecQual(), returning
+ *		whether an ExprContext's inner/outer tuples are NOT DISTINCT
  */
-FmgrInfo *
-execTuplesMatchPrepare(int numCols,
-					   Oid *eqOperators)
+ExprState *
+execTuplesMatchPrepare(TupleDesc desc,
+					   int numCols,
+					   AttrNumber *keyColIdx,
+					   Oid *eqOperators,
+					   PlanState *parent)
 {
-	FmgrInfo   *eqFunctions = (FmgrInfo *) palloc(numCols * sizeof(FmgrInfo));
+	Oid		   *eqFunctions = (Oid *) palloc(numCols * sizeof(Oid));
 	int			i;
+	ExprState  *expr;
+
+	if (numCols == 0)
+		return NULL;
 
+	/* lookup equality functions */
 	for (i = 0; i < numCols; i++)
-	{
-		Oid			eq_opr = eqOperators[i];
-		Oid			eq_function;
+		eqFunctions[i] = get_opcode(eqOperators[i]);
 
-		eq_function = get_opcode(eq_opr);
-		fmgr_info(eq_function, &eqFunctions[i]);
-	}
+	/* build actual expression */
+	expr = ExecBuildGroupingEqual(desc, desc, numCols, keyColIdx, eqFunctions,
+								  parent);
 
-	return eqFunctions;
+	return expr;
 }
 
 /*
@@ -232,12 +94,12 @@ execTuplesMatchPrepare(int numCols,
 void
 execTuplesHashPrepare(int numCols,
 					  Oid *eqOperators,
-					  FmgrInfo **eqFunctions,
+					  Oid **eqFuncOids,
 					  FmgrInfo **hashFunctions)
 {
 	int			i;
 
-	*eqFunctions = (FmgrInfo *) palloc(numCols * sizeof(FmgrInfo));
+	*eqFuncOids = (Oid *) palloc(numCols * sizeof(Oid));
 	*hashFunctions = (FmgrInfo *) palloc(numCols * sizeof(FmgrInfo));
 
 	for (i = 0; i < numCols; i++)
@@ -254,7 +116,7 @@ execTuplesHashPrepare(int numCols,
 				 eq_opr);
 		/* We're not supporting cross-type cases here */
 		Assert(left_hash_function == right_hash_function);
-		fmgr_info(eq_function, &(*eqFunctions)[i]);
+		(*eqFuncOids)[i] = eq_function;
 		fmgr_info(right_hash_function, &(*hashFunctions)[i]);
 	}
 }
@@ -287,8 +149,10 @@ execTuplesHashPrepare(int numCols,
  * storage that will live as long as the hashtable does.
  */
 TupleHashTable
-BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
-					FmgrInfo *eqfunctions,
+BuildTupleHashTable(PlanState *parent,
+					TupleDesc inputDesc,
+					int numCols, AttrNumber *keyColIdx,
+					Oid *eqfuncoids,
 					FmgrInfo *hashfunctions,
 					long nbuckets, Size additionalsize,
 					MemoryContext tablecxt, MemoryContext tempcxt,
@@ -296,6 +160,7 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
 {
 	TupleHashTable hashtable;
 	Size		entrysize = sizeof(TupleHashEntryData) + additionalsize;
+	MemoryContext oldcontext;
 
 	Assert(nbuckets > 0);
 
@@ -308,14 +173,13 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
 	hashtable->numCols = numCols;
 	hashtable->keyColIdx = keyColIdx;
 	hashtable->tab_hash_funcs = hashfunctions;
-	hashtable->tab_eq_funcs = eqfunctions;
 	hashtable->tablecxt = tablecxt;
 	hashtable->tempcxt = tempcxt;
 	hashtable->entrysize = entrysize;
 	hashtable->tableslot = NULL;	/* will be made on first lookup */
 	hashtable->inputslot = NULL;
 	hashtable->in_hash_funcs = NULL;
-	hashtable->cur_eq_funcs = NULL;
+	hashtable->cur_eq_func = NULL;
 
 	/*
 	 * If parallelism is in use, even if the master backend is performing the
@@ -326,12 +190,30 @@ BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
 	 * underestimated.
 	 */
 	if (use_variable_hash_iv)
-		hashtable->hash_iv = hash_uint32(ParallelWorkerNumber);
+		hashtable->hash_iv = murmurhash32(ParallelWorkerNumber);
 	else
 		hashtable->hash_iv = 0;
 
 	hashtable->hashtab = tuplehash_create(tablecxt, nbuckets, hashtable);
 
+	oldcontext = MemoryContextSwitchTo(hashtable->tablecxt);
+
+	/*
+	 * We copy the input tuple descriptor just for safety --- we assume all
+	 * input tuples will have equivalent descriptors.
+	 */
+	hashtable->tableslot = MakeSingleTupleTableSlot(CreateTupleDescCopy(inputDesc));
+
+	/* build comparator for all columns */
+	hashtable->tab_eq_func = ExecBuildGroupingEqual(inputDesc, inputDesc,
+													numCols,
+													keyColIdx, eqfuncoids,
+													parent);
+
+	MemoryContextSwitchTo(oldcontext);
+
+	hashtable->exprcontext = CreateExprContext(parent->state);
+
 	return hashtable;
 }
 
@@ -356,29 +238,13 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
 	bool		found;
 	MinimalTuple key;
 
-	/* If first time through, clone the input slot to make table slot */
-	if (hashtable->tableslot == NULL)
-	{
-		TupleDesc	tupdesc;
-
-		oldContext = MemoryContextSwitchTo(hashtable->tablecxt);
-
-		/*
-		 * We copy the input tuple descriptor just for safety --- we assume
-		 * all input tuples will have equivalent descriptors.
-		 */
-		tupdesc = CreateTupleDescCopy(slot->tts_tupleDescriptor);
-		hashtable->tableslot = MakeSingleTupleTableSlot(tupdesc);
-		MemoryContextSwitchTo(oldContext);
-	}
-
 	/* Need to run the hash functions in short-lived context */
 	oldContext = MemoryContextSwitchTo(hashtable->tempcxt);
 
 	/* set up data needed by hash and match functions */
 	hashtable->inputslot = slot;
 	hashtable->in_hash_funcs = hashtable->tab_hash_funcs;
-	hashtable->cur_eq_funcs = hashtable->tab_eq_funcs;
+	hashtable->cur_eq_func = hashtable->tab_eq_func;
 
 	key = NULL;					/* flag to reference inputslot */
 
@@ -423,7 +289,7 @@ LookupTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
  */
 TupleHashEntry
 FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
-				   FmgrInfo *eqfunctions,
+				   ExprState *eqcomp,
 				   FmgrInfo *hashfunctions)
 {
 	TupleHashEntry entry;
@@ -436,7 +302,7 @@ FindTupleHashEntry(TupleHashTable hashtable, TupleTableSlot *slot,
 	/* Set up data needed by hash and match functions */
 	hashtable->inputslot = slot;
 	hashtable->in_hash_funcs = hashfunctions;
-	hashtable->cur_eq_funcs = eqfunctions;
+	hashtable->cur_eq_func = eqcomp;
 
 	/* Search the hash table */
 	key = NULL;					/* flag to reference inputslot */
@@ -510,16 +376,19 @@ TupleHashTableHash(struct tuplehash_hash *tb, const MinimalTuple tuple)
 		}
 	}
 
-	return hashkey;
+	/*
+	 * The way hashes are combined above, among each other and with the IV,
+	 * doesn't lead to good bit perturbation. As the IV's goal is to lead to
+	 * achieve that, perform a round of hashing of the combined hash -
+	 * resulting in near perfect perturbation.
+	 */
+	return murmurhash32(hashkey);
 }
 
 /*
  * See whether two tuples (presumably of the same hash value) match
  *
  * As above, the passed pointers are pointers to TupleHashEntryData.
- *
- * Also, the caller must select an appropriate memory context for running
- * the compare functions.  (dynahash.c doesn't change CurrentMemoryContext.)
  */
 static int
 TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const MinimalTuple tuple2)
@@ -527,6 +396,7 @@ TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const
 	TupleTableSlot *slot1;
 	TupleTableSlot *slot2;
 	TupleHashTable hashtable = (TupleHashTable) tb->private_data;
+	ExprContext *econtext = hashtable->exprcontext;
 
 	/*
 	 * We assume that simplehash.h will only ever call us with the first
@@ -541,13 +411,7 @@ TupleHashTableMatch(struct tuplehash_hash *tb, const MinimalTuple tuple1, const
 	slot2 = hashtable->inputslot;
 
 	/* For crosstype comparisons, the inputslot must be first */
-	if (execTuplesMatch(slot2,
-						slot1,
-						hashtable->numCols,
-						hashtable->keyColIdx,
-						hashtable->cur_eq_funcs,
-						hashtable->tempcxt))
-		return 0;
-	else
-		return 1;
+	econtext->ecxt_innertuple = slot2;
+	econtext->ecxt_outertuple = slot1;
+	return !ExecQualAndReset(hashtable->cur_eq_func, econtext);
 }
diff --git a/src/backend/executor/execIndexing.c b/src/backend/executor/execIndexing.c
index 89e189fa71..62e51f1ef3 100644
--- a/src/backend/executor/execIndexing.c
+++ b/src/backend/executor/execIndexing.c
@@ -95,7 +95,7 @@
  * with the higher XID backs out.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/executor/execJunk.c b/src/backend/executor/execJunk.c
index a422327c88..57d74e57c1 100644
--- a/src/backend/executor/execJunk.c
+++ b/src/backend/executor/execJunk.c
@@ -3,7 +3,7 @@
  * execJunk.c
  *	  Junk attribute support stuff....
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -168,7 +168,7 @@ ExecInitJunkFilterConversion(List *targetList,
 		t = list_head(targetList);
 		for (i = 0; i < cleanLength; i++)
 		{
-			if (cleanTupType->attrs[i]->attisdropped)
+			if (TupleDescAttr(cleanTupType, i)->attisdropped)
 				continue;		/* map entry is already zero */
 			for (;;)
 			{
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 6671a25ffb..91ba939bdc 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -26,7 +26,7 @@
  *	before ExecutorEnd.  This can be omitted only in case of EXPLAIN,
  *	which should also omit ExecutorRun.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -97,14 +97,8 @@ static char *ExecBuildSlotValueDescription(Oid reloid,
 							  TupleDesc tupdesc,
 							  Bitmapset *modifiedCols,
 							  int maxfieldlen);
-static char *ExecBuildSlotPartitionKeyDescription(Relation rel,
-									 Datum *values,
-									 bool *isnull,
-									 int maxfieldlen);
 static void EvalPlanQualStart(EPQState *epqstate, EState *parentestate,
 				  Plan *planTree);
-static void ExecPartitionCheck(ResultRelInfo *resultRelInfo,
-				   TupleTableSlot *slot, EState *estate);
 
 /*
  * Note that GetUpdatedColumns() also exists in commands/trigger.c.  There does
@@ -194,9 +188,14 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	 */
 	estate->es_param_list_info = queryDesc->params;
 
-	if (queryDesc->plannedstmt->nParamExec > 0)
+	if (queryDesc->plannedstmt->paramExecTypes != NIL)
+	{
+		int			nParamExec;
+
+		nParamExec = list_length(queryDesc->plannedstmt->paramExecTypes);
 		estate->es_param_exec_vals = (ParamExecData *)
-			palloc0(queryDesc->plannedstmt->nParamExec * sizeof(ParamExecData));
+			palloc0(nParamExec * sizeof(ParamExecData));
+	}
 
 	estate->es_sourceText = queryDesc->sourceText;
 
@@ -250,11 +249,6 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	estate->es_top_eflags = eflags;
 	estate->es_instrument = queryDesc->instrument_options;
 
-	/*
-	 * Initialize the plan state tree
-	 */
-	InitPlan(queryDesc, eflags);
-
 	/*
 	 * Set up an AFTER-trigger statement context, unless told not to, or
 	 * unless it's EXPLAIN-only mode (when ExecutorFinish won't be called).
@@ -262,6 +256,11 @@ standard_ExecutorStart(QueryDesc *queryDesc, int eflags)
 	if (!(eflags & (EXEC_FLAG_SKIP_TRIGGERS | EXEC_FLAG_EXPLAIN_ONLY)))
 		AfterTriggerBeginQuery();
 
+	/*
+	 * Initialize the plan state tree
+	 */
+	InitPlan(queryDesc, eflags);
+
 	MemoryContextSwitchTo(oldcontext);
 }
 
@@ -348,7 +347,7 @@ standard_ExecutorRun(QueryDesc *queryDesc,
 				  queryDesc->plannedstmt->hasReturning);
 
 	if (sendTuples)
-		(*dest->rStartup) (dest, operation, queryDesc->tupDesc);
+		dest->rStartup(dest, operation, queryDesc->tupDesc);
 
 	/*
 	 * run plan
@@ -374,7 +373,7 @@ standard_ExecutorRun(QueryDesc *queryDesc,
 	 * shutdown tuple receiver, if we started it
 	 */
 	if (sendTuples)
-		(*dest->rShutdown) (dest);
+		dest->rShutdown(dest);
 
 	if (queryDesc->totaltime)
 		InstrStopNode(queryDesc->totaltime, estate->es_processed);
@@ -580,7 +579,7 @@ ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation)
 		{
 			Assert(rte->rtekind == RTE_RELATION);
 			if (ereport_on_violation)
-				aclcheck_error(ACLCHECK_NO_PRIV, ACL_KIND_CLASS,
+				aclcheck_error(ACLCHECK_NO_PRIV, get_relkind_objtype(get_rel_relkind(rte->relid)),
 							   get_rel_name(rte->relid));
 			return false;
 		}
@@ -1074,7 +1073,7 @@ InitPlan(QueryDesc *queryDesc, int eflags)
 
 			j = ExecInitJunkFilter(planstate->plan->targetlist,
 								   tupType->tdhasoid,
-								   ExecInitExtraTupleSlot(estate));
+								   ExecInitExtraTupleSlot(estate, NULL));
 			estate->es_junkFilter = j;
 
 			/* Want to return the cleaned tuple type */
@@ -1096,8 +1095,9 @@ InitPlan(QueryDesc *queryDesc, int eflags)
  * CheckValidRowMarkRel.
  */
 void
-CheckValidResultRel(Relation resultRel, CmdType operation)
+CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation)
 {
+	Relation	resultRel = resultRelInfo->ri_RelationDesc;
 	TriggerDesc *trigDesc = resultRel->trigdesc;
 	FdwRoutine *fdwroutine;
 
@@ -1168,10 +1168,17 @@ CheckValidResultRel(Relation resultRel, CmdType operation)
 			break;
 		case RELKIND_FOREIGN_TABLE:
 			/* Okay only if the FDW supports it */
-			fdwroutine = GetFdwRoutineForRelation(resultRel, false);
+			fdwroutine = resultRelInfo->ri_FdwRoutine;
 			switch (operation)
 			{
 				case CMD_INSERT:
+
+					/*
+					 * If foreign partition to do tuple-routing for, skip the
+					 * check; it's disallowed elsewhere.
+					 */
+					if (resultRelInfo->ri_PartitionRoot)
+						break;
 					if (fdwroutine->ExecForeignInsert == NULL)
 						ereport(ERROR,
 								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
@@ -1364,16 +1371,18 @@ InitResultRelInfo(ResultRelInfo *resultRelInfo,
  *
  * Get a ResultRelInfo for a trigger target relation.  Most of the time,
  * triggers are fired on one of the result relations of the query, and so
- * we can just return a member of the es_result_relations array.  (Note: in
- * self-join situations there might be multiple members with the same OID;
- * if so it doesn't matter which one we pick.)  However, it is sometimes
- * necessary to fire triggers on other relations; this happens mainly when an
- * RI update trigger queues additional triggers on other relations, which will
- * be processed in the context of the outer query.  For efficiency's sake,
- * we want to have a ResultRelInfo for those triggers too; that can avoid
- * repeated re-opening of the relation.  (It also provides a way for EXPLAIN
- * ANALYZE to report the runtimes of such triggers.)  So we make additional
- * ResultRelInfo's as needed, and save them in es_trig_target_relations.
+ * we can just return a member of the es_result_relations array, the
+ * es_root_result_relations array (if any), or the es_leaf_result_relations
+ * list (if any).  (Note: in self-join situations there might be multiple
+ * members with the same OID; if so it doesn't matter which one we pick.)
+ * However, it is sometimes necessary to fire triggers on other relations;
+ * this happens mainly when an RI update trigger queues additional triggers
+ * on other relations, which will be processed in the context of the outer
+ * query.  For efficiency's sake, we want to have a ResultRelInfo for those
+ * triggers too; that can avoid repeated re-opening of the relation.  (It
+ * also provides a way for EXPLAIN ANALYZE to report the runtimes of such
+ * triggers.)  So we make additional ResultRelInfo's as needed, and save them
+ * in es_trig_target_relations.
  */
 ResultRelInfo *
 ExecGetTriggerResultRel(EState *estate, Oid relid)
@@ -1394,6 +1403,26 @@ ExecGetTriggerResultRel(EState *estate, Oid relid)
 		rInfo++;
 		nr--;
 	}
+	/* Second, search through the root result relations, if any */
+	rInfo = estate->es_root_result_relations;
+	nr = estate->es_num_root_result_relations;
+	while (nr > 0)
+	{
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+			return rInfo;
+		rInfo++;
+		nr--;
+	}
+	/*
+	 * Third, search through the result relations that were created during
+	 * tuple routing, if any.
+	 */
+	foreach(l, estate->es_tuple_routing_result_relations)
+	{
+		rInfo = (ResultRelInfo *) lfirst(l);
+		if (RelationGetRelid(rInfo->ri_RelationDesc) == relid)
+			return rInfo;
+	}
 	/* Nope, but maybe we already made an extra ResultRelInfo for it */
 	foreach(l, estate->es_trig_target_relations)
 	{
@@ -1459,8 +1488,8 @@ ExecCleanUpTriggerState(EState *estate)
  * going to be stored into a relation that has OIDs.  In other contexts
  * we are free to choose whether to leave space for OIDs in result tuples
  * (we generally don't want to, but we do if a physical-tlist optimization
- * is possible).  This routine checks the plan context and returns TRUE if the
- * choice is forced, FALSE if the choice is not forced.  In the TRUE case,
+ * is possible).  This routine checks the plan context and returns true if the
+ * choice is forced, false if the choice is not forced.  In the true case,
  * *hasoids is set to the required value.
  *
  * One reason this is ugly is that all plan nodes in the plan tree will emit
@@ -1669,13 +1698,12 @@ ExecutePlan(EState *estate,
 
 	/*
 	 * If the plan might potentially be executed multiple times, we must force
-	 * it to run without parallelism, because we might exit early.  Also
-	 * disable parallelism when writing into a relation, because no database
-	 * changes are allowed in parallel mode.
+	 * it to run without parallelism, because we might exit early.
 	 */
-	if (!execute_once || dest->mydest == DestIntoRel)
+	if (!execute_once)
 		use_parallel_mode = false;
 
+	estate->es_use_parallel_mode = use_parallel_mode;
 	if (use_parallel_mode)
 		EnterParallelMode();
 
@@ -1725,7 +1753,7 @@ ExecutePlan(EState *estate,
 			 * has closed and no more tuples can be sent. If that's the case,
 			 * end the loop.
 			 */
-			if (!((*dest->receiveSlot) (slot, dest)))
+			if (!dest->receiveSlot(slot, dest))
 				break;
 		}
 
@@ -1822,16 +1850,14 @@ ExecRelCheck(ResultRelInfo *resultRelInfo,
 
 /*
  * ExecPartitionCheck --- check that tuple meets the partition constraint.
+ *
+ * Exported in executor.h for outside use.
+ * Returns true if it meets the partition constraint, else returns false.
  */
-static void
+bool
 ExecPartitionCheck(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
 				   EState *estate)
 {
-	Relation	rel = resultRelInfo->ri_RelationDesc;
-	TupleDesc	tupdesc = RelationGetDescr(rel);
-	Bitmapset  *modifiedCols;
-	Bitmapset  *insertedCols;
-	Bitmapset  *updatedCols;
 	ExprContext *econtext;
 
 	/*
@@ -1859,52 +1885,69 @@ ExecPartitionCheck(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
 	 * As in case of the catalogued constraints, we treat a NULL result as
 	 * success here, not a failure.
 	 */
-	if (!ExecCheck(resultRelInfo->ri_PartitionCheckExpr, econtext))
-	{
-		char	   *val_desc;
-		Relation	orig_rel = rel;
+	return ExecCheck(resultRelInfo->ri_PartitionCheckExpr, econtext);
+}
 
-		/* See the comment above. */
-		if (resultRelInfo->ri_PartitionRoot)
+/*
+ * ExecPartitionCheckEmitError - Form and emit an error message after a failed
+ * partition constraint check.
+ */
+void
+ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo,
+							TupleTableSlot *slot,
+							EState *estate)
+{
+	Relation	rel = resultRelInfo->ri_RelationDesc;
+	Relation	orig_rel = rel;
+	TupleDesc	tupdesc = RelationGetDescr(rel);
+	char	   *val_desc;
+	Bitmapset  *modifiedCols;
+	Bitmapset  *insertedCols;
+	Bitmapset  *updatedCols;
+
+	/*
+	 * Need to first convert the tuple to the root partitioned table's row
+	 * type. For details, check similar comments in ExecConstraints().
+	 */
+	if (resultRelInfo->ri_PartitionRoot)
+	{
+		HeapTuple	tuple = ExecFetchSlotTuple(slot);
+		TupleDesc	old_tupdesc = RelationGetDescr(rel);
+		TupleConversionMap *map;
+
+		rel = resultRelInfo->ri_PartitionRoot;
+		tupdesc = RelationGetDescr(rel);
+		/* a reverse map */
+		map = convert_tuples_by_name(old_tupdesc, tupdesc,
+									 gettext_noop("could not convert row type"));
+		if (map != NULL)
 		{
-			HeapTuple	tuple = ExecFetchSlotTuple(slot);
-			TupleDesc	old_tupdesc = RelationGetDescr(rel);
-			TupleConversionMap *map;
-
-			rel = resultRelInfo->ri_PartitionRoot;
-			tupdesc = RelationGetDescr(rel);
-			/* a reverse map */
-			map = convert_tuples_by_name(old_tupdesc, tupdesc,
-										 gettext_noop("could not convert row type"));
-			if (map != NULL)
-			{
-				tuple = do_convert_tuple(tuple, map);
-				ExecSetSlotDescriptor(slot, tupdesc);
-				ExecStoreTuple(tuple, slot, InvalidBuffer, false);
-			}
+			tuple = do_convert_tuple(tuple, map);
+			ExecSetSlotDescriptor(slot, tupdesc);
+			ExecStoreTuple(tuple, slot, InvalidBuffer, false);
 		}
-
-		insertedCols = GetInsertedColumns(resultRelInfo, estate);
-		updatedCols = GetUpdatedColumns(resultRelInfo, estate);
-		modifiedCols = bms_union(insertedCols, updatedCols);
-		val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
-												 slot,
-												 tupdesc,
-												 modifiedCols,
-												 64);
-		ereport(ERROR,
-				(errcode(ERRCODE_CHECK_VIOLATION),
-				 errmsg("new row for relation \"%s\" violates partition constraint",
-						RelationGetRelationName(orig_rel)),
-				 val_desc ? errdetail("Failing row contains %s.", val_desc) : 0));
 	}
+
+	insertedCols = GetInsertedColumns(resultRelInfo, estate);
+	updatedCols = GetUpdatedColumns(resultRelInfo, estate);
+	modifiedCols = bms_union(insertedCols, updatedCols);
+	val_desc = ExecBuildSlotValueDescription(RelationGetRelid(rel),
+											 slot,
+											 tupdesc,
+											 modifiedCols,
+											 64);
+	ereport(ERROR,
+			(errcode(ERRCODE_CHECK_VIOLATION),
+			 errmsg("new row for relation \"%s\" violates partition constraint",
+					RelationGetRelationName(orig_rel)),
+			 val_desc ? errdetail("Failing row contains %s.", val_desc) : 0));
 }
 
 /*
  * ExecConstraints - check constraints of the tuple in 'slot'
  *
- * This checks the traditional NOT NULL and check constraints, as well as
- * the partition constraint, if any.
+ * This checks the traditional NOT NULL and check constraints, and if
+ * requested, checks the partition constraint.
  *
  * Note: 'slot' contains the tuple to check the constraints of, which may
  * have been converted from the original input tuple after tuple routing.
@@ -1912,7 +1955,8 @@ ExecPartitionCheck(ResultRelInfo *resultRelInfo, TupleTableSlot *slot,
  */
 void
 ExecConstraints(ResultRelInfo *resultRelInfo,
-				TupleTableSlot *slot, EState *estate)
+				TupleTableSlot *slot, EState *estate,
+				bool check_partition_constraint)
 {
 	Relation	rel = resultRelInfo->ri_RelationDesc;
 	TupleDesc	tupdesc = RelationGetDescr(rel);
@@ -1930,8 +1974,9 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 
 		for (attrChk = 1; attrChk <= natts; attrChk++)
 		{
-			if (tupdesc->attrs[attrChk - 1]->attnotnull &&
-				slot_attisnull(slot, attrChk))
+			Form_pg_attribute att = TupleDescAttr(tupdesc, attrChk - 1);
+
+			if (att->attnotnull && slot_attisnull(slot, attrChk))
 			{
 				char	   *val_desc;
 				Relation	orig_rel = rel;
@@ -1974,7 +2019,7 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 				ereport(ERROR,
 						(errcode(ERRCODE_NOT_NULL_VIOLATION),
 						 errmsg("null value in column \"%s\" violates not-null constraint",
-								NameStr(orig_tupdesc->attrs[attrChk - 1]->attname)),
+								NameStr(att->attname)),
 						 val_desc ? errdetail("Failing row contains %s.", val_desc) : 0,
 						 errtablecol(orig_rel, attrChk)));
 			}
@@ -2027,8 +2072,9 @@ ExecConstraints(ResultRelInfo *resultRelInfo,
 		}
 	}
 
-	if (resultRelInfo->ri_PartitionCheck)
-		ExecPartitionCheck(resultRelInfo, slot, estate);
+	if (check_partition_constraint && resultRelInfo->ri_PartitionCheck &&
+		!ExecPartitionCheck(resultRelInfo, slot, estate))
+		ExecPartitionCheckEmitError(resultRelInfo, slot, estate);
 }
 
 
@@ -2241,9 +2287,10 @@ ExecBuildSlotValueDescription(Oid reloid,
 		bool		column_perm = false;
 		char	   *val;
 		int			vallen;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
 		/* ignore dropped columns */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		if (!table_perm)
@@ -2254,9 +2301,9 @@ ExecBuildSlotValueDescription(Oid reloid,
 			 * for the column.  If not, omit this column from the error
 			 * message.
 			 */
-			aclresult = pg_attribute_aclcheck(reloid, tupdesc->attrs[i]->attnum,
+			aclresult = pg_attribute_aclcheck(reloid, att->attnum,
 											  GetUserId(), ACL_SELECT);
-			if (bms_is_member(tupdesc->attrs[i]->attnum - FirstLowInvalidHeapAttributeNumber,
+			if (bms_is_member(att->attnum - FirstLowInvalidHeapAttributeNumber,
 							  modifiedCols) || aclresult == ACLCHECK_OK)
 			{
 				column_perm = any_perm = true;
@@ -2266,7 +2313,7 @@ ExecBuildSlotValueDescription(Oid reloid,
 				else
 					write_comma_collist = true;
 
-				appendStringInfoString(&collist, NameStr(tupdesc->attrs[i]->attname));
+				appendStringInfoString(&collist, NameStr(att->attname));
 			}
 		}
 
@@ -2279,7 +2326,7 @@ ExecBuildSlotValueDescription(Oid reloid,
 				Oid			foutoid;
 				bool		typisvarlena;
 
-				getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
+				getTypeOutputInfo(att->atttypid,
 								  &foutoid, &typisvarlena);
 				val = OidOutputFunctionCall(foutoid, slot->tts_values[i]);
 			}
@@ -3003,9 +3050,11 @@ EvalPlanQualBegin(EPQState *epqstate, EState *parentestate)
 		MemSet(estate->es_epqScanDone, 0, rtsize * sizeof(bool));
 
 		/* Recopy current values of parent parameters */
-		if (parentestate->es_plannedstmt->nParamExec > 0)
+		if (parentestate->es_plannedstmt->paramExecTypes != NIL)
 		{
-			int			i = parentestate->es_plannedstmt->nParamExec;
+			int			i;
+
+			i = list_length(parentestate->es_plannedstmt->paramExecTypes);
 
 			while (--i >= 0)
 			{
@@ -3093,10 +3142,11 @@ EvalPlanQualStart(EPQState *epqstate, EState *parentestate, Plan *planTree)
 	 * already set from other parts of the parent's plan tree.
 	 */
 	estate->es_param_list_info = parentestate->es_param_list_info;
-	if (parentestate->es_plannedstmt->nParamExec > 0)
+	if (parentestate->es_plannedstmt->paramExecTypes != NIL)
 	{
-		int			i = parentestate->es_plannedstmt->nParamExec;
+		int			i;
 
+		i = list_length(parentestate->es_plannedstmt->paramExecTypes);
 		estate->es_param_exec_vals = (ParamExecData *)
 			palloc0(i * sizeof(ParamExecData));
 		while (--i >= 0)
@@ -3208,250 +3258,3 @@ EvalPlanQualEnd(EPQState *epqstate)
 	epqstate->planstate = NULL;
 	epqstate->origslot = NULL;
 }
-
-/*
- * ExecSetupPartitionTupleRouting - set up information needed during
- * tuple routing for partitioned tables
- *
- * Output arguments:
- * 'pd' receives an array of PartitionDispatch objects with one entry for
- *		every partitioned table in the partition tree
- * 'partitions' receives an array of ResultRelInfo objects with one entry for
- *		every leaf partition in the partition tree
- * 'tup_conv_maps' receives an array of TupleConversionMap objects with one
- *		entry for every leaf partition (required to convert input tuple based
- *		on the root table's rowtype to a leaf partition's rowtype after tuple
- *		routing is done)
- * 'partition_tuple_slot' receives a standalone TupleTableSlot to be used
- *		to manipulate any given leaf partition's rowtype after that partition
- *		is chosen by tuple-routing.
- * 'num_parted' receives the number of partitioned tables in the partition
- *		tree (= the number of entries in the 'pd' output array)
- * 'num_partitions' receives the number of leaf partitions in the partition
- *		tree (= the number of entries in the 'partitions' and 'tup_conv_maps'
- *		output arrays
- *
- * Note that all the relations in the partition tree are locked using the
- * RowExclusiveLock mode upon return from this function.
- */
-void
-ExecSetupPartitionTupleRouting(Relation rel,
-							   Index resultRTindex,
-							   PartitionDispatch **pd,
-							   ResultRelInfo **partitions,
-							   TupleConversionMap ***tup_conv_maps,
-							   TupleTableSlot **partition_tuple_slot,
-							   int *num_parted, int *num_partitions)
-{
-	TupleDesc	tupDesc = RelationGetDescr(rel);
-	List	   *leaf_parts;
-	ListCell   *cell;
-	int			i;
-	ResultRelInfo *leaf_part_rri;
-
-	/* Get the tuple-routing information and lock partitions */
-	*pd = RelationGetPartitionDispatchInfo(rel, RowExclusiveLock, num_parted,
-										   &leaf_parts);
-	*num_partitions = list_length(leaf_parts);
-	*partitions = (ResultRelInfo *) palloc(*num_partitions *
-										   sizeof(ResultRelInfo));
-	*tup_conv_maps = (TupleConversionMap **) palloc0(*num_partitions *
-													 sizeof(TupleConversionMap *));
-
-	/*
-	 * Initialize an empty slot that will be used to manipulate tuples of any
-	 * given partition's rowtype.  It is attached to the caller-specified node
-	 * (such as ModifyTableState) and released when the node finishes
-	 * processing.
-	 */
-	*partition_tuple_slot = MakeTupleTableSlot();
-
-	leaf_part_rri = *partitions;
-	i = 0;
-	foreach(cell, leaf_parts)
-	{
-		Relation	partrel;
-		TupleDesc	part_tupdesc;
-
-		/*
-		 * We locked all the partitions above including the leaf partitions.
-		 * Note that each of the relations in *partitions are eventually
-		 * closed by the caller.
-		 */
-		partrel = heap_open(lfirst_oid(cell), NoLock);
-		part_tupdesc = RelationGetDescr(partrel);
-
-		/*
-		 * Verify result relation is a valid target for the current operation.
-		 */
-		CheckValidResultRel(partrel, CMD_INSERT);
-
-		/*
-		 * Save a tuple conversion map to convert a tuple routed to this
-		 * partition from the parent's type to the partition's.
-		 */
-		(*tup_conv_maps)[i] = convert_tuples_by_name(tupDesc, part_tupdesc,
-													 gettext_noop("could not convert row type"));
-
-		InitResultRelInfo(leaf_part_rri,
-						  partrel,
-						  resultRTindex,
-						  rel,
-						  0);
-
-		/*
-		 * Open partition indices (remember we do not support ON CONFLICT in
-		 * case of partitioned tables, so we do not need support information
-		 * for speculative insertion)
-		 */
-		if (leaf_part_rri->ri_RelationDesc->rd_rel->relhasindex &&
-			leaf_part_rri->ri_IndexRelationDescs == NULL)
-			ExecOpenIndices(leaf_part_rri, false);
-
-		leaf_part_rri++;
-		i++;
-	}
-}
-
-/*
- * ExecFindPartition -- Find a leaf partition in the partition tree rooted
- * at parent, for the heap tuple contained in *slot
- *
- * estate must be non-NULL; we'll need it to compute any expressions in the
- * partition key(s)
- *
- * If no leaf partition is found, this routine errors out with the appropriate
- * error message, else it returns the leaf partition sequence number returned
- * by get_partition_for_tuple() unchanged.
- */
-int
-ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
-				  TupleTableSlot *slot, EState *estate)
-{
-	int			result;
-	PartitionDispatchData *failed_at;
-	TupleTableSlot *failed_slot;
-
-	/*
-	 * First check the root table's partition constraint, if any.  No point in
-	 * routing the tuple if it doesn't belong in the root table itself.
-	 */
-	if (resultRelInfo->ri_PartitionCheck)
-		ExecPartitionCheck(resultRelInfo, slot, estate);
-
-	result = get_partition_for_tuple(pd, slot, estate,
-									 &failed_at, &failed_slot);
-	if (result < 0)
-	{
-		Relation	failed_rel;
-		Datum		key_values[PARTITION_MAX_KEYS];
-		bool		key_isnull[PARTITION_MAX_KEYS];
-		char	   *val_desc;
-		ExprContext *ecxt = GetPerTupleExprContext(estate);
-
-		failed_rel = failed_at->reldesc;
-		ecxt->ecxt_scantuple = failed_slot;
-		FormPartitionKeyDatum(failed_at, failed_slot, estate,
-							  key_values, key_isnull);
-		val_desc = ExecBuildSlotPartitionKeyDescription(failed_rel,
-														key_values,
-														key_isnull,
-														64);
-		Assert(OidIsValid(RelationGetRelid(failed_rel)));
-		ereport(ERROR,
-				(errcode(ERRCODE_CHECK_VIOLATION),
-				 errmsg("no partition of relation \"%s\" found for row",
-						RelationGetRelationName(failed_rel)),
-				 val_desc ? errdetail("Partition key of the failing row contains %s.", val_desc) : 0));
-	}
-
-	return result;
-}
-
-/*
- * BuildSlotPartitionKeyDescription
- *
- * This works very much like BuildIndexValueDescription() and is currently
- * used for building error messages when ExecFindPartition() fails to find
- * partition for a row.
- */
-static char *
-ExecBuildSlotPartitionKeyDescription(Relation rel,
-									 Datum *values,
-									 bool *isnull,
-									 int maxfieldlen)
-{
-	StringInfoData buf;
-	PartitionKey key = RelationGetPartitionKey(rel);
-	int			partnatts = get_partition_natts(key);
-	int			i;
-	Oid			relid = RelationGetRelid(rel);
-	AclResult	aclresult;
-
-	if (check_enable_rls(relid, InvalidOid, true) == RLS_ENABLED)
-		return NULL;
-
-	/* If the user has table-level access, just go build the description. */
-	aclresult = pg_class_aclcheck(relid, GetUserId(), ACL_SELECT);
-	if (aclresult != ACLCHECK_OK)
-	{
-		/*
-		 * Step through the columns of the partition key and make sure the
-		 * user has SELECT rights on all of them.
-		 */
-		for (i = 0; i < partnatts; i++)
-		{
-			AttrNumber	attnum = get_partition_col_attnum(key, i);
-
-			/*
-			 * If this partition key column is an expression, we return no
-			 * detail rather than try to figure out what column(s) the
-			 * expression includes and if the user has SELECT rights on them.
-			 */
-			if (attnum == InvalidAttrNumber ||
-				pg_attribute_aclcheck(relid, attnum, GetUserId(),
-									  ACL_SELECT) != ACLCHECK_OK)
-				return NULL;
-		}
-	}
-
-	initStringInfo(&buf);
-	appendStringInfo(&buf, "(%s) = (",
-					 pg_get_partkeydef_columns(relid, true));
-
-	for (i = 0; i < partnatts; i++)
-	{
-		char	   *val;
-		int			vallen;
-
-		if (isnull[i])
-			val = "null";
-		else
-		{
-			Oid			foutoid;
-			bool		typisvarlena;
-
-			getTypeOutputInfo(get_partition_col_typid(key, i),
-							  &foutoid, &typisvarlena);
-			val = OidOutputFunctionCall(foutoid, values[i]);
-		}
-
-		if (i > 0)
-			appendStringInfoString(&buf, ", ");
-
-		/* truncate if needed */
-		vallen = strlen(val);
-		if (vallen <= maxfieldlen)
-			appendStringInfoString(&buf, val);
-		else
-		{
-			vallen = pg_mbcliplen(val, vallen, maxfieldlen);
-			appendBinaryStringInfo(&buf, val, vallen);
-			appendStringInfoString(&buf, "...");
-		}
-	}
-
-	appendStringInfoChar(&buf, ')');
-
-	return buf.data;
-}
diff --git a/src/backend/executor/execParallel.c b/src/backend/executor/execParallel.c
index ce47f1d4a8..14b0b89463 100644
--- a/src/backend/executor/execParallel.c
+++ b/src/backend/executor/execParallel.c
@@ -3,7 +3,7 @@
  * execParallel.c
  *	  Support routines for parallel execution.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * This file contains routines that are intended to support setting up,
@@ -23,21 +23,28 @@
 
 #include "postgres.h"
 
+#include "executor/execExpr.h"
 #include "executor/execParallel.h"
 #include "executor/executor.h"
+#include "executor/nodeAppend.h"
 #include "executor/nodeBitmapHeapscan.h"
 #include "executor/nodeCustom.h"
 #include "executor/nodeForeignscan.h"
-#include "executor/nodeSeqscan.h"
+#include "executor/nodeHash.h"
+#include "executor/nodeHashjoin.h"
 #include "executor/nodeIndexscan.h"
 #include "executor/nodeIndexonlyscan.h"
+#include "executor/nodeSeqscan.h"
+#include "executor/nodeSort.h"
 #include "executor/tqueue.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/planmain.h"
 #include "optimizer/planner.h"
 #include "storage/spin.h"
 #include "tcop/tcopprot.h"
+#include "utils/datum.h"
 #include "utils/dsa.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/snapmgr.h"
 #include "pgstat.h"
@@ -47,16 +54,27 @@
  * greater than any 32-bit integer here so that values < 2^32 can be used
  * by individual parallel nodes to store their own state.
  */
-#define PARALLEL_KEY_PLANNEDSTMT		UINT64CONST(0xE000000000000001)
-#define PARALLEL_KEY_PARAMS				UINT64CONST(0xE000000000000002)
-#define PARALLEL_KEY_BUFFER_USAGE		UINT64CONST(0xE000000000000003)
-#define PARALLEL_KEY_TUPLE_QUEUE		UINT64CONST(0xE000000000000004)
-#define PARALLEL_KEY_INSTRUMENTATION	UINT64CONST(0xE000000000000005)
-#define PARALLEL_KEY_DSA				UINT64CONST(0xE000000000000006)
-#define PARALLEL_KEY_QUERY_TEXT		UINT64CONST(0xE000000000000007)
+#define PARALLEL_KEY_EXECUTOR_FIXED		UINT64CONST(0xE000000000000001)
+#define PARALLEL_KEY_PLANNEDSTMT		UINT64CONST(0xE000000000000002)
+#define PARALLEL_KEY_PARAMLISTINFO		UINT64CONST(0xE000000000000003)
+#define PARALLEL_KEY_BUFFER_USAGE		UINT64CONST(0xE000000000000004)
+#define PARALLEL_KEY_TUPLE_QUEUE		UINT64CONST(0xE000000000000005)
+#define PARALLEL_KEY_INSTRUMENTATION	UINT64CONST(0xE000000000000006)
+#define PARALLEL_KEY_DSA				UINT64CONST(0xE000000000000007)
+#define PARALLEL_KEY_QUERY_TEXT		UINT64CONST(0xE000000000000008)
 
 #define PARALLEL_TUPLE_QUEUE_SIZE		65536
 
+/*
+ * Fixed-size random stuff that we need to pass to parallel workers.
+ */
+typedef struct FixedParallelExecutorState
+{
+	int64		tuples_needed;	/* tuple bound, see ExecSetTupleBound */
+	dsa_pointer param_exec;
+	int			eflags;
+} FixedParallelExecutorState;
+
 /*
  * DSM structure for accumulating per-PlanState instrumentation.
  *
@@ -109,6 +127,8 @@ static bool ExecParallelInitializeDSM(PlanState *node,
 						  ExecParallelInitializeDSMContext *d);
 static shm_mq_handle **ExecParallelSetupTupleQueues(ParallelContext *pcxt,
 							 bool reinitialize);
+static bool ExecParallelReInitializeDSM(PlanState *planstate,
+							ParallelContext *pcxt);
 static bool ExecParallelRetrieveInstrumentation(PlanState *planstate,
 									SharedExecutorInstrumentation *instrumentation);
 
@@ -150,7 +170,7 @@ ExecSerializePlan(Plan *plan, EState *estate)
 	 */
 	pstmt = makeNode(PlannedStmt);
 	pstmt->commandType = CMD_SELECT;
-	pstmt->queryId = 0;
+	pstmt->queryId = UINT64CONST(0);
 	pstmt->hasReturning = false;
 	pstmt->hasModifyingCTE = false;
 	pstmt->canSetTag = true;
@@ -183,7 +203,7 @@ ExecSerializePlan(Plan *plan, EState *estate)
 	pstmt->rowMarks = NIL;
 	pstmt->relationOids = NIL;
 	pstmt->invalItems = NIL;	/* workers can't replan anyway... */
-	pstmt->nParamExec = estate->es_plannedstmt->nParamExec;
+	pstmt->paramExecTypes = estate->es_plannedstmt->paramExecTypes;
 	pstmt->utilityStmt = NULL;
 	pstmt->stmt_location = -1;
 	pstmt->stmt_len = -1;
@@ -193,10 +213,10 @@ ExecSerializePlan(Plan *plan, EState *estate)
 }
 
 /*
- * Ordinary plan nodes won't do anything here, but parallel-aware plan nodes
- * may need some state which is shared across all parallel workers.  Before
- * we size the DSM, give them a chance to call shm_toc_estimate_chunk or
- * shm_toc_estimate_keys on &pcxt->estimator.
+ * Parallel-aware plan nodes (and occasionally others) may need some state
+ * which is shared across all parallel workers.  Before we size the DSM, give
+ * them a chance to call shm_toc_estimate_chunk or shm_toc_estimate_keys on
+ * &pcxt->estimator.
  *
  * While we're at it, count the number of PlanState nodes in the tree, so
  * we know how many SharedPlanStateInstrumentation structures we need.
@@ -210,43 +230,191 @@ ExecParallelEstimate(PlanState *planstate, ExecParallelEstimateContext *e)
 	/* Count this node. */
 	e->nnodes++;
 
-	/* Call estimators for parallel-aware nodes. */
-	if (planstate->plan->parallel_aware)
+	switch (nodeTag(planstate))
 	{
-		switch (nodeTag(planstate))
-		{
-			case T_SeqScanState:
+		case T_SeqScanState:
+			if (planstate->plan->parallel_aware)
 				ExecSeqScanEstimate((SeqScanState *) planstate,
 									e->pcxt);
-				break;
-			case T_IndexScanState:
+			break;
+		case T_IndexScanState:
+			if (planstate->plan->parallel_aware)
 				ExecIndexScanEstimate((IndexScanState *) planstate,
 									  e->pcxt);
-				break;
-			case T_IndexOnlyScanState:
+			break;
+		case T_IndexOnlyScanState:
+			if (planstate->plan->parallel_aware)
 				ExecIndexOnlyScanEstimate((IndexOnlyScanState *) planstate,
 										  e->pcxt);
-				break;
-			case T_ForeignScanState:
+			break;
+		case T_ForeignScanState:
+			if (planstate->plan->parallel_aware)
 				ExecForeignScanEstimate((ForeignScanState *) planstate,
 										e->pcxt);
-				break;
-			case T_CustomScanState:
+			break;
+		case T_AppendState:
+			if (planstate->plan->parallel_aware)
+				ExecAppendEstimate((AppendState *) planstate,
+								   e->pcxt);
+			break;
+		case T_CustomScanState:
+			if (planstate->plan->parallel_aware)
 				ExecCustomScanEstimate((CustomScanState *) planstate,
 									   e->pcxt);
-				break;
-			case T_BitmapHeapScanState:
+			break;
+		case T_BitmapHeapScanState:
+			if (planstate->plan->parallel_aware)
 				ExecBitmapHeapEstimate((BitmapHeapScanState *) planstate,
 									   e->pcxt);
-				break;
-			default:
-				break;
-		}
+			break;
+		case T_HashJoinState:
+			if (planstate->plan->parallel_aware)
+				ExecHashJoinEstimate((HashJoinState *) planstate,
+									 e->pcxt);
+			break;
+		case T_HashState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecHashEstimate((HashState *) planstate, e->pcxt);
+			break;
+		case T_SortState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecSortEstimate((SortState *) planstate, e->pcxt);
+			break;
+
+		default:
+			break;
 	}
 
 	return planstate_tree_walker(planstate, ExecParallelEstimate, e);
 }
 
+/*
+ * Estimate the amount of space required to serialize the indicated parameters.
+ */
+static Size
+EstimateParamExecSpace(EState *estate, Bitmapset *params)
+{
+	int			paramid;
+	Size		sz = sizeof(int);
+
+	paramid = -1;
+	while ((paramid = bms_next_member(params, paramid)) >= 0)
+	{
+		Oid			typeOid;
+		int16		typLen;
+		bool		typByVal;
+		ParamExecData *prm;
+
+		prm = &(estate->es_param_exec_vals[paramid]);
+		typeOid = list_nth_oid(estate->es_plannedstmt->paramExecTypes,
+							   paramid);
+
+		sz = add_size(sz, sizeof(int)); /* space for paramid */
+
+		/* space for datum/isnull */
+		if (OidIsValid(typeOid))
+			get_typlenbyval(typeOid, &typLen, &typByVal);
+		else
+		{
+			/* If no type OID, assume by-value, like copyParamList does. */
+			typLen = sizeof(Datum);
+			typByVal = true;
+		}
+		sz = add_size(sz,
+					  datumEstimateSpace(prm->value, prm->isnull,
+										 typByVal, typLen));
+	}
+	return sz;
+}
+
+/*
+ * Serialize specified PARAM_EXEC parameters.
+ *
+ * We write the number of parameters first, as a 4-byte integer, and then
+ * write details for each parameter in turn.  The details for each parameter
+ * consist of a 4-byte paramid (location of param in execution time internal
+ * parameter array) and then the datum as serialized by datumSerialize().
+ */
+static dsa_pointer
+SerializeParamExecParams(EState *estate, Bitmapset *params, dsa_area *area)
+{
+	Size		size;
+	int			nparams;
+	int			paramid;
+	ParamExecData *prm;
+	dsa_pointer handle;
+	char	   *start_address;
+
+	/* Allocate enough space for the current parameter values. */
+	size = EstimateParamExecSpace(estate, params);
+	handle = dsa_allocate(area, size);
+	start_address = dsa_get_address(area, handle);
+
+	/* First write the number of parameters as a 4-byte integer. */
+	nparams = bms_num_members(params);
+	memcpy(start_address, &nparams, sizeof(int));
+	start_address += sizeof(int);
+
+	/* Write details for each parameter in turn. */
+	paramid = -1;
+	while ((paramid = bms_next_member(params, paramid)) >= 0)
+	{
+		Oid			typeOid;
+		int16		typLen;
+		bool		typByVal;
+
+		prm = &(estate->es_param_exec_vals[paramid]);
+		typeOid = list_nth_oid(estate->es_plannedstmt->paramExecTypes,
+							   paramid);
+
+		/* Write paramid. */
+		memcpy(start_address, &paramid, sizeof(int));
+		start_address += sizeof(int);
+
+		/* Write datum/isnull */
+		if (OidIsValid(typeOid))
+			get_typlenbyval(typeOid, &typLen, &typByVal);
+		else
+		{
+			/* If no type OID, assume by-value, like copyParamList does. */
+			typLen = sizeof(Datum);
+			typByVal = true;
+		}
+		datumSerialize(prm->value, prm->isnull, typByVal, typLen,
+					   &start_address);
+	}
+
+	return handle;
+}
+
+/*
+ * Restore specified PARAM_EXEC parameters.
+ */
+static void
+RestoreParamExecParams(char *start_address, EState *estate)
+{
+	int			nparams;
+	int			i;
+	int			paramid;
+
+	memcpy(&nparams, start_address, sizeof(int));
+	start_address += sizeof(int);
+
+	for (i = 0; i < nparams; i++)
+	{
+		ParamExecData *prm;
+
+		/* Read paramid */
+		memcpy(&paramid, start_address, sizeof(int));
+		start_address += sizeof(int);
+		prm = &(estate->es_param_exec_vals[paramid]);
+
+		/* Read datum/isnull. */
+		prm->value = datumRestore(&start_address, &prm->isnull);
+		prm->execPlan = NULL;
+	}
+}
+
 /*
  * Initialize the dynamic shared memory segment that will be used to control
  * parallel execution.
@@ -267,46 +435,67 @@ ExecParallelInitializeDSM(PlanState *planstate,
 	d->nnodes++;
 
 	/*
-	 * Call initializers for parallel-aware plan nodes.
+	 * Call initializers for DSM-using plan nodes.
 	 *
-	 * Ordinary plan nodes won't do anything here, but parallel-aware plan
-	 * nodes may need to initialize shared state in the DSM before parallel
-	 * workers are available.  They can allocate the space they previously
+	 * Most plan nodes won't do anything here, but plan nodes that allocated
+	 * DSM may need to initialize shared state in the DSM before parallel
+	 * workers are launched.  They can allocate the space they previously
 	 * estimated using shm_toc_allocate, and add the keys they previously
 	 * estimated using shm_toc_insert, in each case targeting pcxt->toc.
 	 */
-	if (planstate->plan->parallel_aware)
+	switch (nodeTag(planstate))
 	{
-		switch (nodeTag(planstate))
-		{
-			case T_SeqScanState:
+		case T_SeqScanState:
+			if (planstate->plan->parallel_aware)
 				ExecSeqScanInitializeDSM((SeqScanState *) planstate,
 										 d->pcxt);
-				break;
-			case T_IndexScanState:
+			break;
+		case T_IndexScanState:
+			if (planstate->plan->parallel_aware)
 				ExecIndexScanInitializeDSM((IndexScanState *) planstate,
 										   d->pcxt);
-				break;
-			case T_IndexOnlyScanState:
+			break;
+		case T_IndexOnlyScanState:
+			if (planstate->plan->parallel_aware)
 				ExecIndexOnlyScanInitializeDSM((IndexOnlyScanState *) planstate,
 											   d->pcxt);
-				break;
-			case T_ForeignScanState:
+			break;
+		case T_ForeignScanState:
+			if (planstate->plan->parallel_aware)
 				ExecForeignScanInitializeDSM((ForeignScanState *) planstate,
 											 d->pcxt);
-				break;
-			case T_CustomScanState:
+			break;
+		case T_AppendState:
+			if (planstate->plan->parallel_aware)
+				ExecAppendInitializeDSM((AppendState *) planstate,
+										d->pcxt);
+			break;
+		case T_CustomScanState:
+			if (planstate->plan->parallel_aware)
 				ExecCustomScanInitializeDSM((CustomScanState *) planstate,
 											d->pcxt);
-				break;
-			case T_BitmapHeapScanState:
+			break;
+		case T_BitmapHeapScanState:
+			if (planstate->plan->parallel_aware)
 				ExecBitmapHeapInitializeDSM((BitmapHeapScanState *) planstate,
 											d->pcxt);
-				break;
+			break;
+		case T_HashJoinState:
+			if (planstate->plan->parallel_aware)
+				ExecHashJoinInitializeDSM((HashJoinState *) planstate,
+										  d->pcxt);
+			break;
+		case T_HashState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecHashInitializeDSM((HashState *) planstate, d->pcxt);
+			break;
+		case T_SortState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecSortInitializeDSM((SortState *) planstate, d->pcxt);
+			break;
 
-			default:
-				break;
-		}
+		default:
+			break;
 	}
 
 	return planstate_tree_walker(planstate, ExecParallelInitializeDSM, d);
@@ -364,42 +553,36 @@ ExecParallelSetupTupleQueues(ParallelContext *pcxt, bool reinitialize)
 	return responseq;
 }
 
-/*
- * Re-initialize the parallel executor info such that it can be reused by
- * workers.
- */
-void
-ExecParallelReinitialize(ParallelExecutorInfo *pei)
-{
-	ReinitializeParallelDSM(pei->pcxt);
-	pei->tqueue = ExecParallelSetupTupleQueues(pei->pcxt, true);
-	pei->finished = false;
-}
-
 /*
  * Sets up the required infrastructure for backend workers to perform
  * execution and return results to the main backend.
  */
 ParallelExecutorInfo *
-ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
+ExecInitParallelPlan(PlanState *planstate, EState *estate,
+					 Bitmapset *sendParams, int nworkers,
+					 int64 tuples_needed)
 {
 	ParallelExecutorInfo *pei;
 	ParallelContext *pcxt;
 	ExecParallelEstimateContext e;
 	ExecParallelInitializeDSMContext d;
+	FixedParallelExecutorState *fpes;
 	char	   *pstmt_data;
 	char	   *pstmt_space;
-	char	   *param_space;
+	char	   *paramlistinfo_space;
 	BufferUsage *bufusage_space;
 	SharedExecutorInstrumentation *instrumentation = NULL;
 	int			pstmt_len;
-	int			param_len;
+	int			paramlistinfo_len;
 	int			instrumentation_len = 0;
 	int			instrument_offset = 0;
 	Size		dsa_minsize = dsa_minimum_size();
 	char	   *query_string;
 	int			query_len;
 
+	/* Force parameters we're going to pass to workers to be evaluated. */
+	ExecEvalParamExecParams(sendParams, estate);
+
 	/* Allocate object for return value. */
 	pei = palloc0(sizeof(ParallelExecutorInfo));
 	pei->finished = false;
@@ -409,7 +592,7 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	pstmt_data = ExecSerializePlan(planstate->plan, estate);
 
 	/* Create a parallel context. */
-	pcxt = CreateParallelContext("postgres", "ParallelQueryMain", nworkers);
+	pcxt = CreateParallelContext("postgres", "ParallelQueryMain", nworkers, false);
 	pei->pcxt = pcxt;
 
 	/*
@@ -418,9 +601,14 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	 * for the various things we need to store.
 	 */
 
+	/* Estimate space for fixed-size state. */
+	shm_toc_estimate_chunk(&pcxt->estimator,
+						   sizeof(FixedParallelExecutorState));
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+
 	/* Estimate space for query text. */
 	query_len = strlen(estate->es_sourceText);
-	shm_toc_estimate_chunk(&pcxt->estimator, query_len);
+	shm_toc_estimate_chunk(&pcxt->estimator, query_len + 1);
 	shm_toc_estimate_keys(&pcxt->estimator, 1);
 
 	/* Estimate space for serialized PlannedStmt. */
@@ -429,8 +617,8 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	shm_toc_estimate_keys(&pcxt->estimator, 1);
 
 	/* Estimate space for serialized ParamListInfo. */
-	param_len = EstimateParamListSpace(estate->es_param_list_info);
-	shm_toc_estimate_chunk(&pcxt->estimator, param_len);
+	paramlistinfo_len = EstimateParamListSpace(estate->es_param_list_info);
+	shm_toc_estimate_chunk(&pcxt->estimator, paramlistinfo_len);
 	shm_toc_estimate_keys(&pcxt->estimator, 1);
 
 	/*
@@ -487,9 +675,16 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	 * asked for has been allocated or initialized yet, though, so do that.
 	 */
 
+	/* Store fixed-size state. */
+	fpes = shm_toc_allocate(pcxt->toc, sizeof(FixedParallelExecutorState));
+	fpes->tuples_needed = tuples_needed;
+	fpes->param_exec = InvalidDsaPointer;
+	fpes->eflags = estate->es_top_eflags;
+	shm_toc_insert(pcxt->toc, PARALLEL_KEY_EXECUTOR_FIXED, fpes);
+
 	/* Store query string */
-	query_string = shm_toc_allocate(pcxt->toc, query_len);
-	memcpy(query_string, estate->es_sourceText, query_len);
+	query_string = shm_toc_allocate(pcxt->toc, query_len + 1);
+	memcpy(query_string, estate->es_sourceText, query_len + 1);
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_QUERY_TEXT, query_string);
 
 	/* Store serialized PlannedStmt. */
@@ -498,9 +693,9 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_PLANNEDSTMT, pstmt_space);
 
 	/* Store serialized ParamListInfo. */
-	param_space = shm_toc_allocate(pcxt->toc, param_len);
-	shm_toc_insert(pcxt->toc, PARALLEL_KEY_PARAMS, param_space);
-	SerializeParamList(estate->es_param_list_info, &param_space);
+	paramlistinfo_space = shm_toc_allocate(pcxt->toc, paramlistinfo_len);
+	shm_toc_insert(pcxt->toc, PARALLEL_KEY_PARAMLISTINFO, paramlistinfo_space);
+	SerializeParamList(estate->es_param_list_info, &paramlistinfo_space);
 
 	/* Allocate space for each worker's BufferUsage; no need to initialize. */
 	bufusage_space = shm_toc_allocate(pcxt->toc,
@@ -508,9 +703,12 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	shm_toc_insert(pcxt->toc, PARALLEL_KEY_BUFFER_USAGE, bufusage_space);
 	pei->buffer_usage = bufusage_space;
 
-	/* Set up tuple queues. */
+	/* Set up the tuple queues that the workers will write into. */
 	pei->tqueue = ExecParallelSetupTupleQueues(pcxt, false);
 
+	/* We don't need the TupleQueueReaders yet, though. */
+	pei->reader = NULL;
+
 	/*
 	 * If instrumentation options were supplied, allocate space for the data.
 	 * It only gets partially initialized here; the rest happens during
@@ -548,13 +746,20 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 		pei->area = dsa_create_in_place(area_space, dsa_minsize,
 										LWTRANCHE_PARALLEL_QUERY_DSA,
 										pcxt->seg);
-	}
 
-	/*
-	 * Make the area available to executor nodes running in the leader.  See
-	 * also ParallelQueryMain which makes it available to workers.
-	 */
-	estate->es_query_dsa = pei->area;
+		/*
+		 * Serialize parameters, if any, using DSA storage.  We don't dare use
+		 * the main parallel query DSM for this because we might relaunch
+		 * workers after the values have changed (and thus the amount of
+		 * storage required has changed).
+		 */
+		if (!bms_is_empty(sendParams))
+		{
+			pei->param_exec = SerializeParamExecParams(estate, sendParams,
+													   pei->area);
+			fpes->param_exec = pei->param_exec;
+		}
+	}
 
 	/*
 	 * Give parallel-aware nodes a chance to initialize their shared data.
@@ -564,10 +769,14 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	d.pcxt = pcxt;
 	d.instrumentation = instrumentation;
 	d.nnodes = 0;
+
+	/* Install our DSA area while initializing the plan. */
+	estate->es_query_dsa = pei->area;
 	ExecParallelInitializeDSM(planstate, &d);
+	estate->es_query_dsa = NULL;
 
 	/*
-	 * Make sure that the world hasn't shifted under our feat.  This could
+	 * Make sure that the world hasn't shifted under our feet.  This could
 	 * probably just be an Assert(), but let's be conservative for now.
 	 */
 	if (e.nnodes != d.nnodes)
@@ -577,6 +786,146 @@ ExecInitParallelPlan(PlanState *planstate, EState *estate, int nworkers)
 	return pei;
 }
 
+/*
+ * Set up tuple queue readers to read the results of a parallel subplan.
+ *
+ * This is separate from ExecInitParallelPlan() because we can launch the
+ * worker processes and let them start doing something before we do this.
+ */
+void
+ExecParallelCreateReaders(ParallelExecutorInfo *pei)
+{
+	int			nworkers = pei->pcxt->nworkers_launched;
+	int			i;
+
+	Assert(pei->reader == NULL);
+
+	if (nworkers > 0)
+	{
+		pei->reader = (TupleQueueReader **)
+			palloc(nworkers * sizeof(TupleQueueReader *));
+
+		for (i = 0; i < nworkers; i++)
+		{
+			shm_mq_set_handle(pei->tqueue[i],
+							  pei->pcxt->worker[i].bgwhandle);
+			pei->reader[i] = CreateTupleQueueReader(pei->tqueue[i]);
+		}
+	}
+}
+
+/*
+ * Re-initialize the parallel executor shared memory state before launching
+ * a fresh batch of workers.
+ */
+void
+ExecParallelReinitialize(PlanState *planstate,
+						 ParallelExecutorInfo *pei,
+						 Bitmapset *sendParams)
+{
+	EState	   *estate = planstate->state;
+	FixedParallelExecutorState *fpes;
+
+	/* Old workers must already be shut down */
+	Assert(pei->finished);
+
+	/* Force parameters we're going to pass to workers to be evaluated. */
+	ExecEvalParamExecParams(sendParams, estate);
+
+	ReinitializeParallelDSM(pei->pcxt);
+	pei->tqueue = ExecParallelSetupTupleQueues(pei->pcxt, true);
+	pei->reader = NULL;
+	pei->finished = false;
+
+	fpes = shm_toc_lookup(pei->pcxt->toc, PARALLEL_KEY_EXECUTOR_FIXED, false);
+
+	/* Free any serialized parameters from the last round. */
+	if (DsaPointerIsValid(fpes->param_exec))
+	{
+		dsa_free(pei->area, fpes->param_exec);
+		fpes->param_exec = InvalidDsaPointer;
+	}
+
+	/* Serialize current parameter values if required. */
+	if (!bms_is_empty(sendParams))
+	{
+		pei->param_exec = SerializeParamExecParams(estate, sendParams,
+												   pei->area);
+		fpes->param_exec = pei->param_exec;
+	}
+
+	/* Traverse plan tree and let each child node reset associated state. */
+	estate->es_query_dsa = pei->area;
+	ExecParallelReInitializeDSM(planstate, pei->pcxt);
+	estate->es_query_dsa = NULL;
+}
+
+/*
+ * Traverse plan tree to reinitialize per-node dynamic shared memory state
+ */
+static bool
+ExecParallelReInitializeDSM(PlanState *planstate,
+							ParallelContext *pcxt)
+{
+	if (planstate == NULL)
+		return false;
+
+	/*
+	 * Call reinitializers for DSM-using plan nodes.
+	 */
+	switch (nodeTag(planstate))
+	{
+		case T_SeqScanState:
+			if (planstate->plan->parallel_aware)
+				ExecSeqScanReInitializeDSM((SeqScanState *) planstate,
+										   pcxt);
+			break;
+		case T_IndexScanState:
+			if (planstate->plan->parallel_aware)
+				ExecIndexScanReInitializeDSM((IndexScanState *) planstate,
+											 pcxt);
+			break;
+		case T_IndexOnlyScanState:
+			if (planstate->plan->parallel_aware)
+				ExecIndexOnlyScanReInitializeDSM((IndexOnlyScanState *) planstate,
+												 pcxt);
+			break;
+		case T_ForeignScanState:
+			if (planstate->plan->parallel_aware)
+				ExecForeignScanReInitializeDSM((ForeignScanState *) planstate,
+											   pcxt);
+			break;
+		case T_AppendState:
+			if (planstate->plan->parallel_aware)
+				ExecAppendReInitializeDSM((AppendState *) planstate, pcxt);
+			break;
+		case T_CustomScanState:
+			if (planstate->plan->parallel_aware)
+				ExecCustomScanReInitializeDSM((CustomScanState *) planstate,
+											  pcxt);
+			break;
+		case T_BitmapHeapScanState:
+			if (planstate->plan->parallel_aware)
+				ExecBitmapHeapReInitializeDSM((BitmapHeapScanState *) planstate,
+											  pcxt);
+			break;
+		case T_HashJoinState:
+			if (planstate->plan->parallel_aware)
+				ExecHashJoinReInitializeDSM((HashJoinState *) planstate,
+											pcxt);
+			break;
+		case T_HashState:
+		case T_SortState:
+			/* these nodes have DSM state, but no reinitialization is required */
+			break;
+
+		default:
+			break;
+	}
+
+	return planstate_tree_walker(planstate, ExecParallelReInitializeDSM, pcxt);
+}
+
 /*
  * Copy instrumentation information about this node and its descendants from
  * dynamic shared memory.
@@ -621,46 +970,94 @@ ExecParallelRetrieveInstrumentation(PlanState *planstate,
 	planstate->worker_instrument->num_workers = instrumentation->num_workers;
 	memcpy(&planstate->worker_instrument->instrument, instrument, ibytes);
 
+	/* Perform any node-type-specific work that needs to be done. */
+	switch (nodeTag(planstate))
+	{
+		case T_SortState:
+			ExecSortRetrieveInstrumentation((SortState *) planstate);
+			break;
+		case T_HashState:
+			ExecHashRetrieveInstrumentation((HashState *) planstate);
+			break;
+		default:
+			break;
+	}
+
 	return planstate_tree_walker(planstate, ExecParallelRetrieveInstrumentation,
 								 instrumentation);
 }
 
 /*
  * Finish parallel execution.  We wait for parallel workers to finish, and
- * accumulate their buffer usage and instrumentation.
+ * accumulate their buffer usage.
  */
 void
 ExecParallelFinish(ParallelExecutorInfo *pei)
 {
+	int			nworkers = pei->pcxt->nworkers_launched;
 	int			i;
 
+	/* Make this be a no-op if called twice in a row. */
 	if (pei->finished)
 		return;
 
-	/* First, wait for the workers to finish. */
+	/*
+	 * Detach from tuple queues ASAP, so that any still-active workers will
+	 * notice that no further results are wanted.
+	 */
+	if (pei->tqueue != NULL)
+	{
+		for (i = 0; i < nworkers; i++)
+			shm_mq_detach(pei->tqueue[i]);
+		pfree(pei->tqueue);
+		pei->tqueue = NULL;
+	}
+
+	/*
+	 * While we're waiting for the workers to finish, let's get rid of the
+	 * tuple queue readers.  (Any other local cleanup could be done here too.)
+	 */
+	if (pei->reader != NULL)
+	{
+		for (i = 0; i < nworkers; i++)
+			DestroyTupleQueueReader(pei->reader[i]);
+		pfree(pei->reader);
+		pei->reader = NULL;
+	}
+
+	/* Now wait for the workers to finish. */
 	WaitForParallelWorkersToFinish(pei->pcxt);
 
-	/* Next, accumulate buffer usage. */
-	for (i = 0; i < pei->pcxt->nworkers_launched; ++i)
+	/*
+	 * Next, accumulate buffer usage.  (This must wait for the workers to
+	 * finish, or we might get incomplete data.)
+	 */
+	for (i = 0; i < nworkers; i++)
 		InstrAccumParallelQuery(&pei->buffer_usage[i]);
 
-	/* Finally, accumulate instrumentation, if any. */
-	if (pei->instrumentation)
-		ExecParallelRetrieveInstrumentation(pei->planstate,
-											pei->instrumentation);
-
 	pei->finished = true;
 }
 
 /*
- * Clean up whatever ParallelExecutorInfo resources still exist after
- * ExecParallelFinish.  We separate these routines because someone might
- * want to examine the contents of the DSM after ExecParallelFinish and
- * before calling this routine.
+ * Accumulate instrumentation, and then clean up whatever ParallelExecutorInfo
+ * resources still exist after ExecParallelFinish.  We separate these
+ * routines because someone might want to examine the contents of the DSM
+ * after ExecParallelFinish and before calling this routine.
  */
 void
 ExecParallelCleanup(ParallelExecutorInfo *pei)
 {
+	/* Accumulate instrumentation, if any. */
+	if (pei->instrumentation)
+		ExecParallelRetrieveInstrumentation(pei->planstate,
+											pei->instrumentation);
+
+	/* Free any serialized parameters. */
+	if (DsaPointerIsValid(pei->param_exec))
+	{
+		dsa_free(pei->area, pei->param_exec);
+		pei->param_exec = InvalidDsaPointer;
+	}
 	if (pei->area != NULL)
 	{
 		dsa_detach(pei->area);
@@ -712,7 +1109,7 @@ ExecParallelGetQueryDesc(shm_toc *toc, DestReceiver *receiver,
 	pstmt = (PlannedStmt *) stringToNode(pstmtspace);
 
 	/* Reconstruct ParamListInfo. */
-	paramspace = shm_toc_lookup(toc, PARALLEL_KEY_PARAMS, false);
+	paramspace = shm_toc_lookup(toc, PARALLEL_KEY_PARAMLISTINFO, false);
 	paramLI = RestoreParamList(&paramspace);
 
 	/*
@@ -775,43 +1172,66 @@ ExecParallelReportInstrumentation(PlanState *planstate,
  * is allocated and initialized by executor; that is, after ExecutorStart().
  */
 static bool
-ExecParallelInitializeWorker(PlanState *planstate, shm_toc *toc)
+ExecParallelInitializeWorker(PlanState *planstate, ParallelWorkerContext *pwcxt)
 {
 	if (planstate == NULL)
 		return false;
 
-	/* Call initializers for parallel-aware plan nodes. */
-	if (planstate->plan->parallel_aware)
+	switch (nodeTag(planstate))
 	{
-		switch (nodeTag(planstate))
-		{
-			case T_SeqScanState:
-				ExecSeqScanInitializeWorker((SeqScanState *) planstate, toc);
-				break;
-			case T_IndexScanState:
-				ExecIndexScanInitializeWorker((IndexScanState *) planstate, toc);
-				break;
-			case T_IndexOnlyScanState:
-				ExecIndexOnlyScanInitializeWorker((IndexOnlyScanState *) planstate, toc);
-				break;
-			case T_ForeignScanState:
+		case T_SeqScanState:
+			if (planstate->plan->parallel_aware)
+				ExecSeqScanInitializeWorker((SeqScanState *) planstate, pwcxt);
+			break;
+		case T_IndexScanState:
+			if (planstate->plan->parallel_aware)
+				ExecIndexScanInitializeWorker((IndexScanState *) planstate,
+											  pwcxt);
+			break;
+		case T_IndexOnlyScanState:
+			if (planstate->plan->parallel_aware)
+				ExecIndexOnlyScanInitializeWorker((IndexOnlyScanState *) planstate,
+												  pwcxt);
+			break;
+		case T_ForeignScanState:
+			if (planstate->plan->parallel_aware)
 				ExecForeignScanInitializeWorker((ForeignScanState *) planstate,
-												toc);
-				break;
-			case T_CustomScanState:
+												pwcxt);
+			break;
+		case T_AppendState:
+			if (planstate->plan->parallel_aware)
+				ExecAppendInitializeWorker((AppendState *) planstate, pwcxt);
+			break;
+		case T_CustomScanState:
+			if (planstate->plan->parallel_aware)
 				ExecCustomScanInitializeWorker((CustomScanState *) planstate,
-											   toc);
-				break;
-			case T_BitmapHeapScanState:
-				ExecBitmapHeapInitializeWorker(
-											   (BitmapHeapScanState *) planstate, toc);
-				break;
-			default:
-				break;
-		}
+											   pwcxt);
+			break;
+		case T_BitmapHeapScanState:
+			if (planstate->plan->parallel_aware)
+				ExecBitmapHeapInitializeWorker((BitmapHeapScanState *) planstate,
+											   pwcxt);
+			break;
+		case T_HashJoinState:
+			if (planstate->plan->parallel_aware)
+				ExecHashJoinInitializeWorker((HashJoinState *) planstate,
+											 pwcxt);
+			break;
+		case T_HashState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecHashInitializeWorker((HashState *) planstate, pwcxt);
+			break;
+		case T_SortState:
+			/* even when not parallel-aware, for EXPLAIN ANALYZE */
+			ExecSortInitializeWorker((SortState *) planstate, pwcxt);
+			break;
+
+		default:
+			break;
 	}
 
-	return planstate_tree_walker(planstate, ExecParallelInitializeWorker, toc);
+	return planstate_tree_walker(planstate, ExecParallelInitializeWorker,
+								 pwcxt);
 }
 
 /*
@@ -833,6 +1253,7 @@ ExecParallelInitializeWorker(PlanState *planstate, shm_toc *toc)
 void
 ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
 {
+	FixedParallelExecutorState *fpes;
 	BufferUsage *buffer_usage;
 	DestReceiver *receiver;
 	QueryDesc  *queryDesc;
@@ -840,6 +1261,10 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
 	int			instrument_options = 0;
 	void	   *area_space;
 	dsa_area   *area;
+	ParallelWorkerContext pwcxt;
+
+	/* Get fixed-size state. */
+	fpes = shm_toc_lookup(toc, PARALLEL_KEY_EXECUTOR_FIXED, false);
 
 	/* Set up DestReceiver, SharedExecutorInstrumentation, and QueryDesc. */
 	receiver = ExecParallelGetReceiver(seg, toc);
@@ -862,14 +1287,33 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
 	area = dsa_attach_in_place(area_space, seg);
 
 	/* Start up the executor */
-	ExecutorStart(queryDesc, 0);
+	ExecutorStart(queryDesc, fpes->eflags);
 
 	/* Special executor initialization steps for parallel workers */
 	queryDesc->planstate->state->es_query_dsa = area;
-	ExecParallelInitializeWorker(queryDesc->planstate, toc);
+	if (DsaPointerIsValid(fpes->param_exec))
+	{
+		char	   *paramexec_space;
 
-	/* Run the plan */
-	ExecutorRun(queryDesc, ForwardScanDirection, 0L, true);
+		paramexec_space = dsa_get_address(area, fpes->param_exec);
+		RestoreParamExecParams(paramexec_space, queryDesc->estate);
+
+	}
+	pwcxt.toc = toc;
+	pwcxt.seg = seg;
+	ExecParallelInitializeWorker(queryDesc->planstate, &pwcxt);
+
+	/* Pass down any tuple bound */
+	ExecSetTupleBound(fpes->tuples_needed, queryDesc->planstate);
+
+	/*
+	 * Run the plan.  If we specified a tuple bound, be careful not to demand
+	 * more tuples than that.
+	 */
+	ExecutorRun(queryDesc,
+				ForwardScanDirection,
+				fpes->tuples_needed < 0 ? (int64) 0 : fpes->tuples_needed,
+				true);
 
 	/* Shut down the executor */
 	ExecutorFinish(queryDesc);
@@ -889,5 +1333,5 @@ ParallelQueryMain(dsm_segment *seg, shm_toc *toc)
 	/* Cleanup. */
 	dsa_detach(area);
 	FreeQueryDesc(queryDesc);
-	(*receiver->rDestroy) (receiver);
+	receiver->rDestroy(receiver);
 }
diff --git a/src/backend/executor/execPartition.c b/src/backend/executor/execPartition.c
new file mode 100644
index 0000000000..54efc9e545
--- /dev/null
+++ b/src/backend/executor/execPartition.c
@@ -0,0 +1,948 @@
+/*-------------------------------------------------------------------------
+ *
+ * execPartition.c
+ *	  Support routines for partitioning.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/executor/execPartition.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "catalog/pg_inherits_fn.h"
+#include "executor/execPartition.h"
+#include "executor/executor.h"
+#include "mb/pg_wchar.h"
+#include "miscadmin.h"
+#include "utils/lsyscache.h"
+#include "utils/rls.h"
+#include "utils/ruleutils.h"
+
+static PartitionDispatch *RelationGetPartitionDispatchInfo(Relation rel,
+								 int *num_parted, List **leaf_part_oids);
+static void get_partition_dispatch_recurse(Relation rel, Relation parent,
+							   List **pds, List **leaf_part_oids);
+static void FormPartitionKeyDatum(PartitionDispatch pd,
+					  TupleTableSlot *slot,
+					  EState *estate,
+					  Datum *values,
+					  bool *isnull);
+static char *ExecBuildSlotPartitionKeyDescription(Relation rel,
+									 Datum *values,
+									 bool *isnull,
+									 int maxfieldlen);
+
+/*
+ * ExecSetupPartitionTupleRouting - sets up information needed during
+ * tuple routing for partitioned tables, encapsulates it in
+ * PartitionTupleRouting, and returns it.
+ *
+ * Note that all the relations in the partition tree are locked using the
+ * RowExclusiveLock mode upon return from this function.
+ *
+ * While we allocate the arrays of pointers of ResultRelInfo and
+ * TupleConversionMap for all partitions here, actual objects themselves are
+ * lazily allocated for a given partition if a tuple is actually routed to it;
+ * see ExecInitPartitionInfo.  However, if the function is invoked for update
+ * tuple routing, caller would already have initialized ResultRelInfo's for
+ * some of the partitions, which are reused and assigned to their respective
+ * slot in the aforementioned array.
+ */
+PartitionTupleRouting *
+ExecSetupPartitionTupleRouting(ModifyTableState *mtstate, Relation rel)
+{
+	TupleDesc	tupDesc = RelationGetDescr(rel);
+	List	   *leaf_parts;
+	ListCell   *cell;
+	int			i;
+	ResultRelInfo *update_rri = NULL;
+	int			num_update_rri = 0,
+				update_rri_index = 0;
+	PartitionTupleRouting *proute;
+
+	/*
+	 * Get the information about the partition tree after locking all the
+	 * partitions.
+	 */
+	(void) find_all_inheritors(RelationGetRelid(rel), RowExclusiveLock, NULL);
+	proute = (PartitionTupleRouting *) palloc0(sizeof(PartitionTupleRouting));
+	proute->partition_dispatch_info =
+		RelationGetPartitionDispatchInfo(rel, &proute->num_dispatch,
+										 &leaf_parts);
+	proute->num_partitions = list_length(leaf_parts);
+	proute->partitions = (ResultRelInfo **) palloc(proute->num_partitions *
+												   sizeof(ResultRelInfo *));
+	proute->parent_child_tupconv_maps =
+		(TupleConversionMap **) palloc0(proute->num_partitions *
+										sizeof(TupleConversionMap *));
+	proute->partition_oids = (Oid *) palloc(proute->num_partitions *
+											sizeof(Oid));
+
+	/* Set up details specific to the type of tuple routing we are doing. */
+	if (mtstate && mtstate->operation == CMD_UPDATE)
+	{
+		ModifyTable *node = (ModifyTable *) mtstate->ps.plan;
+
+		update_rri = mtstate->resultRelInfo;
+		num_update_rri = list_length(node->plans);
+		proute->subplan_partition_offsets =
+			palloc(num_update_rri * sizeof(int));
+		proute->num_subplan_partition_offsets = num_update_rri;
+
+		/*
+		 * We need an additional tuple slot for storing transient tuples that
+		 * are converted to the root table descriptor.
+		 */
+		proute->root_tuple_slot = MakeTupleTableSlot(NULL);
+	}
+
+	/*
+	 * Initialize an empty slot that will be used to manipulate tuples of any
+	 * given partition's rowtype.  It is attached to the caller-specified node
+	 * (such as ModifyTableState) and released when the node finishes
+	 * processing.
+	 */
+	proute->partition_tuple_slot = MakeTupleTableSlot(NULL);
+
+	i = 0;
+	foreach(cell, leaf_parts)
+	{
+		ResultRelInfo *leaf_part_rri = NULL;
+		Oid			leaf_oid = lfirst_oid(cell);
+
+		proute->partition_oids[i] = leaf_oid;
+
+		/*
+		 * If the leaf partition is already present in the per-subplan result
+		 * rels, we re-use that rather than initialize a new result rel. The
+		 * per-subplan resultrels and the resultrels of the leaf partitions
+		 * are both in the same canonical order. So while going through the
+		 * leaf partition oids, we need to keep track of the next per-subplan
+		 * result rel to be looked for in the leaf partition resultrels.
+		 */
+		if (update_rri_index < num_update_rri &&
+			RelationGetRelid(update_rri[update_rri_index].ri_RelationDesc) == leaf_oid)
+		{
+			Relation	partrel;
+			TupleDesc	part_tupdesc;
+
+			leaf_part_rri = &update_rri[update_rri_index];
+			partrel = leaf_part_rri->ri_RelationDesc;
+
+			/*
+			 * This is required in order to convert the partition's tuple to
+			 * be compatible with the root partitioned table's tuple
+			 * descriptor.  When generating the per-subplan result rels, this
+			 * was not set.
+			 */
+			leaf_part_rri->ri_PartitionRoot = rel;
+
+			/* Remember the subplan offset for this ResultRelInfo */
+			proute->subplan_partition_offsets[update_rri_index] = i;
+
+			update_rri_index++;
+
+			part_tupdesc = RelationGetDescr(partrel);
+
+			/*
+			 * Save a tuple conversion map to convert a tuple routed to this
+			 * partition from the parent's type to the partition's.
+			 */
+			proute->parent_child_tupconv_maps[i] =
+				convert_tuples_by_name(tupDesc, part_tupdesc,
+									   gettext_noop("could not convert row type"));
+
+			/*
+			 * Verify result relation is a valid target for an INSERT.  An
+			 * UPDATE of a partition-key becomes a DELETE+INSERT operation, so
+			 * this check is required even when the operation is CMD_UPDATE.
+			 */
+			CheckValidResultRel(leaf_part_rri, CMD_INSERT);
+		}
+
+		proute->partitions[i] = leaf_part_rri;
+		i++;
+	}
+
+	/*
+	 * For UPDATE, we should have found all the per-subplan resultrels in the
+	 * leaf partitions.  (If this is an INSERT, both values will be zero.)
+	 */
+	Assert(update_rri_index == num_update_rri);
+
+	return proute;
+}
+
+/*
+ * ExecFindPartition -- Find a leaf partition in the partition tree rooted
+ * at parent, for the heap tuple contained in *slot
+ *
+ * estate must be non-NULL; we'll need it to compute any expressions in the
+ * partition key(s)
+ *
+ * If no leaf partition is found, this routine errors out with the appropriate
+ * error message, else it returns the leaf partition sequence number
+ * as an index into the array of (ResultRelInfos of) all leaf partitions in
+ * the partition tree.
+ */
+int
+ExecFindPartition(ResultRelInfo *resultRelInfo, PartitionDispatch *pd,
+				  TupleTableSlot *slot, EState *estate)
+{
+	int			result;
+	Datum		values[PARTITION_MAX_KEYS];
+	bool		isnull[PARTITION_MAX_KEYS];
+	Relation	rel;
+	PartitionDispatch parent;
+	ExprContext *ecxt = GetPerTupleExprContext(estate);
+	TupleTableSlot *ecxt_scantuple_old = ecxt->ecxt_scantuple;
+
+	/*
+	 * First check the root table's partition constraint, if any.  No point in
+	 * routing the tuple if it doesn't belong in the root table itself.
+	 */
+	if (resultRelInfo->ri_PartitionCheck &&
+		!ExecPartitionCheck(resultRelInfo, slot, estate))
+		ExecPartitionCheckEmitError(resultRelInfo, slot, estate);
+
+	/* start with the root partitioned table */
+	parent = pd[0];
+	while (true)
+	{
+		PartitionDesc partdesc;
+		TupleTableSlot *myslot = parent->tupslot;
+		TupleConversionMap *map = parent->tupmap;
+		int			cur_index = -1;
+
+		rel = parent->reldesc;
+		partdesc = RelationGetPartitionDesc(rel);
+
+		/*
+		 * Convert the tuple to this parent's layout so that we can do certain
+		 * things we do below.
+		 */
+		if (myslot != NULL && map != NULL)
+		{
+			HeapTuple	tuple = ExecFetchSlotTuple(slot);
+
+			ExecClearTuple(myslot);
+			tuple = do_convert_tuple(tuple, map);
+			ExecStoreTuple(tuple, myslot, InvalidBuffer, true);
+			slot = myslot;
+		}
+
+		/*
+		 * Extract partition key from tuple. Expression evaluation machinery
+		 * that FormPartitionKeyDatum() invokes expects ecxt_scantuple to
+		 * point to the correct tuple slot.  The slot might have changed from
+		 * what was used for the parent table if the table of the current
+		 * partitioning level has different tuple descriptor from the parent.
+		 * So update ecxt_scantuple accordingly.
+		 */
+		ecxt->ecxt_scantuple = slot;
+		FormPartitionKeyDatum(parent, slot, estate, values, isnull);
+
+		/*
+		 * Nothing for get_partition_for_tuple() to do if there are no
+		 * partitions to begin with.
+		 */
+		if (partdesc->nparts == 0)
+		{
+			result = -1;
+			break;
+		}
+
+		cur_index = get_partition_for_tuple(rel, values, isnull);
+
+		/*
+		 * cur_index < 0 means we failed to find a partition of this parent.
+		 * cur_index >= 0 means we either found the leaf partition, or the
+		 * next parent to find a partition of.
+		 */
+		if (cur_index < 0)
+		{
+			result = -1;
+			break;
+		}
+		else if (parent->indexes[cur_index] >= 0)
+		{
+			result = parent->indexes[cur_index];
+			break;
+		}
+		else
+			parent = pd[-parent->indexes[cur_index]];
+	}
+
+	/* A partition was not found. */
+	if (result < 0)
+	{
+		char	   *val_desc;
+
+		val_desc = ExecBuildSlotPartitionKeyDescription(rel,
+														values, isnull, 64);
+		Assert(OidIsValid(RelationGetRelid(rel)));
+		ereport(ERROR,
+				(errcode(ERRCODE_CHECK_VIOLATION),
+				 errmsg("no partition of relation \"%s\" found for row",
+						RelationGetRelationName(rel)),
+				 val_desc ? errdetail("Partition key of the failing row contains %s.", val_desc) : 0));
+	}
+
+	ecxt->ecxt_scantuple = ecxt_scantuple_old;
+	return result;
+}
+
+/*
+ * ExecInitPartitionInfo
+ *		Initialize ResultRelInfo and other information for a partition if not
+ *		already done
+ *
+ * Returns the ResultRelInfo
+ */
+ResultRelInfo *
+ExecInitPartitionInfo(ModifyTableState *mtstate,
+					  ResultRelInfo *resultRelInfo,
+					  PartitionTupleRouting *proute,
+					  EState *estate, int partidx)
+{
+	Relation	rootrel = resultRelInfo->ri_RelationDesc,
+				partrel;
+	ResultRelInfo *leaf_part_rri;
+	ModifyTable *node = mtstate ? (ModifyTable *) mtstate->ps.plan : NULL;
+	MemoryContext oldContext;
+
+	/*
+	 * We locked all the partitions in ExecSetupPartitionTupleRouting
+	 * including the leaf partitions.
+	 */
+	partrel = heap_open(proute->partition_oids[partidx], NoLock);
+
+	/*
+	 * Keep ResultRelInfo and other information for this partition in the
+	 * per-query memory context so they'll survive throughout the query.
+	 */
+	oldContext = MemoryContextSwitchTo(estate->es_query_cxt);
+
+	leaf_part_rri = (ResultRelInfo *) palloc0(sizeof(ResultRelInfo));
+	InitResultRelInfo(leaf_part_rri,
+					  partrel,
+					  node ? node->nominalRelation : 1,
+					  rootrel,
+					  estate->es_instrument);
+
+	/*
+	 * Verify result relation is a valid target for an INSERT.  An UPDATE of a
+	 * partition-key becomes a DELETE+INSERT operation, so this check is still
+	 * required when the operation is CMD_UPDATE.
+	 */
+	CheckValidResultRel(leaf_part_rri, CMD_INSERT);
+
+	/*
+	 * Since we've just initialized this ResultRelInfo, it's not in any list
+	 * attached to the estate as yet.  Add it, so that it can be found later.
+	 *
+	 * Note that the entries in this list appear in no predetermined order,
+	 * because partition result rels are initialized as and when they're
+	 * needed.
+	 */
+	estate->es_tuple_routing_result_relations =
+		lappend(estate->es_tuple_routing_result_relations,
+				leaf_part_rri);
+
+	/*
+	 * Open partition indices.  The user may have asked to check for conflicts
+	 * within this leaf partition and do "nothing" instead of throwing an
+	 * error.  Be prepared in that case by initializing the index information
+	 * needed by ExecInsert() to perform speculative insertions.
+	 */
+	if (partrel->rd_rel->relhasindex &&
+		leaf_part_rri->ri_IndexRelationDescs == NULL)
+		ExecOpenIndices(leaf_part_rri,
+						(mtstate != NULL &&
+						 mtstate->mt_onconflict != ONCONFLICT_NONE));
+
+	/*
+	 * Build WITH CHECK OPTION constraints for the partition.  Note that we
+	 * didn't build the withCheckOptionList for partitions within the planner,
+	 * but simple translation of varattnos will suffice.  This only occurs for
+	 * the INSERT case or in the case of UPDATE tuple routing where we didn't
+	 * find a result rel to reuse in ExecSetupPartitionTupleRouting().
+	 */
+	if (node && node->withCheckOptionLists != NIL)
+	{
+		List	   *wcoList;
+		List	   *wcoExprs = NIL;
+		ListCell   *ll;
+		int			firstVarno = mtstate->resultRelInfo[0].ri_RangeTableIndex;
+		Relation	firstResultRel = mtstate->resultRelInfo[0].ri_RelationDesc;
+
+		/*
+		 * In the case of INSERT on a partitioned table, there is only one
+		 * plan.  Likewise, there is only one WCO list, not one per partition.
+		 * For UPDATE, there are as many WCO lists as there are plans.
+		 */
+		Assert((node->operation == CMD_INSERT &&
+				list_length(node->withCheckOptionLists) == 1 &&
+				list_length(node->plans) == 1) ||
+			   (node->operation == CMD_UPDATE &&
+				list_length(node->withCheckOptionLists) ==
+				list_length(node->plans)));
+
+		/*
+		 * Use the WCO list of the first plan as a reference to calculate
+		 * attno's for the WCO list of this partition.  In the INSERT case,
+		 * that refers to the root partitioned table, whereas in the UPDATE
+		 * tuple routing case, that refers to the first partition in the
+		 * mtstate->resultRelInfo array.  In any case, both that relation and
+		 * this partition should have the same columns, so we should be able
+		 * to map attributes successfully.
+		 */
+		wcoList = linitial(node->withCheckOptionLists);
+
+		/*
+		 * Convert Vars in it to contain this partition's attribute numbers.
+		 */
+		wcoList = map_partition_varattnos(wcoList, firstVarno,
+										  partrel, firstResultRel, NULL);
+		foreach(ll, wcoList)
+		{
+			WithCheckOption *wco = castNode(WithCheckOption, lfirst(ll));
+			ExprState  *wcoExpr = ExecInitQual(castNode(List, wco->qual),
+											   mtstate->mt_plans[0]);
+
+			wcoExprs = lappend(wcoExprs, wcoExpr);
+		}
+
+		leaf_part_rri->ri_WithCheckOptions = wcoList;
+		leaf_part_rri->ri_WithCheckOptionExprs = wcoExprs;
+	}
+
+	/*
+	 * Build the RETURNING projection for the partition.  Note that we didn't
+	 * build the returningList for partitions within the planner, but simple
+	 * translation of varattnos will suffice.  This only occurs for the INSERT
+	 * case or in the case of UPDATE tuple routing where we didn't find a
+	 * result rel to reuse in ExecSetupPartitionTupleRouting().
+	 */
+	if (node && node->returningLists != NIL)
+	{
+		TupleTableSlot *slot;
+		ExprContext *econtext;
+		List	   *returningList;
+		int			firstVarno = mtstate->resultRelInfo[0].ri_RangeTableIndex;
+		Relation	firstResultRel = mtstate->resultRelInfo[0].ri_RelationDesc;
+
+		/* See the comment above for WCO lists. */
+		Assert((node->operation == CMD_INSERT &&
+				list_length(node->returningLists) == 1 &&
+				list_length(node->plans) == 1) ||
+			   (node->operation == CMD_UPDATE &&
+				list_length(node->returningLists) ==
+				list_length(node->plans)));
+
+		/*
+		 * Use the RETURNING list of the first plan as a reference to
+		 * calculate attno's for the RETURNING list of this partition.  See
+		 * the comment above for WCO lists for more details on why this is
+		 * okay.
+		 */
+		returningList = linitial(node->returningLists);
+
+		/*
+		 * Convert Vars in it to contain this partition's attribute numbers.
+		 */
+		returningList = map_partition_varattnos(returningList, firstVarno,
+												partrel, firstResultRel,
+												NULL);
+
+		/*
+		 * Initialize the projection itself.
+		 *
+		 * Use the slot and the expression context that would have been set up
+		 * in ExecInitModifyTable() for projection's output.
+		 */
+		Assert(mtstate->ps.ps_ResultTupleSlot != NULL);
+		slot = mtstate->ps.ps_ResultTupleSlot;
+		Assert(mtstate->ps.ps_ExprContext != NULL);
+		econtext = mtstate->ps.ps_ExprContext;
+		leaf_part_rri->ri_projectReturning =
+			ExecBuildProjectionInfo(returningList, econtext, slot,
+									&mtstate->ps, RelationGetDescr(partrel));
+	}
+
+	Assert(proute->partitions[partidx] == NULL);
+	proute->partitions[partidx] = leaf_part_rri;
+
+	/*
+	 * Save a tuple conversion map to convert a tuple routed to this partition
+	 * from the parent's type to the partition's.
+	 */
+	proute->parent_child_tupconv_maps[partidx] =
+		convert_tuples_by_name(RelationGetDescr(rootrel),
+							   RelationGetDescr(partrel),
+							   gettext_noop("could not convert row type"));
+
+	MemoryContextSwitchTo(oldContext);
+
+	return leaf_part_rri;
+}
+
+/*
+ * ExecSetupChildParentMapForLeaf -- Initialize the per-leaf-partition
+ * child-to-root tuple conversion map array.
+ *
+ * This map is required for capturing transition tuples when the target table
+ * is a partitioned table. For a tuple that is routed by an INSERT or UPDATE,
+ * we need to convert it from the leaf partition to the target table
+ * descriptor.
+ */
+void
+ExecSetupChildParentMapForLeaf(PartitionTupleRouting *proute)
+{
+	Assert(proute != NULL);
+
+	/*
+	 * These array elements get filled up with maps on an on-demand basis.
+	 * Initially just set all of them to NULL.
+	 */
+	proute->child_parent_tupconv_maps =
+		(TupleConversionMap **) palloc0(sizeof(TupleConversionMap *) *
+										proute->num_partitions);
+
+	/* Same is the case for this array. All the values are set to false */
+	proute->child_parent_map_not_required =
+		(bool *) palloc0(sizeof(bool) * proute->num_partitions);
+}
+
+/*
+ * TupConvMapForLeaf -- Get the tuple conversion map for a given leaf partition
+ * index.
+ */
+TupleConversionMap *
+TupConvMapForLeaf(PartitionTupleRouting *proute,
+				  ResultRelInfo *rootRelInfo, int leaf_index)
+{
+	ResultRelInfo **resultRelInfos = proute->partitions;
+	TupleConversionMap **map;
+	TupleDesc	tupdesc;
+
+	/* Don't call this if we're not supposed to be using this type of map. */
+	Assert(proute->child_parent_tupconv_maps != NULL);
+
+	/* If it's already known that we don't need a map, return NULL. */
+	if (proute->child_parent_map_not_required[leaf_index])
+		return NULL;
+
+	/* If we've already got a map, return it. */
+	map = &proute->child_parent_tupconv_maps[leaf_index];
+	if (*map != NULL)
+		return *map;
+
+	/* No map yet; try to create one. */
+	tupdesc = RelationGetDescr(resultRelInfos[leaf_index]->ri_RelationDesc);
+	*map =
+		convert_tuples_by_name(tupdesc,
+							   RelationGetDescr(rootRelInfo->ri_RelationDesc),
+							   gettext_noop("could not convert row type"));
+
+	/* If it turns out no map is needed, remember for next time. */
+	proute->child_parent_map_not_required[leaf_index] = (*map == NULL);
+
+	return *map;
+}
+
+/*
+ * ConvertPartitionTupleSlot -- convenience function for tuple conversion.
+ * The tuple, if converted, is stored in new_slot, and *p_my_slot is
+ * updated to point to it.  new_slot typically should be one of the
+ * dedicated partition tuple slots. If map is NULL, *p_my_slot is not changed.
+ *
+ * Returns the converted tuple, unless map is NULL, in which case original
+ * tuple is returned unmodified.
+ */
+HeapTuple
+ConvertPartitionTupleSlot(TupleConversionMap *map,
+						  HeapTuple tuple,
+						  TupleTableSlot *new_slot,
+						  TupleTableSlot **p_my_slot)
+{
+	if (!map)
+		return tuple;
+
+	tuple = do_convert_tuple(tuple, map);
+
+	/*
+	 * Change the partition tuple slot descriptor, as per converted tuple.
+	 */
+	*p_my_slot = new_slot;
+	Assert(new_slot != NULL);
+	ExecSetSlotDescriptor(new_slot, map->outdesc);
+	ExecStoreTuple(tuple, new_slot, InvalidBuffer, true);
+
+	return tuple;
+}
+
+/*
+ * ExecCleanupTupleRouting -- Clean up objects allocated for partition tuple
+ * routing.
+ *
+ * Close all the partitioned tables, leaf partitions, and their indices.
+ */
+void
+ExecCleanupTupleRouting(PartitionTupleRouting *proute)
+{
+	int			i;
+	int			subplan_index = 0;
+
+	/*
+	 * Remember, proute->partition_dispatch_info[0] corresponds to the root
+	 * partitioned table, which we must not try to close, because it is the
+	 * main target table of the query that will be closed by callers such as
+	 * ExecEndPlan() or DoCopy(). Also, tupslot is NULL for the root
+	 * partitioned table.
+	 */
+	for (i = 1; i < proute->num_dispatch; i++)
+	{
+		PartitionDispatch pd = proute->partition_dispatch_info[i];
+
+		heap_close(pd->reldesc, NoLock);
+		ExecDropSingleTupleTableSlot(pd->tupslot);
+	}
+
+	for (i = 0; i < proute->num_partitions; i++)
+	{
+		ResultRelInfo *resultRelInfo = proute->partitions[i];
+
+		/* skip further processsing for uninitialized partitions */
+		if (resultRelInfo == NULL)
+			continue;
+
+		/*
+		 * If this result rel is one of the UPDATE subplan result rels, let
+		 * ExecEndPlan() close it. For INSERT or COPY,
+		 * proute->subplan_partition_offsets will always be NULL. Note that
+		 * the subplan_partition_offsets array and the partitions array have
+		 * the partitions in the same order. So, while we iterate over
+		 * partitions array, we also iterate over the
+		 * subplan_partition_offsets array in order to figure out which of the
+		 * result rels are present in the UPDATE subplans.
+		 */
+		if (proute->subplan_partition_offsets &&
+			subplan_index < proute->num_subplan_partition_offsets &&
+			proute->subplan_partition_offsets[subplan_index] == i)
+		{
+			subplan_index++;
+			continue;
+		}
+
+		ExecCloseIndices(resultRelInfo);
+		heap_close(resultRelInfo->ri_RelationDesc, NoLock);
+	}
+
+	/* Release the standalone partition tuple descriptors, if any */
+	if (proute->root_tuple_slot)
+		ExecDropSingleTupleTableSlot(proute->root_tuple_slot);
+	if (proute->partition_tuple_slot)
+		ExecDropSingleTupleTableSlot(proute->partition_tuple_slot);
+}
+
+/*
+ * RelationGetPartitionDispatchInfo
+ *		Returns information necessary to route tuples down a partition tree
+ *
+ * The number of elements in the returned array (that is, the number of
+ * PartitionDispatch objects for the partitioned tables in the partition tree)
+ * is returned in *num_parted and a list of the OIDs of all the leaf
+ * partitions of rel is returned in *leaf_part_oids.
+ *
+ * All the relations in the partition tree (including 'rel') must have been
+ * locked (using at least the AccessShareLock) by the caller.
+ */
+static PartitionDispatch *
+RelationGetPartitionDispatchInfo(Relation rel,
+								 int *num_parted, List **leaf_part_oids)
+{
+	List	   *pdlist = NIL;
+	PartitionDispatchData **pd;
+	ListCell   *lc;
+	int			i;
+
+	Assert(rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
+
+	*num_parted = 0;
+	*leaf_part_oids = NIL;
+
+	get_partition_dispatch_recurse(rel, NULL, &pdlist, leaf_part_oids);
+	*num_parted = list_length(pdlist);
+	pd = (PartitionDispatchData **) palloc(*num_parted *
+										   sizeof(PartitionDispatchData *));
+	i = 0;
+	foreach(lc, pdlist)
+	{
+		pd[i++] = lfirst(lc);
+	}
+
+	return pd;
+}
+
+/*
+ * get_partition_dispatch_recurse
+ *		Recursively expand partition tree rooted at rel
+ *
+ * As the partition tree is expanded in a depth-first manner, we maintain two
+ * global lists: of PartitionDispatch objects corresponding to partitioned
+ * tables in *pds and of the leaf partition OIDs in *leaf_part_oids.
+ *
+ * Note that the order of OIDs of leaf partitions in leaf_part_oids matches
+ * the order in which the planner's expand_partitioned_rtentry() processes
+ * them.  It's not necessarily the case that the offsets match up exactly,
+ * because constraint exclusion might prune away some partitions on the
+ * planner side, whereas we'll always have the complete list; but unpruned
+ * partitions will appear in the same order in the plan as they are returned
+ * here.
+ */
+static void
+get_partition_dispatch_recurse(Relation rel, Relation parent,
+							   List **pds, List **leaf_part_oids)
+{
+	TupleDesc	tupdesc = RelationGetDescr(rel);
+	PartitionDesc partdesc = RelationGetPartitionDesc(rel);
+	PartitionKey partkey = RelationGetPartitionKey(rel);
+	PartitionDispatch pd;
+	int			i;
+
+	check_stack_depth();
+
+	/* Build a PartitionDispatch for this table and add it to *pds. */
+	pd = (PartitionDispatch) palloc(sizeof(PartitionDispatchData));
+	*pds = lappend(*pds, pd);
+	pd->reldesc = rel;
+	pd->key = partkey;
+	pd->keystate = NIL;
+	pd->partdesc = partdesc;
+	if (parent != NULL)
+	{
+		/*
+		 * For every partitioned table other than the root, we must store a
+		 * tuple table slot initialized with its tuple descriptor and a tuple
+		 * conversion map to convert a tuple from its parent's rowtype to its
+		 * own. That is to make sure that we are looking at the correct row
+		 * using the correct tuple descriptor when computing its partition key
+		 * for tuple routing.
+		 */
+		pd->tupslot = MakeSingleTupleTableSlot(tupdesc);
+		pd->tupmap = convert_tuples_by_name(RelationGetDescr(parent),
+											tupdesc,
+											gettext_noop("could not convert row type"));
+	}
+	else
+	{
+		/* Not required for the root partitioned table */
+		pd->tupslot = NULL;
+		pd->tupmap = NULL;
+	}
+
+	/*
+	 * Go look at each partition of this table.  If it's a leaf partition,
+	 * simply add its OID to *leaf_part_oids.  If it's a partitioned table,
+	 * recursively call get_partition_dispatch_recurse(), so that its
+	 * partitions are processed as well and a corresponding PartitionDispatch
+	 * object gets added to *pds.
+	 *
+	 * About the values in pd->indexes: for a leaf partition, it contains the
+	 * leaf partition's position in the global list *leaf_part_oids minus 1,
+	 * whereas for a partitioned table partition, it contains the partition's
+	 * position in the global list *pds multiplied by -1.  The latter is
+	 * multiplied by -1 to distinguish partitioned tables from leaf partitions
+	 * when going through the values in pd->indexes.  So, for example, when
+	 * using it during tuple-routing, encountering a value >= 0 means we found
+	 * a leaf partition.  It is immediately returned as the index in the array
+	 * of ResultRelInfos of all the leaf partitions, using which we insert the
+	 * tuple into that leaf partition.  A negative value means we found a
+	 * partitioned table.  The value multiplied by -1 is returned as the index
+	 * in the array of PartitionDispatch objects of all partitioned tables in
+	 * the tree.  This value is used to continue the search in the next level
+	 * of the partition tree.
+	 */
+	pd->indexes = (int *) palloc(partdesc->nparts * sizeof(int));
+	for (i = 0; i < partdesc->nparts; i++)
+	{
+		Oid			partrelid = partdesc->oids[i];
+
+		if (get_rel_relkind(partrelid) != RELKIND_PARTITIONED_TABLE)
+		{
+			*leaf_part_oids = lappend_oid(*leaf_part_oids, partrelid);
+			pd->indexes[i] = list_length(*leaf_part_oids) - 1;
+		}
+		else
+		{
+			/*
+			 * We assume all tables in the partition tree were already locked
+			 * by the caller.
+			 */
+			Relation	partrel = heap_open(partrelid, NoLock);
+
+			pd->indexes[i] = -list_length(*pds);
+			get_partition_dispatch_recurse(partrel, rel, pds, leaf_part_oids);
+		}
+	}
+}
+
+/* ----------------
+ *		FormPartitionKeyDatum
+ *			Construct values[] and isnull[] arrays for the partition key
+ *			of a tuple.
+ *
+ *	pd				Partition dispatch object of the partitioned table
+ *	slot			Heap tuple from which to extract partition key
+ *	estate			executor state for evaluating any partition key
+ *					expressions (must be non-NULL)
+ *	values			Array of partition key Datums (output area)
+ *	isnull			Array of is-null indicators (output area)
+ *
+ * the ecxt_scantuple slot of estate's per-tuple expr context must point to
+ * the heap tuple passed in.
+ * ----------------
+ */
+static void
+FormPartitionKeyDatum(PartitionDispatch pd,
+					  TupleTableSlot *slot,
+					  EState *estate,
+					  Datum *values,
+					  bool *isnull)
+{
+	ListCell   *partexpr_item;
+	int			i;
+
+	if (pd->key->partexprs != NIL && pd->keystate == NIL)
+	{
+		/* Check caller has set up context correctly */
+		Assert(estate != NULL &&
+			   GetPerTupleExprContext(estate)->ecxt_scantuple == slot);
+
+		/* First time through, set up expression evaluation state */
+		pd->keystate = ExecPrepareExprList(pd->key->partexprs, estate);
+	}
+
+	partexpr_item = list_head(pd->keystate);
+	for (i = 0; i < pd->key->partnatts; i++)
+	{
+		AttrNumber	keycol = pd->key->partattrs[i];
+		Datum		datum;
+		bool		isNull;
+
+		if (keycol != 0)
+		{
+			/* Plain column; get the value directly from the heap tuple */
+			datum = slot_getattr(slot, keycol, &isNull);
+		}
+		else
+		{
+			/* Expression; need to evaluate it */
+			if (partexpr_item == NULL)
+				elog(ERROR, "wrong number of partition key expressions");
+			datum = ExecEvalExprSwitchContext((ExprState *) lfirst(partexpr_item),
+											  GetPerTupleExprContext(estate),
+											  &isNull);
+			partexpr_item = lnext(partexpr_item);
+		}
+		values[i] = datum;
+		isnull[i] = isNull;
+	}
+
+	if (partexpr_item != NULL)
+		elog(ERROR, "wrong number of partition key expressions");
+}
+
+/*
+ * ExecBuildSlotPartitionKeyDescription
+ *
+ * This works very much like BuildIndexValueDescription() and is currently
+ * used for building error messages when ExecFindPartition() fails to find
+ * partition for a row.
+ */
+static char *
+ExecBuildSlotPartitionKeyDescription(Relation rel,
+									 Datum *values,
+									 bool *isnull,
+									 int maxfieldlen)
+{
+	StringInfoData buf;
+	PartitionKey key = RelationGetPartitionKey(rel);
+	int			partnatts = get_partition_natts(key);
+	int			i;
+	Oid			relid = RelationGetRelid(rel);
+	AclResult	aclresult;
+
+	if (check_enable_rls(relid, InvalidOid, true) == RLS_ENABLED)
+		return NULL;
+
+	/* If the user has table-level access, just go build the description. */
+	aclresult = pg_class_aclcheck(relid, GetUserId(), ACL_SELECT);
+	if (aclresult != ACLCHECK_OK)
+	{
+		/*
+		 * Step through the columns of the partition key and make sure the
+		 * user has SELECT rights on all of them.
+		 */
+		for (i = 0; i < partnatts; i++)
+		{
+			AttrNumber	attnum = get_partition_col_attnum(key, i);
+
+			/*
+			 * If this partition key column is an expression, we return no
+			 * detail rather than try to figure out what column(s) the
+			 * expression includes and if the user has SELECT rights on them.
+			 */
+			if (attnum == InvalidAttrNumber ||
+				pg_attribute_aclcheck(relid, attnum, GetUserId(),
+									  ACL_SELECT) != ACLCHECK_OK)
+				return NULL;
+		}
+	}
+
+	initStringInfo(&buf);
+	appendStringInfo(&buf, "(%s) = (",
+					 pg_get_partkeydef_columns(relid, true));
+
+	for (i = 0; i < partnatts; i++)
+	{
+		char	   *val;
+		int			vallen;
+
+		if (isnull[i])
+			val = "null";
+		else
+		{
+			Oid			foutoid;
+			bool		typisvarlena;
+
+			getTypeOutputInfo(get_partition_col_typid(key, i),
+							  &foutoid, &typisvarlena);
+			val = OidOutputFunctionCall(foutoid, values[i]);
+		}
+
+		if (i > 0)
+			appendStringInfoString(&buf, ", ");
+
+		/* truncate if needed */
+		vallen = strlen(val);
+		if (vallen <= maxfieldlen)
+			appendStringInfoString(&buf, val);
+		else
+		{
+			vallen = pg_mbcliplen(val, vallen, maxfieldlen);
+			appendBinaryStringInfo(&buf, val, vallen);
+			appendStringInfoString(&buf, "...");
+		}
+	}
+
+	appendStringInfoChar(&buf, ')');
+
+	return buf.data;
+}
diff --git a/src/backend/executor/execProcnode.c b/src/backend/executor/execProcnode.c
index 36d2914249..43a27a9af2 100644
--- a/src/backend/executor/execProcnode.c
+++ b/src/backend/executor/execProcnode.c
@@ -7,7 +7,7 @@
  *	 ExecProcNode, or ExecEndNode on its subnodes and do the appropriate
  *	 processing.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -370,12 +370,7 @@ ExecInitNode(Plan *node, EState *estate, int eflags)
 			break;
 	}
 
-	/*
-	 * Add a wrapper around the ExecProcNode callback that checks stack depth
-	 * during the first execution.
-	 */
-	result->ExecProcNodeReal = result->ExecProcNode;
-	result->ExecProcNode = ExecProcNodeFirst;
+	ExecSetExecProcNode(result, result->ExecProcNode);
 
 	/*
 	 * Initialize any initPlans present in this node.  The planner put them in
@@ -401,6 +396,27 @@ ExecInitNode(Plan *node, EState *estate, int eflags)
 }
 
 
+/*
+ * If a node wants to change its ExecProcNode function after ExecInitNode()
+ * has finished, it should do so with this function.  That way any wrapper
+ * functions can be reinstalled, without the node having to know how that
+ * works.
+ */
+void
+ExecSetExecProcNode(PlanState *node, ExecProcNodeMtd function)
+{
+	/*
+	 * Add a wrapper around the ExecProcNode callback that checks stack depth
+	 * during the first execution and maybe adds an instrumentation
+	 * wrapper. When the callback is changed after execution has already begun
+	 * that means we'll superflously execute ExecProcNodeFirst, but that seems
+	 * ok.
+	 */
+	node->ExecProcNodeReal = function;
+	node->ExecProcNode = ExecProcNodeFirst;
+}
+
+
 /*
  * ExecProcNode wrapper that performs some one-time checks, before calling
  * the relevant node method (possibly via an instrumentation wrapper).
@@ -751,9 +767,136 @@ ExecShutdownNode(PlanState *node)
 		case T_GatherMergeState:
 			ExecShutdownGatherMerge((GatherMergeState *) node);
 			break;
+		case T_HashState:
+			ExecShutdownHash((HashState *) node);
+			break;
+		case T_HashJoinState:
+			ExecShutdownHashJoin((HashJoinState *) node);
+			break;
 		default:
 			break;
 	}
 
 	return false;
 }
+
+/*
+ * ExecSetTupleBound
+ *
+ * Set a tuple bound for a planstate node.  This lets child plan nodes
+ * optimize based on the knowledge that the maximum number of tuples that
+ * their parent will demand is limited.  The tuple bound for a node may
+ * only be changed between scans (i.e., after node initialization or just
+ * before an ExecReScan call).
+ *
+ * Any negative tuples_needed value means "no limit", which should be the
+ * default assumption when this is not called at all for a particular node.
+ *
+ * Note: if this is called repeatedly on a plan tree, the exact same set
+ * of nodes must be updated with the new limit each time; be careful that
+ * only unchanging conditions are tested here.
+ */
+void
+ExecSetTupleBound(int64 tuples_needed, PlanState *child_node)
+{
+	/*
+	 * Since this function recurses, in principle we should check stack depth
+	 * here.  In practice, it's probably pointless since the earlier node
+	 * initialization tree traversal would surely have consumed more stack.
+	 */
+
+	if (IsA(child_node, SortState))
+	{
+		/*
+		 * If it is a Sort node, notify it that it can use bounded sort.
+		 *
+		 * Note: it is the responsibility of nodeSort.c to react properly to
+		 * changes of these parameters.  If we ever redesign this, it'd be a
+		 * good idea to integrate this signaling with the parameter-change
+		 * mechanism.
+		 */
+		SortState  *sortState = (SortState *) child_node;
+
+		if (tuples_needed < 0)
+		{
+			/* make sure flag gets reset if needed upon rescan */
+			sortState->bounded = false;
+		}
+		else
+		{
+			sortState->bounded = true;
+			sortState->bound = tuples_needed;
+		}
+	}
+	else if (IsA(child_node, MergeAppendState))
+	{
+		/*
+		 * If it is a MergeAppend, we can apply the bound to any nodes that
+		 * are children of the MergeAppend, since the MergeAppend surely need
+		 * read no more than that many tuples from any one input.
+		 */
+		MergeAppendState *maState = (MergeAppendState *) child_node;
+		int			i;
+
+		for (i = 0; i < maState->ms_nplans; i++)
+			ExecSetTupleBound(tuples_needed, maState->mergeplans[i]);
+	}
+	else if (IsA(child_node, ResultState))
+	{
+		/*
+		 * Similarly, for a projecting Result, we can apply the bound to its
+		 * child node.
+		 *
+		 * If Result supported qual checking, we'd have to punt on seeing a
+		 * qual.  Note that having a resconstantqual is not a showstopper: if
+		 * that condition succeeds it affects nothing, while if it fails, no
+		 * rows will be demanded from the Result child anyway.
+		 */
+		if (outerPlanState(child_node))
+			ExecSetTupleBound(tuples_needed, outerPlanState(child_node));
+	}
+	else if (IsA(child_node, SubqueryScanState))
+	{
+		/*
+		 * We can also descend through SubqueryScan, but only if it has no
+		 * qual (otherwise it might discard rows).
+		 */
+		SubqueryScanState *subqueryState = (SubqueryScanState *) child_node;
+
+		if (subqueryState->ss.ps.qual == NULL)
+			ExecSetTupleBound(tuples_needed, subqueryState->subplan);
+	}
+	else if (IsA(child_node, GatherState))
+	{
+		/*
+		 * A Gather node can propagate the bound to its workers.  As with
+		 * MergeAppend, no one worker could possibly need to return more
+		 * tuples than the Gather itself needs to.
+		 *
+		 * Note: As with Sort, the Gather node is responsible for reacting
+		 * properly to changes to this parameter.
+		 */
+		GatherState *gstate = (GatherState *) child_node;
+
+		gstate->tuples_needed = tuples_needed;
+
+		/* Also pass down the bound to our own copy of the child plan */
+		ExecSetTupleBound(tuples_needed, outerPlanState(child_node));
+	}
+	else if (IsA(child_node, GatherMergeState))
+	{
+		/* Same comments as for Gather */
+		GatherMergeState *gstate = (GatherMergeState *) child_node;
+
+		gstate->tuples_needed = tuples_needed;
+
+		ExecSetTupleBound(tuples_needed, outerPlanState(child_node));
+	}
+
+	/*
+	 * In principle we could descend through any plan node type that is
+	 * certain not to discard or combine input rows; but on seeing a node that
+	 * can do that, we can't propagate the bound any further.  For the moment
+	 * it's unclear that any other cases are worth checking here.
+	 */
+}
diff --git a/src/backend/executor/execReplication.c b/src/backend/executor/execReplication.c
index 3819de28ad..32891abbdf 100644
--- a/src/backend/executor/execReplication.c
+++ b/src/backend/executor/execReplication.c
@@ -3,7 +3,7 @@
  * execReplication.c
  *	  miscellaneous executor routines for logical replication
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -247,7 +247,7 @@ tuple_equals_slot(TupleDesc desc, HeapTuple tup, TupleTableSlot *slot)
 		if (isnull[attrnum])
 			continue;
 
-		att = desc->attrs[attrnum];
+		att = TupleDescAttr(desc, attrnum);
 
 		typentry = lookup_type_cache(att->atttypid, TYPECACHE_EQ_OPR_FINFO);
 		if (!OidIsValid(typentry->eq_opr_finfo.fn_oid))
@@ -288,7 +288,7 @@ RelationFindReplTupleSeq(Relation rel, LockTupleMode lockmode,
 
 	Assert(equalTupleDescs(desc, outslot->tts_tupleDescriptor));
 
-	/* Start an index scan. */
+	/* Start a heap scan. */
 	InitDirtySnapshot(snap);
 	scan = heap_beginscan(rel, &snap, 0, NULL);
 
@@ -401,7 +401,7 @@ ExecSimpleRelationInsert(EState *estate, TupleTableSlot *slot)
 
 		/* Check the constraints of the tuple */
 		if (rel->rd_att->constr)
-			ExecConstraints(resultRelInfo, slot, estate);
+			ExecConstraints(resultRelInfo, slot, estate, true);
 
 		/* Store the slot into tuple that we can inspect. */
 		tuple = ExecMaterializeSlot(slot);
@@ -448,7 +448,7 @@ ExecSimpleRelationUpdate(EState *estate, EPQState *epqstate,
 
 	CheckCmdReplicaIdentity(rel, CMD_UPDATE);
 
-	/* BEFORE ROW INSERT Triggers */
+	/* BEFORE ROW UPDATE Triggers */
 	if (resultRelInfo->ri_TrigDesc &&
 		resultRelInfo->ri_TrigDesc->trig_update_before_row)
 	{
@@ -466,7 +466,7 @@ ExecSimpleRelationUpdate(EState *estate, EPQState *epqstate,
 
 		/* Check the constraints of the tuple */
 		if (rel->rd_att->constr)
-			ExecConstraints(resultRelInfo, slot, estate);
+			ExecConstraints(resultRelInfo, slot, estate, true);
 
 		/* Store the slot into tuple that we can write. */
 		tuple = ExecMaterializeSlot(slot);
@@ -509,9 +509,9 @@ ExecSimpleRelationDelete(EState *estate, EPQState *epqstate,
 
 	CheckCmdReplicaIdentity(rel, CMD_DELETE);
 
-	/* BEFORE ROW INSERT Triggers */
+	/* BEFORE ROW DELETE Triggers */
 	if (resultRelInfo->ri_TrigDesc &&
-		resultRelInfo->ri_TrigDesc->trig_update_before_row)
+		resultRelInfo->ri_TrigDesc->trig_delete_before_row)
 	{
 		skip_tuple = !ExecBRDeleteTriggers(estate, epqstate, resultRelInfo,
 										   &searchslot->tts_tuple->t_self,
@@ -559,13 +559,13 @@ CheckCmdReplicaIdentity(Relation rel, CmdType cmd)
 	if (cmd == CMD_UPDATE && pubactions->pubupdate)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("cannot update table \"%s\" because it does not have replica identity and publishes updates",
+				 errmsg("cannot update table \"%s\" because it does not have a replica identity and publishes updates",
 						RelationGetRelationName(rel)),
 				 errhint("To enable updating the table, set REPLICA IDENTITY using ALTER TABLE.")));
 	else if (cmd == CMD_DELETE && pubactions->pubdelete)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("cannot delete from table \"%s\" because it does not have replica identity and publishes deletes",
+				 errmsg("cannot delete from table \"%s\" because it does not have a replica identity and publishes deletes",
 						RelationGetRelationName(rel)),
 				 errhint("To enable deleting from the table, set REPLICA IDENTITY using ALTER TABLE.")));
 }
diff --git a/src/backend/executor/execSRF.c b/src/backend/executor/execSRF.c
index 138e86ac67..b97b8d797e 100644
--- a/src/backend/executor/execSRF.c
+++ b/src/backend/executor/execSRF.c
@@ -7,7 +7,7 @@
  * common code for calling set-returning functions according to the
  * ReturnSetInfo API.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -467,11 +467,16 @@ ExecInitFunctionResultSet(Expr *expr,
  * function itself.  The argument expressions may not contain set-returning
  * functions (the planner is supposed to have separated evaluation for those).
  *
+ * This should be called in a short-lived (per-tuple) context, argContext
+ * needs to live until all rows have been returned (i.e. *isDone set to
+ * ExprEndResult or ExprSingleResult).
+ *
  * This is used by nodeProjectSet.c.
  */
 Datum
 ExecMakeFunctionResultSet(SetExprState *fcache,
 						  ExprContext *econtext,
+						  MemoryContext argContext,
 						  bool *isNull,
 						  ExprDoneCond *isDone)
 {
@@ -495,8 +500,21 @@ ExecMakeFunctionResultSet(SetExprState *fcache,
 	 */
 	if (fcache->funcResultStore)
 	{
-		if (tuplestore_gettupleslot(fcache->funcResultStore, true, false,
-									fcache->funcResultSlot))
+		TupleTableSlot *slot = fcache->funcResultSlot;
+		MemoryContext oldContext;
+		bool		foundTup;
+
+		/*
+		 * Have to make sure tuple in slot lives long enough, otherwise
+		 * clearing the slot could end up trying to free something already
+		 * freed.
+		 */
+		oldContext = MemoryContextSwitchTo(slot->tts_mcxt);
+		foundTup = tuplestore_gettupleslot(fcache->funcResultStore, true, false,
+										   fcache->funcResultSlot);
+		MemoryContextSwitchTo(oldContext);
+
+		if (foundTup)
 		{
 			*isDone = ExprMultipleResult;
 			if (fcache->funcReturnsTuple)
@@ -524,11 +542,20 @@ ExecMakeFunctionResultSet(SetExprState *fcache,
 	 * function manager.  We skip the evaluation if it was already done in the
 	 * previous call (ie, we are continuing the evaluation of a set-valued
 	 * function).  Otherwise, collect the current argument values into fcinfo.
+	 *
+	 * The arguments have to live in a context that lives at least until all
+	 * rows from this SRF have been returned, otherwise ValuePerCall SRFs
+	 * would reference freed memory after the first returned row.
 	 */
 	fcinfo = &fcache->fcinfo_data;
 	arguments = fcache->args;
 	if (!fcache->setArgsValid)
+	{
+		MemoryContext oldContext = MemoryContextSwitchTo(argContext);
+
 		ExecEvalFuncArgs(fcinfo, arguments, econtext);
+		MemoryContextSwitchTo(oldContext);
+	}
 	else
 	{
 		/* Reset flag (we may set it again below) */
@@ -655,7 +682,7 @@ init_sexpr(Oid foid, Oid input_collation, Expr *node,
 	/* Check permission to call function */
 	aclresult = pg_proc_aclcheck(foid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, get_func_name(foid));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, get_func_name(foid));
 	InvokeFunctionExecuteHook(foid);
 
 	/*
@@ -707,7 +734,8 @@ init_sexpr(Oid foid, Oid input_collation, Expr *node,
 		/* Must save tupdesc in sexpr's context */
 		oldcontext = MemoryContextSwitchTo(sexprCxt);
 
-		if (functypclass == TYPEFUNC_COMPOSITE)
+		if (functypclass == TYPEFUNC_COMPOSITE ||
+			functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
 		{
 			/* Composite data type, e.g. a table's row type */
 			Assert(tupdesc);
@@ -903,8 +931,8 @@ tupledesc_match(TupleDesc dst_tupdesc, TupleDesc src_tupdesc)
 
 	for (i = 0; i < dst_tupdesc->natts; i++)
 	{
-		Form_pg_attribute dattr = dst_tupdesc->attrs[i];
-		Form_pg_attribute sattr = src_tupdesc->attrs[i];
+		Form_pg_attribute dattr = TupleDescAttr(dst_tupdesc, i);
+		Form_pg_attribute sattr = TupleDescAttr(src_tupdesc, i);
 
 		if (IsBinaryCoercible(sattr->atttypid, dattr->atttypid))
 			continue;			/* no worries */
diff --git a/src/backend/executor/execScan.c b/src/backend/executor/execScan.c
index 4f131b3ee0..caf91730ce 100644
--- a/src/backend/executor/execScan.c
+++ b/src/backend/executor/execScan.c
@@ -7,7 +7,7 @@
  *	  stuff - checking the qualification and projecting the tuple
  *	  appropriately.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,11 +23,9 @@
 #include "utils/memutils.h"
 
 
-static bool tlist_matches_tupdesc(PlanState *ps, List *tlist, Index varno, TupleDesc tupdesc);
-
 
 /*
- * ExecScanFetch -- fetch next potential tuple
+ * ExecScanFetch -- check interrupts & fetch next potential tuple
  *
  * This routine is concerned with substituting a test tuple if we are
  * inside an EvalPlanQual recheck.  If we aren't, just execute
@@ -40,6 +38,8 @@ ExecScanFetch(ScanState *node,
 {
 	EState	   *estate = node->ps.state;
 
+	CHECK_FOR_INTERRUPTS();
+
 	if (estate->es_epqTuple != NULL)
 	{
 		/*
@@ -133,6 +133,8 @@ ExecScan(ScanState *node,
 	projInfo = node->ps.ps_ProjInfo;
 	econtext = node->ps.ps_ExprContext;
 
+	/* interrupt checks are in ExecScanFetch */
+
 	/*
 	 * If we have neither a qual to check nor a projection to do, just skip
 	 * all the overhead and return the raw scan tuple.
@@ -157,8 +159,6 @@ ExecScan(ScanState *node,
 	{
 		TupleTableSlot *slot;
 
-		CHECK_FOR_INTERRUPTS();
-
 		slot = ExecScanFetch(node, accessMtd, recheckMtd);
 
 		/*
@@ -229,14 +229,15 @@ ExecScan(ScanState *node,
  * the scan node, because the planner will preferentially generate a matching
  * tlist.
  *
- * ExecAssignScanType must have been called already.
+ * The scan slot's descriptor must have been set already.
  */
 void
 ExecAssignScanProjectionInfo(ScanState *node)
 {
 	Scan	   *scan = (Scan *) node->ps.plan;
+	TupleDesc	tupdesc = node->ss_ScanTupleSlot->tts_tupleDescriptor;
 
-	ExecAssignScanProjectionInfoWithVarno(node, scan->scanrelid);
+	ExecConditionalAssignProjectionInfo(&node->ps, tupdesc, scan->scanrelid);
 }
 
 /*
@@ -246,75 +247,9 @@ ExecAssignScanProjectionInfo(ScanState *node)
 void
 ExecAssignScanProjectionInfoWithVarno(ScanState *node, Index varno)
 {
-	Scan	   *scan = (Scan *) node->ps.plan;
-
-	if (tlist_matches_tupdesc(&node->ps,
-							  scan->plan.targetlist,
-							  varno,
-							  node->ss_ScanTupleSlot->tts_tupleDescriptor))
-		node->ps.ps_ProjInfo = NULL;
-	else
-		ExecAssignProjectionInfo(&node->ps,
-								 node->ss_ScanTupleSlot->tts_tupleDescriptor);
-}
-
-static bool
-tlist_matches_tupdesc(PlanState *ps, List *tlist, Index varno, TupleDesc tupdesc)
-{
-	int			numattrs = tupdesc->natts;
-	int			attrno;
-	bool		hasoid;
-	ListCell   *tlist_item = list_head(tlist);
-
-	/* Check the tlist attributes */
-	for (attrno = 1; attrno <= numattrs; attrno++)
-	{
-		Form_pg_attribute att_tup = tupdesc->attrs[attrno - 1];
-		Var		   *var;
-
-		if (tlist_item == NULL)
-			return false;		/* tlist too short */
-		var = (Var *) ((TargetEntry *) lfirst(tlist_item))->expr;
-		if (!var || !IsA(var, Var))
-			return false;		/* tlist item not a Var */
-		/* if these Asserts fail, planner messed up */
-		Assert(var->varno == varno);
-		Assert(var->varlevelsup == 0);
-		if (var->varattno != attrno)
-			return false;		/* out of order */
-		if (att_tup->attisdropped)
-			return false;		/* table contains dropped columns */
-
-		/*
-		 * Note: usually the Var's type should match the tupdesc exactly, but
-		 * in situations involving unions of columns that have different
-		 * typmods, the Var may have come from above the union and hence have
-		 * typmod -1.  This is a legitimate situation since the Var still
-		 * describes the column, just not as exactly as the tupdesc does. We
-		 * could change the planner to prevent it, but it'd then insert
-		 * projection steps just to convert from specific typmod to typmod -1,
-		 * which is pretty silly.
-		 */
-		if (var->vartype != att_tup->atttypid ||
-			(var->vartypmod != att_tup->atttypmod &&
-			 var->vartypmod != -1))
-			return false;		/* type mismatch */
-
-		tlist_item = lnext(tlist_item);
-	}
-
-	if (tlist_item)
-		return false;			/* tlist too long */
-
-	/*
-	 * If the plan context requires a particular hasoid setting, then that has
-	 * to match, too.
-	 */
-	if (ExecContextForcesOids(ps, &hasoid) &&
-		hasoid != tupdesc->tdhasoid)
-		return false;
+	TupleDesc	tupdesc = node->ss_ScanTupleSlot->tts_tupleDescriptor;
 
-	return true;
+	ExecConditionalAssignProjectionInfo(&node->ps, tupdesc, varno);
 }
 
 /*
diff --git a/src/backend/executor/execTuples.c b/src/backend/executor/execTuples.c
index 7ae70a877a..c46d65cf93 100644
--- a/src/backend/executor/execTuples.c
+++ b/src/backend/executor/execTuples.c
@@ -12,7 +12,7 @@
  *	  This information is needed by routines manipulating tuples
  *	  (getattribute, formtuple, etc.).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -58,7 +58,7 @@
  *		At ExecutorStart()
  *		----------------
  *		- ExecInitSeqScan() calls ExecInitScanTupleSlot() and
- *		  ExecInitResultTupleSlot() to construct TupleTableSlots
+ *		  ExecInitResultTupleSlotTL() to construct TupleTableSlots
  *		  for the tuples returned by the access methods and the
  *		  tuples resulting from performing target list projections.
  *
@@ -104,19 +104,36 @@ static TupleDesc ExecTypeFromTLInternal(List *targetList,
 /* --------------------------------
  *		MakeTupleTableSlot
  *
- *		Basic routine to make an empty TupleTableSlot.
+ *		Basic routine to make an empty TupleTableSlot. If tupleDesc is
+ *		specified the slot's descriptor is fixed for it's lifetime, gaining
+ *		some efficiency. If that's undesirable, pass NULL.
  * --------------------------------
  */
 TupleTableSlot *
-MakeTupleTableSlot(void)
+MakeTupleTableSlot(TupleDesc tupleDesc)
 {
-	TupleTableSlot *slot = makeNode(TupleTableSlot);
+	Size		sz;
+	TupleTableSlot *slot;
+
+	/*
+	 * When a fixed descriptor is specified, we can reduce overhead by
+	 * allocating the entire slot in one go.
+	 */
+	if (tupleDesc)
+		sz = MAXALIGN(sizeof(TupleTableSlot)) +
+			MAXALIGN(tupleDesc->natts * sizeof(Datum)) +
+			MAXALIGN(tupleDesc->natts * sizeof(bool));
+	else
+		sz = sizeof(TupleTableSlot);
 
+	slot = palloc0(sz);
+	slot->type = T_TupleTableSlot;
 	slot->tts_isempty = true;
 	slot->tts_shouldFree = false;
 	slot->tts_shouldFreeMin = false;
 	slot->tts_tuple = NULL;
-	slot->tts_tupleDescriptor = NULL;
+	slot->tts_fixedTupleDescriptor = tupleDesc != NULL;
+	slot->tts_tupleDescriptor = tupleDesc;
 	slot->tts_mcxt = CurrentMemoryContext;
 	slot->tts_buffer = InvalidBuffer;
 	slot->tts_nvalid = 0;
@@ -124,6 +141,19 @@ MakeTupleTableSlot(void)
 	slot->tts_isnull = NULL;
 	slot->tts_mintuple = NULL;
 
+	if (tupleDesc != NULL)
+	{
+		slot->tts_values = (Datum *)
+			(((char *) slot)
+			 + MAXALIGN(sizeof(TupleTableSlot)));
+		slot->tts_isnull = (bool *)
+			(((char *) slot)
+			 + MAXALIGN(sizeof(TupleTableSlot))
+			 + MAXALIGN(tupleDesc->natts * sizeof(Datum)));
+
+		PinTupleDesc(tupleDesc);
+	}
+
 	return slot;
 }
 
@@ -134,9 +164,9 @@ MakeTupleTableSlot(void)
  * --------------------------------
  */
 TupleTableSlot *
-ExecAllocTableSlot(List **tupleTable)
+ExecAllocTableSlot(List **tupleTable, TupleDesc desc)
 {
-	TupleTableSlot *slot = MakeTupleTableSlot();
+	TupleTableSlot *slot = MakeTupleTableSlot(desc);
 
 	*tupleTable = lappend(*tupleTable, slot);
 
@@ -173,10 +203,13 @@ ExecResetTupleTable(List *tupleTable,	/* tuple table */
 		/* If shouldFree, release memory occupied by the slot itself */
 		if (shouldFree)
 		{
-			if (slot->tts_values)
-				pfree(slot->tts_values);
-			if (slot->tts_isnull)
-				pfree(slot->tts_isnull);
+			if (!slot->tts_fixedTupleDescriptor)
+			{
+				if (slot->tts_values)
+					pfree(slot->tts_values);
+				if (slot->tts_isnull)
+					pfree(slot->tts_isnull);
+			}
 			pfree(slot);
 		}
 	}
@@ -198,9 +231,7 @@ ExecResetTupleTable(List *tupleTable,	/* tuple table */
 TupleTableSlot *
 MakeSingleTupleTableSlot(TupleDesc tupdesc)
 {
-	TupleTableSlot *slot = MakeTupleTableSlot();
-
-	ExecSetSlotDescriptor(slot, tupdesc);
+	TupleTableSlot *slot = MakeTupleTableSlot(tupdesc);
 
 	return slot;
 }
@@ -220,10 +251,13 @@ ExecDropSingleTupleTableSlot(TupleTableSlot *slot)
 	ExecClearTuple(slot);
 	if (slot->tts_tupleDescriptor)
 		ReleaseTupleDesc(slot->tts_tupleDescriptor);
-	if (slot->tts_values)
-		pfree(slot->tts_values);
-	if (slot->tts_isnull)
-		pfree(slot->tts_isnull);
+	if (!slot->tts_fixedTupleDescriptor)
+	{
+		if (slot->tts_values)
+			pfree(slot->tts_values);
+		if (slot->tts_isnull)
+			pfree(slot->tts_isnull);
+	}
 	pfree(slot);
 }
 
@@ -247,6 +281,8 @@ void
 ExecSetSlotDescriptor(TupleTableSlot *slot, /* slot to change */
 					  TupleDesc tupdesc)	/* new tuple descriptor */
 {
+	Assert(!slot->tts_fixedTupleDescriptor);
+
 	/* For safety, make sure slot is empty before changing it */
 	ExecClearTuple(slot);
 
@@ -816,7 +852,7 @@ ExecCopySlot(TupleTableSlot *dstslot, TupleTableSlot *srcslot)
  */
 
 /* --------------------------------
- *		ExecInit{Result,Scan,Extra}TupleSlot
+ *		ExecInit{Result,Scan,Extra}TupleSlot[TL]
  *
  *		These are convenience routines to initialize the specified slot
  *		in nodes inheriting the appropriate state.  ExecInitExtraTupleSlot
@@ -825,13 +861,30 @@ ExecCopySlot(TupleTableSlot *dstslot, TupleTableSlot *srcslot)
  */
 
 /* ----------------
- *		ExecInitResultTupleSlot
+ *		ExecInitResultTupleSlotTL
+ *
+ *		Initialize result tuple slot, using the plan node's targetlist.
  * ----------------
  */
 void
-ExecInitResultTupleSlot(EState *estate, PlanState *planstate)
+ExecInitResultTupleSlotTL(EState *estate, PlanState *planstate)
 {
-	planstate->ps_ResultTupleSlot = ExecAllocTableSlot(&estate->es_tupleTable);
+	bool		hasoid;
+	TupleDesc	tupDesc;
+
+	if (ExecContextForcesOids(planstate, &hasoid))
+	{
+		/* context forces OID choice; hasoid is now set correctly */
+	}
+	else
+	{
+		/* given free choice, don't leave space for OIDs in result tuples */
+		hasoid = false;
+	}
+
+	tupDesc = ExecTypeFromTL(planstate->plan->targetlist, hasoid);
+
+	planstate->ps_ResultTupleSlot = ExecAllocTableSlot(&estate->es_tupleTable, tupDesc);
 }
 
 /* ----------------
@@ -839,19 +892,24 @@ ExecInitResultTupleSlot(EState *estate, PlanState *planstate)
  * ----------------
  */
 void
-ExecInitScanTupleSlot(EState *estate, ScanState *scanstate)
+ExecInitScanTupleSlot(EState *estate, ScanState *scanstate, TupleDesc tupledesc)
 {
-	scanstate->ss_ScanTupleSlot = ExecAllocTableSlot(&estate->es_tupleTable);
+	scanstate->ss_ScanTupleSlot = ExecAllocTableSlot(&estate->es_tupleTable,
+													 tupledesc);
 }
 
 /* ----------------
  *		ExecInitExtraTupleSlot
+ *
+ * Return a newly created slot. If tupledesc is non-NULL the slot will have
+ * that as its fixed tupledesc. Otherwise the caller needs to use
+ * ExecSetSlotDescriptor() to set the descriptor before use.
  * ----------------
  */
 TupleTableSlot *
-ExecInitExtraTupleSlot(EState *estate)
+ExecInitExtraTupleSlot(EState *estate, TupleDesc tupledesc)
 {
-	return ExecAllocTableSlot(&estate->es_tupleTable);
+	return ExecAllocTableSlot(&estate->es_tupleTable, tupledesc);
 }
 
 /* ----------------
@@ -865,9 +923,7 @@ ExecInitExtraTupleSlot(EState *estate)
 TupleTableSlot *
 ExecInitNullTupleSlot(EState *estate, TupleDesc tupType)
 {
-	TupleTableSlot *slot = ExecInitExtraTupleSlot(estate);
-
-	ExecSetSlotDescriptor(slot, tupType);
+	TupleTableSlot *slot = ExecInitExtraTupleSlot(estate, tupType);
 
 	return ExecStoreAllNullTuple(slot);
 }
@@ -997,7 +1053,8 @@ ExecTypeSetColNames(TupleDesc typeInfo, List *namesList)
 		/* Guard against too-long names list */
 		if (colno >= typeInfo->natts)
 			break;
-		attr = typeInfo->attrs[colno++];
+		attr = TupleDescAttr(typeInfo, colno);
+		colno++;
 
 		/* Ignore empty aliases (these must be for dropped columns) */
 		if (cname[0] == '\0')
@@ -1090,13 +1147,15 @@ TupleDescGetAttInMetadata(TupleDesc tupdesc)
 
 	for (i = 0; i < natts; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
 		/* Ignore dropped attributes */
-		if (!tupdesc->attrs[i]->attisdropped)
+		if (!att->attisdropped)
 		{
-			atttypeid = tupdesc->attrs[i]->atttypid;
+			atttypeid = att->atttypid;
 			getTypeInputInfo(atttypeid, &attinfuncid, &attioparams[i]);
 			fmgr_info(attinfuncid, &attinfuncinfo[i]);
-			atttypmods[i] = tupdesc->attrs[i]->atttypmod;
+			atttypmods[i] = att->atttypmod;
 		}
 	}
 	attinmeta->attinfuncs = attinfuncinfo;
@@ -1127,7 +1186,7 @@ BuildTupleFromCStrings(AttInMetadata *attinmeta, char **values)
 	/* Call the "in" function for each non-dropped attribute */
 	for (i = 0; i < natts; i++)
 	{
-		if (!tupdesc->attrs[i]->attisdropped)
+		if (!TupleDescAttr(tupdesc, i)->attisdropped)
 		{
 			/* Non-dropped attributes */
 			dvalues[i] = InputFunctionCall(&attinmeta->attinfuncs[i],
@@ -1238,7 +1297,7 @@ begin_tup_output_tupdesc(DestReceiver *dest, TupleDesc tupdesc)
 	tstate->slot = MakeSingleTupleTableSlot(tupdesc);
 	tstate->dest = dest;
 
-	(*tstate->dest->rStartup) (tstate->dest, (int) CMD_SELECT, tupdesc);
+	tstate->dest->rStartup(tstate->dest, (int) CMD_SELECT, tupdesc);
 
 	return tstate;
 }
@@ -1263,7 +1322,7 @@ do_tup_output(TupOutputState *tstate, Datum *values, bool *isnull)
 	ExecStoreVirtualTuple(slot);
 
 	/* send the tuple to the receiver */
-	(void) (*tstate->dest->receiveSlot) (slot, tstate->dest);
+	(void) tstate->dest->receiveSlot(slot, tstate->dest);
 
 	/* clean up */
 	ExecClearTuple(slot);
@@ -1307,7 +1366,7 @@ do_text_output_multiline(TupOutputState *tstate, const char *txt)
 void
 end_tup_output(TupOutputState *tstate)
 {
-	(*tstate->dest->rShutdown) (tstate->dest);
+	tstate->dest->rShutdown(tstate->dest);
 	/* note that destroying the dest is not ours to do */
 	ExecDropSingleTupleTableSlot(tstate->slot);
 	pfree(tstate);
diff --git a/src/backend/executor/execUtils.c b/src/backend/executor/execUtils.c
index 25772fc603..a8ae37ebc8 100644
--- a/src/backend/executor/execUtils.c
+++ b/src/backend/executor/execUtils.c
@@ -3,7 +3,7 @@
  * execUtils.c
  *	  miscellaneous executor utility routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -22,7 +22,6 @@
  *		ReScanExprContext
  *
  *		ExecAssignExprContext	Common code for plan node init routines.
- *		ExecAssignResultType
  *		etc
  *
  *		ExecOpenScanRelation	Common code for scan node init routines.
@@ -56,6 +55,7 @@
 #include "utils/typcache.h"
 
 
+static bool tlist_matches_tupdesc(PlanState *ps, List *tlist, Index varno, TupleDesc tupdesc);
 static void ShutdownExprContext(ExprContext *econtext, bool isCommit);
 
 
@@ -115,6 +115,11 @@ CreateExecutorState(void)
 	estate->es_num_result_relations = 0;
 	estate->es_result_relation_info = NULL;
 
+	estate->es_root_result_relations = NULL;
+	estate->es_num_root_result_relations = 0;
+
+	estate->es_tuple_routing_result_relations = NIL;
+
 	estate->es_trig_target_relations = NIL;
 	estate->es_trig_tuple_slot = NULL;
 	estate->es_trig_oldtup_slot = NULL;
@@ -151,6 +156,8 @@ CreateExecutorState(void)
 	estate->es_epqScanDone = NULL;
 	estate->es_sourceText = NULL;
 
+	estate->es_use_parallel_mode = false;
+
 	/*
 	 * Return the executor state structure
 	 */
@@ -420,47 +427,6 @@ ExecAssignExprContext(EState *estate, PlanState *planstate)
 	planstate->ps_ExprContext = CreateExprContext(estate);
 }
 
-/* ----------------
- *		ExecAssignResultType
- * ----------------
- */
-void
-ExecAssignResultType(PlanState *planstate, TupleDesc tupDesc)
-{
-	TupleTableSlot *slot = planstate->ps_ResultTupleSlot;
-
-	ExecSetSlotDescriptor(slot, tupDesc);
-}
-
-/* ----------------
- *		ExecAssignResultTypeFromTL
- * ----------------
- */
-void
-ExecAssignResultTypeFromTL(PlanState *planstate)
-{
-	bool		hasoid;
-	TupleDesc	tupDesc;
-
-	if (ExecContextForcesOids(planstate, &hasoid))
-	{
-		/* context forces OID choice; hasoid is now set correctly */
-	}
-	else
-	{
-		/* given free choice, don't leave space for OIDs in result tuples */
-		hasoid = false;
-	}
-
-	/*
-	 * ExecTypeFromTL needs the parse-time representation of the tlist, not a
-	 * list of ExprStates.  This is good because some plan nodes don't bother
-	 * to set up planstate->targetlist ...
-	 */
-	tupDesc = ExecTypeFromTL(planstate->plan->targetlist, hasoid);
-	ExecAssignResultType(planstate, tupDesc);
-}
-
 /* ----------------
  *		ExecGetResultType
  * ----------------
@@ -496,6 +462,85 @@ ExecAssignProjectionInfo(PlanState *planstate,
 }
 
 
+/* ----------------
+ *		ExecConditionalAssignProjectionInfo
+ *
+ * as ExecAssignProjectionInfo, but store NULL rather than building projection
+ * info if no projection is required
+ * ----------------
+ */
+void
+ExecConditionalAssignProjectionInfo(PlanState *planstate, TupleDesc inputDesc,
+									Index varno)
+{
+	if (tlist_matches_tupdesc(planstate,
+							  planstate->plan->targetlist,
+							  varno,
+							  inputDesc))
+		planstate->ps_ProjInfo = NULL;
+	else
+		ExecAssignProjectionInfo(planstate, inputDesc);
+}
+
+static bool
+tlist_matches_tupdesc(PlanState *ps, List *tlist, Index varno, TupleDesc tupdesc)
+{
+	int			numattrs = tupdesc->natts;
+	int			attrno;
+	bool		hasoid;
+	ListCell   *tlist_item = list_head(tlist);
+
+	/* Check the tlist attributes */
+	for (attrno = 1; attrno <= numattrs; attrno++)
+	{
+		Form_pg_attribute att_tup = TupleDescAttr(tupdesc, attrno - 1);
+		Var		   *var;
+
+		if (tlist_item == NULL)
+			return false;		/* tlist too short */
+		var = (Var *) ((TargetEntry *) lfirst(tlist_item))->expr;
+		if (!var || !IsA(var, Var))
+			return false;		/* tlist item not a Var */
+		/* if these Asserts fail, planner messed up */
+		Assert(var->varno == varno);
+		Assert(var->varlevelsup == 0);
+		if (var->varattno != attrno)
+			return false;		/* out of order */
+		if (att_tup->attisdropped)
+			return false;		/* table contains dropped columns */
+
+		/*
+		 * Note: usually the Var's type should match the tupdesc exactly, but
+		 * in situations involving unions of columns that have different
+		 * typmods, the Var may have come from above the union and hence have
+		 * typmod -1.  This is a legitimate situation since the Var still
+		 * describes the column, just not as exactly as the tupdesc does. We
+		 * could change the planner to prevent it, but it'd then insert
+		 * projection steps just to convert from specific typmod to typmod -1,
+		 * which is pretty silly.
+		 */
+		if (var->vartype != att_tup->atttypid ||
+			(var->vartypmod != att_tup->atttypmod &&
+			 var->vartypmod != -1))
+			return false;		/* type mismatch */
+
+		tlist_item = lnext(tlist_item);
+	}
+
+	if (tlist_item)
+		return false;			/* tlist too long */
+
+	/*
+	 * If the plan context requires a particular hasoid setting, then that has
+	 * to match, too.
+	 */
+	if (ExecContextForcesOids(ps, &hasoid) &&
+		hasoid != tupdesc->tdhasoid)
+		return false;
+
+	return true;
+}
+
 /* ----------------
  *		ExecFreeExprContext
  *
@@ -522,13 +567,9 @@ ExecFreeExprContext(PlanState *planstate)
 	planstate->ps_ExprContext = NULL;
 }
 
+
 /* ----------------------------------------------------------------
- *		the following scan type support functions are for
- *		those nodes which are stubborn and return tuples in
- *		their Scan tuple slot instead of their Result tuple
- *		slot..  luck fur us, these nodes do not do projections
- *		so we don't have to worry about getting the ProjectionInfo
- *		right for them...  -cim 6/3/91
+ *				  Scan node support
  * ----------------------------------------------------------------
  */
 
@@ -545,11 +586,11 @@ ExecAssignScanType(ScanState *scanstate, TupleDesc tupDesc)
 }
 
 /* ----------------
- *		ExecAssignScanTypeFromOuterPlan
+ *		ExecCreateSlotFromOuterPlan
  * ----------------
  */
 void
-ExecAssignScanTypeFromOuterPlan(ScanState *scanstate)
+ExecCreateScanSlotFromOuterPlan(EState *estate, ScanState *scanstate)
 {
 	PlanState  *outerPlan;
 	TupleDesc	tupDesc;
@@ -557,15 +598,9 @@ ExecAssignScanTypeFromOuterPlan(ScanState *scanstate)
 	outerPlan = outerPlanState(scanstate);
 	tupDesc = ExecGetResultType(outerPlan);
 
-	ExecAssignScanType(scanstate, tupDesc);
+	ExecInitScanTupleSlot(estate, scanstate, tupDesc);
 }
 
-
-/* ----------------------------------------------------------------
- *				  Scan node support
- * ----------------------------------------------------------------
- */
-
 /* ----------------------------------------------------------------
  *		ExecRelationIsTargetRelation
  *
@@ -808,7 +843,7 @@ ShutdownExprContext(ExprContext *econtext, bool isCommit)
 	{
 		econtext->ecxt_callbacks = ecxt_callback->next;
 		if (isCommit)
-			(*ecxt_callback->function) (ecxt_callback->arg);
+			ecxt_callback->function(ecxt_callback->arg);
 		pfree(ecxt_callback);
 	}
 
@@ -912,9 +947,11 @@ GetAttributeByName(HeapTupleHeader tuple, const char *attname, bool *isNull)
 	attrno = InvalidAttrNumber;
 	for (i = 0; i < tupDesc->natts; i++)
 	{
-		if (namestrcmp(&(tupDesc->attrs[i]->attname), attname) == 0)
+		Form_pg_attribute att = TupleDescAttr(tupDesc, i);
+
+		if (namestrcmp(&(att->attname), attname) == 0)
 		{
-			attrno = tupDesc->attrs[i]->attnum;
+			attrno = att->attnum;
 			break;
 		}
 	}
diff --git a/src/backend/executor/functions.c b/src/backend/executor/functions.c
index 3630f5d966..7e249f575f 100644
--- a/src/backend/executor/functions.c
+++ b/src/backend/executor/functions.c
@@ -3,7 +3,7 @@
  * functions.c
  *	  Execution of SQL-language functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -390,6 +390,7 @@ sql_fn_post_column_ref(ParseState *pstate, ColumnRef *cref, Node *var)
 								  list_make1(param),
 								  pstate->p_last_srf,
 								  NULL,
+								  false,
 								  cref->location);
 	}
 
@@ -658,7 +659,8 @@ init_sql_fcache(FmgrInfo *finfo, Oid collation, bool lazyEvalOK)
 	fcache->rettype = rettype;
 
 	/* Fetch the typlen and byval info for the result type */
-	get_typlenbyval(rettype, &fcache->typlen, &fcache->typbyval);
+	if (rettype)
+		get_typlenbyval(rettype, &fcache->typlen, &fcache->typbyval);
 
 	/* Remember whether we're returning setof something */
 	fcache->returnsSet = procedureStruct->proretset;
@@ -886,7 +888,7 @@ postquel_end(execution_state *es)
 		ExecutorEnd(es->qd);
 	}
 
-	(*es->qd->dest->rDestroy) (es->qd->dest);
+	es->qd->dest->rDestroy(es->qd->dest);
 
 	FreeQueryDesc(es->qd);
 	es->qd = NULL;
@@ -912,10 +914,11 @@ postquel_sub_params(SQLFunctionCachePtr fcache,
 			/* we have static list of params, so no hooks needed */
 			paramLI->paramFetch = NULL;
 			paramLI->paramFetchArg = NULL;
+			paramLI->paramCompile = NULL;
+			paramLI->paramCompileArg = NULL;
 			paramLI->parserSetup = NULL;
 			paramLI->parserSetupArg = NULL;
 			paramLI->numParams = nargs;
-			paramLI->paramMask = NULL;
 			fcache->paramLI = paramLI;
 		}
 		else
@@ -1321,8 +1324,8 @@ fmgr_sql(PG_FUNCTION_ARGS)
 		}
 		else
 		{
-			/* Should only get here for VOID functions */
-			Assert(fcache->rettype == VOIDOID);
+			/* Should only get here for procedures and VOID functions */
+			Assert(fcache->rettype == InvalidOid || fcache->rettype == VOIDOID);
 			fcinfo->isnull = true;
 			result = (Datum) 0;
 		}
@@ -1546,7 +1549,10 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	if (modifyTargetList)
 		*modifyTargetList = false;	/* initialize for no change */
 	if (junkFilter)
-		*junkFilter = NULL;		/* initialize in case of VOID result */
+		*junkFilter = NULL;		/* initialize in case of procedure/VOID result */
+
+	if (!rettype)
+		return false;
 
 	/*
 	 * Find the last canSetTag query in the list.  This isn't necessarily the
@@ -1591,7 +1597,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	else
 	{
 		/* Empty function body, or last statement is a utility command */
-		if (rettype != VOIDOID)
+		if (rettype && rettype != VOIDOID)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 					 errmsg("return type mismatch in function declared to return %s",
@@ -1665,7 +1671,15 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 	}
 	else if (fn_typtype == TYPTYPE_COMPOSITE || rettype == RECORDOID)
 	{
-		/* Returns a rowtype */
+		/*
+		 * Returns a rowtype.
+		 *
+		 * Note that we will not consider a domain over composite to be a
+		 * "rowtype" return type; it goes through the scalar case above.  This
+		 * is because SQL functions don't provide any implicit casting to the
+		 * result type, so there is no way to produce a domain-over-composite
+		 * result except by computing it as an explicit single-column result.
+		 */
 		TupleDesc	tupdesc;
 		int			tupnatts;	/* physical number of columns in tuple */
 		int			tuplogcols; /* # of nondeleted columns in tuple */
@@ -1711,7 +1725,10 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 			}
 		}
 
-		/* Is the rowtype fixed, or determined only at runtime? */
+		/*
+		 * Is the rowtype fixed, or determined only at runtime?  (Note we
+		 * cannot see TYPEFUNC_COMPOSITE_DOMAIN here.)
+		 */
 		if (get_func_result_type(func_id, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
 		{
 			/*
@@ -1759,7 +1776,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 							 errmsg("return type mismatch in function declared to return %s",
 									format_type_be(rettype)),
 							 errdetail("Final statement returns too many columns.")));
-				attr = tupdesc->attrs[colindex - 1];
+				attr = TupleDescAttr(tupdesc, colindex - 1);
 				if (attr->attisdropped && modifyTargetList)
 				{
 					Expr	   *null_expr;
@@ -1816,7 +1833,7 @@ check_sql_fn_retval(Oid func_id, Oid rettype, List *queryTreeList,
 		/* remaining columns in tupdesc had better all be dropped */
 		for (colindex++; colindex <= tupnatts; colindex++)
 		{
-			if (!tupdesc->attrs[colindex - 1]->attisdropped)
+			if (!TupleDescAttr(tupdesc, colindex - 1)->attisdropped)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_FUNCTION_DEFINITION),
 						 errmsg("return type mismatch in function declared to return %s",
diff --git a/src/backend/executor/instrument.c b/src/backend/executor/instrument.c
index 6ec96ec371..a2d9381ba1 100644
--- a/src/backend/executor/instrument.c
+++ b/src/backend/executor/instrument.c
@@ -4,7 +4,7 @@
  *	 functions for instrumentation of plan execution
  *
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/executor/instrument.c
diff --git a/src/backend/executor/nodeAgg.c b/src/backend/executor/nodeAgg.c
index 6a26773a49..1b1334006f 100644
--- a/src/backend/executor/nodeAgg.c
+++ b/src/backend/executor/nodeAgg.c
@@ -90,7 +90,7 @@
  *	  but in the aggregate case we know the left input is either the initial
  *	  transition value or a previous function result, and in either case its
  *	  value need not be preserved.  See int8inc() for an example.  Notice that
- *	  advance_transition_function() is coded to avoid a data copy step when
+ *	  the EEOP_AGG_PLAIN_TRANS step is coded to avoid a data copy step when
  *	  the previous transition value pointer is returned.  It is also possible
  *	  to avoid repeated data copying when the transition value is an expanded
  *	  object: to do that, the transition function must take care to return
@@ -194,8 +194,18 @@
  *	  transition values.  hashcontext is the single context created to support
  *	  all hash tables.
  *
+ *    Transition / Combine function invocation:
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *    For performance reasons transition functions, including combine
+ *    functions, aren't invoked one-by-one from nodeAgg.c after computing
+ *    arguments using the expression evaluation engine. Instead
+ *    ExecBuildAggTrans() builds one large expression that does both argument
+ *    evaluation and transition function invocation. That avoids performance
+ *    issues due to repeated uses of expression evaluation, complications due
+ *    to filter expressions having to be evaluated early, and allows to JIT
+ *    the entire expression into one native function.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -229,310 +239,16 @@
 #include "utils/datum.h"
 
 
-/*
- * AggStatePerTransData - per aggregate state value information
- *
- * Working state for updating the aggregate's state value, by calling the
- * transition function with an input row. This struct does not store the
- * information needed to produce the final aggregate result from the transition
- * state, that's stored in AggStatePerAggData instead. This separation allows
- * multiple aggregate results to be produced from a single state value.
- */
-typedef struct AggStatePerTransData
-{
-	/*
-	 * These values are set up during ExecInitAgg() and do not change
-	 * thereafter:
-	 */
-
-	/*
-	 * Link to an Aggref expr this state value is for.
-	 *
-	 * There can be multiple Aggref's sharing the same state value, as long as
-	 * the inputs and transition function are identical. This points to the
-	 * first one of them.
-	 */
-	Aggref	   *aggref;
-
-	/*
-	 * Nominal number of arguments for aggregate function.  For plain aggs,
-	 * this excludes any ORDER BY expressions.  For ordered-set aggs, this
-	 * counts both the direct and aggregated (ORDER BY) arguments.
-	 */
-	int			numArguments;
-
-	/*
-	 * Number of aggregated input columns.  This includes ORDER BY expressions
-	 * in both the plain-agg and ordered-set cases.  Ordered-set direct args
-	 * are not counted, though.
-	 */
-	int			numInputs;
-
-	/* offset of input columns in AggState->evalslot */
-	int			inputoff;
-
-	/*
-	 * Number of aggregated input columns to pass to the transfn.  This
-	 * includes the ORDER BY columns for ordered-set aggs, but not for plain
-	 * aggs.  (This doesn't count the transition state value!)
-	 */
-	int			numTransInputs;
-
-	/* Oid of the state transition or combine function */
-	Oid			transfn_oid;
-
-	/* Oid of the serialization function or InvalidOid */
-	Oid			serialfn_oid;
-
-	/* Oid of the deserialization function or InvalidOid */
-	Oid			deserialfn_oid;
-
-	/* Oid of state value's datatype */
-	Oid			aggtranstype;
-
-	/* ExprStates of the FILTER and argument expressions. */
-	ExprState  *aggfilter;		/* state of FILTER expression, if any */
-	List	   *aggdirectargs;	/* states of direct-argument expressions */
-
-	/*
-	 * fmgr lookup data for transition function or combine function.  Note in
-	 * particular that the fn_strict flag is kept here.
-	 */
-	FmgrInfo	transfn;
-
-	/* fmgr lookup data for serialization function */
-	FmgrInfo	serialfn;
-
-	/* fmgr lookup data for deserialization function */
-	FmgrInfo	deserialfn;
-
-	/* Input collation derived for aggregate */
-	Oid			aggCollation;
-
-	/* number of sorting columns */
-	int			numSortCols;
-
-	/* number of sorting columns to consider in DISTINCT comparisons */
-	/* (this is either zero or the same as numSortCols) */
-	int			numDistinctCols;
-
-	/* deconstructed sorting information (arrays of length numSortCols) */
-	AttrNumber *sortColIdx;
-	Oid		   *sortOperators;
-	Oid		   *sortCollations;
-	bool	   *sortNullsFirst;
-
-	/*
-	 * fmgr lookup data for input columns' equality operators --- only
-	 * set/used when aggregate has DISTINCT flag.  Note that these are in
-	 * order of sort column index, not parameter index.
-	 */
-	FmgrInfo   *equalfns;		/* array of length numDistinctCols */
-
-	/*
-	 * initial value from pg_aggregate entry
-	 */
-	Datum		initValue;
-	bool		initValueIsNull;
-
-	/*
-	 * We need the len and byval info for the agg's input and transition data
-	 * types in order to know how to copy/delete values.
-	 *
-	 * Note that the info for the input type is used only when handling
-	 * DISTINCT aggs with just one argument, so there is only one input type.
-	 */
-	int16		inputtypeLen,
-				transtypeLen;
-	bool		inputtypeByVal,
-				transtypeByVal;
-
-	/*
-	 * Stuff for evaluation of aggregate inputs in cases where the aggregate
-	 * requires sorted input.  The arguments themselves will be evaluated via
-	 * AggState->evalslot/evalproj for all aggregates at once, but we only
-	 * want to sort the relevant columns for individual aggregates.
-	 */
-	TupleDesc	sortdesc;		/* descriptor of input tuples */
-
-	/*
-	 * Slots for holding the evaluated input arguments.  These are set up
-	 * during ExecInitAgg() and then used for each input row requiring
-	 * processing besides what's done in AggState->evalproj.
-	 */
-	TupleTableSlot *sortslot;	/* current input tuple */
-	TupleTableSlot *uniqslot;	/* used for multi-column DISTINCT */
-
-	/*
-	 * These values are working state that is initialized at the start of an
-	 * input tuple group and updated for each input tuple.
-	 *
-	 * For a simple (non DISTINCT/ORDER BY) aggregate, we just feed the input
-	 * values straight to the transition function.  If it's DISTINCT or
-	 * requires ORDER BY, we pass the input values into a Tuplesort object;
-	 * then at completion of the input tuple group, we scan the sorted values,
-	 * eliminate duplicates if needed, and run the transition function on the
-	 * rest.
-	 *
-	 * We need a separate tuplesort for each grouping set.
-	 */
-
-	Tuplesortstate **sortstates;	/* sort objects, if DISTINCT or ORDER BY */
-
-	/*
-	 * This field is a pre-initialized FunctionCallInfo struct used for
-	 * calling this aggregate's transfn.  We save a few cycles per row by not
-	 * re-initializing the unchanging fields; which isn't much, but it seems
-	 * worth the extra space consumption.
-	 */
-	FunctionCallInfoData transfn_fcinfo;
-
-	/* Likewise for serialization and deserialization functions */
-	FunctionCallInfoData serialfn_fcinfo;
-
-	FunctionCallInfoData deserialfn_fcinfo;
-}			AggStatePerTransData;
-
-/*
- * AggStatePerAggData - per-aggregate information
- *
- * This contains the information needed to call the final function, to produce
- * a final aggregate result from the state value. If there are multiple
- * identical Aggrefs in the query, they can all share the same per-agg data.
- *
- * These values are set up during ExecInitAgg() and do not change thereafter.
- */
-typedef struct AggStatePerAggData
-{
-	/*
-	 * Link to an Aggref expr this state value is for.
-	 *
-	 * There can be multiple identical Aggref's sharing the same per-agg. This
-	 * points to the first one of them.
-	 */
-	Aggref	   *aggref;
-
-	/* index to the state value which this agg should use */
-	int			transno;
-
-	/* Optional Oid of final function (may be InvalidOid) */
-	Oid			finalfn_oid;
-
-	/*
-	 * fmgr lookup data for final function --- only valid when finalfn_oid oid
-	 * is not InvalidOid.
-	 */
-	FmgrInfo	finalfn;
-
-	/*
-	 * Number of arguments to pass to the finalfn.  This is always at least 1
-	 * (the transition state value) plus any ordered-set direct args. If the
-	 * finalfn wants extra args then we pass nulls corresponding to the
-	 * aggregated input columns.
-	 */
-	int			numFinalArgs;
-
-	/*
-	 * We need the len and byval info for the agg's result data type in order
-	 * to know how to copy/delete values.
-	 */
-	int16		resulttypeLen;
-	bool		resulttypeByVal;
-
-}			AggStatePerAggData;
-
-/*
- * AggStatePerGroupData - per-aggregate-per-group working state
- *
- * These values are working state that is initialized at the start of
- * an input tuple group and updated for each input tuple.
- *
- * In AGG_PLAIN and AGG_SORTED modes, we have a single array of these
- * structs (pointed to by aggstate->pergroup); we re-use the array for
- * each input group, if it's AGG_SORTED mode.  In AGG_HASHED mode, the
- * hash table contains an array of these structs for each tuple group.
- *
- * Logically, the sortstate field belongs in this struct, but we do not
- * keep it here for space reasons: we don't support DISTINCT aggregates
- * in AGG_HASHED mode, so there's no reason to use up a pointer field
- * in every entry of the hashtable.
- */
-typedef struct AggStatePerGroupData
-{
-	Datum		transValue;		/* current transition value */
-	bool		transValueIsNull;
-
-	bool		noTransValue;	/* true if transValue not set yet */
-
-	/*
-	 * Note: noTransValue initially has the same value as transValueIsNull,
-	 * and if true both are cleared to false at the same time.  They are not
-	 * the same though: if transfn later returns a NULL, we want to keep that
-	 * NULL and not auto-replace it with a later input value. Only the first
-	 * non-NULL input will be auto-substituted.
-	 */
-}			AggStatePerGroupData;
-
-/*
- * AggStatePerPhaseData - per-grouping-set-phase state
- *
- * Grouping sets are divided into "phases", where a single phase can be
- * processed in one pass over the input. If there is more than one phase, then
- * at the end of input from the current phase, state is reset and another pass
- * taken over the data which has been re-sorted in the mean time.
- *
- * Accordingly, each phase specifies a list of grouping sets and group clause
- * information, plus each phase after the first also has a sort order.
- */
-typedef struct AggStatePerPhaseData
-{
-	AggStrategy aggstrategy;	/* strategy for this phase */
-	int			numsets;		/* number of grouping sets (or 0) */
-	int		   *gset_lengths;	/* lengths of grouping sets */
-	Bitmapset **grouped_cols;	/* column groupings for rollup */
-	FmgrInfo   *eqfunctions;	/* per-grouping-field equality fns */
-	Agg		   *aggnode;		/* Agg node for phase data */
-	Sort	   *sortnode;		/* Sort node for input ordering for phase */
-}			AggStatePerPhaseData;
-
-/*
- * AggStatePerHashData - per-hashtable state
- *
- * When doing grouping sets with hashing, we have one of these for each
- * grouping set. (When doing hashing without grouping sets, we have just one of
- * them.)
- */
-typedef struct AggStatePerHashData
-{
-	TupleHashTable hashtable;	/* hash table with one entry per group */
-	TupleHashIterator hashiter; /* for iterating through hash table */
-	TupleTableSlot *hashslot;	/* slot for loading hash table */
-	FmgrInfo   *hashfunctions;	/* per-grouping-field hash fns */
-	FmgrInfo   *eqfunctions;	/* per-grouping-field equality fns */
-	int			numCols;		/* number of hash key columns */
-	int			numhashGrpCols; /* number of columns in hash table */
-	int			largestGrpColIdx;	/* largest col required for hashing */
-	AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */
-	AttrNumber *hashGrpColIdxHash;	/* indices in hashtbl tuples */
-	Agg		   *aggnode;		/* original Agg node, for numGroups etc. */
-}			AggStatePerHashData;
-
-
 static void select_current_set(AggState *aggstate, int setno, bool is_hash);
 static void initialize_phase(AggState *aggstate, int newphase);
 static TupleTableSlot *fetch_input_tuple(AggState *aggstate);
 static void initialize_aggregates(AggState *aggstate,
-					  AggStatePerGroup pergroup,
+					  AggStatePerGroup *pergroups,
 					  int numReset);
 static void advance_transition_function(AggState *aggstate,
 							AggStatePerTrans pertrans,
 							AggStatePerGroup pergroupstate);
-static void advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup,
-				   AggStatePerGroup *pergroups);
-static void advance_combine_function(AggState *aggstate,
-						 AggStatePerTrans pertrans,
-						 AggStatePerGroup pergroupstate);
-static void combine_aggregates(AggState *aggstate, AggStatePerGroup pergroup);
+static void advance_aggregates(AggState *aggstate);
 static void process_ordered_aggregate_single(AggState *aggstate,
 								 AggStatePerTrans pertrans,
 								 AggStatePerGroup pergroupstate);
@@ -558,7 +274,7 @@ static Bitmapset *find_unaggregated_cols(AggState *aggstate);
 static bool find_unaggregated_cols_walker(Node *node, Bitmapset **colnos);
 static void build_hash_table(AggState *aggstate);
 static TupleHashEntryData *lookup_hash_entry(AggState *aggstate);
-static AggStatePerGroup *lookup_hash_entries(AggState *aggstate);
+static void lookup_hash_entries(AggState *aggstate);
 static TupleTableSlot *agg_retrieve_direct(AggState *aggstate);
 static void agg_fill_hash_table(AggState *aggstate);
 static TupleTableSlot *agg_retrieve_hash_table(AggState *aggstate);
@@ -572,6 +288,7 @@ static void build_pertrans_for_aggref(AggStatePerTrans pertrans,
 static int find_compatible_peragg(Aggref *newagg, AggState *aggstate,
 					   int lastaggno, List **same_input_transnos);
 static int find_compatible_pertrans(AggState *aggstate, Aggref *newagg,
+						 bool sharable,
 						 Oid aggtransfn, Oid aggtranstype,
 						 Oid aggserialfn, Oid aggdeserialfn,
 						 Datum initValue, bool initValueIsNull,
@@ -585,6 +302,7 @@ static int find_compatible_pertrans(AggState *aggstate, Aggref *newagg,
 static void
 select_current_set(AggState *aggstate, int setno, bool is_hash)
 {
+	/* when changing this, also adapt ExecInterpExpr() and friends */
 	if (is_hash)
 		aggstate->curaggcontext = aggstate->hashcontext;
 	else
@@ -655,7 +373,7 @@ initialize_phase(AggState *aggstate, int newphase)
 												  sortnode->collations,
 												  sortnode->nullsFirst,
 												  work_mem,
-												  false);
+												  NULL, false);
 	}
 
 	aggstate->current_phase = newphase;
@@ -724,12 +442,16 @@ initialize_aggregate(AggState *aggstate, AggStatePerTrans pertrans,
 		 * process_ordered_aggregate_single.)
 		 */
 		if (pertrans->numInputs == 1)
+		{
+			Form_pg_attribute attr = TupleDescAttr(pertrans->sortdesc, 0);
+
 			pertrans->sortstates[aggstate->current_set] =
-				tuplesort_begin_datum(pertrans->sortdesc->attrs[0]->atttypid,
+				tuplesort_begin_datum(attr->atttypid,
 									  pertrans->sortOperators[0],
 									  pertrans->sortCollations[0],
 									  pertrans->sortNullsFirst[0],
-									  work_mem, false);
+									  work_mem, NULL, false);
+		}
 		else
 			pertrans->sortstates[aggstate->current_set] =
 				tuplesort_begin_heap(pertrans->sortdesc,
@@ -738,7 +460,7 @@ initialize_aggregate(AggState *aggstate, AggStatePerTrans pertrans,
 									 pertrans->sortOperators,
 									 pertrans->sortCollations,
 									 pertrans->sortNullsFirst,
-									 work_mem, false);
+									 work_mem, NULL, false);
 	}
 
 	/*
@@ -778,14 +500,16 @@ initialize_aggregate(AggState *aggstate, AggStatePerTrans pertrans,
  * If there are multiple grouping sets, we initialize only the first numReset
  * of them (the grouping sets are ordered so that the most specific one, which
  * is reset most often, is first). As a convenience, if numReset is 0, we
- * reinitialize all sets. numReset is -1 to initialize a hashtable entry, in
- * which case the caller must have used select_current_set appropriately.
+ * reinitialize all sets.
+ *
+ * NB: This cannot be used for hash aggregates, as for those the grouping set
+ * number has to be specified from further up.
  *
  * When called, CurrentMemoryContext should be the per-query context.
  */
 static void
 initialize_aggregates(AggState *aggstate,
-					  AggStatePerGroup pergroup,
+					  AggStatePerGroup *pergroups,
 					  int numReset)
 {
 	int			transno;
@@ -797,30 +521,18 @@ initialize_aggregates(AggState *aggstate,
 	if (numReset == 0)
 		numReset = numGroupingSets;
 
-	for (transno = 0; transno < numTrans; transno++)
+	for (setno = 0; setno < numReset; setno++)
 	{
-		AggStatePerTrans pertrans = &transstates[transno];
-
-		if (numReset < 0)
-		{
-			AggStatePerGroup pergroupstate;
+		AggStatePerGroup pergroup = pergroups[setno];
 
-			pergroupstate = &pergroup[transno];
+		select_current_set(aggstate, setno, false);
 
-			initialize_aggregate(aggstate, pertrans, pergroupstate);
-		}
-		else
+		for (transno = 0; transno < numTrans; transno++)
 		{
-			for (setno = 0; setno < numReset; setno++)
-			{
-				AggStatePerGroup pergroupstate;
-
-				pergroupstate = &pergroup[transno + (setno * numTrans)];
+			AggStatePerTrans pertrans = &transstates[transno];
+			AggStatePerGroup pergroupstate = &pergroup[transno];
 
-				select_current_set(aggstate, setno, false);
-
-				initialize_aggregate(aggstate, pertrans, pergroupstate);
-			}
+			initialize_aggregate(aggstate, pertrans, pergroupstate);
 		}
 	}
 }
@@ -961,321 +673,15 @@ advance_transition_function(AggState *aggstate,
  * When called, CurrentMemoryContext should be the per-query context.
  */
 static void
-advance_aggregates(AggState *aggstate, AggStatePerGroup pergroup, AggStatePerGroup *pergroups)
+advance_aggregates(AggState *aggstate)
 {
-	int			transno;
-	int			setno = 0;
-	int			numGroupingSets = Max(aggstate->phase->numsets, 1);
-	int			numHashes = aggstate->num_hashes;
-	int			numTrans = aggstate->numtrans;
-	TupleTableSlot *slot = aggstate->evalslot;
-
-	/* compute input for all aggregates */
-	if (aggstate->evalproj)
-		aggstate->evalslot = ExecProject(aggstate->evalproj);
-
-	for (transno = 0; transno < numTrans; transno++)
-	{
-		AggStatePerTrans pertrans = &aggstate->pertrans[transno];
-		ExprState  *filter = pertrans->aggfilter;
-		int			numTransInputs = pertrans->numTransInputs;
-		int			i;
-		int			inputoff = pertrans->inputoff;
-
-		/* Skip anything FILTERed out */
-		if (filter)
-		{
-			Datum		res;
-			bool		isnull;
-
-			res = ExecEvalExprSwitchContext(filter, aggstate->tmpcontext,
-											&isnull);
-			if (isnull || !DatumGetBool(res))
-				continue;
-		}
-
-		if (pertrans->numSortCols > 0)
-		{
-			/* DISTINCT and/or ORDER BY case */
-			Assert(slot->tts_nvalid >= (pertrans->numInputs + inputoff));
-			Assert(!pergroups);
-
-			/*
-			 * If the transfn is strict, we want to check for nullity before
-			 * storing the row in the sorter, to save space if there are a lot
-			 * of nulls.  Note that we must only check numTransInputs columns,
-			 * not numInputs, since nullity in columns used only for sorting
-			 * is not relevant here.
-			 */
-			if (pertrans->transfn.fn_strict)
-			{
-				for (i = 0; i < numTransInputs; i++)
-				{
-					if (slot->tts_isnull[i + inputoff])
-						break;
-				}
-				if (i < numTransInputs)
-					continue;
-			}
-
-			for (setno = 0; setno < numGroupingSets; setno++)
-			{
-				/* OK, put the tuple into the tuplesort object */
-				if (pertrans->numInputs == 1)
-					tuplesort_putdatum(pertrans->sortstates[setno],
-									   slot->tts_values[inputoff],
-									   slot->tts_isnull[inputoff]);
-				else
-				{
-					/*
-					 * Copy slot contents, starting from inputoff, into sort
-					 * slot.
-					 */
-					ExecClearTuple(pertrans->sortslot);
-					memcpy(pertrans->sortslot->tts_values,
-						   &slot->tts_values[inputoff],
-						   pertrans->numInputs * sizeof(Datum));
-					memcpy(pertrans->sortslot->tts_isnull,
-						   &slot->tts_isnull[inputoff],
-						   pertrans->numInputs * sizeof(bool));
-					pertrans->sortslot->tts_nvalid = pertrans->numInputs;
-					ExecStoreVirtualTuple(pertrans->sortslot);
-					tuplesort_puttupleslot(pertrans->sortstates[setno], pertrans->sortslot);
-				}
-			}
-		}
-		else
-		{
-			/* We can apply the transition function immediately */
-			FunctionCallInfo fcinfo = &pertrans->transfn_fcinfo;
-
-			/* Load values into fcinfo */
-			/* Start from 1, since the 0th arg will be the transition value */
-			Assert(slot->tts_nvalid >= (numTransInputs + inputoff));
-
-			for (i = 0; i < numTransInputs; i++)
-			{
-				fcinfo->arg[i + 1] = slot->tts_values[i + inputoff];
-				fcinfo->argnull[i + 1] = slot->tts_isnull[i + inputoff];
-			}
-
-			if (pergroup)
-			{
-				/* advance transition states for ordered grouping */
-
-				for (setno = 0; setno < numGroupingSets; setno++)
-				{
-					AggStatePerGroup pergroupstate;
-
-					select_current_set(aggstate, setno, false);
-
-					pergroupstate = &pergroup[transno + (setno * numTrans)];
-
-					advance_transition_function(aggstate, pertrans, pergroupstate);
-				}
-			}
-
-			if (pergroups)
-			{
-				/* advance transition states for hashed grouping */
+	bool		dummynull;
 
-				for (setno = 0; setno < numHashes; setno++)
-				{
-					AggStatePerGroup pergroupstate;
-
-					select_current_set(aggstate, setno, true);
-
-					pergroupstate = &pergroups[setno][transno];
-
-					advance_transition_function(aggstate, pertrans, pergroupstate);
-				}
-			}
-		}
-	}
+	ExecEvalExprSwitchContext(aggstate->phase->evaltrans,
+							  aggstate->tmpcontext,
+							  &dummynull);
 }
 
-/*
- * combine_aggregates replaces advance_aggregates in DO_AGGSPLIT_COMBINE
- * mode.  The principal difference is that here we may need to apply the
- * deserialization function before running the transfn (which, in this mode,
- * is actually the aggregate's combinefn).  Also, we know we don't need to
- * handle FILTER, DISTINCT, ORDER BY, or grouping sets.
- */
-static void
-combine_aggregates(AggState *aggstate, AggStatePerGroup pergroup)
-{
-	int			transno;
-	int			numTrans = aggstate->numtrans;
-	TupleTableSlot *slot;
-
-	/* combine not supported with grouping sets */
-	Assert(aggstate->phase->numsets <= 1);
-
-	/* compute input for all aggregates */
-	slot = ExecProject(aggstate->evalproj);
-
-	for (transno = 0; transno < numTrans; transno++)
-	{
-		AggStatePerTrans pertrans = &aggstate->pertrans[transno];
-		AggStatePerGroup pergroupstate = &pergroup[transno];
-		FunctionCallInfo fcinfo = &pertrans->transfn_fcinfo;
-		int			inputoff = pertrans->inputoff;
-
-		Assert(slot->tts_nvalid > inputoff);
-
-		/*
-		 * deserialfn_oid will be set if we must deserialize the input state
-		 * before calling the combine function
-		 */
-		if (OidIsValid(pertrans->deserialfn_oid))
-		{
-			/* Don't call a strict deserialization function with NULL input */
-			if (pertrans->deserialfn.fn_strict && slot->tts_isnull[inputoff])
-			{
-				fcinfo->arg[1] = slot->tts_values[inputoff];
-				fcinfo->argnull[1] = slot->tts_isnull[inputoff];
-			}
-			else
-			{
-				FunctionCallInfo dsinfo = &pertrans->deserialfn_fcinfo;
-				MemoryContext oldContext;
-
-				dsinfo->arg[0] = slot->tts_values[inputoff];
-				dsinfo->argnull[0] = slot->tts_isnull[inputoff];
-				/* Dummy second argument for type-safety reasons */
-				dsinfo->arg[1] = PointerGetDatum(NULL);
-				dsinfo->argnull[1] = false;
-
-				/*
-				 * We run the deserialization functions in per-input-tuple
-				 * memory context.
-				 */
-				oldContext = MemoryContextSwitchTo(aggstate->tmpcontext->ecxt_per_tuple_memory);
-
-				fcinfo->arg[1] = FunctionCallInvoke(dsinfo);
-				fcinfo->argnull[1] = dsinfo->isnull;
-
-				MemoryContextSwitchTo(oldContext);
-			}
-		}
-		else
-		{
-			fcinfo->arg[1] = slot->tts_values[inputoff];
-			fcinfo->argnull[1] = slot->tts_isnull[inputoff];
-		}
-
-		advance_combine_function(aggstate, pertrans, pergroupstate);
-	}
-}
-
-/*
- * Perform combination of states between 2 aggregate states. Effectively this
- * 'adds' two states together by whichever logic is defined in the aggregate
- * function's combine function.
- *
- * Note that in this case transfn is set to the combination function. This
- * perhaps should be changed to avoid confusion, but one field is ok for now
- * as they'll never be needed at the same time.
- */
-static void
-advance_combine_function(AggState *aggstate,
-						 AggStatePerTrans pertrans,
-						 AggStatePerGroup pergroupstate)
-{
-	FunctionCallInfo fcinfo = &pertrans->transfn_fcinfo;
-	MemoryContext oldContext;
-	Datum		newVal;
-
-	if (pertrans->transfn.fn_strict)
-	{
-		/* if we're asked to merge to a NULL state, then do nothing */
-		if (fcinfo->argnull[1])
-			return;
-
-		if (pergroupstate->noTransValue)
-		{
-			/*
-			 * transValue has not yet been initialized.  If pass-by-ref
-			 * datatype we must copy the combining state value into
-			 * aggcontext.
-			 */
-			if (!pertrans->transtypeByVal)
-			{
-				oldContext = MemoryContextSwitchTo(
-												   aggstate->curaggcontext->ecxt_per_tuple_memory);
-				pergroupstate->transValue = datumCopy(fcinfo->arg[1],
-													  pertrans->transtypeByVal,
-													  pertrans->transtypeLen);
-				MemoryContextSwitchTo(oldContext);
-			}
-			else
-				pergroupstate->transValue = fcinfo->arg[1];
-
-			pergroupstate->transValueIsNull = false;
-			pergroupstate->noTransValue = false;
-			return;
-		}
-	}
-
-	/* We run the combine functions in per-input-tuple memory context */
-	oldContext = MemoryContextSwitchTo(aggstate->tmpcontext->ecxt_per_tuple_memory);
-
-	/* set up aggstate->curpertrans for AggGetAggref() */
-	aggstate->curpertrans = pertrans;
-
-	/*
-	 * OK to call the combine function
-	 */
-	fcinfo->arg[0] = pergroupstate->transValue;
-	fcinfo->argnull[0] = pergroupstate->transValueIsNull;
-	fcinfo->isnull = false;		/* just in case combine func doesn't set it */
-
-	newVal = FunctionCallInvoke(fcinfo);
-
-	aggstate->curpertrans = NULL;
-
-	/*
-	 * If pass-by-ref datatype, must copy the new value into aggcontext and
-	 * free the prior transValue.  But if the combine function returned a
-	 * pointer to its first input, we don't need to do anything.  Also, if the
-	 * combine function returned a pointer to a R/W expanded object that is
-	 * already a child of the aggcontext, assume we can adopt that value
-	 * without copying it.
-	 */
-	if (!pertrans->transtypeByVal &&
-		DatumGetPointer(newVal) != DatumGetPointer(pergroupstate->transValue))
-	{
-		if (!fcinfo->isnull)
-		{
-			MemoryContextSwitchTo(aggstate->curaggcontext->ecxt_per_tuple_memory);
-			if (DatumIsReadWriteExpandedObject(newVal,
-											   false,
-											   pertrans->transtypeLen) &&
-				MemoryContextGetParent(DatumGetEOHP(newVal)->eoh_context) == CurrentMemoryContext)
-				 /* do nothing */ ;
-			else
-				newVal = datumCopy(newVal,
-								   pertrans->transtypeByVal,
-								   pertrans->transtypeLen);
-		}
-		if (!pergroupstate->transValueIsNull)
-		{
-			if (DatumIsReadWriteExpandedObject(pergroupstate->transValue,
-											   false,
-											   pertrans->transtypeLen))
-				DeleteExpandedObject(pergroupstate->transValue);
-			else
-				pfree(DatumGetPointer(pergroupstate->transValue));
-		}
-	}
-
-	pergroupstate->transValue = newVal;
-	pergroupstate->transValueIsNull = fcinfo->isnull;
-
-	MemoryContextSwitchTo(oldContext);
-}
-
-
 /*
  * Run the transition function for a DISTINCT or ORDER BY aggregate
  * with only one input.  This is called after we have completed
@@ -1349,7 +755,7 @@ process_ordered_aggregate_single(AggState *aggstate,
 			((oldIsNull && *isNull) ||
 			 (!oldIsNull && !*isNull &&
 			  oldAbbrevVal == newAbbrevVal &&
-			  DatumGetBool(FunctionCall2(&pertrans->equalfns[0],
+			  DatumGetBool(FunctionCall2(&pertrans->equalfnOne,
 										 oldVal, *newVal)))))
 		{
 			/* equal to prior, so forget this one */
@@ -1396,7 +802,7 @@ process_ordered_aggregate_multi(AggState *aggstate,
 								AggStatePerTrans pertrans,
 								AggStatePerGroup pergroupstate)
 {
-	MemoryContext workcontext = aggstate->tmpcontext->ecxt_per_tuple_memory;
+	ExprContext *tmpcontext = aggstate->tmpcontext;
 	FunctionCallInfo fcinfo = &pertrans->transfn_fcinfo;
 	TupleTableSlot *slot1 = pertrans->sortslot;
 	TupleTableSlot *slot2 = pertrans->uniqslot;
@@ -1405,6 +811,7 @@ process_ordered_aggregate_multi(AggState *aggstate,
 	Datum		newAbbrevVal = (Datum) 0;
 	Datum		oldAbbrevVal = (Datum) 0;
 	bool		haveOldValue = false;
+	TupleTableSlot *save = aggstate->tmpcontext->ecxt_outertuple;
 	int			i;
 
 	tuplesort_performsort(pertrans->sortstates[aggstate->current_set]);
@@ -1418,22 +825,20 @@ process_ordered_aggregate_multi(AggState *aggstate,
 	{
 		CHECK_FOR_INTERRUPTS();
 
-		/*
-		 * Extract the first numTransInputs columns as datums to pass to the
-		 * transfn.  (This will help execTuplesMatch too, so we do it
-		 * immediately.)
-		 */
-		slot_getsomeattrs(slot1, numTransInputs);
+		tmpcontext->ecxt_outertuple = slot1;
+		tmpcontext->ecxt_innertuple = slot2;
 
 		if (numDistinctCols == 0 ||
 			!haveOldValue ||
 			newAbbrevVal != oldAbbrevVal ||
-			!execTuplesMatch(slot1, slot2,
-							 numDistinctCols,
-							 pertrans->sortColIdx,
-							 pertrans->equalfns,
-							 workcontext))
+			!ExecQual(pertrans->equalfnMulti, tmpcontext))
 		{
+			/*
+			 * Extract the first numTransInputs columns as datums to pass to
+			 * the transfn.
+			 */
+			slot_getsomeattrs(slot1, numTransInputs);
+
 			/* Load values into fcinfo */
 			/* Start from 1, since the 0th arg will be the transition value */
 			for (i = 0; i < numTransInputs; i++)
@@ -1451,15 +856,14 @@ process_ordered_aggregate_multi(AggState *aggstate,
 
 				slot2 = slot1;
 				slot1 = tmpslot;
-				/* avoid execTuplesMatch() calls by reusing abbreviated keys */
+				/* avoid ExecQual() calls by reusing abbreviated keys */
 				oldAbbrevVal = newAbbrevVal;
 				haveOldValue = true;
 			}
 		}
 
-		/* Reset context each time, unless execTuplesMatch did it for us */
-		if (numDistinctCols == 0)
-			MemoryContextReset(workcontext);
+		/* Reset context each time */
+		ResetExprContext(tmpcontext);
 
 		ExecClearTuple(slot1);
 	}
@@ -1469,6 +873,9 @@ process_ordered_aggregate_multi(AggState *aggstate,
 
 	tuplesort_end(pertrans->sortstates[aggstate->current_set]);
 	pertrans->sortstates[aggstate->current_set] = NULL;
+
+	/* restore previous slot, potentially in use for grouping sets */
+	tmpcontext->ecxt_outertuple = save;
 }
 
 /*
@@ -1506,7 +913,7 @@ finalize_aggregate(AggState *aggstate,
 	 * for the transition state value.
 	 */
 	i = 1;
-	foreach(lc, pertrans->aggdirectargs)
+	foreach(lc, peragg->aggdirectargs)
 	{
 		ExprState  *expr = (ExprState *) lfirst(lc);
 
@@ -1524,8 +931,8 @@ finalize_aggregate(AggState *aggstate,
 	{
 		int			numFinalArgs = peragg->numFinalArgs;
 
-		/* set up aggstate->curpertrans for AggGetAggref() */
-		aggstate->curpertrans = pertrans;
+		/* set up aggstate->curperagg for AggGetAggref() */
+		aggstate->curperagg = peragg;
 
 		InitFunctionCallInfoData(fcinfo, &peragg->finalfn,
 								 numFinalArgs,
@@ -1558,7 +965,7 @@ finalize_aggregate(AggState *aggstate,
 			*resultVal = FunctionCallInvoke(&fcinfo);
 			*resultIsNull = fcinfo.isnull;
 		}
-		aggstate->curpertrans = NULL;
+		aggstate->curperagg = NULL;
 	}
 	else
 	{
@@ -1870,9 +1277,11 @@ build_hash_table(AggState *aggstate)
 
 		Assert(perhash->aggnode->numGroups > 0);
 
-		perhash->hashtable = BuildTupleHashTable(perhash->numCols,
+		perhash->hashtable = BuildTupleHashTable(&aggstate->ss.ps,
+												 perhash->hashslot->tts_tupleDescriptor,
+												 perhash->numCols,
 												 perhash->hashGrpColIdxHash,
-												 perhash->eqfunctions,
+												 perhash->eqfuncoids,
 												 perhash->hashfunctions,
 												 perhash->aggnode->numGroups,
 												 additionalsize,
@@ -1908,6 +1317,7 @@ find_hash_columns(AggState *aggstate)
 	Bitmapset  *base_colnos;
 	List	   *outerTlist = outerPlanState(aggstate)->plan->targetlist;
 	int			numHashes = aggstate->num_hashes;
+	EState	   *estate = aggstate->ss.ps.state;
 	int			j;
 
 	/* Find Vars that will be needed in tlist and qual */
@@ -1987,7 +1397,13 @@ find_hash_columns(AggState *aggstate)
 		}
 
 		hashDesc = ExecTypeFromTL(hashTlist, false);
-		ExecSetSlotDescriptor(perhash->hashslot, hashDesc);
+
+		execTuplesHashPrepare(perhash->numCols,
+							  perhash->aggnode->grpOperators,
+							  &perhash->eqfuncoids,
+							  &perhash->hashfunctions);
+		perhash->hashslot =
+			ExecAllocTableSlot(&estate->es_tupleTable, hashDesc);
 
 		list_free(hashTlist);
 		bms_free(colnos);
@@ -2053,12 +1469,25 @@ lookup_hash_entry(AggState *aggstate)
 
 	if (isnew)
 	{
-		entry->additional = (AggStatePerGroup)
+		AggStatePerGroup pergroup;
+		int			transno;
+
+		pergroup = (AggStatePerGroup)
 			MemoryContextAlloc(perhash->hashtable->tablecxt,
 							   sizeof(AggStatePerGroupData) * aggstate->numtrans);
-		/* initialize aggregates for new tuple group */
-		initialize_aggregates(aggstate, (AggStatePerGroup) entry->additional,
-							  -1);
+		entry->additional = pergroup;
+
+		/*
+		 * Initialize aggregates for new tuple group, lookup_hash_entries()
+		 * already has selected the relevant grouping set.
+		 */
+		for (transno = 0; transno < aggstate->numtrans; transno++)
+		{
+			AggStatePerTrans pertrans = &aggstate->pertrans[transno];
+			AggStatePerGroup pergroupstate = &pergroup[transno];
+
+			initialize_aggregate(aggstate, pertrans, pergroupstate);
+		}
 	}
 
 	return entry;
@@ -2070,7 +1499,7 @@ lookup_hash_entry(AggState *aggstate)
  *
  * Be aware that lookup_hash_entry can reset the tmpcontext.
  */
-static AggStatePerGroup *
+static void
 lookup_hash_entries(AggState *aggstate)
 {
 	int			numHashes = aggstate->num_hashes;
@@ -2082,8 +1511,6 @@ lookup_hash_entries(AggState *aggstate)
 		select_current_set(aggstate, setno, true);
 		pergroup[setno] = lookup_hash_entry(aggstate)->additional;
 	}
-
-	return pergroup;
 }
 
 /*
@@ -2142,8 +1569,7 @@ agg_retrieve_direct(AggState *aggstate)
 	ExprContext *econtext;
 	ExprContext *tmpcontext;
 	AggStatePerAgg peragg;
-	AggStatePerGroup pergroup;
-	AggStatePerGroup *hash_pergroups = NULL;
+	AggStatePerGroup *pergroups;
 	TupleTableSlot *outerslot;
 	TupleTableSlot *firstSlot;
 	TupleTableSlot *result;
@@ -2165,7 +1591,7 @@ agg_retrieve_direct(AggState *aggstate)
 	tmpcontext = aggstate->tmpcontext;
 
 	peragg = aggstate->peragg;
-	pergroup = aggstate->pergroup;
+	pergroups = aggstate->pergroups;
 	firstSlot = aggstate->ss.ss_ScanTupleSlot;
 
 	/*
@@ -2278,17 +1704,14 @@ agg_retrieve_direct(AggState *aggstate)
 		 *		of the next grouping set
 		 *----------
 		 */
+		tmpcontext->ecxt_innertuple = econtext->ecxt_outertuple;
 		if (aggstate->input_done ||
 			(node->aggstrategy != AGG_PLAIN &&
 			 aggstate->projected_set != -1 &&
 			 aggstate->projected_set < (numGroupingSets - 1) &&
 			 nextSetSize > 0 &&
-			 !execTuplesMatch(econtext->ecxt_outertuple,
-							  tmpcontext->ecxt_outertuple,
-							  nextSetSize,
-							  node->grpColIdx,
-							  aggstate->phase->eqfunctions,
-							  tmpcontext->ecxt_per_tuple_memory)))
+			 !ExecQualAndReset(aggstate->phase->eqfunctions[nextSetSize - 1],
+							   tmpcontext)))
 		{
 			aggstate->projected_set += 1;
 
@@ -2367,7 +1790,7 @@ agg_retrieve_direct(AggState *aggstate)
 			/*
 			 * Initialize working state for a new input tuple group.
 			 */
-			initialize_aggregates(aggstate, pergroup, numReset);
+			initialize_aggregates(aggstate, pergroups, numReset);
 
 			if (aggstate->grp_firstTuple != NULL)
 			{
@@ -2398,15 +1821,11 @@ agg_retrieve_direct(AggState *aggstate)
 					if (aggstate->aggstrategy == AGG_MIXED &&
 						aggstate->current_phase == 1)
 					{
-						hash_pergroups = lookup_hash_entries(aggstate);
+						lookup_hash_entries(aggstate);
 					}
-					else
-						hash_pergroups = NULL;
 
-					if (DO_AGGSPLIT_COMBINE(aggstate->aggsplit))
-						combine_aggregates(aggstate, pergroup);
-					else
-						advance_aggregates(aggstate, pergroup, hash_pergroups);
+					/* Advance the aggregates (or combine functions) */
+					advance_aggregates(aggstate);
 
 					/* Reset per-input-tuple context after each tuple */
 					ResetExprContext(tmpcontext);
@@ -2435,12 +1854,9 @@ agg_retrieve_direct(AggState *aggstate)
 					 */
 					if (node->aggstrategy != AGG_PLAIN)
 					{
-						if (!execTuplesMatch(firstSlot,
-											 outerslot,
-											 node->numCols,
-											 node->grpColIdx,
-											 aggstate->phase->eqfunctions,
-											 tmpcontext->ecxt_per_tuple_memory))
+						tmpcontext->ecxt_innertuple = firstSlot;
+						if (!ExecQual(aggstate->phase->eqfunctions[node->numCols - 1],
+									  tmpcontext))
 						{
 							aggstate->grp_firstTuple = ExecCopySlotTuple(outerslot);
 							break;
@@ -2470,7 +1886,7 @@ agg_retrieve_direct(AggState *aggstate)
 
 		finalize_aggregates(aggstate,
 							peragg,
-							pergroup + (currentSet * aggstate->numtrans));
+							pergroups[currentSet]);
 
 		/*
 		 * If there's no row to project right now, we must continue rather
@@ -2500,8 +1916,6 @@ agg_fill_hash_table(AggState *aggstate)
 	 */
 	for (;;)
 	{
-		AggStatePerGroup *pergroups;
-
 		outerslot = fetch_input_tuple(aggstate);
 		if (TupIsNull(outerslot))
 			break;
@@ -2510,13 +1924,10 @@ agg_fill_hash_table(AggState *aggstate)
 		tmpcontext->ecxt_outertuple = outerslot;
 
 		/* Find or build hashtable entries */
-		pergroups = lookup_hash_entries(aggstate);
+		lookup_hash_entries(aggstate);
 
-		/* Advance the aggregates */
-		if (DO_AGGSPLIT_COMBINE(aggstate->aggsplit))
-			combine_aggregates(aggstate, pergroups[0]);
-		else
-			advance_aggregates(aggstate, NULL, pergroups);
+		/* Advance the aggregates (or combine functions) */
+		advance_aggregates(aggstate);
 
 		/*
 		 * Reset per-input-tuple context after each tuple, but note that the
@@ -2597,7 +2008,7 @@ agg_retrieve_hash_table(AggState *aggstate)
 			else
 			{
 				/* No more hashtables, so done */
-				aggstate->agg_done = TRUE;
+				aggstate->agg_done = true;
 				return NULL;
 			}
 		}
@@ -2668,20 +2079,20 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	AggState   *aggstate;
 	AggStatePerAgg peraggs;
 	AggStatePerTrans pertransstates;
+	AggStatePerGroup *pergroups;
 	Plan	   *outerPlan;
 	ExprContext *econtext;
+	TupleDesc	scanDesc;
 	int			numaggs,
 				transno,
 				aggno;
 	int			phase;
 	int			phaseidx;
-	List	   *combined_inputeval;
 	ListCell   *l;
 	Bitmapset  *all_grouped_cols = NULL;
 	int			numGroupingSets = 1;
 	int			numPhases;
 	int			numHashes;
-	int			column_offset;
 	int			i = 0;
 	int			j = 0;
 	bool		use_hashing = (node->aggstrategy == AGG_HASHED ||
@@ -2708,10 +2119,11 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	aggstate->current_set = 0;
 	aggstate->peragg = NULL;
 	aggstate->pertrans = NULL;
+	aggstate->curperagg = NULL;
 	aggstate->curpertrans = NULL;
 	aggstate->input_done = false;
 	aggstate->agg_done = false;
-	aggstate->pergroup = NULL;
+	aggstate->pergroups = NULL;
 	aggstate->grp_firstTuple = NULL;
 	aggstate->sort_in = NULL;
 	aggstate->sort_out = NULL;
@@ -2786,30 +2198,6 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 
 	ExecAssignExprContext(estate, &aggstate->ss.ps);
 
-	/*
-	 * tuple table initialization.
-	 *
-	 * For hashtables, we create some additional slots below.
-	 */
-	ExecInitScanTupleSlot(estate, &aggstate->ss);
-	ExecInitResultTupleSlot(estate, &aggstate->ss.ps);
-	aggstate->sort_slot = ExecInitExtraTupleSlot(estate);
-
-	/*
-	 * initialize child expressions
-	 *
-	 * We rely on the parser to have checked that no aggs contain other agg
-	 * calls in their arguments.  This would make no sense under SQL semantics
-	 * (and it's forbidden by the spec).  Because it is true, we don't need to
-	 * worry about evaluating the aggs in any particular order.
-	 *
-	 * Note: execExpr.c finds Aggrefs for us, and adds their AggrefExprState
-	 * nodes to aggstate->aggs.  Aggrefs in the qual are found here; Aggrefs
-	 * in the targetlist are found during ExecAssignProjectionInfo, below.
-	 */
-	aggstate->ss.ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) aggstate);
-
 	/*
 	 * Initialize child nodes.
 	 *
@@ -2824,33 +2212,38 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	/*
 	 * initialize source tuple type.
 	 */
-	ExecAssignScanTypeFromOuterPlan(&aggstate->ss);
+	ExecCreateScanSlotFromOuterPlan(estate, &aggstate->ss);
+	scanDesc = aggstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor;
 	if (node->chain)
-		ExecSetSlotDescriptor(aggstate->sort_slot,
-							  aggstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
+		aggstate->sort_slot = ExecInitExtraTupleSlot(estate, scanDesc);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result type, slot and projection.
 	 */
-	ExecAssignResultTypeFromTL(&aggstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &aggstate->ss.ps);
 	ExecAssignProjectionInfo(&aggstate->ss.ps, NULL);
 
+	/*
+	 * initialize child expressions
+	 *
+	 * We expect the parser to have checked that no aggs contain other agg
+	 * calls in their arguments (and just to be sure, we verify it again while
+	 * initializing the plan node).  This would make no sense under SQL
+	 * semantics, and it's forbidden by the spec.  Because it is true, we
+	 * don't need to worry about evaluating the aggs in any particular order.
+	 *
+	 * Note: execExpr.c finds Aggrefs for us, and adds their AggrefExprState
+	 * nodes to aggstate->aggs.  Aggrefs in the qual are found here; Aggrefs
+	 * in the targetlist are found during ExecAssignProjectionInfo, below.
+	 */
+	aggstate->ss.ps.qual =
+		ExecInitQual(node->plan.qual, (PlanState *) aggstate);
+
 	/*
 	 * We should now have found all Aggrefs in the targetlist and quals.
 	 */
 	numaggs = aggstate->numaggs;
 	Assert(numaggs == list_length(aggstate->aggs));
-	if (numaggs <= 0)
-	{
-		/*
-		 * This is not an error condition: we might be using the Agg node just
-		 * to do hash-based grouping.  Even in the regular case,
-		 * constant-expression simplification could optimize away all of the
-		 * Aggrefs in the targetlist and qual.  So keep going, but force local
-		 * copy of numaggs positive so that palloc()s below don't choke.
-		 */
-		numaggs = 1;
-	}
 
 	/*
 	 * For each phase, prepare grouping set data and fmgr lookup data for
@@ -2958,11 +2351,43 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 			 */
 			if (aggnode->aggstrategy == AGG_SORTED)
 			{
+				int			i = 0;
+
 				Assert(aggnode->numCols > 0);
 
+				/*
+				 * Build a separate function for each subset of columns that
+				 * need to be compared.
+				 */
 				phasedata->eqfunctions =
-					execTuplesMatchPrepare(aggnode->numCols,
-										   aggnode->grpOperators);
+					(ExprState **) palloc0(aggnode->numCols * sizeof(ExprState *));
+
+				/* for each grouping set */
+				for (i = 0; i < phasedata->numsets; i++)
+				{
+					int		length = phasedata->gset_lengths[i];
+
+					if (phasedata->eqfunctions[length - 1] != NULL)
+						continue;
+
+					phasedata->eqfunctions[length - 1] =
+						execTuplesMatchPrepare(scanDesc,
+											   length,
+											   aggnode->grpColIdx,
+											   aggnode->grpOperators,
+											   (PlanState *) aggstate);
+				}
+
+				/* and for all grouped columns, unless already computed */
+				if (phasedata->eqfunctions[aggnode->numCols - 1] == NULL)
+				{
+					phasedata->eqfunctions[aggnode->numCols - 1] =
+						execTuplesMatchPrepare(scanDesc,
+											   aggnode->numCols,
+											   aggnode->grpColIdx,
+											   aggnode->grpOperators,
+											   (PlanState *) aggstate);
+				}
 			}
 
 			phasedata->aggnode = aggnode;
@@ -2992,40 +2417,37 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	aggstate->peragg = peraggs;
 	aggstate->pertrans = pertransstates;
 
+
+	aggstate->all_pergroups =
+		(AggStatePerGroup *) palloc0(sizeof(AggStatePerGroup)
+									 * (numGroupingSets + numHashes));
+	pergroups = aggstate->all_pergroups;
+
+	if (node->aggstrategy != AGG_HASHED)
+	{
+		for (i = 0; i < numGroupingSets; i++)
+		{
+			pergroups[i] = (AggStatePerGroup) palloc0(sizeof(AggStatePerGroupData)
+													  * numaggs);
+		}
+
+		aggstate->pergroups = pergroups;
+		pergroups += numGroupingSets;
+	}
+
 	/*
 	 * Hashing can only appear in the initial phase.
 	 */
 	if (use_hashing)
 	{
-		for (i = 0; i < numHashes; ++i)
-		{
-			aggstate->perhash[i].hashslot = ExecInitExtraTupleSlot(estate);
-
-			execTuplesHashPrepare(aggstate->perhash[i].numCols,
-								  aggstate->perhash[i].aggnode->grpOperators,
-								  &aggstate->perhash[i].eqfunctions,
-								  &aggstate->perhash[i].hashfunctions);
-		}
-
 		/* this is an array of pointers, not structures */
-		aggstate->hash_pergroup = palloc0(sizeof(AggStatePerGroup) * numHashes);
+		aggstate->hash_pergroup = pergroups;
 
 		find_hash_columns(aggstate);
 		build_hash_table(aggstate);
 		aggstate->table_filled = false;
 	}
 
-	if (node->aggstrategy != AGG_HASHED)
-	{
-		AggStatePerGroup pergroup;
-
-		pergroup = (AggStatePerGroup) palloc0(sizeof(AggStatePerGroupData)
-											  * numaggs
-											  * numGroupingSets);
-
-		aggstate->pergroup = pergroup;
-	}
-
 	/*
 	 * Initialize current phase-dependent values to initial phase. The initial
 	 * phase is 1 (first sort pass) for all strategies that use sorting (if
@@ -3056,27 +2478,29 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	 *
 	 * Scenarios:
 	 *
-	 * 1. An aggregate function appears more than once in query:
+	 * 1. Identical aggregate function calls appear in the query:
 	 *
 	 *	  SELECT SUM(x) FROM ... HAVING SUM(x) > 0
 	 *
-	 *	  Since the aggregates are the identical, we only need to calculate
-	 *	  the calculate it once. Both aggregates will share the same 'aggno'
-	 *	  value.
+	 *	  Since these aggregates are identical, we only need to calculate
+	 *	  the value once. Both aggregates will share the same 'aggno' value.
 	 *
 	 * 2. Two different aggregate functions appear in the query, but the
-	 *	  aggregates have the same transition function and initial value, but
-	 *	  different final function:
+	 *	  aggregates have the same arguments, transition functions and
+	 *	  initial values (and, presumably, different final functions):
 	 *
-	 *	  SELECT SUM(x), AVG(x) FROM ...
+	 *	  SELECT AVG(x), STDDEV(x) FROM ...
 	 *
 	 *	  In this case we must create a new peragg for the varying aggregate,
-	 *	  and need to call the final functions separately, but can share the
-	 *	  same transition state.
+	 *	  and we need to call the final functions separately, but we need
+	 *	  only run the transition function once.  (This requires that the
+	 *	  final functions be nondestructive of the transition state, but
+	 *	  that's required anyway for other reasons.)
 	 *
-	 * For either of these optimizations to be valid, the aggregate's
-	 * arguments must be the same, including any modifiers such as ORDER BY,
-	 * DISTINCT and FILTER, and they mustn't contain any volatile functions.
+	 * For either of these optimizations to be valid, all aggregate properties
+	 * used in the transition phase must be the same, including any modifiers
+	 * such as ORDER BY, DISTINCT and FILTER, and the arguments mustn't
+	 * contain any volatile functions.
 	 * -----------------
 	 */
 	aggno = -1;
@@ -3098,6 +2522,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		AclResult	aclresult;
 		Oid			transfn_oid,
 					finalfn_oid;
+		bool		sharable;
 		Oid			serialfn_oid,
 					deserialfn_oid;
 		Expr	   *finalfnexpr;
@@ -3141,7 +2566,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		aclresult = pg_proc_aclcheck(aggref->aggfnoid, GetUserId(),
 									 ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC,
+			aclcheck_error(aclresult, OBJECT_AGGREGATE,
 						   get_func_name(aggref->aggfnoid));
 		InvokeFunctionExecuteHook(aggref->aggfnoid);
 
@@ -3170,6 +2595,15 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		else
 			peragg->finalfn_oid = finalfn_oid = aggform->aggfinalfn;
 
+		/*
+		 * If finalfn is marked read-write, we can't share transition states;
+		 * but it is okay to share states for AGGMODIFY_SHARABLE aggs.  Also,
+		 * if we're not executing the finalfn here, we can share regardless.
+		 */
+		sharable = (aggform->aggfinalmodify != AGGMODIFY_READ_WRITE) ||
+			(finalfn_oid == InvalidOid);
+		peragg->sharable = sharable;
+
 		serialfn_oid = InvalidOid;
 		deserialfn_oid = InvalidOid;
 
@@ -3222,7 +2656,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 			aclresult = pg_proc_aclcheck(transfn_oid, aggOwner,
 										 ACL_EXECUTE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_PROC,
+				aclcheck_error(aclresult, OBJECT_FUNCTION,
 							   get_func_name(transfn_oid));
 			InvokeFunctionExecuteHook(transfn_oid);
 			if (OidIsValid(finalfn_oid))
@@ -3230,7 +2664,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 				aclresult = pg_proc_aclcheck(finalfn_oid, aggOwner,
 											 ACL_EXECUTE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_PROC,
+					aclcheck_error(aclresult, OBJECT_FUNCTION,
 								   get_func_name(finalfn_oid));
 				InvokeFunctionExecuteHook(finalfn_oid);
 			}
@@ -3239,7 +2673,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 				aclresult = pg_proc_aclcheck(serialfn_oid, aggOwner,
 											 ACL_EXECUTE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_PROC,
+					aclcheck_error(aclresult, OBJECT_FUNCTION,
 								   get_func_name(serialfn_oid));
 				InvokeFunctionExecuteHook(serialfn_oid);
 			}
@@ -3248,7 +2682,7 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 				aclresult = pg_proc_aclcheck(deserialfn_oid, aggOwner,
 											 ACL_EXECUTE);
 				if (aclresult != ACLCHECK_OK)
-					aclcheck_error(aclresult, ACL_KIND_PROC,
+					aclcheck_error(aclresult, OBJECT_FUNCTION,
 								   get_func_name(deserialfn_oid));
 				InvokeFunctionExecuteHook(deserialfn_oid);
 			}
@@ -3270,6 +2704,10 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		else
 			peragg->numFinalArgs = numDirectArgs + 1;
 
+		/* Initialize any direct-argument expressions */
+		peragg->aggdirectargs = ExecInitExprList(aggref->aggdirectargs,
+												 (PlanState *) aggstate);
+
 		/*
 		 * build expression trees using actual argument & result types for the
 		 * finalfn, if it exists and is required.
@@ -3308,11 +2746,12 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		 * 2. Build working state for invoking the transition function, or
 		 * look up previously initialized working state, if we can share it.
 		 *
-		 * find_compatible_peragg() already collected a list of per-Trans's
-		 * with the same inputs. Check if any of them have the same transition
-		 * function and initial value.
+		 * find_compatible_peragg() already collected a list of sharable
+		 * per-Trans's with the same inputs. Check if any of them have the
+		 * same transition function and initial value.
 		 */
 		existing_transno = find_compatible_pertrans(aggstate, aggref,
+													sharable,
 													transfn_oid, aggtranstype,
 													serialfn_oid, deserialfn_oid,
 													initValue, initValueIsNull,
@@ -3321,9 +2760,10 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 		{
 			/*
 			 * Existing compatible trans found, so just point the 'peragg' to
-			 * the same per-trans struct.
+			 * the same per-trans struct, and mark the trans state as shared.
 			 */
 			pertrans = &pertransstates[existing_transno];
+			pertrans->aggshared = true;
 			peragg->transno = existing_transno;
 		}
 		else
@@ -3340,56 +2780,79 @@ ExecInitAgg(Agg *node, EState *estate, int eflags)
 	}
 
 	/*
-	 * Update numaggs to match the number of unique aggregates found. Also set
-	 * numstates to the number of unique aggregate states found.
+	 * Update aggstate->numaggs to be the number of unique aggregates found.
+	 * Also set numstates to the number of unique transition states found.
 	 */
 	aggstate->numaggs = aggno + 1;
 	aggstate->numtrans = transno + 1;
 
 	/*
-	 * Build a single projection computing the aggregate arguments for all
-	 * aggregates at once, that's considerably faster than doing it separately
-	 * for each.
-	 *
-	 * First create a targetlist combining the targetlist of all the
-	 * transitions.
+	 * Last, check whether any more aggregates got added onto the node while
+	 * we processed the expressions for the aggregate arguments (including not
+	 * only the regular arguments and FILTER expressions handled immediately
+	 * above, but any direct arguments we might've handled earlier).  If so,
+	 * we have nested aggregate functions, which is semantically nonsensical,
+	 * so complain.  (This should have been caught by the parser, so we don't
+	 * need to work hard on a helpful error message; but we defend against it
+	 * here anyway, just to be sure.)
 	 */
-	combined_inputeval = NIL;
-	column_offset = 0;
-	for (transno = 0; transno < aggstate->numtrans; transno++)
+	if (numaggs != list_length(aggstate->aggs))
+		ereport(ERROR,
+				(errcode(ERRCODE_GROUPING_ERROR),
+				 errmsg("aggregate function calls cannot be nested")));
+
+	/*
+	 * Build expressions doing all the transition work at once. We build a
+	 * different one for each phase, as the number of transition function
+	 * invocation can differ between phases. Note this'll work both for
+	 * transition and combination functions (although there'll only be one
+	 * phase in the latter case).
+	 */
+	for (phaseidx = 0; phaseidx < aggstate->numphases; phaseidx++)
 	{
-		AggStatePerTrans pertrans = &pertransstates[transno];
-		ListCell   *arg;
+		AggStatePerPhase phase = &aggstate->phases[phaseidx];
+		bool		dohash = false;
+		bool		dosort = false;
 
-		pertrans->inputoff = column_offset;
+		/* phase 0 doesn't necessarily exist */
+		if (!phase->aggnode)
+			continue;
 
-		/*
-		 * Adjust resno in a copied target entries, to point into the combined
-		 * slot.
-		 */
-		foreach(arg, pertrans->aggref->args)
+		if (aggstate->aggstrategy == AGG_MIXED && phaseidx == 1)
 		{
-			TargetEntry *source_tle = lfirst_node(TargetEntry, arg);
-			TargetEntry *tle;
-
-			tle = flatCopyTargetEntry(source_tle);
-			tle->resno += column_offset;
-
-			combined_inputeval = lappend(combined_inputeval, tle);
+			/*
+			 * Phase one, and only phase one, in a mixed agg performs both
+			 * sorting and aggregation.
+			 */
+			dohash = true;
+			dosort = true;
+		}
+		else if (aggstate->aggstrategy == AGG_MIXED && phaseidx == 0)
+		{
+			/*
+			 * No need to compute a transition function for an AGG_MIXED phase
+			 * 0 - the contents of the hashtables will have been computed
+			 * during phase 1.
+			 */
+			continue;
+		}
+		else if (phase->aggstrategy == AGG_PLAIN ||
+				 phase->aggstrategy == AGG_SORTED)
+		{
+			dohash = false;
+			dosort = true;
 		}
+		else if (phase->aggstrategy == AGG_HASHED)
+		{
+			dohash = true;
+			dosort = false;
+		}
+		else
+			Assert(false);
 
-		column_offset += list_length(pertrans->aggref->args);
-	}
+		phase->evaltrans = ExecBuildAggTrans(aggstate, phase, dosort, dohash);
 
-	/* and then create a projection for that targetlist */
-	aggstate->evaldesc = ExecTypeFromTL(combined_inputeval, false);
-	aggstate->evalslot = ExecInitExtraTupleSlot(estate);
-	aggstate->evalproj = ExecBuildProjectionInfo(combined_inputeval,
-												 aggstate->tmpcontext,
-												 aggstate->evalslot,
-												 &aggstate->ss.ps,
-												 NULL);
-	ExecSetSlotDescriptor(aggstate->evalslot, aggstate->evaldesc);
+	}
 
 	return aggstate;
 }
@@ -3420,11 +2883,11 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
 	List	   *sortlist;
 	int			numSortCols;
 	int			numDistinctCols;
-	int			naggs;
 	int			i;
 
 	/* Begin filling in the pertrans data */
 	pertrans->aggref = aggref;
+	pertrans->aggshared = false;
 	pertrans->aggCollation = aggref->inputcollid;
 	pertrans->transfn_oid = aggtransfn;
 	pertrans->serialfn_oid = aggserialfn;
@@ -3561,23 +3024,6 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
 
 	}
 
-	/* Initialize the input and FILTER expressions */
-	naggs = aggstate->numaggs;
-	pertrans->aggfilter = ExecInitExpr(aggref->aggfilter,
-									   (PlanState *) aggstate);
-	pertrans->aggdirectargs = ExecInitExprList(aggref->aggdirectargs,
-											   (PlanState *) aggstate);
-
-	/*
-	 * Complain if the aggregate's arguments contain any aggregates; nested
-	 * agg functions are semantically nonsensical.  (This should have been
-	 * caught earlier, but we defend against it here anyway.)
-	 */
-	if (naggs != aggstate->numaggs)
-		ereport(ERROR,
-				(errcode(ERRCODE_GROUPING_ERROR),
-				 errmsg("aggregate function calls cannot be nested")));
-
 	/*
 	 * If we're doing either DISTINCT or ORDER BY for a plain agg, then we
 	 * have a list of SortGroupClause nodes; fish out the data in them and
@@ -3608,16 +3054,20 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
 	pertrans->numSortCols = numSortCols;
 	pertrans->numDistinctCols = numDistinctCols;
 
-	if (numSortCols > 0)
+	/*
+	 * If we have either sorting or filtering to do, create a tupledesc and
+	 * slot corresponding to the aggregated inputs (including sort
+	 * expressions) of the agg.
+	 */
+	if (numSortCols > 0 || aggref->aggfilter)
 	{
-		/*
-		 * Get a tupledesc and slot corresponding to the aggregated inputs
-		 * (including sort expressions) of the agg.
-		 */
 		pertrans->sortdesc = ExecTypeFromTL(aggref->args, false);
-		pertrans->sortslot = ExecInitExtraTupleSlot(estate);
-		ExecSetSlotDescriptor(pertrans->sortslot, pertrans->sortdesc);
+		pertrans->sortslot =
+			ExecInitExtraTupleSlot(estate, pertrans->sortdesc);
+	}
 
+	if (numSortCols > 0)
+	{
 		/*
 		 * We don't implement DISTINCT or ORDER BY aggs in the HASHED case
 		 * (yet)
@@ -3634,9 +3084,8 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
 		else if (numDistinctCols > 0)
 		{
 			/* we will need an extra slot to store prior values */
-			pertrans->uniqslot = ExecInitExtraTupleSlot(estate);
-			ExecSetSlotDescriptor(pertrans->uniqslot,
-								  pertrans->sortdesc);
+			pertrans->uniqslot =
+				ExecInitExtraTupleSlot(estate, pertrans->sortdesc);
 		}
 
 		/* Extract the sort information for use later */
@@ -3669,24 +3118,28 @@ build_pertrans_for_aggref(AggStatePerTrans pertrans,
 
 	if (aggref->aggdistinct)
 	{
+		Oid		   *ops;
+
 		Assert(numArguments > 0);
+		Assert(list_length(aggref->aggdistinct) == numDistinctCols);
 
-		/*
-		 * We need the equal function for each DISTINCT comparison we will
-		 * make.
-		 */
-		pertrans->equalfns =
-			(FmgrInfo *) palloc(numDistinctCols * sizeof(FmgrInfo));
+		ops = palloc(numDistinctCols * sizeof(Oid));
 
 		i = 0;
 		foreach(lc, aggref->aggdistinct)
-		{
-			SortGroupClause *sortcl = (SortGroupClause *) lfirst(lc);
+			ops[i++] = ((SortGroupClause *) lfirst(lc))->eqop;
 
-			fmgr_info(get_opcode(sortcl->eqop), &pertrans->equalfns[i]);
-			i++;
-		}
-		Assert(i == numDistinctCols);
+		/* lookup / build the necessary comparators */
+		if (numDistinctCols == 1)
+			fmgr_info(get_opcode(ops[0]), &pertrans->equalfnOne);
+		else
+			pertrans->equalfnMulti =
+				execTuplesMatchPrepare(pertrans->sortdesc,
+									   numDistinctCols,
+									   pertrans->sortColIdx,
+									   ops,
+									   &aggstate->ss.ps);
+		pfree(ops);
 	}
 
 	pertrans->sortstates = (Tuplesortstate **)
@@ -3717,10 +3170,10 @@ GetAggInitVal(Datum textInitVal, Oid transtype)
  * with this one, with the same input parameters. If no compatible aggregate
  * can be found, returns -1.
  *
- * As a side-effect, this also collects a list of existing per-Trans structs
- * with matching inputs. If no identical Aggref is found, the list is passed
- * later to find_compatible_perstate, to see if we can at least reuse the
- * state value of another aggregate.
+ * As a side-effect, this also collects a list of existing, sharable per-Trans
+ * structs with matching inputs. If no identical Aggref is found, the list is
+ * passed later to find_compatible_pertrans, to see if we can at least reuse
+ * the state value of another aggregate.
  */
 static int
 find_compatible_peragg(Aggref *newagg, AggState *aggstate,
@@ -3739,11 +3192,12 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
 
 	/*
 	 * Search through the list of already seen aggregates. If we find an
-	 * existing aggregate with the same aggregate function and input
-	 * parameters as an existing one, then we can re-use that one. While
+	 * existing identical aggregate call, then we can re-use that one. While
 	 * searching, we'll also collect a list of Aggrefs with the same input
 	 * parameters. If no matching Aggref is found, the caller can potentially
-	 * still re-use the transition state of one of them.
+	 * still re-use the transition state of one of them.  (At this stage we
+	 * just compare the parsetrees; whether different aggregates share the
+	 * same transition function will be checked later.)
 	 */
 	for (aggno = 0; aggno <= lastaggno; aggno++)
 	{
@@ -3759,7 +3213,6 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
 			newagg->aggstar != existingRef->aggstar ||
 			newagg->aggvariadic != existingRef->aggvariadic ||
 			newagg->aggkind != existingRef->aggkind ||
-			!equal(newagg->aggdirectargs, existingRef->aggdirectargs) ||
 			!equal(newagg->args, existingRef->args) ||
 			!equal(newagg->aggorder, existingRef->aggorder) ||
 			!equal(newagg->aggdistinct, existingRef->aggdistinct) ||
@@ -3769,7 +3222,8 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
 		/* if it's the same aggregate function then report exact match */
 		if (newagg->aggfnoid == existingRef->aggfnoid &&
 			newagg->aggtype == existingRef->aggtype &&
-			newagg->aggcollid == existingRef->aggcollid)
+			newagg->aggcollid == existingRef->aggcollid &&
+			equal(newagg->aggdirectargs, existingRef->aggdirectargs))
 		{
 			list_free(*same_input_transnos);
 			*same_input_transnos = NIL;
@@ -3777,11 +3231,15 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
 		}
 
 		/*
-		 * Not identical, but it had the same inputs. Return it to the caller,
-		 * in case we can re-use its per-trans state.
+		 * Not identical, but it had the same inputs.  If the final function
+		 * permits sharing, return its transno to the caller, in case we can
+		 * re-use its per-trans state.  (If there's already sharing going on,
+		 * we might report a transno more than once.  find_compatible_pertrans
+		 * is cheap enough that it's not worth spending cycles to avoid that.)
 		 */
-		*same_input_transnos = lappend_int(*same_input_transnos,
-										   peragg->transno);
+		if (peragg->sharable)
+			*same_input_transnos = lappend_int(*same_input_transnos,
+											   peragg->transno);
 	}
 
 	return -1;
@@ -3792,11 +3250,11 @@ find_compatible_peragg(Aggref *newagg, AggState *aggstate,
  * struct
  *
  * Searches the list of transnos for a per-Trans struct with the same
- * transition state and initial condition. (The inputs have already been
+ * transition function and initial condition. (The inputs have already been
  * verified to match.)
  */
 static int
-find_compatible_pertrans(AggState *aggstate, Aggref *newagg,
+find_compatible_pertrans(AggState *aggstate, Aggref *newagg, bool sharable,
 						 Oid aggtransfn, Oid aggtranstype,
 						 Oid aggserialfn, Oid aggdeserialfn,
 						 Datum initValue, bool initValueIsNull,
@@ -3804,6 +3262,10 @@ find_compatible_pertrans(AggState *aggstate, Aggref *newagg,
 {
 	ListCell   *lc;
 
+	/* If this aggregate can't share transition states, give up */
+	if (!sharable)
+		return -1;
+
 	foreach(lc, transnos)
 	{
 		int			transno = lfirst_int(lc);
@@ -3828,16 +3290,16 @@ find_compatible_pertrans(AggState *aggstate, Aggref *newagg,
 			aggdeserialfn != pertrans->deserialfn_oid)
 			continue;
 
-		/* Check that the initial condition matches, too. */
+		/*
+		 * Check that the initial condition matches, too.
+		 */
 		if (initValueIsNull && pertrans->initValueIsNull)
 			return transno;
 
 		if (!initValueIsNull && !pertrans->initValueIsNull &&
 			datumIsEqual(initValue, pertrans->initValue,
 						 pertrans->transtypeByVal, pertrans->transtypeLen))
-		{
 			return transno;
-		}
 	}
 	return -1;
 }
@@ -3986,8 +3448,11 @@ ExecReScanAgg(AggState *node)
 		/*
 		 * Reset the per-group state (in particular, mark transvalues null)
 		 */
-		MemSet(node->pergroup, 0,
-			   sizeof(AggStatePerGroupData) * node->numaggs * numGroupingSets);
+		for (setno = 0; setno < numGroupingSets; setno++)
+		{
+			MemSet(node->pergroups[setno], 0,
+				   sizeof(AggStatePerGroupData) * node->numaggs);
+		}
 
 		/* reset to phase 1 */
 		initialize_phase(node, 1);
@@ -4056,6 +3521,13 @@ AggCheckCallContext(FunctionCallInfo fcinfo, MemoryContext *aggcontext)
  * If the function is being called as an aggregate support function,
  * return the Aggref node for the aggregate call.  Otherwise, return NULL.
  *
+ * Aggregates sharing the same inputs and transition functions can get
+ * merged into a single transition calculation.  If the transition function
+ * calls AggGetAggref, it will get some one of the Aggrefs for which it is
+ * executing.  It must therefore not pay attention to the Aggref fields that
+ * relate to the final function, as those are indeterminate.  But if a final
+ * function calls AggGetAggref, it will get a precise result.
+ *
  * Note that if an aggregate is being used as a window function, this will
  * return NULL.  We could provide a similar function to return the relevant
  * WindowFunc node in such cases, but it's not needed yet.
@@ -4065,9 +3537,18 @@ AggGetAggref(FunctionCallInfo fcinfo)
 {
 	if (fcinfo->context && IsA(fcinfo->context, AggState))
 	{
+		AggState   *aggstate = (AggState *) fcinfo->context;
+		AggStatePerAgg curperagg;
 		AggStatePerTrans curpertrans;
 
-		curpertrans = ((AggState *) fcinfo->context)->curpertrans;
+		/* check curperagg (valid when in a final function) */
+		curperagg = aggstate->curperagg;
+
+		if (curperagg)
+			return curperagg->aggref;
+
+		/* check curpertrans (valid when in a transition function) */
+		curpertrans = aggstate->curpertrans;
 
 		if (curpertrans)
 			return curpertrans->aggref;
@@ -4097,6 +3578,44 @@ AggGetTempMemoryContext(FunctionCallInfo fcinfo)
 	return NULL;
 }
 
+/*
+ * AggStateIsShared - find out whether transition state is shared
+ *
+ * If the function is being called as an aggregate support function,
+ * return true if the aggregate's transition state is shared across
+ * multiple aggregates, false if it is not.
+ *
+ * Returns true if not called as an aggregate support function.
+ * This is intended as a conservative answer, ie "no you'd better not
+ * scribble on your input".  In particular, will return true if the
+ * aggregate is being used as a window function, which is a scenario
+ * in which changing the transition state is a bad idea.  We might
+ * want to refine the behavior for the window case in future.
+ */
+bool
+AggStateIsShared(FunctionCallInfo fcinfo)
+{
+	if (fcinfo->context && IsA(fcinfo->context, AggState))
+	{
+		AggState   *aggstate = (AggState *) fcinfo->context;
+		AggStatePerAgg curperagg;
+		AggStatePerTrans curpertrans;
+
+		/* check curperagg (valid when in a final function) */
+		curperagg = aggstate->curperagg;
+
+		if (curperagg)
+			return aggstate->pertrans[curperagg->transno].aggshared;
+
+		/* check curpertrans (valid when in a transition function) */
+		curpertrans = aggstate->curpertrans;
+
+		if (curpertrans)
+			return curpertrans->aggshared;
+	}
+	return true;
+}
+
 /*
  * AggRegisterCallback - register a cleanup callback for an aggregate
  *
diff --git a/src/backend/executor/nodeAppend.c b/src/backend/executor/nodeAppend.c
index bed9bb8713..dcbf4d68aa 100644
--- a/src/backend/executor/nodeAppend.c
+++ b/src/backend/executor/nodeAppend.c
@@ -3,7 +3,7 @@
  * nodeAppend.c
  *	  routines to handle append nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -61,51 +61,27 @@
 #include "executor/nodeAppend.h"
 #include "miscadmin.h"
 
-static TupleTableSlot *ExecAppend(PlanState *pstate);
-static bool exec_append_initialize_next(AppendState *appendstate);
-
-
-/* ----------------------------------------------------------------
- *		exec_append_initialize_next
- *
- *		Sets up the append state node for the "next" scan.
- *
- *		Returns t iff there is a "next" scan to process.
- * ----------------------------------------------------------------
- */
-static bool
-exec_append_initialize_next(AppendState *appendstate)
+/* Shared state for parallel-aware Append. */
+struct ParallelAppendState
 {
-	int			whichplan;
+	LWLock		pa_lock;		/* mutual exclusion to choose next subplan */
+	int			pa_next_plan;	/* next plan to choose by any worker */
 
 	/*
-	 * get information from the append node
+	 * pa_finished[i] should be true if no more workers should select subplan
+	 * i.  for a non-partial plan, this should be set to true as soon as a
+	 * worker selects the plan; for a partial plan, it remains false until
+	 * some worker executes the plan to completion.
 	 */
-	whichplan = appendstate->as_whichplan;
+	bool		pa_finished[FLEXIBLE_ARRAY_MEMBER];
+};
 
-	if (whichplan < 0)
-	{
-		/*
-		 * if scanning in reverse, we start at the last scan in the list and
-		 * then proceed back to the first.. in any case we inform ExecAppend
-		 * that we are at the end of the line by returning FALSE
-		 */
-		appendstate->as_whichplan = 0;
-		return FALSE;
-	}
-	else if (whichplan >= appendstate->as_nplans)
-	{
-		/*
-		 * as above, end the scan if we go beyond the last scan in our list..
-		 */
-		appendstate->as_whichplan = appendstate->as_nplans - 1;
-		return FALSE;
-	}
-	else
-	{
-		return TRUE;
-	}
-}
+#define INVALID_SUBPLAN_INDEX		-1
+
+static TupleTableSlot *ExecAppend(PlanState *pstate);
+static bool choose_next_subplan_locally(AppendState *node);
+static bool choose_next_subplan_for_leader(AppendState *node);
+static bool choose_next_subplan_for_worker(AppendState *node);
 
 /* ----------------------------------------------------------------
  *		ExecInitAppend
@@ -153,17 +129,9 @@ ExecInitAppend(Append *node, EState *estate, int eflags)
 	appendstate->as_nplans = nplans;
 
 	/*
-	 * Miscellaneous initialization
-	 *
-	 * Append plans don't have expression contexts because they never call
-	 * ExecQual or ExecProject.
+	 * Initialize result tuple type and slot.
 	 */
-
-	/*
-	 * append nodes still have Result slots, which hold pointers to tuples, so
-	 * we have to initialize them.
-	 */
-	ExecInitResultTupleSlot(estate, &appendstate->ps);
+	ExecInitResultTupleSlotTL(estate, &appendstate->ps);
 
 	/*
 	 * call ExecInitNode on each of the plans to be executed and save the
@@ -179,16 +147,23 @@ ExecInitAppend(Append *node, EState *estate, int eflags)
 	}
 
 	/*
-	 * initialize output tuple type
+	 * Miscellaneous initialization
+	 *
+	 * Append plans don't have expression contexts because they never call
+	 * ExecQual or ExecProject.
 	 */
-	ExecAssignResultTypeFromTL(&appendstate->ps);
 	appendstate->ps.ps_ProjInfo = NULL;
 
 	/*
-	 * initialize to scan first subplan
+	 * Parallel-aware append plans must choose the first subplan to execute by
+	 * looking at shared memory, but non-parallel-aware append plans can
+	 * always start with the first subplan.
 	 */
-	appendstate->as_whichplan = 0;
-	exec_append_initialize_next(appendstate);
+	appendstate->as_whichplan =
+		appendstate->ps.plan->parallel_aware ? INVALID_SUBPLAN_INDEX : 0;
+
+	/* For parallel query, this will be overridden later. */
+	appendstate->choose_next_subplan = choose_next_subplan_locally;
 
 	return appendstate;
 }
@@ -204,6 +179,11 @@ ExecAppend(PlanState *pstate)
 {
 	AppendState *node = castNode(AppendState, pstate);
 
+	/* If no subplan has been chosen, we must choose one before proceeding. */
+	if (node->as_whichplan == INVALID_SUBPLAN_INDEX &&
+		!node->choose_next_subplan(node))
+		return ExecClearTuple(node->ps.ps_ResultTupleSlot);
+
 	for (;;)
 	{
 		PlanState  *subnode;
@@ -214,6 +194,7 @@ ExecAppend(PlanState *pstate)
 		/*
 		 * figure out which subplan we are currently processing
 		 */
+		Assert(node->as_whichplan >= 0 && node->as_whichplan < node->as_nplans);
 		subnode = node->appendplans[node->as_whichplan];
 
 		/*
@@ -231,19 +212,9 @@ ExecAppend(PlanState *pstate)
 			return result;
 		}
 
-		/*
-		 * Go on to the "next" subplan in the appropriate direction. If no
-		 * more subplans, return the empty slot set up for us by
-		 * ExecInitAppend.
-		 */
-		if (ScanDirectionIsForward(node->ps.state->es_direction))
-			node->as_whichplan++;
-		else
-			node->as_whichplan--;
-		if (!exec_append_initialize_next(node))
+		/* choose new subplan; if none, we're done */
+		if (!node->choose_next_subplan(node))
 			return ExecClearTuple(node->ps.ps_ResultTupleSlot);
-
-		/* Else loop back and try to get a tuple from the new subplan */
 	}
 }
 
@@ -298,6 +269,266 @@ ExecReScanAppend(AppendState *node)
 		if (subnode->chgParam == NULL)
 			ExecReScan(subnode);
 	}
-	node->as_whichplan = 0;
-	exec_append_initialize_next(node);
+
+	node->as_whichplan =
+		node->ps.plan->parallel_aware ? INVALID_SUBPLAN_INDEX : 0;
+}
+
+/* ----------------------------------------------------------------
+ *						Parallel Append Support
+ * ----------------------------------------------------------------
+ */
+
+/* ----------------------------------------------------------------
+ *		ExecAppendEstimate
+ *
+ *		Compute the amount of space we'll need in the parallel
+ *		query DSM, and inform pcxt->estimator about our needs.
+ * ----------------------------------------------------------------
+ */
+void
+ExecAppendEstimate(AppendState *node,
+				   ParallelContext *pcxt)
+{
+	node->pstate_len =
+		add_size(offsetof(ParallelAppendState, pa_finished),
+				 sizeof(bool) * node->as_nplans);
+
+	shm_toc_estimate_chunk(&pcxt->estimator, node->pstate_len);
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+}
+
+
+/* ----------------------------------------------------------------
+ *		ExecAppendInitializeDSM
+ *
+ *		Set up shared state for Parallel Append.
+ * ----------------------------------------------------------------
+ */
+void
+ExecAppendInitializeDSM(AppendState *node,
+						ParallelContext *pcxt)
+{
+	ParallelAppendState *pstate;
+
+	pstate = shm_toc_allocate(pcxt->toc, node->pstate_len);
+	memset(pstate, 0, node->pstate_len);
+	LWLockInitialize(&pstate->pa_lock, LWTRANCHE_PARALLEL_APPEND);
+	shm_toc_insert(pcxt->toc, node->ps.plan->plan_node_id, pstate);
+
+	node->as_pstate = pstate;
+	node->choose_next_subplan = choose_next_subplan_for_leader;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecAppendReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecAppendReInitializeDSM(AppendState *node, ParallelContext *pcxt)
+{
+	ParallelAppendState *pstate = node->as_pstate;
+
+	pstate->pa_next_plan = 0;
+	memset(pstate->pa_finished, 0, sizeof(bool) * node->as_nplans);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecAppendInitializeWorker
+ *
+ *		Copy relevant information from TOC into planstate, and initialize
+ *		whatever is required to choose and execute the optimal subplan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecAppendInitializeWorker(AppendState *node, ParallelWorkerContext *pwcxt)
+{
+	node->as_pstate = shm_toc_lookup(pwcxt->toc, node->ps.plan->plan_node_id, false);
+	node->choose_next_subplan = choose_next_subplan_for_worker;
+}
+
+/* ----------------------------------------------------------------
+ *		choose_next_subplan_locally
+ *
+ *		Choose next subplan for a non-parallel-aware Append,
+ *		returning false if there are no more.
+ * ----------------------------------------------------------------
+ */
+static bool
+choose_next_subplan_locally(AppendState *node)
+{
+	int			whichplan = node->as_whichplan;
+
+	if (ScanDirectionIsForward(node->ps.state->es_direction))
+	{
+		/*
+		 * We won't normally see INVALID_SUBPLAN_INDEX in this case, but we
+		 * might if a plan intended to be run in parallel ends up being run
+		 * serially.
+		 */
+		if (whichplan == INVALID_SUBPLAN_INDEX)
+			node->as_whichplan = 0;
+		else
+		{
+			if (whichplan >= node->as_nplans - 1)
+				return false;
+			node->as_whichplan++;
+		}
+	}
+	else
+	{
+		if (whichplan <= 0)
+			return false;
+		node->as_whichplan--;
+	}
+
+	return true;
+}
+
+/* ----------------------------------------------------------------
+ *		choose_next_subplan_for_leader
+ *
+ *      Try to pick a plan which doesn't commit us to doing much
+ *      work locally, so that as much work as possible is done in
+ *      the workers.  Cheapest subplans are at the end.
+ * ----------------------------------------------------------------
+ */
+static bool
+choose_next_subplan_for_leader(AppendState *node)
+{
+	ParallelAppendState *pstate = node->as_pstate;
+	Append	   *append = (Append *) node->ps.plan;
+
+	/* Backward scan is not supported by parallel-aware plans */
+	Assert(ScanDirectionIsForward(node->ps.state->es_direction));
+
+	LWLockAcquire(&pstate->pa_lock, LW_EXCLUSIVE);
+
+	if (node->as_whichplan != INVALID_SUBPLAN_INDEX)
+	{
+		/* Mark just-completed subplan as finished. */
+		node->as_pstate->pa_finished[node->as_whichplan] = true;
+	}
+	else
+	{
+		/* Start with last subplan. */
+		node->as_whichplan = node->as_nplans - 1;
+	}
+
+	/* Loop until we find a subplan to execute. */
+	while (pstate->pa_finished[node->as_whichplan])
+	{
+		if (node->as_whichplan == 0)
+		{
+			pstate->pa_next_plan = INVALID_SUBPLAN_INDEX;
+			node->as_whichplan = INVALID_SUBPLAN_INDEX;
+			LWLockRelease(&pstate->pa_lock);
+			return false;
+		}
+		node->as_whichplan--;
+	}
+
+	/* If non-partial, immediately mark as finished. */
+	if (node->as_whichplan < append->first_partial_plan)
+		node->as_pstate->pa_finished[node->as_whichplan] = true;
+
+	LWLockRelease(&pstate->pa_lock);
+
+	return true;
+}
+
+/* ----------------------------------------------------------------
+ *		choose_next_subplan_for_worker
+ *
+ *		Choose next subplan for a parallel-aware Append, returning
+ *		false if there are no more.
+ *
+ *		We start from the first plan and advance through the list;
+ *		when we get back to the end, we loop back to the first
+ *		partial plan.  This assigns the non-partial plans first in
+ *		order of descending cost and then spreads out the workers
+ *		as evenly as possible across the remaining partial plans.
+ * ----------------------------------------------------------------
+ */
+static bool
+choose_next_subplan_for_worker(AppendState *node)
+{
+	ParallelAppendState *pstate = node->as_pstate;
+	Append	   *append = (Append *) node->ps.plan;
+
+	/* Backward scan is not supported by parallel-aware plans */
+	Assert(ScanDirectionIsForward(node->ps.state->es_direction));
+
+	LWLockAcquire(&pstate->pa_lock, LW_EXCLUSIVE);
+
+	/* Mark just-completed subplan as finished. */
+	if (node->as_whichplan != INVALID_SUBPLAN_INDEX)
+		node->as_pstate->pa_finished[node->as_whichplan] = true;
+
+	/* If all the plans are already done, we have nothing to do */
+	if (pstate->pa_next_plan == INVALID_SUBPLAN_INDEX)
+	{
+		LWLockRelease(&pstate->pa_lock);
+		return false;
+	}
+
+	/* Save the plan from which we are starting the search. */
+	node->as_whichplan = pstate->pa_next_plan;
+
+	/* Loop until we find a subplan to execute. */
+	while (pstate->pa_finished[pstate->pa_next_plan])
+	{
+		if (pstate->pa_next_plan < node->as_nplans - 1)
+		{
+			/* Advance to next plan. */
+			pstate->pa_next_plan++;
+		}
+		else if (node->as_whichplan > append->first_partial_plan)
+		{
+			/* Loop back to first partial plan. */
+			pstate->pa_next_plan = append->first_partial_plan;
+		}
+		else
+		{
+			/*
+			 * At last plan, and either there are no partial plans or we've
+			 * tried them all.  Arrange to bail out.
+			 */
+			pstate->pa_next_plan = node->as_whichplan;
+		}
+
+		if (pstate->pa_next_plan == node->as_whichplan)
+		{
+			/* We've tried everything! */
+			pstate->pa_next_plan = INVALID_SUBPLAN_INDEX;
+			LWLockRelease(&pstate->pa_lock);
+			return false;
+		}
+	}
+
+	/* Pick the plan we found, and advance pa_next_plan one more time. */
+	node->as_whichplan = pstate->pa_next_plan++;
+	if (pstate->pa_next_plan >= node->as_nplans)
+	{
+		if (append->first_partial_plan < node->as_nplans)
+			pstate->pa_next_plan = append->first_partial_plan;
+		else
+		{
+			/*
+			 * We have only non-partial plans, and we already chose the last
+			 * one; so arrange for the other workers to immediately bail out.
+			 */
+			pstate->pa_next_plan = INVALID_SUBPLAN_INDEX;
+		}
+	}
+
+	/* If non-partial, immediately mark as finished. */
+	if (node->as_whichplan < append->first_partial_plan)
+		node->as_pstate->pa_finished[node->as_whichplan] = true;
+
+	LWLockRelease(&pstate->pa_lock);
+
+	return true;
 }
diff --git a/src/backend/executor/nodeBitmapAnd.c b/src/backend/executor/nodeBitmapAnd.c
index 1c5c312c95..23d0d94326 100644
--- a/src/backend/executor/nodeBitmapAnd.c
+++ b/src/backend/executor/nodeBitmapAnd.c
@@ -3,7 +3,7 @@
  * nodeBitmapAnd.c
  *	  routines to handle BitmapAnd nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -80,13 +80,6 @@ ExecInitBitmapAnd(BitmapAnd *node, EState *estate, int eflags)
 	bitmapandstate->bitmapplans = bitmapplanstates;
 	bitmapandstate->nplans = nplans;
 
-	/*
-	 * Miscellaneous initialization
-	 *
-	 * BitmapAnd plans don't have expression contexts because they never call
-	 * ExecQual or ExecProject.  They don't need any tuple slots either.
-	 */
-
 	/*
 	 * call ExecInitNode on each of the plans to be executed and save the
 	 * results into the array "bitmapplanstates".
@@ -99,6 +92,13 @@ ExecInitBitmapAnd(BitmapAnd *node, EState *estate, int eflags)
 		i++;
 	}
 
+	/*
+	 * Miscellaneous initialization
+	 *
+	 * BitmapAnd plans don't have expression contexts because they never call
+	 * ExecQual or ExecProject.  They don't need any tuple slots either.
+	 */
+
 	return bitmapandstate;
 }
 
diff --git a/src/backend/executor/nodeBitmapHeapscan.c b/src/backend/executor/nodeBitmapHeapscan.c
index 79f534e4e9..3e1c9e0714 100644
--- a/src/backend/executor/nodeBitmapHeapscan.c
+++ b/src/backend/executor/nodeBitmapHeapscan.c
@@ -16,7 +16,7 @@
  * required index qual conditions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -39,6 +39,7 @@
 
 #include "access/relscan.h"
 #include "access/transam.h"
+#include "access/visibilitymap.h"
 #include "executor/execdebug.h"
 #include "executor/nodeBitmapHeapscan.h"
 #include "miscadmin.h"
@@ -225,9 +226,31 @@ BitmapHeapNext(BitmapHeapScanState *node)
 			}
 
 			/*
-			 * Fetch the current heap page and identify candidate tuples.
+			 * We can skip fetching the heap page if we don't need any fields
+			 * from the heap, and the bitmap entries don't need rechecking,
+			 * and all tuples on the page are visible to our transaction.
 			 */
-			bitgetpage(scan, tbmres);
+			node->skip_fetch = (node->can_skip_fetch &&
+								!tbmres->recheck &&
+								VM_ALL_VISIBLE(node->ss.ss_currentRelation,
+											   tbmres->blockno,
+											   &node->vmbuffer));
+
+			if (node->skip_fetch)
+			{
+				/*
+				 * The number of tuples on this page is put into
+				 * scan->rs_ntuples; note we don't fill scan->rs_vistuples.
+				 */
+				scan->rs_ntuples = tbmres->ntuples;
+			}
+			else
+			{
+				/*
+				 * Fetch the current heap page and identify candidate tuples.
+				 */
+				bitgetpage(scan, tbmres);
+			}
 
 			if (tbmres->ntuples >= 0)
 				node->exact_pages++;
@@ -289,45 +312,53 @@ BitmapHeapNext(BitmapHeapScanState *node)
 		 */
 		BitmapPrefetch(node, scan);
 
-		/*
-		 * Okay to fetch the tuple
-		 */
-		targoffset = scan->rs_vistuples[scan->rs_cindex];
-		dp = (Page) BufferGetPage(scan->rs_cbuf);
-		lp = PageGetItemId(dp, targoffset);
-		Assert(ItemIdIsNormal(lp));
-
-		scan->rs_ctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
-		scan->rs_ctup.t_len = ItemIdGetLength(lp);
-		scan->rs_ctup.t_tableOid = scan->rs_rd->rd_id;
-		ItemPointerSet(&scan->rs_ctup.t_self, tbmres->blockno, targoffset);
+		if (node->skip_fetch)
+		{
+			/*
+			 * If we don't have to fetch the tuple, just return nulls.
+			 */
+			ExecStoreAllNullTuple(slot);
+		}
+		else
+		{
+			/*
+			 * Okay to fetch the tuple.
+			 */
+			targoffset = scan->rs_vistuples[scan->rs_cindex];
+			dp = (Page) BufferGetPage(scan->rs_cbuf);
+			lp = PageGetItemId(dp, targoffset);
+			Assert(ItemIdIsNormal(lp));
 
-		pgstat_count_heap_fetch(scan->rs_rd);
+			scan->rs_ctup.t_data = (HeapTupleHeader) PageGetItem((Page) dp, lp);
+			scan->rs_ctup.t_len = ItemIdGetLength(lp);
+			scan->rs_ctup.t_tableOid = scan->rs_rd->rd_id;
+			ItemPointerSet(&scan->rs_ctup.t_self, tbmres->blockno, targoffset);
 
-		/*
-		 * Set up the result slot to point to this tuple. Note that the slot
-		 * acquires a pin on the buffer.
-		 */
-		ExecStoreTuple(&scan->rs_ctup,
-					   slot,
-					   scan->rs_cbuf,
-					   false);
+			pgstat_count_heap_fetch(scan->rs_rd);
 
-		/*
-		 * If we are using lossy info, we have to recheck the qual conditions
-		 * at every tuple.
-		 */
-		if (tbmres->recheck)
-		{
-			econtext->ecxt_scantuple = slot;
-			ResetExprContext(econtext);
+			/*
+			 * Set up the result slot to point to this tuple.  Note that the
+			 * slot acquires a pin on the buffer.
+			 */
+			ExecStoreTuple(&scan->rs_ctup,
+						   slot,
+						   scan->rs_cbuf,
+						   false);
 
-			if (!ExecQual(node->bitmapqualorig, econtext))
+			/*
+			 * If we are using lossy info, we have to recheck the qual
+			 * conditions at every tuple.
+			 */
+			if (tbmres->recheck)
 			{
-				/* Fails recheck, so drop it and loop back for another */
-				InstrCountFiltered2(node, 1);
-				ExecClearTuple(slot);
-				continue;
+				econtext->ecxt_scantuple = slot;
+				if (!ExecQualAndReset(node->bitmapqualorig, econtext))
+				{
+					/* Fails recheck, so drop it and loop back for another */
+					InstrCountFiltered2(node, 1);
+					ExecClearTuple(slot);
+					continue;
+				}
 			}
 		}
 
@@ -582,6 +613,7 @@ BitmapPrefetch(BitmapHeapScanState *node, HeapScanDesc scan)
 			while (node->prefetch_pages < node->prefetch_target)
 			{
 				TBMIterateResult *tbmpre = tbm_iterate(prefetch_iterator);
+				bool		skip_fetch;
 
 				if (tbmpre == NULL)
 				{
@@ -591,7 +623,26 @@ BitmapPrefetch(BitmapHeapScanState *node, HeapScanDesc scan)
 					break;
 				}
 				node->prefetch_pages++;
-				PrefetchBuffer(scan->rs_rd, MAIN_FORKNUM, tbmpre->blockno);
+
+				/*
+				 * If we expect not to have to actually read this heap page,
+				 * skip this prefetch call, but continue to run the prefetch
+				 * logic normally.  (Would it be better not to increment
+				 * prefetch_pages?)
+				 *
+				 * This depends on the assumption that the index AM will
+				 * report the same recheck flag for this future heap page as
+				 * it did for the current heap page; which is not a certainty
+				 * but is true in many cases.
+				 */
+				skip_fetch = (node->can_skip_fetch &&
+							  (node->tbmres ? !node->tbmres->recheck : false) &&
+							  VM_ALL_VISIBLE(node->ss.ss_currentRelation,
+											 tbmpre->blockno,
+											 &node->pvmbuffer));
+
+				if (!skip_fetch)
+					PrefetchBuffer(scan->rs_rd, MAIN_FORKNUM, tbmpre->blockno);
 			}
 		}
 
@@ -608,6 +659,7 @@ BitmapPrefetch(BitmapHeapScanState *node, HeapScanDesc scan)
 			{
 				TBMIterateResult *tbmpre;
 				bool		do_prefetch = false;
+				bool		skip_fetch;
 
 				/*
 				 * Recheck under the mutex. If some other process has already
@@ -633,7 +685,15 @@ BitmapPrefetch(BitmapHeapScanState *node, HeapScanDesc scan)
 					break;
 				}
 
-				PrefetchBuffer(scan->rs_rd, MAIN_FORKNUM, tbmpre->blockno);
+				/* As above, skip prefetch if we expect not to need page */
+				skip_fetch = (node->can_skip_fetch &&
+							  (node->tbmres ? !node->tbmres->recheck : false) &&
+							  VM_ALL_VISIBLE(node->ss.ss_currentRelation,
+											 tbmpre->blockno,
+											 &node->pvmbuffer));
+
+				if (!skip_fetch)
+					PrefetchBuffer(scan->rs_rd, MAIN_FORKNUM, tbmpre->blockno);
 			}
 		}
 	}
@@ -655,10 +715,7 @@ BitmapHeapRecheck(BitmapHeapScanState *node, TupleTableSlot *slot)
 
 	/* Does the tuple meet the original qual conditions? */
 	econtext->ecxt_scantuple = slot;
-
-	ResetExprContext(econtext);
-
-	return ExecQual(node->bitmapqualorig, econtext);
+	return ExecQualAndReset(node->bitmapqualorig, econtext);
 }
 
 /* ----------------------------------------------------------------
@@ -687,6 +744,7 @@ ExecReScanBitmapHeapScan(BitmapHeapScanState *node)
 	/* rescan to release any page pin */
 	heap_rescan(node->ss.ss_currentScanDesc, NULL);
 
+	/* release bitmaps and buffers if any */
 	if (node->tbmiterator)
 		tbm_end_iterate(node->tbmiterator);
 	if (node->prefetch_iterator)
@@ -697,6 +755,10 @@ ExecReScanBitmapHeapScan(BitmapHeapScanState *node)
 		tbm_end_shared_iterate(node->shared_prefetch_iterator);
 	if (node->tbm)
 		tbm_free(node->tbm);
+	if (node->vmbuffer != InvalidBuffer)
+		ReleaseBuffer(node->vmbuffer);
+	if (node->pvmbuffer != InvalidBuffer)
+		ReleaseBuffer(node->pvmbuffer);
 	node->tbm = NULL;
 	node->tbmiterator = NULL;
 	node->tbmres = NULL;
@@ -704,23 +766,8 @@ ExecReScanBitmapHeapScan(BitmapHeapScanState *node)
 	node->initialized = false;
 	node->shared_tbmiterator = NULL;
 	node->shared_prefetch_iterator = NULL;
-
-	/* Reset parallel bitmap state, if present */
-	if (node->pstate)
-	{
-		dsa_area   *dsa = node->ss.ps.state->es_query_dsa;
-
-		node->pstate->state = BM_INITIAL;
-
-		if (DsaPointerIsValid(node->pstate->tbmiterator))
-			tbm_free_shared_area(dsa, node->pstate->tbmiterator);
-
-		if (DsaPointerIsValid(node->pstate->prefetch_iterator))
-			tbm_free_shared_area(dsa, node->pstate->prefetch_iterator);
-
-		node->pstate->tbmiterator = InvalidDsaPointer;
-		node->pstate->prefetch_iterator = InvalidDsaPointer;
-	}
+	node->vmbuffer = InvalidBuffer;
+	node->pvmbuffer = InvalidBuffer;
 
 	ExecScanReScan(&node->ss);
 
@@ -765,7 +812,7 @@ ExecEndBitmapHeapScan(BitmapHeapScanState *node)
 	ExecEndNode(outerPlanState(node));
 
 	/*
-	 * release bitmap if any
+	 * release bitmaps and buffers if any
 	 */
 	if (node->tbmiterator)
 		tbm_end_iterate(node->tbmiterator);
@@ -777,6 +824,10 @@ ExecEndBitmapHeapScan(BitmapHeapScanState *node)
 		tbm_end_shared_iterate(node->shared_tbmiterator);
 	if (node->shared_prefetch_iterator)
 		tbm_end_shared_iterate(node->shared_prefetch_iterator);
+	if (node->vmbuffer != InvalidBuffer)
+		ReleaseBuffer(node->vmbuffer);
+	if (node->pvmbuffer != InvalidBuffer)
+		ReleaseBuffer(node->pvmbuffer);
 
 	/*
 	 * close heap scan
@@ -822,6 +873,9 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags)
 	scanstate->tbm = NULL;
 	scanstate->tbmiterator = NULL;
 	scanstate->tbmres = NULL;
+	scanstate->skip_fetch = false;
+	scanstate->vmbuffer = InvalidBuffer;
+	scanstate->pvmbuffer = InvalidBuffer;
 	scanstate->exact_pages = 0;
 	scanstate->lossy_pages = 0;
 	scanstate->prefetch_iterator = NULL;
@@ -832,8 +886,19 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags)
 	scanstate->pscan_len = 0;
 	scanstate->initialized = false;
 	scanstate->shared_tbmiterator = NULL;
+	scanstate->shared_prefetch_iterator = NULL;
 	scanstate->pstate = NULL;
 
+	/*
+	 * We can potentially skip fetching heap pages if we do not need any
+	 * columns of the table, either for checking non-indexable quals or for
+	 * returning data.  This test is a bit simplistic, as it checks the
+	 * stronger condition that there's no qual or return tlist at all.  But in
+	 * most cases it's probably not worth working harder than that.
+	 */
+	scanstate->can_skip_fetch = (node->scan.plan.qual == NIL &&
+								 node->scan.plan.targetlist == NIL);
+
 	/*
 	 * Miscellaneous initialization
 	 *
@@ -842,23 +907,39 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
 	/*
-	 * initialize child expressions
+	 * open the base relation and acquire appropriate lock on it.
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
-	scanstate->bitmapqualorig =
-		ExecInitQual(node->bitmapqualorig, (PlanState *) scanstate);
+	currentRelation = ExecOpenScanRelation(estate, node->scan.scanrelid, eflags);
 
 	/*
-	 * tuple table initialization
+	 * initialize child nodes
+	 *
+	 * We do this after ExecOpenScanRelation because the child nodes will open
+	 * indexscans on our relation's indexes, and we want to be sure we have
+	 * acquired a lock on the relation first.
 	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
+	outerPlanState(scanstate) = ExecInitNode(outerPlan(node), estate, eflags);
 
 	/*
-	 * open the base relation and acquire appropriate lock on it.
+	 * get the scan type from the relation descriptor.
 	 */
-	currentRelation = ExecOpenScanRelation(estate, node->scan.scanrelid, eflags);
+	ExecInitScanTupleSlot(estate, &scanstate->ss,
+						  RelationGetDescr(currentRelation));
+
+
+	/*
+	 * Initialize result slot, type and projection.
+	 */
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecAssignScanProjectionInfo(&scanstate->ss);
+
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	scanstate->bitmapqualorig =
+		ExecInitQual(node->bitmapqualorig, (PlanState *) scanstate);
 
 	/*
 	 * Determine the maximum for prefetch_target.  If the tablespace has a
@@ -887,26 +968,6 @@ ExecInitBitmapHeapScan(BitmapHeapScan *node, EState *estate, int eflags)
 														 0,
 														 NULL);
 
-	/*
-	 * get the scan type from the relation descriptor.
-	 */
-	ExecAssignScanType(&scanstate->ss, RelationGetDescr(currentRelation));
-
-	/*
-	 * Initialize result tuple type and projection info.
-	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
-	ExecAssignScanProjectionInfo(&scanstate->ss);
-
-	/*
-	 * initialize child nodes
-	 *
-	 * We do this last because the child nodes will open indexscans on our
-	 * relation's indexes, and we want to be sure we have acquired a lock on
-	 * the relation first.
-	 */
-	outerPlanState(scanstate) = ExecInitNode(outerPlan(node), estate, eflags);
-
 	/*
 	 * all done.
 	 */
@@ -951,7 +1012,8 @@ BitmapShouldInitializeSharedState(ParallelBitmapHeapState *pstate)
 /* ----------------------------------------------------------------
  *		ExecBitmapHeapEstimate
  *
- *		estimates the space required to serialize bitmap scan node.
+ *		Compute the amount of space we'll need in the parallel
+ *		query DSM, and inform pcxt->estimator about our needs.
  * ----------------------------------------------------------------
  */
 void
@@ -980,6 +1042,11 @@ ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node,
 {
 	ParallelBitmapHeapState *pstate;
 	EState	   *estate = node->ss.ps.state;
+	dsa_area   *dsa = node->ss.ps.state->es_query_dsa;
+
+	/* If there's no DSA, there are no workers; initialize nothing. */
+	if (dsa == NULL)
+		return;
 
 	pstate = shm_toc_allocate(pcxt->toc, node->pscan_len);
 
@@ -999,6 +1066,35 @@ ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node,
 	node->pstate = pstate;
 }
 
+/* ----------------------------------------------------------------
+ *		ExecBitmapHeapReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecBitmapHeapReInitializeDSM(BitmapHeapScanState *node,
+							  ParallelContext *pcxt)
+{
+	ParallelBitmapHeapState *pstate = node->pstate;
+	dsa_area   *dsa = node->ss.ps.state->es_query_dsa;
+
+	/* If there's no DSA, there are no workers; do nothing. */
+	if (dsa == NULL)
+		return;
+
+	pstate->state = BM_INITIAL;
+
+	if (DsaPointerIsValid(pstate->tbmiterator))
+		tbm_free_shared_area(dsa, pstate->tbmiterator);
+
+	if (DsaPointerIsValid(pstate->prefetch_iterator))
+		tbm_free_shared_area(dsa, pstate->prefetch_iterator);
+
+	pstate->tbmiterator = InvalidDsaPointer;
+	pstate->prefetch_iterator = InvalidDsaPointer;
+}
+
 /* ----------------------------------------------------------------
  *		ExecBitmapHeapInitializeWorker
  *
@@ -1006,12 +1102,15 @@ ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node,
  * ----------------------------------------------------------------
  */
 void
-ExecBitmapHeapInitializeWorker(BitmapHeapScanState *node, shm_toc *toc)
+ExecBitmapHeapInitializeWorker(BitmapHeapScanState *node,
+							   ParallelWorkerContext *pwcxt)
 {
 	ParallelBitmapHeapState *pstate;
 	Snapshot	snapshot;
 
-	pstate = shm_toc_lookup(toc, node->ss.ps.plan->plan_node_id, false);
+	Assert(node->ss.ps.state->es_query_dsa != NULL);
+
+	pstate = shm_toc_lookup(pwcxt->toc, node->ss.ps.plan->plan_node_id, false);
 	node->pstate = pstate;
 
 	snapshot = RestoreSnapshot(pstate->phs_snapshot_data);
diff --git a/src/backend/executor/nodeBitmapIndexscan.c b/src/backend/executor/nodeBitmapIndexscan.c
index 6feb70f4ae..d04f4901b4 100644
--- a/src/backend/executor/nodeBitmapIndexscan.c
+++ b/src/backend/executor/nodeBitmapIndexscan.c
@@ -3,7 +3,7 @@
  * nodeBitmapIndexscan.c
  *	  Routines to support bitmapped index scans of relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -226,6 +226,15 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags)
 	/* normally we don't make the result bitmap till runtime */
 	indexstate->biss_result = NULL;
 
+	/*
+	 * We do not open or lock the base relation here.  We assume that an
+	 * ancestor BitmapHeapScan node is holding AccessShareLock (or better) on
+	 * the heap relation throughout the execution of the plan tree.
+	 */
+
+	indexstate->ss.ss_currentRelation = NULL;
+	indexstate->ss.ss_currentScanDesc = NULL;
+
 	/*
 	 * Miscellaneous initialization
 	 *
@@ -242,15 +251,6 @@ ExecInitBitmapIndexScan(BitmapIndexScan *node, EState *estate, int eflags)
 	 * sub-parts corresponding to runtime keys (see below).
 	 */
 
-	/*
-	 * We do not open or lock the base relation here.  We assume that an
-	 * ancestor BitmapHeapScan node is holding AccessShareLock (or better) on
-	 * the heap relation throughout the execution of the plan tree.
-	 */
-
-	indexstate->ss.ss_currentRelation = NULL;
-	indexstate->ss.ss_currentScanDesc = NULL;
-
 	/*
 	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
 	 * here.  This allows an index-advisor plugin to EXPLAIN a plan containing
diff --git a/src/backend/executor/nodeBitmapOr.c b/src/backend/executor/nodeBitmapOr.c
index 66a7a89a8b..3f0a0a0544 100644
--- a/src/backend/executor/nodeBitmapOr.c
+++ b/src/backend/executor/nodeBitmapOr.c
@@ -3,7 +3,7 @@
  * nodeBitmapOr.c
  *	  routines to handle BitmapOr nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -81,13 +81,6 @@ ExecInitBitmapOr(BitmapOr *node, EState *estate, int eflags)
 	bitmaporstate->bitmapplans = bitmapplanstates;
 	bitmaporstate->nplans = nplans;
 
-	/*
-	 * Miscellaneous initialization
-	 *
-	 * BitmapOr plans don't have expression contexts because they never call
-	 * ExecQual or ExecProject.  They don't need any tuple slots either.
-	 */
-
 	/*
 	 * call ExecInitNode on each of the plans to be executed and save the
 	 * results into the array "bitmapplanstates".
@@ -100,6 +93,13 @@ ExecInitBitmapOr(BitmapOr *node, EState *estate, int eflags)
 		i++;
 	}
 
+	/*
+	 * Miscellaneous initialization
+	 *
+	 * BitmapOr plans don't have expression contexts because they never call
+	 * ExecQual or ExecProject.  They don't need any tuple slots either.
+	 */
+
 	return bitmaporstate;
 }
 
diff --git a/src/backend/executor/nodeCtescan.c b/src/backend/executor/nodeCtescan.c
index 79676ca978..24700dd396 100644
--- a/src/backend/executor/nodeCtescan.c
+++ b/src/backend/executor/nodeCtescan.c
@@ -3,7 +3,7 @@
  * nodeCtescan.c
  *	  routines to handle CteScan nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -107,6 +107,13 @@ CteScanNext(CteScanState *node)
 			return NULL;
 		}
 
+		/*
+		 * There are corner cases where the subplan could change which
+		 * tuplestore read pointer is active, so be sure to reselect ours
+		 * before storing the tuple we got.
+		 */
+		tuplestore_select_read_pointer(tuplestorestate, node->readptr);
+
 		/*
 		 * Append a copy of the returned tuple to tuplestore.  NOTE: because
 		 * our read pointer is certainly in EOF state, its read position will
@@ -178,6 +185,12 @@ ExecInitCteScan(CteScan *node, EState *estate, int eflags)
 	 * we might be asked to rescan the CTE even though upper levels didn't
 	 * tell us to be prepared to do it efficiently.  Annoying, since this
 	 * prevents truncation of the tuplestore.  XXX FIXME
+	 *
+	 * Note: if we are in an EPQ recheck plan tree, it's likely that no access
+	 * to the tuplestore is needed at all, making this even more annoying.
+	 * It's not worth improving that as long as all the read pointers would
+	 * have REWIND anyway, but if we ever improve this logic then that aspect
+	 * should be considered too.
 	 */
 	eflags |= EXEC_FLAG_REWIND;
 
@@ -242,31 +255,25 @@ ExecInitCteScan(CteScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
-
 	/*
 	 * The scan tuple type (ie, the rowtype we expect to find in the work
 	 * table) is the same as the result rowtype of the CTE query.
 	 */
-	ExecAssignScanType(&scanstate->ss,
-					   ExecGetResultType(scanstate->cteplanstate));
+	ExecInitScanTupleSlot(estate, &scanstate->ss,
+						  ExecGetResultType(scanstate->cteplanstate));
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
 	ExecAssignScanProjectionInfo(&scanstate->ss);
 
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+
 	return scanstate;
 }
 
diff --git a/src/backend/executor/nodeCustom.c b/src/backend/executor/nodeCustom.c
index fb7645b1f4..b816e0b31d 100644
--- a/src/backend/executor/nodeCustom.c
+++ b/src/backend/executor/nodeCustom.c
@@ -3,7 +3,7 @@
  * nodeCustom.c
  *		Routines to handle execution of custom scan node
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * ------------------------------------------------------------------------
@@ -54,14 +54,6 @@ ExecInitCustomScan(CustomScan *cscan, EState *estate, int eflags)
 	/* create expression context for node */
 	ExecAssignExprContext(estate, &css->ss.ps);
 
-	/* initialize child expressions */
-	css->ss.ps.qual =
-		ExecInitQual(cscan->scan.plan.qual, (PlanState *) css);
-
-	/* tuple table initialization */
-	ExecInitScanTupleSlot(estate, &css->ss);
-	ExecInitResultTupleSlot(estate, &css->ss.ps);
-
 	/*
 	 * open the base relation, if any, and acquire an appropriate lock on it
 	 */
@@ -81,23 +73,27 @@ ExecInitCustomScan(CustomScan *cscan, EState *estate, int eflags)
 		TupleDesc	scan_tupdesc;
 
 		scan_tupdesc = ExecTypeFromTL(cscan->custom_scan_tlist, false);
-		ExecAssignScanType(&css->ss, scan_tupdesc);
+		ExecInitScanTupleSlot(estate, &css->ss, scan_tupdesc);
 		/* Node's targetlist will contain Vars with varno = INDEX_VAR */
 		tlistvarno = INDEX_VAR;
 	}
 	else
 	{
-		ExecAssignScanType(&css->ss, RelationGetDescr(scan_rel));
+		ExecInitScanTupleSlot(estate, &css->ss, RelationGetDescr(scan_rel));
 		/* Node's targetlist will contain Vars with varno = scanrelid */
 		tlistvarno = scanrelid;
 	}
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&css->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &css->ss.ps);
 	ExecAssignScanProjectionInfoWithVarno(&css->ss, tlistvarno);
 
+	/* initialize child expressions */
+	css->ss.ps.qual =
+		ExecInitQual(cscan->scan.plan.qual, (PlanState *) css);
+
 	/*
 	 * The callback of custom-scan provider applies the final initialization
 	 * of the custom-scan-state node according to its logic.
@@ -195,7 +191,23 @@ ExecCustomScanInitializeDSM(CustomScanState *node, ParallelContext *pcxt)
 }
 
 void
-ExecCustomScanInitializeWorker(CustomScanState *node, shm_toc *toc)
+ExecCustomScanReInitializeDSM(CustomScanState *node, ParallelContext *pcxt)
+{
+	const CustomExecMethods *methods = node->methods;
+
+	if (methods->ReInitializeDSMCustomScan)
+	{
+		int			plan_node_id = node->ss.ps.plan->plan_node_id;
+		void	   *coordinate;
+
+		coordinate = shm_toc_lookup(pcxt->toc, plan_node_id, false);
+		methods->ReInitializeDSMCustomScan(node, pcxt, coordinate);
+	}
+}
+
+void
+ExecCustomScanInitializeWorker(CustomScanState *node,
+							   ParallelWorkerContext *pwcxt)
 {
 	const CustomExecMethods *methods = node->methods;
 
@@ -204,8 +216,8 @@ ExecCustomScanInitializeWorker(CustomScanState *node, shm_toc *toc)
 		int			plan_node_id = node->ss.ps.plan->plan_node_id;
 		void	   *coordinate;
 
-		coordinate = shm_toc_lookup(toc, plan_node_id, false);
-		methods->InitializeWorkerCustomScan(node, toc, coordinate);
+		coordinate = shm_toc_lookup(pwcxt->toc, plan_node_id, false);
+		methods->InitializeWorkerCustomScan(node, pwcxt->toc, coordinate);
 	}
 }
 
diff --git a/src/backend/executor/nodeForeignscan.c b/src/backend/executor/nodeForeignscan.c
index 140e82ef5e..0084234b35 100644
--- a/src/backend/executor/nodeForeignscan.c
+++ b/src/backend/executor/nodeForeignscan.c
@@ -3,7 +3,7 @@
  * nodeForeignscan.c
  *	  Routines to support scans of foreign tables
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -155,20 +155,6 @@ ExecInitForeignScan(ForeignScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
-	scanstate->fdw_recheck_quals =
-		ExecInitQual(node->fdw_recheck_quals, (PlanState *) scanstate);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
-
 	/*
 	 * open the base relation, if any, and acquire an appropriate lock on it;
 	 * also acquire function pointers from the FDW's handler
@@ -194,23 +180,31 @@ ExecInitForeignScan(ForeignScan *node, EState *estate, int eflags)
 		TupleDesc	scan_tupdesc;
 
 		scan_tupdesc = ExecTypeFromTL(node->fdw_scan_tlist, false);
-		ExecAssignScanType(&scanstate->ss, scan_tupdesc);
+		ExecInitScanTupleSlot(estate, &scanstate->ss, scan_tupdesc);
 		/* Node's targetlist will contain Vars with varno = INDEX_VAR */
 		tlistvarno = INDEX_VAR;
 	}
 	else
 	{
-		ExecAssignScanType(&scanstate->ss, RelationGetDescr(currentRelation));
+		ExecInitScanTupleSlot(estate, &scanstate->ss, RelationGetDescr(currentRelation));
 		/* Node's targetlist will contain Vars with varno = scanrelid */
 		tlistvarno = scanrelid;
 	}
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
 	ExecAssignScanProjectionInfoWithVarno(&scanstate->ss, tlistvarno);
 
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	scanstate->fdw_recheck_quals =
+		ExecInitQual(node->fdw_recheck_quals, (PlanState *) scanstate);
+
 	/*
 	 * Initialize FDW-related state.
 	 */
@@ -332,13 +326,35 @@ ExecForeignScanInitializeDSM(ForeignScanState *node, ParallelContext *pcxt)
 }
 
 /* ----------------------------------------------------------------
- *		ExecForeignScanInitializeDSM
+ *		ExecForeignScanReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecForeignScanReInitializeDSM(ForeignScanState *node, ParallelContext *pcxt)
+{
+	FdwRoutine *fdwroutine = node->fdwroutine;
+
+	if (fdwroutine->ReInitializeDSMForeignScan)
+	{
+		int			plan_node_id = node->ss.ps.plan->plan_node_id;
+		void	   *coordinate;
+
+		coordinate = shm_toc_lookup(pcxt->toc, plan_node_id, false);
+		fdwroutine->ReInitializeDSMForeignScan(node, pcxt, coordinate);
+	}
+}
+
+/* ----------------------------------------------------------------
+ *		ExecForeignScanInitializeWorker
  *
  *		Initialization according to the parallel coordination information
  * ----------------------------------------------------------------
  */
 void
-ExecForeignScanInitializeWorker(ForeignScanState *node, shm_toc *toc)
+ExecForeignScanInitializeWorker(ForeignScanState *node,
+								ParallelWorkerContext *pwcxt)
 {
 	FdwRoutine *fdwroutine = node->fdwroutine;
 
@@ -347,8 +363,8 @@ ExecForeignScanInitializeWorker(ForeignScanState *node, shm_toc *toc)
 		int			plan_node_id = node->ss.ps.plan->plan_node_id;
 		void	   *coordinate;
 
-		coordinate = shm_toc_lookup(toc, plan_node_id, false);
-		fdwroutine->InitializeWorkerForeignScan(node, toc, coordinate);
+		coordinate = shm_toc_lookup(pwcxt->toc, plan_node_id, false);
+		fdwroutine->InitializeWorkerForeignScan(node, pwcxt->toc, coordinate);
 	}
 }
 
diff --git a/src/backend/executor/nodeFunctionscan.c b/src/backend/executor/nodeFunctionscan.c
index 9f87a7e5cd..fb7c9f6787 100644
--- a/src/backend/executor/nodeFunctionscan.c
+++ b/src/backend/executor/nodeFunctionscan.c
@@ -3,7 +3,7 @@
  * nodeFunctionscan.c
  *	  Support routines for scanning RangeFunctions (functions in rangetable).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -334,18 +334,6 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
-
-	/*
-	 * initialize child expressions
-	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
-
 	scanstate->funcstates = palloc(nfuncs * sizeof(FunctionScanPerFuncState));
 
 	natts = 0;
@@ -383,7 +371,8 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
 											&funcrettype,
 											&tupdesc);
 
-		if (functypclass == TYPEFUNC_COMPOSITE)
+		if (functypclass == TYPEFUNC_COMPOSITE ||
+			functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
 		{
 			/* Composite data type, e.g. a table's row type */
 			Assert(tupdesc);
@@ -435,8 +424,7 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
 		 */
 		if (!scanstate->simple)
 		{
-			fs->func_slot = ExecInitExtraTupleSlot(estate);
-			ExecSetSlotDescriptor(fs->func_slot, fs->tupdesc);
+			fs->func_slot = ExecInitExtraTupleSlot(estate, fs->tupdesc);
 		}
 		else
 			fs->func_slot = NULL;
@@ -491,14 +479,23 @@ ExecInitFunctionScan(FunctionScan *node, EState *estate, int eflags)
 		Assert(attno == natts);
 	}
 
-	ExecAssignScanType(&scanstate->ss, scan_tupdesc);
+	/*
+	 * Initialize scan slot and type.
+	 */
+	ExecInitScanTupleSlot(estate, &scanstate->ss, scan_tupdesc);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
 	ExecAssignScanProjectionInfo(&scanstate->ss);
 
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+
 	/*
 	 * Create a memory context that ExecMakeTableFunctionResult can use to
 	 * evaluate function arguments in.  We can't use the per-tuple context for
diff --git a/src/backend/executor/nodeGather.c b/src/backend/executor/nodeGather.c
index e8d94ee6f3..eaf7d2d563 100644
--- a/src/backend/executor/nodeGather.c
+++ b/src/backend/executor/nodeGather.c
@@ -3,7 +3,7 @@
  * nodeGather.c
  *	  Support routines for scanning a plan via multiple workers.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * A Gather executor launches parallel workers to run multiple copies of a
@@ -38,6 +38,7 @@
 #include "executor/nodeSubplan.h"
 #include "executor/tqueue.h"
 #include "miscadmin.h"
+#include "optimizer/planmain.h"
 #include "pgstat.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
@@ -58,7 +59,6 @@ ExecInitGather(Gather *node, EState *estate, int eflags)
 {
 	GatherState *gatherstate;
 	Plan	   *outerNode;
-	bool		hasoid;
 	TupleDesc	tupDesc;
 
 	/* Gather node doesn't have innerPlan node. */
@@ -71,7 +71,11 @@ ExecInitGather(Gather *node, EState *estate, int eflags)
 	gatherstate->ps.plan = (Plan *) node;
 	gatherstate->ps.state = estate;
 	gatherstate->ps.ExecProcNode = ExecGather;
-	gatherstate->need_to_scan_locally = !node->single_copy;
+
+	gatherstate->initialized = false;
+	gatherstate->need_to_scan_locally =
+		!node->single_copy && parallel_leader_participation;
+	gatherstate->tuples_needed = -1;
 
 	/*
 	 * Miscellaneous initialization
@@ -80,37 +84,29 @@ ExecInitGather(Gather *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &gatherstate->ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	gatherstate->ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) gatherstate);
-
-	/*
-	 * tuple table initialization
-	 */
-	gatherstate->funnel_slot = ExecInitExtraTupleSlot(estate);
-	ExecInitResultTupleSlot(estate, &gatherstate->ps);
-
 	/*
 	 * now initialize outer plan
 	 */
 	outerNode = outerPlan(node);
 	outerPlanState(gatherstate) = ExecInitNode(outerNode, estate, eflags);
+	tupDesc = ExecGetResultType(outerPlanState(gatherstate));
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&gatherstate->ps);
-	ExecAssignProjectionInfo(&gatherstate->ps, NULL);
+	ExecInitResultTupleSlotTL(estate, &gatherstate->ps);
+	ExecConditionalAssignProjectionInfo(&gatherstate->ps, tupDesc, OUTER_VAR);
 
 	/*
 	 * Initialize funnel slot to same tuple descriptor as outer plan.
 	 */
-	if (!ExecContextForcesOids(&gatherstate->ps, &hasoid))
-		hasoid = false;
-	tupDesc = ExecTypeFromTL(outerNode->targetlist, hasoid);
-	ExecSetSlotDescriptor(gatherstate->funnel_slot, tupDesc);
+	gatherstate->funnel_slot = ExecInitExtraTupleSlot(estate, tupDesc);
+
+	/*
+	 * Gather doesn't support checking a qual (it's always more efficient to
+	 * do it in the child node).
+	 */
+	Assert(!node->plan.qual);
 
 	return gatherstate;
 }
@@ -126,8 +122,6 @@ static TupleTableSlot *
 ExecGather(PlanState *pstate)
 {
 	GatherState *node = castNode(GatherState, pstate);
-	TupleTableSlot *fslot = node->funnel_slot;
-	int			i;
 	TupleTableSlot *slot;
 	ExprContext *econtext;
 
@@ -148,15 +142,21 @@ ExecGather(PlanState *pstate)
 		 * Sometimes we might have to run without parallelism; but if parallel
 		 * mode is active then we can try to fire up some workers.
 		 */
-		if (gather->num_workers > 0 && IsInParallelMode())
+		if (gather->num_workers > 0 && estate->es_use_parallel_mode)
 		{
 			ParallelContext *pcxt;
 
-			/* Initialize the workers required to execute Gather node. */
+			/* Initialize, or re-initialize, shared state needed by workers. */
 			if (!node->pei)
 				node->pei = ExecInitParallelPlan(node->ps.lefttree,
 												 estate,
-												 gather->num_workers);
+												 gather->initParam,
+												 gather->num_workers,
+												 node->tuples_needed);
+			else
+				ExecParallelReinitialize(node->ps.lefttree,
+										 node->pei,
+										 gather->initParam);
 
 			/*
 			 * Register backend workers. We might not get as many as we
@@ -164,45 +164,39 @@ ExecGather(PlanState *pstate)
 			 */
 			pcxt = node->pei->pcxt;
 			LaunchParallelWorkers(pcxt);
+			/* We save # workers launched for the benefit of EXPLAIN */
 			node->nworkers_launched = pcxt->nworkers_launched;
 
 			/* Set up tuple queue readers to read the results. */
 			if (pcxt->nworkers_launched > 0)
 			{
-				node->nreaders = 0;
-				node->nextreader = 0;
-				node->reader =
-					palloc(pcxt->nworkers_launched * sizeof(TupleQueueReader *));
-
-				for (i = 0; i < pcxt->nworkers_launched; ++i)
-				{
-					shm_mq_set_handle(node->pei->tqueue[i],
-									  pcxt->worker[i].bgwhandle);
-					node->reader[node->nreaders++] =
-						CreateTupleQueueReader(node->pei->tqueue[i],
-											   fslot->tts_tupleDescriptor);
-				}
+				ExecParallelCreateReaders(node->pei);
+				/* Make a working array showing the active readers */
+				node->nreaders = pcxt->nworkers_launched;
+				node->reader = (TupleQueueReader **)
+					palloc(node->nreaders * sizeof(TupleQueueReader *));
+				memcpy(node->reader, node->pei->reader,
+					   node->nreaders * sizeof(TupleQueueReader *));
 			}
 			else
 			{
 				/* No workers?	Then never mind. */
-				ExecShutdownGatherWorkers(node);
+				node->nreaders = 0;
+				node->reader = NULL;
 			}
+			node->nextreader = 0;
 		}
 
-		/* Run plan locally if no workers or not single-copy. */
-		node->need_to_scan_locally = (node->reader == NULL)
-			|| !gather->single_copy;
+		/* Run plan locally if no workers or enabled and not single-copy. */
+		node->need_to_scan_locally = (node->nreaders == 0)
+			|| (!gather->single_copy && parallel_leader_participation);
 		node->initialized = true;
 	}
 
 	/*
 	 * Reset per-tuple memory context to free any expression evaluation
-	 * storage allocated in the previous tuple cycle.  This will also clear
-	 * any previous tuple returned by a TupleQueueReader; to make sure we
-	 * don't leave a dangling pointer around, clear the working slot first.
+	 * storage allocated in the previous tuple cycle.
 	 */
-	ExecClearTuple(fslot);
 	econtext = node->ps.ps_ExprContext;
 	ResetExprContext(econtext);
 
@@ -214,6 +208,10 @@ ExecGather(PlanState *pstate)
 	if (TupIsNull(slot))
 		return NULL;
 
+	/* If no projection is required, we're done. */
+	if (node->ps.ps_ProjInfo == NULL)
+		return slot;
+
 	/*
 	 * Form the result tuple using ExecProject(), and return it.
 	 */
@@ -247,21 +245,15 @@ gather_getnext(GatherState *gatherstate)
 	PlanState  *outerPlan = outerPlanState(gatherstate);
 	TupleTableSlot *outerTupleSlot;
 	TupleTableSlot *fslot = gatherstate->funnel_slot;
-	MemoryContext tupleContext = gatherstate->ps.ps_ExprContext->ecxt_per_tuple_memory;
 	HeapTuple	tup;
 
-	while (gatherstate->reader != NULL || gatherstate->need_to_scan_locally)
+	while (gatherstate->nreaders > 0 || gatherstate->need_to_scan_locally)
 	{
 		CHECK_FOR_INTERRUPTS();
 
-		if (gatherstate->reader != NULL)
+		if (gatherstate->nreaders > 0)
 		{
-			MemoryContext oldContext;
-
-			/* Run TupleQueueReaders in per-tuple context */
-			oldContext = MemoryContextSwitchTo(tupleContext);
 			tup = gather_readnext(gatherstate);
-			MemoryContextSwitchTo(oldContext);
 
 			if (HeapTupleIsValid(tup))
 			{
@@ -269,14 +261,20 @@ gather_getnext(GatherState *gatherstate)
 							   fslot,	/* slot in which to store the tuple */
 							   InvalidBuffer,	/* buffer associated with this
 												 * tuple */
-							   false);	/* slot should not pfree tuple */
+							   true);	/* pfree tuple when done with it */
 				return fslot;
 			}
 		}
 
 		if (gatherstate->need_to_scan_locally)
 		{
+			EState *estate = gatherstate->ps.state;
+
+			/* Install our DSA area while executing the plan. */
+			estate->es_query_dsa =
+				gatherstate->pei ? gatherstate->pei->area : NULL;
 			outerTupleSlot = ExecProcNode(outerPlan);
+			estate->es_query_dsa = NULL;
 
 			if (!TupIsNull(outerTupleSlot))
 				return outerTupleSlot;
@@ -305,25 +303,28 @@ gather_readnext(GatherState *gatherstate)
 		/* Check for async events, particularly messages from workers. */
 		CHECK_FOR_INTERRUPTS();
 
-		/* Attempt to read a tuple, but don't block if none is available. */
+		/*
+		 * Attempt to read a tuple, but don't block if none is available.
+		 *
+		 * Note that TupleQueueReaderNext will just return NULL for a worker
+		 * which fails to initialize.  We'll treat that worker as having
+		 * produced no tuples; WaitForParallelWorkersToFinish will error out
+		 * when we get there.
+		 */
 		Assert(gatherstate->nextreader < gatherstate->nreaders);
 		reader = gatherstate->reader[gatherstate->nextreader];
 		tup = TupleQueueReaderNext(reader, true, &readerdone);
 
 		/*
-		 * If this reader is done, remove it.  If all readers are done, clean
-		 * up remaining worker state.
+		 * If this reader is done, remove it from our working array of active
+		 * readers.  If all readers are done, we're outta here.
 		 */
 		if (readerdone)
 		{
 			Assert(!tup);
-			DestroyTupleQueueReader(reader);
 			--gatherstate->nreaders;
 			if (gatherstate->nreaders == 0)
-			{
-				ExecShutdownGatherWorkers(gatherstate);
 				return NULL;
-			}
 			memmove(&gatherstate->reader[gatherstate->nextreader],
 					&gatherstate->reader[gatherstate->nextreader + 1],
 					sizeof(TupleQueueReader *)
@@ -370,37 +371,25 @@ gather_readnext(GatherState *gatherstate)
 /* ----------------------------------------------------------------
  *		ExecShutdownGatherWorkers
  *
- *		Destroy the parallel workers.  Collect all the stats after
- *		workers are stopped, else some work done by workers won't be
- *		accounted.
+ *		Stop all the parallel workers.
  * ----------------------------------------------------------------
  */
 static void
 ExecShutdownGatherWorkers(GatherState *node)
 {
-	/* Shut down tuple queue readers before shutting down workers. */
-	if (node->reader != NULL)
-	{
-		int			i;
-
-		for (i = 0; i < node->nreaders; ++i)
-			DestroyTupleQueueReader(node->reader[i]);
-
-		pfree(node->reader);
-		node->reader = NULL;
-	}
-
-	/* Now shut down the workers. */
 	if (node->pei != NULL)
 		ExecParallelFinish(node->pei);
+
+	/* Flush local copy of reader array */
+	if (node->reader)
+		pfree(node->reader);
+	node->reader = NULL;
 }
 
 /* ----------------------------------------------------------------
  *		ExecShutdownGather
  *
  *		Destroy the setup for parallel workers including parallel context.
- *		Collect all the stats after workers are stopped, else some work
- *		done by workers won't be accounted.
  * ----------------------------------------------------------------
  */
 void
@@ -424,24 +413,42 @@ ExecShutdownGather(GatherState *node)
 /* ----------------------------------------------------------------
  *		ExecReScanGather
  *
- *		Re-initialize the workers and rescans a relation via them.
+ *		Prepare to re-scan the result of a Gather.
  * ----------------------------------------------------------------
  */
 void
 ExecReScanGather(GatherState *node)
 {
-	/*
-	 * Re-initialize the parallel workers to perform rescan of relation. We
-	 * want to gracefully shutdown all the workers so that they should be able
-	 * to propagate any error or other information to master backend before
-	 * dying.  Parallel context will be reused for rescan.
-	 */
+	Gather	   *gather = (Gather *) node->ps.plan;
+	PlanState  *outerPlan = outerPlanState(node);
+
+	/* Make sure any existing workers are gracefully shut down */
 	ExecShutdownGatherWorkers(node);
 
+	/* Mark node so that shared state will be rebuilt at next call */
 	node->initialized = false;
 
-	if (node->pei)
-		ExecParallelReinitialize(node->pei);
+	/*
+	 * Set child node's chgParam to tell it that the next scan might deliver a
+	 * different set of rows within the leader process.  (The overall rowset
+	 * shouldn't change, but the leader process's subset might; hence nodes
+	 * between here and the parallel table scan node mustn't optimize on the
+	 * assumption of an unchanging rowset.)
+	 */
+	if (gather->rescan_param >= 0)
+		outerPlan->chgParam = bms_add_member(outerPlan->chgParam,
+											 gather->rescan_param);
 
-	ExecReScan(node->ps.lefttree);
+	/*
+	 * If chgParam of subnode is not null then plan will be re-scanned by
+	 * first ExecProcNode.  Note: because this does nothing if we have a
+	 * rescan_param, it's currently guaranteed that parallel-aware child nodes
+	 * will not see a ReScan call until after they get a ReInitializeDSM call.
+	 * That ordering might not be something to rely on, though.  A good rule
+	 * of thumb is that ReInitializeDSM should reset only shared state, ReScan
+	 * should reset only local state, and anything that depends on both of
+	 * those steps being finished must wait until the first ExecProcNode call.
+	 */
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
diff --git a/src/backend/executor/nodeGatherMerge.c b/src/backend/executor/nodeGatherMerge.c
index 9a81e22510..83221cdbae 100644
--- a/src/backend/executor/nodeGatherMerge.c
+++ b/src/backend/executor/nodeGatherMerge.c
@@ -3,7 +3,7 @@
  * nodeGatherMerge.c
  *		Scan a plan in multiple workers, and do order-preserving merge.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -23,37 +23,46 @@
 #include "executor/tqueue.h"
 #include "lib/binaryheap.h"
 #include "miscadmin.h"
+#include "optimizer/planmain.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
 
-/*
- * Tuple array for each worker
- */
-typedef struct GMReaderTupleBuffer
-{
-	HeapTuple  *tuple;
-	int			readCounter;
-	int			nTuples;
-	bool		done;
-} GMReaderTupleBuffer;
-
 /*
  * When we read tuples from workers, it's a good idea to read several at once
  * for efficiency when possible: this minimizes context-switching overhead.
  * But reading too many at a time wastes memory without improving performance.
+ * We'll read up to MAX_TUPLE_STORE tuples (in addition to the first one).
  */
 #define MAX_TUPLE_STORE 10
 
+/*
+ * Pending-tuple array for each worker.  This holds additional tuples that
+ * we were able to fetch from the worker, but can't process yet.  In addition,
+ * this struct holds the "done" flag indicating the worker is known to have
+ * no more tuples.  (We do not use this struct for the leader; we don't keep
+ * any pending tuples for the leader, and the need_to_scan_locally flag serves
+ * as its "done" indicator.)
+ */
+typedef struct GMReaderTupleBuffer
+{
+	HeapTuple  *tuple;			/* array of length MAX_TUPLE_STORE */
+	int			nTuples;		/* number of tuples currently stored */
+	int			readCounter;	/* index of next tuple to extract */
+	bool		done;			/* true if reader is known exhausted */
+} GMReaderTupleBuffer;
+
 static TupleTableSlot *ExecGatherMerge(PlanState *pstate);
 static int32 heap_compare_slots(Datum a, Datum b, void *arg);
 static TupleTableSlot *gather_merge_getnext(GatherMergeState *gm_state);
 static HeapTuple gm_readnext_tuple(GatherMergeState *gm_state, int nreader,
 				  bool nowait, bool *done);
-static void gather_merge_init(GatherMergeState *gm_state);
 static void ExecShutdownGatherMergeWorkers(GatherMergeState *node);
+static void gather_merge_setup(GatherMergeState *gm_state);
+static void gather_merge_init(GatherMergeState *gm_state);
+static void gather_merge_clear_tuples(GatherMergeState *gm_state);
 static bool gather_merge_readnext(GatherMergeState *gm_state, int reader,
 					  bool nowait);
-static void form_tuple_array(GatherMergeState *gm_state, int reader);
+static void load_tuple_array(GatherMergeState *gm_state, int reader);
 
 /* ----------------------------------------------------------------
  *		ExecInitGather
@@ -64,7 +73,6 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
 {
 	GatherMergeState *gm_state;
 	Plan	   *outerNode;
-	bool		hasoid;
 	TupleDesc	tupDesc;
 
 	/* Gather merge node doesn't have innerPlan node. */
@@ -78,6 +86,10 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
 	gm_state->ps.state = estate;
 	gm_state->ps.ExecProcNode = ExecGatherMerge;
 
+	gm_state->initialized = false;
+	gm_state->gm_initialized = false;
+	gm_state->tuples_needed = -1;
+
 	/*
 	 * Miscellaneous initialization
 	 *
@@ -86,15 +98,10 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, &gm_state->ps);
 
 	/*
-	 * initialize child expressions
+	 * GatherMerge doesn't support checking a qual (it's always more efficient
+	 * to do it in the child node).
 	 */
-	gm_state->ps.qual =
-		ExecInitQual(node->plan.qual, &gm_state->ps);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &gm_state->ps);
+	Assert(!node->plan.qual);
 
 	/*
 	 * now initialize outer plan
@@ -103,12 +110,17 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
 	outerPlanState(gm_state) = ExecInitNode(outerNode, estate, eflags);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Store the tuple descriptor into gather merge state, so we can use it
+	 * while initializing the gather merge slots.
 	 */
-	ExecAssignResultTypeFromTL(&gm_state->ps);
-	ExecAssignProjectionInfo(&gm_state->ps, NULL);
+	tupDesc = ExecGetResultType(outerPlanState(gm_state));
+	gm_state->tupDesc = tupDesc;
 
-	gm_state->gm_initialized = false;
+	/*
+	 * Initialize result slot, type and projection.
+	 */
+	ExecInitResultTupleSlotTL(estate, &gm_state->ps);
+	ExecConditionalAssignProjectionInfo(&gm_state->ps, tupDesc, OUTER_VAR);
 
 	/*
 	 * initialize sort-key information
@@ -140,14 +152,8 @@ ExecInitGatherMerge(GatherMerge *node, EState *estate, int eflags)
 		}
 	}
 
-	/*
-	 * store the tuple descriptor into gather merge state, so we can use it
-	 * later while initializing the gather merge slots.
-	 */
-	if (!ExecContextForcesOids(&gm_state->ps, &hasoid))
-		hasoid = false;
-	tupDesc = ExecTypeFromTL(outerNode->targetlist, hasoid);
-	gm_state->tupDesc = tupDesc;
+	/* Now allocate the workspace for gather merge */
+	gather_merge_setup(gm_state);
 
 	return gm_state;
 }
@@ -165,7 +171,6 @@ ExecGatherMerge(PlanState *pstate)
 	GatherMergeState *node = castNode(GatherMergeState, pstate);
 	TupleTableSlot *slot;
 	ExprContext *econtext;
-	int			i;
 
 	CHECK_FOR_INTERRUPTS();
 
@@ -176,54 +181,56 @@ ExecGatherMerge(PlanState *pstate)
 	if (!node->initialized)
 	{
 		EState	   *estate = node->ps.state;
-		GatherMerge *gm = (GatherMerge *) node->ps.plan;
+		GatherMerge *gm = castNode(GatherMerge, node->ps.plan);
 
 		/*
 		 * Sometimes we might have to run without parallelism; but if parallel
 		 * mode is active then we can try to fire up some workers.
 		 */
-		if (gm->num_workers > 0 && IsInParallelMode())
+		if (gm->num_workers > 0 && estate->es_use_parallel_mode)
 		{
 			ParallelContext *pcxt;
 
-			/* Initialize data structures for workers. */
+			/* Initialize, or re-initialize, shared state needed by workers. */
 			if (!node->pei)
 				node->pei = ExecInitParallelPlan(node->ps.lefttree,
 												 estate,
-												 gm->num_workers);
+												 gm->initParam,
+												 gm->num_workers,
+												 node->tuples_needed);
+			else
+				ExecParallelReinitialize(node->ps.lefttree,
+										 node->pei,
+										 gm->initParam);
 
 			/* Try to launch workers. */
 			pcxt = node->pei->pcxt;
 			LaunchParallelWorkers(pcxt);
+			/* We save # workers launched for the benefit of EXPLAIN */
 			node->nworkers_launched = pcxt->nworkers_launched;
 
 			/* Set up tuple queue readers to read the results. */
 			if (pcxt->nworkers_launched > 0)
 			{
-				node->nreaders = 0;
-				node->reader = palloc(pcxt->nworkers_launched *
-									  sizeof(TupleQueueReader *));
-
-				Assert(gm->numCols);
-
-				for (i = 0; i < pcxt->nworkers_launched; ++i)
-				{
-					shm_mq_set_handle(node->pei->tqueue[i],
-									  pcxt->worker[i].bgwhandle);
-					node->reader[node->nreaders++] =
-						CreateTupleQueueReader(node->pei->tqueue[i],
-											   node->tupDesc);
-				}
+				ExecParallelCreateReaders(node->pei);
+				/* Make a working array showing the active readers */
+				node->nreaders = pcxt->nworkers_launched;
+				node->reader = (TupleQueueReader **)
+					palloc(node->nreaders * sizeof(TupleQueueReader *));
+				memcpy(node->reader, node->pei->reader,
+					   node->nreaders * sizeof(TupleQueueReader *));
 			}
 			else
 			{
 				/* No workers?	Then never mind. */
-				ExecShutdownGatherMergeWorkers(node);
+				node->nreaders = 0;
+				node->reader = NULL;
 			}
 		}
 
-		/* always allow leader to participate */
-		node->need_to_scan_locally = true;
+		/* allow leader to participate if enabled or no choice */
+		if (parallel_leader_participation || node->nreaders == 0)
+			node->need_to_scan_locally = true;
 		node->initialized = true;
 	}
 
@@ -242,10 +249,12 @@ ExecGatherMerge(PlanState *pstate)
 	if (TupIsNull(slot))
 		return NULL;
 
+	/* If no projection is required, we're done. */
+	if (node->ps.ps_ProjInfo == NULL)
+		return slot;
+
 	/*
-	 * form the result tuple using ExecProject(), and return it --- unless the
-	 * projection produces an empty set, in which case we must loop back
-	 * around for another tuple
+	 * Form the result tuple using ExecProject(), and return it.
 	 */
 	econtext->ecxt_outertuple = slot;
 	return ExecProject(node->ps.ps_ProjInfo);
@@ -270,8 +279,6 @@ ExecEndGatherMerge(GatherMergeState *node)
  *		ExecShutdownGatherMerge
  *
  *		Destroy the setup for parallel workers including parallel context.
- *		Collect all the stats after workers are stopped, else some work
- *		done by workers won't be accounted.
  * ----------------------------------------------------------------
  */
 void
@@ -290,159 +297,225 @@ ExecShutdownGatherMerge(GatherMergeState *node)
 /* ----------------------------------------------------------------
  *		ExecShutdownGatherMergeWorkers
  *
- *		Destroy the parallel workers.  Collect all the stats after
- *		workers are stopped, else some work done by workers won't be
- *		accounted.
+ *		Stop all the parallel workers.
  * ----------------------------------------------------------------
  */
 static void
 ExecShutdownGatherMergeWorkers(GatherMergeState *node)
 {
-	/* Shut down tuple queue readers before shutting down workers. */
-	if (node->reader != NULL)
-	{
-		int			i;
-
-		for (i = 0; i < node->nreaders; ++i)
-			if (node->reader[i])
-				DestroyTupleQueueReader(node->reader[i]);
-
-		pfree(node->reader);
-		node->reader = NULL;
-	}
-
-	/* Now shut down the workers. */
 	if (node->pei != NULL)
 		ExecParallelFinish(node->pei);
+
+	/* Flush local copy of reader array */
+	if (node->reader)
+		pfree(node->reader);
+	node->reader = NULL;
 }
 
 /* ----------------------------------------------------------------
  *		ExecReScanGatherMerge
  *
- *		Re-initialize the workers and rescans a relation via them.
+ *		Prepare to re-scan the result of a GatherMerge.
  * ----------------------------------------------------------------
  */
 void
 ExecReScanGatherMerge(GatherMergeState *node)
 {
-	/*
-	 * Re-initialize the parallel workers to perform rescan of relation. We
-	 * want to gracefully shutdown all the workers so that they should be able
-	 * to propagate any error or other information to master backend before
-	 * dying.  Parallel context will be reused for rescan.
-	 */
+	GatherMerge *gm = (GatherMerge *) node->ps.plan;
+	PlanState  *outerPlan = outerPlanState(node);
+
+	/* Make sure any existing workers are gracefully shut down */
 	ExecShutdownGatherMergeWorkers(node);
 
+	/* Free any unused tuples, so we don't leak memory across rescans */
+	gather_merge_clear_tuples(node);
+
+	/* Mark node so that shared state will be rebuilt at next call */
 	node->initialized = false;
+	node->gm_initialized = false;
 
-	if (node->pei)
-		ExecParallelReinitialize(node->pei);
+	/*
+	 * Set child node's chgParam to tell it that the next scan might deliver a
+	 * different set of rows within the leader process.  (The overall rowset
+	 * shouldn't change, but the leader process's subset might; hence nodes
+	 * between here and the parallel table scan node mustn't optimize on the
+	 * assumption of an unchanging rowset.)
+	 */
+	if (gm->rescan_param >= 0)
+		outerPlan->chgParam = bms_add_member(outerPlan->chgParam,
+											 gm->rescan_param);
 
-	ExecReScan(node->ps.lefttree);
+	/*
+	 * If chgParam of subnode is not null then plan will be re-scanned by
+	 * first ExecProcNode.  Note: because this does nothing if we have a
+	 * rescan_param, it's currently guaranteed that parallel-aware child nodes
+	 * will not see a ReScan call until after they get a ReInitializeDSM call.
+	 * That ordering might not be something to rely on, though.  A good rule
+	 * of thumb is that ReInitializeDSM should reset only shared state, ReScan
+	 * should reset only local state, and anything that depends on both of
+	 * those steps being finished must wait until the first ExecProcNode call.
+	 */
+	if (outerPlan->chgParam == NULL)
+		ExecReScan(outerPlan);
 }
 
 /*
- * Initialize the Gather merge tuple read.
+ * Set up the data structures that we'll need for Gather Merge.
+ *
+ * We allocate these once on the basis of gm->num_workers, which is an
+ * upper bound for the number of workers we'll actually have.  During
+ * a rescan, we reset the structures to empty.  This approach simplifies
+ * not leaking memory across rescans.
  *
- * Pull at least a single tuple from each worker + leader and set up the heap.
+ * In the gm_slots[] array, index 0 is for the leader, and indexes 1 to n
+ * are for workers.  The values placed into gm_heap correspond to indexes
+ * in gm_slots[].  The gm_tuple_buffers[] array, however, is indexed from
+ * 0 to n-1; it has no entry for the leader.
  */
 static void
-gather_merge_init(GatherMergeState *gm_state)
+gather_merge_setup(GatherMergeState *gm_state)
 {
-	int			nreaders = gm_state->nreaders;
-	bool		initialize = true;
+	GatherMerge *gm = castNode(GatherMerge, gm_state->ps.plan);
+	int			nreaders = gm->num_workers;
 	int			i;
 
 	/*
-	 * Allocate gm_slots for the number of worker + one more slot for leader.
-	 * Last slot is always for leader. Leader always calls ExecProcNode() to
-	 * read the tuple which will return the TupleTableSlot. Later it will
-	 * directly get assigned to gm_slot. So just initialize leader gm_slot
-	 * with NULL. For other slots below code will call
-	 * ExecInitExtraTupleSlot() which will do the initialization of worker
-	 * slots.
+	 * Allocate gm_slots for the number of workers + one more slot for leader.
+	 * Slot 0 is always for the leader.  Leader always calls ExecProcNode() to
+	 * read the tuple, and then stores it directly into its gm_slots entry.
+	 * For other slots, code below will call ExecInitExtraTupleSlot() to
+	 * create a slot for the worker's results.  Note that during any single
+	 * scan, we might have fewer than num_workers available workers, in which
+	 * case the extra array entries go unused.
 	 */
-	gm_state->gm_slots =
-		palloc((gm_state->nreaders + 1) * sizeof(TupleTableSlot *));
-	gm_state->gm_slots[gm_state->nreaders] = NULL;
-
-	/* Initialize the tuple slot and tuple array for each worker */
-	gm_state->gm_tuple_buffers =
-		(GMReaderTupleBuffer *) palloc0(sizeof(GMReaderTupleBuffer) *
-										(gm_state->nreaders + 1));
-	for (i = 0; i < gm_state->nreaders; i++)
+	gm_state->gm_slots = (TupleTableSlot **)
+		palloc0((nreaders + 1) * sizeof(TupleTableSlot *));
+
+	/* Allocate the tuple slot and tuple array for each worker */
+	gm_state->gm_tuple_buffers = (GMReaderTupleBuffer *)
+		palloc0(nreaders * sizeof(GMReaderTupleBuffer));
+
+	for (i = 0; i < nreaders; i++)
 	{
-		/* Allocate the tuple array with MAX_TUPLE_STORE size */
+		/* Allocate the tuple array with length MAX_TUPLE_STORE */
 		gm_state->gm_tuple_buffers[i].tuple =
 			(HeapTuple *) palloc0(sizeof(HeapTuple) * MAX_TUPLE_STORE);
 
-		/* Initialize slot for worker */
-		gm_state->gm_slots[i] = ExecInitExtraTupleSlot(gm_state->ps.state);
-		ExecSetSlotDescriptor(gm_state->gm_slots[i],
-							  gm_state->tupDesc);
+		/* Initialize tuple slot for worker */
+		gm_state->gm_slots[i + 1] =
+			ExecInitExtraTupleSlot(gm_state->ps.state, gm_state->tupDesc);
 	}
 
 	/* Allocate the resources for the merge */
-	gm_state->gm_heap = binaryheap_allocate(gm_state->nreaders + 1,
+	gm_state->gm_heap = binaryheap_allocate(nreaders + 1,
 											heap_compare_slots,
 											gm_state);
+}
+
+/*
+ * Initialize the Gather Merge.
+ *
+ * Reset data structures to ensure they're empty.  Then pull at least one
+ * tuple from leader + each worker (or set its "done" indicator), and set up
+ * the heap.
+ */
+static void
+gather_merge_init(GatherMergeState *gm_state)
+{
+	int			nreaders = gm_state->nreaders;
+	bool		nowait = true;
+	int			i;
+
+	/* Assert that gather_merge_setup made enough space */
+	Assert(nreaders <= castNode(GatherMerge, gm_state->ps.plan)->num_workers);
+
+	/* Reset leader's tuple slot to empty */
+	gm_state->gm_slots[0] = NULL;
+
+	/* Reset the tuple slot and tuple array for each worker */
+	for (i = 0; i < nreaders; i++)
+	{
+		/* Reset tuple array to empty */
+		gm_state->gm_tuple_buffers[i].nTuples = 0;
+		gm_state->gm_tuple_buffers[i].readCounter = 0;
+		/* Reset done flag to not-done */
+		gm_state->gm_tuple_buffers[i].done = false;
+		/* Ensure output slot is empty */
+		ExecClearTuple(gm_state->gm_slots[i + 1]);
+	}
+
+	/* Reset binary heap to empty */
+	binaryheap_reset(gm_state->gm_heap);
 
 	/*
 	 * First, try to read a tuple from each worker (including leader) in
-	 * nowait mode, so that we initialize read from each worker as well as
-	 * leader. After this, if all active workers are unable to produce a
-	 * tuple, then re-read and this time use wait mode. For workers that were
-	 * able to produce a tuple in the earlier loop and are still active, just
-	 * try to fill the tuple array if more tuples are avaiable.
+	 * nowait mode.  After this, if not all workers were able to produce a
+	 * tuple (or a "done" indication), then re-read from remaining workers,
+	 * this time using wait mode.  Add all live readers (those producing at
+	 * least one tuple) to the heap.
 	 */
 reread:
-	for (i = 0; i < nreaders + 1; i++)
+	for (i = 0; i <= nreaders; i++)
 	{
 		CHECK_FOR_INTERRUPTS();
 
-		if (!gm_state->gm_tuple_buffers[i].done &&
-			(TupIsNull(gm_state->gm_slots[i]) ||
-			 gm_state->gm_slots[i]->tts_isempty))
+		/* skip this source if already known done */
+		if ((i == 0) ? gm_state->need_to_scan_locally :
+			!gm_state->gm_tuple_buffers[i - 1].done)
 		{
-			if (gather_merge_readnext(gm_state, i, initialize))
+			if (TupIsNull(gm_state->gm_slots[i]))
 			{
-				binaryheap_add_unordered(gm_state->gm_heap,
-										 Int32GetDatum(i));
+				/* Don't have a tuple yet, try to get one */
+				if (gather_merge_readnext(gm_state, i, nowait))
+					binaryheap_add_unordered(gm_state->gm_heap,
+											 Int32GetDatum(i));
+			}
+			else
+			{
+				/*
+				 * We already got at least one tuple from this worker, but
+				 * might as well see if it has any more ready by now.
+				 */
+				load_tuple_array(gm_state, i);
 			}
 		}
-		else
-			form_tuple_array(gm_state, i);
 	}
-	initialize = false;
 
-	for (i = 0; i < nreaders; i++)
-		if (!gm_state->gm_tuple_buffers[i].done &&
-			(TupIsNull(gm_state->gm_slots[i]) ||
-			 gm_state->gm_slots[i]->tts_isempty))
+	/* need not recheck leader, since nowait doesn't matter for it */
+	for (i = 1; i <= nreaders; i++)
+	{
+		if (!gm_state->gm_tuple_buffers[i - 1].done &&
+			TupIsNull(gm_state->gm_slots[i]))
+		{
+			nowait = false;
 			goto reread;
+		}
+	}
 
+	/* Now heapify the heap. */
 	binaryheap_build(gm_state->gm_heap);
+
 	gm_state->gm_initialized = true;
 }
 
 /*
- * Clear out the tuple table slots for each gather merge input.
+ * Clear out the tuple table slot, and any unused pending tuples,
+ * for each gather merge input.
  */
 static void
-gather_merge_clear_slots(GatherMergeState *gm_state)
+gather_merge_clear_tuples(GatherMergeState *gm_state)
 {
 	int			i;
 
 	for (i = 0; i < gm_state->nreaders; i++)
 	{
-		pfree(gm_state->gm_tuple_buffers[i].tuple);
-		gm_state->gm_slots[i] = ExecClearTuple(gm_state->gm_slots[i]);
-	}
+		GMReaderTupleBuffer *tuple_buffer = &gm_state->gm_tuple_buffers[i];
+
+		while (tuple_buffer->readCounter < tuple_buffer->nTuples)
+			heap_freetuple(tuple_buffer->tuple[tuple_buffer->readCounter++]);
 
-	/* Free tuple array as we don't need it any more */
-	pfree(gm_state->gm_tuple_buffers);
-	/* Free the binaryheap, which was created for sort */
-	binaryheap_free(gm_state->gm_heap);
+		ExecClearTuple(gm_state->gm_slots[i + 1]);
+	}
 }
 
 /*
@@ -476,13 +549,16 @@ gather_merge_getnext(GatherMergeState *gm_state)
 		if (gather_merge_readnext(gm_state, i, false))
 			binaryheap_replace_first(gm_state->gm_heap, Int32GetDatum(i));
 		else
+		{
+			/* reader exhausted, remove it from heap */
 			(void) binaryheap_remove_first(gm_state->gm_heap);
+		}
 	}
 
 	if (binaryheap_empty(gm_state->gm_heap))
 	{
 		/* All the queues are exhausted, and so is the heap */
-		gather_merge_clear_slots(gm_state);
+		gather_merge_clear_tuples(gm_state);
 		return NULL;
 	}
 	else
@@ -494,37 +570,37 @@ gather_merge_getnext(GatherMergeState *gm_state)
 }
 
 /*
- * Read the tuple for given reader in nowait mode, and form the tuple array.
+ * Read tuple(s) for given reader in nowait mode, and load into its tuple
+ * array, until we have MAX_TUPLE_STORE of them or would have to block.
  */
 static void
-form_tuple_array(GatherMergeState *gm_state, int reader)
+load_tuple_array(GatherMergeState *gm_state, int reader)
 {
-	GMReaderTupleBuffer *tuple_buffer = &gm_state->gm_tuple_buffers[reader];
+	GMReaderTupleBuffer *tuple_buffer;
 	int			i;
 
-	/* Last slot is for leader and we don't build tuple array for leader */
-	if (reader == gm_state->nreaders)
+	/* Don't do anything if this is the leader. */
+	if (reader == 0)
 		return;
 
-	/*
-	 * We here because we already read all the tuples from the tuple array, so
-	 * initialize the counter to zero.
-	 */
+	tuple_buffer = &gm_state->gm_tuple_buffers[reader - 1];
+
+	/* If there's nothing in the array, reset the counters to zero. */
 	if (tuple_buffer->nTuples == tuple_buffer->readCounter)
 		tuple_buffer->nTuples = tuple_buffer->readCounter = 0;
 
-	/* Tuple array is already full? */
-	if (tuple_buffer->nTuples == MAX_TUPLE_STORE)
-		return;
-
+	/* Try to fill additional slots in the array. */
 	for (i = tuple_buffer->nTuples; i < MAX_TUPLE_STORE; i++)
 	{
-		tuple_buffer->tuple[i] = heap_copytuple(gm_readnext_tuple(gm_state,
-																  reader,
-																  false,
-																  &tuple_buffer->done));
-		if (!HeapTupleIsValid(tuple_buffer->tuple[i]))
+		HeapTuple	tuple;
+
+		tuple = gm_readnext_tuple(gm_state,
+								  reader,
+								  true,
+								  &tuple_buffer->done);
+		if (!HeapTupleIsValid(tuple))
 			break;
+		tuple_buffer->tuple[i] = tuple;
 		tuple_buffer->nTuples++;
 	}
 }
@@ -532,70 +608,72 @@ form_tuple_array(GatherMergeState *gm_state, int reader)
 /*
  * Store the next tuple for a given reader into the appropriate slot.
  *
- * Returns false if the reader is exhausted, and true otherwise.
+ * Returns true if successful, false if not (either reader is exhausted,
+ * or we didn't want to wait for a tuple).  Sets done flag if reader
+ * is found to be exhausted.
  */
 static bool
 gather_merge_readnext(GatherMergeState *gm_state, int reader, bool nowait)
 {
 	GMReaderTupleBuffer *tuple_buffer;
-	HeapTuple	tup = NULL;
+	HeapTuple	tup;
 
 	/*
 	 * If we're being asked to generate a tuple from the leader, then we just
 	 * call ExecProcNode as normal to produce one.
 	 */
-	if (gm_state->nreaders == reader)
+	if (reader == 0)
 	{
 		if (gm_state->need_to_scan_locally)
 		{
 			PlanState  *outerPlan = outerPlanState(gm_state);
 			TupleTableSlot *outerTupleSlot;
+			EState *estate = gm_state->ps.state;
 
+			/* Install our DSA area while executing the plan. */
+			estate->es_query_dsa = gm_state->pei ? gm_state->pei->area : NULL;
 			outerTupleSlot = ExecProcNode(outerPlan);
+			estate->es_query_dsa = NULL;
 
 			if (!TupIsNull(outerTupleSlot))
 			{
-				gm_state->gm_slots[reader] = outerTupleSlot;
+				gm_state->gm_slots[0] = outerTupleSlot;
 				return true;
 			}
-			gm_state->gm_tuple_buffers[reader].done = true;
+			/* need_to_scan_locally serves as "done" flag for leader */
 			gm_state->need_to_scan_locally = false;
 		}
 		return false;
 	}
 
 	/* Otherwise, check the state of the relevant tuple buffer. */
-	tuple_buffer = &gm_state->gm_tuple_buffers[reader];
+	tuple_buffer = &gm_state->gm_tuple_buffers[reader - 1];
 
 	if (tuple_buffer->nTuples > tuple_buffer->readCounter)
 	{
 		/* Return any tuple previously read that is still buffered. */
-		tuple_buffer = &gm_state->gm_tuple_buffers[reader];
 		tup = tuple_buffer->tuple[tuple_buffer->readCounter++];
 	}
 	else if (tuple_buffer->done)
 	{
 		/* Reader is known to be exhausted. */
-		DestroyTupleQueueReader(gm_state->reader[reader]);
-		gm_state->reader[reader] = NULL;
 		return false;
 	}
 	else
 	{
 		/* Read and buffer next tuple. */
-		tup = heap_copytuple(gm_readnext_tuple(gm_state,
-											   reader,
-											   nowait,
-											   &tuple_buffer->done));
+		tup = gm_readnext_tuple(gm_state,
+								reader,
+								nowait,
+								&tuple_buffer->done);
+		if (!HeapTupleIsValid(tup))
+			return false;
 
 		/*
 		 * Attempt to read more tuples in nowait mode and store them in the
-		 * tuple array.
+		 * pending-tuple array for the reader.
 		 */
-		if (HeapTupleIsValid(tup))
-			form_tuple_array(gm_state, reader);
-		else
-			return false;
+		load_tuple_array(gm_state, reader);
 	}
 
 	Assert(HeapTupleIsValid(tup));
@@ -604,39 +682,35 @@ gather_merge_readnext(GatherMergeState *gm_state, int reader, bool nowait)
 	ExecStoreTuple(tup,			/* tuple to store */
 				   gm_state->gm_slots[reader],	/* slot in which to store the
 												 * tuple */
-				   InvalidBuffer,	/* buffer associated with this tuple */
-				   true);		/* pfree this pointer if not from heap */
+				   InvalidBuffer,	/* no buffer associated with tuple */
+				   true);		/* pfree tuple when done with it */
 
 	return true;
 }
 
 /*
- * Attempt to read a tuple from given reader.
+ * Attempt to read a tuple from given worker.
  */
 static HeapTuple
 gm_readnext_tuple(GatherMergeState *gm_state, int nreader, bool nowait,
 				  bool *done)
 {
 	TupleQueueReader *reader;
-	HeapTuple	tup = NULL;
-	MemoryContext oldContext;
-	MemoryContext tupleContext;
-
-	tupleContext = gm_state->ps.ps_ExprContext->ecxt_per_tuple_memory;
-
-	if (done != NULL)
-		*done = false;
+	HeapTuple	tup;
 
 	/* Check for async events, particularly messages from workers. */
 	CHECK_FOR_INTERRUPTS();
 
-	/* Attempt to read a tuple. */
-	reader = gm_state->reader[nreader];
-
-	/* Run TupleQueueReaders in per-tuple context */
-	oldContext = MemoryContextSwitchTo(tupleContext);
+	/*
+	 * Attempt to read a tuple.
+	 *
+	 * Note that TupleQueueReaderNext will just return NULL for a worker which
+	 * fails to initialize.  We'll treat that worker as having produced no
+	 * tuples; WaitForParallelWorkersToFinish will error out when we get
+	 * there.
+	 */
+	reader = gm_state->reader[nreader - 1];
 	tup = TupleQueueReaderNext(reader, nowait, done);
-	MemoryContextSwitchTo(oldContext);
 
 	return tup;
 }
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
index ab4ae24a6b..2ea80e817d 100644
--- a/src/backend/executor/nodeGroup.c
+++ b/src/backend/executor/nodeGroup.c
@@ -3,7 +3,7 @@
  * nodeGroup.c
  *	  Routines to handle group nodes (used for queries with GROUP BY clause).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -25,6 +25,7 @@
 #include "executor/executor.h"
 #include "executor/nodeGroup.h"
 #include "miscadmin.h"
+#include "utils/memutils.h"
 
 
 /*
@@ -37,8 +38,6 @@ ExecGroup(PlanState *pstate)
 {
 	GroupState *node = castNode(GroupState, pstate);
 	ExprContext *econtext;
-	int			numCols;
-	AttrNumber *grpColIdx;
 	TupleTableSlot *firsttupleslot;
 	TupleTableSlot *outerslot;
 
@@ -50,8 +49,6 @@ ExecGroup(PlanState *pstate)
 	if (node->grp_done)
 		return NULL;
 	econtext = node->ss.ps.ps_ExprContext;
-	numCols = ((Group *) node->ss.ps.plan)->numCols;
-	grpColIdx = ((Group *) node->ss.ps.plan)->grpColIdx;
 
 	/*
 	 * The ScanTupleSlot holds the (copied) first tuple of each group.
@@ -59,7 +56,7 @@ ExecGroup(PlanState *pstate)
 	firsttupleslot = node->ss.ss_ScanTupleSlot;
 
 	/*
-	 * We need not call ResetExprContext here because execTuplesMatch will
+	 * We need not call ResetExprContext here because ExecQualAndReset() will
 	 * reset the per-tuple memory context once per input tuple.
 	 */
 
@@ -73,7 +70,7 @@ ExecGroup(PlanState *pstate)
 		if (TupIsNull(outerslot))
 		{
 			/* empty input, so return nothing */
-			node->grp_done = TRUE;
+			node->grp_done = true;
 			return NULL;
 		}
 		/* Copy tuple into firsttupleslot */
@@ -116,7 +113,7 @@ ExecGroup(PlanState *pstate)
 			if (TupIsNull(outerslot))
 			{
 				/* no more groups, so we're done */
-				node->grp_done = TRUE;
+				node->grp_done = true;
 				return NULL;
 			}
 
@@ -124,10 +121,9 @@ ExecGroup(PlanState *pstate)
 			 * Compare with first tuple and see if this tuple is of the same
 			 * group.  If so, ignore it and keep scanning.
 			 */
-			if (!execTuplesMatch(firsttupleslot, outerslot,
-								 numCols, grpColIdx,
-								 node->eqfunctions,
-								 econtext->ecxt_per_tuple_memory))
+			econtext->ecxt_innertuple = firsttupleslot;
+			econtext->ecxt_outertuple = outerslot;
+			if (!ExecQualAndReset(node->eqfunction, econtext))
 				break;
 		}
 
@@ -177,47 +173,44 @@ ExecInitGroup(Group *node, EState *estate, int eflags)
 	grpstate->ss.ps.plan = (Plan *) node;
 	grpstate->ss.ps.state = estate;
 	grpstate->ss.ps.ExecProcNode = ExecGroup;
-	grpstate->grp_done = FALSE;
+	grpstate->grp_done = false;
 
 	/*
 	 * create expression context
 	 */
 	ExecAssignExprContext(estate, &grpstate->ss.ps);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitScanTupleSlot(estate, &grpstate->ss);
-	ExecInitResultTupleSlot(estate, &grpstate->ss.ps);
-
-	/*
-	 * initialize child expressions
-	 */
-	grpstate->ss.ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) grpstate);
-
 	/*
 	 * initialize child nodes
 	 */
 	outerPlanState(grpstate) = ExecInitNode(outerPlan(node), estate, eflags);
 
 	/*
-	 * initialize tuple type.
+	 * Initialize scan slot and type.
 	 */
-	ExecAssignScanTypeFromOuterPlan(&grpstate->ss);
+	ExecCreateScanSlotFromOuterPlan(estate, &grpstate->ss);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&grpstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &grpstate->ss.ps);
 	ExecAssignProjectionInfo(&grpstate->ss.ps, NULL);
 
+	/*
+	 * initialize child expressions
+	 */
+	grpstate->ss.ps.qual =
+		ExecInitQual(node->plan.qual, (PlanState *) grpstate);
+
 	/*
 	 * Precompute fmgr lookup data for inner loop
 	 */
-	grpstate->eqfunctions =
-		execTuplesMatchPrepare(node->numCols,
-							   node->grpOperators);
+	grpstate->eqfunction =
+		execTuplesMatchPrepare(ExecGetResultType(outerPlanState(grpstate)),
+							   node->numCols,
+							   node->grpColIdx,
+							   node->grpOperators,
+							   &grpstate->ss.ps);
 
 	return grpstate;
 }
@@ -246,7 +239,7 @@ ExecReScanGroup(GroupState *node)
 {
 	PlanState  *outerPlan = outerPlanState(node);
 
-	node->grp_done = FALSE;
+	node->grp_done = false;
 	/* must clear first tuple */
 	ExecClearTuple(node->ss.ss_ScanTupleSlot);
 
diff --git a/src/backend/executor/nodeHash.c b/src/backend/executor/nodeHash.c
index d10d94ccc2..06bb44b163 100644
--- a/src/backend/executor/nodeHash.c
+++ b/src/backend/executor/nodeHash.c
@@ -3,13 +3,15 @@
  * nodeHash.c
  *	  Routines to hash relations for hashjoin
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
  *	  src/backend/executor/nodeHash.c
  *
+ * See note on parallelism in nodeHashjoin.c.
+ *
  *-------------------------------------------------------------------------
  */
 /*
@@ -25,6 +27,7 @@
 #include <limits.h>
 
 #include "access/htup_details.h"
+#include "access/parallel.h"
 #include "catalog/pg_statistic.h"
 #include "commands/tablespace.h"
 #include "executor/execdebug.h"
@@ -32,6 +35,8 @@
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
 #include "miscadmin.h"
+#include "pgstat.h"
+#include "port/atomics.h"
 #include "utils/dynahash.h"
 #include "utils/memutils.h"
 #include "utils/lsyscache.h"
@@ -40,6 +45,8 @@
 
 static void ExecHashIncreaseNumBatches(HashJoinTable hashtable);
 static void ExecHashIncreaseNumBuckets(HashJoinTable hashtable);
+static void ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable);
+static void ExecParallelHashIncreaseNumBuckets(HashJoinTable hashtable);
 static void ExecHashBuildSkewHash(HashJoinTable hashtable, Hash *node,
 					  int mcvsToUse);
 static void ExecHashSkewTableInsert(HashJoinTable hashtable,
@@ -49,6 +56,30 @@ static void ExecHashSkewTableInsert(HashJoinTable hashtable,
 static void ExecHashRemoveNextSkewBucket(HashJoinTable hashtable);
 
 static void *dense_alloc(HashJoinTable hashtable, Size size);
+static HashJoinTuple ExecParallelHashTupleAlloc(HashJoinTable hashtable,
+						   size_t size,
+						   dsa_pointer *shared);
+static void MultiExecPrivateHash(HashState *node);
+static void MultiExecParallelHash(HashState *node);
+static inline HashJoinTuple ExecParallelHashFirstTuple(HashJoinTable table,
+						   int bucketno);
+static inline HashJoinTuple ExecParallelHashNextTuple(HashJoinTable table,
+						  HashJoinTuple tuple);
+static inline void ExecParallelHashPushTuple(dsa_pointer_atomic *head,
+						  HashJoinTuple tuple,
+						  dsa_pointer tuple_shared);
+static void ExecParallelHashJoinSetUpBatches(HashJoinTable hashtable, int nbatch);
+static void ExecParallelHashEnsureBatchAccessors(HashJoinTable hashtable);
+static void ExecParallelHashRepartitionFirst(HashJoinTable hashtable);
+static void ExecParallelHashRepartitionRest(HashJoinTable hashtable);
+static HashMemoryChunk ExecParallelHashPopChunkQueue(HashJoinTable table,
+							  dsa_pointer *shared);
+static bool ExecParallelHashTuplePrealloc(HashJoinTable hashtable,
+							  int batchno,
+							  size_t size);
+static void ExecParallelHashMergeCounters(HashJoinTable hashtable);
+static void ExecParallelHashCloseBatchAccessors(HashJoinTable hashtable);
+
 
 /* ----------------------------------------------------------------
  *		ExecHash
@@ -72,6 +103,39 @@ ExecHash(PlanState *pstate)
  */
 Node *
 MultiExecHash(HashState *node)
+{
+	/* must provide our own instrumentation support */
+	if (node->ps.instrument)
+		InstrStartNode(node->ps.instrument);
+
+	if (node->parallel_state != NULL)
+		MultiExecParallelHash(node);
+	else
+		MultiExecPrivateHash(node);
+
+	/* must provide our own instrumentation support */
+	if (node->ps.instrument)
+		InstrStopNode(node->ps.instrument, node->hashtable->partialTuples);
+
+	/*
+	 * We do not return the hash table directly because it's not a subtype of
+	 * Node, and so would violate the MultiExecProcNode API.  Instead, our
+	 * parent Hashjoin node is expected to know how to fish it out of our node
+	 * state.  Ugly but not really worth cleaning up, since Hashjoin knows
+	 * quite a bit more about Hash besides that.
+	 */
+	return NULL;
+}
+
+/* ----------------------------------------------------------------
+ *		MultiExecPrivateHash
+ *
+ *		parallel-oblivious version, building a backend-private
+ *		hash table and (if necessary) batch files.
+ * ----------------------------------------------------------------
+ */
+static void
+MultiExecPrivateHash(HashState *node)
 {
 	PlanState  *outerNode;
 	List	   *hashkeys;
@@ -80,10 +144,6 @@ MultiExecHash(HashState *node)
 	ExprContext *econtext;
 	uint32		hashvalue;
 
-	/* must provide our own instrumentation support */
-	if (node->ps.instrument)
-		InstrStartNode(node->ps.instrument);
-
 	/*
 	 * get state info from node
 	 */
@@ -138,18 +198,148 @@ MultiExecHash(HashState *node)
 	if (hashtable->spaceUsed > hashtable->spacePeak)
 		hashtable->spacePeak = hashtable->spaceUsed;
 
-	/* must provide our own instrumentation support */
-	if (node->ps.instrument)
-		InstrStopNode(node->ps.instrument, hashtable->totalTuples);
+	hashtable->partialTuples = hashtable->totalTuples;
+}
+
+/* ----------------------------------------------------------------
+ *		MultiExecParallelHash
+ *
+ *		parallel-aware version, building a shared hash table and
+ *		(if necessary) batch files using the combined effort of
+ *		a set of co-operating backends.
+ * ----------------------------------------------------------------
+ */
+static void
+MultiExecParallelHash(HashState *node)
+{
+	ParallelHashJoinState *pstate;
+	PlanState  *outerNode;
+	List	   *hashkeys;
+	HashJoinTable hashtable;
+	TupleTableSlot *slot;
+	ExprContext *econtext;
+	uint32		hashvalue;
+	Barrier    *build_barrier;
+	int			i;
 
 	/*
-	 * We do not return the hash table directly because it's not a subtype of
-	 * Node, and so would violate the MultiExecProcNode API.  Instead, our
-	 * parent Hashjoin node is expected to know how to fish it out of our node
-	 * state.  Ugly but not really worth cleaning up, since Hashjoin knows
-	 * quite a bit more about Hash besides that.
+	 * get state info from node
 	 */
-	return NULL;
+	outerNode = outerPlanState(node);
+	hashtable = node->hashtable;
+
+	/*
+	 * set expression context
+	 */
+	hashkeys = node->hashkeys;
+	econtext = node->ps.ps_ExprContext;
+
+	/*
+	 * Synchronize the parallel hash table build.  At this stage we know that
+	 * the shared hash table has been or is being set up by
+	 * ExecHashTableCreate(), but we don't know if our peers have returned
+	 * from there or are here in MultiExecParallelHash(), and if so how far
+	 * through they are.  To find out, we check the build_barrier phase then
+	 * and jump to the right step in the build algorithm.
+	 */
+	pstate = hashtable->parallel_state;
+	build_barrier = &pstate->build_barrier;
+	Assert(BarrierPhase(build_barrier) >= PHJ_BUILD_ALLOCATING);
+	switch (BarrierPhase(build_barrier))
+	{
+		case PHJ_BUILD_ALLOCATING:
+
+			/*
+			 * Either I just allocated the initial hash table in
+			 * ExecHashTableCreate(), or someone else is doing that.  Either
+			 * way, wait for everyone to arrive here so we can proceed.
+			 */
+			BarrierArriveAndWait(build_barrier, WAIT_EVENT_HASH_BUILD_ALLOCATING);
+			/* Fall through. */
+
+		case PHJ_BUILD_HASHING_INNER:
+
+			/*
+			 * It's time to begin hashing, or if we just arrived here then
+			 * hashing is already underway, so join in that effort.  While
+			 * hashing we have to be prepared to help increase the number of
+			 * batches or buckets at any time, and if we arrived here when
+			 * that was already underway we'll have to help complete that work
+			 * immediately so that it's safe to access batches and buckets
+			 * below.
+			 */
+			if (PHJ_GROW_BATCHES_PHASE(BarrierAttach(&pstate->grow_batches_barrier)) !=
+				PHJ_GROW_BATCHES_ELECTING)
+				ExecParallelHashIncreaseNumBatches(hashtable);
+			if (PHJ_GROW_BUCKETS_PHASE(BarrierAttach(&pstate->grow_buckets_barrier)) !=
+				PHJ_GROW_BUCKETS_ELECTING)
+				ExecParallelHashIncreaseNumBuckets(hashtable);
+			ExecParallelHashEnsureBatchAccessors(hashtable);
+			ExecParallelHashTableSetCurrentBatch(hashtable, 0);
+			for (;;)
+			{
+				slot = ExecProcNode(outerNode);
+				if (TupIsNull(slot))
+					break;
+				econtext->ecxt_innertuple = slot;
+				if (ExecHashGetHashValue(hashtable, econtext, hashkeys,
+										 false, hashtable->keepNulls,
+										 &hashvalue))
+					ExecParallelHashTableInsert(hashtable, slot, hashvalue);
+				hashtable->partialTuples++;
+			}
+
+			/*
+			 * Make sure that any tuples we wrote to disk are visible to
+			 * others before anyone tries to load them.
+			 */
+			for (i = 0; i < hashtable->nbatch; ++i)
+				sts_end_write(hashtable->batches[i].inner_tuples);
+
+			/*
+			 * Update shared counters.  We need an accurate total tuple count
+			 * to control the empty table optimization.
+			 */
+			ExecParallelHashMergeCounters(hashtable);
+
+			BarrierDetach(&pstate->grow_buckets_barrier);
+			BarrierDetach(&pstate->grow_batches_barrier);
+
+			/*
+			 * Wait for everyone to finish building and flushing files and
+			 * counters.
+			 */
+			if (BarrierArriveAndWait(build_barrier,
+									 WAIT_EVENT_HASH_BUILD_HASHING_INNER))
+			{
+				/*
+				 * Elect one backend to disable any further growth.  Batches
+				 * are now fixed.  While building them we made sure they'd fit
+				 * in our memory budget when we load them back in later (or we
+				 * tried to do that and gave up because we detected extreme
+				 * skew).
+				 */
+				pstate->growth = PHJ_GROWTH_DISABLED;
+			}
+	}
+
+	/*
+	 * We're not yet attached to a batch.  We all agree on the dimensions and
+	 * number of inner tuples (for the empty table optimization).
+	 */
+	hashtable->curbatch = -1;
+	hashtable->nbuckets = pstate->nbuckets;
+	hashtable->log2_nbuckets = my_log2(hashtable->nbuckets);
+	hashtable->totalTuples = pstate->total_tuples;
+	ExecParallelHashEnsureBatchAccessors(hashtable);
+
+	/*
+	 * The next synchronization point is in ExecHashJoin's HJ_BUILD_HASHTABLE
+	 * case, which will bring the build phase to PHJ_BUILD_DONE (if it isn't
+	 * there already).
+	 */
+	Assert(BarrierPhase(build_barrier) == PHJ_BUILD_HASHING_OUTER ||
+		   BarrierPhase(build_barrier) == PHJ_BUILD_DONE);
 }
 
 /* ----------------------------------------------------------------
@@ -183,29 +373,24 @@ ExecInitHash(Hash *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &hashstate->ps);
 
-	/*
-	 * initialize our result slot
-	 */
-	ExecInitResultTupleSlot(estate, &hashstate->ps);
-
-	/*
-	 * initialize child expressions
-	 */
-	hashstate->ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) hashstate);
-
 	/*
 	 * initialize child nodes
 	 */
 	outerPlanState(hashstate) = ExecInitNode(outerPlan(node), estate, eflags);
 
 	/*
-	 * initialize tuple type. no need to initialize projection info because
-	 * this node doesn't do projections
+	 * initialize our result slot and type. No need to build projection
+	 * because this node doesn't do projections.
 	 */
-	ExecAssignResultTypeFromTL(&hashstate->ps);
+	ExecInitResultTupleSlotTL(estate, &hashstate->ps);
 	hashstate->ps.ps_ProjInfo = NULL;
 
+	/*
+	 * initialize child expressions
+	 */
+	hashstate->ps.qual =
+		ExecInitQual(node->plan.qual, (PlanState *) hashstate);
+
 	return hashstate;
 }
 
@@ -240,12 +425,15 @@ ExecEndHash(HashState *node)
  * ----------------------------------------------------------------
  */
 HashJoinTable
-ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
+ExecHashTableCreate(HashState *state, List *hashOperators, bool keepNulls)
 {
+	Hash	   *node;
 	HashJoinTable hashtable;
 	Plan	   *outerNode;
+	size_t		space_allowed;
 	int			nbuckets;
 	int			nbatch;
+	double		rows;
 	int			num_skew_mcvs;
 	int			log2_nbuckets;
 	int			nkeys;
@@ -258,10 +446,22 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 	 * "outer" subtree of this node, but the inner relation of the hashjoin).
 	 * Compute the appropriate size of the hash table.
 	 */
+	node = (Hash *) state->ps.plan;
 	outerNode = outerPlan(node);
 
-	ExecChooseHashTableSize(outerNode->plan_rows, outerNode->plan_width,
+	/*
+	 * If this is shared hash table with a partial plan, then we can't use
+	 * outerNode->plan_rows to estimate its size.  We need an estimate of the
+	 * total number of rows across all copies of the partial plan.
+	 */
+	rows = node->plan.parallel_aware ? node->rows_total : outerNode->plan_rows;
+
+	ExecChooseHashTableSize(rows, outerNode->plan_width,
 							OidIsValid(node->skewTable),
+							state->parallel_state != NULL,
+							state->parallel_state != NULL ?
+							state->parallel_state->nparticipants - 1 : 0,
+							&space_allowed,
 							&nbuckets, &nbatch, &num_skew_mcvs);
 
 	/* nbuckets must be a power of 2 */
@@ -280,7 +480,7 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 	hashtable->nbuckets_optimal = nbuckets;
 	hashtable->log2_nbuckets = log2_nbuckets;
 	hashtable->log2_nbuckets_optimal = log2_nbuckets;
-	hashtable->buckets = NULL;
+	hashtable->buckets.unshared = NULL;
 	hashtable->keepNulls = keepNulls;
 	hashtable->skewEnabled = false;
 	hashtable->skewBucket = NULL;
@@ -293,16 +493,21 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 	hashtable->nbatch_outstart = nbatch;
 	hashtable->growEnabled = true;
 	hashtable->totalTuples = 0;
+	hashtable->partialTuples = 0;
 	hashtable->skewTuples = 0;
 	hashtable->innerBatchFile = NULL;
 	hashtable->outerBatchFile = NULL;
 	hashtable->spaceUsed = 0;
 	hashtable->spacePeak = 0;
-	hashtable->spaceAllowed = work_mem * 1024L;
+	hashtable->spaceAllowed = space_allowed;
 	hashtable->spaceUsedSkew = 0;
 	hashtable->spaceAllowedSkew =
 		hashtable->spaceAllowed * SKEW_WORK_MEM_PERCENT / 100;
 	hashtable->chunks = NULL;
+	hashtable->current_chunk = NULL;
+	hashtable->parallel_state = state->parallel_state;
+	hashtable->area = state->ps.state->es_query_dsa;
+	hashtable->batches = NULL;
 
 #ifdef HJDEBUG
 	printf("Hashjoin %p: initial nbatch = %d, nbuckets = %d\n",
@@ -351,10 +556,11 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 
 	oldcxt = MemoryContextSwitchTo(hashtable->hashCxt);
 
-	if (nbatch > 1)
+	if (nbatch > 1 && hashtable->parallel_state == NULL)
 	{
 		/*
-		 * allocate and initialize the file arrays in hashCxt
+		 * allocate and initialize the file arrays in hashCxt (not needed for
+		 * parallel case which uses shared tuplestores instead of raw files)
 		 */
 		hashtable->innerBatchFile = (BufFile **)
 			palloc0(nbatch * sizeof(BufFile *));
@@ -365,23 +571,77 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 		PrepareTempTablespaces();
 	}
 
-	/*
-	 * Prepare context for the first-scan space allocations; allocate the
-	 * hashbucket array therein, and set each bucket "empty".
-	 */
-	MemoryContextSwitchTo(hashtable->batchCxt);
+	MemoryContextSwitchTo(oldcxt);
 
-	hashtable->buckets = (HashJoinTuple *)
-		palloc0(nbuckets * sizeof(HashJoinTuple));
+	if (hashtable->parallel_state)
+	{
+		ParallelHashJoinState *pstate = hashtable->parallel_state;
+		Barrier    *build_barrier;
 
-	/*
-	 * Set up for skew optimization, if possible and there's a need for more
-	 * than one batch.  (In a one-batch join, there's no point in it.)
-	 */
-	if (nbatch > 1)
-		ExecHashBuildSkewHash(hashtable, node, num_skew_mcvs);
+		/*
+		 * Attach to the build barrier.  The corresponding detach operation is
+		 * in ExecHashTableDetach.  Note that we won't attach to the
+		 * batch_barrier for batch 0 yet.  We'll attach later and start it out
+		 * in PHJ_BATCH_PROBING phase, because batch 0 is allocated up front
+		 * and then loaded while hashing (the standard hybrid hash join
+		 * algorithm), and we'll coordinate that using build_barrier.
+		 */
+		build_barrier = &pstate->build_barrier;
+		BarrierAttach(build_barrier);
 
-	MemoryContextSwitchTo(oldcxt);
+		/*
+		 * So far we have no idea whether there are any other participants,
+		 * and if so, what phase they are working on.  The only thing we care
+		 * about at this point is whether someone has already created the
+		 * SharedHashJoinBatch objects and the hash table for batch 0.  One
+		 * backend will be elected to do that now if necessary.
+		 */
+		if (BarrierPhase(build_barrier) == PHJ_BUILD_ELECTING &&
+			BarrierArriveAndWait(build_barrier, WAIT_EVENT_HASH_BUILD_ELECTING))
+		{
+			pstate->nbatch = nbatch;
+			pstate->space_allowed = space_allowed;
+			pstate->growth = PHJ_GROWTH_OK;
+
+			/* Set up the shared state for coordinating batches. */
+			ExecParallelHashJoinSetUpBatches(hashtable, nbatch);
+
+			/*
+			 * Allocate batch 0's hash table up front so we can load it
+			 * directly while hashing.
+			 */
+			pstate->nbuckets = nbuckets;
+			ExecParallelHashTableAlloc(hashtable, 0);
+		}
+
+		/*
+		 * The next Parallel Hash synchronization point is in
+		 * MultiExecParallelHash(), which will progress it all the way to
+		 * PHJ_BUILD_DONE.  The caller must not return control from this
+		 * executor node between now and then.
+		 */
+	}
+	else
+	{
+		/*
+		 * Prepare context for the first-scan space allocations; allocate the
+		 * hashbucket array therein, and set each bucket "empty".
+		 */
+		MemoryContextSwitchTo(hashtable->batchCxt);
+
+		hashtable->buckets.unshared = (HashJoinTuple *)
+			palloc0(nbuckets * sizeof(HashJoinTuple));
+
+		/*
+		 * Set up for skew optimization, if possible and there's a need for
+		 * more than one batch.  (In a one-batch join, there's no point in
+		 * it.)
+		 */
+		if (nbatch > 1)
+			ExecHashBuildSkewHash(hashtable, node, num_skew_mcvs);
+
+		MemoryContextSwitchTo(oldcxt);
+	}
 
 	return hashtable;
 }
@@ -399,6 +659,9 @@ ExecHashTableCreate(Hash *node, List *hashOperators, bool keepNulls)
 
 void
 ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
+						bool try_combined_work_mem,
+						int parallel_workers,
+						size_t *space_allowed,
 						int *numbuckets,
 						int *numbatches,
 						int *num_skew_mcvs)
@@ -433,6 +696,16 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 	 */
 	hash_table_bytes = work_mem * 1024L;
 
+	/*
+	 * Parallel Hash tries to use the combined work_mem of all workers to
+	 * avoid the need to batch.  If that won't work, it falls back to work_mem
+	 * per worker and tries to process batches in parallel.
+	 */
+	if (try_combined_work_mem)
+		hash_table_bytes += hash_table_bytes * parallel_workers;
+
+	*space_allowed = hash_table_bytes;
+
 	/*
 	 * If skew optimization is possible, estimate the number of skew buckets
 	 * that will fit in the memory allowed, and decrement the assumed space
@@ -478,7 +751,7 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 	 * Note that both nbuckets and nbatch must be powers of 2 to make
 	 * ExecHashGetBucketAndBatch fast.
 	 */
-	max_pointers = (work_mem * 1024L) / sizeof(HashJoinTuple);
+	max_pointers = *space_allowed / sizeof(HashJoinTuple);
 	max_pointers = Min(max_pointers, MaxAllocSize / sizeof(HashJoinTuple));
 	/* If max_pointers isn't a power of 2, must round it down to one */
 	mppow2 = 1L << my_log2(max_pointers);
@@ -510,6 +783,21 @@ ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
 		int			minbatch;
 		long		bucket_size;
 
+		/*
+		 * If Parallel Hash with combined work_mem would still need multiple
+		 * batches, we'll have to fall back to regular work_mem budget.
+		 */
+		if (try_combined_work_mem)
+		{
+			ExecChooseHashTableSize(ntuples, tupwidth, useskew,
+									false, parallel_workers,
+									space_allowed,
+									numbuckets,
+									numbatches,
+									num_skew_mcvs);
+			return;
+		}
+
 		/*
 		 * Estimate the number of buckets we'll want to have when work_mem is
 		 * entirely full.  Each bucket will contain a bucket pointer plus
@@ -564,14 +852,17 @@ ExecHashTableDestroy(HashJoinTable hashtable)
 	/*
 	 * Make sure all the temp files are closed.  We skip batch 0, since it
 	 * can't have any temp files (and the arrays might not even exist if
-	 * nbatch is only 1).
+	 * nbatch is only 1).  Parallel hash joins don't use these files.
 	 */
-	for (i = 1; i < hashtable->nbatch; i++)
+	if (hashtable->innerBatchFile != NULL)
 	{
-		if (hashtable->innerBatchFile[i])
-			BufFileClose(hashtable->innerBatchFile[i]);
-		if (hashtable->outerBatchFile[i])
-			BufFileClose(hashtable->outerBatchFile[i]);
+		for (i = 1; i < hashtable->nbatch; i++)
+		{
+			if (hashtable->innerBatchFile[i])
+				BufFileClose(hashtable->innerBatchFile[i]);
+			if (hashtable->outerBatchFile[i])
+				BufFileClose(hashtable->outerBatchFile[i]);
+		}
 	}
 
 	/* Release working memory (batchCxt is a child, so it goes away too) */
@@ -657,8 +948,9 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 		hashtable->nbuckets = hashtable->nbuckets_optimal;
 		hashtable->log2_nbuckets = hashtable->log2_nbuckets_optimal;
 
-		hashtable->buckets = repalloc(hashtable->buckets,
-									  sizeof(HashJoinTuple) * hashtable->nbuckets);
+		hashtable->buckets.unshared =
+			repalloc(hashtable->buckets.unshared,
+					 sizeof(HashJoinTuple) * hashtable->nbuckets);
 	}
 
 	/*
@@ -666,14 +958,15 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 	 * buckets now and not have to keep track which tuples in the buckets have
 	 * already been processed. We will free the old chunks as we go.
 	 */
-	memset(hashtable->buckets, 0, sizeof(HashJoinTuple) * hashtable->nbuckets);
+	memset(hashtable->buckets.unshared, 0,
+		   sizeof(HashJoinTuple) * hashtable->nbuckets);
 	oldchunks = hashtable->chunks;
 	hashtable->chunks = NULL;
 
 	/* so, let's scan through the old chunks, and all tuples in each chunk */
 	while (oldchunks != NULL)
 	{
-		HashMemoryChunk nextchunk = oldchunks->next;
+		HashMemoryChunk nextchunk = oldchunks->next.unshared;
 
 		/* position within the buffer (up to oldchunks->used) */
 		size_t		idx = 0;
@@ -681,7 +974,7 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 		/* process all tuples stored in this chunk (and then free it) */
 		while (idx < oldchunks->used)
 		{
-			HashJoinTuple hashTuple = (HashJoinTuple) (oldchunks->data + idx);
+			HashJoinTuple hashTuple = (HashJoinTuple) (HASH_CHUNK_DATA(oldchunks) + idx);
 			MinimalTuple tuple = HJTUPLE_MINTUPLE(hashTuple);
 			int			hashTupleSize = (HJTUPLE_OVERHEAD + tuple->t_len);
 			int			bucketno;
@@ -700,8 +993,8 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 				memcpy(copyTuple, hashTuple, hashTupleSize);
 
 				/* and add it back to the appropriate bucket */
-				copyTuple->next = hashtable->buckets[bucketno];
-				hashtable->buckets[bucketno] = copyTuple;
+				copyTuple->next.unshared = hashtable->buckets.unshared[bucketno];
+				hashtable->buckets.unshared[bucketno] = copyTuple;
 			}
 			else
 			{
@@ -751,109 +1044,571 @@ ExecHashIncreaseNumBatches(HashJoinTable hashtable)
 }
 
 /*
- * ExecHashIncreaseNumBuckets
- *		increase the original number of buckets in order to reduce
- *		number of tuples per bucket
+ * ExecParallelHashIncreaseNumBatches
+ *		Every participant attached to grow_barrier must run this function
+ *		when it observes growth == PHJ_GROWTH_NEED_MORE_BATCHES.
  */
 static void
-ExecHashIncreaseNumBuckets(HashJoinTable hashtable)
+ExecParallelHashIncreaseNumBatches(HashJoinTable hashtable)
 {
-	HashMemoryChunk chunk;
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	int			i;
 
-	/* do nothing if not an increase (it's called increase for a reason) */
-	if (hashtable->nbuckets >= hashtable->nbuckets_optimal)
-		return;
+	Assert(BarrierPhase(&pstate->build_barrier) == PHJ_BUILD_HASHING_INNER);
 
-#ifdef HJDEBUG
-	printf("Hashjoin %p: increasing nbuckets %d => %d\n",
-		   hashtable, hashtable->nbuckets, hashtable->nbuckets_optimal);
-#endif
+	/*
+	 * It's unlikely, but we need to be prepared for new participants to show
+	 * up while we're in the middle of this operation so we need to switch on
+	 * barrier phase here.
+	 */
+	switch (PHJ_GROW_BATCHES_PHASE(BarrierPhase(&pstate->grow_batches_barrier)))
+	{
+		case PHJ_GROW_BATCHES_ELECTING:
 
-	hashtable->nbuckets = hashtable->nbuckets_optimal;
-	hashtable->log2_nbuckets = hashtable->log2_nbuckets_optimal;
+			/*
+			 * Elect one participant to prepare to grow the number of batches.
+			 * This involves reallocating or resetting the buckets of batch 0
+			 * in preparation for all participants to begin repartitioning the
+			 * tuples.
+			 */
+			if (BarrierArriveAndWait(&pstate->grow_batches_barrier,
+									 WAIT_EVENT_HASH_GROW_BATCHES_ELECTING))
+			{
+				dsa_pointer_atomic *buckets;
+				ParallelHashJoinBatch *old_batch0;
+				int			new_nbatch;
+				int			i;
+
+				/* Move the old batch out of the way. */
+				old_batch0 = hashtable->batches[0].shared;
+				pstate->old_batches = pstate->batches;
+				pstate->old_nbatch = hashtable->nbatch;
+				pstate->batches = InvalidDsaPointer;
+
+				/* Free this backend's old accessors. */
+				ExecParallelHashCloseBatchAccessors(hashtable);
+
+				/* Figure out how many batches to use. */
+				if (hashtable->nbatch == 1)
+				{
+					/*
+					 * We are going from single-batch to multi-batch.  We need
+					 * to switch from one large combined memory budget to the
+					 * regular work_mem budget.
+					 */
+					pstate->space_allowed = work_mem * 1024L;
+
+					/*
+					 * The combined work_mem of all participants wasn't
+					 * enough. Therefore one batch per participant would be
+					 * approximately equivalent and would probably also be
+					 * insufficient.  So try two batches per particiant,
+					 * rounded up to a power of two.
+					 */
+					new_nbatch = 1 << my_log2(pstate->nparticipants * 2);
+				}
+				else
+				{
+					/*
+					 * We were already multi-batched.  Try doubling the number
+					 * of batches.
+					 */
+					new_nbatch = hashtable->nbatch * 2;
+				}
+
+				/* Allocate new larger generation of batches. */
+				Assert(hashtable->nbatch == pstate->nbatch);
+				ExecParallelHashJoinSetUpBatches(hashtable, new_nbatch);
+				Assert(hashtable->nbatch == pstate->nbatch);
+
+				/* Replace or recycle batch 0's bucket array. */
+				if (pstate->old_nbatch == 1)
+				{
+					double		dtuples;
+					double		dbuckets;
+					int			new_nbuckets;
+
+					/*
+					 * We probably also need a smaller bucket array.  How many
+					 * tuples do we expect per batch, assuming we have only
+					 * half of them so far?  Normally we don't need to change
+					 * the bucket array's size, because the size of each batch
+					 * stays the same as we add more batches, but in this
+					 * special case we move from a large batch to many smaller
+					 * batches and it would be wasteful to keep the large
+					 * array.
+					 */
+					dtuples = (old_batch0->ntuples * 2.0) / new_nbatch;
+					dbuckets = ceil(dtuples / NTUP_PER_BUCKET);
+					dbuckets = Min(dbuckets,
+								   MaxAllocSize / sizeof(dsa_pointer_atomic));
+					new_nbuckets = (int) dbuckets;
+					new_nbuckets = Max(new_nbuckets, 1024);
+					new_nbuckets = 1 << my_log2(new_nbuckets);
+					dsa_free(hashtable->area, old_batch0->buckets);
+					hashtable->batches[0].shared->buckets =
+						dsa_allocate(hashtable->area,
+									 sizeof(dsa_pointer_atomic) * new_nbuckets);
+					buckets = (dsa_pointer_atomic *)
+						dsa_get_address(hashtable->area,
+										hashtable->batches[0].shared->buckets);
+					for (i = 0; i < new_nbuckets; ++i)
+						dsa_pointer_atomic_init(&buckets[i], InvalidDsaPointer);
+					pstate->nbuckets = new_nbuckets;
+				}
+				else
+				{
+					/* Recycle the existing bucket array. */
+					hashtable->batches[0].shared->buckets = old_batch0->buckets;
+					buckets = (dsa_pointer_atomic *)
+						dsa_get_address(hashtable->area, old_batch0->buckets);
+					for (i = 0; i < hashtable->nbuckets; ++i)
+						dsa_pointer_atomic_write(&buckets[i], InvalidDsaPointer);
+				}
+
+				/* Move all chunks to the work queue for parallel processing. */
+				pstate->chunk_work_queue = old_batch0->chunks;
+
+				/* Disable further growth temporarily while we're growing. */
+				pstate->growth = PHJ_GROWTH_DISABLED;
+			}
+			else
+			{
+				/* All other participants just flush their tuples to disk. */
+				ExecParallelHashCloseBatchAccessors(hashtable);
+			}
+			/* Fall through. */
+
+		case PHJ_GROW_BATCHES_ALLOCATING:
+			/* Wait for the above to be finished. */
+			BarrierArriveAndWait(&pstate->grow_batches_barrier,
+								 WAIT_EVENT_HASH_GROW_BATCHES_ALLOCATING);
+			/* Fall through. */
+
+		case PHJ_GROW_BATCHES_REPARTITIONING:
+			/* Make sure that we have the current dimensions and buckets. */
+			ExecParallelHashEnsureBatchAccessors(hashtable);
+			ExecParallelHashTableSetCurrentBatch(hashtable, 0);
+			/* Then partition, flush counters. */
+			ExecParallelHashRepartitionFirst(hashtable);
+			ExecParallelHashRepartitionRest(hashtable);
+			ExecParallelHashMergeCounters(hashtable);
+			/* Wait for the above to be finished. */
+			BarrierArriveAndWait(&pstate->grow_batches_barrier,
+								 WAIT_EVENT_HASH_GROW_BATCHES_REPARTITIONING);
+			/* Fall through. */
+
+		case PHJ_GROW_BATCHES_DECIDING:
 
-	Assert(hashtable->nbuckets > 1);
-	Assert(hashtable->nbuckets <= (INT_MAX / 2));
-	Assert(hashtable->nbuckets == (1 << hashtable->log2_nbuckets));
+			/*
+			 * Elect one participant to clean up and decide whether further
+			 * repartitioning is needed, or should be disabled because it's
+			 * not helping.
+			 */
+			if (BarrierArriveAndWait(&pstate->grow_batches_barrier,
+									 WAIT_EVENT_HASH_GROW_BATCHES_DECIDING))
+			{
+				bool		space_exhausted = false;
+				bool		extreme_skew_detected = false;
+
+				/* Make sure that we have the current dimensions and buckets. */
+				ExecParallelHashEnsureBatchAccessors(hashtable);
+				ExecParallelHashTableSetCurrentBatch(hashtable, 0);
+
+				/* Are any of the new generation of batches exhausted? */
+				for (i = 0; i < hashtable->nbatch; ++i)
+				{
+					ParallelHashJoinBatch *batch = hashtable->batches[i].shared;
+
+					if (batch->space_exhausted ||
+						batch->estimated_size > pstate->space_allowed)
+					{
+						int			parent;
+
+						space_exhausted = true;
+
+						/*
+						 * Did this batch receive ALL of the tuples from its
+						 * parent batch?  That would indicate that further
+						 * repartitioning isn't going to help (the hash values
+						 * are probably all the same).
+						 */
+						parent = i % pstate->old_nbatch;
+						if (batch->ntuples == hashtable->batches[parent].shared->old_ntuples)
+							extreme_skew_detected = true;
+					}
+				}
+
+				/* Don't keep growing if it's not helping or we'd overflow. */
+				if (extreme_skew_detected || hashtable->nbatch >= INT_MAX / 2)
+					pstate->growth = PHJ_GROWTH_DISABLED;
+				else if (space_exhausted)
+					pstate->growth = PHJ_GROWTH_NEED_MORE_BATCHES;
+				else
+					pstate->growth = PHJ_GROWTH_OK;
+
+				/* Free the old batches in shared memory. */
+				dsa_free(hashtable->area, pstate->old_batches);
+				pstate->old_batches = InvalidDsaPointer;
+			}
+			/* Fall through. */
 
-	/*
-	 * Just reallocate the proper number of buckets - we don't need to walk
-	 * through them - we can walk the dense-allocated chunks (just like in
-	 * ExecHashIncreaseNumBatches, but without all the copying into new
-	 * chunks)
-	 */
-	hashtable->buckets =
-		(HashJoinTuple *) repalloc(hashtable->buckets,
-								   hashtable->nbuckets * sizeof(HashJoinTuple));
+		case PHJ_GROW_BATCHES_FINISHING:
+			/* Wait for the above to complete. */
+			BarrierArriveAndWait(&pstate->grow_batches_barrier,
+								 WAIT_EVENT_HASH_GROW_BATCHES_FINISHING);
+	}
+}
 
-	memset(hashtable->buckets, 0, hashtable->nbuckets * sizeof(HashJoinTuple));
+/*
+ * Repartition the tuples currently loaded into memory for inner batch 0
+ * because the number of batches has been increased.  Some tuples are retained
+ * in memory and some are written out to a later batch.
+ */
+static void
+ExecParallelHashRepartitionFirst(HashJoinTable hashtable)
+{
+	dsa_pointer chunk_shared;
+	HashMemoryChunk chunk;
 
-	/* scan through all tuples in all chunks to rebuild the hash table */
-	for (chunk = hashtable->chunks; chunk != NULL; chunk = chunk->next)
+	Assert(hashtable->nbatch == hashtable->parallel_state->nbatch);
+
+	while ((chunk = ExecParallelHashPopChunkQueue(hashtable, &chunk_shared)))
 	{
-		/* process all tuples stored in this chunk */
 		size_t		idx = 0;
 
+		/* Repartition all tuples in this chunk. */
 		while (idx < chunk->used)
 		{
-			HashJoinTuple hashTuple = (HashJoinTuple) (chunk->data + idx);
+			HashJoinTuple hashTuple = (HashJoinTuple) (HASH_CHUNK_DATA(chunk) + idx);
+			MinimalTuple tuple = HJTUPLE_MINTUPLE(hashTuple);
+			HashJoinTuple copyTuple;
+			dsa_pointer shared;
 			int			bucketno;
 			int			batchno;
 
 			ExecHashGetBucketAndBatch(hashtable, hashTuple->hashvalue,
 									  &bucketno, &batchno);
 
-			/* add the tuple to the proper bucket */
-			hashTuple->next = hashtable->buckets[bucketno];
-			hashtable->buckets[bucketno] = hashTuple;
+			Assert(batchno < hashtable->nbatch);
+			if (batchno == 0)
+			{
+				/* It still belongs in batch 0.  Copy to a new chunk. */
+				copyTuple =
+					ExecParallelHashTupleAlloc(hashtable,
+											   HJTUPLE_OVERHEAD + tuple->t_len,
+											   &shared);
+				copyTuple->hashvalue = hashTuple->hashvalue;
+				memcpy(HJTUPLE_MINTUPLE(copyTuple), tuple, tuple->t_len);
+				ExecParallelHashPushTuple(&hashtable->buckets.shared[bucketno],
+										  copyTuple, shared);
+			}
+			else
+			{
+				size_t		tuple_size =
+				MAXALIGN(HJTUPLE_OVERHEAD + tuple->t_len);
+
+				/* It belongs in a later batch. */
+				hashtable->batches[batchno].estimated_size += tuple_size;
+				sts_puttuple(hashtable->batches[batchno].inner_tuples,
+							 &hashTuple->hashvalue, tuple);
+			}
+
+			/* Count this tuple. */
+			++hashtable->batches[0].old_ntuples;
+			++hashtable->batches[batchno].ntuples;
 
-			/* advance index past the tuple */
 			idx += MAXALIGN(HJTUPLE_OVERHEAD +
 							HJTUPLE_MINTUPLE(hashTuple)->t_len);
 		}
 
-		/* allow this loop to be cancellable */
+		/* Free this chunk. */
+		dsa_free(hashtable->area, chunk_shared);
+
 		CHECK_FOR_INTERRUPTS();
 	}
 }
 
-
 /*
- * ExecHashTableInsert
- *		insert a tuple into the hash table depending on the hash value
- *		it may just go to a temp file for later batches
- *
- * Note: the passed TupleTableSlot may contain a regular, minimal, or virtual
- * tuple; the minimal case in particular is certain to happen while reloading
- * tuples from batch files.  We could save some cycles in the regular-tuple
- * case by not forcing the slot contents into minimal form; not clear if it's
- * worth the messiness required.
+ * Help repartition inner batches 1..n.
  */
-void
-ExecHashTableInsert(HashJoinTable hashtable,
-					TupleTableSlot *slot,
-					uint32 hashvalue)
+static void
+ExecParallelHashRepartitionRest(HashJoinTable hashtable)
 {
-	MinimalTuple tuple = ExecFetchSlotMinimalTuple(slot);
-	int			bucketno;
-	int			batchno;
-
-	ExecHashGetBucketAndBatch(hashtable, hashvalue,
-							  &bucketno, &batchno);
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	int			old_nbatch = pstate->old_nbatch;
+	SharedTuplestoreAccessor **old_inner_tuples;
+	ParallelHashJoinBatch *old_batches;
+	int			i;
 
-	/*
-	 * decide whether to put the tuple in the hash table or a temp file
-	 */
-	if (batchno == hashtable->curbatch)
+	/* Get our hands on the previous generation of batches. */
+	old_batches = (ParallelHashJoinBatch *)
+		dsa_get_address(hashtable->area, pstate->old_batches);
+	old_inner_tuples = palloc0(sizeof(SharedTuplestoreAccessor *) * old_nbatch);
+	for (i = 1; i < old_nbatch; ++i)
 	{
-		/*
-		 * put the tuple in hash table
-		 */
-		HashJoinTuple hashTuple;
-		int			hashTupleSize;
-		double		ntuples = (hashtable->totalTuples - hashtable->skewTuples);
+		ParallelHashJoinBatch *shared =
+		NthParallelHashJoinBatch(old_batches, i);
 
-		/* Create the HashJoinTuple */
+		old_inner_tuples[i] = sts_attach(ParallelHashJoinBatchInner(shared),
+										 ParallelWorkerNumber + 1,
+										 &pstate->fileset);
+	}
+
+	/* Join in the effort to repartition them. */
+	for (i = 1; i < old_nbatch; ++i)
+	{
+		MinimalTuple tuple;
+		uint32		hashvalue;
+
+		/* Scan one partition from the previous generation. */
+		sts_begin_parallel_scan(old_inner_tuples[i]);
+		while ((tuple = sts_parallel_scan_next(old_inner_tuples[i], &hashvalue)))
+		{
+			size_t		tuple_size = MAXALIGN(HJTUPLE_OVERHEAD + tuple->t_len);
+			int			bucketno;
+			int			batchno;
+
+			/* Decide which partition it goes to in the new generation. */
+			ExecHashGetBucketAndBatch(hashtable, hashvalue, &bucketno,
+									  &batchno);
+
+			hashtable->batches[batchno].estimated_size += tuple_size;
+			++hashtable->batches[batchno].ntuples;
+			++hashtable->batches[i].old_ntuples;
+
+			/* Store the tuple its new batch. */
+			sts_puttuple(hashtable->batches[batchno].inner_tuples,
+						 &hashvalue, tuple);
+
+			CHECK_FOR_INTERRUPTS();
+		}
+		sts_end_parallel_scan(old_inner_tuples[i]);
+	}
+
+	pfree(old_inner_tuples);
+}
+
+/*
+ * Transfer the backend-local per-batch counters to the shared totals.
+ */
+static void
+ExecParallelHashMergeCounters(HashJoinTable hashtable)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	int			i;
+
+	LWLockAcquire(&pstate->lock, LW_EXCLUSIVE);
+	pstate->total_tuples = 0;
+	for (i = 0; i < hashtable->nbatch; ++i)
+	{
+		ParallelHashJoinBatchAccessor *batch = &hashtable->batches[i];
+
+		batch->shared->size += batch->size;
+		batch->shared->estimated_size += batch->estimated_size;
+		batch->shared->ntuples += batch->ntuples;
+		batch->shared->old_ntuples += batch->old_ntuples;
+		batch->size = 0;
+		batch->estimated_size = 0;
+		batch->ntuples = 0;
+		batch->old_ntuples = 0;
+		pstate->total_tuples += batch->shared->ntuples;
+	}
+	LWLockRelease(&pstate->lock);
+}
+
+/*
+ * ExecHashIncreaseNumBuckets
+ *		increase the original number of buckets in order to reduce
+ *		number of tuples per bucket
+ */
+static void
+ExecHashIncreaseNumBuckets(HashJoinTable hashtable)
+{
+	HashMemoryChunk chunk;
+
+	/* do nothing if not an increase (it's called increase for a reason) */
+	if (hashtable->nbuckets >= hashtable->nbuckets_optimal)
+		return;
+
+#ifdef HJDEBUG
+	printf("Hashjoin %p: increasing nbuckets %d => %d\n",
+		   hashtable, hashtable->nbuckets, hashtable->nbuckets_optimal);
+#endif
+
+	hashtable->nbuckets = hashtable->nbuckets_optimal;
+	hashtable->log2_nbuckets = hashtable->log2_nbuckets_optimal;
+
+	Assert(hashtable->nbuckets > 1);
+	Assert(hashtable->nbuckets <= (INT_MAX / 2));
+	Assert(hashtable->nbuckets == (1 << hashtable->log2_nbuckets));
+
+	/*
+	 * Just reallocate the proper number of buckets - we don't need to walk
+	 * through them - we can walk the dense-allocated chunks (just like in
+	 * ExecHashIncreaseNumBatches, but without all the copying into new
+	 * chunks)
+	 */
+	hashtable->buckets.unshared =
+		(HashJoinTuple *) repalloc(hashtable->buckets.unshared,
+								   hashtable->nbuckets * sizeof(HashJoinTuple));
+
+	memset(hashtable->buckets.unshared, 0,
+		   hashtable->nbuckets * sizeof(HashJoinTuple));
+
+	/* scan through all tuples in all chunks to rebuild the hash table */
+	for (chunk = hashtable->chunks; chunk != NULL; chunk = chunk->next.unshared)
+	{
+		/* process all tuples stored in this chunk */
+		size_t		idx = 0;
+
+		while (idx < chunk->used)
+		{
+			HashJoinTuple hashTuple = (HashJoinTuple) (HASH_CHUNK_DATA(chunk) + idx);
+			int			bucketno;
+			int			batchno;
+
+			ExecHashGetBucketAndBatch(hashtable, hashTuple->hashvalue,
+									  &bucketno, &batchno);
+
+			/* add the tuple to the proper bucket */
+			hashTuple->next.unshared = hashtable->buckets.unshared[bucketno];
+			hashtable->buckets.unshared[bucketno] = hashTuple;
+
+			/* advance index past the tuple */
+			idx += MAXALIGN(HJTUPLE_OVERHEAD +
+							HJTUPLE_MINTUPLE(hashTuple)->t_len);
+		}
+
+		/* allow this loop to be cancellable */
+		CHECK_FOR_INTERRUPTS();
+	}
+}
+
+static void
+ExecParallelHashIncreaseNumBuckets(HashJoinTable hashtable)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	int			i;
+	HashMemoryChunk chunk;
+	dsa_pointer chunk_s;
+
+	Assert(BarrierPhase(&pstate->build_barrier) == PHJ_BUILD_HASHING_INNER);
+
+	/*
+	 * It's unlikely, but we need to be prepared for new participants to show
+	 * up while we're in the middle of this operation so we need to switch on
+	 * barrier phase here.
+	 */
+	switch (PHJ_GROW_BUCKETS_PHASE(BarrierPhase(&pstate->grow_buckets_barrier)))
+	{
+		case PHJ_GROW_BUCKETS_ELECTING:
+			/* Elect one participant to prepare to increase nbuckets. */
+			if (BarrierArriveAndWait(&pstate->grow_buckets_barrier,
+									 WAIT_EVENT_HASH_GROW_BUCKETS_ELECTING))
+			{
+				size_t		size;
+				dsa_pointer_atomic *buckets;
+
+				/* Double the size of the bucket array. */
+				pstate->nbuckets *= 2;
+				size = pstate->nbuckets * sizeof(dsa_pointer_atomic);
+				hashtable->batches[0].shared->size += size / 2;
+				dsa_free(hashtable->area, hashtable->batches[0].shared->buckets);
+				hashtable->batches[0].shared->buckets =
+					dsa_allocate(hashtable->area, size);
+				buckets = (dsa_pointer_atomic *)
+					dsa_get_address(hashtable->area,
+									hashtable->batches[0].shared->buckets);
+				for (i = 0; i < pstate->nbuckets; ++i)
+					dsa_pointer_atomic_init(&buckets[i], InvalidDsaPointer);
+
+				/* Put the chunk list onto the work queue. */
+				pstate->chunk_work_queue = hashtable->batches[0].shared->chunks;
+
+				/* Clear the flag. */
+				pstate->growth = PHJ_GROWTH_OK;
+			}
+			/* Fall through. */
+
+		case PHJ_GROW_BUCKETS_ALLOCATING:
+			/* Wait for the above to complete. */
+			BarrierArriveAndWait(&pstate->grow_buckets_barrier,
+								 WAIT_EVENT_HASH_GROW_BUCKETS_ALLOCATING);
+			/* Fall through. */
+
+		case PHJ_GROW_BUCKETS_REINSERTING:
+			/* Reinsert all tuples into the hash table. */
+			ExecParallelHashEnsureBatchAccessors(hashtable);
+			ExecParallelHashTableSetCurrentBatch(hashtable, 0);
+			while ((chunk = ExecParallelHashPopChunkQueue(hashtable, &chunk_s)))
+			{
+				size_t		idx = 0;
+
+				while (idx < chunk->used)
+				{
+					HashJoinTuple hashTuple = (HashJoinTuple) (HASH_CHUNK_DATA(chunk) + idx);
+					dsa_pointer shared = chunk_s + HASH_CHUNK_HEADER_SIZE + idx;
+					int			bucketno;
+					int			batchno;
+
+					ExecHashGetBucketAndBatch(hashtable, hashTuple->hashvalue,
+											  &bucketno, &batchno);
+					Assert(batchno == 0);
+
+					/* add the tuple to the proper bucket */
+					ExecParallelHashPushTuple(&hashtable->buckets.shared[bucketno],
+											  hashTuple, shared);
+
+					/* advance index past the tuple */
+					idx += MAXALIGN(HJTUPLE_OVERHEAD +
+									HJTUPLE_MINTUPLE(hashTuple)->t_len);
+				}
+
+				/* allow this loop to be cancellable */
+				CHECK_FOR_INTERRUPTS();
+			}
+			BarrierArriveAndWait(&pstate->grow_buckets_barrier,
+								 WAIT_EVENT_HASH_GROW_BUCKETS_REINSERTING);
+	}
+}
+
+/*
+ * ExecHashTableInsert
+ *		insert a tuple into the hash table depending on the hash value
+ *		it may just go to a temp file for later batches
+ *
+ * Note: the passed TupleTableSlot may contain a regular, minimal, or virtual
+ * tuple; the minimal case in particular is certain to happen while reloading
+ * tuples from batch files.  We could save some cycles in the regular-tuple
+ * case by not forcing the slot contents into minimal form; not clear if it's
+ * worth the messiness required.
+ */
+void
+ExecHashTableInsert(HashJoinTable hashtable,
+					TupleTableSlot *slot,
+					uint32 hashvalue)
+{
+	MinimalTuple tuple = ExecFetchSlotMinimalTuple(slot);
+	int			bucketno;
+	int			batchno;
+
+	ExecHashGetBucketAndBatch(hashtable, hashvalue,
+							  &bucketno, &batchno);
+
+	/*
+	 * decide whether to put the tuple in the hash table or a temp file
+	 */
+	if (batchno == hashtable->curbatch)
+	{
+		/*
+		 * put the tuple in hash table
+		 */
+		HashJoinTuple hashTuple;
+		int			hashTupleSize;
+		double		ntuples = (hashtable->totalTuples - hashtable->skewTuples);
+
+		/* Create the HashJoinTuple */
 		hashTupleSize = HJTUPLE_OVERHEAD + tuple->t_len;
 		hashTuple = (HashJoinTuple) dense_alloc(hashtable, hashTupleSize);
 
@@ -869,8 +1624,8 @@ ExecHashTableInsert(HashJoinTable hashtable,
 		HeapTupleHeaderClearMatch(HJTUPLE_MINTUPLE(hashTuple));
 
 		/* Push it onto the front of the bucket's list */
-		hashTuple->next = hashtable->buckets[bucketno];
-		hashtable->buckets[bucketno] = hashTuple;
+		hashTuple->next.unshared = hashtable->buckets.unshared[bucketno];
+		hashtable->buckets.unshared[bucketno] = hashTuple;
 
 		/*
 		 * Increase the (optimal) number of buckets if we just exceeded the
@@ -910,6 +1665,94 @@ ExecHashTableInsert(HashJoinTable hashtable,
 	}
 }
 
+/*
+ * ExecHashTableParallelInsert
+ *		insert a tuple into a shared hash table or shared batch tuplestore
+ */
+void
+ExecParallelHashTableInsert(HashJoinTable hashtable,
+							TupleTableSlot *slot,
+							uint32 hashvalue)
+{
+	MinimalTuple tuple = ExecFetchSlotMinimalTuple(slot);
+	dsa_pointer shared;
+	int			bucketno;
+	int			batchno;
+
+retry:
+	ExecHashGetBucketAndBatch(hashtable, hashvalue, &bucketno, &batchno);
+
+	if (batchno == 0)
+	{
+		HashJoinTuple hashTuple;
+
+		/* Try to load it into memory. */
+		Assert(BarrierPhase(&hashtable->parallel_state->build_barrier) ==
+			   PHJ_BUILD_HASHING_INNER);
+		hashTuple = ExecParallelHashTupleAlloc(hashtable,
+											   HJTUPLE_OVERHEAD + tuple->t_len,
+											   &shared);
+		if (hashTuple == NULL)
+			goto retry;
+
+		/* Store the hash value in the HashJoinTuple header. */
+		hashTuple->hashvalue = hashvalue;
+		memcpy(HJTUPLE_MINTUPLE(hashTuple), tuple, tuple->t_len);
+
+		/* Push it onto the front of the bucket's list */
+		ExecParallelHashPushTuple(&hashtable->buckets.shared[bucketno],
+								  hashTuple, shared);
+	}
+	else
+	{
+		size_t		tuple_size = MAXALIGN(HJTUPLE_OVERHEAD + tuple->t_len);
+
+		Assert(batchno > 0);
+
+		/* Try to preallocate space in the batch if necessary. */
+		if (hashtable->batches[batchno].preallocated < tuple_size)
+		{
+			if (!ExecParallelHashTuplePrealloc(hashtable, batchno, tuple_size))
+				goto retry;
+		}
+
+		Assert(hashtable->batches[batchno].preallocated >= tuple_size);
+		hashtable->batches[batchno].preallocated -= tuple_size;
+		sts_puttuple(hashtable->batches[batchno].inner_tuples, &hashvalue,
+					 tuple);
+	}
+	++hashtable->batches[batchno].ntuples;
+}
+
+/*
+ * Insert a tuple into the current hash table.  Unlike
+ * ExecParallelHashTableInsert, this version is not prepared to send the tuple
+ * to other batches or to run out of memory, and should only be called with
+ * tuples that belong in the current batch once growth has been disabled.
+ */
+void
+ExecParallelHashTableInsertCurrentBatch(HashJoinTable hashtable,
+										TupleTableSlot *slot,
+										uint32 hashvalue)
+{
+	MinimalTuple tuple = ExecFetchSlotMinimalTuple(slot);
+	HashJoinTuple hashTuple;
+	dsa_pointer shared;
+	int			batchno;
+	int			bucketno;
+
+	ExecHashGetBucketAndBatch(hashtable, hashvalue, &bucketno, &batchno);
+	Assert(batchno == hashtable->curbatch);
+	hashTuple = ExecParallelHashTupleAlloc(hashtable,
+										   HJTUPLE_OVERHEAD + tuple->t_len,
+										   &shared);
+	hashTuple->hashvalue = hashvalue;
+	memcpy(HJTUPLE_MINTUPLE(hashTuple), tuple, tuple->t_len);
+	HeapTupleHeaderClearMatch(HJTUPLE_MINTUPLE(hashTuple));
+	ExecParallelHashPushTuple(&hashtable->buckets.shared[bucketno],
+							  hashTuple, shared);
+}
+
 /*
  * ExecHashGetHashValue
  *		Compute the hash value for a tuple
@@ -918,10 +1761,10 @@ ExecHashTableInsert(HashJoinTable hashtable,
  * econtext->ecxt_innertuple.  Vars in the hashkeys expressions should have
  * varno either OUTER_VAR or INNER_VAR.
  *
- * A TRUE result means the tuple's hash value has been successfully computed
- * and stored at *hashvalue.  A FALSE result means the tuple cannot match
+ * A true result means the tuple's hash value has been successfully computed
+ * and stored at *hashvalue.  A false result means the tuple cannot match
  * because it contains a null attribute, and hence it should be discarded
- * immediately.  (If keep_nulls is true then FALSE is never returned.)
+ * immediately.  (If keep_nulls is true then false is never returned.)
  */
 bool
 ExecHashGetHashValue(HashJoinTable hashtable,
@@ -1076,11 +1919,11 @@ ExecScanHashBucket(HashJoinState *hjstate,
 	 * otherwise scan the standard hashtable bucket.
 	 */
 	if (hashTuple != NULL)
-		hashTuple = hashTuple->next;
+		hashTuple = hashTuple->next.unshared;
 	else if (hjstate->hj_CurSkewBucketNo != INVALID_SKEW_BUCKET_NO)
 		hashTuple = hashtable->skewBucket[hjstate->hj_CurSkewBucketNo]->tuples;
 	else
-		hashTuple = hashtable->buckets[hjstate->hj_CurBucketNo];
+		hashTuple = hashtable->buckets.unshared[hjstate->hj_CurBucketNo];
 
 	while (hashTuple != NULL)
 	{
@@ -1094,17 +1937,71 @@ ExecScanHashBucket(HashJoinState *hjstate,
 											 false);	/* do not pfree */
 			econtext->ecxt_innertuple = inntuple;
 
-			/* reset temp memory each time to avoid leaks from qual expr */
-			ResetExprContext(econtext);
+			if (ExecQualAndReset(hjclauses, econtext))
+			{
+				hjstate->hj_CurTuple = hashTuple;
+				return true;
+			}
+		}
+
+		hashTuple = hashTuple->next.unshared;
+	}
+
+	/*
+	 * no match
+	 */
+	return false;
+}
+
+/*
+ * ExecParallelScanHashBucket
+ *		scan a hash bucket for matches to the current outer tuple
+ *
+ * The current outer tuple must be stored in econtext->ecxt_outertuple.
+ *
+ * On success, the inner tuple is stored into hjstate->hj_CurTuple and
+ * econtext->ecxt_innertuple, using hjstate->hj_HashTupleSlot as the slot
+ * for the latter.
+ */
+bool
+ExecParallelScanHashBucket(HashJoinState *hjstate,
+						   ExprContext *econtext)
+{
+	ExprState  *hjclauses = hjstate->hashclauses;
+	HashJoinTable hashtable = hjstate->hj_HashTable;
+	HashJoinTuple hashTuple = hjstate->hj_CurTuple;
+	uint32		hashvalue = hjstate->hj_CurHashValue;
+
+	/*
+	 * hj_CurTuple is the address of the tuple last returned from the current
+	 * bucket, or NULL if it's time to start scanning a new bucket.
+	 */
+	if (hashTuple != NULL)
+		hashTuple = ExecParallelHashNextTuple(hashtable, hashTuple);
+	else
+		hashTuple = ExecParallelHashFirstTuple(hashtable,
+											   hjstate->hj_CurBucketNo);
+
+	while (hashTuple != NULL)
+	{
+		if (hashTuple->hashvalue == hashvalue)
+		{
+			TupleTableSlot *inntuple;
+
+			/* insert hashtable's tuple into exec slot so ExecQual sees it */
+			inntuple = ExecStoreMinimalTuple(HJTUPLE_MINTUPLE(hashTuple),
+											 hjstate->hj_HashTupleSlot,
+											 false);	/* do not pfree */
+			econtext->ecxt_innertuple = inntuple;
 
-			if (ExecQual(hjclauses, econtext))
+			if (ExecQualAndReset(hjclauses, econtext))
 			{
 				hjstate->hj_CurTuple = hashTuple;
 				return true;
 			}
 		}
 
-		hashTuple = hashTuple->next;
+		hashTuple = ExecParallelHashNextTuple(hashtable, hashTuple);
 	}
 
 	/*
@@ -1155,10 +2052,10 @@ ExecScanHashTableForUnmatched(HashJoinState *hjstate, ExprContext *econtext)
 		 * bucket.
 		 */
 		if (hashTuple != NULL)
-			hashTuple = hashTuple->next;
+			hashTuple = hashTuple->next.unshared;
 		else if (hjstate->hj_CurBucketNo < hashtable->nbuckets)
 		{
-			hashTuple = hashtable->buckets[hjstate->hj_CurBucketNo];
+			hashTuple = hashtable->buckets.unshared[hjstate->hj_CurBucketNo];
 			hjstate->hj_CurBucketNo++;
 		}
 		else if (hjstate->hj_CurSkewBucketNo < hashtable->nSkewBuckets)
@@ -1194,7 +2091,7 @@ ExecScanHashTableForUnmatched(HashJoinState *hjstate, ExprContext *econtext)
 				return true;
 			}
 
-			hashTuple = hashTuple->next;
+			hashTuple = hashTuple->next.unshared;
 		}
 
 		/* allow this loop to be cancellable */
@@ -1226,7 +2123,7 @@ ExecHashTableReset(HashJoinTable hashtable)
 	oldcxt = MemoryContextSwitchTo(hashtable->batchCxt);
 
 	/* Reallocate and reinitialize the hash bucket headers. */
-	hashtable->buckets = (HashJoinTuple *)
+	hashtable->buckets.unshared = (HashJoinTuple *)
 		palloc0(nbuckets * sizeof(HashJoinTuple));
 
 	hashtable->spaceUsed = 0;
@@ -1250,7 +2147,8 @@ ExecHashTableResetMatchFlags(HashJoinTable hashtable)
 	/* Reset all flags in the main table ... */
 	for (i = 0; i < hashtable->nbuckets; i++)
 	{
-		for (tuple = hashtable->buckets[i]; tuple != NULL; tuple = tuple->next)
+		for (tuple = hashtable->buckets.unshared[i]; tuple != NULL;
+			 tuple = tuple->next.unshared)
 			HeapTupleHeaderClearMatch(HJTUPLE_MINTUPLE(tuple));
 	}
 
@@ -1260,7 +2158,7 @@ ExecHashTableResetMatchFlags(HashJoinTable hashtable)
 		int			j = hashtable->skewBucketNums[i];
 		HashSkewBucket *skewBucket = hashtable->skewBucket[j];
 
-		for (tuple = skewBucket->tuples; tuple != NULL; tuple = tuple->next)
+		for (tuple = skewBucket->tuples; tuple != NULL; tuple = tuple->next.unshared)
 			HeapTupleHeaderClearMatch(HJTUPLE_MINTUPLE(tuple));
 	}
 }
@@ -1505,8 +2403,9 @@ ExecHashSkewTableInsert(HashJoinTable hashtable,
 	HeapTupleHeaderClearMatch(HJTUPLE_MINTUPLE(hashTuple));
 
 	/* Push it onto the front of the skew bucket's list */
-	hashTuple->next = hashtable->skewBucket[bucketNumber]->tuples;
+	hashTuple->next.unshared = hashtable->skewBucket[bucketNumber]->tuples;
 	hashtable->skewBucket[bucketNumber]->tuples = hashTuple;
+	Assert(hashTuple != hashTuple->next.unshared);
 
 	/* Account for space used, and back off if we've used too much */
 	hashtable->spaceUsed += hashTupleSize;
@@ -1554,7 +2453,7 @@ ExecHashRemoveNextSkewBucket(HashJoinTable hashtable)
 	hashTuple = bucket->tuples;
 	while (hashTuple != NULL)
 	{
-		HashJoinTuple nextHashTuple = hashTuple->next;
+		HashJoinTuple nextHashTuple = hashTuple->next.unshared;
 		MinimalTuple tuple;
 		Size		tupleSize;
 
@@ -1580,8 +2479,8 @@ ExecHashRemoveNextSkewBucket(HashJoinTable hashtable)
 			memcpy(copyTuple, hashTuple, tupleSize);
 			pfree(hashTuple);
 
-			copyTuple->next = hashtable->buckets[bucketno];
-			hashtable->buckets[bucketno] = copyTuple;
+			copyTuple->next.unshared = hashtable->buckets.unshared[bucketno];
+			hashtable->buckets.unshared[bucketno] = copyTuple;
 
 			/* We have reduced skew space, but overall space doesn't change */
 			hashtable->spaceUsedSkew -= tupleSize;
@@ -1638,49 +2537,151 @@ ExecHashRemoveNextSkewBucket(HashJoinTable hashtable)
 }
 
 /*
- * Allocate 'size' bytes from the currently active HashMemoryChunk
+ * Reserve space in the DSM segment for instrumentation data.
  */
-static void *
-dense_alloc(HashJoinTable hashtable, Size size)
+void
+ExecHashEstimate(HashState *node, ParallelContext *pcxt)
 {
-	HashMemoryChunk newChunk;
-	char	   *ptr;
+	size_t		size;
 
-	/* just in case the size is not already aligned properly */
-	size = MAXALIGN(size);
+	/* don't need this if not instrumenting or no workers */
+	if (!node->ps.instrument || pcxt->nworkers == 0)
+		return;
 
-	/*
-	 * If tuple size is larger than of 1/4 of chunk size, allocate a separate
-	 * chunk.
-	 */
-	if (size > HASH_CHUNK_THRESHOLD)
-	{
-		/* allocate new chunk and put it at the beginning of the list */
-		newChunk = (HashMemoryChunk) MemoryContextAlloc(hashtable->batchCxt,
-														offsetof(HashMemoryChunkData, data) + size);
-		newChunk->maxlen = size;
-		newChunk->used = 0;
-		newChunk->ntuples = 0;
+	size = mul_size(pcxt->nworkers, sizeof(HashInstrumentation));
+	size = add_size(size, offsetof(SharedHashInfo, hinstrument));
+	shm_toc_estimate_chunk(&pcxt->estimator, size);
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+}
 
-		/*
-		 * Add this chunk to the list after the first existing chunk, so that
-		 * we don't lose the remaining space in the "current" chunk.
-		 */
-		if (hashtable->chunks != NULL)
-		{
-			newChunk->next = hashtable->chunks->next;
-			hashtable->chunks->next = newChunk;
+/*
+ * Set up a space in the DSM for all workers to record instrumentation data
+ * about their hash table.
+ */
+void
+ExecHashInitializeDSM(HashState *node, ParallelContext *pcxt)
+{
+	size_t		size;
+
+	/* don't need this if not instrumenting or no workers */
+	if (!node->ps.instrument || pcxt->nworkers == 0)
+		return;
+
+	size = offsetof(SharedHashInfo, hinstrument) +
+		pcxt->nworkers * sizeof(HashInstrumentation);
+	node->shared_info = (SharedHashInfo *) shm_toc_allocate(pcxt->toc, size);
+	memset(node->shared_info, 0, size);
+	node->shared_info->num_workers = pcxt->nworkers;
+	shm_toc_insert(pcxt->toc, node->ps.plan->plan_node_id,
+				   node->shared_info);
+}
+
+/*
+ * Locate the DSM space for hash table instrumentation data that we'll write
+ * to at shutdown time.
+ */
+void
+ExecHashInitializeWorker(HashState *node, ParallelWorkerContext *pwcxt)
+{
+	SharedHashInfo *shared_info;
+
+	/* don't need this if not instrumenting */
+	if (!node->ps.instrument)
+		return;
+
+	shared_info = (SharedHashInfo *)
+		shm_toc_lookup(pwcxt->toc, node->ps.plan->plan_node_id, false);
+	node->hinstrument = &shared_info->hinstrument[ParallelWorkerNumber];
+}
+
+/*
+ * Copy instrumentation data from this worker's hash table (if it built one)
+ * to DSM memory so the leader can retrieve it.  This must be done in an
+ * ExecShutdownHash() rather than ExecEndHash() because the latter runs after
+ * we've detached from the DSM segment.
+ */
+void
+ExecShutdownHash(HashState *node)
+{
+	if (node->hinstrument && node->hashtable)
+		ExecHashGetInstrumentation(node->hinstrument, node->hashtable);
+}
+
+/*
+ * Retrieve instrumentation data from workers before the DSM segment is
+ * detached, so that EXPLAIN can access it.
+ */
+void
+ExecHashRetrieveInstrumentation(HashState *node)
+{
+	SharedHashInfo *shared_info = node->shared_info;
+	size_t		size;
+
+	if (shared_info == NULL)
+		return;
+
+	/* Replace node->shared_info with a copy in backend-local memory. */
+	size = offsetof(SharedHashInfo, hinstrument) +
+		shared_info->num_workers * sizeof(HashInstrumentation);
+	node->shared_info = palloc(size);
+	memcpy(node->shared_info, shared_info, size);
+}
+
+/*
+ * Copy the instrumentation data from 'hashtable' into a HashInstrumentation
+ * struct.
+ */
+void
+ExecHashGetInstrumentation(HashInstrumentation *instrument,
+						   HashJoinTable hashtable)
+{
+	instrument->nbuckets = hashtable->nbuckets;
+	instrument->nbuckets_original = hashtable->nbuckets_original;
+	instrument->nbatch = hashtable->nbatch;
+	instrument->nbatch_original = hashtable->nbatch_original;
+	instrument->space_peak = hashtable->spacePeak;
+}
+
+/*
+ * Allocate 'size' bytes from the currently active HashMemoryChunk
+ */
+static void *
+dense_alloc(HashJoinTable hashtable, Size size)
+{
+	HashMemoryChunk newChunk;
+	char	   *ptr;
+
+	/* just in case the size is not already aligned properly */
+	size = MAXALIGN(size);
+
+	/*
+	 * If tuple size is larger than threshold, allocate a separate chunk.
+	 */
+	if (size > HASH_CHUNK_THRESHOLD)
+	{
+		/* allocate new chunk and put it at the beginning of the list */
+		newChunk = (HashMemoryChunk) MemoryContextAlloc(hashtable->batchCxt,
+														HASH_CHUNK_HEADER_SIZE + size);
+		newChunk->maxlen = size;
+		newChunk->used = size;
+		newChunk->ntuples = 1;
+
+		/*
+		 * Add this chunk to the list after the first existing chunk, so that
+		 * we don't lose the remaining space in the "current" chunk.
+		 */
+		if (hashtable->chunks != NULL)
+		{
+			newChunk->next = hashtable->chunks->next;
+			hashtable->chunks->next.unshared = newChunk;
 		}
 		else
 		{
-			newChunk->next = hashtable->chunks;
+			newChunk->next.unshared = hashtable->chunks;
 			hashtable->chunks = newChunk;
 		}
 
-		newChunk->used += size;
-		newChunk->ntuples += 1;
-
-		return newChunk->data;
+		return HASH_CHUNK_DATA(newChunk);
 	}
 
 	/*
@@ -1692,23 +2693,616 @@ dense_alloc(HashJoinTable hashtable, Size size)
 	{
 		/* allocate new chunk and put it at the beginning of the list */
 		newChunk = (HashMemoryChunk) MemoryContextAlloc(hashtable->batchCxt,
-														offsetof(HashMemoryChunkData, data) + HASH_CHUNK_SIZE);
+														HASH_CHUNK_HEADER_SIZE + HASH_CHUNK_SIZE);
 
 		newChunk->maxlen = HASH_CHUNK_SIZE;
 		newChunk->used = size;
 		newChunk->ntuples = 1;
 
-		newChunk->next = hashtable->chunks;
+		newChunk->next.unshared = hashtable->chunks;
 		hashtable->chunks = newChunk;
 
-		return newChunk->data;
+		return HASH_CHUNK_DATA(newChunk);
 	}
 
 	/* There is enough space in the current chunk, let's add the tuple */
-	ptr = hashtable->chunks->data + hashtable->chunks->used;
+	ptr = HASH_CHUNK_DATA(hashtable->chunks) + hashtable->chunks->used;
 	hashtable->chunks->used += size;
 	hashtable->chunks->ntuples += 1;
 
 	/* return pointer to the start of the tuple memory */
 	return ptr;
 }
+
+/*
+ * Allocate space for a tuple in shared dense storage.  This is equivalent to
+ * dense_alloc but for Parallel Hash using shared memory.
+ *
+ * While loading a tuple into shared memory, we might run out of memory and
+ * decide to repartition, or determine that the load factor is too high and
+ * decide to expand the bucket array, or discover that another participant has
+ * commanded us to help do that.  Return NULL if number of buckets or batches
+ * has changed, indicating that the caller must retry (considering the
+ * possibility that the tuple no longer belongs in the same batch).
+ */
+static HashJoinTuple
+ExecParallelHashTupleAlloc(HashJoinTable hashtable, size_t size,
+						   dsa_pointer *shared)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	dsa_pointer chunk_shared;
+	HashMemoryChunk chunk;
+	Size		chunk_size;
+	HashJoinTuple result;
+	int			curbatch = hashtable->curbatch;
+
+	size = MAXALIGN(size);
+
+	/*
+	 * Fast path: if there is enough space in this backend's current chunk,
+	 * then we can allocate without any locking.
+	 */
+	chunk = hashtable->current_chunk;
+	if (chunk != NULL &&
+		size <= HASH_CHUNK_THRESHOLD &&
+		chunk->maxlen - chunk->used >= size)
+	{
+
+		chunk_shared = hashtable->current_chunk_shared;
+		Assert(chunk == dsa_get_address(hashtable->area, chunk_shared));
+		*shared = chunk_shared + HASH_CHUNK_HEADER_SIZE + chunk->used;
+		result = (HashJoinTuple) (HASH_CHUNK_DATA(chunk) + chunk->used);
+		chunk->used += size;
+
+		Assert(chunk->used <= chunk->maxlen);
+		Assert(result == dsa_get_address(hashtable->area, *shared));
+
+		return result;
+	}
+
+	/* Slow path: try to allocate a new chunk. */
+	LWLockAcquire(&pstate->lock, LW_EXCLUSIVE);
+
+	/*
+	 * Check if we need to help increase the number of buckets or batches.
+	 */
+	if (pstate->growth == PHJ_GROWTH_NEED_MORE_BATCHES ||
+		pstate->growth == PHJ_GROWTH_NEED_MORE_BUCKETS)
+	{
+		ParallelHashGrowth growth = pstate->growth;
+
+		hashtable->current_chunk = NULL;
+		LWLockRelease(&pstate->lock);
+
+		/* Another participant has commanded us to help grow. */
+		if (growth == PHJ_GROWTH_NEED_MORE_BATCHES)
+			ExecParallelHashIncreaseNumBatches(hashtable);
+		else if (growth == PHJ_GROWTH_NEED_MORE_BUCKETS)
+			ExecParallelHashIncreaseNumBuckets(hashtable);
+
+		/* The caller must retry. */
+		return NULL;
+	}
+
+	/* Oversized tuples get their own chunk. */
+	if (size > HASH_CHUNK_THRESHOLD)
+		chunk_size = size + HASH_CHUNK_HEADER_SIZE;
+	else
+		chunk_size = HASH_CHUNK_SIZE;
+
+	/* Check if it's time to grow batches or buckets. */
+	if (pstate->growth != PHJ_GROWTH_DISABLED)
+	{
+		Assert(curbatch == 0);
+		Assert(BarrierPhase(&pstate->build_barrier) == PHJ_BUILD_HASHING_INNER);
+
+		/*
+		 * Check if our space limit would be exceeded.  To avoid choking on
+		 * very large tuples or very low work_mem setting, we'll always allow
+		 * each backend to allocate at least one chunk.
+		 */
+		if (hashtable->batches[0].at_least_one_chunk &&
+			hashtable->batches[0].shared->size +
+			chunk_size > pstate->space_allowed)
+		{
+			pstate->growth = PHJ_GROWTH_NEED_MORE_BATCHES;
+			hashtable->batches[0].shared->space_exhausted = true;
+			LWLockRelease(&pstate->lock);
+
+			return NULL;
+		}
+
+		/* Check if our load factor limit would be exceeded. */
+		if (hashtable->nbatch == 1)
+		{
+			hashtable->batches[0].shared->ntuples += hashtable->batches[0].ntuples;
+			hashtable->batches[0].ntuples = 0;
+			if (hashtable->batches[0].shared->ntuples + 1 >
+				hashtable->nbuckets * NTUP_PER_BUCKET &&
+				hashtable->nbuckets < (INT_MAX / 2))
+			{
+				pstate->growth = PHJ_GROWTH_NEED_MORE_BUCKETS;
+				LWLockRelease(&pstate->lock);
+
+				return NULL;
+			}
+		}
+	}
+
+	/* We are cleared to allocate a new chunk. */
+	chunk_shared = dsa_allocate(hashtable->area, chunk_size);
+	hashtable->batches[curbatch].shared->size += chunk_size;
+	hashtable->batches[curbatch].at_least_one_chunk = true;
+
+	/* Set up the chunk. */
+	chunk = (HashMemoryChunk) dsa_get_address(hashtable->area, chunk_shared);
+	*shared = chunk_shared + HASH_CHUNK_HEADER_SIZE;
+	chunk->maxlen = chunk_size - HASH_CHUNK_HEADER_SIZE;
+	chunk->used = size;
+
+	/*
+	 * Push it onto the list of chunks, so that it can be found if we need to
+	 * increase the number of buckets or batches (batch 0 only) and later for
+	 * freeing the memory (all batches).
+	 */
+	chunk->next.shared = hashtable->batches[curbatch].shared->chunks;
+	hashtable->batches[curbatch].shared->chunks = chunk_shared;
+
+	if (size <= HASH_CHUNK_THRESHOLD)
+	{
+		/*
+		 * Make this the current chunk so that we can use the fast path to
+		 * fill the rest of it up in future calls.
+		 */
+		hashtable->current_chunk = chunk;
+		hashtable->current_chunk_shared = chunk_shared;
+	}
+	LWLockRelease(&pstate->lock);
+
+	Assert(HASH_CHUNK_DATA(chunk) == dsa_get_address(hashtable->area, *shared));
+	result = (HashJoinTuple) HASH_CHUNK_DATA(chunk);
+
+	return result;
+}
+
+/*
+ * One backend needs to set up the shared batch state including tuplestores.
+ * Other backends will ensure they have correctly configured accessors by
+ * called ExecParallelHashEnsureBatchAccessors().
+ */
+static void
+ExecParallelHashJoinSetUpBatches(HashJoinTable hashtable, int nbatch)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	ParallelHashJoinBatch *batches;
+	MemoryContext oldcxt;
+	int			i;
+
+	Assert(hashtable->batches == NULL);
+
+	/* Allocate space. */
+	pstate->batches =
+		dsa_allocate0(hashtable->area,
+					  EstimateParallelHashJoinBatch(hashtable) * nbatch);
+	pstate->nbatch = nbatch;
+	batches = dsa_get_address(hashtable->area, pstate->batches);
+
+	/* Use hash join memory context. */
+	oldcxt = MemoryContextSwitchTo(hashtable->hashCxt);
+
+	/* Allocate this backend's accessor array. */
+	hashtable->nbatch = nbatch;
+	hashtable->batches = (ParallelHashJoinBatchAccessor *)
+		palloc0(sizeof(ParallelHashJoinBatchAccessor) * hashtable->nbatch);
+
+	/* Set up the shared state, tuplestores and backend-local accessors. */
+	for (i = 0; i < hashtable->nbatch; ++i)
+	{
+		ParallelHashJoinBatchAccessor *accessor = &hashtable->batches[i];
+		ParallelHashJoinBatch *shared = NthParallelHashJoinBatch(batches, i);
+		char		name[MAXPGPATH];
+
+		/*
+		 * All members of shared were zero-initialized.  We just need to set
+		 * up the Barrier.
+		 */
+		BarrierInit(&shared->batch_barrier, 0);
+		if (i == 0)
+		{
+			/* Batch 0 doesn't need to be loaded. */
+			BarrierAttach(&shared->batch_barrier);
+			while (BarrierPhase(&shared->batch_barrier) < PHJ_BATCH_PROBING)
+				BarrierArriveAndWait(&shared->batch_barrier, 0);
+			BarrierDetach(&shared->batch_barrier);
+		}
+
+		/* Initialize accessor state.  All members were zero-initialized. */
+		accessor->shared = shared;
+
+		/* Initialize the shared tuplestores. */
+		snprintf(name, sizeof(name), "i%dof%d", i, hashtable->nbatch);
+		accessor->inner_tuples =
+			sts_initialize(ParallelHashJoinBatchInner(shared),
+						   pstate->nparticipants,
+						   ParallelWorkerNumber + 1,
+						   sizeof(uint32),
+						   SHARED_TUPLESTORE_SINGLE_PASS,
+						   &pstate->fileset,
+						   name);
+		snprintf(name, sizeof(name), "o%dof%d", i, hashtable->nbatch);
+		accessor->outer_tuples =
+			sts_initialize(ParallelHashJoinBatchOuter(shared,
+													  pstate->nparticipants),
+						   pstate->nparticipants,
+						   ParallelWorkerNumber + 1,
+						   sizeof(uint32),
+						   SHARED_TUPLESTORE_SINGLE_PASS,
+						   &pstate->fileset,
+						   name);
+	}
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * Free the current set of ParallelHashJoinBatchAccessor objects.
+ */
+static void
+ExecParallelHashCloseBatchAccessors(HashJoinTable hashtable)
+{
+	int			i;
+
+	for (i = 0; i < hashtable->nbatch; ++i)
+	{
+		/* Make sure no files are left open. */
+		sts_end_write(hashtable->batches[i].inner_tuples);
+		sts_end_write(hashtable->batches[i].outer_tuples);
+		sts_end_parallel_scan(hashtable->batches[i].inner_tuples);
+		sts_end_parallel_scan(hashtable->batches[i].outer_tuples);
+	}
+	pfree(hashtable->batches);
+	hashtable->batches = NULL;
+}
+
+/*
+ * Make sure this backend has up-to-date accessors for the current set of
+ * batches.
+ */
+static void
+ExecParallelHashEnsureBatchAccessors(HashJoinTable hashtable)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	ParallelHashJoinBatch *batches;
+	MemoryContext oldcxt;
+	int			i;
+
+	if (hashtable->batches != NULL)
+	{
+		if (hashtable->nbatch == pstate->nbatch)
+			return;
+		ExecParallelHashCloseBatchAccessors(hashtable);
+	}
+
+	/*
+	 * It's possible for a backend to start up very late so that the whole
+	 * join is finished and the shm state for tracking batches has already
+	 * been freed by ExecHashTableDetach().  In that case we'll just leave
+	 * hashtable->batches as NULL so that ExecParallelHashJoinNewBatch() gives
+	 * up early.
+	 */
+	if (!DsaPointerIsValid(pstate->batches))
+		return;
+
+	/* Use hash join memory context. */
+	oldcxt = MemoryContextSwitchTo(hashtable->hashCxt);
+
+	/* Allocate this backend's accessor array. */
+	hashtable->nbatch = pstate->nbatch;
+	hashtable->batches = (ParallelHashJoinBatchAccessor *)
+		palloc0(sizeof(ParallelHashJoinBatchAccessor) * hashtable->nbatch);
+
+	/* Find the base of the pseudo-array of ParallelHashJoinBatch objects. */
+	batches = (ParallelHashJoinBatch *)
+		dsa_get_address(hashtable->area, pstate->batches);
+
+	/* Set up the accessor array and attach to the tuplestores. */
+	for (i = 0; i < hashtable->nbatch; ++i)
+	{
+		ParallelHashJoinBatchAccessor *accessor = &hashtable->batches[i];
+		ParallelHashJoinBatch *shared = NthParallelHashJoinBatch(batches, i);
+
+		accessor->shared = shared;
+		accessor->preallocated = 0;
+		accessor->done = false;
+		accessor->inner_tuples =
+			sts_attach(ParallelHashJoinBatchInner(shared),
+					   ParallelWorkerNumber + 1,
+					   &pstate->fileset);
+		accessor->outer_tuples =
+			sts_attach(ParallelHashJoinBatchOuter(shared,
+												  pstate->nparticipants),
+					   ParallelWorkerNumber + 1,
+					   &pstate->fileset);
+	}
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * Allocate an empty shared memory hash table for a given batch.
+ */
+void
+ExecParallelHashTableAlloc(HashJoinTable hashtable, int batchno)
+{
+	ParallelHashJoinBatch *batch = hashtable->batches[batchno].shared;
+	dsa_pointer_atomic *buckets;
+	int			nbuckets = hashtable->parallel_state->nbuckets;
+	int			i;
+
+	batch->buckets =
+		dsa_allocate(hashtable->area, sizeof(dsa_pointer_atomic) * nbuckets);
+	buckets = (dsa_pointer_atomic *)
+		dsa_get_address(hashtable->area, batch->buckets);
+	for (i = 0; i < nbuckets; ++i)
+		dsa_pointer_atomic_init(&buckets[i], InvalidDsaPointer);
+}
+
+/*
+ * If we are currently attached to a shared hash join batch, detach.  If we
+ * are last to detach, clean up.
+ */
+void
+ExecHashTableDetachBatch(HashJoinTable hashtable)
+{
+	if (hashtable->parallel_state != NULL &&
+		hashtable->curbatch >= 0)
+	{
+		int			curbatch = hashtable->curbatch;
+		ParallelHashJoinBatch *batch = hashtable->batches[curbatch].shared;
+
+		/* Make sure any temporary files are closed. */
+		sts_end_parallel_scan(hashtable->batches[curbatch].inner_tuples);
+		sts_end_parallel_scan(hashtable->batches[curbatch].outer_tuples);
+
+		/* Detach from the batch we were last working on. */
+		if (BarrierArriveAndDetach(&batch->batch_barrier))
+		{
+			/*
+			 * Technically we shouldn't access the barrier because we're no
+			 * longer attached, but since there is no way it's moving after
+			 * this point it seems safe to make the following assertion.
+			 */
+			Assert(BarrierPhase(&batch->batch_barrier) == PHJ_BATCH_DONE);
+
+			/* Free shared chunks and buckets. */
+			while (DsaPointerIsValid(batch->chunks))
+			{
+				HashMemoryChunk chunk =
+				dsa_get_address(hashtable->area, batch->chunks);
+				dsa_pointer next = chunk->next.shared;
+
+				dsa_free(hashtable->area, batch->chunks);
+				batch->chunks = next;
+			}
+			if (DsaPointerIsValid(batch->buckets))
+			{
+				dsa_free(hashtable->area, batch->buckets);
+				batch->buckets = InvalidDsaPointer;
+			}
+		}
+
+		/*
+		 * Track the largest batch we've been attached to.  Though each
+		 * backend might see a different subset of batches, explain.c will
+		 * scan the results from all backends to find the largest value.
+		 */
+		hashtable->spacePeak =
+			Max(hashtable->spacePeak,
+				batch->size + sizeof(dsa_pointer_atomic) * hashtable->nbuckets);
+
+		/* Remember that we are not attached to a batch. */
+		hashtable->curbatch = -1;
+	}
+}
+
+/*
+ * Detach from all shared resources.  If we are last to detach, clean up.
+ */
+void
+ExecHashTableDetach(HashJoinTable hashtable)
+{
+	if (hashtable->parallel_state)
+	{
+		ParallelHashJoinState *pstate = hashtable->parallel_state;
+		int			i;
+
+		/* Make sure any temporary files are closed. */
+		if (hashtable->batches)
+		{
+			for (i = 0; i < hashtable->nbatch; ++i)
+			{
+				sts_end_write(hashtable->batches[i].inner_tuples);
+				sts_end_write(hashtable->batches[i].outer_tuples);
+				sts_end_parallel_scan(hashtable->batches[i].inner_tuples);
+				sts_end_parallel_scan(hashtable->batches[i].outer_tuples);
+			}
+		}
+
+		/* If we're last to detach, clean up shared memory. */
+		if (BarrierDetach(&pstate->build_barrier))
+		{
+			if (DsaPointerIsValid(pstate->batches))
+			{
+				dsa_free(hashtable->area, pstate->batches);
+				pstate->batches = InvalidDsaPointer;
+			}
+		}
+
+		hashtable->parallel_state = NULL;
+	}
+}
+
+/*
+ * Get the first tuple in a given bucket identified by number.
+ */
+static inline HashJoinTuple
+ExecParallelHashFirstTuple(HashJoinTable hashtable, int bucketno)
+{
+	HashJoinTuple tuple;
+	dsa_pointer p;
+
+	Assert(hashtable->parallel_state);
+	p = dsa_pointer_atomic_read(&hashtable->buckets.shared[bucketno]);
+	tuple = (HashJoinTuple) dsa_get_address(hashtable->area, p);
+
+	return tuple;
+}
+
+/*
+ * Get the next tuple in the same bucket as 'tuple'.
+ */
+static inline HashJoinTuple
+ExecParallelHashNextTuple(HashJoinTable hashtable, HashJoinTuple tuple)
+{
+	HashJoinTuple next;
+
+	Assert(hashtable->parallel_state);
+	next = (HashJoinTuple) dsa_get_address(hashtable->area, tuple->next.shared);
+
+	return next;
+}
+
+/*
+ * Insert a tuple at the front of a chain of tuples in DSA memory atomically.
+ */
+static inline void
+ExecParallelHashPushTuple(dsa_pointer_atomic *head,
+						  HashJoinTuple tuple,
+						  dsa_pointer tuple_shared)
+{
+	for (;;)
+	{
+		tuple->next.shared = dsa_pointer_atomic_read(head);
+		if (dsa_pointer_atomic_compare_exchange(head,
+												&tuple->next.shared,
+												tuple_shared))
+			break;
+	}
+}
+
+/*
+ * Prepare to work on a given batch.
+ */
+void
+ExecParallelHashTableSetCurrentBatch(HashJoinTable hashtable, int batchno)
+{
+	Assert(hashtable->batches[batchno].shared->buckets != InvalidDsaPointer);
+
+	hashtable->curbatch = batchno;
+	hashtable->buckets.shared = (dsa_pointer_atomic *)
+		dsa_get_address(hashtable->area,
+						hashtable->batches[batchno].shared->buckets);
+	hashtable->nbuckets = hashtable->parallel_state->nbuckets;
+	hashtable->log2_nbuckets = my_log2(hashtable->nbuckets);
+	hashtable->current_chunk = NULL;
+	hashtable->current_chunk_shared = InvalidDsaPointer;
+	hashtable->batches[batchno].at_least_one_chunk = false;
+}
+
+/*
+ * Take the next available chunk from the queue of chunks being worked on in
+ * parallel.  Return NULL if there are none left.  Otherwise return a pointer
+ * to the chunk, and set *shared to the DSA pointer to the chunk.
+ */
+static HashMemoryChunk
+ExecParallelHashPopChunkQueue(HashJoinTable hashtable, dsa_pointer *shared)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	HashMemoryChunk chunk;
+
+	LWLockAcquire(&pstate->lock, LW_EXCLUSIVE);
+	if (DsaPointerIsValid(pstate->chunk_work_queue))
+	{
+		*shared = pstate->chunk_work_queue;
+		chunk = (HashMemoryChunk)
+			dsa_get_address(hashtable->area, *shared);
+		pstate->chunk_work_queue = chunk->next.shared;
+	}
+	else
+		chunk = NULL;
+	LWLockRelease(&pstate->lock);
+
+	return chunk;
+}
+
+/*
+ * Increase the space preallocated in this backend for a given inner batch by
+ * at least a given amount.  This allows us to track whether a given batch
+ * would fit in memory when loaded back in.  Also increase the number of
+ * batches or buckets if required.
+ *
+ * This maintains a running estimation of how much space will be taken when we
+ * load the batch back into memory by simulating the way chunks will be handed
+ * out to workers.  It's not perfectly accurate because the tuples will be
+ * packed into memory chunks differently by ExecParallelHashTupleAlloc(), but
+ * it should be pretty close.  It tends to overestimate by a fraction of a
+ * chunk per worker since all workers gang up to preallocate during hashing,
+ * but workers tend to reload batches alone if there are enough to go around,
+ * leaving fewer partially filled chunks.  This effect is bounded by
+ * nparticipants.
+ *
+ * Return false if the number of batches or buckets has changed, and the
+ * caller should reconsider which batch a given tuple now belongs in and call
+ * again.
+ */
+static bool
+ExecParallelHashTuplePrealloc(HashJoinTable hashtable, int batchno, size_t size)
+{
+	ParallelHashJoinState *pstate = hashtable->parallel_state;
+	ParallelHashJoinBatchAccessor *batch = &hashtable->batches[batchno];
+	size_t		want = Max(size, HASH_CHUNK_SIZE - HASH_CHUNK_HEADER_SIZE);
+
+	Assert(batchno > 0);
+	Assert(batchno < hashtable->nbatch);
+	Assert(size == MAXALIGN(size));
+
+	LWLockAcquire(&pstate->lock, LW_EXCLUSIVE);
+
+	/* Has another participant commanded us to help grow? */
+	if (pstate->growth == PHJ_GROWTH_NEED_MORE_BATCHES ||
+		pstate->growth == PHJ_GROWTH_NEED_MORE_BUCKETS)
+	{
+		ParallelHashGrowth growth = pstate->growth;
+
+		LWLockRelease(&pstate->lock);
+		if (growth == PHJ_GROWTH_NEED_MORE_BATCHES)
+			ExecParallelHashIncreaseNumBatches(hashtable);
+		else if (growth == PHJ_GROWTH_NEED_MORE_BUCKETS)
+			ExecParallelHashIncreaseNumBuckets(hashtable);
+
+		return false;
+	}
+
+	if (pstate->growth != PHJ_GROWTH_DISABLED &&
+		batch->at_least_one_chunk &&
+		(batch->shared->estimated_size + want + HASH_CHUNK_HEADER_SIZE
+		 > pstate->space_allowed))
+	{
+		/*
+		 * We have determined that this batch would exceed the space budget if
+		 * loaded into memory.  Command all participants to help repartition.
+		 */
+		batch->shared->space_exhausted = true;
+		pstate->growth = PHJ_GROWTH_NEED_MORE_BATCHES;
+		LWLockRelease(&pstate->lock);
+
+		return false;
+	}
+
+	batch->at_least_one_chunk = true;
+	batch->shared->estimated_size += want + HASH_CHUNK_HEADER_SIZE;
+	batch->preallocated = want;
+	LWLockRelease(&pstate->lock);
+
+	return true;
+}
diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
index ab1632cc13..ab91eb2527 100644
--- a/src/backend/executor/nodeHashjoin.c
+++ b/src/backend/executor/nodeHashjoin.c
@@ -3,25 +3,119 @@
  * nodeHashjoin.c
  *	  Routines to handle hash join nodes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
  *	  src/backend/executor/nodeHashjoin.c
  *
+ * PARALLELISM
+ *
+ * Hash joins can participate in parallel query execution in several ways.  A
+ * parallel-oblivious hash join is one where the node is unaware that it is
+ * part of a parallel plan.  In this case, a copy of the inner plan is used to
+ * build a copy of the hash table in every backend, and the outer plan could
+ * either be built from a partial or complete path, so that the results of the
+ * hash join are correspondingly either partial or complete.  A parallel-aware
+ * hash join is one that behaves differently, coordinating work between
+ * backends, and appears as Parallel Hash Join in EXPLAIN output.  A Parallel
+ * Hash Join always appears with a Parallel Hash node.
+ *
+ * Parallel-aware hash joins use the same per-backend state machine to track
+ * progress through the hash join algorithm as parallel-oblivious hash joins.
+ * In a parallel-aware hash join, there is also a shared state machine that
+ * co-operating backends use to synchronize their local state machines and
+ * program counters.  The shared state machine is managed with a Barrier IPC
+ * primitive.  When all attached participants arrive at a barrier, the phase
+ * advances and all waiting participants are released.
+ *
+ * When a participant begins working on a parallel hash join, it must first
+ * figure out how much progress has already been made, because participants
+ * don't wait for each other to begin.  For this reason there are switch
+ * statements at key points in the code where we have to synchronize our local
+ * state machine with the phase, and then jump to the correct part of the
+ * algorithm so that we can get started.
+ *
+ * One barrier called build_barrier is used to coordinate the hashing phases.
+ * The phase is represented by an integer which begins at zero and increments
+ * one by one, but in the code it is referred to by symbolic names as follows:
+ *
+ *   PHJ_BUILD_ELECTING              -- initial state
+ *   PHJ_BUILD_ALLOCATING            -- one sets up the batches and table 0
+ *   PHJ_BUILD_HASHING_INNER         -- all hash the inner rel
+ *   PHJ_BUILD_HASHING_OUTER         -- (multi-batch only) all hash the outer
+ *   PHJ_BUILD_DONE                  -- building done, probing can begin
+ *
+ * While in the phase PHJ_BUILD_HASHING_INNER a separate pair of barriers may
+ * be used repeatedly as required to coordinate expansions in the number of
+ * batches or buckets.  Their phases are as follows:
+ *
+ *   PHJ_GROW_BATCHES_ELECTING       -- initial state
+ *   PHJ_GROW_BATCHES_ALLOCATING     -- one allocates new batches
+ *   PHJ_GROW_BATCHES_REPARTITIONING -- all repartition
+ *   PHJ_GROW_BATCHES_FINISHING      -- one cleans up, detects skew
+ *
+ *   PHJ_GROW_BUCKETS_ELECTING       -- initial state
+ *   PHJ_GROW_BUCKETS_ALLOCATING     -- one allocates new buckets
+ *   PHJ_GROW_BUCKETS_REINSERTING    -- all insert tuples
+ *
+ * If the planner got the number of batches and buckets right, those won't be
+ * necessary, but on the other hand we might finish up needing to expand the
+ * buckets or batches multiple times while hashing the inner relation to stay
+ * within our memory budget and load factor target.  For that reason it's a
+ * separate pair of barriers using circular phases.
+ *
+ * The PHJ_BUILD_HASHING_OUTER phase is required only for multi-batch joins,
+ * because we need to divide the outer relation into batches up front in order
+ * to be able to process batches entirely independently.  In contrast, the
+ * parallel-oblivious algorithm simply throws tuples 'forward' to 'later'
+ * batches whenever it encounters them while scanning and probing, which it
+ * can do because it processes batches in serial order.
+ *
+ * Once PHJ_BUILD_DONE is reached, backends then split up and process
+ * different batches, or gang up and work together on probing batches if there
+ * aren't enough to go around.  For each batch there is a separate barrier
+ * with the following phases:
+ *
+ *  PHJ_BATCH_ELECTING       -- initial state
+ *  PHJ_BATCH_ALLOCATING     -- one allocates buckets
+ *  PHJ_BATCH_LOADING        -- all load the hash table from disk
+ *  PHJ_BATCH_PROBING        -- all probe
+ *  PHJ_BATCH_DONE           -- end
+ *
+ * Batch 0 is a special case, because it starts out in phase
+ * PHJ_BATCH_PROBING; populating batch 0's hash table is done during
+ * PHJ_BUILD_HASHING_INNER so we can skip loading.
+ *
+ * Initially we try to plan for a single-batch hash join using the combined
+ * work_mem of all participants to create a large shared hash table.  If that
+ * turns out either at planning or execution time to be impossible then we
+ * fall back to regular work_mem sized hash tables.
+ *
+ * To avoid deadlocks, we never wait for any barrier unless it is known that
+ * all other backends attached to it are actively executing the node or have
+ * already arrived.  Practically, that means that we never return a tuple
+ * while attached to a barrier, unless the barrier has reached its final
+ * state.  In the slightly special case of the per-batch barrier, we return
+ * tuples while in PHJ_BATCH_PROBING phase, but that's OK because we use
+ * BarrierArriveAndDetach() to advance it to PHJ_BATCH_DONE without waiting.
+ *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
 #include "access/htup_details.h"
+#include "access/parallel.h"
 #include "executor/executor.h"
 #include "executor/hashjoin.h"
 #include "executor/nodeHash.h"
 #include "executor/nodeHashjoin.h"
 #include "miscadmin.h"
+#include "pgstat.h"
 #include "utils/memutils.h"
+#include "utils/sharedtuplestore.h"
 
 
 /*
@@ -42,24 +136,33 @@
 static TupleTableSlot *ExecHashJoinOuterGetTuple(PlanState *outerNode,
 						  HashJoinState *hjstate,
 						  uint32 *hashvalue);
+static TupleTableSlot *ExecParallelHashJoinOuterGetTuple(PlanState *outerNode,
+								  HashJoinState *hjstate,
+								  uint32 *hashvalue);
 static TupleTableSlot *ExecHashJoinGetSavedTuple(HashJoinState *hjstate,
 						  BufFile *file,
 						  uint32 *hashvalue,
 						  TupleTableSlot *tupleSlot);
 static bool ExecHashJoinNewBatch(HashJoinState *hjstate);
+static bool ExecParallelHashJoinNewBatch(HashJoinState *hjstate);
+static void ExecParallelHashJoinPartitionOuter(HashJoinState *node);
 
 
 /* ----------------------------------------------------------------
- *		ExecHashJoin
+ *		ExecHashJoinImpl
  *
- *		This function implements the Hybrid Hashjoin algorithm.
+ *		This function implements the Hybrid Hashjoin algorithm.  It is marked
+ *		with an always-inline attribute so that ExecHashJoin() and
+ *		ExecParallelHashJoin() can inline it.  Compilers that respect the
+ *		attribute should create versions specialized for parallel == true and
+ *		parallel == false with unnecessary branches removed.
  *
  *		Note: the relation we build hash table on is the "inner"
  *			  the other one is "outer".
  * ----------------------------------------------------------------
  */
-static TupleTableSlot *			/* return: a tuple or NULL */
-ExecHashJoin(PlanState *pstate)
+static pg_attribute_always_inline TupleTableSlot *
+ExecHashJoinImpl(PlanState *pstate, bool parallel)
 {
 	HashJoinState *node = castNode(HashJoinState, pstate);
 	PlanState  *outerNode;
@@ -71,6 +174,7 @@ ExecHashJoin(PlanState *pstate)
 	TupleTableSlot *outerTupleSlot;
 	uint32		hashvalue;
 	int			batchno;
+	ParallelHashJoinState *parallel_state;
 
 	/*
 	 * get information from HashJoin node
@@ -81,6 +185,7 @@ ExecHashJoin(PlanState *pstate)
 	outerNode = outerPlanState(node);
 	hashtable = node->hj_HashTable;
 	econtext = node->js.ps.ps_ExprContext;
+	parallel_state = hashNode->parallel_state;
 
 	/*
 	 * Reset per-tuple memory context to free any expression evaluation
@@ -138,6 +243,18 @@ ExecHashJoin(PlanState *pstate)
 					/* no chance to not build the hash table */
 					node->hj_FirstOuterTupleSlot = NULL;
 				}
+				else if (parallel)
+				{
+					/*
+					 * The empty-outer optimization is not implemented for
+					 * shared hash tables, because no one participant can
+					 * determine that there are no outer tuples, and it's not
+					 * yet clear that it's worth the synchronization overhead
+					 * of reaching consensus to figure that out.  So we have
+					 * to build the hash table.
+					 */
+					node->hj_FirstOuterTupleSlot = NULL;
+				}
 				else if (HJ_FILL_OUTER(node) ||
 						 (outerNode->plan->startup_cost < hashNode->ps.plan->total_cost &&
 						  !node->hj_OuterNotEmpty))
@@ -155,15 +272,19 @@ ExecHashJoin(PlanState *pstate)
 					node->hj_FirstOuterTupleSlot = NULL;
 
 				/*
-				 * create the hash table
+				 * Create the hash table.  If using Parallel Hash, then
+				 * whoever gets here first will create the hash table and any
+				 * later arrivals will merely attach to it.
 				 */
-				hashtable = ExecHashTableCreate((Hash *) hashNode->ps.plan,
+				hashtable = ExecHashTableCreate(hashNode,
 												node->hj_HashOperators,
 												HJ_FILL_INNER(node));
 				node->hj_HashTable = hashtable;
 
 				/*
-				 * execute the Hash node, to build the hash table
+				 * Execute the Hash node, to build the hash table.  If using
+				 * Parallel Hash, then we'll try to help hashing unless we
+				 * arrived too late.
 				 */
 				hashNode->hashtable = hashtable;
 				(void) MultiExecProcNode((PlanState *) hashNode);
@@ -189,7 +310,34 @@ ExecHashJoin(PlanState *pstate)
 				 */
 				node->hj_OuterNotEmpty = false;
 
-				node->hj_JoinState = HJ_NEED_NEW_OUTER;
+				if (parallel)
+				{
+					Barrier    *build_barrier;
+
+					build_barrier = &parallel_state->build_barrier;
+					Assert(BarrierPhase(build_barrier) == PHJ_BUILD_HASHING_OUTER ||
+						   BarrierPhase(build_barrier) == PHJ_BUILD_DONE);
+					if (BarrierPhase(build_barrier) == PHJ_BUILD_HASHING_OUTER)
+					{
+						/*
+						 * If multi-batch, we need to hash the outer relation
+						 * up front.
+						 */
+						if (hashtable->nbatch > 1)
+							ExecParallelHashJoinPartitionOuter(node);
+						BarrierArriveAndWait(build_barrier,
+											 WAIT_EVENT_HASH_BUILD_HASHING_OUTER);
+					}
+					Assert(BarrierPhase(build_barrier) == PHJ_BUILD_DONE);
+
+					/* Each backend should now select a batch to work on. */
+					hashtable->curbatch = -1;
+					node->hj_JoinState = HJ_NEED_NEW_BATCH;
+
+					continue;
+				}
+				else
+					node->hj_JoinState = HJ_NEED_NEW_OUTER;
 
 				/* FALL THRU */
 
@@ -198,9 +346,14 @@ ExecHashJoin(PlanState *pstate)
 				/*
 				 * We don't have an outer tuple, try to get the next one
 				 */
-				outerTupleSlot = ExecHashJoinOuterGetTuple(outerNode,
-														   node,
-														   &hashvalue);
+				if (parallel)
+					outerTupleSlot =
+						ExecParallelHashJoinOuterGetTuple(outerNode, node,
+														  &hashvalue);
+				else
+					outerTupleSlot =
+						ExecHashJoinOuterGetTuple(outerNode, node, &hashvalue);
+
 				if (TupIsNull(outerTupleSlot))
 				{
 					/* end of batch, or maybe whole join */
@@ -240,10 +393,12 @@ ExecHashJoin(PlanState *pstate)
 					 * Need to postpone this outer tuple to a later batch.
 					 * Save it in the corresponding outer-batch file.
 					 */
+					Assert(parallel_state == NULL);
 					Assert(batchno > hashtable->curbatch);
 					ExecHashJoinSaveTuple(ExecFetchSlotMinimalTuple(outerTupleSlot),
 										  hashvalue,
 										  &hashtable->outerBatchFile[batchno]);
+
 					/* Loop around, staying in HJ_NEED_NEW_OUTER state */
 					continue;
 				}
@@ -258,11 +413,23 @@ ExecHashJoin(PlanState *pstate)
 				/*
 				 * Scan the selected hash bucket for matches to current outer
 				 */
-				if (!ExecScanHashBucket(node, econtext))
+				if (parallel)
 				{
-					/* out of matches; check for possible outer-join fill */
-					node->hj_JoinState = HJ_FILL_OUTER_TUPLE;
-					continue;
+					if (!ExecParallelScanHashBucket(node, econtext))
+					{
+						/* out of matches; check for possible outer-join fill */
+						node->hj_JoinState = HJ_FILL_OUTER_TUPLE;
+						continue;
+					}
+				}
+				else
+				{
+					if (!ExecScanHashBucket(node, econtext))
+					{
+						/* out of matches; check for possible outer-join fill */
+						node->hj_JoinState = HJ_FILL_OUTER_TUPLE;
+						continue;
+					}
 				}
 
 				/*
@@ -362,8 +529,16 @@ ExecHashJoin(PlanState *pstate)
 				/*
 				 * Try to advance to next batch.  Done if there are no more.
 				 */
-				if (!ExecHashJoinNewBatch(node))
-					return NULL;	/* end of join */
+				if (parallel)
+				{
+					if (!ExecParallelHashJoinNewBatch(node))
+						return NULL;	/* end of parallel-aware join */
+				}
+				else
+				{
+					if (!ExecHashJoinNewBatch(node))
+						return NULL;	/* end of parallel-oblivious join */
+				}
 				node->hj_JoinState = HJ_NEED_NEW_OUTER;
 				break;
 
@@ -374,6 +549,38 @@ ExecHashJoin(PlanState *pstate)
 	}
 }
 
+/* ----------------------------------------------------------------
+ *		ExecHashJoin
+ *
+ *		Parallel-oblivious version.
+ * ----------------------------------------------------------------
+ */
+static TupleTableSlot *			/* return: a tuple or NULL */
+ExecHashJoin(PlanState *pstate)
+{
+	/*
+	 * On sufficiently smart compilers this should be inlined with the
+	 * parallel-aware branches removed.
+	 */
+	return ExecHashJoinImpl(pstate, false);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecParallelHashJoin
+ *
+ *		Parallel-aware version.
+ * ----------------------------------------------------------------
+ */
+static TupleTableSlot *			/* return: a tuple or NULL */
+ExecParallelHashJoin(PlanState *pstate)
+{
+	/*
+	 * On sufficiently smart compilers this should be inlined with the
+	 * parallel-oblivious branches removed.
+	 */
+	return ExecHashJoinImpl(pstate, true);
+}
+
 /* ----------------------------------------------------------------
  *		ExecInitHashJoin
  *
@@ -389,6 +596,7 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 	List	   *lclauses;
 	List	   *rclauses;
 	List	   *hoperators;
+	TupleDesc	outerDesc, innerDesc;
 	ListCell   *l;
 
 	/* check for unsupported flags */
@@ -400,7 +608,14 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 	hjstate = makeNode(HashJoinState);
 	hjstate->js.ps.plan = (Plan *) node;
 	hjstate->js.ps.state = estate;
+
+	/*
+	 * See ExecHashJoinInitializeDSM() and ExecHashJoinInitializeWorker()
+	 * where this function may be replaced with a parallel version, if we
+	 * managed to launch a parallel query.
+	 */
 	hjstate->js.ps.ExecProcNode = ExecHashJoin;
+	hjstate->js.jointype = node->join.jointype;
 
 	/*
 	 * Miscellaneous initialization
@@ -409,17 +624,6 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &hjstate->js.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	hjstate->js.ps.qual =
-		ExecInitQual(node->join.plan.qual, (PlanState *) hjstate);
-	hjstate->js.jointype = node->join.jointype;
-	hjstate->js.joinqual =
-		ExecInitQual(node->join.joinqual, (PlanState *) hjstate);
-	hjstate->hashclauses =
-		ExecInitQual(node->hashclauses, (PlanState *) hjstate);
-
 	/*
 	 * initialize child nodes
 	 *
@@ -431,13 +635,20 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 	hashNode = (Hash *) innerPlan(node);
 
 	outerPlanState(hjstate) = ExecInitNode(outerNode, estate, eflags);
+	outerDesc = ExecGetResultType(outerPlanState(hjstate));
 	innerPlanState(hjstate) = ExecInitNode((Plan *) hashNode, estate, eflags);
+	innerDesc = ExecGetResultType(innerPlanState(hjstate));
+
+	/*
+	 * Initialize result slot, type and projection.
+	 */
+	ExecInitResultTupleSlotTL(estate, &hjstate->js.ps);
+	ExecAssignProjectionInfo(&hjstate->js.ps, NULL);
 
 	/*
 	 * tuple table initialization
 	 */
-	ExecInitResultTupleSlot(estate, &hjstate->js.ps);
-	hjstate->hj_OuterTupleSlot = ExecInitExtraTupleSlot(estate);
+	hjstate->hj_OuterTupleSlot = ExecInitExtraTupleSlot(estate, outerDesc);
 
 	/*
 	 * detect whether we need only consider the first matching inner tuple
@@ -454,21 +665,17 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 		case JOIN_LEFT:
 		case JOIN_ANTI:
 			hjstate->hj_NullInnerTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(innerPlanState(hjstate)));
+				ExecInitNullTupleSlot(estate, innerDesc);
 			break;
 		case JOIN_RIGHT:
 			hjstate->hj_NullOuterTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(outerPlanState(hjstate)));
+				ExecInitNullTupleSlot(estate, outerDesc);
 			break;
 		case JOIN_FULL:
 			hjstate->hj_NullOuterTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(outerPlanState(hjstate)));
+				ExecInitNullTupleSlot(estate, outerDesc);
 			hjstate->hj_NullInnerTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(innerPlanState(hjstate)));
+				ExecInitNullTupleSlot(estate, innerDesc);
 			break;
 		default:
 			elog(ERROR, "unrecognized join type: %d",
@@ -490,13 +697,14 @@ ExecInitHashJoin(HashJoin *node, EState *estate, int eflags)
 	}
 
 	/*
-	 * initialize tuple type and projection info
+	 * initialize child expressions
 	 */
-	ExecAssignResultTypeFromTL(&hjstate->js.ps);
-	ExecAssignProjectionInfo(&hjstate->js.ps, NULL);
-
-	ExecSetSlotDescriptor(hjstate->hj_OuterTupleSlot,
-						  ExecGetResultType(outerPlanState(hjstate)));
+	hjstate->js.ps.qual =
+		ExecInitQual(node->join.plan.qual, (PlanState *) hjstate);
+	hjstate->js.joinqual =
+		ExecInitQual(node->join.joinqual, (PlanState *) hjstate);
+	hjstate->hashclauses =
+		ExecInitQual(node->hashclauses, (PlanState *) hjstate);
 
 	/*
 	 * initialize hash-specific info
@@ -581,9 +789,9 @@ ExecEndHashJoin(HashJoinState *node)
 /*
  * ExecHashJoinOuterGetTuple
  *
- *		get the next outer tuple for hashjoin: either by
- *		executing the outer plan node in the first pass, or from
- *		the temp files for the hashjoin batches.
+ *		get the next outer tuple for a parallel oblivious hashjoin: either by
+ *		executing the outer plan node in the first pass, or from the temp
+ *		files for the hashjoin batches.
  *
  * Returns a null slot if no more outer tuples (within the current batch).
  *
@@ -661,6 +869,67 @@ ExecHashJoinOuterGetTuple(PlanState *outerNode,
 	return NULL;
 }
 
+/*
+ * ExecHashJoinOuterGetTuple variant for the parallel case.
+ */
+static TupleTableSlot *
+ExecParallelHashJoinOuterGetTuple(PlanState *outerNode,
+								  HashJoinState *hjstate,
+								  uint32 *hashvalue)
+{
+	HashJoinTable hashtable = hjstate->hj_HashTable;
+	int			curbatch = hashtable->curbatch;
+	TupleTableSlot *slot;
+
+	/*
+	 * In the Parallel Hash case we only run the outer plan directly for
+	 * single-batch hash joins.  Otherwise we have to go to batch files, even
+	 * for batch 0.
+	 */
+	if (curbatch == 0 && hashtable->nbatch == 1)
+	{
+		slot = ExecProcNode(outerNode);
+
+		while (!TupIsNull(slot))
+		{
+			ExprContext *econtext = hjstate->js.ps.ps_ExprContext;
+
+			econtext->ecxt_outertuple = slot;
+			if (ExecHashGetHashValue(hashtable, econtext,
+									 hjstate->hj_OuterHashKeys,
+									 true,	/* outer tuple */
+									 HJ_FILL_OUTER(hjstate),
+									 hashvalue))
+				return slot;
+
+			/*
+			 * That tuple couldn't match because of a NULL, so discard it and
+			 * continue with the next one.
+			 */
+			slot = ExecProcNode(outerNode);
+		}
+	}
+	else if (curbatch < hashtable->nbatch)
+	{
+		MinimalTuple tuple;
+
+		tuple = sts_parallel_scan_next(hashtable->batches[curbatch].outer_tuples,
+									   hashvalue);
+		if (tuple != NULL)
+		{
+			slot = ExecStoreMinimalTuple(tuple,
+										 hjstate->hj_OuterTupleSlot,
+										 false);
+			return slot;
+		}
+		else
+			ExecClearTuple(hjstate->hj_OuterTupleSlot);
+	}
+
+	/* End of this batch */
+	return NULL;
+}
+
 /*
  * ExecHashJoinNewBatch
  *		switch to a new hashjoin batch
@@ -803,6 +1072,129 @@ ExecHashJoinNewBatch(HashJoinState *hjstate)
 	return true;
 }
 
+/*
+ * Choose a batch to work on, and attach to it.  Returns true if successful,
+ * false if there are no more batches.
+ */
+static bool
+ExecParallelHashJoinNewBatch(HashJoinState *hjstate)
+{
+	HashJoinTable hashtable = hjstate->hj_HashTable;
+	int			start_batchno;
+	int			batchno;
+
+	/*
+	 * If we started up so late that the batch tracking array has been freed
+	 * already by ExecHashTableDetach(), then we are finished.  See also
+	 * ExecParallelHashEnsureBatchAccessors().
+	 */
+	if (hashtable->batches == NULL)
+		return false;
+
+	/*
+	 * If we were already attached to a batch, remember not to bother checking
+	 * it again, and detach from it (possibly freeing the hash table if we are
+	 * last to detach).
+	 */
+	if (hashtable->curbatch >= 0)
+	{
+		hashtable->batches[hashtable->curbatch].done = true;
+		ExecHashTableDetachBatch(hashtable);
+	}
+
+	/*
+	 * Search for a batch that isn't done.  We use an atomic counter to start
+	 * our search at a different batch in every participant when there are
+	 * more batches than participants.
+	 */
+	batchno = start_batchno =
+		pg_atomic_fetch_add_u32(&hashtable->parallel_state->distributor, 1) %
+		hashtable->nbatch;
+	do
+	{
+		uint32		hashvalue;
+		MinimalTuple tuple;
+		TupleTableSlot *slot;
+
+		if (!hashtable->batches[batchno].done)
+		{
+			SharedTuplestoreAccessor *inner_tuples;
+			Barrier    *batch_barrier =
+			&hashtable->batches[batchno].shared->batch_barrier;
+
+			switch (BarrierAttach(batch_barrier))
+			{
+				case PHJ_BATCH_ELECTING:
+
+					/* One backend allocates the hash table. */
+					if (BarrierArriveAndWait(batch_barrier,
+											 WAIT_EVENT_HASH_BATCH_ELECTING))
+						ExecParallelHashTableAlloc(hashtable, batchno);
+					/* Fall through. */
+
+				case PHJ_BATCH_ALLOCATING:
+					/* Wait for allocation to complete. */
+					BarrierArriveAndWait(batch_barrier,
+										 WAIT_EVENT_HASH_BATCH_ALLOCATING);
+					/* Fall through. */
+
+				case PHJ_BATCH_LOADING:
+					/* Start (or join in) loading tuples. */
+					ExecParallelHashTableSetCurrentBatch(hashtable, batchno);
+					inner_tuples = hashtable->batches[batchno].inner_tuples;
+					sts_begin_parallel_scan(inner_tuples);
+					while ((tuple = sts_parallel_scan_next(inner_tuples,
+														   &hashvalue)))
+					{
+						slot = ExecStoreMinimalTuple(tuple,
+													 hjstate->hj_HashTupleSlot,
+													 false);
+						ExecParallelHashTableInsertCurrentBatch(hashtable, slot,
+																hashvalue);
+					}
+					sts_end_parallel_scan(inner_tuples);
+					BarrierArriveAndWait(batch_barrier,
+										 WAIT_EVENT_HASH_BATCH_LOADING);
+					/* Fall through. */
+
+				case PHJ_BATCH_PROBING:
+
+					/*
+					 * This batch is ready to probe.  Return control to
+					 * caller. We stay attached to batch_barrier so that the
+					 * hash table stays alive until everyone's finished
+					 * probing it, but no participant is allowed to wait at
+					 * this barrier again (or else a deadlock could occur).
+					 * All attached participants must eventually call
+					 * BarrierArriveAndDetach() so that the final phase
+					 * PHJ_BATCH_DONE can be reached.
+					 */
+					ExecParallelHashTableSetCurrentBatch(hashtable, batchno);
+					sts_begin_parallel_scan(hashtable->batches[batchno].outer_tuples);
+					return true;
+
+				case PHJ_BATCH_DONE:
+
+					/*
+					 * Already done.  Detach and go around again (if any
+					 * remain).
+					 */
+					BarrierDetach(batch_barrier);
+					hashtable->batches[batchno].done = true;
+					hashtable->curbatch = -1;
+					break;
+
+				default:
+					elog(ERROR, "unexpected batch phase %d",
+						 BarrierPhase(batch_barrier));
+			}
+		}
+		batchno = (batchno + 1) % hashtable->nbatch;
+	} while (batchno != start_batchno);
+
+	return false;
+}
+
 /*
  * ExecHashJoinSaveTuple
  *		save a tuple to a batch file.
@@ -964,3 +1356,176 @@ ExecReScanHashJoin(HashJoinState *node)
 	if (node->js.ps.lefttree->chgParam == NULL)
 		ExecReScan(node->js.ps.lefttree);
 }
+
+void
+ExecShutdownHashJoin(HashJoinState *node)
+{
+	if (node->hj_HashTable)
+	{
+		/*
+		 * Detach from shared state before DSM memory goes away.  This makes
+		 * sure that we don't have any pointers into DSM memory by the time
+		 * ExecEndHashJoin runs.
+		 */
+		ExecHashTableDetachBatch(node->hj_HashTable);
+		ExecHashTableDetach(node->hj_HashTable);
+	}
+}
+
+static void
+ExecParallelHashJoinPartitionOuter(HashJoinState *hjstate)
+{
+	PlanState  *outerState = outerPlanState(hjstate);
+	ExprContext *econtext = hjstate->js.ps.ps_ExprContext;
+	HashJoinTable hashtable = hjstate->hj_HashTable;
+	TupleTableSlot *slot;
+	uint32		hashvalue;
+	int			i;
+
+	Assert(hjstate->hj_FirstOuterTupleSlot == NULL);
+
+	/* Execute outer plan, writing all tuples to shared tuplestores. */
+	for (;;)
+	{
+		slot = ExecProcNode(outerState);
+		if (TupIsNull(slot))
+			break;
+		econtext->ecxt_outertuple = slot;
+		if (ExecHashGetHashValue(hashtable, econtext,
+								 hjstate->hj_OuterHashKeys,
+								 true,	/* outer tuple */
+								 false, /* outer join, currently unsupported */
+								 &hashvalue))
+		{
+			int			batchno;
+			int			bucketno;
+
+			ExecHashGetBucketAndBatch(hashtable, hashvalue, &bucketno,
+									  &batchno);
+			sts_puttuple(hashtable->batches[batchno].outer_tuples,
+						 &hashvalue, ExecFetchSlotMinimalTuple(slot));
+		}
+		CHECK_FOR_INTERRUPTS();
+	}
+
+	/* Make sure all outer partitions are readable by any backend. */
+	for (i = 0; i < hashtable->nbatch; ++i)
+		sts_end_write(hashtable->batches[i].outer_tuples);
+}
+
+void
+ExecHashJoinEstimate(HashJoinState *state, ParallelContext *pcxt)
+{
+	shm_toc_estimate_chunk(&pcxt->estimator, sizeof(ParallelHashJoinState));
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+}
+
+void
+ExecHashJoinInitializeDSM(HashJoinState *state, ParallelContext *pcxt)
+{
+	int			plan_node_id = state->js.ps.plan->plan_node_id;
+	HashState  *hashNode;
+	ParallelHashJoinState *pstate;
+
+	/*
+	 * Disable shared hash table mode if we failed to create a real DSM
+	 * segment, because that means that we don't have a DSA area to work with.
+	 */
+	if (pcxt->seg == NULL)
+		return;
+
+	ExecSetExecProcNode(&state->js.ps, ExecParallelHashJoin);
+
+	/*
+	 * Set up the state needed to coordinate access to the shared hash
+	 * table(s), using the plan node ID as the toc key.
+	 */
+	pstate = shm_toc_allocate(pcxt->toc, sizeof(ParallelHashJoinState));
+	shm_toc_insert(pcxt->toc, plan_node_id, pstate);
+
+	/*
+	 * Set up the shared hash join state with no batches initially.
+	 * ExecHashTableCreate() will prepare at least one later and set nbatch
+	 * and space_allowed.
+	 */
+	pstate->nbatch = 0;
+	pstate->space_allowed = 0;
+	pstate->batches = InvalidDsaPointer;
+	pstate->old_batches = InvalidDsaPointer;
+	pstate->nbuckets = 0;
+	pstate->growth = PHJ_GROWTH_OK;
+	pstate->chunk_work_queue = InvalidDsaPointer;
+	pg_atomic_init_u32(&pstate->distributor, 0);
+	pstate->nparticipants = pcxt->nworkers + 1;
+	pstate->total_tuples = 0;
+	LWLockInitialize(&pstate->lock,
+					 LWTRANCHE_PARALLEL_HASH_JOIN);
+	BarrierInit(&pstate->build_barrier, 0);
+	BarrierInit(&pstate->grow_batches_barrier, 0);
+	BarrierInit(&pstate->grow_buckets_barrier, 0);
+
+	/* Set up the space we'll use for shared temporary files. */
+	SharedFileSetInit(&pstate->fileset, pcxt->seg);
+
+	/* Initialize the shared state in the hash node. */
+	hashNode = (HashState *) innerPlanState(state);
+	hashNode->parallel_state = pstate;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecHashJoinReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *cxt)
+{
+	int			plan_node_id = state->js.ps.plan->plan_node_id;
+	ParallelHashJoinState *pstate =
+	shm_toc_lookup(cxt->toc, plan_node_id, false);
+
+	/*
+	 * It would be possible to reuse the shared hash table in single-batch
+	 * cases by resetting and then fast-forwarding build_barrier to
+	 * PHJ_BUILD_DONE and batch 0's batch_barrier to PHJ_BATCH_PROBING, but
+	 * currently shared hash tables are already freed by now (by the last
+	 * participant to detach from the batch).  We could consider keeping it
+	 * around for single-batch joins.  We'd also need to adjust
+	 * finalize_plan() so that it doesn't record a dummy dependency for
+	 * Parallel Hash nodes, preventing the rescan optimization.  For now we
+	 * don't try.
+	 */
+
+	/* Detach, freeing any remaining shared memory. */
+	if (state->hj_HashTable != NULL)
+	{
+		ExecHashTableDetachBatch(state->hj_HashTable);
+		ExecHashTableDetach(state->hj_HashTable);
+	}
+
+	/* Clear any shared batch files. */
+	SharedFileSetDeleteAll(&pstate->fileset);
+
+	/* Reset build_barrier to PHJ_BUILD_ELECTING so we can go around again. */
+	BarrierInit(&pstate->build_barrier, 0);
+}
+
+void
+ExecHashJoinInitializeWorker(HashJoinState *state,
+							 ParallelWorkerContext *pwcxt)
+{
+	HashState  *hashNode;
+	int			plan_node_id = state->js.ps.plan->plan_node_id;
+	ParallelHashJoinState *pstate =
+	shm_toc_lookup(pwcxt->toc, plan_node_id, false);
+
+	/* Attach to the space for shared temporary files. */
+	SharedFileSetAttach(&pstate->fileset, pwcxt->seg);
+
+	/* Attach to the shared state in the hash node. */
+	hashNode = (HashState *) innerPlanState(state);
+	hashNode->parallel_state = pstate;
+
+	ExecSetExecProcNode(&state->js.ps, ExecParallelHashJoin);
+}
diff --git a/src/backend/executor/nodeIndexonlyscan.c b/src/backend/executor/nodeIndexonlyscan.c
index fe7ba3f1a4..ddc0ae9061 100644
--- a/src/backend/executor/nodeIndexonlyscan.c
+++ b/src/backend/executor/nodeIndexonlyscan.c
@@ -3,7 +3,7 @@
  * nodeIndexonlyscan.c
  *	  Routines to support index-only scans
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -25,6 +25,7 @@
  *						parallel index-only scan
  *		ExecIndexOnlyScanInitializeDSM	initialize DSM for parallel
  *						index-only scan
+ *		ExecIndexOnlyScanReInitializeDSM	reinitialize DSM for fresh scan
  *		ExecIndexOnlyScanInitializeWorker attach to DSM info in parallel worker
  */
 #include "postgres.h"
@@ -213,8 +214,7 @@ IndexOnlyNext(IndexOnlyScanState *node)
 		if (scandesc->xs_recheck)
 		{
 			econtext->ecxt_scantuple = slot;
-			ResetExprContext(econtext);
-			if (!ExecQual(node->indexqual, econtext))
+			if (!ExecQualAndReset(node->indexqual, econtext))
 			{
 				/* Fails recheck, so drop it and loop back for another */
 				InstrCountFiltered2(node, 1);
@@ -336,16 +336,6 @@ ExecIndexOnlyScan(PlanState *pstate)
 void
 ExecReScanIndexOnlyScan(IndexOnlyScanState *node)
 {
-	bool		reset_parallel_scan = true;
-
-	/*
-	 * If we are here to just update the scan keys, then don't reset parallel
-	 * scan. For detailed reason behind this look in the comments for
-	 * ExecReScanIndexScan.
-	 */
-	if (node->ioss_NumRuntimeKeys != 0 && !node->ioss_RuntimeKeysReady)
-		reset_parallel_scan = false;
-
 	/*
 	 * If we are doing runtime key calculations (ie, any of the index key
 	 * values weren't simple Consts), compute the new key values.  But first,
@@ -366,15 +356,10 @@ ExecReScanIndexOnlyScan(IndexOnlyScanState *node)
 
 	/* reset index scan */
 	if (node->ioss_ScanDesc)
-	{
-
 		index_rescan(node->ioss_ScanDesc,
 					 node->ioss_ScanKeys, node->ioss_NumScanKeys,
 					 node->ioss_OrderByKeys, node->ioss_NumOrderByKeys);
 
-		if (reset_parallel_scan && node->ioss_ScanDesc->parallel_scan)
-			index_parallelrescan(node->ioss_ScanDesc);
-	}
 	ExecScanReScan(&node->ss);
 }
 
@@ -435,11 +420,39 @@ ExecEndIndexOnlyScan(IndexOnlyScanState *node)
 
 /* ----------------------------------------------------------------
  *		ExecIndexOnlyMarkPos
+ *
+ * Note: we assume that no caller attempts to set a mark before having read
+ * at least one tuple.  Otherwise, ioss_ScanDesc might still be NULL.
  * ----------------------------------------------------------------
  */
 void
 ExecIndexOnlyMarkPos(IndexOnlyScanState *node)
 {
+	EState	   *estate = node->ss.ps.state;
+
+	if (estate->es_epqTuple != NULL)
+	{
+		/*
+		 * We are inside an EvalPlanQual recheck.  If a test tuple exists for
+		 * this relation, then we shouldn't access the index at all.  We would
+		 * instead need to save, and later restore, the state of the
+		 * es_epqScanDone flag, so that re-fetching the test tuple is
+		 * possible.  However, given the assumption that no caller sets a mark
+		 * at the start of the scan, we can only get here with es_epqScanDone
+		 * already set, and so no state need be saved.
+		 */
+		Index		scanrelid = ((Scan *) node->ss.ps.plan)->scanrelid;
+
+		Assert(scanrelid > 0);
+		if (estate->es_epqTupleSet[scanrelid - 1])
+		{
+			/* Verify the claim above */
+			if (!estate->es_epqScanDone[scanrelid - 1])
+				elog(ERROR, "unexpected ExecIndexOnlyMarkPos call in EPQ recheck");
+			return;
+		}
+	}
+
 	index_markpos(node->ioss_ScanDesc);
 }
 
@@ -450,6 +463,23 @@ ExecIndexOnlyMarkPos(IndexOnlyScanState *node)
 void
 ExecIndexOnlyRestrPos(IndexOnlyScanState *node)
 {
+	EState	   *estate = node->ss.ps.state;
+
+	if (estate->es_epqTuple != NULL)
+	{
+		/* See comments in ExecIndexOnlyMarkPos */
+		Index		scanrelid = ((Scan *) node->ss.ps.plan)->scanrelid;
+
+		Assert(scanrelid > 0);
+		if (estate->es_epqTupleSet[scanrelid - 1])
+		{
+			/* Verify the claim above */
+			if (!estate->es_epqScanDone[scanrelid - 1])
+				elog(ERROR, "unexpected ExecIndexOnlyRestrPos call in EPQ recheck");
+			return;
+		}
+	}
+
 	index_restrpos(node->ioss_ScanDesc);
 }
 
@@ -488,23 +518,6 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &indexstate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 *
-	 * Note: we don't initialize all of the indexorderby expression, only the
-	 * sub-parts corresponding to runtime keys (see below).
-	 */
-	indexstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) indexstate);
-	indexstate->indexqual =
-		ExecInitQual(node->indexqual, (PlanState *) indexstate);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &indexstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &indexstate->ss);
-
 	/*
 	 * open the base relation and acquire appropriate lock on it.
 	 */
@@ -521,16 +534,27 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 	 * suitable data anyway.)
 	 */
 	tupDesc = ExecTypeFromTL(node->indextlist, false);
-	ExecAssignScanType(&indexstate->ss, tupDesc);
+	ExecInitScanTupleSlot(estate, &indexstate->ss, tupDesc);
 
 	/*
-	 * Initialize result tuple type and projection info.  The node's
+	 * Initialize result slot, type and projection info.  The node's
 	 * targetlist will contain Vars with varno = INDEX_VAR, referencing the
 	 * scan tuple.
 	 */
-	ExecAssignResultTypeFromTL(&indexstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &indexstate->ss.ps);
 	ExecAssignScanProjectionInfoWithVarno(&indexstate->ss, INDEX_VAR);
 
+	/*
+	 * initialize child expressions
+	 *
+	 * Note: we don't initialize all of the indexorderby expression, only the
+	 * sub-parts corresponding to runtime keys (see below).
+	 */
+	indexstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) indexstate);
+	indexstate->indexqual =
+		ExecInitQual(node->indexqual, (PlanState *) indexstate);
+
 	/*
 	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
 	 * here.  This allows an index-advisor plugin to EXPLAIN a plan containing
@@ -618,7 +642,8 @@ ExecInitIndexOnlyScan(IndexOnlyScan *node, EState *estate, int eflags)
 /* ----------------------------------------------------------------
  *		ExecIndexOnlyScanEstimate
  *
- *	estimates the space required to serialize index-only scan node.
+ *		Compute the amount of space we'll need in the parallel
+ *		query DSM, and inform pcxt->estimator about our needs.
  * ----------------------------------------------------------------
  */
 void
@@ -671,6 +696,19 @@ ExecIndexOnlyScanInitializeDSM(IndexOnlyScanState *node,
 					 node->ioss_OrderByKeys, node->ioss_NumOrderByKeys);
 }
 
+/* ----------------------------------------------------------------
+ *		ExecIndexOnlyScanReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecIndexOnlyScanReInitializeDSM(IndexOnlyScanState *node,
+								 ParallelContext *pcxt)
+{
+	index_parallelrescan(node->ioss_ScanDesc);
+}
+
 /* ----------------------------------------------------------------
  *		ExecIndexOnlyScanInitializeWorker
  *
@@ -678,11 +716,12 @@ ExecIndexOnlyScanInitializeDSM(IndexOnlyScanState *node,
  * ----------------------------------------------------------------
  */
 void
-ExecIndexOnlyScanInitializeWorker(IndexOnlyScanState *node, shm_toc *toc)
+ExecIndexOnlyScanInitializeWorker(IndexOnlyScanState *node,
+								  ParallelWorkerContext *pwcxt)
 {
 	ParallelIndexScanDesc piscan;
 
-	piscan = shm_toc_lookup(toc, node->ss.ps.plan->plan_node_id, false);
+	piscan = shm_toc_lookup(pwcxt->toc, node->ss.ps.plan->plan_node_id, false);
 	node->ioss_ScanDesc =
 		index_beginscan_parallel(node->ss.ss_currentRelation,
 								 node->ioss_RelationDesc,
diff --git a/src/backend/executor/nodeIndexscan.c b/src/backend/executor/nodeIndexscan.c
index 404076d593..01c9de88f4 100644
--- a/src/backend/executor/nodeIndexscan.c
+++ b/src/backend/executor/nodeIndexscan.c
@@ -3,7 +3,7 @@
  * nodeIndexscan.c
  *	  Routines to support indexed scans of relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -24,6 +24,7 @@
  *		ExecIndexRestrPos		restores scan position.
  *		ExecIndexScanEstimate	estimates DSM space needed for parallel index scan
  *		ExecIndexScanInitializeDSM initialize DSM for parallel indexscan
+ *		ExecIndexScanReInitializeDSM reinitialize DSM for fresh scan
  *		ExecIndexScanInitializeWorker attach to DSM info in parallel worker
  */
 #include "postgres.h"
@@ -151,8 +152,7 @@ IndexNext(IndexScanState *node)
 		if (scandesc->xs_recheck)
 		{
 			econtext->ecxt_scantuple = slot;
-			ResetExprContext(econtext);
-			if (!ExecQual(node->indexqualorig, econtext))
+			if (!ExecQualAndReset(node->indexqualorig, econtext))
 			{
 				/* Fails recheck, so drop it and loop back for another */
 				InstrCountFiltered2(node, 1);
@@ -299,8 +299,7 @@ IndexNextWithReorder(IndexScanState *node)
 		if (scandesc->xs_recheck)
 		{
 			econtext->ecxt_scantuple = slot;
-			ResetExprContext(econtext);
-			if (!ExecQual(node->indexqualorig, econtext))
+			if (!ExecQualAndReset(node->indexqualorig, econtext))
 			{
 				/* Fails recheck, so drop it and loop back for another */
 				InstrCountFiltered2(node, 1);
@@ -419,10 +418,7 @@ IndexRecheck(IndexScanState *node, TupleTableSlot *slot)
 
 	/* Does the tuple meet the indexqual condition? */
 	econtext->ecxt_scantuple = slot;
-
-	ResetExprContext(econtext);
-
-	return ExecQual(node->indexqualorig, econtext);
+	return ExecQualAndReset(node->indexqualorig, econtext);
 }
 
 
@@ -577,18 +573,6 @@ ExecIndexScan(PlanState *pstate)
 void
 ExecReScanIndexScan(IndexScanState *node)
 {
-	bool		reset_parallel_scan = true;
-
-	/*
-	 * If we are here to just update the scan keys, then don't reset parallel
-	 * scan.  We don't want each of the participating process in the parallel
-	 * scan to update the shared parallel scan state at the start of the scan.
-	 * It is quite possible that one of the participants has already begun
-	 * scanning the index when another has yet to start it.
-	 */
-	if (node->iss_NumRuntimeKeys != 0 && !node->iss_RuntimeKeysReady)
-		reset_parallel_scan = false;
-
 	/*
 	 * If we are doing runtime key calculations (ie, any of the index key
 	 * values weren't simple Consts), compute the new key values.  But first,
@@ -614,21 +598,11 @@ ExecReScanIndexScan(IndexScanState *node)
 			reorderqueue_pop(node);
 	}
 
-	/*
-	 * Reset (parallel) index scan.  For parallel-aware nodes, the scan
-	 * descriptor is initialized during actual execution of node and we can
-	 * reach here before that (ex. during execution of nest loop join).  So,
-	 * avoid updating the scan descriptor at that time.
-	 */
+	/* reset index scan */
 	if (node->iss_ScanDesc)
-	{
 		index_rescan(node->iss_ScanDesc,
 					 node->iss_ScanKeys, node->iss_NumScanKeys,
 					 node->iss_OrderByKeys, node->iss_NumOrderByKeys);
-
-		if (reset_parallel_scan && node->iss_ScanDesc->parallel_scan)
-			index_parallelrescan(node->iss_ScanDesc);
-	}
 	node->iss_ReachedEnd = false;
 
 	ExecScanReScan(&node->ss);
@@ -697,8 +671,8 @@ ExecIndexEvalRuntimeKeys(ExprContext *econtext,
  * ExecIndexEvalArrayKeys
  *		Evaluate any array key values, and set up to iterate through arrays.
  *
- * Returns TRUE if there are array elements to consider; FALSE means there
- * is at least one null or empty array, so no match is possible.  On TRUE
+ * Returns true if there are array elements to consider; false means there
+ * is at least one null or empty array, so no match is possible.  On true
  * result, the scankeys are initialized with the first elements of the arrays.
  */
 bool
@@ -777,8 +751,8 @@ ExecIndexEvalArrayKeys(ExprContext *econtext,
  * ExecIndexAdvanceArrayKeys
  *		Advance to the next set of array key values, if any.
  *
- * Returns TRUE if there is another set of values to consider, FALSE if not.
- * On TRUE result, the scankeys are initialized with the next set of values.
+ * Returns true if there is another set of values to consider, false if not.
+ * On true result, the scankeys are initialized with the next set of values.
  */
 bool
 ExecIndexAdvanceArrayKeys(IndexArrayKeyInfo *arrayKeys, int numArrayKeys)
@@ -870,11 +844,39 @@ ExecEndIndexScan(IndexScanState *node)
 
 /* ----------------------------------------------------------------
  *		ExecIndexMarkPos
+ *
+ * Note: we assume that no caller attempts to set a mark before having read
+ * at least one tuple.  Otherwise, iss_ScanDesc might still be NULL.
  * ----------------------------------------------------------------
  */
 void
 ExecIndexMarkPos(IndexScanState *node)
 {
+	EState	   *estate = node->ss.ps.state;
+
+	if (estate->es_epqTuple != NULL)
+	{
+		/*
+		 * We are inside an EvalPlanQual recheck.  If a test tuple exists for
+		 * this relation, then we shouldn't access the index at all.  We would
+		 * instead need to save, and later restore, the state of the
+		 * es_epqScanDone flag, so that re-fetching the test tuple is
+		 * possible.  However, given the assumption that no caller sets a mark
+		 * at the start of the scan, we can only get here with es_epqScanDone
+		 * already set, and so no state need be saved.
+		 */
+		Index		scanrelid = ((Scan *) node->ss.ps.plan)->scanrelid;
+
+		Assert(scanrelid > 0);
+		if (estate->es_epqTupleSet[scanrelid - 1])
+		{
+			/* Verify the claim above */
+			if (!estate->es_epqScanDone[scanrelid - 1])
+				elog(ERROR, "unexpected ExecIndexMarkPos call in EPQ recheck");
+			return;
+		}
+	}
+
 	index_markpos(node->iss_ScanDesc);
 }
 
@@ -885,6 +887,23 @@ ExecIndexMarkPos(IndexScanState *node)
 void
 ExecIndexRestrPos(IndexScanState *node)
 {
+	EState	   *estate = node->ss.ps.state;
+
+	if (estate->es_epqTuple != NULL)
+	{
+		/* See comments in ExecIndexMarkPos */
+		Index		scanrelid = ((Scan *) node->ss.ps.plan)->scanrelid;
+
+		Assert(scanrelid > 0);
+		if (estate->es_epqTupleSet[scanrelid - 1])
+		{
+			/* Verify the claim above */
+			if (!estate->es_epqScanDone[scanrelid - 1])
+				elog(ERROR, "unexpected ExecIndexRestrPos call in EPQ recheck");
+			return;
+		}
+	}
+
 	index_restrpos(node->iss_ScanDesc);
 }
 
@@ -921,6 +940,26 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &indexstate->ss.ps);
 
+	/*
+	 * open the base relation and acquire appropriate lock on it.
+	 */
+	currentRelation = ExecOpenScanRelation(estate, node->scan.scanrelid, eflags);
+
+	indexstate->ss.ss_currentRelation = currentRelation;
+	indexstate->ss.ss_currentScanDesc = NULL;	/* no heap scan here */
+
+	/*
+	 * get the scan type from the relation descriptor.
+	 */
+	ExecInitScanTupleSlot(estate, &indexstate->ss,
+						  RelationGetDescr(currentRelation));
+
+	/*
+	 * Initialize result slot, type and projection.
+	 */
+	ExecInitResultTupleSlotTL(estate, &indexstate->ss.ps);
+	ExecAssignScanProjectionInfo(&indexstate->ss);
+
 	/*
 	 * initialize child expressions
 	 *
@@ -938,31 +977,6 @@ ExecInitIndexScan(IndexScan *node, EState *estate, int eflags)
 	indexstate->indexorderbyorig =
 		ExecInitExprList(node->indexorderbyorig, (PlanState *) indexstate);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &indexstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &indexstate->ss);
-
-	/*
-	 * open the base relation and acquire appropriate lock on it.
-	 */
-	currentRelation = ExecOpenScanRelation(estate, node->scan.scanrelid, eflags);
-
-	indexstate->ss.ss_currentRelation = currentRelation;
-	indexstate->ss.ss_currentScanDesc = NULL;	/* no heap scan here */
-
-	/*
-	 * get the scan type from the relation descriptor.
-	 */
-	ExecAssignScanType(&indexstate->ss, RelationGetDescr(currentRelation));
-
-	/*
-	 * Initialize result tuple type and projection info.
-	 */
-	ExecAssignResultTypeFromTL(&indexstate->ss.ps);
-	ExecAssignScanProjectionInfo(&indexstate->ss);
-
 	/*
 	 * If we are just doing EXPLAIN (ie, aren't going to run the plan), stop
 	 * here.  This allows an index-advisor plugin to EXPLAIN a plan containing
@@ -1665,7 +1679,8 @@ ExecIndexBuildScanKeys(PlanState *planstate, Relation index,
 /* ----------------------------------------------------------------
  *		ExecIndexScanEstimate
  *
- *		estimates the space required to serialize indexscan node.
+ *		Compute the amount of space we'll need in the parallel
+ *		query DSM, and inform pcxt->estimator about our needs.
  * ----------------------------------------------------------------
  */
 void
@@ -1716,6 +1731,19 @@ ExecIndexScanInitializeDSM(IndexScanState *node,
 					 node->iss_OrderByKeys, node->iss_NumOrderByKeys);
 }
 
+/* ----------------------------------------------------------------
+ *		ExecIndexScanReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecIndexScanReInitializeDSM(IndexScanState *node,
+							 ParallelContext *pcxt)
+{
+	index_parallelrescan(node->iss_ScanDesc);
+}
+
 /* ----------------------------------------------------------------
  *		ExecIndexScanInitializeWorker
  *
@@ -1723,11 +1751,12 @@ ExecIndexScanInitializeDSM(IndexScanState *node,
  * ----------------------------------------------------------------
  */
 void
-ExecIndexScanInitializeWorker(IndexScanState *node, shm_toc *toc)
+ExecIndexScanInitializeWorker(IndexScanState *node,
+							  ParallelWorkerContext *pwcxt)
 {
 	ParallelIndexScanDesc piscan;
 
-	piscan = shm_toc_lookup(toc, node->ss.ps.plan->plan_node_id, false);
+	piscan = shm_toc_lookup(pwcxt->toc, node->ss.ps.plan->plan_node_id, false);
 	node->iss_ScanDesc =
 		index_beginscan_parallel(node->ss.ss_currentRelation,
 								 node->iss_RelationDesc,
diff --git a/src/backend/executor/nodeLimit.c b/src/backend/executor/nodeLimit.c
index ac5a2ff0e6..56d98b4490 100644
--- a/src/backend/executor/nodeLimit.c
+++ b/src/backend/executor/nodeLimit.c
@@ -3,7 +3,7 @@
  * nodeLimit.c
  *	  Routines to handle limiting of query results where appropriate
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -27,7 +27,7 @@
 #include "nodes/nodeFuncs.h"
 
 static void recompute_limits(LimitState *node);
-static void pass_down_bound(LimitState *node, PlanState *child_node);
+static int64 compute_tuples_needed(LimitState *node);
 
 
 /* ----------------------------------------------------------------
@@ -297,64 +297,26 @@ recompute_limits(LimitState *node)
 	/* Set state-machine state */
 	node->lstate = LIMIT_RESCAN;
 
-	/* Notify child node about limit, if useful */
-	pass_down_bound(node, outerPlanState(node));
+	/*
+	 * Notify child node about limit.  Note: think not to "optimize" by
+	 * skipping ExecSetTupleBound if compute_tuples_needed returns < 0.  We
+	 * must update the child node anyway, in case this is a rescan and the
+	 * previous time we got a different result.
+	 */
+	ExecSetTupleBound(compute_tuples_needed(node), outerPlanState(node));
 }
 
 /*
- * If we have a COUNT, and our input is a Sort node, notify it that it can
- * use bounded sort.  Also, if our input is a MergeAppend, we can apply the
- * same bound to any Sorts that are direct children of the MergeAppend,
- * since the MergeAppend surely need read no more than that many tuples from
- * any one input.  We also have to be prepared to look through a Result,
- * since the planner might stick one atop MergeAppend for projection purposes.
- *
- * This is a bit of a kluge, but we don't have any more-abstract way of
- * communicating between the two nodes; and it doesn't seem worth trying
- * to invent one without some more examples of special communication needs.
- *
- * Note: it is the responsibility of nodeSort.c to react properly to
- * changes of these parameters.  If we ever do redesign this, it'd be a
- * good idea to integrate this signaling with the parameter-change mechanism.
+ * Compute the maximum number of tuples needed to satisfy this Limit node.
+ * Return a negative value if there is not a determinable limit.
  */
-static void
-pass_down_bound(LimitState *node, PlanState *child_node)
+static int64
+compute_tuples_needed(LimitState *node)
 {
-	if (IsA(child_node, SortState))
-	{
-		SortState  *sortState = (SortState *) child_node;
-		int64		tuples_needed = node->count + node->offset;
-
-		/* negative test checks for overflow in sum */
-		if (node->noCount || tuples_needed < 0)
-		{
-			/* make sure flag gets reset if needed upon rescan */
-			sortState->bounded = false;
-		}
-		else
-		{
-			sortState->bounded = true;
-			sortState->bound = tuples_needed;
-		}
-	}
-	else if (IsA(child_node, MergeAppendState))
-	{
-		MergeAppendState *maState = (MergeAppendState *) child_node;
-		int			i;
-
-		for (i = 0; i < maState->ms_nplans; i++)
-			pass_down_bound(node, maState->mergeplans[i]);
-	}
-	else if (IsA(child_node, ResultState))
-	{
-		/*
-		 * If Result supported qual checking, we'd have to punt on seeing a
-		 * qual.  Note that having a resconstantqual is not a showstopper: if
-		 * that fails we're not getting any rows at all.
-		 */
-		if (outerPlanState(child_node))
-			pass_down_bound(node, outerPlanState(child_node));
-	}
+	if (node->noCount)
+		return -1;
+	/* Note: if this overflows, we'll return a negative value, which is OK */
+	return node->count + node->offset;
 }
 
 /* ----------------------------------------------------------------
@@ -391,6 +353,12 @@ ExecInitLimit(Limit *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &limitstate->ps);
 
+	/*
+	 * initialize outer plan
+	 */
+	outerPlan = outerPlan(node);
+	outerPlanState(limitstate) = ExecInitNode(outerPlan, estate, eflags);
+
 	/*
 	 * initialize child expressions
 	 */
@@ -400,21 +368,15 @@ ExecInitLimit(Limit *node, EState *estate, int eflags)
 										  (PlanState *) limitstate);
 
 	/*
-	 * Tuple table initialization (XXX not actually used...)
+	 * Initialize result slot and type. (XXX not actually used, but upper
+	 * nodes access it to get this node's result tupledesc...)
 	 */
-	ExecInitResultTupleSlot(estate, &limitstate->ps);
-
-	/*
-	 * then initialize outer plan
-	 */
-	outerPlan = outerPlan(node);
-	outerPlanState(limitstate) = ExecInitNode(outerPlan, estate, eflags);
+	ExecInitResultTupleSlotTL(estate, &limitstate->ps);
 
 	/*
 	 * limit nodes do no projections, so initialize projection info for this
 	 * node appropriately
 	 */
-	ExecAssignResultTypeFromTL(&limitstate->ps);
 	limitstate->ps.ps_ProjInfo = NULL;
 
 	return limitstate;
diff --git a/src/backend/executor/nodeLockRows.c b/src/backend/executor/nodeLockRows.c
index 93895600a5..b39ccf7dc1 100644
--- a/src/backend/executor/nodeLockRows.c
+++ b/src/backend/executor/nodeLockRows.c
@@ -3,7 +3,7 @@
  * nodeLockRows.c
  *	  Routines to handle FOR UPDATE/FOR SHARE row locking
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -370,13 +370,15 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
 	/*
 	 * Miscellaneous initialization
 	 *
-	 * LockRows nodes never call ExecQual or ExecProject.
+	 * LockRows nodes never call ExecQual or ExecProject, therefore no
+	 * ExprContext is needed.
 	 */
 
 	/*
-	 * Tuple table initialization (XXX not actually used...)
+	 * Tuple table initialization (XXX not actually used, but upper nodes
+	 * access it to get this node's result tupledesc...)
 	 */
-	ExecInitResultTupleSlot(estate, &lrstate->ps);
+	ExecInitResultTupleSlotTL(estate, &lrstate->ps);
 
 	/*
 	 * then initialize outer plan
@@ -387,7 +389,6 @@ ExecInitLockRows(LockRows *node, EState *estate, int eflags)
 	 * LockRows nodes do no projections, so initialize projection info for
 	 * this node appropriately
 	 */
-	ExecAssignResultTypeFromTL(&lrstate->ps);
 	lrstate->ps.ps_ProjInfo = NULL;
 
 	/*
diff --git a/src/backend/executor/nodeMaterial.c b/src/backend/executor/nodeMaterial.c
index 91178f1019..8c2e57dbd0 100644
--- a/src/backend/executor/nodeMaterial.c
+++ b/src/backend/executor/nodeMaterial.c
@@ -3,7 +3,7 @@
  * nodeMaterial.c
  *	  Routines to handle materialization nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -206,14 +206,6 @@ ExecInitMaterial(Material *node, EState *estate, int eflags)
 	 * ExecQual or ExecProject.
 	 */
 
-	/*
-	 * tuple table initialization
-	 *
-	 * material nodes only return tuples from their materialized relation.
-	 */
-	ExecInitResultTupleSlot(estate, &matstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &matstate->ss);
-
 	/*
 	 * initialize child nodes
 	 *
@@ -226,13 +218,19 @@ ExecInitMaterial(Material *node, EState *estate, int eflags)
 	outerPlanState(matstate) = ExecInitNode(outerPlan, estate, eflags);
 
 	/*
-	 * initialize tuple type.  no need to initialize projection info because
-	 * this node doesn't do projections.
+	 * Initialize result type and slot. No need to initialize projection info
+	 * because this node doesn't do projections.
+	 *
+	 * material nodes only return tuples from their materialized relation.
 	 */
-	ExecAssignResultTypeFromTL(&matstate->ss.ps);
-	ExecAssignScanTypeFromOuterPlan(&matstate->ss);
+	ExecInitResultTupleSlotTL(estate, &matstate->ss.ps);
 	matstate->ss.ps.ps_ProjInfo = NULL;
 
+	/*
+	 * initialize tuple type.
+	 */
+	ExecCreateScanSlotFromOuterPlan(estate, &matstate->ss);
+
 	return matstate;
 }
 
diff --git a/src/backend/executor/nodeMergeAppend.c b/src/backend/executor/nodeMergeAppend.c
index 6bf490bd70..118f4ef07d 100644
--- a/src/backend/executor/nodeMergeAppend.c
+++ b/src/backend/executor/nodeMergeAppend.c
@@ -3,7 +3,7 @@
  * nodeMergeAppend.c
  *	  routines to handle MergeAppend nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -109,7 +109,7 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
 	 * MergeAppend nodes do have Result slots, which hold pointers to tuples,
 	 * so we have to initialize them.
 	 */
-	ExecInitResultTupleSlot(estate, &mergestate->ps);
+	ExecInitResultTupleSlotTL(estate, &mergestate->ps);
 
 	/*
 	 * call ExecInitNode on each of the plans to be executed and save the
@@ -124,10 +124,6 @@ ExecInitMergeAppend(MergeAppend *node, EState *estate, int eflags)
 		i++;
 	}
 
-	/*
-	 * initialize output tuple type
-	 */
-	ExecAssignResultTypeFromTL(&mergestate->ps);
 	mergestate->ps.ps_ProjInfo = NULL;
 
 	/*
diff --git a/src/backend/executor/nodeMergejoin.c b/src/backend/executor/nodeMergejoin.c
index 925b4cf553..f3cbe2f889 100644
--- a/src/backend/executor/nodeMergejoin.c
+++ b/src/backend/executor/nodeMergejoin.c
@@ -3,7 +3,7 @@
  * nodeMergejoin.c
  *	  routines supporting merge joins
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -510,7 +510,7 @@ MJFillInner(MergeJoinState *node)
 
 /*
  * Check that a qual condition is constant true or constant false.
- * If it is constant false (or null), set *is_const_false to TRUE.
+ * If it is constant false (or null), set *is_const_false to true.
  *
  * Constant true would normally be represented by a NIL list, but we allow an
  * actual bool Const as well.  We do expect that the planner will have thrown
@@ -1436,6 +1436,7 @@ MergeJoinState *
 ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 {
 	MergeJoinState *mergestate;
+	TupleDesc	outerDesc, innerDesc;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -1450,6 +1451,8 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	mergestate->js.ps.plan = (Plan *) node;
 	mergestate->js.ps.state = estate;
 	mergestate->js.ps.ExecProcNode = ExecMergeJoin;
+	mergestate->js.jointype = node->join.jointype;
+	mergestate->mj_ConstFalseJoin = false;
 
 	/*
 	 * Miscellaneous initialization
@@ -1466,17 +1469,6 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	mergestate->mj_OuterEContext = CreateExprContext(estate);
 	mergestate->mj_InnerEContext = CreateExprContext(estate);
 
-	/*
-	 * initialize child expressions
-	 */
-	mergestate->js.ps.qual =
-		ExecInitQual(node->join.plan.qual, (PlanState *) mergestate);
-	mergestate->js.jointype = node->join.jointype;
-	mergestate->js.joinqual =
-		ExecInitQual(node->join.joinqual, (PlanState *) mergestate);
-	mergestate->mj_ConstFalseJoin = false;
-	/* mergeclauses are handled below */
-
 	/*
 	 * initialize child nodes
 	 *
@@ -1488,10 +1480,12 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	mergestate->mj_SkipMarkRestore = node->skip_mark_restore;
 
 	outerPlanState(mergestate) = ExecInitNode(outerPlan(node), estate, eflags);
+	outerDesc = ExecGetResultType(outerPlanState(mergestate));
 	innerPlanState(mergestate) = ExecInitNode(innerPlan(node), estate,
 											  mergestate->mj_SkipMarkRestore ?
 											  eflags :
 											  (eflags | EXEC_FLAG_MARK));
+	innerDesc = ExecGetResultType(innerPlanState(mergestate));
 
 	/*
 	 * For certain types of inner child nodes, it is advantageous to issue
@@ -1502,6 +1496,10 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	 *
 	 * Currently, only Material wants the extra MARKs, and it will be helpful
 	 * only if eflags doesn't specify REWIND.
+	 *
+	 * Note that for IndexScan and IndexOnlyScan, it is *necessary* that we
+	 * not set mj_ExtraMarks; otherwise we might attempt to set a mark before
+	 * the first inner tuple, which they do not support.
 	 */
 	if (IsA(innerPlan(node), Material) &&
 		(eflags & EXEC_FLAG_REWIND) == 0 &&
@@ -1510,14 +1508,25 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 	else
 		mergestate->mj_ExtraMarks = false;
 
+	/*
+	 * Initialize result slot, type and projection.
+	 */
+	ExecInitResultTupleSlotTL(estate, &mergestate->js.ps);
+	ExecAssignProjectionInfo(&mergestate->js.ps, NULL);
+
 	/*
 	 * tuple table initialization
 	 */
-	ExecInitResultTupleSlot(estate, &mergestate->js.ps);
+	mergestate->mj_MarkedTupleSlot = ExecInitExtraTupleSlot(estate, innerDesc);
 
-	mergestate->mj_MarkedTupleSlot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(mergestate->mj_MarkedTupleSlot,
-						  ExecGetResultType(innerPlanState(mergestate)));
+	/*
+	 * initialize child expressions
+	 */
+	mergestate->js.ps.qual =
+		ExecInitQual(node->join.plan.qual, (PlanState *) mergestate);
+	mergestate->js.joinqual =
+		ExecInitQual(node->join.joinqual, (PlanState *) mergestate);
+	/* mergeclauses are handled below */
 
 	/*
 	 * detect whether we need only consider the first matching inner tuple
@@ -1538,15 +1547,13 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 			mergestate->mj_FillOuter = true;
 			mergestate->mj_FillInner = false;
 			mergestate->mj_NullInnerTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(innerPlanState(mergestate)));
+				ExecInitNullTupleSlot(estate, innerDesc);
 			break;
 		case JOIN_RIGHT:
 			mergestate->mj_FillOuter = false;
 			mergestate->mj_FillInner = true;
 			mergestate->mj_NullOuterTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(outerPlanState(mergestate)));
+				ExecInitNullTupleSlot(estate, outerDesc);
 
 			/*
 			 * Can't handle right or full join with non-constant extra
@@ -1562,11 +1569,9 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 			mergestate->mj_FillOuter = true;
 			mergestate->mj_FillInner = true;
 			mergestate->mj_NullOuterTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(outerPlanState(mergestate)));
+				ExecInitNullTupleSlot(estate, outerDesc);
 			mergestate->mj_NullInnerTupleSlot =
-				ExecInitNullTupleSlot(estate,
-									  ExecGetResultType(innerPlanState(mergestate)));
+				ExecInitNullTupleSlot(estate, innerDesc);
 
 			/*
 			 * Can't handle right or full join with non-constant extra
@@ -1583,12 +1588,6 @@ ExecInitMergeJoin(MergeJoin *node, EState *estate, int eflags)
 				 (int) node->join.jointype);
 	}
 
-	/*
-	 * initialize tuple type and projection info
-	 */
-	ExecAssignResultTypeFromTL(&mergestate->js.ps);
-	ExecAssignProjectionInfo(&mergestate->js.ps, NULL);
-
 	/*
 	 * preprocess the merge clauses
 	 */
diff --git a/src/backend/executor/nodeModifyTable.c b/src/backend/executor/nodeModifyTable.c
index 36b2b43bc6..c32928d9bd 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/src/backend/executor/nodeModifyTable.c
@@ -3,7 +3,7 @@
  * nodeModifyTable.c
  *	  routines to handle ModifyTable nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -40,12 +40,12 @@
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "commands/trigger.h"
+#include "executor/execPartition.h"
 #include "executor/executor.h"
 #include "executor/nodeModifyTable.h"
 #include "foreign/fdwapi.h"
 #include "miscadmin.h"
 #include "nodes/nodeFuncs.h"
-#include "parser/parsetree.h"
 #include "storage/bufmgr.h"
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
@@ -62,6 +62,11 @@ static bool ExecOnConflictUpdate(ModifyTableState *mtstate,
 					 EState *estate,
 					 bool canSetTag,
 					 TupleTableSlot **returning);
+static ResultRelInfo *getTargetResultRelInfo(ModifyTableState *node);
+static void ExecSetupChildParentMapForTcs(ModifyTableState *mtstate);
+static void ExecSetupChildParentMapForSubplan(ModifyTableState *mtstate);
+static TupleConversionMap *tupconv_map_for_subplan(ModifyTableState *node,
+						int whichplan);
 
 /*
  * Verify that the tuples to be produced by INSERT or UPDATE match the
@@ -95,7 +100,8 @@ ExecCheckPlanOutput(Relation resultRel, List *targetList)
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("table row type and query-specified row type do not match"),
 					 errdetail("Query has too many columns.")));
-		attr = resultDesc->attrs[attno++];
+		attr = TupleDescAttr(resultDesc, attno);
+		attno++;
 
 		if (!attr->attisdropped)
 		{
@@ -264,6 +270,7 @@ ExecInsert(ModifyTableState *mtstate,
 	Oid			newId;
 	List	   *recheckIndexes = NIL;
 	TupleTableSlot *result = NULL;
+	TransitionCaptureState *ar_insert_trig_tcs;
 
 	/*
 	 * get the heap tuple out of the tuple table slot, making sure we have a
@@ -277,32 +284,40 @@ ExecInsert(ModifyTableState *mtstate,
 	resultRelInfo = estate->es_result_relation_info;
 
 	/* Determine the partition to heap_insert the tuple into */
-	if (mtstate->mt_partition_dispatch_info)
+	if (mtstate->mt_partition_tuple_routing)
 	{
 		int			leaf_part_index;
-		TupleConversionMap *map;
+		PartitionTupleRouting *proute = mtstate->mt_partition_tuple_routing;
 
 		/*
 		 * Away we go ... If we end up not finding a partition after all,
 		 * ExecFindPartition() does not return and errors out instead.
 		 * Otherwise, the returned value is to be used as an index into arrays
-		 * mt_partitions[] and mt_partition_tupconv_maps[] that will get us
-		 * the ResultRelInfo and TupleConversionMap for the partition,
+		 * proute->partitions[] and proute->partition_tupconv_maps[] that will
+		 * get us the ResultRelInfo and TupleConversionMap for the partition,
 		 * respectively.
 		 */
 		leaf_part_index = ExecFindPartition(resultRelInfo,
-											mtstate->mt_partition_dispatch_info,
+											proute->partition_dispatch_info,
 											slot,
 											estate);
 		Assert(leaf_part_index >= 0 &&
-			   leaf_part_index < mtstate->mt_num_partitions);
+			   leaf_part_index < proute->num_partitions);
 
 		/*
 		 * Save the old ResultRelInfo and switch to the one corresponding to
-		 * the selected partition.
+		 * the selected partition.  (We might need to initialize it first.)
 		 */
 		saved_resultRelInfo = resultRelInfo;
-		resultRelInfo = mtstate->mt_partitions + leaf_part_index;
+		resultRelInfo = proute->partitions[leaf_part_index];
+		if (resultRelInfo == NULL)
+		{
+			resultRelInfo = ExecInitPartitionInfo(mtstate,
+												  saved_resultRelInfo,
+												  proute, estate,
+												  leaf_part_index);
+			Assert(resultRelInfo != NULL);
+		}
 
 		/* We do not yet have a way to insert into a foreign partition */
 		if (resultRelInfo->ri_FdwRoutine)
@@ -329,8 +344,10 @@ ExecInsert(ModifyTableState *mtstate,
 				 * back to tuplestore format.
 				 */
 				mtstate->mt_transition_capture->tcs_original_insert_tuple = NULL;
+
 				mtstate->mt_transition_capture->tcs_map =
-					mtstate->mt_transition_tupconv_maps[leaf_part_index];
+					TupConvMapForLeaf(proute, saved_resultRelInfo,
+									  leaf_part_index);
 			}
 			else
 			{
@@ -342,28 +359,21 @@ ExecInsert(ModifyTableState *mtstate,
 				mtstate->mt_transition_capture->tcs_map = NULL;
 			}
 		}
+		if (mtstate->mt_oc_transition_capture != NULL)
+		{
+			mtstate->mt_oc_transition_capture->tcs_map =
+				TupConvMapForLeaf(proute, saved_resultRelInfo,
+								  leaf_part_index);
+		}
 
 		/*
 		 * We might need to convert from the parent rowtype to the partition
 		 * rowtype.
 		 */
-		map = mtstate->mt_partition_tupconv_maps[leaf_part_index];
-		if (map)
-		{
-			Relation	partrel = resultRelInfo->ri_RelationDesc;
-
-			tuple = do_convert_tuple(tuple, map);
-
-			/*
-			 * We must use the partition's tuple descriptor from this point
-			 * on, until we're finished dealing with the partition. Use the
-			 * dedicated slot for that.
-			 */
-			slot = mtstate->mt_partition_tuple_slot;
-			Assert(slot != NULL);
-			ExecSetSlotDescriptor(slot, RelationGetDescr(partrel));
-			ExecStoreTuple(tuple, slot, InvalidBuffer, true);
-		}
+		tuple = ConvertPartitionTupleSlot(proute->parent_child_tupconv_maps[leaf_part_index],
+										  tuple,
+										  proute->partition_tuple_slot,
+										  &slot);
 	}
 
 	resultRelationDesc = resultRelInfo->ri_RelationDesc;
@@ -444,6 +454,8 @@ ExecInsert(ModifyTableState *mtstate,
 	}
 	else
 	{
+		WCOKind		wco_kind;
+
 		/*
 		 * We always check the partition constraint, including when the tuple
 		 * got here via tuple-routing.  However we don't need to in the latter
@@ -461,14 +473,23 @@ ExecInsert(ModifyTableState *mtstate,
 		tuple->t_tableOid = RelationGetRelid(resultRelationDesc);
 
 		/*
-		 * Check any RLS INSERT WITH CHECK policies
+		 * Check any RLS WITH CHECK policies.
 		 *
+		 * Normally we should check INSERT policies. But if the insert is the
+		 * result of a partition key update that moved the tuple to a new
+		 * partition, we should instead check UPDATE policies, because we are
+		 * executing policies defined on the target table, and not those
+		 * defined on the child partitions.
+		 */
+		wco_kind = (mtstate->operation == CMD_UPDATE) ?
+			WCO_RLS_UPDATE_CHECK : WCO_RLS_INSERT_CHECK;
+
+		/*
 		 * ExecWithCheckOptions() will skip any WCOs which are not of the kind
 		 * we are looking for at this point.
 		 */
 		if (resultRelInfo->ri_WithCheckOptions != NIL)
-			ExecWithCheckOptions(WCO_RLS_INSERT_CHECK,
-								 resultRelInfo, slot, estate);
+			ExecWithCheckOptions(wco_kind, resultRelInfo, slot, estate);
 
 		/*
 		 * No need though if the tuple has been routed, and a BR trigger
@@ -481,7 +502,7 @@ ExecInsert(ModifyTableState *mtstate,
 
 		/* Check the constraints of the tuple */
 		if (resultRelationDesc->rd_att->constr || check_partition_constr)
-			ExecConstraints(resultRelInfo, slot, estate);
+			ExecConstraints(resultRelInfo, slot, estate, true);
 
 		if (onconflict != ONCONFLICT_NONE && resultRelInfo->ri_NumIndices > 0)
 		{
@@ -617,9 +638,32 @@ ExecInsert(ModifyTableState *mtstate,
 		setLastTid(&(tuple->t_self));
 	}
 
+	/*
+	 * If this insert is the result of a partition key update that moved the
+	 * tuple to a new partition, put this row into the transition NEW TABLE,
+	 * if there is one. We need to do this separately for DELETE and INSERT
+	 * because they happen on different tables.
+	 */
+	ar_insert_trig_tcs = mtstate->mt_transition_capture;
+	if (mtstate->operation == CMD_UPDATE && mtstate->mt_transition_capture
+		&& mtstate->mt_transition_capture->tcs_update_new_table)
+	{
+		ExecARUpdateTriggers(estate, resultRelInfo, NULL,
+							 NULL,
+							 tuple,
+							 NULL,
+							 mtstate->mt_transition_capture);
+
+		/*
+		 * We've already captured the NEW TABLE row, so make sure any AR
+		 * INSERT trigger fired below doesn't capture it again.
+		 */
+		ar_insert_trig_tcs = NULL;
+	}
+
 	/* AFTER ROW INSERT Triggers */
 	ExecARInsertTriggers(estate, resultRelInfo, tuple, recheckIndexes,
-						 mtstate->mt_transition_capture);
+						 ar_insert_trig_tcs);
 
 	list_free(recheckIndexes);
 
@@ -673,6 +717,8 @@ ExecDelete(ModifyTableState *mtstate,
 		   TupleTableSlot *planSlot,
 		   EPQState *epqstate,
 		   EState *estate,
+		   bool *tupleDeleted,
+		   bool processReturning,
 		   bool canSetTag)
 {
 	ResultRelInfo *resultRelInfo;
@@ -680,6 +726,10 @@ ExecDelete(ModifyTableState *mtstate,
 	HTSU_Result result;
 	HeapUpdateFailureData hufd;
 	TupleTableSlot *slot = NULL;
+	TransitionCaptureState *ar_delete_trig_tcs;
+
+	if (tupleDeleted)
+		*tupleDeleted = false;
 
 	/*
 	 * get information on the (current) result relation
@@ -844,12 +894,40 @@ ldelete:;
 	if (canSetTag)
 		(estate->es_processed)++;
 
+	/* Tell caller that the delete actually happened. */
+	if (tupleDeleted)
+		*tupleDeleted = true;
+
+	/*
+	 * If this delete is the result of a partition key update that moved the
+	 * tuple to a new partition, put this row into the transition OLD TABLE,
+	 * if there is one. We need to do this separately for DELETE and INSERT
+	 * because they happen on different tables.
+	 */
+	ar_delete_trig_tcs = mtstate->mt_transition_capture;
+	if (mtstate->operation == CMD_UPDATE && mtstate->mt_transition_capture
+		&& mtstate->mt_transition_capture->tcs_update_old_table)
+	{
+		ExecARUpdateTriggers(estate, resultRelInfo,
+							 tupleid,
+							 oldtuple,
+							 NULL,
+							 NULL,
+							 mtstate->mt_transition_capture);
+
+		/*
+		 * We've already captured the NEW TABLE row, so make sure any AR
+		 * DELETE trigger fired below doesn't capture it again.
+		 */
+		ar_delete_trig_tcs = NULL;
+	}
+
 	/* AFTER ROW DELETE Triggers */
 	ExecARDeleteTriggers(estate, resultRelInfo, tupleid, oldtuple,
-						 mtstate->mt_transition_capture);
+						 ar_delete_trig_tcs);
 
-	/* Process RETURNING if present */
-	if (resultRelInfo->ri_projectReturning)
+	/* Process RETURNING if present and if requested */
+	if (processReturning && resultRelInfo->ri_projectReturning)
 	{
 		/*
 		 * We have to put the target tuple into a slot, which means first we
@@ -942,6 +1020,7 @@ ExecUpdate(ModifyTableState *mtstate,
 	HTSU_Result result;
 	HeapUpdateFailureData hufd;
 	List	   *recheckIndexes = NIL;
+	TupleConversionMap *saved_tcs_map = NULL;
 
 	/*
 	 * abort the operation if not running transactions
@@ -1013,6 +1092,7 @@ ExecUpdate(ModifyTableState *mtstate,
 	else
 	{
 		LockTupleMode lockmode;
+		bool		partition_constraint_failed;
 
 		/*
 		 * Constraints might reference the tableoid column, so initialize
@@ -1028,22 +1108,142 @@ ExecUpdate(ModifyTableState *mtstate,
 		 * (We don't need to redo triggers, however.  If there are any BEFORE
 		 * triggers then trigger.c will have done heap_lock_tuple to lock the
 		 * correct tuple, so there's no need to do them again.)
-		 *
-		 * ExecWithCheckOptions() will skip any WCOs which are not of the kind
-		 * we are looking for at this point.
 		 */
 lreplace:;
-		if (resultRelInfo->ri_WithCheckOptions != NIL)
+
+		/*
+		 * If partition constraint fails, this row might get moved to another
+		 * partition, in which case we should check the RLS CHECK policy just
+		 * before inserting into the new partition, rather than doing it here.
+		 * This is because a trigger on that partition might again change the
+		 * row.  So skip the WCO checks if the partition constraint fails.
+		 */
+		partition_constraint_failed =
+			resultRelInfo->ri_PartitionCheck &&
+			!ExecPartitionCheck(resultRelInfo, slot, estate);
+
+		if (!partition_constraint_failed &&
+			resultRelInfo->ri_WithCheckOptions != NIL)
+		{
+			/*
+			 * ExecWithCheckOptions() will skip any WCOs which are not of the
+			 * kind we are looking for at this point.
+			 */
 			ExecWithCheckOptions(WCO_RLS_UPDATE_CHECK,
 								 resultRelInfo, slot, estate);
+		}
+
+		/*
+		 * If a partition check failed, try to move the row into the right
+		 * partition.
+		 */
+		if (partition_constraint_failed)
+		{
+			bool		tuple_deleted;
+			TupleTableSlot *ret_slot;
+			PartitionTupleRouting *proute = mtstate->mt_partition_tuple_routing;
+			int			map_index;
+			TupleConversionMap *tupconv_map;
+
+			/*
+			 * When an UPDATE is run on a leaf partition, we will not have
+			 * partition tuple routing set up. In that case, fail with
+			 * partition constraint violation error.
+			 */
+			if (proute == NULL)
+				ExecPartitionCheckEmitError(resultRelInfo, slot, estate);
+
+			/*
+			 * Row movement, part 1.  Delete the tuple, but skip RETURNING
+			 * processing. We want to return rows from INSERT.
+			 */
+			ExecDelete(mtstate, tupleid, oldtuple, planSlot, epqstate, estate,
+					   &tuple_deleted, false, false);
+
+			/*
+			 * For some reason if DELETE didn't happen (e.g. trigger prevented
+			 * it, or it was already deleted by self, or it was concurrently
+			 * deleted by another transaction), then we should skip the insert
+			 * as well; otherwise, an UPDATE could cause an increase in the
+			 * total number of rows across all partitions, which is clearly
+			 * wrong.
+			 *
+			 * For a normal UPDATE, the case where the tuple has been the
+			 * subject of a concurrent UPDATE or DELETE would be handled by
+			 * the EvalPlanQual machinery, but for an UPDATE that we've
+			 * translated into a DELETE from this partition and an INSERT into
+			 * some other partition, that's not available, because CTID chains
+			 * can't span relation boundaries.  We mimic the semantics to a
+			 * limited extent by skipping the INSERT if the DELETE fails to
+			 * find a tuple. This ensures that two concurrent attempts to
+			 * UPDATE the same tuple at the same time can't turn one tuple
+			 * into two, and that an UPDATE of a just-deleted tuple can't
+			 * resurrect it.
+			 */
+			if (!tuple_deleted)
+				return NULL;
+
+			/*
+			 * Updates set the transition capture map only when a new subplan
+			 * is chosen.  But for inserts, it is set for each row. So after
+			 * INSERT, we need to revert back to the map created for UPDATE;
+			 * otherwise the next UPDATE will incorrectly use the one created
+			 * for INSERT.  So first save the one created for UPDATE.
+			 */
+			if (mtstate->mt_transition_capture)
+				saved_tcs_map = mtstate->mt_transition_capture->tcs_map;
+
+			/*
+			 * resultRelInfo is one of the per-subplan resultRelInfos.  So we
+			 * should convert the tuple into root's tuple descriptor, since
+			 * ExecInsert() starts the search from root.  The tuple conversion
+			 * map list is in the order of mtstate->resultRelInfo[], so to
+			 * retrieve the one for this resultRel, we need to know the
+			 * position of the resultRel in mtstate->resultRelInfo[].
+			 */
+			map_index = resultRelInfo - mtstate->resultRelInfo;
+			Assert(map_index >= 0 && map_index < mtstate->mt_nplans);
+			tupconv_map = tupconv_map_for_subplan(mtstate, map_index);
+			tuple = ConvertPartitionTupleSlot(tupconv_map,
+											  tuple,
+											  proute->root_tuple_slot,
+											  &slot);
+
+
+			/*
+			 * For ExecInsert(), make it look like we are inserting into the
+			 * root.
+			 */
+			Assert(mtstate->rootResultRelInfo != NULL);
+			estate->es_result_relation_info = mtstate->rootResultRelInfo;
+
+			ret_slot = ExecInsert(mtstate, slot, planSlot, NULL,
+								  ONCONFLICT_NONE, estate, canSetTag);
+
+			/*
+			 * Revert back the active result relation and the active
+			 * transition capture map that we changed above.
+			 */
+			estate->es_result_relation_info = resultRelInfo;
+			if (mtstate->mt_transition_capture)
+			{
+				mtstate->mt_transition_capture->tcs_original_insert_tuple = NULL;
+				mtstate->mt_transition_capture->tcs_map = saved_tcs_map;
+			}
+			return ret_slot;
+		}
 
 		/*
 		 * Check the constraints of the tuple.  Note that we pass the same
 		 * slot for the orig_slot argument, because unlike ExecInsert(), no
 		 * tuple-routing is performed here, hence the slot remains unchanged.
+		 * We've already checked the partition constraint above; however, we
+		 * must still ensure the tuple passes all other constraints, so we
+		 * will call ExecConstraints() and have it validate all remaining
+		 * checks.
 		 */
-		if (resultRelationDesc->rd_att->constr || resultRelInfo->ri_PartitionCheck)
-			ExecConstraints(resultRelInfo, slot, estate);
+		if (resultRelationDesc->rd_att->constr)
+			ExecConstraints(resultRelInfo, slot, estate, false);
 
 		/*
 		 * replace the heap tuple
@@ -1157,6 +1357,8 @@ lreplace:;
 	/* AFTER ROW UPDATE Triggers */
 	ExecARUpdateTriggers(estate, resultRelInfo, tupleid, oldtuple, tuple,
 						 recheckIndexes,
+						 mtstate->operation == CMD_INSERT ?
+						 mtstate->mt_oc_transition_capture :
 						 mtstate->mt_transition_capture);
 
 	list_free(recheckIndexes);
@@ -1411,17 +1613,20 @@ fireBSTriggers(ModifyTableState *node)
 }
 
 /*
- * Return the ResultRelInfo for which we will fire AFTER STATEMENT triggers.
- * This is also the relation into whose tuple format all captured transition
- * tuples must be converted.
+ * Return the target rel ResultRelInfo.
+ *
+ * This relation is the same as :
+ * - the relation for which we will fire AFTER STATEMENT triggers.
+ * - the relation into whose tuple format all captured transition tuples must
+ *   be converted.
+ * - the root partitioned table.
  */
 static ResultRelInfo *
-getASTriggerResultRelInfo(ModifyTableState *node)
+getTargetResultRelInfo(ModifyTableState *node)
 {
 	/*
-	 * If the node modifies a partitioned table, we must fire its triggers.
-	 * Note that in that case, node->resultRelInfo points to the first leaf
-	 * partition, not the root table.
+	 * Note that if the node modifies a partitioned table, node->resultRelInfo
+	 * points to the first leaf partition, not the root table.
 	 */
 	if (node->rootResultRelInfo != NULL)
 		return node->rootResultRelInfo;
@@ -1435,7 +1640,7 @@ getASTriggerResultRelInfo(ModifyTableState *node)
 static void
 fireASTriggers(ModifyTableState *node)
 {
-	ResultRelInfo *resultRelInfo = getASTriggerResultRelInfo(node);
+	ResultRelInfo *resultRelInfo = getTargetResultRelInfo(node);
 
 	switch (node->operation)
 	{
@@ -1443,7 +1648,7 @@ fireASTriggers(ModifyTableState *node)
 			if (node->mt_onconflict == ONCONFLICT_UPDATE)
 				ExecASUpdateTriggers(node->ps.state,
 									 resultRelInfo,
-									 node->mt_transition_capture);
+									 node->mt_oc_transition_capture);
 			ExecASInsertTriggers(node->ps.state, resultRelInfo,
 								 node->mt_transition_capture);
 			break;
@@ -1468,63 +1673,165 @@ fireASTriggers(ModifyTableState *node)
 static void
 ExecSetupTransitionCaptureState(ModifyTableState *mtstate, EState *estate)
 {
-	ResultRelInfo *targetRelInfo = getASTriggerResultRelInfo(mtstate);
-	int			i;
+	ResultRelInfo *targetRelInfo = getTargetResultRelInfo(mtstate);
 
 	/* Check for transition tables on the directly targeted relation. */
 	mtstate->mt_transition_capture =
-		MakeTransitionCaptureState(targetRelInfo->ri_TrigDesc);
+		MakeTransitionCaptureState(targetRelInfo->ri_TrigDesc,
+								   RelationGetRelid(targetRelInfo->ri_RelationDesc),
+								   mtstate->operation);
+	if (mtstate->operation == CMD_INSERT &&
+		mtstate->mt_onconflict == ONCONFLICT_UPDATE)
+		mtstate->mt_oc_transition_capture =
+			MakeTransitionCaptureState(targetRelInfo->ri_TrigDesc,
+									   RelationGetRelid(targetRelInfo->ri_RelationDesc),
+									   CMD_UPDATE);
 
 	/*
 	 * If we found that we need to collect transition tuples then we may also
 	 * need tuple conversion maps for any children that have TupleDescs that
-	 * aren't compatible with the tuplestores.
+	 * aren't compatible with the tuplestores.  (We can share these maps
+	 * between the regular and ON CONFLICT cases.)
 	 */
-	if (mtstate->mt_transition_capture != NULL)
+	if (mtstate->mt_transition_capture != NULL ||
+		mtstate->mt_oc_transition_capture != NULL)
 	{
-		ResultRelInfo *resultRelInfos;
-		int			numResultRelInfos;
+		ExecSetupChildParentMapForTcs(mtstate);
 
-		/* Find the set of partitions so that we can find their TupleDescs. */
-		if (mtstate->mt_partition_dispatch_info != NULL)
-		{
-			/*
-			 * For INSERT via partitioned table, so we need TupleDescs based
-			 * on the partition routing table.
-			 */
-			resultRelInfos = mtstate->mt_partitions;
-			numResultRelInfos = mtstate->mt_num_partitions;
-		}
-		else
-		{
-			/* Otherwise we need the ResultRelInfo for each subplan. */
-			resultRelInfos = mtstate->resultRelInfo;
-			numResultRelInfos = mtstate->mt_nplans;
-		}
+		/*
+		 * Install the conversion map for the first plan for UPDATE and DELETE
+		 * operations.  It will be advanced each time we switch to the next
+		 * plan.  (INSERT operations set it every time, so we need not update
+		 * mtstate->mt_oc_transition_capture here.)
+		 */
+		if (mtstate->mt_transition_capture && mtstate->operation != CMD_INSERT)
+			mtstate->mt_transition_capture->tcs_map =
+				tupconv_map_for_subplan(mtstate, 0);
+	}
+}
 
+/*
+ * Initialize the child-to-root tuple conversion map array for UPDATE subplans.
+ *
+ * This map array is required to convert the tuple from the subplan result rel
+ * to the target table descriptor. This requirement arises for two independent
+ * scenarios:
+ * 1. For update-tuple-routing.
+ * 2. For capturing tuples in transition tables.
+ */
+static void
+ExecSetupChildParentMapForSubplan(ModifyTableState *mtstate)
+{
+	ResultRelInfo *targetRelInfo = getTargetResultRelInfo(mtstate);
+	ResultRelInfo *resultRelInfos = mtstate->resultRelInfo;
+	TupleDesc	outdesc;
+	int			numResultRelInfos = mtstate->mt_nplans;
+	int			i;
+
+	/*
+	 * First check if there is already a per-subplan array allocated. Even if
+	 * there is already a per-leaf map array, we won't require a per-subplan
+	 * one, since we will use the subplan offset array to convert the subplan
+	 * index to per-leaf index.
+	 */
+	if (mtstate->mt_per_subplan_tupconv_maps ||
+		(mtstate->mt_partition_tuple_routing &&
+		 mtstate->mt_partition_tuple_routing->child_parent_tupconv_maps))
+		return;
+
+	/*
+	 * Build array of conversion maps from each child's TupleDesc to the one
+	 * used in the target relation.  The map pointers may be NULL when no
+	 * conversion is necessary, which is hopefully a common case.
+	 */
+
+	/* Get tuple descriptor of the target rel. */
+	outdesc = RelationGetDescr(targetRelInfo->ri_RelationDesc);
+
+	mtstate->mt_per_subplan_tupconv_maps = (TupleConversionMap **)
+		palloc(sizeof(TupleConversionMap *) * numResultRelInfos);
+
+	for (i = 0; i < numResultRelInfos; ++i)
+	{
+		mtstate->mt_per_subplan_tupconv_maps[i] =
+			convert_tuples_by_name(RelationGetDescr(resultRelInfos[i].ri_RelationDesc),
+								   outdesc,
+								   gettext_noop("could not convert row type"));
+	}
+}
+
+/*
+ * Initialize the child-to-root tuple conversion map array required for
+ * capturing transition tuples.
+ *
+ * The map array can be indexed either by subplan index or by leaf-partition
+ * index.  For transition tables, we need a subplan-indexed access to the map,
+ * and where tuple-routing is present, we also require a leaf-indexed access.
+ */
+static void
+ExecSetupChildParentMapForTcs(ModifyTableState *mtstate)
+{
+	PartitionTupleRouting *proute = mtstate->mt_partition_tuple_routing;
+
+	/*
+	 * If partition tuple routing is set up, we will require partition-indexed
+	 * access. In that case, create the map array indexed by partition; we
+	 * will still be able to access the maps using a subplan index by
+	 * converting the subplan index to a partition index using
+	 * subplan_partition_offsets. If tuple routing is not set up, it means we
+	 * don't require partition-indexed access. In that case, create just a
+	 * subplan-indexed map.
+	 */
+	if (proute)
+	{
 		/*
-		 * Build array of conversion maps from each child's TupleDesc to the
-		 * one used in the tuplestore.  The map pointers may be NULL when no
-		 * conversion is necessary, which is hopefully a common case for
-		 * partitions.
+		 * If a partition-indexed map array is to be created, the subplan map
+		 * array has to be NULL.  If the subplan map array is already created,
+		 * we won't be able to access the map using a partition index.
 		 */
-		mtstate->mt_transition_tupconv_maps = (TupleConversionMap **)
-			palloc0(sizeof(TupleConversionMap *) * numResultRelInfos);
-		for (i = 0; i < numResultRelInfos; ++i)
-		{
-			mtstate->mt_transition_tupconv_maps[i] =
-				convert_tuples_by_name(RelationGetDescr(resultRelInfos[i].ri_RelationDesc),
-									   RelationGetDescr(targetRelInfo->ri_RelationDesc),
-									   gettext_noop("could not convert row type"));
-		}
+		Assert(mtstate->mt_per_subplan_tupconv_maps == NULL);
+
+		ExecSetupChildParentMapForLeaf(proute);
+	}
+	else
+		ExecSetupChildParentMapForSubplan(mtstate);
+}
+
+/*
+ * For a given subplan index, get the tuple conversion map.
+ */
+static TupleConversionMap *
+tupconv_map_for_subplan(ModifyTableState *mtstate, int whichplan)
+{
+	/*
+	 * If a partition-index tuple conversion map array is allocated, we need
+	 * to first get the index into the partition array. Exactly *one* of the
+	 * two arrays is allocated. This is because if there is a partition array
+	 * required, we don't require subplan-indexed array since we can translate
+	 * subplan index into partition index. And, we create a subplan-indexed
+	 * array *only* if partition-indexed array is not required.
+	 */
+	if (mtstate->mt_per_subplan_tupconv_maps == NULL)
+	{
+		int			leaf_index;
+		PartitionTupleRouting *proute = mtstate->mt_partition_tuple_routing;
 
 		/*
-		 * Install the conversion map for the first plan for UPDATE and DELETE
-		 * operations.  It will be advanced each time we switch to the next
-		 * plan.  (INSERT operations set it every time.)
+		 * If subplan-indexed array is NULL, things should have been arranged
+		 * to convert the subplan index to partition index.
 		 */
-		mtstate->mt_transition_capture->tcs_map =
-			mtstate->mt_transition_tupconv_maps[0];
+		Assert(proute && proute->subplan_partition_offsets != NULL &&
+			   whichplan < proute->num_subplan_partition_offsets);
+
+		leaf_index = proute->subplan_partition_offsets[whichplan];
+
+		return TupConvMapForLeaf(proute, getTargetResultRelInfo(mtstate),
+								 leaf_index);
+	}
+	else
+	{
+		Assert(whichplan >= 0 && whichplan < mtstate->mt_nplans);
+		return mtstate->mt_per_subplan_tupconv_maps[whichplan];
 	}
 }
 
@@ -1547,7 +1854,7 @@ ExecModifyTable(PlanState *pstate)
 	JunkFilter *junkfilter;
 	TupleTableSlot *slot;
 	TupleTableSlot *planSlot;
-	ItemPointer tupleid = NULL;
+	ItemPointer tupleid;
 	ItemPointerData tuple_ctid;
 	HeapTupleData oldtupdata;
 	HeapTuple	oldtuple;
@@ -1628,12 +1935,16 @@ ExecModifyTable(PlanState *pstate)
 				estate->es_result_relation_info = resultRelInfo;
 				EvalPlanQualSetPlan(&node->mt_epqstate, subplanstate->plan,
 									node->mt_arowmarks[node->mt_whichplan]);
+				/* Prepare to convert transition tuples from this child. */
 				if (node->mt_transition_capture != NULL)
 				{
-					/* Prepare to convert transition tuples from this child. */
-					Assert(node->mt_transition_tupconv_maps != NULL);
 					node->mt_transition_capture->tcs_map =
-						node->mt_transition_tupconv_maps[node->mt_whichplan];
+						tupconv_map_for_subplan(node, node->mt_whichplan);
+				}
+				if (node->mt_oc_transition_capture != NULL)
+				{
+					node->mt_oc_transition_capture->tcs_map =
+						tupconv_map_for_subplan(node, node->mt_whichplan);
 				}
 				continue;
 			}
@@ -1664,6 +1975,7 @@ ExecModifyTable(PlanState *pstate)
 		EvalPlanQualSetSlot(&node->mt_epqstate, planSlot);
 		slot = planSlot;
 
+		tupleid = NULL;
 		oldtuple = NULL;
 		if (junkfilter != NULL)
 		{
@@ -1749,7 +2061,8 @@ ExecModifyTable(PlanState *pstate)
 				break;
 			case CMD_DELETE:
 				slot = ExecDelete(node, tupleid, oldtuple, planSlot,
-								  &node->mt_epqstate, estate, node->canSetTag);
+								  &node->mt_epqstate, estate,
+								  NULL, true, node->canSetTag);
 				break;
 			default:
 				elog(ERROR, "unknown operation");
@@ -1792,11 +2105,11 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	int			nplans = list_length(node->plans);
 	ResultRelInfo *saved_resultRelInfo;
 	ResultRelInfo *resultRelInfo;
-	TupleDesc	tupDesc;
 	Plan	   *subplan;
 	ListCell   *l;
 	int			i;
 	Relation	rel;
+	bool		update_tuple_routing_needed = node->partColsUpdated;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -1853,7 +2166,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		/*
 		 * Verify result relation is a valid target for the current operation
 		 */
-		CheckValidResultRel(resultRelInfo->ri_RelationDesc, operation);
+		CheckValidResultRel(resultRelInfo, operation);
 
 		/*
 		 * If there are indices on the result relation, open them and save
@@ -1869,6 +2182,16 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 			resultRelInfo->ri_IndexRelationDescs == NULL)
 			ExecOpenIndices(resultRelInfo, mtstate->mt_onconflict != ONCONFLICT_NONE);
 
+		/*
+		 * If this is an UPDATE and a BEFORE UPDATE trigger is present, the
+		 * trigger itself might modify the partition-key values. So arrange
+		 * for tuple routing.
+		 */
+		if (resultRelInfo->ri_TrigDesc &&
+			resultRelInfo->ri_TrigDesc->trig_update_before_row &&
+			operation == CMD_UPDATE)
+			update_tuple_routing_needed = true;
+
 		/* Now init the plan for this result rel */
 		estate->es_result_relation_info = resultRelInfo;
 		mtstate->mt_plans[i] = ExecInitNode(subplan, estate, eflags);
@@ -1893,47 +2216,42 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 
 	estate->es_result_relation_info = saved_resultRelInfo;
 
-	/* The root table RT index is at the head of the partitioned_rels list */
-	if (node->partitioned_rels)
-	{
-		Index		root_rti;
-		Oid			root_oid;
+	/* Get the target relation */
+	rel = (getTargetResultRelInfo(mtstate))->ri_RelationDesc;
 
-		root_rti = linitial_int(node->partitioned_rels);
-		root_oid = getrelid(root_rti, estate->es_range_table);
-		rel = heap_open(root_oid, NoLock);	/* locked by InitPlan */
-	}
-	else
-		rel = mtstate->resultRelInfo->ri_RelationDesc;
+	/*
+	 * If it's not a partitioned table after all, UPDATE tuple routing should
+	 * not be attempted.
+	 */
+	if (rel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
+		update_tuple_routing_needed = false;
 
-	/* Build state for INSERT tuple routing */
-	if (operation == CMD_INSERT &&
-		rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
-	{
-		PartitionDispatch *partition_dispatch_info;
-		ResultRelInfo *partitions;
-		TupleConversionMap **partition_tupconv_maps;
-		TupleTableSlot *partition_tuple_slot;
-		int			num_parted,
-					num_partitions;
-
-		ExecSetupPartitionTupleRouting(rel,
-									   node->nominalRelation,
-									   &partition_dispatch_info,
-									   &partitions,
-									   &partition_tupconv_maps,
-									   &partition_tuple_slot,
-									   &num_parted, &num_partitions);
-		mtstate->mt_partition_dispatch_info = partition_dispatch_info;
-		mtstate->mt_num_dispatch = num_parted;
-		mtstate->mt_partitions = partitions;
-		mtstate->mt_num_partitions = num_partitions;
-		mtstate->mt_partition_tupconv_maps = partition_tupconv_maps;
-		mtstate->mt_partition_tuple_slot = partition_tuple_slot;
-	}
+	/*
+	 * Build state for tuple routing if it's an INSERT or if it's an UPDATE of
+	 * partition key.
+	 */
+	if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE &&
+		(operation == CMD_INSERT || update_tuple_routing_needed))
+		mtstate->mt_partition_tuple_routing =
+						ExecSetupPartitionTupleRouting(mtstate, rel);
+
+	/*
+	 * Build state for collecting transition tuples.  This requires having a
+	 * valid trigger query context, so skip it in explain-only mode.
+	 */
+	if (!(eflags & EXEC_FLAG_EXPLAIN_ONLY))
+		ExecSetupTransitionCaptureState(mtstate, estate);
 
-	/* Build state for collecting transition tuples */
-	ExecSetupTransitionCaptureState(mtstate, estate);
+	/*
+	 * Construct mapping from each of the per-subplan partition attnos to the
+	 * root attno.  This is required when during update row movement the tuple
+	 * descriptor of a source partition does not match the root partitioned
+	 * table descriptor.  In such a case we need to convert tuples to the root
+	 * tuple descriptor, because the search for destination partition starts
+	 * from the root.  Skip this setup if it's not a partition key update.
+	 */
+	if (update_tuple_routing_needed)
+		ExecSetupChildParentMapForSubplan(mtstate);
 
 	/*
 	 * Initialize any WITH CHECK OPTION constraints if needed.
@@ -1961,57 +2279,6 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		i++;
 	}
 
-	/*
-	 * Build WITH CHECK OPTION constraints for each leaf partition rel. Note
-	 * that we didn't build the withCheckOptionList for each partition within
-	 * the planner, but simple translation of the varattnos for each partition
-	 * will suffice.  This only occurs for the INSERT case; UPDATE/DELETE
-	 * cases are handled above.
-	 */
-	if (node->withCheckOptionLists != NIL && mtstate->mt_num_partitions > 0)
-	{
-		List	   *wcoList;
-		PlanState  *plan;
-
-		/*
-		 * In case of INSERT on partitioned tables, there is only one plan.
-		 * Likewise, there is only one WITH CHECK OPTIONS list, not one per
-		 * partition.  We make a copy of the WCO qual for each partition; note
-		 * that, if there are SubPlans in there, they all end up attached to
-		 * the one parent Plan node.
-		 */
-		Assert(operation == CMD_INSERT &&
-			   list_length(node->withCheckOptionLists) == 1 &&
-			   mtstate->mt_nplans == 1);
-		wcoList = linitial(node->withCheckOptionLists);
-		plan = mtstate->mt_plans[0];
-		resultRelInfo = mtstate->mt_partitions;
-		for (i = 0; i < mtstate->mt_num_partitions; i++)
-		{
-			Relation	partrel = resultRelInfo->ri_RelationDesc;
-			List	   *mapped_wcoList;
-			List	   *wcoExprs = NIL;
-			ListCell   *ll;
-
-			/* varno = node->nominalRelation */
-			mapped_wcoList = map_partition_varattnos(wcoList,
-													 node->nominalRelation,
-													 partrel, rel, NULL);
-			foreach(ll, mapped_wcoList)
-			{
-				WithCheckOption *wco = castNode(WithCheckOption, lfirst(ll));
-				ExprState  *wcoExpr = ExecInitQual(castNode(List, wco->qual),
-												   plan);
-
-				wcoExprs = lappend(wcoExprs, wcoExpr);
-			}
-
-			resultRelInfo->ri_WithCheckOptions = mapped_wcoList;
-			resultRelInfo->ri_WithCheckOptionExprs = wcoExprs;
-			resultRelInfo++;
-		}
-	}
-
 	/*
 	 * Initialize RETURNING projections if needed.
 	 */
@@ -2019,18 +2286,15 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	{
 		TupleTableSlot *slot;
 		ExprContext *econtext;
-		List	   *returningList;
 
 		/*
 		 * Initialize result tuple slot and assign its rowtype using the first
 		 * RETURNING list.  We assume the rest will look the same.
 		 */
-		tupDesc = ExecTypeFromTL((List *) linitial(node->returningLists),
-								 false);
+		mtstate->ps.plan->targetlist = (List *) linitial(node->returningLists);
 
 		/* Set up a slot for the output of the RETURNING projection(s) */
-		ExecInitResultTupleSlot(estate, &mtstate->ps);
-		ExecAssignResultType(&mtstate->ps, tupDesc);
+		ExecInitResultTupleSlotTL(estate, &mtstate->ps);
 		slot = mtstate->ps.ps_ResultTupleSlot;
 
 		/* Need an econtext too */
@@ -2051,30 +2315,6 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 										resultRelInfo->ri_RelationDesc->rd_att);
 			resultRelInfo++;
 		}
-
-		/*
-		 * Build a projection for each leaf partition rel.  Note that we
-		 * didn't build the returningList for each partition within the
-		 * planner, but simple translation of the varattnos for each partition
-		 * will suffice.  This only occurs for the INSERT case; UPDATE/DELETE
-		 * are handled above.
-		 */
-		resultRelInfo = mtstate->mt_partitions;
-		returningList = linitial(node->returningLists);
-		for (i = 0; i < mtstate->mt_num_partitions; i++)
-		{
-			Relation	partrel = resultRelInfo->ri_RelationDesc;
-			List	   *rlist;
-
-			/* varno = node->nominalRelation */
-			rlist = map_partition_varattnos(returningList,
-											node->nominalRelation,
-											partrel, rel, NULL);
-			resultRelInfo->ri_projectReturning =
-				ExecBuildProjectionInfo(rlist, econtext, slot, &mtstate->ps,
-										resultRelInfo->ri_RelationDesc->rd_att);
-			resultRelInfo++;
-		}
 	}
 	else
 	{
@@ -2082,17 +2322,12 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 		 * We still must construct a dummy result tuple type, because InitPlan
 		 * expects one (maybe should change that?).
 		 */
-		tupDesc = ExecTypeFromTL(NIL, false);
-		ExecInitResultTupleSlot(estate, &mtstate->ps);
-		ExecAssignResultType(&mtstate->ps, tupDesc);
+		mtstate->ps.plan->targetlist = NIL;
+		ExecInitResultTupleSlotTL(estate, &mtstate->ps);
 
 		mtstate->ps.ps_ExprContext = NULL;
 	}
 
-	/* Close the root partitioned rel if we opened it above. */
-	if (rel != mtstate->resultRelInfo->ri_RelationDesc)
-		heap_close(rel, NoLock);
-
 	/*
 	 * If needed, Initialize target list, projection and qual for ON CONFLICT
 	 * DO UPDATE.
@@ -2101,6 +2336,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	if (node->onConflictAction == ONCONFLICT_UPDATE)
 	{
 		ExprContext *econtext;
+		TupleDesc	relationDesc;
 		TupleDesc	tupDesc;
 
 		/* insert may only have one plan, inheritance is not expanded */
@@ -2111,26 +2347,26 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 			ExecAssignExprContext(estate, &mtstate->ps);
 
 		econtext = mtstate->ps.ps_ExprContext;
+		relationDesc = resultRelInfo->ri_RelationDesc->rd_att;
 
 		/* initialize slot for the existing tuple */
-		mtstate->mt_existing = ExecInitExtraTupleSlot(mtstate->ps.state);
-		ExecSetSlotDescriptor(mtstate->mt_existing,
-							  resultRelInfo->ri_RelationDesc->rd_att);
+		mtstate->mt_existing =
+			ExecInitExtraTupleSlot(mtstate->ps.state, relationDesc);
 
 		/* carried forward solely for the benefit of explain */
 		mtstate->mt_excludedtlist = node->exclRelTlist;
 
 		/* create target slot for UPDATE SET projection */
 		tupDesc = ExecTypeFromTL((List *) node->onConflictSet,
-								 resultRelInfo->ri_RelationDesc->rd_rel->relhasoids);
-		mtstate->mt_conflproj = ExecInitExtraTupleSlot(mtstate->ps.state);
-		ExecSetSlotDescriptor(mtstate->mt_conflproj, tupDesc);
+								 relationDesc->tdhasoid);
+		mtstate->mt_conflproj =
+			ExecInitExtraTupleSlot(mtstate->ps.state, tupDesc);
 
 		/* build UPDATE SET projection state */
 		resultRelInfo->ri_onConflictSetProj =
 			ExecBuildProjectionInfo(node->onConflictSet, econtext,
 									mtstate->mt_conflproj, &mtstate->ps,
-									resultRelInfo->ri_RelationDesc->rd_att);
+									relationDesc);
 
 		/* build DO UPDATE WHERE clause expression */
 		if (node->onConflictWhere)
@@ -2235,7 +2471,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 
 				j = ExecInitJunkFilter(subplan->targetlist,
 									   resultRelInfo->ri_RelationDesc->rd_att->tdhasoid,
-									   ExecInitExtraTupleSlot(estate));
+									   ExecInitExtraTupleSlot(estate, NULL));
 
 				if (operation == CMD_UPDATE || operation == CMD_DELETE)
 				{
@@ -2285,7 +2521,7 @@ ExecInitModifyTable(ModifyTable *node, EState *estate, int eflags)
 	 * we keep it in the estate.
 	 */
 	if (estate->es_trig_tuple_slot == NULL)
-		estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate);
+		estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate, NULL);
 
 	/*
 	 * Lastly, if this is not the primary (canSetTag) ModifyTable node, add it
@@ -2316,10 +2552,6 @@ ExecEndModifyTable(ModifyTableState *node)
 {
 	int			i;
 
-	/* Free transition tables */
-	if (node->mt_transition_capture != NULL)
-		DestroyTransitionCaptureState(node->mt_transition_capture);
-
 	/*
 	 * Allow any FDWs to shut down
 	 */
@@ -2334,32 +2566,9 @@ ExecEndModifyTable(ModifyTableState *node)
 														   resultRelInfo);
 	}
 
-	/*
-	 * Close all the partitioned tables, leaf partitions, and their indices
-	 *
-	 * Remember node->mt_partition_dispatch_info[0] corresponds to the root
-	 * partitioned table, which we must not try to close, because it is the
-	 * main target table of the query that will be closed by ExecEndPlan().
-	 * Also, tupslot is NULL for the root partitioned table.
-	 */
-	for (i = 1; i < node->mt_num_dispatch; i++)
-	{
-		PartitionDispatch pd = node->mt_partition_dispatch_info[i];
-
-		heap_close(pd->reldesc, NoLock);
-		ExecDropSingleTupleTableSlot(pd->tupslot);
-	}
-	for (i = 0; i < node->mt_num_partitions; i++)
-	{
-		ResultRelInfo *resultRelInfo = node->mt_partitions + i;
-
-		ExecCloseIndices(resultRelInfo);
-		heap_close(resultRelInfo->ri_RelationDesc, NoLock);
-	}
-
-	/* Release the standalone partition tuple descriptor, if any */
-	if (node->mt_partition_tuple_slot)
-		ExecDropSingleTupleTableSlot(node->mt_partition_tuple_slot);
+	/* Close all the partitioned tables, leaf partitions, and their indices */
+	if (node->mt_partition_tuple_routing)
+		ExecCleanupTupleRouting(node->mt_partition_tuple_routing);
 
 	/*
 	 * Free the exprcontext
diff --git a/src/backend/executor/nodeNamedtuplestorescan.c b/src/backend/executor/nodeNamedtuplestorescan.c
index 3a65b9f5dc..b260ad2594 100644
--- a/src/backend/executor/nodeNamedtuplestorescan.c
+++ b/src/backend/executor/nodeNamedtuplestorescan.c
@@ -3,7 +3,7 @@
  * nodeNamedtuplestorescan.c
  *	  routines to handle NamedTuplestoreScan nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -40,6 +40,7 @@ NamedTuplestoreScanNext(NamedTuplestoreScanState *node)
 	 * Get the next tuple from tuplestore. Return NULL if no more tuples.
 	 */
 	slot = node->ss.ss_ScanTupleSlot;
+	tuplestore_select_read_pointer(node->relation, node->readptr);
 	(void) tuplestore_gettupleslot(node->relation, true, false, slot);
 	return slot;
 }
@@ -116,6 +117,7 @@ ExecInitNamedTuplestoreScan(NamedTuplestoreScan *node, EState *estate, int eflag
 	 * The new read pointer copies its position from read pointer 0, which
 	 * could be anywhere, so explicitly rewind it.
 	 */
+	tuplestore_select_read_pointer(scanstate->relation, scanstate->readptr);
 	tuplestore_rescan(scanstate->relation);
 
 	/*
@@ -133,26 +135,21 @@ ExecInitNamedTuplestoreScan(NamedTuplestoreScan *node, EState *estate, int eflag
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
 	/*
-	 * initialize child expressions
+	 * Tuple table and result type initialization. The scan tuple type is
+	 * specified for the tuplestore.
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecInitScanTupleSlot(estate, &scanstate->ss, scanstate->tupdesc);
 
 	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
-
-	/*
-	 * The scan tuple type is specified for the tuplestore.
+	 * initialize child expressions
 	 */
-	ExecAssignScanType(&scanstate->ss, scanstate->tupdesc);
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize projection.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
 	ExecAssignScanProjectionInfo(&scanstate->ss);
 
 	return scanstate;
diff --git a/src/backend/executor/nodeNestloop.c b/src/backend/executor/nodeNestloop.c
index 4447b7c051..9ae9863226 100644
--- a/src/backend/executor/nodeNestloop.c
+++ b/src/backend/executor/nodeNestloop.c
@@ -3,7 +3,7 @@
  * nodeNestloop.c
  *	  routines to support nest-loop joins
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -285,15 +285,6 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &nlstate->js.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	nlstate->js.ps.qual =
-		ExecInitQual(node->join.plan.qual, (PlanState *) nlstate);
-	nlstate->js.jointype = node->join.jointype;
-	nlstate->js.joinqual =
-		ExecInitQual(node->join.joinqual, (PlanState *) nlstate);
-
 	/*
 	 * initialize child nodes
 	 *
@@ -311,9 +302,19 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags)
 	innerPlanState(nlstate) = ExecInitNode(innerPlan(node), estate, eflags);
 
 	/*
-	 * tuple table initialization
+	 * Initialize result slot, type and projection.
 	 */
-	ExecInitResultTupleSlot(estate, &nlstate->js.ps);
+	ExecInitResultTupleSlotTL(estate, &nlstate->js.ps);
+	ExecAssignProjectionInfo(&nlstate->js.ps, NULL);
+
+	/*
+	 * initialize child expressions
+	 */
+	nlstate->js.ps.qual =
+		ExecInitQual(node->join.plan.qual, (PlanState *) nlstate);
+	nlstate->js.jointype = node->join.jointype;
+	nlstate->js.joinqual =
+		ExecInitQual(node->join.joinqual, (PlanState *) nlstate);
 
 	/*
 	 * detect whether we need only consider the first matching inner tuple
@@ -338,12 +339,6 @@ ExecInitNestLoop(NestLoop *node, EState *estate, int eflags)
 				 (int) node->join.jointype);
 	}
 
-	/*
-	 * initialize tuple type and projection info
-	 */
-	ExecAssignResultTypeFromTL(&nlstate->js.ps);
-	ExecAssignProjectionInfo(&nlstate->js.ps, NULL);
-
 	/*
 	 * finally, wipe the current outer tuple clean.
 	 */
diff --git a/src/backend/executor/nodeProjectSet.c b/src/backend/executor/nodeProjectSet.c
index d93462c542..6d6ed38cee 100644
--- a/src/backend/executor/nodeProjectSet.c
+++ b/src/backend/executor/nodeProjectSet.c
@@ -11,7 +11,7 @@
  *		can't be inside more-complex expressions.  If that'd otherwise be
  *		the case, the planner adds additional ProjectSet nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -52,6 +52,13 @@ ExecProjectSet(PlanState *pstate)
 
 	econtext = node->ps.ps_ExprContext;
 
+	/*
+	 * Reset per-tuple context to free expression-evaluation storage allocated
+	 * for a potentially previously returned tuple. Note that the SRF argument
+	 * context has a different lifetime and is reset below.
+	 */
+	ResetExprContext(econtext);
+
 	/*
 	 * Check to see if we're still projecting out tuples from a previous scan
 	 * tuple (because there is a function-returning-set in the projection
@@ -66,11 +73,13 @@ ExecProjectSet(PlanState *pstate)
 	}
 
 	/*
-	 * Reset per-tuple memory context to free any expression evaluation
-	 * storage allocated in the previous tuple cycle.  Note this can't happen
-	 * until we're done projecting out tuples from a scan tuple.
+	 * Reset argument context to free any expression evaluation storage
+	 * allocated in the previous tuple cycle.  Note this can't happen until
+	 * we're done projecting out tuples from a scan tuple, as ValuePerCall
+	 * functions are allowed to reference the arguments for each returned
+	 * tuple.
 	 */
-	ResetExprContext(econtext);
+	MemoryContextReset(node->argcontext);
 
 	/*
 	 * Get another input tuple and project SRFs from it.
@@ -124,12 +133,16 @@ ExecProjectSRF(ProjectSetState *node, bool continuing)
 {
 	TupleTableSlot *resultSlot = node->ps.ps_ResultTupleSlot;
 	ExprContext *econtext = node->ps.ps_ExprContext;
+	MemoryContext oldcontext;
 	bool		hassrf PG_USED_FOR_ASSERTS_ONLY;
 	bool		hasresult;
 	int			argno;
 
 	ExecClearTuple(resultSlot);
 
+	/* Call SRFs, as well as plain expressions, in per-tuple context */
+	oldcontext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
+
 	/*
 	 * Assume no further tuples are produced unless an ExprMultipleResult is
 	 * encountered from a set returning function.
@@ -160,7 +173,8 @@ ExecProjectSRF(ProjectSetState *node, bool continuing)
 			 * Evaluate SRF - possibly continuing previously started output.
 			 */
 			*result = ExecMakeFunctionResultSet((SetExprState *) elem,
-												econtext, isnull, isdone);
+												econtext, node->argcontext,
+												isnull, isdone);
 
 			if (*isdone != ExprEndResult)
 				hasresult = true;
@@ -176,6 +190,8 @@ ExecProjectSRF(ProjectSetState *node, bool continuing)
 		}
 	}
 
+	MemoryContextSwitchTo(oldcontext);
+
 	/* ProjectSet should not be used if there's no SRFs */
 	Assert(hassrf);
 
@@ -227,14 +243,6 @@ ExecInitProjectSet(ProjectSet *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &state->ps);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &state->ps);
-
-	/* We don't support any qual on ProjectSet nodes */
-	Assert(node->plan.qual == NIL);
-
 	/*
 	 * initialize child nodes
 	 */
@@ -246,9 +254,9 @@ ExecInitProjectSet(ProjectSet *node, EState *estate, int eflags)
 	Assert(innerPlan(node) == NULL);
 
 	/*
-	 * initialize tuple type and projection info
+	 * tuple table and result type initialization
 	 */
-	ExecAssignResultTypeFromTL(&state->ps);
+	ExecInitResultTupleSlotTL(estate, &state->ps);
 
 	/* Create workspace for per-tlist-entry expr state & SRF-is-done state */
 	state->nelems = list_length(node->plan.targetlist);
@@ -285,6 +293,20 @@ ExecInitProjectSet(ProjectSet *node, EState *estate, int eflags)
 		off++;
 	}
 
+	/* We don't support any qual on ProjectSet nodes */
+	Assert(node->plan.qual == NIL);
+
+	/*
+	 * Create a memory context that ExecMakeFunctionResult can use to evaluate
+	 * function arguments in.  We can't use the per-tuple context for this
+	 * because it gets reset too often; but we don't want to leak evaluation
+	 * results into the query-lifespan context either.  We use one context for
+	 * the arguments of all tSRFs, as they have roughly equivalent lifetimes.
+	 */
+	state->argcontext = AllocSetContextCreate(CurrentMemoryContext,
+											  "tSRF function arguments",
+											  ALLOCSET_DEFAULT_SIZES);
+
 	return state;
 }
 
diff --git a/src/backend/executor/nodeRecursiveunion.c b/src/backend/executor/nodeRecursiveunion.c
index a64dd1397a..6b3ea5afb3 100644
--- a/src/backend/executor/nodeRecursiveunion.c
+++ b/src/backend/executor/nodeRecursiveunion.c
@@ -7,7 +7,7 @@
  * already seen.  The hash key is computed from the grouping columns.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -32,13 +32,16 @@ static void
 build_hash_table(RecursiveUnionState *rustate)
 {
 	RecursiveUnion *node = (RecursiveUnion *) rustate->ps.plan;
+	TupleDesc	desc = ExecGetResultType(outerPlanState(rustate));
 
 	Assert(node->numCols > 0);
 	Assert(node->numGroups > 0);
 
-	rustate->hashtable = BuildTupleHashTable(node->numCols,
+	rustate->hashtable = BuildTupleHashTable(&rustate->ps,
+											 desc,
+											 node->numCols,
 											 node->dupColIdx,
-											 rustate->eqfunctions,
+											 rustate->eqfuncoids,
 											 rustate->hashfunctions,
 											 node->numGroups,
 											 0,
@@ -175,7 +178,7 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags)
 	rustate->ps.state = estate;
 	rustate->ps.ExecProcNode = ExecRecursiveUnion;
 
-	rustate->eqfunctions = NULL;
+	rustate->eqfuncoids = NULL;
 	rustate->hashfunctions = NULL;
 	rustate->hashtable = NULL;
 	rustate->tempContext = NULL;
@@ -226,14 +229,13 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags)
 	 * RecursiveUnion nodes still have Result slots, which hold pointers to
 	 * tuples, so we have to initialize them.
 	 */
-	ExecInitResultTupleSlot(estate, &rustate->ps);
+	ExecInitResultTupleSlotTL(estate, &rustate->ps);
 
 	/*
-	 * Initialize result tuple type and projection info.  (Note: we have to
-	 * set up the result type before initializing child nodes, because
-	 * nodeWorktablescan.c expects it to be valid.)
+	 * Initialize result tuple type.  (Note: we have to set up the result type
+	 * before initializing child nodes, because nodeWorktablescan.c expects it
+	 * to be valid.)
 	 */
-	ExecAssignResultTypeFromTL(&rustate->ps);
 	rustate->ps.ps_ProjInfo = NULL;
 
 	/*
@@ -250,7 +252,7 @@ ExecInitRecursiveUnion(RecursiveUnion *node, EState *estate, int eflags)
 	{
 		execTuplesHashPrepare(node->numCols,
 							  node->dupOperators,
-							  &rustate->eqfunctions,
+							  &rustate->eqfuncoids,
 							  &rustate->hashfunctions);
 		build_hash_table(rustate);
 	}
diff --git a/src/backend/executor/nodeResult.c b/src/backend/executor/nodeResult.c
index 4c879d8765..e4418a29bb 100644
--- a/src/backend/executor/nodeResult.c
+++ b/src/backend/executor/nodeResult.c
@@ -34,7 +34,7 @@
  *		plan normally and pass back the results.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -204,19 +204,6 @@ ExecInitResult(Result *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &resstate->ps);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &resstate->ps);
-
-	/*
-	 * initialize child expressions
-	 */
-	resstate->ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) resstate);
-	resstate->resconstantqual =
-		ExecInitQual((List *) node->resconstantqual, (PlanState *) resstate);
-
 	/*
 	 * initialize child nodes
 	 */
@@ -228,11 +215,19 @@ ExecInitResult(Result *node, EState *estate, int eflags)
 	Assert(innerPlan(node) == NULL);
 
 	/*
-	 * initialize tuple type and projection info
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&resstate->ps);
+	ExecInitResultTupleSlotTL(estate, &resstate->ps);
 	ExecAssignProjectionInfo(&resstate->ps, NULL);
 
+	/*
+	 * initialize child expressions
+	 */
+	resstate->ps.qual =
+		ExecInitQual(node->plan.qual, (PlanState *) resstate);
+	resstate->resconstantqual =
+		ExecInitQual((List *) node->resconstantqual, (PlanState *) resstate);
+
 	return resstate;
 }
 
diff --git a/src/backend/executor/nodeSamplescan.c b/src/backend/executor/nodeSamplescan.c
index 9c74a836e4..872d6e5735 100644
--- a/src/backend/executor/nodeSamplescan.c
+++ b/src/backend/executor/nodeSamplescan.c
@@ -3,7 +3,7 @@
  * nodeSamplescan.c
  *	  Support routines for sample scans of relations (table sampling).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,7 +26,6 @@
 #include "utils/rel.h"
 #include "utils/tqual.h"
 
-static void InitScanRelation(SampleScanState *node, EState *estate, int eflags);
 static TupleTableSlot *SampleNext(SampleScanState *node);
 static void tablesample_init(SampleScanState *scanstate);
 static HeapTuple tablesample_getnext(SampleScanState *scanstate);
@@ -106,35 +105,6 @@ ExecSampleScan(PlanState *pstate)
 					(ExecScanRecheckMtd) SampleRecheck);
 }
 
-/* ----------------------------------------------------------------
- *		InitScanRelation
- *
- *		Set up to access the scan relation.
- * ----------------------------------------------------------------
- */
-static void
-InitScanRelation(SampleScanState *node, EState *estate, int eflags)
-{
-	Relation	currentRelation;
-
-	/*
-	 * get the relation object id from the relid'th entry in the range table,
-	 * open that relation and acquire appropriate lock on it.
-	 */
-	currentRelation = ExecOpenScanRelation(estate,
-										   ((SampleScan *) node->ss.ps.plan)->scan.scanrelid,
-										   eflags);
-
-	node->ss.ss_currentRelation = currentRelation;
-
-	/* we won't set up the HeapScanDesc till later */
-	node->ss.ss_currentScanDesc = NULL;
-
-	/* and report the scan tuple slot's rowtype */
-	ExecAssignScanType(&node->ss, RelationGetDescr(currentRelation));
-}
-
-
 /* ----------------------------------------------------------------
  *		ExecInitSampleScan
  * ----------------------------------------------------------------
@@ -165,31 +135,39 @@ ExecInitSampleScan(SampleScan *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
 	/*
-	 * initialize child expressions
+	 * Initialize scan relation.
+	 *
+	 * Get the relation object id from the relid'th entry in the range table,
+	 * open that relation and acquire appropriate lock on it.
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	scanstate->ss.ss_currentRelation =
+		ExecOpenScanRelation(estate,
+							 node->scan.scanrelid,
+							 eflags);
 
-	scanstate->args = ExecInitExprList(tsc->args, (PlanState *) scanstate);
-	scanstate->repeatable =
-		ExecInitExpr(tsc->repeatable, (PlanState *) scanstate);
+	/* we won't set up the HeapScanDesc till later */
+	scanstate->ss.ss_currentScanDesc = NULL;
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
+	/* and create slot with appropriate rowtype */
+	ExecInitScanTupleSlot(estate, &scanstate->ss,
+						  RelationGetDescr(scanstate->ss.ss_currentRelation));
 
 	/*
-	 * initialize scan relation
+	 * Initialize result slot, type and projection.
+	 * tuple table and result tuple initialization
 	 */
-	InitScanRelation(scanstate, estate, eflags);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecAssignScanProjectionInfo(&scanstate->ss);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * initialize child expressions
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
-	ExecAssignScanProjectionInfo(&scanstate->ss);
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+
+	scanstate->args = ExecInitExprList(tsc->args, (PlanState *) scanstate);
+	scanstate->repeatable =
+		ExecInitExpr(tsc->repeatable, (PlanState *) scanstate);
 
 	/*
 	 * If we don't have a REPEATABLE clause, select a random seed.  We want to
diff --git a/src/backend/executor/nodeSeqscan.c b/src/backend/executor/nodeSeqscan.c
index 5c49d4ca8a..9db368922a 100644
--- a/src/backend/executor/nodeSeqscan.c
+++ b/src/backend/executor/nodeSeqscan.c
@@ -3,7 +3,7 @@
  * nodeSeqscan.c
  *	  Support routines for sequential scans of relations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -22,6 +22,7 @@
  *
  *		ExecSeqScanEstimate		estimates DSM space needed for parallel scan
  *		ExecSeqScanInitializeDSM initialize DSM for parallel scan
+ *		ExecSeqScanReInitializeDSM reinitialize DSM for fresh parallel scan
  *		ExecSeqScanInitializeWorker attach to DSM info in parallel worker
  */
 #include "postgres.h"
@@ -31,7 +32,6 @@
 #include "executor/nodeSeqscan.h"
 #include "utils/rel.h"
 
-static void InitScanRelation(SeqScanState *node, EState *estate, int eflags);
 static TupleTableSlot *SeqNext(SeqScanState *node);
 
 /* ----------------------------------------------------------------
@@ -131,31 +131,6 @@ ExecSeqScan(PlanState *pstate)
 					(ExecScanRecheckMtd) SeqRecheck);
 }
 
-/* ----------------------------------------------------------------
- *		InitScanRelation
- *
- *		Set up to access the scan relation.
- * ----------------------------------------------------------------
- */
-static void
-InitScanRelation(SeqScanState *node, EState *estate, int eflags)
-{
-	Relation	currentRelation;
-
-	/*
-	 * get the relation object id from the relid'th entry in the range table,
-	 * open that relation and acquire appropriate lock on it.
-	 */
-	currentRelation = ExecOpenScanRelation(estate,
-										   ((SeqScan *) node->ss.ps.plan)->scanrelid,
-										   eflags);
-
-	node->ss.ss_currentRelation = currentRelation;
-
-	/* and report the scan tuple slot's rowtype */
-	ExecAssignScanType(&node->ss, RelationGetDescr(currentRelation));
-}
-
 
 /* ----------------------------------------------------------------
  *		ExecInitSeqScan
@@ -189,27 +164,31 @@ ExecInitSeqScan(SeqScan *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
 	/*
-	 * initialize child expressions
+	 * Initialize scan relation.
+	 *
+	 * Get the relation object id from the relid'th entry in the range table,
+	 * open that relation and acquire appropriate lock on it.
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->plan.qual, (PlanState *) scanstate);
+	scanstate->ss.ss_currentRelation =
+		ExecOpenScanRelation(estate,
+							 node->scanrelid,
+							 eflags);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
+	/* and create slot with the appropriate rowtype */
+	ExecInitScanTupleSlot(estate, &scanstate->ss,
+						  RelationGetDescr(scanstate->ss.ss_currentRelation));
 
 	/*
-	 * initialize scan relation
+	 * Initialize result slot, type and projection.
 	 */
-	InitScanRelation(scanstate, estate, eflags);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecAssignScanProjectionInfo(&scanstate->ss);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * initialize child expressions
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
-	ExecAssignScanProjectionInfo(&scanstate->ss);
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->plan.qual, (PlanState *) scanstate);
 
 	return scanstate;
 }
@@ -288,7 +267,8 @@ ExecReScanSeqScan(SeqScanState *node)
 /* ----------------------------------------------------------------
  *		ExecSeqScanEstimate
  *
- *		estimates the space required to serialize seqscan node.
+ *		Compute the amount of space we'll need in the parallel
+ *		query DSM, and inform pcxt->estimator about our needs.
  * ----------------------------------------------------------------
  */
 void
@@ -324,6 +304,21 @@ ExecSeqScanInitializeDSM(SeqScanState *node,
 		heap_beginscan_parallel(node->ss.ss_currentRelation, pscan);
 }
 
+/* ----------------------------------------------------------------
+ *		ExecSeqScanReInitializeDSM
+ *
+ *		Reset shared state before beginning a fresh scan.
+ * ----------------------------------------------------------------
+ */
+void
+ExecSeqScanReInitializeDSM(SeqScanState *node,
+						   ParallelContext *pcxt)
+{
+	HeapScanDesc scan = node->ss.ss_currentScanDesc;
+
+	heap_parallelscan_reinitialize(scan->rs_parallel);
+}
+
 /* ----------------------------------------------------------------
  *		ExecSeqScanInitializeWorker
  *
@@ -331,11 +326,12 @@ ExecSeqScanInitializeDSM(SeqScanState *node,
  * ----------------------------------------------------------------
  */
 void
-ExecSeqScanInitializeWorker(SeqScanState *node, shm_toc *toc)
+ExecSeqScanInitializeWorker(SeqScanState *node,
+							ParallelWorkerContext *pwcxt)
 {
 	ParallelHeapScanDesc pscan;
 
-	pscan = shm_toc_lookup(toc, node->ss.ps.plan->plan_node_id, false);
+	pscan = shm_toc_lookup(pwcxt->toc, node->ss.ps.plan->plan_node_id, false);
 	node->ss.ss_currentScanDesc =
 		heap_beginscan_parallel(node->ss.ss_currentRelation, pscan);
 }
diff --git a/src/backend/executor/nodeSetOp.c b/src/backend/executor/nodeSetOp.c
index 571cbf86b1..3fa4a5fcc6 100644
--- a/src/backend/executor/nodeSetOp.c
+++ b/src/backend/executor/nodeSetOp.c
@@ -32,7 +32,7 @@
  * input group.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -120,18 +120,22 @@ static void
 build_hash_table(SetOpState *setopstate)
 {
 	SetOp	   *node = (SetOp *) setopstate->ps.plan;
+	ExprContext *econtext = setopstate->ps.ps_ExprContext;
+	TupleDesc	desc = ExecGetResultType(outerPlanState(setopstate));
 
 	Assert(node->strategy == SETOP_HASHED);
 	Assert(node->numGroups > 0);
 
-	setopstate->hashtable = BuildTupleHashTable(node->numCols,
+	setopstate->hashtable = BuildTupleHashTable(&setopstate->ps,
+												desc,
+												node->numCols,
 												node->dupColIdx,
-												setopstate->eqfunctions,
+												setopstate->eqfuncoids,
 												setopstate->hashfunctions,
 												node->numGroups,
 												0,
 												setopstate->tableContext,
-												setopstate->tempContext,
+												econtext->ecxt_per_tuple_memory,
 												false);
 }
 
@@ -220,11 +224,11 @@ ExecSetOp(PlanState *pstate)
 static TupleTableSlot *
 setop_retrieve_direct(SetOpState *setopstate)
 {
-	SetOp	   *node = (SetOp *) setopstate->ps.plan;
 	PlanState  *outerPlan;
 	SetOpStatePerGroup pergroup;
 	TupleTableSlot *outerslot;
 	TupleTableSlot *resultTupleSlot;
+	ExprContext *econtext = setopstate->ps.ps_ExprContext;
 
 	/*
 	 * get state info from node
@@ -292,11 +296,10 @@ setop_retrieve_direct(SetOpState *setopstate)
 			/*
 			 * Check whether we've crossed a group boundary.
 			 */
-			if (!execTuplesMatch(resultTupleSlot,
-								 outerslot,
-								 node->numCols, node->dupColIdx,
-								 setopstate->eqfunctions,
-								 setopstate->tempContext))
+			econtext->ecxt_outertuple = resultTupleSlot;
+			econtext->ecxt_innertuple = outerslot;
+
+			if (!ExecQualAndReset(setopstate->eqfunction, econtext))
 			{
 				/*
 				 * Save the first input tuple of the next group.
@@ -338,6 +341,7 @@ setop_fill_hash_table(SetOpState *setopstate)
 	PlanState  *outerPlan;
 	int			firstFlag;
 	bool		in_first_rel PG_USED_FOR_ASSERTS_ONLY;
+	ExprContext *econtext = setopstate->ps.ps_ExprContext;
 
 	/*
 	 * get state info from node
@@ -404,8 +408,8 @@ setop_fill_hash_table(SetOpState *setopstate)
 				advance_counts((SetOpStatePerGroup) entry->additional, flag);
 		}
 
-		/* Must reset temp context after each hashtable lookup */
-		MemoryContextReset(setopstate->tempContext);
+		/* Must reset expression context after each hashtable lookup */
+		ResetExprContext(econtext);
 	}
 
 	setopstate->table_filled = true;
@@ -476,6 +480,7 @@ SetOpState *
 ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 {
 	SetOpState *setopstate;
+	TupleDesc	outerDesc;
 
 	/* check for unsupported flags */
 	Assert(!(eflags & (EXEC_FLAG_BACKWARD | EXEC_FLAG_MARK)));
@@ -488,7 +493,7 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 	setopstate->ps.state = estate;
 	setopstate->ps.ExecProcNode = ExecSetOp;
 
-	setopstate->eqfunctions = NULL;
+	setopstate->eqfuncoids = NULL;
 	setopstate->hashfunctions = NULL;
 	setopstate->setop_done = false;
 	setopstate->numOutput = 0;
@@ -498,16 +503,9 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 	setopstate->tableContext = NULL;
 
 	/*
-	 * Miscellaneous initialization
-	 *
-	 * SetOp nodes have no ExprContext initialization because they never call
-	 * ExecQual or ExecProject.  But they do need a per-tuple memory context
-	 * anyway for calling execTuplesMatch.
+	 * create expression context
 	 */
-	setopstate->tempContext =
-		AllocSetContextCreate(CurrentMemoryContext,
-							  "SetOp",
-							  ALLOCSET_DEFAULT_SIZES);
+	ExecAssignExprContext(estate, &setopstate->ps);
 
 	/*
 	 * If hashing, we also need a longer-lived context to store the hash
@@ -520,11 +518,6 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 								  "SetOp hash table",
 								  ALLOCSET_DEFAULT_SIZES);
 
-	/*
-	 * Tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &setopstate->ps);
-
 	/*
 	 * initialize child nodes
 	 *
@@ -534,12 +527,13 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 	if (node->strategy == SETOP_HASHED)
 		eflags &= ~EXEC_FLAG_REWIND;
 	outerPlanState(setopstate) = ExecInitNode(outerPlan(node), estate, eflags);
+	outerDesc = ExecGetResultType(outerPlanState(setopstate));
 
 	/*
-	 * setop nodes do no projections, so initialize projection info for this
-	 * node appropriately
+	 * Initialize result slot and type. Setop nodes do no projections, so
+	 * initialize projection info for this node appropriately.
 	 */
-	ExecAssignResultTypeFromTL(&setopstate->ps);
+	ExecInitResultTupleSlotTL(estate, &setopstate->ps);
 	setopstate->ps.ps_ProjInfo = NULL;
 
 	/*
@@ -550,12 +544,15 @@ ExecInitSetOp(SetOp *node, EState *estate, int eflags)
 	if (node->strategy == SETOP_HASHED)
 		execTuplesHashPrepare(node->numCols,
 							  node->dupOperators,
-							  &setopstate->eqfunctions,
+							  &setopstate->eqfuncoids,
 							  &setopstate->hashfunctions);
 	else
-		setopstate->eqfunctions =
-			execTuplesMatchPrepare(node->numCols,
-								   node->dupOperators);
+		setopstate->eqfunction =
+			execTuplesMatchPrepare(outerDesc,
+								   node->numCols,
+								   node->dupColIdx,
+								   node->dupOperators,
+								   &setopstate->ps);
 
 	if (node->strategy == SETOP_HASHED)
 	{
@@ -585,9 +582,9 @@ ExecEndSetOp(SetOpState *node)
 	ExecClearTuple(node->ps.ps_ResultTupleSlot);
 
 	/* free subsidiary stuff including hashtable */
-	MemoryContextDelete(node->tempContext);
 	if (node->tableContext)
 		MemoryContextDelete(node->tableContext);
+	ExecFreeExprContext(&node->ps);
 
 	ExecEndNode(outerPlanState(node));
 }
diff --git a/src/backend/executor/nodeSort.c b/src/backend/executor/nodeSort.c
index aae4150e2c..73f16c9aba 100644
--- a/src/backend/executor/nodeSort.c
+++ b/src/backend/executor/nodeSort.c
@@ -3,7 +3,7 @@
  * nodeSort.c
  *	  Routines to handle sorting of relations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -15,6 +15,7 @@
 
 #include "postgres.h"
 
+#include "access/parallel.h"
 #include "executor/execdebug.h"
 #include "executor/nodeSort.h"
 #include "miscadmin.h"
@@ -92,7 +93,7 @@ ExecSort(PlanState *pstate)
 											  plannode->collations,
 											  plannode->nullsFirst,
 											  work_mem,
-											  node->randomAccess);
+											  NULL, node->randomAccess);
 		if (node->bounded)
 			tuplesort_set_bound(tuplesortstate, node->bound);
 		node->tuplesortstate = (void *) tuplesortstate;
@@ -127,6 +128,15 @@ ExecSort(PlanState *pstate)
 		node->sort_Done = true;
 		node->bounded_Done = node->bounded;
 		node->bound_Done = node->bound;
+		if (node->shared_info && node->am_worker)
+		{
+			TuplesortInstrumentation *si;
+
+			Assert(IsParallelWorker());
+			Assert(ParallelWorkerNumber <= node->shared_info->num_workers);
+			si = &node->shared_info->sinstrument[ParallelWorkerNumber];
+			tuplesort_get_stats(tuplesortstate, si);
+		}
 		SO1_printf("ExecSort: %s\n", "sorting done");
 	}
 
@@ -188,14 +198,6 @@ ExecInitSort(Sort *node, EState *estate, int eflags)
 	 * ExecQual or ExecProject.
 	 */
 
-	/*
-	 * tuple table initialization
-	 *
-	 * sort nodes only return scan tuples from their sorted relation.
-	 */
-	ExecInitResultTupleSlot(estate, &sortstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &sortstate->ss);
-
 	/*
 	 * initialize child nodes
 	 *
@@ -207,11 +209,15 @@ ExecInitSort(Sort *node, EState *estate, int eflags)
 	outerPlanState(sortstate) = ExecInitNode(outerPlan(node), estate, eflags);
 
 	/*
-	 * initialize tuple type.  no need to initialize projection info because
+	 * Initialize scan slot and type.
+	 */
+	ExecCreateScanSlotFromOuterPlan(estate, &sortstate->ss);
+
+	/*
+	 * Initialize return slot and type. No need to initialize projection info because
 	 * this node doesn't do projections.
 	 */
-	ExecAssignResultTypeFromTL(&sortstate->ss.ps);
-	ExecAssignScanTypeFromOuterPlan(&sortstate->ss);
+	ExecInitResultTupleSlotTL(estate, &sortstate->ss.ps);
 	sortstate->ss.ps.ps_ProjInfo = NULL;
 
 	SO1_printf("ExecInitSort: %s\n",
@@ -334,3 +340,90 @@ ExecReScanSort(SortState *node)
 	else
 		tuplesort_rescan((Tuplesortstate *) node->tuplesortstate);
 }
+
+/* ----------------------------------------------------------------
+ *						Parallel Query Support
+ * ----------------------------------------------------------------
+ */
+
+/* ----------------------------------------------------------------
+ *		ExecSortEstimate
+ *
+ *		Estimate space required to propagate sort statistics.
+ * ----------------------------------------------------------------
+ */
+void
+ExecSortEstimate(SortState *node, ParallelContext *pcxt)
+{
+	Size		size;
+
+	/* don't need this if not instrumenting or no workers */
+	if (!node->ss.ps.instrument || pcxt->nworkers == 0)
+		return;
+
+	size = mul_size(pcxt->nworkers, sizeof(TuplesortInstrumentation));
+	size = add_size(size, offsetof(SharedSortInfo, sinstrument));
+	shm_toc_estimate_chunk(&pcxt->estimator, size);
+	shm_toc_estimate_keys(&pcxt->estimator, 1);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecSortInitializeDSM
+ *
+ *		Initialize DSM space for sort statistics.
+ * ----------------------------------------------------------------
+ */
+void
+ExecSortInitializeDSM(SortState *node, ParallelContext *pcxt)
+{
+	Size		size;
+
+	/* don't need this if not instrumenting or no workers */
+	if (!node->ss.ps.instrument || pcxt->nworkers == 0)
+		return;
+
+	size = offsetof(SharedSortInfo, sinstrument)
+		+ pcxt->nworkers * sizeof(TuplesortInstrumentation);
+	node->shared_info = shm_toc_allocate(pcxt->toc, size);
+	/* ensure any unfilled slots will contain zeroes */
+	memset(node->shared_info, 0, size);
+	node->shared_info->num_workers = pcxt->nworkers;
+	shm_toc_insert(pcxt->toc, node->ss.ps.plan->plan_node_id,
+				   node->shared_info);
+}
+
+/* ----------------------------------------------------------------
+ *		ExecSortInitializeWorker
+ *
+ *		Attach worker to DSM space for sort statistics.
+ * ----------------------------------------------------------------
+ */
+void
+ExecSortInitializeWorker(SortState *node, ParallelWorkerContext *pwcxt)
+{
+	node->shared_info =
+		shm_toc_lookup(pwcxt->toc, node->ss.ps.plan->plan_node_id, true);
+	node->am_worker = true;
+}
+
+/* ----------------------------------------------------------------
+ *		ExecSortRetrieveInstrumentation
+ *
+ *		Transfer sort statistics from DSM to private memory.
+ * ----------------------------------------------------------------
+ */
+void
+ExecSortRetrieveInstrumentation(SortState *node)
+{
+	Size		size;
+	SharedSortInfo *si;
+
+	if (node->shared_info == NULL)
+		return;
+
+	size = offsetof(SharedSortInfo, sinstrument)
+		+ node->shared_info->num_workers * sizeof(TuplesortInstrumentation);
+	si = palloc(size);
+	memcpy(si, node->shared_info, size);
+	node->shared_info = si;
+}
diff --git a/src/backend/executor/nodeSubplan.c b/src/backend/executor/nodeSubplan.c
index fe10e809df..d5411500a2 100644
--- a/src/backend/executor/nodeSubplan.c
+++ b/src/backend/executor/nodeSubplan.c
@@ -11,7 +11,7 @@
  * subplans, which are re-evaluated every time their result is required.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -149,7 +149,7 @@ ExecHashSubPlan(SubPlanState *node,
 		if (node->havehashrows &&
 			FindTupleHashEntry(node->hashtable,
 							   slot,
-							   node->cur_eq_funcs,
+							   node->cur_eq_comp,
 							   node->lhs_hash_funcs) != NULL)
 		{
 			ExecClearTuple(slot);
@@ -220,7 +220,7 @@ ExecScanSubPlan(SubPlanState *node,
 	MemoryContext oldcontext;
 	TupleTableSlot *slot;
 	Datum		result;
-	bool		found = false;	/* TRUE if got at least one subplan tuple */
+	bool		found = false;	/* true if got at least one subplan tuple */
 	ListCell   *pvar;
 	ListCell   *l;
 	ArrayBuildStateAny *astate = NULL;
@@ -360,7 +360,7 @@ ExecScanSubPlan(SubPlanState *node,
 
 			found = true;
 			/* stash away current value */
-			Assert(subplan->firstColType == tdesc->attrs[0]->atttypid);
+			Assert(subplan->firstColType == TupleDescAttr(tdesc, 0)->atttypid);
 			dvalue = slot_getattr(slot, 1, &disnull);
 			astate = accumArrayResultAny(astate, dvalue, disnull,
 										 subplan->firstColType, oldcontext);
@@ -494,9 +494,11 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 	if (nbuckets < 1)
 		nbuckets = 1;
 
-	node->hashtable = BuildTupleHashTable(ncols,
+	node->hashtable = BuildTupleHashTable(node->parent,
+										  node->descRight,
+										  ncols,
 										  node->keyColIdx,
-										  node->tab_eq_funcs,
+										  node->tab_eq_funcoids,
 										  node->tab_hash_funcs,
 										  nbuckets,
 										  0,
@@ -514,9 +516,11 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 			if (nbuckets < 1)
 				nbuckets = 1;
 		}
-		node->hashnulls = BuildTupleHashTable(ncols,
+		node->hashnulls = BuildTupleHashTable(node->parent,
+											  node->descRight,
+											  ncols,
 											  node->keyColIdx,
-											  node->tab_eq_funcs,
+											  node->tab_eq_funcoids,
 											  node->tab_hash_funcs,
 											  nbuckets,
 											  0,
@@ -598,6 +602,77 @@ buildSubPlanHash(SubPlanState *node, ExprContext *econtext)
 	MemoryContextSwitchTo(oldcontext);
 }
 
+/*
+ * execTuplesUnequal
+ *		Return true if two tuples are definitely unequal in the indicated
+ *		fields.
+ *
+ * Nulls are neither equal nor unequal to anything else.  A true result
+ * is obtained only if there are non-null fields that compare not-equal.
+ *
+ * slot1, slot2: the tuples to compare (must have same columns!)
+ * numCols: the number of attributes to be examined
+ * matchColIdx: array of attribute column numbers
+ * eqFunctions: array of fmgr lookup info for the equality functions to use
+ * evalContext: short-term memory context for executing the functions
+ */
+static bool
+execTuplesUnequal(TupleTableSlot *slot1,
+				  TupleTableSlot *slot2,
+				  int numCols,
+				  AttrNumber *matchColIdx,
+				  FmgrInfo *eqfunctions,
+				  MemoryContext evalContext)
+{
+	MemoryContext oldContext;
+	bool		result;
+	int			i;
+
+	/* Reset and switch into the temp context. */
+	MemoryContextReset(evalContext);
+	oldContext = MemoryContextSwitchTo(evalContext);
+
+	/*
+	 * We cannot report a match without checking all the fields, but we can
+	 * report a non-match as soon as we find unequal fields.  So, start
+	 * comparing at the last field (least significant sort key). That's the
+	 * most likely to be different if we are dealing with sorted input.
+	 */
+	result = false;
+
+	for (i = numCols; --i >= 0;)
+	{
+		AttrNumber	att = matchColIdx[i];
+		Datum		attr1,
+					attr2;
+		bool		isNull1,
+					isNull2;
+
+		attr1 = slot_getattr(slot1, att, &isNull1);
+
+		if (isNull1)
+			continue;			/* can't prove anything here */
+
+		attr2 = slot_getattr(slot2, att, &isNull2);
+
+		if (isNull2)
+			continue;			/* can't prove anything here */
+
+		/* Apply the type-specific equality function */
+
+		if (!DatumGetBool(FunctionCall2(&eqfunctions[i],
+										attr1, attr2)))
+		{
+			result = true;		/* they are unequal */
+			break;
+		}
+	}
+
+	MemoryContextSwitchTo(oldContext);
+
+	return result;
+}
+
 /*
  * findPartialMatch: does the hashtable contain an entry that is not
  * provably distinct from the tuple?
@@ -719,6 +794,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 	sstate->hashtempcxt = NULL;
 	sstate->innerecontext = NULL;
 	sstate->keyColIdx = NULL;
+	sstate->tab_eq_funcoids = NULL;
 	sstate->tab_hash_funcs = NULL;
 	sstate->tab_eq_funcs = NULL;
 	sstate->lhs_hash_funcs = NULL;
@@ -757,7 +833,8 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 	{
 		int			ncols,
 					i;
-		TupleDesc	tupDesc;
+		TupleDesc	tupDescLeft;
+		TupleDesc	tupDescRight;
 		TupleTableSlot *slot;
 		List	   *oplist,
 				   *lefttlist,
@@ -815,6 +892,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 		Assert(list_length(oplist) == ncols);
 
 		lefttlist = righttlist = NIL;
+		sstate->tab_eq_funcoids = (Oid *) palloc(ncols * sizeof(Oid));
 		sstate->tab_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
 		sstate->tab_eq_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
 		sstate->lhs_hash_funcs = (FmgrInfo *) palloc(ncols * sizeof(FmgrInfo));
@@ -848,6 +926,7 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 			righttlist = lappend(righttlist, tle);
 
 			/* Lookup the equality function (potentially cross-type) */
+			sstate->tab_eq_funcoids[i - 1] = opexpr->opfuncid;
 			fmgr_info(opexpr->opfuncid, &sstate->cur_eq_funcs[i - 1]);
 			fmgr_info_set_expr((Node *) opexpr, &sstate->cur_eq_funcs[i - 1]);
 
@@ -877,23 +956,32 @@ ExecInitSubPlan(SubPlan *subplan, PlanState *parent)
 		 * (hack alert!).  The righthand expressions will be evaluated in our
 		 * own innerecontext.
 		 */
-		tupDesc = ExecTypeFromTL(lefttlist, false);
-		slot = ExecInitExtraTupleSlot(estate);
-		ExecSetSlotDescriptor(slot, tupDesc);
+		tupDescLeft = ExecTypeFromTL(lefttlist, false);
+		slot = ExecInitExtraTupleSlot(estate, tupDescLeft);
 		sstate->projLeft = ExecBuildProjectionInfo(lefttlist,
 												   NULL,
 												   slot,
 												   parent,
 												   NULL);
 
-		tupDesc = ExecTypeFromTL(righttlist, false);
-		slot = ExecInitExtraTupleSlot(estate);
-		ExecSetSlotDescriptor(slot, tupDesc);
+		sstate->descRight = tupDescRight = ExecTypeFromTL(righttlist, false);
+		slot = ExecInitExtraTupleSlot(estate, tupDescRight);
 		sstate->projRight = ExecBuildProjectionInfo(righttlist,
 													sstate->innerecontext,
 													slot,
 													sstate->planstate,
 													NULL);
+
+		/*
+		 * Create comparator for lookups of rows in the table (potentially
+		 *  across-type comparison).
+		 */
+		sstate->cur_eq_comp = ExecBuildGroupingEqual(tupDescLeft, tupDescRight,
+													 ncols,
+													 sstate->keyColIdx,
+													 sstate->tab_eq_funcoids,
+													 parent);
+
 	}
 
 	return sstate;
@@ -992,7 +1080,7 @@ ExecSetParamPlan(SubPlanState *node, ExprContext *econtext)
 
 			found = true;
 			/* stash away current value */
-			Assert(subplan->firstColType == tdesc->attrs[0]->atttypid);
+			Assert(subplan->firstColType == TupleDescAttr(tdesc, 0)->atttypid);
 			dvalue = slot_getattr(slot, 1, &disnull);
 			astate = accumArrayResultAny(astate, dvalue, disnull,
 										 subplan->firstColType, oldcontext);
diff --git a/src/backend/executor/nodeSubqueryscan.c b/src/backend/executor/nodeSubqueryscan.c
index 088c92992e..fa61884785 100644
--- a/src/backend/executor/nodeSubqueryscan.c
+++ b/src/backend/executor/nodeSubqueryscan.c
@@ -7,7 +7,7 @@
  * we need two sets of code.  Ought to look at trying to unify the cases.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -120,35 +120,29 @@ ExecInitSubqueryScan(SubqueryScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &subquerystate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	subquerystate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) subquerystate);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &subquerystate->ss.ps);
-	ExecInitScanTupleSlot(estate, &subquerystate->ss);
-
 	/*
 	 * initialize subquery
 	 */
 	subquerystate->subplan = ExecInitNode(node->subplan, estate, eflags);
 
 	/*
-	 * Initialize scan tuple type (needed by ExecAssignScanProjectionInfo)
+	 * Initialize scan slot and type (needed by ExecInitResultTupleSlotTL)
 	 */
-	ExecAssignScanType(&subquerystate->ss,
-					   ExecGetResultType(subquerystate->subplan));
+	ExecInitScanTupleSlot(estate, &subquerystate->ss,
+						  ExecGetResultType(subquerystate->subplan));
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&subquerystate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &subquerystate->ss.ps);
 	ExecAssignScanProjectionInfo(&subquerystate->ss);
 
+	/*
+	 * initialize child expressions
+	 */
+	subquerystate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) subquerystate);
+
 	return subquerystate;
 }
 
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
index b03d2ef762..fed6f2b3a5 100644
--- a/src/backend/executor/nodeTableFuncscan.c
+++ b/src/backend/executor/nodeTableFuncscan.c
@@ -3,7 +3,7 @@
  * nodeTableFuncscan.c
  *	  Support routines for scanning RangeTableFunc (XMLTABLE like functions).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -139,18 +139,6 @@ ExecInitTableFuncScan(TableFuncScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, &scanstate->ss.ps);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
-
 	/*
 	 * initialize source tuple type
 	 */
@@ -158,15 +146,21 @@ ExecInitTableFuncScan(TableFuncScan *node, EState *estate, int eflags)
 								 tf->coltypes,
 								 tf->coltypmods,
 								 tf->colcollations);
-
-	ExecAssignScanType(&scanstate->ss, tupdesc);
+	/* and the corresponding scan slot */
+	ExecInitScanTupleSlot(estate, &scanstate->ss, tupdesc);
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
 	ExecAssignScanProjectionInfo(&scanstate->ss);
 
+	/*
+	 * initialize child expressions
+	 */
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, &scanstate->ss.ps);
+
 	/* Only XMLTABLE is supported currently */
 	scanstate->routine = &XmlTableRoutine;
 
@@ -202,7 +196,7 @@ ExecInitTableFuncScan(TableFuncScan *node, EState *estate, int eflags)
 	{
 		Oid			in_funcid;
 
-		getTypeInputInfo(tupdesc->attrs[i]->atttypid,
+		getTypeInputInfo(TupleDescAttr(tupdesc, i)->atttypid,
 						 &in_funcid, &scanstate->typioparams[i]);
 		fmgr_info(in_funcid, &scanstate->in_functions[i]);
 	}
@@ -390,6 +384,7 @@ tfuncInitialize(TableFuncScanState *tstate, ExprContext *econtext, Datum doc)
 	foreach(lc1, tstate->colexprs)
 	{
 		char	   *colfilter;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, colno);
 
 		if (colno != ordinalitycol)
 		{
@@ -403,11 +398,11 @@ tfuncInitialize(TableFuncScanState *tstate, ExprContext *econtext, Datum doc)
 							(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 							 errmsg("column filter expression must not be null"),
 							 errdetail("Filter for column \"%s\" is null.",
-									   NameStr(tupdesc->attrs[colno]->attname))));
+									   NameStr(att->attname))));
 				colfilter = TextDatumGetCString(value);
 			}
 			else
-				colfilter = NameStr(tupdesc->attrs[colno]->attname);
+				colfilter = NameStr(att->attname);
 
 			routine->SetColumnFilter(tstate, colfilter, colno);
 		}
@@ -453,6 +448,8 @@ tfuncLoadRows(TableFuncScanState *tstate, ExprContext *econtext)
 		 */
 		for (colno = 0; colno < natts; colno++)
 		{
+			Form_pg_attribute att = TupleDescAttr(tupdesc, colno);
+
 			if (colno == ordinalitycol)
 			{
 				/* Fast path for ordinality column */
@@ -465,8 +462,8 @@ tfuncLoadRows(TableFuncScanState *tstate, ExprContext *econtext)
 
 				values[colno] = routine->GetValue(tstate,
 												  colno,
-												  tupdesc->attrs[colno]->atttypid,
-												  tupdesc->attrs[colno]->atttypmod,
+												  att->atttypid,
+												  att->atttypmod,
 												  &isnull);
 
 				/* No value?  Evaluate and apply the default, if any */
@@ -484,7 +481,7 @@ tfuncLoadRows(TableFuncScanState *tstate, ExprContext *econtext)
 					ereport(ERROR,
 							(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
 							 errmsg("null is not allowed in column \"%s\"",
-									NameStr(tupdesc->attrs[colno]->attname))));
+									NameStr(att->attname))));
 
 				nulls[colno] = isnull;
 			}
diff --git a/src/backend/executor/nodeTidscan.c b/src/backend/executor/nodeTidscan.c
index 0ee76e7d25..e207b1ffb5 100644
--- a/src/backend/executor/nodeTidscan.c
+++ b/src/backend/executor/nodeTidscan.c
@@ -3,7 +3,7 @@
  * nodeTidscan.c
  *	  Routines to support direct tid scans of relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -530,20 +530,6 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags)
 	 */
 	ExecAssignExprContext(estate, &tidstate->ss.ps);
 
-	/*
-	 * initialize child expressions
-	 */
-	tidstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) tidstate);
-
-	TidExprListCreate(tidstate);
-
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &tidstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &tidstate->ss);
-
 	/*
 	 * mark tid list as not computed yet
 	 */
@@ -562,14 +548,23 @@ ExecInitTidScan(TidScan *node, EState *estate, int eflags)
 	/*
 	 * get the scan type from the relation descriptor.
 	 */
-	ExecAssignScanType(&tidstate->ss, RelationGetDescr(currentRelation));
+	ExecInitScanTupleSlot(estate, &tidstate->ss,
+						  RelationGetDescr(currentRelation));
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&tidstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &tidstate->ss.ps);
 	ExecAssignScanProjectionInfo(&tidstate->ss);
 
+	/*
+	 * initialize child expressions
+	 */
+	tidstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) tidstate);
+
+	TidExprListCreate(tidstate);
+
 	/*
 	 * all done.
 	 */
diff --git a/src/backend/executor/nodeUnique.c b/src/backend/executor/nodeUnique.c
index 621fdd9b9c..05d65330a0 100644
--- a/src/backend/executor/nodeUnique.c
+++ b/src/backend/executor/nodeUnique.c
@@ -11,7 +11,7 @@
  * (It's debatable whether the savings justifies carrying two plan node
  * types, though.)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -47,7 +47,7 @@ static TupleTableSlot *			/* return: a tuple or NULL */
 ExecUnique(PlanState *pstate)
 {
 	UniqueState *node = castNode(UniqueState, pstate);
-	Unique	   *plannode = (Unique *) node->ps.plan;
+	ExprContext *econtext = node->ps.ps_ExprContext;
 	TupleTableSlot *resultTupleSlot;
 	TupleTableSlot *slot;
 	PlanState  *outerPlan;
@@ -89,10 +89,9 @@ ExecUnique(PlanState *pstate)
 		 * If so then we loop back and fetch another new tuple from the
 		 * subplan.
 		 */
-		if (!execTuplesMatch(slot, resultTupleSlot,
-							 plannode->numCols, plannode->uniqColIdx,
-							 node->eqfunctions,
-							 node->tempContext))
+		econtext->ecxt_innertuple = slot;
+		econtext->ecxt_outertuple = resultTupleSlot;
+		if (!ExecQualAndReset(node->eqfunction, econtext))
 			break;
 	}
 
@@ -129,21 +128,9 @@ ExecInitUnique(Unique *node, EState *estate, int eflags)
 	uniquestate->ps.ExecProcNode = ExecUnique;
 
 	/*
-	 * Miscellaneous initialization
-	 *
-	 * Unique nodes have no ExprContext initialization because they never call
-	 * ExecQual or ExecProject.  But they do need a per-tuple memory context
-	 * anyway for calling execTuplesMatch.
+	 * create expression context
 	 */
-	uniquestate->tempContext =
-		AllocSetContextCreate(CurrentMemoryContext,
-							  "Unique",
-							  ALLOCSET_DEFAULT_SIZES);
-
-	/*
-	 * Tuple table initialization
-	 */
-	ExecInitResultTupleSlot(estate, &uniquestate->ps);
+	ExecAssignExprContext(estate, &uniquestate->ps);
 
 	/*
 	 * then initialize outer plan
@@ -151,18 +138,21 @@ ExecInitUnique(Unique *node, EState *estate, int eflags)
 	outerPlanState(uniquestate) = ExecInitNode(outerPlan(node), estate, eflags);
 
 	/*
-	 * unique nodes do no projections, so initialize projection info for this
-	 * node appropriately
+	 * Initialize result slot and type. Unique nodes do no projections, so
+	 * initialize projection info for this node appropriately.
 	 */
-	ExecAssignResultTypeFromTL(&uniquestate->ps);
+	ExecInitResultTupleSlotTL(estate, &uniquestate->ps);
 	uniquestate->ps.ps_ProjInfo = NULL;
 
 	/*
 	 * Precompute fmgr lookup data for inner loop
 	 */
-	uniquestate->eqfunctions =
-		execTuplesMatchPrepare(node->numCols,
-							   node->uniqOperators);
+	uniquestate->eqfunction =
+		execTuplesMatchPrepare(ExecGetResultType(outerPlanState(uniquestate)),
+							   node->numCols,
+							   node->uniqColIdx,
+							   node->uniqOperators,
+							   &uniquestate->ps);
 
 	return uniquestate;
 }
@@ -180,7 +170,7 @@ ExecEndUnique(UniqueState *node)
 	/* clean up tuple table */
 	ExecClearTuple(node->ps.ps_ResultTupleSlot);
 
-	MemoryContextDelete(node->tempContext);
+	ExecFreeExprContext(&node->ps);
 
 	ExecEndNode(outerPlanState(node));
 }
diff --git a/src/backend/executor/nodeValuesscan.c b/src/backend/executor/nodeValuesscan.c
index 6eacaed8bb..63b7e7ef5b 100644
--- a/src/backend/executor/nodeValuesscan.c
+++ b/src/backend/executor/nodeValuesscan.c
@@ -4,7 +4,7 @@
  *	  Support routines for scanning Values lists
  *	  ("VALUES (...), (...), ..." in rangetable).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -92,10 +92,10 @@ ValuesNext(ValuesScanState *node)
 	if (exprlist)
 	{
 		MemoryContext oldContext;
+		List	   *oldsubplans;
 		List	   *exprstatelist;
 		Datum	   *values;
 		bool	   *isnull;
-		Form_pg_attribute *att;
 		ListCell   *lc;
 		int			resind;
 
@@ -115,12 +115,22 @@ ValuesNext(ValuesScanState *node)
 		oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
 
 		/*
-		 * Pass NULL, not my plan node, because we don't want anything in this
-		 * transient state linking into permanent state.  The only possibility
-		 * is a SubPlan, and there shouldn't be any (any subselects in the
-		 * VALUES list should be InitPlans).
+		 * The expressions might contain SubPlans (this is currently only
+		 * possible if there's a sub-select containing a LATERAL reference,
+		 * otherwise sub-selects in a VALUES list should be InitPlans). Those
+		 * subplans will want to hook themselves into our subPlan list, which
+		 * would result in a corrupted list after we delete the eval state. We
+		 * can work around this by saving and restoring the subPlan list.
+		 * (There's no need for the functionality that would be enabled by
+		 * having the list entries, since the SubPlans aren't going to be
+		 * re-executed anyway.)
 		 */
-		exprstatelist = ExecInitExprList(exprlist, NULL);
+		oldsubplans = node->ss.ps.subPlan;
+		node->ss.ps.subPlan = NIL;
+
+		exprstatelist = ExecInitExprList(exprlist, &node->ss.ps);
+
+		node->ss.ps.subPlan = oldsubplans;
 
 		/* parser should have checked all sublists are the same length */
 		Assert(list_length(exprstatelist) == slot->tts_tupleDescriptor->natts);
@@ -131,12 +141,13 @@ ValuesNext(ValuesScanState *node)
 		 */
 		values = slot->tts_values;
 		isnull = slot->tts_isnull;
-		att = slot->tts_tupleDescriptor->attrs;
 
 		resind = 0;
 		foreach(lc, exprstatelist)
 		{
 			ExprState  *estate = (ExprState *) lfirst(lc);
+			Form_pg_attribute attr = TupleDescAttr(slot->tts_tupleDescriptor,
+												   resind);
 
 			values[resind] = ExecEvalExpr(estate,
 										  econtext,
@@ -150,7 +161,7 @@ ValuesNext(ValuesScanState *node)
 			 */
 			values[resind] = MakeExpandedObjectReadOnly(values[resind],
 														isnull[resind],
-														att[resind]->attlen);
+														attr->attlen);
 
 			resind++;
 		}
@@ -237,23 +248,22 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, planstate);
 
 	/*
-	 * tuple table initialization
+	 * Get info about values list, initialize scan slot with it.
 	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
+	tupdesc = ExecTypeFromExprList((List *) linitial(node->values_lists));
+	ExecInitScanTupleSlot(estate, &scanstate->ss, tupdesc);
 
 	/*
-	 * initialize child expressions
+	 * Initialize result slot, type and projection.
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecAssignScanProjectionInfo(&scanstate->ss);
 
 	/*
-	 * get info about values list
+	 * initialize child expressions
 	 */
-	tupdesc = ExecTypeFromExprList((List *) linitial(node->values_lists));
-
-	ExecAssignScanType(&scanstate->ss, tupdesc);
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
 
 	/*
 	 * Other node-specific setup
@@ -270,12 +280,6 @@ ExecInitValuesScan(ValuesScan *node, EState *estate, int eflags)
 		scanstate->exprlists[i++] = (List *) lfirst(vtl);
 	}
 
-	/*
-	 * Initialize result tuple type and projection info.
-	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
-	ExecAssignScanProjectionInfo(&scanstate->ss);
-
 	return scanstate;
 }
 
diff --git a/src/backend/executor/nodeWindowAgg.c b/src/backend/executor/nodeWindowAgg.c
index 80be46029f..fe5369a0c7 100644
--- a/src/backend/executor/nodeWindowAgg.c
+++ b/src/backend/executor/nodeWindowAgg.c
@@ -23,7 +23,7 @@
  * aggregate function over all rows in the current row's window frame.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -49,6 +49,7 @@
 #include "utils/datum.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
+#include "utils/regproc.h"
 #include "utils/syscache.h"
 #include "windowapi.h"
 
@@ -179,10 +180,11 @@ static void begin_partition(WindowAggState *winstate);
 static void spool_tuples(WindowAggState *winstate, int64 pos);
 static void release_partition(WindowAggState *winstate);
 
-static bool row_is_in_frame(WindowAggState *winstate, int64 pos,
+static int row_is_in_frame(WindowAggState *winstate, int64 pos,
 				TupleTableSlot *slot);
-static void update_frameheadpos(WindowObject winobj, TupleTableSlot *slot);
-static void update_frametailpos(WindowObject winobj, TupleTableSlot *slot);
+static void update_frameheadpos(WindowAggState *winstate);
+static void update_frametailpos(WindowAggState *winstate);
+static void update_grouptailpos(WindowAggState *winstate);
 
 static WindowStatePerAggData *initialize_peragg(WindowAggState *winstate,
 				  WindowFunc *wfunc,
@@ -682,11 +684,9 @@ eval_windowaggregates(WindowAggState *winstate)
 	temp_slot = winstate->temp_slot_1;
 
 	/*
-	 * Currently, we support only a subset of the SQL-standard window framing
-	 * rules.
-	 *
-	 * If the frame start is UNBOUNDED_PRECEDING, the window frame consists of
-	 * a contiguous group of rows extending forward from the start of the
+	 * If the window's frame start clause is UNBOUNDED_PRECEDING and no
+	 * exclusion clause is specified, then the window frame consists of a
+	 * contiguous group of rows extending forward from the start of the
 	 * partition, and rows only enter the frame, never exit it, as the current
 	 * row advances forward.  This makes it possible to use an incremental
 	 * strategy for evaluating aggregates: we run the transition function for
@@ -709,6 +709,11 @@ eval_windowaggregates(WindowAggState *winstate)
 	 * must perform the aggregation all over again for all tuples within the
 	 * new frame boundaries.
 	 *
+	 * If there's any exclusion clause, then we may have to aggregate over a
+	 * non-contiguous set of rows, so we punt and recalculate for every row.
+	 * (For some frame end choices, it might be that the frame is always
+	 * contiguous anyway, but that's an optimization to investigate later.)
+	 *
 	 * In many common cases, multiple rows share the same frame and hence the
 	 * same aggregate value. (In particular, if there's no ORDER BY in a RANGE
 	 * window, then all rows are peers and so they all have window frame equal
@@ -727,7 +732,7 @@ eval_windowaggregates(WindowAggState *winstate)
 	 * The frame head should never move backwards, and the code below wouldn't
 	 * cope if it did, so for safety we complain if it does.
 	 */
-	update_frameheadpos(agg_winobj, temp_slot);
+	update_frameheadpos(winstate);
 	if (winstate->frameheadpos < winstate->aggregatedbase)
 		elog(ERROR, "window frame head moved backward");
 
@@ -736,15 +741,16 @@ eval_windowaggregates(WindowAggState *winstate)
 	 * the result values that were previously saved at the bottom of this
 	 * function.  Since we don't know the current frame's end yet, this is not
 	 * possible to check for fully.  But if the frame end mode is UNBOUNDED
-	 * FOLLOWING or CURRENT ROW, and the current row lies within the previous
-	 * row's frame, then the two frames' ends must coincide.  Note that on the
-	 * first row aggregatedbase == aggregatedupto, meaning this test must
-	 * fail, so we don't need to check the "there was no previous row" case
-	 * explicitly here.
+	 * FOLLOWING or CURRENT ROW, no exclusion clause is specified, and the
+	 * current row lies within the previous row's frame, then the two frames'
+	 * ends must coincide.  Note that on the first row aggregatedbase ==
+	 * aggregatedupto, meaning this test must fail, so we don't need to check
+	 * the "there was no previous row" case explicitly here.
 	 */
 	if (winstate->aggregatedbase == winstate->frameheadpos &&
 		(winstate->frameOptions & (FRAMEOPTION_END_UNBOUNDED_FOLLOWING |
 								   FRAMEOPTION_END_CURRENT_ROW)) &&
+		!(winstate->frameOptions & FRAMEOPTION_EXCLUSION) &&
 		winstate->aggregatedbase <= winstate->currentpos &&
 		winstate->aggregatedupto > winstate->currentpos)
 	{
@@ -765,6 +771,7 @@ eval_windowaggregates(WindowAggState *winstate)
 	 *	 - if we're processing the first row in the partition, or
 	 *	 - if the frame's head moved and we cannot use an inverse
 	 *	   transition function, or
+	 *	 - we have an EXCLUSION clause, or
 	 *	 - if the new frame doesn't overlap the old one
 	 *
 	 * Note that we don't strictly need to restart in the last case, but if
@@ -779,6 +786,7 @@ eval_windowaggregates(WindowAggState *winstate)
 		if (winstate->currentpos == 0 ||
 			(winstate->aggregatedbase != winstate->frameheadpos &&
 			 !OidIsValid(peraggstate->invtransfn_oid)) ||
+			(winstate->frameOptions & FRAMEOPTION_EXCLUSION) ||
 			winstate->aggregatedupto <= winstate->frameheadpos)
 		{
 			peraggstate->restart = true;
@@ -919,6 +927,8 @@ eval_windowaggregates(WindowAggState *winstate)
 	 */
 	for (;;)
 	{
+		int			ret;
+
 		/* Fetch next row if we didn't already */
 		if (TupIsNull(agg_row_slot))
 		{
@@ -927,9 +937,15 @@ eval_windowaggregates(WindowAggState *winstate)
 				break;			/* must be end of partition */
 		}
 
-		/* Exit loop (for now) if not in frame */
-		if (!row_is_in_frame(winstate, winstate->aggregatedupto, agg_row_slot))
+		/*
+		 * Exit loop if no more rows can be in frame.  Skip aggregation if
+		 * current row is not in frame but there might be more in the frame.
+		 */
+		ret = row_is_in_frame(winstate, winstate->aggregatedupto, agg_row_slot);
+		if (ret < 0)
 			break;
+		if (ret == 0)
+			goto next_tuple;
 
 		/* Set tuple context for evaluation of aggregate arguments */
 		winstate->tmpcontext->ecxt_outertuple = agg_row_slot;
@@ -950,6 +966,7 @@ eval_windowaggregates(WindowAggState *winstate)
 									peraggstate);
 		}
 
+next_tuple:
 		/* Reset per-input-tuple context after each tuple */
 		ResetExprContext(winstate->tmpcontext);
 
@@ -1060,6 +1077,7 @@ eval_windowfunction(WindowAggState *winstate, WindowStatePerFunc perfuncstate,
 static void
 begin_partition(WindowAggState *winstate)
 {
+	WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
 	PlanState  *outerPlan = outerPlanState(winstate);
 	int			numfuncs = winstate->numfuncs;
 	int			i;
@@ -1067,11 +1085,21 @@ begin_partition(WindowAggState *winstate)
 	winstate->partition_spooled = false;
 	winstate->framehead_valid = false;
 	winstate->frametail_valid = false;
+	winstate->grouptail_valid = false;
 	winstate->spooled_rows = 0;
 	winstate->currentpos = 0;
 	winstate->frameheadpos = 0;
-	winstate->frametailpos = -1;
+	winstate->frametailpos = 0;
+	winstate->currentgroup = 0;
+	winstate->frameheadgroup = 0;
+	winstate->frametailgroup = 0;
+	winstate->groupheadpos = 0;
+	winstate->grouptailpos = -1;	/* see update_grouptailpos */
 	ExecClearTuple(winstate->agg_row_slot);
+	if (winstate->framehead_slot)
+		ExecClearTuple(winstate->framehead_slot);
+	if (winstate->frametail_slot)
+		ExecClearTuple(winstate->frametail_slot);
 
 	/*
 	 * If this is the very first partition, we need to fetch the first input
@@ -1098,7 +1126,7 @@ begin_partition(WindowAggState *winstate)
 	/*
 	 * Set up read pointers for the tuplestore.  The current pointer doesn't
 	 * need BACKWARD capability, but the per-window-function read pointers do,
-	 * and the aggregate pointer does if frame start is movable.
+	 * and the aggregate pointer does if we might need to restart aggregation.
 	 */
 	winstate->current_ptr = 0;	/* read pointer 0 is pre-allocated */
 
@@ -1111,10 +1139,14 @@ begin_partition(WindowAggState *winstate)
 		WindowObject agg_winobj = winstate->agg_winobj;
 		int			readptr_flags = 0;
 
-		/* If the frame head is potentially movable ... */
-		if (!(winstate->frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING))
+		/*
+		 * If the frame head is potentially movable, or we have an EXCLUSION
+		 * clause, we might need to restart aggregation ...
+		 */
+		if (!(winstate->frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING) ||
+			(winstate->frameOptions & FRAMEOPTION_EXCLUSION))
 		{
-			/* ... create a mark pointer to track the frame head */
+			/* ... so create a mark pointer to track the frame head */
 			agg_winobj->markptr = tuplestore_alloc_read_pointer(winstate->buffer, 0);
 			/* and the read pointer will need BACKWARD capability */
 			readptr_flags |= EXEC_FLAG_BACKWARD;
@@ -1148,6 +1180,44 @@ begin_partition(WindowAggState *winstate)
 		}
 	}
 
+	/*
+	 * If we are in RANGE or GROUPS mode, then determining frame boundaries
+	 * requires physical access to the frame endpoint rows, except in
+	 * degenerate cases.  We create read pointers to point to those rows, to
+	 * simplify access and ensure that the tuplestore doesn't discard the
+	 * endpoint rows prematurely.  (Must match logic in update_frameheadpos
+	 * and update_frametailpos.)
+	 */
+	winstate->framehead_ptr = winstate->frametail_ptr = -1; /* if not used */
+
+	if ((winstate->frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS)) &&
+		node->ordNumCols != 0)
+	{
+		if (!(winstate->frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING))
+			winstate->framehead_ptr =
+				tuplestore_alloc_read_pointer(winstate->buffer, 0);
+		if (!(winstate->frameOptions & FRAMEOPTION_END_UNBOUNDED_FOLLOWING))
+			winstate->frametail_ptr =
+				tuplestore_alloc_read_pointer(winstate->buffer, 0);
+	}
+
+	/*
+	 * If we have an exclusion clause that requires knowing the boundaries of
+	 * the current row's peer group, we create a read pointer to track the
+	 * tail position of the peer group (i.e., first row of the next peer
+	 * group).  The head position does not require its own pointer because we
+	 * maintain that as a side effect of advancing the current row.
+	 */
+	winstate->grouptail_ptr = -1;
+
+	if ((winstate->frameOptions & (FRAMEOPTION_EXCLUDE_GROUP |
+								   FRAMEOPTION_EXCLUDE_TIES)) &&
+		node->ordNumCols != 0)
+	{
+		winstate->grouptail_ptr =
+			tuplestore_alloc_read_pointer(winstate->buffer, 0);
+	}
+
 	/*
 	 * Store the first tuple into the tuplestore (it's always available now;
 	 * we either read it above, or saved it at the end of previous partition)
@@ -1202,12 +1272,13 @@ spool_tuples(WindowAggState *winstate, int64 pos)
 
 		if (node->partNumCols > 0)
 		{
+			ExprContext *econtext = winstate->tmpcontext;
+
+			econtext->ecxt_innertuple = winstate->first_part_slot;
+			econtext->ecxt_outertuple = outerslot;
+
 			/* Check if this tuple still belongs to the current partition */
-			if (!execTuplesMatch(winstate->first_part_slot,
-								 outerslot,
-								 node->partNumCols, node->partColIdx,
-								 winstate->partEqfunctions,
-								 winstate->tmpcontext->ecxt_per_tuple_memory))
+			if (!ExecQualAndReset(winstate->partEqfunction, econtext))
 			{
 				/*
 				 * end of partition; copy the tuple for the next cycle.
@@ -1274,119 +1345,127 @@ release_partition(WindowAggState *winstate)
  * The caller must have already determined that the row is in the partition
  * and fetched it into a slot.  This function just encapsulates the framing
  * rules.
+ *
+ * Returns:
+ * -1, if the row is out of frame and no succeeding rows can be in frame
+ * 0, if the row is out of frame but succeeding rows might be in frame
+ * 1, if the row is in frame
+ *
+ * May clobber winstate->temp_slot_2.
  */
-static bool
+static int
 row_is_in_frame(WindowAggState *winstate, int64 pos, TupleTableSlot *slot)
 {
 	int			frameOptions = winstate->frameOptions;
 
 	Assert(pos >= 0);			/* else caller error */
 
-	/* First, check frame starting conditions */
-	if (frameOptions & FRAMEOPTION_START_CURRENT_ROW)
-	{
-		if (frameOptions & FRAMEOPTION_ROWS)
-		{
-			/* rows before current row are out of frame */
-			if (pos < winstate->currentpos)
-				return false;
-		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
-		{
-			/* preceding row that is not peer is out of frame */
-			if (pos < winstate->currentpos &&
-				!are_peers(winstate, slot, winstate->ss.ss_ScanTupleSlot))
-				return false;
-		}
-		else
-			Assert(false);
-	}
-	else if (frameOptions & FRAMEOPTION_START_VALUE)
-	{
-		if (frameOptions & FRAMEOPTION_ROWS)
-		{
-			int64		offset = DatumGetInt64(winstate->startOffsetValue);
-
-			/* rows before current row + offset are out of frame */
-			if (frameOptions & FRAMEOPTION_START_VALUE_PRECEDING)
-				offset = -offset;
-
-			if (pos < winstate->currentpos + offset)
-				return false;
-		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
-		{
-			/* parser should have rejected this */
-			elog(ERROR, "window frame with value offset is not implemented");
-		}
-		else
-			Assert(false);
-	}
+	/*
+	 * First, check frame starting conditions.  We might as well delegate this
+	 * to update_frameheadpos always; it doesn't add any notable cost.
+	 */
+	update_frameheadpos(winstate);
+	if (pos < winstate->frameheadpos)
+		return 0;
 
-	/* Okay so far, now check frame ending conditions */
+	/*
+	 * Okay so far, now check frame ending conditions.  Here, we avoid calling
+	 * update_frametailpos in simple cases, so as not to spool tuples further
+	 * ahead than necessary.
+	 */
 	if (frameOptions & FRAMEOPTION_END_CURRENT_ROW)
 	{
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			/* rows after current row are out of frame */
 			if (pos > winstate->currentpos)
-				return false;
+				return -1;
 		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
+		else if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
 		{
 			/* following row that is not peer is out of frame */
 			if (pos > winstate->currentpos &&
 				!are_peers(winstate, slot, winstate->ss.ss_ScanTupleSlot))
-				return false;
+				return -1;
 		}
 		else
 			Assert(false);
 	}
-	else if (frameOptions & FRAMEOPTION_END_VALUE)
+	else if (frameOptions & FRAMEOPTION_END_OFFSET)
 	{
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			int64		offset = DatumGetInt64(winstate->endOffsetValue);
 
 			/* rows after current row + offset are out of frame */
-			if (frameOptions & FRAMEOPTION_END_VALUE_PRECEDING)
+			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 				offset = -offset;
 
 			if (pos > winstate->currentpos + offset)
-				return false;
+				return -1;
 		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
+		else if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
 		{
-			/* parser should have rejected this */
-			elog(ERROR, "window frame with value offset is not implemented");
+			/* hard cases, so delegate to update_frametailpos */
+			update_frametailpos(winstate);
+			if (pos >= winstate->frametailpos)
+				return -1;
 		}
 		else
 			Assert(false);
 	}
 
+	/* Check exclusion clause */
+	if (frameOptions & FRAMEOPTION_EXCLUDE_CURRENT_ROW)
+	{
+		if (pos == winstate->currentpos)
+			return 0;
+	}
+	else if ((frameOptions & FRAMEOPTION_EXCLUDE_GROUP) ||
+			 ((frameOptions & FRAMEOPTION_EXCLUDE_TIES) &&
+			  pos != winstate->currentpos))
+	{
+		WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
+
+		/* If no ORDER BY, all rows are peers with each other */
+		if (node->ordNumCols == 0)
+			return 0;
+		/* Otherwise, check the group boundaries */
+		if (pos >= winstate->groupheadpos)
+		{
+			update_grouptailpos(winstate);
+			if (pos < winstate->grouptailpos)
+				return 0;
+		}
+	}
+
 	/* If we get here, it's in frame */
-	return true;
+	return 1;
 }
 
 /*
  * update_frameheadpos
  * make frameheadpos valid for the current row
  *
- * Uses the winobj's read pointer for any required fetches; hence, if the
- * frame mode is one that requires row comparisons, the winobj's mark must
- * not be past the currently known frame head.  Also uses the specified slot
- * for any required fetches.
+ * Note that frameheadpos is computed without regard for any window exclusion
+ * clause; the current row and/or its peers are considered part of the frame
+ * for this purpose even if they must be excluded later.
+ *
+ * May clobber winstate->temp_slot_2.
  */
 static void
-update_frameheadpos(WindowObject winobj, TupleTableSlot *slot)
+update_frameheadpos(WindowAggState *winstate)
 {
-	WindowAggState *winstate = winobj->winstate;
 	WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
 	int			frameOptions = winstate->frameOptions;
+	MemoryContext oldcontext;
 
 	if (winstate->framehead_valid)
 		return;					/* already known for current row */
 
+	/* We may be called in a short-lived context */
+	oldcontext = MemoryContextSwitchTo(winstate->ss.ps.ps_ExprContext->ecxt_per_query_memory);
+
 	if (frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING)
 	{
 		/* In UNBOUNDED PRECEDING mode, frame head is always row 0 */
@@ -1401,58 +1480,67 @@ update_frameheadpos(WindowObject winobj, TupleTableSlot *slot)
 			winstate->frameheadpos = winstate->currentpos;
 			winstate->framehead_valid = true;
 		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
+		else if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
 		{
-			int64		fhprev;
-
 			/* If no ORDER BY, all rows are peers with each other */
 			if (node->ordNumCols == 0)
 			{
 				winstate->frameheadpos = 0;
 				winstate->framehead_valid = true;
+				MemoryContextSwitchTo(oldcontext);
 				return;
 			}
 
 			/*
-			 * In RANGE START_CURRENT mode, frame head is the first row that
-			 * is a peer of current row.  We search backwards from current,
-			 * which could be a bit inefficient if peer sets are large. Might
-			 * be better to have a separate read pointer that moves forward
-			 * tracking the frame head.
+			 * In RANGE or GROUPS START_CURRENT_ROW mode, frame head is the
+			 * first row that is a peer of current row.  We keep a copy of the
+			 * last-known frame head row in framehead_slot, and advance as
+			 * necessary.  Note that if we reach end of partition, we will
+			 * leave frameheadpos = end+1 and framehead_slot empty.
 			 */
-			fhprev = winstate->currentpos - 1;
-			for (;;)
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->framehead_ptr);
+			if (winstate->frameheadpos == 0 &&
+				TupIsNull(winstate->framehead_slot))
 			{
-				/* assume the frame head can't go backwards */
-				if (fhprev < winstate->frameheadpos)
-					break;
-				if (!window_gettupleslot(winobj, fhprev, slot))
-					break;		/* start of partition */
-				if (!are_peers(winstate, slot, winstate->ss.ss_ScanTupleSlot))
-					break;		/* not peer of current row */
-				fhprev--;
+				/* fetch first row into framehead_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->framehead_slot))
+			{
+				if (are_peers(winstate, winstate->framehead_slot,
+							  winstate->ss.ss_ScanTupleSlot))
+					break;		/* this row is the correct frame head */
+				/* Note we advance frameheadpos even if the fetch fails */
+				winstate->frameheadpos++;
+				spool_tuples(winstate, winstate->frameheadpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					break;		/* end of partition */
 			}
-			winstate->frameheadpos = fhprev + 1;
 			winstate->framehead_valid = true;
 		}
 		else
 			Assert(false);
 	}
-	else if (frameOptions & FRAMEOPTION_START_VALUE)
+	else if (frameOptions & FRAMEOPTION_START_OFFSET)
 	{
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			/* In ROWS mode, bound is physically n before/after current */
 			int64		offset = DatumGetInt64(winstate->startOffsetValue);
 
-			if (frameOptions & FRAMEOPTION_START_VALUE_PRECEDING)
+			if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
 				offset = -offset;
 
 			winstate->frameheadpos = winstate->currentpos + offset;
 			/* frame head can't go before first row */
 			if (winstate->frameheadpos < 0)
 				winstate->frameheadpos = 0;
-			else if (winstate->frameheadpos > winstate->currentpos)
+			else if (winstate->frameheadpos > winstate->currentpos + 1)
 			{
 				/* make sure frameheadpos is not past end of partition */
 				spool_tuples(winstate, winstate->frameheadpos - 1);
@@ -1463,40 +1551,173 @@ update_frameheadpos(WindowObject winobj, TupleTableSlot *slot)
 		}
 		else if (frameOptions & FRAMEOPTION_RANGE)
 		{
-			/* parser should have rejected this */
-			elog(ERROR, "window frame with value offset is not implemented");
+			/*
+			 * In RANGE START_OFFSET mode, frame head is the first row that
+			 * satisfies the in_range constraint relative to the current row.
+			 * We keep a copy of the last-known frame head row in
+			 * framehead_slot, and advance as necessary.  Note that if we
+			 * reach end of partition, we will leave frameheadpos = end+1 and
+			 * framehead_slot empty.
+			 */
+			int			sortCol = node->ordColIdx[0];
+			bool		sub,
+						less;
+
+			/* Precompute flags for in_range checks */
+			if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
+				sub = true;		/* subtract startOffset from current row */
+			else
+				sub = false;	/* add it */
+			less = false;		/* normally, we want frame head >= sum */
+			/* If sort order is descending, flip both flags */
+			if (!winstate->inRangeAsc)
+			{
+				sub = !sub;
+				less = true;
+			}
+
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->framehead_ptr);
+			if (winstate->frameheadpos == 0 &&
+				TupIsNull(winstate->framehead_slot))
+			{
+				/* fetch first row into framehead_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->framehead_slot))
+			{
+				Datum		headval,
+							currval;
+				bool		headisnull,
+							currisnull;
+
+				headval = slot_getattr(winstate->framehead_slot, sortCol,
+									   &headisnull);
+				currval = slot_getattr(winstate->ss.ss_ScanTupleSlot, sortCol,
+									   &currisnull);
+				if (headisnull || currisnull)
+				{
+					/* order of the rows depends only on nulls_first */
+					if (winstate->inRangeNullsFirst)
+					{
+						/* advance head if head is null and curr is not */
+						if (!headisnull || currisnull)
+							break;
+					}
+					else
+					{
+						/* advance head if head is not null and curr is null */
+						if (headisnull || !currisnull)
+							break;
+					}
+				}
+				else
+				{
+					if (DatumGetBool(FunctionCall5Coll(&winstate->startInRangeFunc,
+													   winstate->inRangeColl,
+													   headval,
+													   currval,
+													   winstate->startOffsetValue,
+													   BoolGetDatum(sub),
+													   BoolGetDatum(less))))
+						break;	/* this row is the correct frame head */
+				}
+				/* Note we advance frameheadpos even if the fetch fails */
+				winstate->frameheadpos++;
+				spool_tuples(winstate, winstate->frameheadpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					break;		/* end of partition */
+			}
+			winstate->framehead_valid = true;
+		}
+		else if (frameOptions & FRAMEOPTION_GROUPS)
+		{
+			/*
+			 * In GROUPS START_OFFSET mode, frame head is the first row of the
+			 * first peer group whose number satisfies the offset constraint.
+			 * We keep a copy of the last-known frame head row in
+			 * framehead_slot, and advance as necessary.  Note that if we
+			 * reach end of partition, we will leave frameheadpos = end+1 and
+			 * framehead_slot empty.
+			 */
+			int64		offset = DatumGetInt64(winstate->startOffsetValue);
+			int64		minheadgroup;
+
+			if (frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
+				minheadgroup = winstate->currentgroup - offset;
+			else
+				minheadgroup = winstate->currentgroup + offset;
+
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->framehead_ptr);
+			if (winstate->frameheadpos == 0 &&
+				TupIsNull(winstate->framehead_slot))
+			{
+				/* fetch first row into framehead_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->framehead_slot))
+			{
+				if (winstate->frameheadgroup >= minheadgroup)
+					break;		/* this row is the correct frame head */
+				ExecCopySlot(winstate->temp_slot_2, winstate->framehead_slot);
+				/* Note we advance frameheadpos even if the fetch fails */
+				winstate->frameheadpos++;
+				spool_tuples(winstate, winstate->frameheadpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->framehead_slot))
+					break;		/* end of partition */
+				if (!are_peers(winstate, winstate->temp_slot_2,
+							   winstate->framehead_slot))
+					winstate->frameheadgroup++;
+			}
+			ExecClearTuple(winstate->temp_slot_2);
+			winstate->framehead_valid = true;
 		}
 		else
 			Assert(false);
 	}
 	else
 		Assert(false);
+
+	MemoryContextSwitchTo(oldcontext);
 }
 
 /*
  * update_frametailpos
  * make frametailpos valid for the current row
  *
- * Uses the winobj's read pointer for any required fetches; hence, if the
- * frame mode is one that requires row comparisons, the winobj's mark must
- * not be past the currently known frame tail.  Also uses the specified slot
- * for any required fetches.
+ * Note that frametailpos is computed without regard for any window exclusion
+ * clause; the current row and/or its peers are considered part of the frame
+ * for this purpose even if they must be excluded later.
+ *
+ * May clobber winstate->temp_slot_2.
  */
 static void
-update_frametailpos(WindowObject winobj, TupleTableSlot *slot)
+update_frametailpos(WindowAggState *winstate)
 {
-	WindowAggState *winstate = winobj->winstate;
 	WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
 	int			frameOptions = winstate->frameOptions;
+	MemoryContext oldcontext;
 
 	if (winstate->frametail_valid)
 		return;					/* already known for current row */
 
+	/* We may be called in a short-lived context */
+	oldcontext = MemoryContextSwitchTo(winstate->ss.ps.ps_ExprContext->ecxt_per_query_memory);
+
 	if (frameOptions & FRAMEOPTION_END_UNBOUNDED_FOLLOWING)
 	{
 		/* In UNBOUNDED FOLLOWING mode, all partition rows are in frame */
 		spool_tuples(winstate, -1);
-		winstate->frametailpos = winstate->spooled_rows - 1;
+		winstate->frametailpos = winstate->spooled_rows;
 		winstate->frametail_valid = true;
 	}
 	else if (frameOptions & FRAMEOPTION_END_CURRENT_ROW)
@@ -1504,77 +1725,277 @@ update_frametailpos(WindowObject winobj, TupleTableSlot *slot)
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			/* In ROWS mode, exactly the rows up to current are in frame */
-			winstate->frametailpos = winstate->currentpos;
+			winstate->frametailpos = winstate->currentpos + 1;
 			winstate->frametail_valid = true;
 		}
-		else if (frameOptions & FRAMEOPTION_RANGE)
+		else if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
 		{
-			int64		ftnext;
-
 			/* If no ORDER BY, all rows are peers with each other */
 			if (node->ordNumCols == 0)
 			{
 				spool_tuples(winstate, -1);
-				winstate->frametailpos = winstate->spooled_rows - 1;
+				winstate->frametailpos = winstate->spooled_rows;
 				winstate->frametail_valid = true;
+				MemoryContextSwitchTo(oldcontext);
 				return;
 			}
 
 			/*
-			 * Else we have to search for the first non-peer of the current
-			 * row.  We assume the current value of frametailpos is a lower
-			 * bound on the possible frame tail location, ie, frame tail never
-			 * goes backward, and that currentpos is also a lower bound, ie,
-			 * frame end always >= current row.
+			 * In RANGE or GROUPS END_CURRENT_ROW mode, frame end is the last
+			 * row that is a peer of current row, frame tail is the row after
+			 * that (if any).  We keep a copy of the last-known frame tail row
+			 * in frametail_slot, and advance as necessary.  Note that if we
+			 * reach end of partition, we will leave frametailpos = end+1 and
+			 * frametail_slot empty.
 			 */
-			ftnext = Max(winstate->frametailpos, winstate->currentpos) + 1;
-			for (;;)
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->frametail_ptr);
+			if (winstate->frametailpos == 0 &&
+				TupIsNull(winstate->frametail_slot))
+			{
+				/* fetch first row into frametail_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->frametail_slot))
 			{
-				if (!window_gettupleslot(winobj, ftnext, slot))
+				if (winstate->frametailpos > winstate->currentpos &&
+					!are_peers(winstate, winstate->frametail_slot,
+							   winstate->ss.ss_ScanTupleSlot))
+					break;		/* this row is the frame tail */
+				/* Note we advance frametailpos even if the fetch fails */
+				winstate->frametailpos++;
+				spool_tuples(winstate, winstate->frametailpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
 					break;		/* end of partition */
-				if (!are_peers(winstate, slot, winstate->ss.ss_ScanTupleSlot))
-					break;		/* not peer of current row */
-				ftnext++;
 			}
-			winstate->frametailpos = ftnext - 1;
 			winstate->frametail_valid = true;
 		}
 		else
 			Assert(false);
 	}
-	else if (frameOptions & FRAMEOPTION_END_VALUE)
+	else if (frameOptions & FRAMEOPTION_END_OFFSET)
 	{
 		if (frameOptions & FRAMEOPTION_ROWS)
 		{
 			/* In ROWS mode, bound is physically n before/after current */
 			int64		offset = DatumGetInt64(winstate->endOffsetValue);
 
-			if (frameOptions & FRAMEOPTION_END_VALUE_PRECEDING)
+			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 				offset = -offset;
 
-			winstate->frametailpos = winstate->currentpos + offset;
-			/* smallest allowable value of frametailpos is -1 */
+			winstate->frametailpos = winstate->currentpos + offset + 1;
+			/* smallest allowable value of frametailpos is 0 */
 			if (winstate->frametailpos < 0)
-				winstate->frametailpos = -1;
-			else if (winstate->frametailpos > winstate->currentpos)
+				winstate->frametailpos = 0;
+			else if (winstate->frametailpos > winstate->currentpos + 1)
 			{
-				/* make sure frametailpos is not past last row of partition */
-				spool_tuples(winstate, winstate->frametailpos);
-				if (winstate->frametailpos >= winstate->spooled_rows)
-					winstate->frametailpos = winstate->spooled_rows - 1;
+				/* make sure frametailpos is not past end of partition */
+				spool_tuples(winstate, winstate->frametailpos - 1);
+				if (winstate->frametailpos > winstate->spooled_rows)
+					winstate->frametailpos = winstate->spooled_rows;
 			}
 			winstate->frametail_valid = true;
 		}
 		else if (frameOptions & FRAMEOPTION_RANGE)
 		{
-			/* parser should have rejected this */
-			elog(ERROR, "window frame with value offset is not implemented");
+			/*
+			 * In RANGE END_OFFSET mode, frame end is the last row that
+			 * satisfies the in_range constraint relative to the current row,
+			 * frame tail is the row after that (if any).  We keep a copy of
+			 * the last-known frame tail row in frametail_slot, and advance as
+			 * necessary.  Note that if we reach end of partition, we will
+			 * leave frametailpos = end+1 and frametail_slot empty.
+			 */
+			int			sortCol = node->ordColIdx[0];
+			bool		sub,
+						less;
+
+			/* Precompute flags for in_range checks */
+			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
+				sub = true;		/* subtract endOffset from current row */
+			else
+				sub = false;	/* add it */
+			less = true;		/* normally, we want frame tail <= sum */
+			/* If sort order is descending, flip both flags */
+			if (!winstate->inRangeAsc)
+			{
+				sub = !sub;
+				less = false;
+			}
+
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->frametail_ptr);
+			if (winstate->frametailpos == 0 &&
+				TupIsNull(winstate->frametail_slot))
+			{
+				/* fetch first row into frametail_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->frametail_slot))
+			{
+				Datum		tailval,
+							currval;
+				bool		tailisnull,
+							currisnull;
+
+				tailval = slot_getattr(winstate->frametail_slot, sortCol,
+									   &tailisnull);
+				currval = slot_getattr(winstate->ss.ss_ScanTupleSlot, sortCol,
+									   &currisnull);
+				if (tailisnull || currisnull)
+				{
+					/* order of the rows depends only on nulls_first */
+					if (winstate->inRangeNullsFirst)
+					{
+						/* advance tail if tail is null or curr is not */
+						if (!tailisnull)
+							break;
+					}
+					else
+					{
+						/* advance tail if tail is not null or curr is null */
+						if (!currisnull)
+							break;
+					}
+				}
+				else
+				{
+					if (!DatumGetBool(FunctionCall5Coll(&winstate->endInRangeFunc,
+														winstate->inRangeColl,
+														tailval,
+														currval,
+														winstate->endOffsetValue,
+														BoolGetDatum(sub),
+														BoolGetDatum(less))))
+						break;	/* this row is the correct frame tail */
+				}
+				/* Note we advance frametailpos even if the fetch fails */
+				winstate->frametailpos++;
+				spool_tuples(winstate, winstate->frametailpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
+					break;		/* end of partition */
+			}
+			winstate->frametail_valid = true;
+		}
+		else if (frameOptions & FRAMEOPTION_GROUPS)
+		{
+			/*
+			 * In GROUPS END_OFFSET mode, frame end is the last row of the
+			 * last peer group whose number satisfies the offset constraint,
+			 * and frame tail is the row after that (if any).  We keep a copy
+			 * of the last-known frame tail row in frametail_slot, and advance
+			 * as necessary.  Note that if we reach end of partition, we will
+			 * leave frametailpos = end+1 and frametail_slot empty.
+			 */
+			int64		offset = DatumGetInt64(winstate->endOffsetValue);
+			int64		maxtailgroup;
+
+			if (frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
+				maxtailgroup = winstate->currentgroup - offset;
+			else
+				maxtailgroup = winstate->currentgroup + offset;
+
+			tuplestore_select_read_pointer(winstate->buffer,
+										   winstate->frametail_ptr);
+			if (winstate->frametailpos == 0 &&
+				TupIsNull(winstate->frametail_slot))
+			{
+				/* fetch first row into frametail_slot, if we didn't already */
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
+					elog(ERROR, "unexpected end of tuplestore");
+			}
+
+			while (!TupIsNull(winstate->frametail_slot))
+			{
+				if (winstate->frametailgroup > maxtailgroup)
+					break;		/* this row is the correct frame tail */
+				ExecCopySlot(winstate->temp_slot_2, winstate->frametail_slot);
+				/* Note we advance frametailpos even if the fetch fails */
+				winstate->frametailpos++;
+				spool_tuples(winstate, winstate->frametailpos);
+				if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+											 winstate->frametail_slot))
+					break;		/* end of partition */
+				if (!are_peers(winstate, winstate->temp_slot_2,
+							   winstate->frametail_slot))
+					winstate->frametailgroup++;
+			}
+			ExecClearTuple(winstate->temp_slot_2);
+			winstate->frametail_valid = true;
 		}
 		else
 			Assert(false);
 	}
 	else
 		Assert(false);
+
+	MemoryContextSwitchTo(oldcontext);
+}
+
+/*
+ * update_grouptailpos
+ * make grouptailpos valid for the current row
+ *
+ * May clobber winstate->temp_slot_2.
+ */
+static void
+update_grouptailpos(WindowAggState *winstate)
+{
+	WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
+	MemoryContext oldcontext;
+
+	if (winstate->grouptail_valid)
+		return;					/* already known for current row */
+
+	/* We may be called in a short-lived context */
+	oldcontext = MemoryContextSwitchTo(winstate->ss.ps.ps_ExprContext->ecxt_per_query_memory);
+
+	/* If no ORDER BY, all rows are peers with each other */
+	if (node->ordNumCols == 0)
+	{
+		spool_tuples(winstate, -1);
+		winstate->grouptailpos = winstate->spooled_rows;
+		winstate->grouptail_valid = true;
+		MemoryContextSwitchTo(oldcontext);
+		return;
+	}
+
+	/*
+	 * Because grouptail_valid is reset only when current row advances into a
+	 * new peer group, we always reach here knowing that grouptailpos needs to
+	 * be advanced by at least one row.  Hence, unlike the otherwise similar
+	 * case for frame tail tracking, we do not need persistent storage of the
+	 * group tail row.
+	 */
+	Assert(winstate->grouptailpos <= winstate->currentpos);
+	tuplestore_select_read_pointer(winstate->buffer,
+								   winstate->grouptail_ptr);
+	for (;;)
+	{
+		/* Note we advance grouptailpos even if the fetch fails */
+		winstate->grouptailpos++;
+		spool_tuples(winstate, winstate->grouptailpos);
+		if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+									 winstate->temp_slot_2))
+			break;				/* end of partition */
+		if (winstate->grouptailpos > winstate->currentpos &&
+			!are_peers(winstate, winstate->temp_slot_2,
+					   winstate->ss.ss_ScanTupleSlot))
+			break;				/* this row is the group tail */
+	}
+	ExecClearTuple(winstate->temp_slot_2);
+	winstate->grouptail_valid = true;
+
+	MemoryContextSwitchTo(oldcontext);
 }
 
 
@@ -1601,7 +2022,9 @@ ExecWindowAgg(PlanState *pstate)
 		return NULL;
 
 	/*
-	 * Compute frame offset values, if any, during first call.
+	 * Compute frame offset values, if any, during first call (or after a
+	 * rescan).  These are assumed to hold constant throughout the scan; if
+	 * user gives us a volatile expression, we'll only use its initial value.
 	 */
 	if (winstate->all_first)
 	{
@@ -1612,7 +2035,7 @@ ExecWindowAgg(PlanState *pstate)
 		int16		len;
 		bool		byval;
 
-		if (frameOptions & FRAMEOPTION_START_VALUE)
+		if (frameOptions & FRAMEOPTION_START_OFFSET)
 		{
 			Assert(winstate->startOffset != NULL);
 			value = ExecEvalExprSwitchContext(winstate->startOffset,
@@ -1626,18 +2049,18 @@ ExecWindowAgg(PlanState *pstate)
 			get_typlenbyval(exprType((Node *) winstate->startOffset->expr),
 							&len, &byval);
 			winstate->startOffsetValue = datumCopy(value, byval, len);
-			if (frameOptions & FRAMEOPTION_ROWS)
+			if (frameOptions & (FRAMEOPTION_ROWS | FRAMEOPTION_GROUPS))
 			{
 				/* value is known to be int8 */
 				int64		offset = DatumGetInt64(value);
 
 				if (offset < 0)
 					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
 							 errmsg("frame starting offset must not be negative")));
 			}
 		}
-		if (frameOptions & FRAMEOPTION_END_VALUE)
+		if (frameOptions & FRAMEOPTION_END_OFFSET)
 		{
 			Assert(winstate->endOffset != NULL);
 			value = ExecEvalExprSwitchContext(winstate->endOffset,
@@ -1651,14 +2074,14 @@ ExecWindowAgg(PlanState *pstate)
 			get_typlenbyval(exprType((Node *) winstate->endOffset->expr),
 							&len, &byval);
 			winstate->endOffsetValue = datumCopy(value, byval, len);
-			if (frameOptions & FRAMEOPTION_ROWS)
+			if (frameOptions & (FRAMEOPTION_ROWS | FRAMEOPTION_GROUPS))
 			{
 				/* value is known to be int8 */
 				int64		offset = DatumGetInt64(value);
 
 				if (offset < 0)
 					ereport(ERROR,
-							(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+							(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
 							 errmsg("frame ending offset must not be negative")));
 			}
 		}
@@ -1678,6 +2101,7 @@ ExecWindowAgg(PlanState *pstate)
 		/* This might mean that the frame moves, too */
 		winstate->framehead_valid = false;
 		winstate->frametail_valid = false;
+		/* we don't need to invalidate grouptail here; see below */
 	}
 
 	/*
@@ -1717,12 +2141,38 @@ ExecWindowAgg(PlanState *pstate)
 	 * out of the tuplestore, since window function evaluation might cause the
 	 * tuplestore to dump its state to disk.)
 	 *
+	 * In GROUPS mode, or when tracking a group-oriented exclusion clause, we
+	 * must also detect entering a new peer group and update associated state
+	 * when that happens.  We use temp_slot_2 to temporarily hold the previous
+	 * row for this purpose.
+	 *
 	 * Current row must be in the tuplestore, since we spooled it above.
 	 */
 	tuplestore_select_read_pointer(winstate->buffer, winstate->current_ptr);
-	if (!tuplestore_gettupleslot(winstate->buffer, true, true,
-								 winstate->ss.ss_ScanTupleSlot))
-		elog(ERROR, "unexpected end of tuplestore");
+	if ((winstate->frameOptions & (FRAMEOPTION_GROUPS |
+								   FRAMEOPTION_EXCLUDE_GROUP |
+								   FRAMEOPTION_EXCLUDE_TIES)) &&
+		winstate->currentpos > 0)
+	{
+		ExecCopySlot(winstate->temp_slot_2, winstate->ss.ss_ScanTupleSlot);
+		if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+									 winstate->ss.ss_ScanTupleSlot))
+			elog(ERROR, "unexpected end of tuplestore");
+		if (!are_peers(winstate, winstate->temp_slot_2,
+					   winstate->ss.ss_ScanTupleSlot))
+		{
+			winstate->currentgroup++;
+			winstate->groupheadpos = winstate->currentpos;
+			winstate->grouptail_valid = false;
+		}
+		ExecClearTuple(winstate->temp_slot_2);
+	}
+	else
+	{
+		if (!tuplestore_gettupleslot(winstate->buffer, true, true,
+									 winstate->ss.ss_ScanTupleSlot))
+			elog(ERROR, "unexpected end of tuplestore");
+	}
 
 	/*
 	 * Evaluate true window functions
@@ -1745,6 +2195,23 @@ ExecWindowAgg(PlanState *pstate)
 	if (winstate->numaggs > 0)
 		eval_windowaggregates(winstate);
 
+	/*
+	 * If we have created auxiliary read pointers for the frame or group
+	 * boundaries, force them to be kept up-to-date, because we don't know
+	 * whether the window function(s) will do anything that requires that.
+	 * Failing to advance the pointers would result in being unable to trim
+	 * data from the tuplestore, which is bad.  (If we could know in advance
+	 * whether the window functions will use frame boundary info, we could
+	 * skip creating these pointers in the first place ... but unfortunately
+	 * the window function API doesn't require that.)
+	 */
+	if (winstate->framehead_ptr >= 0)
+		update_frameheadpos(winstate);
+	if (winstate->frametail_ptr >= 0)
+		update_frametailpos(winstate);
+	if (winstate->grouptail_ptr >= 0)
+		update_grouptailpos(winstate);
+
 	/*
 	 * Truncate any no-longer-needed rows from the tuplestore.
 	 */
@@ -1776,10 +2243,12 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 	ExprContext *tmpcontext;
 	WindowStatePerFunc perfunc;
 	WindowStatePerAgg peragg;
+	int			frameOptions = node->frameOptions;
 	int			numfuncs,
 				wfuncno,
 				numaggs,
 				aggno;
+	TupleDesc	scanDesc;
 	ListCell   *l;
 
 	/* check for unsupported flags */
@@ -1820,16 +2289,6 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 							  "WindowAgg Aggregates",
 							  ALLOCSET_DEFAULT_SIZES);
 
-	/*
-	 * tuple table initialization
-	 */
-	ExecInitScanTupleSlot(estate, &winstate->ss);
-	ExecInitResultTupleSlot(estate, &winstate->ss.ps);
-	winstate->first_part_slot = ExecInitExtraTupleSlot(estate);
-	winstate->agg_row_slot = ExecInitExtraTupleSlot(estate);
-	winstate->temp_slot_1 = ExecInitExtraTupleSlot(estate);
-	winstate->temp_slot_2 = ExecInitExtraTupleSlot(estate);
-
 	/*
 	 * WindowAgg nodes never have quals, since they can only occur at the
 	 * logical top level of a query (ie, after any WHERE or HAVING filters)
@@ -1847,30 +2306,53 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 	 * initialize source tuple type (which is also the tuple type that we'll
 	 * store in the tuplestore and use in all our working slots).
 	 */
-	ExecAssignScanTypeFromOuterPlan(&winstate->ss);
+	ExecCreateScanSlotFromOuterPlan(estate, &winstate->ss);
+	scanDesc = winstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor;
+
+	/*
+	 * tuple table initialization
+	 */
+	winstate->first_part_slot = ExecInitExtraTupleSlot(estate, scanDesc);
+	winstate->agg_row_slot = ExecInitExtraTupleSlot(estate, scanDesc);
+	winstate->temp_slot_1 = ExecInitExtraTupleSlot(estate, scanDesc);
+	winstate->temp_slot_2 = ExecInitExtraTupleSlot(estate, scanDesc);
 
-	ExecSetSlotDescriptor(winstate->first_part_slot,
-						  winstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
-	ExecSetSlotDescriptor(winstate->agg_row_slot,
-						  winstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
-	ExecSetSlotDescriptor(winstate->temp_slot_1,
-						  winstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
-	ExecSetSlotDescriptor(winstate->temp_slot_2,
-						  winstate->ss.ss_ScanTupleSlot->tts_tupleDescriptor);
+	/*
+	 * create frame head and tail slots only if needed (must match logic in
+	 * update_frameheadpos and update_frametailpos)
+	 */
+	winstate->framehead_slot = winstate->frametail_slot = NULL;
+
+	if (frameOptions & (FRAMEOPTION_RANGE | FRAMEOPTION_GROUPS))
+	{
+		if (!(frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING))
+			winstate->framehead_slot = ExecInitExtraTupleSlot(estate, scanDesc);
+		if (!(frameOptions & FRAMEOPTION_END_UNBOUNDED_FOLLOWING))
+			winstate->frametail_slot = ExecInitExtraTupleSlot(estate, scanDesc);
+	}
 
 	/*
-	 * Initialize result tuple type and projection info.
+	 * Initialize result slot, type and projection.
 	 */
-	ExecAssignResultTypeFromTL(&winstate->ss.ps);
+	ExecInitResultTupleSlotTL(estate, &winstate->ss.ps);
 	ExecAssignProjectionInfo(&winstate->ss.ps, NULL);
 
 	/* Set up data for comparing tuples */
 	if (node->partNumCols > 0)
-		winstate->partEqfunctions = execTuplesMatchPrepare(node->partNumCols,
-														   node->partOperators);
+		winstate->partEqfunction =
+			execTuplesMatchPrepare(scanDesc,
+								   node->partNumCols,
+								   node->partColIdx,
+								   node->partOperators,
+								   &winstate->ss.ps);
+
 	if (node->ordNumCols > 0)
-		winstate->ordEqfunctions = execTuplesMatchPrepare(node->ordNumCols,
-														  node->ordOperators);
+		winstate->ordEqfunction =
+			execTuplesMatchPrepare(scanDesc,
+								   node->ordNumCols,
+								   node->ordColIdx,
+								   node->ordOperators,
+								   &winstate->ss.ps);
 
 	/*
 	 * WindowAgg nodes use aggvalues and aggnulls as well as Agg nodes.
@@ -1927,7 +2409,7 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 		aclresult = pg_proc_aclcheck(wfunc->winfnoid, GetUserId(),
 									 ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC,
+			aclcheck_error(aclresult, OBJECT_FUNCTION,
 						   get_func_name(wfunc->winfnoid));
 		InvokeFunctionExecuteHook(wfunc->winfnoid);
 
@@ -1990,7 +2472,7 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 	}
 
 	/* copy frame options to state node for easy access */
-	winstate->frameOptions = node->frameOptions;
+	winstate->frameOptions = frameOptions;
 
 	/* initialize frame bound offset expressions */
 	winstate->startOffset = ExecInitExpr((Expr *) node->startOffset,
@@ -1998,6 +2480,15 @@ ExecInitWindowAgg(WindowAgg *node, EState *estate, int eflags)
 	winstate->endOffset = ExecInitExpr((Expr *) node->endOffset,
 									   (PlanState *) winstate);
 
+	/* Lookup in_range support functions if needed */
+	if (OidIsValid(node->startInRangeFunc))
+		fmgr_info(node->startInRangeFunc, &winstate->startInRangeFunc);
+	if (OidIsValid(node->endInRangeFunc))
+		fmgr_info(node->endInRangeFunc, &winstate->endInRangeFunc);
+	winstate->inRangeColl = node->inRangeColl;
+	winstate->inRangeAsc = node->inRangeAsc;
+	winstate->inRangeNullsFirst = node->inRangeNullsFirst;
+
 	winstate->all_first = true;
 	winstate->partition_spooled = false;
 	winstate->more_partitions = false;
@@ -2022,6 +2513,10 @@ ExecEndWindowAgg(WindowAggState *node)
 	ExecClearTuple(node->agg_row_slot);
 	ExecClearTuple(node->temp_slot_1);
 	ExecClearTuple(node->temp_slot_2);
+	if (node->framehead_slot)
+		ExecClearTuple(node->framehead_slot);
+	if (node->frametail_slot)
+		ExecClearTuple(node->frametail_slot);
 
 	/*
 	 * Free both the expr contexts.
@@ -2067,6 +2562,10 @@ ExecReScanWindowAgg(WindowAggState *node)
 	ExecClearTuple(node->agg_row_slot);
 	ExecClearTuple(node->temp_slot_1);
 	ExecClearTuple(node->temp_slot_2);
+	if (node->framehead_slot)
+		ExecClearTuple(node->framehead_slot);
+	if (node->frametail_slot)
+		ExecClearTuple(node->frametail_slot);
 
 	/* Forget current wfunc values */
 	MemSet(econtext->ecxt_aggvalues, 0, sizeof(Datum) * node->numfuncs);
@@ -2096,10 +2595,12 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 	Oid			aggtranstype;
 	AttrNumber	initvalAttNo;
 	AclResult	aclresult;
+	bool		use_ma_code;
 	Oid			transfn_oid,
 				invtransfn_oid,
 				finalfn_oid;
 	bool		finalextra;
+	char		finalmodify;
 	Expr	   *transfnexpr,
 			   *invtransfnexpr,
 			   *finalfnexpr;
@@ -2125,20 +2626,32 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 	 * Figure out whether we want to use the moving-aggregate implementation,
 	 * and collect the right set of fields from the pg_attribute entry.
 	 *
-	 * If the frame head can't move, we don't need moving-aggregate code. Even
-	 * if we'd like to use it, don't do so if the aggregate's arguments (and
-	 * FILTER clause if any) contain any calls to volatile functions.
-	 * Otherwise, the difference between restarting and not restarting the
-	 * aggregation would be user-visible.
+	 * It's possible that an aggregate would supply a safe moving-aggregate
+	 * implementation and an unsafe normal one, in which case our hand is
+	 * forced.  Otherwise, if the frame head can't move, we don't need
+	 * moving-aggregate code.  Even if we'd like to use it, don't do so if the
+	 * aggregate's arguments (and FILTER clause if any) contain any calls to
+	 * volatile functions.  Otherwise, the difference between restarting and
+	 * not restarting the aggregation would be user-visible.
 	 */
-	if (OidIsValid(aggform->aggminvtransfn) &&
-		!(winstate->frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING) &&
-		!contain_volatile_functions((Node *) wfunc))
+	if (!OidIsValid(aggform->aggminvtransfn))
+		use_ma_code = false;	/* sine qua non */
+	else if (aggform->aggmfinalmodify == AGGMODIFY_READ_ONLY &&
+			 aggform->aggfinalmodify != AGGMODIFY_READ_ONLY)
+		use_ma_code = true;		/* decision forced by safety */
+	else if (winstate->frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING)
+		use_ma_code = false;	/* non-moving frame head */
+	else if (contain_volatile_functions((Node *) wfunc))
+		use_ma_code = false;	/* avoid possible behavioral change */
+	else
+		use_ma_code = true;		/* yes, let's use it */
+	if (use_ma_code)
 	{
 		peraggstate->transfn_oid = transfn_oid = aggform->aggmtransfn;
 		peraggstate->invtransfn_oid = invtransfn_oid = aggform->aggminvtransfn;
 		peraggstate->finalfn_oid = finalfn_oid = aggform->aggmfinalfn;
 		finalextra = aggform->aggmfinalextra;
+		finalmodify = aggform->aggmfinalmodify;
 		aggtranstype = aggform->aggmtranstype;
 		initvalAttNo = Anum_pg_aggregate_aggminitval;
 	}
@@ -2148,6 +2661,7 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 		peraggstate->invtransfn_oid = invtransfn_oid = InvalidOid;
 		peraggstate->finalfn_oid = finalfn_oid = aggform->aggfinalfn;
 		finalextra = aggform->aggfinalextra;
+		finalmodify = aggform->aggfinalmodify;
 		aggtranstype = aggform->aggtranstype;
 		initvalAttNo = Anum_pg_aggregate_agginitval;
 	}
@@ -2173,7 +2687,7 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 		aclresult = pg_proc_aclcheck(transfn_oid, aggOwner,
 									 ACL_EXECUTE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_PROC,
+			aclcheck_error(aclresult, OBJECT_FUNCTION,
 						   get_func_name(transfn_oid));
 		InvokeFunctionExecuteHook(transfn_oid);
 
@@ -2182,7 +2696,7 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 			aclresult = pg_proc_aclcheck(invtransfn_oid, aggOwner,
 										 ACL_EXECUTE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_PROC,
+				aclcheck_error(aclresult, OBJECT_FUNCTION,
 							   get_func_name(invtransfn_oid));
 			InvokeFunctionExecuteHook(invtransfn_oid);
 		}
@@ -2192,12 +2706,23 @@ initialize_peragg(WindowAggState *winstate, WindowFunc *wfunc,
 			aclresult = pg_proc_aclcheck(finalfn_oid, aggOwner,
 										 ACL_EXECUTE);
 			if (aclresult != ACLCHECK_OK)
-				aclcheck_error(aclresult, ACL_KIND_PROC,
+				aclcheck_error(aclresult, OBJECT_FUNCTION,
 							   get_func_name(finalfn_oid));
 			InvokeFunctionExecuteHook(finalfn_oid);
 		}
 	}
 
+	/*
+	 * If the selected finalfn isn't read-only, we can't run this aggregate as
+	 * a window function.  This is a user-facing error, so we take a bit more
+	 * care with the error message than elsewhere in this function.
+	 */
+	if (finalmodify != AGGMODIFY_READ_ONLY)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("aggregate function %s does not support use as a window function",
+						format_procedure(wfunc->winfnoid))));
+
 	/* Detect how many arguments to pass to the finalfn */
 	if (finalextra)
 		peraggstate->numFinalArgs = numArguments + 1;
@@ -2351,15 +2876,15 @@ are_peers(WindowAggState *winstate, TupleTableSlot *slot1,
 		  TupleTableSlot *slot2)
 {
 	WindowAgg  *node = (WindowAgg *) winstate->ss.ps.plan;
+	ExprContext *econtext = winstate->tmpcontext;
 
 	/* If no ORDER BY, all rows are peers with each other */
 	if (node->ordNumCols == 0)
 		return true;
 
-	return execTuplesMatch(slot1, slot2,
-						   node->ordNumCols, node->ordColIdx,
-						   winstate->ordEqfunctions,
-						   winstate->tmpcontext->ecxt_per_tuple_memory);
+	econtext->ecxt_outertuple = slot1;
+	econtext->ecxt_innertuple = slot2;
+	return ExecQualAndReset(winstate->ordEqfunction, econtext);
 }
 
 /*
@@ -2547,7 +3072,7 @@ WinSetMarkPosition(WindowObject winobj, int64 markpos)
 
 /*
  * WinRowsArePeers
- *		Compare two rows (specified by absolute position in window) to see
+ *		Compare two rows (specified by absolute position in partition) to see
  *		if they are equal according to the ORDER BY clause.
  *
  * NB: this does not consider the window frame mode.
@@ -2569,6 +3094,10 @@ WinRowsArePeers(WindowObject winobj, int64 pos1, int64 pos2)
 	if (node->ordNumCols == 0)
 		return true;
 
+	/*
+	 * Note: OK to use temp_slot_2 here because we aren't calling any
+	 * frame-related functions (those tend to clobber temp_slot_2).
+	 */
 	slot1 = winstate->temp_slot_1;
 	slot2 = winstate->temp_slot_2;
 
@@ -2653,30 +3182,7 @@ WinGetFuncArgInPartition(WindowObject winobj, int argno,
 		if (isout)
 			*isout = false;
 		if (set_mark)
-		{
-			int			frameOptions = winstate->frameOptions;
-			int64		mark_pos = abs_pos;
-
-			/*
-			 * In RANGE mode with a moving frame head, we must not let the
-			 * mark advance past frameheadpos, since that row has to be
-			 * fetchable during future update_frameheadpos calls.
-			 *
-			 * XXX it is very ugly to pollute window functions' marks with
-			 * this consideration; it could for instance mask a logic bug that
-			 * lets a window function fetch rows before what it had claimed
-			 * was its mark.  Perhaps use a separate mark for frame head
-			 * probes?
-			 */
-			if ((frameOptions & FRAMEOPTION_RANGE) &&
-				!(frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING))
-			{
-				update_frameheadpos(winobj, winstate->temp_slot_2);
-				if (mark_pos > winstate->frameheadpos)
-					mark_pos = winstate->frameheadpos;
-			}
-			WinSetMarkPosition(winobj, mark_pos);
-		}
+			WinSetMarkPosition(winobj, abs_pos);
 		econtext->ecxt_outertuple = slot;
 		return ExecEvalExpr((ExprState *) list_nth(winobj->argstates, argno),
 							econtext, isnull);
@@ -2687,19 +3193,34 @@ WinGetFuncArgInPartition(WindowObject winobj, int argno,
  * WinGetFuncArgInFrame
  *		Evaluate a window function's argument expression on a specified
  *		row of the window frame.  The row is identified in lseek(2) style,
- *		i.e. relative to the current, first, or last row.
+ *		i.e. relative to the first or last row of the frame.  (We do not
+ *		support WINDOW_SEEK_CURRENT here, because it's not very clear what
+ *		that should mean if the current row isn't part of the frame.)
  *
  * argno: argument number to evaluate (counted from 0)
  * relpos: signed rowcount offset from the seek position
- * seektype: WINDOW_SEEK_CURRENT, WINDOW_SEEK_HEAD, or WINDOW_SEEK_TAIL
- * set_mark: If the row is found and set_mark is true, the mark is moved to
- *		the row as a side-effect.
+ * seektype: WINDOW_SEEK_HEAD or WINDOW_SEEK_TAIL
+ * set_mark: If the row is found/in frame and set_mark is true, the mark is
+ *		moved to the row as a side-effect.
  * isnull: output argument, receives isnull status of result
  * isout: output argument, set to indicate whether target row position
  *		is out of frame (can pass NULL if caller doesn't care about this)
  *
- * Specifying a nonexistent row is not an error, it just causes a null result
- * (plus setting *isout true, if isout isn't NULL).
+ * Specifying a nonexistent or not-in-frame row is not an error, it just
+ * causes a null result (plus setting *isout true, if isout isn't NULL).
+ *
+ * Note that some exclusion-clause options lead to situations where the
+ * rows that are in-frame are not consecutive in the partition.  But we
+ * count only in-frame rows when measuring relpos.
+ *
+ * The set_mark flag is interpreted as meaning that the caller will specify
+ * a constant (or, perhaps, monotonically increasing) relpos in successive
+ * calls, so that *if there is no exclusion clause* there will be no need
+ * to fetch a row before the previously fetched row.  But we do not expect
+ * the caller to know how to account for exclusion clauses.  Therefore,
+ * if there is an exclusion clause we take responsibility for adjusting the
+ * mark request to something that will be safe given the above assumption
+ * about relpos.
  */
 Datum
 WinGetFuncArgInFrame(WindowObject winobj, int argno,
@@ -2709,8 +3230,8 @@ WinGetFuncArgInFrame(WindowObject winobj, int argno,
 	WindowAggState *winstate;
 	ExprContext *econtext;
 	TupleTableSlot *slot;
-	bool		gottuple;
 	int64		abs_pos;
+	int64		mark_pos;
 
 	Assert(WindowObjectIsValid(winobj));
 	winstate = winobj->winstate;
@@ -2720,66 +3241,167 @@ WinGetFuncArgInFrame(WindowObject winobj, int argno,
 	switch (seektype)
 	{
 		case WINDOW_SEEK_CURRENT:
-			abs_pos = winstate->currentpos + relpos;
+			elog(ERROR, "WINDOW_SEEK_CURRENT is not supported for WinGetFuncArgInFrame");
+			abs_pos = mark_pos = 0; /* keep compiler quiet */
 			break;
 		case WINDOW_SEEK_HEAD:
-			update_frameheadpos(winobj, slot);
+			/* rejecting relpos < 0 is easy and simplifies code below */
+			if (relpos < 0)
+				goto out_of_frame;
+			update_frameheadpos(winstate);
 			abs_pos = winstate->frameheadpos + relpos;
+			mark_pos = abs_pos;
+
+			/*
+			 * Account for exclusion option if one is active, but advance only
+			 * abs_pos not mark_pos.  This prevents changes of the current
+			 * row's peer group from resulting in trying to fetch a row before
+			 * some previous mark position.
+			 *
+			 * Note that in some corner cases such as current row being
+			 * outside frame, these calculations are theoretically too simple,
+			 * but it doesn't matter because we'll end up deciding the row is
+			 * out of frame.  We do not attempt to avoid fetching rows past
+			 * end of frame; that would happen in some cases anyway.
+			 */
+			switch (winstate->frameOptions & FRAMEOPTION_EXCLUSION)
+			{
+				case 0:
+					/* no adjustment needed */
+					break;
+				case FRAMEOPTION_EXCLUDE_CURRENT_ROW:
+					if (abs_pos >= winstate->currentpos &&
+						winstate->currentpos >= winstate->frameheadpos)
+						abs_pos++;
+					break;
+				case FRAMEOPTION_EXCLUDE_GROUP:
+					update_grouptailpos(winstate);
+					if (abs_pos >= winstate->groupheadpos &&
+						winstate->grouptailpos > winstate->frameheadpos)
+					{
+						int64		overlapstart = Max(winstate->groupheadpos,
+													   winstate->frameheadpos);
+
+						abs_pos += winstate->grouptailpos - overlapstart;
+					}
+					break;
+				case FRAMEOPTION_EXCLUDE_TIES:
+					update_grouptailpos(winstate);
+					if (abs_pos >= winstate->groupheadpos &&
+						winstate->grouptailpos > winstate->frameheadpos)
+					{
+						int64		overlapstart = Max(winstate->groupheadpos,
+													   winstate->frameheadpos);
+
+						if (abs_pos == overlapstart)
+							abs_pos = winstate->currentpos;
+						else
+							abs_pos += winstate->grouptailpos - overlapstart - 1;
+					}
+					break;
+				default:
+					elog(ERROR, "unrecognized frame option state: 0x%x",
+						 winstate->frameOptions);
+					break;
+			}
 			break;
 		case WINDOW_SEEK_TAIL:
-			update_frametailpos(winobj, slot);
-			abs_pos = winstate->frametailpos + relpos;
+			/* rejecting relpos > 0 is easy and simplifies code below */
+			if (relpos > 0)
+				goto out_of_frame;
+			update_frametailpos(winstate);
+			abs_pos = winstate->frametailpos - 1 + relpos;
+
+			/*
+			 * Account for exclusion option if one is active.  If there is no
+			 * exclusion, we can safely set the mark at the accessed row.  But
+			 * if there is, we can only mark the frame start, because we can't
+			 * be sure how far back in the frame the exclusion might cause us
+			 * to fetch in future.  Furthermore, we have to actually check
+			 * against frameheadpos here, since it's unsafe to try to fetch a
+			 * row before frame start if the mark might be there already.
+			 */
+			switch (winstate->frameOptions & FRAMEOPTION_EXCLUSION)
+			{
+				case 0:
+					/* no adjustment needed */
+					mark_pos = abs_pos;
+					break;
+				case FRAMEOPTION_EXCLUDE_CURRENT_ROW:
+					if (abs_pos <= winstate->currentpos &&
+						winstate->currentpos < winstate->frametailpos)
+						abs_pos--;
+					update_frameheadpos(winstate);
+					if (abs_pos < winstate->frameheadpos)
+						goto out_of_frame;
+					mark_pos = winstate->frameheadpos;
+					break;
+				case FRAMEOPTION_EXCLUDE_GROUP:
+					update_grouptailpos(winstate);
+					if (abs_pos < winstate->grouptailpos &&
+						winstate->groupheadpos < winstate->frametailpos)
+					{
+						int64		overlapend = Min(winstate->grouptailpos,
+													 winstate->frametailpos);
+
+						abs_pos -= overlapend - winstate->groupheadpos;
+					}
+					update_frameheadpos(winstate);
+					if (abs_pos < winstate->frameheadpos)
+						goto out_of_frame;
+					mark_pos = winstate->frameheadpos;
+					break;
+				case FRAMEOPTION_EXCLUDE_TIES:
+					update_grouptailpos(winstate);
+					if (abs_pos < winstate->grouptailpos &&
+						winstate->groupheadpos < winstate->frametailpos)
+					{
+						int64		overlapend = Min(winstate->grouptailpos,
+													 winstate->frametailpos);
+
+						if (abs_pos == overlapend - 1)
+							abs_pos = winstate->currentpos;
+						else
+							abs_pos -= overlapend - 1 - winstate->groupheadpos;
+					}
+					update_frameheadpos(winstate);
+					if (abs_pos < winstate->frameheadpos)
+						goto out_of_frame;
+					mark_pos = winstate->frameheadpos;
+					break;
+				default:
+					elog(ERROR, "unrecognized frame option state: 0x%x",
+						 winstate->frameOptions);
+					mark_pos = 0;	/* keep compiler quiet */
+					break;
+			}
 			break;
 		default:
 			elog(ERROR, "unrecognized window seek type: %d", seektype);
-			abs_pos = 0;		/* keep compiler quiet */
+			abs_pos = mark_pos = 0; /* keep compiler quiet */
 			break;
 	}
 
-	gottuple = window_gettupleslot(winobj, abs_pos, slot);
-	if (gottuple)
-		gottuple = row_is_in_frame(winstate, abs_pos, slot);
+	if (!window_gettupleslot(winobj, abs_pos, slot))
+		goto out_of_frame;
 
-	if (!gottuple)
-	{
-		if (isout)
-			*isout = true;
-		*isnull = true;
-		return (Datum) 0;
-	}
-	else
-	{
-		if (isout)
-			*isout = false;
-		if (set_mark)
-		{
-			int			frameOptions = winstate->frameOptions;
-			int64		mark_pos = abs_pos;
+	/* The code above does not detect all out-of-frame cases, so check */
+	if (row_is_in_frame(winstate, abs_pos, slot) <= 0)
+		goto out_of_frame;
 
-			/*
-			 * In RANGE mode with a moving frame head, we must not let the
-			 * mark advance past frameheadpos, since that row has to be
-			 * fetchable during future update_frameheadpos calls.
-			 *
-			 * XXX it is very ugly to pollute window functions' marks with
-			 * this consideration; it could for instance mask a logic bug that
-			 * lets a window function fetch rows before what it had claimed
-			 * was its mark.  Perhaps use a separate mark for frame head
-			 * probes?
-			 */
-			if ((frameOptions & FRAMEOPTION_RANGE) &&
-				!(frameOptions & FRAMEOPTION_START_UNBOUNDED_PRECEDING))
-			{
-				update_frameheadpos(winobj, winstate->temp_slot_2);
-				if (mark_pos > winstate->frameheadpos)
-					mark_pos = winstate->frameheadpos;
-			}
-			WinSetMarkPosition(winobj, mark_pos);
-		}
-		econtext->ecxt_outertuple = slot;
-		return ExecEvalExpr((ExprState *) list_nth(winobj->argstates, argno),
-							econtext, isnull);
-	}
+	if (isout)
+		*isout = false;
+	if (set_mark)
+		WinSetMarkPosition(winobj, mark_pos);
+	econtext->ecxt_outertuple = slot;
+	return ExecEvalExpr((ExprState *) list_nth(winobj->argstates, argno),
+						econtext, isnull);
+
+out_of_frame:
+	if (isout)
+		*isout = true;
+	*isnull = true;
+	return (Datum) 0;
 }
 
 /*
diff --git a/src/backend/executor/nodeWorktablescan.c b/src/backend/executor/nodeWorktablescan.c
index d5ffadda3e..2ff9a215b1 100644
--- a/src/backend/executor/nodeWorktablescan.c
+++ b/src/backend/executor/nodeWorktablescan.c
@@ -3,7 +3,7 @@
  * nodeWorktablescan.c
  *	  routines to handle WorkTableScan nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -157,21 +157,21 @@ ExecInitWorkTableScan(WorkTableScan *node, EState *estate, int eflags)
 	ExecAssignExprContext(estate, &scanstate->ss.ps);
 
 	/*
-	 * initialize child expressions
+	 * tuple table initialization
 	 */
-	scanstate->ss.ps.qual =
-		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
+	ExecInitResultTupleSlotTL(estate, &scanstate->ss.ps);
+	ExecInitScanTupleSlot(estate, &scanstate->ss, NULL);
 
 	/*
-	 * tuple table initialization
+	 * initialize child expressions
 	 */
-	ExecInitResultTupleSlot(estate, &scanstate->ss.ps);
-	ExecInitScanTupleSlot(estate, &scanstate->ss);
+	scanstate->ss.ps.qual =
+		ExecInitQual(node->scan.plan.qual, (PlanState *) scanstate);
 
 	/*
-	 * Initialize result tuple type, but not yet projection info.
+	 * Do not yet initialize projection info, see ExecWorkTableScan() for
+	 * details.
 	 */
-	ExecAssignResultTypeFromTL(&scanstate->ss.ps);
 
 	return scanstate;
 }
diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index cd00a6d9f2..9fc4431b80 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -3,7 +3,7 @@
  * spi.c
  *				Server Programming Interface
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -71,8 +71,8 @@ static void _SPI_cursor_operation(Portal portal,
 static SPIPlanPtr _SPI_make_plan_non_temp(SPIPlanPtr plan);
 static SPIPlanPtr _SPI_save_plan(SPIPlanPtr plan);
 
-static int	_SPI_begin_call(bool execmem);
-static int	_SPI_end_call(bool procmem);
+static int	_SPI_begin_call(bool use_exec);
+static int	_SPI_end_call(bool use_exec);
 static MemoryContext _SPI_execmem(void);
 static MemoryContext _SPI_procmem(void);
 static bool _SPI_checktuples(void);
@@ -82,6 +82,12 @@ static bool _SPI_checktuples(void);
 
 int
 SPI_connect(void)
+{
+	return SPI_connect_ext(0);
+}
+
+int
+SPI_connect_ext(int options)
 {
 	int			newdepth;
 
@@ -92,7 +98,7 @@ SPI_connect(void)
 			elog(ERROR, "SPI stack corrupted");
 		newdepth = 16;
 		_SPI_stack = (_SPI_connection *)
-			MemoryContextAlloc(TopTransactionContext,
+			MemoryContextAlloc(TopMemoryContext,
 							   newdepth * sizeof(_SPI_connection));
 		_SPI_stack_depth = newdepth;
 	}
@@ -118,24 +124,31 @@ SPI_connect(void)
 	_SPI_current->processed = 0;
 	_SPI_current->lastoid = InvalidOid;
 	_SPI_current->tuptable = NULL;
+	_SPI_current->execSubid = InvalidSubTransactionId;
 	slist_init(&_SPI_current->tuptables);
 	_SPI_current->procCxt = NULL;	/* in case we fail to create 'em */
 	_SPI_current->execCxt = NULL;
 	_SPI_current->connectSubid = GetCurrentSubTransactionId();
 	_SPI_current->queryEnv = NULL;
+	_SPI_current->atomic = (options & SPI_OPT_NONATOMIC ? false : true);
+	_SPI_current->internal_xact = false;
 
 	/*
 	 * Create memory contexts for this procedure
 	 *
-	 * XXX it would be better to use PortalContext as the parent context, but
-	 * we may not be inside a portal (consider deferred-trigger execution).
-	 * Perhaps CurTransactionContext would do?	For now it doesn't matter
-	 * because we clean up explicitly in AtEOSubXact_SPI().
+	 * In atomic contexts (the normal case), we use TopTransactionContext,
+	 * otherwise PortalContext, so that it lives across transaction
+	 * boundaries.
+	 *
+	 * XXX It could be better to use PortalContext as the parent context in
+	 * all cases, but we may not be inside a portal (consider deferred-trigger
+	 * execution).  Perhaps CurTransactionContext could be an option?  For now
+	 * it doesn't matter because we clean up explicitly in AtEOSubXact_SPI().
 	 */
-	_SPI_current->procCxt = AllocSetContextCreate(TopTransactionContext,
+	_SPI_current->procCxt = AllocSetContextCreate(_SPI_current->atomic ? TopTransactionContext : PortalContext,
 												  "SPI Proc",
 												  ALLOCSET_DEFAULT_SIZES);
-	_SPI_current->execCxt = AllocSetContextCreate(TopTransactionContext,
+	_SPI_current->execCxt = AllocSetContextCreate(_SPI_current->atomic ? TopTransactionContext : _SPI_current->procCxt,
 												  "SPI Exec",
 												  ALLOCSET_DEFAULT_SIZES);
 	/* ... and switch to procedure's context */
@@ -149,7 +162,7 @@ SPI_finish(void)
 {
 	int			res;
 
-	res = _SPI_begin_call(false);	/* live in procedure memory */
+	res = _SPI_begin_call(false);	/* just check we're connected */
 	if (res < 0)
 		return res;
 
@@ -180,12 +193,85 @@ SPI_finish(void)
 	return SPI_OK_FINISH;
 }
 
+void
+SPI_start_transaction(void)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	StartTransactionCommand();
+	MemoryContextSwitchTo(oldcontext);
+}
+
+void
+SPI_commit(void)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	if (_SPI_current->atomic)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				 errmsg("invalid transaction termination")));
+
+	/*
+	 * This restriction is required by PLs implemented on top of SPI.  They
+	 * use subtransactions to establish exception blocks that are supposed to
+	 * be rolled back together if there is an error.  Terminating the
+	 * top-level transaction in such a block violates that idea.  A future PL
+	 * implementation might have different ideas about this, in which case
+	 * this restriction would have to be refined or the check possibly be
+	 * moved out of SPI into the PLs.
+	 */
+	if (IsSubTransaction())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				 errmsg("cannot commit while a subtransaction is active")));
+
+	_SPI_current->internal_xact = true;
+
+	if (ActiveSnapshotSet())
+		PopActiveSnapshot();
+	CommitTransactionCommand();
+	MemoryContextSwitchTo(oldcontext);
+
+	_SPI_current->internal_xact = false;
+}
+
+void
+SPI_rollback(void)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	if (_SPI_current->atomic)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				 errmsg("invalid transaction termination")));
+
+	/* see under SPI_commit() */
+	if (IsSubTransaction())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				 errmsg("cannot roll back while a subtransaction is active")));
+
+	_SPI_current->internal_xact = true;
+
+	AbortCurrentTransaction();
+	MemoryContextSwitchTo(oldcontext);
+
+	_SPI_current->internal_xact = false;
+}
+
 /*
  * Clean up SPI state at transaction commit or abort.
  */
 void
 AtEOXact_SPI(bool isCommit)
 {
+	/*
+	 * Do nothing if the transaction end was initiated by SPI.
+	 */
+	if (_SPI_current && _SPI_current->internal_xact)
+		return;
+
 	/*
 	 * Note that memory contexts belonging to SPI stack entries will be freed
 	 * automatically, so we can ignore them here.  We just need to restore our
@@ -223,6 +309,9 @@ AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid)
 		if (connection->connectSubid != mySubid)
 			break;				/* couldn't be any underneath it either */
 
+		if (connection->internal_xact)
+			break;
+
 		found = true;
 
 		/*
@@ -268,8 +357,15 @@ AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid)
 	{
 		slist_mutable_iter siter;
 
-		/* free Executor memory the same as _SPI_end_call would do */
-		MemoryContextResetAndDeleteChildren(_SPI_current->execCxt);
+		/*
+		 * Throw away executor state if current executor operation was started
+		 * within current subxact (essentially, force a _SPI_end_call(true)).
+		 */
+		if (_SPI_current->execSubid >= mySubid)
+		{
+			_SPI_current->execSubid = InvalidSubTransactionId;
+			MemoryContextResetAndDeleteChildren(_SPI_current->execCxt);
+		}
 
 		/* throw away any tuple tables created within current subxact */
 		slist_foreach_modify(siter, &_SPI_current->tuptables)
@@ -293,8 +389,6 @@ AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid)
 				MemoryContextDelete(tuptable->tuptabcxt);
 			}
 		}
-		/* in particular we should have gotten rid of any in-progress table */
-		Assert(_SPI_current->tuptable == NULL);
 	}
 }
 
@@ -765,8 +859,10 @@ SPI_fnumber(TupleDesc tupdesc, const char *fname)
 
 	for (res = 0; res < tupdesc->natts; res++)
 	{
-		if (namestrcmp(&tupdesc->attrs[res]->attname, fname) == 0 &&
-			!tupdesc->attrs[res]->attisdropped)
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, res);
+
+		if (namestrcmp(&attr->attname, fname) == 0 &&
+			!attr->attisdropped)
 			return res + 1;
 	}
 
@@ -793,7 +889,7 @@ SPI_fname(TupleDesc tupdesc, int fnumber)
 	}
 
 	if (fnumber > 0)
-		att = tupdesc->attrs[fnumber - 1];
+		att = TupleDescAttr(tupdesc, fnumber - 1);
 	else
 		att = SystemAttributeDefinition(fnumber, true);
 
@@ -823,7 +919,7 @@ SPI_getvalue(HeapTuple tuple, TupleDesc tupdesc, int fnumber)
 		return NULL;
 
 	if (fnumber > 0)
-		typoid = tupdesc->attrs[fnumber - 1]->atttypid;
+		typoid = TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
 	else
 		typoid = (SystemAttributeDefinition(fnumber, true))->atttypid;
 
@@ -865,7 +961,7 @@ SPI_gettype(TupleDesc tupdesc, int fnumber)
 	}
 
 	if (fnumber > 0)
-		typoid = tupdesc->attrs[fnumber - 1]->atttypid;
+		typoid = TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
 	else
 		typoid = (SystemAttributeDefinition(fnumber, true))->atttypid;
 
@@ -901,7 +997,7 @@ SPI_gettypeid(TupleDesc tupdesc, int fnumber)
 	}
 
 	if (fnumber > 0)
-		return tupdesc->attrs[fnumber - 1]->atttypid;
+		return TupleDescAttr(tupdesc, fnumber - 1)->atttypid;
 	else
 		return (SystemAttributeDefinition(fnumber, true))->atttypid;
 }
@@ -1175,7 +1271,7 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	}
 
 	/* Copy the plan's query string into the portal */
-	query_string = MemoryContextStrdup(PortalGetHeapMemory(portal),
+	query_string = MemoryContextStrdup(portal->portalContext,
 									   plansource->query_string);
 
 	/*
@@ -1205,7 +1301,7 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 		 * will result in leaking our refcount on the plan, but it doesn't
 		 * matter because the plan is unsaved and hence transient anyway.
 		 */
-		oldcontext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+		oldcontext = MemoryContextSwitchTo(portal->portalContext);
 		stmt_list = copyObject(stmt_list);
 		MemoryContextSwitchTo(oldcontext);
 		ReleaseCachedPlan(cplan, false);
@@ -1303,7 +1399,7 @@ SPI_cursor_open_internal(const char *name, SPIPlanPtr plan,
 	 */
 	if (paramLI)
 	{
-		oldcontext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+		oldcontext = MemoryContextSwitchTo(portal->portalContext);
 		paramLI = copyParamList(paramLI);
 		MemoryContextSwitchTo(oldcontext);
 	}
@@ -1899,9 +1995,9 @@ _SPI_prepare_oneshot_plan(const char *src, SPIPlanPtr plan)
  * snapshot: query snapshot to use, or InvalidSnapshot for the normal
  *		behavior of taking a new snapshot for each query.
  * crosscheck_snapshot: for RI use, all others pass InvalidSnapshot
- * read_only: TRUE for read-only execution (no CommandCounterIncrement)
- * fire_triggers: TRUE to fire AFTER triggers at end of query (normal case);
- *		FALSE means any AFTER triggers are postponed to end of outer query
+ * read_only: true for read-only execution (no CommandCounterIncrement)
+ * fire_triggers: true to fire AFTER triggers at end of query (normal case);
+ *		false means any AFTER triggers are postponed to end of outer query
  * tcount: execution tuple-count limit, or 0 for none
  */
 static int
@@ -2251,10 +2347,11 @@ _SPI_convert_params(int nargs, Oid *argtypes,
 		/* we have static list of params, so no hooks needed */
 		paramLI->paramFetch = NULL;
 		paramLI->paramFetchArg = NULL;
+		paramLI->paramCompile = NULL;
+		paramLI->paramCompileArg = NULL;
 		paramLI->parserSetup = NULL;
 		paramLI->parserSetupArg = NULL;
 		paramLI->numParams = nargs;
-		paramLI->paramMask = NULL;
 
 		for (i = 0; i < nargs; i++)
 		{
@@ -2359,6 +2456,9 @@ _SPI_error_callback(void *arg)
 	const char *query = (const char *) arg;
 	int			syntaxerrposition;
 
+	if (query == NULL)			/* in case arg wasn't set yet */
+		return;
+
 	/*
 	 * If there is a syntax error position, convert to internal syntax error;
 	 * otherwise treat the query as an item of context stack
@@ -2444,15 +2544,24 @@ _SPI_procmem(void)
 
 /*
  * _SPI_begin_call: begin a SPI operation within a connected procedure
+ *
+ * use_exec is true if we intend to make use of the procedure's execCxt
+ * during this SPI operation.  We'll switch into that context, and arrange
+ * for it to be cleaned up at _SPI_end_call or if an error occurs.
  */
 static int
-_SPI_begin_call(bool execmem)
+_SPI_begin_call(bool use_exec)
 {
 	if (_SPI_current == NULL)
 		return SPI_ERROR_UNCONNECTED;
 
-	if (execmem)				/* switch to the Executor memory context */
+	if (use_exec)
+	{
+		/* remember when the Executor operation started */
+		_SPI_current->execSubid = GetCurrentSubTransactionId();
+		/* switch to the Executor memory context */
 		_SPI_execmem();
+	}
 
 	return 0;
 }
@@ -2460,14 +2569,19 @@ _SPI_begin_call(bool execmem)
 /*
  * _SPI_end_call: end a SPI operation within a connected procedure
  *
+ * use_exec must be the same as in the previous _SPI_begin_call
+ *
  * Note: this currently has no failure return cases, so callers don't check
  */
 static int
-_SPI_end_call(bool procmem)
+_SPI_end_call(bool use_exec)
 {
-	if (procmem)				/* switch to the procedure memory context */
+	if (use_exec)
 	{
+		/* switch to the procedure memory context */
 		_SPI_procmem();
+		/* mark Executor context no longer in use */
+		_SPI_current->execSubid = InvalidSubTransactionId;
 		/* and free Executor memory */
 		MemoryContextResetAndDeleteChildren(_SPI_current->execCxt);
 	}
diff --git a/src/backend/executor/tqueue.c b/src/backend/executor/tqueue.c
index a4cfe9685a..ecdbe7f79f 100644
--- a/src/backend/executor/tqueue.c
+++ b/src/backend/executor/tqueue.c
@@ -3,27 +3,12 @@
  * tqueue.c
  *	  Use shm_mq to send & receive tuples between parallel backends
  *
- * Most of the complexity in this module arises from transient RECORD types,
- * which all have type RECORDOID and are distinguished by typmod numbers
- * that are managed per-backend (see src/backend/utils/cache/typcache.c).
- * The sender's set of RECORD typmod assignments probably doesn't match the
- * receiver's.  To deal with this, we make the sender send a description
- * of each transient RECORD type appearing in the data it sends.  The
- * receiver finds or creates a matching type in its own typcache, and then
- * maps the sender's typmod for that type to its own typmod.
- *
  * A DestReceiver of type DestTupleQueue, which is a TQueueDestReceiver
- * under the hood, writes tuples from the executor to a shm_mq.  If
- * necessary, it also writes control messages describing transient
- * record types used within the tuple.
+ * under the hood, writes tuples from the executor to a shm_mq.
  *
- * A TupleQueueReader reads tuples, and control messages if any are sent,
- * from a shm_mq and returns the tuples.  If transient record types are
- * in use, it registers those types locally based on the control messages
- * and rewrites the typmods sent by the remote side to the corresponding
- * local record typmods.
+ * A TupleQueueReader reads tuples from a shm_mq and returns the tuples.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -35,275 +20,43 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
-#include "catalog/pg_type.h"
 #include "executor/tqueue.h"
-#include "funcapi.h"
-#include "lib/stringinfo.h"
-#include "miscadmin.h"
-#include "utils/array.h"
-#include "utils/lsyscache.h"
-#include "utils/memutils.h"
-#include "utils/rangetypes.h"
-#include "utils/syscache.h"
-#include "utils/typcache.h"
-
-
-/*
- * The data transferred through the shm_mq is divided into messages.
- * One-byte messages are mode-switch messages, telling the receiver to switch
- * between "control" and "data" modes.  (We always start up in "data" mode.)
- * Otherwise, when in "data" mode, each message is a tuple.  When in "control"
- * mode, each message defines one transient-typmod-to-tupledesc mapping to
- * let us interpret future tuples.  Both of those cases certainly require
- * more than one byte, so no confusion is possible.
- */
-#define TUPLE_QUEUE_MODE_CONTROL	'c' /* mode-switch message contents */
-#define TUPLE_QUEUE_MODE_DATA		'd'
-
-/*
- * Both the sender and receiver build trees of TupleRemapInfo nodes to help
- * them identify which (sub) fields of transmitted tuples are composite and
- * may thus need remap processing.  We might need to look within arrays and
- * ranges, not only composites, to find composite sub-fields.  A NULL
- * TupleRemapInfo pointer indicates that it is known that the described field
- * is not composite and has no composite substructure.
- *
- * Note that we currently have to look at each composite field at runtime,
- * even if we believe it's of a named composite type (i.e., not RECORD).
- * This is because we allow the actual value to be a compatible transient
- * RECORD type.  That's grossly inefficient, and it would be good to get
- * rid of the requirement, but it's not clear what would need to change.
- *
- * Also, we allow the top-level tuple structure, as well as the actual
- * structure of composite subfields, to change from one tuple to the next
- * at runtime.  This may well be entirely historical, but it's mostly free
- * to support given the previous requirement; and other places in the system
- * also permit this, so it's not entirely clear if we could drop it.
- */
-
-typedef enum
-{
-	TQUEUE_REMAP_ARRAY,			/* array */
-	TQUEUE_REMAP_RANGE,			/* range */
-	TQUEUE_REMAP_RECORD			/* composite type, named or transient */
-} TupleRemapClass;
-
-typedef struct TupleRemapInfo TupleRemapInfo;
-
-typedef struct ArrayRemapInfo
-{
-	int16		typlen;			/* array element type's storage properties */
-	bool		typbyval;
-	char		typalign;
-	TupleRemapInfo *element_remap;	/* array element type's remap info */
-} ArrayRemapInfo;
-
-typedef struct RangeRemapInfo
-{
-	TypeCacheEntry *typcache;	/* range type's typcache entry */
-	TupleRemapInfo *bound_remap;	/* range bound type's remap info */
-} RangeRemapInfo;
-
-typedef struct RecordRemapInfo
-{
-	/* Original (remote) type ID info last seen for this composite field */
-	Oid			rectypid;
-	int32		rectypmod;
-	/* Local RECORD typmod, or -1 if unset; not used on sender side */
-	int32		localtypmod;
-	/* If no fields of the record require remapping, these are NULL: */
-	TupleDesc	tupledesc;		/* copy of record's tupdesc */
-	TupleRemapInfo **field_remap;	/* each field's remap info */
-} RecordRemapInfo;
-
-struct TupleRemapInfo
-{
-	TupleRemapClass remapclass;
-	union
-	{
-		ArrayRemapInfo arr;
-		RangeRemapInfo rng;
-		RecordRemapInfo rec;
-	}			u;
-};
 
 /*
  * DestReceiver object's private contents
  *
- * queue and tupledesc are pointers to data supplied by DestReceiver's caller.
- * The recordhtab and remap info are owned by the DestReceiver and are kept
- * in mycontext.  tmpcontext is a tuple-lifespan context to hold cruft
- * created while traversing each tuple to find record subfields.
+ * queue is a pointer to data supplied by DestReceiver's caller.
  */
 typedef struct TQueueDestReceiver
 {
 	DestReceiver pub;			/* public fields */
 	shm_mq_handle *queue;		/* shm_mq to send to */
-	MemoryContext mycontext;	/* context containing TQueueDestReceiver */
-	MemoryContext tmpcontext;	/* per-tuple context, if needed */
-	HTAB	   *recordhtab;		/* table of transmitted typmods, if needed */
-	char		mode;			/* current message mode */
-	TupleDesc	tupledesc;		/* current top-level tuple descriptor */
-	TupleRemapInfo **field_remapinfo;	/* current top-level remap info */
 } TQueueDestReceiver;
 
-/*
- * Hash table entries for mapping remote to local typmods.
- */
-typedef struct RecordTypmodMap
-{
-	int32		remotetypmod;	/* hash key (must be first!) */
-	int32		localtypmod;
-} RecordTypmodMap;
-
 /*
  * TupleQueueReader object's private contents
  *
- * queue and tupledesc are pointers to data supplied by reader's caller.
- * The typmodmap and remap info are owned by the TupleQueueReader and
- * are kept in mycontext.
+ * queue is a pointer to data supplied by reader's caller.
  *
  * "typedef struct TupleQueueReader TupleQueueReader" is in tqueue.h
  */
 struct TupleQueueReader
 {
 	shm_mq_handle *queue;		/* shm_mq to receive from */
-	MemoryContext mycontext;	/* context containing TupleQueueReader */
-	HTAB	   *typmodmap;		/* RecordTypmodMap hashtable, if needed */
-	char		mode;			/* current message mode */
-	TupleDesc	tupledesc;		/* current top-level tuple descriptor */
-	TupleRemapInfo **field_remapinfo;	/* current top-level remap info */
 };
 
-/* Local function prototypes */
-static void TQExamine(TQueueDestReceiver *tqueue,
-		  TupleRemapInfo *remapinfo,
-		  Datum value);
-static void TQExamineArray(TQueueDestReceiver *tqueue,
-			   ArrayRemapInfo *remapinfo,
-			   Datum value);
-static void TQExamineRange(TQueueDestReceiver *tqueue,
-			   RangeRemapInfo *remapinfo,
-			   Datum value);
-static void TQExamineRecord(TQueueDestReceiver *tqueue,
-				RecordRemapInfo *remapinfo,
-				Datum value);
-static void TQSendRecordInfo(TQueueDestReceiver *tqueue, int32 typmod,
-				 TupleDesc tupledesc);
-static void TupleQueueHandleControlMessage(TupleQueueReader *reader,
-							   Size nbytes, char *data);
-static HeapTuple TupleQueueHandleDataMessage(TupleQueueReader *reader,
-							Size nbytes, HeapTupleHeader data);
-static HeapTuple TQRemapTuple(TupleQueueReader *reader,
-			 TupleDesc tupledesc,
-			 TupleRemapInfo **field_remapinfo,
-			 HeapTuple tuple);
-static Datum TQRemap(TupleQueueReader *reader, TupleRemapInfo *remapinfo,
-		Datum value, bool *changed);
-static Datum TQRemapArray(TupleQueueReader *reader, ArrayRemapInfo *remapinfo,
-			 Datum value, bool *changed);
-static Datum TQRemapRange(TupleQueueReader *reader, RangeRemapInfo *remapinfo,
-			 Datum value, bool *changed);
-static Datum TQRemapRecord(TupleQueueReader *reader, RecordRemapInfo *remapinfo,
-			  Datum value, bool *changed);
-static TupleRemapInfo *BuildTupleRemapInfo(Oid typid, MemoryContext mycontext);
-static TupleRemapInfo *BuildArrayRemapInfo(Oid elemtypid,
-					MemoryContext mycontext);
-static TupleRemapInfo *BuildRangeRemapInfo(Oid rngtypid,
-					MemoryContext mycontext);
-static TupleRemapInfo **BuildFieldRemapInfo(TupleDesc tupledesc,
-					MemoryContext mycontext);
-
-
 /*
  * Receive a tuple from a query, and send it to the designated shm_mq.
  *
- * Returns TRUE if successful, FALSE if shm_mq has been detached.
+ * Returns true if successful, false if shm_mq has been detached.
  */
 static bool
 tqueueReceiveSlot(TupleTableSlot *slot, DestReceiver *self)
 {
 	TQueueDestReceiver *tqueue = (TQueueDestReceiver *) self;
-	TupleDesc	tupledesc = slot->tts_tupleDescriptor;
 	HeapTuple	tuple;
 	shm_mq_result result;
 
-	/*
-	 * If first time through, compute remapping info for the top-level fields.
-	 * On later calls, if the tupledesc has changed, set up for the new
-	 * tupledesc.  (This is a strange test both because the executor really
-	 * shouldn't change the tupledesc, and also because it would be unsafe if
-	 * the old tupledesc could be freed and a new one allocated at the same
-	 * address.  But since some very old code in printtup.c uses a similar
-	 * approach, we adopt it here as well.)
-	 *
-	 * Here and elsewhere in this module, when replacing remapping info we
-	 * pfree the top-level object because that's easy, but we don't bother to
-	 * recursively free any substructure.  This would lead to query-lifespan
-	 * memory leaks if the mapping info actually changed frequently, but since
-	 * we don't expect that to happen, it doesn't seem worth expending code to
-	 * prevent it.
-	 */
-	if (tqueue->tupledesc != tupledesc)
-	{
-		/* Is it worth trying to free substructure of the remap tree? */
-		if (tqueue->field_remapinfo != NULL)
-			pfree(tqueue->field_remapinfo);
-		tqueue->field_remapinfo = BuildFieldRemapInfo(tupledesc,
-													  tqueue->mycontext);
-		tqueue->tupledesc = tupledesc;
-	}
-
-	/*
-	 * When, because of the types being transmitted, no record typmod mapping
-	 * can be needed, we can skip a good deal of work.
-	 */
-	if (tqueue->field_remapinfo != NULL)
-	{
-		TupleRemapInfo **remapinfo = tqueue->field_remapinfo;
-		int			i;
-		MemoryContext oldcontext = NULL;
-
-		/* Deform the tuple so we can examine fields, if not done already. */
-		slot_getallattrs(slot);
-
-		/* Iterate over each attribute and search it for transient typmods. */
-		for (i = 0; i < tupledesc->natts; i++)
-		{
-			/* Ignore nulls and types that don't need special handling. */
-			if (slot->tts_isnull[i] || remapinfo[i] == NULL)
-				continue;
-
-			/* Switch to temporary memory context to avoid leaking. */
-			if (oldcontext == NULL)
-			{
-				if (tqueue->tmpcontext == NULL)
-					tqueue->tmpcontext =
-						AllocSetContextCreate(tqueue->mycontext,
-											  "tqueue sender temp context",
-											  ALLOCSET_DEFAULT_SIZES);
-				oldcontext = MemoryContextSwitchTo(tqueue->tmpcontext);
-			}
-
-			/* Examine the value. */
-			TQExamine(tqueue, remapinfo[i], slot->tts_values[i]);
-		}
-
-		/* If we used the temp context, reset it and restore prior context. */
-		if (oldcontext != NULL)
-		{
-			MemoryContextSwitchTo(oldcontext);
-			MemoryContextReset(tqueue->tmpcontext);
-		}
-
-		/* If we entered control mode, switch back to data mode. */
-		if (tqueue->mode != TUPLE_QUEUE_MODE_DATA)
-		{
-			tqueue->mode = TUPLE_QUEUE_MODE_DATA;
-			shm_mq_send(tqueue->queue, sizeof(char), &tqueue->mode, false);
-		}
-	}
-
 	/* Send the tuple itself. */
 	tuple = ExecMaterializeSlot(slot);
 	result = shm_mq_send(tqueue->queue, tuple->t_len, tuple->t_data, false);
@@ -319,248 +72,6 @@ tqueueReceiveSlot(TupleTableSlot *slot, DestReceiver *self)
 	return true;
 }
 
-/*
- * Examine the given datum and send any necessary control messages for
- * transient record types contained in it.
- *
- * remapinfo is previously-computed remapping info about the datum's type.
- *
- * This function just dispatches based on the remap class.
- */
-static void
-TQExamine(TQueueDestReceiver *tqueue, TupleRemapInfo *remapinfo, Datum value)
-{
-	/* This is recursive, so it could be driven to stack overflow. */
-	check_stack_depth();
-
-	switch (remapinfo->remapclass)
-	{
-		case TQUEUE_REMAP_ARRAY:
-			TQExamineArray(tqueue, &remapinfo->u.arr, value);
-			break;
-		case TQUEUE_REMAP_RANGE:
-			TQExamineRange(tqueue, &remapinfo->u.rng, value);
-			break;
-		case TQUEUE_REMAP_RECORD:
-			TQExamineRecord(tqueue, &remapinfo->u.rec, value);
-			break;
-	}
-}
-
-/*
- * Examine a record datum and send any necessary control messages for
- * transient record types contained in it.
- */
-static void
-TQExamineRecord(TQueueDestReceiver *tqueue, RecordRemapInfo *remapinfo,
-				Datum value)
-{
-	HeapTupleHeader tup;
-	Oid			typid;
-	int32		typmod;
-	TupleDesc	tupledesc;
-
-	/* Extract type OID and typmod from tuple. */
-	tup = DatumGetHeapTupleHeader(value);
-	typid = HeapTupleHeaderGetTypeId(tup);
-	typmod = HeapTupleHeaderGetTypMod(tup);
-
-	/*
-	 * If first time through, or if this isn't the same composite type as last
-	 * time, consider sending a control message, and then look up the
-	 * necessary information for examining the fields.
-	 */
-	if (typid != remapinfo->rectypid || typmod != remapinfo->rectypmod)
-	{
-		/* Free any old data. */
-		if (remapinfo->tupledesc != NULL)
-			FreeTupleDesc(remapinfo->tupledesc);
-		/* Is it worth trying to free substructure of the remap tree? */
-		if (remapinfo->field_remap != NULL)
-			pfree(remapinfo->field_remap);
-
-		/* Look up tuple descriptor in typcache. */
-		tupledesc = lookup_rowtype_tupdesc(typid, typmod);
-
-		/*
-		 * If this is a transient record type, send the tupledesc in a control
-		 * message.  (TQSendRecordInfo is smart enough to do this only once
-		 * per typmod.)
-		 */
-		if (typid == RECORDOID)
-			TQSendRecordInfo(tqueue, typmod, tupledesc);
-
-		/* Figure out whether fields need recursive processing. */
-		remapinfo->field_remap = BuildFieldRemapInfo(tupledesc,
-													 tqueue->mycontext);
-		if (remapinfo->field_remap != NULL)
-		{
-			/*
-			 * We need to inspect the record contents, so save a copy of the
-			 * tupdesc.  (We could possibly just reference the typcache's
-			 * copy, but then it's problematic when to release the refcount.)
-			 */
-			MemoryContext oldcontext = MemoryContextSwitchTo(tqueue->mycontext);
-
-			remapinfo->tupledesc = CreateTupleDescCopy(tupledesc);
-			MemoryContextSwitchTo(oldcontext);
-		}
-		else
-		{
-			/* No fields of the record require remapping. */
-			remapinfo->tupledesc = NULL;
-		}
-		remapinfo->rectypid = typid;
-		remapinfo->rectypmod = typmod;
-
-		/* Release reference count acquired by lookup_rowtype_tupdesc. */
-		DecrTupleDescRefCount(tupledesc);
-	}
-
-	/*
-	 * If field remapping is required, deform the tuple and examine each
-	 * field.
-	 */
-	if (remapinfo->field_remap != NULL)
-	{
-		Datum	   *values;
-		bool	   *isnull;
-		HeapTupleData tdata;
-		int			i;
-
-		/* Deform the tuple so we can check each column within. */
-		tupledesc = remapinfo->tupledesc;
-		values = (Datum *) palloc(tupledesc->natts * sizeof(Datum));
-		isnull = (bool *) palloc(tupledesc->natts * sizeof(bool));
-		tdata.t_len = HeapTupleHeaderGetDatumLength(tup);
-		ItemPointerSetInvalid(&(tdata.t_self));
-		tdata.t_tableOid = InvalidOid;
-		tdata.t_data = tup;
-		heap_deform_tuple(&tdata, tupledesc, values, isnull);
-
-		/* Recursively check each interesting non-NULL attribute. */
-		for (i = 0; i < tupledesc->natts; i++)
-		{
-			if (!isnull[i] && remapinfo->field_remap[i])
-				TQExamine(tqueue, remapinfo->field_remap[i], values[i]);
-		}
-
-		/* Need not clean up, since we're in a short-lived context. */
-	}
-}
-
-/*
- * Examine an array datum and send any necessary control messages for
- * transient record types contained in it.
- */
-static void
-TQExamineArray(TQueueDestReceiver *tqueue, ArrayRemapInfo *remapinfo,
-			   Datum value)
-{
-	ArrayType  *arr = DatumGetArrayTypeP(value);
-	Oid			typid = ARR_ELEMTYPE(arr);
-	Datum	   *elem_values;
-	bool	   *elem_nulls;
-	int			num_elems;
-	int			i;
-
-	/* Deconstruct the array. */
-	deconstruct_array(arr, typid, remapinfo->typlen,
-					  remapinfo->typbyval, remapinfo->typalign,
-					  &elem_values, &elem_nulls, &num_elems);
-
-	/* Examine each element. */
-	for (i = 0; i < num_elems; i++)
-	{
-		if (!elem_nulls[i])
-			TQExamine(tqueue, remapinfo->element_remap, elem_values[i]);
-	}
-}
-
-/*
- * Examine a range datum and send any necessary control messages for
- * transient record types contained in it.
- */
-static void
-TQExamineRange(TQueueDestReceiver *tqueue, RangeRemapInfo *remapinfo,
-			   Datum value)
-{
-	RangeType  *range = DatumGetRangeType(value);
-	RangeBound	lower;
-	RangeBound	upper;
-	bool		empty;
-
-	/* Extract the lower and upper bounds. */
-	range_deserialize(remapinfo->typcache, range, &lower, &upper, &empty);
-
-	/* Nothing to do for an empty range. */
-	if (empty)
-		return;
-
-	/* Examine each bound, if present. */
-	if (!upper.infinite)
-		TQExamine(tqueue, remapinfo->bound_remap, upper.val);
-	if (!lower.infinite)
-		TQExamine(tqueue, remapinfo->bound_remap, lower.val);
-}
-
-/*
- * Send tuple descriptor information for a transient typmod, unless we've
- * already done so previously.
- */
-static void
-TQSendRecordInfo(TQueueDestReceiver *tqueue, int32 typmod, TupleDesc tupledesc)
-{
-	StringInfoData buf;
-	bool		found;
-	int			i;
-
-	/* Initialize hash table if not done yet. */
-	if (tqueue->recordhtab == NULL)
-	{
-		HASHCTL		ctl;
-
-		MemSet(&ctl, 0, sizeof(ctl));
-		/* Hash table entries are just typmods */
-		ctl.keysize = sizeof(int32);
-		ctl.entrysize = sizeof(int32);
-		ctl.hcxt = tqueue->mycontext;
-		tqueue->recordhtab = hash_create("tqueue sender record type hashtable",
-										 100, &ctl,
-										 HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
-	}
-
-	/* Have we already seen this record type?  If not, must report it. */
-	hash_search(tqueue->recordhtab, &typmod, HASH_ENTER, &found);
-	if (found)
-		return;
-
-	elog(DEBUG3, "sending tqueue control message for record typmod %d", typmod);
-
-	/* If message queue is in data mode, switch to control mode. */
-	if (tqueue->mode != TUPLE_QUEUE_MODE_CONTROL)
-	{
-		tqueue->mode = TUPLE_QUEUE_MODE_CONTROL;
-		shm_mq_send(tqueue->queue, sizeof(char), &tqueue->mode, false);
-	}
-
-	/* Assemble a control message. */
-	initStringInfo(&buf);
-	appendBinaryStringInfo(&buf, (char *) &typmod, sizeof(int32));
-	appendBinaryStringInfo(&buf, (char *) &tupledesc->natts, sizeof(int));
-	appendBinaryStringInfo(&buf, (char *) &tupledesc->tdhasoid, sizeof(bool));
-	for (i = 0; i < tupledesc->natts; i++)
-	{
-		appendBinaryStringInfo(&buf, (char *) tupledesc->attrs[i],
-							   sizeof(FormData_pg_attribute));
-	}
-
-	/* Send control message. */
-	shm_mq_send(tqueue->queue, buf.len, buf.data, false);
-
-	/* We assume it's OK to leak buf because we're in a short-lived context. */
-}
-
 /*
  * Prepare to receive tuples from executor.
  */
@@ -578,7 +89,9 @@ tqueueShutdownReceiver(DestReceiver *self)
 {
 	TQueueDestReceiver *tqueue = (TQueueDestReceiver *) self;
 
-	shm_mq_detach(shm_mq_get_queue(tqueue->queue));
+	if (tqueue->queue != NULL)
+		shm_mq_detach(tqueue->queue);
+	tqueue->queue = NULL;
 }
 
 /*
@@ -589,13 +102,9 @@ tqueueDestroyReceiver(DestReceiver *self)
 {
 	TQueueDestReceiver *tqueue = (TQueueDestReceiver *) self;
 
-	if (tqueue->tmpcontext != NULL)
-		MemoryContextDelete(tqueue->tmpcontext);
-	if (tqueue->recordhtab != NULL)
-		hash_destroy(tqueue->recordhtab);
-	/* Is it worth trying to free substructure of the remap tree? */
-	if (tqueue->field_remapinfo != NULL)
-		pfree(tqueue->field_remapinfo);
+	/* We probably already detached from queue, but let's be sure */
+	if (tqueue->queue != NULL)
+		shm_mq_detach(tqueue->queue);
 	pfree(self);
 }
 
@@ -615,13 +124,6 @@ CreateTupleQueueDestReceiver(shm_mq_handle *handle)
 	self->pub.rDestroy = tqueueDestroyReceiver;
 	self->pub.mydest = DestTupleQueue;
 	self->queue = handle;
-	self->mycontext = CurrentMemoryContext;
-	self->tmpcontext = NULL;
-	self->recordhtab = NULL;
-	self->mode = TUPLE_QUEUE_MODE_DATA;
-	/* Top-level tupledesc is not known yet */
-	self->tupledesc = NULL;
-	self->field_remapinfo = NULL;
 
 	return (DestReceiver *) self;
 }
@@ -630,32 +132,24 @@ CreateTupleQueueDestReceiver(shm_mq_handle *handle)
  * Create a tuple queue reader.
  */
 TupleQueueReader *
-CreateTupleQueueReader(shm_mq_handle *handle, TupleDesc tupledesc)
+CreateTupleQueueReader(shm_mq_handle *handle)
 {
 	TupleQueueReader *reader = palloc0(sizeof(TupleQueueReader));
 
 	reader->queue = handle;
-	reader->mycontext = CurrentMemoryContext;
-	reader->typmodmap = NULL;
-	reader->mode = TUPLE_QUEUE_MODE_DATA;
-	reader->tupledesc = tupledesc;
-	reader->field_remapinfo = BuildFieldRemapInfo(tupledesc, reader->mycontext);
 
 	return reader;
 }
 
 /*
  * Destroy a tuple queue reader.
+ *
+ * Note: cleaning up the underlying shm_mq is the caller's responsibility.
+ * We won't access it here, as it may be detached already.
  */
 void
 DestroyTupleQueueReader(TupleQueueReader *reader)
 {
-	shm_mq_detach(shm_mq_get_queue(reader->queue));
-	if (reader->typmodmap != NULL)
-		hash_destroy(reader->typmodmap);
-	/* Is it worth trying to free substructure of the remap tree? */
-	if (reader->field_remapinfo != NULL)
-		pfree(reader->field_remapinfo);
 	pfree(reader);
 }
 
@@ -667,9 +161,8 @@ DestroyTupleQueueReader(TupleQueueReader *reader)
  * is set to true when there are no remaining tuples and otherwise to false.
  *
  * The returned tuple, if any, is allocated in CurrentMemoryContext.
- * That should be a short-lived (tuple-lifespan) context, because we are
- * pretty cavalier about leaking memory in that context if we have to do
- * tuple remapping.
+ * Note that this routine must not leak memory!  (We used to allow that,
+ * but not any more.)
  *
  * Even when shm_mq_receive() returns SHM_MQ_WOULD_BLOCK, this can still
  * accumulate bytes from a partially-read message, so it's useful to call
@@ -678,64 +171,29 @@ DestroyTupleQueueReader(TupleQueueReader *reader)
 HeapTuple
 TupleQueueReaderNext(TupleQueueReader *reader, bool nowait, bool *done)
 {
+	HeapTupleData htup;
 	shm_mq_result result;
+	Size		nbytes;
+	void	   *data;
 
 	if (done != NULL)
 		*done = false;
 
-	for (;;)
-	{
-		Size		nbytes;
-		void	   *data;
-
-		/* Attempt to read a message. */
-		result = shm_mq_receive(reader->queue, &nbytes, &data, nowait);
-
-		/* If queue is detached, set *done and return NULL. */
-		if (result == SHM_MQ_DETACHED)
-		{
-			if (done != NULL)
-				*done = true;
-			return NULL;
-		}
-
-		/* In non-blocking mode, bail out if no message ready yet. */
-		if (result == SHM_MQ_WOULD_BLOCK)
-			return NULL;
-		Assert(result == SHM_MQ_SUCCESS);
+	/* Attempt to read a message. */
+	result = shm_mq_receive(reader->queue, &nbytes, &data, nowait);
 
-		/*
-		 * We got a message (see message spec at top of file).  Process it.
-		 */
-		if (nbytes == 1)
-		{
-			/* Mode switch message. */
-			reader->mode = ((char *) data)[0];
-		}
-		else if (reader->mode == TUPLE_QUEUE_MODE_DATA)
-		{
-			/* Tuple data. */
-			return TupleQueueHandleDataMessage(reader, nbytes, data);
-		}
-		else if (reader->mode == TUPLE_QUEUE_MODE_CONTROL)
-		{
-			/* Control message, describing a transient record type. */
-			TupleQueueHandleControlMessage(reader, nbytes, data);
-		}
-		else
-			elog(ERROR, "unrecognized tqueue mode: %d", (int) reader->mode);
+	/* If queue is detached, set *done and return NULL. */
+	if (result == SHM_MQ_DETACHED)
+	{
+		if (done != NULL)
+			*done = true;
+		return NULL;
 	}
-}
 
-/*
- * Handle a data message - that is, a tuple - from the remote side.
- */
-static HeapTuple
-TupleQueueHandleDataMessage(TupleQueueReader *reader,
-							Size nbytes,
-							HeapTupleHeader data)
-{
-	HeapTupleData htup;
+	/* In non-blocking mode, bail out if no message ready yet. */
+	if (result == SHM_MQ_WOULD_BLOCK)
+		return NULL;
+	Assert(result == SHM_MQ_SUCCESS);
 
 	/*
 	 * Set up a dummy HeapTupleData pointing to the data from the shm_mq
@@ -746,531 +204,5 @@ TupleQueueHandleDataMessage(TupleQueueReader *reader,
 	htup.t_len = nbytes;
 	htup.t_data = data;
 
-	/*
-	 * Either just copy the data into a regular palloc'd tuple, or remap it,
-	 * as required.
-	 */
-	return TQRemapTuple(reader,
-						reader->tupledesc,
-						reader->field_remapinfo,
-						&htup);
-}
-
-/*
- * Copy the given tuple, remapping any transient typmods contained in it.
- */
-static HeapTuple
-TQRemapTuple(TupleQueueReader *reader,
-			 TupleDesc tupledesc,
-			 TupleRemapInfo **field_remapinfo,
-			 HeapTuple tuple)
-{
-	Datum	   *values;
-	bool	   *isnull;
-	bool		changed = false;
-	int			i;
-
-	/*
-	 * If no remapping is necessary, just copy the tuple into a single
-	 * palloc'd chunk, as caller will expect.
-	 */
-	if (field_remapinfo == NULL)
-		return heap_copytuple(tuple);
-
-	/* Deform tuple so we can remap record typmods for individual attrs. */
-	values = (Datum *) palloc(tupledesc->natts * sizeof(Datum));
-	isnull = (bool *) palloc(tupledesc->natts * sizeof(bool));
-	heap_deform_tuple(tuple, tupledesc, values, isnull);
-
-	/* Recursively process each interesting non-NULL attribute. */
-	for (i = 0; i < tupledesc->natts; i++)
-	{
-		if (isnull[i] || field_remapinfo[i] == NULL)
-			continue;
-		values[i] = TQRemap(reader, field_remapinfo[i], values[i], &changed);
-	}
-
-	/* Reconstruct the modified tuple, if anything was modified. */
-	if (changed)
-		return heap_form_tuple(tupledesc, values, isnull);
-	else
-		return heap_copytuple(tuple);
-}
-
-/*
- * Process the given datum and replace any transient record typmods
- * contained in it.  Set *changed to TRUE if we actually changed the datum.
- *
- * remapinfo is previously-computed remapping info about the datum's type.
- *
- * This function just dispatches based on the remap class.
- */
-static Datum
-TQRemap(TupleQueueReader *reader, TupleRemapInfo *remapinfo,
-		Datum value, bool *changed)
-{
-	/* This is recursive, so it could be driven to stack overflow. */
-	check_stack_depth();
-
-	switch (remapinfo->remapclass)
-	{
-		case TQUEUE_REMAP_ARRAY:
-			return TQRemapArray(reader, &remapinfo->u.arr, value, changed);
-
-		case TQUEUE_REMAP_RANGE:
-			return TQRemapRange(reader, &remapinfo->u.rng, value, changed);
-
-		case TQUEUE_REMAP_RECORD:
-			return TQRemapRecord(reader, &remapinfo->u.rec, value, changed);
-	}
-
-	elog(ERROR, "unrecognized tqueue remap class: %d",
-		 (int) remapinfo->remapclass);
-	return (Datum) 0;
-}
-
-/*
- * Process the given array datum and replace any transient record typmods
- * contained in it.  Set *changed to TRUE if we actually changed the datum.
- */
-static Datum
-TQRemapArray(TupleQueueReader *reader, ArrayRemapInfo *remapinfo,
-			 Datum value, bool *changed)
-{
-	ArrayType  *arr = DatumGetArrayTypeP(value);
-	Oid			typid = ARR_ELEMTYPE(arr);
-	bool		element_changed = false;
-	Datum	   *elem_values;
-	bool	   *elem_nulls;
-	int			num_elems;
-	int			i;
-
-	/* Deconstruct the array. */
-	deconstruct_array(arr, typid, remapinfo->typlen,
-					  remapinfo->typbyval, remapinfo->typalign,
-					  &elem_values, &elem_nulls, &num_elems);
-
-	/* Remap each element. */
-	for (i = 0; i < num_elems; i++)
-	{
-		if (!elem_nulls[i])
-			elem_values[i] = TQRemap(reader,
-									 remapinfo->element_remap,
-									 elem_values[i],
-									 &element_changed);
-	}
-
-	if (element_changed)
-	{
-		/* Reconstruct and return the array.  */
-		*changed = true;
-		arr = construct_md_array(elem_values, elem_nulls,
-								 ARR_NDIM(arr), ARR_DIMS(arr), ARR_LBOUND(arr),
-								 typid, remapinfo->typlen,
-								 remapinfo->typbyval, remapinfo->typalign);
-		return PointerGetDatum(arr);
-	}
-
-	/* Else just return the value as-is. */
-	return value;
-}
-
-/*
- * Process the given range datum and replace any transient record typmods
- * contained in it.  Set *changed to TRUE if we actually changed the datum.
- */
-static Datum
-TQRemapRange(TupleQueueReader *reader, RangeRemapInfo *remapinfo,
-			 Datum value, bool *changed)
-{
-	RangeType  *range = DatumGetRangeType(value);
-	bool		bound_changed = false;
-	RangeBound	lower;
-	RangeBound	upper;
-	bool		empty;
-
-	/* Extract the lower and upper bounds. */
-	range_deserialize(remapinfo->typcache, range, &lower, &upper, &empty);
-
-	/* Nothing to do for an empty range. */
-	if (empty)
-		return value;
-
-	/* Remap each bound, if present. */
-	if (!upper.infinite)
-		upper.val = TQRemap(reader, remapinfo->bound_remap,
-							upper.val, &bound_changed);
-	if (!lower.infinite)
-		lower.val = TQRemap(reader, remapinfo->bound_remap,
-							lower.val, &bound_changed);
-
-	if (bound_changed)
-	{
-		/* Reserialize.  */
-		*changed = true;
-		range = range_serialize(remapinfo->typcache, &lower, &upper, empty);
-		return RangeTypeGetDatum(range);
-	}
-
-	/* Else just return the value as-is. */
-	return value;
-}
-
-/*
- * Process the given record datum and replace any transient record typmods
- * contained in it.  Set *changed to TRUE if we actually changed the datum.
- */
-static Datum
-TQRemapRecord(TupleQueueReader *reader, RecordRemapInfo *remapinfo,
-			  Datum value, bool *changed)
-{
-	HeapTupleHeader tup;
-	Oid			typid;
-	int32		typmod;
-	bool		changed_typmod;
-	TupleDesc	tupledesc;
-
-	/* Extract type OID and typmod from tuple. */
-	tup = DatumGetHeapTupleHeader(value);
-	typid = HeapTupleHeaderGetTypeId(tup);
-	typmod = HeapTupleHeaderGetTypMod(tup);
-
-	/*
-	 * If first time through, or if this isn't the same composite type as last
-	 * time, identify the required typmod mapping, and then look up the
-	 * necessary information for processing the fields.
-	 */
-	if (typid != remapinfo->rectypid || typmod != remapinfo->rectypmod)
-	{
-		/* Free any old data. */
-		if (remapinfo->tupledesc != NULL)
-			FreeTupleDesc(remapinfo->tupledesc);
-		/* Is it worth trying to free substructure of the remap tree? */
-		if (remapinfo->field_remap != NULL)
-			pfree(remapinfo->field_remap);
-
-		/* If transient record type, look up matching local typmod. */
-		if (typid == RECORDOID)
-		{
-			RecordTypmodMap *mapent;
-
-			Assert(reader->typmodmap != NULL);
-			mapent = hash_search(reader->typmodmap, &typmod,
-								 HASH_FIND, NULL);
-			if (mapent == NULL)
-				elog(ERROR, "tqueue received unrecognized remote typmod %d",
-					 typmod);
-			remapinfo->localtypmod = mapent->localtypmod;
-		}
-		else
-			remapinfo->localtypmod = -1;
-
-		/* Look up tuple descriptor in typcache. */
-		tupledesc = lookup_rowtype_tupdesc(typid, remapinfo->localtypmod);
-
-		/* Figure out whether fields need recursive processing. */
-		remapinfo->field_remap = BuildFieldRemapInfo(tupledesc,
-													 reader->mycontext);
-		if (remapinfo->field_remap != NULL)
-		{
-			/*
-			 * We need to inspect the record contents, so save a copy of the
-			 * tupdesc.  (We could possibly just reference the typcache's
-			 * copy, but then it's problematic when to release the refcount.)
-			 */
-			MemoryContext oldcontext = MemoryContextSwitchTo(reader->mycontext);
-
-			remapinfo->tupledesc = CreateTupleDescCopy(tupledesc);
-			MemoryContextSwitchTo(oldcontext);
-		}
-		else
-		{
-			/* No fields of the record require remapping. */
-			remapinfo->tupledesc = NULL;
-		}
-		remapinfo->rectypid = typid;
-		remapinfo->rectypmod = typmod;
-
-		/* Release reference count acquired by lookup_rowtype_tupdesc. */
-		DecrTupleDescRefCount(tupledesc);
-	}
-
-	/* If transient record, replace remote typmod with local typmod. */
-	if (typid == RECORDOID && typmod != remapinfo->localtypmod)
-	{
-		typmod = remapinfo->localtypmod;
-		changed_typmod = true;
-	}
-	else
-		changed_typmod = false;
-
-	/*
-	 * If we need to change the typmod, or if there are any potentially
-	 * remappable fields, replace the tuple.
-	 */
-	if (changed_typmod || remapinfo->field_remap != NULL)
-	{
-		HeapTupleData htup;
-		HeapTuple	atup;
-
-		/* For now, assume we always need to change the tuple in this case. */
-		*changed = true;
-
-		/* Copy tuple, possibly remapping contained fields. */
-		ItemPointerSetInvalid(&htup.t_self);
-		htup.t_tableOid = InvalidOid;
-		htup.t_len = HeapTupleHeaderGetDatumLength(tup);
-		htup.t_data = tup;
-		atup = TQRemapTuple(reader,
-							remapinfo->tupledesc,
-							remapinfo->field_remap,
-							&htup);
-
-		/* Apply the correct labeling for a local Datum. */
-		HeapTupleHeaderSetTypeId(atup->t_data, typid);
-		HeapTupleHeaderSetTypMod(atup->t_data, typmod);
-		HeapTupleHeaderSetDatumLength(atup->t_data, htup.t_len);
-
-		/* And return the results. */
-		return HeapTupleHeaderGetDatum(atup->t_data);
-	}
-
-	/* Else just return the value as-is. */
-	return value;
-}
-
-/*
- * Handle a control message from the tuple queue reader.
- *
- * Control messages are sent when the remote side is sending tuples that
- * contain transient record types.  We need to arrange to bless those
- * record types locally and translate between remote and local typmods.
- */
-static void
-TupleQueueHandleControlMessage(TupleQueueReader *reader, Size nbytes,
-							   char *data)
-{
-	int32		remotetypmod;
-	int			natts;
-	bool		hasoid;
-	Size		offset = 0;
-	Form_pg_attribute *attrs;
-	TupleDesc	tupledesc;
-	RecordTypmodMap *mapent;
-	bool		found;
-	int			i;
-
-	/* Extract remote typmod. */
-	memcpy(&remotetypmod, &data[offset], sizeof(int32));
-	offset += sizeof(int32);
-
-	/* Extract attribute count. */
-	memcpy(&natts, &data[offset], sizeof(int));
-	offset += sizeof(int);
-
-	/* Extract hasoid flag. */
-	memcpy(&hasoid, &data[offset], sizeof(bool));
-	offset += sizeof(bool);
-
-	/* Extract attribute details. The tupledesc made here is just transient. */
-	attrs = palloc(natts * sizeof(Form_pg_attribute));
-	for (i = 0; i < natts; i++)
-	{
-		attrs[i] = palloc(sizeof(FormData_pg_attribute));
-		memcpy(attrs[i], &data[offset], sizeof(FormData_pg_attribute));
-		offset += sizeof(FormData_pg_attribute);
-	}
-
-	/* We should have read the whole message. */
-	Assert(offset == nbytes);
-
-	/* Construct TupleDesc, and assign a local typmod. */
-	tupledesc = CreateTupleDesc(natts, hasoid, attrs);
-	tupledesc = BlessTupleDesc(tupledesc);
-
-	/* Create mapping hashtable if it doesn't exist already. */
-	if (reader->typmodmap == NULL)
-	{
-		HASHCTL		ctl;
-
-		MemSet(&ctl, 0, sizeof(ctl));
-		ctl.keysize = sizeof(int32);
-		ctl.entrysize = sizeof(RecordTypmodMap);
-		ctl.hcxt = reader->mycontext;
-		reader->typmodmap = hash_create("tqueue receiver record type hashtable",
-										100, &ctl,
-										HASH_ELEM | HASH_BLOBS | HASH_CONTEXT);
-	}
-
-	/* Create map entry. */
-	mapent = hash_search(reader->typmodmap, &remotetypmod, HASH_ENTER,
-						 &found);
-	if (found)
-		elog(ERROR, "duplicate tqueue control message for typmod %d",
-			 remotetypmod);
-	mapent->localtypmod = tupledesc->tdtypmod;
-
-	elog(DEBUG3, "tqueue mapping remote typmod %d to local typmod %d",
-		 remotetypmod, mapent->localtypmod);
-}
-
-/*
- * Build remap info for the specified data type, storing it in mycontext.
- * Returns NULL if neither the type nor any subtype could require remapping.
- */
-static TupleRemapInfo *
-BuildTupleRemapInfo(Oid typid, MemoryContext mycontext)
-{
-	HeapTuple	tup;
-	Form_pg_type typ;
-
-	/* This is recursive, so it could be driven to stack overflow. */
-	check_stack_depth();
-
-restart:
-	tup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typid));
-	if (!HeapTupleIsValid(tup))
-		elog(ERROR, "cache lookup failed for type %u", typid);
-	typ = (Form_pg_type) GETSTRUCT(tup);
-
-	/* Look through domains to underlying base type. */
-	if (typ->typtype == TYPTYPE_DOMAIN)
-	{
-		typid = typ->typbasetype;
-		ReleaseSysCache(tup);
-		goto restart;
-	}
-
-	/* If it's a true array type, deal with it that way. */
-	if (OidIsValid(typ->typelem) && typ->typlen == -1)
-	{
-		typid = typ->typelem;
-		ReleaseSysCache(tup);
-		return BuildArrayRemapInfo(typid, mycontext);
-	}
-
-	/* Similarly, deal with ranges appropriately. */
-	if (typ->typtype == TYPTYPE_RANGE)
-	{
-		ReleaseSysCache(tup);
-		return BuildRangeRemapInfo(typid, mycontext);
-	}
-
-	/*
-	 * If it's a composite type (including RECORD), set up for remapping.  We
-	 * don't attempt to determine the status of subfields here, since we do
-	 * not have enough information yet; just mark everything invalid.
-	 */
-	if (typ->typtype == TYPTYPE_COMPOSITE || typid == RECORDOID)
-	{
-		TupleRemapInfo *remapinfo;
-
-		remapinfo = (TupleRemapInfo *)
-			MemoryContextAlloc(mycontext, sizeof(TupleRemapInfo));
-		remapinfo->remapclass = TQUEUE_REMAP_RECORD;
-		remapinfo->u.rec.rectypid = InvalidOid;
-		remapinfo->u.rec.rectypmod = -1;
-		remapinfo->u.rec.localtypmod = -1;
-		remapinfo->u.rec.tupledesc = NULL;
-		remapinfo->u.rec.field_remap = NULL;
-		ReleaseSysCache(tup);
-		return remapinfo;
-	}
-
-	/* Nothing else can possibly need remapping attention. */
-	ReleaseSysCache(tup);
-	return NULL;
-}
-
-static TupleRemapInfo *
-BuildArrayRemapInfo(Oid elemtypid, MemoryContext mycontext)
-{
-	TupleRemapInfo *remapinfo;
-	TupleRemapInfo *element_remapinfo;
-
-	/* See if element type requires remapping. */
-	element_remapinfo = BuildTupleRemapInfo(elemtypid, mycontext);
-	/* If not, the array doesn't either. */
-	if (element_remapinfo == NULL)
-		return NULL;
-	/* OK, set up to remap the array. */
-	remapinfo = (TupleRemapInfo *)
-		MemoryContextAlloc(mycontext, sizeof(TupleRemapInfo));
-	remapinfo->remapclass = TQUEUE_REMAP_ARRAY;
-	get_typlenbyvalalign(elemtypid,
-						 &remapinfo->u.arr.typlen,
-						 &remapinfo->u.arr.typbyval,
-						 &remapinfo->u.arr.typalign);
-	remapinfo->u.arr.element_remap = element_remapinfo;
-	return remapinfo;
-}
-
-static TupleRemapInfo *
-BuildRangeRemapInfo(Oid rngtypid, MemoryContext mycontext)
-{
-	TupleRemapInfo *remapinfo;
-	TupleRemapInfo *bound_remapinfo;
-	TypeCacheEntry *typcache;
-
-	/*
-	 * Get range info from the typcache.  We assume this pointer will stay
-	 * valid for the duration of the query.
-	 */
-	typcache = lookup_type_cache(rngtypid, TYPECACHE_RANGE_INFO);
-	if (typcache->rngelemtype == NULL)
-		elog(ERROR, "type %u is not a range type", rngtypid);
-
-	/* See if range bound type requires remapping. */
-	bound_remapinfo = BuildTupleRemapInfo(typcache->rngelemtype->type_id,
-										  mycontext);
-	/* If not, the range doesn't either. */
-	if (bound_remapinfo == NULL)
-		return NULL;
-	/* OK, set up to remap the range. */
-	remapinfo = (TupleRemapInfo *)
-		MemoryContextAlloc(mycontext, sizeof(TupleRemapInfo));
-	remapinfo->remapclass = TQUEUE_REMAP_RANGE;
-	remapinfo->u.rng.typcache = typcache;
-	remapinfo->u.rng.bound_remap = bound_remapinfo;
-	return remapinfo;
-}
-
-/*
- * Build remap info for fields of the type described by the given tupdesc.
- * Returns an array of TupleRemapInfo pointers, or NULL if no field
- * requires remapping.  Data is allocated in mycontext.
- */
-static TupleRemapInfo **
-BuildFieldRemapInfo(TupleDesc tupledesc, MemoryContext mycontext)
-{
-	TupleRemapInfo **remapinfo;
-	bool		noop = true;
-	int			i;
-
-	/* Recursively determine the remapping status of each field. */
-	remapinfo = (TupleRemapInfo **)
-		MemoryContextAlloc(mycontext,
-						   tupledesc->natts * sizeof(TupleRemapInfo *));
-	for (i = 0; i < tupledesc->natts; i++)
-	{
-		Form_pg_attribute attr = tupledesc->attrs[i];
-
-		if (attr->attisdropped)
-		{
-			remapinfo[i] = NULL;
-			continue;
-		}
-		remapinfo[i] = BuildTupleRemapInfo(attr->atttypid, mycontext);
-		if (remapinfo[i] != NULL)
-			noop = false;
-	}
-
-	/* If no fields require remapping, report that by returning NULL. */
-	if (noop)
-	{
-		pfree(remapinfo);
-		remapinfo = NULL;
-	}
-
-	return remapinfo;
+	return heap_copytuple(&htup);
 }
diff --git a/src/backend/executor/tstoreReceiver.c b/src/backend/executor/tstoreReceiver.c
index eda38b1de1..d02ca3afd1 100644
--- a/src/backend/executor/tstoreReceiver.c
+++ b/src/backend/executor/tstoreReceiver.c
@@ -9,7 +9,7 @@
  * data even if the underlying table is dropped.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -49,7 +49,6 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo)
 {
 	TStoreState *myState = (TStoreState *) self;
 	bool		needtoast = false;
-	Form_pg_attribute *attrs = typeinfo->attrs;
 	int			natts = typeinfo->natts;
 	int			i;
 
@@ -58,9 +57,11 @@ tstoreStartupReceiver(DestReceiver *self, int operation, TupleDesc typeinfo)
 	{
 		for (i = 0; i < natts; i++)
 		{
-			if (attrs[i]->attisdropped)
+			Form_pg_attribute attr = TupleDescAttr(typeinfo, i);
+
+			if (attr->attisdropped)
 				continue;
-			if (attrs[i]->attlen == -1)
+			if (attr->attlen == -1)
 			{
 				needtoast = true;
 				break;
@@ -109,7 +110,6 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self)
 {
 	TStoreState *myState = (TStoreState *) self;
 	TupleDesc	typeinfo = slot->tts_tupleDescriptor;
-	Form_pg_attribute *attrs = typeinfo->attrs;
 	int			natts = typeinfo->natts;
 	int			nfree;
 	int			i;
@@ -127,10 +127,9 @@ tstoreReceiveSlot_detoast(TupleTableSlot *slot, DestReceiver *self)
 	for (i = 0; i < natts; i++)
 	{
 		Datum		val = slot->tts_values[i];
+		Form_pg_attribute attr = TupleDescAttr(typeinfo, i);
 
-		if (!attrs[i]->attisdropped &&
-			attrs[i]->attlen == -1 &&
-			!slot->tts_isnull[i])
+		if (!attr->attisdropped && attr->attlen == -1 && !slot->tts_isnull[i])
 		{
 			if (VARATT_IS_EXTERNAL(DatumGetPointer(val)))
 			{
diff --git a/src/backend/foreign/foreign.c b/src/backend/foreign/foreign.c
index a113bf540d..eac78a5d31 100644
--- a/src/backend/foreign/foreign.c
+++ b/src/backend/foreign/foreign.c
@@ -3,7 +3,7 @@
  * foreign.c
  *		  support for foreign-data wrappers, servers and user mappings.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/backend/foreign/foreign.c
@@ -428,7 +428,7 @@ GetFdwRoutineForRelation(Relation relation, bool makecopy)
 /*
  * IsImportableForeignTable - filter table names for IMPORT FOREIGN SCHEMA
  *
- * Returns TRUE if given table name should be imported according to the
+ * Returns true if given table name should be imported according to the
  * statement's import filter options.
  */
 bool
@@ -712,7 +712,7 @@ get_foreign_server_oid(const char *servername, bool missing_ok)
  * path list in RelOptInfo is anyway sorted by total cost we are likely to
  * choose the most efficient path, which is all for the best.
  */
-extern Path *
+Path *
 GetExistingLocalJoinPath(RelOptInfo *joinrel)
 {
 	ListCell   *lc;
diff --git a/src/backend/lib/Makefile b/src/backend/lib/Makefile
index f222c6c20d..d1fefe43f2 100644
--- a/src/backend/lib/Makefile
+++ b/src/backend/lib/Makefile
@@ -12,7 +12,7 @@ subdir = src/backend/lib
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = binaryheap.o bipartite_match.o hyperloglog.o ilist.o knapsack.o \
-       pairingheap.o rbtree.o stringinfo.o
+OBJS = binaryheap.o bipartite_match.o dshash.o hyperloglog.o ilist.o \
+	   knapsack.o pairingheap.o rbtree.o stringinfo.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/lib/binaryheap.c b/src/backend/lib/binaryheap.c
index ce4331ccde..a8adf065a9 100644
--- a/src/backend/lib/binaryheap.c
+++ b/src/backend/lib/binaryheap.c
@@ -3,7 +3,7 @@
  * binaryheap.c
  *	  A simple binary heap implementation
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/lib/binaryheap.c
diff --git a/src/backend/lib/bipartite_match.c b/src/backend/lib/bipartite_match.c
index 4564a463d5..5be5ed24f1 100644
--- a/src/backend/lib/bipartite_match.c
+++ b/src/backend/lib/bipartite_match.c
@@ -7,7 +7,7 @@
  *
  * http://en.wikipedia.org/w/index.php?title=Hopcroft%E2%80%93Karp_algorithm&oldid=593898016
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/lib/bipartite_match.c
diff --git a/src/backend/lib/dshash.c b/src/backend/lib/dshash.c
new file mode 100644
index 0000000000..b1973d4bfb
--- /dev/null
+++ b/src/backend/lib/dshash.c
@@ -0,0 +1,901 @@
+/*-------------------------------------------------------------------------
+ *
+ * dshash.c
+ *	  Concurrent hash tables backed by dynamic shared memory areas.
+ *
+ * This is an open hashing hash table, with a linked list at each table
+ * entry.  It supports dynamic resizing, as required to prevent the linked
+ * lists from growing too long on average.  Currently, only growing is
+ * supported: the hash table never becomes smaller.
+ *
+ * To deal with concurrency, it has a fixed size set of partitions, each of
+ * which is independently locked.  Each bucket maps to a partition; so insert,
+ * find and iterate operations normally only acquire one lock.  Therefore,
+ * good concurrency is achieved whenever such operations don't collide at the
+ * lock partition level.  However, when a resize operation begins, all
+ * partition locks must be acquired simultaneously for a brief period.  This
+ * is only expected to happen a small number of times until a stable size is
+ * found, since growth is geometric.
+ *
+ * Future versions may support iterators and incremental resizing; for now
+ * the implementation is minimalist.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/lib/dshash.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "lib/dshash.h"
+#include "storage/ipc.h"
+#include "storage/lwlock.h"
+#include "utils/dsa.h"
+#include "utils/hsearch.h"
+#include "utils/memutils.h"
+
+/*
+ * An item in the hash table.  This wraps the user's entry object in an
+ * envelop that holds a pointer back to the bucket and a pointer to the next
+ * item in the bucket.
+ */
+struct dshash_table_item
+{
+	/* The next item in the same bucket. */
+	dsa_pointer next;
+	/* The hashed key, to avoid having to recompute it. */
+	dshash_hash hash;
+	/* The user's entry object follows here.  See ENTRY_FROM_ITEM(item). */
+};
+
+/*
+ * The number of partitions for locking purposes.  This is set to match
+ * NUM_BUFFER_PARTITIONS for now, on the basis that whatever's good enough for
+ * the buffer pool must be good enough for any other purpose.  This could
+ * become a runtime parameter in future.
+ */
+#define DSHASH_NUM_PARTITIONS_LOG2 7
+#define DSHASH_NUM_PARTITIONS (1 << DSHASH_NUM_PARTITIONS_LOG2)
+
+/* A magic value used to identify our hash tables. */
+#define DSHASH_MAGIC 0x75ff6a20
+
+/*
+ * Tracking information for each lock partition.  Initially, each partition
+ * corresponds to one bucket, but each time the hash table grows, the buckets
+ * covered by each partition split so the number of buckets covered doubles.
+ *
+ * We might want to add padding here so that each partition is on a different
+ * cache line, but doing so would bloat this structure considerably.
+ */
+typedef struct dshash_partition
+{
+	LWLock		lock;			/* Protects all buckets in this partition. */
+	size_t		count;			/* # of items in this partition's buckets */
+} dshash_partition;
+
+/*
+ * The head object for a hash table.  This will be stored in dynamic shared
+ * memory.
+ */
+typedef struct dshash_table_control
+{
+	dshash_table_handle handle;
+	uint32		magic;
+	dshash_partition partitions[DSHASH_NUM_PARTITIONS];
+	int			lwlock_tranche_id;
+
+	/*
+	 * The following members are written to only when ALL partitions locks are
+	 * held.  They can be read when any one partition lock is held.
+	 */
+
+	/* Number of buckets expressed as power of 2 (8 = 256 buckets). */
+	size_t		size_log2;		/* log2(number of buckets) */
+	dsa_pointer buckets;		/* current bucket array */
+} dshash_table_control;
+
+/*
+ * Per-backend state for a dynamic hash table.
+ */
+struct dshash_table
+{
+	dsa_area   *area;			/* Backing dynamic shared memory area. */
+	dshash_parameters params;	/* Parameters. */
+	void	   *arg;			/* User-supplied data pointer. */
+	dshash_table_control *control;	/* Control object in DSM. */
+	dsa_pointer *buckets;		/* Current bucket pointers in DSM. */
+	size_t		size_log2;		/* log2(number of buckets) */
+	bool		find_locked;	/* Is any partition lock held by 'find'? */
+	bool		find_exclusively_locked;	/* ... exclusively? */
+};
+
+/* Given a pointer to an item, find the entry (user data) it holds. */
+#define ENTRY_FROM_ITEM(item) \
+	((char *)(item) + MAXALIGN(sizeof(dshash_table_item)))
+
+/* Given a pointer to an entry, find the item that holds it. */
+#define ITEM_FROM_ENTRY(entry)											\
+	((dshash_table_item *)((char *)(entry) -							\
+							 MAXALIGN(sizeof(dshash_table_item))))
+
+/* How many resize operations (bucket splits) have there been? */
+#define NUM_SPLITS(size_log2)					\
+	(size_log2 - DSHASH_NUM_PARTITIONS_LOG2)
+
+/* How many buckets are there in each partition at a given size? */
+#define BUCKETS_PER_PARTITION(size_log2)		\
+	(UINT64CONST(1) << NUM_SPLITS(size_log2))
+
+/* Max entries before we need to grow.  Half + quarter = 75% load factor. */
+#define MAX_COUNT_PER_PARTITION(hash_table)				\
+	(BUCKETS_PER_PARTITION(hash_table->size_log2) / 2 + \
+	 BUCKETS_PER_PARTITION(hash_table->size_log2) / 4)
+
+/* Choose partition based on the highest order bits of the hash. */
+#define PARTITION_FOR_HASH(hash)										\
+	(hash >> ((sizeof(dshash_hash) * CHAR_BIT) - DSHASH_NUM_PARTITIONS_LOG2))
+
+/*
+ * Find the bucket index for a given hash and table size.  Each time the table
+ * doubles in size, the appropriate bucket for a given hash value doubles and
+ * possibly adds one, depending on the newly revealed bit, so that all buckets
+ * are split.
+ */
+#define BUCKET_INDEX_FOR_HASH_AND_SIZE(hash, size_log2)		\
+	(hash >> ((sizeof(dshash_hash) * CHAR_BIT) - (size_log2)))
+
+/* The index of the first bucket in a given partition. */
+#define BUCKET_INDEX_FOR_PARTITION(partition, size_log2)	\
+	((partition) << NUM_SPLITS(size_log2))
+
+/* The head of the active bucket for a given hash value (lvalue). */
+#define BUCKET_FOR_HASH(hash_table, hash)								\
+	(hash_table->buckets[												\
+		BUCKET_INDEX_FOR_HASH_AND_SIZE(hash,							\
+									   hash_table->size_log2)])
+
+static void delete_item(dshash_table *hash_table,
+			dshash_table_item *item);
+static void resize(dshash_table *hash_table, size_t new_size);
+static inline void ensure_valid_bucket_pointers(dshash_table *hash_table);
+static inline dshash_table_item *find_in_bucket(dshash_table *hash_table,
+			   const void *key,
+			   dsa_pointer item_pointer);
+static void insert_item_into_bucket(dshash_table *hash_table,
+						dsa_pointer item_pointer,
+						dshash_table_item *item,
+						dsa_pointer *bucket);
+static dshash_table_item *insert_into_bucket(dshash_table *hash_table,
+				   const void *key,
+				   dsa_pointer *bucket);
+static bool delete_key_from_bucket(dshash_table *hash_table,
+					   const void *key,
+					   dsa_pointer *bucket_head);
+static bool delete_item_from_bucket(dshash_table *hash_table,
+						dshash_table_item *item,
+						dsa_pointer *bucket_head);
+static inline dshash_hash hash_key(dshash_table *hash_table, const void *key);
+static inline bool equal_keys(dshash_table *hash_table,
+		   const void *a, const void *b);
+
+#define PARTITION_LOCK(hash_table, i)			\
+	(&(hash_table)->control->partitions[(i)].lock)
+
+/*
+ * Create a new hash table backed by the given dynamic shared area, with the
+ * given parameters.  The returned object is allocated in backend-local memory
+ * using the current MemoryContext.  'arg' will be passed through to the
+ * compare and hash functions.
+ */
+dshash_table *
+dshash_create(dsa_area *area, const dshash_parameters *params, void *arg)
+{
+	dshash_table *hash_table;
+	dsa_pointer control;
+
+	/* Allocate the backend-local object representing the hash table. */
+	hash_table = palloc(sizeof(dshash_table));
+
+	/* Allocate the control object in shared memory. */
+	control = dsa_allocate(area, sizeof(dshash_table_control));
+
+	/* Set up the local and shared hash table structs. */
+	hash_table->area = area;
+	hash_table->params = *params;
+	hash_table->arg = arg;
+	hash_table->control = dsa_get_address(area, control);
+	hash_table->control->handle = control;
+	hash_table->control->magic = DSHASH_MAGIC;
+	hash_table->control->lwlock_tranche_id = params->tranche_id;
+
+	/* Set up the array of lock partitions. */
+	{
+		dshash_partition *partitions = hash_table->control->partitions;
+		int			tranche_id = hash_table->control->lwlock_tranche_id;
+		int			i;
+
+		for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+		{
+			LWLockInitialize(&partitions[i].lock, tranche_id);
+			partitions[i].count = 0;
+		}
+	}
+
+	hash_table->find_locked = false;
+	hash_table->find_exclusively_locked = false;
+
+	/*
+	 * Set up the initial array of buckets.  Our initial size is the same as
+	 * the number of partitions.
+	 */
+	hash_table->control->size_log2 = DSHASH_NUM_PARTITIONS_LOG2;
+	hash_table->control->buckets =
+		dsa_allocate_extended(area,
+							  sizeof(dsa_pointer) * DSHASH_NUM_PARTITIONS,
+							  DSA_ALLOC_NO_OOM | DSA_ALLOC_ZERO);
+	if (!DsaPointerIsValid(hash_table->control->buckets))
+	{
+		dsa_free(area, control);
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory"),
+				 errdetail("Failed on DSA request of size %zu.",
+						   sizeof(dsa_pointer) * DSHASH_NUM_PARTITIONS)));
+	}
+	hash_table->buckets = dsa_get_address(area,
+										  hash_table->control->buckets);
+	hash_table->size_log2 = hash_table->control->size_log2;
+
+	return hash_table;
+}
+
+/*
+ * Attach to an existing hash table using a handle.  The returned object is
+ * allocated in backend-local memory using the current MemoryContext.  'arg'
+ * will be passed through to the compare and hash functions.
+ */
+dshash_table *
+dshash_attach(dsa_area *area, const dshash_parameters *params,
+			  dshash_table_handle handle, void *arg)
+{
+	dshash_table *hash_table;
+	dsa_pointer control;
+
+	/* Allocate the backend-local object representing the hash table. */
+	hash_table = palloc(sizeof(dshash_table));
+
+	/* Find the control object in shared memory. */
+	control = handle;
+
+	/* Set up the local hash table struct. */
+	hash_table->area = area;
+	hash_table->params = *params;
+	hash_table->arg = arg;
+	hash_table->control = dsa_get_address(area, control);
+	hash_table->find_locked = false;
+	hash_table->find_exclusively_locked = false;
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+
+	/*
+	 * These will later be set to the correct values by
+	 * ensure_valid_bucket_pointers(), at which time we'll be holding a
+	 * partition lock for interlocking against concurrent resizing.
+	 */
+	hash_table->buckets = NULL;
+	hash_table->size_log2 = 0;
+
+	return hash_table;
+}
+
+/*
+ * Detach from a hash table.  This frees backend-local resources associated
+ * with the hash table, but the hash table will continue to exist until it is
+ * either explicitly destroyed (by a backend that is still attached to it), or
+ * the area that backs it is returned to the operating system.
+ */
+void
+dshash_detach(dshash_table *hash_table)
+{
+	Assert(!hash_table->find_locked);
+
+	/* The hash table may have been destroyed.  Just free local memory. */
+	pfree(hash_table);
+}
+
+/*
+ * Destroy a hash table, returning all memory to the area.  The caller must be
+ * certain that no other backend will attempt to access the hash table before
+ * calling this function.  Other backend must explicitly call dshash_detach to
+ * free up backend-local memory associated with the hash table.  The backend
+ * that calls dshash_destroy must not call dshash_detach.
+ */
+void
+dshash_destroy(dshash_table *hash_table)
+{
+	size_t		size;
+	size_t		i;
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	ensure_valid_bucket_pointers(hash_table);
+
+	/* Free all the entries. */
+	size = ((size_t) 1) << hash_table->size_log2;
+	for (i = 0; i < size; ++i)
+	{
+		dsa_pointer item_pointer = hash_table->buckets[i];
+
+		while (DsaPointerIsValid(item_pointer))
+		{
+			dshash_table_item *item;
+			dsa_pointer next_item_pointer;
+
+			item = dsa_get_address(hash_table->area, item_pointer);
+			next_item_pointer = item->next;
+			dsa_free(hash_table->area, item_pointer);
+			item_pointer = next_item_pointer;
+		}
+	}
+
+	/*
+	 * Vandalize the control block to help catch programming errors where
+	 * other backends access the memory formerly occupied by this hash table.
+	 */
+	hash_table->control->magic = 0;
+
+	/* Free the active table and control object. */
+	dsa_free(hash_table->area, hash_table->control->buckets);
+	dsa_free(hash_table->area, hash_table->control->handle);
+
+	pfree(hash_table);
+}
+
+/*
+ * Get a handle that can be used by other processes to attach to this hash
+ * table.
+ */
+dshash_table_handle
+dshash_get_hash_table_handle(dshash_table *hash_table)
+{
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+
+	return hash_table->control->handle;
+}
+
+/*
+ * Look up an entry, given a key.  Returns a pointer to an entry if one can be
+ * found with the given key.  Returns NULL if the key is not found.  If a
+ * non-NULL value is returned, the entry is locked and must be released by
+ * calling dshash_release_lock.  If an error is raised before
+ * dshash_release_lock is called, the lock will be released automatically, but
+ * the caller must take care to ensure that the entry is not left corrupted.
+ * The lock mode is either shared or exclusive depending on 'exclusive'.
+ *
+ * The caller must not lock a lock already.
+ *
+ * Note that the lock held is in fact an LWLock, so interrupts will be held on
+ * return from this function, and not resumed until dshash_release_lock is
+ * called.  It is a very good idea for the caller to release the lock quickly.
+ */
+void *
+dshash_find(dshash_table *hash_table, const void *key, bool exclusive)
+{
+	dshash_hash hash;
+	size_t		partition;
+	dshash_table_item *item;
+
+	hash = hash_key(hash_table, key);
+	partition = PARTITION_FOR_HASH(hash);
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(!hash_table->find_locked);
+
+	LWLockAcquire(PARTITION_LOCK(hash_table, partition),
+				  exclusive ? LW_EXCLUSIVE : LW_SHARED);
+	ensure_valid_bucket_pointers(hash_table);
+
+	/* Search the active bucket. */
+	item = find_in_bucket(hash_table, key, BUCKET_FOR_HASH(hash_table, hash));
+
+	if (!item)
+	{
+		/* Not found. */
+		LWLockRelease(PARTITION_LOCK(hash_table, partition));
+		return NULL;
+	}
+	else
+	{
+		/* The caller will free the lock by calling dshash_release. */
+		hash_table->find_locked = true;
+		hash_table->find_exclusively_locked = exclusive;
+		return ENTRY_FROM_ITEM(item);
+	}
+}
+
+/*
+ * Returns a pointer to an exclusively locked item which must be released with
+ * dshash_release_lock.  If the key is found in the hash table, 'found' is set
+ * to true and a pointer to the existing entry is returned.  If the key is not
+ * found, 'found' is set to false, and a pointer to a newly created entry is
+ * returned.
+ *
+ * Notes above dshash_find() regarding locking and error handling equally
+ * apply here.
+ */
+void *
+dshash_find_or_insert(dshash_table *hash_table,
+					  const void *key,
+					  bool *found)
+{
+	dshash_hash hash;
+	size_t		partition_index;
+	dshash_partition *partition;
+	dshash_table_item *item;
+
+	hash = hash_key(hash_table, key);
+	partition_index = PARTITION_FOR_HASH(hash);
+	partition = &hash_table->control->partitions[partition_index];
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(!hash_table->find_locked);
+
+restart:
+	LWLockAcquire(PARTITION_LOCK(hash_table, partition_index),
+				  LW_EXCLUSIVE);
+	ensure_valid_bucket_pointers(hash_table);
+
+	/* Search the active bucket. */
+	item = find_in_bucket(hash_table, key, BUCKET_FOR_HASH(hash_table, hash));
+
+	if (item)
+		*found = true;
+	else
+	{
+		*found = false;
+
+		/* Check if we are getting too full. */
+		if (partition->count > MAX_COUNT_PER_PARTITION(hash_table))
+		{
+			/*
+			 * The load factor (= keys / buckets) for all buckets protected by
+			 * this partition is > 0.75.  Presumably the same applies
+			 * generally across the whole hash table (though we don't attempt
+			 * to track that directly to avoid contention on some kind of
+			 * central counter; we just assume that this partition is
+			 * representative).  This is a good time to resize.
+			 *
+			 * Give up our existing lock first, because resizing needs to
+			 * reacquire all the locks in the right order to avoid deadlocks.
+			 */
+			LWLockRelease(PARTITION_LOCK(hash_table, partition_index));
+			resize(hash_table, hash_table->size_log2 + 1);
+
+			goto restart;
+		}
+
+		/* Finally we can try to insert the new item. */
+		item = insert_into_bucket(hash_table, key,
+								  &BUCKET_FOR_HASH(hash_table, hash));
+		item->hash = hash;
+		/* Adjust per-lock-partition counter for load factor knowledge. */
+		++partition->count;
+	}
+
+	/* The caller must release the lock with dshash_release_lock. */
+	hash_table->find_locked = true;
+	hash_table->find_exclusively_locked = true;
+	return ENTRY_FROM_ITEM(item);
+}
+
+/*
+ * Remove an entry by key.  Returns true if the key was found and the
+ * corresponding entry was removed.
+ *
+ * To delete an entry that you already have a pointer to, see
+ * dshash_delete_entry.
+ */
+bool
+dshash_delete_key(dshash_table *hash_table, const void *key)
+{
+	dshash_hash hash;
+	size_t		partition;
+	bool		found;
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(!hash_table->find_locked);
+
+	hash = hash_key(hash_table, key);
+	partition = PARTITION_FOR_HASH(hash);
+
+	LWLockAcquire(PARTITION_LOCK(hash_table, partition), LW_EXCLUSIVE);
+	ensure_valid_bucket_pointers(hash_table);
+
+	if (delete_key_from_bucket(hash_table, key,
+							   &BUCKET_FOR_HASH(hash_table, hash)))
+	{
+		Assert(hash_table->control->partitions[partition].count > 0);
+		found = true;
+		--hash_table->control->partitions[partition].count;
+	}
+	else
+		found = false;
+
+	LWLockRelease(PARTITION_LOCK(hash_table, partition));
+
+	return found;
+}
+
+/*
+ * Remove an entry.  The entry must already be exclusively locked, and must
+ * have been obtained by dshash_find or dshash_find_or_insert.  Note that this
+ * function releases the lock just like dshash_release_lock.
+ *
+ * To delete an entry by key, see dshash_delete_key.
+ */
+void
+dshash_delete_entry(dshash_table *hash_table, void *entry)
+{
+	dshash_table_item *item = ITEM_FROM_ENTRY(entry);
+	size_t		partition = PARTITION_FOR_HASH(item->hash);
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(hash_table->find_locked);
+	Assert(hash_table->find_exclusively_locked);
+	Assert(LWLockHeldByMeInMode(PARTITION_LOCK(hash_table, partition),
+								LW_EXCLUSIVE));
+
+	delete_item(hash_table, item);
+	hash_table->find_locked = false;
+	hash_table->find_exclusively_locked = false;
+	LWLockRelease(PARTITION_LOCK(hash_table, partition));
+}
+
+/*
+ * Unlock an entry which was locked by dshash_find or dshash_find_or_insert.
+ */
+void
+dshash_release_lock(dshash_table *hash_table, void *entry)
+{
+	dshash_table_item *item = ITEM_FROM_ENTRY(entry);
+	size_t		partition_index = PARTITION_FOR_HASH(item->hash);
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(hash_table->find_locked);
+	Assert(LWLockHeldByMeInMode(PARTITION_LOCK(hash_table, partition_index),
+								hash_table->find_exclusively_locked
+								? LW_EXCLUSIVE : LW_SHARED));
+
+	hash_table->find_locked = false;
+	hash_table->find_exclusively_locked = false;
+	LWLockRelease(PARTITION_LOCK(hash_table, partition_index));
+}
+
+/*
+ * A compare function that forwards to memcmp.
+ */
+int
+dshash_memcmp(const void *a, const void *b, size_t size, void *arg)
+{
+	return memcmp(a, b, size);
+}
+
+/*
+ * A hash function that forwards to tag_hash.
+ */
+dshash_hash
+dshash_memhash(const void *v, size_t size, void *arg)
+{
+	return tag_hash(v, size);
+}
+
+/*
+ * Print debugging information about the internal state of the hash table to
+ * stderr.  The caller must hold no partition locks.
+ */
+void
+dshash_dump(dshash_table *hash_table)
+{
+	size_t		i;
+	size_t		j;
+
+	Assert(hash_table->control->magic == DSHASH_MAGIC);
+	Assert(!hash_table->find_locked);
+
+	for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+	{
+		Assert(!LWLockHeldByMe(PARTITION_LOCK(hash_table, i)));
+		LWLockAcquire(PARTITION_LOCK(hash_table, i), LW_SHARED);
+	}
+
+	ensure_valid_bucket_pointers(hash_table);
+
+	fprintf(stderr,
+			"hash table size = %zu\n", (size_t) 1 << hash_table->size_log2);
+	for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+	{
+		dshash_partition *partition = &hash_table->control->partitions[i];
+		size_t		begin = BUCKET_INDEX_FOR_PARTITION(i, hash_table->size_log2);
+		size_t		end = BUCKET_INDEX_FOR_PARTITION(i + 1, hash_table->size_log2);
+
+		fprintf(stderr, "  partition %zu\n", i);
+		fprintf(stderr,
+				"    active buckets (key count = %zu)\n", partition->count);
+
+		for (j = begin; j < end; ++j)
+		{
+			size_t		count = 0;
+			dsa_pointer bucket = hash_table->buckets[j];
+
+			while (DsaPointerIsValid(bucket))
+			{
+				dshash_table_item *item;
+
+				item = dsa_get_address(hash_table->area, bucket);
+
+				bucket = item->next;
+				++count;
+			}
+			fprintf(stderr, "      bucket %zu (key count = %zu)\n", j, count);
+		}
+	}
+
+	for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+		LWLockRelease(PARTITION_LOCK(hash_table, i));
+}
+
+/*
+ * Delete a locked item to which we have a pointer.
+ */
+static void
+delete_item(dshash_table *hash_table, dshash_table_item *item)
+{
+	size_t		hash = item->hash;
+	size_t		partition = PARTITION_FOR_HASH(hash);
+
+	Assert(LWLockHeldByMe(PARTITION_LOCK(hash_table, partition)));
+
+	if (delete_item_from_bucket(hash_table, item,
+								&BUCKET_FOR_HASH(hash_table, hash)))
+	{
+		Assert(hash_table->control->partitions[partition].count > 0);
+		--hash_table->control->partitions[partition].count;
+	}
+	else
+	{
+		Assert(false);
+	}
+}
+
+/*
+ * Grow the hash table if necessary to the requested number of buckets.  The
+ * requested size must be double some previously observed size.  Returns true
+ * if the table was successfully expanded or found to be big enough already
+ * (because another backend expanded it).
+ *
+ * Must be called without any partition lock held.
+ */
+static void
+resize(dshash_table *hash_table, size_t new_size_log2)
+{
+	dsa_pointer old_buckets;
+	dsa_pointer new_buckets_shared;
+	dsa_pointer *new_buckets;
+	size_t		size;
+	size_t		new_size = ((size_t) 1) << new_size_log2;
+	size_t		i;
+
+	/*
+	 * Acquire the locks for all lock partitions.  This is expensive, but we
+	 * shouldn't have to do it many times.
+	 */
+	for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+	{
+		Assert(!LWLockHeldByMe(PARTITION_LOCK(hash_table, i)));
+
+		LWLockAcquire(PARTITION_LOCK(hash_table, i), LW_EXCLUSIVE);
+		if (i == 0 && hash_table->control->size_log2 >= new_size_log2)
+		{
+			/*
+			 * Another backend has already increased the size; we can avoid
+			 * obtaining all the locks and return early.
+			 */
+			LWLockRelease(PARTITION_LOCK(hash_table, 0));
+			return;
+		}
+	}
+
+	Assert(new_size_log2 == hash_table->control->size_log2 + 1);
+
+	/* Allocate the space for the new table. */
+	new_buckets_shared = dsa_allocate0(hash_table->area,
+									   sizeof(dsa_pointer) * new_size);
+	new_buckets = dsa_get_address(hash_table->area, new_buckets_shared);
+
+	/*
+	 * We've allocated the new bucket array; all that remains to do now is to
+	 * reinsert all items, which amounts to adjusting all the pointers.
+	 */
+	size = ((size_t) 1) << hash_table->control->size_log2;
+	for (i = 0; i < size; ++i)
+	{
+		dsa_pointer item_pointer = hash_table->buckets[i];
+
+		while (DsaPointerIsValid(item_pointer))
+		{
+			dshash_table_item *item;
+			dsa_pointer next_item_pointer;
+
+			item = dsa_get_address(hash_table->area, item_pointer);
+			next_item_pointer = item->next;
+			insert_item_into_bucket(hash_table, item_pointer, item,
+									&new_buckets[BUCKET_INDEX_FOR_HASH_AND_SIZE(item->hash,
+																				new_size_log2)]);
+			item_pointer = next_item_pointer;
+		}
+	}
+
+	/* Swap the hash table into place and free the old one. */
+	old_buckets = hash_table->control->buckets;
+	hash_table->control->buckets = new_buckets_shared;
+	hash_table->control->size_log2 = new_size_log2;
+	hash_table->buckets = new_buckets;
+	dsa_free(hash_table->area, old_buckets);
+
+	/* Release all the locks. */
+	for (i = 0; i < DSHASH_NUM_PARTITIONS; ++i)
+		LWLockRelease(PARTITION_LOCK(hash_table, i));
+}
+
+/*
+ * Make sure that our backend-local bucket pointers are up to date.  The
+ * caller must have locked one lock partition, which prevents resize() from
+ * running concurrently.
+ */
+static inline void
+ensure_valid_bucket_pointers(dshash_table *hash_table)
+{
+	if (hash_table->size_log2 != hash_table->control->size_log2)
+	{
+		hash_table->buckets = dsa_get_address(hash_table->area,
+											  hash_table->control->buckets);
+		hash_table->size_log2 = hash_table->control->size_log2;
+	}
+}
+
+/*
+ * Scan a locked bucket for a match, using the provided compare function.
+ */
+static inline dshash_table_item *
+find_in_bucket(dshash_table *hash_table, const void *key,
+			   dsa_pointer item_pointer)
+{
+	while (DsaPointerIsValid(item_pointer))
+	{
+		dshash_table_item *item;
+
+		item = dsa_get_address(hash_table->area, item_pointer);
+		if (equal_keys(hash_table, key, ENTRY_FROM_ITEM(item)))
+			return item;
+		item_pointer = item->next;
+	}
+	return NULL;
+}
+
+/*
+ * Insert an already-allocated item into a bucket.
+ */
+static void
+insert_item_into_bucket(dshash_table *hash_table,
+						dsa_pointer item_pointer,
+						dshash_table_item *item,
+						dsa_pointer *bucket)
+{
+	Assert(item == dsa_get_address(hash_table->area, item_pointer));
+
+	item->next = *bucket;
+	*bucket = item_pointer;
+}
+
+/*
+ * Allocate space for an entry with the given key and insert it into the
+ * provided bucket.
+ */
+static dshash_table_item *
+insert_into_bucket(dshash_table *hash_table,
+				   const void *key,
+				   dsa_pointer *bucket)
+{
+	dsa_pointer item_pointer;
+	dshash_table_item *item;
+
+	item_pointer = dsa_allocate(hash_table->area,
+								hash_table->params.entry_size +
+								MAXALIGN(sizeof(dshash_table_item)));
+	item = dsa_get_address(hash_table->area, item_pointer);
+	memcpy(ENTRY_FROM_ITEM(item), key, hash_table->params.key_size);
+	insert_item_into_bucket(hash_table, item_pointer, item, bucket);
+	return item;
+}
+
+/*
+ * Search a bucket for a matching key and delete it.
+ */
+static bool
+delete_key_from_bucket(dshash_table *hash_table,
+					   const void *key,
+					   dsa_pointer *bucket_head)
+{
+	while (DsaPointerIsValid(*bucket_head))
+	{
+		dshash_table_item *item;
+
+		item = dsa_get_address(hash_table->area, *bucket_head);
+
+		if (equal_keys(hash_table, key, ENTRY_FROM_ITEM(item)))
+		{
+			dsa_pointer next;
+
+			next = item->next;
+			dsa_free(hash_table->area, *bucket_head);
+			*bucket_head = next;
+
+			return true;
+		}
+		bucket_head = &item->next;
+	}
+	return false;
+}
+
+/*
+ * Delete the specified item from the bucket.
+ */
+static bool
+delete_item_from_bucket(dshash_table *hash_table,
+						dshash_table_item *item,
+						dsa_pointer *bucket_head)
+{
+	while (DsaPointerIsValid(*bucket_head))
+	{
+		dshash_table_item *bucket_item;
+
+		bucket_item = dsa_get_address(hash_table->area, *bucket_head);
+
+		if (bucket_item == item)
+		{
+			dsa_pointer next;
+
+			next = item->next;
+			dsa_free(hash_table->area, *bucket_head);
+			*bucket_head = next;
+			return true;
+		}
+		bucket_head = &bucket_item->next;
+	}
+	return false;
+}
+
+/*
+ * Compute the hash value for a key.
+ */
+static inline dshash_hash
+hash_key(dshash_table *hash_table, const void *key)
+{
+	return hash_table->params.hash_function(key,
+											hash_table->params.key_size,
+											hash_table->arg);
+}
+
+/*
+ * Check whether two keys compare equal.
+ */
+static inline bool
+equal_keys(dshash_table *hash_table, const void *a, const void *b)
+{
+	return hash_table->params.compare_function(a, b,
+											   hash_table->params.key_size,
+											   hash_table->arg) == 0;
+}
diff --git a/src/backend/lib/hyperloglog.c b/src/backend/lib/hyperloglog.c
index df7a67e7dc..3c50375a92 100644
--- a/src/backend/lib/hyperloglog.c
+++ b/src/backend/lib/hyperloglog.c
@@ -3,7 +3,7 @@
  * hyperloglog.c
  *	  HyperLogLog cardinality estimator
  *
- * Portions Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * Based on Hideaki Ohno's C++ implementation.  This is probably not ideally
  * suited to estimating the cardinality of very large sets;  in particular, we
diff --git a/src/backend/lib/ilist.c b/src/backend/lib/ilist.c
index af8d656d3e..58bee57c76 100644
--- a/src/backend/lib/ilist.c
+++ b/src/backend/lib/ilist.c
@@ -3,7 +3,7 @@
  * ilist.c
  *	  support for integrated/inline doubly- and singly- linked lists
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/lib/knapsack.c b/src/backend/lib/knapsack.c
index ddf2b9afa3..c7d9c4d8d2 100644
--- a/src/backend/lib/knapsack.c
+++ b/src/backend/lib/knapsack.c
@@ -15,7 +15,7 @@
  * allows approximate solutions in polynomial time (the general case of the
  * exact problem is NP-hard).
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/lib/knapsack.c
@@ -32,7 +32,6 @@
 #include "nodes/bitmapset.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 
 /*
  * DiscreteKnapsack
@@ -57,9 +56,7 @@ DiscreteKnapsack(int max_weight, int num_items,
 {
 	MemoryContext local_ctx = AllocSetContextCreate(CurrentMemoryContext,
 													"Knapsack",
-													ALLOCSET_SMALL_MINSIZE,
-													ALLOCSET_SMALL_INITSIZE,
-													ALLOCSET_SMALL_MAXSIZE);
+													ALLOCSET_SMALL_SIZES);
 	MemoryContext oldctx = MemoryContextSwitchTo(local_ctx);
 	double	   *values;
 	Bitmapset **sets;
diff --git a/src/backend/lib/pairingheap.c b/src/backend/lib/pairingheap.c
index fd871408f3..89d0f62f8f 100644
--- a/src/backend/lib/pairingheap.c
+++ b/src/backend/lib/pairingheap.c
@@ -14,7 +14,7 @@
  *	The pairing heap: a new form of self-adjusting heap.
  *	Algorithmica 1, 1 (January 1986), pages 111-129. DOI: 10.1007/BF01840439
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/lib/pairingheap.c
diff --git a/src/backend/lib/rbtree.c b/src/backend/lib/rbtree.c
index 3d80090a8c..a43d5938d5 100644
--- a/src/backend/lib/rbtree.c
+++ b/src/backend/lib/rbtree.c
@@ -17,7 +17,7 @@
  * longest path from root to leaf is only about twice as long as the shortest,
  * so lookups are guaranteed to run in O(lg n) time.
  *
- * Copyright (c) 2009-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2009-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/lib/rbtree.c
@@ -62,17 +62,6 @@ struct RBTree
 
 static RBNode sentinel = {RBBLACK, RBNIL, RBNIL, NULL};
 
-/*
- * Values used in the RBTreeIterator.next_state field, with an
- * InvertedWalk iterator.
- */
-typedef enum InvertedWalkNextStep
-{
-	NextStepBegin,
-	NextStepUp,
-	NextStepLeft,
-	NextStepRight
-} InvertedWalkNextStep;
 
 /*
  * rb_create: create an empty RBTree
@@ -567,6 +556,7 @@ rb_delete_node(RBTree *rb, RBNode *z)
 	RBNode	   *x,
 			   *y;
 
+	/* This is just paranoia: we should only get called on a valid node */
 	if (!z || z == RBNIL)
 		return;
 
@@ -730,114 +720,6 @@ rb_right_left_iterator(RBTreeIterator *iter)
 	return iter->last_visited;
 }
 
-static RBNode *
-rb_direct_iterator(RBTreeIterator *iter)
-{
-	if (iter->last_visited == NULL)
-	{
-		iter->last_visited = iter->rb->root;
-		return iter->last_visited;
-	}
-
-	if (iter->last_visited->left != RBNIL)
-	{
-		iter->last_visited = iter->last_visited->left;
-		return iter->last_visited;
-	}
-
-	do
-	{
-		if (iter->last_visited->right != RBNIL)
-		{
-			iter->last_visited = iter->last_visited->right;
-			break;
-		}
-
-		/* go up and one step right */
-		for (;;)
-		{
-			RBNode	   *came_from = iter->last_visited;
-
-			iter->last_visited = iter->last_visited->parent;
-			if (iter->last_visited == NULL)
-			{
-				iter->is_over = true;
-				break;
-			}
-
-			if ((iter->last_visited->right != came_from) && (iter->last_visited->right != RBNIL))
-			{
-				iter->last_visited = iter->last_visited->right;
-				return iter->last_visited;
-			}
-		}
-	}
-	while (iter->last_visited != NULL);
-
-	return iter->last_visited;
-}
-
-static RBNode *
-rb_inverted_iterator(RBTreeIterator *iter)
-{
-	RBNode	   *came_from;
-	RBNode	   *current;
-
-	current = iter->last_visited;
-
-loop:
-	switch ((InvertedWalkNextStep) iter->next_step)
-	{
-			/* First call, begin from root */
-		case NextStepBegin:
-			current = iter->rb->root;
-			iter->next_step = NextStepLeft;
-			goto loop;
-
-		case NextStepLeft:
-			while (current->left != RBNIL)
-				current = current->left;
-
-			iter->next_step = NextStepRight;
-			goto loop;
-
-		case NextStepRight:
-			if (current->right != RBNIL)
-			{
-				current = current->right;
-				iter->next_step = NextStepLeft;
-				goto loop;
-			}
-			else				/* not moved - return current, then go up */
-				iter->next_step = NextStepUp;
-			break;
-
-		case NextStepUp:
-			came_from = current;
-			current = current->parent;
-			if (current == NULL)
-			{
-				iter->is_over = true;
-				break;			/* end of iteration */
-			}
-			else if (came_from == current->right)
-			{
-				/* return current, then continue to go up */
-				break;
-			}
-			else
-			{
-				/* otherwise we came from the left */
-				Assert(came_from == current->left);
-				iter->next_step = NextStepRight;
-				goto loop;
-			}
-	}
-
-	iter->last_visited = current;
-	return current;
-}
-
 /*
  * rb_begin_iterate: prepare to traverse the tree in any of several orders
  *
@@ -849,7 +731,7 @@ rb_inverted_iterator(RBTreeIterator *iter)
  * tree are allowed.
  *
  * The iterator state is stored in the 'iter' struct.  The caller should
- * treat it as opaque struct.
+ * treat it as an opaque struct.
  */
 void
 rb_begin_iterate(RBTree *rb, RBOrderControl ctrl, RBTreeIterator *iter)
@@ -867,13 +749,6 @@ rb_begin_iterate(RBTree *rb, RBOrderControl ctrl, RBTreeIterator *iter)
 		case RightLeftWalk:		/* visit right, then self, then left */
 			iter->iterate = rb_right_left_iterator;
 			break;
-		case DirectWalk:		/* visit self, then left, then right */
-			iter->iterate = rb_direct_iterator;
-			break;
-		case InvertedWalk:		/* visit left, then right, then self */
-			iter->iterate = rb_inverted_iterator;
-			iter->next_step = NextStepBegin;
-			break;
 		default:
 			elog(ERROR, "unrecognized rbtree iteration order: %d", ctrl);
 	}
diff --git a/src/backend/lib/stringinfo.c b/src/backend/lib/stringinfo.c
index fd15567144..798a823ac9 100644
--- a/src/backend/lib/stringinfo.c
+++ b/src/backend/lib/stringinfo.c
@@ -6,7 +6,7 @@
  * It can be used to buffer either ordinary C strings (null-terminated text)
  * or arbitrary binary data.  All storage is allocated with palloc().
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	  src/backend/lib/stringinfo.c
@@ -202,7 +202,7 @@ appendStringInfoSpaces(StringInfo str, int count)
  * appendBinaryStringInfo
  *
  * Append arbitrary binary data to a StringInfo, allocating more space
- * if necessary.
+ * if necessary. Ensures that a trailing null byte is present.
  */
 void
 appendBinaryStringInfo(StringInfo str, const char *data, int datalen)
@@ -224,6 +224,25 @@ appendBinaryStringInfo(StringInfo str, const char *data, int datalen)
 	str->data[str->len] = '\0';
 }
 
+/*
+ * appendBinaryStringInfoNT
+ *
+ * Append arbitrary binary data to a StringInfo, allocating more space
+ * if necessary. Does not ensure a trailing null-byte exists.
+ */
+void
+appendBinaryStringInfoNT(StringInfo str, const char *data, int datalen)
+{
+	Assert(str != NULL);
+
+	/* Make more room if needed */
+	enlargeStringInfo(str, datalen);
+
+	/* OK, append the data */
+	memcpy(str->data + str->len, data, datalen);
+	str->len += datalen;
+}
+
 /*
  * enlargeStringInfo
  *
diff --git a/src/backend/libpq/README.SSL b/src/backend/libpq/README.SSL
index 53dc9dd005..d84a434a6e 100644
--- a/src/backend/libpq/README.SSL
+++ b/src/backend/libpq/README.SSL
@@ -58,3 +58,25 @@ SSL
    Fail with unknown
 
 ---------------------------------------------------------------------------
+
+Ephemeral DH
+============
+
+Since the server static private key ($DataDir/server.key) will
+normally be stored unencrypted so that the database backend can
+restart automatically, it is important that we select an algorithm
+that continues to provide confidentiality even if the attacker has the
+server's private key.  Ephemeral DH (EDH) keys provide this and more
+(Perfect Forward Secrecy aka PFS).
+
+N.B., the static private key should still be protected to the largest
+extent possible, to minimize the risk of impersonations.
+
+Another benefit of EDH is that it allows the backend and clients to
+use DSA keys.  DSA keys can only provide digital signatures, not
+encryption, and are often acceptable in jurisdictions where RSA keys
+are unacceptable.
+
+The downside to EDH is that it makes it impossible to use ssldump(1)
+if there's a problem establishing an SSL session.  In this case you'll
+need to temporarily disable EDH (see initialize_dh()).
diff --git a/src/backend/libpq/auth-scram.c b/src/backend/libpq/auth-scram.c
index 0b69f106f1..48eb531d0f 100644
--- a/src/backend/libpq/auth-scram.c
+++ b/src/backend/libpq/auth-scram.c
@@ -17,8 +17,6 @@
  *	 by the SASLprep profile, we skip the SASLprep pre-processing and use
  *	 the raw bytes in calculating the hash.
  *
- * - Channel binding is not supported yet.
- *
  *
  * The password stored in pg_authid consists of the iteration count, salt,
  * StoredKey and ServerKey.
@@ -69,7 +67,7 @@
  * general, after logging in, but let's do what we can here.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/libpq/auth-scram.c
@@ -112,6 +110,10 @@ typedef struct
 
 	const char *username;		/* username from startup packet */
 
+	Port	   *port;
+	char		cbind_flag;
+	char	   *channel_binding_type;
+
 	int			iterations;
 	char	   *salt;			/* base64-encoded */
 	uint8		StoredKey[SCRAM_KEY_LEN];
@@ -168,14 +170,16 @@ static char *scram_mock_salt(const char *username);
  * it will fail, as if an incorrect password was given.
  */
 void *
-pg_be_scram_init(const char *username, const char *shadow_pass)
+pg_be_scram_init(Port *port,
+				 const char *shadow_pass)
 {
 	scram_state *state;
 	bool		got_verifier;
 
 	state = (scram_state *) palloc0(sizeof(scram_state));
+	state->port = port;
 	state->state = SCRAM_AUTH_INIT;
-	state->username = username;
+	state->channel_binding_type = NULL;
 
 	/*
 	 * Parse the stored password verifier.
@@ -197,7 +201,7 @@ pg_be_scram_init(const char *username, const char *shadow_pass)
 				 */
 				ereport(LOG,
 						(errmsg("invalid SCRAM verifier for user \"%s\"",
-								username)));
+								state->port->user_name)));
 				got_verifier = false;
 			}
 		}
@@ -208,7 +212,7 @@ pg_be_scram_init(const char *username, const char *shadow_pass)
 			 * authentication with an MD5 hash.)
 			 */
 			state->logdetail = psprintf(_("User \"%s\" does not have a valid SCRAM verifier."),
-										state->username);
+										state->port->user_name);
 			got_verifier = false;
 		}
 	}
@@ -230,8 +234,8 @@ pg_be_scram_init(const char *username, const char *shadow_pass)
 	 */
 	if (!got_verifier)
 	{
-		mock_scram_verifier(username, &state->iterations, &state->salt,
-							state->StoredKey, state->ServerKey);
+		mock_scram_verifier(state->port->user_name, &state->iterations,
+							&state->salt, state->StoredKey, state->ServerKey);
 		state->doomed = true;
 	}
 
@@ -573,7 +577,7 @@ mock_scram_verifier(const char *username, int *iterations, char **salt,
 }
 
 /*
- * Read the value in a given SASL exchange message for given attribute.
+ * Read the value in a given SCRAM exchange message for given attribute.
  */
 static char *
 read_attr_value(char **input, char attr)
@@ -585,7 +589,7 @@ read_attr_value(char **input, char attr)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("malformed SCRAM message"),
-				 errdetail("Expected attribute '%c' but found %s.",
+				 errdetail("Expected attribute \"%c\" but found \"%s\".",
 						   attr, sanitize_char(*begin))));
 	begin++;
 
@@ -593,7 +597,7 @@ read_attr_value(char **input, char attr)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("malformed SCRAM message"),
-				 errdetail("Expected character = for attribute %c.", attr)));
+				 errdetail("Expected character \"=\" for attribute \"%c\".", attr)));
 	begin++;
 
 	end = begin;
@@ -652,7 +656,7 @@ sanitize_char(char c)
 }
 
 /*
- * Read the next attribute and value in a SASL exchange message.
+ * Read the next attribute and value in a SCRAM exchange message.
  *
  * Returns NULL if there is attribute.
  */
@@ -674,7 +678,7 @@ read_any_attr(char **input, char *attr_p)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("malformed SCRAM message"),
-				 errdetail("Attribute expected, but found invalid character %s.",
+				 errdetail("Attribute expected, but found invalid character \"%s\".",
 						   sanitize_char(attr))));
 	if (attr_p)
 		*attr_p = attr;
@@ -684,7 +688,7 @@ read_any_attr(char **input, char *attr_p)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("malformed SCRAM message"),
-				 errdetail("Expected character = for attribute %c.", attr)));
+				 errdetail("Expected character \"=\" for attribute \"%c\".", attr)));
 	begin++;
 
 	end = begin;
@@ -703,7 +707,7 @@ read_any_attr(char **input, char *attr_p)
 }
 
 /*
- * Read and parse the first message from client in the context of a SASL
+ * Read and parse the first message from client in the context of a SCRAM
  * authentication exchange message.
  *
  * At this stage, any errors will be reported directly with ereport(ERROR).
@@ -773,45 +777,101 @@ read_client_first_message(scram_state *state, char *input)
 	 *------
 	 */
 
-	/* read gs2-cbind-flag */
+	/*
+	 * Read gs2-cbind-flag.  (For details see also RFC 5802 Section 6 "Channel
+	 * Binding".)
+	 */
+	state->cbind_flag = *input;
 	switch (*input)
 	{
 		case 'n':
-			/* Client does not support channel binding */
+
+			/*
+			 * The client does not support channel binding or has simply
+			 * decided to not use it.  In that case just let it go.
+			 */
+			input++;
+			if (*input != ',')
+				ereport(ERROR,
+						(errcode(ERRCODE_PROTOCOL_VIOLATION),
+						 errmsg("malformed SCRAM message"),
+						 errdetail("Comma expected, but found character \"%s\".",
+								   sanitize_char(*input))));
 			input++;
 			break;
 		case 'y':
-			/* Client supports channel binding, but we're not doing it today */
+
+			/*
+			 * The client supports channel binding and thinks that the server
+			 * does not.  In this case, the server must fail authentication if
+			 * it supports channel binding, which in this implementation is
+			 * the case if a connection is using SSL.
+			 */
+			if (state->port->ssl_in_use)
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+						 errmsg("SCRAM channel binding negotiation error"),
+						 errdetail("The client supports SCRAM channel binding but thinks the server does not.  "
+								   "However, this server does support channel binding.")));
+			input++;
+			if (*input != ',')
+				ereport(ERROR,
+						(errcode(ERRCODE_PROTOCOL_VIOLATION),
+						 errmsg("malformed SCRAM message"),
+						 errdetail("Comma expected, but found character \"%s\".",
+								   sanitize_char(*input))));
 			input++;
 			break;
 		case 'p':
 
 			/*
-			 * Client requires channel binding.  We don't support it.
-			 *
-			 * RFC 5802 specifies a particular error code,
-			 * e=server-does-support-channel-binding, for this.  But it can
-			 * only be sent in the server-final message, and we don't want to
-			 * go through the motions of the authentication, knowing it will
-			 * fail, just to send that error message.
+			 * The client requires channel binding.  Channel binding type
+			 * follows, e.g., "p=tls-unique".
 			 */
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("client requires SCRAM channel binding, but it is not supported")));
+			{
+				char	   *channel_binding_type;
+
+				if (!state->port->ssl_in_use)
+				{
+					/*
+					 * Without SSL, we don't support channel binding.
+					 *
+					 * RFC 5802 specifies a particular error code,
+					 * e=server-does-support-channel-binding, for this.  But
+					 * it can only be sent in the server-final message, and we
+					 * don't want to go through the motions of the
+					 * authentication, knowing it will fail, just to send that
+					 * error message.
+					 */
+					ereport(ERROR,
+							(errcode(ERRCODE_PROTOCOL_VIOLATION),
+							 errmsg("client requires SCRAM channel binding, but it is not supported")));
+				}
+
+				/*
+				 * Read value provided by client.  (It is not safe to print
+				 * the name of an unsupported binding type in the error
+				 * message.  Pranksters could print arbitrary strings into the
+				 * log that way.)
+				 */
+				channel_binding_type = read_attr_value(&input, 'p');
+				if (strcmp(channel_binding_type, SCRAM_CHANNEL_BINDING_TLS_UNIQUE) != 0 &&
+					strcmp(channel_binding_type, SCRAM_CHANNEL_BINDING_TLS_END_POINT) != 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_PROTOCOL_VIOLATION),
+							 (errmsg("unsupported SCRAM channel-binding type"))));
+
+				/* Save the name for handling of subsequent messages */
+				state->channel_binding_type = pstrdup(channel_binding_type);
+			}
+			break;
 		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
 					 errmsg("malformed SCRAM message"),
-					 errdetail("Unexpected channel-binding flag %s.",
+					 errdetail("Unexpected channel-binding flag \"%s\".",
 							   sanitize_char(*input))));
 	}
-	if (*input != ',')
-		ereport(ERROR,
-				(errcode(ERRCODE_PROTOCOL_VIOLATION),
-				 errmsg("malformed SCRAM message"),
-				 errdetail("Comma expected, but found character %s.",
-						   sanitize_char(*input))));
-	input++;
 
 	/*
 	 * Forbid optional authzid (authorization identity).  We don't support it.
@@ -824,7 +884,7 @@ read_client_first_message(scram_state *state, char *input)
 		ereport(ERROR,
 				(errcode(ERRCODE_PROTOCOL_VIOLATION),
 				 errmsg("malformed SCRAM message"),
-				 errdetail("Unexpected attribute %s in client-first-message.",
+				 errdetail("Unexpected attribute \"%s\" in client-first-message.",
 						   sanitize_char(*input))));
 	input++;
 
@@ -929,7 +989,7 @@ verify_client_proof(scram_state *state)
 }
 
 /*
- * Build the first server-side message sent to the client in a SASL
+ * Build the first server-side message sent to the client in a SCRAM
  * communication exchange.
  */
 static char *
@@ -1032,14 +1092,86 @@ read_client_final_message(scram_state *state, char *input)
 	 */
 
 	/*
-	 * Read channel-binding.  We don't support channel binding, so it's
-	 * expected to always be "biws", which is "n,,", base64-encoded.
+	 * Read channel binding.  This repeats the channel-binding flags and is
+	 * then followed by the actual binding data depending on the type.
 	 */
 	channel_binding = read_attr_value(&p, 'c');
-	if (strcmp(channel_binding, "biws") != 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_PROTOCOL_VIOLATION),
-				 (errmsg("unexpected SCRAM channel-binding attribute in client-final-message"))));
+	if (state->channel_binding_type)
+	{
+		const char *cbind_data = NULL;
+		size_t		cbind_data_len = 0;
+		size_t		cbind_header_len;
+		char	   *cbind_input;
+		size_t		cbind_input_len;
+		char	   *b64_message;
+		int			b64_message_len;
+
+		Assert(state->cbind_flag == 'p');
+
+		/*
+		 * Fetch data appropriate for channel binding type
+		 */
+		if (strcmp(state->channel_binding_type, SCRAM_CHANNEL_BINDING_TLS_UNIQUE) == 0)
+		{
+#ifdef USE_SSL
+			cbind_data = be_tls_get_peer_finished(state->port, &cbind_data_len);
+#endif
+		}
+		else if (strcmp(state->channel_binding_type,
+						SCRAM_CHANNEL_BINDING_TLS_END_POINT) == 0)
+		{
+			/* Fetch hash data of server's SSL certificate */
+#ifdef USE_SSL
+			cbind_data = be_tls_get_certificate_hash(state->port,
+													 &cbind_data_len);
+#endif
+		}
+		else
+		{
+			/* should not happen */
+			elog(ERROR, "invalid channel binding type");
+		}
+
+		/* should not happen */
+		if (cbind_data == NULL || cbind_data_len == 0)
+			elog(ERROR, "empty channel binding data for channel binding type \"%s\"",
+				 state->channel_binding_type);
+
+		cbind_header_len = 4 + strlen(state->channel_binding_type); /* p=type,, */
+		cbind_input_len = cbind_header_len + cbind_data_len;
+		cbind_input = palloc(cbind_input_len);
+		snprintf(cbind_input, cbind_input_len, "p=%s,,", state->channel_binding_type);
+		memcpy(cbind_input + cbind_header_len, cbind_data, cbind_data_len);
+
+		b64_message = palloc(pg_b64_enc_len(cbind_input_len) + 1);
+		b64_message_len = pg_b64_encode(cbind_input, cbind_input_len,
+										b64_message);
+		b64_message[b64_message_len] = '\0';
+
+		/*
+		 * Compare the value sent by the client with the value expected by the
+		 * server.
+		 */
+		if (strcmp(channel_binding, b64_message) != 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_AUTHORIZATION_SPECIFICATION),
+					 (errmsg("SCRAM channel binding check failed"))));
+	}
+	else
+	{
+		/*
+		 * If we are not using channel binding, the binding data is expected
+		 * to always be "biws", which is "n,," base64-encoded, or "eSws",
+		 * which is "y,,".  We also have to check whether the flag is the same
+		 * one that the client originally sent.
+		 */
+		if (!(strcmp(channel_binding, "biws") == 0 && state->cbind_flag == 'n') &&
+			!(strcmp(channel_binding, "eSws") == 0 && state->cbind_flag == 'y'))
+			ereport(ERROR,
+					(errcode(ERRCODE_PROTOCOL_VIOLATION),
+					 (errmsg("unexpected SCRAM channel-binding attribute in client-final-message"))));
+	}
+
 	state->client_final_nonce = read_attr_value(&p, 'r');
 
 	/* ignore optional extensions */
@@ -1116,7 +1248,7 @@ build_server_final_message(scram_state *state)
 
 
 /*
- * Determinisitcally generate salt for mock authentication, using a SHA256
+ * Deterministically generate salt for mock authentication, using a SHA256
  * hash based on the username and a cluster-level secret key.  Returns a
  * pointer to a static buffer of size SCRAM_DEFAULT_SALT_LEN.
  */
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index cb30fc7b71..3014b17a7c 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -3,7 +3,7 @@
  * auth.c
  *	  Routines to handle network authentication
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -18,7 +18,6 @@
 #include <sys/param.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
-#include <arpa/inet.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_SELECT_H
 #include <sys/select.h>
@@ -27,12 +26,14 @@
 #include "commands/user.h"
 #include "common/ip.h"
 #include "common/md5.h"
+#include "common/scram-common.h"
 #include "libpq/auth.h"
 #include "libpq/crypt.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "libpq/scram.h"
 #include "miscadmin.h"
+#include "port/pg_bswap.h"
 #include "replication/walsender.h"
 #include "storage/ipc.h"
 #include "utils/backend_random.h"
@@ -43,7 +44,7 @@
  * Global authentication functions
  *----------------------------------------------------------------
  */
-static void sendAuthRequest(Port *port, AuthRequest areq, char *extradata,
+static void sendAuthRequest(Port *port, AuthRequest areq, const char *extradata,
 				int extralen);
 static void auth_failed(Port *port, int status, char *logdetail);
 static char *recv_password_packet(Port *port);
@@ -91,7 +92,7 @@ static int	auth_peer(hbaPort *port);
 
 #define PGSQL_PAM_SERVICE "postgresql"	/* Service name passed to PAM */
 
-static int	CheckPAMAuth(Port *port, char *user, char *password);
+static int	CheckPAMAuth(Port *port, const char *user, const char *password);
 static int pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
 					 struct pam_response **resp, void *appdata_ptr);
 
@@ -100,7 +101,8 @@ static struct pam_conv pam_passw_conv = {
 	NULL
 };
 
-static char *pam_passwd = NULL; /* Workaround for Solaris 2.6 brokenness */
+static const char *pam_passwd = NULL;	/* Workaround for Solaris 2.6
+										 * brokenness */
 static Port *pam_port_cludge;	/* Workaround for passing "Port *port" into
 								 * pam_passwd_conv_proc */
 #endif							/* USE_PAM */
@@ -141,6 +143,12 @@ ULONG		(*__ldap_start_tls_sA) (
 #endif
 
 static int	CheckLDAPAuth(Port *port);
+
+/* LDAP_OPT_DIAGNOSTIC_MESSAGE is the newer spelling */
+#ifndef LDAP_OPT_DIAGNOSTIC_MESSAGE
+#define LDAP_OPT_DIAGNOSTIC_MESSAGE LDAP_OPT_ERROR_STRING
+#endif
+
 #endif							/* USE_LDAP */
 
 /*----------------------------------------------------------------
@@ -196,7 +204,7 @@ static int pg_SSPI_make_upn(char *accountname,
  *----------------------------------------------------------------
  */
 static int	CheckRADIUSAuth(Port *port);
-static int	PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identifier, char *user_name, char *passwd);
+static int	PerformRadiusTransaction(const char *server, const char *secret, const char *portstr, const char *identifier, const char *user_name, const char *passwd);
 
 
 /*
@@ -606,14 +614,14 @@ ClientAuthentication(Port *port)
  * Send an authentication request packet to the frontend.
  */
 static void
-sendAuthRequest(Port *port, AuthRequest areq, char *extradata, int extralen)
+sendAuthRequest(Port *port, AuthRequest areq, const char *extradata, int extralen)
 {
 	StringInfoData buf;
 
 	CHECK_FOR_INTERRUPTS();
 
 	pq_beginmessage(&buf, 'R');
-	pq_sendint(&buf, (int32) areq, sizeof(int32));
+	pq_sendint32(&buf, (int32) areq);
 	if (extralen > 0)
 		pq_sendbytes(&buf, extradata, extralen);
 
@@ -854,6 +862,8 @@ CheckMD5Auth(Port *port, char *shadow_pass, char **logdetail)
 static int
 CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
 {
+	char	   *sasl_mechs;
+	char	   *p;
 	int			mtype;
 	StringInfoData buf;
 	void	   *scram_opaq;
@@ -879,12 +889,29 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
 
 	/*
 	 * Send the SASL authentication request to user.  It includes the list of
-	 * authentication mechanisms (which is trivial, because we only support
-	 * SCRAM-SHA-256 at the moment).  The extra "\0" is for an empty string to
-	 * terminate the list.
+	 * authentication mechanisms that are supported.  The order of mechanisms
+	 * is advertised in decreasing order of importance.  So the
+	 * channel-binding variants go first, if they are supported.  Channel
+	 * binding is only supported in SSL builds.
 	 */
-	sendAuthRequest(port, AUTH_REQ_SASL, SCRAM_SHA256_NAME "\0",
-					strlen(SCRAM_SHA256_NAME) + 2);
+	sasl_mechs = palloc(strlen(SCRAM_SHA_256_PLUS_NAME) +
+						strlen(SCRAM_SHA_256_NAME) + 3);
+	p = sasl_mechs;
+
+	if (port->ssl_in_use)
+	{
+		strcpy(p, SCRAM_SHA_256_PLUS_NAME);
+		p += strlen(SCRAM_SHA_256_PLUS_NAME) + 1;
+	}
+
+	strcpy(p, SCRAM_SHA_256_NAME);
+	p += strlen(SCRAM_SHA_256_NAME) + 1;
+
+	/* Put another '\0' to mark that list is finished. */
+	p[0] = '\0';
+
+	sendAuthRequest(port, AUTH_REQ_SASL, sasl_mechs, p - sasl_mechs + 1);
+	pfree(sasl_mechs);
 
 	/*
 	 * Initialize the status tracker for message exchanges.
@@ -897,7 +924,7 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
 	 * This is because we don't want to reveal to an attacker what usernames
 	 * are valid, nor which users have a valid password.
 	 */
-	scram_opaq = pg_be_scram_init(port->user_name, shadow_pass);
+	scram_opaq = pg_be_scram_init(port, shadow_pass);
 
 	/*
 	 * Loop through SASL message exchange.  This exchange can consist of
@@ -945,12 +972,9 @@ CheckSCRAMAuth(Port *port, char *shadow_pass, char **logdetail)
 		{
 			const char *selected_mech;
 
-			/*
-			 * We only support SCRAM-SHA-256 at the moment, so anything else
-			 * is an error.
-			 */
 			selected_mech = pq_getmsgrawstring(&buf);
-			if (strcmp(selected_mech, SCRAM_SHA256_NAME) != 0)
+			if (strcmp(selected_mech, SCRAM_SHA_256_NAME) != 0 &&
+				strcmp(selected_mech, SCRAM_SHA_256_PLUS_NAME) != 0)
 			{
 				ereport(ERROR,
 						(errcode(ERRCODE_PROTOCOL_VIOLATION),
@@ -1034,7 +1058,7 @@ static GSS_DLLIMP gss_OID GSS_C_NT_USER_NAME = &GSS_C_NT_USER_NAME_desc;
 
 
 static void
-pg_GSS_error(int severity, char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
+pg_GSS_error(int severity, const char *errmsg, OM_uint32 maj_stat, OM_uint32 min_stat)
 {
 	gss_buffer_desc gmsg;
 	OM_uint32	lmin_s,
@@ -2045,7 +2069,7 @@ static int
 pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
 					 struct pam_response **resp, void *appdata_ptr)
 {
-	char	   *passwd;
+	const char *passwd;
 	struct pam_response *reply;
 	int			i;
 
@@ -2143,7 +2167,7 @@ pam_passwd_conv_proc(int num_msg, const struct pam_message **msg,
  * Check authentication against PAM.
  */
 static int
-CheckPAMAuth(Port *port, char *user, char *password)
+CheckPAMAuth(Port *port, const char *user, const char *password)
 {
 	int			retval;
 	pam_handle_t *pamh = NULL;
@@ -2305,6 +2329,8 @@ CheckBSDAuth(Port *port, char *user)
  */
 #ifdef USE_LDAP
 
+static int	errdetail_for_ldap(LDAP *ldap);
+
 /*
  * Initialize a connection to the LDAP server, including setting up
  * TLS if requested.
@@ -2312,28 +2338,70 @@ CheckBSDAuth(Port *port, char *user)
 static int
 InitializeLDAPConnection(Port *port, LDAP **ldap)
 {
+	const char *scheme;
 	int			ldapversion = LDAP_VERSION3;
 	int			r;
 
-	*ldap = ldap_init(port->hba->ldapserver, port->hba->ldapport);
+	scheme = port->hba->ldapscheme;
+	if (scheme == NULL)
+		scheme = "ldap";
+#ifdef WIN32
+	if (strcmp(scheme, "ldaps") == 0)
+		*ldap = ldap_sslinit(port->hba->ldapserver, port->hba->ldapport, 1);
+	else
+		*ldap = ldap_init(port->hba->ldapserver, port->hba->ldapport);
 	if (!*ldap)
 	{
-#ifndef WIN32
-		ereport(LOG,
-				(errmsg("could not initialize LDAP: %m")));
-#else
 		ereport(LOG,
 				(errmsg("could not initialize LDAP: error code %d",
 						(int) LdapGetLastError())));
-#endif
+
 		return STATUS_ERROR;
 	}
+#else
+#ifdef HAVE_LDAP_INITIALIZE
+	{
+		char	   *uri;
+
+		uri = psprintf("%s://%s:%d", scheme, port->hba->ldapserver,
+					   port->hba->ldapport);
+		r = ldap_initialize(ldap, uri);
+		pfree(uri);
+		if (r != LDAP_SUCCESS)
+		{
+			ereport(LOG,
+					(errmsg("could not initialize LDAP: %s",
+							ldap_err2string(r))));
+
+			return STATUS_ERROR;
+		}
+	}
+#else
+	if (strcmp(scheme, "ldaps") == 0)
+	{
+		ereport(LOG,
+				(errmsg("ldaps not supported with this LDAP library")));
+
+		return STATUS_ERROR;
+	}
+	*ldap = ldap_init(port->hba->ldapserver, port->hba->ldapport);
+	if (!*ldap)
+	{
+		ereport(LOG,
+				(errmsg("could not initialize LDAP: %m")));
+
+		return STATUS_ERROR;
+	}
+#endif
+#endif
 
 	if ((r = ldap_set_option(*ldap, LDAP_OPT_PROTOCOL_VERSION, &ldapversion)) != LDAP_SUCCESS)
 	{
-		ldap_unbind(*ldap);
 		ereport(LOG,
-				(errmsg("could not set LDAP protocol version: %s", ldap_err2string(r))));
+				(errmsg("could not set LDAP protocol version: %s",
+						ldap_err2string(r)),
+				 errdetail_for_ldap(*ldap)));
+		ldap_unbind(*ldap);
 		return STATUS_ERROR;
 	}
 
@@ -2360,18 +2428,18 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
 				 * should never happen since we import other files from
 				 * wldap32, but check anyway
 				 */
-				ldap_unbind(*ldap);
 				ereport(LOG,
 						(errmsg("could not load wldap32.dll")));
+				ldap_unbind(*ldap);
 				return STATUS_ERROR;
 			}
 			_ldap_start_tls_sA = (__ldap_start_tls_sA) GetProcAddress(ldaphandle, "ldap_start_tls_sA");
 			if (_ldap_start_tls_sA == NULL)
 			{
-				ldap_unbind(*ldap);
 				ereport(LOG,
 						(errmsg("could not load function _ldap_start_tls_sA in wldap32.dll"),
 						 errdetail("LDAP over SSL is not supported on this platform.")));
+				ldap_unbind(*ldap);
 				return STATUS_ERROR;
 			}
 
@@ -2384,9 +2452,11 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
 		if ((r = _ldap_start_tls_sA(*ldap, NULL, NULL, NULL, NULL)) != LDAP_SUCCESS)
 #endif
 		{
-			ldap_unbind(*ldap);
 			ereport(LOG,
-					(errmsg("could not start LDAP TLS session: %s", ldap_err2string(r))));
+					(errmsg("could not start LDAP TLS session: %s",
+							ldap_err2string(r)),
+					 errdetail_for_ldap(*ldap)));
+			ldap_unbind(*ldap);
 			return STATUS_ERROR;
 		}
 	}
@@ -2394,6 +2464,44 @@ InitializeLDAPConnection(Port *port, LDAP **ldap)
 	return STATUS_OK;
 }
 
+/* Placeholders recognized by FormatSearchFilter.  For now just one. */
+#define LPH_USERNAME "$username"
+#define LPH_USERNAME_LEN (sizeof(LPH_USERNAME) - 1)
+
+/* Not all LDAP implementations define this. */
+#ifndef LDAP_NO_ATTRS
+#define LDAP_NO_ATTRS "1.1"
+#endif
+
+/* Not all LDAP implementations define this. */
+#ifndef LDAPS_PORT
+#define LDAPS_PORT 636
+#endif
+
+/*
+ * Return a newly allocated C string copied from "pattern" with all
+ * occurrences of the placeholder "$username" replaced with "user_name".
+ */
+static char *
+FormatSearchFilter(const char *pattern, const char *user_name)
+{
+	StringInfoData output;
+
+	initStringInfo(&output);
+	while (*pattern != '\0')
+	{
+		if (strncmp(pattern, LPH_USERNAME, LPH_USERNAME_LEN) == 0)
+		{
+			appendStringInfoString(&output, user_name);
+			pattern += LPH_USERNAME_LEN;
+		}
+		else
+			appendStringInfoChar(&output, *pattern++);
+	}
+
+	return output.data;
+}
+
 /*
  * Perform LDAP authentication
  */
@@ -2413,7 +2521,13 @@ CheckLDAPAuth(Port *port)
 	}
 
 	if (port->hba->ldapport == 0)
-		port->hba->ldapport = LDAP_PORT;
+	{
+		if (port->hba->ldapscheme != NULL &&
+			strcmp(port->hba->ldapscheme, "ldaps") == 0)
+			port->hba->ldapport = LDAPS_PORT;
+		else
+			port->hba->ldapport = LDAP_PORT;
+	}
 
 	sendAuthRequest(port, AUTH_REQ_PASSWORD, NULL, 0);
 
@@ -2437,7 +2551,7 @@ CheckLDAPAuth(Port *port)
 		char	   *filter;
 		LDAPMessage *search_message;
 		LDAPMessage *entry;
-		char	   *attributes[2];
+		char	   *attributes[] = {LDAP_NO_ATTRS, NULL};
 		char	   *dn;
 		char	   *c;
 		int			count;
@@ -2458,6 +2572,7 @@ CheckLDAPAuth(Port *port)
 			{
 				ereport(LOG,
 						(errmsg("invalid character in user name for LDAP authentication")));
+				ldap_unbind(ldap);
 				pfree(passwd);
 				return STATUS_ERROR;
 			}
@@ -2474,18 +2589,22 @@ CheckLDAPAuth(Port *port)
 		{
 			ereport(LOG,
 					(errmsg("could not perform initial LDAP bind for ldapbinddn \"%s\" on server \"%s\": %s",
-							port->hba->ldapbinddn, port->hba->ldapserver, ldap_err2string(r))));
+							port->hba->ldapbinddn ? port->hba->ldapbinddn : "",
+							port->hba->ldapserver,
+							ldap_err2string(r)),
+					 errdetail_for_ldap(ldap)));
+			ldap_unbind(ldap);
 			pfree(passwd);
 			return STATUS_ERROR;
 		}
 
-		/* Fetch just one attribute, else *all* attributes are returned */
-		attributes[0] = port->hba->ldapsearchattribute ? port->hba->ldapsearchattribute : "uid";
-		attributes[1] = NULL;
-
-		filter = psprintf("(%s=%s)",
-						  attributes[0],
-						  port->user_name);
+		/* Build a custom filter or a single attribute filter? */
+		if (port->hba->ldapsearchfilter)
+			filter = FormatSearchFilter(port->hba->ldapsearchfilter, port->user_name);
+		else if (port->hba->ldapsearchattribute)
+			filter = psprintf("(%s=%s)", port->hba->ldapsearchattribute, port->user_name);
+		else
+			filter = psprintf("(uid=%s)", port->user_name);
 
 		r = ldap_search_s(ldap,
 						  port->hba->ldapbasedn,
@@ -2499,7 +2618,9 @@ CheckLDAPAuth(Port *port)
 		{
 			ereport(LOG,
 					(errmsg("could not search LDAP for filter \"%s\" on server \"%s\": %s",
-							filter, port->hba->ldapserver, ldap_err2string(r))));
+							filter, port->hba->ldapserver, ldap_err2string(r)),
+					 errdetail_for_ldap(ldap)));
+			ldap_unbind(ldap);
 			pfree(passwd);
 			pfree(filter);
 			return STATUS_ERROR;
@@ -2521,6 +2642,7 @@ CheckLDAPAuth(Port *port)
 										  count,
 										  filter, port->hba->ldapserver, count)));
 
+			ldap_unbind(ldap);
 			pfree(passwd);
 			pfree(filter);
 			ldap_msgfree(search_message);
@@ -2536,7 +2658,10 @@ CheckLDAPAuth(Port *port)
 			(void) ldap_get_option(ldap, LDAP_OPT_ERROR_NUMBER, &error);
 			ereport(LOG,
 					(errmsg("could not get dn for the first entry matching \"%s\" on server \"%s\": %s",
-							filter, port->hba->ldapserver, ldap_err2string(error))));
+							filter, port->hba->ldapserver,
+							ldap_err2string(error)),
+					 errdetail_for_ldap(ldap)));
+			ldap_unbind(ldap);
 			pfree(passwd);
 			pfree(filter);
 			ldap_msgfree(search_message);
@@ -2552,12 +2677,9 @@ CheckLDAPAuth(Port *port)
 		r = ldap_unbind_s(ldap);
 		if (r != LDAP_SUCCESS)
 		{
-			int			error;
-
-			(void) ldap_get_option(ldap, LDAP_OPT_ERROR_NUMBER, &error);
 			ereport(LOG,
-					(errmsg("could not unbind after searching for user \"%s\" on server \"%s\": %s",
-							fulluser, port->hba->ldapserver, ldap_err2string(error))));
+					(errmsg("could not unbind after searching for user \"%s\" on server \"%s\"",
+							fulluser, port->hba->ldapserver)));
 			pfree(passwd);
 			pfree(fulluser);
 			return STATUS_ERROR;
@@ -2583,23 +2705,46 @@ CheckLDAPAuth(Port *port)
 							port->hba->ldapsuffix ? port->hba->ldapsuffix : "");
 
 	r = ldap_simple_bind_s(ldap, fulluser, passwd);
-	ldap_unbind(ldap);
 
 	if (r != LDAP_SUCCESS)
 	{
 		ereport(LOG,
 				(errmsg("LDAP login failed for user \"%s\" on server \"%s\": %s",
-						fulluser, port->hba->ldapserver, ldap_err2string(r))));
+						fulluser, port->hba->ldapserver, ldap_err2string(r)),
+				 errdetail_for_ldap(ldap)));
+		ldap_unbind(ldap);
 		pfree(passwd);
 		pfree(fulluser);
 		return STATUS_ERROR;
 	}
 
+	ldap_unbind(ldap);
 	pfree(passwd);
 	pfree(fulluser);
 
 	return STATUS_OK;
 }
+
+/*
+ * Add a detail error message text to the current error if one can be
+ * constructed from the LDAP 'diagnostic message'.
+ */
+static int
+errdetail_for_ldap(LDAP *ldap)
+{
+	char	   *message;
+	int			rc;
+
+	rc = ldap_get_option(ldap, LDAP_OPT_DIAGNOSTIC_MESSAGE, &message);
+	if (rc == LDAP_SUCCESS && message != NULL)
+	{
+		errdetail("LDAP diagnostics: %s", message);
+		ldap_memfree(message);
+	}
+
+	return 0;
+}
+
 #endif							/* USE_LDAP */
 
 
@@ -2667,7 +2812,7 @@ typedef struct
 #define RADIUS_ACCESS_ACCEPT	2
 #define RADIUS_ACCESS_REJECT	3
 
-/* RAIDUS attributes */
+/* RADIUS attributes */
 #define RADIUS_USER_NAME		1
 #define RADIUS_PASSWORD			2
 #define RADIUS_SERVICE_TYPE		6
@@ -2799,7 +2944,7 @@ CheckRADIUSAuth(Port *port)
 }
 
 static int
-PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identifier, char *user_name, char *passwd)
+PerformRadiusTransaction(const char *server, const char *secret, const char *portstr, const char *identifier, const char *user_name, const char *passwd)
 {
 	radius_packet radius_send_pack;
 	radius_packet radius_recv_pack;
@@ -2807,7 +2952,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 	radius_packet *receivepacket = &radius_recv_pack;
 	char	   *radius_buffer = (char *) &radius_send_pack;
 	char	   *receive_buffer = (char *) &radius_recv_pack;
-	int32		service = htonl(RADIUS_AUTHENTICATE_ONLY);
+	int32		service = pg_hton32(RADIUS_AUTHENTICATE_ONLY);
 	uint8	   *cryptvector;
 	int			encryptedpasswordlen;
 	uint8		encryptedpassword[RADIUS_MAX_PASSWORD_LENGTH];
@@ -2866,9 +3011,9 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 		return STATUS_ERROR;
 	}
 	packet->id = packet->vector[0];
-	radius_add_attribute(packet, RADIUS_SERVICE_TYPE, (unsigned char *) &service, sizeof(service));
-	radius_add_attribute(packet, RADIUS_USER_NAME, (unsigned char *) user_name, strlen(user_name));
-	radius_add_attribute(packet, RADIUS_NAS_IDENTIFIER, (unsigned char *) identifier, strlen(identifier));
+	radius_add_attribute(packet, RADIUS_SERVICE_TYPE, (const unsigned char *) &service, sizeof(service));
+	radius_add_attribute(packet, RADIUS_USER_NAME, (const unsigned char *) user_name, strlen(user_name));
+	radius_add_attribute(packet, RADIUS_NAS_IDENTIFIER, (const unsigned char *) identifier, strlen(identifier));
 
 	/*
 	 * RADIUS password attributes are calculated as: e[0] = p[0] XOR
@@ -2915,7 +3060,7 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 
 	/* Length needs to be in network order on the wire */
 	packetlength = packet->length;
-	packet->length = htons(packet->length);
+	packet->length = pg_hton16(packet->length);
 
 	sock = socket(serveraddrs[0].ai_family, SOCK_DGRAM, 0);
 	if (sock == PGINVALID_SOCKET)
@@ -3041,19 +3186,19 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 		}
 
 #ifdef HAVE_IPV6
-		if (remoteaddr.sin6_port != htons(port))
+		if (remoteaddr.sin6_port != pg_hton16(port))
 #else
-		if (remoteaddr.sin_port != htons(port))
+		if (remoteaddr.sin_port != pg_hton16(port))
 #endif
 		{
 #ifdef HAVE_IPV6
 			ereport(LOG,
 					(errmsg("RADIUS response from %s was sent from incorrect port: %d",
-							server, ntohs(remoteaddr.sin6_port))));
+							server, pg_ntoh16(remoteaddr.sin6_port))));
 #else
 			ereport(LOG,
 					(errmsg("RADIUS response from %s was sent from incorrect port: %d",
-							server, ntohs(remoteaddr.sin_port))));
+							server, pg_ntoh16(remoteaddr.sin_port))));
 #endif
 			continue;
 		}
@@ -3065,11 +3210,11 @@ PerformRadiusTransaction(char *server, char *secret, char *portstr, char *identi
 			continue;
 		}
 
-		if (packetlength != ntohs(receivepacket->length))
+		if (packetlength != pg_ntoh16(receivepacket->length))
 		{
 			ereport(LOG,
 					(errmsg("RADIUS response from %s has corrupt length: %d (actual length %d)",
-							server, ntohs(receivepacket->length), packetlength)));
+							server, pg_ntoh16(receivepacket->length), packetlength)));
 			continue;
 		}
 
diff --git a/src/backend/libpq/be-fsstubs.c b/src/backend/libpq/be-fsstubs.c
index bf45461b2f..0b802b54e4 100644
--- a/src/backend/libpq/be-fsstubs.c
+++ b/src/backend/libpq/be-fsstubs.c
@@ -3,7 +3,7 @@
  * be-fsstubs.c
  *	  Builtin functions for open/close/read/write operations on large objects
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -51,11 +51,6 @@
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 
-/*
- * compatibility flag for permission checks
- */
-bool		lo_compat_privileges;
-
 /* define this to enable debug logging */
 /* #define FSDB 1 */
 /* chunk size for lo_import/lo_export transfers */
@@ -108,14 +103,6 @@ be_lo_open(PG_FUNCTION_ARGS)
 
 	lobjDesc = inv_open(lobjId, mode, fscxt);
 
-	if (lobjDesc == NULL)
-	{							/* lookup failed */
-#if FSDB
-		elog(DEBUG4, "could not open large object %u", lobjId);
-#endif
-		PG_RETURN_INT32(-1);
-	}
-
 	fd = newLOfd(lobjDesc);
 
 	PG_RETURN_INT32(fd);
@@ -163,22 +150,16 @@ lo_read(int fd, char *buf, int len)
 				 errmsg("invalid large-object descriptor: %d", fd)));
 	lobj = cookies[fd];
 
-	/* We don't bother to check IFS_RDLOCK, since it's always set */
-
-	/* Permission checks --- first time through only */
-	if ((lobj->flags & IFS_RD_PERM_OK) == 0)
-	{
-		if (!lo_compat_privileges &&
-			pg_largeobject_aclcheck_snapshot(lobj->id,
-											 GetUserId(),
-											 ACL_SELECT,
-											 lobj->snapshot) != ACLCHECK_OK)
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("permission denied for large object %u",
-							lobj->id)));
-		lobj->flags |= IFS_RD_PERM_OK;
-	}
+	/*
+	 * Check state.  inv_read() would throw an error anyway, but we want the
+	 * error to be about the FD's state not the underlying privilege; it might
+	 * be that the privilege exists but user forgot to ask for read mode.
+	 */
+	if ((lobj->flags & IFS_RDLOCK) == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("large object descriptor %d was not opened for reading",
+						fd)));
 
 	status = inv_read(lobj, buf, len);
 
@@ -197,27 +178,13 @@ lo_write(int fd, const char *buf, int len)
 				 errmsg("invalid large-object descriptor: %d", fd)));
 	lobj = cookies[fd];
 
+	/* see comment in lo_read() */
 	if ((lobj->flags & IFS_WRLOCK) == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("large object descriptor %d was not opened for writing",
 						fd)));
 
-	/* Permission checks --- first time through only */
-	if ((lobj->flags & IFS_WR_PERM_OK) == 0)
-	{
-		if (!lo_compat_privileges &&
-			pg_largeobject_aclcheck_snapshot(lobj->id,
-											 GetUserId(),
-											 ACL_UPDATE,
-											 lobj->snapshot) != ACLCHECK_OK)
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("permission denied for large object %u",
-							lobj->id)));
-		lobj->flags |= IFS_WR_PERM_OK;
-	}
-
 	status = inv_write(lobj, buf, len);
 
 	return status;
@@ -342,7 +309,11 @@ be_lo_unlink(PG_FUNCTION_ARGS)
 {
 	Oid			lobjId = PG_GETARG_OID(0);
 
-	/* Must be owner of the largeobject */
+	/*
+	 * Must be owner of the large object.  It would be cleaner to check this
+	 * in inv_drop(), but we want to throw the error before not after closing
+	 * relevant FDs.
+	 */
 	if (!lo_compat_privileges &&
 		!pg_largeobject_ownercheck(lobjId, GetUserId()))
 		ereport(ERROR,
@@ -448,21 +419,13 @@ lo_import_internal(text *filename, Oid lobjOid)
 	LargeObjectDesc *lobj;
 	Oid			oid;
 
-#ifndef ALLOW_DANGEROUS_LO_FUNCTIONS
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to use server-side lo_import()"),
-				 errhint("Anyone can use the client-side lo_import() provided by libpq.")));
-#endif
-
 	CreateFSContext();
 
 	/*
 	 * open the file to be read in
 	 */
 	text_to_cstring_buffer(filename, fnamebuf, sizeof(fnamebuf));
-	fd = OpenTransientFile(fnamebuf, O_RDONLY | PG_BINARY, S_IRWXU);
+	fd = OpenTransientFile(fnamebuf, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -514,14 +477,6 @@ be_lo_export(PG_FUNCTION_ARGS)
 	LargeObjectDesc *lobj;
 	mode_t		oumask;
 
-#ifndef ALLOW_DANGEROUS_LO_FUNCTIONS
-	if (!superuser())
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("must be superuser to use server-side lo_export()"),
-				 errhint("Anyone can use the client-side lo_export() provided by libpq.")));
-#endif
-
 	CreateFSContext();
 
 	/*
@@ -538,8 +493,17 @@ be_lo_export(PG_FUNCTION_ARGS)
 	 */
 	text_to_cstring_buffer(filename, fnamebuf, sizeof(fnamebuf));
 	oumask = umask(S_IWGRP | S_IWOTH);
-	fd = OpenTransientFile(fnamebuf, O_CREAT | O_WRONLY | O_TRUNC | PG_BINARY,
-						   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	PG_TRY();
+	{
+		fd = OpenTransientFilePerm(fnamebuf, O_CREAT | O_WRONLY | O_TRUNC | PG_BINARY,
+								   S_IRUSR | S_IWUSR | S_IRGRP | S_IROTH);
+	}
+	PG_CATCH();
+	{
+		umask(oumask);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
 	umask(oumask);
 	if (fd < 0)
 		ereport(ERROR,
@@ -581,27 +545,13 @@ lo_truncate_internal(int32 fd, int64 len)
 				 errmsg("invalid large-object descriptor: %d", fd)));
 	lobj = cookies[fd];
 
+	/* see comment in lo_read() */
 	if ((lobj->flags & IFS_WRLOCK) == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("large object descriptor %d was not opened for writing",
 						fd)));
 
-	/* Permission checks --- first time through only */
-	if ((lobj->flags & IFS_WR_PERM_OK) == 0)
-	{
-		if (!lo_compat_privileges &&
-			pg_largeobject_aclcheck_snapshot(lobj->id,
-											 GetUserId(),
-											 ACL_UPDATE,
-											 lobj->snapshot) != ACLCHECK_OK)
-			ereport(ERROR,
-					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-					 errmsg("permission denied for large object %u",
-							lobj->id)));
-		lobj->flags |= IFS_WR_PERM_OK;
-	}
-
 	inv_truncate(lobj, len);
 }
 
@@ -777,17 +727,6 @@ lo_get_fragment_internal(Oid loOid, int64 offset, int32 nbytes)
 
 	loDesc = inv_open(loOid, INV_READ, fscxt);
 
-	/* Permission check */
-	if (!lo_compat_privileges &&
-		pg_largeobject_aclcheck_snapshot(loDesc->id,
-										 GetUserId(),
-										 ACL_SELECT,
-										 loDesc->snapshot) != ACLCHECK_OK)
-		ereport(ERROR,
-				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
-				 errmsg("permission denied for large object %u",
-						loDesc->id)));
-
 	/*
 	 * Compute number of bytes we'll actually read, accommodating nbytes == -1
 	 * and reads beyond the end of the LO.
diff --git a/src/backend/libpq/be-secure-openssl.c b/src/backend/libpq/be-secure-openssl.c
index fe15227a77..e1ddfb3c16 100644
--- a/src/backend/libpq/be-secure-openssl.c
+++ b/src/backend/libpq/be-secure-openssl.c
@@ -4,35 +4,13 @@
  *	  functions for OpenSSL support in the backend.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
  * IDENTIFICATION
  *	  src/backend/libpq/be-secure-openssl.c
  *
- *	  Since the server static private key ($DataDir/server.key)
- *	  will normally be stored unencrypted so that the database
- *	  backend can restart automatically, it is important that
- *	  we select an algorithm that continues to provide confidentiality
- *	  even if the attacker has the server's private key.  Ephemeral
- *	  DH (EDH) keys provide this and more (Perfect Forward Secrecy
- *	  aka PFS).
- *
- *	  N.B., the static private key should still be protected to
- *	  the largest extent possible, to minimize the risk of
- *	  impersonations.
- *
- *	  Another benefit of EDH is that it allows the backend and
- *	  clients to use DSA keys.  DSA keys can only provide digital
- *	  signatures, not encryption, and are often acceptable in
- *	  jurisdictions where RSA keys are unacceptable.
- *
- *	  The downside to EDH is that it makes it impossible to
- *	  use ssldump(1) if there's a problem establishing an SSL
- *	  session.  In this case you'll need to temporarily disable
- *	  EDH by commenting out the callback.
- *
  *-------------------------------------------------------------------------
  */
 
@@ -87,58 +65,16 @@ static SSL_CTX *SSL_context = NULL;
 static bool SSL_initialized = false;
 static bool ssl_passwd_cb_called = false;
 
-/* ------------------------------------------------------------ */
-/*						 Hardcoded values						*/
-/* ------------------------------------------------------------ */
-
-/*
- *	Hardcoded DH parameters, used in ephemeral DH keying.
- *	As discussed above, EDH protects the confidentiality of
- *	sessions even if the static private key is compromised,
- *	so we are *highly* motivated to ensure that we can use
- *	EDH even if the DBA has not provided custom DH parameters.
- *
- *	We could refuse SSL connections unless a good DH parameter
- *	file exists, but some clients may quietly renegotiate an
- *	unsecured connection without fully informing the user.
- *	Very uncool. Alternatively, the system could refuse to start
- *	if a DH parameters is not specified, but this would tend to
- *	piss off DBAs.
- *
- *	If you want to create your own hardcoded DH parameters
- *	for fun and profit, review "Assigned Number for SKIP
- *	Protocols" (http://www.skip-vpn.org/spec/numbers.html)
- *	for suggestions.
- */
-
-static const char file_dh2048[] =
-"-----BEGIN DH PARAMETERS-----\n\
-MIIBCAKCAQEA9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV\n\
-89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50\n\
-T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknb\n\
-zSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdX\n\
-Q6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbT\n\
-CD1mpF1Bn5x8vYlLIhkmuquiXsNV6TILOwIBAg==\n\
------END DH PARAMETERS-----\n";
-
 
 /* ------------------------------------------------------------ */
 /*						 Public interface						*/
 /* ------------------------------------------------------------ */
 
-/*
- *	Initialize global SSL context.
- *
- * If isServerStart is true, report any errors as FATAL (so we don't return).
- * Otherwise, log errors at LOG level and return -1 to indicate trouble,
- * preserving the old SSL state if any.  Returns 0 if OK.
- */
 int
 be_tls_init(bool isServerStart)
 {
 	STACK_OF(X509_NAME) *root_cert_list = NULL;
 	SSL_CTX    *context;
-	struct stat buf;
 
 	/* This stuff need be done only once. */
 	if (!SSL_initialized)
@@ -196,63 +132,8 @@ be_tls_init(bool isServerStart)
 		goto error;
 	}
 
-	if (stat(ssl_key_file, &buf) != 0)
-	{
-		ereport(isServerStart ? FATAL : LOG,
-				(errcode_for_file_access(),
-				 errmsg("could not access private key file \"%s\": %m",
-						ssl_key_file)));
-		goto error;
-	}
-
-	if (!S_ISREG(buf.st_mode))
-	{
-		ereport(isServerStart ? FATAL : LOG,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("private key file \"%s\" is not a regular file",
-						ssl_key_file)));
-		goto error;
-	}
-
-	/*
-	 * Refuse to load key files owned by users other than us or root.
-	 *
-	 * XXX surely we can check this on Windows somehow, too.
-	 */
-#if !defined(WIN32) && !defined(__CYGWIN__)
-	if (buf.st_uid != geteuid() && buf.st_uid != 0)
-	{
-		ereport(isServerStart ? FATAL : LOG,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("private key file \"%s\" must be owned by the database user or root",
-						ssl_key_file)));
+	if (!check_ssl_key_file_permissions(ssl_key_file, isServerStart))
 		goto error;
-	}
-#endif
-
-	/*
-	 * Require no public access to key file. If the file is owned by us,
-	 * require mode 0600 or less. If owned by root, require 0640 or less to
-	 * allow read access through our gid, or a supplementary gid that allows
-	 * to read system-wide certificates.
-	 *
-	 * XXX temporarily suppress check when on Windows, because there may not
-	 * be proper support for Unix-y file permissions.  Need to think of a
-	 * reasonable check to apply on Windows.  (See also the data directory
-	 * permission check in postmaster.c)
-	 */
-#if !defined(WIN32) && !defined(__CYGWIN__)
-	if ((buf.st_uid == geteuid() && buf.st_mode & (S_IRWXG | S_IRWXO)) ||
-		(buf.st_uid == 0 && buf.st_mode & (S_IWGRP | S_IXGRP | S_IRWXO)))
-	{
-		ereport(isServerStart ? FATAL : LOG,
-				(errcode(ERRCODE_CONFIG_FILE_ERROR),
-				 errmsg("private key file \"%s\" has group or world access",
-						ssl_key_file),
-				 errdetail("File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root.")));
-		goto error;
-	}
-#endif
 
 	/*
 	 * OK, try to load the private key file.
@@ -412,9 +293,6 @@ be_tls_init(bool isServerStart)
 	return -1;
 }
 
-/*
- *	Destroy global SSL context, if any.
- */
 void
 be_tls_destroy(void)
 {
@@ -424,9 +302,6 @@ be_tls_destroy(void)
 	ssl_loaded_verify_locations = false;
 }
 
-/*
- *	Attempt to negotiate SSL connection.
- */
 int
 be_tls_open_server(Port *port)
 {
@@ -585,19 +460,12 @@ be_tls_open_server(Port *port)
 		port->peer_cert_valid = true;
 	}
 
-	ereport(DEBUG2,
-			(errmsg("SSL connection from \"%s\"",
-					port->peer_cn ? port->peer_cn : "(anonymous)")));
-
 	/* set up debugging/info callback */
 	SSL_CTX_set_info_callback(SSL_context, info_cb);
 
 	return 0;
 }
 
-/*
- *	Close SSL connection.
- */
 void
 be_tls_close(Port *port)
 {
@@ -622,9 +490,6 @@ be_tls_close(Port *port)
 	}
 }
 
-/*
- *	Read data from a secure connection.
- */
 ssize_t
 be_tls_read(Port *port, void *ptr, size_t len, int *waitfor)
 {
@@ -684,9 +549,6 @@ be_tls_read(Port *port, void *ptr, size_t len, int *waitfor)
 	return n;
 }
 
-/*
- *	Write data to a secure connection.
- */
 ssize_t
 be_tls_write(Port *port, void *ptr, size_t len, int *waitfor)
 {
@@ -1080,7 +942,7 @@ initialize_dh(SSL_CTX *context, bool isServerStart)
 	if (ssl_dh_params_file[0])
 		dh = load_dh_file(ssl_dh_params_file, isServerStart);
 	if (!dh)
-		dh = load_dh_buffer(file_dh2048, sizeof file_dh2048);
+		dh = load_dh_buffer(FILE_DH2048, sizeof(FILE_DH2048));
 	if (!dh)
 	{
 		ereport(isServerStart ? FATAL : LOG,
@@ -1162,9 +1024,6 @@ SSLerrmessage(unsigned long ecode)
 	return errbuf;
 }
 
-/*
- * Return information about the SSL connection
- */
 int
 be_tls_get_cipher_bits(Port *port)
 {
@@ -1188,22 +1047,22 @@ be_tls_get_compression(Port *port)
 		return false;
 }
 
-void
-be_tls_get_version(Port *port, char *ptr, size_t len)
+const char *
+be_tls_get_version(Port *port)
 {
 	if (port->ssl)
-		strlcpy(ptr, SSL_get_version(port->ssl), len);
+		return SSL_get_version(port->ssl);
 	else
-		ptr[0] = '\0';
+		return NULL;
 }
 
-void
-be_tls_get_cipher(Port *port, char *ptr, size_t len)
+const char *
+be_tls_get_cipher(Port *port)
 {
 	if (port->ssl)
-		strlcpy(ptr, SSL_get_cipher(port->ssl), len);
+		return SSL_get_cipher(port->ssl);
 	else
-		ptr[0] = '\0';
+		return NULL;
 }
 
 void
@@ -1215,6 +1074,85 @@ be_tls_get_peerdn_name(Port *port, char *ptr, size_t len)
 		ptr[0] = '\0';
 }
 
+char *
+be_tls_get_peer_finished(Port *port, size_t *len)
+{
+	char		dummy[1];
+	char	   *result;
+
+	/*
+	 * OpenSSL does not offer an API to directly get the length of the
+	 * expected TLS Finished message, so just do a dummy call to grab this
+	 * information to allow caller to do an allocation with a correct size.
+	 */
+	*len = SSL_get_peer_finished(port->ssl, dummy, sizeof(dummy));
+	result = palloc(*len);
+	(void) SSL_get_peer_finished(port->ssl, result, *len);
+
+	return result;
+}
+
+char *
+be_tls_get_certificate_hash(Port *port, size_t *len)
+{
+#ifdef HAVE_X509_GET_SIGNATURE_NID
+	X509	   *server_cert;
+	char	   *cert_hash;
+	const EVP_MD *algo_type = NULL;
+	unsigned char hash[EVP_MAX_MD_SIZE];	/* size for SHA-512 */
+	unsigned int hash_size;
+	int			algo_nid;
+
+	*len = 0;
+	server_cert = SSL_get_certificate(port->ssl);
+	if (server_cert == NULL)
+		return NULL;
+
+	/*
+	 * Get the signature algorithm of the certificate to determine the
+	 * hash algorithm to use for the result.
+	 */
+	if (!OBJ_find_sigid_algs(X509_get_signature_nid(server_cert),
+							 &algo_nid, NULL))
+		elog(ERROR, "could not determine server certificate signature algorithm");
+
+	/*
+	 * The TLS server's certificate bytes need to be hashed with SHA-256 if
+	 * its signature algorithm is MD5 or SHA-1 as per RFC 5929
+	 * (https://tools.ietf.org/html/rfc5929#section-4.1).  If something else
+	 * is used, the same hash as the signature algorithm is used.
+	 */
+	switch (algo_nid)
+	{
+		case NID_md5:
+		case NID_sha1:
+			algo_type = EVP_sha256();
+			break;
+		default:
+			algo_type = EVP_get_digestbynid(algo_nid);
+			if (algo_type == NULL)
+				elog(ERROR, "could not find digest for NID %s",
+					 OBJ_nid2sn(algo_nid));
+			break;
+	}
+
+	/* generate and save the certificate hash */
+	if (!X509_digest(server_cert, algo_type, hash, &hash_size))
+		elog(ERROR, "could not generate server certificate hash");
+
+	cert_hash = palloc(hash_size);
+	memcpy(cert_hash, hash, hash_size);
+	*len = hash_size;
+
+	return cert_hash;
+#else
+	ereport(ERROR,
+			(errcode(ERRCODE_PROTOCOL_VIOLATION),
+			 errmsg("channel binding type \"tls-server-end-point\" is not supported by this build")));
+	return NULL;
+#endif
+}
+
 /*
  * Convert an X509 subject name to a cstring.
  *
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
index 53fefd1b29..76c0a9e39b 100644
--- a/src/backend/libpq/be-secure.c
+++ b/src/backend/libpq/be-secure.c
@@ -6,7 +6,7 @@
  *	  message integrity and endpoint authentication.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -114,6 +114,10 @@ secure_open_server(Port *port)
 
 #ifdef USE_SSL
 	r = be_tls_open_server(port);
+
+	ereport(DEBUG2,
+			(errmsg("SSL connection from \"%s\"",
+					port->peer_cn ? port->peer_cn : "(anonymous)")));
 #endif
 
 	return r;
@@ -314,3 +318,70 @@ secure_raw_write(Port *port, const void *ptr, size_t len)
 
 	return n;
 }
+
+bool
+check_ssl_key_file_permissions(const char *ssl_key_file, bool isServerStart)
+{
+	int			loglevel = isServerStart ? FATAL : LOG;
+	struct stat	buf;
+
+	if (stat(ssl_key_file, &buf) != 0)
+	{
+		ereport(loglevel,
+				(errcode_for_file_access(),
+				 errmsg("could not access private key file \"%s\": %m",
+						ssl_key_file)));
+		return false;
+	}
+
+	if (!S_ISREG(buf.st_mode))
+	{
+		ereport(loglevel,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("private key file \"%s\" is not a regular file",
+						ssl_key_file)));
+		return false;
+	}
+
+	/*
+	 * Refuse to load key files owned by users other than us or root.
+	 *
+	 * XXX surely we can check this on Windows somehow, too.
+	 */
+#if !defined(WIN32) && !defined(__CYGWIN__)
+	if (buf.st_uid != geteuid() && buf.st_uid != 0)
+	{
+		ereport(loglevel,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("private key file \"%s\" must be owned by the database user or root",
+						ssl_key_file)));
+		return false;
+	}
+#endif
+
+	/*
+	 * Require no public access to key file. If the file is owned by us,
+	 * require mode 0600 or less. If owned by root, require 0640 or less to
+	 * allow read access through our gid, or a supplementary gid that allows
+	 * to read system-wide certificates.
+	 *
+	 * XXX temporarily suppress check when on Windows, because there may not
+	 * be proper support for Unix-y file permissions.  Need to think of a
+	 * reasonable check to apply on Windows.  (See also the data directory
+	 * permission check in postmaster.c)
+	 */
+#if !defined(WIN32) && !defined(__CYGWIN__)
+	if ((buf.st_uid == geteuid() && buf.st_mode & (S_IRWXG | S_IRWXO)) ||
+		(buf.st_uid == 0 && buf.st_mode & (S_IWGRP | S_IXGRP | S_IRWXO)))
+	{
+		ereport(loglevel,
+				(errcode(ERRCODE_CONFIG_FILE_ERROR),
+				 errmsg("private key file \"%s\" has group or world access",
+						ssl_key_file),
+				 errdetail("File must have permissions u=rw (0600) or less if owned by the database user, or permissions u=rw,g=r (0640) or less if owned by root.")));
+		return false;
+	}
+#endif
+
+	return true;
+}
diff --git a/src/backend/libpq/crypt.c b/src/backend/libpq/crypt.c
index 1715c52462..2c5ce4a47e 100644
--- a/src/backend/libpq/crypt.c
+++ b/src/backend/libpq/crypt.c
@@ -4,7 +4,7 @@
  *	  Functions for dealing with encrypted passwords stored in
  *	  pg_authid.rolpassword.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/libpq/crypt.c
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 42afead9fd..acf625e4ec 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -5,7 +5,7 @@
  *	  wherein you authenticate a user by seeing what IP address the system
  *	  says he comes from and choosing authentication method based on it).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -126,7 +126,7 @@ static const char *const UserAuthName[] =
 	"ident",
 	"password",
 	"md5",
-	"scram-sha256",
+	"scram-sha-256",
 	"gss",
 	"sspi",
 	"pam",
@@ -144,8 +144,8 @@ static List *tokenize_inc_file(List *tokens, const char *outer_filename,
 				  const char *inc_filename, int elevel, char **err_msg);
 static bool parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 				   int elevel, char **err_msg);
-static bool verify_option_list_length(List *options, char *optionname,
-						  List *masters, char *mastername, int line_num);
+static bool verify_option_list_length(List *options, const char *optionname,
+						  List *masters, const char *mastername, int line_num);
 static ArrayType *gethba_options(HbaLine *hba);
 static void fill_hba_line(Tuplestorestate *tuple_store, TupleDesc tupdesc,
 			  int lineno, HbaLine *hba, const char *err_msg);
@@ -187,9 +187,9 @@ pg_isblank(const char c)
  * set *err_msg to a string describing the error.  Currently the only
  * possible error is token too long for buf.
  *
- * If successful: store null-terminated token at *buf and return TRUE.
- * If no more tokens on line: set *buf = '\0' and return FALSE.
- * If error: fill buf with truncated or misformatted token and return FALSE.
+ * If successful: store null-terminated token at *buf and return true.
+ * If no more tokens on line: set *buf = '\0' and return false.
+ * If error: fill buf with truncated or misformatted token and return false.
  */
 static bool
 next_token(char **lineptr, char *buf, int bufsz,
@@ -1505,22 +1505,24 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
 		/*
 		 * LDAP can operate in two modes: either with a direct bind, using
 		 * ldapprefix and ldapsuffix, or using a search+bind, using
-		 * ldapbasedn, ldapbinddn, ldapbindpasswd and ldapsearchattribute.
-		 * Disallow mixing these parameters.
+		 * ldapbasedn, ldapbinddn, ldapbindpasswd and one of
+		 * ldapsearchattribute or ldapsearchfilter.  Disallow mixing these
+		 * parameters.
 		 */
 		if (parsedline->ldapprefix || parsedline->ldapsuffix)
 		{
 			if (parsedline->ldapbasedn ||
 				parsedline->ldapbinddn ||
 				parsedline->ldapbindpasswd ||
-				parsedline->ldapsearchattribute)
+				parsedline->ldapsearchattribute ||
+				parsedline->ldapsearchfilter)
 			{
 				ereport(elevel,
 						(errcode(ERRCODE_CONFIG_FILE_ERROR),
-						 errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, or ldapurl together with ldapprefix"),
+						 errmsg("cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix"),
 						 errcontext("line %d of configuration file \"%s\"",
 									line_num, HbaFileName)));
-				*err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, or ldapurl together with ldapprefix";
+				*err_msg = "cannot use ldapbasedn, ldapbinddn, ldapbindpasswd, ldapsearchattribute, ldapsearchfilter or ldapurl together with ldapprefix";
 				return NULL;
 			}
 		}
@@ -1534,6 +1536,22 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
 			*err_msg = "authentication method \"ldap\" requires argument \"ldapbasedn\", \"ldapprefix\", or \"ldapsuffix\" to be set";
 			return NULL;
 		}
+
+		/*
+		 * When using search+bind, you can either use a simple attribute
+		 * (defaulting to "uid") or a fully custom search filter.  You can't
+		 * do both.
+		 */
+		if (parsedline->ldapsearchattribute && parsedline->ldapsearchfilter)
+		{
+			ereport(elevel,
+					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+					 errmsg("cannot use ldapsearchattribute together with ldapsearchfilter"),
+					 errcontext("line %d of configuration file \"%s\"",
+								line_num, HbaFileName)));
+			*err_msg = "cannot use ldapsearchattribute together with ldapsearchfilter";
+			return NULL;
+		}
 	}
 
 	if (parsedline->auth_method == uaRADIUS)
@@ -1599,7 +1617,7 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
 
 
 static bool
-verify_option_list_length(List *options, char *optionname, List *masters, char *mastername, int line_num)
+verify_option_list_length(List *options, const char *optionname, List *masters, const char *mastername, int line_num)
 {
 	if (list_length(options) == 0 ||
 		list_length(options) == 1 ||
@@ -1608,7 +1626,7 @@ verify_option_list_length(List *options, char *optionname, List *masters, char *
 
 	ereport(LOG,
 			(errcode(ERRCODE_CONFIG_FILE_ERROR),
-			 errmsg("the number of %s (%i) must be 1 or the same as the number of %s (%i)",
+			 errmsg("the number of %s (%d) must be 1 or the same as the number of %s (%d)",
 					optionname,
 					list_length(options),
 					mastername,
@@ -1710,7 +1728,8 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 			return false;
 		}
 
-		if (strcmp(urldata->lud_scheme, "ldap") != 0)
+		if (strcmp(urldata->lud_scheme, "ldap") != 0 &&
+			strcmp(urldata->lud_scheme, "ldaps") != 0)
 		{
 			ereport(elevel,
 					(errcode(ERRCODE_CONFIG_FILE_ERROR),
@@ -1721,22 +1740,19 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 			return false;
 		}
 
-		hbaline->ldapserver = pstrdup(urldata->lud_host);
+		if (urldata->lud_scheme)
+			hbaline->ldapscheme = pstrdup(urldata->lud_scheme);
+		if (urldata->lud_host)
+			hbaline->ldapserver = pstrdup(urldata->lud_host);
 		hbaline->ldapport = urldata->lud_port;
-		hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
+		if (urldata->lud_dn)
+			hbaline->ldapbasedn = pstrdup(urldata->lud_dn);
 
 		if (urldata->lud_attrs)
 			hbaline->ldapsearchattribute = pstrdup(urldata->lud_attrs[0]);	/* only use first one */
 		hbaline->ldapscope = urldata->lud_scope;
 		if (urldata->lud_filter)
-		{
-			ereport(elevel,
-					(errcode(ERRCODE_CONFIG_FILE_ERROR),
-					 errmsg("filters not supported in LDAP URLs")));
-			*err_msg = "filters not supported in LDAP URLs";
-			ldap_free_urldesc(urldata);
-			return false;
-		}
+			hbaline->ldapsearchfilter = pstrdup(urldata->lud_filter);
 		ldap_free_urldesc(urldata);
 #else							/* not OpenLDAP */
 		ereport(elevel,
@@ -1753,6 +1769,17 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 		else
 			hbaline->ldaptls = false;
 	}
+	else if (strcmp(name, "ldapscheme") == 0)
+	{
+		REQUIRE_AUTH_OPTION(uaLDAP, "ldapscheme", "ldap");
+		if (strcmp(val, "ldap") != 0 && strcmp(val, "ldaps") != 0)
+			ereport(elevel,
+					(errcode(ERRCODE_CONFIG_FILE_ERROR),
+					 errmsg("invalid ldapscheme value: \"%s\"", val),
+					 errcontext("line %d of configuration file \"%s\"",
+								line_num, HbaFileName)));
+		hbaline->ldapscheme = pstrdup(val);
+	}
 	else if (strcmp(name, "ldapserver") == 0)
 	{
 		REQUIRE_AUTH_OPTION(uaLDAP, "ldapserver", "ldap");
@@ -1788,6 +1815,11 @@ parse_hba_auth_opt(char *name, char *val, HbaLine *hbaline,
 		REQUIRE_AUTH_OPTION(uaLDAP, "ldapsearchattribute", "ldap");
 		hbaline->ldapsearchattribute = pstrdup(val);
 	}
+	else if (strcmp(name, "ldapsearchfilter") == 0)
+	{
+		REQUIRE_AUTH_OPTION(uaLDAP, "ldapsearchfilter", "ldap");
+		hbaline->ldapsearchfilter = pstrdup(val);
+	}
 	else if (strcmp(name, "ldapbasedn") == 0)
 	{
 		REQUIRE_AUTH_OPTION(uaLDAP, "ldapbasedn", "ldap");
@@ -2266,6 +2298,11 @@ gethba_options(HbaLine *hba)
 				CStringGetTextDatum(psprintf("ldapsearchattribute=%s",
 											 hba->ldapsearchattribute));
 
+		if (hba->ldapsearchfilter)
+			options[noptions++] =
+				CStringGetTextDatum(psprintf("ldapsearchfilter=%s",
+											 hba->ldapsearchfilter));
+
 		if (hba->ldapscope)
 			options[noptions++] =
 				CStringGetTextDatum(psprintf("ldapscope=%d", hba->ldapscope));
diff --git a/src/backend/libpq/ifaddr.c b/src/backend/libpq/ifaddr.c
index 53bf6bcd80..274c084362 100644
--- a/src/backend/libpq/ifaddr.c
+++ b/src/backend/libpq/ifaddr.c
@@ -3,7 +3,7 @@
  * ifaddr.c
  *	  IP netmask calculations, and enumerating network interfaces.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -27,10 +27,10 @@
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#include <arpa/inet.h>
 #include <sys/file.h>
 
 #include "libpq/ifaddr.h"
+#include "port/pg_bswap.h"
 
 static int range_sockaddr_AF_INET(const struct sockaddr_in *addr,
 					   const struct sockaddr_in *netaddr,
@@ -144,7 +144,7 @@ pg_sockaddr_cidr_mask(struct sockaddr_storage *mask, char *numbits, int family)
 						& 0xffffffffUL;
 				else
 					maskl = 0;
-				mask4.sin_addr.s_addr = htonl(maskl);
+				mask4.sin_addr.s_addr = pg_hton32(maskl);
 				memcpy(mask, &mask4, sizeof(mask4));
 				break;
 			}
@@ -568,7 +568,7 @@ pg_foreach_ifaddr(PgIfAddrCallback callback, void *cb_data)
 	/* addr 127.0.0.1/8 */
 	memset(&addr, 0, sizeof(addr));
 	addr.sin_family = AF_INET;
-	addr.sin_addr.s_addr = ntohl(0x7f000001);
+	addr.sin_addr.s_addr = pg_ntoh32(0x7f000001);
 	memset(&mask, 0, sizeof(mask));
 	pg_sockaddr_cidr_mask(&mask, "8", AF_INET);
 	run_ifaddr_callback(callback, cb_data,
diff --git a/src/backend/libpq/pqcomm.c b/src/backend/libpq/pqcomm.c
index 4452ea4228..a4f6d4deeb 100644
--- a/src/backend/libpq/pqcomm.c
+++ b/src/backend/libpq/pqcomm.c
@@ -27,7 +27,7 @@
  * the backend's "backend/libpq" is quite separate from "interfaces/libpq".
  * All that remains is similarities of names to trap the unwary...
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/libpq/pqcomm.c
@@ -81,7 +81,6 @@
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#include <arpa/inet.h>
 #ifdef HAVE_UTIME_H
 #include <utime.h>
 #endif
@@ -92,6 +91,7 @@
 #include "common/ip.h"
 #include "libpq/libpq.h"
 #include "miscadmin.h"
+#include "port/pg_bswap.h"
 #include "storage/ipc.h"
 #include "utils/guc.h"
 #include "utils/memutils.h"
@@ -914,7 +914,7 @@ RemoveSocketFiles(void)
 /* --------------------------------
  *			  socket_set_nonblocking - set socket blocking/non-blocking
  *
- * Sets the socket non-blocking if nonblocking is TRUE, or sets it
+ * Sets the socket non-blocking if nonblocking is true, or sets it
  * blocking otherwise.
  * --------------------------------
  */
@@ -1286,7 +1286,7 @@ pq_getmessage(StringInfo s, int maxlen)
 		return EOF;
 	}
 
-	len = ntohl(len);
+	len = pg_ntoh32(len);
 
 	if (len < 4 ||
 		(maxlen > 0 && len > maxlen))
@@ -1569,7 +1569,7 @@ socket_putmessage(char msgtype, const char *s, size_t len)
 	{
 		uint32		n32;
 
-		n32 = htonl((uint32) (len + 4));
+		n32 = pg_hton32((uint32) (len + 4));
 		if (internal_putbytes((char *) &n32, 4))
 			goto fail;
 	}
diff --git a/src/backend/libpq/pqformat.c b/src/backend/libpq/pqformat.c
index c8cf67c041..30145b96ec 100644
--- a/src/backend/libpq/pqformat.c
+++ b/src/backend/libpq/pqformat.c
@@ -21,7 +21,7 @@
  * are different.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/libpq/pqformat.c
@@ -72,12 +72,11 @@
 #include "postgres.h"
 
 #include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
 
 
 /* --------------------------------
@@ -98,13 +97,24 @@ pq_beginmessage(StringInfo buf, char msgtype)
 }
 
 /* --------------------------------
- *		pq_sendbyte		- append a raw byte to a StringInfo buffer
+
+ *		pq_beginmessage_reuse - initialize for sending a message, reuse buffer
+ *
+ * This requires the buffer to be allocated in an sufficiently long-lived
+ * memory context.
  * --------------------------------
  */
 void
-pq_sendbyte(StringInfo buf, int byt)
+pq_beginmessage_reuse(StringInfo buf, char msgtype)
 {
-	appendStringInfoCharMacro(buf, byt);
+	resetStringInfo(buf);
+
+	/*
+	 * We stash the message type into the buffer's cursor field, expecting
+	 * that the pq_sendXXX routines won't touch it.  We could alternatively
+	 * make it the first byte of the buffer contents, but this seems easier.
+	 */
+	buf->cursor = msgtype;
 }
 
 /* --------------------------------
@@ -114,6 +124,7 @@ pq_sendbyte(StringInfo buf, int byt)
 void
 pq_sendbytes(StringInfo buf, const char *data, int datalen)
 {
+	/* use variant that maintains a trailing null-byte, out of caution */
 	appendBinaryStringInfo(buf, data, datalen);
 }
 
@@ -138,14 +149,14 @@ pq_sendcountedtext(StringInfo buf, const char *str, int slen,
 	if (p != str)				/* actual conversion has been done? */
 	{
 		slen = strlen(p);
-		pq_sendint(buf, slen + extra, 4);
-		appendBinaryStringInfo(buf, p, slen);
+		pq_sendint32(buf, slen + extra);
+		appendBinaryStringInfoNT(buf, p, slen);
 		pfree(p);
 	}
 	else
 	{
-		pq_sendint(buf, slen + extra, 4);
-		appendBinaryStringInfo(buf, str, slen);
+		pq_sendint32(buf, slen + extra);
+		appendBinaryStringInfoNT(buf, str, slen);
 	}
 }
 
@@ -192,11 +203,11 @@ pq_sendstring(StringInfo buf, const char *str)
 	if (p != str)				/* actual conversion has been done? */
 	{
 		slen = strlen(p);
-		appendBinaryStringInfo(buf, p, slen + 1);
+		appendBinaryStringInfoNT(buf, p, slen + 1);
 		pfree(p);
 	}
 	else
-		appendBinaryStringInfo(buf, str, slen + 1);
+		appendBinaryStringInfoNT(buf, str, slen + 1);
 }
 
 /* --------------------------------
@@ -228,61 +239,6 @@ pq_send_ascii_string(StringInfo buf, const char *str)
 	appendStringInfoChar(buf, '\0');
 }
 
-/* --------------------------------
- *		pq_sendint		- append a binary integer to a StringInfo buffer
- * --------------------------------
- */
-void
-pq_sendint(StringInfo buf, int i, int b)
-{
-	unsigned char n8;
-	uint16		n16;
-	uint32		n32;
-
-	switch (b)
-	{
-		case 1:
-			n8 = (unsigned char) i;
-			appendBinaryStringInfo(buf, (char *) &n8, 1);
-			break;
-		case 2:
-			n16 = htons((uint16) i);
-			appendBinaryStringInfo(buf, (char *) &n16, 2);
-			break;
-		case 4:
-			n32 = htonl((uint32) i);
-			appendBinaryStringInfo(buf, (char *) &n32, 4);
-			break;
-		default:
-			elog(ERROR, "unsupported integer size %d", b);
-			break;
-	}
-}
-
-/* --------------------------------
- *		pq_sendint64	- append a binary 8-byte int to a StringInfo buffer
- *
- * It is tempting to merge this with pq_sendint, but we'd have to make the
- * argument int64 for all data widths --- that could be a big performance
- * hit on machines where int64 isn't efficient.
- * --------------------------------
- */
-void
-pq_sendint64(StringInfo buf, int64 i)
-{
-	uint32		n32;
-
-	/* High order half first, since we're doing MSB-first */
-	n32 = (uint32) (i >> 32);
-	n32 = htonl(n32);
-	appendBinaryStringInfo(buf, (char *) &n32, 4);
-
-	/* Now the low order half */
-	n32 = (uint32) i;
-	n32 = htonl(n32);
-	appendBinaryStringInfo(buf, (char *) &n32, 4);
-}
-
 /* --------------------------------
  *		pq_sendfloat4	- append a float4 to a StringInfo buffer
  *
@@ -304,9 +260,7 @@ pq_sendfloat4(StringInfo buf, float4 f)
 	}			swap;
 
 	swap.f = f;
-	swap.i = htonl(swap.i);
-
-	appendBinaryStringInfo(buf, (char *) &swap.i, 4);
+	pq_sendint32(buf, swap.i);
 }
 
 /* --------------------------------
@@ -350,6 +304,21 @@ pq_endmessage(StringInfo buf)
 	buf->data = NULL;
 }
 
+/* --------------------------------
+ *		pq_endmessage_reuse	- send the completed message to the frontend
+ *
+ * The data buffer is *not* freed, allowing to reuse the buffer with
+ * pg_beginmessage_reuse.
+ --------------------------------
+ */
+
+void
+pq_endmessage_reuse(StringInfo buf)
+{
+	/* msgtype was saved in cursor field */
+	(void) pq_putmessage(buf->cursor, buf->data, buf->len);
+}
+
 
 /* --------------------------------
  *		pq_begintypsend		- initialize for constructing a bytea result
@@ -460,11 +429,11 @@ pq_getmsgint(StringInfo msg, int b)
 			break;
 		case 2:
 			pq_copymsgbytes(msg, (char *) &n16, 2);
-			result = ntohs(n16);
+			result = pg_ntoh16(n16);
 			break;
 		case 4:
 			pq_copymsgbytes(msg, (char *) &n32, 4);
-			result = ntohl(n32);
+			result = pg_ntoh32(n32);
 			break;
 		default:
 			elog(ERROR, "unsupported integer size %d", b);
@@ -485,20 +454,11 @@ pq_getmsgint(StringInfo msg, int b)
 int64
 pq_getmsgint64(StringInfo msg)
 {
-	int64		result;
-	uint32		h32;
-	uint32		l32;
-
-	pq_copymsgbytes(msg, (char *) &h32, 4);
-	pq_copymsgbytes(msg, (char *) &l32, 4);
-	h32 = ntohl(h32);
-	l32 = ntohl(l32);
+	uint64		n64;
 
-	result = h32;
-	result <<= 32;
-	result |= l32;
+	pq_copymsgbytes(msg, (char *) &n64, sizeof(n64));
 
-	return result;
+	return pg_ntoh64(n64);
 }
 
 /* --------------------------------
diff --git a/src/backend/libpq/pqmq.c b/src/backend/libpq/pqmq.c
index 8fbc03819d..201075dd47 100644
--- a/src/backend/libpq/pqmq.c
+++ b/src/backend/libpq/pqmq.c
@@ -3,7 +3,7 @@
  * pqmq.c
  *	  Use the frontend/backend protocol for communication over a shm_mq
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/libpq/pqmq.c
@@ -21,7 +21,6 @@
 #include "tcop/tcopprot.h"
 #include "utils/builtins.h"
 
-static shm_mq *pq_mq;
 static shm_mq_handle *pq_mq_handle;
 static bool pq_mq_busy = false;
 static pid_t pq_mq_parallel_master_pid = 0;
@@ -56,7 +55,6 @@ void
 pq_redirect_to_shm_mq(dsm_segment *seg, shm_mq_handle *mqh)
 {
 	PqCommMethods = &PqCommMqMethods;
-	pq_mq = shm_mq_get_queue(mqh);
 	pq_mq_handle = mqh;
 	whereToSendOutput = DestRemote;
 	FrontendProtocol = PG_PROTOCOL_LATEST;
@@ -70,7 +68,6 @@ pq_redirect_to_shm_mq(dsm_segment *seg, shm_mq_handle *mqh)
 static void
 pq_cleanup_redirect_to_shm_mq(dsm_segment *seg, Datum arg)
 {
-	pq_mq = NULL;
 	pq_mq_handle = NULL;
 	whereToSendOutput = DestNone;
 }
@@ -135,9 +132,8 @@ mq_putmessage(char msgtype, const char *s, size_t len)
 	 */
 	if (pq_mq_busy)
 	{
-		if (pq_mq != NULL)
-			shm_mq_detach(pq_mq);
-		pq_mq = NULL;
+		if (pq_mq_handle != NULL)
+			shm_mq_detach(pq_mq_handle);
 		pq_mq_handle = NULL;
 		return EOF;
 	}
@@ -148,7 +144,7 @@ mq_putmessage(char msgtype, const char *s, size_t len)
 	 * be generated late in the shutdown sequence, after all DSMs have already
 	 * been detached.
 	 */
-	if (pq_mq == NULL)
+	if (pq_mq_handle == NULL)
 		return 0;
 
 	pq_mq_busy = true;
diff --git a/src/backend/libpq/pqsignal.c b/src/backend/libpq/pqsignal.c
index 476e883a68..a24de5d410 100644
--- a/src/backend/libpq/pqsignal.c
+++ b/src/backend/libpq/pqsignal.c
@@ -3,7 +3,7 @@
  * pqsignal.c
  *	  Backend signal(2) support (see also src/port/pqsignal.c)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/main/main.c b/src/backend/main/main.c
index 87b7d3bf65..38853e38eb 100644
--- a/src/backend/main/main.c
+++ b/src/backend/main/main.c
@@ -9,7 +9,7 @@
  * proper FooMain() routine for the incarnation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -61,6 +61,14 @@ main(int argc, char *argv[])
 {
 	bool		do_check_root = true;
 
+	/*
+	 * If supported on the current platform, set up a handler to be called if
+	 * the backend/postmaster crashes with a fatal signal or exception.
+	 */
+#if defined(WIN32) && defined(HAVE_MINIDUMP_TYPE)
+	pgwin32_install_crashdump_handler();
+#endif
+
 	progname = get_progname(argv[0]);
 
 	/*
@@ -81,14 +89,6 @@ main(int argc, char *argv[])
 	 */
 	argv = save_ps_display_args(argc, argv);
 
-	/*
-	 * If supported on the current platform, set up a handler to be called if
-	 * the backend/postmaster crashes with a fatal signal or exception.
-	 */
-#if defined(WIN32) && defined(HAVE_MINIDUMP_TYPE)
-	pgwin32_install_crashdump_handler();
-#endif
-
 	/*
 	 * Fire up essential subsystems: error and memory management
 	 *
diff --git a/src/backend/nodes/bitmapset.c b/src/backend/nodes/bitmapset.c
index bf8545d437..edcd19a4fd 100644
--- a/src/backend/nodes/bitmapset.c
+++ b/src/backend/nodes/bitmapset.c
@@ -11,7 +11,7 @@
  * bms_is_empty() in preference to testing for NULL.)
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/nodes/bitmapset.c
@@ -172,6 +172,50 @@ bms_equal(const Bitmapset *a, const Bitmapset *b)
 	return true;
 }
 
+/*
+ * bms_compare - qsort-style comparator for bitmapsets
+ *
+ * This guarantees to report values as equal iff bms_equal would say they are
+ * equal.  Otherwise, the highest-numbered bit that is set in one value but
+ * not the other determines the result.  (This rule means that, for example,
+ * {6} is greater than {5}, which seems plausible.)
+ */
+int
+bms_compare(const Bitmapset *a, const Bitmapset *b)
+{
+	int			shortlen;
+	int			i;
+
+	/* Handle cases where either input is NULL */
+	if (a == NULL)
+		return bms_is_empty(b) ? 0 : -1;
+	else if (b == NULL)
+		return bms_is_empty(a) ? 0 : +1;
+	/* Handle cases where one input is longer than the other */
+	shortlen = Min(a->nwords, b->nwords);
+	for (i = shortlen; i < a->nwords; i++)
+	{
+		if (a->words[i] != 0)
+			return +1;
+	}
+	for (i = shortlen; i < b->nwords; i++)
+	{
+		if (b->words[i] != 0)
+			return -1;
+	}
+	/* Process words in common */
+	i = shortlen;
+	while (--i >= 0)
+	{
+		bitmapword	aw = a->words[i];
+		bitmapword	bw = b->words[i];
+
+		if (aw != bw)
+			return (aw > bw) ? +1 : -1;
+	}
+	return 0;
+}
+
 /*
  * bms_make_singleton - build a bitmapset containing a single member
  */
@@ -558,8 +602,8 @@ bms_singleton_member(const Bitmapset *a)
  * bms_get_singleton_member
  *
  * Test whether the given set is a singleton.
- * If so, set *member to the value of its sole member, and return TRUE.
- * If not, return FALSE, without changing *member.
+ * If so, set *member to the value of its sole member, and return true.
+ * If not, return false, without changing *member.
  *
  * This is more convenient and faster than calling bms_membership() and then
  * bms_singleton_member(), if we don't care about distinguishing empty sets
@@ -784,6 +828,78 @@ bms_add_members(Bitmapset *a, const Bitmapset *b)
 	return result;
 }
 
+/*
+ * bms_add_range
+ *		Add members in the range of 'lower' to 'upper' to the set.
+ *
+ * Note this could also be done by calling bms_add_member in a loop, however,
+ * using this function will be faster when the range is large as we work at
+ * the bitmapword level rather than at bit level.
+ */
+Bitmapset *
+bms_add_range(Bitmapset *a, int lower, int upper)
+{
+	int			lwordnum,
+				lbitnum,
+				uwordnum,
+				ushiftbits,
+				wordnum;
+
+	if (lower < 0 || upper < 0)
+		elog(ERROR, "negative bitmapset member not allowed");
+	if (lower > upper)
+		elog(ERROR, "lower range must not be above upper range");
+	uwordnum = WORDNUM(upper);
+
+	if (a == NULL)
+	{
+		a = (Bitmapset *) palloc0(BITMAPSET_SIZE(uwordnum + 1));
+		a->nwords = uwordnum + 1;
+	}
+
+	/* ensure we have enough words to store the upper bit */
+	else if (uwordnum >= a->nwords)
+	{
+		int			oldnwords = a->nwords;
+		int			i;
+
+		a = (Bitmapset *) repalloc(a, BITMAPSET_SIZE(uwordnum + 1));
+		a->nwords = uwordnum + 1;
+		/* zero out the enlarged portion */
+		for (i = oldnwords; i < a->nwords; i++)
+			a->words[i] = 0;
+	}
+
+	wordnum = lwordnum = WORDNUM(lower);
+
+	lbitnum = BITNUM(lower);
+	ushiftbits = BITS_PER_BITMAPWORD - (BITNUM(upper) + 1);
+
+	/*
+	 * Special case when lwordnum is the same as uwordnum we must perform the
+	 * upper and lower masking on the word.
+	 */
+	if (lwordnum == uwordnum)
+	{
+		a->words[lwordnum] |= ~(bitmapword) (((bitmapword) 1 << lbitnum) - 1)
+			& (~(bitmapword) 0) >> ushiftbits;
+	}
+	else
+	{
+		/* turn on lbitnum and all bits left of it */
+		a->words[wordnum++] |= ~(bitmapword) (((bitmapword) 1 << lbitnum) - 1);
+
+		/* turn on all bits for any intermediate words */
+		while (wordnum < uwordnum)
+			a->words[wordnum++] = ~(bitmapword) 0;
+
+		/* turn on upper's bit and all bits right of it. */
+		a->words[uwordnum] |= (~(bitmapword) 0) >> ushiftbits;
+	}
+
+	return a;
+}
+
 /*
  * bms_int_members - like bms_intersect, but left input is recycled
  */
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 72041693df..266a3ef8ef 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -11,7 +11,7 @@
  * be handled easily in a simple depth-first traversal.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -97,7 +97,7 @@ _copyPlannedStmt(const PlannedStmt *from)
 	COPY_NODE_FIELD(rowMarks);
 	COPY_NODE_FIELD(relationOids);
 	COPY_NODE_FIELD(invalItems);
-	COPY_SCALAR_FIELD(nParamExec);
+	COPY_NODE_FIELD(paramExecTypes);
 	COPY_NODE_FIELD(utilityStmt);
 	COPY_LOCATION_FIELD(stmt_location);
 	COPY_LOCATION_FIELD(stmt_len);
@@ -204,6 +204,7 @@ _copyModifyTable(const ModifyTable *from)
 	COPY_SCALAR_FIELD(canSetTag);
 	COPY_SCALAR_FIELD(nominalRelation);
 	COPY_NODE_FIELD(partitioned_rels);
+	COPY_SCALAR_FIELD(partColsUpdated);
 	COPY_NODE_FIELD(resultRelations);
 	COPY_SCALAR_FIELD(resultRelIndex);
 	COPY_SCALAR_FIELD(rootResultRelIndex);
@@ -242,6 +243,7 @@ _copyAppend(const Append *from)
 	 */
 	COPY_NODE_FIELD(partitioned_rels);
 	COPY_NODE_FIELD(appendplans);
+	COPY_SCALAR_FIELD(first_partial_plan);
 
 	return newnode;
 }
@@ -361,8 +363,10 @@ _copyGather(const Gather *from)
 	 * copy remainder of node
 	 */
 	COPY_SCALAR_FIELD(num_workers);
+	COPY_SCALAR_FIELD(rescan_param);
 	COPY_SCALAR_FIELD(single_copy);
 	COPY_SCALAR_FIELD(invisible);
+	COPY_BITMAPSET_FIELD(initParam);
 
 	return newnode;
 }
@@ -384,11 +388,13 @@ _copyGatherMerge(const GatherMerge *from)
 	 * copy remainder of node
 	 */
 	COPY_SCALAR_FIELD(num_workers);
+	COPY_SCALAR_FIELD(rescan_param);
 	COPY_SCALAR_FIELD(numCols);
 	COPY_POINTER_FIELD(sortColIdx, from->numCols * sizeof(AttrNumber));
 	COPY_POINTER_FIELD(sortOperators, from->numCols * sizeof(Oid));
 	COPY_POINTER_FIELD(collations, from->numCols * sizeof(Oid));
 	COPY_POINTER_FIELD(nullsFirst, from->numCols * sizeof(bool));
+	COPY_BITMAPSET_FIELD(initParam);
 
 	return newnode;
 }
@@ -1006,6 +1012,11 @@ _copyWindowAgg(const WindowAgg *from)
 	COPY_SCALAR_FIELD(frameOptions);
 	COPY_NODE_FIELD(startOffset);
 	COPY_NODE_FIELD(endOffset);
+	COPY_SCALAR_FIELD(startInRangeFunc);
+	COPY_SCALAR_FIELD(endInRangeFunc);
+	COPY_SCALAR_FIELD(inRangeColl);
+	COPY_SCALAR_FIELD(inRangeAsc);
+	COPY_SCALAR_FIELD(inRangeNullsFirst);
 
 	return newnode;
 }
@@ -1052,6 +1063,7 @@ _copyHash(const Hash *from)
 	COPY_SCALAR_FIELD(skewTable);
 	COPY_SCALAR_FIELD(skewColumn);
 	COPY_SCALAR_FIELD(skewInherit);
+	COPY_SCALAR_FIELD(rows_total);
 
 	return newnode;
 }
@@ -1696,11 +1708,10 @@ _copyArrayCoerceExpr(const ArrayCoerceExpr *from)
 	ArrayCoerceExpr *newnode = makeNode(ArrayCoerceExpr);
 
 	COPY_NODE_FIELD(arg);
-	COPY_SCALAR_FIELD(elemfuncid);
+	COPY_NODE_FIELD(elemexpr);
 	COPY_SCALAR_FIELD(resulttype);
 	COPY_SCALAR_FIELD(resulttypmod);
 	COPY_SCALAR_FIELD(resultcollid);
-	COPY_SCALAR_FIELD(isExplicit);
 	COPY_SCALAR_FIELD(coerceformat);
 	COPY_LOCATION_FIELD(location);
 
@@ -2258,6 +2269,7 @@ _copyPartitionedChildRelInfo(const PartitionedChildRelInfo *from)
 
 	COPY_SCALAR_FIELD(parent_relid);
 	COPY_NODE_FIELD(child_rels);
+	COPY_SCALAR_FIELD(part_cols_updated);
 
 	return newnode;
 }
@@ -2405,6 +2417,11 @@ _copyWindowClause(const WindowClause *from)
 	COPY_SCALAR_FIELD(frameOptions);
 	COPY_NODE_FIELD(startOffset);
 	COPY_NODE_FIELD(endOffset);
+	COPY_SCALAR_FIELD(startInRangeFunc);
+	COPY_SCALAR_FIELD(endInRangeFunc);
+	COPY_SCALAR_FIELD(inRangeColl);
+	COPY_SCALAR_FIELD(inRangeAsc);
+	COPY_SCALAR_FIELD(inRangeNullsFirst);
 	COPY_SCALAR_FIELD(winref);
 	COPY_SCALAR_FIELD(copiedOrder);
 
@@ -2812,6 +2829,7 @@ _copyColumnDef(const ColumnDef *from)
 	COPY_NODE_FIELD(raw_default);
 	COPY_NODE_FIELD(cooked_default);
 	COPY_SCALAR_FIELD(identity);
+	COPY_NODE_FIELD(identitySequence);
 	COPY_NODE_FIELD(collClause);
 	COPY_SCALAR_FIELD(collOid);
 	COPY_NODE_FIELD(constraints);
@@ -3085,6 +3103,7 @@ _copyAlterTableCmd(const AlterTableCmd *from)
 
 	COPY_SCALAR_FIELD(subtype);
 	COPY_STRING_FIELD(name);
+	COPY_SCALAR_FIELD(num);
 	COPY_NODE_FIELD(newowner);
 	COPY_NODE_FIELD(def);
 	COPY_SCALAR_FIELD(behavior);
@@ -3206,6 +3225,17 @@ _copyClosePortalStmt(const ClosePortalStmt *from)
 	return newnode;
 }
 
+static CallStmt *
+_copyCallStmt(const CallStmt *from)
+{
+	CallStmt   *newnode = makeNode(CallStmt);
+
+	COPY_NODE_FIELD(funccall);
+	COPY_NODE_FIELD(funcexpr);
+
+	return newnode;
+}
+
 static ClusterStmt *
 _copyClusterStmt(const ClusterStmt *from)
 {
@@ -3363,6 +3393,7 @@ _copyIndexStmt(const IndexStmt *from)
 
 	COPY_STRING_FIELD(idxname);
 	COPY_NODE_FIELD(relation);
+	COPY_SCALAR_FIELD(relationId);
 	COPY_STRING_FIELD(accessMethod);
 	COPY_STRING_FIELD(tableSpace);
 	COPY_NODE_FIELD(indexParams);
@@ -3403,12 +3434,12 @@ _copyCreateFunctionStmt(const CreateFunctionStmt *from)
 {
 	CreateFunctionStmt *newnode = makeNode(CreateFunctionStmt);
 
+	COPY_SCALAR_FIELD(is_procedure);
 	COPY_SCALAR_FIELD(replace);
 	COPY_NODE_FIELD(funcname);
 	COPY_NODE_FIELD(parameters);
 	COPY_NODE_FIELD(returnType);
 	COPY_NODE_FIELD(options);
-	COPY_NODE_FIELD(withClause);
 
 	return newnode;
 }
@@ -3431,6 +3462,7 @@ _copyAlterFunctionStmt(const AlterFunctionStmt *from)
 {
 	AlterFunctionStmt *newnode = makeNode(AlterFunctionStmt);
 
+	COPY_SCALAR_FIELD(objtype);
 	COPY_NODE_FIELD(func);
 	COPY_NODE_FIELD(actions);
 
@@ -3764,7 +3796,18 @@ _copyVacuumStmt(const VacuumStmt *from)
 	VacuumStmt *newnode = makeNode(VacuumStmt);
 
 	COPY_SCALAR_FIELD(options);
+	COPY_NODE_FIELD(rels);
+
+	return newnode;
+}
+
+static VacuumRelation *
+_copyVacuumRelation(const VacuumRelation *from)
+{
+	VacuumRelation *newnode = makeNode(VacuumRelation);
+
 	COPY_NODE_FIELD(relation);
+	COPY_SCALAR_FIELD(oid);
 	COPY_NODE_FIELD(va_cols);
 
 	return newnode;
@@ -4447,6 +4490,9 @@ _copyPartitionBoundSpec(const PartitionBoundSpec *from)
 	PartitionBoundSpec *newnode = makeNode(PartitionBoundSpec);
 
 	COPY_SCALAR_FIELD(strategy);
+	COPY_SCALAR_FIELD(is_default);
+	COPY_SCALAR_FIELD(modulus);
+	COPY_SCALAR_FIELD(remainder);
 	COPY_NODE_FIELD(listdatums);
 	COPY_NODE_FIELD(lowerdatums);
 	COPY_NODE_FIELD(upperdatums);
@@ -5086,6 +5132,9 @@ copyObjectImpl(const void *from)
 		case T_ClosePortalStmt:
 			retval = _copyClosePortalStmt(from);
 			break;
+		case T_CallStmt:
+			retval = _copyCallStmt(from);
+			break;
 		case T_ClusterStmt:
 			retval = _copyClusterStmt(from);
 			break;
@@ -5212,6 +5261,9 @@ copyObjectImpl(const void *from)
 		case T_VacuumStmt:
 			retval = _copyVacuumStmt(from);
 			break;
+		case T_VacuumRelation:
+			retval = _copyVacuumRelation(from);
+			break;
 		case T_ExplainStmt:
 			retval = _copyExplainStmt(from);
 			break;
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 8d92c03633..bbffc87842 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -18,7 +18,7 @@
  * "x" to be considered equal() to another reference to "x" in the query.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -513,11 +513,10 @@ static bool
 _equalArrayCoerceExpr(const ArrayCoerceExpr *a, const ArrayCoerceExpr *b)
 {
 	COMPARE_NODE_FIELD(arg);
-	COMPARE_SCALAR_FIELD(elemfuncid);
+	COMPARE_NODE_FIELD(elemexpr);
 	COMPARE_SCALAR_FIELD(resulttype);
 	COMPARE_SCALAR_FIELD(resulttypmod);
 	COMPARE_SCALAR_FIELD(resultcollid);
-	COMPARE_SCALAR_FIELD(isExplicit);
 	COMPARE_COERCIONFORM_FIELD(coerceformat);
 	COMPARE_LOCATION_FIELD(location);
 
@@ -909,6 +908,7 @@ _equalPartitionedChildRelInfo(const PartitionedChildRelInfo *a, const Partitione
 {
 	COMPARE_SCALAR_FIELD(parent_relid);
 	COMPARE_NODE_FIELD(child_rels);
+	COMPARE_SCALAR_FIELD(part_cols_updated);
 
 	return true;
 }
@@ -1098,6 +1098,7 @@ _equalAlterTableCmd(const AlterTableCmd *a, const AlterTableCmd *b)
 {
 	COMPARE_SCALAR_FIELD(subtype);
 	COMPARE_STRING_FIELD(name);
+	COMPARE_SCALAR_FIELD(num);
 	COMPARE_NODE_FIELD(newowner);
 	COMPARE_NODE_FIELD(def);
 	COMPARE_SCALAR_FIELD(behavior);
@@ -1201,6 +1202,15 @@ _equalClosePortalStmt(const ClosePortalStmt *a, const ClosePortalStmt *b)
 	return true;
 }
 
+static bool
+_equalCallStmt(const CallStmt *a, const CallStmt *b)
+{
+	COMPARE_NODE_FIELD(funccall);
+	COMPARE_NODE_FIELD(funcexpr);
+
+	return true;
+}
+
 static bool
 _equalClusterStmt(const ClusterStmt *a, const ClusterStmt *b)
 {
@@ -1324,6 +1334,7 @@ _equalIndexStmt(const IndexStmt *a, const IndexStmt *b)
 {
 	COMPARE_STRING_FIELD(idxname);
 	COMPARE_NODE_FIELD(relation);
+	COMPARE_SCALAR_FIELD(relationId);
 	COMPARE_STRING_FIELD(accessMethod);
 	COMPARE_STRING_FIELD(tableSpace);
 	COMPARE_NODE_FIELD(indexParams);
@@ -1360,12 +1371,12 @@ _equalCreateStatsStmt(const CreateStatsStmt *a, const CreateStatsStmt *b)
 static bool
 _equalCreateFunctionStmt(const CreateFunctionStmt *a, const CreateFunctionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(is_procedure);
 	COMPARE_SCALAR_FIELD(replace);
 	COMPARE_NODE_FIELD(funcname);
 	COMPARE_NODE_FIELD(parameters);
 	COMPARE_NODE_FIELD(returnType);
 	COMPARE_NODE_FIELD(options);
-	COMPARE_NODE_FIELD(withClause);
 
 	return true;
 }
@@ -1384,6 +1395,7 @@ _equalFunctionParameter(const FunctionParameter *a, const FunctionParameter *b)
 static bool
 _equalAlterFunctionStmt(const AlterFunctionStmt *a, const AlterFunctionStmt *b)
 {
+	COMPARE_SCALAR_FIELD(objtype);
 	COMPARE_NODE_FIELD(func);
 	COMPARE_NODE_FIELD(actions);
 
@@ -1663,7 +1675,16 @@ static bool
 _equalVacuumStmt(const VacuumStmt *a, const VacuumStmt *b)
 {
 	COMPARE_SCALAR_FIELD(options);
+	COMPARE_NODE_FIELD(rels);
+
+	return true;
+}
+
+static bool
+_equalVacuumRelation(const VacuumRelation *a, const VacuumRelation *b)
+{
 	COMPARE_NODE_FIELD(relation);
+	COMPARE_SCALAR_FIELD(oid);
 	COMPARE_NODE_FIELD(va_cols);
 
 	return true;
@@ -2544,6 +2565,7 @@ _equalColumnDef(const ColumnDef *a, const ColumnDef *b)
 	COMPARE_NODE_FIELD(raw_default);
 	COMPARE_NODE_FIELD(cooked_default);
 	COMPARE_SCALAR_FIELD(identity);
+	COMPARE_NODE_FIELD(identitySequence);
 	COMPARE_NODE_FIELD(collClause);
 	COMPARE_SCALAR_FIELD(collOid);
 	COMPARE_NODE_FIELD(constraints);
@@ -2714,6 +2736,11 @@ _equalWindowClause(const WindowClause *a, const WindowClause *b)
 	COMPARE_SCALAR_FIELD(frameOptions);
 	COMPARE_NODE_FIELD(startOffset);
 	COMPARE_NODE_FIELD(endOffset);
+	COMPARE_SCALAR_FIELD(startInRangeFunc);
+	COMPARE_SCALAR_FIELD(endInRangeFunc);
+	COMPARE_SCALAR_FIELD(inRangeColl);
+	COMPARE_SCALAR_FIELD(inRangeAsc);
+	COMPARE_SCALAR_FIELD(inRangeNullsFirst);
 	COMPARE_SCALAR_FIELD(winref);
 	COMPARE_SCALAR_FIELD(copiedOrder);
 
@@ -2838,6 +2865,9 @@ static bool
 _equalPartitionBoundSpec(const PartitionBoundSpec *a, const PartitionBoundSpec *b)
 {
 	COMPARE_SCALAR_FIELD(strategy);
+	COMPARE_SCALAR_FIELD(is_default);
+	COMPARE_SCALAR_FIELD(modulus);
+	COMPARE_SCALAR_FIELD(remainder);
 	COMPARE_NODE_FIELD(listdatums);
 	COMPARE_NODE_FIELD(lowerdatums);
 	COMPARE_NODE_FIELD(upperdatums);
@@ -3234,6 +3264,9 @@ equal(const void *a, const void *b)
 		case T_ClosePortalStmt:
 			retval = _equalClosePortalStmt(a, b);
 			break;
+		case T_CallStmt:
+			retval = _equalCallStmt(a, b);
+			break;
 		case T_ClusterStmt:
 			retval = _equalClusterStmt(a, b);
 			break;
@@ -3360,6 +3393,9 @@ equal(const void *a, const void *b)
 		case T_VacuumStmt:
 			retval = _equalVacuumStmt(a, b);
 			break;
+		case T_VacuumRelation:
+			retval = _equalVacuumRelation(a, b);
+			break;
 		case T_ExplainStmt:
 			retval = _equalExplainStmt(a, b);
 			break;
diff --git a/src/backend/nodes/extensible.c b/src/backend/nodes/extensible.c
index 01cd3c84fb..f301c11fa9 100644
--- a/src/backend/nodes/extensible.c
+++ b/src/backend/nodes/extensible.c
@@ -10,7 +10,7 @@
  * and GetExtensibleNodeMethods to get information about a previously
  * registered type of extensible node.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/nodes/list.c b/src/backend/nodes/list.c
index acaf4b5315..f3e1800708 100644
--- a/src/backend/nodes/list.c
+++ b/src/backend/nodes/list.c
@@ -4,7 +4,7 @@
  *	  implementation for PostgreSQL generic linked list package
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1249,6 +1249,68 @@ list_copy_tail(const List *oldlist, int nskip)
 	return newlist;
 }
 
+/*
+ * Sort a list as though by qsort.
+ *
+ * A new list is built and returned.  Like list_copy, this doesn't make
+ * fresh copies of any pointed-to data.
+ *
+ * The comparator function receives arguments of type ListCell **.
+ */
+List *
+list_qsort(const List *list, list_qsort_comparator cmp)
+{
+	int			len = list_length(list);
+	ListCell  **list_arr;
+	List	   *newlist;
+	ListCell   *newlist_prev;
+	ListCell   *cell;
+	int			i;
+
+	/* Empty list is easy */
+	if (len == 0)
+		return NIL;
+
+	/* Flatten list cells into an array, so we can use qsort */
+	list_arr = (ListCell **) palloc(sizeof(ListCell *) * len);
+	i = 0;
+	foreach(cell, list)
+		list_arr[i++] = cell;
+
+	qsort(list_arr, len, sizeof(ListCell *), cmp);
+
+	/* Construct new list (this code is much like list_copy) */
+	newlist = new_list(list->type);
+	newlist->length = len;
+
+	/*
+	 * Copy over the data in the first cell; new_list() has already allocated
+	 * the head cell itself
+	 */
+	newlist->head->data = list_arr[0]->data;
+
+	newlist_prev = newlist->head;
+	for (i = 1; i < len; i++)
+	{
+		ListCell   *newlist_cur;
+
+		newlist_cur = (ListCell *) palloc(sizeof(*newlist_cur));
+		newlist_cur->data = list_arr[i]->data;
+		newlist_prev->next = newlist_cur;
+
+		newlist_prev = newlist_cur;
+	}
+
+	newlist_prev->next = NULL;
+	newlist->tail = newlist_prev;
+
+	/* Might as well free the workspace array */
+	pfree(list_arr);
+
+	check_list_invariants(newlist);
+	return newlist;
+}
+
 /*
  * Temporary compatibility functions
  *
diff --git a/src/backend/nodes/makefuncs.c b/src/backend/nodes/makefuncs.c
index 0755039da9..1bd2599c2c 100644
--- a/src/backend/nodes/makefuncs.c
+++ b/src/backend/nodes/makefuncs.c
@@ -4,7 +4,7 @@
  *	  creator functions for primitive nodes. The functions here are for
  *	  the most frequently created nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -120,8 +120,10 @@ makeVarFromTargetEntry(Index varno,
  * table entry, and varattno == 0 to signal that it references the whole
  * tuple.  (Use of zero here is unclean, since it could easily be confused
  * with error cases, but it's not worth changing now.)  The vartype indicates
- * a rowtype; either a named composite type, or RECORD.  This function
- * encapsulates the logic for determining the correct rowtype OID to use.
+ * a rowtype; either a named composite type, or a domain over a named
+ * composite type (only possible if the RTE is a function returning that),
+ * or RECORD.  This function encapsulates the logic for determining the
+ * correct rowtype OID to use.
  *
  * If allowScalar is true, then for the case where the RTE is a single function
  * returning a non-composite result type, we produce a normal Var referencing
@@ -611,3 +613,18 @@ makeGroupingSet(GroupingSetKind kind, List *content, int location)
 	n->location = location;
 	return n;
 }
+
+/*
+ * makeVacuumRelation -
+ *	  create a VacuumRelation node
+ */
+VacuumRelation *
+makeVacuumRelation(RangeVar *relation, Oid oid, List *va_cols)
+{
+	VacuumRelation *v = makeNode(VacuumRelation);
+
+	v->relation = relation;
+	v->oid = oid;
+	v->va_cols = va_cols;
+	return v;
+}
diff --git a/src/backend/nodes/nodeFuncs.c b/src/backend/nodes/nodeFuncs.c
index e3eb0c5788..6c76c41ebe 100644
--- a/src/backend/nodes/nodeFuncs.c
+++ b/src/backend/nodes/nodeFuncs.c
@@ -3,7 +3,7 @@
  * nodeFuncs.c
  *		Various general-purpose manipulations of Node trees
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -663,7 +663,7 @@ strip_implicit_coercions(Node *node)
  *	  Test whether an expression returns a set result.
  *
  * Because we use expression_tree_walker(), this can also be applied to
- * whole targetlists; it'll produce TRUE if any one of the tlist items
+ * whole targetlists; it'll produce true if any one of the tlist items
  * returns a set.
  */
 bool
@@ -1632,9 +1632,9 @@ set_sa_opfuncid(ScalarArrayOpExpr *opexpr)
  *	check_functions_in_node -
  *	  apply checker() to each function OID contained in given expression node
  *
- * Returns TRUE if the checker() function does; for nodes representing more
- * than one function call, returns TRUE if the checker() function does so
- * for any of those functions.  Returns FALSE if node does not invoke any
+ * Returns true if the checker() function does; for nodes representing more
+ * than one function call, returns true if the checker() function does so
+ * for any of those functions.  Returns false if node does not invoke any
  * SQL-visible function.  Caller must not pass node == NULL.
  *
  * This function examines only the given node; it does not recurse into any
@@ -1717,15 +1717,6 @@ check_functions_in_node(Node *node, check_function_callback checker,
 					return true;
 			}
 			break;
-		case T_ArrayCoerceExpr:
-			{
-				ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
-
-				if (OidIsValid(expr->elemfuncid) &&
-					checker(expr->elemfuncid, context))
-					return true;
-			}
-			break;
 		case T_RowCompareExpr:
 			{
 				RowCompareExpr *rcexpr = (RowCompareExpr *) node;
@@ -2023,7 +2014,15 @@ expression_tree_walker(Node *node,
 		case T_CoerceViaIO:
 			return walker(((CoerceViaIO *) node)->arg, context);
 		case T_ArrayCoerceExpr:
-			return walker(((ArrayCoerceExpr *) node)->arg, context);
+			{
+				ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) node;
+
+				if (walker(acoerce->arg, context))
+					return true;
+				if (walker(acoerce->elemexpr, context))
+					return true;
+			}
+			break;
 		case T_ConvertRowtypeExpr:
 			return walker(((ConvertRowtypeExpr *) node)->arg, context);
 		case T_CollateExpr:
@@ -2705,6 +2704,7 @@ expression_tree_mutator(Node *node,
 
 				FLATCOPY(newnode, acoerce, ArrayCoerceExpr);
 				MUTATE(newnode->arg, acoerce->arg, Expr *);
+				MUTATE(newnode->elemexpr, acoerce->elemexpr, Expr *);
 				return (Node *) newnode;
 			}
 			break;
diff --git a/src/backend/nodes/nodes.c b/src/backend/nodes/nodes.c
index d3345aae6d..f5ede390e0 100644
--- a/src/backend/nodes/nodes.c
+++ b/src/backend/nodes/nodes.c
@@ -4,7 +4,7 @@
  *	  support code for nodes (now that we have removed the home-brew
  *	  inheritance system, our support code for nodes is much simpler)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 5ce3c7c599..011d2a3fa9 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -3,7 +3,7 @@
  * outfuncs.c
  *	  Output functions for Postgres tree nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -54,6 +54,11 @@ static void outChar(StringInfo str, char c);
 #define WRITE_UINT_FIELD(fldname) \
 	appendStringInfo(str, " :" CppAsString(fldname) " %u", node->fldname)
 
+/* Write an unsigned integer field (anything written with UINT64_FORMAT) */
+#define WRITE_UINT64_FIELD(fldname) \
+	appendStringInfo(str, " :" CppAsString(fldname) " " UINT64_FORMAT, \
+					 node->fldname)
+
 /* Write an OID field (don't hard-wire assumption that OID is same as uint) */
 #define WRITE_OID_FIELD(fldname) \
 	appendStringInfo(str, " :" CppAsString(fldname) " %u", node->fldname)
@@ -260,7 +265,7 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_TYPE("PLANNEDSTMT");
 
 	WRITE_ENUM_FIELD(commandType, CmdType);
-	WRITE_UINT_FIELD(queryId);
+	WRITE_UINT64_FIELD(queryId);
 	WRITE_BOOL_FIELD(hasReturning);
 	WRITE_BOOL_FIELD(hasModifyingCTE);
 	WRITE_BOOL_FIELD(canSetTag);
@@ -277,7 +282,7 @@ _outPlannedStmt(StringInfo str, const PlannedStmt *node)
 	WRITE_NODE_FIELD(rowMarks);
 	WRITE_NODE_FIELD(relationOids);
 	WRITE_NODE_FIELD(invalItems);
-	WRITE_INT_FIELD(nParamExec);
+	WRITE_NODE_FIELD(paramExecTypes);
 	WRITE_NODE_FIELD(utilityStmt);
 	WRITE_LOCATION_FIELD(stmt_location);
 	WRITE_LOCATION_FIELD(stmt_len);
@@ -367,6 +372,7 @@ _outModifyTable(StringInfo str, const ModifyTable *node)
 	WRITE_BOOL_FIELD(canSetTag);
 	WRITE_UINT_FIELD(nominalRelation);
 	WRITE_NODE_FIELD(partitioned_rels);
+	WRITE_BOOL_FIELD(partColsUpdated);
 	WRITE_NODE_FIELD(resultRelations);
 	WRITE_INT_FIELD(resultRelIndex);
 	WRITE_INT_FIELD(rootResultRelIndex);
@@ -394,6 +400,7 @@ _outAppend(StringInfo str, const Append *node)
 
 	WRITE_NODE_FIELD(partitioned_rels);
 	WRITE_NODE_FIELD(appendplans);
+	WRITE_INT_FIELD(first_partial_plan);
 }
 
 static void
@@ -479,8 +486,10 @@ _outGather(StringInfo str, const Gather *node)
 	_outPlanInfo(str, (const Plan *) node);
 
 	WRITE_INT_FIELD(num_workers);
+	WRITE_INT_FIELD(rescan_param);
 	WRITE_BOOL_FIELD(single_copy);
 	WRITE_BOOL_FIELD(invisible);
+	WRITE_BITMAPSET_FIELD(initParam);
 }
 
 static void
@@ -493,6 +502,7 @@ _outGatherMerge(StringInfo str, const GatherMerge *node)
 	_outPlanInfo(str, (const Plan *) node);
 
 	WRITE_INT_FIELD(num_workers);
+	WRITE_INT_FIELD(rescan_param);
 	WRITE_INT_FIELD(numCols);
 
 	appendStringInfoString(str, " :sortColIdx");
@@ -510,6 +520,8 @@ _outGatherMerge(StringInfo str, const GatherMerge *node)
 	appendStringInfoString(str, " :nullsFirst");
 	for (i = 0; i < node->numCols; i++)
 		appendStringInfo(str, " %s", booltostr(node->nullsFirst[i]));
+
+	WRITE_BITMAPSET_FIELD(initParam);
 }
 
 static void
@@ -828,6 +840,11 @@ _outWindowAgg(StringInfo str, const WindowAgg *node)
 	WRITE_INT_FIELD(frameOptions);
 	WRITE_NODE_FIELD(startOffset);
 	WRITE_NODE_FIELD(endOffset);
+	WRITE_OID_FIELD(startInRangeFunc);
+	WRITE_OID_FIELD(endInRangeFunc);
+	WRITE_OID_FIELD(inRangeColl);
+	WRITE_BOOL_FIELD(inRangeAsc);
+	WRITE_BOOL_FIELD(inRangeNullsFirst);
 }
 
 static void
@@ -916,6 +933,7 @@ _outHash(StringInfo str, const Hash *node)
 	WRITE_OID_FIELD(skewTable);
 	WRITE_INT_FIELD(skewColumn);
 	WRITE_BOOL_FIELD(skewInherit);
+	WRITE_FLOAT_FIELD(rows_total, "%.0f");
 }
 
 static void
@@ -1392,11 +1410,10 @@ _outArrayCoerceExpr(StringInfo str, const ArrayCoerceExpr *node)
 	WRITE_NODE_TYPE("ARRAYCOERCEEXPR");
 
 	WRITE_NODE_FIELD(arg);
-	WRITE_OID_FIELD(elemfuncid);
+	WRITE_NODE_FIELD(elemexpr);
 	WRITE_OID_FIELD(resulttype);
 	WRITE_INT_FIELD(resulttypmod);
 	WRITE_OID_FIELD(resultcollid);
-	WRITE_BOOL_FIELD(isExplicit);
 	WRITE_ENUM_FIELD(coerceformat, CoercionForm);
 	WRITE_LOCATION_FIELD(location);
 }
@@ -2094,6 +2111,7 @@ _outModifyTablePath(StringInfo str, const ModifyTablePath *node)
 	WRITE_BOOL_FIELD(canSetTag);
 	WRITE_UINT_FIELD(nominalRelation);
 	WRITE_NODE_FIELD(partitioned_rels);
+	WRITE_BOOL_FIELD(partColsUpdated);
 	WRITE_NODE_FIELD(resultRelations);
 	WRITE_NODE_FIELD(subpaths);
 	WRITE_NODE_FIELD(subroots);
@@ -2175,7 +2193,7 @@ _outPlannerGlobal(StringInfo str, const PlannerGlobal *node)
 	WRITE_NODE_FIELD(rootResultRelations);
 	WRITE_NODE_FIELD(relationOids);
 	WRITE_NODE_FIELD(invalItems);
-	WRITE_INT_FIELD(nParamExec);
+	WRITE_NODE_FIELD(paramExecTypes);
 	WRITE_UINT_FIELD(lastPHId);
 	WRITE_UINT_FIELD(lastRowMarkId);
 	WRITE_INT_FIELD(lastPlanNodeId);
@@ -2516,6 +2534,7 @@ _outPartitionedChildRelInfo(StringInfo str, const PartitionedChildRelInfo *node)
 
 	WRITE_UINT_FIELD(parent_relid);
 	WRITE_NODE_FIELD(child_rels);
+	WRITE_BOOL_FIELD(part_cols_updated);
 }
 
 static void
@@ -2639,6 +2658,7 @@ _outIndexStmt(StringInfo str, const IndexStmt *node)
 
 	WRITE_STRING_FIELD(idxname);
 	WRITE_NODE_FIELD(relation);
+	WRITE_OID_FIELD(relationId);
 	WRITE_STRING_FIELD(accessMethod);
 	WRITE_STRING_FIELD(tableSpace);
 	WRITE_NODE_FIELD(indexParams);
@@ -2799,6 +2819,7 @@ _outColumnDef(StringInfo str, const ColumnDef *node)
 	WRITE_NODE_FIELD(raw_default);
 	WRITE_NODE_FIELD(cooked_default);
 	WRITE_CHAR_FIELD(identity);
+	WRITE_NODE_FIELD(identitySequence);
 	WRITE_NODE_FIELD(collClause);
 	WRITE_OID_FIELD(collOid);
 	WRITE_NODE_FIELD(constraints);
@@ -2969,6 +2990,11 @@ _outWindowClause(StringInfo str, const WindowClause *node)
 	WRITE_INT_FIELD(frameOptions);
 	WRITE_NODE_FIELD(startOffset);
 	WRITE_NODE_FIELD(endOffset);
+	WRITE_OID_FIELD(startInRangeFunc);
+	WRITE_OID_FIELD(endInRangeFunc);
+	WRITE_OID_FIELD(inRangeColl);
+	WRITE_BOOL_FIELD(inRangeAsc);
+	WRITE_BOOL_FIELD(inRangeNullsFirst);
 	WRITE_UINT_FIELD(winref);
 	WRITE_BOOL_FIELD(copiedOrder);
 }
@@ -3571,6 +3597,9 @@ _outPartitionBoundSpec(StringInfo str, const PartitionBoundSpec *node)
 	WRITE_NODE_TYPE("PARTITIONBOUNDSPEC");
 
 	WRITE_CHAR_FIELD(strategy);
+	WRITE_BOOL_FIELD(is_default);
+	WRITE_INT_FIELD(modulus);
+	WRITE_INT_FIELD(remainder);
 	WRITE_NODE_FIELD(listdatums);
 	WRITE_NODE_FIELD(lowerdatums);
 	WRITE_NODE_FIELD(upperdatums);
diff --git a/src/backend/nodes/params.c b/src/backend/nodes/params.c
index 110732081b..79197b18b4 100644
--- a/src/backend/nodes/params.c
+++ b/src/backend/nodes/params.c
@@ -4,7 +4,7 @@
  *	  Support for finding the values associated with Param nodes.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -48,32 +48,25 @@ copyParamList(ParamListInfo from)
 	retval = (ParamListInfo) palloc(size);
 	retval->paramFetch = NULL;
 	retval->paramFetchArg = NULL;
+	retval->paramCompile = NULL;
+	retval->paramCompileArg = NULL;
 	retval->parserSetup = NULL;
 	retval->parserSetupArg = NULL;
 	retval->numParams = from->numParams;
-	retval->paramMask = NULL;
 
 	for (i = 0; i < from->numParams; i++)
 	{
-		ParamExternData *oprm = &from->params[i];
+		ParamExternData *oprm;
 		ParamExternData *nprm = &retval->params[i];
+		ParamExternData prmdata;
 		int16		typLen;
 		bool		typByVal;
 
-		/* Ignore parameters we don't need, to save cycles and space. */
-		if (from->paramMask != NULL &&
-			!bms_is_member(i, from->paramMask))
-		{
-			nprm->value = (Datum) 0;
-			nprm->isnull = true;
-			nprm->pflags = 0;
-			nprm->ptype = InvalidOid;
-			continue;
-		}
-
 		/* give hook a chance in case parameter is dynamic */
-		if (!OidIsValid(oprm->ptype) && from->paramFetch != NULL)
-			(*from->paramFetch) (from, i + 1);
+		if (from->paramFetch != NULL)
+			oprm = from->paramFetch(from, i + 1, false, &prmdata);
+		else
+			oprm = &from->params[i];
 
 		/* flat-copy the parameter info */
 		*nprm = *oprm;
@@ -102,22 +95,19 @@ EstimateParamListSpace(ParamListInfo paramLI)
 
 	for (i = 0; i < paramLI->numParams; i++)
 	{
-		ParamExternData *prm = &paramLI->params[i];
+		ParamExternData *prm;
+		ParamExternData prmdata;
 		Oid			typeOid;
 		int16		typLen;
 		bool		typByVal;
 
-		/* Ignore parameters we don't need, to save cycles and space. */
-		if (paramLI->paramMask != NULL &&
-			!bms_is_member(i, paramLI->paramMask))
-			typeOid = InvalidOid;
+		/* give hook a chance in case parameter is dynamic */
+		if (paramLI->paramFetch != NULL)
+			prm = paramLI->paramFetch(paramLI, i + 1, false, &prmdata);
 		else
-		{
-			/* give hook a chance in case parameter is dynamic */
-			if (!OidIsValid(prm->ptype) && paramLI->paramFetch != NULL)
-				(*paramLI->paramFetch) (paramLI, i + 1);
-			typeOid = prm->ptype;
-		}
+			prm = &paramLI->params[i];
+
+		typeOid = prm->ptype;
 
 		sz = add_size(sz, sizeof(Oid)); /* space for type OID */
 		sz = add_size(sz, sizeof(uint16));	/* space for pflags */
@@ -171,22 +161,19 @@ SerializeParamList(ParamListInfo paramLI, char **start_address)
 	/* Write each parameter in turn. */
 	for (i = 0; i < nparams; i++)
 	{
-		ParamExternData *prm = &paramLI->params[i];
+		ParamExternData *prm;
+		ParamExternData prmdata;
 		Oid			typeOid;
 		int16		typLen;
 		bool		typByVal;
 
-		/* Ignore parameters we don't need, to save cycles and space. */
-		if (paramLI->paramMask != NULL &&
-			!bms_is_member(i, paramLI->paramMask))
-			typeOid = InvalidOid;
+		/* give hook a chance in case parameter is dynamic */
+		if (paramLI->paramFetch != NULL)
+			prm = paramLI->paramFetch(paramLI, i + 1, false, &prmdata);
 		else
-		{
-			/* give hook a chance in case parameter is dynamic */
-			if (!OidIsValid(prm->ptype) && paramLI->paramFetch != NULL)
-				(*paramLI->paramFetch) (paramLI, i + 1);
-			typeOid = prm->ptype;
-		}
+			prm = &paramLI->params[i];
+
+		typeOid = prm->ptype;
 
 		/* Write type OID. */
 		memcpy(*start_address, &typeOid, sizeof(Oid));
@@ -237,10 +224,11 @@ RestoreParamList(char **start_address)
 	paramLI = (ParamListInfo) palloc(size);
 	paramLI->paramFetch = NULL;
 	paramLI->paramFetchArg = NULL;
+	paramLI->paramCompile = NULL;
+	paramLI->paramCompileArg = NULL;
 	paramLI->parserSetup = NULL;
 	paramLI->parserSetupArg = NULL;
 	paramLI->numParams = nparams;
-	paramLI->paramMask = NULL;
 
 	for (i = 0; i < nparams; i++)
 	{
diff --git a/src/backend/nodes/print.c b/src/backend/nodes/print.c
index 380e8b71f2..b9bad5eacc 100644
--- a/src/backend/nodes/print.c
+++ b/src/backend/nodes/print.c
@@ -3,7 +3,7 @@
  * print.c
  *	  various print routines (used mostly for debugging)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/nodes/read.c b/src/backend/nodes/read.c
index b56f28e15f..76414029d8 100644
--- a/src/backend/nodes/read.c
+++ b/src/backend/nodes/read.c
@@ -4,7 +4,7 @@
  *	  routines to convert a string (legal ascii representation of node) back
  *	  to nodes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 86c811de49..068db353d7 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -3,7 +3,7 @@
  * readfuncs.c
  *	  Reader functions for Postgres tree nodes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -33,6 +33,7 @@
 #include "nodes/parsenodes.h"
 #include "nodes/plannodes.h"
 #include "nodes/readfuncs.h"
+#include "utils/builtins.h"
 
 
 /*
@@ -70,6 +71,12 @@
 	token = pg_strtok(&length);		/* get field value */ \
 	local_node->fldname = atoui(token)
 
+/* Read an unsigned integer field (anything written using UINT64_FORMAT) */
+#define READ_UINT64_FIELD(fldname) \
+	token = pg_strtok(&length);		/* skip :fldname */ \
+	token = pg_strtok(&length);		/* get field value */ \
+	local_node->fldname = pg_strtouint64(token, NULL, 10)
+
 /* Read an long integer field (anything written as ":fldname %ld") */
 #define READ_LONG_FIELD(fldname) \
 	token = pg_strtok(&length);		/* skip :fldname */ \
@@ -231,7 +238,7 @@ _readQuery(void)
 
 	READ_ENUM_FIELD(commandType, CmdType);
 	READ_ENUM_FIELD(querySource, QuerySource);
-	local_node->queryId = 0;	/* not saved in output format */
+	local_node->queryId = UINT64CONST(0);	/* not saved in output format */
 	READ_BOOL_FIELD(canSetTag);
 	READ_NODE_FIELD(utilityStmt);
 	READ_INT_FIELD(resultRelation);
@@ -362,6 +369,11 @@ _readWindowClause(void)
 	READ_INT_FIELD(frameOptions);
 	READ_NODE_FIELD(startOffset);
 	READ_NODE_FIELD(endOffset);
+	READ_OID_FIELD(startInRangeFunc);
+	READ_OID_FIELD(endInRangeFunc);
+	READ_OID_FIELD(inRangeColl);
+	READ_BOOL_FIELD(inRangeAsc);
+	READ_BOOL_FIELD(inRangeNullsFirst);
 	READ_UINT_FIELD(winref);
 	READ_BOOL_FIELD(copiedOrder);
 
@@ -892,11 +904,10 @@ _readArrayCoerceExpr(void)
 	READ_LOCALS(ArrayCoerceExpr);
 
 	READ_NODE_FIELD(arg);
-	READ_OID_FIELD(elemfuncid);
+	READ_NODE_FIELD(elemexpr);
 	READ_OID_FIELD(resulttype);
 	READ_INT_FIELD(resulttypmod);
 	READ_OID_FIELD(resultcollid);
-	READ_BOOL_FIELD(isExplicit);
 	READ_ENUM_FIELD(coerceformat, CoercionForm);
 	READ_LOCATION_FIELD(location);
 
@@ -1457,7 +1468,7 @@ _readPlannedStmt(void)
 	READ_LOCALS(PlannedStmt);
 
 	READ_ENUM_FIELD(commandType, CmdType);
-	READ_UINT_FIELD(queryId);
+	READ_UINT64_FIELD(queryId);
 	READ_BOOL_FIELD(hasReturning);
 	READ_BOOL_FIELD(hasModifyingCTE);
 	READ_BOOL_FIELD(canSetTag);
@@ -1474,7 +1485,7 @@ _readPlannedStmt(void)
 	READ_NODE_FIELD(rowMarks);
 	READ_NODE_FIELD(relationOids);
 	READ_NODE_FIELD(invalItems);
-	READ_INT_FIELD(nParamExec);
+	READ_NODE_FIELD(paramExecTypes);
 	READ_NODE_FIELD(utilityStmt);
 	READ_LOCATION_FIELD(stmt_location);
 	READ_LOCATION_FIELD(stmt_len);
@@ -1562,6 +1573,7 @@ _readModifyTable(void)
 	READ_BOOL_FIELD(canSetTag);
 	READ_UINT_FIELD(nominalRelation);
 	READ_NODE_FIELD(partitioned_rels);
+	READ_BOOL_FIELD(partColsUpdated);
 	READ_NODE_FIELD(resultRelations);
 	READ_INT_FIELD(resultRelIndex);
 	READ_INT_FIELD(rootResultRelIndex);
@@ -1594,6 +1606,7 @@ _readAppend(void)
 
 	READ_NODE_FIELD(partitioned_rels);
 	READ_NODE_FIELD(appendplans);
+	READ_INT_FIELD(first_partial_plan);
 
 	READ_DONE();
 }
@@ -2131,6 +2144,11 @@ _readWindowAgg(void)
 	READ_INT_FIELD(frameOptions);
 	READ_NODE_FIELD(startOffset);
 	READ_NODE_FIELD(endOffset);
+	READ_OID_FIELD(startInRangeFunc);
+	READ_OID_FIELD(endInRangeFunc);
+	READ_OID_FIELD(inRangeColl);
+	READ_BOOL_FIELD(inRangeAsc);
+	READ_BOOL_FIELD(inRangeNullsFirst);
 
 	READ_DONE();
 }
@@ -2163,8 +2181,10 @@ _readGather(void)
 	ReadCommonPlan(&local_node->plan);
 
 	READ_INT_FIELD(num_workers);
+	READ_INT_FIELD(rescan_param);
 	READ_BOOL_FIELD(single_copy);
 	READ_BOOL_FIELD(invisible);
+	READ_BITMAPSET_FIELD(initParam);
 
 	READ_DONE();
 }
@@ -2180,11 +2200,13 @@ _readGatherMerge(void)
 	ReadCommonPlan(&local_node->plan);
 
 	READ_INT_FIELD(num_workers);
+	READ_INT_FIELD(rescan_param);
 	READ_INT_FIELD(numCols);
 	READ_ATTRNUMBER_ARRAY(sortColIdx, local_node->numCols);
 	READ_OID_ARRAY(sortOperators, local_node->numCols);
 	READ_OID_ARRAY(collations, local_node->numCols);
 	READ_BOOL_ARRAY(nullsFirst, local_node->numCols);
+	READ_BITMAPSET_FIELD(initParam);
 
 	READ_DONE();
 }
@@ -2202,6 +2224,7 @@ _readHash(void)
 	READ_OID_FIELD(skewTable);
 	READ_INT_FIELD(skewColumn);
 	READ_BOOL_FIELD(skewInherit);
+	READ_FLOAT_FIELD(rows_total);
 
 	READ_DONE();
 }
@@ -2388,6 +2411,9 @@ _readPartitionBoundSpec(void)
 	READ_LOCALS(PartitionBoundSpec);
 
 	READ_CHAR_FIELD(strategy);
+	READ_BOOL_FIELD(is_default);
+	READ_INT_FIELD(modulus);
+	READ_INT_FIELD(remainder);
 	READ_NODE_FIELD(listdatums);
 	READ_NODE_FIELD(lowerdatums);
 	READ_NODE_FIELD(upperdatums);
diff --git a/src/backend/nodes/tidbitmap.c b/src/backend/nodes/tidbitmap.c
index c4e53adb0c..17dc53898f 100644
--- a/src/backend/nodes/tidbitmap.c
+++ b/src/backend/nodes/tidbitmap.c
@@ -29,7 +29,7 @@
  * and a non-lossy page.
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/nodes/tidbitmap.c
@@ -45,6 +45,7 @@
 #include "nodes/tidbitmap.h"
 #include "storage/lwlock.h"
 #include "utils/dsa.h"
+#include "utils/hashutils.h"
 
 /*
  * The maximum number of tuples per page is not large (typically 256 with
@@ -237,30 +238,13 @@ static int	tbm_comparator(const void *left, const void *right);
 static int tbm_shared_comparator(const void *left, const void *right,
 					  void *arg);
 
-/*
- * Simple inline murmur hash implementation for the exact width required, for
- * performance.
- */
-static inline uint32
-hash_blockno(BlockNumber b)
-{
-	uint32		h = b;
-
-	h ^= h >> 16;
-	h *= 0x85ebca6b;
-	h ^= h >> 13;
-	h *= 0xc2b2ae35;
-	h ^= h >> 16;
-	return h;
-}
-
 /* define hashtable mapping block numbers to PagetableEntry's */
 #define SH_USE_NONDEFAULT_ALLOCATOR
 #define SH_PREFIX pagetable
 #define SH_ELEMENT_TYPE PagetableEntry
 #define SH_KEY_TYPE BlockNumber
 #define SH_KEY blockno
-#define SH_HASH_KEY(tb, key) hash_blockno(key)
+#define SH_HASH_KEY(tb, key) murmurhash32(key)
 #define SH_EQUAL(tb, a, b) a == b
 #define SH_SCOPE static inline
 #define SH_DEFINE
@@ -281,7 +265,6 @@ TIDBitmap *
 tbm_create(long maxbytes, dsa_area *dsa)
 {
 	TIDBitmap  *tbm;
-	long		nbuckets;
 
 	/* Create the TIDBitmap struct and zero all its fields */
 	tbm = makeNode(TIDBitmap);
@@ -289,17 +272,7 @@ tbm_create(long maxbytes, dsa_area *dsa)
 	tbm->mcxt = CurrentMemoryContext;
 	tbm->status = TBM_EMPTY;
 
-	/*
-	 * Estimate number of hashtable entries we can have within maxbytes. This
-	 * estimates the hash cost as sizeof(PagetableEntry), which is good enough
-	 * for our purpose.  Also count an extra Pointer per entry for the arrays
-	 * created during iteration readout.
-	 */
-	nbuckets = maxbytes /
-		(sizeof(PagetableEntry) + sizeof(Pointer) + sizeof(Pointer));
-	nbuckets = Min(nbuckets, INT_MAX - 1);	/* safety limit */
-	nbuckets = Max(nbuckets, 16);	/* sanity limit */
-	tbm->maxentries = (int) nbuckets;
+	tbm->maxentries = (int) tbm_calculate_entries(maxbytes);
 	tbm->lossify_start = 0;
 	tbm->dsa = dsa;
 	tbm->dsapagetable = InvalidDsaPointer;
@@ -609,7 +582,7 @@ tbm_intersect(TIDBitmap *a, const TIDBitmap *b)
 /*
  * Process one page of a during an intersection op
  *
- * Returns TRUE if apage is now empty and should be deleted from a
+ * Returns true if apage is now empty and should be deleted from a
  */
 static bool
 tbm_intersect_page(TIDBitmap *a, PagetableEntry *apage, const TIDBitmap *b)
@@ -1562,3 +1535,27 @@ pagetable_free(pagetable_hash *pagetable, void *pointer)
 		tbm->dsapagetableold = InvalidDsaPointer;
 	}
 }
+
+/*
+ * tbm_calculate_entries
+ *
+ * Estimate number of hashtable entries we can have within maxbytes.
+ */
+long
+tbm_calculate_entries(double maxbytes)
+{
+	long		nbuckets;
+
+	/*
+	 * Estimate number of hashtable entries we can have within maxbytes. This
+	 * estimates the hash cost as sizeof(PagetableEntry), which is good enough
+	 * for our purpose.  Also count an extra Pointer per entry for the arrays
+	 * created during iteration readout.
+	 */
+	nbuckets = maxbytes /
+		(sizeof(PagetableEntry) + sizeof(Pointer) + sizeof(Pointer));
+	nbuckets = Min(nbuckets, INT_MAX - 1);	/* safety limit */
+	nbuckets = Max(nbuckets, 16);	/* sanity limit */
+
+	return nbuckets;
+}
diff --git a/src/backend/nodes/value.c b/src/backend/nodes/value.c
index 5d2f96c103..8f0428fce1 100644
--- a/src/backend/nodes/value.c
+++ b/src/backend/nodes/value.c
@@ -4,7 +4,7 @@
  *	  implementation of Value nodes
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/optimizer/README b/src/backend/optimizer/README
index fc0fca4107..3e254c8b2d 100644
--- a/src/backend/optimizer/README
+++ b/src/backend/optimizer/README
@@ -374,6 +374,7 @@ RelOptInfo      - a relation or joined relations
   MaterialPath  - a Material plan node
   UniquePath    - remove duplicate rows (either by hashing or sorting)
   GatherPath    - collect the results of parallel workers
+  GatherMergePath - collect parallel results, preserving their common sort order
   ProjectionPath - a Result plan node with child (used for projection)
   ProjectSetPath - a ProjectSet plan node applied to some sub-path
   SortPath      - a Sort plan node applied to some sub-path
@@ -997,6 +998,7 @@ considered useful for each step.  Currently, we may create these types of
 additional RelOptInfos during upper-level planning:
 
 UPPERREL_SETOP		result of UNION/INTERSECT/EXCEPT, if any
+UPPERREL_PARTIAL_GROUP_AGG	result of partial grouping/aggregation, if any
 UPPERREL_GROUP_AGG	result of grouping/aggregation, if any
 UPPERREL_WINDOW		result of window functions, if any
 UPPERREL_DISTINCT	result of "SELECT DISTINCT", if any
@@ -1030,7 +1032,7 @@ either by an entire query or some portion of the query in such a way that
 some of that work can be done by one or more worker processes, which are
 called parallel workers.  Parallel workers are a subtype of dynamic
 background workers; see src/backend/access/transam/README.parallel for a
-fuller description.  Academic literature on parallel query suggests that
+fuller description.  The academic literature on parallel query suggests
 that parallel execution strategies can be divided into essentially two
 categories: pipelined parallelism, where the execution of the query is
 divided into multiple stages and each stage is handled by a separate
@@ -1046,16 +1048,14 @@ that the underlying table be partitioned.  It only requires that (1)
 there is some method of dividing the data from at least one of the base
 tables involved in the relation across multiple processes, (2) allowing
 each process to handle its own portion of the data, and then (3)
-collecting the results.  Requirements (2) and (3) is satisfied by the
-executor node Gather, which launches any number of worker processes and
-executes its single child plan in all of them (and perhaps in the leader
-also, if the children aren't generating enough data to keep the leader
-busy).  Requirement (1) is handled by the SeqScan node: when invoked
-with parallel_aware = true, this node will, in effect, partition the
-table on a block by block basis, returning a subset of the tuples from
-the relation in each worker where that SeqScan is executed.  A similar
-scheme could be (and probably should be) implemented for bitmap heap
-scans.
+collecting the results.  Requirements (2) and (3) are satisfied by the
+executor node Gather (or GatherMerge), which launches any number of worker
+processes and executes its single child plan in all of them, and perhaps
+in the leader also, if the children aren't generating enough data to keep
+the leader busy.  Requirement (1) is handled by the table scan node: when
+invoked with parallel_aware = true, this node will, in effect, partition
+the table on a block by block basis, returning a subset of the tuples from
+the relation in each worker where that scan node is executed.
 
 Just as we do for non-parallel access methods, we build Paths to
 represent access strategies that can be used in a parallel plan.  These
@@ -1076,3 +1076,29 @@ be desirable to postpone the Gather stage until as near to the top of the
 plan as possible.  Expanding the range of cases in which more work can be
 pushed below the Gather (and costing them accurately) is likely to keep us
 busy for a long time to come.
+
+Partitionwise joins
+-------------------
+A join between two similarly partitioned tables can be broken down into joins
+between their matching partitions if there exists an equi-join condition
+between the partition keys of the joining tables. The equi-join between
+partition keys implies that all join partners for a given row in one
+partitioned table must be in the corresponding partition of the other
+partitioned table. Because of this the join between partitioned tables to be
+broken into joins between the matching partitions. The resultant join is
+partitioned in the same way as the joining relations, thus allowing an N-way
+join between similarly partitioned tables having equi-join condition between
+their partition keys to be broken down into N-way joins between their matching
+partitions. This technique of breaking down a join between partitioned tables
+into joins between their partitions is called partitionwise join. We will use
+term "partitioned relation" for either a partitioned table or a join between
+compatibly partitioned tables.
+
+The partitioning properties of a partitioned relation are stored in its
+RelOptInfo.  The information about data types of partition keys are stored in
+PartitionSchemeData structure. The planner maintains a list of canonical
+partition schemes (distinct PartitionSchemeData objects) so that RelOptInfo of
+any two partitioned relations with same partitioning scheme point to the same
+PartitionSchemeData object.  This reduces memory consumed by
+PartitionSchemeData objects and makes it easy to compare the partition schemes
+of joining relations.
diff --git a/src/backend/optimizer/geqo/geqo_copy.c b/src/backend/optimizer/geqo/geqo_copy.c
index 8fd20c5986..111caa2a2a 100644
--- a/src/backend/optimizer/geqo/geqo_copy.c
+++ b/src/backend/optimizer/geqo/geqo_copy.c
@@ -2,7 +2,7 @@
  *
  * geqo_copy.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_copy.c
diff --git a/src/backend/optimizer/geqo/geqo_eval.c b/src/backend/optimizer/geqo/geqo_eval.c
index b5cab0c351..0be2a73e05 100644
--- a/src/backend/optimizer/geqo/geqo_eval.c
+++ b/src/backend/optimizer/geqo/geqo_eval.c
@@ -3,7 +3,7 @@
  * geqo_eval.c
  *	  Routines to evaluate query trees
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_eval.c
@@ -264,8 +264,11 @@ merge_clump(PlannerInfo *root, List *clumps, Clump *new_clump, bool force)
 			/* Keep searching if join order is not valid */
 			if (joinrel)
 			{
+				/* Create paths for partitionwise joins. */
+				generate_partitionwise_join_paths(root, joinrel);
+
 				/* Create GatherPaths for any useful partial paths for rel */
-				generate_gather_paths(root, joinrel);
+				generate_gather_paths(root, joinrel, false);
 
 				/* Find and save the cheapest paths for this joinrel */
 				set_cheapest(joinrel);
diff --git a/src/backend/optimizer/geqo/geqo_main.c b/src/backend/optimizer/geqo/geqo_main.c
index 86213ac5a0..3eb8bcb76f 100644
--- a/src/backend/optimizer/geqo/geqo_main.c
+++ b/src/backend/optimizer/geqo/geqo_main.c
@@ -4,7 +4,7 @@
  *	  solution to the query optimization problem
  *	  by means of a Genetic Algorithm (GA)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_main.c
diff --git a/src/backend/optimizer/geqo/geqo_misc.c b/src/backend/optimizer/geqo/geqo_misc.c
index 937cb5fe0f..919d2889bc 100644
--- a/src/backend/optimizer/geqo/geqo_misc.c
+++ b/src/backend/optimizer/geqo/geqo_misc.c
@@ -3,7 +3,7 @@
  * geqo_misc.c
  *	   misc. printout and debug stuff
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_misc.c
diff --git a/src/backend/optimizer/geqo/geqo_pool.c b/src/backend/optimizer/geqo/geqo_pool.c
index 596a2cda20..b2c9f31c8b 100644
--- a/src/backend/optimizer/geqo/geqo_pool.c
+++ b/src/backend/optimizer/geqo/geqo_pool.c
@@ -3,7 +3,7 @@
  * geqo_pool.c
  *	  Genetic Algorithm (GA) pool stuff
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_pool.c
diff --git a/src/backend/optimizer/geqo/geqo_random.c b/src/backend/optimizer/geqo/geqo_random.c
index 6f3500649c..850bfe5ebe 100644
--- a/src/backend/optimizer/geqo/geqo_random.c
+++ b/src/backend/optimizer/geqo/geqo_random.c
@@ -3,7 +3,7 @@
  * geqo_random.c
  *	   random number generator
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_random.c
diff --git a/src/backend/optimizer/geqo/geqo_selection.c b/src/backend/optimizer/geqo/geqo_selection.c
index 4d0f6b0881..ebd34b6db2 100644
--- a/src/backend/optimizer/geqo/geqo_selection.c
+++ b/src/backend/optimizer/geqo/geqo_selection.c
@@ -3,7 +3,7 @@
  * geqo_selection.c
  *	  linear selection scheme for the genetic query optimizer
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/optimizer/geqo/geqo_selection.c
diff --git a/src/backend/optimizer/path/allpaths.c b/src/backend/optimizer/path/allpaths.c
index 2d7e1d84d0..1c792a00eb 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -3,7 +3,7 @@
  * allpaths.c
  *	  Routines to find possible search paths for processing a query
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -24,6 +24,7 @@
 #include "catalog/pg_operator.h"
 #include "catalog/pg_proc.h"
 #include "foreign/fdwapi.h"
+#include "miscadmin.h"
 #include "nodes/makefuncs.h"
 #include "nodes/nodeFuncs.h"
 #ifdef OPTIMIZER_DEBUG
@@ -100,7 +101,8 @@ static void generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 static Path *get_cheapest_parameterized_child_path(PlannerInfo *root,
 									  RelOptInfo *rel,
 									  Relids required_outer);
-static List *accumulate_append_subpath(List *subpaths, Path *path);
+static void accumulate_append_subpath(Path *path,
+						  List **subpaths, List **special_subpaths);
 static void set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 					  Index rti, RangeTblEntry *rte);
 static void set_function_pathlist(PlannerInfo *root, RelOptInfo *rel,
@@ -352,8 +354,8 @@ set_rel_size(PlannerInfo *root, RelOptInfo *rel,
 				else if (rte->relkind == RELKIND_PARTITIONED_TABLE)
 				{
 					/*
-					 * A partitioned table without leaf partitions is marked
-					 * as a dummy rel.
+					 * A partitioned table without any partitions is marked as
+					 * a dummy rel.
 					 */
 					set_dummy_rel_pathlist(rel);
 				}
@@ -486,7 +488,7 @@ set_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	 * we'll consider gathering partial paths for the parent appendrel.)
 	 */
 	if (rel->reloptkind == RELOPT_BASEREL)
-		generate_gather_paths(root, rel);
+		generate_gather_paths(root, rel, false);
 
 	/*
 	 * Allow a plugin to editorialize on the set of Paths for this base
@@ -718,7 +720,8 @@ create_plain_partial_paths(PlannerInfo *root, RelOptInfo *rel)
 {
 	int			parallel_workers;
 
-	parallel_workers = compute_parallel_worker(rel, rel->pages, -1);
+	parallel_workers = compute_parallel_worker(rel, rel->pages, -1,
+											   max_parallel_workers_per_gather);
 
 	/* If any limit was set to zero, the user doesn't want a parallel scan. */
 	if (parallel_workers <= 0)
@@ -867,6 +870,9 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
 	int			nattrs;
 	ListCell   *l;
 
+	/* Guard against stack overflow due to overly deep inheritance tree. */
+	check_stack_depth();
+
 	Assert(IS_SIMPLE_REL(rel));
 
 	/*
@@ -916,12 +922,91 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
 		childrel = find_base_rel(root, childRTindex);
 		Assert(childrel->reloptkind == RELOPT_OTHER_MEMBER_REL);
 
+		if (rel->part_scheme)
+		{
+			AttrNumber	attno;
+
+			/*
+			 * We need attr_needed data for building targetlist of a join
+			 * relation representing join between matching partitions for
+			 * partitionwise join. A given attribute of a child will be
+			 * needed in the same highest joinrel where the corresponding
+			 * attribute of parent is needed. Hence it suffices to use the
+			 * same Relids set for parent and child.
+			 */
+			for (attno = rel->min_attr; attno <= rel->max_attr; attno++)
+			{
+				int			index = attno - rel->min_attr;
+				Relids		attr_needed = rel->attr_needed[index];
+
+				/* System attributes do not need translation. */
+				if (attno <= 0)
+				{
+					Assert(rel->min_attr == childrel->min_attr);
+					childrel->attr_needed[index] = attr_needed;
+				}
+				else
+				{
+					Var		   *var = list_nth_node(Var,
+													appinfo->translated_vars,
+													attno - 1);
+					int			child_index;
+
+					/*
+					 * Ignore any column dropped from the parent.
+					 * Corresponding Var won't have any translation. It won't
+					 * have attr_needed information, since it can not be
+					 * referenced in the query.
+					 */
+					if (var == NULL)
+					{
+						Assert(attr_needed == NULL);
+						continue;
+					}
+
+					child_index = var->varattno - childrel->min_attr;
+					childrel->attr_needed[child_index] = attr_needed;
+				}
+			}
+		}
+
 		/*
-		 * We have to copy the parent's targetlist and quals to the child,
-		 * with appropriate substitution of variables.  However, only the
-		 * baserestrictinfo quals are needed before we can check for
-		 * constraint exclusion; so do that first and then check to see if we
-		 * can disregard this child.
+		 * Copy/Modify targetlist. Even if this child is deemed empty, we need
+		 * its targetlist in case it falls on nullable side in a child-join
+		 * because of partitionwise join.
+		 *
+		 * NB: the resulting childrel->reltarget->exprs may contain arbitrary
+		 * expressions, which otherwise would not occur in a rel's targetlist.
+		 * Code that might be looking at an appendrel child must cope with
+		 * such.  (Normally, a rel's targetlist would only include Vars and
+		 * PlaceHolderVars.)  XXX we do not bother to update the cost or width
+		 * fields of childrel->reltarget; not clear if that would be useful.
+		 */
+		childrel->reltarget->exprs = (List *)
+			adjust_appendrel_attrs(root,
+								   (Node *) rel->reltarget->exprs,
+								   1, &appinfo);
+
+		/*
+		 * We have to make child entries in the EquivalenceClass data
+		 * structures as well.  This is needed either if the parent
+		 * participates in some eclass joins (because we will want to consider
+		 * inner-indexscan joins on the individual children) or if the parent
+		 * has useful pathkeys (because we should try to build MergeAppend
+		 * paths that produce those sort orderings). Even if this child is
+		 * deemed dummy, it may fall on nullable side in a child-join, which
+		 * in turn may participate in a MergeAppend, where we will need the
+		 * EquivalenceClass data structures.
+		 */
+		if (rel->has_eclass_joins || has_useful_pathkeys(root, rel))
+			add_child_rel_equivalences(root, appinfo, rel, childrel);
+		childrel->has_eclass_joins = rel->has_eclass_joins;
+
+		/*
+		 * We have to copy the parent's quals to the child, with appropriate
+		 * substitution of variables.  However, only the baserestrictinfo
+		 * quals are needed before we can check for constraint exclusion; so
+		 * do that first and then check to see if we can disregard this child.
 		 *
 		 * The child rel's targetlist might contain non-Var expressions, which
 		 * means that substitution into the quals could produce opportunities
@@ -1048,44 +1133,11 @@ set_append_rel_size(PlannerInfo *root, RelOptInfo *rel,
 			continue;
 		}
 
-		/*
-		 * CE failed, so finish copying/modifying targetlist and join quals.
-		 *
-		 * NB: the resulting childrel->reltarget->exprs may contain arbitrary
-		 * expressions, which otherwise would not occur in a rel's targetlist.
-		 * Code that might be looking at an appendrel child must cope with
-		 * such.  (Normally, a rel's targetlist would only include Vars and
-		 * PlaceHolderVars.)  XXX we do not bother to update the cost or width
-		 * fields of childrel->reltarget; not clear if that would be useful.
-		 */
+		/* CE failed, so finish copying/modifying join quals. */
 		childrel->joininfo = (List *)
 			adjust_appendrel_attrs(root,
 								   (Node *) rel->joininfo,
 								   1, &appinfo);
-		childrel->reltarget->exprs = (List *)
-			adjust_appendrel_attrs(root,
-								   (Node *) rel->reltarget->exprs,
-								   1, &appinfo);
-
-		/*
-		 * We have to make child entries in the EquivalenceClass data
-		 * structures as well.  This is needed either if the parent
-		 * participates in some eclass joins (because we will want to consider
-		 * inner-indexscan joins on the individual children) or if the parent
-		 * has useful pathkeys (because we should try to build MergeAppend
-		 * paths that produce those sort orderings).
-		 */
-		if (rel->has_eclass_joins || has_useful_pathkeys(root, rel))
-			add_child_rel_equivalences(root, appinfo, rel, childrel);
-		childrel->has_eclass_joins = rel->has_eclass_joins;
-
-		/*
-		 * Note: we could compute appropriate attr_needed data for the child's
-		 * variables, by transforming the parent's attr_needed through the
-		 * translated_vars mapping.  However, currently there's no need
-		 * because attr_needed is only examined for base relations not
-		 * otherrels.  So we just leave the child's attr_needed empty.
-		 */
 
 		/*
 		 * If parallelism is allowable for this query in general, see whether
@@ -1258,14 +1310,14 @@ set_append_rel_pathlist(PlannerInfo *root, RelOptInfo *rel,
 		live_childrels = lappend(live_childrels, childrel);
 	}
 
-	/* Add paths to the "append" relation. */
+	/* Add paths to the append relation. */
 	add_paths_to_append_rel(root, rel, live_childrels);
 }
 
 
 /*
  * add_paths_to_append_rel
- *		Generate paths for given "append" relation given the set of non-dummy
+ *		Generate paths for the given append relation given the set of non-dummy
  *		child rels.
  *
  * The function collects all parameterizations and orderings supported by the
@@ -1281,19 +1333,56 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 	List	   *subpaths = NIL;
 	bool		subpaths_valid = true;
 	List	   *partial_subpaths = NIL;
+	List	   *pa_partial_subpaths = NIL;
+	List	   *pa_nonpartial_subpaths = NIL;
 	bool		partial_subpaths_valid = true;
+	bool		pa_subpaths_valid = enable_parallel_append;
 	List	   *all_child_pathkeys = NIL;
 	List	   *all_child_outers = NIL;
 	ListCell   *l;
 	List	   *partitioned_rels = NIL;
 	RangeTblEntry *rte;
+	bool		build_partitioned_rels = false;
+	double		partial_rows = -1;
 
-	rte = planner_rt_fetch(rel->relid, root);
-	if (rte->relkind == RELKIND_PARTITIONED_TABLE)
+	if (IS_SIMPLE_REL(rel))
 	{
-		partitioned_rels = get_partitioned_child_rels(root, rel->relid);
-		/* The root partitioned table is included as a child rel */
-		Assert(list_length(partitioned_rels) >= 1);
+		/*
+		 * A root partition will already have a PartitionedChildRelInfo, and a
+		 * non-root partitioned table doesn't need one, because its Append
+		 * paths will get flattened into the parent anyway.  For a subquery
+		 * RTE, no PartitionedChildRelInfo exists; we collect all
+		 * partitioned_rels associated with any child.  (This assumes that we
+		 * don't need to look through multiple levels of subquery RTEs; if we
+		 * ever do, we could create a PartitionedChildRelInfo with the
+		 * accumulated list of partitioned_rels which would then be found when
+		 * populated our parent rel with paths.  For the present, that appears
+		 * to be unnecessary.)
+		 */
+		rte = planner_rt_fetch(rel->relid, root);
+		switch (rte->rtekind)
+		{
+			case RTE_RELATION:
+				if (rte->relkind == RELKIND_PARTITIONED_TABLE)
+					partitioned_rels =
+						get_partitioned_child_rels(root, rel->relid, NULL);
+				break;
+			case RTE_SUBQUERY:
+				build_partitioned_rels = true;
+				break;
+			default:
+				elog(ERROR, "unexpected rtekind: %d", (int) rte->rtekind);
+		}
+	}
+	else if (rel->reloptkind == RELOPT_JOINREL && rel->part_scheme)
+	{
+		/*
+		 * Associate PartitionedChildRelInfo of the root partitioned tables
+		 * being joined with the root partitioned join (indicated by
+		 * RELOPT_JOINREL).
+		 */
+		partitioned_rels = get_partitioned_child_rels_for_join(root,
+															   rel->relids);
 	}
 
 	/*
@@ -1305,6 +1394,20 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 	{
 		RelOptInfo *childrel = lfirst(l);
 		ListCell   *lcp;
+		Path	   *cheapest_partial_path = NULL;
+
+		/*
+		 * If we need to build partitioned_rels, accumulate the partitioned
+		 * rels for this child.
+		 */
+		if (build_partitioned_rels)
+		{
+			List	   *cprels;
+
+			cprels = get_partitioned_child_rels(root, childrel->relid, NULL);
+			partitioned_rels = list_concat(partitioned_rels,
+										   list_copy(cprels));
+		}
 
 		/*
 		 * If child has an unparameterized cheapest-total path, add that to
@@ -1312,18 +1415,69 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 		 * If not, there's no workable unparameterized path.
 		 */
 		if (childrel->cheapest_total_path->param_info == NULL)
-			subpaths = accumulate_append_subpath(subpaths,
-												 childrel->cheapest_total_path);
+			accumulate_append_subpath(childrel->cheapest_total_path,
+									  &subpaths, NULL);
 		else
 			subpaths_valid = false;
 
 		/* Same idea, but for a partial plan. */
 		if (childrel->partial_pathlist != NIL)
-			partial_subpaths = accumulate_append_subpath(partial_subpaths,
-														 linitial(childrel->partial_pathlist));
+		{
+			cheapest_partial_path = linitial(childrel->partial_pathlist);
+			accumulate_append_subpath(cheapest_partial_path,
+									  &partial_subpaths, NULL);
+		}
 		else
 			partial_subpaths_valid = false;
 
+		/*
+		 * Same idea, but for a parallel append mixing partial and non-partial
+		 * paths.
+		 */
+		if (pa_subpaths_valid)
+		{
+			Path	   *nppath = NULL;
+
+			nppath =
+				get_cheapest_parallel_safe_total_inner(childrel->pathlist);
+
+			if (cheapest_partial_path == NULL && nppath == NULL)
+			{
+				/* Neither a partial nor a parallel-safe path?  Forget it. */
+				pa_subpaths_valid = false;
+			}
+			else if (nppath == NULL ||
+					 (cheapest_partial_path != NULL &&
+					  cheapest_partial_path->total_cost < nppath->total_cost))
+			{
+				/* Partial path is cheaper or the only option. */
+				Assert(cheapest_partial_path != NULL);
+				accumulate_append_subpath(cheapest_partial_path,
+										  &pa_partial_subpaths,
+										  &pa_nonpartial_subpaths);
+
+			}
+			else
+			{
+				/*
+				 * Either we've got only a non-partial path, or we think that
+				 * a single backend can execute the best non-partial path
+				 * faster than all the parallel backends working together can
+				 * execute the best partial path.
+				 *
+				 * It might make sense to be more aggressive here.  Even if
+				 * the best non-partial path is more expensive than the best
+				 * partial path, it could still be better to choose the
+				 * non-partial path if there are several such paths that can
+				 * be given to different workers.  For now, we don't try to
+				 * figure that out.
+				 */
+				accumulate_append_subpath(nppath,
+										  &pa_nonpartial_subpaths,
+										  NULL);
+			}
+		}
+
 		/*
 		 * Collect lists of all the available path orderings and
 		 * parameterizations for all the children.  We use these as a
@@ -1395,11 +1549,13 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 	 * if we have zero or one live subpath due to constraint exclusion.)
 	 */
 	if (subpaths_valid)
-		add_path(rel, (Path *) create_append_path(rel, subpaths, NULL, 0,
-												  partitioned_rels));
+		add_path(rel, (Path *) create_append_path(rel, subpaths, NIL,
+												  NULL, 0, false,
+												  partitioned_rels, -1));
 
 	/*
-	 * Consider an append of partial unordered, unparameterized partial paths.
+	 * Consider an append of unordered, unparameterized partial paths.  Make
+	 * it parallel-aware if possible.
 	 */
 	if (partial_subpaths_valid)
 	{
@@ -1407,12 +1563,7 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 		ListCell   *lc;
 		int			parallel_workers = 0;
 
-		/*
-		 * Decide on the number of workers to request for this append path.
-		 * For now, we just use the maximum value from among the members.  It
-		 * might be useful to use a higher number if the Append node were
-		 * smart enough to spread out the workers, but it currently isn't.
-		 */
+		/* Find the highest number of workers requested for any subpath. */
 		foreach(lc, partial_subpaths)
 		{
 			Path	   *path = lfirst(lc);
@@ -1421,9 +1572,78 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 		}
 		Assert(parallel_workers > 0);
 
+		/*
+		 * If the use of parallel append is permitted, always request at least
+		 * log2(# of children) paths.  We assume it can be useful to have
+		 * extra workers in this case because they will be spread out across
+		 * the children.  The precise formula is just a guess, but we don't
+		 * want to end up with a radically different answer for a table with N
+		 * partitions vs. an unpartitioned table with the same data, so the
+		 * use of some kind of log-scaling here seems to make some sense.
+		 */
+		if (enable_parallel_append)
+		{
+			parallel_workers = Max(parallel_workers,
+								   fls(list_length(live_childrels)));
+			parallel_workers = Min(parallel_workers,
+								   max_parallel_workers_per_gather);
+		}
+		Assert(parallel_workers > 0);
+
 		/* Generate a partial append path. */
-		appendpath = create_append_path(rel, partial_subpaths, NULL,
-										parallel_workers, partitioned_rels);
+		appendpath = create_append_path(rel, NIL, partial_subpaths, NULL,
+										parallel_workers,
+										enable_parallel_append,
+										partitioned_rels, -1);
+
+		/*
+		 * Make sure any subsequent partial paths use the same row count
+		 * estimate.
+		 */
+		partial_rows = appendpath->path.rows;
+
+		/* Add the path. */
+		add_partial_path(rel, (Path *) appendpath);
+	}
+
+	/*
+	 * Consider a parallel-aware append using a mix of partial and non-partial
+	 * paths.  (This only makes sense if there's at least one child which has
+	 * a non-partial path that is substantially cheaper than any partial path;
+	 * otherwise, we should use the append path added in the previous step.)
+	 */
+	if (pa_subpaths_valid && pa_nonpartial_subpaths != NIL)
+	{
+		AppendPath *appendpath;
+		ListCell   *lc;
+		int			parallel_workers = 0;
+
+		/*
+		 * Find the highest number of workers requested for any partial
+		 * subpath.
+		 */
+		foreach(lc, pa_partial_subpaths)
+		{
+			Path	   *path = lfirst(lc);
+
+			parallel_workers = Max(parallel_workers, path->parallel_workers);
+		}
+
+		/*
+		 * Same formula here as above.  It's even more important in this
+		 * instance because the non-partial paths won't contribute anything to
+		 * the planned number of parallel workers.
+		 */
+		parallel_workers = Max(parallel_workers,
+							   fls(list_length(live_childrels)));
+		parallel_workers = Min(parallel_workers,
+							   max_parallel_workers_per_gather);
+		Assert(parallel_workers > 0);
+
+		appendpath = create_append_path(rel, pa_nonpartial_subpaths,
+										pa_partial_subpaths,
+										NULL, parallel_workers, true,
+										partitioned_rels, partial_rows);
 		add_partial_path(rel, (Path *) appendpath);
 	}
 
@@ -1471,13 +1691,14 @@ add_paths_to_append_rel(PlannerInfo *root, RelOptInfo *rel,
 				subpaths_valid = false;
 				break;
 			}
-			subpaths = accumulate_append_subpath(subpaths, subpath);
+			accumulate_append_subpath(subpath, &subpaths, NULL);
 		}
 
 		if (subpaths_valid)
 			add_path(rel, (Path *)
-					 create_append_path(rel, subpaths, required_outer, 0,
-										partitioned_rels));
+					 create_append_path(rel, subpaths, NIL,
+										required_outer, 0, false,
+										partitioned_rels, -1));
 	}
 }
 
@@ -1561,10 +1782,10 @@ generate_mergeappend_paths(PlannerInfo *root, RelOptInfo *rel,
 			if (cheapest_startup != cheapest_total)
 				startup_neq_total = true;
 
-			startup_subpaths =
-				accumulate_append_subpath(startup_subpaths, cheapest_startup);
-			total_subpaths =
-				accumulate_append_subpath(total_subpaths, cheapest_total);
+			accumulate_append_subpath(cheapest_startup,
+									  &startup_subpaths, NULL);
+			accumulate_append_subpath(cheapest_total,
+									  &total_subpaths, NULL);
 		}
 
 		/* ... and build the MergeAppend paths */
@@ -1660,7 +1881,7 @@ get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel,
 
 /*
  * accumulate_append_subpath
- *		Add a subpath to the list being built for an Append or MergeAppend
+ *		Add a subpath to the list being built for an Append or MergeAppend.
  *
  * It's possible that the child is itself an Append or MergeAppend path, in
  * which case we can "cut out the middleman" and just add its child paths to
@@ -1671,26 +1892,54 @@ get_cheapest_parameterized_child_path(PlannerInfo *root, RelOptInfo *rel,
  * omitting a sort step, which seems fine: if the parent is to be an Append,
  * its result would be unsorted anyway, while if the parent is to be a
  * MergeAppend, there's no point in a separate sort on a child.
+ * its result would be unsorted anyway.
+ *
+ * Normally, either path is a partial path and subpaths is a list of partial
+ * paths, or else path is a non-partial plan and subpaths is a list of those.
+ * However, if path is a parallel-aware Append, then we add its partial path
+ * children to subpaths and the rest to special_subpaths.  If the latter is
+ * NULL, we don't flatten the path at all (unless it contains only partial
+ * paths).
  */
-static List *
-accumulate_append_subpath(List *subpaths, Path *path)
+static void
+accumulate_append_subpath(Path *path, List **subpaths, List **special_subpaths)
 {
 	if (IsA(path, AppendPath))
 	{
 		AppendPath *apath = (AppendPath *) path;
 
-		/* list_copy is important here to avoid sharing list substructure */
-		return list_concat(subpaths, list_copy(apath->subpaths));
+		if (!apath->path.parallel_aware || apath->first_partial_path == 0)
+		{
+			/* list_copy is important here to avoid sharing list substructure */
+			*subpaths = list_concat(*subpaths, list_copy(apath->subpaths));
+			return;
+		}
+		else if (special_subpaths != NULL)
+		{
+			List	   *new_special_subpaths;
+
+			/* Split Parallel Append into partial and non-partial subpaths */
+			*subpaths = list_concat(*subpaths,
+									list_copy_tail(apath->subpaths,
+												   apath->first_partial_path));
+			new_special_subpaths =
+				list_truncate(list_copy(apath->subpaths),
+							  apath->first_partial_path);
+			*special_subpaths = list_concat(*special_subpaths,
+											new_special_subpaths);
+			return;
+		}
 	}
 	else if (IsA(path, MergeAppendPath))
 	{
 		MergeAppendPath *mpath = (MergeAppendPath *) path;
 
 		/* list_copy is important here to avoid sharing list substructure */
-		return list_concat(subpaths, list_copy(mpath->subpaths));
+		*subpaths = list_concat(*subpaths, list_copy(mpath->subpaths));
+		return;
 	}
-	else
-		return lappend(subpaths, path);
+
+	*subpaths = lappend(*subpaths, path);
 }
 
 /*
@@ -1713,7 +1962,8 @@ set_dummy_rel_pathlist(RelOptInfo *rel)
 	rel->pathlist = NIL;
 	rel->partial_pathlist = NIL;
 
-	add_path(rel, (Path *) create_append_path(rel, NIL, NULL, 0, NIL));
+	add_path(rel, (Path *) create_append_path(rel, NIL, NIL, NULL,
+											  0, false, NIL, -1));
 
 	/*
 	 * We set the cheapest path immediately, to ensure that IS_DUMMY_REL()
@@ -1788,7 +2038,7 @@ set_subquery_pathlist(PlannerInfo *root, RelOptInfo *rel,
 	 * Zero out result area for subquery_is_pushdown_safe, so that it can set
 	 * flags as needed while recursing.  In particular, we need a workspace
 	 * for keeping track of unsafe-to-reference columns.  unsafeColumns[i]
-	 * will be set TRUE if we find that output column i of the subquery is
+	 * will be set true if we find that output column i of the subquery is
 	 * unsafe to use in a pushed-down qual.
 	 */
 	memset(&safetyInfo, 0, sizeof(safetyInfo));
@@ -2194,27 +2444,42 @@ set_worktable_pathlist(PlannerInfo *root, RelOptInfo *rel, RangeTblEntry *rte)
  * This must not be called until after we're done creating all partial paths
  * for the specified relation.  (Otherwise, add_partial_path might delete a
  * path that some GatherPath or GatherMergePath has a reference to.)
+ *
+ * If we're generating paths for a scan or join relation, override_rows will
+ * be false, and we'll just use the relation's size estimate.  When we're
+ * being called for a partially-grouped path, though, we need to override
+ * the rowcount estimate.  (It's not clear that the particular value we're
+ * using here is actually best, but the underlying rel has no estimate so
+ * we must do something.)
  */
 void
-generate_gather_paths(PlannerInfo *root, RelOptInfo *rel)
+generate_gather_paths(PlannerInfo *root, RelOptInfo *rel, bool override_rows)
 {
 	Path	   *cheapest_partial_path;
 	Path	   *simple_gather_path;
 	ListCell   *lc;
+	double		rows;
+	double	   *rowsp = NULL;
 
 	/* If there are no partial paths, there's nothing to do here. */
 	if (rel->partial_pathlist == NIL)
 		return;
 
+	/* Should we override the rel's rowcount estimate? */
+	if (override_rows)
+		rowsp = &rows;
+
 	/*
 	 * The output of Gather is always unsorted, so there's only one partial
 	 * path of interest: the cheapest one.  That will be the one at the front
 	 * of partial_pathlist because of the way add_partial_path works.
 	 */
 	cheapest_partial_path = linitial(rel->partial_pathlist);
+	rows =
+		cheapest_partial_path->rows * cheapest_partial_path->parallel_workers;
 	simple_gather_path = (Path *)
 		create_gather_path(root, rel, cheapest_partial_path, rel->reltarget,
-						   NULL, NULL);
+						   NULL, rowsp);
 	add_path(rel, simple_gather_path);
 
 	/*
@@ -2229,8 +2494,9 @@ generate_gather_paths(PlannerInfo *root, RelOptInfo *rel)
 		if (subpath->pathkeys == NIL)
 			continue;
 
+		rows = subpath->rows * subpath->parallel_workers;
 		path = create_gather_merge_path(root, rel, subpath, rel->reltarget,
-										subpath->pathkeys, NULL, NULL);
+										subpath->pathkeys, NULL, rowsp);
 		add_path(rel, &path->path);
 	}
 }
@@ -2386,18 +2652,24 @@ standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels)
 		join_search_one_level(root, lev);
 
 		/*
-		 * Run generate_gather_paths() for each just-processed joinrel.  We
-		 * could not do this earlier because both regular and partial paths
-		 * can get added to a particular joinrel at multiple times within
-		 * join_search_one_level.  After that, we're done creating paths for
-		 * the joinrel, so run set_cheapest().
+		 * Run generate_partitionwise_join_paths() and
+		 * generate_gather_paths() for each just-processed joinrel.  We could
+		 * not do this earlier because both regular and partial paths can get
+		 * added to a particular joinrel at multiple times within
+		 * join_search_one_level.
+		 *
+		 * After that, we're done creating paths for the joinrel, so run
+		 * set_cheapest().
 		 */
 		foreach(lc, root->join_rel_level[lev])
 		{
 			rel = (RelOptInfo *) lfirst(lc);
 
+			/* Create paths for partitionwise joins. */
+			generate_partitionwise_join_paths(root, rel);
+
 			/* Create GatherPaths for any useful partial paths for rel */
-			generate_gather_paths(root, rel);
+			generate_gather_paths(root, rel, false);
 
 			/* Find and save the cheapest paths for this rel */
 			set_cheapest(rel);
@@ -2464,7 +2736,7 @@ standard_join_search(PlannerInfo *root, int levels_needed, List *initial_rels)
  * In addition, we make several checks on the subquery's output columns to see
  * if it is safe to reference them in pushed-down quals.  If output column k
  * is found to be unsafe to reference, we set safetyInfo->unsafeColumns[k]
- * to TRUE, but we don't reject the subquery overall since column k might not
+ * to true, but we don't reject the subquery overall since column k might not
  * be referenced by some/all quals.  The unsafeColumns[] array will be
  * consulted later by qual_is_pushdown_safe().  It's better to do it this way
  * than to make the checks directly in qual_is_pushdown_safe(), because when
@@ -2586,7 +2858,7 @@ recurse_pushdown_safe(Node *setOp, Query *topquery,
  *
  * There are several cases in which it's unsafe to push down an upper-level
  * qual if it references a particular output column of a subquery.  We check
- * each output column of the subquery and set unsafeColumns[k] to TRUE if
+ * each output column of the subquery and set unsafeColumns[k] to true if
  * that column is unsafe for a pushed-down qual to reference.  The conditions
  * checked here are:
  *
@@ -2738,9 +3010,11 @@ targetIsInAllPartitionLists(TargetEntry *tle, Query *query)
  *
  * Conditions checked here:
  *
- * 1. The qual must not contain any subselects (mainly because I'm not sure
- * it will work correctly: sublinks will already have been transformed into
- * subplans in the qual, but not in the subquery).
+ * 1. The qual must not contain any SubPlans (mainly because I'm not sure
+ * it will work correctly: SubLinks will already have been transformed into
+ * SubPlans in the qual, but not in the subquery).  Note that SubLinks that
+ * transform to initplans are safe, and will be accepted here because what
+ * we'll see in the qual is just a Param referencing the initplan output.
  *
  * 2. If unsafeVolatile is set, the qual must not contain any volatile
  * functions.
@@ -3042,7 +3316,8 @@ create_partial_bitmap_paths(PlannerInfo *root, RelOptInfo *rel,
 	pages_fetched = compute_bitmap_pages(root, rel, bitmapqual, 1.0,
 										 NULL, NULL);
 
-	parallel_workers = compute_parallel_worker(rel, pages_fetched, -1);
+	parallel_workers = compute_parallel_worker(rel, pages_fetched, -1,
+											   max_parallel_workers_per_gather);
 
 	if (parallel_workers <= 0)
 		return;
@@ -3062,9 +3337,13 @@ create_partial_bitmap_paths(PlannerInfo *root, RelOptInfo *rel,
  *
  * "index_pages" is the number of pages from the index that we expect to scan, or
  * -1 if we don't expect to scan any.
+ *
+ * "max_workers" is caller's limit on the number of workers.  This typically
+ * comes from a GUC.
  */
 int
-compute_parallel_worker(RelOptInfo *rel, double heap_pages, double index_pages)
+compute_parallel_worker(RelOptInfo *rel, double heap_pages, double index_pages,
+						int max_workers)
 {
 	int			parallel_workers = 0;
 
@@ -3135,14 +3414,78 @@ compute_parallel_worker(RelOptInfo *rel, double heap_pages, double index_pages)
 		}
 	}
 
-	/*
-	 * In no case use more than max_parallel_workers_per_gather workers.
-	 */
-	parallel_workers = Min(parallel_workers, max_parallel_workers_per_gather);
+	/* In no case use more than caller supplied maximum number of workers */
+	parallel_workers = Min(parallel_workers, max_workers);
 
 	return parallel_workers;
 }
 
+/*
+ * generate_partitionwise_join_paths
+ * 		Create paths representing partitionwise join for given partitioned
+ * 		join relation.
+ *
+ * This must not be called until after we are done adding paths for all
+ * child-joins. Otherwise, add_path might delete a path to which some path
+ * generated here has a reference.
+ */
+void
+generate_partitionwise_join_paths(PlannerInfo *root, RelOptInfo *rel)
+{
+	List	   *live_children = NIL;
+	int			cnt_parts;
+	int			num_parts;
+	RelOptInfo **part_rels;
+
+	/* Handle only join relations here. */
+	if (!IS_JOIN_REL(rel))
+		return;
+
+	/* We've nothing to do if the relation is not partitioned. */
+	if (!IS_PARTITIONED_REL(rel))
+		return;
+
+	/* Guard against stack overflow due to overly deep partition hierarchy. */
+	check_stack_depth();
+
+	num_parts = rel->nparts;
+	part_rels = rel->part_rels;
+
+	/* Collect non-dummy child-joins. */
+	for (cnt_parts = 0; cnt_parts < num_parts; cnt_parts++)
+	{
+		RelOptInfo *child_rel = part_rels[cnt_parts];
+
+		Assert(child_rel != NULL);
+
+		/* Add partitionwise join paths for partitioned child-joins. */
+		generate_partitionwise_join_paths(root, child_rel);
+
+		/* Dummy children will not be scanned, so ignore those. */
+		if (IS_DUMMY_REL(child_rel))
+			continue;
+
+		set_cheapest(child_rel);
+
+#ifdef OPTIMIZER_DEBUG
+		debug_print_rel(root, child_rel);
+#endif
+
+		live_children = lappend(live_children, child_rel);
+	}
+
+	/* If all child-joins are dummy, parent join is also dummy. */
+	if (!live_children)
+	{
+		mark_dummy_rel(rel);
+		return;
+	}
+
+	/* Build additional paths for this rel from child-join paths. */
+	add_paths_to_append_rel(root, rel, live_children);
+	list_free(live_children);
+}
+
 
 /*****************************************************************************
  *			DEBUG SUPPORT
diff --git a/src/backend/optimizer/path/clausesel.c b/src/backend/optimizer/path/clausesel.c
index 9d340255c3..f4717942c3 100644
--- a/src/backend/optimizer/path/clausesel.c
+++ b/src/backend/optimizer/path/clausesel.c
@@ -3,7 +3,7 @@
  * clausesel.c
  *	  Routines to compute clause selectivities
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -71,7 +71,7 @@ static RelOptInfo *find_single_rel_for_clauses(PlannerInfo *root,
  *
  * We also recognize "range queries", such as "x > 34 AND x < 42".  Clauses
  * are recognized as possible range query components if they are restriction
- * opclauses whose operators have scalarltsel() or scalargtsel() as their
+ * opclauses whose operators have scalarltsel or a related function as their
  * restriction selectivity estimator.  We pair up clauses of this form that
  * refer to the same variable.  An unpairable clause of this kind is simply
  * multiplied into the selectivity product in the normal way.  But when we
@@ -92,8 +92,8 @@ static RelOptInfo *find_single_rel_for_clauses(PlannerInfo *root,
  * A free side-effect is that we can recognize redundant inequalities such
  * as "x < 4 AND x < 5"; only the tighter constraint will be counted.
  *
- * Of course this is all very dependent on the behavior of
- * scalarltsel/scalargtsel; perhaps some day we can generalize the approach.
+ * Of course this is all very dependent on the behavior of the inequality
+ * selectivity functions; perhaps some day we can generalize the approach.
  */
 Selectivity
 clauselist_selectivity(PlannerInfo *root,
@@ -218,17 +218,19 @@ clauselist_selectivity(PlannerInfo *root,
 			if (ok)
 			{
 				/*
-				 * If it's not a "<" or ">" operator, just merge the
+				 * If it's not a "<"/"<="/">"/">=" operator, just merge the
 				 * selectivity in generically.  But if it's the right oprrest,
 				 * add the clause to rqlist for later processing.
 				 */
 				switch (get_oprrest(expr->opno))
 				{
 					case F_SCALARLTSEL:
+					case F_SCALARLESEL:
 						addRangeClause(&rqlist, clause,
 									   varonleft, true, s2);
 						break;
 					case F_SCALARGTSEL:
+					case F_SCALARGESEL:
 						addRangeClause(&rqlist, clause,
 									   varonleft, false, s2);
 						break;
@@ -368,7 +370,7 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
 
 				/*------
 				 * We have found two similar clauses, such as
-				 * x < y AND x < z.
+				 * x < y AND x <= z.
 				 * Keep only the more restrictive one.
 				 *------
 				 */
@@ -388,7 +390,7 @@ addRangeClause(RangeQueryClause **rqlist, Node *clause,
 
 				/*------
 				 * We have found two similar clauses, such as
-				 * x > y AND x > z.
+				 * x > y AND x >= z.
 				 * Keep only the more restrictive one.
 				 *------
 				 */
diff --git a/src/backend/optimizer/path/costsize.c b/src/backend/optimizer/path/costsize.c
index 051a8544b0..d8db0b29e1 100644
--- a/src/backend/optimizer/path/costsize.c
+++ b/src/backend/optimizer/path/costsize.c
@@ -60,7 +60,7 @@
  * values.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -100,6 +100,13 @@
 
 #define LOG2(x)  (log(x) / 0.693147180559945)
 
+/*
+ * Append and MergeAppend nodes are less expensive than some other operations
+ * which use cpu_tuple_cost; instead of adding a separate GUC, estimate the
+ * per-tuple cost as cpu_tuple_cost multiplied by this value.
+ */
+#define APPEND_CPU_COST_MULTIPLIER 0.5
+
 
 double		seq_page_cost = DEFAULT_SEQ_PAGE_COST;
 double		random_page_cost = DEFAULT_RANDOM_PAGE_COST;
@@ -127,6 +134,9 @@ bool		enable_material = true;
 bool		enable_mergejoin = true;
 bool		enable_hashjoin = true;
 bool		enable_gathermerge = true;
+bool		enable_partitionwise_join = false;
+bool		enable_parallel_append = true;
+bool		enable_parallel_hash = true;
 
 typedef struct
 {
@@ -159,6 +169,8 @@ static Selectivity get_foreign_key_join_selectivity(PlannerInfo *root,
 								 Relids inner_relids,
 								 SpecialJoinInfo *sjinfo,
 								 List **restrictlist);
+static Cost append_nonpartial_cost(List *subpaths, int numpaths,
+					   int parallel_workers);
 static void set_rel_width(PlannerInfo *root, RelOptInfo *rel);
 static double relation_byte_size(double tuples, int width);
 static double page_size(double tuples, int width);
@@ -677,7 +689,9 @@ cost_index(IndexPath *path, PlannerInfo *root, double loop_count,
 		 * order.
 		 */
 		path->path.parallel_workers = compute_parallel_worker(baserel,
-															  rand_heap_pages, index_pages);
+															  rand_heap_pages,
+															  index_pages,
+															  max_parallel_workers_per_gather);
 
 		/*
 		 * Fall out if workers can't be assigned for parallel scan, because in
@@ -1740,6 +1754,178 @@ cost_sort(Path *path, PlannerInfo *root,
 	path->total_cost = startup_cost + run_cost;
 }
 
+/*
+ * append_nonpartial_cost
+ *	  Estimate the cost of the non-partial paths in a Parallel Append.
+ *	  The non-partial paths are assumed to be the first "numpaths" paths
+ *	  from the subpaths list, and to be in order of decreasing cost.
+ */
+static Cost
+append_nonpartial_cost(List *subpaths, int numpaths, int parallel_workers)
+{
+	Cost	   *costarr;
+	int			arrlen;
+	ListCell   *l;
+	ListCell   *cell;
+	int			i;
+	int			path_index;
+	int			min_index;
+	int			max_index;
+
+	if (numpaths == 0)
+		return 0;
+
+	/*
+	 * Array length is number of workers or number of relevants paths,
+	 * whichever is less.
+	 */
+	arrlen = Min(parallel_workers, numpaths);
+	costarr = (Cost *) palloc(sizeof(Cost) * arrlen);
+
+	/* The first few paths will each be claimed by a different worker. */
+	path_index = 0;
+	foreach(cell, subpaths)
+	{
+		Path	   *subpath = (Path *) lfirst(cell);
+
+		if (path_index == arrlen)
+			break;
+		costarr[path_index++] = subpath->total_cost;
+	}
+
+	/*
+	 * Since subpaths are sorted by decreasing cost, the last one will have
+	 * the minimum cost.
+	 */
+	min_index = arrlen - 1;
+
+	/*
+	 * For each of the remaining subpaths, add its cost to the array element
+	 * with minimum cost.
+	 */
+	for_each_cell(l, cell)
+	{
+		Path	   *subpath = (Path *) lfirst(l);
+		int			i;
+
+		/* Consider only the non-partial paths */
+		if (path_index++ == numpaths)
+			break;
+
+		costarr[min_index] += subpath->total_cost;
+
+		/* Update the new min cost array index */
+		for (min_index = i = 0; i < arrlen; i++)
+		{
+			if (costarr[i] < costarr[min_index])
+				min_index = i;
+		}
+	}
+
+	/* Return the highest cost from the array */
+	for (max_index = i = 0; i < arrlen; i++)
+	{
+		if (costarr[i] > costarr[max_index])
+			max_index = i;
+	}
+
+	return costarr[max_index];
+}
+
+/*
+ * cost_append
+ *	  Determines and returns the cost of an Append node.
+ */
+void
+cost_append(AppendPath *apath)
+{
+	ListCell   *l;
+
+	apath->path.startup_cost = 0;
+	apath->path.total_cost = 0;
+
+	if (apath->subpaths == NIL)
+		return;
+
+	if (!apath->path.parallel_aware)
+	{
+		Path	   *subpath = (Path *) linitial(apath->subpaths);
+
+		/*
+		 * Startup cost of non-parallel-aware Append is the startup cost of
+		 * first subpath.
+		 */
+		apath->path.startup_cost = subpath->startup_cost;
+
+		/* Compute rows and costs as sums of subplan rows and costs. */
+		foreach(l, apath->subpaths)
+		{
+			Path	   *subpath = (Path *) lfirst(l);
+
+			apath->path.rows += subpath->rows;
+			apath->path.total_cost += subpath->total_cost;
+		}
+	}
+	else						/* parallel-aware */
+	{
+		int			i = 0;
+		double		parallel_divisor = get_parallel_divisor(&apath->path);
+
+		/* Calculate startup cost. */
+		foreach(l, apath->subpaths)
+		{
+			Path	   *subpath = (Path *) lfirst(l);
+
+			/*
+			 * Append will start returning tuples when the child node having
+			 * lowest startup cost is done setting up. We consider only the
+			 * first few subplans that immediately get a worker assigned.
+			 */
+			if (i == 0)
+				apath->path.startup_cost = subpath->startup_cost;
+			else if (i < apath->path.parallel_workers)
+				apath->path.startup_cost = Min(apath->path.startup_cost,
+											   subpath->startup_cost);
+
+			/*
+			 * Apply parallel divisor to subpaths.  Scale the number of rows
+			 * for each partial subpath based on the ratio of the parallel
+			 * divisor originally used for the subpath to the one we adopted.
+			 * Also add the cost of partial paths to the total cost, but
+			 * ignore non-partial paths for now.
+			 */
+			if (i < apath->first_partial_path)
+				apath->path.rows += subpath->rows / parallel_divisor;
+			else
+			{
+				double		subpath_parallel_divisor;
+
+				subpath_parallel_divisor = get_parallel_divisor(subpath);
+				apath->path.rows += subpath->rows * (subpath_parallel_divisor /
+													 parallel_divisor);
+				apath->path.total_cost += subpath->total_cost;
+			}
+
+			apath->path.rows = clamp_row_est(apath->path.rows);
+
+			i++;
+		}
+
+		/* Add cost for non-partial subpaths. */
+		apath->path.total_cost +=
+			append_nonpartial_cost(apath->subpaths,
+								   apath->first_partial_path,
+								   apath->path.parallel_workers);
+	}
+
+	/*
+	 * Although Append does not do any selection or projection, it's not free;
+	 * add a small per-tuple overhead.
+	 */
+	apath->path.total_cost +=
+		cpu_tuple_cost * APPEND_CPU_COST_MULTIPLIER * apath->path.rows;
+}
+
 /*
  * cost_merge_append
  *	  Determines and returns the cost of a MergeAppend node.
@@ -1792,12 +1978,10 @@ cost_merge_append(Path *path, PlannerInfo *root,
 	run_cost += tuples * comparison_cost * logN;
 
 	/*
-	 * Also charge a small amount (arbitrarily set equal to operator cost) per
-	 * extracted tuple.  We don't charge cpu_tuple_cost because a MergeAppend
-	 * node doesn't do qual-checking or projection, so it has less overhead
-	 * than most plan nodes.
+	 * Although MergeAppend does not do any selection or projection, it's not
+	 * free; add a small per-tuple overhead.
 	 */
-	run_cost += cpu_operator_cost * tuples;
+	run_cost += cpu_tuple_cost * APPEND_CPU_COST_MULTIPLIER * tuples;
 
 	path->startup_cost = startup_cost + input_startup_cost;
 	path->total_cost = startup_cost + run_cost + input_total_cost;
@@ -1873,6 +2057,7 @@ void
 cost_agg(Path *path, PlannerInfo *root,
 		 AggStrategy aggstrategy, const AggClauseCosts *aggcosts,
 		 int numGroupCols, double numGroups,
+		 List *quals,
 		 Cost input_startup_cost, Cost input_total_cost,
 		 double input_tuples)
 {
@@ -1954,6 +2139,26 @@ cost_agg(Path *path, PlannerInfo *root,
 		output_tuples = numGroups;
 	}
 
+	/*
+	 * If there are quals (HAVING quals), account for their cost and
+	 * selectivity.
+	 */
+	if (quals)
+	{
+		QualCost	qual_cost;
+
+		cost_qual_eval(&qual_cost, quals, root);
+		startup_cost += qual_cost.startup;
+		total_cost += qual_cost.startup + output_tuples * qual_cost.per_tuple;
+
+		output_tuples = clamp_row_est(output_tuples *
+									  clauselist_selectivity(root,
+															 quals,
+															 0,
+															 JOIN_INNER,
+															 NULL));
+	}
+
 	path->rows = output_tuples;
 	path->startup_cost = startup_cost;
 	path->total_cost = total_cost;
@@ -2039,12 +2244,15 @@ cost_windowagg(Path *path, PlannerInfo *root,
 void
 cost_group(Path *path, PlannerInfo *root,
 		   int numGroupCols, double numGroups,
+		   List *quals,
 		   Cost input_startup_cost, Cost input_total_cost,
 		   double input_tuples)
 {
+	double		output_tuples;
 	Cost		startup_cost;
 	Cost		total_cost;
 
+	output_tuples = numGroups;
 	startup_cost = input_startup_cost;
 	total_cost = input_total_cost;
 
@@ -2054,7 +2262,27 @@ cost_group(Path *path, PlannerInfo *root,
 	 */
 	total_cost += cpu_operator_cost * input_tuples * numGroupCols;
 
-	path->rows = numGroups;
+	/*
+	 * If there are quals (HAVING quals), account for their cost and
+	 * selectivity.
+	 */
+	if (quals)
+	{
+		QualCost	qual_cost;
+
+		cost_qual_eval(&qual_cost, quals, root);
+		startup_cost += qual_cost.startup;
+		total_cost += qual_cost.startup + output_tuples * qual_cost.per_tuple;
+
+		output_tuples = clamp_row_est(output_tuples *
+									  clauselist_selectivity(root,
+															 quals,
+															 0,
+															 JOIN_INNER,
+															 NULL));
+	}
+
+	path->rows = output_tuples;
 	path->startup_cost = startup_cost;
 	path->total_cost = total_cost;
 }
@@ -2921,16 +3149,19 @@ initial_cost_hashjoin(PlannerInfo *root, JoinCostWorkspace *workspace,
 					  JoinType jointype,
 					  List *hashclauses,
 					  Path *outer_path, Path *inner_path,
-					  JoinPathExtraData *extra)
+					  JoinPathExtraData *extra,
+					  bool parallel_hash)
 {
 	Cost		startup_cost = 0;
 	Cost		run_cost = 0;
 	double		outer_path_rows = outer_path->rows;
 	double		inner_path_rows = inner_path->rows;
+	double		inner_path_rows_total = inner_path_rows;
 	int			num_hashclauses = list_length(hashclauses);
 	int			numbuckets;
 	int			numbatches;
 	int			num_skew_mcvs;
+	size_t		space_allowed;	/* unused */
 
 	/* cost of source data */
 	startup_cost += outer_path->startup_cost;
@@ -2951,6 +3182,15 @@ initial_cost_hashjoin(PlannerInfo *root, JoinCostWorkspace *workspace,
 		* inner_path_rows;
 	run_cost += cpu_operator_cost * num_hashclauses * outer_path_rows;
 
+	/*
+	 * If this is a parallel hash build, then the value we have for
+	 * inner_rows_total currently refers only to the rows returned by each
+	 * participant.  For shared hash table size estimation, we need the total
+	 * number, so we need to undo the division.
+	 */
+	if (parallel_hash)
+		inner_path_rows_total *= get_parallel_divisor(inner_path);
+
 	/*
 	 * Get hash table size that executor would use for inner relation.
 	 *
@@ -2961,9 +3201,12 @@ initial_cost_hashjoin(PlannerInfo *root, JoinCostWorkspace *workspace,
 	 * XXX at some point it might be interesting to try to account for skew
 	 * optimization in the cost estimate, but for now, we don't.
 	 */
-	ExecChooseHashTableSize(inner_path_rows,
+	ExecChooseHashTableSize(inner_path_rows_total,
 							inner_path->pathtarget->width,
 							true,	/* useskew */
+							parallel_hash,	/* try_combined_work_mem */
+							outer_path->parallel_workers,
+							&space_allowed,
 							&numbuckets,
 							&numbatches,
 							&num_skew_mcvs);
@@ -2995,6 +3238,7 @@ initial_cost_hashjoin(PlannerInfo *root, JoinCostWorkspace *workspace,
 	workspace->run_cost = run_cost;
 	workspace->numbuckets = numbuckets;
 	workspace->numbatches = numbatches;
+	workspace->inner_rows_total = inner_path_rows_total;
 }
 
 /*
@@ -3017,6 +3261,7 @@ final_cost_hashjoin(PlannerInfo *root, HashPath *path,
 	Path	   *inner_path = path->jpath.innerjoinpath;
 	double		outer_path_rows = outer_path->rows;
 	double		inner_path_rows = inner_path->rows;
+	double		inner_path_rows_total = workspace->inner_rows_total;
 	List	   *hashclauses = path->path_hashclauses;
 	Cost		startup_cost = workspace->startup_cost;
 	Cost		run_cost = workspace->run_cost;
@@ -3057,6 +3302,9 @@ final_cost_hashjoin(PlannerInfo *root, HashPath *path,
 	/* mark the path with estimated # of batches */
 	path->num_batches = numbatches;
 
+	/* store the total number of tuples (sum of partial row estimates) */
+	path->inner_rows_total = inner_path_rows_total;
+
 	/* and compute the number of "virtual" buckets in the whole join */
 	virtualbuckets = (double) numbuckets * (double) numbatches;
 
@@ -3632,11 +3880,14 @@ cost_qual_eval_walker(Node *node, cost_qual_eval_context *context)
 	else if (IsA(node, ArrayCoerceExpr))
 	{
 		ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) node;
-		Node	   *arraynode = (Node *) acoerce->arg;
-
-		if (OidIsValid(acoerce->elemfuncid))
-			context->total.per_tuple += get_func_cost(acoerce->elemfuncid) *
-				cpu_operator_cost * estimate_array_length(arraynode);
+		QualCost	perelemcost;
+
+		cost_qual_eval_node(&perelemcost, (Node *) acoerce->elemexpr,
+							context->root);
+		context->total.startup += perelemcost.startup;
+		if (perelemcost.per_tuple > 0)
+			context->total.per_tuple += perelemcost.per_tuple *
+				estimate_array_length((Node *) acoerce->arg);
 	}
 	else if (IsA(node, RowCompareExpr))
 	{
@@ -4550,15 +4801,11 @@ set_subquery_size_estimates(PlannerInfo *root, RelOptInfo *rel)
 {
 	PlannerInfo *subroot = rel->subroot;
 	RelOptInfo *sub_final_rel;
-	RangeTblEntry *rte PG_USED_FOR_ASSERTS_ONLY;
 	ListCell   *lc;
 
 	/* Should only be applied to base relations that are subqueries */
 	Assert(rel->relid > 0);
-#ifdef USE_ASSERT_CHECKING
-	rte = planner_rt_fetch(rel->relid, root);
-	Assert(rte->rtekind == RTE_SUBQUERY);
-#endif
+	Assert(planner_rt_fetch(rel->relid, root)->rtekind == RTE_SUBQUERY);
 
 	/*
 	 * Copy raw number of output rows from subquery.  All of its paths should
@@ -4670,14 +4917,9 @@ set_function_size_estimates(PlannerInfo *root, RelOptInfo *rel)
 void
 set_tablefunc_size_estimates(PlannerInfo *root, RelOptInfo *rel)
 {
-	RangeTblEntry *rte PG_USED_FOR_ASSERTS_ONLY;
-
 	/* Should only be applied to base relations that are functions */
 	Assert(rel->relid > 0);
-#ifdef USE_ASSERT_CHECKING
-	rte = planner_rt_fetch(rel->relid, root);
-	Assert(rte->rtekind == RTE_TABLEFUNC);
-#endif
+	Assert(planner_rt_fetch(rel->relid, root)->rtekind == RTE_TABLEFUNC);
 
 	rel->tuples = 100;
 
@@ -5098,7 +5340,6 @@ static double
 get_parallel_divisor(Path *path)
 {
 	double		parallel_divisor = path->parallel_workers;
-	double		leader_contribution;
 
 	/*
 	 * Early experience with parallel query suggests that when there is only
@@ -5111,9 +5352,14 @@ get_parallel_divisor(Path *path)
 	 * its time servicing each worker, and the remainder executing the
 	 * parallel plan.
 	 */
-	leader_contribution = 1.0 - (0.3 * path->parallel_workers);
-	if (leader_contribution > 0)
-		parallel_divisor += leader_contribution;
+	if (parallel_leader_participation)
+	{
+		double		leader_contribution;
+
+		leader_contribution = 1.0 - (0.3 * path->parallel_workers);
+		if (leader_contribution > 0)
+			parallel_divisor += leader_contribution;
+	}
 
 	return parallel_divisor;
 }
@@ -5132,6 +5378,8 @@ compute_bitmap_pages(PlannerInfo *root, RelOptInfo *baserel, Path *bitmapqual,
 	double		T;
 	double		pages_fetched;
 	double		tuples_fetched;
+	double		heap_pages;
+	long		maxentries;
 
 	/*
 	 * Fetch total cost of obtaining the bitmap, as well as its total
@@ -5146,6 +5394,24 @@ compute_bitmap_pages(PlannerInfo *root, RelOptInfo *baserel, Path *bitmapqual,
 
 	T = (baserel->pages > 1) ? (double) baserel->pages : 1.0;
 
+	/*
+	 * For a single scan, the number of heap pages that need to be fetched is
+	 * the same as the Mackert and Lohman formula for the case T <= b (ie, no
+	 * re-reads needed).
+	 */
+	pages_fetched = (2.0 * T * tuples_fetched) / (2.0 * T + tuples_fetched);
+
+	/*
+	 * Calculate the number of pages fetched from the heap.  Then based on
+	 * current work_mem estimate get the estimated maxentries in the bitmap.
+	 * (Note that we always do this calculation based on the number of pages
+	 * that would be fetched in a single iteration, even if loop_count > 1.
+	 * That's correct, because only that number of entries will be stored in
+	 * the bitmap at one time.)
+	 */
+	heap_pages = Min(pages_fetched, baserel->pages);
+	maxentries = tbm_calculate_entries(work_mem * 1024L);
+
 	if (loop_count > 1)
 	{
 		/*
@@ -5160,22 +5426,41 @@ compute_bitmap_pages(PlannerInfo *root, RelOptInfo *baserel, Path *bitmapqual,
 											root);
 		pages_fetched /= loop_count;
 	}
-	else
-	{
-		/*
-		 * For a single scan, the number of heap pages that need to be fetched
-		 * is the same as the Mackert and Lohman formula for the case T <= b
-		 * (ie, no re-reads needed).
-		 */
-		pages_fetched =
-			(2.0 * T * tuples_fetched) / (2.0 * T + tuples_fetched);
-	}
 
 	if (pages_fetched >= T)
 		pages_fetched = T;
 	else
 		pages_fetched = ceil(pages_fetched);
 
+	if (maxentries < heap_pages)
+	{
+		double		exact_pages;
+		double		lossy_pages;
+
+		/*
+		 * Crude approximation of the number of lossy pages.  Because of the
+		 * way tbm_lossify() is coded, the number of lossy pages increases
+		 * very sharply as soon as we run short of memory; this formula has
+		 * that property and seems to perform adequately in testing, but it's
+		 * possible we could do better somehow.
+		 */
+		lossy_pages = Max(0, heap_pages - maxentries / 2);
+		exact_pages = heap_pages - lossy_pages;
+
+		/*
+		 * If there are lossy pages then recompute the  number of tuples
+		 * processed by the bitmap heap node.  We assume here that the chance
+		 * of a given tuple coming from an exact page is the same as the
+		 * chance that a given page is exact.  This might not be true, but
+		 * it's not clear how we can do any better.
+		 */
+		if (lossy_pages > 0)
+			tuples_fetched =
+				clamp_row_est(indexSelectivity *
+							  (exact_pages / heap_pages) * baserel->tuples +
+							  (lossy_pages / heap_pages) * baserel->tuples);
+	}
+
 	if (cost)
 		*cost = indexTotalCost;
 	if (tuple)
diff --git a/src/backend/optimizer/path/equivclass.c b/src/backend/optimizer/path/equivclass.c
index 7997f50c18..70a925c63a 100644
--- a/src/backend/optimizer/path/equivclass.c
+++ b/src/backend/optimizer/path/equivclass.c
@@ -6,7 +6,7 @@
  * See src/backend/optimizer/README for discussion of EquivalenceClasses.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -27,6 +27,7 @@
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
 #include "optimizer/prep.h"
+#include "optimizer/restrictinfo.h"
 #include "optimizer/var.h"
 #include "utils/lsyscache.h"
 
@@ -71,8 +72,14 @@ static bool reconsider_full_join_clause(PlannerInfo *root,
  *	  any delay by an outer join, so its two sides can be considered equal
  *	  anywhere they are both computable; moreover that equality can be
  *	  extended transitively.  Record this knowledge in the EquivalenceClass
- *	  data structure.  Returns TRUE if successful, FALSE if not (in which
- *	  case caller should treat the clause as ordinary, not an equivalence).
+ *	  data structure, if applicable.  Returns true if successful, false if not
+ *	  (in which case caller should treat the clause as ordinary, not an
+ *	  equivalence).
+ *
+ * In some cases, although we cannot convert a clause into EquivalenceClass
+ * knowledge, we can still modify it to a more useful form than the original.
+ * Then, *p_restrictinfo will be replaced by a new RestrictInfo, which is what
+ * the caller should use for further processing.
  *
  * If below_outer_join is true, then the clause was found below the nullable
  * side of an outer join, so its sides might validly be both NULL rather than
@@ -104,9 +111,11 @@ static bool reconsider_full_join_clause(PlannerInfo *root,
  * memory context.
  */
 bool
-process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
+process_equivalence(PlannerInfo *root,
+					RestrictInfo **p_restrictinfo,
 					bool below_outer_join)
 {
+	RestrictInfo *restrictinfo = *p_restrictinfo;
 	Expr	   *clause = restrictinfo->clause;
 	Oid			opno,
 				collation,
@@ -154,16 +163,45 @@ process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
 									   collation);
 
 	/*
-	 * Reject clauses of the form X=X.  These are not as redundant as they
-	 * might seem at first glance: assuming the operator is strict, this is
-	 * really an expensive way to write X IS NOT NULL.  So we must not risk
-	 * just losing the clause, which would be possible if there is already a
-	 * single-element EquivalenceClass containing X.  The case is not common
-	 * enough to be worth contorting the EC machinery for, so just reject the
-	 * clause and let it be processed as a normal restriction clause.
+	 * Clauses of the form X=X cannot be translated into EquivalenceClasses.
+	 * We'd either end up with a single-entry EC, losing the knowledge that
+	 * the clause was present at all, or else make an EC with duplicate
+	 * entries, causing other issues.
 	 */
 	if (equal(item1, item2))
-		return false;			/* X=X is not a useful equivalence */
+	{
+		/*
+		 * If the operator is strict, then the clause can be treated as just
+		 * "X IS NOT NULL".  (Since we know we are considering a top-level
+		 * qual, we can ignore the difference between FALSE and NULL results.)
+		 * It's worth making the conversion because we'll typically get a much
+		 * better selectivity estimate than we would for X=X.
+		 *
+		 * If the operator is not strict, we can't be sure what it will do
+		 * with NULLs, so don't attempt to optimize it.
+		 */
+		set_opfuncid((OpExpr *) clause);
+		if (func_strict(((OpExpr *) clause)->opfuncid))
+		{
+			NullTest   *ntest = makeNode(NullTest);
+
+			ntest->arg = item1;
+			ntest->nulltesttype = IS_NOT_NULL;
+			ntest->argisrow = false;	/* correct even if composite arg */
+			ntest->location = -1;
+
+			*p_restrictinfo =
+				make_restrictinfo((Expr *) ntest,
+								  restrictinfo->is_pushed_down,
+								  restrictinfo->outerjoin_delayed,
+								  restrictinfo->pseudoconstant,
+								  restrictinfo->security_level,
+								  NULL,
+								  restrictinfo->outer_relids,
+								  restrictinfo->nullable_relids);
+		}
+		return false;
+	}
 
 	/*
 	 * If below outer join, check for strictness, else reject.
@@ -564,8 +602,8 @@ add_eq_member(EquivalenceClass *ec, Expr *expr, Relids relids,
  * so for now we live with just reporting the first match.  See also
  * generate_implied_equalities_for_column and match_pathkeys_to_index.)
  *
- * If create_it is TRUE, we'll build a new EquivalenceClass when there is no
- * match.  If create_it is FALSE, we just return NULL when no match.
+ * If create_it is true, we'll build a new EquivalenceClass when there is no
+ * match.  If create_it is false, we just return NULL when no match.
  *
  * This can be used safely both before and after EquivalenceClass merging;
  * since it never causes merging it does not invalidate any existing ECs
@@ -1637,7 +1675,7 @@ reconsider_outer_join_clauses(PlannerInfo *root)
 /*
  * reconsider_outer_join_clauses for a single LEFT/RIGHT JOIN clause
  *
- * Returns TRUE if we were able to propagate a constant through the clause.
+ * Returns true if we were able to propagate a constant through the clause.
  */
 static bool
 reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
@@ -1741,7 +1779,7 @@ reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
 												   bms_copy(inner_relids),
 												   bms_copy(inner_nullable_relids),
 												   cur_ec->ec_min_security);
-			if (process_equivalence(root, newrinfo, true))
+			if (process_equivalence(root, &newrinfo, true))
 				match = true;
 		}
 
@@ -1762,7 +1800,7 @@ reconsider_outer_join_clause(PlannerInfo *root, RestrictInfo *rinfo,
 /*
  * reconsider_outer_join_clauses for a single FULL JOIN clause
  *
- * Returns TRUE if we were able to propagate a constant through the clause.
+ * Returns true if we were able to propagate a constant through the clause.
  */
 static bool
 reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
@@ -1884,7 +1922,7 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 													   bms_copy(left_relids),
 													   bms_copy(left_nullable_relids),
 													   cur_ec->ec_min_security);
-				if (process_equivalence(root, newrinfo, true))
+				if (process_equivalence(root, &newrinfo, true))
 					matchleft = true;
 			}
 			eq_op = select_equality_operator(cur_ec,
@@ -1899,7 +1937,7 @@ reconsider_full_join_clause(PlannerInfo *root, RestrictInfo *rinfo)
 													   bms_copy(right_relids),
 													   bms_copy(right_nullable_relids),
 													   cur_ec->ec_min_security);
-				if (process_equivalence(root, newrinfo, true))
+				if (process_equivalence(root, &newrinfo, true))
 					matchright = true;
 			}
 		}
diff --git a/src/backend/optimizer/path/indxpath.c b/src/backend/optimizer/path/indxpath.c
index f35380391a..7fc70804f8 100644
--- a/src/backend/optimizer/path/indxpath.c
+++ b/src/backend/optimizer/path/indxpath.c
@@ -4,7 +4,7 @@
  *	  Routines to determine which indexes are usable for scanning a
  *	  given relation, and create Paths accordingly.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -838,12 +838,12 @@ get_index_paths(PlannerInfo *root, RelOptInfo *rel,
  *
  * If skip_nonnative_saop is non-NULL, we ignore ScalarArrayOpExpr clauses
  * unless the index AM supports them directly, and we set *skip_nonnative_saop
- * to TRUE if we found any such clauses (caller must initialize the variable
- * to FALSE).  If it's NULL, we do not ignore ScalarArrayOpExpr clauses.
+ * to true if we found any such clauses (caller must initialize the variable
+ * to false).  If it's NULL, we do not ignore ScalarArrayOpExpr clauses.
  *
  * If skip_lower_saop is non-NULL, we ignore ScalarArrayOpExpr clauses for
- * non-first index columns, and we set *skip_lower_saop to TRUE if we found
- * any such clauses (caller must initialize the variable to FALSE).  If it's
+ * non-first index columns, and we set *skip_lower_saop to true if we found
+ * any such clauses (caller must initialize the variable to false).  If it's
  * NULL, we do not ignore non-first ScalarArrayOpExpr clauses, but they will
  * result in considering the scan's output to be unordered.
  *
diff --git a/src/backend/optimizer/path/joinpath.c b/src/backend/optimizer/path/joinpath.c
index 43833ea9c9..688f440b92 100644
--- a/src/backend/optimizer/path/joinpath.c
+++ b/src/backend/optimizer/path/joinpath.c
@@ -3,7 +3,7 @@
  * joinpath.c
  *	  Routines to find all possible paths for processing a set of joins
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,9 +26,19 @@
 /* Hook for plugins to get control in add_paths_to_joinrel() */
 set_join_pathlist_hook_type set_join_pathlist_hook = NULL;
 
-#define PATH_PARAM_BY_REL(path, rel)  \
+/*
+ * Paths parameterized by the parent can be considered to be parameterized by
+ * any of its child.
+ */
+#define PATH_PARAM_BY_PARENT(path, rel)	\
+	((path)->param_info && bms_overlap(PATH_REQ_OUTER(path),	\
+									   (rel)->top_parent_relids))
+#define PATH_PARAM_BY_REL_SELF(path, rel)  \
 	((path)->param_info && bms_overlap(PATH_REQ_OUTER(path), (rel)->relids))
 
+#define PATH_PARAM_BY_REL(path, rel)	\
+	(PATH_PARAM_BY_REL_SELF(path, rel) || PATH_PARAM_BY_PARENT(path, rel))
+
 static void try_partial_mergejoin_path(PlannerInfo *root,
 						   RelOptInfo *joinrel,
 						   Path *outer_path,
@@ -115,6 +125,19 @@ add_paths_to_joinrel(PlannerInfo *root,
 	JoinPathExtraData extra;
 	bool		mergejoin_allowed = true;
 	ListCell   *lc;
+	Relids		joinrelids;
+
+	/*
+	 * PlannerInfo doesn't contain the SpecialJoinInfos created for joins
+	 * between child relations, even if there is a SpecialJoinInfo node for
+	 * the join between the topmost parents. So, while calculating Relids set
+	 * representing the restriction, consider relids of topmost parent of
+	 * partitions.
+	 */
+	if (joinrel->reloptkind == RELOPT_OTHER_JOINREL)
+		joinrelids = joinrel->top_parent_relids;
+	else
+		joinrelids = joinrel->relids;
 
 	extra.restrictlist = restrictlist;
 	extra.mergeclause_list = NIL;
@@ -211,16 +234,16 @@ add_paths_to_joinrel(PlannerInfo *root,
 		 * join has already been proven legal.)  If the SJ is relevant, it
 		 * presents constraints for joining to anything not in its RHS.
 		 */
-		if (bms_overlap(joinrel->relids, sjinfo2->min_righthand) &&
-			!bms_overlap(joinrel->relids, sjinfo2->min_lefthand))
+		if (bms_overlap(joinrelids, sjinfo2->min_righthand) &&
+			!bms_overlap(joinrelids, sjinfo2->min_lefthand))
 			extra.param_source_rels = bms_join(extra.param_source_rels,
 											   bms_difference(root->all_baserels,
 															  sjinfo2->min_righthand));
 
 		/* full joins constrain both sides symmetrically */
 		if (sjinfo2->jointype == JOIN_FULL &&
-			bms_overlap(joinrel->relids, sjinfo2->min_lefthand) &&
-			!bms_overlap(joinrel->relids, sjinfo2->min_righthand))
+			bms_overlap(joinrelids, sjinfo2->min_lefthand) &&
+			!bms_overlap(joinrelids, sjinfo2->min_righthand))
 			extra.param_source_rels = bms_join(extra.param_source_rels,
 											   bms_difference(root->all_baserels,
 															  sjinfo2->min_lefthand));
@@ -313,7 +336,7 @@ add_paths_to_joinrel(PlannerInfo *root,
  * across joins unless there's a join-order-constraint-based reason to do so.
  * So we ignore the param_source_rels restriction when this case applies.
  *
- * allow_star_schema_join() returns TRUE if the param_source_rels restriction
+ * allow_star_schema_join() returns true if the param_source_rels restriction
  * should be overridden, ie, it's okay to perform this join.
  */
 static inline bool
@@ -347,11 +370,25 @@ try_nestloop_path(PlannerInfo *root,
 	JoinCostWorkspace workspace;
 	RelOptInfo *innerrel = inner_path->parent;
 	RelOptInfo *outerrel = outer_path->parent;
-	Relids		innerrelids = innerrel->relids;
-	Relids		outerrelids = outerrel->relids;
+	Relids		innerrelids;
+	Relids		outerrelids;
 	Relids		inner_paramrels = PATH_REQ_OUTER(inner_path);
 	Relids		outer_paramrels = PATH_REQ_OUTER(outer_path);
 
+	/*
+	 * Paths are parameterized by top-level parents, so run parameterization
+	 * tests on the parent relids.
+	 */
+	if (innerrel->top_parent_relids)
+		innerrelids = innerrel->top_parent_relids;
+	else
+		innerrelids = innerrel->relids;
+
+	if (outerrel->top_parent_relids)
+		outerrelids = outerrel->top_parent_relids;
+	else
+		outerrelids = outerrel->relids;
+
 	/*
 	 * Check to see if proposed path is still parameterized, and reject if the
 	 * parameterization wouldn't be sensible --- unless allow_star_schema_join
@@ -387,6 +424,27 @@ try_nestloop_path(PlannerInfo *root,
 						  workspace.startup_cost, workspace.total_cost,
 						  pathkeys, required_outer))
 	{
+		/*
+		 * If the inner path is parameterized, it is parameterized by the
+		 * topmost parent of the outer rel, not the outer rel itself.  Fix
+		 * that.
+		 */
+		if (PATH_PARAM_BY_PARENT(inner_path, outer_path->parent))
+		{
+			inner_path = reparameterize_path_by_child(root, inner_path,
+													  outer_path->parent);
+
+			/*
+			 * If we could not translate the path, we can't create nest loop
+			 * path.
+			 */
+			if (!inner_path)
+			{
+				bms_free(required_outer);
+				return;
+			}
+		}
+
 		add_path(joinrel, (Path *)
 				 create_nestloop_path(root,
 									  joinrel,
@@ -432,8 +490,20 @@ try_partial_nestloop_path(PlannerInfo *root,
 	if (inner_path->param_info != NULL)
 	{
 		Relids		inner_paramrels = inner_path->param_info->ppi_req_outer;
+		RelOptInfo *outerrel = outer_path->parent;
+		Relids		outerrelids;
 
-		if (!bms_is_subset(inner_paramrels, outer_path->parent->relids))
+		/*
+		 * The inner and outer paths are parameterized, if at all, by the top
+		 * level parents, not the child relations, so we must use those relids
+		 * for our paramaterization tests.
+		 */
+		if (outerrel->top_parent_relids)
+			outerrelids = outerrel->top_parent_relids;
+		else
+			outerrelids = outerrel->relids;
+
+		if (!bms_is_subset(inner_paramrels, outerrelids))
 			return;
 	}
 
@@ -446,6 +516,22 @@ try_partial_nestloop_path(PlannerInfo *root,
 	if (!add_partial_path_precheck(joinrel, workspace.total_cost, pathkeys))
 		return;
 
+	/*
+	 * If the inner path is parameterized, it is parameterized by the topmost
+	 * parent of the outer rel, not the outer rel itself.  Fix that.
+	 */
+	if (PATH_PARAM_BY_PARENT(inner_path, outer_path->parent))
+	{
+		inner_path = reparameterize_path_by_child(root, inner_path,
+												  outer_path->parent);
+
+		/*
+		 * If we could not translate the path, we can't create nest loop path.
+		 */
+		if (!inner_path)
+			return;
+	}
+
 	/* Might be good enough to be worth trying, so let's try it. */
 	add_partial_path(joinrel, (Path *)
 					 create_nestloop_path(root,
@@ -661,7 +747,7 @@ try_hashjoin_path(PlannerInfo *root,
 	 * never have any output pathkeys, per comments in create_hashjoin_path.
 	 */
 	initial_cost_hashjoin(root, &workspace, jointype, hashclauses,
-						  outer_path, inner_path, extra);
+						  outer_path, inner_path, extra, false);
 
 	if (add_path_precheck(joinrel,
 						  workspace.startup_cost, workspace.total_cost,
@@ -675,6 +761,7 @@ try_hashjoin_path(PlannerInfo *root,
 									  extra,
 									  outer_path,
 									  inner_path,
+									  false,	/* parallel_hash */
 									  extra->restrictlist,
 									  required_outer,
 									  hashclauses));
@@ -690,6 +777,10 @@ try_hashjoin_path(PlannerInfo *root,
  * try_partial_hashjoin_path
  *	  Consider a partial hashjoin join path; if it appears useful, push it into
  *	  the joinrel's partial_pathlist via add_partial_path().
+ *	  The outer side is partial.  If parallel_hash is true, then the inner path
+ *	  must be partial and will be run in parallel to create one or more shared
+ *	  hash tables; otherwise the inner path must be complete and a copy of it
+ *	  is run in every process to create separate identical private hash tables.
  */
 static void
 try_partial_hashjoin_path(PlannerInfo *root,
@@ -698,7 +789,8 @@ try_partial_hashjoin_path(PlannerInfo *root,
 						  Path *inner_path,
 						  List *hashclauses,
 						  JoinType jointype,
-						  JoinPathExtraData *extra)
+						  JoinPathExtraData *extra,
+						  bool parallel_hash)
 {
 	JoinCostWorkspace workspace;
 
@@ -722,7 +814,7 @@ try_partial_hashjoin_path(PlannerInfo *root,
 	 * cost.  Bail out right away if it looks terrible.
 	 */
 	initial_cost_hashjoin(root, &workspace, jointype, hashclauses,
-						  outer_path, inner_path, extra);
+						  outer_path, inner_path, extra, true);
 	if (!add_partial_path_precheck(joinrel, workspace.total_cost, NIL))
 		return;
 
@@ -735,6 +827,7 @@ try_partial_hashjoin_path(PlannerInfo *root,
 										  extra,
 										  outer_path,
 										  inner_path,
+										  parallel_hash,
 										  extra->restrictlist,
 										  NULL,
 										  hashclauses));
@@ -916,10 +1009,10 @@ sort_inner_and_outer(PlannerInfo *root,
 			outerkeys = all_pathkeys;	/* no work at first one... */
 
 		/* Sort the mergeclauses into the corresponding ordering */
-		cur_mergeclauses = find_mergeclauses_for_pathkeys(root,
-														  outerkeys,
-														  true,
-														  extra->mergeclause_list);
+		cur_mergeclauses =
+			find_mergeclauses_for_outer_pathkeys(root,
+												 outerkeys,
+												 extra->mergeclause_list);
 
 		/* Should have used them all... */
 		Assert(list_length(cur_mergeclauses) == list_length(extra->mergeclause_list));
@@ -1009,10 +1102,10 @@ generate_mergejoin_paths(PlannerInfo *root,
 		jointype = JOIN_INNER;
 
 	/* Look for useful mergeclauses (if any) */
-	mergeclauses = find_mergeclauses_for_pathkeys(root,
-												  outerpath->pathkeys,
-												  true,
-												  extra->mergeclause_list);
+	mergeclauses =
+		find_mergeclauses_for_outer_pathkeys(root,
+											 outerpath->pathkeys,
+											 extra->mergeclause_list);
 
 	/*
 	 * Done with this outer path if no chance for a mergejoin.
@@ -1135,10 +1228,9 @@ generate_mergejoin_paths(PlannerInfo *root,
 			if (sortkeycnt < num_sortkeys)
 			{
 				newclauses =
-					find_mergeclauses_for_pathkeys(root,
-												   trialsortkeys,
-												   false,
-												   mergeclauses);
+					trim_mergeclauses_for_inner_pathkeys(root,
+														 mergeclauses,
+														 trialsortkeys);
 				Assert(newclauses != NIL);
 			}
 			else
@@ -1179,10 +1271,9 @@ generate_mergejoin_paths(PlannerInfo *root,
 					if (sortkeycnt < num_sortkeys)
 					{
 						newclauses =
-							find_mergeclauses_for_pathkeys(root,
-														   trialsortkeys,
-														   false,
-														   mergeclauses);
+							trim_mergeclauses_for_inner_pathkeys(root,
+																 mergeclauses,
+																 trialsortkeys);
 						Assert(newclauses != NIL);
 					}
 					else
@@ -1753,6 +1844,10 @@ hash_inner_and_outer(PlannerInfo *root,
 		 * able to properly guarantee uniqueness.  Similarly, we can't handle
 		 * JOIN_FULL and JOIN_RIGHT, because they can produce false null
 		 * extended rows.  Also, the resulting path must not be parameterized.
+		 * We would be able to support JOIN_FULL and JOIN_RIGHT for Parallel
+		 * Hash, since in that case we're back to a single hash table with a
+		 * single set of match bits for each batch, but that will require
+		 * figuring out a deadlock-free way to wait for the probe to finish.
 		 */
 		if (joinrel->consider_parallel &&
 			save_jointype != JOIN_UNIQUE_OUTER &&
@@ -1762,11 +1857,27 @@ hash_inner_and_outer(PlannerInfo *root,
 			bms_is_empty(joinrel->lateral_relids))
 		{
 			Path	   *cheapest_partial_outer;
+			Path	   *cheapest_partial_inner = NULL;
 			Path	   *cheapest_safe_inner = NULL;
 
 			cheapest_partial_outer =
 				(Path *) linitial(outerrel->partial_pathlist);
 
+			/*
+			 * Can we use a partial inner plan too, so that we can build a
+			 * shared hash table in parallel?
+			 */
+			if (innerrel->partial_pathlist != NIL && enable_parallel_hash)
+			{
+				cheapest_partial_inner =
+					(Path *) linitial(innerrel->partial_pathlist);
+				try_partial_hashjoin_path(root, joinrel,
+										  cheapest_partial_outer,
+										  cheapest_partial_inner,
+										  hashclauses, jointype, extra,
+										  true /* parallel_hash */ );
+			}
+
 			/*
 			 * Normally, given that the joinrel is parallel-safe, the cheapest
 			 * total inner path will also be parallel-safe, but if not, we'll
@@ -1784,7 +1895,8 @@ hash_inner_and_outer(PlannerInfo *root,
 				try_partial_hashjoin_path(root, joinrel,
 										  cheapest_partial_outer,
 										  cheapest_safe_inner,
-										  hashclauses, jointype, extra);
+										  hashclauses, jointype, extra,
+										  false /* parallel_hash */ );
 		}
 	}
 }
@@ -1794,7 +1906,7 @@ hash_inner_and_outer(PlannerInfo *root,
  *	  Select mergejoin clauses that are usable for a particular join.
  *	  Returns a list of RestrictInfo nodes for those clauses.
  *
- * *mergejoin_allowed is normally set to TRUE, but it is set to FALSE if
+ * *mergejoin_allowed is normally set to true, but it is set to false if
  * this is a right/full join and there are nonmergejoinable join clauses.
  * The executor's mergejoin machinery cannot handle such cases, so we have
  * to avoid generating a mergejoin plan.  (Note that this flag does NOT
diff --git a/src/backend/optimizer/path/joinrels.c b/src/backend/optimizer/path/joinrels.c
index 6ee23509c5..3f1c1b3477 100644
--- a/src/backend/optimizer/path/joinrels.c
+++ b/src/backend/optimizer/path/joinrels.c
@@ -3,7 +3,7 @@
  * joinrels.c
  *	  Routines to determine which relations should be joined
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -14,9 +14,14 @@
  */
 #include "postgres.h"
 
+#include "miscadmin.h"
+#include "catalog/partition.h"
+#include "optimizer/clauses.h"
 #include "optimizer/joininfo.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
+#include "optimizer/prep.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 
 
@@ -29,12 +34,17 @@ static void make_rels_by_clauseless_joins(PlannerInfo *root,
 static bool has_join_restriction(PlannerInfo *root, RelOptInfo *rel);
 static bool has_legal_joinclause(PlannerInfo *root, RelOptInfo *rel);
 static bool is_dummy_rel(RelOptInfo *rel);
-static void mark_dummy_rel(RelOptInfo *rel);
 static bool restriction_is_constant_false(List *restrictlist,
 							  bool only_pushed_down);
 static void populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1,
 							RelOptInfo *rel2, RelOptInfo *joinrel,
 							SpecialJoinInfo *sjinfo, List *restrictlist);
+static void try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1,
+						RelOptInfo *rel2, RelOptInfo *joinrel,
+						SpecialJoinInfo *parent_sjinfo,
+						List *parent_restrictlist);
+static int match_expr_to_partition_keys(Expr *expr, RelOptInfo *rel,
+							 bool strict_op);
 
 
 /*
@@ -323,7 +333,7 @@ make_rels_by_clauseless_joins(PlannerInfo *root,
  *
  * On success, *sjinfo_p is set to NULL if this is to be a plain inner join,
  * else it's set to point to the associated SpecialJoinInfo node.  Also,
- * *reversed_p is set TRUE if the given relations need to be swapped to
+ * *reversed_p is set true if the given relations need to be swapped to
  * match the SpecialJoinInfo node.
  */
 static bool
@@ -892,6 +902,9 @@ populate_joinrel_with_paths(PlannerInfo *root, RelOptInfo *rel1,
 			elog(ERROR, "unrecognized join type: %d", (int) sjinfo->jointype);
 			break;
 	}
+
+	/* Apply partitionwise join technique, if possible. */
+	try_partitionwise_join(root, rel1, rel2, joinrel, sjinfo, restrictlist);
 }
 
 
@@ -1197,7 +1210,7 @@ is_dummy_rel(RelOptInfo *rel)
  * is that the best solution is to explicitly make the dummy path in the same
  * context the given RelOptInfo is in.
  */
-static void
+void
 mark_dummy_rel(RelOptInfo *rel)
 {
 	MemoryContext oldcontext;
@@ -1217,7 +1230,8 @@ mark_dummy_rel(RelOptInfo *rel)
 	rel->partial_pathlist = NIL;
 
 	/* Set up the dummy path */
-	add_path(rel, (Path *) create_append_path(rel, NIL, NULL, 0, NIL));
+	add_path(rel, (Path *) create_append_path(rel, NIL, NIL, NULL,
+											  0, false, NIL, -1));
 
 	/* Set or update cheapest_total_path and related fields */
 	set_cheapest(rel);
@@ -1235,7 +1249,7 @@ mark_dummy_rel(RelOptInfo *rel)
  * decide there's no match for an outer row, which is pretty stupid.  So,
  * we need to detect the case.
  *
- * If only_pushed_down is TRUE, then consider only pushed-down quals.
+ * If only_pushed_down is true, then consider only pushed-down quals.
  */
 static bool
 restriction_is_constant_false(List *restrictlist, bool only_pushed_down)
@@ -1268,3 +1282,290 @@ restriction_is_constant_false(List *restrictlist, bool only_pushed_down)
 	}
 	return false;
 }
+
+/*
+ * Assess whether join between given two partitioned relations can be broken
+ * down into joins between matching partitions; a technique called
+ * "partitionwise join"
+ *
+ * Partitionwise join is possible when a. Joining relations have same
+ * partitioning scheme b. There exists an equi-join between the partition keys
+ * of the two relations.
+ *
+ * Partitionwise join is planned as follows (details: optimizer/README.)
+ *
+ * 1. Create the RelOptInfos for joins between matching partitions i.e
+ * child-joins and add paths to them.
+ *
+ * 2. Construct Append or MergeAppend paths across the set of child joins.
+ * This second phase is implemented by generate_partitionwise_join_paths().
+ *
+ * The RelOptInfo, SpecialJoinInfo and restrictlist for each child join are
+ * obtained by translating the respective parent join structures.
+ */
+static void
+try_partitionwise_join(PlannerInfo *root, RelOptInfo *rel1, RelOptInfo *rel2,
+						RelOptInfo *joinrel, SpecialJoinInfo *parent_sjinfo,
+						List *parent_restrictlist)
+{
+	int			nparts;
+	int			cnt_parts;
+
+	/* Guard against stack overflow due to overly deep partition hierarchy. */
+	check_stack_depth();
+
+	/* Nothing to do, if the join relation is not partitioned. */
+	if (!IS_PARTITIONED_REL(joinrel))
+		return;
+
+	/*
+	 * Since this join relation is partitioned, all the base relations
+	 * participating in this join must be partitioned and so are all the
+	 * intermediate join relations.
+	 */
+	Assert(IS_PARTITIONED_REL(rel1) && IS_PARTITIONED_REL(rel2));
+	Assert(REL_HAS_ALL_PART_PROPS(rel1) && REL_HAS_ALL_PART_PROPS(rel2));
+
+	/*
+	 * The partition scheme of the join relation should match that of the
+	 * joining relations.
+	 */
+	Assert(joinrel->part_scheme == rel1->part_scheme &&
+		   joinrel->part_scheme == rel2->part_scheme);
+
+	/*
+	 * Since we allow partitionwise join only when the partition bounds of
+	 * the joining relations exactly match, the partition bounds of the join
+	 * should match those of the joining relations.
+	 */
+	Assert(partition_bounds_equal(joinrel->part_scheme->partnatts,
+								  joinrel->part_scheme->parttyplen,
+								  joinrel->part_scheme->parttypbyval,
+								  joinrel->boundinfo, rel1->boundinfo));
+	Assert(partition_bounds_equal(joinrel->part_scheme->partnatts,
+								  joinrel->part_scheme->parttyplen,
+								  joinrel->part_scheme->parttypbyval,
+								  joinrel->boundinfo, rel2->boundinfo));
+
+	nparts = joinrel->nparts;
+
+	/*
+	 * Create child-join relations for this partitioned join, if those don't
+	 * exist. Add paths to child-joins for a pair of child relations
+	 * corresponding to the given pair of parent relations.
+	 */
+	for (cnt_parts = 0; cnt_parts < nparts; cnt_parts++)
+	{
+		RelOptInfo *child_rel1 = rel1->part_rels[cnt_parts];
+		RelOptInfo *child_rel2 = rel2->part_rels[cnt_parts];
+		SpecialJoinInfo *child_sjinfo;
+		List	   *child_restrictlist;
+		RelOptInfo *child_joinrel;
+		Relids		child_joinrelids;
+		AppendRelInfo **appinfos;
+		int			nappinfos;
+
+		/* We should never try to join two overlapping sets of rels. */
+		Assert(!bms_overlap(child_rel1->relids, child_rel2->relids));
+		child_joinrelids = bms_union(child_rel1->relids, child_rel2->relids);
+		appinfos = find_appinfos_by_relids(root, child_joinrelids, &nappinfos);
+
+		/*
+		 * Construct SpecialJoinInfo from parent join relations's
+		 * SpecialJoinInfo.
+		 */
+		child_sjinfo = build_child_join_sjinfo(root, parent_sjinfo,
+											   child_rel1->relids,
+											   child_rel2->relids);
+
+		/*
+		 * Construct restrictions applicable to the child join from those
+		 * applicable to the parent join.
+		 */
+		child_restrictlist =
+			(List *) adjust_appendrel_attrs(root,
+											(Node *) parent_restrictlist,
+											nappinfos, appinfos);
+		pfree(appinfos);
+
+		child_joinrel = joinrel->part_rels[cnt_parts];
+		if (!child_joinrel)
+		{
+			child_joinrel = build_child_join_rel(root, child_rel1, child_rel2,
+												 joinrel, child_restrictlist,
+												 child_sjinfo,
+												 child_sjinfo->jointype);
+			joinrel->part_rels[cnt_parts] = child_joinrel;
+		}
+
+		Assert(bms_equal(child_joinrel->relids, child_joinrelids));
+
+		populate_joinrel_with_paths(root, child_rel1, child_rel2,
+									child_joinrel, child_sjinfo,
+									child_restrictlist);
+	}
+}
+
+/*
+ * Returns true if there exists an equi-join condition for each pair of
+ * partition keys from given relations being joined.
+ */
+bool
+have_partkey_equi_join(RelOptInfo *rel1, RelOptInfo *rel2, JoinType jointype,
+					   List *restrictlist)
+{
+	PartitionScheme part_scheme = rel1->part_scheme;
+	ListCell   *lc;
+	int			cnt_pks;
+	bool		pk_has_clause[PARTITION_MAX_KEYS];
+	bool		strict_op;
+
+	/*
+	 * This function should be called when the joining relations have same
+	 * partitioning scheme.
+	 */
+	Assert(rel1->part_scheme == rel2->part_scheme);
+	Assert(part_scheme);
+
+	memset(pk_has_clause, 0, sizeof(pk_has_clause));
+	foreach(lc, restrictlist)
+	{
+		RestrictInfo *rinfo = lfirst_node(RestrictInfo, lc);
+		OpExpr	   *opexpr;
+		Expr	   *expr1;
+		Expr	   *expr2;
+		int			ipk1;
+		int			ipk2;
+
+		/* If processing an outer join, only use its own join clauses. */
+		if (IS_OUTER_JOIN(jointype) && rinfo->is_pushed_down)
+			continue;
+
+		/* Skip clauses which can not be used for a join. */
+		if (!rinfo->can_join)
+			continue;
+
+		/* Skip clauses which are not equality conditions. */
+		if (!rinfo->mergeopfamilies && !OidIsValid(rinfo->hashjoinoperator))
+			continue;
+
+		opexpr = (OpExpr *) rinfo->clause;
+		Assert(is_opclause(opexpr));
+
+		/*
+		 * The equi-join between partition keys is strict if equi-join between
+		 * at least one partition key is using a strict operator. See
+		 * explanation about outer join reordering identity 3 in
+		 * optimizer/README
+		 */
+		strict_op = op_strict(opexpr->opno);
+
+		/* Match the operands to the relation. */
+		if (bms_is_subset(rinfo->left_relids, rel1->relids) &&
+			bms_is_subset(rinfo->right_relids, rel2->relids))
+		{
+			expr1 = linitial(opexpr->args);
+			expr2 = lsecond(opexpr->args);
+		}
+		else if (bms_is_subset(rinfo->left_relids, rel2->relids) &&
+				 bms_is_subset(rinfo->right_relids, rel1->relids))
+		{
+			expr1 = lsecond(opexpr->args);
+			expr2 = linitial(opexpr->args);
+		}
+		else
+			continue;
+
+		/*
+		 * Only clauses referencing the partition keys are useful for
+		 * partitionwise join.
+		 */
+		ipk1 = match_expr_to_partition_keys(expr1, rel1, strict_op);
+		if (ipk1 < 0)
+			continue;
+		ipk2 = match_expr_to_partition_keys(expr2, rel2, strict_op);
+		if (ipk2 < 0)
+			continue;
+
+		/*
+		 * If the clause refers to keys at different ordinal positions, it can
+		 * not be used for partitionwise join.
+		 */
+		if (ipk1 != ipk2)
+			continue;
+
+		/*
+		 * The clause allows partitionwise join if only it uses the same
+		 * operator family as that specified by the partition key.
+		 */
+		if (rel1->part_scheme->strategy == PARTITION_STRATEGY_HASH)
+		{
+			if (!op_in_opfamily(rinfo->hashjoinoperator,
+								part_scheme->partopfamily[ipk1]))
+				continue;
+		}
+		else if (!list_member_oid(rinfo->mergeopfamilies,
+								  part_scheme->partopfamily[ipk1]))
+			continue;
+
+		/* Mark the partition key as having an equi-join clause. */
+		pk_has_clause[ipk1] = true;
+	}
+
+	/* Check whether every partition key has an equi-join condition. */
+	for (cnt_pks = 0; cnt_pks < part_scheme->partnatts; cnt_pks++)
+	{
+		if (!pk_has_clause[cnt_pks])
+			return false;
+	}
+
+	return true;
+}
+
+/*
+ * Find the partition key from the given relation matching the given
+ * expression. If found, return the index of the partition key, else return -1.
+ */
+static int
+match_expr_to_partition_keys(Expr *expr, RelOptInfo *rel, bool strict_op)
+{
+	int			cnt;
+
+	/* This function should be called only for partitioned relations. */
+	Assert(rel->part_scheme);
+
+	/* Remove any relabel decorations. */
+	while (IsA(expr, RelabelType))
+		expr = (Expr *) (castNode(RelabelType, expr))->arg;
+
+	for (cnt = 0; cnt < rel->part_scheme->partnatts; cnt++)
+	{
+		ListCell   *lc;
+
+		Assert(rel->partexprs);
+		foreach(lc, rel->partexprs[cnt])
+		{
+			if (equal(lfirst(lc), expr))
+				return cnt;
+		}
+
+		if (!strict_op)
+			continue;
+
+		/*
+		 * If it's a strict equi-join a NULL partition key on one side will
+		 * not join a NULL partition key on the other side. So, rows with NULL
+		 * partition key from a partition on one side can not join with those
+		 * from a non-matching partition on the other side. So, search the
+		 * nullable partition keys as well.
+		 */
+		Assert(rel->nullable_partexprs);
+		foreach(lc, rel->nullable_partexprs[cnt])
+		{
+			if (equal(lfirst(lc), expr))
+				return cnt;
+		}
+	}
+
+	return -1;
+}
diff --git a/src/backend/optimizer/path/pathkeys.c b/src/backend/optimizer/path/pathkeys.c
index 9d83a5ca62..6d1cc3b8a0 100644
--- a/src/backend/optimizer/path/pathkeys.c
+++ b/src/backend/optimizer/path/pathkeys.c
@@ -7,7 +7,7 @@
  * the nature and use of path keys.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -162,8 +162,8 @@ pathkey_is_redundant(PathKey *new_pathkey, List *pathkeys)
  * considered.  Otherwise child members are ignored.  (See the comments for
  * get_eclass_for_sort_expr.)
  *
- * create_it is TRUE if we should create any missing EquivalenceClass
- * needed to represent the sort key.  If it's FALSE, we return NULL if the
+ * create_it is true if we should create any missing EquivalenceClass
+ * needed to represent the sort key.  If it's false, we return NULL if the
  * sort key isn't already present in any EquivalenceClass.
  */
 static PathKey *
@@ -981,16 +981,14 @@ update_mergeclause_eclasses(PlannerInfo *root, RestrictInfo *restrictinfo)
 }
 
 /*
- * find_mergeclauses_for_pathkeys
- *	  This routine attempts to find a set of mergeclauses that can be
- *	  used with a specified ordering for one of the input relations.
+ * find_mergeclauses_for_outer_pathkeys
+ *	  This routine attempts to find a list of mergeclauses that can be
+ *	  used with a specified ordering for the join's outer relation.
  *	  If successful, it returns a list of mergeclauses.
  *
- * 'pathkeys' is a pathkeys list showing the ordering of an input path.
- * 'outer_keys' is TRUE if these keys are for the outer input path,
- *			FALSE if for inner.
+ * 'pathkeys' is a pathkeys list showing the ordering of an outer-rel path.
  * 'restrictinfos' is a list of mergejoinable restriction clauses for the
- *			join relation being formed.
+ *			join relation being formed, in no particular order.
  *
  * The restrictinfos must be marked (via outer_is_left) to show which side
  * of each clause is associated with the current outer path.  (See
@@ -998,12 +996,12 @@ update_mergeclause_eclasses(PlannerInfo *root, RestrictInfo *restrictinfo)
  *
  * The result is NIL if no merge can be done, else a maximal list of
  * usable mergeclauses (represented as a list of their restrictinfo nodes).
+ * The list is ordered to match the pathkeys, as required for execution.
  */
 List *
-find_mergeclauses_for_pathkeys(PlannerInfo *root,
-							   List *pathkeys,
-							   bool outer_keys,
-							   List *restrictinfos)
+find_mergeclauses_for_outer_pathkeys(PlannerInfo *root,
+									 List *pathkeys,
+									 List *restrictinfos)
 {
 	List	   *mergeclauses = NIL;
 	ListCell   *i;
@@ -1044,19 +1042,20 @@ find_mergeclauses_for_pathkeys(PlannerInfo *root,
 		 *
 		 * It's possible that multiple matching clauses might have different
 		 * ECs on the other side, in which case the order we put them into our
-		 * result makes a difference in the pathkeys required for the other
-		 * input path.  However this routine hasn't got any info about which
+		 * result makes a difference in the pathkeys required for the inner
+		 * input rel.  However this routine hasn't got any info about which
 		 * order would be best, so we don't worry about that.
 		 *
 		 * It's also possible that the selected mergejoin clauses produce
-		 * a noncanonical ordering of pathkeys for the other side, ie, we
+		 * a noncanonical ordering of pathkeys for the inner side, ie, we
 		 * might select clauses that reference b.v1, b.v2, b.v1 in that
 		 * order.  This is not harmful in itself, though it suggests that
-		 * the clauses are partially redundant.  Since it happens only with
-		 * redundant query conditions, we don't bother to eliminate it.
-		 * make_inner_pathkeys_for_merge() has to delete duplicates when
-		 * it constructs the canonical pathkeys list, and we also have to
-		 * deal with the case in create_mergejoin_plan().
+		 * the clauses are partially redundant.  Since the alternative is
+		 * to omit mergejoin clauses and thereby possibly fail to generate a
+		 * plan altogether, we live with it.  make_inner_pathkeys_for_merge()
+		 * has to delete duplicates when it constructs the inner pathkeys
+		 * list, and we also have to deal with such cases specially in
+		 * create_mergejoin_plan().
 		 *----------
 		 */
 		foreach(j, restrictinfos)
@@ -1064,12 +1063,8 @@ find_mergeclauses_for_pathkeys(PlannerInfo *root,
 			RestrictInfo *rinfo = (RestrictInfo *) lfirst(j);
 			EquivalenceClass *clause_ec;
 
-			if (outer_keys)
-				clause_ec = rinfo->outer_is_left ?
-					rinfo->left_ec : rinfo->right_ec;
-			else
-				clause_ec = rinfo->outer_is_left ?
-					rinfo->right_ec : rinfo->left_ec;
+			clause_ec = rinfo->outer_is_left ?
+				rinfo->left_ec : rinfo->right_ec;
 			if (clause_ec == pathkey_ec)
 				matched_restrictinfos = lappend(matched_restrictinfos, rinfo);
 		}
@@ -1273,8 +1268,8 @@ select_outer_pathkeys_for_merge(PlannerInfo *root,
  *	  must be applied to an inner path to make it usable with the
  *	  given mergeclauses.
  *
- * 'mergeclauses' is a list of RestrictInfos for mergejoin clauses
- *			that will be used in a merge join.
+ * 'mergeclauses' is a list of RestrictInfos for the mergejoin clauses
+ *			that will be used in a merge join, in order.
  * 'outer_pathkeys' are the already-known canonical pathkeys for the outer
  *			side of the join.
  *
@@ -1351,8 +1346,13 @@ make_inner_pathkeys_for_merge(PlannerInfo *root,
 											 opathkey->pk_nulls_first);
 
 		/*
-		 * Don't generate redundant pathkeys (can happen if multiple
-		 * mergeclauses refer to same EC).
+		 * Don't generate redundant pathkeys (which can happen if multiple
+		 * mergeclauses refer to the same EC).  Because we do this, the output
+		 * pathkey list isn't necessarily ordered like the mergeclauses, which
+		 * complicates life for create_mergejoin_plan().  But if we didn't,
+		 * we'd have a noncanonical sort key list, which would be bad; for one
+		 * reason, it certainly wouldn't match any available sort order for
+		 * the input relation.
 		 */
 		if (!pathkey_is_redundant(pathkey, pathkeys))
 			pathkeys = lappend(pathkeys, pathkey);
@@ -1361,6 +1361,98 @@ make_inner_pathkeys_for_merge(PlannerInfo *root,
 	return pathkeys;
 }
 
+/*
+ * trim_mergeclauses_for_inner_pathkeys
+ *	  This routine trims a list of mergeclauses to include just those that
+ *	  work with a specified ordering for the join's inner relation.
+ *
+ * 'mergeclauses' is a list of RestrictInfos for mergejoin clauses for the
+ *			join relation being formed, in an order known to work for the
+ *			currently-considered sort ordering of the join's outer rel.
+ * 'pathkeys' is a pathkeys list showing the ordering of an inner-rel path;
+ *			it should be equal to, or a truncation of, the result of
+ *			make_inner_pathkeys_for_merge for these mergeclauses.
+ *
+ * What we return will be a prefix of the given mergeclauses list.
+ *
+ * We need this logic because make_inner_pathkeys_for_merge's result isn't
+ * necessarily in the same order as the mergeclauses.  That means that if we
+ * consider an inner-rel pathkey list that is a truncation of that result,
+ * we might need to drop mergeclauses even though they match a surviving inner
+ * pathkey.  This happens when they are to the right of a mergeclause that
+ * matches a removed inner pathkey.
+ *
+ * The mergeclauses must be marked (via outer_is_left) to show which side
+ * of each clause is associated with the current outer path.  (See
+ * select_mergejoin_clauses())
+ */
+List *
+trim_mergeclauses_for_inner_pathkeys(PlannerInfo *root,
+									 List *mergeclauses,
+									 List *pathkeys)
+{
+	List	   *new_mergeclauses = NIL;
+	PathKey    *pathkey;
+	EquivalenceClass *pathkey_ec;
+	bool		matched_pathkey;
+	ListCell   *lip;
+	ListCell   *i;
+
+	/* No pathkeys => no mergeclauses (though we don't expect this case) */
+	if (pathkeys == NIL)
+		return NIL;
+	/* Initialize to consider first pathkey */
+	lip = list_head(pathkeys);
+	pathkey = (PathKey *) lfirst(lip);
+	pathkey_ec = pathkey->pk_eclass;
+	lip = lnext(lip);
+	matched_pathkey = false;
+
+	/* Scan mergeclauses to see how many we can use */
+	foreach(i, mergeclauses)
+	{
+		RestrictInfo *rinfo = (RestrictInfo *) lfirst(i);
+		EquivalenceClass *clause_ec;
+
+		/* Assume we needn't do update_mergeclause_eclasses again here */
+
+		/* Check clause's inner-rel EC against current pathkey */
+		clause_ec = rinfo->outer_is_left ?
+			rinfo->right_ec : rinfo->left_ec;
+
+		/* If we don't have a match, attempt to advance to next pathkey */
+		if (clause_ec != pathkey_ec)
+		{
+			/* If we had no clauses matching this inner pathkey, must stop */
+			if (!matched_pathkey)
+				break;
+
+			/* Advance to next inner pathkey, if any */
+			if (lip == NULL)
+				break;
+			pathkey = (PathKey *) lfirst(lip);
+			pathkey_ec = pathkey->pk_eclass;
+			lip = lnext(lip);
+			matched_pathkey = false;
+		}
+
+		/* If mergeclause matches current inner pathkey, we can use it */
+		if (clause_ec == pathkey_ec)
+		{
+			new_mergeclauses = lappend(new_mergeclauses, rinfo);
+			matched_pathkey = true;
+		}
+		else
+		{
+			/* Else, no hope of adding any more mergeclauses */
+			break;
+		}
+	}
+
+	return new_mergeclauses;
+}
+
+
 /****************************************************************************
  *		PATHKEY USEFULNESS CHECKS
  *
diff --git a/src/backend/optimizer/path/tidpath.c b/src/backend/optimizer/path/tidpath.c
index a2fe661075..3bb5b8def6 100644
--- a/src/backend/optimizer/path/tidpath.c
+++ b/src/backend/optimizer/path/tidpath.c
@@ -25,7 +25,7 @@
  * for that.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/plan/analyzejoins.c b/src/backend/optimizer/plan/analyzejoins.c
index 34317fe778..ef25fefa45 100644
--- a/src/backend/optimizer/plan/analyzejoins.c
+++ b/src/backend/optimizer/plan/analyzejoins.c
@@ -11,7 +11,7 @@
  * is that we have to work harder to clean up after ourselves when we modify
  * the query, since the derived data structures have to be updated too.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -582,7 +582,7 @@ reduce_unique_semijoins(PlannerInfo *root)
  *		Could the relation possibly be proven distinct on some set of columns?
  *
  * This is effectively a pre-checking function for rel_is_distinct_for().
- * It must return TRUE if rel_is_distinct_for() could possibly return TRUE
+ * It must return true if rel_is_distinct_for() could possibly return true
  * with this rel, but it should not expend a lot of cycles.  The idea is
  * that callers can avoid doing possibly-expensive processing to compute
  * rel_is_distinct_for()'s argument lists if the call could not possibly
@@ -703,6 +703,14 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list)
 			else
 				var = (Var *) get_leftop(rinfo->clause);
 
+			/*
+			 * We may ignore any RelabelType node above the operand.  (There
+			 * won't be more than one, since eval_const_expressions() has been
+			 * applied already.)
+			 */
+			if (var && IsA(var, RelabelType))
+				var = (Var *) ((RelabelType *) var)->arg;
+
 			/*
 			 * If inner side isn't a Var referencing a subquery output column,
 			 * this clause doesn't help us.
@@ -727,7 +735,7 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list)
  *		on some set of output columns?
  *
  * This is effectively a pre-checking function for query_is_distinct_for().
- * It must return TRUE if query_is_distinct_for() could possibly return TRUE
+ * It must return true if query_is_distinct_for() could possibly return true
  * with this query, but it should not expend a lot of cycles.  The idea is
  * that callers can avoid doing possibly-expensive processing to compute
  * query_is_distinct_for()'s argument lists if the call could not possibly
@@ -736,8 +744,8 @@ rel_is_distinct_for(PlannerInfo *root, RelOptInfo *rel, List *clause_list)
 bool
 query_supports_distinctness(Query *query)
 {
-	/* we don't cope with SRFs, see comment below */
-	if (query->hasTargetSRFs)
+	/* SRFs break distinctness except with DISTINCT, see below */
+	if (query->hasTargetSRFs && query->distinctClause == NIL)
 		return false;
 
 	/* check for features we can prove distinctness with */
@@ -778,21 +786,11 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 
 	Assert(list_length(colnos) == list_length(opids));
 
-	/*
-	 * A set-returning function in the query's targetlist can result in
-	 * returning duplicate rows, if the SRF is evaluated after the
-	 * de-duplication step; so we play it safe and say "no" if there are any
-	 * SRFs.  (We could be certain that it's okay if SRFs appear only in the
-	 * specified columns, since those must be evaluated before de-duplication;
-	 * but it doesn't presently seem worth the complication to check that.)
-	 */
-	if (query->hasTargetSRFs)
-		return false;
-
 	/*
 	 * DISTINCT (including DISTINCT ON) guarantees uniqueness if all the
 	 * columns in the DISTINCT clause appear in colnos and operator semantics
-	 * match.
+	 * match.  This is true even if there are SRFs in the DISTINCT columns or
+	 * elsewhere in the tlist.
 	 */
 	if (query->distinctClause)
 	{
@@ -811,6 +809,16 @@ query_is_distinct_for(Query *query, List *colnos, List *opids)
 			return true;
 	}
 
+	/*
+	 * Otherwise, a set-returning function in the query's targetlist can
+	 * result in returning duplicate rows, despite any grouping that might
+	 * occur before tlist evaluation.  (If all tlist SRFs are within GROUP BY
+	 * columns, it would be safe because they'd be expanded before grouping.
+	 * But it doesn't currently seem worth the effort to check for that.)
+	 */
+	if (query->hasTargetSRFs)
+		return false;
+
 	/*
 	 * Similarly, GROUP BY without GROUPING SETS guarantees uniqueness if all
 	 * the grouped columns appear in colnos and operator semantics match.
diff --git a/src/backend/optimizer/plan/createplan.c b/src/backend/optimizer/plan/createplan.c
index 5c934f223d..9ae1bf31d5 100644
--- a/src/backend/optimizer/plan/createplan.c
+++ b/src/backend/optimizer/plan/createplan.c
@@ -5,7 +5,7 @@
  *	  Planning is complete, we just need to convert the selected
  *	  Path into a Plan.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -203,7 +203,8 @@ static NamedTuplestoreScan *make_namedtuplestorescan(List *qptlist, List *qpqual
 						 Index scanrelid, char *enrname);
 static WorkTableScan *make_worktablescan(List *qptlist, List *qpqual,
 				   Index scanrelid, int wtParam);
-static Append *make_append(List *appendplans, List *tlist, List *partitioned_rels);
+static Append *make_append(List *appendplans, int first_partial_plan,
+			List *tlist, List *partitioned_rels);
 static RecursiveUnion *make_recursive_union(List *tlist,
 					 Plan *lefttree,
 					 Plan *righttree,
@@ -250,7 +251,8 @@ static Plan *prepare_sort_from_pathkeys(Plan *lefttree, List *pathkeys,
 static EquivalenceMember *find_ec_member_for_tle(EquivalenceClass *ec,
 					   TargetEntry *tle,
 					   Relids relids);
-static Sort *make_sort_from_pathkeys(Plan *lefttree, List *pathkeys);
+static Sort *make_sort_from_pathkeys(Plan *lefttree, List *pathkeys,
+						Relids relids);
 static Sort *make_sort_from_groupcols(List *groupcls,
 						 AttrNumber *grpColIdx,
 						 Plan *lefttree);
@@ -259,6 +261,8 @@ static WindowAgg *make_windowagg(List *tlist, Index winref,
 			   int partNumCols, AttrNumber *partColIdx, Oid *partOperators,
 			   int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators,
 			   int frameOptions, Node *startOffset, Node *endOffset,
+			   Oid startInRangeFunc, Oid endInRangeFunc,
+			   Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst,
 			   Plan *lefttree);
 static Group *make_group(List *tlist, List *qual, int numGroupCols,
 		   AttrNumber *grpColIdx, Oid *grpOperators,
@@ -267,7 +271,7 @@ static Unique *make_unique_from_sortclauses(Plan *lefttree, List *distinctList);
 static Unique *make_unique_from_pathkeys(Plan *lefttree,
 						  List *pathkeys, int numCols);
 static Gather *make_gather(List *qptlist, List *qpqual,
-			int nworkers, bool single_copy, Plan *subplan);
+			int nworkers, int rescan_param, bool single_copy, Plan *subplan);
 static SetOp *make_setop(SetOpCmd cmd, SetOpStrategy strategy, Plan *lefttree,
 		   List *distinctList, AttrNumber flagColIdx, int firstFlag,
 		   long numGroups);
@@ -277,6 +281,7 @@ static ProjectSet *make_project_set(List *tlist, Plan *subplan);
 static ModifyTable *make_modifytable(PlannerInfo *root,
 				 CmdType operation, bool canSetTag,
 				 Index nominalRelation, List *partitioned_rels,
+				 bool partColsUpdated,
 				 List *resultRelations, List *subplans,
 				 List *withCheckOptionLists, List *returningLists,
 				 List *rowMarks, OnConflictExpr *onconflict, int epqParam);
@@ -355,6 +360,9 @@ create_plan_recurse(PlannerInfo *root, Path *best_path, int flags)
 {
 	Plan	   *plan;
 
+	/* Guard against stack overflow due to overly complex plans */
+	check_stack_depth();
+
 	switch (best_path->pathtype)
 	{
 		case T_SeqScan:
@@ -806,6 +814,15 @@ use_physical_tlist(PlannerInfo *root, Path *path, int flags)
 	if (IsA(path, CustomPath))
 		return false;
 
+	/*
+	 * If a bitmap scan's tlist is empty, keep it as-is.  This may allow the
+	 * executor to skip heap page fetches, and in any case, the benefit of
+	 * using a physical tlist instead would be minimal.
+	 */
+	if (IsA(path, BitmapHeapPath) &&
+		path->pathtarget->exprs == NIL)
+		return false;
+
 	/*
 	 * Can't do it if any system columns or whole-row Vars are requested.
 	 * (This could possibly be fixed but would take some fragile assumptions
@@ -1049,7 +1066,8 @@ create_append_plan(PlannerInfo *root, AppendPath *best_path)
 	 * parent-rel Vars it'll be asked to emit.
 	 */
 
-	plan = make_append(subplans, tlist, best_path->partitioned_rels);
+	plan = make_append(subplans, best_path->first_partial_path,
+					   tlist, best_path->partitioned_rels);
 
 	copy_generic_path_info(&plan->plan, (Path *) best_path);
 
@@ -1471,6 +1489,7 @@ create_gather_plan(PlannerInfo *root, GatherPath *best_path)
 	gather_plan = make_gather(tlist,
 							  NIL,
 							  best_path->num_workers,
+							  SS_assign_special_param(root),
 							  best_path->single_copy,
 							  subplan);
 
@@ -1505,6 +1524,9 @@ create_gather_merge_plan(PlannerInfo *root, GatherMergePath *best_path)
 	gm_plan->num_workers = best_path->num_workers;
 	copy_generic_path_info(&gm_plan->plan, &best_path->path);
 
+	/* Assign the rescan Param. */
+	gm_plan->rescan_param = SS_assign_special_param(root);
+
 	/* Gather Merge is pointless with no pathkeys; use Gather instead. */
 	Assert(pathkeys != NIL);
 
@@ -1648,7 +1670,7 @@ create_sort_plan(PlannerInfo *root, SortPath *best_path, int flags)
 	subplan = create_plan_recurse(root, best_path->subpath,
 								  flags | CP_SMALL_TLIST);
 
-	plan = make_sort_from_pathkeys(subplan, best_path->path.pathkeys);
+	plan = make_sort_from_pathkeys(subplan, best_path->path.pathkeys, NULL);
 
 	copy_generic_path_info(&plan->plan, (Path *) best_path);
 
@@ -2103,6 +2125,11 @@ create_windowagg_plan(PlannerInfo *root, WindowAggPath *best_path)
 						  wc->frameOptions,
 						  wc->startOffset,
 						  wc->endOffset,
+						  wc->startInRangeFunc,
+						  wc->endInRangeFunc,
+						  wc->inRangeColl,
+						  wc->inRangeAsc,
+						  wc->inRangeNullsFirst,
 						  subplan);
 
 	copy_generic_path_info(&plan->plan, (Path *) best_path);
@@ -2357,6 +2384,7 @@ create_modifytable_plan(PlannerInfo *root, ModifyTablePath *best_path)
 							best_path->canSetTag,
 							best_path->nominalRelation,
 							best_path->partitioned_rels,
+							best_path->partColsUpdated,
 							best_path->resultRelations,
 							subplans,
 							best_path->withCheckOptionLists,
@@ -3763,10 +3791,14 @@ create_mergejoin_plan(PlannerInfo *root,
 	Oid		   *mergecollations;
 	int		   *mergestrategies;
 	bool	   *mergenullsfirst;
+	PathKey    *opathkey;
+	EquivalenceClass *opeclass;
 	int			i;
 	ListCell   *lc;
 	ListCell   *lop;
 	ListCell   *lip;
+	Path	   *outer_path = best_path->jpath.outerjoinpath;
+	Path	   *inner_path = best_path->jpath.innerjoinpath;
 
 	/*
 	 * MergeJoin can project, so we don't have to demand exact tlists from the
@@ -3830,8 +3862,10 @@ create_mergejoin_plan(PlannerInfo *root,
 	 */
 	if (best_path->outersortkeys)
 	{
+		Relids		outer_relids = outer_path->parent->relids;
 		Sort	   *sort = make_sort_from_pathkeys(outer_plan,
-												   best_path->outersortkeys);
+												   best_path->outersortkeys,
+												   outer_relids);
 
 		label_sort_with_costsize(root, sort, -1.0);
 		outer_plan = (Plan *) sort;
@@ -3842,8 +3876,10 @@ create_mergejoin_plan(PlannerInfo *root,
 
 	if (best_path->innersortkeys)
 	{
+		Relids		inner_relids = inner_path->parent->relids;
 		Sort	   *sort = make_sort_from_pathkeys(inner_plan,
-												   best_path->innersortkeys);
+												   best_path->innersortkeys,
+												   inner_relids);
 
 		label_sort_with_costsize(root, sort, -1.0);
 		inner_plan = (Plan *) sort;
@@ -3875,7 +3911,8 @@ create_mergejoin_plan(PlannerInfo *root,
 	 * Compute the opfamily/collation/strategy/nullsfirst arrays needed by the
 	 * executor.  The information is in the pathkeys for the two inputs, but
 	 * we need to be careful about the possibility of mergeclauses sharing a
-	 * pathkey (compare find_mergeclauses_for_pathkeys()).
+	 * pathkey, as well as the possibility that the inner pathkeys are not in
+	 * an order matching the mergeclauses.
 	 */
 	nClauses = list_length(mergeclauses);
 	Assert(nClauses == list_length(best_path->path_mergeclauses));
@@ -3884,6 +3921,8 @@ create_mergejoin_plan(PlannerInfo *root,
 	mergestrategies = (int *) palloc(nClauses * sizeof(int));
 	mergenullsfirst = (bool *) palloc(nClauses * sizeof(bool));
 
+	opathkey = NULL;
+	opeclass = NULL;
 	lop = list_head(outerpathkeys);
 	lip = list_head(innerpathkeys);
 	i = 0;
@@ -3892,11 +3931,9 @@ create_mergejoin_plan(PlannerInfo *root,
 		RestrictInfo *rinfo = lfirst_node(RestrictInfo, lc);
 		EquivalenceClass *oeclass;
 		EquivalenceClass *ieclass;
-		PathKey    *opathkey;
-		PathKey    *ipathkey;
-		EquivalenceClass *opeclass;
-		EquivalenceClass *ipeclass;
-		ListCell   *l2;
+		PathKey    *ipathkey = NULL;
+		EquivalenceClass *ipeclass = NULL;
+		bool		first_inner_match = false;
 
 		/* fetch outer/inner eclass from mergeclause */
 		if (rinfo->outer_is_left)
@@ -3913,104 +3950,96 @@ create_mergejoin_plan(PlannerInfo *root,
 		Assert(ieclass != NULL);
 
 		/*
-		 * For debugging purposes, we check that the eclasses match the paths'
-		 * pathkeys.  In typical cases the merge clauses are one-to-one with
-		 * the pathkeys, but when dealing with partially redundant query
-		 * conditions, we might have clauses that re-reference earlier path
-		 * keys.  The case that we need to reject is where a pathkey is
-		 * entirely skipped over.
+		 * We must identify the pathkey elements associated with this clause
+		 * by matching the eclasses (which should give a unique match, since
+		 * the pathkey lists should be canonical).  In typical cases the merge
+		 * clauses are one-to-one with the pathkeys, but when dealing with
+		 * partially redundant query conditions, things are more complicated.
+		 *
+		 * lop and lip reference the first as-yet-unmatched pathkey elements.
+		 * If they're NULL then all pathkey elements have been matched.
 		 *
-		 * lop and lip reference the first as-yet-unused pathkey elements;
-		 * it's okay to match them, or any element before them.  If they're
-		 * NULL then we have found all pathkey elements to be used.
+		 * The ordering of the outer pathkeys should match the mergeclauses,
+		 * by construction (see find_mergeclauses_for_outer_pathkeys()). There
+		 * could be more than one mergeclause for the same outer pathkey, but
+		 * no pathkey may be entirely skipped over.
 		 */
-		if (lop)
+		if (oeclass != opeclass)	/* multiple matches are not interesting */
 		{
+			/* doesn't match the current opathkey, so must match the next */
+			if (lop == NULL)
+				elog(ERROR, "outer pathkeys do not match mergeclauses");
 			opathkey = (PathKey *) lfirst(lop);
 			opeclass = opathkey->pk_eclass;
-			if (oeclass == opeclass)
-			{
-				/* fast path for typical case */
-				lop = lnext(lop);
-			}
-			else
-			{
-				/* redundant clauses ... must match something before lop */
-				foreach(l2, outerpathkeys)
-				{
-					if (l2 == lop)
-						break;
-					opathkey = (PathKey *) lfirst(l2);
-					opeclass = opathkey->pk_eclass;
-					if (oeclass == opeclass)
-						break;
-				}
-				if (oeclass != opeclass)
-					elog(ERROR, "outer pathkeys do not match mergeclauses");
-			}
-		}
-		else
-		{
-			/* redundant clauses ... must match some already-used pathkey */
-			opathkey = NULL;
-			opeclass = NULL;
-			foreach(l2, outerpathkeys)
-			{
-				opathkey = (PathKey *) lfirst(l2);
-				opeclass = opathkey->pk_eclass;
-				if (oeclass == opeclass)
-					break;
-			}
-			if (l2 == NULL)
+			lop = lnext(lop);
+			if (oeclass != opeclass)
 				elog(ERROR, "outer pathkeys do not match mergeclauses");
 		}
 
+		/*
+		 * The inner pathkeys likewise should not have skipped-over keys, but
+		 * it's possible for a mergeclause to reference some earlier inner
+		 * pathkey if we had redundant pathkeys.  For example we might have
+		 * mergeclauses like "o.a = i.x AND o.b = i.y AND o.c = i.x".  The
+		 * implied inner ordering is then "ORDER BY x, y, x", but the pathkey
+		 * mechanism drops the second sort by x as redundant, and this code
+		 * must cope.
+		 *
+		 * It's also possible for the implied inner-rel ordering to be like
+		 * "ORDER BY x, y, x DESC".  We still drop the second instance of x as
+		 * redundant; but this means that the sort ordering of a redundant
+		 * inner pathkey should not be considered significant.  So we must
+		 * detect whether this is the first clause matching an inner pathkey.
+		 */
 		if (lip)
 		{
 			ipathkey = (PathKey *) lfirst(lip);
 			ipeclass = ipathkey->pk_eclass;
 			if (ieclass == ipeclass)
 			{
-				/* fast path for typical case */
+				/* successful first match to this inner pathkey */
 				lip = lnext(lip);
-			}
-			else
-			{
-				/* redundant clauses ... must match something before lip */
-				foreach(l2, innerpathkeys)
-				{
-					if (l2 == lip)
-						break;
-					ipathkey = (PathKey *) lfirst(l2);
-					ipeclass = ipathkey->pk_eclass;
-					if (ieclass == ipeclass)
-						break;
-				}
-				if (ieclass != ipeclass)
-					elog(ERROR, "inner pathkeys do not match mergeclauses");
+				first_inner_match = true;
 			}
 		}
-		else
+		if (!first_inner_match)
 		{
-			/* redundant clauses ... must match some already-used pathkey */
-			ipathkey = NULL;
-			ipeclass = NULL;
+			/* redundant clause ... must match something before lip */
+			ListCell   *l2;
+
 			foreach(l2, innerpathkeys)
 			{
+				if (l2 == lip)
+					break;
 				ipathkey = (PathKey *) lfirst(l2);
 				ipeclass = ipathkey->pk_eclass;
 				if (ieclass == ipeclass)
 					break;
 			}
-			if (l2 == NULL)
+			if (ieclass != ipeclass)
 				elog(ERROR, "inner pathkeys do not match mergeclauses");
 		}
 
-		/* pathkeys should match each other too (more debugging) */
+		/*
+		 * The pathkeys should always match each other as to opfamily and
+		 * collation (which affect equality), but if we're considering a
+		 * redundant inner pathkey, its sort ordering might not match.  In
+		 * such cases we may ignore the inner pathkey's sort ordering and use
+		 * the outer's.  (In effect, we're lying to the executor about the
+		 * sort direction of this inner column, but it does not matter since
+		 * the run-time row comparisons would only reach this column when
+		 * there's equality for the earlier column containing the same eclass.
+		 * There could be only one value in this column for the range of inner
+		 * rows having a given value in the earlier column, so it does not
+		 * matter which way we imagine this column to be ordered.)  But a
+		 * non-redundant inner pathkey had better match outer's ordering too.
+		 */
 		if (opathkey->pk_opfamily != ipathkey->pk_opfamily ||
-			opathkey->pk_eclass->ec_collation != ipathkey->pk_eclass->ec_collation ||
-			opathkey->pk_strategy != ipathkey->pk_strategy ||
-			opathkey->pk_nulls_first != ipathkey->pk_nulls_first)
+			opathkey->pk_eclass->ec_collation != ipathkey->pk_eclass->ec_collation)
+			elog(ERROR, "left and right pathkeys do not match in mergejoin");
+		if (first_inner_match &&
+			(opathkey->pk_strategy != ipathkey->pk_strategy ||
+			 opathkey->pk_nulls_first != ipathkey->pk_nulls_first))
 			elog(ERROR, "left and right pathkeys do not match in mergejoin");
 
 		/* OK, save info for executor */
@@ -4170,6 +4199,17 @@ create_hashjoin_plan(PlannerInfo *root,
 	copy_plan_costsize(&hash_plan->plan, inner_plan);
 	hash_plan->plan.startup_cost = hash_plan->plan.total_cost;
 
+	/*
+	 * If parallel-aware, the executor will also need an estimate of the total
+	 * number of rows expected from all participants so that it can size the
+	 * shared hash table.
+	 */
+	if (best_path->jpath.path.parallel_aware)
+	{
+		hash_plan->plan.parallel_aware = true;
+		hash_plan->rows_total = best_path->inner_rows_total;
+	}
+
 	join_plan = make_hashjoin(tlist,
 							  joinclauses,
 							  otherclauses,
@@ -4922,7 +4962,11 @@ bitmap_subplan_mark_shared(Plan *plan)
 		bitmap_subplan_mark_shared(
 								   linitial(((BitmapAnd *) plan)->bitmapplans));
 	else if (IsA(plan, BitmapOr))
+	{
 		((BitmapOr *) plan)->isshared = true;
+		bitmap_subplan_mark_shared(
+								   linitial(((BitmapOr *) plan)->bitmapplans));
+	}
 	else if (IsA(plan, BitmapIndexScan))
 		((BitmapIndexScan *) plan)->isshared = true;
 	else
@@ -5270,7 +5314,8 @@ make_foreignscan(List *qptlist,
 }
 
 static Append *
-make_append(List *appendplans, List *tlist, List *partitioned_rels)
+make_append(List *appendplans, int first_partial_plan,
+			List *tlist, List *partitioned_rels)
 {
 	Append	   *node = makeNode(Append);
 	Plan	   *plan = &node->plan;
@@ -5281,6 +5326,7 @@ make_append(List *appendplans, List *tlist, List *partitioned_rels)
 	plan->righttree = NULL;
 	node->partitioned_rels = partitioned_rels;
 	node->appendplans = appendplans;
+	node->first_partial_plan = first_partial_plan;
 
 	return node;
 }
@@ -5513,7 +5559,7 @@ make_sort(Plan *lefttree, int numCols,
  *	  'pathkeys' is the list of pathkeys by which the result is to be sorted
  *	  'relids' identifies the child relation being sorted, if any
  *	  'reqColIdx' is NULL or an array of required sort key column numbers
- *	  'adjust_tlist_in_place' is TRUE if lefttree must be modified in-place
+ *	  'adjust_tlist_in_place' is true if lefttree must be modified in-place
  *
  * We must convert the pathkey information into arrays of sort key column
  * numbers, sort operator OIDs, collation OIDs, and nulls-first flags,
@@ -5521,8 +5567,9 @@ make_sort(Plan *lefttree, int numCols,
  * the output parameters *p_numsortkeys etc.
  *
  * When looking for matches to an EquivalenceClass's members, we will only
- * consider child EC members if they match 'relids'.  This protects against
- * possible incorrect matches to child expressions that contain no Vars.
+ * consider child EC members if they belong to given 'relids'.  This protects
+ * against possible incorrect matches to child expressions that contain no
+ * Vars.
  *
  * If reqColIdx isn't NULL then it contains sort key column numbers that
  * we should match.  This is used when making child plans for a MergeAppend;
@@ -5533,7 +5580,7 @@ make_sort(Plan *lefttree, int numCols,
  * compute these expressions, since a Sort or MergeAppend node itself won't
  * do any such calculations.  If the input plan type isn't one that can do
  * projections, this means adding a Result node just to do the projection.
- * However, the caller can pass adjust_tlist_in_place = TRUE to force the
+ * However, the caller can pass adjust_tlist_in_place = true to force the
  * lefttree tlist to be modified in-place regardless of whether the node type
  * can project --- we use this for fixing the tlist of MergeAppend itself.
  *
@@ -5677,11 +5724,11 @@ prepare_sort_from_pathkeys(Plan *lefttree, List *pathkeys,
 					continue;
 
 				/*
-				 * Ignore child members unless they match the rel being
+				 * Ignore child members unless they belong to the rel being
 				 * sorted.
 				 */
 				if (em->em_is_child &&
-					!bms_equal(em->em_relids, relids))
+					!bms_is_subset(em->em_relids, relids))
 					continue;
 
 				sortexpr = em->em_expr;
@@ -5765,7 +5812,7 @@ prepare_sort_from_pathkeys(Plan *lefttree, List *pathkeys,
  * find_ec_member_for_tle
  *		Locate an EquivalenceClass member matching the given TLE, if any
  *
- * Child EC members are ignored unless they match 'relids'.
+ * Child EC members are ignored unless they belong to given 'relids'.
  */
 static EquivalenceMember *
 find_ec_member_for_tle(EquivalenceClass *ec,
@@ -5793,10 +5840,10 @@ find_ec_member_for_tle(EquivalenceClass *ec,
 			continue;
 
 		/*
-		 * Ignore child members unless they match the rel being sorted.
+		 * Ignore child members unless they belong to the rel being sorted.
 		 */
 		if (em->em_is_child &&
-			!bms_equal(em->em_relids, relids))
+			!bms_is_subset(em->em_relids, relids))
 			continue;
 
 		/* Match if same expression (after stripping relabel) */
@@ -5817,9 +5864,10 @@ find_ec_member_for_tle(EquivalenceClass *ec,
  *
  *	  'lefttree' is the node which yields input tuples
  *	  'pathkeys' is the list of pathkeys by which the result is to be sorted
+ *	  'relids' is the set of relations required by prepare_sort_from_pathkeys()
  */
 static Sort *
-make_sort_from_pathkeys(Plan *lefttree, List *pathkeys)
+make_sort_from_pathkeys(Plan *lefttree, List *pathkeys, Relids relids)
 {
 	int			numsortkeys;
 	AttrNumber *sortColIdx;
@@ -5829,7 +5877,7 @@ make_sort_from_pathkeys(Plan *lefttree, List *pathkeys)
 
 	/* Compute sort column info, and adjust lefttree as needed */
 	lefttree = prepare_sort_from_pathkeys(lefttree, pathkeys,
-										  NULL,
+										  relids,
 										  NULL,
 										  false,
 										  &numsortkeys,
@@ -6034,6 +6082,8 @@ make_windowagg(List *tlist, Index winref,
 			   int partNumCols, AttrNumber *partColIdx, Oid *partOperators,
 			   int ordNumCols, AttrNumber *ordColIdx, Oid *ordOperators,
 			   int frameOptions, Node *startOffset, Node *endOffset,
+			   Oid startInRangeFunc, Oid endInRangeFunc,
+			   Oid inRangeColl, bool inRangeAsc, bool inRangeNullsFirst,
 			   Plan *lefttree)
 {
 	WindowAgg  *node = makeNode(WindowAgg);
@@ -6049,6 +6099,11 @@ make_windowagg(List *tlist, Index winref,
 	node->frameOptions = frameOptions;
 	node->startOffset = startOffset;
 	node->endOffset = endOffset;
+	node->startInRangeFunc = startInRangeFunc;
+	node->endInRangeFunc = endInRangeFunc;
+	node->inRangeColl = inRangeColl;
+	node->inRangeAsc = inRangeAsc;
+	node->inRangeNullsFirst = inRangeNullsFirst;
 
 	plan->targetlist = tlist;
 	plan->lefttree = lefttree;
@@ -6238,6 +6293,7 @@ static Gather *
 make_gather(List *qptlist,
 			List *qpqual,
 			int nworkers,
+			int rescan_param,
 			bool single_copy,
 			Plan *subplan)
 {
@@ -6249,8 +6305,10 @@ make_gather(List *qptlist,
 	plan->lefttree = subplan;
 	plan->righttree = NULL;
 	node->num_workers = nworkers;
+	node->rescan_param = rescan_param;
 	node->single_copy = single_copy;
 	node->invisible = false;
+	node->initParam = NULL;
 
 	return node;
 }
@@ -6282,7 +6340,6 @@ make_setop(SetOpCmd cmd, SetOpStrategy strategy, Plan *lefttree,
 	 * convert SortGroupClause list into arrays of attr indexes and equality
 	 * operators, as wanted by executor
 	 */
-	Assert(numCols > 0);
 	dupColIdx = (AttrNumber *) palloc(sizeof(AttrNumber) * numCols);
 	dupOperators = (Oid *) palloc(sizeof(Oid) * numCols);
 
@@ -6399,6 +6456,7 @@ static ModifyTable *
 make_modifytable(PlannerInfo *root,
 				 CmdType operation, bool canSetTag,
 				 Index nominalRelation, List *partitioned_rels,
+				 bool partColsUpdated,
 				 List *resultRelations, List *subplans,
 				 List *withCheckOptionLists, List *returningLists,
 				 List *rowMarks, OnConflictExpr *onconflict, int epqParam)
@@ -6425,6 +6483,7 @@ make_modifytable(PlannerInfo *root,
 	node->canSetTag = canSetTag;
 	node->nominalRelation = nominalRelation;
 	node->partitioned_rels = partitioned_rels;
+	node->partColsUpdated = partColsUpdated;
 	node->resultRelations = resultRelations;
 	node->resultRelIndex = -1;	/* will be set correctly in setrefs.c */
 	node->rootResultRelIndex = -1;	/* will be set correctly in setrefs.c */
diff --git a/src/backend/optimizer/plan/initsplan.c b/src/backend/optimizer/plan/initsplan.c
index 987c20ac9f..a436b53806 100644
--- a/src/backend/optimizer/plan/initsplan.c
+++ b/src/backend/optimizer/plan/initsplan.c
@@ -3,7 +3,7 @@
  * initsplan.c
  *	  Target list, qualification, joininfo initialization routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -15,6 +15,7 @@
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
+#include "catalog/pg_class.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
@@ -629,11 +630,31 @@ create_lateral_join_info(PlannerInfo *root)
 	for (rti = 1; rti < root->simple_rel_array_size; rti++)
 	{
 		RelOptInfo *brel = root->simple_rel_array[rti];
+		RangeTblEntry *brte = root->simple_rte_array[rti];
 
-		if (brel == NULL || brel->reloptkind != RELOPT_BASEREL)
+		/*
+		 * Skip empty slots. Also skip non-simple relations i.e. dead
+		 * relations.
+		 */
+		if (brel == NULL || !IS_SIMPLE_REL(brel))
+			continue;
+
+		/*
+		 * In the case of table inheritance, the parent RTE is directly linked
+		 * to every child table via an AppendRelInfo.  In the case of table
+		 * partitioning, the inheritance hierarchy is expanded one level at a
+		 * time rather than flattened.  Therefore, an other member rel that is
+		 * a partitioned table may have children of its own, and must
+		 * therefore be marked with the appropriate lateral info so that those
+		 * children eventually get marked also.
+		 */
+		Assert(brte);
+		if (brel->reloptkind == RELOPT_OTHER_MEMBER_REL &&
+			(brte->rtekind != RTE_RELATION ||
+			 brte->relkind != RELKIND_PARTITIONED_TABLE))
 			continue;
 
-		if (root->simple_rte_array[rti]->inh)
+		if (brte->inh)
 		{
 			foreach(lc, root->append_rel_list)
 			{
@@ -719,7 +740,7 @@ deconstruct_jointree(PlannerInfo *root)
  *
  * Inputs:
  *	jtnode is the jointree node to examine
- *	below_outer_join is TRUE if this node is within the nullable side of a
+ *	below_outer_join is true if this node is within the nullable side of a
  *		higher-level outer join
  * Outputs:
  *	*qualscope gets the set of base Relids syntactically included in this
@@ -1588,8 +1609,8 @@ compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause)
  *	  as belonging to a higher join level, just add it to postponed_qual_list.
  *
  * 'clause': the qual clause to be distributed
- * 'is_deduced': TRUE if the qual came from implied-equality deduction
- * 'below_outer_join': TRUE if the qual is from a JOIN/ON that is below the
+ * 'is_deduced': true if the qual came from implied-equality deduction
+ * 'below_outer_join': true if the qual is from a JOIN/ON that is below the
  *		nullable side of a higher-level outer join
  * 'jointype': type of join the qual is from (JOIN_INNER for a WHERE clause)
  * 'security_level': security_level to assign to the qual
@@ -1600,7 +1621,7 @@ compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause)
  *		baserels appearing on the outer (nonnullable) side of the join
  *		(for FULL JOIN this includes both sides of the join, and must in fact
  *		equal qualscope)
- * 'deduced_nullable_relids': if is_deduced is TRUE, the nullable relids to
+ * 'deduced_nullable_relids': if is_deduced is true, the nullable relids to
  *		impute to the clause; otherwise NULL
  * 'postponed_qual_list': list of PostponedQual structs, which we can add
  *		this qual to if it turns out to belong to a higher join level.
@@ -1610,9 +1631,9 @@ compute_semijoin_info(SpecialJoinInfo *sjinfo, List *clause)
  * 'ojscope' is needed if we decide to force the qual up to the outer-join
  * level, which will be ojscope not necessarily qualscope.
  *
- * In normal use (when is_deduced is FALSE), at the time this is called,
+ * In normal use (when is_deduced is false), at the time this is called,
  * root->join_info_list must contain entries for all and only those special
- * joins that are syntactically below this qual.  But when is_deduced is TRUE,
+ * joins that are syntactically below this qual.  But when is_deduced is true,
  * we are adding new deduced clauses after completion of deconstruct_jointree,
  * so it cannot be assumed that root->join_info_list has anything to do with
  * qual placement.
@@ -1943,10 +1964,11 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
 		if (maybe_equivalence)
 		{
 			if (check_equivalence_delay(root, restrictinfo) &&
-				process_equivalence(root, restrictinfo, below_outer_join))
+				process_equivalence(root, &restrictinfo, below_outer_join))
 				return;
 			/* EC rejected it, so set left_ec/right_ec the hard way ... */
-			initialize_mergeclause_eclasses(root, restrictinfo);
+			if (restrictinfo->mergeopfamilies)	/* EC might have changed this */
+				initialize_mergeclause_eclasses(root, restrictinfo);
 			/* ... and fall through to distribute_restrictinfo_to_rels */
 		}
 		else if (maybe_outer_join && restrictinfo->can_join)
@@ -2001,8 +2023,8 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  *		may force extra delay of higher-level outer joins.
  *
  * If the qual must be delayed, add relids to *relids_p to reflect the lowest
- * safe level for evaluating the qual, and return TRUE.  Any extra delay for
- * higher-level joins is reflected by setting delay_upper_joins to TRUE in
+ * safe level for evaluating the qual, and return true.  Any extra delay for
+ * higher-level joins is reflected by setting delay_upper_joins to true in
  * SpecialJoinInfo structs.  We also compute nullable_relids, the set of
  * referenced relids that are nullable by lower outer joins (note that this
  * can be nonempty even for a non-delayed qual).
@@ -2034,7 +2056,7 @@ distribute_qual_to_rels(PlannerInfo *root, Node *clause,
  * Lastly, a pushed-down qual that references the nullable side of any current
  * join_info_list member and has to be evaluated above that OJ (because its
  * required relids overlap the LHS too) causes that OJ's delay_upper_joins
- * flag to be set TRUE.  This will prevent any higher-level OJs from
+ * flag to be set true.  This will prevent any higher-level OJs from
  * being interchanged with that OJ, which would result in not having any
  * correct place to evaluate the qual.  (The case we care about here is a
  * sub-select WHERE clause within the RHS of some outer join.  The WHERE
@@ -2118,7 +2140,7 @@ check_outerjoin_delay(PlannerInfo *root,
 /*
  * check_equivalence_delay
  *		Detect whether a potential equivalence clause is rendered unsafe
- *		by outer-join-delay considerations.  Return TRUE if it's safe.
+ *		by outer-join-delay considerations.  Return true if it's safe.
  *
  * The initial tests in distribute_qual_to_rels will consider a mergejoinable
  * clause to be a potential equivalence clause if it is not outerjoin_delayed.
diff --git a/src/backend/optimizer/plan/planagg.c b/src/backend/optimizer/plan/planagg.c
index bba8a1ff58..95cbffbd69 100644
--- a/src/backend/optimizer/plan/planagg.c
+++ b/src/backend/optimizer/plan/planagg.c
@@ -17,7 +17,7 @@
  * scan all the rows anyway.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -232,9 +232,9 @@ preprocess_minmax_aggregates(PlannerInfo *root, List *tlist)
  *		that each one is a MIN/MAX aggregate.  If so, build a list of the
  *		distinct aggregate calls in the tree.
  *
- * Returns TRUE if a non-MIN/MAX aggregate is found, FALSE otherwise.
+ * Returns true if a non-MIN/MAX aggregate is found, false otherwise.
  * (This seemingly-backward definition is used because expression_tree_walker
- * aborts the scan on TRUE return, which is what we want.)
+ * aborts the scan on true return, which is what we want.)
  *
  * Found aggregates are added to the list at *context; it's up to the caller
  * to initialize the list to NIL.
@@ -335,8 +335,8 @@ find_minmax_aggs_walker(Node *node, List **context)
  *		Given a MIN/MAX aggregate, try to build an indexscan Path it can be
  *		optimized with.
  *
- * If successful, stash the best path in *mminfo and return TRUE.
- * Otherwise, return FALSE.
+ * If successful, stash the best path in *mminfo and return true.
+ * Otherwise, return false.
  */
 static bool
 build_minmax_path(PlannerInfo *root, MinMaxAggInfo *mminfo,
diff --git a/src/backend/optimizer/plan/planmain.c b/src/backend/optimizer/plan/planmain.c
index f4e0a6ea3d..7a34abca04 100644
--- a/src/backend/optimizer/plan/planmain.c
+++ b/src/backend/optimizer/plan/planmain.c
@@ -9,7 +9,7 @@
  * shorn of features like subselects, inheritance, aggregates, grouping,
  * and so on.  (Those are the things planner.c deals with.)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/plan/planner.c b/src/backend/optimizer/plan/planner.c
index 407df9ae79..de1257d9c2 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -3,7 +3,7 @@
  * planner.c
  *	  The query optimizer external interface.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -61,6 +61,7 @@
 /* GUC parameters */
 double		cursor_tuple_fraction = DEFAULT_CURSOR_TUPLE_FRACTION;
 int			force_parallel_mode = FORCE_PARALLEL_OFF;
+bool		parallel_leader_participation = true;
 
 /* Hook for plugins to get control in planner() */
 planner_hook_type planner_hook = NULL;
@@ -184,6 +185,23 @@ static PathTarget *make_sort_input_target(PlannerInfo *root,
 					   bool *have_postponed_srfs);
 static void adjust_paths_for_srfs(PlannerInfo *root, RelOptInfo *rel,
 					  List *targets, List *targets_contain_srfs);
+static void add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel,
+						  RelOptInfo *grouped_rel,
+						  PathTarget *target,
+						  RelOptInfo *partially_grouped_rel,
+						  const AggClauseCosts *agg_costs,
+						  const AggClauseCosts *agg_final_costs,
+						  grouping_sets_data *gd, bool can_sort, bool can_hash,
+						  double dNumGroups, List *havingQual);
+static void add_paths_to_partial_grouping_rel(PlannerInfo *root,
+								  RelOptInfo *input_rel,
+								  RelOptInfo *partially_grouped_rel,
+								  AggClauseCosts *agg_partial_costs,
+								  grouping_sets_data *gd,
+								  bool can_sort,
+								  bool can_hash);
+static bool can_parallel_agg(PlannerInfo *root, RelOptInfo *input_rel,
+				 RelOptInfo *grouped_rel, const AggClauseCosts *agg_costs);
 
 
 /*****************************************************************************
@@ -243,7 +261,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	glob->rootResultRelations = NIL;
 	glob->relationOids = NIL;
 	glob->invalItems = NIL;
-	glob->nParamExec = 0;
+	glob->paramExecTypes = NIL;
 	glob->lastPHId = 0;
 	glob->lastRowMarkId = 0;
 	glob->lastPlanNodeId = 0;
@@ -257,6 +275,16 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	 * to values that don't permit parallelism, or if parallel-unsafe
 	 * functions are present in the query tree.
 	 *
+	 * (Note that we do allow CREATE TABLE AS, SELECT INTO, and CREATE
+	 * MATERIALIZED VIEW to use parallel plans, but this is safe only because
+	 * the command is writing into a completely new table which workers won't
+	 * be able to see.  If the workers could see the table, the fact that
+	 * group locking would cause them to ignore the leader's heavyweight
+	 * relation extension lock and GIN page locks would make this unsafe.
+	 * We'll have to fix that somehow if we want to allow parallel inserts in
+	 * general; updates and deletes have additional problems especially around
+	 * combo CIDs.)
+	 *
 	 * For now, we don't try to use parallel mode if we're running inside a
 	 * parallel worker.  We might eventually be able to relax this
 	 * restriction, but for now it seems best not to have parallel workers
@@ -291,13 +319,21 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	}
 
 	/*
-	 * glob->parallelModeNeeded should tell us whether it's necessary to
-	 * impose the parallel mode restrictions, but we don't actually want to
-	 * impose them unless we choose a parallel plan, so it is normally set
-	 * only if a parallel plan is chosen (see create_gather_plan).  That way,
-	 * people who mislabel their functions but don't use parallelism anyway
-	 * aren't harmed.  But when force_parallel_mode is set, we enable the
-	 * restrictions whenever possible for testing purposes.
+	 * glob->parallelModeNeeded is normally set to false here and changed to
+	 * true during plan creation if a Gather or Gather Merge plan is actually
+	 * created (cf. create_gather_plan, create_gather_merge_plan).
+	 *
+	 * However, if force_parallel_mode = on or force_parallel_mode = regress,
+	 * then we impose parallel mode whenever it's safe to do so, even if the
+	 * final plan doesn't use parallelism.  It's not safe to do so if the
+	 * query contains anything parallel-unsafe; parallelModeOK will be false
+	 * in that case.  Note that parallelModeOK can't change after this point.
+	 * Otherwise, everything in the query is either parallel-safe or
+	 * parallel-restricted, and in either case it should be OK to impose
+	 * parallel-mode restrictions.  If that ends up breaking something, then
+	 * either some function the user included in the query is incorrectly
+	 * labelled as parallel-safe or parallel-restricted when in reality it's
+	 * parallel-unsafe, or else the query planner itself has a bug.
 	 */
 	glob->parallelModeNeeded = glob->parallelModeOK &&
 		(force_parallel_mode != FORCE_PARALLEL_OFF);
@@ -358,6 +394,14 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	{
 		Gather	   *gather = makeNode(Gather);
 
+		/*
+		 * If there are any initPlans attached to the formerly-top plan node,
+		 * move them up to the Gather node; same as we do for Material node in
+		 * materialize_finished_plan.
+		 */
+		gather->plan.initPlan = top_plan->initPlan;
+		top_plan->initPlan = NIL;
+
 		gather->plan.targetlist = top_plan->targetlist;
 		gather->plan.qual = NIL;
 		gather->plan.lefttree = top_plan;
@@ -366,6 +410,12 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 		gather->single_copy = true;
 		gather->invisible = (force_parallel_mode == FORCE_PARALLEL_REGRESS);
 
+		/*
+		 * Since this Gather has no parallel-aware descendants to signal to,
+		 * we don't need a rescan Param.
+		 */
+		gather->rescan_param = -1;
+
 		/*
 		 * Ideally we'd use cost_gather here, but setting up dummy path data
 		 * to satisfy it doesn't seem much cleaner than knowing what it does.
@@ -391,13 +441,13 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	 * set_plan_references' tree traversal, but for now it has to be separate
 	 * because we need to visit subplans before not after main plan.
 	 */
-	if (glob->nParamExec > 0)
+	if (glob->paramExecTypes != NIL)
 	{
 		Assert(list_length(glob->subplans) == list_length(glob->subroots));
 		forboth(lp, glob->subplans, lr, glob->subroots)
 		{
 			Plan	   *subplan = (Plan *) lfirst(lp);
-			PlannerInfo *subroot = (PlannerInfo *) lfirst(lr);
+			PlannerInfo *subroot = lfirst_node(PlannerInfo, lr);
 
 			SS_finalize_plan(subroot, subplan);
 		}
@@ -416,7 +466,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	forboth(lp, glob->subplans, lr, glob->subroots)
 	{
 		Plan	   *subplan = (Plan *) lfirst(lp);
-		PlannerInfo *subroot = (PlannerInfo *) lfirst(lr);
+		PlannerInfo *subroot = lfirst_node(PlannerInfo, lr);
 
 		lfirst(lp) = set_plan_references(subroot, subplan);
 	}
@@ -442,7 +492,7 @@ standard_planner(Query *parse, int cursorOptions, ParamListInfo boundParams)
 	result->rowMarks = glob->finalrowmarks;
 	result->relationOids = glob->relationOids;
 	result->invalItems = glob->invalItems;
-	result->nParamExec = glob->nParamExec;
+	result->paramExecTypes = glob->paramExecTypes;
 	/* utilityStmt should be null, but we might as well copy it */
 	result->utilityStmt = parse->utilityStmt;
 	result->stmt_location = parse->stmt_location;
@@ -572,7 +622,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 	hasOuterJoins = false;
 	foreach(l, parse->rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
 
 		if (rte->rtekind == RTE_JOIN)
 		{
@@ -629,7 +679,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 	newWithCheckOptions = NIL;
 	foreach(l, parse->withCheckOptions)
 	{
-		WithCheckOption *wco = (WithCheckOption *) lfirst(l);
+		WithCheckOption *wco = lfirst_node(WithCheckOption, l);
 
 		wco->qual = preprocess_expression(root, wco->qual,
 										  EXPRKIND_QUAL);
@@ -649,7 +699,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 
 	foreach(l, parse->windowClause)
 	{
-		WindowClause *wc = (WindowClause *) lfirst(l);
+		WindowClause *wc = lfirst_node(WindowClause, l);
 
 		/* partitionClause/orderClause are sort/group expressions */
 		wc->startOffset = preprocess_expression(root, wc->startOffset,
@@ -691,7 +741,7 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 	/* Also need to preprocess expressions within RTEs */
 	foreach(l, parse->rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
 		int			kind;
 		ListCell   *lcsq;
 
@@ -752,6 +802,27 @@ subquery_planner(PlannerGlobal *glob, Query *parse,
 		}
 	}
 
+	/*
+	 * Now that we are done preprocessing expressions, and in particular done
+	 * flattening join alias variables, get rid of the joinaliasvars lists.
+	 * They no longer match what expressions in the rest of the tree look
+	 * like, because we have not preprocessed expressions in those lists (and
+	 * do not want to; for example, expanding a SubLink there would result in
+	 * a useless unreferenced subplan).  Leaving them in place simply creates
+	 * a hazard for later scans of the tree.  We could try to prevent that by
+	 * using QTW_IGNORE_JOINALIASES in every tree scan done after this point,
+	 * but that doesn't sound very reliable.
+	 */
+	if (root->hasJoinRTEs)
+	{
+		foreach(l, parse->rtable)
+		{
+			RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
+
+			rte->joinaliasvars = NIL;
+		}
+	}
+
 	/*
 	 * In some cases we may want to transfer a HAVING clause into WHERE. We
 	 * cannot do so if the HAVING clause contains aggregates (obviously) or
@@ -878,11 +949,12 @@ preprocess_expression(PlannerInfo *root, Node *expr, int kind)
 
 	/*
 	 * If the query has any join RTEs, replace join alias variables with
-	 * base-relation variables.  We must do this before sublink processing,
-	 * else sublinks expanded out from join aliases would not get processed.
-	 * We can skip it in non-lateral RTE functions, VALUES lists, and
-	 * TABLESAMPLE clauses, however, since they can't contain any Vars of the
-	 * current query level.
+	 * base-relation variables.  We must do this first, since any expressions
+	 * we may extract from the joinaliasvars lists have not been preprocessed.
+	 * For example, if we did this after sublink processing, sublinks expanded
+	 * out from join aliases would not get processed.  But we can skip this in
+	 * non-lateral RTE functions, VALUES lists, and TABLESAMPLE clauses, since
+	 * they can't contain any Vars of the current query level.
 	 */
 	if (root->hasJoinRTEs &&
 		!(kind == EXPRKIND_RTFUNC ||
@@ -1024,7 +1096,7 @@ static void
 inheritance_planner(PlannerInfo *root)
 {
 	Query	   *parse = root->parse;
-	int			parentRTindex = parse->resultRelation;
+	int			top_parentRTindex = parse->resultRelation;
 	Bitmapset  *subqueryRTindexes;
 	Bitmapset  *modifiableARIindexes;
 	int			nominalRelation = -1;
@@ -1042,6 +1114,11 @@ inheritance_planner(PlannerInfo *root)
 	Index		rti;
 	RangeTblEntry *parent_rte;
 	List	   *partitioned_rels = NIL;
+	PlannerInfo *parent_root;
+	Query	   *parent_parse;
+	Bitmapset  *parent_relids = bms_make_singleton(top_parentRTindex);
+	PlannerInfo **parent_roots = NULL;
+	bool		partColsUpdated = false;
 
 	Assert(parse->commandType != CMD_INSERT);
 
@@ -1066,7 +1143,7 @@ inheritance_planner(PlannerInfo *root)
 	rti = 1;
 	foreach(lc, parse->rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);
 
 		if (rte->rtekind == RTE_SUBQUERY)
 			subqueryRTindexes = bms_add_member(subqueryRTindexes, rti);
@@ -1088,7 +1165,7 @@ inheritance_planner(PlannerInfo *root)
 	{
 		foreach(lc, root->append_rel_list)
 		{
-			AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);
+			AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);
 
 			if (bms_is_member(appinfo->parent_relid, subqueryRTindexes) ||
 				bms_is_member(appinfo->child_relid, subqueryRTindexes) ||
@@ -1105,33 +1182,63 @@ inheritance_planner(PlannerInfo *root)
 	 * (including the root parent) as child members of the inheritance set do
 	 * not appear anywhere else in the plan.  The situation is exactly the
 	 * opposite in the case of non-partitioned inheritance parent as described
-	 * below.
+	 * below. For the same reason, collect the list of descendant partitioned
+	 * tables to be saved in ModifyTable node, so that executor can lock those
+	 * as well.
 	 */
-	parent_rte = rt_fetch(parentRTindex, root->parse->rtable);
+	parent_rte = rt_fetch(top_parentRTindex, root->parse->rtable);
 	if (parent_rte->relkind == RELKIND_PARTITIONED_TABLE)
-		nominalRelation = parentRTindex;
+	{
+		nominalRelation = top_parentRTindex;
+		partitioned_rels = get_partitioned_child_rels(root, top_parentRTindex,
+													  &partColsUpdated);
+		/* The root partitioned table is included as a child rel */
+		Assert(list_length(partitioned_rels) >= 1);
+	}
+
+	/*
+	 * The PlannerInfo for each child is obtained by translating the relevant
+	 * members of the PlannerInfo for its immediate parent, which we find
+	 * using the parent_relid in its AppendRelInfo.  We save the PlannerInfo
+	 * for each parent in an array indexed by relid for fast retrieval. Since
+	 * the maximum number of parents is limited by the number of RTEs in the
+	 * query, we use that number to allocate the array. An extra entry is
+	 * needed since relids start from 1.
+	 */
+	parent_roots = (PlannerInfo **) palloc0((list_length(parse->rtable) + 1) *
+											sizeof(PlannerInfo *));
+	parent_roots[top_parentRTindex] = root;
 
 	/*
 	 * And now we can get on with generating a plan for each child table.
 	 */
 	foreach(lc, root->append_rel_list)
 	{
-		AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(lc);
+		AppendRelInfo *appinfo = lfirst_node(AppendRelInfo, lc);
 		PlannerInfo *subroot;
 		RangeTblEntry *child_rte;
 		RelOptInfo *sub_final_rel;
 		Path	   *subpath;
 
 		/* append_rel_list contains all append rels; ignore others */
-		if (appinfo->parent_relid != parentRTindex)
+		if (!bms_is_member(appinfo->parent_relid, parent_relids))
 			continue;
 
+		/*
+		 * expand_inherited_rtentry() always processes a parent before any of
+		 * that parent's children, so the parent_root for this relation should
+		 * already be available.
+		 */
+		parent_root = parent_roots[appinfo->parent_relid];
+		Assert(parent_root != NULL);
+		parent_parse = parent_root->parse;
+
 		/*
 		 * We need a working copy of the PlannerInfo so that we can control
 		 * propagation of information back to the main copy.
 		 */
 		subroot = makeNode(PlannerInfo);
-		memcpy(subroot, root, sizeof(PlannerInfo));
+		memcpy(subroot, parent_root, sizeof(PlannerInfo));
 
 		/*
 		 * Generate modified query with this rel as target.  We first apply
@@ -1140,15 +1247,15 @@ inheritance_planner(PlannerInfo *root)
 		 * then fool around with subquery RTEs.
 		 */
 		subroot->parse = (Query *)
-			adjust_appendrel_attrs(root,
-								   (Node *) parse,
+			adjust_appendrel_attrs(parent_root,
+								   (Node *) parent_parse,
 								   1, &appinfo);
 
 		/*
 		 * If there are securityQuals attached to the parent, move them to the
 		 * child rel (they've already been transformed properly for that).
 		 */
-		parent_rte = rt_fetch(parentRTindex, subroot->parse->rtable);
+		parent_rte = rt_fetch(appinfo->parent_relid, subroot->parse->rtable);
 		child_rte = rt_fetch(appinfo->child_relid, subroot->parse->rtable);
 		child_rte->securityQuals = parent_rte->securityQuals;
 		parent_rte->securityQuals = NIL;
@@ -1159,7 +1266,7 @@ inheritance_planner(PlannerInfo *root)
 		 * executor doesn't need to see the modified copies --- we can just
 		 * pass it the original rowMarks list.)
 		 */
-		subroot->rowMarks = copyObject(root->rowMarks);
+		subroot->rowMarks = copyObject(parent_root->rowMarks);
 
 		/*
 		 * The append_rel_list likewise might contain references to subquery
@@ -1176,9 +1283,9 @@ inheritance_planner(PlannerInfo *root)
 			ListCell   *lc2;
 
 			subroot->append_rel_list = NIL;
-			foreach(lc2, root->append_rel_list)
+			foreach(lc2, parent_root->append_rel_list)
 			{
-				AppendRelInfo *appinfo2 = (AppendRelInfo *) lfirst(lc2);
+				AppendRelInfo *appinfo2 = lfirst_node(AppendRelInfo, lc2);
 
 				if (bms_is_member(appinfo2->child_relid, modifiableARIindexes))
 					appinfo2 = copyObject(appinfo2);
@@ -1211,9 +1318,9 @@ inheritance_planner(PlannerInfo *root)
 			ListCell   *lr;
 
 			rti = 1;
-			foreach(lr, parse->rtable)
+			foreach(lr, parent_parse->rtable)
 			{
-				RangeTblEntry *rte = (RangeTblEntry *) lfirst(lr);
+				RangeTblEntry *rte = lfirst_node(RangeTblEntry, lr);
 
 				if (bms_is_member(rti, subqueryRTindexes))
 				{
@@ -1235,7 +1342,7 @@ inheritance_planner(PlannerInfo *root)
 
 						foreach(lc2, subroot->append_rel_list)
 						{
-							AppendRelInfo *appinfo2 = (AppendRelInfo *) lfirst(lc2);
+							AppendRelInfo *appinfo2 = lfirst_node(AppendRelInfo, lc2);
 
 							if (bms_is_member(appinfo2->child_relid,
 											  modifiableARIindexes))
@@ -1258,6 +1365,22 @@ inheritance_planner(PlannerInfo *root)
 		/* hack to mark target relation as an inheritance partition */
 		subroot->hasInheritedTarget = true;
 
+		/*
+		 * If the child is further partitioned, remember it as a parent. Since
+		 * a partitioned table does not have any data, we don't need to create
+		 * a plan for it. We do, however, need to remember the PlannerInfo for
+		 * use when processing its children.
+		 */
+		if (child_rte->inh)
+		{
+			Assert(child_rte->relkind == RELKIND_PARTITIONED_TABLE);
+			parent_relids =
+				bms_add_member(parent_relids, appinfo->child_relid);
+			parent_roots[appinfo->child_relid] = subroot;
+
+			continue;
+		}
+
 		/* Generate Path(s) for accessing this result relation */
 		grouping_planner(subroot, true, 0.0 /* retrieve all tuples */ );
 
@@ -1354,13 +1477,6 @@ inheritance_planner(PlannerInfo *root)
 		Assert(!parse->onConflict);
 	}
 
-	if (parent_rte->relkind == RELKIND_PARTITIONED_TABLE)
-	{
-		partitioned_rels = get_partitioned_child_rels(root, parentRTindex);
-		/* The root partitioned table is included as a child rel */
-		Assert(list_length(partitioned_rels) >= 1);
-	}
-
 	/* Result path must go into outer query's FINAL upperrel */
 	final_rel = fetch_upper_rel(root, UPPERREL_FINAL, NULL);
 
@@ -1393,7 +1509,7 @@ inheritance_planner(PlannerInfo *root)
 	rti = 1;
 	foreach(lc, final_rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);
 
 		root->simple_rte_array[rti++] = rte;
 	}
@@ -1415,6 +1531,7 @@ inheritance_planner(PlannerInfo *root)
 									 parse->canSetTag,
 									 nominalRelation,
 									 partitioned_rels,
+									 partColsUpdated,
 									 resultRelations,
 									 subpaths,
 									 subroots,
@@ -1458,7 +1575,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 				 double tuple_fraction)
 {
 	Query	   *parse = root->parse;
-	List	   *tlist = parse->targetList;
+	List	   *tlist;
 	int64		offset_est = 0;
 	int64		count_est = 0;
 	double		limit_tuples = -1.0;
@@ -1542,8 +1659,8 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 			/*------
 			  translator: %s is a SQL row locking clause such as FOR UPDATE */
 					 errmsg("%s is not allowed with UNION/INTERSECT/EXCEPT",
-							LCS_asString(((RowMarkClause *)
-										  linitial(parse->rowMarks))->strength))));
+							LCS_asString(linitial_node(RowMarkClause,
+													   parse->rowMarks)->strength))));
 
 		/*
 		 * Calculate pathkeys that represent result ordering requirements
@@ -1588,13 +1705,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 		}
 
 		/* Preprocess targetlist */
-		tlist = preprocess_targetlist(root, tlist);
-
-		if (parse->onConflict)
-			parse->onConflict->onConflictSet =
-				preprocess_onconflict_targetlist(parse->onConflict->onConflictSet,
-												 parse->resultRelation,
-												 parse->rtable);
+		tlist = preprocess_targetlist(root);
 
 		/*
 		 * We are now done hacking up the query's targetlist.  Most of the
@@ -1673,7 +1784,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 		qp_extra.tlist = tlist;
 		qp_extra.activeWindows = activeWindows;
 		qp_extra.groupClause = (gset_data
-								? (gset_data->rollups ? ((RollupData *) linitial(gset_data->rollups))->groupClause : NIL)
+								? (gset_data->rollups ? linitial_node(RollupData, gset_data->rollups)->groupClause : NIL)
 								: parse->groupClause);
 
 		/*
@@ -1743,25 +1854,25 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 			split_pathtarget_at_srfs(root, final_target, sort_input_target,
 									 &final_targets,
 									 &final_targets_contain_srfs);
-			final_target = (PathTarget *) linitial(final_targets);
+			final_target = linitial_node(PathTarget, final_targets);
 			Assert(!linitial_int(final_targets_contain_srfs));
 			/* likewise for sort_input_target vs. grouping_target */
 			split_pathtarget_at_srfs(root, sort_input_target, grouping_target,
 									 &sort_input_targets,
 									 &sort_input_targets_contain_srfs);
-			sort_input_target = (PathTarget *) linitial(sort_input_targets);
+			sort_input_target = linitial_node(PathTarget, sort_input_targets);
 			Assert(!linitial_int(sort_input_targets_contain_srfs));
 			/* likewise for grouping_target vs. scanjoin_target */
 			split_pathtarget_at_srfs(root, grouping_target, scanjoin_target,
 									 &grouping_targets,
 									 &grouping_targets_contain_srfs);
-			grouping_target = (PathTarget *) linitial(grouping_targets);
+			grouping_target = linitial_node(PathTarget, grouping_targets);
 			Assert(!linitial_int(grouping_targets_contain_srfs));
 			/* scanjoin_target will not have any SRFs precomputed for it */
 			split_pathtarget_at_srfs(root, scanjoin_target, NULL,
 									 &scanjoin_targets,
 									 &scanjoin_targets_contain_srfs);
-			scanjoin_target = (PathTarget *) linitial(scanjoin_targets);
+			scanjoin_target = linitial_node(PathTarget, scanjoin_targets);
 			Assert(!linitial_int(scanjoin_targets_contain_srfs));
 		}
 		else
@@ -2032,6 +2143,7 @@ grouping_planner(PlannerInfo *root, bool inheritance_update,
 										parse->canSetTag,
 										parse->resultRelation,
 										NIL,
+										false,
 										list_make1_int(parse->resultRelation),
 										list_make1(path),
 										list_make1(root),
@@ -2092,7 +2204,7 @@ preprocess_grouping_sets(PlannerInfo *root)
 
 		foreach(lc, parse->groupClause)
 		{
-			SortGroupClause *gc = lfirst(lc);
+			SortGroupClause *gc = lfirst_node(SortGroupClause, lc);
 			Index		ref = gc->tleSortGroupRef;
 
 			if (ref > maxref)
@@ -2121,7 +2233,7 @@ preprocess_grouping_sets(PlannerInfo *root)
 
 		foreach(lc, parse->groupingSets)
 		{
-			List	   *gset = lfirst(lc);
+			List	   *gset = (List *) lfirst(lc);
 
 			if (bms_overlap_list(gd->unsortable_refs, gset))
 			{
@@ -2180,7 +2292,7 @@ preprocess_grouping_sets(PlannerInfo *root)
 		/*
 		 * Get the initial (and therefore largest) grouping set.
 		 */
-		gs = linitial(current_sets);
+		gs = linitial_node(GroupingSetData, current_sets);
 
 		/*
 		 * Order the groupClause appropriately.  If the first grouping set is
@@ -2255,7 +2367,7 @@ remap_to_groupclause_idx(List *groupClause,
 
 	foreach(lc, groupClause)
 	{
-		SortGroupClause *gc = lfirst(lc);
+		SortGroupClause *gc = lfirst_node(SortGroupClause, lc);
 
 		tleref_to_colnum_map[gc->tleSortGroupRef] = ref++;
 	}
@@ -2264,7 +2376,7 @@ remap_to_groupclause_idx(List *groupClause,
 	{
 		List	   *set = NIL;
 		ListCell   *lc2;
-		GroupingSetData *gs = lfirst(lc);
+		GroupingSetData *gs = lfirst_node(GroupingSetData, lc);
 
 		foreach(lc2, gs->set)
 		{
@@ -2330,8 +2442,8 @@ preprocess_rowmarks(PlannerInfo *root)
 		 * CTIDs invalid.  This is also checked at parse time, but that's
 		 * insufficient because of rule substitution, query pullup, etc.
 		 */
-		CheckSelectLocking(parse, ((RowMarkClause *)
-								   linitial(parse->rowMarks))->strength);
+		CheckSelectLocking(parse, linitial_node(RowMarkClause,
+												parse->rowMarks)->strength);
 	}
 	else
 	{
@@ -2359,7 +2471,7 @@ preprocess_rowmarks(PlannerInfo *root)
 	prowmarks = NIL;
 	foreach(l, parse->rowMarks)
 	{
-		RowMarkClause *rc = (RowMarkClause *) lfirst(l);
+		RowMarkClause *rc = lfirst_node(RowMarkClause, l);
 		RangeTblEntry *rte = rt_fetch(rc->rti, parse->rtable);
 		PlanRowMark *newrc;
 
@@ -2399,7 +2511,7 @@ preprocess_rowmarks(PlannerInfo *root)
 	i = 0;
 	foreach(l, parse->rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(l);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
 		PlanRowMark *newrc;
 
 		i++;
@@ -2758,7 +2870,7 @@ remove_useless_groupby_columns(PlannerInfo *root)
 										   (list_length(parse->rtable) + 1));
 	foreach(lc, parse->groupClause)
 	{
-		SortGroupClause *sgc = (SortGroupClause *) lfirst(lc);
+		SortGroupClause *sgc = lfirst_node(SortGroupClause, lc);
 		TargetEntry *tle = get_sortgroupclause_tle(sgc, parse->targetList);
 		Var		   *var = (Var *) tle->expr;
 
@@ -2791,7 +2903,7 @@ remove_useless_groupby_columns(PlannerInfo *root)
 	relid = 0;
 	foreach(lc, parse->rtable)
 	{
-		RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
+		RangeTblEntry *rte = lfirst_node(RangeTblEntry, lc);
 		Bitmapset  *relattnos;
 		Bitmapset  *pkattnos;
 		Oid			constraintOid;
@@ -2849,7 +2961,7 @@ remove_useless_groupby_columns(PlannerInfo *root)
 
 		foreach(lc, parse->groupClause)
 		{
-			SortGroupClause *sgc = (SortGroupClause *) lfirst(lc);
+			SortGroupClause *sgc = lfirst_node(SortGroupClause, lc);
 			TargetEntry *tle = get_sortgroupclause_tle(sgc, parse->targetList);
 			Var		   *var = (Var *) tle->expr;
 
@@ -2924,11 +3036,11 @@ preprocess_groupclause(PlannerInfo *root, List *force)
 	 */
 	foreach(sl, parse->sortClause)
 	{
-		SortGroupClause *sc = (SortGroupClause *) lfirst(sl);
+		SortGroupClause *sc = lfirst_node(SortGroupClause, sl);
 
 		foreach(gl, parse->groupClause)
 		{
-			SortGroupClause *gc = (SortGroupClause *) lfirst(gl);
+			SortGroupClause *gc = lfirst_node(SortGroupClause, gl);
 
 			if (equal(gc, sc))
 			{
@@ -2957,7 +3069,7 @@ preprocess_groupclause(PlannerInfo *root, List *force)
 	 */
 	foreach(gl, parse->groupClause)
 	{
-		SortGroupClause *gc = (SortGroupClause *) lfirst(gl);
+		SortGroupClause *gc = lfirst_node(SortGroupClause, gl);
 
 		if (list_member_ptr(new_groupclause, gc))
 			continue;			/* it matched an ORDER BY item */
@@ -3057,7 +3169,7 @@ extract_rollup_sets(List *groupingSets)
 
 	for_each_cell(lc, lc1)
 	{
-		List	   *candidate = lfirst(lc);
+		List	   *candidate = (List *) lfirst(lc);
 		Bitmapset  *candidate_set = NULL;
 		ListCell   *lc2;
 		int			dup_of = 0;
@@ -3214,7 +3326,7 @@ reorder_grouping_sets(List *groupingsets, List *sortclause)
 
 	foreach(lc, groupingsets)
 	{
-		List	   *candidate = lfirst(lc);
+		List	   *candidate = (List *) lfirst(lc);
 		List	   *new_elems = list_difference_int(candidate, previous);
 		GroupingSetData *gs = makeNode(GroupingSetData);
 
@@ -3282,7 +3394,7 @@ standard_qp_callback(PlannerInfo *root, void *extra)
 	/* We consider only the first (bottom) window in pathkeys logic */
 	if (activeWindows != NIL)
 	{
-		WindowClause *wc = (WindowClause *) linitial(activeWindows);
+		WindowClause *wc = linitial_node(WindowClause, activeWindows);
 
 		root->window_pathkeys = make_pathkeys_for_window(root,
 														 wc,
@@ -3370,7 +3482,7 @@ get_number_of_groups(PlannerInfo *root,
 
 			foreach(lc, gd->rollups)
 			{
-				RollupData *rollup = lfirst(lc);
+				RollupData *rollup = lfirst_node(RollupData, lc);
 				ListCell   *lc;
 
 				groupExprs = get_sortgrouplist_exprs(rollup->groupClause,
@@ -3381,7 +3493,7 @@ get_number_of_groups(PlannerInfo *root,
 				forboth(lc, rollup->gsets, lc2, rollup->gsets_data)
 				{
 					List	   *gset = (List *) lfirst(lc);
-					GroupingSetData *gs = lfirst(lc2);
+					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
 					double		numGroups = estimate_num_groups(root,
 																groupExprs,
 																path_rows,
@@ -3406,7 +3518,7 @@ get_number_of_groups(PlannerInfo *root,
 				forboth(lc, gd->hash_sets_idx, lc2, gd->unsortable_sets)
 				{
 					List	   *gset = (List *) lfirst(lc);
-					GroupingSetData *gs = lfirst(lc2);
+					GroupingSetData *gs = lfirst_node(GroupingSetData, lc2);
 					double		numGroups = estimate_num_groups(root,
 																groupExprs,
 																path_rows,
@@ -3486,6 +3598,11 @@ estimate_hashagg_tablesize(Path *path, const AggClauseCosts *agg_costs,
  * create_grouping_paths
  *
  * Build a new upperrel containing Paths for grouping and/or aggregation.
+ * Along the way, we also build an upperrel for Paths which are partially
+ * grouped and/or aggregated.  A partially grouped and/or aggregated path
+ * needs a FinalizeAggregate node to complete the aggregation.  Currently,
+ * the only partially grouped paths we build are also partial paths; that
+ * is, they need a Gather and then a FinalizeAggregate.
  *
  * input_rel: contains the source-data Paths
  * target: the pathtarget for the result Paths to compute
@@ -3512,38 +3629,49 @@ create_grouping_paths(PlannerInfo *root,
 	Query	   *parse = root->parse;
 	Path	   *cheapest_path = input_rel->cheapest_total_path;
 	RelOptInfo *grouped_rel;
-	PathTarget *partial_grouping_target = NULL;
+	RelOptInfo *partially_grouped_rel;
 	AggClauseCosts agg_partial_costs;	/* parallel only */
 	AggClauseCosts agg_final_costs; /* parallel only */
-	Size		hashaggtablesize;
 	double		dNumGroups;
-	double		dNumPartialGroups = 0;
 	bool		can_hash;
 	bool		can_sort;
 	bool		try_parallel_aggregation;
 
-	ListCell   *lc;
-
-	/* For now, do all work in the (GROUP_AGG, NULL) upperrel */
+	/*
+	 * For now, all aggregated paths are added to the (GROUP_AGG, NULL)
+	 * upperrel.  Paths that are only partially aggregated go into the
+	 * (UPPERREL_PARTIAL_GROUP_AGG, NULL) upperrel.
+	 */
 	grouped_rel = fetch_upper_rel(root, UPPERREL_GROUP_AGG, NULL);
+	partially_grouped_rel = fetch_upper_rel(root, UPPERREL_PARTIAL_GROUP_AGG,
+											NULL);
 
 	/*
 	 * If the input relation is not parallel-safe, then the grouped relation
 	 * can't be parallel-safe, either.  Otherwise, it's parallel-safe if the
-	 * target list and HAVING quals are parallel-safe.
+	 * target list and HAVING quals are parallel-safe.  The partially grouped
+	 * relation obeys the same rules.
 	 */
 	if (input_rel->consider_parallel &&
 		is_parallel_safe(root, (Node *) target->exprs) &&
 		is_parallel_safe(root, (Node *) parse->havingQual))
+	{
 		grouped_rel->consider_parallel = true;
+		partially_grouped_rel->consider_parallel = true;
+	}
 
 	/*
-	 * If the input rel belongs to a single FDW, so does the grouped rel.
+	 * If the input rel belongs to a single FDW, so does the grouped rel. Same
+	 * for the partially_grouped_rel.
 	 */
 	grouped_rel->serverid = input_rel->serverid;
 	grouped_rel->userid = input_rel->userid;
 	grouped_rel->useridiscurrent = input_rel->useridiscurrent;
 	grouped_rel->fdwroutine = input_rel->fdwroutine;
+	partially_grouped_rel->serverid = input_rel->serverid;
+	partially_grouped_rel->userid = input_rel->userid;
+	partially_grouped_rel->useridiscurrent = input_rel->useridiscurrent;
+	partially_grouped_rel->fdwroutine = input_rel->fdwroutine;
 
 	/*
 	 * Check for degenerate grouping.
@@ -3589,9 +3717,12 @@ create_grouping_paths(PlannerInfo *root,
 			path = (Path *)
 				create_append_path(grouped_rel,
 								   paths,
+								   NIL,
 								   NULL,
 								   0,
-								   NIL);
+								   false,
+								   NIL,
+								   -1);
 			path->pathtarget = target;
 		}
 		else
@@ -3656,56 +3787,20 @@ create_grouping_paths(PlannerInfo *root,
 				(gd ? gd->any_hashable : grouping_is_hashable(parse->groupClause)));
 
 	/*
-	 * If grouped_rel->consider_parallel is true, then paths that we generate
-	 * for this grouping relation could be run inside of a worker, but that
-	 * doesn't mean we can actually use the PartialAggregate/FinalizeAggregate
-	 * execution strategy.  Figure that out.
+	 * Figure out whether a PartialAggregate/Finalize Aggregate execution
+	 * strategy is viable.
 	 */
-	if (!grouped_rel->consider_parallel)
-	{
-		/* Not even parallel-safe. */
-		try_parallel_aggregation = false;
-	}
-	else if (input_rel->partial_pathlist == NIL)
-	{
-		/* Nothing to use as input for partial aggregate. */
-		try_parallel_aggregation = false;
-	}
-	else if (!parse->hasAggs && parse->groupClause == NIL)
-	{
-		/*
-		 * We don't know how to do parallel aggregation unless we have either
-		 * some aggregates or a grouping clause.
-		 */
-		try_parallel_aggregation = false;
-	}
-	else if (parse->groupingSets)
-	{
-		/* We don't know how to do grouping sets in parallel. */
-		try_parallel_aggregation = false;
-	}
-	else if (agg_costs->hasNonPartial || agg_costs->hasNonSerial)
-	{
-		/* Insufficient support for partial mode. */
-		try_parallel_aggregation = false;
-	}
-	else
-	{
-		/* Everything looks good. */
-		try_parallel_aggregation = true;
-	}
+	try_parallel_aggregation = can_parallel_agg(root, input_rel, grouped_rel,
+												agg_costs);
 
 	/*
 	 * Before generating paths for grouped_rel, we first generate any possible
-	 * partial paths; that way, later code can easily consider both parallel
-	 * and non-parallel approaches to grouping.  Note that the partial paths
-	 * we generate here are also partially aggregated, so simply pushing a
-	 * Gather node on top is insufficient to create a final path, as would be
-	 * the case for a scan/join rel.
+	 * partial paths for partially_grouped_rel; that way, later code can
+	 * easily consider both parallel and non-parallel approaches to grouping.
 	 */
 	if (try_parallel_aggregation)
 	{
-		Path	   *cheapest_partial_path = linitial(input_rel->partial_pathlist);
+		PathTarget *partial_grouping_target;
 
 		/*
 		 * Build target list for partial aggregate paths.  These paths cannot
@@ -3715,11 +3810,7 @@ create_grouping_paths(PlannerInfo *root,
 		 * partial mode.
 		 */
 		partial_grouping_target = make_partial_grouping_target(root, target);
-
-		/* Estimate number of partial groups. */
-		dNumPartialGroups = get_number_of_groups(root,
-												 cheapest_partial_path->rows,
-												 gd);
+		partially_grouped_rel->reltarget = partial_grouping_target;
 
 		/*
 		 * Collect statistics about aggregates for estimating costs of
@@ -3743,469 +3834,119 @@ create_grouping_paths(PlannerInfo *root,
 								 &agg_final_costs);
 		}
 
-		if (can_sort)
-		{
-			/* This was checked before setting try_parallel_aggregation */
-			Assert(parse->hasAggs || parse->groupClause);
+		add_paths_to_partial_grouping_rel(root, input_rel,
+										  partially_grouped_rel,
+										  &agg_partial_costs,
+										  gd, can_sort, can_hash);
+	}
 
-			/*
-			 * Use any available suitably-sorted path as input, and also
-			 * consider sorting the cheapest partial path.
-			 */
-			foreach(lc, input_rel->partial_pathlist)
-			{
-				Path	   *path = (Path *) lfirst(lc);
-				bool		is_sorted;
+	/* Build final grouping paths */
+	add_paths_to_grouping_rel(root, input_rel, grouped_rel, target,
+							  partially_grouped_rel, agg_costs,
+							  &agg_final_costs, gd, can_sort, can_hash,
+							  dNumGroups, (List *) parse->havingQual);
 
-				is_sorted = pathkeys_contained_in(root->group_pathkeys,
-												  path->pathkeys);
-				if (path == cheapest_partial_path || is_sorted)
-				{
-					/* Sort the cheapest partial path, if it isn't already */
-					if (!is_sorted)
-						path = (Path *) create_sort_path(root,
-														 grouped_rel,
-														 path,
-														 root->group_pathkeys,
-														 -1.0);
-
-					if (parse->hasAggs)
-						add_partial_path(grouped_rel, (Path *)
-										 create_agg_path(root,
-														 grouped_rel,
-														 path,
-														 partial_grouping_target,
-														 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
-														 AGGSPLIT_INITIAL_SERIAL,
-														 parse->groupClause,
-														 NIL,
-														 &agg_partial_costs,
-														 dNumPartialGroups));
-					else
-						add_partial_path(grouped_rel, (Path *)
-										 create_group_path(root,
-														   grouped_rel,
-														   path,
-														   partial_grouping_target,
-														   parse->groupClause,
-														   NIL,
-														   dNumPartialGroups));
-				}
-			}
-		}
+	/* Give a helpful error if we failed to find any implementation */
+	if (grouped_rel->pathlist == NIL)
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("could not implement GROUP BY"),
+				 errdetail("Some of the datatypes only support hashing, while others only support sorting.")));
 
-		if (can_hash)
-		{
-			/* Checked above */
-			Assert(parse->hasAggs || parse->groupClause);
+	/*
+	 * If there is an FDW that's responsible for all baserels of the query,
+	 * let it consider adding ForeignPaths.
+	 */
+	if (grouped_rel->fdwroutine &&
+		grouped_rel->fdwroutine->GetForeignUpperPaths)
+		grouped_rel->fdwroutine->GetForeignUpperPaths(root, UPPERREL_GROUP_AGG,
+													  input_rel, grouped_rel);
 
-			hashaggtablesize =
-				estimate_hashagg_tablesize(cheapest_partial_path,
-										   &agg_partial_costs,
-										   dNumPartialGroups);
+	/* Let extensions possibly add some more paths */
+	if (create_upper_paths_hook)
+		(*create_upper_paths_hook) (root, UPPERREL_GROUP_AGG,
+									input_rel, grouped_rel);
 
-			/*
-			 * Tentatively produce a partial HashAgg Path, depending on if it
-			 * looks as if the hash table will fit in work_mem.
-			 */
-			if (hashaggtablesize < work_mem * 1024L)
-			{
-				add_partial_path(grouped_rel, (Path *)
-								 create_agg_path(root,
-												 grouped_rel,
-												 cheapest_partial_path,
-												 partial_grouping_target,
-												 AGG_HASHED,
-												 AGGSPLIT_INITIAL_SERIAL,
-												 parse->groupClause,
-												 NIL,
-												 &agg_partial_costs,
-												 dNumPartialGroups));
-			}
-		}
-	}
+	/* Now choose the best path(s) */
+	set_cheapest(grouped_rel);
 
-	/* Build final grouping paths */
-	if (can_sort)
+	return grouped_rel;
+}
+
+
+/*
+ * For a given input path, consider the possible ways of doing grouping sets on
+ * it, by combinations of hashing and sorting.  This can be called multiple
+ * times, so it's important that it not scribble on input.  No result is
+ * returned, but any generated paths are added to grouped_rel.
+ */
+static void
+consider_groupingsets_paths(PlannerInfo *root,
+							RelOptInfo *grouped_rel,
+							Path *path,
+							bool is_sorted,
+							bool can_hash,
+							PathTarget *target,
+							grouping_sets_data *gd,
+							const AggClauseCosts *agg_costs,
+							double dNumGroups)
+{
+	Query	   *parse = root->parse;
+
+	/*
+	 * If we're not being offered sorted input, then only consider plans that
+	 * can be done entirely by hashing.
+	 *
+	 * We can hash everything if it looks like it'll fit in work_mem. But if
+	 * the input is actually sorted despite not being advertised as such, we
+	 * prefer to make use of that in order to use less memory.
+	 *
+	 * If none of the grouping sets are sortable, then ignore the work_mem
+	 * limit and generate a path anyway, since otherwise we'll just fail.
+	 */
+	if (!is_sorted)
 	{
-		/*
-		 * Use any available suitably-sorted path as input, and also consider
-		 * sorting the cheapest-total path.
-		 */
-		foreach(lc, input_rel->pathlist)
-		{
-			Path	   *path = (Path *) lfirst(lc);
-			bool		is_sorted;
+		List	   *new_rollups = NIL;
+		RollupData *unhashed_rollup = NULL;
+		List	   *sets_data;
+		List	   *empty_sets_data = NIL;
+		List	   *empty_sets = NIL;
+		ListCell   *lc;
+		ListCell   *l_start = list_head(gd->rollups);
+		AggStrategy strat = AGG_HASHED;
+		Size		hashsize;
+		double		exclude_groups = 0.0;
 
-			is_sorted = pathkeys_contained_in(root->group_pathkeys,
-											  path->pathkeys);
-			if (path == cheapest_path || is_sorted)
-			{
-				/* Sort the cheapest-total path if it isn't already sorted */
-				if (!is_sorted)
-					path = (Path *) create_sort_path(root,
-													 grouped_rel,
-													 path,
-													 root->group_pathkeys,
-													 -1.0);
+		Assert(can_hash);
 
-				/* Now decide what to stick atop it */
-				if (parse->groupingSets)
-				{
-					consider_groupingsets_paths(root, grouped_rel,
-												path, true, can_hash, target,
-												gd, agg_costs, dNumGroups);
-				}
-				else if (parse->hasAggs)
-				{
-					/*
-					 * We have aggregation, possibly with plain GROUP BY. Make
-					 * an AggPath.
-					 */
-					add_path(grouped_rel, (Path *)
-							 create_agg_path(root,
-											 grouped_rel,
-											 path,
-											 target,
-											 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
-											 AGGSPLIT_SIMPLE,
-											 parse->groupClause,
-											 (List *) parse->havingQual,
-											 agg_costs,
-											 dNumGroups));
-				}
-				else if (parse->groupClause)
-				{
-					/*
-					 * We have GROUP BY without aggregation or grouping sets.
-					 * Make a GroupPath.
-					 */
-					add_path(grouped_rel, (Path *)
-							 create_group_path(root,
-											   grouped_rel,
-											   path,
-											   target,
-											   parse->groupClause,
-											   (List *) parse->havingQual,
-											   dNumGroups));
-				}
-				else
-				{
-					/* Other cases should have been handled above */
-					Assert(false);
-				}
-			}
+		if (pathkeys_contained_in(root->group_pathkeys, path->pathkeys))
+		{
+			unhashed_rollup = lfirst_node(RollupData, l_start);
+			exclude_groups = unhashed_rollup->numGroups;
+			l_start = lnext(l_start);
 		}
 
+		hashsize = estimate_hashagg_tablesize(path,
+											  agg_costs,
+											  dNumGroups - exclude_groups);
+
 		/*
-		 * Now generate a complete GroupAgg Path atop of the cheapest partial
-		 * path.  We can do this using either Gather or Gather Merge.
+		 * gd->rollups is empty if we have only unsortable columns to work
+		 * with.  Override work_mem in that case; otherwise, we'll rely on the
+		 * sorted-input case to generate usable mixed paths.
 		 */
-		if (grouped_rel->partial_pathlist)
-		{
-			Path	   *path = (Path *) linitial(grouped_rel->partial_pathlist);
-			double		total_groups = path->rows * path->parallel_workers;
+		if (hashsize > work_mem * 1024L && gd->rollups)
+			return;				/* nope, won't fit */
 
-			path = (Path *) create_gather_path(root,
-											   grouped_rel,
-											   path,
-											   partial_grouping_target,
-											   NULL,
-											   &total_groups);
+		/*
+		 * We need to burst the existing rollups list into individual grouping
+		 * sets and recompute a groupClause for each set.
+		 */
+		sets_data = list_copy(gd->unsortable_sets);
 
-			/*
-			 * Since Gather's output is always unsorted, we'll need to sort,
-			 * unless there's no GROUP BY clause or a degenerate (constant)
-			 * one, in which case there will only be a single group.
-			 */
-			if (root->group_pathkeys)
-				path = (Path *) create_sort_path(root,
-												 grouped_rel,
-												 path,
-												 root->group_pathkeys,
-												 -1.0);
-
-			if (parse->hasAggs)
-				add_path(grouped_rel, (Path *)
-						 create_agg_path(root,
-										 grouped_rel,
-										 path,
-										 target,
-										 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
-										 AGGSPLIT_FINAL_DESERIAL,
-										 parse->groupClause,
-										 (List *) parse->havingQual,
-										 &agg_final_costs,
-										 dNumGroups));
-			else
-				add_path(grouped_rel, (Path *)
-						 create_group_path(root,
-										   grouped_rel,
-										   path,
-										   target,
-										   parse->groupClause,
-										   (List *) parse->havingQual,
-										   dNumGroups));
-
-			/*
-			 * The point of using Gather Merge rather than Gather is that it
-			 * can preserve the ordering of the input path, so there's no
-			 * reason to try it unless (1) it's possible to produce more than
-			 * one output row and (2) we want the output path to be ordered.
-			 */
-			if (parse->groupClause != NIL && root->group_pathkeys != NIL)
-			{
-				foreach(lc, grouped_rel->partial_pathlist)
-				{
-					Path	   *subpath = (Path *) lfirst(lc);
-					Path	   *gmpath;
-					double		total_groups;
-
-					/*
-					 * It's useful to consider paths that are already properly
-					 * ordered for Gather Merge, because those don't need a
-					 * sort.  It's also useful to consider the cheapest path,
-					 * because sorting it in parallel and then doing Gather
-					 * Merge may be better than doing an unordered Gather
-					 * followed by a sort.  But there's no point in
-					 * considering non-cheapest paths that aren't already
-					 * sorted correctly.
-					 */
-					if (path != subpath &&
-						!pathkeys_contained_in(root->group_pathkeys,
-											   subpath->pathkeys))
-						continue;
-
-					total_groups = subpath->rows * subpath->parallel_workers;
-
-					gmpath = (Path *)
-						create_gather_merge_path(root,
-												 grouped_rel,
-												 subpath,
-												 partial_grouping_target,
-												 root->group_pathkeys,
-												 NULL,
-												 &total_groups);
-
-					if (parse->hasAggs)
-						add_path(grouped_rel, (Path *)
-								 create_agg_path(root,
-												 grouped_rel,
-												 gmpath,
-												 target,
-												 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
-												 AGGSPLIT_FINAL_DESERIAL,
-												 parse->groupClause,
-												 (List *) parse->havingQual,
-												 &agg_final_costs,
-												 dNumGroups));
-					else
-						add_path(grouped_rel, (Path *)
-								 create_group_path(root,
-												   grouped_rel,
-												   gmpath,
-												   target,
-												   parse->groupClause,
-												   (List *) parse->havingQual,
-												   dNumGroups));
-				}
-			}
-		}
-	}
-
-	if (can_hash)
-	{
-		if (parse->groupingSets)
-		{
-			/*
-			 * Try for a hash-only groupingsets path over unsorted input.
-			 */
-			consider_groupingsets_paths(root, grouped_rel,
-										cheapest_path, false, true, target,
-										gd, agg_costs, dNumGroups);
-		}
-		else
-		{
-			hashaggtablesize = estimate_hashagg_tablesize(cheapest_path,
-														  agg_costs,
-														  dNumGroups);
-
-			/*
-			 * Provided that the estimated size of the hashtable does not
-			 * exceed work_mem, we'll generate a HashAgg Path, although if we
-			 * were unable to sort above, then we'd better generate a Path, so
-			 * that we at least have one.
-			 */
-			if (hashaggtablesize < work_mem * 1024L ||
-				grouped_rel->pathlist == NIL)
-			{
-				/*
-				 * We just need an Agg over the cheapest-total input path,
-				 * since input order won't matter.
-				 */
-				add_path(grouped_rel, (Path *)
-						 create_agg_path(root, grouped_rel,
-										 cheapest_path,
-										 target,
-										 AGG_HASHED,
-										 AGGSPLIT_SIMPLE,
-										 parse->groupClause,
-										 (List *) parse->havingQual,
-										 agg_costs,
-										 dNumGroups));
-			}
-		}
-
-		/*
-		 * Generate a HashAgg Path atop of the cheapest partial path. Once
-		 * again, we'll only do this if it looks as though the hash table
-		 * won't exceed work_mem.
-		 */
-		if (grouped_rel->partial_pathlist)
-		{
-			Path	   *path = (Path *) linitial(grouped_rel->partial_pathlist);
-
-			hashaggtablesize = estimate_hashagg_tablesize(path,
-														  &agg_final_costs,
-														  dNumGroups);
-
-			if (hashaggtablesize < work_mem * 1024L)
-			{
-				double		total_groups = path->rows * path->parallel_workers;
-
-				path = (Path *) create_gather_path(root,
-												   grouped_rel,
-												   path,
-												   partial_grouping_target,
-												   NULL,
-												   &total_groups);
-
-				add_path(grouped_rel, (Path *)
-						 create_agg_path(root,
-										 grouped_rel,
-										 path,
-										 target,
-										 AGG_HASHED,
-										 AGGSPLIT_FINAL_DESERIAL,
-										 parse->groupClause,
-										 (List *) parse->havingQual,
-										 &agg_final_costs,
-										 dNumGroups));
-			}
-		}
-	}
-
-	/* Give a helpful error if we failed to find any implementation */
-	if (grouped_rel->pathlist == NIL)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("could not implement GROUP BY"),
-				 errdetail("Some of the datatypes only support hashing, while others only support sorting.")));
-
-	/*
-	 * If there is an FDW that's responsible for all baserels of the query,
-	 * let it consider adding ForeignPaths.
-	 */
-	if (grouped_rel->fdwroutine &&
-		grouped_rel->fdwroutine->GetForeignUpperPaths)
-		grouped_rel->fdwroutine->GetForeignUpperPaths(root, UPPERREL_GROUP_AGG,
-													  input_rel, grouped_rel);
-
-	/* Let extensions possibly add some more paths */
-	if (create_upper_paths_hook)
-		(*create_upper_paths_hook) (root, UPPERREL_GROUP_AGG,
-									input_rel, grouped_rel);
-
-	/* Now choose the best path(s) */
-	set_cheapest(grouped_rel);
-
-	/*
-	 * We've been using the partial pathlist for the grouped relation to hold
-	 * partially aggregated paths, but that's actually a little bit bogus
-	 * because it's unsafe for later planning stages -- like ordered_rel ---
-	 * to get the idea that they can use these partial paths as if they didn't
-	 * need a FinalizeAggregate step.  Zap the partial pathlist at this stage
-	 * so we don't get confused.
-	 */
-	grouped_rel->partial_pathlist = NIL;
-
-	return grouped_rel;
-}
-
-
-/*
- * For a given input path, consider the possible ways of doing grouping sets on
- * it, by combinations of hashing and sorting.  This can be called multiple
- * times, so it's important that it not scribble on input.  No result is
- * returned, but any generated paths are added to grouped_rel.
- */
-static void
-consider_groupingsets_paths(PlannerInfo *root,
-							RelOptInfo *grouped_rel,
-							Path *path,
-							bool is_sorted,
-							bool can_hash,
-							PathTarget *target,
-							grouping_sets_data *gd,
-							const AggClauseCosts *agg_costs,
-							double dNumGroups)
-{
-	Query	   *parse = root->parse;
-
-	/*
-	 * If we're not being offered sorted input, then only consider plans that
-	 * can be done entirely by hashing.
-	 *
-	 * We can hash everything if it looks like it'll fit in work_mem. But if
-	 * the input is actually sorted despite not being advertised as such, we
-	 * prefer to make use of that in order to use less memory.
-	 *
-	 * If none of the grouping sets are sortable, then ignore the work_mem
-	 * limit and generate a path anyway, since otherwise we'll just fail.
-	 */
-	if (!is_sorted)
-	{
-		List	   *new_rollups = NIL;
-		RollupData *unhashed_rollup = NULL;
-		List	   *sets_data;
-		List	   *empty_sets_data = NIL;
-		List	   *empty_sets = NIL;
-		ListCell   *lc;
-		ListCell   *l_start = list_head(gd->rollups);
-		AggStrategy strat = AGG_HASHED;
-		Size		hashsize;
-		double		exclude_groups = 0.0;
-
-		Assert(can_hash);
-
-		if (pathkeys_contained_in(root->group_pathkeys, path->pathkeys))
-		{
-			unhashed_rollup = lfirst(l_start);
-			exclude_groups = unhashed_rollup->numGroups;
-			l_start = lnext(l_start);
-		}
-
-		hashsize = estimate_hashagg_tablesize(path,
-											  agg_costs,
-											  dNumGroups - exclude_groups);
-
-		/*
-		 * gd->rollups is empty if we have only unsortable columns to work
-		 * with.  Override work_mem in that case; otherwise, we'll rely on the
-		 * sorted-input case to generate usable mixed paths.
-		 */
-		if (hashsize > work_mem * 1024L && gd->rollups)
-			return;				/* nope, won't fit */
-
-		/*
-		 * We need to burst the existing rollups list into individual grouping
-		 * sets and recompute a groupClause for each set.
-		 */
-		sets_data = list_copy(gd->unsortable_sets);
-
-		for_each_cell(lc, l_start)
-		{
-			RollupData *rollup = lfirst(lc);
+		for_each_cell(lc, l_start)
+		{
+			RollupData *rollup = lfirst_node(RollupData, lc);
 
 			/*
 			 * If we find an unhashable rollup that's not been skipped by the
@@ -4225,7 +3966,7 @@ consider_groupingsets_paths(PlannerInfo *root,
 		}
 		foreach(lc, sets_data)
 		{
-			GroupingSetData *gs = lfirst(lc);
+			GroupingSetData *gs = lfirst_node(GroupingSetData, lc);
 			List	   *gset = gs->set;
 			RollupData *rollup;
 
@@ -4367,7 +4108,7 @@ consider_groupingsets_paths(PlannerInfo *root,
 			i = 0;
 			for_each_cell(lc, lnext(list_head(gd->rollups)))
 			{
-				RollupData *rollup = lfirst(lc);
+				RollupData *rollup = lfirst_node(RollupData, lc);
 
 				if (rollup->hashable)
 				{
@@ -4401,7 +4142,7 @@ consider_groupingsets_paths(PlannerInfo *root,
 				i = 0;
 				for_each_cell(lc, lnext(list_head(gd->rollups)))
 				{
-					RollupData *rollup = lfirst(lc);
+					RollupData *rollup = lfirst_node(RollupData, lc);
 
 					if (rollup->hashable)
 					{
@@ -4423,7 +4164,7 @@ consider_groupingsets_paths(PlannerInfo *root,
 
 		foreach(lc, hash_sets)
 		{
-			GroupingSetData *gs = lfirst(lc);
+			GroupingSetData *gs = lfirst_node(GroupingSetData, lc);
 			RollupData *rollup = makeNode(RollupData);
 
 			Assert(gs->set != NIL);
@@ -4602,7 +4343,7 @@ create_one_window_path(PlannerInfo *root,
 
 	foreach(l, activeWindows)
 	{
-		WindowClause *wc = (WindowClause *) lfirst(l);
+		WindowClause *wc = lfirst_node(WindowClause, l);
 		List	   *window_pathkeys;
 
 		window_pathkeys = make_pathkeys_for_window(root,
@@ -4965,14 +4706,15 @@ create_ordered_paths(PlannerInfo *root,
 											 ordered_rel,
 											 cheapest_partial_path,
 											 root->sort_pathkeys,
-											 -1.0);
+											 limit_tuples);
 
 			total_groups = cheapest_partial_path->rows *
 				cheapest_partial_path->parallel_workers;
 			path = (Path *)
 				create_gather_merge_path(root, ordered_rel,
 										 path,
-										 target, root->sort_pathkeys, NULL,
+										 path->pathtarget,
+										 root->sort_pathkeys, NULL,
 										 &total_groups);
 
 			/* Add projection step if needed */
@@ -5266,7 +5008,7 @@ postprocess_setop_tlist(List *new_tlist, List *orig_tlist)
 
 	foreach(l, new_tlist)
 	{
-		TargetEntry *new_tle = (TargetEntry *) lfirst(l);
+		TargetEntry *new_tle = lfirst_node(TargetEntry, l);
 		TargetEntry *orig_tle;
 
 		/* ignore resjunk columns in setop result */
@@ -5274,7 +5016,7 @@ postprocess_setop_tlist(List *new_tlist, List *orig_tlist)
 			continue;
 
 		Assert(orig_tlist_item != NULL);
-		orig_tle = (TargetEntry *) lfirst(orig_tlist_item);
+		orig_tle = lfirst_node(TargetEntry, orig_tlist_item);
 		orig_tlist_item = lnext(orig_tlist_item);
 		if (orig_tle->resjunk)	/* should not happen */
 			elog(ERROR, "resjunk output columns are not implemented");
@@ -5302,7 +5044,7 @@ select_active_windows(PlannerInfo *root, WindowFuncLists *wflists)
 	actives = NIL;
 	foreach(lc, root->parse->windowClause)
 	{
-		WindowClause *wc = (WindowClause *) lfirst(lc);
+		WindowClause *wc = lfirst_node(WindowClause, lc);
 
 		/* It's only active if wflists shows some related WindowFuncs */
 		Assert(wc->winref <= wflists->maxWinRef);
@@ -5325,7 +5067,7 @@ select_active_windows(PlannerInfo *root, WindowFuncLists *wflists)
 	result = NIL;
 	while (actives != NIL)
 	{
-		WindowClause *wc = (WindowClause *) linitial(actives);
+		WindowClause *wc = linitial_node(WindowClause, actives);
 		ListCell   *prev;
 		ListCell   *next;
 
@@ -5337,7 +5079,7 @@ select_active_windows(PlannerInfo *root, WindowFuncLists *wflists)
 		prev = NULL;
 		for (lc = list_head(actives); lc; lc = next)
 		{
-			WindowClause *wc2 = (WindowClause *) lfirst(lc);
+			WindowClause *wc2 = lfirst_node(WindowClause, lc);
 
 			next = lnext(lc);
 			/* framing options are NOT to be compared here! */
@@ -5410,18 +5152,18 @@ make_window_input_target(PlannerInfo *root,
 	sgrefs = NULL;
 	foreach(lc, activeWindows)
 	{
-		WindowClause *wc = (WindowClause *) lfirst(lc);
+		WindowClause *wc = lfirst_node(WindowClause, lc);
 		ListCell   *lc2;
 
 		foreach(lc2, wc->partitionClause)
 		{
-			SortGroupClause *sortcl = (SortGroupClause *) lfirst(lc2);
+			SortGroupClause *sortcl = lfirst_node(SortGroupClause, lc2);
 
 			sgrefs = bms_add_member(sgrefs, sortcl->tleSortGroupRef);
 		}
 		foreach(lc2, wc->orderClause)
 		{
-			SortGroupClause *sortcl = (SortGroupClause *) lfirst(lc2);
+			SortGroupClause *sortcl = lfirst_node(SortGroupClause, lc2);
 
 			sgrefs = bms_add_member(sgrefs, sortcl->tleSortGroupRef);
 		}
@@ -5430,7 +5172,7 @@ make_window_input_target(PlannerInfo *root,
 	/* Add in sortgroupref numbers of GROUP BY clauses, too */
 	foreach(lc, parse->groupClause)
 	{
-		SortGroupClause *grpcl = (SortGroupClause *) lfirst(lc);
+		SortGroupClause *grpcl = lfirst_node(SortGroupClause, lc);
 
 		sgrefs = bms_add_member(sgrefs, grpcl->tleSortGroupRef);
 	}
@@ -5600,7 +5342,7 @@ make_pathkeys_for_window(PlannerInfo *root, WindowClause *wc,
  * below the Sort step (and the Distinct step, if any).  This will be
  * exactly final_target if we decide a projection step wouldn't be helpful.
  *
- * In addition, *have_postponed_srfs is set to TRUE if we choose to postpone
+ * In addition, *have_postponed_srfs is set to true if we choose to postpone
  * any set-returning functions to after the Sort.
  */
 static PathTarget *
@@ -5850,7 +5592,7 @@ adjust_paths_for_srfs(PlannerInfo *root, RelOptInfo *rel,
 		Assert(subpath->param_info == NULL);
 		forboth(lc1, targets, lc2, targets_contain_srfs)
 		{
-			PathTarget *thistarget = (PathTarget *) lfirst(lc1);
+			PathTarget *thistarget = lfirst_node(PathTarget, lc1);
 			bool		contains_srfs = (bool) lfirst_int(lc2);
 
 			/* If this level doesn't contain SRFs, do regular projection */
@@ -5883,7 +5625,7 @@ adjust_paths_for_srfs(PlannerInfo *root, RelOptInfo *rel,
 		Assert(subpath->param_info == NULL);
 		forboth(lc1, targets, lc2, targets_contain_srfs)
 		{
-			PathTarget *thistarget = (PathTarget *) lfirst(lc1);
+			PathTarget *thistarget = lfirst_node(PathTarget, lc1);
 			bool		contains_srfs = (bool) lfirst_int(lc2);
 
 			/* If this level doesn't contain SRFs, do regular projection */
@@ -5952,7 +5694,7 @@ expression_planner(Expr *expr)
  * tableOid is the OID of a table to be clustered on its index indexOid
  * (which is already known to be a btree index).  Decide whether it's
  * cheaper to do an indexscan or a seqscan-plus-sort to execute the CLUSTER.
- * Return TRUE to use sorting, FALSE to use an indexscan.
+ * Return true to use sorting, false to use an indexscan.
  *
  * Note: caller had better already hold some type of lock on the table.
  */
@@ -6009,7 +5751,7 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid)
 	indexInfo = NULL;
 	foreach(lc, rel->indexlist)
 	{
-		indexInfo = (IndexOptInfo *) lfirst(lc);
+		indexInfo = lfirst_node(IndexOptInfo, lc);
 		if (indexInfo->indexoid == indexOid)
 			break;
 	}
@@ -6058,31 +5800,619 @@ plan_cluster_use_sort(Oid tableOid, Oid indexOid)
 }
 
 /*
- * get_partitioned_child_rels
- *		Returns a list of the RT indexes of the partitioned child relations
- *		with rti as the root parent RT index.
+ * plan_create_index_workers
+ *		Use the planner to decide how many parallel worker processes
+ *		CREATE INDEX should request for use
+ *
+ * tableOid is the table on which the index is to be built.  indexOid is the
+ * OID of an index to be created or reindexed (which must be a btree index).
+ *
+ * Return value is the number of parallel worker processes to request.  It
+ * may be unsafe to proceed if this is 0.  Note that this does not include the
+ * leader participating as a worker (value is always a number of parallel
+ * worker processes).
  *
- * Note: Only call this function on RTEs known to be partitioned tables.
+ * Note: caller had better already hold some type of lock on the table and
+ * index.
  */
-List *
-get_partitioned_child_rels(PlannerInfo *root, Index rti)
+int
+plan_create_index_workers(Oid tableOid, Oid indexOid)
 {
-	List	   *result = NIL;
-	ListCell   *l;
+	PlannerInfo *root;
+	Query	   *query;
+	PlannerGlobal *glob;
+	RangeTblEntry *rte;
+	Relation	heap;
+	Relation	index;
+	RelOptInfo *rel;
+	int			parallel_workers;
+	BlockNumber heap_blocks;
+	double		reltuples;
+	double		allvisfrac;
 
-	foreach(l, root->pcinfo_list)
-	{
-		PartitionedChildRelInfo *pc = lfirst(l);
+	/* Return immediately when parallelism disabled */
+	if (dynamic_shared_memory_type == DSM_IMPL_NONE ||
+		max_parallel_maintenance_workers == 0)
+		return 0;
 
-		if (pc->parent_relid == rti)
-		{
-			result = pc->child_rels;
-			break;
-		}
-	}
+	/* Set up largely-dummy planner state */
+	query = makeNode(Query);
+	query->commandType = CMD_SELECT;
+
+	glob = makeNode(PlannerGlobal);
 
-	/* The root partitioned table is included as a child rel */
-	Assert(list_length(result) >= 1);
+	root = makeNode(PlannerInfo);
+	root->parse = query;
+	root->glob = glob;
+	root->query_level = 1;
+	root->planner_cxt = CurrentMemoryContext;
+	root->wt_param_id = -1;
 
-	return result;
+	/*
+	 * Build a minimal RTE.
+	 *
+	 * Set the target's table to be an inheritance parent.  This is a kludge
+	 * that prevents problems within get_relation_info(), which does not
+	 * expect that any IndexOptInfo is currently undergoing REINDEX.
+	 */
+	rte = makeNode(RangeTblEntry);
+	rte->rtekind = RTE_RELATION;
+	rte->relid = tableOid;
+	rte->relkind = RELKIND_RELATION;	/* Don't be too picky. */
+	rte->lateral = false;
+	rte->inh = true;
+	rte->inFromCl = true;
+	query->rtable = list_make1(rte);
+
+	/* Set up RTE/RelOptInfo arrays */
+	setup_simple_rel_arrays(root);
+
+	/* Build RelOptInfo */
+	rel = build_simple_rel(root, 1, NULL);
+
+	heap = heap_open(tableOid, NoLock);
+	index = index_open(indexOid, NoLock);
+
+	/*
+	 * Determine if it's safe to proceed.
+	 *
+	 * Currently, parallel workers can't access the leader's temporary tables.
+	 * Furthermore, any index predicate or index expressions must be parallel
+	 * safe.
+	 */
+	if (heap->rd_rel->relpersistence == RELPERSISTENCE_TEMP ||
+		!is_parallel_safe(root, (Node *) RelationGetIndexExpressions(index)) ||
+		!is_parallel_safe(root, (Node *) RelationGetIndexPredicate(index)))
+	{
+		parallel_workers = 0;
+		goto done;
+	}
+
+	/*
+	 * If parallel_workers storage parameter is set for the table, accept that
+	 * as the number of parallel worker processes to launch (though still cap
+	 * at max_parallel_maintenance_workers).  Note that we deliberately do not
+	 * consider any other factor when parallel_workers is set. (e.g., memory
+	 * use by workers.)
+	 */
+	if (rel->rel_parallel_workers != -1)
+	{
+		parallel_workers = Min(rel->rel_parallel_workers,
+							   max_parallel_maintenance_workers);
+		goto done;
+	}
+
+	/*
+	 * Estimate heap relation size ourselves, since rel->pages cannot be
+	 * trusted (heap RTE was marked as inheritance parent)
+	 */
+	estimate_rel_size(heap, NULL, &heap_blocks, &reltuples, &allvisfrac);
+
+	/*
+	 * Determine number of workers to scan the heap relation using generic
+	 * model
+	 */
+	parallel_workers = compute_parallel_worker(rel, heap_blocks, -1,
+											   max_parallel_maintenance_workers);
+
+	/*
+	 * Cap workers based on available maintenance_work_mem as needed.
+	 *
+	 * Note that each tuplesort participant receives an even share of the
+	 * total maintenance_work_mem budget.  Aim to leave participants
+	 * (including the leader as a participant) with no less than 32MB of
+	 * memory.  This leaves cases where maintenance_work_mem is set to 64MB
+	 * immediately past the threshold of being capable of launching a single
+	 * parallel worker to sort.
+	 */
+	while (parallel_workers > 0 &&
+		   maintenance_work_mem / (parallel_workers + 1) < 32768L)
+		parallel_workers--;
+
+done:
+	index_close(index, NoLock);
+	heap_close(heap, NoLock);
+
+	return parallel_workers;
+}
+
+/*
+ * get_partitioned_child_rels
+ *		Returns a list of the RT indexes of the partitioned child relations
+ *		with rti as the root parent RT index. Also sets
+ *		*part_cols_updated to true if any of the root rte's updated
+ *		columns is used in the partition key either of the relation whose RTI
+ *		is specified or of any child relation.
+ *
+ * Note: This function might get called even for range table entries that
+ * are not partitioned tables; in such a case, it will simply return NIL.
+ */
+List *
+get_partitioned_child_rels(PlannerInfo *root, Index rti,
+						   bool *part_cols_updated)
+{
+	List	   *result = NIL;
+	ListCell   *l;
+
+	if (part_cols_updated)
+		*part_cols_updated = false;
+
+	foreach(l, root->pcinfo_list)
+	{
+		PartitionedChildRelInfo *pc = lfirst_node(PartitionedChildRelInfo, l);
+
+		if (pc->parent_relid == rti)
+		{
+			result = pc->child_rels;
+			if (part_cols_updated)
+				*part_cols_updated = pc->part_cols_updated;
+			break;
+		}
+	}
+
+	return result;
+}
+
+/*
+ * get_partitioned_child_rels_for_join
+ *		Build and return a list containing the RTI of every partitioned
+ *		relation which is a child of some rel included in the join.
+ */
+List *
+get_partitioned_child_rels_for_join(PlannerInfo *root, Relids join_relids)
+{
+	List	   *result = NIL;
+	ListCell   *l;
+
+	foreach(l, root->pcinfo_list)
+	{
+		PartitionedChildRelInfo *pc = lfirst(l);
+
+		if (bms_is_member(pc->parent_relid, join_relids))
+			result = list_concat(result, list_copy(pc->child_rels));
+	}
+
+	return result;
+}
+
+/*
+ * add_paths_to_grouping_rel
+ *
+ * Add non-partial paths to grouping relation.
+ */
+static void
+add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo *input_rel,
+						  RelOptInfo *grouped_rel,
+						  PathTarget *target,
+						  RelOptInfo *partially_grouped_rel,
+						  const AggClauseCosts *agg_costs,
+						  const AggClauseCosts *agg_final_costs,
+						  grouping_sets_data *gd, bool can_sort, bool can_hash,
+						  double dNumGroups, List *havingQual)
+{
+	Query	   *parse = root->parse;
+	Path	   *cheapest_path = input_rel->cheapest_total_path;
+	ListCell   *lc;
+
+	if (can_sort)
+	{
+		/*
+		 * Use any available suitably-sorted path as input, and also consider
+		 * sorting the cheapest-total path.
+		 */
+		foreach(lc, input_rel->pathlist)
+		{
+			Path	   *path = (Path *) lfirst(lc);
+			bool		is_sorted;
+
+			is_sorted = pathkeys_contained_in(root->group_pathkeys,
+											  path->pathkeys);
+			if (path == cheapest_path || is_sorted)
+			{
+				/* Sort the cheapest-total path if it isn't already sorted */
+				if (!is_sorted)
+					path = (Path *) create_sort_path(root,
+													 grouped_rel,
+													 path,
+													 root->group_pathkeys,
+													 -1.0);
+
+				/* Now decide what to stick atop it */
+				if (parse->groupingSets)
+				{
+					consider_groupingsets_paths(root, grouped_rel,
+												path, true, can_hash, target,
+												gd, agg_costs, dNumGroups);
+				}
+				else if (parse->hasAggs)
+				{
+					/*
+					 * We have aggregation, possibly with plain GROUP BY. Make
+					 * an AggPath.
+					 */
+					add_path(grouped_rel, (Path *)
+							 create_agg_path(root,
+											 grouped_rel,
+											 path,
+											 target,
+											 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
+											 AGGSPLIT_SIMPLE,
+											 parse->groupClause,
+											 havingQual,
+											 agg_costs,
+											 dNumGroups));
+				}
+				else if (parse->groupClause)
+				{
+					/*
+					 * We have GROUP BY without aggregation or grouping sets.
+					 * Make a GroupPath.
+					 */
+					add_path(grouped_rel, (Path *)
+							 create_group_path(root,
+											   grouped_rel,
+											   path,
+											   target,
+											   parse->groupClause,
+											   havingQual,
+											   dNumGroups));
+				}
+				else
+				{
+					/* Other cases should have been handled above */
+					Assert(false);
+				}
+			}
+		}
+
+		/*
+		 * Instead of operating directly on the input relation, we can
+		 * consider finalizing a partially aggregated path.
+		 */
+		foreach(lc, partially_grouped_rel->pathlist)
+		{
+			Path	   *path = (Path *) lfirst(lc);
+
+			/*
+			 * Insert a Sort node, if required.  But there's no point in
+			 * sorting anything but the cheapest path.
+			 */
+			if (!pathkeys_contained_in(root->group_pathkeys, path->pathkeys))
+			{
+				if (path != partially_grouped_rel->cheapest_total_path)
+					continue;
+				path = (Path *) create_sort_path(root,
+												 grouped_rel,
+												 path,
+												 root->group_pathkeys,
+												 -1.0);
+			}
+
+			if (parse->hasAggs)
+				add_path(grouped_rel, (Path *)
+						 create_agg_path(root,
+										 grouped_rel,
+										 path,
+										 target,
+										 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
+										 AGGSPLIT_FINAL_DESERIAL,
+										 parse->groupClause,
+										 havingQual,
+										 agg_final_costs,
+										 dNumGroups));
+			else
+				add_path(grouped_rel, (Path *)
+						 create_group_path(root,
+										   grouped_rel,
+										   path,
+										   target,
+										   parse->groupClause,
+										   havingQual,
+										   dNumGroups));
+		}
+	}
+
+	if (can_hash)
+	{
+		Size		hashaggtablesize;
+
+		if (parse->groupingSets)
+		{
+			/*
+			 * Try for a hash-only groupingsets path over unsorted input.
+			 */
+			consider_groupingsets_paths(root, grouped_rel,
+										cheapest_path, false, true, target,
+										gd, agg_costs, dNumGroups);
+		}
+		else
+		{
+			hashaggtablesize = estimate_hashagg_tablesize(cheapest_path,
+														  agg_costs,
+														  dNumGroups);
+
+			/*
+			 * Provided that the estimated size of the hashtable does not
+			 * exceed work_mem, we'll generate a HashAgg Path, although if we
+			 * were unable to sort above, then we'd better generate a Path, so
+			 * that we at least have one.
+			 */
+			if (hashaggtablesize < work_mem * 1024L ||
+				grouped_rel->pathlist == NIL)
+			{
+				/*
+				 * We just need an Agg over the cheapest-total input path,
+				 * since input order won't matter.
+				 */
+				add_path(grouped_rel, (Path *)
+						 create_agg_path(root, grouped_rel,
+										 cheapest_path,
+										 target,
+										 AGG_HASHED,
+										 AGGSPLIT_SIMPLE,
+										 parse->groupClause,
+										 havingQual,
+										 agg_costs,
+										 dNumGroups));
+			}
+		}
+
+		/*
+		 * Generate a Finalize HashAgg Path atop of the cheapest partially
+		 * grouped path. Once again, we'll only do this if it looks as though
+		 * the hash table won't exceed work_mem.
+		 */
+		if (partially_grouped_rel->pathlist)
+		{
+			Path	   *path = partially_grouped_rel->cheapest_total_path;
+
+			hashaggtablesize = estimate_hashagg_tablesize(path,
+														  agg_final_costs,
+														  dNumGroups);
+
+			if (hashaggtablesize < work_mem * 1024L)
+				add_path(grouped_rel, (Path *)
+						 create_agg_path(root,
+										 grouped_rel,
+										 path,
+										 target,
+										 AGG_HASHED,
+										 AGGSPLIT_FINAL_DESERIAL,
+										 parse->groupClause,
+										 havingQual,
+										 agg_final_costs,
+										 dNumGroups));
+		}
+	}
+}
+
+/*
+ * add_paths_to_partial_grouping_rel
+ *
+ * First, generate partially aggregated partial paths from the partial paths
+ * for the input relation, and then generate partially aggregated non-partial
+ * paths using Gather or Gather Merge.  All paths for this relation -- both
+ * partial and non-partial -- have been partially aggregated but require a
+ * subsequent FinalizeAggregate step.
+ */
+static void
+add_paths_to_partial_grouping_rel(PlannerInfo *root,
+								  RelOptInfo *input_rel,
+								  RelOptInfo *partially_grouped_rel,
+								  AggClauseCosts *agg_partial_costs,
+								  grouping_sets_data *gd,
+								  bool can_sort,
+								  bool can_hash)
+{
+	Query	   *parse = root->parse;
+	Path	   *cheapest_partial_path = linitial(input_rel->partial_pathlist);
+	Size		hashaggtablesize;
+	double		dNumPartialGroups = 0;
+	ListCell   *lc;
+
+	/* Estimate number of partial groups. */
+	dNumPartialGroups = get_number_of_groups(root,
+											 cheapest_partial_path->rows,
+											 gd);
+
+	if (can_sort)
+	{
+		/* This should have been checked previously */
+		Assert(parse->hasAggs || parse->groupClause);
+
+		/*
+		 * Use any available suitably-sorted path as input, and also consider
+		 * sorting the cheapest partial path.
+		 */
+		foreach(lc, input_rel->partial_pathlist)
+		{
+			Path	   *path = (Path *) lfirst(lc);
+			bool		is_sorted;
+
+			is_sorted = pathkeys_contained_in(root->group_pathkeys,
+											  path->pathkeys);
+			if (path == cheapest_partial_path || is_sorted)
+			{
+				/* Sort the cheapest partial path, if it isn't already */
+				if (!is_sorted)
+					path = (Path *) create_sort_path(root,
+													 partially_grouped_rel,
+													 path,
+													 root->group_pathkeys,
+													 -1.0);
+
+				if (parse->hasAggs)
+					add_partial_path(partially_grouped_rel, (Path *)
+									 create_agg_path(root,
+													 partially_grouped_rel,
+													 path,
+													 partially_grouped_rel->reltarget,
+													 parse->groupClause ? AGG_SORTED : AGG_PLAIN,
+													 AGGSPLIT_INITIAL_SERIAL,
+													 parse->groupClause,
+													 NIL,
+													 agg_partial_costs,
+													 dNumPartialGroups));
+				else
+					add_partial_path(partially_grouped_rel, (Path *)
+									 create_group_path(root,
+													   partially_grouped_rel,
+													   path,
+													   partially_grouped_rel->reltarget,
+													   parse->groupClause,
+													   NIL,
+													   dNumPartialGroups));
+			}
+		}
+	}
+
+	if (can_hash)
+	{
+		/* Checked above */
+		Assert(parse->hasAggs || parse->groupClause);
+
+		hashaggtablesize =
+			estimate_hashagg_tablesize(cheapest_partial_path,
+									   agg_partial_costs,
+									   dNumPartialGroups);
+
+		/*
+		 * Tentatively produce a partial HashAgg Path, depending on if it
+		 * looks as if the hash table will fit in work_mem.
+		 */
+		if (hashaggtablesize < work_mem * 1024L)
+		{
+			add_partial_path(partially_grouped_rel, (Path *)
+							 create_agg_path(root,
+											 partially_grouped_rel,
+											 cheapest_partial_path,
+											 partially_grouped_rel->reltarget,
+											 AGG_HASHED,
+											 AGGSPLIT_INITIAL_SERIAL,
+											 parse->groupClause,
+											 NIL,
+											 agg_partial_costs,
+											 dNumPartialGroups));
+		}
+	}
+
+	/*
+	 * If there is an FDW that's responsible for all baserels of the query,
+	 * let it consider adding partially grouped ForeignPaths.
+	 */
+	if (partially_grouped_rel->fdwroutine &&
+		partially_grouped_rel->fdwroutine->GetForeignUpperPaths)
+	{
+		FdwRoutine *fdwroutine = partially_grouped_rel->fdwroutine;
+
+		fdwroutine->GetForeignUpperPaths(root,
+										 UPPERREL_PARTIAL_GROUP_AGG,
+										 input_rel, partially_grouped_rel);
+	}
+
+	/*
+	 * Try adding Gather or Gather Merge to partial paths to produce
+	 * non-partial paths.
+	 */
+	generate_gather_paths(root, partially_grouped_rel, true);
+
+	/* Get cheapest partial path from partially_grouped_rel */
+	cheapest_partial_path = linitial(partially_grouped_rel->partial_pathlist);
+
+	/*
+	 * generate_gather_paths won't consider sorting the cheapest path to match
+	 * the group keys and then applying a Gather Merge node to the result;
+	 * that might be a winning strategy.
+	 */
+	if (!pathkeys_contained_in(root->group_pathkeys,
+							   cheapest_partial_path->pathkeys))
+	{
+		Path	   *path;
+		double		total_groups;
+
+		total_groups =
+			cheapest_partial_path->rows * cheapest_partial_path->parallel_workers;
+		path = (Path *) create_sort_path(root, partially_grouped_rel,
+										 cheapest_partial_path,
+										 root->group_pathkeys,
+										 -1.0);
+		path = (Path *)
+			create_gather_merge_path(root,
+									 partially_grouped_rel,
+									 path,
+									 partially_grouped_rel->reltarget,
+									 root->group_pathkeys,
+									 NULL,
+									 &total_groups);
+
+		add_path(partially_grouped_rel, path);
+	}
+
+	/* Now choose the best path(s) */
+	set_cheapest(partially_grouped_rel);
+}
+
+/*
+ * can_parallel_agg
+ *
+ * Determines whether or not parallel grouping and/or aggregation is possible.
+ * Returns true when possible, false otherwise.
+ */
+static bool
+can_parallel_agg(PlannerInfo *root, RelOptInfo *input_rel,
+				 RelOptInfo *grouped_rel, const AggClauseCosts *agg_costs)
+{
+	Query	   *parse = root->parse;
+
+	if (!grouped_rel->consider_parallel)
+	{
+		/* Not even parallel-safe. */
+		return false;
+	}
+	else if (input_rel->partial_pathlist == NIL)
+	{
+		/* Nothing to use as input for partial aggregate. */
+		return false;
+	}
+	else if (!parse->hasAggs && parse->groupClause == NIL)
+	{
+		/*
+		 * We don't know how to do parallel aggregation unless we have either
+		 * some aggregates or a grouping clause.
+		 */
+		return false;
+	}
+	else if (parse->groupingSets)
+	{
+		/* We don't know how to do grouping sets in parallel. */
+		return false;
+	}
+	else if (agg_costs->hasNonPartial || agg_costs->hasNonSerial)
+	{
+		/* Insufficient support for partial mode. */
+		return false;
+	}
+
+	/* Everything looks good. */
+	return true;
 }
diff --git a/src/backend/optimizer/plan/setrefs.c b/src/backend/optimizer/plan/setrefs.c
index b0c9e94459..4617d12cb9 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -4,7 +4,7 @@
  *	  Post-processing of a completed plan tree: fix references to subplan
  *	  vars, compute regproc values for operators, etc
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -41,6 +41,9 @@ typedef struct
 	int			num_vars;		/* number of plain Var tlist entries */
 	bool		has_ph_vars;	/* are there PlaceHolderVar entries? */
 	bool		has_non_vars;	/* are there other entries? */
+	bool		has_conv_whole_rows;	/* are there ConvertRowtypeExpr
+										 * entries encapsulating a whole-row
+										 * Var? */
 	tlist_vinfo vars[FLEXIBLE_ARRAY_MEMBER];	/* has num_vars entries */
 } indexed_tlist;
 
@@ -104,6 +107,7 @@ static Node *fix_scan_expr_mutator(Node *node, fix_scan_expr_context *context);
 static bool fix_scan_expr_walker(Node *node, fix_scan_expr_context *context);
 static void set_join_references(PlannerInfo *root, Join *join, int rtoffset);
 static void set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset);
+static void set_param_references(PlannerInfo *root, Plan *plan);
 static Node *convert_combining_aggrefs(Node *node, void *context);
 static void set_dummy_tlist_references(Plan *plan, int rtoffset);
 static indexed_tlist *build_tlist_index(List *tlist);
@@ -139,6 +143,7 @@ static List *set_returning_clause_references(PlannerInfo *root,
 								int rtoffset);
 static bool extract_query_dependencies_walker(Node *node,
 								  PlannerInfo *context);
+static bool is_converted_whole_row_reference(Node *node);
 
 /*****************************************************************************
  *
@@ -628,7 +633,10 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
 
 		case T_Gather:
 		case T_GatherMerge:
-			set_upper_references(root, plan, rtoffset);
+			{
+				set_upper_references(root, plan, rtoffset);
+				set_param_references(root, plan);
+			}
 			break;
 
 		case T_Hash:
@@ -1395,12 +1403,6 @@ fix_expr_common(PlannerInfo *root, Node *node)
 		record_plan_function_dependency(root,
 										((ScalarArrayOpExpr *) node)->opfuncid);
 	}
-	else if (IsA(node, ArrayCoerceExpr))
-	{
-		if (OidIsValid(((ArrayCoerceExpr *) node)->elemfuncid))
-			record_plan_function_dependency(root,
-											((ArrayCoerceExpr *) node)->elemfuncid);
-	}
 	else if (IsA(node, Const))
 	{
 		Const	   *con = (Const *) node;
@@ -1746,8 +1748,8 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset)
 		TargetEntry *tle = (TargetEntry *) lfirst(l);
 		Node	   *newexpr;
 
-		/* If it's a non-Var sort/group item, first try to match by sortref */
-		if (tle->ressortgroupref != 0 && !IsA(tle->expr, Var))
+		/* If it's a sort/group item, first try to match by sortref */
+		if (tle->ressortgroupref != 0)
 		{
 			newexpr = (Node *)
 				search_indexed_tlist_for_sortgroupref(tle->expr,
@@ -1783,6 +1785,51 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset)
 	pfree(subplan_itlist);
 }
 
+/*
+ * set_param_references
+ *	  Initialize the initParam list in Gather or Gather merge node such that
+ *	  it contains reference of all the params that needs to be evaluated
+ *	  before execution of the node.  It contains the initplan params that are
+ *	  being passed to the plan nodes below it.
+ */
+static void
+set_param_references(PlannerInfo *root, Plan *plan)
+{
+	Assert(IsA(plan, Gather) ||IsA(plan, GatherMerge));
+
+	if (plan->lefttree->extParam)
+	{
+		PlannerInfo *proot;
+		Bitmapset  *initSetParam = NULL;
+		ListCell   *l;
+
+		for (proot = root; proot != NULL; proot = proot->parent_root)
+		{
+			foreach(l, proot->init_plans)
+			{
+				SubPlan    *initsubplan = (SubPlan *) lfirst(l);
+				ListCell   *l2;
+
+				foreach(l2, initsubplan->setParam)
+				{
+					initSetParam = bms_add_member(initSetParam, lfirst_int(l2));
+				}
+			}
+		}
+
+		/*
+		 * Remember the list of all external initplan params that are used by
+		 * the children of Gather or Gather merge node.
+		 */
+		if (IsA(plan, Gather))
+			((Gather *) plan)->initParam =
+				bms_intersect(plan->lefttree->extParam, initSetParam);
+		else
+			((GatherMerge *) plan)->initParam =
+				bms_intersect(plan->lefttree->extParam, initSetParam);
+	}
+}
+
 /*
  * Recursively scan an expression tree and convert Aggrefs to the proper
  * intermediate form for combining aggregates.  This means (1) replacing each
@@ -1950,6 +1997,7 @@ build_tlist_index(List *tlist)
 	itlist->tlist = tlist;
 	itlist->has_ph_vars = false;
 	itlist->has_non_vars = false;
+	itlist->has_conv_whole_rows = false;
 
 	/* Find the Vars and fill in the index array */
 	vinfo = itlist->vars;
@@ -1968,6 +2016,8 @@ build_tlist_index(List *tlist)
 		}
 		else if (tle->expr && IsA(tle->expr, PlaceHolderVar))
 			itlist->has_ph_vars = true;
+		else if (is_converted_whole_row_reference((Node *) tle->expr))
+			itlist->has_conv_whole_rows = true;
 		else
 			itlist->has_non_vars = true;
 	}
@@ -1983,7 +2033,10 @@ build_tlist_index(List *tlist)
  * This is like build_tlist_index, but we only index tlist entries that
  * are Vars belonging to some rel other than the one specified.  We will set
  * has_ph_vars (allowing PlaceHolderVars to be matched), but not has_non_vars
- * (so nothing other than Vars and PlaceHolderVars can be matched).
+ * (so nothing other than Vars and PlaceHolderVars can be matched). In case of
+ * DML, where this function will be used, returning lists from child relations
+ * will be appended similar to a simple append relation. That does not require
+ * fixing ConvertRowtypeExpr references. So, those are not considered here.
  */
 static indexed_tlist *
 build_tlist_index_other_vars(List *tlist, Index ignore_rel)
@@ -2000,6 +2053,7 @@ build_tlist_index_other_vars(List *tlist, Index ignore_rel)
 	itlist->tlist = tlist;
 	itlist->has_ph_vars = false;
 	itlist->has_non_vars = false;
+	itlist->has_conv_whole_rows = false;
 
 	/* Find the desired Vars and fill in the index array */
 	vinfo = itlist->vars;
@@ -2108,7 +2162,6 @@ search_indexed_tlist_for_non_var(Expr *node,
 
 /*
  * search_indexed_tlist_for_sortgroupref --- find a sort/group expression
- *		(which is assumed not to be just a Var)
  *
  * If a match is found, return a Var constructed to reference the tlist item.
  * If no match, return NULL.
@@ -2203,6 +2256,7 @@ static Node *
 fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 {
 	Var		   *newvar;
+	bool		converted_whole_row;
 
 	if (node == NULL)
 		return NULL;
@@ -2272,8 +2326,12 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 	}
 	if (IsA(node, Param))
 		return fix_param_node(context->root, (Param *) node);
+
 	/* Try matching more complex expressions too, if tlists have any */
-	if (context->outer_itlist && context->outer_itlist->has_non_vars)
+	converted_whole_row = is_converted_whole_row_reference(node);
+	if (context->outer_itlist &&
+		(context->outer_itlist->has_non_vars ||
+		 (context->outer_itlist->has_conv_whole_rows && converted_whole_row)))
 	{
 		newvar = search_indexed_tlist_for_non_var((Expr *) node,
 												  context->outer_itlist,
@@ -2281,7 +2339,9 @@ fix_join_expr_mutator(Node *node, fix_join_expr_context *context)
 		if (newvar)
 			return (Node *) newvar;
 	}
-	if (context->inner_itlist && context->inner_itlist->has_non_vars)
+	if (context->inner_itlist &&
+		(context->inner_itlist->has_non_vars ||
+		 (context->inner_itlist->has_conv_whole_rows && converted_whole_row)))
 	{
 		newvar = search_indexed_tlist_for_non_var((Expr *) node,
 												  context->inner_itlist,
@@ -2401,7 +2461,9 @@ fix_upper_expr_mutator(Node *node, fix_upper_expr_context *context)
 		/* If no match, just fall through to process it normally */
 	}
 	/* Try matching more complex expressions too, if tlist has any */
-	if (context->subplan_itlist->has_non_vars)
+	if (context->subplan_itlist->has_non_vars ||
+		(context->subplan_itlist->has_conv_whole_rows &&
+		 is_converted_whole_row_reference(node)))
 	{
 		newvar = search_indexed_tlist_for_non_var((Expr *) node,
 												  context->subplan_itlist,
@@ -2608,3 +2670,33 @@ extract_query_dependencies_walker(Node *node, PlannerInfo *context)
 	return expression_tree_walker(node, extract_query_dependencies_walker,
 								  (void *) context);
 }
+
+/*
+ * is_converted_whole_row_reference
+ *		If the given node is a ConvertRowtypeExpr encapsulating a whole-row
+ *		reference as implicit cast, return true. Otherwise return false.
+ */
+static bool
+is_converted_whole_row_reference(Node *node)
+{
+	ConvertRowtypeExpr *convexpr;
+
+	if (!node || !IsA(node, ConvertRowtypeExpr))
+		return false;
+
+	/* Traverse nested ConvertRowtypeExpr's. */
+	convexpr = castNode(ConvertRowtypeExpr, node);
+	while (convexpr->convertformat == COERCE_IMPLICIT_CAST &&
+		   IsA(convexpr->arg, ConvertRowtypeExpr))
+		convexpr = castNode(ConvertRowtypeExpr, convexpr->arg);
+
+	if (IsA(convexpr->arg, Var))
+	{
+		Var		   *var = castNode(Var, convexpr->arg);
+
+		if (var->varattno == 0)
+			return true;
+	}
+
+	return false;
+}
diff --git a/src/backend/optimizer/plan/subselect.c b/src/backend/optimizer/plan/subselect.c
index ffbd3eeed7..46367cba63 100644
--- a/src/backend/optimizer/plan/subselect.c
+++ b/src/backend/optimizer/plan/subselect.c
@@ -3,7 +3,7 @@
  * subselect.c
  *	  Planning routines for subselects and parameters.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -79,6 +79,7 @@ static Node *process_sublinks_mutator(Node *node,
 						 process_sublinks_context *context);
 static Bitmapset *finalize_plan(PlannerInfo *root,
 			  Plan *plan,
+			  int gather_param,
 			  Bitmapset *valid_params,
 			  Bitmapset *scan_params);
 static bool finalize_primnode(Node *node, finalize_primnode_context *context);
@@ -130,7 +131,9 @@ assign_param_for_var(PlannerInfo *root, Var *var)
 
 	pitem = makeNode(PlannerParamItem);
 	pitem->item = (Node *) var;
-	pitem->paramId = root->glob->nParamExec++;
+	pitem->paramId = list_length(root->glob->paramExecTypes);
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 var->vartype);
 
 	root->plan_params = lappend(root->plan_params, pitem);
 
@@ -233,7 +236,9 @@ assign_param_for_placeholdervar(PlannerInfo *root, PlaceHolderVar *phv)
 
 	pitem = makeNode(PlannerParamItem);
 	pitem->item = (Node *) phv;
-	pitem->paramId = root->glob->nParamExec++;
+	pitem->paramId = list_length(root->glob->paramExecTypes);
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 exprType((Node *) phv->phexpr));
 
 	root->plan_params = lappend(root->plan_params, pitem);
 
@@ -322,7 +327,9 @@ replace_outer_agg(PlannerInfo *root, Aggref *agg)
 
 	pitem = makeNode(PlannerParamItem);
 	pitem->item = (Node *) agg;
-	pitem->paramId = root->glob->nParamExec++;
+	pitem->paramId = list_length(root->glob->paramExecTypes);
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 agg->aggtype);
 
 	root->plan_params = lappend(root->plan_params, pitem);
 
@@ -347,6 +354,7 @@ replace_outer_grouping(PlannerInfo *root, GroupingFunc *grp)
 	Param	   *retval;
 	PlannerParamItem *pitem;
 	Index		levelsup;
+	Oid			ptype;
 
 	Assert(grp->agglevelsup > 0 && grp->agglevelsup < root->query_level);
 
@@ -361,17 +369,20 @@ replace_outer_grouping(PlannerInfo *root, GroupingFunc *grp)
 	grp = copyObject(grp);
 	IncrementVarSublevelsUp((Node *) grp, -((int) grp->agglevelsup), 0);
 	Assert(grp->agglevelsup == 0);
+	ptype = exprType((Node *) grp);
 
 	pitem = makeNode(PlannerParamItem);
 	pitem->item = (Node *) grp;
-	pitem->paramId = root->glob->nParamExec++;
+	pitem->paramId = list_length(root->glob->paramExecTypes);
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 ptype);
 
 	root->plan_params = lappend(root->plan_params, pitem);
 
 	retval = makeNode(Param);
 	retval->paramkind = PARAM_EXEC;
 	retval->paramid = pitem->paramId;
-	retval->paramtype = exprType((Node *) grp);
+	retval->paramtype = ptype;
 	retval->paramtypmod = -1;
 	retval->paramcollid = InvalidOid;
 	retval->location = grp->location;
@@ -384,7 +395,8 @@ replace_outer_grouping(PlannerInfo *root, GroupingFunc *grp)
  *
  * This is used to create Params representing subplan outputs.
  * We don't need to build a PlannerParamItem for such a Param, but we do
- * need to record the PARAM_EXEC slot number as being allocated.
+ * need to make sure we record the type in paramExecTypes (otherwise,
+ * there won't be a slot allocated for it).
  */
 static Param *
 generate_new_param(PlannerInfo *root, Oid paramtype, int32 paramtypmod,
@@ -394,7 +406,9 @@ generate_new_param(PlannerInfo *root, Oid paramtype, int32 paramtypmod,
 
 	retval = makeNode(Param);
 	retval->paramkind = PARAM_EXEC;
-	retval->paramid = root->glob->nParamExec++;
+	retval->paramid = list_length(root->glob->paramExecTypes);
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 paramtype);
 	retval->paramtype = paramtype;
 	retval->paramtypmod = paramtypmod;
 	retval->paramcollid = paramcollation;
@@ -414,7 +428,11 @@ generate_new_param(PlannerInfo *root, Oid paramtype, int32 paramtypmod,
 int
 SS_assign_special_param(PlannerInfo *root)
 {
-	return root->glob->nParamExec++;
+	int			paramId = list_length(root->glob->paramExecTypes);
+
+	root->glob->paramExecTypes = lappend_oid(root->glob->paramExecTypes,
+											 InvalidOid);
+	return paramId;
 }
 
 /*
@@ -1562,7 +1580,7 @@ convert_EXISTS_sublink_to_join(PlannerInfo *root, SubLink *sublink,
  * won't occur, nor will other side-effects of volatile functions.  This seems
  * unlikely to bother anyone in practice.
  *
- * Returns TRUE if was able to discard the targetlist, else FALSE.
+ * Returns true if was able to discard the targetlist, else false.
  */
 static bool
 simplify_EXISTS_query(PlannerInfo *root, Query *query)
@@ -2097,7 +2115,7 @@ SS_identify_outer_params(PlannerInfo *root)
 	 * If no parameters have been assigned anywhere in the tree, we certainly
 	 * don't need to do anything here.
 	 */
-	if (root->glob->nParamExec == 0)
+	if (root->glob->paramExecTypes == NIL)
 		return;
 
 	/*
@@ -2217,12 +2235,15 @@ void
 SS_finalize_plan(PlannerInfo *root, Plan *plan)
 {
 	/* No setup needed, just recurse through plan tree. */
-	(void) finalize_plan(root, plan, root->outer_params, NULL);
+	(void) finalize_plan(root, plan, -1, root->outer_params, NULL);
 }
 
 /*
  * Recursive processing of all nodes in the plan tree
  *
+ * gather_param is the rescan_param of an ancestral Gather/GatherMerge,
+ * or -1 if there is none.
+ *
  * valid_params is the set of param IDs supplied by outer plan levels
  * that are valid to reference in this plan node or its children.
  *
@@ -2249,7 +2270,9 @@ SS_finalize_plan(PlannerInfo *root, Plan *plan)
  * can be handled more cleanly.
  */
 static Bitmapset *
-finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
+finalize_plan(PlannerInfo *root, Plan *plan,
+			  int gather_param,
+			  Bitmapset *valid_params,
 			  Bitmapset *scan_params)
 {
 	finalize_primnode_context context;
@@ -2302,6 +2325,18 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 	finalize_primnode((Node *) plan->targetlist, &context);
 	finalize_primnode((Node *) plan->qual, &context);
 
+	/*
+	 * If it's a parallel-aware scan node, mark it as dependent on the parent
+	 * Gather/GatherMerge's rescan Param.
+	 */
+	if (plan->parallel_aware)
+	{
+		if (gather_param < 0)
+			elog(ERROR, "parallel-aware plan node is not below a Gather");
+		context.paramids =
+			bms_add_member(context.paramids, gather_param);
+	}
+
 	/* Check additional node-type-specific fields */
 	switch (nodeTag(plan))
 	{
@@ -2512,6 +2547,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(lc),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2542,6 +2578,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2558,6 +2595,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2574,6 +2612,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2590,6 +2629,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2606,6 +2646,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 						bms_add_members(context.paramids,
 										finalize_plan(root,
 													  (Plan *) lfirst(l),
+													  gather_param,
 													  valid_params,
 													  scan_params));
 				}
@@ -2697,13 +2738,51 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 							  &context);
 			break;
 
+		case T_Gather:
+			/* child nodes are allowed to reference rescan_param, if any */
+			locally_added_param = ((Gather *) plan)->rescan_param;
+			if (locally_added_param >= 0)
+			{
+				valid_params = bms_add_member(bms_copy(valid_params),
+											  locally_added_param);
+
+				/*
+				 * We currently don't support nested Gathers.  The issue so
+				 * far as this function is concerned would be how to identify
+				 * which child nodes depend on which Gather.
+				 */
+				Assert(gather_param < 0);
+				/* Pass down rescan_param to child parallel-aware nodes */
+				gather_param = locally_added_param;
+			}
+			/* rescan_param does *not* get added to scan_params */
+			break;
+
+		case T_GatherMerge:
+			/* child nodes are allowed to reference rescan_param, if any */
+			locally_added_param = ((GatherMerge *) plan)->rescan_param;
+			if (locally_added_param >= 0)
+			{
+				valid_params = bms_add_member(bms_copy(valid_params),
+											  locally_added_param);
+
+				/*
+				 * We currently don't support nested Gathers.  The issue so
+				 * far as this function is concerned would be how to identify
+				 * which child nodes depend on which Gather.
+				 */
+				Assert(gather_param < 0);
+				/* Pass down rescan_param to child parallel-aware nodes */
+				gather_param = locally_added_param;
+			}
+			/* rescan_param does *not* get added to scan_params */
+			break;
+
 		case T_ProjectSet:
 		case T_Hash:
 		case T_Material:
 		case T_Sort:
 		case T_Unique:
-		case T_Gather:
-		case T_GatherMerge:
 		case T_SetOp:
 		case T_Group:
 			/* no node-type-specific fields need fixing */
@@ -2717,6 +2796,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 	/* Process left and right child plans, if any */
 	child_params = finalize_plan(root,
 								 plan->lefttree,
+								 gather_param,
 								 valid_params,
 								 scan_params);
 	context.paramids = bms_add_members(context.paramids, child_params);
@@ -2726,6 +2806,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 		/* right child can reference nestloop_params as well as valid_params */
 		child_params = finalize_plan(root,
 									 plan->righttree,
+									 gather_param,
 									 bms_union(nestloop_params, valid_params),
 									 scan_params);
 		/* ... and they don't count as parameters used at my level */
@@ -2737,6 +2818,7 @@ finalize_plan(PlannerInfo *root, Plan *plan, Bitmapset *valid_params,
 		/* easy case */
 		child_params = finalize_plan(root,
 									 plan->righttree,
+									 gather_param,
 									 valid_params,
 									 scan_params);
 	}
diff --git a/src/backend/optimizer/prep/prepjointree.c b/src/backend/optimizer/prep/prepjointree.c
index f3bb73a664..45d82da459 100644
--- a/src/backend/optimizer/prep/prepjointree.c
+++ b/src/backend/optimizer/prep/prepjointree.c
@@ -12,7 +12,7 @@
  *		reduce_outer_joins
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -644,9 +644,9 @@ pull_up_subqueries(PlannerInfo *root)
  * This forces use of the PlaceHolderVar mechanism for all non-Var targetlist
  * items, and puts some additional restrictions on what can be pulled up.
  *
- * deletion_ok is TRUE if the caller can cope with us returning NULL for a
+ * deletion_ok is true if the caller can cope with us returning NULL for a
  * deletable leaf node (for example, a VALUES RTE that could be pulled up).
- * If it's FALSE, we'll avoid pullup in such cases.
+ * If it's false, we'll avoid pullup in such cases.
  *
  * A tricky aspect of this code is that if we pull up a subquery we have
  * to replace Vars that reference the subquery's outputs throughout the
@@ -1003,11 +1003,8 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
 
 	/*
 	 * The subquery's targetlist items are now in the appropriate form to
-	 * insert into the top query, but if we are under an outer join then
-	 * non-nullable items and lateral references may have to be turned into
-	 * PlaceHolderVars.  If we are dealing with an appendrel member then
-	 * anything that's not a simple Var has to be turned into a
-	 * PlaceHolderVar.  Set up required context data for pullup_replace_vars.
+	 * insert into the top query, except that we may need to wrap them in
+	 * PlaceHolderVars.  Set up required context data for pullup_replace_vars.
 	 */
 	rvcontext.root = root;
 	rvcontext.targetlist = subquery->targetList;
@@ -1019,13 +1016,48 @@ pull_up_simple_subquery(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte,
 		rvcontext.relids = NULL;
 	rvcontext.outer_hasSubLinks = &parse->hasSubLinks;
 	rvcontext.varno = varno;
-	rvcontext.need_phvs = (lowest_nulling_outer_join != NULL ||
-						   containing_appendrel != NULL);
-	rvcontext.wrap_non_vars = (containing_appendrel != NULL);
+	/* these flags will be set below, if needed */
+	rvcontext.need_phvs = false;
+	rvcontext.wrap_non_vars = false;
 	/* initialize cache array with indexes 0 .. length(tlist) */
 	rvcontext.rv_cache = palloc0((list_length(subquery->targetList) + 1) *
 								 sizeof(Node *));
 
+	/*
+	 * If we are under an outer join then non-nullable items and lateral
+	 * references may have to be turned into PlaceHolderVars.
+	 */
+	if (lowest_nulling_outer_join != NULL)
+		rvcontext.need_phvs = true;
+
+	/*
+	 * If we are dealing with an appendrel member then anything that's not a
+	 * simple Var has to be turned into a PlaceHolderVar.  We force this to
+	 * ensure that what we pull up doesn't get merged into a surrounding
+	 * expression during later processing and then fail to match the
+	 * expression actually available from the appendrel.
+	 */
+	if (containing_appendrel != NULL)
+	{
+		rvcontext.need_phvs = true;
+		rvcontext.wrap_non_vars = true;
+	}
+
+	/*
+	 * If the parent query uses grouping sets, we need a PlaceHolderVar for
+	 * anything that's not a simple Var.  Again, this ensures that expressions
+	 * retain their separate identity so that they will match grouping set
+	 * columns when appropriate.  (It'd be sufficient to wrap values used in
+	 * grouping set columns, and do so only in non-aggregated portions of the
+	 * tlist and havingQual, but that would require a lot of infrastructure
+	 * that pullup_replace_vars hasn't currently got.)
+	 */
+	if (parse->groupingSets)
+	{
+		rvcontext.need_phvs = true;
+		rvcontext.wrap_non_vars = true;
+	}
+
 	/*
 	 * Replace all of the top query's references to the subquery's outputs
 	 * with copies of the adjusted subtlist items, being careful not to
@@ -1401,7 +1433,7 @@ make_setop_translation_list(Query *query, Index newvarno,
  * (Note subquery is not necessarily equal to rte->subquery; it could be a
  * processed copy of that.)
  * lowest_outer_join is the lowest outer join above the subquery, or NULL.
- * deletion_ok is TRUE if it'd be okay to delete the subquery entirely.
+ * deletion_ok is true if it'd be okay to delete the subquery entirely.
  */
 static bool
 is_simple_subquery(Query *subquery, RangeTblEntry *rte,
@@ -1457,7 +1489,7 @@ is_simple_subquery(Query *subquery, RangeTblEntry *rte,
 
 	/*
 	 * Don't pull up a subquery with an empty jointree, unless it has no quals
-	 * and deletion_ok is TRUE and we're not underneath an outer join.
+	 * and deletion_ok is true and we're not underneath an outer join.
 	 *
 	 * query_planner() will correctly generate a Result plan for a jointree
 	 * that's totally empty, but we can't cope with an empty FromExpr
@@ -1681,7 +1713,7 @@ pull_up_simple_values(PlannerInfo *root, Node *jtnode, RangeTblEntry *rte)
  *	  to pull up into the parent query.
  *
  * rte is the RTE_VALUES RangeTblEntry to check.
- * deletion_ok is TRUE if it'd be okay to delete the VALUES RTE entirely.
+ * deletion_ok is true if it'd be okay to delete the VALUES RTE entirely.
  */
 static bool
 is_simple_values(PlannerInfo *root, RangeTblEntry *rte, bool deletion_ok)
@@ -1689,7 +1721,7 @@ is_simple_values(PlannerInfo *root, RangeTblEntry *rte, bool deletion_ok)
 	Assert(rte->rtekind == RTE_VALUES);
 
 	/*
-	 * We can only pull up a VALUES RTE if deletion_ok is TRUE.  It's
+	 * We can only pull up a VALUES RTE if deletion_ok is true.  It's
 	 * basically the same case as a sub-select with empty FROM list; see
 	 * comments in is_simple_subquery().
 	 */
@@ -1844,7 +1876,7 @@ is_safe_append_member(Query *subquery)
  *
  * If restricted is false, all level-1 Vars are allowed (but we still must
  * search the jointree, since it might contain outer joins below which there
- * will be restrictions).  If restricted is true, return TRUE when any qual
+ * will be restrictions).  If restricted is true, return true when any qual
  * in the jointree contains level-1 Vars coming from outside the rels listed
  * in safe_upper_varnos.
  */
diff --git a/src/backend/optimizer/prep/prepqual.c b/src/backend/optimizer/prep/prepqual.c
index f75b3274ad..cb1f4853c3 100644
--- a/src/backend/optimizer/prep/prepqual.c
+++ b/src/backend/optimizer/prep/prepqual.c
@@ -19,7 +19,7 @@
  * tree after local transformations that might introduce nested AND/ORs.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/prep/preptlist.c b/src/backend/optimizer/prep/preptlist.c
index afc733f183..8603feef2b 100644
--- a/src/backend/optimizer/prep/preptlist.c
+++ b/src/backend/optimizer/prep/preptlist.c
@@ -4,20 +4,22 @@
  *	  Routines to preprocess the parse tree target list
  *
  * For INSERT and UPDATE queries, the targetlist must contain an entry for
- * each attribute of the target relation in the correct order.  For all query
+ * each attribute of the target relation in the correct order.  For UPDATE and
+ * DELETE queries, it must also contain junk tlist entries needed to allow the
+ * executor to identify the rows to be updated or deleted.  For all query
  * types, we may need to add junk tlist entries for Vars used in the RETURNING
  * list and row ID information needed for SELECT FOR UPDATE locking and/or
  * EvalPlanQual checking.
  *
- * The rewriter's rewriteTargetListIU and rewriteTargetListUD routines
- * also do preprocessing of the targetlist.  The division of labor between
- * here and there is partially historical, but it's not entirely arbitrary.
- * In particular, consider an UPDATE across an inheritance tree.  What the
- * rewriter does need be done only once (because it depends only on the
- * properties of the parent relation).  What's done here has to be done over
- * again for each child relation, because it depends on the column list of
- * the child, which might have more columns and/or a different column order
- * than the parent.
+ * The query rewrite phase also does preprocessing of the targetlist (see
+ * rewriteTargetListIU).  The division of labor between here and there is
+ * partially historical, but it's not entirely arbitrary.  In particular,
+ * consider an UPDATE across an inheritance tree.  What rewriteTargetListIU
+ * does need be done only once (because it depends only on the properties of
+ * the parent relation).  What's done here has to be done over again for each
+ * child relation, because it depends on the properties of the child, which
+ * might be of a different relation type, or have more columns and/or a
+ * different column order than the parent.
  *
  * The fact that rewriteTargetListIU sorts non-resjunk tlist entries by column
  * position, which expand_targetlist depends on, violates the above comment
@@ -27,7 +29,7 @@
  * that because it's faster in typical non-inherited cases.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -47,11 +49,12 @@
 #include "optimizer/var.h"
 #include "parser/parsetree.h"
 #include "parser/parse_coerce.h"
+#include "rewrite/rewriteHandler.h"
 #include "utils/rel.h"
 
 
 static List *expand_targetlist(List *tlist, int command_type,
-				  Index result_relation, List *range_table);
+				  Index result_relation, Relation rel);
 
 
 /*
@@ -59,36 +62,61 @@ static List *expand_targetlist(List *tlist, int command_type,
  *	  Driver for preprocessing the parse tree targetlist.
  *
  *	  Returns the new targetlist.
+ *
+ * As a side effect, if there's an ON CONFLICT UPDATE clause, its targetlist
+ * is also preprocessed (and updated in-place).
  */
 List *
-preprocess_targetlist(PlannerInfo *root, List *tlist)
+preprocess_targetlist(PlannerInfo *root)
 {
 	Query	   *parse = root->parse;
 	int			result_relation = parse->resultRelation;
 	List	   *range_table = parse->rtable;
 	CmdType		command_type = parse->commandType;
+	RangeTblEntry *target_rte = NULL;
+	Relation	target_relation = NULL;
+	List	   *tlist;
 	ListCell   *lc;
 
 	/*
-	 * Sanity check: if there is a result relation, it'd better be a real
-	 * relation not a subquery.  Else parser or rewriter messed up.
+	 * If there is a result relation, open it so we can look for missing
+	 * columns and so on.  We assume that previous code already acquired at
+	 * least AccessShareLock on the relation, so we need no lock here.
 	 */
 	if (result_relation)
 	{
-		RangeTblEntry *rte = rt_fetch(result_relation, range_table);
+		target_rte = rt_fetch(result_relation, range_table);
+
+		/*
+		 * Sanity check: it'd better be a real relation not, say, a subquery.
+		 * Else parser or rewriter messed up.
+		 */
+		if (target_rte->rtekind != RTE_RELATION)
+			elog(ERROR, "result relation must be a regular relation");
 
-		if (rte->subquery != NULL || rte->relid == InvalidOid)
-			elog(ERROR, "subquery cannot be result relation");
+		target_relation = heap_open(target_rte->relid, NoLock);
 	}
+	else
+		Assert(command_type == CMD_SELECT);
+
+	/*
+	 * For UPDATE/DELETE, add any junk column(s) needed to allow the executor
+	 * to identify the rows to be updated or deleted.  Note that this step
+	 * scribbles on parse->targetList, which is not very desirable, but we
+	 * keep it that way to avoid changing APIs used by FDWs.
+	 */
+	if (command_type == CMD_UPDATE || command_type == CMD_DELETE)
+		rewriteTargetListUD(parse, target_rte, target_relation);
 
 	/*
 	 * for heap_form_tuple to work, the targetlist must match the exact order
 	 * of the attributes. We also need to fill in any missing attributes. -ay
 	 * 10/94
 	 */
+	tlist = parse->targetList;
 	if (command_type == CMD_INSERT || command_type == CMD_UPDATE)
 		tlist = expand_targetlist(tlist, command_type,
-								  result_relation, range_table);
+								  result_relation, target_relation);
 
 	/*
 	 * Add necessary junk columns for rowmarked rels.  These values are needed
@@ -193,19 +221,21 @@ preprocess_targetlist(PlannerInfo *root, List *tlist)
 		list_free(vars);
 	}
 
-	return tlist;
-}
+	/*
+	 * If there's an ON CONFLICT UPDATE clause, preprocess its targetlist too
+	 * while we have the relation open.
+	 */
+	if (parse->onConflict)
+		parse->onConflict->onConflictSet =
+			expand_targetlist(parse->onConflict->onConflictSet,
+							  CMD_UPDATE,
+							  result_relation,
+							  target_relation);
 
-/*
- * preprocess_onconflict_targetlist
- *	  Process ON CONFLICT SET targetlist.
- *
- *	  Returns the new targetlist.
- */
-List *
-preprocess_onconflict_targetlist(List *tlist, int result_relation, List *range_table)
-{
-	return expand_targetlist(tlist, CMD_UPDATE, result_relation, range_table);
+	if (target_relation)
+		heap_close(target_relation, NoLock);
+
+	return tlist;
 }
 
 
@@ -223,11 +253,10 @@ preprocess_onconflict_targetlist(List *tlist, int result_relation, List *range_t
  */
 static List *
 expand_targetlist(List *tlist, int command_type,
-				  Index result_relation, List *range_table)
+				  Index result_relation, Relation rel)
 {
 	List	   *new_tlist = NIL;
 	ListCell   *tlist_item;
-	Relation	rel;
 	int			attrno,
 				numattrs;
 
@@ -238,17 +267,13 @@ expand_targetlist(List *tlist, int command_type,
 	 * order; but we have to insert TLEs for any missing attributes.
 	 *
 	 * Scan the tuple description in the relation's relcache entry to make
-	 * sure we have all the user attributes in the right order.  We assume
-	 * that the rewriter already acquired at least AccessShareLock on the
-	 * relation, so we need no lock here.
+	 * sure we have all the user attributes in the right order.
 	 */
-	rel = heap_open(getrelid(result_relation, range_table), NoLock);
-
 	numattrs = RelationGetNumberOfAttributes(rel);
 
 	for (attrno = 1; attrno <= numattrs; attrno++)
 	{
-		Form_pg_attribute att_tup = rel->rd_att->attrs[attrno - 1];
+		Form_pg_attribute att_tup = TupleDescAttr(rel->rd_att, attrno - 1);
 		TargetEntry *new_tle = NULL;
 
 		if (tlist_item != NULL)
@@ -306,9 +331,9 @@ expand_targetlist(List *tlist, int command_type,
 						new_expr = coerce_to_domain(new_expr,
 													InvalidOid, -1,
 													atttype,
+													COERCION_IMPLICIT,
 													COERCE_IMPLICIT_CAST,
 													-1,
-													false,
 													false);
 					}
 					else
@@ -386,8 +411,6 @@ expand_targetlist(List *tlist, int command_type,
 		tlist_item = lnext(tlist_item);
 	}
 
-	heap_close(rel, NoLock);
-
 	return new_tlist;
 }
 
diff --git a/src/backend/optimizer/prep/prepunion.c b/src/backend/optimizer/prep/prepunion.c
index 6d8f8938b2..b586f941a8 100644
--- a/src/backend/optimizer/prep/prepunion.c
+++ b/src/backend/optimizer/prep/prepunion.c
@@ -17,7 +17,7 @@
  * append relations, and thenceforth share code with the UNION ALL case.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -33,6 +33,7 @@
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/sysattr.h"
+#include "catalog/partition.h"
 #include "catalog/pg_inherits_fn.h"
 #include "catalog/pg_type.h"
 #include "miscadmin.h"
@@ -100,6 +101,18 @@ static List *generate_append_tlist(List *colTypes, List *colCollations,
 static List *generate_setop_grouplist(SetOperationStmt *op, List *targetlist);
 static void expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte,
 						 Index rti);
+static void expand_partitioned_rtentry(PlannerInfo *root,
+						   RangeTblEntry *parentrte,
+						   Index parentRTindex, Relation parentrel,
+						   PlanRowMark *top_parentrc, LOCKMODE lockmode,
+						   List **appinfos, List **partitioned_child_rels,
+						   bool *part_cols_updated);
+static void expand_single_inheritance_child(PlannerInfo *root,
+								RangeTblEntry *parentrte,
+								Index parentRTindex, Relation parentrel,
+								PlanRowMark *top_parentrc, Relation childrel,
+								List **appinfos, RangeTblEntry **childrte_p,
+								Index *childRTindex_p);
 static void make_inh_translation_list(Relation oldrelation,
 						  Relation newrelation,
 						  Index newvarno,
@@ -254,6 +267,9 @@ recurse_set_operations(Node *setOp, PlannerInfo *root,
 					   List **pTargetList,
 					   double *pNumGroups)
 {
+	/* Guard against stack overflow due to overly complex setop nests */
+	check_stack_depth();
+
 	if (IsA(setOp, RangeTblRef))
 	{
 		RangeTblRef *rtr = (RangeTblRef *) setOp;
@@ -578,8 +594,8 @@ generate_union_path(SetOperationStmt *op, PlannerInfo *root,
 	/*
 	 * Append the child results together.
 	 */
-	path = (Path *) create_append_path(result_rel, pathlist, NULL, 0, NIL);
-
+	path = (Path *) create_append_path(result_rel, pathlist, NIL,
+									   NULL, 0, false, NIL, -1);
 	/* We have to manually jam the right tlist into the path; ick */
 	path->pathtarget = create_pathtarget(root, tlist);
 
@@ -690,7 +706,8 @@ generate_nonunion_path(SetOperationStmt *op, PlannerInfo *root,
 	/*
 	 * Append the child results together.
 	 */
-	path = (Path *) create_append_path(result_rel, pathlist, NULL, 0, NIL);
+	path = (Path *) create_append_path(result_rel, pathlist, NIL,
+									   NULL, 0, false, NIL, -1);
 
 	/* We have to manually jam the right tlist into the path; ick */
 	path->pathtarget = create_pathtarget(root, tlist);
@@ -698,10 +715,6 @@ generate_nonunion_path(SetOperationStmt *op, PlannerInfo *root,
 	/* Identify the grouping semantics */
 	groupList = generate_setop_grouplist(op, tlist);
 
-	/* punt if nothing to group on (can this happen?) */
-	if (groupList == NIL)
-		return path;
-
 	/*
 	 * Estimate number of distinct groups that we'll need hashtable entries
 	 * for; this is the size of the left-hand input for EXCEPT, or the smaller
@@ -728,7 +741,7 @@ generate_nonunion_path(SetOperationStmt *op, PlannerInfo *root,
 								   dNumGroups, dNumOutputRows,
 								   (op->op == SETOP_INTERSECT) ? "INTERSECT" : "EXCEPT");
 
-	if (!use_hash)
+	if (groupList && !use_hash)
 		path = (Path *) create_sort_path(root,
 										 result_rel,
 										 path,
@@ -851,10 +864,6 @@ make_union_unique(SetOperationStmt *op, Path *path, List *tlist,
 	/* Identify the grouping semantics */
 	groupList = generate_setop_grouplist(op, tlist);
 
-	/* punt if nothing to group on (can this happen?) */
-	if (groupList == NIL)
-		return path;
-
 	/*
 	 * XXX for the moment, take the number of distinct groups as equal to the
 	 * total input size, ie, the worst case.  This is too conservative, but we
@@ -885,13 +894,15 @@ make_union_unique(SetOperationStmt *op, Path *path, List *tlist,
 	else
 	{
 		/* Sort and Unique */
-		path = (Path *) create_sort_path(root,
-										 result_rel,
-										 path,
-										 make_pathkeys_for_sortclauses(root,
-																	   groupList,
-																	   tlist),
-										 -1.0);
+		if (groupList)
+			path = (Path *)
+				create_sort_path(root,
+								 result_rel,
+								 path,
+								 make_pathkeys_for_sortclauses(root,
+															   groupList,
+															   tlist),
+								 -1.0);
 		/* We have to manually jam the right tlist into the path; ick */
 		path->pathtarget = create_pathtarget(root, tlist);
 		path = (Path *) create_upper_unique_path(root,
@@ -965,6 +976,7 @@ choose_hashed_setop(PlannerInfo *root, List *groupClauses,
 	 */
 	cost_agg(&hashed_p, root, AGG_HASHED, NULL,
 			 numGroupCols, dNumGroups,
+			 NIL,
 			 input_path->startup_cost, input_path->total_cost,
 			 input_path->rows);
 
@@ -979,6 +991,7 @@ choose_hashed_setop(PlannerInfo *root, List *groupClauses,
 			  input_path->rows, input_path->pathtarget->width,
 			  0.0, work_mem, -1.0);
 	cost_group(&sorted_p, root, numGroupCols, dNumGroups,
+			   NIL,
 			   sorted_p.startup_cost, sorted_p.total_cost,
 			   input_path->rows);
 
@@ -1334,9 +1347,9 @@ expand_inherited_tables(PlannerInfo *root)
 	ListCell   *rl;
 
 	/*
-	 * expand_inherited_rtentry may add RTEs to parse->rtable; there is no
-	 * need to scan them since they can't have inh=true.  So just scan as far
-	 * as the original end of the rtable list.
+	 * expand_inherited_rtentry may add RTEs to parse->rtable. The function is
+	 * expected to recursively handle any RTEs that it creates with inh=true.
+	 * So just scan as far as the original end of the rtable list.
 	 */
 	nrtes = list_length(root->parse->rtable);
 	rl = list_head(root->parse->rtable);
@@ -1378,11 +1391,7 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
 	Relation	oldrelation;
 	LOCKMODE	lockmode;
 	List	   *inhOIDs;
-	List	   *appinfos;
 	ListCell   *l;
-	bool		has_child;
-	PartitionedChildRelInfo *pcinfo;
-	List	   *partitioned_child_rels = NIL;
 
 	/* Does RT entry allow inheritance? */
 	if (!rte->inh)
@@ -1453,171 +1462,328 @@ expand_inherited_rtentry(PlannerInfo *root, RangeTblEntry *rte, Index rti)
 	oldrelation = heap_open(parentOID, NoLock);
 
 	/* Scan the inheritance set and expand it */
-	appinfos = NIL;
-	has_child = false;
-	foreach(l, inhOIDs)
+	if (RelationGetPartitionDesc(oldrelation) != NULL)
 	{
-		Oid			childOID = lfirst_oid(l);
-		Relation	newrelation;
-		RangeTblEntry *childrte;
-		Index		childRTindex;
-		AppendRelInfo *appinfo;
+		List	   *partitioned_child_rels = NIL;
+		bool		part_cols_updated = false;
 
-		/* Open rel if needed; we already have required locks */
-		if (childOID != parentOID)
-			newrelation = heap_open(childOID, NoLock);
-		else
-			newrelation = oldrelation;
+		Assert(rte->relkind == RELKIND_PARTITIONED_TABLE);
 
 		/*
-		 * It is possible that the parent table has children that are temp
-		 * tables of other backends.  We cannot safely access such tables
-		 * (because of buffering issues), and the best thing to do seems to be
-		 * to silently ignore them.
+		 * If this table has partitions, recursively expand them in the order
+		 * in which they appear in the PartitionDesc.  While at it, also
+		 * extract the partition key columns of all the partitioned tables.
 		 */
-		if (childOID != parentOID && RELATION_IS_OTHER_TEMP(newrelation))
-		{
-			heap_close(newrelation, lockmode);
-			continue;
-		}
+		expand_partitioned_rtentry(root, rte, rti, oldrelation, oldrc,
+								   lockmode, &root->append_rel_list,
+								   &partitioned_child_rels,
+								   &part_cols_updated);
 
 		/*
-		 * Build an RTE for the child, and attach to query's rangetable list.
-		 * We copy most fields of the parent's RTE, but replace relation OID
-		 * and relkind, and set inh = false.  Also, set requiredPerms to zero
-		 * since all required permissions checks are done on the original RTE.
-		 * Likewise, set the child's securityQuals to empty, because we only
-		 * want to apply the parent's RLS conditions regardless of what RLS
-		 * properties individual children may have.  (This is an intentional
-		 * choice to make inherited RLS work like regular permissions checks.)
-		 * The parent securityQuals will be propagated to children along with
-		 * other base restriction clauses, so we don't need to do it here.
+		 * We keep a list of objects in root, each of which maps a root
+		 * partitioned parent RT index to the list of RT indexes of descendant
+		 * partitioned child tables.  When creating an Append or a ModifyTable
+		 * path for the parent, we copy the child RT index list verbatim to
+		 * the path so that it could be carried over to the executor so that
+		 * the latter could identify the partitioned child tables.
 		 */
-		childrte = copyObject(rte);
-		childrte->relid = childOID;
-		childrte->relkind = newrelation->rd_rel->relkind;
-		childrte->inh = false;
-		childrte->requiredPerms = 0;
-		childrte->securityQuals = NIL;
-		parse->rtable = lappend(parse->rtable, childrte);
-		childRTindex = list_length(parse->rtable);
+		if (rte->inh && partitioned_child_rels != NIL)
+		{
+			PartitionedChildRelInfo *pcinfo;
+
+			pcinfo = makeNode(PartitionedChildRelInfo);
+			pcinfo->parent_relid = rti;
+			pcinfo->child_rels = partitioned_child_rels;
+			pcinfo->part_cols_updated = part_cols_updated;
+			root->pcinfo_list = lappend(root->pcinfo_list, pcinfo);
+		}
+	}
+	else
+	{
+		List	   *appinfos = NIL;
+		RangeTblEntry *childrte;
+		Index		childRTindex;
 
 		/*
-		 * Build an AppendRelInfo for this parent and child, unless the child
-		 * is a partitioned table.
+		 * This table has no partitions.  Expand any plain inheritance
+		 * children in the order the OIDs were returned by
+		 * find_all_inheritors.
 		 */
-		if (childrte->relkind != RELKIND_PARTITIONED_TABLE)
+		foreach(l, inhOIDs)
 		{
-			/* Remember if we saw a real child. */
+			Oid			childOID = lfirst_oid(l);
+			Relation	newrelation;
+
+			/* Open rel if needed; we already have required locks */
 			if (childOID != parentOID)
-				has_child = true;
-
-			appinfo = makeNode(AppendRelInfo);
-			appinfo->parent_relid = rti;
-			appinfo->child_relid = childRTindex;
-			appinfo->parent_reltype = oldrelation->rd_rel->reltype;
-			appinfo->child_reltype = newrelation->rd_rel->reltype;
-			make_inh_translation_list(oldrelation, newrelation, childRTindex,
-									  &appinfo->translated_vars);
-			appinfo->parent_reloid = parentOID;
-			appinfos = lappend(appinfos, appinfo);
+				newrelation = heap_open(childOID, NoLock);
+			else
+				newrelation = oldrelation;
 
 			/*
-			 * Translate the column permissions bitmaps to the child's attnums
-			 * (we have to build the translated_vars list before we can do
-			 * this). But if this is the parent table, leave copyObject's
-			 * result alone.
-			 *
-			 * Note: we need to do this even though the executor won't run any
-			 * permissions checks on the child RTE.  The
-			 * insertedCols/updatedCols bitmaps may be examined for
-			 * trigger-firing purposes.
+			 * It is possible that the parent table has children that are temp
+			 * tables of other backends.  We cannot safely access such tables
+			 * (because of buffering issues), and the best thing to do seems
+			 * to be to silently ignore them.
 			 */
-			if (childOID != parentOID)
+			if (childOID != parentOID && RELATION_IS_OTHER_TEMP(newrelation))
 			{
-				childrte->selectedCols = translate_col_privs(rte->selectedCols,
-															 appinfo->translated_vars);
-				childrte->insertedCols = translate_col_privs(rte->insertedCols,
-															 appinfo->translated_vars);
-				childrte->updatedCols = translate_col_privs(rte->updatedCols,
-															appinfo->translated_vars);
+				heap_close(newrelation, lockmode);
+				continue;
 			}
+
+			expand_single_inheritance_child(root, rte, rti, oldrelation, oldrc,
+											newrelation,
+											&appinfos, &childrte,
+											&childRTindex);
+
+			/* Close child relations, but keep locks */
+			if (childOID != parentOID)
+				heap_close(newrelation, NoLock);
 		}
-		else
-			partitioned_child_rels = lappend_int(partitioned_child_rels,
-												 childRTindex);
 
 		/*
-		 * Build a PlanRowMark if parent is marked FOR UPDATE/SHARE.
+		 * If all the children were temp tables, pretend it's a
+		 * non-inheritance situation; we don't need Append node in that case.
+		 * The duplicate RTE we added for the parent table is harmless, so we
+		 * don't bother to get rid of it; ditto for the useless PlanRowMark
+		 * node.
 		 */
-		if (oldrc)
-		{
-			PlanRowMark *newrc = makeNode(PlanRowMark);
+		if (list_length(appinfos) < 2)
+			rte->inh = false;
+		else
+			root->append_rel_list = list_concat(root->append_rel_list,
+												appinfos);
 
-			newrc->rti = childRTindex;
-			newrc->prti = rti;
-			newrc->rowmarkId = oldrc->rowmarkId;
-			/* Reselect rowmark type, because relkind might not match parent */
-			newrc->markType = select_rowmark_type(childrte, oldrc->strength);
-			newrc->allMarkTypes = (1 << newrc->markType);
-			newrc->strength = oldrc->strength;
-			newrc->waitPolicy = oldrc->waitPolicy;
+	}
 
-			/*
-			 * We mark RowMarks for partitioned child tables as parent
-			 * RowMarks so that the executor ignores them (except their
-			 * existence means that the child tables be locked using
-			 * appropriate mode).
-			 */
-			newrc->isParent = (childrte->relkind == RELKIND_PARTITIONED_TABLE);
+	heap_close(oldrelation, NoLock);
+}
+
+/*
+ * expand_partitioned_rtentry
+ *		Recursively expand an RTE for a partitioned table.
+ *
+ * Note that RelationGetPartitionDispatchInfo will expand partitions in the
+ * same order as this code.
+ */
+static void
+expand_partitioned_rtentry(PlannerInfo *root, RangeTblEntry *parentrte,
+						   Index parentRTindex, Relation parentrel,
+						   PlanRowMark *top_parentrc, LOCKMODE lockmode,
+						   List **appinfos, List **partitioned_child_rels,
+						   bool *part_cols_updated)
+{
+	int			i;
+	RangeTblEntry *childrte;
+	Index		childRTindex;
+	bool		has_child = false;
+	PartitionDesc partdesc = RelationGetPartitionDesc(parentrel);
+
+	check_stack_depth();
+
+	/* A partitioned table should always have a partition descriptor. */
+	Assert(partdesc);
 
-			/* Include child's rowmark type in parent's allMarkTypes */
-			oldrc->allMarkTypes |= newrc->allMarkTypes;
+	Assert(parentrte->inh);
 
-			root->rowMarks = lappend(root->rowMarks, newrc);
+	/*
+	 * Note down whether any partition key cols are being updated. Though it's
+	 * the root partitioned table's updatedCols we are interested in, we
+	 * instead use parentrte to get the updatedCols. This is convenient because
+	 * parentrte already has the root partrel's updatedCols translated to match
+	 * the attribute ordering of parentrel.
+	 */
+	if (!*part_cols_updated)
+		*part_cols_updated =
+			has_partition_attrs(parentrel, parentrte->updatedCols, NULL);
+
+	/* First expand the partitioned table itself. */
+	expand_single_inheritance_child(root, parentrte, parentRTindex, parentrel,
+									top_parentrc, parentrel,
+									appinfos, &childrte, &childRTindex);
+
+	/*
+	 * The partitioned table does not have data for itself but still need to
+	 * be locked. Update given list of partitioned children with RTI of this
+	 * partitioned relation.
+	 */
+	*partitioned_child_rels = lappend_int(*partitioned_child_rels,
+										  childRTindex);
+
+	for (i = 0; i < partdesc->nparts; i++)
+	{
+		Oid			childOID = partdesc->oids[i];
+		Relation	childrel;
+
+		/* Open rel; we already have required locks */
+		childrel = heap_open(childOID, NoLock);
+
+		/* As in expand_inherited_rtentry, skip non-local temp tables */
+		if (RELATION_IS_OTHER_TEMP(childrel))
+		{
+			heap_close(childrel, lockmode);
+			continue;
 		}
 
-		/* Close child relations, but keep locks */
-		if (childOID != parentOID)
-			heap_close(newrelation, NoLock);
-	}
+		/* We have a real partition. */
+		has_child = true;
 
-	heap_close(oldrelation, NoLock);
+		expand_single_inheritance_child(root, parentrte, parentRTindex,
+										parentrel, top_parentrc, childrel,
+										appinfos, &childrte, &childRTindex);
+
+		/* If this child is itself partitioned, recurse */
+		if (childrel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+			expand_partitioned_rtentry(root, childrte, childRTindex,
+									   childrel, top_parentrc, lockmode,
+									   appinfos, partitioned_child_rels,
+									   part_cols_updated);
+
+		/* Close child relation, but keep locks */
+		heap_close(childrel, NoLock);
+	}
 
 	/*
-	 * If all the children were temp tables or a partitioned parent did not
-	 * have any leaf partitions, pretend it's a non-inheritance situation; we
-	 * don't need Append node in that case.  The duplicate RTE we added for
-	 * the parent table is harmless, so we don't bother to get rid of it;
-	 * ditto for the useless PlanRowMark node.
+	 * If the partitioned table has no partitions or all the partitions are
+	 * temporary tables from other backends, treat this as non-inheritance
+	 * case.
 	 */
 	if (!has_child)
+		parentrte->inh = false;
+}
+
+/*
+ * expand_single_inheritance_child
+ *		Build a RangeTblEntry and an AppendRelInfo, if appropriate, plus
+ *		maybe a PlanRowMark.
+ *
+ * We now expand the partition hierarchy level by level, creating a
+ * corresponding hierarchy of AppendRelInfos and RelOptInfos, where each
+ * partitioned descendant acts as a parent of its immediate partitions.
+ * (This is a difference from what older versions of PostgreSQL did and what
+ * is still done in the case of table inheritance for unpartitioned tables,
+ * where the hierarchy is flattened during RTE expansion.)
+ *
+ * PlanRowMarks still carry the top-parent's RTI, and the top-parent's
+ * allMarkTypes field still accumulates values from all descendents.
+ *
+ * "parentrte" and "parentRTindex" are immediate parent's RTE and
+ * RTI. "top_parentrc" is top parent's PlanRowMark.
+ *
+ * The child RangeTblEntry and its RTI are returned in "childrte_p" and
+ * "childRTindex_p" resp.
+ */
+static void
+expand_single_inheritance_child(PlannerInfo *root, RangeTblEntry *parentrte,
+								Index parentRTindex, Relation parentrel,
+								PlanRowMark *top_parentrc, Relation childrel,
+								List **appinfos, RangeTblEntry **childrte_p,
+								Index *childRTindex_p)
+{
+	Query	   *parse = root->parse;
+	Oid			parentOID = RelationGetRelid(parentrel);
+	Oid			childOID = RelationGetRelid(childrel);
+	RangeTblEntry *childrte;
+	Index		childRTindex;
+	AppendRelInfo *appinfo;
+
+	/*
+	 * Build an RTE for the child, and attach to query's rangetable list. We
+	 * copy most fields of the parent's RTE, but replace relation OID and
+	 * relkind, and set inh = false.  Also, set requiredPerms to zero since
+	 * all required permissions checks are done on the original RTE. Likewise,
+	 * set the child's securityQuals to empty, because we only want to apply
+	 * the parent's RLS conditions regardless of what RLS properties
+	 * individual children may have.  (This is an intentional choice to make
+	 * inherited RLS work like regular permissions checks.) The parent
+	 * securityQuals will be propagated to children along with other base
+	 * restriction clauses, so we don't need to do it here.
+	 */
+	childrte = copyObject(parentrte);
+	*childrte_p = childrte;
+	childrte->relid = childOID;
+	childrte->relkind = childrel->rd_rel->relkind;
+	/* A partitioned child will need to be expanded further. */
+	if (childOID != parentOID &&
+		childrte->relkind == RELKIND_PARTITIONED_TABLE)
+		childrte->inh = true;
+	else
+		childrte->inh = false;
+	childrte->requiredPerms = 0;
+	childrte->securityQuals = NIL;
+	parse->rtable = lappend(parse->rtable, childrte);
+	childRTindex = list_length(parse->rtable);
+	*childRTindex_p = childRTindex;
+
+	/*
+	 * We need an AppendRelInfo if paths will be built for the child RTE. If
+	 * childrte->inh is true, then we'll always need to generate append paths
+	 * for it.  If childrte->inh is false, we must scan it if it's not a
+	 * partitioned table; but if it is a partitioned table, then it never has
+	 * any data of its own and need not be scanned.
+	 */
+	if (childrte->relkind != RELKIND_PARTITIONED_TABLE || childrte->inh)
 	{
-		/* Clear flag before returning */
-		rte->inh = false;
-		return;
+		appinfo = makeNode(AppendRelInfo);
+		appinfo->parent_relid = parentRTindex;
+		appinfo->child_relid = childRTindex;
+		appinfo->parent_reltype = parentrel->rd_rel->reltype;
+		appinfo->child_reltype = childrel->rd_rel->reltype;
+		make_inh_translation_list(parentrel, childrel, childRTindex,
+								  &appinfo->translated_vars);
+		appinfo->parent_reloid = parentOID;
+		*appinfos = lappend(*appinfos, appinfo);
+
+		/*
+		 * Translate the column permissions bitmaps to the child's attnums (we
+		 * have to build the translated_vars list before we can do this). But
+		 * if this is the parent table, leave copyObject's result alone.
+		 *
+		 * Note: we need to do this even though the executor won't run any
+		 * permissions checks on the child RTE.  The insertedCols/updatedCols
+		 * bitmaps may be examined for trigger-firing purposes.
+		 */
+		if (childOID != parentOID)
+		{
+			childrte->selectedCols = translate_col_privs(parentrte->selectedCols,
+														 appinfo->translated_vars);
+			childrte->insertedCols = translate_col_privs(parentrte->insertedCols,
+														 appinfo->translated_vars);
+			childrte->updatedCols = translate_col_privs(parentrte->updatedCols,
+														appinfo->translated_vars);
+		}
 	}
 
 	/*
-	 * We keep a list of objects in root, each of which maps a partitioned
-	 * parent RT index to the list of RT indexes of its partitioned child
-	 * tables.  When creating an Append or a ModifyTable path for the parent,
-	 * we copy the child RT index list verbatim to the path so that it could
-	 * be carried over to the executor so that the latter could identify the
-	 * partitioned child tables.
+	 * Build a PlanRowMark if parent is marked FOR UPDATE/SHARE.
 	 */
-	if (partitioned_child_rels != NIL)
+	if (top_parentrc)
 	{
-		pcinfo = makeNode(PartitionedChildRelInfo);
+		PlanRowMark *childrc = makeNode(PlanRowMark);
+
+		childrc->rti = childRTindex;
+		childrc->prti = top_parentrc->rti;
+		childrc->rowmarkId = top_parentrc->rowmarkId;
+		/* Reselect rowmark type, because relkind might not match parent */
+		childrc->markType = select_rowmark_type(childrte,
+												top_parentrc->strength);
+		childrc->allMarkTypes = (1 << childrc->markType);
+		childrc->strength = top_parentrc->strength;
+		childrc->waitPolicy = top_parentrc->waitPolicy;
 
-		Assert(rte->relkind == RELKIND_PARTITIONED_TABLE);
-		pcinfo->parent_relid = rti;
-		pcinfo->child_rels = partitioned_child_rels;
-		root->pcinfo_list = lappend(root->pcinfo_list, pcinfo);
-	}
+		/*
+		 * We mark RowMarks for partitioned child tables as parent RowMarks so
+		 * that the executor ignores them (except their existence means that
+		 * the child tables be locked using appropriate mode).
+		 */
+		childrc->isParent = (childrte->relkind == RELKIND_PARTITIONED_TABLE);
+
+		/* Include child's rowmark type in top parent's allMarkTypes */
+		top_parentrc->allMarkTypes |= childrc->allMarkTypes;
 
-	/* Otherwise, OK to add to root->append_rel_list */
-	root->append_rel_list = list_concat(root->append_rel_list, appinfos);
+		root->rowMarks = lappend(root->rowMarks, childrc);
+	}
 }
 
 /*
@@ -1648,7 +1814,7 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
 		Oid			attcollation;
 		int			new_attno;
 
-		att = old_tupdesc->attrs[old_attno];
+		att = TupleDescAttr(old_tupdesc, old_attno);
 		if (att->attisdropped)
 		{
 			/* Just put NULL into this list entry */
@@ -1686,16 +1852,16 @@ make_inh_translation_list(Relation oldrelation, Relation newrelation,
 		 * notational device to include the assignment into the if-clause.
 		 */
 		if (old_attno < newnatts &&
-			(att = new_tupdesc->attrs[old_attno]) != NULL &&
-			!att->attisdropped && att->attinhcount != 0 &&
+			(att = TupleDescAttr(new_tupdesc, old_attno)) != NULL &&
+			!att->attisdropped &&
 			strcmp(attname, NameStr(att->attname)) == 0)
 			new_attno = old_attno;
 		else
 		{
 			for (new_attno = 0; new_attno < newnatts; new_attno++)
 			{
-				att = new_tupdesc->attrs[new_attno];
-				if (!att->attisdropped && att->attinhcount != 0 &&
+				att = TupleDescAttr(new_tupdesc, new_attno);
+				if (!att->attisdropped &&
 					strcmp(attname, NameStr(att->attname)) == 0)
 					break;
 			}
@@ -2088,7 +2254,7 @@ adjust_appendrel_attrs_mutator(Node *node,
  * Substitute child relids for parent relids in a Relid set.  The array of
  * appinfos specifies the substitutions to be performed.
  */
-Relids
+static Relids
 adjust_child_relids(Relids relids, int nappinfos, AppendRelInfo **appinfos)
 {
 	Bitmapset  *result = NULL;
@@ -2118,6 +2284,59 @@ adjust_child_relids(Relids relids, int nappinfos, AppendRelInfo **appinfos)
 	return relids;
 }
 
+/*
+ * Replace any relid present in top_parent_relids with its child in
+ * child_relids. Members of child_relids can be multiple levels below top
+ * parent in the partition hierarchy.
+ */
+Relids
+adjust_child_relids_multilevel(PlannerInfo *root, Relids relids,
+							   Relids child_relids, Relids top_parent_relids)
+{
+	AppendRelInfo **appinfos;
+	int			nappinfos;
+	Relids		parent_relids = NULL;
+	Relids		result;
+	Relids		tmp_result = NULL;
+	int			cnt;
+
+	/*
+	 * If the given relids set doesn't contain any of the top parent relids,
+	 * it will remain unchanged.
+	 */
+	if (!bms_overlap(relids, top_parent_relids))
+		return relids;
+
+	appinfos = find_appinfos_by_relids(root, child_relids, &nappinfos);
+
+	/* Construct relids set for the immediate parent of the given child. */
+	for (cnt = 0; cnt < nappinfos; cnt++)
+	{
+		AppendRelInfo *appinfo = appinfos[cnt];
+
+		parent_relids = bms_add_member(parent_relids, appinfo->parent_relid);
+	}
+
+	/* Recurse if immediate parent is not the top parent. */
+	if (!bms_equal(parent_relids, top_parent_relids))
+	{
+		tmp_result = adjust_child_relids_multilevel(root, relids,
+													parent_relids,
+													top_parent_relids);
+		relids = tmp_result;
+	}
+
+	result = adjust_child_relids(relids, nappinfos, appinfos);
+
+	/* Free memory consumed by any intermediate result. */
+	if (tmp_result)
+		bms_free(tmp_result);
+	bms_free(parent_relids);
+	pfree(appinfos);
+
+	return result;
+}
+
 /*
  * Adjust the targetlist entries of an inherited UPDATE operation
  *
@@ -2257,12 +2476,54 @@ adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node,
 	return node;
 }
 
+/*
+ * Construct the SpecialJoinInfo for a child-join by translating
+ * SpecialJoinInfo for the join between parents. left_relids and right_relids
+ * are the relids of left and right side of the join respectively.
+ */
+SpecialJoinInfo *
+build_child_join_sjinfo(PlannerInfo *root, SpecialJoinInfo *parent_sjinfo,
+						Relids left_relids, Relids right_relids)
+{
+	SpecialJoinInfo *sjinfo = makeNode(SpecialJoinInfo);
+	AppendRelInfo **left_appinfos;
+	int			left_nappinfos;
+	AppendRelInfo **right_appinfos;
+	int			right_nappinfos;
+
+	memcpy(sjinfo, parent_sjinfo, sizeof(SpecialJoinInfo));
+	left_appinfos = find_appinfos_by_relids(root, left_relids,
+											&left_nappinfos);
+	right_appinfos = find_appinfos_by_relids(root, right_relids,
+											 &right_nappinfos);
+
+	sjinfo->min_lefthand = adjust_child_relids(sjinfo->min_lefthand,
+											   left_nappinfos, left_appinfos);
+	sjinfo->min_righthand = adjust_child_relids(sjinfo->min_righthand,
+												right_nappinfos,
+												right_appinfos);
+	sjinfo->syn_lefthand = adjust_child_relids(sjinfo->syn_lefthand,
+											   left_nappinfos, left_appinfos);
+	sjinfo->syn_righthand = adjust_child_relids(sjinfo->syn_righthand,
+												right_nappinfos,
+												right_appinfos);
+	sjinfo->semi_rhs_exprs = (List *) adjust_appendrel_attrs(root,
+															 (Node *) sjinfo->semi_rhs_exprs,
+															 right_nappinfos,
+															 right_appinfos);
+
+	pfree(left_appinfos);
+	pfree(right_appinfos);
+
+	return sjinfo;
+}
+
 /*
  * find_appinfos_by_relids
  * 		Find AppendRelInfo structures for all relations specified by relids.
  *
  * The AppendRelInfos are returned in an array, which can be pfree'd by the
- * caller. *nappinfos is set to the the number of entries in the array.
+ * caller. *nappinfos is set to the number of entries in the array.
  */
 AppendRelInfo **
 find_appinfos_by_relids(PlannerInfo *root, Relids relids, int *nappinfos)
diff --git a/src/backend/optimizer/util/clauses.c b/src/backend/optimizer/util/clauses.c
index 602d17dfb4..89f27ce0eb 100644
--- a/src/backend/optimizer/util/clauses.c
+++ b/src/backend/optimizer/util/clauses.c
@@ -3,7 +3,7 @@
  * clauses.c
  *	  routines to manipulate qualification clauses
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -115,6 +115,9 @@ static List *find_nonnullable_vars_walker(Node *node, bool top_level);
 static bool is_strict_saop(ScalarArrayOpExpr *expr, bool falseOK);
 static Node *eval_const_expressions_mutator(Node *node,
 							   eval_const_expressions_context *context);
+static bool contain_non_const_walker(Node *node, void *context);
+static bool ece_function_is_safe(Oid funcid,
+					 eval_const_expressions_context *context);
 static List *simplify_or_arguments(List *args,
 					  eval_const_expressions_context *context,
 					  bool *haveNull, bool *forceTrue);
@@ -832,7 +835,7 @@ expression_returns_set_rows(Node *clause)
  * contain_subplans
  *	  Recursively search for subplan nodes within a clause.
  *
- * If we see a SubLink node, we will return TRUE.  This is only possible if
+ * If we see a SubLink node, we will return true.  This is only possible if
  * the expression tree hasn't yet been transformed by subselect.c.  We do not
  * know whether the node will produce a true subplan or just an initplan,
  * but we make the conservative assumption that it will be a subplan.
@@ -1087,6 +1090,8 @@ bool
 is_parallel_safe(PlannerInfo *root, Node *node)
 {
 	max_parallel_hazard_context context;
+	PlannerInfo *proot;
+	ListCell   *l;
 
 	/*
 	 * Even if the original querytree contained nothing unsafe, we need to
@@ -1095,12 +1100,31 @@ is_parallel_safe(PlannerInfo *root, Node *node)
 	 * in this expression.  But otherwise we don't need to look.
 	 */
 	if (root->glob->maxParallelHazard == PROPARALLEL_SAFE &&
-		root->glob->nParamExec == 0)
+		root->glob->paramExecTypes == NIL)
 		return true;
 	/* Else use max_parallel_hazard's search logic, but stop on RESTRICTED */
 	context.max_hazard = PROPARALLEL_SAFE;
 	context.max_interesting = PROPARALLEL_RESTRICTED;
 	context.safe_param_ids = NIL;
+
+	/*
+	 * The params that refer to the same or parent query level are considered
+	 * parallel-safe.  The idea is that we compute such params at Gather or
+	 * Gather Merge node and pass their value to workers.
+	 */
+	for (proot = root; proot != NULL; proot = proot->parent_root)
+	{
+		foreach(l, proot->init_plans)
+		{
+			SubPlan    *initsubplan = (SubPlan *) lfirst(l);
+			ListCell   *l2;
+
+			foreach(l2, initsubplan->setParam)
+				context.safe_param_ids = lcons_int(lfirst_int(l2),
+												   context.safe_param_ids);
+		}
+	}
+
 	return !max_parallel_hazard_walker(node, &context);
 }
 
@@ -1223,13 +1247,18 @@ max_parallel_hazard_walker(Node *node, max_parallel_hazard_context *context)
 
 	/*
 	 * We can't pass Params to workers at the moment either, so they are also
-	 * parallel-restricted, unless they are PARAM_EXEC Params listed in
-	 * safe_param_ids, meaning they could be generated within the worker.
+	 * parallel-restricted, unless they are PARAM_EXTERN Params or are
+	 * PARAM_EXEC Params listed in safe_param_ids, meaning they could be
+	 * either generated within the worker or can be computed in master and
+	 * then their value can be passed to the worker.
 	 */
 	else if (IsA(node, Param))
 	{
 		Param	   *param = (Param *) node;
 
+		if (param->paramkind == PARAM_EXTERN)
+			return false;
+
 		if (param->paramkind != PARAM_EXEC ||
 			!list_member_int(context->safe_param_ids, param->paramid))
 		{
@@ -1361,6 +1390,17 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 		return true;
 	if (IsA(node, FieldStore))
 		return true;
+	if (IsA(node, ArrayCoerceExpr))
+	{
+		/*
+		 * ArrayCoerceExpr is strict at the array level, regardless of what
+		 * the per-element expression is; so we should ignore elemexpr and
+		 * recurse only into the arg.
+		 */
+		return expression_tree_walker((Node *) ((ArrayCoerceExpr *) node)->arg,
+									  contain_nonstrict_functions_walker,
+									  context);
+	}
 	if (IsA(node, CaseExpr))
 		return true;
 	if (IsA(node, ArrayExpr))
@@ -1380,14 +1420,11 @@ contain_nonstrict_functions_walker(Node *node, void *context)
 	if (IsA(node, BooleanTest))
 		return true;
 
-	/*
-	 * Check other function-containing nodes; but ArrayCoerceExpr is strict at
-	 * the array level, regardless of elemfunc.
-	 */
-	if (!IsA(node, ArrayCoerceExpr) &&
-		check_functions_in_node(node, contain_nonstrict_functions_checker,
+	/* Check other function-containing nodes */
+	if (check_functions_in_node(node, contain_nonstrict_functions_checker,
 								context))
 		return true;
+
 	return expression_tree_walker(node, contain_nonstrict_functions_walker,
 								  context);
 }
@@ -1574,7 +1611,7 @@ contain_leaked_vars_walker(Node *node, void *context)
 			 * WHERE CURRENT OF doesn't contain leaky function calls.
 			 * Moreover, it is essential that this is considered non-leaky,
 			 * since the planner must always generate a TID scan when CURRENT
-			 * OF is present -- c.f. cost_tidscan.
+			 * OF is present -- cf. cost_tidscan.
 			 */
 			return false;
 
@@ -1614,8 +1651,8 @@ contain_leaked_vars_walker(Node *node, void *context)
  * that either v1 or v2 can't be NULL, but it does prove that the t1 row
  * as a whole can't be all-NULL.
  *
- * top_level is TRUE while scanning top-level AND/OR structure; here, showing
- * the result is either FALSE or NULL is good enough.  top_level is FALSE when
+ * top_level is true while scanning top-level AND/OR structure; here, showing
+ * the result is either FALSE or NULL is good enough.  top_level is false when
  * we have descended below a NOT or a strict function: now we must be able to
  * prove that the subexpression goes to NULL.
  *
@@ -1757,7 +1794,7 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
 	}
 	else if (IsA(node, ArrayCoerceExpr))
 	{
-		/* ArrayCoerceExpr is strict at the array level */
+		/* ArrayCoerceExpr is strict at the array level; ignore elemexpr */
 		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
 
 		result = find_nonnullable_rels_walker((Node *) expr->arg, top_level);
@@ -1822,8 +1859,8 @@ find_nonnullable_rels_walker(Node *node, bool top_level)
  * The result is a palloc'd List, but we have not copied the member Var nodes.
  * Also, we don't bother trying to eliminate duplicate entries.
  *
- * top_level is TRUE while scanning top-level AND/OR structure; here, showing
- * the result is either FALSE or NULL is good enough.  top_level is FALSE when
+ * top_level is true while scanning top-level AND/OR structure; here, showing
+ * the result is either FALSE or NULL is good enough.  top_level is false when
  * we have descended below a NOT or a strict function: now we must be able to
  * prove that the subexpression goes to NULL.
  *
@@ -1965,7 +2002,7 @@ find_nonnullable_vars_walker(Node *node, bool top_level)
 	}
 	else if (IsA(node, ArrayCoerceExpr))
 	{
-		/* ArrayCoerceExpr is strict at the array level */
+		/* ArrayCoerceExpr is strict at the array level; ignore elemexpr */
 		ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
 
 		result = find_nonnullable_vars_walker((Node *) expr->arg, top_level);
@@ -2348,6 +2385,10 @@ CommuteRowCompareExpr(RowCompareExpr *clause)
  * is still what it was when the expression was parsed.  This is needed to
  * guard against improper simplification after ALTER COLUMN TYPE.  (XXX we
  * may well need to make similar checks elsewhere?)
+ *
+ * rowtypeid may come from a whole-row Var, and therefore it can be a domain
+ * over composite, but for this purpose we only care about checking the type
+ * of a contained field.
  */
 static bool
 rowtype_field_matches(Oid rowtypeid, int fieldnum,
@@ -2360,13 +2401,13 @@ rowtype_field_matches(Oid rowtypeid, int fieldnum,
 	/* No issue for RECORD, since there is no way to ALTER such a type */
 	if (rowtypeid == RECORDOID)
 		return true;
-	tupdesc = lookup_rowtype_tupdesc(rowtypeid, -1);
+	tupdesc = lookup_rowtype_tupdesc_domain(rowtypeid, -1, false);
 	if (fieldnum <= 0 || fieldnum > tupdesc->natts)
 	{
 		ReleaseTupleDesc(tupdesc);
 		return false;
 	}
-	attr = tupdesc->attrs[fieldnum - 1];
+	attr = TupleDescAttr(tupdesc, fieldnum - 1);
 	if (attr->attisdropped ||
 		attr->atttypid != expectedtype ||
 		attr->atttypmod != expectedtypmod ||
@@ -2464,6 +2505,37 @@ estimate_expression_value(PlannerInfo *root, Node *node)
 	return eval_const_expressions_mutator(node, &context);
 }
 
+/*
+ * The generic case in eval_const_expressions_mutator is to recurse using
+ * expression_tree_mutator, which will copy the given node unchanged but
+ * const-simplify its arguments (if any) as far as possible.  If the node
+ * itself does immutable processing, and each of its arguments were reduced
+ * to a Const, we can then reduce it to a Const using evaluate_expr.  (Some
+ * node types need more complicated logic; for example, a CASE expression
+ * might be reducible to a constant even if not all its subtrees are.)
+ */
+#define ece_generic_processing(node) \
+	expression_tree_mutator((Node *) (node), eval_const_expressions_mutator, \
+							(void *) context)
+
+/*
+ * Check whether all arguments of the given node were reduced to Consts.
+ * By going directly to expression_tree_walker, contain_non_const_walker
+ * is not applied to the node itself, only to its children.
+ */
+#define ece_all_arguments_const(node) \
+	(!expression_tree_walker((Node *) (node), contain_non_const_walker, NULL))
+
+/* Generic macro for applying evaluate_expr */
+#define ece_evaluate_expr(node) \
+	((Node *) evaluate_expr((Expr *) (node), \
+							exprType((Node *) (node)), \
+							exprTypmod((Node *) (node)), \
+							exprCollation((Node *) (node))))
+
+/*
+ * Recursive guts of eval_const_expressions/estimate_expression_value
+ */
 static Node *
 eval_const_expressions_mutator(Node *node,
 							   eval_const_expressions_context *context)
@@ -2475,14 +2547,27 @@ eval_const_expressions_mutator(Node *node,
 		case T_Param:
 			{
 				Param	   *param = (Param *) node;
+				ParamListInfo paramLI = context->boundParams;
 
 				/* Look to see if we've been given a value for this Param */
 				if (param->paramkind == PARAM_EXTERN &&
-					context->boundParams != NULL &&
+					paramLI != NULL &&
 					param->paramid > 0 &&
-					param->paramid <= context->boundParams->numParams)
+					param->paramid <= paramLI->numParams)
 				{
-					ParamExternData *prm = &context->boundParams->params[param->paramid - 1];
+					ParamExternData *prm;
+					ParamExternData prmdata;
+
+					/*
+					 * Give hook a chance in case parameter is dynamic.  Tell
+					 * it that this fetch is speculative, so it should avoid
+					 * erroring out if parameter is unavailable.
+					 */
+					if (paramLI->paramFetch != NULL)
+						prm = paramLI->paramFetch(paramLI, param->paramid,
+												  true, &prmdata);
+					else
+						prm = &paramLI->params[param->paramid - 1];
 
 					if (OidIsValid(prm->ptype))
 					{
@@ -2779,6 +2864,25 @@ eval_const_expressions_mutator(Node *node,
 				newexpr->location = expr->location;
 				return (Node *) newexpr;
 			}
+		case T_ScalarArrayOpExpr:
+			{
+				ScalarArrayOpExpr *saop;
+
+				/* Copy the node and const-simplify its arguments */
+				saop = (ScalarArrayOpExpr *) ece_generic_processing(node);
+
+				/* Make sure we know underlying function */
+				set_sa_opfuncid(saop);
+
+				/*
+				 * If all arguments are Consts, and it's a safe function, we
+				 * can fold to a constant
+				 */
+				if (ece_all_arguments_const(saop) &&
+					ece_function_is_safe(saop->opfuncid, context))
+					return ece_evaluate_expr(saop);
+				return (Node *) saop;
+			}
 		case T_BoolExpr:
 			{
 				BoolExpr   *expr = (BoolExpr *) node;
@@ -3003,41 +3107,24 @@ eval_const_expressions_mutator(Node *node,
 			}
 		case T_ArrayCoerceExpr:
 			{
-				ArrayCoerceExpr *expr = (ArrayCoerceExpr *) node;
-				Expr	   *arg;
-				ArrayCoerceExpr *newexpr;
+				ArrayCoerceExpr *ac;
 
-				/*
-				 * Reduce constants in the ArrayCoerceExpr's argument, then
-				 * build a new ArrayCoerceExpr.
-				 */
-				arg = (Expr *) eval_const_expressions_mutator((Node *) expr->arg,
-															  context);
-
-				newexpr = makeNode(ArrayCoerceExpr);
-				newexpr->arg = arg;
-				newexpr->elemfuncid = expr->elemfuncid;
-				newexpr->resulttype = expr->resulttype;
-				newexpr->resulttypmod = expr->resulttypmod;
-				newexpr->resultcollid = expr->resultcollid;
-				newexpr->isExplicit = expr->isExplicit;
-				newexpr->coerceformat = expr->coerceformat;
-				newexpr->location = expr->location;
+				/* Copy the node and const-simplify its arguments */
+				ac = (ArrayCoerceExpr *) ece_generic_processing(node);
 
 				/*
-				 * If constant argument and it's a binary-coercible or
-				 * immutable conversion, we can simplify it to a constant.
+				 * If constant argument and the per-element expression is
+				 * immutable, we can simplify the whole thing to a constant.
+				 * Exception: although contain_mutable_functions considers
+				 * CoerceToDomain immutable for historical reasons, let's not
+				 * do so here; this ensures coercion to an array-over-domain
+				 * does not apply the domain's constraints until runtime.
 				 */
-				if (arg && IsA(arg, Const) &&
-					(!OidIsValid(newexpr->elemfuncid) ||
-					 func_volatile(newexpr->elemfuncid) == PROVOLATILE_IMMUTABLE))
-					return (Node *) evaluate_expr((Expr *) newexpr,
-												  newexpr->resulttype,
-												  newexpr->resulttypmod,
-												  newexpr->resultcollid);
-
-				/* Else we must return the partially-simplified node */
-				return (Node *) newexpr;
+				if (ac->arg && IsA(ac->arg, Const) &&
+					ac->elemexpr && !IsA(ac->elemexpr, CoerceToDomain) &&
+					!contain_mutable_functions((Node *) ac->elemexpr))
+					return ece_evaluate_expr(ac);
+				return (Node *) ac;
 			}
 		case T_CollateExpr:
 			{
@@ -3229,41 +3316,22 @@ eval_const_expressions_mutator(Node *node,
 				else
 					return copyObject(node);
 			}
+		case T_ArrayRef:
 		case T_ArrayExpr:
+		case T_RowExpr:
 			{
-				ArrayExpr  *arrayexpr = (ArrayExpr *) node;
-				ArrayExpr  *newarray;
-				bool		all_const = true;
-				List	   *newelems;
-				ListCell   *element;
-
-				newelems = NIL;
-				foreach(element, arrayexpr->elements)
-				{
-					Node	   *e;
-
-					e = eval_const_expressions_mutator((Node *) lfirst(element),
-													   context);
-					if (!IsA(e, Const))
-						all_const = false;
-					newelems = lappend(newelems, e);
-				}
+				/*
+				 * Generic handling for node types whose own processing is
+				 * known to be immutable, and for which we need no smarts
+				 * beyond "simplify if all inputs are constants".
+				 */
 
-				newarray = makeNode(ArrayExpr);
-				newarray->array_typeid = arrayexpr->array_typeid;
-				newarray->array_collid = arrayexpr->array_collid;
-				newarray->element_typeid = arrayexpr->element_typeid;
-				newarray->elements = newelems;
-				newarray->multidims = arrayexpr->multidims;
-				newarray->location = arrayexpr->location;
-
-				if (all_const)
-					return (Node *) evaluate_expr((Expr *) newarray,
-												  newarray->array_typeid,
-												  exprTypmod(node),
-												  newarray->array_collid);
-
-				return (Node *) newarray;
+				/* Copy the node and const-simplify its arguments */
+				node = ece_generic_processing(node);
+				/* If all arguments are Consts, we can fold to a constant */
+				if (ece_all_arguments_const(node))
+					return ece_evaluate_expr(node);
+				return node;
 			}
 		case T_CoalesceExpr:
 			{
@@ -3340,7 +3408,8 @@ eval_const_expressions_mutator(Node *node,
 				 * simple Var.  (This case won't be generated directly by the
 				 * parser, because ParseComplexProjection short-circuits it.
 				 * But it can arise while simplifying functions.)  Also, we
-				 * can optimize field selection from a RowExpr construct.
+				 * can optimize field selection from a RowExpr construct, or
+				 * of course from a constant.
 				 *
 				 * However, replacing a whole-row Var in this way has a
 				 * pitfall: if we've already built the rel targetlist for the
@@ -3355,6 +3424,8 @@ eval_const_expressions_mutator(Node *node,
 				 * We must also check that the declared type of the field is
 				 * still the same as when the FieldSelect was created --- this
 				 * can change if someone did ALTER COLUMN TYPE on the rowtype.
+				 * If it isn't, we skip the optimization; the case will
+				 * probably fail at runtime, but that's not our problem here.
 				 */
 				FieldSelect *fselect = (FieldSelect *) node;
 				FieldSelect *newfselect;
@@ -3405,6 +3476,17 @@ eval_const_expressions_mutator(Node *node,
 				newfselect->resulttype = fselect->resulttype;
 				newfselect->resulttypmod = fselect->resulttypmod;
 				newfselect->resultcollid = fselect->resultcollid;
+				if (arg && IsA(arg, Const))
+				{
+					Const	   *con = (Const *) arg;
+
+					if (rowtype_field_matches(con->consttype,
+											  newfselect->fieldnum,
+											  newfselect->resulttype,
+											  newfselect->resulttypmod,
+											  newfselect->resultcollid))
+						return ece_evaluate_expr(newfselect);
+				}
 				return (Node *) newfselect;
 			}
 		case T_NullTest:
@@ -3500,6 +3582,13 @@ eval_const_expressions_mutator(Node *node,
 			}
 		case T_BooleanTest:
 			{
+				/*
+				 * This case could be folded into the generic handling used
+				 * for ArrayRef etc.  But because the simplification logic is
+				 * so trivial, applying evaluate_expr() to perform it would be
+				 * a heavy overhead.  BooleanTest is probably common enough to
+				 * justify keeping this bespoke implementation.
+				 */
 				BooleanTest *btest = (BooleanTest *) node;
 				BooleanTest *newbtest;
 				Node	   *arg;
@@ -3573,14 +3662,57 @@ eval_const_expressions_mutator(Node *node,
 	}
 
 	/*
-	 * For any node type not handled above, we recurse using
-	 * expression_tree_mutator, which will copy the node unchanged but try to
-	 * simplify its arguments (if any) using this routine. For example: we
-	 * cannot eliminate an ArrayRef node, but we might be able to simplify
-	 * constant expressions in its subscripts.
+	 * For any node type not handled above, copy the node unchanged but
+	 * const-simplify its subexpressions.  This is the correct thing for node
+	 * types whose behavior might change between planning and execution, such
+	 * as CoerceToDomain.  It's also a safe default for new node types not
+	 * known to this routine.
 	 */
-	return expression_tree_mutator(node, eval_const_expressions_mutator,
-								   (void *) context);
+	return ece_generic_processing(node);
+}
+
+/*
+ * Subroutine for eval_const_expressions: check for non-Const nodes.
+ *
+ * We can abort recursion immediately on finding a non-Const node.  This is
+ * critical for performance, else eval_const_expressions_mutator would take
+ * O(N^2) time on non-simplifiable trees.  However, we do need to descend
+ * into List nodes since expression_tree_walker sometimes invokes the walker
+ * function directly on List subtrees.
+ */
+static bool
+contain_non_const_walker(Node *node, void *context)
+{
+	if (node == NULL)
+		return false;
+	if (IsA(node, Const))
+		return false;
+	if (IsA(node, List))
+		return expression_tree_walker(node, contain_non_const_walker, context);
+	/* Otherwise, abort the tree traversal and return true */
+	return true;
+}
+
+/*
+ * Subroutine for eval_const_expressions: check if a function is OK to evaluate
+ */
+static bool
+ece_function_is_safe(Oid funcid, eval_const_expressions_context *context)
+{
+	char		provolatile = func_volatile(funcid);
+
+	/*
+	 * Ordinarily we are only allowed to simplify immutable functions. But for
+	 * purposes of estimation, we consider it okay to simplify functions that
+	 * are merely stable; the risk that the result might change from planning
+	 * time to execution time is worth taking in preference to not being able
+	 * to estimate the value at all.
+	 */
+	if (provolatile == PROVOLATILE_IMMUTABLE)
+		return true;
+	if (context->estimate && provolatile == PROVOLATILE_STABLE)
+		return true;
+	return false;
 }
 
 /*
@@ -3598,8 +3730,8 @@ eval_const_expressions_mutator(Node *node,
  * input is TRUE and at least one is NULL.  We don't actually include the NULL
  * here, that's supposed to be done by the caller.
  *
- * The output arguments *haveNull and *forceTrue must be initialized FALSE
- * by the caller.  They will be set TRUE if a null constant or true constant,
+ * The output arguments *haveNull and *forceTrue must be initialized false
+ * by the caller.  They will be set true if a NULL constant or TRUE constant,
  * respectively, is detected anywhere in the argument list.
  */
 static List *
@@ -3710,8 +3842,8 @@ simplify_or_arguments(List *args,
  * no input is FALSE and at least one is NULL.  We don't actually include the
  * NULL here, that's supposed to be done by the caller.
  *
- * The output arguments *haveNull and *forceFalse must be initialized FALSE
- * by the caller.  They will be set TRUE if a null constant or false constant,
+ * The output arguments *haveNull and *forceFalse must be initialized false
+ * by the caller.  They will be set true if a null constant or false constant,
  * respectively, is detected anywhere in the argument list.
  */
 static List *
@@ -4357,6 +4489,7 @@ inline_function(Oid funcid, Oid result_type, Oid result_collid,
 	if (funcform->prolang != SQLlanguageId ||
 		funcform->prosecdef ||
 		funcform->proretset ||
+		funcform->prorettype == InvalidOid ||
 		funcform->prorettype == RECORDOID ||
 		!heap_attisnull(func_tuple, Anum_pg_proc_proconfig) ||
 		funcform->pronargs != list_length(args))
@@ -4991,7 +5124,9 @@ inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte)
 	 *
 	 * If the function returns a composite type, don't inline unless the check
 	 * shows it's returning a whole tuple result; otherwise what it's
-	 * returning is a single composite column which is not what we need.
+	 * returning is a single composite column which is not what we need. (Like
+	 * check_sql_fn_retval, we deliberately exclude domains over composite
+	 * here.)
 	 */
 	if (!check_sql_fn_retval(func_oid, fexpr->funcresulttype,
 							 querytree_list,
diff --git a/src/backend/optimizer/util/joininfo.c b/src/backend/optimizer/util/joininfo.c
index 62629ee7d8..3aaa004275 100644
--- a/src/backend/optimizer/util/joininfo.c
+++ b/src/backend/optimizer/util/joininfo.c
@@ -3,7 +3,7 @@
  * joininfo.c
  *	  joininfo list manipulation routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/util/orclauses.c b/src/backend/optimizer/util/orclauses.c
index 9aa661c909..1e78028abe 100644
--- a/src/backend/optimizer/util/orclauses.c
+++ b/src/backend/optimizer/util/orclauses.c
@@ -3,7 +3,7 @@
  * orclauses.c
  *	  Routines to extract restriction OR clauses from join OR clauses
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/util/pathnode.c b/src/backend/optimizer/util/pathnode.c
index 26567cb7f6..fe3b4582d4 100644
--- a/src/backend/optimizer/util/pathnode.c
+++ b/src/backend/optimizer/util/pathnode.c
@@ -3,7 +3,7 @@
  * pathnode.c
  *	  Routines to manipulate pathlists and create path nodes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -17,16 +17,21 @@
 #include <math.h>
 
 #include "miscadmin.h"
+#include "foreign/fdwapi.h"
+#include "nodes/extensible.h"
 #include "nodes/nodeFuncs.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/planmain.h"
+#include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
+#include "optimizer/tlist.h"
 #include "optimizer/var.h"
 #include "parser/parsetree.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/selfuncs.h"
 
 
@@ -46,6 +51,11 @@ typedef enum
 #define STD_FUZZ_FACTOR 1.01
 
 static List *translate_sub_tlist(List *tlist, int relid);
+static int	append_total_cost_compare(const void *a, const void *b);
+static int	append_startup_cost_compare(const void *a, const void *b);
+static List *reparameterize_pathlist_by_child(PlannerInfo *root,
+								 List *pathlist,
+								 RelOptInfo *child_rel);
 
 
 /*****************************************************************************
@@ -1200,44 +1210,50 @@ create_tidscan_path(PlannerInfo *root, RelOptInfo *rel, List *tidquals,
  * Note that we must handle subpaths = NIL, representing a dummy access path.
  */
 AppendPath *
-create_append_path(RelOptInfo *rel, List *subpaths, Relids required_outer,
-				   int parallel_workers, List *partitioned_rels)
+create_append_path(RelOptInfo *rel,
+				   List *subpaths, List *partial_subpaths,
+				   Relids required_outer,
+				   int parallel_workers, bool parallel_aware,
+				   List *partitioned_rels, double rows)
 {
 	AppendPath *pathnode = makeNode(AppendPath);
 	ListCell   *l;
 
+	Assert(!parallel_aware || parallel_workers > 0);
+
 	pathnode->path.pathtype = T_Append;
 	pathnode->path.parent = rel;
 	pathnode->path.pathtarget = rel->reltarget;
 	pathnode->path.param_info = get_appendrel_parampathinfo(rel,
 															required_outer);
-	pathnode->path.parallel_aware = false;
+	pathnode->path.parallel_aware = parallel_aware;
 	pathnode->path.parallel_safe = rel->consider_parallel;
 	pathnode->path.parallel_workers = parallel_workers;
 	pathnode->path.pathkeys = NIL;	/* result is always considered unsorted */
 	pathnode->partitioned_rels = list_copy(partitioned_rels);
-	pathnode->subpaths = subpaths;
 
 	/*
-	 * We don't bother with inventing a cost_append(), but just do it here.
-	 *
-	 * Compute rows and costs as sums of subplan rows and costs.  We charge
-	 * nothing extra for the Append itself, which perhaps is too optimistic,
-	 * but since it doesn't do any selection or projection, it is a pretty
-	 * cheap node.
+	 * For parallel append, non-partial paths are sorted by descending total
+	 * costs. That way, the total time to finish all non-partial paths is
+	 * minimized.  Also, the partial paths are sorted by descending startup
+	 * costs.  There may be some paths that require to do startup work by a
+	 * single worker.  In such case, it's better for workers to choose the
+	 * expensive ones first, whereas the leader should choose the cheapest
+	 * startup plan.
 	 */
-	pathnode->path.rows = 0;
-	pathnode->path.startup_cost = 0;
-	pathnode->path.total_cost = 0;
+	if (pathnode->path.parallel_aware)
+	{
+		subpaths = list_qsort(subpaths, append_total_cost_compare);
+		partial_subpaths = list_qsort(partial_subpaths,
+									  append_startup_cost_compare);
+	}
+	pathnode->first_partial_path = list_length(subpaths);
+	pathnode->subpaths = list_concat(subpaths, partial_subpaths);
+
 	foreach(l, subpaths)
 	{
 		Path	   *subpath = (Path *) lfirst(l);
 
-		pathnode->path.rows += subpath->rows;
-
-		if (l == list_head(subpaths))	/* first node? */
-			pathnode->path.startup_cost = subpath->startup_cost;
-		pathnode->path.total_cost += subpath->total_cost;
 		pathnode->path.parallel_safe = pathnode->path.parallel_safe &&
 			subpath->parallel_safe;
 
@@ -1245,9 +1261,59 @@ create_append_path(RelOptInfo *rel, List *subpaths, Relids required_outer,
 		Assert(bms_equal(PATH_REQ_OUTER(subpath), required_outer));
 	}
 
+	Assert(!parallel_aware || pathnode->path.parallel_safe);
+
+	cost_append(pathnode);
+
+	/* If the caller provided a row estimate, override the computed value. */
+	if (rows >= 0)
+		pathnode->path.rows = rows;
+
 	return pathnode;
 }
 
+/*
+ * append_total_cost_compare
+ *	  qsort comparator for sorting append child paths by total_cost descending
+ *
+ * For equal total costs, we fall back to comparing startup costs; if those
+ * are equal too, break ties using bms_compare on the paths' relids.
+ * (This is to avoid getting unpredictable results from qsort.)
+ */
+static int
+append_total_cost_compare(const void *a, const void *b)
+{
+	Path	   *path1 = (Path *) lfirst(*(ListCell **) a);
+	Path	   *path2 = (Path *) lfirst(*(ListCell **) b);
+	int			cmp;
+
+	cmp = compare_path_costs(path1, path2, TOTAL_COST);
+	if (cmp != 0)
+		return -cmp;
+	return bms_compare(path1->parent->relids, path2->parent->relids);
+}
+
+/*
+ * append_startup_cost_compare
+ *	  qsort comparator for sorting append child paths by startup_cost descending
+ *
+ * For equal startup costs, we fall back to comparing total costs; if those
+ * are equal too, break ties using bms_compare on the paths' relids.
+ * (This is to avoid getting unpredictable results from qsort.)
+ */
+static int
+append_startup_cost_compare(const void *a, const void *b)
+{
+	Path	   *path1 = (Path *) lfirst(*(ListCell **) a);
+	Path	   *path2 = (Path *) lfirst(*(ListCell **) b);
+	int			cmp;
+
+	cmp = compare_path_costs(path1, path2, STARTUP_COST);
+	if (cmp != 0)
+		return -cmp;
+	return bms_compare(path1->parent->relids, path2->parent->relids);
+}
+
 /*
  * create_merge_append_path
  *	  Creates a path corresponding to a MergeAppend plan, returning the
@@ -1366,6 +1432,11 @@ create_result_path(PlannerInfo *root, RelOptInfo *rel,
 	pathnode->path.startup_cost = target->cost.startup;
 	pathnode->path.total_cost = target->cost.startup +
 		cpu_tuple_cost + target->cost.per_tuple;
+
+	/*
+	 * Add cost of qual, if any --- but we ignore its selectivity, since our
+	 * rowcount estimate should be 1 no matter what the qual is.
+	 */
 	if (resconstantqual)
 	{
 		QualCost	qual_cost;
@@ -1449,10 +1520,16 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 		return NULL;
 
 	/*
-	 * We must ensure path struct and subsidiary data are allocated in main
-	 * planning context; otherwise GEQO memory management causes trouble.
+	 * When called during GEQO join planning, we are in a short-lived memory
+	 * context.  We must make sure that the path and any subsidiary data
+	 * structures created for a baserel survive the GEQO cycle, else the
+	 * baserel is trashed for future GEQO cycles.  On the other hand, when we
+	 * are creating those for a joinrel during GEQO, we don't want them to
+	 * clutter the main planning context.  Upshot is that the best solution is
+	 * to explicitly allocate memory in the same context the given RelOptInfo
+	 * is in.
 	 */
-	oldcontext = MemoryContextSwitchTo(root->planner_cxt);
+	oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(rel));
 
 	pathnode = makeNode(UniquePath);
 
@@ -1588,6 +1665,7 @@ create_unique_path(PlannerInfo *root, RelOptInfo *rel, Path *subpath,
 			cost_agg(&agg_path, root,
 					 AGG_HASHED, NULL,
 					 numCols, pathnode->path.rows,
+					 NIL,
 					 subpath->startup_cost,
 					 subpath->total_cost,
 					 rel->rows);
@@ -2206,6 +2284,7 @@ create_mergejoin_path(PlannerInfo *root,
  * 'extra' contains various information about the join
  * 'outer_path' is the cheapest outer path
  * 'inner_path' is the cheapest inner path
+ * 'parallel_hash' to select Parallel Hash of inner path (shared hash table)
  * 'restrict_clauses' are the RestrictInfo nodes to apply at the join
  * 'required_outer' is the set of required outer rels
  * 'hashclauses' are the RestrictInfo nodes to use as hash clauses
@@ -2219,6 +2298,7 @@ create_hashjoin_path(PlannerInfo *root,
 					 JoinPathExtraData *extra,
 					 Path *outer_path,
 					 Path *inner_path,
+					 bool parallel_hash,
 					 List *restrict_clauses,
 					 Relids required_outer,
 					 List *hashclauses)
@@ -2236,7 +2316,8 @@ create_hashjoin_path(PlannerInfo *root,
 								  extra->sjinfo,
 								  required_outer,
 								  &restrict_clauses);
-	pathnode->jpath.path.parallel_aware = false;
+	pathnode->jpath.path.parallel_aware =
+		joinrel->consider_parallel && parallel_hash;
 	pathnode->jpath.path.parallel_safe = joinrel->consider_parallel &&
 		outer_path->parallel_safe && inner_path->parallel_safe;
 	/* This is a foolish way to estimate parallel_workers, but for now... */
@@ -2354,9 +2435,9 @@ create_projection_path(PlannerInfo *root,
  * knows that the given path isn't referenced elsewhere and so can be modified
  * in-place.
  *
- * If the input path is a GatherPath, we try to push the new target down to
- * its input as well; this is a yet more invasive modification of the input
- * path, which create_projection_path() can't do.
+ * If the input path is a GatherPath or GatherMergePath, we try to push the
+ * new target down to its input as well; this is a yet more invasive
+ * modification of the input path, which create_projection_path() can't do.
  *
  * Note that we mustn't change the source path's parent link; so when it is
  * add_path'd to "rel" things will be a bit inconsistent.  So far that has
@@ -2393,31 +2474,44 @@ apply_projection_to_path(PlannerInfo *root,
 		(target->cost.per_tuple - oldcost.per_tuple) * path->rows;
 
 	/*
-	 * If the path happens to be a Gather path, we'd like to arrange for the
-	 * subpath to return the required target list so that workers can help
-	 * project.  But if there is something that is not parallel-safe in the
-	 * target expressions, then we can't.
+	 * If the path happens to be a Gather or GatherMerge path, we'd like to
+	 * arrange for the subpath to return the required target list so that
+	 * workers can help project.  But if there is something that is not
+	 * parallel-safe in the target expressions, then we can't.
 	 */
-	if (IsA(path, GatherPath) &&
+	if ((IsA(path, GatherPath) ||IsA(path, GatherMergePath)) &&
 		is_parallel_safe(root, (Node *) target->exprs))
 	{
-		GatherPath *gpath = (GatherPath *) path;
-
 		/*
 		 * We always use create_projection_path here, even if the subpath is
 		 * projection-capable, so as to avoid modifying the subpath in place.
 		 * It seems unlikely at present that there could be any other
 		 * references to the subpath, but better safe than sorry.
 		 *
-		 * Note that we don't change the GatherPath's cost estimates; it might
-		 * be appropriate to do so, to reflect the fact that the bulk of the
-		 * target evaluation will happen in workers.
+		 * Note that we don't change the parallel path's cost estimates; it
+		 * might be appropriate to do so, to reflect the fact that the bulk of
+		 * the target evaluation will happen in workers.
 		 */
-		gpath->subpath = (Path *)
-			create_projection_path(root,
-								   gpath->subpath->parent,
-								   gpath->subpath,
-								   target);
+		if (IsA(path, GatherPath))
+		{
+			GatherPath *gpath = (GatherPath *) path;
+
+			gpath->subpath = (Path *)
+				create_projection_path(root,
+									   gpath->subpath->parent,
+									   gpath->subpath,
+									   target);
+		}
+		else
+		{
+			GatherMergePath *gmpath = (GatherMergePath *) path;
+
+			gmpath->subpath = (Path *)
+				create_projection_path(root,
+									   gmpath->subpath->parent,
+									   gmpath->subpath,
+									   target);
+		}
 	}
 	else if (path->parallel_safe &&
 			 !is_parallel_safe(root, (Node *) target->exprs))
@@ -2584,6 +2678,7 @@ create_group_path(PlannerInfo *root,
 	cost_group(&pathnode->path, root,
 			   list_length(groupClause),
 			   numGroups,
+			   qual,
 			   subpath->startup_cost, subpath->total_cost,
 			   subpath->rows);
 
@@ -2701,6 +2796,7 @@ create_agg_path(PlannerInfo *root,
 	cost_agg(&pathnode->path, root,
 			 aggstrategy, aggcosts,
 			 list_length(groupClause), numGroups,
+			 qual,
 			 subpath->startup_cost, subpath->total_cost,
 			 subpath->rows);
 
@@ -2809,6 +2905,7 @@ create_groupingsets_path(PlannerInfo *root,
 					 agg_costs,
 					 numGroupCols,
 					 rollup->numGroups,
+					 having_qual,
 					 subpath->startup_cost,
 					 subpath->total_cost,
 					 subpath->rows);
@@ -2832,6 +2929,7 @@ create_groupingsets_path(PlannerInfo *root,
 						 agg_costs,
 						 numGroupCols,
 						 rollup->numGroups,
+						 having_qual,
 						 0.0, 0.0,
 						 subpath->rows);
 				if (!rollup->is_hashed)
@@ -2855,6 +2953,7 @@ create_groupingsets_path(PlannerInfo *root,
 						 agg_costs,
 						 numGroupCols,
 						 rollup->numGroups,
+						 having_qual,
 						 sort_path.startup_cost,
 						 sort_path.total_cost,
 						 sort_path.rows);
@@ -2924,6 +3023,19 @@ create_minmaxagg_path(PlannerInfo *root,
 	pathnode->path.total_cost = initplan_cost + target->cost.startup +
 		target->cost.per_tuple + cpu_tuple_cost;
 
+	/*
+	 * Add cost of qual, if any --- but we ignore its selectivity, since our
+	 * rowcount estimate should be 1 no matter what the qual is.
+	 */
+	if (quals)
+	{
+		QualCost	qual_cost;
+
+		cost_qual_eval(&qual_cost, quals, root);
+		pathnode->path.startup_cost += qual_cost.startup;
+		pathnode->path.total_cost += qual_cost.startup + qual_cost.per_tuple;
+	}
+
 	return pathnode;
 }
 
@@ -3162,6 +3274,8 @@ create_lockrows_path(PlannerInfo *root, RelOptInfo *rel,
  * 'partitioned_rels' is an integer list of RT indexes of non-leaf tables in
  *		the partition tree, if this is an UPDATE/DELETE to a partitioned table.
  *		Otherwise NIL.
+ * 'partColsUpdated' is true if any partitioning columns are being updated,
+ *		either from the target relation or a descendent partitioned table.
  * 'resultRelations' is an integer list of actual RT indexes of target rel(s)
  * 'subpaths' is a list of Path(s) producing source data (one per rel)
  * 'subroots' is a list of PlannerInfo structs (one per rel)
@@ -3175,6 +3289,7 @@ ModifyTablePath *
 create_modifytable_path(PlannerInfo *root, RelOptInfo *rel,
 						CmdType operation, bool canSetTag,
 						Index nominalRelation, List *partitioned_rels,
+						bool partColsUpdated,
 						List *resultRelations, List *subpaths,
 						List *subroots,
 						List *withCheckOptionLists, List *returningLists,
@@ -3242,6 +3357,7 @@ create_modifytable_path(PlannerInfo *root, RelOptInfo *rel,
 	pathnode->canSetTag = canSetTag;
 	pathnode->nominalRelation = nominalRelation;
 	pathnode->partitioned_rels = list_copy(partitioned_rels);
+	pathnode->partColsUpdated = partColsUpdated;
 	pathnode->resultRelations = resultRelations;
 	pathnode->subpaths = subpaths;
 	pathnode->subroots = subroots;
@@ -3424,8 +3540,398 @@ reparameterize_path(PlannerInfo *root, Path *path,
 														 spath->path.pathkeys,
 														 required_outer);
 			}
+		case T_Append:
+			{
+				AppendPath *apath = (AppendPath *) path;
+				List	   *childpaths = NIL;
+				List	   *partialpaths = NIL;
+				int			i;
+				ListCell   *lc;
+
+				/* Reparameterize the children */
+				i = 0;
+				foreach(lc, apath->subpaths)
+				{
+					Path	   *spath = (Path *) lfirst(lc);
+
+					spath = reparameterize_path(root, spath,
+												required_outer,
+												loop_count);
+					if (spath == NULL)
+						return NULL;
+					/* We have to re-split the regular and partial paths */
+					if (i < apath->first_partial_path)
+						childpaths = lappend(childpaths, spath);
+					else
+						partialpaths = lappend(partialpaths, spath);
+					i++;
+				}
+				return (Path *)
+					create_append_path(rel, childpaths, partialpaths,
+									   required_outer,
+									   apath->path.parallel_workers,
+									   apath->path.parallel_aware,
+									   apath->partitioned_rels,
+									   -1);
+			}
 		default:
 			break;
 	}
 	return NULL;
 }
+
+/*
+ * reparameterize_path_by_child
+ * 		Given a path parameterized by the parent of the given child relation,
+ * 		translate the path to be parameterized by the given child relation.
+ *
+ * The function creates a new path of the same type as the given path, but
+ * parameterized by the given child relation.  Most fields from the original
+ * path can simply be flat-copied, but any expressions must be adjusted to
+ * refer to the correct varnos, and any paths must be recursively
+ * reparameterized.  Other fields that refer to specific relids also need
+ * adjustment.
+ *
+ * The cost, number of rows, width and parallel path properties depend upon
+ * path->parent, which does not change during the translation. Hence those
+ * members are copied as they are.
+ *
+ * If the given path can not be reparameterized, the function returns NULL.
+ */
+Path *
+reparameterize_path_by_child(PlannerInfo *root, Path *path,
+							 RelOptInfo *child_rel)
+{
+
+#define FLAT_COPY_PATH(newnode, node, nodetype)  \
+	( (newnode) = makeNode(nodetype), \
+	  memcpy((newnode), (node), sizeof(nodetype)) )
+
+#define ADJUST_CHILD_ATTRS(node) \
+	((node) = \
+	 (List *) adjust_appendrel_attrs_multilevel(root, (Node *) (node), \
+												child_rel->relids, \
+												child_rel->top_parent_relids))
+
+#define REPARAMETERIZE_CHILD_PATH(path) \
+do { \
+	(path) = reparameterize_path_by_child(root, (path), child_rel); \
+	if ((path) == NULL) \
+		return NULL; \
+} while(0);
+
+#define REPARAMETERIZE_CHILD_PATH_LIST(pathlist) \
+do { \
+	if ((pathlist) != NIL) \
+	{ \
+		(pathlist) = reparameterize_pathlist_by_child(root, (pathlist), \
+													  child_rel); \
+		if ((pathlist) == NIL) \
+			return NULL; \
+	} \
+} while(0);
+
+	Path	   *new_path;
+	ParamPathInfo *new_ppi;
+	ParamPathInfo *old_ppi;
+	Relids		required_outer;
+
+	/*
+	 * If the path is not parameterized by parent of the given relation, it
+	 * doesn't need reparameterization.
+	 */
+	if (!path->param_info ||
+		!bms_overlap(PATH_REQ_OUTER(path), child_rel->top_parent_relids))
+		return path;
+
+	/* Reparameterize a copy of given path. */
+	switch (nodeTag(path))
+	{
+		case T_Path:
+			FLAT_COPY_PATH(new_path, path, Path);
+			break;
+
+		case T_IndexPath:
+			{
+				IndexPath  *ipath;
+
+				FLAT_COPY_PATH(ipath, path, IndexPath);
+				ADJUST_CHILD_ATTRS(ipath->indexclauses);
+				ADJUST_CHILD_ATTRS(ipath->indexquals);
+				new_path = (Path *) ipath;
+			}
+			break;
+
+		case T_BitmapHeapPath:
+			{
+				BitmapHeapPath *bhpath;
+
+				FLAT_COPY_PATH(bhpath, path, BitmapHeapPath);
+				REPARAMETERIZE_CHILD_PATH(bhpath->bitmapqual);
+				new_path = (Path *) bhpath;
+			}
+			break;
+
+		case T_BitmapAndPath:
+			{
+				BitmapAndPath *bapath;
+
+				FLAT_COPY_PATH(bapath, path, BitmapAndPath);
+				REPARAMETERIZE_CHILD_PATH_LIST(bapath->bitmapquals);
+				new_path = (Path *) bapath;
+			}
+			break;
+
+		case T_BitmapOrPath:
+			{
+				BitmapOrPath *bopath;
+
+				FLAT_COPY_PATH(bopath, path, BitmapOrPath);
+				REPARAMETERIZE_CHILD_PATH_LIST(bopath->bitmapquals);
+				new_path = (Path *) bopath;
+			}
+			break;
+
+		case T_TidPath:
+			{
+				TidPath    *tpath;
+
+				/*
+				 * TidPath contains tidquals, which do not contain any
+				 * external parameters per create_tidscan_path(). So don't
+				 * bother to translate those.
+				 */
+				FLAT_COPY_PATH(tpath, path, TidPath);
+				new_path = (Path *) tpath;
+			}
+			break;
+
+		case T_ForeignPath:
+			{
+				ForeignPath *fpath;
+				ReparameterizeForeignPathByChild_function rfpc_func;
+
+				FLAT_COPY_PATH(fpath, path, ForeignPath);
+				if (fpath->fdw_outerpath)
+					REPARAMETERIZE_CHILD_PATH(fpath->fdw_outerpath);
+
+				/* Hand over to FDW if needed. */
+				rfpc_func =
+					path->parent->fdwroutine->ReparameterizeForeignPathByChild;
+				if (rfpc_func)
+					fpath->fdw_private = rfpc_func(root, fpath->fdw_private,
+												   child_rel);
+				new_path = (Path *) fpath;
+			}
+			break;
+
+		case T_CustomPath:
+			{
+				CustomPath *cpath;
+
+				FLAT_COPY_PATH(cpath, path, CustomPath);
+				REPARAMETERIZE_CHILD_PATH_LIST(cpath->custom_paths);
+				if (cpath->methods &&
+					cpath->methods->ReparameterizeCustomPathByChild)
+					cpath->custom_private =
+						cpath->methods->ReparameterizeCustomPathByChild(root,
+																		cpath->custom_private,
+																		child_rel);
+				new_path = (Path *) cpath;
+			}
+			break;
+
+		case T_NestPath:
+			{
+				JoinPath   *jpath;
+
+				FLAT_COPY_PATH(jpath, path, NestPath);
+
+				REPARAMETERIZE_CHILD_PATH(jpath->outerjoinpath);
+				REPARAMETERIZE_CHILD_PATH(jpath->innerjoinpath);
+				ADJUST_CHILD_ATTRS(jpath->joinrestrictinfo);
+				new_path = (Path *) jpath;
+			}
+			break;
+
+		case T_MergePath:
+			{
+				JoinPath   *jpath;
+				MergePath  *mpath;
+
+				FLAT_COPY_PATH(mpath, path, MergePath);
+
+				jpath = (JoinPath *) mpath;
+				REPARAMETERIZE_CHILD_PATH(jpath->outerjoinpath);
+				REPARAMETERIZE_CHILD_PATH(jpath->innerjoinpath);
+				ADJUST_CHILD_ATTRS(jpath->joinrestrictinfo);
+				ADJUST_CHILD_ATTRS(mpath->path_mergeclauses);
+				new_path = (Path *) mpath;
+			}
+			break;
+
+		case T_HashPath:
+			{
+				JoinPath   *jpath;
+				HashPath   *hpath;
+
+				FLAT_COPY_PATH(hpath, path, HashPath);
+
+				jpath = (JoinPath *) hpath;
+				REPARAMETERIZE_CHILD_PATH(jpath->outerjoinpath);
+				REPARAMETERIZE_CHILD_PATH(jpath->innerjoinpath);
+				ADJUST_CHILD_ATTRS(jpath->joinrestrictinfo);
+				ADJUST_CHILD_ATTRS(hpath->path_hashclauses);
+				new_path = (Path *) hpath;
+			}
+			break;
+
+		case T_AppendPath:
+			{
+				AppendPath *apath;
+
+				FLAT_COPY_PATH(apath, path, AppendPath);
+				REPARAMETERIZE_CHILD_PATH_LIST(apath->subpaths);
+				new_path = (Path *) apath;
+			}
+			break;
+
+		case T_MergeAppend:
+			{
+				MergeAppendPath *mapath;
+
+				FLAT_COPY_PATH(mapath, path, MergeAppendPath);
+				REPARAMETERIZE_CHILD_PATH_LIST(mapath->subpaths);
+				new_path = (Path *) mapath;
+			}
+			break;
+
+		case T_MaterialPath:
+			{
+				MaterialPath *mpath;
+
+				FLAT_COPY_PATH(mpath, path, MaterialPath);
+				REPARAMETERIZE_CHILD_PATH(mpath->subpath);
+				new_path = (Path *) mpath;
+			}
+			break;
+
+		case T_UniquePath:
+			{
+				UniquePath *upath;
+
+				FLAT_COPY_PATH(upath, path, UniquePath);
+				REPARAMETERIZE_CHILD_PATH(upath->subpath);
+				ADJUST_CHILD_ATTRS(upath->uniq_exprs);
+				new_path = (Path *) upath;
+			}
+			break;
+
+		case T_GatherPath:
+			{
+				GatherPath *gpath;
+
+				FLAT_COPY_PATH(gpath, path, GatherPath);
+				REPARAMETERIZE_CHILD_PATH(gpath->subpath);
+				new_path = (Path *) gpath;
+			}
+			break;
+
+		case T_GatherMergePath:
+			{
+				GatherMergePath *gmpath;
+
+				FLAT_COPY_PATH(gmpath, path, GatherMergePath);
+				REPARAMETERIZE_CHILD_PATH(gmpath->subpath);
+				new_path = (Path *) gmpath;
+			}
+			break;
+
+		default:
+
+			/* We don't know how to reparameterize this path. */
+			return NULL;
+	}
+
+	/*
+	 * Adjust the parameterization information, which refers to the topmost
+	 * parent. The topmost parent can be multiple levels away from the given
+	 * child, hence use multi-level expression adjustment routines.
+	 */
+	old_ppi = new_path->param_info;
+	required_outer =
+		adjust_child_relids_multilevel(root, old_ppi->ppi_req_outer,
+									   child_rel->relids,
+									   child_rel->top_parent_relids);
+
+	/* If we already have a PPI for this parameterization, just return it */
+	new_ppi = find_param_path_info(new_path->parent, required_outer);
+
+	/*
+	 * If not, build a new one and link it to the list of PPIs. For the same
+	 * reason as explained in mark_dummy_rel(), allocate new PPI in the same
+	 * context the given RelOptInfo is in.
+	 */
+	if (new_ppi == NULL)
+	{
+		MemoryContext oldcontext;
+		RelOptInfo *rel = path->parent;
+
+		oldcontext = MemoryContextSwitchTo(GetMemoryChunkContext(rel));
+
+		new_ppi = makeNode(ParamPathInfo);
+		new_ppi->ppi_req_outer = bms_copy(required_outer);
+		new_ppi->ppi_rows = old_ppi->ppi_rows;
+		new_ppi->ppi_clauses = old_ppi->ppi_clauses;
+		ADJUST_CHILD_ATTRS(new_ppi->ppi_clauses);
+		rel->ppilist = lappend(rel->ppilist, new_ppi);
+
+		MemoryContextSwitchTo(oldcontext);
+	}
+	bms_free(required_outer);
+
+	new_path->param_info = new_ppi;
+
+	/*
+	 * Adjust the path target if the parent of the outer relation is
+	 * referenced in the targetlist. This can happen when only the parent of
+	 * outer relation is laterally referenced in this relation.
+	 */
+	if (bms_overlap(path->parent->lateral_relids,
+					child_rel->top_parent_relids))
+	{
+		new_path->pathtarget = copy_pathtarget(new_path->pathtarget);
+		ADJUST_CHILD_ATTRS(new_path->pathtarget->exprs);
+	}
+
+	return new_path;
+}
+
+/*
+ * reparameterize_pathlist_by_child
+ * 		Helper function to reparameterize a list of paths by given child rel.
+ */
+static List *
+reparameterize_pathlist_by_child(PlannerInfo *root,
+								 List *pathlist,
+								 RelOptInfo *child_rel)
+{
+	ListCell   *lc;
+	List	   *result = NIL;
+
+	foreach(lc, pathlist)
+	{
+		Path	   *path = reparameterize_path_by_child(root, lfirst(lc),
+														child_rel);
+
+		if (path == NULL)
+		{
+			list_free(result);
+			return NIL;
+		}
+
+		result = lappend(result, path);
+	}
+
+	return result;
+}
diff --git a/src/backend/optimizer/util/placeholder.c b/src/backend/optimizer/util/placeholder.c
index 970542dde5..c79d0f25d4 100644
--- a/src/backend/optimizer/util/placeholder.c
+++ b/src/backend/optimizer/util/placeholder.c
@@ -4,7 +4,7 @@
  *	  PlaceHolderVar and PlaceHolderInfo manipulation routines
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -20,6 +20,7 @@
 #include "optimizer/pathnode.h"
 #include "optimizer/placeholder.h"
 #include "optimizer/planmain.h"
+#include "optimizer/prep.h"
 #include "optimizer/var.h"
 #include "utils/lsyscache.h"
 
@@ -62,7 +63,7 @@ make_placeholder_expr(PlannerInfo *root, Expr *expr, Relids phrels)
  * simplified query passed to query_planner().
  *
  * Note: this should only be called after query_planner() has started.  Also,
- * create_new_ph must not be TRUE after deconstruct_jointree begins, because
+ * create_new_ph must not be true after deconstruct_jointree begins, because
  * make_outerjoininfo assumes that we already know about all placeholders.
  */
 PlaceHolderInfo *
@@ -414,6 +415,10 @@ add_placeholders_to_joinrel(PlannerInfo *root, RelOptInfo *joinrel,
 	Relids		relids = joinrel->relids;
 	ListCell   *lc;
 
+	/* This function is called only on the parent relations. */
+	Assert(!IS_OTHER_REL(joinrel) && !IS_OTHER_REL(outer_rel) &&
+		   !IS_OTHER_REL(inner_rel));
+
 	foreach(lc, root->placeholder_list)
 	{
 		PlaceHolderInfo *phinfo = (PlaceHolderInfo *) lfirst(lc);
@@ -459,3 +464,56 @@ add_placeholders_to_joinrel(PlannerInfo *root, RelOptInfo *joinrel,
 		}
 	}
 }
+
+/*
+ * add_placeholders_to_child_joinrel
+ *		Translate the PHVs in parent's targetlist and add them to the child's
+ *		targetlist. Also adjust the cost
+ */
+void
+add_placeholders_to_child_joinrel(PlannerInfo *root, RelOptInfo *childrel,
+								  RelOptInfo *parentrel)
+{
+	ListCell   *lc;
+	AppendRelInfo **appinfos;
+	int			nappinfos;
+
+	Assert(IS_JOIN_REL(childrel) && IS_JOIN_REL(parentrel));
+	Assert(IS_OTHER_REL(childrel));
+
+	/* Nothing to do if no PHVs. */
+	if (root->placeholder_list == NIL)
+		return;
+
+	appinfos = find_appinfos_by_relids(root, childrel->relids, &nappinfos);
+	foreach(lc, parentrel->reltarget->exprs)
+	{
+		PlaceHolderVar *phv = lfirst(lc);
+
+		if (IsA(phv, PlaceHolderVar))
+		{
+			/*
+			 * In case the placeholder Var refers to any of the parent
+			 * relations, translate it to refer to the corresponding child.
+			 */
+			if (bms_overlap(phv->phrels, parentrel->relids) &&
+				childrel->reloptkind == RELOPT_OTHER_JOINREL)
+			{
+				phv = (PlaceHolderVar *) adjust_appendrel_attrs(root,
+																(Node *) phv,
+																nappinfos,
+																appinfos);
+			}
+
+			childrel->reltarget->exprs = lappend(childrel->reltarget->exprs,
+												 phv);
+		}
+	}
+
+	/* Adjust the cost and width of child targetlist. */
+	childrel->reltarget->cost.startup = parentrel->reltarget->cost.startup;
+	childrel->reltarget->cost.per_tuple = parentrel->reltarget->cost.per_tuple;
+	childrel->reltarget->width = parentrel->reltarget->width;
+
+	pfree(appinfos);
+}
diff --git a/src/backend/optimizer/util/plancat.c b/src/backend/optimizer/util/plancat.c
index dc0b0b0706..60f21711f4 100644
--- a/src/backend/optimizer/util/plancat.c
+++ b/src/backend/optimizer/util/plancat.c
@@ -4,7 +4,7 @@
  *	   routines for accessing the system catalogs
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -68,6 +68,11 @@ static List *get_relation_constraints(PlannerInfo *root,
 static List *build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
 				  Relation heapRelation);
 static List *get_relation_statistics(RelOptInfo *rel, Relation relation);
+static void set_relation_partition_info(PlannerInfo *root, RelOptInfo *rel,
+							Relation relation);
+static PartitionScheme find_partition_scheme(PlannerInfo *root, Relation rel);
+static void set_baserel_partition_key_exprs(Relation relation,
+								RelOptInfo *rel);
 
 /*
  * get_relation_info -
@@ -202,6 +207,16 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 				continue;
 			}
 
+			/*
+			 * Ignore partitioned indexes, since they are not usable for
+			 * queries.
+			 */
+			if (indexRelation->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
+			{
+				index_close(indexRelation, NoLock);
+				continue;
+			}
+
 			/*
 			 * If the index is valid, but cannot yet be used, ignore it; but
 			 * mark the plan we are generating as transient. See
@@ -420,6 +435,13 @@ get_relation_info(PlannerInfo *root, Oid relationObjectId, bool inhparent,
 	/* Collect info about relation's foreign keys, if relevant */
 	get_relation_foreign_keys(root, rel, relation, inhparent);
 
+	/*
+	 * Collect info about relation's partitioning scheme, if any. Only
+	 * inheritance parents may be partitioned.
+	 */
+	if (inhparent && relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+		set_relation_partition_info(root, rel, relation);
+
 	heap_close(relation, NoLock);
 
 	/*
@@ -1072,7 +1094,7 @@ get_rel_data_width(Relation rel, int32 *attr_widths)
 
 	for (i = 1; i <= RelationGetNumberOfAttributes(rel); i++)
 	{
-		Form_pg_attribute att = rel->rd_att->attrs[i - 1];
+		Form_pg_attribute att = TupleDescAttr(rel->rd_att, i - 1);
 		int32		item_width;
 
 		if (att->attisdropped)
@@ -1208,7 +1230,7 @@ get_relation_constraints(PlannerInfo *root,
 
 			for (i = 1; i <= natts; i++)
 			{
-				Form_pg_attribute att = relation->rd_att->attrs[i - 1];
+				Form_pg_attribute att = TupleDescAttr(relation->rd_att, i - 1);
 
 				if (att->attnotnull && !att->attisdropped)
 				{
@@ -1402,8 +1424,18 @@ relation_excluded_by_constraints(PlannerInfo *root,
 	if (predicate_refuted_by(safe_restrictions, safe_restrictions, false))
 		return true;
 
-	/* Only plain relations have constraints */
-	if (rte->rtekind != RTE_RELATION || rte->inh)
+	/*
+	 * Only plain relations have constraints.  In a partitioning hierarchy,
+	 * but not with regular table inheritance, it's OK to assume that any
+	 * constraints that hold for the parent also hold for every child; for
+	 * instance, table inheritance allows the parent to have constraints
+	 * marked NO INHERIT, but table partitioning does not.  We choose to check
+	 * whether the partitioning parents can be excluded here; doing so
+	 * consumes some cycles, but potentially saves us the work of excluding
+	 * each child individually.
+	 */
+	if (rte->rtekind != RTE_RELATION ||
+		(rte->inh && rte->relkind != RELKIND_PARTITIONED_TABLE))
 		return false;
 
 	/*
@@ -1489,7 +1521,8 @@ build_physical_tlist(PlannerInfo *root, RelOptInfo *rel)
 			numattrs = RelationGetNumberOfAttributes(relation);
 			for (attrno = 1; attrno <= numattrs; attrno++)
 			{
-				Form_pg_attribute att_tup = relation->rd_att->attrs[attrno - 1];
+				Form_pg_attribute att_tup = TupleDescAttr(relation->rd_att,
+														  attrno - 1);
 
 				if (att_tup->attisdropped)
 				{
@@ -1609,7 +1642,7 @@ build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
 				att_tup = SystemAttributeDefinition(indexkey,
 													heapRelation->rd_rel->relhasoids);
 			else
-				att_tup = heapRelation->rd_att->attrs[indexkey - 1];
+				att_tup = TupleDescAttr(heapRelation->rd_att, indexkey - 1);
 
 			indexvar = (Expr *) makeVar(varno,
 										indexkey,
@@ -1801,3 +1834,179 @@ has_row_triggers(PlannerInfo *root, Index rti, CmdType event)
 	heap_close(relation, NoLock);
 	return result;
 }
+
+/*
+ * set_relation_partition_info
+ *
+ * Set partitioning scheme and related information for a partitioned table.
+ */
+static void
+set_relation_partition_info(PlannerInfo *root, RelOptInfo *rel,
+							Relation relation)
+{
+	PartitionDesc partdesc;
+	PartitionKey partkey;
+
+	Assert(relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
+
+	partdesc = RelationGetPartitionDesc(relation);
+	partkey = RelationGetPartitionKey(relation);
+	rel->part_scheme = find_partition_scheme(root, relation);
+	Assert(partdesc != NULL && rel->part_scheme != NULL);
+	rel->boundinfo = partition_bounds_copy(partdesc->boundinfo, partkey);
+	rel->nparts = partdesc->nparts;
+	set_baserel_partition_key_exprs(relation, rel);
+}
+
+/*
+ * find_partition_scheme
+ *
+ * Find or create a PartitionScheme for this Relation.
+ */
+static PartitionScheme
+find_partition_scheme(PlannerInfo *root, Relation relation)
+{
+	PartitionKey partkey = RelationGetPartitionKey(relation);
+	ListCell   *lc;
+	int			partnatts;
+	PartitionScheme part_scheme;
+
+	/* A partitioned table should have a partition key. */
+	Assert(partkey != NULL);
+
+	partnatts = partkey->partnatts;
+
+	/* Search for a matching partition scheme and return if found one. */
+	foreach(lc, root->part_schemes)
+	{
+		part_scheme = lfirst(lc);
+
+		/* Match partitioning strategy and number of keys. */
+		if (partkey->strategy != part_scheme->strategy ||
+			partnatts != part_scheme->partnatts)
+			continue;
+
+		/* Match the partition key types. */
+		if (memcmp(partkey->partopfamily, part_scheme->partopfamily,
+				   sizeof(Oid) * partnatts) != 0 ||
+			memcmp(partkey->partopcintype, part_scheme->partopcintype,
+				   sizeof(Oid) * partnatts) != 0 ||
+			memcmp(partkey->parttypcoll, part_scheme->parttypcoll,
+				   sizeof(Oid) * partnatts) != 0)
+			continue;
+
+		/*
+		 * Length and byval information should match when partopcintype
+		 * matches.
+		 */
+		Assert(memcmp(partkey->parttyplen, part_scheme->parttyplen,
+					  sizeof(int16) * partnatts) == 0);
+		Assert(memcmp(partkey->parttypbyval, part_scheme->parttypbyval,
+					  sizeof(bool) * partnatts) == 0);
+
+		/* Found matching partition scheme. */
+		return part_scheme;
+	}
+
+	/*
+	 * Did not find matching partition scheme. Create one copying relevant
+	 * information from the relcache. We need to copy the contents of the
+	 * array since the relcache entry may not survive after we have closed the
+	 * relation.
+	 */
+	part_scheme = (PartitionScheme) palloc0(sizeof(PartitionSchemeData));
+	part_scheme->strategy = partkey->strategy;
+	part_scheme->partnatts = partkey->partnatts;
+
+	part_scheme->partopfamily = (Oid *) palloc(sizeof(Oid) * partnatts);
+	memcpy(part_scheme->partopfamily, partkey->partopfamily,
+		   sizeof(Oid) * partnatts);
+
+	part_scheme->partopcintype = (Oid *) palloc(sizeof(Oid) * partnatts);
+	memcpy(part_scheme->partopcintype, partkey->partopcintype,
+		   sizeof(Oid) * partnatts);
+
+	part_scheme->parttypcoll = (Oid *) palloc(sizeof(Oid) * partnatts);
+	memcpy(part_scheme->parttypcoll, partkey->parttypcoll,
+		   sizeof(Oid) * partnatts);
+
+	part_scheme->parttyplen = (int16 *) palloc(sizeof(int16) * partnatts);
+	memcpy(part_scheme->parttyplen, partkey->parttyplen,
+		   sizeof(int16) * partnatts);
+
+	part_scheme->parttypbyval = (bool *) palloc(sizeof(bool) * partnatts);
+	memcpy(part_scheme->parttypbyval, partkey->parttypbyval,
+		   sizeof(bool) * partnatts);
+
+	/* Add the partitioning scheme to PlannerInfo. */
+	root->part_schemes = lappend(root->part_schemes, part_scheme);
+
+	return part_scheme;
+}
+
+/*
+ * set_baserel_partition_key_exprs
+ *
+ * Builds partition key expressions for the given base relation and sets them
+ * in given RelOptInfo.  Any single column partition keys are converted to Var
+ * nodes.  All Var nodes are restamped with the relid of given relation.
+ */
+static void
+set_baserel_partition_key_exprs(Relation relation,
+								RelOptInfo *rel)
+{
+	PartitionKey partkey = RelationGetPartitionKey(relation);
+	int			partnatts;
+	int			cnt;
+	List	  **partexprs;
+	ListCell   *lc;
+	Index		varno = rel->relid;
+
+	Assert(IS_SIMPLE_REL(rel) && rel->relid > 0);
+
+	/* A partitioned table should have a partition key. */
+	Assert(partkey != NULL);
+
+	partnatts = partkey->partnatts;
+	partexprs = (List **) palloc(sizeof(List *) * partnatts);
+	lc = list_head(partkey->partexprs);
+
+	for (cnt = 0; cnt < partnatts; cnt++)
+	{
+		Expr	   *partexpr;
+		AttrNumber	attno = partkey->partattrs[cnt];
+
+		if (attno != InvalidAttrNumber)
+		{
+			/* Single column partition key is stored as a Var node. */
+			Assert(attno > 0);
+
+			partexpr = (Expr *) makeVar(varno, attno,
+										partkey->parttypid[cnt],
+										partkey->parttypmod[cnt],
+										partkey->parttypcoll[cnt], 0);
+		}
+		else
+		{
+			if (lc == NULL)
+				elog(ERROR, "wrong number of partition key expressions");
+
+			/* Re-stamp the expression with given varno. */
+			partexpr = (Expr *) copyObject(lfirst(lc));
+			ChangeVarNodes((Node *) partexpr, 1, varno, 0);
+			lc = lnext(lc);
+		}
+
+		partexprs[cnt] = list_make1(partexpr);
+	}
+
+	rel->partexprs = partexprs;
+
+	/*
+	 * A base relation can not have nullable partition key expressions. We
+	 * still allocate array of empty expressions lists to keep partition key
+	 * expression handling code simple. See build_joinrel_partition_info() and
+	 * match_expr_to_partition_keys().
+	 */
+	rel->nullable_partexprs = (List **) palloc0(sizeof(List *) * partnatts);
+}
diff --git a/src/backend/optimizer/util/predtest.c b/src/backend/optimizer/util/predtest.c
index 536d24b698..8106010329 100644
--- a/src/backend/optimizer/util/predtest.c
+++ b/src/backend/optimizer/util/predtest.c
@@ -4,7 +4,7 @@
  *	  Routines to attempt to prove logical implications between predicate
  *	  expressions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1048,7 +1048,7 @@ arrayexpr_cleanup_fn(PredIterInfo info)
  *	  Does the predicate implication test for a "simple clause" predicate
  *	  and a "simple clause" restriction.
  *
- * We return TRUE if able to prove the implication, FALSE if not.
+ * We return true if able to prove the implication, false if not.
  *
  * We have three strategies for determining whether one simple clause
  * implies another:
@@ -1116,7 +1116,7 @@ predicate_implied_by_simple_clause(Expr *predicate, Node *clause,
  *	  Does the predicate refutation test for a "simple clause" predicate
  *	  and a "simple clause" restriction.
  *
- * We return TRUE if able to prove the refutation, FALSE if not.
+ * We return true if able to prove the refutation, false if not.
  *
  * Unlike the implication case, checking for equal() clauses isn't
  * helpful.
@@ -1360,12 +1360,12 @@ static const bool BT_implies_table[6][6] = {
  *			The predicate operator:
  *	 LT    LE	 EQ    GE	 GT    NE
  */
-	{TRUE, TRUE, none, none, none, TRUE},	/* LT */
-	{none, TRUE, none, none, none, none},	/* LE */
-	{none, TRUE, TRUE, TRUE, none, none},	/* EQ */
-	{none, none, none, TRUE, none, none},	/* GE */
-	{none, none, none, TRUE, TRUE, TRUE},	/* GT */
-	{none, none, none, none, none, TRUE}	/* NE */
+	{true, true, none, none, none, true},	/* LT */
+	{none, true, none, none, none, none},	/* LE */
+	{none, true, true, true, none, none},	/* EQ */
+	{none, none, none, true, none, none},	/* GE */
+	{none, none, none, true, true, true},	/* GT */
+	{none, none, none, none, none, true}	/* NE */
 };
 
 static const bool BT_refutes_table[6][6] = {
@@ -1373,12 +1373,12 @@ static const bool BT_refutes_table[6][6] = {
  *			The predicate operator:
  *	 LT    LE	 EQ    GE	 GT    NE
  */
-	{none, none, TRUE, TRUE, TRUE, none},	/* LT */
-	{none, none, none, none, TRUE, none},	/* LE */
-	{TRUE, none, none, none, TRUE, TRUE},	/* EQ */
-	{TRUE, none, none, none, none, none},	/* GE */
-	{TRUE, TRUE, TRUE, none, none, none},	/* GT */
-	{none, none, TRUE, none, none, none}	/* NE */
+	{none, none, true, true, true, none},	/* LT */
+	{none, none, none, none, true, none},	/* LE */
+	{true, none, none, none, true, true},	/* EQ */
+	{true, none, none, none, none, none},	/* GE */
+	{true, true, true, none, none, none},	/* GT */
+	{none, none, true, none, none, none}	/* NE */
 };
 
 static const StrategyNumber BT_implic_table[6][6] = {
@@ -1417,7 +1417,7 @@ static const StrategyNumber BT_refute_table[6][6] = {
  * When refute_it == false, we want to prove the predicate true;
  * when refute_it == true, we want to prove the predicate false.
  * (There is enough common code to justify handling these two cases
- * in one routine.)  We return TRUE if able to make the proof, FALSE
+ * in one routine.)  We return true if able to make the proof, false
  * if not able to prove it.
  *
  * We can make proofs involving several expression forms (here "foo" and "bar"
@@ -1661,7 +1661,7 @@ operator_predicate_proof(Expr *predicate, Node *clause, bool refute_it)
  *	  Assuming that EXPR1 clause_op EXPR2 is true, try to prove or refute
  *	  EXPR1 pred_op EXPR2.
  *
- * Return TRUE if able to make the proof, false if not able to prove it.
+ * Return true if able to make the proof, false if not able to prove it.
  */
 static bool
 operator_same_subexprs_proof(Oid pred_op, Oid clause_op, bool refute_it)
diff --git a/src/backend/optimizer/util/relnode.c b/src/backend/optimizer/util/relnode.c
index 8ad0b4a669..da8f0f93fc 100644
--- a/src/backend/optimizer/util/relnode.c
+++ b/src/backend/optimizer/util/relnode.c
@@ -3,7 +3,7 @@
  * relnode.c
  *	  Relation-node lookup/construction routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -17,12 +17,14 @@
 #include <limits.h>
 
 #include "miscadmin.h"
+#include "catalog/partition.h"
 #include "optimizer/clauses.h"
 #include "optimizer/cost.h"
 #include "optimizer/pathnode.h"
 #include "optimizer/paths.h"
 #include "optimizer/placeholder.h"
 #include "optimizer/plancat.h"
+#include "optimizer/prep.h"
 #include "optimizer/restrictinfo.h"
 #include "optimizer/tlist.h"
 #include "utils/hsearch.h"
@@ -52,6 +54,9 @@ static List *subbuild_joinrel_joinlist(RelOptInfo *joinrel,
 static void set_foreign_rel_properties(RelOptInfo *joinrel,
 						   RelOptInfo *outer_rel, RelOptInfo *inner_rel);
 static void add_join_rel(PlannerInfo *root, RelOptInfo *joinrel);
+static void build_joinrel_partition_info(RelOptInfo *joinrel,
+							 RelOptInfo *outer_rel, RelOptInfo *inner_rel,
+							 List *restrictlist, JoinType jointype);
 
 
 /*
@@ -146,6 +151,12 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
 	rel->baserestrict_min_security = UINT_MAX;
 	rel->joininfo = NIL;
 	rel->has_eclass_joins = false;
+	rel->part_scheme = NULL;
+	rel->nparts = 0;
+	rel->boundinfo = NULL;
+	rel->part_rels = NULL;
+	rel->partexprs = NULL;
+	rel->nullable_partexprs = NULL;
 
 	/*
 	 * Pass top parent's relids down the inheritance hierarchy. If the parent
@@ -178,8 +189,8 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
 		case RTE_NAMEDTUPLESTORE:
 
 			/*
-			 * Subquery, function, tablefunc, or values list --- set up attr
-			 * range and arrays
+			 * Subquery, function, tablefunc, values list, CTE, or ENR --- set
+			 * up attr range and arrays
 			 *
 			 * Note: 0 is included in range to support whole-row Vars
 			 */
@@ -218,18 +229,41 @@ build_simple_rel(PlannerInfo *root, int relid, RelOptInfo *parent)
 	if (rte->inh)
 	{
 		ListCell   *l;
+		int			nparts = rel->nparts;
+		int			cnt_parts = 0;
+
+		if (nparts > 0)
+			rel->part_rels = (RelOptInfo **)
+				palloc(sizeof(RelOptInfo *) * nparts);
 
 		foreach(l, root->append_rel_list)
 		{
 			AppendRelInfo *appinfo = (AppendRelInfo *) lfirst(l);
+			RelOptInfo *childrel;
 
 			/* append_rel_list contains all append rels; ignore others */
 			if (appinfo->parent_relid != relid)
 				continue;
 
-			(void) build_simple_rel(root, appinfo->child_relid,
-									rel);
+			childrel = build_simple_rel(root, appinfo->child_relid,
+										rel);
+
+			/* Nothing more to do for an unpartitioned table. */
+			if (!rel->part_scheme)
+				continue;
+
+			/*
+			 * The order of partition OIDs in append_rel_list is the same as
+			 * the order in the PartitionDesc, so the order of part_rels will
+			 * also match the PartitionDesc.  See expand_partitioned_rtentry.
+			 */
+			Assert(cnt_parts < nparts);
+			rel->part_rels[cnt_parts] = childrel;
+			cnt_parts++;
 		}
+
+		/* We should have seen all the child partitions. */
+		Assert(cnt_parts == nparts);
 	}
 
 	return rel;
@@ -453,6 +487,9 @@ build_join_rel(PlannerInfo *root,
 	RelOptInfo *joinrel;
 	List	   *restrictlist;
 
+	/* This function should be used only for join between parents. */
+	Assert(!IS_OTHER_REL(outer_rel) && !IS_OTHER_REL(inner_rel));
+
 	/*
 	 * See if we already have a joinrel for this set of base rels.
 	 */
@@ -527,6 +564,12 @@ build_join_rel(PlannerInfo *root,
 	joinrel->joininfo = NIL;
 	joinrel->has_eclass_joins = false;
 	joinrel->top_parent_relids = NULL;
+	joinrel->part_scheme = NULL;
+	joinrel->nparts = 0;
+	joinrel->boundinfo = NULL;
+	joinrel->part_rels = NULL;
+	joinrel->partexprs = NULL;
+	joinrel->nullable_partexprs = NULL;
 
 	/* Compute information relevant to the foreign relations. */
 	set_foreign_rel_properties(joinrel, outer_rel, inner_rel);
@@ -572,6 +615,10 @@ build_join_rel(PlannerInfo *root,
 	 */
 	joinrel->has_eclass_joins = has_relevant_eclass_joinclause(root, joinrel);
 
+	/* Store the partition information. */
+	build_joinrel_partition_info(joinrel, outer_rel, inner_rel, restrictlist,
+								 sjinfo->jointype);
+
 	/*
 	 * Set estimates of the joinrel's size.
 	 */
@@ -617,6 +664,137 @@ build_join_rel(PlannerInfo *root,
 	return joinrel;
 }
 
+/*
+ * build_child_join_rel
+ *	  Builds RelOptInfo representing join between given two child relations.
+ *
+ * 'outer_rel' and 'inner_rel' are the RelOptInfos of child relations being
+ *		joined
+ * 'parent_joinrel' is the RelOptInfo representing the join between parent
+ *		relations. Some of the members of new RelOptInfo are produced by
+ *		translating corresponding members of this RelOptInfo
+ * 'sjinfo': child-join context info
+ * 'restrictlist': list of RestrictInfo nodes that apply to this particular
+ *		pair of joinable relations
+ * 'jointype' is the join type (inner, left, full, etc)
+ */
+RelOptInfo *
+build_child_join_rel(PlannerInfo *root, RelOptInfo *outer_rel,
+					 RelOptInfo *inner_rel, RelOptInfo *parent_joinrel,
+					 List *restrictlist, SpecialJoinInfo *sjinfo,
+					 JoinType jointype)
+{
+	RelOptInfo *joinrel = makeNode(RelOptInfo);
+	AppendRelInfo **appinfos;
+	int			nappinfos;
+
+	/* Only joins between "other" relations land here. */
+	Assert(IS_OTHER_REL(outer_rel) && IS_OTHER_REL(inner_rel));
+
+	joinrel->reloptkind = RELOPT_OTHER_JOINREL;
+	joinrel->relids = bms_union(outer_rel->relids, inner_rel->relids);
+	joinrel->rows = 0;
+	/* cheap startup cost is interesting iff not all tuples to be retrieved */
+	joinrel->consider_startup = (root->tuple_fraction > 0);
+	joinrel->consider_param_startup = false;
+	joinrel->consider_parallel = false;
+	joinrel->reltarget = create_empty_pathtarget();
+	joinrel->pathlist = NIL;
+	joinrel->ppilist = NIL;
+	joinrel->partial_pathlist = NIL;
+	joinrel->cheapest_startup_path = NULL;
+	joinrel->cheapest_total_path = NULL;
+	joinrel->cheapest_unique_path = NULL;
+	joinrel->cheapest_parameterized_paths = NIL;
+	joinrel->direct_lateral_relids = NULL;
+	joinrel->lateral_relids = NULL;
+	joinrel->relid = 0;			/* indicates not a baserel */
+	joinrel->rtekind = RTE_JOIN;
+	joinrel->min_attr = 0;
+	joinrel->max_attr = 0;
+	joinrel->attr_needed = NULL;
+	joinrel->attr_widths = NULL;
+	joinrel->lateral_vars = NIL;
+	joinrel->lateral_referencers = NULL;
+	joinrel->indexlist = NIL;
+	joinrel->pages = 0;
+	joinrel->tuples = 0;
+	joinrel->allvisfrac = 0;
+	joinrel->subroot = NULL;
+	joinrel->subplan_params = NIL;
+	joinrel->serverid = InvalidOid;
+	joinrel->userid = InvalidOid;
+	joinrel->useridiscurrent = false;
+	joinrel->fdwroutine = NULL;
+	joinrel->fdw_private = NULL;
+	joinrel->baserestrictinfo = NIL;
+	joinrel->baserestrictcost.startup = 0;
+	joinrel->baserestrictcost.per_tuple = 0;
+	joinrel->joininfo = NIL;
+	joinrel->has_eclass_joins = false;
+	joinrel->top_parent_relids = NULL;
+	joinrel->part_scheme = NULL;
+	joinrel->part_rels = NULL;
+	joinrel->partexprs = NULL;
+	joinrel->nullable_partexprs = NULL;
+
+	joinrel->top_parent_relids = bms_union(outer_rel->top_parent_relids,
+										   inner_rel->top_parent_relids);
+
+	/* Compute information relevant to foreign relations. */
+	set_foreign_rel_properties(joinrel, outer_rel, inner_rel);
+
+	/* Build targetlist */
+	build_joinrel_tlist(root, joinrel, outer_rel);
+	build_joinrel_tlist(root, joinrel, inner_rel);
+	/* Add placeholder variables. */
+	add_placeholders_to_child_joinrel(root, joinrel, parent_joinrel);
+
+	/* Construct joininfo list. */
+	appinfos = find_appinfos_by_relids(root, joinrel->relids, &nappinfos);
+	joinrel->joininfo = (List *) adjust_appendrel_attrs(root,
+														(Node *) parent_joinrel->joininfo,
+														nappinfos,
+														appinfos);
+	pfree(appinfos);
+
+	/*
+	 * Lateral relids referred in child join will be same as that referred in
+	 * the parent relation. Throw any partial result computed while building
+	 * the targetlist.
+	 */
+	bms_free(joinrel->direct_lateral_relids);
+	bms_free(joinrel->lateral_relids);
+	joinrel->direct_lateral_relids = (Relids) bms_copy(parent_joinrel->direct_lateral_relids);
+	joinrel->lateral_relids = (Relids) bms_copy(parent_joinrel->lateral_relids);
+
+	/*
+	 * If the parent joinrel has pending equivalence classes, so does the
+	 * child.
+	 */
+	joinrel->has_eclass_joins = parent_joinrel->has_eclass_joins;
+
+	/* Is the join between partitions itself partitioned? */
+	build_joinrel_partition_info(joinrel, outer_rel, inner_rel, restrictlist,
+								 jointype);
+
+	/* Child joinrel is parallel safe if parent is parallel safe. */
+	joinrel->consider_parallel = parent_joinrel->consider_parallel;
+
+
+	/* Set estimates of the child-joinrel's size. */
+	set_joinrel_size_estimates(root, joinrel, outer_rel, inner_rel,
+							   sjinfo, restrictlist);
+
+	/* We build the join only once. */
+	Assert(!find_join_rel(root, joinrel->relids));
+
+	/* Add the relation to the PlannerInfo. */
+	add_join_rel(root, joinrel);
+
+	return joinrel;
+}
+
 /*
  * min_join_parameterization
  *
@@ -672,9 +850,15 @@ static void
 build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
 					RelOptInfo *input_rel)
 {
-	Relids		relids = joinrel->relids;
+	Relids		relids;
 	ListCell   *vars;
 
+	/* attrs_needed refers to parent relids and not those of a child. */
+	if (joinrel->top_parent_relids)
+		relids = joinrel->top_parent_relids;
+	else
+		relids = joinrel->relids;
+
 	foreach(vars, input_rel->reltarget->exprs)
 	{
 		Var		   *var = (Var *) lfirst(vars);
@@ -690,23 +874,54 @@ build_joinrel_tlist(PlannerInfo *root, RelOptInfo *joinrel,
 
 		/*
 		 * Otherwise, anything in a baserel or joinrel targetlist ought to be
-		 * a Var.  (More general cases can only appear in appendrel child
-		 * rels, which will never be seen here.)
+		 * a Var. Children of a partitioned table may have ConvertRowtypeExpr
+		 * translating whole-row Var of a child to that of the parent.
+		 * Children of an inherited table or subquery child rels can not
+		 * directly participate in a join, so other kinds of nodes here.
 		 */
-		if (!IsA(var, Var))
+		if (IsA(var, Var))
+		{
+			baserel = find_base_rel(root, var->varno);
+			ndx = var->varattno - baserel->min_attr;
+		}
+		else if (IsA(var, ConvertRowtypeExpr))
+		{
+			ConvertRowtypeExpr *child_expr = (ConvertRowtypeExpr *) var;
+			Var		   *childvar = (Var *) child_expr->arg;
+
+			/*
+			 * Child's whole-row references are converted to look like those
+			 * of parent using ConvertRowtypeExpr. There can be as many
+			 * ConvertRowtypeExpr decorations as the depth of partition tree.
+			 * The argument to the deepest ConvertRowtypeExpr is expected to
+			 * be a whole-row reference of the child.
+			 */
+			while (IsA(childvar, ConvertRowtypeExpr))
+			{
+				child_expr = (ConvertRowtypeExpr *) childvar;
+				childvar = (Var *) child_expr->arg;
+			}
+			Assert(IsA(childvar, Var) &&childvar->varattno == 0);
+
+			baserel = find_base_rel(root, childvar->varno);
+			ndx = 0 - baserel->min_attr;
+		}
+		else
 			elog(ERROR, "unexpected node type in rel targetlist: %d",
 				 (int) nodeTag(var));
 
-		/* Get the Var's original base rel */
-		baserel = find_base_rel(root, var->varno);
 
-		/* Is it still needed above this joinrel? */
-		ndx = var->varattno - baserel->min_attr;
+		/* Is the target expression still needed above this joinrel? */
 		if (bms_nonempty_difference(baserel->attr_needed[ndx], relids))
 		{
 			/* Yup, add it to the output */
 			joinrel->reltarget->exprs = lappend(joinrel->reltarget->exprs, var);
-			/* Vars have cost zero, so no need to adjust reltarget->cost */
+
+			/*
+			 * Vars have cost zero, so no need to adjust reltarget->cost. Even
+			 * if it's a ConvertRowtypeExpr, it will be computed only for the
+			 * base relation, costing nothing for a join.
+			 */
 			joinrel->reltarget->width += baserel->attr_widths[ndx];
 		}
 	}
@@ -843,6 +1058,9 @@ subbuild_joinrel_joinlist(RelOptInfo *joinrel,
 {
 	ListCell   *l;
 
+	/* Expected to be called only for join between parent relations. */
+	Assert(joinrel->reloptkind == RELOPT_JOINREL);
+
 	foreach(l, joininfo_list)
 	{
 		RestrictInfo *rinfo = (RestrictInfo *) lfirst(l);
@@ -1366,3 +1584,170 @@ find_param_path_info(RelOptInfo *rel, Relids required_outer)
 
 	return NULL;
 }
+
+/*
+ * build_joinrel_partition_info
+ *		If the two relations have same partitioning scheme, their join may be
+ *		partitioned and will follow the same partitioning scheme as the joining
+ *		relations. Set the partition scheme and partition key expressions in
+ *		the join relation.
+ */
+static void
+build_joinrel_partition_info(RelOptInfo *joinrel, RelOptInfo *outer_rel,
+							 RelOptInfo *inner_rel, List *restrictlist,
+							 JoinType jointype)
+{
+	int			partnatts;
+	int			cnt;
+	PartitionScheme part_scheme;
+
+	/* Nothing to do if partitionwise join technique is disabled. */
+	if (!enable_partitionwise_join)
+	{
+		Assert(!IS_PARTITIONED_REL(joinrel));
+		return;
+	}
+
+	/*
+	 * We can only consider this join as an input to further partitionwise
+	 * joins if (a) the input relations are partitioned, (b) the partition
+	 * schemes match, and (c) we can identify an equi-join between the
+	 * partition keys.  Note that if it were possible for
+	 * have_partkey_equi_join to return different answers for the same joinrel
+	 * depending on which join ordering we try first, this logic would break.
+	 * That shouldn't happen, though, because of the way the query planner
+	 * deduces implied equalities and reorders the joins. Please see
+	 * optimizer/README for details.
+	 */
+	if (!IS_PARTITIONED_REL(outer_rel) || !IS_PARTITIONED_REL(inner_rel) ||
+		outer_rel->part_scheme != inner_rel->part_scheme ||
+		!have_partkey_equi_join(outer_rel, inner_rel, jointype, restrictlist))
+	{
+		Assert(!IS_PARTITIONED_REL(joinrel));
+		return;
+	}
+
+	part_scheme = outer_rel->part_scheme;
+
+	Assert(REL_HAS_ALL_PART_PROPS(outer_rel) &&
+		   REL_HAS_ALL_PART_PROPS(inner_rel));
+
+	/*
+	 * For now, our partition matching algorithm can match partitions only
+	 * when the partition bounds of the joining relations are exactly same.
+	 * So, bail out otherwise.
+	 */
+	if (outer_rel->nparts != inner_rel->nparts ||
+		!partition_bounds_equal(part_scheme->partnatts,
+								part_scheme->parttyplen,
+								part_scheme->parttypbyval,
+								outer_rel->boundinfo, inner_rel->boundinfo))
+	{
+		Assert(!IS_PARTITIONED_REL(joinrel));
+		return;
+	}
+
+	/*
+	 * This function will be called only once for each joinrel, hence it
+	 * should not have partition scheme, partition bounds, partition key
+	 * expressions and array for storing child relations set.
+	 */
+	Assert(!joinrel->part_scheme && !joinrel->partexprs &&
+		   !joinrel->nullable_partexprs && !joinrel->part_rels &&
+		   !joinrel->boundinfo);
+
+	/*
+	 * Join relation is partitioned using the same partitioning scheme as the
+	 * joining relations and has same bounds.
+	 */
+	joinrel->part_scheme = part_scheme;
+	joinrel->boundinfo = outer_rel->boundinfo;
+	partnatts = joinrel->part_scheme->partnatts;
+	joinrel->partexprs = (List **) palloc0(sizeof(List *) * partnatts);
+	joinrel->nullable_partexprs =
+		(List **) palloc0(sizeof(List *) * partnatts);
+	joinrel->nparts = outer_rel->nparts;
+	joinrel->part_rels =
+		(RelOptInfo **) palloc0(sizeof(RelOptInfo *) * joinrel->nparts);
+
+
+	/*
+	 * Construct partition keys for the join.
+	 *
+	 * An INNER join between two partitioned relations can be regarded as
+	 * partitioned by either key expression.  For example, A INNER JOIN B ON
+	 * A.a = B.b can be regarded as partitioned on A.a or on B.b; they are
+	 * equivalent.
+	 *
+	 * For a SEMI or ANTI join, the result can only be regarded as being
+	 * partitioned in the same manner as the outer side, since the inner
+	 * columns are not retained.
+	 *
+	 * An OUTER join like (A LEFT JOIN B ON A.a = B.b) may produce rows with
+	 * B.b NULL. These rows may not fit the partitioning conditions imposed on
+	 * B.b. Hence, strictly speaking, the join is not partitioned by B.b and
+	 * thus partition keys of an OUTER join should include partition key
+	 * expressions from the OUTER side only.  However, because all
+	 * commonly-used comparison operators are strict, the presence of nulls on
+	 * the outer side doesn't cause any problem; they can't match anything at
+	 * future join levels anyway.  Therefore, we track two sets of
+	 * expressions: those that authentically partition the relation
+	 * (partexprs) and those that partition the relation with the exception
+	 * that extra nulls may be present (nullable_partexprs).  When the
+	 * comparison operator is strict, the latter is just as good as the
+	 * former.
+	 */
+	for (cnt = 0; cnt < partnatts; cnt++)
+	{
+		List	   *outer_expr;
+		List	   *outer_null_expr;
+		List	   *inner_expr;
+		List	   *inner_null_expr;
+		List	   *partexpr = NIL;
+		List	   *nullable_partexpr = NIL;
+
+		outer_expr = list_copy(outer_rel->partexprs[cnt]);
+		outer_null_expr = list_copy(outer_rel->nullable_partexprs[cnt]);
+		inner_expr = list_copy(inner_rel->partexprs[cnt]);
+		inner_null_expr = list_copy(inner_rel->nullable_partexprs[cnt]);
+
+		switch (jointype)
+		{
+			case JOIN_INNER:
+				partexpr = list_concat(outer_expr, inner_expr);
+				nullable_partexpr = list_concat(outer_null_expr,
+												inner_null_expr);
+				break;
+
+			case JOIN_SEMI:
+			case JOIN_ANTI:
+				partexpr = outer_expr;
+				nullable_partexpr = outer_null_expr;
+				break;
+
+			case JOIN_LEFT:
+				partexpr = outer_expr;
+				nullable_partexpr = list_concat(inner_expr,
+												outer_null_expr);
+				nullable_partexpr = list_concat(nullable_partexpr,
+												inner_null_expr);
+				break;
+
+			case JOIN_FULL:
+				nullable_partexpr = list_concat(outer_expr,
+												inner_expr);
+				nullable_partexpr = list_concat(nullable_partexpr,
+												outer_null_expr);
+				nullable_partexpr = list_concat(nullable_partexpr,
+												inner_null_expr);
+				break;
+
+			default:
+				elog(ERROR, "unrecognized join type: %d", (int) jointype);
+
+		}
+
+		joinrel->partexprs[cnt] = partexpr;
+		joinrel->nullable_partexprs[cnt] = nullable_partexpr;
+	}
+}
diff --git a/src/backend/optimizer/util/restrictinfo.c b/src/backend/optimizer/util/restrictinfo.c
index 39b52aecc5..1075dde40c 100644
--- a/src/backend/optimizer/util/restrictinfo.c
+++ b/src/backend/optimizer/util/restrictinfo.c
@@ -3,7 +3,7 @@
  * restrictinfo.c
  *	  RestrictInfo node manipulation routines.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/util/tlist.c b/src/backend/optimizer/util/tlist.c
index 9345891380..32160d5716 100644
--- a/src/backend/optimizer/util/tlist.c
+++ b/src/backend/optimizer/util/tlist.c
@@ -3,7 +3,7 @@
  * tlist.c
  *	  Target list manipulation routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/optimizer/util/var.c b/src/backend/optimizer/util/var.c
index b8d7d3ffad..b16b1e4656 100644
--- a/src/backend/optimizer/util/var.c
+++ b/src/backend/optimizer/util/var.c
@@ -9,7 +9,7 @@
  * contains variables.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -657,9 +657,9 @@ pull_var_clause_walker(Node *node, pull_var_clause_context *context)
  * entries might now be arbitrary expressions, not just Vars.  This affects
  * this function in one important way: we might find ourselves inserting
  * SubLink expressions into subqueries, and we must make sure that their
- * Query.hasSubLinks fields get set to TRUE if so.  If there are any
+ * Query.hasSubLinks fields get set to true if so.  If there are any
  * SubLinks in the join alias lists, the outer Query should already have
- * hasSubLinks = TRUE, so this is only relevant to un-flattened subqueries.
+ * hasSubLinks = true, so this is only relevant to un-flattened subqueries.
  *
  * NOTE: this is used on not-yet-planned expressions.  We do not expect it
  * to be applied directly to the whole Query, so if we see a Query to start
diff --git a/src/backend/parser/analyze.c b/src/backend/parser/analyze.c
index 4fb793cfbf..c3a9617f67 100644
--- a/src/backend/parser/analyze.c
+++ b/src/backend/parser/analyze.c
@@ -14,7 +14,7 @@
  * contain optimizable statements, which we should transform.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/parser/analyze.c
@@ -36,6 +36,8 @@
 #include "parser/parse_coerce.h"
 #include "parser/parse_collate.h"
 #include "parser/parse_cte.h"
+#include "parser/parse_expr.h"
+#include "parser/parse_func.h"
 #include "parser/parse_oper.h"
 #include "parser/parse_param.h"
 #include "parser/parse_relation.h"
@@ -74,6 +76,8 @@ static Query *transformExplainStmt(ParseState *pstate,
 					 ExplainStmt *stmt);
 static Query *transformCreateTableAsStmt(ParseState *pstate,
 						   CreateTableAsStmt *stmt);
+static Query *transformCallStmt(ParseState *pstate,
+					 CallStmt *stmt);
 static void transformLockingClause(ParseState *pstate, Query *qry,
 					   LockingClause *lc, bool pushedDown);
 #ifdef RAW_EXPRESSION_COVERAGE_TEST
@@ -318,6 +322,10 @@ transformStmt(ParseState *pstate, Node *parseTree)
 												(CreateTableAsStmt *) parseTree);
 			break;
 
+		case T_CallStmt:
+			result = transformCallStmt(pstate,
+									   (CallStmt *) parseTree);
+
 		default:
 
 			/*
@@ -847,16 +855,8 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
 
 	/* Process ON CONFLICT, if any. */
 	if (stmt->onConflictClause)
-	{
-		/* Bail out if target relation is partitioned table */
-		if (pstate->p_target_rangetblentry->relkind == RELKIND_PARTITIONED_TABLE)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("ON CONFLICT clause is not supported with partitioned tables")));
-
 		qry->onConflict = transformOnConflictClause(pstate,
 													stmt->onConflictClause);
-	}
 
 	/*
 	 * If we have a RETURNING clause, we need to add the target relation to
@@ -1025,6 +1025,13 @@ transformOnConflictClause(ParseState *pstate,
 		TargetEntry *te;
 		int			attno;
 
+		if (targetrel->rd_partdesc)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("%s cannot be applied to partitioned table \"%s\"",
+							"ON CONFLICT DO UPDATE",
+							RelationGetRelationName(targetrel))));
+
 		/*
 		 * All INSERT expressions have been parsed, get ready for potentially
 		 * existing SET statements that need to be processed like an UPDATE.
@@ -1050,7 +1057,7 @@ transformOnConflictClause(ParseState *pstate,
 		 */
 		for (attno = 0; attno < targetrel->rd_rel->relnatts; attno++)
 		{
-			Form_pg_attribute attr = targetrel->rd_att->attrs[attno];
+			Form_pg_attribute attr = TupleDescAttr(targetrel->rd_att, attno);
 			char	   *name;
 
 			if (attr->attisdropped)
@@ -2572,6 +2579,43 @@ transformCreateTableAsStmt(ParseState *pstate, CreateTableAsStmt *stmt)
 	return result;
 }
 
+/*
+ * transform a CallStmt
+ *
+ * We need to do parse analysis on the procedure call and its arguments.
+ */
+static Query *
+transformCallStmt(ParseState *pstate, CallStmt *stmt)
+{
+	List	   *targs;
+	ListCell   *lc;
+	Node	   *node;
+	Query	   *result;
+
+	targs = NIL;
+	foreach(lc, stmt->funccall->args)
+	{
+		targs = lappend(targs, transformExpr(pstate,
+											 (Node *) lfirst(lc),
+											 EXPR_KIND_CALL_ARGUMENT));
+	}
+
+	node = ParseFuncOrColumn(pstate,
+							 stmt->funccall->funcname,
+							 targs,
+							 pstate->p_last_srf,
+							 stmt->funccall,
+							 true,
+							 stmt->funccall->location);
+
+	stmt->funcexpr = castNode(FuncExpr, node);
+
+	result = makeNode(Query);
+	result->commandType = CMD_UTILITY;
+	result->utilityStmt = (Node *) stmt;
+
+	return result;
+}
 
 /*
  * Produce a string representation of a LockClauseStrength value.
diff --git a/src/backend/parser/check_keywords.pl b/src/backend/parser/check_keywords.pl
index 6eb0aea96b..d8ebddec9f 100644
--- a/src/backend/parser/check_keywords.pl
+++ b/src/backend/parser/check_keywords.pl
@@ -4,7 +4,7 @@
 # Usage: check_keywords.pl gram.y kwlist.h
 
 # src/backend/parser/check_keywords.pl
-# Copyright (c) 2009-2017, PostgreSQL Global Development Group
+# Copyright (c) 2009-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 7d0de99baf..d99f2be2c9 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -6,7 +6,7 @@
  * gram.y
  *	  POSTGRESQL BISON rules/actions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -115,7 +115,7 @@
 typedef struct PrivTarget
 {
 	GrantTargetType targtype;
-	GrantObjectType objtype;
+	ObjectType	objtype;
 	List	   *objs;
 } PrivTarget;
 
@@ -253,7 +253,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 		AlterCompositeTypeStmt AlterUserMappingStmt
 		AlterRoleStmt AlterRoleSetStmt AlterPolicyStmt
 		AlterDefaultPrivilegesStmt DefACLAction
-		AnalyzeStmt ClosePortalStmt ClusterStmt CommentStmt
+		AnalyzeStmt CallStmt ClosePortalStmt ClusterStmt CommentStmt
 		ConstraintsSetStmt CopyStmt CreateAsStmt CreateCastStmt
 		CreateDomainStmt CreateExtensionStmt CreateGroupStmt CreateOpClassStmt
 		CreateOpFamilyStmt AlterOpFamilyStmt CreatePLangStmt
@@ -290,7 +290,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <ival>	add_drop opt_asc_desc opt_nulls_order
 
 %type <node>	alter_table_cmd alter_type_cmd opt_collate_clause
-	   replica_identity partition_cmd
+	   replica_identity partition_cmd index_partition_cmd
 %type <list>	alter_table_cmds alter_type_cmds
 %type <list>    alter_identity_column_option_list
 %type <defelt>  alter_identity_column_option
@@ -365,6 +365,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <list>	DefACLOptionList
 %type <ival>	import_qualification_type
 %type <importqual> import_qualification
+%type <node>	vacuum_relation
 
 %type <list>	stmtblock stmtmulti
 				OptTableElementList TableElementList OptInherit definition
@@ -396,6 +397,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 				transform_element_list transform_type_list
 				TriggerTransitions TriggerReferencing
 				publication_name_list
+				vacuum_relation_list opt_vacuum_relation_list
 
 %type <list>	group_by_list
 %type <node>	group_by_item empty_grouping_set rollup_clause cube_clause
@@ -435,7 +437,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 
 %type <boolean> opt_instead
 %type <boolean> opt_unique opt_concurrently opt_verbose opt_full
-%type <boolean> opt_freeze opt_default opt_recheck
+%type <boolean> opt_freeze opt_analyze opt_default opt_recheck
 %type <defelt>	opt_binary opt_oids copy_delimiter
 
 %type <boolean> copy_from opt_program
@@ -568,6 +570,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <list>	window_clause window_definition_list opt_partition_clause
 %type <windef>	window_definition over_clause window_specification
 				opt_frame_clause frame_extent frame_bound
+%type <ival>	opt_window_exclusion_clause
 %type <str>		opt_existing_window_name
 %type <boolean> opt_if_not_exists
 %type <ival>	generated_when override_kind
@@ -575,9 +578,10 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 %type <str>			part_strategy
 %type <partelem>	part_elem
 %type <list>		part_params
-%type <partboundspec> ForValues
+%type <partboundspec> PartitionBoundSpec
 %type <node>		partbound_datum PartitionRangeDatum
-%type <list>		partbound_datum_list range_datum_list
+%type <list>		hash_partbound partbound_datum_list range_datum_list
+%type <defelt>		hash_partbound_elem
 
 /*
  * Non-keyword token types.  These are hard-wired into the "flex" lexer.
@@ -608,7 +612,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	BACKWARD BEFORE BEGIN_P BETWEEN BIGINT BINARY BIT
 	BOOLEAN_P BOTH BY
 
-	CACHE CALLED CASCADE CASCADED CASE CAST CATALOG_P CHAIN CHAR_P
+	CACHE CALL CALLED CASCADE CASCADED CASE CAST CATALOG_P CHAIN CHAR_P
 	CHARACTER CHARACTERISTICS CHECK CHECKPOINT CLASS CLOSE
 	CLUSTER COALESCE COLLATE COLLATION COLUMN COLUMNS COMMENT COMMENTS COMMIT
 	COMMITTED CONCURRENTLY CONFIGURATION CONFLICT CONNECTION CONSTRAINT
@@ -629,7 +633,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	FALSE_P FAMILY FETCH FILTER FIRST_P FLOAT_P FOLLOWING FOR
 	FORCE FOREIGN FORWARD FREEZE FROM FULL FUNCTION FUNCTIONS
 
-	GENERATED GLOBAL GRANT GRANTED GREATEST GROUP_P GROUPING
+	GENERATED GLOBAL GRANT GRANTED GREATEST GROUP_P GROUPING GROUPS
 
 	HANDLER HAVING HEADER_P HOLD HOUR_P
 
@@ -653,18 +657,19 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	NULLS_P NUMERIC
 
 	OBJECT_P OF OFF OFFSET OIDS OLD ON ONLY OPERATOR OPTION OPTIONS OR
-	ORDER ORDINALITY OUT_P OUTER_P OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER
+	ORDER ORDINALITY OTHERS OUT_P OUTER_P
+	OVER OVERLAPS OVERLAY OVERRIDING OWNED OWNER
 
 	PARALLEL PARSER PARTIAL PARTITION PASSING PASSWORD PLACING PLANS POLICY
 	POSITION PRECEDING PRECISION PRESERVE PREPARE PREPARED PRIMARY
-	PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROGRAM PUBLICATION
+	PRIOR PRIVILEGES PROCEDURAL PROCEDURE PROCEDURES PROGRAM PUBLICATION
 
 	QUOTE
 
 	RANGE READ REAL REASSIGN RECHECK RECURSIVE REF REFERENCES REFERENCING
 	REFRESH REINDEX RELATIVE_P RELEASE RENAME REPEATABLE REPLACE REPLICA
 	RESET RESTART RESTRICT RETURNING RETURNS REVOKE RIGHT ROLE ROLLBACK ROLLUP
-	ROW ROWS RULE
+	ROUTINE ROUTINES ROW ROWS RULE
 
 	SAVEPOINT SCHEMA SCHEMAS SCROLL SEARCH SECOND_P SECURITY SELECT SEQUENCE SEQUENCES
 	SERIALIZABLE SERVER SESSION SESSION_USER SET SETS SETOF SHARE SHOW
@@ -673,7 +678,8 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
 	SUBSCRIPTION SUBSTRING SYMMETRIC SYSID SYSTEM_P
 
 	TABLE TABLES TABLESAMPLE TABLESPACE TEMP TEMPLATE TEMPORARY TEXT_P THEN
-	TIME TIMESTAMP TO TRAILING TRANSACTION TRANSFORM TREAT TRIGGER TRIM TRUE_P
+	TIES TIME TIMESTAMP TO TRAILING TRANSACTION TRANSFORM
+	TREAT TRIGGER TRIM TRUE_P
 	TRUNCATE TRUSTED TYPE_P TYPES_P
 
 	UNBOUNDED UNCOMMITTED UNENCRYPTED UNION UNIQUE UNKNOWN UNLISTEN UNLOGGED
@@ -721,9 +727,10 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
  * between POSTFIXOP and Op.  We can safely assign the same priority to
  * various unreserved keywords as needed to resolve ambiguities (this can't
  * have any bad effects since obviously the keywords will still behave the
- * same as if they weren't keywords).  We need to do this for PARTITION,
- * RANGE, ROWS to support opt_existing_window_name; and for RANGE, ROWS
- * so that they can follow a_expr without creating postfix-operator problems;
+ * same as if they weren't keywords).  We need to do this:
+ * for PARTITION, RANGE, ROWS, GROUPS to support opt_existing_window_name;
+ * for RANGE, ROWS, GROUPS so that they can follow a_expr without creating
+ * postfix-operator problems;
  * for GENERATED so that it can follow b_expr;
  * and for NULL so that it can follow b_expr in ColQualList without creating
  * postfix-operator problems.
@@ -743,7 +750,7 @@ static Node *makeRecursiveViewSelect(char *relname, List *aliases, Node *query);
  * blame any funny behavior of UNBOUNDED on the SQL standard, though.
  */
 %nonassoc	UNBOUNDED		/* ideally should have same precedence as IDENT */
-%nonassoc	IDENT GENERATED NULL_P PARTITION RANGE ROWS PRECEDING FOLLOWING CUBE ROLLUP
+%nonassoc	IDENT GENERATED NULL_P PARTITION RANGE ROWS GROUPS PRECEDING FOLLOWING CUBE ROLLUP
 %left		Op OPERATOR		/* multi-character ops and user-defined operators */
 %left		'+' '-'
 %left		'*' '/' '%'
@@ -842,6 +849,7 @@ stmt :
 			| AlterTSDictionaryStmt
 			| AlterUserMappingStmt
 			| AnalyzeStmt
+			| CallStmt
 			| CheckPointStmt
 			| ClosePortalStmt
 			| ClusterStmt
@@ -937,6 +945,20 @@ stmt :
 				{ $$ = NULL; }
 		;
 
+/*****************************************************************************
+ *
+ * CALL statement
+ *
+ *****************************************************************************/
+
+CallStmt:	CALL func_application
+				{
+					CallStmt *n = makeNode(CallStmt);
+					n->funccall = castNode(FuncCall, $2);
+					$$ = (Node *)n;
+				}
+		;
+
 /*****************************************************************************
  *
  * Create a new Postgres DBMS role
@@ -1005,7 +1027,7 @@ AlterOptRoleElem:
 				}
 			| INHERIT
 				{
-					$$ = makeDefElem("inherit", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("inherit", (Node *)makeInteger(true), @1);
 				}
 			| CONNECTION LIMIT SignedIconst
 				{
@@ -1028,36 +1050,36 @@ AlterOptRoleElem:
 					 * size of the main parser.
 					 */
 					if (strcmp($1, "superuser") == 0)
-						$$ = makeDefElem("superuser", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("superuser", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "nosuperuser") == 0)
-						$$ = makeDefElem("superuser", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("superuser", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "createrole") == 0)
-						$$ = makeDefElem("createrole", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("createrole", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "nocreaterole") == 0)
-						$$ = makeDefElem("createrole", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("createrole", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "replication") == 0)
-						$$ = makeDefElem("isreplication", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("isreplication", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "noreplication") == 0)
-						$$ = makeDefElem("isreplication", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("isreplication", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "createdb") == 0)
-						$$ = makeDefElem("createdb", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("createdb", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "nocreatedb") == 0)
-						$$ = makeDefElem("createdb", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("createdb", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "login") == 0)
-						$$ = makeDefElem("canlogin", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("canlogin", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "nologin") == 0)
-						$$ = makeDefElem("canlogin", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("canlogin", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "bypassrls") == 0)
-						$$ = makeDefElem("bypassrls", (Node *)makeInteger(TRUE), @1);
+						$$ = makeDefElem("bypassrls", (Node *)makeInteger(true), @1);
 					else if (strcmp($1, "nobypassrls") == 0)
-						$$ = makeDefElem("bypassrls", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("bypassrls", (Node *)makeInteger(false), @1);
 					else if (strcmp($1, "noinherit") == 0)
 					{
 						/*
 						 * Note that INHERIT is a keyword, so it's handled by main parser, but
 						 * NOINHERIT is handled here.
 						 */
-						$$ = makeDefElem("inherit", (Node *)makeInteger(FALSE), @1);
+						$$ = makeDefElem("inherit", (Node *)makeInteger(false), @1);
 					}
 					else
 						ereport(ERROR,
@@ -1190,21 +1212,21 @@ DropRoleStmt:
 			DROP ROLE role_list
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->roles = $3;
 					$$ = (Node *)n;
 				}
 			| DROP ROLE IF_P EXISTS role_list
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->roles = $5;
 					$$ = (Node *)n;
 				}
 			| DROP USER role_list
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->roles = $3;
 					$$ = (Node *)n;
 				}
@@ -1212,20 +1234,20 @@ DropRoleStmt:
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
 					n->roles = $5;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
 			| DROP GROUP_P role_list
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->roles = $3;
 					$$ = (Node *)n;
 				}
 			| DROP GROUP_P IF_P EXISTS role_list
 				{
 					DropRoleStmt *n = makeNode(DropRoleStmt);
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->roles = $5;
 					$$ = (Node *)n;
 				}
@@ -1730,8 +1752,8 @@ constraints_set_list:
 		;
 
 constraints_set_mode:
-			DEFERRED								{ $$ = TRUE; }
-			| IMMEDIATE								{ $$ = FALSE; }
+			DEFERRED								{ $$ = true; }
+			| IMMEDIATE								{ $$ = false; }
 		;
 
 
@@ -1873,6 +1895,15 @@ AlterTableStmt:
 					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
+		|	ALTER INDEX qualified_name index_partition_cmd
+				{
+					AlterTableStmt *n = makeNode(AlterTableStmt);
+					n->relation = $3;
+					n->cmds = list_make1($4);
+					n->relkind = OBJECT_INDEX;
+					n->missing_ok = false;
+					$$ = (Node *)n;
+				}
 		|	ALTER INDEX ALL IN_P TABLESPACE name SET TABLESPACE name opt_nowait
 				{
 					AlterTableMoveAllStmt *n =
@@ -1980,7 +2011,7 @@ alter_table_cmds:
 
 partition_cmd:
 			/* ALTER TABLE <name> ATTACH PARTITION <table_name> FOR VALUES */
-			ATTACH PARTITION qualified_name ForValues
+			ATTACH PARTITION qualified_name PartitionBoundSpec
 				{
 					AlterTableCmd *n = makeNode(AlterTableCmd);
 					PartitionCmd *cmd = makeNode(PartitionCmd);
@@ -2007,6 +2038,22 @@ partition_cmd:
 				}
 		;
 
+index_partition_cmd:
+			/* ALTER INDEX <name> ATTACH PARTITION <index_name> */
+			ATTACH PARTITION qualified_name
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+					PartitionCmd *cmd = makeNode(PartitionCmd);
+
+					n->subtype = AT_AttachPartition;
+					cmd->name = $3;
+					cmd->bound = NULL;
+					n->def = (Node *) cmd;
+
+					$$ = (Node *) n;
+				}
+		;
+
 alter_table_cmd:
 			/* ALTER TABLE <name> ADD <coldef> */
 			ADD_P columnDef
@@ -2078,6 +2125,22 @@ alter_table_cmd:
 					n->def = (Node *) makeInteger($6);
 					$$ = (Node *)n;
 				}
+			/* ALTER TABLE <name> ALTER [COLUMN] <colnum> SET STATISTICS <SignedIconst> */
+			| ALTER opt_column Iconst SET STATISTICS SignedIconst
+				{
+					AlterTableCmd *n = makeNode(AlterTableCmd);
+
+					if ($3 <= 0 || $3 > PG_INT16_MAX)
+						ereport(ERROR,
+								(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+								 errmsg("column number must be in range from 1 to %d", PG_INT16_MAX),
+								 parser_errposition(@3)));
+
+					n->subtype = AT_SetStatistics;
+					n->num = (int16) $3;
+					n->def = (Node *) makeInteger($6);
+					$$ = (Node *)n;
+				}
 			/* ALTER TABLE <name> ALTER [COLUMN] <colname> SET ( column_parameter = value [, ... ] ) */
 			| ALTER opt_column ColId SET reloptions
 				{
@@ -2156,7 +2219,7 @@ alter_table_cmd:
 					n->subtype = AT_DropColumn;
 					n->name = $5;
 					n->behavior = $6;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
 			/* ALTER TABLE <name> DROP [COLUMN] <colname> [RESTRICT|CASCADE] */
@@ -2166,7 +2229,7 @@ alter_table_cmd:
 					n->subtype = AT_DropColumn;
 					n->name = $3;
 					n->behavior = $4;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
 			/*
@@ -2234,7 +2297,7 @@ alter_table_cmd:
 					n->subtype = AT_DropConstraint;
 					n->name = $5;
 					n->behavior = $6;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
 			/* ALTER TABLE <name> DROP CONSTRAINT <name> [RESTRICT|CASCADE] */
@@ -2244,7 +2307,7 @@ alter_table_cmd:
 					n->subtype = AT_DropConstraint;
 					n->name = $3;
 					n->behavior = $4;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
 			/* ALTER TABLE <name> SET WITH OIDS  */
@@ -2619,13 +2682,67 @@ alter_identity_column_option:
 				}
 		;
 
-ForValues:
+PartitionBoundSpec:
+			/* a HASH partition*/
+			FOR VALUES WITH '(' hash_partbound ')'
+				{
+					ListCell   *lc;
+					PartitionBoundSpec *n = makeNode(PartitionBoundSpec);
+
+					n->strategy = PARTITION_STRATEGY_HASH;
+					n->modulus = n->remainder = -1;
+
+					foreach (lc, $5)
+					{
+						DefElem    *opt = lfirst_node(DefElem, lc);
+
+						if (strcmp(opt->defname, "modulus") == 0)
+						{
+							if (n->modulus != -1)
+								ereport(ERROR,
+										(errcode(ERRCODE_DUPLICATE_OBJECT),
+										 errmsg("modulus for hash partition provided more than once"),
+										 parser_errposition(opt->location)));
+							n->modulus = defGetInt32(opt);
+						}
+						else if (strcmp(opt->defname, "remainder") == 0)
+						{
+							if (n->remainder != -1)
+								ereport(ERROR,
+										(errcode(ERRCODE_DUPLICATE_OBJECT),
+										 errmsg("remainder for hash partition provided more than once"),
+										 parser_errposition(opt->location)));
+							n->remainder = defGetInt32(opt);
+						}
+						else
+							ereport(ERROR,
+									(errcode(ERRCODE_SYNTAX_ERROR),
+									 errmsg("unrecognized hash partition bound specification \"%s\"",
+											opt->defname),
+									 parser_errposition(opt->location)));
+					}
+
+					if (n->modulus == -1)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("modulus for hash partition must be specified")));
+					if (n->remainder == -1)
+						ereport(ERROR,
+								(errcode(ERRCODE_SYNTAX_ERROR),
+								 errmsg("remainder for hash partition must be specified")));
+
+					n->location = @3;
+
+					$$ = n;
+				}
+
 			/* a LIST partition */
-			FOR VALUES IN_P '(' partbound_datum_list ')'
+			| FOR VALUES IN_P '(' partbound_datum_list ')'
 				{
 					PartitionBoundSpec *n = makeNode(PartitionBoundSpec);
 
 					n->strategy = PARTITION_STRATEGY_LIST;
+					n->is_default = false;
 					n->listdatums = $5;
 					n->location = @3;
 
@@ -2638,14 +2755,44 @@ ForValues:
 					PartitionBoundSpec *n = makeNode(PartitionBoundSpec);
 
 					n->strategy = PARTITION_STRATEGY_RANGE;
+					n->is_default = false;
 					n->lowerdatums = $5;
 					n->upperdatums = $9;
 					n->location = @3;
 
+					$$ = n;
+				}
+
+			/* a DEFAULT partition */
+			| DEFAULT
+				{
+					PartitionBoundSpec *n = makeNode(PartitionBoundSpec);
+
+					n->is_default = true;
+					n->location = @1;
+
 					$$ = n;
 				}
 		;
 
+hash_partbound_elem:
+		NonReservedWord Iconst
+			{
+				$$ = makeDefElem($1, (Node *)makeInteger($2), @1);
+			}
+		;
+
+hash_partbound:
+		hash_partbound_elem
+			{
+				$$ = list_make1($1);
+			}
+		| hash_partbound ',' hash_partbound_elem
+			{
+				$$ = lappend($1, $3);
+			}
+		;
+
 partbound_datum:
 			Sconst			{ $$ = makeStringConst($1, @1); }
 			| NumericOnly	{ $$ = makeAConst($1, @1); }
@@ -2739,7 +2886,7 @@ alter_type_cmd:
 					n->subtype = AT_DropColumn;
 					n->name = $5;
 					n->behavior = $6;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
 			/* ALTER TYPE <name> DROP ATTRIBUTE <attname> [RESTRICT|CASCADE] */
@@ -2749,7 +2896,7 @@ alter_type_cmd:
 					n->subtype = AT_DropColumn;
 					n->name = $3;
 					n->behavior = $4;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
 			/* ALTER TYPE <name> ALTER ATTRIBUTE <attname> [SET DATA] TYPE <typename> [RESTRICT|CASCADE] */
@@ -2869,13 +3016,13 @@ CopyStmt:	COPY opt_binary qualified_name opt_column_list opt_oids
 		;
 
 copy_from:
-			FROM									{ $$ = TRUE; }
-			| TO									{ $$ = FALSE; }
+			FROM									{ $$ = true; }
+			| TO									{ $$ = false; }
 		;
 
 opt_program:
-			PROGRAM									{ $$ = TRUE; }
-			| /* EMPTY */							{ $$ = FALSE; }
+			PROGRAM									{ $$ = true; }
+			| /* EMPTY */							{ $$ = false; }
 		;
 
 /*
@@ -2906,11 +3053,11 @@ copy_opt_item:
 				}
 			| OIDS
 				{
-					$$ = makeDefElem("oids", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("oids", (Node *)makeInteger(true), @1);
 				}
 			| FREEZE
 				{
-					$$ = makeDefElem("freeze", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("freeze", (Node *)makeInteger(true), @1);
 				}
 			| DELIMITER opt_as Sconst
 				{
@@ -2926,7 +3073,7 @@ copy_opt_item:
 				}
 			| HEADER_P
 				{
-					$$ = makeDefElem("header", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("header", (Node *)makeInteger(true), @1);
 				}
 			| QUOTE opt_as Sconst
 				{
@@ -2971,7 +3118,7 @@ opt_binary:
 opt_oids:
 			WITH OIDS
 				{
-					$$ = makeDefElem("oids", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("oids", (Node *)makeInteger(true), @1);
 				}
 			| /*EMPTY*/								{ $$ = NULL; }
 		;
@@ -3114,7 +3261,7 @@ CreateStmt:	CREATE OptTemp TABLE qualified_name '(' OptTableElementList ')'
 					$$ = (Node *)n;
 				}
 		| CREATE OptTemp TABLE qualified_name PARTITION OF qualified_name
-			OptTypedTableElementList ForValues OptPartitionSpec OptWith
+			OptTypedTableElementList PartitionBoundSpec OptPartitionSpec OptWith
 			OnCommitOption OptTableSpace
 				{
 					CreateStmt *n = makeNode(CreateStmt);
@@ -3133,7 +3280,7 @@ CreateStmt:	CREATE OptTemp TABLE qualified_name '(' OptTableElementList ')'
 					$$ = (Node *)n;
 				}
 		| CREATE OptTemp TABLE IF_P NOT EXISTS qualified_name PARTITION OF
-			qualified_name OptTypedTableElementList ForValues OptPartitionSpec
+			qualified_name OptTypedTableElementList PartitionBoundSpec OptPartitionSpec
 			OptWith OnCommitOption OptTableSpace
 				{
 					CreateStmt *n = makeNode(CreateStmt);
@@ -3625,8 +3772,8 @@ ConstraintElem:
 				}
 		;
 
-opt_no_inherit:	NO INHERIT							{  $$ = TRUE; }
-			| /* EMPTY */							{  $$ = FALSE; }
+opt_no_inherit:	NO INHERIT							{  $$ = true; }
+			| /* EMPTY */							{  $$ = false; }
 		;
 
 opt_column_list:
@@ -3903,9 +4050,9 @@ create_as_target:
 		;
 
 opt_with_data:
-			WITH DATA_P								{ $$ = TRUE; }
-			| WITH NO DATA_P						{ $$ = FALSE; }
-			| /*EMPTY*/								{ $$ = TRUE; }
+			WITH DATA_P								{ $$ = true; }
+			| WITH NO DATA_P						{ $$ = false; }
+			| /*EMPTY*/								{ $$ = true; }
 		;
 
 
@@ -4056,11 +4203,11 @@ SeqOptElem: AS SimpleTypename
 				}
 			| CYCLE
 				{
-					$$ = makeDefElem("cycle", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("cycle", (Node *)makeInteger(true), @1);
 				}
 			| NO CYCLE
 				{
-					$$ = makeDefElem("cycle", (Node *)makeInteger(FALSE), @1);
+					$$ = makeDefElem("cycle", (Node *)makeInteger(false), @1);
 				}
 			| INCREMENT opt_by NumericOnly
 				{
@@ -4160,8 +4307,8 @@ CreatePLangStmt:
 		;
 
 opt_trusted:
-			TRUSTED									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			TRUSTED									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 /* This ought to be just func_name, but that causes reduce/reduce conflicts
@@ -4312,7 +4459,7 @@ create_extension_opt_item:
 				}
 			| CASCADE
 				{
-					$$ = makeDefElem("cascade", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("cascade", (Node *)makeInteger(true), @1);
 				}
 		;
 
@@ -4451,6 +4598,24 @@ AlterExtensionContentsStmt:
 					n->object = (Node *) lcons(makeString($9), $7);
 					$$ = (Node *)n;
 				}
+			| ALTER EXTENSION name add_drop PROCEDURE function_with_argtypes
+				{
+					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
+					n->extname = $3;
+					n->action = $4;
+					n->objtype = OBJECT_PROCEDURE;
+					n->object = (Node *) $6;
+					$$ = (Node *)n;
+				}
+			| ALTER EXTENSION name add_drop ROUTINE function_with_argtypes
+				{
+					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
+					n->extname = $3;
+					n->action = $4;
+					n->objtype = OBJECT_ROUTINE;
+					n->object = (Node *) $6;
+					$$ = (Node *)n;
+				}
 			| ALTER EXTENSION name add_drop SCHEMA name
 				{
 					AlterExtensionContentsStmt *n = makeNode(AlterExtensionContentsStmt);
@@ -4848,7 +5013,7 @@ CreateForeignTableStmt:
 					$$ = (Node *) n;
 				}
 		| CREATE FOREIGN TABLE qualified_name
-			PARTITION OF qualified_name OptTypedTableElementList ForValues
+			PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec
 			SERVER name create_generic_options
 				{
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
@@ -4869,7 +5034,7 @@ CreateForeignTableStmt:
 					$$ = (Node *) n;
 				}
 		| CREATE FOREIGN TABLE IF_P NOT EXISTS qualified_name
-			PARTITION OF qualified_name OptTypedTableElementList ForValues
+			PARTITION OF qualified_name OptTypedTableElementList PartitionBoundSpec
 			SERVER name create_generic_options
 				{
 					CreateForeignTableStmt *n = makeNode(CreateForeignTableStmt);
@@ -5176,9 +5341,9 @@ CreateTrigStmt:
 					n->columns = (List *) lsecond($5);
 					n->whenClause = $10;
 					n->transitionRels = $8;
-					n->isconstraint  = FALSE;
-					n->deferrable	 = FALSE;
-					n->initdeferred  = FALSE;
+					n->isconstraint  = false;
+					n->deferrable	 = false;
+					n->initdeferred  = false;
 					n->constrrel = NULL;
 					$$ = (Node *)n;
 				}
@@ -5192,13 +5357,13 @@ CreateTrigStmt:
 					n->relation = $8;
 					n->funcname = $17;
 					n->args = $19;
-					n->row = TRUE;
+					n->row = true;
 					n->timing = TRIGGER_TYPE_AFTER;
 					n->events = intVal(linitial($6));
 					n->columns = (List *) lsecond($6);
 					n->whenClause = $14;
 					n->transitionRels = NIL;
-					n->isconstraint  = TRUE;
+					n->isconstraint  = true;
 					processCASbits($10, @10, "TRIGGER",
 								   &n->deferrable, &n->initdeferred, NULL,
 								   NULL, yyscanner);
@@ -5272,12 +5437,12 @@ TriggerTransition:
 		;
 
 TransitionOldOrNew:
-			NEW										{ $$ = TRUE; }
-			| OLD									{ $$ = FALSE; }
+			NEW										{ $$ = true; }
+			| OLD									{ $$ = false; }
 		;
 
 TransitionRowOrTable:
-			TABLE									{ $$ = TRUE; }
+			TABLE									{ $$ = true; }
 			/*
 			 * According to the standard, lack of a keyword here implies ROW.
 			 * Support for that would require prohibiting ROW entirely here,
@@ -5286,7 +5451,7 @@ TransitionRowOrTable:
 			 * next token.  Requiring ROW seems cleanest and easiest to
 			 * explain.
 			 */
-			| ROW									{ $$ = FALSE; }
+			| ROW									{ $$ = false; }
 		;
 
 TransitionRelName:
@@ -5304,7 +5469,7 @@ TriggerForSpec:
 					 * If ROW/STATEMENT not specified, default to
 					 * STATEMENT, per SQL
 					 */
-					$$ = FALSE;
+					$$ = false;
 				}
 		;
 
@@ -5314,8 +5479,8 @@ TriggerForOptEach:
 		;
 
 TriggerForType:
-			ROW										{ $$ = TRUE; }
-			| STATEMENT								{ $$ = FALSE; }
+			ROW										{ $$ = true; }
+			| STATEMENT								{ $$ = false; }
 		;
 
 TriggerWhen:
@@ -5466,7 +5631,7 @@ CreateAssertStmt:
 					CreateTrigStmt *n = makeNode(CreateTrigStmt);
 					n->trigname = $3;
 					n->args = list_make1($6);
-					n->isconstraint  = TRUE;
+					n->isconstraint  = true;
 					processCASbits($8, @8, "ASSERTION",
 								   &n->deferrable, &n->initdeferred, NULL,
 								   NULL, yyscanner);
@@ -5846,8 +6011,8 @@ opclass_item:
 				}
 		;
 
-opt_default:	DEFAULT						{ $$ = TRUE; }
-			| /*EMPTY*/						{ $$ = FALSE; }
+opt_default:	DEFAULT						{ $$ = true; }
+			| /*EMPTY*/						{ $$ = false; }
 		;
 
 opt_opfamily:	FAMILY any_name				{ $$ = $2; }
@@ -5871,9 +6036,9 @@ opt_recheck:	RECHECK
 							 errmsg("RECHECK is no longer required"),
 							 errhint("Update your data type."),
 							 parser_errposition(@1)));
-					$$ = TRUE;
+					$$ = true;
 				}
-			| /*EMPTY*/						{ $$ = FALSE; }
+			| /*EMPTY*/						{ $$ = false; }
 		;
 
 
@@ -6021,7 +6186,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = $2;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->objects = $5;
 					n->behavior = $6;
 					n->concurrent = false;
@@ -6031,7 +6196,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = $2;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->objects = $3;
 					n->behavior = $4;
 					n->concurrent = false;
@@ -6041,7 +6206,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = $2;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->objects = $5;
 					n->behavior = $6;
 					n->concurrent = false;
@@ -6051,7 +6216,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = $2;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->objects = $3;
 					n->behavior = $4;
 					n->concurrent = false;
@@ -6081,7 +6246,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TYPE;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->objects = $3;
 					n->behavior = $4;
 					n->concurrent = false;
@@ -6091,7 +6256,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_TYPE;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->objects = $5;
 					n->behavior = $6;
 					n->concurrent = false;
@@ -6101,7 +6266,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_DOMAIN;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->objects = $3;
 					n->behavior = $4;
 					n->concurrent = false;
@@ -6111,7 +6276,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_DOMAIN;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->objects = $5;
 					n->behavior = $6;
 					n->concurrent = false;
@@ -6121,7 +6286,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_INDEX;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					n->objects = $4;
 					n->behavior = $5;
 					n->concurrent = true;
@@ -6131,7 +6296,7 @@ DropStmt:	DROP drop_type_any_name IF_P EXISTS any_name_list opt_drop_behavior
 				{
 					DropStmt *n = makeNode(DropStmt);
 					n->removeType = OBJECT_INDEX;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					n->objects = $6;
 					n->behavior = $7;
 					n->concurrent = true;
@@ -6333,6 +6498,22 @@ CommentStmt:
 					n->comment = $8;
 					$$ = (Node *) n;
 				}
+			| COMMENT ON PROCEDURE function_with_argtypes IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_PROCEDURE;
+					n->object = (Node *) $4;
+					n->comment = $6;
+					$$ = (Node *) n;
+				}
+			| COMMENT ON ROUTINE function_with_argtypes IS comment_text
+				{
+					CommentStmt *n = makeNode(CommentStmt);
+					n->objtype = OBJECT_ROUTINE;
+					n->object = (Node *) $4;
+					n->comment = $6;
+					$$ = (Node *) n;
+				}
 			| COMMENT ON RULE name ON any_name IS comment_text
 				{
 					CommentStmt *n = makeNode(CommentStmt);
@@ -6511,6 +6692,26 @@ SecLabelStmt:
 					n->label = $9;
 					$$ = (Node *) n;
 				}
+			| SECURITY LABEL opt_provider ON PROCEDURE function_with_argtypes
+			  IS security_label
+				{
+					SecLabelStmt *n = makeNode(SecLabelStmt);
+					n->provider = $3;
+					n->objtype = OBJECT_PROCEDURE;
+					n->object = (Node *) $6;
+					n->label = $8;
+					$$ = (Node *) n;
+				}
+			| SECURITY LABEL opt_provider ON ROUTINE function_with_argtypes
+			  IS security_label
+				{
+					SecLabelStmt *n = makeNode(SecLabelStmt);
+					n->provider = $3;
+					n->objtype = OBJECT_ROUTINE;
+					n->object = (Node *) $6;
+					n->label = $8;
+					$$ = (Node *) n;
+				}
 		;
 
 opt_provider:	FOR NonReservedWord_or_Sconst	{ $$ = $2; }
@@ -6553,13 +6754,13 @@ security_label:	Sconst				{ $$ = $1; }
 FetchStmt:	FETCH fetch_args
 				{
 					FetchStmt *n = (FetchStmt *) $2;
-					n->ismove = FALSE;
+					n->ismove = false;
 					$$ = (Node *)n;
 				}
 			| MOVE fetch_args
 				{
 					FetchStmt *n = (FetchStmt *) $2;
-					n->ismove = TRUE;
+					n->ismove = true;
 					$$ = (Node *)n;
 				}
 		;
@@ -6830,7 +7031,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_RELATION;
+					n->objtype = OBJECT_TABLE;
 					n->objs = $1;
 					$$ = n;
 				}
@@ -6838,7 +7039,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_RELATION;
+					n->objtype = OBJECT_TABLE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6846,7 +7047,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_SEQUENCE;
+					n->objtype = OBJECT_SEQUENCE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6854,7 +7055,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_FDW;
+					n->objtype = OBJECT_FDW;
 					n->objs = $4;
 					$$ = n;
 				}
@@ -6862,7 +7063,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_FOREIGN_SERVER;
+					n->objtype = OBJECT_FOREIGN_SERVER;
 					n->objs = $3;
 					$$ = n;
 				}
@@ -6870,7 +7071,23 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_FUNCTION;
+					n->objtype = OBJECT_FUNCTION;
+					n->objs = $2;
+					$$ = n;
+				}
+			| PROCEDURE function_with_argtypes_list
+				{
+					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
+					n->targtype = ACL_TARGET_OBJECT;
+					n->objtype = OBJECT_PROCEDURE;
+					n->objs = $2;
+					$$ = n;
+				}
+			| ROUTINE function_with_argtypes_list
+				{
+					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
+					n->targtype = ACL_TARGET_OBJECT;
+					n->objtype = OBJECT_ROUTINE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6878,7 +7095,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_DATABASE;
+					n->objtype = OBJECT_DATABASE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6886,7 +7103,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_DOMAIN;
+					n->objtype = OBJECT_DOMAIN;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6894,7 +7111,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_LANGUAGE;
+					n->objtype = OBJECT_LANGUAGE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6902,7 +7119,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_LARGEOBJECT;
+					n->objtype = OBJECT_LARGEOBJECT;
 					n->objs = $3;
 					$$ = n;
 				}
@@ -6910,7 +7127,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_NAMESPACE;
+					n->objtype = OBJECT_SCHEMA;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6918,7 +7135,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_TABLESPACE;
+					n->objtype = OBJECT_TABLESPACE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6926,7 +7143,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_OBJECT;
-					n->objtype = ACL_OBJECT_TYPE;
+					n->objtype = OBJECT_TYPE;
 					n->objs = $2;
 					$$ = n;
 				}
@@ -6934,7 +7151,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
-					n->objtype = ACL_OBJECT_RELATION;
+					n->objtype = OBJECT_TABLE;
 					n->objs = $5;
 					$$ = n;
 				}
@@ -6942,7 +7159,7 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
-					n->objtype = ACL_OBJECT_SEQUENCE;
+					n->objtype = OBJECT_SEQUENCE;
 					n->objs = $5;
 					$$ = n;
 				}
@@ -6950,7 +7167,23 @@ privilege_target:
 				{
 					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
 					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
-					n->objtype = ACL_OBJECT_FUNCTION;
+					n->objtype = OBJECT_FUNCTION;
+					n->objs = $5;
+					$$ = n;
+				}
+			| ALL PROCEDURES IN_P SCHEMA name_list
+				{
+					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
+					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
+					n->objtype = OBJECT_PROCEDURE;
+					n->objs = $5;
+					$$ = n;
+				}
+			| ALL ROUTINES IN_P SCHEMA name_list
+				{
+					PrivTarget *n = (PrivTarget *) palloc(sizeof(PrivTarget));
+					n->targtype = ACL_TARGET_ALL_IN_SCHEMA;
+					n->objtype = OBJECT_ROUTINE;
 					n->objs = $5;
 					$$ = n;
 				}
@@ -6969,8 +7202,8 @@ grantee:
 
 
 opt_grant_grant_option:
-			WITH GRANT OPTION { $$ = TRUE; }
-			| /*EMPTY*/ { $$ = FALSE; }
+			WITH GRANT OPTION { $$ = true; }
+			| /*EMPTY*/ { $$ = false; }
 		;
 
 /*****************************************************************************
@@ -7015,8 +7248,8 @@ RevokeRoleStmt:
 				}
 		;
 
-opt_grant_admin_option: WITH ADMIN OPTION				{ $$ = TRUE; }
-			| /*EMPTY*/									{ $$ = FALSE; }
+opt_grant_admin_option: WITH ADMIN OPTION				{ $$ = true; }
+			| /*EMPTY*/									{ $$ = false; }
 		;
 
 opt_granted_by: GRANTED BY RoleSpec						{ $$ = $3; }
@@ -7108,11 +7341,12 @@ DefACLAction:
 		;
 
 defacl_privilege_target:
-			TABLES			{ $$ = ACL_OBJECT_RELATION; }
-			| FUNCTIONS		{ $$ = ACL_OBJECT_FUNCTION; }
-			| SEQUENCES		{ $$ = ACL_OBJECT_SEQUENCE; }
-			| TYPES_P		{ $$ = ACL_OBJECT_TYPE; }
-			| SCHEMAS		{ $$ = ACL_OBJECT_NAMESPACE; }
+			TABLES			{ $$ = OBJECT_TABLE; }
+			| FUNCTIONS		{ $$ = OBJECT_FUNCTION; }
+			| ROUTINES		{ $$ = OBJECT_FUNCTION; }
+			| SEQUENCES		{ $$ = OBJECT_SEQUENCE; }
+			| TYPES_P		{ $$ = OBJECT_TYPE; }
+			| SCHEMAS		{ $$ = OBJECT_SCHEMA; }
 		;
 
 
@@ -7125,7 +7359,7 @@ defacl_privilege_target:
  *****************************************************************************/
 
 IndexStmt:	CREATE opt_unique INDEX opt_concurrently opt_index_name
-			ON qualified_name access_method_clause '(' index_params ')'
+			ON relation_expr access_method_clause '(' index_params ')'
 			opt_reloptions OptTableSpace where_clause
 				{
 					IndexStmt *n = makeNode(IndexStmt);
@@ -7133,6 +7367,7 @@ IndexStmt:	CREATE opt_unique INDEX opt_concurrently opt_index_name
 					n->concurrent = $4;
 					n->idxname = $5;
 					n->relation = $7;
+					n->relationId = InvalidOid;
 					n->accessMethod = $8;
 					n->indexParams = $10;
 					n->options = $12;
@@ -7151,7 +7386,7 @@ IndexStmt:	CREATE opt_unique INDEX opt_concurrently opt_index_name
 					$$ = (Node *)n;
 				}
 			| CREATE opt_unique INDEX opt_concurrently IF_P NOT EXISTS index_name
-			ON qualified_name access_method_clause '(' index_params ')'
+			ON relation_expr access_method_clause '(' index_params ')'
 			opt_reloptions OptTableSpace where_clause
 				{
 					IndexStmt *n = makeNode(IndexStmt);
@@ -7159,6 +7394,7 @@ IndexStmt:	CREATE opt_unique INDEX opt_concurrently opt_index_name
 					n->concurrent = $4;
 					n->idxname = $8;
 					n->relation = $10;
+					n->relationId = InvalidOid;
 					n->accessMethod = $11;
 					n->indexParams = $13;
 					n->options = $15;
@@ -7179,13 +7415,13 @@ IndexStmt:	CREATE opt_unique INDEX opt_concurrently opt_index_name
 		;
 
 opt_unique:
-			UNIQUE									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			UNIQUE									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 opt_concurrently:
-			CONCURRENTLY							{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			CONCURRENTLY							{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 opt_index_name:
@@ -7274,47 +7510,59 @@ opt_nulls_order: NULLS_LA FIRST_P			{ $$ = SORTBY_NULLS_FIRST; }
 
 CreateFunctionStmt:
 			CREATE opt_or_replace FUNCTION func_name func_args_with_defaults
-			RETURNS func_return createfunc_opt_list opt_definition
+			RETURNS func_return createfunc_opt_list
 				{
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
+					n->is_procedure = false;
 					n->replace = $2;
 					n->funcname = $4;
 					n->parameters = $5;
 					n->returnType = $7;
 					n->options = $8;
-					n->withClause = $9;
 					$$ = (Node *)n;
 				}
 			| CREATE opt_or_replace FUNCTION func_name func_args_with_defaults
-			  RETURNS TABLE '(' table_func_column_list ')' createfunc_opt_list opt_definition
+			  RETURNS TABLE '(' table_func_column_list ')' createfunc_opt_list
 				{
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
+					n->is_procedure = false;
 					n->replace = $2;
 					n->funcname = $4;
 					n->parameters = mergeTableFuncParameters($5, $9);
 					n->returnType = TableFuncTypeName($9);
 					n->returnType->location = @7;
 					n->options = $11;
-					n->withClause = $12;
 					$$ = (Node *)n;
 				}
 			| CREATE opt_or_replace FUNCTION func_name func_args_with_defaults
-			  createfunc_opt_list opt_definition
+			  createfunc_opt_list
+				{
+					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
+					n->is_procedure = false;
+					n->replace = $2;
+					n->funcname = $4;
+					n->parameters = $5;
+					n->returnType = NULL;
+					n->options = $6;
+					$$ = (Node *)n;
+				}
+			| CREATE opt_or_replace PROCEDURE func_name func_args_with_defaults
+			  createfunc_opt_list
 				{
 					CreateFunctionStmt *n = makeNode(CreateFunctionStmt);
+					n->is_procedure = true;
 					n->replace = $2;
 					n->funcname = $4;
 					n->parameters = $5;
 					n->returnType = NULL;
 					n->options = $6;
-					n->withClause = $7;
 					$$ = (Node *)n;
 				}
 		;
 
 opt_or_replace:
-			OR REPLACE								{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			OR REPLACE								{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 func_args:	'(' func_args_list ')'					{ $$ = $2; }
@@ -7483,7 +7731,7 @@ func_type:	Typename								{ $$ = $1; }
 				{
 					$$ = makeTypeNameFromNameList(lcons(makeString($2), $3));
 					$$->pct_type = true;
-					$$->setof = TRUE;
+					$$->setof = true;
 					$$->location = @2;
 				}
 		;
@@ -7599,15 +7847,15 @@ createfunc_opt_list:
 common_func_opt_item:
 			CALLED ON NULL_P INPUT_P
 				{
-					$$ = makeDefElem("strict", (Node *)makeInteger(FALSE), @1);
+					$$ = makeDefElem("strict", (Node *)makeInteger(false), @1);
 				}
 			| RETURNS NULL_P ON NULL_P INPUT_P
 				{
-					$$ = makeDefElem("strict", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("strict", (Node *)makeInteger(true), @1);
 				}
 			| STRICT_P
 				{
-					$$ = makeDefElem("strict", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("strict", (Node *)makeInteger(true), @1);
 				}
 			| IMMUTABLE
 				{
@@ -7623,27 +7871,27 @@ common_func_opt_item:
 				}
 			| EXTERNAL SECURITY DEFINER
 				{
-					$$ = makeDefElem("security", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("security", (Node *)makeInteger(true), @1);
 				}
 			| EXTERNAL SECURITY INVOKER
 				{
-					$$ = makeDefElem("security", (Node *)makeInteger(FALSE), @1);
+					$$ = makeDefElem("security", (Node *)makeInteger(false), @1);
 				}
 			| SECURITY DEFINER
 				{
-					$$ = makeDefElem("security", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("security", (Node *)makeInteger(true), @1);
 				}
 			| SECURITY INVOKER
 				{
-					$$ = makeDefElem("security", (Node *)makeInteger(FALSE), @1);
+					$$ = makeDefElem("security", (Node *)makeInteger(false), @1);
 				}
 			| LEAKPROOF
 				{
-					$$ = makeDefElem("leakproof", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("leakproof", (Node *)makeInteger(true), @1);
 				}
 			| NOT LEAKPROOF
 				{
-					$$ = makeDefElem("leakproof", (Node *)makeInteger(FALSE), @1);
+					$$ = makeDefElem("leakproof", (Node *)makeInteger(false), @1);
 				}
 			| COST NumericOnly
 				{
@@ -7679,7 +7927,7 @@ createfunc_opt_item:
 				}
 			| WINDOW
 				{
-					$$ = makeDefElem("window", (Node *)makeInteger(TRUE), @1);
+					$$ = makeDefElem("window", (Node *)makeInteger(true), @1);
 				}
 			| common_func_opt_item
 				{
@@ -7727,7 +7975,7 @@ table_func_column_list:
 		;
 
 /*****************************************************************************
- * ALTER FUNCTION
+ * ALTER FUNCTION / ALTER PROCEDURE / ALTER ROUTINE
  *
  * RENAME and OWNER subcommands are already provided by the generic
  * ALTER infrastructure, here we just specify alterations that can
@@ -7738,6 +7986,23 @@ AlterFunctionStmt:
 			ALTER FUNCTION function_with_argtypes alterfunc_opt_list opt_restrict
 				{
 					AlterFunctionStmt *n = makeNode(AlterFunctionStmt);
+					n->objtype = OBJECT_FUNCTION;
+					n->func = $3;
+					n->actions = $4;
+					$$ = (Node *) n;
+				}
+			| ALTER PROCEDURE function_with_argtypes alterfunc_opt_list opt_restrict
+				{
+					AlterFunctionStmt *n = makeNode(AlterFunctionStmt);
+					n->objtype = OBJECT_PROCEDURE;
+					n->func = $3;
+					n->actions = $4;
+					$$ = (Node *) n;
+				}
+			| ALTER ROUTINE function_with_argtypes alterfunc_opt_list opt_restrict
+				{
+					AlterFunctionStmt *n = makeNode(AlterFunctionStmt);
+					n->objtype = OBJECT_ROUTINE;
 					n->func = $3;
 					n->actions = $4;
 					$$ = (Node *) n;
@@ -7762,6 +8027,8 @@ opt_restrict:
  *		QUERY:
  *
  *		DROP FUNCTION funcname (arg1, arg2, ...) [ RESTRICT | CASCADE ]
+ *		DROP PROCEDURE procname (arg1, arg2, ...) [ RESTRICT | CASCADE ]
+ *		DROP ROUTINE routname (arg1, arg2, ...) [ RESTRICT | CASCADE ]
  *		DROP AGGREGATE aggname (arg1, ...) [ RESTRICT | CASCADE ]
  *		DROP OPERATOR opname (leftoperand_typ, rightoperand_typ) [ RESTRICT | CASCADE ]
  *
@@ -7788,6 +8055,46 @@ RemoveFuncStmt:
 					n->concurrent = false;
 					$$ = (Node *)n;
 				}
+			| DROP PROCEDURE function_with_argtypes_list opt_drop_behavior
+				{
+					DropStmt *n = makeNode(DropStmt);
+					n->removeType = OBJECT_PROCEDURE;
+					n->objects = $3;
+					n->behavior = $4;
+					n->missing_ok = false;
+					n->concurrent = false;
+					$$ = (Node *)n;
+				}
+			| DROP PROCEDURE IF_P EXISTS function_with_argtypes_list opt_drop_behavior
+				{
+					DropStmt *n = makeNode(DropStmt);
+					n->removeType = OBJECT_PROCEDURE;
+					n->objects = $5;
+					n->behavior = $6;
+					n->missing_ok = true;
+					n->concurrent = false;
+					$$ = (Node *)n;
+				}
+			| DROP ROUTINE function_with_argtypes_list opt_drop_behavior
+				{
+					DropStmt *n = makeNode(DropStmt);
+					n->removeType = OBJECT_ROUTINE;
+					n->objects = $3;
+					n->behavior = $4;
+					n->missing_ok = false;
+					n->concurrent = false;
+					$$ = (Node *)n;
+				}
+			| DROP ROUTINE IF_P EXISTS function_with_argtypes_list opt_drop_behavior
+				{
+					DropStmt *n = makeNode(DropStmt);
+					n->removeType = OBJECT_ROUTINE;
+					n->objects = $5;
+					n->behavior = $6;
+					n->missing_ok = true;
+					n->concurrent = false;
+					$$ = (Node *)n;
+				}
 		;
 
 RemoveAggrStmt:
@@ -7968,8 +8275,8 @@ DropCastStmt: DROP CAST opt_if_exists '(' Typename AS Typename ')' opt_drop_beha
 				}
 		;
 
-opt_if_exists: IF_P EXISTS						{ $$ = TRUE; }
-		| /*EMPTY*/								{ $$ = FALSE; }
+opt_if_exists: IF_P EXISTS						{ $$ = true; }
+		| /*EMPTY*/								{ $$ = false; }
 		;
 
 
@@ -8097,7 +8404,7 @@ AlterTblSpcStmt:
 						makeNode(AlterTableSpaceOptionsStmt);
 					n->tablespacename = $3;
 					n->options = $5;
-					n->isReset = FALSE;
+					n->isReset = false;
 					$$ = (Node *)n;
 				}
 			| ALTER TABLESPACE name RESET reloptions
@@ -8106,7 +8413,7 @@ AlterTblSpcStmt:
 						makeNode(AlterTableSpaceOptionsStmt);
 					n->tablespacename = $3;
 					n->options = $5;
-					n->isReset = TRUE;
+					n->isReset = true;
 					$$ = (Node *)n;
 				}
 		;
@@ -8245,6 +8552,15 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
 					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
+			| ALTER PROCEDURE function_with_argtypes RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_PROCEDURE;
+					n->object = (Node *) $3;
+					n->newname = $6;
+					n->missing_ok = false;
+					$$ = (Node *)n;
+				}
 			| ALTER PUBLICATION name RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
@@ -8254,6 +8570,15 @@ RenameStmt: ALTER AGGREGATE aggregate_with_argtypes RENAME TO name
 					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
+			| ALTER ROUTINE function_with_argtypes RENAME TO name
+				{
+					RenameStmt *n = makeNode(RenameStmt);
+					n->renameType = OBJECT_ROUTINE;
+					n->object = (Node *) $3;
+					n->newname = $6;
+					n->missing_ok = false;
+					$$ = (Node *)n;
+				}
 			| ALTER SCHEMA name RENAME TO name
 				{
 					RenameStmt *n = makeNode(RenameStmt);
@@ -8633,6 +8958,22 @@ AlterObjectDependsStmt:
 					n->extname = makeString($7);
 					$$ = (Node *)n;
 				}
+			| ALTER PROCEDURE function_with_argtypes DEPENDS ON EXTENSION name
+				{
+					AlterObjectDependsStmt *n = makeNode(AlterObjectDependsStmt);
+					n->objectType = OBJECT_PROCEDURE;
+					n->object = (Node *) $3;
+					n->extname = makeString($7);
+					$$ = (Node *)n;
+				}
+			| ALTER ROUTINE function_with_argtypes DEPENDS ON EXTENSION name
+				{
+					AlterObjectDependsStmt *n = makeNode(AlterObjectDependsStmt);
+					n->objectType = OBJECT_ROUTINE;
+					n->object = (Node *) $3;
+					n->extname = makeString($7);
+					$$ = (Node *)n;
+				}
 			| ALTER TRIGGER name ON qualified_name DEPENDS ON EXTENSION name
 				{
 					AlterObjectDependsStmt *n = makeNode(AlterObjectDependsStmt);
@@ -8748,6 +9089,24 @@ AlterObjectSchemaStmt:
 					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
+			| ALTER PROCEDURE function_with_argtypes SET SCHEMA name
+				{
+					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
+					n->objectType = OBJECT_PROCEDURE;
+					n->object = (Node *) $3;
+					n->newschema = $6;
+					n->missing_ok = false;
+					$$ = (Node *)n;
+				}
+			| ALTER ROUTINE function_with_argtypes SET SCHEMA name
+				{
+					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
+					n->objectType = OBJECT_ROUTINE;
+					n->object = (Node *) $3;
+					n->newschema = $6;
+					n->missing_ok = false;
+					$$ = (Node *)n;
+				}
 			| ALTER TABLE relation_expr SET SCHEMA name
 				{
 					AlterObjectSchemaStmt *n = makeNode(AlterObjectSchemaStmt);
@@ -9023,6 +9382,22 @@ AlterOwnerStmt: ALTER AGGREGATE aggregate_with_argtypes OWNER TO RoleSpec
 					n->newowner = $9;
 					$$ = (Node *)n;
 				}
+			| ALTER PROCEDURE function_with_argtypes OWNER TO RoleSpec
+				{
+					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
+					n->objectType = OBJECT_PROCEDURE;
+					n->object = (Node *) $3;
+					n->newowner = $6;
+					$$ = (Node *)n;
+				}
+			| ALTER ROUTINE function_with_argtypes OWNER TO RoleSpec
+				{
+					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
+					n->objectType = OBJECT_ROUTINE;
+					n->object = (Node *) $3;
+					n->newowner = $6;
+					$$ = (Node *)n;
+				}
 			| ALTER SCHEMA name OWNER TO RoleSpec
 				{
 					AlterOwnerStmt *n = makeNode(AlterOwnerStmt);
@@ -9133,7 +9508,7 @@ CreatePublicationStmt:
 							n->tables = (List *)$4;
 						/* FOR ALL TABLES */
 						else
-							n->for_all_tables = TRUE;
+							n->for_all_tables = true;
 					}
 					$$ = (Node *)n;
 				}
@@ -9151,7 +9526,7 @@ publication_for_tables:
 				}
 			| FOR ALL TABLES
 				{
-					$$ = (Node *) makeInteger(TRUE);
+					$$ = (Node *) makeInteger(true);
 				}
 		;
 
@@ -9286,7 +9661,7 @@ AlterSubscriptionStmt:
 					n->kind = ALTER_SUBSCRIPTION_ENABLED;
 					n->subname = $3;
 					n->options = list_make1(makeDefElem("enabled",
-											(Node *)makeInteger(TRUE), @1));
+											(Node *)makeInteger(true), @1));
 					$$ = (Node *)n;
 				}
 			| ALTER SUBSCRIPTION name DISABLE_P
@@ -9296,7 +9671,7 @@ AlterSubscriptionStmt:
 					n->kind = ALTER_SUBSCRIPTION_ENABLED;
 					n->subname = $3;
 					n->options = list_make1(makeDefElem("enabled",
-											(Node *)makeInteger(FALSE), @1));
+											(Node *)makeInteger(false), @1));
 					$$ = (Node *)n;
 				}
 		;
@@ -9389,9 +9764,9 @@ event:		SELECT									{ $$ = CMD_SELECT; }
 		 ;
 
 opt_instead:
-			INSTEAD									{ $$ = TRUE; }
-			| ALSO									{ $$ = FALSE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			INSTEAD									{ $$ = true; }
+			| ALSO									{ $$ = false; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 
@@ -9567,16 +9942,16 @@ transaction_mode_item:
 									   makeStringConst($3, @3), @1); }
 			| READ ONLY
 					{ $$ = makeDefElem("transaction_read_only",
-									   makeIntConst(TRUE, @1), @1); }
+									   makeIntConst(true, @1), @1); }
 			| READ WRITE
 					{ $$ = makeDefElem("transaction_read_only",
-									   makeIntConst(FALSE, @1), @1); }
+									   makeIntConst(false, @1), @1); }
 			| DEFERRABLE
 					{ $$ = makeDefElem("transaction_deferrable",
-									   makeIntConst(TRUE, @1), @1); }
+									   makeIntConst(true, @1), @1); }
 			| NOT DEFERRABLE
 					{ $$ = makeDefElem("transaction_deferrable",
-									   makeIntConst(FALSE, @1), @1); }
+									   makeIntConst(false, @1), @1); }
 		;
 
 /* Syntax with commas is SQL-spec, without commas is Postgres historical */
@@ -9815,14 +10190,14 @@ DropdbStmt: DROP DATABASE database_name
 				{
 					DropdbStmt *n = makeNode(DropdbStmt);
 					n->dbname = $3;
-					n->missing_ok = FALSE;
+					n->missing_ok = false;
 					$$ = (Node *)n;
 				}
 			| DROP DATABASE IF_P EXISTS database_name
 				{
 					DropdbStmt *n = makeNode(DropdbStmt);
 					n->dbname = $5;
-					n->missing_ok = TRUE;
+					n->missing_ok = true;
 					$$ = (Node *)n;
 				}
 		;
@@ -10118,7 +10493,7 @@ cluster_index_specification:
  *
  *****************************************************************************/
 
-VacuumStmt: VACUUM opt_full opt_freeze opt_verbose
+VacuumStmt: VACUUM opt_full opt_freeze opt_verbose opt_analyze opt_vacuum_relation_list
 				{
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM;
@@ -10128,52 +10503,16 @@ VacuumStmt: VACUUM opt_full opt_freeze opt_verbose
 						n->options |= VACOPT_FREEZE;
 					if ($4)
 						n->options |= VACOPT_VERBOSE;
-					n->relation = NULL;
-					n->va_cols = NIL;
-					$$ = (Node *)n;
-				}
-			| VACUUM opt_full opt_freeze opt_verbose qualified_name
-				{
-					VacuumStmt *n = makeNode(VacuumStmt);
-					n->options = VACOPT_VACUUM;
-					if ($2)
-						n->options |= VACOPT_FULL;
-					if ($3)
-						n->options |= VACOPT_FREEZE;
-					if ($4)
-						n->options |= VACOPT_VERBOSE;
-					n->relation = $5;
-					n->va_cols = NIL;
-					$$ = (Node *)n;
-				}
-			| VACUUM opt_full opt_freeze opt_verbose AnalyzeStmt
-				{
-					VacuumStmt *n = (VacuumStmt *) $5;
-					n->options |= VACOPT_VACUUM;
-					if ($2)
-						n->options |= VACOPT_FULL;
-					if ($3)
-						n->options |= VACOPT_FREEZE;
-					if ($4)
-						n->options |= VACOPT_VERBOSE;
+					if ($5)
+						n->options |= VACOPT_ANALYZE;
+					n->rels = $6;
 					$$ = (Node *)n;
 				}
-			| VACUUM '(' vacuum_option_list ')'
-				{
-					VacuumStmt *n = makeNode(VacuumStmt);
-					n->options = VACOPT_VACUUM | $3;
-					n->relation = NULL;
-					n->va_cols = NIL;
-					$$ = (Node *) n;
-				}
-			| VACUUM '(' vacuum_option_list ')' qualified_name opt_name_list
+			| VACUUM '(' vacuum_option_list ')' opt_vacuum_relation_list
 				{
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_VACUUM | $3;
-					n->relation = $5;
-					n->va_cols = $6;
-					if (n->va_cols != NIL)	/* implies analyze */
-						n->options |= VACOPT_ANALYZE;
+					n->rels = $5;
 					$$ = (Node *) n;
 				}
 		;
@@ -10200,25 +10539,13 @@ vacuum_option_elem:
 				}
 		;
 
-AnalyzeStmt:
-			analyze_keyword opt_verbose
-				{
-					VacuumStmt *n = makeNode(VacuumStmt);
-					n->options = VACOPT_ANALYZE;
-					if ($2)
-						n->options |= VACOPT_VERBOSE;
-					n->relation = NULL;
-					n->va_cols = NIL;
-					$$ = (Node *)n;
-				}
-			| analyze_keyword opt_verbose qualified_name opt_name_list
+AnalyzeStmt: analyze_keyword opt_verbose opt_vacuum_relation_list
 				{
 					VacuumStmt *n = makeNode(VacuumStmt);
 					n->options = VACOPT_ANALYZE;
 					if ($2)
 						n->options |= VACOPT_VERBOSE;
-					n->relation = $3;
-					n->va_cols = $4;
+					n->rels = $3;
 					$$ = (Node *)n;
 				}
 		;
@@ -10228,17 +10555,22 @@ analyze_keyword:
 			| ANALYSE /* British */					{}
 		;
 
+opt_analyze:
+			analyze_keyword							{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
+		;
+
 opt_verbose:
-			VERBOSE									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			VERBOSE									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
-opt_full:	FULL									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+opt_full:	FULL									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
-opt_freeze: FREEZE									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+opt_freeze: FREEZE									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 opt_name_list:
@@ -10246,6 +10578,25 @@ opt_name_list:
 			| /*EMPTY*/								{ $$ = NIL; }
 		;
 
+vacuum_relation:
+			qualified_name opt_name_list
+				{
+					$$ = (Node *) makeVacuumRelation($1, InvalidOid, $2);
+				}
+		;
+
+vacuum_relation_list:
+			vacuum_relation
+					{ $$ = list_make1($1); }
+			| vacuum_relation_list ',' vacuum_relation
+					{ $$ = lappend($1, $3); }
+		;
+
+opt_vacuum_relation_list:
+			vacuum_relation_list					{ $$ = $1; }
+			| /*EMPTY*/								{ $$ = NIL; }
+		;
+
 
 /*****************************************************************************
  *
@@ -10636,8 +10987,8 @@ lock_type:	ACCESS SHARE					{ $$ = AccessShareLock; }
 			| ACCESS EXCLUSIVE				{ $$ = AccessExclusiveLock; }
 		;
 
-opt_nowait:	NOWAIT							{ $$ = TRUE; }
-			| /*EMPTY*/						{ $$ = FALSE; }
+opt_nowait:	NOWAIT							{ $$ = true; }
+			| /*EMPTY*/						{ $$ = false; }
 		;
 
 opt_nowait_or_skip:
@@ -11104,9 +11455,9 @@ opt_table:	TABLE									{}
 		;
 
 all_or_distinct:
-			ALL										{ $$ = TRUE; }
-			| DISTINCT								{ $$ = FALSE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			ALL										{ $$ = true; }
+			| DISTINCT								{ $$ = false; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 /* We use (NIL) as a placeholder to indicate that all target expressions
@@ -11535,7 +11886,7 @@ joined_table:
 					/* CROSS JOIN is same as unqualified inner join */
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = JOIN_INNER;
-					n->isNatural = FALSE;
+					n->isNatural = false;
 					n->larg = $1;
 					n->rarg = $4;
 					n->usingClause = NIL;
@@ -11546,7 +11897,7 @@ joined_table:
 				{
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = $2;
-					n->isNatural = FALSE;
+					n->isNatural = false;
 					n->larg = $1;
 					n->rarg = $4;
 					if ($5 != NULL && IsA($5, List))
@@ -11560,7 +11911,7 @@ joined_table:
 					/* letting join_type reduce to empty doesn't work */
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = JOIN_INNER;
-					n->isNatural = FALSE;
+					n->isNatural = false;
 					n->larg = $1;
 					n->rarg = $3;
 					if ($4 != NULL && IsA($4, List))
@@ -11573,7 +11924,7 @@ joined_table:
 				{
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = $3;
-					n->isNatural = TRUE;
+					n->isNatural = true;
 					n->larg = $1;
 					n->rarg = $5;
 					n->usingClause = NIL; /* figure out which columns later... */
@@ -11585,7 +11936,7 @@ joined_table:
 					/* letting join_type reduce to empty doesn't work */
 					JoinExpr *n = makeNode(JoinExpr);
 					n->jointype = JOIN_INNER;
-					n->isNatural = TRUE;
+					n->isNatural = true;
 					n->larg = $1;
 					n->rarg = $4;
 					n->usingClause = NIL; /* figure out which columns later... */
@@ -12055,7 +12406,7 @@ Typename:	SimpleTypename opt_array_bounds
 				{
 					$$ = $2;
 					$$->arrayBounds = $3;
-					$$->setof = TRUE;
+					$$->setof = true;
 				}
 			/* SQL standard syntax, currently only one-dimensional */
 			| SimpleTypename ARRAY '[' Iconst ']'
@@ -12067,7 +12418,7 @@ Typename:	SimpleTypename opt_array_bounds
 				{
 					$$ = $2;
 					$$->arrayBounds = list_make1(makeInteger($5));
-					$$->setof = TRUE;
+					$$->setof = true;
 				}
 			| SimpleTypename ARRAY
 				{
@@ -12078,7 +12429,7 @@ Typename:	SimpleTypename opt_array_bounds
 				{
 					$$ = $2;
 					$$->arrayBounds = list_make1(makeInteger(-1));
-					$$->setof = TRUE;
+					$$->setof = true;
 				}
 		;
 
@@ -12365,8 +12716,8 @@ character:	CHARACTER opt_varying
 		;
 
 opt_varying:
-			VARYING									{ $$ = TRUE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			VARYING									{ $$ = true; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 /*
@@ -12418,9 +12769,9 @@ ConstInterval:
 		;
 
 opt_timezone:
-			WITH_LA TIME ZONE						{ $$ = TRUE; }
-			| WITHOUT TIME ZONE						{ $$ = FALSE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+			WITH_LA TIME ZONE						{ $$ = true; }
+			| WITHOUT TIME ZONE						{ $$ = false; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 opt_interval:
@@ -13181,14 +13532,14 @@ func_application: func_name '(' ')'
 			| func_name '(' VARIADIC func_arg_expr opt_sort_clause ')'
 				{
 					FuncCall *n = makeFuncCall($1, list_make1($4), @1);
-					n->func_variadic = TRUE;
+					n->func_variadic = true;
 					n->agg_order = $5;
 					$$ = (Node *)n;
 				}
 			| func_name '(' func_arg_list ',' VARIADIC func_arg_expr opt_sort_clause ')'
 				{
 					FuncCall *n = makeFuncCall($1, lappend($3, $6), @1);
-					n->func_variadic = TRUE;
+					n->func_variadic = true;
 					n->agg_order = $7;
 					$$ = (Node *)n;
 				}
@@ -13206,7 +13557,7 @@ func_application: func_name '(' ')'
 				{
 					FuncCall *n = makeFuncCall($1, $4, @1);
 					n->agg_order = $5;
-					n->agg_distinct = TRUE;
+					n->agg_distinct = true;
 					$$ = (Node *)n;
 				}
 			| func_name '(' '*' ')'
@@ -13222,7 +13573,7 @@ func_application: func_name '(' ')'
 					 * really was.
 					 */
 					FuncCall *n = makeFuncCall($1, NIL, @1);
-					n->agg_star = TRUE;
+					n->agg_star = true;
 					$$ = (Node *)n;
 				}
 		;
@@ -13266,7 +13617,7 @@ func_expr: func_application within_group_clause filter_clause over_clause
 									 errmsg("cannot use VARIADIC with WITHIN GROUP"),
 									 parser_errposition(@2)));
 						n->agg_order = $2;
-						n->agg_within_group = TRUE;
+						n->agg_within_group = true;
 					}
 					n->agg_filter = $3;
 					n->over = $4;
@@ -13556,9 +13907,9 @@ document_or_content: DOCUMENT_P						{ $$ = XMLOPTION_DOCUMENT; }
 			| CONTENT_P								{ $$ = XMLOPTION_CONTENT; }
 		;
 
-xml_whitespace_option: PRESERVE WHITESPACE_P		{ $$ = TRUE; }
-			| STRIP_P WHITESPACE_P					{ $$ = FALSE; }
-			| /*EMPTY*/								{ $$ = FALSE; }
+xml_whitespace_option: PRESERVE WHITESPACE_P		{ $$ = true; }
+			| STRIP_P WHITESPACE_P					{ $$ = false; }
+			| /*EMPTY*/								{ $$ = false; }
 		;
 
 /* We allow several variants for SQL and other compatibility. */
@@ -13656,7 +14007,7 @@ window_specification: '(' opt_existing_window_name opt_partition_clause
 		;
 
 /*
- * If we see PARTITION, RANGE, or ROWS as the first token after the '('
+ * If we see PARTITION, RANGE, ROWS or GROUPS as the first token after the '('
  * of a window_specification, we want the assumption to be that there is
  * no existing_window_name; but those keywords are unreserved and so could
  * be ColIds.  We fix this by making them have the same precedence as IDENT
@@ -13676,33 +14027,27 @@ opt_partition_clause: PARTITION BY expr_list		{ $$ = $3; }
 /*
  * For frame clauses, we return a WindowDef, but only some fields are used:
  * frameOptions, startOffset, and endOffset.
- *
- * This is only a subset of the full SQL:2008 frame_clause grammar.
- * We don't support <window frame exclusion> yet.
  */
 opt_frame_clause:
-			RANGE frame_extent
+			RANGE frame_extent opt_window_exclusion_clause
 				{
 					WindowDef *n = $2;
 					n->frameOptions |= FRAMEOPTION_NONDEFAULT | FRAMEOPTION_RANGE;
-					if (n->frameOptions & (FRAMEOPTION_START_VALUE_PRECEDING |
-										   FRAMEOPTION_END_VALUE_PRECEDING))
-						ereport(ERROR,
-								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("RANGE PRECEDING is only supported with UNBOUNDED"),
-								 parser_errposition(@1)));
-					if (n->frameOptions & (FRAMEOPTION_START_VALUE_FOLLOWING |
-										   FRAMEOPTION_END_VALUE_FOLLOWING))
-						ereport(ERROR,
-								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("RANGE FOLLOWING is only supported with UNBOUNDED"),
-								 parser_errposition(@1)));
+					n->frameOptions |= $3;
 					$$ = n;
 				}
-			| ROWS frame_extent
+			| ROWS frame_extent opt_window_exclusion_clause
 				{
 					WindowDef *n = $2;
 					n->frameOptions |= FRAMEOPTION_NONDEFAULT | FRAMEOPTION_ROWS;
+					n->frameOptions |= $3;
+					$$ = n;
+				}
+			| GROUPS frame_extent opt_window_exclusion_clause
+				{
+					WindowDef *n = $2;
+					n->frameOptions |= FRAMEOPTION_NONDEFAULT | FRAMEOPTION_GROUPS;
+					n->frameOptions |= $3;
 					$$ = n;
 				}
 			| /*EMPTY*/
@@ -13724,7 +14069,7 @@ frame_extent: frame_bound
 								(errcode(ERRCODE_WINDOWING_ERROR),
 								 errmsg("frame start cannot be UNBOUNDED FOLLOWING"),
 								 parser_errposition(@1)));
-					if (n->frameOptions & FRAMEOPTION_START_VALUE_FOLLOWING)
+					if (n->frameOptions & FRAMEOPTION_START_OFFSET_FOLLOWING)
 						ereport(ERROR,
 								(errcode(ERRCODE_WINDOWING_ERROR),
 								 errmsg("frame starting from following row cannot end with current row"),
@@ -13753,13 +14098,13 @@ frame_extent: frame_bound
 								 errmsg("frame end cannot be UNBOUNDED PRECEDING"),
 								 parser_errposition(@4)));
 					if ((frameOptions & FRAMEOPTION_START_CURRENT_ROW) &&
-						(frameOptions & FRAMEOPTION_END_VALUE_PRECEDING))
+						(frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING))
 						ereport(ERROR,
 								(errcode(ERRCODE_WINDOWING_ERROR),
 								 errmsg("frame starting from current row cannot have preceding rows"),
 								 parser_errposition(@4)));
-					if ((frameOptions & FRAMEOPTION_START_VALUE_FOLLOWING) &&
-						(frameOptions & (FRAMEOPTION_END_VALUE_PRECEDING |
+					if ((frameOptions & FRAMEOPTION_START_OFFSET_FOLLOWING) &&
+						(frameOptions & (FRAMEOPTION_END_OFFSET_PRECEDING |
 										 FRAMEOPTION_END_CURRENT_ROW)))
 						ereport(ERROR,
 								(errcode(ERRCODE_WINDOWING_ERROR),
@@ -13804,7 +14149,7 @@ frame_bound:
 			| a_expr PRECEDING
 				{
 					WindowDef *n = makeNode(WindowDef);
-					n->frameOptions = FRAMEOPTION_START_VALUE_PRECEDING;
+					n->frameOptions = FRAMEOPTION_START_OFFSET_PRECEDING;
 					n->startOffset = $1;
 					n->endOffset = NULL;
 					$$ = n;
@@ -13812,13 +14157,21 @@ frame_bound:
 			| a_expr FOLLOWING
 				{
 					WindowDef *n = makeNode(WindowDef);
-					n->frameOptions = FRAMEOPTION_START_VALUE_FOLLOWING;
+					n->frameOptions = FRAMEOPTION_START_OFFSET_FOLLOWING;
 					n->startOffset = $1;
 					n->endOffset = NULL;
 					$$ = n;
 				}
 		;
 
+opt_window_exclusion_clause:
+			EXCLUDE CURRENT_P ROW	{ $$ = FRAMEOPTION_EXCLUDE_CURRENT_ROW; }
+			| EXCLUDE GROUP_P		{ $$ = FRAMEOPTION_EXCLUDE_GROUP; }
+			| EXCLUDE TIES			{ $$ = FRAMEOPTION_EXCLUDE_TIES; }
+			| EXCLUDE NO OTHERS		{ $$ = 0; }
+			| /*EMPTY*/				{ $$ = 0; }
+		;
+
 
 /*
  * Supporting nonterminals for expressions.
@@ -14430,11 +14783,11 @@ AexprConst: Iconst
 				}
 			| TRUE_P
 				{
-					$$ = makeBoolAConst(TRUE, @1);
+					$$ = makeBoolAConst(true, @1);
 				}
 			| FALSE_P
 				{
-					$$ = makeBoolAConst(FALSE, @1);
+					$$ = makeBoolAConst(false, @1);
 				}
 			| NULL_P
 				{
@@ -14605,6 +14958,7 @@ unreserved_keyword:
 			| BEGIN_P
 			| BY
 			| CACHE
+			| CALL
 			| CALLED
 			| CASCADE
 			| CASCADED
@@ -14679,6 +15033,7 @@ unreserved_keyword:
 			| GENERATED
 			| GLOBAL
 			| GRANTED
+			| GROUPS
 			| HANDLER
 			| HEADER_P
 			| HOLD
@@ -14744,6 +15099,7 @@ unreserved_keyword:
 			| OPTION
 			| OPTIONS
 			| ORDINALITY
+			| OTHERS
 			| OVER
 			| OVERRIDING
 			| OWNED
@@ -14764,6 +15120,7 @@ unreserved_keyword:
 			| PRIVILEGES
 			| PROCEDURAL
 			| PROCEDURE
+			| PROCEDURES
 			| PROGRAM
 			| PUBLICATION
 			| QUOTE
@@ -14790,6 +15147,8 @@ unreserved_keyword:
 			| ROLE
 			| ROLLBACK
 			| ROLLUP
+			| ROUTINE
+			| ROUTINES
 			| ROWS
 			| RULE
 			| SAVEPOINT
@@ -14831,6 +15190,7 @@ unreserved_keyword:
 			| TEMPLATE
 			| TEMPORARY
 			| TEXT_P
+			| TIES
 			| TRANSACTION
 			| TRANSFORM
 			| TRIGGER
diff --git a/src/backend/parser/parse_agg.c b/src/backend/parser/parse_agg.c
index 64111f315e..377a7ed6d0 100644
--- a/src/backend/parser/parse_agg.c
+++ b/src/backend/parser/parse_agg.c
@@ -3,7 +3,7 @@
  * parse_agg.c
  *	  handle aggregates and window functions in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -419,6 +419,13 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr)
 			else
 				err = _("grouping operations are not allowed in window ROWS");
 
+			break;
+		case EXPR_KIND_WINDOW_FRAME_GROUPS:
+			if (isAgg)
+				err = _("aggregate functions are not allowed in window GROUPS");
+			else
+				err = _("grouping operations are not allowed in window GROUPS");
+
 			break;
 		case EXPR_KIND_SELECT_TARGET:
 			/* okay */
@@ -502,9 +509,17 @@ check_agglevels_and_constraints(ParseState *pstate, Node *expr)
 			break;
 		case EXPR_KIND_PARTITION_EXPRESSION:
 			if (isAgg)
-				err = _("aggregate functions are not allowed in partition key expression");
+				err = _("aggregate functions are not allowed in partition key expressions");
+			else
+				err = _("grouping operations are not allowed in partition key expressions");
+
+			break;
+
+		case EXPR_KIND_CALL_ARGUMENT:
+			if (isAgg)
+				err = _("aggregate functions are not allowed in CALL arguments");
 			else
-				err = _("grouping operations are not allowed in partition key expression");
+				err = _("grouping operations are not allowed in CALL arguments");
 
 			break;
 
@@ -827,6 +842,7 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
 		case EXPR_KIND_WINDOW_ORDER:
 		case EXPR_KIND_WINDOW_FRAME_RANGE:
 		case EXPR_KIND_WINDOW_FRAME_ROWS:
+		case EXPR_KIND_WINDOW_FRAME_GROUPS:
 			err = _("window functions are not allowed in window definitions");
 			break;
 		case EXPR_KIND_SELECT_TARGET:
@@ -881,7 +897,10 @@ transformWindowFuncCall(ParseState *pstate, WindowFunc *wfunc,
 			err = _("window functions are not allowed in trigger WHEN conditions");
 			break;
 		case EXPR_KIND_PARTITION_EXPRESSION:
-			err = _("window functions are not allowed in partition key expression");
+			err = _("window functions are not allowed in partition key expressions");
+			break;
+		case EXPR_KIND_CALL_ARGUMENT:
+			err = _("window functions are not allowed in CALL arguments");
 			break;
 
 			/*
diff --git a/src/backend/parser/parse_clause.c b/src/backend/parser/parse_clause.c
index 9ff80b8b40..3a02307bd9 100644
--- a/src/backend/parser/parse_clause.c
+++ b/src/backend/parser/parse_clause.c
@@ -3,7 +3,7 @@
  * parse_clause.c
  *	  handle clauses in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -18,10 +18,13 @@
 #include "miscadmin.h"
 
 #include "access/heapam.h"
+#include "access/htup_details.h"
+#include "access/nbtree.h"
 #include "access/tsmapi.h"
 #include "catalog/catalog.h"
 #include "catalog/heap.h"
 #include "catalog/pg_am.h"
+#include "catalog/pg_amproc.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_constraint_fn.h"
 #include "catalog/pg_type.h"
@@ -43,8 +46,11 @@
 #include "parser/parse_target.h"
 #include "parser/parse_type.h"
 #include "rewrite/rewriteManip.h"
+#include "utils/builtins.h"
 #include "utils/guc.h"
+#include "utils/catcache.h"
 #include "utils/lsyscache.h"
+#include "utils/syscache.h"
 #include "utils/rel.h"
 
 
@@ -62,9 +68,6 @@ static Node *transformJoinOnClause(ParseState *pstate, JoinExpr *j,
 static RangeTblEntry *getRTEForSpecialRelationTypes(ParseState *pstate,
 							  RangeVar *rv);
 static RangeTblEntry *transformTableEntry(ParseState *pstate, RangeVar *r);
-static RangeTblEntry *transformCTEReference(ParseState *pstate, RangeVar *r,
-					  CommonTableExpr *cte, Index levelsup);
-static RangeTblEntry *transformENRReference(ParseState *pstate, RangeVar *r);
 static RangeTblEntry *transformRangeSubselect(ParseState *pstate,
 						RangeSubselect *r);
 static RangeTblEntry *transformRangeFunction(ParseState *pstate,
@@ -98,6 +101,7 @@ static List *addTargetToGroupList(ParseState *pstate, TargetEntry *tle,
 					 List *grouplist, List *targetlist, int location);
 static WindowClause *findWindowClause(List *wclist, const char *name);
 static Node *transformFrameOffset(ParseState *pstate, int frameOptions,
+					 Oid rangeopfamily, Oid rangeopcintype, Oid *inRangeFunc,
 					 Node *clause);
 
 
@@ -184,9 +188,12 @@ setTargetTable(ParseState *pstate, RangeVar *relation,
 	RangeTblEntry *rte;
 	int			rtindex;
 
-	/* So far special relations are immutable; so they cannot be targets. */
-	rte = getRTEForSpecialRelationTypes(pstate, relation);
-	if (rte != NULL)
+	/*
+	 * ENRs hide tables of the same name, so we need to check for them first.
+	 * In contrast, CTEs don't hide tables (for this purpose).
+	 */
+	if (relation->schemaname == NULL &&
+		scanNameSpaceForENR(pstate, relation->relname))
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("relation \"%s\" cannot be the target of a modifying statement",
@@ -262,7 +269,7 @@ interpretOidsOption(List *defList, bool allowOids)
 		DefElem    *def = (DefElem *) lfirst(cell);
 
 		if (def->defnamespace == NULL &&
-			pg_strcasecmp(def->defname, "oids") == 0)
+			strcmp(def->defname, "oids") == 0)
 		{
 			if (!allowOids)
 				ereport(ERROR,
@@ -430,35 +437,6 @@ transformTableEntry(ParseState *pstate, RangeVar *r)
 	return rte;
 }
 
-/*
- * transformCTEReference --- transform a RangeVar that references a common
- * table expression (ie, a sub-SELECT defined in a WITH clause)
- */
-static RangeTblEntry *
-transformCTEReference(ParseState *pstate, RangeVar *r,
-					  CommonTableExpr *cte, Index levelsup)
-{
-	RangeTblEntry *rte;
-
-	rte = addRangeTableEntryForCTE(pstate, cte, levelsup, r, true);
-
-	return rte;
-}
-
-/*
- * transformENRReference --- transform a RangeVar that references an ephemeral
- * named relation
- */
-static RangeTblEntry *
-transformENRReference(ParseState *pstate, RangeVar *r)
-{
-	RangeTblEntry *rte;
-
-	rte = addRangeTableEntryForENR(pstate, r, true);
-
-	return rte;
-}
-
 /*
  * transformRangeSubselect --- transform a sub-SELECT appearing in FROM
  */
@@ -1071,19 +1049,32 @@ transformRangeTableSample(ParseState *pstate, RangeTableSample *rts)
 	return tablesample;
 }
 
-
+/*
+ * getRTEForSpecialRelationTypes
+ *
+ * If given RangeVar refers to a CTE or an EphemeralNamedRelation,
+ * build and return an appropriate RTE, otherwise return NULL
+ */
 static RangeTblEntry *
 getRTEForSpecialRelationTypes(ParseState *pstate, RangeVar *rv)
 {
 	CommonTableExpr *cte;
 	Index		levelsup;
-	RangeTblEntry *rte = NULL;
+	RangeTblEntry *rte;
+
+	/*
+	 * if it is a qualified name, it can't be a CTE or tuplestore reference
+	 */
+	if (rv->schemaname)
+		return NULL;
 
 	cte = scanNameSpaceForCTE(pstate, rv->relname, &levelsup);
 	if (cte)
-		rte = transformCTEReference(pstate, rv, cte, levelsup);
-	if (!rte && scanNameSpaceForENR(pstate, rv->relname))
-		rte = transformENRReference(pstate, rv);
+		rte = addRangeTableEntryForCTE(pstate, cte, levelsup, rv, true);
+	else if (scanNameSpaceForENR(pstate, rv->relname))
+		rte = addRangeTableEntryForENR(pstate, rv, true);
+	else
+		rte = NULL;
 
 	return rte;
 }
@@ -1119,15 +1110,11 @@ transformFromClauseItem(ParseState *pstate, Node *n,
 		/* Plain relation reference, or perhaps a CTE reference */
 		RangeVar   *rv = (RangeVar *) n;
 		RangeTblRef *rtr;
-		RangeTblEntry *rte = NULL;
+		RangeTblEntry *rte;
 		int			rtindex;
 
-		/*
-		 * if it is an unqualified name, it might be a CTE or tuplestore
-		 * reference
-		 */
-		if (!rv->schemaname)
-			rte = getRTEForSpecialRelationTypes(pstate, rv);
+		/* Check if it's a CTE or tuplestore reference */
+		rte = getRTEForSpecialRelationTypes(pstate, rv);
 
 		/* if not found above, must be a table reference */
 		if (!rte)
@@ -2076,7 +2063,7 @@ findTargetlistEntrySQL99(ParseState *pstate, Node *node, List **tlist,
 
 	/*
 	 * If no matches, construct a new target entry which is appended to the
-	 * end of the target list.  This target is given resjunk = TRUE so that it
+	 * end of the target list.  This target is given resjunk = true so that it
 	 * will not be projected into the final tuple.
 	 */
 	target_result = transformTargetEntry(pstate, node, expr, exprKind,
@@ -2647,6 +2634,8 @@ transformWindowDefinitions(ParseState *pstate,
 		WindowClause *refwc = NULL;
 		List	   *partitionClause;
 		List	   *orderClause;
+		Oid			rangeopfamily = InvalidOid;
+		Oid			rangeopcintype = InvalidOid;
 		WindowClause *wc;
 
 		winref++;
@@ -2773,10 +2762,47 @@ transformWindowDefinitions(ParseState *pstate,
 					 parser_errposition(pstate, windef->location)));
 		}
 		wc->frameOptions = windef->frameOptions;
+
+		/*
+		 * RANGE offset PRECEDING/FOLLOWING requires exactly one ORDER BY
+		 * column; check that and get its sort opfamily info.
+		 */
+		if ((wc->frameOptions & FRAMEOPTION_RANGE) &&
+			(wc->frameOptions & (FRAMEOPTION_START_OFFSET |
+								 FRAMEOPTION_END_OFFSET)))
+		{
+			SortGroupClause *sortcl;
+			Node	   *sortkey;
+			int16		rangestrategy;
+
+			if (list_length(wc->orderClause) != 1)
+				ereport(ERROR,
+						(errcode(ERRCODE_WINDOWING_ERROR),
+						 errmsg("RANGE with offset PRECEDING/FOLLOWING requires exactly one ORDER BY column"),
+						 parser_errposition(pstate, windef->location)));
+			sortcl = castNode(SortGroupClause, linitial(wc->orderClause));
+			sortkey = get_sortgroupclause_expr(sortcl, *targetlist);
+			/* Find the sort operator in pg_amop */
+			if (!get_ordering_op_properties(sortcl->sortop,
+											&rangeopfamily,
+											&rangeopcintype,
+											&rangestrategy))
+				elog(ERROR, "operator %u is not a valid ordering operator",
+					 sortcl->sortop);
+			/* Record properties of sort ordering */
+			wc->inRangeColl = exprCollation(sortkey);
+			wc->inRangeAsc = (rangestrategy == BTLessStrategyNumber);
+			wc->inRangeNullsFirst = sortcl->nulls_first;
+		}
+
 		/* Process frame offset expressions */
 		wc->startOffset = transformFrameOffset(pstate, wc->frameOptions,
+											   rangeopfamily, rangeopcintype,
+											   &wc->startInRangeFunc,
 											   windef->startOffset);
 		wc->endOffset = transformFrameOffset(pstate, wc->frameOptions,
+											 rangeopfamily, rangeopcintype,
+											 &wc->endInRangeFunc,
 											 windef->endOffset);
 		wc->winref = winref;
 
@@ -3080,12 +3106,11 @@ resolve_unique_index_expr(ParseState *pstate, InferClause *infer,
 		}
 
 		/*
-		 * transformExpr() should have already rejected subqueries,
-		 * aggregates, and window functions, based on the EXPR_KIND_ for an
-		 * index expression.  Expressions returning sets won't have been
-		 * rejected, but don't bother doing so here; there should be no
-		 * available expression unique index to match any such expression
-		 * against anyway.
+		 * transformExpr() will reject subqueries, aggregates, window
+		 * functions, and SRFs, based on being passed
+		 * EXPR_KIND_INDEX_EXPRESSION.  So we needn't worry about those
+		 * further ... not that they would match any available index
+		 * expression anyway.
 		 */
 		pInfer->expr = transformExpr(pstate, parse, EXPR_KIND_INDEX_EXPRESSION);
 
@@ -3184,9 +3209,26 @@ transformOnConflictArbiter(ParseState *pstate,
 
 		pstate->p_namespace = save_namespace;
 
+		/*
+		 * If the arbiter is specified by constraint name, get the constraint
+		 * OID and mark the constrained columns as requiring SELECT privilege,
+		 * in the same way as would have happened if the arbiter had been
+		 * specified by explicit reference to the constraint's index columns.
+		 */
 		if (infer->conname)
-			*constraint = get_relation_constraint_oid(RelationGetRelid(pstate->p_target_relation),
-													  infer->conname, false);
+		{
+			Oid			relid = RelationGetRelid(pstate->p_target_relation);
+			RangeTblEntry *rte = pstate->p_target_rangetblentry;
+			Bitmapset  *conattnos;
+
+			conattnos = get_relation_constraint_attnos(relid, infer->conname,
+													   false, constraint);
+
+			/* Make sure the rel as a whole is marked for SELECT access */
+			rte->requiredPerms |= ACL_SELECT;
+			/* Mark the constrained columns as requiring SELECT access */
+			rte->selectedCols = bms_add_members(rte->selectedCols, conattnos);
+		}
 	}
 
 	/*
@@ -3492,13 +3534,24 @@ findWindowClause(List *wclist, const char *name)
 /*
  * transformFrameOffset
  *		Process a window frame offset expression
+ *
+ * In RANGE mode, rangeopfamily is the sort opfamily for the input ORDER BY
+ * column, and rangeopcintype is the input data type the sort operator is
+ * registered with.  We expect the in_range function to be registered with
+ * that same type.  (In binary-compatible cases, it might be different from
+ * the input column's actual type, so we can't use that for the lookups.)
+ * We'll return the OID of the in_range function to *inRangeFunc.
  */
 static Node *
-transformFrameOffset(ParseState *pstate, int frameOptions, Node *clause)
+transformFrameOffset(ParseState *pstate, int frameOptions,
+					 Oid rangeopfamily, Oid rangeopcintype, Oid *inRangeFunc,
+					 Node *clause)
 {
 	const char *constructName = NULL;
 	Node	   *node;
 
+	*inRangeFunc = InvalidOid;	/* default result */
+
 	/* Quick exit if no offset expression */
 	if (clause == NULL)
 		return NULL;
@@ -3516,16 +3569,105 @@ transformFrameOffset(ParseState *pstate, int frameOptions, Node *clause)
 	}
 	else if (frameOptions & FRAMEOPTION_RANGE)
 	{
+		/*
+		 * We must look up the in_range support function that's to be used,
+		 * possibly choosing one of several, and coerce the "offset" value to
+		 * the appropriate input type.
+		 */
+		Oid			nodeType;
+		Oid			preferredType;
+		int			nfuncs = 0;
+		int			nmatches = 0;
+		Oid			selectedType = InvalidOid;
+		Oid			selectedFunc = InvalidOid;
+		CatCList   *proclist;
+		int			i;
+
 		/* Transform the raw expression tree */
 		node = transformExpr(pstate, clause, EXPR_KIND_WINDOW_FRAME_RANGE);
+		nodeType = exprType(node);
 
 		/*
-		 * this needs a lot of thought to decide how to support in the context
-		 * of Postgres' extensible datatype framework
+		 * If there are multiple candidates, we'll prefer the one that exactly
+		 * matches nodeType; or if nodeType is as yet unknown, prefer the one
+		 * that exactly matches the sort column type.  (The second rule is
+		 * like what we do for "known_type operator unknown".)
 		 */
+		preferredType = (nodeType != UNKNOWNOID) ? nodeType : rangeopcintype;
+
+		/* Find the in_range support functions applicable to this case */
+		proclist = SearchSysCacheList2(AMPROCNUM,
+									   ObjectIdGetDatum(rangeopfamily),
+									   ObjectIdGetDatum(rangeopcintype));
+		for (i = 0; i < proclist->n_members; i++)
+		{
+			HeapTuple	proctup = &proclist->members[i]->tuple;
+			Form_pg_amproc procform = (Form_pg_amproc) GETSTRUCT(proctup);
+
+			/* The search will find all support proc types; ignore others */
+			if (procform->amprocnum != BTINRANGE_PROC)
+				continue;
+			nfuncs++;
+
+			/* Ignore function if given value can't be coerced to that type */
+			if (!can_coerce_type(1, &nodeType, &procform->amprocrighttype,
+								 COERCION_IMPLICIT))
+				continue;
+			nmatches++;
+
+			/* Remember preferred match, or any match if didn't find that */
+			if (selectedType != preferredType)
+			{
+				selectedType = procform->amprocrighttype;
+				selectedFunc = procform->amproc;
+			}
+		}
+		ReleaseCatCacheList(proclist);
+
+		/*
+		 * Throw error if needed.  It seems worth taking the trouble to
+		 * distinguish "no support at all" from "you didn't match any
+		 * available offset type".
+		 */
+		if (nfuncs == 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s",
+							format_type_be(rangeopcintype)),
+					 parser_errposition(pstate, exprLocation(node))));
+		if (nmatches == 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("RANGE with offset PRECEDING/FOLLOWING is not supported for column type %s and offset type %s",
+							format_type_be(rangeopcintype),
+							format_type_be(nodeType)),
+					 errhint("Cast the offset value to an appropriate type."),
+					 parser_errposition(pstate, exprLocation(node))));
+		if (nmatches != 1 && selectedType != preferredType)
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("RANGE with offset PRECEDING/FOLLOWING has multiple interpretations for column type %s and offset type %s",
+							format_type_be(rangeopcintype),
+							format_type_be(nodeType)),
+					 errhint("Cast the offset value to the exact intended type."),
+					 parser_errposition(pstate, exprLocation(node))));
+
+		/* OK, coerce the offset to the right type */
 		constructName = "RANGE";
-		/* error was already thrown by gram.y, this is just a backstop */
-		elog(ERROR, "window frame with value offset is not implemented");
+		node = coerce_to_specific_type(pstate, node,
+									   selectedType, constructName);
+		*inRangeFunc = selectedFunc;
+	}
+	else if (frameOptions & FRAMEOPTION_GROUPS)
+	{
+		/* Transform the raw expression tree */
+		node = transformExpr(pstate, clause, EXPR_KIND_WINDOW_FRAME_GROUPS);
+
+		/*
+		 * Like LIMIT clause, simply coerce to int8
+		 */
+		constructName = "GROUPS";
+		node = coerce_to_specific_type(pstate, node, INT8OID, constructName);
 	}
 	else
 	{
diff --git a/src/backend/parser/parse_coerce.c b/src/backend/parser/parse_coerce.c
index 0bc7dba6a0..085aa8766c 100644
--- a/src/backend/parser/parse_coerce.c
+++ b/src/backend/parser/parse_coerce.c
@@ -3,7 +3,7 @@
  * parse_coerce.c
  *		handle type coercions/conversions for parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -34,15 +34,16 @@
 
 static Node *coerce_type_typmod(Node *node,
 				   Oid targetTypeId, int32 targetTypMod,
-				   CoercionForm cformat, int location,
-				   bool isExplicit, bool hideInputCoercion);
+				   CoercionContext ccontext, CoercionForm cformat,
+				   int location,
+				   bool hideInputCoercion);
 static void hide_coercion_node(Node *node);
 static Node *build_coercion_expression(Node *node,
 						  CoercionPathType pathtype,
 						  Oid funcId,
 						  Oid targetTypeId, int32 targetTypMod,
-						  CoercionForm cformat, int location,
-						  bool isExplicit);
+						  CoercionContext ccontext, CoercionForm cformat,
+						  int location);
 static Node *coerce_record_to_complex(ParseState *pstate, Node *node,
 						 Oid targetTypeId,
 						 CoercionContext ccontext,
@@ -110,8 +111,7 @@ coerce_to_target_type(ParseState *pstate, Node *expr, Oid exprtype,
 	 */
 	result = coerce_type_typmod(result,
 								targettype, targettypmod,
-								cformat, location,
-								(cformat != COERCE_IMPLICIT_CAST),
+								ccontext, cformat, location,
 								(result != expr && !IsA(result, Const)));
 
 	if (expr != origexpr)
@@ -355,7 +355,8 @@ coerce_type(ParseState *pstate, Node *node,
 			result = coerce_to_domain(result,
 									  baseTypeId, baseTypeMod,
 									  targetTypeId,
-									  cformat, location, false, false);
+									  ccontext, cformat, location,
+									  false);
 
 		ReleaseSysCache(baseType);
 
@@ -369,11 +370,11 @@ coerce_type(ParseState *pstate, Node *node,
 		 * transformed node (very possibly the same Param node), or return
 		 * NULL to indicate we should proceed with normal coercion.
 		 */
-		result = (*pstate->p_coerce_param_hook) (pstate,
-												 (Param *) node,
-												 targetTypeId,
-												 targetTypeMod,
-												 location);
+		result = pstate->p_coerce_param_hook(pstate,
+											 (Param *) node,
+											 targetTypeId,
+											 targetTypeMod,
+											 location);
 		if (result)
 			return result;
 	}
@@ -417,20 +418,17 @@ coerce_type(ParseState *pstate, Node *node,
 
 			result = build_coercion_expression(node, pathtype, funcId,
 											   baseTypeId, baseTypeMod,
-											   cformat, location,
-											   (cformat != COERCE_IMPLICIT_CAST));
+											   ccontext, cformat, location);
 
 			/*
 			 * If domain, coerce to the domain type and relabel with domain
-			 * type ID.  We can skip the internal length-coercion step if the
-			 * selected coercion function was a type-and-length coercion.
+			 * type ID, hiding the previous coercion node.
 			 */
 			if (targetTypeId != baseTypeId)
 				result = coerce_to_domain(result, baseTypeId, baseTypeMod,
 										  targetTypeId,
-										  cformat, location, true,
-										  exprIsLengthCoercion(result,
-															   NULL));
+										  ccontext, cformat, location,
+										  true);
 		}
 		else
 		{
@@ -444,7 +442,8 @@ coerce_type(ParseState *pstate, Node *node,
 			 * then we won't need a RelabelType node.
 			 */
 			result = coerce_to_domain(node, InvalidOid, -1, targetTypeId,
-									  cformat, location, false, false);
+									  ccontext, cformat, location,
+									  false);
 			if (result == node)
 			{
 				/*
@@ -500,9 +499,26 @@ coerce_type(ParseState *pstate, Node *node,
 		 * Input class type is a subclass of target, so generate an
 		 * appropriate runtime conversion (removing unneeded columns and
 		 * possibly rearranging the ones that are wanted).
+		 *
+		 * We will also get here when the input is a domain over a subclass of
+		 * the target type.  To keep life simple for the executor, we define
+		 * ConvertRowtypeExpr as only working between regular composite types;
+		 * therefore, in such cases insert a RelabelType to smash the input
+		 * expression down to its base type.
 		 */
+		Oid			baseTypeId = getBaseType(inputTypeId);
 		ConvertRowtypeExpr *r = makeNode(ConvertRowtypeExpr);
 
+		if (baseTypeId != inputTypeId)
+		{
+			RelabelType *rt = makeRelabelType((Expr *) node,
+											  baseTypeId, -1,
+											  InvalidOid,
+											  COERCE_IMPLICIT_CAST);
+
+			rt->location = location;
+			node = (Node *) rt;
+		}
 		r->arg = (Expr *) node;
 		r->resulttype = targetTypeId;
 		r->convertformat = cformat;
@@ -636,19 +652,17 @@ can_coerce_type(int nargs, Oid *input_typeids, Oid *target_typeids,
  * 'baseTypeMod': base type typmod of domain, if known (pass -1 if caller
  *		has not bothered to look this up)
  * 'typeId': target type to coerce to
- * 'cformat': coercion format
+ * 'ccontext': context indicator to control coercions
+ * 'cformat': coercion display format
  * 'location': coercion request location
  * 'hideInputCoercion': if true, hide the input coercion under this one.
- * 'lengthCoercionDone': if true, caller already accounted for length,
- *		ie the input is already of baseTypMod as well as baseTypeId.
  *
  * If the target type isn't a domain, the given 'arg' is returned as-is.
  */
 Node *
 coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
-				 CoercionForm cformat, int location,
-				 bool hideInputCoercion,
-				 bool lengthCoercionDone)
+				 CoercionContext ccontext, CoercionForm cformat, int location,
+				 bool hideInputCoercion)
 {
 	CoerceToDomain *result;
 
@@ -677,14 +691,9 @@ coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
 	 * would be safe to do anyway, without lots of knowledge about what the
 	 * base type thinks the typmod means.
 	 */
-	if (!lengthCoercionDone)
-	{
-		if (baseTypeMod >= 0)
-			arg = coerce_type_typmod(arg, baseTypeId, baseTypeMod,
-									 COERCE_IMPLICIT_CAST, location,
-									 (cformat != COERCE_IMPLICIT_CAST),
-									 false);
-	}
+	arg = coerce_type_typmod(arg, baseTypeId, baseTypeMod,
+							 ccontext, COERCE_IMPLICIT_CAST, location,
+							 false);
 
 	/*
 	 * Now build the domain coercion node.  This represents run-time checking
@@ -714,11 +723,14 @@ coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
  * The caller must have already ensured that the value is of the correct
  * type, typically by applying coerce_type.
  *
- * cformat determines the display properties of the generated node (if any),
- * while isExplicit may affect semantics.  If hideInputCoercion is true
- * *and* we generate a node, the input node is forced to IMPLICIT display
- * form, so that only the typmod coercion node will be visible when
- * displaying the expression.
+ * ccontext may affect semantics, depending on whether the length coercion
+ * function pays attention to the isExplicit flag it's passed.
+ *
+ * cformat determines the display properties of the generated node (if any).
+ *
+ * If hideInputCoercion is true *and* we generate a node, the input node is
+ * forced to IMPLICIT display form, so that only the typmod coercion node will
+ * be visible when displaying the expression.
  *
  * NOTE: this does not need to work on domain types, because any typmod
  * coercion for a domain is considered to be part of the type coercion
@@ -726,8 +738,9 @@ coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod, Oid typeId,
  */
 static Node *
 coerce_type_typmod(Node *node, Oid targetTypeId, int32 targetTypMod,
-				   CoercionForm cformat, int location,
-				   bool isExplicit, bool hideInputCoercion)
+				   CoercionContext ccontext, CoercionForm cformat,
+				   int location,
+				   bool hideInputCoercion)
 {
 	CoercionPathType pathtype;
 	Oid			funcId;
@@ -749,8 +762,7 @@ coerce_type_typmod(Node *node, Oid targetTypeId, int32 targetTypMod,
 
 		node = build_coercion_expression(node, pathtype, funcId,
 										 targetTypeId, targetTypMod,
-										 cformat, location,
-										 isExplicit);
+										 ccontext, cformat, location);
 	}
 
 	return node;
@@ -799,8 +811,8 @@ build_coercion_expression(Node *node,
 						  CoercionPathType pathtype,
 						  Oid funcId,
 						  Oid targetTypeId, int32 targetTypMod,
-						  CoercionForm cformat, int location,
-						  bool isExplicit)
+						  CoercionContext ccontext, CoercionForm cformat,
+						  int location)
 {
 	int			nargs = 0;
 
@@ -865,7 +877,7 @@ build_coercion_expression(Node *node,
 							 -1,
 							 InvalidOid,
 							 sizeof(bool),
-							 BoolGetDatum(isExplicit),
+							 BoolGetDatum(ccontext == COERCION_EXPLICIT),
 							 false,
 							 true);
 
@@ -881,19 +893,52 @@ build_coercion_expression(Node *node,
 	{
 		/* We need to build an ArrayCoerceExpr */
 		ArrayCoerceExpr *acoerce = makeNode(ArrayCoerceExpr);
+		CaseTestExpr *ctest = makeNode(CaseTestExpr);
+		Oid			sourceBaseTypeId;
+		int32		sourceBaseTypeMod;
+		Oid			targetElementType;
+		Node	   *elemexpr;
+
+		/*
+		 * Look through any domain over the source array type.  Note we don't
+		 * expect that the target type is a domain; it must be a plain array.
+		 * (To get to a domain target type, we'll do coerce_to_domain later.)
+		 */
+		sourceBaseTypeMod = exprTypmod(node);
+		sourceBaseTypeId = getBaseTypeAndTypmod(exprType(node),
+												&sourceBaseTypeMod);
+
+		/* Set up CaseTestExpr representing one element of source array */
+		ctest->typeId = get_element_type(sourceBaseTypeId);
+		Assert(OidIsValid(ctest->typeId));
+		ctest->typeMod = sourceBaseTypeMod;
+		ctest->collation = InvalidOid;	/* Assume coercions don't care */
+
+		/* And coerce it to the target element type */
+		targetElementType = get_element_type(targetTypeId);
+		Assert(OidIsValid(targetElementType));
+
+		elemexpr = coerce_to_target_type(NULL,
+										 (Node *) ctest,
+										 ctest->typeId,
+										 targetElementType,
+										 targetTypMod,
+										 ccontext,
+										 cformat,
+										 location);
+		if (elemexpr == NULL)	/* shouldn't happen */
+			elog(ERROR, "failed to coerce array element type as expected");
 
 		acoerce->arg = (Expr *) node;
-		acoerce->elemfuncid = funcId;
+		acoerce->elemexpr = (Expr *) elemexpr;
 		acoerce->resulttype = targetTypeId;
 
 		/*
-		 * Label the output as having a particular typmod only if we are
-		 * really invoking a length-coercion function, ie one with more than
-		 * one argument.
+		 * Label the output as having a particular element typmod only if we
+		 * ended up with a per-element expression that is labeled that way.
 		 */
-		acoerce->resulttypmod = (nargs >= 2) ? targetTypMod : -1;
+		acoerce->resulttypmod = exprTypmod(elemexpr);
 		/* resultcollid will be set by parse_collate.c */
-		acoerce->isExplicit = isExplicit;
 		acoerce->coerceformat = cformat;
 		acoerce->location = location;
 
@@ -938,6 +983,8 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 						 int location)
 {
 	RowExpr    *rowexpr;
+	Oid			baseTypeId;
+	int32		baseTypeMod = -1;
 	TupleDesc	tupdesc;
 	List	   *args = NIL;
 	List	   *newargs;
@@ -973,7 +1020,14 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 						format_type_be(targetTypeId)),
 				 parser_coercion_errposition(pstate, location, node)));
 
-	tupdesc = lookup_rowtype_tupdesc(targetTypeId, -1);
+	/*
+	 * Look up the composite type, accounting for possibility that what we are
+	 * given is a domain over composite.
+	 */
+	baseTypeId = getBaseTypeAndTypmod(targetTypeId, &baseTypeMod);
+	tupdesc = lookup_rowtype_tupdesc(baseTypeId, baseTypeMod);
+
+	/* Process the fields */
 	newargs = NIL;
 	ucolno = 1;
 	arg = list_head(args);
@@ -982,9 +1036,10 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 		Node	   *expr;
 		Node	   *cexpr;
 		Oid			exprtype;
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
 		/* Fill in NULLs for dropped columns in rowtype */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 		{
 			/*
 			 * can't use atttypid here, but it doesn't really matter what type
@@ -1008,8 +1063,8 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 
 		cexpr = coerce_to_target_type(pstate,
 									  expr, exprtype,
-									  tupdesc->attrs[i]->atttypid,
-									  tupdesc->attrs[i]->atttypmod,
+									  attr->atttypid,
+									  attr->atttypmod,
 									  ccontext,
 									  COERCE_IMPLICIT_CAST,
 									  -1);
@@ -1021,7 +1076,7 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 							format_type_be(targetTypeId)),
 					 errdetail("Cannot cast type %s to %s in column %d.",
 							   format_type_be(exprtype),
-							   format_type_be(tupdesc->attrs[i]->atttypid),
+							   format_type_be(attr->atttypid),
 							   ucolno),
 					 parser_coercion_errposition(pstate, location, expr)));
 		newargs = lappend(newargs, cexpr);
@@ -1041,10 +1096,22 @@ coerce_record_to_complex(ParseState *pstate, Node *node,
 
 	rowexpr = makeNode(RowExpr);
 	rowexpr->args = newargs;
-	rowexpr->row_typeid = targetTypeId;
+	rowexpr->row_typeid = baseTypeId;
 	rowexpr->row_format = cformat;
 	rowexpr->colnames = NIL;	/* not needed for named target type */
 	rowexpr->location = location;
+
+	/* If target is a domain, apply constraints */
+	if (baseTypeId != targetTypeId)
+	{
+		rowexpr->row_format = COERCE_IMPLICIT_CAST;
+		return coerce_to_domain((Node *) rowexpr,
+								baseTypeId, baseTypeMod,
+								targetTypeId,
+								ccontext, cformat, location,
+								false);
+	}
+
 	return (Node *) rowexpr;
 }
 
@@ -1398,7 +1465,7 @@ coerce_to_common_type(ParseState *pstate, Node *node,
  * that is, so long as there is no use of ANYELEMENT.  This is mostly for
  * backwards compatibility with the pre-7.4 behavior of ANYARRAY.
  *
- * We do not ereport here, but just return FALSE if a rule is violated.
+ * We do not ereport here, but just return false if a rule is violated.
  */
 bool
 check_generic_type_consistency(Oid *actual_arg_types,
@@ -2021,7 +2088,7 @@ TypeCategory(Oid type)
 /* IsPreferredType()
  *		Check if this type is a preferred type for the given category.
  *
- * If category is TYPCATEGORY_INVALID, then we'll return TRUE for preferred
+ * If category is TYPCATEGORY_INVALID, then we'll return true for preferred
  * types of any category; otherwise, only for preferred types of that
  * category.
  */
@@ -2147,8 +2214,7 @@ IsBinaryCoercible(Oid srctype, Oid targettype)
  *	COERCION_PATH_RELABELTYPE: binary-compatible cast, no function needed
  *				*funcid is set to InvalidOid
  *	COERCION_PATH_ARRAYCOERCE: need an ArrayCoerceExpr node
- *				*funcid is set to the element cast function, or InvalidOid
- *				if the array elements are binary-compatible
+ *				*funcid is set to InvalidOid
  *	COERCION_PATH_COERCEVIAIO: need a CoerceViaIO node
  *				*funcid is set to InvalidOid
  *
@@ -2234,11 +2300,8 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 	{
 		/*
 		 * If there's no pg_cast entry, perhaps we are dealing with a pair of
-		 * array types.  If so, and if the element types have a suitable cast,
-		 * report that we can coerce with an ArrayCoerceExpr.
-		 *
-		 * Note that the source type can be a domain over array, but not the
-		 * target, because ArrayCoerceExpr won't check domain constraints.
+		 * array types.  If so, and if their element types have a conversion
+		 * pathway, report that we can coerce with an ArrayCoerceExpr.
 		 *
 		 * Hack: disallow coercions to oidvector and int2vector, which
 		 * otherwise tend to capture coercions that should go to "real" array
@@ -2253,7 +2316,7 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 			Oid			sourceElem;
 
 			if ((targetElem = get_element_type(targetTypeId)) != InvalidOid &&
-				(sourceElem = get_base_element_type(sourceTypeId)) != InvalidOid)
+				(sourceElem = get_element_type(sourceTypeId)) != InvalidOid)
 			{
 				CoercionPathType elempathtype;
 				Oid			elemfuncid;
@@ -2262,14 +2325,9 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
 													 sourceElem,
 													 ccontext,
 													 &elemfuncid);
-				if (elempathtype != COERCION_PATH_NONE &&
-					elempathtype != COERCION_PATH_ARRAYCOERCE)
+				if (elempathtype != COERCION_PATH_NONE)
 				{
-					*funcid = elemfuncid;
-					if (elempathtype == COERCION_PATH_COERCEVIAIO)
-						result = COERCION_PATH_COERCEVIAIO;
-					else
-						result = COERCION_PATH_ARRAYCOERCE;
+					result = COERCION_PATH_ARRAYCOERCE;
 				}
 			}
 		}
@@ -2310,7 +2368,9 @@ find_coercion_pathway(Oid targetTypeId, Oid sourceTypeId,
  * If the given type is a varlena array type, we do not look for a coercion
  * function associated directly with the array type, but instead look for
  * one associated with the element type.  An ArrayCoerceExpr node must be
- * used to apply such a function.
+ * used to apply such a function.  (Note: currently, it's pointless to
+ * return the funcid in this case, because it'll just get looked up again
+ * in the recursive construction of the ArrayCoerceExpr's elemexpr.)
  *
  * We use the same result enum as find_coercion_pathway, but the only possible
  * result codes are:
@@ -2379,13 +2439,13 @@ is_complex_array(Oid typid)
 
 /*
  * Check whether reltypeId is the row type of a typed table of type
- * reloftypeId.  (This is conceptually similar to the subtype
- * relationship checked by typeInheritsFrom().)
+ * reloftypeId, or is a domain over such a row type.  (This is conceptually
+ * similar to the subtype relationship checked by typeInheritsFrom().)
  */
 static bool
 typeIsOfTypedTable(Oid reltypeId, Oid reloftypeId)
 {
-	Oid			relid = typeidTypeRelid(reltypeId);
+	Oid			relid = typeOrDomainTypeRelid(reltypeId);
 	bool		result = false;
 
 	if (relid)
diff --git a/src/backend/parser/parse_collate.c b/src/backend/parser/parse_collate.c
index 0d106c4c19..6d34245083 100644
--- a/src/backend/parser/parse_collate.c
+++ b/src/backend/parser/parse_collate.c
@@ -29,7 +29,7 @@
  * at runtime.  If we knew exactly which functions require collation
  * information, we could throw those errors at parse time instead.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/parser/parse_cte.c b/src/backend/parser/parse_cte.c
index 5160fdb0e0..d28c421b6f 100644
--- a/src/backend/parser/parse_cte.c
+++ b/src/backend/parser/parse_cte.c
@@ -3,7 +3,7 @@
  * parse_cte.c
  *	  handle CTEs (common table expressions) in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/parser/parse_enr.c b/src/backend/parser/parse_enr.c
index 1cfcf65a51..069249b732 100644
--- a/src/backend/parser/parse_enr.c
+++ b/src/backend/parser/parse_enr.c
@@ -3,7 +3,7 @@
  * parse_enr.c
  *	  parser support routines dealing with ephemeral named relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/parser/parse_expr.c b/src/backend/parser/parse_expr.c
index 6d8cb07766..385e54a9b6 100644
--- a/src/backend/parser/parse_expr.c
+++ b/src/backend/parser/parse_expr.c
@@ -3,7 +3,7 @@
  * parse_expr.c
  *	  handle expressions in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -386,7 +386,7 @@ transformExprRecurse(ParseState *pstate, Node *expr)
  * selection from an arbitrary node needs it.)
  */
 static void
-unknown_attribute(ParseState *pstate, Node *relref, char *attname,
+unknown_attribute(ParseState *pstate, Node *relref, const char *attname,
 				  int location)
 {
 	RangeTblEntry *rte;
@@ -480,6 +480,7 @@ transformIndirection(ParseState *pstate, A_Indirection *ind)
 										  list_make1(result),
 										  last_srf,
 										  NULL,
+										  false,
 										  location);
 			if (newresult == NULL)
 				unknown_attribute(pstate, result, strVal(n), location);
@@ -527,7 +528,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 	 */
 	if (pstate->p_pre_columnref_hook != NULL)
 	{
-		node = (*pstate->p_pre_columnref_hook) (pstate, cref);
+		node = pstate->p_pre_columnref_hook(pstate, cref);
 		if (node != NULL)
 			return node;
 	}
@@ -629,6 +630,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 											 list_make1(node),
 											 pstate->p_last_srf,
 											 NULL,
+											 false,
 											 cref->location);
 				}
 				break;
@@ -676,6 +678,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 											 list_make1(node),
 											 pstate->p_last_srf,
 											 NULL,
+											 false,
 											 cref->location);
 				}
 				break;
@@ -736,6 +739,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 											 list_make1(node),
 											 pstate->p_last_srf,
 											 NULL,
+											 false,
 											 cref->location);
 				}
 				break;
@@ -758,7 +762,7 @@ transformColumnRef(ParseState *pstate, ColumnRef *cref)
 	{
 		Node	   *hookresult;
 
-		hookresult = (*pstate->p_post_columnref_hook) (pstate, cref, node);
+		hookresult = pstate->p_post_columnref_hook(pstate, cref, node);
 		if (node == NULL)
 			node = hookresult;
 		else if (hookresult != NULL)
@@ -813,7 +817,7 @@ transformParamRef(ParseState *pstate, ParamRef *pref)
 	 * call it.  If not, or if the hook returns NULL, throw a generic error.
 	 */
 	if (pstate->p_paramref_hook != NULL)
-		result = (*pstate->p_paramref_hook) (pstate, pref);
+		result = pstate->p_paramref_hook(pstate, pref);
 	else
 		result = NULL;
 
@@ -1477,6 +1481,7 @@ transformFuncCall(ParseState *pstate, FuncCall *fn)
 							 targs,
 							 last_srf,
 							 fn,
+							 false,
 							 fn->location);
 }
 
@@ -1800,6 +1805,7 @@ transformSubLink(ParseState *pstate, SubLink *sublink)
 		case EXPR_KIND_WINDOW_ORDER:
 		case EXPR_KIND_WINDOW_FRAME_RANGE:
 		case EXPR_KIND_WINDOW_FRAME_ROWS:
+		case EXPR_KIND_WINDOW_FRAME_GROUPS:
 		case EXPR_KIND_SELECT_TARGET:
 		case EXPR_KIND_INSERT_TARGET:
 		case EXPR_KIND_UPDATE_SOURCE:
@@ -1840,6 +1846,9 @@ transformSubLink(ParseState *pstate, SubLink *sublink)
 		case EXPR_KIND_PARTITION_EXPRESSION:
 			err = _("cannot use subquery in partition key expression");
 			break;
+		case EXPR_KIND_CALL_ARGUMENT:
+			err = _("cannot use subquery in CALL argument");
+			break;
 
 			/*
 			 * There is intentionally no default: case here, so that the
@@ -2585,9 +2594,9 @@ transformCurrentOfExpr(ParseState *pstate, CurrentOfExpr *cexpr)
 
 		/* See if there is a translation available from a parser hook */
 		if (pstate->p_pre_columnref_hook != NULL)
-			node = (*pstate->p_pre_columnref_hook) (pstate, cref);
+			node = pstate->p_pre_columnref_hook(pstate, cref);
 		if (node == NULL && pstate->p_post_columnref_hook != NULL)
-			node = (*pstate->p_post_columnref_hook) (pstate, cref, NULL);
+			node = pstate->p_post_columnref_hook(pstate, cref, NULL);
 
 		/*
 		 * XXX Should we throw an error if we get a translation that isn't a
@@ -3422,6 +3431,8 @@ ParseExprKindName(ParseExprKind exprKind)
 			return "window RANGE";
 		case EXPR_KIND_WINDOW_FRAME_ROWS:
 			return "window ROWS";
+		case EXPR_KIND_WINDOW_FRAME_GROUPS:
+			return "window GROUPS";
 		case EXPR_KIND_SELECT_TARGET:
 			return "SELECT";
 		case EXPR_KIND_INSERT_TARGET:
@@ -3462,6 +3473,8 @@ ParseExprKindName(ParseExprKind exprKind)
 			return "WHEN";
 		case EXPR_KIND_PARTITION_EXPRESSION:
 			return "PARTITION BY";
+		case EXPR_KIND_CALL_ARGUMENT:
+			return "CALL";
 
 			/*
 			 * There is intentionally no default: case here, so that the
diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c
index 8487edaa95..2a4ac09d5c 100644
--- a/src/backend/parser/parse_func.c
+++ b/src/backend/parser/parse_func.c
@@ -3,7 +3,7 @@
  * parse_func.c
  *		handle function calls in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -39,7 +39,7 @@ static void unify_hypothetical_args(ParseState *pstate,
 						List *fargs, int numAggregatedArgs,
 						Oid *actual_arg_types, Oid *declared_arg_types);
 static Oid	FuncNameAsType(List *funcname);
-static Node *ParseComplexProjection(ParseState *pstate, char *funcname,
+static Node *ParseComplexProjection(ParseState *pstate, const char *funcname,
 					   Node *first_arg, int location);
 
 
@@ -71,7 +71,7 @@ static Node *ParseComplexProjection(ParseState *pstate, char *funcname,
  */
 Node *
 ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
-				  Node *last_srf, FuncCall *fn, int location)
+				  Node *last_srf, FuncCall *fn, bool proc_call, int location)
 {
 	bool		is_column = (fn == NULL);
 	List	   *agg_order = (fn ? fn->agg_order : NIL);
@@ -263,7 +263,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 						   actual_arg_types[0], rettype, -1,
 						   COERCION_EXPLICIT, COERCE_EXPLICIT_CALL, location);
 	}
-	else if (fdresult == FUNCDETAIL_NORMAL)
+	else if (fdresult == FUNCDETAIL_NORMAL || fdresult == FUNCDETAIL_PROCEDURE)
 	{
 		/*
 		 * Normal function found; was there anything indicating it must be an
@@ -306,6 +306,26 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 					 errmsg("OVER specified, but %s is not a window function nor an aggregate function",
 							NameListToString(funcname)),
 					 parser_errposition(pstate, location)));
+
+		if (fdresult == FUNCDETAIL_NORMAL && proc_call)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_FUNCTION),
+					 errmsg("%s is not a procedure",
+							func_signature_string(funcname, nargs,
+												  argnames,
+												  actual_arg_types)),
+					 errhint("To call a function, use SELECT."),
+					 parser_errposition(pstate, location)));
+
+		if (fdresult == FUNCDETAIL_PROCEDURE && !proc_call)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_FUNCTION),
+					 errmsg("%s is a procedure",
+							func_signature_string(funcname, nargs,
+												  argnames,
+												  actual_arg_types)),
+					 errhint("To call a procedure, use CALL."),
+					 parser_errposition(pstate, location)));
 	}
 	else if (fdresult == FUNCDETAIL_AGGREGATE)
 	{
@@ -316,6 +336,15 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		Form_pg_aggregate classForm;
 		int			catDirectArgs;
 
+		if (proc_call)
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_FUNCTION),
+					 errmsg("%s is not a procedure",
+							func_signature_string(funcname, nargs,
+												  argnames,
+												  actual_arg_types)),
+					 parser_errposition(pstate, location)));
+
 		tup = SearchSysCache1(AGGFNOID, ObjectIdGetDatum(funcid));
 		if (!HeapTupleIsValid(tup)) /* should not happen */
 			elog(ERROR, "cache lookup failed for aggregate %u", funcid);
@@ -635,7 +664,7 @@ ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
 		check_srf_call_placement(pstate, last_srf, location);
 
 	/* build the appropriate output structure */
-	if (fdresult == FUNCDETAIL_NORMAL)
+	if (fdresult == FUNCDETAIL_NORMAL || fdresult == FUNCDETAIL_PROCEDURE)
 	{
 		FuncExpr   *funcexpr = makeNode(FuncExpr);
 
@@ -1589,6 +1618,8 @@ func_get_detail(List *funcname,
 			result = FUNCDETAIL_AGGREGATE;
 		else if (pform->proiswindow)
 			result = FUNCDETAIL_WINDOWFUNC;
+		else if (pform->prorettype == InvalidOid)
+			result = FUNCDETAIL_PROCEDURE;
 		else
 			result = FUNCDETAIL_NORMAL;
 		ReleaseSysCache(ftup);
@@ -1790,7 +1821,7 @@ FuncNameAsType(List *funcname)
  *	  transformed expression tree.  If not, return NULL.
  */
 static Node *
-ParseComplexProjection(ParseState *pstate, char *funcname, Node *first_arg,
+ParseComplexProjection(ParseState *pstate, const char *funcname, Node *first_arg,
 					   int location)
 {
 	TupleDesc	tupdesc;
@@ -1819,22 +1850,23 @@ ParseComplexProjection(ParseState *pstate, char *funcname, Node *first_arg,
 	}
 
 	/*
-	 * Else do it the hard way with get_expr_result_type().
+	 * Else do it the hard way with get_expr_result_tupdesc().
 	 *
 	 * If it's a Var of type RECORD, we have to work even harder: we have to
-	 * find what the Var refers to, and pass that to get_expr_result_type.
+	 * find what the Var refers to, and pass that to get_expr_result_tupdesc.
 	 * That task is handled by expandRecordVariable().
 	 */
 	if (IsA(first_arg, Var) &&
 		((Var *) first_arg)->vartype == RECORDOID)
 		tupdesc = expandRecordVariable(pstate, (Var *) first_arg, 0);
-	else if (get_expr_result_type(first_arg, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+	else
+		tupdesc = get_expr_result_tupdesc(first_arg, true);
+	if (!tupdesc)
 		return NULL;			/* unresolvable RECORD type */
-	Assert(tupdesc);
 
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-		Form_pg_attribute att = tupdesc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
 		if (strcmp(funcname, NameStr(att->attname)) == 0 &&
 			!att->attisdropped)
@@ -1983,16 +2015,28 @@ LookupFuncName(List *funcname, int nargs, const Oid *argtypes, bool noError)
 
 /*
  * LookupFuncWithArgs
- *		Like LookupFuncName, but the argument types are specified by a
- *		ObjectWithArgs node.
+ *
+ * Like LookupFuncName, but the argument types are specified by a
+ * ObjectWithArgs node.  Also, this function can check whether the result is a
+ * function, procedure, or aggregate, based on the objtype argument.  Pass
+ * OBJECT_ROUTINE to accept any of them.
+ *
+ * For historical reasons, we also accept aggregates when looking for a
+ * function.
  */
 Oid
-LookupFuncWithArgs(ObjectWithArgs *func, bool noError)
+LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func, bool noError)
 {
 	Oid			argoids[FUNC_MAX_ARGS];
 	int			argcount;
 	int			i;
 	ListCell   *args_item;
+	Oid			oid;
+
+	Assert(objtype == OBJECT_AGGREGATE ||
+		   objtype == OBJECT_FUNCTION ||
+		   objtype == OBJECT_PROCEDURE ||
+		   objtype == OBJECT_ROUTINE);
 
 	argcount = list_length(func->objargs);
 	if (argcount > FUNC_MAX_ARGS)
@@ -2012,90 +2056,100 @@ LookupFuncWithArgs(ObjectWithArgs *func, bool noError)
 		args_item = lnext(args_item);
 	}
 
-	return LookupFuncName(func->objname, func->args_unspecified ? -1 : argcount, argoids, noError);
-}
-
-/*
- * LookupAggWithArgs
- *		Find an aggregate function from a given ObjectWithArgs node.
- *
- * This is almost like LookupFuncWithArgs, but the error messages refer
- * to aggregates rather than plain functions, and we verify that the found
- * function really is an aggregate.
- */
-Oid
-LookupAggWithArgs(ObjectWithArgs *agg, bool noError)
-{
-	Oid			argoids[FUNC_MAX_ARGS];
-	int			argcount;
-	int			i;
-	ListCell   *lc;
-	Oid			oid;
-	HeapTuple	ftup;
-	Form_pg_proc pform;
-
-	argcount = list_length(agg->objargs);
-	if (argcount > FUNC_MAX_ARGS)
-		ereport(ERROR,
-				(errcode(ERRCODE_TOO_MANY_ARGUMENTS),
-				 errmsg_plural("functions cannot have more than %d argument",
-							   "functions cannot have more than %d arguments",
-							   FUNC_MAX_ARGS,
-							   FUNC_MAX_ARGS)));
+	/*
+	 * When looking for a function or routine, we pass noError through to
+	 * LookupFuncName and let it make any error messages.  Otherwise, we make
+	 * our own errors for the aggregate and procedure cases.
+	 */
+	oid = LookupFuncName(func->objname, func->args_unspecified ? -1 : argcount, argoids,
+						 (objtype == OBJECT_FUNCTION || objtype == OBJECT_ROUTINE) ? noError : true);
 
-	i = 0;
-	foreach(lc, agg->objargs)
+	if (objtype == OBJECT_FUNCTION)
 	{
-		TypeName   *t = (TypeName *) lfirst(lc);
-
-		argoids[i] = LookupTypeNameOid(NULL, t, noError);
-		i++;
+		/* Make sure it's a function, not a procedure */
+		if (oid && get_func_rettype(oid) == InvalidOid)
+		{
+			if (noError)
+				return InvalidOid;
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("%s is not a function",
+							func_signature_string(func->objname, argcount,
+												  NIL, argoids))));
+		}
 	}
-
-	oid = LookupFuncName(agg->objname, argcount, argoids, true);
-
-	if (!OidIsValid(oid))
+	else if (objtype == OBJECT_PROCEDURE)
 	{
-		if (noError)
-			return InvalidOid;
-		if (argcount == 0)
-			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_FUNCTION),
-					 errmsg("aggregate %s(*) does not exist",
-							NameListToString(agg->objname))));
-		else
+		if (!OidIsValid(oid))
+		{
+			if (noError)
+				return InvalidOid;
+			else if (func->args_unspecified)
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("could not find a procedure named \"%s\"",
+								NameListToString(func->objname))));
+			else
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("procedure %s does not exist",
+								func_signature_string(func->objname, argcount,
+													  NIL, argoids))));
+		}
+
+		/* Make sure it's a procedure */
+		if (get_func_rettype(oid) != InvalidOid)
+		{
+			if (noError)
+				return InvalidOid;
 			ereport(ERROR,
-					(errcode(ERRCODE_UNDEFINED_FUNCTION),
-					 errmsg("aggregate %s does not exist",
-							func_signature_string(agg->objname, argcount,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("%s is not a procedure",
+							func_signature_string(func->objname, argcount,
 												  NIL, argoids))));
+		}
 	}
-
-	/* Make sure it's an aggregate */
-	ftup = SearchSysCache1(PROCOID, ObjectIdGetDatum(oid));
-	if (!HeapTupleIsValid(ftup))	/* should not happen */
-		elog(ERROR, "cache lookup failed for function %u", oid);
-	pform = (Form_pg_proc) GETSTRUCT(ftup);
-
-	if (!pform->proisagg)
+	else if (objtype == OBJECT_AGGREGATE)
 	{
-		ReleaseSysCache(ftup);
-		if (noError)
-			return InvalidOid;
-		/* we do not use the (*) notation for functions... */
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("function %s is not an aggregate",
-						func_signature_string(agg->objname, argcount,
-											  NIL, argoids))));
-	}
+		if (!OidIsValid(oid))
+		{
+			if (noError)
+				return InvalidOid;
+			else if (func->args_unspecified)
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("could not find a aggregate named \"%s\"",
+								NameListToString(func->objname))));
+			else if (argcount == 0)
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("aggregate %s(*) does not exist",
+								NameListToString(func->objname))));
+			else
+				ereport(ERROR,
+						(errcode(ERRCODE_UNDEFINED_FUNCTION),
+						 errmsg("aggregate %s does not exist",
+								func_signature_string(func->objname, argcount,
+													  NIL, argoids))));
+		}
 
-	ReleaseSysCache(ftup);
+		/* Make sure it's an aggregate */
+		if (!get_func_isagg(oid))
+		{
+			if (noError)
+				return InvalidOid;
+			/* we do not use the (*) notation for functions... */
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("function %s is not an aggregate",
+							func_signature_string(func->objname, argcount,
+												  NIL, argoids))));
+		}
+	}
 
 	return oid;
 }
 
-
 /*
  * check_srf_call_placement
  *		Verify that a set-returning function is called in a valid place,
@@ -2173,6 +2227,7 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location)
 			break;
 		case EXPR_KIND_WINDOW_FRAME_RANGE:
 		case EXPR_KIND_WINDOW_FRAME_ROWS:
+		case EXPR_KIND_WINDOW_FRAME_GROUPS:
 			err = _("set-returning functions are not allowed in window definitions");
 			break;
 		case EXPR_KIND_SELECT_TARGET:
@@ -2235,6 +2290,9 @@ check_srf_call_placement(ParseState *pstate, Node *last_srf, int location)
 		case EXPR_KIND_PARTITION_EXPRESSION:
 			err = _("set-returning functions are not allowed in partition key expressions");
 			break;
+		case EXPR_KIND_CALL_ARGUMENT:
+			err = _("set-returning functions are not allowed in CALL arguments");
+			break;
 
 			/*
 			 * There is intentionally no default: case here, so that the
diff --git a/src/backend/parser/parse_node.c b/src/backend/parser/parse_node.c
index 6dbad53a41..d2672882d7 100644
--- a/src/backend/parser/parse_node.c
+++ b/src/backend/parser/parse_node.c
@@ -3,7 +3,7 @@
  * parse_node.c
  *	  various routines that make nodes for querytrees
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/parser/parse_oper.c b/src/backend/parser/parse_oper.c
index e9bf50243f..b279e1236a 100644
--- a/src/backend/parser/parse_oper.c
+++ b/src/backend/parser/parse_oper.c
@@ -3,7 +3,7 @@
  * parse_oper.c
  *		handle operator things for parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -723,7 +723,10 @@ op_error(ParseState *pstate, List *op, char oprkind,
 				(errcode(ERRCODE_UNDEFINED_FUNCTION),
 				 errmsg("operator does not exist: %s",
 						op_signature_string(op, oprkind, arg1, arg2)),
-				 errhint("No operator matches the given name and argument type(s). "
+				 (!arg1 || !arg2) ?
+				 errhint("No operator matches the given name and argument type. "
+						 "You might need to add an explicit type cast.") :
+				 errhint("No operator matches the given name and argument types. "
 						 "You might need to add explicit type casts."),
 				 parser_errposition(pstate, location)));
 }
@@ -1020,7 +1023,7 @@ static HTAB *OprCacheHash = NULL;
  * make_oper_cache_key
  *		Fill the lookup key struct given operator name and arg types.
  *
- * Returns TRUE if successful, FALSE if the search_path overflowed
+ * Returns true if successful, false if the search_path overflowed
  * (hence no caching is possible).
  *
  * pstate/location are used only to report the error position; pass NULL/-1
diff --git a/src/backend/parser/parse_param.c b/src/backend/parser/parse_param.c
index 3e04e8c4d1..454a3e07f7 100644
--- a/src/backend/parser/parse_param.c
+++ b/src/backend/parser/parse_param.c
@@ -12,7 +12,7 @@
  * Note that other approaches to parameters are possible using the parser
  * hooks defined in ParseState.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 684a50d3df..053ae02c9f 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -3,7 +3,7 @@
  * parse_relation.c
  *	  parser support routines dealing with relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -652,7 +652,7 @@ updateFuzzyAttrMatchState(int fuzzy_rte_penalty,
  * for an approximate match and update fuzzystate accordingly.
  */
 Node *
-scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, char *colname,
+scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, const char *colname,
 				 int location, int fuzzy_rte_penalty,
 				 FuzzyAttrMatchState *fuzzystate)
 {
@@ -754,7 +754,7 @@ scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte, char *colname,
  *	  If localonly is true, only names in the innermost query are considered.
  */
 Node *
-colNameToVar(ParseState *pstate, char *colname, bool localonly,
+colNameToVar(ParseState *pstate, const char *colname, bool localonly,
 			 int location)
 {
 	Node	   *result = NULL;
@@ -828,7 +828,7 @@ colNameToVar(ParseState *pstate, char *colname, bool localonly,
  * and 'second' will contain the attribute number for the second match.
  */
 static FuzzyAttrMatchState *
-searchRangeTableForCol(ParseState *pstate, const char *alias, char *colname,
+searchRangeTableForCol(ParseState *pstate, const char *alias, const char *colname,
 					   int location)
 {
 	ParseState *orig_pstate = pstate;
@@ -1052,7 +1052,7 @@ buildRelationAliases(TupleDesc tupdesc, Alias *alias, Alias *eref)
 
 	for (varattno = 0; varattno < maxattrs; varattno++)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[varattno];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, varattno);
 		Value	   *attrname;
 
 		if (attr->attisdropped)
@@ -1159,19 +1159,13 @@ parserOpenTable(ParseState *pstate, const RangeVar *relation, int lockmode)
 							relation->schemaname, relation->relname)));
 		else
 		{
-			/*
-			 * An unqualified name might be a named ephemeral relation.
-			 */
-			if (get_visible_ENR_metadata(pstate->p_queryEnv, relation->relname))
-				rel = NULL;
-
 			/*
 			 * An unqualified name might have been meant as a reference to
 			 * some not-yet-in-scope CTE.  The bare "does not exist" message
 			 * has proven remarkably unhelpful for figuring out such problems,
 			 * so we take pains to offer a specific hint.
 			 */
-			else if (isFutureCTE(pstate, relation->relname))
+			if (isFutureCTE(pstate, relation->relname))
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_TABLE),
 						 errmsg("relation \"%s\" does not exist",
@@ -1502,7 +1496,8 @@ addRangeTableEntryForFunction(ParseState *pstate,
 						 parser_errposition(pstate, exprLocation(funcexpr))));
 		}
 
-		if (functypclass == TYPEFUNC_COMPOSITE)
+		if (functypclass == TYPEFUNC_COMPOSITE ||
+			functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
 		{
 			/* Composite data type, e.g. a table's row type */
 			Assert(tupdesc);
@@ -2014,11 +2009,13 @@ addRangeTableEntryForENR(ParseState *pstate,
 
 	/*
 	 * Build the list of effective column names using user-supplied aliases
-	 * and/or actual column names.  Also build the cannibalized fields.
+	 * and/or actual column names.
 	 */
 	tupdesc = ENRMetadataGetTupDesc(enrmd);
 	rte->eref = makeAlias(refname, NIL);
 	buildRelationAliases(tupdesc, alias, rte->eref);
+
+	/* Record additional data for ENR, including column type info */
 	rte->enrname = enrmd->name;
 	rte->enrtuples = enrmd->enrtuples;
 	rte->coltypes = NIL;
@@ -2026,19 +2023,26 @@ addRangeTableEntryForENR(ParseState *pstate,
 	rte->colcollations = NIL;
 	for (attno = 1; attno <= tupdesc->natts; ++attno)
 	{
-		if (tupdesc->attrs[attno - 1]->atttypid == InvalidOid &&
-			!(tupdesc->attrs[attno - 1]->attisdropped))
-			elog(ERROR, "atttypid was invalid for column which has not been dropped from \"%s\"",
-				 rv->relname);
-		rte->coltypes =
-			lappend_oid(rte->coltypes,
-						tupdesc->attrs[attno - 1]->atttypid);
-		rte->coltypmods =
-			lappend_int(rte->coltypmods,
-						tupdesc->attrs[attno - 1]->atttypmod);
-		rte->colcollations =
-			lappend_oid(rte->colcollations,
-						tupdesc->attrs[attno - 1]->attcollation);
+		Form_pg_attribute att = TupleDescAttr(tupdesc, attno - 1);
+
+		if (att->attisdropped)
+		{
+			/* Record zeroes for a dropped column */
+			rte->coltypes = lappend_oid(rte->coltypes, InvalidOid);
+			rte->coltypmods = lappend_int(rte->coltypmods, 0);
+			rte->colcollations = lappend_oid(rte->colcollations, InvalidOid);
+		}
+		else
+		{
+			/* Let's just make sure we can tell this isn't dropped */
+			if (att->atttypid == InvalidOid)
+				elog(ERROR, "atttypid is invalid for non-dropped column in \"%s\"",
+					 rv->relname);
+			rte->coltypes = lappend_oid(rte->coltypes, att->atttypid);
+			rte->coltypmods = lappend_int(rte->coltypmods, att->atttypmod);
+			rte->colcollations = lappend_oid(rte->colcollations,
+											 att->attcollation);
+		}
 	}
 
 	/*
@@ -2153,8 +2157,8 @@ addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
  *
  * This creates lists of an RTE's column names (aliases if provided, else
  * real names) and Vars for each column.  Only user columns are considered.
- * If include_dropped is FALSE then dropped columns are omitted from the
- * results.  If include_dropped is TRUE then empty strings and NULL constants
+ * If include_dropped is false then dropped columns are omitted from the
+ * results.  If include_dropped is true then empty strings and NULL constants
  * (not Vars!) are returned for dropped columns.
  *
  * rtindex, sublevels_up, and location are the varno, varlevelsup, and location
@@ -2201,13 +2205,22 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 					varattno++;
 					Assert(varattno == te->resno);
 
+					/*
+					 * In scenarios where columns have been added to a view
+					 * since the outer query was originally parsed, there can
+					 * be more items in the subquery tlist than the outer
+					 * query expects.  We should ignore such extra column(s)
+					 * --- compare the behavior for composite-returning
+					 * functions, in the RTE_FUNCTION case below.
+					 */
+					if (!aliasp_item)
+						break;
+
 					if (colnames)
 					{
-						/* Assume there is one alias per target item */
 						char	   *label = strVal(lfirst(aliasp_item));
 
 						*colnames = lappend(*colnames, makeString(pstrdup(label)));
-						aliasp_item = lnext(aliasp_item);
 					}
 
 					if (colvars)
@@ -2223,6 +2236,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 
 						*colvars = lappend(*colvars, varnode);
 					}
+
+					aliasp_item = lnext(aliasp_item);
 				}
 			}
 			break;
@@ -2242,7 +2257,8 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 					functypclass = get_expr_result_type(rtfunc->funcexpr,
 														&funcrettype,
 														&tupdesc);
-					if (functypclass == TYPEFUNC_COMPOSITE)
+					if (functypclass == TYPEFUNC_COMPOSITE ||
+						functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
 					{
 						/* Composite data type, e.g. a table's row type */
 						Assert(tupdesc);
@@ -2417,7 +2433,7 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 		case RTE_CTE:
 		case RTE_NAMEDTUPLESTORE:
 			{
-				/* Tablefunc, Values or CTE RTE */
+				/* Tablefunc, Values, CTE, or ENR RTE */
 				ListCell   *aliasp_item = list_head(rte->eref->colnames);
 				ListCell   *lct;
 				ListCell   *lcm;
@@ -2437,23 +2453,43 @@ expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 					if (colnames)
 					{
 						/* Assume there is one alias per output column */
-						char	   *label = strVal(lfirst(aliasp_item));
+						if (OidIsValid(coltype))
+						{
+							char	   *label = strVal(lfirst(aliasp_item));
+
+							*colnames = lappend(*colnames,
+												makeString(pstrdup(label)));
+						}
+						else if (include_dropped)
+							*colnames = lappend(*colnames,
+												makeString(pstrdup("")));
 
-						*colnames = lappend(*colnames,
-											makeString(pstrdup(label)));
 						aliasp_item = lnext(aliasp_item);
 					}
 
 					if (colvars)
 					{
-						Var		   *varnode;
+						if (OidIsValid(coltype))
+						{
+							Var		   *varnode;
 
-						varnode = makeVar(rtindex, varattno,
-										  coltype, coltypmod, colcoll,
-										  sublevels_up);
-						varnode->location = location;
+							varnode = makeVar(rtindex, varattno,
+											  coltype, coltypmod, colcoll,
+											  sublevels_up);
+							varnode->location = location;
 
-						*colvars = lappend(*colvars, varnode);
+							*colvars = lappend(*colvars, varnode);
+						}
+						else if (include_dropped)
+						{
+							/*
+							 * It doesn't really matter what type the Const
+							 * claims to be.
+							 */
+							*colvars = lappend(*colvars,
+											   makeNullConst(INT4OID, -1,
+															 InvalidOid));
+						}
 					}
 				}
 			}
@@ -2514,7 +2550,7 @@ expandTupleDesc(TupleDesc tupdesc, Alias *eref, int count, int offset,
 	Assert(count <= tupdesc->natts);
 	for (varattno = 0; varattno < count; varattno++)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[varattno];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, varattno);
 
 		if (attr->attisdropped)
 		{
@@ -2651,7 +2687,7 @@ get_rte_attribute_name(RangeTblEntry *rte, AttrNumber attnum)
 	 * built (which can easily happen for rules).
 	 */
 	if (rte->rtekind == RTE_RELATION)
-		return get_relid_attribute_name(rte->relid, attnum);
+		return get_attname(rte->relid, attnum, false);
 
 	/*
 	 * Otherwise use the column name from eref.  There should always be one.
@@ -2742,14 +2778,15 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 															&funcrettype,
 															&tupdesc);
 
-						if (functypclass == TYPEFUNC_COMPOSITE)
+						if (functypclass == TYPEFUNC_COMPOSITE ||
+							functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
 						{
 							/* Composite data type, e.g. a table's row type */
 							Form_pg_attribute att_tup;
 
 							Assert(tupdesc);
 							Assert(attnum <= tupdesc->natts);
-							att_tup = tupdesc->attrs[attnum - 1];
+							att_tup = TupleDescAttr(tupdesc, attnum - 1);
 
 							/*
 							 * If dropped column, pretend it ain't there.  See
@@ -2832,13 +2869,21 @@ get_rte_attribute_type(RangeTblEntry *rte, AttrNumber attnum,
 		case RTE_NAMEDTUPLESTORE:
 			{
 				/*
-				 * tablefunc, VALUES or CTE RTE --- get type info from lists
-				 * in the RTE
+				 * tablefunc, VALUES, CTE, or ENR RTE --- get type info from
+				 * lists in the RTE
 				 */
 				Assert(attnum > 0 && attnum <= list_length(rte->coltypes));
 				*vartype = list_nth_oid(rte->coltypes, attnum - 1);
 				*vartypmod = list_nth_int(rte->coltypmods, attnum - 1);
 				*varcollid = list_nth_oid(rte->colcollations, attnum - 1);
+
+				/* For ENR, better check for dropped column */
+				if (!OidIsValid(*vartype))
+					ereport(ERROR,
+							(errcode(ERRCODE_UNDEFINED_COLUMN),
+							 errmsg("column %d of relation \"%s\" does not exist",
+									attnum,
+									rte->eref->aliasname)));
 			}
 			break;
 		default:
@@ -2889,15 +2934,11 @@ get_rte_attribute_is_dropped(RangeTblEntry *rte, AttrNumber attnum)
 			break;
 		case RTE_NAMEDTUPLESTORE:
 			{
-				Assert(rte->enrname);
-
-				/*
-				 * We checked when we loaded coltypes for the tuplestore that
-				 * InvalidOid was only used for dropped columns, so it is safe
-				 * to count on that here.
-				 */
-				result =
-					((list_nth_oid(rte->coltypes, attnum - 1) == InvalidOid));
+				/* Check dropped-ness by testing for valid coltype */
+				if (attnum <= 0 ||
+					attnum > list_length(rte->coltypes))
+					elog(ERROR, "invalid varattno %d", attnum);
+				result = !OidIsValid((list_nth_oid(rte->coltypes, attnum - 1)));
 			}
 			break;
 		case RTE_JOIN:
@@ -2939,21 +2980,19 @@ get_rte_attribute_is_dropped(RangeTblEntry *rte, AttrNumber attnum)
 					if (attnum > atts_done &&
 						attnum <= atts_done + rtfunc->funccolcount)
 					{
-						TypeFuncClass functypclass;
-						Oid			funcrettype;
 						TupleDesc	tupdesc;
 
-						functypclass = get_expr_result_type(rtfunc->funcexpr,
-															&funcrettype,
-															&tupdesc);
-						if (functypclass == TYPEFUNC_COMPOSITE)
+						tupdesc = get_expr_result_tupdesc(rtfunc->funcexpr,
+														  true);
+						if (tupdesc)
 						{
 							/* Composite data type, e.g. a table's row type */
 							Form_pg_attribute att_tup;
 
 							Assert(tupdesc);
 							Assert(attnum - atts_done <= tupdesc->natts);
-							att_tup = tupdesc->attrs[attnum - atts_done - 1];
+							att_tup = TupleDescAttr(tupdesc,
+													attnum - atts_done - 1);
 							return att_tup->attisdropped;
 						}
 						/* Otherwise, it can't have any dropped columns */
@@ -3042,7 +3081,7 @@ attnameAttNum(Relation rd, const char *attname, bool sysColOK)
 
 	for (i = 0; i < rd->rd_rel->relnatts; i++)
 	{
-		Form_pg_attribute att = rd->rd_att->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(rd->rd_att, i);
 
 		if (namestrcmp(&(att->attname), attname) == 0 && !att->attisdropped)
 			return i + 1;
@@ -3102,7 +3141,7 @@ attnumAttName(Relation rd, int attid)
 	}
 	if (attid > rd->rd_att->natts)
 		elog(ERROR, "invalid attribute number %d", attid);
-	return &rd->rd_att->attrs[attid - 1]->attname;
+	return &TupleDescAttr(rd->rd_att, attid - 1)->attname;
 }
 
 /*
@@ -3124,7 +3163,7 @@ attnumTypeId(Relation rd, int attid)
 	}
 	if (attid > rd->rd_att->natts)
 		elog(ERROR, "invalid attribute number %d", attid);
-	return rd->rd_att->attrs[attid - 1]->atttypid;
+	return TupleDescAttr(rd->rd_att, attid - 1)->atttypid;
 }
 
 /*
@@ -3142,7 +3181,7 @@ attnumCollationId(Relation rd, int attid)
 	}
 	if (attid > rd->rd_att->natts)
 		elog(ERROR, "invalid attribute number %d", attid);
-	return rd->rd_att->attrs[attid - 1]->attcollation;
+	return TupleDescAttr(rd->rd_att, attid - 1)->attcollation;
 }
 
 /*
@@ -3209,7 +3248,7 @@ errorMissingRTE(ParseState *pstate, RangeVar *relation)
  */
 void
 errorMissingColumn(ParseState *pstate,
-				   char *relname, char *colname, int location)
+				   const char *relname, const char *colname, int location)
 {
 	FuzzyAttrMatchState *state;
 	char	   *closestfirst = NULL;
@@ -3276,7 +3315,7 @@ errorMissingColumn(ParseState *pstate,
 
 
 /*
- * Examine a fully-parsed query, and return TRUE iff any relation underlying
+ * Examine a fully-parsed query, and return true iff any relation underlying
  * the query is a temporary relation (table, view, or materialized view).
  */
 bool
diff --git a/src/backend/parser/parse_target.c b/src/backend/parser/parse_target.c
index 0a70539fb1..ea209cdab6 100644
--- a/src/backend/parser/parse_target.c
+++ b/src/backend/parser/parse_target.c
@@ -3,7 +3,7 @@
  * parse_target.c
  *	  handle target lists
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -455,7 +455,7 @@ Expr *
 transformAssignedExpr(ParseState *pstate,
 					  Expr *expr,
 					  ParseExprKind exprKind,
-					  char *colname,
+					  const char *colname,
 					  int attrno,
 					  List *indirection,
 					  int location)
@@ -484,8 +484,8 @@ transformAssignedExpr(ParseState *pstate,
 						colname),
 				 parser_errposition(pstate, location)));
 	attrtype = attnumTypeId(rd, attrno);
-	attrtypmod = rd->rd_att->attrs[attrno - 1]->atttypmod;
-	attrcollation = rd->rd_att->attrs[attrno - 1]->attcollation;
+	attrtypmod = TupleDescAttr(rd->rd_att, attrno - 1)->atttypmod;
+	attrcollation = TupleDescAttr(rd->rd_att, attrno - 1)->attcollation;
 
 	/*
 	 * If the expression is a DEFAULT placeholder, insert the attribute's
@@ -725,6 +725,8 @@ transformAssignmentIndirection(ParseState *pstate,
 		else
 		{
 			FieldStore *fstore;
+			Oid			baseTypeId;
+			int32		baseTypeMod;
 			Oid			typrelid;
 			AttrNumber	attnum;
 			Oid			fieldTypeId;
@@ -752,7 +754,14 @@ transformAssignmentIndirection(ParseState *pstate,
 
 			/* No subscripts, so can process field selection here */
 
-			typrelid = typeidTypeRelid(targetTypeId);
+			/*
+			 * Look up the composite type, accounting for possibility that
+			 * what we are given is a domain over composite.
+			 */
+			baseTypeMod = targetTypMod;
+			baseTypeId = getBaseTypeAndTypmod(targetTypeId, &baseTypeMod);
+
+			typrelid = typeidTypeRelid(baseTypeId);
 			if (!typrelid)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -796,7 +805,17 @@ transformAssignmentIndirection(ParseState *pstate,
 			fstore->arg = (Expr *) basenode;
 			fstore->newvals = list_make1(rhs);
 			fstore->fieldnums = list_make1_int(attnum);
-			fstore->resulttype = targetTypeId;
+			fstore->resulttype = baseTypeId;
+
+			/* If target is a domain, apply constraints */
+			if (baseTypeId != targetTypeId)
+				return coerce_to_domain((Node *) fstore,
+										baseTypeId, baseTypeMod,
+										targetTypeId,
+										COERCION_IMPLICIT,
+										COERCE_IMPLICIT_CAST,
+										location,
+										false);
 
 			return (Node *) fstore;
 		}
@@ -959,19 +978,21 @@ checkInsertTargets(ParseState *pstate, List *cols, List **attrnos)
 		/*
 		 * Generate default column list for INSERT.
 		 */
-		Form_pg_attribute *attr = pstate->p_target_relation->rd_att->attrs;
 		int			numcol = pstate->p_target_relation->rd_rel->relnatts;
 		int			i;
 
 		for (i = 0; i < numcol; i++)
 		{
 			ResTarget  *col;
+			Form_pg_attribute attr;
 
-			if (attr[i]->attisdropped)
+			attr = TupleDescAttr(pstate->p_target_relation->rd_att, i);
+
+			if (attr->attisdropped)
 				continue;
 
 			col = makeNode(ResTarget);
-			col->name = pstrdup(NameStr(attr[i]->attname));
+			col->name = pstrdup(NameStr(attr->attname));
 			col->indirection = NIL;
 			col->val = NULL;
 			col->location = -1;
@@ -1106,7 +1127,7 @@ ExpandColumnRefStar(ParseState *pstate, ColumnRef *cref,
 		{
 			Node	   *node;
 
-			node = (*pstate->p_pre_columnref_hook) (pstate, cref);
+			node = pstate->p_pre_columnref_hook(pstate, cref);
 			if (node != NULL)
 				return ExpandRowReference(pstate, node, make_target_entry);
 		}
@@ -1161,8 +1182,8 @@ ExpandColumnRefStar(ParseState *pstate, ColumnRef *cref,
 		{
 			Node	   *node;
 
-			node = (*pstate->p_post_columnref_hook) (pstate, cref,
-													 (Node *) rte);
+			node = pstate->p_post_columnref_hook(pstate, cref,
+												 (Node *) rte);
 			if (node != NULL)
 			{
 				if (rte != NULL)
@@ -1385,29 +1406,25 @@ ExpandRowReference(ParseState *pstate, Node *expr,
 	 * (This can be pretty inefficient if the expression involves nontrivial
 	 * computation :-(.)
 	 *
-	 * Verify it's a composite type, and get the tupdesc.  We use
-	 * get_expr_result_type() because that can handle references to functions
-	 * returning anonymous record types.  If that fails, use
-	 * lookup_rowtype_tupdesc(), which will almost certainly fail as well, but
-	 * it will give an appropriate error message.
+	 * Verify it's a composite type, and get the tupdesc.
+	 * get_expr_result_tupdesc() handles this conveniently.
 	 *
 	 * If it's a Var of type RECORD, we have to work even harder: we have to
-	 * find what the Var refers to, and pass that to get_expr_result_type.
+	 * find what the Var refers to, and pass that to get_expr_result_tupdesc.
 	 * That task is handled by expandRecordVariable().
 	 */
 	if (IsA(expr, Var) &&
 		((Var *) expr)->vartype == RECORDOID)
 		tupleDesc = expandRecordVariable(pstate, (Var *) expr, 0);
-	else if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
-		tupleDesc = lookup_rowtype_tupdesc_copy(exprType(expr),
-												exprTypmod(expr));
+	else
+		tupleDesc = get_expr_result_tupdesc(expr, false);
 	Assert(tupleDesc);
 
 	/* Generate a list of references to the individual fields */
 	numAttrs = tupleDesc->natts;
 	for (i = 0; i < numAttrs; i++)
 	{
-		Form_pg_attribute att = tupleDesc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(tupleDesc, i);
 		FieldSelect *fselect;
 
 		if (att->attisdropped)
@@ -1509,8 +1526,8 @@ expandRecordVariable(ParseState *pstate, Var *var, int levelsup)
 		case RTE_NAMEDTUPLESTORE:
 
 			/*
-			 * This case should not occur: a column of a table or values list
-			 * shouldn't have type RECORD.  Fall through and fail (most
+			 * This case should not occur: a column of a table, values list,
+			 * or ENR shouldn't have type RECORD.  Fall through and fail (most
 			 * likely) at the bottom.
 			 */
 			break;
@@ -1608,15 +1625,9 @@ expandRecordVariable(ParseState *pstate, Var *var, int levelsup)
 
 	/*
 	 * We now have an expression we can't expand any more, so see if
-	 * get_expr_result_type() can do anything with it.  If not, pass to
-	 * lookup_rowtype_tupdesc() which will probably fail, but will give an
-	 * appropriate error message while failing.
+	 * get_expr_result_tupdesc() can do anything with it.
 	 */
-	if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
-		tupleDesc = lookup_rowtype_tupdesc_copy(exprType(expr),
-												exprTypmod(expr));
-
-	return tupleDesc;
+	return get_expr_result_tupdesc(expr, false);
 }
 
 
diff --git a/src/backend/parser/parse_type.c b/src/backend/parser/parse_type.c
index d0b3fbeb57..d959b6122a 100644
--- a/src/backend/parser/parse_type.c
+++ b/src/backend/parser/parse_type.c
@@ -3,7 +3,7 @@
  * parse_type.c
  *		handle type operations for parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -641,7 +641,10 @@ stringTypeDatum(Type tp, char *string, int32 atttypmod)
 	return OidInputFunctionCall(typinput, string, typioparam, atttypmod);
 }
 
-/* given a typeid, return the type's typrelid (associated relation, if any) */
+/*
+ * Given a typeid, return the type's typrelid (associated relation), if any.
+ * Returns InvalidOid if type is not a composite type.
+ */
 Oid
 typeidTypeRelid(Oid type_id)
 {
@@ -652,13 +655,44 @@ typeidTypeRelid(Oid type_id)
 	typeTuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(type_id));
 	if (!HeapTupleIsValid(typeTuple))
 		elog(ERROR, "cache lookup failed for type %u", type_id);
-
 	type = (Form_pg_type) GETSTRUCT(typeTuple);
 	result = type->typrelid;
 	ReleaseSysCache(typeTuple);
 	return result;
 }
 
+/*
+ * Given a typeid, return the type's typrelid (associated relation), if any.
+ * Returns InvalidOid if type is not a composite type or a domain over one.
+ * This is the same as typeidTypeRelid(getBaseType(type_id)), but faster.
+ */
+Oid
+typeOrDomainTypeRelid(Oid type_id)
+{
+	HeapTuple	typeTuple;
+	Form_pg_type type;
+	Oid			result;
+
+	for (;;)
+	{
+		typeTuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(type_id));
+		if (!HeapTupleIsValid(typeTuple))
+			elog(ERROR, "cache lookup failed for type %u", type_id);
+		type = (Form_pg_type) GETSTRUCT(typeTuple);
+		if (type->typtype != TYPTYPE_DOMAIN)
+		{
+			/* Not a domain, so done looking through domains */
+			break;
+		}
+		/* It is a domain, so examine the base type instead */
+		type_id = type->typbasetype;
+		ReleaseSysCache(typeTuple);
+	}
+	result = type->typrelid;
+	ReleaseSysCache(typeTuple);
+	return result;
+}
+
 /*
  * error context callback for parse failure during parseTypeString()
  */
diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 495ba3dffc..6029eb13d7 100644
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -16,7 +16,7 @@
  * a quick copyObject() call before manipulating the query tree.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/backend/parser/parse_utilcmd.c
@@ -92,6 +92,7 @@ typedef struct
 	IndexStmt  *pkey;			/* PRIMARY KEY index, if any */
 	bool		ispartitioned;	/* true if table is partitioned */
 	PartitionBoundSpec *partbound;	/* transformed FOR VALUES */
+	bool		ofType;			/* true if statement contains OF typename */
 } CreateStmtContext;
 
 /* State shared by transformCreateSchemaStmt and its subroutines */
@@ -117,9 +118,6 @@ static void transformTableLikeClause(CreateStmtContext *cxt,
 						 TableLikeClause *table_like_clause);
 static void transformOfType(CreateStmtContext *cxt,
 				TypeName *ofTypename);
-static IndexStmt *generateClonedIndexStmt(CreateStmtContext *cxt,
-						Relation source_idx,
-						const AttrNumber *attmap, int attmap_length);
 static List *get_collation(Oid collation, Oid actual_datatype);
 static List *get_opclass(Oid opclass, Oid actual_datatype);
 static void transformIndexConstraints(CreateStmtContext *cxt);
@@ -135,6 +133,7 @@ static void transformConstraintAttrs(CreateStmtContext *cxt,
 static void transformColumnType(CreateStmtContext *cxt, ColumnDef *column);
 static void setSchemaName(char *context_schema, char **stmt_schema_name);
 static void transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd);
+static void validateInfiniteBounds(ParseState *pstate, List *blist);
 static Const *transformPartitionBoundValue(ParseState *pstate, A_Const *con,
 							 const char *colName, Oid colType, int32 colTypmod);
 
@@ -239,6 +238,8 @@ transformCreateStmt(CreateStmt *stmt, const char *queryString)
 	cxt.alist = NIL;
 	cxt.pkey = NULL;
 	cxt.ispartitioned = stmt->partspec != NULL;
+	cxt.partbound = stmt->partbound;
+	cxt.ofType = (stmt->ofTypename != NULL);
 
 	/*
 	 * Notice that we allow OIDs here only for plain tables, even though
@@ -471,6 +472,14 @@ generateSerialExtraStmts(CreateStmtContext *cxt, ColumnDef *column,
 
 	cxt->blist = lappend(cxt->blist, seqstmt);
 
+	/*
+	 * Store the identity sequence name that we decided on.  ALTER TABLE
+	 * ... ADD COLUMN ... IDENTITY needs this so that it can fill the new
+	 * column with values from the sequence, while the association of the
+	 * sequence with the table is not set until after the ALTER TABLE.
+	 */
+	column->identitySequence = seqstmt->sequence;
+
 	/*
 	 * Build an ALTER SEQUENCE ... OWNED BY command to mark the sequence as
 	 * owned by this column, and add it to the list of things to be done after
@@ -627,7 +636,7 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 									column->colname, cxt->relation->relname),
 							 parser_errposition(cxt->pstate,
 												constraint->location)));
-				column->is_not_null = FALSE;
+				column->is_not_null = false;
 				saw_nullable = true;
 				break;
 
@@ -639,7 +648,7 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 									column->colname, cxt->relation->relname),
 							 parser_errposition(cxt->pstate,
 												constraint->location)));
-				column->is_not_null = TRUE;
+				column->is_not_null = true;
 				saw_nullable = true;
 				break;
 
@@ -661,6 +670,15 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 					Type		ctype;
 					Oid			typeOid;
 
+					if (cxt->ofType)
+						ereport(ERROR,
+								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								 errmsg("identity columns are not supported on typed tables")));
+					if (cxt->partbound)
+						ereport(ERROR,
+								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								 errmsg("identity columns are not supported on partitions")));
+
 					ctype = typenameType(cxt->pstate, column->typeName, NULL);
 					typeOid = HeapTupleGetOid(ctype);
 					ReleaseSysCache(ctype);
@@ -679,7 +697,7 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 
 					column->identity = constraint->generated_when;
 					saw_identity = true;
-					column->is_not_null = TRUE;
+					column->is_not_null = true;
 					break;
 				}
 
@@ -694,12 +712,6 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 							 errmsg("primary key constraints are not supported on foreign tables"),
 							 parser_errposition(cxt->pstate,
 												constraint->location)));
-				if (cxt->ispartitioned)
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("primary key constraints are not supported on partitioned tables"),
-							 parser_errposition(cxt->pstate,
-												constraint->location)));
 				/* FALL THRU */
 
 			case CONSTR_UNIQUE:
@@ -709,12 +721,6 @@ transformColumnDefinition(CreateStmtContext *cxt, ColumnDef *column)
 							 errmsg("unique constraints are not supported on foreign tables"),
 							 parser_errposition(cxt->pstate,
 												constraint->location)));
-				if (cxt->ispartitioned)
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("unique constraints are not supported on partitioned tables"),
-							 parser_errposition(cxt->pstate,
-												constraint->location)));
 				if (constraint->keys == NIL)
 					constraint->keys = list_make1(makeString(column->colname));
 				cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
@@ -811,12 +817,6 @@ transformTableConstraint(CreateStmtContext *cxt, Constraint *constraint)
 						 errmsg("primary key constraints are not supported on foreign tables"),
 						 parser_errposition(cxt->pstate,
 											constraint->location)));
-			if (cxt->ispartitioned)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("primary key constraints are not supported on partitioned tables"),
-						 parser_errposition(cxt->pstate,
-											constraint->location)));
 			cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
 			break;
 
@@ -827,12 +827,6 @@ transformTableConstraint(CreateStmtContext *cxt, Constraint *constraint)
 						 errmsg("unique constraints are not supported on foreign tables"),
 						 parser_errposition(cxt->pstate,
 											constraint->location)));
-			if (cxt->ispartitioned)
-				ereport(ERROR,
-						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						 errmsg("unique constraints are not supported on partitioned tables"),
-						 parser_errposition(cxt->pstate,
-											constraint->location)));
 			cxt->ixconstraints = lappend(cxt->ixconstraints, constraint);
 			break;
 
@@ -941,7 +935,7 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 		aclresult = pg_type_aclcheck(relation->rd_rel->reltype, GetUserId(),
 									 ACL_USAGE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TYPE,
+			aclcheck_error(aclresult, OBJECT_TYPE,
 						   RelationGetRelationName(relation));
 	}
 	else
@@ -949,7 +943,7 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 		aclresult = pg_class_aclcheck(RelationGetRelid(relation), GetUserId(),
 									  ACL_SELECT);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_CLASS,
+			aclcheck_error(aclresult, get_relkind_objtype(relation->rd_rel->relkind),
 						   RelationGetRelationName(relation));
 	}
 
@@ -969,7 +963,8 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 	for (parent_attno = 1; parent_attno <= tupleDesc->natts;
 		 parent_attno++)
 	{
-		Form_pg_attribute attribute = tupleDesc->attrs[parent_attno - 1];
+		Form_pg_attribute attribute = TupleDescAttr(tupleDesc,
+													parent_attno - 1);
 		char	   *attributeName = NameStr(attribute->attname);
 		ColumnDef  *def;
 
@@ -1171,8 +1166,9 @@ transformTableLikeClause(CreateStmtContext *cxt, TableLikeClause *table_like_cla
 			parent_index = index_open(parent_index_oid, AccessShareLock);
 
 			/* Build CREATE INDEX statement to recreate the parent_index */
-			index_stmt = generateClonedIndexStmt(cxt, parent_index,
-												 attmap, tupleDesc->natts);
+			index_stmt = generateClonedIndexStmt(cxt->relation, InvalidOid,
+												 parent_index,
+												 attmap, tupleDesc->natts, NULL);
 
 			/* Copy comment on index, if requested */
 			if (table_like_clause->options & CREATE_TABLE_LIKE_COMMENTS)
@@ -1219,7 +1215,7 @@ transformOfType(CreateStmtContext *cxt, TypeName *ofTypename)
 	tupdesc = lookup_rowtype_tupdesc(ofTypeId, -1);
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-		Form_pg_attribute attr = tupdesc->attrs[i];
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 		ColumnDef  *n;
 
 		if (attr->attisdropped)
@@ -1249,14 +1245,15 @@ transformOfType(CreateStmtContext *cxt, TypeName *ofTypename)
 
 /*
  * Generate an IndexStmt node using information from an already existing index
- * "source_idx".  Attribute numbers should be adjusted according to attmap.
+ * "source_idx", for the rel identified either by heapRel or heapRelid.
+ *
+ * Attribute numbers should be adjusted according to attmap.
  */
-static IndexStmt *
-generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
-						const AttrNumber *attmap, int attmap_length)
+IndexStmt *
+generateClonedIndexStmt(RangeVar *heapRel, Oid heapRelid, Relation source_idx,
+						const AttrNumber *attmap, int attmap_length, Oid *constraintOid)
 {
 	Oid			source_relid = RelationGetRelid(source_idx);
-	Form_pg_attribute *attrs = RelationGetDescr(source_idx)->attrs;
 	HeapTuple	ht_idxrel;
 	HeapTuple	ht_idx;
 	HeapTuple	ht_am;
@@ -1274,6 +1271,9 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 	Datum		datum;
 	bool		isnull;
 
+	Assert((heapRel == NULL && OidIsValid(heapRelid)) ||
+		   (heapRel != NULL && !OidIsValid(heapRelid)));
+
 	/*
 	 * Fetch pg_class tuple of source index.  We can't use the copy in the
 	 * relcache entry because it doesn't include optional fields.
@@ -1309,7 +1309,8 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 
 	/* Begin building the IndexStmt */
 	index = makeNode(IndexStmt);
-	index->relation = cxt->relation;
+	index->relation = heapRel;
+	index->relationId = heapRelid;
 	index->accessMethod = pstrdup(NameStr(amrec->amname));
 	if (OidIsValid(idxrelrec->reltablespace))
 		index->tableSpace = get_tablespace_name(idxrelrec->reltablespace);
@@ -1348,6 +1349,9 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 			HeapTuple	ht_constr;
 			Form_pg_constraint conrec;
 
+			if (constraintOid)
+				*constraintOid = constraintId;
+
 			ht_constr = SearchSysCache1(CONSTROID,
 										ObjectIdGetDatum(constraintId));
 			if (!HeapTupleIsValid(ht_constr))
@@ -1434,6 +1438,8 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 	{
 		IndexElem  *iparam;
 		AttrNumber	attnum = idxrec->indkey.values[keyno];
+		Form_pg_attribute attr = TupleDescAttr(RelationGetDescr(source_idx),
+											   keyno);
 		int16		opt = source_idx->rd_indoption[keyno];
 
 		iparam = makeNode(IndexElem);
@@ -1443,7 +1449,7 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 			/* Simple index column */
 			char	   *attname;
 
-			attname = get_relid_attribute_name(indrelid, attnum);
+			attname = get_attname(indrelid, attnum, false);
 			keycoltype = get_atttype(indrelid, attnum);
 
 			iparam->name = attname;
@@ -1481,7 +1487,7 @@ generateClonedIndexStmt(CreateStmtContext *cxt, Relation source_idx,
 		}
 
 		/* Copy the original index column name */
-		iparam->indexcolname = pstrdup(NameStr(attrs[keyno]->attname));
+		iparam->indexcolname = pstrdup(NameStr(attr->attname));
 
 		/* Add the collation name, if non-default */
 		iparam->collation = get_collation(indcollation->values[keyno], keycoltype);
@@ -1921,7 +1927,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 			if (attnum > 0)
 			{
 				Assert(attnum <= heap_rel->rd_att->natts);
-				attform = heap_rel->rd_att->attrs[attnum - 1];
+				attform = TupleDescAttr(heap_rel->rd_att, attnum - 1);
 			}
 			else
 				attform = SystemAttributeDefinition(attnum,
@@ -2007,7 +2013,7 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 		{
 			/* found column in the new table; force it to be NOT NULL */
 			if (constraint->contype == CONSTR_PRIMARY)
-				column->is_not_null = TRUE;
+				column->is_not_null = true;
 		}
 		else if (SystemAttributeByName(key, cxt->hasoids) != NULL)
 		{
@@ -2040,7 +2046,8 @@ transformIndexConstraint(Constraint *constraint, CreateStmtContext *cxt)
 									inh->relname)));
 				for (count = 0; count < rel->rd_att->natts; count++)
 				{
-					Form_pg_attribute inhattr = rel->rd_att->attrs[count];
+					Form_pg_attribute inhattr = TupleDescAttr(rel->rd_att,
+															  count);
 					char	   *inhname = NameStr(inhattr->attname);
 
 					if (inhattr->attisdropped)
@@ -2693,6 +2700,7 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
 	cxt.pkey = NULL;
 	cxt.ispartitioned = (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE);
 	cxt.partbound = NULL;
+	cxt.ofType = false;
 
 	/*
 	 * The only subtypes that currently require parse transformation handling
@@ -3272,18 +3280,39 @@ transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd)
 {
 	Relation	parentRel = cxt->rel;
 
-	/* the table must be partitioned */
-	if (parentRel->rd_rel->relkind != RELKIND_PARTITIONED_TABLE)
-		ereport(ERROR,
-				(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-				 errmsg("\"%s\" is not partitioned",
-						RelationGetRelationName(parentRel))));
-
-	/* transform the partition bound, if any */
-	Assert(RelationGetPartitionKey(parentRel) != NULL);
-	if (cmd->bound != NULL)
-		cxt->partbound = transformPartitionBound(cxt->pstate, parentRel,
-												 cmd->bound);
+	switch (parentRel->rd_rel->relkind)
+	{
+		case RELKIND_PARTITIONED_TABLE:
+			/* transform the partition bound, if any */
+			Assert(RelationGetPartitionKey(parentRel) != NULL);
+			if (cmd->bound != NULL)
+				cxt->partbound = transformPartitionBound(cxt->pstate, parentRel,
+														 cmd->bound);
+			break;
+		case RELKIND_PARTITIONED_INDEX:
+			/* nothing to check */
+			Assert(cmd->bound == NULL);
+			break;
+		case RELKIND_RELATION:
+			/* the table must be partitioned */
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("table \"%s\" is not partitioned",
+							RelationGetRelationName(parentRel))));
+			break;
+		case RELKIND_INDEX:
+			/* the index must be partitioned */
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("index \"%s\" is not partitioned",
+							RelationGetRelationName(parentRel))));
+			break;
+		default:
+			/* parser shouldn't let this case through */
+			elog(ERROR, "\"%s\" is not a partitioned table or index",
+				 RelationGetRelationName(parentRel));
+			break;
+	}
 }
 
 /*
@@ -3304,7 +3333,44 @@ transformPartitionBound(ParseState *pstate, Relation parent,
 	/* Avoid scribbling on input */
 	result_spec = copyObject(spec);
 
-	if (strategy == PARTITION_STRATEGY_LIST)
+	if (spec->is_default)
+	{
+		if (strategy == PARTITION_STRATEGY_HASH)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("a hash-partitioned table may not have a default partition")));
+
+		/*
+		 * In case of the default partition, parser had no way to identify the
+		 * partition strategy. Assign the parent's strategy to the default
+		 * partition bound spec.
+		 */
+		result_spec->strategy = strategy;
+
+		return result_spec;
+	}
+
+	if (strategy == PARTITION_STRATEGY_HASH)
+	{
+		if (spec->strategy != PARTITION_STRATEGY_HASH)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("invalid bound specification for a hash partition"),
+					 parser_errposition(pstate, exprLocation((Node *) spec))));
+
+		if (spec->modulus <= 0)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("modulus for hash partition must be a positive integer")));
+
+		Assert(spec->remainder >= 0);
+
+		if (spec->remainder >= spec->modulus)
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
+					 errmsg("remainder for hash partition must be less than modulus")));
+	}
+	else if (strategy == PARTITION_STRATEGY_LIST)
 	{
 		ListCell   *cell;
 		char	   *colname;
@@ -3319,8 +3385,8 @@ transformPartitionBound(ParseState *pstate, Relation parent,
 
 		/* Get the only column's name in case we need to output an error */
 		if (key->partattrs[0] != 0)
-			colname = get_relid_attribute_name(RelationGetRelid(parent),
-											   key->partattrs[0]);
+			colname = get_attname(RelationGetRelid(parent),
+								  key->partattrs[0], false);
 		else
 			colname = deparse_expression((Node *) linitial(partexprs),
 										 deparse_context_for(RelationGetRelationName(parent),
@@ -3382,6 +3448,13 @@ transformPartitionBound(ParseState *pstate, Relation parent,
 					(errcode(ERRCODE_INVALID_TABLE_DEFINITION),
 					 errmsg("TO must specify exactly one value per partitioning column")));
 
+		/*
+		 * Once we see MINVALUE or MAXVALUE for one column, the remaining
+		 * columns must be the same.
+		 */
+		validateInfiniteBounds(pstate, spec->lowerdatums);
+		validateInfiniteBounds(pstate, spec->upperdatums);
+
 		/* Transform all the constants */
 		i = j = 0;
 		result_spec->lowerdatums = result_spec->upperdatums = NIL;
@@ -3397,8 +3470,8 @@ transformPartitionBound(ParseState *pstate, Relation parent,
 
 			/* Get the column's name in case we need to output an error */
 			if (key->partattrs[i] != 0)
-				colname = get_relid_attribute_name(RelationGetRelid(parent),
-												   key->partattrs[i]);
+				colname = get_attname(RelationGetRelid(parent),
+									  key->partattrs[i], false);
 			else
 			{
 				colname = deparse_expression((Node *) list_nth(partexprs, j),
@@ -3453,6 +3526,46 @@ transformPartitionBound(ParseState *pstate, Relation parent,
 	return result_spec;
 }
 
+/*
+ * validateInfiniteBounds
+ *
+ * Check that a MAXVALUE or MINVALUE specification in a partition bound is
+ * followed only by more of the same.
+ */
+static void
+validateInfiniteBounds(ParseState *pstate, List *blist)
+{
+	ListCell   *lc;
+	PartitionRangeDatumKind kind = PARTITION_RANGE_DATUM_VALUE;
+
+	foreach(lc, blist)
+	{
+		PartitionRangeDatum *prd = castNode(PartitionRangeDatum, lfirst(lc));
+
+		if (kind == prd->kind)
+			continue;
+
+		switch (kind)
+		{
+			case PARTITION_RANGE_DATUM_VALUE:
+				kind = prd->kind;
+				break;
+
+			case PARTITION_RANGE_DATUM_MAXVALUE:
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("every bound following MAXVALUE must also be MAXVALUE"),
+						 parser_errposition(pstate, exprLocation((Node *) prd))));
+
+			case PARTITION_RANGE_DATUM_MINVALUE:
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("every bound following MINVALUE must also be MINVALUE"),
+						 parser_errposition(pstate, exprLocation((Node *) prd))));
+		}
+	}
+}
+
 /*
  * Transform one constant in a partition bound spec
  */
diff --git a/src/backend/parser/parser.c b/src/backend/parser/parser.c
index 245b4cda3b..db30483459 100644
--- a/src/backend/parser/parser.c
+++ b/src/backend/parser/parser.c
@@ -10,7 +10,7 @@
  * analyze.c and related files.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/parser/scan.l b/src/backend/parser/scan.l
index 634bfa512f..eedef7c005 100644
--- a/src/backend/parser/scan.l
+++ b/src/backend/parser/scan.l
@@ -21,7 +21,7 @@
  * Postgres 9.2, this check is made automatically by the Makefile.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -41,6 +41,9 @@
 }
 
 %{
+
+/* LCOV_EXCL_START */
+
 /* Avoid exit() on fatal scanner errors (a bit ugly -- see yy_fatal_error) */
 #undef fprintf
 #define fprintf(file, fmt, msg)  fprintf_to_ereport(fmt, msg)
@@ -1011,6 +1014,8 @@ other			.
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 /*
  * Arrange access to yyextra for subroutines of the main yylex() function.
  * We expect each subroutine to have a yyscanner parameter.  Rather than
diff --git a/src/backend/parser/scansup.c b/src/backend/parser/scansup.c
index c3d2805803..9256524b8d 100644
--- a/src/backend/parser/scansup.c
+++ b/src/backend/parser/scansup.c
@@ -4,7 +4,7 @@
  *	  support routines for the lex/flex scanner, used by both the normal
  * backend as well as the bootstrap backend
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -209,7 +209,7 @@ truncate_identifier(char *ident, int len, bool warn)
 }
 
 /*
- * scanner_isspace() --- return TRUE if flex scanner considers char whitespace
+ * scanner_isspace() --- return true if flex scanner considers char whitespace
  *
  * This should be used instead of the potentially locale-dependent isspace()
  * function when it's important to match the lexer's behavior.
diff --git a/src/backend/port/atomics.c b/src/backend/port/atomics.c
index c0c2b31270..e4e4734dd2 100644
--- a/src/backend/port/atomics.c
+++ b/src/backend/port/atomics.c
@@ -3,7 +3,7 @@
  * atomics.c
  *	   Non-Inline parts of the atomics implementation
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/port/dynloader/aix.h b/src/backend/port/dynloader/aix.h
index 4b1bad6e45..df4f5d5a1a 100644
--- a/src/backend/port/dynloader/aix.h
+++ b/src/backend/port/dynloader/aix.h
@@ -4,7 +4,7 @@
  *	  prototypes for AIX-specific routines
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/aix.h
diff --git a/src/backend/port/dynloader/cygwin.h b/src/backend/port/dynloader/cygwin.h
index 5d819cfd7b..ef05e6b416 100644
--- a/src/backend/port/dynloader/cygwin.h
+++ b/src/backend/port/dynloader/cygwin.h
@@ -2,7 +2,7 @@
  *
  * Dynamic loader declarations for Cygwin
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/cygwin.h
diff --git a/src/backend/port/dynloader/darwin.c b/src/backend/port/dynloader/darwin.c
index f8fdeaf122..93f19878f5 100644
--- a/src/backend/port/dynloader/darwin.c
+++ b/src/backend/port/dynloader/darwin.c
@@ -20,7 +20,7 @@
 #ifdef HAVE_DLOPEN
 
 void *
-pg_dlopen(char *filename)
+pg_dlopen(const char *filename)
 {
 	return dlopen(filename, RTLD_NOW | RTLD_GLOBAL);
 }
@@ -32,7 +32,7 @@ pg_dlclose(void *handle)
 }
 
 PGFunction
-pg_dlsym(void *handle, char *funcname)
+pg_dlsym(void *handle, const char *funcname)
 {
 	/* Do not prepend an underscore: see dlopen(3) */
 	return dlsym(handle, funcname);
@@ -54,7 +54,7 @@ pg_dlerror(void)
 static NSObjectFileImageReturnCode cofiff_result = NSObjectFileImageFailure;
 
 void *
-pg_dlopen(char *filename)
+pg_dlopen(const char *filename)
 {
 	NSObjectFileImage image;
 
@@ -69,11 +69,11 @@ pg_dlopen(char *filename)
 void
 pg_dlclose(void *handle)
 {
-	NSUnLinkModule(handle, FALSE);
+	NSUnLinkModule(handle, NSUNLINKMODULE_OPTION_NONE);
 }
 
 PGFunction
-pg_dlsym(void *handle, char *funcname)
+pg_dlsym(void *handle, const char *funcname)
 {
 	NSSymbol symbol;
 	char	   *symname = (char *) malloc(strlen(funcname) + 2);
diff --git a/src/backend/port/dynloader/darwin.h b/src/backend/port/dynloader/darwin.h
index 44a3bd6b82..292a31de13 100644
--- a/src/backend/port/dynloader/darwin.h
+++ b/src/backend/port/dynloader/darwin.h
@@ -2,7 +2,7 @@
 
 #include "fmgr.h"
 
-void	   *pg_dlopen(char *filename);
-PGFunction	pg_dlsym(void *handle, char *funcname);
+void	   *pg_dlopen(const char *filename);
+PGFunction	pg_dlsym(void *handle, const char *funcname);
 void		pg_dlclose(void *handle);
 char	   *pg_dlerror(void);
diff --git a/src/backend/port/dynloader/freebsd.c b/src/backend/port/dynloader/freebsd.c
index 23547b06bb..54ee0e8448 100644
--- a/src/backend/port/dynloader/freebsd.c
+++ b/src/backend/port/dynloader/freebsd.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/src/backend/port/dynloader/freebsd.h b/src/backend/port/dynloader/freebsd.h
index 6faf07f962..d047b1662e 100644
--- a/src/backend/port/dynloader/freebsd.h
+++ b/src/backend/port/dynloader/freebsd.h
@@ -3,7 +3,7 @@
  * freebsd.h
  *	  port-specific prototypes for FreeBSD
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/freebsd.h
diff --git a/src/backend/port/dynloader/hpux.c b/src/backend/port/dynloader/hpux.c
index 5a0e40146d..d82dd7603b 100644
--- a/src/backend/port/dynloader/hpux.c
+++ b/src/backend/port/dynloader/hpux.c
@@ -3,7 +3,7 @@
  * dynloader.c
  *	  dynamic loader for HP-UX using the shared library mechanism
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,7 +26,7 @@
 #include "utils/dynamic_loader.h"
 
 void *
-pg_dlopen(char *filename)
+pg_dlopen(const char *filename)
 {
 	/*
 	 * Use BIND_IMMEDIATE so that undefined symbols cause a failure return
@@ -41,7 +41,7 @@ pg_dlopen(char *filename)
 }
 
 PGFunction
-pg_dlsym(void *handle, char *funcname)
+pg_dlsym(void *handle, const char *funcname)
 {
 	PGFunction	f;
 
diff --git a/src/backend/port/dynloader/hpux.h b/src/backend/port/dynloader/hpux.h
index 0a17454f2b..1cbc46960e 100644
--- a/src/backend/port/dynloader/hpux.h
+++ b/src/backend/port/dynloader/hpux.h
@@ -3,7 +3,7 @@
  * dynloader.h
  *	  dynamic loader for HP-UX using the shared library mechanism
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -19,7 +19,7 @@
 /* System includes */
 #include "fmgr.h"
 
-extern void *pg_dlopen(char *filename);
-extern PGFunction pg_dlsym(void *handle, char *funcname);
+extern void *pg_dlopen(const char *filename);
+extern PGFunction pg_dlsym(void *handle, const char *funcname);
 extern void pg_dlclose(void *handle);
 extern char *pg_dlerror(void);
diff --git a/src/backend/port/dynloader/linux.c b/src/backend/port/dynloader/linux.c
index 38e19f7484..8735767add 100644
--- a/src/backend/port/dynloader/linux.c
+++ b/src/backend/port/dynloader/linux.c
@@ -6,7 +6,7 @@
  *
  *	  You need to install the dld library on your Linux system!
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -29,7 +29,7 @@
 #ifndef HAVE_DLOPEN
 
 void *
-pg_dlopen(char *filename)
+pg_dlopen(const char *filename)
 {
 #ifndef HAVE_DLD_H
 	elog(ERROR, "dynamic load not supported");
@@ -101,7 +101,7 @@ pg_dlopen(char *filename)
 }
 
 PGFunction
-pg_dlsym(void *handle, char *funcname)
+pg_dlsym(void *handle, const char *funcname)
 {
 #ifndef HAVE_DLD_H
 	return NULL;
diff --git a/src/backend/port/dynloader/linux.h b/src/backend/port/dynloader/linux.h
index d2c25df033..df2852ac58 100644
--- a/src/backend/port/dynloader/linux.h
+++ b/src/backend/port/dynloader/linux.h
@@ -4,7 +4,7 @@
  *		Port-specific prototypes for Linux
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/linux.h
diff --git a/src/backend/port/dynloader/netbsd.c b/src/backend/port/dynloader/netbsd.c
index 475d746514..7b8d90caa7 100644
--- a/src/backend/port/dynloader/netbsd.c
+++ b/src/backend/port/dynloader/netbsd.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/src/backend/port/dynloader/netbsd.h b/src/backend/port/dynloader/netbsd.h
index 2ca332256b..823574abf0 100644
--- a/src/backend/port/dynloader/netbsd.h
+++ b/src/backend/port/dynloader/netbsd.h
@@ -4,7 +4,7 @@
  *	  port-specific prototypes for NetBSD
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/netbsd.h
diff --git a/src/backend/port/dynloader/openbsd.c b/src/backend/port/dynloader/openbsd.c
index 7b481b90d1..2104915c6c 100644
--- a/src/backend/port/dynloader/openbsd.c
+++ b/src/backend/port/dynloader/openbsd.c
@@ -1,5 +1,5 @@
 /*
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1990 The Regents of the University of California.
  * All rights reserved.
  *
diff --git a/src/backend/port/dynloader/openbsd.h b/src/backend/port/dynloader/openbsd.h
index 1130f39b41..a184ca8ecd 100644
--- a/src/backend/port/dynloader/openbsd.h
+++ b/src/backend/port/dynloader/openbsd.h
@@ -3,7 +3,7 @@
  * openbsd.h
  *	  port-specific prototypes for OpenBSD
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/openbsd.h
diff --git a/src/backend/port/dynloader/solaris.h b/src/backend/port/dynloader/solaris.h
index e7638ff0fc..b583c266cf 100644
--- a/src/backend/port/dynloader/solaris.h
+++ b/src/backend/port/dynloader/solaris.h
@@ -4,7 +4,7 @@
  *	  port-specific prototypes for Solaris
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/port/dynloader/solaris.h
diff --git a/src/backend/port/posix_sema.c b/src/backend/port/posix_sema.c
index 5719caf9b5..a2cabe58fc 100644
--- a/src/backend/port/posix_sema.c
+++ b/src/backend/port/posix_sema.c
@@ -15,7 +15,7 @@
  * forked backends, but they could not be accessed by exec'd backends.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/port/sysv_sema.c b/src/backend/port/sysv_sema.c
index d4202feb56..1c178a7317 100644
--- a/src/backend/port/sysv_sema.c
+++ b/src/backend/port/sysv_sema.c
@@ -4,7 +4,7 @@
  *	  Implement PGSemaphores using SysV semaphore facilities
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/port/sysv_shmem.c b/src/backend/port/sysv_shmem.c
index e8cf6d3e93..741c455ccb 100644
--- a/src/backend/port/sysv_shmem.c
+++ b/src/backend/port/sysv_shmem.c
@@ -9,7 +9,7 @@
  * exist, though, because mmap'd shmem provides no way to find out how
  * many processes are attached, which we need for interlocking purposes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/port/tas/sunstudio_sparc.s b/src/backend/port/tas/sunstudio_sparc.s
index 73ff315d1a..b041a296ca 100644
--- a/src/backend/port/tas/sunstudio_sparc.s
+++ b/src/backend/port/tas/sunstudio_sparc.s
@@ -3,7 +3,7 @@
 ! sunstudio_sparc.s
 !	  compare and swap for Sun Studio on Sparc
 !
-! Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+! Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 ! Portions Copyright (c) 1994, Regents of the University of California
 !
 ! IDENTIFICATION
diff --git a/src/backend/port/tas/sunstudio_x86.s b/src/backend/port/tas/sunstudio_x86.s
index 31934b01d4..af2b8c6a17 100644
--- a/src/backend/port/tas/sunstudio_x86.s
+++ b/src/backend/port/tas/sunstudio_x86.s
@@ -3,7 +3,7 @@
 / sunstudio_x86.s
 /	  compare and swap for Sun Studio on x86
 /
-/ Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+/ Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 / Portions Copyright (c) 1994, Regents of the University of California
 /
 / IDENTIFICATION
diff --git a/src/backend/port/win32/crashdump.c b/src/backend/port/win32/crashdump.c
index f06dfd1987..7b84d22679 100644
--- a/src/backend/port/win32/crashdump.c
+++ b/src/backend/port/win32/crashdump.c
@@ -28,7 +28,7 @@
  * be added, though at the cost of a greater chance of the crash dump failing.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32/crashdump.c
diff --git a/src/backend/port/win32/mingwcompat.c b/src/backend/port/win32/mingwcompat.c
index e02b41711e..3577d2538f 100644
--- a/src/backend/port/win32/mingwcompat.c
+++ b/src/backend/port/win32/mingwcompat.c
@@ -3,7 +3,7 @@
  * mingwcompat.c
  *	  MinGW compatibility functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32/mingwcompat.c
diff --git a/src/backend/port/win32/signal.c b/src/backend/port/win32/signal.c
index 0fd993e3f3..f489cee8bd 100644
--- a/src/backend/port/win32/signal.c
+++ b/src/backend/port/win32/signal.c
@@ -3,7 +3,7 @@
  * signal.c
  *	  Microsoft Windows Win32 Signal Emulation Functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32/signal.c
diff --git a/src/backend/port/win32/socket.c b/src/backend/port/win32/socket.c
index ba8b863d82..f4356fe1f3 100644
--- a/src/backend/port/win32/socket.c
+++ b/src/backend/port/win32/socket.c
@@ -3,7 +3,7 @@
  * socket.c
  *	  Microsoft Windows Win32 Socket Functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32/socket.c
diff --git a/src/backend/port/win32/timer.c b/src/backend/port/win32/timer.c
index f0a45f4339..dac105acf5 100644
--- a/src/backend/port/win32/timer.c
+++ b/src/backend/port/win32/timer.c
@@ -8,7 +8,7 @@
  *	  - Does not support interval timer (value->it_interval)
  *	  - Only supports ITIMER_REAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32/timer.c
diff --git a/src/backend/port/win32_sema.c b/src/backend/port/win32_sema.c
index a798510bbc..a924c59cdb 100644
--- a/src/backend/port/win32_sema.c
+++ b/src/backend/port/win32_sema.c
@@ -3,7 +3,7 @@
  * win32_sema.c
  *	  Microsoft Windows Win32 Semaphores Emulation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32_sema.c
diff --git a/src/backend/port/win32_shmem.c b/src/backend/port/win32_shmem.c
index 01f51f3158..fa80cebfbd 100644
--- a/src/backend/port/win32_shmem.c
+++ b/src/backend/port/win32_shmem.c
@@ -3,7 +3,7 @@
  * win32_shmem.c
  *	  Implement shared memory using win32 facilities
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/port/win32_shmem.c
@@ -21,6 +21,7 @@ HANDLE		UsedShmemSegID = INVALID_HANDLE_VALUE;
 void	   *UsedShmemSegAddr = NULL;
 static Size UsedShmemSegSize = 0;
 
+static bool EnableLockPagesPrivilege(int elevel);
 static void pgwin32_SharedMemoryDelete(int status, Datum shmId);
 
 /*
@@ -103,6 +104,66 @@ PGSharedMemoryIsInUse(unsigned long id1, unsigned long id2)
 	return true;
 }
 
+/*
+ * EnableLockPagesPrivilege
+ *
+ * Try to acquire SeLockMemoryPrivilege so we can use large pages.
+ */
+static bool
+EnableLockPagesPrivilege(int elevel)
+{
+	HANDLE hToken;
+	TOKEN_PRIVILEGES tp;
+	LUID luid;
+
+	if (!OpenProcessToken(GetCurrentProcess(), TOKEN_ADJUST_PRIVILEGES | TOKEN_QUERY, &hToken))
+	{
+		ereport(elevel,
+				(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
+				 errdetail("Failed system call was %s.", "OpenProcessToken")));
+		return FALSE;
+	}
+
+	if (!LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &luid))
+	{
+		ereport(elevel,
+				(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
+				 errdetail("Failed system call was %s.", "LookupPrivilegeValue")));
+		CloseHandle(hToken);
+		return FALSE;
+	}
+	tp.PrivilegeCount = 1;
+	tp.Privileges[0].Luid = luid;
+	tp.Privileges[0].Attributes = SE_PRIVILEGE_ENABLED;
+
+	if (!AdjustTokenPrivileges(hToken, FALSE, &tp, 0, NULL, NULL))
+	{
+		ereport(elevel,
+				(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
+				 errdetail("Failed system call was %s.", "AdjustTokenPrivileges")));
+		CloseHandle(hToken);
+		return FALSE;
+	}
+
+	if (GetLastError() != ERROR_SUCCESS)
+	{
+		if (GetLastError() == ERROR_NOT_ALL_ASSIGNED)
+			ereport(elevel,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("could not enable Lock Pages in Memory user right"),
+					 errhint("Assign Lock Pages in Memory user right to the Windows user account which runs PostgreSQL.")));
+		else
+			ereport(elevel,
+					(errmsg("could not enable Lock Pages in Memory user right: error code %lu", GetLastError()),
+					 errdetail("Failed system call was %s.", "AdjustTokenPrivileges")));
+		CloseHandle(hToken);
+		return FALSE;
+	}
+
+	CloseHandle(hToken);
+
+	return TRUE;
+}
 
 /*
  * PGSharedMemoryCreate
@@ -127,11 +188,9 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port,
 	int			i;
 	DWORD		size_high;
 	DWORD		size_low;
-
-	if (huge_pages == HUGE_PAGES_ON)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("huge pages not supported on this platform")));
+	SIZE_T		largePageSize = 0;
+	Size		orig_size = size;
+	DWORD		flProtect = PAGE_READWRITE;
 
 	/* Room for a header? */
 	Assert(size > MAXALIGN(sizeof(PGShmemHeader)));
@@ -140,6 +199,35 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port,
 
 	UsedShmemSegAddr = NULL;
 
+	if (huge_pages == HUGE_PAGES_ON || huge_pages == HUGE_PAGES_TRY)
+	{
+		/* Does the processor support large pages? */
+		largePageSize = GetLargePageMinimum();
+		if (largePageSize == 0)
+		{
+			ereport(huge_pages == HUGE_PAGES_ON ? FATAL : DEBUG1,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("the processor does not support large pages")));
+			ereport(DEBUG1,
+					(errmsg("disabling huge pages")));
+		}
+		else if (!EnableLockPagesPrivilege(huge_pages == HUGE_PAGES_ON ? FATAL : DEBUG1))
+		{
+			ereport(DEBUG1,
+					(errmsg("disabling huge pages")));
+		}
+		else
+		{
+			/* Huge pages available and privilege enabled, so turn on */
+			flProtect = PAGE_READWRITE | SEC_COMMIT | SEC_LARGE_PAGES;
+
+			/* Round size up as appropriate. */
+			if (size % largePageSize != 0)
+				size += largePageSize - (size % largePageSize);
+		}
+	}
+
+retry:
 #ifdef _WIN64
 	size_high = size >> 32;
 #else
@@ -163,16 +251,35 @@ PGSharedMemoryCreate(Size size, bool makePrivate, int port,
 
 		hmap = CreateFileMapping(INVALID_HANDLE_VALUE,	/* Use the pagefile */
 								 NULL,	/* Default security attrs */
-								 PAGE_READWRITE,	/* Memory is Read/Write */
+								 flProtect,
 								 size_high, /* Size Upper 32 Bits	*/
 								 size_low,	/* Size Lower 32 bits */
 								 szShareMem);
 
 		if (!hmap)
-			ereport(FATAL,
-					(errmsg("could not create shared memory segment: error code %lu", GetLastError()),
-					 errdetail("Failed system call was CreateFileMapping(size=%zu, name=%s).",
-							   size, szShareMem)));
+		{
+			if (GetLastError() == ERROR_NO_SYSTEM_RESOURCES &&
+				huge_pages == HUGE_PAGES_TRY &&
+				(flProtect & SEC_LARGE_PAGES) != 0)
+			{
+				elog(DEBUG1, "CreateFileMapping(%zu) with SEC_LARGE_PAGES failed, "
+					 "huge pages disabled",
+					 size);
+
+				/*
+				 * Use the original size, not the rounded-up value, when falling back
+				 * to non-huge pages.
+				 */
+				size = orig_size;
+				flProtect = PAGE_READWRITE;
+				goto retry;
+			}
+			else
+				ereport(FATAL,
+						(errmsg("could not create shared memory segment: error code %lu", GetLastError()),
+						 errdetail("Failed system call was CreateFileMapping(size=%zu, name=%s).",
+								   size, szShareMem)));
+		}
 
 		/*
 		 * If the segment already existed, CreateFileMapping() will return a
diff --git a/src/backend/postmaster/autovacuum.c b/src/backend/postmaster/autovacuum.c
index 776b1c0a9d..21f5e2ce95 100644
--- a/src/backend/postmaster/autovacuum.c
+++ b/src/backend/postmaster/autovacuum.c
@@ -50,7 +50,7 @@
  * there is a window (caused by pgstat delay) on which a worker may choose a
  * table that was already vacuumed; this is a bug in the current design.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -79,6 +79,7 @@
 #include "lib/ilist.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
+#include "nodes/makefuncs.h"
 #include "pgstat.h"
 #include "postmaster/autovacuum.h"
 #include "postmaster/fork_process.h"
@@ -93,7 +94,6 @@
 #include "storage/sinvaladt.h"
 #include "storage/smgr.h"
 #include "tcop/tcopprot.h"
-#include "utils/dsa.h"
 #include "utils/fmgroids.h"
 #include "utils/fmgrprotos.h"
 #include "utils/lsyscache.h"
@@ -436,7 +436,7 @@ AutoVacLauncherMain(int argc, char *argv[])
 	am_autovacuum_launcher = true;
 
 	/* Identify myself via ps */
-	init_ps_display("autovacuum launcher process", "", "", "");
+	init_ps_display(pgstat_get_backend_desc(B_AUTOVAC_LAUNCHER), "", "", "");
 
 	ereport(DEBUG1,
 			(errmsg("autovacuum launcher started")));
@@ -574,6 +574,12 @@ AutoVacLauncherMain(int argc, char *argv[])
 	/* must unblock signals before calling rebuild_database_list */
 	PG_SETMASK(&UnBlockSig);
 
+	/*
+	 * Set always-secure search path.  Launcher doesn't connect to a database,
+	 * so this has no effect.
+	 */
+	SetConfigOption("search_path", "", PGC_SUSET, PGC_S_OVERRIDE);
+
 	/*
 	 * Force zero_damaged_pages OFF in the autovac process, even if it is set
 	 * in postgresql.conf.  We don't really want such a dangerous option being
@@ -1519,7 +1525,7 @@ AutoVacWorkerMain(int argc, char *argv[])
 	am_autovacuum_worker = true;
 
 	/* Identify myself via ps */
-	init_ps_display("autovacuum worker process", "", "", "");
+	init_ps_display(pgstat_get_backend_desc(B_AUTOVAC_WORKER), "", "", "");
 
 	SetProcessingMode(InitProcessing);
 
@@ -1584,6 +1590,14 @@ AutoVacWorkerMain(int argc, char *argv[])
 
 	PG_SETMASK(&UnBlockSig);
 
+	/*
+	 * Set always-secure search path, so malicious users can't redirect user
+	 * code (e.g. pg_index.indexprs).  (That code runs in a
+	 * SECURITY_RESTRICTED_OPERATION sandbox, so malicious users could not
+	 * take control of the entire autovacuum worker in any case.)
+	 */
+	SetConfigOption("search_path", "", PGC_SUSET, PGC_S_OVERRIDE);
+
 	/*
 	 * Force zero_damaged_pages OFF in the autovac process, even if it is set
 	 * in postgresql.conf.  We don't really want such a dangerous option being
@@ -2444,8 +2458,10 @@ do_autovacuum(void)
 		 */
 		PG_TRY();
 		{
+			/* Use PortalContext for any per-table allocations */
+			MemoryContextSwitchTo(PortalContext);
+
 			/* have at it */
-			MemoryContextSwitchTo(TopTransactionContext);
 			autovacuum_do_vac_analyze(tab, bstrategy);
 
 			/*
@@ -2482,6 +2498,9 @@ do_autovacuum(void)
 		}
 		PG_END_TRY();
 
+		/* Make sure we're back in AutovacMemCxt */
+		MemoryContextSwitchTo(AutovacMemCxt);
+
 		did_vacuum = true;
 
 		/* the PGXACT flags are reset at the next end of transaction */
@@ -2525,6 +2544,8 @@ do_autovacuum(void)
 			continue;
 		if (workitem->avw_active)
 			continue;
+		if (workitem->avw_database != MyDatabaseId)
+			continue;
 
 		/* claim this one, and release lock while performing it */
 		workitem->avw_active = true;
@@ -2533,8 +2554,7 @@ do_autovacuum(void)
 		perform_work_item(workitem);
 
 		/*
-		 * Check for config changes before acquiring lock for further
-		 * jobs.
+		 * Check for config changes before acquiring lock for further jobs.
 		 */
 		CHECK_FOR_INTERRUPTS();
 		if (got_SIGHUP)
@@ -2601,10 +2621,9 @@ perform_work_item(AutoVacuumWorkItem *workitem)
 	/*
 	 * Save the relation name for a possible error message, to avoid a catalog
 	 * lookup in case of an error.  If any of these return NULL, then the
-	 * relation has been dropped since last we checked; skip it. Note: they
-	 * must live in a long-lived memory context because we call vacuum and
-	 * analyze in different transactions.
+	 * relation has been dropped since last we checked; skip it.
 	 */
+	Assert(CurrentMemoryContext == AutovacMemCxt);
 
 	cur_relname = get_rel_name(workitem->avw_relation);
 	cur_nspname = get_namespace_name(get_rel_namespace(workitem->avw_relation));
@@ -2614,6 +2633,9 @@ perform_work_item(AutoVacuumWorkItem *workitem)
 
 	autovac_report_workitem(workitem, cur_nspname, cur_datname);
 
+	/* clean up memory before each work item */
+	MemoryContextResetAndDeleteChildren(PortalContext);
+
 	/*
 	 * We will abort the current work item if something errors out, and
 	 * continue with the next one; in particular, this happens if we are
@@ -2622,9 +2644,10 @@ perform_work_item(AutoVacuumWorkItem *workitem)
 	 */
 	PG_TRY();
 	{
-		/* have at it */
-		MemoryContextSwitchTo(TopTransactionContext);
+		/* Use PortalContext for any per-work-item allocations */
+		MemoryContextSwitchTo(PortalContext);
 
+		/* have at it */
 		switch (workitem->avw_type)
 		{
 			case AVW_BRINSummarizeRange:
@@ -2668,6 +2691,9 @@ perform_work_item(AutoVacuumWorkItem *workitem)
 	}
 	PG_END_TRY();
 
+	/* Make sure we're back in AutovacMemCxt */
+	MemoryContextSwitchTo(AutovacMemCxt);
+
 	/* We intentionally do not set did_vacuum here */
 
 	/* be tidy */
@@ -3069,20 +3095,19 @@ relation_needs_vacanalyze(Oid relid,
 static void
 autovacuum_do_vac_analyze(autovac_table *tab, BufferAccessStrategy bstrategy)
 {
-	RangeVar	rangevar;
-
-	/* Set up command parameters --- use local variables instead of palloc */
-	MemSet(&rangevar, 0, sizeof(rangevar));
-
-	rangevar.schemaname = tab->at_nspname;
-	rangevar.relname = tab->at_relname;
-	rangevar.location = -1;
+	RangeVar   *rangevar;
+	VacuumRelation *rel;
+	List	   *rel_list;
 
 	/* Let pgstat know what we're doing */
 	autovac_report_activity(tab);
 
-	vacuum(tab->at_vacoptions, &rangevar, tab->at_relid, &tab->at_params, NIL,
-		   bstrategy, true);
+	/* Set up one VacuumRelation target, identified by OID, for vacuum() */
+	rangevar = makeRangeVar(tab->at_nspname, tab->at_relname, -1);
+	rel = makeVacuumRelation(rangevar, tab->at_relid, NIL);
+	rel_list = list_make1(rel);
+
+	vacuum(tab->at_vacoptions, rel_list, &tab->at_params, bstrategy, true);
 }
 
 /*
diff --git a/src/backend/postmaster/bgworker.c b/src/backend/postmaster/bgworker.c
index 28af6f0f07..f651bb49b1 100644
--- a/src/backend/postmaster/bgworker.c
+++ b/src/backend/postmaster/bgworker.c
@@ -2,7 +2,7 @@
  * bgworker.c
  *		POSTGRES pluggable background workers implementation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/postmaster/bgworker.c
@@ -344,6 +344,8 @@ BackgroundWorkerStateChange(void)
 		 */
 		ascii_safe_strlcpy(rw->rw_worker.bgw_name,
 						   slot->worker.bgw_name, BGW_MAXLEN);
+		ascii_safe_strlcpy(rw->rw_worker.bgw_type,
+						   slot->worker.bgw_type, BGW_MAXLEN);
 		ascii_safe_strlcpy(rw->rw_worker.bgw_library_name,
 						   slot->worker.bgw_library_name, BGW_MAXLEN);
 		ascii_safe_strlcpy(rw->rw_worker.bgw_function_name,
@@ -630,6 +632,12 @@ SanityCheckBackgroundWorker(BackgroundWorker *worker, int elevel)
 		return false;
 	}
 
+	/*
+	 * If bgw_type is not filled in, use bgw_name.
+	 */
+	if (strcmp(worker->bgw_type, "") == 0)
+		strcpy(worker->bgw_type, worker->bgw_name);
+
 	return true;
 }
 
@@ -671,7 +679,7 @@ bgworker_die(SIGNAL_ARGS)
 	ereport(FATAL,
 			(errcode(ERRCODE_ADMIN_SHUTDOWN),
 			 errmsg("terminating background worker \"%s\" due to administrator command",
-					MyBgworkerEntry->bgw_name)));
+					MyBgworkerEntry->bgw_type)));
 }
 
 /*
@@ -700,7 +708,6 @@ void
 StartBackgroundWorker(void)
 {
 	sigjmp_buf	local_sigjmp_buf;
-	char		buf[MAXPGPATH];
 	BackgroundWorker *worker = MyBgworkerEntry;
 	bgworker_main_type entrypt;
 
@@ -710,8 +717,7 @@ StartBackgroundWorker(void)
 	IsBackgroundWorker = true;
 
 	/* Identify myself via ps */
-	snprintf(buf, MAXPGPATH, "bgworker: %s", worker->bgw_name);
-	init_ps_display(buf, "", "", "");
+	init_ps_display(worker->bgw_name, "", "", "");
 
 	/*
 	 * If we're not supposed to have shared memory access, then detach from
@@ -1028,14 +1034,18 @@ RegisterDynamicBackgroundWorker(BackgroundWorker *worker,
  * Get the PID of a dynamically-registered background worker.
  *
  * If the worker is determined to be running, the return value will be
- * BGWH_STARTED and *pidp will get the PID of the worker process.
- * Otherwise, the return value will be BGWH_NOT_YET_STARTED if the worker
- * hasn't been started yet, and BGWH_STOPPED if the worker was previously
- * running but is no longer.
+ * BGWH_STARTED and *pidp will get the PID of the worker process.  If the
+ * postmaster has not yet attempted to start the worker, the return value will
+ * be BGWH_NOT_YET_STARTED.  Otherwise, the return value is BGWH_STOPPED.
  *
- * In the latter case, the worker may be stopped temporarily (if it is
- * configured for automatic restart and exited non-zero) or gone for
- * good (if it exited with code 0 or if it is configured not to restart).
+ * BGWH_STOPPED can indicate either that the worker is temporarily stopped
+ * (because it is configured for automatic restart and exited non-zero),
+ * or that the worker is permanently stopped (because it exited with exit
+ * code 0, or was not configured for automatic restart), or even that the
+ * worker was unregistered without ever starting (either because startup
+ * failed and the worker is not configured for automatic restart, or because
+ * TerminateBackgroundWorker was used before the worker was successfully
+ * started).
  */
 BgwHandleStatus
 GetBackgroundWorkerPid(BackgroundWorkerHandle *handle, pid_t *pidp)
@@ -1060,8 +1070,11 @@ GetBackgroundWorkerPid(BackgroundWorkerHandle *handle, pid_t *pidp)
 	 * time, but we assume such changes are atomic.  So the value we read
 	 * won't be garbage, but it might be out of date by the time the caller
 	 * examines it (but that's unavoidable anyway).
+	 *
+	 * The in_use flag could be in the process of changing from true to false,
+	 * but if it is already false then it can't change further.
 	 */
-	if (handle->generation != slot->generation)
+	if (handle->generation != slot->generation || !slot->in_use)
 		pid = 0;
 	else
 		pid = slot->pid;
@@ -1233,3 +1246,40 @@ LookupBackgroundWorkerFunction(const char *libraryname, const char *funcname)
 	return (bgworker_main_type)
 		load_external_function(libraryname, funcname, true, NULL);
 }
+
+/*
+ * Given a PID, get the bgw_type of the background worker.  Returns NULL if
+ * not a valid background worker.
+ *
+ * The return value is in static memory belonging to this function, so it has
+ * to be used before calling this function again.  This is so that the caller
+ * doesn't have to worry about the background worker locking protocol.
+ */
+const char *
+GetBackgroundWorkerTypeByPid(pid_t pid)
+{
+	int			slotno;
+	bool		found = false;
+	static char result[BGW_MAXLEN];
+
+	LWLockAcquire(BackgroundWorkerLock, LW_SHARED);
+
+	for (slotno = 0; slotno < BackgroundWorkerData->total_slots; slotno++)
+	{
+		BackgroundWorkerSlot *slot = &BackgroundWorkerData->slot[slotno];
+
+		if (slot->pid > 0 && slot->pid == pid)
+		{
+			strcpy(result, slot->worker.bgw_type);
+			found = true;
+			break;
+		}
+	}
+
+	LWLockRelease(BackgroundWorkerLock);
+
+	if (!found)
+		return NULL;
+
+	return result;
+}
diff --git a/src/backend/postmaster/bgwriter.c b/src/backend/postmaster/bgwriter.c
index 9ad74ee977..b7813d7a4f 100644
--- a/src/backend/postmaster/bgwriter.c
+++ b/src/backend/postmaster/bgwriter.c
@@ -24,7 +24,7 @@
  * should be killed by SIGQUIT and then a recovery cycle started.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/postmaster/checkpointer.c b/src/backend/postmaster/checkpointer.c
index e48ebd557f..4b452e7cee 100644
--- a/src/backend/postmaster/checkpointer.c
+++ b/src/backend/postmaster/checkpointer.c
@@ -26,7 +26,7 @@
  * restart needs to be forced.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -624,7 +624,7 @@ CheckArchiveTimeout(void)
 			 * If the returned pointer points exactly to a segment boundary,
 			 * assume nothing happened.
 			 */
-			if ((switchpoint % XLogSegSize) != 0)
+			if (XLogSegmentOffset(switchpoint, wal_segment_size) != 0)
 				elog(DEBUG1, "write-ahead log switch forced (archive_timeout=%d)",
 					 XLogArchiveTimeout);
 		}
@@ -782,7 +782,8 @@ IsCheckpointOnSchedule(double progress)
 		recptr = GetXLogReplayRecPtr(NULL);
 	else
 		recptr = GetInsertRecPtr();
-	elapsed_xlogs = (((double) (recptr - ckpt_start_recptr)) / XLogSegSize) / CheckPointSegments;
+	elapsed_xlogs = (((double) (recptr - ckpt_start_recptr)) /
+					 wal_segment_size) / CheckPointSegments;
 
 	if (progress < elapsed_xlogs)
 	{
diff --git a/src/backend/postmaster/fork_process.c b/src/backend/postmaster/fork_process.c
index 65145b1205..d3005d9f1d 100644
--- a/src/backend/postmaster/fork_process.c
+++ b/src/backend/postmaster/fork_process.c
@@ -4,7 +4,7 @@
  *	 EXEC_BACKEND case; it might be extended to do so, but it would be
  *	 considerably more complex.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/postmaster/fork_process.c
diff --git a/src/backend/postmaster/pgarch.c b/src/backend/postmaster/pgarch.c
index ddf9d698e0..885e85ad8a 100644
--- a/src/backend/postmaster/pgarch.c
+++ b/src/backend/postmaster/pgarch.c
@@ -14,7 +14,7 @@
  *
  *	Initial author: Simon Riggs		simon@2ndquadrant.com
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -236,7 +236,7 @@ PgArchiverMain(int argc, char *argv[])
 	/*
 	 * Identify myself via ps
 	 */
-	init_ps_display("archiver process", "", "", "");
+	init_ps_display("archiver", "", "", "");
 
 	pgarch_MainLoop();
 
@@ -673,11 +673,6 @@ pgarch_readyXlog(char *xlog)
 
 	snprintf(XLogArchiveStatusDir, MAXPGPATH, XLOGDIR "/archive_status");
 	rldir = AllocateDir(XLogArchiveStatusDir);
-	if (rldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open archive status directory \"%s\": %m",
-						XLogArchiveStatusDir)));
 
 	while ((rlde = ReadDir(rldir, XLogArchiveStatusDir)) != NULL)
 	{
diff --git a/src/backend/postmaster/pgstat.c b/src/backend/postmaster/pgstat.c
index 1f75e2e97d..96ba216387 100644
--- a/src/backend/postmaster/pgstat.c
+++ b/src/backend/postmaster/pgstat.c
@@ -11,7 +11,7 @@
  *			- Add a pgstat config column to pg_database, so this
  *			  entire thing can be enabled/disabled on a per db basis.
  *
- *	Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  *	src/backend/postmaster/pgstat.c
  * ----------
@@ -2701,7 +2701,7 @@ CreateSharedBackendStatus(void)
 		buffer = BackendActivityBuffer;
 		for (i = 0; i < NumBackendStatSlots; i++)
 		{
-			BackendStatusArray[i].st_activity = buffer;
+			BackendStatusArray[i].st_activity_raw = buffer;
 			buffer += pgstat_track_activity_query_size;
 		}
 	}
@@ -2909,8 +2909,8 @@ pgstat_bestart(void)
 		beentry->st_ssl = true;
 		beentry->st_sslstatus->ssl_bits = be_tls_get_cipher_bits(MyProcPort);
 		beentry->st_sslstatus->ssl_compression = be_tls_get_compression(MyProcPort);
-		be_tls_get_version(MyProcPort, beentry->st_sslstatus->ssl_version, NAMEDATALEN);
-		be_tls_get_cipher(MyProcPort, beentry->st_sslstatus->ssl_cipher, NAMEDATALEN);
+		strlcpy(beentry->st_sslstatus->ssl_version, be_tls_get_version(MyProcPort), NAMEDATALEN);
+		strlcpy(beentry->st_sslstatus->ssl_cipher, be_tls_get_cipher(MyProcPort), NAMEDATALEN);
 		be_tls_get_peerdn_name(MyProcPort, beentry->st_sslstatus->ssl_clientdn, NAMEDATALEN);
 	}
 	else
@@ -2922,11 +2922,11 @@ pgstat_bestart(void)
 #endif
 	beentry->st_state = STATE_UNDEFINED;
 	beentry->st_appname[0] = '\0';
-	beentry->st_activity[0] = '\0';
+	beentry->st_activity_raw[0] = '\0';
 	/* Also make sure the last byte in each string area is always 0 */
 	beentry->st_clienthostname[NAMEDATALEN - 1] = '\0';
 	beentry->st_appname[NAMEDATALEN - 1] = '\0';
-	beentry->st_activity[pgstat_track_activity_query_size - 1] = '\0';
+	beentry->st_activity_raw[pgstat_track_activity_query_size - 1] = '\0';
 	beentry->st_progress_command = PROGRESS_COMMAND_INVALID;
 	beentry->st_progress_command_target = InvalidOid;
 
@@ -3017,7 +3017,7 @@ pgstat_report_activity(BackendState state, const char *cmd_str)
 			pgstat_increment_changecount_before(beentry);
 			beentry->st_state = STATE_DISABLED;
 			beentry->st_state_start_timestamp = 0;
-			beentry->st_activity[0] = '\0';
+			beentry->st_activity_raw[0] = '\0';
 			beentry->st_activity_start_timestamp = 0;
 			/* st_xact_start_timestamp and wait_event_info are also disabled */
 			beentry->st_xact_start_timestamp = 0;
@@ -3034,8 +3034,12 @@ pgstat_report_activity(BackendState state, const char *cmd_str)
 	start_timestamp = GetCurrentStatementStartTimestamp();
 	if (cmd_str != NULL)
 	{
-		len = pg_mbcliplen(cmd_str, strlen(cmd_str),
-						   pgstat_track_activity_query_size - 1);
+		/*
+		 * Compute length of to-be-stored string unaware of multi-byte
+		 * characters. For speed reasons that'll get corrected on read, rather
+		 * than computed every write.
+		 */
+		len = Min(strlen(cmd_str), pgstat_track_activity_query_size - 1);
 	}
 	current_timestamp = GetCurrentTimestamp();
 
@@ -3049,8 +3053,8 @@ pgstat_report_activity(BackendState state, const char *cmd_str)
 
 	if (cmd_str != NULL)
 	{
-		memcpy((char *) beentry->st_activity, cmd_str, len);
-		beentry->st_activity[len] = '\0';
+		memcpy((char *) beentry->st_activity_raw, cmd_str, len);
+		beentry->st_activity_raw[len] = '\0';
 		beentry->st_activity_start_timestamp = start_timestamp;
 	}
 
@@ -3278,8 +3282,8 @@ pgstat_read_current_status(void)
 				 */
 				strcpy(localappname, (char *) beentry->st_appname);
 				localentry->backendStatus.st_appname = localappname;
-				strcpy(localactivity, (char *) beentry->st_activity);
-				localentry->backendStatus.st_activity = localactivity;
+				strcpy(localactivity, (char *) beentry->st_activity_raw);
+				localentry->backendStatus.st_activity_raw = localactivity;
 				localentry->backendStatus.st_ssl = beentry->st_ssl;
 #ifdef USE_SSL
 				if (beentry->st_ssl)
@@ -3582,6 +3586,51 @@ pgstat_get_wait_ipc(WaitEventIPC w)
 		case WAIT_EVENT_EXECUTE_GATHER:
 			event_name = "ExecuteGather";
 			break;
+		case WAIT_EVENT_HASH_BATCH_ALLOCATING:
+			event_name = "Hash/Batch/Allocating";
+			break;
+		case WAIT_EVENT_HASH_BATCH_ELECTING:
+			event_name = "Hash/Batch/Electing";
+			break;
+		case WAIT_EVENT_HASH_BATCH_LOADING:
+			event_name = "Hash/Batch/Loading";
+			break;
+		case WAIT_EVENT_HASH_BUILD_ALLOCATING:
+			event_name = "Hash/Build/Allocating";
+			break;
+		case WAIT_EVENT_HASH_BUILD_ELECTING:
+			event_name = "Hash/Build/Electing";
+			break;
+		case WAIT_EVENT_HASH_BUILD_HASHING_INNER:
+			event_name = "Hash/Build/HashingInner";
+			break;
+		case WAIT_EVENT_HASH_BUILD_HASHING_OUTER:
+			event_name = "Hash/Build/HashingOuter";
+			break;
+		case WAIT_EVENT_HASH_GROW_BATCHES_ALLOCATING:
+			event_name = "Hash/GrowBatches/Allocating";
+			break;
+		case WAIT_EVENT_HASH_GROW_BATCHES_DECIDING:
+			event_name = "Hash/GrowBatches/Deciding";
+			break;
+		case WAIT_EVENT_HASH_GROW_BATCHES_ELECTING:
+			event_name = "Hash/GrowBatches/Electing";
+			break;
+		case WAIT_EVENT_HASH_GROW_BATCHES_FINISHING:
+			event_name = "Hash/GrowBatches/Finishing";
+			break;
+		case WAIT_EVENT_HASH_GROW_BATCHES_REPARTITIONING:
+			event_name = "Hash/GrowBatches/Repartitioning";
+			break;
+		case WAIT_EVENT_HASH_GROW_BUCKETS_ALLOCATING:
+			event_name = "Hash/GrowBuckets/Allocating";
+			break;
+		case WAIT_EVENT_HASH_GROW_BUCKETS_ELECTING:
+			event_name = "Hash/GrowBuckets/Electing";
+			break;
+		case WAIT_EVENT_HASH_GROW_BUCKETS_REINSERTING:
+			event_name = "Hash/GrowBuckets/Reinserting";
+			break;
 		case WAIT_EVENT_LOGICAL_SYNC_DATA:
 			event_name = "LogicalSyncData";
 			break;
@@ -3606,9 +3655,15 @@ pgstat_get_wait_ipc(WaitEventIPC w)
 		case WAIT_EVENT_PARALLEL_BITMAP_SCAN:
 			event_name = "ParallelBitmapScan";
 			break;
+		case WAIT_EVENT_PARALLEL_CREATE_INDEX_SCAN:
+			event_name = "ParallelCreateIndexScan";
+			break;
 		case WAIT_EVENT_PROCARRAY_GROUP_UPDATE:
 			event_name = "ProcArrayGroupUpdate";
 			break;
+		case WAIT_EVENT_CLOG_GROUP_UPDATE:
+			event_name = "ClogGroupUpdate";
+			break;
 		case WAIT_EVENT_REPLICATION_ORIGIN_DROP:
 			event_name = "ReplicationOriginDrop";
 			break;
@@ -3942,10 +3997,13 @@ pgstat_get_backend_current_activity(int pid, bool checkUser)
 			/* Now it is safe to use the non-volatile pointer */
 			if (checkUser && !superuser() && beentry->st_userid != GetUserId())
 				return "<insufficient privilege>";
-			else if (*(beentry->st_activity) == '\0')
+			else if (*(beentry->st_activity_raw) == '\0')
 				return "<command string not enabled>";
 			else
-				return beentry->st_activity;
+			{
+				/* this'll leak a bit of memory, but that seems acceptable */
+				return pgstat_clip_activity(beentry->st_activity_raw);
+			}
 		}
 
 		beentry++;
@@ -3991,7 +4049,7 @@ pgstat_get_crashed_backend_activity(int pid, char *buffer, int buflen)
 		if (beentry->st_procpid == pid)
 		{
 			/* Read pointer just once, so it can't change after validation */
-			const char *activity = beentry->st_activity;
+			const char *activity = beentry->st_activity_raw;
 			const char *activity_last;
 
 			/*
@@ -4014,7 +4072,8 @@ pgstat_get_crashed_backend_activity(int pid, char *buffer, int buflen)
 			/*
 			 * Copy only ASCII-safe characters so we don't run into encoding
 			 * problems when reporting the message; and be sure not to run off
-			 * the end of memory.
+			 * the end of memory.  As only ASCII characters are reported, it
+			 * doesn't seem necessary to perform multibyte aware clipping.
 			 */
 			ascii_safe_strlcpy(buffer, activity,
 							   Min(buflen, pgstat_track_activity_query_size));
@@ -4213,7 +4272,7 @@ PgstatCollectorMain(int argc, char *argv[])
 	/*
 	 * Identify myself via ps
 	 */
-	init_ps_display("stats collector process", "", "", "");
+	init_ps_display("stats collector", "", "", "");
 
 	/*
 	 * Read in existing stats files or initialize the stats to zero.
@@ -5259,7 +5318,7 @@ pgstat_read_db_statsfile(Oid databaseid, HTAB *tabhash, HTAB *funchash,
  * pgstat_read_db_statsfile_timestamp() -
  *
  *	Attempt to determine the timestamp of the last db statfile write.
- *	Returns TRUE if successful; the timestamp is stored in *ts.
+ *	Returns true if successful; the timestamp is stored in *ts.
  *
  *	This needs to be careful about handling databases for which no stats file
  *	exists, such as databases without a stat entry or those not yet written:
@@ -6267,3 +6326,47 @@ pgstat_db_requested(Oid databaseid)
 
 	return false;
 }
+
+/*
+ * Convert a potentially unsafely truncated activity string (see
+ * PgBackendStatus.st_activity_raw's documentation) into a correctly truncated
+ * one.
+ *
+ * The returned string is allocated in the caller's memory context and may be
+ * freed.
+ */
+char *
+pgstat_clip_activity(const char *raw_activity)
+{
+	char	   *activity;
+	int			rawlen;
+	int			cliplen;
+
+	/*
+	 * Some callers, like pgstat_get_backend_current_activity(), do not
+	 * guarantee that the buffer isn't concurrently modified. We try to take
+	 * care that the buffer is always terminated by a NUL byte regardless, but
+	 * let's still be paranoid about the string's length. In those cases the
+	 * underlying buffer is guaranteed to be pgstat_track_activity_query_size
+	 * large.
+	 */
+	activity = pnstrdup(raw_activity, pgstat_track_activity_query_size - 1);
+
+	/* now double-guaranteed to be NUL terminated */
+	rawlen = strlen(activity);
+
+	/*
+	 * All supported server-encodings make it possible to determine the length
+	 * of a multi-byte character from its first byte (this is not the case for
+	 * client encodings, see GB18030). As st_activity is always stored using
+	 * server encoding, this allows us to perform multi-byte aware truncation,
+	 * even if the string earlier was truncated in the middle of a multi-byte
+	 * character.
+	 */
+	cliplen = pg_mbcliplen(activity, rawlen,
+						   pgstat_track_activity_query_size - 1);
+
+	activity[cliplen] = '\0';
+
+	return activity;
+}
diff --git a/src/backend/postmaster/postmaster.c b/src/backend/postmaster/postmaster.c
index 95180b2ef5..f3ddf828bb 100644
--- a/src/backend/postmaster/postmaster.c
+++ b/src/backend/postmaster/postmaster.c
@@ -32,7 +32,7 @@
  *	  clients.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -74,8 +74,6 @@
 #include <sys/socket.h>
 #include <fcntl.h>
 #include <sys/param.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
 #include <netdb.h>
 #include <limits.h>
 
@@ -103,10 +101,12 @@
 #include "lib/ilist.h"
 #include "libpq/auth.h"
 #include "libpq/libpq.h"
+#include "libpq/pqformat.h"
 #include "libpq/pqsignal.h"
 #include "miscadmin.h"
 #include "pg_getopt.h"
 #include "pgstat.h"
+#include "port/pg_bswap.h"
 #include "postmaster/autovacuum.h"
 #include "postmaster/bgworker_internals.h"
 #include "postmaster/fork_process.h"
@@ -413,6 +413,7 @@ static void ExitPostmaster(int status) pg_attribute_noreturn();
 static int	ServerLoop(void);
 static int	BackendStartup(Port *port);
 static int	ProcessStartupPacket(Port *port, bool SSLdone);
+static void SendNegotiateProtocolVersion(List *unrecognized_protocol_options);
 static void processCancelRequest(Port *port, void *pkt);
 static int	initMasks(fd_set *rmask);
 static void report_fork_failure_to_client(Port *port, int errnum);
@@ -950,6 +951,9 @@ PostmasterMain(int argc, char *argv[])
 	 */
 	CreateDataDirLockFile(true);
 
+	/* read control file (error checking and contains config) */
+	LocalProcessControlFile(false);
+
 	/*
 	 * Initialize SSL library, if specified.
 	 */
@@ -1069,7 +1073,7 @@ PostmasterMain(int argc, char *argv[])
 								 "_postgresql._tcp.",
 								 NULL,
 								 NULL,
-								 htons(PostPortNumber),
+								 pg_hton16(PostPortNumber),
 								 0,
 								 NULL,
 								 NULL,
@@ -1963,7 +1967,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 		return STATUS_ERROR;
 	}
 
-	len = ntohl(len);
+	len = pg_ntoh32(len);
 	len -= 4;
 
 	if (len < (int32) sizeof(ProtocolVersion) ||
@@ -1999,7 +2003,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 	 * The first field is either a protocol version number or a special
 	 * request code.
 	 */
-	port->proto = proto = ntohl(*((ProtocolVersion *) buf));
+	port->proto = proto = pg_ntoh32(*((ProtocolVersion *) buf));
 
 	if (proto == CANCEL_REQUEST_CODE)
 	{
@@ -2050,12 +2054,9 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 	 */
 	FrontendProtocol = proto;
 
-	/* Check we can handle the protocol the frontend is using. */
-
+	/* Check that the major protocol version is in range. */
 	if (PG_PROTOCOL_MAJOR(proto) < PG_PROTOCOL_MAJOR(PG_PROTOCOL_EARLIEST) ||
-		PG_PROTOCOL_MAJOR(proto) > PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) ||
-		(PG_PROTOCOL_MAJOR(proto) == PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST) &&
-		 PG_PROTOCOL_MINOR(proto) > PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST)))
+		PG_PROTOCOL_MAJOR(proto) > PG_PROTOCOL_MAJOR(PG_PROTOCOL_LATEST))
 		ereport(FATAL,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("unsupported frontend protocol %u.%u: server supports %u.0 to %u.%u",
@@ -2077,6 +2078,7 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 	if (PG_PROTOCOL_MAJOR(proto) >= 3)
 	{
 		int32		offset = sizeof(ProtocolVersion);
+		List	   *unrecognized_protocol_options = NIL;
 
 		/*
 		 * Scan packet body for name/option pairs.  We can assume any string
@@ -2126,6 +2128,16 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 									valptr),
 							 errhint("Valid values are: \"false\", 0, \"true\", 1, \"database\".")));
 			}
+			else if (strncmp(nameptr, "_pq_.", 5) == 0)
+			{
+				/*
+				 * Any option beginning with _pq_. is reserved for use as a
+				 * protocol-level option, but at present no such options are
+				 * defined.
+				 */
+				unrecognized_protocol_options =
+					lappend(unrecognized_protocol_options, pstrdup(nameptr));
+			}
 			else
 			{
 				/* Assume it's a generic GUC option */
@@ -2145,6 +2157,16 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 			ereport(FATAL,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
 					 errmsg("invalid startup packet layout: expected terminator as last byte")));
+
+		/*
+		 * If the client requested a newer protocol version or if the client
+		 * requested any protocol options we didn't recognize, let them know
+		 * the newest minor protocol version we do support and the names of
+		 * any unrecognized options.
+		 */
+		if (PG_PROTOCOL_MINOR(proto) > PG_PROTOCOL_MINOR(PG_PROTOCOL_LATEST) ||
+			unrecognized_protocol_options != NIL)
+			SendNegotiateProtocolVersion(unrecognized_protocol_options);
 	}
 	else
 	{
@@ -2258,6 +2280,34 @@ ProcessStartupPacket(Port *port, bool SSLdone)
 	return STATUS_OK;
 }
 
+/*
+ * Send a NegotiateProtocolVersion to the client.  This lets the client know
+ * that they have requested a newer minor protocol version than we are able
+ * to speak.  We'll speak the highest version we know about; the client can,
+ * of course, abandon the connection if that's a problem.
+ *
+ * We also include in the response a list of protocol options we didn't
+ * understand.  This allows clients to include optional parameters that might
+ * be present either in newer protocol versions or third-party protocol
+ * extensions without fear of having to reconnect if those options are not
+ * understood, while at the same time making certain that the client is aware
+ * of which options were actually accepted.
+ */
+static void
+SendNegotiateProtocolVersion(List *unrecognized_protocol_options)
+{
+	StringInfoData buf;
+	ListCell   *lc;
+
+	pq_beginmessage(&buf, 'v'); /* NegotiateProtocolVersion */
+	pq_sendint32(&buf, PG_PROTOCOL_LATEST);
+	pq_sendint32(&buf, list_length(unrecognized_protocol_options));
+	foreach(lc, unrecognized_protocol_options)
+		pq_sendstring(&buf, lfirst(lc));
+	pq_endmessage(&buf);
+
+	/* no need to flush, some other message will follow */
+}
 
 /*
  * The client has sent a cancel request packet, not a normal
@@ -2278,8 +2328,8 @@ processCancelRequest(Port *port, void *pkt)
 	int			i;
 #endif
 
-	backendPID = (int) ntohl(canc->backendPID);
-	cancelAuthCode = (int32) ntohl(canc->cancelAuthCode);
+	backendPID = (int) pg_ntoh32(canc->backendPID);
+	cancelAuthCode = (int32) pg_ntoh32(canc->cancelAuthCode);
 
 	/*
 	 * See if we have a matching backend.  In the EXEC_BACKEND case, we can no
@@ -3114,8 +3164,9 @@ CleanupBackgroundWorker(int pid,
 			exitstatus = 0;
 #endif
 
-		snprintf(namebuf, MAXPGPATH, "%s: %s", _("worker process"),
-				 rw->rw_worker.bgw_name);
+		snprintf(namebuf, MAXPGPATH, _("background worker \"%s\""),
+				 rw->rw_worker.bgw_type);
+
 
 		if (!EXIT_STATUS_0(exitstatus))
 		{
@@ -3826,6 +3877,10 @@ PostmasterStateMachine(void)
 		ResetBackgroundWorkerCrashTimes();
 
 		shmem_exit(1);
+
+		/* re-read control file into local memory */
+		LocalProcessControlFile(true);
+
 		reset_shared(PostPortNumber);
 
 		StartupPID = StartupDataBase();
@@ -4259,14 +4314,14 @@ BackendInitialize(Port *port)
 	 *
 	 * For a walsender, the ps display is set in the following form:
 	 *
-	 * postgres: wal sender process <user> <host> <activity>
+	 * postgres: walsender <user> <host> <activity>
 	 *
-	 * To achieve that, we pass "wal sender process" as username and username
-	 * as dbname to init_ps_display(). XXX: should add a new variant of
+	 * To achieve that, we pass "walsender" as username and username as dbname
+	 * to init_ps_display(). XXX: should add a new variant of
 	 * init_ps_display() to avoid abusing the parameters like this.
 	 */
 	if (am_walsender)
-		init_ps_display("wal sender process", port->user_name, remote_ps_data,
+		init_ps_display(pgstat_get_backend_desc(B_WAL_SENDER), port->user_name, remote_ps_data,
 						update_process_title ? "authentication" : "");
 	else
 		init_ps_display(port->user_name, port->database_name, remote_ps_data,
@@ -4805,6 +4860,12 @@ SubPostmasterMain(int argc, char *argv[])
 	/* Read in remaining GUC variables */
 	read_nondefault_variables();
 
+	/*
+	 * (re-)read control file, as it contains config. The postmaster will
+	 * already have read this, but this process doesn't know about that.
+	 */
+	LocalProcessControlFile(false);
+
 	/*
 	 * Reload any libraries that were preloaded by the postmaster.  Since we
 	 * exec'd this process, those libraries didn't come along with us; but we
@@ -5524,7 +5585,7 @@ MaxLivePostmasterChildren(void)
  * Connect background worker to a database.
  */
 void
-BackgroundWorkerInitializeConnection(char *dbname, char *username)
+BackgroundWorkerInitializeConnection(const char *dbname, const char *username)
 {
 	BackgroundWorker *worker = MyBgworkerEntry;
 
@@ -5848,7 +5909,16 @@ maybe_start_bgworkers(void)
 		{
 			if (rw->rw_worker.bgw_restart_time == BGW_NEVER_RESTART)
 			{
+				int			notify_pid;
+
+				notify_pid = rw->rw_worker.bgw_notify_pid;
+
 				ForgetBackgroundWorker(&iter);
+
+				/* Report worker is gone now. */
+				if (notify_pid != 0)
+					kill(notify_pid, SIGUSR1);
+
 				continue;
 			}
 
diff --git a/src/backend/postmaster/startup.c b/src/backend/postmaster/startup.c
index 4693a1bb86..38300527a5 100644
--- a/src/backend/postmaster/startup.c
+++ b/src/backend/postmaster/startup.c
@@ -9,7 +9,7 @@
  * though.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/postmaster/syslogger.c b/src/backend/postmaster/syslogger.c
index 3255b42c7d..f70eea37df 100644
--- a/src/backend/postmaster/syslogger.c
+++ b/src/backend/postmaster/syslogger.c
@@ -13,7 +13,7 @@
  *
  * Author: Andreas Pflug <pgadmin@pse-consulting.de>
  *
- * Copyright (c) 2004-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2004-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -173,7 +173,7 @@ SysLoggerMain(int argc, char *argv[])
 
 	am_syslogger = true;
 
-	init_ps_display("logger process", "", "", "");
+	init_ps_display("logger", "", "", "");
 
 	/*
 	 * If we restarted, our stderr is already redirected into our own input
diff --git a/src/backend/postmaster/walwriter.c b/src/backend/postmaster/walwriter.c
index 7b89e02428..4fa3a3b0aa 100644
--- a/src/backend/postmaster/walwriter.c
+++ b/src/backend/postmaster/walwriter.c
@@ -31,7 +31,7 @@
  * should be killed by SIGQUIT and then a recovery cycle started.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/regex/regc_pg_locale.c b/src/backend/regex/regc_pg_locale.c
index 6982879688..acbed2eeed 100644
--- a/src/backend/regex/regc_pg_locale.c
+++ b/src/backend/regex/regc_pg_locale.c
@@ -6,7 +6,7 @@
  *
  * This file is #included by regcomp.c; it's not meant to compile standalone.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -29,20 +29,20 @@
  *
  * 2. In the "default" collation (which is supposed to obey LC_CTYPE):
  *
- * 2a. When working in UTF8 encoding, we use the <wctype.h> functions if
- * available.  This assumes that every platform uses Unicode codepoints
- * directly as the wchar_t representation of Unicode.  On some platforms
+ * 2a. When working in UTF8 encoding, we use the <wctype.h> functions.
+ * This assumes that every platform uses Unicode codepoints directly
+ * as the wchar_t representation of Unicode.  On some platforms
  * wchar_t is only 16 bits wide, so we have to punt for codepoints > 0xFFFF.
  *
- * 2b. In all other encodings, or on machines that lack <wctype.h>, we use
- * the <ctype.h> functions for pg_wchar values up to 255, and punt for values
- * above that.  This is only 100% correct in single-byte encodings such as
- * LATINn.  However, non-Unicode multibyte encodings are mostly Far Eastern
- * character sets for which the properties being tested here aren't very
- * relevant for higher code values anyway.  The difficulty with using the
- * <wctype.h> functions with non-Unicode multibyte encodings is that we can
- * have no certainty that the platform's wchar_t representation matches
- * what we do in pg_wchar conversions.
+ * 2b. In all other encodings, we use the <ctype.h> functions for pg_wchar
+ * values up to 255, and punt for values above that.  This is 100% correct
+ * only in single-byte encodings such as LATINn.  However, non-Unicode
+ * multibyte encodings are mostly Far Eastern character sets for which the
+ * properties being tested here aren't very relevant for higher code values
+ * anyway.  The difficulty with using the <wctype.h> functions with
+ * non-Unicode multibyte encodings is that we can have no certainty that
+ * the platform's wchar_t representation matches what we do in pg_wchar
+ * conversions.
  *
  * 3. Other collations are only supported on platforms that HAVE_LOCALE_T.
  * Here, we use the locale_t-extended forms of the <wctype.h> and <ctype.h>
@@ -268,7 +268,6 @@ pg_set_regex_collation(Oid collation)
 			pg_regex_strategy = PG_REGEX_LOCALE_ICU;
 		else
 #endif
-#ifdef USE_WIDE_UPPER_LOWER
 		if (GetDatabaseEncoding() == PG_UTF8)
 		{
 			if (pg_regex_locale)
@@ -277,7 +276,6 @@ pg_set_regex_collation(Oid collation)
 				pg_regex_strategy = PG_REGEX_LOCALE_WIDE;
 		}
 		else
-#endif							/* USE_WIDE_UPPER_LOWER */
 		{
 			if (pg_regex_locale)
 				pg_regex_strategy = PG_REGEX_LOCALE_1BYTE_L;
@@ -298,16 +296,14 @@ pg_wc_isdigit(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISDIGIT));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswdigit((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isdigit((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswdigit_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -336,16 +332,14 @@ pg_wc_isalpha(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISALPHA));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswalpha((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isalpha((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswalpha_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -374,16 +368,14 @@ pg_wc_isalnum(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISALNUM));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswalnum((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isalnum((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswalnum_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -412,16 +404,14 @@ pg_wc_isupper(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISUPPER));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswupper((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isupper((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswupper_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -450,16 +440,14 @@ pg_wc_islower(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISLOWER));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswlower((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					islower((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswlower_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -488,16 +476,14 @@ pg_wc_isgraph(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISGRAPH));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswgraph((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isgraph((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswgraph_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -526,16 +512,14 @@ pg_wc_isprint(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISPRINT));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswprint((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isprint((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswprint_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -564,16 +548,14 @@ pg_wc_ispunct(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISPUNCT));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswpunct((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					ispunct((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswpunct_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -602,16 +584,14 @@ pg_wc_isspace(pg_wchar c)
 			return (c <= (pg_wchar) 127 &&
 					(pg_char_properties[c] & PG_ISSPACE));
 		case PG_REGEX_LOCALE_WIDE:
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswspace((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			return (c <= (pg_wchar) UCHAR_MAX &&
 					isspace((unsigned char) c));
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return iswspace_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -644,10 +624,8 @@ pg_wc_toupper(pg_wchar c)
 			/* force C behavior for ASCII characters, per comments above */
 			if (c <= (pg_wchar) 127)
 				return pg_ascii_toupper((unsigned char) c);
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return towupper((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			/* force C behavior for ASCII characters, per comments above */
@@ -657,7 +635,7 @@ pg_wc_toupper(pg_wchar c)
 				return toupper((unsigned char) c);
 			return c;
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return towupper_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
@@ -690,10 +668,8 @@ pg_wc_tolower(pg_wchar c)
 			/* force C behavior for ASCII characters, per comments above */
 			if (c <= (pg_wchar) 127)
 				return pg_ascii_tolower((unsigned char) c);
-#ifdef USE_WIDE_UPPER_LOWER
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return towlower((wint_t) c);
-#endif
 			/* FALL THRU */
 		case PG_REGEX_LOCALE_1BYTE:
 			/* force C behavior for ASCII characters, per comments above */
@@ -703,7 +679,7 @@ pg_wc_tolower(pg_wchar c)
 				return tolower((unsigned char) c);
 			return c;
 		case PG_REGEX_LOCALE_WIDE_L:
-#if defined(HAVE_LOCALE_T) && defined(USE_WIDE_UPPER_LOWER)
+#ifdef HAVE_LOCALE_T
 			if (sizeof(wchar_t) >= 4 || c <= (pg_wchar) 0xFFFF)
 				return towlower_l((wint_t) c, pg_regex_locale->info.lt);
 #endif
diff --git a/src/backend/regex/regexport.c b/src/backend/regex/regexport.c
index febf2adaec..81b3bf1fc8 100644
--- a/src/backend/regex/regexport.c
+++ b/src/backend/regex/regexport.c
@@ -15,7 +15,7 @@
  * allows the caller to decide how big is too big to bother with.
  *
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1998, 1999 Henry Spencer
  *
  * IDENTIFICATION
diff --git a/src/backend/regex/regprefix.c b/src/backend/regex/regprefix.c
index 96ca0e1ed3..6bf7c77f98 100644
--- a/src/backend/regex/regprefix.c
+++ b/src/backend/regex/regprefix.c
@@ -4,7 +4,7 @@
  *	  Extract a common prefix, if any, from a compiled regex.
  *
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1998, 1999 Henry Spencer
  *
  * IDENTIFICATION
diff --git a/src/backend/replication/basebackup.c b/src/backend/replication/basebackup.c
index 9776858f03..185f32a5f9 100644
--- a/src/backend/replication/basebackup.c
+++ b/src/backend/replication/basebackup.c
@@ -3,7 +3,7 @@
  * basebackup.c
  *	  code for taking a base backup and streaming it to a standby
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/basebackup.c
@@ -34,8 +34,8 @@
 #include "storage/fd.h"
 #include "storage/ipc.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
 #include "utils/ps_status.h"
+#include "utils/relcache.h"
 #include "utils/timestamp.h"
 
 
@@ -51,9 +51,9 @@ typedef struct
 } basebackup_options;
 
 
-static int64 sendDir(char *path, int basepathlen, bool sizeonly,
+static int64 sendDir(const char *path, int basepathlen, bool sizeonly,
 		List *tablespaces, bool sendtblspclinks);
-static bool sendFile(char *readfilename, char *tarfilename,
+static bool sendFile(const char *readfilename, const char *tarfilename,
 		 struct stat *statbuf, bool missing_ok);
 static void sendFileWithContent(const char *filename, const char *content);
 static int64 _tarWriteHeader(const char *filename, const char *linktarget,
@@ -63,7 +63,7 @@ static int64 _tarWriteDir(const char *pathbuf, int basepathlen, struct stat *sta
 static void send_int8_string(StringInfoData *buf, int64 intval);
 static void SendBackupHeader(List *tablespaces);
 static void base_backup_cleanup(int code, Datum arg);
-static void perform_base_backup(basebackup_options *opt, DIR *tblspcdir);
+static void perform_base_backup(basebackup_options *opt);
 static void parse_basebackup_options(List *options, basebackup_options *opt);
 static void SendXlogRecPtrResult(XLogRecPtr ptr, TimeLineID tli);
 static int	compareWalFileNames(const void *a, const void *b);
@@ -151,6 +151,9 @@ static const char *excludeFiles[] =
 	/* Skip current log file temporary file */
 	LOG_METAINFO_DATAFILE_TMP,
 
+	/* Skip relation cache because it is rebuilt on startup */
+	RELCACHE_INIT_FILENAME,
+
 	/*
 	 * If there's a backup_label or tablespace_map file, it belongs to a
 	 * backup started by the user with pg_start_backup().  It is *not* correct
@@ -184,7 +187,7 @@ base_backup_cleanup(int code, Datum arg)
  * clobbered by longjmp" from stupider versions of gcc.
  */
 static void
-perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
+perform_base_backup(basebackup_options *opt)
 {
 	XLogRecPtr	startptr;
 	TimeLineID	starttli;
@@ -203,7 +206,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 	tblspc_map_file = makeStringInfo();
 
 	startptr = do_pg_start_backup(opt->label, opt->fastcheckpoint, &starttli,
-								  labelfile, tblspcdir, &tablespaces,
+								  labelfile, &tablespaces,
 								  tblspc_map_file,
 								  opt->progress, opt->sendtblspcmapfile);
 
@@ -211,7 +214,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 	 * Once do_pg_start_backup has been called, ensure that any failure causes
 	 * us to abort the backup so we don't "leak" a backup counter. For this
 	 * reason, *all* functionality between do_pg_start_backup() and
-	 * do_pg_stop_backup() should be inside the error cleanup block!
+	 * the end of do_pg_stop_backup() should be inside the error cleanup block!
 	 */
 
 	PG_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
@@ -274,7 +277,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			/* Send CopyOutResponse message */
 			pq_beginmessage(&buf, 'H');
 			pq_sendbyte(&buf, 0);	/* overall format */
-			pq_sendint(&buf, 0, 2); /* natts */
+			pq_sendint16(&buf, 0);	/* natts */
 			pq_endmessage(&buf);
 
 			if (ti->path == NULL)
@@ -320,10 +323,11 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			else
 				pq_putemptymessage('c');	/* CopyDone */
 		}
+
+		endptr = do_pg_stop_backup(labelfile->data, !opt->nowait, &endtli);
 	}
 	PG_END_ENSURE_ERROR_CLEANUP(base_backup_cleanup, (Datum) 0);
 
-	endptr = do_pg_stop_backup(labelfile->data, !opt->nowait, &endtli);
 
 	if (opt->includewal)
 	{
@@ -357,15 +361,12 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		 * shouldn't be such files, but if there are, there's little harm in
 		 * including them.
 		 */
-		XLByteToSeg(startptr, startsegno);
-		XLogFileName(firstoff, ThisTimeLineID, startsegno);
-		XLByteToPrevSeg(endptr, endsegno);
-		XLogFileName(lastoff, ThisTimeLineID, endsegno);
+		XLByteToSeg(startptr, startsegno, wal_segment_size);
+		XLogFileName(firstoff, ThisTimeLineID, startsegno, wal_segment_size);
+		XLByteToPrevSeg(endptr, endsegno, wal_segment_size);
+		XLogFileName(lastoff, ThisTimeLineID, endsegno, wal_segment_size);
 
 		dir = AllocateDir("pg_wal");
-		if (!dir)
-			ereport(ERROR,
-					(errmsg("could not open directory \"%s\": %m", "pg_wal")));
 		while ((de = ReadDir(dir, "pg_wal")) != NULL)
 		{
 			/* Does it look like a WAL segment, and is it in the range? */
@@ -415,12 +416,13 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		 * Sanity check: the first and last segment should cover startptr and
 		 * endptr, with no gaps in between.
 		 */
-		XLogFromFileName(walFiles[0], &tli, &segno);
+		XLogFromFileName(walFiles[0], &tli, &segno, wal_segment_size);
 		if (segno != startsegno)
 		{
 			char		startfname[MAXFNAMELEN];
 
-			XLogFileName(startfname, ThisTimeLineID, startsegno);
+			XLogFileName(startfname, ThisTimeLineID, startsegno,
+						 wal_segment_size);
 			ereport(ERROR,
 					(errmsg("could not find WAL file \"%s\"", startfname)));
 		}
@@ -429,12 +431,13 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			XLogSegNo	currsegno = segno;
 			XLogSegNo	nextsegno = segno + 1;
 
-			XLogFromFileName(walFiles[i], &tli, &segno);
+			XLogFromFileName(walFiles[i], &tli, &segno, wal_segment_size);
 			if (!(nextsegno == segno || currsegno == segno))
 			{
 				char		nextfname[MAXFNAMELEN];
 
-				XLogFileName(nextfname, ThisTimeLineID, nextsegno);
+				XLogFileName(nextfname, ThisTimeLineID, nextsegno,
+							 wal_segment_size);
 				ereport(ERROR,
 						(errmsg("could not find WAL file \"%s\"", nextfname)));
 			}
@@ -443,7 +446,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 		{
 			char		endfname[MAXFNAMELEN];
 
-			XLogFileName(endfname, ThisTimeLineID, endsegno);
+			XLogFileName(endfname, ThisTimeLineID, endsegno, wal_segment_size);
 			ereport(ERROR,
 					(errmsg("could not find WAL file \"%s\"", endfname)));
 		}
@@ -457,7 +460,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			pgoff_t		len = 0;
 
 			snprintf(pathbuf, MAXPGPATH, XLOGDIR "/%s", walFiles[i]);
-			XLogFromFileName(walFiles[i], &tli, &segno);
+			XLogFromFileName(walFiles[i], &tli, &segno, wal_segment_size);
 
 			fp = AllocateFile(pathbuf, "rb");
 			if (fp == NULL)
@@ -479,7 +482,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 						(errcode_for_file_access(),
 						 errmsg("could not stat file \"%s\": %m",
 								pathbuf)));
-			if (statbuf.st_size != XLogSegSize)
+			if (statbuf.st_size != wal_segment_size)
 			{
 				CheckXLogRemoved(segno, tli);
 				ereport(ERROR,
@@ -490,7 +493,9 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 			/* send the WAL file itself */
 			_tarWriteHeader(pathbuf, NULL, &statbuf, false);
 
-			while ((cnt = fread(buf, 1, Min(sizeof(buf), XLogSegSize - len), fp)) > 0)
+			while ((cnt = fread(buf, 1,
+								Min(sizeof(buf), wal_segment_size - len),
+								fp)) > 0)
 			{
 				CheckXLogRemoved(segno, tli);
 				/* Send the chunk as a CopyData message */
@@ -501,11 +506,11 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 				len += cnt;
 				throttle(cnt);
 
-				if (len == XLogSegSize)
+				if (len == wal_segment_size)
 					break;
 			}
 
-			if (len != XLogSegSize)
+			if (len != wal_segment_size)
 			{
 				CheckXLogRemoved(segno, tli);
 				ereport(ERROR,
@@ -513,7 +518,7 @@ perform_base_backup(basebackup_options *opt, DIR *tblspcdir)
 						 errmsg("unexpected WAL file size \"%s\"", walFiles[i])));
 			}
 
-			/* XLogSegSize is a multiple of 512, so no need for padding */
+			/* wal_segment_size is a multiple of 512, so no need for padding */
 
 			FreeFile(fp);
 
@@ -685,7 +690,6 @@ parse_basebackup_options(List *options, basebackup_options *opt)
 void
 SendBaseBackup(BaseBackupCmd *cmd)
 {
-	DIR		   *dir;
 	basebackup_options opt;
 
 	parse_basebackup_options(cmd->options, &opt);
@@ -701,15 +705,7 @@ SendBaseBackup(BaseBackupCmd *cmd)
 		set_ps_display(activitymsg, false);
 	}
 
-	/* Make sure we can open the directory with tablespaces in it */
-	dir = AllocateDir("pg_tblspc");
-	if (!dir)
-		ereport(ERROR,
-				(errmsg("could not open directory \"%s\": %m", "pg_tblspc")));
-
-	perform_base_backup(&opt, dir);
-
-	FreeDir(dir);
+	perform_base_backup(&opt);
 }
 
 static void
@@ -718,7 +714,7 @@ send_int8_string(StringInfoData *buf, int64 intval)
 	char		is[32];
 
 	sprintf(is, INT64_FORMAT, intval);
-	pq_sendint(buf, strlen(is), 4);
+	pq_sendint32(buf, strlen(is));
 	pq_sendbytes(buf, is, strlen(is));
 }
 
@@ -730,34 +726,34 @@ SendBackupHeader(List *tablespaces)
 
 	/* Construct and send the directory information */
 	pq_beginmessage(&buf, 'T'); /* RowDescription */
-	pq_sendint(&buf, 3, 2);		/* 3 fields */
+	pq_sendint16(&buf, 3);		/* 3 fields */
 
 	/* First field - spcoid */
 	pq_sendstring(&buf, "spcoid");
-	pq_sendint(&buf, 0, 4);		/* table oid */
-	pq_sendint(&buf, 0, 2);		/* attnum */
-	pq_sendint(&buf, OIDOID, 4);	/* type oid */
-	pq_sendint(&buf, 4, 2);		/* typlen */
-	pq_sendint(&buf, 0, 4);		/* typmod */
-	pq_sendint(&buf, 0, 2);		/* format code */
+	pq_sendint32(&buf, 0);		/* table oid */
+	pq_sendint16(&buf, 0);		/* attnum */
+	pq_sendint32(&buf, OIDOID); /* type oid */
+	pq_sendint16(&buf, 4);		/* typlen */
+	pq_sendint32(&buf, 0);		/* typmod */
+	pq_sendint16(&buf, 0);		/* format code */
 
 	/* Second field - spcpath */
 	pq_sendstring(&buf, "spclocation");
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
-	pq_sendint(&buf, TEXTOID, 4);
-	pq_sendint(&buf, -1, 2);
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
+	pq_sendint32(&buf, TEXTOID);
+	pq_sendint16(&buf, -1);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
 
 	/* Third field - size */
 	pq_sendstring(&buf, "size");
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
-	pq_sendint(&buf, INT8OID, 4);
-	pq_sendint(&buf, 8, 2);
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
+	pq_sendint32(&buf, INT8OID);
+	pq_sendint16(&buf, 8);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
 	pq_endmessage(&buf);
 
 	foreach(lc, tablespaces)
@@ -766,28 +762,28 @@ SendBackupHeader(List *tablespaces)
 
 		/* Send one datarow message */
 		pq_beginmessage(&buf, 'D');
-		pq_sendint(&buf, 3, 2); /* number of columns */
+		pq_sendint16(&buf, 3);	/* number of columns */
 		if (ti->path == NULL)
 		{
-			pq_sendint(&buf, -1, 4);	/* Length = -1 ==> NULL */
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1); /* Length = -1 ==> NULL */
+			pq_sendint32(&buf, -1);
 		}
 		else
 		{
 			Size		len;
 
 			len = strlen(ti->oid);
-			pq_sendint(&buf, len, 4);
+			pq_sendint32(&buf, len);
 			pq_sendbytes(&buf, ti->oid, len);
 
 			len = strlen(ti->path);
-			pq_sendint(&buf, len, 4);
+			pq_sendint32(&buf, len);
 			pq_sendbytes(&buf, ti->path, len);
 		}
 		if (ti->size >= 0)
 			send_int8_string(&buf, ti->size / 1024);
 		else
-			pq_sendint(&buf, -1, 4);	/* NULL */
+			pq_sendint32(&buf, -1); /* NULL */
 
 		pq_endmessage(&buf);
 	}
@@ -808,42 +804,42 @@ SendXlogRecPtrResult(XLogRecPtr ptr, TimeLineID tli)
 	Size		len;
 
 	pq_beginmessage(&buf, 'T'); /* RowDescription */
-	pq_sendint(&buf, 2, 2);		/* 2 fields */
+	pq_sendint16(&buf, 2);		/* 2 fields */
 
 	/* Field headers */
 	pq_sendstring(&buf, "recptr");
-	pq_sendint(&buf, 0, 4);		/* table oid */
-	pq_sendint(&buf, 0, 2);		/* attnum */
-	pq_sendint(&buf, TEXTOID, 4);	/* type oid */
-	pq_sendint(&buf, -1, 2);
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
+	pq_sendint32(&buf, 0);		/* table oid */
+	pq_sendint16(&buf, 0);		/* attnum */
+	pq_sendint32(&buf, TEXTOID);	/* type oid */
+	pq_sendint16(&buf, -1);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
 
 	pq_sendstring(&buf, "tli");
-	pq_sendint(&buf, 0, 4);		/* table oid */
-	pq_sendint(&buf, 0, 2);		/* attnum */
+	pq_sendint32(&buf, 0);		/* table oid */
+	pq_sendint16(&buf, 0);		/* attnum */
 
 	/*
 	 * int8 may seem like a surprising data type for this, but in theory int4
 	 * would not be wide enough for this, as TimeLineID is unsigned.
 	 */
-	pq_sendint(&buf, INT8OID, 4);	/* type oid */
-	pq_sendint(&buf, -1, 2);
-	pq_sendint(&buf, 0, 4);
-	pq_sendint(&buf, 0, 2);
+	pq_sendint32(&buf, INT8OID);	/* type oid */
+	pq_sendint16(&buf, -1);
+	pq_sendint32(&buf, 0);
+	pq_sendint16(&buf, 0);
 	pq_endmessage(&buf);
 
 	/* Data row */
 	pq_beginmessage(&buf, 'D');
-	pq_sendint(&buf, 2, 2);		/* number of columns */
+	pq_sendint16(&buf, 2);		/* number of columns */
 
 	len = snprintf(str, sizeof(str),
 				   "%X/%X", (uint32) (ptr >> 32), (uint32) ptr);
-	pq_sendint(&buf, len, 4);
+	pq_sendint32(&buf, len);
 	pq_sendbytes(&buf, str, len);
 
 	len = snprintf(str, sizeof(str), "%u", tli);
-	pq_sendint(&buf, len, 4);
+	pq_sendint32(&buf, len);
 	pq_sendbytes(&buf, str, len);
 
 	pq_endmessage(&buf);
@@ -954,7 +950,7 @@ sendTablespace(char *path, bool sizeonly)
  * as it will be sent separately in the tablespace_map file.
  */
 static int64
-sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
+sendDir(const char *path, int basepathlen, bool sizeonly, List *tablespaces,
 		bool sendtblspclinks)
 {
 	DIR		   *dir;
@@ -1199,7 +1195,7 @@ sendDir(char *path, int basepathlen, bool sizeonly, List *tablespaces,
  * and the file did not exist.
  */
 static bool
-sendFile(char *readfilename, char *tarfilename, struct stat *statbuf,
+sendFile(const char *readfilename, const char *tarfilename, struct stat *statbuf,
 		 bool missing_ok)
 {
 	FILE	   *fp;
@@ -1336,10 +1332,7 @@ _tarWriteDir(const char *pathbuf, int basepathlen, struct stat *statbuf,
 static void
 throttle(size_t increment)
 {
-	TimeOffset	elapsed,
-				elapsed_min,
-				sleep;
-	int			wait_result;
+	TimeOffset	elapsed_min;
 
 	if (throttling_counter < 0)
 		return;
@@ -1348,14 +1341,28 @@ throttle(size_t increment)
 	if (throttling_counter < throttling_sample)
 		return;
 
-	/* Time elapsed since the last measurement (and possible wake up). */
-	elapsed = GetCurrentTimestamp() - throttled_last;
-	/* How much should have elapsed at minimum? */
-	elapsed_min = elapsed_min_unit * (throttling_counter / throttling_sample);
-	sleep = elapsed_min - elapsed;
-	/* Only sleep if the transfer is faster than it should be. */
-	if (sleep > 0)
+	/* How much time should have elapsed at minimum? */
+	elapsed_min = elapsed_min_unit *
+		(throttling_counter / throttling_sample);
+
+	/*
+	 * Since the latch could be set repeatedly because of concurrently WAL
+	 * activity, sleep in a loop to ensure enough time has passed.
+	 */
+	for (;;)
 	{
+		TimeOffset	elapsed,
+					sleep;
+		int			wait_result;
+
+		/* Time elapsed since the last measurement (and possible wake up). */
+		elapsed = GetCurrentTimestamp() - throttled_last;
+
+		/* sleep if the transfer is faster than it should be */
+		sleep = elapsed_min - elapsed;
+		if (sleep <= 0)
+			break;
+
 		ResetLatch(MyLatch);
 
 		/* We're eating a potentially set latch, so check for interrupts */
@@ -1372,6 +1379,10 @@ throttle(size_t increment)
 
 		if (wait_result & WL_LATCH_SET)
 			CHECK_FOR_INTERRUPTS();
+
+		/* Done waiting? */
+		if (wait_result & WL_TIMEOUT)
+			break;
 	}
 
 	/*
diff --git a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
index 3957bd37fb..f9aec0531a 100644
--- a/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
+++ b/src/backend/replication/libpqwalreceiver/libpqwalreceiver.c
@@ -6,7 +6,7 @@
  * loaded as a dynamic module to avoid linking the main server binary with
  * libpq.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/replication/logical/decode.c b/src/backend/replication/logical/decode.c
index 486fd0c988..6eb0d5527e 100644
--- a/src/backend/replication/logical/decode.c
+++ b/src/backend/replication/logical/decode.c
@@ -16,7 +16,7 @@
  *		contents of records in here except turning them into a more usable
  *		format.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -88,6 +88,9 @@ static void DecodeXLogTuple(char *data, Size len, ReorderBufferTupleBuf *tup);
  * call ReorderBufferProcessXid for each record type by default, because
  * e.g. empty xacts can be handled more efficiently if there's no previous
  * state for them.
+ *
+ * We also support the ability to fast forward thru records, skipping some
+ * record types completely - see individual record types for details.
  */
 void
 LogicalDecodingProcessRecord(LogicalDecodingContext *ctx, XLogReaderState *record)
@@ -332,8 +335,10 @@ DecodeStandbyOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 				xl_invalidations *invalidations =
 				(xl_invalidations *) XLogRecGetData(r);
 
-				ReorderBufferImmediateInvalidation(
-												   ctx->reorder, invalidations->nmsgs, invalidations->msgs);
+				if (!ctx->fast_forward)
+					ReorderBufferImmediateInvalidation(ctx->reorder,
+													   invalidations->nmsgs,
+													   invalidations->msgs);
 			}
 			break;
 		default:
@@ -353,14 +358,19 @@ DecodeHeap2Op(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 
 	ReorderBufferProcessXid(ctx->reorder, xid, buf->origptr);
 
-	/* no point in doing anything yet */
-	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT)
+	/*
+	 * If we don't have snapshot or we are just fast-forwarding, there is no
+	 * point in decoding changes.
+	 */
+	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT ||
+		ctx->fast_forward)
 		return;
 
 	switch (info)
 	{
 		case XLOG_HEAP2_MULTI_INSERT:
-			if (SnapBuildProcessChange(builder, xid, buf->origptr))
+			if (!ctx->fast_forward &&
+				SnapBuildProcessChange(builder, xid, buf->origptr))
 				DecodeMultiInsert(ctx, buf);
 			break;
 		case XLOG_HEAP2_NEW_CID:
@@ -408,8 +418,12 @@ DecodeHeapOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 
 	ReorderBufferProcessXid(ctx->reorder, xid, buf->origptr);
 
-	/* no point in doing anything yet */
-	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT)
+	/*
+	 * If we don't have snapshot or we are just fast-forwarding, there is no
+	 * point in decoding data changes.
+	 */
+	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT ||
+		ctx->fast_forward)
 		return;
 
 	switch (info)
@@ -501,8 +515,12 @@ DecodeLogicalMsgOp(LogicalDecodingContext *ctx, XLogRecordBuffer *buf)
 
 	ReorderBufferProcessXid(ctx->reorder, XLogRecGetXid(r), buf->origptr);
 
-	/* No point in doing anything yet. */
-	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT)
+	/*
+	 * If we don't have snapshot or we are just fast-forwarding, there is no
+	 * point in decoding messages.
+	 */
+	if (SnapBuildCurrentState(builder) < SNAPBUILD_FULL_SNAPSHOT ||
+		ctx->fast_forward)
 		return;
 
 	message = (xl_logical_message *) XLogRecGetData(r);
@@ -554,8 +572,9 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	 */
 	if (parsed->nmsgs > 0)
 	{
-		ReorderBufferAddInvalidations(ctx->reorder, xid, buf->origptr,
-									  parsed->nmsgs, parsed->msgs);
+		if (!ctx->fast_forward)
+			ReorderBufferAddInvalidations(ctx->reorder, xid, buf->origptr,
+										  parsed->nmsgs, parsed->msgs);
 		ReorderBufferXidSetCatalogChanges(ctx->reorder, xid, buf->origptr);
 	}
 
@@ -574,6 +593,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	 *	  are restarting or if we haven't assembled a consistent snapshot yet.
 	 * 2) The transaction happened in another database.
 	 * 3) The output plugin is not interested in the origin.
+	 * 4) We are doing fast-forwarding
 	 *
 	 * We can't just use ReorderBufferAbort() here, because we need to execute
 	 * the transaction's invalidations.  This currently won't be needed if
@@ -589,7 +609,7 @@ DecodeCommit(LogicalDecodingContext *ctx, XLogRecordBuffer *buf,
 	 */
 	if (SnapBuildXactNeedsSkip(ctx->snapshot_builder, buf->origptr) ||
 		(parsed->dbId != InvalidOid && parsed->dbId != ctx->slot->data.database) ||
-		FilterByOrigin(ctx, origin_id))
+		ctx->fast_forward || FilterByOrigin(ctx, origin_id))
 	{
 		for (i = 0; i < parsed->nsubxacts; i++)
 		{
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
index 6c894421a3..2da9129562 100644
--- a/src/backend/replication/logical/launcher.c
+++ b/src/backend/replication/logical/launcher.c
@@ -2,7 +2,7 @@
  * launcher.c
  *	   PostgreSQL logical replication worker launcher process
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/launcher.c
@@ -168,14 +168,11 @@ get_subscription_list(void)
  */
 static void
 WaitForReplicationWorkerAttach(LogicalRepWorker *worker,
+							   uint16 generation,
 							   BackgroundWorkerHandle *handle)
 {
 	BgwHandleStatus status;
 	int			rc;
-	uint16		generation;
-
-	/* Remember generation for future identification. */
-	generation = worker->generation;
 
 	for (;;)
 	{
@@ -282,7 +279,7 @@ logicalrep_workers_find(Oid subid, bool only_running)
 }
 
 /*
- * Start new apply background worker.
+ * Start new apply background worker, if possible.
  */
 void
 logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
@@ -290,6 +287,7 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 {
 	BackgroundWorker bgw;
 	BackgroundWorkerHandle *bgw_handle;
+	uint16		generation;
 	int			i;
 	int			slot = 0;
 	LogicalRepWorker *worker = NULL;
@@ -406,6 +404,9 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 	worker->reply_lsn = InvalidXLogRecPtr;
 	TIMESTAMP_NOBEGIN(worker->reply_time);
 
+	/* Before releasing lock, remember generation for future identification. */
+	generation = worker->generation;
+
 	LWLockRelease(LogicalRepWorkerLock);
 
 	/* Register the new dynamic worker. */
@@ -421,6 +422,7 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 	else
 		snprintf(bgw.bgw_name, BGW_MAXLEN,
 				 "logical replication worker for subscription %u", subid);
+	snprintf(bgw.bgw_type, BGW_MAXLEN, "logical replication worker");
 
 	bgw.bgw_restart_time = BGW_NEVER_RESTART;
 	bgw.bgw_notify_pid = MyProcPid;
@@ -428,6 +430,12 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 
 	if (!RegisterDynamicBackgroundWorker(&bgw, &bgw_handle))
 	{
+		/* Failed to start worker, so clean up the worker slot. */
+		LWLockAcquire(LogicalRepWorkerLock, LW_EXCLUSIVE);
+		Assert(generation == worker->generation);
+		logicalrep_worker_cleanup(worker);
+		LWLockRelease(LogicalRepWorkerLock);
+
 		ereport(WARNING,
 				(errcode(ERRCODE_CONFIGURATION_LIMIT_EXCEEDED),
 				 errmsg("out of background worker slots"),
@@ -436,7 +444,7 @@ logicalrep_worker_launch(Oid dbid, Oid subid, const char *subname, Oid userid,
 	}
 
 	/* Now wait until it attaches. */
-	WaitForReplicationWorkerAttach(worker, bgw_handle);
+	WaitForReplicationWorkerAttach(worker, generation, bgw_handle);
 }
 
 /*
@@ -768,6 +776,8 @@ ApplyLauncherRegister(void)
 	snprintf(bgw.bgw_function_name, BGW_MAXLEN, "ApplyLauncherMain");
 	snprintf(bgw.bgw_name, BGW_MAXLEN,
 			 "logical replication launcher");
+	snprintf(bgw.bgw_type, BGW_MAXLEN,
+			 "logical replication launcher");
 	bgw.bgw_restart_time = 5;
 	bgw.bgw_notify_pid = 0;
 	bgw.bgw_main_arg = (Datum) 0;
@@ -915,9 +925,7 @@ ApplyLauncherMain(Datum main_arg)
 			/* Use temporary context for the database list and worker info. */
 			subctx = AllocSetContextCreate(TopMemoryContext,
 										   "Logical Replication Launcher sublist",
-										   ALLOCSET_DEFAULT_MINSIZE,
-										   ALLOCSET_DEFAULT_INITSIZE,
-										   ALLOCSET_DEFAULT_MAXSIZE);
+										   ALLOCSET_DEFAULT_SIZES);
 			oldctx = MemoryContextSwitchTo(subctx);
 
 			/* search for subscriptions to start or stop. */
diff --git a/src/backend/replication/logical/logical.c b/src/backend/replication/logical/logical.c
index efb9785f25..7637efc32e 100644
--- a/src/backend/replication/logical/logical.c
+++ b/src/backend/replication/logical/logical.c
@@ -2,7 +2,7 @@
  * logical.c
  *	   PostgreSQL logical decoding coordination
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/logical.c
@@ -115,6 +115,7 @@ StartupDecodingContext(List *output_plugin_options,
 					   XLogRecPtr start_lsn,
 					   TransactionId xmin_horizon,
 					   bool need_full_snapshot,
+					   bool fast_forward,
 					   XLogPageReadCB read_page,
 					   LogicalOutputPluginWriterPrepareWrite prepare_write,
 					   LogicalOutputPluginWriterWrite do_write,
@@ -140,7 +141,8 @@ StartupDecodingContext(List *output_plugin_options,
 	 * (re-)load output plugins, so we detect a bad (removed) output plugin
 	 * now.
 	 */
-	LoadOutputPlugin(&ctx->callbacks, NameStr(slot->data.plugin));
+	if (!fast_forward)
+		LoadOutputPlugin(&ctx->callbacks, NameStr(slot->data.plugin));
 
 	/*
 	 * Now that the slot's xmin has been set, we can announce ourselves as a
@@ -163,7 +165,7 @@ StartupDecodingContext(List *output_plugin_options,
 
 	ctx->slot = slot;
 
-	ctx->reader = XLogReaderAllocate(read_page, ctx);
+	ctx->reader = XLogReaderAllocate(wal_segment_size, read_page, ctx);
 	if (!ctx->reader)
 		ereport(ERROR,
 				(errcode(ERRCODE_OUT_OF_MEMORY),
@@ -191,6 +193,8 @@ StartupDecodingContext(List *output_plugin_options,
 
 	ctx->output_plugin_options = output_plugin_options;
 
+	ctx->fast_forward = fast_forward;
+
 	MemoryContextSwitchTo(old_context);
 
 	return ctx;
@@ -303,8 +307,9 @@ CreateInitDecodingContext(char *plugin,
 	ReplicationSlotSave();
 
 	ctx = StartupDecodingContext(NIL, InvalidXLogRecPtr, xmin_horizon,
-								 need_full_snapshot, read_page, prepare_write,
-								 do_write, update_progress);
+								 need_full_snapshot, true,
+								 read_page, prepare_write, do_write,
+								 update_progress);
 
 	/* call output plugin initialization callback */
 	old_context = MemoryContextSwitchTo(ctx->context);
@@ -342,6 +347,7 @@ CreateInitDecodingContext(char *plugin,
 LogicalDecodingContext *
 CreateDecodingContext(XLogRecPtr start_lsn,
 					  List *output_plugin_options,
+					  bool fast_forward,
 					  XLogPageReadCB read_page,
 					  LogicalOutputPluginWriterPrepareWrite prepare_write,
 					  LogicalOutputPluginWriterWrite do_write,
@@ -395,8 +401,8 @@ CreateDecodingContext(XLogRecPtr start_lsn,
 
 	ctx = StartupDecodingContext(output_plugin_options,
 								 start_lsn, InvalidTransactionId, false,
-								 read_page, prepare_write, do_write,
-								 update_progress);
+								 fast_forward, read_page, prepare_write,
+								 do_write, update_progress);
 
 	/* call output plugin initialization callback */
 	old_context = MemoryContextSwitchTo(ctx->context);
@@ -573,6 +579,8 @@ startup_cb_wrapper(LogicalDecodingContext *ctx, OutputPluginOptions *opt, bool i
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "startup";
@@ -598,6 +606,8 @@ shutdown_cb_wrapper(LogicalDecodingContext *ctx)
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "shutdown";
@@ -629,6 +639,8 @@ begin_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn)
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "begin";
@@ -658,6 +670,8 @@ commit_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "commit";
@@ -687,6 +701,8 @@ change_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "change";
@@ -721,6 +737,8 @@ filter_by_origin_cb_wrapper(LogicalDecodingContext *ctx, RepOriginId origin_id)
 	ErrorContextCallback errcallback;
 	bool		ret;
 
+	Assert(!ctx->fast_forward);
+
 	/* Push callback + info on the error context stack */
 	state.ctx = ctx;
 	state.callback_name = "filter_by_origin";
@@ -751,6 +769,8 @@ message_cb_wrapper(ReorderBuffer *cache, ReorderBufferTXN *txn,
 	LogicalErrorCallbackState state;
 	ErrorContextCallback errcallback;
 
+	Assert(!ctx->fast_forward);
+
 	if (ctx->callbacks.message_cb == NULL)
 		return;
 
diff --git a/src/backend/replication/logical/logicalfuncs.c b/src/backend/replication/logical/logicalfuncs.c
index a3ba2b1266..54c25f1f5b 100644
--- a/src/backend/replication/logical/logicalfuncs.c
+++ b/src/backend/replication/logical/logicalfuncs.c
@@ -6,7 +6,7 @@
  *	   logical replication slots via SQL.
  *
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logicalfuncs.c
@@ -251,6 +251,7 @@ pg_logical_slot_get_changes_guts(FunctionCallInfo fcinfo, bool confirm, bool bin
 		/* restart at slot's confirmed_flush */
 		ctx = CreateDecodingContext(InvalidXLogRecPtr,
 									options,
+									false,
 									logical_read_local_xlog_page,
 									LogicalOutputPrepareWrite,
 									LogicalOutputWrite, NULL);
diff --git a/src/backend/replication/logical/message.c b/src/backend/replication/logical/message.c
index ef7d6c5cde..0eba74c26a 100644
--- a/src/backend/replication/logical/message.c
+++ b/src/backend/replication/logical/message.c
@@ -3,7 +3,7 @@
  * message.c
  *	  Generic logical messages.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/message.c
diff --git a/src/backend/replication/logical/origin.c b/src/backend/replication/logical/origin.c
index 14cb3d0bf2..963878a5d8 100644
--- a/src/backend/replication/logical/origin.c
+++ b/src/backend/replication/logical/origin.c
@@ -3,7 +3,7 @@
  * origin.c
  *	  Logical replication progress tracking support.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/origin.c
@@ -60,7 +60,7 @@
  *	 all our platforms, but it also simplifies memory ordering concerns
  *	 between the remote and local lsn. We use a lwlock instead of a spinlock
  *	 so it's less harmful to hold the lock over a WAL write
- *	 (c.f. AdvanceReplicationProgress).
+ *	 (cf. AdvanceReplicationProgress).
  *
  * ---------------------------------------------------------------------------
  */
@@ -225,8 +225,10 @@ replorigin_by_name(char *roname, bool missing_ok)
 		ReleaseSysCache(tuple);
 	}
 	else if (!missing_ok)
-		elog(ERROR, "cache lookup failed for replication origin '%s'",
-			 roname);
+		ereport(ERROR,
+				(errcode(ERRCODE_UNDEFINED_OBJECT),
+				 errmsg("replication origin \"%s\" does not exist",
+						roname)));
 
 	return roident;
 }
@@ -337,20 +339,26 @@ replorigin_drop(RepOriginId roident, bool nowait)
 
 	Assert(IsTransactionState());
 
+	/*
+	 * To interlock against concurrent drops, we hold ExclusiveLock on
+	 * pg_replication_origin throughout this function.
+	 */
 	rel = heap_open(ReplicationOriginRelationId, ExclusiveLock);
 
+	/*
+	 * First, clean up the slot state info, if there is any matching slot.
+	 */
 restart:
 	tuple = NULL;
-	/* cleanup the slot state info */
 	LWLockAcquire(ReplicationOriginLock, LW_EXCLUSIVE);
 
 	for (i = 0; i < max_replication_slots; i++)
 	{
 		ReplicationState *state = &replication_states[i];
 
-		/* found our slot */
 		if (state->roident == roident)
 		{
+			/* found our slot, is it busy? */
 			if (state->acquired_by != 0)
 			{
 				ConditionVariable *cv;
@@ -361,16 +369,23 @@ replorigin_drop(RepOriginId roident, bool nowait)
 							 errmsg("could not drop replication origin with OID %d, in use by PID %d",
 									state->roident,
 									state->acquired_by)));
+
+				/*
+				 * We must wait and then retry.  Since we don't know which CV
+				 * to wait on until here, we can't readily use
+				 * ConditionVariablePrepareToSleep (calling it here would be
+				 * wrong, since we could miss the signal if we did so); just
+				 * use ConditionVariableSleep directly.
+				 */
 				cv = &state->origin_cv;
 
 				LWLockRelease(ReplicationOriginLock);
-				ConditionVariablePrepareToSleep(cv);
+
 				ConditionVariableSleep(cv, WAIT_EVENT_REPLICATION_ORIGIN_DROP);
-				ConditionVariableCancelSleep();
 				goto restart;
 			}
 
-			/* first WAL log */
+			/* first make a WAL log entry */
 			{
 				xl_replorigin_drop xlrec;
 
@@ -380,7 +395,7 @@ replorigin_drop(RepOriginId roident, bool nowait)
 				XLogInsert(RM_REPLORIGIN_ID, XLOG_REPLORIGIN_DROP);
 			}
 
-			/* then reset the in-memory entry */
+			/* then clear the in-memory slot */
 			state->roident = InvalidRepOriginId;
 			state->remote_lsn = InvalidXLogRecPtr;
 			state->local_lsn = InvalidXLogRecPtr;
@@ -388,7 +403,11 @@ replorigin_drop(RepOriginId roident, bool nowait)
 		}
 	}
 	LWLockRelease(ReplicationOriginLock);
+	ConditionVariableCancelSleep();
 
+	/*
+	 * Now, we can delete the catalog entry.
+	 */
 	tuple = SearchSysCache1(REPLORIGIDENT, ObjectIdGetDatum(roident));
 	if (!HeapTupleIsValid(tuple))
 		elog(ERROR, "cache lookup failed for replication origin with oid %u",
@@ -437,8 +456,10 @@ replorigin_by_oid(RepOriginId roident, bool missing_ok, char **roname)
 		*roname = NULL;
 
 		if (!missing_ok)
-			elog(ERROR, "cache lookup failed for replication origin with oid %u",
-				 roident);
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_OBJECT),
+					 errmsg("replication origin with OID %u does not exist",
+							roident)));
 
 		return false;
 	}
@@ -546,9 +567,8 @@ CheckPointReplicationOrigin(void)
 	 * no other backend can perform this at the same time, we're protected by
 	 * CheckpointLock.
 	 */
-	tmpfd = OpenTransientFile((char *) tmppath,
-							  O_CREAT | O_EXCL | O_WRONLY | PG_BINARY,
-							  S_IRUSR | S_IWUSR);
+	tmpfd = OpenTransientFile(tmppath,
+							  O_CREAT | O_EXCL | O_WRONLY | PG_BINARY);
 	if (tmpfd < 0)
 		ereport(PANIC,
 				(errcode_for_file_access(),
@@ -660,7 +680,7 @@ StartupReplicationOrigin(void)
 
 	elog(DEBUG2, "starting up replication origin progress state");
 
-	fd = OpenTransientFile((char *) path, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 
 	/*
 	 * might have had max_replication_slots == 0 last run, or we just brought
@@ -1205,7 +1225,7 @@ pg_replication_origin_drop(PG_FUNCTION_ARGS)
 	roident = replorigin_by_name(name, false);
 	Assert(OidIsValid(roident));
 
-	replorigin_drop(roident, false);
+	replorigin_drop(roident, true);
 
 	pfree(name);
 
diff --git a/src/backend/replication/logical/proto.c b/src/backend/replication/logical/proto.c
index 94dfee0b24..948343e4ae 100644
--- a/src/backend/replication/logical/proto.c
+++ b/src/backend/replication/logical/proto.c
@@ -3,7 +3,7 @@
  * proto.c
  *		logical replication protocol functions
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/backend/replication/logical/proto.c
@@ -47,7 +47,7 @@ logicalrep_write_begin(StringInfo out, ReorderBufferTXN *txn)
 	/* fixed fields */
 	pq_sendint64(out, txn->final_lsn);
 	pq_sendint64(out, txn->commit_time);
-	pq_sendint(out, txn->xid, 4);
+	pq_sendint32(out, txn->xid);
 }
 
 /*
@@ -145,7 +145,7 @@ logicalrep_write_insert(StringInfo out, Relation rel, HeapTuple newtuple)
 		   rel->rd_rel->relreplident == REPLICA_IDENTITY_INDEX);
 
 	/* use Oid as relation identifier */
-	pq_sendint(out, RelationGetRelid(rel), 4);
+	pq_sendint32(out, RelationGetRelid(rel));
 
 	pq_sendbyte(out, 'N');		/* new tuple follows */
 	logicalrep_write_tuple(out, rel, newtuple);
@@ -189,7 +189,7 @@ logicalrep_write_update(StringInfo out, Relation rel, HeapTuple oldtuple,
 		   rel->rd_rel->relreplident == REPLICA_IDENTITY_INDEX);
 
 	/* use Oid as relation identifier */
-	pq_sendint(out, RelationGetRelid(rel), 4);
+	pq_sendint32(out, RelationGetRelid(rel));
 
 	if (oldtuple != NULL)
 	{
@@ -258,7 +258,7 @@ logicalrep_write_delete(StringInfo out, Relation rel, HeapTuple oldtuple)
 	pq_sendbyte(out, 'D');		/* action DELETE */
 
 	/* use Oid as relation identifier */
-	pq_sendint(out, RelationGetRelid(rel), 4);
+	pq_sendint32(out, RelationGetRelid(rel));
 
 	if (rel->rd_rel->relreplident == REPLICA_IDENTITY_FULL)
 		pq_sendbyte(out, 'O');	/* old tuple follows */
@@ -303,7 +303,7 @@ logicalrep_write_rel(StringInfo out, Relation rel)
 	pq_sendbyte(out, 'R');		/* sending RELATION */
 
 	/* use Oid as relation identifier */
-	pq_sendint(out, RelationGetRelid(rel), 4);
+	pq_sendint32(out, RelationGetRelid(rel));
 
 	/* send qualified relation name */
 	logicalrep_write_namespace(out, RelationGetNamespace(rel));
@@ -360,7 +360,7 @@ logicalrep_write_typ(StringInfo out, Oid typoid)
 	typtup = (Form_pg_type) GETSTRUCT(tup);
 
 	/* use Oid as relation identifier */
-	pq_sendint(out, typoid, 4);
+	pq_sendint32(out, typoid);
 
 	/* send qualified type name */
 	logicalrep_write_namespace(out, typtup->typnamespace);
@@ -398,11 +398,11 @@ logicalrep_write_tuple(StringInfo out, Relation rel, HeapTuple tuple)
 
 	for (i = 0; i < desc->natts; i++)
 	{
-		if (desc->attrs[i]->attisdropped)
+		if (TupleDescAttr(desc, i)->attisdropped)
 			continue;
 		nliveatts++;
 	}
-	pq_sendint(out, nliveatts, 2);
+	pq_sendint16(out, nliveatts);
 
 	/* try to allocate enough memory from the get-go */
 	enlargeStringInfo(out, tuple->t_len +
@@ -415,7 +415,7 @@ logicalrep_write_tuple(StringInfo out, Relation rel, HeapTuple tuple)
 	{
 		HeapTuple	typtup;
 		Form_pg_type typclass;
-		Form_pg_attribute att = desc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(desc, i);
 		char	   *outputstr;
 
 		/* skip dropped columns */
@@ -518,11 +518,11 @@ logicalrep_write_attrs(StringInfo out, Relation rel)
 	/* send number of live attributes */
 	for (i = 0; i < desc->natts; i++)
 	{
-		if (desc->attrs[i]->attisdropped)
+		if (TupleDescAttr(desc, i)->attisdropped)
 			continue;
 		nliveatts++;
 	}
-	pq_sendint(out, nliveatts, 2);
+	pq_sendint16(out, nliveatts);
 
 	/* fetch bitmap of REPLICATION IDENTITY attributes */
 	replidentfull = (rel->rd_rel->relreplident == REPLICA_IDENTITY_FULL);
@@ -533,7 +533,7 @@ logicalrep_write_attrs(StringInfo out, Relation rel)
 	/* send the attributes */
 	for (i = 0; i < desc->natts; i++)
 	{
-		Form_pg_attribute att = desc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(desc, i);
 		uint8		flags = 0;
 
 		if (att->attisdropped)
@@ -551,10 +551,10 @@ logicalrep_write_attrs(StringInfo out, Relation rel)
 		pq_sendstring(out, NameStr(att->attname));
 
 		/* attribute type id */
-		pq_sendint(out, (int) att->atttypid, sizeof(att->atttypid));
+		pq_sendint32(out, (int) att->atttypid);
 
 		/* attribute mode */
-		pq_sendint(out, att->atttypmod, sizeof(att->atttypmod));
+		pq_sendint32(out, att->atttypmod);
 	}
 
 	bms_free(idattrs);
diff --git a/src/backend/replication/logical/relation.c b/src/backend/replication/logical/relation.c
index a7ea16d714..e492d26d18 100644
--- a/src/backend/replication/logical/relation.c
+++ b/src/backend/replication/logical/relation.c
@@ -2,7 +2,7 @@
  * relation.c
  *	   PostgreSQL logical replication
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/relation.c
@@ -278,15 +278,16 @@ logicalrep_rel_open(LogicalRepRelId remoteid, LOCKMODE lockmode)
 		for (i = 0; i < desc->natts; i++)
 		{
 			int			attnum;
+			Form_pg_attribute attr = TupleDescAttr(desc, i);
 
-			if (desc->attrs[i]->attisdropped)
+			if (attr->attisdropped)
 			{
 				entry->attrmap[i] = -1;
 				continue;
 			}
 
 			attnum = logicalrep_rel_att_by_name(remoterel,
-												NameStr(desc->attrs[i]->attname));
+												NameStr(attr->attname));
 
 			entry->attrmap[i] = attnum;
 			if (attnum >= 0)
@@ -453,9 +454,8 @@ logicalrep_typmap_getid(Oid remoteid)
 	{
 		if (!get_typisdefined(remoteid))
 			ereport(ERROR,
-					(errmsg("builtin type %u not found", remoteid),
-					 errhint("This can be caused by having publisher with "
-							 "higher major version than subscriber")));
+					(errmsg("built-in type %u not found", remoteid),
+					 errhint("This can be caused by having a publisher with a higher PostgreSQL major version than the subscriber.")));
 		return remoteid;
 	}
 
diff --git a/src/backend/replication/logical/reorderbuffer.c b/src/backend/replication/logical/reorderbuffer.c
index 5567bee061..c72a611a39 100644
--- a/src/backend/replication/logical/reorderbuffer.c
+++ b/src/backend/replication/logical/reorderbuffer.c
@@ -4,7 +4,7 @@
  *	  PostgreSQL logical replay/reorder buffer management
  *
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -15,7 +15,7 @@
  *	  they are written to the WAL and is responsible to reassemble them into
  *	  toplevel transaction sized pieces. When a transaction is completely
  *	  reassembled - signalled by reading the transaction commit record - it
- *	  will then call the output plugin (c.f. ReorderBufferCommit()) with the
+ *	  will then call the output plugin (cf. ReorderBufferCommit()) with the
  *	  individual changes. The output plugins rely on snapshots built by
  *	  snapbuild.c which hands them to us.
  *
@@ -43,6 +43,12 @@
  *	  transaction there will be no other data carrying records between a row's
  *	  toast chunks and the row data itself. See ReorderBufferToast* for
  *	  details.
+ *
+ *	  ReorderBuffer uses two special memory context types - SlabContext for
+ *	  allocations of fixed-length structures (changes and transactions), and
+ *	  GenerationContext for the variable-length transaction data (allocated
+ *	  and freed in groups with similar lifespan).
+ *
  * -------------------------------------------------------------------------
  */
 #include "postgres.h"
@@ -150,15 +156,6 @@ typedef struct ReorderBufferDiskChange
  */
 static const Size max_changes_in_memory = 4096;
 
-/*
- * We use a very simple form of a slab allocator for frequently allocated
- * objects, simply keeping a fixed number in a linked list when unused,
- * instead pfree()ing them. Without that in many workloads aset.c becomes a
- * major bottleneck, especially when spilling to disk while decoding batch
- * workloads.
- */
-static const Size max_cached_tuplebufs = 4096 * 2;	/* ~8MB */
-
 /* ---------------------------------------
  * primary reorderbuffer support routines
  * ---------------------------------------
@@ -240,14 +237,21 @@ ReorderBufferAllocate(void)
 
 	buffer->change_context = SlabContextCreate(new_ctx,
 											   "Change",
+											   0,
 											   SLAB_DEFAULT_BLOCK_SIZE,
 											   sizeof(ReorderBufferChange));
 
 	buffer->txn_context = SlabContextCreate(new_ctx,
 											"TXN",
+											0,
 											SLAB_DEFAULT_BLOCK_SIZE,
 											sizeof(ReorderBufferTXN));
 
+	buffer->tup_context = GenerationContextCreate(new_ctx,
+												  "Tuples",
+												  0,
+												  SLAB_LARGE_BLOCK_SIZE);
+
 	hash_ctl.keysize = sizeof(TransactionId);
 	hash_ctl.entrysize = sizeof(ReorderBufferTXNByIdEnt);
 	hash_ctl.hcxt = buffer->context;
@@ -258,15 +262,12 @@ ReorderBufferAllocate(void)
 	buffer->by_txn_last_xid = InvalidTransactionId;
 	buffer->by_txn_last_txn = NULL;
 
-	buffer->nr_cached_tuplebufs = 0;
-
 	buffer->outbuf = NULL;
 	buffer->outbufsize = 0;
 
 	buffer->current_restart_decoding_lsn = InvalidXLogRecPtr;
 
 	dlist_init(&buffer->toplevel_by_lsn);
-	slist_init(&buffer->cached_tuplebufs);
 
 	return buffer;
 }
@@ -419,42 +420,12 @@ ReorderBufferGetTupleBuf(ReorderBuffer *rb, Size tuple_len)
 
 	alloc_len = tuple_len + SizeofHeapTupleHeader;
 
-	/*
-	 * Most tuples are below MaxHeapTupleSize, so we use a slab allocator for
-	 * those. Thus always allocate at least MaxHeapTupleSize. Note that tuples
-	 * generated for oldtuples can be bigger, as they don't have out-of-line
-	 * toast columns.
-	 */
-	if (alloc_len < MaxHeapTupleSize)
-		alloc_len = MaxHeapTupleSize;
-
-
-	/* if small enough, check the slab cache */
-	if (alloc_len <= MaxHeapTupleSize && rb->nr_cached_tuplebufs)
-	{
-		rb->nr_cached_tuplebufs--;
-		tuple = slist_container(ReorderBufferTupleBuf, node,
-								slist_pop_head_node(&rb->cached_tuplebufs));
-		Assert(tuple->alloc_tuple_size == MaxHeapTupleSize);
-#ifdef USE_ASSERT_CHECKING
-		memset(&tuple->tuple, 0xa9, sizeof(HeapTupleData));
-		VALGRIND_MAKE_MEM_UNDEFINED(&tuple->tuple, sizeof(HeapTupleData));
-#endif
-		tuple->tuple.t_data = ReorderBufferTupleBufData(tuple);
-#ifdef USE_ASSERT_CHECKING
-		memset(tuple->tuple.t_data, 0xa8, tuple->alloc_tuple_size);
-		VALGRIND_MAKE_MEM_UNDEFINED(tuple->tuple.t_data, tuple->alloc_tuple_size);
-#endif
-	}
-	else
-	{
-		tuple = (ReorderBufferTupleBuf *)
-			MemoryContextAlloc(rb->context,
-							   sizeof(ReorderBufferTupleBuf) +
-							   MAXIMUM_ALIGNOF + alloc_len);
-		tuple->alloc_tuple_size = alloc_len;
-		tuple->tuple.t_data = ReorderBufferTupleBufData(tuple);
-	}
+	tuple = (ReorderBufferTupleBuf *)
+		MemoryContextAlloc(rb->tup_context,
+						   sizeof(ReorderBufferTupleBuf) +
+						   MAXIMUM_ALIGNOF + alloc_len);
+	tuple->alloc_tuple_size = alloc_len;
+	tuple->tuple.t_data = ReorderBufferTupleBufData(tuple);
 
 	return tuple;
 }
@@ -468,21 +439,7 @@ ReorderBufferGetTupleBuf(ReorderBuffer *rb, Size tuple_len)
 void
 ReorderBufferReturnTupleBuf(ReorderBuffer *rb, ReorderBufferTupleBuf *tuple)
 {
-	/* check whether to put into the slab cache, oversized tuples never are */
-	if (tuple->alloc_tuple_size == MaxHeapTupleSize &&
-		rb->nr_cached_tuplebufs < max_cached_tuplebufs)
-	{
-		rb->nr_cached_tuplebufs++;
-		slist_push_head(&rb->cached_tuplebufs, &tuple->node);
-		VALGRIND_MAKE_MEM_UNDEFINED(tuple->tuple.t_data, tuple->alloc_tuple_size);
-		VALGRIND_MAKE_MEM_UNDEFINED(tuple, sizeof(ReorderBufferTupleBuf));
-		VALGRIND_MAKE_MEM_DEFINED(&tuple->node, sizeof(tuple->node));
-		VALGRIND_MAKE_MEM_DEFINED(&tuple->alloc_tuple_size, sizeof(tuple->alloc_tuple_size));
-	}
-	else
-	{
-		pfree(tuple);
-	}
+	pfree(tuple);
 }
 
 /*
@@ -1713,8 +1670,8 @@ ReorderBufferAbortOld(ReorderBuffer *rb, TransactionId oldestRunningXid)
 	 * Iterate through all (potential) toplevel TXNs and abort all that are
 	 * older than what possibly can be running. Once we've found the first
 	 * that is alive we stop, there might be some that acquired an xid earlier
-	 * but started writing later, but it's unlikely and they will cleaned up
-	 * in a later call to ReorderBufferAbortOld().
+	 * but started writing later, but it's unlikely and they will be cleaned
+	 * up in a later call to this function.
 	 */
 	dlist_foreach_modify(it, &rb->toplevel_by_lsn)
 	{
@@ -1724,6 +1681,21 @@ ReorderBufferAbortOld(ReorderBuffer *rb, TransactionId oldestRunningXid)
 
 		if (TransactionIdPrecedes(txn->xid, oldestRunningXid))
 		{
+			/*
+			 * We set final_lsn on a transaction when we decode its commit or
+			 * abort record, but we never see those records for crashed
+			 * transactions.  To ensure cleanup of these transactions, set
+			 * final_lsn to that of their last change; this causes
+			 * ReorderBufferRestoreCleanup to do the right thing.
+			 */
+			if (txn->serialized && txn->final_lsn == 0)
+			{
+				ReorderBufferChange *last =
+					dlist_tail_element(ReorderBufferChange, node, &txn->changes);
+
+				txn->final_lsn = last->lsn;
+			}
+
 			elog(DEBUG2, "aborting old transaction %u", txn->xid);
 
 			/* remove potential on-disk data, and deallocate this tx */
@@ -1780,7 +1752,7 @@ ReorderBufferForget(ReorderBuffer *rb, TransactionId xid, XLogRecPtr lsn)
 /*
  * Execute invalidations happening outside the context of a decoded
  * transaction. That currently happens either for xid-less commits
- * (c.f. RecordTransactionCommit()) or for invalidations in uninteresting
+ * (cf. RecordTransactionCommit()) or for invalidations in uninteresting
  * transactions (via ReorderBufferForget()).
  */
 void
@@ -2083,15 +2055,16 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn)
 		 * store in segment in which it belongs by start lsn, don't split over
 		 * multiple segments tho
 		 */
-		if (fd == -1 || !XLByteInSeg(change->lsn, curOpenSegNo))
+		if (fd == -1 ||
+			!XLByteInSeg(change->lsn, curOpenSegNo, wal_segment_size))
 		{
 			XLogRecPtr	recptr;
 
 			if (fd != -1)
 				CloseTransientFile(fd);
 
-			XLByteToSeg(change->lsn, curOpenSegNo);
-			XLogSegNoOffsetToRecPtr(curOpenSegNo, 0, recptr);
+			XLByteToSeg(change->lsn, curOpenSegNo, wal_segment_size);
+			XLogSegNoOffsetToRecPtr(curOpenSegNo, 0, recptr, wal_segment_size);
 
 			/*
 			 * No need to care about TLIs here, only used during a single run,
@@ -2103,8 +2076,7 @@ ReorderBufferSerializeTXN(ReorderBuffer *rb, ReorderBufferTXN *txn)
 
 			/* open segment, create it if necessary */
 			fd = OpenTransientFile(path,
-								   O_CREAT | O_WRONLY | O_APPEND | PG_BINARY,
-								   S_IRUSR | S_IWUSR);
+								   O_CREAT | O_WRONLY | O_APPEND | PG_BINARY);
 
 			if (fd < 0)
 				ereport(ERROR,
@@ -2319,7 +2291,7 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
 	txn->nentries_mem = 0;
 	Assert(dlist_is_empty(&txn->changes));
 
-	XLByteToSeg(txn->final_lsn, last_segno);
+	XLByteToSeg(txn->final_lsn, last_segno, wal_segment_size);
 
 	while (restored < max_changes_in_memory && *segno <= last_segno)
 	{
@@ -2334,11 +2306,11 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
 			/* first time in */
 			if (*segno == 0)
 			{
-				XLByteToSeg(txn->first_lsn, *segno);
+				XLByteToSeg(txn->first_lsn, *segno, wal_segment_size);
 			}
 
 			Assert(*segno != 0 || dlist_is_empty(&txn->changes));
-			XLogSegNoOffsetToRecPtr(*segno, 0, recptr);
+			XLogSegNoOffsetToRecPtr(*segno, 0, recptr, wal_segment_size);
 
 			/*
 			 * No need to care about TLIs here, only used during a single run,
@@ -2348,7 +2320,7 @@ ReorderBufferRestoreChanges(ReorderBuffer *rb, ReorderBufferTXN *txn,
 					NameStr(MyReplicationSlot->data.name), txn->xid,
 					(uint32) (recptr >> 32), (uint32) recptr);
 
-			*fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+			*fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 			if (*fd < 0 && errno == ENOENT)
 			{
 				*fd = -1;
@@ -2575,8 +2547,8 @@ ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn)
 	Assert(txn->first_lsn != InvalidXLogRecPtr);
 	Assert(txn->final_lsn != InvalidXLogRecPtr);
 
-	XLByteToSeg(txn->first_lsn, first);
-	XLByteToSeg(txn->final_lsn, last);
+	XLByteToSeg(txn->first_lsn, first, wal_segment_size);
+	XLByteToSeg(txn->final_lsn, last, wal_segment_size);
 
 	/* iterate over all possible filenames, and delete them */
 	for (cur = first; cur <= last; cur++)
@@ -2584,7 +2556,7 @@ ReorderBufferRestoreCleanup(ReorderBuffer *rb, ReorderBufferTXN *txn)
 		char		path[MAXPGPATH];
 		XLogRecPtr	recptr;
 
-		XLogSegNoOffsetToRecPtr(cur, 0, recptr);
+		XLogSegNoOffsetToRecPtr(cur, 0, recptr, wal_segment_size);
 
 		sprintf(path, "pg_replslot/%s/xid-%u-lsn-%X-%X.snap",
 				NameStr(MyReplicationSlot->data.name), txn->xid,
@@ -2800,7 +2772,7 @@ ReorderBufferToastReplace(ReorderBuffer *rb, ReorderBufferTXN *txn,
 
 	for (natt = 0; natt < desc->natts; natt++)
 	{
-		Form_pg_attribute attr = desc->attrs[natt];
+		Form_pg_attribute attr = TupleDescAttr(desc, natt);
 		ReorderBufferToastEnt *ent;
 		struct varlena *varlena;
 
@@ -3037,7 +3009,7 @@ ApplyLogicalMappingFile(HTAB *tuplecid_data, Oid relid, const char *fname)
 	LogicalRewriteMappingData map;
 
 	sprintf(path, "pg_logical/mappings/%s", fname);
-	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/replication/logical/snapbuild.c b/src/backend/replication/logical/snapbuild.c
index fba57a0470..4123cdebcf 100644
--- a/src/backend/replication/logical/snapbuild.c
+++ b/src/backend/replication/logical/snapbuild.c
@@ -42,7 +42,7 @@
  * catalog in a transaction. During normal operation this is achieved by using
  * CommandIds/cmin/cmax. The problem with that however is that for space
  * efficiency reasons only one value of that is stored
- * (c.f. combocid.c). Since ComboCids are only available in memory we log
+ * (cf. combocid.c). Since ComboCids are only available in memory we log
  * additional information which allows us to get the original (cmin, cmax)
  * pair during visibility checks. Check the reorderbuffer.c's comment above
  * ResolveCminCmaxDuringDecoding() for details.
@@ -107,7 +107,7 @@
  * is a convenient point to initialize replication from, which is why we
  * export a snapshot at that point, which *can* be used to read normal data.
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/snapbuild.c
@@ -1597,8 +1597,7 @@ SnapBuildSerialize(SnapBuild *builder, XLogRecPtr lsn)
 
 	/* we have valid data now, open tempfile and write it there */
 	fd = OpenTransientFile(tmppath,
-						   O_CREAT | O_EXCL | O_WRONLY | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+						   O_CREAT | O_EXCL | O_WRONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errmsg("could not open file \"%s\": %m", path)));
@@ -1682,7 +1681,7 @@ SnapBuildRestore(SnapBuild *builder, XLogRecPtr lsn)
 	sprintf(path, "pg_logical/snapshots/%X-%X.snap",
 			(uint32) (lsn >> 32), (uint32) lsn);
 
-	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 
 	if (fd < 0 && errno == ENOENT)
 		return false;
diff --git a/src/backend/replication/logical/tablesync.c b/src/backend/replication/logical/tablesync.c
index 4cca0f1a85..e50b9f7905 100644
--- a/src/backend/replication/logical/tablesync.c
+++ b/src/backend/replication/logical/tablesync.c
@@ -2,7 +2,7 @@
  * tablesync.c
  *	  PostgreSQL logical replication
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/tablesync.c
diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c
index 7c2df57645..04985c9f91 100644
--- a/src/backend/replication/logical/worker.c
+++ b/src/backend/replication/logical/worker.c
@@ -2,7 +2,7 @@
  * worker.c
  *	   PostgreSQL logical replication worker (apply)
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/logical/worker.c
@@ -204,9 +204,11 @@ create_estate_for_relation(LogicalRepRelMapEntry *rel)
 	estate->es_num_result_relations = 1;
 	estate->es_result_relation_info = resultRelInfo;
 
+	estate->es_output_cid = GetCurrentCommandId(true);
+
 	/* Triggers might need a slot */
 	if (resultRelInfo->ri_TrigDesc)
-		estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate);
+		estate->es_trig_tuple_slot = ExecInitExtraTupleSlot(estate, NULL);
 
 	/* Prepare to catch AFTER triggers. */
 	AfterTriggerBeginQuery();
@@ -247,7 +249,7 @@ slot_fill_defaults(LogicalRepRelMapEntry *rel, EState *estate,
 	{
 		Expr	   *defexpr;
 
-		if (desc->attrs[attnum]->attisdropped)
+		if (TupleDescAttr(desc, attnum)->attisdropped)
 			continue;
 
 		if (rel->attrmap[attnum] >= 0)
@@ -323,7 +325,7 @@ slot_store_cstrings(TupleTableSlot *slot, LogicalRepRelMapEntry *rel,
 	/* Call the "in" function for each non-dropped attribute */
 	for (i = 0; i < natts; i++)
 	{
-		Form_pg_attribute att = slot->tts_tupleDescriptor->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(slot->tts_tupleDescriptor, i);
 		int			remoteattnum = rel->attrmap[i];
 
 		if (!att->attisdropped && remoteattnum >= 0 &&
@@ -388,13 +390,16 @@ slot_modify_cstrings(TupleTableSlot *slot, LogicalRepRelMapEntry *rel,
 	/* Call the "in" function for each replaced attribute */
 	for (i = 0; i < natts; i++)
 	{
-		Form_pg_attribute att = slot->tts_tupleDescriptor->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(slot->tts_tupleDescriptor, i);
 		int			remoteattnum = rel->attrmap[i];
 
-		if (remoteattnum >= 0 && !replaces[remoteattnum])
+		if (remoteattnum < 0)
+			continue;
+
+		if (!replaces[remoteattnum])
 			continue;
 
-		if (remoteattnum >= 0 && values[remoteattnum] != NULL)
+		if (values[remoteattnum] != NULL)
 		{
 			Oid			typinput;
 			Oid			typioparam;
@@ -580,8 +585,8 @@ apply_handle_insert(StringInfo s)
 
 	/* Initialize the executor state. */
 	estate = create_estate_for_relation(rel);
-	remoteslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(remoteslot, RelationGetDescr(rel->localrel));
+	remoteslot = ExecInitExtraTupleSlot(estate,
+										RelationGetDescr(rel->localrel));
 
 	/* Process and store remote tuple in the slot */
 	oldctx = MemoryContextSwitchTo(GetPerTupleMemoryContext(estate));
@@ -629,7 +634,7 @@ check_relation_updatable(LogicalRepRelMapEntry *rel)
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-				 errmsg("publisher does not send replica identity column "
+				 errmsg("publisher did not send replica identity column "
 						"expected by the logical replication target relation \"%s.%s\"",
 						rel->remoterel.nspname, rel->remoterel.relname)));
 	}
@@ -684,10 +689,10 @@ apply_handle_update(StringInfo s)
 
 	/* Initialize the executor state. */
 	estate = create_estate_for_relation(rel);
-	remoteslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(remoteslot, RelationGetDescr(rel->localrel));
-	localslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(localslot, RelationGetDescr(rel->localrel));
+	remoteslot = ExecInitExtraTupleSlot(estate,
+										RelationGetDescr(rel->localrel));
+	localslot = ExecInitExtraTupleSlot(estate,
+									   RelationGetDescr(rel->localrel));
 	EvalPlanQualInit(&epqstate, estate, NULL, NIL, -1);
 
 	PushActiveSnapshot(GetTransactionSnapshot());
@@ -802,10 +807,10 @@ apply_handle_delete(StringInfo s)
 
 	/* Initialize the executor state. */
 	estate = create_estate_for_relation(rel);
-	remoteslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(remoteslot, RelationGetDescr(rel->localrel));
-	localslot = ExecInitExtraTupleSlot(estate);
-	ExecSetSlotDescriptor(localslot, RelationGetDescr(rel->localrel));
+	remoteslot = ExecInitExtraTupleSlot(estate,
+										RelationGetDescr(rel->localrel));
+	localslot = ExecInitExtraTupleSlot(estate,
+									   RelationGetDescr(rel->localrel));
 	EvalPlanQualInit(&epqstate, estate, NULL, NIL, -1);
 
 	PushActiveSnapshot(GetTransactionSnapshot());
@@ -844,7 +849,7 @@ apply_handle_delete(StringInfo s)
 		/* The tuple to be deleted could not be found. */
 		ereport(DEBUG1,
 				(errmsg("logical replication could not find row for delete "
-						"in replication target %s",
+						"in replication target relation \"%s\"",
 						RelationGetRelationName(rel->localrel))));
 	}
 
@@ -910,7 +915,7 @@ apply_dispatch(StringInfo s)
 		default:
 			ereport(ERROR,
 					(errcode(ERRCODE_PROTOCOL_VIOLATION),
-					 errmsg("invalid logical replication message type %c", action)));
+					 errmsg("invalid logical replication message type \"%c\"", action)));
 	}
 }
 
diff --git a/src/backend/replication/pgoutput/pgoutput.c b/src/backend/replication/pgoutput/pgoutput.c
index 370b74f232..d538f25ede 100644
--- a/src/backend/replication/pgoutput/pgoutput.c
+++ b/src/backend/replication/pgoutput/pgoutput.c
@@ -3,7 +3,7 @@
  * pgoutput.c
  *		Logical Replication output plugin
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/backend/replication/pgoutput/pgoutput.c
@@ -21,6 +21,7 @@
 
 #include "utils/inval.h"
 #include "utils/int8.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 #include "utils/varlena.h"
@@ -115,7 +116,7 @@ parse_output_parameters(List *options, uint32 *protocol_version,
 			if (parsed > PG_UINT32_MAX || parsed < 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						 errmsg("proto_verson \"%s\" out of range",
+						 errmsg("proto_version \"%s\" out of range",
 								strVal(defel->arg))));
 
 			*protocol_version = (uint32) parsed;
@@ -151,9 +152,7 @@ pgoutput_startup(LogicalDecodingContext *ctx, OutputPluginOptions *opt,
 	/* Create our memory context for private allocations. */
 	data->context = AllocSetContextCreate(ctx->context,
 										  "logical replication output context",
-										  ALLOCSET_DEFAULT_MINSIZE,
-										  ALLOCSET_DEFAULT_INITSIZE,
-										  ALLOCSET_DEFAULT_MAXSIZE);
+										  ALLOCSET_DEFAULT_SIZES);
 
 	ctx->output_plugin_private = data;
 
@@ -263,6 +262,9 @@ pgoutput_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 	MemoryContext old;
 	RelationSyncEntry *relentry;
 
+	if (!is_publishable_relation(relation))
+		return;
+
 	relentry = get_rel_sync_entry(data, RelationGetRelid(relation));
 
 	/* First check the table filter */
@@ -303,7 +305,7 @@ pgoutput_change(LogicalDecodingContext *ctx, ReorderBufferTXN *txn,
 		 */
 		for (i = 0; i < desc->natts; i++)
 		{
-			Form_pg_attribute att = desc->attrs[i];
+			Form_pg_attribute att = TupleDescAttr(desc, i);
 
 			if (att->attisdropped)
 				continue;
@@ -509,6 +511,31 @@ get_rel_sync_entry(PGOutputData *data, Oid relid)
 		{
 			Publication *pub = lfirst(lc);
 
+			/*
+			 * Skip tables that look like they are from a heap rewrite (see
+			 * make_new_heap()).  We need to skip them because the subscriber
+			 * won't have a table by that name to receive the data.  That
+			 * means we won't ship the new data in, say, an added column with
+			 * a DEFAULT, but if the user applies the same DDL manually on the
+			 * subscriber, then this will work out for them.
+			 *
+			 * We only need to consider the alltables case, because such a
+			 * transient heap won't be an explicit member of a publication.
+			 */
+			if (pub->alltables)
+			{
+				char	   *relname = get_rel_name(relid);
+				unsigned int u;
+				int			n;
+
+				if (sscanf(relname, "pg_temp_%u%n", &u, &n) == 1 &&
+					relname[n] == '\0')
+				{
+					if (get_rel_relkind(u) == RELKIND_RELATION)
+						break;
+				}
+			}
+
 			if (pub->alltables || list_member_oid(pubids, pub->oid))
 			{
 				entry->pubactions.pubinsert |= pub->pubactions.pubinsert;
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index ec047c827c..beb2c2877b 100644
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -3,7 +3,7 @@
  *
  * repl_gram.y				- Parser for the replication commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -72,6 +72,7 @@ static SQLCmd *make_sqlcmd(void);
 %token K_LABEL
 %token K_PROGRESS
 %token K_FAST
+%token K_WAIT
 %token K_NOWAIT
 %token K_MAX_RATE
 %token K_WAL
@@ -180,22 +181,22 @@ base_backup_opt:
 			| K_PROGRESS
 				{
 				  $$ = makeDefElem("progress",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_FAST
 				{
 				  $$ = makeDefElem("fast",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_WAL
 				{
 				  $$ = makeDefElem("wal",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_NOWAIT
 				{
 				  $$ = makeDefElem("nowait",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_MAX_RATE UCONST
 				{
@@ -205,7 +206,7 @@ base_backup_opt:
 			| K_TABLESPACE_MAP
 				{
 				  $$ = makeDefElem("tablespace_map",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			;
 
@@ -246,22 +247,22 @@ create_slot_opt:
 			K_EXPORT_SNAPSHOT
 				{
 				  $$ = makeDefElem("export_snapshot",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_NOEXPORT_SNAPSHOT
 				{
 				  $$ = makeDefElem("export_snapshot",
-								   (Node *)makeInteger(FALSE), -1);
+								   (Node *)makeInteger(false), -1);
 				}
 			| K_USE_SNAPSHOT
 				{
 				  $$ = makeDefElem("use_snapshot",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			| K_RESERVE_WAL
 				{
 				  $$ = makeDefElem("reserve_wal",
-								   (Node *)makeInteger(TRUE), -1);
+								   (Node *)makeInteger(true), -1);
 				}
 			;
 
@@ -272,6 +273,15 @@ drop_replication_slot:
 					DropReplicationSlotCmd *cmd;
 					cmd = makeNode(DropReplicationSlotCmd);
 					cmd->slotname = $2;
+					cmd->wait = false;
+					$$ = (Node *) cmd;
+				}
+			| K_DROP_REPLICATION_SLOT IDENT K_WAIT
+				{
+					DropReplicationSlotCmd *cmd;
+					cmd = makeNode(DropReplicationSlotCmd);
+					cmd->slotname = $2;
+					cmd->wait = true;
 					$$ = (Node *) cmd;
 				}
 			;
diff --git a/src/backend/replication/repl_scanner.l b/src/backend/replication/repl_scanner.l
index 52ae7b343f..fb48241e48 100644
--- a/src/backend/replication/repl_scanner.l
+++ b/src/backend/replication/repl_scanner.l
@@ -4,7 +4,7 @@
  * repl_scanner.l
  *	  a lexical scanner for the replication commands
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -38,6 +38,8 @@ static char *litbufdup(void);
 static void addlit(char *ytext, int yleng);
 static void addlitchar(unsigned char ychar);
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option 8bit
@@ -103,6 +105,7 @@ TEMPORARY			{ return K_TEMPORARY; }
 EXPORT_SNAPSHOT		{ return K_EXPORT_SNAPSHOT; }
 NOEXPORT_SNAPSHOT	{ return K_NOEXPORT_SNAPSHOT; }
 USE_SNAPSHOT		{ return K_USE_SNAPSHOT; }
+WAIT				{ return K_WAIT; }
 
 ","				{ return ','; }
 ";"				{ return ';'; }
@@ -185,6 +188,7 @@ USE_SNAPSHOT		{ return K_USE_SNAPSHOT; }
 				}
 %%
 
+/* LCOV_EXCL_STOP */
 
 static void
 startlit(void)
diff --git a/src/backend/replication/slot.c b/src/backend/replication/slot.c
index a8a16f55e9..fc9ef22b0b 100644
--- a/src/backend/replication/slot.c
+++ b/src/backend/replication/slot.c
@@ -4,7 +4,7 @@
  *	   Replication slot management.
  *
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -1039,7 +1039,7 @@ ReplicationSlotReserveWal(void)
 		 * the new restart_lsn above, so normally we should never need to loop
 		 * more than twice.
 		 */
-		XLByteToSeg(slot->data.restart_lsn, segno);
+		XLByteToSeg(slot->data.restart_lsn, segno, wal_segment_size);
 		if (XLogGetLastRemovedSegno() < segno)
 			break;
 	}
@@ -1233,9 +1233,7 @@ SaveSlotToPath(ReplicationSlot *slot, const char *dir, int elevel)
 	sprintf(tmppath, "%s/state.tmp", dir);
 	sprintf(path, "%s/state", dir);
 
-	fd = OpenTransientFile(tmppath,
-						   O_CREAT | O_EXCL | O_WRONLY | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(tmppath, O_CREAT | O_EXCL | O_WRONLY | PG_BINARY);
 	if (fd < 0)
 	{
 		ereport(elevel,
@@ -1354,7 +1352,7 @@ RestoreSlotFromDisk(const char *name)
 
 	elog(DEBUG1, "restoring replication slot from \"%s\"", path);
 
-	fd = OpenTransientFile(path, O_RDWR | PG_BINARY, 0);
+	fd = OpenTransientFile(path, O_RDWR | PG_BINARY);
 
 	/*
 	 * We do not need to handle this as we are rename()ing the directory into
diff --git a/src/backend/replication/slotfuncs.c b/src/backend/replication/slotfuncs.c
index d4cbd83bde..e873dd1f81 100644
--- a/src/backend/replication/slotfuncs.c
+++ b/src/backend/replication/slotfuncs.c
@@ -3,7 +3,7 @@
  * slotfuncs.c
  *	   Support functions for replication slots
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/slotfuncs.c
@@ -17,11 +17,14 @@
 #include "miscadmin.h"
 
 #include "access/htup_details.h"
+#include "replication/decode.h"
 #include "replication/slot.h"
 #include "replication/logical.h"
 #include "replication/logicalfuncs.h"
 #include "utils/builtins.h"
+#include "utils/inval.h"
 #include "utils/pg_lsn.h"
+#include "utils/resowner.h"
 
 static void
 check_permissions(void)
@@ -171,7 +174,7 @@ pg_drop_replication_slot(PG_FUNCTION_ARGS)
 
 	CheckSlotRequirements();
 
-	ReplicationSlotDrop(NameStr(*name), false);
+	ReplicationSlotDrop(NameStr(*name), true);
 
 	PG_RETURN_VOID();
 }
@@ -312,3 +315,199 @@ pg_get_replication_slots(PG_FUNCTION_ARGS)
 
 	return (Datum) 0;
 }
+
+/*
+ * Helper function for advancing physical replication slot forward.
+ */
+static XLogRecPtr
+pg_physical_replication_slot_advance(XLogRecPtr startlsn, XLogRecPtr moveto)
+{
+	XLogRecPtr	retlsn = InvalidXLogRecPtr;
+
+	SpinLockAcquire(&MyReplicationSlot->mutex);
+	if (MyReplicationSlot->data.restart_lsn < moveto)
+	{
+		MyReplicationSlot->data.restart_lsn = moveto;
+		retlsn = moveto;
+	}
+	SpinLockRelease(&MyReplicationSlot->mutex);
+
+	return retlsn;
+}
+
+/*
+ * Helper function for advancing logical replication slot forward.
+ */
+static XLogRecPtr
+pg_logical_replication_slot_advance(XLogRecPtr startlsn, XLogRecPtr moveto)
+{
+	LogicalDecodingContext *ctx;
+	ResourceOwner	old_resowner = CurrentResourceOwner;
+	XLogRecPtr		retlsn = InvalidXLogRecPtr;
+
+	PG_TRY();
+	{
+		/* restart at slot's confirmed_flush */
+		ctx = CreateDecodingContext(InvalidXLogRecPtr,
+									NIL,
+									true,
+									logical_read_local_xlog_page,
+									NULL, NULL, NULL);
+
+		CurrentResourceOwner = ResourceOwnerCreate(CurrentResourceOwner,
+												   "logical decoding");
+
+		/* invalidate non-timetravel entries */
+		InvalidateSystemCaches();
+
+		/* Decode until we run out of records */
+		while ((startlsn != InvalidXLogRecPtr && startlsn < moveto) ||
+			   (ctx->reader->EndRecPtr != InvalidXLogRecPtr && ctx->reader->EndRecPtr < moveto))
+		{
+			XLogRecord *record;
+			char	   *errm = NULL;
+
+			record = XLogReadRecord(ctx->reader, startlsn, &errm);
+			if (errm)
+				elog(ERROR, "%s", errm);
+
+			/*
+			 * Now that we've set up the xlog reader state, subsequent calls
+			 * pass InvalidXLogRecPtr to say "continue from last record"
+			 */
+			startlsn = InvalidXLogRecPtr;
+
+			/*
+			 * The {begin_txn,change,commit_txn}_wrapper callbacks above will
+			 * store the description into our tuplestore.
+			 */
+			if (record != NULL)
+				LogicalDecodingProcessRecord(ctx, ctx->reader);
+
+			/* check limits */
+			if (moveto <= ctx->reader->EndRecPtr)
+				break;
+
+			CHECK_FOR_INTERRUPTS();
+		}
+
+		CurrentResourceOwner = old_resowner;
+
+		if (ctx->reader->EndRecPtr != InvalidXLogRecPtr)
+		{
+			LogicalConfirmReceivedLocation(moveto);
+
+			/*
+			 * If only the confirmed_flush_lsn has changed the slot won't get
+			 * marked as dirty by the above. Callers on the walsender
+			 * interface are expected to keep track of their own progress and
+			 * don't need it written out. But SQL-interface users cannot
+			 * specify their own start positions and it's harder for them to
+			 * keep track of their progress, so we should make more of an
+			 * effort to save it for them.
+			 *
+			 * Dirty the slot so it's written out at the next checkpoint.
+			 * We'll still lose its position on crash, as documented, but it's
+			 * better than always losing the position even on clean restart.
+			 */
+			ReplicationSlotMarkDirty();
+		}
+
+		retlsn = MyReplicationSlot->data.confirmed_flush;
+
+		/* free context, call shutdown callback */
+		FreeDecodingContext(ctx);
+
+		InvalidateSystemCaches();
+	}
+	PG_CATCH();
+	{
+		/* clear all timetravel entries */
+		InvalidateSystemCaches();
+
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	return retlsn;
+}
+
+/*
+ * SQL function for moving the position in a replication slot.
+ */
+Datum
+pg_replication_slot_advance(PG_FUNCTION_ARGS)
+{
+	Name		slotname = PG_GETARG_NAME(0);
+	XLogRecPtr	moveto = PG_GETARG_LSN(1);
+	XLogRecPtr	endlsn;
+	XLogRecPtr	startlsn;
+	TupleDesc	tupdesc;
+	Datum		values[2];
+	bool		nulls[2];
+	HeapTuple	tuple;
+	Datum		result;
+
+	Assert(!MyReplicationSlot);
+
+	check_permissions();
+
+	if (XLogRecPtrIsInvalid(moveto))
+		ereport(ERROR,
+				(errmsg("invalid target wal lsn")));
+
+	/* Build a tuple descriptor for our result type */
+	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+		elog(ERROR, "return type must be a row type");
+
+	/*
+	 * We can't move slot past what's been flushed/replayed so clamp the
+	 * target position accordingly.
+	 */
+	if (!RecoveryInProgress())
+		moveto = Min(moveto, GetFlushRecPtr());
+	else
+		moveto = Min(moveto, GetXLogReplayRecPtr(&ThisTimeLineID));
+
+	/* Acquire the slot so we "own" it */
+	ReplicationSlotAcquire(NameStr(*slotname), true);
+
+	startlsn = MyReplicationSlot->data.confirmed_flush;
+	if (moveto < startlsn)
+	{
+		ReplicationSlotRelease();
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot move slot to %X/%X, minimum is %X/%X",
+						(uint32) (moveto >> 32), (uint32) moveto,
+						(uint32) (startlsn >> 32), (uint32) startlsn)));
+	}
+
+	if (OidIsValid(MyReplicationSlot->data.database))
+		endlsn = pg_logical_replication_slot_advance(startlsn, moveto);
+	else
+		endlsn = pg_physical_replication_slot_advance(startlsn, moveto);
+
+	values[0] = NameGetDatum(&MyReplicationSlot->data.name);
+	nulls[0] = false;
+
+	/* Update the on disk state when lsn was updated. */
+	if (XLogRecPtrIsInvalid(endlsn))
+	{
+		ReplicationSlotMarkDirty();
+		ReplicationSlotsComputeRequiredXmin(false);
+		ReplicationSlotsComputeRequiredLSN();
+		ReplicationSlotSave();
+	}
+
+	ReplicationSlotRelease();
+
+	/* Return the reached position. */
+	values[1] = LSNGetDatum(endlsn);
+	nulls[1] = false;
+
+	tuple = heap_form_tuple(tupdesc, values, nulls);
+	result = HeapTupleGetDatum(tuple);
+
+	PG_RETURN_DATUM(result);
+}
diff --git a/src/backend/replication/syncrep.c b/src/backend/replication/syncrep.c
index 8677235411..75d2681719 100644
--- a/src/backend/replication/syncrep.c
+++ b/src/backend/replication/syncrep.c
@@ -63,7 +63,7 @@
  * the standbys which are considered as synchronous at that moment
  * will release waiters from the queue.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/syncrep.c
@@ -156,11 +156,9 @@ SyncRepWaitForLSN(XLogRecPtr lsn, bool commit)
 		mode = Min(SyncRepWaitMode, SYNC_REP_WAIT_FLUSH);
 
 	/*
-	 * Fast exit if user has not requested sync replication, or there are no
-	 * sync replication standby names defined. Note that those standbys don't
-	 * need to be connected.
+	 * Fast exit if user has not requested sync replication.
 	 */
-	if (!SyncRepRequested() || !SyncStandbysDefined())
+	if (!SyncRepRequested())
 		return;
 
 	Assert(SHMQueueIsDetached(&(MyProc->syncRepLinks)));
diff --git a/src/backend/replication/syncrep_gram.y b/src/backend/replication/syncrep_gram.y
index cc8622c93d..5d12925ab8 100644
--- a/src/backend/replication/syncrep_gram.y
+++ b/src/backend/replication/syncrep_gram.y
@@ -3,7 +3,7 @@
  *
  * syncrep_gram.y				- Parser for synchronous_standby_names
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/replication/syncrep_scanner.l b/src/backend/replication/syncrep_scanner.l
index d1d1b26a48..5b641d8297 100644
--- a/src/backend/replication/syncrep_scanner.l
+++ b/src/backend/replication/syncrep_scanner.l
@@ -4,7 +4,7 @@
  * syncrep_scanner.l
  *	  a lexical scanner for synchronous_standby_names
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -32,6 +32,8 @@ static YY_BUFFER_STATE scanbufhandle;
 
 static StringInfoData xdbuf;
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option 8bit
@@ -112,6 +114,7 @@ xdinside		[^"]+
 .			{ return JUNK; }
 %%
 
+/* LCOV_EXCL_STOP */
 
 /* Needs to be here for access to yytext */
 void
diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c
index ea9d21a46b..a39a98ff18 100644
--- a/src/backend/replication/walreceiver.c
+++ b/src/backend/replication/walreceiver.c
@@ -33,7 +33,7 @@
  * specific parts are in the libpqwalreceiver module. It's loaded
  * dynamically to avoid linking the server with libpq.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -196,6 +196,7 @@ WalReceiverMain(void)
 	bool		first_stream;
 	WalRcvData *walrcv = WalRcv;
 	TimestampTz last_recv_timestamp;
+	TimestampTz now;
 	bool		ping_sent;
 	char	   *err;
 
@@ -205,6 +206,8 @@ WalReceiverMain(void)
 	 */
 	Assert(walrcv != NULL);
 
+	now = GetCurrentTimestamp();
+
 	/*
 	 * Mark walreceiver as running in shared memory.
 	 *
@@ -235,6 +238,7 @@ WalReceiverMain(void)
 		case WALRCV_RESTARTING:
 		default:
 			/* Shouldn't happen */
+			SpinLockRelease(&walrcv->mutex);
 			elog(PANIC, "walreceiver still running according to shared memory state");
 	}
 	/* Advertise our PID so that the startup process can kill us */
@@ -249,15 +253,17 @@ WalReceiverMain(void)
 	startpointTLI = walrcv->receiveStartTLI;
 
 	/* Initialise to a sanish value */
-	walrcv->lastMsgSendTime = walrcv->lastMsgReceiptTime = walrcv->latestWalEndTime = GetCurrentTimestamp();
+	walrcv->lastMsgSendTime =
+		walrcv->lastMsgReceiptTime = walrcv->latestWalEndTime = now;
+
+	/* Report the latch to use to awaken this process */
+	walrcv->latch = &MyProc->procLatch;
 
 	SpinLockRelease(&walrcv->mutex);
 
 	/* Arrange to clean up at walreceiver exit */
 	on_shmem_exit(WalRcvDie, 0);
 
-	walrcv->latch = &MyProc->procLatch;
-
 	/* Properly accept or ignore signals the postmaster might send us */
 	pqsignal(SIGHUP, WalRcvSigHupHandler);	/* set flag to read config file */
 	pqsignal(SIGINT, SIG_IGN);
@@ -308,13 +314,13 @@ WalReceiverMain(void)
 	SpinLockAcquire(&walrcv->mutex);
 	memset(walrcv->conninfo, 0, MAXCONNINFO);
 	if (tmp_conninfo)
-	{
 		strlcpy((char *) walrcv->conninfo, tmp_conninfo, MAXCONNINFO);
-		pfree(tmp_conninfo);
-	}
 	walrcv->ready_to_display = true;
 	SpinLockRelease(&walrcv->mutex);
 
+	if (tmp_conninfo)
+		pfree(tmp_conninfo);
+
 	first_stream = true;
 	for (;;)
 	{
@@ -613,7 +619,7 @@ WalReceiverMain(void)
 			 * Create .done file forcibly to prevent the streamed segment from
 			 * being archived later.
 			 */
-			XLogFileName(xlogfname, recvFileTLI, recvSegNo);
+			XLogFileName(xlogfname, recvFileTLI, recvSegNo, wal_segment_size);
 			if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
 				XLogArchiveForceDone(xlogfname);
 			else
@@ -772,8 +778,7 @@ WalRcvDie(int code, Datum arg)
 	/* Ensure that all WAL records received are flushed to disk */
 	XLogWalRcvFlush(true);
 
-	walrcv->latch = NULL;
-
+	/* Mark ourselves inactive in shared memory */
 	SpinLockAcquire(&walrcv->mutex);
 	Assert(walrcv->walRcvState == WALRCV_STREAMING ||
 		   walrcv->walRcvState == WALRCV_RESTARTING ||
@@ -784,6 +789,7 @@ WalRcvDie(int code, Datum arg)
 	walrcv->walRcvState = WALRCV_STOPPED;
 	walrcv->pid = 0;
 	walrcv->ready_to_display = false;
+	walrcv->latch = NULL;
 	SpinLockRelease(&walrcv->mutex);
 
 	/* Terminate the connection gracefully. */
@@ -943,7 +949,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 	{
 		int			segbytes;
 
-		if (recvFile < 0 || !XLByteInSeg(recptr, recvSegNo))
+		if (recvFile < 0 || !XLByteInSeg(recptr, recvSegNo, wal_segment_size))
 		{
 			bool		use_existent;
 
@@ -972,7 +978,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 				 * Create .done file forcibly to prevent the streamed segment
 				 * from being archived later.
 				 */
-				XLogFileName(xlogfname, recvFileTLI, recvSegNo);
+				XLogFileName(xlogfname, recvFileTLI, recvSegNo, wal_segment_size);
 				if (XLogArchiveMode != ARCHIVE_MODE_ALWAYS)
 					XLogArchiveForceDone(xlogfname);
 				else
@@ -981,7 +987,7 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 			recvFile = -1;
 
 			/* Create/use new log file */
-			XLByteToSeg(recptr, recvSegNo);
+			XLByteToSeg(recptr, recvSegNo, wal_segment_size);
 			use_existent = true;
 			recvFile = XLogFileInit(recvSegNo, &use_existent, true);
 			recvFileTLI = ThisTimeLineID;
@@ -989,10 +995,10 @@ XLogWalRcvWrite(char *buf, Size nbytes, XLogRecPtr recptr)
 		}
 
 		/* Calculate the start offset of the received logs */
-		startoff = recptr % XLogSegSize;
+		startoff = XLogSegmentOffset(recptr, wal_segment_size);
 
-		if (startoff + nbytes > XLogSegSize)
-			segbytes = XLogSegSize - startoff;
+		if (startoff + nbytes > wal_segment_size)
+			segbytes = wal_segment_size - startoff;
 		else
 			segbytes = nbytes;
 
@@ -1266,10 +1272,10 @@ XLogWalRcvSendHSFeedback(bool immed)
 	resetStringInfo(&reply_message);
 	pq_sendbyte(&reply_message, 'h');
 	pq_sendint64(&reply_message, GetCurrentTimestamp());
-	pq_sendint(&reply_message, xmin, 4);
-	pq_sendint(&reply_message, xmin_epoch, 4);
-	pq_sendint(&reply_message, catalog_xmin, 4);
-	pq_sendint(&reply_message, catalog_xmin_epoch, 4);
+	pq_sendint32(&reply_message, xmin);
+	pq_sendint32(&reply_message, xmin_epoch);
+	pq_sendint32(&reply_message, catalog_xmin);
+	pq_sendint32(&reply_message, catalog_xmin_epoch);
 	walrcv_send(wrconn, reply_message.data, reply_message.len);
 	if (TransactionIdIsValid(xmin) || TransactionIdIsValid(catalog_xmin))
 		master_has_standby_xmin = true;
@@ -1339,9 +1345,15 @@ ProcessWalSndrMessage(XLogRecPtr walEnd, TimestampTz sendTime)
 void
 WalRcvForceReply(void)
 {
+	Latch	   *latch;
+
 	WalRcv->force_reply = true;
-	if (WalRcv->latch)
-		SetLatch(WalRcv->latch);
+	/* fetching the latch pointer might not be atomic, so use spinlock */
+	SpinLockAcquire(&WalRcv->mutex);
+	latch = WalRcv->latch;
+	SpinLockRelease(&WalRcv->mutex);
+	if (latch)
+		SetLatch(latch);
 }
 
 /*
@@ -1390,8 +1402,8 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS)
 	TimestampTz last_receipt_time;
 	XLogRecPtr	latest_end_lsn;
 	TimestampTz latest_end_time;
-	char	   *slotname;
-	char	   *conninfo;
+	char		slotname[NAMEDATALEN];
+	char		conninfo[MAXCONNINFO];
 
 	/* Take a lock to ensure value consistency */
 	SpinLockAcquire(&WalRcv->mutex);
@@ -1406,8 +1418,8 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS)
 	last_receipt_time = WalRcv->lastMsgReceiptTime;
 	latest_end_lsn = WalRcv->latestWalEnd;
 	latest_end_time = WalRcv->latestWalEndTime;
-	slotname = pstrdup(WalRcv->slotname);
-	conninfo = pstrdup(WalRcv->conninfo);
+	strlcpy(slotname, (char *) WalRcv->slotname, sizeof(slotname));
+	strlcpy(conninfo, (char *) WalRcv->conninfo, sizeof(conninfo));
 	SpinLockRelease(&WalRcv->mutex);
 
 	/*
@@ -1430,7 +1442,8 @@ pg_stat_get_wal_receiver(PG_FUNCTION_ARGS)
 	if (!is_member_of_role(GetUserId(), DEFAULT_ROLE_READ_ALL_STATS))
 	{
 		/*
-		 * Only superusers can see details. Other users only get the pid value
+		 * Only superusers and members of pg_read_all_stats can see details.
+		 * Other users only get the pid value
 		 * to know whether it is a WAL receiver, but no details.
 		 */
 		MemSet(&nulls[1], true, sizeof(bool) * (tupdesc->natts - 1));
diff --git a/src/backend/replication/walreceiverfuncs.c b/src/backend/replication/walreceiverfuncs.c
index 8ed7254b5c..67b1a074cc 100644
--- a/src/backend/replication/walreceiverfuncs.c
+++ b/src/backend/replication/walreceiverfuncs.c
@@ -6,7 +6,7 @@
  * with the walreceiver process. Functions implementing walreceiver itself
  * are in walreceiver.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -226,6 +226,7 @@ RequestXLogStreaming(TimeLineID tli, XLogRecPtr recptr, const char *conninfo,
 	WalRcvData *walrcv = WalRcv;
 	bool		launch = false;
 	pg_time_t	now = (pg_time_t) time(NULL);
+	Latch	   *latch;
 
 	/*
 	 * We always start at the beginning of the segment. That prevents a broken
@@ -233,8 +234,8 @@ RequestXLogStreaming(TimeLineID tli, XLogRecPtr recptr, const char *conninfo,
 	 * being created by XLOG streaming, which might cause trouble later on if
 	 * the segment is e.g archived.
 	 */
-	if (recptr % XLogSegSize != 0)
-		recptr -= recptr % XLogSegSize;
+	if (XLogSegmentOffset(recptr, wal_segment_size) != 0)
+		recptr -= XLogSegmentOffset(recptr, wal_segment_size);
 
 	SpinLockAcquire(&walrcv->mutex);
 
@@ -274,12 +275,14 @@ RequestXLogStreaming(TimeLineID tli, XLogRecPtr recptr, const char *conninfo,
 	walrcv->receiveStart = recptr;
 	walrcv->receiveStartTLI = tli;
 
+	latch = walrcv->latch;
+
 	SpinLockRelease(&walrcv->mutex);
 
 	if (launch)
 		SendPostmasterSignal(PMSIGNAL_START_WALRECEIVER);
-	else if (walrcv->latch)
-		SetLatch(walrcv->latch);
+	else if (latch)
+		SetLatch(latch);
 }
 
 /*
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
index 03e1cf44de..d46374ddce 100644
--- a/src/backend/replication/walsender.c
+++ b/src/backend/replication/walsender.c
@@ -37,7 +37,7 @@
  * record, wait for it to be replicated to the standby, and then exit.
  *
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/replication/walsender.c
@@ -56,6 +56,7 @@
 #include "access/xlog_internal.h"
 #include "access/xlogutils.h"
 
+#include "catalog/pg_authid.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
 #include "commands/defrem.h"
@@ -444,35 +445,35 @@ SendTimeLineHistory(TimeLineHistoryCmd *cmd)
 
 	/* Send a RowDescription message */
 	pq_beginmessage(&buf, 'T');
-	pq_sendint(&buf, 2, 2);		/* 2 fields */
+	pq_sendint16(&buf, 2);		/* 2 fields */
 
 	/* first field */
 	pq_sendstring(&buf, "filename");	/* col name */
-	pq_sendint(&buf, 0, 4);		/* table oid */
-	pq_sendint(&buf, 0, 2);		/* attnum */
-	pq_sendint(&buf, TEXTOID, 4);	/* type oid */
-	pq_sendint(&buf, -1, 2);	/* typlen */
-	pq_sendint(&buf, 0, 4);		/* typmod */
-	pq_sendint(&buf, 0, 2);		/* format code */
+	pq_sendint32(&buf, 0);		/* table oid */
+	pq_sendint16(&buf, 0);		/* attnum */
+	pq_sendint32(&buf, TEXTOID);	/* type oid */
+	pq_sendint16(&buf, -1);		/* typlen */
+	pq_sendint32(&buf, 0);		/* typmod */
+	pq_sendint16(&buf, 0);		/* format code */
 
 	/* second field */
 	pq_sendstring(&buf, "content"); /* col name */
-	pq_sendint(&buf, 0, 4);		/* table oid */
-	pq_sendint(&buf, 0, 2);		/* attnum */
-	pq_sendint(&buf, BYTEAOID, 4);	/* type oid */
-	pq_sendint(&buf, -1, 2);	/* typlen */
-	pq_sendint(&buf, 0, 4);		/* typmod */
-	pq_sendint(&buf, 0, 2);		/* format code */
+	pq_sendint32(&buf, 0);		/* table oid */
+	pq_sendint16(&buf, 0);		/* attnum */
+	pq_sendint32(&buf, BYTEAOID);	/* type oid */
+	pq_sendint16(&buf, -1);		/* typlen */
+	pq_sendint32(&buf, 0);		/* typmod */
+	pq_sendint16(&buf, 0);		/* format code */
 	pq_endmessage(&buf);
 
 	/* Send a DataRow message */
 	pq_beginmessage(&buf, 'D');
-	pq_sendint(&buf, 2, 2);		/* # of columns */
+	pq_sendint16(&buf, 2);		/* # of columns */
 	len = strlen(histfname);
-	pq_sendint(&buf, len, 4);	/* col1 len */
+	pq_sendint32(&buf, len);	/* col1 len */
 	pq_sendbytes(&buf, histfname, len);
 
-	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY, 0666);
+	fd = OpenTransientFile(path, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -489,7 +490,7 @@ SendTimeLineHistory(TimeLineHistoryCmd *cmd)
 				(errcode_for_file_access(),
 				 errmsg("could not seek to beginning of file \"%s\": %m", path)));
 
-	pq_sendint(&buf, histfilelen, 4);	/* col2 len */
+	pq_sendint32(&buf, histfilelen);	/* col2 len */
 
 	bytesleft = histfilelen;
 	while (bytesleft > 0)
@@ -646,7 +647,7 @@ StartReplication(StartReplicationCmd *cmd)
 		/* Send a CopyBothResponse message, and start streaming */
 		pq_beginmessage(&buf, 'W');
 		pq_sendbyte(&buf, 0);
-		pq_sendint(&buf, 0, 2);
+		pq_sendint16(&buf, 0);
 		pq_endmessage(&buf);
 		pq_flush();
 
@@ -1028,7 +1029,7 @@ CreateReplicationSlot(CreateReplicationSlotCmd *cmd)
 static void
 DropReplicationSlot(DropReplicationSlotCmd *cmd)
 {
-	ReplicationSlotDrop(cmd->slotname, false);
+	ReplicationSlotDrop(cmd->slotname, !cmd->wait);
 	EndCommand("DROP_REPLICATION_SLOT", DestRemote);
 }
 
@@ -1065,7 +1066,7 @@ StartLogicalReplication(StartReplicationCmd *cmd)
 	/* Send a CopyBothResponse message, and start streaming */
 	pq_beginmessage(&buf, 'W');
 	pq_sendbyte(&buf, 0);
-	pq_sendint(&buf, 0, 2);
+	pq_sendint16(&buf, 0);
 	pq_endmessage(&buf);
 	pq_flush();
 
@@ -1074,6 +1075,7 @@ StartLogicalReplication(StartReplicationCmd *cmd)
 	 * to be shipped from that position.
 	 */
 	logical_decoding_ctx = CreateDecodingContext(cmd->startpoint, cmd->options,
+												 false,
 												 logical_read_xlog_page,
 												 WalSndPrepareWrite,
 												 WalSndWriteData,
@@ -1151,6 +1153,8 @@ static void
 WalSndWriteData(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xid,
 				bool last_write)
 {
+	TimestampTz	now;
+
 	/* output previously gathered data in a CopyData packet */
 	pq_putmessage_noblock('d', ctx->out->data, ctx->out->len);
 
@@ -1160,23 +1164,54 @@ WalSndWriteData(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xid,
 	 * several releases by streaming physical replication.
 	 */
 	resetStringInfo(&tmpbuf);
-	pq_sendint64(&tmpbuf, GetCurrentTimestamp());
+	now = GetCurrentTimestamp();
+	pq_sendint64(&tmpbuf, now);
 	memcpy(&ctx->out->data[1 + sizeof(int64) + sizeof(int64)],
 		   tmpbuf.data, sizeof(int64));
 
-	/* fast path */
+	CHECK_FOR_INTERRUPTS();
+
 	/* Try to flush pending output to the client */
 	if (pq_flush_if_writable() != 0)
 		WalSndShutdown();
 
-	if (!pq_is_send_pending())
+	/* Try taking fast path unless we get too close to walsender timeout. */
+	if (now < TimestampTzPlusMilliseconds(last_reply_timestamp,
+										  wal_sender_timeout / 2) &&
+		!pq_is_send_pending())
+	{
 		return;
+	}
 
+	/* If we have pending write here, go to slow path */
 	for (;;)
 	{
 		int			wakeEvents;
 		long		sleeptime;
-		TimestampTz now;
+
+		/* Check for input from the client */
+		ProcessRepliesIfAny();
+
+		now = GetCurrentTimestamp();
+
+		/* die if timeout was reached */
+		WalSndCheckTimeOut(now);
+
+		/* Send keepalive if the time has come */
+		WalSndKeepaliveIfNecessary(now);
+
+		if (!pq_is_send_pending())
+			break;
+
+		sleeptime = WalSndComputeSleeptime(now);
+
+		wakeEvents = WL_LATCH_SET | WL_POSTMASTER_DEATH |
+			WL_SOCKET_WRITEABLE | WL_SOCKET_READABLE | WL_TIMEOUT;
+
+		/* Sleep until something happens or we time out */
+		WaitLatchOrSocket(MyLatch, wakeEvents,
+						  MyProcPort->sock, sleeptime,
+						  WAIT_EVENT_WAL_SENDER_WRITE_DATA);
 
 		/*
 		 * Emergency bailout if postmaster has died.  This is to avoid the
@@ -1198,34 +1233,9 @@ WalSndWriteData(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xid,
 			SyncRepInitConfig();
 		}
 
-		/* Check for input from the client */
-		ProcessRepliesIfAny();
-
 		/* Try to flush pending output to the client */
 		if (pq_flush_if_writable() != 0)
 			WalSndShutdown();
-
-		/* If we finished clearing the buffered data, we're done here. */
-		if (!pq_is_send_pending())
-			break;
-
-		now = GetCurrentTimestamp();
-
-		/* die if timeout was reached */
-		WalSndCheckTimeOut(now);
-
-		/* Send keepalive if the time has come */
-		WalSndKeepaliveIfNecessary(now);
-
-		sleeptime = WalSndComputeSleeptime(now);
-
-		wakeEvents = WL_LATCH_SET | WL_POSTMASTER_DEATH |
-			WL_SOCKET_WRITEABLE | WL_SOCKET_READABLE | WL_TIMEOUT;
-
-		/* Sleep until something happens or we time out */
-		WaitLatchOrSocket(MyLatch, wakeEvents,
-						  MyProcPort->sock, sleeptime,
-						  WAIT_EVENT_WAL_SENDER_WRITE_DATA);
 	}
 
 	/* reactivate latch so WalSndLoop knows to continue */
@@ -1233,7 +1243,7 @@ WalSndWriteData(LogicalDecodingContext *ctx, XLogRecPtr lsn, TransactionId xid,
 }
 
 /*
- * LogicalDecodingContext 'progress_update' callback.
+ * LogicalDecodingContext 'update_progress' callback.
  *
  * Write the current position to the log tracker (see XLogSendPhysical).
  */
@@ -1496,6 +1506,9 @@ exec_replication_command(const char *cmd_string)
 	initStringInfo(&reply_message);
 	initStringInfo(&tmpbuf);
 
+	/* Report to pgstat that this process is running */
+	pgstat_report_activity(STATE_RUNNING, NULL);
+
 	switch (cmd_node->type)
 	{
 		case T_IdentifySystemCmd:
@@ -1545,7 +1558,10 @@ exec_replication_command(const char *cmd_string)
 		case T_SQLCmd:
 			if (MyDatabaseId == InvalidOid)
 				ereport(ERROR,
-						(errmsg("not connected to database")));
+						(errmsg("cannot execute SQL commands in WAL sender for physical replication")));
+
+			/* Report to pgstat that this process is now idle */
+			pgstat_report_activity(STATE_IDLE, NULL);
 
 			/* Tell the caller that this wasn't a WalSender command. */
 			return false;
@@ -1562,6 +1578,9 @@ exec_replication_command(const char *cmd_string)
 	/* Send CommandComplete message */
 	EndCommand("SELECT", DestRemote);
 
+	/* Report to pgstat that this process is now idle */
+	pgstat_report_activity(STATE_IDLE, NULL);
+
 	return true;
 }
 
@@ -2081,9 +2100,6 @@ WalSndLoop(WalSndSendDataCallback send_data)
 	last_reply_timestamp = GetCurrentTimestamp();
 	waiting_for_ping_response = false;
 
-	/* Report to pgstat that this process is running */
-	pgstat_report_activity(STATE_RUNNING, NULL);
-
 	/*
 	 * Loop until we reach the end of this timeline or the client requests to
 	 * stop streaming.
@@ -2316,9 +2332,9 @@ XLogRead(char *buf, XLogRecPtr startptr, Size count)
 		int			segbytes;
 		int			readbytes;
 
-		startoff = recptr % XLogSegSize;
+		startoff = XLogSegmentOffset(recptr, wal_segment_size);
 
-		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo))
+		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo, wal_segment_size))
 		{
 			char		path[MAXPGPATH];
 
@@ -2326,7 +2342,7 @@ XLogRead(char *buf, XLogRecPtr startptr, Size count)
 			if (sendFile >= 0)
 				close(sendFile);
 
-			XLByteToSeg(recptr, sendSegNo);
+			XLByteToSeg(recptr, sendSegNo, wal_segment_size);
 
 			/*-------
 			 * When reading from a historic timeline, and there is a timeline
@@ -2359,14 +2375,14 @@ XLogRead(char *buf, XLogRecPtr startptr, Size count)
 			{
 				XLogSegNo	endSegNo;
 
-				XLByteToSeg(sendTimeLineValidUpto, endSegNo);
+				XLByteToSeg(sendTimeLineValidUpto, endSegNo, wal_segment_size);
 				if (sendSegNo == endSegNo)
 					curFileTimeLine = sendTimeLineNextTLI;
 			}
 
-			XLogFilePath(path, curFileTimeLine, sendSegNo);
+			XLogFilePath(path, curFileTimeLine, sendSegNo, wal_segment_size);
 
-			sendFile = BasicOpenFile(path, O_RDONLY | PG_BINARY, 0);
+			sendFile = BasicOpenFile(path, O_RDONLY | PG_BINARY);
 			if (sendFile < 0)
 			{
 				/*
@@ -2401,8 +2417,8 @@ XLogRead(char *buf, XLogRecPtr startptr, Size count)
 		}
 
 		/* How many bytes are within this segment? */
-		if (nbytes > (XLogSegSize - startoff))
-			segbytes = XLogSegSize - startoff;
+		if (nbytes > (wal_segment_size - startoff))
+			segbytes = wal_segment_size - startoff;
 		else
 			segbytes = nbytes;
 
@@ -2433,7 +2449,7 @@ XLogRead(char *buf, XLogRecPtr startptr, Size count)
 	 * read() succeeds in that case, but the data we tried to read might
 	 * already have been overwritten with new WAL records.
 	 */
-	XLByteToSeg(startptr, segno);
+	XLByteToSeg(startptr, segno, wal_segment_size);
 	CheckXLogRemoved(segno, ThisTimeLineID);
 
 	/*
@@ -3228,11 +3244,12 @@ pg_stat_get_wal_senders(PG_FUNCTION_ARGS)
 		memset(nulls, 0, sizeof(nulls));
 		values[0] = Int32GetDatum(pid);
 
-		if (!superuser())
+		if (!is_member_of_role(GetUserId(), DEFAULT_ROLE_READ_ALL_STATS))
 		{
 			/*
-			 * Only superusers can see details. Other users only get the pid
-			 * value to know it's a walsender, but no details.
+			 * Only superusers and members of pg_read_all_stats can see details.
+			 * Other users only get the pid value to know it's a walsender,
+			 * but no details.
 			 */
 			MemSet(&nulls[1], true, PG_STAT_GET_WAL_SENDERS_COLS - 1);
 		}
diff --git a/src/backend/rewrite/rewriteDefine.c b/src/backend/rewrite/rewriteDefine.c
index 9e6865bef6..f3a9b639a8 100644
--- a/src/backend/rewrite/rewriteDefine.c
+++ b/src/backend/rewrite/rewriteDefine.c
@@ -3,7 +3,7 @@
  * rewriteDefine.c
  *	  routines for defining a rewrite rule
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -56,7 +56,7 @@ static void setRuleCheckAsUser_Query(Query *qry, Oid userid);
  *	  relation "pg_rewrite"
  */
 static Oid
-InsertRule(char *rulname,
+InsertRule(const char *rulname,
 		   int evtype,
 		   Oid eventrel_oid,
 		   bool evinstead,
@@ -225,7 +225,7 @@ DefineRule(RuleStmt *stmt, const char *queryString)
  * action and qual have already been passed through parse analysis.
  */
 ObjectAddress
-DefineQueryRewrite(char *rulename,
+DefineQueryRewrite(const char *rulename,
 				   Oid event_relid,
 				   Node *event_qual,
 				   CmdType event_type,
@@ -276,7 +276,7 @@ DefineQueryRewrite(char *rulename,
 	 * Check user has permission to apply rules to this relation.
 	 */
 	if (!pg_class_ownercheck(event_relid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(event_relation->rd_rel->relkind),
 					   RelationGetRelationName(event_relation));
 
 	/*
@@ -425,13 +425,13 @@ DefineQueryRewrite(char *rulename,
 			if (event_relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("could not convert partitioned table \"%s\" to a view",
+						 errmsg("cannot convert partitioned table \"%s\" to a view",
 								RelationGetRelationName(event_relation))));
 
 			if (event_relation->rd_rel->relispartition)
 				ereport(ERROR,
 						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("could not convert partition \"%s\" to a view",
+						 errmsg("cannot convert partition \"%s\" to a view",
 								RelationGetRelationName(event_relation))));
 
 			snapshot = RegisterSnapshot(GetLatestSnapshot());
@@ -531,7 +531,7 @@ DefineQueryRewrite(char *rulename,
 							replace);
 
 		/*
-		 * Set pg_class 'relhasrules' field TRUE for event relation.
+		 * Set pg_class 'relhasrules' field true for event relation.
 		 *
 		 * Important side effect: an SI notice is broadcast to force all
 		 * backends (including me!) to update relcache entries with the new
@@ -676,7 +676,7 @@ checkRuleResultList(List *targetList, TupleDesc resultDesc, bool isSelect,
 					 errmsg("SELECT rule's target list has too many entries") :
 					 errmsg("RETURNING list has too many entries")));
 
-		attr = resultDesc->attrs[i - 1];
+		attr = TupleDescAttr(resultDesc, i - 1);
 		attname = NameStr(attr->attname);
 
 		/*
@@ -864,7 +864,7 @@ EnableDisableRule(Relation rel, const char *rulename,
 	eventRelationOid = ((Form_pg_rewrite) GETSTRUCT(ruletup))->ev_class;
 	Assert(eventRelationOid == owningRel);
 	if (!pg_class_ownercheck(eventRelationOid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS,
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(eventRelationOid)),
 					   get_rel_name(eventRelationOid));
 
 	/*
@@ -927,7 +927,7 @@ RangeVarCallbackForRenameRule(const RangeVar *rv, Oid relid, Oid oldrelid,
 
 	/* you must own the table to rename one of its rules */
 	if (!pg_class_ownercheck(relid, GetUserId()))
-		aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_CLASS, rv->relname);
+		aclcheck_error(ACLCHECK_NOT_OWNER, get_relkind_objtype(get_rel_relkind(relid)), rv->relname);
 
 	ReleaseSysCache(tuple);
 }
diff --git a/src/backend/rewrite/rewriteHandler.c b/src/backend/rewrite/rewriteHandler.c
index 6b79c69795..66253fc3d3 100644
--- a/src/backend/rewrite/rewriteHandler.c
+++ b/src/backend/rewrite/rewriteHandler.c
@@ -3,7 +3,7 @@
  * rewriteHandler.c
  *		Primary module of query rewriter.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -72,8 +72,6 @@ static TargetEntry *process_matched_tle(TargetEntry *src_tle,
 static Node *get_assignment_input(Node *node);
 static void rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation,
 				 List *attrnos);
-static void rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte,
-					Relation target_relation);
 static void markQueryForLocking(Query *qry, Node *jtnode,
 					LockClauseStrength strength, LockWaitPolicy waitPolicy,
 					bool pushedDown);
@@ -325,8 +323,8 @@ acquireLocksOnSubLinks(Node *node, acquireLocksOnSubLinks_context *context)
  *	rt_index - RT index of result relation in original query
  *	event - type of rule event
  * Output arguments:
- *	*returning_flag - set TRUE if we rewrite RETURNING clause in rule_action
- *					(must be initialized to FALSE)
+ *	*returning_flag - set true if we rewrite RETURNING clause in rule_action
+ *					(must be initialized to false)
  * Return value:
  *	rewritten form of rule_action
  */
@@ -707,6 +705,13 @@ adjustJoinTreeList(Query *parsetree, bool removert, int rt_index)
  * rewritten targetlist: an integer list of the assigned-to attnums, in
  * order of the original tlist's non-junk entries.  This is needed for
  * processing VALUES RTEs.
+ *
+ * Note that for an inheritable UPDATE, this processing is only done once,
+ * using the parent relation as reference.  It must not do anything that
+ * will not be correct when transposed to the child relation(s).  (Step 4
+ * is incorrect by this light, since child relations might have different
+ * colun ordering, but the planner will fix things by re-sorting the tlist
+ * for each child.)
  */
 static List *
 rewriteTargetListIU(List *targetList,
@@ -751,7 +756,7 @@ rewriteTargetListIU(List *targetList,
 			attrno = old_tle->resno;
 			if (attrno < 1 || attrno > numattrs)
 				elog(ERROR, "bogus resno %d in targetlist", attrno);
-			att_tup = target_relation->rd_att->attrs[attrno - 1];
+			att_tup = TupleDescAttr(target_relation->rd_att, attrno - 1);
 
 			/* put attrno into attrno_list even if it's dropped */
 			if (attrno_list)
@@ -794,7 +799,7 @@ rewriteTargetListIU(List *targetList,
 		TargetEntry *new_tle = new_tles[attrno - 1];
 		bool		apply_default;
 
-		att_tup = target_relation->rd_att->attrs[attrno - 1];
+		att_tup = TupleDescAttr(target_relation->rd_att, attrno - 1);
 
 		/* We can (and must) ignore deleted attributes */
 		if (att_tup->attisdropped)
@@ -839,17 +844,7 @@ rewriteTargetListIU(List *targetList,
 		{
 			Node	   *new_expr;
 
-			if (att_tup->attidentity)
-			{
-				NextValueExpr *nve = makeNode(NextValueExpr);
-
-				nve->seqid = getOwnedSequence(RelationGetRelid(target_relation), attrno);
-				nve->typeId = att_tup->atttypid;
-
-				new_expr = (Node *) nve;
-			}
-			else
-				new_expr = build_column_default(target_relation, attrno);
+			new_expr = build_column_default(target_relation, attrno);
 
 			/*
 			 * If there is no default (ie, default is effectively NULL), we
@@ -875,9 +870,9 @@ rewriteTargetListIU(List *targetList,
 					new_expr = coerce_to_domain(new_expr,
 												InvalidOid, -1,
 												att_tup->atttypid,
+												COERCION_IMPLICIT,
 												COERCE_IMPLICIT_CAST,
 												-1,
-												false,
 												false);
 				}
 			}
@@ -1112,12 +1107,22 @@ Node *
 build_column_default(Relation rel, int attrno)
 {
 	TupleDesc	rd_att = rel->rd_att;
-	Form_pg_attribute att_tup = rd_att->attrs[attrno - 1];
+	Form_pg_attribute att_tup = TupleDescAttr(rd_att, attrno - 1);
 	Oid			atttype = att_tup->atttypid;
 	int32		atttypmod = att_tup->atttypmod;
 	Node	   *expr = NULL;
 	Oid			exprtype;
 
+	if (att_tup->attidentity)
+	{
+		NextValueExpr *nve = makeNode(NextValueExpr);
+
+		nve->seqid = getOwnedSequence(RelationGetRelid(rel), attrno);
+		nve->typeId = att_tup->atttypid;
+
+		return (Node *) nve;
+	}
+
 	/*
 	 * Scan to see if relation has a default for this column.
 	 */
@@ -1247,7 +1252,7 @@ rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos)
 				Form_pg_attribute att_tup;
 				Node	   *new_expr;
 
-				att_tup = target_relation->rd_att->attrs[attrno - 1];
+				att_tup = TupleDescAttr(target_relation->rd_att, attrno - 1);
 
 				if (!att_tup->attisdropped)
 					new_expr = build_column_default(target_relation, attrno);
@@ -1271,9 +1276,9 @@ rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos)
 					new_expr = coerce_to_domain(new_expr,
 												InvalidOid, -1,
 												att_tup->atttypid,
+												COERCION_IMPLICIT,
 												COERCE_IMPLICIT_CAST,
 												-1,
-												false,
 												false);
 				}
 				newList = lappend(newList, new_expr);
@@ -1293,14 +1298,15 @@ rewriteValuesRTE(RangeTblEntry *rte, Relation target_relation, List *attrnos)
  * This function adds a "junk" TLE that is needed to allow the executor to
  * find the original row for the update or delete.  When the target relation
  * is a regular table, the junk TLE emits the ctid attribute of the original
- * row.  When the target relation is a view, there is no ctid, so we instead
- * emit a whole-row Var that will contain the "old" values of the view row.
- * If it's a foreign table, we let the FDW decide what to add.
+ * row.  When the target relation is a foreign table, we let the FDW decide
+ * what to add.
  *
- * For UPDATE queries, this is applied after rewriteTargetListIU.  The
- * ordering isn't actually critical at the moment.
+ * We used to do this during RewriteQuery(), but now that inheritance trees
+ * can contain a mix of regular and foreign tables, we must postpone it till
+ * planning, after the inheritance tree has been expanded.  In that way we
+ * can do the right thing for each child table.
  */
-static void
+void
 rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte,
 					Relation target_relation)
 {
@@ -1358,19 +1364,6 @@ rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte,
 			attrname = "wholerow";
 		}
 	}
-	else
-	{
-		/*
-		 * Emit whole-row Var so that executor will have the "old" view row to
-		 * pass to the INSTEAD OF trigger.
-		 */
-		var = makeWholeRowVar(target_rte,
-							  parsetree->resultRelation,
-							  0,
-							  false);
-
-		attrname = "wholerow";
-	}
 
 	if (var != NULL)
 	{
@@ -1497,6 +1490,8 @@ ApplyRetrieveRule(Query *parsetree,
 				 parsetree->commandType == CMD_DELETE)
 		{
 			RangeTblEntry *newrte;
+			Var		   *var;
+			TargetEntry *tle;
 
 			rte = rt_fetch(rt_index, parsetree->rtable);
 			newrte = copyObject(rte);
@@ -1527,6 +1522,20 @@ ApplyRetrieveRule(Query *parsetree,
 			ChangeVarNodes((Node *) parsetree->returningList, rt_index,
 						   parsetree->resultRelation, 0);
 
+			/*
+			 * To allow the executor to compute the original view row to pass
+			 * to the INSTEAD OF trigger, we add a resjunk whole-row Var
+			 * referencing the original RTE.  This will later get expanded
+			 * into a RowExpr computing all the OLD values of the view row.
+			 */
+			var = makeWholeRowVar(rte, rt_index, 0, false);
+			tle = makeTargetEntry((Expr *) var,
+								  list_length(parsetree->targetList) + 1,
+								  pstrdup("wholerow"),
+								  true);
+
+			parsetree->targetList = lappend(parsetree->targetList, tle);
+
 			/* Now, continue with expanding the original view RTE */
 		}
 		else
@@ -2017,10 +2026,10 @@ CopyAndAddInvertedQual(Query *parsetree,
  *	event - type of rule event
  *	locks - list of rules to fire
  * Output arguments:
- *	*instead_flag - set TRUE if any unqualified INSTEAD rule is found
- *					(must be initialized to FALSE)
- *	*returning_flag - set TRUE if we rewrite RETURNING clause in any rule
- *					(must be initialized to FALSE)
+ *	*instead_flag - set true if any unqualified INSTEAD rule is found
+ *					(must be initialized to false)
+ *	*returning_flag - set true if we rewrite RETURNING clause in any rule
+ *					(must be initialized to false)
  *	*qual_product - filled with modified original query if any qualified
  *					INSTEAD rule is found (must be initialized to NULL)
  * Return value:
@@ -2966,26 +2975,6 @@ rewriteTargetView(Query *parsetree, Relation view)
 	new_rte->securityQuals = view_rte->securityQuals;
 	view_rte->securityQuals = NIL;
 
-	/*
-	 * For UPDATE/DELETE, rewriteTargetListUD will have added a wholerow junk
-	 * TLE for the view to the end of the targetlist, which we no longer need.
-	 * Remove it to avoid unnecessary work when we process the targetlist.
-	 * Note that when we recurse through rewriteQuery a new junk TLE will be
-	 * added to allow the executor to find the proper row in the new target
-	 * relation.  (So, if we failed to do this, we might have multiple junk
-	 * TLEs with the same name, which would be disastrous.)
-	 */
-	if (parsetree->commandType != CMD_INSERT)
-	{
-		TargetEntry *tle = (TargetEntry *) llast(parsetree->targetList);
-
-		Assert(tle->resjunk);
-		Assert(IsA(tle->expr, Var) &&
-			   ((Var *) tle->expr)->varno == parsetree->resultRelation &&
-			   ((Var *) tle->expr)->varattno == 0);
-		parsetree->targetList = list_delete_ptr(parsetree->targetList, tle);
-	}
-
 	/*
 	 * Now update all Vars in the outer query that reference the view to
 	 * reference the appropriate column of the base relation instead.
@@ -3347,11 +3336,10 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 									parsetree->override,
 									rt_entry_relation,
 									parsetree->resultRelation, NULL);
-			rewriteTargetListUD(parsetree, rt_entry, rt_entry_relation);
 		}
 		else if (event == CMD_DELETE)
 		{
-			rewriteTargetListUD(parsetree, rt_entry, rt_entry_relation);
+			/* Nothing to do here */
 		}
 		else
 			elog(ERROR, "unrecognized commandType: %d", (int) event);
@@ -3575,7 +3563,7 @@ RewriteQuery(Query *parsetree, List *rewrite_events)
 List *
 QueryRewrite(Query *parsetree)
 {
-	uint32		input_query_id = parsetree->queryId;
+	uint64		input_query_id = parsetree->queryId;
 	List	   *querylist;
 	List	   *results;
 	ListCell   *l;
diff --git a/src/backend/rewrite/rewriteManip.c b/src/backend/rewrite/rewriteManip.c
index ba706b25b4..abad1bf7e4 100644
--- a/src/backend/rewrite/rewriteManip.c
+++ b/src/backend/rewrite/rewriteManip.c
@@ -2,7 +2,7 @@
  *
  * rewriteManip.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1143,7 +1143,7 @@ replace_rte_variables_mutator(Node *node,
 			/* Found a matching variable, make the substitution */
 			Node	   *newnode;
 
-			newnode = (*context->callback) (var, context);
+			newnode = context->callback(var, context);
 			/* Detect if we are adding a sublink to query */
 			if (!context->inserted_sublink)
 				context->inserted_sublink = checkExprHasSubLink(newnode);
@@ -1203,9 +1203,11 @@ replace_rte_variables_mutator(Node *node,
  * appear in the expression.
  *
  * If the expression tree contains a whole-row Var for the target RTE,
- * *found_whole_row is returned as TRUE.  In addition, if to_rowtype is
- * not InvalidOid, we modify the Var's vartype and insert a ConvertRowTypeExpr
- * to map back to the orignal rowtype.  Callers that don't provide to_rowtype
+ * *found_whole_row is set to true.  In addition, if to_rowtype is
+ * not InvalidOid, we replace the Var with a Var of that vartype, inserting
+ * a ConvertRowTypeExpr to map back to the rowtype expected by the expression.
+ * (Therefore, to_rowtype had better be a child rowtype of the rowtype of the
+ * RTE we're changing references to.)  Callers that don't provide to_rowtype
  * should report an error if *found_row_type is true; we don't do that here
  * because we don't know exactly what wording for the error message would
  * be most appropriate.  The caller will be aware of the context.
@@ -1221,8 +1223,7 @@ typedef struct
 	int			sublevels_up;	/* (current) nesting depth */
 	const AttrNumber *attno_map;	/* map array for user attnos */
 	int			map_length;		/* number of entries in attno_map[] */
-	/* Target type when converting whole-row vars */
-	Oid			to_rowtype;
+	Oid			to_rowtype;		/* change whole-row Vars to this type */
 	bool	   *found_whole_row;	/* output flag */
 } map_variable_attnos_context;
 
@@ -1243,7 +1244,8 @@ map_variable_attnos_mutator(Node *node,
 			Var		   *newvar = (Var *) palloc(sizeof(Var));
 			int			attno = var->varattno;
 
-			*newvar = *var;
+			*newvar = *var;		/* initially copy all fields of the Var */
+
 			if (attno > 0)
 			{
 				/* user-defined column, replace attno */
@@ -1258,38 +1260,76 @@ map_variable_attnos_mutator(Node *node,
 				/* whole-row variable, warn caller */
 				*(context->found_whole_row) = true;
 
-				/* If the callers expects us to convert the same, do so. */
-				if (OidIsValid(context->to_rowtype))
+				/* If the caller expects us to convert the Var, do so. */
+				if (OidIsValid(context->to_rowtype) &&
+					context->to_rowtype != var->vartype)
 				{
-					/* No support for RECORDOID. */
+					ConvertRowtypeExpr *r;
+
+					/* This certainly won't work for a RECORD variable. */
 					Assert(var->vartype != RECORDOID);
 
-					/* Don't convert unless necessary. */
-					if (context->to_rowtype != var->vartype)
-					{
-						ConvertRowtypeExpr *r;
-
-						/* Var itself is converted to the requested type. */
-						newvar->vartype = context->to_rowtype;
-
-						/*
-						 * And a conversion node on top to convert back to the
-						 * original type.
-						 */
-						r = makeNode(ConvertRowtypeExpr);
-						r->arg = (Expr *) newvar;
-						r->resulttype = var->vartype;
-						r->convertformat = COERCE_IMPLICIT_CAST;
-						r->location = -1;
-
-						return (Node *) r;
-					}
+					/* Var itself is changed to the requested type. */
+					newvar->vartype = context->to_rowtype;
+
+					/*
+					 * Add a conversion node on top to convert back to the
+					 * original type expected by the expression.
+					 */
+					r = makeNode(ConvertRowtypeExpr);
+					r->arg = (Expr *) newvar;
+					r->resulttype = var->vartype;
+					r->convertformat = COERCE_IMPLICIT_CAST;
+					r->location = -1;
+
+					return (Node *) r;
 				}
 			}
 			return (Node *) newvar;
 		}
 		/* otherwise fall through to copy the var normally */
 	}
+	else if (IsA(node, ConvertRowtypeExpr))
+	{
+		ConvertRowtypeExpr *r = (ConvertRowtypeExpr *) node;
+		Var		   *var = (Var *) r->arg;
+
+		/*
+		 * If this is coercing a whole-row Var that we need to convert, then
+		 * just convert the Var without adding an extra ConvertRowtypeExpr.
+		 * Effectively we're simplifying var::parenttype::grandparenttype into
+		 * just var::grandparenttype.  This avoids building stacks of CREs if
+		 * this function is applied repeatedly.
+		 */
+		if (IsA(var, Var) &&
+			var->varno == context->target_varno &&
+			var->varlevelsup == context->sublevels_up &&
+			var->varattno == 0 &&
+			OidIsValid(context->to_rowtype) &&
+			context->to_rowtype != var->vartype)
+		{
+			ConvertRowtypeExpr *newnode;
+			Var		   *newvar = (Var *) palloc(sizeof(Var));
+
+			/* whole-row variable, warn caller */
+			*(context->found_whole_row) = true;
+
+			*newvar = *var;		/* initially copy all fields of the Var */
+
+			/* This certainly won't work for a RECORD variable. */
+			Assert(var->vartype != RECORDOID);
+
+			/* Var itself is changed to the requested type. */
+			newvar->vartype = context->to_rowtype;
+
+			newnode = (ConvertRowtypeExpr *) palloc(sizeof(ConvertRowtypeExpr));
+			*newnode = *r;		/* initially copy all fields of the CRE */
+			newnode->arg = (Expr *) newvar;
+
+			return (Node *) newnode;
+		}
+		/* otherwise fall through to process the expression normally */
+	}
 	else if (IsA(node, Query))
 	{
 		/* Recurse into RTE subquery or not-yet-planned sublink subquery */
@@ -1429,9 +1469,9 @@ ReplaceVarsFromTargetList_callback(Var *var,
 															   var->varcollid),
 										InvalidOid, -1,
 										var->vartype,
+										COERCION_IMPLICIT,
 										COERCE_IMPLICIT_CAST,
 										-1,
-										false,
 										false);
 		}
 		elog(ERROR, "could not find replacement targetlist entry for attno %d",
diff --git a/src/backend/rewrite/rewriteRemove.c b/src/backend/rewrite/rewriteRemove.c
index e6f5ed575f..07de85b8a3 100644
--- a/src/backend/rewrite/rewriteRemove.c
+++ b/src/backend/rewrite/rewriteRemove.c
@@ -3,7 +3,7 @@
  * rewriteRemove.c
  *	  routines for removing rewrite rules
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/rewrite/rewriteSupport.c b/src/backend/rewrite/rewriteSupport.c
index ce9c8e3793..ab291a43e2 100644
--- a/src/backend/rewrite/rewriteSupport.c
+++ b/src/backend/rewrite/rewriteSupport.c
@@ -3,7 +3,7 @@
  * rewriteSupport.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
index 9e7e54db67..ce77a18bc9 100644
--- a/src/backend/rewrite/rowsecurity.c
+++ b/src/backend/rewrite/rowsecurity.c
@@ -29,7 +29,7 @@
  * in the current environment, but that may change if the row_security GUC or
  * the current role changes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  */
 #include "postgres.h"
@@ -310,6 +310,8 @@ get_row_security_policies(Query *root, RangeTblEntry *rte, int rt_index,
 		{
 			List	   *conflict_permissive_policies;
 			List	   *conflict_restrictive_policies;
+			List	   *conflict_select_permissive_policies = NIL;
+			List	   *conflict_select_restrictive_policies = NIL;
 
 			/* Get the policies that apply to the auxiliary UPDATE */
 			get_policies_for_relation(rel, CMD_UPDATE, user_id,
@@ -339,9 +341,6 @@ get_row_security_policies(Query *root, RangeTblEntry *rte, int rt_index,
 			 */
 			if (rte->requiredPerms & ACL_SELECT)
 			{
-				List	   *conflict_select_permissive_policies = NIL;
-				List	   *conflict_select_restrictive_policies = NIL;
-
 				get_policies_for_relation(rel, CMD_SELECT, user_id,
 										  &conflict_select_permissive_policies,
 										  &conflict_select_restrictive_policies);
@@ -362,6 +361,21 @@ get_row_security_policies(Query *root, RangeTblEntry *rte, int rt_index,
 								   withCheckOptions,
 								   hasSubLinks,
 								   false);
+
+			/*
+			 * Add ALL/SELECT policies as WCO_RLS_UPDATE_CHECK WCOs, to ensure
+			 * that the final updated row is visible when taking the UPDATE
+			 * path of an INSERT .. ON CONFLICT DO UPDATE, if SELECT rights
+			 * are required for this relation.
+			 */
+			if (rte->requiredPerms & ACL_SELECT)
+				add_with_check_options(rel, rt_index,
+									   WCO_RLS_UPDATE_CHECK,
+									   conflict_select_permissive_policies,
+									   conflict_select_restrictive_policies,
+									   withCheckOptions,
+									   hasSubLinks,
+									   true);
 		}
 	}
 
@@ -394,11 +408,7 @@ get_policies_for_relation(Relation relation, CmdType cmd, Oid user_id,
 	*permissive_policies = NIL;
 	*restrictive_policies = NIL;
 
-	/*
-	 * First find all internal policies for the relation.  CREATE POLICY does
-	 * not currently support defining restrictive policies, so for now all
-	 * internal policies are permissive.
-	 */
+	/* First find all internal policies for the relation. */
 	foreach(item, relation->rd_rsdesc->policies)
 	{
 		bool		cmd_matches = false;
@@ -436,7 +446,7 @@ get_policies_for_relation(Relation relation, CmdType cmd, Oid user_id,
 		}
 
 		/*
-		 * Add this policy to the list of permissive policies if it applies to
+		 * Add this policy to the relevant list of policies if it applies to
 		 * the specified role.
 		 */
 		if (cmd_matches && check_role_for_policy(policy->roles, user_id))
diff --git a/src/backend/snowball/dict_snowball.c b/src/backend/snowball/dict_snowball.c
index 7cf668de19..78c9f73ef0 100644
--- a/src/backend/snowball/dict_snowball.c
+++ b/src/backend/snowball/dict_snowball.c
@@ -3,7 +3,7 @@
  * dict_snowball.c
  *		Snowball dictionary
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/snowball/dict_snowball.c
@@ -138,7 +138,7 @@ typedef struct DictSnowball
 
 
 static void
-locate_stem_module(DictSnowball *d, char *lang)
+locate_stem_module(DictSnowball *d, const char *lang)
 {
 	const stemmer_module *m;
 
@@ -192,7 +192,7 @@ dsnowball_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp("StopWords", defel->defname) == 0)
+		if (strcmp(defel->defname, "stopwords") == 0)
 		{
 			if (stoploaded)
 				ereport(ERROR,
@@ -201,7 +201,7 @@ dsnowball_init(PG_FUNCTION_ARGS)
 			readstoplist(defGetString(defel), &d->stoplist, lowerstr);
 			stoploaded = true;
 		}
-		else if (pg_strcasecmp("Language", defel->defname) == 0)
+		else if (strcmp(defel->defname, "language") == 0)
 		{
 			if (d->stem)
 				ereport(ERROR,
diff --git a/src/backend/snowball/snowball.sql.in b/src/backend/snowball/snowball.sql.in
index 844822fddb..27550dfc9a 100644
--- a/src/backend/snowball/snowball.sql.in
+++ b/src/backend/snowball/snowball.sql.in
@@ -1,7 +1,7 @@
 /*
  * text search configuration for _LANGNAME_ language
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * src/backend/snowball/snowball.sql.in
  *
diff --git a/src/backend/snowball/snowball_func.sql.in b/src/backend/snowball/snowball_func.sql.in
index 90fa000c6d..c02dad43e3 100644
--- a/src/backend/snowball/snowball_func.sql.in
+++ b/src/backend/snowball/snowball_func.sql.in
@@ -1,7 +1,7 @@
 /*
  * Create underlying C functions for Snowball stemmers
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * src/backend/snowball/snowball_func.sql.in
  *
diff --git a/src/backend/statistics/dependencies.c b/src/backend/statistics/dependencies.c
index 2e7c0ad6ba..d7305b7ab3 100644
--- a/src/backend/statistics/dependencies.c
+++ b/src/backend/statistics/dependencies.c
@@ -3,7 +3,7 @@
  * dependencies.c
  *	  POSTGRES functional dependencies
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -736,83 +736,104 @@ pg_dependencies_send(PG_FUNCTION_ARGS)
  * dependency_is_compatible_clause
  *		Determines if the clause is compatible with functional dependencies
  *
- * Only OpExprs with two arguments using an equality operator are supported.
- * When returning True attnum is set to the attribute number of the Var within
- * the supported clause.
- *
- * Currently we only support Var = Const, or Const = Var. It may be possible
- * to expand on this later.
+ * Only clauses that have the form of equality to a pseudoconstant, or can be
+ * interpreted that way, are currently accepted.  Furthermore the variable
+ * part of the clause must be a simple Var belonging to the specified
+ * relation, whose attribute number we return in *attnum on success.
  */
 static bool
 dependency_is_compatible_clause(Node *clause, Index relid, AttrNumber *attnum)
 {
 	RestrictInfo *rinfo = (RestrictInfo *) clause;
+	Var		   *var;
 
 	if (!IsA(rinfo, RestrictInfo))
 		return false;
 
-	/* Pseudoconstants are not really interesting here. */
+	/* Pseudoconstants are not interesting (they couldn't contain a Var) */
 	if (rinfo->pseudoconstant)
 		return false;
 
-	/* clauses referencing multiple varnos are incompatible */
+	/* Clauses referencing multiple, or no, varnos are incompatible */
 	if (bms_membership(rinfo->clause_relids) != BMS_SINGLETON)
 		return false;
 
 	if (is_opclause(rinfo->clause))
 	{
+		/* If it's an opclause, check for Var = Const or Const = Var. */
 		OpExpr	   *expr = (OpExpr *) rinfo->clause;
-		Var		   *var;
-		bool		varonleft = true;
-		bool		ok;
 
-		/* Only expressions with two arguments are considered compatible. */
+		/* Only expressions with two arguments are candidates. */
 		if (list_length(expr->args) != 2)
 			return false;
 
-		/* see if it actually has the right */
-		ok = (NumRelids((Node *) expr) == 1) &&
-			(is_pseudo_constant_clause(lsecond(expr->args)) ||
-			 (varonleft = false,
-			  is_pseudo_constant_clause(linitial(expr->args))));
-
-		/* unsupported structure (two variables or so) */
-		if (!ok)
+		/* Make sure non-selected argument is a pseudoconstant. */
+		if (is_pseudo_constant_clause(lsecond(expr->args)))
+			var = linitial(expr->args);
+		else if (is_pseudo_constant_clause(linitial(expr->args)))
+			var = lsecond(expr->args);
+		else
 			return false;
 
 		/*
-		 * If it's not "=" operator, just ignore the clause, as it's not
+		 * If it's not an "=" operator, just ignore the clause, as it's not
 		 * compatible with functional dependencies.
 		 *
 		 * This uses the function for estimating selectivity, not the operator
 		 * directly (a bit awkward, but well ...).
+		 *
+		 * XXX this is pretty dubious; probably it'd be better to check btree
+		 * or hash opclass membership, so as not to be fooled by custom
+		 * selectivity functions, and to be more consistent with decisions
+		 * elsewhere in the planner.
 		 */
 		if (get_oprrest(expr->opno) != F_EQSEL)
 			return false;
 
-		var = (varonleft) ? linitial(expr->args) : lsecond(expr->args);
+		/* OK to proceed with checking "var" */
+	}
+	else if (not_clause((Node *) rinfo->clause))
+	{
+		/*
+		 * "NOT x" can be interpreted as "x = false", so get the argument and
+		 * proceed with seeing if it's a suitable Var.
+		 */
+		var = (Var *) get_notclausearg(rinfo->clause);
+	}
+	else
+	{
+		/*
+		 * A boolean expression "x" can be interpreted as "x = true", so
+		 * proceed with seeing if it's a suitable Var.
+		 */
+		var = (Var *) rinfo->clause;
+	}
 
-		/* We only support plain Vars for now */
-		if (!IsA(var, Var))
-			return false;
+	/*
+	 * We may ignore any RelabelType node above the operand.  (There won't be
+	 * more than one, since eval_const_expressions has been applied already.)
+	 */
+	if (IsA(var, RelabelType))
+		var = (Var *) ((RelabelType *) var)->arg;
 
-		/* Ensure var is from the correct relation */
-		if (var->varno != relid)
-			return false;
+	/* We only support plain Vars for now */
+	if (!IsA(var, Var))
+		return false;
 
-		/* we also better ensure the Var is from the current level */
-		if (var->varlevelsup > 0)
-			return false;
+	/* Ensure Var is from the correct relation */
+	if (var->varno != relid)
+		return false;
 
-		/* Also skip system attributes (we don't allow stats on those). */
-		if (!AttrNumberIsForUserDefinedAttr(var->varattno))
-			return false;
+	/* We also better ensure the Var is from the current level */
+	if (var->varlevelsup != 0)
+		return false;
 
-		*attnum = var->varattno;
-		return true;
-	}
+	/* Also ignore system attributes (we don't allow stats on those) */
+	if (!AttrNumberIsForUserDefinedAttr(var->varattno))
+		return false;
 
-	return false;
+	*attnum = var->varattno;
+	return true;
 }
 
 /*
@@ -883,12 +904,12 @@ find_strongest_dependency(StatisticExtInfo *stats, MVDependencies *dependencies,
 
 /*
  * dependencies_clauselist_selectivity
- *		Return the estimated selectivity of the given clauses using
- *		functional dependency statistics, or 1.0 if no useful functional
+ *		Return the estimated selectivity of (a subset of) the given clauses
+ *		using functional dependency statistics, or 1.0 if no useful functional
  *		dependency statistic exists.
  *
  * 'estimatedclauses' is an output argument that gets a bit set corresponding
- * to the (zero-based) list index of clauses that are included in the
+ * to the (zero-based) list index of each clause that is included in the
  * estimated selectivity.
  *
  * Given equality clauses on attributes (a,b) we find the strongest dependency
@@ -924,6 +945,9 @@ dependencies_clauselist_selectivity(PlannerInfo *root,
 	AttrNumber *list_attnums;
 	int			listidx;
 
+	/* initialize output argument */
+	*estimatedclauses = NULL;
+
 	/* check if there's any stats that might be useful for us. */
 	if (!has_stats_of_kind(rel->statlist, STATS_EXT_DEPENDENCIES))
 		return 1.0;
diff --git a/src/backend/statistics/extended_stats.c b/src/backend/statistics/extended_stats.c
index db4987bde3..d34d5c3d12 100644
--- a/src/backend/statistics/extended_stats.c
+++ b/src/backend/statistics/extended_stats.c
@@ -6,7 +6,7 @@
  * Generic code supporting statistics objects created via CREATE STATISTICS.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -95,15 +95,16 @@ BuildRelationExtStatistics(Relation onerel, double totalrows,
 		 */
 		stats = lookup_var_attr_stats(onerel, stat->columns,
 									  natts, vacattrstats);
-		if (!stats && !IsAutoVacuumWorkerProcess())
+		if (!stats)
 		{
-			ereport(WARNING,
-					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-					 errmsg("statistics object \"%s.%s\" could not be computed for relation \"%s.%s\"",
-							stat->schema, stat->name,
-							get_namespace_name(onerel->rd_rel->relnamespace),
-							RelationGetRelationName(onerel)),
-					 errtable(onerel)));
+			if (!IsAutoVacuumWorkerProcess())
+				ereport(WARNING,
+						(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+						 errmsg("statistics object \"%s.%s\" could not be computed for relation \"%s.%s\"",
+								stat->schema, stat->name,
+								get_namespace_name(onerel->rd_rel->relnamespace),
+								RelationGetRelationName(onerel)),
+						 errtable(onerel)));
 			continue;
 		}
 
@@ -300,9 +301,9 @@ statext_store(Relation pg_stext, Oid statOid,
 	bool		nulls[Natts_pg_statistic_ext];
 	bool		replaces[Natts_pg_statistic_ext];
 
-	memset(nulls, 1, Natts_pg_statistic_ext * sizeof(bool));
-	memset(replaces, 0, Natts_pg_statistic_ext * sizeof(bool));
-	memset(values, 0, Natts_pg_statistic_ext * sizeof(Datum));
+	memset(nulls, true, sizeof(nulls));
+	memset(replaces, false, sizeof(replaces));
+	memset(values, 0, sizeof(values));
 
 	/*
 	 * Construct a new pg_statistic_ext tuple, replacing the calculated stats.
diff --git a/src/backend/statistics/mvdistinct.c b/src/backend/statistics/mvdistinct.c
index 913829233e..24e74d7a1b 100644
--- a/src/backend/statistics/mvdistinct.c
+++ b/src/backend/statistics/mvdistinct.c
@@ -13,7 +13,7 @@
  * estimates are already available in pg_statistic.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/buffer/buf_init.c b/src/backend/storage/buffer/buf_init.c
index 147fced852..144a2cee6f 100644
--- a/src/backend/storage/buffer/buf_init.c
+++ b/src/backend/storage/buffer/buf_init.c
@@ -3,7 +3,7 @@
  * buf_init.c
  *	  buffer manager initialization routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/buffer/buf_table.c b/src/backend/storage/buffer/buf_table.c
index bccda066f9..88155204fd 100644
--- a/src/backend/storage/buffer/buf_table.c
+++ b/src/backend/storage/buffer/buf_table.c
@@ -10,7 +10,7 @@
  * before the lock is released (see notes in README).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/buffer/bufmgr.c b/src/backend/storage/buffer/bufmgr.c
index 15795b0c5a..01eabe5706 100644
--- a/src/backend/storage/buffer/bufmgr.c
+++ b/src/backend/storage/buffer/bufmgr.c
@@ -3,7 +3,7 @@
  * bufmgr.c
  *	  buffer manager interface routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -975,7 +975,7 @@ ReadBuffer_common(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
  *
  * The returned buffer is pinned and is already marked as holding the
  * desired page.  If it already did have the desired page, *foundPtr is
- * set TRUE.  Otherwise, *foundPtr is set FALSE and the buffer is marked
+ * set true.  Otherwise, *foundPtr is set false and the buffer is marked
  * as IO_IN_PROGRESS; ReadBuffer will now need to do I/O to fill it.
  *
  * *foundPtr is actually redundant with the buffer's BM_VALID flag, but
@@ -1025,7 +1025,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 		/* Can release the mapping lock as soon as we've pinned it */
 		LWLockRelease(newPartitionLock);
 
-		*foundPtr = TRUE;
+		*foundPtr = true;
 
 		if (!valid)
 		{
@@ -1042,7 +1042,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 				 * If we get here, previous attempts to read the buffer must
 				 * have failed ... but we shall bravely try again.
 				 */
-				*foundPtr = FALSE;
+				*foundPtr = false;
 			}
 		}
 
@@ -1237,7 +1237,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 			/* Can release the mapping lock as soon as we've pinned it */
 			LWLockRelease(newPartitionLock);
 
-			*foundPtr = TRUE;
+			*foundPtr = true;
 
 			if (!valid)
 			{
@@ -1254,7 +1254,7 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 					 * If we get here, previous attempts to read the buffer
 					 * must have failed ... but we shall bravely try again.
 					 */
-					*foundPtr = FALSE;
+					*foundPtr = false;
 				}
 			}
 
@@ -1324,9 +1324,9 @@ BufferAlloc(SMgrRelation smgr, char relpersistence, ForkNumber forkNum,
 	 * read it before we did, so there's nothing left for BufferAlloc() to do.
 	 */
 	if (StartBufferIO(buf, true))
-		*foundPtr = FALSE;
+		*foundPtr = false;
 	else
-		*foundPtr = TRUE;
+		*foundPtr = true;
 
 	return buf;
 }
@@ -1564,7 +1564,7 @@ ReleaseAndReadBuffer(Buffer buffer,
  *
  * Note that ResourceOwnerEnlargeBuffers must have been done already.
  *
- * Returns TRUE if buffer is BM_VALID, else FALSE.  This provision allows
+ * Returns true if buffer is BM_VALID, else false.  This provision allows
  * some callers to avoid an extra spinlock cycle.
  */
 static bool
@@ -1688,7 +1688,7 @@ PinBuffer_Locked(BufferDesc *buf)
  * This should be applied only to shared buffers, never local ones.
  *
  * Most but not all callers want CurrentResourceOwner to be adjusted.
- * Those that don't should pass fixOwner = FALSE.
+ * Those that don't should pass fixOwner = false.
  */
 static void
 UnpinBuffer(BufferDesc *buf, bool fixOwner)
@@ -3348,7 +3348,6 @@ IncrBufferRefCount(Buffer buffer)
 {
 	Assert(BufferIsPinned(buffer));
 	ResourceOwnerEnlargeBuffers(CurrentResourceOwner);
-	ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);
 	if (BufferIsLocal(buffer))
 		LocalRefCount[-buffer - 1]++;
 	else
@@ -3359,6 +3358,7 @@ IncrBufferRefCount(Buffer buffer)
 		Assert(ref != NULL);
 		ref->refcount++;
 	}
+	ResourceOwnerRememberBuffer(CurrentResourceOwner, buffer);
 }
 
 /*
@@ -3712,7 +3712,7 @@ HoldingBufferPinThatDelaysRecovery(void)
  * ConditionalLockBufferForCleanup - as above, but don't wait to get the lock
  *
  * We won't loop, but just check once to see if the pin count is OK.  If
- * not, return FALSE with no lock held.
+ * not, return false with no lock held.
  */
 bool
 ConditionalLockBufferForCleanup(Buffer buffer)
@@ -3868,8 +3868,8 @@ WaitIO(BufferDesc *buf)
  * and output operations only on buffers that are BM_VALID and BM_DIRTY,
  * so we can always tell if the work is already done.
  *
- * Returns TRUE if we successfully marked the buffer as I/O busy,
- * FALSE if someone else already did the work.
+ * Returns true if we successfully marked the buffer as I/O busy,
+ * false if someone else already did the work.
  */
 static bool
 StartBufferIO(BufferDesc *buf, bool forInput)
@@ -3929,7 +3929,7 @@ StartBufferIO(BufferDesc *buf, bool forInput)
  *	We hold the buffer's io_in_progress lock
  *	The buffer is Pinned
  *
- * If clear_dirty is TRUE and BM_JUST_DIRTIED is not set, we clear the
+ * If clear_dirty is true and BM_JUST_DIRTIED is not set, we clear the
  * buffer's BM_DIRTY flag.  This is appropriate when terminating a
  * successful write.  The check on BM_JUST_DIRTIED is necessary to avoid
  * marking the buffer clean if it was re-dirtied while we were writing.
@@ -4064,8 +4064,8 @@ local_buffer_write_error_callback(void *arg)
 static int
 rnode_comparator(const void *p1, const void *p2)
 {
-	RelFileNode n1 = *(RelFileNode *) p1;
-	RelFileNode n2 = *(RelFileNode *) p2;
+	RelFileNode n1 = *(const RelFileNode *) p1;
+	RelFileNode n2 = *(const RelFileNode *) p2;
 
 	if (n1.relNode < n2.relNode)
 		return -1;
@@ -4174,8 +4174,8 @@ buffertag_comparator(const void *a, const void *b)
 static int
 ckpt_buforder_comparator(const void *pa, const void *pb)
 {
-	const CkptSortItem *a = (CkptSortItem *) pa;
-	const CkptSortItem *b = (CkptSortItem *) pb;
+	const CkptSortItem *a = (const CkptSortItem *) pa;
+	const CkptSortItem *b = (const CkptSortItem *) pb;
 
 	/* compare tablespace */
 	if (a->tsId < b->tsId)
@@ -4195,8 +4195,10 @@ ckpt_buforder_comparator(const void *pa, const void *pb)
 	/* compare block number */
 	else if (a->blockNum < b->blockNum)
 		return -1;
-	else						/* should not be the same block ... */
+	else if (a->blockNum > b->blockNum)
 		return 1;
+	/* equal page IDs are unlikely, but not impossible */
+	return 0;
 }
 
 /*
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
index 9d8ae6ae8e..18493dca17 100644
--- a/src/backend/storage/buffer/freelist.c
+++ b/src/backend/storage/buffer/freelist.c
@@ -4,7 +4,7 @@
  *	  routines for managing the buffer pool's replacement strategy.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -168,6 +168,23 @@ ClockSweepTick(void)
 	return victim;
 }
 
+/*
+ * have_free_buffer -- a lockless check to see if there is a free buffer in
+ *					   buffer pool.
+ *
+ * If the result is true that will become stale once free buffers are moved out
+ * by other operations, so the caller who strictly want to use a free buffer
+ * should not call this.
+ */
+bool
+have_free_buffer()
+{
+	if (StrategyControl->firstFreeBuffer >= 0)
+		return true;
+	else
+		return false;
+}
+
 /*
  * StrategyGetBuffer
  *
diff --git a/src/backend/storage/buffer/localbuf.c b/src/backend/storage/buffer/localbuf.c
index 1d540e87e8..e4146a260a 100644
--- a/src/backend/storage/buffer/localbuf.c
+++ b/src/backend/storage/buffer/localbuf.c
@@ -4,7 +4,7 @@
  *	  local buffer manager. Fast buffer manager for temporary tables,
  *	  which never need to be WAL-logged or checkpointed, etc.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  *
@@ -145,11 +145,11 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum,
 		ResourceOwnerRememberBuffer(CurrentResourceOwner,
 									BufferDescriptorGetBuffer(bufHdr));
 		if (buf_state & BM_VALID)
-			*foundPtr = TRUE;
+			*foundPtr = true;
 		else
 		{
 			/* Previous read attempt must have failed; try again */
-			*foundPtr = FALSE;
+			*foundPtr = false;
 		}
 		return bufHdr;
 	}
@@ -268,7 +268,7 @@ LocalBufferAlloc(SMgrRelation smgr, ForkNumber forkNum, BlockNumber blockNum,
 	buf_state += BUF_USAGECOUNT_ONE;
 	pg_atomic_unlocked_write_u32(&bufHdr->state, buf_state);
 
-	*foundPtr = FALSE;
+	*foundPtr = false;
 	return bufHdr;
 }
 
diff --git a/src/backend/storage/file/Makefile b/src/backend/storage/file/Makefile
index d2198f2b93..ca6a0e4f7d 100644
--- a/src/backend/storage/file/Makefile
+++ b/src/backend/storage/file/Makefile
@@ -12,6 +12,6 @@ subdir = src/backend/storage/file
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = fd.o buffile.o copydir.o reinit.o
+OBJS = fd.o buffile.o copydir.o reinit.o sharedfileset.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/storage/file/buffile.c b/src/backend/storage/file/buffile.c
index 4ca0ea4f2a..c058c3fc43 100644
--- a/src/backend/storage/file/buffile.c
+++ b/src/backend/storage/file/buffile.c
@@ -1,9 +1,9 @@
 /*-------------------------------------------------------------------------
  *
  * buffile.c
- *	  Management of large buffered files, primarily temporary files.
+ *	  Management of large buffered temporary files.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -20,8 +20,8 @@
  * of opening/closing file descriptors.
  *
  * Note that BufFile structs are allocated with palloc(), and therefore
- * will go away automatically at transaction end.  If the underlying
- * virtual File is made with OpenTemporaryFile, then all resources for
+ * will go away automatically at query/transaction end.  Since the underlying
+ * virtual Files are made with OpenTemporaryFile, all resources for
  * the file are certain to be cleaned up even if processing is aborted
  * by ereport(ERROR).  The data structures required are made in the
  * palloc context that was current when the BufFile was created, and
@@ -31,12 +31,18 @@
  * BufFile also supports temporary files that exceed the OS file size limit
  * (by opening multiple fd.c temporary files).  This is an essential feature
  * for sorts and hashjoins on large amounts of data.
+ *
+ * BufFile supports temporary files that can be made read-only and shared with
+ * other backends, as infrastructure for parallel execution.  Such files need
+ * to be created as a member of a SharedFileSet that all participants are
+ * attached to.
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
 #include "executor/instrument.h"
+#include "miscadmin.h"
 #include "pgstat.h"
 #include "storage/fd.h"
 #include "storage/buffile.h"
@@ -45,8 +51,8 @@
 
 /*
  * We break BufFiles into gigabyte-sized segments, regardless of RELSEG_SIZE.
- * The reason is that we'd like large temporary BufFiles to be spread across
- * multiple tablespaces when available.
+ * The reason is that we'd like large BufFiles to be spread across multiple
+ * tablespaces when available.
  */
 #define MAX_PHYSICAL_FILESIZE	0x40000000
 #define BUFFILE_SEG_SIZE		(MAX_PHYSICAL_FILESIZE / BLCKSZ)
@@ -68,9 +74,12 @@ struct BufFile
 	 * avoid making redundant FileSeek calls.
 	 */
 
-	bool		isTemp;			/* can only add files if this is TRUE */
 	bool		isInterXact;	/* keep open over transactions? */
 	bool		dirty;			/* does buffer need to be written? */
+	bool		readOnly;		/* has the file been set to read only? */
+
+	SharedFileSet *fileset;		/* space for segment files if shared */
+	const char *name;			/* name of this BufFile if shared */
 
 	/*
 	 * resowner is the ResourceOwner to use for underlying temp files.  (We
@@ -95,11 +104,12 @@ static void extendBufFile(BufFile *file);
 static void BufFileLoadBuffer(BufFile *file);
 static void BufFileDumpBuffer(BufFile *file);
 static int	BufFileFlush(BufFile *file);
+static File MakeNewSharedSegment(BufFile *file, int segment);
 
 
 /*
  * Create a BufFile given the first underlying physical file.
- * NOTE: caller must set isTemp and isInterXact if appropriate.
+ * NOTE: caller must set isInterXact if appropriate.
  */
 static BufFile *
 makeBufFile(File firstfile)
@@ -111,7 +121,6 @@ makeBufFile(File firstfile)
 	file->files[0] = firstfile;
 	file->offsets = (off_t *) palloc(sizeof(off_t));
 	file->offsets[0] = 0L;
-	file->isTemp = false;
 	file->isInterXact = false;
 	file->dirty = false;
 	file->resowner = CurrentResourceOwner;
@@ -119,6 +128,9 @@ makeBufFile(File firstfile)
 	file->curOffset = 0L;
 	file->pos = 0;
 	file->nbytes = 0;
+	file->readOnly = false;
+	file->fileset = NULL;
+	file->name = NULL;
 
 	return file;
 }
@@ -136,8 +148,11 @@ extendBufFile(BufFile *file)
 	oldowner = CurrentResourceOwner;
 	CurrentResourceOwner = file->resowner;
 
-	Assert(file->isTemp);
-	pfile = OpenTemporaryFile(file->isInterXact);
+	if (file->fileset == NULL)
+		pfile = OpenTemporaryFile(file->isInterXact);
+	else
+		pfile = MakeNewSharedSegment(file, file->numFiles);
+
 	Assert(pfile >= 0);
 
 	CurrentResourceOwner = oldowner;
@@ -173,26 +188,205 @@ BufFileCreateTemp(bool interXact)
 	Assert(pfile >= 0);
 
 	file = makeBufFile(pfile);
-	file->isTemp = true;
 	file->isInterXact = interXact;
 
 	return file;
 }
 
-#ifdef NOT_USED
 /*
- * Create a BufFile and attach it to an already-opened virtual File.
+ * Build the name for a given segment of a given BufFile.
+ */
+static void
+SharedSegmentName(char *name, const char *buffile_name, int segment)
+{
+	snprintf(name, MAXPGPATH, "%s.%d", buffile_name, segment);
+}
+
+/*
+ * Create a new segment file backing a shared BufFile.
+ */
+static File
+MakeNewSharedSegment(BufFile *buffile, int segment)
+{
+	char		name[MAXPGPATH];
+	File		file;
+
+	/*
+	 * It is possible that there are files left over from before a crash
+	 * restart with the same name.  In order for BufFileOpenShared()
+	 * not to get confused about how many segments there are, we'll unlink
+	 * the next segment number if it already exists.
+	 */
+	SharedSegmentName(name, buffile->name, segment + 1);
+	SharedFileSetDelete(buffile->fileset, name, true);
+
+	/* Create the new segment. */
+	SharedSegmentName(name, buffile->name, segment);
+	file = SharedFileSetCreate(buffile->fileset, name);
+
+	/* SharedFileSetCreate would've errored out */
+	Assert(file > 0);
+
+	return file;
+}
+
+/*
+ * Create a BufFile that can be discovered and opened read-only by other
+ * backends that are attached to the same SharedFileSet using the same name.
  *
- * This is comparable to fdopen() in stdio.  This is the only way at present
- * to attach a BufFile to a non-temporary file.  Note that BufFiles created
- * in this way CANNOT be expanded into multiple files.
+ * The naming scheme for shared BufFiles is left up to the calling code.  The
+ * name will appear as part of one or more filenames on disk, and might
+ * provide clues to administrators about which subsystem is generating
+ * temporary file data.  Since each SharedFileSet object is backed by one or
+ * more uniquely named temporary directory, names don't conflict with
+ * unrelated SharedFileSet objects.
  */
 BufFile *
-BufFileCreate(File file)
+BufFileCreateShared(SharedFileSet *fileset, const char *name)
 {
-	return makeBufFile(file);
+	BufFile    *file;
+
+	file = (BufFile *) palloc(sizeof(BufFile));
+	file->fileset = fileset;
+	file->name = pstrdup(name);
+	file->numFiles = 1;
+	file->files = (File *) palloc(sizeof(File));
+	file->files[0] = MakeNewSharedSegment(file, 0);
+	file->offsets = (off_t *) palloc(sizeof(off_t));
+	file->offsets[0] = 0L;
+	file->isInterXact = false;
+	file->dirty = false;
+	file->resowner = CurrentResourceOwner;
+	file->curFile = 0;
+	file->curOffset = 0L;
+	file->pos = 0;
+	file->nbytes = 0;
+	file->readOnly = false;
+	file->name = pstrdup(name);
+
+	return file;
+}
+
+/*
+ * Open a file that was previously created in another backend (or this one)
+ * with BufFileCreateShared in the same SharedFileSet using the same name.
+ * The backend that created the file must have called BufFileClose() or
+ * BufFileExportShared() to make sure that it is ready to be opened by other
+ * backends and render it read-only.
+ */
+BufFile *
+BufFileOpenShared(SharedFileSet *fileset, const char *name)
+{
+	BufFile    *file = (BufFile *) palloc(sizeof(BufFile));
+	char		segment_name[MAXPGPATH];
+	Size		capacity = 16;
+	File	   *files = palloc(sizeof(File) * capacity);
+	int			nfiles = 0;
+
+	file = (BufFile *) palloc(sizeof(BufFile));
+	files = palloc(sizeof(File) * capacity);
+
+	/*
+	 * We don't know how many segments there are, so we'll probe the
+	 * filesystem to find out.
+	 */
+	for (;;)
+	{
+		/* See if we need to expand our file segment array. */
+		if (nfiles + 1 > capacity)
+		{
+			capacity *= 2;
+			files = repalloc(files, sizeof(File) * capacity);
+		}
+		/* Try to load a segment. */
+		SharedSegmentName(segment_name, name, nfiles);
+		files[nfiles] = SharedFileSetOpen(fileset, segment_name);
+		if (files[nfiles] <= 0)
+			break;
+		++nfiles;
+
+		CHECK_FOR_INTERRUPTS();
+	}
+
+	/*
+	 * If we didn't find any files at all, then no BufFile exists with this
+	 * name.
+	 */
+	if (nfiles == 0)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not open BufFile \"%s\"", name)));
+
+	file->numFiles = nfiles;
+	file->files = files;
+	file->offsets = (off_t *) palloc0(sizeof(off_t) * nfiles);
+	file->isInterXact = false;
+	file->dirty = false;
+	file->resowner = CurrentResourceOwner;	/* Unused, can't extend */
+	file->curFile = 0;
+	file->curOffset = 0L;
+	file->pos = 0;
+	file->nbytes = 0;
+	file->readOnly = true;		/* Can't write to files opened this way */
+	file->fileset = fileset;
+	file->name = pstrdup(name);
+
+	return file;
+}
+
+/*
+ * Delete a BufFile that was created by BufFileCreateShared in the given
+ * SharedFileSet using the given name.
+ *
+ * It is not necessary to delete files explicitly with this function.  It is
+ * provided only as a way to delete files proactively, rather than waiting for
+ * the SharedFileSet to be cleaned up.
+ *
+ * Only one backend should attempt to delete a given name, and should know
+ * that it exists and has been exported or closed.
+ */
+void
+BufFileDeleteShared(SharedFileSet *fileset, const char *name)
+{
+	char		segment_name[MAXPGPATH];
+	int			segment = 0;
+	bool		found = false;
+
+	/*
+	 * We don't know how many segments the file has.  We'll keep deleting
+	 * until we run out.  If we don't manage to find even an initial segment,
+	 * raise an error.
+	 */
+	for (;;)
+	{
+		SharedSegmentName(segment_name, name, segment);
+		if (!SharedFileSetDelete(fileset, segment_name, true))
+			break;
+		found = true;
+		++segment;
+
+		CHECK_FOR_INTERRUPTS();
+	}
+
+	if (!found)
+		elog(ERROR, "could not delete unknown shared BufFile \"%s\"", name);
+}
+
+/*
+ * BufFileExportShared --- flush and make read-only, in preparation for sharing.
+ */
+void
+BufFileExportShared(BufFile *file)
+{
+	/* Must be a file belonging to a SharedFileSet. */
+	Assert(file->fileset != NULL);
+
+	/* It's probably a bug if someone calls this twice. */
+	Assert(!file->readOnly);
+
+	BufFileFlush(file);
+	file->readOnly = true;
 }
-#endif
 
 /*
  * Close a BufFile
@@ -206,7 +400,7 @@ BufFileClose(BufFile *file)
 
 	/* flush any unwritten data */
 	BufFileFlush(file);
-	/* close the underlying file(s) (with delete if it's a temp file) */
+	/* close and delete the underlying file(s) */
 	for (i = 0; i < file->numFiles; i++)
 		FileClose(file->files[i]);
 	/* release the buffer space */
@@ -229,10 +423,6 @@ BufFileLoadBuffer(BufFile *file)
 
 	/*
 	 * Advance to next component file if necessary and possible.
-	 *
-	 * This path can only be taken if there is more than one component, so it
-	 * won't interfere with reading a non-temp file that is over
-	 * MAX_PHYSICAL_FILESIZE.
 	 */
 	if (file->curOffset >= MAX_PHYSICAL_FILESIZE &&
 		file->curFile + 1 < file->numFiles)
@@ -264,7 +454,8 @@ BufFileLoadBuffer(BufFile *file)
 	file->offsets[file->curFile] += file->nbytes;
 	/* we choose not to advance curOffset here */
 
-	pgBufferUsage.temp_blks_read++;
+	if (file->nbytes > 0)
+		pgBufferUsage.temp_blks_read++;
 }
 
 /*
@@ -287,10 +478,12 @@ BufFileDumpBuffer(BufFile *file)
 	 */
 	while (wpos < file->nbytes)
 	{
+		off_t		availbytes;
+
 		/*
 		 * Advance to next component file if necessary and possible.
 		 */
-		if (file->curOffset >= MAX_PHYSICAL_FILESIZE && file->isTemp)
+		if (file->curOffset >= MAX_PHYSICAL_FILESIZE)
 		{
 			while (file->curFile + 1 >= file->numFiles)
 				extendBufFile(file);
@@ -299,17 +492,13 @@ BufFileDumpBuffer(BufFile *file)
 		}
 
 		/*
-		 * Enforce per-file size limit only for temp files, else just try to
-		 * write as much as asked...
+		 * Determine how much we need to write into this file.
 		 */
 		bytestowrite = file->nbytes - wpos;
-		if (file->isTemp)
-		{
-			off_t		availbytes = MAX_PHYSICAL_FILESIZE - file->curOffset;
+		availbytes = MAX_PHYSICAL_FILESIZE - file->curOffset;
 
-			if ((off_t) bytestowrite > availbytes)
-				bytestowrite = (int) availbytes;
-		}
+		if ((off_t) bytestowrite > availbytes)
+			bytestowrite = (int) availbytes;
 
 		/*
 		 * May need to reposition physical file.
@@ -414,6 +603,8 @@ BufFileWrite(BufFile *file, void *ptr, size_t size)
 	size_t		nwritten = 0;
 	size_t		nthistime;
 
+	Assert(!file->readOnly);
+
 	while (size > 0)
 	{
 		if (file->pos >= BLCKSZ)
@@ -475,8 +666,8 @@ BufFileFlush(BufFile *file)
  * BufFileSeek
  *
  * Like fseek(), except that target position needs two values in order to
- * work when logical filesize exceeds maximum value representable by long.
- * We do not support relative seeks across more than LONG_MAX, however.
+ * work when logical filesize exceeds maximum value representable by off_t.
+ * We do not support relative seeks across more than that, however.
  *
  * Result is 0 if OK, EOF if not.  Logical position is not moved if an
  * impossible seek is attempted.
@@ -542,20 +733,18 @@ BufFileSeek(BufFile *file, int fileno, off_t offset, int whence)
 	 * above flush could have created a new segment, so checking sooner would
 	 * not work (at least not with this code).
 	 */
-	if (file->isTemp)
+
+	/* convert seek to "start of next seg" to "end of last seg" */
+	if (newFile == file->numFiles && newOffset == 0)
 	{
-		/* convert seek to "start of next seg" to "end of last seg" */
-		if (newFile == file->numFiles && newOffset == 0)
-		{
-			newFile--;
-			newOffset = MAX_PHYSICAL_FILESIZE;
-		}
-		while (newOffset > MAX_PHYSICAL_FILESIZE)
-		{
-			if (++newFile >= file->numFiles)
-				return EOF;
-			newOffset -= MAX_PHYSICAL_FILESIZE;
-		}
+		newFile--;
+		newOffset = MAX_PHYSICAL_FILESIZE;
+	}
+	while (newOffset > MAX_PHYSICAL_FILESIZE)
+	{
+		if (++newFile >= file->numFiles)
+			return EOF;
+		newOffset -= MAX_PHYSICAL_FILESIZE;
 	}
 	if (newFile >= file->numFiles)
 		return EOF;
@@ -611,3 +800,62 @@ BufFileTellBlock(BufFile *file)
 }
 
 #endif
+
+/*
+ * Return the current file size.  Counts any holes left behind by
+ * BufFileViewAppend as part of the size.
+ */
+off_t
+BufFileSize(BufFile *file)
+{
+	return ((file->numFiles - 1) * (off_t) MAX_PHYSICAL_FILESIZE) +
+		FileGetSize(file->files[file->numFiles - 1]);
+}
+
+/*
+ * Append the contents of source file (managed within shared fileset) to
+ * end of target file (managed within same shared fileset).
+ *
+ * Note that operation subsumes ownership of underlying resources from
+ * "source".  Caller should never call BufFileClose against source having
+ * called here first.  Resource owners for source and target must match,
+ * too.
+ *
+ * This operation works by manipulating lists of segment files, so the
+ * file content is always appended at a MAX_PHYSICAL_FILESIZE-aligned
+ * boundary, typically creating empty holes before the boundary.  These
+ * areas do not contain any interesting data, and cannot be read from by
+ * caller.
+ *
+ * Returns the block number within target where the contents of source
+ * begins.  Caller should apply this as an offset when working off block
+ * positions that are in terms of the original BufFile space.
+ */
+long
+BufFileAppend(BufFile *target, BufFile *source)
+{
+	long		startBlock = target->numFiles * BUFFILE_SEG_SIZE;
+	int			newNumFiles = target->numFiles + source->numFiles;
+	int			i;
+
+	Assert(target->fileset != NULL);
+	Assert(source->readOnly);
+	Assert(!source->dirty);
+	Assert(source->fileset != NULL);
+
+	if (target->resowner != source->resowner)
+		elog(ERROR, "could not append BufFile with non-matching resource owner");
+
+	target->files = (File *)
+		repalloc(target->files, sizeof(File) * newNumFiles);
+	target->offsets = (off_t *)
+		repalloc(target->offsets, sizeof(off_t) * newNumFiles);
+	for (i = target->numFiles; i < newNumFiles; i++)
+	{
+		target->files[i] = source->files[i - target->numFiles];
+		target->offsets[i] = 0L;
+	}
+	target->numFiles = newNumFiles;
+
+	return startBlock;
+}
diff --git a/src/backend/storage/file/copydir.c b/src/backend/storage/file/copydir.c
index 1e2691685a..ca6342db0d 100644
--- a/src/backend/storage/file/copydir.c
+++ b/src/backend/storage/file/copydir.c
@@ -3,7 +3,7 @@
  * copydir.c
  *	  copies a directory
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	While "xcopy /e /i /q" works fine for copying directories, on Windows XP
@@ -47,10 +47,6 @@ copydir(char *fromdir, char *todir, bool recurse)
 				 errmsg("could not create directory \"%s\": %m", todir)));
 
 	xldir = AllocateDir(fromdir);
-	if (xldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open directory \"%s\": %m", fromdir)));
 
 	while ((xlde = ReadDir(xldir, fromdir)) != NULL)
 	{
@@ -90,10 +86,6 @@ copydir(char *fromdir, char *todir, bool recurse)
 		return;
 
 	xldir = AllocateDir(todir);
-	if (xldir == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open directory \"%s\": %m", todir)));
 
 	while ((xlde = ReadDir(xldir, todir)) != NULL)
 	{
@@ -139,23 +131,36 @@ copy_file(char *fromfile, char *tofile)
 	int			dstfd;
 	int			nbytes;
 	off_t		offset;
+	off_t		flush_offset;
 
-	/* Use palloc to ensure we get a maxaligned buffer */
+	/* Size of copy buffer (read and write requests) */
 #define COPY_BUF_SIZE (8 * BLCKSZ)
 
+	/*
+	 * Size of data flush requests.  It seems beneficial on most platforms to
+	 * do this every 1MB or so.  But macOS, at least with early releases of
+	 * APFS, is really unfriendly to small mmap/msync requests, so there do it
+	 * only every 32MB.
+	 */
+#if defined(__darwin__)
+#define FLUSH_DISTANCE (32 * 1024 * 1024)
+#else
+#define FLUSH_DISTANCE (1024 * 1024)
+#endif
+
+	/* Use palloc to ensure we get a maxaligned buffer */
 	buffer = palloc(COPY_BUF_SIZE);
 
 	/*
 	 * Open the files
 	 */
-	srcfd = OpenTransientFile(fromfile, O_RDONLY | PG_BINARY, 0);
+	srcfd = OpenTransientFile(fromfile, O_RDONLY | PG_BINARY);
 	if (srcfd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
 				 errmsg("could not open file \"%s\": %m", fromfile)));
 
-	dstfd = OpenTransientFile(tofile, O_RDWR | O_CREAT | O_EXCL | PG_BINARY,
-							  S_IRUSR | S_IWUSR);
+	dstfd = OpenTransientFile(tofile, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 	if (dstfd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -164,11 +169,23 @@ copy_file(char *fromfile, char *tofile)
 	/*
 	 * Do the data copying.
 	 */
+	flush_offset = 0;
 	for (offset = 0;; offset += nbytes)
 	{
 		/* If we got a cancel signal during the copy of the file, quit */
 		CHECK_FOR_INTERRUPTS();
 
+		/*
+		 * We fsync the files later, but during the copy, flush them every so
+		 * often to avoid spamming the cache and hopefully get the kernel to
+		 * start writing them out before the fsync comes.
+		 */
+		if (offset - flush_offset >= FLUSH_DISTANCE)
+		{
+			pg_flush_data(dstfd, flush_offset, offset - flush_offset);
+			flush_offset = offset;
+		}
+
 		pgstat_report_wait_start(WAIT_EVENT_COPY_FILE_READ);
 		nbytes = read(srcfd, buffer, COPY_BUF_SIZE);
 		pgstat_report_wait_end();
@@ -191,15 +208,11 @@ copy_file(char *fromfile, char *tofile)
 					 errmsg("could not write to file \"%s\": %m", tofile)));
 		}
 		pgstat_report_wait_end();
-
-		/*
-		 * We fsync the files later but first flush them to avoid spamming the
-		 * cache and hopefully get the kernel to start writing them out before
-		 * the fsync comes.
-		 */
-		pg_flush_data(dstfd, offset, nbytes);
 	}
 
+	if (offset > flush_offset)
+		pg_flush_data(dstfd, flush_offset, offset - flush_offset);
+
 	if (CloseTransientFile(dstfd))
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
index 83b061a036..2a18e94ff4 100644
--- a/src/backend/storage/file/fd.c
+++ b/src/backend/storage/file/fd.c
@@ -3,7 +3,7 @@
  * fd.c
  *	  Virtual file descriptor code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -39,6 +39,14 @@
  * for a long time, like relation files. It is the caller's responsibility
  * to close them, there is no automatic mechanism in fd.c for that.
  *
+ * PathName(Create|Open|Delete)Temporary(File|Dir) are used to manage
+ * temporary files that have names so that they can be shared between
+ * backends.  Such files are automatically closed and count against the
+ * temporary file limit of the backend that creates them, but unlike anonymous
+ * files they are not automatically deleted.  See sharedfileset.c for a shared
+ * ownership mechanism that provides automatic cleanup for shared files when
+ * the last of a group of backends detaches.
+ *
  * AllocateFile, AllocateDir, OpenPipeStream and OpenTransientFile are
  * wrappers around fopen(3), opendir(3), popen(3) and open(2), respectively.
  * They behave like the corresponding native functions, except that the handle
@@ -116,6 +124,11 @@
  */
 #define FD_MINFREE				10
 
+/*
+ * Default mode for created files, unless something else is specified using
+ * the *Perm() function variants.
+ */
+#define PG_FILE_MODE_DEFAULT	(S_IRUSR | S_IWUSR)
 
 /*
  * A number of platforms allow individual processes to open many more files
@@ -170,8 +183,9 @@ int			max_safe_fds = 32;	/* default if not changed */
 #define FilePosIsUnknown(pos) ((pos) < 0)
 
 /* these are the assigned bits in fdstate below: */
-#define FD_TEMPORARY		(1 << 0)	/* T = delete when closed */
-#define FD_XACT_TEMPORARY	(1 << 1)	/* T = delete at eoXact */
+#define FD_DELETE_AT_CLOSE	(1 << 0)	/* T = delete when closed */
+#define FD_CLOSE_AT_EOXACT	(1 << 1)	/* T = close at eoXact */
+#define FD_TEMP_FILE_LIMIT	(1 << 2)	/* T = respect temp_file_limit */
 
 typedef struct vfd
 {
@@ -186,7 +200,7 @@ typedef struct vfd
 	char	   *fileName;		/* name of file, or NULL for unused VFD */
 	/* NB: fileName is malloc'd, and must be free'd when closing the VFD */
 	int			fileFlags;		/* open(2) flags for (re)opening the file */
-	int			fileMode;		/* mode to pass to open(2) */
+	mode_t		fileMode;		/* mode to pass to open(2) */
 } Vfd;
 
 /*
@@ -304,11 +318,11 @@ static int	FileAccess(File file);
 static File OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError);
 static bool reserveAllocatedDesc(void);
 static int	FreeDesc(AllocateDesc *desc);
-static struct dirent *ReadDirExtended(DIR *dir, const char *dirname, int elevel);
 
 static void AtProcExit_Files(int code, Datum arg);
 static void CleanupTempFiles(bool isProcExit);
-static void RemovePgTempFilesInDir(const char *tmpdirname);
+static void RemovePgTempFilesInDir(const char *tmpdirname, bool missing_ok,
+					   bool unlink_all);
 static void RemovePgTempRelationFiles(const char *tsdirname);
 static void RemovePgTempRelationFilesInDbspace(const char *dbspacedirname);
 static bool looks_like_temp_rel_name(const char *name);
@@ -321,6 +335,7 @@ static void walkdir(const char *path,
 static void pre_sync_fname(const char *fname, bool isdir, int elevel);
 #endif
 static void datadir_fsync_fname(const char *fname, bool isdir, int elevel);
+static void unlink_if_exists_fname(const char *fname, bool isdir, int elevel);
 
 static int	fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel);
 static int	fsync_parent_path(const char *fname, int elevel);
@@ -604,7 +619,7 @@ durable_rename(const char *oldfile, const char *newfile, int elevel)
 	if (fsync_fname_ext(oldfile, false, false, elevel) != 0)
 		return -1;
 
-	fd = OpenTransientFile((char *) newfile, PG_BINARY | O_RDWR, 0);
+	fd = OpenTransientFile(newfile, PG_BINARY | O_RDWR);
 	if (fd < 0)
 	{
 		if (errno != ENOENT)
@@ -917,7 +932,17 @@ set_max_safe_fds(void)
 }
 
 /*
- * BasicOpenFile --- same as open(2) except can free other FDs if needed
+ * Open a file with BasicOpenFilePerm() and pass default file mode for the
+ * fileMode parameter.
+ */
+int
+BasicOpenFile(const char *fileName, int fileFlags)
+{
+	return BasicOpenFilePerm(fileName, fileFlags, PG_FILE_MODE_DEFAULT);
+}
+
+/*
+ * BasicOpenFilePerm --- same as open(2) except can free other FDs if needed
  *
  * This is exported for use by places that really want a plain kernel FD,
  * but need to be proof against running out of FDs.  Once an FD has been
@@ -933,7 +958,7 @@ set_max_safe_fds(void)
  * this module wouldn't have any open files to close at that point anyway.
  */
 int
-BasicOpenFile(FileName fileName, int fileFlags, int fileMode)
+BasicOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode)
 {
 	int			fd;
 
@@ -1084,8 +1109,8 @@ LruInsert(File file)
 		 * overall system file table being full.  So, be prepared to release
 		 * another FD if necessary...
 		 */
-		vfdP->fd = BasicOpenFile(vfdP->fileName, vfdP->fileFlags,
-								 vfdP->fileMode);
+		vfdP->fd = BasicOpenFilePerm(vfdP->fileName, vfdP->fileFlags,
+									 vfdP->fileMode);
 		if (vfdP->fd < 0)
 		{
 			DO_DB(elog(LOG, "re-open failed: %m"));
@@ -1279,6 +1304,39 @@ FileAccess(File file)
 	return 0;
 }
 
+/*
+ * Called whenever a temporary file is deleted to report its size.
+ */
+static void
+ReportTemporaryFileUsage(const char *path, off_t size)
+{
+	pgstat_report_tempfile(size);
+
+	if (log_temp_files >= 0)
+	{
+		if ((size / 1024) >= log_temp_files)
+			ereport(LOG,
+					(errmsg("temporary file: path \"%s\", size %lu",
+							path, (unsigned long) size)));
+	}
+}
+
+/*
+ * Called to register a temporary file for automatic close.
+ * ResourceOwnerEnlargeFiles(CurrentResourceOwner) must have been called
+ * before the file was opened.
+ */
+static void
+RegisterTemporaryFile(File file)
+{
+	ResourceOwnerRememberFile(CurrentResourceOwner, file);
+	VfdCache[file].resowner = CurrentResourceOwner;
+
+	/* Backup mechanism for closing at end of xact. */
+	VfdCache[file].fdstate |= FD_CLOSE_AT_EOXACT;
+	have_xact_temporary_files = true;
+}
+
 /*
  *	Called when we get a shared invalidation message on some relation.
  */
@@ -1292,6 +1350,16 @@ FileInvalidate(File file)
 }
 #endif
 
+/*
+ * Open a file with PathNameOpenFilePerm() and pass default file mode for the
+ * fileMode parameter.
+ */
+File
+PathNameOpenFile(const char *fileName, int fileFlags)
+{
+	return PathNameOpenFilePerm(fileName, fileFlags, PG_FILE_MODE_DEFAULT);
+}
+
 /*
  * open a file in an arbitrary directory
  *
@@ -1300,13 +1368,13 @@ FileInvalidate(File file)
  * (which should always be $PGDATA when this code is running).
  */
 File
-PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
+PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode)
 {
 	char	   *fnamecopy;
 	File		file;
 	Vfd		   *vfdP;
 
-	DO_DB(elog(LOG, "PathNameOpenFile: %s %x %o",
+	DO_DB(elog(LOG, "PathNameOpenFilePerm: %s %x %o",
 			   fileName, fileFlags, fileMode));
 
 	/*
@@ -1324,7 +1392,7 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	/* Close excess kernel FDs. */
 	ReleaseLruFiles();
 
-	vfdP->fd = BasicOpenFile(fileName, fileFlags, fileMode);
+	vfdP->fd = BasicOpenFilePerm(fileName, fileFlags, fileMode);
 
 	if (vfdP->fd < 0)
 	{
@@ -1353,6 +1421,67 @@ PathNameOpenFile(FileName fileName, int fileFlags, int fileMode)
 	return file;
 }
 
+/*
+ * Create directory 'directory'.  If necessary, create 'basedir', which must
+ * be the directory above it.  This is designed for creating the top-level
+ * temporary directory on demand before creating a directory underneath it.
+ * Do nothing if the directory already exists.
+ *
+ * Directories created within the top-level temporary directory should begin
+ * with PG_TEMP_FILE_PREFIX, so that they can be identified as temporary and
+ * deleted at startup by RemovePgTempFiles().  Further subdirectories below
+ * that do not need any particular prefix.
+*/
+void
+PathNameCreateTemporaryDir(const char *basedir, const char *directory)
+{
+	if (mkdir(directory, S_IRWXU) < 0)
+	{
+		if (errno == EEXIST)
+			return;
+
+		/*
+		 * Failed.  Try to create basedir first in case it's missing. Tolerate
+		 * EEXIST to close a race against another process following the same
+		 * algorithm.
+		 */
+		if (mkdir(basedir, S_IRWXU) < 0 && errno != EEXIST)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("cannot create temporary directory \"%s\": %m",
+							basedir)));
+
+		/* Try again. */
+		if (mkdir(directory, S_IRWXU) < 0 && errno != EEXIST)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("cannot create temporary subdirectory \"%s\": %m",
+							directory)));
+	}
+}
+
+/*
+ * Delete a directory and everything in it, if it exists.
+ */
+void
+PathNameDeleteTemporaryDir(const char *dirname)
+{
+	struct stat statbuf;
+
+	/* Silently ignore missing directory. */
+	if (stat(dirname, &statbuf) != 0 && errno == ENOENT)
+		return;
+
+	/*
+	 * Currently, walkdir doesn't offer a way for our passed in function to
+	 * maintain state.  Perhaps it should, so that we could tell the caller
+	 * whether this operation succeeded or failed.  Since this operation is
+	 * used in a cleanup path, we wouldn't actually behave differently: we'll
+	 * just log failures.
+	 */
+	walkdir(dirname, unlink_if_exists_fname, false, LOG);
+}
+
 /*
  * Open a temporary file that will disappear when we close it.
  *
@@ -1372,6 +1501,13 @@ OpenTemporaryFile(bool interXact)
 {
 	File		file = 0;
 
+	/*
+	 * Make sure the current resource owner has space for this File before we
+	 * open it, if we'll be registering it below.
+	 */
+	if (!interXact)
+		ResourceOwnerEnlargeFiles(CurrentResourceOwner);
+
 	/*
 	 * If some temp tablespace(s) have been given to us, try to use the next
 	 * one.  If a given tablespace can't be found, we silently fall back to
@@ -1400,54 +1536,52 @@ OpenTemporaryFile(bool interXact)
 											 DEFAULTTABLESPACE_OID,
 											 true);
 
-	/* Mark it for deletion at close */
-	VfdCache[file].fdstate |= FD_TEMPORARY;
+	/* Mark it for deletion at close and temporary file size limit */
+	VfdCache[file].fdstate |= FD_DELETE_AT_CLOSE | FD_TEMP_FILE_LIMIT;
 
 	/* Register it with the current resource owner */
 	if (!interXact)
-	{
-		VfdCache[file].fdstate |= FD_XACT_TEMPORARY;
-
-		ResourceOwnerEnlargeFiles(CurrentResourceOwner);
-		ResourceOwnerRememberFile(CurrentResourceOwner, file);
-		VfdCache[file].resowner = CurrentResourceOwner;
-
-		/* ensure cleanup happens at eoxact */
-		have_xact_temporary_files = true;
-	}
+		RegisterTemporaryFile(file);
 
 	return file;
 }
 
 /*
- * Open a temporary file in a specific tablespace.
- * Subroutine for OpenTemporaryFile, which see for details.
+ * Return the path of the temp directory in a given tablespace.
  */
-static File
-OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError)
+void
+TempTablespacePath(char *path, Oid tablespace)
 {
-	char		tempdirpath[MAXPGPATH];
-	char		tempfilepath[MAXPGPATH];
-	File		file;
-
 	/*
 	 * Identify the tempfile directory for this tablespace.
 	 *
 	 * If someone tries to specify pg_global, use pg_default instead.
 	 */
-	if (tblspcOid == DEFAULTTABLESPACE_OID ||
-		tblspcOid == GLOBALTABLESPACE_OID)
-	{
-		/* The default tablespace is {datadir}/base */
-		snprintf(tempdirpath, sizeof(tempdirpath), "base/%s",
-				 PG_TEMP_FILES_DIR);
-	}
+	if (tablespace == InvalidOid ||
+		tablespace == DEFAULTTABLESPACE_OID ||
+		tablespace == GLOBALTABLESPACE_OID)
+		snprintf(path, MAXPGPATH, "base/%s", PG_TEMP_FILES_DIR);
 	else
 	{
 		/* All other tablespaces are accessed via symlinks */
-		snprintf(tempdirpath, sizeof(tempdirpath), "pg_tblspc/%u/%s/%s",
-				 tblspcOid, TABLESPACE_VERSION_DIRECTORY, PG_TEMP_FILES_DIR);
+		snprintf(path, MAXPGPATH, "pg_tblspc/%u/%s/%s",
+				 tablespace, TABLESPACE_VERSION_DIRECTORY,
+				 PG_TEMP_FILES_DIR);
 	}
+}
+
+/*
+ * Open a temporary file in a specific tablespace.
+ * Subroutine for OpenTemporaryFile, which see for details.
+ */
+static File
+OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError)
+{
+	char		tempdirpath[MAXPGPATH];
+	char		tempfilepath[MAXPGPATH];
+	File		file;
+
+	TempTablespacePath(tempdirpath, tblspcOid);
 
 	/*
 	 * Generate a tempfile name that should be unique within the current
@@ -1461,8 +1595,7 @@ OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError)
 	 * temp file that can be reused.
 	 */
 	file = PathNameOpenFile(tempfilepath,
-							O_RDWR | O_CREAT | O_TRUNC | PG_BINARY,
-							0600);
+							O_RDWR | O_CREAT | O_TRUNC | PG_BINARY);
 	if (file <= 0)
 	{
 		/*
@@ -1476,8 +1609,7 @@ OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError)
 		mkdir(tempdirpath, S_IRWXU);
 
 		file = PathNameOpenFile(tempfilepath,
-								O_RDWR | O_CREAT | O_TRUNC | PG_BINARY,
-								0600);
+								O_RDWR | O_CREAT | O_TRUNC | PG_BINARY);
 		if (file <= 0 && rejectError)
 			elog(ERROR, "could not create temporary file \"%s\": %m",
 				 tempfilepath);
@@ -1486,6 +1618,130 @@ OpenTemporaryFileInTablespace(Oid tblspcOid, bool rejectError)
 	return file;
 }
 
+
+/*
+ * Create a new file.  The directory containing it must already exist.  Files
+ * created this way are subject to temp_file_limit and are automatically
+ * closed at end of transaction, but are not automatically deleted on close
+ * because they are intended to be shared between cooperating backends.
+ *
+ * If the file is inside the top-level temporary directory, its name should
+ * begin with PG_TEMP_FILE_PREFIX so that it can be identified as temporary
+ * and deleted at startup by RemovePgTempFiles().  Alternatively, it can be
+ * inside a directory created with PathnameCreateTemporaryDir(), in which case
+ * the prefix isn't needed.
+ */
+File
+PathNameCreateTemporaryFile(const char *path, bool error_on_failure)
+{
+	File		file;
+
+	ResourceOwnerEnlargeFiles(CurrentResourceOwner);
+
+	/*
+	 * Open the file.  Note: we don't use O_EXCL, in case there is an orphaned
+	 * temp file that can be reused.
+	 */
+	file = PathNameOpenFile(path, O_RDWR | O_CREAT | O_TRUNC | PG_BINARY);
+	if (file <= 0)
+	{
+		if (error_on_failure)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not create temporary file \"%s\": %m",
+							path)));
+		else
+			return file;
+	}
+
+	/* Mark it for temp_file_limit accounting. */
+	VfdCache[file].fdstate |= FD_TEMP_FILE_LIMIT;
+
+	/* Register it for automatic close. */
+	RegisterTemporaryFile(file);
+
+	return file;
+}
+
+/*
+ * Open a file that was created with PathNameCreateTemporaryFile, possibly in
+ * another backend.  Files opened this way don't count against the
+ * temp_file_limit of the caller, are read-only and are automatically closed
+ * at the end of the transaction but are not deleted on close.
+ */
+File
+PathNameOpenTemporaryFile(const char *path)
+{
+	File		file;
+
+	ResourceOwnerEnlargeFiles(CurrentResourceOwner);
+
+	/* We open the file read-only. */
+	file = PathNameOpenFile(path, O_RDONLY | PG_BINARY);
+
+	/* If no such file, then we don't raise an error. */
+	if (file <= 0 && errno != ENOENT)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not open temporary file \"%s\": %m",
+						path)));
+
+	if (file > 0)
+	{
+		/* Register it for automatic close. */
+		RegisterTemporaryFile(file);
+	}
+
+	return file;
+}
+
+/*
+ * Delete a file by pathname.  Return true if the file existed, false if
+ * didn't.
+ */
+bool
+PathNameDeleteTemporaryFile(const char *path, bool error_on_failure)
+{
+	struct stat filestats;
+	int			stat_errno;
+
+	/* Get the final size for pgstat reporting. */
+	if (stat(path, &filestats) != 0)
+		stat_errno = errno;
+	else
+		stat_errno = 0;
+
+	/*
+	 * Unlike FileClose's automatic file deletion code, we tolerate
+	 * non-existence to support BufFileDeleteShared which doesn't know how
+	 * many segments it has to delete until it runs out.
+	 */
+	if (stat_errno == ENOENT)
+		return false;
+
+	if (unlink(path) < 0)
+	{
+		if (errno != ENOENT)
+			ereport(error_on_failure ? ERROR : LOG,
+					(errcode_for_file_access(),
+					 errmsg("cannot unlink temporary file \"%s\": %m",
+							path)));
+		return false;
+	}
+
+	if (stat_errno == 0)
+		ReportTemporaryFileUsage(path, filestats.st_size);
+	else
+	{
+		errno = stat_errno;
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not stat file \"%s\": %m", path)));
+	}
+
+	return true;
+}
+
 /*
  * close a file when done with it
  */
@@ -1514,10 +1770,17 @@ FileClose(File file)
 		Delete(file);
 	}
 
+	if (vfdP->fdstate & FD_TEMP_FILE_LIMIT)
+	{
+		/* Subtract its size from current usage (do first in case of error) */
+		temporary_files_size -= vfdP->fileSize;
+		vfdP->fileSize = 0;
+	}
+
 	/*
 	 * Delete the file if it was temporary, and make a log entry if wanted
 	 */
-	if (vfdP->fdstate & FD_TEMPORARY)
+	if (vfdP->fdstate & FD_DELETE_AT_CLOSE)
 	{
 		struct stat filestats;
 		int			stat_errno;
@@ -1529,11 +1792,8 @@ FileClose(File file)
 		 * is arranged to ensure that the worst-case consequence is failing to
 		 * emit log message(s), not failing to attempt the unlink.
 		 */
-		vfdP->fdstate &= ~FD_TEMPORARY;
+		vfdP->fdstate &= ~FD_DELETE_AT_CLOSE;
 
-		/* Subtract its size from current usage (do first in case of error) */
-		temporary_files_size -= vfdP->fileSize;
-		vfdP->fileSize = 0;
 
 		/* first try the stat() */
 		if (stat(vfdP->fileName, &filestats))
@@ -1547,18 +1807,7 @@ FileClose(File file)
 
 		/* and last report the stat results */
 		if (stat_errno == 0)
-		{
-			pgstat_report_tempfile(filestats.st_size);
-
-			if (log_temp_files >= 0)
-			{
-				if ((filestats.st_size / 1024) >= log_temp_files)
-					ereport(LOG,
-							(errmsg("temporary file: path \"%s\", size %lu",
-									vfdP->fileName,
-									(unsigned long) filestats.st_size)));
-			}
-		}
+			ReportTemporaryFileUsage(vfdP->fileName, filestats.st_size);
 		else
 		{
 			errno = stat_errno;
@@ -1732,7 +1981,7 @@ FileWrite(File file, char *buffer, int amount, uint32 wait_event_info)
 	 * message if we do that.  All current callers would just throw error
 	 * immediately anyway, so this is safe at present.
 	 */
-	if (temp_file_limit >= 0 && (vfdP->fdstate & FD_TEMPORARY))
+	if (temp_file_limit >= 0 && (vfdP->fdstate & FD_TEMP_FILE_LIMIT))
 	{
 		off_t		newPos;
 
@@ -1785,7 +2034,7 @@ FileWrite(File file, char *buffer, int amount, uint32 wait_event_info)
 		 * get here in that state if we're not enforcing temporary_files_size,
 		 * so we don't care.
 		 */
-		if (vfdP->fdstate & FD_TEMPORARY)
+		if (vfdP->fdstate & FD_TEMP_FILE_LIMIT)
 		{
 			off_t		newPos = vfdP->seekPos;
 
@@ -1956,7 +2205,7 @@ FileTruncate(File file, off_t offset, uint32 wait_event_info)
 	if (returnCode == 0 && VfdCache[file].fileSize > offset)
 	{
 		/* adjust our state for truncation of a temp file */
-		Assert(VfdCache[file].fdstate & FD_TEMPORARY);
+		Assert(VfdCache[file].fdstate & FD_TEMP_FILE_LIMIT);
 		temporary_files_size -= VfdCache[file].fileSize - offset;
 		VfdCache[file].fileSize = offset;
 	}
@@ -2006,13 +2255,23 @@ FileGetRawFlags(File file)
 /*
  * FileGetRawMode - returns the mode bitmask passed to open(2)
  */
-int
+mode_t
 FileGetRawMode(File file)
 {
 	Assert(FileIsValid(file));
 	return VfdCache[file].fileMode;
 }
 
+/*
+ * FileGetSize - returns the size of file
+ */
+off_t
+FileGetSize(File file)
+{
+	Assert(FileIsValid(file));
+	return VfdCache[file].fileSize;
+}
+
 /*
  * Make room for another allocatedDescs[] array entry if needed and possible.
  * Returns true if an array element is available.
@@ -2136,12 +2395,21 @@ AllocateFile(const char *name, const char *mode)
 	return NULL;
 }
 
+/*
+ * Open a file with OpenTransientFilePerm() and pass default file mode for
+ * the fileMode parameter.
+ */
+int
+OpenTransientFile(const char *fileName, int fileFlags)
+{
+	return OpenTransientFilePerm(fileName, fileFlags, PG_FILE_MODE_DEFAULT);
+}
 
 /*
  * Like AllocateFile, but returns an unbuffered fd like open(2)
  */
 int
-OpenTransientFile(FileName fileName, int fileFlags, int fileMode)
+OpenTransientFilePerm(const char *fileName, int fileFlags, mode_t fileMode)
 {
 	int			fd;
 
@@ -2158,7 +2426,7 @@ OpenTransientFile(FileName fileName, int fileFlags, int fileMode)
 	/* Close excess kernel FDs. */
 	ReleaseLruFiles();
 
-	fd = BasicOpenFile(fileName, fileFlags, fileMode);
+	fd = BasicOpenFilePerm(fileName, fileFlags, fileMode);
 
 	if (fd >= 0)
 	{
@@ -2329,6 +2597,10 @@ CloseTransientFile(int fd)
  * necessary to open the directory, and with closing it after an elog.
  * When done, call FreeDir rather than closedir.
  *
+ * Returns NULL, with errno set, on failure.  Note that failure detection
+ * is commonly left to the following call of ReadDir or ReadDirExtended;
+ * see the comments for ReadDir.
+ *
  * Ideally this should be the *only* direct call of opendir() in the backend.
  */
 DIR *
@@ -2391,8 +2663,8 @@ AllocateDir(const char *dirname)
  *		FreeDir(dir);
  *
  * since a NULL dir parameter is taken as indicating AllocateDir failed.
- * (Make sure errno hasn't been changed since AllocateDir if you use this
- * shortcut.)
+ * (Make sure errno isn't changed between AllocateDir and ReadDir if you
+ * use this shortcut.)
  *
  * The pathname passed to AllocateDir must be passed to this routine too,
  * but it is only used for error reporting.
@@ -2404,10 +2676,15 @@ ReadDir(DIR *dir, const char *dirname)
 }
 
 /*
- * Alternate version that allows caller to specify the elevel for any
- * error report.  If elevel < ERROR, returns NULL on any error.
+ * Alternate version of ReadDir that allows caller to specify the elevel
+ * for any error report (whether it's reporting an initial failure of
+ * AllocateDir or a subsequent directory read failure).
+ *
+ * If elevel < ERROR, returns NULL after any error.  With the normal coding
+ * pattern, this will result in falling out of the loop immediately as
+ * though the directory contained no (more) entries.
  */
-static struct dirent *
+struct dirent *
 ReadDirExtended(DIR *dir, const char *dirname, int elevel)
 {
 	struct dirent *dent;
@@ -2437,14 +2714,22 @@ ReadDirExtended(DIR *dir, const char *dirname, int elevel)
 /*
  * Close a directory opened with AllocateDir.
  *
- * Note we do not check closedir's return value --- it is up to the caller
- * to handle close errors.
+ * Returns closedir's return value (with errno set if it's not 0).
+ * Note we do not check the return value --- it is up to the caller
+ * to handle close errors if wanted.
+ *
+ * Does nothing if dir == NULL; we assume that directory open failure was
+ * already reported if desired.
  */
 int
 FreeDir(DIR *dir)
 {
 	int			i;
 
+	/* Nothing to do if AllocateDir failed */
+	if (dir == NULL)
+		return 0;
+
 	DO_DB(elog(LOG, "FreeDir: Allocated %d", numAllocatedDescs));
 
 	/* Remove dir from list of allocated dirs, if it's present */
@@ -2545,7 +2830,7 @@ SetTempTablespaces(Oid *tableSpaces, int numSpaces)
 /*
  * TempTablespacesAreSet
  *
- * Returns TRUE if SetTempTablespaces has been called in current transaction.
+ * Returns true if SetTempTablespaces has been called in current transaction.
  * (This is just so that tablespaces.c doesn't need its own per-transaction
  * state.)
  */
@@ -2555,6 +2840,24 @@ TempTablespacesAreSet(void)
 	return (numTempTableSpaces >= 0);
 }
 
+/*
+ * GetTempTablespaces
+ *
+ * Populate an array with the OIDs of the tablespaces that should be used for
+ * temporary files.  Return the number that were copied into the output array.
+ */
+int
+GetTempTablespaces(Oid *tableSpaces, int numSpaces)
+{
+	int			i;
+
+	Assert(TempTablespacesAreSet());
+	for (i = 0; i < numTempTableSpaces && i < numSpaces; ++i)
+		tableSpaces[i] = tempTableSpaces[i];
+
+	return i;
+}
+
 /*
  * GetNextTempTableSpace
  *
@@ -2658,7 +2961,8 @@ CleanupTempFiles(bool isProcExit)
 		{
 			unsigned short fdstate = VfdCache[i].fdstate;
 
-			if ((fdstate & FD_TEMPORARY) && VfdCache[i].fileName != NULL)
+			if (((fdstate & FD_DELETE_AT_CLOSE) || (fdstate & FD_CLOSE_AT_EOXACT)) &&
+				VfdCache[i].fileName != NULL)
 			{
 				/*
 				 * If we're in the process of exiting a backend process, close
@@ -2669,7 +2973,7 @@ CleanupTempFiles(bool isProcExit)
 				 */
 				if (isProcExit)
 					FileClose(i);
-				else if (fdstate & FD_XACT_TEMPORARY)
+				else if (fdstate & FD_CLOSE_AT_EOXACT)
 				{
 					elog(WARNING,
 						 "temporary file %s not closed at end-of-transaction",
@@ -2701,6 +3005,10 @@ CleanupTempFiles(bool isProcExit)
  * the temp files for debugging purposes.  This does however mean that
  * OpenTemporaryFile had better allow for collision with an existing temp
  * file name.
+ *
+ * NOTE: this function and its subroutines generally report syscall failures
+ * with ereport(LOG) and keep going.  Removing temp files is not so critical
+ * that we should fail to start the database when we can't do it.
  */
 void
 RemovePgTempFiles(void)
@@ -2713,7 +3021,7 @@ RemovePgTempFiles(void)
 	 * First process temp files in pg_default ($PGDATA/base)
 	 */
 	snprintf(temp_path, sizeof(temp_path), "base/%s", PG_TEMP_FILES_DIR);
-	RemovePgTempFilesInDir(temp_path);
+	RemovePgTempFilesInDir(temp_path, true, false);
 	RemovePgTempRelationFiles("base");
 
 	/*
@@ -2721,7 +3029,7 @@ RemovePgTempFiles(void)
 	 */
 	spc_dir = AllocateDir("pg_tblspc");
 
-	while ((spc_de = ReadDir(spc_dir, "pg_tblspc")) != NULL)
+	while ((spc_de = ReadDirExtended(spc_dir, "pg_tblspc", LOG)) != NULL)
 	{
 		if (strcmp(spc_de->d_name, ".") == 0 ||
 			strcmp(spc_de->d_name, "..") == 0)
@@ -2729,7 +3037,7 @@ RemovePgTempFiles(void)
 
 		snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s/%s",
 				 spc_de->d_name, TABLESPACE_VERSION_DIRECTORY, PG_TEMP_FILES_DIR);
-		RemovePgTempFilesInDir(temp_path);
+		RemovePgTempFilesInDir(temp_path, true, false);
 
 		snprintf(temp_path, sizeof(temp_path), "pg_tblspc/%s/%s",
 				 spc_de->d_name, TABLESPACE_VERSION_DIRECTORY);
@@ -2743,30 +3051,38 @@ RemovePgTempFiles(void)
 	 * DataDir as well.
 	 */
 #ifdef EXEC_BACKEND
-	RemovePgTempFilesInDir(PG_TEMP_FILES_DIR);
+	RemovePgTempFilesInDir(PG_TEMP_FILES_DIR, true, false);
 #endif
 }
 
-/* Process one pgsql_tmp directory for RemovePgTempFiles */
+/*
+ * Process one pgsql_tmp directory for RemovePgTempFiles.
+ *
+ * If missing_ok is true, it's all right for the named directory to not exist.
+ * Any other problem results in a LOG message.  (missing_ok should be true at
+ * the top level, since pgsql_tmp directories are not created until needed.)
+ *
+ * At the top level, this should be called with unlink_all = false, so that
+ * only files matching the temporary name prefix will be unlinked.  When
+ * recursing it will be called with unlink_all = true to unlink everything
+ * under a top-level temporary directory.
+ *
+ * (These two flags could be replaced by one, but it seems clearer to keep
+ * them separate.)
+ */
 static void
-RemovePgTempFilesInDir(const char *tmpdirname)
+RemovePgTempFilesInDir(const char *tmpdirname, bool missing_ok, bool unlink_all)
 {
 	DIR		   *temp_dir;
 	struct dirent *temp_de;
 	char		rm_path[MAXPGPATH * 2];
 
 	temp_dir = AllocateDir(tmpdirname);
-	if (temp_dir == NULL)
-	{
-		/* anything except ENOENT is fishy */
-		if (errno != ENOENT)
-			elog(LOG,
-				 "could not open temporary-files directory \"%s\": %m",
-				 tmpdirname);
+
+	if (temp_dir == NULL && errno == ENOENT && missing_ok)
 		return;
-	}
 
-	while ((temp_de = ReadDir(temp_dir, tmpdirname)) != NULL)
+	while ((temp_de = ReadDirExtended(temp_dir, tmpdirname, LOG)) != NULL)
 	{
 		if (strcmp(temp_de->d_name, ".") == 0 ||
 			strcmp(temp_de->d_name, "..") == 0)
@@ -2775,14 +3091,45 @@ RemovePgTempFilesInDir(const char *tmpdirname)
 		snprintf(rm_path, sizeof(rm_path), "%s/%s",
 				 tmpdirname, temp_de->d_name);
 
-		if (strncmp(temp_de->d_name,
+		if (unlink_all ||
+			strncmp(temp_de->d_name,
 					PG_TEMP_FILE_PREFIX,
 					strlen(PG_TEMP_FILE_PREFIX)) == 0)
-			unlink(rm_path);	/* note we ignore any error */
+		{
+			struct stat statbuf;
+
+			if (lstat(rm_path, &statbuf) < 0)
+			{
+				ereport(LOG,
+						(errcode_for_file_access(),
+						 errmsg("could not stat file \"%s\": %m", rm_path)));
+				continue;
+			}
+
+			if (S_ISDIR(statbuf.st_mode))
+			{
+				/* recursively remove contents, then directory itself */
+				RemovePgTempFilesInDir(rm_path, false, true);
+
+				if (rmdir(rm_path) < 0)
+					ereport(LOG,
+							(errcode_for_file_access(),
+							 errmsg("could not remove directory \"%s\": %m",
+									rm_path)));
+			}
+			else
+			{
+				if (unlink(rm_path) < 0)
+					ereport(LOG,
+							(errcode_for_file_access(),
+							 errmsg("could not remove file \"%s\": %m",
+									rm_path)));
+			}
+		}
 		else
-			elog(LOG,
-				 "unexpected file found in temporary-files directory: \"%s\"",
-				 rm_path);
+			ereport(LOG,
+					(errmsg("unexpected file found in temporary-files directory: \"%s\"",
+							rm_path)));
 	}
 
 	FreeDir(temp_dir);
@@ -2797,28 +3144,15 @@ RemovePgTempRelationFiles(const char *tsdirname)
 	char		dbspace_path[MAXPGPATH * 2];
 
 	ts_dir = AllocateDir(tsdirname);
-	if (ts_dir == NULL)
-	{
-		/* anything except ENOENT is fishy */
-		if (errno != ENOENT)
-			elog(LOG,
-				 "could not open tablespace directory \"%s\": %m",
-				 tsdirname);
-		return;
-	}
 
-	while ((de = ReadDir(ts_dir, tsdirname)) != NULL)
+	while ((de = ReadDirExtended(ts_dir, tsdirname, LOG)) != NULL)
 	{
-		int			i = 0;
-
 		/*
 		 * We're only interested in the per-database directories, which have
 		 * numeric names.  Note that this code will also (properly) ignore "."
 		 * and "..".
 		 */
-		while (isdigit((unsigned char) de->d_name[i]))
-			++i;
-		if (de->d_name[i] != '\0' || i == 0)
+		if (strspn(de->d_name, "0123456789") != strlen(de->d_name))
 			continue;
 
 		snprintf(dbspace_path, sizeof(dbspace_path), "%s/%s",
@@ -2838,16 +3172,8 @@ RemovePgTempRelationFilesInDbspace(const char *dbspacedirname)
 	char		rm_path[MAXPGPATH * 2];
 
 	dbspace_dir = AllocateDir(dbspacedirname);
-	if (dbspace_dir == NULL)
-	{
-		/* we just saw this directory, so it really ought to be there */
-		elog(LOG,
-			 "could not open dbspace directory \"%s\": %m",
-			 dbspacedirname);
-		return;
-	}
 
-	while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
+	while ((de = ReadDirExtended(dbspace_dir, dbspacedirname, LOG)) != NULL)
 	{
 		if (!looks_like_temp_rel_name(de->d_name))
 			continue;
@@ -2855,7 +3181,11 @@ RemovePgTempRelationFilesInDbspace(const char *dbspacedirname)
 		snprintf(rm_path, sizeof(rm_path), "%s/%s",
 				 dbspacedirname, de->d_name);
 
-		unlink(rm_path);		/* note we ignore any error */
+		if (unlink(rm_path) < 0)
+			ereport(LOG,
+					(errcode_for_file_access(),
+					 errmsg("could not remove file \"%s\": %m",
+							rm_path)));
 	}
 
 	FreeDir(dbspace_dir);
@@ -3012,13 +3342,6 @@ walkdir(const char *path,
 	struct dirent *de;
 
 	dir = AllocateDir(path);
-	if (dir == NULL)
-	{
-		ereport(elevel,
-				(errcode_for_file_access(),
-				 errmsg("could not open directory \"%s\": %m", path)));
-		return;
-	}
 
 	while ((de = ReadDirExtended(dir, path, elevel)) != NULL)
 	{
@@ -3058,9 +3381,11 @@ walkdir(const char *path,
 	/*
 	 * It's important to fsync the destination directory itself as individual
 	 * file fsyncs don't guarantee that the directory entry for the file is
-	 * synced.
+	 * synced.  However, skip this if AllocateDir failed; the action function
+	 * might not be robust against that.
 	 */
-	(*action) (path, true, elevel);
+	if (dir)
+		(*action) (path, true, elevel);
 }
 
 
@@ -3081,7 +3406,7 @@ pre_sync_fname(const char *fname, bool isdir, int elevel)
 	if (isdir)
 		return;
 
-	fd = OpenTransientFile((char *) fname, O_RDONLY | PG_BINARY, 0);
+	fd = OpenTransientFile(fname, O_RDONLY | PG_BINARY);
 
 	if (fd < 0)
 	{
@@ -3114,6 +3439,23 @@ datadir_fsync_fname(const char *fname, bool isdir, int elevel)
 	fsync_fname_ext(fname, isdir, true, elevel);
 }
 
+static void
+unlink_if_exists_fname(const char *fname, bool isdir, int elevel)
+{
+	if (isdir)
+	{
+		if (rmdir(fname) != 0 && errno != ENOENT)
+			ereport(elevel,
+					(errcode_for_file_access(),
+					 errmsg("could not rmdir directory \"%s\": %m", fname)));
+	}
+	else
+	{
+		/* Use PathNameDeleteTemporaryFile to report filesize */
+		PathNameDeleteTemporaryFile(fname, false);
+	}
+}
+
 /*
  * fsync_fname_ext -- Try to fsync a file or directory
  *
@@ -3141,7 +3483,7 @@ fsync_fname_ext(const char *fname, bool isdir, bool ignore_perm, int elevel)
 	else
 		flags |= O_RDONLY;
 
-	fd = OpenTransientFile((char *) fname, flags, 0);
+	fd = OpenTransientFile(fname, flags);
 
 	/*
 	 * Some OSs don't allow us to open directories at all (Windows returns
diff --git a/src/backend/storage/file/reinit.c b/src/backend/storage/file/reinit.c
index f331e7bc21..92363ae6ad 100644
--- a/src/backend/storage/file/reinit.c
+++ b/src/backend/storage/file/reinit.c
@@ -3,7 +3,7 @@
  * reinit.c
  *	  Reinitialization of unlogged relations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -98,7 +98,9 @@ ResetUnloggedRelations(int op)
 	MemoryContextDelete(tmpctx);
 }
 
-/* Process one tablespace directory for ResetUnloggedRelations */
+/*
+ * Process one tablespace directory for ResetUnloggedRelations
+ */
 static void
 ResetUnloggedRelationsInTablespaceDir(const char *tsdirname, int op)
 {
@@ -107,28 +109,32 @@ ResetUnloggedRelationsInTablespaceDir(const char *tsdirname, int op)
 	char		dbspace_path[MAXPGPATH * 2];
 
 	ts_dir = AllocateDir(tsdirname);
-	if (ts_dir == NULL)
+
+	/*
+	 * If we get ENOENT on a tablespace directory, log it and return.  This
+	 * can happen if a previous DROP TABLESPACE crashed between removing the
+	 * tablespace directory and removing the symlink in pg_tblspc.  We don't
+	 * really want to prevent database startup in that scenario, so let it
+	 * pass instead.  Any other type of error will be reported by ReadDir
+	 * (causing a startup failure).
+	 */
+	if (ts_dir == NULL && errno == ENOENT)
 	{
-		/* anything except ENOENT is fishy */
-		if (errno != ENOENT)
-			elog(LOG,
-				 "could not open tablespace directory \"%s\": %m",
-				 tsdirname);
+		ereport(LOG,
+				(errcode_for_file_access(),
+				 errmsg("could not open directory \"%s\": %m",
+						tsdirname)));
 		return;
 	}
 
 	while ((de = ReadDir(ts_dir, tsdirname)) != NULL)
 	{
-		int			i = 0;
-
 		/*
 		 * We're only interested in the per-database directories, which have
 		 * numeric names.  Note that this code will also (properly) ignore "."
 		 * and "..".
 		 */
-		while (isdigit((unsigned char) de->d_name[i]))
-			++i;
-		if (de->d_name[i] != '\0' || i == 0)
+		if (strspn(de->d_name, "0123456789") != strlen(de->d_name))
 			continue;
 
 		snprintf(dbspace_path, sizeof(dbspace_path), "%s/%s",
@@ -139,7 +145,9 @@ ResetUnloggedRelationsInTablespaceDir(const char *tsdirname, int op)
 	FreeDir(ts_dir);
 }
 
-/* Process one per-dbspace directory for ResetUnloggedRelations */
+/*
+ * Process one per-dbspace directory for ResetUnloggedRelations
+ */
 static void
 ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 {
@@ -157,19 +165,9 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 	 */
 	if ((op & UNLOGGED_RELATION_CLEANUP) != 0)
 	{
-		HTAB	   *hash = NULL;
+		HTAB	   *hash;
 		HASHCTL		ctl;
 
-		/* Open the directory. */
-		dbspace_dir = AllocateDir(dbspacedirname);
-		if (dbspace_dir == NULL)
-		{
-			elog(LOG,
-				 "could not open dbspace directory \"%s\": %m",
-				 dbspacedirname);
-			return;
-		}
-
 		/*
 		 * It's possible that someone could create a ton of unlogged relations
 		 * in the same database & tablespace, so we'd better use a hash table
@@ -177,11 +175,13 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 		 * need to be reset.  Otherwise, this cleanup operation would be
 		 * O(n^2).
 		 */
+		memset(&ctl, 0, sizeof(ctl));
 		ctl.keysize = sizeof(unlogged_relation_entry);
 		ctl.entrysize = sizeof(unlogged_relation_entry);
 		hash = hash_create("unlogged hash", 32, &ctl, HASH_ELEM);
 
 		/* Scan the directory. */
+		dbspace_dir = AllocateDir(dbspacedirname);
 		while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
 		{
 			ForkNumber	forkNum;
@@ -220,20 +220,9 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 		}
 
 		/*
-		 * Now, make a second pass and remove anything that matches. First,
-		 * reopen the directory.
+		 * Now, make a second pass and remove anything that matches.
 		 */
 		dbspace_dir = AllocateDir(dbspacedirname);
-		if (dbspace_dir == NULL)
-		{
-			elog(LOG,
-				 "could not open dbspace directory \"%s\": %m",
-				 dbspacedirname);
-			hash_destroy(hash);
-			return;
-		}
-
-		/* Scan the directory. */
 		while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
 		{
 			ForkNumber	forkNum;
@@ -263,15 +252,11 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 			{
 				snprintf(rm_path, sizeof(rm_path), "%s/%s",
 						 dbspacedirname, de->d_name);
-
-				/*
-				 * It's tempting to actually throw an error here, but since
-				 * this code gets run during database startup, that could
-				 * result in the database failing to start.  (XXX Should we do
-				 * it anyway?)
-				 */
-				if (unlink(rm_path))
-					elog(LOG, "could not unlink file \"%s\": %m", rm_path);
+				if (unlink(rm_path) < 0)
+					ereport(ERROR,
+							(errcode_for_file_access(),
+							 errmsg("could not remove file \"%s\": %m",
+									rm_path)));
 				else
 					elog(DEBUG2, "unlinked file \"%s\"", rm_path);
 			}
@@ -291,18 +276,8 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 	 */
 	if ((op & UNLOGGED_RELATION_INIT) != 0)
 	{
-		/* Open the directory. */
-		dbspace_dir = AllocateDir(dbspacedirname);
-		if (dbspace_dir == NULL)
-		{
-			/* we just saw this directory, so it really ought to be there */
-			elog(LOG,
-				 "could not open dbspace directory \"%s\": %m",
-				 dbspacedirname);
-			return;
-		}
-
 		/* Scan the directory. */
+		dbspace_dir = AllocateDir(dbspacedirname);
 		while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
 		{
 			ForkNumber	forkNum;
@@ -346,15 +321,6 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 		 * (especially the metadata ones) at once.
 		 */
 		dbspace_dir = AllocateDir(dbspacedirname);
-		if (dbspace_dir == NULL)
-		{
-			/* we just saw this directory, so it really ought to be there */
-			elog(LOG,
-				 "could not open dbspace directory \"%s\": %m",
-				 dbspacedirname);
-			return;
-		}
-
 		while ((de = ReadDir(dbspace_dir, dbspacedirname)) != NULL)
 		{
 			ForkNumber	forkNum;
@@ -383,6 +349,14 @@ ResetUnloggedRelationsInDbspaceDir(const char *dbspacedirname, int op)
 
 		FreeDir(dbspace_dir);
 
+		/*
+		 * Lastly, fsync the database directory itself, ensuring the
+		 * filesystem remembers the file creations and deletions we've done.
+		 * We don't bother with this during a call that does only
+		 * UNLOGGED_RELATION_CLEANUP, because if recovery crashes before we
+		 * get to doing UNLOGGED_RELATION_INIT, we'll redo the cleanup step
+		 * too at the next startup attempt.
+		 */
 		fsync_fname(dbspacedirname, true);
 	}
 }
diff --git a/src/backend/storage/file/sharedfileset.c b/src/backend/storage/file/sharedfileset.c
new file mode 100644
index 0000000000..0ac8696536
--- /dev/null
+++ b/src/backend/storage/file/sharedfileset.c
@@ -0,0 +1,244 @@
+/*-------------------------------------------------------------------------
+ *
+ * sharedfileset.c
+ *	  Shared temporary file management.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/storage/file/sharedfileset.c
+ *
+ * SharefFileSets provide a temporary namespace (think directory) so that
+ * files can be discovered by name, and a shared ownership semantics so that
+ * shared files survive until the last user detaches.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/hash.h"
+#include "catalog/pg_tablespace.h"
+#include "commands/tablespace.h"
+#include "miscadmin.h"
+#include "storage/dsm.h"
+#include "storage/sharedfileset.h"
+#include "utils/builtins.h"
+
+static void SharedFileSetOnDetach(dsm_segment *segment, Datum datum);
+static void SharedFileSetPath(char *path, SharedFileSet *fileset, Oid tablespace);
+static void SharedFilePath(char *path, SharedFileSet *fileset, const char *name);
+static Oid	ChooseTablespace(const SharedFileSet *fileset, const char *name);
+
+/*
+ * Initialize a space for temporary files that can be opened for read-only
+ * access by other backends.  Other backends must attach to it before
+ * accessing it.  Associate this SharedFileSet with 'seg'.  Any contained
+ * files will be deleted when the last backend detaches.
+ *
+ * Files will be distributed over the tablespaces configured in
+ * temp_tablespaces.
+ *
+ * Under the covers the set is one or more directories which will eventually
+ * be deleted when there are no backends attached.
+ */
+void
+SharedFileSetInit(SharedFileSet *fileset, dsm_segment *seg)
+{
+	static uint32 counter = 0;
+
+	SpinLockInit(&fileset->mutex);
+	fileset->refcnt = 1;
+	fileset->creator_pid = MyProcPid;
+	fileset->number = counter;
+	counter = (counter + 1) % INT_MAX;
+
+	/* Capture the tablespace OIDs so that all backends agree on them. */
+	PrepareTempTablespaces();
+	fileset->ntablespaces =
+		GetTempTablespaces(&fileset->tablespaces[0],
+						   lengthof(fileset->tablespaces));
+	if (fileset->ntablespaces == 0)
+	{
+		fileset->tablespaces[0] = DEFAULTTABLESPACE_OID;
+		fileset->ntablespaces = 1;
+	}
+
+	/* Register our cleanup callback. */
+	on_dsm_detach(seg, SharedFileSetOnDetach, PointerGetDatum(fileset));
+}
+
+/*
+ * Attach to a set of directories that was created with SharedFileSetInit.
+ */
+void
+SharedFileSetAttach(SharedFileSet *fileset, dsm_segment *seg)
+{
+	bool		success;
+
+	SpinLockAcquire(&fileset->mutex);
+	if (fileset->refcnt == 0)
+		success = false;
+	else
+	{
+		++fileset->refcnt;
+		success = true;
+	}
+	SpinLockRelease(&fileset->mutex);
+
+	if (!success)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("could not attach to a SharedFileSet that is already destroyed")));
+
+	/* Register our cleanup callback. */
+	on_dsm_detach(seg, SharedFileSetOnDetach, PointerGetDatum(fileset));
+}
+
+/*
+ * Create a new file in the given set.
+ */
+File
+SharedFileSetCreate(SharedFileSet *fileset, const char *name)
+{
+	char		path[MAXPGPATH];
+	File		file;
+
+	SharedFilePath(path, fileset, name);
+	file = PathNameCreateTemporaryFile(path, false);
+
+	/* If we failed, see if we need to create the directory on demand. */
+	if (file <= 0)
+	{
+		char		tempdirpath[MAXPGPATH];
+		char		filesetpath[MAXPGPATH];
+		Oid			tablespace = ChooseTablespace(fileset, name);
+
+		TempTablespacePath(tempdirpath, tablespace);
+		SharedFileSetPath(filesetpath, fileset, tablespace);
+		PathNameCreateTemporaryDir(tempdirpath, filesetpath);
+		file = PathNameCreateTemporaryFile(path, true);
+	}
+
+	return file;
+}
+
+/*
+ * Open a file that was created with SharedFileSetCreate(), possibly in
+ * another backend.
+ */
+File
+SharedFileSetOpen(SharedFileSet *fileset, const char *name)
+{
+	char		path[MAXPGPATH];
+	File		file;
+
+	SharedFilePath(path, fileset, name);
+	file = PathNameOpenTemporaryFile(path);
+
+	return file;
+}
+
+/*
+ * Delete a file that was created with PathNameCreateShared().
+ * Return true if the file existed, false if didn't.
+ */
+bool
+SharedFileSetDelete(SharedFileSet *fileset, const char *name,
+					bool error_on_failure)
+{
+	char		path[MAXPGPATH];
+
+	SharedFilePath(path, fileset, name);
+
+	return PathNameDeleteTemporaryFile(path, error_on_failure);
+}
+
+/*
+ * Delete all files in the set.
+ */
+void
+SharedFileSetDeleteAll(SharedFileSet *fileset)
+{
+	char		dirpath[MAXPGPATH];
+	int			i;
+
+	/*
+	 * Delete the directory we created in each tablespace.  Doesn't fail
+	 * because we use this in error cleanup paths, but can generate LOG
+	 * message on IO error.
+	 */
+	for (i = 0; i < fileset->ntablespaces; ++i)
+	{
+		SharedFileSetPath(dirpath, fileset, fileset->tablespaces[i]);
+		PathNameDeleteTemporaryDir(dirpath);
+	}
+}
+
+/*
+ * Callback function that will be invoked when this backend detaches from a
+ * DSM segment holding a SharedFileSet that it has created or attached to.  If
+ * we are the last to detach, then try to remove the directories and
+ * everything in them.  We can't raise an error on failures, because this runs
+ * in error cleanup paths.
+ */
+static void
+SharedFileSetOnDetach(dsm_segment *segment, Datum datum)
+{
+	bool		unlink_all = false;
+	SharedFileSet *fileset = (SharedFileSet *) DatumGetPointer(datum);
+
+	SpinLockAcquire(&fileset->mutex);
+	Assert(fileset->refcnt > 0);
+	if (--fileset->refcnt == 0)
+		unlink_all = true;
+	SpinLockRelease(&fileset->mutex);
+
+	/*
+	 * If we are the last to detach, we delete the directory in all
+	 * tablespaces.  Note that we are still actually attached for the rest of
+	 * this function so we can safely access its data.
+	 */
+	if (unlink_all)
+		SharedFileSetDeleteAll(fileset);
+}
+
+/*
+ * Build the path for the directory holding the files backing a SharedFileSet
+ * in a given tablespace.
+ */
+static void
+SharedFileSetPath(char *path, SharedFileSet *fileset, Oid tablespace)
+{
+	char		tempdirpath[MAXPGPATH];
+
+	TempTablespacePath(tempdirpath, tablespace);
+	snprintf(path, MAXPGPATH, "%s/%s%d.%u.sharedfileset",
+			 tempdirpath, PG_TEMP_FILE_PREFIX,
+			 fileset->creator_pid, fileset->number);
+}
+
+/*
+ * Sorting hat to determine which tablespace a given shared temporary file
+ * belongs in.
+ */
+static Oid
+ChooseTablespace(const SharedFileSet *fileset, const char *name)
+{
+	uint32		hash = hash_any((const unsigned char *) name, strlen(name));
+
+	return fileset->tablespaces[hash % fileset->ntablespaces];
+}
+
+/*
+ * Compute the full path of a file in a SharedFileSet.
+ */
+static void
+SharedFilePath(char *path, SharedFileSet *fileset, const char *name)
+{
+	char		dirpath[MAXPGPATH];
+
+	SharedFileSetPath(dirpath, fileset, ChooseTablespace(fileset, name));
+	snprintf(path, MAXPGPATH, "%s/%s", dirpath, name);
+}
diff --git a/src/backend/storage/freespace/freespace.c b/src/backend/storage/freespace/freespace.c
index 4648473523..dd8ae52644 100644
--- a/src/backend/storage/freespace/freespace.c
+++ b/src/backend/storage/freespace/freespace.c
@@ -4,7 +4,7 @@
  *	  POSTGRES free space map for quickly finding free space in relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/freespace/fsmpage.c b/src/backend/storage/freespace/fsmpage.c
index 987a2f5e53..2b382417c5 100644
--- a/src/backend/storage/freespace/fsmpage.c
+++ b/src/backend/storage/freespace/fsmpage.c
@@ -4,7 +4,7 @@
  *	  routines to search and manipulate one FSM page.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/freespace/indexfsm.c b/src/backend/storage/freespace/indexfsm.c
index 5cfbd4c867..e21047b96f 100644
--- a/src/backend/storage/freespace/indexfsm.c
+++ b/src/backend/storage/freespace/indexfsm.c
@@ -4,7 +4,7 @@
  *	  POSTGRES free space map for quickly finding free pages in relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/Makefile b/src/backend/storage/ipc/Makefile
index 8a55392ade..9dbdc26c9b 100644
--- a/src/backend/storage/ipc/Makefile
+++ b/src/backend/storage/ipc/Makefile
@@ -8,7 +8,7 @@ subdir = src/backend/storage/ipc
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \
+OBJS = barrier.o dsm_impl.o dsm.o ipc.o ipci.o latch.o pmsignal.o procarray.o \
 	procsignal.o  shmem.o shmqueue.o shm_mq.o shm_toc.o sinval.o \
 	sinvaladt.o standby.o
 
diff --git a/src/backend/storage/ipc/barrier.c b/src/backend/storage/ipc/barrier.c
new file mode 100644
index 0000000000..00ab57c0f6
--- /dev/null
+++ b/src/backend/storage/ipc/barrier.c
@@ -0,0 +1,311 @@
+/*-------------------------------------------------------------------------
+ *
+ * barrier.c
+ *	  Barriers for synchronizing cooperating processes.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * From Wikipedia[1]: "In parallel computing, a barrier is a type of
+ * synchronization method.  A barrier for a group of threads or processes in
+ * the source code means any thread/process must stop at this point and cannot
+ * proceed until all other threads/processes reach this barrier."
+ *
+ * This implementation of barriers allows for static sets of participants
+ * known up front, or dynamic sets of participants which processes can join or
+ * leave at any time.  In the dynamic case, a phase number can be used to
+ * track progress through a parallel algorithm, and may be necessary to
+ * synchronize with the current phase of a multi-phase algorithm when a new
+ * participant joins.  In the static case, the phase number is used
+ * internally, but it isn't strictly necessary for client code to access it
+ * because the phase can only advance when the declared number of participants
+ * reaches the barrier, so client code should be in no doubt about the current
+ * phase of computation at all times.
+ *
+ * Consider a parallel algorithm that involves separate phases of computation
+ * A, B and C where the output of each phase is needed before the next phase
+ * can begin.
+ *
+ * In the case of a static barrier initialized with 4 participants, each
+ * participant works on phase A, then calls BarrierArriveAndWait to wait until
+ * all 4 participants have reached that point.  When BarrierArriveAndWait
+ * returns control, each participant can work on B, and so on.  Because the
+ * barrier knows how many participants to expect, the phases of computation
+ * don't need labels or numbers, since each process's program counter implies
+ * the current phase.  Even if some of the processes are slow to start up and
+ * begin running phase A, the other participants are expecting them and will
+ * patiently wait at the barrier.  The code could be written as follows:
+ *
+ *     perform_a();
+ *     BarrierArriveAndWait(&barrier, ...);
+ *     perform_b();
+ *     BarrierArriveAndWait(&barrier, ...);
+ *     perform_c();
+ *     BarrierArriveAndWait(&barrier, ...);
+ *
+ * If the number of participants is not known up front, then a dynamic barrier
+ * is needed and the number should be set to zero at initialization.  New
+ * complications arise because the number necessarily changes over time as
+ * participants attach and detach, and therefore phases B, C or even the end
+ * of processing may be reached before any given participant has started
+ * running and attached.  Therefore the client code must perform an initial
+ * test of the phase number after attaching, because it needs to find out
+ * which phase of the algorithm has been reached by any participants that are
+ * already attached in order to synchronize with that work.  Once the program
+ * counter or some other representation of current progress is synchronized
+ * with the barrier's phase, normal control flow can be used just as in the
+ * static case.  Our example could be written using a switch statement with
+ * cases that fall-through, as follows:
+ *
+ *     phase = BarrierAttach(&barrier);
+ *     switch (phase)
+ *     {
+ *     case PHASE_A:
+ *         perform_a();
+ *         BarrierArriveAndWait(&barrier, ...);
+ *     case PHASE_B:
+ *         perform_b();
+ *         BarrierArriveAndWait(&barrier, ...);
+ *     case PHASE_C:
+ *         perform_c();
+ *         BarrierArriveAndWait(&barrier, ...);
+ *     }
+ *     BarrierDetach(&barrier);
+ *
+ * Static barriers behave similarly to POSIX's pthread_barrier_t.  Dynamic
+ * barriers behave similarly to Java's java.util.concurrent.Phaser.
+ *
+ * [1] https://en.wikipedia.org/wiki/Barrier_(computer_science)
+ *
+ * IDENTIFICATION
+ *	  src/backend/storage/ipc/barrier.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+#include "storage/barrier.h"
+
+static inline bool BarrierDetachImpl(Barrier *barrier, bool arrive);
+
+/*
+ * Initialize this barrier.  To use a static party size, provide the number of
+ * participants to wait for at each phase indicating that that number of
+ * backends is implicitly attached.  To use a dynamic party size, specify zero
+ * here and then use BarrierAttach() and
+ * BarrierDetach()/BarrierArriveAndDetach() to register and deregister
+ * participants explicitly.
+ */
+void
+BarrierInit(Barrier *barrier, int participants)
+{
+	SpinLockInit(&barrier->mutex);
+	barrier->participants = participants;
+	barrier->arrived = 0;
+	barrier->phase = 0;
+	barrier->elected = 0;
+	barrier->static_party = participants > 0;
+	ConditionVariableInit(&barrier->condition_variable);
+}
+
+/*
+ * Arrive at this barrier, wait for all other attached participants to arrive
+ * too and then return.  Increments the current phase.  The caller must be
+ * attached.
+ *
+ * While waiting, pg_stat_activity shows a wait_event_class and wait_event
+ * controlled by the wait_event_info passed in, which should be a value from
+ * from one of the WaitEventXXX enums defined in pgstat.h.
+ *
+ * Return true in one arbitrarily chosen participant.  Return false in all
+ * others.  The return code can be used to elect one participant to execute a
+ * phase of work that must be done serially while other participants wait.
+ */
+bool
+BarrierArriveAndWait(Barrier *barrier, uint32 wait_event_info)
+{
+	bool		release = false;
+	bool		elected;
+	int			start_phase;
+	int			next_phase;
+
+	SpinLockAcquire(&barrier->mutex);
+	start_phase = barrier->phase;
+	next_phase = start_phase + 1;
+	++barrier->arrived;
+	if (barrier->arrived == barrier->participants)
+	{
+		release = true;
+		barrier->arrived = 0;
+		barrier->phase = next_phase;
+		barrier->elected = next_phase;
+	}
+	SpinLockRelease(&barrier->mutex);
+
+	/*
+	 * If we were the last expected participant to arrive, we can release our
+	 * peers and return true to indicate that this backend has been elected to
+	 * perform any serial work.
+	 */
+	if (release)
+	{
+		ConditionVariableBroadcast(&barrier->condition_variable);
+
+		return true;
+	}
+
+	/*
+	 * Otherwise we have to wait for the last participant to arrive and
+	 * advance the phase.
+	 */
+	elected = false;
+	ConditionVariablePrepareToSleep(&barrier->condition_variable);
+	for (;;)
+	{
+		/*
+		 * We know that phase must either be start_phase, indicating that we
+		 * need to keep waiting, or next_phase, indicating that the last
+		 * participant that we were waiting for has either arrived or detached
+		 * so that the next phase has begun.  The phase cannot advance any
+		 * further than that without this backend's participation, because
+		 * this backend is attached.
+		 */
+		SpinLockAcquire(&barrier->mutex);
+		Assert(barrier->phase == start_phase || barrier->phase == next_phase);
+		release = barrier->phase == next_phase;
+		if (release && barrier->elected != next_phase)
+		{
+			/*
+			 * Usually the backend that arrives last and releases the other
+			 * backends is elected to return true (see above), so that it can
+			 * begin processing serial work while it has a CPU timeslice.
+			 * However, if the barrier advanced because someone detached, then
+			 * one of the backends that is awoken will need to be elected.
+			 */
+			barrier->elected = barrier->phase;
+			elected = true;
+		}
+		SpinLockRelease(&barrier->mutex);
+		if (release)
+			break;
+		ConditionVariableSleep(&barrier->condition_variable, wait_event_info);
+	}
+	ConditionVariableCancelSleep();
+
+	return elected;
+}
+
+/*
+ * Arrive at this barrier, but detach rather than waiting.  Returns true if
+ * the caller was the last to detach.
+ */
+bool
+BarrierArriveAndDetach(Barrier *barrier)
+{
+	return BarrierDetachImpl(barrier, true);
+}
+
+/*
+ * Attach to a barrier.  All waiting participants will now wait for this
+ * participant to call BarrierArriveAndWait(), BarrierDetach() or
+ * BarrierArriveAndDetach().  Return the current phase.
+ */
+int
+BarrierAttach(Barrier *barrier)
+{
+	int			phase;
+
+	Assert(!barrier->static_party);
+
+	SpinLockAcquire(&barrier->mutex);
+	++barrier->participants;
+	phase = barrier->phase;
+	SpinLockRelease(&barrier->mutex);
+
+	return phase;
+}
+
+/*
+ * Detach from a barrier.  This may release other waiters from BarrierWait and
+ * advance the phase if they were only waiting for this backend.  Return true
+ * if this participant was the last to detach.
+ */
+bool
+BarrierDetach(Barrier *barrier)
+{
+	return BarrierDetachImpl(barrier, false);
+}
+
+/*
+ * Return the current phase of a barrier.  The caller must be attached.
+ */
+int
+BarrierPhase(Barrier *barrier)
+{
+	/*
+	 * It is OK to read barrier->phase without locking, because it can't
+	 * change without us (we are attached to it), and we executed a memory
+	 * barrier when we either attached or participated in changing it last
+	 * time.
+	 */
+	return barrier->phase;
+}
+
+/*
+ * Return an instantaneous snapshot of the number of participants currently
+ * attached to this barrier.  For debugging purposes only.
+ */
+int
+BarrierParticipants(Barrier *barrier)
+{
+	int			participants;
+
+	SpinLockAcquire(&barrier->mutex);
+	participants = barrier->participants;
+	SpinLockRelease(&barrier->mutex);
+
+	return participants;
+}
+
+/*
+ * Detach from a barrier.  If 'arrive' is true then also increment the phase
+ * if there are no other participants.  If there are other participants
+ * waiting, then the phase will be advanced and they'll be released if they
+ * were only waiting for the caller.  Return true if this participant was the
+ * last to detach.
+ */
+static inline bool
+BarrierDetachImpl(Barrier *barrier, bool arrive)
+{
+	bool		release;
+	bool		last;
+
+	Assert(!barrier->static_party);
+
+	SpinLockAcquire(&barrier->mutex);
+	Assert(barrier->participants > 0);
+	--barrier->participants;
+
+	/*
+	 * If any other participants are waiting and we were the last participant
+	 * waited for, release them.  If no other participants are waiting, but
+	 * this is a BarrierArriveAndDetach() call, then advance the phase too.
+	 */
+	if ((arrive || barrier->participants > 0) &&
+		barrier->arrived == barrier->participants)
+	{
+		release = true;
+		barrier->arrived = 0;
+		++barrier->phase;
+	}
+	else
+		release = false;
+
+	last = barrier->participants == 0;
+	SpinLockRelease(&barrier->mutex);
+
+	if (release)
+		ConditionVariableBroadcast(&barrier->condition_variable);
+
+	return last;
+}
diff --git a/src/backend/storage/ipc/dsm.c b/src/backend/storage/ipc/dsm.c
index 36904d2676..f1f75b73f5 100644
--- a/src/backend/storage/ipc/dsm.c
+++ b/src/backend/storage/ipc/dsm.c
@@ -14,7 +14,7 @@
  * hard postmaster crash, remaining segments will be removed, if they
  * still exist, at the next postmaster startup.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -294,14 +294,9 @@ dsm_cleanup_for_mmap(void)
 	DIR		   *dir;
 	struct dirent *dent;
 
-	/* Open the directory; can't use AllocateDir in postmaster. */
-	if ((dir = AllocateDir(PG_DYNSHMEM_DIR)) == NULL)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open directory \"%s\": %m",
-						PG_DYNSHMEM_DIR)));
+	/* Scan the directory for something with a name of the correct format. */
+	dir = AllocateDir(PG_DYNSHMEM_DIR);
 
-	/* Scan for something with a name of the correct format. */
 	while ((dent = ReadDir(dir, PG_DYNSHMEM_DIR)) != NULL)
 	{
 		if (strncmp(dent->d_name, PG_DYNSHMEM_MMAP_FILE_PREFIX,
@@ -315,17 +310,9 @@ dsm_cleanup_for_mmap(void)
 
 			/* We found a matching file; so remove it. */
 			if (unlink(buf) != 0)
-			{
-				int			save_errno;
-
-				save_errno = errno;
-				closedir(dir);
-				errno = save_errno;
-
 				ereport(ERROR,
 						(errcode_for_file_access(),
 						 errmsg("could not remove file \"%s\": %m", buf)));
-			}
 		}
 	}
 
diff --git a/src/backend/storage/ipc/dsm_impl.c b/src/backend/storage/ipc/dsm_impl.c
index 1500465d31..67e76b98fe 100644
--- a/src/backend/storage/ipc/dsm_impl.c
+++ b/src/backend/storage/ipc/dsm_impl.c
@@ -36,7 +36,7 @@
  *
  * As ever, Windows requires its own implementation.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -73,6 +73,7 @@
 static bool dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
 			   void **impl_private, void **mapped_address,
 			   Size *mapped_size, int elevel);
+static int	dsm_impl_posix_resize(int fd, off_t size);
 #endif
 #ifdef USE_DSM_SYSV
 static bool dsm_impl_sysv(dsm_op op, dsm_handle handle, Size request_size,
@@ -319,7 +320,8 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
 		}
 		request_size = st.st_size;
 	}
-	else if (*mapped_size != request_size && ftruncate(fd, request_size))
+	else if (*mapped_size != request_size &&
+			 dsm_impl_posix_resize(fd, request_size) != 0)
 	{
 		int			save_errno;
 
@@ -392,7 +394,52 @@ dsm_impl_posix(dsm_op op, dsm_handle handle, Size request_size,
 
 	return true;
 }
-#endif
+
+/*
+ * Set the size of a virtual memory region associated with a file descriptor.
+ * If necessary, also ensure that virtual memory is actually allocated by the
+ * operating system, to avoid nasty surprises later.
+ *
+ * Returns non-zero if either truncation or allocation fails, and sets errno.
+ */
+static int
+dsm_impl_posix_resize(int fd, off_t size)
+{
+	int			rc;
+
+	/* Truncate (or extend) the file to the requested size. */
+	rc = ftruncate(fd, size);
+
+	/*
+	 * On Linux, a shm_open fd is backed by a tmpfs file.  After resizing with
+	 * ftruncate, the file may contain a hole.  Accessing memory backed by a
+	 * hole causes tmpfs to allocate pages, which fails with SIGBUS if there
+	 * is no more tmpfs space available.  So we ask tmpfs to allocate pages
+	 * here, so we can fail gracefully with ENOSPC now rather than risking
+	 * SIGBUS later.
+	 */
+#if defined(HAVE_POSIX_FALLOCATE) && defined(__linux__)
+	if (rc == 0)
+	{
+		/* We may get interrupted, if so just retry. */
+		do
+		{
+			rc = posix_fallocate(fd, 0, size);
+		} while (rc == EINTR);
+
+		/*
+		 * The caller expects errno to be set, but posix_fallocate() doesn't
+		 * set it.  Instead it returns error numbers directly.  So set errno,
+		 * even though we'll also return rc to indicate success or failure.
+		 */
+		errno = rc;
+	}
+#endif							/* HAVE_POSIX_FALLOCATE && __linux__ */
+
+	return rc;
+}
+
+#endif							/* USE_DSM_POSIX */
 
 #ifdef USE_DSM_SYSV
 /*
@@ -635,7 +682,7 @@ dsm_impl_windows(dsm_op op, dsm_handle handle, Size request_size,
 
 	/*
 	 * Handle teardown cases.  Since Windows automatically destroys the object
-	 * when no references reamin, we can treat it the same as detach.
+	 * when no references remain, we can treat it the same as detach.
 	 */
 	if (op == DSM_OP_DETACH || op == DSM_OP_DESTROY)
 	{
@@ -835,7 +882,7 @@ dsm_impl_mmap(dsm_op op, dsm_handle handle, Size request_size,
 
 	/* Create new segment or open an existing one for attach or resize. */
 	flags = O_RDWR | (op == DSM_OP_CREATE ? O_CREAT | O_EXCL : 0);
-	if ((fd = OpenTransientFile(name, flags, 0600)) == -1)
+	if ((fd = OpenTransientFile(name, flags)) == -1)
 	{
 		if (errno != EEXIST)
 			ereport(elevel,
diff --git a/src/backend/storage/ipc/ipc.c b/src/backend/storage/ipc/ipc.c
index 90dee4f51a..726db7b7f1 100644
--- a/src/backend/storage/ipc/ipc.c
+++ b/src/backend/storage/ipc/ipc.c
@@ -8,7 +8,7 @@
  * exit-time cleanup for either a postmaster or a backend.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -39,6 +39,11 @@
  */
 bool		proc_exit_inprogress = false;
 
+/*
+ * Set when shmem_exit() is in progress.
+ */
+bool		shmem_exit_inprogress = false;
+
 /*
  * This flag tracks whether we've called atexit() in the current process
  * (or in the parent postmaster).
@@ -197,8 +202,8 @@ proc_exit_prepare(int code)
 	 * possible.
 	 */
 	while (--on_proc_exit_index >= 0)
-		(*on_proc_exit_list[on_proc_exit_index].function) (code,
-														   on_proc_exit_list[on_proc_exit_index].arg);
+		on_proc_exit_list[on_proc_exit_index].function(code,
+													   on_proc_exit_list[on_proc_exit_index].arg);
 
 	on_proc_exit_index = 0;
 }
@@ -214,6 +219,8 @@ proc_exit_prepare(int code)
 void
 shmem_exit(int code)
 {
+	shmem_exit_inprogress = true;
+
 	/*
 	 * Call before_shmem_exit callbacks.
 	 *
@@ -225,8 +232,8 @@ shmem_exit(int code)
 	elog(DEBUG3, "shmem_exit(%d): %d before_shmem_exit callbacks to make",
 		 code, before_shmem_exit_index);
 	while (--before_shmem_exit_index >= 0)
-		(*before_shmem_exit_list[before_shmem_exit_index].function) (code,
-																	 before_shmem_exit_list[before_shmem_exit_index].arg);
+		before_shmem_exit_list[before_shmem_exit_index].function(code,
+																 before_shmem_exit_list[before_shmem_exit_index].arg);
 	before_shmem_exit_index = 0;
 
 	/*
@@ -258,8 +265,8 @@ shmem_exit(int code)
 	elog(DEBUG3, "shmem_exit(%d): %d on_shmem_exit callbacks to make",
 		 code, on_shmem_exit_index);
 	while (--on_shmem_exit_index >= 0)
-		(*on_shmem_exit_list[on_shmem_exit_index].function) (code,
-															 on_shmem_exit_list[on_shmem_exit_index].arg);
+		on_shmem_exit_list[on_shmem_exit_index].function(code,
+														 on_shmem_exit_list[on_shmem_exit_index].arg);
 	on_shmem_exit_index = 0;
 }
 
diff --git a/src/backend/storage/ipc/ipci.c b/src/backend/storage/ipc/ipci.c
index 2d1ed143e0..0c86a581c0 100644
--- a/src/backend/storage/ipc/ipci.c
+++ b/src/backend/storage/ipc/ipci.c
@@ -3,7 +3,7 @@
  * ipci.c
  *	  POSTGRES inter-process communication initialization code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/ipc/latch.c b/src/backend/storage/ipc/latch.c
index 4eb6e83682..e6706f7fb8 100644
--- a/src/backend/storage/ipc/latch.c
+++ b/src/backend/storage/ipc/latch.c
@@ -22,7 +22,7 @@
  * The Windows implementation uses Windows events that are inherited by all
  * postmaster child processes. There's no need for the self-pipe trick there.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/pmsignal.c b/src/backend/storage/ipc/pmsignal.c
index 85db6b21f8..be61858fc6 100644
--- a/src/backend/storage/ipc/pmsignal.c
+++ b/src/backend/storage/ipc/pmsignal.c
@@ -4,7 +4,7 @@
  *	  routines for signaling the postmaster from its child processes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/procarray.c b/src/backend/storage/ipc/procarray.c
index ffa6180eff..afe1c03aa3 100644
--- a/src/backend/storage/ipc/procarray.c
+++ b/src/backend/storage/ipc/procarray.c
@@ -32,7 +32,7 @@
  * happen, it would tie up KnownAssignedXids indefinitely, so we protect
  * ourselves by pruning the array when a valid list of running XIDs arrives.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -820,7 +820,7 @@ ProcArrayApplyRecoveryInfo(RunningTransactions running)
 
 	/*
 	 * latestObservedXid is at least set to the point where SUBTRANS was
-	 * started up to (c.f. ProcArrayInitRecovery()) or to the biggest xid
+	 * started up to (cf. ProcArrayInitRecovery()) or to the biggest xid
 	 * RecordKnownAssignedTransactionIds() was called for.  Initialize
 	 * subtrans from thereon, up to nextXid - 1.
 	 *
@@ -1791,7 +1791,7 @@ GetSnapshotData(Snapshot snapshot)
  * check that the source transaction is still running, and we'd better do
  * that atomically with installing the new xmin.
  *
- * Returns TRUE if successful, FALSE if source xact is no longer running.
+ * Returns true if successful, false if source xact is no longer running.
  */
 bool
 ProcArrayInstallImportedXmin(TransactionId xmin,
@@ -1866,7 +1866,7 @@ ProcArrayInstallImportedXmin(TransactionId xmin,
  * PGPROC of the transaction from which we imported the snapshot, rather than
  * an XID.
  *
- * Returns TRUE if successful, FALSE if source xact is no longer running.
+ * Returns true if successful, false if source xact is no longer running.
  */
 bool
 ProcArrayInstallRestoredXmin(TransactionId xmin, PGPROC *proc)
@@ -2180,7 +2180,7 @@ GetOldestSafeDecodingTransactionId(bool catalogOnly)
 	 * that value, it's guaranteed to be safe since it's computed by this
 	 * routine initially and has been enforced since.  We can always use the
 	 * slot's general xmin horizon, but the catalog horizon is only usable
-	 * when we only catalog data is going to be looked at.
+	 * when only catalog data is going to be looked at.
 	 */
 	if (TransactionIdIsValid(procArray->replication_slot_xmin) &&
 		TransactionIdPrecedes(procArray->replication_slot_xmin,
@@ -2873,7 +2873,7 @@ CountUserBackends(Oid roleid)
  * The current backend is always ignored; it is caller's responsibility to
  * check whether the current backend uses the given DB, if it's important.
  *
- * Returns TRUE if there are (still) other backends in the DB, FALSE if not.
+ * Returns true if there are (still) other backends in the DB, false if not.
  * Also, *nbackends and *nprepared are set to the number of other backends
  * and prepared transactions in the DB, respectively.
  *
@@ -2958,7 +2958,7 @@ CountOtherDBBackends(Oid databaseId, int *nbackends, int *nprepared)
  *
  * Install limits to future computations of the xmin horizon to prevent vacuum
  * and HOT pruning from removing affected rows still needed by clients with
- * replicaton slots.
+ * replication slots.
  */
 void
 ProcArraySetReplicationSlotXmin(TransactionId xmin, TransactionId catalog_xmin,
diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/procsignal.c
index b9302ac630..b0dd7d1b37 100644
--- a/src/backend/storage/ipc/procsignal.c
+++ b/src/backend/storage/ipc/procsignal.c
@@ -4,7 +4,7 @@
  *	  Routines for interprocess signalling
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/ipc/shm_mq.c b/src/backend/storage/ipc/shm_mq.c
index f45a67cc27..1131e27e2e 100644
--- a/src/backend/storage/ipc/shm_mq.c
+++ b/src/backend/storage/ipc/shm_mq.c
@@ -8,7 +8,7 @@
  * and only the receiver may receive.  This is intended to allow a user
  * backend to communicate with worker backends that it has registered.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/shm_mq.h
@@ -83,7 +83,9 @@ struct shm_mq
  * This structure is a backend-private handle for access to a queue.
  *
  * mqh_queue is a pointer to the queue we've attached, and mqh_segment is
- * a pointer to the dynamic shared memory segment that contains it.
+ * an optional pointer to the dynamic shared memory segment that contains it.
+ * (If mqh_segment is provided, we register an on_dsm_detach callback to
+ * make sure we detach from the queue before detaching from DSM.)
  *
  * If this queue is intended to connect the current process with a background
  * worker that started it, the user can pass a pointer to the worker handle
@@ -139,6 +141,7 @@ struct shm_mq_handle
 	MemoryContext mqh_context;
 };
 
+static void shm_mq_detach_internal(shm_mq *mq);
 static shm_mq_result shm_mq_send_bytes(shm_mq_handle *mq, Size nbytes,
 				  const void *data, bool nowait, Size *bytes_written);
 static shm_mq_result shm_mq_receive_bytes(shm_mq *mq, Size bytes_needed,
@@ -288,14 +291,15 @@ shm_mq_attach(shm_mq *mq, dsm_segment *seg, BackgroundWorkerHandle *handle)
 	Assert(mq->mq_receiver == MyProc || mq->mq_sender == MyProc);
 	mqh->mqh_queue = mq;
 	mqh->mqh_segment = seg;
-	mqh->mqh_buffer = NULL;
 	mqh->mqh_handle = handle;
+	mqh->mqh_buffer = NULL;
 	mqh->mqh_buflen = 0;
 	mqh->mqh_consume_pending = 0;
-	mqh->mqh_context = CurrentMemoryContext;
 	mqh->mqh_partial_bytes = 0;
+	mqh->mqh_expected_bytes = 0;
 	mqh->mqh_length_word_complete = false;
 	mqh->mqh_counterparty_attached = false;
+	mqh->mqh_context = CurrentMemoryContext;
 
 	if (seg != NULL)
 		on_dsm_detach(seg, shm_mq_detach_callback, PointerGetDatum(mq));
@@ -765,7 +769,28 @@ shm_mq_wait_for_attach(shm_mq_handle *mqh)
 }
 
 /*
- * Detach a shared message queue.
+ * Detach from a shared message queue, and destroy the shm_mq_handle.
+ */
+void
+shm_mq_detach(shm_mq_handle *mqh)
+{
+	/* Notify counterparty that we're outta here. */
+	shm_mq_detach_internal(mqh->mqh_queue);
+
+	/* Cancel on_dsm_detach callback, if any. */
+	if (mqh->mqh_segment)
+		cancel_on_dsm_detach(mqh->mqh_segment,
+							 shm_mq_detach_callback,
+							 PointerGetDatum(mqh->mqh_queue));
+
+	/* Release local memory associated with handle. */
+	if (mqh->mqh_buffer != NULL)
+		pfree(mqh->mqh_buffer);
+	pfree(mqh);
+}
+
+/*
+ * Notify counterparty that we're detaching from shared message queue.
  *
  * The purpose of this function is to make sure that the process
  * with which we're communicating doesn't block forever waiting for us to
@@ -773,9 +798,13 @@ shm_mq_wait_for_attach(shm_mq_handle *mqh)
  * detaches, the receiver can read any messages remaining in the queue;
  * further reads will return SHM_MQ_DETACHED.  If the receiver detaches,
  * further attempts to send messages will likewise return SHM_MQ_DETACHED.
+ *
+ * This is separated out from shm_mq_detach() because if the on_dsm_detach
+ * callback fires, we only want to do this much.  We do not try to touch
+ * the local shm_mq_handle, as it may have been pfree'd already.
  */
-void
-shm_mq_detach(shm_mq *mq)
+static void
+shm_mq_detach_internal(shm_mq *mq)
 {
 	volatile shm_mq *vmq = mq;
 	PGPROC	   *victim;
@@ -1193,5 +1222,5 @@ shm_mq_detach_callback(dsm_segment *seg, Datum arg)
 {
 	shm_mq	   *mq = (shm_mq *) DatumGetPointer(arg);
 
-	shm_mq_detach(mq);
+	shm_mq_detach_internal(mq);
 }
diff --git a/src/backend/storage/ipc/shm_toc.c b/src/backend/storage/ipc/shm_toc.c
index 958397884d..ee5ec6e380 100644
--- a/src/backend/storage/ipc/shm_toc.c
+++ b/src/backend/storage/ipc/shm_toc.c
@@ -3,7 +3,7 @@
  * shm_toc.c
  *	  shared memory segment table of contents
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/storage/ipc/shm_toc.c
@@ -60,7 +60,7 @@ shm_toc_create(uint64 magic, void *address, Size nbytes)
  * Attach to an existing table of contents.  If the magic number found at
  * the target address doesn't match our expectations, return NULL.
  */
-extern shm_toc *
+shm_toc *
 shm_toc_attach(uint64 magic, void *address)
 {
 	shm_toc    *toc = (shm_toc *) address;
@@ -84,7 +84,7 @@ shm_toc_attach(uint64 magic, void *address)
  * We allocate backwards from the end of the segment, so that the TOC entries
  * can grow forward from the start of the segment.
  */
-extern void *
+void *
 shm_toc_allocate(shm_toc *toc, Size nbytes)
 {
 	volatile shm_toc *vtoc = toc;
@@ -127,7 +127,7 @@ shm_toc_allocate(shm_toc *toc, Size nbytes)
 /*
  * Return the number of bytes that can still be allocated.
  */
-extern Size
+Size
 shm_toc_freespace(shm_toc *toc)
 {
 	volatile shm_toc *vtoc = toc;
diff --git a/src/backend/storage/ipc/shmem.c b/src/backend/storage/ipc/shmem.c
index 81c291f6e3..7893c01983 100644
--- a/src/backend/storage/ipc/shmem.c
+++ b/src/backend/storage/ipc/shmem.c
@@ -3,7 +3,7 @@
  * shmem.c
  *	  create shared memory and initialize shared memory data structures.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -257,7 +257,7 @@ ShmemAllocUnlocked(Size size)
 /*
  * ShmemAddrIsValid -- test if an address refers to shared memory
  *
- * Returns TRUE if the pointer points within the shared memory segment.
+ * Returns true if the pointer points within the shared memory segment.
  */
 bool
 ShmemAddrIsValid(const void *addr)
@@ -361,7 +361,7 @@ ShmemInitHash(const char *name,		/* table string name for shmem index */
  *		for it.  If it exists already, a pointer to the existing
  *		structure is returned.
  *
- *	Returns: pointer to the object.  *foundPtr is set TRUE if the object was
+ *	Returns: pointer to the object.  *foundPtr is set true if the object was
  *		already in the shmem index (hence, already initialized).
  *
  *	Note: before Postgres 9.0, this function returned NULL for some failure
@@ -388,7 +388,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 			/* Must be initializing a (non-standalone) backend */
 			Assert(shmemseghdr->index != NULL);
 			structPtr = shmemseghdr->index;
-			*foundPtr = TRUE;
+			*foundPtr = true;
 		}
 		else
 		{
@@ -403,7 +403,7 @@ ShmemInitStruct(const char *name, Size size, bool *foundPtr)
 			Assert(shmemseghdr->index == NULL);
 			structPtr = ShmemAlloc(size);
 			shmemseghdr->index = structPtr;
-			*foundPtr = FALSE;
+			*foundPtr = false;
 		}
 		LWLockRelease(ShmemIndexLock);
 		return structPtr;
diff --git a/src/backend/storage/ipc/shmqueue.c b/src/backend/storage/ipc/shmqueue.c
index 1026e67b94..598d9ebcfb 100644
--- a/src/backend/storage/ipc/shmqueue.c
+++ b/src/backend/storage/ipc/shmqueue.c
@@ -3,7 +3,7 @@
  * shmqueue.c
  *	  shared memory linked lists
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -40,7 +40,7 @@ SHMQueueInit(SHM_QUEUE *queue)
 }
 
 /*
- * SHMQueueIsDetached -- TRUE if element is not currently
+ * SHMQueueIsDetached -- true if element is not currently
  *		in a queue.
  */
 bool
@@ -174,7 +174,7 @@ SHMQueuePrev(const SHM_QUEUE *queue, const SHM_QUEUE *curElem, Size linkOffset)
 }
 
 /*
- * SHMQueueEmpty -- TRUE if queue head is only element, FALSE otherwise
+ * SHMQueueEmpty -- true if queue head is only element, false otherwise
  */
 bool
 SHMQueueEmpty(const SHM_QUEUE *queue)
@@ -184,7 +184,7 @@ SHMQueueEmpty(const SHM_QUEUE *queue)
 	if (queue->prev == queue)
 	{
 		Assert(queue->next == queue);
-		return TRUE;
+		return true;
 	}
-	return FALSE;
+	return false;
 }
diff --git a/src/backend/storage/ipc/sinval.c b/src/backend/storage/ipc/sinval.c
index b9a73e9247..563e2906e3 100644
--- a/src/backend/storage/ipc/sinval.c
+++ b/src/backend/storage/ipc/sinval.c
@@ -3,7 +3,7 @@
  * sinval.c
  *	  POSTGRES shared cache invalidation communication code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/ipc/sinvaladt.c b/src/backend/storage/ipc/sinvaladt.c
index 1b9d32b7cf..569f1058fa 100644
--- a/src/backend/storage/ipc/sinvaladt.c
+++ b/src/backend/storage/ipc/sinvaladt.c
@@ -3,7 +3,7 @@
  * sinvaladt.c
  *	  POSTGRES shared cache invalidation data manager.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -627,7 +627,7 @@ SIGetDataEntries(SharedInvalidationMessage *data, int datasize)
  * SICleanupQueue
  *		Remove messages that have been consumed by all active backends
  *
- * callerHasWriteLock is TRUE if caller is holding SInvalWriteLock.
+ * callerHasWriteLock is true if caller is holding SInvalWriteLock.
  * minFree is the minimum number of message slots to make free.
  *
  * Possible side effects of this routine include marking one or more
diff --git a/src/backend/storage/ipc/standby.c b/src/backend/storage/ipc/standby.c
index d491ece60a..44ed20992e 100644
--- a/src/backend/storage/ipc/standby.c
+++ b/src/backend/storage/ipc/standby.c
@@ -7,7 +7,7 @@
  *	AccessExclusiveLocks and starting snapshots for Hot Standby mode.
  *	Plus conflict recovery processing.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/large_object/inv_api.c b/src/backend/storage/large_object/inv_api.c
index d55d40e6f8..7eac0724bb 100644
--- a/src/backend/storage/large_object/inv_api.c
+++ b/src/backend/storage/large_object/inv_api.c
@@ -19,7 +19,7 @@
  * memory context given to inv_open (for LargeObjectDesc structs).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -51,6 +51,11 @@
 #include "utils/tqual.h"
 
 
+/*
+ * GUC: backwards-compatibility flag to suppress LO permission checks
+ */
+bool		lo_compat_privileges;
+
 /*
  * All accesses to pg_largeobject and its index make use of a single Relation
  * reference, so that we only need to open pg_relation once per transaction.
@@ -75,23 +80,14 @@ open_lo_relation(void)
 
 	/* Arrange for the top xact to own these relation references */
 	currentOwner = CurrentResourceOwner;
-	PG_TRY();
-	{
-		CurrentResourceOwner = TopTransactionResourceOwner;
+	CurrentResourceOwner = TopTransactionResourceOwner;
+
+	/* Use RowExclusiveLock since we might either read or write */
+	if (lo_heap_r == NULL)
+		lo_heap_r = heap_open(LargeObjectRelationId, RowExclusiveLock);
+	if (lo_index_r == NULL)
+		lo_index_r = index_open(LargeObjectLOidPNIndexId, RowExclusiveLock);
 
-		/* Use RowExclusiveLock since we might either read or write */
-		if (lo_heap_r == NULL)
-			lo_heap_r = heap_open(LargeObjectRelationId, RowExclusiveLock);
-		if (lo_index_r == NULL)
-			lo_index_r = index_open(LargeObjectLOidPNIndexId, RowExclusiveLock);
-	}
-	PG_CATCH();
-	{
-		/* Ensure CurrentResourceOwner is restored on error */
-		CurrentResourceOwner = currentOwner;
-		PG_RE_THROW();
-	}
-	PG_END_TRY();
 	CurrentResourceOwner = currentOwner;
 }
 
@@ -112,22 +108,13 @@ close_lo_relation(bool isCommit)
 			ResourceOwner currentOwner;
 
 			currentOwner = CurrentResourceOwner;
-			PG_TRY();
-			{
-				CurrentResourceOwner = TopTransactionResourceOwner;
+			CurrentResourceOwner = TopTransactionResourceOwner;
+
+			if (lo_index_r)
+				index_close(lo_index_r, NoLock);
+			if (lo_heap_r)
+				heap_close(lo_heap_r, NoLock);
 
-				if (lo_index_r)
-					index_close(lo_index_r, NoLock);
-				if (lo_heap_r)
-					heap_close(lo_heap_r, NoLock);
-			}
-			PG_CATCH();
-			{
-				/* Ensure CurrentResourceOwner is restored on error */
-				CurrentResourceOwner = currentOwner;
-				PG_RE_THROW();
-			}
-			PG_END_TRY();
 			CurrentResourceOwner = currentOwner;
 		}
 		lo_heap_r = NULL;
@@ -268,46 +255,78 @@ inv_open(Oid lobjId, int flags, MemoryContext mcxt)
 	Snapshot	snapshot = NULL;
 	int			descflags = 0;
 
+	/*
+	 * Historically, no difference is made between (INV_WRITE) and (INV_WRITE
+	 * | INV_READ), the caller being allowed to read the large object
+	 * descriptor in either case.
+	 */
 	if (flags & INV_WRITE)
-	{
-		snapshot = NULL;		/* instantaneous MVCC snapshot */
-		descflags = IFS_WRLOCK | IFS_RDLOCK;
-	}
-	else if (flags & INV_READ)
-	{
-		snapshot = GetActiveSnapshot();
-		descflags = IFS_RDLOCK;
-	}
-	else
+		descflags |= IFS_WRLOCK | IFS_RDLOCK;
+	if (flags & INV_READ)
+		descflags |= IFS_RDLOCK;
+
+	if (descflags == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 				 errmsg("invalid flags for opening a large object: %d",
 						flags)));
 
+	/* Get snapshot.  If write is requested, use an instantaneous snapshot. */
+	if (descflags & IFS_WRLOCK)
+		snapshot = NULL;
+	else
+		snapshot = GetActiveSnapshot();
+
 	/* Can't use LargeObjectExists here because we need to specify snapshot */
 	if (!myLargeObjectExists(lobjId, snapshot))
 		ereport(ERROR,
 				(errcode(ERRCODE_UNDEFINED_OBJECT),
 				 errmsg("large object %u does not exist", lobjId)));
 
+	/* Apply permission checks, again specifying snapshot */
+	if ((descflags & IFS_RDLOCK) != 0)
+	{
+		if (!lo_compat_privileges &&
+			pg_largeobject_aclcheck_snapshot(lobjId,
+											 GetUserId(),
+											 ACL_SELECT,
+											 snapshot) != ACLCHECK_OK)
+			ereport(ERROR,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("permission denied for large object %u",
+							lobjId)));
+	}
+	if ((descflags & IFS_WRLOCK) != 0)
+	{
+		if (!lo_compat_privileges &&
+			pg_largeobject_aclcheck_snapshot(lobjId,
+											 GetUserId(),
+											 ACL_UPDATE,
+											 snapshot) != ACLCHECK_OK)
+			ereport(ERROR,
+					(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+					 errmsg("permission denied for large object %u",
+							lobjId)));
+	}
+
+	/* OK to create a descriptor */
+	retval = (LargeObjectDesc *) MemoryContextAlloc(mcxt,
+													sizeof(LargeObjectDesc));
+	retval->id = lobjId;
+	retval->subid = GetCurrentSubTransactionId();
+	retval->offset = 0;
+	retval->flags = descflags;
+
 	/*
 	 * We must register the snapshot in TopTransaction's resowner, because it
 	 * must stay alive until the LO is closed rather than until the current
-	 * portal shuts down. Do this after checking that the LO exists, to avoid
-	 * leaking the snapshot if an error is thrown.
+	 * portal shuts down.  Do this last to avoid uselessly leaking the
+	 * snapshot if an error is thrown above.
 	 */
 	if (snapshot)
 		snapshot = RegisterSnapshotOnOwner(snapshot,
 										   TopTransactionResourceOwner);
-
-	/* All set, create a descriptor */
-	retval = (LargeObjectDesc *) MemoryContextAlloc(mcxt,
-													sizeof(LargeObjectDesc));
-	retval->id = lobjId;
-	retval->subid = GetCurrentSubTransactionId();
-	retval->offset = 0;
 	retval->snapshot = snapshot;
-	retval->flags = descflags;
 
 	return retval;
 }
@@ -330,7 +349,7 @@ inv_close(LargeObjectDesc *obj_desc)
 /*
  * Destroys an existing large object (not to be confused with a descriptor!)
  *
- * returns -1 if failed
+ * Note we expect caller to have done any required permissions check.
  */
 int
 inv_drop(Oid lobjId)
@@ -351,6 +370,7 @@ inv_drop(Oid lobjId)
 	 */
 	CommandCounterIncrement();
 
+	/* For historical reasons, we always return 1 on success. */
 	return 1;
 }
 
@@ -415,6 +435,11 @@ inv_seek(LargeObjectDesc *obj_desc, int64 offset, int whence)
 
 	Assert(PointerIsValid(obj_desc));
 
+	/*
+	 * We allow seek/tell if you have either read or write permission, so no
+	 * need for a permission check here.
+	 */
+
 	/*
 	 * Note: overflow in the additions is possible, but since we will reject
 	 * negative results, we don't need any extra test for that.
@@ -457,6 +482,11 @@ inv_tell(LargeObjectDesc *obj_desc)
 {
 	Assert(PointerIsValid(obj_desc));
 
+	/*
+	 * We allow seek/tell if you have either read or write permission, so no
+	 * need for a permission check here.
+	 */
+
 	return obj_desc->offset;
 }
 
@@ -476,6 +506,12 @@ inv_read(LargeObjectDesc *obj_desc, char *buf, int nbytes)
 	Assert(PointerIsValid(obj_desc));
 	Assert(buf != NULL);
 
+	if ((obj_desc->flags & IFS_RDLOCK) == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("permission denied for large object %u",
+						obj_desc->id)));
+
 	if (nbytes <= 0)
 		return 0;
 
@@ -581,7 +617,11 @@ inv_write(LargeObjectDesc *obj_desc, const char *buf, int nbytes)
 	Assert(buf != NULL);
 
 	/* enforce writability because snapshot is probably wrong otherwise */
-	Assert(obj_desc->flags & IFS_WRLOCK);
+	if ((obj_desc->flags & IFS_WRLOCK) == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("permission denied for large object %u",
+						obj_desc->id)));
 
 	if (nbytes <= 0)
 		return 0;
@@ -767,7 +807,11 @@ inv_truncate(LargeObjectDesc *obj_desc, int64 len)
 	Assert(PointerIsValid(obj_desc));
 
 	/* enforce writability because snapshot is probably wrong otherwise */
-	Assert(obj_desc->flags & IFS_WRLOCK);
+	if ((obj_desc->flags & IFS_WRLOCK) == 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INSUFFICIENT_PRIVILEGE),
+				 errmsg("permission denied for large object %u",
+						obj_desc->id)));
 
 	/*
 	 * use errmsg_internal here because we don't want to expose INT64_FORMAT
diff --git a/src/backend/storage/lmgr/condition_variable.c b/src/backend/storage/lmgr/condition_variable.c
index b4b7d28dd5..ef1d5baf01 100644
--- a/src/backend/storage/lmgr/condition_variable.c
+++ b/src/backend/storage/lmgr/condition_variable.c
@@ -8,7 +8,7 @@
  *	  interrupted, unlike LWLock waits.  Condition variables are safe
  *	  to use within dynamic shared memory segments.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/storage/lmgr/condition_variable.c
@@ -43,11 +43,18 @@ ConditionVariableInit(ConditionVariable *cv)
 }
 
 /*
- * Prepare to wait on a given condition variable.  This can optionally be
- * called before entering a test/sleep loop.  Alternatively, the call to
- * ConditionVariablePrepareToSleep can be omitted.  The only advantage of
- * calling ConditionVariablePrepareToSleep is that it avoids an initial
- * double-test of the user's predicate in the case that we need to wait.
+ * Prepare to wait on a given condition variable.
+ *
+ * This can optionally be called before entering a test/sleep loop.
+ * Doing so is more efficient if we'll need to sleep at least once.
+ * However, if the first test of the exit condition is likely to succeed,
+ * it's more efficient to omit the ConditionVariablePrepareToSleep call.
+ * See comments in ConditionVariableSleep for more detail.
+ *
+ * Caution: "before entering the loop" means you *must* test the exit
+ * condition between calling ConditionVariablePrepareToSleep and calling
+ * ConditionVariableSleep.  If that is inconvenient, omit calling
+ * ConditionVariablePrepareToSleep.
  */
 void
 ConditionVariablePrepareToSleep(ConditionVariable *cv)
@@ -55,49 +62,63 @@ ConditionVariablePrepareToSleep(ConditionVariable *cv)
 	int			pgprocno = MyProc->pgprocno;
 
 	/*
-	 * It's not legal to prepare a sleep until the previous sleep has been
-	 * completed or canceled.
+	 * If first time through in this process, create a WaitEventSet, which
+	 * we'll reuse for all condition variable sleeps.
 	 */
-	Assert(cv_sleep_target == NULL);
-
-	/* Record the condition variable on which we will sleep. */
-	cv_sleep_target = cv;
-
-	/* Create a reusable WaitEventSet. */
 	if (cv_wait_event_set == NULL)
 	{
-		cv_wait_event_set = CreateWaitEventSet(TopMemoryContext, 1);
-		AddWaitEventToSet(cv_wait_event_set, WL_LATCH_SET, PGINVALID_SOCKET,
+		WaitEventSet *new_event_set;
+
+		new_event_set = CreateWaitEventSet(TopMemoryContext, 2);
+		AddWaitEventToSet(new_event_set, WL_LATCH_SET, PGINVALID_SOCKET,
 						  MyLatch, NULL);
+		AddWaitEventToSet(new_event_set, WL_POSTMASTER_DEATH, PGINVALID_SOCKET,
+						  NULL, NULL);
+		/* Don't set cv_wait_event_set until we have a correct WES. */
+		cv_wait_event_set = new_event_set;
 	}
 
 	/*
-	 * Reset my latch before adding myself to the queue and before entering
-	 * the caller's predicate loop.
+	 * If some other sleep is already prepared, cancel it; this is necessary
+	 * because we have just one static variable tracking the prepared sleep,
+	 * and also only one cvWaitLink in our PGPROC.  It's okay to do this
+	 * because whenever control does return to the other test-and-sleep loop,
+	 * its ConditionVariableSleep call will just re-establish that sleep as
+	 * the prepared one.
+	 */
+	if (cv_sleep_target != NULL)
+		ConditionVariableCancelSleep();
+
+	/* Record the condition variable on which we will sleep. */
+	cv_sleep_target = cv;
+
+	/*
+	 * Reset my latch before adding myself to the queue, to ensure that we
+	 * don't miss a wakeup that occurs immediately.
 	 */
 	ResetLatch(MyLatch);
 
 	/* Add myself to the wait queue. */
 	SpinLockAcquire(&cv->mutex);
-	if (!proclist_contains(&cv->wakeup, pgprocno, cvWaitLink))
-		proclist_push_tail(&cv->wakeup, pgprocno, cvWaitLink);
+	proclist_push_tail(&cv->wakeup, pgprocno, cvWaitLink);
 	SpinLockRelease(&cv->mutex);
 }
 
-/*--------------------------------------------------------------------------
- * Wait for the given condition variable to be signaled.  This should be
- * called in a predicate loop that tests for a specific exit condition and
- * otherwise sleeps, like so:
+/*
+ * Wait for the given condition variable to be signaled.
+ *
+ * This should be called in a predicate loop that tests for a specific exit
+ * condition and otherwise sleeps, like so:
  *
- *	 ConditionVariablePrepareToSleep(cv); [optional]
+ *	 ConditionVariablePrepareToSleep(cv);  // optional
  *	 while (condition for which we are waiting is not true)
  *		 ConditionVariableSleep(cv, wait_event_info);
  *	 ConditionVariableCancelSleep();
  *
- * Supply a value from one of the WaitEventXXX enums defined in pgstat.h to
- * control the contents of pg_stat_activity's wait_event_type and wait_event
- * columns while waiting.
- *-------------------------------------------------------------------------*/
+ * wait_event_info should be a value from one of the WaitEventXXX enums
+ * defined in pgstat.h.  This controls the contents of pg_stat_activity's
+ * wait_event_type and wait_event columns while waiting.
+ */
 void
 ConditionVariableSleep(ConditionVariable *cv, uint32 wait_event_info)
 {
@@ -107,45 +128,60 @@ ConditionVariableSleep(ConditionVariable *cv, uint32 wait_event_info)
 	/*
 	 * If the caller didn't prepare to sleep explicitly, then do so now and
 	 * return immediately.  The caller's predicate loop should immediately
-	 * call again if its exit condition is not yet met.  This initial spurious
-	 * return can be avoided by calling ConditionVariablePrepareToSleep(cv)
+	 * call again if its exit condition is not yet met.  This will result in
+	 * the exit condition being tested twice before we first sleep.  The extra
+	 * test can be prevented by calling ConditionVariablePrepareToSleep(cv)
 	 * first.  Whether it's worth doing that depends on whether you expect the
-	 * condition to be met initially, in which case skipping the prepare
-	 * allows you to skip manipulation of the wait list, or not met initially,
-	 * in which case preparing first allows you to skip a spurious test of the
-	 * caller's exit condition.
+	 * exit condition to be met initially, in which case skipping the prepare
+	 * is recommended because it avoids manipulations of the wait list, or not
+	 * met initially, in which case preparing first is better because it
+	 * avoids one extra test of the exit condition.
+	 *
+	 * If we are currently prepared to sleep on some other CV, we just cancel
+	 * that and prepare this one; see ConditionVariablePrepareToSleep.
 	 */
-	if (cv_sleep_target == NULL)
+	if (cv_sleep_target != cv)
 	{
 		ConditionVariablePrepareToSleep(cv);
 		return;
 	}
 
-	/* Any earlier condition variable sleep must have been canceled. */
-	Assert(cv_sleep_target == cv);
-
-	while (!done)
+	do
 	{
 		CHECK_FOR_INTERRUPTS();
 
 		/*
-		 * Wait for latch to be set.  We don't care about the result because
-		 * our contract permits spurious returns.
+		 * Wait for latch to be set.  (If we're awakened for some other
+		 * reason, the code below will cope anyway.)
 		 */
 		WaitEventSetWait(cv_wait_event_set, -1, &event, 1, wait_event_info);
 
-		/* Reset latch before testing whether we can return. */
+		if (event.events & WL_POSTMASTER_DEATH)
+		{
+			/*
+			 * Emergency bailout if postmaster has died.  This is to avoid the
+			 * necessity for manual cleanup of all postmaster children.
+			 */
+			exit(1);
+		}
+
+		/* Reset latch before examining the state of the wait list. */
 		ResetLatch(MyLatch);
 
 		/*
 		 * If this process has been taken out of the wait list, then we know
-		 * that is has been signaled by ConditionVariableSignal.  We put it
-		 * back into the wait list, so we don't miss any further signals while
-		 * the caller's loop checks its condition.  If it hasn't been taken
-		 * out of the wait list, then the latch must have been set by
-		 * something other than ConditionVariableSignal; though we don't
-		 * guarantee not to return spuriously, we'll avoid these obvious
-		 * cases.
+		 * that it has been signaled by ConditionVariableSignal (or
+		 * ConditionVariableBroadcast), so we should return to the caller. But
+		 * that doesn't guarantee that the exit condition is met, only that we
+		 * ought to check it.  So we must put the process back into the wait
+		 * list, to ensure we don't miss any additional wakeup occurring while
+		 * the caller checks its exit condition.  We can take ourselves out of
+		 * the wait list only when the caller calls
+		 * ConditionVariableCancelSleep.
+		 *
+		 * If we're still in the wait list, then the latch must have been set
+		 * by something other than ConditionVariableSignal; though we don't
+		 * guarantee not to return spuriously, we'll avoid this obvious case.
 		 */
 		SpinLockAcquire(&cv->mutex);
 		if (!proclist_contains(&cv->wakeup, MyProc->pgprocno, cvWaitLink))
@@ -154,13 +190,17 @@ ConditionVariableSleep(ConditionVariable *cv, uint32 wait_event_info)
 			proclist_push_tail(&cv->wakeup, MyProc->pgprocno, cvWaitLink);
 		}
 		SpinLockRelease(&cv->mutex);
-	}
+	} while (!done);
 }
 
 /*
- * Cancel any pending sleep operation.  We just need to remove ourselves
- * from the wait queue of any condition variable for which we have previously
- * prepared a sleep.
+ * Cancel any pending sleep operation.
+ *
+ * We just need to remove ourselves from the wait queue of any condition
+ * variable for which we have previously prepared a sleep.
+ *
+ * Do nothing if nothing is pending; this allows this function to be called
+ * during transaction abort to clean up any unfinished CV sleep.
  */
 void
 ConditionVariableCancelSleep(void)
@@ -179,11 +219,14 @@ ConditionVariableCancelSleep(void)
 }
 
 /*
- * Wake up one sleeping process, assuming there is at least one.
+ * Wake up the oldest process sleeping on the CV, if there is any.
  *
- * The return value indicates whether or not we woke somebody up.
+ * Note: it's difficult to tell whether this has any real effect: we know
+ * whether we took an entry off the list, but the entry might only be a
+ * sentinel.  Hence, think twice before proposing that this should return
+ * a flag telling whether it woke somebody.
  */
-bool
+void
 ConditionVariableSignal(ConditionVariable *cv)
 {
 	PGPROC	   *proc = NULL;
@@ -196,33 +239,93 @@ ConditionVariableSignal(ConditionVariable *cv)
 
 	/* If we found someone sleeping, set their latch to wake them up. */
 	if (proc != NULL)
-	{
 		SetLatch(&proc->procLatch);
-		return true;
-	}
-
-	/* No sleeping processes. */
-	return false;
 }
 
 /*
- * Wake up all sleeping processes.
+ * Wake up all processes sleeping on the given CV.
  *
- * The return value indicates the number of processes we woke.
+ * This guarantees to wake all processes that were sleeping on the CV
+ * at time of call, but processes that add themselves to the list mid-call
+ * will typically not get awakened.
  */
-int
+void
 ConditionVariableBroadcast(ConditionVariable *cv)
 {
-	int			nwoken = 0;
+	int			pgprocno = MyProc->pgprocno;
+	PGPROC	   *proc = NULL;
+	bool		have_sentinel = false;
+
+	/*
+	 * In some use-cases, it is common for awakened processes to immediately
+	 * re-queue themselves.  If we just naively try to reduce the wakeup list
+	 * to empty, we'll get into a potentially-indefinite loop against such a
+	 * process.  The semantics we really want are just to be sure that we have
+	 * wakened all processes that were in the list at entry.  We can use our
+	 * own cvWaitLink as a sentinel to detect when we've finished.
+	 *
+	 * A seeming flaw in this approach is that someone else might signal the
+	 * CV and in doing so remove our sentinel entry.  But that's fine: since
+	 * CV waiters are always added and removed in order, that must mean that
+	 * every previous waiter has been wakened, so we're done.  We'll get an
+	 * extra "set" on our latch from the someone else's signal, which is
+	 * slightly inefficient but harmless.
+	 *
+	 * We can't insert our cvWaitLink as a sentinel if it's already in use in
+	 * some other proclist.  While that's not expected to be true for typical
+	 * uses of this function, we can deal with it by simply canceling any
+	 * prepared CV sleep.  The next call to ConditionVariableSleep will take
+	 * care of re-establishing the lost state.
+	 */
+	if (cv_sleep_target != NULL)
+		ConditionVariableCancelSleep();
 
 	/*
-	 * Let's just do this the dumbest way possible.  We could try to dequeue
-	 * all the sleepers at once to save spinlock cycles, but it's a bit hard
-	 * to get that right in the face of possible sleep cancelations, and we
-	 * don't want to loop holding the mutex.
+	 * Inspect the state of the queue.  If it's empty, we have nothing to do.
+	 * If there's exactly one entry, we need only remove and signal that
+	 * entry.  Otherwise, remove the first entry and insert our sentinel.
 	 */
-	while (ConditionVariableSignal(cv))
-		++nwoken;
+	SpinLockAcquire(&cv->mutex);
+	/* While we're here, let's assert we're not in the list. */
+	Assert(!proclist_contains(&cv->wakeup, pgprocno, cvWaitLink));
+
+	if (!proclist_is_empty(&cv->wakeup))
+	{
+		proc = proclist_pop_head_node(&cv->wakeup, cvWaitLink);
+		if (!proclist_is_empty(&cv->wakeup))
+		{
+			proclist_push_tail(&cv->wakeup, pgprocno, cvWaitLink);
+			have_sentinel = true;
+		}
+	}
+	SpinLockRelease(&cv->mutex);
 
-	return nwoken;
+	/* Awaken first waiter, if there was one. */
+	if (proc != NULL)
+		SetLatch(&proc->procLatch);
+
+	while (have_sentinel)
+	{
+		/*
+		 * Each time through the loop, remove the first wakeup list entry, and
+		 * signal it unless it's our sentinel.  Repeat as long as the sentinel
+		 * remains in the list.
+		 *
+		 * Notice that if someone else removes our sentinel, we will waken one
+		 * additional process before exiting.  That's intentional, because if
+		 * someone else signals the CV, they may be intending to waken some
+		 * third process that added itself to the list after we added the
+		 * sentinel.  Better to give a spurious wakeup (which should be
+		 * harmless beyond wasting some cycles) than to lose a wakeup.
+		 */
+		proc = NULL;
+		SpinLockAcquire(&cv->mutex);
+		if (!proclist_is_empty(&cv->wakeup))
+			proc = proclist_pop_head_node(&cv->wakeup, cvWaitLink);
+		have_sentinel = proclist_contains(&cv->wakeup, pgprocno, cvWaitLink);
+		SpinLockRelease(&cv->mutex);
+
+		if (proc != NULL && proc != MyProc)
+			SetLatch(&proc->procLatch);
+	}
 }
diff --git a/src/backend/storage/lmgr/deadlock.c b/src/backend/storage/lmgr/deadlock.c
index 5e49c78905..aeaf1f3ab4 100644
--- a/src/backend/storage/lmgr/deadlock.c
+++ b/src/backend/storage/lmgr/deadlock.c
@@ -7,7 +7,7 @@
  * detection and resolution algorithms.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -307,7 +307,7 @@ GetBlockingAutoVacuumPgproc(void)
  * by an outer level of recursion.  Add to this each possible solution
  * constraint for any cycle detected at this level.
  *
- * Returns TRUE if no solution exists.  Returns FALSE if a deadlock-free
+ * Returns true if no solution exists.  Returns false if a deadlock-free
  * state is attainable, in which case waitOrders[] shows the required
  * rearrangements of lock wait queues (if any).
  */
@@ -432,8 +432,8 @@ TestConfiguration(PGPROC *startProc)
  * FindLockCycle -- basic check for deadlock cycles
  *
  * Scan outward from the given proc to see if there is a cycle in the
- * waits-for graph that includes this proc.  Return TRUE if a cycle
- * is found, else FALSE.  If a cycle is found, we return a list of
+ * waits-for graph that includes this proc.  Return true if a cycle
+ * is found, else false.  If a cycle is found, we return a list of
  * the "soft edges", if any, included in the cycle.  These edges could
  * potentially be eliminated by rearranging wait queues.  We also fill
  * deadlockDetails[] with information about the detected cycle; this info
@@ -792,8 +792,8 @@ FindLockCycleRecurseMember(PGPROC *checkProc,
  * of nWaitOrders WAIT_ORDER structs in waitOrders[], with PGPROC array
  * workspace in waitOrderProcs[].
  *
- * Returns TRUE if able to build an ordering that satisfies all the
- * constraints, FALSE if not (there are contradictory constraints).
+ * Returns true if able to build an ordering that satisfies all the
+ * constraints, false if not (there are contradictory constraints).
  */
 static bool
 ExpandConstraints(EDGE *constraints,
@@ -864,8 +864,8 @@ ExpandConstraints(EDGE *constraints,
  * the "blocker" in the output array.  The EDGE array may well contain
  * edges associated with other locks; these should be ignored.
  *
- * Returns TRUE if able to build an ordering that satisfies all the
- * constraints, FALSE if not (there are contradictory constraints).
+ * Returns true if able to build an ordering that satisfies all the
+ * constraints, false if not (there are contradictory constraints).
  */
 static bool
 TopoSort(LOCK *lock,
diff --git a/src/backend/storage/lmgr/generate-lwlocknames.pl b/src/backend/storage/lmgr/generate-lwlocknames.pl
index 10d069896f..6cf71c10c4 100644
--- a/src/backend/storage/lmgr/generate-lwlocknames.pl
+++ b/src/backend/storage/lmgr/generate-lwlocknames.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate lwlocknames.h and lwlocknames.c from lwlocknames.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/backend/storage/lmgr/lmgr.c b/src/backend/storage/lmgr/lmgr.c
index fe9889894b..7b2dcb6c60 100644
--- a/src/backend/storage/lmgr/lmgr.c
+++ b/src/backend/storage/lmgr/lmgr.c
@@ -3,7 +3,7 @@
  * lmgr.c
  *	  POSTGRES lock manager code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -129,7 +129,7 @@ LockRelationOid(Oid relid, LOCKMODE lockmode)
  *		ConditionalLockRelationOid
  *
  * As above, but only lock if we can get the lock without blocking.
- * Returns TRUE iff the lock was acquired.
+ * Returns true iff the lock was acquired.
  *
  * NOTE: we do not currently need conditional versions of all the
  * LockXXX routines in this file, but they could easily be added if needed.
@@ -344,7 +344,7 @@ LockRelationForExtension(Relation relation, LOCKMODE lockmode)
  *		ConditionalLockRelationForExtension
  *
  * As above, but only lock if we can get the lock without blocking.
- * Returns TRUE iff the lock was acquired.
+ * Returns true iff the lock was acquired.
  */
 bool
 ConditionalLockRelationForExtension(Relation relation, LOCKMODE lockmode)
@@ -413,7 +413,7 @@ LockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode)
  *		ConditionalLockPage
  *
  * As above, but only lock if we can get the lock without blocking.
- * Returns TRUE iff the lock was acquired.
+ * Returns true iff the lock was acquired.
  */
 bool
 ConditionalLockPage(Relation relation, BlockNumber blkno, LOCKMODE lockmode)
@@ -469,7 +469,7 @@ LockTuple(Relation relation, ItemPointer tid, LOCKMODE lockmode)
  *		ConditionalLockTuple
  *
  * As above, but only lock if we can get the lock without blocking.
- * Returns TRUE iff the lock was acquired.
+ * Returns true iff the lock was acquired.
  */
 bool
 ConditionalLockTuple(Relation relation, ItemPointer tid, LOCKMODE lockmode)
@@ -557,6 +557,7 @@ XactLockTableWait(TransactionId xid, Relation rel, ItemPointer ctid,
 	LOCKTAG		tag;
 	XactLockTableWaitInfo info;
 	ErrorContextCallback callback;
+	bool		first = true;
 
 	/*
 	 * If an operation is specified, set up our verbose error context
@@ -590,7 +591,26 @@ XactLockTableWait(TransactionId xid, Relation rel, ItemPointer ctid,
 
 		if (!TransactionIdIsInProgress(xid))
 			break;
-		xid = SubTransGetParent(xid);
+
+		/*
+		 * If the Xid belonged to a subtransaction, then the lock would have
+		 * gone away as soon as it was finished; for correct tuple visibility,
+		 * the right action is to wait on its parent transaction to go away.
+		 * But instead of going levels up one by one, we can just wait for the
+		 * topmost transaction to finish with the same end result, which also
+		 * incurs less locktable traffic.
+		 *
+		 * Some uses of this function don't involve tuple visibility -- such
+		 * as when building snapshots for logical decoding.  It is possible to
+		 * see a transaction in ProcArray before it registers itself in the
+		 * locktable.  The topmost transaction in that case is the same xid,
+		 * so we try again after a short sleep.  (Don't sleep the first time
+		 * through, to avoid slowing down the normal case.)
+		 */
+		if (!first)
+			pg_usleep(1000L);
+		first = false;
+		xid = SubTransGetTopmostTransaction(xid);
 	}
 
 	if (oper != XLTW_None)
@@ -601,12 +621,13 @@ XactLockTableWait(TransactionId xid, Relation rel, ItemPointer ctid,
  *		ConditionalXactLockTableWait
  *
  * As above, but only lock if we can get the lock without blocking.
- * Returns TRUE if the lock was acquired.
+ * Returns true if the lock was acquired.
  */
 bool
 ConditionalXactLockTableWait(TransactionId xid)
 {
 	LOCKTAG		tag;
+	bool		first = true;
 
 	for (;;)
 	{
@@ -622,7 +643,12 @@ ConditionalXactLockTableWait(TransactionId xid)
 
 		if (!TransactionIdIsInProgress(xid))
 			break;
-		xid = SubTransGetParent(xid);
+
+		/* See XactLockTableWait about this case */
+		if (!first)
+			pg_usleep(1000L);
+		first = false;
+		xid = SubTransGetTopmostTransaction(xid);
 	}
 
 	return true;
diff --git a/src/backend/storage/lmgr/lock.c b/src/backend/storage/lmgr/lock.c
index 2b26173924..dc3d8d9817 100644
--- a/src/backend/storage/lmgr/lock.c
+++ b/src/backend/storage/lmgr/lock.c
@@ -3,7 +3,7 @@
  * lock.c
  *	  POSTGRES primary lock mechanism
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -768,7 +768,7 @@ LockAcquireExtended(const LOCKTAG *locktag,
 		locallock->nLocks = 0;
 		locallock->numLockOwners = 0;
 		locallock->maxLockOwners = 8;
-		locallock->holdsStrongLockCount = FALSE;
+		locallock->holdsStrongLockCount = false;
 		locallock->lockOwners = NULL;	/* in case next line fails */
 		locallock->lockOwners = (LOCALLOCKOWNER *)
 			MemoryContextAlloc(TopMemoryContext,
@@ -1264,7 +1264,7 @@ RemoveLocalLock(LOCALLOCK *locallock)
 		SpinLockAcquire(&FastPathStrongRelationLocks->mutex);
 		Assert(FastPathStrongRelationLocks->count[fasthashcode] > 0);
 		FastPathStrongRelationLocks->count[fasthashcode]--;
-		locallock->holdsStrongLockCount = FALSE;
+		locallock->holdsStrongLockCount = false;
 		SpinLockRelease(&FastPathStrongRelationLocks->mutex);
 	}
 
@@ -1578,7 +1578,7 @@ static void
 BeginStrongLockAcquire(LOCALLOCK *locallock, uint32 fasthashcode)
 {
 	Assert(StrongLockInProgress == NULL);
-	Assert(locallock->holdsStrongLockCount == FALSE);
+	Assert(locallock->holdsStrongLockCount == false);
 
 	/*
 	 * Adding to a memory location is not atomic, so we take a spinlock to
@@ -1591,7 +1591,7 @@ BeginStrongLockAcquire(LOCALLOCK *locallock, uint32 fasthashcode)
 
 	SpinLockAcquire(&FastPathStrongRelationLocks->mutex);
 	FastPathStrongRelationLocks->count[fasthashcode]++;
-	locallock->holdsStrongLockCount = TRUE;
+	locallock->holdsStrongLockCount = true;
 	StrongLockInProgress = locallock;
 	SpinLockRelease(&FastPathStrongRelationLocks->mutex);
 }
@@ -1620,11 +1620,11 @@ AbortStrongLockAcquire(void)
 		return;
 
 	fasthashcode = FastPathStrongLockHashPartition(locallock->hashcode);
-	Assert(locallock->holdsStrongLockCount == TRUE);
+	Assert(locallock->holdsStrongLockCount == true);
 	SpinLockAcquire(&FastPathStrongRelationLocks->mutex);
 	Assert(FastPathStrongRelationLocks->count[fasthashcode] > 0);
 	FastPathStrongRelationLocks->count[fasthashcode]--;
-	locallock->holdsStrongLockCount = FALSE;
+	locallock->holdsStrongLockCount = false;
 	StrongLockInProgress = NULL;
 	SpinLockRelease(&FastPathStrongRelationLocks->mutex);
 }
@@ -1857,7 +1857,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 	{
 		elog(WARNING, "you don't own a lock of type %s",
 			 lockMethodTable->lockModeNames[lockmode]);
-		return FALSE;
+		return false;
 	}
 
 	/*
@@ -1896,7 +1896,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 			/* don't release a lock belonging to another owner */
 			elog(WARNING, "you don't own a lock of type %s",
 				 lockMethodTable->lockModeNames[lockmode]);
-			return FALSE;
+			return false;
 		}
 	}
 
@@ -1907,7 +1907,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 	locallock->nLocks--;
 
 	if (locallock->nLocks > 0)
-		return TRUE;
+		return true;
 
 	/* Attempt fast release of any lock eligible for the fast path. */
 	if (EligibleForRelationFastPath(locktag, lockmode) &&
@@ -1926,7 +1926,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 		if (released)
 		{
 			RemoveLocalLock(locallock);
-			return TRUE;
+			return true;
 		}
 	}
 
@@ -1984,7 +1984,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 		elog(WARNING, "you don't own a lock of type %s",
 			 lockMethodTable->lockModeNames[lockmode]);
 		RemoveLocalLock(locallock);
-		return FALSE;
+		return false;
 	}
 
 	/*
@@ -1999,7 +1999,7 @@ LockRelease(const LOCKTAG *locktag, LOCKMODE lockmode, bool sessionLock)
 	LWLockRelease(partitionLock);
 
 	RemoveLocalLock(locallock);
-	return TRUE;
+	return true;
 }
 
 /*
@@ -3137,7 +3137,7 @@ AtPrepare_Locks(void)
 		 * entry.  We must retain the count until the prepared transaction is
 		 * committed or rolled back.
 		 */
-		locallock->holdsStrongLockCount = FALSE;
+		locallock->holdsStrongLockCount = false;
 
 		/*
 		 * Create a 2PC record.
diff --git a/src/backend/storage/lmgr/lwlock.c b/src/backend/storage/lmgr/lwlock.c
index 82a1cf5150..233606b414 100644
--- a/src/backend/storage/lmgr/lwlock.c
+++ b/src/backend/storage/lmgr/lwlock.c
@@ -20,7 +20,7 @@
  * appropriate value for a free lock.  The meaning of the variable is up to
  * the caller, the lightweight lock code just assigns and compares it.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -111,7 +111,7 @@ extern slock_t *ShmemLock;
  * This is indexed by tranche ID and stores the names of all tranches known
  * to the current backend.
  */
-static char **LWLockTrancheArray = NULL;
+static const char **LWLockTrancheArray = NULL;
 static int	LWLockTranchesAllocated = 0;
 
 #define T_NAME(lock) \
@@ -380,10 +380,10 @@ LWLockShmemSize(void)
 void
 CreateLWLocks(void)
 {
-	StaticAssertExpr(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,
+	StaticAssertStmt(LW_VAL_EXCLUSIVE > (uint32) MAX_BACKENDS,
 					 "MAX_BACKENDS too big for lwlock.c");
 
-	StaticAssertExpr(sizeof(LWLock) <= LWLOCK_MINIMAL_SIZE &&
+	StaticAssertStmt(sizeof(LWLock) <= LWLOCK_MINIMAL_SIZE &&
 					 sizeof(LWLock) <= LWLOCK_PADDED_SIZE,
 					 "Miscalculated LWLock padding");
 
@@ -494,8 +494,8 @@ RegisterLWLockTranches(void)
 
 	if (LWLockTrancheArray == NULL)
 	{
-		LWLockTranchesAllocated = 64;
-		LWLockTrancheArray = (char **)
+		LWLockTranchesAllocated = 128;
+		LWLockTrancheArray = (const char **)
 			MemoryContextAllocZero(TopMemoryContext,
 								   LWLockTranchesAllocated * sizeof(char *));
 		Assert(LWLockTranchesAllocated >= LWTRANCHE_FIRST_USER_DEFINED);
@@ -510,7 +510,16 @@ RegisterLWLockTranches(void)
 						  "predicate_lock_manager");
 	LWLockRegisterTranche(LWTRANCHE_PARALLEL_QUERY_DSA,
 						  "parallel_query_dsa");
+	LWLockRegisterTranche(LWTRANCHE_SESSION_DSA,
+						  "session_dsa");
+	LWLockRegisterTranche(LWTRANCHE_SESSION_RECORD_TABLE,
+						  "session_record_table");
+	LWLockRegisterTranche(LWTRANCHE_SESSION_TYPMOD_TABLE,
+						  "session_typmod_table");
+	LWLockRegisterTranche(LWTRANCHE_SHARED_TUPLESTORE,
+						  "shared_tuplestore");
 	LWLockRegisterTranche(LWTRANCHE_TBM, "tbm");
+	LWLockRegisterTranche(LWTRANCHE_PARALLEL_APPEND, "parallel_append");
 
 	/* Register named tranches. */
 	for (i = 0; i < NamedLWLockTrancheRequests; i++)
@@ -589,7 +598,7 @@ LWLockNewTrancheId(void)
  * (TopMemoryContext, static variable, or similar).
  */
 void
-LWLockRegisterTranche(int tranche_id, char *tranche_name)
+LWLockRegisterTranche(int tranche_id, const char *tranche_name)
 {
 	Assert(LWLockTrancheArray != NULL);
 
@@ -601,7 +610,7 @@ LWLockRegisterTranche(int tranche_id, char *tranche_name)
 		while (i <= tranche_id)
 			i *= 2;
 
-		LWLockTrancheArray = (char **)
+		LWLockTrancheArray = (const char **)
 			repalloc(LWLockTrancheArray, i * sizeof(char *));
 		LWLockTranchesAllocated = i;
 		while (j < LWLockTranchesAllocated)
@@ -1275,7 +1284,7 @@ LWLockAcquire(LWLock *lock, LWLockMode mode)
 /*
  * LWLockConditionalAcquire - acquire a lightweight lock in the specified mode
  *
- * If the lock is not available, return FALSE with no side-effects.
+ * If the lock is not available, return false with no side-effects.
  *
  * If successful, cancel/die interrupts are held off until lock release.
  */
diff --git a/src/backend/storage/lmgr/predicate.c b/src/backend/storage/lmgr/predicate.c
index 74e4b35837..654eca4f3f 100644
--- a/src/backend/storage/lmgr/predicate.c
+++ b/src/backend/storage/lmgr/predicate.c
@@ -116,16 +116,18 @@
  *			than its own active transaction must acquire an exclusive
  *			lock.
  *
- *	FirstPredicateLockMgrLock based partition locks
+ *	PredicateLockHashPartitionLock(hashcode)
  *		- The same lock protects a target, all locks on that target, and
- *			the linked list of locks on the target..
- *		- When more than one is needed, acquire in ascending order.
+ *			the linked list of locks on the target.
+ *		- When more than one is needed, acquire in ascending address order.
+ *		- When all are needed (rare), acquire in ascending index order with
+ *			PredicateLockHashPartitionLockByIndex(index).
  *
  *	SerializableXactHashLock
  *		- Protects both PredXact and SerializableXidHash.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -491,8 +493,8 @@ PredicateLockingNeededForRelation(Relation relation)
  * as RO-safe since the last call, we release all predicate locks and reset
  * MySerializableXact. That makes subsequent calls to return quickly.
  *
- * This is marked as 'inline' to make to eliminate the function call overhead
- * in the common case that serialization is not needed.
+ * This is marked as 'inline' to eliminate the function call overhead in the
+ * common case that serialization is not needed.
  */
 static inline bool
 SerializationNeededForRead(Relation relation, Snapshot snapshot)
@@ -1767,7 +1769,7 @@ GetSerializableTransactionSnapshotInt(Snapshot snapshot,
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("could not import the requested snapshot"),
-				 errdetail("The source process with pid %d is not running anymore.",
+				 errdetail("The source process with PID %d is not running anymore.",
 						   sourcepid)));
 	}
 
diff --git a/src/backend/storage/lmgr/proc.c b/src/backend/storage/lmgr/proc.c
index bfa84992ea..6f30e082b2 100644
--- a/src/backend/storage/lmgr/proc.c
+++ b/src/backend/storage/lmgr/proc.c
@@ -3,7 +3,7 @@
  * proc.c
  *	  routines to manage per-process shared memory data structure
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -186,6 +186,7 @@ InitProcGlobal(void)
 	ProcGlobal->walwriterLatch = NULL;
 	ProcGlobal->checkpointerLatch = NULL;
 	pg_atomic_init_u32(&ProcGlobal->procArrayGroupFirst, INVALID_PGPROCNO);
+	pg_atomic_init_u32(&ProcGlobal->clogGroupFirst, INVALID_PGPROCNO);
 
 	/*
 	 * Create and initialize all the PGPROC structures we'll need.  There are
@@ -408,6 +409,14 @@ InitProcess(void)
 	/* Initialize wait event information. */
 	MyProc->wait_event_info = 0;
 
+	/* Initialize fields for group transaction status update. */
+	MyProc->clogGroupMember = false;
+	MyProc->clogGroupMemberXid = InvalidTransactionId;
+	MyProc->clogGroupMemberXidStatus = TRANSACTION_STATUS_IN_PROGRESS;
+	MyProc->clogGroupMemberPage = -1;
+	MyProc->clogGroupMemberLsn = InvalidXLogRecPtr;
+	pg_atomic_init_u32(&MyProc->clogGroupNext, INVALID_PGPROCNO);
+
 	/*
 	 * Acquire ownership of the PGPROC's latch, so that we can use WaitLatch
 	 * on it.  That allows us to repoint the process latch, which so far
diff --git a/src/backend/storage/lmgr/s_lock.c b/src/backend/storage/lmgr/s_lock.c
index 40d8156331..7482b2d44b 100644
--- a/src/backend/storage/lmgr/s_lock.c
+++ b/src/backend/storage/lmgr/s_lock.c
@@ -36,7 +36,7 @@
  * the probability of unintended failure) than to fix the total time
  * spent.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -251,7 +251,7 @@ static void
 tas_dummy()
 {
 	__asm__ __volatile__(
-#if defined(__NetBSD__) && defined(__ELF__)
+#if (defined(__NetBSD__) || defined(__OpenBSD__)) && defined(__ELF__)
 /* no underscore for label and % for registers */
 						 "\
 .global		tas 				\n\
@@ -276,7 +276,7 @@ _tas:							\n\
 _success:						\n\
 			moveq 	#0,d0		\n\
 			rts					\n"
-#endif							/* __NetBSD__ && __ELF__ */
+#endif							/* (__NetBSD__ || __OpenBSD__) && __ELF__ */
 		);
 }
 #endif							/* __m68k__ && !__linux__ */
diff --git a/src/backend/storage/lmgr/spin.c b/src/backend/storage/lmgr/spin.c
index 2c16938f5a..6d59a7f15d 100644
--- a/src/backend/storage/lmgr/spin.c
+++ b/src/backend/storage/lmgr/spin.c
@@ -11,7 +11,7 @@
  * is too slow to be very useful :-(
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/page/bufpage.c b/src/backend/storage/page/bufpage.c
index 41642eb59c..dfbda5458f 100644
--- a/src/backend/storage/page/bufpage.c
+++ b/src/backend/storage/page/bufpage.c
@@ -3,7 +3,7 @@
  * bufpage.c
  *	  POSTGRES standard buffer page code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -481,6 +481,8 @@ PageRepairFragmentation(Page page)
 	Offset		pd_lower = ((PageHeader) page)->pd_lower;
 	Offset		pd_upper = ((PageHeader) page)->pd_upper;
 	Offset		pd_special = ((PageHeader) page)->pd_special;
+	itemIdSortData itemidbase[MaxHeapTuplesPerPage];
+	itemIdSort	itemidptr;
 	ItemId		lp;
 	int			nline,
 				nstorage,
@@ -505,15 +507,31 @@ PageRepairFragmentation(Page page)
 				 errmsg("corrupted page pointers: lower = %u, upper = %u, special = %u",
 						pd_lower, pd_upper, pd_special)));
 
+	/*
+	 * Run through the line pointer array and collect data about live items.
+	 */
 	nline = PageGetMaxOffsetNumber(page);
-	nunused = nstorage = 0;
+	itemidptr = itemidbase;
+	nunused = totallen = 0;
 	for (i = FirstOffsetNumber; i <= nline; i++)
 	{
 		lp = PageGetItemId(page, i);
 		if (ItemIdIsUsed(lp))
 		{
 			if (ItemIdHasStorage(lp))
-				nstorage++;
+			{
+				itemidptr->offsetindex = i - 1;
+				itemidptr->itemoff = ItemIdGetOffset(lp);
+				if (unlikely(itemidptr->itemoff < (int) pd_upper ||
+							 itemidptr->itemoff >= (int) pd_special))
+					ereport(ERROR,
+							(errcode(ERRCODE_DATA_CORRUPTED),
+							 errmsg("corrupted item pointer: %u",
+									itemidptr->itemoff)));
+				itemidptr->alignedlen = MAXALIGN(ItemIdGetLength(lp));
+				totallen += itemidptr->alignedlen;
+				itemidptr++;
+			}
 		}
 		else
 		{
@@ -523,6 +541,7 @@ PageRepairFragmentation(Page page)
 		}
 	}
 
+	nstorage = itemidptr - itemidbase;
 	if (nstorage == 0)
 	{
 		/* Page is completely empty, so just reset it quickly */
@@ -531,29 +550,6 @@ PageRepairFragmentation(Page page)
 	else
 	{
 		/* Need to compact the page the hard way */
-		itemIdSortData itemidbase[MaxHeapTuplesPerPage];
-		itemIdSort	itemidptr = itemidbase;
-
-		totallen = 0;
-		for (i = 0; i < nline; i++)
-		{
-			lp = PageGetItemId(page, i + 1);
-			if (ItemIdHasStorage(lp))
-			{
-				itemidptr->offsetindex = i;
-				itemidptr->itemoff = ItemIdGetOffset(lp);
-				if (itemidptr->itemoff < (int) pd_upper ||
-					itemidptr->itemoff >= (int) pd_special)
-					ereport(ERROR,
-							(errcode(ERRCODE_DATA_CORRUPTED),
-							 errmsg("corrupted item pointer: %u",
-									itemidptr->itemoff)));
-				itemidptr->alignedlen = MAXALIGN(ItemIdGetLength(lp));
-				totallen += itemidptr->alignedlen;
-				itemidptr++;
-			}
-		}
-
 		if (totallen > (Size) (pd_special - pd_lower))
 			ereport(ERROR,
 					(errcode(ERRCODE_DATA_CORRUPTED),
diff --git a/src/backend/storage/page/checksum.c b/src/backend/storage/page/checksum.c
index b96440ae54..a28343b79e 100644
--- a/src/backend/storage/page/checksum.c
+++ b/src/backend/storage/page/checksum.c
@@ -3,7 +3,7 @@
  * checksum.c
  *	  Checksum implementation for data pages.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/storage/page/itemptr.c b/src/backend/storage/page/itemptr.c
index b872928f2f..a899dac645 100644
--- a/src/backend/storage/page/itemptr.c
+++ b/src/backend/storage/page/itemptr.c
@@ -3,7 +3,7 @@
  * itemptr.c
  *	  POSTGRES disk item pointer code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
index 65e0abe9ec..bb96881cad 100644
--- a/src/backend/storage/smgr/md.c
+++ b/src/backend/storage/smgr/md.c
@@ -10,7 +10,7 @@
  * It doesn't matter whether the bits are on spinning rust or some other
  * storage technology.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -304,7 +304,7 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo)
 
 	path = relpath(reln->smgr_rnode, forkNum);
 
-	fd = PathNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, 0600);
+	fd = PathNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 
 	if (fd < 0)
 	{
@@ -317,7 +317,7 @@ mdcreate(SMgrRelation reln, ForkNumber forkNum, bool isRedo)
 		 * already, even if isRedo is not set.  (See also mdopen)
 		 */
 		if (isRedo || IsBootstrapProcessingMode())
-			fd = PathNameOpenFile(path, O_RDWR | PG_BINARY, 0600);
+			fd = PathNameOpenFile(path, O_RDWR | PG_BINARY);
 		if (fd < 0)
 		{
 			/* be sure to report the error reported by create, not open */
@@ -430,7 +430,7 @@ mdunlinkfork(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)
 		/* truncate(2) would be easier here, but Windows hasn't got it */
 		int			fd;
 
-		fd = OpenTransientFile(path, O_RDWR | PG_BINARY, 0);
+		fd = OpenTransientFile(path, O_RDWR | PG_BINARY);
 		if (fd >= 0)
 		{
 			int			save_errno;
@@ -583,7 +583,7 @@ mdopen(SMgrRelation reln, ForkNumber forknum, int behavior)
 
 	path = relpath(reln->smgr_rnode, forknum);
 
-	fd = PathNameOpenFile(path, O_RDWR | PG_BINARY, 0600);
+	fd = PathNameOpenFile(path, O_RDWR | PG_BINARY);
 
 	if (fd < 0)
 	{
@@ -594,7 +594,7 @@ mdopen(SMgrRelation reln, ForkNumber forknum, int behavior)
 		 * substitute for mdcreate() in bootstrap mode only. (See mdcreate)
 		 */
 		if (IsBootstrapProcessingMode())
-			fd = PathNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY, 0600);
+			fd = PathNameOpenFile(path, O_RDWR | O_CREAT | O_EXCL | PG_BINARY);
 		if (fd < 0)
 		{
 			if ((behavior & EXTENSION_RETURN_NULL) &&
@@ -1780,7 +1780,7 @@ _mdfd_openseg(SMgrRelation reln, ForkNumber forknum, BlockNumber segno,
 	fullpath = _mdfd_segpath(reln, forknum, segno);
 
 	/* open the file */
-	fd = PathNameOpenFile(fullpath, O_RDWR | PG_BINARY | oflags, 0600);
+	fd = PathNameOpenFile(fullpath, O_RDWR | PG_BINARY | oflags);
 
 	pfree(fullpath);
 
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 0ca095c4d6..08f06bade2 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -6,7 +6,7 @@
  *	  All file system operations in POSTGRES dispatch through these
  *	  routines.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -106,7 +106,7 @@ smgrinit(void)
 	for (i = 0; i < NSmgr; i++)
 	{
 		if (smgrsw[i].smgr_init)
-			(*(smgrsw[i].smgr_init)) ();
+			smgrsw[i].smgr_init();
 	}
 
 	/* register the shutdown proc */
@@ -124,7 +124,7 @@ smgrshutdown(int code, Datum arg)
 	for (i = 0; i < NSmgr; i++)
 	{
 		if (smgrsw[i].smgr_shutdown)
-			(*(smgrsw[i].smgr_shutdown)) ();
+			smgrsw[i].smgr_shutdown();
 	}
 }
 
@@ -286,7 +286,7 @@ remove_from_unowned_list(SMgrRelation reln)
 bool
 smgrexists(SMgrRelation reln, ForkNumber forknum)
 {
-	return (*(smgrsw[reln->smgr_which].smgr_exists)) (reln, forknum);
+	return smgrsw[reln->smgr_which].smgr_exists(reln, forknum);
 }
 
 /*
@@ -299,7 +299,7 @@ smgrclose(SMgrRelation reln)
 	ForkNumber	forknum;
 
 	for (forknum = 0; forknum <= MAX_FORKNUM; forknum++)
-		(*(smgrsw[reln->smgr_which].smgr_close)) (reln, forknum);
+		smgrsw[reln->smgr_which].smgr_close(reln, forknum);
 
 	owner = reln->smgr_owner;
 
@@ -395,7 +395,7 @@ smgrcreate(SMgrRelation reln, ForkNumber forknum, bool isRedo)
 							reln->smgr_rnode.node.dbNode,
 							isRedo);
 
-	(*(smgrsw[reln->smgr_which].smgr_create)) (reln, forknum, isRedo);
+	smgrsw[reln->smgr_which].smgr_create(reln, forknum, isRedo);
 }
 
 /*
@@ -419,7 +419,7 @@ smgrdounlink(SMgrRelation reln, bool isRedo)
 
 	/* Close the forks at smgr level */
 	for (forknum = 0; forknum <= MAX_FORKNUM; forknum++)
-		(*(smgrsw[which].smgr_close)) (reln, forknum);
+		smgrsw[which].smgr_close(reln, forknum);
 
 	/*
 	 * Get rid of any remaining buffers for the relation.  bufmgr will just
@@ -451,7 +451,7 @@ smgrdounlink(SMgrRelation reln, bool isRedo)
 	 * ERROR, because we've already decided to commit or abort the current
 	 * xact.
 	 */
-	(*(smgrsw[which].smgr_unlink)) (rnode, InvalidForkNumber, isRedo);
+	smgrsw[which].smgr_unlink(rnode, InvalidForkNumber, isRedo);
 }
 
 /*
@@ -491,7 +491,7 @@ smgrdounlinkall(SMgrRelation *rels, int nrels, bool isRedo)
 
 		/* Close the forks at smgr level */
 		for (forknum = 0; forknum <= MAX_FORKNUM; forknum++)
-			(*(smgrsw[which].smgr_close)) (rels[i], forknum);
+			smgrsw[which].smgr_close(rels[i], forknum);
 	}
 
 	/*
@@ -529,7 +529,7 @@ smgrdounlinkall(SMgrRelation *rels, int nrels, bool isRedo)
 		int			which = rels[i]->smgr_which;
 
 		for (forknum = 0; forknum <= MAX_FORKNUM; forknum++)
-			(*(smgrsw[which].smgr_unlink)) (rnodes[i], forknum, isRedo);
+			smgrsw[which].smgr_unlink(rnodes[i], forknum, isRedo);
 	}
 
 	pfree(rnodes);
@@ -552,7 +552,7 @@ smgrdounlinkfork(SMgrRelation reln, ForkNumber forknum, bool isRedo)
 	int			which = reln->smgr_which;
 
 	/* Close the fork at smgr level */
-	(*(smgrsw[which].smgr_close)) (reln, forknum);
+	smgrsw[which].smgr_close(reln, forknum);
 
 	/*
 	 * Get rid of any remaining buffers for the fork.  bufmgr will just drop
@@ -584,7 +584,7 @@ smgrdounlinkfork(SMgrRelation reln, ForkNumber forknum, bool isRedo)
 	 * ERROR, because we've already decided to commit or abort the current
 	 * xact.
 	 */
-	(*(smgrsw[which].smgr_unlink)) (rnode, forknum, isRedo);
+	smgrsw[which].smgr_unlink(rnode, forknum, isRedo);
 }
 
 /*
@@ -600,8 +600,8 @@ void
 smgrextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		   char *buffer, bool skipFsync)
 {
-	(*(smgrsw[reln->smgr_which].smgr_extend)) (reln, forknum, blocknum,
-											   buffer, skipFsync);
+	smgrsw[reln->smgr_which].smgr_extend(reln, forknum, blocknum,
+										 buffer, skipFsync);
 }
 
 /*
@@ -610,7 +610,7 @@ smgrextend(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 void
 smgrprefetch(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum)
 {
-	(*(smgrsw[reln->smgr_which].smgr_prefetch)) (reln, forknum, blocknum);
+	smgrsw[reln->smgr_which].smgr_prefetch(reln, forknum, blocknum);
 }
 
 /*
@@ -625,7 +625,7 @@ void
 smgrread(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		 char *buffer)
 {
-	(*(smgrsw[reln->smgr_which].smgr_read)) (reln, forknum, blocknum, buffer);
+	smgrsw[reln->smgr_which].smgr_read(reln, forknum, blocknum, buffer);
 }
 
 /*
@@ -647,8 +647,8 @@ void
 smgrwrite(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 		  char *buffer, bool skipFsync)
 {
-	(*(smgrsw[reln->smgr_which].smgr_write)) (reln, forknum, blocknum,
-											  buffer, skipFsync);
+	smgrsw[reln->smgr_which].smgr_write(reln, forknum, blocknum,
+										buffer, skipFsync);
 }
 
 
@@ -660,8 +660,8 @@ void
 smgrwriteback(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 			  BlockNumber nblocks)
 {
-	(*(smgrsw[reln->smgr_which].smgr_writeback)) (reln, forknum, blocknum,
-												  nblocks);
+	smgrsw[reln->smgr_which].smgr_writeback(reln, forknum, blocknum,
+											nblocks);
 }
 
 /*
@@ -671,7 +671,7 @@ smgrwriteback(SMgrRelation reln, ForkNumber forknum, BlockNumber blocknum,
 BlockNumber
 smgrnblocks(SMgrRelation reln, ForkNumber forknum)
 {
-	return (*(smgrsw[reln->smgr_which].smgr_nblocks)) (reln, forknum);
+	return smgrsw[reln->smgr_which].smgr_nblocks(reln, forknum);
 }
 
 /*
@@ -704,7 +704,7 @@ smgrtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
 	/*
 	 * Do the truncation.
 	 */
-	(*(smgrsw[reln->smgr_which].smgr_truncate)) (reln, forknum, nblocks);
+	smgrsw[reln->smgr_which].smgr_truncate(reln, forknum, nblocks);
 }
 
 /*
@@ -733,7 +733,7 @@ smgrtruncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
 void
 smgrimmedsync(SMgrRelation reln, ForkNumber forknum)
 {
-	(*(smgrsw[reln->smgr_which].smgr_immedsync)) (reln, forknum);
+	smgrsw[reln->smgr_which].smgr_immedsync(reln, forknum);
 }
 
 
@@ -748,7 +748,7 @@ smgrpreckpt(void)
 	for (i = 0; i < NSmgr; i++)
 	{
 		if (smgrsw[i].smgr_pre_ckpt)
-			(*(smgrsw[i].smgr_pre_ckpt)) ();
+			smgrsw[i].smgr_pre_ckpt();
 	}
 }
 
@@ -763,7 +763,7 @@ smgrsync(void)
 	for (i = 0; i < NSmgr; i++)
 	{
 		if (smgrsw[i].smgr_sync)
-			(*(smgrsw[i].smgr_sync)) ();
+			smgrsw[i].smgr_sync();
 	}
 }
 
@@ -778,7 +778,7 @@ smgrpostckpt(void)
 	for (i = 0; i < NSmgr; i++)
 	{
 		if (smgrsw[i].smgr_post_ckpt)
-			(*(smgrsw[i].smgr_post_ckpt)) ();
+			smgrsw[i].smgr_post_ckpt();
 	}
 }
 
diff --git a/src/backend/storage/smgr/smgrtype.c b/src/backend/storage/smgr/smgrtype.c
index dc81fe81cf..e819f2e514 100644
--- a/src/backend/storage/smgr/smgrtype.c
+++ b/src/backend/storage/smgr/smgrtype.c
@@ -3,7 +3,7 @@
  * smgrtype.c
  *	  storage manager type
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/tcop/dest.c b/src/backend/tcop/dest.c
index 28081c3765..c95a4d519d 100644
--- a/src/backend/tcop/dest.c
+++ b/src/backend/tcop/dest.c
@@ -4,7 +4,7 @@
  *	  support for communication destinations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/tcop/fastpath.c b/src/backend/tcop/fastpath.c
index 9207d76981..d16ba5ec92 100644
--- a/src/backend/tcop/fastpath.c
+++ b/src/backend/tcop/fastpath.c
@@ -3,7 +3,7 @@
  * fastpath.c
  *	  routines to handle function requests from the frontend
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -17,9 +17,6 @@
  */
 #include "postgres.h"
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include "access/htup_details.h"
 #include "access/xact.h"
 #include "catalog/objectaccess.h"
@@ -28,6 +25,7 @@
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
 #include "miscadmin.h"
+#include "port/pg_bswap.h"
 #include "tcop/fastpath.h"
 #include "tcop/tcopprot.h"
 #include "utils/acl.h"
@@ -92,7 +90,7 @@ GetOldFunctionMessage(StringInfo buf)
 	if (pq_getbytes((char *) &ibuf, 4))
 		return EOF;
 	appendBinaryStringInfo(buf, (char *) &ibuf, 4);
-	nargs = ntohl(ibuf);
+	nargs = pg_ntoh32(ibuf);
 	/* For each argument ... */
 	while (nargs-- > 0)
 	{
@@ -102,7 +100,7 @@ GetOldFunctionMessage(StringInfo buf)
 		if (pq_getbytes((char *) &ibuf, 4))
 			return EOF;
 		appendBinaryStringInfo(buf, (char *) &ibuf, 4);
-		argsize = ntohl(ibuf);
+		argsize = pg_ntoh32(ibuf);
 		if (argsize < -1)
 		{
 			/* FATAL here since no hope of regaining message sync */
@@ -145,7 +143,7 @@ SendFunctionResult(Datum retval, bool isnull, Oid rettype, int16 format)
 	if (isnull)
 	{
 		if (newstyle)
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1);
 	}
 	else
 	{
@@ -171,7 +169,7 @@ SendFunctionResult(Datum retval, bool isnull, Oid rettype, int16 format)
 
 			getTypeBinaryOutputInfo(rettype, &typsend, &typisvarlena);
 			outputbytes = OidSendFunctionCall(typsend, retval);
-			pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
+			pq_sendint32(&buf, VARSIZE(outputbytes) - VARHDRSZ);
 			pq_sendbytes(&buf, VARDATA(outputbytes),
 						 VARSIZE(outputbytes) - VARHDRSZ);
 			pfree(outputbytes);
@@ -317,13 +315,13 @@ HandleFunctionRequest(StringInfo msgBuf)
 	 */
 	aclresult = pg_namespace_aclcheck(fip->namespace, GetUserId(), ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_NAMESPACE,
+		aclcheck_error(aclresult, OBJECT_SCHEMA,
 					   get_namespace_name(fip->namespace));
 	InvokeNamespaceSearchHook(fip->namespace, true);
 
 	aclresult = pg_proc_aclcheck(fid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC,
+		aclcheck_error(aclresult, OBJECT_FUNCTION,
 					   get_func_name(fid));
 	InvokeFunctionExecuteHook(fid);
 
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
index b8d860ebdb..6dc2095b9a 100644
--- a/src/backend/tcop/postgres.c
+++ b/src/backend/tcop/postgres.c
@@ -3,7 +3,7 @@
  * postgres.c
  *	  POSTGRES C Backend Interface
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -143,6 +143,11 @@ static bool DoingCommandRead = false;
 static bool doing_extended_query_message = false;
 static bool ignore_till_sync = false;
 
+/*
+ * Flag to keep track of whether statement timeout timer is active.
+ */
+static bool stmt_timeout_active = false;
+
 /*
  * If an unnamed prepared statement exists, it's stored here.
  * We keep it separate from the hashtable kept by commands/prepare.c
@@ -160,6 +165,10 @@ static bool RecoveryConflictPending = false;
 static bool RecoveryConflictRetryable = true;
 static ProcSignalReason RecoveryConflictReason;
 
+/* reused buffer to pass to SendRowDescriptionMessage() */
+static MemoryContext row_description_context = NULL;
+static StringInfoData row_description_buf;
+
 /* ----------------------------------------------------------------
  *		decls for routines only used in this file
  * ----------------------------------------------------------------
@@ -182,6 +191,8 @@ static bool IsTransactionExitStmtList(List *pstmts);
 static bool IsTransactionStmtList(List *pstmts);
 static void drop_unnamed_stmt(void);
 static void log_disconnections(int code, Datum arg);
+static void enable_statement_timeout(void);
+static void disable_statement_timeout(void);
 
 
 /* ----------------------------------------------------------------
@@ -883,10 +894,9 @@ exec_simple_query(const char *query_string)
 	ListCell   *parsetree_item;
 	bool		save_log_statement_stats = log_statement_stats;
 	bool		was_logged = false;
-	bool		isTopLevel;
+	bool		use_implicit_block;
 	char		msec_str[32];
 
-
 	/*
 	 * Report query to various monitoring facilities.
 	 */
@@ -947,13 +957,14 @@ exec_simple_query(const char *query_string)
 	MemoryContextSwitchTo(oldcontext);
 
 	/*
-	 * We'll tell PortalRun it's a top-level command iff there's exactly one
-	 * raw parsetree.  If more than one, it's effectively a transaction block
-	 * and we want PreventTransactionChain to reject unsafe commands. (Note:
-	 * we're assuming that query rewrite cannot add commands that are
-	 * significant to PreventTransactionChain.)
+	 * For historical reasons, if multiple SQL statements are given in a
+	 * single "simple Query" message, we execute them as a single transaction,
+	 * unless explicit transaction control commands are included to make
+	 * portions of the list be separate transactions.  To represent this
+	 * behavior properly in the transaction machinery, we use an "implicit"
+	 * transaction block.
 	 */
-	isTopLevel = (list_length(parsetree_list) == 1);
+	use_implicit_block = (list_length(parsetree_list) > 1);
 
 	/*
 	 * Run through the raw parsetree(s) and process each one.
@@ -1001,6 +1012,16 @@ exec_simple_query(const char *query_string)
 		/* Make sure we are in a transaction command */
 		start_xact_command();
 
+		/*
+		 * If using an implicit transaction block, and we're not already in a
+		 * transaction block, start an implicit block to force this statement
+		 * to be grouped together with any following ones.  (We must do this
+		 * each time through the loop; otherwise, a COMMIT/ROLLBACK in the
+		 * list would cause later statements to not be grouped.)
+		 */
+		if (use_implicit_block)
+			BeginImplicitTransactionBlock();
+
 		/* If we got a cancel signal in parsing or prior command, quit */
 		CHECK_FOR_INTERRUPTS();
 
@@ -1098,25 +1119,17 @@ exec_simple_query(const char *query_string)
 		 */
 		(void) PortalRun(portal,
 						 FETCH_ALL,
-						 isTopLevel,
+						 true,	/* always top level */
 						 true,
 						 receiver,
 						 receiver,
 						 completionTag);
 
-		(*receiver->rDestroy) (receiver);
+		receiver->rDestroy(receiver);
 
 		PortalDrop(portal, false);
 
-		if (IsA(parsetree->stmt, TransactionStmt))
-		{
-			/*
-			 * If this was a transaction control statement, commit it. We will
-			 * start a new xact command for the next command (if any).
-			 */
-			finish_xact_command();
-		}
-		else if (lnext(parsetree_item) == NULL)
+		if (lnext(parsetree_item) == NULL)
 		{
 			/*
 			 * If this is the last parsetree of the query string, close down
@@ -1124,9 +1137,18 @@ exec_simple_query(const char *query_string)
 			 * is so that any end-of-transaction errors are reported before
 			 * the command-complete message is issued, to avoid confusing
 			 * clients who will expect either a command-complete message or an
-			 * error, not one and then the other.  But for compatibility with
-			 * historical Postgres behavior, we do not force a transaction
-			 * boundary between queries appearing in a single query string.
+			 * error, not one and then the other.  Also, if we're using an
+			 * implicit transaction block, we must close that out first.
+			 */
+			if (use_implicit_block)
+				EndImplicitTransactionBlock();
+			finish_xact_command();
+		}
+		else if (IsA(parsetree->stmt, TransactionStmt))
+		{
+			/*
+			 * If this was a transaction control statement, commit it. We will
+			 * start a new xact command for the next command.
 			 */
 			finish_xact_command();
 		}
@@ -1149,7 +1171,9 @@ exec_simple_query(const char *query_string)
 	}							/* end loop over parsetrees */
 
 	/*
-	 * Close down transaction statement, if one is open.
+	 * Close down transaction statement, if one is open.  (This will only do
+	 * something if the parsetree list was empty; otherwise the last loop
+	 * iteration already did it.)
 	 */
 	finish_xact_command();
 
@@ -1228,7 +1252,8 @@ exec_parse_message(const char *query_string,	/* string to execute */
 	/*
 	 * Start up a transaction command so we can run parse analysis etc. (Note
 	 * that this will normally change current memory context.) Nothing happens
-	 * if we are already in one.
+	 * if we are already in one.  This also arms the statement timeout if
+	 * necessary.
 	 */
 	start_xact_command();
 
@@ -1516,7 +1541,8 @@ exec_bind_message(StringInfo input_message)
 	/*
 	 * Start up a transaction command so we can call functions etc. (Note that
 	 * this will normally change current memory context.) Nothing happens if
-	 * we are already in one.
+	 * we are already in one.  This also arms the statement timeout if
+	 * necessary.
 	 */
 	start_xact_command();
 
@@ -1582,7 +1608,7 @@ exec_bind_message(StringInfo input_message)
 	 * don't want a failure to occur between GetCachedPlan and
 	 * PortalDefineQuery; that would result in leaking our plancache refcount.
 	 */
-	oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+	oldContext = MemoryContextSwitchTo(portal->portalContext);
 
 	/* Copy the plan's query string into the portal */
 	query_string = pstrdup(psrc->query_string);
@@ -1620,10 +1646,11 @@ exec_bind_message(StringInfo input_message)
 		/* we have static list of params, so no hooks needed */
 		params->paramFetch = NULL;
 		params->paramFetchArg = NULL;
+		params->paramCompile = NULL;
+		params->paramCompileArg = NULL;
 		params->parserSetup = NULL;
 		params->parserSetupArg = NULL;
 		params->numParams = numParams;
-		params->paramMask = NULL;
 
 		for (paramno = 0; paramno < numParams; paramno++)
 		{
@@ -1989,7 +2016,7 @@ exec_execute_message(const char *portal_name, long max_rows)
 						  receiver,
 						  completionTag);
 
-	(*receiver->rDestroy) (receiver);
+	receiver->rDestroy(receiver);
 
 	if (completed)
 	{
@@ -2008,6 +2035,9 @@ exec_execute_message(const char *portal_name, long max_rows)
 			 * those that start or end a transaction block.
 			 */
 			CommandCounterIncrement();
+
+			/* full command has been executed, reset timeout */
+			disable_statement_timeout();
 		}
 
 		/* Send appropriate CommandComplete to client */
@@ -2093,7 +2123,7 @@ check_log_statement(List *stmt_list)
  * If logging is needed, the duration in msec is formatted into msec_str[],
  * which must be a 32-byte buffer.
  *
- * was_logged should be TRUE if caller already logged query details (this
+ * was_logged should be true if caller already logged query details (this
  * essentially prevents 2 from being returned).
  */
 int
@@ -2182,6 +2212,9 @@ errdetail_params(ParamListInfo params)
 		MemoryContext oldcontext;
 		int			paramno;
 
+		/* This code doesn't support dynamic param lists */
+		Assert(params->paramFetch == NULL);
+
 		/* Make sure any trash is generated in MessageContext */
 		oldcontext = MemoryContextSwitchTo(MessageContext);
 
@@ -2290,7 +2323,6 @@ static void
 exec_describe_statement_message(const char *stmt_name)
 {
 	CachedPlanSource *psrc;
-	StringInfoData buf;
 	int			i;
 
 	/*
@@ -2346,16 +2378,17 @@ exec_describe_statement_message(const char *stmt_name)
 	/*
 	 * First describe the parameters...
 	 */
-	pq_beginmessage(&buf, 't'); /* parameter description message type */
-	pq_sendint(&buf, psrc->num_params, 2);
+	pq_beginmessage_reuse(&row_description_buf, 't');	/* parameter description
+														 * message type */
+	pq_sendint16(&row_description_buf, psrc->num_params);
 
 	for (i = 0; i < psrc->num_params; i++)
 	{
 		Oid			ptype = psrc->param_types[i];
 
-		pq_sendint(&buf, (int) ptype, 4);
+		pq_sendint32(&row_description_buf, (int) ptype);
 	}
-	pq_endmessage(&buf);
+	pq_endmessage_reuse(&row_description_buf);
 
 	/*
 	 * Next send RowDescription or NoData to describe the result...
@@ -2367,7 +2400,10 @@ exec_describe_statement_message(const char *stmt_name)
 		/* Get the plan's primary targetlist */
 		tlist = CachedPlanGetTargetList(psrc, NULL);
 
-		SendRowDescriptionMessage(psrc->resultDesc, tlist, NULL);
+		SendRowDescriptionMessage(&row_description_buf,
+								  psrc->resultDesc,
+								  tlist,
+								  NULL);
 	}
 	else
 		pq_putemptymessage('n');	/* NoData */
@@ -2419,7 +2455,8 @@ exec_describe_portal_message(const char *portal_name)
 		return;					/* can't actually do anything... */
 
 	if (portal->tupDesc)
-		SendRowDescriptionMessage(portal->tupDesc,
+		SendRowDescriptionMessage(&row_description_buf,
+								  portal->tupDesc,
 								  FetchPortalTargetList(portal),
 								  portal->formats);
 	else
@@ -2437,25 +2474,27 @@ start_xact_command(void)
 	{
 		StartTransactionCommand();
 
-		/* Set statement timeout running, if any */
-		/* NB: this mustn't be enabled until we are within an xact */
-		if (StatementTimeout > 0)
-			enable_timeout_after(STATEMENT_TIMEOUT, StatementTimeout);
-		else
-			disable_timeout(STATEMENT_TIMEOUT, false);
-
 		xact_started = true;
 	}
+
+	/*
+	 * Start statement timeout if necessary.  Note that this'll intentionally
+	 * not reset the clock on an already started timeout, to avoid the timing
+	 * overhead when start_xact_command() is invoked repeatedly, without an
+	 * interceding finish_xact_command() (e.g. parse/bind/execute).  If that's
+	 * not desired, the timeout has to be disabled explicitly.
+	 */
+	enable_statement_timeout();
 }
 
 static void
 finish_xact_command(void)
 {
+	/* cancel active statement timeout after each command */
+	disable_statement_timeout();
+
 	if (xact_started)
 	{
-		/* Cancel any active statement timeout before committing */
-		disable_timeout(STATEMENT_TIMEOUT, false);
-
 		CommitTransactionCommand();
 
 #ifdef MEMORY_CONTEXT_CHECKING
@@ -2914,26 +2953,24 @@ ProcessInterrupts(void)
 						 " database and repeat your command.")));
 	}
 
-	if (QueryCancelPending)
+	/*
+	 * Don't allow query cancel interrupts while reading input from the
+	 * client, because we might lose sync in the FE/BE protocol.  (Die
+	 * interrupts are OK, because we won't read any further messages from the
+	 * client in that case.)
+	 */
+	if (QueryCancelPending && QueryCancelHoldoffCount != 0)
 	{
-		bool		lock_timeout_occurred;
-		bool		stmt_timeout_occurred;
-
 		/*
-		 * Don't allow query cancel interrupts while reading input from the
-		 * client, because we might lose sync in the FE/BE protocol.  (Die
-		 * interrupts are OK, because we won't read any further messages from
-		 * the client in that case.)
+		 * Re-arm InterruptPending so that we process the cancel request as
+		 * soon as we're done reading the message.
 		 */
-		if (QueryCancelHoldoffCount != 0)
-		{
-			/*
-			 * Re-arm InterruptPending so that we process the cancel request
-			 * as soon as we're done reading the message.
-			 */
-			InterruptPending = true;
-			return;
-		}
+		InterruptPending = true;
+	}
+	else if (QueryCancelPending)
+	{
+		bool		lock_timeout_occurred;
+		bool		stmt_timeout_occurred;
 
 		QueryCancelPending = false;
 
@@ -3704,6 +3741,9 @@ PostgresMain(int argc, char *argv[],
 		 */
 		CreateDataDirLockFile(false);
 
+		/* read control file (error checking and contains config ) */
+		LocalProcessControlFile(false);
+
 		/* Initialize MaxBackends (if under postmaster, was done already) */
 		InitializeMaxBackends();
 	}
@@ -3782,8 +3822,8 @@ PostgresMain(int argc, char *argv[],
 		StringInfoData buf;
 
 		pq_beginmessage(&buf, 'K');
-		pq_sendint(&buf, (int32) MyProcPid, sizeof(int32));
-		pq_sendint(&buf, (int32) MyCancelKey, sizeof(int32));
+		pq_sendint32(&buf, (int32) MyProcPid);
+		pq_sendint32(&buf, (int32) MyCancelKey);
 		pq_endmessage(&buf);
 		/* Need not flush since ReadyForQuery will do it. */
 	}
@@ -3802,6 +3842,19 @@ PostgresMain(int argc, char *argv[],
 										   "MessageContext",
 										   ALLOCSET_DEFAULT_SIZES);
 
+	/*
+	 * Create memory context and buffer used for RowDescription messages. As
+	 * SendRowDescriptionMessage(), via exec_describe_statement_message(), is
+	 * frequently executed for ever single statement, we don't want to
+	 * allocate a separate buffer every time.
+	 */
+	row_description_context = AllocSetContextCreate(TopMemoryContext,
+													"RowDescriptionContext",
+													ALLOCSET_DEFAULT_SIZES);
+	MemoryContextSwitchTo(row_description_context);
+	initStringInfo(&row_description_buf);
+	MemoryContextSwitchTo(TopMemoryContext);
+
 	/*
 	 * Remember stand-alone backend startup time
 	 */
@@ -3859,6 +3912,7 @@ PostgresMain(int argc, char *argv[],
 		 */
 		disable_all_timeouts(false);
 		QueryCancelPending = false; /* second to avoid race condition */
+		stmt_timeout_active = false;
 
 		/* Not reading from the client anymore. */
 		DoingCommandRead = false;
@@ -4421,11 +4475,8 @@ ShowUsage(const char *title)
 	}
 
 	/*
-	 * the only stats we don't show here are for memory usage -- i can't
-	 * figure out how to interpret the relevant fields in the rusage struct,
-	 * and they change names across o/s platforms, anyway. if you can figure
-	 * out what the entries mean, you can somehow extract resident set size,
-	 * shared text size, and unshared data and stack sizes.
+	 * The only stats we don't show here are ixrss, idrss, isrss.  It takes
+	 * some work to interpret them, and most platforms don't fill them in.
 	 */
 	initStringInfo(&str);
 
@@ -4445,6 +4496,16 @@ ShowUsage(const char *title)
 					 (long) sys.tv_sec,
 					 (long) sys.tv_usec);
 #if defined(HAVE_GETRUSAGE)
+	appendStringInfo(&str,
+					 "!\t%ld kB max resident size\n",
+#if defined(__darwin__)
+	/* in bytes on macOS */
+					 r.ru_maxrss / 1024
+#else
+	/* in kilobytes on most other platforms */
+					 r.ru_maxrss
+#endif
+		);
 	appendStringInfo(&str,
 					 "!\t%ld/%ld [%ld/%ld] filesystem blocks in/out\n",
 					 r.ru_inblock - Save_r.ru_inblock,
@@ -4514,3 +4575,42 @@ log_disconnections(int code, Datum arg)
 					port->user_name, port->database_name, port->remote_host,
 					port->remote_port[0] ? " port=" : "", port->remote_port)));
 }
+
+/*
+ * Start statement timeout timer, if enabled.
+ *
+ * If there's already a timeout running, don't restart the timer.  That
+ * enables compromises between accuracy of timeouts and cost of starting a
+ * timeout.
+ */
+static void
+enable_statement_timeout(void)
+{
+	/* must be within an xact */
+	Assert(xact_started);
+
+	if (StatementTimeout > 0)
+	{
+		if (!stmt_timeout_active)
+		{
+			enable_timeout_after(STATEMENT_TIMEOUT, StatementTimeout);
+			stmt_timeout_active = true;
+		}
+	}
+	else
+		disable_timeout(STATEMENT_TIMEOUT, false);
+}
+
+/*
+ * Disable statement timeout, if active.
+ */
+static void
+disable_statement_timeout(void)
+{
+	if (stmt_timeout_active)
+	{
+		disable_timeout(STATEMENT_TIMEOUT, false);
+
+		stmt_timeout_active = false;
+	}
+}
diff --git a/src/backend/tcop/pquery.c b/src/backend/tcop/pquery.c
index 7e820d05dd..66cc5c35c6 100644
--- a/src/backend/tcop/pquery.c
+++ b/src/backend/tcop/pquery.c
@@ -3,7 +3,7 @@
  * pquery.c
  *	  POSTGRES process query command code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -466,9 +466,9 @@ PortalStart(Portal portal, ParamListInfo params,
 		ActivePortal = portal;
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
-		PortalContext = PortalGetHeapMemory(portal);
+		PortalContext = portal->portalContext;
 
-		oldContext = MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+		oldContext = MemoryContextSwitchTo(PortalContext);
 
 		/* Must remember portal param list, if any */
 		portal->portalParams = params;
@@ -634,7 +634,7 @@ PortalSetResultFormat(Portal portal, int nFormats, int16 *formats)
 		return;
 	natts = portal->tupDesc->natts;
 	portal->formats = (int16 *)
-		MemoryContextAlloc(PortalGetHeapMemory(portal),
+		MemoryContextAlloc(portal->portalContext,
 						   natts * sizeof(int16));
 	if (nFormats > 1)
 	{
@@ -682,7 +682,7 @@ PortalSetResultFormat(Portal portal, int nFormats, int16 *formats)
  *		in which to store a command completion status string.
  *		May be NULL if caller doesn't want a status string.
  *
- * Returns TRUE if the portal's execution is complete, FALSE if it was
+ * Returns true if the portal's execution is complete, false if it was
  * suspended due to exhaustion of the count parameter.
  */
 bool
@@ -748,7 +748,7 @@ PortalRun(Portal portal, long count, bool isTopLevel, bool run_once,
 		ActivePortal = portal;
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
-		PortalContext = PortalGetHeapMemory(portal);
+		PortalContext = portal->portalContext;
 
 		MemoryContextSwitchTo(PortalContext);
 
@@ -885,7 +885,7 @@ PortalRunSelect(Portal portal,
 	 * NB: queryDesc will be NULL if we are fetching from a held cursor or a
 	 * completed utility query; can't use it in that path.
 	 */
-	queryDesc = PortalGetQueryDesc(portal);
+	queryDesc = portal->queryDesc;
 
 	/* Caller messed up if we have neither a ready query nor held data. */
 	Assert(queryDesc || portal->holdStore);
@@ -1049,7 +1049,7 @@ FillPortalStore(Portal portal, bool isTopLevel)
 	if (completionTag[0] != '\0')
 		portal->commandTag = pstrdup(completionTag);
 
-	(*treceiver->rDestroy) (treceiver);
+	treceiver->rDestroy(treceiver);
 }
 
 /*
@@ -1073,7 +1073,7 @@ RunFromStore(Portal portal, ScanDirection direction, uint64 count,
 
 	slot = MakeSingleTupleTableSlot(portal->tupDesc);
 
-	(*dest->rStartup) (dest, CMD_SELECT, portal->tupDesc);
+	dest->rStartup(dest, CMD_SELECT, portal->tupDesc);
 
 	if (ScanDirectionIsNoMovement(direction))
 	{
@@ -1103,7 +1103,7 @@ RunFromStore(Portal portal, ScanDirection direction, uint64 count,
 			 * has closed and no more tuples can be sent. If that's the case,
 			 * end the loop.
 			 */
-			if (!((*dest->receiveSlot) (slot, dest)))
+			if (!dest->receiveSlot(slot, dest))
 				break;
 
 			ExecClearTuple(slot);
@@ -1119,7 +1119,7 @@ RunFromStore(Portal portal, ScanDirection direction, uint64 count,
 		}
 	}
 
-	(*dest->rShutdown) (dest);
+	dest->rShutdown(dest);
 
 	ExecDropSingleTupleTableSlot(slot);
 
@@ -1184,7 +1184,7 @@ PortalRunUtility(Portal portal, PlannedStmt *pstmt,
 				   completionTag);
 
 	/* Some utility statements may change context on us */
-	MemoryContextSwitchTo(PortalGetHeapMemory(portal));
+	MemoryContextSwitchTo(portal->portalContext);
 
 	/*
 	 * Some utility commands may pop the ActiveSnapshot stack from under us,
@@ -1343,9 +1343,9 @@ PortalRunMulti(Portal portal,
 		/*
 		 * Clear subsidiary contexts to recover temporary memory.
 		 */
-		Assert(PortalGetHeapMemory(portal) == CurrentMemoryContext);
+		Assert(portal->portalContext == CurrentMemoryContext);
 
-		MemoryContextDeleteChildren(PortalGetHeapMemory(portal));
+		MemoryContextDeleteChildren(portal->portalContext);
 	}
 
 	/* Pop the snapshot if we pushed one. */
@@ -1424,7 +1424,7 @@ PortalRunFetch(Portal portal,
 		ActivePortal = portal;
 		if (portal->resowner)
 			CurrentResourceOwner = portal->resowner;
-		PortalContext = PortalGetHeapMemory(portal);
+		PortalContext = portal->portalContext;
 
 		oldContext = MemoryContextSwitchTo(PortalContext);
 
@@ -1694,7 +1694,7 @@ DoPortalRewind(Portal portal)
 	}
 
 	/* Rewind executor, if active */
-	queryDesc = PortalGetQueryDesc(portal);
+	queryDesc = portal->queryDesc;
 	if (queryDesc)
 	{
 		PushActiveSnapshot(queryDesc->snapshot);
diff --git a/src/backend/tcop/utility.c b/src/backend/tcop/utility.c
index 775477c6cf..f78efdf359 100644
--- a/src/backend/tcop/utility.c
+++ b/src/backend/tcop/utility.c
@@ -5,7 +5,7 @@
  *	  commands.  At one time acted as an interface between the Lisp and C
  *	  systems.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -23,6 +23,7 @@
 #include "access/xlog.h"
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
+#include "catalog/pg_inherits_fn.h"
 #include "catalog/toasting.h"
 #include "commands/alter.h"
 #include "commands/async.h"
@@ -529,7 +530,8 @@ standard_ProcessUtility(PlannedStmt *pstmt,
 			break;
 
 		case T_DoStmt:
-			ExecuteDoStmt((DoStmt *) parsetree);
+			ExecuteDoStmt((DoStmt *) parsetree,
+						  (context != PROCESS_UTILITY_TOPLEVEL || IsTransactionBlock()));
 			break;
 
 		case T_CreateTableSpaceStmt:
@@ -657,6 +659,11 @@ standard_ProcessUtility(PlannedStmt *pstmt,
 			}
 			break;
 
+		case T_CallStmt:
+			ExecuteCallStmt(castNode(CallStmt, parsetree), params,
+							(context != PROCESS_UTILITY_TOPLEVEL || IsTransactionBlock()));
+			break;
+
 		case T_ClusterStmt:
 			/* we choose to allow this during "read only" transactions */
 			PreventCommandDuringRecovery("CLUSTER");
@@ -823,7 +830,7 @@ standard_ProcessUtility(PlannedStmt *pstmt,
 			{
 				GrantStmt  *stmt = (GrantStmt *) parsetree;
 
-				if (EventTriggerSupportsGrantObjectType(stmt->objtype))
+				if (EventTriggerSupportsObjectType(stmt->objtype))
 					ProcessUtilitySlow(pstate, pstmt, queryString,
 									   context, params, queryEnv,
 									   dest, completionTag);
@@ -1296,6 +1303,7 @@ ProcessUtilitySlow(ParseState *pstate,
 					IndexStmt  *stmt = (IndexStmt *) parsetree;
 					Oid			relid;
 					LOCKMODE	lockmode;
+					List	   *inheritors = NIL;
 
 					if (stmt->concurrent)
 						PreventTransactionChain(isTopLevel,
@@ -1318,6 +1326,23 @@ ProcessUtilitySlow(ParseState *pstate,
 												 RangeVarCallbackOwnsRelation,
 												 NULL);
 
+					/*
+					 * CREATE INDEX on partitioned tables (but not regular
+					 * inherited tables) recurses to partitions, so we must
+					 * acquire locks early to avoid deadlocks.
+					 */
+					if (stmt->relation->inh)
+					{
+						Relation	rel;
+
+						/* already locked by RangeVarGetRelidExtended */
+						rel = heap_open(relid, NoLock);
+						if (rel->rd_rel->relkind == RELKIND_PARTITIONED_TABLE)
+							inheritors = find_all_inheritors(relid, lockmode,
+															 NULL);
+						heap_close(rel, NoLock);
+					}
+
 					/* Run parse analysis ... */
 					stmt = transformIndexStmt(relid, stmt, queryString);
 
@@ -1327,6 +1352,8 @@ ProcessUtilitySlow(ParseState *pstate,
 						DefineIndex(relid,	/* OID of heap relation */
 									stmt,
 									InvalidOid, /* no predefined OID */
+									InvalidOid, /* no parent index */
+									InvalidOid, /* no parent constraint */
 									false,	/* is_alter_table */
 									true,	/* check_rights */
 									true,	/* check_not_in_use */
@@ -1342,6 +1369,8 @@ ProcessUtilitySlow(ParseState *pstate,
 													 parsetree);
 					commandCollected = true;
 					EventTriggerAlterTableEnd();
+
+					list_free(inheritors);
 				}
 				break;
 
@@ -1412,7 +1441,7 @@ ProcessUtilitySlow(ParseState *pstate,
 				break;
 
 			case T_AlterEnumStmt:	/* ALTER TYPE (enum) */
-				address = AlterEnum((AlterEnumStmt *) parsetree);
+				address = AlterEnum((AlterEnumStmt *) parsetree, isTopLevel);
 				break;
 
 			case T_ViewStmt:	/* CREATE VIEW */
@@ -1957,9 +1986,15 @@ AlterObjectTypeCommandTag(ObjectType objtype)
 		case OBJECT_POLICY:
 			tag = "ALTER POLICY";
 			break;
+		case OBJECT_PROCEDURE:
+			tag = "ALTER PROCEDURE";
+			break;
 		case OBJECT_ROLE:
 			tag = "ALTER ROLE";
 			break;
+		case OBJECT_ROUTINE:
+			tag = "ALTER ROUTINE";
+			break;
 		case OBJECT_RULE:
 			tag = "ALTER RULE";
 			break;
@@ -2261,6 +2296,12 @@ CreateCommandTag(Node *parsetree)
 				case OBJECT_FUNCTION:
 					tag = "DROP FUNCTION";
 					break;
+				case OBJECT_PROCEDURE:
+					tag = "DROP PROCEDURE";
+					break;
+				case OBJECT_ROUTINE:
+					tag = "DROP ROUTINE";
+					break;
 				case OBJECT_AGGREGATE:
 					tag = "DROP AGGREGATE";
 					break;
@@ -2359,7 +2400,20 @@ CreateCommandTag(Node *parsetree)
 			break;
 
 		case T_AlterFunctionStmt:
-			tag = "ALTER FUNCTION";
+			switch (((AlterFunctionStmt *) parsetree)->objtype)
+			{
+				case OBJECT_FUNCTION:
+					tag = "ALTER FUNCTION";
+					break;
+				case OBJECT_PROCEDURE:
+					tag = "ALTER PROCEDURE";
+					break;
+				case OBJECT_ROUTINE:
+					tag = "ALTER ROUTINE";
+					break;
+				default:
+					tag = "???";
+			}
 			break;
 
 		case T_GrantStmt:
@@ -2438,7 +2492,10 @@ CreateCommandTag(Node *parsetree)
 			break;
 
 		case T_CreateFunctionStmt:
-			tag = "CREATE FUNCTION";
+			if (((CreateFunctionStmt *) parsetree)->is_procedure)
+				tag = "CREATE PROCEDURE";
+			else
+				tag = "CREATE FUNCTION";
 			break;
 
 		case T_IndexStmt:
@@ -2493,6 +2550,10 @@ CreateCommandTag(Node *parsetree)
 			tag = "LOAD";
 			break;
 
+		case T_CallStmt:
+			tag = "CALL";
+			break;
+
 		case T_ClusterStmt:
 			tag = "CLUSTER";
 			break;
@@ -3007,6 +3068,10 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_AlterOperatorStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
 		case T_AlterTableMoveAllStmt:
 		case T_AlterTableStmt:
 			lev = LOGSTMT_DDL;
@@ -3112,6 +3177,10 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_ALL;
 			break;
 
+		case T_CallStmt:
+			lev = LOGSTMT_ALL;
+			break;
+
 		case T_ClusterStmt:
 			lev = LOGSTMT_DDL;
 			break;
@@ -3291,6 +3360,14 @@ GetCommandLogLevel(Node *parsetree)
 			lev = LOGSTMT_DDL;
 			break;
 
+		case T_CreateStatsStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
+		case T_AlterCollationStmt:
+			lev = LOGSTMT_DDL;
+			break;
+
 			/* already-planned queries */
 		case T_PlannedStmt:
 			{
diff --git a/src/backend/tsearch/Makefile b/src/backend/tsearch/Makefile
index 34fe4c5b3c..227468ae9e 100644
--- a/src/backend/tsearch/Makefile
+++ b/src/backend/tsearch/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for backend/tsearch
 #
-# Copyright (c) 2006-2017, PostgreSQL Global Development Group
+# Copyright (c) 2006-2018, PostgreSQL Global Development Group
 #
 # src/backend/tsearch/Makefile
 #
diff --git a/src/backend/tsearch/dict.c b/src/backend/tsearch/dict.c
index 63655fb592..c44849b7d3 100644
--- a/src/backend/tsearch/dict.c
+++ b/src/backend/tsearch/dict.c
@@ -3,7 +3,7 @@
  * dict.c
  *		Standard interface to dictionary
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tsearch/dict_ispell.c b/src/backend/tsearch/dict_ispell.c
index 8f61bd2830..edc6547700 100644
--- a/src/backend/tsearch/dict_ispell.c
+++ b/src/backend/tsearch/dict_ispell.c
@@ -3,7 +3,7 @@
  * dict_ispell.c
  *		Ispell dictionary interface
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -44,7 +44,7 @@ dispell_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp(defel->defname, "DictFile") == 0)
+		if (strcmp(defel->defname, "dictfile") == 0)
 		{
 			if (dictloaded)
 				ereport(ERROR,
@@ -55,7 +55,7 @@ dispell_init(PG_FUNCTION_ARGS)
 														   "dict"));
 			dictloaded = true;
 		}
-		else if (pg_strcasecmp(defel->defname, "AffFile") == 0)
+		else if (strcmp(defel->defname, "afffile") == 0)
 		{
 			if (affloaded)
 				ereport(ERROR,
@@ -66,7 +66,7 @@ dispell_init(PG_FUNCTION_ARGS)
 														"affix"));
 			affloaded = true;
 		}
-		else if (pg_strcasecmp(defel->defname, "StopWords") == 0)
+		else if (strcmp(defel->defname, "stopwords") == 0)
 		{
 			if (stoploaded)
 				ereport(ERROR,
diff --git a/src/backend/tsearch/dict_simple.c b/src/backend/tsearch/dict_simple.c
index a13cdc0743..ac6a24eba5 100644
--- a/src/backend/tsearch/dict_simple.c
+++ b/src/backend/tsearch/dict_simple.c
@@ -3,7 +3,7 @@
  * dict_simple.c
  *		Simple dictionary: just lowercase and check for stopword
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -41,7 +41,7 @@ dsimple_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp("StopWords", defel->defname) == 0)
+		if (strcmp(defel->defname, "stopwords") == 0)
 		{
 			if (stoploaded)
 				ereport(ERROR,
@@ -50,7 +50,7 @@ dsimple_init(PG_FUNCTION_ARGS)
 			readstoplist(defGetString(defel), &d->stoplist, lowerstr);
 			stoploaded = true;
 		}
-		else if (pg_strcasecmp("Accept", defel->defname) == 0)
+		else if (strcmp(defel->defname, "accept") == 0)
 		{
 			if (acceptloaded)
 				ereport(ERROR,
diff --git a/src/backend/tsearch/dict_synonym.c b/src/backend/tsearch/dict_synonym.c
index e67d2e6e04..c011886cb0 100644
--- a/src/backend/tsearch/dict_synonym.c
+++ b/src/backend/tsearch/dict_synonym.c
@@ -3,7 +3,7 @@
  * dict_synonym.c
  *		Synonym dictionary: replace word by its synonym
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -108,9 +108,9 @@ dsynonym_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp("Synonyms", defel->defname) == 0)
+		if (strcmp(defel->defname, "synonyms") == 0)
 			filename = defGetString(defel);
-		else if (pg_strcasecmp("CaseSensitive", defel->defname) == 0)
+		else if (strcmp(defel->defname, "casesensitive") == 0)
 			case_sensitive = defGetBoolean(defel);
 		else
 			ereport(ERROR,
diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
index 1b6085add3..24364e646d 100644
--- a/src/backend/tsearch/dict_thesaurus.c
+++ b/src/backend/tsearch/dict_thesaurus.c
@@ -3,7 +3,7 @@
  * dict_thesaurus.c
  *		Thesaurus dictionary: phrase to phrase substitution
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -165,7 +165,7 @@ addWrd(DictThesaurus *d, char *b, char *e, uint32 idsubst, uint16 nwrd, uint16 p
 #define TR_INSUBS	4
 
 static void
-thesaurusRead(char *filename, DictThesaurus *d)
+thesaurusRead(const char *filename, DictThesaurus *d)
 {
 	tsearch_readline_state trst;
 	uint32		idsubst = 0;
@@ -616,7 +616,7 @@ thesaurus_init(PG_FUNCTION_ARGS)
 	{
 		DefElem    *defel = (DefElem *) lfirst(l);
 
-		if (pg_strcasecmp("DictFile", defel->defname) == 0)
+		if (strcmp(defel->defname, "dictfile") == 0)
 		{
 			if (fileloaded)
 				ereport(ERROR,
@@ -625,7 +625,7 @@ thesaurus_init(PG_FUNCTION_ARGS)
 			thesaurusRead(defGetString(defel), d);
 			fileloaded = true;
 		}
-		else if (pg_strcasecmp("Dictionary", defel->defname) == 0)
+		else if (strcmp(defel->defname, "dictionary") == 0)
 		{
 			if (subdictname)
 				ereport(ERROR,
diff --git a/src/backend/tsearch/regis.c b/src/backend/tsearch/regis.c
index 2b89f596f0..cab5a4cbd2 100644
--- a/src/backend/tsearch/regis.c
+++ b/src/backend/tsearch/regis.c
@@ -3,7 +3,7 @@
  * regis.c
  *		Fast regex subset
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -178,7 +178,6 @@ RS_free(Regis *r)
 	r->node = NULL;
 }
 
-#ifdef USE_WIDE_UPPER_LOWER
 static bool
 mb_strchr(char *str, char *c)
 {
@@ -209,10 +208,6 @@ mb_strchr(char *str, char *c)
 
 	return res;
 }
-#else
-#define mb_strchr(s,c)	( (strchr((s),*(c)) == NULL) ? false : true )
-#endif
-
 
 bool
 RS_execute(Regis *r, char *str)
diff --git a/src/backend/tsearch/spell.c b/src/backend/tsearch/spell.c
index 1020250490..b9fdd77e19 100644
--- a/src/backend/tsearch/spell.c
+++ b/src/backend/tsearch/spell.c
@@ -3,7 +3,7 @@
  * spell.c
  *		Normalizing word with ISpell
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * Ispell dictionary
  * -----------------
@@ -195,14 +195,14 @@ static char *VoidString = "";
 static int
 cmpspell(const void *s1, const void *s2)
 {
-	return (strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word));
+	return strcmp((*(SPELL *const *) s1)->word, (*(SPELL *const *) s2)->word);
 }
 
 static int
 cmpspellaffix(const void *s1, const void *s2)
 {
-	return (strcmp((*(SPELL *const *) s1)->p.flag,
-				   (*(SPELL *const *) s2)->p.flag));
+	return strcmp((*(SPELL *const *) s1)->p.flag,
+				  (*(SPELL *const *) s2)->p.flag);
 }
 
 static int
@@ -450,7 +450,7 @@ getNextFlagFromString(IspellDict *Conf, char **sflagset, char *sflag)
  * otherwise returns false.
  */
 static bool
-IsAffixFlagInUse(IspellDict *Conf, int affix, char *affixflag)
+IsAffixFlagInUse(IspellDict *Conf, int affix, const char *affixflag)
 {
 	char	   *flagcur;
 	char		flag[BUFSIZ];
@@ -596,7 +596,7 @@ NIImportDictionary(IspellDict *Conf, const char *filename)
  * Returns 1 if the word was found in the prefix tree, else returns 0.
  */
 static int
-FindWord(IspellDict *Conf, const char *word, char *affixflag, int flag)
+FindWord(IspellDict *Conf, const char *word, const char *affixflag, int flag)
 {
 	SPNode	   *node = Conf->Dictionary;
 	SPNodeData *StopLow,
@@ -776,7 +776,7 @@ NIAddAffix(IspellDict *Conf, const char *flag, char flagflags, const char *mask,
  *
  * The buffer at "next" must be of size BUFSIZ; we truncate the input to fit.
  *
- * Returns TRUE if we found a field, FALSE if not.
+ * Returns true if we found a field, false if not.
  */
 static bool
 get_nextfield(char **str, char *next)
@@ -2240,9 +2240,9 @@ NormalizeSubWord(IspellDict *Conf, char *word, int flag)
 	if (cur == forms)
 	{
 		pfree(forms);
-		return (NULL);
+		return NULL;
 	}
-	return (forms);
+	return forms;
 }
 
 typedef struct SplitVar
diff --git a/src/backend/tsearch/to_tsany.c b/src/backend/tsearch/to_tsany.c
index 35d9ab276c..ea5947a3a8 100644
--- a/src/backend/tsearch/to_tsany.c
+++ b/src/backend/tsearch/to_tsany.c
@@ -3,7 +3,7 @@
  * to_tsany.c
  *		to_ts* function definitions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -271,7 +271,7 @@ Datum
 jsonb_to_tsvector_byid(PG_FUNCTION_ARGS)
 {
 	Oid			cfgId = PG_GETARG_OID(0);
-	Jsonb	   *jb = PG_GETARG_JSONB(1);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(1);
 	TSVector	result;
 	TSVectorBuildState state;
 	ParsedText	prs;
@@ -293,13 +293,13 @@ jsonb_to_tsvector_byid(PG_FUNCTION_ARGS)
 Datum
 jsonb_to_tsvector(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	Oid			cfgId;
 
 	cfgId = getTSCurrentConfig(true);
 	PG_RETURN_DATUM(DirectFunctionCall2(jsonb_to_tsvector_byid,
 										ObjectIdGetDatum(cfgId),
-										JsonbGetDatum(jb)));
+										JsonbPGetDatum(jb)));
 }
 
 Datum
diff --git a/src/backend/tsearch/ts_locale.c b/src/backend/tsearch/ts_locale.c
index 1aa3e23733..a114d6635b 100644
--- a/src/backend/tsearch/ts_locale.c
+++ b/src/backend/tsearch/ts_locale.c
@@ -3,7 +3,7 @@
  * ts_locale.c
  *		locale compatibility layer for tsearch
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -21,8 +21,6 @@
 static void tsearch_readline_callback(void *arg);
 
 
-#ifdef USE_WIDE_UPPER_LOWER
-
 int
 t_isdigit(const char *ptr)
 {
@@ -86,7 +84,6 @@ t_isprint(const char *ptr)
 
 	return iswprint((wint_t) character[0]);
 }
-#endif							/* USE_WIDE_UPPER_LOWER */
 
 
 /*
@@ -244,17 +241,12 @@ char *
 lowerstr_with_len(const char *str, int len)
 {
 	char	   *out;
-
-#ifdef USE_WIDE_UPPER_LOWER
 	Oid			collation = DEFAULT_COLLATION_OID;	/* TODO */
 	pg_locale_t mylocale = 0;	/* TODO */
-#endif
 
 	if (len == 0)
 		return pstrdup("");
 
-#ifdef USE_WIDE_UPPER_LOWER
-
 	/*
 	 * Use wide char code only when max encoding length > 1 and ctype != C.
 	 * Some operating systems fail with multi-byte encodings and a C locale.
@@ -300,7 +292,6 @@ lowerstr_with_len(const char *str, int len)
 		Assert(wlen < len);
 	}
 	else
-#endif							/* USE_WIDE_UPPER_LOWER */
 	{
 		const char *ptr = str;
 		char	   *outptr;
diff --git a/src/backend/tsearch/ts_parse.c b/src/backend/tsearch/ts_parse.c
index ad5dddff4b..7b69ef5660 100644
--- a/src/backend/tsearch/ts_parse.c
+++ b/src/backend/tsearch/ts_parse.c
@@ -3,7 +3,7 @@
  * ts_parse.c
  *		main parse functions for tsearch
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tsearch/ts_selfuncs.c b/src/backend/tsearch/ts_selfuncs.c
index 046f543c01..7ebc3d4641 100644
--- a/src/backend/tsearch/ts_selfuncs.c
+++ b/src/backend/tsearch/ts_selfuncs.c
@@ -3,7 +3,7 @@
  * ts_selfuncs.c
  *	  Selectivity estimation functions for text search operators.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tsearch/ts_typanalyze.c b/src/backend/tsearch/ts_typanalyze.c
index 320c7f1a61..1f93963c66 100644
--- a/src/backend/tsearch/ts_typanalyze.c
+++ b/src/backend/tsearch/ts_typanalyze.c
@@ -3,7 +3,7 @@
  * ts_typanalyze.c
  *	  functions for gathering statistics from tsvector columns
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tsearch/ts_utils.c b/src/backend/tsearch/ts_utils.c
index 56d4cf03e5..f6e03aea4f 100644
--- a/src/backend/tsearch/ts_utils.c
+++ b/src/backend/tsearch/ts_utils.c
@@ -3,7 +3,7 @@
  * ts_utils.c
  *		various support functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/tsearch/wparser.c b/src/backend/tsearch/wparser.c
index c9ce80a91a..649245b292 100644
--- a/src/backend/tsearch/wparser.c
+++ b/src/backend/tsearch/wparser.c
@@ -3,7 +3,7 @@
  * wparser.c
  *		Standard interface to word parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -383,7 +383,7 @@ Datum
 ts_headline_jsonb_byid_opt(PG_FUNCTION_ARGS)
 {
 	Oid			tsconfig = PG_GETARG_OID(0);
-	Jsonb	   *jb = PG_GETARG_JSONB(1);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(1);
 	TSQuery		query = PG_GETARG_TSQUERY(2);
 	text	   *opt = (PG_NARGS() > 3 && PG_GETARG_POINTER(3)) ? PG_GETARG_TEXT_P(3) : NULL;
 	Jsonb	   *out;
@@ -424,7 +424,7 @@ ts_headline_jsonb_byid_opt(PG_FUNCTION_ARGS)
 		pfree(prs.stopsel);
 	}
 
-	PG_RETURN_JSONB(out);
+	PG_RETURN_JSONB_P(out);
 }
 
 Datum
diff --git a/src/backend/tsearch/wparser_def.c b/src/backend/tsearch/wparser_def.c
index e841a1ccf0..f0c3441990 100644
--- a/src/backend/tsearch/wparser_def.c
+++ b/src/backend/tsearch/wparser_def.c
@@ -3,7 +3,7 @@
  * wparser_def.c
  *		Default text search parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -241,11 +241,9 @@ typedef struct TParser
 	/* string and position information */
 	char	   *str;			/* multibyte string */
 	int			lenstr;			/* length of mbstring */
-#ifdef USE_WIDE_UPPER_LOWER
 	wchar_t    *wstr;			/* wide character string */
 	pg_wchar   *pgwstr;			/* wide character string for C-locale */
 	bool		usewide;
-#endif
 
 	/* State of parse */
 	int			charmaxlen;
@@ -294,8 +292,6 @@ TParserInit(char *str, int len)
 	prs->str = str;
 	prs->lenstr = len;
 
-#ifdef USE_WIDE_UPPER_LOWER
-
 	/*
 	 * Use wide char code only when max encoding length > 1.
 	 */
@@ -323,7 +319,6 @@ TParserInit(char *str, int len)
 	}
 	else
 		prs->usewide = false;
-#endif
 
 	prs->state = newTParserPosition(NULL);
 	prs->state->state = TPS_Base;
@@ -360,15 +355,12 @@ TParserCopyInit(const TParser *orig)
 	prs->charmaxlen = orig->charmaxlen;
 	prs->str = orig->str + orig->state->posbyte;
 	prs->lenstr = orig->lenstr - orig->state->posbyte;
-
-#ifdef USE_WIDE_UPPER_LOWER
 	prs->usewide = orig->usewide;
 
 	if (orig->pgwstr)
 		prs->pgwstr = orig->pgwstr + orig->state->poschar;
 	if (orig->wstr)
 		prs->wstr = orig->wstr + orig->state->poschar;
-#endif
 
 	prs->state = newTParserPosition(NULL);
 	prs->state->state = TPS_Base;
@@ -393,12 +385,10 @@ TParserClose(TParser *prs)
 		prs->state = ptr;
 	}
 
-#ifdef USE_WIDE_UPPER_LOWER
 	if (prs->wstr)
 		pfree(prs->wstr);
 	if (prs->pgwstr)
 		pfree(prs->pgwstr);
-#endif
 
 #ifdef WPARSER_TRACE
 	fprintf(stderr, "closing parser\n");
@@ -437,96 +427,45 @@ TParserCopyClose(TParser *prs)
  *	- if locale is C then we use pgwstr instead of wstr.
  */
 
-#ifdef USE_WIDE_UPPER_LOWER
-
-#define p_iswhat(type)														\
+#define p_iswhat(type, nonascii)											\
+																			\
 static int																	\
-p_is##type(TParser *prs) {													\
-	Assert( prs->state );													\
-	if ( prs->usewide )														\
+p_is##type(TParser *prs)													\
+{																			\
+	Assert(prs->state);														\
+	if (prs->usewide)														\
 	{																		\
-		if ( prs->pgwstr )													\
+		if (prs->pgwstr)													\
 		{																	\
 			unsigned int c = *(prs->pgwstr + prs->state->poschar);			\
-			if ( c > 0x7f )													\
-				return 0;													\
-			return is##type( c );											\
+			if (c > 0x7f)													\
+				return nonascii;											\
+			return is##type(c);												\
 		}																	\
-		return isw##type( *( prs->wstr + prs->state->poschar ) );			\
+		return isw##type(*(prs->wstr + prs->state->poschar));				\
 	}																		\
-																			\
-	return is##type( *(unsigned char*)( prs->str + prs->state->posbyte ) ); \
-}	\
+	return is##type(*(unsigned char *) (prs->str + prs->state->posbyte));	\
+}																			\
 																			\
 static int																	\
-p_isnot##type(TParser *prs) {												\
+p_isnot##type(TParser *prs)													\
+{																			\
 	return !p_is##type(prs);												\
 }
 
-static int
-p_isalnum(TParser *prs)
-{
-	Assert(prs->state);
-
-	if (prs->usewide)
-	{
-		if (prs->pgwstr)
-		{
-			unsigned int c = *(prs->pgwstr + prs->state->poschar);
-
-			/*
-			 * any non-ascii symbol with multibyte encoding with C-locale is
-			 * an alpha character
-			 */
-			if (c > 0x7f)
-				return 1;
-
-			return isalnum(c);
-		}
-
-		return iswalnum(*(prs->wstr + prs->state->poschar));
-	}
-
-	return isalnum(*(unsigned char *) (prs->str + prs->state->posbyte));
-}
-static int
-p_isnotalnum(TParser *prs)
-{
-	return !p_isalnum(prs);
-}
-
-static int
-p_isalpha(TParser *prs)
-{
-	Assert(prs->state);
-
-	if (prs->usewide)
-	{
-		if (prs->pgwstr)
-		{
-			unsigned int c = *(prs->pgwstr + prs->state->poschar);
-
-			/*
-			 * any non-ascii symbol with multibyte encoding with C-locale is
-			 * an alpha character
-			 */
-			if (c > 0x7f)
-				return 1;
-
-			return isalpha(c);
-		}
-
-		return iswalpha(*(prs->wstr + prs->state->poschar));
-	}
-
-	return isalpha(*(unsigned char *) (prs->str + prs->state->posbyte));
-}
-
-static int
-p_isnotalpha(TParser *prs)
-{
-	return !p_isalpha(prs);
-}
+/*
+ * In C locale with a multibyte encoding, any non-ASCII symbol is considered
+ * an alpha character, but not a member of other char classes.
+ */
+p_iswhat(alnum, 1)
+p_iswhat(alpha, 1)
+p_iswhat(digit, 0)
+p_iswhat(lower, 0)
+p_iswhat(print, 0)
+p_iswhat(punct, 0)
+p_iswhat(space, 0)
+p_iswhat(upper, 0)
+p_iswhat(xdigit, 0)
 
 /* p_iseq should be used only for ascii symbols */
 
@@ -536,39 +475,6 @@ p_iseq(TParser *prs, char c)
 	Assert(prs->state);
 	return ((prs->state->charlen == 1 && *(prs->str + prs->state->posbyte) == c)) ? 1 : 0;
 }
-#else							/* USE_WIDE_UPPER_LOWER */
-
-#define p_iswhat(type)														\
-static int																	\
-p_is##type(TParser *prs) {													\
-	Assert( prs->state );													\
-	return is##type( (unsigned char)*( prs->str + prs->state->posbyte ) );	\
-}	\
-																			\
-static int																	\
-p_isnot##type(TParser *prs) {												\
-	return !p_is##type(prs);												\
-}
-
-
-static int
-p_iseq(TParser *prs, char c)
-{
-	Assert(prs->state);
-	return (*(prs->str + prs->state->posbyte) == c) ? 1 : 0;
-}
-
-p_iswhat(alnum)
-p_iswhat(alpha)
-#endif							/* USE_WIDE_UPPER_LOWER */
-
-p_iswhat(digit)
-p_iswhat(lower)
-p_iswhat(print)
-p_iswhat(punct)
-p_iswhat(space)
-p_iswhat(upper)
-p_iswhat(xdigit)
 
 static int
 p_isEOF(TParser *prs)
@@ -785,8 +691,6 @@ p_isspecial(TParser *prs)
 	if (pg_dsplen(prs->str + prs->state->posbyte) == 0)
 		return 1;
 
-#ifdef USE_WIDE_UPPER_LOWER
-
 	/*
 	 * Unicode Characters in the 'Mark, Spacing Combining' Category That
 	 * characters are not alpha although they are not breakers of word too.
@@ -1050,7 +954,6 @@ p_isspecial(TParser *prs)
 				StopHigh = StopMiddle;
 		}
 	}
-#endif
 
 	return 0;
 }
diff --git a/src/backend/utils/Gen_dummy_probes.pl b/src/backend/utils/Gen_dummy_probes.pl
index e6dc5630b4..0458c43cc3 100644
--- a/src/backend/utils/Gen_dummy_probes.pl
+++ b/src/backend/utils/Gen_dummy_probes.pl
@@ -4,7 +4,7 @@
 # Gen_dummy_probes.pl
 #    Perl script that generates probes.h file when dtrace is not available
 #
-# Portions Copyright (c) 2008-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 2008-2018, PostgreSQL Global Development Group
 #
 #
 # IDENTIFICATION
diff --git a/src/backend/utils/Gen_dummy_probes.sed b/src/backend/utils/Gen_dummy_probes.sed
index 6919e41d3a..023e2d3257 100644
--- a/src/backend/utils/Gen_dummy_probes.sed
+++ b/src/backend/utils/Gen_dummy_probes.sed
@@ -1,7 +1,7 @@
 #-------------------------------------------------------------------------
 # sed script to create dummy probes.h file when dtrace is not available
 #
-# Copyright (c) 2008-2017, PostgreSQL Global Development Group
+# Copyright (c) 2008-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/Gen_dummy_probes.sed
 #-------------------------------------------------------------------------
diff --git a/src/backend/utils/Gen_fmgrtab.pl b/src/backend/utils/Gen_fmgrtab.pl
index 17851fe2a4..4ae86df1f7 100644
--- a/src/backend/utils/Gen_fmgrtab.pl
+++ b/src/backend/utils/Gen_fmgrtab.pl
@@ -2,9 +2,10 @@
 #-------------------------------------------------------------------------
 #
 # Gen_fmgrtab.pl
-#    Perl script that generates fmgroids.h and fmgrtab.c from pg_proc.h
+#    Perl script that generates fmgroids.h, fmgrprotos.h, and fmgrtab.c
+#    from pg_proc.h
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 #
@@ -21,6 +22,8 @@
 # Collect arguments
 my $infile;    # pg_proc.h
 my $output_path = '';
+my @include_path;
+
 while (@ARGV)
 {
 	my $arg = shift @ARGV;
@@ -32,6 +35,10 @@
 	{
 		$output_path = length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
 	}
+	elsif ($arg =~ /^-I/)
+	{
+		push @include_path, length($arg) > 2 ? substr($arg, 2) : shift @ARGV;
+	}
 	else
 	{
 		usage();
@@ -44,6 +51,15 @@
 	$output_path .= '/';
 }
 
+# Sanity check arguments.
+die "No input files.\n"                                     if !$infile;
+die "No include path; you must specify -I at least once.\n" if !@include_path;
+
+my $FirstBootstrapObjectId =
+	Catalog::FindDefinedSymbol('access/transam.h', \@include_path, 'FirstBootstrapObjectId');
+my $INTERNALlanguageId =
+	Catalog::FindDefinedSymbol('catalog/pg_language.h', \@include_path, 'INTERNALlanguageId');
+
 # Read all the data from the include/catalog files.
 my $catalogs = Catalog::Catalogs($infile);
 
@@ -64,8 +80,7 @@
 	@bki_values{@attnames} = Catalog::SplitDataLine($row->{bki_values});
 
 	# Select out just the rows for internal-language procedures.
-	# Note assumption here that INTERNALlanguageId is 12.
-	next if $bki_values{prolang} ne '12';
+	next if $bki_values{prolang} ne $INTERNALlanguageId;
 
 	push @fmgr,
 	  { oid    => $row->{oid},
@@ -97,7 +112,7 @@
  * These macros can be used to avoid a catalog lookup when a specific
  * fmgr-callable function needs to be referenced.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -105,8 +120,7 @@
  *	*** DO NOT EDIT THIS FILE! ***
  *	******************************
  *
- *	It has been GENERATED by $0
- *	from $infile
+ *	It has been GENERATED by src/backend/utils/Gen_fmgrtab.pl
  *
  *-------------------------------------------------------------------------
  */
@@ -132,7 +146,7 @@
  * fmgrprotos.h
  *    Prototypes for built-in functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -140,8 +154,7 @@
  *	*** DO NOT EDIT THIS FILE! ***
  *	******************************
  *
- *	It has been GENERATED by $0
- *	from $infile
+ *	It has been GENERATED by src/backend/utils/Gen_fmgrtab.pl
  *
  *-------------------------------------------------------------------------
  */
@@ -159,7 +172,7 @@
  * fmgrtab.c
  *    The function manager's table of internal functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES
@@ -168,14 +181,14 @@
  *	*** DO NOT EDIT THIS FILE! ***
  *	******************************
  *
- *	It has been GENERATED by $0
- *	from $infile
+ *	It has been GENERATED by src/backend/utils/Gen_fmgrtab.pl
  *
  *-------------------------------------------------------------------------
  */
 
 #include "postgres.h"
 
+#include "access/transam.h"
 #include "utils/fmgrtab.h"
 #include "utils/fmgrprotos.h"
 
@@ -191,32 +204,71 @@
 	print $pfh "extern Datum $s->{prosrc}(PG_FUNCTION_ARGS);\n";
 }
 
-# Create the fmgr_builtins table
+# Create the fmgr_builtins table, collect data for fmgr_builtin_oid_index
 print $tfh "\nconst FmgrBuiltin fmgr_builtins[] = {\n";
 my %bmap;
 $bmap{'t'} = 'true';
 $bmap{'f'} = 'false';
+my @fmgr_builtin_oid_index;
+my $fmgr_count = 0;
 foreach my $s (sort { $a->{oid} <=> $b->{oid} } @fmgr)
 {
 	print $tfh
-"  { $s->{oid}, \"$s->{prosrc}\", $s->{nargs}, $bmap{$s->{strict}}, $bmap{$s->{retset}}, $s->{prosrc} },\n";
+"  { $s->{oid}, \"$s->{prosrc}\", $s->{nargs}, $bmap{$s->{strict}}, $bmap{$s->{retset}}, $s->{prosrc} }";
+
+	$fmgr_builtin_oid_index[$s->{oid}] = $fmgr_count++;
+
+	if ($fmgr_count <= $#fmgr)
+	{
+		print $tfh ",\n";
+	}
+	else
+	{
+		print $tfh "\n";
+	}
+}
+print $tfh "};\n";
+
+print $tfh qq|
+const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin));
+|;
+
+
+# Create fmgr_builtins_oid_index table.
+#
+# Note that the array has to be filled up to FirstBootstrapObjectId,
+# as we can't rely on zero initialization as 0 is a valid mapping.
+print $tfh qq|
+const uint16 fmgr_builtin_oid_index[FirstBootstrapObjectId] = {
+|;
+
+for (my $i = 0; $i < $FirstBootstrapObjectId; $i++)
+{
+	my $oid = $fmgr_builtin_oid_index[$i];
+
+	# fmgr_builtin_oid_index is sparse, map nonexistant functions to
+	# InvalidOidBuiltinMapping
+	if (not defined $oid)
+	{
+		$oid = 'InvalidOidBuiltinMapping';
+	}
+
+	if ($i + 1 == $FirstBootstrapObjectId)
+	{
+		print $tfh "  $oid\n";
+	}
+	else
+	{
+		print $tfh "  $oid,\n";
+	}
 }
+print $tfh "};\n";
+
 
 # And add the file footers.
 print $ofh "\n#endif /* FMGROIDS_H */\n";
 print $pfh "\n#endif /* FMGRPROTOS_H */\n";
 
-print $tfh
-qq|  /* dummy entry is easier than getting rid of comma after last real one */
-  /* (not that there has ever been anything wrong with *having* a
-     comma after the last field in an array initializer) */
-  { 0, NULL, 0, false, false, NULL }
-};
-
-/* Note fmgr_nbuiltins excludes the dummy entry */
-const int fmgr_nbuiltins = (sizeof(fmgr_builtins) / sizeof(FmgrBuiltin)) - 1;
-|;
-
 close($ofh);
 close($pfh);
 close($tfh);
@@ -231,7 +283,8 @@ sub usage
 	die <<EOM;
 Usage: perl -I [directory of Catalog.pm] Gen_fmgrtab.pl [path to pg_proc.h]
 
-Gen_fmgrtab.pl generates fmgroids.h and fmgrtab.c from pg_proc.h
+Gen_fmgrtab.pl generates fmgroids.h, fmgrprotos.h, and fmgrtab.c from
+pg_proc.h
 
 Report bugs to <pgsql-bugs\@postgresql.org>.
 EOM
diff --git a/src/backend/utils/Makefile b/src/backend/utils/Makefile
index 2e35ca58cc..efb8b53f49 100644
--- a/src/backend/utils/Makefile
+++ b/src/backend/utils/Makefile
@@ -25,7 +25,7 @@ fmgrprotos.h: fmgroids.h ;
 fmgroids.h: fmgrtab.c ;
 
 fmgrtab.c: Gen_fmgrtab.pl $(catalogdir)/Catalog.pm $(top_srcdir)/src/include/catalog/pg_proc.h
-	$(PERL) -I $(catalogdir) $< $(top_srcdir)/src/include/catalog/pg_proc.h
+	$(PERL) -I $(catalogdir) $< -I $(top_srcdir)/src/include/ $(top_srcdir)/src/include/catalog/pg_proc.h
 
 errcodes.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-errcodes.pl
 	$(PERL) $(srcdir)/generate-errcodes.pl $< > $@
diff --git a/src/backend/utils/adt/Makefile b/src/backend/utils/adt/Makefile
index 1fb018416e..4b35dbb8bb 100644
--- a/src/backend/utils/adt/Makefile
+++ b/src/backend/utils/adt/Makefile
@@ -11,8 +11,9 @@ include $(top_builddir)/src/Makefile.global
 # keep this list arranged alphabetically or it gets to be a mess
 OBJS = acl.o amutils.o arrayfuncs.o array_expanded.o array_selfuncs.o \
 	array_typanalyze.o array_userfuncs.o arrayutils.o ascii.o \
-	bool.o cash.o char.o date.o datetime.o datum.o dbsize.o domains.o \
-	encode.o enum.o expandeddatum.o \
+	bool.o cash.o char.o cryptohashes.o \
+	date.o datetime.o datum.o dbsize.o domains.o \
+	encode.o enum.o expandeddatum.o expandedrecord.o \
 	float.o format_type.o formatting.o genfile.o \
 	geo_ops.o geo_selfuncs.o geo_spgist.o inet_cidr_ntop.o inet_net_pton.o \
 	int.o int8.o json.o jsonb.o jsonb_gin.o jsonb_op.o jsonb_util.o \
diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c
index 2efb6c94e1..0cfc297b65 100644
--- a/src/backend/utils/adt/acl.c
+++ b/src/backend/utils/adt/acl.c
@@ -3,7 +3,7 @@
  * acl.c
  *	  Basic access control list data structures manipulation routines.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -16,6 +16,7 @@
 
 #include <ctype.h>
 
+#include "access/hash.h"
 #include "access/htup_details.h"
 #include "catalog/catalog.h"
 #include "catalog/namespace.h"
@@ -717,18 +718,34 @@ hash_aclitem(PG_FUNCTION_ARGS)
 	PG_RETURN_UINT32((uint32) (a->ai_privs + a->ai_grantee + a->ai_grantor));
 }
 
+/*
+ * 64-bit hash function for aclitem.
+ *
+ * Similar to hash_aclitem, but accepts a seed and returns a uint64 value.
+ */
+Datum
+hash_aclitem_extended(PG_FUNCTION_ARGS)
+{
+	AclItem    *a = PG_GETARG_ACLITEM_P(0);
+	uint64		seed = PG_GETARG_INT64(1);
+	uint32		sum = (uint32) (a->ai_privs + a->ai_grantee + a->ai_grantor);
+
+	return (seed == 0) ? UInt64GetDatum(sum) : hash_uint32_extended(sum, seed);
+}
 
 /*
  * acldefault()  --- create an ACL describing default access permissions
  *
  * Change this routine if you want to alter the default access policy for
- * newly-created objects (or any object with a NULL acl entry).
+ * newly-created objects (or any object with a NULL acl entry).  When
+ * you make a change here, don't forget to update the GRANT man page,
+ * which explains all the default permissions.
  *
  * Note that these are the hard-wired "defaults" that are used in the
  * absence of any pg_default_acl entry.
  */
 Acl *
-acldefault(GrantObjectType objtype, Oid ownerId)
+acldefault(ObjectType objtype, Oid ownerId)
 {
 	AclMode		world_default;
 	AclMode		owner_default;
@@ -738,56 +755,56 @@ acldefault(GrantObjectType objtype, Oid ownerId)
 
 	switch (objtype)
 	{
-		case ACL_OBJECT_COLUMN:
+		case OBJECT_COLUMN:
 			/* by default, columns have no extra privileges */
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_NO_RIGHTS;
 			break;
-		case ACL_OBJECT_RELATION:
+		case OBJECT_TABLE:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_RELATION;
 			break;
-		case ACL_OBJECT_SEQUENCE:
+		case OBJECT_SEQUENCE:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_SEQUENCE;
 			break;
-		case ACL_OBJECT_DATABASE:
+		case OBJECT_DATABASE:
 			/* for backwards compatibility, grant some rights by default */
 			world_default = ACL_CREATE_TEMP | ACL_CONNECT;
 			owner_default = ACL_ALL_RIGHTS_DATABASE;
 			break;
-		case ACL_OBJECT_FUNCTION:
+		case OBJECT_FUNCTION:
 			/* Grant EXECUTE by default, for now */
 			world_default = ACL_EXECUTE;
 			owner_default = ACL_ALL_RIGHTS_FUNCTION;
 			break;
-		case ACL_OBJECT_LANGUAGE:
+		case OBJECT_LANGUAGE:
 			/* Grant USAGE by default, for now */
 			world_default = ACL_USAGE;
 			owner_default = ACL_ALL_RIGHTS_LANGUAGE;
 			break;
-		case ACL_OBJECT_LARGEOBJECT:
+		case OBJECT_LARGEOBJECT:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_LARGEOBJECT;
 			break;
-		case ACL_OBJECT_NAMESPACE:
+		case OBJECT_SCHEMA:
 			world_default = ACL_NO_RIGHTS;
-			owner_default = ACL_ALL_RIGHTS_NAMESPACE;
+			owner_default = ACL_ALL_RIGHTS_SCHEMA;
 			break;
-		case ACL_OBJECT_TABLESPACE:
+		case OBJECT_TABLESPACE:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_TABLESPACE;
 			break;
-		case ACL_OBJECT_FDW:
+		case OBJECT_FDW:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_FDW;
 			break;
-		case ACL_OBJECT_FOREIGN_SERVER:
+		case OBJECT_FOREIGN_SERVER:
 			world_default = ACL_NO_RIGHTS;
 			owner_default = ACL_ALL_RIGHTS_FOREIGN_SERVER;
 			break;
-		case ACL_OBJECT_DOMAIN:
-		case ACL_OBJECT_TYPE:
+		case OBJECT_DOMAIN:
+		case OBJECT_TYPE:
 			world_default = ACL_USAGE;
 			owner_default = ACL_ALL_RIGHTS_TYPE;
 			break;
@@ -838,7 +855,7 @@ acldefault(GrantObjectType objtype, Oid ownerId)
 
 /*
  * SQL-accessible version of acldefault().  Hackish mapping from "char" type to
- * ACL_OBJECT_* values, but it's only used in the information schema, not
+ * OBJECT_* values, but it's only used in the information schema, not
  * documented for general use.
  */
 Datum
@@ -846,45 +863,45 @@ acldefault_sql(PG_FUNCTION_ARGS)
 {
 	char		objtypec = PG_GETARG_CHAR(0);
 	Oid			owner = PG_GETARG_OID(1);
-	GrantObjectType objtype = 0;
+	ObjectType	objtype = 0;
 
 	switch (objtypec)
 	{
 		case 'c':
-			objtype = ACL_OBJECT_COLUMN;
+			objtype = OBJECT_COLUMN;
 			break;
 		case 'r':
-			objtype = ACL_OBJECT_RELATION;
+			objtype = OBJECT_TABLE;
 			break;
 		case 's':
-			objtype = ACL_OBJECT_SEQUENCE;
+			objtype = OBJECT_SEQUENCE;
 			break;
 		case 'd':
-			objtype = ACL_OBJECT_DATABASE;
+			objtype = OBJECT_DATABASE;
 			break;
 		case 'f':
-			objtype = ACL_OBJECT_FUNCTION;
+			objtype = OBJECT_FUNCTION;
 			break;
 		case 'l':
-			objtype = ACL_OBJECT_LANGUAGE;
+			objtype = OBJECT_LANGUAGE;
 			break;
 		case 'L':
-			objtype = ACL_OBJECT_LARGEOBJECT;
+			objtype = OBJECT_LARGEOBJECT;
 			break;
 		case 'n':
-			objtype = ACL_OBJECT_NAMESPACE;
+			objtype = OBJECT_SCHEMA;
 			break;
 		case 't':
-			objtype = ACL_OBJECT_TABLESPACE;
+			objtype = OBJECT_TABLESPACE;
 			break;
 		case 'F':
-			objtype = ACL_OBJECT_FDW;
+			objtype = OBJECT_FDW;
 			break;
 		case 'S':
-			objtype = ACL_OBJECT_FOREIGN_SERVER;
+			objtype = OBJECT_FOREIGN_SERVER;
 			break;
 		case 'T':
-			objtype = ACL_OBJECT_TYPE;
+			objtype = OBJECT_TYPE;
 			break;
 		default:
 			elog(ERROR, "unrecognized objtype abbreviation: %c", objtypec);
@@ -2225,8 +2242,11 @@ convert_sequence_priv_string(text *priv_type_text)
 {
 	static const priv_map sequence_priv_map[] = {
 		{"USAGE", ACL_USAGE},
+		{"USAGE WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_USAGE)},
 		{"SELECT", ACL_SELECT},
+		{"SELECT WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_SELECT)},
 		{"UPDATE", ACL_UPDATE},
+		{"UPDATE WITH GRANT OPTION", ACL_GRANT_OPTION_FOR(ACL_UPDATE)},
 		{NULL, 0}
 	};
 
diff --git a/src/backend/utils/adt/amutils.c b/src/backend/utils/adt/amutils.c
index f53b251b30..0f7ceb62eb 100644
--- a/src/backend/utils/adt/amutils.c
+++ b/src/backend/utils/adt/amutils.c
@@ -3,7 +3,7 @@
  * amutils.c
  *	  SQL-level APIs related to index access methods.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -183,7 +183,8 @@ indexam_property(FunctionCallInfo fcinfo,
 		if (!HeapTupleIsValid(tuple))
 			PG_RETURN_NULL();
 		rd_rel = (Form_pg_class) GETSTRUCT(tuple);
-		if (rd_rel->relkind != RELKIND_INDEX)
+		if (rd_rel->relkind != RELKIND_INDEX &&
+			rd_rel->relkind != RELKIND_PARTITIONED_INDEX)
 		{
 			ReleaseSysCache(tuple);
 			PG_RETURN_NULL();
diff --git a/src/backend/utils/adt/array_expanded.c b/src/backend/utils/adt/array_expanded.c
index f256c7f13d..277aaf1368 100644
--- a/src/backend/utils/adt/array_expanded.c
+++ b/src/backend/utils/adt/array_expanded.c
@@ -3,7 +3,7 @@
  * array_expanded.c
  *	  Basic functions for manipulating expanded arrays.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -394,11 +394,11 @@ DatumGetExpandedArrayX(Datum d, ArrayMetaState *metacache)
 }
 
 /*
- * DatumGetAnyArray: return either an expanded array or a detoasted varlena
+ * DatumGetAnyArrayP: return either an expanded array or a detoasted varlena
  * array.  The result must not be modified in-place.
  */
 AnyArrayType *
-DatumGetAnyArray(Datum d)
+DatumGetAnyArrayP(Datum d)
 {
 	ExpandedArrayHeader *eah;
 
diff --git a/src/backend/utils/adt/array_selfuncs.c b/src/backend/utils/adt/array_selfuncs.c
index 9daf8e73bc..339525b53b 100644
--- a/src/backend/utils/adt/array_selfuncs.c
+++ b/src/backend/utils/adt/array_selfuncs.c
@@ -3,7 +3,7 @@
  * array_selfuncs.c
  *	  Functions for selectivity estimation of array operators
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/array_typanalyze.c b/src/backend/utils/adt/array_typanalyze.c
index 78153d232f..92e38b870f 100644
--- a/src/backend/utils/adt/array_typanalyze.c
+++ b/src/backend/utils/adt/array_typanalyze.c
@@ -3,7 +3,7 @@
  * array_typanalyze.c
  *	  Functions for gathering statistics from array columns
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -247,7 +247,7 @@ compute_array_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
 	 * temporarily install that.
 	 */
 	stats->extra_data = extra_data->std_extra_data;
-	(*extra_data->std_compute_stats) (stats, fetchfunc, samplerows, totalrows);
+	extra_data->std_compute_stats(stats, fetchfunc, samplerows, totalrows);
 	stats->extra_data = extra_data;
 
 	/*
diff --git a/src/backend/utils/adt/array_userfuncs.c b/src/backend/utils/adt/array_userfuncs.c
index 87d79f3f98..cb7a6b6d01 100644
--- a/src/backend/utils/adt/array_userfuncs.c
+++ b/src/backend/utils/adt/array_userfuncs.c
@@ -3,7 +3,7 @@
  * array_userfuncs.c
  *	  Misc user-visible array support functions
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/array_userfuncs.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 
 #include "catalog/pg_type.h"
+#include "common/int.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
@@ -118,15 +119,11 @@ array_append(PG_FUNCTION_ARGS)
 	if (eah->ndims == 1)
 	{
 		/* append newelem */
-		int			ub;
-
 		lb = eah->lbound;
 		dimv = eah->dims;
-		ub = dimv[0] + lb[0] - 1;
-		indx = ub + 1;
 
-		/* overflow? */
-		if (indx < ub)
+		/* index of added elem is at lb[0] + (dimv[0] - 1) + 1 */
+		if (pg_add_s32_overflow(lb[0], dimv[0], &indx))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
@@ -176,11 +173,9 @@ array_prepend(PG_FUNCTION_ARGS)
 	{
 		/* prepend newelem */
 		lb = eah->lbound;
-		indx = lb[0] - 1;
 		lb0 = lb[0];
 
-		/* overflow? */
-		if (indx > lb[0])
+		if (pg_sub_s32_overflow(lb0, 1, &indx))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
diff --git a/src/backend/utils/adt/arrayfuncs.c b/src/backend/utils/adt/arrayfuncs.c
index 34dadd6e19..0cbdbe5587 100644
--- a/src/backend/utils/adt/arrayfuncs.c
+++ b/src/backend/utils/adt/arrayfuncs.c
@@ -3,7 +3,7 @@
  * arrayfuncs.c
  *	  Support functions for arrays.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -20,6 +20,7 @@
 #endif
 #include <math.h>
 
+#include "access/hash.h"
 #include "access/htup_details.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
@@ -705,7 +706,7 @@ ArrayCount(const char *str, int *dim, char typdelim)
  * Outputs:
  *	values[]: filled with converted data values.
  *	nulls[]: filled with is-null markers.
- *	*hasnulls: set TRUE iff there are any null elements.
+ *	*hasnulls: set true iff there are any null elements.
  *	*nbytes: set to total size of data area needed (including alignment
  *		padding but not including array header overhead).
  *
@@ -945,7 +946,7 @@ ReadArrayStr(char *arrayStr,
  * nulls: array of is-null flags (can be NULL if no nulls)
  * nitems: number of Datums to be copied
  * typbyval, typlen, typalign: info about element datatype
- * freedata: if TRUE and element type is pass-by-ref, pfree data values
+ * freedata: if true and element type is pass-by-ref, pfree data values
  * referenced by Datums after copying them.
  *
  * If the input data is of varlena type, the caller must have ensured that
@@ -1010,7 +1011,7 @@ CopyArrayEls(ArrayType *array,
 Datum
 array_out(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	Oid			element_type = AARR_ELEMTYPE(v);
 	int			typlen;
 	bool		typbyval;
@@ -1418,7 +1419,7 @@ array_recv(PG_FUNCTION_ARGS)
  * Outputs:
  *	values[]: filled with converted data values.
  *	nulls[]: filled with is-null markers.
- *	*hasnulls: set TRUE iff there are any null elements.
+ *	*hasnulls: set true iff there are any null elements.
  *	*nbytes: set to total size of data area needed (including alignment
  *		padding but not including array header overhead).
  *
@@ -1533,7 +1534,7 @@ ReadArrayBinary(StringInfo buf,
 Datum
 array_send(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	Oid			element_type = AARR_ELEMTYPE(v);
 	int			typlen;
 	bool		typbyval;
@@ -1589,13 +1590,13 @@ array_send(PG_FUNCTION_ARGS)
 	pq_begintypsend(&buf);
 
 	/* Send the array header information */
-	pq_sendint(&buf, ndim, 4);
-	pq_sendint(&buf, AARR_HASNULL(v) ? 1 : 0, 4);
-	pq_sendint(&buf, element_type, sizeof(Oid));
+	pq_sendint32(&buf, ndim);
+	pq_sendint32(&buf, AARR_HASNULL(v) ? 1 : 0);
+	pq_sendint32(&buf, element_type);
 	for (i = 0; i < ndim; i++)
 	{
-		pq_sendint(&buf, dim[i], 4);
-		pq_sendint(&buf, lb[i], 4);
+		pq_sendint32(&buf, dim[i]);
+		pq_sendint32(&buf, lb[i]);
 	}
 
 	/* Send the array elements using the element's own sendproc */
@@ -1613,14 +1614,14 @@ array_send(PG_FUNCTION_ARGS)
 		if (isnull)
 		{
 			/* -1 length means a NULL */
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1);
 		}
 		else
 		{
 			bytea	   *outputbytes;
 
 			outputbytes = SendFunctionCall(&my_extra->proc, itemvalue);
-			pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
+			pq_sendint32(&buf, VARSIZE(outputbytes) - VARHDRSZ);
 			pq_sendbytes(&buf, VARDATA(outputbytes),
 						 VARSIZE(outputbytes) - VARHDRSZ);
 			pfree(outputbytes);
@@ -1637,7 +1638,7 @@ array_send(PG_FUNCTION_ARGS)
 Datum
 array_ndims(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 
 	/* Sanity check: does it look like an array at all? */
 	if (AARR_NDIM(v) <= 0 || AARR_NDIM(v) > MAXDIM)
@@ -1653,7 +1654,7 @@ array_ndims(PG_FUNCTION_ARGS)
 Datum
 array_dims(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	char	   *p;
 	int			i;
 	int		   *dimv,
@@ -1691,7 +1692,7 @@ array_dims(PG_FUNCTION_ARGS)
 Datum
 array_lower(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *lb;
 	int			result;
@@ -1718,7 +1719,7 @@ array_lower(PG_FUNCTION_ARGS)
 Datum
 array_upper(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *dimv,
 			   *lb;
@@ -1748,7 +1749,7 @@ array_upper(PG_FUNCTION_ARGS)
 Datum
 array_length(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 	int			reqdim = PG_GETARG_INT32(1);
 	int		   *dimv;
 	int			result;
@@ -1775,7 +1776,7 @@ array_length(PG_FUNCTION_ARGS)
 Datum
 array_cardinality(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 
 	PG_RETURN_INT32(ArrayGetNItems(AARR_NDIM(v), AARR_DIMS(v)));
 }
@@ -3091,21 +3092,18 @@ array_set(ArrayType *array, int nSubscripts, int *indx,
 /*
  * array_map()
  *
- * Map an array through an arbitrary function.  Return a new array with
- * same dimensions and each source element transformed by fn().  Each
- * source element is passed as the first argument to fn(); additional
- * arguments to be passed to fn() can be specified by the caller.
- * The output array can have a different element type than the input.
+ * Map an array through an arbitrary expression.  Return a new array with
+ * the same dimensions and each source element transformed by the given,
+ * already-compiled expression.  Each source element is placed in the
+ * innermost_caseval/innermost_casenull fields of the ExprState.
  *
  * Parameters are:
- * * fcinfo: a function-call data structure pre-constructed by the caller
- *	 to be ready to call the desired function, with everything except the
- *	 first argument position filled in.  In particular, flinfo identifies
- *	 the function fn(), and if nargs > 1 then argument positions after the
- *	 first must be preset to the additional values to be passed.  The
- *	 first argument position initially holds the input array value.
+ * * arrayd: Datum representing array argument.
+ * * exprstate: ExprState representing the per-element transformation.
+ * * econtext: context for expression evaluation.
  * * retType: OID of element type of output array.  This must be the same as,
- *	 or binary-compatible with, the result type of fn().
+ *	 or binary-compatible with, the result type of the expression.  It might
+ *	 be different from the input array's element type.
  * * amstate: workspace for array_map.  Must be zeroed by caller before
  *	 first call, and not touched after that.
  *
@@ -3115,11 +3113,14 @@ array_set(ArrayType *array, int nSubscripts, int *indx,
  *
  * NB: caller must assure that input array is not NULL.  NULL elements in
  * the array are OK however.
+ * NB: caller should be running in econtext's per-tuple memory context.
  */
 Datum
-array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
+array_map(Datum arrayd,
+		  ExprState *exprstate, ExprContext *econtext,
+		  Oid retType, ArrayMapState *amstate)
 {
-	AnyArrayType *v;
+	AnyArrayType *v = DatumGetAnyArrayP(arrayd);
 	ArrayType  *result;
 	Datum	   *values;
 	bool	   *nulls;
@@ -3140,13 +3141,8 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 	array_iter	iter;
 	ArrayMetaState *inp_extra;
 	ArrayMetaState *ret_extra;
-
-	/* Get input array */
-	if (fcinfo->nargs < 1)
-		elog(ERROR, "invalid nargs: %d", fcinfo->nargs);
-	if (PG_ARGISNULL(0))
-		elog(ERROR, "null input array");
-	v = PG_GETARG_ANY_ARRAY(0);
+	Datum	   *transform_source = exprstate->innermost_caseval;
+	bool	   *transform_source_isnull = exprstate->innermost_casenull;
 
 	inpType = AARR_ELEMTYPE(v);
 	ndim = AARR_NDIM(v);
@@ -3157,7 +3153,7 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 	if (nitems <= 0)
 	{
 		/* Return empty array */
-		PG_RETURN_ARRAYTYPE_P(construct_empty_array(retType));
+		return PointerGetDatum(construct_empty_array(retType));
 	}
 
 	/*
@@ -3202,39 +3198,15 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 
 	for (i = 0; i < nitems; i++)
 	{
-		bool		callit = true;
-
 		/* Get source element, checking for NULL */
-		fcinfo->arg[0] = array_iter_next(&iter, &fcinfo->argnull[0], i,
-										 inp_typlen, inp_typbyval, inp_typalign);
-
-		/*
-		 * Apply the given function to source elt and extra args.
-		 */
-		if (fcinfo->flinfo->fn_strict)
-		{
-			int			j;
-
-			for (j = 0; j < fcinfo->nargs; j++)
-			{
-				if (fcinfo->argnull[j])
-				{
-					callit = false;
-					break;
-				}
-			}
-		}
+		*transform_source =
+			array_iter_next(&iter, transform_source_isnull, i,
+							inp_typlen, inp_typbyval, inp_typalign);
 
-		if (callit)
-		{
-			fcinfo->isnull = false;
-			values[i] = FunctionCallInvoke(fcinfo);
-		}
-		else
-			fcinfo->isnull = true;
+		/* Apply the given expression to source element */
+		values[i] = ExecEvalExpr(exprstate, econtext, &nulls[i]);
 
-		nulls[i] = fcinfo->isnull;
-		if (fcinfo->isnull)
+		if (nulls[i])
 			hasnulls = true;
 		else
 		{
@@ -3253,7 +3225,7 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 		}
 	}
 
-	/* Allocate and initialize the result array */
+	/* Allocate and fill the result array */
 	if (hasnulls)
 	{
 		dataoffset = ARR_OVERHEAD_WITHNULLS(ndim, nitems);
@@ -3272,18 +3244,18 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
 	memcpy(ARR_DIMS(result), AARR_DIMS(v), ndim * sizeof(int));
 	memcpy(ARR_LBOUND(result), AARR_LBOUND(v), ndim * sizeof(int));
 
-	/*
-	 * Note: do not risk trying to pfree the results of the called function
-	 */
 	CopyArrayEls(result,
 				 values, nulls, nitems,
 				 typlen, typbyval, typalign,
 				 false);
 
+	/*
+	 * Note: do not risk trying to pfree the results of the called expression
+	 */
 	pfree(values);
 	pfree(nulls);
 
-	PG_RETURN_ARRAYTYPE_P(result);
+	return PointerGetDatum(result);
 }
 
 /*
@@ -3296,6 +3268,7 @@ array_map(FunctionCallInfo fcinfo, Oid retType, ArrayMapState *amstate)
  *
  * A palloc'd 1-D array object is constructed and returned.  Note that
  * elem values will be copied into the object even if pass-by-ref type.
+ * Also note the result will be 0-D not 1-D if nelems = 0.
  *
  * NOTE: it would be cleaner to look up the elmlen/elmbval/elmalign info
  * from the system catalogs, given the elmtype.  However, the caller is
@@ -3330,6 +3303,7 @@ construct_array(Datum *elems, int nelems,
  *
  * A palloc'd ndims-D array object is constructed and returned.  Note that
  * elem values will be copied into the object even if pass-by-ref type.
+ * Also note the result will be 0-D not ndims-D if any dims[i] = 0.
  *
  * NOTE: it would be cleaner to look up the elmlen/elmbval/elmalign info
  * from the system catalogs, given the elmtype.  However, the caller is
@@ -3361,12 +3335,12 @@ construct_md_array(Datum *elems,
 				 errmsg("number of array dimensions (%d) exceeds the maximum allowed (%d)",
 						ndims, MAXDIM)));
 
-	/* fast track for empty array */
-	if (ndims == 0)
-		return construct_empty_array(elmtype);
-
 	nelems = ArrayGetNItems(ndims, dims);
 
+	/* if ndims <= 0 or any dims[i] == 0, return empty array */
+	if (nelems <= 0)
+		return construct_empty_array(elmtype);
+
 	/* compute required space */
 	nbytes = 0;
 	hasnulls = false;
@@ -3588,8 +3562,8 @@ array_contains_nulls(ArrayType *array)
 Datum
 array_eq(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
-	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY_P(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY_P(1);
 	Oid			collation = PG_GET_COLLATION();
 	int			ndims1 = AARR_NDIM(array1);
 	int			ndims2 = AARR_NDIM(array2);
@@ -3759,8 +3733,8 @@ btarraycmp(PG_FUNCTION_ARGS)
 static int
 array_cmp(FunctionCallInfo fcinfo)
 {
-	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
-	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY_P(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY_P(1);
 	Oid			collation = PG_GET_COLLATION();
 	int			ndims1 = AARR_NDIM(array1);
 	int			ndims2 = AARR_NDIM(array2);
@@ -3930,7 +3904,7 @@ array_cmp(FunctionCallInfo fcinfo)
 Datum
 hash_array(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *array = PG_GETARG_ANY_ARRAY(0);
+	AnyArrayType *array = PG_GETARG_ANY_ARRAY_P(0);
 	int			ndims = AARR_NDIM(array);
 	int		   *dims = AARR_DIMS(array);
 	Oid			element_type = AARR_ELEMTYPE(array);
@@ -4020,6 +3994,84 @@ hash_array(PG_FUNCTION_ARGS)
 	PG_RETURN_UINT32(result);
 }
 
+/*
+ * Returns 64-bit value by hashing a value to a 64-bit value, with a seed.
+ * Otherwise, similar to hash_array.
+ */
+Datum
+hash_array_extended(PG_FUNCTION_ARGS)
+{
+	AnyArrayType *array = PG_GETARG_ANY_ARRAY_P(0);
+	uint64		seed = PG_GETARG_INT64(1);
+	int			ndims = AARR_NDIM(array);
+	int		   *dims = AARR_DIMS(array);
+	Oid			element_type = AARR_ELEMTYPE(array);
+	uint64		result = 1;
+	int			nitems;
+	TypeCacheEntry *typentry;
+	int			typlen;
+	bool		typbyval;
+	char		typalign;
+	int			i;
+	array_iter	iter;
+	FunctionCallInfoData locfcinfo;
+
+	typentry = (TypeCacheEntry *) fcinfo->flinfo->fn_extra;
+	if (typentry == NULL ||
+		typentry->type_id != element_type)
+	{
+		typentry = lookup_type_cache(element_type,
+									 TYPECACHE_HASH_EXTENDED_PROC_FINFO);
+		if (!OidIsValid(typentry->hash_extended_proc_finfo.fn_oid))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_FUNCTION),
+					 errmsg("could not identify an extended hash function for type %s",
+							format_type_be(element_type))));
+		fcinfo->flinfo->fn_extra = (void *) typentry;
+	}
+	typlen = typentry->typlen;
+	typbyval = typentry->typbyval;
+	typalign = typentry->typalign;
+
+	InitFunctionCallInfoData(locfcinfo, &typentry->hash_extended_proc_finfo, 2,
+							 InvalidOid, NULL, NULL);
+
+	/* Loop over source data */
+	nitems = ArrayGetNItems(ndims, dims);
+	array_iter_setup(&iter, array);
+
+	for (i = 0; i < nitems; i++)
+	{
+		Datum		elt;
+		bool		isnull;
+		uint64		elthash;
+
+		/* Get element, checking for NULL */
+		elt = array_iter_next(&iter, &isnull, i, typlen, typbyval, typalign);
+
+		if (isnull)
+		{
+			elthash = 0;
+		}
+		else
+		{
+			/* Apply the hash function */
+			locfcinfo.arg[0] = elt;
+			locfcinfo.arg[1] = Int64GetDatum(seed);
+			locfcinfo.argnull[0] = false;
+			locfcinfo.argnull[1] = false;
+			locfcinfo.isnull = false;
+			elthash = DatumGetUInt64(FunctionCallInvoke(&locfcinfo));
+		}
+
+		result = (result << 5) - result + elthash;
+	}
+
+	AARR_FREE_IF_COPY(array, 0);
+
+	PG_RETURN_UINT64(result);
+}
+
 
 /*-----------------------------------------------------------------------------
  * array overlap/containment comparisons
@@ -4181,8 +4233,8 @@ array_contain_compare(AnyArrayType *array1, AnyArrayType *array2, Oid collation,
 Datum
 arrayoverlap(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
-	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY_P(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY_P(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -4199,8 +4251,8 @@ arrayoverlap(PG_FUNCTION_ARGS)
 Datum
 arraycontains(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
-	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY_P(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY_P(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -4217,8 +4269,8 @@ arraycontains(PG_FUNCTION_ARGS)
 Datum
 arraycontained(PG_FUNCTION_ARGS)
 {
-	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY(0);
-	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY(1);
+	AnyArrayType *array1 = PG_GETARG_ANY_ARRAY_P(0);
+	AnyArrayType *array2 = PG_GETARG_ANY_ARRAY_P(1);
 	Oid			collation = PG_GET_COLLATION();
 	bool		result;
 
@@ -5555,7 +5607,7 @@ generate_subscripts(PG_FUNCTION_ARGS)
 	/* stuff done only on the first call of the function */
 	if (SRF_IS_FIRSTCALL())
 	{
-		AnyArrayType *v = PG_GETARG_ANY_ARRAY(0);
+		AnyArrayType *v = PG_GETARG_ANY_ARRAY_P(0);
 		int			reqdim = PG_GETARG_INT32(1);
 		int		   *lb,
 				   *dimv;
@@ -5917,7 +5969,7 @@ array_unnest(PG_FUNCTION_ARGS)
 		 * and not before.  (If no detoast happens, we assume the originally
 		 * passed array will stick around till then.)
 		 */
-		arr = PG_GETARG_ANY_ARRAY(0);
+		arr = PG_GETARG_ANY_ARRAY_P(0);
 
 		/* allocate memory for user context */
 		fctx = (array_unnest_fctx *) palloc(sizeof(array_unnest_fctx));
diff --git a/src/backend/utils/adt/arrayutils.c b/src/backend/utils/adt/arrayutils.c
index 27b24703b0..c0d719e98c 100644
--- a/src/backend/utils/adt/arrayutils.c
+++ b/src/backend/utils/adt/arrayutils.c
@@ -3,7 +3,7 @@
  * arrayutils.c
  *	  This file contains some support routines required for array functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/ascii.c b/src/backend/utils/adt/ascii.c
index 362272277f..b26985369a 100644
--- a/src/backend/utils/adt/ascii.c
+++ b/src/backend/utils/adt/ascii.c
@@ -2,7 +2,7 @@
  * ascii.c
  *	 The PostgreSQL routine for string to ascii conversion.
  *
- *	 Portions Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ *	 Portions Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/ascii.c
diff --git a/src/backend/utils/adt/bool.c b/src/backend/utils/adt/bool.c
index 6c87e21140..2af62e3f2e 100644
--- a/src/backend/utils/adt/bool.c
+++ b/src/backend/utils/adt/bool.c
@@ -3,7 +3,7 @@
  * bool.c
  *	  Functions for the built-in type "bool".
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/cash.c b/src/backend/utils/adt/cash.c
index 7bbc634bd2..c787dd3419 100644
--- a/src/backend/utils/adt/cash.c
+++ b/src/backend/utils/adt/cash.c
@@ -22,6 +22,7 @@
 #include <ctype.h>
 #include <math.h>
 
+#include "common/int.h"
 #include "libpq/pqformat.h"
 #include "utils/builtins.h"
 #include "utils/cash.h"
@@ -199,20 +200,21 @@ cash_in(PG_FUNCTION_ARGS)
 
 	for (; *s; s++)
 	{
-		/* we look for digits as long as we have found less */
-		/* than the required number of decimal places */
+		/*
+		 * We look for digits as long as we have found less than the required
+		 * number of decimal places.
+		 */
 		if (isdigit((unsigned char) *s) && (!seen_dot || dec < fpoint))
 		{
-			Cash		newvalue = (value * 10) - (*s - '0');
+			int8		digit = *s - '0';
 
-			if (newvalue / 10 != value)
+			if (pg_mul_s64_overflow(value, 10, &value) ||
+				pg_sub_s64_overflow(value, digit, &value))
 				ereport(ERROR,
 						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 						 errmsg("value \"%s\" is out of range for type %s",
 								str, "money")));
 
-			value = newvalue;
-
 			if (seen_dot)
 				dec++;
 		}
@@ -230,26 +232,23 @@ cash_in(PG_FUNCTION_ARGS)
 
 	/* round off if there's another digit */
 	if (isdigit((unsigned char) *s) && *s >= '5')
-		value--;				/* remember we build the value in the negative */
-
-	if (value > 0)
-		ereport(ERROR,
-				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-				 errmsg("value \"%s\" is out of range for type %s",
-						str, "money")));
+	{
+		/* remember we build the value in the negative */
+		if (pg_sub_s64_overflow(value, 1, &value))
+			ereport(ERROR,
+					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+					 errmsg("value \"%s\" is out of range for type %s",
+							str, "money")));
+	}
 
 	/* adjust for less than required decimal places */
 	for (; dec < fpoint; dec++)
 	{
-		Cash		newvalue = value * 10;
-
-		if (newvalue / 10 != value)
+		if (pg_mul_s64_overflow(value, 10, &value))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("value \"%s\" is out of range for type %s",
 							str, "money")));
-
-		value = newvalue;
 	}
 
 	/*
@@ -285,12 +284,12 @@ cash_in(PG_FUNCTION_ARGS)
 	 */
 	if (sgn > 0)
 	{
-		result = -value;
-		if (result < 0)
+		if (value == PG_INT64_MIN)
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("value \"%s\" is out of range for type %s",
 							str, "money")));
+		result = -value;
 	}
 	else
 		result = value;
diff --git a/src/backend/utils/adt/char.c b/src/backend/utils/adt/char.c
index 1b849e8703..d9fec3bb40 100644
--- a/src/backend/utils/adt/char.c
+++ b/src/backend/utils/adt/char.c
@@ -4,7 +4,7 @@
  *	  Functions for the built-in type "char" (not to be confused with
  *	  bpchar, which is the SQL CHAR(n) type).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/cryptohashes.c b/src/backend/utils/adt/cryptohashes.c
new file mode 100644
index 0000000000..e1ff17590e
--- /dev/null
+++ b/src/backend/utils/adt/cryptohashes.c
@@ -0,0 +1,169 @@
+/*-------------------------------------------------------------------------
+ *
+ * cryptohashes.c
+ *	  Cryptographic hash functions
+ *
+ * Portions Copyright (c) 2018, PostgreSQL Global Development Group
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/adt/cryptohashes.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "common/md5.h"
+#include "common/sha2.h"
+#include "utils/builtins.h"
+
+
+/*
+ * MD5
+ */
+
+/* MD5 produces a 16 byte (128 bit) hash; double it for hex */
+#define MD5_HASH_LEN  32
+
+/*
+ * Create an MD5 hash of a text value and return it as hex string.
+ */
+Datum
+md5_text(PG_FUNCTION_ARGS)
+{
+	text	   *in_text = PG_GETARG_TEXT_PP(0);
+	size_t		len;
+	char		hexsum[MD5_HASH_LEN + 1];
+
+	/* Calculate the length of the buffer using varlena metadata */
+	len = VARSIZE_ANY_EXHDR(in_text);
+
+	/* get the hash result */
+	if (pg_md5_hash(VARDATA_ANY(in_text), len, hexsum) == false)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
+
+	/* convert to text and return it */
+	PG_RETURN_TEXT_P(cstring_to_text(hexsum));
+}
+
+/*
+ * Create an MD5 hash of a bytea value and return it as a hex string.
+ */
+Datum
+md5_bytea(PG_FUNCTION_ARGS)
+{
+	bytea	   *in = PG_GETARG_BYTEA_PP(0);
+	size_t		len;
+	char		hexsum[MD5_HASH_LEN + 1];
+
+	len = VARSIZE_ANY_EXHDR(in);
+	if (pg_md5_hash(VARDATA_ANY(in), len, hexsum) == false)
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory")));
+
+	PG_RETURN_TEXT_P(cstring_to_text(hexsum));
+}
+
+
+/*
+ * SHA-2 variants
+ */
+
+Datum
+sha224_bytea(PG_FUNCTION_ARGS)
+{
+	bytea	   *in = PG_GETARG_BYTEA_PP(0);
+	const uint8 *data;
+	size_t		len;
+	pg_sha224_ctx ctx;
+	unsigned char buf[PG_SHA224_DIGEST_LENGTH];
+	bytea	   *result;
+
+	len = VARSIZE_ANY_EXHDR(in);
+	data = (unsigned char *) VARDATA_ANY(in);
+
+	pg_sha224_init(&ctx);
+	pg_sha224_update(&ctx, data, len);
+	pg_sha224_final(&ctx, buf);
+
+	result = palloc(sizeof(buf) + VARHDRSZ);
+	SET_VARSIZE(result, sizeof(buf) + VARHDRSZ);
+	memcpy(VARDATA(result), buf, sizeof(buf));
+
+	PG_RETURN_BYTEA_P(result);
+}
+
+Datum
+sha256_bytea(PG_FUNCTION_ARGS)
+{
+	bytea	   *in = PG_GETARG_BYTEA_PP(0);
+	const uint8 *data;
+	size_t		len;
+	pg_sha256_ctx ctx;
+	unsigned char buf[PG_SHA256_DIGEST_LENGTH];
+	bytea	   *result;
+
+	len = VARSIZE_ANY_EXHDR(in);
+	data = (unsigned char *) VARDATA_ANY(in);
+
+	pg_sha256_init(&ctx);
+	pg_sha256_update(&ctx, data, len);
+	pg_sha256_final(&ctx, buf);
+
+	result = palloc(sizeof(buf) + VARHDRSZ);
+	SET_VARSIZE(result, sizeof(buf) + VARHDRSZ);
+	memcpy(VARDATA(result), buf, sizeof(buf));
+
+	PG_RETURN_BYTEA_P(result);
+}
+
+Datum
+sha384_bytea(PG_FUNCTION_ARGS)
+{
+	bytea	   *in = PG_GETARG_BYTEA_PP(0);
+	const uint8 *data;
+	size_t		len;
+	pg_sha384_ctx ctx;
+	unsigned char buf[PG_SHA384_DIGEST_LENGTH];
+	bytea	   *result;
+
+	len = VARSIZE_ANY_EXHDR(in);
+	data = (unsigned char *) VARDATA_ANY(in);
+
+	pg_sha384_init(&ctx);
+	pg_sha384_update(&ctx, data, len);
+	pg_sha384_final(&ctx, buf);
+
+	result = palloc(sizeof(buf) + VARHDRSZ);
+	SET_VARSIZE(result, sizeof(buf) + VARHDRSZ);
+	memcpy(VARDATA(result), buf, sizeof(buf));
+
+	PG_RETURN_BYTEA_P(result);
+}
+
+Datum
+sha512_bytea(PG_FUNCTION_ARGS)
+{
+	bytea	   *in = PG_GETARG_BYTEA_PP(0);
+	const uint8 *data;
+	size_t		len;
+	pg_sha512_ctx ctx;
+	unsigned char buf[PG_SHA512_DIGEST_LENGTH];
+	bytea	   *result;
+
+	len = VARSIZE_ANY_EXHDR(in);
+	data = (unsigned char *) VARDATA_ANY(in);
+
+	pg_sha512_init(&ctx);
+	pg_sha512_update(&ctx, data, len);
+	pg_sha512_final(&ctx, buf);
+
+	result = palloc(sizeof(buf) + VARHDRSZ);
+	SET_VARSIZE(result, sizeof(buf) + VARHDRSZ);
+	memcpy(VARDATA(result), buf, sizeof(buf));
+
+	PG_RETURN_BYTEA_P(result);
+}
diff --git a/src/backend/utils/adt/date.c b/src/backend/utils/adt/date.c
index 7d89d79438..eea2904414 100644
--- a/src/backend/utils/adt/date.c
+++ b/src/backend/utils/adt/date.c
@@ -3,7 +3,7 @@
  * date.c
  *	  implements DATE and TIME data types specified in SQL standard
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  *
@@ -41,8 +41,6 @@
 #endif
 
 
-static int	time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec);
-static int	timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp);
 static int	tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result);
 static int	tm2timetz(struct pg_tm *tm, fsec_t fsec, int tz, TimeTzADT *result);
 static void AdjustTimeForTypmod(TimeADT *time, int32 typmod);
@@ -239,7 +237,7 @@ date_send(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, date, sizeof(date));
+	pq_sendint32(&buf, date);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -1013,6 +1011,34 @@ timestamptz_cmp_date(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(timestamptz_cmp_internal(dt1, dt2));
 }
 
+/*
+ * in_range support function for date.
+ *
+ * We implement this by promoting the dates to timestamp (without time zone)
+ * and then using the timestamp-and-interval in_range function.
+ */
+Datum
+in_range_date_interval(PG_FUNCTION_ARGS)
+{
+	DateADT		val = PG_GETARG_DATEADT(0);
+	DateADT		base = PG_GETARG_DATEADT(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	Timestamp	valStamp;
+	Timestamp	baseStamp;
+
+	valStamp = date2timestamp(val);
+	baseStamp = date2timestamp(base);
+
+	return DirectFunctionCall5(in_range_timestamp_interval,
+							   TimestampGetDatum(valStamp),
+							   TimestampGetDatum(baseStamp),
+							   IntervalPGetDatum(offset),
+							   BoolGetDatum(sub),
+							   BoolGetDatum(less));
+}
+
 
 /* Add an interval to a date, giving a new date.
  * Must handle both positive and negative intervals.
@@ -1249,7 +1275,7 @@ tm2time(struct pg_tm *tm, fsec_t fsec, TimeADT *result)
  * If out of this range, leave as UTC (in practice that could only happen
  * if pg_time_t is just 32 bits) - thomas 97/05/27
  */
-static int
+int
 time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec)
 {
 	tm->tm_hour = time / USECS_PER_HOUR;
@@ -1508,6 +1534,12 @@ time_hash(PG_FUNCTION_ARGS)
 	return hashint8(fcinfo);
 }
 
+Datum
+time_hash_extended(PG_FUNCTION_ARGS)
+{
+	return hashint8extended(fcinfo);
+}
+
 Datum
 time_larger(PG_FUNCTION_ARGS)
 {
@@ -1838,6 +1870,45 @@ time_mi_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMEADT(result);
 }
 
+/*
+ * in_range support function for time.
+ */
+Datum
+in_range_time_interval(PG_FUNCTION_ARGS)
+{
+	TimeADT		val = PG_GETARG_TIMEADT(0);
+	TimeADT		base = PG_GETARG_TIMEADT(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	TimeADT		sum;
+
+	/*
+	 * Like time_pl_interval/time_mi_interval, we disregard the month and day
+	 * fields of the offset.  So our test for negative should too.
+	 */
+	if (offset->time < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/*
+	 * We can't use time_pl_interval/time_mi_interval here, because their
+	 * wraparound behavior would give wrong (or at least undesirable) answers.
+	 * Fortunately the equivalent non-wrapping behavior is trivial, especially
+	 * since we don't worry about integer overflow.
+	 */
+	if (sub)
+		sum = base - offset->time;
+	else
+		sum = base + offset->time;
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
 
 /* time_part()
  * Extract specified field from time type.
@@ -2043,7 +2114,7 @@ timetz_send(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 	pq_sendint64(&buf, time->time);
-	pq_sendint(&buf, time->zone, sizeof(time->zone));
+	pq_sendint32(&buf, time->zone);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -2067,7 +2138,7 @@ timetztypmodout(PG_FUNCTION_ARGS)
 /* timetz2tm()
  * Convert TIME WITH TIME ZONE data type to POSIX time structure.
  */
-static int
+int
 timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp)
 {
 	TimeOffset	trem = time->time;
@@ -2213,6 +2284,22 @@ timetz_hash(PG_FUNCTION_ARGS)
 	PG_RETURN_UINT32(thash);
 }
 
+Datum
+timetz_hash_extended(PG_FUNCTION_ARGS)
+{
+	TimeTzADT  *key = PG_GETARG_TIMETZADT_P(0);
+	Datum		seed = PG_GETARG_DATUM(1);
+	uint64		thash;
+
+	/* Same approach as timetz_hash */
+	thash = DatumGetUInt64(DirectFunctionCall2(hashint8extended,
+											   Int64GetDatumFast(key->time),
+											   seed));
+	thash ^= DatumGetUInt64(hash_uint32_extended(key->zone,
+												 DatumGetInt64(seed)));
+	PG_RETURN_UINT64(thash);
+}
+
 Datum
 timetz_larger(PG_FUNCTION_ARGS)
 {
@@ -2285,6 +2372,46 @@ timetz_mi_interval(PG_FUNCTION_ARGS)
 	PG_RETURN_TIMETZADT_P(result);
 }
 
+/*
+ * in_range support function for timetz.
+ */
+Datum
+in_range_timetz_interval(PG_FUNCTION_ARGS)
+{
+	TimeTzADT  *val = PG_GETARG_TIMETZADT_P(0);
+	TimeTzADT  *base = PG_GETARG_TIMETZADT_P(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	TimeTzADT	sum;
+
+	/*
+	 * Like timetz_pl_interval/timetz_mi_interval, we disregard the month and
+	 * day fields of the offset.  So our test for negative should too.
+	 */
+	if (offset->time < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/*
+	 * We can't use timetz_pl_interval/timetz_mi_interval here, because their
+	 * wraparound behavior would give wrong (or at least undesirable) answers.
+	 * Fortunately the equivalent non-wrapping behavior is trivial, especially
+	 * since we don't worry about integer overflow.
+	 */
+	if (sub)
+		sum.time = base->time - offset->time;
+	else
+		sum.time = base->time + offset->time;
+	sum.zone = base->zone;
+
+	if (less)
+		PG_RETURN_BOOL(timetz_cmp_internal(val, &sum) <= 0);
+	else
+		PG_RETURN_BOOL(timetz_cmp_internal(val, &sum) >= 0);
+}
+
 /* overlaps_timetz() --- implements the SQL OVERLAPS operator.
  *
  * Algorithm is per SQL spec.  This is much harder than you'd think
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
index a3d7dc3697..8375b93c39 100644
--- a/src/backend/utils/adt/datetime.c
+++ b/src/backend/utils/adt/datetime.c
@@ -3,7 +3,7 @@
  * datetime.c
  *	  Support functions for date/time types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -791,10 +791,10 @@ DecodeDateTime(char **field, int *ftype, int nf,
 	int			val;
 	int			dterr;
 	int			mer = HR24;
-	bool		haveTextMonth = FALSE;
-	bool		isjulian = FALSE;
-	bool		is2digits = FALSE;
-	bool		bc = FALSE;
+	bool		haveTextMonth = false;
+	bool		isjulian = false;
+	bool		is2digits = false;
+	bool		bc = false;
 	pg_tz	   *namedTz = NULL;
 	pg_tz	   *abbrevTz = NULL;
 	pg_tz	   *valtz;
@@ -840,7 +840,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 						return DTERR_FIELD_OVERFLOW;
 
 					j2date(val, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-					isjulian = TRUE;
+					isjulian = true;
 
 					/* Get the time zone from the end of the string */
 					dterr = DecodeTimezone(cp, tzp);
@@ -1087,7 +1087,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 								return DTERR_FIELD_OVERFLOW;
 							tmask = DTK_DATE_M;
 							j2date(val, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-							isjulian = TRUE;
+							isjulian = true;
 
 							/* fractional Julian Day? */
 							if (*cp == '.')
@@ -1271,7 +1271,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 							tm->tm_mday = tm->tm_mon;
 							tmask = DTK_M(DAY);
 						}
-						haveTextMonth = TRUE;
+						haveTextMonth = true;
 						tm->tm_mon = val;
 						break;
 
@@ -1751,9 +1751,9 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 	int			i;
 	int			val;
 	int			dterr;
-	bool		isjulian = FALSE;
-	bool		is2digits = FALSE;
-	bool		bc = FALSE;
+	bool		isjulian = false;
+	bool		is2digits = false;
+	bool		bc = false;
 	int			mer = HR24;
 	pg_tz	   *namedTz = NULL;
 	pg_tz	   *abbrevTz = NULL;
@@ -1991,7 +1991,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 								return DTERR_FIELD_OVERFLOW;
 							tmask = DTK_DATE_M;
 							j2date(val, &tm->tm_year, &tm->tm_mon, &tm->tm_mday);
-							isjulian = TRUE;
+							isjulian = true;
 
 							if (*cp == '.')
 							{
@@ -2086,7 +2086,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
 					else
 					{
 						dterr = DecodeNumber(flen, field[i],
-											 FALSE,
+											 false,
 											 (fmask | DTK_DATE_M),
 											 &tmask, tm,
 											 fsec, &is2digits);
@@ -2362,7 +2362,7 @@ DecodeTimeOnly(char **field, int *ftype, int nf,
  *	str: field to be parsed
  *	fmask: bitmask for field types already seen
  *	*tmask: receives bitmask for fields found here
- *	*is2digits: set to TRUE if we find 2-digit year
+ *	*is2digits: set to true if we find 2-digit year
  *	*tm: field values are stored into appropriate members of this struct
  */
 static int
@@ -2374,7 +2374,7 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits,
 	int			i,
 				len;
 	int			dterr;
-	bool		haveTextMonth = FALSE;
+	bool		haveTextMonth = false;
 	int			type,
 				val,
 				dmask = 0;
@@ -2424,7 +2424,7 @@ DecodeDate(char *str, int fmask, int *tmask, bool *is2digits,
 			{
 				case MONTH:
 					tm->tm_mon = val;
-					haveTextMonth = TRUE;
+					haveTextMonth = true;
 					break;
 
 				default:
@@ -2755,7 +2755,7 @@ DecodeNumber(int flen, char *str, bool haveTextMonth, int fmask,
 					*tmask = DTK_M(DAY);	/* YEAR is already set */
 					tm->tm_mday = tm->tm_year;
 					tm->tm_year = val;
-					*is2digits = FALSE;
+					*is2digits = false;
 				}
 				else
 				{
@@ -2859,7 +2859,7 @@ DecodeNumberField(int len, char *str, int fmask,
 			*(str + (len - 4)) = '\0';
 			tm->tm_year = atoi(str);
 			if ((len - 4) == 2)
-				*is2digits = TRUE;
+				*is2digits = true;
 
 			return DTK_DATE;
 		}
@@ -3095,7 +3095,7 @@ int
 DecodeInterval(char **field, int *ftype, int nf, int range,
 			   int *dtype, struct pg_tm *tm, fsec_t *fsec)
 {
-	bool		is_before = FALSE;
+	bool		is_before = false;
 	char	   *cp;
 	int			fmask = 0,
 				tmask,
@@ -3350,7 +3350,7 @@ DecodeInterval(char **field, int *ftype, int nf, int range,
 						break;
 
 					case AGO:
-						is_before = TRUE;
+						is_before = true;
 						type = val;
 						break;
 
@@ -4193,7 +4193,7 @@ AddPostgresIntPart(char *cp, int value, const char *units,
 	 * tad bizarre but it's how it worked before...
 	 */
 	*is_before = (value < 0);
-	*is_zero = FALSE;
+	*is_zero = false;
 	return cp + strlen(cp);
 }
 
@@ -4213,7 +4213,7 @@ AddVerboseIntPart(char *cp, int value, const char *units,
 	else if (*is_before)
 		value = -value;
 	sprintf(cp, " %d %s%s", value, units, (value == 1) ? "" : "s");
-	*is_zero = FALSE;
+	*is_zero = false;
 	return cp + strlen(cp);
 }
 
@@ -4247,8 +4247,8 @@ EncodeInterval(struct pg_tm *tm, fsec_t fsec, int style, char *str)
 	int			hour = tm->tm_hour;
 	int			min = tm->tm_min;
 	int			sec = tm->tm_sec;
-	bool		is_before = FALSE;
-	bool		is_zero = TRUE;
+	bool		is_before = false;
+	bool		is_zero = true;
 
 	/*
 	 * The sign of year and month are guaranteed to match, since they are
@@ -4403,7 +4403,7 @@ EncodeInterval(struct pg_tm *tm, fsec_t fsec, int style, char *str)
 				if (sec < 0 || (sec == 0 && fsec < 0))
 				{
 					if (is_zero)
-						is_before = TRUE;
+						is_before = true;
 					else if (!is_before)
 						*cp++ = '-';
 				}
@@ -4412,7 +4412,7 @@ EncodeInterval(struct pg_tm *tm, fsec_t fsec, int style, char *str)
 				cp = AppendSeconds(cp, sec, fsec, MAX_INTERVAL_PRECISION, false);
 				sprintf(cp, " sec%s",
 						(abs(sec) != 1 || fsec != 0) ? "s" : "");
-				is_zero = FALSE;
+				is_zero = false;
 			}
 			/* identically zero? then put in a unitless zero... */
 			if (is_zero)
diff --git a/src/backend/utils/adt/datum.c b/src/backend/utils/adt/datum.c
index 81e3b52ec9..f02a5e77ae 100644
--- a/src/backend/utils/adt/datum.c
+++ b/src/backend/utils/adt/datum.c
@@ -3,7 +3,7 @@
  * datum.c
  *	  POSTGRES Datum (abstract data type) manipulation routines.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/dbsize.c b/src/backend/utils/adt/dbsize.c
index 515e30d177..834a10485f 100644
--- a/src/backend/utils/adt/dbsize.c
+++ b/src/backend/utils/adt/dbsize.c
@@ -2,7 +2,7 @@
  * dbsize.c
  *		Database object size functions, and related inquiries
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/dbsize.c
@@ -97,7 +97,7 @@ calculate_database_size(Oid dbOid)
 	if (aclresult != ACLCHECK_OK &&
 		!is_member_of_role(GetUserId(), DEFAULT_ROLE_READ_ALL_STATS))
 	{
-		aclcheck_error(aclresult, ACL_KIND_DATABASE,
+		aclcheck_error(aclresult, OBJECT_DATABASE,
 					   get_database_name(dbOid));
 	}
 
@@ -110,11 +110,6 @@ calculate_database_size(Oid dbOid)
 	/* Scan the non-default tablespaces */
 	snprintf(dirpath, MAXPGPATH, "pg_tblspc");
 	dirdesc = AllocateDir(dirpath);
-	if (!dirdesc)
-		ereport(ERROR,
-				(errcode_for_file_access(),
-				 errmsg("could not open tablespace directory \"%s\": %m",
-						dirpath)));
 
 	while ((direntry = ReadDir(dirdesc, dirpath)) != NULL)
 	{
@@ -188,7 +183,7 @@ calculate_tablespace_size(Oid tblspcOid)
 	{
 		aclresult = pg_tablespace_aclcheck(tblspcOid, GetUserId(), ACL_CREATE);
 		if (aclresult != ACLCHECK_OK)
-			aclcheck_error(aclresult, ACL_KIND_TABLESPACE,
+			aclcheck_error(aclresult, OBJECT_TABLESPACE,
 						   get_tablespace_name(tblspcOid));
 	}
 
diff --git a/src/backend/utils/adt/domains.c b/src/backend/utils/adt/domains.c
index e61d91bd88..1df554ec93 100644
--- a/src/backend/utils/adt/domains.c
+++ b/src/backend/utils/adt/domains.c
@@ -19,7 +19,7 @@
  *		to evaluate them in.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -82,9 +82,10 @@ domain_state_setup(Oid domainType, bool binary, MemoryContext mcxt)
 	 * Verify that domainType represents a valid domain type.  We need to be
 	 * careful here because domain_in and domain_recv can be called from SQL,
 	 * possibly with incorrect arguments.  We use lookup_type_cache mainly
-	 * because it will throw a clean user-facing error for a bad OID.
+	 * because it will throw a clean user-facing error for a bad OID; but also
+	 * it can cache the underlying base type info.
 	 */
-	typentry = lookup_type_cache(domainType, 0);
+	typentry = lookup_type_cache(domainType, TYPECACHE_DOMAIN_BASE_INFO);
 	if (typentry->typtype != TYPTYPE_DOMAIN)
 		ereport(ERROR,
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
@@ -92,8 +93,8 @@ domain_state_setup(Oid domainType, bool binary, MemoryContext mcxt)
 						format_type_be(domainType))));
 
 	/* Find out the base type */
-	my_extra->typtypmod = -1;
-	baseType = getBaseTypeAndTypmod(domainType, &my_extra->typtypmod);
+	baseType = typentry->domainBaseType;
+	my_extra->typtypmod = typentry->domainBaseTypmod;
 
 	/* Look up underlying I/O function */
 	if (binary)
diff --git a/src/backend/utils/adt/encode.c b/src/backend/utils/adt/encode.c
index 742ce6f97e..f527ee2a43 100644
--- a/src/backend/utils/adt/encode.c
+++ b/src/backend/utils/adt/encode.c
@@ -3,7 +3,7 @@
  * encode.c
  *	  Various data encoding/decoding things.
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/enum.c b/src/backend/utils/adt/enum.c
index 973397cc85..562cd5c555 100644
--- a/src/backend/utils/adt/enum.c
+++ b/src/backend/utils/adt/enum.c
@@ -3,7 +3,7 @@
  * enum.c
  *	  I/O functions, operators, aggregates etc for enum types
  *
- * Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -19,7 +19,6 @@
 #include "catalog/indexing.h"
 #include "catalog/pg_enum.h"
 #include "libpq/pqformat.h"
-#include "storage/procarray.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
@@ -32,93 +31,6 @@ static Oid	enum_endpoint(Oid enumtypoid, ScanDirection direction);
 static ArrayType *enum_range_internal(Oid enumtypoid, Oid lower, Oid upper);
 
 
-/*
- * Disallow use of an uncommitted pg_enum tuple.
- *
- * We need to make sure that uncommitted enum values don't get into indexes.
- * If they did, and if we then rolled back the pg_enum addition, we'd have
- * broken the index because value comparisons will not work reliably without
- * an underlying pg_enum entry.  (Note that removal of the heap entry
- * containing an enum value is not sufficient to ensure that it doesn't appear
- * in upper levels of indexes.)  To do this we prevent an uncommitted row from
- * being used for any SQL-level purpose.  This is stronger than necessary,
- * since the value might not be getting inserted into a table or there might
- * be no index on its column, but it's easy to enforce centrally.
- *
- * However, it's okay to allow use of uncommitted values belonging to enum
- * types that were themselves created in the same transaction, because then
- * any such index would also be new and would go away altogether on rollback.
- * (This case is required by pg_upgrade.)
- *
- * This function needs to be called (directly or indirectly) in any of the
- * functions below that could return an enum value to SQL operations.
- */
-static void
-check_safe_enum_use(HeapTuple enumval_tup)
-{
-	TransactionId xmin;
-	Form_pg_enum en;
-	HeapTuple	enumtyp_tup;
-
-	/*
-	 * If the row is hinted as committed, it's surely safe.  This provides a
-	 * fast path for all normal use-cases.
-	 */
-	if (HeapTupleHeaderXminCommitted(enumval_tup->t_data))
-		return;
-
-	/*
-	 * Usually, a row would get hinted as committed when it's read or loaded
-	 * into syscache; but just in case not, let's check the xmin directly.
-	 */
-	xmin = HeapTupleHeaderGetXmin(enumval_tup->t_data);
-	if (!TransactionIdIsInProgress(xmin) &&
-		TransactionIdDidCommit(xmin))
-		return;
-
-	/* It is a new enum value, so check to see if the whole enum is new */
-	en = (Form_pg_enum) GETSTRUCT(enumval_tup);
-	enumtyp_tup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(en->enumtypid));
-	if (!HeapTupleIsValid(enumtyp_tup))
-		elog(ERROR, "cache lookup failed for type %u", en->enumtypid);
-
-	/*
-	 * We insist that the type have been created in the same (sub)transaction
-	 * as the enum value.  It would be safe to allow the type's originating
-	 * xact to be a subcommitted child of the enum value's xact, but not vice
-	 * versa (since we might now be in a subxact of the type's originating
-	 * xact, which could roll back along with the enum value's subxact).  The
-	 * former case seems a sufficiently weird usage pattern as to not be worth
-	 * spending code for, so we're left with a simple equality check.
-	 *
-	 * We also insist that the type's pg_type row not be HEAP_UPDATED.  If it
-	 * is, we can't tell whether the row was created or only modified in the
-	 * apparent originating xact, so it might be older than that xact.  (We do
-	 * not worry whether the enum value is HEAP_UPDATED; if it is, we might
-	 * think it's too new and throw an unnecessary error, but we won't allow
-	 * an unsafe case.)
-	 */
-	if (xmin == HeapTupleHeaderGetXmin(enumtyp_tup->t_data) &&
-		!(enumtyp_tup->t_data->t_infomask & HEAP_UPDATED))
-	{
-		/* same (sub)transaction, so safe */
-		ReleaseSysCache(enumtyp_tup);
-		return;
-	}
-
-	/*
-	 * There might well be other tests we could do here to narrow down the
-	 * unsafe conditions, but for now just raise an exception.
-	 */
-	ereport(ERROR,
-			(errcode(ERRCODE_UNSAFE_NEW_ENUM_VALUE_USAGE),
-			 errmsg("unsafe use of new value \"%s\" of enum type %s",
-					NameStr(en->enumlabel),
-					format_type_be(en->enumtypid)),
-			 errhint("New enum values must be committed before they can be used.")));
-}
-
-
 /* Basic I/O support */
 
 Datum
@@ -147,9 +59,6 @@ enum_in(PG_FUNCTION_ARGS)
 						format_type_be(enumtypoid),
 						name)));
 
-	/* check it's safe to use in SQL */
-	check_safe_enum_use(tup);
-
 	/*
 	 * This comes from pg_enum.oid and stores system oids in user tables. This
 	 * oid must be preserved by binary upgrades.
@@ -215,9 +124,6 @@ enum_recv(PG_FUNCTION_ARGS)
 						format_type_be(enumtypoid),
 						name)));
 
-	/* check it's safe to use in SQL */
-	check_safe_enum_use(tup);
-
 	enumoid = HeapTupleGetOid(tup);
 
 	ReleaseSysCache(tup);
@@ -425,16 +331,9 @@ enum_endpoint(Oid enumtypoid, ScanDirection direction)
 
 	enum_tuple = systable_getnext_ordered(enum_scan, direction);
 	if (HeapTupleIsValid(enum_tuple))
-	{
-		/* check it's safe to use in SQL */
-		check_safe_enum_use(enum_tuple);
 		minmax = HeapTupleGetOid(enum_tuple);
-	}
 	else
-	{
-		/* should only happen with an empty enum */
 		minmax = InvalidOid;
-	}
 
 	systable_endscan_ordered(enum_scan);
 	index_close(enum_idx, AccessShareLock);
@@ -595,9 +494,6 @@ enum_range_internal(Oid enumtypoid, Oid lower, Oid upper)
 
 		if (left_found)
 		{
-			/* check it's safe to use in SQL */
-			check_safe_enum_use(enum_tuple);
-
 			if (cnt >= max)
 			{
 				max *= 2;
diff --git a/src/backend/utils/adt/expandeddatum.c b/src/backend/utils/adt/expandeddatum.c
index 3d77686af7..33fa4a0629 100644
--- a/src/backend/utils/adt/expandeddatum.c
+++ b/src/backend/utils/adt/expandeddatum.c
@@ -3,7 +3,7 @@
  * expandeddatum.c
  *	  Support functions for "expanded" value representations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -74,14 +74,14 @@ EOH_init_header(ExpandedObjectHeader *eohptr,
 Size
 EOH_get_flat_size(ExpandedObjectHeader *eohptr)
 {
-	return (*eohptr->eoh_methods->get_flat_size) (eohptr);
+	return eohptr->eoh_methods->get_flat_size(eohptr);
 }
 
 void
 EOH_flatten_into(ExpandedObjectHeader *eohptr,
 				 void *result, Size allocated_size)
 {
-	(*eohptr->eoh_methods->flatten_into) (eohptr, result, allocated_size);
+	eohptr->eoh_methods->flatten_into(eohptr, result, allocated_size);
 }
 
 /*
diff --git a/src/backend/utils/adt/expandedrecord.c b/src/backend/utils/adt/expandedrecord.c
new file mode 100644
index 0000000000..0bf5fe8cc7
--- /dev/null
+++ b/src/backend/utils/adt/expandedrecord.c
@@ -0,0 +1,1569 @@
+/*-------------------------------------------------------------------------
+ *
+ * expandedrecord.c
+ *	  Functions for manipulating composite expanded objects.
+ *
+ * This module supports "expanded objects" (cf. expandeddatum.h) that can
+ * store values of named composite types, domains over named composite types,
+ * and record types (registered or anonymous).
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/adt/expandedrecord.c
+ *
+ *-------------------------------------------------------------------------
+ */
+#include "postgres.h"
+
+#include "access/htup_details.h"
+#include "catalog/heap.h"
+#include "catalog/pg_type.h"
+#include "utils/builtins.h"
+#include "utils/datum.h"
+#include "utils/expandedrecord.h"
+#include "utils/memutils.h"
+#include "utils/typcache.h"
+
+
+/* "Methods" required for an expanded object */
+static Size ER_get_flat_size(ExpandedObjectHeader *eohptr);
+static void ER_flatten_into(ExpandedObjectHeader *eohptr,
+				void *result, Size allocated_size);
+
+static const ExpandedObjectMethods ER_methods =
+{
+	ER_get_flat_size,
+	ER_flatten_into
+};
+
+/* Other local functions */
+static void ER_mc_callback(void *arg);
+static MemoryContext get_domain_check_cxt(ExpandedRecordHeader *erh);
+static void build_dummy_expanded_header(ExpandedRecordHeader *main_erh);
+static pg_noinline void check_domain_for_new_field(ExpandedRecordHeader *erh,
+						   int fnumber,
+						   Datum newValue, bool isnull);
+static pg_noinline void check_domain_for_new_tuple(ExpandedRecordHeader *erh,
+						   HeapTuple tuple);
+
+
+/*
+ * Build an expanded record of the specified composite type
+ *
+ * type_id can be RECORDOID, but only if a positive typmod is given.
+ *
+ * The expanded record is initially "empty", having a state logically
+ * equivalent to a NULL composite value (not ROW(NULL, NULL, ...)).
+ * Note that this might not be a valid state for a domain type; if the
+ * caller needs to check that, call expanded_record_set_tuple(erh, NULL).
+ *
+ * The expanded object will be a child of parentcontext.
+ */
+ExpandedRecordHeader *
+make_expanded_record_from_typeid(Oid type_id, int32 typmod,
+								 MemoryContext parentcontext)
+{
+	ExpandedRecordHeader *erh;
+	int			flags = 0;
+	TupleDesc	tupdesc;
+	uint64		tupdesc_id;
+	MemoryContext objcxt;
+	char	   *chunk;
+
+	if (type_id != RECORDOID)
+	{
+		/*
+		 * Consult the typcache to see if it's a domain over composite, and in
+		 * any case to get the tupdesc and tupdesc identifier.
+		 */
+		TypeCacheEntry *typentry;
+
+		typentry = lookup_type_cache(type_id,
+									 TYPECACHE_TUPDESC |
+									 TYPECACHE_DOMAIN_BASE_INFO);
+		if (typentry->typtype == TYPTYPE_DOMAIN)
+		{
+			flags |= ER_FLAG_IS_DOMAIN;
+			typentry = lookup_type_cache(typentry->domainBaseType,
+										 TYPECACHE_TUPDESC);
+		}
+		if (typentry->tupDesc == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("type %s is not composite",
+							format_type_be(type_id))));
+		tupdesc = typentry->tupDesc;
+		tupdesc_id = typentry->tupDesc_identifier;
+	}
+	else
+	{
+		/*
+		 * For RECORD types, get the tupdesc and identifier from typcache.
+		 */
+		tupdesc = lookup_rowtype_tupdesc(type_id, typmod);
+		tupdesc_id = assign_record_type_identifier(type_id, typmod);
+	}
+
+	/*
+	 * Allocate private context for expanded object.  We use a regular-size
+	 * context, not a small one, to improve the odds that we can fit a tupdesc
+	 * into it without needing an extra malloc block.  (This code path doesn't
+	 * ever need to copy a tupdesc into the expanded record, but let's be
+	 * consistent with the other ways of making an expanded record.)
+	 */
+	objcxt = AllocSetContextCreate(parentcontext,
+								   "expanded record",
+								   ALLOCSET_DEFAULT_SIZES);
+
+	/*
+	 * Since we already know the number of fields in the tupdesc, we can
+	 * allocate the dvalues/dnulls arrays along with the record header.  This
+	 * is useless if we never need those arrays, but it costs almost nothing,
+	 * and it will save a palloc cycle if we do need them.
+	 */
+	erh = (ExpandedRecordHeader *)
+		MemoryContextAlloc(objcxt, MAXALIGN(sizeof(ExpandedRecordHeader))
+						   + tupdesc->natts * (sizeof(Datum) + sizeof(bool)));
+
+	/* Ensure all header fields are initialized to 0/null */
+	memset(erh, 0, sizeof(ExpandedRecordHeader));
+
+	EOH_init_header(&erh->hdr, &ER_methods, objcxt);
+	erh->er_magic = ER_MAGIC;
+
+	/* Set up dvalues/dnulls, with no valid contents as yet */
+	chunk = (char *) erh + MAXALIGN(sizeof(ExpandedRecordHeader));
+	erh->dvalues = (Datum *) chunk;
+	erh->dnulls = (bool *) (chunk + tupdesc->natts * sizeof(Datum));
+	erh->nfields = tupdesc->natts;
+
+	/* Fill in composite-type identification info */
+	erh->er_decltypeid = type_id;
+	erh->er_typeid = tupdesc->tdtypeid;
+	erh->er_typmod = tupdesc->tdtypmod;
+	erh->er_tupdesc_id = tupdesc_id;
+
+	erh->flags = flags;
+
+	/*
+	 * If what we got from the typcache is a refcounted tupdesc, we need to
+	 * acquire our own refcount on it.  We manage the refcount with a memory
+	 * context callback rather than assuming that the CurrentResourceOwner is
+	 * longer-lived than this expanded object.
+	 */
+	if (tupdesc->tdrefcount >= 0)
+	{
+		/* Register callback to release the refcount */
+		erh->er_mcb.func = ER_mc_callback;
+		erh->er_mcb.arg = (void *) erh;
+		MemoryContextRegisterResetCallback(erh->hdr.eoh_context,
+										   &erh->er_mcb);
+
+		/* And save the pointer */
+		erh->er_tupdesc = tupdesc;
+		tupdesc->tdrefcount++;
+
+		/* If we called lookup_rowtype_tupdesc, release the pin it took */
+		if (type_id == RECORDOID)
+			DecrTupleDescRefCount(tupdesc);
+	}
+	else
+	{
+		/*
+		 * If it's not refcounted, just assume it will outlive the expanded
+		 * object.  (This can happen for shared record types, for instance.)
+		 */
+		erh->er_tupdesc = tupdesc;
+	}
+
+	/*
+	 * We don't set ER_FLAG_DVALUES_VALID or ER_FLAG_FVALUE_VALID, so the
+	 * record remains logically empty.
+	 */
+
+	return erh;
+}
+
+/*
+ * Build an expanded record of the rowtype defined by the tupdesc
+ *
+ * The tupdesc is copied if necessary (i.e., if we can't just bump its
+ * reference count instead).
+ *
+ * The expanded record is initially "empty", having a state logically
+ * equivalent to a NULL composite value (not ROW(NULL, NULL, ...)).
+ *
+ * The expanded object will be a child of parentcontext.
+ */
+ExpandedRecordHeader *
+make_expanded_record_from_tupdesc(TupleDesc tupdesc,
+								  MemoryContext parentcontext)
+{
+	ExpandedRecordHeader *erh;
+	uint64		tupdesc_id;
+	MemoryContext objcxt;
+	MemoryContext oldcxt;
+	char	   *chunk;
+
+	if (tupdesc->tdtypeid != RECORDOID)
+	{
+		/*
+		 * If it's a named composite type (not RECORD), we prefer to reference
+		 * the typcache's copy of the tupdesc, which is guaranteed to be
+		 * refcounted (the given tupdesc might not be).  In any case, we need
+		 * to consult the typcache to get the correct tupdesc identifier.
+		 *
+		 * Note that tdtypeid couldn't be a domain type, so we need not
+		 * consider that case here.
+		 */
+		TypeCacheEntry *typentry;
+
+		typentry = lookup_type_cache(tupdesc->tdtypeid, TYPECACHE_TUPDESC);
+		if (typentry->tupDesc == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("type %s is not composite",
+							format_type_be(tupdesc->tdtypeid))));
+		tupdesc = typentry->tupDesc;
+		tupdesc_id = typentry->tupDesc_identifier;
+	}
+	else
+	{
+		/*
+		 * For RECORD types, get the appropriate unique identifier (possibly
+		 * freshly assigned).
+		 */
+		tupdesc_id = assign_record_type_identifier(tupdesc->tdtypeid,
+												   tupdesc->tdtypmod);
+	}
+
+	/*
+	 * Allocate private context for expanded object.  We use a regular-size
+	 * context, not a small one, to improve the odds that we can fit a tupdesc
+	 * into it without needing an extra malloc block.
+	 */
+	objcxt = AllocSetContextCreate(parentcontext,
+								   "expanded record",
+								   ALLOCSET_DEFAULT_SIZES);
+
+	/*
+	 * Since we already know the number of fields in the tupdesc, we can
+	 * allocate the dvalues/dnulls arrays along with the record header.  This
+	 * is useless if we never need those arrays, but it costs almost nothing,
+	 * and it will save a palloc cycle if we do need them.
+	 */
+	erh = (ExpandedRecordHeader *)
+		MemoryContextAlloc(objcxt, MAXALIGN(sizeof(ExpandedRecordHeader))
+						   + tupdesc->natts * (sizeof(Datum) + sizeof(bool)));
+
+	/* Ensure all header fields are initialized to 0/null */
+	memset(erh, 0, sizeof(ExpandedRecordHeader));
+
+	EOH_init_header(&erh->hdr, &ER_methods, objcxt);
+	erh->er_magic = ER_MAGIC;
+
+	/* Set up dvalues/dnulls, with no valid contents as yet */
+	chunk = (char *) erh + MAXALIGN(sizeof(ExpandedRecordHeader));
+	erh->dvalues = (Datum *) chunk;
+	erh->dnulls = (bool *) (chunk + tupdesc->natts * sizeof(Datum));
+	erh->nfields = tupdesc->natts;
+
+	/* Fill in composite-type identification info */
+	erh->er_decltypeid = erh->er_typeid = tupdesc->tdtypeid;
+	erh->er_typmod = tupdesc->tdtypmod;
+	erh->er_tupdesc_id = tupdesc_id;
+
+	/*
+	 * Copy tupdesc if needed, but we prefer to bump its refcount if possible.
+	 * We manage the refcount with a memory context callback rather than
+	 * assuming that the CurrentResourceOwner is longer-lived than this
+	 * expanded object.
+	 */
+	if (tupdesc->tdrefcount >= 0)
+	{
+		/* Register callback to release the refcount */
+		erh->er_mcb.func = ER_mc_callback;
+		erh->er_mcb.arg = (void *) erh;
+		MemoryContextRegisterResetCallback(erh->hdr.eoh_context,
+										   &erh->er_mcb);
+
+		/* And save the pointer */
+		erh->er_tupdesc = tupdesc;
+		tupdesc->tdrefcount++;
+	}
+	else
+	{
+		/* Just copy it */
+		oldcxt = MemoryContextSwitchTo(objcxt);
+		erh->er_tupdesc = CreateTupleDescCopy(tupdesc);
+		erh->flags |= ER_FLAG_TUPDESC_ALLOCED;
+		MemoryContextSwitchTo(oldcxt);
+	}
+
+	/*
+	 * We don't set ER_FLAG_DVALUES_VALID or ER_FLAG_FVALUE_VALID, so the
+	 * record remains logically empty.
+	 */
+
+	return erh;
+}
+
+/*
+ * Build an expanded record of the same rowtype as the given expanded record
+ *
+ * This is faster than either of the above routines because we can bypass
+ * typcache lookup(s).
+ *
+ * The expanded record is initially "empty" --- we do not copy whatever
+ * tuple might be in the source expanded record.
+ *
+ * The expanded object will be a child of parentcontext.
+ */
+ExpandedRecordHeader *
+make_expanded_record_from_exprecord(ExpandedRecordHeader *olderh,
+									MemoryContext parentcontext)
+{
+	ExpandedRecordHeader *erh;
+	TupleDesc	tupdesc = expanded_record_get_tupdesc(olderh);
+	MemoryContext objcxt;
+	MemoryContext oldcxt;
+	char	   *chunk;
+
+	/*
+	 * Allocate private context for expanded object.  We use a regular-size
+	 * context, not a small one, to improve the odds that we can fit a tupdesc
+	 * into it without needing an extra malloc block.
+	 */
+	objcxt = AllocSetContextCreate(parentcontext,
+								   "expanded record",
+								   ALLOCSET_DEFAULT_SIZES);
+
+	/*
+	 * Since we already know the number of fields in the tupdesc, we can
+	 * allocate the dvalues/dnulls arrays along with the record header.  This
+	 * is useless if we never need those arrays, but it costs almost nothing,
+	 * and it will save a palloc cycle if we do need them.
+	 */
+	erh = (ExpandedRecordHeader *)
+		MemoryContextAlloc(objcxt, MAXALIGN(sizeof(ExpandedRecordHeader))
+						   + tupdesc->natts * (sizeof(Datum) + sizeof(bool)));
+
+	/* Ensure all header fields are initialized to 0/null */
+	memset(erh, 0, sizeof(ExpandedRecordHeader));
+
+	EOH_init_header(&erh->hdr, &ER_methods, objcxt);
+	erh->er_magic = ER_MAGIC;
+
+	/* Set up dvalues/dnulls, with no valid contents as yet */
+	chunk = (char *) erh + MAXALIGN(sizeof(ExpandedRecordHeader));
+	erh->dvalues = (Datum *) chunk;
+	erh->dnulls = (bool *) (chunk + tupdesc->natts * sizeof(Datum));
+	erh->nfields = tupdesc->natts;
+
+	/* Fill in composite-type identification info */
+	erh->er_decltypeid = olderh->er_decltypeid;
+	erh->er_typeid = olderh->er_typeid;
+	erh->er_typmod = olderh->er_typmod;
+	erh->er_tupdesc_id = olderh->er_tupdesc_id;
+
+	/* The only flag bit that transfers over is IS_DOMAIN */
+	erh->flags = olderh->flags & ER_FLAG_IS_DOMAIN;
+
+	/*
+	 * Copy tupdesc if needed, but we prefer to bump its refcount if possible.
+	 * We manage the refcount with a memory context callback rather than
+	 * assuming that the CurrentResourceOwner is longer-lived than this
+	 * expanded object.
+	 */
+	if (tupdesc->tdrefcount >= 0)
+	{
+		/* Register callback to release the refcount */
+		erh->er_mcb.func = ER_mc_callback;
+		erh->er_mcb.arg = (void *) erh;
+		MemoryContextRegisterResetCallback(erh->hdr.eoh_context,
+										   &erh->er_mcb);
+
+		/* And save the pointer */
+		erh->er_tupdesc = tupdesc;
+		tupdesc->tdrefcount++;
+	}
+	else if (olderh->flags & ER_FLAG_TUPDESC_ALLOCED)
+	{
+		/* We need to make our own copy of the tupdesc */
+		oldcxt = MemoryContextSwitchTo(objcxt);
+		erh->er_tupdesc = CreateTupleDescCopy(tupdesc);
+		erh->flags |= ER_FLAG_TUPDESC_ALLOCED;
+		MemoryContextSwitchTo(oldcxt);
+	}
+	else
+	{
+		/*
+		 * Assume the tupdesc will outlive this expanded object, just like
+		 * we're assuming it will outlive the source object.
+		 */
+		erh->er_tupdesc = tupdesc;
+	}
+
+	/*
+	 * We don't set ER_FLAG_DVALUES_VALID or ER_FLAG_FVALUE_VALID, so the
+	 * record remains logically empty.
+	 */
+
+	return erh;
+}
+
+/*
+ * Insert given tuple as the value of the expanded record
+ *
+ * It is caller's responsibility that the tuple matches the record's
+ * previously-assigned rowtype.  (However domain constraints, if any,
+ * will be checked here.)
+ *
+ * The tuple is physically copied into the expanded record's local storage
+ * if "copy" is true, otherwise it's caller's responsibility that the tuple
+ * will live as long as the expanded record does.  In any case, out-of-line
+ * fields in the tuple are not automatically inlined.
+ *
+ * Alternatively, tuple can be NULL, in which case we just set the expanded
+ * record to be empty.
+ */
+void
+expanded_record_set_tuple(ExpandedRecordHeader *erh,
+						  HeapTuple tuple,
+						  bool copy)
+{
+	int			oldflags;
+	HeapTuple	oldtuple;
+	char	   *oldfstartptr;
+	char	   *oldfendptr;
+	int			newflags;
+	HeapTuple	newtuple;
+	MemoryContext oldcxt;
+
+	/* Shouldn't ever be trying to assign new data to a dummy header */
+	Assert(!(erh->flags & ER_FLAG_IS_DUMMY));
+
+	/*
+	 * Before performing the assignment, see if result will satisfy domain.
+	 */
+	if (erh->flags & ER_FLAG_IS_DOMAIN)
+		check_domain_for_new_tuple(erh, tuple);
+
+	/*
+	 * Initialize new flags, keeping only non-data status bits.
+	 */
+	oldflags = erh->flags;
+	newflags = oldflags & ER_FLAGS_NON_DATA;
+
+	/*
+	 * Copy tuple into local storage if needed.  We must be sure this succeeds
+	 * before we start to modify the expanded record's state.
+	 */
+	if (copy && tuple)
+	{
+		oldcxt = MemoryContextSwitchTo(erh->hdr.eoh_context);
+		newtuple = heap_copytuple(tuple);
+		newflags |= ER_FLAG_FVALUE_ALLOCED;
+		MemoryContextSwitchTo(oldcxt);
+	}
+	else
+		newtuple = tuple;
+
+	/* Make copies of fields we're about to overwrite */
+	oldtuple = erh->fvalue;
+	oldfstartptr = erh->fstartptr;
+	oldfendptr = erh->fendptr;
+
+	/*
+	 * It's now safe to update the expanded record's state.
+	 */
+	if (newtuple)
+	{
+		/* Save flat representation */
+		erh->fvalue = newtuple;
+		erh->fstartptr = (char *) newtuple->t_data;
+		erh->fendptr = ((char *) newtuple->t_data) + newtuple->t_len;
+		newflags |= ER_FLAG_FVALUE_VALID;
+
+		/* Remember if we have any out-of-line field values */
+		if (HeapTupleHasExternal(newtuple))
+			newflags |= ER_FLAG_HAVE_EXTERNAL;
+	}
+	else
+	{
+		erh->fvalue = NULL;
+		erh->fstartptr = erh->fendptr = NULL;
+	}
+
+	erh->flags = newflags;
+
+	/* Reset flat-size info; we don't bother to make it valid now */
+	erh->flat_size = 0;
+
+	/*
+	 * Now, release any storage belonging to old field values.  It's safe to
+	 * do this because ER_FLAG_DVALUES_VALID is no longer set in erh->flags;
+	 * even if we fail partway through, the record is valid, and at worst
+	 * we've failed to reclaim some space.
+	 */
+	if (oldflags & ER_FLAG_DVALUES_ALLOCED)
+	{
+		TupleDesc	tupdesc = erh->er_tupdesc;
+		int			i;
+
+		for (i = 0; i < erh->nfields; i++)
+		{
+			if (!erh->dnulls[i] &&
+				!(TupleDescAttr(tupdesc, i)->attbyval))
+			{
+				char	   *oldValue = (char *) DatumGetPointer(erh->dvalues[i]);
+
+				if (oldValue < oldfstartptr || oldValue >= oldfendptr)
+					pfree(oldValue);
+			}
+		}
+	}
+
+	/* Likewise free the old tuple, if it was locally allocated */
+	if (oldflags & ER_FLAG_FVALUE_ALLOCED)
+		heap_freetuple(oldtuple);
+
+	/* We won't make a new deconstructed representation until/unless needed */
+}
+
+/*
+ * make_expanded_record_from_datum: build expanded record from composite Datum
+ *
+ * This combines the functions of make_expanded_record_from_typeid and
+ * expanded_record_set_tuple.  However, we do not force a lookup of the
+ * tupdesc immediately, reasoning that it might never be needed.
+ *
+ * The expanded object will be a child of parentcontext.
+ *
+ * Note: a composite datum cannot self-identify as being of a domain type,
+ * so we need not consider domain cases here.
+ */
+Datum
+make_expanded_record_from_datum(Datum recorddatum, MemoryContext parentcontext)
+{
+	ExpandedRecordHeader *erh;
+	HeapTupleHeader tuphdr;
+	HeapTupleData tmptup;
+	HeapTuple	newtuple;
+	MemoryContext objcxt;
+	MemoryContext oldcxt;
+
+	/*
+	 * Allocate private context for expanded object.  We use a regular-size
+	 * context, not a small one, to improve the odds that we can fit a tupdesc
+	 * into it without needing an extra malloc block.
+	 */
+	objcxt = AllocSetContextCreate(parentcontext,
+								   "expanded record",
+								   ALLOCSET_DEFAULT_SIZES);
+
+	/* Set up expanded record header, initializing fields to 0/null */
+	erh = (ExpandedRecordHeader *)
+		MemoryContextAllocZero(objcxt, sizeof(ExpandedRecordHeader));
+
+	EOH_init_header(&erh->hdr, &ER_methods, objcxt);
+	erh->er_magic = ER_MAGIC;
+
+	/*
+	 * Detoast and copy source record into private context, as a HeapTuple.
+	 * (If we actually have to detoast the source, we'll leak some memory in
+	 * the caller's context, but it doesn't seem worth worrying about.)
+	 */
+	tuphdr = DatumGetHeapTupleHeader(recorddatum);
+
+	tmptup.t_len = HeapTupleHeaderGetDatumLength(tuphdr);
+	ItemPointerSetInvalid(&(tmptup.t_self));
+	tmptup.t_tableOid = InvalidOid;
+	tmptup.t_data = tuphdr;
+
+	oldcxt = MemoryContextSwitchTo(objcxt);
+	newtuple = heap_copytuple(&tmptup);
+	erh->flags |= ER_FLAG_FVALUE_ALLOCED;
+	MemoryContextSwitchTo(oldcxt);
+
+	/* Fill in composite-type identification info */
+	erh->er_decltypeid = erh->er_typeid = HeapTupleHeaderGetTypeId(tuphdr);
+	erh->er_typmod = HeapTupleHeaderGetTypMod(tuphdr);
+
+	/* remember we have a flat representation */
+	erh->fvalue = newtuple;
+	erh->fstartptr = (char *) newtuple->t_data;
+	erh->fendptr = ((char *) newtuple->t_data) + newtuple->t_len;
+	erh->flags |= ER_FLAG_FVALUE_VALID;
+
+	/* Shouldn't need to set ER_FLAG_HAVE_EXTERNAL */
+	Assert(!HeapTupleHeaderHasExternal(tuphdr));
+
+	/*
+	 * We won't look up the tupdesc till we have to, nor make a deconstructed
+	 * representation.  We don't have enough info to fill flat_size and
+	 * friends, either.
+	 */
+
+	/* return a R/W pointer to the expanded record */
+	return EOHPGetRWDatum(&erh->hdr);
+}
+
+/*
+ * get_flat_size method for expanded records
+ *
+ * Note: call this in a reasonably short-lived memory context, in case of
+ * memory leaks from activities such as detoasting.
+ */
+static Size
+ER_get_flat_size(ExpandedObjectHeader *eohptr)
+{
+	ExpandedRecordHeader *erh = (ExpandedRecordHeader *) eohptr;
+	TupleDesc	tupdesc;
+	Size		len;
+	Size		data_len;
+	int			hoff;
+	bool		hasnull;
+	int			i;
+
+	Assert(erh->er_magic == ER_MAGIC);
+
+	/*
+	 * The flat representation has to be a valid composite datum.  Make sure
+	 * that we have a registered, not anonymous, RECORD type.
+	 */
+	if (erh->er_typeid == RECORDOID &&
+		erh->er_typmod < 0)
+	{
+		tupdesc = expanded_record_get_tupdesc(erh);
+		assign_record_type_typmod(tupdesc);
+		erh->er_typmod = tupdesc->tdtypmod;
+	}
+
+	/*
+	 * If we have a valid flattened value without out-of-line fields, we can
+	 * just use it as-is.
+	 */
+	if (erh->flags & ER_FLAG_FVALUE_VALID &&
+		!(erh->flags & ER_FLAG_HAVE_EXTERNAL))
+		return erh->fvalue->t_len;
+
+	/* If we have a cached size value, believe that */
+	if (erh->flat_size)
+		return erh->flat_size;
+
+	/* If we haven't yet deconstructed the tuple, do that */
+	if (!(erh->flags & ER_FLAG_DVALUES_VALID))
+		deconstruct_expanded_record(erh);
+
+	/* Tuple descriptor must be valid by now */
+	tupdesc = erh->er_tupdesc;
+
+	/*
+	 * Composite datums mustn't contain any out-of-line values.
+	 */
+	if (erh->flags & ER_FLAG_HAVE_EXTERNAL)
+	{
+		for (i = 0; i < erh->nfields; i++)
+		{
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+			if (!erh->dnulls[i] &&
+				!attr->attbyval && attr->attlen == -1 &&
+				VARATT_IS_EXTERNAL(DatumGetPointer(erh->dvalues[i])))
+			{
+				/*
+				 * It's an external toasted value, so we need to dereference
+				 * it so that the flat representation will be self-contained.
+				 * Do this step in the caller's context because the TOAST
+				 * fetch might leak memory.  That means making an extra copy,
+				 * which is a tad annoying, but repetitive leaks in the
+				 * record's context would be worse.
+				 */
+				Datum		newValue;
+
+				newValue = PointerGetDatum(PG_DETOAST_DATUM(erh->dvalues[i]));
+				/* expanded_record_set_field can do the rest */
+				/* ... and we don't need it to recheck domain constraints */
+				expanded_record_set_field_internal(erh, i + 1,
+												   newValue, false,
+												   false);
+				/* Might as well free the detoasted value */
+				pfree(DatumGetPointer(newValue));
+			}
+		}
+
+		/*
+		 * We have now removed all external field values, so we can clear the
+		 * flag about them.  This won't cause ER_flatten_into() to mistakenly
+		 * take the fast path, since expanded_record_set_field() will have
+		 * cleared ER_FLAG_FVALUE_VALID.
+		 */
+		erh->flags &= ~ER_FLAG_HAVE_EXTERNAL;
+	}
+
+	/* Test if we currently have any null values */
+	hasnull = false;
+	for (i = 0; i < erh->nfields; i++)
+	{
+		if (erh->dnulls[i])
+		{
+			hasnull = true;
+			break;
+		}
+	}
+
+	/* Determine total space needed */
+	len = offsetof(HeapTupleHeaderData, t_bits);
+
+	if (hasnull)
+		len += BITMAPLEN(tupdesc->natts);
+
+	if (tupdesc->tdhasoid)
+		len += sizeof(Oid);
+
+	hoff = len = MAXALIGN(len); /* align user data safely */
+
+	data_len = heap_compute_data_size(tupdesc, erh->dvalues, erh->dnulls);
+
+	len += data_len;
+
+	/* Cache for next time */
+	erh->flat_size = len;
+	erh->data_len = data_len;
+	erh->hoff = hoff;
+	erh->hasnull = hasnull;
+
+	return len;
+}
+
+/*
+ * flatten_into method for expanded records
+ */
+static void
+ER_flatten_into(ExpandedObjectHeader *eohptr,
+				void *result, Size allocated_size)
+{
+	ExpandedRecordHeader *erh = (ExpandedRecordHeader *) eohptr;
+	HeapTupleHeader tuphdr = (HeapTupleHeader) result;
+	TupleDesc	tupdesc;
+
+	Assert(erh->er_magic == ER_MAGIC);
+
+	/* Easy if we have a valid flattened value without out-of-line fields */
+	if (erh->flags & ER_FLAG_FVALUE_VALID &&
+		!(erh->flags & ER_FLAG_HAVE_EXTERNAL))
+	{
+		Assert(allocated_size == erh->fvalue->t_len);
+		memcpy(tuphdr, erh->fvalue->t_data, allocated_size);
+		/* The original flattened value might not have datum header fields */
+		HeapTupleHeaderSetDatumLength(tuphdr, allocated_size);
+		HeapTupleHeaderSetTypeId(tuphdr, erh->er_typeid);
+		HeapTupleHeaderSetTypMod(tuphdr, erh->er_typmod);
+		return;
+	}
+
+	/* Else allocation should match previous get_flat_size result */
+	Assert(allocated_size == erh->flat_size);
+
+	/* We'll need the tuple descriptor */
+	tupdesc = expanded_record_get_tupdesc(erh);
+
+	/* We must ensure that any pad space is zero-filled */
+	memset(tuphdr, 0, allocated_size);
+
+	/* Set up header fields of composite Datum */
+	HeapTupleHeaderSetDatumLength(tuphdr, allocated_size);
+	HeapTupleHeaderSetTypeId(tuphdr, erh->er_typeid);
+	HeapTupleHeaderSetTypMod(tuphdr, erh->er_typmod);
+	/* We also make sure that t_ctid is invalid unless explicitly set */
+	ItemPointerSetInvalid(&(tuphdr->t_ctid));
+
+	HeapTupleHeaderSetNatts(tuphdr, tupdesc->natts);
+	tuphdr->t_hoff = erh->hoff;
+
+	if (tupdesc->tdhasoid)		/* else leave infomask = 0 */
+		tuphdr->t_infomask = HEAP_HASOID;
+
+	/* And fill the data area from dvalues/dnulls */
+	heap_fill_tuple(tupdesc,
+					erh->dvalues,
+					erh->dnulls,
+					(char *) tuphdr + erh->hoff,
+					erh->data_len,
+					&tuphdr->t_infomask,
+					(erh->hasnull ? tuphdr->t_bits : NULL));
+}
+
+/*
+ * Look up the tupdesc for the expanded record's actual type
+ *
+ * Note: code internal to this module is allowed to just fetch
+ * erh->er_tupdesc if ER_FLAG_DVALUES_VALID is set; otherwise it should call
+ * expanded_record_get_tupdesc.  This function is the out-of-line portion
+ * of expanded_record_get_tupdesc.
+ */
+TupleDesc
+expanded_record_fetch_tupdesc(ExpandedRecordHeader *erh)
+{
+	TupleDesc	tupdesc;
+
+	/* Easy if we already have it (but caller should have checked already) */
+	if (erh->er_tupdesc)
+		return erh->er_tupdesc;
+
+	/* Lookup the composite type's tupdesc using the typcache */
+	tupdesc = lookup_rowtype_tupdesc(erh->er_typeid, erh->er_typmod);
+
+	/*
+	 * If it's a refcounted tupdesc rather than a statically allocated one, we
+	 * want to manage the refcount with a memory context callback rather than
+	 * assuming that the CurrentResourceOwner is longer-lived than this
+	 * expanded object.
+	 */
+	if (tupdesc->tdrefcount >= 0)
+	{
+		/* Register callback if we didn't already */
+		if (erh->er_mcb.arg == NULL)
+		{
+			erh->er_mcb.func = ER_mc_callback;
+			erh->er_mcb.arg = (void *) erh;
+			MemoryContextRegisterResetCallback(erh->hdr.eoh_context,
+											   &erh->er_mcb);
+		}
+
+		/* Remember our own pointer */
+		erh->er_tupdesc = tupdesc;
+		tupdesc->tdrefcount++;
+
+		/* Release the pin lookup_rowtype_tupdesc acquired */
+		DecrTupleDescRefCount(tupdesc);
+	}
+	else
+	{
+		/* Just remember the pointer */
+		erh->er_tupdesc = tupdesc;
+	}
+
+	/* In either case, fetch the process-global ID for this tupdesc */
+	erh->er_tupdesc_id = assign_record_type_identifier(tupdesc->tdtypeid,
+													   tupdesc->tdtypmod);
+
+	return tupdesc;
+}
+
+/*
+ * Get a HeapTuple representing the current value of the expanded record
+ *
+ * If valid, the originally stored tuple is returned, so caller must not
+ * scribble on it.  Otherwise, we return a HeapTuple created in the current
+ * memory context.  In either case, no attempt has been made to inline
+ * out-of-line toasted values, so the tuple isn't usable as a composite
+ * datum.
+ *
+ * Returns NULL if expanded record is empty.
+ */
+HeapTuple
+expanded_record_get_tuple(ExpandedRecordHeader *erh)
+{
+	/* Easy case if we still have original tuple */
+	if (erh->flags & ER_FLAG_FVALUE_VALID)
+		return erh->fvalue;
+
+	/* Else just build a tuple from datums */
+	if (erh->flags & ER_FLAG_DVALUES_VALID)
+		return heap_form_tuple(erh->er_tupdesc, erh->dvalues, erh->dnulls);
+
+	/* Expanded record is empty */
+	return NULL;
+}
+
+/*
+ * Memory context reset callback for cleaning up external resources
+ */
+static void
+ER_mc_callback(void *arg)
+{
+	ExpandedRecordHeader *erh = (ExpandedRecordHeader *) arg;
+	TupleDesc	tupdesc = erh->er_tupdesc;
+
+	/* Release our privately-managed tupdesc refcount, if any */
+	if (tupdesc)
+	{
+		erh->er_tupdesc = NULL; /* just for luck */
+		if (tupdesc->tdrefcount > 0)
+		{
+			if (--tupdesc->tdrefcount == 0)
+				FreeTupleDesc(tupdesc);
+		}
+	}
+}
+
+/*
+ * DatumGetExpandedRecord: get a writable expanded record from an input argument
+ *
+ * Caution: if the input is a read/write pointer, this returns the input
+ * argument; so callers must be sure that their changes are "safe", that is
+ * they cannot leave the record in a corrupt state.
+ */
+ExpandedRecordHeader *
+DatumGetExpandedRecord(Datum d)
+{
+	/* If it's a writable expanded record already, just return it */
+	if (VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(d)))
+	{
+		ExpandedRecordHeader *erh = (ExpandedRecordHeader *) DatumGetEOHP(d);
+
+		Assert(erh->er_magic == ER_MAGIC);
+		return erh;
+	}
+
+	/* Else expand the hard way */
+	d = make_expanded_record_from_datum(d, CurrentMemoryContext);
+	return (ExpandedRecordHeader *) DatumGetEOHP(d);
+}
+
+/*
+ * Create the Datum/isnull representation of an expanded record object
+ * if we didn't do so already.  After calling this, it's OK to read the
+ * dvalues/dnulls arrays directly, rather than going through get_field.
+ *
+ * Note that if the object is currently empty ("null"), this will change
+ * it to represent a row of nulls.
+ */
+void
+deconstruct_expanded_record(ExpandedRecordHeader *erh)
+{
+	TupleDesc	tupdesc;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+	int			nfields;
+
+	if (erh->flags & ER_FLAG_DVALUES_VALID)
+		return;					/* already valid, nothing to do */
+
+	/* We'll need the tuple descriptor */
+	tupdesc = expanded_record_get_tupdesc(erh);
+
+	/*
+	 * Allocate arrays in private context, if we don't have them already.  We
+	 * don't expect to see a change in nfields here, so while we cope if it
+	 * happens, we don't bother avoiding a leak of the old arrays (which might
+	 * not be separately palloc'd, anyway).
+	 */
+	nfields = tupdesc->natts;
+	if (erh->dvalues == NULL || erh->nfields != nfields)
+	{
+		char	   *chunk;
+
+		/*
+		 * To save a palloc cycle, we allocate both the Datum and isnull
+		 * arrays in one palloc chunk.
+		 */
+		chunk = MemoryContextAlloc(erh->hdr.eoh_context,
+								   nfields * (sizeof(Datum) + sizeof(bool)));
+		dvalues = (Datum *) chunk;
+		dnulls = (bool *) (chunk + nfields * sizeof(Datum));
+		erh->dvalues = dvalues;
+		erh->dnulls = dnulls;
+		erh->nfields = nfields;
+	}
+	else
+	{
+		dvalues = erh->dvalues;
+		dnulls = erh->dnulls;
+	}
+
+	if (erh->flags & ER_FLAG_FVALUE_VALID)
+	{
+		/* Deconstruct tuple */
+		heap_deform_tuple(erh->fvalue, tupdesc, dvalues, dnulls);
+	}
+	else
+	{
+		/* If record was empty, instantiate it as a row of nulls */
+		memset(dvalues, 0, nfields * sizeof(Datum));
+		memset(dnulls, true, nfields * sizeof(bool));
+	}
+
+	/* Mark the dvalues as valid */
+	erh->flags |= ER_FLAG_DVALUES_VALID;
+}
+
+/*
+ * Look up a record field by name
+ *
+ * If there is a field named "fieldname", fill in the contents of finfo
+ * and return "true".  Else return "false" without changing *finfo.
+ */
+bool
+expanded_record_lookup_field(ExpandedRecordHeader *erh, const char *fieldname,
+							 ExpandedRecordFieldInfo *finfo)
+{
+	TupleDesc	tupdesc;
+	int			fno;
+	Form_pg_attribute attr;
+
+	tupdesc = expanded_record_get_tupdesc(erh);
+
+	/* First, check user-defined attributes */
+	for (fno = 0; fno < tupdesc->natts; fno++)
+	{
+		attr = TupleDescAttr(tupdesc, fno);
+		if (namestrcmp(&attr->attname, fieldname) == 0 &&
+			!attr->attisdropped)
+		{
+			finfo->fnumber = attr->attnum;
+			finfo->ftypeid = attr->atttypid;
+			finfo->ftypmod = attr->atttypmod;
+			finfo->fcollation = attr->attcollation;
+			return true;
+		}
+	}
+
+	/* How about system attributes? */
+	attr = SystemAttributeByName(fieldname, tupdesc->tdhasoid);
+	if (attr != NULL)
+	{
+		finfo->fnumber = attr->attnum;
+		finfo->ftypeid = attr->atttypid;
+		finfo->ftypmod = attr->atttypmod;
+		finfo->fcollation = attr->attcollation;
+		return true;
+	}
+
+	return false;
+}
+
+/*
+ * Fetch value of record field
+ *
+ * expanded_record_get_field is the frontend for this; it handles the
+ * easy inline-able cases.
+ */
+Datum
+expanded_record_fetch_field(ExpandedRecordHeader *erh, int fnumber,
+							bool *isnull)
+{
+	if (fnumber > 0)
+	{
+		/* Empty record has null fields */
+		if (ExpandedRecordIsEmpty(erh))
+		{
+			*isnull = true;
+			return (Datum) 0;
+		}
+		/* Make sure we have deconstructed form */
+		deconstruct_expanded_record(erh);
+		/* Out-of-range field number reads as null */
+		if (unlikely(fnumber > erh->nfields))
+		{
+			*isnull = true;
+			return (Datum) 0;
+		}
+		*isnull = erh->dnulls[fnumber - 1];
+		return erh->dvalues[fnumber - 1];
+	}
+	else
+	{
+		/* System columns read as null if we haven't got flat tuple */
+		if (erh->fvalue == NULL)
+		{
+			*isnull = true;
+			return (Datum) 0;
+		}
+		/* heap_getsysattr doesn't actually use tupdesc, so just pass null */
+		return heap_getsysattr(erh->fvalue, fnumber, NULL, isnull);
+	}
+}
+
+/*
+ * Set value of record field
+ *
+ * If the expanded record is of domain type, the assignment will be rejected
+ * (without changing the record's state) if the domain's constraints would
+ * be violated.
+ *
+ * Internal callers can pass check_constraints = false to skip application
+ * of domain constraints.  External callers should never do that.
+ */
+void
+expanded_record_set_field_internal(ExpandedRecordHeader *erh, int fnumber,
+								   Datum newValue, bool isnull,
+								   bool check_constraints)
+{
+	TupleDesc	tupdesc;
+	Form_pg_attribute attr;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+	char	   *oldValue;
+
+	/*
+	 * Shouldn't ever be trying to assign new data to a dummy header, except
+	 * in the case of an internal call for field inlining.
+	 */
+	Assert(!(erh->flags & ER_FLAG_IS_DUMMY) || !check_constraints);
+
+	/* Before performing the assignment, see if result will satisfy domain */
+	if ((erh->flags & ER_FLAG_IS_DOMAIN) && check_constraints)
+		check_domain_for_new_field(erh, fnumber, newValue, isnull);
+
+	/* If we haven't yet deconstructed the tuple, do that */
+	if (!(erh->flags & ER_FLAG_DVALUES_VALID))
+		deconstruct_expanded_record(erh);
+
+	/* Tuple descriptor must be valid by now */
+	tupdesc = erh->er_tupdesc;
+	Assert(erh->nfields == tupdesc->natts);
+
+	/* Caller error if fnumber is system column or nonexistent column */
+	if (unlikely(fnumber <= 0 || fnumber > erh->nfields))
+		elog(ERROR, "cannot assign to field %d of expanded record", fnumber);
+
+	/*
+	 * Copy new field value into record's context, if needed.
+	 */
+	attr = TupleDescAttr(tupdesc, fnumber - 1);
+	if (!isnull && !attr->attbyval)
+	{
+		MemoryContext oldcxt;
+
+		oldcxt = MemoryContextSwitchTo(erh->hdr.eoh_context);
+		newValue = datumCopy(newValue, false, attr->attlen);
+		MemoryContextSwitchTo(oldcxt);
+
+		/* Remember that we have field(s) that may need to be pfree'd */
+		erh->flags |= ER_FLAG_DVALUES_ALLOCED;
+
+		/*
+		 * While we're here, note whether it's an external toasted value,
+		 * because that could mean we need to inline it later.
+		 */
+		if (attr->attlen == -1 &&
+			VARATT_IS_EXTERNAL(DatumGetPointer(newValue)))
+			erh->flags |= ER_FLAG_HAVE_EXTERNAL;
+	}
+
+	/*
+	 * We're ready to make irreversible changes.
+	 */
+	dvalues = erh->dvalues;
+	dnulls = erh->dnulls;
+
+	/* Flattened value will no longer represent record accurately */
+	erh->flags &= ~ER_FLAG_FVALUE_VALID;
+	/* And we don't know the flattened size either */
+	erh->flat_size = 0;
+
+	/* Grab old field value for pfree'ing, if needed. */
+	if (!attr->attbyval && !dnulls[fnumber - 1])
+		oldValue = (char *) DatumGetPointer(dvalues[fnumber - 1]);
+	else
+		oldValue = NULL;
+
+	/* And finally we can insert the new field. */
+	dvalues[fnumber - 1] = newValue;
+	dnulls[fnumber - 1] = isnull;
+
+	/*
+	 * Free old field if needed; this keeps repeated field replacements from
+	 * bloating the record's storage.  If the pfree somehow fails, it won't
+	 * corrupt the record.
+	 *
+	 * If we're updating a dummy header, we can't risk pfree'ing the old
+	 * value, because most likely the expanded record's main header still has
+	 * a pointer to it.  This won't result in any sustained memory leak, since
+	 * whatever we just allocated here is in the short-lived domain check
+	 * context.
+	 */
+	if (oldValue && !(erh->flags & ER_FLAG_IS_DUMMY))
+	{
+		/* Don't try to pfree a part of the original flat record */
+		if (oldValue < erh->fstartptr || oldValue >= erh->fendptr)
+			pfree(oldValue);
+	}
+}
+
+/*
+ * Set all record field(s)
+ *
+ * Caller must ensure that the provided datums are of the right types
+ * to match the record's previously assigned rowtype.
+ *
+ * Unlike repeated application of expanded_record_set_field(), this does not
+ * guarantee to leave the expanded record in a non-corrupt state in event
+ * of an error.  Typically it would only be used for initializing a new
+ * expanded record.
+ */
+void
+expanded_record_set_fields(ExpandedRecordHeader *erh,
+						   const Datum *newValues, const bool *isnulls)
+{
+	TupleDesc	tupdesc;
+	Datum	   *dvalues;
+	bool	   *dnulls;
+	int			fnumber;
+	MemoryContext oldcxt;
+
+	/* Shouldn't ever be trying to assign new data to a dummy header */
+	Assert(!(erh->flags & ER_FLAG_IS_DUMMY));
+
+	/* If we haven't yet deconstructed the tuple, do that */
+	if (!(erh->flags & ER_FLAG_DVALUES_VALID))
+		deconstruct_expanded_record(erh);
+
+	/* Tuple descriptor must be valid by now */
+	tupdesc = erh->er_tupdesc;
+	Assert(erh->nfields == tupdesc->natts);
+
+	/* Flattened value will no longer represent record accurately */
+	erh->flags &= ~ER_FLAG_FVALUE_VALID;
+	/* And we don't know the flattened size either */
+	erh->flat_size = 0;
+
+	oldcxt = MemoryContextSwitchTo(erh->hdr.eoh_context);
+
+	dvalues = erh->dvalues;
+	dnulls = erh->dnulls;
+
+	for (fnumber = 0; fnumber < erh->nfields; fnumber++)
+	{
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, fnumber);
+		Datum		newValue;
+		bool		isnull;
+
+		/* Ignore dropped columns */
+		if (attr->attisdropped)
+			continue;
+
+		newValue = newValues[fnumber];
+		isnull = isnulls[fnumber];
+
+		if (!attr->attbyval)
+		{
+			/*
+			 * Copy new field value into record's context, if needed.
+			 */
+			if (!isnull)
+			{
+				newValue = datumCopy(newValue, false, attr->attlen);
+
+				/* Remember that we have field(s) that need to be pfree'd */
+				erh->flags |= ER_FLAG_DVALUES_ALLOCED;
+
+				/*
+				 * While we're here, note whether it's an external toasted
+				 * value, because that could mean we need to inline it later.
+				 */
+				if (attr->attlen == -1 &&
+					VARATT_IS_EXTERNAL(DatumGetPointer(newValue)))
+					erh->flags |= ER_FLAG_HAVE_EXTERNAL;
+			}
+
+			/*
+			 * Free old field value, if any (not likely, since really we ought
+			 * to be inserting into an empty record).
+			 */
+			if (unlikely(!dnulls[fnumber]))
+			{
+				char	   *oldValue;
+
+				oldValue = (char *) DatumGetPointer(dvalues[fnumber]);
+				/* Don't try to pfree a part of the original flat record */
+				if (oldValue < erh->fstartptr || oldValue >= erh->fendptr)
+					pfree(oldValue);
+			}
+		}
+
+		/* And finally we can insert the new field. */
+		dvalues[fnumber] = newValue;
+		dnulls[fnumber] = isnull;
+	}
+
+	/*
+	 * Because we don't guarantee atomicity of set_fields(), we can just leave
+	 * checking of domain constraints to occur as the final step; if it throws
+	 * an error, too bad.
+	 */
+	if (erh->flags & ER_FLAG_IS_DOMAIN)
+	{
+		/* We run domain_check in a short-lived context to limit cruft */
+		MemoryContextSwitchTo(get_domain_check_cxt(erh));
+
+		domain_check(ExpandedRecordGetRODatum(erh), false,
+					 erh->er_decltypeid,
+					 &erh->er_domaininfo,
+					 erh->hdr.eoh_context);
+	}
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * Construct (or reset) working memory context for domain checks.
+ *
+ * If we don't have a working memory context for domain checking, make one;
+ * if we have one, reset it to get rid of any leftover cruft.  (It is a tad
+ * annoying to need a whole context for this, since it will often go unused
+ * --- but it's hard to avoid memory leaks otherwise.  We can make the
+ * context small, at least.)
+ */
+static MemoryContext
+get_domain_check_cxt(ExpandedRecordHeader *erh)
+{
+	if (erh->er_domain_check_cxt == NULL)
+		erh->er_domain_check_cxt =
+			AllocSetContextCreate(erh->hdr.eoh_context,
+								  "expanded record domain checks",
+								  ALLOCSET_SMALL_SIZES);
+	else
+		MemoryContextReset(erh->er_domain_check_cxt);
+	return erh->er_domain_check_cxt;
+}
+
+/*
+ * Construct "dummy header" for checking domain constraints.
+ *
+ * Since we don't want to modify the state of the expanded record until
+ * we've validated the constraints, our approach is to set up a dummy
+ * record header containing the new field value(s) and then pass that to
+ * domain_check.  We retain the dummy header as part of the expanded
+ * record's state to save palloc cycles, but reinitialize (most of)
+ * its contents on each use.
+ */
+static void
+build_dummy_expanded_header(ExpandedRecordHeader *main_erh)
+{
+	ExpandedRecordHeader *erh;
+	TupleDesc	tupdesc = expanded_record_get_tupdesc(main_erh);
+
+	/* Ensure we have a domain_check_cxt */
+	(void) get_domain_check_cxt(main_erh);
+
+	/*
+	 * Allocate dummy header on first time through, or in the unlikely event
+	 * that the number of fields changes (in which case we just leak the old
+	 * one).  Include space for its field values in the request.
+	 */
+	erh = main_erh->er_dummy_header;
+	if (erh == NULL || erh->nfields != tupdesc->natts)
+	{
+		char	   *chunk;
+
+		erh = (ExpandedRecordHeader *)
+			MemoryContextAlloc(main_erh->hdr.eoh_context,
+							   MAXALIGN(sizeof(ExpandedRecordHeader))
+							   + tupdesc->natts * (sizeof(Datum) + sizeof(bool)));
+
+		/* Ensure all header fields are initialized to 0/null */
+		memset(erh, 0, sizeof(ExpandedRecordHeader));
+
+		/*
+		 * We set up the dummy header with an indication that its memory
+		 * context is the short-lived context.  This is so that, if any
+		 * detoasting of out-of-line values happens due to an attempt to
+		 * extract a composite datum from the dummy header, the detoasted
+		 * stuff will end up in the short-lived context and not cause a leak.
+		 * This is cheating a bit on the expanded-object protocol; but since
+		 * we never pass a R/W pointer to the dummy object to any other code,
+		 * nothing else is authorized to delete or transfer ownership of the
+		 * object's context, so it should be safe enough.
+		 */
+		EOH_init_header(&erh->hdr, &ER_methods, main_erh->er_domain_check_cxt);
+		erh->er_magic = ER_MAGIC;
+
+		/* Set up dvalues/dnulls, with no valid contents as yet */
+		chunk = (char *) erh + MAXALIGN(sizeof(ExpandedRecordHeader));
+		erh->dvalues = (Datum *) chunk;
+		erh->dnulls = (bool *) (chunk + tupdesc->natts * sizeof(Datum));
+		erh->nfields = tupdesc->natts;
+
+		/*
+		 * The fields we just set are assumed to remain constant through
+		 * multiple uses of the dummy header to check domain constraints.  All
+		 * other dummy header fields should be explicitly reset below, to
+		 * ensure there's not accidental effects of one check on the next one.
+		 */
+
+		main_erh->er_dummy_header = erh;
+	}
+
+	/*
+	 * If anything inquires about the dummy header's declared type, it should
+	 * report the composite base type, not the domain type (since the VALUE in
+	 * a domain check constraint is of the base type not the domain).  Hence
+	 * we do not transfer over the IS_DOMAIN flag, nor indeed any of the main
+	 * header's flags, since the dummy header is empty of data at this point.
+	 * But don't forget to mark header as dummy.
+	 */
+	erh->flags = ER_FLAG_IS_DUMMY;
+
+	/* Copy composite-type identification info */
+	erh->er_decltypeid = erh->er_typeid = main_erh->er_typeid;
+	erh->er_typmod = main_erh->er_typmod;
+
+	/* Dummy header does not need its own tupdesc refcount */
+	erh->er_tupdesc = tupdesc;
+	erh->er_tupdesc_id = main_erh->er_tupdesc_id;
+
+	/*
+	 * It's tempting to copy over whatever we know about the flat size, but
+	 * there's no point since we're surely about to modify the dummy record's
+	 * field(s).  Instead just clear anything left over from a previous usage
+	 * cycle.
+	 */
+	erh->flat_size = 0;
+
+	/* Copy over fvalue if we have it, so that system columns are available */
+	erh->fvalue = main_erh->fvalue;
+	erh->fstartptr = main_erh->fstartptr;
+	erh->fendptr = main_erh->fendptr;
+}
+
+/*
+ * Precheck domain constraints for a set_field operation
+ */
+static pg_noinline void
+check_domain_for_new_field(ExpandedRecordHeader *erh, int fnumber,
+						   Datum newValue, bool isnull)
+{
+	ExpandedRecordHeader *dummy_erh;
+	MemoryContext oldcxt;
+
+	/* Construct dummy header to contain proposed new field set */
+	build_dummy_expanded_header(erh);
+	dummy_erh = erh->er_dummy_header;
+
+	/*
+	 * If record isn't empty, just deconstruct it (if needed) and copy over
+	 * the existing field values.  If it is empty, just fill fields with nulls
+	 * manually --- don't call deconstruct_expanded_record prematurely.
+	 */
+	if (!ExpandedRecordIsEmpty(erh))
+	{
+		deconstruct_expanded_record(erh);
+		memcpy(dummy_erh->dvalues, erh->dvalues,
+			   dummy_erh->nfields * sizeof(Datum));
+		memcpy(dummy_erh->dnulls, erh->dnulls,
+			   dummy_erh->nfields * sizeof(bool));
+		/* There might be some external values in there... */
+		dummy_erh->flags |= erh->flags & ER_FLAG_HAVE_EXTERNAL;
+	}
+	else
+	{
+		memset(dummy_erh->dvalues, 0, dummy_erh->nfields * sizeof(Datum));
+		memset(dummy_erh->dnulls, true, dummy_erh->nfields * sizeof(bool));
+	}
+
+	/* Either way, we now have valid dvalues */
+	dummy_erh->flags |= ER_FLAG_DVALUES_VALID;
+
+	/* Caller error if fnumber is system column or nonexistent column */
+	if (unlikely(fnumber <= 0 || fnumber > dummy_erh->nfields))
+		elog(ERROR, "cannot assign to field %d of expanded record", fnumber);
+
+	/* Insert proposed new value into dummy field array */
+	dummy_erh->dvalues[fnumber - 1] = newValue;
+	dummy_erh->dnulls[fnumber - 1] = isnull;
+
+	/*
+	 * The proposed new value might be external, in which case we'd better set
+	 * the flag for that in dummy_erh.  (This matters in case something in the
+	 * domain check expressions tries to extract a flat value from the dummy
+	 * header.)
+	 */
+	if (!isnull)
+	{
+		Form_pg_attribute attr = TupleDescAttr(erh->er_tupdesc, fnumber - 1);
+
+		if (!attr->attbyval && attr->attlen == -1 &&
+			VARATT_IS_EXTERNAL(DatumGetPointer(newValue)))
+			dummy_erh->flags |= ER_FLAG_HAVE_EXTERNAL;
+	}
+
+	/*
+	 * We call domain_check in the short-lived context, so that any cruft
+	 * leaked by expression evaluation can be reclaimed.
+	 */
+	oldcxt = MemoryContextSwitchTo(erh->er_domain_check_cxt);
+
+	/*
+	 * And now we can apply the check.  Note we use main header's domain cache
+	 * space, so that caching carries across repeated uses.
+	 */
+	domain_check(ExpandedRecordGetRODatum(dummy_erh), false,
+				 erh->er_decltypeid,
+				 &erh->er_domaininfo,
+				 erh->hdr.eoh_context);
+
+	MemoryContextSwitchTo(oldcxt);
+
+	/* We might as well clean up cruft immediately. */
+	MemoryContextReset(erh->er_domain_check_cxt);
+}
+
+/*
+ * Precheck domain constraints for a set_tuple operation
+ */
+static pg_noinline void
+check_domain_for_new_tuple(ExpandedRecordHeader *erh, HeapTuple tuple)
+{
+	ExpandedRecordHeader *dummy_erh;
+	MemoryContext oldcxt;
+
+	/* If we're being told to set record to empty, just see if NULL is OK */
+	if (tuple == NULL)
+	{
+		/* We run domain_check in a short-lived context to limit cruft */
+		oldcxt = MemoryContextSwitchTo(get_domain_check_cxt(erh));
+
+		domain_check((Datum) 0, true,
+					 erh->er_decltypeid,
+					 &erh->er_domaininfo,
+					 erh->hdr.eoh_context);
+
+		MemoryContextSwitchTo(oldcxt);
+
+		/* We might as well clean up cruft immediately. */
+		MemoryContextReset(erh->er_domain_check_cxt);
+
+		return;
+	}
+
+	/* Construct dummy header to contain replacement tuple */
+	build_dummy_expanded_header(erh);
+	dummy_erh = erh->er_dummy_header;
+
+	/* Insert tuple, but don't bother to deconstruct its fields for now */
+	dummy_erh->fvalue = tuple;
+	dummy_erh->fstartptr = (char *) tuple->t_data;
+	dummy_erh->fendptr = ((char *) tuple->t_data) + tuple->t_len;
+	dummy_erh->flags |= ER_FLAG_FVALUE_VALID;
+
+	/* Remember if we have any out-of-line field values */
+	if (HeapTupleHasExternal(tuple))
+		dummy_erh->flags |= ER_FLAG_HAVE_EXTERNAL;
+
+	/*
+	 * We call domain_check in the short-lived context, so that any cruft
+	 * leaked by expression evaluation can be reclaimed.
+	 */
+	oldcxt = MemoryContextSwitchTo(erh->er_domain_check_cxt);
+
+	/*
+	 * And now we can apply the check.  Note we use main header's domain cache
+	 * space, so that caching carries across repeated uses.
+	 */
+	domain_check(ExpandedRecordGetRODatum(dummy_erh), false,
+				 erh->er_decltypeid,
+				 &erh->er_domaininfo,
+				 erh->hdr.eoh_context);
+
+	MemoryContextSwitchTo(oldcxt);
+
+	/* We might as well clean up cruft immediately. */
+	MemoryContextReset(erh->er_domain_check_cxt);
+}
diff --git a/src/backend/utils/adt/float.c b/src/backend/utils/adt/float.c
index 18b3b949ac..aadb92de66 100644
--- a/src/backend/utils/adt/float.c
+++ b/src/backend/utils/adt/float.c
@@ -3,7 +3,7 @@
  * float.c
  *	  Functions for the built-in floating-point types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -20,6 +20,7 @@
 #include <limits.h>
 
 #include "catalog/pg_type.h"
+#include "common/int.h"
 #include "libpq/pqformat.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
@@ -1179,6 +1180,96 @@ btfloat84cmp(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(float8_cmp_internal(arg1, arg2));
 }
 
+/*
+ * in_range support function for float8.
+ *
+ * Note: we needn't supply a float8_float4 variant, as implicit coercion
+ * of the offset value takes care of that scenario just as well.
+ */
+Datum
+in_range_float8_float8(PG_FUNCTION_ARGS)
+{
+	float8		val = PG_GETARG_FLOAT8(0);
+	float8		base = PG_GETARG_FLOAT8(1);
+	float8		offset = PG_GETARG_FLOAT8(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	float8		sum;
+
+	/*
+	 * Reject negative or NaN offset.  Negative is per spec, and NaN is
+	 * because appropriate semantics for that seem non-obvious.
+	 */
+	if (isnan(offset) || offset < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/*
+	 * Deal with cases where val and/or base is NaN, following the rule that
+	 * NaN sorts after non-NaN (cf float8_cmp_internal).  The offset cannot
+	 * affect the conclusion.
+	 */
+	if (isnan(val))
+	{
+		if (isnan(base))
+			PG_RETURN_BOOL(true);	/* NAN = NAN */
+		else
+			PG_RETURN_BOOL(!less);	/* NAN > non-NAN */
+	}
+	else if (isnan(base))
+	{
+		PG_RETURN_BOOL(less);	/* non-NAN < NAN */
+	}
+
+	/*
+	 * Deal with infinite offset (necessarily +inf, at this point).  We must
+	 * special-case this because if base happens to be -inf, their sum would
+	 * be NaN, which is an overflow-ish condition we should avoid.
+	 */
+	if (isinf(offset))
+	{
+		PG_RETURN_BOOL(sub ? !less : less);
+	}
+
+	/*
+	 * Otherwise it should be safe to compute base +/- offset.  We trust the
+	 * FPU to cope if base is +/-inf or the true sum would overflow, and
+	 * produce a suitably signed infinity, which will compare properly against
+	 * val whether or not that's infinity.
+	 */
+	if (sub)
+		sum = base - offset;
+	else
+		sum = base + offset;
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+/*
+ * in_range support function for float4.
+ *
+ * We would need a float4_float8 variant in any case, so we supply that and
+ * let implicit coercion take care of the float4_float4 case.
+ */
+Datum
+in_range_float4_float8(PG_FUNCTION_ARGS)
+{
+	/* Doesn't seem worth duplicating code for, so just invoke float8_float8 */
+	float8		val = (float8) PG_GETARG_FLOAT4(0);
+	float8		base = (float8) PG_GETARG_FLOAT4(1);
+
+	return DirectFunctionCall5(in_range_float8_float8,
+							   Float8GetDatumFast(val),
+							   Float8GetDatumFast(base),
+							   PG_GETARG_DATUM(2),
+							   PG_GETARG_DATUM(3),
+							   PG_GETARG_DATUM(4));
+}
+
 
 /*
  *		===================
@@ -3548,9 +3639,7 @@ width_bucket_float8(PG_FUNCTION_ARGS)
 			result = 0;
 		else if (operand >= bound2)
 		{
-			result = count + 1;
-			/* check for overflow */
-			if (result < count)
+			if (pg_add_s32_overflow(count, 1, &result))
 				ereport(ERROR,
 						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 						 errmsg("integer out of range")));
@@ -3564,9 +3653,7 @@ width_bucket_float8(PG_FUNCTION_ARGS)
 			result = 0;
 		else if (operand <= bound2)
 		{
-			result = count + 1;
-			/* check for overflow */
-			if (result < count)
+			if (pg_add_s32_overflow(count, 1, &result))
 				ereport(ERROR,
 						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 						 errmsg("integer out of range")));
diff --git a/src/backend/utils/adt/format_type.c b/src/backend/utils/adt/format_type.c
index 00bfaca59e..872574fdd5 100644
--- a/src/backend/utils/adt/format_type.c
+++ b/src/backend/utils/adt/format_type.c
@@ -4,7 +4,7 @@
  *	  Display type names "nicely".
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -28,9 +28,6 @@
 
 #define MAX_INT32_LEN 11
 
-static char *format_type_internal(Oid type_oid, int32 typemod,
-					 bool typemod_given, bool allow_invalid,
-					 bool force_qualify);
 static char *printTypmod(const char *typname, int32 typmod, Oid typmodout);
 
 
@@ -72,81 +69,52 @@ format_type(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 
 	type_oid = PG_GETARG_OID(0);
+	typemod = PG_ARGISNULL(1) ? -1 : PG_GETARG_INT32(1);
 
-	if (PG_ARGISNULL(1))
-		result = format_type_internal(type_oid, -1, false, true, false);
-	else
-	{
-		typemod = PG_GETARG_INT32(1);
-		result = format_type_internal(type_oid, typemod, true, true, false);
-	}
+	result = format_type_extended(type_oid, typemod,
+								  FORMAT_TYPE_TYPEMOD_GIVEN |
+								  FORMAT_TYPE_ALLOW_INVALID);
 
 	PG_RETURN_TEXT_P(cstring_to_text(result));
 }
 
 /*
- * This version is for use within the backend in error messages, etc.
- * One difference is that it will fail for an invalid type.
+ * format_type_extended
+ *		Generate a possibly-qualified type name.
  *
- * The result is always a palloc'd string.
- */
-char *
-format_type_be(Oid type_oid)
-{
-	return format_type_internal(type_oid, -1, false, false, false);
-}
-
-/*
- * This version returns a name that is always qualified (unless it's one
- * of the SQL-keyword type names, such as TIMESTAMP WITH TIME ZONE).
- */
-char *
-format_type_be_qualified(Oid type_oid)
-{
-	return format_type_internal(type_oid, -1, false, false, true);
-}
-
-/*
- * This version allows a nondefault typemod to be specified.
- */
-char *
-format_type_with_typemod(Oid type_oid, int32 typemod)
-{
-	return format_type_internal(type_oid, typemod, true, false, false);
-}
-
-/*
- * This version allows a nondefault typemod to be specified, and forces
- * qualification of normal type names.
+ * The default is to only qualify if the type is not in the search path, to
+ * ignore the given typmod, and to raise an error if a non-existent type_oid is
+ * given.
+ *
+ * The following bits in 'flags' modify the behavior:
+ * - FORMAT_TYPE_TYPEMOD_GIVEN
+ *			consider the given typmod in the output (may be -1 to request
+ *			the default behavior)
+ *
+ * - FORMAT_TYPE_ALLOW_INVALID
+ *			if the type OID is invalid or unknown, return ??? or such instead
+ *			of failing
+ *
+ * - FORMAT_TYPE_FORCE_QUALIFY
+ *			always schema-qualify type names, regardless of search_path
  */
 char *
-format_type_with_typemod_qualified(Oid type_oid, int32 typemod)
+format_type_extended(Oid type_oid, int32 typemod, bits16 flags)
 {
-	return format_type_internal(type_oid, typemod, true, false, true);
-}
-
-/*
- * Common workhorse.
- */
-static char *
-format_type_internal(Oid type_oid, int32 typemod,
-					 bool typemod_given, bool allow_invalid,
-					 bool force_qualify)
-{
-	bool		with_typemod = typemod_given && (typemod >= 0);
 	HeapTuple	tuple;
 	Form_pg_type typeform;
 	Oid			array_base_type;
 	bool		is_array;
 	char	   *buf;
+	bool		with_typemod;
 
-	if (type_oid == InvalidOid && allow_invalid)
+	if (type_oid == InvalidOid && (flags & FORMAT_TYPE_ALLOW_INVALID) != 0)
 		return pstrdup("-");
 
 	tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(type_oid));
 	if (!HeapTupleIsValid(tuple))
 	{
-		if (allow_invalid)
+		if ((flags & FORMAT_TYPE_ALLOW_INVALID) != 0)
 			return pstrdup("???");
 		else
 			elog(ERROR, "cache lookup failed for type %u", type_oid);
@@ -162,15 +130,14 @@ format_type_internal(Oid type_oid, int32 typemod,
 	 */
 	array_base_type = typeform->typelem;
 
-	if (array_base_type != InvalidOid &&
-		typeform->typstorage != 'p')
+	if (array_base_type != InvalidOid && typeform->typstorage != 'p')
 	{
 		/* Switch our attention to the array element type */
 		ReleaseSysCache(tuple);
 		tuple = SearchSysCache1(TYPEOID, ObjectIdGetDatum(array_base_type));
 		if (!HeapTupleIsValid(tuple))
 		{
-			if (allow_invalid)
+			if ((flags & FORMAT_TYPE_ALLOW_INVALID) != 0)
 				return pstrdup("???[]");
 			else
 				elog(ERROR, "cache lookup failed for type %u", type_oid);
@@ -182,6 +149,8 @@ format_type_internal(Oid type_oid, int32 typemod,
 	else
 		is_array = false;
 
+	with_typemod = (flags & FORMAT_TYPE_TYPEMOD_GIVEN) != 0 && (typemod >= 0);
+
 	/*
 	 * See if we want to special-case the output for certain built-in types.
 	 * Note that these special cases should all correspond to special
@@ -200,7 +169,7 @@ format_type_internal(Oid type_oid, int32 typemod,
 		case BITOID:
 			if (with_typemod)
 				buf = printTypmod("bit", typemod, typeform->typmodout);
-			else if (typemod_given)
+			else if ((flags & FORMAT_TYPE_TYPEMOD_GIVEN) != 0)
 			{
 				/*
 				 * bit with typmod -1 is not the same as BIT, which means
@@ -219,7 +188,7 @@ format_type_internal(Oid type_oid, int32 typemod,
 		case BPCHAROID:
 			if (with_typemod)
 				buf = printTypmod("character", typemod, typeform->typmodout);
-			else if (typemod_given)
+			else if ((flags & FORMAT_TYPE_TYPEMOD_GIVEN) != 0)
 			{
 				/*
 				 * bpchar with typmod -1 is not the same as CHARACTER, which
@@ -313,13 +282,14 @@ format_type_internal(Oid type_oid, int32 typemod,
 		/*
 		 * Default handling: report the name as it appears in the catalog.
 		 * Here, we must qualify the name if it is not visible in the search
-		 * path, and we must double-quote it if it's not a standard identifier
-		 * or if it matches any keyword.
+		 * path or if caller requests it; and we must double-quote it if it's
+		 * not a standard identifier or if it matches any keyword.
 		 */
 		char	   *nspname;
 		char	   *typname;
 
-		if (!force_qualify && TypeIsVisible(type_oid))
+		if ((flags & FORMAT_TYPE_FORCE_QUALIFY) == 0 &&
+			TypeIsVisible(type_oid))
 			nspname = NULL;
 		else
 			nspname = get_namespace_name_or_temp(typeform->typnamespace);
@@ -340,6 +310,36 @@ format_type_internal(Oid type_oid, int32 typemod,
 	return buf;
 }
 
+/*
+ * This version is for use within the backend in error messages, etc.
+ * One difference is that it will fail for an invalid type.
+ *
+ * The result is always a palloc'd string.
+ */
+char *
+format_type_be(Oid type_oid)
+{
+	return format_type_extended(type_oid, -1, 0);
+}
+
+/*
+ * This version returns a name that is always qualified (unless it's one
+ * of the SQL-keyword type names, such as TIMESTAMP WITH TIME ZONE).
+ */
+char *
+format_type_be_qualified(Oid type_oid)
+{
+	return format_type_extended(type_oid, -1, FORMAT_TYPE_FORCE_QUALIFY);
+}
+
+/*
+ * This version allows a nondefault typemod to be specified.
+ */
+char *
+format_type_with_typemod(Oid type_oid, int32 typemod)
+{
+	return format_type_extended(type_oid, typemod, FORMAT_TYPE_TYPEMOD_GIVEN);
+}
 
 /*
  * Add typmod decoration to the basic type name
@@ -437,8 +437,8 @@ oidvectortypes(PG_FUNCTION_ARGS)
 
 	for (num = 0; num < numargs; num++)
 	{
-		char	   *typename = format_type_internal(oidArray->values[num], -1,
-													false, true, false);
+		char	   *typename = format_type_extended(oidArray->values[num], -1,
+													FORMAT_TYPE_ALLOW_INVALID);
 		size_t		slen = strlen(typename);
 
 		if (left < (slen + 2))
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
index 46f45f6654..b8bd4caa3e 100644
--- a/src/backend/utils/adt/formatting.c
+++ b/src/backend/utils/adt/formatting.c
@@ -4,7 +4,7 @@
  * src/backend/utils/adt/formatting.c
  *
  *
- *	 Portions Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ *	 Portions Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  *
  *	 TO_CHAR(); TO_TIMESTAMP(); TO_DATE(); TO_NUMBER();
@@ -151,8 +151,6 @@ typedef enum
 	FROM_CHAR_DATE_ISOWEEK		/* ISO 8601 week date */
 } FromCharDateMode;
 
-typedef struct FormatNode FormatNode;
-
 typedef struct
 {
 	const char *name;
@@ -162,13 +160,13 @@ typedef struct
 	FromCharDateMode date_mode;
 } KeyWord;
 
-struct FormatNode
+typedef struct
 {
-	int			type;			/* node type			*/
-	const KeyWord *key;			/* if node type is KEYWORD	*/
-	char		character;		/* if node type is CHAR		*/
-	int			suffix;			/* keyword suffix		*/
-};
+	int			type;			/* NODE_TYPE_XXX, see below */
+	const KeyWord *key;			/* if type is ACTION */
+	char		character[MAX_MULTIBYTE_CHAR_LEN + 1];	/* if type is CHAR */
+	int			suffix;			/* keyword prefix/suffix code, if any */
+} FormatNode;
 
 #define NODE_TYPE_END		1
 #define NODE_TYPE_ACTION	2
@@ -426,7 +424,10 @@ typedef struct
 				j,
 				us,
 				yysz,			/* is it YY or YYYY ? */
-				clock;			/* 12 or 24 hour clock? */
+				clock,			/* 12 or 24 hour clock? */
+				tzsign,			/* +1, -1 or 0 if timezone info is absent */
+				tzh,
+				tzm;
 } TmFromChar;
 
 #define ZERO_tmfc(_X) memset(_X, 0, sizeof(TmFromChar))
@@ -472,6 +473,7 @@ do {	\
 	(_X)->tm_sec  = (_X)->tm_year = (_X)->tm_min = (_X)->tm_wday = \
 	(_X)->tm_hour = (_X)->tm_yday = (_X)->tm_isdst = 0; \
 	(_X)->tm_mday = (_X)->tm_mon  = 1; \
+	(_X)->tm_zone = NULL; \
 } while(0)
 
 #define ZERO_tmtc(_X) \
@@ -611,6 +613,8 @@ typedef enum
 	DCH_RM,
 	DCH_SSSS,
 	DCH_SS,
+	DCH_TZH,
+	DCH_TZM,
 	DCH_TZ,
 	DCH_US,
 	DCH_WW,
@@ -718,99 +722,101 @@ typedef enum
  */
 static const KeyWord DCH_keywords[] = {
 /*	name, len, id, is_digit, date_mode */
-	{"A.D.", 4, DCH_A_D, FALSE, FROM_CHAR_DATE_NONE},	/* A */
-	{"A.M.", 4, DCH_A_M, FALSE, FROM_CHAR_DATE_NONE},
-	{"AD", 2, DCH_AD, FALSE, FROM_CHAR_DATE_NONE},
-	{"AM", 2, DCH_AM, FALSE, FROM_CHAR_DATE_NONE},
-	{"B.C.", 4, DCH_B_C, FALSE, FROM_CHAR_DATE_NONE},	/* B */
-	{"BC", 2, DCH_BC, FALSE, FROM_CHAR_DATE_NONE},
-	{"CC", 2, DCH_CC, TRUE, FROM_CHAR_DATE_NONE},	/* C */
-	{"DAY", 3, DCH_DAY, FALSE, FROM_CHAR_DATE_NONE},	/* D */
-	{"DDD", 3, DCH_DDD, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"DD", 2, DCH_DD, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"DY", 2, DCH_DY, FALSE, FROM_CHAR_DATE_NONE},
-	{"Day", 3, DCH_Day, FALSE, FROM_CHAR_DATE_NONE},
-	{"Dy", 2, DCH_Dy, FALSE, FROM_CHAR_DATE_NONE},
-	{"D", 1, DCH_D, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"FX", 2, DCH_FX, FALSE, FROM_CHAR_DATE_NONE},	/* F */
-	{"HH24", 4, DCH_HH24, TRUE, FROM_CHAR_DATE_NONE},	/* H */
-	{"HH12", 4, DCH_HH12, TRUE, FROM_CHAR_DATE_NONE},
-	{"HH", 2, DCH_HH, TRUE, FROM_CHAR_DATE_NONE},
-	{"IDDD", 4, DCH_IDDD, TRUE, FROM_CHAR_DATE_ISOWEEK},	/* I */
-	{"ID", 2, DCH_ID, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"IW", 2, DCH_IW, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"IYYY", 4, DCH_IYYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"IYY", 3, DCH_IYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"IY", 2, DCH_IY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"I", 1, DCH_I, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"J", 1, DCH_J, TRUE, FROM_CHAR_DATE_NONE}, /* J */
-	{"MI", 2, DCH_MI, TRUE, FROM_CHAR_DATE_NONE},	/* M */
-	{"MM", 2, DCH_MM, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"MONTH", 5, DCH_MONTH, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"MON", 3, DCH_MON, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"MS", 2, DCH_MS, TRUE, FROM_CHAR_DATE_NONE},
-	{"Month", 5, DCH_Month, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"Mon", 3, DCH_Mon, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"OF", 2, DCH_OF, FALSE, FROM_CHAR_DATE_NONE},	/* O */
-	{"P.M.", 4, DCH_P_M, FALSE, FROM_CHAR_DATE_NONE},	/* P */
-	{"PM", 2, DCH_PM, FALSE, FROM_CHAR_DATE_NONE},
-	{"Q", 1, DCH_Q, TRUE, FROM_CHAR_DATE_NONE}, /* Q */
-	{"RM", 2, DCH_RM, FALSE, FROM_CHAR_DATE_GREGORIAN}, /* R */
-	{"SSSS", 4, DCH_SSSS, TRUE, FROM_CHAR_DATE_NONE},	/* S */
-	{"SS", 2, DCH_SS, TRUE, FROM_CHAR_DATE_NONE},
-	{"TZ", 2, DCH_TZ, FALSE, FROM_CHAR_DATE_NONE},	/* T */
-	{"US", 2, DCH_US, TRUE, FROM_CHAR_DATE_NONE},	/* U */
-	{"WW", 2, DCH_WW, TRUE, FROM_CHAR_DATE_GREGORIAN},	/* W */
-	{"W", 1, DCH_W, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"Y,YYY", 5, DCH_Y_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},	/* Y */
-	{"YYYY", 4, DCH_YYYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"YYY", 3, DCH_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"YY", 2, DCH_YY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"Y", 1, DCH_Y, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"a.d.", 4, DCH_a_d, FALSE, FROM_CHAR_DATE_NONE},	/* a */
-	{"a.m.", 4, DCH_a_m, FALSE, FROM_CHAR_DATE_NONE},
-	{"ad", 2, DCH_ad, FALSE, FROM_CHAR_DATE_NONE},
-	{"am", 2, DCH_am, FALSE, FROM_CHAR_DATE_NONE},
-	{"b.c.", 4, DCH_b_c, FALSE, FROM_CHAR_DATE_NONE},	/* b */
-	{"bc", 2, DCH_bc, FALSE, FROM_CHAR_DATE_NONE},
-	{"cc", 2, DCH_CC, TRUE, FROM_CHAR_DATE_NONE},	/* c */
-	{"day", 3, DCH_day, FALSE, FROM_CHAR_DATE_NONE},	/* d */
-	{"ddd", 3, DCH_DDD, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"dd", 2, DCH_DD, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"dy", 2, DCH_dy, FALSE, FROM_CHAR_DATE_NONE},
-	{"d", 1, DCH_D, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"fx", 2, DCH_FX, FALSE, FROM_CHAR_DATE_NONE},	/* f */
-	{"hh24", 4, DCH_HH24, TRUE, FROM_CHAR_DATE_NONE},	/* h */
-	{"hh12", 4, DCH_HH12, TRUE, FROM_CHAR_DATE_NONE},
-	{"hh", 2, DCH_HH, TRUE, FROM_CHAR_DATE_NONE},
-	{"iddd", 4, DCH_IDDD, TRUE, FROM_CHAR_DATE_ISOWEEK},	/* i */
-	{"id", 2, DCH_ID, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"iw", 2, DCH_IW, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"iyyy", 4, DCH_IYYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"iyy", 3, DCH_IYY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"iy", 2, DCH_IY, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"i", 1, DCH_I, TRUE, FROM_CHAR_DATE_ISOWEEK},
-	{"j", 1, DCH_J, TRUE, FROM_CHAR_DATE_NONE}, /* j */
-	{"mi", 2, DCH_MI, TRUE, FROM_CHAR_DATE_NONE},	/* m */
-	{"mm", 2, DCH_MM, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"month", 5, DCH_month, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"mon", 3, DCH_mon, FALSE, FROM_CHAR_DATE_GREGORIAN},
-	{"ms", 2, DCH_MS, TRUE, FROM_CHAR_DATE_NONE},
-	{"p.m.", 4, DCH_p_m, FALSE, FROM_CHAR_DATE_NONE},	/* p */
-	{"pm", 2, DCH_pm, FALSE, FROM_CHAR_DATE_NONE},
-	{"q", 1, DCH_Q, TRUE, FROM_CHAR_DATE_NONE}, /* q */
-	{"rm", 2, DCH_rm, FALSE, FROM_CHAR_DATE_GREGORIAN}, /* r */
-	{"ssss", 4, DCH_SSSS, TRUE, FROM_CHAR_DATE_NONE},	/* s */
-	{"ss", 2, DCH_SS, TRUE, FROM_CHAR_DATE_NONE},
-	{"tz", 2, DCH_tz, FALSE, FROM_CHAR_DATE_NONE},	/* t */
-	{"us", 2, DCH_US, TRUE, FROM_CHAR_DATE_NONE},	/* u */
-	{"ww", 2, DCH_WW, TRUE, FROM_CHAR_DATE_GREGORIAN},	/* w */
-	{"w", 1, DCH_W, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"y,yyy", 5, DCH_Y_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},	/* y */
-	{"yyyy", 4, DCH_YYYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"yyy", 3, DCH_YYY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"yy", 2, DCH_YY, TRUE, FROM_CHAR_DATE_GREGORIAN},
-	{"y", 1, DCH_Y, TRUE, FROM_CHAR_DATE_GREGORIAN},
+	{"A.D.", 4, DCH_A_D, false, FROM_CHAR_DATE_NONE},	/* A */
+	{"A.M.", 4, DCH_A_M, false, FROM_CHAR_DATE_NONE},
+	{"AD", 2, DCH_AD, false, FROM_CHAR_DATE_NONE},
+	{"AM", 2, DCH_AM, false, FROM_CHAR_DATE_NONE},
+	{"B.C.", 4, DCH_B_C, false, FROM_CHAR_DATE_NONE},	/* B */
+	{"BC", 2, DCH_BC, false, FROM_CHAR_DATE_NONE},
+	{"CC", 2, DCH_CC, true, FROM_CHAR_DATE_NONE},	/* C */
+	{"DAY", 3, DCH_DAY, false, FROM_CHAR_DATE_NONE},	/* D */
+	{"DDD", 3, DCH_DDD, true, FROM_CHAR_DATE_GREGORIAN},
+	{"DD", 2, DCH_DD, true, FROM_CHAR_DATE_GREGORIAN},
+	{"DY", 2, DCH_DY, false, FROM_CHAR_DATE_NONE},
+	{"Day", 3, DCH_Day, false, FROM_CHAR_DATE_NONE},
+	{"Dy", 2, DCH_Dy, false, FROM_CHAR_DATE_NONE},
+	{"D", 1, DCH_D, true, FROM_CHAR_DATE_GREGORIAN},
+	{"FX", 2, DCH_FX, false, FROM_CHAR_DATE_NONE},	/* F */
+	{"HH24", 4, DCH_HH24, true, FROM_CHAR_DATE_NONE},	/* H */
+	{"HH12", 4, DCH_HH12, true, FROM_CHAR_DATE_NONE},
+	{"HH", 2, DCH_HH, true, FROM_CHAR_DATE_NONE},
+	{"IDDD", 4, DCH_IDDD, true, FROM_CHAR_DATE_ISOWEEK},	/* I */
+	{"ID", 2, DCH_ID, true, FROM_CHAR_DATE_ISOWEEK},
+	{"IW", 2, DCH_IW, true, FROM_CHAR_DATE_ISOWEEK},
+	{"IYYY", 4, DCH_IYYY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"IYY", 3, DCH_IYY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"IY", 2, DCH_IY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"I", 1, DCH_I, true, FROM_CHAR_DATE_ISOWEEK},
+	{"J", 1, DCH_J, true, FROM_CHAR_DATE_NONE}, /* J */
+	{"MI", 2, DCH_MI, true, FROM_CHAR_DATE_NONE},	/* M */
+	{"MM", 2, DCH_MM, true, FROM_CHAR_DATE_GREGORIAN},
+	{"MONTH", 5, DCH_MONTH, false, FROM_CHAR_DATE_GREGORIAN},
+	{"MON", 3, DCH_MON, false, FROM_CHAR_DATE_GREGORIAN},
+	{"MS", 2, DCH_MS, true, FROM_CHAR_DATE_NONE},
+	{"Month", 5, DCH_Month, false, FROM_CHAR_DATE_GREGORIAN},
+	{"Mon", 3, DCH_Mon, false, FROM_CHAR_DATE_GREGORIAN},
+	{"OF", 2, DCH_OF, false, FROM_CHAR_DATE_NONE},	/* O */
+	{"P.M.", 4, DCH_P_M, false, FROM_CHAR_DATE_NONE},	/* P */
+	{"PM", 2, DCH_PM, false, FROM_CHAR_DATE_NONE},
+	{"Q", 1, DCH_Q, true, FROM_CHAR_DATE_NONE}, /* Q */
+	{"RM", 2, DCH_RM, false, FROM_CHAR_DATE_GREGORIAN}, /* R */
+	{"SSSS", 4, DCH_SSSS, true, FROM_CHAR_DATE_NONE},	/* S */
+	{"SS", 2, DCH_SS, true, FROM_CHAR_DATE_NONE},
+	{"TZH", 3, DCH_TZH, false, FROM_CHAR_DATE_NONE},	/* T */
+	{"TZM", 3, DCH_TZM, true, FROM_CHAR_DATE_NONE},
+	{"TZ", 2, DCH_TZ, false, FROM_CHAR_DATE_NONE},
+	{"US", 2, DCH_US, true, FROM_CHAR_DATE_NONE},	/* U */
+	{"WW", 2, DCH_WW, true, FROM_CHAR_DATE_GREGORIAN},	/* W */
+	{"W", 1, DCH_W, true, FROM_CHAR_DATE_GREGORIAN},
+	{"Y,YYY", 5, DCH_Y_YYY, true, FROM_CHAR_DATE_GREGORIAN},	/* Y */
+	{"YYYY", 4, DCH_YYYY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"YYY", 3, DCH_YYY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"YY", 2, DCH_YY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"Y", 1, DCH_Y, true, FROM_CHAR_DATE_GREGORIAN},
+	{"a.d.", 4, DCH_a_d, false, FROM_CHAR_DATE_NONE},	/* a */
+	{"a.m.", 4, DCH_a_m, false, FROM_CHAR_DATE_NONE},
+	{"ad", 2, DCH_ad, false, FROM_CHAR_DATE_NONE},
+	{"am", 2, DCH_am, false, FROM_CHAR_DATE_NONE},
+	{"b.c.", 4, DCH_b_c, false, FROM_CHAR_DATE_NONE},	/* b */
+	{"bc", 2, DCH_bc, false, FROM_CHAR_DATE_NONE},
+	{"cc", 2, DCH_CC, true, FROM_CHAR_DATE_NONE},	/* c */
+	{"day", 3, DCH_day, false, FROM_CHAR_DATE_NONE},	/* d */
+	{"ddd", 3, DCH_DDD, true, FROM_CHAR_DATE_GREGORIAN},
+	{"dd", 2, DCH_DD, true, FROM_CHAR_DATE_GREGORIAN},
+	{"dy", 2, DCH_dy, false, FROM_CHAR_DATE_NONE},
+	{"d", 1, DCH_D, true, FROM_CHAR_DATE_GREGORIAN},
+	{"fx", 2, DCH_FX, false, FROM_CHAR_DATE_NONE},	/* f */
+	{"hh24", 4, DCH_HH24, true, FROM_CHAR_DATE_NONE},	/* h */
+	{"hh12", 4, DCH_HH12, true, FROM_CHAR_DATE_NONE},
+	{"hh", 2, DCH_HH, true, FROM_CHAR_DATE_NONE},
+	{"iddd", 4, DCH_IDDD, true, FROM_CHAR_DATE_ISOWEEK},	/* i */
+	{"id", 2, DCH_ID, true, FROM_CHAR_DATE_ISOWEEK},
+	{"iw", 2, DCH_IW, true, FROM_CHAR_DATE_ISOWEEK},
+	{"iyyy", 4, DCH_IYYY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"iyy", 3, DCH_IYY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"iy", 2, DCH_IY, true, FROM_CHAR_DATE_ISOWEEK},
+	{"i", 1, DCH_I, true, FROM_CHAR_DATE_ISOWEEK},
+	{"j", 1, DCH_J, true, FROM_CHAR_DATE_NONE}, /* j */
+	{"mi", 2, DCH_MI, true, FROM_CHAR_DATE_NONE},	/* m */
+	{"mm", 2, DCH_MM, true, FROM_CHAR_DATE_GREGORIAN},
+	{"month", 5, DCH_month, false, FROM_CHAR_DATE_GREGORIAN},
+	{"mon", 3, DCH_mon, false, FROM_CHAR_DATE_GREGORIAN},
+	{"ms", 2, DCH_MS, true, FROM_CHAR_DATE_NONE},
+	{"p.m.", 4, DCH_p_m, false, FROM_CHAR_DATE_NONE},	/* p */
+	{"pm", 2, DCH_pm, false, FROM_CHAR_DATE_NONE},
+	{"q", 1, DCH_Q, true, FROM_CHAR_DATE_NONE}, /* q */
+	{"rm", 2, DCH_rm, false, FROM_CHAR_DATE_GREGORIAN}, /* r */
+	{"ssss", 4, DCH_SSSS, true, FROM_CHAR_DATE_NONE},	/* s */
+	{"ss", 2, DCH_SS, true, FROM_CHAR_DATE_NONE},
+	{"tz", 2, DCH_tz, false, FROM_CHAR_DATE_NONE},	/* t */
+	{"us", 2, DCH_US, true, FROM_CHAR_DATE_NONE},	/* u */
+	{"ww", 2, DCH_WW, true, FROM_CHAR_DATE_GREGORIAN},	/* w */
+	{"w", 1, DCH_W, true, FROM_CHAR_DATE_GREGORIAN},
+	{"y,yyy", 5, DCH_Y_YYY, true, FROM_CHAR_DATE_GREGORIAN},	/* y */
+	{"yyyy", 4, DCH_YYYY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"yyy", 3, DCH_YYY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"yy", 2, DCH_YY, true, FROM_CHAR_DATE_GREGORIAN},
+	{"y", 1, DCH_Y, true, FROM_CHAR_DATE_GREGORIAN},
 
 	/* last */
 	{NULL, 0, 0, 0, 0}
@@ -881,7 +887,7 @@ static const int DCH_index[KeyWord_INDEX_SIZE] = {
 	-1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
 	-1, -1, -1, -1, -1, DCH_A_D, DCH_B_C, DCH_CC, DCH_DAY, -1,
 	DCH_FX, -1, DCH_HH24, DCH_IDDD, DCH_J, -1, -1, DCH_MI, -1, DCH_OF,
-	DCH_P_M, DCH_Q, DCH_RM, DCH_SSSS, DCH_TZ, DCH_US, -1, DCH_WW, -1, DCH_Y_YYY,
+	DCH_P_M, DCH_Q, DCH_RM, DCH_SSSS, DCH_TZH, DCH_US, -1, DCH_WW, -1, DCH_Y_YYY,
 	-1, -1, -1, -1, -1, -1, -1, DCH_a_d, DCH_b_c, DCH_cc,
 	DCH_day, -1, DCH_fx, -1, DCH_hh24, DCH_iddd, DCH_j, -1, -1, DCH_mi,
 	-1, -1, DCH_p_m, DCH_q, DCH_rm, DCH_ssss, DCH_tz, DCH_us, -1, DCH_ww,
@@ -988,7 +994,7 @@ static char *get_last_relevant_decnum(char *num);
 static void NUM_numpart_from_char(NUMProc *Np, int id, int input_len);
 static void NUM_numpart_to_char(NUMProc *Np, int id);
 static char *NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
-			  char *number, int from_char_input_len, int to_char_out_pre_spaces,
+			  char *number, int input_len, int to_char_out_pre_spaces,
 			  int sign, bool is_to_char, Oid collid);
 static DCHCacheEntry *DCH_cache_getnew(const char *str);
 static DCHCacheEntry *DCH_cache_search(const char *str);
@@ -1102,7 +1108,7 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
 
 		case NUM_D:
 			num->flag |= NUM_F_LDECIMAL;
-			num->need_locale = TRUE;
+			num->need_locale = true;
 			/* FALLTHROUGH */
 		case NUM_DEC:
 			if (IS_DECIMAL(num))
@@ -1133,13 +1139,13 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
 			{
 				num->lsign = NUM_LSIGN_PRE;
 				num->pre_lsign_num = num->pre;
-				num->need_locale = TRUE;
+				num->need_locale = true;
 				num->flag |= NUM_F_LSIGN;
 			}
 			else if (num->lsign == NUM_LSIGN_NONE)
 			{
 				num->lsign = NUM_LSIGN_POST;
-				num->need_locale = TRUE;
+				num->need_locale = true;
 				num->flag |= NUM_F_LSIGN;
 			}
 			break;
@@ -1188,7 +1194,7 @@ NUMDesc_prepare(NUMDesc *num, FormatNode *n)
 
 		case NUM_L:
 		case NUM_G:
-			num->need_locale = TRUE;
+			num->need_locale = true;
 			break;
 
 		case NUM_V:
@@ -1227,11 +1233,7 @@ static void
 parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 			 const KeySuffix *suf, const int *index, int ver, NUMDesc *Num)
 {
-	const KeySuffix *s;
 	FormatNode *n;
-	int			node_set = 0,
-				suffix,
-				last = 0;
 
 #ifdef DEBUG_TO_FROM_CHAR
 	elog(DEBUG_elog_output, "to_char/number(): run parser");
@@ -1241,12 +1243,14 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 
 	while (*str)
 	{
-		suffix = 0;
+		int			suffix = 0;
+		const KeySuffix *s;
 
 		/*
 		 * Prefix
 		 */
-		if (ver == DCH_TYPE && (s = suff_search(str, suf, SUFFTYPE_PREFIX)) != NULL)
+		if (ver == DCH_TYPE &&
+			(s = suff_search(str, suf, SUFFTYPE_PREFIX)) != NULL)
 		{
 			suffix |= s->id;
 			if (s->len)
@@ -1259,8 +1263,7 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 		if (*str && (n->key = index_seq_search(str, kw, index)) != NULL)
 		{
 			n->type = NODE_TYPE_ACTION;
-			n->suffix = 0;
-			node_set = 1;
+			n->suffix = suffix;
 			if (n->key->len)
 				str += n->key->len;
 
@@ -1273,71 +1276,64 @@ parse_format(FormatNode *node, const char *str, const KeyWord *kw,
 			/*
 			 * Postfix
 			 */
-			if (ver == DCH_TYPE && *str && (s = suff_search(str, suf, SUFFTYPE_POSTFIX)) != NULL)
+			if (ver == DCH_TYPE && *str &&
+				(s = suff_search(str, suf, SUFFTYPE_POSTFIX)) != NULL)
 			{
-				suffix |= s->id;
+				n->suffix |= s->id;
 				if (s->len)
 					str += s->len;
 			}
+
+			n++;
 		}
 		else if (*str)
 		{
+			int			chlen;
+
 			/*
-			 * Special characters '\' and '"'
+			 * Process double-quoted literal string, if any
 			 */
-			if (*str == '"' && last != '\\')
+			if (*str == '"')
 			{
-				int			x = 0;
-
-				while (*(++str))
+				str++;
+				while (*str)
 				{
-					if (*str == '"' && x != '\\')
+					if (*str == '"')
 					{
 						str++;
 						break;
 					}
-					else if (*str == '\\' && x != '\\')
-					{
-						x = '\\';
-						continue;
-					}
+					/* backslash quotes the next character, if any */
+					if (*str == '\\' && *(str + 1))
+						str++;
+					chlen = pg_mblen(str);
 					n->type = NODE_TYPE_CHAR;
-					n->character = *str;
+					memcpy(n->character, str, chlen);
+					n->character[chlen] = '\0';
 					n->key = NULL;
 					n->suffix = 0;
-					++n;
-					x = *str;
+					n++;
+					str += chlen;
 				}
-				node_set = 0;
-				suffix = 0;
-				last = 0;
-			}
-			else if (*str && *str == '\\' && last != '\\' && *(str + 1) == '"')
-			{
-				last = *str;
-				str++;
 			}
-			else if (*str)
+			else
 			{
+				/*
+				 * Outside double-quoted strings, backslash is only special if
+				 * it immediately precedes a double quote.
+				 */
+				if (*str == '\\' && *(str + 1) == '"')
+					str++;
+				chlen = pg_mblen(str);
 				n->type = NODE_TYPE_CHAR;
-				n->character = *str;
+				memcpy(n->character, str, chlen);
+				n->character[chlen] = '\0';
 				n->key = NULL;
-				node_set = 1;
-				last = 0;
-				str++;
+				n->suffix = 0;
+				n++;
+				str += chlen;
 			}
 		}
-
-		/* end */
-		if (node_set)
-		{
-			if (n->type == NODE_TYPE_ACTION)
-				n->suffix = suffix;
-			++n;
-
-			n->suffix = 0;
-			node_set = 0;
-		}
 	}
 
 	n->type = NODE_TYPE_END;
@@ -1367,7 +1363,8 @@ dump_node(FormatNode *node, int max)
 			elog(DEBUG_elog_output, "%d:\t NODE_TYPE_ACTION '%s'\t(%s,%s)",
 				 a, n->key->name, DUMP_THth(n->suffix), DUMP_FM(n->suffix));
 		else if (n->type == NODE_TYPE_CHAR)
-			elog(DEBUG_elog_output, "%d:\t NODE_TYPE_CHAR '%c'", a, n->character);
+			elog(DEBUG_elog_output, "%d:\t NODE_TYPE_CHAR '%s'",
+				 a, n->character);
 		else if (n->type == NODE_TYPE_END)
 		{
 			elog(DEBUG_elog_output, "%d:\t NODE_TYPE_END", a);
@@ -1528,7 +1525,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_tolower(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1603,7 +1599,6 @@ str_tolower(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
 			{
 				char	   *p;
@@ -1652,7 +1647,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_toupper(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1727,7 +1721,6 @@ str_toupper(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
 			{
 				char	   *p;
@@ -1777,7 +1770,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 	{
 		result = asc_initcap(buff, nbytes);
 	}
-#ifdef USE_WIDE_UPPER_LOWER
 	else
 	{
 		pg_locale_t mylocale = 0;
@@ -1864,7 +1856,6 @@ str_initcap(const char *buff, size_t nbytes, Oid collid)
 				wchar2char(result, workspace, result_size, mylocale);
 				pfree(workspace);
 			}
-#endif							/* USE_WIDE_UPPER_LOWER */
 			else
 			{
 				char	   *p;
@@ -2032,8 +2023,8 @@ asc_toupper_z(const char *buff)
 	do { \
 		if (S_THth(_suf)) \
 		{ \
-			if (*(ptr)) (ptr)++; \
-			if (*(ptr)) (ptr)++; \
+			if (*(ptr)) (ptr) += pg_mblen(ptr); \
+			if (*(ptr)) (ptr) += pg_mblen(ptr); \
 		} \
 	} while (0)
 
@@ -2072,17 +2063,17 @@ dump_index(const KeyWord *k, const int *index)
 #endif							/* DEBUG */
 
 /* ----------
- * Return TRUE if next format picture is not digit value
+ * Return true if next format picture is not digit value
  * ----------
  */
 static bool
 is_next_separator(FormatNode *n)
 {
 	if (n->type == NODE_TYPE_END)
-		return FALSE;
+		return false;
 
 	if (n->type == NODE_TYPE_ACTION && S_THth(n->suffix))
-		return TRUE;
+		return true;
 
 	/*
 	 * Next node
@@ -2091,19 +2082,20 @@ is_next_separator(FormatNode *n)
 
 	/* end of format string is treated like a non-digit separator */
 	if (n->type == NODE_TYPE_END)
-		return TRUE;
+		return true;
 
 	if (n->type == NODE_TYPE_ACTION)
 	{
 		if (n->key->is_digit)
-			return FALSE;
+			return false;
 
-		return TRUE;
+		return true;
 	}
-	else if (isdigit((unsigned char) n->character))
-		return FALSE;
+	else if (n->character[1] == '\0' &&
+			 isdigit((unsigned char) n->character[0]))
+		return false;
 
-	return TRUE;				/* some non-digit input (separator) */
+	return true;				/* some non-digit input (separator) */
 }
 
 
@@ -2429,8 +2421,8 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 	{
 		if (n->type != NODE_TYPE_ACTION)
 		{
-			*s = n->character;
-			s++;
+			strcpy(s, n->character);
+			s += strlen(s);
 			continue;
 		}
 
@@ -2535,6 +2527,19 @@ DCH_to_char(FormatNode *node, bool is_interval, TmToChar *in, char *out, Oid col
 					s += strlen(s);
 				}
 				break;
+			case DCH_TZH:
+				INVALID_FOR_INTERVAL;
+				sprintf(s, "%c%02d",
+						(tm->tm_gmtoff >= 0) ? '+' : '-',
+						abs((int) tm->tm_gmtoff) / SECS_PER_HOUR);
+				s += strlen(s);
+				break;
+			case DCH_TZM:
+				INVALID_FOR_INTERVAL;
+				sprintf(s, "%02d",
+						(abs((int) tm->tm_gmtoff) % SECS_PER_HOUR) / SECS_PER_MINUTE);
+				s += strlen(s);
+				break;
 			case DCH_OF:
 				INVALID_FOR_INTERVAL;
 				sprintf(s, "%c%0*d",
@@ -2998,7 +3003,7 @@ DCH_from_char(FormatNode *node, char *in, TmFromChar *out)
 			 * we don't insist that the consumed character match the format's
 			 * character.
 			 */
-			s++;
+			s += pg_mblen(s);
 			continue;
 		}
 
@@ -3086,6 +3091,20 @@ DCH_from_char(FormatNode *node, char *in, TmFromChar *out)
 						 errmsg("formatting field \"%s\" is only supported in to_char",
 								n->key->name)));
 				break;
+			case DCH_TZH:
+				out->tzsign = *s == '-' ? -1 : +1;
+
+				if (*s == '+' || *s == '-' || *s == ' ')
+					s++;
+
+				from_char_parse_int_len(&out->tzh, &s, 2, n);
+				break;
+			case DCH_TZM:
+				/* assign positive timezone sign if TZH was not seen before */
+				if (!out->tzsign)
+					out->tzsign = +1;
+				from_char_parse_int_len(&out->tzm, &s, 2, n);
+				break;
 			case DCH_A_D:
 			case DCH_B_C:
 			case DCH_a_d:
@@ -3397,7 +3416,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
 		 * Allocate new memory if format picture is bigger than static cache
 		 * and do not use cache (call parser always)
 		 */
-		incache = FALSE;
+		incache = false;
 
 		format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
 
@@ -3411,7 +3430,7 @@ datetime_to_char_body(TmToChar *tmtc, text *fmt, bool is_interval, Oid collid)
 		 */
 		DCHCacheEntry *ent = DCH_cache_fetch(fmt_str);
 
-		incache = TRUE;
+		incache = true;
 		format = ent->format;
 	}
 
@@ -3552,7 +3571,16 @@ to_timestamp(PG_FUNCTION_ARGS)
 
 	do_to_timestamp(date_txt, fmt, &tm, &fsec);
 
-	tz = DetermineTimeZoneOffset(&tm, session_timezone);
+	/* Use the specified time zone, if any. */
+	if (tm.tm_zone)
+	{
+		int			dterr = DecodeTimezone((char *) tm.tm_zone, &tz);
+
+		if (dterr)
+			DateTimeParseError(dterr, text_to_cstring(date_txt), "timestamptz");
+	}
+	else
+		tz = DetermineTimeZoneOffset(&tm, session_timezone);
 
 	if (tm2timestamp(&tm, fsec, &tz, &result) != 0)
 		ereport(ERROR,
@@ -3642,7 +3670,7 @@ do_to_timestamp(text *date_txt, text *fmt,
 			 * Allocate new memory if format picture is bigger than static
 			 * cache and do not use cache (call parser always)
 			 */
-			incache = FALSE;
+			incache = false;
 
 			format = (FormatNode *) palloc((fmt_len + 1) * sizeof(FormatNode));
 
@@ -3656,7 +3684,7 @@ do_to_timestamp(text *date_txt, text *fmt,
 			 */
 			DCHCacheEntry *ent = DCH_cache_fetch(fmt_str);
 
-			incache = TRUE;
+			incache = true;
 			format = ent->format;
 		}
 
@@ -3874,6 +3902,23 @@ do_to_timestamp(text *date_txt, text *fmt,
 		*fsec < INT64CONST(0) || *fsec >= USECS_PER_SEC)
 		DateTimeParseError(DTERR_FIELD_OVERFLOW, date_str, "timestamp");
 
+	/* Save parsed time-zone into tm->tm_zone if it was specified */
+	if (tmfc.tzsign)
+	{
+		char	   *tz;
+
+		if (tmfc.tzh < 0 || tmfc.tzh > MAX_TZDISP_HOUR ||
+			tmfc.tzm < 0 || tmfc.tzm >= MINS_PER_HOUR)
+			DateTimeParseError(DTERR_TZDISP_OVERFLOW, date_str, "timestamp");
+
+		tz = palloc(7);
+
+		snprintf(tz, 7, "%c%02d:%02d",
+				 tmfc.tzsign > 0 ? '+' : '-', tmfc.tzh, tmfc.tzm);
+
+		tm->tm_zone = tz;
+	}
+
 	DEBUG_TM(tm);
 
 	pfree(date_str);
@@ -4238,6 +4283,14 @@ get_last_relevant_decnum(char *num)
 	return result;
 }
 
+/*
+ * These macros are used in NUM_processor() and its subsidiary routines.
+ * OVERLOAD_TEST: true if we've reached end of input string
+ * AMOUNT_TEST(s): true if at least s bytes remain in string
+ */
+#define OVERLOAD_TEST	(Np->inout_p >= Np->inout + input_len)
+#define AMOUNT_TEST(s)	(Np->inout_p <= Np->inout + (input_len - (s)))
+
 /* ----------
  * Number extraction for TO_NUMBER()
  * ----------
@@ -4245,16 +4298,13 @@ get_last_relevant_decnum(char *num)
 static void
 NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
 {
-	bool		isread = FALSE;
+	bool		isread = false;
 
 #ifdef DEBUG_TO_FROM_CHAR
 	elog(DEBUG_elog_output, " --- scan start --- id=%s",
 		 (id == NUM_0 || id == NUM_9) ? "NUM_0/9" : id == NUM_DEC ? "NUM_DEC" : "???");
 #endif
 
-#define OVERLOAD_TEST	(Np->inout_p >= Np->inout + input_len)
-#define AMOUNT_TEST(_s) (input_len-(Np->inout_p-Np->inout) >= _s)
-
 	if (OVERLOAD_TEST)
 		return;
 
@@ -4346,13 +4396,13 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
 		else
 			Np->read_pre++;
 
-		isread = TRUE;
+		isread = true;
 
 #ifdef DEBUG_TO_FROM_CHAR
 		elog(DEBUG_elog_output, "Read digit (%c)", *Np->inout_p);
 #endif
 	}
-	else if (IS_DECIMAL(Np->Num) && Np->read_dec == FALSE)
+	else if (IS_DECIMAL(Np->Num) && Np->read_dec == false)
 	{
 		/*
 		 * We need not test IS_LDECIMAL(Np->Num) explicitly here, because
@@ -4370,8 +4420,8 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
 			Np->inout_p += x - 1;
 			*Np->number_p = '.';
 			Np->number_p++;
-			Np->read_dec = TRUE;
-			isread = TRUE;
+			Np->read_dec = true;
+			isread = true;
 		}
 	}
 
@@ -4429,11 +4479,11 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
 		 *
 		 * FM9.999999MI			   -> 5.01-
 		 *
-		 * if (.... && IS_LSIGN(Np->Num)==FALSE) prevents read wrong formats
+		 * if (.... && IS_LSIGN(Np->Num)==false) prevents read wrong formats
 		 * like to_number('1 -', '9S') where sign is not anchored to last
 		 * number.
 		 */
-		else if (isread == FALSE && IS_LSIGN(Np->Num) == FALSE &&
+		else if (isread == false && IS_LSIGN(Np->Num) == false &&
 				 (IS_PLUS(Np->Num) || IS_MINUS(Np->Num)))
 		{
 #ifdef DEBUG_TO_FROM_CHAR
@@ -4451,7 +4501,7 @@ NUM_numpart_from_char(NUMProc *Np, int id, int input_len)
 }
 
 #define IS_PREDEC_SPACE(_n) \
-		(IS_ZERO((_n)->Num)==FALSE && \
+		(IS_ZERO((_n)->Num)==false && \
 		 (_n)->number == (_n)->number_p && \
 		 *(_n)->number == '0' && \
 				 (_n)->Num->post != 0)
@@ -4483,15 +4533,15 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 		 Np->number_p,
 		 Np->inout);
 #endif
-	Np->num_in = FALSE;
+	Np->num_in = false;
 
 	/*
 	 * Write sign if real number will write to output Note: IS_PREDEC_SPACE()
 	 * handle "9.9" --> " .1"
 	 */
-	if (Np->sign_wrote == FALSE &&
+	if (Np->sign_wrote == false &&
 		(Np->num_curr >= Np->out_pre_spaces || (IS_ZERO(Np->Num) && Np->Num->zero_start == Np->num_curr)) &&
-		(IS_PREDEC_SPACE(Np) == FALSE || (Np->last_relevant && *Np->last_relevant == '.')))
+		(IS_PREDEC_SPACE(Np) == false || (Np->last_relevant && *Np->last_relevant == '.')))
 	{
 		if (IS_LSIGN(Np->Num))
 		{
@@ -4502,14 +4552,14 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 				else
 					strcpy(Np->inout_p, Np->L_positive_sign);
 				Np->inout_p += strlen(Np->inout_p);
-				Np->sign_wrote = TRUE;
+				Np->sign_wrote = true;
 			}
 		}
 		else if (IS_BRACKET(Np->Num))
 		{
 			*Np->inout_p = Np->sign == '+' ? ' ' : '<';
 			++Np->inout_p;
-			Np->sign_wrote = TRUE;
+			Np->sign_wrote = true;
 		}
 		else if (Np->sign == '+')
 		{
@@ -4518,13 +4568,13 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 				*Np->inout_p = ' '; /* Write + */
 				++Np->inout_p;
 			}
-			Np->sign_wrote = TRUE;
+			Np->sign_wrote = true;
 		}
 		else if (Np->sign == '-')
 		{						/* Write - */
 			*Np->inout_p = '-';
 			++Np->inout_p;
-			Np->sign_wrote = TRUE;
+			Np->sign_wrote = true;
 		}
 	}
 
@@ -4555,7 +4605,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 			 */
 			*Np->inout_p = '0'; /* Write '0' */
 			++Np->inout_p;
-			Np->num_in = TRUE;
+			Np->num_in = true;
 		}
 		else
 		{
@@ -4613,7 +4663,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 				{
 					*Np->inout_p = *Np->number_p;	/* Write DIGIT */
 					++Np->inout_p;
-					Np->num_in = TRUE;
+					Np->num_in = true;
 				}
 			}
 			/* do no exceed string length */
@@ -4628,7 +4678,7 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 
 		if (Np->num_curr + 1 == end)
 		{
-			if (Np->sign_wrote == TRUE && IS_BRACKET(Np->Num))
+			if (Np->sign_wrote == true && IS_BRACKET(Np->Num))
 			{
 				*Np->inout_p = Np->sign == '+' ? ' ' : '>';
 				++Np->inout_p;
@@ -4647,14 +4697,32 @@ NUM_numpart_to_char(NUMProc *Np, int id)
 	++Np->num_curr;
 }
 
+/*
+ * Skip over "n" input characters, but only if they aren't numeric data
+ */
+static void
+NUM_eat_non_data_chars(NUMProc *Np, int n, int input_len)
+{
+	while (n-- > 0)
+	{
+		if (OVERLOAD_TEST)
+			break;				/* end of input */
+		if (strchr("0123456789.,+-", *Np->inout_p) != NULL)
+			break;				/* it's a data character */
+		Np->inout_p += pg_mblen(Np->inout_p);
+	}
+}
+
 static char *
 NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
-			  char *number, int from_char_input_len, int to_char_out_pre_spaces,
+			  char *number, int input_len, int to_char_out_pre_spaces,
 			  int sign, bool is_to_char, Oid collid)
 {
 	FormatNode *n;
 	NUMProc		_Np,
 			   *Np = &_Np;
+	const char *pattern;
+	int			pattern_len;
 
 	MemSet(Np, 0, sizeof(NUMProc));
 
@@ -4665,7 +4733,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 	Np->last_relevant = NULL;
 	Np->read_post = 0;
 	Np->read_pre = 0;
-	Np->read_dec = FALSE;
+	Np->read_dec = false;
 
 	if (Np->Num->zero_start)
 		--Np->Num->zero_start;
@@ -4712,10 +4780,10 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 		/* MI/PL/SG - write sign itself and not in number */
 		if (IS_PLUS(Np->Num) || IS_MINUS(Np->Num))
 		{
-			if (IS_PLUS(Np->Num) && IS_MINUS(Np->Num) == FALSE)
-				Np->sign_wrote = FALSE; /* need sign */
+			if (IS_PLUS(Np->Num) && IS_MINUS(Np->Num) == false)
+				Np->sign_wrote = false; /* need sign */
 			else
-				Np->sign_wrote = TRUE;	/* needn't sign */
+				Np->sign_wrote = true;	/* needn't sign */
 		}
 		else
 		{
@@ -4729,17 +4797,17 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 			else if (Np->sign != '+' && IS_PLUS(Np->Num))
 				Np->Num->flag &= ~NUM_F_PLUS;
 
-			if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == FALSE)
-				Np->sign_wrote = TRUE;	/* needn't sign */
+			if (Np->sign == '+' && IS_FILLMODE(Np->Num) && IS_LSIGN(Np->Num) == false)
+				Np->sign_wrote = true;	/* needn't sign */
 			else
-				Np->sign_wrote = FALSE; /* need sign */
+				Np->sign_wrote = false; /* need sign */
 
 			if (Np->Num->lsign == NUM_LSIGN_PRE && Np->Num->pre == Np->Num->pre_lsign_num)
 				Np->Num->lsign = NUM_LSIGN_POST;
 		}
 	}
 	else
-		Np->sign = FALSE;
+		Np->sign = false;
 
 	/*
 	 * Count
@@ -4768,7 +4836,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 			}
 		}
 
-		if (Np->sign_wrote == FALSE && Np->out_pre_spaces == 0)
+		if (Np->sign_wrote == false && Np->out_pre_spaces == 0)
 			++Np->num_count;
 	}
 	else
@@ -4822,9 +4890,11 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 		if (!Np->is_to_char)
 		{
 			/*
-			 * Check non-string inout end
+			 * Check at least one byte remains to be scanned.  (In actions
+			 * below, must use AMOUNT_TEST if we want to read more bytes than
+			 * that.)
 			 */
-			if (Np->inout_p >= Np->inout + from_char_input_len)
+			if (OVERLOAD_TEST)
 				break;
 		}
 
@@ -4834,12 +4904,16 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 		if (n->type == NODE_TYPE_ACTION)
 		{
 			/*
-			 * Create/reading digit/zero/blank/sing
+			 * Create/read digit/zero/blank/sign/special-case
 			 *
 			 * 'NUM_S' note: The locale sign is anchored to number and we
 			 * read/write it when we work with first or last number
-			 * (NUM_0/NUM_9). This is reason why NUM_S missing in follow
-			 * switch().
+			 * (NUM_0/NUM_9).  This is why NUM_S is missing in switch().
+			 *
+			 * Notice the "Np->inout_p++" at the bottom of the loop.  This is
+			 * why most of the actions advance inout_p one less than you might
+			 * expect.  In cases where we don't want that increment to happen,
+			 * a switch case ends with "continue" not "break".
 			 */
 			switch (n->key->id)
 			{
@@ -4854,7 +4928,7 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 					}
 					else
 					{
-						NUM_numpart_from_char(Np, n->key->id, from_char_input_len);
+						NUM_numpart_from_char(Np, n->key->id, input_len);
 						break;	/* switch() case: */
 					}
 
@@ -4878,10 +4952,14 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 							if (IS_FILLMODE(Np->Num))
 								continue;
 						}
+						if (*Np->inout_p != ',')
+							continue;
 					}
 					break;
 
 				case NUM_G:
+					pattern = Np->L_thousands_sep;
+					pattern_len = strlen(pattern);
 					if (Np->is_to_char)
 					{
 						if (!Np->num_in)
@@ -4890,16 +4968,16 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 								continue;
 							else
 							{
-								int			x = strlen(Np->L_thousands_sep);
-
-								memset(Np->inout_p, ' ', x);
-								Np->inout_p += x - 1;
+								/* just in case there are MB chars */
+								pattern_len = pg_mbstrlen(pattern);
+								memset(Np->inout_p, ' ', pattern_len);
+								Np->inout_p += pattern_len - 1;
 							}
 						}
 						else
 						{
-							strcpy(Np->inout_p, Np->L_thousands_sep);
-							Np->inout_p += strlen(Np->inout_p) - 1;
+							strcpy(Np->inout_p, pattern);
+							Np->inout_p += pattern_len - 1;
 						}
 					}
 					else
@@ -4909,18 +4987,33 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 							if (IS_FILLMODE(Np->Num))
 								continue;
 						}
-						Np->inout_p += strlen(Np->L_thousands_sep) - 1;
+
+						/*
+						 * Because L_thousands_sep typically contains data
+						 * characters (either '.' or ','), we can't use
+						 * NUM_eat_non_data_chars here.  Instead skip only if
+						 * the input matches L_thousands_sep.
+						 */
+						if (AMOUNT_TEST(pattern_len) &&
+							strncmp(Np->inout_p, pattern, pattern_len) == 0)
+							Np->inout_p += pattern_len - 1;
+						else
+							continue;
 					}
 					break;
 
 				case NUM_L:
+					pattern = Np->L_currency_symbol;
 					if (Np->is_to_char)
 					{
-						strcpy(Np->inout_p, Np->L_currency_symbol);
-						Np->inout_p += strlen(Np->inout_p) - 1;
+						strcpy(Np->inout_p, pattern);
+						Np->inout_p += strlen(pattern) - 1;
 					}
 					else
-						Np->inout_p += strlen(Np->L_currency_symbol) - 1;
+					{
+						NUM_eat_non_data_chars(Np, pg_mbstrlen(pattern), input_len);
+						continue;
+					}
 					break;
 
 				case NUM_RN:
@@ -4955,8 +5048,16 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 						continue;
 
 					if (Np->is_to_char)
+					{
 						strcpy(Np->inout_p, get_th(Np->number, TH_LOWER));
-					Np->inout_p += 1;
+						Np->inout_p += 1;
+					}
+					else
+					{
+						/* All variants of 'th' occupy 2 characters */
+						NUM_eat_non_data_chars(Np, 2, input_len);
+						continue;
+					}
 					break;
 
 				case NUM_TH:
@@ -4965,8 +5066,16 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 						continue;
 
 					if (Np->is_to_char)
+					{
 						strcpy(Np->inout_p, get_th(Np->number, TH_UPPER));
-					Np->inout_p += 1;
+						Np->inout_p += 1;
+					}
+					else
+					{
+						/* All variants of 'TH' occupy 2 characters */
+						NUM_eat_non_data_chars(Np, 2, input_len);
+						continue;
+					}
 					break;
 
 				case NUM_MI:
@@ -4983,6 +5092,11 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 					{
 						if (*Np->inout_p == '-')
 							*Np->number = '-';
+						else
+						{
+							NUM_eat_non_data_chars(Np, 1, input_len);
+							continue;
+						}
 					}
 					break;
 
@@ -5000,23 +5114,31 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 					{
 						if (*Np->inout_p == '+')
 							*Np->number = '+';
+						else
+						{
+							NUM_eat_non_data_chars(Np, 1, input_len);
+							continue;
+						}
 					}
 					break;
 
 				case NUM_SG:
 					if (Np->is_to_char)
 						*Np->inout_p = Np->sign;
-
 					else
 					{
 						if (*Np->inout_p == '-')
 							*Np->number = '-';
 						else if (*Np->inout_p == '+')
 							*Np->number = '+';
+						else
+						{
+							NUM_eat_non_data_chars(Np, 1, input_len);
+							continue;
+						}
 					}
 					break;
 
-
 				default:
 					continue;
 					break;
@@ -5025,10 +5147,21 @@ NUM_processor(FormatNode *node, NUMDesc *Num, char *inout,
 		else
 		{
 			/*
-			 * Remove to output char from input in TO_CHAR
+			 * In TO_CHAR, non-pattern characters in the format are copied to
+			 * the output.  In TO_NUMBER, we skip one input character for each
+			 * non-pattern format character, whether or not it matches the
+			 * format character.
 			 */
 			if (Np->is_to_char)
-				*Np->inout_p = n->character;
+			{
+				strcpy(Np->inout_p, n->character);
+				Np->inout_p += strlen(Np->inout_p);
+			}
+			else
+			{
+				Np->inout_p += pg_mblen(Np->inout_p);
+			}
+			continue;
 		}
 		Np->inout_p++;
 	}
diff --git a/src/backend/utils/adt/genfile.c b/src/backend/utils/adt/genfile.c
index 5285aa54f1..d9027fc688 100644
--- a/src/backend/utils/adt/genfile.c
+++ b/src/backend/utils/adt/genfile.c
@@ -4,7 +4,7 @@
  *		Functions for direct access to files
  *
  *
- * Copyright (c) 2004-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2004-2018, PostgreSQL Global Development Group
  *
  * Author: Andreas Pflug <pgadmin@pse-consulting.de>
  *
@@ -477,7 +477,7 @@ pg_ls_dir_1arg(PG_FUNCTION_ARGS)
 
 /* Generic function to return a directory listing of files */
 static Datum
-pg_ls_dir_files(FunctionCallInfo fcinfo, char *dir)
+pg_ls_dir_files(FunctionCallInfo fcinfo, const char *dir)
 {
 	FuncCallContext *funcctx;
 	struct dirent *de;
@@ -508,7 +508,7 @@ pg_ls_dir_files(FunctionCallInfo fcinfo, char *dir)
 		if (!fctx->dirdesc)
 			ereport(ERROR,
 					(errcode_for_file_access(),
-					 errmsg("could not read directory \"%s\": %m",
+					 errmsg("could not open directory \"%s\": %m",
 							fctx->location)));
 
 		funcctx->user_fctx = fctx;
diff --git a/src/backend/utils/adt/geo_ops.c b/src/backend/utils/adt/geo_ops.c
index 0348855b11..f57380a4df 100644
--- a/src/backend/utils/adt/geo_ops.c
+++ b/src/backend/utils/adt/geo_ops.c
@@ -3,7 +3,7 @@
  * geo_ops.c
  *	  2D geometric operations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -41,7 +41,6 @@ enum path_delim
 static int	point_inside(Point *p, int npts, Point *plist);
 static int	lseg_crossing(double x, double y, double px, double py);
 static BOX *box_construct(double x1, double x2, double y1, double y2);
-static BOX *box_copy(BOX *box);
 static BOX *box_fill(BOX *result, double x1, double x2, double y1, double y2);
 static bool box_ov(BOX *box1, BOX *box2);
 static double box_ht(BOX *box);
@@ -482,7 +481,7 @@ box_fill(BOX *result, double x1, double x2, double y1, double y2)
 
 /*		box_copy		-		copy a box
  */
-static BOX *
+BOX *
 box_copy(BOX *box)
 {
 	BOX		   *result = (BOX *) palloc(sizeof(BOX));
@@ -1433,7 +1432,7 @@ path_send(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 	pq_sendbyte(&buf, path->closed ? 1 : 0);
-	pq_sendint(&buf, path->npts, sizeof(int32));
+	pq_sendint32(&buf, path->npts);
 	for (i = 0; i < path->npts; i++)
 	{
 		pq_sendfloat8(&buf, path->p[i].x);
@@ -1530,7 +1529,7 @@ path_close(PG_FUNCTION_ARGS)
 {
 	PATH	   *path = PG_GETARG_PATH_P_COPY(0);
 
-	path->closed = TRUE;
+	path->closed = true;
 
 	PG_RETURN_PATH_P(path);
 }
@@ -1540,7 +1539,7 @@ path_open(PG_FUNCTION_ARGS)
 {
 	PATH	   *path = PG_GETARG_PATH_P_COPY(0);
 
-	path->closed = FALSE;
+	path->closed = false;
 
 	PG_RETURN_PATH_P(path);
 }
@@ -3514,7 +3513,7 @@ poly_send(PG_FUNCTION_ARGS)
 	int32		i;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, poly->npts, sizeof(int32));
+	pq_sendint32(&buf, poly->npts);
 	for (i = 0; i < poly->npts; i++)
 	{
 		pq_sendfloat8(&buf, poly->p[i].x);
@@ -4499,7 +4498,7 @@ poly_path(PG_FUNCTION_ARGS)
 
 	SET_VARSIZE(path, size);
 	path->npts = poly->npts;
-	path->closed = TRUE;
+	path->closed = true;
 	/* prevent instability in unused pad bytes */
 	path->dummy = 0;
 
@@ -5401,7 +5400,7 @@ plist_same(int npts, Point *p1, Point *p2)
 			printf("plist_same- ii = %d/%d after forward match\n", ii, npts);
 #endif
 			if (ii == npts)
-				return TRUE;
+				return true;
 
 			/* match not found forwards? then look backwards */
 			for (ii = 1, j = i - 1; ii < npts; ii++, j--)
@@ -5421,11 +5420,11 @@ plist_same(int npts, Point *p1, Point *p2)
 			printf("plist_same- ii = %d/%d after reverse match\n", ii, npts);
 #endif
 			if (ii == npts)
-				return TRUE;
+				return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 
diff --git a/src/backend/utils/adt/geo_selfuncs.c b/src/backend/utils/adt/geo_selfuncs.c
index 774063e92c..02a8853d75 100644
--- a/src/backend/utils/adt/geo_selfuncs.c
+++ b/src/backend/utils/adt/geo_selfuncs.c
@@ -4,7 +4,7 @@
  *	  Selectivity routines registered in the operator catalog in the
  *	  "oprrest" and "oprjoin" attributes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/geo_spgist.c b/src/backend/utils/adt/geo_spgist.c
index f6334bae14..3f1a755cbb 100644
--- a/src/backend/utils/adt/geo_spgist.c
+++ b/src/backend/utils/adt/geo_spgist.c
@@ -62,7 +62,7 @@
  * except the root.  For the root node, we are setting the boundaries
  * that we don't yet have as infinity.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -391,7 +391,7 @@ spg_box_quad_choose(PG_FUNCTION_ARGS)
 	spgChooseIn *in = (spgChooseIn *) PG_GETARG_POINTER(0);
 	spgChooseOut *out = (spgChooseOut *) PG_GETARG_POINTER(1);
 	BOX		   *centroid = DatumGetBoxP(in->prefixDatum),
-			   *box = DatumGetBoxP(in->datum);
+			   *box = DatumGetBoxP(in->leafDatum);
 
 	out->resultType = spgMatchNode;
 	out->result.matchNode.restDatum = BoxPGetDatum(box);
@@ -473,6 +473,51 @@ spg_box_quad_picksplit(PG_FUNCTION_ARGS)
 	PG_RETURN_VOID();
 }
 
+/*
+ * Check if result of consistent method based on bounding box is exact.
+ */
+static bool
+is_bounding_box_test_exact(StrategyNumber strategy)
+{
+	switch (strategy)
+	{
+		case RTLeftStrategyNumber:
+		case RTOverLeftStrategyNumber:
+		case RTOverRightStrategyNumber:
+		case RTRightStrategyNumber:
+		case RTOverBelowStrategyNumber:
+		case RTBelowStrategyNumber:
+		case RTAboveStrategyNumber:
+		case RTOverAboveStrategyNumber:
+			return true;
+
+		default:
+			return false;
+	}
+}
+
+/*
+ * Get bounding box for ScanKey.
+ */
+static BOX *
+spg_box_quad_get_scankey_bbox(ScanKey sk, bool *recheck)
+{
+	switch (sk->sk_subtype)
+	{
+		case BOXOID:
+			return DatumGetBoxP(sk->sk_argument);
+
+		case POLYGONOID:
+			if (recheck && !is_bounding_box_test_exact(sk->sk_strategy))
+				*recheck = true;
+			return &DatumGetPolygonP(sk->sk_argument)->boundbox;
+
+		default:
+			elog(ERROR, "unrecognized scankey subtype: %d", sk->sk_subtype);
+			return NULL;
+	}
+}
+
 /*
  * SP-GiST inner consistent function
  */
@@ -515,7 +560,11 @@ spg_box_quad_inner_consistent(PG_FUNCTION_ARGS)
 	centroid = getRangeBox(DatumGetBoxP(in->prefixDatum));
 	queries = (RangeBox **) palloc(in->nkeys * sizeof(RangeBox *));
 	for (i = 0; i < in->nkeys; i++)
-		queries[i] = getRangeBox(DatumGetBoxP(in->scankeys[i].sk_argument));
+	{
+		BOX		   *box = spg_box_quad_get_scankey_bbox(&in->scankeys[i], NULL);
+
+		queries[i] = getRangeBox(box);
+	}
 
 	/* Allocate enough memory for nodes */
 	out->nNodes = 0;
@@ -637,8 +686,10 @@ spg_box_quad_leaf_consistent(PG_FUNCTION_ARGS)
 	/* Perform the required comparison(s) */
 	for (i = 0; i < in->nkeys; i++)
 	{
-		StrategyNumber strategy = in->scankeys[i].sk_strategy;
-		Datum		query = in->scankeys[i].sk_argument;
+		StrategyNumber	strategy = in->scankeys[i].sk_strategy;
+		BOX			   *box = spg_box_quad_get_scankey_bbox(&in->scankeys[i],
+															&out->recheck);
+		Datum			query = BoxPGetDatum(box);
 
 		switch (strategy)
 		{
@@ -713,3 +764,36 @@ spg_box_quad_leaf_consistent(PG_FUNCTION_ARGS)
 
 	PG_RETURN_BOOL(flag);
 }
+
+
+/*
+ * SP-GiST config function for 2-D types that are lossy represented by their
+ * bounding boxes
+ */
+Datum
+spg_bbox_quad_config(PG_FUNCTION_ARGS)
+{
+	spgConfigOut *cfg = (spgConfigOut *) PG_GETARG_POINTER(1);
+
+	cfg->prefixType = BOXOID;	/* A type represented by its bounding box */
+	cfg->labelType = VOIDOID;	/* We don't need node labels. */
+	cfg->leafType = BOXOID;
+	cfg->canReturnData = false;
+	cfg->longValuesOK = false;
+
+	PG_RETURN_VOID();
+}
+
+/*
+ * SP-GiST compress function for polygons
+ */
+Datum
+spg_poly_quad_compress(PG_FUNCTION_ARGS)
+{
+	POLYGON	   *polygon = PG_GETARG_POLYGON_P(0);
+	BOX		   *box;
+
+	box = box_copy(&polygon->boundbox);
+
+	PG_RETURN_BOX_P(box);
+}
diff --git a/src/backend/utils/adt/inet_cidr_ntop.c b/src/backend/utils/adt/inet_cidr_ntop.c
index 2973d56658..30b3673789 100644
--- a/src/backend/utils/adt/inet_cidr_ntop.c
+++ b/src/backend/utils/adt/inet_cidr_ntop.c
@@ -58,12 +58,12 @@ inet_cidr_ntop(int af, const void *src, int bits, char *dst, size_t size)
 	switch (af)
 	{
 		case PGSQL_AF_INET:
-			return (inet_cidr_ntop_ipv4(src, bits, dst, size));
+			return inet_cidr_ntop_ipv4(src, bits, dst, size);
 		case PGSQL_AF_INET6:
-			return (inet_cidr_ntop_ipv6(src, bits, dst, size));
+			return inet_cidr_ntop_ipv6(src, bits, dst, size);
 		default:
 			errno = EAFNOSUPPORT;
-			return (NULL);
+			return NULL;
 	}
 }
 
@@ -92,7 +92,7 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
 	if (bits < 0 || bits > 32)
 	{
 		errno = EINVAL;
-		return (NULL);
+		return NULL;
 	}
 
 	if (bits == 0)
@@ -137,11 +137,11 @@ inet_cidr_ntop_ipv4(const u_char *src, int bits, char *dst, size_t size)
 	if (size <= sizeof "/32")
 		goto emsgsize;
 	dst += SPRINTF((dst, "/%u", bits));
-	return (odst);
+	return odst;
 
 emsgsize:
 	errno = EMSGSIZE;
-	return (NULL);
+	return NULL;
 }
 
 /*
@@ -182,7 +182,7 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
 	if (bits < 0 || bits > 128)
 	{
 		errno = EINVAL;
-		return (NULL);
+		return NULL;
 	}
 
 	cp = outbuf;
@@ -286,9 +286,9 @@ inet_cidr_ntop_ipv6(const u_char *src, int bits, char *dst, size_t size)
 		goto emsgsize;
 	strcpy(dst, outbuf);
 
-	return (dst);
+	return dst;
 
 emsgsize:
 	errno = EMSGSIZE;
-	return (NULL);
+	return NULL;
 }
diff --git a/src/backend/utils/adt/inet_net_pton.c b/src/backend/utils/adt/inet_net_pton.c
index be788d37cd..6f3ece1209 100644
--- a/src/backend/utils/adt/inet_net_pton.c
+++ b/src/backend/utils/adt/inet_net_pton.c
@@ -73,7 +73,7 @@ inet_net_pton(int af, const char *src, void *dst, size_t size)
 				inet_cidr_pton_ipv6(src, dst, size);
 		default:
 			errno = EAFNOSUPPORT;
-			return (-1);
+			return -1;
 	}
 }
 
@@ -228,15 +228,15 @@ inet_cidr_pton_ipv4(const char *src, u_char *dst, size_t size)
 			goto emsgsize;
 		*dst++ = '\0';
 	}
-	return (bits);
+	return bits;
 
 enoent:
 	errno = ENOENT;
-	return (-1);
+	return -1;
 
 emsgsize:
 	errno = EMSGSIZE;
-	return (-1);
+	return -1;
 }
 
 /*
@@ -338,11 +338,11 @@ inet_net_pton_ipv4(const char *src, u_char *dst)
 
 enoent:
 	errno = ENOENT;
-	return (-1);
+	return -1;
 
 emsgsize:
 	errno = EMSGSIZE;
-	return (-1);
+	return -1;
 }
 
 static int
@@ -363,19 +363,19 @@ getbits(const char *src, int *bitsp)
 		if (pch != NULL)
 		{
 			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
+				return 0;
 			val *= 10;
 			val += (pch - digits);
 			if (val > 128)		/* range */
-				return (0);
+				return 0;
 			continue;
 		}
-		return (0);
+		return 0;
 	}
 	if (n == 0)
-		return (0);
+		return 0;
 	*bitsp = val;
-	return (1);
+	return 1;
 }
 
 static int
@@ -397,32 +397,32 @@ getv4(const char *src, u_char *dst, int *bitsp)
 		if (pch != NULL)
 		{
 			if (n++ != 0 && val == 0)	/* no leading zeros */
-				return (0);
+				return 0;
 			val *= 10;
 			val += (pch - digits);
 			if (val > 255)		/* range */
-				return (0);
+				return 0;
 			continue;
 		}
 		if (ch == '.' || ch == '/')
 		{
 			if (dst - odst > 3) /* too many octets? */
-				return (0);
+				return 0;
 			*dst++ = val;
 			if (ch == '/')
-				return (getbits(src, bitsp));
+				return getbits(src, bitsp);
 			val = 0;
 			n = 0;
 			continue;
 		}
-		return (0);
+		return 0;
 	}
 	if (n == 0)
-		return (0);
+		return 0;
 	if (dst - odst > 3)			/* too many octets? */
-		return (0);
+		return 0;
 	*dst++ = val;
-	return (1);
+	return 1;
 }
 
 static int
@@ -552,13 +552,13 @@ inet_cidr_pton_ipv6(const char *src, u_char *dst, size_t size)
 	 */
 	memcpy(dst, tmp, NS_IN6ADDRSZ);
 
-	return (bits);
+	return bits;
 
 enoent:
 	errno = ENOENT;
-	return (-1);
+	return -1;
 
 emsgsize:
 	errno = EMSGSIZE;
-	return (-1);
+	return -1;
 }
diff --git a/src/backend/utils/adt/int.c b/src/backend/utils/adt/int.c
index 96ef25b900..559c365fec 100644
--- a/src/backend/utils/adt/int.c
+++ b/src/backend/utils/adt/int.c
@@ -3,7 +3,7 @@
  * int.c
  *	  Functions for the built-in integer types (except int8).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -32,14 +32,12 @@
 #include <limits.h>
 
 #include "catalog/pg_type.h"
+#include "common/int.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 
-
-#define SAMESIGN(a,b)	(((a) < 0) == ((b) < 0))
-
 #define Int2VectorSize(n)	(offsetof(int2vector, values) + (n) * sizeof(int16))
 
 typedef struct
@@ -99,7 +97,7 @@ int2send(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(int16));
+	pq_sendint16(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -304,7 +302,7 @@ int4send(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(int32));
+	pq_sendint32(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -328,7 +326,7 @@ i4toi2(PG_FUNCTION_ARGS)
 {
 	int32		arg1 = PG_GETARG_INT32(0);
 
-	if (arg1 < SHRT_MIN || arg1 > SHRT_MAX)
+	if (unlikely(arg1 < SHRT_MIN) || unlikely(arg1 > SHRT_MAX))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
@@ -587,6 +585,158 @@ int42ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(arg1 >= arg2);
 }
 
+
+/*----------------------------------------------------------
+ *	in_range functions for int4 and int2,
+ *	including cross-data-type comparisons.
+ *
+ *	Note: we provide separate intN_int8 functions for performance
+ *	reasons.  This forces also providing intN_int2, else cases with a
+ *	smallint offset value would fail to resolve which function to use.
+ *	But that's an unlikely situation, so don't duplicate code for it.
+ *---------------------------------------------------------*/
+
+Datum
+in_range_int4_int4(PG_FUNCTION_ARGS)
+{
+	int32		val = PG_GETARG_INT32(0);
+	int32		base = PG_GETARG_INT32(1);
+	int32		offset = PG_GETARG_INT32(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	int32		sum;
+
+	if (offset < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	if (sub)
+		offset = -offset;		/* cannot overflow */
+
+	if (unlikely(pg_add_s32_overflow(base, offset, &sum)))
+	{
+		/*
+		 * If sub is false, the true sum is surely more than val, so correct
+		 * answer is the same as "less".  If sub is true, the true sum is
+		 * surely less than val, so the answer is "!less".
+		 */
+		PG_RETURN_BOOL(sub ? !less : less);
+	}
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+Datum
+in_range_int4_int2(PG_FUNCTION_ARGS)
+{
+	/* Doesn't seem worth duplicating code for, so just invoke int4_int4 */
+	return DirectFunctionCall5(in_range_int4_int4,
+							   PG_GETARG_DATUM(0),
+							   PG_GETARG_DATUM(1),
+							   Int32GetDatum((int32) PG_GETARG_INT16(2)),
+							   PG_GETARG_DATUM(3),
+							   PG_GETARG_DATUM(4));
+}
+
+Datum
+in_range_int4_int8(PG_FUNCTION_ARGS)
+{
+	/* We must do all the math in int64 */
+	int64		val = (int64) PG_GETARG_INT32(0);
+	int64		base = (int64) PG_GETARG_INT32(1);
+	int64		offset = PG_GETARG_INT64(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	int64		sum;
+
+	if (offset < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	if (sub)
+		offset = -offset;		/* cannot overflow */
+
+	if (unlikely(pg_add_s64_overflow(base, offset, &sum)))
+	{
+		/*
+		 * If sub is false, the true sum is surely more than val, so correct
+		 * answer is the same as "less".  If sub is true, the true sum is
+		 * surely less than val, so the answer is "!less".
+		 */
+		PG_RETURN_BOOL(sub ? !less : less);
+	}
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+Datum
+in_range_int2_int4(PG_FUNCTION_ARGS)
+{
+	/* We must do all the math in int32 */
+	int32		val = (int32) PG_GETARG_INT16(0);
+	int32		base = (int32) PG_GETARG_INT16(1);
+	int32		offset = PG_GETARG_INT32(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	int32		sum;
+
+	if (offset < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	if (sub)
+		offset = -offset;		/* cannot overflow */
+
+	if (unlikely(pg_add_s32_overflow(base, offset, &sum)))
+	{
+		/*
+		 * If sub is false, the true sum is surely more than val, so correct
+		 * answer is the same as "less".  If sub is true, the true sum is
+		 * surely less than val, so the answer is "!less".
+		 */
+		PG_RETURN_BOOL(sub ? !less : less);
+	}
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+Datum
+in_range_int2_int2(PG_FUNCTION_ARGS)
+{
+	/* Doesn't seem worth duplicating code for, so just invoke int2_int4 */
+	return DirectFunctionCall5(in_range_int2_int4,
+							   PG_GETARG_DATUM(0),
+							   PG_GETARG_DATUM(1),
+							   Int32GetDatum((int32) PG_GETARG_INT16(2)),
+							   PG_GETARG_DATUM(3),
+							   PG_GETARG_DATUM(4));
+}
+
+Datum
+in_range_int2_int8(PG_FUNCTION_ARGS)
+{
+	/* Doesn't seem worth duplicating code for, so just invoke int4_int8 */
+	return DirectFunctionCall5(in_range_int4_int8,
+							   Int32GetDatum((int32) PG_GETARG_INT16(0)),
+							   Int32GetDatum((int32) PG_GETARG_INT16(1)),
+							   PG_GETARG_DATUM(2),
+							   PG_GETARG_DATUM(3),
+							   PG_GETARG_DATUM(4));
+}
+
+
 /*
  *		int[24]pl		- returns arg1 + arg2
  *		int[24]mi		- returns arg1 - arg2
@@ -598,15 +748,12 @@ Datum
 int4um(PG_FUNCTION_ARGS)
 {
 	int32		arg = PG_GETARG_INT32(0);
-	int32		result;
 
-	result = -arg;
-	/* overflow check (needed for INT_MIN) */
-	if (arg != 0 && SAMESIGN(result, arg))
+	if (unlikely(arg == PG_INT32_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
-	PG_RETURN_INT32(result);
+	PG_RETURN_INT32(-arg);
 }
 
 Datum
@@ -624,14 +771,7 @@ int4pl(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s32_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -645,14 +785,7 @@ int4mi(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s32_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -666,24 +799,7 @@ int4mul(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg2 gives arg1
-	 * again.  There are two cases where this fails: arg2 = 0 (which cannot
-	 * overflow) and arg1 = INT_MIN, arg2 = -1 (where the division itself will
-	 * overflow and thus incorrectly match).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int16
-	 * range; if so, no overflow is possible.
-	 */
-	if (!(arg1 >= (int32) SHRT_MIN && arg1 <= (int32) SHRT_MAX &&
-		  arg2 >= (int32) SHRT_MIN && arg2 <= (int32) SHRT_MAX) &&
-		arg2 != 0 &&
-		((arg2 == -1 && arg1 < 0 && result < 0) ||
-		 result / arg2 != arg1))
+	if (unlikely(pg_mul_s32_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -714,12 +830,11 @@ int4div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for INT_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT32_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
+		result = -arg1;
 		PG_RETURN_INT32(result);
 	}
 
@@ -736,9 +851,7 @@ int4inc(PG_FUNCTION_ARGS)
 	int32		arg = PG_GETARG_INT32(0);
 	int32		result;
 
-	result = arg + 1;
-	/* Overflow check */
-	if (arg > 0 && result < 0)
+	if (unlikely(pg_add_s32_overflow(arg, 1, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -750,15 +863,12 @@ Datum
 int2um(PG_FUNCTION_ARGS)
 {
 	int16		arg = PG_GETARG_INT16(0);
-	int16		result;
 
-	result = -arg;
-	/* overflow check (needed for SHRT_MIN) */
-	if (arg != 0 && SAMESIGN(result, arg))
+	if (unlikely(arg == PG_INT16_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
-	PG_RETURN_INT16(result);
+	PG_RETURN_INT16(-arg);
 }
 
 Datum
@@ -776,14 +886,7 @@ int2pl(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int16		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s16_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
@@ -797,14 +900,7 @@ int2mi(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int16		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s16_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
@@ -816,20 +912,14 @@ int2mul(PG_FUNCTION_ARGS)
 {
 	int16		arg1 = PG_GETARG_INT16(0);
 	int16		arg2 = PG_GETARG_INT16(1);
-	int32		result32;
-
-	/*
-	 * The most practical way to detect overflow is to do the arithmetic in
-	 * int32 (so that the result can't overflow) and then do a range check.
-	 */
-	result32 = (int32) arg1 * (int32) arg2;
+	int16		result;
 
-	if (result32 < SHRT_MIN || result32 > SHRT_MAX)
+	if (unlikely(pg_mul_s16_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
 
-	PG_RETURN_INT16((int16) result32);
+	PG_RETURN_INT16(result);
 }
 
 Datum
@@ -856,12 +946,11 @@ int2div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for SHRT_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT16_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("smallint out of range")));
+		result = -arg1;
 		PG_RETURN_INT16(result);
 	}
 
@@ -879,14 +968,7 @@ int24pl(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s32_overflow((int32) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -900,14 +982,7 @@ int24mi(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s32_overflow((int32) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -921,20 +996,7 @@ int24mul(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int32		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg2 gives arg1
-	 * again.  There is one case where this fails: arg2 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int16
-	 * range; if so, no overflow is possible.
-	 */
-	if (!(arg2 >= (int32) SHRT_MIN && arg2 <= (int32) SHRT_MAX) &&
-		result / arg2 != arg1)
+	if (unlikely(pg_mul_s32_overflow((int32) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -947,7 +1009,7 @@ int24div(PG_FUNCTION_ARGS)
 	int16		arg1 = PG_GETARG_INT16(0);
 	int32		arg2 = PG_GETARG_INT32(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -967,14 +1029,7 @@ int42pl(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int32		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s32_overflow(arg1, (int32) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -988,14 +1043,7 @@ int42mi(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int32		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s32_overflow(arg1, (int32) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -1009,20 +1057,7 @@ int42mul(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int32		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg1 gives arg2
-	 * again.  There is one case where this fails: arg1 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int16
-	 * range; if so, no overflow is possible.
-	 */
-	if (!(arg1 >= (int32) SHRT_MIN && arg1 <= (int32) SHRT_MAX) &&
-		result / arg1 != arg2)
+	if (unlikely(pg_mul_s32_overflow(arg1, (int32) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -1036,7 +1071,7 @@ int42div(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int32		result;
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1053,12 +1088,11 @@ int42div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for INT_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT32_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("integer out of range")));
+		result = -arg1;
 		PG_RETURN_INT32(result);
 	}
 
@@ -1075,7 +1109,7 @@ int4mod(PG_FUNCTION_ARGS)
 	int32		arg1 = PG_GETARG_INT32(0);
 	int32		arg2 = PG_GETARG_INT32(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1103,7 +1137,7 @@ int2mod(PG_FUNCTION_ARGS)
 	int16		arg1 = PG_GETARG_INT16(0);
 	int16		arg2 = PG_GETARG_INT16(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1136,12 +1170,11 @@ int4abs(PG_FUNCTION_ARGS)
 	int32		arg1 = PG_GETARG_INT32(0);
 	int32		result;
 
-	result = (arg1 < 0) ? -arg1 : arg1;
-	/* overflow check (needed for INT_MIN) */
-	if (result < 0)
+	if (unlikely(arg1 == PG_INT32_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
+	result = (arg1 < 0) ? -arg1 : arg1;
 	PG_RETURN_INT32(result);
 }
 
@@ -1151,12 +1184,11 @@ int2abs(PG_FUNCTION_ARGS)
 	int16		arg1 = PG_GETARG_INT16(0);
 	int16		result;
 
-	result = (arg1 < 0) ? -arg1 : arg1;
-	/* overflow check (needed for SHRT_MIN) */
-	if (result < 0)
+	if (unlikely(arg1 == PG_INT16_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
+	result = (arg1 < 0) ? -arg1 : arg1;
 	PG_RETURN_INT16(result);
 }
 
@@ -1381,11 +1413,11 @@ generate_series_step_int4(PG_FUNCTION_ARGS)
 	if ((fctx->step > 0 && fctx->current <= fctx->finish) ||
 		(fctx->step < 0 && fctx->current >= fctx->finish))
 	{
-		/* increment current in preparation for next iteration */
-		fctx->current += fctx->step;
-
-		/* if next-value computation overflows, this is the final result */
-		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+		/*
+		 * Increment current in preparation for next iteration. If next-value
+		 * computation overflows, this is the final result.
+		 */
+		if (pg_add_s32_overflow(fctx->current, fctx->step, &fctx->current))
 			fctx->step = 0;
 
 		/* do when there is more left to send */
diff --git a/src/backend/utils/adt/int8.c b/src/backend/utils/adt/int8.c
index e8354dee44..e6bae6860d 100644
--- a/src/backend/utils/adt/int8.c
+++ b/src/backend/utils/adt/int8.c
@@ -3,7 +3,7 @@
  * int8.c
  *	  Internal 64-bit integer operations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -14,9 +14,11 @@
 #include "postgres.h"
 
 #include <ctype.h>
+#include <float.h>				/* for _isnan */
 #include <limits.h>
 #include <math.h>
 
+#include "common/int.h"
 #include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "utils/int8.h"
@@ -25,8 +27,6 @@
 
 #define MAXINT8LEN		25
 
-#define SAMESIGN(a,b)	(((a) < 0) == ((b) < 0))
-
 typedef struct
 {
 	int64		current;
@@ -56,11 +56,14 @@ scanint8(const char *str, bool errorOK, int64 *result)
 {
 	const char *ptr = str;
 	int64		tmp = 0;
-	int			sign = 1;
+	bool		neg = false;
 
 	/*
 	 * Do our own scan, rather than relying on sscanf which might be broken
 	 * for long long.
+	 *
+	 * As INT64_MIN can't be stored as a positive 64 bit integer, accumulate
+	 * value as a negative number.
 	 */
 
 	/* skip leading spaces */
@@ -71,72 +74,57 @@ scanint8(const char *str, bool errorOK, int64 *result)
 	if (*ptr == '-')
 	{
 		ptr++;
-
-		/*
-		 * Do an explicit check for INT64_MIN.  Ugly though this is, it's
-		 * cleaner than trying to get the loop below to handle it portably.
-		 */
-		if (strncmp(ptr, "9223372036854775808", 19) == 0)
-		{
-			tmp = PG_INT64_MIN;
-			ptr += 19;
-			goto gotdigits;
-		}
-		sign = -1;
+		neg = true;
 	}
 	else if (*ptr == '+')
 		ptr++;
 
 	/* require at least one digit */
-	if (!isdigit((unsigned char) *ptr))
-	{
-		if (errorOK)
-			return false;
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for %s: \"%s\"",
-							"integer", str)));
-	}
+	if (unlikely(!isdigit((unsigned char) *ptr)))
+		goto invalid_syntax;
 
 	/* process digits */
 	while (*ptr && isdigit((unsigned char) *ptr))
 	{
-		int64		newtmp = tmp * 10 + (*ptr++ - '0');
-
-		if ((newtmp / 10) != tmp)	/* overflow? */
-		{
-			if (errorOK)
-				return false;
-			else
-				ereport(ERROR,
-						(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-						 errmsg("value \"%s\" is out of range for type %s",
-								str, "bigint")));
-		}
-		tmp = newtmp;
-	}
+		int8		digit = (*ptr++ - '0');
 
-gotdigits:
+		if (unlikely(pg_mul_s64_overflow(tmp, 10, &tmp)) ||
+			unlikely(pg_sub_s64_overflow(tmp, digit, &tmp)))
+			goto out_of_range;
+	}
 
 	/* allow trailing whitespace, but not other trailing chars */
 	while (*ptr != '\0' && isspace((unsigned char) *ptr))
 		ptr++;
 
-	if (*ptr != '\0')
+	if (unlikely(*ptr != '\0'))
+		goto invalid_syntax;
+
+	if (!neg)
 	{
-		if (errorOK)
-			return false;
-		else
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("invalid input syntax for %s: \"%s\"",
-							"integer", str)));
+		if (unlikely(tmp == PG_INT64_MIN))
+			goto out_of_range;
+		tmp = -tmp;
 	}
 
-	*result = (sign < 0) ? -tmp : tmp;
-
+	*result = tmp;
 	return true;
+
+out_of_range:
+	if (!errorOK)
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("value \"%s\" is out of range for type %s",
+						str, "bigint")));
+	return false;
+
+invalid_syntax:
+	if (!errorOK)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						str)));
+	return false;
 }
 
 /* int8in()
@@ -481,6 +469,46 @@ int28ge(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(val1 >= val2);
 }
 
+/*
+ * in_range support function for int8.
+ *
+ * Note: we needn't supply int8_int4 or int8_int2 variants, as implicit
+ * coercion of the offset value takes care of those scenarios just as well.
+ */
+Datum
+in_range_int8_int8(PG_FUNCTION_ARGS)
+{
+	int64		val = PG_GETARG_INT64(0);
+	int64		base = PG_GETARG_INT64(1);
+	int64		offset = PG_GETARG_INT64(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	int64		sum;
+
+	if (offset < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	if (sub)
+		offset = -offset;		/* cannot overflow */
+
+	if (unlikely(pg_add_s64_overflow(base, offset, &sum)))
+	{
+		/*
+		 * If sub is false, the true sum is surely more than val, so correct
+		 * answer is the same as "less".  If sub is true, the true sum is
+		 * surely less than val, so the answer is "!less".
+		 */
+		PG_RETURN_BOOL(sub ? !less : less);
+	}
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
 
 /*----------------------------------------------------------
  *	Arithmetic operators on 64-bit integers.
@@ -492,12 +520,11 @@ int8um(PG_FUNCTION_ARGS)
 	int64		arg = PG_GETARG_INT64(0);
 	int64		result;
 
-	result = -arg;
-	/* overflow check (needed for INT64_MIN) */
-	if (arg != 0 && SAMESIGN(result, arg))
+	if (unlikely(arg == PG_INT64_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
+	result = -arg;
 	PG_RETURN_INT64(result);
 }
 
@@ -516,14 +543,7 @@ int8pl(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s64_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -537,14 +557,7 @@ int8mi(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s64_overflow(arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -558,28 +571,10 @@ int8mul(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg2 gives arg1
-	 * again.  There are two cases where this fails: arg2 = 0 (which cannot
-	 * overflow) and arg1 = INT64_MIN, arg2 = -1 (where the division itself
-	 * will overflow and thus incorrectly match).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int32
-	 * range; if so, no overflow is possible.
-	 */
-	if (arg1 != (int64) ((int32) arg1) || arg2 != (int64) ((int32) arg2))
-	{
-		if (arg2 != 0 &&
-			((arg2 == -1 && arg1 < 0 && result < 0) ||
-			 result / arg2 != arg1))
-			ereport(ERROR,
-					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
-					 errmsg("bigint out of range")));
-	}
+	if (unlikely(pg_mul_s64_overflow(arg1, arg2, &result)))
+		ereport(ERROR,
+				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
+				 errmsg("bigint out of range")));
 	PG_RETURN_INT64(result);
 }
 
@@ -607,12 +602,11 @@ int8div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for INT64_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT64_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
+		result = -arg1;
 		PG_RETURN_INT64(result);
 	}
 
@@ -632,12 +626,11 @@ int8abs(PG_FUNCTION_ARGS)
 	int64		arg1 = PG_GETARG_INT64(0);
 	int64		result;
 
-	result = (arg1 < 0) ? -arg1 : arg1;
-	/* overflow check (needed for INT64_MIN) */
-	if (result < 0)
+	if (unlikely(arg1 == PG_INT64_MIN))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
+	result = (arg1 < 0) ? -arg1 : arg1;
 	PG_RETURN_INT64(result);
 }
 
@@ -650,7 +643,7 @@ int8mod(PG_FUNCTION_ARGS)
 	int64		arg1 = PG_GETARG_INT64(0);
 	int64		arg2 = PG_GETARG_INT64(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -687,16 +680,12 @@ int8inc(PG_FUNCTION_ARGS)
 	if (AggCheckCallContext(fcinfo, NULL))
 	{
 		int64	   *arg = (int64 *) PG_GETARG_POINTER(0);
-		int64		result;
 
-		result = *arg + 1;
-		/* Overflow check */
-		if (result < 0 && *arg > 0)
+		if (unlikely(pg_add_s64_overflow(*arg, 1, arg)))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
 
-		*arg = result;
 		PG_RETURN_POINTER(arg);
 	}
 	else
@@ -706,9 +695,7 @@ int8inc(PG_FUNCTION_ARGS)
 		int64		arg = PG_GETARG_INT64(0);
 		int64		result;
 
-		result = arg + 1;
-		/* Overflow check */
-		if (result < 0 && arg > 0)
+		if (unlikely(pg_add_s64_overflow(arg, 1, &result)))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
@@ -731,16 +718,11 @@ int8dec(PG_FUNCTION_ARGS)
 	if (AggCheckCallContext(fcinfo, NULL))
 	{
 		int64	   *arg = (int64 *) PG_GETARG_POINTER(0);
-		int64		result;
 
-		result = *arg - 1;
-		/* Overflow check */
-		if (result > 0 && *arg < 0)
+		if (unlikely(pg_sub_s64_overflow(*arg, 1, arg)))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
-
-		*arg = result;
 		PG_RETURN_POINTER(arg);
 	}
 	else
@@ -750,9 +732,7 @@ int8dec(PG_FUNCTION_ARGS)
 		int64		arg = PG_GETARG_INT64(0);
 		int64		result;
 
-		result = arg - 1;
-		/* Overflow check */
-		if (result > 0 && arg < 0)
+		if (unlikely(pg_sub_s64_overflow(arg, 1, &result)))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
@@ -821,14 +801,7 @@ int84pl(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int64		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -842,14 +815,7 @@ int84mi(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int64		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -863,20 +829,7 @@ int84mul(PG_FUNCTION_ARGS)
 	int32		arg2 = PG_GETARG_INT32(1);
 	int64		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg1 gives arg2
-	 * again.  There is one case where this fails: arg1 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int32
-	 * range; if so, no overflow is possible.
-	 */
-	if (arg1 != (int64) ((int32) arg1) &&
-		result / arg1 != arg2)
+	if (unlikely(pg_mul_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -907,12 +860,11 @@ int84div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for INT64_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT64_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
+		result = -arg1;
 		PG_RETURN_INT64(result);
 	}
 
@@ -930,14 +882,7 @@ int48pl(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -951,14 +896,7 @@ int48mi(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -972,20 +910,7 @@ int48mul(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg2 gives arg1
-	 * again.  There is one case where this fails: arg2 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int32
-	 * range; if so, no overflow is possible.
-	 */
-	if (arg2 != (int64) ((int32) arg2) &&
-		result / arg2 != arg1)
+	if (unlikely(pg_mul_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -998,7 +923,7 @@ int48div(PG_FUNCTION_ARGS)
 	int32		arg1 = PG_GETARG_INT32(0);
 	int64		arg2 = PG_GETARG_INT64(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1018,14 +943,7 @@ int82pl(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int64		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1039,14 +957,7 @@ int82mi(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int64		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1060,20 +971,7 @@ int82mul(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int64		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg1 gives arg2
-	 * again.  There is one case where this fails: arg1 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int32
-	 * range; if so, no overflow is possible.
-	 */
-	if (arg1 != (int64) ((int32) arg1) &&
-		result / arg1 != arg2)
+	if (unlikely(pg_mul_s64_overflow(arg1, (int64) arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1087,7 +985,7 @@ int82div(PG_FUNCTION_ARGS)
 	int16		arg2 = PG_GETARG_INT16(1);
 	int64		result;
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1104,12 +1002,11 @@ int82div(PG_FUNCTION_ARGS)
 	 */
 	if (arg2 == -1)
 	{
-		result = -arg1;
-		/* overflow check (needed for INT64_MIN) */
-		if (arg1 != 0 && SAMESIGN(result, arg1))
+		if (unlikely(arg1 == PG_INT64_MIN))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("bigint out of range")));
+		result = -arg1;
 		PG_RETURN_INT64(result);
 	}
 
@@ -1127,14 +1024,7 @@ int28pl(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 + arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of different signs then their sum
-	 * cannot overflow.  If the inputs are of the same sign, their sum had
-	 * better be that sign too.
-	 */
-	if (SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_add_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1148,14 +1038,7 @@ int28mi(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 - arg2;
-
-	/*
-	 * Overflow check.  If the inputs are of the same sign then their
-	 * difference cannot overflow.  If they are of different signs then the
-	 * result should be of the same sign as the first input.
-	 */
-	if (!SAMESIGN(arg1, arg2) && !SAMESIGN(result, arg1))
+	if (unlikely(pg_sub_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1169,20 +1052,7 @@ int28mul(PG_FUNCTION_ARGS)
 	int64		arg2 = PG_GETARG_INT64(1);
 	int64		result;
 
-	result = arg1 * arg2;
-
-	/*
-	 * Overflow check.  We basically check to see if result / arg2 gives arg1
-	 * again.  There is one case where this fails: arg2 = 0 (which cannot
-	 * overflow).
-	 *
-	 * Since the division is likely much more expensive than the actual
-	 * multiplication, we'd like to skip it where possible.  The best bang for
-	 * the buck seems to be to check whether both inputs are in the int32
-	 * range; if so, no overflow is possible.
-	 */
-	if (arg2 != (int64) ((int32) arg2) &&
-		result / arg2 != arg1)
+	if (unlikely(pg_mul_s64_overflow((int64) arg1, arg2, &result)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
@@ -1195,7 +1065,7 @@ int28div(PG_FUNCTION_ARGS)
 	int16		arg1 = PG_GETARG_INT16(0);
 	int64		arg2 = PG_GETARG_INT64(1);
 
-	if (arg2 == 0)
+	if (unlikely(arg2 == 0))
 	{
 		ereport(ERROR,
 				(errcode(ERRCODE_DIVISION_BY_ZERO),
@@ -1287,17 +1157,13 @@ Datum
 int84(PG_FUNCTION_ARGS)
 {
 	int64		arg = PG_GETARG_INT64(0);
-	int32		result;
-
-	result = (int32) arg;
 
-	/* Test for overflow by reverse-conversion. */
-	if ((int64) result != arg)
+	if (unlikely(arg < PG_INT32_MIN) || unlikely(arg > PG_INT32_MAX))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
 
-	PG_RETURN_INT32(result);
+	PG_RETURN_INT32((int32) arg);
 }
 
 Datum
@@ -1312,17 +1178,13 @@ Datum
 int82(PG_FUNCTION_ARGS)
 {
 	int64		arg = PG_GETARG_INT64(0);
-	int16		result;
 
-	result = (int16) arg;
-
-	/* Test for overflow by reverse-conversion. */
-	if ((int64) result != arg)
+	if (unlikely(arg < PG_INT16_MIN) || unlikely(arg > PG_INT16_MAX))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("smallint out of range")));
 
-	PG_RETURN_INT16(result);
+	PG_RETURN_INT16((int16) arg);
 }
 
 Datum
@@ -1348,18 +1210,15 @@ dtoi8(PG_FUNCTION_ARGS)
 	/* Round arg to nearest integer (but it's still in float form) */
 	arg = rint(arg);
 
-	/*
-	 * Does it fit in an int64?  Avoid assuming that we have handy constants
-	 * defined for the range boundaries, instead test for overflow by
-	 * reverse-conversion.
-	 */
-	result = (int64) arg;
-
-	if ((float8) result != arg)
+	if (unlikely(arg < (double) PG_INT64_MIN) ||
+		unlikely(arg > (double) PG_INT64_MAX) ||
+		unlikely(isnan(arg)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
 
+	result = (int64) arg;
+
 	PG_RETURN_INT64(result);
 }
 
@@ -1381,42 +1240,32 @@ Datum
 ftoi8(PG_FUNCTION_ARGS)
 {
 	float4		arg = PG_GETARG_FLOAT4(0);
-	int64		result;
 	float8		darg;
 
 	/* Round arg to nearest integer (but it's still in float form) */
 	darg = rint(arg);
 
-	/*
-	 * Does it fit in an int64?  Avoid assuming that we have handy constants
-	 * defined for the range boundaries, instead test for overflow by
-	 * reverse-conversion.
-	 */
-	result = (int64) darg;
-
-	if ((float8) result != darg)
+	if (unlikely(arg < (float4) PG_INT64_MIN) ||
+		unlikely(arg > (float4) PG_INT64_MAX) ||
+		unlikely(isnan(arg)))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("bigint out of range")));
 
-	PG_RETURN_INT64(result);
+	PG_RETURN_INT64((int64) darg);
 }
 
 Datum
 i8tooid(PG_FUNCTION_ARGS)
 {
 	int64		arg = PG_GETARG_INT64(0);
-	Oid			result;
 
-	result = (Oid) arg;
-
-	/* Test for overflow by reverse-conversion. */
-	if ((int64) result != arg)
+	if (unlikely(arg < 0) || unlikely(arg > PG_UINT32_MAX))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("OID out of range")));
 
-	PG_RETURN_OID(result);
+	PG_RETURN_OID((Oid) arg);
 }
 
 Datum
@@ -1494,11 +1343,11 @@ generate_series_step_int8(PG_FUNCTION_ARGS)
 	if ((fctx->step > 0 && fctx->current <= fctx->finish) ||
 		(fctx->step < 0 && fctx->current >= fctx->finish))
 	{
-		/* increment current in preparation for next iteration */
-		fctx->current += fctx->step;
-
-		/* if next-value computation overflows, this is the final result */
-		if (SAMESIGN(result, fctx->step) && !SAMESIGN(result, fctx->current))
+		/*
+		 * Increment current in preparation for next iteration. If next-value
+		 * computation overflows, this is the final result.
+		 */
+		if (pg_add_s64_overflow(fctx->current, fctx->step, &fctx->current))
 			fctx->step = 0;
 
 		/* do when there is more left to send */
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index 4dd7d977e8..6f0fe94d63 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -3,7 +3,7 @@
  * json.c
  *		JSON data type support.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -17,6 +17,7 @@
 #include "access/transam.h"
 #include "catalog/pg_type.h"
 #include "executor/spi.h"
+#include "funcapi.h"
 #include "lib/stringinfo.h"
 #include "libpq/pqformat.h"
 #include "mb/pg_wchar.h"
@@ -83,8 +84,8 @@ static void parse_object_field(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_object(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_array_element(JsonLexContext *lex, JsonSemAction *sem);
 static void parse_array(JsonLexContext *lex, JsonSemAction *sem);
-static void report_parse_error(JsonParseContext ctx, JsonLexContext *lex);
-static void report_invalid_token(JsonLexContext *lex);
+static void report_parse_error(JsonParseContext ctx, JsonLexContext *lex) pg_attribute_noreturn();
+static void report_invalid_token(JsonLexContext *lex) pg_attribute_noreturn();
 static int	report_json_context(JsonLexContext *lex);
 static char *extract_mb_char(char *s);
 static void composite_to_json(Datum composite, StringInfo result,
@@ -1502,12 +1503,70 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 			pfree(outputstr);
 			break;
 		case JSONTYPE_DATE:
+			{
+				char		buf[MAXDATELEN + 1];
+
+				JsonEncodeDateTime(buf, val, DATEOID);
+				appendStringInfo(result, "\"%s\"", buf);
+			}
+			break;
+		case JSONTYPE_TIMESTAMP:
+			{
+				char		buf[MAXDATELEN + 1];
+
+				JsonEncodeDateTime(buf, val, TIMESTAMPOID);
+				appendStringInfo(result, "\"%s\"", buf);
+			}
+			break;
+		case JSONTYPE_TIMESTAMPTZ:
+			{
+				char		buf[MAXDATELEN + 1];
+
+				JsonEncodeDateTime(buf, val, TIMESTAMPTZOID);
+				appendStringInfo(result, "\"%s\"", buf);
+			}
+			break;
+		case JSONTYPE_JSON:
+			/* JSON and JSONB output will already be escaped */
+			outputstr = OidOutputFunctionCall(outfuncoid, val);
+			appendStringInfoString(result, outputstr);
+			pfree(outputstr);
+			break;
+		case JSONTYPE_CAST:
+			/* outfuncoid refers to a cast function, not an output function */
+			jsontext = DatumGetTextPP(OidFunctionCall1(outfuncoid, val));
+			outputstr = text_to_cstring(jsontext);
+			appendStringInfoString(result, outputstr);
+			pfree(outputstr);
+			pfree(jsontext);
+			break;
+		default:
+			outputstr = OidOutputFunctionCall(outfuncoid, val);
+			escape_json(result, outputstr);
+			pfree(outputstr);
+			break;
+	}
+}
+
+/*
+ * Encode 'value' of datetime type 'typid' into JSON string in ISO format using
+ * optionally preallocated buffer 'buf'.
+ */
+char *
+JsonEncodeDateTime(char *buf, Datum value, Oid typid)
+{
+	if (!buf)
+		buf = palloc(MAXDATELEN + 1);
+
+	switch (typid)
+	{
+		case DATEOID:
 			{
 				DateADT		date;
 				struct pg_tm tm;
-				char		buf[MAXDATELEN + 1];
 
-				date = DatumGetDateADT(val);
+				date = DatumGetDateADT(value);
+
 				/* Same as date_out(), but forcing DateStyle */
 				if (DATE_NOT_FINITE(date))
 					EncodeSpecialDate(date, buf);
@@ -1517,17 +1576,40 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 						   &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
 					EncodeDateOnly(&tm, USE_XSD_DATES, buf);
 				}
-				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
-		case JSONTYPE_TIMESTAMP:
+		case TIMEOID:
+			{
+				TimeADT		time = DatumGetTimeADT(value);
+				struct pg_tm tt,
+						   *tm = &tt;
+				fsec_t		fsec;
+
+				/* Same as time_out(), but forcing DateStyle */
+				time2tm(time, tm, &fsec);
+				EncodeTimeOnly(tm, fsec, false, 0, USE_XSD_DATES, buf);
+			}
+			break;
+		case TIMETZOID:
+			{
+				TimeTzADT  *time = DatumGetTimeTzADTP(value);
+				struct pg_tm tt,
+						   *tm = &tt;
+				fsec_t		fsec;
+				int			tz;
+
+				/* Same as timetz_out(), but forcing DateStyle */
+				timetz2tm(time, tm, &fsec, &tz);
+				EncodeTimeOnly(tm, fsec, true, tz, USE_XSD_DATES, buf);
+			}
+			break;
+		case TIMESTAMPOID:
 			{
 				Timestamp	timestamp;
 				struct pg_tm tm;
 				fsec_t		fsec;
-				char		buf[MAXDATELEN + 1];
 
-				timestamp = DatumGetTimestamp(val);
+				timestamp = DatumGetTimestamp(value);
 				/* Same as timestamp_out(), but forcing DateStyle */
 				if (TIMESTAMP_NOT_FINITE(timestamp))
 					EncodeSpecialTimestamp(timestamp, buf);
@@ -1537,19 +1619,17 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 					ereport(ERROR,
 							(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 							 errmsg("timestamp out of range")));
-				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
-		case JSONTYPE_TIMESTAMPTZ:
+		case TIMESTAMPTZOID:
 			{
 				TimestampTz timestamp;
 				struct pg_tm tm;
 				int			tz;
 				fsec_t		fsec;
 				const char *tzn = NULL;
-				char		buf[MAXDATELEN + 1];
 
-				timestamp = DatumGetTimestampTz(val);
+				timestamp = DatumGetTimestampTz(value);
 				/* Same as timestamptz_out(), but forcing DateStyle */
 				if (TIMESTAMP_NOT_FINITE(timestamp))
 					EncodeSpecialTimestamp(timestamp, buf);
@@ -1559,29 +1639,14 @@ datum_to_json(Datum val, bool is_null, StringInfo result,
 					ereport(ERROR,
 							(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
 							 errmsg("timestamp out of range")));
-				appendStringInfo(result, "\"%s\"", buf);
 			}
 			break;
-		case JSONTYPE_JSON:
-			/* JSON and JSONB output will already be escaped */
-			outputstr = OidOutputFunctionCall(outfuncoid, val);
-			appendStringInfoString(result, outputstr);
-			pfree(outputstr);
-			break;
-		case JSONTYPE_CAST:
-			/* outfuncoid refers to a cast function, not an output function */
-			jsontext = DatumGetTextPP(OidFunctionCall1(outfuncoid, val));
-			outputstr = text_to_cstring(jsontext);
-			appendStringInfoString(result, outputstr);
-			pfree(outputstr);
-			pfree(jsontext);
-			break;
 		default:
-			outputstr = OidOutputFunctionCall(outfuncoid, val);
-			escape_json(result, outputstr);
-			pfree(outputstr);
-			break;
+			elog(ERROR, "unknown jsonb value datetime type oid %d", typid);
+			return NULL;
 	}
+
+	return buf;
 }
 
 /*
@@ -1714,15 +1779,16 @@ composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
 		char	   *attname;
 		JsonTypeCategory tcategory;
 		Oid			outfuncoid;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		if (needsep)
 			appendStringInfoString(result, sep);
 		needsep = true;
 
-		attname = NameStr(tupdesc->attrs[i]->attname);
+		attname = NameStr(att->attname);
 		escape_json(result, attname);
 		appendStringInfoChar(result, ':');
 
@@ -1734,8 +1800,7 @@ composite_to_json(Datum composite, StringInfo result, bool use_line_feeds)
 			outfuncoid = InvalidOid;
 		}
 		else
-			json_categorize_type(tupdesc->attrs[i]->atttypid,
-								 &tcategory, &outfuncoid);
+			json_categorize_type(att->atttypid, &tcategory, &outfuncoid);
 
 		datum_to_json(val, isnull, result, tcategory, outfuncoid, false);
 	}
@@ -1778,7 +1843,7 @@ add_json(Datum val, bool is_null, StringInfo result,
 /*
  * SQL function array_to_json(row)
  */
-extern Datum
+Datum
 array_to_json(PG_FUNCTION_ARGS)
 {
 	Datum		array = PG_GETARG_DATUM(0);
@@ -1794,7 +1859,7 @@ array_to_json(PG_FUNCTION_ARGS)
 /*
  * SQL function array_to_json(row, prettybool)
  */
-extern Datum
+Datum
 array_to_json_pretty(PG_FUNCTION_ARGS)
 {
 	Datum		array = PG_GETARG_DATUM(0);
@@ -1811,7 +1876,7 @@ array_to_json_pretty(PG_FUNCTION_ARGS)
 /*
  * SQL function row_to_json(row)
  */
-extern Datum
+Datum
 row_to_json(PG_FUNCTION_ARGS)
 {
 	Datum		array = PG_GETARG_DATUM(0);
@@ -1827,7 +1892,7 @@ row_to_json(PG_FUNCTION_ARGS)
 /*
  * SQL function row_to_json(row, prettybool)
  */
-extern Datum
+Datum
 row_to_json_pretty(PG_FUNCTION_ARGS)
 {
 	Datum		array = PG_GETARG_DATUM(0);
@@ -1939,7 +2004,7 @@ json_agg_transfn(PG_FUNCTION_ARGS)
 				  state->val_output_func, false);
 
 	/*
-	 * The transition type for array_agg() is declared to be "internal", which
+	 * The transition type for json_agg() is declared to be "internal", which
 	 * is a pass-by-value type the same size as a pointer.  So we can safely
 	 * pass the JsonAggState pointer through nodeAgg.c's machinations.
 	 */
@@ -2111,10 +2176,17 @@ json_build_object(PG_FUNCTION_ARGS)
 {
 	int			nargs = PG_NARGS();
 	int			i;
-	Datum		arg;
 	const char *sep = "";
 	StringInfo	result;
-	Oid			val_type;
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+
+	/* fetch argument values to build the object */
+	nargs = extract_variadic_args(fcinfo, 0, false, &args, &types, &nulls);
+
+	if (nargs < 0)
+		PG_RETURN_NULL();
 
 	if (nargs % 2 != 0)
 		ereport(ERROR,
@@ -2128,52 +2200,22 @@ json_build_object(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < nargs; i += 2)
 	{
-		/*
-		 * Note: since json_build_object() is declared as taking type "any",
-		 * the parser will not do any type conversion on unknown-type literals
-		 * (that is, undecorated strings or NULLs).  Such values will arrive
-		 * here as type UNKNOWN, which fortunately does not matter to us,
-		 * since unknownout() works fine.
-		 */
 		appendStringInfoString(result, sep);
 		sep = ", ";
 
 		/* process key */
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
-
-		if (val_type == InvalidOid)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d",
-							i + 1)));
-
-		if (PG_ARGISNULL(i))
+		if (nulls[i])
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("argument %d cannot be null", i + 1),
 					 errhint("Object keys should be text.")));
 
-		arg = PG_GETARG_DATUM(i);
-
-		add_json(arg, false, result, val_type, true);
+		add_json(args[i], false, result, types[i], true);
 
 		appendStringInfoString(result, " : ");
 
 		/* process value */
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i + 1);
-
-		if (val_type == InvalidOid)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d",
-							i + 2)));
-
-		if (PG_ARGISNULL(i + 1))
-			arg = (Datum) 0;
-		else
-			arg = PG_GETARG_DATUM(i + 1);
-
-		add_json(arg, PG_ARGISNULL(i + 1), result, val_type, false);
+		add_json(args[i + 1], nulls[i + 1], result, types[i + 1], false);
 	}
 
 	appendStringInfoChar(result, '}');
@@ -2196,12 +2238,19 @@ json_build_object_noargs(PG_FUNCTION_ARGS)
 Datum
 json_build_array(PG_FUNCTION_ARGS)
 {
-	int			nargs = PG_NARGS();
+	int			nargs;
 	int			i;
-	Datum		arg;
 	const char *sep = "";
 	StringInfo	result;
-	Oid			val_type;
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+
+	/* fetch argument values to build the array */
+	nargs = extract_variadic_args(fcinfo, 0, false, &args, &types, &nulls);
+
+	if (nargs < 0)
+		PG_RETURN_NULL();
 
 	result = makeStringInfo();
 
@@ -2209,30 +2258,9 @@ json_build_array(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < nargs; i++)
 	{
-		/*
-		 * Note: since json_build_array() is declared as taking type "any",
-		 * the parser will not do any type conversion on unknown-type literals
-		 * (that is, undecorated strings or NULLs).  Such values will arrive
-		 * here as type UNKNOWN, which fortunately does not matter to us,
-		 * since unknownout() works fine.
-		 */
 		appendStringInfoString(result, sep);
 		sep = ", ";
-
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
-
-		if (val_type == InvalidOid)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d",
-							i + 1)));
-
-		if (PG_ARGISNULL(i))
-			arg = (Datum) 0;
-		else
-			arg = PG_GETARG_DATUM(i);
-
-		add_json(arg, PG_ARGISNULL(i), result, val_type, false);
+		add_json(args[i], nulls[i], result, types[i], false);
 	}
 
 	appendStringInfoChar(result, ']');
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 49f41f9f99..0f70180164 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -3,7 +3,7 @@
  * jsonb.c
  *		I/O routines for jsonb type
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/jsonb.c
@@ -16,6 +16,7 @@
 #include "access/htup_details.h"
 #include "access/transam.h"
 #include "catalog/pg_type.h"
+#include "funcapi.h"
 #include "libpq/pqformat.h"
 #include "parser/parse_coerce.h"
 #include "utils/builtins.h"
@@ -130,7 +131,7 @@ jsonb_recv(PG_FUNCTION_ARGS)
 Datum
 jsonb_out(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	char	   *out;
 
 	out = JsonbToCString(NULL, &jb->root, VARSIZE(jb));
@@ -146,7 +147,7 @@ jsonb_out(PG_FUNCTION_ARGS)
 Datum
 jsonb_send(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	StringInfoData buf;
 	StringInfo	jtext = makeStringInfo();
 	int			version = 1;
@@ -154,7 +155,7 @@ jsonb_send(PG_FUNCTION_ARGS)
 	(void) JsonbToCString(jtext, &jb->root, VARSIZE(jb));
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, version, 1);
+	pq_sendint8(&buf, version);
 	pq_sendtext(&buf, jtext->data, jtext->len);
 	pfree(jtext->data);
 	pfree(jtext);
@@ -171,7 +172,7 @@ jsonb_send(PG_FUNCTION_ARGS)
 Datum
 jsonb_typeof(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	JsonbIterator *it;
 	JsonbValue	v;
 	char	   *result;
@@ -785,71 +786,19 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 				}
 				break;
 			case JSONBTYPE_DATE:
-				{
-					DateADT		date;
-					struct pg_tm tm;
-					char		buf[MAXDATELEN + 1];
-
-					date = DatumGetDateADT(val);
-					/* Same as date_out(), but forcing DateStyle */
-					if (DATE_NOT_FINITE(date))
-						EncodeSpecialDate(date, buf);
-					else
-					{
-						j2date(date + POSTGRES_EPOCH_JDATE,
-							   &(tm.tm_year), &(tm.tm_mon), &(tm.tm_mday));
-						EncodeDateOnly(&tm, USE_XSD_DATES, buf);
-					}
-					jb.type = jbvString;
-					jb.val.string.len = strlen(buf);
-					jb.val.string.val = pstrdup(buf);
-				}
+				jb.type = jbvString;
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, DATEOID);
+				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_TIMESTAMP:
-				{
-					Timestamp	timestamp;
-					struct pg_tm tm;
-					fsec_t		fsec;
-					char		buf[MAXDATELEN + 1];
-
-					timestamp = DatumGetTimestamp(val);
-					/* Same as timestamp_out(), but forcing DateStyle */
-					if (TIMESTAMP_NOT_FINITE(timestamp))
-						EncodeSpecialTimestamp(timestamp, buf);
-					else if (timestamp2tm(timestamp, NULL, &tm, &fsec, NULL, NULL) == 0)
-						EncodeDateTime(&tm, fsec, false, 0, NULL, USE_XSD_DATES, buf);
-					else
-						ereport(ERROR,
-								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("timestamp out of range")));
-					jb.type = jbvString;
-					jb.val.string.len = strlen(buf);
-					jb.val.string.val = pstrdup(buf);
-				}
+				jb.type = jbvString;
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPOID);
+				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_TIMESTAMPTZ:
-				{
-					TimestampTz timestamp;
-					struct pg_tm tm;
-					int			tz;
-					fsec_t		fsec;
-					const char *tzn = NULL;
-					char		buf[MAXDATELEN + 1];
-
-					timestamp = DatumGetTimestampTz(val);
-					/* Same as timestamptz_out(), but forcing DateStyle */
-					if (TIMESTAMP_NOT_FINITE(timestamp))
-						EncodeSpecialTimestamp(timestamp, buf);
-					else if (timestamp2tm(timestamp, &tz, &tm, &fsec, &tzn, NULL) == 0)
-						EncodeDateTime(&tm, fsec, true, tz, tzn, USE_XSD_DATES, buf);
-					else
-						ereport(ERROR,
-								(errcode(ERRCODE_DATETIME_VALUE_OUT_OF_RANGE),
-								 errmsg("timestamp out of range")));
-					jb.type = jbvString;
-					jb.val.string.len = strlen(buf);
-					jb.val.string.val = pstrdup(buf);
-				}
+				jb.type = jbvString;
+				jb.val.string.val = JsonEncodeDateTime(NULL, val, TIMESTAMPTZOID);
+				jb.val.string.len = strlen(jb.val.string.val);
 				break;
 			case JSONBTYPE_JSONCAST:
 			case JSONBTYPE_JSON:
@@ -878,7 +827,7 @@ datum_to_jsonb(Datum val, bool is_null, JsonbInState *result,
 				break;
 			case JSONBTYPE_JSONB:
 				{
-					Jsonb	   *jsonb = DatumGetJsonb(val);
+					Jsonb	   *jsonb = DatumGetJsonbP(val);
 					JsonbIterator *it;
 
 					it = JsonbIteratorInit(&jsonb->root);
@@ -1075,11 +1024,12 @@ composite_to_jsonb(Datum composite, JsonbInState *result)
 		JsonbTypeCategory tcategory;
 		Oid			outfuncoid;
 		JsonbValue	v;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
-		attname = NameStr(tupdesc->attrs[i]->attname);
+		attname = NameStr(att->attname);
 
 		v.type = jbvString;
 		/* don't need checkStringLen here - can't exceed maximum name length */
@@ -1096,8 +1046,7 @@ composite_to_jsonb(Datum composite, JsonbInState *result)
 			outfuncoid = InvalidOid;
 		}
 		else
-			jsonb_categorize_type(tupdesc->attrs[i]->atttypid,
-								  &tcategory, &outfuncoid);
+			jsonb_categorize_type(att->atttypid, &tcategory, &outfuncoid);
 
 		datum_to_jsonb(val, isnull, result, tcategory, outfuncoid, false);
 	}
@@ -1171,16 +1120,24 @@ to_jsonb(PG_FUNCTION_ARGS)
 Datum
 jsonb_build_object(PG_FUNCTION_ARGS)
 {
-	int			nargs = PG_NARGS();
+	int			nargs;
 	int			i;
-	Datum		arg;
-	Oid			val_type;
 	JsonbInState result;
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+
+	/* build argument values to build the object */
+	nargs = extract_variadic_args(fcinfo, 0, true, &args, &types, &nulls);
+
+	if (nargs < 0)
+		PG_RETURN_NULL();
 
 	if (nargs % 2 != 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("invalid number of arguments: object must be matched key value pairs")));
+				 errmsg("argument list must have even number of elements"),
+				 errhint("The arguments of jsonb_build_object() must consist of alternating keys and values.")));
 
 	memset(&result, 0, sizeof(JsonbInState));
 
@@ -1189,54 +1146,15 @@ jsonb_build_object(PG_FUNCTION_ARGS)
 	for (i = 0; i < nargs; i += 2)
 	{
 		/* process key */
-
-		if (PG_ARGISNULL(i))
+		if (nulls[i])
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
 					 errmsg("argument %d: key must not be null", i + 1)));
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
 
-		/*
-		 * turn a constant (more or less literal) value that's of unknown type
-		 * into text. Unknowns come in as a cstring pointer.
-		 */
-		if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i))
-		{
-			val_type = TEXTOID;
-			arg = CStringGetTextDatum(PG_GETARG_POINTER(i));
-		}
-		else
-		{
-			arg = PG_GETARG_DATUM(i);
-		}
-		if (val_type == InvalidOid || val_type == UNKNOWNOID)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d", i + 1)));
-
-		add_jsonb(arg, false, &result, val_type, true);
+		add_jsonb(args[i], false, &result, types[i], true);
 
 		/* process value */
-
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i + 1);
-		/* see comments above */
-		if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i + 1))
-		{
-			val_type = TEXTOID;
-			if (PG_ARGISNULL(i + 1))
-				arg = (Datum) 0;
-			else
-				arg = CStringGetTextDatum(PG_GETARG_POINTER(i + 1));
-		}
-		else
-		{
-			arg = PG_GETARG_DATUM(i + 1);
-		}
-		if (val_type == InvalidOid || val_type == UNKNOWNOID)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d", i + 2)));
-		add_jsonb(arg, PG_ARGISNULL(i + 1), &result, val_type, false);
+		add_jsonb(args[i + 1], nulls[i + 1], &result, types[i + 1], false);
 	}
 
 	result.res = pushJsonbValue(&result.parseState, WJB_END_OBJECT, NULL);
@@ -1266,38 +1184,25 @@ jsonb_build_object_noargs(PG_FUNCTION_ARGS)
 Datum
 jsonb_build_array(PG_FUNCTION_ARGS)
 {
-	int			nargs = PG_NARGS();
+	int			nargs;
 	int			i;
-	Datum		arg;
-	Oid			val_type;
 	JsonbInState result;
+	Datum	   *args;
+	bool	   *nulls;
+	Oid		   *types;
+
+	/* build argument values to build the array */
+	nargs = extract_variadic_args(fcinfo, 0, true, &args, &types, &nulls);
+
+	if (nargs < 0)
+		PG_RETURN_NULL();
 
 	memset(&result, 0, sizeof(JsonbInState));
 
 	result.res = pushJsonbValue(&result.parseState, WJB_BEGIN_ARRAY, NULL);
 
 	for (i = 0; i < nargs; i++)
-	{
-		val_type = get_fn_expr_argtype(fcinfo->flinfo, i);
-		/* see comments in jsonb_build_object above */
-		if (val_type == UNKNOWNOID && get_fn_expr_arg_stable(fcinfo->flinfo, i))
-		{
-			val_type = TEXTOID;
-			if (PG_ARGISNULL(i))
-				arg = (Datum) 0;
-			else
-				arg = CStringGetTextDatum(PG_GETARG_POINTER(i));
-		}
-		else
-		{
-			arg = PG_GETARG_DATUM(i);
-		}
-		if (val_type == InvalidOid || val_type == UNKNOWNOID)
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-					 errmsg("could not determine data type for argument %d", i + 1)));
-		add_jsonb(arg, PG_ARGISNULL(i), &result, val_type, false);
-	}
+		add_jsonb(args[i], nulls[i], &result, types[i], false);
 
 	result.res = pushJsonbValue(&result.parseState, WJB_END_ARRAY, NULL);
 
diff --git a/src/backend/utils/adt/jsonb_gin.c b/src/backend/utils/adt/jsonb_gin.c
index 8e8e8fd850..c8a27451d2 100644
--- a/src/backend/utils/adt/jsonb_gin.c
+++ b/src/backend/utils/adt/jsonb_gin.c
@@ -3,7 +3,7 @@
  * jsonb_gin.c
  *	 GIN support functions for jsonb
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -66,7 +66,7 @@ gin_compare_jsonb(PG_FUNCTION_ARGS)
 Datum
 gin_extract_jsonb(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = (Jsonb *) PG_GETARG_JSONB(0);
+	Jsonb	   *jb = (Jsonb *) PG_GETARG_JSONB_P(0);
 	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
 	int			total = 2 * JB_ROOT_COUNT(jb);
 	JsonbIterator *it;
@@ -196,7 +196,7 @@ gin_consistent_jsonb(PG_FUNCTION_ARGS)
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
 
-	/* Jsonb	   *query = PG_GETARG_JSONB(2); */
+	/* Jsonb	   *query = PG_GETARG_JSONB_P(2); */
 	int32		nkeys = PG_GETARG_INT32(3);
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
@@ -268,7 +268,7 @@ gin_triconsistent_jsonb(PG_FUNCTION_ARGS)
 	GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
 
-	/* Jsonb	   *query = PG_GETARG_JSONB(2); */
+	/* Jsonb	   *query = PG_GETARG_JSONB_P(2); */
 	int32		nkeys = PG_GETARG_INT32(3);
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
@@ -329,7 +329,7 @@ gin_triconsistent_jsonb(PG_FUNCTION_ARGS)
 Datum
 gin_extract_jsonb_path(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	int32	   *nentries = (int32 *) PG_GETARG_POINTER(1);
 	int			total = 2 * JB_ROOT_COUNT(jb);
 	JsonbIterator *it;
@@ -454,7 +454,7 @@ gin_consistent_jsonb_path(PG_FUNCTION_ARGS)
 	bool	   *check = (bool *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
 
-	/* Jsonb	   *query = PG_GETARG_JSONB(2); */
+	/* Jsonb	   *query = PG_GETARG_JSONB_P(2); */
 	int32		nkeys = PG_GETARG_INT32(3);
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
@@ -492,7 +492,7 @@ gin_triconsistent_jsonb_path(PG_FUNCTION_ARGS)
 	GinTernaryValue *check = (GinTernaryValue *) PG_GETARG_POINTER(0);
 	StrategyNumber strategy = PG_GETARG_UINT16(1);
 
-	/* Jsonb	   *query = PG_GETARG_JSONB(2); */
+	/* Jsonb	   *query = PG_GETARG_JSONB_P(2); */
 	int32		nkeys = PG_GETARG_INT32(3);
 
 	/* Pointer	   *extra_data = (Pointer *) PG_GETARG_POINTER(4); */
diff --git a/src/backend/utils/adt/jsonb_op.c b/src/backend/utils/adt/jsonb_op.c
index d4c490e948..4e86dfde93 100644
--- a/src/backend/utils/adt/jsonb_op.c
+++ b/src/backend/utils/adt/jsonb_op.c
@@ -3,7 +3,7 @@
  * jsonb_op.c
  *	 Special operators for jsonb only, used by various index access methods
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -21,7 +21,7 @@
 Datum
 jsonb_exists(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue	kval;
 	JsonbValue *v = NULL;
@@ -46,7 +46,7 @@ jsonb_exists(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_any(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
 	int			i;
 	Datum	   *key_datums;
@@ -79,7 +79,7 @@ jsonb_exists_any(PG_FUNCTION_ARGS)
 Datum
 jsonb_exists_all(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
 	int			i;
 	Datum	   *key_datums;
@@ -112,8 +112,8 @@ jsonb_exists_all(PG_FUNCTION_ARGS)
 Datum
 jsonb_contains(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *val = PG_GETARG_JSONB(0);
-	Jsonb	   *tmpl = PG_GETARG_JSONB(1);
+	Jsonb	   *val = PG_GETARG_JSONB_P(0);
+	Jsonb	   *tmpl = PG_GETARG_JSONB_P(1);
 
 	JsonbIterator *it1,
 			   *it2;
@@ -131,8 +131,8 @@ Datum
 jsonb_contained(PG_FUNCTION_ARGS)
 {
 	/* Commutator of "contains" */
-	Jsonb	   *tmpl = PG_GETARG_JSONB(0);
-	Jsonb	   *val = PG_GETARG_JSONB(1);
+	Jsonb	   *tmpl = PG_GETARG_JSONB_P(0);
+	Jsonb	   *val = PG_GETARG_JSONB_P(1);
 
 	JsonbIterator *it1,
 			   *it2;
@@ -149,8 +149,8 @@ jsonb_contained(PG_FUNCTION_ARGS)
 Datum
 jsonb_ne(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) != 0);
@@ -166,8 +166,8 @@ jsonb_ne(PG_FUNCTION_ARGS)
 Datum
 jsonb_lt(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) < 0);
@@ -180,8 +180,8 @@ jsonb_lt(PG_FUNCTION_ARGS)
 Datum
 jsonb_gt(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) > 0);
@@ -194,8 +194,8 @@ jsonb_gt(PG_FUNCTION_ARGS)
 Datum
 jsonb_le(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) <= 0);
@@ -208,8 +208,8 @@ jsonb_le(PG_FUNCTION_ARGS)
 Datum
 jsonb_ge(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) >= 0);
@@ -222,8 +222,8 @@ jsonb_ge(PG_FUNCTION_ARGS)
 Datum
 jsonb_eq(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	bool		res;
 
 	res = (compareJsonbContainers(&jba->root, &jbb->root) == 0);
@@ -236,8 +236,8 @@ jsonb_eq(PG_FUNCTION_ARGS)
 Datum
 jsonb_cmp(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jba = PG_GETARG_JSONB(0);
-	Jsonb	   *jbb = PG_GETARG_JSONB(1);
+	Jsonb	   *jba = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jbb = PG_GETARG_JSONB_P(1);
 	int			res;
 
 	res = compareJsonbContainers(&jba->root, &jbb->root);
@@ -253,7 +253,7 @@ jsonb_cmp(PG_FUNCTION_ARGS)
 Datum
 jsonb_hash(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	JsonbIterator *it;
 	JsonbValue	v;
 	JsonbIteratorToken r;
@@ -291,3 +291,46 @@ jsonb_hash(PG_FUNCTION_ARGS)
 	PG_FREE_IF_COPY(jb, 0);
 	PG_RETURN_INT32(hash);
 }
+
+Datum
+jsonb_hash_extended(PG_FUNCTION_ARGS)
+{
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
+	uint64		seed = PG_GETARG_INT64(1);
+	JsonbIterator *it;
+	JsonbValue	v;
+	JsonbIteratorToken r;
+	uint64		hash = 0;
+
+	if (JB_ROOT_COUNT(jb) == 0)
+		PG_RETURN_UINT64(seed);
+
+	it = JsonbIteratorInit(&jb->root);
+
+	while ((r = JsonbIteratorNext(&it, &v, false)) != WJB_DONE)
+	{
+		switch (r)
+		{
+				/* Rotation is left to JsonbHashScalarValueExtended() */
+			case WJB_BEGIN_ARRAY:
+				hash ^= ((uint64) JB_FARRAY) << 32 | JB_FARRAY;
+				break;
+			case WJB_BEGIN_OBJECT:
+				hash ^= ((uint64) JB_FOBJECT) << 32 | JB_FOBJECT;
+				break;
+			case WJB_KEY:
+			case WJB_VALUE:
+			case WJB_ELEM:
+				JsonbHashScalarValueExtended(&v, &hash, seed);
+				break;
+			case WJB_END_ARRAY:
+			case WJB_END_OBJECT:
+				break;
+			default:
+				elog(ERROR, "invalid JsonbIteratorNext rc: %d", (int) r);
+		}
+	}
+
+	PG_FREE_IF_COPY(jb, 0);
+	PG_RETURN_UINT64(hash);
+}
diff --git a/src/backend/utils/adt/jsonb_util.c b/src/backend/utils/adt/jsonb_util.c
index 4850569bb5..2524584d95 100644
--- a/src/backend/utils/adt/jsonb_util.c
+++ b/src/backend/utils/adt/jsonb_util.c
@@ -3,7 +3,7 @@
  * jsonb_util.c
  *	  converting between Jsonb and JsonbValues, and iterating.
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -1249,6 +1249,49 @@ JsonbHashScalarValue(const JsonbValue *scalarVal, uint32 *hash)
 	*hash ^= tmp;
 }
 
+/*
+ * Hash a value to a 64-bit value, with a seed. Otherwise, similar to
+ * JsonbHashScalarValue.
+ */
+void
+JsonbHashScalarValueExtended(const JsonbValue *scalarVal, uint64 *hash,
+							 uint64 seed)
+{
+	uint64		tmp;
+
+	switch (scalarVal->type)
+	{
+		case jbvNull:
+			tmp = seed + 0x01;
+			break;
+		case jbvString:
+			tmp = DatumGetUInt64(hash_any_extended((const unsigned char *) scalarVal->val.string.val,
+												   scalarVal->val.string.len,
+												   seed));
+			break;
+		case jbvNumeric:
+			tmp = DatumGetUInt64(DirectFunctionCall2(hash_numeric_extended,
+													 NumericGetDatum(scalarVal->val.numeric),
+													 UInt64GetDatum(seed)));
+			break;
+		case jbvBool:
+			if (seed)
+				tmp = DatumGetUInt64(DirectFunctionCall2(hashcharextended,
+														 BoolGetDatum(scalarVal->val.boolean),
+														 UInt64GetDatum(seed)));
+			else
+				tmp = scalarVal->val.boolean ? 0x02 : 0x04;
+
+			break;
+		default:
+			elog(ERROR, "invalid jsonb scalar type");
+			break;
+	}
+
+	*hash = ROTATE_HIGH_AND_LOW_32BITS(*hash);
+	*hash ^= tmp;
+}
+
 /*
  * Are two scalar JsonbValues of the same type a and b equal?
  */
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index 4779e74895..fa78451613 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -3,7 +3,7 @@
  * jsonfuncs.c
  *		Functions to process JSON data types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -169,6 +169,11 @@ typedef struct CompositeIOData
 	 */
 	RecordIOData *record_io;	/* metadata cache for populate_record() */
 	TupleDesc	tupdesc;		/* cached tuple descriptor */
+	/* these fields differ from target type only if domain over composite: */
+	Oid			base_typid;		/* base type id */
+	int32		base_typmod;	/* base type modifier */
+	/* this field is used only if target type is domain over composite: */
+	void	   *domain_info;	/* opaque cache for domain checks */
 } CompositeIOData;
 
 /* structure to cache metadata needed for populate_domain() */
@@ -186,6 +191,7 @@ typedef enum TypeCat
 	TYPECAT_SCALAR = 's',
 	TYPECAT_ARRAY = 'a',
 	TYPECAT_COMPOSITE = 'c',
+	TYPECAT_COMPOSITE_DOMAIN = 'C',
 	TYPECAT_DOMAIN = 'd'
 } TypeCat;
 
@@ -217,7 +223,15 @@ struct RecordIOData
 	ColumnIOData columns[FLEXIBLE_ARRAY_MEMBER];
 };
 
-/* state for populate_recordset */
+/* per-query cache for populate_recordset */
+typedef struct PopulateRecordsetCache
+{
+	Oid			argtype;		/* declared type of the record argument */
+	ColumnIOData c;				/* metadata cache for populate_composite() */
+	MemoryContext fn_mcxt;		/* where this is stored */
+} PopulateRecordsetCache;
+
+/* per-call state for populate_recordset */
 typedef struct PopulateRecordsetState
 {
 	JsonLexContext *lex;
@@ -227,17 +241,15 @@ typedef struct PopulateRecordsetState
 	char	   *save_json_start;
 	JsonTokenType saved_token_type;
 	Tuplestorestate *tuple_store;
-	TupleDesc	ret_tdesc;
 	HeapTupleHeader rec;
-	RecordIOData **my_extra;
-	MemoryContext fn_mcxt;		/* used to stash IO funcs */
+	PopulateRecordsetCache *cache;
 } PopulateRecordsetState;
 
 /* structure to cache metadata needed for populate_record_worker() */
 typedef struct PopulateRecordCache
 {
-	Oid			argtype;		/* verified row type of the first argument */
-	CompositeIOData io;			/* metadata cache for populate_composite() */
+	Oid			argtype;		/* declared type of the record argument */
+	ColumnIOData c;				/* metadata cache for populate_composite() */
 } PopulateRecordCache;
 
 /* common data for populate_array_json() and populate_array_dim_jsonb() */
@@ -415,16 +427,13 @@ static Datum populate_record_worker(FunctionCallInfo fcinfo, const char *funcnam
 static HeapTupleHeader populate_record(TupleDesc tupdesc, RecordIOData **record_p,
 				HeapTupleHeader defaultval, MemoryContext mcxt,
 				JsObject *obj);
-static Datum populate_record_field(ColumnIOData *col, Oid typid, int32 typmod,
-					  const char *colname, MemoryContext mcxt,
-					  Datum defaultval, JsValue *jsv, bool *isnull);
 static void JsValueToJsObject(JsValue *jsv, JsObject *jso);
-static Datum populate_composite(CompositeIOData *io, Oid typid, int32 typmod,
+static Datum populate_composite(CompositeIOData *io, Oid typid,
 				   const char *colname, MemoryContext mcxt,
-				   HeapTupleHeader defaultval, JsValue *jsv);
+				   HeapTupleHeader defaultval, JsValue *jsv, bool isnull);
 static Datum populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv);
 static void prepare_column_cache(ColumnIOData *column, Oid typid, int32 typmod,
-					 MemoryContext mcxt, bool json);
+					 MemoryContext mcxt, bool need_scalar);
 static Datum populate_record_field(ColumnIOData *col, Oid typid, int32 typmod,
 					  const char *colname, MemoryContext mcxt, Datum defaultval,
 					  JsValue *jsv, bool *isnull);
@@ -499,7 +508,7 @@ jsonb_object_keys(PG_FUNCTION_ARGS)
 	if (SRF_IS_FIRSTCALL())
 	{
 		MemoryContext oldcontext;
-		Jsonb	   *jb = PG_GETARG_JSONB(0);
+		Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 		bool		skipNested = false;
 		JsonbIterator *it;
 		JsonbValue	v;
@@ -703,7 +712,7 @@ json_object_field(PG_FUNCTION_ARGS)
 Datum
 jsonb_object_field(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue *v;
 
@@ -715,7 +724,7 @@ jsonb_object_field(PG_FUNCTION_ARGS)
 									   VARSIZE_ANY_EXHDR(key));
 
 	if (v != NULL)
-		PG_RETURN_JSONB(JsonbValueToJsonb(v));
+		PG_RETURN_JSONB_P(JsonbValueToJsonb(v));
 
 	PG_RETURN_NULL();
 }
@@ -739,7 +748,7 @@ json_object_field_text(PG_FUNCTION_ARGS)
 Datum
 jsonb_object_field_text(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	JsonbValue *v;
 
@@ -805,7 +814,7 @@ json_array_element(PG_FUNCTION_ARGS)
 Datum
 jsonb_array_element(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	int			element = PG_GETARG_INT32(1);
 	JsonbValue *v;
 
@@ -825,7 +834,7 @@ jsonb_array_element(PG_FUNCTION_ARGS)
 
 	v = getIthJsonbValueFromContainer(&jb->root, element);
 	if (v != NULL)
-		PG_RETURN_JSONB(JsonbValueToJsonb(v));
+		PG_RETURN_JSONB_P(JsonbValueToJsonb(v));
 
 	PG_RETURN_NULL();
 }
@@ -848,7 +857,7 @@ json_array_element_text(PG_FUNCTION_ARGS)
 Datum
 jsonb_array_element_text(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	int			element = PG_GETARG_INT32(1);
 	JsonbValue *v;
 
@@ -1375,7 +1384,7 @@ jsonb_extract_path_text(PG_FUNCTION_ARGS)
 static Datum
 get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
 	Jsonb	   *res;
 	Datum	   *pathtext;
@@ -1435,7 +1444,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 		else
 		{
 			/* not text mode - just hand back the jsonb */
-			PG_RETURN_JSONB(jb);
+			PG_RETURN_JSONB_P(jb);
 		}
 	}
 
@@ -1533,7 +1542,7 @@ get_jsonb_path_all(FunctionCallInfo fcinfo, bool as_text)
 	else
 	{
 		/* not text mode - just hand back the jsonb */
-		PG_RETURN_JSONB(res);
+		PG_RETURN_JSONB_P(res);
 	}
 }
 
@@ -1571,7 +1580,7 @@ json_array_length(PG_FUNCTION_ARGS)
 Datum
 jsonb_array_length(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 
 	if (JB_ROOT_IS_SCALAR(jb))
 		ereport(ERROR,
@@ -1661,7 +1670,7 @@ jsonb_each_text(PG_FUNCTION_ARGS)
 static Datum
 each_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname, bool as_text)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	ReturnSetInfo *rsi;
 	Tuplestorestate *tuple_store;
 	TupleDesc	tupdesc;
@@ -1976,7 +1985,7 @@ static Datum
 elements_worker_jsonb(FunctionCallInfo fcinfo, const char *funcname,
 					  bool as_text)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	ReturnSetInfo *rsi;
 	Tuplestorestate *tuple_store;
 	TupleDesc	tupdesc;
@@ -2314,7 +2323,7 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the value of key \"%s\"", ctx->colname)));
+					 errhint("See the value of key \"%s\".", ctx->colname)));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
@@ -2336,13 +2345,13 @@ populate_array_report_expected_array(PopulateArrayContext *ctx, int ndim)
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the array element %s of key \"%s\"",
+					 errhint("See the array element %s of key \"%s\".",
 							 indices.data, ctx->colname)));
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 					 errmsg("expected json array"),
-					 errhint("see the array element %s",
+					 errhint("See the array element %s.",
 							 indices.data)));
 	}
 }
@@ -2704,25 +2713,16 @@ JsValueToJsObject(JsValue *jsv, JsObject *jso)
 	}
 }
 
-/* recursively populate a composite (row type) value from json/jsonb */
-static Datum
-populate_composite(CompositeIOData *io,
-				   Oid typid,
-				   int32 typmod,
-				   const char *colname,
-				   MemoryContext mcxt,
-				   HeapTupleHeader defaultval,
-				   JsValue *jsv)
+/* acquire or update cached tuple descriptor for a composite type */
+static void
+update_cached_tupdesc(CompositeIOData *io, MemoryContext mcxt)
 {
-	HeapTupleHeader tuple;
-	JsObject	jso;
-
-	/* acquire cached tuple descriptor */
 	if (!io->tupdesc ||
-		io->tupdesc->tdtypeid != typid ||
-		io->tupdesc->tdtypmod != typmod)
+		io->tupdesc->tdtypeid != io->base_typid ||
+		io->tupdesc->tdtypmod != io->base_typmod)
 	{
-		TupleDesc	tupdesc = lookup_rowtype_tupdesc(typid, typmod);
+		TupleDesc	tupdesc = lookup_rowtype_tupdesc(io->base_typid,
+													 io->base_typmod);
 		MemoryContext oldcxt;
 
 		if (io->tupdesc)
@@ -2735,17 +2735,50 @@ populate_composite(CompositeIOData *io,
 
 		ReleaseTupleDesc(tupdesc);
 	}
+}
+
+/* recursively populate a composite (row type) value from json/jsonb */
+static Datum
+populate_composite(CompositeIOData *io,
+				   Oid typid,
+				   const char *colname,
+				   MemoryContext mcxt,
+				   HeapTupleHeader defaultval,
+				   JsValue *jsv,
+				   bool isnull)
+{
+	Datum		result;
 
-	/* prepare input value */
-	JsValueToJsObject(jsv, &jso);
+	/* acquire/update cached tuple descriptor */
+	update_cached_tupdesc(io, mcxt);
 
-	/* populate resulting record tuple */
-	tuple = populate_record(io->tupdesc, &io->record_io,
-							defaultval, mcxt, &jso);
+	if (isnull)
+		result = (Datum) 0;
+	else
+	{
+		HeapTupleHeader tuple;
+		JsObject	jso;
+
+		/* prepare input value */
+		JsValueToJsObject(jsv, &jso);
+
+		/* populate resulting record tuple */
+		tuple = populate_record(io->tupdesc, &io->record_io,
+								defaultval, mcxt, &jso);
+		result = HeapTupleHeaderGetDatum(tuple);
 
-	JsObjectFree(&jso);
+		JsObjectFree(&jso);
+	}
+
+	/*
+	 * If it's domain over composite, check domain constraints.  (This should
+	 * probably get refactored so that we can see the TYPECAT value, but for
+	 * now, we can tell by comparing typid to base_typid.)
+	 */
+	if (typid != io->base_typid && typid != RECORDOID)
+		domain_check(result, isnull, typid, &io->domain_info, mcxt);
 
-	return HeapTupleHeaderGetDatum(tuple);
+	return result;
 }
 
 /* populate non-null scalar value from json/jsonb value */
@@ -2799,7 +2832,7 @@ populate_scalar(ScalarIOData *io, Oid typid, int32 typmod, JsValue *jsv)
 		{
 			Jsonb	   *jsonb = JsonbValueToJsonb(jbv); /* directly use jsonb */
 
-			return JsonbGetDatum(jsonb);
+			return JsonbPGetDatum(jsonb);
 		}
 		/* convert jsonb to string for typio call */
 		else if (typid == JSONOID && jbv->type != jbvBinary)
@@ -2867,7 +2900,7 @@ prepare_column_cache(ColumnIOData *column,
 					 Oid typid,
 					 int32 typmod,
 					 MemoryContext mcxt,
-					 bool json)
+					 bool need_scalar)
 {
 	HeapTuple	tup;
 	Form_pg_type type;
@@ -2883,18 +2916,43 @@ prepare_column_cache(ColumnIOData *column,
 
 	if (type->typtype == TYPTYPE_DOMAIN)
 	{
-		column->typcat = TYPECAT_DOMAIN;
-		column->io.domain.base_typid = type->typbasetype;
-		column->io.domain.base_typmod = type->typtypmod;
-		column->io.domain.base_io = MemoryContextAllocZero(mcxt,
-														   sizeof(ColumnIOData));
-		column->io.domain.domain_info = NULL;
+		/*
+		 * We can move directly to the bottom base type; domain_check() will
+		 * take care of checking all constraints for a stack of domains.
+		 */
+		Oid			base_typid;
+		int32		base_typmod = typmod;
+
+		base_typid = getBaseTypeAndTypmod(typid, &base_typmod);
+		if (get_typtype(base_typid) == TYPTYPE_COMPOSITE)
+		{
+			/* domain over composite has its own code path */
+			column->typcat = TYPECAT_COMPOSITE_DOMAIN;
+			column->io.composite.record_io = NULL;
+			column->io.composite.tupdesc = NULL;
+			column->io.composite.base_typid = base_typid;
+			column->io.composite.base_typmod = base_typmod;
+			column->io.composite.domain_info = NULL;
+		}
+		else
+		{
+			/* domain over anything else */
+			column->typcat = TYPECAT_DOMAIN;
+			column->io.domain.base_typid = base_typid;
+			column->io.domain.base_typmod = base_typmod;
+			column->io.domain.base_io =
+				MemoryContextAllocZero(mcxt, sizeof(ColumnIOData));
+			column->io.domain.domain_info = NULL;
+		}
 	}
 	else if (type->typtype == TYPTYPE_COMPOSITE || typid == RECORDOID)
 	{
 		column->typcat = TYPECAT_COMPOSITE;
 		column->io.composite.record_io = NULL;
 		column->io.composite.tupdesc = NULL;
+		column->io.composite.base_typid = typid;
+		column->io.composite.base_typmod = typmod;
+		column->io.composite.domain_info = NULL;
 	}
 	else if (type->typlen == -1 && OidIsValid(type->typelem))
 	{
@@ -2906,10 +2964,13 @@ prepare_column_cache(ColumnIOData *column,
 		column->io.array.element_typmod = typmod;
 	}
 	else
+	{
 		column->typcat = TYPECAT_SCALAR;
+		need_scalar = true;
+	}
 
-	/* don't need input function when converting from jsonb to jsonb */
-	if (json || typid != JSONBOID)
+	/* caller can force us to look up scalar_io info even for non-scalars */
+	if (need_scalar)
 	{
 		Oid			typioproc;
 
@@ -2935,9 +2996,12 @@ populate_record_field(ColumnIOData *col,
 
 	check_stack_depth();
 
-	/* prepare column metadata cache for the given type */
+	/*
+	 * Prepare column metadata cache for the given type.  Force lookup of the
+	 * scalar_io data so that the json string hack below will work.
+	 */
 	if (col->typid != typid || col->typmod != typmod)
-		prepare_column_cache(col, typid, typmod, mcxt, jsv->is_json);
+		prepare_column_cache(col, typid, typmod, mcxt, true);
 
 	*isnull = JsValueIsNull(jsv);
 
@@ -2945,11 +3009,15 @@ populate_record_field(ColumnIOData *col,
 
 	/* try to convert json string to a non-scalar type through input function */
 	if (JsValueIsString(jsv) &&
-		(typcat == TYPECAT_ARRAY || typcat == TYPECAT_COMPOSITE))
+		(typcat == TYPECAT_ARRAY ||
+		 typcat == TYPECAT_COMPOSITE ||
+		 typcat == TYPECAT_COMPOSITE_DOMAIN))
 		typcat = TYPECAT_SCALAR;
 
-	/* we must perform domain checks for NULLs */
-	if (*isnull && typcat != TYPECAT_DOMAIN)
+	/* we must perform domain checks for NULLs, otherwise exit immediately */
+	if (*isnull &&
+		typcat != TYPECAT_DOMAIN &&
+		typcat != TYPECAT_COMPOSITE_DOMAIN)
 		return (Datum) 0;
 
 	switch (typcat)
@@ -2961,12 +3029,13 @@ populate_record_field(ColumnIOData *col,
 			return populate_array(&col->io.array, colname, mcxt, jsv);
 
 		case TYPECAT_COMPOSITE:
-			return populate_composite(&col->io.composite, typid, typmod,
+		case TYPECAT_COMPOSITE_DOMAIN:
+			return populate_composite(&col->io.composite, typid,
 									  colname, mcxt,
 									  DatumGetPointer(defaultval)
 									  ? DatumGetHeapTupleHeader(defaultval)
 									  : NULL,
-									  jsv);
+									  jsv, *isnull);
 
 		case TYPECAT_DOMAIN:
 			return populate_domain(&col->io.domain, typid, colname, mcxt,
@@ -3087,7 +3156,7 @@ populate_record(TupleDesc tupdesc,
 
 	for (i = 0; i < ncolumns; ++i)
 	{
-		Form_pg_attribute att = tupdesc->attrs[i];
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 		char	   *colname = NameStr(att->attname);
 		JsValue		field = {0};
 		bool		found;
@@ -3137,10 +3206,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 	int			json_arg_num = have_record_arg ? 1 : 0;
 	Oid			jtype = get_fn_expr_argtype(fcinfo->flinfo, json_arg_num);
 	JsValue		jsv = {0};
-	HeapTupleHeader rec = NULL;
-	Oid			tupType;
-	int32		tupTypmod;
-	TupleDesc	tupdesc = NULL;
+	HeapTupleHeader rec;
 	Datum		rettuple;
 	JsonbValue	jbv;
 	MemoryContext fnmcxt = fcinfo->flinfo->fn_mcxt;
@@ -3149,77 +3215,88 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 	Assert(jtype == JSONOID || jtype == JSONBOID);
 
 	/*
-	 * We arrange to look up the needed I/O info just once per series of
-	 * calls, assuming the record type doesn't change underneath us.
+	 * If first time through, identify input/result record type.  Note that
+	 * this stanza looks only at fcinfo context, which can't change during the
+	 * query; so we may not be able to fully resolve a RECORD input type yet.
 	 */
 	if (!cache)
+	{
 		fcinfo->flinfo->fn_extra = cache =
 			MemoryContextAllocZero(fnmcxt, sizeof(*cache));
 
-	if (have_record_arg)
-	{
-		Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
-
-		if (cache->argtype != argtype)
+		if (have_record_arg)
 		{
-			if (!type_is_rowtype(argtype))
+			/*
+			 * json{b}_populate_record case: result type will be same as first
+			 * argument's.
+			 */
+			cache->argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
+			prepare_column_cache(&cache->c,
+								 cache->argtype, -1,
+								 fnmcxt, false);
+			if (cache->c.typcat != TYPECAT_COMPOSITE &&
+				cache->c.typcat != TYPECAT_COMPOSITE_DOMAIN)
 				ereport(ERROR,
 						(errcode(ERRCODE_DATATYPE_MISMATCH),
 						 errmsg("first argument of %s must be a row type",
 								funcname)));
-
-			cache->argtype = argtype;
 		}
-
-		if (PG_ARGISNULL(0))
+		else
 		{
-			if (PG_ARGISNULL(1))
-				PG_RETURN_NULL();
-
 			/*
-			 * We have no tuple to look at, so the only source of type info is
-			 * the argtype. The lookup_rowtype_tupdesc call below will error
-			 * out if we don't have a known composite type oid here.
+			 * json{b}_to_record case: result type is specified by calling
+			 * query.  Here it is syntactically impossible to specify the
+			 * target type as domain-over-composite.
 			 */
-			tupType = argtype;
-			tupTypmod = -1;
-		}
-		else
-		{
-			rec = PG_GETARG_HEAPTUPLEHEADER(0);
+			TupleDesc	tupdesc;
+			MemoryContext old_cxt;
 
-			if (PG_ARGISNULL(1))
-				PG_RETURN_POINTER(rec);
-
-			/* Extract type info from the tuple itself */
-			tupType = HeapTupleHeaderGetTypeId(rec);
-			tupTypmod = HeapTupleHeaderGetTypMod(rec);
+			if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("function returning record called in context "
+								"that cannot accept type record"),
+						 errhint("Try calling the function in the FROM clause "
+								 "using a column definition list.")));
+
+			Assert(tupdesc);
+			cache->argtype = tupdesc->tdtypeid;
+
+			/* Save identified tupdesc */
+			old_cxt = MemoryContextSwitchTo(fnmcxt);
+			cache->c.io.composite.tupdesc = CreateTupleDescCopy(tupdesc);
+			cache->c.io.composite.base_typid = tupdesc->tdtypeid;
+			cache->c.io.composite.base_typmod = tupdesc->tdtypmod;
+			MemoryContextSwitchTo(old_cxt);
 		}
 	}
-	else
-	{
-		/* json{b}_to_record case */
-		if (PG_ARGISNULL(0))
-			PG_RETURN_NULL();
-
-		if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("function returning record called in context "
-							"that cannot accept type record"),
-					 errhint("Try calling the function in the FROM clause "
-							 "using a column definition list.")));
 
-		Assert(tupdesc);
+	/* Collect record arg if we have one */
+	if (have_record_arg && !PG_ARGISNULL(0))
+	{
+		rec = PG_GETARG_HEAPTUPLEHEADER(0);
 
 		/*
-		 * Add tupdesc to the cache and set the appropriate values of
-		 * tupType/tupTypmod for proper cache usage in populate_composite().
+		 * When declared arg type is RECORD, identify actual record type from
+		 * the tuple itself.  Note the lookup_rowtype_tupdesc call in
+		 * update_cached_tupdesc will fail if we're unable to do this.
 		 */
-		cache->io.tupdesc = tupdesc;
+		if (cache->argtype == RECORDOID)
+		{
+			cache->c.io.composite.base_typid = HeapTupleHeaderGetTypeId(rec);
+			cache->c.io.composite.base_typmod = HeapTupleHeaderGetTypMod(rec);
+		}
+	}
+	else
+		rec = NULL;
 
-		tupType = tupdesc->tdtypeid;
-		tupTypmod = tupdesc->tdtypmod;
+	/* If no JSON argument, just return the record (if any) unchanged */
+	if (PG_ARGISNULL(json_arg_num))
+	{
+		if (rec)
+			PG_RETURN_POINTER(rec);
+		else
+			PG_RETURN_NULL();
 	}
 
 	jsv.is_json = jtype == JSONOID;
@@ -3235,7 +3312,7 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 	}
 	else
 	{
-		Jsonb	   *jb = PG_GETARG_JSONB(json_arg_num);
+		Jsonb	   *jb = PG_GETARG_JSONB_P(json_arg_num);
 
 		jsv.val.jsonb = &jbv;
 
@@ -3245,14 +3322,8 @@ populate_record_worker(FunctionCallInfo fcinfo, const char *funcname,
 		jbv.val.binary.len = VARSIZE(jb) - VARHDRSZ;
 	}
 
-	rettuple = populate_composite(&cache->io, tupType, tupTypmod,
-								  NULL, fnmcxt, rec, &jsv);
-
-	if (tupdesc)
-	{
-		cache->io.tupdesc = NULL;
-		ReleaseTupleDesc(tupdesc);
-	}
+	rettuple = populate_composite(&cache->c.io.composite, cache->argtype,
+								  NULL, fnmcxt, rec, &jsv, false);
 
 	PG_RETURN_DATUM(rettuple);
 }
@@ -3438,13 +3509,28 @@ json_to_recordset(PG_FUNCTION_ARGS)
 static void
 populate_recordset_record(PopulateRecordsetState *state, JsObject *obj)
 {
+	PopulateRecordsetCache *cache = state->cache;
+	HeapTupleHeader tuphead;
 	HeapTupleData tuple;
-	HeapTupleHeader tuphead = populate_record(state->ret_tdesc,
-											  state->my_extra,
-											  state->rec,
-											  state->fn_mcxt,
-											  obj);
 
+	/* acquire/update cached tuple descriptor */
+	update_cached_tupdesc(&cache->c.io.composite, cache->fn_mcxt);
+
+	/* replace record fields from json */
+	tuphead = populate_record(cache->c.io.composite.tupdesc,
+							  &cache->c.io.composite.record_io,
+							  state->rec,
+							  cache->fn_mcxt,
+							  obj);
+
+	/* if it's domain over composite, check domain constraints */
+	if (cache->c.typcat == TYPECAT_COMPOSITE_DOMAIN)
+		domain_check(HeapTupleHeaderGetDatum(tuphead), false,
+					 cache->argtype,
+					 &cache->c.io.composite.domain_info,
+					 cache->fn_mcxt);
+
+	/* ok, save into tuplestore */
 	tuple.t_len = HeapTupleHeaderGetDatumLength(tuphead);
 	ItemPointerSetInvalid(&(tuple.t_self));
 	tuple.t_tableOid = InvalidOid;
@@ -3465,25 +3551,13 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
 	ReturnSetInfo *rsi;
 	MemoryContext old_cxt;
 	HeapTupleHeader rec;
-	TupleDesc	tupdesc;
+	PopulateRecordsetCache *cache = fcinfo->flinfo->fn_extra;
 	PopulateRecordsetState *state;
 
-	if (have_record_arg)
-	{
-		Oid			argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
-
-		if (!type_is_rowtype(argtype))
-			ereport(ERROR,
-					(errcode(ERRCODE_DATATYPE_MISMATCH),
-					 errmsg("first argument of %s must be a row type",
-							funcname)));
-	}
-
 	rsi = (ReturnSetInfo *) fcinfo->resultinfo;
 
 	if (!rsi || !IsA(rsi, ReturnSetInfo) ||
-		(rsi->allowedModes & SFRM_Materialize) == 0 ||
-		rsi->expectedDesc == NULL)
+		(rsi->allowedModes & SFRM_Materialize) == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 				 errmsg("set-valued function called in context that "
@@ -3492,40 +3566,97 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
 	rsi->returnMode = SFRM_Materialize;
 
 	/*
-	 * get the tupdesc from the result set info - it must be a record type
-	 * because we already checked that arg1 is a record type, or we're in a
-	 * to_record function which returns a setof record.
+	 * If first time through, identify input/result record type.  Note that
+	 * this stanza looks only at fcinfo context, which can't change during the
+	 * query; so we may not be able to fully resolve a RECORD input type yet.
 	 */
-	if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
-		ereport(ERROR,
-				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-				 errmsg("function returning record called in context "
-						"that cannot accept type record")));
+	if (!cache)
+	{
+		fcinfo->flinfo->fn_extra = cache =
+			MemoryContextAllocZero(fcinfo->flinfo->fn_mcxt, sizeof(*cache));
+		cache->fn_mcxt = fcinfo->flinfo->fn_mcxt;
+
+		if (have_record_arg)
+		{
+			/*
+			 * json{b}_populate_recordset case: result type will be same as
+			 * first argument's.
+			 */
+			cache->argtype = get_fn_expr_argtype(fcinfo->flinfo, 0);
+			prepare_column_cache(&cache->c,
+								 cache->argtype, -1,
+								 cache->fn_mcxt, false);
+			if (cache->c.typcat != TYPECAT_COMPOSITE &&
+				cache->c.typcat != TYPECAT_COMPOSITE_DOMAIN)
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("first argument of %s must be a row type",
+								funcname)));
+		}
+		else
+		{
+			/*
+			 * json{b}_to_recordset case: result type is specified by calling
+			 * query.  Here it is syntactically impossible to specify the
+			 * target type as domain-over-composite.
+			 */
+			TupleDesc	tupdesc;
+
+			if (get_call_result_type(fcinfo, NULL, &tupdesc) != TYPEFUNC_COMPOSITE)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("function returning record called in context "
+								"that cannot accept type record"),
+						 errhint("Try calling the function in the FROM clause "
+								 "using a column definition list.")));
+
+			Assert(tupdesc);
+			cache->argtype = tupdesc->tdtypeid;
+
+			/* Save identified tupdesc */
+			old_cxt = MemoryContextSwitchTo(cache->fn_mcxt);
+			cache->c.io.composite.tupdesc = CreateTupleDescCopy(tupdesc);
+			cache->c.io.composite.base_typid = tupdesc->tdtypeid;
+			cache->c.io.composite.base_typmod = tupdesc->tdtypmod;
+			MemoryContextSwitchTo(old_cxt);
+		}
+	}
+
+	/* Collect record arg if we have one */
+	if (have_record_arg && !PG_ARGISNULL(0))
+	{
+		rec = PG_GETARG_HEAPTUPLEHEADER(0);
+
+		/*
+		 * When declared arg type is RECORD, identify actual record type from
+		 * the tuple itself.  Note the lookup_rowtype_tupdesc call in
+		 * update_cached_tupdesc will fail if we're unable to do this.
+		 */
+		if (cache->argtype == RECORDOID)
+		{
+			cache->c.io.composite.base_typid = HeapTupleHeaderGetTypeId(rec);
+			cache->c.io.composite.base_typmod = HeapTupleHeaderGetTypMod(rec);
+		}
+	}
+	else
+		rec = NULL;
 
 	/* if the json is null send back an empty set */
 	if (PG_ARGISNULL(json_arg_num))
 		PG_RETURN_NULL();
 
-	if (!have_record_arg || PG_ARGISNULL(0))
-		rec = NULL;
-	else
-		rec = PG_GETARG_HEAPTUPLEHEADER(0);
-
 	state = palloc0(sizeof(PopulateRecordsetState));
 
-	/* make these in a sufficiently long-lived memory context */
+	/* make tuplestore in a sufficiently long-lived memory context */
 	old_cxt = MemoryContextSwitchTo(rsi->econtext->ecxt_per_query_memory);
-	state->ret_tdesc = CreateTupleDescCopy(tupdesc);
-	BlessTupleDesc(state->ret_tdesc);
 	state->tuple_store = tuplestore_begin_heap(rsi->allowedModes &
 											   SFRM_Materialize_Random,
 											   false, work_mem);
 	MemoryContextSwitchTo(old_cxt);
 
 	state->function_name = funcname;
-	state->my_extra = (RecordIOData **) &fcinfo->flinfo->fn_extra;
+	state->cache = cache;
 	state->rec = rec;
-	state->fn_mcxt = fcinfo->flinfo->fn_mcxt;
 
 	if (jtype == JSONOID)
 	{
@@ -3552,7 +3683,7 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
 	}
 	else
 	{
-		Jsonb	   *jb = PG_GETARG_JSONB(json_arg_num);
+		Jsonb	   *jb = PG_GETARG_JSONB_P(json_arg_num);
 		JsonbIterator *it;
 		JsonbValue	v;
 		bool		skipNested = false;
@@ -3592,7 +3723,7 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
 	}
 
 	rsi->setResult = state->tuple_store;
-	rsi->setDesc = state->ret_tdesc;
+	rsi->setDesc = cache->c.io.composite.tupdesc;
 
 	PG_RETURN_NULL();
 }
@@ -3904,7 +4035,7 @@ json_strip_nulls(PG_FUNCTION_ARGS)
 Datum
 jsonb_strip_nulls(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	JsonbIterator *it;
 	JsonbParseState *parseState = NULL;
 	JsonbValue *res = NULL;
@@ -4013,7 +4144,7 @@ addJsonbToParseState(JsonbParseState **jbps, Jsonb *jb)
 Datum
 jsonb_pretty(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb = PG_GETARG_JSONB(0);
+	Jsonb	   *jb = PG_GETARG_JSONB_P(0);
 	StringInfo	str = makeStringInfo();
 
 	JsonbToCStringIndent(str, &jb->root, VARSIZE(jb));
@@ -4029,8 +4160,8 @@ jsonb_pretty(PG_FUNCTION_ARGS)
 Datum
 jsonb_concat(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *jb1 = PG_GETARG_JSONB(0);
-	Jsonb	   *jb2 = PG_GETARG_JSONB(1);
+	Jsonb	   *jb1 = PG_GETARG_JSONB_P(0);
+	Jsonb	   *jb2 = PG_GETARG_JSONB_P(1);
 	JsonbParseState *state = NULL;
 	JsonbValue *res;
 	JsonbIterator *it1,
@@ -4045,9 +4176,9 @@ jsonb_concat(PG_FUNCTION_ARGS)
 	if (JB_ROOT_IS_OBJECT(jb1) == JB_ROOT_IS_OBJECT(jb2))
 	{
 		if (JB_ROOT_COUNT(jb1) == 0 && !JB_ROOT_IS_SCALAR(jb2))
-			PG_RETURN_JSONB(jb2);
+			PG_RETURN_JSONB_P(jb2);
 		else if (JB_ROOT_COUNT(jb2) == 0 && !JB_ROOT_IS_SCALAR(jb1))
-			PG_RETURN_JSONB(jb1);
+			PG_RETURN_JSONB_P(jb1);
 	}
 
 	it1 = JsonbIteratorInit(&jb1->root);
@@ -4057,7 +4188,7 @@ jsonb_concat(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 
@@ -4070,7 +4201,7 @@ jsonb_concat(PG_FUNCTION_ARGS)
 Datum
 jsonb_delete(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	text	   *key = PG_GETARG_TEXT_PP(1);
 	char	   *keyptr = VARDATA_ANY(key);
 	int			keylen = VARSIZE_ANY_EXHDR(key);
@@ -4087,7 +4218,7 @@ jsonb_delete(PG_FUNCTION_ARGS)
 				 errmsg("cannot delete from scalar")));
 
 	if (JB_ROOT_COUNT(in) == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4111,7 +4242,7 @@ jsonb_delete(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4123,7 +4254,7 @@ jsonb_delete(PG_FUNCTION_ARGS)
 Datum
 jsonb_delete_array(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	ArrayType  *keys = PG_GETARG_ARRAYTYPE_P(1);
 	Datum	   *keys_elems;
 	bool	   *keys_nulls;
@@ -4146,13 +4277,13 @@ jsonb_delete_array(PG_FUNCTION_ARGS)
 				 errmsg("cannot delete from scalar")));
 
 	if (JB_ROOT_COUNT(in) == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	deconstruct_array(keys, TEXTOID, -1, false, 'i',
 					  &keys_elems, &keys_nulls, &keys_len);
 
 	if (keys_len == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4197,7 +4328,7 @@ jsonb_delete_array(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4210,7 +4341,7 @@ jsonb_delete_array(PG_FUNCTION_ARGS)
 Datum
 jsonb_delete_idx(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	int			idx = PG_GETARG_INT32(1);
 	JsonbParseState *state = NULL;
 	JsonbIterator *it;
@@ -4231,7 +4362,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
 				 errmsg("cannot delete from object using integer index")));
 
 	if (JB_ROOT_COUNT(in) == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4248,7 +4379,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
 	}
 
 	if (idx >= n)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	pushJsonbValue(&state, r, NULL);
 
@@ -4265,7 +4396,7 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4275,9 +4406,9 @@ jsonb_delete_idx(PG_FUNCTION_ARGS)
 Datum
 jsonb_set(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
-	Jsonb	   *newval = PG_GETARG_JSONB(2);
+	Jsonb	   *newval = PG_GETARG_JSONB_P(2);
 	bool		create = PG_GETARG_BOOL(3);
 	JsonbValue *res = NULL;
 	Datum	   *path_elems;
@@ -4297,13 +4428,13 @@ jsonb_set(PG_FUNCTION_ARGS)
 				 errmsg("cannot set path in scalar")));
 
 	if (JB_ROOT_COUNT(in) == 0 && !create)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	deconstruct_array(path, TEXTOID, -1, false, 'i',
 					  &path_elems, &path_nulls, &path_len);
 
 	if (path_len == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4312,7 +4443,7 @@ jsonb_set(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 
@@ -4322,7 +4453,7 @@ jsonb_set(PG_FUNCTION_ARGS)
 Datum
 jsonb_delete_path(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
 	JsonbValue *res = NULL;
 	Datum	   *path_elems;
@@ -4342,13 +4473,13 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
 				 errmsg("cannot delete path in scalar")));
 
 	if (JB_ROOT_COUNT(in) == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	deconstruct_array(path, TEXTOID, -1, false, 'i',
 					  &path_elems, &path_nulls, &path_len);
 
 	if (path_len == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4357,7 +4488,7 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4367,9 +4498,9 @@ jsonb_delete_path(PG_FUNCTION_ARGS)
 Datum
 jsonb_insert(PG_FUNCTION_ARGS)
 {
-	Jsonb	   *in = PG_GETARG_JSONB(0);
+	Jsonb	   *in = PG_GETARG_JSONB_P(0);
 	ArrayType  *path = PG_GETARG_ARRAYTYPE_P(1);
-	Jsonb	   *newval = PG_GETARG_JSONB(2);
+	Jsonb	   *newval = PG_GETARG_JSONB_P(2);
 	bool		after = PG_GETARG_BOOL(3);
 	JsonbValue *res = NULL;
 	Datum	   *path_elems;
@@ -4392,7 +4523,7 @@ jsonb_insert(PG_FUNCTION_ARGS)
 					  &path_elems, &path_nulls, &path_len);
 
 	if (path_len == 0)
-		PG_RETURN_JSONB(in);
+		PG_RETURN_JSONB_P(in);
 
 	it = JsonbIteratorInit(&in->root);
 
@@ -4401,7 +4532,7 @@ jsonb_insert(PG_FUNCTION_ARGS)
 
 	Assert(res != NULL);
 
-	PG_RETURN_JSONB(JsonbValueToJsonb(res));
+	PG_RETURN_JSONB_P(JsonbValueToJsonb(res));
 }
 
 /*
@@ -4860,7 +4991,7 @@ iterate_string_values_scalar(void *state, char *token, JsonTokenType tokentype)
 	IterateJsonStringValuesState *_state = (IterateJsonStringValuesState *) state;
 
 	if (tokentype == JSON_TOKEN_STRING)
-		(*_state->action) (_state->action_state, token, strlen(token));
+		_state->action(_state->action_state, token, strlen(token));
 }
 
 /*
@@ -5011,7 +5142,7 @@ transform_string_values_scalar(void *state, char *token, JsonTokenType tokentype
 
 	if (tokentype == JSON_TOKEN_STRING)
 	{
-		text	   *out = (*_state->action) (_state->action_state, token, strlen(token));
+		text	   *out = _state->action(_state->action_state, token, strlen(token));
 
 		escape_json(_state->strval, text_to_cstring(out));
 	}
diff --git a/src/backend/utils/adt/levenshtein.c b/src/backend/utils/adt/levenshtein.c
index 97e034b453..dc4346a039 100644
--- a/src/backend/utils/adt/levenshtein.c
+++ b/src/backend/utils/adt/levenshtein.c
@@ -16,7 +16,7 @@
  * PHP 4.0.6 distribution for inspiration.  Configurable penalty costs
  * extension is introduced by Volkan YAZICI <volkan.yazici@gmail.com.
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	src/backend/utils/adt/levenshtein.c
diff --git a/src/backend/utils/adt/like.c b/src/backend/utils/adt/like.c
index 37394f4972..ff716c5f58 100644
--- a/src/backend/utils/adt/like.c
+++ b/src/backend/utils/adt/like.c
@@ -7,7 +7,7 @@
  *		A big hack of the regexp.c code!! Contributed by
  *		Keith Parks <emkxp01@mtcc.demon.co.uk> (7/95).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/like_match.c b/src/backend/utils/adt/like_match.c
index 8ed362a8ff..18428569a8 100644
--- a/src/backend/utils/adt/like_match.c
+++ b/src/backend/utils/adt/like_match.c
@@ -16,7 +16,7 @@
  * do_like_escape - name of function if wanted - needs CHAREQ and CopyAdvChar
  * MATCH_LOWER - define for case (4) to specify case folding for 1-byte chars
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	src/backend/utils/adt/like_match.c
diff --git a/src/backend/utils/adt/lockfuncs.c b/src/backend/utils/adt/lockfuncs.c
index 9e0a8ab79d..66c09a1f31 100644
--- a/src/backend/utils/adt/lockfuncs.c
+++ b/src/backend/utils/adt/lockfuncs.c
@@ -3,7 +3,7 @@
  * lockfuncs.c
  *		Functions for SQL access to various lock-manager capabilities.
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/backend/utils/adt/lockfuncs.c
diff --git a/src/backend/utils/adt/mac.c b/src/backend/utils/adt/mac.c
index d1c20c3086..94703c8c1c 100644
--- a/src/backend/utils/adt/mac.c
+++ b/src/backend/utils/adt/mac.c
@@ -3,7 +3,7 @@
  * mac.c
  *	  PostgreSQL type definitions for 6 byte, EUI-48, MAC addresses.
  *
- * Portions Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/backend/utils/adt/mac.c
@@ -271,6 +271,15 @@ hashmacaddr(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) key, sizeof(macaddr));
 }
 
+Datum
+hashmacaddrextended(PG_FUNCTION_ARGS)
+{
+	macaddr    *key = PG_GETARG_MACADDR_P(0);
+
+	return hash_any_extended((unsigned char *) key, sizeof(macaddr),
+							 PG_GETARG_INT64(1));
+}
+
 /*
  * Arithmetic functions: bitwise NOT, AND, OR.
  */
diff --git a/src/backend/utils/adt/mac8.c b/src/backend/utils/adt/mac8.c
index 482d1fb5bf..6dd2febc26 100644
--- a/src/backend/utils/adt/mac8.c
+++ b/src/backend/utils/adt/mac8.c
@@ -11,7 +11,7 @@
  * The following code is written with the assumption that the OUI field
  * size is 24 bits.
  *
- * Portions Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/backend/utils/adt/mac8.c
@@ -407,6 +407,15 @@ hashmacaddr8(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) key, sizeof(macaddr8));
 }
 
+Datum
+hashmacaddr8extended(PG_FUNCTION_ARGS)
+{
+	macaddr8   *key = PG_GETARG_MACADDR8_P(0);
+
+	return hash_any_extended((unsigned char *) key, sizeof(macaddr8),
+							 PG_GETARG_INT64(1));
+}
+
 /*
  * Arithmetic functions: bitwise NOT, AND, OR.
  */
@@ -553,8 +562,8 @@ macaddr8tomacaddr(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("macaddr8 data out of range to convert to macaddr"),
 				 errhint("Only addresses that have FF and FE as values in the "
-						 "4th and 5th bytes, from the left, for example: "
-						 "XX-XX-XX-FF-FE-XX-XX-XX, are eligible to be converted "
+						 "4th and 5th bytes from the left, for example "
+						 "xx:xx:xx:ff:fe:xx:xx:xx, are eligible to be converted "
 						 "from macaddr8 to macaddr.")));
 
 	result->a = addr->a;
diff --git a/src/backend/utils/adt/misc.c b/src/backend/utils/adt/misc.c
index 62341b84d1..2e1e020c4b 100644
--- a/src/backend/utils/adt/misc.c
+++ b/src/backend/utils/adt/misc.c
@@ -3,7 +3,7 @@
  * misc.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -26,6 +26,7 @@
 #include "catalog/pg_tablespace.h"
 #include "catalog/pg_type.h"
 #include "commands/dbcommands.h"
+#include "commands/tablespace.h"
 #include "common/keywords.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -47,7 +48,7 @@
 
 /*
  * Common subroutine for num_nulls() and num_nonnulls().
- * Returns TRUE if successful, FALSE if function should return NULL.
+ * Returns true if successful, false if function should return NULL.
  * If successful, total argument count and number of nulls are
  * returned into *nargs and *nulls.
  */
@@ -425,9 +426,9 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
 
 	while ((de = ReadDir(fctx->dirdesc, fctx->location)) != NULL)
 	{
-		char	   *subdir;
-		DIR		   *dirdesc;
 		Oid			datOid = atooid(de->d_name);
+		char	   *subdir;
+		bool		isempty;
 
 		/* this test skips . and .., but is awfully weak */
 		if (!datOid)
@@ -436,16 +437,10 @@ pg_tablespace_databases(PG_FUNCTION_ARGS)
 		/* if database subdir is empty, don't report tablespace as used */
 
 		subdir = psprintf("%s/%s", fctx->location, de->d_name);
-		dirdesc = AllocateDir(subdir);
-		while ((de = ReadDir(dirdesc, subdir)) != NULL)
-		{
-			if (strcmp(de->d_name, ".") != 0 && strcmp(de->d_name, "..") != 0)
-				break;
-		}
-		FreeDir(dirdesc);
+		isempty = directory_is_empty(subdir);
 		pfree(subdir);
 
-		if (!de)
+		if (isempty)
 			continue;			/* indeed, nothing in it */
 
 		SRF_RETURN_NEXT(funcctx, ObjectIdGetDatum(datOid));
diff --git a/src/backend/utils/adt/nabstime.c b/src/backend/utils/adt/nabstime.c
index 2c5948052d..ec85795827 100644
--- a/src/backend/utils/adt/nabstime.c
+++ b/src/backend/utils/adt/nabstime.c
@@ -5,7 +5,7 @@
  *	  Functions for the built-in type "RelativeTime".
  *	  Functions for the built-in type "TimeInterval".
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -315,7 +315,7 @@ abstimesend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, time, sizeof(time));
+	pq_sendint32(&buf, time);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -674,7 +674,7 @@ reltimesend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, time, sizeof(time));
+	pq_sendint32(&buf, time);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -794,9 +794,9 @@ tintervalsend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, tinterval->status, sizeof(tinterval->status));
-	pq_sendint(&buf, tinterval->data[0], sizeof(tinterval->data[0]));
-	pq_sendint(&buf, tinterval->data[1], sizeof(tinterval->data[1]));
+	pq_sendint32(&buf, tinterval->status);
+	pq_sendint32(&buf, tinterval->data[0]);
+	pq_sendint32(&buf, tinterval->data[1]);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
diff --git a/src/backend/utils/adt/name.c b/src/backend/utils/adt/name.c
index 974e6e8401..fe20448ac5 100644
--- a/src/backend/utils/adt/name.c
+++ b/src/backend/utils/adt/name.c
@@ -9,7 +9,7 @@
  * always use NAMEDATALEN as the symbolic constant!   - jolly 8/21/95
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/network.c b/src/backend/utils/adt/network.c
index 5573c34097..aac7621717 100644
--- a/src/backend/utils/adt/network.c
+++ b/src/backend/utils/adt/network.c
@@ -486,6 +486,16 @@ hashinet(PG_FUNCTION_ARGS)
 	return hash_any((unsigned char *) VARDATA_ANY(addr), addrsize + 2);
 }
 
+Datum
+hashinetextended(PG_FUNCTION_ARGS)
+{
+	inet	   *addr = PG_GETARG_INET_PP(0);
+	int			addrsize = ip_addrsize(addr);
+
+	return hash_any_extended((unsigned char *) VARDATA_ANY(addr), addrsize + 2,
+							 PG_GETARG_INT64(1));
+}
+
 /*
  *	Boolean network-inclusion tests.
  */
@@ -947,8 +957,8 @@ convert_network_to_scalar(Datum value, Oid typid)
 	}
 
 	/*
-	 * Can't get here unless someone tries to use scalarltsel/scalargtsel on
-	 * an operator with one network and one non-network operand.
+	 * Can't get here unless someone tries to use scalarineqsel() on an
+	 * operator with one network and one non-network operand.
 	 */
 	elog(ERROR, "unsupported type: %u", typid);
 	return 0;
diff --git a/src/backend/utils/adt/network_gist.c b/src/backend/utils/adt/network_gist.c
index a0097dae9c..ba884a803b 100644
--- a/src/backend/utils/adt/network_gist.c
+++ b/src/backend/utils/adt/network_gist.c
@@ -34,7 +34,7 @@
  * twice as fast as for a simpler design in which a single field doubles as
  * the common prefix length and the minimum ip_bits value.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -561,13 +561,13 @@ inet_gist_compress(PG_FUNCTION_ARGS)
 
 			gistentryinit(*retval, PointerGetDatum(r),
 						  entry->rel, entry->page,
-						  entry->offset, FALSE);
+						  entry->offset, false);
 		}
 		else
 		{
 			gistentryinit(*retval, (Datum) 0,
 						  entry->rel, entry->page,
-						  entry->offset, FALSE);
+						  entry->offset, false);
 		}
 	}
 	else
@@ -576,17 +576,9 @@ inet_gist_compress(PG_FUNCTION_ARGS)
 }
 
 /*
- * The GiST decompress function
- *
- * do not do anything --- we just use the stored GistInetKey as-is.
+ * We do not need a decompress function, because the other GiST inet
+ * support functions work with the GistInetKey representation.
  */
-Datum
-inet_gist_decompress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-
-	PG_RETURN_POINTER(entry);
-}
 
 /*
  * The GiST fetch function
@@ -610,7 +602,7 @@ inet_gist_fetch(PG_FUNCTION_ARGS)
 
 	retval = palloc(sizeof(GISTENTRY));
 	gistentryinit(*retval, InetPGetDatum(dst), entry->rel, entry->page,
-				  entry->offset, FALSE);
+				  entry->offset, false);
 
 	PG_RETURN_POINTER(retval);
 }
diff --git a/src/backend/utils/adt/network_selfuncs.c b/src/backend/utils/adt/network_selfuncs.c
index c9927fff9b..6c365b34b1 100644
--- a/src/backend/utils/adt/network_selfuncs.c
+++ b/src/backend/utils/adt/network_selfuncs.c
@@ -7,7 +7,7 @@
  * operators.  Estimates are based on null fraction, most common values,
  * and histogram of inet/cidr columns.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/network_spgist.c b/src/backend/utils/adt/network_spgist.c
index c48f45fe47..e5250fe13e 100644
--- a/src/backend/utils/adt/network_spgist.c
+++ b/src/backend/utils/adt/network_spgist.c
@@ -21,7 +21,7 @@
  * the address family, everything goes into node 0 (which will probably
  * lead to creating an allTheSame tuple).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/numeric.c b/src/backend/utils/adt/numeric.c
index 3e5614ece3..6f40072971 100644
--- a/src/backend/utils/adt/numeric.c
+++ b/src/backend/utils/adt/numeric.c
@@ -11,7 +11,7 @@
  * Transactions on Mathematical Software, Vol. 24, No. 4, December 1998,
  * pages 359-367.
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/numeric.c
@@ -28,6 +28,7 @@
 
 #include "access/hash.h"
 #include "catalog/pg_type.h"
+#include "common/int.h"
 #include "funcapi.h"
 #include "lib/hyperloglog.h"
 #include "libpq/pqformat.h"
@@ -353,12 +354,12 @@ typedef struct NumericSumAccum
  */
 #define NUMERIC_ABBREV_BITS (SIZEOF_DATUM * BITS_PER_BYTE)
 #if SIZEOF_DATUM == 8
-#define NumericAbbrevGetDatum(X) ((Datum) SET_8_BYTES(X))
-#define DatumGetNumericAbbrev(X) ((int64) GET_8_BYTES(X))
+#define NumericAbbrevGetDatum(X) ((Datum) (X))
+#define DatumGetNumericAbbrev(X) ((int64) (X))
 #define NUMERIC_ABBREV_NAN		 NumericAbbrevGetDatum(PG_INT64_MIN)
 #else
-#define NumericAbbrevGetDatum(X) ((Datum) SET_4_BYTES(X))
-#define DatumGetNumericAbbrev(X) ((int32) GET_4_BYTES(X))
+#define NumericAbbrevGetDatum(X) ((Datum) (X))
+#define DatumGetNumericAbbrev(X) ((int32) (X))
 #define NUMERIC_ABBREV_NAN		 NumericAbbrevGetDatum(PG_INT32_MIN)
 #endif
 
@@ -367,59 +368,59 @@ typedef struct NumericSumAccum
  * Some preinitialized constants
  * ----------
  */
-static NumericDigit const_zero_data[1] = {0};
-static NumericVar const_zero =
-{0, 0, NUMERIC_POS, 0, NULL, const_zero_data};
+static const NumericDigit const_zero_data[1] = {0};
+static const NumericVar const_zero =
+{0, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_zero_data};
 
-static NumericDigit const_one_data[1] = {1};
-static NumericVar const_one =
-{1, 0, NUMERIC_POS, 0, NULL, const_one_data};
+static const NumericDigit const_one_data[1] = {1};
+static const NumericVar const_one =
+{1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_one_data};
 
-static NumericDigit const_two_data[1] = {2};
-static NumericVar const_two =
-{1, 0, NUMERIC_POS, 0, NULL, const_two_data};
+static const NumericDigit const_two_data[1] = {2};
+static const NumericVar const_two =
+{1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_two_data};
 
 #if DEC_DIGITS == 4 || DEC_DIGITS == 2
-static NumericDigit const_ten_data[1] = {10};
-static NumericVar const_ten =
-{1, 0, NUMERIC_POS, 0, NULL, const_ten_data};
+static const NumericDigit const_ten_data[1] = {10};
+static const NumericVar const_ten =
+{1, 0, NUMERIC_POS, 0, NULL, (NumericDigit *) const_ten_data};
 #elif DEC_DIGITS == 1
-static NumericDigit const_ten_data[1] = {1};
-static NumericVar const_ten =
-{1, 1, NUMERIC_POS, 0, NULL, const_ten_data};
+static const NumericDigit const_ten_data[1] = {1};
+static const NumericVar const_ten =
+{1, 1, NUMERIC_POS, 0, NULL, (NumericDigit *) const_ten_data};
 #endif
 
 #if DEC_DIGITS == 4
-static NumericDigit const_zero_point_five_data[1] = {5000};
+static const NumericDigit const_zero_point_five_data[1] = {5000};
 #elif DEC_DIGITS == 2
-static NumericDigit const_zero_point_five_data[1] = {50};
+static const NumericDigit const_zero_point_five_data[1] = {50};
 #elif DEC_DIGITS == 1
-static NumericDigit const_zero_point_five_data[1] = {5};
+static const NumericDigit const_zero_point_five_data[1] = {5};
 #endif
-static NumericVar const_zero_point_five =
-{1, -1, NUMERIC_POS, 1, NULL, const_zero_point_five_data};
+static const NumericVar const_zero_point_five =
+{1, -1, NUMERIC_POS, 1, NULL, (NumericDigit *) const_zero_point_five_data};
 
 #if DEC_DIGITS == 4
-static NumericDigit const_zero_point_nine_data[1] = {9000};
+static const NumericDigit const_zero_point_nine_data[1] = {9000};
 #elif DEC_DIGITS == 2
-static NumericDigit const_zero_point_nine_data[1] = {90};
+static const NumericDigit const_zero_point_nine_data[1] = {90};
 #elif DEC_DIGITS == 1
-static NumericDigit const_zero_point_nine_data[1] = {9};
+static const NumericDigit const_zero_point_nine_data[1] = {9};
 #endif
-static NumericVar const_zero_point_nine =
-{1, -1, NUMERIC_POS, 1, NULL, const_zero_point_nine_data};
+static const NumericVar const_zero_point_nine =
+{1, -1, NUMERIC_POS, 1, NULL, (NumericDigit *) const_zero_point_nine_data};
 
 #if DEC_DIGITS == 4
-static NumericDigit const_one_point_one_data[2] = {1, 1000};
+static const NumericDigit const_one_point_one_data[2] = {1, 1000};
 #elif DEC_DIGITS == 2
-static NumericDigit const_one_point_one_data[2] = {1, 10};
+static const NumericDigit const_one_point_one_data[2] = {1, 10};
 #elif DEC_DIGITS == 1
-static NumericDigit const_one_point_one_data[2] = {1, 1};
+static const NumericDigit const_one_point_one_data[2] = {1, 1};
 #endif
-static NumericVar const_one_point_one =
-{2, 0, NUMERIC_POS, 1, NULL, const_one_point_one_data};
+static const NumericVar const_one_point_one =
+{2, 0, NUMERIC_POS, 1, NULL, (NumericDigit *) const_one_point_one_data};
 
-static NumericVar const_nan =
+static const NumericVar const_nan =
 {0, 0, NUMERIC_NAN, 0, NULL, NULL};
 
 #if DEC_DIGITS == 4
@@ -467,74 +468,84 @@ static const char *set_var_from_str(const char *str, const char *cp,
 				 NumericVar *dest);
 static void set_var_from_num(Numeric value, NumericVar *dest);
 static void init_var_from_num(Numeric num, NumericVar *dest);
-static void set_var_from_var(NumericVar *value, NumericVar *dest);
-static char *get_str_from_var(NumericVar *var);
-static char *get_str_from_var_sci(NumericVar *var, int rscale);
+static void set_var_from_var(const NumericVar *value, NumericVar *dest);
+static char *get_str_from_var(const NumericVar *var);
+static char *get_str_from_var_sci(const NumericVar *var, int rscale);
 
-static Numeric make_result(NumericVar *var);
+static Numeric make_result(const NumericVar *var);
 
 static void apply_typmod(NumericVar *var, int32 typmod);
 
-static int32 numericvar_to_int32(NumericVar *var);
-static bool numericvar_to_int64(NumericVar *var, int64 *result);
+static int32 numericvar_to_int32(const NumericVar *var);
+static bool numericvar_to_int64(const NumericVar *var, int64 *result);
 static void int64_to_numericvar(int64 val, NumericVar *var);
 #ifdef HAVE_INT128
-static bool numericvar_to_int128(NumericVar *var, int128 *result);
+static bool numericvar_to_int128(const NumericVar *var, int128 *result);
 static void int128_to_numericvar(int128 val, NumericVar *var);
 #endif
 static double numeric_to_double_no_overflow(Numeric num);
-static double numericvar_to_double_no_overflow(NumericVar *var);
+static double numericvar_to_double_no_overflow(const NumericVar *var);
 
 static Datum numeric_abbrev_convert(Datum original_datum, SortSupport ssup);
 static bool numeric_abbrev_abort(int memtupcount, SortSupport ssup);
 static int	numeric_fast_cmp(Datum x, Datum y, SortSupport ssup);
 static int	numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup);
 
-static Datum numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss);
+static Datum numeric_abbrev_convert_var(const NumericVar *var,
+						   NumericSortSupport *nss);
 
 static int	cmp_numerics(Numeric num1, Numeric num2);
-static int	cmp_var(NumericVar *var1, NumericVar *var2);
+static int	cmp_var(const NumericVar *var1, const NumericVar *var2);
 static int cmp_var_common(const NumericDigit *var1digits, int var1ndigits,
 			   int var1weight, int var1sign,
 			   const NumericDigit *var2digits, int var2ndigits,
 			   int var2weight, int var2sign);
-static void add_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
-static void sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
-static void mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
+static void add_var(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result);
+static void sub_var(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result);
+static void mul_var(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result,
 		int rscale);
-static void div_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
+static void div_var(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result,
 		int rscale, bool round);
-static void div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result,
-			 int rscale, bool round);
-static int	select_div_scale(NumericVar *var1, NumericVar *var2);
-static void mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result);
-static void ceil_var(NumericVar *var, NumericVar *result);
-static void floor_var(NumericVar *var, NumericVar *result);
-
-static void sqrt_var(NumericVar *arg, NumericVar *result, int rscale);
-static void exp_var(NumericVar *arg, NumericVar *result, int rscale);
-static int	estimate_ln_dweight(NumericVar *var);
-static void ln_var(NumericVar *arg, NumericVar *result, int rscale);
-static void log_var(NumericVar *base, NumericVar *num, NumericVar *result);
-static void power_var(NumericVar *base, NumericVar *exp, NumericVar *result);
-static void power_var_int(NumericVar *base, int exp, NumericVar *result,
+static void div_var_fast(const NumericVar *var1, const NumericVar *var2,
+			 NumericVar *result, int rscale, bool round);
+static int	select_div_scale(const NumericVar *var1, const NumericVar *var2);
+static void mod_var(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result);
+static void ceil_var(const NumericVar *var, NumericVar *result);
+static void floor_var(const NumericVar *var, NumericVar *result);
+
+static void sqrt_var(const NumericVar *arg, NumericVar *result, int rscale);
+static void exp_var(const NumericVar *arg, NumericVar *result, int rscale);
+static int	estimate_ln_dweight(const NumericVar *var);
+static void ln_var(const NumericVar *arg, NumericVar *result, int rscale);
+static void log_var(const NumericVar *base, const NumericVar *num,
+		NumericVar *result);
+static void power_var(const NumericVar *base, const NumericVar *exp,
+		  NumericVar *result);
+static void power_var_int(const NumericVar *base, int exp, NumericVar *result,
 			  int rscale);
 
-static int	cmp_abs(NumericVar *var1, NumericVar *var2);
+static int	cmp_abs(const NumericVar *var1, const NumericVar *var2);
 static int cmp_abs_common(const NumericDigit *var1digits, int var1ndigits,
 			   int var1weight,
 			   const NumericDigit *var2digits, int var2ndigits,
 			   int var2weight);
-static void add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
-static void sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result);
+static void add_abs(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result);
+static void sub_abs(const NumericVar *var1, const NumericVar *var2,
+		NumericVar *result);
 static void round_var(NumericVar *var, int rscale);
 static void trunc_var(NumericVar *var, int rscale);
 static void strip_var(NumericVar *var);
 static void compute_bucket(Numeric operand, Numeric bound1, Numeric bound2,
-			   NumericVar *count_var, NumericVar *result_var);
+			   const NumericVar *count_var, NumericVar *result_var);
 
-static void accum_sum_add(NumericSumAccum *accum, NumericVar *var1);
-static void accum_sum_rescale(NumericSumAccum *accum, NumericVar *val);
+static void accum_sum_add(NumericSumAccum *accum, const NumericVar *var1);
+static void accum_sum_rescale(NumericSumAccum *accum, const NumericVar *val);
 static void accum_sum_carry(NumericSumAccum *accum);
 static void accum_sum_reset(NumericSumAccum *accum);
 static void accum_sum_final(NumericSumAccum *accum, NumericVar *result);
@@ -866,12 +877,12 @@ numeric_send(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 
-	pq_sendint(&buf, x.ndigits, sizeof(int16));
-	pq_sendint(&buf, x.weight, sizeof(int16));
-	pq_sendint(&buf, x.sign, sizeof(int16));
-	pq_sendint(&buf, x.dscale, sizeof(int16));
+	pq_sendint16(&buf, x.ndigits);
+	pq_sendint16(&buf, x.weight);
+	pq_sendint16(&buf, x.sign);
+	pq_sendint16(&buf, x.dscale);
 	for (i = 0; i < x.ndigits; i++)
-		pq_sendint(&buf, x.digits[i], sizeof(NumericDigit));
+		pq_sendint16(&buf, x.digits[i]);
 
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
@@ -1551,7 +1562,7 @@ width_bucket_numeric(PG_FUNCTION_ARGS)
  */
 static void
 compute_bucket(Numeric operand, Numeric bound1, Numeric bound2,
-			   NumericVar *count_var, NumericVar *result_var)
+			   const NumericVar *count_var, NumericVar *result_var)
 {
 	NumericVar	bound1_var;
 	NumericVar	bound2_var;
@@ -1883,7 +1894,7 @@ numeric_cmp_abbrev(Datum x, Datum y, SortSupport ssup)
 #if NUMERIC_ABBREV_BITS == 64
 
 static Datum
-numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
+numeric_abbrev_convert_var(const NumericVar *var, NumericSortSupport *nss)
 {
 	int			ndigits = var->ndigits;
 	int			weight = var->weight;
@@ -1938,7 +1949,7 @@ numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
 #if NUMERIC_ABBREV_BITS == 32
 
 static Datum
-numeric_abbrev_convert_var(NumericVar *var, NumericSortSupport *nss)
+numeric_abbrev_convert_var(const NumericVar *var, NumericSortSupport *nss)
 {
 	int			ndigits = var->ndigits;
 	int			weight = var->weight;
@@ -2154,6 +2165,81 @@ cmp_numerics(Numeric num1, Numeric num2)
 	return result;
 }
 
+/*
+ * in_range support function for numeric.
+ */
+Datum
+in_range_numeric_numeric(PG_FUNCTION_ARGS)
+{
+	Numeric		val = PG_GETARG_NUMERIC(0);
+	Numeric		base = PG_GETARG_NUMERIC(1);
+	Numeric		offset = PG_GETARG_NUMERIC(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	bool		result;
+
+	/*
+	 * Reject negative or NaN offset.  Negative is per spec, and NaN is
+	 * because appropriate semantics for that seem non-obvious.
+	 */
+	if (NUMERIC_IS_NAN(offset) || NUMERIC_SIGN(offset) == NUMERIC_NEG)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/*
+	 * Deal with cases where val and/or base is NaN, following the rule that
+	 * NaN sorts after non-NaN (cf cmp_numerics).  The offset cannot affect
+	 * the conclusion.
+	 */
+	if (NUMERIC_IS_NAN(val))
+	{
+		if (NUMERIC_IS_NAN(base))
+			result = true;		/* NAN = NAN */
+		else
+			result = !less;		/* NAN > non-NAN */
+	}
+	else if (NUMERIC_IS_NAN(base))
+	{
+		result = less;			/* non-NAN < NAN */
+	}
+	else
+	{
+		/*
+		 * Otherwise go ahead and compute base +/- offset.  While it's
+		 * possible for this to overflow the numeric format, it's unlikely
+		 * enough that we don't take measures to prevent it.
+		 */
+		NumericVar	valv;
+		NumericVar	basev;
+		NumericVar	offsetv;
+		NumericVar	sum;
+
+		init_var_from_num(val, &valv);
+		init_var_from_num(base, &basev);
+		init_var_from_num(offset, &offsetv);
+		init_var(&sum);
+
+		if (sub)
+			sub_var(&basev, &offsetv, &sum);
+		else
+			add_var(&basev, &offsetv, &sum);
+
+		if (less)
+			result = (cmp_var(&valv, &sum) <= 0);
+		else
+			result = (cmp_var(&valv, &sum) >= 0);
+
+		free_var(&sum);
+	}
+
+	PG_FREE_IF_COPY(val, 0);
+	PG_FREE_IF_COPY(base, 1);
+	PG_FREE_IF_COPY(offset, 2);
+
+	PG_RETURN_BOOL(result);
+}
+
 Datum
 hash_numeric(PG_FUNCTION_ARGS)
 {
@@ -2230,6 +2316,66 @@ hash_numeric(PG_FUNCTION_ARGS)
 	PG_RETURN_DATUM(result);
 }
 
+/*
+ * Returns 64-bit value by hashing a value to a 64-bit value, with a seed.
+ * Otherwise, similar to hash_numeric.
+ */
+Datum
+hash_numeric_extended(PG_FUNCTION_ARGS)
+{
+	Numeric		key = PG_GETARG_NUMERIC(0);
+	uint64		seed = PG_GETARG_INT64(1);
+	Datum		digit_hash;
+	Datum		result;
+	int			weight;
+	int			start_offset;
+	int			end_offset;
+	int			i;
+	int			hash_len;
+	NumericDigit *digits;
+
+	if (NUMERIC_IS_NAN(key))
+		PG_RETURN_UINT64(seed);
+
+	weight = NUMERIC_WEIGHT(key);
+	start_offset = 0;
+	end_offset = 0;
+
+	digits = NUMERIC_DIGITS(key);
+	for (i = 0; i < NUMERIC_NDIGITS(key); i++)
+	{
+		if (digits[i] != (NumericDigit) 0)
+			break;
+
+		start_offset++;
+
+		weight--;
+	}
+
+	if (NUMERIC_NDIGITS(key) == start_offset)
+		PG_RETURN_UINT64(seed - 1);
+
+	for (i = NUMERIC_NDIGITS(key) - 1; i >= 0; i--)
+	{
+		if (digits[i] != (NumericDigit) 0)
+			break;
+
+		end_offset++;
+	}
+
+	Assert(start_offset + end_offset < NUMERIC_NDIGITS(key));
+
+	hash_len = NUMERIC_NDIGITS(key) - start_offset - end_offset;
+	digit_hash = hash_any_extended((unsigned char *) (NUMERIC_DIGITS(key)
+													  + start_offset),
+								   hash_len * sizeof(NumericDigit),
+								   seed);
+
+	result = UInt64GetDatum(DatumGetUInt64(digit_hash) ^ weight);
+
+	PG_RETURN_DATUM(result);
+}
+
 
 /* ----------------------------------------------------------------------
  *
@@ -2942,7 +3088,7 @@ numeric_int4(PG_FUNCTION_ARGS)
  * ereport(). The input NumericVar is *not* free'd.
  */
 static int32
-numericvar_to_int32(NumericVar *var)
+numericvar_to_int32(const NumericVar *var)
 {
 	int32		result;
 	int64		val;
@@ -3073,7 +3219,12 @@ float8_numeric(PG_FUNCTION_ARGS)
 	if (isnan(val))
 		PG_RETURN_NUMERIC(make_result(&const_nan));
 
-	sprintf(buf, "%.*g", DBL_DIG, val);
+	if (isinf(val))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot convert infinity to numeric")));
+
+	snprintf(buf, sizeof(buf), "%.*g", DBL_DIG, val);
 
 	init_var(&result);
 
@@ -3139,7 +3290,12 @@ float4_numeric(PG_FUNCTION_ARGS)
 	if (isnan(val))
 		PG_RETURN_NUMERIC(make_result(&const_nan));
 
-	sprintf(buf, "%.*g", FLT_DIG, val);
+	if (isinf(val))
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("cannot convert infinity to numeric")));
+
+	snprintf(buf, sizeof(buf), "%.*g", FLT_DIG, val);
 
 	init_var(&result);
 
@@ -3613,7 +3769,7 @@ numeric_avg_serialize(PG_FUNCTION_ARGS)
 	pq_sendbytes(&buf, VARDATA_ANY(sumX), VARSIZE_ANY_EXHDR(sumX));
 
 	/* maxScale */
-	pq_sendint(&buf, state->maxScale, 4);
+	pq_sendint32(&buf, state->maxScale);
 
 	/* maxScaleCount */
 	pq_sendint64(&buf, state->maxScaleCount);
@@ -3735,7 +3891,7 @@ numeric_serialize(PG_FUNCTION_ARGS)
 	pq_sendbytes(&buf, VARDATA_ANY(sumX2), VARSIZE_ANY_EXHDR(sumX2));
 
 	/* maxScale */
-	pq_sendint(&buf, state->maxScale, 4);
+	pq_sendint32(&buf, state->maxScale);
 
 	/* maxScaleCount */
 	pq_sendint64(&buf, state->maxScaleCount);
@@ -4659,7 +4815,7 @@ numeric_stddev_internal(NumericAggState *state,
 				vsumX,
 				vsumX2,
 				vNminus1;
-	NumericVar *comp;
+	const NumericVar *comp;
 	int			rscale;
 
 	/* Deal with empty input and NaN-input cases */
@@ -5447,7 +5603,7 @@ zero_var(NumericVar *var)
 static const char *
 set_var_from_str(const char *str, const char *cp, NumericVar *dest)
 {
-	bool		have_dp = FALSE;
+	bool		have_dp = false;
 	int			i;
 	unsigned char *decdigits;
 	int			sign = NUMERIC_POS;
@@ -5478,7 +5634,7 @@ set_var_from_str(const char *str, const char *cp, NumericVar *dest)
 
 	if (*cp == '.')
 	{
-		have_dp = TRUE;
+		have_dp = true;
 		cp++;
 	}
 
@@ -5511,7 +5667,7 @@ set_var_from_str(const char *str, const char *cp, NumericVar *dest)
 						(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
 						 errmsg("invalid input syntax for type %s: \"%s\"",
 								"numeric", str)));
-			have_dp = TRUE;
+			have_dp = true;
 			cp++;
 		}
 		else
@@ -5655,7 +5811,7 @@ init_var_from_num(Numeric num, NumericVar *dest)
  *	Copy one variable into another
  */
 static void
-set_var_from_var(NumericVar *value, NumericVar *dest)
+set_var_from_var(const NumericVar *value, NumericVar *dest)
 {
 	NumericDigit *newbuf;
 
@@ -5681,7 +5837,7 @@ set_var_from_var(NumericVar *value, NumericVar *dest)
  *	Returns a palloc'd string.
  */
 static char *
-get_str_from_var(NumericVar *var)
+get_str_from_var(const NumericVar *var)
 {
 	int			dscale;
 	char	   *str;
@@ -5834,7 +5990,7 @@ get_str_from_var(NumericVar *var)
  *	Returns a palloc'd string.
  */
 static char *
-get_str_from_var_sci(NumericVar *var, int rscale)
+get_str_from_var_sci(const NumericVar *var, int rscale)
 {
 	int32		exponent;
 	NumericVar	denominator;
@@ -5920,7 +6076,7 @@ get_str_from_var_sci(NumericVar *var, int rscale)
  *	a variable.
  */
 static Numeric
-make_result(NumericVar *var)
+make_result(const NumericVar *var)
 {
 	Numeric		result;
 	NumericDigit *digits = var->digits;
@@ -6080,17 +6236,16 @@ apply_typmod(NumericVar *var, int32 typmod)
 /*
  * Convert numeric to int8, rounding if needed.
  *
- * If overflow, return FALSE (no error is raised).  Return TRUE if okay.
+ * If overflow, return false (no error is raised).  Return true if okay.
  */
 static bool
-numericvar_to_int64(NumericVar *var, int64 *result)
+numericvar_to_int64(const NumericVar *var, int64 *result)
 {
 	NumericDigit *digits;
 	int			ndigits;
 	int			weight;
 	int			i;
-	int64		val,
-				oldval;
+	int64		val;
 	bool		neg;
 	NumericVar	rounded;
 
@@ -6116,27 +6271,25 @@ numericvar_to_int64(NumericVar *var, int64 *result)
 	weight = rounded.weight;
 	Assert(weight >= 0 && ndigits <= weight + 1);
 
-	/* Construct the result */
+	/*
+	 * Construct the result. To avoid issues with converting a value
+	 * corresponding to INT64_MIN (which can't be represented as a positive 64
+	 * bit two's complement integer), accumulate value as a negative number.
+	 */
 	digits = rounded.digits;
 	neg = (rounded.sign == NUMERIC_NEG);
-	val = digits[0];
+	val = -digits[0];
 	for (i = 1; i <= weight; i++)
 	{
-		oldval = val;
-		val *= NBASE;
-		if (i < ndigits)
-			val += digits[i];
+		if (unlikely(pg_mul_s64_overflow(val, NBASE, &val)))
+		{
+			free_var(&rounded);
+			return false;
+		}
 
-		/*
-		 * The overflow check is a bit tricky because we want to accept
-		 * INT64_MIN, which will overflow the positive accumulator.  We can
-		 * detect this case easily though because INT64_MIN is the only
-		 * nonzero value for which -val == val (on a two's complement machine,
-		 * anyway).
-		 */
-		if ((val / NBASE) != oldval)	/* possible overflow? */
+		if (i < ndigits)
 		{
-			if (!neg || (-val) != val || val == 0 || oldval < 0)
+			if (unlikely(pg_sub_s64_overflow(val, digits[i], &val)))
 			{
 				free_var(&rounded);
 				return false;
@@ -6146,7 +6299,14 @@ numericvar_to_int64(NumericVar *var, int64 *result)
 
 	free_var(&rounded);
 
-	*result = neg ? -val : val;
+	if (!neg)
+	{
+		if (unlikely(val == PG_INT64_MIN))
+			return false;
+		val = -val;
+	}
+	*result = val;
+
 	return true;
 }
 
@@ -6199,10 +6359,10 @@ int64_to_numericvar(int64 val, NumericVar *var)
 /*
  * Convert numeric to int128, rounding if needed.
  *
- * If overflow, return FALSE (no error is raised).  Return TRUE if okay.
+ * If overflow, return false (no error is raised).  Return true if okay.
  */
 static bool
-numericvar_to_int128(NumericVar *var, int128 *result)
+numericvar_to_int128(const NumericVar *var, int128 *result)
 {
 	NumericDigit *digits;
 	int			ndigits;
@@ -6346,7 +6506,7 @@ numeric_to_double_no_overflow(Numeric num)
 
 /* As above, but work from a NumericVar */
 static double
-numericvar_to_double_no_overflow(NumericVar *var)
+numericvar_to_double_no_overflow(const NumericVar *var)
 {
 	char	   *tmp;
 	double		val;
@@ -6378,7 +6538,7 @@ numericvar_to_double_no_overflow(NumericVar *var)
  *	truncated to no digits.
  */
 static int
-cmp_var(NumericVar *var1, NumericVar *var2)
+cmp_var(const NumericVar *var1, const NumericVar *var2)
 {
 	return cmp_var_common(var1->digits, var1->ndigits,
 						  var1->weight, var1->sign,
@@ -6436,7 +6596,7 @@ cmp_var_common(const NumericDigit *var1digits, int var1ndigits,
  *	result might point to one of the operands too without danger.
  */
 static void
-add_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
+add_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
 {
 	/*
 	 * Decide on the signs of the two variables what to do
@@ -6553,7 +6713,7 @@ add_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
  *	result might point to one of the operands too without danger.
  */
 static void
-sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
+sub_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
 {
 	/*
 	 * Decide on the signs of the two variables what to do
@@ -6674,7 +6834,7 @@ sub_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
  *	in result.  Result is rounded to no more than rscale fractional digits.
  */
 static void
-mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
+mul_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result,
 		int rscale)
 {
 	int			res_ndigits;
@@ -6703,7 +6863,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
 	 */
 	if (var1->ndigits > var2->ndigits)
 	{
-		NumericVar *tmp = var1;
+		const NumericVar *tmp = var1;
 
 		var1 = var2;
 		var2 = tmp;
@@ -6871,7 +7031,7 @@ mul_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
  *	is truncated (towards zero) at that digit.
  */
 static void
-div_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
+div_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result,
 		int rscale, bool round)
 {
 	int			div_ndigits;
@@ -7156,8 +7316,8 @@ div_var(NumericVar *var1, NumericVar *var2, NumericVar *result,
  *	the correct answer is 1.
  */
 static void
-div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result,
-			 int rscale, bool round)
+div_var_fast(const NumericVar *var1, const NumericVar *var2,
+			 NumericVar *result, int rscale, bool round)
 {
 	int			div_ndigits;
 	int			res_sign;
@@ -7451,7 +7611,7 @@ div_var_fast(NumericVar *var1, NumericVar *var2, NumericVar *result,
  * Returns the appropriate result scale for the division result.
  */
 static int
-select_div_scale(NumericVar *var1, NumericVar *var2)
+select_div_scale(const NumericVar *var1, const NumericVar *var2)
 {
 	int			weight1,
 				weight2,
@@ -7520,7 +7680,7 @@ select_div_scale(NumericVar *var1, NumericVar *var2)
  *	Calculate the modulo of two numerics at variable level
  */
 static void
-mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
+mod_var(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
 {
 	NumericVar	tmp;
 
@@ -7549,7 +7709,7 @@ mod_var(NumericVar *var1, NumericVar *var2, NumericVar *result)
  *	on variable level
  */
 static void
-ceil_var(NumericVar *var, NumericVar *result)
+ceil_var(const NumericVar *var, NumericVar *result)
 {
 	NumericVar	tmp;
 
@@ -7573,7 +7733,7 @@ ceil_var(NumericVar *var, NumericVar *result)
  *	on variable level
  */
 static void
-floor_var(NumericVar *var, NumericVar *result)
+floor_var(const NumericVar *var, NumericVar *result)
 {
 	NumericVar	tmp;
 
@@ -7596,7 +7756,7 @@ floor_var(NumericVar *var, NumericVar *result)
  *	Compute the square root of x using Newton's algorithm
  */
 static void
-sqrt_var(NumericVar *arg, NumericVar *result, int rscale)
+sqrt_var(const NumericVar *arg, NumericVar *result, int rscale)
 {
 	NumericVar	tmp_arg;
 	NumericVar	tmp_val;
@@ -7669,7 +7829,7 @@ sqrt_var(NumericVar *arg, NumericVar *result, int rscale)
  *	Raise e to the power of x, computed to rscale fractional digits
  */
 static void
-exp_var(NumericVar *arg, NumericVar *result, int rscale)
+exp_var(const NumericVar *arg, NumericVar *result, int rscale)
 {
 	NumericVar	x;
 	NumericVar	elem;
@@ -7795,7 +7955,7 @@ exp_var(NumericVar *arg, NumericVar *result, int rscale)
  * determine the appropriate rscale when computing natural logarithms.
  */
 static int
-estimate_ln_dweight(NumericVar *var)
+estimate_ln_dweight(const NumericVar *var)
 {
 	int			ln_dweight;
 
@@ -7873,7 +8033,7 @@ estimate_ln_dweight(NumericVar *var)
  *	Compute the natural log of x
  */
 static void
-ln_var(NumericVar *arg, NumericVar *result, int rscale)
+ln_var(const NumericVar *arg, NumericVar *result, int rscale)
 {
 	NumericVar	x;
 	NumericVar	xx;
@@ -7980,7 +8140,7 @@ ln_var(NumericVar *arg, NumericVar *result, int rscale)
  *	Note: this routine chooses dscale of the result.
  */
 static void
-log_var(NumericVar *base, NumericVar *num, NumericVar *result)
+log_var(const NumericVar *base, const NumericVar *num, NumericVar *result)
 {
 	NumericVar	ln_base;
 	NumericVar	ln_num;
@@ -8040,7 +8200,7 @@ log_var(NumericVar *base, NumericVar *num, NumericVar *result)
  *	Note: this routine chooses dscale of the result.
  */
 static void
-power_var(NumericVar *base, NumericVar *exp, NumericVar *result)
+power_var(const NumericVar *base, const NumericVar *exp, NumericVar *result)
 {
 	NumericVar	ln_base;
 	NumericVar	ln_num;
@@ -8155,7 +8315,7 @@ power_var(NumericVar *base, NumericVar *exp, NumericVar *result)
  *	Raise base to the power of exp, where exp is an integer.
  */
 static void
-power_var_int(NumericVar *base, int exp, NumericVar *result, int rscale)
+power_var_int(const NumericVar *base, int exp, NumericVar *result, int rscale)
 {
 	double		f;
 	int			p;
@@ -8345,7 +8505,7 @@ power_var_int(NumericVar *base, int exp, NumericVar *result, int rscale)
  * ----------
  */
 static int
-cmp_abs(NumericVar *var1, NumericVar *var2)
+cmp_abs(const NumericVar *var1, const NumericVar *var2)
 {
 	return cmp_abs_common(var1->digits, var1->ndigits, var1->weight,
 						  var2->digits, var2->ndigits, var2->weight);
@@ -8423,7 +8583,7 @@ cmp_abs_common(const NumericDigit *var1digits, int var1ndigits, int var1weight,
  *	result might point to one of the operands without danger.
  */
 static void
-add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
+add_abs(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
 {
 	NumericDigit *res_buf;
 	NumericDigit *res_digits;
@@ -8508,7 +8668,7 @@ add_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
  *	ABS(var1) MUST BE GREATER OR EQUAL ABS(var2) !!!
  */
 static void
-sub_abs(NumericVar *var1, NumericVar *var2, NumericVar *result)
+sub_abs(const NumericVar *var1, const NumericVar *var2, NumericVar *result)
 {
 	NumericDigit *res_buf;
 	NumericDigit *res_digits;
@@ -8815,7 +8975,7 @@ accum_sum_reset(NumericSumAccum *accum)
  * Accumulate a new value.
  */
 static void
-accum_sum_add(NumericSumAccum *accum, NumericVar *val)
+accum_sum_add(NumericSumAccum *accum, const NumericVar *val)
 {
 	int32	   *accum_digits;
 	int			i,
@@ -8936,7 +9096,7 @@ accum_sum_carry(NumericSumAccum *accum)
  * accumulator, enlarge the buffers.
  */
 static void
-accum_sum_rescale(NumericSumAccum *accum, NumericVar *val)
+accum_sum_rescale(NumericSumAccum *accum, const NumericVar *val)
 {
 	int			old_weight = accum->weight;
 	int			old_ndigits = accum->ndigits;
diff --git a/src/backend/utils/adt/numutils.c b/src/backend/utils/adt/numutils.c
index 07682723b7..b5439f497c 100644
--- a/src/backend/utils/adt/numutils.c
+++ b/src/backend/utils/adt/numutils.c
@@ -3,7 +3,7 @@
  * numutils.c
  *	  utility functions for I/O of built-in numeric types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -48,8 +48,8 @@ pg_atoi(const char *s, int size, int c)
 	if (*s == 0)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	errno = 0;
 	l = strtol(s, &badp, 10);
@@ -58,8 +58,8 @@ pg_atoi(const char *s, int size, int c)
 	if (s == badp)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	switch (size)
 	{
@@ -102,8 +102,8 @@ pg_atoi(const char *s, int size, int c)
 	if (*badp && *badp != c)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-				 errmsg("invalid input syntax for %s: \"%s\"",
-						"integer", s)));
+				 errmsg("invalid input syntax for integer: \"%s\"",
+						s)));
 
 	return (int32) l;
 }
diff --git a/src/backend/utils/adt/oid.c b/src/backend/utils/adt/oid.c
index 7baaa1dd4e..b0670e0d9f 100644
--- a/src/backend/utils/adt/oid.c
+++ b/src/backend/utils/adt/oid.c
@@ -3,7 +3,7 @@
  * oid.c
  *	  Functions for the built-in type Oid ... also oidvector.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -154,7 +154,7 @@ oidsend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(Oid));
+	pq_sendint32(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index b82016500b..331c18517a 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -2,7 +2,7 @@
  * oracle_compat.c
  *	Oracle compatible functions.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *	Author: Edmund Mergl <E.Mergl@bawue.de>
  *	Multibyte enhancement: Tatsuo Ishii <ishii@postgresql.org>
@@ -15,6 +15,7 @@
  */
 #include "postgres.h"
 
+#include "common/int.h"
 #include "utils/builtins.h"
 #include "utils/formatting.h"
 #include "mb/pg_wchar.h"
@@ -1045,19 +1046,12 @@ repeat(PG_FUNCTION_ARGS)
 		count = 0;
 
 	slen = VARSIZE_ANY_EXHDR(string);
-	tlen = VARHDRSZ + (count * slen);
 
-	/* Check for integer overflow */
-	if (slen != 0 && count != 0)
-	{
-		int			check = count * slen;
-		int			check2 = check + VARHDRSZ;
-
-		if ((check / slen) != count || check2 <= check)
-			ereport(ERROR,
-					(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
-					 errmsg("requested length too large")));
-	}
+	if (unlikely(pg_mul_s32_overflow(count, slen, &tlen)) ||
+		unlikely(pg_add_s32_overflow(tlen, VARHDRSZ, &tlen)))
+		ereport(ERROR,
+				(errcode(ERRCODE_PROGRAM_LIMIT_EXCEEDED),
+				 errmsg("requested length too large")));
 
 	result = (text *) palloc(tlen);
 
diff --git a/src/backend/utils/adt/orderedsetaggs.c b/src/backend/utils/adt/orderedsetaggs.c
index 8502fcfc82..50b34fcbc6 100644
--- a/src/backend/utils/adt/orderedsetaggs.c
+++ b/src/backend/utils/adt/orderedsetaggs.c
@@ -3,7 +3,7 @@
  * orderedsetaggs.c
  *		Ordered-set aggregate functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -27,6 +27,7 @@
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/lsyscache.h"
+#include "utils/memutils.h"
 #include "utils/timestamp.h"
 #include "utils/tuplesort.h"
 
@@ -40,14 +41,24 @@
  * create just once per query because they will not change across groups.
  * The per-query struct and subsidiary data live in the executor's per-query
  * memory context, and go away implicitly at ExecutorEnd().
+ *
+ * These structs are set up during the first call of the transition function.
+ * Because we allow nodeAgg.c to merge ordered-set aggregates (but not
+ * hypothetical aggregates) with identical inputs and transition functions,
+ * this info must not depend on the particular aggregate (ie, particular
+ * final-function), nor on the direct argument(s) of the aggregate.
  */
 
 typedef struct OSAPerQueryState
 {
-	/* Aggref for this aggregate: */
+	/* Representative Aggref for this aggregate: */
 	Aggref	   *aggref;
 	/* Memory context containing this struct and other per-query data: */
 	MemoryContext qcontext;
+	/* Context for expression evaluation */
+	ExprContext *econtext;
+	/* Do we expect multiple final-function calls within one group? */
+	bool		rescan_needed;
 
 	/* These fields are used only when accumulating tuples: */
 
@@ -63,7 +74,7 @@ typedef struct OSAPerQueryState
 	Oid		   *sortCollations;
 	bool	   *sortNullsFirsts;
 	/* Equality operator call info, created only if needed: */
-	FmgrInfo   *equalfns;
+	ExprState  *compareTuple;
 
 	/* These fields are used only when accumulating datums: */
 
@@ -91,6 +102,8 @@ typedef struct OSAPerGroupState
 	Tuplesortstate *sortstate;
 	/* Number of normal rows inserted into sortstate: */
 	int64		number_of_rows;
+	/* Have we already done tuplesort_performsort? */
+	bool		sort_done;
 } OSAPerGroupState;
 
 static void ordered_set_shutdown(Datum arg);
@@ -146,6 +159,9 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
 		qstate->aggref = aggref;
 		qstate->qcontext = qcontext;
 
+		/* We need to support rescans if the trans state is shared */
+		qstate->rescan_needed = AggStateIsShared(fcinfo);
+
 		/* Extract the sort information */
 		sortlist = aggref->aggorder;
 		numSortCols = list_length(sortlist);
@@ -277,15 +293,20 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
 												   qstate->sortOperators,
 												   qstate->sortCollations,
 												   qstate->sortNullsFirsts,
-												   work_mem, false);
+												   work_mem,
+												   NULL,
+												   qstate->rescan_needed);
 	else
 		osastate->sortstate = tuplesort_begin_datum(qstate->sortColType,
 													qstate->sortOperator,
 													qstate->sortCollation,
 													qstate->sortNullsFirst,
-													work_mem, false);
+													work_mem,
+													NULL,
+													qstate->rescan_needed);
 
 	osastate->number_of_rows = 0;
+	osastate->sort_done = false;
 
 	/* Now register a shutdown callback to clean things up at end of group */
 	AggRegisterCallback(fcinfo,
@@ -306,14 +327,12 @@ ordered_set_startup(FunctionCallInfo fcinfo, bool use_tuples)
  * group) by ExecutorEnd.  But we must take care to release any potential
  * non-memory resources.
  *
- * This callback is arguably unnecessary, since we don't support use of
- * ordered-set aggs in AGG_HASHED mode and there is currently no non-error
- * code path in non-hashed modes wherein nodeAgg.c won't call the finalfn
- * after calling the transfn one or more times.  So in principle we could rely
- * on the finalfn to delete the tuplestore etc.  However, it's possible that
- * such a code path might exist in future, and in any case it'd be
- * notationally tedious and sometimes require extra data copying to ensure
- * we always delete the tuplestore in the finalfn.
+ * In the case where we're not expecting multiple finalfn calls, we could
+ * arguably rely on the finalfn to clean up; but it's easier and more testable
+ * if we just do it the same way in either case.  Note that many of the
+ * finalfns could *not* free the tuplesort object, at least not without extra
+ * data copying, because what they return is a pointer to a datum inside the
+ * tuplesort object.
  */
 static void
 ordered_set_shutdown(Datum arg)
@@ -436,8 +455,14 @@ percentile_disc_final(PG_FUNCTION_ARGS)
 	if (osastate->number_of_rows == 0)
 		PG_RETURN_NULL();
 
-	/* Finish the sort */
-	tuplesort_performsort(osastate->sortstate);
+	/* Finish the sort, or rescan if we already did */
+	if (!osastate->sort_done)
+	{
+		tuplesort_performsort(osastate->sortstate);
+		osastate->sort_done = true;
+	}
+	else
+		tuplesort_rescan(osastate->sortstate);
 
 	/*----------
 	 * We need the smallest K such that (K/N) >= percentile.
@@ -457,13 +482,6 @@ percentile_disc_final(PG_FUNCTION_ARGS)
 	if (!tuplesort_getdatum(osastate->sortstate, true, &val, &isnull, NULL))
 		elog(ERROR, "missing row in percentile_disc");
 
-	/*
-	 * Note: we *cannot* clean up the tuplesort object here, because the value
-	 * to be returned is allocated inside its sortcontext.  We could use
-	 * datumCopy to copy it out of there, but it doesn't seem worth the
-	 * trouble, since the cleanup callback will clear the tuplesort later.
-	 */
-
 	/* We shouldn't have stored any nulls, but do the right thing anyway */
 	if (isnull)
 		PG_RETURN_NULL();
@@ -543,8 +561,14 @@ percentile_cont_final_common(FunctionCallInfo fcinfo,
 
 	Assert(expect_type == osastate->qstate->sortColType);
 
-	/* Finish the sort */
-	tuplesort_performsort(osastate->sortstate);
+	/* Finish the sort, or rescan if we already did */
+	if (!osastate->sort_done)
+	{
+		tuplesort_performsort(osastate->sortstate);
+		osastate->sort_done = true;
+	}
+	else
+		tuplesort_rescan(osastate->sortstate);
 
 	first_row = floor(percentile * (osastate->number_of_rows - 1));
 	second_row = ceil(percentile * (osastate->number_of_rows - 1));
@@ -575,13 +599,6 @@ percentile_cont_final_common(FunctionCallInfo fcinfo,
 		val = lerpfunc(first_val, second_val, proportion);
 	}
 
-	/*
-	 * Note: we *cannot* clean up the tuplesort object here, because the value
-	 * to be returned may be allocated inside its sortcontext.  We could use
-	 * datumCopy to copy it out of there, but it doesn't seem worth the
-	 * trouble, since the cleanup callback will clear the tuplesort later.
-	 */
-
 	PG_RETURN_DATUM(val);
 }
 
@@ -779,8 +796,14 @@ percentile_disc_multi_final(PG_FUNCTION_ARGS)
 	 */
 	if (i < num_percentiles)
 	{
-		/* Finish the sort */
-		tuplesort_performsort(osastate->sortstate);
+		/* Finish the sort, or rescan if we already did */
+		if (!osastate->sort_done)
+		{
+			tuplesort_performsort(osastate->sortstate);
+			osastate->sort_done = true;
+		}
+		else
+			tuplesort_rescan(osastate->sortstate);
 
 		for (; i < num_percentiles; i++)
 		{
@@ -804,11 +827,6 @@ percentile_disc_multi_final(PG_FUNCTION_ARGS)
 		}
 	}
 
-	/*
-	 * We could clean up the tuplesort object after forming the array, but
-	 * probably not worth the trouble.
-	 */
-
 	/* We make the output array the same shape as the input */
 	PG_RETURN_POINTER(construct_md_array(result_datum, result_isnull,
 										 ARR_NDIM(param),
@@ -902,8 +920,14 @@ percentile_cont_multi_final_common(FunctionCallInfo fcinfo,
 	 */
 	if (i < num_percentiles)
 	{
-		/* Finish the sort */
-		tuplesort_performsort(osastate->sortstate);
+		/* Finish the sort, or rescan if we already did */
+		if (!osastate->sort_done)
+		{
+			tuplesort_performsort(osastate->sortstate);
+			osastate->sort_done = true;
+		}
+		else
+			tuplesort_rescan(osastate->sortstate);
 
 		for (; i < num_percentiles; i++)
 		{
@@ -962,11 +986,6 @@ percentile_cont_multi_final_common(FunctionCallInfo fcinfo,
 		}
 	}
 
-	/*
-	 * We could clean up the tuplesort object after forming the array, but
-	 * probably not worth the trouble.
-	 */
-
 	/* We make the output array the same shape as the input */
 	PG_RETURN_POINTER(construct_md_array(result_datum, result_isnull,
 										 ARR_NDIM(param),
@@ -1043,8 +1062,14 @@ mode_final(PG_FUNCTION_ARGS)
 
 	shouldfree = !(osastate->qstate->typByVal);
 
-	/* Finish the sort */
-	tuplesort_performsort(osastate->sortstate);
+	/* Finish the sort, or rescan if we already did */
+	if (!osastate->sort_done)
+	{
+		tuplesort_performsort(osastate->sortstate);
+		osastate->sort_done = true;
+	}
+	else
+		tuplesort_rescan(osastate->sortstate);
 
 	/* Scan tuples and count frequencies */
 	while (tuplesort_getdatum(osastate->sortstate, true, &val, &isnull, &abbrev_val))
@@ -1097,13 +1122,6 @@ mode_final(PG_FUNCTION_ARGS)
 	if (shouldfree && !last_val_is_mode)
 		pfree(DatumGetPointer(last_val));
 
-	/*
-	 * Note: we *cannot* clean up the tuplesort object here, because the value
-	 * to be returned is allocated inside its sortcontext.  We could use
-	 * datumCopy to copy it out of there, but it doesn't seem worth the
-	 * trouble, since the cleanup callback will clear the tuplesort later.
-	 */
-
 	if (mode_freq)
 		PG_RETURN_DATUM(mode_val);
 	else
@@ -1125,13 +1143,15 @@ hypothetical_check_argtypes(FunctionCallInfo fcinfo, int nargs,
 	/* check that we have an int4 flag column */
 	if (!tupdesc ||
 		(nargs + 1) != tupdesc->natts ||
-		tupdesc->attrs[nargs]->atttypid != INT4OID)
+		TupleDescAttr(tupdesc, nargs)->atttypid != INT4OID)
 		elog(ERROR, "type mismatch in hypothetical-set function");
 
 	/* check that direct args match in type with aggregated args */
 	for (i = 0; i < nargs; i++)
 	{
-		if (get_fn_expr_argtype(fcinfo->flinfo, i + 1) != tupdesc->attrs[i]->atttypid)
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+		if (get_fn_expr_argtype(fcinfo->flinfo, i + 1) != attr->atttypid)
 			elog(ERROR, "type mismatch in hypothetical-set function");
 	}
 }
@@ -1172,6 +1192,9 @@ hypothetical_rank_common(FunctionCallInfo fcinfo, int flag,
 
 	hypothetical_check_argtypes(fcinfo, nargs, osastate->qstate->tupdesc);
 
+	/* because we need a hypothetical row, we can't share transition state */
+	Assert(!osastate->sort_done);
+
 	/* insert the hypothetical row into the sort */
 	slot = osastate->qstate->tupslot;
 	ExecClearTuple(slot);
@@ -1188,6 +1211,7 @@ hypothetical_rank_common(FunctionCallInfo fcinfo, int flag,
 
 	/* finish the sort */
 	tuplesort_performsort(osastate->sortstate);
+	osastate->sort_done = true;
 
 	/* iterate till we find the hypothetical row */
 	while (tuplesort_gettupleslot(osastate->sortstate, true, true, slot, NULL))
@@ -1205,10 +1229,6 @@ hypothetical_rank_common(FunctionCallInfo fcinfo, int flag,
 
 	ExecClearTuple(slot);
 
-	/* Might as well clean up the tuplesort object immediately */
-	tuplesort_end(osastate->sortstate);
-	osastate->sortstate = NULL;
-
 	return rank;
 }
 
@@ -1270,6 +1290,8 @@ hypothetical_cume_dist_final(PG_FUNCTION_ARGS)
 Datum
 hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 {
+	ExprContext *econtext;
+	ExprState  *compareTuple;
 	int			nargs = PG_NARGS() - 1;
 	int64		rank = 1;
 	int64		duplicate_count = 0;
@@ -1277,12 +1299,9 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 	int			numDistinctCols;
 	Datum		abbrevVal = (Datum) 0;
 	Datum		abbrevOld = (Datum) 0;
-	AttrNumber *sortColIdx;
-	FmgrInfo   *equalfns;
 	TupleTableSlot *slot;
 	TupleTableSlot *extraslot;
 	TupleTableSlot *slot2;
-	MemoryContext tmpcontext;
 	int			i;
 
 	Assert(AggCheckCallContext(fcinfo, NULL) == AGG_CONTEXT_AGGREGATE);
@@ -1292,6 +1311,9 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 		PG_RETURN_INT64(rank);
 
 	osastate = (OSAPerGroupState *) PG_GETARG_POINTER(0);
+	econtext = osastate->qstate->econtext;
+	if (!econtext)
+		osastate->qstate->econtext = econtext = CreateStandaloneExprContext();
 
 	/* Adjust nargs to be the number of direct (or aggregated) args */
 	if (nargs % 2 != 0)
@@ -1306,26 +1328,25 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 	 */
 	numDistinctCols = osastate->qstate->numSortCols - 1;
 
-	/* Look up the equality function(s), if we didn't already */
-	equalfns = osastate->qstate->equalfns;
-	if (equalfns == NULL)
+	/* Build tuple comparator, if we didn't already */
+	compareTuple = osastate->qstate->compareTuple;
+	if (compareTuple == NULL)
 	{
-		MemoryContext qcontext = osastate->qstate->qcontext;
-
-		equalfns = (FmgrInfo *)
-			MemoryContextAlloc(qcontext, numDistinctCols * sizeof(FmgrInfo));
-		for (i = 0; i < numDistinctCols; i++)
-		{
-			fmgr_info_cxt(get_opcode(osastate->qstate->eqOperators[i]),
-						  &equalfns[i],
-						  qcontext);
-		}
-		osastate->qstate->equalfns = equalfns;
+		AttrNumber *sortColIdx = osastate->qstate->sortColIdx;
+		MemoryContext oldContext;
+
+		oldContext = MemoryContextSwitchTo(osastate->qstate->qcontext);
+		compareTuple = execTuplesMatchPrepare(osastate->qstate->tupdesc,
+											  numDistinctCols,
+											  sortColIdx,
+											  osastate->qstate->eqOperators,
+											  NULL);
+		MemoryContextSwitchTo(oldContext);
+		osastate->qstate->compareTuple = compareTuple;
 	}
-	sortColIdx = osastate->qstate->sortColIdx;
 
-	/* Get short-term context we can use for execTuplesMatch */
-	tmpcontext = AggGetTempMemoryContext(fcinfo);
+	/* because we need a hypothetical row, we can't share transition state */
+	Assert(!osastate->sort_done);
 
 	/* insert the hypothetical row into the sort */
 	slot = osastate->qstate->tupslot;
@@ -1343,6 +1364,7 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 
 	/* finish the sort */
 	tuplesort_performsort(osastate->sortstate);
+	osastate->sort_done = true;
 
 	/*
 	 * We alternate fetching into tupslot and extraslot so that we have the
@@ -1364,19 +1386,18 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 			break;
 
 		/* count non-distinct tuples */
+		econtext->ecxt_outertuple = slot;
+		econtext->ecxt_innertuple = slot2;
+
 		if (!TupIsNull(slot2) &&
 			abbrevVal == abbrevOld &&
-			execTuplesMatch(slot, slot2,
-							numDistinctCols,
-							sortColIdx,
-							equalfns,
-							tmpcontext))
+			ExecQualAndReset(compareTuple, econtext))
 			duplicate_count++;
 
 		tmpslot = slot2;
 		slot2 = slot;
 		slot = tmpslot;
-		/* avoid execTuplesMatch() calls by reusing abbreviated keys */
+		/* avoid ExecQual() calls by reusing abbreviated keys */
 		abbrevOld = abbrevVal;
 
 		rank++;
@@ -1389,10 +1410,6 @@ hypothetical_dense_rank_final(PG_FUNCTION_ARGS)
 
 	ExecDropSingleTupleTableSlot(extraslot);
 
-	/* Might as well clean up the tuplesort object immediately */
-	tuplesort_end(osastate->sortstate);
-	osastate->sortstate = NULL;
-
 	rank = rank - duplicate_count;
 
 	PG_RETURN_INT64(rank);
diff --git a/src/backend/utils/adt/pg_locale.c b/src/backend/utils/adt/pg_locale.c
index 13e7625b20..a3dc3be5a8 100644
--- a/src/backend/utils/adt/pg_locale.c
+++ b/src/backend/utils/adt/pg_locale.c
@@ -2,7 +2,7 @@
  *
  * PostgreSQL locale utilities
  *
- * Portions Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/backend/utils/adt/pg_locale.c
  *
@@ -1292,7 +1292,8 @@ pg_newlocale_from_collation(Oid collid)
 		Form_pg_collation collform;
 		const char *collcollate;
 		const char *collctype pg_attribute_unused();
-		pg_locale_t result;
+		struct pg_locale_struct result;
+		pg_locale_t resultp;
 		Datum		collversion;
 		bool		isnull;
 
@@ -1304,9 +1305,9 @@ pg_newlocale_from_collation(Oid collid)
 		collcollate = NameStr(collform->collcollate);
 		collctype = NameStr(collform->collctype);
 
-		result = malloc(sizeof(*result));
-		memset(result, 0, sizeof(*result));
-		result->provider = collform->collprovider;
+		/* We'll fill in the result struct locally before allocating memory */
+		memset(&result, 0, sizeof(result));
+		result.provider = collform->collprovider;
 
 		if (collform->collprovider == COLLPROVIDER_LIBC)
 		{
@@ -1353,7 +1354,7 @@ pg_newlocale_from_collation(Oid collid)
 #endif
 			}
 
-			result->info.lt = loc;
+			result.info.lt = loc;
 #else							/* not HAVE_LOCALE_T */
 			/* platform that doesn't support locale_t */
 			ereport(ERROR,
@@ -1379,8 +1380,10 @@ pg_newlocale_from_collation(Oid collid)
 						(errmsg("could not open collator for locale \"%s\": %s",
 								collcollate, u_errorName(status))));
 
-			result->info.icu.locale = strdup(collcollate);
-			result->info.icu.ucol = collator;
+			/* We will leak this string if we get an error below :-( */
+			result.info.icu.locale = MemoryContextStrdup(TopMemoryContext,
+														 collcollate);
+			result.info.icu.ucol = collator;
 #else							/* not USE_ICU */
 			/* could get here if a collation was created by a build with ICU */
 			ereport(ERROR,
@@ -1427,7 +1430,11 @@ pg_newlocale_from_collation(Oid collid)
 
 		ReleaseSysCache(tp);
 
-		cache_entry->locale = result;
+		/* We'll keep the pg_locale_t structures in TopMemoryContext */
+		resultp = MemoryContextAlloc(TopMemoryContext, sizeof(*resultp));
+		*resultp = result;
+
+		cache_entry->locale = resultp;
 	}
 
 	return cache_entry->locale;
@@ -1580,6 +1587,7 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar)
 
 	return len_result;
 }
+
 #endif							/* USE_ICU */
 
 /*
@@ -1587,8 +1595,6 @@ icu_from_uchar(char **result, const UChar *buff_uchar, int32_t len_uchar)
  * Therefore we keep them here rather than with the mbutils code.
  */
 
-#ifdef USE_WIDE_UPPER_LOWER
-
 /*
  * wchar2char --- convert wide characters to multibyte format
  *
@@ -1755,5 +1761,3 @@ char2wchar(wchar_t *to, size_t tolen, const char *from, size_t fromlen,
 
 	return result;
 }
-
-#endif							/* USE_WIDE_UPPER_LOWER */
diff --git a/src/backend/utils/adt/pg_lsn.c b/src/backend/utils/adt/pg_lsn.c
index aefbb87680..f4eae9d83d 100644
--- a/src/backend/utils/adt/pg_lsn.c
+++ b/src/backend/utils/adt/pg_lsn.c
@@ -3,7 +3,7 @@
  * pg_lsn.c
  *	  Operations for the pg_lsn datatype.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -179,6 +179,12 @@ pg_lsn_hash(PG_FUNCTION_ARGS)
 	return hashint8(fcinfo);
 }
 
+Datum
+pg_lsn_hash_extended(PG_FUNCTION_ARGS)
+{
+	return hashint8extended(fcinfo);
+}
+
 
 /*----------------------------------------------------------
  *	Arithmetic operators on PostgreSQL LSNs.
diff --git a/src/backend/utils/adt/pg_upgrade_support.c b/src/backend/utils/adt/pg_upgrade_support.c
index c0b0474628..0c54b02542 100644
--- a/src/backend/utils/adt/pg_upgrade_support.c
+++ b/src/backend/utils/adt/pg_upgrade_support.c
@@ -5,7 +5,7 @@
  *	to control oid and relfilenode assignment, and do other special
  *	hacks needed for pg_upgrade.
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/backend/utils/adt/pg_upgrade_support.c
  */
 
diff --git a/src/backend/utils/adt/pgstatfuncs.c b/src/backend/utils/adt/pgstatfuncs.c
index 20ce48b2d8..6110e40d3e 100644
--- a/src/backend/utils/adt/pgstatfuncs.c
+++ b/src/backend/utils/adt/pgstatfuncs.c
@@ -3,7 +3,7 @@
  * pgstatfuncs.c
  *	  Functions for accessing the statistics collector data
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -21,6 +21,7 @@
 #include "funcapi.h"
 #include "miscadmin.h"
 #include "pgstat.h"
+#include "postmaster/bgworker_internals.h"
 #include "postmaster/postmaster.h"
 #include "storage/proc.h"
 #include "storage/procarray.h"
@@ -664,6 +665,7 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 			is_member_of_role(GetUserId(), DEFAULT_ROLE_READ_ALL_STATS))
 		{
 			SockAddr	zero_clientaddr;
+			char	   *clipped_activity;
 
 			switch (beentry->st_state)
 			{
@@ -690,7 +692,9 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 					break;
 			}
 
-			values[5] = CStringGetTextDatum(beentry->st_activity);
+			clipped_activity = pgstat_clip_activity(beentry->st_activity_raw);
+			values[5] = CStringGetTextDatum(clipped_activity);
+			pfree(clipped_activity);
 
 			proc = BackendPidGetProc(beentry->st_procpid);
 			if (proc != NULL)
@@ -820,8 +824,19 @@ pg_stat_get_activity(PG_FUNCTION_ARGS)
 				}
 			}
 			/* Add backend type */
-			values[17] =
-				CStringGetTextDatum(pgstat_get_backend_desc(beentry->st_backendType));
+			if (beentry->st_backendType == B_BG_WORKER)
+			{
+				const char *bgw_type;
+
+				bgw_type = GetBackgroundWorkerTypeByPid(beentry->st_procpid);
+				if (bgw_type)
+					values[17] = CStringGetTextDatum(bgw_type);
+				else
+					nulls[17] = true;
+			}
+			else
+				values[17] =
+					CStringGetTextDatum(pgstat_get_backend_desc(beentry->st_backendType));
 		}
 		else
 		{
@@ -906,17 +921,23 @@ pg_stat_get_backend_activity(PG_FUNCTION_ARGS)
 	int32		beid = PG_GETARG_INT32(0);
 	PgBackendStatus *beentry;
 	const char *activity;
+	char	   *clipped_activity;
+	text	   *ret;
 
 	if ((beentry = pgstat_fetch_stat_beentry(beid)) == NULL)
 		activity = "<backend information not available>";
 	else if (!has_privs_of_role(GetUserId(), beentry->st_userid))
 		activity = "<insufficient privilege>";
-	else if (*(beentry->st_activity) == '\0')
+	else if (*(beentry->st_activity_raw) == '\0')
 		activity = "<command string not enabled>";
 	else
-		activity = beentry->st_activity;
+		activity = beentry->st_activity_raw;
+
+	clipped_activity = pgstat_clip_activity(activity);
+	ret = cstring_to_text(activity);
+	pfree(clipped_activity);
 
-	PG_RETURN_TEXT_P(cstring_to_text(activity));
+	PG_RETURN_TEXT_P(ret);
 }
 
 Datum
diff --git a/src/backend/utils/adt/pseudotypes.c b/src/backend/utils/adt/pseudotypes.c
index be793539a3..dbe67cdb4c 100644
--- a/src/backend/utils/adt/pseudotypes.c
+++ b/src/backend/utils/adt/pseudotypes.c
@@ -11,7 +11,7 @@
  * we do better?)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/adt/quote.c b/src/backend/utils/adt/quote.c
index 43e5bb7962..699ca4a419 100644
--- a/src/backend/utils/adt/quote.c
+++ b/src/backend/utils/adt/quote.c
@@ -3,7 +3,7 @@
  * quote.c
  *	  Functions for quoting identifiers and literals
  *
- * Portions Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/rangetypes.c b/src/backend/utils/adt/rangetypes.c
index 09a4f14a17..5a5d0a0b8f 100644
--- a/src/backend/utils/adt/rangetypes.c
+++ b/src/backend/utils/adt/rangetypes.c
@@ -19,7 +19,7 @@
  * value; we must detoast it first.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -115,13 +115,13 @@ range_in(PG_FUNCTION_ARGS)
 	/* serialize and canonicalize */
 	range = make_range(cache->typcache, &lower, &upper, flags & RANGE_EMPTY);
 
-	PG_RETURN_RANGE(range);
+	PG_RETURN_RANGE_P(range);
 }
 
 Datum
 range_out(PG_FUNCTION_ARGS)
 {
-	RangeType  *range = PG_GETARG_RANGE(0);
+	RangeType  *range = PG_GETARG_RANGE_P(0);
 	char	   *output_str;
 	RangeIOData *cache;
 	char		flags;
@@ -238,13 +238,13 @@ range_recv(PG_FUNCTION_ARGS)
 	/* serialize and canonicalize */
 	range = make_range(cache->typcache, &lower, &upper, flags & RANGE_EMPTY);
 
-	PG_RETURN_RANGE(range);
+	PG_RETURN_RANGE_P(range);
 }
 
 Datum
 range_send(PG_FUNCTION_ARGS)
 {
-	RangeType  *range = PG_GETARG_RANGE(0);
+	RangeType  *range = PG_GETARG_RANGE_P(0);
 	StringInfo	buf = makeStringInfo();
 	RangeIOData *cache;
 	char		flags;
@@ -272,7 +272,7 @@ range_send(PG_FUNCTION_ARGS)
 		uint32		bound_len = VARSIZE(bound) - VARHDRSZ;
 		char	   *bound_data = VARDATA(bound);
 
-		pq_sendint(buf, bound_len, 4);
+		pq_sendint32(buf, bound_len);
 		pq_sendbytes(buf, bound_data, bound_len);
 	}
 
@@ -283,7 +283,7 @@ range_send(PG_FUNCTION_ARGS)
 		uint32		bound_len = VARSIZE(bound) - VARHDRSZ;
 		char	   *bound_data = VARDATA(bound);
 
-		pq_sendint(buf, bound_len, 4);
+		pq_sendint32(buf, bound_len);
 		pq_sendbytes(buf, bound_data, bound_len);
 	}
 
@@ -381,7 +381,7 @@ range_constructor2(PG_FUNCTION_ARGS)
 
 	range = make_range(typcache, &lower, &upper, false);
 
-	PG_RETURN_RANGE(range);
+	PG_RETURN_RANGE_P(range);
 }
 
 /* Construct general range value from three arguments */
@@ -418,7 +418,7 @@ range_constructor3(PG_FUNCTION_ARGS)
 
 	range = make_range(typcache, &lower, &upper, false);
 
-	PG_RETURN_RANGE(range);
+	PG_RETURN_RANGE_P(range);
 }
 
 
@@ -428,7 +428,7 @@ range_constructor3(PG_FUNCTION_ARGS)
 Datum
 range_lower(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	TypeCacheEntry *typcache;
 	RangeBound	lower;
 	RangeBound	upper;
@@ -449,7 +449,7 @@ range_lower(PG_FUNCTION_ARGS)
 Datum
 range_upper(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	TypeCacheEntry *typcache;
 	RangeBound	lower;
 	RangeBound	upper;
@@ -473,7 +473,7 @@ range_upper(PG_FUNCTION_ARGS)
 Datum
 range_empty(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	char		flags = range_get_flags(r1);
 
 	PG_RETURN_BOOL(flags & RANGE_EMPTY);
@@ -483,7 +483,7 @@ range_empty(PG_FUNCTION_ARGS)
 Datum
 range_lower_inc(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	char		flags = range_get_flags(r1);
 
 	PG_RETURN_BOOL(flags & RANGE_LB_INC);
@@ -493,7 +493,7 @@ range_lower_inc(PG_FUNCTION_ARGS)
 Datum
 range_upper_inc(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	char		flags = range_get_flags(r1);
 
 	PG_RETURN_BOOL(flags & RANGE_UB_INC);
@@ -503,7 +503,7 @@ range_upper_inc(PG_FUNCTION_ARGS)
 Datum
 range_lower_inf(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	char		flags = range_get_flags(r1);
 
 	PG_RETURN_BOOL(flags & RANGE_LB_INF);
@@ -513,7 +513,7 @@ range_lower_inf(PG_FUNCTION_ARGS)
 Datum
 range_upper_inf(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
 	char		flags = range_get_flags(r1);
 
 	PG_RETURN_BOOL(flags & RANGE_UB_INF);
@@ -526,7 +526,7 @@ range_upper_inf(PG_FUNCTION_ARGS)
 Datum
 range_contains_elem(PG_FUNCTION_ARGS)
 {
-	RangeType  *r = PG_GETARG_RANGE(0);
+	RangeType  *r = PG_GETARG_RANGE_P(0);
 	Datum		val = PG_GETARG_DATUM(1);
 	TypeCacheEntry *typcache;
 
@@ -540,7 +540,7 @@ Datum
 elem_contained_by_range(PG_FUNCTION_ARGS)
 {
 	Datum		val = PG_GETARG_DATUM(0);
-	RangeType  *r = PG_GETARG_RANGE(1);
+	RangeType  *r = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r));
@@ -587,8 +587,8 @@ range_eq_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_eq(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -607,8 +607,8 @@ range_ne_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_ne(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -620,8 +620,8 @@ range_ne(PG_FUNCTION_ARGS)
 Datum
 range_contains(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -633,8 +633,8 @@ range_contains(PG_FUNCTION_ARGS)
 Datum
 range_contained_by(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -671,8 +671,8 @@ range_before_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_before(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -709,8 +709,8 @@ range_after_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_after(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -810,8 +810,8 @@ range_adjacent_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_adjacent(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -856,8 +856,8 @@ range_overlaps_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_overlaps(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -897,8 +897,8 @@ range_overleft_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_overleft(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -938,8 +938,8 @@ range_overright_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2)
 Datum
 range_overright(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
@@ -954,8 +954,8 @@ range_overright(PG_FUNCTION_ARGS)
 Datum
 range_minus(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 	RangeBound	lower1,
 				lower2;
@@ -979,7 +979,7 @@ range_minus(PG_FUNCTION_ARGS)
 
 	/* if either is empty, r1 is the correct answer */
 	if (empty1 || empty2)
-		PG_RETURN_RANGE(r1);
+		PG_RETURN_RANGE_P(r1);
 
 	cmp_l1l2 = range_cmp_bounds(typcache, &lower1, &lower2);
 	cmp_l1u2 = range_cmp_bounds(typcache, &lower1, &upper2);
@@ -992,23 +992,23 @@ range_minus(PG_FUNCTION_ARGS)
 				 errmsg("result of range difference would not be contiguous")));
 
 	if (cmp_l1u2 > 0 || cmp_u1l2 < 0)
-		PG_RETURN_RANGE(r1);
+		PG_RETURN_RANGE_P(r1);
 
 	if (cmp_l1l2 >= 0 && cmp_u1u2 <= 0)
-		PG_RETURN_RANGE(make_empty_range(typcache));
+		PG_RETURN_RANGE_P(make_empty_range(typcache));
 
 	if (cmp_l1l2 <= 0 && cmp_u1l2 >= 0 && cmp_u1u2 <= 0)
 	{
 		lower2.inclusive = !lower2.inclusive;
 		lower2.lower = false;	/* it will become the upper bound */
-		PG_RETURN_RANGE(make_range(typcache, &lower1, &lower2, false));
+		PG_RETURN_RANGE_P(make_range(typcache, &lower1, &lower2, false));
 	}
 
 	if (cmp_l1l2 >= 0 && cmp_u1u2 >= 0 && cmp_l1u2 <= 0)
 	{
 		upper2.inclusive = !upper2.inclusive;
 		upper2.lower = true;	/* it will become the lower bound */
-		PG_RETURN_RANGE(make_range(typcache, &upper2, &upper1, false));
+		PG_RETURN_RANGE_P(make_range(typcache, &upper2, &upper1, false));
 	}
 
 	elog(ERROR, "unexpected case in range_minus");
@@ -1068,13 +1068,13 @@ range_union_internal(TypeCacheEntry *typcache, RangeType *r1, RangeType *r2,
 Datum
 range_union(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
 
-	PG_RETURN_RANGE(range_union_internal(typcache, r1, r2, true));
+	PG_RETURN_RANGE_P(range_union_internal(typcache, r1, r2, true));
 }
 
 /*
@@ -1084,21 +1084,21 @@ range_union(PG_FUNCTION_ARGS)
 Datum
 range_merge(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r1));
 
-	PG_RETURN_RANGE(range_union_internal(typcache, r1, r2, false));
+	PG_RETURN_RANGE_P(range_union_internal(typcache, r1, r2, false));
 }
 
 /* set intersection */
 Datum
 range_intersect(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 	RangeBound	lower1,
 				lower2;
@@ -1119,7 +1119,7 @@ range_intersect(PG_FUNCTION_ARGS)
 	range_deserialize(typcache, r2, &lower2, &upper2, &empty2);
 
 	if (empty1 || empty2 || !DatumGetBool(range_overlaps(fcinfo)))
-		PG_RETURN_RANGE(make_empty_range(typcache));
+		PG_RETURN_RANGE_P(make_empty_range(typcache));
 
 	if (range_cmp_bounds(typcache, &lower1, &lower2) >= 0)
 		result_lower = &lower1;
@@ -1131,7 +1131,7 @@ range_intersect(PG_FUNCTION_ARGS)
 	else
 		result_upper = &upper2;
 
-	PG_RETURN_RANGE(make_range(typcache, result_lower, result_upper, false));
+	PG_RETURN_RANGE_P(make_range(typcache, result_lower, result_upper, false));
 }
 
 /* Btree support */
@@ -1140,8 +1140,8 @@ range_intersect(PG_FUNCTION_ARGS)
 Datum
 range_cmp(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	TypeCacheEntry *typcache;
 	RangeBound	lower1,
 				lower2;
@@ -1221,7 +1221,7 @@ range_gt(PG_FUNCTION_ARGS)
 Datum
 hash_range(PG_FUNCTION_ARGS)
 {
-	RangeType  *r = PG_GETARG_RANGE(0);
+	RangeType  *r = PG_GETARG_RANGE_P(0);
 	uint32		result;
 	TypeCacheEntry *typcache;
 	TypeCacheEntry *scache;
@@ -1280,6 +1280,70 @@ hash_range(PG_FUNCTION_ARGS)
 	PG_RETURN_INT32(result);
 }
 
+/*
+ * Returns 64-bit value by hashing a value to a 64-bit value, with a seed.
+ * Otherwise, similar to hash_range.
+ */
+Datum
+hash_range_extended(PG_FUNCTION_ARGS)
+{
+	RangeType  *r = PG_GETARG_RANGE_P(0);
+	Datum		seed = PG_GETARG_DATUM(1);
+	uint64		result;
+	TypeCacheEntry *typcache;
+	TypeCacheEntry *scache;
+	RangeBound	lower;
+	RangeBound	upper;
+	bool		empty;
+	char		flags;
+	uint64		lower_hash;
+	uint64		upper_hash;
+
+	check_stack_depth();
+
+	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(r));
+
+	range_deserialize(typcache, r, &lower, &upper, &empty);
+	flags = range_get_flags(r);
+
+	scache = typcache->rngelemtype;
+	if (!OidIsValid(scache->hash_extended_proc_finfo.fn_oid))
+	{
+		scache = lookup_type_cache(scache->type_id,
+								   TYPECACHE_HASH_EXTENDED_PROC_FINFO);
+		if (!OidIsValid(scache->hash_extended_proc_finfo.fn_oid))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_FUNCTION),
+					 errmsg("could not identify a hash function for type %s",
+							format_type_be(scache->type_id))));
+	}
+
+	if (RANGE_HAS_LBOUND(flags))
+		lower_hash = DatumGetUInt64(FunctionCall2Coll(&scache->hash_extended_proc_finfo,
+													  typcache->rng_collation,
+													  lower.val,
+													  seed));
+	else
+		lower_hash = 0;
+
+	if (RANGE_HAS_UBOUND(flags))
+		upper_hash = DatumGetUInt64(FunctionCall2Coll(&scache->hash_extended_proc_finfo,
+													  typcache->rng_collation,
+													  upper.val,
+													  seed));
+	else
+		upper_hash = 0;
+
+	/* Merge hashes of flags and bounds */
+	result = DatumGetUInt64(hash_uint32_extended((uint32) flags,
+												 DatumGetInt64(seed)));
+	result ^= lower_hash;
+	result = ROTATE_HIGH_AND_LOW_32BITS(result);
+	result ^= upper_hash;
+
+	PG_RETURN_UINT64(result);
+}
+
 /*
  *----------------------------------------------------------
  * CANONICAL FUNCTIONS
@@ -1291,7 +1355,7 @@ hash_range(PG_FUNCTION_ARGS)
 Datum
 int4range_canonical(PG_FUNCTION_ARGS)
 {
-	RangeType  *r = PG_GETARG_RANGE(0);
+	RangeType  *r = PG_GETARG_RANGE_P(0);
 	TypeCacheEntry *typcache;
 	RangeBound	lower;
 	RangeBound	upper;
@@ -1302,7 +1366,7 @@ int4range_canonical(PG_FUNCTION_ARGS)
 	range_deserialize(typcache, r, &lower, &upper, &empty);
 
 	if (empty)
-		PG_RETURN_RANGE(r);
+		PG_RETURN_RANGE_P(r);
 
 	if (!lower.infinite && !lower.inclusive)
 	{
@@ -1316,13 +1380,13 @@ int4range_canonical(PG_FUNCTION_ARGS)
 		upper.inclusive = false;
 	}
 
-	PG_RETURN_RANGE(range_serialize(typcache, &lower, &upper, false));
+	PG_RETURN_RANGE_P(range_serialize(typcache, &lower, &upper, false));
 }
 
 Datum
 int8range_canonical(PG_FUNCTION_ARGS)
 {
-	RangeType  *r = PG_GETARG_RANGE(0);
+	RangeType  *r = PG_GETARG_RANGE_P(0);
 	TypeCacheEntry *typcache;
 	RangeBound	lower;
 	RangeBound	upper;
@@ -1333,7 +1397,7 @@ int8range_canonical(PG_FUNCTION_ARGS)
 	range_deserialize(typcache, r, &lower, &upper, &empty);
 
 	if (empty)
-		PG_RETURN_RANGE(r);
+		PG_RETURN_RANGE_P(r);
 
 	if (!lower.infinite && !lower.inclusive)
 	{
@@ -1347,13 +1411,13 @@ int8range_canonical(PG_FUNCTION_ARGS)
 		upper.inclusive = false;
 	}
 
-	PG_RETURN_RANGE(range_serialize(typcache, &lower, &upper, false));
+	PG_RETURN_RANGE_P(range_serialize(typcache, &lower, &upper, false));
 }
 
 Datum
 daterange_canonical(PG_FUNCTION_ARGS)
 {
-	RangeType  *r = PG_GETARG_RANGE(0);
+	RangeType  *r = PG_GETARG_RANGE_P(0);
 	TypeCacheEntry *typcache;
 	RangeBound	lower;
 	RangeBound	upper;
@@ -1364,7 +1428,7 @@ daterange_canonical(PG_FUNCTION_ARGS)
 	range_deserialize(typcache, r, &lower, &upper, &empty);
 
 	if (empty)
-		PG_RETURN_RANGE(r);
+		PG_RETURN_RANGE_P(r);
 
 	if (!lower.infinite && !lower.inclusive)
 	{
@@ -1378,7 +1442,7 @@ daterange_canonical(PG_FUNCTION_ARGS)
 		upper.inclusive = false;
 	}
 
-	PG_RETURN_RANGE(range_serialize(typcache, &lower, &upper, false));
+	PG_RETURN_RANGE_P(range_serialize(typcache, &lower, &upper, false));
 }
 
 /*
@@ -1735,8 +1799,8 @@ make_range(TypeCacheEntry *typcache, RangeBound *lower, RangeBound *upper,
 	/* no need to call canonical on empty ranges ... */
 	if (OidIsValid(typcache->rng_canonical_finfo.fn_oid) &&
 		!RangeIsEmpty(range))
-		range = DatumGetRangeType(FunctionCall1(&typcache->rng_canonical_finfo,
-												RangeTypeGetDatum(range)));
+		range = DatumGetRangeTypeP(FunctionCall1(&typcache->rng_canonical_finfo,
+												 RangeTypePGetDatum(range)));
 
 	return range;
 }
diff --git a/src/backend/utils/adt/rangetypes_gist.c b/src/backend/utils/adt/rangetypes_gist.c
index a1f4f4d372..2fe61043d9 100644
--- a/src/backend/utils/adt/rangetypes_gist.c
+++ b/src/backend/utils/adt/rangetypes_gist.c
@@ -3,7 +3,7 @@
  * rangetypes_gist.c
  *	  GiST support for range types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -177,7 +177,7 @@ range_gist_consistent(PG_FUNCTION_ARGS)
 
 	/* Oid subtype = PG_GETARG_OID(3); */
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(4);
-	RangeType  *key = DatumGetRangeType(entry->key);
+	RangeType  *key = DatumGetRangeTypeP(entry->key);
 	TypeCacheEntry *typcache;
 
 	/* All operators served by this function are exact */
@@ -203,43 +203,24 @@ range_gist_union(PG_FUNCTION_ARGS)
 	TypeCacheEntry *typcache;
 	int			i;
 
-	result_range = DatumGetRangeType(ent[0].key);
+	result_range = DatumGetRangeTypeP(ent[0].key);
 
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(result_range));
 
 	for (i = 1; i < entryvec->n; i++)
 	{
 		result_range = range_super_union(typcache, result_range,
-										 DatumGetRangeType(ent[i].key));
+										 DatumGetRangeTypeP(ent[i].key));
 	}
 
-	PG_RETURN_RANGE(result_range);
+	PG_RETURN_RANGE_P(result_range);
 }
 
-/* compress, decompress, fetch are no-ops */
-Datum
-range_gist_compress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-
-	PG_RETURN_POINTER(entry);
-}
-
-Datum
-range_gist_decompress(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-
-	PG_RETURN_POINTER(entry);
-}
-
-Datum
-range_gist_fetch(PG_FUNCTION_ARGS)
-{
-	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-
-	PG_RETURN_POINTER(entry);
-}
+/*
+ * We store ranges as ranges in GiST indexes, so we do not need
+ * compress, decompress, or fetch functions.  Note this implies a limit
+ * on the size of range values that can be indexed.
+ */
 
 /*
  * GiST page split penalty function.
@@ -257,8 +238,8 @@ range_gist_penalty(PG_FUNCTION_ARGS)
 	GISTENTRY  *origentry = (GISTENTRY *) PG_GETARG_POINTER(0);
 	GISTENTRY  *newentry = (GISTENTRY *) PG_GETARG_POINTER(1);
 	float	   *penalty = (float *) PG_GETARG_POINTER(2);
-	RangeType  *orig = DatumGetRangeType(origentry->key);
-	RangeType  *new = DatumGetRangeType(newentry->key);
+	RangeType  *orig = DatumGetRangeTypeP(origentry->key);
+	RangeType  *new = DatumGetRangeTypeP(newentry->key);
 	TypeCacheEntry *typcache;
 	bool		has_subtype_diff;
 	RangeBound	orig_lower,
@@ -526,7 +507,7 @@ range_gist_picksplit(PG_FUNCTION_ARGS)
 	int			total_count;
 
 	/* use first item to look up range type's info */
-	pred_left = DatumGetRangeType(entryvec->vector[FirstOffsetNumber].key);
+	pred_left = DatumGetRangeTypeP(entryvec->vector[FirstOffsetNumber].key);
 	typcache = range_get_typcache(fcinfo, RangeTypeGetOid(pred_left));
 
 	maxoff = entryvec->n - 1;
@@ -540,7 +521,7 @@ range_gist_picksplit(PG_FUNCTION_ARGS)
 	memset(count_in_classes, 0, sizeof(count_in_classes));
 	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 	{
-		RangeType  *range = DatumGetRangeType(entryvec->vector[i].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[i].key);
 
 		count_in_classes[get_gist_range_class(range)]++;
 	}
@@ -670,8 +651,8 @@ range_gist_picksplit(PG_FUNCTION_ARGS)
 Datum
 range_gist_same(PG_FUNCTION_ARGS)
 {
-	RangeType  *r1 = PG_GETARG_RANGE(0);
-	RangeType  *r2 = PG_GETARG_RANGE(1);
+	RangeType  *r1 = PG_GETARG_RANGE_P(0);
+	RangeType  *r2 = PG_GETARG_RANGE_P(1);
 	bool	   *result = (bool *) PG_GETARG_POINTER(2);
 
 	/*
@@ -787,39 +768,39 @@ range_gist_consistent_int(TypeCacheEntry *typcache, StrategyNumber strategy,
 	switch (strategy)
 	{
 		case RANGESTRAT_BEFORE:
-			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return false;
 			return (!range_overright_internal(typcache, key,
-											  DatumGetRangeType(query)));
+											  DatumGetRangeTypeP(query)));
 		case RANGESTRAT_OVERLEFT:
-			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return false;
 			return (!range_after_internal(typcache, key,
-										  DatumGetRangeType(query)));
+										  DatumGetRangeTypeP(query)));
 		case RANGESTRAT_OVERLAPS:
 			return range_overlaps_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_OVERRIGHT:
-			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return false;
 			return (!range_before_internal(typcache, key,
-										   DatumGetRangeType(query)));
+										   DatumGetRangeTypeP(query)));
 		case RANGESTRAT_AFTER:
-			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return false;
 			return (!range_overleft_internal(typcache, key,
-											 DatumGetRangeType(query)));
+											 DatumGetRangeTypeP(query)));
 		case RANGESTRAT_ADJACENT:
-			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(key) || RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return false;
 			if (range_adjacent_internal(typcache, key,
-										DatumGetRangeType(query)))
+										DatumGetRangeTypeP(query)))
 				return true;
 			return range_overlaps_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINS:
 			return range_contains_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINED_BY:
 
 			/*
@@ -830,7 +811,7 @@ range_gist_consistent_int(TypeCacheEntry *typcache, StrategyNumber strategy,
 			if (RangeIsOrContainsEmpty(key))
 				return true;
 			return range_overlaps_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINS_ELEM:
 			return range_contains_elem_internal(typcache, key, query);
 		case RANGESTRAT_EQ:
@@ -839,10 +820,10 @@ range_gist_consistent_int(TypeCacheEntry *typcache, StrategyNumber strategy,
 			 * If query is empty, descend only if the key is or contains any
 			 * empty ranges.  Otherwise, descend if key contains query.
 			 */
-			if (RangeIsEmpty(DatumGetRangeType(query)))
+			if (RangeIsEmpty(DatumGetRangeTypeP(query)))
 				return RangeIsOrContainsEmpty(key);
 			return range_contains_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		default:
 			elog(ERROR, "unrecognized range strategy: %d", strategy);
 			return false;		/* keep compiler quiet */
@@ -860,32 +841,32 @@ range_gist_consistent_leaf(TypeCacheEntry *typcache, StrategyNumber strategy,
 	{
 		case RANGESTRAT_BEFORE:
 			return range_before_internal(typcache, key,
-										 DatumGetRangeType(query));
+										 DatumGetRangeTypeP(query));
 		case RANGESTRAT_OVERLEFT:
 			return range_overleft_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_OVERLAPS:
 			return range_overlaps_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_OVERRIGHT:
 			return range_overright_internal(typcache, key,
-											DatumGetRangeType(query));
+											DatumGetRangeTypeP(query));
 		case RANGESTRAT_AFTER:
 			return range_after_internal(typcache, key,
-										DatumGetRangeType(query));
+										DatumGetRangeTypeP(query));
 		case RANGESTRAT_ADJACENT:
 			return range_adjacent_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINS:
 			return range_contains_internal(typcache, key,
-										   DatumGetRangeType(query));
+										   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINED_BY:
 			return range_contained_by_internal(typcache, key,
-											   DatumGetRangeType(query));
+											   DatumGetRangeTypeP(query));
 		case RANGESTRAT_CONTAINS_ELEM:
 			return range_contains_elem_internal(typcache, key, query);
 		case RANGESTRAT_EQ:
-			return range_eq_internal(typcache, key, DatumGetRangeType(query));
+			return range_eq_internal(typcache, key, DatumGetRangeTypeP(query));
 		default:
 			elog(ERROR, "unrecognized range strategy: %d", strategy);
 			return false;		/* keep compiler quiet */
@@ -915,7 +896,7 @@ range_gist_fallback_split(TypeCacheEntry *typcache,
 	v->spl_nright = 0;
 	for (i = FirstOffsetNumber; i <= maxoff; i++)
 	{
-		RangeType  *range = DatumGetRangeType(entryvec->vector[i].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[i].key);
 
 		if (i < split_idx)
 			PLACE_LEFT(range, i);
@@ -923,8 +904,8 @@ range_gist_fallback_split(TypeCacheEntry *typcache,
 			PLACE_RIGHT(range, i);
 	}
 
-	v->spl_ldatum = RangeTypeGetDatum(left_range);
-	v->spl_rdatum = RangeTypeGetDatum(right_range);
+	v->spl_ldatum = RangeTypePGetDatum(left_range);
+	v->spl_rdatum = RangeTypePGetDatum(right_range);
 }
 
 /*
@@ -951,7 +932,7 @@ range_gist_class_split(TypeCacheEntry *typcache,
 	v->spl_nright = 0;
 	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 	{
-		RangeType  *range = DatumGetRangeType(entryvec->vector[i].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[i].key);
 		int			class;
 
 		/* Get class of range */
@@ -967,8 +948,8 @@ range_gist_class_split(TypeCacheEntry *typcache,
 		}
 	}
 
-	v->spl_ldatum = RangeTypeGetDatum(left_range);
-	v->spl_rdatum = RangeTypeGetDatum(right_range);
+	v->spl_ldatum = RangeTypePGetDatum(left_range);
+	v->spl_rdatum = RangeTypePGetDatum(right_range);
 }
 
 /*
@@ -1000,7 +981,7 @@ range_gist_single_sorting_split(TypeCacheEntry *typcache,
 	 */
 	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 	{
-		RangeType  *range = DatumGetRangeType(entryvec->vector[i].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[i].key);
 		RangeBound	bound2;
 		bool		empty;
 
@@ -1026,7 +1007,7 @@ range_gist_single_sorting_split(TypeCacheEntry *typcache,
 	for (i = 0; i < maxoff; i++)
 	{
 		int			idx = sortItems[i].index;
-		RangeType  *range = DatumGetRangeType(entryvec->vector[idx].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[idx].key);
 
 		if (i < split_idx)
 			PLACE_LEFT(range, idx);
@@ -1034,8 +1015,8 @@ range_gist_single_sorting_split(TypeCacheEntry *typcache,
 			PLACE_RIGHT(range, idx);
 	}
 
-	v->spl_ldatum = RangeTypeGetDatum(left_range);
-	v->spl_rdatum = RangeTypeGetDatum(right_range);
+	v->spl_ldatum = RangeTypePGetDatum(left_range);
+	v->spl_rdatum = RangeTypePGetDatum(right_range);
 }
 
 /*
@@ -1102,7 +1083,7 @@ range_gist_double_sorting_split(TypeCacheEntry *typcache,
 	/* Fill arrays of bounds */
 	for (i = FirstOffsetNumber; i <= maxoff; i = OffsetNumberNext(i))
 	{
-		RangeType  *range = DatumGetRangeType(entryvec->vector[i].key);
+		RangeType  *range = DatumGetRangeTypeP(entryvec->vector[i].key);
 		bool		empty;
 
 		range_deserialize(typcache, range,
@@ -1277,7 +1258,7 @@ range_gist_double_sorting_split(TypeCacheEntry *typcache,
 		/*
 		 * Get upper and lower bounds along selected axis.
 		 */
-		range = DatumGetRangeType(entryvec->vector[i].key);
+		range = DatumGetRangeTypeP(entryvec->vector[i].key);
 
 		range_deserialize(typcache, range, &lower, &upper, &empty);
 
@@ -1347,7 +1328,7 @@ range_gist_double_sorting_split(TypeCacheEntry *typcache,
 		{
 			int			idx = common_entries[i].index;
 
-			range = DatumGetRangeType(entryvec->vector[idx].key);
+			range = DatumGetRangeTypeP(entryvec->vector[idx].key);
 
 			/*
 			 * Check if we have to place this entry in either group to achieve
diff --git a/src/backend/utils/adt/rangetypes_selfuncs.c b/src/backend/utils/adt/rangetypes_selfuncs.c
index ed13c27fcb..59761ecf34 100644
--- a/src/backend/utils/adt/rangetypes_selfuncs.c
+++ b/src/backend/utils/adt/rangetypes_selfuncs.c
@@ -6,7 +6,7 @@
  * Estimates are based on histograms of lower and upper bounds, and the
  * fraction of empty ranges.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -203,7 +203,7 @@ rangesel(PG_FUNCTION_ARGS)
 		/* Both sides are the same range type */
 		typcache = range_get_typcache(fcinfo, vardata.vartype);
 
-		constrange = DatumGetRangeType(((Const *) other)->constvalue);
+		constrange = DatumGetRangeTypeP(((Const *) other)->constvalue);
 	}
 
 	/*
@@ -406,7 +406,7 @@ calc_hist_selectivity(TypeCacheEntry *typcache, VariableStatData *vardata,
 	hist_upper = (RangeBound *) palloc(sizeof(RangeBound) * nhist);
 	for (i = 0; i < nhist; i++)
 	{
-		range_deserialize(typcache, DatumGetRangeType(hslot.values[i]),
+		range_deserialize(typcache, DatumGetRangeTypeP(hslot.values[i]),
 						  &hist_lower[i], &hist_upper[i], &empty);
 		/* The histogram should not contain any empty ranges */
 		if (empty)
diff --git a/src/backend/utils/adt/rangetypes_spgist.c b/src/backend/utils/adt/rangetypes_spgist.c
index e82c4e1a9e..a7898c4366 100644
--- a/src/backend/utils/adt/rangetypes_spgist.c
+++ b/src/backend/utils/adt/rangetypes_spgist.c
@@ -25,7 +25,7 @@
  * This implementation only uses the comparison function of the range element
  * datatype, therefore it works for any range type.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -132,7 +132,7 @@ spg_range_quad_choose(PG_FUNCTION_ARGS)
 {
 	spgChooseIn *in = (spgChooseIn *) PG_GETARG_POINTER(0);
 	spgChooseOut *out = (spgChooseOut *) PG_GETARG_POINTER(1);
-	RangeType  *inRange = DatumGetRangeType(in->datum),
+	RangeType  *inRange = DatumGetRangeTypeP(in->datum),
 			   *centroid;
 	int16		quadrant;
 	TypeCacheEntry *typcache;
@@ -142,7 +142,7 @@ spg_range_quad_choose(PG_FUNCTION_ARGS)
 		out->resultType = spgMatchNode;
 		/* nodeN will be set by core */
 		out->result.matchNode.levelAdd = 0;
-		out->result.matchNode.restDatum = RangeTypeGetDatum(inRange);
+		out->result.matchNode.restDatum = RangeTypePGetDatum(inRange);
 		PG_RETURN_VOID();
 	}
 
@@ -161,11 +161,11 @@ spg_range_quad_choose(PG_FUNCTION_ARGS)
 		else
 			out->result.matchNode.nodeN = 1;
 		out->result.matchNode.levelAdd = 1;
-		out->result.matchNode.restDatum = RangeTypeGetDatum(inRange);
+		out->result.matchNode.restDatum = RangeTypePGetDatum(inRange);
 		PG_RETURN_VOID();
 	}
 
-	centroid = DatumGetRangeType(in->prefixDatum);
+	centroid = DatumGetRangeTypeP(in->prefixDatum);
 	quadrant = getQuadrant(typcache, centroid, inRange);
 
 	Assert(quadrant <= in->nNodes);
@@ -174,7 +174,7 @@ spg_range_quad_choose(PG_FUNCTION_ARGS)
 	out->resultType = spgMatchNode;
 	out->result.matchNode.nodeN = quadrant - 1;
 	out->result.matchNode.levelAdd = 1;
-	out->result.matchNode.restDatum = RangeTypeGetDatum(inRange);
+	out->result.matchNode.restDatum = RangeTypePGetDatum(inRange);
 
 	PG_RETURN_VOID();
 }
@@ -213,7 +213,7 @@ spg_range_quad_picksplit(PG_FUNCTION_ARGS)
 			   *upperBounds;
 
 	typcache = range_get_typcache(fcinfo,
-								  RangeTypeGetOid(DatumGetRangeType(in->datums[0])));
+								  RangeTypeGetOid(DatumGetRangeTypeP(in->datums[0])));
 
 	/* Allocate memory for bounds */
 	lowerBounds = palloc(sizeof(RangeBound) * in->nTuples);
@@ -223,7 +223,7 @@ spg_range_quad_picksplit(PG_FUNCTION_ARGS)
 	/* Deserialize bounds of ranges, count non-empty ranges */
 	for (i = 0; i < in->nTuples; i++)
 	{
-		range_deserialize(typcache, DatumGetRangeType(in->datums[i]),
+		range_deserialize(typcache, DatumGetRangeTypeP(in->datums[i]),
 						  &lowerBounds[j], &upperBounds[j], &empty);
 		if (!empty)
 			j++;
@@ -249,9 +249,9 @@ spg_range_quad_picksplit(PG_FUNCTION_ARGS)
 		/* Place all ranges into node 0 */
 		for (i = 0; i < in->nTuples; i++)
 		{
-			RangeType  *range = DatumGetRangeType(in->datums[i]);
+			RangeType  *range = DatumGetRangeTypeP(in->datums[i]);
 
-			out->leafTupleDatums[i] = RangeTypeGetDatum(range);
+			out->leafTupleDatums[i] = RangeTypePGetDatum(range);
 			out->mapTuplesToNodes[i] = 0;
 		}
 		PG_RETURN_VOID();
@@ -267,7 +267,7 @@ spg_range_quad_picksplit(PG_FUNCTION_ARGS)
 	centroid = range_serialize(typcache, &lowerBounds[nonEmptyCount / 2],
 							   &upperBounds[nonEmptyCount / 2], false);
 	out->hasPrefix = true;
-	out->prefixDatum = RangeTypeGetDatum(centroid);
+	out->prefixDatum = RangeTypePGetDatum(centroid);
 
 	/* Create node for empty ranges only if it is a root node */
 	out->nNodes = (in->level == 0) ? 5 : 4;
@@ -282,10 +282,10 @@ spg_range_quad_picksplit(PG_FUNCTION_ARGS)
 	 */
 	for (i = 0; i < in->nTuples; i++)
 	{
-		RangeType  *range = DatumGetRangeType(in->datums[i]);
+		RangeType  *range = DatumGetRangeTypeP(in->datums[i]);
 		int16		quadrant = getQuadrant(typcache, centroid, range);
 
-		out->leafTupleDatums[i] = RangeTypeGetDatum(range);
+		out->leafTupleDatums[i] = RangeTypePGetDatum(range);
 		out->mapTuplesToNodes[i] = quadrant - 1;
 	}
 
@@ -347,7 +347,7 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 			 */
 			if (strategy != RANGESTRAT_CONTAINS_ELEM)
 				empty = RangeIsEmpty(
-									 DatumGetRangeType(in->scankeys[i].sk_argument));
+									 DatumGetRangeTypeP(in->scankeys[i].sk_argument));
 			else
 				empty = false;
 
@@ -415,9 +415,9 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 		RangeType  *centroid;
 
 		/* This node has a centroid. Fetch it. */
-		centroid = DatumGetRangeType(in->prefixDatum);
+		centroid = DatumGetRangeTypeP(in->prefixDatum);
 		typcache = range_get_typcache(fcinfo,
-									  RangeTypeGetOid(DatumGetRangeType(centroid)));
+									  RangeTypeGetOid(DatumGetRangeTypeP(centroid)));
 		range_deserialize(typcache, centroid, &centroidLower, &centroidUpper,
 						  &centroidEmpty);
 
@@ -482,7 +482,7 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 			}
 			else
 			{
-				range = DatumGetRangeType(in->scankeys[i].sk_argument);
+				range = DatumGetRangeTypeP(in->scankeys[i].sk_argument);
 				range_deserialize(typcache, range, &lower, &upper, &empty);
 			}
 
@@ -556,9 +556,9 @@ spg_range_quad_inner_consistent(PG_FUNCTION_ARGS)
 					 * for lower or upper bounds to be adjacent. Deserialize
 					 * previous centroid range if present for checking this.
 					 */
-					if (in->traversalValue != (Datum) 0)
+					if (in->traversalValue)
 					{
-						prevCentroid = DatumGetRangeType(in->traversalValue);
+						prevCentroid = DatumGetRangeTypeP(in->traversalValue);
 						range_deserialize(typcache, prevCentroid,
 										  &prevLower, &prevUpper, &prevEmpty);
 					}
@@ -921,7 +921,7 @@ spg_range_quad_leaf_consistent(PG_FUNCTION_ARGS)
 {
 	spgLeafConsistentIn *in = (spgLeafConsistentIn *) PG_GETARG_POINTER(0);
 	spgLeafConsistentOut *out = (spgLeafConsistentOut *) PG_GETARG_POINTER(1);
-	RangeType  *leafRange = DatumGetRangeType(in->leafDatum);
+	RangeType  *leafRange = DatumGetRangeTypeP(in->leafDatum);
 	TypeCacheEntry *typcache;
 	bool		res;
 	int			i;
@@ -945,35 +945,35 @@ spg_range_quad_leaf_consistent(PG_FUNCTION_ARGS)
 		{
 			case RANGESTRAT_BEFORE:
 				res = range_before_internal(typcache, leafRange,
-											DatumGetRangeType(keyDatum));
+											DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_OVERLEFT:
 				res = range_overleft_internal(typcache, leafRange,
-											  DatumGetRangeType(keyDatum));
+											  DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_OVERLAPS:
 				res = range_overlaps_internal(typcache, leafRange,
-											  DatumGetRangeType(keyDatum));
+											  DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_OVERRIGHT:
 				res = range_overright_internal(typcache, leafRange,
-											   DatumGetRangeType(keyDatum));
+											   DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_AFTER:
 				res = range_after_internal(typcache, leafRange,
-										   DatumGetRangeType(keyDatum));
+										   DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_ADJACENT:
 				res = range_adjacent_internal(typcache, leafRange,
-											  DatumGetRangeType(keyDatum));
+											  DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_CONTAINS:
 				res = range_contains_internal(typcache, leafRange,
-											  DatumGetRangeType(keyDatum));
+											  DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_CONTAINED_BY:
 				res = range_contained_by_internal(typcache, leafRange,
-												  DatumGetRangeType(keyDatum));
+												  DatumGetRangeTypeP(keyDatum));
 				break;
 			case RANGESTRAT_CONTAINS_ELEM:
 				res = range_contains_elem_internal(typcache, leafRange,
@@ -981,7 +981,7 @@ spg_range_quad_leaf_consistent(PG_FUNCTION_ARGS)
 				break;
 			case RANGESTRAT_EQ:
 				res = range_eq_internal(typcache, leafRange,
-										DatumGetRangeType(keyDatum));
+										DatumGetRangeTypeP(keyDatum));
 				break;
 			default:
 				elog(ERROR, "unrecognized range strategy: %d",
diff --git a/src/backend/utils/adt/rangetypes_typanalyze.c b/src/backend/utils/adt/rangetypes_typanalyze.c
index 324bbe48e5..f2c11f54bc 100644
--- a/src/backend/utils/adt/rangetypes_typanalyze.c
+++ b/src/backend/utils/adt/rangetypes_typanalyze.c
@@ -13,7 +13,7 @@
  * come from different tuples. In theory, the standard scalar selectivity
  * functions could be used with the combined histogram.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -144,7 +144,7 @@ compute_range_stats(VacAttrStats *stats, AnalyzeAttrFetchFunc fetchfunc,
 		total_width += VARSIZE_ANY(DatumGetPointer(value));
 
 		/* Get range and deserialize it for further analysis. */
-		range = DatumGetRangeType(value);
+		range = DatumGetRangeTypeP(value);
 		range_deserialize(typcache, range, &lower, &upper, &empty);
 
 		if (!empty)
diff --git a/src/backend/utils/adt/regexp.c b/src/backend/utils/adt/regexp.c
index 139bb583b1..5025a449fb 100644
--- a/src/backend/utils/adt/regexp.c
+++ b/src/backend/utils/adt/regexp.c
@@ -3,7 +3,7 @@
  * regexp.c
  *	  Postgres' interface to the regular expression package.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -247,7 +247,7 @@ RE_compile_and_cache(text *text_re, int cflags, Oid collation)
 /*
  * RE_wchar_execute - execute a RE on pg_wchar data
  *
- * Returns TRUE on match, FALSE on no match
+ * Returns true on match, false on no match
  *
  *	re --- the compiled pattern as returned by RE_compile_and_cache
  *	data --- the data to match against (need not be null-terminated)
@@ -291,7 +291,7 @@ RE_wchar_execute(regex_t *re, pg_wchar *data, int data_len,
 /*
  * RE_execute - execute a RE
  *
- * Returns TRUE on match, FALSE on no match
+ * Returns true on match, false on no match
  *
  *	re --- the compiled pattern as returned by RE_compile_and_cache
  *	dat --- the data to match against (need not be null-terminated)
@@ -323,7 +323,7 @@ RE_execute(regex_t *re, char *dat, int dat_len,
 /*
  * RE_compile_and_execute - compile and execute a RE
  *
- * Returns TRUE on match, FALSE on no match
+ * Returns true on match, false on no match
  *
  *	text_re --- the pattern, expressed as a TEXT object
  *	dat --- the data to match against (need not be null-terminated)
@@ -1294,7 +1294,7 @@ build_regexp_split_result(regexp_matches_ctx *splitctx)
  * regexp_fixed_prefix - extract fixed prefix, if any, for a regexp
  *
  * The result is NULL if there is no fixed prefix, else a palloc'd string.
- * If it is an exact match, not just a prefix, *exact is returned as TRUE.
+ * If it is an exact match, not just a prefix, *exact is returned as true.
  */
 char *
 regexp_fixed_prefix(text *text_re, bool case_insensitive, Oid collation,
diff --git a/src/backend/utils/adt/regproc.c b/src/backend/utils/adt/regproc.c
index 6fe81fab7e..a0079821fe 100644
--- a/src/backend/utils/adt/regproc.c
+++ b/src/backend/utils/adt/regproc.c
@@ -8,7 +8,7 @@
  * special I/O conversion routines.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1728,7 +1728,7 @@ stringToQualifiedNameList(const char *string)
  * the argtypes array should be of size FUNC_MAX_ARGS).  The function or
  * operator name is returned to *names as a List of Strings.
  *
- * If allowNone is TRUE, accept "NONE" and return it as InvalidOid (this is
+ * If allowNone is true, accept "NONE" and return it as InvalidOid (this is
  * for unary operators).
  */
 static void
diff --git a/src/backend/utils/adt/ri_triggers.c b/src/backend/utils/adt/ri_triggers.c
index c2891e6fa1..8faae1d069 100644
--- a/src/backend/utils/adt/ri_triggers.c
+++ b/src/backend/utils/adt/ri_triggers.c
@@ -13,7 +13,7 @@
  *	plan --- consider improving this someday.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/backend/utils/adt/ri_triggers.c
  *
@@ -81,12 +81,9 @@
 /* these queries are executed against the FK (referencing) table: */
 #define RI_PLAN_CASCADE_DEL_DODELETE	3
 #define RI_PLAN_CASCADE_UPD_DOUPDATE	4
-#define RI_PLAN_RESTRICT_DEL_CHECKREF	5
-#define RI_PLAN_RESTRICT_UPD_CHECKREF	6
-#define RI_PLAN_SETNULL_DEL_DOUPDATE	7
-#define RI_PLAN_SETNULL_UPD_DOUPDATE	8
-#define RI_PLAN_SETDEFAULT_DEL_DOUPDATE 9
-#define RI_PLAN_SETDEFAULT_UPD_DOUPDATE 10
+#define RI_PLAN_RESTRICT_CHECKREF		5
+#define RI_PLAN_SETNULL_DOUPDATE		6
+#define RI_PLAN_SETDEFAULT_DOUPDATE		7
 
 #define MAX_QUOTED_NAME_LEN  (NAMEDATALEN*2+3)
 #define MAX_QUOTED_REL_NAME_LEN  (MAX_QUOTED_NAME_LEN*2)
@@ -196,8 +193,9 @@ static int	ri_constraint_cache_valid_count = 0;
 static bool ri_Check_Pk_Match(Relation pk_rel, Relation fk_rel,
 				  HeapTuple old_row,
 				  const RI_ConstraintInfo *riinfo);
-static Datum ri_restrict_del(TriggerData *trigdata, bool is_no_action);
-static Datum ri_restrict_upd(TriggerData *trigdata, bool is_no_action);
+static Datum ri_restrict(TriggerData *trigdata, bool is_no_action);
+static Datum ri_setnull(TriggerData *trigdata);
+static Datum ri_setdefault(TriggerData *trigdata);
 static void quoteOneName(char *buffer, const char *name);
 static void quoteRelationName(char *buffer, Relation rel);
 static void ri_GenerateQual(StringInfo buf,
@@ -242,7 +240,7 @@ static void ri_ExtractValues(Relation rel, HeapTuple tup,
 static void ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 				   Relation pk_rel, Relation fk_rel,
 				   HeapTuple violator, TupleDesc tupdesc,
-				   int queryno, bool spi_err);
+				   int queryno) pg_attribute_noreturn();
 
 
 /* ----------
@@ -603,9 +601,9 @@ RI_FKey_noaction_del(PG_FUNCTION_ARGS)
 	ri_CheckTrigger(fcinfo, "RI_FKey_noaction_del", RI_TRIGTYPE_DELETE);
 
 	/*
-	 * Share code with RESTRICT case.
+	 * Share code with RESTRICT/UPDATE cases.
 	 */
-	return ri_restrict_del((TriggerData *) fcinfo->context, true);
+	return ri_restrict((TriggerData *) fcinfo->context, true);
 }
 
 /* ----------
@@ -628,176 +626,11 @@ RI_FKey_restrict_del(PG_FUNCTION_ARGS)
 	ri_CheckTrigger(fcinfo, "RI_FKey_restrict_del", RI_TRIGTYPE_DELETE);
 
 	/*
-	 * Share code with NO ACTION case.
+	 * Share code with NO ACTION/UPDATE cases.
 	 */
-	return ri_restrict_del((TriggerData *) fcinfo->context, false);
+	return ri_restrict((TriggerData *) fcinfo->context, false);
 }
 
-/* ----------
- * ri_restrict_del -
- *
- *	Common code for ON DELETE RESTRICT and ON DELETE NO ACTION.
- * ----------
- */
-static Datum
-ri_restrict_del(TriggerData *trigdata, bool is_no_action)
-{
-	const RI_ConstraintInfo *riinfo;
-	Relation	fk_rel;
-	Relation	pk_rel;
-	HeapTuple	old_row;
-	RI_QueryKey qkey;
-	SPIPlanPtr	qplan;
-	int			i;
-
-	/*
-	 * Get arguments.
-	 */
-	riinfo = ri_FetchConstraintInfo(trigdata->tg_trigger,
-									trigdata->tg_relation, true);
-
-	/*
-	 * Get the relation descriptors of the FK and PK tables and the old tuple.
-	 *
-	 * fk_rel is opened in RowShareLock mode since that's what our eventual
-	 * SELECT FOR KEY SHARE will get on it.
-	 */
-	fk_rel = heap_open(riinfo->fk_relid, RowShareLock);
-	pk_rel = trigdata->tg_relation;
-	old_row = trigdata->tg_trigtuple;
-
-	switch (riinfo->confmatchtype)
-	{
-			/* ----------
-			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 9) a) iv):
-			 *		MATCH SIMPLE/FULL
-			 *			... ON DELETE RESTRICT
-			 * ----------
-			 */
-		case FKCONSTR_MATCH_SIMPLE:
-		case FKCONSTR_MATCH_FULL:
-			switch (ri_NullCheck(old_row, riinfo, true))
-			{
-				case RI_KEYS_ALL_NULL:
-				case RI_KEYS_SOME_NULL:
-
-					/*
-					 * No check needed - there cannot be any reference to old
-					 * key if it contains a NULL
-					 */
-					heap_close(fk_rel, RowShareLock);
-					return PointerGetDatum(NULL);
-
-				case RI_KEYS_NONE_NULL:
-
-					/*
-					 * Have a full qualified key - continue below
-					 */
-					break;
-			}
-
-			/*
-			 * If another PK row now exists providing the old key values, we
-			 * should not do anything.  However, this check should only be
-			 * made in the NO ACTION case; in RESTRICT cases we don't wish to
-			 * allow another row to be substituted.
-			 */
-			if (is_no_action &&
-				ri_Check_Pk_Match(pk_rel, fk_rel, old_row, riinfo))
-			{
-				heap_close(fk_rel, RowShareLock);
-				return PointerGetDatum(NULL);
-			}
-
-			if (SPI_connect() != SPI_OK_CONNECT)
-				elog(ERROR, "SPI_connect failed");
-
-			/*
-			 * Fetch or prepare a saved plan for the restrict delete lookup
-			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_RESTRICT_DEL_CHECKREF);
-
-			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
-			{
-				StringInfoData querybuf;
-				char		fkrelname[MAX_QUOTED_REL_NAME_LEN];
-				char		attname[MAX_QUOTED_NAME_LEN];
-				char		paramname[16];
-				const char *querysep;
-				Oid			queryoids[RI_MAX_NUMKEYS];
-
-				/* ----------
-				 * The query string built is
-				 *	SELECT 1 FROM ONLY <fktable> x WHERE $1 = fkatt1 [AND ...]
-				 *		   FOR KEY SHARE OF x
-				 * The type id's for the $ parameters are those of the
-				 * corresponding PK attributes.
-				 * ----------
-				 */
-				initStringInfo(&querybuf);
-				quoteRelationName(fkrelname, fk_rel);
-				appendStringInfo(&querybuf, "SELECT 1 FROM ONLY %s x",
-								 fkrelname);
-				querysep = "WHERE";
-				for (i = 0; i < riinfo->nkeys; i++)
-				{
-					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
-					Oid			fk_type = RIAttType(fk_rel, riinfo->fk_attnums[i]);
-
-					quoteOneName(attname,
-								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
-					sprintf(paramname, "$%d", i + 1);
-					ri_GenerateQual(&querybuf, querysep,
-									paramname, pk_type,
-									riinfo->pf_eq_oprs[i],
-									attname, fk_type);
-					querysep = "AND";
-					queryoids[i] = pk_type;
-				}
-				appendStringInfoString(&querybuf, " FOR KEY SHARE OF x");
-
-				/* Prepare and save the plan */
-				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
-									 &qkey, fk_rel, pk_rel, true);
-			}
-
-			/*
-			 * We have a plan now. Run it to check for existing references.
-			 */
-			ri_PerformCheck(riinfo, &qkey, qplan,
-							fk_rel, pk_rel,
-							old_row, NULL,
-							true,	/* must detect new rows */
-							SPI_OK_SELECT);
-
-			if (SPI_finish() != SPI_OK_FINISH)
-				elog(ERROR, "SPI_finish failed");
-
-			heap_close(fk_rel, RowShareLock);
-
-			return PointerGetDatum(NULL);
-
-			/*
-			 * Handle MATCH PARTIAL restrict delete.
-			 */
-		case FKCONSTR_MATCH_PARTIAL:
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("MATCH PARTIAL not yet implemented")));
-			return PointerGetDatum(NULL);
-
-		default:
-			elog(ERROR, "unrecognized confmatchtype: %d",
-				 riinfo->confmatchtype);
-			break;
-	}
-
-	/* Never reached */
-	return PointerGetDatum(NULL);
-}
-
-
 /* ----------
  * RI_FKey_noaction_upd -
  *
@@ -815,9 +648,9 @@ RI_FKey_noaction_upd(PG_FUNCTION_ARGS)
 	ri_CheckTrigger(fcinfo, "RI_FKey_noaction_upd", RI_TRIGTYPE_UPDATE);
 
 	/*
-	 * Share code with RESTRICT case.
+	 * Share code with RESTRICT/DELETE cases.
 	 */
-	return ri_restrict_upd((TriggerData *) fcinfo->context, true);
+	return ri_restrict((TriggerData *) fcinfo->context, true);
 }
 
 /* ----------
@@ -840,28 +673,27 @@ RI_FKey_restrict_upd(PG_FUNCTION_ARGS)
 	ri_CheckTrigger(fcinfo, "RI_FKey_restrict_upd", RI_TRIGTYPE_UPDATE);
 
 	/*
-	 * Share code with NO ACTION case.
+	 * Share code with NO ACTION/DELETE cases.
 	 */
-	return ri_restrict_upd((TriggerData *) fcinfo->context, false);
+	return ri_restrict((TriggerData *) fcinfo->context, false);
 }
 
 /* ----------
- * ri_restrict_upd -
+ * ri_restrict -
  *
- *	Common code for ON UPDATE RESTRICT and ON UPDATE NO ACTION.
+ *	Common code for ON DELETE RESTRICT, ON DELETE NO ACTION,
+ *	ON UPDATE RESTRICT, and ON UPDATE NO ACTION.
  * ----------
  */
 static Datum
-ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
+ri_restrict(TriggerData *trigdata, bool is_no_action)
 {
 	const RI_ConstraintInfo *riinfo;
 	Relation	fk_rel;
 	Relation	pk_rel;
-	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
 	SPIPlanPtr	qplan;
-	int			i;
 
 	/*
 	 * Get arguments.
@@ -870,21 +702,22 @@ ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
 									trigdata->tg_relation, true);
 
 	/*
-	 * Get the relation descriptors of the FK and PK tables and the new and
-	 * old tuple.
+	 * Get the relation descriptors of the FK and PK tables and the old tuple.
 	 *
 	 * fk_rel is opened in RowShareLock mode since that's what our eventual
 	 * SELECT FOR KEY SHARE will get on it.
 	 */
 	fk_rel = heap_open(riinfo->fk_relid, RowShareLock);
 	pk_rel = trigdata->tg_relation;
-	new_row = trigdata->tg_newtuple;
 	old_row = trigdata->tg_trigtuple;
 
 	switch (riinfo->confmatchtype)
 	{
 			/* ----------
 			 * SQL:2008 15.17 <Execution of referential actions>
+			 *	General rules 9) a) iv):
+			 *		MATCH SIMPLE/FULL
+			 *			... ON DELETE RESTRICT
 			 *	General rules 10) a) iv):
 			 *		MATCH SIMPLE/FULL
 			 *			... ON UPDATE RESTRICT
@@ -913,12 +746,17 @@ ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
 			}
 
 			/*
-			 * No need to check anything if old and new keys are equal
+			 * In UPDATE, no need to do anything if old and new keys are equal
 			 */
-			if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
+			if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 			{
-				heap_close(fk_rel, RowShareLock);
-				return PointerGetDatum(NULL);
+				HeapTuple	new_row = trigdata->tg_newtuple;
+
+				if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
+				{
+					heap_close(fk_rel, RowShareLock);
+					return PointerGetDatum(NULL);
+				}
 			}
 
 			/*
@@ -938,9 +776,10 @@ ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
 				elog(ERROR, "SPI_connect failed");
 
 			/*
-			 * Fetch or prepare a saved plan for the restrict update lookup
+			 * Fetch or prepare a saved plan for the restrict lookup (it's the
+			 * same query for delete and update cases)
 			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_RESTRICT_UPD_CHECKREF);
+			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_RESTRICT_CHECKREF);
 
 			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
 			{
@@ -950,10 +789,12 @@ ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
 				char		paramname[16];
 				const char *querysep;
 				Oid			queryoids[RI_MAX_NUMKEYS];
+				int			i;
 
 				/* ----------
 				 * The query string built is
-				 *	SELECT 1 FROM ONLY <fktable> WHERE $1 = fkatt1 [AND ...]
+				 *	SELECT 1 FROM ONLY <fktable> x WHERE $1 = fkatt1 [AND ...]
+				 *		   FOR KEY SHARE OF x
 				 * The type id's for the $ parameters are those of the
 				 * corresponding PK attributes.
 				 * ----------
@@ -961,385 +802,48 @@ ri_restrict_upd(TriggerData *trigdata, bool is_no_action)
 				initStringInfo(&querybuf);
 				quoteRelationName(fkrelname, fk_rel);
 				appendStringInfo(&querybuf, "SELECT 1 FROM ONLY %s x",
-								 fkrelname);
-				querysep = "WHERE";
-				for (i = 0; i < riinfo->nkeys; i++)
-				{
-					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
-					Oid			fk_type = RIAttType(fk_rel, riinfo->fk_attnums[i]);
-
-					quoteOneName(attname,
-								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
-					sprintf(paramname, "$%d", i + 1);
-					ri_GenerateQual(&querybuf, querysep,
-									paramname, pk_type,
-									riinfo->pf_eq_oprs[i],
-									attname, fk_type);
-					querysep = "AND";
-					queryoids[i] = pk_type;
-				}
-				appendStringInfoString(&querybuf, " FOR KEY SHARE OF x");
-
-				/* Prepare and save the plan */
-				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
-									 &qkey, fk_rel, pk_rel, true);
-			}
-
-			/*
-			 * We have a plan now. Run it to check for existing references.
-			 */
-			ri_PerformCheck(riinfo, &qkey, qplan,
-							fk_rel, pk_rel,
-							old_row, NULL,
-							true,	/* must detect new rows */
-							SPI_OK_SELECT);
-
-			if (SPI_finish() != SPI_OK_FINISH)
-				elog(ERROR, "SPI_finish failed");
-
-			heap_close(fk_rel, RowShareLock);
-
-			return PointerGetDatum(NULL);
-
-			/*
-			 * Handle MATCH PARTIAL restrict update.
-			 */
-		case FKCONSTR_MATCH_PARTIAL:
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("MATCH PARTIAL not yet implemented")));
-			return PointerGetDatum(NULL);
-
-		default:
-			elog(ERROR, "unrecognized confmatchtype: %d",
-				 riinfo->confmatchtype);
-			break;
-	}
-
-	/* Never reached */
-	return PointerGetDatum(NULL);
-}
-
-
-/* ----------
- * RI_FKey_cascade_del -
- *
- *	Cascaded delete foreign key references at delete event on PK table.
- * ----------
- */
-Datum
-RI_FKey_cascade_del(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	const RI_ConstraintInfo *riinfo;
-	Relation	fk_rel;
-	Relation	pk_rel;
-	HeapTuple	old_row;
-	RI_QueryKey qkey;
-	SPIPlanPtr	qplan;
-	int			i;
-
-	/*
-	 * Check that this is a valid trigger call on the right time and event.
-	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_cascade_del", RI_TRIGTYPE_DELETE);
-
-	/*
-	 * Get arguments.
-	 */
-	riinfo = ri_FetchConstraintInfo(trigdata->tg_trigger,
-									trigdata->tg_relation, true);
-
-	/*
-	 * Get the relation descriptors of the FK and PK tables and the old tuple.
-	 *
-	 * fk_rel is opened in RowExclusiveLock mode since that's what our
-	 * eventual DELETE will get on it.
-	 */
-	fk_rel = heap_open(riinfo->fk_relid, RowExclusiveLock);
-	pk_rel = trigdata->tg_relation;
-	old_row = trigdata->tg_trigtuple;
-
-	switch (riinfo->confmatchtype)
-	{
-			/* ----------
-			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 9) a) i):
-			 *		MATCH SIMPLE/FULL
-			 *			... ON DELETE CASCADE
-			 * ----------
-			 */
-		case FKCONSTR_MATCH_SIMPLE:
-		case FKCONSTR_MATCH_FULL:
-			switch (ri_NullCheck(old_row, riinfo, true))
-			{
-				case RI_KEYS_ALL_NULL:
-				case RI_KEYS_SOME_NULL:
-
-					/*
-					 * No check needed - there cannot be any reference to old
-					 * key if it contains a NULL
-					 */
-					heap_close(fk_rel, RowExclusiveLock);
-					return PointerGetDatum(NULL);
-
-				case RI_KEYS_NONE_NULL:
-
-					/*
-					 * Have a full qualified key - continue below
-					 */
-					break;
-			}
-
-			if (SPI_connect() != SPI_OK_CONNECT)
-				elog(ERROR, "SPI_connect failed");
-
-			/*
-			 * Fetch or prepare a saved plan for the cascaded delete
-			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_CASCADE_DEL_DODELETE);
-
-			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
-			{
-				StringInfoData querybuf;
-				char		fkrelname[MAX_QUOTED_REL_NAME_LEN];
-				char		attname[MAX_QUOTED_NAME_LEN];
-				char		paramname[16];
-				const char *querysep;
-				Oid			queryoids[RI_MAX_NUMKEYS];
-
-				/* ----------
-				 * The query string built is
-				 *	DELETE FROM ONLY <fktable> WHERE $1 = fkatt1 [AND ...]
-				 * The type id's for the $ parameters are those of the
-				 * corresponding PK attributes.
-				 * ----------
-				 */
-				initStringInfo(&querybuf);
-				quoteRelationName(fkrelname, fk_rel);
-				appendStringInfo(&querybuf, "DELETE FROM ONLY %s", fkrelname);
-				querysep = "WHERE";
-				for (i = 0; i < riinfo->nkeys; i++)
-				{
-					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
-					Oid			fk_type = RIAttType(fk_rel, riinfo->fk_attnums[i]);
-
-					quoteOneName(attname,
-								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
-					sprintf(paramname, "$%d", i + 1);
-					ri_GenerateQual(&querybuf, querysep,
-									paramname, pk_type,
-									riinfo->pf_eq_oprs[i],
-									attname, fk_type);
-					querysep = "AND";
-					queryoids[i] = pk_type;
-				}
-
-				/* Prepare and save the plan */
-				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
-									 &qkey, fk_rel, pk_rel, true);
-			}
-
-			/*
-			 * We have a plan now. Build up the arguments from the key values
-			 * in the deleted PK tuple and delete the referencing rows
-			 */
-			ri_PerformCheck(riinfo, &qkey, qplan,
-							fk_rel, pk_rel,
-							old_row, NULL,
-							true,	/* must detect new rows */
-							SPI_OK_DELETE);
-
-			if (SPI_finish() != SPI_OK_FINISH)
-				elog(ERROR, "SPI_finish failed");
-
-			heap_close(fk_rel, RowExclusiveLock);
-
-			return PointerGetDatum(NULL);
-
-			/*
-			 * Handle MATCH PARTIAL cascaded delete.
-			 */
-		case FKCONSTR_MATCH_PARTIAL:
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("MATCH PARTIAL not yet implemented")));
-			return PointerGetDatum(NULL);
-
-		default:
-			elog(ERROR, "unrecognized confmatchtype: %d",
-				 riinfo->confmatchtype);
-			break;
-	}
-
-	/* Never reached */
-	return PointerGetDatum(NULL);
-}
-
-
-/* ----------
- * RI_FKey_cascade_upd -
- *
- *	Cascaded update foreign key references at update event on PK table.
- * ----------
- */
-Datum
-RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
-{
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	const RI_ConstraintInfo *riinfo;
-	Relation	fk_rel;
-	Relation	pk_rel;
-	HeapTuple	new_row;
-	HeapTuple	old_row;
-	RI_QueryKey qkey;
-	SPIPlanPtr	qplan;
-	int			i;
-	int			j;
-
-	/*
-	 * Check that this is a valid trigger call on the right time and event.
-	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_cascade_upd", RI_TRIGTYPE_UPDATE);
-
-	/*
-	 * Get arguments.
-	 */
-	riinfo = ri_FetchConstraintInfo(trigdata->tg_trigger,
-									trigdata->tg_relation, true);
-
-	/*
-	 * Get the relation descriptors of the FK and PK tables and the new and
-	 * old tuple.
-	 *
-	 * fk_rel is opened in RowExclusiveLock mode since that's what our
-	 * eventual UPDATE will get on it.
-	 */
-	fk_rel = heap_open(riinfo->fk_relid, RowExclusiveLock);
-	pk_rel = trigdata->tg_relation;
-	new_row = trigdata->tg_newtuple;
-	old_row = trigdata->tg_trigtuple;
-
-	switch (riinfo->confmatchtype)
-	{
-			/* ----------
-			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 10) a) i):
-			 *		MATCH SIMPLE/FULL
-			 *			... ON UPDATE CASCADE
-			 * ----------
-			 */
-		case FKCONSTR_MATCH_SIMPLE:
-		case FKCONSTR_MATCH_FULL:
-			switch (ri_NullCheck(old_row, riinfo, true))
-			{
-				case RI_KEYS_ALL_NULL:
-				case RI_KEYS_SOME_NULL:
-
-					/*
-					 * No check needed - there cannot be any reference to old
-					 * key if it contains a NULL
-					 */
-					heap_close(fk_rel, RowExclusiveLock);
-					return PointerGetDatum(NULL);
-
-				case RI_KEYS_NONE_NULL:
-
-					/*
-					 * Have a full qualified key - continue below
-					 */
-					break;
-			}
-
-			/*
-			 * No need to do anything if old and new keys are equal
-			 */
-			if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
-			{
-				heap_close(fk_rel, RowExclusiveLock);
-				return PointerGetDatum(NULL);
-			}
-
-			if (SPI_connect() != SPI_OK_CONNECT)
-				elog(ERROR, "SPI_connect failed");
-
-			/*
-			 * Fetch or prepare a saved plan for the cascaded update
-			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_CASCADE_UPD_DOUPDATE);
-
-			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
-			{
-				StringInfoData querybuf;
-				StringInfoData qualbuf;
-				char		fkrelname[MAX_QUOTED_REL_NAME_LEN];
-				char		attname[MAX_QUOTED_NAME_LEN];
-				char		paramname[16];
-				const char *querysep;
-				const char *qualsep;
-				Oid			queryoids[RI_MAX_NUMKEYS * 2];
-
-				/* ----------
-				 * The query string built is
-				 *	UPDATE ONLY <fktable> SET fkatt1 = $1 [, ...]
-				 *			WHERE $n = fkatt1 [AND ...]
-				 * The type id's for the $ parameters are those of the
-				 * corresponding PK attributes.  Note that we are assuming
-				 * there is an assignment cast from the PK to the FK type;
-				 * else the parser will fail.
-				 * ----------
-				 */
-				initStringInfo(&querybuf);
-				initStringInfo(&qualbuf);
-				quoteRelationName(fkrelname, fk_rel);
-				appendStringInfo(&querybuf, "UPDATE ONLY %s SET", fkrelname);
-				querysep = "";
-				qualsep = "WHERE";
-				for (i = 0, j = riinfo->nkeys; i < riinfo->nkeys; i++, j++)
+								 fkrelname);
+				querysep = "WHERE";
+				for (i = 0; i < riinfo->nkeys; i++)
 				{
 					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
 					Oid			fk_type = RIAttType(fk_rel, riinfo->fk_attnums[i]);
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
-					appendStringInfo(&querybuf,
-									 "%s %s = $%d",
-									 querysep, attname, i + 1);
-					sprintf(paramname, "$%d", j + 1);
-					ri_GenerateQual(&qualbuf, qualsep,
+					sprintf(paramname, "$%d", i + 1);
+					ri_GenerateQual(&querybuf, querysep,
 									paramname, pk_type,
 									riinfo->pf_eq_oprs[i],
 									attname, fk_type);
-					querysep = ",";
-					qualsep = "AND";
+					querysep = "AND";
 					queryoids[i] = pk_type;
-					queryoids[j] = pk_type;
 				}
-				appendStringInfoString(&querybuf, qualbuf.data);
+				appendStringInfoString(&querybuf, " FOR KEY SHARE OF x");
 
 				/* Prepare and save the plan */
-				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys * 2, queryoids,
+				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
 									 &qkey, fk_rel, pk_rel, true);
 			}
 
 			/*
-			 * We have a plan now. Run it to update the existing references.
+			 * We have a plan now. Run it to check for existing references.
 			 */
 			ri_PerformCheck(riinfo, &qkey, qplan,
 							fk_rel, pk_rel,
-							old_row, new_row,
+							old_row, NULL,
 							true,	/* must detect new rows */
-							SPI_OK_UPDATE);
+							SPI_OK_SELECT);
 
 			if (SPI_finish() != SPI_OK_FINISH)
 				elog(ERROR, "SPI_finish failed");
 
-			heap_close(fk_rel, RowExclusiveLock);
+			heap_close(fk_rel, RowShareLock);
 
 			return PointerGetDatum(NULL);
 
 			/*
-			 * Handle MATCH PARTIAL cascade update.
+			 * Handle MATCH PARTIAL restrict delete or update.
 			 */
 		case FKCONSTR_MATCH_PARTIAL:
 			ereport(ERROR,
@@ -1359,13 +863,13 @@ RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
 
 
 /* ----------
- * RI_FKey_setnull_del -
+ * RI_FKey_cascade_del -
  *
- *	Set foreign key references to NULL values at delete event on PK table.
+ *	Cascaded delete foreign key references at delete event on PK table.
  * ----------
  */
 Datum
-RI_FKey_setnull_del(PG_FUNCTION_ARGS)
+RI_FKey_cascade_del(PG_FUNCTION_ARGS)
 {
 	TriggerData *trigdata = (TriggerData *) fcinfo->context;
 	const RI_ConstraintInfo *riinfo;
@@ -1379,7 +883,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 	/*
 	 * Check that this is a valid trigger call on the right time and event.
 	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_setnull_del", RI_TRIGTYPE_DELETE);
+	ri_CheckTrigger(fcinfo, "RI_FKey_cascade_del", RI_TRIGTYPE_DELETE);
 
 	/*
 	 * Get arguments.
@@ -1391,7 +895,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 	 * Get the relation descriptors of the FK and PK tables and the old tuple.
 	 *
 	 * fk_rel is opened in RowExclusiveLock mode since that's what our
-	 * eventual UPDATE will get on it.
+	 * eventual DELETE will get on it.
 	 */
 	fk_rel = heap_open(riinfo->fk_relid, RowExclusiveLock);
 	pk_rel = trigdata->tg_relation;
@@ -1401,9 +905,9 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 	{
 			/* ----------
 			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 9) a) ii):
+			 *	General rules 9) a) i):
 			 *		MATCH SIMPLE/FULL
-			 *			... ON DELETE SET NULL
+			 *			... ON DELETE CASCADE
 			 * ----------
 			 */
 		case FKCONSTR_MATCH_SIMPLE:
@@ -1432,35 +936,30 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 				elog(ERROR, "SPI_connect failed");
 
 			/*
-			 * Fetch or prepare a saved plan for the set null delete operation
+			 * Fetch or prepare a saved plan for the cascaded delete
 			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETNULL_DEL_DOUPDATE);
+			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_CASCADE_DEL_DODELETE);
 
 			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
 			{
 				StringInfoData querybuf;
-				StringInfoData qualbuf;
 				char		fkrelname[MAX_QUOTED_REL_NAME_LEN];
 				char		attname[MAX_QUOTED_NAME_LEN];
 				char		paramname[16];
 				const char *querysep;
-				const char *qualsep;
 				Oid			queryoids[RI_MAX_NUMKEYS];
 
 				/* ----------
 				 * The query string built is
-				 *	UPDATE ONLY <fktable> SET fkatt1 = NULL [, ...]
-				 *			WHERE $1 = fkatt1 [AND ...]
+				 *	DELETE FROM ONLY <fktable> WHERE $1 = fkatt1 [AND ...]
 				 * The type id's for the $ parameters are those of the
 				 * corresponding PK attributes.
 				 * ----------
 				 */
 				initStringInfo(&querybuf);
-				initStringInfo(&qualbuf);
 				quoteRelationName(fkrelname, fk_rel);
-				appendStringInfo(&querybuf, "UPDATE ONLY %s SET", fkrelname);
-				querysep = "";
-				qualsep = "WHERE";
+				appendStringInfo(&querybuf, "DELETE FROM ONLY %s", fkrelname);
+				querysep = "WHERE";
 				for (i = 0; i < riinfo->nkeys; i++)
 				{
 					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
@@ -1468,19 +967,14 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
-					appendStringInfo(&querybuf,
-									 "%s %s = NULL",
-									 querysep, attname);
 					sprintf(paramname, "$%d", i + 1);
-					ri_GenerateQual(&qualbuf, qualsep,
+					ri_GenerateQual(&querybuf, querysep,
 									paramname, pk_type,
 									riinfo->pf_eq_oprs[i],
 									attname, fk_type);
-					querysep = ",";
-					qualsep = "AND";
+					querysep = "AND";
 					queryoids[i] = pk_type;
 				}
-				appendStringInfoString(&querybuf, qualbuf.data);
 
 				/* Prepare and save the plan */
 				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
@@ -1488,13 +982,14 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 			}
 
 			/*
-			 * We have a plan now. Run it to check for existing references.
+			 * We have a plan now. Build up the arguments from the key values
+			 * in the deleted PK tuple and delete the referencing rows
 			 */
 			ri_PerformCheck(riinfo, &qkey, qplan,
 							fk_rel, pk_rel,
 							old_row, NULL,
 							true,	/* must detect new rows */
-							SPI_OK_UPDATE);
+							SPI_OK_DELETE);
 
 			if (SPI_finish() != SPI_OK_FINISH)
 				elog(ERROR, "SPI_finish failed");
@@ -1504,7 +999,7 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 			return PointerGetDatum(NULL);
 
 			/*
-			 * Handle MATCH PARTIAL set null delete.
+			 * Handle MATCH PARTIAL cascaded delete.
 			 */
 		case FKCONSTR_MATCH_PARTIAL:
 			ereport(ERROR,
@@ -1524,13 +1019,13 @@ RI_FKey_setnull_del(PG_FUNCTION_ARGS)
 
 
 /* ----------
- * RI_FKey_setnull_upd -
+ * RI_FKey_cascade_upd -
  *
- *	Set foreign key references to NULL at update event on PK table.
+ *	Cascaded update foreign key references at update event on PK table.
  * ----------
  */
 Datum
-RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
+RI_FKey_cascade_upd(PG_FUNCTION_ARGS)
 {
 	TriggerData *trigdata = (TriggerData *) fcinfo->context;
 	const RI_ConstraintInfo *riinfo;
@@ -1541,11 +1036,12 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 	RI_QueryKey qkey;
 	SPIPlanPtr	qplan;
 	int			i;
+	int			j;
 
 	/*
 	 * Check that this is a valid trigger call on the right time and event.
 	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_setnull_upd", RI_TRIGTYPE_UPDATE);
+	ri_CheckTrigger(fcinfo, "RI_FKey_cascade_upd", RI_TRIGTYPE_UPDATE);
 
 	/*
 	 * Get arguments.
@@ -1554,7 +1050,8 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 									trigdata->tg_relation, true);
 
 	/*
-	 * Get the relation descriptors of the FK and PK tables and the old tuple.
+	 * Get the relation descriptors of the FK and PK tables and the new and
+	 * old tuple.
 	 *
 	 * fk_rel is opened in RowExclusiveLock mode since that's what our
 	 * eventual UPDATE will get on it.
@@ -1568,9 +1065,9 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 	{
 			/* ----------
 			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 10) a) ii):
+			 *	General rules 10) a) i):
 			 *		MATCH SIMPLE/FULL
-			 *			... ON UPDATE SET NULL
+			 *			... ON UPDATE CASCADE
 			 * ----------
 			 */
 		case FKCONSTR_MATCH_SIMPLE:
@@ -1608,9 +1105,9 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 				elog(ERROR, "SPI_connect failed");
 
 			/*
-			 * Fetch or prepare a saved plan for the set null update operation
+			 * Fetch or prepare a saved plan for the cascaded update
 			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETNULL_UPD_DOUPDATE);
+			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_CASCADE_UPD_DOUPDATE);
 
 			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
 			{
@@ -1621,14 +1118,16 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 				char		paramname[16];
 				const char *querysep;
 				const char *qualsep;
-				Oid			queryoids[RI_MAX_NUMKEYS];
+				Oid			queryoids[RI_MAX_NUMKEYS * 2];
 
 				/* ----------
 				 * The query string built is
-				 *	UPDATE ONLY <fktable> SET fkatt1 = NULL [, ...]
-				 *			WHERE $1 = fkatt1 [AND ...]
+				 *	UPDATE ONLY <fktable> SET fkatt1 = $1 [, ...]
+				 *			WHERE $n = fkatt1 [AND ...]
 				 * The type id's for the $ parameters are those of the
-				 * corresponding PK attributes.
+				 * corresponding PK attributes.  Note that we are assuming
+				 * there is an assignment cast from the PK to the FK type;
+				 * else the parser will fail.
 				 * ----------
 				 */
 				initStringInfo(&querybuf);
@@ -1637,7 +1136,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 				appendStringInfo(&querybuf, "UPDATE ONLY %s SET", fkrelname);
 				querysep = "";
 				qualsep = "WHERE";
-				for (i = 0; i < riinfo->nkeys; i++)
+				for (i = 0, j = riinfo->nkeys; i < riinfo->nkeys; i++, j++)
 				{
 					Oid			pk_type = RIAttType(pk_rel, riinfo->pk_attnums[i]);
 					Oid			fk_type = RIAttType(fk_rel, riinfo->fk_attnums[i]);
@@ -1645,9 +1144,9 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
 					appendStringInfo(&querybuf,
-									 "%s %s = NULL",
-									 querysep, attname);
-					sprintf(paramname, "$%d", i + 1);
+									 "%s %s = $%d",
+									 querysep, attname, i + 1);
+					sprintf(paramname, "$%d", j + 1);
 					ri_GenerateQual(&qualbuf, qualsep,
 									paramname, pk_type,
 									riinfo->pf_eq_oprs[i],
@@ -1655,11 +1154,12 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 					querysep = ",";
 					qualsep = "AND";
 					queryoids[i] = pk_type;
+					queryoids[j] = pk_type;
 				}
 				appendStringInfoString(&querybuf, qualbuf.data);
 
 				/* Prepare and save the plan */
-				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys, queryoids,
+				qplan = ri_PlanCheck(querybuf.data, riinfo->nkeys * 2, queryoids,
 									 &qkey, fk_rel, pk_rel, true);
 			}
 
@@ -1668,7 +1168,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 			 */
 			ri_PerformCheck(riinfo, &qkey, qplan,
 							fk_rel, pk_rel,
-							old_row, NULL,
+							old_row, new_row,
 							true,	/* must detect new rows */
 							SPI_OK_UPDATE);
 
@@ -1680,7 +1180,7 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 			return PointerGetDatum(NULL);
 
 			/*
-			 * Handle MATCH PARTIAL set null update.
+			 * Handle MATCH PARTIAL cascade update.
 			 */
 		case FKCONSTR_MATCH_PARTIAL:
 			ereport(ERROR,
@@ -1700,26 +1200,61 @@ RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
 
 
 /* ----------
- * RI_FKey_setdefault_del -
+ * RI_FKey_setnull_del -
  *
- *	Set foreign key references to defaults at delete event on PK table.
+ *	Set foreign key references to NULL values at delete event on PK table.
  * ----------
  */
 Datum
-RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
+RI_FKey_setnull_del(PG_FUNCTION_ARGS)
+{
+	/*
+	 * Check that this is a valid trigger call on the right time and event.
+	 */
+	ri_CheckTrigger(fcinfo, "RI_FKey_setnull_del", RI_TRIGTYPE_DELETE);
+
+	/*
+	 * Share code with UPDATE case
+	 */
+	return ri_setnull((TriggerData *) fcinfo->context);
+}
+
+/* ----------
+ * RI_FKey_setnull_upd -
+ *
+ *	Set foreign key references to NULL at update event on PK table.
+ * ----------
+ */
+Datum
+RI_FKey_setnull_upd(PG_FUNCTION_ARGS)
+{
+	/*
+	 * Check that this is a valid trigger call on the right time and event.
+	 */
+	ri_CheckTrigger(fcinfo, "RI_FKey_setnull_upd", RI_TRIGTYPE_UPDATE);
+
+	/*
+	 * Share code with DELETE case
+	 */
+	return ri_setnull((TriggerData *) fcinfo->context);
+}
+
+/* ----------
+ * ri_setnull -
+ *
+ *	Common code for ON DELETE SET NULL and ON UPDATE SET NULL
+ * ----------
+ */
+static Datum
+ri_setnull(TriggerData *trigdata)
 {
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
 	const RI_ConstraintInfo *riinfo;
 	Relation	fk_rel;
 	Relation	pk_rel;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
 	SPIPlanPtr	qplan;
-
-	/*
-	 * Check that this is a valid trigger call on the right time and event.
-	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_setdefault_del", RI_TRIGTYPE_DELETE);
+	int			i;
 
 	/*
 	 * Get arguments.
@@ -1741,9 +1276,12 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 	{
 			/* ----------
 			 * SQL:2008 15.17 <Execution of referential actions>
-			 *	General rules 9) a) iii):
+			 *	General rules 9) a) ii):
 			 *		MATCH SIMPLE/FULL
-			 *			... ON DELETE SET DEFAULT
+			 *			... ON DELETE SET NULL
+			 *	General rules 10) a) ii):
+			 *		MATCH SIMPLE/FULL
+			 *			... ON UPDATE SET NULL
 			 * ----------
 			 */
 		case FKCONSTR_MATCH_SIMPLE:
@@ -1768,14 +1306,28 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 					break;
 			}
 
+			/*
+			 * In UPDATE, no need to do anything if old and new keys are equal
+			 */
+			if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
+			{
+				HeapTuple	new_row = trigdata->tg_newtuple;
+
+				if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
+				{
+					heap_close(fk_rel, RowExclusiveLock);
+					return PointerGetDatum(NULL);
+				}
+			}
+
 			if (SPI_connect() != SPI_OK_CONNECT)
 				elog(ERROR, "SPI_connect failed");
 
 			/*
-			 * Fetch or prepare a saved plan for the set default delete
-			 * operation
+			 * Fetch or prepare a saved plan for the set null operation (it's
+			 * the same query for delete and update cases)
 			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETDEFAULT_DEL_DOUPDATE);
+			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETNULL_DOUPDATE);
 
 			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
 			{
@@ -1787,11 +1339,10 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 				const char *querysep;
 				const char *qualsep;
 				Oid			queryoids[RI_MAX_NUMKEYS];
-				int			i;
 
 				/* ----------
 				 * The query string built is
-				 *	UPDATE ONLY <fktable> SET fkatt1 = DEFAULT [, ...]
+				 *	UPDATE ONLY <fktable> SET fkatt1 = NULL [, ...]
 				 *			WHERE $1 = fkatt1 [AND ...]
 				 * The type id's for the $ parameters are those of the
 				 * corresponding PK attributes.
@@ -1811,7 +1362,7 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 					quoteOneName(attname,
 								 RIAttName(fk_rel, riinfo->fk_attnums[i]));
 					appendStringInfo(&querybuf,
-									 "%s %s = DEFAULT",
+									 "%s %s = NULL",
 									 querysep, attname);
 					sprintf(paramname, "$%d", i + 1);
 					ri_GenerateQual(&qualbuf, qualsep,
@@ -1843,24 +1394,10 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 
 			heap_close(fk_rel, RowExclusiveLock);
 
-			/*
-			 * If we just deleted the PK row whose key was equal to the FK
-			 * columns' default values, and a referencing row exists in the FK
-			 * table, we would have updated that row to the same values it
-			 * already had --- and RI_FKey_fk_upd_check_required would hence
-			 * believe no check is necessary.  So we need to do another lookup
-			 * now and in case a reference still exists, abort the operation.
-			 * That is already implemented in the NO ACTION trigger, so just
-			 * run it.  (This recheck is only needed in the SET DEFAULT case,
-			 * since CASCADE would remove such rows, while SET NULL is certain
-			 * to result in rows that satisfy the FK constraint.)
-			 */
-			RI_FKey_noaction_del(fcinfo);
-
 			return PointerGetDatum(NULL);
 
 			/*
-			 * Handle MATCH PARTIAL set default delete.
+			 * Handle MATCH PARTIAL set null delete or update.
 			 */
 		case FKCONSTR_MATCH_PARTIAL:
 			ereport(ERROR,
@@ -1879,6 +1416,26 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 }
 
 
+/* ----------
+ * RI_FKey_setdefault_del -
+ *
+ *	Set foreign key references to defaults at delete event on PK table.
+ * ----------
+ */
+Datum
+RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
+{
+	/*
+	 * Check that this is a valid trigger call on the right time and event.
+	 */
+	ri_CheckTrigger(fcinfo, "RI_FKey_setdefault_del", RI_TRIGTYPE_DELETE);
+
+	/*
+	 * Share code with UPDATE case
+	 */
+	return ri_setdefault((TriggerData *) fcinfo->context);
+}
+
 /* ----------
  * RI_FKey_setdefault_upd -
  *
@@ -1888,20 +1445,33 @@ RI_FKey_setdefault_del(PG_FUNCTION_ARGS)
 Datum
 RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 {
-	TriggerData *trigdata = (TriggerData *) fcinfo->context;
+	/*
+	 * Check that this is a valid trigger call on the right time and event.
+	 */
+	ri_CheckTrigger(fcinfo, "RI_FKey_setdefault_upd", RI_TRIGTYPE_UPDATE);
+
+	/*
+	 * Share code with DELETE case
+	 */
+	return ri_setdefault((TriggerData *) fcinfo->context);
+}
+
+/* ----------
+ * ri_setdefault -
+ *
+ *	Common code for ON DELETE SET DEFAULT and ON UPDATE SET DEFAULT
+ * ----------
+ */
+static Datum
+ri_setdefault(TriggerData *trigdata)
+{
 	const RI_ConstraintInfo *riinfo;
 	Relation	fk_rel;
 	Relation	pk_rel;
-	HeapTuple	new_row;
 	HeapTuple	old_row;
 	RI_QueryKey qkey;
 	SPIPlanPtr	qplan;
 
-	/*
-	 * Check that this is a valid trigger call on the right time and event.
-	 */
-	ri_CheckTrigger(fcinfo, "RI_FKey_setdefault_upd", RI_TRIGTYPE_UPDATE);
-
 	/*
 	 * Get arguments.
 	 */
@@ -1916,13 +1486,15 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 	 */
 	fk_rel = heap_open(riinfo->fk_relid, RowExclusiveLock);
 	pk_rel = trigdata->tg_relation;
-	new_row = trigdata->tg_newtuple;
 	old_row = trigdata->tg_trigtuple;
 
 	switch (riinfo->confmatchtype)
 	{
 			/* ----------
 			 * SQL:2008 15.17 <Execution of referential actions>
+			 *	General rules 9) a) iii):
+			 *		MATCH SIMPLE/FULL
+			 *			... ON DELETE SET DEFAULT
 			 *	General rules 10) a) iii):
 			 *		MATCH SIMPLE/FULL
 			 *			... ON UPDATE SET DEFAULT
@@ -1951,22 +1523,27 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 			}
 
 			/*
-			 * No need to do anything if old and new keys are equal
+			 * In UPDATE, no need to do anything if old and new keys are equal
 			 */
-			if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
+			if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 			{
-				heap_close(fk_rel, RowExclusiveLock);
-				return PointerGetDatum(NULL);
+				HeapTuple	new_row = trigdata->tg_newtuple;
+
+				if (ri_KeysEqual(pk_rel, old_row, new_row, riinfo, true))
+				{
+					heap_close(fk_rel, RowExclusiveLock);
+					return PointerGetDatum(NULL);
+				}
 			}
 
 			if (SPI_connect() != SPI_OK_CONNECT)
 				elog(ERROR, "SPI_connect failed");
 
 			/*
-			 * Fetch or prepare a saved plan for the set default update
-			 * operation
+			 * Fetch or prepare a saved plan for the set default operation
+			 * (it's the same query for delete and update cases)
 			 */
-			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETDEFAULT_UPD_DOUPDATE);
+			ri_BuildQueryKey(&qkey, riinfo, RI_PLAN_SETDEFAULT_DOUPDATE);
 
 			if ((qplan = ri_FetchPreparedPlan(&qkey)) == NULL)
 			{
@@ -2035,23 +1612,23 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
 			heap_close(fk_rel, RowExclusiveLock);
 
 			/*
-			 * If we just updated the PK row whose key was equal to the FK
-			 * columns' default values, and a referencing row exists in the FK
-			 * table, we would have updated that row to the same values it
-			 * already had --- and RI_FKey_fk_upd_check_required would hence
-			 * believe no check is necessary.  So we need to do another lookup
-			 * now and in case a reference still exists, abort the operation.
-			 * That is already implemented in the NO ACTION trigger, so just
-			 * run it.  (This recheck is only needed in the SET DEFAULT case,
-			 * since CASCADE must change the FK key values, while SET NULL is
-			 * certain to result in rows that satisfy the FK constraint.)
+			 * If we just deleted or updated the PK row whose key was equal to
+			 * the FK columns' default values, and a referencing row exists in
+			 * the FK table, we would have updated that row to the same values
+			 * it already had --- and RI_FKey_fk_upd_check_required would
+			 * hence believe no check is necessary.  So we need to do another
+			 * lookup now and in case a reference still exists, abort the
+			 * operation.  That is already implemented in the NO ACTION
+			 * trigger, so just run it.  (This recheck is only needed in the
+			 * SET DEFAULT case, since CASCADE would remove such rows in case
+			 * of a DELETE operation or would change the FK key values in case
+			 * of an UPDATE, while SET NULL is certain to result in rows that
+			 * satisfy the FK constraint.)
 			 */
-			RI_FKey_noaction_upd(fcinfo);
-
-			return PointerGetDatum(NULL);
+			return ri_restrict(trigdata, true);
 
 			/*
-			 * Handle MATCH PARTIAL set default update.
+			 * Handle MATCH PARTIAL set default delete or update.
 			 */
 		case FKCONSTR_MATCH_PARTIAL:
 			ereport(ERROR,
@@ -2075,8 +1652,8 @@ RI_FKey_setdefault_upd(PG_FUNCTION_ARGS)
  *
  *	Check if we really need to fire the RI trigger for an update to a PK
  *	relation.  This is called by the AFTER trigger queue manager to see if
- *	it can skip queuing an instance of an RI trigger.  Returns TRUE if the
- *	trigger must be fired, FALSE if we can prove the constraint will still
+ *	it can skip queuing an instance of an RI trigger.  Returns true if the
+ *	trigger must be fired, false if we can prove the constraint will still
  *	be satisfied.
  * ----------
  */
@@ -2132,8 +1709,8 @@ RI_FKey_pk_upd_check_required(Trigger *trigger, Relation pk_rel,
  *
  *	Check if we really need to fire the RI trigger for an update to an FK
  *	relation.  This is called by the AFTER trigger queue manager to see if
- *	it can skip queuing an instance of an RI trigger.  Returns TRUE if the
- *	trigger must be fired, FALSE if we can prove the constraint will still
+ *	it can skip queuing an instance of an RI trigger.  Returns true if the
+ *	trigger must be fired, false if we can prove the constraint will still
  *	be satisfied.
  * ----------
  */
@@ -2435,8 +2012,8 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 	qplan = SPI_prepare(querybuf.data, 0, NULL);
 
 	if (qplan == NULL)
-		elog(ERROR, "SPI_prepare returned %d for %s",
-			 SPI_result, querybuf.data);
+		elog(ERROR, "SPI_prepare returned %s for %s",
+			 SPI_result_code_string(SPI_result), querybuf.data);
 
 	/*
 	 * Run the plan.  For safety we force a current snapshot to be used. (In
@@ -2453,7 +2030,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 
 	/* Check result */
 	if (spi_result != SPI_OK_SELECT)
-		elog(ERROR, "SPI_execute_snapshot returned %d", spi_result);
+		elog(ERROR, "SPI_execute_snapshot returned %s", SPI_result_code_string(spi_result));
 
 	/* Did we find a tuple violating the constraint? */
 	if (SPI_processed > 0)
@@ -2499,7 +2076,7 @@ RI_Initial_Check(Trigger *trigger, Relation fk_rel, Relation pk_rel)
 		ri_ReportViolation(&fake_riinfo,
 						   pk_rel, fk_rel,
 						   tuple, tupdesc,
-						   RI_PLAN_CHECK_LOOKUPPK, false);
+						   RI_PLAN_CHECK_LOOKUPPK);
 	}
 
 	if (SPI_finish() != SPI_OK_FINISH)
@@ -3016,7 +2593,7 @@ ri_PlanCheck(const char *querystr, int nargs, Oid *argtypes,
 	qplan = SPI_prepare(querystr, nargs, argtypes);
 
 	if (qplan == NULL)
-		elog(ERROR, "SPI_prepare returned %d for %s", SPI_result, querystr);
+		elog(ERROR, "SPI_prepare returned %s for %s", SPI_result_code_string(SPI_result), querystr);
 
 	/* Restore UID and security context */
 	SetUserIdAndSecContext(save_userid, save_sec_context);
@@ -3144,14 +2721,16 @@ ri_PerformCheck(const RI_ConstraintInfo *riinfo,
 
 	/* Check result */
 	if (spi_result < 0)
-		elog(ERROR, "SPI_execute_snapshot returned %d", spi_result);
+		elog(ERROR, "SPI_execute_snapshot returned %s", SPI_result_code_string(spi_result));
 
 	if (expect_OK >= 0 && spi_result != expect_OK)
-		ri_ReportViolation(riinfo,
-						   pk_rel, fk_rel,
-						   new_tuple ? new_tuple : old_tuple,
-						   NULL,
-						   qkey->constr_queryno, true);
+		ereport(ERROR,
+				(errcode(ERRCODE_INTERNAL_ERROR),
+				 errmsg("referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result",
+						RelationGetRelationName(pk_rel),
+						NameStr(riinfo->conname),
+						RelationGetRelationName(fk_rel)),
+				 errhint("This is most likely due to a rule having rewritten the query.")));
 
 	/* XXX wouldn't it be clearer to do this part at the caller? */
 	if (qkey->constr_queryno != RI_PLAN_CHECK_LOOKUPPK_FROM_PK &&
@@ -3161,7 +2740,7 @@ ri_PerformCheck(const RI_ConstraintInfo *riinfo,
 						   pk_rel, fk_rel,
 						   new_tuple ? new_tuple : old_tuple,
 						   NULL,
-						   qkey->constr_queryno, false);
+						   qkey->constr_queryno);
 
 	return SPI_processed != 0;
 }
@@ -3205,7 +2784,7 @@ static void
 ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 				   Relation pk_rel, Relation fk_rel,
 				   HeapTuple violator, TupleDesc tupdesc,
-				   int queryno, bool spi_err)
+				   int queryno)
 {
 	StringInfoData key_names;
 	StringInfoData key_values;
@@ -3216,15 +2795,6 @@ ri_ReportViolation(const RI_ConstraintInfo *riinfo,
 	AclResult	aclresult;
 	bool		has_perm = true;
 
-	if (spi_err)
-		ereport(ERROR,
-				(errcode(ERRCODE_INTERNAL_ERROR),
-				 errmsg("referential integrity query on \"%s\" from constraint \"%s\" on \"%s\" gave unexpected result",
-						RelationGetRelationName(pk_rel),
-						NameStr(riinfo->conname),
-						RelationGetRelationName(fk_rel)),
-				 errhint("This is most likely due to a rule having rewritten the query.")));
-
 	/*
 	 * Determine which relation to complain about.  If tupdesc wasn't passed
 	 * by caller, assume the violator tuple came from there.
diff --git a/src/backend/utils/adt/rowtypes.c b/src/backend/utils/adt/rowtypes.c
index 44acd13c6b..5f729342f8 100644
--- a/src/backend/utils/adt/rowtypes.c
+++ b/src/backend/utils/adt/rowtypes.c
@@ -3,7 +3,7 @@
  * rowtypes.c
  *	  I/O and comparison functions for generic composite types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -159,12 +159,13 @@ record_in(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < ncolumns; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Oid			column_type = att->atttypid;
 		char	   *column_data;
 
 		/* Ignore dropped columns in datatype, but fill with nulls */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 		{
 			values[i] = (Datum) 0;
 			nulls[i] = true;
@@ -252,7 +253,7 @@ record_in(PG_FUNCTION_ARGS)
 		values[i] = InputFunctionCall(&column_info->proc,
 									  column_data,
 									  column_info->typioparam,
-									  tupdesc->attrs[i]->atttypmod);
+									  att->atttypmod);
 
 		/*
 		 * Prep for next column
@@ -367,15 +368,16 @@ record_out(PG_FUNCTION_ARGS)
 
 	for (i = 0; i < ncolumns; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Oid			column_type = att->atttypid;
 		Datum		attr;
 		char	   *value;
 		char	   *tmp;
 		bool		nq;
 
 		/* Ignore dropped columns in datatype */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		if (needComma)
@@ -519,7 +521,7 @@ record_recv(PG_FUNCTION_ARGS)
 	validcols = 0;
 	for (i = 0; i < ncolumns; i++)
 	{
-		if (!tupdesc->attrs[i]->attisdropped)
+		if (!TupleDescAttr(tupdesc, i)->attisdropped)
 			validcols++;
 	}
 	if (usercols != validcols)
@@ -531,8 +533,9 @@ record_recv(PG_FUNCTION_ARGS)
 	/* Process each column */
 	for (i = 0; i < ncolumns; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Oid			column_type = att->atttypid;
 		Oid			coltypoid;
 		int			itemlen;
 		StringInfoData item_buf;
@@ -540,7 +543,7 @@ record_recv(PG_FUNCTION_ARGS)
 		char		csave;
 
 		/* Ignore dropped columns in datatype, but fill with nulls */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 		{
 			values[i] = (Datum) 0;
 			nulls[i] = true;
@@ -605,7 +608,7 @@ record_recv(PG_FUNCTION_ARGS)
 		values[i] = ReceiveFunctionCall(&column_info->proc,
 										bufptr,
 										column_info->typioparam,
-										tupdesc->attrs[i]->atttypmod);
+										att->atttypmod);
 
 		if (bufptr)
 		{
@@ -712,28 +715,29 @@ record_send(PG_FUNCTION_ARGS)
 	validcols = 0;
 	for (i = 0; i < ncolumns; i++)
 	{
-		if (!tupdesc->attrs[i]->attisdropped)
+		if (!TupleDescAttr(tupdesc, i)->attisdropped)
 			validcols++;
 	}
-	pq_sendint(&buf, validcols, 4);
+	pq_sendint32(&buf, validcols);
 
 	for (i = 0; i < ncolumns; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 		ColumnIOData *column_info = &my_extra->columns[i];
-		Oid			column_type = tupdesc->attrs[i]->atttypid;
+		Oid			column_type = att->atttypid;
 		Datum		attr;
 		bytea	   *outputbytes;
 
 		/* Ignore dropped columns in datatype */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
-		pq_sendint(&buf, column_type, sizeof(Oid));
+		pq_sendint32(&buf, column_type);
 
 		if (nulls[i])
 		{
 			/* emit -1 data length to signify a NULL */
-			pq_sendint(&buf, -1, 4);
+			pq_sendint32(&buf, -1);
 			continue;
 		}
 
@@ -752,7 +756,7 @@ record_send(PG_FUNCTION_ARGS)
 
 		attr = values[i];
 		outputbytes = SendFunctionCall(&column_info->proc, attr);
-		pq_sendint(&buf, VARSIZE(outputbytes) - VARHDRSZ, 4);
+		pq_sendint32(&buf, VARSIZE(outputbytes) - VARHDRSZ);
 		pq_sendbytes(&buf, VARDATA(outputbytes),
 					 VARSIZE(outputbytes) - VARHDRSZ);
 	}
@@ -873,18 +877,20 @@ record_cmp(FunctionCallInfo fcinfo)
 	i1 = i2 = j = 0;
 	while (i1 < ncolumns1 || i2 < ncolumns2)
 	{
+		Form_pg_attribute att1;
+		Form_pg_attribute att2;
 		TypeCacheEntry *typentry;
 		Oid			collation;
 
 		/*
 		 * Skip dropped columns
 		 */
-		if (i1 < ncolumns1 && tupdesc1->attrs[i1]->attisdropped)
+		if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped)
 		{
 			i1++;
 			continue;
 		}
-		if (i2 < ncolumns2 && tupdesc2->attrs[i2]->attisdropped)
+		if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped)
 		{
 			i2++;
 			continue;
@@ -892,24 +898,26 @@ record_cmp(FunctionCallInfo fcinfo)
 		if (i1 >= ncolumns1 || i2 >= ncolumns2)
 			break;				/* we'll deal with mismatch below loop */
 
+		att1 = TupleDescAttr(tupdesc1, i1);
+		att2 = TupleDescAttr(tupdesc2, i2);
+
 		/*
 		 * Have two matching columns, they must be same type
 		 */
-		if (tupdesc1->attrs[i1]->atttypid !=
-			tupdesc2->attrs[i2]->atttypid)
+		if (att1->atttypid != att2->atttypid)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("cannot compare dissimilar column types %s and %s at record column %d",
-							format_type_be(tupdesc1->attrs[i1]->atttypid),
-							format_type_be(tupdesc2->attrs[i2]->atttypid),
+							format_type_be(att1->atttypid),
+							format_type_be(att2->atttypid),
 							j + 1)));
 
 		/*
 		 * If they're not same collation, we don't complain here, but the
 		 * comparison function might.
 		 */
-		collation = tupdesc1->attrs[i1]->attcollation;
-		if (collation != tupdesc2->attrs[i2]->attcollation)
+		collation = att1->attcollation;
+		if (collation != att2->attcollation)
 			collation = InvalidOid;
 
 		/*
@@ -917,9 +925,9 @@ record_cmp(FunctionCallInfo fcinfo)
 		 */
 		typentry = my_extra->columns[j].typentry;
 		if (typentry == NULL ||
-			typentry->type_id != tupdesc1->attrs[i1]->atttypid)
+			typentry->type_id != att1->atttypid)
 		{
-			typentry = lookup_type_cache(tupdesc1->attrs[i1]->atttypid,
+			typentry = lookup_type_cache(att1->atttypid,
 										 TYPECACHE_CMP_PROC_FINFO);
 			if (!OidIsValid(typentry->cmp_proc_finfo.fn_oid))
 				ereport(ERROR,
@@ -1111,6 +1119,8 @@ record_eq(PG_FUNCTION_ARGS)
 	i1 = i2 = j = 0;
 	while (i1 < ncolumns1 || i2 < ncolumns2)
 	{
+		Form_pg_attribute att1;
+		Form_pg_attribute att2;
 		TypeCacheEntry *typentry;
 		Oid			collation;
 		FunctionCallInfoData locfcinfo;
@@ -1119,12 +1129,12 @@ record_eq(PG_FUNCTION_ARGS)
 		/*
 		 * Skip dropped columns
 		 */
-		if (i1 < ncolumns1 && tupdesc1->attrs[i1]->attisdropped)
+		if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped)
 		{
 			i1++;
 			continue;
 		}
-		if (i2 < ncolumns2 && tupdesc2->attrs[i2]->attisdropped)
+		if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped)
 		{
 			i2++;
 			continue;
@@ -1132,24 +1142,26 @@ record_eq(PG_FUNCTION_ARGS)
 		if (i1 >= ncolumns1 || i2 >= ncolumns2)
 			break;				/* we'll deal with mismatch below loop */
 
+		att1 = TupleDescAttr(tupdesc1, i1);
+		att2 = TupleDescAttr(tupdesc2, i2);
+
 		/*
 		 * Have two matching columns, they must be same type
 		 */
-		if (tupdesc1->attrs[i1]->atttypid !=
-			tupdesc2->attrs[i2]->atttypid)
+		if (att1->atttypid != att2->atttypid)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("cannot compare dissimilar column types %s and %s at record column %d",
-							format_type_be(tupdesc1->attrs[i1]->atttypid),
-							format_type_be(tupdesc2->attrs[i2]->atttypid),
+							format_type_be(att1->atttypid),
+							format_type_be(att2->atttypid),
 							j + 1)));
 
 		/*
 		 * If they're not same collation, we don't complain here, but the
 		 * equality function might.
 		 */
-		collation = tupdesc1->attrs[i1]->attcollation;
-		if (collation != tupdesc2->attrs[i2]->attcollation)
+		collation = att1->attcollation;
+		if (collation != att2->attcollation)
 			collation = InvalidOid;
 
 		/*
@@ -1157,9 +1169,9 @@ record_eq(PG_FUNCTION_ARGS)
 		 */
 		typentry = my_extra->columns[j].typentry;
 		if (typentry == NULL ||
-			typentry->type_id != tupdesc1->attrs[i1]->atttypid)
+			typentry->type_id != att1->atttypid)
 		{
-			typentry = lookup_type_cache(tupdesc1->attrs[i1]->atttypid,
+			typentry = lookup_type_cache(att1->atttypid,
 										 TYPECACHE_EQ_OPR_FINFO);
 			if (!OidIsValid(typentry->eq_opr_finfo.fn_oid))
 				ereport(ERROR,
@@ -1370,15 +1382,18 @@ record_image_cmp(FunctionCallInfo fcinfo)
 	i1 = i2 = j = 0;
 	while (i1 < ncolumns1 || i2 < ncolumns2)
 	{
+		Form_pg_attribute att1;
+		Form_pg_attribute att2;
+
 		/*
 		 * Skip dropped columns
 		 */
-		if (i1 < ncolumns1 && tupdesc1->attrs[i1]->attisdropped)
+		if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped)
 		{
 			i1++;
 			continue;
 		}
-		if (i2 < ncolumns2 && tupdesc2->attrs[i2]->attisdropped)
+		if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped)
 		{
 			i2++;
 			continue;
@@ -1386,24 +1401,25 @@ record_image_cmp(FunctionCallInfo fcinfo)
 		if (i1 >= ncolumns1 || i2 >= ncolumns2)
 			break;				/* we'll deal with mismatch below loop */
 
+		att1 = TupleDescAttr(tupdesc1, i1);
+		att2 = TupleDescAttr(tupdesc2, i2);
+
 		/*
 		 * Have two matching columns, they must be same type
 		 */
-		if (tupdesc1->attrs[i1]->atttypid !=
-			tupdesc2->attrs[i2]->atttypid)
+		if (att1->atttypid != att2->atttypid)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("cannot compare dissimilar column types %s and %s at record column %d",
-							format_type_be(tupdesc1->attrs[i1]->atttypid),
-							format_type_be(tupdesc2->attrs[i2]->atttypid),
+							format_type_be(att1->atttypid),
+							format_type_be(att2->atttypid),
 							j + 1)));
 
 		/*
 		 * The same type should have the same length (or both should be
 		 * variable).
 		 */
-		Assert(tupdesc1->attrs[i1]->attlen ==
-			   tupdesc2->attrs[i2]->attlen);
+		Assert(att1->attlen == att2->attlen);
 
 		/*
 		 * We consider two NULLs equal; NULL > not-NULL.
@@ -1426,7 +1442,7 @@ record_image_cmp(FunctionCallInfo fcinfo)
 			}
 
 			/* Compare the pair of elements */
-			if (tupdesc1->attrs[i1]->attlen == -1)
+			if (att1->attlen == -1)
 			{
 				Size		len1,
 							len2;
@@ -1449,53 +1465,16 @@ record_image_cmp(FunctionCallInfo fcinfo)
 				if ((Pointer) arg2val != (Pointer) values2[i2])
 					pfree(arg2val);
 			}
-			else if (tupdesc1->attrs[i1]->attbyval)
+			else if (att1->attbyval)
 			{
-				switch (tupdesc1->attrs[i1]->attlen)
-				{
-					case 1:
-						if (GET_1_BYTE(values1[i1]) !=
-							GET_1_BYTE(values2[i2]))
-						{
-							cmpresult = (GET_1_BYTE(values1[i1]) <
-										 GET_1_BYTE(values2[i2])) ? -1 : 1;
-						}
-						break;
-					case 2:
-						if (GET_2_BYTES(values1[i1]) !=
-							GET_2_BYTES(values2[i2]))
-						{
-							cmpresult = (GET_2_BYTES(values1[i1]) <
-										 GET_2_BYTES(values2[i2])) ? -1 : 1;
-						}
-						break;
-					case 4:
-						if (GET_4_BYTES(values1[i1]) !=
-							GET_4_BYTES(values2[i2]))
-						{
-							cmpresult = (GET_4_BYTES(values1[i1]) <
-										 GET_4_BYTES(values2[i2])) ? -1 : 1;
-						}
-						break;
-#if SIZEOF_DATUM == 8
-					case 8:
-						if (GET_8_BYTES(values1[i1]) !=
-							GET_8_BYTES(values2[i2]))
-						{
-							cmpresult = (GET_8_BYTES(values1[i1]) <
-										 GET_8_BYTES(values2[i2])) ? -1 : 1;
-						}
-						break;
-#endif
-					default:
-						Assert(false);	/* cannot happen */
-				}
+				if (values1[i1] != values2[i2])
+					cmpresult = (values1[i1] < values2[i2]) ? -1 : 1;
 			}
 			else
 			{
 				cmpresult = memcmp(DatumGetPointer(values1[i1]),
 								   DatumGetPointer(values2[i2]),
-								   tupdesc1->attrs[i1]->attlen);
+								   att1->attlen);
 			}
 
 			if (cmpresult < 0)
@@ -1647,15 +1626,18 @@ record_image_eq(PG_FUNCTION_ARGS)
 	i1 = i2 = j = 0;
 	while (i1 < ncolumns1 || i2 < ncolumns2)
 	{
+		Form_pg_attribute att1;
+		Form_pg_attribute att2;
+
 		/*
 		 * Skip dropped columns
 		 */
-		if (i1 < ncolumns1 && tupdesc1->attrs[i1]->attisdropped)
+		if (i1 < ncolumns1 && TupleDescAttr(tupdesc1, i1)->attisdropped)
 		{
 			i1++;
 			continue;
 		}
-		if (i2 < ncolumns2 && tupdesc2->attrs[i2]->attisdropped)
+		if (i2 < ncolumns2 && TupleDescAttr(tupdesc2, i2)->attisdropped)
 		{
 			i2++;
 			continue;
@@ -1663,16 +1645,18 @@ record_image_eq(PG_FUNCTION_ARGS)
 		if (i1 >= ncolumns1 || i2 >= ncolumns2)
 			break;				/* we'll deal with mismatch below loop */
 
+		att1 = TupleDescAttr(tupdesc1, i1);
+		att2 = TupleDescAttr(tupdesc2, i2);
+
 		/*
 		 * Have two matching columns, they must be same type
 		 */
-		if (tupdesc1->attrs[i1]->atttypid !=
-			tupdesc2->attrs[i2]->atttypid)
+		if (att1->atttypid != att2->atttypid)
 			ereport(ERROR,
 					(errcode(ERRCODE_DATATYPE_MISMATCH),
 					 errmsg("cannot compare dissimilar column types %s and %s at record column %d",
-							format_type_be(tupdesc1->attrs[i1]->atttypid),
-							format_type_be(tupdesc2->attrs[i2]->atttypid),
+							format_type_be(att1->atttypid),
+							format_type_be(att2->atttypid),
 							j + 1)));
 
 		/*
@@ -1687,7 +1671,7 @@ record_image_eq(PG_FUNCTION_ARGS)
 			}
 
 			/* Compare the pair of elements */
-			if (tupdesc1->attrs[i1]->attlen == -1)
+			if (att1->attlen == -1)
 			{
 				Size		len1,
 							len2;
@@ -1716,37 +1700,15 @@ record_image_eq(PG_FUNCTION_ARGS)
 						pfree(arg2val);
 				}
 			}
-			else if (tupdesc1->attrs[i1]->attbyval)
+			else if (att1->attbyval)
 			{
-				switch (tupdesc1->attrs[i1]->attlen)
-				{
-					case 1:
-						result = (GET_1_BYTE(values1[i1]) ==
-								  GET_1_BYTE(values2[i2]));
-						break;
-					case 2:
-						result = (GET_2_BYTES(values1[i1]) ==
-								  GET_2_BYTES(values2[i2]));
-						break;
-					case 4:
-						result = (GET_4_BYTES(values1[i1]) ==
-								  GET_4_BYTES(values2[i2]));
-						break;
-#if SIZEOF_DATUM == 8
-					case 8:
-						result = (GET_8_BYTES(values1[i1]) ==
-								  GET_8_BYTES(values2[i2]));
-						break;
-#endif
-					default:
-						Assert(false);	/* cannot happen */
-				}
+				result = (values1[i1] == values2[i2]);
 			}
 			else
 			{
 				result = (memcmp(DatumGetPointer(values1[i1]),
 								 DatumGetPointer(values2[i2]),
-								 tupdesc1->attrs[i1]->attlen) == 0);
+								 att1->attlen) == 0);
 			}
 			if (!result)
 				break;
diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c
index 7469ec773c..3697466789 100644
--- a/src/backend/utils/adt/ruleutils.c
+++ b/src/backend/utils/adt/ruleutils.c
@@ -4,7 +4,7 @@
  *	  Functions to convert stored expressions/querytrees back to
  *	  source text
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -86,15 +86,17 @@
 #define PRETTYINDENT_LIMIT		40	/* wrap limit */
 
 /* Pretty flags */
-#define PRETTYFLAG_PAREN		1
-#define PRETTYFLAG_INDENT		2
+#define PRETTYFLAG_PAREN		0x0001
+#define PRETTYFLAG_INDENT		0x0002
+#define PRETTYFLAG_SCHEMA		0x0004
 
 /* Default line length for pretty-print wrapping: 0 means wrap always */
 #define WRAP_COLUMN_DEFAULT		0
 
-/* macro to test if pretty action needed */
+/* macros to test if pretty action needed */
 #define PRETTY_PAREN(context)	((context)->prettyFlags & PRETTYFLAG_PAREN)
 #define PRETTY_INDENT(context)	((context)->prettyFlags & PRETTYFLAG_INDENT)
+#define PRETTY_SCHEMA(context)	((context)->prettyFlags & PRETTYFLAG_SCHEMA)
 
 
 /* ----------
@@ -112,7 +114,7 @@ typedef struct
 	int			prettyFlags;	/* enabling of pretty-print functions */
 	int			wrapColumn;		/* max line length, or -1 for no limit */
 	int			indentLevel;	/* current indent level for prettyprint */
-	bool		varprefix;		/* TRUE to print prefixes on Vars */
+	bool		varprefix;		/* true to print prefixes on Vars */
 	ParseExprKind special_exprkind; /* set only for exprkinds needing special
 									 * handling */
 } deparse_context;
@@ -130,7 +132,7 @@ typedef struct
  * rtable_columns holds the column alias names to be used for each RTE.
  *
  * In some cases we need to make names of merged JOIN USING columns unique
- * across the whole query, not only per-RTE.  If so, unique_using is TRUE
+ * across the whole query, not only per-RTE.  If so, unique_using is true
  * and using_names is a list of C strings representing names already assigned
  * to USING columns.
  *
@@ -317,7 +319,7 @@ static void decompile_column_index_array(Datum column_index_array, Oid relId,
 static char *pg_get_ruledef_worker(Oid ruleoid, int prettyFlags);
 static char *pg_get_indexdef_worker(Oid indexrelid, int colno,
 					   const Oid *excludeOps,
-					   bool attrsOnly, bool showTblSpc,
+					   bool attrsOnly, bool showTblSpc, bool inherits,
 					   int prettyFlags, bool missing_ok);
 static char *pg_get_statisticsobj_worker(Oid statextid, bool missing_ok);
 static char *pg_get_partkeydef_worker(Oid relid, int prettyFlags,
@@ -343,7 +345,7 @@ static void set_relation_column_names(deparse_namespace *dpns,
 						  deparse_columns *colinfo);
 static void set_join_column_names(deparse_namespace *dpns, RangeTblEntry *rte,
 					  deparse_columns *colinfo);
-static bool colname_is_unique(char *colname, deparse_namespace *dpns,
+static bool colname_is_unique(const char *colname, deparse_namespace *dpns,
 				  deparse_columns *colinfo);
 static char *make_colname_unique(char *colname, deparse_namespace *dpns,
 					deparse_columns *colinfo);
@@ -460,6 +462,7 @@ static char *generate_function_name(Oid funcid, int nargs,
 					   bool has_variadic, bool *use_variadic_p,
 					   ParseExprKind special_exprkind);
 static char *generate_operator_name(Oid operid, Oid arg1, Oid arg2);
+static char *generate_qualified_type_name(Oid typid);
 static text *string_to_text(char *str);
 static char *flatten_reloptions(Oid relid);
 
@@ -498,7 +501,7 @@ pg_get_ruledef_ext(PG_FUNCTION_ARGS)
 	int			prettyFlags;
 	char	   *res;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	res = pg_get_ruledef_worker(ruleoid, prettyFlags);
 
@@ -619,7 +622,7 @@ pg_get_viewdef_ext(PG_FUNCTION_ARGS)
 	int			prettyFlags;
 	char	   *res;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	res = pg_get_viewdef_worker(viewoid, prettyFlags, WRAP_COLUMN_DEFAULT);
 
@@ -639,7 +642,7 @@ pg_get_viewdef_wrap(PG_FUNCTION_ARGS)
 	char	   *res;
 
 	/* calling this implies we want pretty printing */
-	prettyFlags = PRETTYFLAG_PAREN | PRETTYFLAG_INDENT;
+	prettyFlags = PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA;
 
 	res = pg_get_viewdef_worker(viewoid, prettyFlags, wrap);
 
@@ -685,7 +688,7 @@ pg_get_viewdef_name_ext(PG_FUNCTION_ARGS)
 	Oid			viewoid;
 	char	   *res;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	/* Look up view name.  Can't lock it - we might not have privileges. */
 	viewrel = makeRangeVarFromNameList(textToQualifiedNameList(viewname));
@@ -907,8 +910,8 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
 
 				if (i > 0)
 					appendStringInfoString(&buf, ", ");
-				attname = get_relid_attribute_name(trigrec->tgrelid,
-												   trigrec->tgattr.values[i]);
+				attname = get_attname(trigrec->tgrelid,
+									  trigrec->tgattr.values[i], false);
 				appendStringInfoString(&buf, quote_identifier(attname));
 			}
 		}
@@ -921,8 +924,15 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
 			appendStringInfoString(&buf, " TRUNCATE");
 		findx++;
 	}
+
+	/*
+	 * In non-pretty mode, always schema-qualify the target table name for
+	 * safety.  In pretty mode, schema-qualify only if not visible.
+	 */
 	appendStringInfo(&buf, " ON %s ",
-					 generate_relation_name(trigrec->tgrelid, NIL));
+					 pretty ?
+					 generate_relation_name(trigrec->tgrelid, NIL) :
+					 generate_qualified_relation_name(trigrec->tgrelid));
 
 	if (OidIsValid(trigrec->tgconstraint))
 	{
@@ -1016,7 +1026,7 @@ pg_get_triggerdef_worker(Oid trigid, bool pretty)
 		context.windowClause = NIL;
 		context.windowTList = NIL;
 		context.varprefix = true;
-		context.prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+		context.prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 		context.wrapColumn = WRAP_COLUMN_DEFAULT;
 		context.indentLevel = PRETTYINDENT_STD;
 		context.special_exprkind = EXPR_KIND_NONE;
@@ -1085,7 +1095,7 @@ pg_get_indexdef(PG_FUNCTION_ARGS)
 
 	prettyFlags = PRETTYFLAG_INDENT;
 
-	res = pg_get_indexdef_worker(indexrelid, 0, NULL, false, false,
+	res = pg_get_indexdef_worker(indexrelid, 0, NULL, false, false, false,
 								 prettyFlags, true);
 
 	if (res == NULL)
@@ -1103,10 +1113,10 @@ pg_get_indexdef_ext(PG_FUNCTION_ARGS)
 	int			prettyFlags;
 	char	   *res;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	res = pg_get_indexdef_worker(indexrelid, colno, NULL, colno != 0, false,
-								 prettyFlags, true);
+								 false, prettyFlags, true);
 
 	if (res == NULL)
 		PG_RETURN_NULL();
@@ -1122,7 +1132,7 @@ pg_get_indexdef_ext(PG_FUNCTION_ARGS)
 char *
 pg_get_indexdef_string(Oid indexrelid)
 {
-	return pg_get_indexdef_worker(indexrelid, 0, NULL, false, true, 0, false);
+	return pg_get_indexdef_worker(indexrelid, 0, NULL, false, true, true, 0, false);
 }
 
 /* Internal version that just reports the column definitions */
@@ -1131,8 +1141,9 @@ pg_get_indexdef_columns(Oid indexrelid, bool pretty)
 {
 	int			prettyFlags;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
-	return pg_get_indexdef_worker(indexrelid, 0, NULL, true, false,
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
+
+	return pg_get_indexdef_worker(indexrelid, 0, NULL, true, false, false,
 								  prettyFlags, false);
 }
 
@@ -1145,7 +1156,7 @@ pg_get_indexdef_columns(Oid indexrelid, bool pretty)
 static char *
 pg_get_indexdef_worker(Oid indexrelid, int colno,
 					   const Oid *excludeOps,
-					   bool attrsOnly, bool showTblSpc,
+					   bool attrsOnly, bool showTblSpc, bool inherits,
 					   int prettyFlags, bool missing_ok)
 {
 	/* might want a separate isConstraint parameter later */
@@ -1258,10 +1269,14 @@ pg_get_indexdef_worker(Oid indexrelid, int colno,
 	if (!attrsOnly)
 	{
 		if (!isConstraint)
-			appendStringInfo(&buf, "CREATE %sINDEX %s ON %s USING %s (",
+			appendStringInfo(&buf, "CREATE %sINDEX %s ON %s%s USING %s (",
 							 idxrec->indisunique ? "UNIQUE " : "",
 							 quote_identifier(NameStr(idxrelrec->relname)),
-							 generate_relation_name(indrelid, NIL),
+							 idxrelrec->relkind == RELKIND_PARTITIONED_INDEX
+							 && !inherits ? "ONLY " : "",
+							 (prettyFlags & PRETTYFLAG_SCHEMA) ?
+							 generate_relation_name(indrelid, NIL) :
+							 generate_qualified_relation_name(indrelid),
 							 quote_identifier(NameStr(amrec->amname)));
 		else					/* currently, must be EXCLUDE constraint */
 			appendStringInfo(&buf, "EXCLUDE USING %s (",
@@ -1289,7 +1304,7 @@ pg_get_indexdef_worker(Oid indexrelid, int colno,
 			char	   *attname;
 			int32		keycoltypmod;
 
-			attname = get_relid_attribute_name(indrelid, attnum);
+			attname = get_attname(indrelid, attnum, false);
 			if (!colno || colno == keyno + 1)
 				appendStringInfoString(&buf, quote_identifier(attname));
 			get_atttypetypmodcoll(indrelid, attnum,
@@ -1532,7 +1547,7 @@ pg_get_statisticsobj_worker(Oid statextid, bool missing_ok)
 		if (colno > 0)
 			appendStringInfoString(&buf, ", ");
 
-		attname = get_relid_attribute_name(statextrec->stxrelid, attnum);
+		attname = get_attname(statextrec->stxrelid, attnum, false);
 
 		appendStringInfoString(&buf, quote_identifier(attname));
 	}
@@ -1550,7 +1565,7 @@ pg_get_statisticsobj_worker(Oid statextid, bool missing_ok)
  *
  * Returns the partition key specification, ie, the following:
  *
- * PARTITION BY { RANGE | LIST } (column opt_collation opt_opclass [, ...])
+ * PARTITION BY { RANGE | LIST | HASH } (column opt_collation opt_opclass [, ...])
  */
 Datum
 pg_get_partkeydef(PG_FUNCTION_ARGS)
@@ -1572,7 +1587,8 @@ pg_get_partkeydef_columns(Oid relid, bool pretty)
 {
 	int			prettyFlags;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
+
 	return pg_get_partkeydef_worker(relid, prettyFlags, true, false);
 }
 
@@ -1654,6 +1670,10 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,
 
 	switch (form->partstrat)
 	{
+		case PARTITION_STRATEGY_HASH:
+			if (!attrsOnly)
+				appendStringInfo(&buf, "HASH");
+			break;
 		case PARTITION_STRATEGY_LIST:
 			if (!attrsOnly)
 				appendStringInfoString(&buf, "LIST");
@@ -1685,7 +1705,7 @@ pg_get_partkeydef_worker(Oid relid, int prettyFlags,
 			char	   *attname;
 			int32		keycoltypmod;
 
-			attname = get_relid_attribute_name(relid, attnum);
+			attname = get_attname(relid, attnum, false);
 			appendStringInfoString(&buf, quote_identifier(attname));
 			get_atttypetypmodcoll(relid, attnum,
 								  &keycoltype, &keycoltypmod,
@@ -1750,7 +1770,7 @@ pg_get_partition_constraintdef(PG_FUNCTION_ARGS)
 
 	constr_expr = get_partition_qual_relid(relationId);
 
-	/* Quick exit if not a partition */
+	/* Quick exit if no partition constraint */
 	if (constr_expr == NULL)
 		PG_RETURN_NULL();
 
@@ -1796,7 +1816,7 @@ pg_get_constraintdef_ext(PG_FUNCTION_ARGS)
 	int			prettyFlags;
 	char	   *res;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	res = pg_get_constraintdef_worker(constraintId, false, prettyFlags, true);
 
@@ -1867,15 +1887,27 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
 
 	if (fullCommand)
 	{
-		/*
-		 * Currently, callers want ALTER TABLE (without ONLY) for CHECK
-		 * constraints, and other types of constraints don't inherit anyway so
-		 * it doesn't matter whether we say ONLY or not.  Someday we might
-		 * need to let callers specify whether to put ONLY in the command.
-		 */
-		appendStringInfo(&buf, "ALTER TABLE %s ADD CONSTRAINT %s ",
-						 generate_qualified_relation_name(conForm->conrelid),
-						 quote_identifier(NameStr(conForm->conname)));
+		if (OidIsValid(conForm->conrelid))
+		{
+			/*
+			 * Currently, callers want ALTER TABLE (without ONLY) for CHECK
+			 * constraints, and other types of constraints don't inherit
+			 * anyway so it doesn't matter whether we say ONLY or not. Someday
+			 * we might need to let callers specify whether to put ONLY in the
+			 * command.
+			 */
+			appendStringInfo(&buf, "ALTER TABLE %s ADD CONSTRAINT %s ",
+							 generate_qualified_relation_name(conForm->conrelid),
+							 quote_identifier(NameStr(conForm->conname)));
+		}
+		else
+		{
+			/* Must be a domain constraint */
+			Assert(OidIsValid(conForm->contypid));
+			appendStringInfo(&buf, "ALTER DOMAIN %s ADD CONSTRAINT %s ",
+							 generate_qualified_type_name(conForm->contypid),
+							 quote_identifier(NameStr(conForm->conname)));
+		}
 	}
 
 	switch (conForm->contype)
@@ -2131,6 +2163,7 @@ pg_get_constraintdef_worker(Oid constraintId, bool fullCommand,
 															  operators,
 															  false,
 															  false,
+															  false,
 															  prettyFlags,
 															  false));
 				break;
@@ -2176,7 +2209,7 @@ decompile_column_index_array(Datum column_index_array, Oid relId,
 	{
 		char	   *colName;
 
-		colName = get_relid_attribute_name(relId, DatumGetInt16(keys[j]));
+		colName = get_attname(relId, DatumGetInt16(keys[j]), false);
 
 		if (j == 0)
 			appendStringInfoString(buf, quote_identifier(colName));
@@ -2238,7 +2271,7 @@ pg_get_expr_ext(PG_FUNCTION_ARGS)
 	int			prettyFlags;
 	char	   *relname;
 
-	prettyFlags = pretty ? PRETTYFLAG_PAREN | PRETTYFLAG_INDENT : PRETTYFLAG_INDENT;
+	prettyFlags = pretty ? (PRETTYFLAG_PAREN | PRETTYFLAG_INDENT | PRETTYFLAG_SCHEMA) : PRETTYFLAG_INDENT;
 
 	if (OidIsValid(relid))
 	{
@@ -2322,7 +2355,7 @@ pg_get_userbyid(PG_FUNCTION_ARGS)
 
 /*
  * pg_get_serial_sequence
- *		Get the name of the sequence used by a serial column,
+ *		Get the name of the sequence used by an identity or serial column,
  *		formatted suitably for passing to setval, nextval or currval.
  *		First parameter is not treated as double-quoted, second parameter
  *		is --- see documentation for reason.
@@ -2380,13 +2413,14 @@ pg_get_serial_sequence(PG_FUNCTION_ARGS)
 		Form_pg_depend deprec = (Form_pg_depend) GETSTRUCT(tup);
 
 		/*
-		 * We assume any auto dependency of a sequence on a column must be
-		 * what we are looking for.  (We need the relkind test because indexes
-		 * can also have auto dependencies on columns.)
+		 * Look for an auto dependency (serial column) or internal dependency
+		 * (identity column) of a sequence on a column.  (We need the relkind
+		 * test because indexes can also have auto dependencies on columns.)
 		 */
 		if (deprec->classid == RelationRelationId &&
 			deprec->objsubid == 0 &&
-			deprec->deptype == DEPENDENCY_AUTO &&
+			(deprec->deptype == DEPENDENCY_AUTO ||
+			 deprec->deptype == DEPENDENCY_INTERNAL) &&
 			get_rel_relkind(deprec->objid) == RELKIND_SEQUENCE)
 		{
 			sequenceId = deprec->objid;
@@ -2428,6 +2462,7 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 	StringInfoData dq;
 	HeapTuple	proctup;
 	Form_pg_proc proc;
+	bool		isfunction;
 	Datum		tmp;
 	bool		isnull;
 	const char *prosrc;
@@ -2451,20 +2486,28 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
 				 errmsg("\"%s\" is an aggregate function", name)));
 
+	isfunction = (proc->prorettype != InvalidOid);
+
 	/*
 	 * We always qualify the function name, to ensure the right function gets
 	 * replaced.
 	 */
 	nsp = get_namespace_name(proc->pronamespace);
-	appendStringInfo(&buf, "CREATE OR REPLACE FUNCTION %s(",
+	appendStringInfo(&buf, "CREATE OR REPLACE %s %s(",
+					 isfunction ? "FUNCTION" : "PROCEDURE",
 					 quote_qualified_identifier(nsp, name));
 	(void) print_function_arguments(&buf, proctup, false, true);
-	appendStringInfoString(&buf, ")\n RETURNS ");
-	print_function_rettype(&buf, proctup);
+	appendStringInfoString(&buf, ")\n");
+	if (isfunction)
+	{
+		appendStringInfoString(&buf, " RETURNS ");
+		print_function_rettype(&buf, proctup);
+		appendStringInfoChar(&buf, '\n');
+	}
 
 	print_function_trftypes(&buf, proctup);
 
-	appendStringInfo(&buf, "\n LANGUAGE %s\n",
+	appendStringInfo(&buf, " LANGUAGE %s\n",
 					 quote_identifier(get_language_name(proc->prolang, false)));
 
 	/* Emit some miscellaneous options on one line */
@@ -2586,10 +2629,11 @@ pg_get_functiondef(PG_FUNCTION_ARGS)
 	 *
 	 * Since the user is likely to be editing the function body string, we
 	 * shouldn't use a short delimiter that he might easily create a conflict
-	 * with.  Hence prefer "$function$", but extend if needed.
+	 * with.  Hence prefer "$function$"/"$procedure$", but extend if needed.
 	 */
 	initStringInfo(&dq);
-	appendStringInfoString(&dq, "$function");
+	appendStringInfoChar(&dq, '$');
+	appendStringInfoString(&dq, (isfunction ? "function" : "procedure"));
 	while (strstr(prosrc, dq.data) != NULL)
 		appendStringInfoChar(&dq, 'x');
 	appendStringInfoChar(&dq, '$');
@@ -2673,6 +2717,12 @@ pg_get_function_result(PG_FUNCTION_ARGS)
 	if (!HeapTupleIsValid(proctup))
 		PG_RETURN_NULL();
 
+	if (((Form_pg_proc) GETSTRUCT(proctup))->prorettype == InvalidOid)
+	{
+		ReleaseSysCache(proctup);
+		PG_RETURN_NULL();
+	}
+
 	initStringInfo(&buf);
 
 	print_function_rettype(&buf, proctup);
@@ -2998,9 +3048,9 @@ deparse_expression(Node *expr, List *dpcontext,
  * for interpreting Vars in the node tree.  It can be NIL if no Vars are
  * expected.
  *
- * forceprefix is TRUE to force all Vars to be prefixed with their table names.
+ * forceprefix is true to force all Vars to be prefixed with their table names.
  *
- * showimplicit is TRUE to force all implicit casts to be shown explicitly.
+ * showimplicit is true to force all implicit casts to be shown explicitly.
  *
  * Tries to pretty up the output according to prettyFlags and startIndent.
  *
@@ -3573,7 +3623,7 @@ set_using_names(deparse_namespace *dpns, Node *jtnode, List *parentUsing)
 		 * If there's a USING clause, select the USING column names and push
 		 * those names down to the children.  We have two strategies:
 		 *
-		 * If dpns->unique_using is TRUE, we force all USING names to be
+		 * If dpns->unique_using is true, we force all USING names to be
 		 * unique across the whole query level.  In principle we'd only need
 		 * the names of dangerous USING columns to be globally unique, but to
 		 * safely assign all USING names in a single pass, we have to enforce
@@ -3586,7 +3636,7 @@ set_using_names(deparse_namespace *dpns, Node *jtnode, List *parentUsing)
 		 * this simplifies the logic and seems likely to lead to less aliasing
 		 * overall.
 		 *
-		 * If dpns->unique_using is FALSE, we only need USING names to be
+		 * If dpns->unique_using is false, we only need USING names to be
 		 * unique within their own join RTE.  We still need to honor
 		 * pushed-down names, though.
 		 *
@@ -3698,10 +3748,12 @@ set_relation_column_names(deparse_namespace *dpns, RangeTblEntry *rte,
 
 		for (i = 0; i < ncolumns; i++)
 		{
-			if (tupdesc->attrs[i]->attisdropped)
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
+
+			if (attr->attisdropped)
 				real_colnames[i] = NULL;
 			else
-				real_colnames[i] = pstrdup(NameStr(tupdesc->attrs[i]->attname));
+				real_colnames[i] = pstrdup(NameStr(attr->attname));
 		}
 		relation_close(rel, AccessShareLock);
 	}
@@ -4097,7 +4149,7 @@ set_join_column_names(deparse_namespace *dpns, RangeTblEntry *rte,
  * dpns is query-wide info, colinfo is for the column's RTE
  */
 static bool
-colname_is_unique(char *colname, deparse_namespace *dpns,
+colname_is_unique(const char *colname, deparse_namespace *dpns,
 				  deparse_columns *colinfo)
 {
 	int			i;
@@ -4670,7 +4722,10 @@ make_ruledef(StringInfo buf, HeapTuple ruletup, TupleDesc rulettc,
 	}
 
 	/* The relation the rule is fired on */
-	appendStringInfo(buf, " TO %s", generate_relation_name(ev_class, NIL));
+	appendStringInfo(buf, " TO %s",
+					 (prettyFlags & PRETTYFLAG_SCHEMA) ?
+					 generate_relation_name(ev_class, NIL) :
+					 generate_qualified_relation_name(ev_class));
 
 	/* If the rule has an event qualification, add it */
 	if (ev_qual == NULL)
@@ -5151,7 +5206,7 @@ get_simple_values_rte(Query *query)
 	ListCell   *lc;
 
 	/*
-	 * We want to return TRUE even if the Query also contains OLD or NEW rule
+	 * We want to return true even if the Query also contains OLD or NEW rule
 	 * RTEs.  So the idea is to scan the rtable and see if there is only one
 	 * inFromCl RTE that is a VALUES RTE.
 	 */
@@ -5391,7 +5446,7 @@ get_target_list(List *targetList, deparse_context *context,
 		 * Otherwise, just use what we can find in the TLE.
 		 */
 		if (resultDesc && colno <= resultDesc->natts)
-			colname = NameStr(resultDesc->attrs[colno - 1]->attname);
+			colname = NameStr(TupleDescAttr(resultDesc, colno - 1)->attname);
 		else
 			colname = tle->resname;
 
@@ -5848,6 +5903,8 @@ get_rule_windowspec(WindowClause *wc, List *targetList,
 			appendStringInfoString(buf, "RANGE ");
 		else if (wc->frameOptions & FRAMEOPTION_ROWS)
 			appendStringInfoString(buf, "ROWS ");
+		else if (wc->frameOptions & FRAMEOPTION_GROUPS)
+			appendStringInfoString(buf, "GROUPS ");
 		else
 			Assert(false);
 		if (wc->frameOptions & FRAMEOPTION_BETWEEN)
@@ -5856,12 +5913,12 @@ get_rule_windowspec(WindowClause *wc, List *targetList,
 			appendStringInfoString(buf, "UNBOUNDED PRECEDING ");
 		else if (wc->frameOptions & FRAMEOPTION_START_CURRENT_ROW)
 			appendStringInfoString(buf, "CURRENT ROW ");
-		else if (wc->frameOptions & FRAMEOPTION_START_VALUE)
+		else if (wc->frameOptions & FRAMEOPTION_START_OFFSET)
 		{
 			get_rule_expr(wc->startOffset, context, false);
-			if (wc->frameOptions & FRAMEOPTION_START_VALUE_PRECEDING)
+			if (wc->frameOptions & FRAMEOPTION_START_OFFSET_PRECEDING)
 				appendStringInfoString(buf, " PRECEDING ");
-			else if (wc->frameOptions & FRAMEOPTION_START_VALUE_FOLLOWING)
+			else if (wc->frameOptions & FRAMEOPTION_START_OFFSET_FOLLOWING)
 				appendStringInfoString(buf, " FOLLOWING ");
 			else
 				Assert(false);
@@ -5875,12 +5932,12 @@ get_rule_windowspec(WindowClause *wc, List *targetList,
 				appendStringInfoString(buf, "UNBOUNDED FOLLOWING ");
 			else if (wc->frameOptions & FRAMEOPTION_END_CURRENT_ROW)
 				appendStringInfoString(buf, "CURRENT ROW ");
-			else if (wc->frameOptions & FRAMEOPTION_END_VALUE)
+			else if (wc->frameOptions & FRAMEOPTION_END_OFFSET)
 			{
 				get_rule_expr(wc->endOffset, context, false);
-				if (wc->frameOptions & FRAMEOPTION_END_VALUE_PRECEDING)
+				if (wc->frameOptions & FRAMEOPTION_END_OFFSET_PRECEDING)
 					appendStringInfoString(buf, " PRECEDING ");
-				else if (wc->frameOptions & FRAMEOPTION_END_VALUE_FOLLOWING)
+				else if (wc->frameOptions & FRAMEOPTION_END_OFFSET_FOLLOWING)
 					appendStringInfoString(buf, " FOLLOWING ");
 				else
 					Assert(false);
@@ -5888,6 +5945,12 @@ get_rule_windowspec(WindowClause *wc, List *targetList,
 			else
 				Assert(false);
 		}
+		if (wc->frameOptions & FRAMEOPTION_EXCLUDE_CURRENT_ROW)
+			appendStringInfoString(buf, "EXCLUDE CURRENT ROW ");
+		else if (wc->frameOptions & FRAMEOPTION_EXCLUDE_GROUP)
+			appendStringInfoString(buf, "EXCLUDE GROUP ");
+		else if (wc->frameOptions & FRAMEOPTION_EXCLUDE_TIES)
+			appendStringInfoString(buf, "EXCLUDE TIES ");
 		/* we will now have a trailing space; remove it */
 		buf->len--;
 	}
@@ -5978,8 +6041,9 @@ get_insert_query_def(Query *query, deparse_context *context)
 		 * tle->resname, since resname will fail to track RENAME.
 		 */
 		appendStringInfoString(buf,
-							   quote_identifier(get_relid_attribute_name(rte->relid,
-																		 tle->resno)));
+							   quote_identifier(get_attname(rte->relid,
+															tle->resno,
+															false)));
 
 		/*
 		 * Print any indirection needed (subfields or subscripts), and strip
@@ -6282,8 +6346,9 @@ get_update_query_targetlist_def(Query *query, List *targetList,
 		 * tle->resname, since resname will fail to track RENAME.
 		 */
 		appendStringInfoString(buf,
-							   quote_identifier(get_relid_attribute_name(rte->relid,
-																		 tle->resno)));
+							   quote_identifier(get_attname(rte->relid,
+															tle->resno,
+															false)));
 
 		/*
 		 * Print any indirection needed (subfields or subscripts), and strip
@@ -6400,7 +6465,7 @@ get_utility_query_def(Query *query, deparse_context *context)
  * the Var's varlevelsup has to be interpreted with respect to a context
  * above the current one; levelsup indicates the offset.
  *
- * If istoplevel is TRUE, the Var is at the top level of a SELECT's
+ * If istoplevel is true, the Var is at the top level of a SELECT's
  * targetlist, which means we need special treatment of whole-row Vars.
  * Instead of the normal "tab.*", we'll print "tab.*::typename", which is a
  * dirty hack to prevent "tab.*" from being expanded into multiple columns.
@@ -6728,20 +6793,15 @@ get_name_for_var_field(Var *var, int fieldno,
 
 	/*
 	 * If it's a Var of type RECORD, we have to find what the Var refers to;
-	 * if not, we can use get_expr_result_type. If that fails, we try
-	 * lookup_rowtype_tupdesc, which will probably fail too, but will ereport
-	 * an acceptable message.
+	 * if not, we can use get_expr_result_tupdesc().
 	 */
 	if (!IsA(var, Var) ||
 		var->vartype != RECORDOID)
 	{
-		if (get_expr_result_type((Node *) var, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
-			tupleDesc = lookup_rowtype_tupdesc_copy(exprType((Node *) var),
-													exprTypmod((Node *) var));
-		Assert(tupleDesc);
+		tupleDesc = get_expr_result_tupdesc((Node *) var, false);
 		/* Got the tupdesc, so we can extract the field name */
 		Assert(fieldno >= 1 && fieldno <= tupleDesc->natts);
-		return NameStr(tupleDesc->attrs[fieldno - 1]->attname);
+		return NameStr(TupleDescAttr(tupleDesc, fieldno - 1)->attname);
 	}
 
 	/* Find appropriate nesting depth */
@@ -6844,8 +6904,8 @@ get_name_for_var_field(Var *var, int fieldno,
 		case RTE_NAMEDTUPLESTORE:
 
 			/*
-			 * This case should not occur: a column of a table or values list
-			 * shouldn't have type RECORD.  Fall through and fail (most
+			 * This case should not occur: a column of a table, values list,
+			 * or ENR shouldn't have type RECORD.  Fall through and fail (most
 			 * likely) at the bottom.
 			 */
 			break;
@@ -7041,17 +7101,12 @@ get_name_for_var_field(Var *var, int fieldno,
 
 	/*
 	 * We now have an expression we can't expand any more, so see if
-	 * get_expr_result_type() can do anything with it.  If not, pass to
-	 * lookup_rowtype_tupdesc() which will probably fail, but will give an
-	 * appropriate error message while failing.
+	 * get_expr_result_tupdesc() can do anything with it.
 	 */
-	if (get_expr_result_type(expr, NULL, &tupleDesc) != TYPEFUNC_COMPOSITE)
-		tupleDesc = lookup_rowtype_tupdesc_copy(exprType(expr),
-												exprTypmod(expr));
-	Assert(tupleDesc);
+	tupleDesc = get_expr_result_tupdesc(expr, false);
 	/* Got the tupdesc, so we can extract the field name */
 	Assert(fieldno >= 1 && fieldno <= tupleDesc->natts);
-	return NameStr(tupleDesc->attrs[fieldno - 1]->attname);
+	return NameStr(TupleDescAttr(tupleDesc, fieldno - 1)->attname);
 }
 
 /*
@@ -8180,7 +8235,7 @@ get_rule_expr(Node *node, deparse_context *context,
 					Node	   *e = (Node *) lfirst(arg);
 
 					if (tupdesc == NULL ||
-						!tupdesc->attrs[i]->attisdropped)
+						!TupleDescAttr(tupdesc, i)->attisdropped)
 					{
 						appendStringInfoString(buf, sep);
 						/* Whole-row Vars need special treatment here */
@@ -8193,7 +8248,7 @@ get_rule_expr(Node *node, deparse_context *context,
 				{
 					while (i < tupdesc->natts)
 					{
-						if (!tupdesc->attrs[i]->attisdropped)
+						if (!TupleDescAttr(tupdesc, i)->attisdropped)
 						{
 							appendStringInfoString(buf, sep);
 							appendStringInfoString(buf, "NULL");
@@ -8697,8 +8752,23 @@ get_rule_expr(Node *node, deparse_context *context,
 				ListCell   *cell;
 				char	   *sep;
 
+				if (spec->is_default)
+				{
+					appendStringInfoString(buf, "DEFAULT");
+					break;
+				}
+
 				switch (spec->strategy)
 				{
+					case PARTITION_STRATEGY_HASH:
+						Assert(spec->modulus > 0 && spec->remainder >= 0);
+						Assert(spec->modulus > spec->remainder);
+
+						appendStringInfoString(buf, "FOR VALUES");
+						appendStringInfo(buf, " WITH (modulus %d, remainder %d)",
+										 spec->modulus, spec->remainder);
+						break;
+
 					case PARTITION_STRATEGY_LIST:
 						Assert(spec->listdatums != NIL);
 
@@ -10298,8 +10368,8 @@ processIndirection(Node *node, deparse_context *context)
 			 * target lists, but this function cannot be used for that case.
 			 */
 			Assert(list_length(fstore->fieldnums) == 1);
-			fieldname = get_relid_attribute_name(typrelid,
-												 linitial_int(fstore->fieldnums));
+			fieldname = get_attname(typrelid,
+									linitial_int(fstore->fieldnums), false);
 			appendStringInfo(buf, ".%s", quote_identifier(fieldname));
 
 			/*
@@ -10600,7 +10670,7 @@ generate_qualified_relation_name(Oid relid)
  * means a FuncExpr or Aggref, not some other way of calling a function), then
  * has_variadic must specify whether variadic arguments have been merged,
  * and *use_variadic_p will be set to indicate whether to print VARIADIC in
- * the output.  For non-FuncExpr cases, has_variadic should be FALSE and
+ * the output.  For non-FuncExpr cases, has_variadic should be false and
  * use_variadic_p can be NULL.
  *
  * The result includes all necessary quoting and schema-prefixing.
@@ -10779,6 +10849,42 @@ generate_operator_name(Oid operid, Oid arg1, Oid arg2)
 	return buf.data;
 }
 
+/*
+ * generate_qualified_type_name
+ *		Compute the name to display for a type specified by OID
+ *
+ * This is different from format_type_be() in that we unconditionally
+ * schema-qualify the name.  That also means no special syntax for
+ * SQL-standard type names ... although in current usage, this should
+ * only get used for domains, so such cases wouldn't occur anyway.
+ */
+static char *
+generate_qualified_type_name(Oid typid)
+{
+	HeapTuple	tp;
+	Form_pg_type typtup;
+	char	   *typname;
+	char	   *nspname;
+	char	   *result;
+
+	tp = SearchSysCache1(TYPEOID, ObjectIdGetDatum(typid));
+	if (!HeapTupleIsValid(tp))
+		elog(ERROR, "cache lookup failed for type %u", typid);
+	typtup = (Form_pg_type) GETSTRUCT(tp);
+	typname = NameStr(typtup->typname);
+
+	nspname = get_namespace_name(typtup->typnamespace);
+	if (!nspname)
+		elog(ERROR, "cache lookup failed for namespace %u",
+			 typtup->typnamespace);
+
+	result = quote_qualified_identifier(nspname, typname);
+
+	ReleaseSysCache(tp);
+
+	return result;
+}
+
 /*
  * generate_collation_name
  *		Compute the name to display for a collation specified by OID
diff --git a/src/backend/utils/adt/selfuncs.c b/src/backend/utils/adt/selfuncs.c
index 23e5526a8e..fcc8323f62 100644
--- a/src/backend/utils/adt/selfuncs.c
+++ b/src/backend/utils/adt/selfuncs.c
@@ -10,7 +10,7 @@
  *	  Index cost functions are located via the index AM's API struct,
  *	  which is obtained from the handler function registered in pg_am.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -142,6 +142,7 @@
 #include "utils/pg_locale.h"
 #include "utils/rel.h"
 #include "utils/selfuncs.h"
+#include "utils/snapmgr.h"
 #include "utils/spccache.h"
 #include "utils/syscache.h"
 #include "utils/timestamp.h"
@@ -163,7 +164,7 @@ static double var_eq_non_const(VariableStatData *vardata, Oid operator,
 				 bool varonleft, bool negate);
 static double ineq_histogram_selectivity(PlannerInfo *root,
 						   VariableStatData *vardata,
-						   FmgrInfo *opproc, bool isgt,
+						   FmgrInfo *opproc, bool isgt, bool iseq,
 						   Datum constval, Oid consttype);
 static double eqjoinsel_inner(Oid operator,
 				VariableStatData *vardata1, VariableStatData *vardata2);
@@ -544,18 +545,21 @@ neqsel(PG_FUNCTION_ARGS)
 /*
  *	scalarineqsel		- Selectivity of "<", "<=", ">", ">=" for scalars.
  *
- * This is the guts of both scalarltsel and scalargtsel.  The caller has
- * commuted the clause, if necessary, so that we can treat the variable as
- * being on the left.  The caller must also make sure that the other side
- * of the clause is a non-null Const, and dissect same into a value and
- * datatype.
+ * This is the guts of scalarltsel/scalarlesel/scalargtsel/scalargesel.
+ * The isgt and iseq flags distinguish which of the four cases apply.
+ *
+ * The caller has commuted the clause, if necessary, so that we can treat
+ * the variable as being on the left.  The caller must also make sure that
+ * the other side of the clause is a non-null Const, and dissect that into
+ * a value and datatype.  (This definition simplifies some callers that
+ * want to estimate against a computed value instead of a Const node.)
  *
  * This routine works for any datatype (or pair of datatypes) known to
  * convert_to_scalar().  If it is applied to some other datatype,
  * it will return a default estimate.
  */
 static double
-scalarineqsel(PlannerInfo *root, Oid operator, bool isgt,
+scalarineqsel(PlannerInfo *root, Oid operator, bool isgt, bool iseq,
 			  VariableStatData *vardata, Datum constval, Oid consttype)
 {
 	Form_pg_statistic stats;
@@ -587,7 +591,8 @@ scalarineqsel(PlannerInfo *root, Oid operator, bool isgt,
 	 * If there is a histogram, determine which bin the constant falls in, and
 	 * compute the resulting contribution to selectivity.
 	 */
-	hist_selec = ineq_histogram_selectivity(root, vardata, &opproc, isgt,
+	hist_selec = ineq_histogram_selectivity(root, vardata,
+											&opproc, isgt, iseq,
 											constval, consttype);
 
 	/*
@@ -757,7 +762,8 @@ histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
  *	ineq_histogram_selectivity	- Examine the histogram for scalarineqsel
  *
  * Determine the fraction of the variable's histogram population that
- * satisfies the inequality condition, ie, VAR < CONST or VAR > CONST.
+ * satisfies the inequality condition, ie, VAR < (or <=, >, >=) CONST.
+ * The isgt and iseq flags distinguish which of the four cases apply.
  *
  * Returns -1 if there is no histogram (valid results will always be >= 0).
  *
@@ -768,7 +774,7 @@ histogram_selectivity(VariableStatData *vardata, FmgrInfo *opproc,
 static double
 ineq_histogram_selectivity(PlannerInfo *root,
 						   VariableStatData *vardata,
-						   FmgrInfo *opproc, bool isgt,
+						   FmgrInfo *opproc, bool isgt, bool iseq,
 						   Datum constval, Oid consttype)
 {
 	double		hist_selec;
@@ -784,7 +790,7 @@ ineq_histogram_selectivity(PlannerInfo *root,
 	 * hand!  (For example, we might have a '<=' operator rather than the '<'
 	 * operator that will appear in staop.)  For now, assume that whatever
 	 * appears in pg_statistic is sorted the same way our operator sorts, or
-	 * the reverse way if isgt is TRUE.
+	 * the reverse way if isgt is true.
 	 */
 	if (HeapTupleIsValid(vardata->statsTuple) &&
 		statistic_proc_security_check(vardata, opproc->fn_oid) &&
@@ -795,11 +801,17 @@ ineq_histogram_selectivity(PlannerInfo *root,
 		if (sslot.nvalues > 1)
 		{
 			/*
-			 * Use binary search to find proper location, ie, the first slot
-			 * at which the comparison fails.  (If the given operator isn't
-			 * actually sort-compatible with the histogram, you'll get garbage
-			 * results ... but probably not any more garbage-y than you would
-			 * from the old linear search.)
+			 * Use binary search to find the desired location, namely the
+			 * right end of the histogram bin containing the comparison value,
+			 * which is the leftmost entry for which the comparison operator
+			 * succeeds (if isgt) or fails (if !isgt).  (If the given operator
+			 * isn't actually sort-compatible with the histogram, you'll get
+			 * garbage results ... but probably not any more garbage-y than
+			 * you would have from the old linear search.)
+			 *
+			 * In this loop, we pay no attention to whether the operator iseq
+			 * or not; that detail will be mopped up below.  (We cannot tell,
+			 * anyway, whether the operator thinks the values are equal.)
 			 *
 			 * If the binary search accesses the first or last histogram
 			 * entry, we try to replace that endpoint with the true column min
@@ -864,25 +876,74 @@ ineq_histogram_selectivity(PlannerInfo *root,
 
 			if (lobound <= 0)
 			{
-				/* Constant is below lower histogram boundary. */
+				/*
+				 * Constant is below lower histogram boundary.  More
+				 * precisely, we have found that no entry in the histogram
+				 * satisfies the inequality clause (if !isgt) or they all do
+				 * (if isgt).  We estimate that that's true of the entire
+				 * table, so set histfrac to 0.0 (which we'll flip to 1.0
+				 * below, if isgt).
+				 */
 				histfrac = 0.0;
 			}
 			else if (lobound >= sslot.nvalues)
 			{
-				/* Constant is above upper histogram boundary. */
+				/*
+				 * Inverse case: constant is above upper histogram boundary.
+				 */
 				histfrac = 1.0;
 			}
 			else
 			{
+				/* We have values[i-1] <= constant <= values[i]. */
 				int			i = lobound;
+				double		eq_selec = 0;
 				double		val,
 							high,
 							low;
 				double		binfrac;
 
 				/*
-				 * We have values[i-1] <= constant <= values[i].
+				 * In the cases where we'll need it below, obtain an estimate
+				 * of the selectivity of "x = constval".  We use a calculation
+				 * similar to what var_eq_const() does for a non-MCV constant,
+				 * ie, estimate that all distinct non-MCV values occur equally
+				 * often.  But multiplication by "1.0 - sumcommon - nullfrac"
+				 * will be done by our caller, so we shouldn't do that here.
+				 * Therefore we can't try to clamp the estimate by reference
+				 * to the least common MCV; the result would be too small.
 				 *
+				 * Note: since this is effectively assuming that constval
+				 * isn't an MCV, it's logically dubious if constval in fact is
+				 * one.  But we have to apply *some* correction for equality,
+				 * and anyway we cannot tell if constval is an MCV, since we
+				 * don't have a suitable equality operator at hand.
+				 */
+				if (i == 1 || isgt == iseq)
+				{
+					double		otherdistinct;
+					bool		isdefault;
+					AttStatsSlot mcvslot;
+
+					/* Get estimated number of distinct values */
+					otherdistinct = get_variable_numdistinct(vardata,
+															 &isdefault);
+
+					/* Subtract off the number of known MCVs */
+					if (get_attstatsslot(&mcvslot, vardata->statsTuple,
+										 STATISTIC_KIND_MCV, InvalidOid,
+										 ATTSTATSSLOT_NUMBERS))
+					{
+						otherdistinct -= mcvslot.nnumbers;
+						free_attstatsslot(&mcvslot);
+					}
+
+					/* If result doesn't seem sane, leave eq_selec at 0 */
+					if (otherdistinct > 1)
+						eq_selec = 1.0 / otherdistinct;
+				}
+
+				/*
 				 * Convert the constant and the two nearest bin boundary
 				 * values to a uniform comparison scale, and do a linear
 				 * interpolation within this bin.
@@ -936,13 +997,54 @@ ineq_histogram_selectivity(PlannerInfo *root,
 				 */
 				histfrac = (double) (i - 1) + binfrac;
 				histfrac /= (double) (sslot.nvalues - 1);
+
+				/*
+				 * At this point, histfrac is an estimate of the fraction of
+				 * the population represented by the histogram that satisfies
+				 * "x <= constval".  Somewhat remarkably, this statement is
+				 * true regardless of which operator we were doing the probes
+				 * with, so long as convert_to_scalar() delivers reasonable
+				 * results.  If the probe constant is equal to some histogram
+				 * entry, we would have considered the bin to the left of that
+				 * entry if probing with "<" or ">=", or the bin to the right
+				 * if probing with "<=" or ">"; but binfrac would have come
+				 * out as 1.0 in the first case and 0.0 in the second, leading
+				 * to the same histfrac in either case.  For probe constants
+				 * between histogram entries, we find the same bin and get the
+				 * same estimate with any operator.
+				 *
+				 * The fact that the estimate corresponds to "x <= constval"
+				 * and not "x < constval" is because of the way that ANALYZE
+				 * constructs the histogram: each entry is, effectively, the
+				 * rightmost value in its sample bucket.  So selectivity
+				 * values that are exact multiples of 1/(histogram_size-1)
+				 * should be understood as estimates including a histogram
+				 * entry plus everything to its left.
+				 *
+				 * However, that breaks down for the first histogram entry,
+				 * which necessarily is the leftmost value in its sample
+				 * bucket.  That means the first histogram bin is slightly
+				 * narrower than the rest, by an amount equal to eq_selec.
+				 * Another way to say that is that we want "x <= leftmost" to
+				 * be estimated as eq_selec not zero.  So, if we're dealing
+				 * with the first bin (i==1), rescale to make that true while
+				 * adjusting the rest of that bin linearly.
+				 */
+				if (i == 1)
+					histfrac += eq_selec * (1.0 - binfrac);
+
+				/*
+				 * "x <= constval" is good if we want an estimate for "<=" or
+				 * ">", but if we are estimating for "<" or ">=", we now need
+				 * to decrease the estimate by eq_selec.
+				 */
+				if (isgt == iseq)
+					histfrac -= eq_selec;
 			}
 
 			/*
-			 * Now histfrac = fraction of histogram entries below the
-			 * constant.
-			 *
-			 * Account for "<" vs ">"
+			 * Now the estimate is finished for "<" and "<=" cases.  If we are
+			 * estimating for ">" or ">=", flip it.
 			 */
 			hist_selec = isgt ? (1.0 - histfrac) : histfrac;
 
@@ -950,16 +1052,21 @@ ineq_histogram_selectivity(PlannerInfo *root,
 			 * The histogram boundaries are only approximate to begin with,
 			 * and may well be out of date anyway.  Therefore, don't believe
 			 * extremely small or large selectivity estimates --- unless we
-			 * got actual current endpoint values from the table.
+			 * got actual current endpoint values from the table, in which
+			 * case just do the usual sanity clamp.  Somewhat arbitrarily, we
+			 * set the cutoff for other cases at a hundredth of the histogram
+			 * resolution.
 			 */
 			if (have_end)
 				CLAMP_PROBABILITY(hist_selec);
 			else
 			{
-				if (hist_selec < 0.0001)
-					hist_selec = 0.0001;
-				else if (hist_selec > 0.9999)
-					hist_selec = 0.9999;
+				double		cutoff = 0.01 / (double) (sslot.nvalues - 1);
+
+				if (hist_selec < cutoff)
+					hist_selec = cutoff;
+				else if (hist_selec > 1.0 - cutoff)
+					hist_selec = 1.0 - cutoff;
 			}
 		}
 
@@ -970,10 +1077,11 @@ ineq_histogram_selectivity(PlannerInfo *root,
 }
 
 /*
- *		scalarltsel		- Selectivity of "<" (also "<=") for scalars.
+ * Common wrapper function for the selectivity estimators that simply
+ * invoke scalarineqsel().
  */
-Datum
-scalarltsel(PG_FUNCTION_ARGS)
+static Datum
+scalarineqsel_wrapper(PG_FUNCTION_ARGS, bool isgt, bool iseq)
 {
 	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
 	Oid			operator = PG_GETARG_OID(1);
@@ -984,7 +1092,6 @@ scalarltsel(PG_FUNCTION_ARGS)
 	bool		varonleft;
 	Datum		constval;
 	Oid			consttype;
-	bool		isgt;
 	double		selec;
 
 	/*
@@ -1019,14 +1126,8 @@ scalarltsel(PG_FUNCTION_ARGS)
 	/*
 	 * Force the var to be on the left to simplify logic in scalarineqsel.
 	 */
-	if (varonleft)
+	if (!varonleft)
 	{
-		/* we have var < other */
-		isgt = false;
-	}
-	else
-	{
-		/* we have other < var, commute to make var > other */
 		operator = get_commutator(operator);
 		if (!operator)
 		{
@@ -1034,10 +1135,12 @@ scalarltsel(PG_FUNCTION_ARGS)
 			ReleaseVariableStats(vardata);
 			PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
 		}
-		isgt = true;
+		isgt = !isgt;
 	}
 
-	selec = scalarineqsel(root, operator, isgt, &vardata, constval, consttype);
+	/* The rest of the work is done by scalarineqsel(). */
+	selec = scalarineqsel(root, operator, isgt, iseq,
+						  &vardata, constval, consttype);
 
 	ReleaseVariableStats(vardata);
 
@@ -1045,78 +1148,39 @@ scalarltsel(PG_FUNCTION_ARGS)
 }
 
 /*
- *		scalargtsel		- Selectivity of ">" (also ">=") for integers.
+ *		scalarltsel		- Selectivity of "<" for scalars.
  */
 Datum
-scalargtsel(PG_FUNCTION_ARGS)
+scalarltsel(PG_FUNCTION_ARGS)
 {
-	PlannerInfo *root = (PlannerInfo *) PG_GETARG_POINTER(0);
-	Oid			operator = PG_GETARG_OID(1);
-	List	   *args = (List *) PG_GETARG_POINTER(2);
-	int			varRelid = PG_GETARG_INT32(3);
-	VariableStatData vardata;
-	Node	   *other;
-	bool		varonleft;
-	Datum		constval;
-	Oid			consttype;
-	bool		isgt;
-	double		selec;
-
-	/*
-	 * If expression is not variable op something or something op variable,
-	 * then punt and return a default estimate.
-	 */
-	if (!get_restriction_variable(root, args, varRelid,
-								  &vardata, &other, &varonleft))
-		PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
-
-	/*
-	 * Can't do anything useful if the something is not a constant, either.
-	 */
-	if (!IsA(other, Const))
-	{
-		ReleaseVariableStats(vardata);
-		PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
-	}
-
-	/*
-	 * If the constant is NULL, assume operator is strict and return zero, ie,
-	 * operator will never return TRUE.
-	 */
-	if (((Const *) other)->constisnull)
-	{
-		ReleaseVariableStats(vardata);
-		PG_RETURN_FLOAT8(0.0);
-	}
-	constval = ((Const *) other)->constvalue;
-	consttype = ((Const *) other)->consttype;
-
-	/*
-	 * Force the var to be on the left to simplify logic in scalarineqsel.
-	 */
-	if (varonleft)
-	{
-		/* we have var > other */
-		isgt = true;
-	}
-	else
-	{
-		/* we have other > var, commute to make var < other */
-		operator = get_commutator(operator);
-		if (!operator)
-		{
-			/* Use default selectivity (should we raise an error instead?) */
-			ReleaseVariableStats(vardata);
-			PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
-		}
-		isgt = false;
-	}
+	return scalarineqsel_wrapper(fcinfo, false, false);
+}
 
-	selec = scalarineqsel(root, operator, isgt, &vardata, constval, consttype);
+/*
+ *		scalarlesel		- Selectivity of "<=" for scalars.
+ */
+Datum
+scalarlesel(PG_FUNCTION_ARGS)
+{
+	return scalarineqsel_wrapper(fcinfo, false, true);
+}
 
-	ReleaseVariableStats(vardata);
+/*
+ *		scalargtsel		- Selectivity of ">" for scalars.
+ */
+Datum
+scalargtsel(PG_FUNCTION_ARGS)
+{
+	return scalarineqsel_wrapper(fcinfo, true, false);
+}
 
-	PG_RETURN_FLOAT8((float8) selec);
+/*
+ *		scalargesel		- Selectivity of ">=" for scalars.
+ */
+Datum
+scalargesel(PG_FUNCTION_ARGS)
+{
+	return scalarineqsel_wrapper(fcinfo, true, true);
 }
 
 /*
@@ -1752,10 +1816,19 @@ strip_array_coercion(Node *node)
 {
 	for (;;)
 	{
-		if (node && IsA(node, ArrayCoerceExpr) &&
-			((ArrayCoerceExpr *) node)->elemfuncid == InvalidOid)
+		if (node && IsA(node, ArrayCoerceExpr))
 		{
-			node = (Node *) ((ArrayCoerceExpr *) node)->arg;
+			ArrayCoerceExpr *acoerce = (ArrayCoerceExpr *) node;
+
+			/*
+			 * If the per-element expression is just a RelabelType on top of
+			 * CaseTestExpr, then we know it's a binary-compatible relabeling.
+			 */
+			if (IsA(acoerce->elemexpr, RelabelType) &&
+				IsA(((RelabelType *) acoerce->elemexpr)->arg, CaseTestExpr))
+				node = (Node *) acoerce->arg;
+			else
+				break;
 		}
 		else if (node && IsA(node, RelabelType))
 		{
@@ -2694,34 +2767,72 @@ neqjoinsel(PG_FUNCTION_ARGS)
 	List	   *args = (List *) PG_GETARG_POINTER(2);
 	JoinType	jointype = (JoinType) PG_GETARG_INT16(3);
 	SpecialJoinInfo *sjinfo = (SpecialJoinInfo *) PG_GETARG_POINTER(4);
-	Oid			eqop;
 	float8		result;
 
-	/*
-	 * We want 1 - eqjoinsel() where the equality operator is the one
-	 * associated with this != operator, that is, its negator.
-	 */
-	eqop = get_negator(operator);
-	if (eqop)
+	if (jointype == JOIN_SEMI || jointype == JOIN_ANTI)
 	{
-		result = DatumGetFloat8(DirectFunctionCall5(eqjoinsel,
-													PointerGetDatum(root),
-													ObjectIdGetDatum(eqop),
-													PointerGetDatum(args),
-													Int16GetDatum(jointype),
-													PointerGetDatum(sjinfo)));
+		/*
+		 * For semi-joins, if there is more than one distinct value in the RHS
+		 * relation then every non-null LHS row must find a row to join since
+		 * it can only be equal to one of them.  We'll assume that there is
+		 * always more than one distinct RHS value for the sake of stability,
+		 * though in theory we could have special cases for empty RHS
+		 * (selectivity = 0) and single-distinct-value RHS (selectivity =
+		 * fraction of LHS that has the same value as the single RHS value).
+		 *
+		 * For anti-joins, if we use the same assumption that there is more
+		 * than one distinct key in the RHS relation, then every non-null LHS
+		 * row must be suppressed by the anti-join.
+		 *
+		 * So either way, the selectivity estimate should be 1 - nullfrac.
+		 */
+		VariableStatData leftvar;
+		VariableStatData rightvar;
+		bool		reversed;
+		HeapTuple	statsTuple;
+		double		nullfrac;
+
+		get_join_variables(root, args, sjinfo, &leftvar, &rightvar, &reversed);
+		statsTuple = reversed ? rightvar.statsTuple : leftvar.statsTuple;
+		if (HeapTupleIsValid(statsTuple))
+			nullfrac = ((Form_pg_statistic) GETSTRUCT(statsTuple))->stanullfrac;
+		else
+			nullfrac = 0.0;
+		ReleaseVariableStats(leftvar);
+		ReleaseVariableStats(rightvar);
+
+		result = 1.0 - nullfrac;
 	}
 	else
 	{
-		/* Use default selectivity (should we raise an error instead?) */
-		result = DEFAULT_EQ_SEL;
+		/*
+		 * We want 1 - eqjoinsel() where the equality operator is the one
+		 * associated with this != operator, that is, its negator.
+		 */
+		Oid			eqop = get_negator(operator);
+
+		if (eqop)
+		{
+			result = DatumGetFloat8(DirectFunctionCall5(eqjoinsel,
+														PointerGetDatum(root),
+														ObjectIdGetDatum(eqop),
+														PointerGetDatum(args),
+														Int16GetDatum(jointype),
+														PointerGetDatum(sjinfo)));
+		}
+		else
+		{
+			/* Use default selectivity (should we raise an error instead?) */
+			result = DEFAULT_EQ_SEL;
+		}
+		result = 1.0 - result;
 	}
-	result = 1.0 - result;
+
 	PG_RETURN_FLOAT8(result);
 }
 
 /*
- *		scalarltjoinsel - Join selectivity of "<" and "<=" for scalars
+ *		scalarltjoinsel - Join selectivity of "<" for scalars
  */
 Datum
 scalarltjoinsel(PG_FUNCTION_ARGS)
@@ -2730,7 +2841,16 @@ scalarltjoinsel(PG_FUNCTION_ARGS)
 }
 
 /*
- *		scalargtjoinsel - Join selectivity of ">" and ">=" for scalars
+ *		scalarlejoinsel - Join selectivity of "<=" for scalars
+ */
+Datum
+scalarlejoinsel(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
+}
+
+/*
+ *		scalargtjoinsel - Join selectivity of ">" for scalars
  */
 Datum
 scalargtjoinsel(PG_FUNCTION_ARGS)
@@ -2738,6 +2858,15 @@ scalargtjoinsel(PG_FUNCTION_ARGS)
 	PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
 }
 
+/*
+ *		scalargejoinsel - Join selectivity of ">=" for scalars
+ */
+Datum
+scalargejoinsel(PG_FUNCTION_ARGS)
+{
+	PG_RETURN_FLOAT8(DEFAULT_INEQ_SEL);
+}
+
 /*
  * patternjoinsel		- Generic code for pattern-match join selectivity.
  */
@@ -3035,13 +3164,13 @@ mergejoinscansel(PlannerInfo *root, Node *clause,
 	 * fraction that's <= the right-side maximum value.  But only believe
 	 * non-default estimates, else stick with our 1.0.
 	 */
-	selec = scalarineqsel(root, leop, isgt, &leftvar,
+	selec = scalarineqsel(root, leop, isgt, true, &leftvar,
 						  rightmax, op_righttype);
 	if (selec != DEFAULT_INEQ_SEL)
 		*leftend = selec;
 
 	/* And similarly for the right variable. */
-	selec = scalarineqsel(root, revleop, isgt, &rightvar,
+	selec = scalarineqsel(root, revleop, isgt, true, &rightvar,
 						  leftmax, op_lefttype);
 	if (selec != DEFAULT_INEQ_SEL)
 		*rightend = selec;
@@ -3065,13 +3194,13 @@ mergejoinscansel(PlannerInfo *root, Node *clause,
 	 * minimum value.  But only believe non-default estimates, else stick with
 	 * our own default.
 	 */
-	selec = scalarineqsel(root, ltop, isgt, &leftvar,
+	selec = scalarineqsel(root, ltop, isgt, false, &leftvar,
 						  rightmin, op_righttype);
 	if (selec != DEFAULT_INEQ_SEL)
 		*leftstart = selec;
 
 	/* And similarly for the right variable. */
-	selec = scalarineqsel(root, revltop, isgt, &rightvar,
+	selec = scalarineqsel(root, revltop, isgt, false, &rightvar,
 						  leftmin, op_lefttype);
 	if (selec != DEFAULT_INEQ_SEL)
 		*rightstart = selec;
@@ -3270,6 +3399,7 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
 					List **pgset)
 {
 	List	   *varinfos = NIL;
+	double		srf_multiplier = 1.0;
 	double		numdistinct;
 	ListCell   *l;
 	int			i;
@@ -3303,6 +3433,7 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
 	foreach(l, groupExprs)
 	{
 		Node	   *groupexpr = (Node *) lfirst(l);
+		double		this_srf_multiplier;
 		VariableStatData vardata;
 		List	   *varshere;
 		ListCell   *l2;
@@ -3311,6 +3442,21 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
 		if (pgset && !list_member_int(*pgset, i++))
 			continue;
 
+		/*
+		 * Set-returning functions in grouping columns are a bit problematic.
+		 * The code below will effectively ignore their SRF nature and come up
+		 * with a numdistinct estimate as though they were scalar functions.
+		 * We compensate by scaling up the end result by the largest SRF
+		 * rowcount estimate.  (This will be an overestimate if the SRF
+		 * produces multiple copies of any output value, but it seems best to
+		 * assume the SRF's outputs are distinct.  In any case, it's probably
+		 * pointless to worry too much about this without much better
+		 * estimates for SRF output rowcounts than we have today.)
+		 */
+		this_srf_multiplier = expression_returns_set_rows(groupexpr);
+		if (srf_multiplier < this_srf_multiplier)
+			srf_multiplier = this_srf_multiplier;
+
 		/* Short-circuit for expressions returning boolean */
 		if (exprType(groupexpr) == BOOLOID)
 		{
@@ -3376,9 +3522,15 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
 	 */
 	if (varinfos == NIL)
 	{
+		/* Apply SRF multiplier as we would do in the long path */
+		numdistinct *= srf_multiplier;
+		/* Round off */
+		numdistinct = ceil(numdistinct);
 		/* Guard against out-of-range answers */
 		if (numdistinct > input_rows)
 			numdistinct = input_rows;
+		if (numdistinct < 1.0)
+			numdistinct = 1.0;
 		return numdistinct;
 	}
 
@@ -3547,6 +3699,10 @@ estimate_num_groups(PlannerInfo *root, List *groupExprs, double input_rows,
 		varinfos = newvarinfos;
 	} while (varinfos != NIL);
 
+	/* Now we can account for the effects of any SRFs */
+	numdistinct *= srf_multiplier;
+
+	/* Round off */
 	numdistinct = ceil(numdistinct);
 
 	/* Guard against out-of-range answers */
@@ -3723,7 +3879,7 @@ estimate_hash_bucket_stats(PlannerInfo *root, Node *hashkey, double nbuckets,
  *
  * Varinfos that aren't for simple Vars are ignored.
  *
- * Return TRUE if we're able to find a match, FALSE otherwise.
+ * Return true if we're able to find a match, false otherwise.
  */
 static bool
 estimate_multivariate_ndistinct(PlannerInfo *root, RelOptInfo *rel,
@@ -4028,8 +4184,8 @@ convert_numeric_to_scalar(Datum value, Oid typid)
 	}
 
 	/*
-	 * Can't get here unless someone tries to use scalarltsel/scalargtsel on
-	 * an operator with one numeric and one non-numeric operand.
+	 * Can't get here unless someone tries to use scalarineqsel() on an
+	 * operator with one numeric and one non-numeric operand.
 	 */
 	elog(ERROR, "unsupported type: %u", typid);
 	return 0;
@@ -4210,8 +4366,8 @@ convert_string_datum(Datum value, Oid typid)
 		default:
 
 			/*
-			 * Can't get here unless someone tries to use scalarltsel on an
-			 * operator with one string and one non-string operand.
+			 * Can't get here unless someone tries to use scalarineqsel() on
+			 * an operator with one string and one non-string operand.
 			 */
 			elog(ERROR, "unsupported type: %u", typid);
 			return NULL;
@@ -4415,8 +4571,8 @@ convert_timevalue_to_scalar(Datum value, Oid typid)
 	}
 
 	/*
-	 * Can't get here unless someone tries to use scalarltsel/scalargtsel on
-	 * an operator with one timevalue and one non-timevalue operand.
+	 * Can't get here unless someone tries to use scalarineqsel() on an
+	 * operator with one timevalue and one non-timevalue operand.
 	 */
 	elog(ERROR, "unsupported type: %u", typid);
 	return 0;
@@ -4436,12 +4592,12 @@ convert_timevalue_to_scalar(Datum value, Oid typid)
  *	args: clause argument list
  *	varRelid: see specs for restriction selectivity functions
  *
- * Outputs: (these are valid only if TRUE is returned)
+ * Outputs: (these are valid only if true is returned)
  *	*vardata: gets information about variable (see examine_variable)
  *	*other: gets other clause argument, aggressively reduced to a constant
- *	*varonleft: set TRUE if variable is on the left, FALSE if on the right
+ *	*varonleft: set true if variable is on the left, false if on the right
  *
- * Returns TRUE if a variable is identified, otherwise FALSE.
+ * Returns true if a variable is identified, otherwise false.
  *
  * Note: if there are Vars on both sides of the clause, we must fail, because
  * callers are expecting that the other side will act like a pseudoconstant.
@@ -4557,12 +4713,12 @@ get_join_variables(PlannerInfo *root, List *args, SpecialJoinInfo *sjinfo,
  *	atttype, atttypmod: actual type/typmod of the "var" expression.  This is
  *		commonly the same as the exposed type of the variable argument,
  *		but can be different in binary-compatible-type cases.
- *	isunique: TRUE if we were able to match the var to a unique index or a
+ *	isunique: true if we were able to match the var to a unique index or a
  *		single-column DISTINCT clause, implying its values are unique for
  *		this query.  (Caution: this should be trusted for statistical
  *		purposes only, since we do not check indimmediate nor verify that
  *		the exact same definition of equality applies.)
- *	acl_ok: TRUE if current user has permission to read the column(s)
+ *	acl_ok: true if current user has permission to read the column(s)
  *		underlying the pg_statistic entry.  This is consulted by
  *		statistic_proc_security_check().
  *
@@ -4969,7 +5125,7 @@ statistic_proc_security_check(VariableStatData *vardata, Oid func_oid)
  *	  Estimate the number of distinct values of a variable.
  *
  * vardata: results of examine_variable
- * *isdefault: set to TRUE if the result is a default rather than based on
+ * *isdefault: set to true if the result is a default rather than based on
  * anything meaningful.
  *
  * NB: be careful to produce a positive integral result, since callers may
@@ -5102,8 +5258,8 @@ get_variable_numdistinct(VariableStatData *vardata, bool *isdefault)
 /*
  * get_variable_range
  *		Estimate the minimum and maximum value of the specified variable.
- *		If successful, store values in *min and *max, and return TRUE.
- *		If no data available, return FALSE.
+ *		If successful, store values in *min and *max, and return true.
+ *		If no data available, return false.
  *
  * sortop is the "<" comparison operator to use.  This should generally
  * be "<" not ">", as only the former is likely to be found in pg_statistic.
@@ -5236,9 +5392,9 @@ get_variable_range(PlannerInfo *root, VariableStatData *vardata, Oid sortop,
  *		Attempt to identify the current *actual* minimum and/or maximum
  *		of the specified variable, by looking for a suitable btree index
  *		and fetching its low and/or high values.
- *		If successful, store values in *min and *max, and return TRUE.
+ *		If successful, store values in *min and *max, and return true.
  *		(Either pointer can be NULL if that endpoint isn't needed.)
- *		If no data available, return FALSE.
+ *		If no data available, return false.
  *
  * sortop is the "<" comparison operator to use.
  */
@@ -5328,7 +5484,7 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 			HeapTuple	tup;
 			Datum		values[INDEX_MAX_KEYS];
 			bool		isnull[INDEX_MAX_KEYS];
-			SnapshotData SnapshotDirty;
+			SnapshotData SnapshotNonVacuumable;
 
 			estate = CreateExecutorState();
 			econtext = GetPerTupleExprContext(estate);
@@ -5351,7 +5507,7 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 			slot = MakeSingleTupleTableSlot(RelationGetDescr(heapRel));
 			econtext->ecxt_scantuple = slot;
 			get_typlenbyval(vardata->atttype, &typLen, &typByVal);
-			InitDirtySnapshot(SnapshotDirty);
+			InitNonVacuumableSnapshot(SnapshotNonVacuumable, RecentGlobalXmin);
 
 			/* set up an IS NOT NULL scan key so that we ignore nulls */
 			ScanKeyEntryInitialize(&scankeys[0],
@@ -5373,17 +5529,29 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 				 * active snapshot, which is the best approximation we've got
 				 * to what the query will see when executed.  But that won't
 				 * be exact if a new snap is taken before running the query,
-				 * and it can be very expensive if a lot of uncommitted rows
-				 * exist at the end of the index (because we'll laboriously
-				 * fetch each one and reject it).  What seems like a good
-				 * compromise is to use SnapshotDirty.  That will accept
-				 * uncommitted rows, and thus avoid fetching multiple heap
-				 * tuples in this scenario.  On the other hand, it will reject
-				 * known-dead rows, and thus not give a bogus answer when the
-				 * extreme value has been deleted; that case motivates not
-				 * using SnapshotAny here.
+				 * and it can be very expensive if a lot of recently-dead or
+				 * uncommitted rows exist at the beginning or end of the index
+				 * (because we'll laboriously fetch each one and reject it).
+				 * Instead, we use SnapshotNonVacuumable.  That will accept
+				 * recently-dead and uncommitted rows as well as normal
+				 * visible rows.  On the other hand, it will reject known-dead
+				 * rows, and thus not give a bogus answer when the extreme
+				 * value has been deleted (unless the deletion was quite
+				 * recent); that case motivates not using SnapshotAny here.
+				 *
+				 * A crucial point here is that SnapshotNonVacuumable, with
+				 * RecentGlobalXmin as horizon, yields the inverse of the
+				 * condition that the indexscan will use to decide that index
+				 * entries are killable (see heap_hot_search_buffer()).
+				 * Therefore, if the snapshot rejects a tuple and we have to
+				 * continue scanning past it, we know that the indexscan will
+				 * mark that index entry killed.  That means that the next
+				 * get_actual_variable_range() call will not have to visit
+				 * that heap entry.  In this way we avoid repetitive work when
+				 * this function is used a lot during planning.
 				 */
-				index_scan = index_beginscan(heapRel, indexRel, &SnapshotDirty,
+				index_scan = index_beginscan(heapRel, indexRel,
+											 &SnapshotNonVacuumable,
 											 1, 0);
 				index_rescan(index_scan, scankeys, 1, NULL, 0);
 
@@ -5415,7 +5583,8 @@ get_actual_variable_range(PlannerInfo *root, VariableStatData *vardata,
 			/* If max is requested, and we didn't find the index is empty */
 			if (max && have_data)
 			{
-				index_scan = index_beginscan(heapRel, indexRel, &SnapshotDirty,
+				index_scan = index_beginscan(heapRel, indexRel,
+											 &SnapshotNonVacuumable,
 											 1, 0);
 				index_rescan(index_scan, scankeys, 1, NULL, 0);
 
@@ -5792,7 +5961,8 @@ prefix_selectivity(PlannerInfo *root, VariableStatData *vardata,
 		elog(ERROR, "no >= operator for opfamily %u", opfamily);
 	fmgr_info(get_opcode(cmpopr), &opproc);
 
-	prefixsel = ineq_histogram_selectivity(root, vardata, &opproc, true,
+	prefixsel = ineq_histogram_selectivity(root, vardata,
+										   &opproc, true, true,
 										   prefixcon->constvalue,
 										   prefixcon->consttype);
 
@@ -5818,7 +5988,8 @@ prefix_selectivity(PlannerInfo *root, VariableStatData *vardata,
 	{
 		Selectivity topsel;
 
-		topsel = ineq_histogram_selectivity(root, vardata, &opproc, false,
+		topsel = ineq_histogram_selectivity(root, vardata,
+											&opproc, false, false,
 											greaterstrcon->constvalue,
 											greaterstrcon->consttype);
 
diff --git a/src/backend/utils/adt/tid.c b/src/backend/utils/adt/tid.c
index 8453b65e78..41d540b46e 100644
--- a/src/backend/utils/adt/tid.c
+++ b/src/backend/utils/adt/tid.c
@@ -3,7 +3,7 @@
  * tid.c
  *	  Functions for the built-in type tuple id
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -149,10 +149,8 @@ tidsend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, ItemPointerGetBlockNumberNoCheck(itemPtr),
-			   sizeof(BlockNumber));
-	pq_sendint(&buf, ItemPointerGetOffsetNumberNoCheck(itemPtr),
-			   sizeof(OffsetNumber));
+	pq_sendint32(&buf, ItemPointerGetBlockNumberNoCheck(itemPtr));
+	pq_sendint16(&buf, ItemPointerGetOffsetNumberNoCheck(itemPtr));
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -273,9 +271,11 @@ currtid_for_view(Relation viewrel, ItemPointer tid)
 
 	for (i = 0; i < natts; i++)
 	{
-		if (strcmp(NameStr(att->attrs[i]->attname), "ctid") == 0)
+		Form_pg_attribute attr = TupleDescAttr(att, i);
+
+		if (strcmp(NameStr(attr->attname), "ctid") == 0)
 		{
-			if (att->attrs[i]->atttypid != TIDOID)
+			if (attr->atttypid != TIDOID)
 				elog(ERROR, "ctid isn't of type TID");
 			tididx = i;
 			break;
@@ -343,7 +343,7 @@ currtid_byreloid(PG_FUNCTION_ARGS)
 	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
 								  ACL_SELECT);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
+		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 
 	if (rel->rd_rel->relkind == RELKIND_VIEW)
@@ -377,7 +377,7 @@ currtid_byrelname(PG_FUNCTION_ARGS)
 	aclresult = pg_class_aclcheck(RelationGetRelid(rel), GetUserId(),
 								  ACL_SELECT);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_CLASS,
+		aclcheck_error(aclresult, get_relkind_objtype(rel->rd_rel->relkind),
 					   RelationGetRelationName(rel));
 
 	if (rel->rd_rel->relkind == RELKIND_VIEW)
diff --git a/src/backend/utils/adt/timestamp.c b/src/backend/utils/adt/timestamp.c
index 6fa126d295..103f91ae62 100644
--- a/src/backend/utils/adt/timestamp.c
+++ b/src/backend/utils/adt/timestamp.c
@@ -3,7 +3,7 @@
  * timestamp.c
  *	  Functions for the built-in SQL types "timestamp" and "interval".
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1009,8 +1009,8 @@ interval_send(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 	pq_sendint64(&buf, interval->time);
-	pq_sendint(&buf, interval->day, sizeof(interval->day));
-	pq_sendint(&buf, interval->month, sizeof(interval->month));
+	pq_sendint32(&buf, interval->day);
+	pq_sendint32(&buf, interval->month);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -2113,6 +2113,11 @@ timestamp_hash(PG_FUNCTION_ARGS)
 	return hashint8(fcinfo);
 }
 
+Datum
+timestamp_hash_extended(PG_FUNCTION_ARGS)
+{
+	return hashint8extended(fcinfo);
+}
 
 /*
  * Cross-type comparison functions for timestamp vs timestamptz
@@ -2419,6 +2424,20 @@ interval_hash(PG_FUNCTION_ARGS)
 	return DirectFunctionCall1(hashint8, Int64GetDatumFast(span64));
 }
 
+Datum
+interval_hash_extended(PG_FUNCTION_ARGS)
+{
+	Interval   *interval = PG_GETARG_INTERVAL_P(0);
+	INT128		span = interval_cmp_value(interval);
+	int64		span64;
+
+	/* Same approach as interval_hash */
+	span64 = int128_to_int64(span);
+
+	return DirectFunctionCall2(hashint8extended, Int64GetDatumFast(span64),
+							   PG_GETARG_DATUM(1));
+}
+
 /* overlaps_timestamp() --- implements the SQL OVERLAPS operator.
  *
  * Algorithm is per SQL spec.  This is much harder than you'd think
@@ -3239,6 +3258,110 @@ interval_div(PG_FUNCTION_ARGS)
 	PG_RETURN_INTERVAL_P(result);
 }
 
+
+/*
+ * in_range support functions for timestamps and intervals.
+ *
+ * Per SQL spec, we support these with interval as the offset type.
+ * The spec's restriction that the offset not be negative is a bit hard to
+ * decipher for intervals, but we choose to interpret it the same as our
+ * interval comparison operators would.
+ */
+
+Datum
+in_range_timestamptz_interval(PG_FUNCTION_ARGS)
+{
+	TimestampTz val = PG_GETARG_TIMESTAMPTZ(0);
+	TimestampTz base = PG_GETARG_TIMESTAMPTZ(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	TimestampTz sum;
+
+	if (int128_compare(interval_cmp_value(offset), int64_to_int128(0)) < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/* We don't currently bother to avoid overflow hazards here */
+	if (sub)
+		sum = DatumGetTimestampTz(DirectFunctionCall2(timestamptz_mi_interval,
+													  TimestampTzGetDatum(base),
+													  IntervalPGetDatum(offset)));
+	else
+		sum = DatumGetTimestampTz(DirectFunctionCall2(timestamptz_pl_interval,
+													  TimestampTzGetDatum(base),
+													  IntervalPGetDatum(offset)));
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+Datum
+in_range_timestamp_interval(PG_FUNCTION_ARGS)
+{
+	Timestamp	val = PG_GETARG_TIMESTAMP(0);
+	Timestamp	base = PG_GETARG_TIMESTAMP(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	Timestamp	sum;
+
+	if (int128_compare(interval_cmp_value(offset), int64_to_int128(0)) < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/* We don't currently bother to avoid overflow hazards here */
+	if (sub)
+		sum = DatumGetTimestamp(DirectFunctionCall2(timestamp_mi_interval,
+													TimestampGetDatum(base),
+													IntervalPGetDatum(offset)));
+	else
+		sum = DatumGetTimestamp(DirectFunctionCall2(timestamp_pl_interval,
+													TimestampGetDatum(base),
+													IntervalPGetDatum(offset)));
+
+	if (less)
+		PG_RETURN_BOOL(val <= sum);
+	else
+		PG_RETURN_BOOL(val >= sum);
+}
+
+Datum
+in_range_interval_interval(PG_FUNCTION_ARGS)
+{
+	Interval   *val = PG_GETARG_INTERVAL_P(0);
+	Interval   *base = PG_GETARG_INTERVAL_P(1);
+	Interval   *offset = PG_GETARG_INTERVAL_P(2);
+	bool		sub = PG_GETARG_BOOL(3);
+	bool		less = PG_GETARG_BOOL(4);
+	Interval   *sum;
+
+	if (int128_compare(interval_cmp_value(offset), int64_to_int128(0)) < 0)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE),
+				 errmsg("invalid preceding or following size in window function")));
+
+	/* We don't currently bother to avoid overflow hazards here */
+	if (sub)
+		sum = DatumGetIntervalP(DirectFunctionCall2(interval_mi,
+													IntervalPGetDatum(base),
+													IntervalPGetDatum(offset)));
+	else
+		sum = DatumGetIntervalP(DirectFunctionCall2(interval_pl,
+													IntervalPGetDatum(base),
+													IntervalPGetDatum(offset)));
+
+	if (less)
+		PG_RETURN_BOOL(interval_cmp_internal(val, sum) <= 0);
+	else
+		PG_RETURN_BOOL(interval_cmp_internal(val, sum) >= 0);
+}
+
+
 /*
  * interval_accum, interval_accum_inv, and interval_avg implement the
  * AVG(interval) aggregate.
diff --git a/src/backend/utils/adt/trigfuncs.c b/src/backend/utils/adt/trigfuncs.c
index 50ea6d9ed3..04605021d7 100644
--- a/src/backend/utils/adt/trigfuncs.c
+++ b/src/backend/utils/adt/trigfuncs.c
@@ -4,7 +4,7 @@
  *	  Builtin functions for useful trigger support.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/utils/adt/trigfuncs.c
diff --git a/src/backend/utils/adt/tsginidx.c b/src/backend/utils/adt/tsginidx.c
index 83a939dfd5..de59e6417e 100644
--- a/src/backend/utils/adt/tsginidx.c
+++ b/src/backend/utils/adt/tsginidx.c
@@ -3,7 +3,7 @@
  * tsginidx.c
  *	 GIN support functions for tsvector_ops
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -295,7 +295,7 @@ gin_tsquery_consistent(PG_FUNCTION_ARGS)
 	/* int32	nkeys = PG_GETARG_INT32(3); */
 	Pointer    *extra_data = (Pointer *) PG_GETARG_POINTER(4);
 	bool	   *recheck = (bool *) PG_GETARG_POINTER(5);
-	bool		res = FALSE;
+	bool		res = false;
 
 	/* Initially assume query doesn't require recheck */
 	*recheck = false;
diff --git a/src/backend/utils/adt/tsgistidx.c b/src/backend/utils/adt/tsgistidx.c
index 7ce2699b5c..2d9ecc4bfd 100644
--- a/src/backend/utils/adt/tsgistidx.c
+++ b/src/backend/utils/adt/tsgistidx.c
@@ -3,7 +3,7 @@
  * tsgistidx.c
  *	  GiST support functions for tsvector_ops
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -110,7 +110,7 @@ static int	outbuf_maxlen = 0;
 Datum
 gtsvectorout(PG_FUNCTION_ARGS)
 {
-	SignTSVector *key = (SignTSVector *) DatumGetPointer(PG_DETOAST_DATUM(PG_GETARG_POINTER(0)));
+	SignTSVector *key = (SignTSVector *) PG_DETOAST_DATUM(PG_GETARG_POINTER(0));
 	char	   *outbuf;
 
 	if (outbuf_maxlen == 0)
@@ -240,7 +240,7 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	else if (ISSIGNKEY(DatumGetPointer(entry->key)) &&
 			 !ISALLTRUE(DatumGetPointer(entry->key)))
@@ -264,7 +264,7 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 		retval = (GISTENTRY *) palloc(sizeof(GISTENTRY));
 		gistentryinit(*retval, PointerGetDatum(res),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 	PG_RETURN_POINTER(retval);
 }
@@ -272,8 +272,12 @@ gtsvector_compress(PG_FUNCTION_ARGS)
 Datum
 gtsvector_decompress(PG_FUNCTION_ARGS)
 {
+	/*
+	 * We need to detoast the stored value, because the other gtsvector
+	 * support functions don't cope with toasted values.
+	 */
 	GISTENTRY  *entry = (GISTENTRY *) PG_GETARG_POINTER(0);
-	SignTSVector *key = (SignTSVector *) DatumGetPointer(PG_DETOAST_DATUM(entry->key));
+	SignTSVector *key = (SignTSVector *) PG_DETOAST_DATUM(entry->key);
 
 	if (key != (SignTSVector *) DatumGetPointer(entry->key))
 	{
@@ -281,7 +285,7 @@ gtsvector_decompress(PG_FUNCTION_ARGS)
 
 		gistentryinit(*retval, PointerGetDatum(key),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 
 		PG_RETURN_POINTER(retval);
 	}
@@ -317,14 +321,14 @@ checkcondition_arr(void *checkval, QueryOperand *val, ExecPhraseData *data)
 	{
 		StopMiddle = StopLow + (StopHigh - StopLow) / 2;
 		if (*StopMiddle == val->valcrc)
-			return (true);
+			return true;
 		else if (*StopMiddle < val->valcrc)
 			StopLow = StopMiddle + 1;
 		else
 			StopHigh = StopMiddle;
 	}
 
-	return (false);
+	return false;
 }
 
 static bool
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
index fdb041971e..1ccbf79030 100644
--- a/src/backend/utils/adt/tsquery.c
+++ b/src/backend/utils/adt/tsquery.c
@@ -3,7 +3,7 @@
  * tsquery.c
  *	  I/O functions for tsquery
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -952,23 +952,22 @@ tsquerysend(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 
-	pq_sendint(&buf, query->size, sizeof(uint32));
+	pq_sendint32(&buf, query->size);
 	for (i = 0; i < query->size; i++)
 	{
-		pq_sendint(&buf, item->type, sizeof(item->type));
+		pq_sendint8(&buf, item->type);
 
 		switch (item->type)
 		{
 			case QI_VAL:
-				pq_sendint(&buf, item->qoperand.weight, sizeof(uint8));
-				pq_sendint(&buf, item->qoperand.prefix, sizeof(uint8));
+				pq_sendint8(&buf, item->qoperand.weight);
+				pq_sendint8(&buf, item->qoperand.prefix);
 				pq_sendstring(&buf, GETOPERAND(query) + item->qoperand.distance);
 				break;
 			case QI_OPR:
-				pq_sendint(&buf, item->qoperator.oper, sizeof(item->qoperator.oper));
+				pq_sendint8(&buf, item->qoperator.oper);
 				if (item->qoperator.oper == OP_PHRASE)
-					pq_sendint(&buf, item->qoperator.distance,
-							   sizeof(item->qoperator.distance));
+					pq_sendint16(&buf, item->qoperator.distance);
 				break;
 			default:
 				elog(ERROR, "unrecognized tsquery node type: %d", item->type);
diff --git a/src/backend/utils/adt/tsquery_cleanup.c b/src/backend/utils/adt/tsquery_cleanup.c
index 350171c93d..c146376e66 100644
--- a/src/backend/utils/adt/tsquery_cleanup.c
+++ b/src/backend/utils/adt/tsquery_cleanup.c
@@ -4,7 +4,7 @@
  *	 Cleanup query from NOT values and/or stopword
  *	 Utility functions to correct work.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsquery_gist.c b/src/backend/utils/adt/tsquery_gist.c
index 85518dc7d9..bf8109b32f 100644
--- a/src/backend/utils/adt/tsquery_gist.c
+++ b/src/backend/utils/adt/tsquery_gist.c
@@ -3,7 +3,7 @@
  * tsquery_gist.c
  *	  GiST index support for tsquery
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -37,17 +37,16 @@ gtsquery_compress(PG_FUNCTION_ARGS)
 
 		gistentryinit(*retval, TSQuerySignGetDatum(sign),
 					  entry->rel, entry->page,
-					  entry->offset, FALSE);
+					  entry->offset, false);
 	}
 
 	PG_RETURN_POINTER(retval);
 }
 
-Datum
-gtsquery_decompress(PG_FUNCTION_ARGS)
-{
-	PG_RETURN_DATUM(PG_GETARG_DATUM(0));
-}
+/*
+ * We do not need a decompress function, because the other gtsquery
+ * support functions work with the compressed representation.
+ */
 
 Datum
 gtsquery_consistent(PG_FUNCTION_ARGS)
@@ -80,7 +79,7 @@ gtsquery_consistent(PG_FUNCTION_ARGS)
 				retval = (key & sq) != 0;
 			break;
 		default:
-			retval = FALSE;
+			retval = false;
 	}
 	PG_RETURN_BOOL(retval);
 }
diff --git a/src/backend/utils/adt/tsquery_op.c b/src/backend/utils/adt/tsquery_op.c
index 755c3e9ee8..07bc609972 100644
--- a/src/backend/utils/adt/tsquery_op.c
+++ b/src/backend/utils/adt/tsquery_op.c
@@ -3,7 +3,7 @@
  * tsquery_op.c
  *	  Various operations with tsquery
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsquery_rewrite.c b/src/backend/utils/adt/tsquery_rewrite.c
index 1bd3deabd5..e3420e8d27 100644
--- a/src/backend/utils/adt/tsquery_rewrite.c
+++ b/src/backend/utils/adt/tsquery_rewrite.c
@@ -3,7 +3,7 @@
  * tsquery_rewrite.c
  *	  Utilities for reconstructing tsquery
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsquery_util.c b/src/backend/utils/adt/tsquery_util.c
index 971bb81ea6..cd310b87d5 100644
--- a/src/backend/utils/adt/tsquery_util.c
+++ b/src/backend/utils/adt/tsquery_util.c
@@ -3,7 +3,7 @@
  * tsquery_util.c
  *	  Utilities for tsquery datatype
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsrank.c b/src/backend/utils/adt/tsrank.c
index 4577bcc0b8..a0011a5f56 100644
--- a/src/backend/utils/adt/tsrank.c
+++ b/src/backend/utils/adt/tsrank.c
@@ -3,7 +3,7 @@
  * tsrank.c
  *		rank tsvector by tsquery
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsvector.c b/src/backend/utils/adt/tsvector.c
index 6f66c1f58c..64e02ef434 100644
--- a/src/backend/utils/adt/tsvector.c
+++ b/src/backend/utils/adt/tsvector.c
@@ -3,7 +3,7 @@
  * tsvector.c
  *	  I/O functions for tsvector
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
@@ -410,7 +410,7 @@ tsvectorsend(PG_FUNCTION_ARGS)
 
 	pq_begintypsend(&buf);
 
-	pq_sendint(&buf, vec->size, sizeof(int32));
+	pq_sendint32(&buf, vec->size);
 	for (i = 0; i < vec->size; i++)
 	{
 		uint16		npos;
@@ -423,14 +423,14 @@ tsvectorsend(PG_FUNCTION_ARGS)
 		pq_sendbyte(&buf, '\0');
 
 		npos = POSDATALEN(vec, weptr);
-		pq_sendint(&buf, npos, sizeof(uint16));
+		pq_sendint16(&buf, npos);
 
 		if (npos > 0)
 		{
 			WordEntryPos *wepptr = POSDATAPTR(vec, weptr);
 
 			for (j = 0; j < npos; j++)
-				pq_sendint(&buf, wepptr[j], sizeof(WordEntryPos));
+				pq_sendint16(&buf, wepptr[j]);
 		}
 		weptr++;
 	}
diff --git a/src/backend/utils/adt/tsvector_op.c b/src/backend/utils/adt/tsvector_op.c
index 822520299e..258fe47a24 100644
--- a/src/backend/utils/adt/tsvector_op.c
+++ b/src/backend/utils/adt/tsvector_op.c
@@ -3,7 +3,7 @@
  * tsvector_op.c
  *	  operations over tsvector
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c
index 060d073fb7..7367ba6a40 100644
--- a/src/backend/utils/adt/tsvector_parser.c
+++ b/src/backend/utils/adt/tsvector_parser.c
@@ -3,7 +3,7 @@
  * tsvector_parser.c
  *	  Parser for tsvector
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/txid.c b/src/backend/utils/adt/txid.c
index 5dd996f62c..7974c0bd3d 100644
--- a/src/backend/utils/adt/txid.c
+++ b/src/backend/utils/adt/txid.c
@@ -10,7 +10,7 @@
  * via functions such as SubTransGetTopmostTransaction().
  *
  *
- *	Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *	Author: Jan Wieck, Afilias USA INC.
  *	64-bit txids: Marko Kreen, Skype Technologies
  *
@@ -132,8 +132,8 @@ TransactionIdInRecentPast(uint64 xid_with_epoch, TransactionId *extracted_xid)
 		|| (xid_epoch == now_epoch && xid > now_epoch_last_xid))
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-				 errmsg("transaction ID " UINT64_FORMAT " is in the future",
-						xid_with_epoch)));
+				 errmsg("transaction ID %s is in the future",
+						psprintf(UINT64_FORMAT, xid_with_epoch))));
 
 	/*
 	 * ShmemVariableCache->oldestClogXid is protected by CLogTruncationLock,
@@ -640,7 +640,7 @@ txid_snapshot_send(PG_FUNCTION_ARGS)
 	uint32		i;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, snap->nxip, 4);
+	pq_sendint32(&buf, snap->nxip);
 	pq_sendint64(&buf, snap->xmin);
 	pq_sendint64(&buf, snap->xmax);
 	for (i = 0; i < snap->nxip; i++)
@@ -755,11 +755,11 @@ txid_status(PG_FUNCTION_ARGS)
 		Assert(TransactionIdIsValid(xid));
 
 		if (TransactionIdIsCurrentTransactionId(xid))
-			status = gettext_noop("in progress");
+			status = "in progress";
 		else if (TransactionIdDidCommit(xid))
-			status = gettext_noop("committed");
+			status = "committed";
 		else if (TransactionIdDidAbort(xid))
-			status = gettext_noop("aborted");
+			status = "aborted";
 		else
 		{
 			/*
@@ -774,9 +774,9 @@ txid_status(PG_FUNCTION_ARGS)
 			 * checked commit/abort status).
 			 */
 			if (TransactionIdPrecedes(xid, GetActiveSnapshot()->xmin))
-				status = gettext_noop("aborted");
+				status = "aborted";
 			else
-				status = gettext_noop("in progress");
+				status = "in progress";
 		}
 	}
 	else
diff --git a/src/backend/utils/adt/uuid.c b/src/backend/utils/adt/uuid.c
index 5f15c8e619..43674dbfab 100644
--- a/src/backend/utils/adt/uuid.c
+++ b/src/backend/utils/adt/uuid.c
@@ -3,7 +3,7 @@
  * uuid.c
  *	  Functions for the built-in type "uuid".
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/adt/uuid.c
@@ -408,3 +408,11 @@ uuid_hash(PG_FUNCTION_ARGS)
 
 	return hash_any(key->data, UUID_LEN);
 }
+
+Datum
+uuid_hash_extended(PG_FUNCTION_ARGS)
+{
+	pg_uuid_t  *key = PG_GETARG_UUID_P(0);
+
+	return hash_any_extended(key->data, UUID_LEN, PG_GETARG_INT64(1));
+}
diff --git a/src/backend/utils/adt/varbit.c b/src/backend/utils/adt/varbit.c
index 0cf1c6f6d6..6ba400b699 100644
--- a/src/backend/utils/adt/varbit.c
+++ b/src/backend/utils/adt/varbit.c
@@ -5,7 +5,7 @@
  *
  * Code originally contributed by Adriaan Joubert.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -17,6 +17,7 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
+#include "common/int.h"
 #include "libpq/pqformat.h"
 #include "nodes/nodeFuncs.h"
 #include "utils/array.h"
@@ -665,7 +666,7 @@ varbit_send(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, VARBITLEN(s), sizeof(int32));
+	pq_sendint32(&buf, VARBITLEN(s));
 	pq_sendbytes(&buf, (char *) VARBITS(s), VARBITBYTES(s));
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
@@ -1166,8 +1167,7 @@ bit_overlay(VarBit *t1, VarBit *t2, int sp, int sl)
 		ereport(ERROR,
 				(errcode(ERRCODE_SUBSTRING_ERROR),
 				 errmsg("negative substring length not allowed")));
-	sp_pl_sl = sp + sl;
-	if (sp_pl_sl <= sl)
+	if (pg_add_s32_overflow(sp, sl, &sp_pl_sl))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
diff --git a/src/backend/utils/adt/varchar.c b/src/backend/utils/adt/varchar.c
index cbc62b00be..8f07b1e272 100644
--- a/src/backend/utils/adt/varchar.c
+++ b/src/backend/utils/adt/varchar.c
@@ -3,7 +3,7 @@
  * varchar.c
  *	  Functions for the built-in types char(n) and varchar(n).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -947,6 +947,24 @@ hashbpchar(PG_FUNCTION_ARGS)
 	return result;
 }
 
+Datum
+hashbpcharextended(PG_FUNCTION_ARGS)
+{
+	BpChar	   *key = PG_GETARG_BPCHAR_PP(0);
+	char	   *keydata;
+	int			keylen;
+	Datum		result;
+
+	keydata = VARDATA_ANY(key);
+	keylen = bcTruelen(key);
+
+	result = hash_any_extended((unsigned char *) keydata, keylen,
+							   PG_GETARG_INT64(1));
+
+	PG_FREE_IF_COPY(key, 0);
+
+	return result;
+}
 
 /*
  * The following operators support character-by-character comparison
diff --git a/src/backend/utils/adt/varlena.c b/src/backend/utils/adt/varlena.c
index ebfb823fb8..4346410d5a 100644
--- a/src/backend/utils/adt/varlena.c
+++ b/src/backend/utils/adt/varlena.c
@@ -3,7 +3,7 @@
  * varlena.c
  *	  Functions for the variable-length built-in types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -21,7 +21,7 @@
 #include "access/tuptoaster.h"
 #include "catalog/pg_collation.h"
 #include "catalog/pg_type.h"
-#include "common/md5.h"
+#include "common/int.h"
 #include "lib/hyperloglog.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
@@ -1047,8 +1047,7 @@ text_overlay(text *t1, text *t2, int sp, int sl)
 		ereport(ERROR,
 				(errcode(ERRCODE_SUBSTRING_ERROR),
 				 errmsg("negative substring length not allowed")));
-	sp_pl_sl = sp + sl;
-	if (sp_pl_sl <= sl)
+	if (pg_add_s32_overflow(sp, sl, &sp_pl_sl))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -1379,7 +1378,7 @@ text_position_cleanup(TextPositionState *state)
  * whether arg1 is less than, equal to, or greater than arg2.
  */
 int
-varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid)
+varstr_cmp(const char *arg1, int len1, const char *arg2, int len2, Oid collid)
 {
 	int			result;
 
@@ -1823,12 +1822,6 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
 	 * requirements of BpChar callers.  However, if LC_COLLATE = C, we can
 	 * make things quite a bit faster with varstrfastcmp_c or bpcharfastcmp_c,
 	 * both of which use memcmp() rather than strcoll().
-	 *
-	 * There is a further exception on Windows.  When the database encoding is
-	 * UTF-8 and we are not using the C collation, complex hacks are required.
-	 * We don't currently have a comparator that handles that case, so we fall
-	 * back on the slow method of having the sort code invoke bttextcmp() (in
-	 * the case of text) via the fmgr trampoline.
 	 */
 	if (lc_collate_is_c(collid))
 	{
@@ -1839,14 +1832,8 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
 
 		collate_c = true;
 	}
-#ifdef WIN32
-	else if (GetDatabaseEncoding() == PG_UTF8)
-		return;
-#endif
 	else
 	{
-		ssup->comparator = varstrfastcmp_locale;
-
 		/*
 		 * We need a collation-sensitive comparison.  To make things faster,
 		 * we'll figure out the collation based on the locale id and cache the
@@ -1867,6 +1854,22 @@ varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar)
 			}
 			locale = pg_newlocale_from_collation(collid);
 		}
+
+		/*
+		 * There is a further exception on Windows.  When the database
+		 * encoding is UTF-8 and we are not using the C collation, complex
+		 * hacks are required.  We don't currently have a comparator that
+		 * handles that case, so we fall back on the slow method of having the
+		 * sort code invoke bttextcmp() (in the case of text) via the fmgr
+		 * trampoline.  ICU locales work just the same on Windows, however.
+		 */
+#ifdef WIN32
+		if (GetDatabaseEncoding() == PG_UTF8 &&
+			!(locale && locale->provider == COLLPROVIDER_ICU))
+			return;
+#endif
+
+		ssup->comparator = varstrfastcmp_locale;
 	}
 
 	/*
@@ -2946,8 +2949,7 @@ bytea_overlay(bytea *t1, bytea *t2, int sp, int sl)
 		ereport(ERROR,
 				(errcode(ERRCODE_SUBSTRING_ERROR),
 				 errmsg("negative substring length not allowed")));
-	sp_pl_sl = sp + sl;
-	if (sp_pl_sl <= sl)
+	if (pg_add_s32_overflow(sp, sl, &sp_pl_sl))
 		ereport(ERROR,
 				(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 				 errmsg("integer out of range")));
@@ -3251,7 +3253,7 @@ textToQualifiedNameList(text *textval)
  *	namelist: filled with a palloc'd list of pointers to identifiers within
  *			  rawstring.  Caller should list_free() this even on error return.
  *
- * Returns TRUE if okay, FALSE if there is a syntax error in the string.
+ * Returns true if okay, false if there is a syntax error in the string.
  *
  * Note that an empty string is considered okay here, though not in
  * textToQualifiedNameList.
@@ -3379,7 +3381,7 @@ SplitIdentifierString(char *rawstring, char separator,
  *	namelist: filled with a palloc'd list of directory names.
  *			  Caller should list_free_deep() this even on error return.
  *
- * Returns TRUE if okay, FALSE if there is a syntax error in the string.
+ * Returns true if okay, false if there is a syntax error in the string.
  *
  * Note that an empty string is considered okay here.
  */
@@ -4561,53 +4563,6 @@ to_hex64(PG_FUNCTION_ARGS)
 	PG_RETURN_TEXT_P(cstring_to_text(ptr));
 }
 
-/*
- * Create an md5 hash of a text string and return it as hex
- *
- * md5 produces a 16 byte (128 bit) hash; double it for hex
- */
-#define MD5_HASH_LEN  32
-
-Datum
-md5_text(PG_FUNCTION_ARGS)
-{
-	text	   *in_text = PG_GETARG_TEXT_PP(0);
-	size_t		len;
-	char		hexsum[MD5_HASH_LEN + 1];
-
-	/* Calculate the length of the buffer using varlena metadata */
-	len = VARSIZE_ANY_EXHDR(in_text);
-
-	/* get the hash result */
-	if (pg_md5_hash(VARDATA_ANY(in_text), len, hexsum) == false)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-
-	/* convert to text and return it */
-	PG_RETURN_TEXT_P(cstring_to_text(hexsum));
-}
-
-/*
- * Create an md5 hash of a bytea field and return it as a hex string:
- * 16-byte md5 digest is represented in 32 hex characters.
- */
-Datum
-md5_bytea(PG_FUNCTION_ARGS)
-{
-	bytea	   *in = PG_GETARG_BYTEA_PP(0);
-	size_t		len;
-	char		hexsum[MD5_HASH_LEN + 1];
-
-	len = VARSIZE_ANY_EXHDR(in);
-	if (pg_md5_hash(VARDATA_ANY(in), len, hexsum) == false)
-		ereport(ERROR,
-				(errcode(ERRCODE_OUT_OF_MEMORY),
-				 errmsg("out of memory")));
-
-	PG_RETURN_TEXT_P(cstring_to_text(hexsum));
-}
-
 /*
  * Return the size of a datum, possibly compressed
  *
@@ -4733,11 +4688,48 @@ string_agg_finalfn(PG_FUNCTION_ARGS)
 		PG_RETURN_NULL();
 }
 
+/*
+ * Prepare cache with fmgr info for the output functions of the datatypes of
+ * the arguments of a concat-like function, beginning with argument "argidx".
+ * (Arguments before that will have corresponding slots in the resulting
+ * FmgrInfo array, but we don't fill those slots.)
+ */
+static FmgrInfo *
+build_concat_foutcache(FunctionCallInfo fcinfo, int argidx)
+{
+	FmgrInfo   *foutcache;
+	int			i;
+
+	/* We keep the info in fn_mcxt so it survives across calls */
+	foutcache = (FmgrInfo *) MemoryContextAlloc(fcinfo->flinfo->fn_mcxt,
+												PG_NARGS() * sizeof(FmgrInfo));
+
+	for (i = argidx; i < PG_NARGS(); i++)
+	{
+		Oid			valtype;
+		Oid			typOutput;
+		bool		typIsVarlena;
+
+		valtype = get_fn_expr_argtype(fcinfo->flinfo, i);
+		if (!OidIsValid(valtype))
+			elog(ERROR, "could not determine data type of concat() input");
+
+		getTypeOutputInfo(valtype, &typOutput, &typIsVarlena);
+		fmgr_info_cxt(typOutput, &foutcache[i], fcinfo->flinfo->fn_mcxt);
+	}
+
+	fcinfo->flinfo->fn_extra = foutcache;
+
+	return foutcache;
+}
+
 /*
  * Implementation of both concat() and concat_ws().
  *
  * sepstr is the separator string to place between values.
- * argidx identifies the first argument to concatenate (counting from zero).
+ * argidx identifies the first argument to concatenate (counting from zero);
+ * note that this must be constant across any one series of calls.
+ *
  * Returns NULL if result should be NULL, else text value.
  */
 static text *
@@ -4746,6 +4738,7 @@ concat_internal(const char *sepstr, int argidx,
 {
 	text	   *result;
 	StringInfoData str;
+	FmgrInfo   *foutcache;
 	bool		first_arg = true;
 	int			i;
 
@@ -4787,14 +4780,16 @@ concat_internal(const char *sepstr, int argidx,
 	/* Normal case without explicit VARIADIC marker */
 	initStringInfo(&str);
 
+	/* Get output function info, building it if first time through */
+	foutcache = (FmgrInfo *) fcinfo->flinfo->fn_extra;
+	if (foutcache == NULL)
+		foutcache = build_concat_foutcache(fcinfo, argidx);
+
 	for (i = argidx; i < PG_NARGS(); i++)
 	{
 		if (!PG_ARGISNULL(i))
 		{
 			Datum		value = PG_GETARG_DATUM(i);
-			Oid			valtype;
-			Oid			typOutput;
-			bool		typIsVarlena;
 
 			/* add separator if appropriate */
 			if (first_arg)
@@ -4803,12 +4798,8 @@ concat_internal(const char *sepstr, int argidx,
 				appendStringInfoString(&str, sepstr);
 
 			/* call the appropriate type output function, append the result */
-			valtype = get_fn_expr_argtype(fcinfo->flinfo, i);
-			if (!OidIsValid(valtype))
-				elog(ERROR, "could not determine data type of concat() input");
-			getTypeOutputInfo(valtype, &typOutput, &typIsVarlena);
 			appendStringInfoString(&str,
-								   OidOutputFunctionCall(typOutput, value));
+								   OutputFunctionCall(&foutcache[i], value));
 		}
 	}
 
@@ -5239,13 +5230,13 @@ text_format_parse_digits(const char **ptr, const char *end_ptr, int *value)
 
 	while (*cp >= '0' && *cp <= '9')
 	{
-		int			newval = val * 10 + (*cp - '0');
+		int8		digit = (*cp - '0');
 
-		if (newval / 10 != val) /* overflow? */
+		if (unlikely(pg_mul_s32_overflow(val, 10, &val)) ||
+			unlikely(pg_add_s32_overflow(val, digit, &val)))
 			ereport(ERROR,
 					(errcode(ERRCODE_NUMERIC_VALUE_OUT_OF_RANGE),
 					 errmsg("number is out of range")));
-		val = newval;
 		ADVANCE_PARSE_POINTER(cp, end_ptr);
 		found = true;
 	}
diff --git a/src/backend/utils/adt/version.c b/src/backend/utils/adt/version.c
index 5bdc8fad43..d57fd98ee0 100644
--- a/src/backend/utils/adt/version.c
+++ b/src/backend/utils/adt/version.c
@@ -3,7 +3,7 @@
  * version.c
  *	 Returns the PostgreSQL version string
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *
diff --git a/src/backend/utils/adt/windowfuncs.c b/src/backend/utils/adt/windowfuncs.c
index d86ad703da..40ba783572 100644
--- a/src/backend/utils/adt/windowfuncs.c
+++ b/src/backend/utils/adt/windowfuncs.c
@@ -3,7 +3,7 @@
  * windowfuncs.c
  *	  Standard window functions defined in SQL spec.
  *
- * Portions Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/adt/xid.c b/src/backend/utils/adt/xid.c
index 2051709fde..1e811faa9c 100644
--- a/src/backend/utils/adt/xid.c
+++ b/src/backend/utils/adt/xid.c
@@ -3,7 +3,7 @@
  * xid.c
  *	  POSTGRES transaction identifier and command identifier datatypes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -68,7 +68,7 @@ xidsend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(arg1));
+	pq_sendint32(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
@@ -196,7 +196,7 @@ cidsend(PG_FUNCTION_ARGS)
 	StringInfoData buf;
 
 	pq_begintypsend(&buf);
-	pq_sendint(&buf, arg1, sizeof(arg1));
+	pq_sendint32(&buf, arg1);
 	PG_RETURN_BYTEA_P(pq_endtypsend(&buf));
 }
 
diff --git a/src/backend/utils/adt/xml.c b/src/backend/utils/adt/xml.c
index c47624eff6..7cdb87ef85 100644
--- a/src/backend/utils/adt/xml.c
+++ b/src/backend/utils/adt/xml.c
@@ -4,7 +4,7 @@
  *	  XML data type support.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/utils/adt/xml.c
@@ -146,7 +146,7 @@ static text *xml_xmlnodetoxmltype(xmlNodePtr cur, PgXmlErrorContext *xmlerrcxt);
 static int xml_xpathobjtoxmlarray(xmlXPathObjectPtr xpathobj,
 					   ArrayBuildState *astate,
 					   PgXmlErrorContext *xmlerrcxt);
-static xmlChar *pg_xmlCharStrndup(char *str, size_t len);
+static xmlChar *pg_xmlCharStrndup(const char *str, size_t len);
 #endif							/* USE_LIBXML */
 
 static void xmldata_root_element_start(StringInfo result, const char *eltname,
@@ -192,11 +192,11 @@ typedef struct XmlTableBuilderData
 
 static void XmlTableInitOpaque(struct TableFuncScanState *state, int natts);
 static void XmlTableSetDocument(struct TableFuncScanState *state, Datum value);
-static void XmlTableSetNamespace(struct TableFuncScanState *state, char *name,
-					 char *uri);
-static void XmlTableSetRowFilter(struct TableFuncScanState *state, char *path);
+static void XmlTableSetNamespace(struct TableFuncScanState *state, const char *name,
+					 const char *uri);
+static void XmlTableSetRowFilter(struct TableFuncScanState *state, const char *path);
 static void XmlTableSetColumnFilter(struct TableFuncScanState *state,
-						char *path, int colnum);
+						const char *path, int colnum);
 static bool XmlTableFetchRow(struct TableFuncScanState *state);
 static Datum XmlTableGetValue(struct TableFuncScanState *state, int colnum,
 				 Oid typid, int32 typmod, bool *isnull);
@@ -765,7 +765,7 @@ xmlparse(text *data, XmlOptionType xmloption_arg, bool preserve_whitespace)
 
 
 xmltype *
-xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null)
+xmlpi(const char *target, text *arg, bool arg_is_null, bool *result_is_null)
 {
 #ifdef USE_LIBXML
 	xmltype    *result;
@@ -1164,7 +1164,7 @@ xml_pnstrdup(const xmlChar *str, size_t len)
 
 /* Ditto, except input is char* */
 static xmlChar *
-pg_xmlCharStrndup(char *str, size_t len)
+pg_xmlCharStrndup(const char *str, size_t len)
 {
 	xmlChar    *result;
 
@@ -1850,7 +1850,7 @@ appendStringInfoLineSeparator(StringInfo str)
  * Convert one char in the current server encoding to a Unicode codepoint.
  */
 static pg_wchar
-sqlchar_to_unicode(char *s)
+sqlchar_to_unicode(const char *s)
 {
 	char	   *utf8string;
 	pg_wchar	ret[2];			/* need space for trailing zero */
@@ -1894,12 +1894,12 @@ is_valid_xml_namechar(pg_wchar c)
  * Map SQL identifier to XML name; see SQL/XML:2008 section 9.1.
  */
 char *
-map_sql_identifier_to_xml_name(char *ident, bool fully_escaped,
+map_sql_identifier_to_xml_name(const char *ident, bool fully_escaped,
 							   bool escape_period)
 {
 #ifdef USE_LIBXML
 	StringInfoData buf;
-	char	   *p;
+	const char *p;
 
 	/*
 	 * SQL/XML doesn't make use of this case anywhere, so it's probably a
@@ -1970,10 +1970,10 @@ unicode_to_sqlchar(pg_wchar c)
  * Map XML name to SQL identifier; see SQL/XML:2008 section 9.3.
  */
 char *
-map_xml_name_to_sql_identifier(char *name)
+map_xml_name_to_sql_identifier(const char *name)
 {
 	StringInfoData buf;
-	char	   *p;
+	const char *p;
 
 	initStringInfo(&buf);
 
@@ -3009,7 +3009,7 @@ database_to_xml_and_xmlschema(PG_FUNCTION_ARGS)
  * 9.2.
  */
 static char *
-map_multipart_sql_identifier_to_xml_name(char *a, char *b, char *c, char *d)
+map_multipart_sql_identifier_to_xml_name(const char *a, const char *b, const char *c, const char *d)
 {
 	StringInfoData result;
 
@@ -3099,13 +3099,15 @@ map_sql_table_to_xmlschema(TupleDesc tupdesc, Oid relid, bool nulls,
 
 	for (i = 0; i < tupdesc->natts; i++)
 	{
-		if (tupdesc->attrs[i]->attisdropped)
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+		if (att->attisdropped)
 			continue;
 		appendStringInfo(&result,
 						 "    <xsd:element name=\"%s\" type=\"%s\"%s></xsd:element>\n",
-						 map_sql_identifier_to_xml_name(NameStr(tupdesc->attrs[i]->attname),
+						 map_sql_identifier_to_xml_name(NameStr(att->attname),
 														true, false),
-						 map_sql_type_to_xml_name(tupdesc->attrs[i]->atttypid, -1),
+						 map_sql_type_to_xml_name(att->atttypid, -1),
 						 nulls ? " nillable=\"true\"" : " minOccurs=\"0\"");
 	}
 
@@ -3392,10 +3394,11 @@ map_sql_typecoll_to_xmlschema_types(List *tupdesc_list)
 
 		for (i = 0; i < tupdesc->natts; i++)
 		{
-			if (tupdesc->attrs[i]->attisdropped)
+			Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+			if (att->attisdropped)
 				continue;
-			uniquetypes = list_append_unique_oid(uniquetypes,
-												 tupdesc->attrs[i]->atttypid);
+			uniquetypes = list_append_unique_oid(uniquetypes, att->atttypid);
 		}
 	}
 
@@ -3842,6 +3845,7 @@ xpath_internal(text *xpath_expr_text, xmltype *data, ArrayType *namespaces,
 	int32		xpath_len;
 	xmlChar    *string;
 	xmlChar    *xpath_expr;
+	size_t		xmldecl_len = 0;
 	int			i;
 	int			ndim;
 	Datum	   *ns_names_uris;
@@ -3897,6 +3901,16 @@ xpath_internal(text *xpath_expr_text, xmltype *data, ArrayType *namespaces,
 	string = pg_xmlCharStrndup(datastr, len);
 	xpath_expr = pg_xmlCharStrndup(VARDATA_ANY(xpath_expr_text), xpath_len);
 
+	/*
+	 * In a UTF8 database, skip any xml declaration, which might assert
+	 * another encoding.  Ignore parse_xml_decl() failure, letting
+	 * xmlCtxtReadMemory() report parse errors.  Documentation disclaims
+	 * xpath() support for non-ASCII data in non-UTF8 databases, so leave
+	 * those scenarios bug-compatible with historical behavior.
+	 */
+	if (GetDatabaseEncoding() == PG_UTF8)
+		parse_xml_decl(string, &xmldecl_len, NULL, NULL, NULL);
+
 	xmlerrcxt = pg_xml_init(PG_XML_STRICTNESS_ALL);
 
 	PG_TRY();
@@ -3911,7 +3925,8 @@ xpath_internal(text *xpath_expr_text, xmltype *data, ArrayType *namespaces,
 		if (ctxt == NULL || xmlerrcxt->err_occurred)
 			xml_ereport(xmlerrcxt, ERROR, ERRCODE_OUT_OF_MEMORY,
 						"could not allocate parser context");
-		doc = xmlCtxtReadMemory(ctxt, (char *) string, len, NULL, NULL, 0);
+		doc = xmlCtxtReadMemory(ctxt, (char *) string + xmldecl_len,
+								len - xmldecl_len, NULL, NULL, 0);
 		if (doc == NULL || xmlerrcxt->err_occurred)
 			xml_ereport(xmlerrcxt, ERROR, ERRCODE_INVALID_XML_DOCUMENT,
 						"could not parse XML document");
@@ -4289,7 +4304,7 @@ XmlTableSetDocument(TableFuncScanState *state, Datum value)
  *		Add a namespace declaration
  */
 static void
-XmlTableSetNamespace(TableFuncScanState *state, char *name, char *uri)
+XmlTableSetNamespace(TableFuncScanState *state, const char *name, const char *uri)
 {
 #ifdef USE_LIBXML
 	XmlTableBuilderData *xtCxt;
@@ -4315,7 +4330,7 @@ XmlTableSetNamespace(TableFuncScanState *state, char *name, char *uri)
  *		Install the row-filter Xpath expression.
  */
 static void
-XmlTableSetRowFilter(TableFuncScanState *state, char *path)
+XmlTableSetRowFilter(TableFuncScanState *state, const char *path)
 {
 #ifdef USE_LIBXML
 	XmlTableBuilderData *xtCxt;
@@ -4344,7 +4359,7 @@ XmlTableSetRowFilter(TableFuncScanState *state, char *path)
  *		Install the column-filter Xpath expression, for the given column.
  */
 static void
-XmlTableSetColumnFilter(TableFuncScanState *state, char *path, int colnum)
+XmlTableSetColumnFilter(TableFuncScanState *state, const char *path, int colnum)
 {
 #ifdef USE_LIBXML
 	XmlTableBuilderData *xtCxt;
@@ -4373,7 +4388,7 @@ XmlTableSetColumnFilter(TableFuncScanState *state, char *path, int colnum)
 /*
  * XmlTableFetchRow
  *		Prepare the next "current" tuple for upcoming GetValue calls.
- *		Returns FALSE if the row-filter expression returned no more rows.
+ *		Returns false if the row-filter expression returned no more rows.
  */
 static bool
 XmlTableFetchRow(TableFuncScanState *state)
diff --git a/src/backend/utils/cache/attoptcache.c b/src/backend/utils/cache/attoptcache.c
index da8b42ddb8..92468472a4 100644
--- a/src/backend/utils/cache/attoptcache.c
+++ b/src/backend/utils/cache/attoptcache.c
@@ -6,7 +6,7 @@
  * Attribute options are cached separately from the fixed-size portion of
  * pg_attribute entries, which are handled by the relcache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/cache/catcache.c b/src/backend/utils/cache/catcache.c
index f894053d80..5ddbf6eab1 100644
--- a/src/backend/utils/cache/catcache.c
+++ b/src/backend/utils/cache/catcache.c
@@ -3,7 +3,7 @@
  * catcache.c
  *	  System catalog cache for tuples matching a key.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -30,7 +30,9 @@
 #endif
 #include "storage/lmgr.h"
 #include "utils/builtins.h"
+#include "utils/datum.h"
 #include "utils/fmgroids.h"
+#include "utils/hashutils.h"
 #include "utils/inval.h"
 #include "utils/memutils.h"
 #include "utils/rel.h"
@@ -72,11 +74,25 @@
 /* Cache management header --- pointer is NULL until created */
 static CatCacheHeader *CacheHdr = NULL;
 
+static inline HeapTuple SearchCatCacheInternal(CatCache *cache,
+					   int nkeys,
+					   Datum v1, Datum v2,
+					   Datum v3, Datum v4);
+
+static pg_noinline HeapTuple SearchCatCacheMiss(CatCache *cache,
+				   int nkeys,
+				   uint32 hashValue,
+				   Index hashIndex,
+				   Datum v1, Datum v2,
+				   Datum v3, Datum v4);
 
 static uint32 CatalogCacheComputeHashValue(CatCache *cache, int nkeys,
-							 ScanKey cur_skey);
-static uint32 CatalogCacheComputeTupleHashValue(CatCache *cache,
+							 Datum v1, Datum v2, Datum v3, Datum v4);
+static uint32 CatalogCacheComputeTupleHashValue(CatCache *cache, int nkeys,
 								  HeapTuple tuple);
+static inline bool CatalogCacheCompareTuple(const CatCache *cache, int nkeys,
+						 const Datum *cachekeys,
+						 const Datum *searchkeys);
 
 #ifdef CATCACHE_STATS
 static void CatCachePrintStats(int code, Datum arg);
@@ -85,9 +101,14 @@ static void CatCacheRemoveCTup(CatCache *cache, CatCTup *ct);
 static void CatCacheRemoveCList(CatCache *cache, CatCList *cl);
 static void CatalogCacheInitializeCache(CatCache *cache);
 static CatCTup *CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
+						Datum *arguments,
 						uint32 hashValue, Index hashIndex,
 						bool negative);
-static HeapTuple build_dummy_tuple(CatCache *cache, int nkeys, ScanKey skeys);
+
+static void CatCacheFreeKeys(TupleDesc tupdesc, int nkeys, int *attnos,
+				 Datum *keys);
+static void CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos,
+				 Datum *srckeys, Datum *dstkeys);
 
 
 /*
@@ -95,45 +116,126 @@ static HeapTuple build_dummy_tuple(CatCache *cache, int nkeys, ScanKey skeys);
  */
 
 /*
- * Look up the hash and equality functions for system types that are used
- * as cache key fields.
- *
- * XXX this should be replaced by catalog lookups,
- * but that seems to pose considerable risk of circularity...
+ * Hash and equality functions for system types that are used as cache key
+ * fields.  In some cases, we just call the regular SQL-callable functions for
+ * the appropriate data type, but that tends to be a little slow, and the
+ * speed of these functions is performance-critical.  Therefore, for data
+ * types that frequently occur as catcache keys, we hard-code the logic here.
+ * Avoiding the overhead of DirectFunctionCallN(...) is a substantial win, and
+ * in certain cases (like int4) we can adopt a faster hash algorithm as well.
  */
+
+static bool
+chareqfast(Datum a, Datum b)
+{
+	return DatumGetChar(a) == DatumGetChar(b);
+}
+
+static uint32
+charhashfast(Datum datum)
+{
+	return murmurhash32((int32) DatumGetChar(datum));
+}
+
+static bool
+nameeqfast(Datum a, Datum b)
+{
+	char	   *ca = NameStr(*DatumGetName(a));
+	char	   *cb = NameStr(*DatumGetName(b));
+
+	return strncmp(ca, cb, NAMEDATALEN) == 0;
+}
+
+static uint32
+namehashfast(Datum datum)
+{
+	char	   *key = NameStr(*DatumGetName(datum));
+
+	return hash_any((unsigned char *) key, strlen(key));
+}
+
+static bool
+int2eqfast(Datum a, Datum b)
+{
+	return DatumGetInt16(a) == DatumGetInt16(b);
+}
+
+static uint32
+int2hashfast(Datum datum)
+{
+	return murmurhash32((int32) DatumGetInt16(datum));
+}
+
+static bool
+int4eqfast(Datum a, Datum b)
+{
+	return DatumGetInt32(a) == DatumGetInt32(b);
+}
+
+static uint32
+int4hashfast(Datum datum)
+{
+	return murmurhash32((int32) DatumGetInt32(datum));
+}
+
+static bool
+texteqfast(Datum a, Datum b)
+{
+	return DatumGetBool(DirectFunctionCall2(texteq, a, b));
+}
+
+static uint32
+texthashfast(Datum datum)
+{
+	return DatumGetInt32(DirectFunctionCall1(hashtext, datum));
+}
+
+static bool
+oidvectoreqfast(Datum a, Datum b)
+{
+	return DatumGetBool(DirectFunctionCall2(oidvectoreq, a, b));
+}
+
+static uint32
+oidvectorhashfast(Datum datum)
+{
+	return DatumGetInt32(DirectFunctionCall1(hashoidvector, datum));
+}
+
+/* Lookup support functions for a type. */
 static void
-GetCCHashEqFuncs(Oid keytype, PGFunction *hashfunc, RegProcedure *eqfunc)
+GetCCHashEqFuncs(Oid keytype, CCHashFN *hashfunc, RegProcedure *eqfunc, CCFastEqualFN *fasteqfunc)
 {
 	switch (keytype)
 	{
 		case BOOLOID:
-			*hashfunc = hashchar;
-
+			*hashfunc = charhashfast;
+			*fasteqfunc = chareqfast;
 			*eqfunc = F_BOOLEQ;
 			break;
 		case CHAROID:
-			*hashfunc = hashchar;
-
+			*hashfunc = charhashfast;
+			*fasteqfunc = chareqfast;
 			*eqfunc = F_CHAREQ;
 			break;
 		case NAMEOID:
-			*hashfunc = hashname;
-
+			*hashfunc = namehashfast;
+			*fasteqfunc = nameeqfast;
 			*eqfunc = F_NAMEEQ;
 			break;
 		case INT2OID:
-			*hashfunc = hashint2;
-
+			*hashfunc = int2hashfast;
+			*fasteqfunc = int2eqfast;
 			*eqfunc = F_INT2EQ;
 			break;
 		case INT4OID:
-			*hashfunc = hashint4;
-
+			*hashfunc = int4hashfast;
+			*fasteqfunc = int4eqfast;
 			*eqfunc = F_INT4EQ;
 			break;
 		case TEXTOID:
-			*hashfunc = hashtext;
-
+			*hashfunc = texthashfast;
+			*fasteqfunc = texteqfast;
 			*eqfunc = F_TEXTEQ;
 			break;
 		case OIDOID:
@@ -147,13 +249,13 @@ GetCCHashEqFuncs(Oid keytype, PGFunction *hashfunc, RegProcedure *eqfunc)
 		case REGDICTIONARYOID:
 		case REGROLEOID:
 		case REGNAMESPACEOID:
-			*hashfunc = hashoid;
-
+			*hashfunc = int4hashfast;
+			*fasteqfunc = int4eqfast;
 			*eqfunc = F_OIDEQ;
 			break;
 		case OIDVECTOROID:
-			*hashfunc = hashoidvector;
-
+			*hashfunc = oidvectorhashfast;
+			*fasteqfunc = oidvectoreqfast;
 			*eqfunc = F_OIDVECTOREQ;
 			break;
 		default:
@@ -171,10 +273,12 @@ GetCCHashEqFuncs(Oid keytype, PGFunction *hashfunc, RegProcedure *eqfunc)
  * Compute the hash value associated with a given set of lookup keys
  */
 static uint32
-CatalogCacheComputeHashValue(CatCache *cache, int nkeys, ScanKey cur_skey)
+CatalogCacheComputeHashValue(CatCache *cache, int nkeys,
+							 Datum v1, Datum v2, Datum v3, Datum v4)
 {
 	uint32		hashValue = 0;
 	uint32		oneHash;
+	CCHashFN   *cc_hashfunc = cache->cc_hashfunc;
 
 	CACHE4_elog(DEBUG2, "CatalogCacheComputeHashValue %s %d %p",
 				cache->cc_relname,
@@ -184,30 +288,26 @@ CatalogCacheComputeHashValue(CatCache *cache, int nkeys, ScanKey cur_skey)
 	switch (nkeys)
 	{
 		case 4:
-			oneHash =
-				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[3],
-												   cur_skey[3].sk_argument));
+			oneHash = (cc_hashfunc[3]) (v4);
+
 			hashValue ^= oneHash << 24;
 			hashValue ^= oneHash >> 8;
 			/* FALLTHROUGH */
 		case 3:
-			oneHash =
-				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[2],
-												   cur_skey[2].sk_argument));
+			oneHash = (cc_hashfunc[2]) (v3);
+
 			hashValue ^= oneHash << 16;
 			hashValue ^= oneHash >> 16;
 			/* FALLTHROUGH */
 		case 2:
-			oneHash =
-				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[1],
-												   cur_skey[1].sk_argument));
+			oneHash = (cc_hashfunc[1]) (v2);
+
 			hashValue ^= oneHash << 8;
 			hashValue ^= oneHash >> 24;
 			/* FALLTHROUGH */
 		case 1:
-			oneHash =
-				DatumGetUInt32(DirectFunctionCall1(cache->cc_hashfunc[0],
-												   cur_skey[0].sk_argument));
+			oneHash = (cc_hashfunc[0]) (v1);
+
 			hashValue ^= oneHash;
 			break;
 		default:
@@ -224,63 +324,82 @@ CatalogCacheComputeHashValue(CatCache *cache, int nkeys, ScanKey cur_skey)
  * Compute the hash value associated with a given tuple to be cached
  */
 static uint32
-CatalogCacheComputeTupleHashValue(CatCache *cache, HeapTuple tuple)
+CatalogCacheComputeTupleHashValue(CatCache *cache, int nkeys, HeapTuple tuple)
 {
-	ScanKeyData cur_skey[CATCACHE_MAXKEYS];
+	Datum		v1 = 0,
+				v2 = 0,
+				v3 = 0,
+				v4 = 0;
 	bool		isNull = false;
-
-	/* Copy pre-initialized overhead data for scankey */
-	memcpy(cur_skey, cache->cc_skey, sizeof(cur_skey));
+	int		   *cc_keyno = cache->cc_keyno;
+	TupleDesc	cc_tupdesc = cache->cc_tupdesc;
 
 	/* Now extract key fields from tuple, insert into scankey */
-	switch (cache->cc_nkeys)
+	switch (nkeys)
 	{
 		case 4:
-			cur_skey[3].sk_argument =
-				(cache->cc_key[3] == ObjectIdAttributeNumber)
+			v4 = (cc_keyno[3] == ObjectIdAttributeNumber)
 				? ObjectIdGetDatum(HeapTupleGetOid(tuple))
 				: fastgetattr(tuple,
-							  cache->cc_key[3],
-							  cache->cc_tupdesc,
+							  cc_keyno[3],
+							  cc_tupdesc,
 							  &isNull);
 			Assert(!isNull);
 			/* FALLTHROUGH */
 		case 3:
-			cur_skey[2].sk_argument =
-				(cache->cc_key[2] == ObjectIdAttributeNumber)
+			v3 = (cc_keyno[2] == ObjectIdAttributeNumber)
 				? ObjectIdGetDatum(HeapTupleGetOid(tuple))
 				: fastgetattr(tuple,
-							  cache->cc_key[2],
-							  cache->cc_tupdesc,
+							  cc_keyno[2],
+							  cc_tupdesc,
 							  &isNull);
 			Assert(!isNull);
 			/* FALLTHROUGH */
 		case 2:
-			cur_skey[1].sk_argument =
-				(cache->cc_key[1] == ObjectIdAttributeNumber)
+			v2 = (cc_keyno[1] == ObjectIdAttributeNumber)
 				? ObjectIdGetDatum(HeapTupleGetOid(tuple))
 				: fastgetattr(tuple,
-							  cache->cc_key[1],
-							  cache->cc_tupdesc,
+							  cc_keyno[1],
+							  cc_tupdesc,
 							  &isNull);
 			Assert(!isNull);
 			/* FALLTHROUGH */
 		case 1:
-			cur_skey[0].sk_argument =
-				(cache->cc_key[0] == ObjectIdAttributeNumber)
+			v1 = (cc_keyno[0] == ObjectIdAttributeNumber)
 				? ObjectIdGetDatum(HeapTupleGetOid(tuple))
 				: fastgetattr(tuple,
-							  cache->cc_key[0],
-							  cache->cc_tupdesc,
+							  cc_keyno[0],
+							  cc_tupdesc,
 							  &isNull);
 			Assert(!isNull);
 			break;
 		default:
-			elog(FATAL, "wrong number of hash keys: %d", cache->cc_nkeys);
+			elog(FATAL, "wrong number of hash keys: %d", nkeys);
 			break;
 	}
 
-	return CatalogCacheComputeHashValue(cache, cache->cc_nkeys, cur_skey);
+	return CatalogCacheComputeHashValue(cache, nkeys, v1, v2, v3, v4);
+}
+
+/*
+ *		CatalogCacheCompareTuple
+ *
+ * Compare a tuple to the passed arguments.
+ */
+static inline bool
+CatalogCacheCompareTuple(const CatCache *cache, int nkeys,
+						 const Datum *cachekeys,
+						 const Datum *searchkeys)
+{
+	const CCFastEqualFN *cc_fastequal = cache->cc_fastequal;
+	int			i;
+
+	for (i = 0; i < nkeys; i++)
+	{
+		if (!(cc_fastequal[i]) (cachekeys[i], searchkeys[i]))
+			return false;
+	}
+	return true;
 }
 
 
@@ -371,9 +490,14 @@ CatCacheRemoveCTup(CatCache *cache, CatCTup *ct)
 	/* delink from linked list */
 	dlist_delete(&ct->cache_elem);
 
-	/* free associated tuple data */
-	if (ct->tuple.t_data != NULL)
-		pfree(ct->tuple.t_data);
+	/*
+	 * Free keys when we're dealing with a negative entry, normal entries just
+	 * point into tuple, allocated together with the CatCTup.
+	 */
+	if (ct->negative)
+		CatCacheFreeKeys(cache->cc_tupdesc, cache->cc_nkeys,
+						 cache->cc_keyno, ct->keys);
+
 	pfree(ct);
 
 	--cache->cc_ntup;
@@ -414,9 +538,10 @@ CatCacheRemoveCList(CatCache *cache, CatCList *cl)
 	/* delink from linked list */
 	dlist_delete(&cl->cache_elem);
 
-	/* free associated tuple data */
-	if (cl->tuple.t_data != NULL)
-		pfree(cl->tuple.t_data);
+	/* free associated column data */
+	CatCacheFreeKeys(cache->cc_tupdesc, cl->nkeys,
+					 cache->cc_keyno, cl->keys);
+
 	pfree(cl);
 }
 
@@ -660,6 +785,7 @@ InitCatCache(int id,
 {
 	CatCache   *cp;
 	MemoryContext oldcxt;
+	size_t		sz;
 	int			i;
 
 	/*
@@ -699,11 +825,12 @@ InitCatCache(int id,
 	}
 
 	/*
-	 * allocate a new cache structure
+	 * Allocate a new cache structure, aligning to a cacheline boundary
 	 *
 	 * Note: we rely on zeroing to initialize all the dlist headers correctly
 	 */
-	cp = (CatCache *) palloc0(sizeof(CatCache));
+	sz = sizeof(CatCache) + PG_CACHE_LINE_SIZE;
+	cp = (CatCache *) CACHELINEALIGN(palloc0(sz));
 	cp->cc_bucket = palloc0(nbuckets * sizeof(dlist_head));
 
 	/*
@@ -721,7 +848,7 @@ InitCatCache(int id,
 	cp->cc_nbuckets = nbuckets;
 	cp->cc_nkeys = nkeys;
 	for (i = 0; i < nkeys; ++i)
-		cp->cc_key[i] = key[i];
+		cp->cc_keyno[i] = key[i];
 
 	/*
 	 * new cache is initialized as far as we can go for now. print some
@@ -794,13 +921,13 @@ RehashCatCache(CatCache *cp)
 
 #define CatalogCacheInitializeCache_DEBUG2 \
 do { \
-		if (cache->cc_key[i] > 0) { \
+		if (cache->cc_keyno[i] > 0) { \
 			elog(DEBUG2, "CatalogCacheInitializeCache: load %d/%d w/%d, %u", \
-				i+1, cache->cc_nkeys, cache->cc_key[i], \
-				 tupdesc->attrs[cache->cc_key[i] - 1]->atttypid); \
+				i+1, cache->cc_nkeys, cache->cc_keyno[i], \
+				 TupleDescAttr(tupdesc, cache->cc_keyno[i] - 1)->atttypid); \
 		} else { \
 			elog(DEBUG2, "CatalogCacheInitializeCache: load %d/%d w/%d", \
-				i+1, cache->cc_nkeys, cache->cc_key[i]); \
+				i+1, cache->cc_nkeys, cache->cc_keyno[i]); \
 		} \
 } while(0)
 #else
@@ -860,9 +987,10 @@ CatalogCacheInitializeCache(CatCache *cache)
 
 		CatalogCacheInitializeCache_DEBUG2;
 
-		if (cache->cc_key[i] > 0)
+		if (cache->cc_keyno[i] > 0)
 		{
-			Form_pg_attribute attr = tupdesc->attrs[cache->cc_key[i] - 1];
+			Form_pg_attribute attr = TupleDescAttr(tupdesc,
+												   cache->cc_keyno[i] - 1);
 
 			keytype = attr->atttypid;
 			/* cache key columns should always be NOT NULL */
@@ -870,16 +998,15 @@ CatalogCacheInitializeCache(CatCache *cache)
 		}
 		else
 		{
-			if (cache->cc_key[i] != ObjectIdAttributeNumber)
+			if (cache->cc_keyno[i] != ObjectIdAttributeNumber)
 				elog(FATAL, "only sys attr supported in caches is OID");
 			keytype = OIDOID;
 		}
 
 		GetCCHashEqFuncs(keytype,
 						 &cache->cc_hashfunc[i],
-						 &eqfunc);
-
-		cache->cc_isname[i] = (keytype == NAMEOID);
+						 &eqfunc,
+						 &cache->cc_fastequal[i]);
 
 		/*
 		 * Do equality-function lookup (we assume this won't need a catalog
@@ -890,7 +1017,7 @@ CatalogCacheInitializeCache(CatCache *cache)
 					  CacheMemoryContext);
 
 		/* Initialize sk_attno suitably for HeapKeyTest() and heap scans */
-		cache->cc_skey[i].sk_attno = cache->cc_key[i];
+		cache->cc_skey[i].sk_attno = cache->cc_keyno[i];
 
 		/* Fill in sk_strategy as well --- always standard equality */
 		cache->cc_skey[i].sk_strategy = BTEqualStrategyNumber;
@@ -1019,7 +1146,7 @@ IndexScanOK(CatCache *cache, ScanKey cur_skey)
 }
 
 /*
- *	SearchCatCache
+ *	SearchCatCacheInternal
  *
  *		This call searches a system cache for a tuple, opening the relation
  *		if necessary (on the first access to a particular cache).
@@ -1041,42 +1168,90 @@ SearchCatCache(CatCache *cache,
 			   Datum v3,
 			   Datum v4)
 {
-	ScanKeyData cur_skey[CATCACHE_MAXKEYS];
+	return SearchCatCacheInternal(cache, cache->cc_nkeys, v1, v2, v3, v4);
+}
+
+
+/*
+ * SearchCatCacheN() are SearchCatCache() versions for a specific number of
+ * arguments. The compiler can inline the body and unroll loops, making them a
+ * bit faster than SearchCatCache().
+ */
+
+HeapTuple
+SearchCatCache1(CatCache *cache,
+				Datum v1)
+{
+	return SearchCatCacheInternal(cache, 1, v1, 0, 0, 0);
+}
+
+
+HeapTuple
+SearchCatCache2(CatCache *cache,
+				Datum v1, Datum v2)
+{
+	return SearchCatCacheInternal(cache, 2, v1, v2, 0, 0);
+}
+
+
+HeapTuple
+SearchCatCache3(CatCache *cache,
+				Datum v1, Datum v2, Datum v3)
+{
+	return SearchCatCacheInternal(cache, 3, v1, v2, v3, 0);
+}
+
+
+HeapTuple
+SearchCatCache4(CatCache *cache,
+				Datum v1, Datum v2, Datum v3, Datum v4)
+{
+	return SearchCatCacheInternal(cache, 4, v1, v2, v3, v4);
+}
+
+/*
+ * Work-horse for SearchCatCache/SearchCatCacheN.
+ */
+static inline HeapTuple
+SearchCatCacheInternal(CatCache *cache,
+					   int nkeys,
+					   Datum v1,
+					   Datum v2,
+					   Datum v3,
+					   Datum v4)
+{
+	Datum		arguments[CATCACHE_MAXKEYS];
 	uint32		hashValue;
 	Index		hashIndex;
 	dlist_iter	iter;
 	dlist_head *bucket;
 	CatCTup    *ct;
-	Relation	relation;
-	SysScanDesc scandesc;
-	HeapTuple	ntp;
 
 	/* Make sure we're in an xact, even if this ends up being a cache hit */
 	Assert(IsTransactionState());
 
+	Assert(cache->cc_nkeys == nkeys);
+
 	/*
 	 * one-time startup overhead for each cache
 	 */
-	if (cache->cc_tupdesc == NULL)
+	if (unlikely(cache->cc_tupdesc == NULL))
 		CatalogCacheInitializeCache(cache);
 
 #ifdef CATCACHE_STATS
 	cache->cc_searches++;
 #endif
 
-	/*
-	 * initialize the search key information
-	 */
-	memcpy(cur_skey, cache->cc_skey, sizeof(cur_skey));
-	cur_skey[0].sk_argument = v1;
-	cur_skey[1].sk_argument = v2;
-	cur_skey[2].sk_argument = v3;
-	cur_skey[3].sk_argument = v4;
+	/* Initialize local parameter array */
+	arguments[0] = v1;
+	arguments[1] = v2;
+	arguments[2] = v3;
+	arguments[3] = v4;
 
 	/*
 	 * find the hash bucket in which to look for the tuple
 	 */
-	hashValue = CatalogCacheComputeHashValue(cache, cache->cc_nkeys, cur_skey);
+	hashValue = CatalogCacheComputeHashValue(cache, nkeys, v1, v2, v3, v4);
 	hashIndex = HASH_INDEX(hashValue, cache->cc_nbuckets);
 
 	/*
@@ -1088,8 +1263,6 @@ SearchCatCache(CatCache *cache,
 	bucket = &cache->cc_bucket[hashIndex];
 	dlist_foreach(iter, bucket)
 	{
-		bool		res;
-
 		ct = dlist_container(CatCTup, cache_elem, iter.cur);
 
 		if (ct->dead)
@@ -1098,15 +1271,7 @@ SearchCatCache(CatCache *cache,
 		if (ct->hash_value != hashValue)
 			continue;			/* quickly skip entry if wrong hash val */
 
-		/*
-		 * see if the cached tuple matches our key.
-		 */
-		HeapKeyTest(&ct->tuple,
-					cache->cc_tupdesc,
-					cache->cc_nkeys,
-					cur_skey,
-					res);
-		if (!res)
+		if (!CatalogCacheCompareTuple(cache, nkeys, ct->keys, arguments))
 			continue;
 
 		/*
@@ -1149,6 +1314,49 @@ SearchCatCache(CatCache *cache,
 		}
 	}
 
+	return SearchCatCacheMiss(cache, nkeys, hashValue, hashIndex, v1, v2, v3, v4);
+}
+
+/*
+ * Search the actual catalogs, rather than the cache.
+ *
+ * This is kept separate from SearchCatCacheInternal() to keep the fast-path
+ * as small as possible.  To avoid that effort being undone by a helpful
+ * compiler, try to explicitly forbid inlining.
+ */
+static pg_noinline HeapTuple
+SearchCatCacheMiss(CatCache *cache,
+				   int nkeys,
+				   uint32 hashValue,
+				   Index hashIndex,
+				   Datum v1,
+				   Datum v2,
+				   Datum v3,
+				   Datum v4)
+{
+	ScanKeyData cur_skey[CATCACHE_MAXKEYS];
+	Relation	relation;
+	SysScanDesc scandesc;
+	HeapTuple	ntp;
+	CatCTup    *ct;
+	Datum		arguments[CATCACHE_MAXKEYS];
+
+	/* Initialize local parameter array */
+	arguments[0] = v1;
+	arguments[1] = v2;
+	arguments[2] = v3;
+	arguments[3] = v4;
+
+	/*
+	 * Ok, need to make a lookup in the relation, copy the scankey and fill
+	 * out any per-call fields.
+	 */
+	memcpy(cur_skey, cache->cc_skey, sizeof(ScanKeyData) * nkeys);
+	cur_skey[0].sk_argument = v1;
+	cur_skey[1].sk_argument = v2;
+	cur_skey[2].sk_argument = v3;
+	cur_skey[3].sk_argument = v4;
+
 	/*
 	 * Tuple was not found in cache, so we have to try to retrieve it directly
 	 * from the relation.  If found, we will add it to the cache; if not
@@ -1170,14 +1378,14 @@ SearchCatCache(CatCache *cache,
 								  cache->cc_indexoid,
 								  IndexScanOK(cache, cur_skey),
 								  NULL,
-								  cache->cc_nkeys,
+								  nkeys,
 								  cur_skey);
 
 	ct = NULL;
 
 	while (HeapTupleIsValid(ntp = systable_getnext(scandesc)))
 	{
-		ct = CatalogCacheCreateEntry(cache, ntp,
+		ct = CatalogCacheCreateEntry(cache, ntp, arguments,
 									 hashValue, hashIndex,
 									 false);
 		/* immediately set the refcount to 1 */
@@ -1206,11 +1414,9 @@ SearchCatCache(CatCache *cache,
 		if (IsBootstrapProcessingMode())
 			return NULL;
 
-		ntp = build_dummy_tuple(cache, cache->cc_nkeys, cur_skey);
-		ct = CatalogCacheCreateEntry(cache, ntp,
+		ct = CatalogCacheCreateEntry(cache, NULL, arguments,
 									 hashValue, hashIndex,
 									 true);
-		heap_freetuple(ntp);
 
 		CACHE4_elog(DEBUG2, "SearchCatCache(%s): Contains %d/%d tuples",
 					cache->cc_relname, cache->cc_ntup, CacheHdr->ch_ntup);
@@ -1287,27 +1493,16 @@ GetCatCacheHashValue(CatCache *cache,
 					 Datum v3,
 					 Datum v4)
 {
-	ScanKeyData cur_skey[CATCACHE_MAXKEYS];
-
 	/*
 	 * one-time startup overhead for each cache
 	 */
 	if (cache->cc_tupdesc == NULL)
 		CatalogCacheInitializeCache(cache);
 
-	/*
-	 * initialize the search key information
-	 */
-	memcpy(cur_skey, cache->cc_skey, sizeof(cur_skey));
-	cur_skey[0].sk_argument = v1;
-	cur_skey[1].sk_argument = v2;
-	cur_skey[2].sk_argument = v3;
-	cur_skey[3].sk_argument = v4;
-
 	/*
 	 * calculate the hash value
 	 */
-	return CatalogCacheComputeHashValue(cache, cache->cc_nkeys, cur_skey);
+	return CatalogCacheComputeHashValue(cache, cache->cc_nkeys, v1, v2, v3, v4);
 }
 
 
@@ -1317,6 +1512,11 @@ GetCatCacheHashValue(CatCache *cache,
  *		Generate a list of all tuples matching a partial key (that is,
  *		a key specifying just the first K of the cache's N key columns).
  *
+ *		It doesn't make any sense to specify all of the cache's key columns
+ *		here: since the key is unique, there could be at most one match, so
+ *		you ought to use SearchCatCache() instead.  Hence this function takes
+ *		one less Datum argument than SearchCatCache() does.
+ *
  *		The caller must not modify the list object or the pointed-to tuples,
  *		and must call ReleaseCatCacheList() when done with the list.
  */
@@ -1325,10 +1525,10 @@ SearchCatCacheList(CatCache *cache,
 				   int nkeys,
 				   Datum v1,
 				   Datum v2,
-				   Datum v3,
-				   Datum v4)
+				   Datum v3)
 {
-	ScanKeyData cur_skey[CATCACHE_MAXKEYS];
+	Datum		v4 = 0;			/* dummy last-column value */
+	Datum		arguments[CATCACHE_MAXKEYS];
 	uint32		lHashValue;
 	dlist_iter	iter;
 	CatCList   *cl;
@@ -1353,21 +1553,18 @@ SearchCatCacheList(CatCache *cache,
 	cache->cc_lsearches++;
 #endif
 
-	/*
-	 * initialize the search key information
-	 */
-	memcpy(cur_skey, cache->cc_skey, sizeof(cur_skey));
-	cur_skey[0].sk_argument = v1;
-	cur_skey[1].sk_argument = v2;
-	cur_skey[2].sk_argument = v3;
-	cur_skey[3].sk_argument = v4;
+	/* Initialize local parameter array */
+	arguments[0] = v1;
+	arguments[1] = v2;
+	arguments[2] = v3;
+	arguments[3] = v4;
 
 	/*
 	 * compute a hash value of the given keys for faster search.  We don't
 	 * presently divide the CatCList items into buckets, but this still lets
 	 * us skip non-matching items quickly most of the time.
 	 */
-	lHashValue = CatalogCacheComputeHashValue(cache, nkeys, cur_skey);
+	lHashValue = CatalogCacheComputeHashValue(cache, nkeys, v1, v2, v3, v4);
 
 	/*
 	 * scan the items until we find a match or exhaust our list
@@ -1377,8 +1574,6 @@ SearchCatCacheList(CatCache *cache,
 	 */
 	dlist_foreach(iter, &cache->cc_lists)
 	{
-		bool		res;
-
 		cl = dlist_container(CatCList, cache_elem, iter.cur);
 
 		if (cl->dead)
@@ -1392,12 +1587,8 @@ SearchCatCacheList(CatCache *cache,
 		 */
 		if (cl->nkeys != nkeys)
 			continue;
-		HeapKeyTest(&cl->tuple,
-					cache->cc_tupdesc,
-					nkeys,
-					cur_skey,
-					res);
-		if (!res)
+
+		if (!CatalogCacheCompareTuple(cache, nkeys, cl->keys, arguments))
 			continue;
 
 		/*
@@ -1440,9 +1631,20 @@ SearchCatCacheList(CatCache *cache,
 
 	PG_TRY();
 	{
+		ScanKeyData cur_skey[CATCACHE_MAXKEYS];
 		Relation	relation;
 		SysScanDesc scandesc;
 
+		/*
+		 * Ok, need to make a lookup in the relation, copy the scankey and
+		 * fill out any per-call fields.
+		 */
+		memcpy(cur_skey, cache->cc_skey, sizeof(ScanKeyData) * cache->cc_nkeys);
+		cur_skey[0].sk_argument = v1;
+		cur_skey[1].sk_argument = v2;
+		cur_skey[2].sk_argument = v3;
+		cur_skey[3].sk_argument = v4;
+
 		relation = heap_open(cache->cc_reloid, AccessShareLock);
 
 		scandesc = systable_beginscan(relation,
@@ -1466,7 +1668,7 @@ SearchCatCacheList(CatCache *cache,
 			 * See if there's an entry for this tuple already.
 			 */
 			ct = NULL;
-			hashValue = CatalogCacheComputeTupleHashValue(cache, ntp);
+			hashValue = CatalogCacheComputeTupleHashValue(cache, cache->cc_nkeys, ntp);
 			hashIndex = HASH_INDEX(hashValue, cache->cc_nbuckets);
 
 			bucket = &cache->cc_bucket[hashIndex];
@@ -1497,7 +1699,7 @@ SearchCatCacheList(CatCache *cache,
 			if (!found)
 			{
 				/* We didn't find a usable entry, so make a new one */
-				ct = CatalogCacheCreateEntry(cache, ntp,
+				ct = CatalogCacheCreateEntry(cache, ntp, arguments,
 											 hashValue, hashIndex,
 											 false);
 			}
@@ -1512,18 +1714,16 @@ SearchCatCacheList(CatCache *cache,
 
 		heap_close(relation, AccessShareLock);
 
-		/*
-		 * Now we can build the CatCList entry.  First we need a dummy tuple
-		 * containing the key values...
-		 */
-		ntp = build_dummy_tuple(cache, nkeys, cur_skey);
+		/* Now we can build the CatCList entry. */
 		oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
 		nmembers = list_length(ctlist);
 		cl = (CatCList *)
 			palloc(offsetof(CatCList, members) + nmembers * sizeof(CatCTup *));
-		heap_copytuple_with_tuple(ntp, &cl->tuple);
+
+		/* Extract key values */
+		CatCacheCopyKeys(cache->cc_tupdesc, nkeys, cache->cc_keyno,
+						 arguments, cl->keys);
 		MemoryContextSwitchTo(oldcxt);
-		heap_freetuple(ntp);
 
 		/*
 		 * We are now past the last thing that could trigger an elog before we
@@ -1620,35 +1820,80 @@ ReleaseCatCacheList(CatCList *list)
  *		supplied data into it.  The new entry initially has refcount 0.
  */
 static CatCTup *
-CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
-						uint32 hashValue, Index hashIndex, bool negative)
+CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp, Datum *arguments,
+						uint32 hashValue, Index hashIndex,
+						bool negative)
 {
 	CatCTup    *ct;
 	HeapTuple	dtp;
 	MemoryContext oldcxt;
 
-	/*
-	 * If there are any out-of-line toasted fields in the tuple, expand them
-	 * in-line.  This saves cycles during later use of the catcache entry, and
-	 * also protects us against the possibility of the toast tuples being
-	 * freed before we attempt to fetch them, in case of something using a
-	 * slightly stale catcache entry.
-	 */
-	if (HeapTupleHasExternal(ntp))
-		dtp = toast_flatten_tuple(ntp, cache->cc_tupdesc);
-	else
-		dtp = ntp;
+	/* negative entries have no tuple associated */
+	if (ntp)
+	{
+		int			i;
 
-	/*
-	 * Allocate CatCTup header in cache memory, and copy the tuple there too.
-	 */
-	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
-	ct = (CatCTup *) palloc(sizeof(CatCTup));
-	heap_copytuple_with_tuple(dtp, &ct->tuple);
-	MemoryContextSwitchTo(oldcxt);
+		Assert(!negative);
+
+		/*
+		 * If there are any out-of-line toasted fields in the tuple, expand
+		 * them in-line.  This saves cycles during later use of the catcache
+		 * entry, and also protects us against the possibility of the toast
+		 * tuples being freed before we attempt to fetch them, in case of
+		 * something using a slightly stale catcache entry.
+		 */
+		if (HeapTupleHasExternal(ntp))
+			dtp = toast_flatten_tuple(ntp, cache->cc_tupdesc);
+		else
+			dtp = ntp;
 
-	if (dtp != ntp)
-		heap_freetuple(dtp);
+		/* Allocate memory for CatCTup and the cached tuple in one go */
+		oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+
+		ct = (CatCTup *) palloc(sizeof(CatCTup) +
+								MAXIMUM_ALIGNOF + dtp->t_len);
+		ct->tuple.t_len = dtp->t_len;
+		ct->tuple.t_self = dtp->t_self;
+		ct->tuple.t_tableOid = dtp->t_tableOid;
+		ct->tuple.t_data = (HeapTupleHeader)
+			MAXALIGN(((char *) ct) + sizeof(CatCTup));
+		/* copy tuple contents */
+		memcpy((char *) ct->tuple.t_data,
+			   (const char *) dtp->t_data,
+			   dtp->t_len);
+		MemoryContextSwitchTo(oldcxt);
+
+		if (dtp != ntp)
+			heap_freetuple(dtp);
+
+		/* extract keys - they'll point into the tuple if not by-value */
+		for (i = 0; i < cache->cc_nkeys; i++)
+		{
+			Datum		atp;
+			bool		isnull;
+
+			atp = heap_getattr(&ct->tuple,
+							   cache->cc_keyno[i],
+							   cache->cc_tupdesc,
+							   &isnull);
+			Assert(!isnull);
+			ct->keys[i] = atp;
+		}
+	}
+	else
+	{
+		Assert(negative);
+		oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+		ct = (CatCTup *) palloc(sizeof(CatCTup));
+
+		/*
+		 * Store keys - they'll point into separately allocated memory if not
+		 * by-value.
+		 */
+		CatCacheCopyKeys(cache->cc_tupdesc, cache->cc_nkeys, cache->cc_keyno,
+						 arguments, ct->keys);
+		MemoryContextSwitchTo(oldcxt);
+	}
 
 	/*
 	 * Finish initializing the CatCTup header, and add it to the cache's
@@ -1678,71 +1923,80 @@ CatalogCacheCreateEntry(CatCache *cache, HeapTuple ntp,
 }
 
 /*
- * build_dummy_tuple
- *		Generate a palloc'd HeapTuple that contains the specified key
- *		columns, and NULLs for other columns.
- *
- * This is used to store the keys for negative cache entries and CatCList
- * entries, which don't have real tuples associated with them.
+ * Helper routine that frees keys stored in the keys array.
  */
-static HeapTuple
-build_dummy_tuple(CatCache *cache, int nkeys, ScanKey skeys)
+static void
+CatCacheFreeKeys(TupleDesc tupdesc, int nkeys, int *attnos, Datum *keys)
 {
-	HeapTuple	ntp;
-	TupleDesc	tupDesc = cache->cc_tupdesc;
-	Datum	   *values;
-	bool	   *nulls;
-	Oid			tupOid = InvalidOid;
-	NameData	tempNames[4];
 	int			i;
 
-	values = (Datum *) palloc(tupDesc->natts * sizeof(Datum));
-	nulls = (bool *) palloc(tupDesc->natts * sizeof(bool));
+	for (i = 0; i < nkeys; i++)
+	{
+		int			attnum = attnos[i];
+		Form_pg_attribute att;
+
+		/* only valid system attribute is the oid, which is by value */
+		if (attnum == ObjectIdAttributeNumber)
+			continue;
+		Assert(attnum > 0);
+
+		att = TupleDescAttr(tupdesc, attnum - 1);
+
+		if (!att->attbyval)
+			pfree(DatumGetPointer(keys[i]));
+	}
+}
+
+/*
+ * Helper routine that copies the keys in the srckeys array into the dstkeys
+ * one, guaranteeing that the datums are fully allocated in the current memory
+ * context.
+ */
+static void
+CatCacheCopyKeys(TupleDesc tupdesc, int nkeys, int *attnos,
+				 Datum *srckeys, Datum *dstkeys)
+{
+	int			i;
 
-	memset(values, 0, tupDesc->natts * sizeof(Datum));
-	memset(nulls, true, tupDesc->natts * sizeof(bool));
+	/*
+	 * XXX: memory and lookup performance could possibly be improved by
+	 * storing all keys in one allocation.
+	 */
 
 	for (i = 0; i < nkeys; i++)
 	{
-		int			attindex = cache->cc_key[i];
-		Datum		keyval = skeys[i].sk_argument;
+		int			attnum = attnos[i];
 
-		if (attindex > 0)
+		if (attnum == ObjectIdAttributeNumber)
+		{
+			dstkeys[i] = srckeys[i];
+		}
+		else
 		{
+			Form_pg_attribute att = TupleDescAttr(tupdesc, attnum - 1);
+			Datum		src = srckeys[i];
+			NameData	srcname;
+
 			/*
-			 * Here we must be careful in case the caller passed a C string
-			 * where a NAME is wanted: convert the given argument to a
-			 * correctly padded NAME.  Otherwise the memcpy() done in
-			 * heap_form_tuple could fall off the end of memory.
+			 * Must be careful in case the caller passed a C string where a
+			 * NAME is wanted: convert the given argument to a correctly
+			 * padded NAME.  Otherwise the memcpy() done by datumCopy() could
+			 * fall off the end of memory.
 			 */
-			if (cache->cc_isname[i])
+			if (att->atttypid == NAMEOID)
 			{
-				Name		newval = &tempNames[i];
-
-				namestrcpy(newval, DatumGetCString(keyval));
-				keyval = NameGetDatum(newval);
+				namestrcpy(&srcname, DatumGetCString(src));
+				src = NameGetDatum(&srcname);
 			}
-			values[attindex - 1] = keyval;
-			nulls[attindex - 1] = false;
-		}
-		else
-		{
-			Assert(attindex == ObjectIdAttributeNumber);
-			tupOid = DatumGetObjectId(keyval);
+
+			dstkeys[i] = datumCopy(src,
+								   att->attbyval,
+								   att->attlen);
 		}
 	}
 
-	ntp = heap_form_tuple(tupDesc, values, nulls);
-	if (tupOid != InvalidOid)
-		HeapTupleSetOid(ntp, tupOid);
-
-	pfree(values);
-	pfree(nulls);
-
-	return ntp;
 }
 
-
 /*
  *	PrepareToInvalidateCacheTuple()
  *
@@ -1819,7 +2073,7 @@ PrepareToInvalidateCacheTuple(Relation relation,
 		if (ccp->cc_tupdesc == NULL)
 			CatalogCacheInitializeCache(ccp);
 
-		hashvalue = CatalogCacheComputeTupleHashValue(ccp, tuple);
+		hashvalue = CatalogCacheComputeTupleHashValue(ccp, ccp->cc_nkeys, tuple);
 		dbid = ccp->cc_relisshared ? (Oid) 0 : MyDatabaseId;
 
 		(*function) (ccp->id, hashvalue, dbid);
@@ -1828,7 +2082,7 @@ PrepareToInvalidateCacheTuple(Relation relation,
 		{
 			uint32		newhashvalue;
 
-			newhashvalue = CatalogCacheComputeTupleHashValue(ccp, newtuple);
+			newhashvalue = CatalogCacheComputeTupleHashValue(ccp, ccp->cc_nkeys, newtuple);
 
 			if (newhashvalue != hashvalue)
 				(*function) (ccp->id, newhashvalue, dbid);
diff --git a/src/backend/utils/cache/evtcache.c b/src/backend/utils/cache/evtcache.c
index 6faf4ae354..7c014d6092 100644
--- a/src/backend/utils/cache/evtcache.c
+++ b/src/backend/utils/cache/evtcache.c
@@ -3,7 +3,7 @@
  * evtcache.c
  *	  Special-purpose cache for event trigger data.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/cache/inval.c b/src/backend/utils/cache/inval.c
index d0e54b8535..955f5c7fdc 100644
--- a/src/backend/utils/cache/inval.c
+++ b/src/backend/utils/cache/inval.c
@@ -85,7 +85,7 @@
  *	problems can be overcome cheaply.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -590,7 +590,7 @@ LocalExecuteInvalidationMessage(SharedInvalidationMessage *msg)
 			{
 				struct RELCACHECALLBACK *ccitem = relcache_callback_list + i;
 
-				(*ccitem->function) (ccitem->arg, msg->rc.relId);
+				ccitem->function(ccitem->arg, msg->rc.relId);
 			}
 		}
 	}
@@ -650,14 +650,14 @@ InvalidateSystemCaches(void)
 	{
 		struct SYSCACHECALLBACK *ccitem = syscache_callback_list + i;
 
-		(*ccitem->function) (ccitem->arg, ccitem->id, 0);
+		ccitem->function(ccitem->arg, ccitem->id, 0);
 	}
 
 	for (i = 0; i < relcache_callback_count; i++)
 	{
 		struct RELCACHECALLBACK *ccitem = relcache_callback_list + i;
 
-		(*ccitem->function) (ccitem->arg, InvalidOid);
+		ccitem->function(ccitem->arg, InvalidOid);
 	}
 }
 
@@ -1460,7 +1460,7 @@ CallSyscacheCallbacks(int cacheid, uint32 hashvalue)
 		struct SYSCACHECALLBACK *ccitem = syscache_callback_list + i;
 
 		Assert(ccitem->id == cacheid);
-		(*ccitem->function) (ccitem->arg, cacheid, hashvalue);
+		ccitem->function(ccitem->arg, cacheid, hashvalue);
 		i = ccitem->link - 1;
 	}
 }
diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c
index 82763f8013..51b6b4f7bb 100644
--- a/src/backend/utils/cache/lsyscache.c
+++ b/src/backend/utils/cache/lsyscache.c
@@ -3,7 +3,7 @@
  * lsyscache.c
  *	  Convenience routines for common queries in the system catalog cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -186,7 +186,7 @@ get_opfamily_member(Oid opfamily, Oid lefttype, Oid righttype,
  *		determine its opfamily, its declared input datatype, and its
  *		strategy number (BTLessStrategyNumber or BTGreaterStrategyNumber).
  *
- * Returns TRUE if successful, FALSE if no matching pg_amop entry exists.
+ * Returns true if successful, false if no matching pg_amop entry exists.
  * (This indicates that the operator is not a valid ordering operator.)
  *
  * Note: the operator could be registered in multiple families, for example
@@ -254,8 +254,8 @@ get_ordering_op_properties(Oid opno,
  *		Get the OID of the datatype-specific btree equality operator
  *		associated with an ordering operator (a "<" or ">" operator).
  *
- * If "reverse" isn't NULL, also set *reverse to FALSE if the operator is "<",
- * TRUE if it's ">"
+ * If "reverse" isn't NULL, also set *reverse to false if the operator is "<",
+ * true if it's ">"
  *
  * Returns InvalidOid if no matching equality operator can be found.
  * (This indicates that the operator is not a valid ordering operator.)
@@ -490,8 +490,8 @@ get_compatible_hash_operators(Oid opno,
 
 /*
  * get_op_hash_functions
- *		Get the OID(s) of hash support function(s) compatible with the given
- *		operator, operating on its LHS and/or RHS datatype as required.
+ *		Get the OID(s) of the standard hash support function(s) compatible with
+ *		the given operator, operating on its LHS and/or RHS datatype as required.
  *
  * A function for the LHS type is sought and returned into *lhs_procno if
  * lhs_procno isn't NULL.  Similarly, a function for the RHS type is sought
@@ -542,7 +542,7 @@ get_op_hash_functions(Oid opno,
 				*lhs_procno = get_opfamily_proc(aform->amopfamily,
 												aform->amoplefttype,
 												aform->amoplefttype,
-												HASHPROC);
+												HASHSTANDARD_PROC);
 				if (!OidIsValid(*lhs_procno))
 					continue;
 				/* Matching LHS found, done if caller doesn't want RHS */
@@ -564,7 +564,7 @@ get_op_hash_functions(Oid opno,
 				*rhs_procno = get_opfamily_proc(aform->amopfamily,
 												aform->amoprighttype,
 												aform->amoprighttype,
-												HASHPROC);
+												HASHSTANDARD_PROC);
 				if (!OidIsValid(*rhs_procno))
 				{
 					/* Forget any LHS function from this opfamily */
@@ -682,7 +682,7 @@ get_op_btree_interpretation(Oid opno)
 
 /*
  * equality_ops_are_compatible
- *		Return TRUE if the two given equality operators have compatible
+ *		Return true if the two given equality operators have compatible
  *		semantics.
  *
  * This is trivially true if they are the same operator.  Otherwise,
@@ -765,19 +765,19 @@ get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype, int16 procnum)
 
 /*
  * get_attname
- *		Given the relation id and the attribute number,
- *		return the "attname" field from the attribute relation.
+ *		Given the relation id and the attribute number, return the "attname"
+ *		field from the attribute relation as a palloc'ed string.
  *
- * Note: returns a palloc'd copy of the string, or NULL if no such attribute.
+ * If no such attribute exists and missing_ok is true, NULL is returned;
+ * otherwise a not-intended-for-user-consumption error is thrown.
  */
 char *
-get_attname(Oid relid, AttrNumber attnum)
+get_attname(Oid relid, AttrNumber attnum, bool missing_ok)
 {
 	HeapTuple	tp;
 
 	tp = SearchSysCache2(ATTNUM,
-						 ObjectIdGetDatum(relid),
-						 Int16GetDatum(attnum));
+						 ObjectIdGetDatum(relid), Int16GetDatum(attnum));
 	if (HeapTupleIsValid(tp))
 	{
 		Form_pg_attribute att_tup = (Form_pg_attribute) GETSTRUCT(tp);
@@ -787,26 +787,11 @@ get_attname(Oid relid, AttrNumber attnum)
 		ReleaseSysCache(tp);
 		return result;
 	}
-	else
-		return NULL;
-}
 
-/*
- * get_relid_attribute_name
- *
- * Same as above routine get_attname(), except that error
- * is handled by elog() instead of returning NULL.
- */
-char *
-get_relid_attribute_name(Oid relid, AttrNumber attnum)
-{
-	char	   *attname;
-
-	attname = get_attname(relid, attnum);
-	if (attname == NULL)
+	if (!missing_ok)
 		elog(ERROR, "cache lookup failed for attribute %d of relation %u",
 			 attnum, relid);
-	return attname;
+	return NULL;
 }
 
 /*
@@ -958,7 +943,7 @@ get_atttypetypmodcoll(Oid relid, AttrNumber attnum,
  * get_collation_name
  *		Returns the name of a given pg_collation entry.
  *
- * Returns a palloc'd copy of the string, or NULL if no such constraint.
+ * Returns a palloc'd copy of the string, or NULL if no such collation.
  *
  * NOTE: since collation name is not unique, be wary of code that uses this
  * for anything except preparing error messages.
@@ -1614,6 +1599,25 @@ func_parallel(Oid funcid)
 	return result;
 }
 
+/*
+ * get_func_isagg
+ *	   Given procedure id, return the function's proisagg field.
+ */
+bool
+get_func_isagg(Oid funcid)
+{
+	HeapTuple	tp;
+	bool		result;
+
+	tp = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid));
+	if (!HeapTupleIsValid(tp))
+		elog(ERROR, "cache lookup failed for function %u", funcid);
+
+	result = ((Form_pg_proc) GETSTRUCT(tp))->proisagg;
+	ReleaseSysCache(tp);
+	return result;
+}
+
 /*
  * get_func_leakproof
  *	   Given procedure id, return the function's leakproof field.
@@ -2398,12 +2402,26 @@ get_typtype(Oid typid)
  * type_is_rowtype
  *
  *		Convenience function to determine whether a type OID represents
- *		a "rowtype" type --- either RECORD or a named composite type.
+ *		a "rowtype" type --- either RECORD or a named composite type
+ *		(including a domain over a named composite type).
  */
 bool
 type_is_rowtype(Oid typid)
 {
-	return (typid == RECORDOID || get_typtype(typid) == TYPTYPE_COMPOSITE);
+	if (typid == RECORDOID)
+		return true;			/* easy case */
+	switch (get_typtype(typid))
+	{
+		case TYPTYPE_COMPOSITE:
+			return true;
+		case TYPTYPE_DOMAIN:
+			if (get_typtype(getBaseType(typid)) == TYPTYPE_COMPOSITE)
+				return true;
+			break;
+		default:
+			break;
+	}
+	return false;
 }
 
 /*
@@ -2854,7 +2872,7 @@ get_attavgwidth(Oid relid, AttrNumber attnum)
  * get_attstatsslot
  *
  *		Extract the contents of a "slot" of a pg_statistic tuple.
- *		Returns TRUE if requested slot type was found, else FALSE.
+ *		Returns true if requested slot type was found, else false.
  *
  * Unlike other routines in this file, this takes a pointer to an
  * already-looked-up tuple in the pg_statistic cache.  We do this since
@@ -2870,7 +2888,7 @@ get_attavgwidth(Oid relid, AttrNumber attnum)
  * reqop: STAOP value wanted, or InvalidOid if don't care.
  * flags: bitmask of ATTSTATSSLOT_VALUES and/or ATTSTATSSLOT_NUMBERS.
  *
- * If a matching slot is found, TRUE is returned, and *sslot is filled thus:
+ * If a matching slot is found, true is returned, and *sslot is filled thus:
  * staop: receives the actual STAOP value.
  * valuetype: receives actual datatype of the elements of stavalues.
  * values: receives pointer to an array of the slot's stavalues.
@@ -2882,7 +2900,7 @@ get_attavgwidth(Oid relid, AttrNumber attnum)
  * wasn't specified.  Likewise, numbers/nnumbers are NULL/0 if
  * ATTSTATSSLOT_NUMBERS wasn't specified.
  *
- * If no matching slot is found, FALSE is returned, and *sslot is zeroed.
+ * If no matching slot is found, false is returned, and *sslot is zeroed.
  *
  * The data referred to by the fields of sslot is locally palloc'd and
  * is independent of the original pg_statistic tuple.  When the caller
diff --git a/src/backend/utils/cache/plancache.c b/src/backend/utils/cache/plancache.c
index ad8a82f1e3..8d7d8e04c9 100644
--- a/src/backend/utils/cache/plancache.c
+++ b/src/backend/utils/cache/plancache.c
@@ -38,7 +38,7 @@
  * be infrequent enough that more-detailed tracking is not worth the effort.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -319,7 +319,7 @@ CreateOneShotCachedPlan(RawStmt *raw_parse_tree,
  * parserSetup: alternate method for handling query parameters
  * parserSetupArg: data to pass to parserSetup
  * cursor_options: options bitmask to pass to planner
- * fixed_result: TRUE to disallow future changes in query's result tupdesc
+ * fixed_result: true to disallow future changes in query's result tupdesc
  */
 void
 CompleteCachedPlan(CachedPlanSource *plansource,
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
index 2150fe9a39..1ebf9c4ed2 100644
--- a/src/backend/utils/cache/relcache.c
+++ b/src/backend/utils/cache/relcache.c
@@ -3,7 +3,7 @@
  * relcache.c
  *	  POSTGRES relation descriptor cache code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -30,6 +30,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 
+#include "access/hash.h"
 #include "access/htup_details.h"
 #include "access/multixact.h"
 #include "access/nbtree.h"
@@ -87,11 +88,6 @@
 #include "utils/tqual.h"
 
 
-/*
- *		name of relcache init file(s), used to speed up backend startup
- */
-#define RELCACHE_INIT_FILENAME	"pg_internal.init"
-
 #define RELCACHE_INIT_FILEMAGIC		0x573266	/* version ID value */
 
 /*
@@ -232,7 +228,7 @@ do { \
 typedef struct opclasscacheent
 {
 	Oid			opclassoid;		/* lookup key: OID of opclass */
-	bool		valid;			/* set TRUE after successful fill-in */
+	bool		valid;			/* set true after successful fill-in */
 	StrategyNumber numSupport;	/* max # of support procs (from pg_am) */
 	Oid			opcfamily;		/* OID of opclass's family */
 	Oid			opcintype;		/* OID of opclass's declared input type */
@@ -266,7 +262,6 @@ static Relation AllocateRelationDesc(Form_pg_class relp);
 static void RelationParseRelOptions(Relation relation, HeapTuple tuple);
 static void RelationBuildTupleDesc(Relation relation);
 static void RelationBuildPartitionKey(Relation relation);
-static PartitionKey copy_partition_key(PartitionKey fromkey);
 static Relation RelationBuildDesc(Oid targetRelId, bool insertIt);
 static void RelationInitPhysicalAddr(Relation relation);
 static void load_critical_index(Oid indexoid, Oid heapoid);
@@ -435,18 +430,26 @@ static void
 RelationParseRelOptions(Relation relation, HeapTuple tuple)
 {
 	bytea	   *options;
+	amoptions_function amoptsfn;
 
 	relation->rd_options = NULL;
 
-	/* Fall out if relkind should not have options */
+	/*
+	 * Look up any AM-specific parse function; fall out if relkind should not
+	 * have options.
+	 */
 	switch (relation->rd_rel->relkind)
 	{
 		case RELKIND_RELATION:
 		case RELKIND_TOASTVALUE:
-		case RELKIND_INDEX:
 		case RELKIND_VIEW:
 		case RELKIND_MATVIEW:
 		case RELKIND_PARTITIONED_TABLE:
+			amoptsfn = NULL;
+			break;
+		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
+			amoptsfn = relation->rd_amroutine->amoptions;
 			break;
 		default:
 			return;
@@ -457,10 +460,7 @@ RelationParseRelOptions(Relation relation, HeapTuple tuple)
 	 * we might not have any other for pg_class yet (consider executing this
 	 * code for pg_class itself)
 	 */
-	options = extractRelOptions(tuple,
-								GetPgClassDescriptor(),
-								relation->rd_rel->relkind == RELKIND_INDEX ?
-								relation->rd_amroutine->amoptions : NULL);
+	options = extractRelOptions(tuple, GetPgClassDescriptor(), amoptsfn);
 
 	/*
 	 * Copy parsed data into CacheMemoryContext.  To guard against the
@@ -546,7 +546,7 @@ RelationBuildTupleDesc(Relation relation)
 			elog(ERROR, "invalid attribute number %d for %s",
 				 attp->attnum, RelationGetRelationName(relation));
 
-		memcpy(relation->rd_att->attrs[attp->attnum - 1],
+		memcpy(TupleDescAttr(relation->rd_att, attp->attnum - 1),
 			   attp,
 			   ATTRIBUTE_FIXED_PART_SIZE);
 
@@ -590,7 +590,7 @@ RelationBuildTupleDesc(Relation relation)
 		int			i;
 
 		for (i = 0; i < relation->rd_rel->relnatts; i++)
-			Assert(relation->rd_att->attrs[i]->attcacheoff == -1);
+			Assert(TupleDescAttr(relation->rd_att, i)->attcacheoff == -1);
 	}
 #endif
 
@@ -600,7 +600,7 @@ RelationBuildTupleDesc(Relation relation)
 	 * for attnum=1 that used to exist in fastgetattr() and index_getattr().
 	 */
 	if (relation->rd_rel->relnatts > 0)
-		relation->rd_att->attrs[0]->attcacheoff = 0;
+		TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0;
 
 	/*
 	 * Set up constraint/default info
@@ -673,9 +673,10 @@ RelationBuildRuleLock(Relation relation)
 	/*
 	 * Make the private context.  Assume it'll not contain much data.
 	 */
-	rulescxt = AllocSetContextCreate(CacheMemoryContext,
-									 RelationGetRelationName(relation),
-									 ALLOCSET_SMALL_SIZES);
+	rulescxt = AllocSetContextCreateExtended(CacheMemoryContext,
+											 RelationGetRelationName(relation),
+											 MEMCONTEXT_COPY_NAME,
+											 ALLOCSET_SMALL_SIZES);
 	relation->rd_rulescxt = rulescxt;
 
 	/*
@@ -811,17 +812,16 @@ RelationBuildRuleLock(Relation relation)
  * RelationBuildPartitionKey
  *		Build and attach to relcache partition key data of relation
  *
- * Partitioning key data is stored in CacheMemoryContext to ensure it survives
- * as long as the relcache.  To avoid leaking memory in that context in case
- * of an error partway through this function, we build the structure in the
- * working context (which must be short-lived) and copy the completed
- * structure into the cache memory.
- *
- * Also, since the structure being created here is sufficiently complex, we
- * make a private child context of CacheMemoryContext for each relation that
- * has associated partition key information.  That means no complicated logic
- * to free individual elements whenever the relcache entry is flushed - just
- * delete the context.
+ * Partitioning key data is a complex structure; to avoid complicated logic to
+ * free individual elements whenever the relcache entry is flushed, we give it
+ * its own memory context, child of CacheMemoryContext, which can easily be
+ * deleted on its own.  To avoid leaking memory in that context in case of an
+ * error partway through this function, the context is initially created as a
+ * child of CurTransactionContext and only re-parented to CacheMemoryContext
+ * at the end, when no further errors are possible.  Also, we don't make this
+ * context the current context except in very brief code sections, out of fear
+ * that some of our callees allocate memory on their own which would be leaked
+ * permanently.
  */
 static void
 RelationBuildPartitionKey(Relation relation)
@@ -838,6 +838,7 @@ RelationBuildPartitionKey(Relation relation)
 	Datum		datum;
 	MemoryContext partkeycxt,
 				oldcxt;
+	int16		procnum;
 
 	tuple = SearchSysCache1(PARTRELID,
 							ObjectIdGetDatum(RelationGetRelid(relation)));
@@ -849,7 +850,13 @@ RelationBuildPartitionKey(Relation relation)
 	if (!HeapTupleIsValid(tuple))
 		return;
 
-	key = (PartitionKey) palloc0(sizeof(PartitionKeyData));
+	partkeycxt = AllocSetContextCreateExtended(CurTransactionContext,
+											   RelationGetRelationName(relation),
+											   MEMCONTEXT_COPY_NAME,
+											   ALLOCSET_SMALL_SIZES);
+
+	key = (PartitionKey) MemoryContextAllocZero(partkeycxt,
+												sizeof(PartitionKeyData));
 
 	/* Fixed-length attributes */
 	form = (Form_pg_partitioned_table) GETSTRUCT(tuple);
@@ -891,17 +898,20 @@ RelationBuildPartitionKey(Relation relation)
 		/*
 		 * Run the expressions through const-simplification since the planner
 		 * will be comparing them to similarly-processed qual clause operands,
-		 * and may fail to detect valid matches without this step.  We don't
-		 * need to bother with canonicalize_qual() though, because partition
-		 * expressions are not full-fledged qualification clauses.
+		 * and may fail to detect valid matches without this step; fix
+		 * opfuncids while at it.  We don't need to bother with
+		 * canonicalize_qual() though, because partition expressions are not
+		 * full-fledged qualification clauses.
 		 */
-		expr = eval_const_expressions(NULL, (Node *) expr);
+		expr = eval_const_expressions(NULL, expr);
+		fix_opfuncids(expr);
 
-		/* May as well fix opfuncids too */
-		fix_opfuncids((Node *) expr);
-		key->partexprs = (List *) expr;
+		oldcxt = MemoryContextSwitchTo(partkeycxt);
+		key->partexprs = (List *) copyObject(expr);
+		MemoryContextSwitchTo(oldcxt);
 	}
 
+	oldcxt = MemoryContextSwitchTo(partkeycxt);
 	key->partattrs = (AttrNumber *) palloc0(key->partnatts * sizeof(AttrNumber));
 	key->partopfamily = (Oid *) palloc0(key->partnatts * sizeof(Oid));
 	key->partopcintype = (Oid *) palloc0(key->partnatts * sizeof(Oid));
@@ -916,6 +926,11 @@ RelationBuildPartitionKey(Relation relation)
 	key->parttypbyval = (bool *) palloc0(key->partnatts * sizeof(bool));
 	key->parttypalign = (char *) palloc0(key->partnatts * sizeof(char));
 	key->parttypcoll = (Oid *) palloc0(key->partnatts * sizeof(Oid));
+	MemoryContextSwitchTo(oldcxt);
+
+	/* determine support function number to search for */
+	procnum = (key->strategy == PARTITION_STRATEGY_HASH) ?
+		HASHEXTENDED_PROC : BTORDER_PROC;
 
 	/* Copy partattrs and fill other per-attribute info */
 	memcpy(key->partattrs, attrs, key->partnatts * sizeof(int16));
@@ -937,18 +952,20 @@ RelationBuildPartitionKey(Relation relation)
 		key->partopfamily[i] = opclassform->opcfamily;
 		key->partopcintype[i] = opclassform->opcintype;
 
-		/*
-		 * A btree support function covers the cases of list and range methods
-		 * currently supported.
-		 */
+		/* Get a support function for the specified opfamily and datatypes */
 		funcid = get_opfamily_proc(opclassform->opcfamily,
 								   opclassform->opcintype,
 								   opclassform->opcintype,
-								   BTORDER_PROC);
-		if (!OidIsValid(funcid))	/* should not happen */
-			elog(ERROR, "missing support function %d(%u,%u) in opfamily %u",
-				 BTORDER_PROC, opclassform->opcintype, opclassform->opcintype,
-				 opclassform->opcfamily);
+								   procnum);
+		if (!OidIsValid(funcid))
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
+					 errmsg("operator class \"%s\" of access method %s is missing support function %d for type %s",
+							NameStr(opclassform->opcname),
+							(key->strategy == PARTITION_STRATEGY_HASH) ?
+							"hash" : "btree",
+							procnum,
+							format_type_be(opclassform->opcintype))));
 
 		fmgr_info(funcid, &key->partsupfunc[i]);
 
@@ -958,15 +975,22 @@ RelationBuildPartitionKey(Relation relation)
 		/* Collect type information */
 		if (attno != 0)
 		{
-			key->parttypid[i] = relation->rd_att->attrs[attno - 1]->atttypid;
-			key->parttypmod[i] = relation->rd_att->attrs[attno - 1]->atttypmod;
-			key->parttypcoll[i] = relation->rd_att->attrs[attno - 1]->attcollation;
+			Form_pg_attribute att = TupleDescAttr(relation->rd_att, attno - 1);
+
+			key->parttypid[i] = att->atttypid;
+			key->parttypmod[i] = att->atttypmod;
+			key->parttypcoll[i] = att->attcollation;
 		}
 		else
 		{
+			if (partexprs_item == NULL)
+				elog(ERROR, "wrong number of partition key expressions");
+
 			key->parttypid[i] = exprType(lfirst(partexprs_item));
 			key->parttypmod[i] = exprTypmod(lfirst(partexprs_item));
 			key->parttypcoll[i] = exprCollation(lfirst(partexprs_item));
+
+			partexprs_item = lnext(partexprs_item);
 		}
 		get_typlenbyvalalign(key->parttypid[i],
 							 &key->parttyplen[i],
@@ -978,68 +1002,13 @@ RelationBuildPartitionKey(Relation relation)
 
 	ReleaseSysCache(tuple);
 
-	/* Success --- now copy to the cache memory */
-	partkeycxt = AllocSetContextCreate(CacheMemoryContext,
-									   RelationGetRelationName(relation),
-									   ALLOCSET_SMALL_SIZES);
+	/*
+	 * Success --- reparent our context and make the relcache point to the
+	 * newly constructed key
+	 */
+	MemoryContextSetParent(partkeycxt, CacheMemoryContext);
 	relation->rd_partkeycxt = partkeycxt;
-	oldcxt = MemoryContextSwitchTo(relation->rd_partkeycxt);
-	relation->rd_partkey = copy_partition_key(key);
-	MemoryContextSwitchTo(oldcxt);
-}
-
-/*
- * copy_partition_key
- *
- * The copy is allocated in the current memory context.
- */
-static PartitionKey
-copy_partition_key(PartitionKey fromkey)
-{
-	PartitionKey newkey;
-	int			n;
-
-	newkey = (PartitionKey) palloc(sizeof(PartitionKeyData));
-
-	newkey->strategy = fromkey->strategy;
-	newkey->partnatts = n = fromkey->partnatts;
-
-	newkey->partattrs = (AttrNumber *) palloc(n * sizeof(AttrNumber));
-	memcpy(newkey->partattrs, fromkey->partattrs, n * sizeof(AttrNumber));
-
-	newkey->partexprs = copyObject(fromkey->partexprs);
-
-	newkey->partopfamily = (Oid *) palloc(n * sizeof(Oid));
-	memcpy(newkey->partopfamily, fromkey->partopfamily, n * sizeof(Oid));
-
-	newkey->partopcintype = (Oid *) palloc(n * sizeof(Oid));
-	memcpy(newkey->partopcintype, fromkey->partopcintype, n * sizeof(Oid));
-
-	newkey->partsupfunc = (FmgrInfo *) palloc(n * sizeof(FmgrInfo));
-	memcpy(newkey->partsupfunc, fromkey->partsupfunc, n * sizeof(FmgrInfo));
-
-	newkey->partcollation = (Oid *) palloc(n * sizeof(Oid));
-	memcpy(newkey->partcollation, fromkey->partcollation, n * sizeof(Oid));
-
-	newkey->parttypid = (Oid *) palloc(n * sizeof(Oid));
-	memcpy(newkey->parttypid, fromkey->parttypid, n * sizeof(Oid));
-
-	newkey->parttypmod = (int32 *) palloc(n * sizeof(int32));
-	memcpy(newkey->parttypmod, fromkey->parttypmod, n * sizeof(int32));
-
-	newkey->parttyplen = (int16 *) palloc(n * sizeof(int16));
-	memcpy(newkey->parttyplen, fromkey->parttyplen, n * sizeof(int16));
-
-	newkey->parttypbyval = (bool *) palloc(n * sizeof(bool));
-	memcpy(newkey->parttypbyval, fromkey->parttypbyval, n * sizeof(bool));
-
-	newkey->parttypalign = (char *) palloc(n * sizeof(bool));
-	memcpy(newkey->parttypalign, fromkey->parttypalign, n * sizeof(char));
-
-	newkey->parttypcoll = (Oid *) palloc(n * sizeof(Oid));
-	memcpy(newkey->parttypcoll, fromkey->parttypcoll, n * sizeof(Oid));
-
-	return newkey;
+	relation->rd_partkey = key;
 }
 
 /*
@@ -1561,9 +1530,10 @@ RelationInitIndexAccessInfo(Relation relation)
 	 * a context, and not just a couple of pallocs, is so that we won't leak
 	 * any subsidiary info attached to fmgr lookup records.
 	 */
-	indexcxt = AllocSetContextCreate(CacheMemoryContext,
-									 RelationGetRelationName(relation),
-									 ALLOCSET_SMALL_SIZES);
+	indexcxt = AllocSetContextCreateExtended(CacheMemoryContext,
+											 RelationGetRelationName(relation),
+											 MEMCONTEXT_COPY_NAME,
+											 ALLOCSET_SMALL_SIZES);
 	relation->rd_indexcxt = indexcxt;
 
 	/*
@@ -1977,16 +1947,16 @@ formrdesc(const char *relationName, Oid relationReltype,
 	has_not_null = false;
 	for (i = 0; i < natts; i++)
 	{
-		memcpy(relation->rd_att->attrs[i],
+		memcpy(TupleDescAttr(relation->rd_att, i),
 			   &attrs[i],
 			   ATTRIBUTE_FIXED_PART_SIZE);
 		has_not_null |= attrs[i].attnotnull;
 		/* make sure attcacheoff is valid */
-		relation->rd_att->attrs[i]->attcacheoff = -1;
+		TupleDescAttr(relation->rd_att, i)->attcacheoff = -1;
 	}
 
 	/* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */
-	relation->rd_att->attrs[0]->attcacheoff = 0;
+	TupleDescAttr(relation->rd_att, 0)->attcacheoff = 0;
 
 	/* mark not-null status */
 	if (has_not_null)
@@ -2000,7 +1970,7 @@ formrdesc(const char *relationName, Oid relationReltype,
 	/*
 	 * initialize relation id from info in att array (my, this is ugly)
 	 */
-	RelationGetRelid(relation) = relation->rd_att->attrs[0]->attrelid;
+	RelationGetRelid(relation) = TupleDescAttr(relation->rd_att, 0)->attrelid;
 
 	/*
 	 * All relations made with formrdesc are mapped.  This is necessarily so
@@ -2093,7 +2063,8 @@ RelationIdGetRelation(Oid relationId)
 			 * and we don't want to use the full-blown procedure because it's
 			 * a headache for indexes that reload itself depends on.
 			 */
-			if (rd->rd_rel->relkind == RELKIND_INDEX)
+			if (rd->rd_rel->relkind == RELKIND_INDEX ||
+				rd->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 				RelationReloadIndexInfo(rd);
 			else
 				RelationClearRelation(rd, true);
@@ -2207,7 +2178,8 @@ RelationReloadIndexInfo(Relation relation)
 	Form_pg_class relp;
 
 	/* Should be called only for invalidated indexes */
-	Assert(relation->rd_rel->relkind == RELKIND_INDEX &&
+	Assert((relation->rd_rel->relkind == RELKIND_INDEX ||
+			relation->rd_rel->relkind == RELKIND_PARTITIONED_INDEX) &&
 		   !relation->rd_isvalid);
 
 	/* Ensure it's closed at smgr level */
@@ -2427,7 +2399,8 @@ RelationClearRelation(Relation relation, bool rebuild)
 	{
 		RelationInitPhysicalAddr(relation);
 
-		if (relation->rd_rel->relkind == RELKIND_INDEX)
+		if (relation->rd_rel->relkind == RELKIND_INDEX ||
+			relation->rd_rel->relkind == RELKIND_PARTITIONED_INDEX)
 		{
 			relation->rd_isvalid = false;	/* needs to be revalidated */
 			if (relation->rd_refcnt > 1 && IsTransactionState())
@@ -2443,7 +2416,8 @@ RelationClearRelation(Relation relation, bool rebuild)
 	 * re-read the pg_class row to handle possible physical relocation of the
 	 * index, and we check for pg_index updates too.
 	 */
-	if (relation->rd_rel->relkind == RELKIND_INDEX &&
+	if ((relation->rd_rel->relkind == RELKIND_INDEX ||
+		 relation->rd_rel->relkind == RELKIND_PARTITIONED_INDEX) &&
 		relation->rd_refcnt > 0 &&
 		relation->rd_indexcxt != NULL)
 	{
@@ -2551,7 +2525,7 @@ RelationClearRelation(Relation relation, bool rebuild)
 
 			/*
 			 * This shouldn't happen as dropping a relation is intended to be
-			 * impossible if still referenced (c.f. CheckTableNotInUse()). But
+			 * impossible if still referenced (cf. CheckTableNotInUse()). But
 			 * if we get here anyway, we can't just delete the relcache entry,
 			 * as it possibly could get accessed later (as e.g. the error
 			 * might get trapped and handled via a subtransaction rollback).
@@ -3274,9 +3248,12 @@ RelationBuildLocalRelation(const char *relname,
 	has_not_null = false;
 	for (i = 0; i < natts; i++)
 	{
-		rel->rd_att->attrs[i]->attidentity = tupDesc->attrs[i]->attidentity;
-		rel->rd_att->attrs[i]->attnotnull = tupDesc->attrs[i]->attnotnull;
-		has_not_null |= tupDesc->attrs[i]->attnotnull;
+		Form_pg_attribute satt = TupleDescAttr(tupDesc, i);
+		Form_pg_attribute datt = TupleDescAttr(rel->rd_att, i);
+
+		datt->attidentity = satt->attidentity;
+		datt->attnotnull = satt->attnotnull;
+		has_not_null |= satt->attnotnull;
 	}
 
 	if (has_not_null)
@@ -3346,7 +3323,7 @@ RelationBuildLocalRelation(const char *relname,
 	RelationGetRelid(rel) = relid;
 
 	for (i = 0; i < natts; i++)
-		rel->rd_att->attrs[i]->attrelid = relid;
+		TupleDescAttr(rel->rd_att, i)->attrelid = relid;
 
 	rel->rd_rel->reltablespace = reltablespace;
 
@@ -3971,13 +3948,13 @@ BuildHardcodedDescriptor(int natts, const FormData_pg_attribute *attrs,
 
 	for (i = 0; i < natts; i++)
 	{
-		memcpy(result->attrs[i], &attrs[i], ATTRIBUTE_FIXED_PART_SIZE);
+		memcpy(TupleDescAttr(result, i), &attrs[i], ATTRIBUTE_FIXED_PART_SIZE);
 		/* make sure attcacheoff is valid */
-		result->attrs[i]->attcacheoff = -1;
+		TupleDescAttr(result, i)->attcacheoff = -1;
 	}
 
 	/* initialize first attribute's attcacheoff, cf RelationBuildTupleDesc */
-	result->attrs[0]->attcacheoff = 0;
+	TupleDescAttr(result, 0)->attcacheoff = 0;
 
 	/* Note: we don't bother to set up a TupleConstr entry */
 
@@ -4044,6 +4021,7 @@ AttrDefaultFetch(Relation relation)
 	while (HeapTupleIsValid(htup = systable_getnext(adscan)))
 	{
 		Form_pg_attrdef adform = (Form_pg_attrdef) GETSTRUCT(htup);
+		Form_pg_attribute attr = TupleDescAttr(relation->rd_att, adform->adnum - 1);
 
 		for (i = 0; i < ndef; i++)
 		{
@@ -4051,7 +4029,7 @@ AttrDefaultFetch(Relation relation)
 				continue;
 			if (attrdef[i].adbin != NULL)
 				elog(WARNING, "multiple attrdef records found for attr %s of rel %s",
-					 NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname),
+					 NameStr(attr->attname),
 					 RelationGetRelationName(relation));
 			else
 				found++;
@@ -4061,7 +4039,7 @@ AttrDefaultFetch(Relation relation)
 							  adrel->rd_att, &isnull);
 			if (isnull)
 				elog(WARNING, "null adbin for attr %s of rel %s",
-					 NameStr(relation->rd_att->attrs[adform->adnum - 1]->attname),
+					 NameStr(attr->attname),
 					 RelationGetRelationName(relation));
 			else
 			{
@@ -5270,9 +5248,9 @@ errtablecol(Relation rel, int attnum)
 
 	/* Use reldesc if it's a user attribute, else consult the catalogs */
 	if (attnum > 0 && attnum <= reldesc->natts)
-		colname = NameStr(reldesc->attrs[attnum - 1]->attname);
+		colname = NameStr(TupleDescAttr(reldesc, attnum - 1)->attname);
 	else
-		colname = get_relid_attribute_name(RelationGetRelid(rel), attnum);
+		colname = get_attname(RelationGetRelid(rel), attnum, false);
 
 	return errtablecolname(rel, colname);
 }
@@ -5357,9 +5335,9 @@ errtableconstraint(Relation rel, const char *conname)
  * load_relcache_init_file -- attempt to load cache from the shared
  * or local cache init file
  *
- * If successful, return TRUE and set criticalRelcachesBuilt or
+ * If successful, return true and set criticalRelcachesBuilt or
  * criticalSharedRelcachesBuilt to true.
- * If not successful, return FALSE.
+ * If not successful, return false.
  *
  * NOTE: we assume we are already switched into CacheMemoryContext.
  */
@@ -5460,14 +5438,16 @@ load_relcache_init_file(bool shared)
 		has_not_null = false;
 		for (i = 0; i < relform->relnatts; i++)
 		{
+			Form_pg_attribute attr = TupleDescAttr(rel->rd_att, i);
+
 			if (fread(&len, 1, sizeof(len), fp) != sizeof(len))
 				goto read_failed;
 			if (len != ATTRIBUTE_FIXED_PART_SIZE)
 				goto read_failed;
-			if (fread(rel->rd_att->attrs[i], 1, len, fp) != len)
+			if (fread(attr, 1, len, fp) != len)
 				goto read_failed;
 
-			has_not_null |= rel->rd_att->attrs[i]->attnotnull;
+			has_not_null |= attr->attnotnull;
 		}
 
 		/* next read the access method specific field */
@@ -5495,7 +5475,10 @@ load_relcache_init_file(bool shared)
 			rel->rd_att->constr = constr;
 		}
 
-		/* If it's an index, there's more to do */
+		/*
+		 * If it's an index, there's more to do.  Note we explicitly ignore
+		 * partitioned indexes here.
+		 */
 		if (rel->rd_rel->relkind == RELKIND_INDEX)
 		{
 			MemoryContext indexcxt;
@@ -5526,9 +5509,11 @@ load_relcache_init_file(bool shared)
 			 * prepare index info context --- parameters should match
 			 * RelationInitIndexAccessInfo
 			 */
-			indexcxt = AllocSetContextCreate(CacheMemoryContext,
-											 RelationGetRelationName(rel),
-											 ALLOCSET_SMALL_SIZES);
+			indexcxt =
+				AllocSetContextCreateExtended(CacheMemoryContext,
+											  RelationGetRelationName(rel),
+											  MEMCONTEXT_COPY_NAME,
+											  ALLOCSET_SMALL_SIZES);
 			rel->rd_indexcxt = indexcxt;
 
 			/*
@@ -5848,7 +5833,8 @@ write_relcache_init_file(bool shared)
 		/* next, do all the attribute tuple form data entries */
 		for (i = 0; i < relform->relnatts; i++)
 		{
-			write_item(rel->rd_att->attrs[i], ATTRIBUTE_FIXED_PART_SIZE, fp);
+			write_item(TupleDescAttr(rel->rd_att, i),
+					   ATTRIBUTE_FIXED_PART_SIZE, fp);
 		}
 
 		/* next, do the access method specific field */
@@ -5856,7 +5842,10 @@ write_relcache_init_file(bool shared)
 				   (rel->rd_options ? VARSIZE(rel->rd_options) : 0),
 				   fp);
 
-		/* If it's an index, there's more to do */
+		/*
+		 * If it's an index, there's more to do. Note we explicitly ignore
+		 * partitioned indexes here.
+		 */
 		if (rel->rd_rel->relkind == RELKIND_INDEX)
 		{
 			/* write the pg_index tuple */
@@ -6107,14 +6096,8 @@ RelationCacheInitFileRemove(void)
 
 	/* Scan the tablespace link directory to find non-default tablespaces */
 	dir = AllocateDir(tblspcdir);
-	if (dir == NULL)
-	{
-		elog(LOG, "could not open tablespace link directory \"%s\": %m",
-			 tblspcdir);
-		return;
-	}
 
-	while ((de = ReadDir(dir, tblspcdir)) != NULL)
+	while ((de = ReadDirExtended(dir, tblspcdir, LOG)) != NULL)
 	{
 		if (strspn(de->d_name, "0123456789") == strlen(de->d_name))
 		{
@@ -6138,14 +6121,8 @@ RelationCacheInitFileRemoveInDir(const char *tblspcpath)
 
 	/* Scan the tablespace directory to find per-database directories */
 	dir = AllocateDir(tblspcpath);
-	if (dir == NULL)
-	{
-		elog(LOG, "could not open tablespace directory \"%s\": %m",
-			 tblspcpath);
-		return;
-	}
 
-	while ((de = ReadDir(dir, tblspcpath)) != NULL)
+	while ((de = ReadDirExtended(dir, tblspcpath, LOG)) != NULL)
 	{
 		if (strspn(de->d_name, "0123456789") == strlen(de->d_name))
 		{
diff --git a/src/backend/utils/cache/relfilenodemap.c b/src/backend/utils/cache/relfilenodemap.c
index 3e811e1c9b..db6bb1c1fd 100644
--- a/src/backend/utils/cache/relfilenodemap.c
+++ b/src/backend/utils/cache/relfilenodemap.c
@@ -3,7 +3,7 @@
  * relfilenodemap.c
  *	  relfilenode to oid mapping cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/cache/relmapper.c b/src/backend/utils/cache/relmapper.c
index f5394dc43d..99d095f2df 100644
--- a/src/backend/utils/cache/relmapper.c
+++ b/src/backend/utils/cache/relmapper.c
@@ -28,7 +28,7 @@
  * all these files commit in a single map file update rather than being tied
  * to transaction commit.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -644,8 +644,7 @@ load_relmap_file(bool shared)
 	}
 
 	/* Read data ... */
-	fd = OpenTransientFile(mapfilename,
-						   O_RDONLY | PG_BINARY, S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(mapfilename, O_RDONLY | PG_BINARY);
 	if (fd < 0)
 		ereport(FATAL,
 				(errcode_for_file_access(),
@@ -694,13 +693,13 @@ load_relmap_file(bool shared)
  * The magic number and CRC are automatically updated in *newmap.  On
  * success, we copy the data to the appropriate permanent static variable.
  *
- * If write_wal is TRUE then an appropriate WAL message is emitted.
+ * If write_wal is true then an appropriate WAL message is emitted.
  * (It will be false for bootstrap and WAL replay cases.)
  *
- * If send_sinval is TRUE then a SI invalidation message is sent.
+ * If send_sinval is true then a SI invalidation message is sent.
  * (This should be true except in bootstrap case.)
  *
- * If preserve_files is TRUE then the storage manager is warned not to
+ * If preserve_files is true then the storage manager is warned not to
  * delete the files listed in the map.
  *
  * Because this may be called during WAL replay when MyDatabaseId,
@@ -745,9 +744,7 @@ write_relmap_file(bool shared, RelMapFile *newmap,
 		realmap = &local_map;
 	}
 
-	fd = OpenTransientFile(mapfilename,
-						   O_WRONLY | O_CREAT | PG_BINARY,
-						   S_IRUSR | S_IWUSR);
+	fd = OpenTransientFile(mapfilename, O_WRONLY | O_CREAT | PG_BINARY);
 	if (fd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
diff --git a/src/backend/utils/cache/spccache.c b/src/backend/utils/cache/spccache.c
index eafc00f9ea..3be8657639 100644
--- a/src/backend/utils/cache/spccache.c
+++ b/src/backend/utils/cache/spccache.c
@@ -8,7 +8,7 @@
  * be a measurable performance gain from doing this, but that might change
  * in the future as we add more options.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/cache/syscache.c b/src/backend/utils/cache/syscache.c
index 607fe9db79..2b381782a3 100644
--- a/src/backend/utils/cache/syscache.c
+++ b/src/backend/utils/cache/syscache.c
@@ -3,7 +3,7 @@
  * syscache.c
  *	  System cache management routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1102,13 +1102,56 @@ SearchSysCache(int cacheId,
 			   Datum key3,
 			   Datum key4)
 {
-	if (cacheId < 0 || cacheId >= SysCacheSize ||
-		!PointerIsValid(SysCache[cacheId]))
-		elog(ERROR, "invalid cache ID: %d", cacheId);
+	Assert(cacheId >= 0 && cacheId < SysCacheSize &&
+		   PointerIsValid(SysCache[cacheId]));
 
 	return SearchCatCache(SysCache[cacheId], key1, key2, key3, key4);
 }
 
+HeapTuple
+SearchSysCache1(int cacheId,
+				Datum key1)
+{
+	Assert(cacheId >= 0 && cacheId < SysCacheSize &&
+		   PointerIsValid(SysCache[cacheId]));
+	Assert(SysCache[cacheId]->cc_nkeys == 1);
+
+	return SearchCatCache1(SysCache[cacheId], key1);
+}
+
+HeapTuple
+SearchSysCache2(int cacheId,
+				Datum key1, Datum key2)
+{
+	Assert(cacheId >= 0 && cacheId < SysCacheSize &&
+		   PointerIsValid(SysCache[cacheId]));
+	Assert(SysCache[cacheId]->cc_nkeys == 2);
+
+	return SearchCatCache2(SysCache[cacheId], key1, key2);
+}
+
+HeapTuple
+SearchSysCache3(int cacheId,
+				Datum key1, Datum key2, Datum key3)
+{
+	Assert(cacheId >= 0 && cacheId < SysCacheSize &&
+		   PointerIsValid(SysCache[cacheId]));
+	Assert(SysCache[cacheId]->cc_nkeys == 3);
+
+	return SearchCatCache3(SysCache[cacheId], key1, key2, key3);
+}
+
+HeapTuple
+SearchSysCache4(int cacheId,
+				Datum key1, Datum key2, Datum key3, Datum key4)
+{
+	Assert(cacheId >= 0 && cacheId < SysCacheSize &&
+		   PointerIsValid(SysCache[cacheId]));
+	Assert(SysCache[cacheId]->cc_nkeys == 4);
+
+	return SearchCatCache4(SysCache[cacheId], key1, key2, key3, key4);
+}
+
 /*
  * ReleaseSysCache
  *		Release previously grabbed reference count on a tuple
@@ -1256,6 +1299,52 @@ SearchSysCacheExistsAttName(Oid relid, const char *attname)
 }
 
 
+/*
+ * SearchSysCacheAttNum
+ *
+ * This routine is equivalent to SearchSysCache on the ATTNUM cache,
+ * except that it will return NULL if the found attribute is marked
+ * attisdropped.  This is convenient for callers that want to act as
+ * though dropped attributes don't exist.
+ */
+HeapTuple
+SearchSysCacheAttNum(Oid relid, int16 attnum)
+{
+	HeapTuple	tuple;
+
+	tuple = SearchSysCache2(ATTNUM,
+							ObjectIdGetDatum(relid),
+							Int16GetDatum(attnum));
+	if (!HeapTupleIsValid(tuple))
+		return NULL;
+	if (((Form_pg_attribute) GETSTRUCT(tuple))->attisdropped)
+	{
+		ReleaseSysCache(tuple);
+		return NULL;
+	}
+	return tuple;
+}
+
+/*
+ * SearchSysCacheCopyAttNum
+ *
+ * As above, an attisdropped-aware version of SearchSysCacheCopy.
+ */
+HeapTuple
+SearchSysCacheCopyAttNum(Oid relid, int16 attnum)
+{
+	HeapTuple	tuple,
+				newtuple;
+
+	tuple = SearchSysCacheAttNum(relid, attnum);
+	if (!HeapTupleIsValid(tuple))
+		return NULL;
+	newtuple = heap_copytuple(tuple);
+	ReleaseSysCache(tuple);
+	return newtuple;
+}
+
+
 /*
  * SysCacheGetAttr
  *
@@ -1329,14 +1418,14 @@ GetSysCacheHashValue(int cacheId,
  */
 struct catclist *
 SearchSysCacheList(int cacheId, int nkeys,
-				   Datum key1, Datum key2, Datum key3, Datum key4)
+				   Datum key1, Datum key2, Datum key3)
 {
 	if (cacheId < 0 || cacheId >= SysCacheSize ||
 		!PointerIsValid(SysCache[cacheId]))
 		elog(ERROR, "invalid cache ID: %d", cacheId);
 
 	return SearchCatCacheList(SysCache[cacheId], nkeys,
-							  key1, key2, key3, key4);
+							  key1, key2, key3);
 }
 
 /*
diff --git a/src/backend/utils/cache/ts_cache.c b/src/backend/utils/cache/ts_cache.c
index da5c8ea345..3d5c194148 100644
--- a/src/backend/utils/cache/ts_cache.c
+++ b/src/backend/utils/cache/ts_cache.c
@@ -17,7 +17,7 @@
  * any database access.
  *
  *
- * Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/cache/ts_cache.c
@@ -294,9 +294,10 @@ lookup_ts_dictionary_cache(Oid dictId)
 			Assert(!found);		/* it wasn't there a moment ago */
 
 			/* Create private memory context the first time through */
-			saveCtx = AllocSetContextCreate(CacheMemoryContext,
-											NameStr(dict->dictname),
-											ALLOCSET_SMALL_SIZES);
+			saveCtx = AllocSetContextCreateExtended(CacheMemoryContext,
+													NameStr(dict->dictname),
+													MEMCONTEXT_COPY_NAME,
+													ALLOCSET_SMALL_SIZES);
 		}
 		else
 		{
diff --git a/src/backend/utils/cache/typcache.c b/src/backend/utils/cache/typcache.c
index 7ec31eb3e3..874d8cd1c9 100644
--- a/src/backend/utils/cache/typcache.c
+++ b/src/backend/utils/cache/typcache.c
@@ -30,7 +30,7 @@
  * Domain constraint changes are also tracked properly.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -46,6 +46,8 @@
 #include "access/heapam.h"
 #include "access/htup_details.h"
 #include "access/nbtree.h"
+#include "access/parallel.h"
+#include "access/session.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_constraint.h"
@@ -55,7 +57,9 @@
 #include "catalog/pg_type.h"
 #include "commands/defrem.h"
 #include "executor/executor.h"
+#include "lib/dshash.h"
 #include "optimizer/planner.h"
+#include "storage/lwlock.h"
 #include "utils/builtins.h"
 #include "utils/catcache.h"
 #include "utils/fmgroids.h"
@@ -75,21 +79,24 @@ static HTAB *TypeCacheHash = NULL;
 static TypeCacheEntry *firstDomainTypeEntry = NULL;
 
 /* Private flag bits in the TypeCacheEntry.flags field */
-#define TCFLAGS_CHECKED_BTREE_OPCLASS		0x0001
-#define TCFLAGS_CHECKED_HASH_OPCLASS		0x0002
-#define TCFLAGS_CHECKED_EQ_OPR				0x0004
-#define TCFLAGS_CHECKED_LT_OPR				0x0008
-#define TCFLAGS_CHECKED_GT_OPR				0x0010
-#define TCFLAGS_CHECKED_CMP_PROC			0x0020
-#define TCFLAGS_CHECKED_HASH_PROC			0x0040
-#define TCFLAGS_CHECKED_ELEM_PROPERTIES		0x0080
-#define TCFLAGS_HAVE_ELEM_EQUALITY			0x0100
-#define TCFLAGS_HAVE_ELEM_COMPARE			0x0200
-#define TCFLAGS_HAVE_ELEM_HASHING			0x0400
-#define TCFLAGS_CHECKED_FIELD_PROPERTIES	0x0800
-#define TCFLAGS_HAVE_FIELD_EQUALITY			0x1000
-#define TCFLAGS_HAVE_FIELD_COMPARE			0x2000
-#define TCFLAGS_CHECKED_DOMAIN_CONSTRAINTS	0x4000
+#define TCFLAGS_CHECKED_BTREE_OPCLASS		0x000001
+#define TCFLAGS_CHECKED_HASH_OPCLASS		0x000002
+#define TCFLAGS_CHECKED_EQ_OPR				0x000004
+#define TCFLAGS_CHECKED_LT_OPR				0x000008
+#define TCFLAGS_CHECKED_GT_OPR				0x000010
+#define TCFLAGS_CHECKED_CMP_PROC			0x000020
+#define TCFLAGS_CHECKED_HASH_PROC			0x000040
+#define TCFLAGS_CHECKED_HASH_EXTENDED_PROC	0x000080
+#define TCFLAGS_CHECKED_ELEM_PROPERTIES		0x000100
+#define TCFLAGS_HAVE_ELEM_EQUALITY			0x000200
+#define TCFLAGS_HAVE_ELEM_COMPARE			0x000400
+#define TCFLAGS_HAVE_ELEM_HASHING			0x000800
+#define TCFLAGS_HAVE_ELEM_EXTENDED_HASHING	0x001000
+#define TCFLAGS_CHECKED_FIELD_PROPERTIES	0x002000
+#define TCFLAGS_HAVE_FIELD_EQUALITY			0x004000
+#define TCFLAGS_HAVE_FIELD_COMPARE			0x008000
+#define TCFLAGS_CHECKED_DOMAIN_CONSTRAINTS	0x010000
+#define TCFLAGS_DOMAIN_BASE_IS_COMPOSITE	0x020000
 
 /*
  * Data stored about a domain type's constraints.  Note that we do not create
@@ -133,27 +140,141 @@ typedef struct TypeCacheEnumData
  *
  * Stored record types are remembered in a linear array of TupleDescs,
  * which can be indexed quickly with the assigned typmod.  There is also
- * a hash table to speed searches for matching TupleDescs.  The hash key
- * uses just the first N columns' type OIDs, and so we may have multiple
- * entries with the same hash key.
+ * a hash table to speed searches for matching TupleDescs.
  */
-#define REC_HASH_KEYS	16		/* use this many columns in hash key */
 
 typedef struct RecordCacheEntry
 {
-	/* the hash lookup key MUST BE FIRST */
-	Oid			hashkey[REC_HASH_KEYS]; /* column type IDs, zero-filled */
-
-	/* list of TupleDescs for record types with this hashkey */
-	List	   *tupdescs;
+	TupleDesc	tupdesc;
 } RecordCacheEntry;
 
+/*
+ * To deal with non-anonymous record types that are exchanged by backends
+ * involved in a parallel query, we also need a shared verion of the above.
+ */
+struct SharedRecordTypmodRegistry
+{
+	/* A hash table for finding a matching TupleDesc. */
+	dshash_table_handle record_table_handle;
+	/* A hash table for finding a TupleDesc by typmod. */
+	dshash_table_handle typmod_table_handle;
+	/* A source of new record typmod numbers. */
+	pg_atomic_uint32 next_typmod;
+};
+
+/*
+ * When using shared tuple descriptors as hash table keys we need a way to be
+ * able to search for an equal shared TupleDesc using a backend-local
+ * TupleDesc.  So we use this type which can hold either, and hash and compare
+ * functions that know how to handle both.
+ */
+typedef struct SharedRecordTableKey
+{
+	union
+	{
+		TupleDesc	local_tupdesc;
+		dsa_pointer shared_tupdesc;
+	}			u;
+	bool		shared;
+} SharedRecordTableKey;
+
+/*
+ * The shared version of RecordCacheEntry.  This lets us look up a typmod
+ * using a TupleDesc which may be in local or shared memory.
+ */
+typedef struct SharedRecordTableEntry
+{
+	SharedRecordTableKey key;
+} SharedRecordTableEntry;
+
+/*
+ * An entry in SharedRecordTypmodRegistry's typmod table.  This lets us look
+ * up a TupleDesc in shared memory using a typmod.
+ */
+typedef struct SharedTypmodTableEntry
+{
+	uint32		typmod;
+	dsa_pointer shared_tupdesc;
+} SharedTypmodTableEntry;
+
+/*
+ * A comparator function for SharedTupleDescTableKey.
+ */
+static int
+shared_record_table_compare(const void *a, const void *b, size_t size,
+							void *arg)
+{
+	dsa_area   *area = (dsa_area *) arg;
+	SharedRecordTableKey *k1 = (SharedRecordTableKey *) a;
+	SharedRecordTableKey *k2 = (SharedRecordTableKey *) b;
+	TupleDesc	t1;
+	TupleDesc	t2;
+
+	if (k1->shared)
+		t1 = (TupleDesc) dsa_get_address(area, k1->u.shared_tupdesc);
+	else
+		t1 = k1->u.local_tupdesc;
+
+	if (k2->shared)
+		t2 = (TupleDesc) dsa_get_address(area, k2->u.shared_tupdesc);
+	else
+		t2 = k2->u.local_tupdesc;
+
+	return equalTupleDescs(t1, t2) ? 0 : 1;
+}
+
+/*
+ * A hash function for SharedRecordTableKey.
+ */
+static uint32
+shared_record_table_hash(const void *a, size_t size, void *arg)
+{
+	dsa_area   *area = (dsa_area *) arg;
+	SharedRecordTableKey *k = (SharedRecordTableKey *) a;
+	TupleDesc	t;
+
+	if (k->shared)
+		t = (TupleDesc) dsa_get_address(area, k->u.shared_tupdesc);
+	else
+		t = k->u.local_tupdesc;
+
+	return hashTupleDesc(t);
+}
+
+/* Parameters for SharedRecordTypmodRegistry's TupleDesc table. */
+static const dshash_parameters srtr_record_table_params = {
+	sizeof(SharedRecordTableKey),	/* unused */
+	sizeof(SharedRecordTableEntry),
+	shared_record_table_compare,
+	shared_record_table_hash,
+	LWTRANCHE_SESSION_RECORD_TABLE
+};
+
+/* Parameters for SharedRecordTypmodRegistry's typmod hash table. */
+static const dshash_parameters srtr_typmod_table_params = {
+	sizeof(uint32),
+	sizeof(SharedTypmodTableEntry),
+	dshash_memcmp,
+	dshash_memhash,
+	LWTRANCHE_SESSION_TYPMOD_TABLE
+};
+
+/* hashtable for recognizing registered record types */
 static HTAB *RecordCacheHash = NULL;
 
+/* arrays of info about registered record types, indexed by assigned typmod */
 static TupleDesc *RecordCacheArray = NULL;
-static int32 RecordCacheArrayLen = 0;	/* allocated length of array */
+static uint64 *RecordIdentifierArray = NULL;
+static int32 RecordCacheArrayLen = 0;	/* allocated length of above arrays */
 static int32 NextRecordTypmod = 0;	/* number of entries used */
 
+/*
+ * Process-wide counter for generating unique tupledesc identifiers.
+ * Zero and one (INVALID_TUPLEDESC_IDENTIFIER) aren't allowed to be chosen
+ * as identifiers, so we start the counter at INVALID_TUPLEDESC_IDENTIFIER.
+ */
+static uint64 tupledesc_id_counter = INVALID_TUPLEDESC_IDENTIFIER;
+
 static void load_typcache_tupdesc(TypeCacheEntry *typentry);
 static void load_rangetype_info(TypeCacheEntry *typentry);
 static void load_domaintype_info(TypeCacheEntry *typentry);
@@ -164,16 +285,25 @@ static List *prep_domain_constraints(List *constraints, MemoryContext execctx);
 static bool array_element_has_equality(TypeCacheEntry *typentry);
 static bool array_element_has_compare(TypeCacheEntry *typentry);
 static bool array_element_has_hashing(TypeCacheEntry *typentry);
+static bool array_element_has_extended_hashing(TypeCacheEntry *typentry);
 static void cache_array_element_properties(TypeCacheEntry *typentry);
 static bool record_fields_have_equality(TypeCacheEntry *typentry);
 static bool record_fields_have_compare(TypeCacheEntry *typentry);
 static void cache_record_field_properties(TypeCacheEntry *typentry);
+static bool range_element_has_hashing(TypeCacheEntry *typentry);
+static bool range_element_has_extended_hashing(TypeCacheEntry *typentry);
+static void cache_range_element_properties(TypeCacheEntry *typentry);
 static void TypeCacheRelCallback(Datum arg, Oid relid);
 static void TypeCacheOpcCallback(Datum arg, int cacheid, uint32 hashvalue);
 static void TypeCacheConstrCallback(Datum arg, int cacheid, uint32 hashvalue);
 static void load_enum_cache_data(TypeCacheEntry *tcache);
 static EnumItem *find_enumitem(TypeCacheEnumData *enumdata, Oid arg);
 static int	enum_oid_cmp(const void *left, const void *right);
+static void shared_record_typmod_registry_detach(dsm_segment *segment,
+									 Datum datum);
+static TupleDesc find_or_make_matching_shared_tupledesc(TupleDesc tupdesc);
+static dsa_pointer share_tupledesc(dsa_area *area, TupleDesc tupdesc,
+				uint32 typmod);
 
 
 /*
@@ -257,6 +387,7 @@ lookup_type_cache(Oid type_id, int flags)
 		typentry->typstorage = typtup->typstorage;
 		typentry->typtype = typtup->typtype;
 		typentry->typrelid = typtup->typrelid;
+		typentry->typelem = typtup->typelem;
 
 		/* If it's a domain, immediately thread it into the domain cache list */
 		if (typentry->typtype == TYPTYPE_DOMAIN)
@@ -314,6 +445,8 @@ lookup_type_cache(Oid type_id, int flags)
 		flags |= TYPECACHE_HASH_OPFAMILY;
 
 	if ((flags & (TYPECACHE_HASH_PROC | TYPECACHE_HASH_PROC_FINFO |
+				  TYPECACHE_HASH_EXTENDED_PROC |
+				  TYPECACHE_HASH_EXTENDED_PROC_FINFO |
 				  TYPECACHE_HASH_OPFAMILY)) &&
 		!(typentry->flags & TCFLAGS_CHECKED_HASH_OPCLASS))
 	{
@@ -335,7 +468,8 @@ lookup_type_cache(Oid type_id, int flags)
 		 * eq_opr; if we already found one from the btree opclass, that
 		 * decision is still good.
 		 */
-		typentry->flags &= ~(TCFLAGS_CHECKED_HASH_PROC);
+		typentry->flags &= ~(TCFLAGS_CHECKED_HASH_PROC |
+							 TCFLAGS_CHECKED_HASH_EXTENDED_PROC);
 		typentry->flags |= TCFLAGS_CHECKED_HASH_OPCLASS;
 	}
 
@@ -361,9 +495,11 @@ lookup_type_cache(Oid type_id, int flags)
 
 		/*
 		 * If the proposed equality operator is array_eq or record_eq, check
-		 * to see if the element type or column types support equality. If
+		 * to see if the element type or column types support equality.  If
 		 * not, array_eq or record_eq would fail at runtime, so we don't want
-		 * to report that the type has equality.
+		 * to report that the type has equality.  (We can omit similar
+		 * checking for ranges because ranges can't be created in the first
+		 * place unless their subtypes support equality.)
 		 */
 		if (eq_opr == ARRAY_EQ_OP &&
 			!array_element_has_equality(typentry))
@@ -379,11 +515,12 @@ lookup_type_cache(Oid type_id, int flags)
 		typentry->eq_opr = eq_opr;
 
 		/*
-		 * Reset info about hash function whenever we pick up new info about
-		 * equality operator.  This is so we can ensure that the hash function
-		 * matches the operator.
+		 * Reset info about hash functions whenever we pick up new info about
+		 * equality operator.  This is so we can ensure that the hash
+		 * functions match the operator.
 		 */
-		typentry->flags &= ~(TCFLAGS_CHECKED_HASH_PROC);
+		typentry->flags &= ~(TCFLAGS_CHECKED_HASH_PROC |
+							 TCFLAGS_CHECKED_HASH_EXTENDED_PROC);
 		typentry->flags |= TCFLAGS_CHECKED_EQ_OPR;
 	}
 	if ((flags & TYPECACHE_LT_OPR) &&
@@ -397,7 +534,10 @@ lookup_type_cache(Oid type_id, int flags)
 										 typentry->btree_opintype,
 										 BTLessStrategyNumber);
 
-		/* As above, make sure array_cmp or record_cmp will succeed */
+		/*
+		 * As above, make sure array_cmp or record_cmp will succeed; but again
+		 * we need no special check for ranges.
+		 */
 		if (lt_opr == ARRAY_LT_OP &&
 			!array_element_has_compare(typentry))
 			lt_opr = InvalidOid;
@@ -419,7 +559,10 @@ lookup_type_cache(Oid type_id, int flags)
 										 typentry->btree_opintype,
 										 BTGreaterStrategyNumber);
 
-		/* As above, make sure array_cmp or record_cmp will succeed */
+		/*
+		 * As above, make sure array_cmp or record_cmp will succeed; but again
+		 * we need no special check for ranges.
+		 */
 		if (gt_opr == ARRAY_GT_OP &&
 			!array_element_has_compare(typentry))
 			gt_opr = InvalidOid;
@@ -441,7 +584,10 @@ lookup_type_cache(Oid type_id, int flags)
 										 typentry->btree_opintype,
 										 BTORDER_PROC);
 
-		/* As above, make sure array_cmp or record_cmp will succeed */
+		/*
+		 * As above, make sure array_cmp or record_cmp will succeed; but again
+		 * we need no special check for ranges.
+		 */
 		if (cmp_proc == F_BTARRAYCMP &&
 			!array_element_has_compare(typentry))
 			cmp_proc = InvalidOid;
@@ -474,7 +620,7 @@ lookup_type_cache(Oid type_id, int flags)
 			hash_proc = get_opfamily_proc(typentry->hash_opf,
 										  typentry->hash_opintype,
 										  typentry->hash_opintype,
-										  HASHPROC);
+										  HASHSTANDARD_PROC);
 
 		/*
 		 * As above, make sure hash_array will succeed.  We don't currently
@@ -485,6 +631,13 @@ lookup_type_cache(Oid type_id, int flags)
 			!array_element_has_hashing(typentry))
 			hash_proc = InvalidOid;
 
+		/*
+		 * Likewise for hash_range.
+		 */
+		if (hash_proc == F_HASH_RANGE &&
+			!range_element_has_hashing(typentry))
+			hash_proc = InvalidOid;
+
 		/* Force update of hash_proc_finfo only if we're changing state */
 		if (typentry->hash_proc != hash_proc)
 			typentry->hash_proc_finfo.fn_oid = InvalidOid;
@@ -492,6 +645,50 @@ lookup_type_cache(Oid type_id, int flags)
 		typentry->hash_proc = hash_proc;
 		typentry->flags |= TCFLAGS_CHECKED_HASH_PROC;
 	}
+	if ((flags & (TYPECACHE_HASH_EXTENDED_PROC |
+				  TYPECACHE_HASH_EXTENDED_PROC_FINFO)) &&
+		!(typentry->flags & TCFLAGS_CHECKED_HASH_EXTENDED_PROC))
+	{
+		Oid			hash_extended_proc = InvalidOid;
+
+		/*
+		 * We insist that the eq_opr, if one has been determined, match the
+		 * hash opclass; else report there is no hash function.
+		 */
+		if (typentry->hash_opf != InvalidOid &&
+			(!OidIsValid(typentry->eq_opr) ||
+			 typentry->eq_opr == get_opfamily_member(typentry->hash_opf,
+													 typentry->hash_opintype,
+													 typentry->hash_opintype,
+													 HTEqualStrategyNumber)))
+			hash_extended_proc = get_opfamily_proc(typentry->hash_opf,
+												   typentry->hash_opintype,
+												   typentry->hash_opintype,
+												   HASHEXTENDED_PROC);
+
+		/*
+		 * As above, make sure hash_array_extended will succeed.  We don't
+		 * currently support hashing for composite types, but when we do,
+		 * we'll need more logic here to check that case too.
+		 */
+		if (hash_extended_proc == F_HASH_ARRAY_EXTENDED &&
+			!array_element_has_extended_hashing(typentry))
+			hash_extended_proc = InvalidOid;
+
+		/*
+		 * Likewise for hash_range_extended.
+		 */
+		if (hash_extended_proc == F_HASH_RANGE_EXTENDED &&
+			!range_element_has_extended_hashing(typentry))
+			hash_extended_proc = InvalidOid;
+
+		/* Force update of proc finfo only if we're changing state */
+		if (typentry->hash_extended_proc != hash_extended_proc)
+			typentry->hash_extended_proc_finfo.fn_oid = InvalidOid;
+
+		typentry->hash_extended_proc = hash_extended_proc;
+		typentry->flags |= TCFLAGS_CHECKED_HASH_EXTENDED_PROC;
+	}
 
 	/*
 	 * Set up fmgr lookup info as requested
@@ -530,6 +727,14 @@ lookup_type_cache(Oid type_id, int flags)
 		fmgr_info_cxt(typentry->hash_proc, &typentry->hash_proc_finfo,
 					  CacheMemoryContext);
 	}
+	if ((flags & TYPECACHE_HASH_EXTENDED_PROC_FINFO) &&
+		typentry->hash_extended_proc_finfo.fn_oid == InvalidOid &&
+		typentry->hash_extended_proc != InvalidOid)
+	{
+		fmgr_info_cxt(typentry->hash_extended_proc,
+					  &typentry->hash_extended_proc_finfo,
+					  CacheMemoryContext);
+	}
 
 	/*
 	 * If it's a composite type (row type), get tupdesc if requested
@@ -554,7 +759,15 @@ lookup_type_cache(Oid type_id, int flags)
 	/*
 	 * If requested, get information about a domain type
 	 */
-	if ((flags & TYPECACHE_DOMAIN_INFO) &&
+	if ((flags & TYPECACHE_DOMAIN_BASE_INFO) &&
+		typentry->domainBaseType == InvalidOid &&
+		typentry->typtype == TYPTYPE_DOMAIN)
+	{
+		typentry->domainBaseTypmod = -1;
+		typentry->domainBaseType =
+			getBaseTypeAndTypmod(type_id, &typentry->domainBaseTypmod);
+	}
+	if ((flags & TYPECACHE_DOMAIN_CONSTR_INFO) &&
 		(typentry->flags & TCFLAGS_CHECKED_DOMAIN_CONSTRAINTS) == 0 &&
 		typentry->typtype == TYPTYPE_DOMAIN)
 	{
@@ -589,6 +802,12 @@ load_typcache_tupdesc(TypeCacheEntry *typentry)
 	Assert(typentry->tupDesc->tdrefcount > 0);
 	typentry->tupDesc->tdrefcount++;
 
+	/*
+	 * In future, we could take some pains to not change tupDesc_identifier if
+	 * the tupdesc didn't really change; but for now it's not worth it.
+	 */
+	typentry->tupDesc_identifier = ++tupledesc_id_counter;
+
 	relation_close(rel, AccessShareLock);
 }
 
@@ -973,7 +1192,7 @@ InitDomainConstraintRef(Oid type_id, DomainConstraintRef *ref,
 						MemoryContext refctx, bool need_exprstate)
 {
 	/* Look up the typcache entry --- we assume it survives indefinitely */
-	ref->tcache = lookup_type_cache(type_id, TYPECACHE_DOMAIN_INFO);
+	ref->tcache = lookup_type_cache(type_id, TYPECACHE_DOMAIN_CONSTR_INFO);
 	ref->need_exprstate = need_exprstate;
 	/* For safety, establish the callback before acquiring a refcount */
 	ref->refctx = refctx;
@@ -1064,7 +1283,7 @@ DomainHasConstraints(Oid type_id)
 	 * Note: a side effect is to cause the typcache's domain data to become
 	 * valid.  This is fine since we'll likely need it soon if there is any.
 	 */
-	typentry = lookup_type_cache(type_id, TYPECACHE_DOMAIN_INFO);
+	typentry = lookup_type_cache(type_id, TYPECACHE_DOMAIN_CONSTR_INFO);
 
 	return (typentry->domainData != NULL);
 }
@@ -1106,6 +1325,14 @@ array_element_has_hashing(TypeCacheEntry *typentry)
 	return (typentry->flags & TCFLAGS_HAVE_ELEM_HASHING) != 0;
 }
 
+static bool
+array_element_has_extended_hashing(TypeCacheEntry *typentry)
+{
+	if (!(typentry->flags & TCFLAGS_CHECKED_ELEM_PROPERTIES))
+		cache_array_element_properties(typentry);
+	return (typentry->flags & TCFLAGS_HAVE_ELEM_EXTENDED_HASHING) != 0;
+}
+
 static void
 cache_array_element_properties(TypeCacheEntry *typentry)
 {
@@ -1118,17 +1345,24 @@ cache_array_element_properties(TypeCacheEntry *typentry)
 		elementry = lookup_type_cache(elem_type,
 									  TYPECACHE_EQ_OPR |
 									  TYPECACHE_CMP_PROC |
-									  TYPECACHE_HASH_PROC);
+									  TYPECACHE_HASH_PROC |
+									  TYPECACHE_HASH_EXTENDED_PROC);
 		if (OidIsValid(elementry->eq_opr))
 			typentry->flags |= TCFLAGS_HAVE_ELEM_EQUALITY;
 		if (OidIsValid(elementry->cmp_proc))
 			typentry->flags |= TCFLAGS_HAVE_ELEM_COMPARE;
 		if (OidIsValid(elementry->hash_proc))
 			typentry->flags |= TCFLAGS_HAVE_ELEM_HASHING;
+		if (OidIsValid(elementry->hash_extended_proc))
+			typentry->flags |= TCFLAGS_HAVE_ELEM_EXTENDED_HASHING;
 	}
 	typentry->flags |= TCFLAGS_CHECKED_ELEM_PROPERTIES;
 }
 
+/*
+ * Likewise, some helper functions for composite types.
+ */
+
 static bool
 record_fields_have_equality(TypeCacheEntry *typentry)
 {
@@ -1176,11 +1410,12 @@ cache_record_field_properties(TypeCacheEntry *typentry)
 		for (i = 0; i < tupdesc->natts; i++)
 		{
 			TypeCacheEntry *fieldentry;
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, i);
 
-			if (tupdesc->attrs[i]->attisdropped)
+			if (attr->attisdropped)
 				continue;
 
-			fieldentry = lookup_type_cache(tupdesc->attrs[i]->atttypid,
+			fieldentry = lookup_type_cache(attr->atttypid,
 										   TYPECACHE_EQ_OPR |
 										   TYPECACHE_CMP_PROC);
 			if (!OidIsValid(fieldentry->eq_opr))
@@ -1196,9 +1431,114 @@ cache_record_field_properties(TypeCacheEntry *typentry)
 
 		DecrTupleDescRefCount(tupdesc);
 	}
+	else if (typentry->typtype == TYPTYPE_DOMAIN)
+	{
+		/* If it's domain over composite, copy base type's properties */
+		TypeCacheEntry *baseentry;
+
+		/* load up basetype info if we didn't already */
+		if (typentry->domainBaseType == InvalidOid)
+		{
+			typentry->domainBaseTypmod = -1;
+			typentry->domainBaseType =
+				getBaseTypeAndTypmod(typentry->type_id,
+									 &typentry->domainBaseTypmod);
+		}
+		baseentry = lookup_type_cache(typentry->domainBaseType,
+									  TYPECACHE_EQ_OPR |
+									  TYPECACHE_CMP_PROC);
+		if (baseentry->typtype == TYPTYPE_COMPOSITE)
+		{
+			typentry->flags |= TCFLAGS_DOMAIN_BASE_IS_COMPOSITE;
+			typentry->flags |= baseentry->flags & (TCFLAGS_HAVE_FIELD_EQUALITY |
+												   TCFLAGS_HAVE_FIELD_COMPARE);
+		}
+	}
 	typentry->flags |= TCFLAGS_CHECKED_FIELD_PROPERTIES;
 }
 
+/*
+ * Likewise, some helper functions for range types.
+ *
+ * We can borrow the flag bits for array element properties to use for range
+ * element properties, since those flag bits otherwise have no use in a
+ * range type's typcache entry.
+ */
+
+static bool
+range_element_has_hashing(TypeCacheEntry *typentry)
+{
+	if (!(typentry->flags & TCFLAGS_CHECKED_ELEM_PROPERTIES))
+		cache_range_element_properties(typentry);
+	return (typentry->flags & TCFLAGS_HAVE_ELEM_HASHING) != 0;
+}
+
+static bool
+range_element_has_extended_hashing(TypeCacheEntry *typentry)
+{
+	if (!(typentry->flags & TCFLAGS_CHECKED_ELEM_PROPERTIES))
+		cache_range_element_properties(typentry);
+	return (typentry->flags & TCFLAGS_HAVE_ELEM_EXTENDED_HASHING) != 0;
+}
+
+static void
+cache_range_element_properties(TypeCacheEntry *typentry)
+{
+	/* load up subtype link if we didn't already */
+	if (typentry->rngelemtype == NULL &&
+		typentry->typtype == TYPTYPE_RANGE)
+		load_rangetype_info(typentry);
+
+	if (typentry->rngelemtype != NULL)
+	{
+		TypeCacheEntry *elementry;
+
+		/* might need to calculate subtype's hash function properties */
+		elementry = lookup_type_cache(typentry->rngelemtype->type_id,
+									  TYPECACHE_HASH_PROC |
+									  TYPECACHE_HASH_EXTENDED_PROC);
+		if (OidIsValid(elementry->hash_proc))
+			typentry->flags |= TCFLAGS_HAVE_ELEM_HASHING;
+		if (OidIsValid(elementry->hash_extended_proc))
+			typentry->flags |= TCFLAGS_HAVE_ELEM_EXTENDED_HASHING;
+	}
+	typentry->flags |= TCFLAGS_CHECKED_ELEM_PROPERTIES;
+}
+
+/*
+ * Make sure that RecordCacheArray and RecordIdentifierArray are large enough
+ * to store 'typmod'.
+ */
+static void
+ensure_record_cache_typmod_slot_exists(int32 typmod)
+{
+	if (RecordCacheArray == NULL)
+	{
+		RecordCacheArray = (TupleDesc *)
+			MemoryContextAllocZero(CacheMemoryContext, 64 * sizeof(TupleDesc));
+		RecordIdentifierArray = (uint64 *)
+			MemoryContextAllocZero(CacheMemoryContext, 64 * sizeof(uint64));
+		RecordCacheArrayLen = 64;
+	}
+
+	if (typmod >= RecordCacheArrayLen)
+	{
+		int32		newlen = RecordCacheArrayLen * 2;
+
+		while (typmod >= newlen)
+			newlen *= 2;
+
+		RecordCacheArray = (TupleDesc *) repalloc(RecordCacheArray,
+												  newlen * sizeof(TupleDesc));
+		memset(RecordCacheArray + RecordCacheArrayLen, 0,
+			   (newlen - RecordCacheArrayLen) * sizeof(TupleDesc));
+		RecordIdentifierArray = (uint64 *) repalloc(RecordIdentifierArray,
+													newlen * sizeof(uint64));
+		memset(RecordIdentifierArray + RecordCacheArrayLen, 0,
+			   (newlen - RecordCacheArrayLen) * sizeof(uint64));
+		RecordCacheArrayLen = newlen;
+	}
+}
 
 /*
  * lookup_rowtype_tupdesc_internal --- internal routine to lookup a rowtype
@@ -1229,15 +1569,59 @@ lookup_rowtype_tupdesc_internal(Oid type_id, int32 typmod, bool noError)
 		/*
 		 * It's a transient record type, so look in our record-type table.
 		 */
-		if (typmod < 0 || typmod >= NextRecordTypmod)
+		if (typmod >= 0)
 		{
-			if (!noError)
-				ereport(ERROR,
-						(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-						 errmsg("record type has not been registered")));
-			return NULL;
+			/* It is already in our local cache? */
+			if (typmod < RecordCacheArrayLen &&
+				RecordCacheArray[typmod] != NULL)
+				return RecordCacheArray[typmod];
+
+			/* Are we attached to a shared record typmod registry? */
+			if (CurrentSession->shared_typmod_registry != NULL)
+			{
+				SharedTypmodTableEntry *entry;
+
+				/* Try to find it in the shared typmod index. */
+				entry = dshash_find(CurrentSession->shared_typmod_table,
+									&typmod, false);
+				if (entry != NULL)
+				{
+					TupleDesc	tupdesc;
+
+					tupdesc = (TupleDesc)
+						dsa_get_address(CurrentSession->area,
+										entry->shared_tupdesc);
+					Assert(typmod == tupdesc->tdtypmod);
+
+					/* We may need to extend the local RecordCacheArray. */
+					ensure_record_cache_typmod_slot_exists(typmod);
+
+					/*
+					 * Our local array can now point directly to the TupleDesc
+					 * in shared memory, which is non-reference-counted.
+					 */
+					RecordCacheArray[typmod] = tupdesc;
+					Assert(tupdesc->tdrefcount == -1);
+
+					/*
+					 * We don't share tupdesc identifiers across processes, so
+					 * assign one locally.
+					 */
+					RecordIdentifierArray[typmod] = ++tupledesc_id_counter;
+
+					dshash_release_lock(CurrentSession->shared_typmod_table,
+										entry);
+
+					return RecordCacheArray[typmod];
+				}
+			}
 		}
-		return RecordCacheArray[typmod];
+
+		if (!noError)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("record type has not been registered")));
+		return NULL;
 	}
 }
 
@@ -1259,7 +1643,7 @@ lookup_rowtype_tupdesc(Oid type_id, int32 typmod)
 	TupleDesc	tupDesc;
 
 	tupDesc = lookup_rowtype_tupdesc_internal(type_id, typmod, false);
-	IncrTupleDescRefCount(tupDesc);
+	PinTupleDesc(tupDesc);
 	return tupDesc;
 }
 
@@ -1277,7 +1661,7 @@ lookup_rowtype_tupdesc_noerror(Oid type_id, int32 typmod, bool noError)
 
 	tupDesc = lookup_rowtype_tupdesc_internal(type_id, typmod, noError);
 	if (tupDesc != NULL)
-		IncrTupleDescRefCount(tupDesc);
+		PinTupleDesc(tupDesc);
 	return tupDesc;
 }
 
@@ -1296,6 +1680,75 @@ lookup_rowtype_tupdesc_copy(Oid type_id, int32 typmod)
 	return CreateTupleDescCopyConstr(tmp);
 }
 
+/*
+ * lookup_rowtype_tupdesc_domain
+ *
+ * Same as lookup_rowtype_tupdesc_noerror(), except that the type can also be
+ * a domain over a named composite type; so this is effectively equivalent to
+ * lookup_rowtype_tupdesc_noerror(getBaseType(type_id), typmod, noError)
+ * except for being a tad faster.
+ *
+ * Note: the reason we don't fold the look-through-domain behavior into plain
+ * lookup_rowtype_tupdesc() is that we want callers to know they might be
+ * dealing with a domain.  Otherwise they might construct a tuple that should
+ * be of the domain type, but not apply domain constraints.
+ */
+TupleDesc
+lookup_rowtype_tupdesc_domain(Oid type_id, int32 typmod, bool noError)
+{
+	TupleDesc	tupDesc;
+
+	if (type_id != RECORDOID)
+	{
+		/*
+		 * Check for domain or named composite type.  We might as well load
+		 * whichever data is needed.
+		 */
+		TypeCacheEntry *typentry;
+
+		typentry = lookup_type_cache(type_id,
+									 TYPECACHE_TUPDESC |
+									 TYPECACHE_DOMAIN_BASE_INFO);
+		if (typentry->typtype == TYPTYPE_DOMAIN)
+			return lookup_rowtype_tupdesc_noerror(typentry->domainBaseType,
+												  typentry->domainBaseTypmod,
+												  noError);
+		if (typentry->tupDesc == NULL && !noError)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("type %s is not composite",
+							format_type_be(type_id))));
+		tupDesc = typentry->tupDesc;
+	}
+	else
+		tupDesc = lookup_rowtype_tupdesc_internal(type_id, typmod, noError);
+	if (tupDesc != NULL)
+		PinTupleDesc(tupDesc);
+	return tupDesc;
+}
+
+/*
+ * Hash function for the hash table of RecordCacheEntry.
+ */
+static uint32
+record_type_typmod_hash(const void *data, size_t size)
+{
+	RecordCacheEntry *entry = (RecordCacheEntry *) data;
+
+	return hashTupleDesc(entry->tupdesc);
+}
+
+/*
+ * Match function for the hash table of RecordCacheEntry.
+ */
+static int
+record_type_typmod_compare(const void *a, const void *b, size_t size)
+{
+	RecordCacheEntry *left = (RecordCacheEntry *) a;
+	RecordCacheEntry *right = (RecordCacheEntry *) b;
+
+	return equalTupleDescs(left->tupdesc, right->tupdesc) ? 0 : 1;
+}
 
 /*
  * assign_record_type_typmod
@@ -1309,11 +1762,7 @@ assign_record_type_typmod(TupleDesc tupDesc)
 {
 	RecordCacheEntry *recentry;
 	TupleDesc	entDesc;
-	Oid			hashkey[REC_HASH_KEYS];
 	bool		found;
-	int			i;
-	ListCell   *l;
-	int32		newtypmod;
 	MemoryContext oldcxt;
 
 	Assert(tupDesc->tdtypeid == RECORDOID);
@@ -1324,75 +1773,286 @@ assign_record_type_typmod(TupleDesc tupDesc)
 		HASHCTL		ctl;
 
 		MemSet(&ctl, 0, sizeof(ctl));
-		ctl.keysize = REC_HASH_KEYS * sizeof(Oid);
+		ctl.keysize = sizeof(TupleDesc);	/* just the pointer */
 		ctl.entrysize = sizeof(RecordCacheEntry);
+		ctl.hash = record_type_typmod_hash;
+		ctl.match = record_type_typmod_compare;
 		RecordCacheHash = hash_create("Record information cache", 64,
-									  &ctl, HASH_ELEM | HASH_BLOBS);
+									  &ctl,
+									  HASH_ELEM | HASH_FUNCTION | HASH_COMPARE);
 
 		/* Also make sure CacheMemoryContext exists */
 		if (!CacheMemoryContext)
 			CreateCacheMemoryContext();
 	}
 
-	/* Find or create a hashtable entry for this hash class */
-	MemSet(hashkey, 0, sizeof(hashkey));
-	for (i = 0; i < tupDesc->natts; i++)
-	{
-		if (i >= REC_HASH_KEYS)
-			break;
-		hashkey[i] = tupDesc->attrs[i]->atttypid;
-	}
+	/* Find or create a hashtable entry for this tuple descriptor */
 	recentry = (RecordCacheEntry *) hash_search(RecordCacheHash,
-												(void *) hashkey,
+												(void *) &tupDesc,
 												HASH_ENTER, &found);
-	if (!found)
+	if (found && recentry->tupdesc != NULL)
 	{
-		/* New entry ... hash_search initialized only the hash key */
-		recentry->tupdescs = NIL;
+		tupDesc->tdtypmod = recentry->tupdesc->tdtypmod;
+		return;
 	}
 
-	/* Look for existing record cache entry */
-	foreach(l, recentry->tupdescs)
+	/* Not present, so need to manufacture an entry */
+	recentry->tupdesc = NULL;
+	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+
+	/* Look in the SharedRecordTypmodRegistry, if attached */
+	entDesc = find_or_make_matching_shared_tupledesc(tupDesc);
+	if (entDesc == NULL)
 	{
-		entDesc = (TupleDesc) lfirst(l);
-		if (equalTupleDescs(tupDesc, entDesc))
-		{
-			tupDesc->tdtypmod = entDesc->tdtypmod;
-			return;
-		}
+		/* Reference-counted local cache only. */
+		entDesc = CreateTupleDescCopy(tupDesc);
+		entDesc->tdrefcount = 1;
+		entDesc->tdtypmod = NextRecordTypmod++;
 	}
+	ensure_record_cache_typmod_slot_exists(entDesc->tdtypmod);
+	RecordCacheArray[entDesc->tdtypmod] = entDesc;
+	recentry->tupdesc = entDesc;
 
-	/* Not present, so need to manufacture an entry */
-	oldcxt = MemoryContextSwitchTo(CacheMemoryContext);
+	/* Assign a unique tupdesc identifier, too. */
+	RecordIdentifierArray[entDesc->tdtypmod] = ++tupledesc_id_counter;
 
-	if (RecordCacheArray == NULL)
+	/* Update the caller's tuple descriptor. */
+	tupDesc->tdtypmod = entDesc->tdtypmod;
+
+	MemoryContextSwitchTo(oldcxt);
+}
+
+/*
+ * assign_record_type_identifier
+ *
+ * Get an identifier, which will be unique over the lifespan of this backend
+ * process, for the current tuple descriptor of the specified composite type.
+ * For named composite types, the value is guaranteed to change if the type's
+ * definition does.  For registered RECORD types, the value will not change
+ * once assigned, since the registered type won't either.  If an anonymous
+ * RECORD type is specified, we return a new identifier on each call.
+ */
+uint64
+assign_record_type_identifier(Oid type_id, int32 typmod)
+{
+	if (type_id != RECORDOID)
 	{
-		RecordCacheArray = (TupleDesc *) palloc(64 * sizeof(TupleDesc));
-		RecordCacheArrayLen = 64;
+		/*
+		 * It's a named composite type, so use the regular typcache.
+		 */
+		TypeCacheEntry *typentry;
+
+		typentry = lookup_type_cache(type_id, TYPECACHE_TUPDESC);
+		if (typentry->tupDesc == NULL)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("type %s is not composite",
+							format_type_be(type_id))));
+		Assert(typentry->tupDesc_identifier != 0);
+		return typentry->tupDesc_identifier;
 	}
-	else if (NextRecordTypmod >= RecordCacheArrayLen)
+	else
 	{
-		int32		newlen = RecordCacheArrayLen * 2;
+		/*
+		 * It's a transient record type, so look in our record-type table.
+		 */
+		if (typmod >= 0 && typmod < RecordCacheArrayLen &&
+			RecordCacheArray[typmod] != NULL)
+		{
+			Assert(RecordIdentifierArray[typmod] != 0);
+			return RecordIdentifierArray[typmod];
+		}
 
-		RecordCacheArray = (TupleDesc *) repalloc(RecordCacheArray,
-												  newlen * sizeof(TupleDesc));
-		RecordCacheArrayLen = newlen;
+		/* For anonymous or unrecognized record type, generate a new ID */
+		return ++tupledesc_id_counter;
 	}
+}
 
-	/* if fail in subrs, no damage except possibly some wasted memory... */
-	entDesc = CreateTupleDescCopy(tupDesc);
-	recentry->tupdescs = lcons(entDesc, recentry->tupdescs);
-	/* mark it as a reference-counted tupdesc */
-	entDesc->tdrefcount = 1;
-	/* now it's safe to advance NextRecordTypmod */
-	newtypmod = NextRecordTypmod++;
-	entDesc->tdtypmod = newtypmod;
-	RecordCacheArray[newtypmod] = entDesc;
+/*
+ * Return the amout of shmem required to hold a SharedRecordTypmodRegistry.
+ * This exists only to avoid exposing private innards of
+ * SharedRecordTypmodRegistry in a header.
+ */
+size_t
+SharedRecordTypmodRegistryEstimate(void)
+{
+	return sizeof(SharedRecordTypmodRegistry);
+}
 
-	/* report to caller as well */
-	tupDesc->tdtypmod = newtypmod;
+/*
+ * Initialize 'registry' in a pre-existing shared memory region, which must be
+ * maximally aligned and have space for SharedRecordTypmodRegistryEstimate()
+ * bytes.
+ *
+ * 'area' will be used to allocate shared memory space as required for the
+ * typemod registration.  The current process, expected to be a leader process
+ * in a parallel query, will be attached automatically and its current record
+ * types will be loaded into *registry.  While attached, all calls to
+ * assign_record_type_typmod will use the shared registry.  Worker backends
+ * will need to attach explicitly.
+ *
+ * Note that this function takes 'area' and 'segment' as arguments rather than
+ * accessing them via CurrentSession, because they aren't installed there
+ * until after this function runs.
+ */
+void
+SharedRecordTypmodRegistryInit(SharedRecordTypmodRegistry *registry,
+							   dsm_segment *segment,
+							   dsa_area *area)
+{
+	MemoryContext old_context;
+	dshash_table *record_table;
+	dshash_table *typmod_table;
+	int32		typmod;
 
-	MemoryContextSwitchTo(oldcxt);
+	Assert(!IsParallelWorker());
+
+	/* We can't already be attached to a shared registry. */
+	Assert(CurrentSession->shared_typmod_registry == NULL);
+	Assert(CurrentSession->shared_record_table == NULL);
+	Assert(CurrentSession->shared_typmod_table == NULL);
+
+	old_context = MemoryContextSwitchTo(TopMemoryContext);
+
+	/* Create the hash table of tuple descriptors indexed by themselves. */
+	record_table = dshash_create(area, &srtr_record_table_params, area);
+
+	/* Create the hash table of tuple descriptors indexed by typmod. */
+	typmod_table = dshash_create(area, &srtr_typmod_table_params, NULL);
+
+	MemoryContextSwitchTo(old_context);
+
+	/* Initialize the SharedRecordTypmodRegistry. */
+	registry->record_table_handle = dshash_get_hash_table_handle(record_table);
+	registry->typmod_table_handle = dshash_get_hash_table_handle(typmod_table);
+	pg_atomic_init_u32(&registry->next_typmod, NextRecordTypmod);
+
+	/*
+	 * Copy all entries from this backend's private registry into the shared
+	 * registry.
+	 */
+	for (typmod = 0; typmod < NextRecordTypmod; ++typmod)
+	{
+		SharedTypmodTableEntry *typmod_table_entry;
+		SharedRecordTableEntry *record_table_entry;
+		SharedRecordTableKey record_table_key;
+		dsa_pointer shared_dp;
+		TupleDesc	tupdesc;
+		bool		found;
+
+		tupdesc = RecordCacheArray[typmod];
+		if (tupdesc == NULL)
+			continue;
+
+		/* Copy the TupleDesc into shared memory. */
+		shared_dp = share_tupledesc(area, tupdesc, typmod);
+
+		/* Insert into the typmod table. */
+		typmod_table_entry = dshash_find_or_insert(typmod_table,
+												   &tupdesc->tdtypmod,
+												   &found);
+		if (found)
+			elog(ERROR, "cannot create duplicate shared record typmod");
+		typmod_table_entry->typmod = tupdesc->tdtypmod;
+		typmod_table_entry->shared_tupdesc = shared_dp;
+		dshash_release_lock(typmod_table, typmod_table_entry);
+
+		/* Insert into the record table. */
+		record_table_key.shared = false;
+		record_table_key.u.local_tupdesc = tupdesc;
+		record_table_entry = dshash_find_or_insert(record_table,
+												   &record_table_key,
+												   &found);
+		if (!found)
+		{
+			record_table_entry->key.shared = true;
+			record_table_entry->key.u.shared_tupdesc = shared_dp;
+		}
+		dshash_release_lock(record_table, record_table_entry);
+	}
+
+	/*
+	 * Set up the global state that will tell assign_record_type_typmod and
+	 * lookup_rowtype_tupdesc_internal about the shared registry.
+	 */
+	CurrentSession->shared_record_table = record_table;
+	CurrentSession->shared_typmod_table = typmod_table;
+	CurrentSession->shared_typmod_registry = registry;
+
+	/*
+	 * We install a detach hook in the leader, but only to handle cleanup on
+	 * failure during GetSessionDsmHandle().  Once GetSessionDsmHandle() pins
+	 * the memory, the leader process will use a shared registry until it
+	 * exits.
+	 */
+	on_dsm_detach(segment, shared_record_typmod_registry_detach, (Datum) 0);
+}
+
+/*
+ * Attach to 'registry', which must have been initialized already by another
+ * backend.  Future calls to assign_record_type_typmod and
+ * lookup_rowtype_tupdesc_internal will use the shared registry until the
+ * current session is detached.
+ */
+void
+SharedRecordTypmodRegistryAttach(SharedRecordTypmodRegistry *registry)
+{
+	MemoryContext old_context;
+	dshash_table *record_table;
+	dshash_table *typmod_table;
+
+	Assert(IsParallelWorker());
+
+	/* We can't already be attached to a shared registry. */
+	Assert(CurrentSession != NULL);
+	Assert(CurrentSession->segment != NULL);
+	Assert(CurrentSession->area != NULL);
+	Assert(CurrentSession->shared_typmod_registry == NULL);
+	Assert(CurrentSession->shared_record_table == NULL);
+	Assert(CurrentSession->shared_typmod_table == NULL);
+
+	/*
+	 * We can't already have typmods in our local cache, because they'd clash
+	 * with those imported by SharedRecordTypmodRegistryInit.  This should be
+	 * a freshly started parallel worker.  If we ever support worker
+	 * recycling, a worker would need to zap its local cache in between
+	 * servicing different queries, in order to be able to call this and
+	 * synchronize typmods with a new leader; but that's problematic because
+	 * we can't be very sure that record-typmod-related state hasn't escaped
+	 * to anywhere else in the process.
+	 */
+	Assert(NextRecordTypmod == 0);
+
+	old_context = MemoryContextSwitchTo(TopMemoryContext);
+
+	/* Attach to the two hash tables. */
+	record_table = dshash_attach(CurrentSession->area,
+								 &srtr_record_table_params,
+								 registry->record_table_handle,
+								 CurrentSession->area);
+	typmod_table = dshash_attach(CurrentSession->area,
+								 &srtr_typmod_table_params,
+								 registry->typmod_table_handle,
+								 NULL);
+
+	MemoryContextSwitchTo(old_context);
+
+	/*
+	 * Set up detach hook to run at worker exit.  Currently this is the same
+	 * as the leader's detach hook, but in future they might need to be
+	 * different.
+	 */
+	on_dsm_detach(CurrentSession->segment,
+				  shared_record_typmod_registry_detach,
+				  PointerGetDatum(registry));
+
+	/*
+	 * Set up the session state that will tell assign_record_type_typmod and
+	 * lookup_rowtype_tupdesc_internal about the shared registry.
+	 */
+	CurrentSession->shared_typmod_registry = registry;
+	CurrentSession->shared_record_table = record_table;
+	CurrentSession->shared_typmod_table = typmod_table;
 }
 
 /*
@@ -1427,29 +2087,40 @@ TypeCacheRelCallback(Datum arg, Oid relid)
 	hash_seq_init(&status, TypeCacheHash);
 	while ((typentry = (TypeCacheEntry *) hash_seq_search(&status)) != NULL)
 	{
-		if (typentry->typtype != TYPTYPE_COMPOSITE)
-			continue;			/* skip non-composites */
+		if (typentry->typtype == TYPTYPE_COMPOSITE)
+		{
+			/* Skip if no match, unless we're zapping all composite types */
+			if (relid != typentry->typrelid && relid != InvalidOid)
+				continue;
 
-		/* Skip if no match, unless we're zapping all composite types */
-		if (relid != typentry->typrelid && relid != InvalidOid)
-			continue;
+			/* Delete tupdesc if we have it */
+			if (typentry->tupDesc != NULL)
+			{
+				/*
+				 * Release our refcount, and free the tupdesc if none remain.
+				 * (Can't use DecrTupleDescRefCount because this reference is
+				 * not logged in current resource owner.)
+				 */
+				Assert(typentry->tupDesc->tdrefcount > 0);
+				if (--typentry->tupDesc->tdrefcount == 0)
+					FreeTupleDesc(typentry->tupDesc);
+				typentry->tupDesc = NULL;
+			}
 
-		/* Delete tupdesc if we have it */
-		if (typentry->tupDesc != NULL)
+			/* Reset equality/comparison/hashing validity information */
+			typentry->flags = 0;
+		}
+		else if (typentry->typtype == TYPTYPE_DOMAIN)
 		{
 			/*
-			 * Release our refcount, and free the tupdesc if none remain.
-			 * (Can't use DecrTupleDescRefCount because this reference is not
-			 * logged in current resource owner.)
+			 * If it's domain over composite, reset flags.  (We don't bother
+			 * trying to determine whether the specific base type needs a
+			 * reset.)  Note that if we haven't determined whether the base
+			 * type is composite, we don't need to reset anything.
 			 */
-			Assert(typentry->tupDesc->tdrefcount > 0);
-			if (--typentry->tupDesc->tdrefcount == 0)
-				FreeTupleDesc(typentry->tupDesc);
-			typentry->tupDesc = NULL;
+			if (typentry->flags & TCFLAGS_DOMAIN_BASE_IS_COMPOSITE)
+				typentry->flags = 0;
 		}
-
-		/* Reset equality/comparison/hashing validity information */
-		typentry->flags = 0;
 	}
 }
 
@@ -1809,3 +2480,157 @@ enum_oid_cmp(const void *left, const void *right)
 	else
 		return 0;
 }
+
+/*
+ * Copy 'tupdesc' into newly allocated shared memory in 'area', set its typmod
+ * to the given value and return a dsa_pointer.
+ */
+static dsa_pointer
+share_tupledesc(dsa_area *area, TupleDesc tupdesc, uint32 typmod)
+{
+	dsa_pointer shared_dp;
+	TupleDesc	shared;
+
+	shared_dp = dsa_allocate(area, TupleDescSize(tupdesc));
+	shared = (TupleDesc) dsa_get_address(area, shared_dp);
+	TupleDescCopy(shared, tupdesc);
+	shared->tdtypmod = typmod;
+
+	return shared_dp;
+}
+
+/*
+ * If we are attached to a SharedRecordTypmodRegistry, use it to find or
+ * create a shared TupleDesc that matches 'tupdesc'.  Otherwise return NULL.
+ * Tuple descriptors returned by this function are not reference counted, and
+ * will exist at least as long as the current backend remained attached to the
+ * current session.
+ */
+static TupleDesc
+find_or_make_matching_shared_tupledesc(TupleDesc tupdesc)
+{
+	TupleDesc	result;
+	SharedRecordTableKey key;
+	SharedRecordTableEntry *record_table_entry;
+	SharedTypmodTableEntry *typmod_table_entry;
+	dsa_pointer shared_dp;
+	bool		found;
+	uint32		typmod;
+
+	/* If not even attached, nothing to do. */
+	if (CurrentSession->shared_typmod_registry == NULL)
+		return NULL;
+
+	/* Try to find a matching tuple descriptor in the record table. */
+	key.shared = false;
+	key.u.local_tupdesc = tupdesc;
+	record_table_entry = (SharedRecordTableEntry *)
+		dshash_find(CurrentSession->shared_record_table, &key, false);
+	if (record_table_entry)
+	{
+		Assert(record_table_entry->key.shared);
+		dshash_release_lock(CurrentSession->shared_record_table,
+							record_table_entry);
+		result = (TupleDesc)
+			dsa_get_address(CurrentSession->area,
+							record_table_entry->key.u.shared_tupdesc);
+		Assert(result->tdrefcount == -1);
+
+		return result;
+	}
+
+	/* Allocate a new typmod number.  This will be wasted if we error out. */
+	typmod = (int)
+		pg_atomic_fetch_add_u32(&CurrentSession->shared_typmod_registry->next_typmod,
+								1);
+
+	/* Copy the TupleDesc into shared memory. */
+	shared_dp = share_tupledesc(CurrentSession->area, tupdesc, typmod);
+
+	/*
+	 * Create an entry in the typmod table so that others will understand this
+	 * typmod number.
+	 */
+	PG_TRY();
+	{
+		typmod_table_entry = (SharedTypmodTableEntry *)
+			dshash_find_or_insert(CurrentSession->shared_typmod_table,
+								  &typmod, &found);
+		if (found)
+			elog(ERROR, "cannot create duplicate shared record typmod");
+	}
+	PG_CATCH();
+	{
+		dsa_free(CurrentSession->area, shared_dp);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+	typmod_table_entry->typmod = typmod;
+	typmod_table_entry->shared_tupdesc = shared_dp;
+	dshash_release_lock(CurrentSession->shared_typmod_table,
+						typmod_table_entry);
+
+	/*
+	 * Finally create an entry in the record table so others with matching
+	 * tuple descriptors can reuse the typmod.
+	 */
+	record_table_entry = (SharedRecordTableEntry *)
+		dshash_find_or_insert(CurrentSession->shared_record_table, &key,
+							  &found);
+	if (found)
+	{
+		/*
+		 * Someone concurrently inserted a matching tuple descriptor since the
+		 * first time we checked.  Use that one instead.
+		 */
+		dshash_release_lock(CurrentSession->shared_record_table,
+							record_table_entry);
+
+		/* Might as well free up the space used by the one we created. */
+		found = dshash_delete_key(CurrentSession->shared_typmod_table,
+								  &typmod);
+		Assert(found);
+		dsa_free(CurrentSession->area, shared_dp);
+
+		/* Return the one we found. */
+		Assert(record_table_entry->key.shared);
+		result = (TupleDesc)
+			dsa_get_address(CurrentSession->area,
+							record_table_entry->key.shared);
+		Assert(result->tdrefcount == -1);
+
+		return result;
+	}
+
+	/* Store it and return it. */
+	record_table_entry->key.shared = true;
+	record_table_entry->key.u.shared_tupdesc = shared_dp;
+	dshash_release_lock(CurrentSession->shared_record_table,
+						record_table_entry);
+	result = (TupleDesc)
+		dsa_get_address(CurrentSession->area, shared_dp);
+	Assert(result->tdrefcount == -1);
+
+	return result;
+}
+
+/*
+ * On-DSM-detach hook to forget about the current shared record typmod
+ * infrastructure.  This is currently used by both leader and workers.
+ */
+static void
+shared_record_typmod_registry_detach(dsm_segment *segment, Datum datum)
+{
+	/* Be cautious here: maybe we didn't finish initializing. */
+	if (CurrentSession->shared_record_table != NULL)
+	{
+		dshash_detach(CurrentSession->shared_record_table);
+		CurrentSession->shared_record_table = NULL;
+	}
+	if (CurrentSession->shared_typmod_table != NULL)
+	{
+		dshash_detach(CurrentSession->shared_typmod_table);
+		CurrentSession->shared_typmod_table = NULL;
+	}
+	CurrentSession->shared_typmod_registry = NULL;
+}
diff --git a/src/backend/utils/errcodes.txt b/src/backend/utils/errcodes.txt
index 4f35471762..9871d1e793 100644
--- a/src/backend/utils/errcodes.txt
+++ b/src/backend/utils/errcodes.txt
@@ -2,7 +2,7 @@
 # errcodes.txt
 #      PostgreSQL error codes
 #
-# Copyright (c) 2003-2017, PostgreSQL Global Development Group
+# Copyright (c) 2003-2018, PostgreSQL Global Development Group
 #
 # This list serves as the basis for generating source files containing error
 # codes. It is kept in a common format to make sure all these source files have
@@ -177,6 +177,7 @@ Section: Class 22 - Data Exception
 22P06    E    ERRCODE_NONSTANDARD_USE_OF_ESCAPE_CHARACTER                    nonstandard_use_of_escape_character
 22010    E    ERRCODE_INVALID_INDICATOR_PARAMETER_VALUE                      invalid_indicator_parameter_value
 22023    E    ERRCODE_INVALID_PARAMETER_VALUE                                invalid_parameter_value
+22013    E    ERRCODE_INVALID_PRECEDING_FOLLOWING_SIZE                       invalid_preceding_following_size
 2201B    E    ERRCODE_INVALID_REGULAR_EXPRESSION                             invalid_regular_expression
 2201W    E    ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE                      invalid_row_count_in_limit_clause
 2201X    E    ERRCODE_INVALID_ROW_COUNT_IN_RESULT_OFFSET_CLAUSE              invalid_row_count_in_result_offset_clause
@@ -400,7 +401,6 @@ Section: Class 55 - Object Not In Prerequisite State
 55006    E    ERRCODE_OBJECT_IN_USE                                          object_in_use
 55P02    E    ERRCODE_CANT_CHANGE_RUNTIME_PARAM                              cant_change_runtime_param
 55P03    E    ERRCODE_LOCK_NOT_AVAILABLE                                     lock_not_available
-55P04    E    ERRCODE_UNSAFE_NEW_ENUM_VALUE_USAGE                            unsafe_new_enum_value_usage
 
 Section: Class 57 - Operator Intervention
 
diff --git a/src/backend/utils/error/assert.c b/src/backend/utils/error/assert.c
index 2ef7792b8b..115dbf692c 100644
--- a/src/backend/utils/error/assert.c
+++ b/src/backend/utils/error/assert.c
@@ -3,7 +3,7 @@
  * assert.c
  *	  Assert code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/error/elog.c b/src/backend/utils/error/elog.c
index 918db0a8f2..16531f7a0f 100644
--- a/src/backend/utils/error/elog.c
+++ b/src/backend/utils/error/elog.c
@@ -43,7 +43,7 @@
  * overflow.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -226,7 +226,7 @@ err_gettext(const char *str)
  * the stack entry.  Finally, errfinish() will be called to actually process
  * the error report.
  *
- * Returns TRUE in normal case.  Returns FALSE to short-circuit the error
+ * Returns true in normal case.  Returns false to short-circuit the error
  * report (if it's a warning or lower and not to be reported anywhere).
  */
 bool
@@ -285,7 +285,7 @@ errstart(int elevel, const char *filename, int lineno,
 
 	/*
 	 * Now decide whether we need to process this report at all; if it's
-	 * warning or less and not enabled for logging, just return FALSE without
+	 * warning or less and not enabled for logging, just return false without
 	 * starting up any error logging machinery.
 	 */
 
@@ -435,7 +435,7 @@ errfinish(int dummy,...)
 	for (econtext = error_context_stack;
 		 econtext != NULL;
 		 econtext = econtext->previous)
-		(*econtext->callback) (econtext->arg);
+		econtext->callback(econtext->arg);
 
 	/*
 	 * If ERROR (not more nor less) we pass it off to the current handler.
@@ -1837,7 +1837,7 @@ GetErrorContextStack(void)
 	for (econtext = error_context_stack;
 		 econtext != NULL;
 		 econtext = econtext->previous)
-		(*econtext->callback) (econtext->arg);
+		econtext->callback(econtext->arg);
 
 	/*
 	 * Clean ourselves off the stack, any allocations done should have been
@@ -2117,10 +2117,15 @@ write_eventlog(int level, const char *line, int len)
 	 * try to convert the message to UTF16 and write it with ReportEventW().
 	 * Fall back on ReportEventA() if conversion failed.
 	 *
+	 * Since we palloc the structure required for conversion, also fall
+	 * through to writing unconverted if we have not yet set up
+	 * CurrentMemoryContext.
+	 *
 	 * Also verify that we are not on our way into error recursion trouble due
 	 * to error messages thrown deep inside pgwin32_message_to_UTF16().
 	 */
 	if (!in_error_recursion_trouble() &&
+		CurrentMemoryContext != NULL &&
 		GetMessageEncoding() != GetACPEncoding())
 	{
 		utf16 = pgwin32_message_to_UTF16(line, len, NULL);
diff --git a/src/backend/utils/fmgr/dfmgr.c b/src/backend/utils/fmgr/dfmgr.c
index 1239f95ddc..1b0dbad82c 100644
--- a/src/backend/utils/fmgr/dfmgr.c
+++ b/src/backend/utils/fmgr/dfmgr.c
@@ -3,7 +3,7 @@
  * dfmgr.c
  *	  Dynamic function manager code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/fmgr/fmgr.c b/src/backend/utils/fmgr/fmgr.c
index a7b07827e0..25f4c34901 100644
--- a/src/backend/utils/fmgr/fmgr.c
+++ b/src/backend/utils/fmgr/fmgr.c
@@ -3,7 +3,7 @@
  * fmgr.c
  *	  The Postgres function manager.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -70,26 +70,21 @@ static Datum fmgr_security_definer(PG_FUNCTION_ARGS);
 static const FmgrBuiltin *
 fmgr_isbuiltin(Oid id)
 {
-	int			low = 0;
-	int			high = fmgr_nbuiltins - 1;
+	uint16		index;
+
+	/* fast lookup only possible if original oid still assigned */
+	if (id >= FirstBootstrapObjectId)
+		return NULL;
 
 	/*
-	 * Loop invariant: low is the first index that could contain target entry,
-	 * and high is the last index that could contain it.
+	 * Lookup function data. If there's a miss in that range it's likely a
+	 * nonexistant function, returning NULL here will trigger an ERROR later.
 	 */
-	while (low <= high)
-	{
-		int			i = (high + low) / 2;
-		const FmgrBuiltin *ptr = &fmgr_builtins[i];
-
-		if (id == ptr->foid)
-			return ptr;
-		else if (id > ptr->foid)
-			low = i + 1;
-		else
-			high = i - 1;
-	}
-	return NULL;
+	index = fmgr_builtin_oid_index[id];
+	if (index == InvalidOidBuiltinMapping)
+		return NULL;
+
+	return &fmgr_builtins[index];
 }
 
 /*
@@ -1941,8 +1936,6 @@ get_call_expr_argtype(Node *expr, int argnum)
 		args = ((DistinctExpr *) expr)->args;
 	else if (IsA(expr, ScalarArrayOpExpr))
 		args = ((ScalarArrayOpExpr *) expr)->args;
-	else if (IsA(expr, ArrayCoerceExpr))
-		args = list_make1(((ArrayCoerceExpr *) expr)->arg);
 	else if (IsA(expr, NullIfExpr))
 		args = ((NullIfExpr *) expr)->args;
 	else if (IsA(expr, WindowFunc))
@@ -1956,16 +1949,12 @@ get_call_expr_argtype(Node *expr, int argnum)
 	argtype = exprType((Node *) list_nth(args, argnum));
 
 	/*
-	 * special hack for ScalarArrayOpExpr and ArrayCoerceExpr: what the
-	 * underlying function will actually get passed is the element type of the
-	 * array.
+	 * special hack for ScalarArrayOpExpr: what the underlying function will
+	 * actually get passed is the element type of the array.
 	 */
 	if (IsA(expr, ScalarArrayOpExpr) &&
 		argnum == 1)
 		argtype = get_base_element_type(argtype);
-	else if (IsA(expr, ArrayCoerceExpr) &&
-			 argnum == 0)
-		argtype = get_base_element_type(argtype);
 
 	return argtype;
 }
@@ -2012,8 +2001,6 @@ get_call_expr_arg_stable(Node *expr, int argnum)
 		args = ((DistinctExpr *) expr)->args;
 	else if (IsA(expr, ScalarArrayOpExpr))
 		args = ((ScalarArrayOpExpr *) expr)->args;
-	else if (IsA(expr, ArrayCoerceExpr))
-		args = list_make1(((ArrayCoerceExpr *) expr)->arg);
 	else if (IsA(expr, NullIfExpr))
 		args = ((NullIfExpr *) expr)->args;
 	else if (IsA(expr, WindowFunc))
@@ -2137,7 +2124,7 @@ CheckFunctionValidatorAccess(Oid validatorOid, Oid functionOid)
 	aclresult = pg_language_aclcheck(procStruct->prolang, GetUserId(),
 									 ACL_USAGE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_LANGUAGE,
+		aclcheck_error(aclresult, OBJECT_LANGUAGE,
 					   NameStr(langStruct->lanname));
 
 	/*
@@ -2147,7 +2134,7 @@ CheckFunctionValidatorAccess(Oid validatorOid, Oid functionOid)
 	 */
 	aclresult = pg_proc_aclcheck(functionOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, NameStr(procStruct->proname));
+		aclcheck_error(aclresult, OBJECT_FUNCTION, NameStr(procStruct->proname));
 
 	ReleaseSysCache(procTup);
 	ReleaseSysCache(langTup);
diff --git a/src/backend/utils/fmgr/funcapi.c b/src/backend/utils/fmgr/funcapi.c
index be47d411c5..c0076bfce3 100644
--- a/src/backend/utils/fmgr/funcapi.c
+++ b/src/backend/utils/fmgr/funcapi.c
@@ -2,9 +2,9 @@
  *
  * funcapi.c
  *	  Utility and convenience functions for fmgr functions that return
- *	  sets and/or composite types.
+ *	  sets and/or composite types, or deal with VARIADIC inputs.
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/fmgr/funcapi.c
@@ -39,7 +39,7 @@ static TypeFuncClass internal_get_result_type(Oid funcid,
 static bool resolve_polymorphic_tupdesc(TupleDesc tupdesc,
 							oidvector *declared_args,
 							Node *call_expr);
-static TypeFuncClass get_type_func_class(Oid typid);
+static TypeFuncClass get_type_func_class(Oid typid, Oid *base_typeid);
 
 
 /*
@@ -246,14 +246,17 @@ get_expr_result_type(Node *expr,
 	{
 		/* handle as a generic expression; no chance to resolve RECORD */
 		Oid			typid = exprType(expr);
+		Oid			base_typid;
 
 		if (resultTypeId)
 			*resultTypeId = typid;
 		if (resultTupleDesc)
 			*resultTupleDesc = NULL;
-		result = get_type_func_class(typid);
-		if (result == TYPEFUNC_COMPOSITE && resultTupleDesc)
-			*resultTupleDesc = lookup_rowtype_tupdesc_copy(typid, -1);
+		result = get_type_func_class(typid, &base_typid);
+		if ((result == TYPEFUNC_COMPOSITE ||
+			 result == TYPEFUNC_COMPOSITE_DOMAIN) &&
+			resultTupleDesc)
+			*resultTupleDesc = lookup_rowtype_tupdesc_copy(base_typid, -1);
 	}
 
 	return result;
@@ -296,6 +299,7 @@ internal_get_result_type(Oid funcid,
 	HeapTuple	tp;
 	Form_pg_proc procform;
 	Oid			rettype;
+	Oid			base_rettype;
 	TupleDesc	tupdesc;
 
 	/* First fetch the function's pg_proc row to inspect its rettype */
@@ -363,12 +367,13 @@ internal_get_result_type(Oid funcid,
 		*resultTupleDesc = NULL;	/* default result */
 
 	/* Classify the result type */
-	result = get_type_func_class(rettype);
+	result = get_type_func_class(rettype, &base_rettype);
 	switch (result)
 	{
 		case TYPEFUNC_COMPOSITE:
+		case TYPEFUNC_COMPOSITE_DOMAIN:
 			if (resultTupleDesc)
-				*resultTupleDesc = lookup_rowtype_tupdesc_copy(rettype, -1);
+				*resultTupleDesc = lookup_rowtype_tupdesc_copy(base_rettype, -1);
 			/* Named composite types can't have any polymorphic columns */
 			break;
 		case TYPEFUNC_SCALAR:
@@ -393,11 +398,51 @@ internal_get_result_type(Oid funcid,
 	return result;
 }
 
+/*
+ * get_expr_result_tupdesc
+ *		Get a tupdesc describing the result of a composite-valued expression
+ *
+ * If expression is not composite or rowtype can't be determined, returns NULL
+ * if noError is true, else throws error.
+ *
+ * This is a simpler version of get_expr_result_type() for use when the caller
+ * is only interested in determinate rowtype results.
+ */
+TupleDesc
+get_expr_result_tupdesc(Node *expr, bool noError)
+{
+	TupleDesc	tupleDesc;
+	TypeFuncClass functypclass;
+
+	functypclass = get_expr_result_type(expr, NULL, &tupleDesc);
+
+	if (functypclass == TYPEFUNC_COMPOSITE ||
+		functypclass == TYPEFUNC_COMPOSITE_DOMAIN)
+		return tupleDesc;
+
+	if (!noError)
+	{
+		Oid			exprTypeId = exprType(expr);
+
+		if (exprTypeId != RECORDOID)
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("type %s is not composite",
+							format_type_be(exprTypeId))));
+		else
+			ereport(ERROR,
+					(errcode(ERRCODE_WRONG_OBJECT_TYPE),
+					 errmsg("record type has not been registered")));
+	}
+
+	return NULL;
+}
+
 /*
  * Given the result tuple descriptor for a function with OUT parameters,
  * replace any polymorphic columns (ANYELEMENT etc) with correct data types
- * deduced from the input arguments. Returns TRUE if able to deduce all types,
- * FALSE if not.
+ * deduced from the input arguments. Returns true if able to deduce all types,
+ * false if not.
  */
 static bool
 resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
@@ -419,7 +464,7 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 	/* See if there are any polymorphic outputs; quick out if not */
 	for (i = 0; i < natts; i++)
 	{
-		switch (tupdesc->attrs[i]->atttypid)
+		switch (TupleDescAttr(tupdesc, i)->atttypid)
 		{
 			case ANYELEMENTOID:
 				have_anyelement_result = true;
@@ -548,13 +593,15 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 	/* And finally replace the tuple column types as needed */
 	for (i = 0; i < natts; i++)
 	{
-		switch (tupdesc->attrs[i]->atttypid)
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+		switch (att->atttypid)
 		{
 			case ANYELEMENTOID:
 			case ANYNONARRAYOID:
 			case ANYENUMOID:
 				TupleDescInitEntry(tupdesc, i + 1,
-								   NameStr(tupdesc->attrs[i]->attname),
+								   NameStr(att->attname),
 								   anyelement_type,
 								   -1,
 								   0);
@@ -562,7 +609,7 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 				break;
 			case ANYARRAYOID:
 				TupleDescInitEntry(tupdesc, i + 1,
-								   NameStr(tupdesc->attrs[i]->attname),
+								   NameStr(att->attname),
 								   anyarray_type,
 								   -1,
 								   0);
@@ -570,7 +617,7 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 				break;
 			case ANYRANGEOID:
 				TupleDescInitEntry(tupdesc, i + 1,
-								   NameStr(tupdesc->attrs[i]->attname),
+								   NameStr(att->attname),
 								   anyrange_type,
 								   -1,
 								   0);
@@ -587,7 +634,7 @@ resolve_polymorphic_tupdesc(TupleDesc tupdesc, oidvector *declared_args,
 /*
  * Given the declared argument types and modes for a function, replace any
  * polymorphic types (ANYELEMENT etc) with correct data types deduced from the
- * input arguments.  Returns TRUE if able to deduce all types, FALSE if not.
+ * input arguments.  Returns true if able to deduce all types, false if not.
  * This is the same logic as resolve_polymorphic_tupdesc, but with a different
  * argument representation.
  *
@@ -739,23 +786,31 @@ resolve_polymorphic_argtypes(int numargs, Oid *argtypes, char *argmodes,
 /*
  * get_type_func_class
  *		Given the type OID, obtain its TYPEFUNC classification.
+ *		Also, if it's a domain, return the base type OID.
  *
  * This is intended to centralize a bunch of formerly ad-hoc code for
  * classifying types.  The categories used here are useful for deciding
  * how to handle functions returning the datatype.
  */
 static TypeFuncClass
-get_type_func_class(Oid typid)
+get_type_func_class(Oid typid, Oid *base_typeid)
 {
+	*base_typeid = typid;
+
 	switch (get_typtype(typid))
 	{
 		case TYPTYPE_COMPOSITE:
 			return TYPEFUNC_COMPOSITE;
 		case TYPTYPE_BASE:
-		case TYPTYPE_DOMAIN:
 		case TYPTYPE_ENUM:
 		case TYPTYPE_RANGE:
 			return TYPEFUNC_SCALAR;
+		case TYPTYPE_DOMAIN:
+			*base_typeid = typid = getBaseType(typid);
+			if (get_typtype(typid) == TYPTYPE_COMPOSITE)
+				return TYPEFUNC_COMPOSITE_DOMAIN;
+			else				/* domain base type can't be a pseudotype */
+				return TYPEFUNC_SCALAR;
 		case TYPTYPE_PSEUDO:
 			if (typid == RECORDOID)
 				return TYPEFUNC_RECORD;
@@ -1318,16 +1373,20 @@ RelationNameGetTupleDesc(const char *relname)
 TupleDesc
 TypeGetTupleDesc(Oid typeoid, List *colaliases)
 {
-	TypeFuncClass functypclass = get_type_func_class(typeoid);
+	Oid			base_typeoid;
+	TypeFuncClass functypclass = get_type_func_class(typeoid, &base_typeoid);
 	TupleDesc	tupdesc = NULL;
 
 	/*
-	 * Build a suitable tupledesc representing the output rows
+	 * Build a suitable tupledesc representing the output rows.  We
+	 * intentionally do not support TYPEFUNC_COMPOSITE_DOMAIN here, as it's
+	 * unlikely that legacy callers of this obsolete function would be
+	 * prepared to apply domain constraints.
 	 */
 	if (functypclass == TYPEFUNC_COMPOSITE)
 	{
 		/* Composite data type, e.g. a table's row type */
-		tupdesc = lookup_rowtype_tupdesc_copy(typeoid, -1);
+		tupdesc = lookup_rowtype_tupdesc_copy(base_typeoid, -1);
 
 		if (colaliases != NIL)
 		{
@@ -1344,9 +1403,10 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
 			for (varattno = 0; varattno < natts; varattno++)
 			{
 				char	   *label = strVal(list_nth(colaliases, varattno));
+				Form_pg_attribute attr = TupleDescAttr(tupdesc, varattno);
 
 				if (label != NULL)
-					namestrcpy(&(tupdesc->attrs[varattno]->attname), label);
+					namestrcpy(&(attr->attname), label);
 			}
 
 			/* The tuple type is now an anonymous record type */
@@ -1397,3 +1457,116 @@ TypeGetTupleDesc(Oid typeoid, List *colaliases)
 
 	return tupdesc;
 }
+
+/*
+ * extract_variadic_args
+ *
+ * Extract a set of argument values, types and NULL markers for a given
+ * input function which makes use of a VARIADIC input whose argument list
+ * depends on the caller context. When doing a VARIADIC call, the caller
+ * has provided one argument made of an array of values, so deconstruct the
+ * array data before using it for the next processing. If no VARIADIC call
+ * is used, just fill in the status data based on all the arguments given
+ * by the caller.
+ *
+ * This function returns the number of arguments generated, or -1 in the
+ * case of "VARIADIC NULL".
+ */
+int
+extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start,
+					  bool convert_unknown, Datum **args, Oid **types,
+					  bool **nulls)
+{
+	bool		variadic = get_fn_expr_variadic(fcinfo->flinfo);
+	Datum	   *args_res;
+	bool	   *nulls_res;
+	Oid		   *types_res;
+	int			nargs,
+				i;
+
+	*args = NULL;
+	*types = NULL;
+	*nulls = NULL;
+
+	if (variadic)
+	{
+		ArrayType  *array_in;
+		Oid			element_type;
+		bool		typbyval;
+		char		typalign;
+		int16		typlen;
+
+		Assert(PG_NARGS() == variadic_start + 1);
+
+		if (PG_ARGISNULL(variadic_start))
+			return -1;
+
+		array_in = PG_GETARG_ARRAYTYPE_P(variadic_start);
+		element_type = ARR_ELEMTYPE(array_in);
+
+		get_typlenbyvalalign(element_type,
+							 &typlen, &typbyval, &typalign);
+		deconstruct_array(array_in, element_type, typlen, typbyval,
+						  typalign, &args_res, &nulls_res,
+						  &nargs);
+
+		/* All the elements of the array have the same type */
+		types_res = (Oid *) palloc0(nargs * sizeof(Oid));
+		for (i = 0; i < nargs; i++)
+			types_res[i] = element_type;
+	}
+	else
+	{
+		nargs = PG_NARGS() - variadic_start;
+		Assert(nargs > 0);
+		nulls_res = (bool *) palloc0(nargs * sizeof(bool));
+		args_res = (Datum *) palloc0(nargs * sizeof(Datum));
+		types_res = (Oid *) palloc0(nargs * sizeof(Oid));
+
+		for (i = 0; i < nargs; i++)
+		{
+			nulls_res[i] = PG_ARGISNULL(i + variadic_start);
+			types_res[i] = get_fn_expr_argtype(fcinfo->flinfo,
+											   i + variadic_start);
+
+			/*
+			 * Turn a constant (more or less literal) value that's of unknown
+			 * type into text if required. Unknowns come in as a cstring
+			 * pointer. Note: for functions declared as taking type "any", the
+			 * parser will not do any type conversion on unknown-type literals
+			 * (that is, undecorated strings or NULLs).
+			 */
+			if (convert_unknown &&
+				types_res[i] == UNKNOWNOID &&
+				get_fn_expr_arg_stable(fcinfo->flinfo, i + variadic_start))
+			{
+				types_res[i] = TEXTOID;
+
+				if (PG_ARGISNULL(i + variadic_start))
+					args_res[i] = (Datum) 0;
+				else
+					args_res[i] =
+						CStringGetTextDatum(PG_GETARG_POINTER(i + variadic_start));
+			}
+			else
+			{
+				/* no conversion needed, just take the datum as given */
+				args_res[i] = PG_GETARG_DATUM(i + variadic_start);
+			}
+
+			if (!OidIsValid(types_res[i]) ||
+				(convert_unknown && types_res[i] == UNKNOWNOID))
+				ereport(ERROR,
+						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
+						 errmsg("could not determine data type for argument %d",
+								i + 1)));
+		}
+	}
+
+	/* Fill in results */
+	*args = args_res;
+	*nulls = nulls_res;
+	*types = types_res;
+
+	return nargs;
+}
diff --git a/src/backend/utils/generate-errcodes.pl b/src/backend/utils/generate-errcodes.pl
index 6a577f657a..e9f1715a0d 100644
--- a/src/backend/utils/generate-errcodes.pl
+++ b/src/backend/utils/generate-errcodes.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate the errcodes.h header from errcodes.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/backend/utils/hash/dynahash.c b/src/backend/utils/hash/dynahash.c
index 6f6b03c815..5281cd5410 100644
--- a/src/backend/utils/hash/dynahash.c
+++ b/src/backend/utils/hash/dynahash.c
@@ -41,7 +41,7 @@
  * function must be supplied; comparison defaults to memcmp() and key copying
  * to memcpy() when a user-defined hashing function is selected.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -340,9 +340,11 @@ hash_create(const char *tabname, long nelem, HASHCTL *info, int flags)
 			CurrentDynaHashCxt = info->hcxt;
 		else
 			CurrentDynaHashCxt = TopMemoryContext;
-		CurrentDynaHashCxt = AllocSetContextCreate(CurrentDynaHashCxt,
-												   tabname,
-												   ALLOCSET_DEFAULT_SIZES);
+		CurrentDynaHashCxt =
+			AllocSetContextCreateExtended(CurrentDynaHashCxt,
+										  tabname,
+										  MEMCONTEXT_COPY_NAME,
+										  ALLOCSET_DEFAULT_SIZES);
 	}
 
 	/* Initialize the hash header, plus a copy of the table name */
@@ -891,8 +893,8 @@ calc_bucket(HASHHDR *hctl, uint32 hash_val)
  * HASH_ENTER_NULL cannot be used with the default palloc-based allocator,
  * since palloc internally ereports on out-of-memory.
  *
- * If foundPtr isn't NULL, then *foundPtr is set TRUE if we found an
- * existing entry in the table, FALSE otherwise.  This is needed in the
+ * If foundPtr isn't NULL, then *foundPtr is set true if we found an
+ * existing entry in the table, false otherwise.  This is needed in the
  * HASH_ENTER case, but is redundant with the return value otherwise.
  *
  * For hash_search_with_hash_value, the hashvalue parameter must have been
@@ -1096,12 +1098,12 @@ hash_search_with_hash_value(HTAB *hashp,
  * Therefore this cannot suffer an out-of-memory failure, even if there are
  * other processes operating in other partitions of the hashtable.
  *
- * Returns TRUE if successful, FALSE if the requested new hash key is already
+ * Returns true if successful, false if the requested new hash key is already
  * present.  Throws error if the specified entry pointer isn't actually a
  * table member.
  *
  * NB: currently, there is no special case for old and new hash keys being
- * identical, which means we'll report FALSE for that situation.  This is
+ * identical, which means we'll report false for that situation.  This is
  * preferable for existing uses.
  *
  * NB: for a partitioned hashtable, caller must hold lock on both relevant
diff --git a/src/backend/utils/hash/hashfn.c b/src/backend/utils/hash/hashfn.c
index 9a93c089a6..9b7ddbad0b 100644
--- a/src/backend/utils/hash/hashfn.c
+++ b/src/backend/utils/hash/hashfn.c
@@ -4,7 +4,7 @@
  *		Hash functions for use in dynahash.c hashtables
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/hash/pg_crc.c b/src/backend/utils/hash/pg_crc.c
index 9dc6c9dcc9..688ea0265f 100644
--- a/src/backend/utils/hash/pg_crc.c
+++ b/src/backend/utils/hash/pg_crc.c
@@ -7,7 +7,7 @@
  * A PAINLESS GUIDE TO CRC ERROR DETECTION ALGORITHMS, available from
  * http://www.ross.net/crc/download/crc_v3.txt or several other net sites.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/init/globals.c b/src/backend/utils/init/globals.c
index 7c09498dc0..446040d816 100644
--- a/src/backend/utils/init/globals.c
+++ b/src/backend/utils/init/globals.c
@@ -3,7 +3,7 @@
  * globals.c
  *	  global variable declarations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -112,7 +112,7 @@ bool		enableFsync = true;
 bool		allowSystemTableMods = false;
 int			work_mem = 1024;
 int			maintenance_work_mem = 16384;
-int			replacement_sort_tuples = 150000;
+int			max_parallel_maintenance_workers = 2;
 
 /*
  * Primary determinants of sizes of shared-memory structures.
diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index afbf8f8691..87ed7d3f71 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -3,7 +3,7 @@
  * miscinit.c
  *	  miscellaneous initialization support stuff
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -1273,11 +1273,11 @@ AddToDataDirLockFile(int target_line, const char *str)
 
 /*
  * Recheck that the data directory lock file still exists with expected
- * content.  Return TRUE if the lock file appears OK, FALSE if it isn't.
+ * content.  Return true if the lock file appears OK, false if it isn't.
  *
  * We call this periodically in the postmaster.  The idea is that if the
  * lock file has been removed or replaced by another postmaster, we should
- * do a panic database shutdown.  Therefore, we should return TRUE if there
+ * do a panic database shutdown.  Therefore, we should return true if there
  * is any doubt: we do not want to cause a panic shutdown unnecessarily.
  * Transient failures like EINTR or ENFILE should not cause us to fail.
  * (If there really is something wrong, we'll detect it on a future recheck.)
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index eb6960d93f..484628987f 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -3,7 +3,7 @@
  * postinit.c
  *	  postgres initialization utilities
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -21,6 +21,7 @@
 
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/session.h"
 #include "access/sysattr.h"
 #include "access/xact.h"
 #include "access/xlog.h"
@@ -245,12 +246,15 @@ PerformAuthentication(Port *port)
 	{
 		if (am_walsender)
 		{
-#ifdef USE_OPENSSL
+#ifdef USE_SSL
 			if (port->ssl_in_use)
 				ereport(LOG,
-						(errmsg("replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)",
-								port->user_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl),
-								SSL_get_current_compression(port->ssl) ? _("on") : _("off"))));
+						(errmsg("replication connection authorized: user=%s SSL enabled (protocol=%s, cipher=%s, bits=%d, compression=%s)",
+								port->user_name,
+								be_tls_get_version(port),
+								be_tls_get_cipher(port),
+								be_tls_get_cipher_bits(port),
+								be_tls_get_compression(port) ? _("on") : _("off"))));
 			else
 #endif
 				ereport(LOG,
@@ -259,12 +263,15 @@ PerformAuthentication(Port *port)
 		}
 		else
 		{
-#ifdef USE_OPENSSL
+#ifdef USE_SSL
 			if (port->ssl_in_use)
 				ereport(LOG,
-						(errmsg("connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s, compression=%s)",
-								port->user_name, port->database_name, SSL_get_version(port->ssl), SSL_get_cipher(port->ssl),
-								SSL_get_current_compression(port->ssl) ? _("on") : _("off"))));
+						(errmsg("connection authorized: user=%s database=%s SSL enabled (protocol=%s, cipher=%s, bits=%d, compression=%s)",
+								port->user_name, port->database_name,
+								be_tls_get_version(port),
+								be_tls_get_cipher(port),
+								be_tls_get_cipher_bits(port),
+								be_tls_get_compression(port) ? _("on") : _("off"))));
 			else
 #endif
 				ereport(LOG,
@@ -1027,6 +1034,9 @@ InitPostgres(const char *in_dbname, Oid dboid, const char *username,
 	/* initialize client encoding */
 	InitializeClientEncoding();
 
+	/* Initialize this backend's session state. */
+	InitializeSession();
+
 	/* report this backend in the PgBackendStatus array */
 	if (!bootstrap)
 		pgstat_bestart();
diff --git a/src/backend/utils/mb/Unicode/Makefile b/src/backend/utils/mb/Unicode/Makefile
index 8f3afa01e2..00a6256b66 100644
--- a/src/backend/utils/mb/Unicode/Makefile
+++ b/src/backend/utils/mb/Unicode/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/backend/utils/mb/Unicode
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/Makefile
 #
@@ -73,40 +73,40 @@ GENERICTEXTS = $(ISO8859TEXTS) $(WINTEXTS) \
 all: $(MAPS)
 
 $(GENERICMAPS): UCS_to_most.pl $(GENERICTEXTS)
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 johab_to_utf8.map utf8_to_johab.map: UCS_to_JOHAB.pl JOHAB.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 uhc_to_utf8.map utf8_to_uhc.map: UCS_to_UHC.pl windows-949-2000.xml
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 euc_jp_to_utf8.map utf8_to_euc_jp.map: UCS_to_EUC_JP.pl CP932.TXT JIS0212.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 euc_cn_to_utf8.map utf8_to_euc_cn.map: UCS_to_EUC_CN.pl gb-18030-2000.xml
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 euc_kr_to_utf8.map utf8_to_euc_kr.map: UCS_to_EUC_KR.pl KSX1001.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 euc_tw_to_utf8.map utf8_to_euc_tw.map: UCS_to_EUC_TW.pl CNS11643.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 sjis_to_utf8.map utf8_to_sjis.map: UCS_to_SJIS.pl CP932.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 gb18030_to_utf8.map utf8_to_gb18030.map: UCS_to_GB18030.pl gb-18030-2000.xml
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 big5_to_utf8.map utf8_to_big5.map: UCS_to_BIG5.pl BIG5.TXT CP950.TXT
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 euc_jis_2004_to_utf8.map utf8_to_euc_jis_2004.map: UCS_to_EUC_JIS_2004.pl euc-jis-2004-std.txt
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 shift_jis_2004_to_utf8.map utf8_to_shift_jis_2004.map: UCS_to_SHIFT_JIS_2004.pl sjis-0213-2004-std.txt
-	$(PERL) $<
+	$(PERL) -I $(srcdir) $<
 
 distclean: clean
 	rm -f $(TEXTS)
diff --git a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
index 05822b2fce..4190ee5c7b 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_BIG5.pl
 #
@@ -27,7 +27,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_BIG5.pl';
 
 # Load BIG5.TXT
 my $all = &read_source("BIG5.TXT");
diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl
index f7f94967d9..2971e64a11 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
 #
@@ -16,7 +16,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl';
 
 # Read the input
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl
index 229003196b..1c1152e820 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl
 #
@@ -10,7 +10,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl';
 
 # first generate UTF-8 --> EUC_JIS_2004 table
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
index 5db663f362..0ac1f17245 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl
 #
@@ -14,7 +14,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl';
 
 # Load JIS0212.TXT
 my $jis0212 = &read_source("JIS0212.TXT");
diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
index f0d978d3df..4d6a3cabaa 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl
 #
@@ -19,7 +19,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl';
 
 # Load the source file.
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
index 0bfcbd5bb2..89f3cd7006 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl
 #
@@ -20,7 +20,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl';
 
 my $mapping = &read_source("CNS11643.TXT");
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
index 4469cc7c9d..ec184d760f 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
 #
@@ -16,7 +16,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_GB18030.pl';
 
 # Read the input
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl b/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
index 7c6f526f0d..b580373a5c 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl
 #
@@ -18,7 +18,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl';
 
 # Load the source file.
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl
index d1b36c0d77..d153e4c8e6 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl
 #
@@ -12,7 +12,7 @@
 
 # first generate UTF-8 --> SHIFT_JIS_2004 table
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl';
 
 my $in_file = "sjis-0213-2004-std.txt";
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
index 746096449c..a50f6f39cd 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_SJIS.pl
 #
@@ -13,7 +13,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_SJIS.pl';
 
 my $mapping = read_source("CP932.TXT");
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_UHC.pl b/src/backend/utils/mb/Unicode/UCS_to_UHC.pl
index 8d99ca302b..dc9fb753b9 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_UHC.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_UHC.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_GB18030.pl
 #
@@ -16,7 +16,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_UHC.pl';
 
 # Read the input
 
diff --git a/src/backend/utils/mb/Unicode/UCS_to_most.pl b/src/backend/utils/mb/Unicode/UCS_to_most.pl
index 60431a6a27..445344932a 100755
--- a/src/backend/utils/mb/Unicode/UCS_to_most.pl
+++ b/src/backend/utils/mb/Unicode/UCS_to_most.pl
@@ -1,6 +1,6 @@
 #! /usr/bin/perl
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/UCS_to_most.pl
 #
@@ -18,7 +18,7 @@
 use strict;
 use convutils;
 
-my $this_script = $0;
+my $this_script = 'src/backend/utils/mb/Unicode/UCS_to_most.pl';
 
 my %filename = (
 	'WIN866'     => 'CP866.TXT',
@@ -50,7 +50,7 @@
 	'GBK'        => 'CP936.TXT');
 
 # make maps for all encodings if not specified
-my @charsets = (scalar(@ARGV) > 0) ? @ARGV : keys(%filename);
+my @charsets = (scalar(@ARGV) > 0) ? @ARGV : sort keys(%filename);
 
 foreach my $charset (@charsets)
 {
diff --git a/src/backend/utils/mb/Unicode/big5_to_utf8.map b/src/backend/utils/mb/Unicode/big5_to_utf8.map
index a28715cd0f..aa417bc9c8 100644
--- a/src/backend/utils/mb/Unicode/big5_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/big5_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/big5_to_utf8.map */
-/* This file is generated by UCS_to_BIG5.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_BIG5.pl */
 
 static const uint32 big5_to_unicode_tree_table[17088];
 
diff --git a/src/backend/utils/mb/Unicode/convutils.pm b/src/backend/utils/mb/Unicode/convutils.pm
index 43cadf5303..69494d0df3 100644
--- a/src/backend/utils/mb/Unicode/convutils.pm
+++ b/src/backend/utils/mb/Unicode/convutils.pm
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2001-2017, PostgreSQL Global Development Group
+# Copyright (c) 2001-2018, PostgreSQL Global Development Group
 #
 # src/backend/utils/mb/Unicode/convutils.pm
 
@@ -7,6 +7,7 @@ package convutils;
 
 use strict;
 
+use Carp;
 use Exporter 'import';
 
 our @EXPORT =
@@ -698,7 +699,7 @@ sub make_charmap
 {
 	my ($out, $charset, $direction, $verbose) = @_;
 
-	die "unacceptable direction : $direction"
+	croak "unacceptable direction : $direction"
 	  if ($direction != TO_UNICODE && $direction != FROM_UNICODE);
 
 	# In verbose mode, print a large comment with the source and comment of
@@ -759,7 +760,7 @@ sub make_charmap_combined
 {
 	my ($charset, $direction) = @_;
 
-	die "unacceptable direction : $direction"
+	croak "unacceptable direction : $direction"
 	  if ($direction != TO_UNICODE && $direction != FROM_UNICODE);
 
 	my @combined;
@@ -812,7 +813,7 @@ sub ucs2utf
 		  (((($ucs & 0x3ffff) >> 12) | 0x80) << 16) |
 		  (((($ucs & 0x0fc0) >> 6) | 0x80) << 8) | (($ucs & 0x003f) | 0x80);
 	}
-	return ($utf);
+	return $utf;
 }
 
 1;
diff --git a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
index a4090512cf..3801e08ef5 100644
--- a/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_cn_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/euc_cn_to_utf8.map */
-/* This file is generated by UCS_to_EUC_CN.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl */
 
 static const uint32 euc_cn_to_unicode_tree_table[7792];
 
diff --git a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
index eb9c35ace3..d2da4a383b 100644
--- a/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/euc_jis_2004_to_utf8.map */
-/* This file is generated by UCS_to_EUC_JIS_2004.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl */
 
 static const uint32 euc_jis_2004_to_unicode_tree_table[11727];
 
diff --git a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
index df8e7fdbdf..96b79a58a1 100644
--- a/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_jp_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/euc_jp_to_utf8.map */
-/* This file is generated by UCS_to_EUC_JP.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl */
 
 static const uint32 euc_jp_to_unicode_tree_table[14254];
 
diff --git a/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map b/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
index 4dcce2f1ab..bf1fc4a98b 100644
--- a/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_kr_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/euc_kr_to_utf8.map */
-/* This file is generated by UCS_to_EUC_KR.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl */
 
 static const uint32 euc_kr_to_unicode_tree_table[8553];
 
diff --git a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
index 8a04289d38..22af269924 100644
--- a/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/euc_tw_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/euc_tw_to_utf8.map */
-/* This file is generated by UCS_to_EUC_TW.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl */
 
 static const uint32 euc_tw_to_unicode_tree_table[27068];
 
diff --git a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
index e2c94e410b..79072fe767 100644
--- a/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/gb18030_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/gb18030_to_utf8.map */
-/* This file is generated by UCS_to_GB18030.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_GB18030.pl */
 
 static const uint32 gb18030_to_unicode_tree_table[32795];
 
diff --git a/src/backend/utils/mb/Unicode/gbk_to_utf8.map b/src/backend/utils/mb/Unicode/gbk_to_utf8.map
index 51098776cb..35d710c3b3 100644
--- a/src/backend/utils/mb/Unicode/gbk_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/gbk_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/gbk_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 gbk_to_unicode_tree_table[24354];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
index 6440d3f070..83961d1327 100644
--- a/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_10_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_10_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
index 65e65cbe31..9efdc9a207 100644
--- a/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_13_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_13_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
index 3f9267da17..766b8703b3 100644
--- a/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_14_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_14_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
index 12eeda7e4a..6ab3f21146 100644
--- a/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_15_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_15_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
index 0146f5ffdb..a639654034 100644
--- a/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_16_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_16_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
index c4bd0f186a..9046300917 100644
--- a/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_2_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_2_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
index bab3556ce8..c716fc3159 100644
--- a/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_3_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_3_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
index e0e0998211..3b711062e4 100644
--- a/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_4_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_4_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
index 90a73503c7..447a4f194f 100644
--- a/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_5_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_5_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
index 20b855fded..5b8be5b6a0 100644
--- a/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_6_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_6_to_unicode_tree_table[230];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
index 69cb1582a7..f4dd1d815a 100644
--- a/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_7_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_7_to_unicode_tree_table[254];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
index 25112c3e4b..194a1b8ebc 100644
--- a/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_8_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 iso8859_8_to_unicode_tree_table[254];
 
diff --git a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
index 5d761c918d..eec3cb8c1b 100644
--- a/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/iso8859_9_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_9_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/johab_to_utf8.map b/src/backend/utils/mb/Unicode/johab_to_utf8.map
index 0767ca0d4c..07d2505c26 100644
--- a/src/backend/utils/mb/Unicode/johab_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/johab_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/johab_to_utf8.map */
-/* This file is generated by UCS_to_JOHAB.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl */
 
 static const uint32 johab_to_unicode_tree_table[22987];
 
diff --git a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
index a4497c9b62..0988748585 100644
--- a/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/koi8r_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/koi8r_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 koi8r_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/koi8u_to_utf8.map b/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
index 404eea8840..2b2ddc9b81 100644
--- a/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/koi8u_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/koi8u_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 koi8u_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
index f655663f5a..e591a1135b 100644
--- a/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/shift_jis_2004_to_utf8.map */
-/* This file is generated by UCS_to_SHIFT_JIS_2004.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl */
 
 static const uint32 shift_jis_2004_to_unicode_tree_table[11716];
 
diff --git a/src/backend/utils/mb/Unicode/sjis_to_utf8.map b/src/backend/utils/mb/Unicode/sjis_to_utf8.map
index cec9990fdc..2b60a240b6 100644
--- a/src/backend/utils/mb/Unicode/sjis_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/sjis_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/sjis_to_utf8.map */
-/* This file is generated by UCS_to_SJIS.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_SJIS.pl */
 
 static const uint32 sjis_to_unicode_tree_table[8786];
 
diff --git a/src/backend/utils/mb/Unicode/uhc_to_utf8.map b/src/backend/utils/mb/Unicode/uhc_to_utf8.map
index 0d56e6d807..65d57639da 100644
--- a/src/backend/utils/mb/Unicode/uhc_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/uhc_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/uhc_to_utf8.map */
-/* This file is generated by UCS_to_UHC.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_UHC.pl */
 
 static const uint32 uhc_to_unicode_tree_table[24256];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_big5.map b/src/backend/utils/mb/Unicode/utf8_to_big5.map
index 132383a7ed..ea26c8a80e 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_big5.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_big5.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_big5.map */
-/* This file is generated by UCS_to_BIG5.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_BIG5.pl */
 
 static const uint16 big5_from_unicode_tree_table[22839];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map b/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
index f3bdf772d3..488d3be043 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_cn.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_euc_cn.map */
-/* This file is generated by UCS_to_EUC_CN.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_CN.pl */
 
 static const uint16 euc_cn_from_unicode_tree_table[21644];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
index 72337da8ca..fa90f3958f 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_euc_jis_2004.map */
-/* This file is generated by UCS_to_EUC_JIS_2004.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_JIS_2004.pl */
 
 static const uint32 euc_jis_2004_from_unicode_tree_table[39163];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map b/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
index 7193fa7be9..1adcedf26d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_jp.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_euc_jp.map */
-/* This file is generated by UCS_to_EUC_JP.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_JP.pl */
 
 static const uint32 euc_jp_from_unicode_tree_table[23370];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map b/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
index 23221f4fa9..b5c4823850 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_kr.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_euc_kr.map */
-/* This file is generated by UCS_to_EUC_KR.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_KR.pl */
 
 static const uint16 euc_kr_from_unicode_tree_table[33954];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map b/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
index 74dd9e78d5..e3a35ea653 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_euc_tw.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_euc_tw.map */
-/* This file is generated by UCS_to_EUC_TW.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_EUC_TW.pl */
 
 static const uint32 euc_tw_from_unicode_tree_table[22640];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
index 7741b8b3c2..5acee4554c 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_gb18030.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_gb18030.map */
-/* This file is generated by UCS_to_GB18030.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_GB18030.pl */
 
 static const uint32 gb18030_from_unicode_tree_table[31972];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_gbk.map b/src/backend/utils/mb/Unicode/utf8_to_gbk.map
index fd8aed6bb5..528b054a63 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_gbk.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_gbk.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_gbk.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 gbk_from_unicode_tree_table[24198];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
index db36f10cd7..899eaf9753 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_10.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_10_from_unicode_tree_table[319];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
index eea83e6159..cae360fc9d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_13.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_13_from_unicode_tree_table[326];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
index 4cdc0550cd..bb2bc3b55f 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_14.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_14_from_unicode_tree_table[507];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
index 52c7813de9..6bc8a32908 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_15.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_15_from_unicode_tree_table[263];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
index fbe7df22c1..59a2ecac90 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_16.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_16_from_unicode_tree_table[425];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
index f7a71c378a..94b65c2c62 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_2.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_2_from_unicode_tree_table[386];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
index b50364d257..c489fda08d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_3.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_3_from_unicode_tree_table[373];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
index f5043b92ad..b273518f18 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_4.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_4_from_unicode_tree_table[385];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
index a3c2540d16..75c6ea615a 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_5.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_5_from_unicode_tree_table[274];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
index ab6fb628ae..b237f54be1 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_6.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_6_from_unicode_tree_table[248];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
index 9ec5ae5cfb..656b80abd1 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_7.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_7_from_unicode_tree_table[386];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
index 59ae5b5968..b512bd5ed7 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_8_from_unicode_tree_table[279];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
index 3dc5163e84..98a2eabbc8 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_iso8859_9.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 iso8859_9_from_unicode_tree_table[324];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_johab.map b/src/backend/utils/mb/Unicode/utf8_to_johab.map
index 08957072ea..8a4e69a9e5 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_johab.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_johab.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_johab.map */
-/* This file is generated by UCS_to_JOHAB.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_JOHAB.pl */
 
 static const uint16 johab_from_unicode_tree_table[34515];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_koi8r.map b/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
index 342d3bfe19..bdc52ad09a 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_koi8r.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_koi8r.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 koi8r_from_unicode_tree_table[678];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_koi8u.map b/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
index 2957e96bba..bb5c56a6de 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_koi8u.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_koi8u.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 koi8u_from_unicode_tree_table[727];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
index db52dd0845..b756b5f157 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_shift_jis_2004.map */
-/* This file is generated by UCS_to_SHIFT_JIS_2004.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_SHIFT_JIS_2004.pl */
 
 static const uint16 shift_jis_2004_from_unicode_tree_table[39196];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_sjis.map b/src/backend/utils/mb/Unicode/utf8_to_sjis.map
index 20ad5dfe7c..72acc0977c 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_sjis.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_sjis.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_sjis.map */
-/* This file is generated by UCS_to_SJIS.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_SJIS.pl */
 
 static const uint16 sjis_from_unicode_tree_table[22895];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_uhc.map b/src/backend/utils/mb/Unicode/utf8_to_uhc.map
index 14ad2455e7..4e8b857cd7 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_uhc.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_uhc.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_uhc.map */
-/* This file is generated by UCS_to_UHC.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_UHC.pl */
 
 static const uint16 uhc_from_unicode_tree_table[34768];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1250.map b/src/backend/utils/mb/Unicode/utf8_to_win1250.map
index e33983ad4f..3d83c18fe6 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1250.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1250.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1250.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1250_from_unicode_tree_table[507];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1251.map b/src/backend/utils/mb/Unicode/utf8_to_win1251.map
index f8a817bf36..d4160171ed 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1251.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1251.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1251.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1251_from_unicode_tree_table[446];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1252.map b/src/backend/utils/mb/Unicode/utf8_to_win1252.map
index 4b536c6775..b98b73f239 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1252.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1252.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1252.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1252_from_unicode_tree_table[513];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1253.map b/src/backend/utils/mb/Unicode/utf8_to_win1253.map
index 790a778cf1..e1812715a0 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1253.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1253.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1253.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1253_from_unicode_tree_table[454];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1254.map b/src/backend/utils/mb/Unicode/utf8_to_win1254.map
index dc920e78c3..fd601c168a 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1254.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1254.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1254.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1254_from_unicode_tree_table[557];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1255.map b/src/backend/utils/mb/Unicode/utf8_to_win1255.map
index b140b6d7b7..1ece6434eb 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1255.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1255.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1255.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1255_from_unicode_tree_table[562];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1256.map b/src/backend/utils/mb/Unicode/utf8_to_win1256.map
index e69d890e3b..7fce018a1d 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1256.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1256.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1256.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1256_from_unicode_tree_table[765];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1257.map b/src/backend/utils/mb/Unicode/utf8_to_win1257.map
index 660e8761a3..1453887ead 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1257.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1257.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1257.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1257_from_unicode_tree_table[513];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win1258.map b/src/backend/utils/mb/Unicode/utf8_to_win1258.map
index b298f9d04f..dedcb109c0 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win1258.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win1258.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win1258.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win1258_from_unicode_tree_table[618];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win866.map b/src/backend/utils/mb/Unicode/utf8_to_win866.map
index 51adc24599..50e88c901f 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win866.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win866.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win866.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win866_from_unicode_tree_table[571];
 
diff --git a/src/backend/utils/mb/Unicode/utf8_to_win874.map b/src/backend/utils/mb/Unicode/utf8_to_win874.map
index c415c07b66..fe8ded3da4 100644
--- a/src/backend/utils/mb/Unicode/utf8_to_win874.map
+++ b/src/backend/utils/mb/Unicode/utf8_to_win874.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/utf8_to_win874.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint16 win874_from_unicode_tree_table[421];
 
diff --git a/src/backend/utils/mb/Unicode/win1250_to_utf8.map b/src/backend/utils/mb/Unicode/win1250_to_utf8.map
index 42c1b3dd00..67909ecf43 100644
--- a/src/backend/utils/mb/Unicode/win1250_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1250_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1250_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1250_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1251_to_utf8.map b/src/backend/utils/mb/Unicode/win1251_to_utf8.map
index f8a0b18ff9..4d5a7efef7 100644
--- a/src/backend/utils/mb/Unicode/win1251_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1251_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1251_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1251_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1252_to_utf8.map b/src/backend/utils/mb/Unicode/win1252_to_utf8.map
index 56aa5d1382..c09e134b1a 100644
--- a/src/backend/utils/mb/Unicode/win1252_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1252_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1252_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1252_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1253_to_utf8.map b/src/backend/utils/mb/Unicode/win1253_to_utf8.map
index df90e6e26b..2298371a7e 100644
--- a/src/backend/utils/mb/Unicode/win1253_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1253_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1253_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1253_to_unicode_tree_table[254];
 
diff --git a/src/backend/utils/mb/Unicode/win1254_to_utf8.map b/src/backend/utils/mb/Unicode/win1254_to_utf8.map
index eed765f7a4..84e009709f 100644
--- a/src/backend/utils/mb/Unicode/win1254_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1254_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1254_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1254_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1255_to_utf8.map b/src/backend/utils/mb/Unicode/win1255_to_utf8.map
index 4c9f7c0b10..133a06b9a3 100644
--- a/src/backend/utils/mb/Unicode/win1255_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1255_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1255_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1255_to_unicode_tree_table[254];
 
diff --git a/src/backend/utils/mb/Unicode/win1256_to_utf8.map b/src/backend/utils/mb/Unicode/win1256_to_utf8.map
index b617abb775..6f55484b0f 100644
--- a/src/backend/utils/mb/Unicode/win1256_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1256_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1256_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1256_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1257_to_utf8.map b/src/backend/utils/mb/Unicode/win1257_to_utf8.map
index 85b3ddf8ae..a58bb81d97 100644
--- a/src/backend/utils/mb/Unicode/win1257_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1257_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1257_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1257_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win1258_to_utf8.map b/src/backend/utils/mb/Unicode/win1258_to_utf8.map
index 5f288ce917..97e203aef7 100644
--- a/src/backend/utils/mb/Unicode/win1258_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win1258_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win1258_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win1258_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win866_to_utf8.map b/src/backend/utils/mb/Unicode/win866_to_utf8.map
index 04988b86ab..ed674f9503 100644
--- a/src/backend/utils/mb/Unicode/win866_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win866_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win866_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win866_to_unicode_tree_table[256];
 
diff --git a/src/backend/utils/mb/Unicode/win874_to_utf8.map b/src/backend/utils/mb/Unicode/win874_to_utf8.map
index c27b7e484e..dcccaf0363 100644
--- a/src/backend/utils/mb/Unicode/win874_to_utf8.map
+++ b/src/backend/utils/mb/Unicode/win874_to_utf8.map
@@ -1,5 +1,5 @@
 /* src/backend/utils/mb/Unicode/win874_to_utf8.map */
-/* This file is generated by UCS_to_most.pl */
+/* This file is generated by src/backend/utils/mb/Unicode/UCS_to_most.pl */
 
 static const uint32 win874_to_unicode_tree_table[248];
 
diff --git a/src/backend/utils/mb/conv.c b/src/backend/utils/mb/conv.c
index d46330b207..fb7c925397 100644
--- a/src/backend/utils/mb/conv.c
+++ b/src/backend/utils/mb/conv.c
@@ -2,7 +2,7 @@
  *
  *	  Utility functions for conversion procs.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
index 4bbeea1e6f..9f44d7e853 100644
--- a/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/ascii_and_mic/ascii_and_mic.c
@@ -2,7 +2,7 @@
  *
  *	  ASCII and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
index 677d7ea3eb..a37156a071 100644
--- a/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/cyrillic_and_mic/cyrillic_and_mic.c
@@ -2,7 +2,7 @@
  *
  *	  Cyrillic and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
index 83c2712eba..e8df57f35c 100644
--- a/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
+++ b/src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_JIS_2004, SHIFT_JIS_2004
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/mb/conversion_procs/euc2004_sjis2004/euc2004_sjis2004.c
diff --git a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
index c897bb2e49..ad3f12870b 100644
--- a/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_cn_and_mic/euc_cn_and_mic.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_CN and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
index 414aeff3b9..5564b02986 100644
--- a/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/euc_jp_and_sjis/euc_jp_and_sjis.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_JP, SJIS and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
index 94f4f813ef..c48704f9b2 100644
--- a/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/euc_kr_and_mic/euc_kr_and_mic.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_KR and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
index 1d9b10f8a7..68f76aa8cb 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/big5.c
@@ -361,14 +361,14 @@ CNStoBIG5(unsigned short cns, unsigned char lc)
 			for (i = 0; i < sizeof(b2c3) / (sizeof(unsigned short) * 2); i++)
 			{
 				if (b2c3[i][1] == cns)
-					return (b2c3[i][0]);
+					return b2c3[i][0];
 			}
 			break;
 		case LC_CNS11643_4:
 			for (i = 0; i < sizeof(b1c4) / (sizeof(unsigned short) * 2); i++)
 			{
 				if (b1c4[i][1] == cns)
-					return (b1c4[i][0]);
+					return b1c4[i][0];
 			}
 		default:
 			break;
diff --git a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
index cb7e296f26..9b5a408533 100644
--- a/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/euc_tw_and_big5/euc_tw_and_big5.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_TW, BIG5 and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
index 62b103a8dd..648aab4f95 100644
--- a/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
+++ b/src/backend/utils/mb/conversion_procs/latin2_and_win1250/latin2_and_win1250.c
@@ -2,7 +2,7 @@
  *
  *	  LATIN2 and WIN1250
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
index 02fa94b8aa..29c01cf771 100644
--- a/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
+++ b/src/backend/utils/mb/conversion_procs/latin_and_mic/latin_and_mic.c
@@ -2,7 +2,7 @@
  *
  *	  LATINn and MULE_INTERNAL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
index 724d3dd27e..e1a5a970ae 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_ascii/utf8_and_ascii.c
@@ -2,7 +2,7 @@
  *
  *	  ASCII <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
index 7a6c0f3b74..5562dff3d7 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_big5/utf8_and_big5.c
@@ -2,7 +2,7 @@
  *
  *	  BIG5 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
index 88ae8d309f..41fe6c5c28 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_cyrillic/utf8_and_cyrillic.c
@@ -2,7 +2,7 @@
  *
  *	  UTF8 and Cyrillic
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
index b21167997c..cc12708d65 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc2004/utf8_and_euc2004.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_JIS_2004 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
index ac7d475c05..e3f37a7b51 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_cn/utf8_and_euc_cn.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_CN <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
index 9a9ba810f2..2f0f111797 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_jp/utf8_and_euc_jp.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_JP <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
index 09289352ea..a7f4d20f59 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_kr/utf8_and_euc_kr.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_KR <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
index efd92bb6af..b2dfd55025 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_euc_tw/utf8_and_euc_tw.c
@@ -2,7 +2,7 @@
  *
  *	  EUC_TW <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
index 7022d99e41..6b8a2cac55 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gb18030/utf8_and_gb18030.c
@@ -2,7 +2,7 @@
  *
  *	  GB18030 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
index 13717b42f9..c0fd57aff5 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_gbk/utf8_and_gbk.c
@@ -2,7 +2,7 @@
  *
  *	  GBK <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
index 4e47cf66c5..d01b59467f 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859/utf8_and_iso8859.c
@@ -2,7 +2,7 @@
  *
  *	  ISO 8859 2-16 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
index 2cfc7bb83b..f72329e33b 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_iso8859_1/utf8_and_iso8859_1.c
@@ -2,7 +2,7 @@
  *
  *	  ISO8859_1 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
index dce5b52aad..1bc12145f6 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_johab/utf8_and_johab.c
@@ -2,7 +2,7 @@
  *
  *	  JOHAB <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
index 3db14bc09e..561730a420 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis/utf8_and_sjis.c
@@ -2,7 +2,7 @@
  *
  *	  SJIS <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
index adc1c9e93c..0dea5a2805 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_sjis2004/utf8_and_sjis2004.c
@@ -2,7 +2,7 @@
  *
  *	  SHIFT_JIS_2004 <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
index 8c71280715..738fd1191f 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_uhc/utf8_and_uhc.c
@@ -2,7 +2,7 @@
  *
  *	  UHC <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
index cec458c9f4..ec8221e89d 100644
--- a/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
+++ b/src/backend/utils/mb/conversion_procs/utf8_and_win/utf8_and_win.c
@@ -2,7 +2,7 @@
  *
  *	  WIN <--> UTF8
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mb/mbutils.c b/src/backend/utils/mb/mbutils.c
index ca7f129ebe..8d80ffe78b 100644
--- a/src/backend/utils/mb/mbutils.c
+++ b/src/backend/utils/mb/mbutils.c
@@ -23,7 +23,7 @@
  * the result is validly encoded according to the destination encoding.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -41,17 +41,6 @@
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 
-/*
- * When converting strings between different encodings, we assume that space
- * for converted result is 4-to-1 growth in the worst case. The rate for
- * currently supported encoding pairs are within 3 (SJIS JIS X0201 half width
- * kanna -> UTF8 is the worst case).  So "4" should be enough for the moment.
- *
- * Note that this is not the same as the maximum character width in any
- * particular encoding.
- */
-#define MAX_CONVERSION_GROWTH  4
-
 /*
  * We maintain a simple linked list caching the fmgr lookup info for the
  * currently selected conversion functions, as well as any that have been
@@ -726,14 +715,14 @@ perform_default_encoding_conversion(const char *src, int len,
 int
 pg_mb2wchar(const char *from, pg_wchar *to)
 {
-	return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) ((const unsigned char *) from, to, strlen(from));
+	return pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len((const unsigned char *) from, to, strlen(from));
 }
 
 /* convert a multibyte string to a wchar with a limited length */
 int
 pg_mb2wchar_with_len(const char *from, pg_wchar *to, int len)
 {
-	return (*pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len) ((const unsigned char *) from, to, len);
+	return pg_wchar_table[DatabaseEncoding->encoding].mb2wchar_with_len((const unsigned char *) from, to, len);
 }
 
 /* same, with any encoding */
@@ -741,21 +730,21 @@ int
 pg_encoding_mb2wchar_with_len(int encoding,
 							  const char *from, pg_wchar *to, int len)
 {
-	return (*pg_wchar_table[encoding].mb2wchar_with_len) ((const unsigned char *) from, to, len);
+	return pg_wchar_table[encoding].mb2wchar_with_len((const unsigned char *) from, to, len);
 }
 
 /* convert a wchar string to a multibyte */
 int
 pg_wchar2mb(const pg_wchar *from, char *to)
 {
-	return (*pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len) (from, (unsigned char *) to, pg_wchar_strlen(from));
+	return pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len(from, (unsigned char *) to, pg_wchar_strlen(from));
 }
 
 /* convert a wchar string to a multibyte with a limited length */
 int
 pg_wchar2mb_with_len(const pg_wchar *from, char *to, int len)
 {
-	return (*pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len) (from, (unsigned char *) to, len);
+	return pg_wchar_table[DatabaseEncoding->encoding].wchar2mb_with_len(from, (unsigned char *) to, len);
 }
 
 /* same, with any encoding */
@@ -763,21 +752,21 @@ int
 pg_encoding_wchar2mb_with_len(int encoding,
 							  const pg_wchar *from, char *to, int len)
 {
-	return (*pg_wchar_table[encoding].wchar2mb_with_len) (from, (unsigned char *) to, len);
+	return pg_wchar_table[encoding].wchar2mb_with_len(from, (unsigned char *) to, len);
 }
 
 /* returns the byte length of a multibyte character */
 int
 pg_mblen(const char *mbstr)
 {
-	return ((*pg_wchar_table[DatabaseEncoding->encoding].mblen) ((const unsigned char *) mbstr));
+	return pg_wchar_table[DatabaseEncoding->encoding].mblen((const unsigned char *) mbstr);
 }
 
 /* returns the display length of a multibyte character */
 int
 pg_dsplen(const char *mbstr)
 {
-	return ((*pg_wchar_table[DatabaseEncoding->encoding].dsplen) ((const unsigned char *) mbstr));
+	return pg_wchar_table[DatabaseEncoding->encoding].dsplen((const unsigned char *) mbstr);
 }
 
 /* returns the length (counted in wchars) of a multibyte string */
@@ -1049,8 +1038,10 @@ GetMessageEncoding(void)
 
 #ifdef WIN32
 /*
- * Result is palloc'ed null-terminated utf16 string. The character length
- * is also passed to utf16len if not null. Returns NULL iff failed.
+ * Convert from MessageEncoding to a palloc'ed, null-terminated utf16
+ * string. The character length is also passed to utf16len if not
+ * null. Returns NULL iff failed. Before MessageEncoding initialization, "str"
+ * should be ASCII-only; this will function as though MessageEncoding is UTF8.
  */
 WCHAR *
 pgwin32_message_to_UTF16(const char *str, int len, int *utf16len)
diff --git a/src/backend/utils/mb/wchar.c b/src/backend/utils/mb/wchar.c
index 765815a199..a5fdda456e 100644
--- a/src/backend/utils/mb/wchar.c
+++ b/src/backend/utils/mb/wchar.c
@@ -1785,8 +1785,8 @@ int
 pg_encoding_mblen(int encoding, const char *mbstr)
 {
 	return (PG_VALID_ENCODING(encoding) ?
-			((*pg_wchar_table[encoding].mblen) ((const unsigned char *) mbstr)) :
-			((*pg_wchar_table[PG_SQL_ASCII].mblen) ((const unsigned char *) mbstr)));
+			pg_wchar_table[encoding].mblen((const unsigned char *) mbstr) :
+			pg_wchar_table[PG_SQL_ASCII].mblen((const unsigned char *) mbstr));
 }
 
 /*
@@ -1796,8 +1796,8 @@ int
 pg_encoding_dsplen(int encoding, const char *mbstr)
 {
 	return (PG_VALID_ENCODING(encoding) ?
-			((*pg_wchar_table[encoding].dsplen) ((const unsigned char *) mbstr)) :
-			((*pg_wchar_table[PG_SQL_ASCII].dsplen) ((const unsigned char *) mbstr)));
+			pg_wchar_table[encoding].dsplen((const unsigned char *) mbstr) :
+			pg_wchar_table[PG_SQL_ASCII].dsplen((const unsigned char *) mbstr));
 }
 
 /*
@@ -1809,8 +1809,8 @@ int
 pg_encoding_verifymb(int encoding, const char *mbstr, int len)
 {
 	return (PG_VALID_ENCODING(encoding) ?
-			((*pg_wchar_table[encoding].mbverify) ((const unsigned char *) mbstr, len)) :
-			((*pg_wchar_table[PG_SQL_ASCII].mbverify) ((const unsigned char *) mbstr, len)));
+			pg_wchar_table[encoding].mbverify((const unsigned char *) mbstr, len) :
+			pg_wchar_table[PG_SQL_ASCII].mbverify((const unsigned char *) mbstr, len));
 }
 
 /*
diff --git a/src/backend/utils/misc/backend_random.c b/src/backend/utils/misc/backend_random.c
index 4f18656fda..a64f3ac398 100644
--- a/src/backend/utils/misc/backend_random.c
+++ b/src/backend/utils/misc/backend_random.c
@@ -15,7 +15,7 @@
  * The built-in implementation uses the standard erand48 algorithm, with
  * a seed shared between all backends.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/misc/guc-file.l b/src/backend/utils/misc/guc-file.l
index f01b814c6e..afe4fe6d77 100644
--- a/src/backend/utils/misc/guc-file.l
+++ b/src/backend/utils/misc/guc-file.l
@@ -2,7 +2,7 @@
 /*
  * Scanner for the configuration file
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/backend/utils/misc/guc-file.l
  */
@@ -57,6 +57,8 @@ static void record_config_file_error(const char *errmsg,
 static int	GUC_flex_fatal(const char *msg);
 static char *GUC_scanstr(const char *s);
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option 8bit
@@ -107,7 +109,7 @@ STRING			\'([^'\\\n]|\\.|\'\')*\'
 
 %%
 
-
+/* LCOV_EXCL_STOP */
 
 /*
  * Exported function to read and process the configuration file. The
diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
index 246fea8693..1db7845d5a 100644
--- a/src/backend/utils/misc/guc.c
+++ b/src/backend/utils/misc/guc.c
@@ -6,7 +6,7 @@
  * See src/backend/utils/misc/README for more information.
  *
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * IDENTIFICATION
@@ -43,7 +43,6 @@
 #include "commands/trigger.h"
 #include "funcapi.h"
 #include "libpq/auth.h"
-#include "libpq/be-fsstubs.h"
 #include "libpq/libpq.h"
 #include "libpq/pqformat.h"
 #include "miscadmin.h"
@@ -71,6 +70,7 @@
 #include "storage/dsm_impl.h"
 #include "storage/standby.h"
 #include "storage/fd.h"
+#include "storage/large_object.h"
 #include "storage/pg_shmem.h"
 #include "storage/proc.h"
 #include "storage/predicate.h"
@@ -446,6 +446,7 @@ char	   *event_source;
 bool		row_security;
 bool		check_function_bodies = true;
 bool		default_with_oids = false;
+bool		session_auth_is_superuser;
 
 int			log_min_error_statement = ERROR;
 int			log_min_messages = WARNING;
@@ -492,7 +493,6 @@ int			huge_pages;
  * and is kept in sync by assign_hooks.
  */
 static char *syslog_ident_str;
-static bool session_auth_is_superuser;
 static double phony_random_seed;
 static char *client_encoding_string;
 static char *datestyle_string;
@@ -514,7 +514,6 @@ static int	block_size;
 static int	segment_size;
 static int	wal_block_size;
 static bool data_checksums;
-static int	wal_segment_size;
 static bool integer_datetimes;
 static bool assert_enabled;
 
@@ -574,8 +573,10 @@ const char *const config_group_names[] =
 	gettext_noop("Connections and Authentication"),
 	/* CONN_AUTH_SETTINGS */
 	gettext_noop("Connections and Authentication / Connection Settings"),
-	/* CONN_AUTH_SECURITY */
-	gettext_noop("Connections and Authentication / Security and Authentication"),
+	/* CONN_AUTH_AUTH */
+	gettext_noop("Connections and Authentication / Authentication"),
+	/* CONN_AUTH_SSL */
+	gettext_noop("Connections and Authentication / SSL"),
 	/* RESOURCES */
 	gettext_noop("Resource Usage"),
 	/* RESOURCES_MEM */
@@ -714,14 +715,16 @@ typedef struct
 #if XLOG_BLCKSZ < 1024 || XLOG_BLCKSZ > (1024*1024)
 #error XLOG_BLCKSZ must be between 1KB and 1MB
 #endif
-#if XLOG_SEG_SIZE < (1024*1024) || XLOG_SEG_SIZE > (1024*1024*1024)
-#error XLOG_SEG_SIZE must be between 1MB and 1GB
-#endif
 
 static const char *memory_units_hint = gettext_noop("Valid units for this parameter are \"kB\", \"MB\", \"GB\", and \"TB\".");
 
 static const unit_conversion memory_unit_conversion_table[] =
 {
+	{"GB", GUC_UNIT_BYTE, 1024 * 1024 * 1024},
+	{"MB", GUC_UNIT_BYTE, 1024 * 1024},
+	{"kB", GUC_UNIT_BYTE, 1024},
+	{"B", GUC_UNIT_BYTE, 1},
+
 	{"TB", GUC_UNIT_KB, 1024 * 1024 * 1024},
 	{"GB", GUC_UNIT_KB, 1024 * 1024},
 	{"MB", GUC_UNIT_KB, 1024},
@@ -910,7 +913,33 @@ static struct config_bool ConfigureNamesBool[] =
 		true,
 		NULL, NULL, NULL
 	},
-
+	{
+		{"enable_partitionwise_join", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables partitionwise join."),
+			NULL
+		},
+		&enable_partitionwise_join,
+		false,
+		NULL, NULL, NULL
+	},
+	{
+		{"enable_parallel_append", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the planner's use of parallel append plans."),
+			NULL
+		},
+		&enable_parallel_append,
+		true,
+		NULL, NULL, NULL
+	},
+	{
+		{"enable_parallel_hash", PGC_USERSET, QUERY_TUNING_METHOD,
+			gettext_noop("Enables the planner's user of parallel hash plans."),
+			NULL
+		},
+		&enable_parallel_hash,
+		true,
+		NULL, NULL, NULL
+	},
 	{
 		{"geqo", PGC_USERSET, QUERY_TUNING_GEQO,
 			gettext_noop("Enables genetic query optimization."),
@@ -951,7 +980,7 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 	{
-		{"ssl", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Enables SSL connections."),
 			NULL
 		},
@@ -960,7 +989,7 @@ static struct config_bool ConfigureNamesBool[] =
 		check_ssl, NULL, NULL
 	},
 	{
-		{"ssl_prefer_server_ciphers", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_prefer_server_ciphers", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Give priority to server ciphersuite order."),
 			NULL
 		},
@@ -1351,7 +1380,7 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 	{
-		{"db_user_namespace", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"db_user_namespace", PGC_SIGHUP, CONN_AUTH_AUTH,
 			gettext_noop("Enables per-database user names."),
 			NULL
 		},
@@ -1398,7 +1427,7 @@ static struct config_bool ConfigureNamesBool[] =
 		check_transaction_deferrable, NULL, NULL
 	},
 	{
-		{"row_security", PGC_USERSET, CONN_AUTH_SECURITY,
+		{"row_security", PGC_USERSET, CLIENT_CONN_STATEMENT,
 			gettext_noop("Enable row security."),
 			gettext_noop("When enabled, row security will be applied to all users.")
 		},
@@ -1521,7 +1550,7 @@ static struct config_bool ConfigureNamesBool[] =
 	},
 
 	{
-		{"krb_caseins_users", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"krb_caseins_users", PGC_SIGHUP, CONN_AUTH_AUTH,
 			gettext_noop("Sets whether Kerberos and GSSAPI user names should be treated as case-insensitive."),
 			NULL
 		},
@@ -1666,6 +1695,16 @@ static struct config_bool ConfigureNamesBool[] =
 		NULL, NULL, NULL
 	},
 
+	{
+		{"parallel_leader_participation", PGC_USERSET, RESOURCES_ASYNCHRONOUS,
+			gettext_noop("Controls whether Gather and Gather Merge also run subplans."),
+			gettext_noop("Should gather nodes also run subplans, or just gather tuples?")
+		},
+		&parallel_leader_participation,
+		true,
+		NULL, NULL, NULL
+	},
+
 	/* End-of-list marker */
 	{
 		{NULL, 0, 0, NULL, NULL}, NULL, false, NULL, NULL, NULL
@@ -1932,16 +1971,6 @@ static struct config_int ConfigureNamesInt[] =
 		NULL, NULL, NULL
 	},
 
-	{
-		{"replacement_sort_tuples", PGC_USERSET, RESOURCES_MEM,
-			gettext_noop("Sets the maximum number of tuples to be sorted using replacement selection."),
-			gettext_noop("When more tuples than this are present, quicksort will be used.")
-		},
-		&replacement_sort_tuples,
-		150000, 0, INT_MAX,
-		NULL, NULL, NULL
-	},
-
 	/*
 	 * We use the hopefully-safely-small value of 100kB as the compiled-in
 	 * default for max_stack_depth.  InitializeGUCOptions will increase it if
@@ -2201,7 +2230,7 @@ static struct config_int ConfigureNamesInt[] =
 		{"max_pred_locks_per_relation", PGC_SIGHUP, LOCK_MANAGEMENT,
 			gettext_noop("Sets the maximum number of predicate-locked pages and tuples per relation."),
 			gettext_noop("If more than this total of pages and tuples in the same relation are locked "
-						 "by a connection, those locks are replaced by a relation level lock.")
+						 "by a connection, those locks are replaced by a relation-level lock.")
 		},
 		&max_predicate_locks_per_relation,
 		-2, INT_MIN, INT_MAX,
@@ -2212,7 +2241,7 @@ static struct config_int ConfigureNamesInt[] =
 		{"max_pred_locks_per_page", PGC_SIGHUP, LOCK_MANAGEMENT,
 			gettext_noop("Sets the maximum number of predicate-locked tuples per page."),
 			gettext_noop("If more than this number of tuples on the same page are locked "
-						 "by a connection, those locks are replaced by a page level lock.")
+						 "by a connection, those locks are replaced by a page-level lock.")
 		},
 		&max_predicate_locks_per_page,
 		2, 0, INT_MAX,
@@ -2220,7 +2249,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"authentication_timeout", PGC_SIGHUP, CONN_AUTH_AUTH,
 			gettext_noop("Sets the maximum allowed time to complete client authentication."),
 			NULL,
 			GUC_UNIT_S
@@ -2259,7 +2288,8 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_MB
 		},
 		&min_wal_size_mb,
-		5 * (XLOG_SEG_SIZE / (1024 * 1024)), 2, MAX_KILOBYTES,
+		DEFAULT_MIN_WAL_SEGS * (DEFAULT_XLOG_SEG_SIZE / (1024 * 1024)),
+		2, MAX_KILOBYTES,
 		NULL, NULL, NULL
 	},
 
@@ -2270,7 +2300,8 @@ static struct config_int ConfigureNamesInt[] =
 			GUC_UNIT_MB
 		},
 		&max_wal_size_mb,
-		64 * (XLOG_SEG_SIZE / (1024 * 1024)), 2, MAX_KILOBYTES,
+		DEFAULT_MAX_WAL_SEGS * (DEFAULT_XLOG_SEG_SIZE / (1024 * 1024)),
+		2, MAX_KILOBYTES,
 		NULL, assign_max_wal_size, NULL
 	},
 
@@ -2632,14 +2663,14 @@ static struct config_int ConfigureNamesInt[] =
 
 	{
 		{"wal_segment_size", PGC_INTERNAL, PRESET_OPTIONS,
-			gettext_noop("Shows the number of pages per write ahead log segment."),
+			gettext_noop("Shows the size of write ahead log segments."),
 			NULL,
-			GUC_UNIT_XBLOCKS | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
+			GUC_UNIT_BYTE | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
 		},
 		&wal_segment_size,
-		(XLOG_SEG_SIZE / XLOG_BLCKSZ),
-		(XLOG_SEG_SIZE / XLOG_BLCKSZ),
-		(XLOG_SEG_SIZE / XLOG_BLCKSZ),
+		DEFAULT_XLOG_SEG_SIZE,
+		WalSegMinSize,
+		WalSegMaxSize,
 		NULL, NULL, NULL
 	},
 
@@ -2703,6 +2734,16 @@ static struct config_int ConfigureNamesInt[] =
 		check_autovacuum_max_workers, NULL, NULL
 	},
 
+	{
+		{"max_parallel_maintenance_workers", PGC_USERSET, RESOURCES_ASYNCHRONOUS,
+			gettext_noop("Sets the maximum number of parallel processes per maintenance operation."),
+			NULL
+		},
+		&max_parallel_maintenance_workers,
+		2, 0, 1024,
+		NULL, NULL, NULL
+	},
+
 	{
 		{"max_parallel_workers_per_gather", PGC_USERSET, RESOURCES_ASYNCHRONOUS,
 			gettext_noop("Sets the maximum number of parallel processes per executor node."),
@@ -2768,7 +2809,7 @@ static struct config_int ConfigureNamesInt[] =
 	},
 
 	{
-		{"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SECURITY,
+		{"ssl_renegotiation_limit", PGC_USERSET, CONN_AUTH_SSL,
 			gettext_noop("SSL renegotiation is no longer supported; this can only be 0."),
 			NULL,
 			GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE,
@@ -2863,11 +2904,7 @@ static struct config_int ConfigureNamesInt[] =
 		{"track_activity_query_size", PGC_POSTMASTER, RESOURCES_MEM,
 			gettext_noop("Sets the size reserved for pg_stat_activity.query, in bytes."),
 			NULL,
-
-			/*
-			 * There is no _bytes_ unit, so the user can't supply units for
-			 * this.
-			 */
+			GUC_UNIT_BYTE
 		},
 		&pgstat_track_activity_query_size,
 		1024, 100, 102400,
@@ -3145,7 +3182,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"krb_server_keyfile", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"krb_server_keyfile", PGC_SIGHUP, CONN_AUTH_AUTH,
 			gettext_noop("Sets the location of the Kerberos server key file."),
 			NULL,
 			GUC_SUPERUSER_ONLY
@@ -3505,7 +3542,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_cert_file", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_cert_file", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Location of the SSL server certificate file."),
 			NULL
 		},
@@ -3515,7 +3552,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_key_file", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_key_file", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Location of the SSL server private key file."),
 			NULL
 		},
@@ -3525,7 +3562,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_ca_file", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_ca_file", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Location of the SSL certificate authority file."),
 			NULL
 		},
@@ -3535,7 +3572,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_crl_file", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_crl_file", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Location of the SSL certificate revocation list file."),
 			NULL
 		},
@@ -3577,7 +3614,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_ciphers", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_ciphers", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Sets the list of allowed SSL ciphers."),
 			NULL,
 			GUC_SUPERUSER_ONLY
@@ -3592,7 +3629,7 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_ecdh_curve", PGC_SIGHUP, CONN_AUTH_SECURITY,
+		{"ssl_ecdh_curve", PGC_SIGHUP, CONN_AUTH_SSL,
 			gettext_noop("Sets the curve to use for ECDH."),
 			NULL,
 			GUC_SUPERUSER_ONLY
@@ -3607,8 +3644,8 @@ static struct config_string ConfigureNamesString[] =
 	},
 
 	{
-		{"ssl_dh_params_file", PGC_SIGHUP, CONN_AUTH_SECURITY,
-			gettext_noop("Location of the SSL DH params file."),
+		{"ssl_dh_params_file", PGC_SIGHUP, CONN_AUTH_SSL,
+			gettext_noop("Location of the SSL DH parameters file."),
 			NULL,
 			GUC_SUPERUSER_ONLY
 		},
@@ -3888,7 +3925,7 @@ static struct config_enum ConfigureNamesEnum[] =
 
 	{
 		{"huge_pages", PGC_POSTMASTER, RESOURCES_MEM,
-			gettext_noop("Use of huge pages on Linux."),
+			gettext_noop("Use of huge pages on Linux or Windows."),
 			NULL
 		},
 		&huge_pages,
@@ -3907,7 +3944,7 @@ static struct config_enum ConfigureNamesEnum[] =
 	},
 
 	{
-		{"password_encryption", PGC_USERSET, CONN_AUTH_SECURITY,
+		{"password_encryption", PGC_USERSET, CONN_AUTH_AUTH,
 			gettext_noop("Encrypt passwords."),
 			gettext_noop("When a password is specified in CREATE USER or "
 						 "ALTER USER without writing either ENCRYPTED or UNENCRYPTED, "
@@ -3952,9 +3989,9 @@ static int	num_guc_variables;
 static int	size_guc_variables;
 
 
-static bool guc_dirty;			/* TRUE if need to do commit/abort work */
+static bool guc_dirty;			/* true if need to do commit/abort work */
 
-static bool reporting_enabled;	/* TRUE to enable GUC_REPORT */
+static bool reporting_enabled;	/* true to enable GUC_REPORT */
 
 static int	GUCNestLevel = 0;	/* 1 when in main transaction */
 
@@ -4376,7 +4413,7 @@ add_placeholder_variable(const char *name, int elevel)
 
 /*
  * Look up option NAME.  If it exists, return a pointer to its record,
- * else return NULL.  If create_placeholders is TRUE, we'll create a
+ * else return NULL.  If create_placeholders is true, we'll create a
  * placeholder record for a valid-looking custom variable name.
  */
 static struct config_generic *
@@ -4602,7 +4639,7 @@ InitializeOneGUCOption(struct config_generic *gconf)
 					elog(FATAL, "failed to initialize %s to %d",
 						 conf->gen.name, (int) newval);
 				if (conf->assign_hook)
-					(*conf->assign_hook) (newval, extra);
+					conf->assign_hook(newval, extra);
 				*conf->variable = conf->reset_val = newval;
 				conf->gen.extra = conf->reset_extra = extra;
 				break;
@@ -4620,7 +4657,7 @@ InitializeOneGUCOption(struct config_generic *gconf)
 					elog(FATAL, "failed to initialize %s to %d",
 						 conf->gen.name, newval);
 				if (conf->assign_hook)
-					(*conf->assign_hook) (newval, extra);
+					conf->assign_hook(newval, extra);
 				*conf->variable = conf->reset_val = newval;
 				conf->gen.extra = conf->reset_extra = extra;
 				break;
@@ -4638,7 +4675,7 @@ InitializeOneGUCOption(struct config_generic *gconf)
 					elog(FATAL, "failed to initialize %s to %g",
 						 conf->gen.name, newval);
 				if (conf->assign_hook)
-					(*conf->assign_hook) (newval, extra);
+					conf->assign_hook(newval, extra);
 				*conf->variable = conf->reset_val = newval;
 				conf->gen.extra = conf->reset_extra = extra;
 				break;
@@ -4660,7 +4697,7 @@ InitializeOneGUCOption(struct config_generic *gconf)
 					elog(FATAL, "failed to initialize %s to \"%s\"",
 						 conf->gen.name, newval ? newval : "");
 				if (conf->assign_hook)
-					(*conf->assign_hook) (newval, extra);
+					conf->assign_hook(newval, extra);
 				*conf->variable = conf->reset_val = newval;
 				conf->gen.extra = conf->reset_extra = extra;
 				break;
@@ -4676,7 +4713,7 @@ InitializeOneGUCOption(struct config_generic *gconf)
 					elog(FATAL, "failed to initialize %s to %d",
 						 conf->gen.name, newval);
 				if (conf->assign_hook)
-					(*conf->assign_hook) (newval, extra);
+					conf->assign_hook(newval, extra);
 				*conf->variable = conf->reset_val = newval;
 				conf->gen.extra = conf->reset_extra = extra;
 				break;
@@ -4901,8 +4938,8 @@ ResetAllOptions(void)
 					struct config_bool *conf = (struct config_bool *) gconf;
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (conf->reset_val,
-											  conf->reset_extra);
+						conf->assign_hook(conf->reset_val,
+										  conf->reset_extra);
 					*conf->variable = conf->reset_val;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									conf->reset_extra);
@@ -4913,8 +4950,8 @@ ResetAllOptions(void)
 					struct config_int *conf = (struct config_int *) gconf;
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (conf->reset_val,
-											  conf->reset_extra);
+						conf->assign_hook(conf->reset_val,
+										  conf->reset_extra);
 					*conf->variable = conf->reset_val;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									conf->reset_extra);
@@ -4925,8 +4962,8 @@ ResetAllOptions(void)
 					struct config_real *conf = (struct config_real *) gconf;
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (conf->reset_val,
-											  conf->reset_extra);
+						conf->assign_hook(conf->reset_val,
+										  conf->reset_extra);
 					*conf->variable = conf->reset_val;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									conf->reset_extra);
@@ -4937,8 +4974,8 @@ ResetAllOptions(void)
 					struct config_string *conf = (struct config_string *) gconf;
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (conf->reset_val,
-											  conf->reset_extra);
+						conf->assign_hook(conf->reset_val,
+										  conf->reset_extra);
 					set_string_field(conf, conf->variable, conf->reset_val);
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									conf->reset_extra);
@@ -4949,8 +4986,8 @@ ResetAllOptions(void)
 					struct config_enum *conf = (struct config_enum *) gconf;
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (conf->reset_val,
-											  conf->reset_extra);
+						conf->assign_hook(conf->reset_val,
+										  conf->reset_extra);
 					*conf->variable = conf->reset_val;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									conf->reset_extra);
@@ -5240,7 +5277,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 								conf->gen.extra != newextra)
 							{
 								if (conf->assign_hook)
-									(*conf->assign_hook) (newval, newextra);
+									conf->assign_hook(newval, newextra);
 								*conf->variable = newval;
 								set_extra_field(&conf->gen, &conf->gen.extra,
 												newextra);
@@ -5258,7 +5295,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 								conf->gen.extra != newextra)
 							{
 								if (conf->assign_hook)
-									(*conf->assign_hook) (newval, newextra);
+									conf->assign_hook(newval, newextra);
 								*conf->variable = newval;
 								set_extra_field(&conf->gen, &conf->gen.extra,
 												newextra);
@@ -5276,7 +5313,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 								conf->gen.extra != newextra)
 							{
 								if (conf->assign_hook)
-									(*conf->assign_hook) (newval, newextra);
+									conf->assign_hook(newval, newextra);
 								*conf->variable = newval;
 								set_extra_field(&conf->gen, &conf->gen.extra,
 												newextra);
@@ -5294,7 +5331,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 								conf->gen.extra != newextra)
 							{
 								if (conf->assign_hook)
-									(*conf->assign_hook) (newval, newextra);
+									conf->assign_hook(newval, newextra);
 								set_string_field(conf, conf->variable, newval);
 								set_extra_field(&conf->gen, &conf->gen.extra,
 												newextra);
@@ -5321,7 +5358,7 @@ AtEOXact_GUC(bool isCommit, int nestLevel)
 								conf->gen.extra != newextra)
 							{
 								if (conf->assign_hook)
-									(*conf->assign_hook) (newval, newextra);
+									conf->assign_hook(newval, newextra);
 								*conf->variable = newval;
 								set_extra_field(&conf->gen, &conf->gen.extra,
 												newextra);
@@ -5645,7 +5682,7 @@ config_enum_lookup_by_value(struct config_enum *record, int val)
  * Lookup the value for an enum option with the selected name
  * (case-insensitive).
  * If the enum option is found, sets the retval value and returns
- * true. If it's not found, return FALSE and retval is set to 0.
+ * true. If it's not found, return false and retval is set to 0.
  */
 bool
 config_enum_lookup_by_name(struct config_enum *record, const char *value,
@@ -5658,12 +5695,12 @@ config_enum_lookup_by_name(struct config_enum *record, const char *value,
 		if (pg_strcasecmp(value, entry->name) == 0)
 		{
 			*retval = entry->val;
-			return TRUE;
+			return true;
 		}
 	}
 
 	*retval = 0;
-	return FALSE;
+	return false;
 }
 
 
@@ -6211,7 +6248,7 @@ set_config_option(const char *name, const char *value,
 						push_old_value(&conf->gen, action);
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (newval, newextra);
+						conf->assign_hook(newval, newextra);
 					*conf->variable = newval;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									newextra);
@@ -6301,7 +6338,7 @@ set_config_option(const char *name, const char *value,
 						push_old_value(&conf->gen, action);
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (newval, newextra);
+						conf->assign_hook(newval, newextra);
 					*conf->variable = newval;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									newextra);
@@ -6391,7 +6428,7 @@ set_config_option(const char *name, const char *value,
 						push_old_value(&conf->gen, action);
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (newval, newextra);
+						conf->assign_hook(newval, newextra);
 					*conf->variable = newval;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									newextra);
@@ -6499,7 +6536,7 @@ set_config_option(const char *name, const char *value,
 						push_old_value(&conf->gen, action);
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (newval, newextra);
+						conf->assign_hook(newval, newextra);
 					set_string_field(conf, conf->variable, newval);
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									newextra);
@@ -6594,7 +6631,7 @@ set_config_option(const char *name, const char *value,
 						push_old_value(&conf->gen, action);
 
 					if (conf->assign_hook)
-						(*conf->assign_hook) (newval, newextra);
+						conf->assign_hook(newval, newextra);
 					*conf->variable = newval;
 					set_extra_field(&conf->gen, &conf->gen.extra,
 									newextra);
@@ -6946,7 +6983,7 @@ write_auto_conf_file(int fd, const char *filename, ConfigVariable *head)
 
 	/* Emit file header containing warning comment */
 	appendStringInfoString(&buf, "# Do not edit this file manually!\n");
-	appendStringInfoString(&buf, "# It will be overwritten by ALTER SYSTEM command.\n");
+	appendStringInfoString(&buf, "# It will be overwritten by the ALTER SYSTEM command.\n");
 
 	errno = 0;
 	if (write(fd, buf.data, buf.len) != buf.len)
@@ -7243,8 +7280,7 @@ AlterSystemSetConfigFile(AlterSystemStmt *altersysstmt)
 	 * truncate and reuse it.
 	 */
 	Tmpfd = BasicOpenFile(AutoConfTmpFileName,
-						  O_CREAT | O_RDWR | O_TRUNC,
-						  S_IRUSR | S_IWUSR);
+						  O_CREAT | O_RDWR | O_TRUNC);
 	if (Tmpfd < 0)
 		ereport(ERROR,
 				(errcode_for_file_access(),
@@ -8113,6 +8149,9 @@ GetConfigOptionByNum(int varnum, const char **values, bool *noshow)
 	{
 		switch (conf->flags & (GUC_UNIT_MEMORY | GUC_UNIT_TIME))
 		{
+			case GUC_UNIT_BYTE:
+				values[2] = "B";
+				break;
 			case GUC_UNIT_KB:
 				values[2] = "kB";
 				break;
@@ -8370,7 +8409,7 @@ show_config_by_name(PG_FUNCTION_ARGS)
 /*
  * show_config_by_name_missing_ok - equiv to SHOW X command but implemented as
  * a function.  If X does not exist, suppress the error and just return NULL
- * if missing_ok is TRUE.
+ * if missing_ok is true.
  */
 Datum
 show_config_by_name_missing_ok(PG_FUNCTION_ARGS)
@@ -8653,7 +8692,7 @@ _ShowOption(struct config_generic *record, bool use_units)
 				struct config_bool *conf = (struct config_bool *) record;
 
 				if (conf->show_hook)
-					val = (*conf->show_hook) ();
+					val = conf->show_hook();
 				else
 					val = *conf->variable ? "on" : "off";
 			}
@@ -8664,7 +8703,7 @@ _ShowOption(struct config_generic *record, bool use_units)
 				struct config_int *conf = (struct config_int *) record;
 
 				if (conf->show_hook)
-					val = (*conf->show_hook) ();
+					val = conf->show_hook();
 				else
 				{
 					/*
@@ -8694,7 +8733,7 @@ _ShowOption(struct config_generic *record, bool use_units)
 				struct config_real *conf = (struct config_real *) record;
 
 				if (conf->show_hook)
-					val = (*conf->show_hook) ();
+					val = conf->show_hook();
 				else
 				{
 					snprintf(buffer, sizeof(buffer), "%g",
@@ -8709,7 +8748,7 @@ _ShowOption(struct config_generic *record, bool use_units)
 				struct config_string *conf = (struct config_string *) record;
 
 				if (conf->show_hook)
-					val = (*conf->show_hook) ();
+					val = conf->show_hook();
 				else if (*conf->variable && **conf->variable)
 					val = *conf->variable;
 				else
@@ -8722,7 +8761,7 @@ _ShowOption(struct config_generic *record, bool use_units)
 				struct config_enum *conf = (struct config_enum *) record;
 
 				if (conf->show_hook)
-					val = (*conf->show_hook) ();
+					val = conf->show_hook();
 				else
 					val = config_enum_lookup_by_value(conf, *conf->variable);
 			}
@@ -8986,12 +9025,18 @@ read_nondefault_variables(void)
  * constants; a few, like server_encoding and lc_ctype, are handled specially
  * outside the serialize/restore procedure.  Therefore, SerializeGUCState()
  * never sends these, and RestoreGUCState() never changes them.
+ *
+ * Role is a special variable in the sense that its current value can be an
+ * invalid value and there are multiple ways by which that can happen (like
+ * after setting the role, someone drops it).  So we handle it outside of
+ * serialize/restore machinery.
  */
 static bool
 can_skip_gucvar(struct config_generic *gconf)
 {
 	return gconf->context == PGC_POSTMASTER ||
-		gconf->context == PGC_INTERNAL || gconf->source == PGC_S_DEFAULT;
+		gconf->context == PGC_INTERNAL || gconf->source == PGC_S_DEFAULT ||
+		strcmp(gconf->name, "role") == 0;
 }
 
 /*
@@ -9252,7 +9297,6 @@ SerializeGUCState(Size maxsize, char *start_address)
 	Size		actual_size;
 	Size		bytes_left;
 	int			i;
-	int			i_role = -1;
 
 	/* Reserve space for saving the actual size of the guc state */
 	Assert(maxsize > sizeof(actual_size));
@@ -9260,19 +9304,7 @@ SerializeGUCState(Size maxsize, char *start_address)
 	bytes_left = maxsize - sizeof(actual_size);
 
 	for (i = 0; i < num_guc_variables; i++)
-	{
-		/*
-		 * It's pretty ugly, but we've got to force "role" to be initialized
-		 * after "session_authorization"; otherwise, the latter will override
-		 * the former.
-		 */
-		if (strcmp(guc_variables[i]->name, "role") == 0)
-			i_role = i;
-		else
-			serialize_variable(&curptr, &bytes_left, guc_variables[i]);
-	}
-	if (i_role >= 0)
-		serialize_variable(&curptr, &bytes_left, guc_variables[i_role]);
+		serialize_variable(&curptr, &bytes_left, guc_variables[i]);
 
 	/* Store actual size without assuming alignment of start_address. */
 	actual_size = maxsize - bytes_left - sizeof(actual_size);
@@ -9699,7 +9731,7 @@ GUCArrayReset(ArrayType *array)
  * or NULL for the Delete/Reset cases.  If skipIfNoPermissions is true, it's
  * not an error to have no permissions to set the option.
  *
- * Returns TRUE if OK, FALSE if skipIfNoPermissions is true and user does not
+ * Returns true if OK, false if skipIfNoPermissions is true and user does not
  * have permission to change this option (all other error cases result in an
  * error being thrown).
  */
@@ -9725,7 +9757,7 @@ validate_option_array_item(const char *name, const char *value,
 	 * define_custom_variable assumes we checked that.
 	 *
 	 * name is not known and can't be created as a placeholder.  Throw error,
-	 * unless skipIfNoPermissions is true, in which case return FALSE.
+	 * unless skipIfNoPermissions is true, in which case return false.
 	 */
 	gconf = find_option(name, true, WARNING);
 	if (!gconf)
@@ -9807,7 +9839,7 @@ call_bool_check_hook(struct config_bool *conf, bool *newval, void **extra,
 	GUC_check_errdetail_string = NULL;
 	GUC_check_errhint_string = NULL;
 
-	if (!(*conf->check_hook) (newval, extra, source))
+	if (!conf->check_hook(newval, extra, source))
 	{
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
@@ -9841,7 +9873,7 @@ call_int_check_hook(struct config_int *conf, int *newval, void **extra,
 	GUC_check_errdetail_string = NULL;
 	GUC_check_errhint_string = NULL;
 
-	if (!(*conf->check_hook) (newval, extra, source))
+	if (!conf->check_hook(newval, extra, source))
 	{
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
@@ -9875,7 +9907,7 @@ call_real_check_hook(struct config_real *conf, double *newval, void **extra,
 	GUC_check_errdetail_string = NULL;
 	GUC_check_errhint_string = NULL;
 
-	if (!(*conf->check_hook) (newval, extra, source))
+	if (!conf->check_hook(newval, extra, source))
 	{
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
@@ -9909,7 +9941,7 @@ call_string_check_hook(struct config_string *conf, char **newval, void **extra,
 	GUC_check_errdetail_string = NULL;
 	GUC_check_errhint_string = NULL;
 
-	if (!(*conf->check_hook) (newval, extra, source))
+	if (!conf->check_hook(newval, extra, source))
 	{
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
@@ -9943,7 +9975,7 @@ call_enum_check_hook(struct config_enum *conf, int *newval, void **extra,
 	GUC_check_errdetail_string = NULL;
 	GUC_check_errhint_string = NULL;
 
-	if (!(*conf->check_hook) (newval, extra, source))
+	if (!conf->check_hook(newval, extra, source))
 	{
 		ereport(elevel,
 				(errcode(GUC_check_errcode_value),
diff --git a/src/backend/utils/misc/help_config.c b/src/backend/utils/misc/help_config.c
index 08d563d1ae..25f5c82804 100644
--- a/src/backend/utils/misc/help_config.c
+++ b/src/backend/utils/misc/help_config.c
@@ -7,7 +7,7 @@
  * or GUC_DISALLOW_IN_FILE are not displayed, unless the user specifically
  * requests that variable by name
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/misc/help_config.c
diff --git a/src/backend/utils/misc/pg_config.c b/src/backend/utils/misc/pg_config.c
index 468c7cc9e1..aa434bc3ab 100644
--- a/src/backend/utils/misc/pg_config.c
+++ b/src/backend/utils/misc/pg_config.c
@@ -3,7 +3,7 @@
  * pg_config.c
  *		Expose same output as pg_config except as an SRF
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -19,7 +19,6 @@
 #include "catalog/pg_type.h"
 #include "common/config_info.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
 #include "port.h"
 
 Datum
@@ -54,8 +53,8 @@ pg_config(PG_FUNCTION_ARGS)
 	 * Check to make sure we have a reasonable tuple descriptor
 	 */
 	if (tupdesc->natts != 2 ||
-		tupdesc->attrs[0]->atttypid != TEXTOID ||
-		tupdesc->attrs[1]->atttypid != TEXTOID)
+		TupleDescAttr(tupdesc, 0)->atttypid != TEXTOID ||
+		TupleDescAttr(tupdesc, 1)->atttypid != TEXTOID)
 		ereport(ERROR,
 				(errcode(ERRCODE_SYNTAX_ERROR),
 				 errmsg("query-specified return tuple and "
diff --git a/src/backend/utils/misc/pg_controldata.c b/src/backend/utils/misc/pg_controldata.c
index 0dbfe7f952..8ab7d1337f 100644
--- a/src/backend/utils/misc/pg_controldata.c
+++ b/src/backend/utils/misc/pg_controldata.c
@@ -5,7 +5,7 @@
  * Routines to expose the contents of the control data file via
  * a set of SQL functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -90,44 +90,42 @@ pg_control_checkpoint(PG_FUNCTION_ARGS)
 	 * Construct a tuple descriptor for the result row.  This must match this
 	 * function's pg_proc entry!
 	 */
-	tupdesc = CreateTemplateTupleDesc(19, false);
+	tupdesc = CreateTemplateTupleDesc(18, false);
 	TupleDescInitEntry(tupdesc, (AttrNumber) 1, "checkpoint_lsn",
 					   LSNOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "prior_lsn",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 2, "redo_lsn",
 					   LSNOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_lsn",
-					   LSNOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "redo_wal_file",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 3, "redo_wal_file",
 					   TEXTOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "timeline_id",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 4, "timeline_id",
 					   INT4OID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "prev_timeline_id",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 5, "prev_timeline_id",
 					   INT4OID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "full_page_writes",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 6, "full_page_writes",
 					   BOOLOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 7, "next_xid",
 					   TEXTOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_oid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 8, "next_oid",
 					   OIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multixact_id",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 9, "next_multixact_id",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "next_multi_offset",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 10, "next_multi_offset",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 11, "oldest_xid",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_xid_dbid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 12, "oldest_xid_dbid",
 					   OIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_active_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 13, "oldest_active_xid",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 14, "oldest_multi_xid",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_multi_dbid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 15, "oldest_multi_dbid",
 					   OIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "oldest_commit_ts_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 16, "oldest_commit_ts_xid",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "newest_commit_ts_xid",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 17, "newest_commit_ts_xid",
 					   XIDOID, -1, 0);
-	TupleDescInitEntry(tupdesc, (AttrNumber) 19, "checkpoint_time",
+	TupleDescInitEntry(tupdesc, (AttrNumber) 18, "checkpoint_time",
 					   TIMESTAMPTZOID, -1, 0);
 	tupdesc = BlessTupleDesc(tupdesc);
 
@@ -141,69 +139,67 @@ pg_control_checkpoint(PG_FUNCTION_ARGS)
 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
 	 * start point.
 	 */
-	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
-	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+	XLByteToSeg(ControlFile->checkPointCopy.redo, segno, wal_segment_size);
+	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID,
+				 segno, wal_segment_size);
 
 	/* Populate the values and null arrays */
 	values[0] = LSNGetDatum(ControlFile->checkPoint);
 	nulls[0] = false;
 
-	values[1] = LSNGetDatum(ControlFile->prevCheckPoint);
+	values[1] = LSNGetDatum(ControlFile->checkPointCopy.redo);
 	nulls[1] = false;
 
-	values[2] = LSNGetDatum(ControlFile->checkPointCopy.redo);
+	values[2] = CStringGetTextDatum(xlogfilename);
 	nulls[2] = false;
 
-	values[3] = CStringGetTextDatum(xlogfilename);
+	values[3] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
 	nulls[3] = false;
 
-	values[4] = Int32GetDatum(ControlFile->checkPointCopy.ThisTimeLineID);
+	values[4] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
 	nulls[4] = false;
 
-	values[5] = Int32GetDatum(ControlFile->checkPointCopy.PrevTimeLineID);
+	values[5] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
 	nulls[5] = false;
 
-	values[6] = BoolGetDatum(ControlFile->checkPointCopy.fullPageWrites);
-	nulls[6] = false;
-
-	values[7] = CStringGetTextDatum(psprintf("%u:%u",
+	values[6] = CStringGetTextDatum(psprintf("%u:%u",
 											 ControlFile->checkPointCopy.nextXidEpoch,
 											 ControlFile->checkPointCopy.nextXid));
+	nulls[6] = false;
+
+	values[7] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
 	nulls[7] = false;
 
-	values[8] = ObjectIdGetDatum(ControlFile->checkPointCopy.nextOid);
+	values[8] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
 	nulls[8] = false;
 
-	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMulti);
+	values[9] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
 	nulls[9] = false;
 
-	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.nextMultiOffset);
+	values[10] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
 	nulls[10] = false;
 
-	values[11] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestXid);
+	values[11] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
 	nulls[11] = false;
 
-	values[12] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestXidDB);
+	values[12] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
 	nulls[12] = false;
 
-	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestActiveXid);
+	values[13] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
 	nulls[13] = false;
 
-	values[14] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestMulti);
+	values[14] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
 	nulls[14] = false;
 
-	values[15] = ObjectIdGetDatum(ControlFile->checkPointCopy.oldestMultiDB);
+	values[15] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
 	nulls[15] = false;
 
-	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.oldestCommitTsXid);
+	values[16] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
 	nulls[16] = false;
 
-	values[17] = TransactionIdGetDatum(ControlFile->checkPointCopy.newestCommitTsXid);
-	nulls[17] = false;
-
-	values[18] = TimestampTzGetDatum(
+	values[17] = TimestampTzGetDatum(
 									 time_t_to_timestamptz(ControlFile->checkPointCopy.time));
-	nulls[18] = false;
+	nulls[17] = false;
 
 	htup = heap_form_tuple(tupdesc, values, nulls);
 
diff --git a/src/backend/utils/misc/pg_rusage.c b/src/backend/utils/misc/pg_rusage.c
index df643d798c..f135f1b134 100644
--- a/src/backend/utils/misc/pg_rusage.c
+++ b/src/backend/utils/misc/pg_rusage.c
@@ -4,7 +4,7 @@
  *	  Resource usage measurement support routines.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/misc/postgresql.conf.sample b/src/backend/utils/misc/postgresql.conf.sample
index df5d2f3f22..39272925fb 100644
--- a/src/backend/utils/misc/postgresql.conf.sample
+++ b/src/backend/utils/misc/postgresql.conf.sample
@@ -73,26 +73,6 @@
 #bonjour_name = ''			# defaults to the computer name
 					# (change requires restart)
 
-# - Security and Authentication -
-
-#authentication_timeout = 1min		# 1s-600s
-#ssl = off
-#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
-#ssl_prefer_server_ciphers = on
-#ssl_ecdh_curve = 'prime256v1'
-#ssl_dh_params_file = ''
-#ssl_cert_file = 'server.crt'
-#ssl_key_file = 'server.key'
-#ssl_ca_file = ''
-#ssl_crl_file = ''
-#password_encryption = md5		# md5, scram-sha-256, or plain
-#db_user_namespace = off
-#row_security = on
-
-# GSSAPI using Kerberos
-#krb_server_keyfile = ''
-#krb_caseins_users = off
-
 # - TCP Keepalives -
 # see "man 7 tcp" for details
 
@@ -103,6 +83,28 @@
 #tcp_keepalives_count = 0		# TCP_KEEPCNT;
 					# 0 selects the system default
 
+# - Authentication -
+
+#authentication_timeout = 1min		# 1s-600s
+#password_encryption = md5		# md5 or scram-sha-256
+#db_user_namespace = off
+
+# GSSAPI using Kerberos
+#krb_server_keyfile = ''
+#krb_caseins_users = off
+
+# - SSL -
+
+#ssl = off
+#ssl_ca_file = ''
+#ssl_cert_file = 'server.crt'
+#ssl_crl_file = ''
+#ssl_key_file = 'server.key'
+#ssl_ciphers = 'HIGH:MEDIUM:+3DES:!aNULL' # allowed SSL ciphers
+#ssl_prefer_server_ciphers = on
+#ssl_ecdh_curve = 'prime256v1'
+#ssl_dh_params_file = ''
+
 
 #------------------------------------------------------------------------------
 # RESOURCE USAGE (except WAL)
@@ -121,7 +123,6 @@
 # you actively intend to use prepared transactions.
 #work_mem = 4MB				# min 64kB
 #maintenance_work_mem = 64MB		# min 1MB
-#replacement_sort_tuples = 150000	# limits use of replacement selection sort
 #autovacuum_work_mem = -1		# min 1MB, or -1 to use maintenance_work_mem
 #max_stack_depth = 2MB			# min 100kB
 #dynamic_shared_memory_type = posix	# the default is the first option
@@ -138,11 +139,10 @@
 #temp_file_limit = -1			# limits per-process temp file space
 					# in kB, or -1 for no limit
 
-# - Kernel Resource Usage -
+# - Kernel Resource -
 
 #max_files_per_process = 1000		# min 25
 					# (change requires restart)
-#shared_preload_libraries = ''		# (change requires restart)
 
 # - Cost-Based Vacuum Delay -
 
@@ -155,7 +155,7 @@
 # - Background Writer -
 
 #bgwriter_delay = 200ms			# 10-10000ms between rounds
-#bgwriter_lru_maxpages = 100		# 0-1000 max buffers written/round
+#bgwriter_lru_maxpages = 100		# max buffers written/round, 0 disables
 #bgwriter_lru_multiplier = 2.0		# 0-10.0 multiplier on buffers scanned/round
 #bgwriter_flush_after = 0		# measured in pages, 0 disables
 
@@ -163,16 +163,18 @@
 
 #effective_io_concurrency = 1		# 1-1000; 0 disables prefetching
 #max_worker_processes = 8		# (change requires restart)
+#max_parallel_maintenance_workers = 2	# taken from max_parallel_workers
 #max_parallel_workers_per_gather = 2	# taken from max_parallel_workers
+#parallel_leader_participation = on
 #max_parallel_workers = 8		# maximum number of max_worker_processes that
-					# can be used in parallel queries
+					# can be used in parallel operations
 #old_snapshot_threshold = -1		# 1min-60d; -1 disables; 0 is immediate
 					# (change requires restart)
 #backend_flush_after = 0		# measured in pages, 0 disables
 
 
 #------------------------------------------------------------------------------
-# WRITE AHEAD LOG
+# WRITE-AHEAD LOG
 #------------------------------------------------------------------------------
 
 # - Settings -
@@ -228,13 +230,13 @@
 # REPLICATION
 #------------------------------------------------------------------------------
 
-# - Sending Server(s) -
+# - Sending Servers -
 
 # Set these on the master and on any standby that will send replication data.
 
 #max_wal_senders = 10		# max number of walsender processes
 				# (change requires restart)
-#wal_keep_segments = 0		# in logfile segments, 16MB each; 0 disables
+#wal_keep_segments = 0		# in logfile segments; 0 disables
 #wal_sender_timeout = 60s	# in milliseconds; 0 disables
 
 #max_replication_slots = 10	# max number of replication slots
@@ -297,9 +299,12 @@
 #enable_material = on
 #enable_mergejoin = on
 #enable_nestloop = on
+#enable_parallel_append = on
 #enable_seqscan = on
 #enable_sort = on
 #enable_tidscan = on
+#enable_partitionwise_join = off
+#enable_parallel_hash = on
 
 # - Planner Cost Constants -
 
@@ -336,7 +341,7 @@
 
 
 #------------------------------------------------------------------------------
-# ERROR REPORTING AND LOGGING
+# REPORTING AND LOGGING
 #------------------------------------------------------------------------------
 
 # - Where to Log -
@@ -471,8 +476,9 @@
 					# -1 disables, 0 logs all temp files
 #log_timezone = 'GMT'
 
-
-# - Process Title -
+#------------------------------------------------------------------------------
+# PROCESS TITLE
+#------------------------------------------------------------------------------
 
 #cluster_name = ''			# added to process titles if nonempty
 					# (change requires restart)
@@ -480,10 +486,10 @@
 
 
 #------------------------------------------------------------------------------
-# RUNTIME STATISTICS
+# STATISTICS
 #------------------------------------------------------------------------------
 
-# - Query/Index Statistics Collector -
+# - Query and Index Statistics Collector -
 
 #track_activities = on
 #track_counts = on
@@ -493,7 +499,7 @@
 #stats_temp_directory = 'pg_stat_tmp'
 
 
-# - Statistics Monitoring -
+# - Monitoring -
 
 #log_parser_stats = off
 #log_planner_stats = off
@@ -502,7 +508,7 @@
 
 
 #------------------------------------------------------------------------------
-# AUTOVACUUM PARAMETERS
+# AUTOVACUUM
 #------------------------------------------------------------------------------
 
 #autovacuum = on			# Enable autovacuum subprocess?  'on'
@@ -540,6 +546,7 @@
 # - Statement Behavior -
 
 #search_path = '"$user", public'	# schema names
+#row_security = on
 #default_tablespace = ''		# a tablespace name, '' uses the default
 #temp_tablespaces = ''			# a list of tablespace names, '' uses
 					# only default tablespace
@@ -587,12 +594,16 @@
 # default configuration for text search
 #default_text_search_config = 'pg_catalog.simple'
 
-# - Other Defaults -
+# - Shared Library Preloading -
 
-#dynamic_library_path = '$libdir'
+#shared_preload_libraries = ''	# (change requires restart)
 #local_preload_libraries = ''
 #session_preload_libraries = ''
 
+# - Other Defaults -
+
+#dynamic_library_path = '$libdir'
+
 
 #------------------------------------------------------------------------------
 # LOCK MANAGEMENT
@@ -610,7 +621,7 @@
 
 
 #------------------------------------------------------------------------------
-# VERSION/PLATFORM COMPATIBILITY
+# VERSION AND PLATFORM COMPATIBILITY
 #------------------------------------------------------------------------------
 
 # - Previous PostgreSQL Versions -
diff --git a/src/backend/utils/misc/ps_status.c b/src/backend/utils/misc/ps_status.c
index 5742de0802..83a93d2405 100644
--- a/src/backend/utils/misc/ps_status.c
+++ b/src/backend/utils/misc/ps_status.c
@@ -7,7 +7,7 @@
  *
  * src/backend/utils/misc/ps_status.c
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  * various details abducted from various places
  *--------------------------------------------------------------------
  */
diff --git a/src/backend/utils/misc/queryenvironment.c b/src/backend/utils/misc/queryenvironment.c
index a0b10d402b..bc2b1e8186 100644
--- a/src/backend/utils/misc/queryenvironment.c
+++ b/src/backend/utils/misc/queryenvironment.c
@@ -11,7 +11,7 @@
  * on callers, since this is an opaque structure.  This is the reason to
  * require a create function.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/misc/rls.c b/src/backend/utils/misc/rls.c
index 49c03d3f88..94449c7e8a 100644
--- a/src/backend/utils/misc/rls.c
+++ b/src/backend/utils/misc/rls.c
@@ -3,7 +3,7 @@
  * rls.c
  *		  RLS-related utility functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -22,7 +22,6 @@
 #include "miscadmin.h"
 #include "utils/acl.h"
 #include "utils/builtins.h"
-#include "utils/elog.h"
 #include "utils/lsyscache.h"
 #include "utils/rls.h"
 #include "utils/syscache.h"
diff --git a/src/backend/utils/misc/sampling.c b/src/backend/utils/misc/sampling.c
index b618ed1d7e..e9e230df01 100644
--- a/src/backend/utils/misc/sampling.c
+++ b/src/backend/utils/misc/sampling.c
@@ -3,7 +3,7 @@
  * sampling.c
  *	  Relation block sampling routines.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/misc/superuser.c b/src/backend/utils/misc/superuser.c
index 175a0677db..fbe83c9b3c 100644
--- a/src/backend/utils/misc/superuser.c
+++ b/src/backend/utils/misc/superuser.c
@@ -9,7 +9,7 @@
  * the single-user case works.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/backend/utils/misc/timeout.c b/src/backend/utils/misc/timeout.c
index d7fc040ad3..f99a63bd5b 100644
--- a/src/backend/utils/misc/timeout.c
+++ b/src/backend/utils/misc/timeout.c
@@ -3,7 +3,7 @@
  * timeout.c
  *	  Routines to multiplex SIGALRM interrupts for multiple timeout reasons.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -302,7 +302,7 @@ handle_sig_alarm(SIGNAL_ARGS)
 				this_timeout->indicator = true;
 
 				/* And call its handler function */
-				(*this_timeout->timeout_handler) ();
+				this_timeout->timeout_handler();
 
 				/*
 				 * The handler might not take negligible time (CheckDeadLock
diff --git a/src/backend/utils/misc/tzparser.c b/src/backend/utils/misc/tzparser.c
index 04d6ee3503..3d07eb7265 100644
--- a/src/backend/utils/misc/tzparser.c
+++ b/src/backend/utils/misc/tzparser.c
@@ -11,7 +11,7 @@
  * PG_TRY if necessary.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -45,7 +45,7 @@ static int ParseTzFile(const char *filename, int depth,
 /*
  * Apply additional validation checks to a tzEntry
  *
- * Returns TRUE if OK, else false
+ * Returns true if OK, else false
  */
 static bool
 validateTzEntry(tzEntry *tzentry)
@@ -92,7 +92,7 @@ validateTzEntry(tzEntry *tzentry)
  *	name  zone
  *	name  offset  dst
  *
- * Returns TRUE if OK, else false; data is stored in *tzentry
+ * Returns true if OK, else false; data is stored in *tzentry
  */
 static bool
 splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
@@ -180,7 +180,7 @@ splitTzLine(const char *filename, int lineno, char *line, tzEntry *tzentry)
  * *arraysize: allocated length of array (changeable if must enlarge array)
  * n: current number of valid elements in array
  * entry: new data to insert
- * override: TRUE if OK to override
+ * override: true if OK to override
  *
  * Returns the new array length (new value for n), or -1 if error
  */
diff --git a/src/backend/utils/mmgr/Makefile b/src/backend/utils/mmgr/Makefile
index cd0e803253..f644c40c46 100644
--- a/src/backend/utils/mmgr/Makefile
+++ b/src/backend/utils/mmgr/Makefile
@@ -12,6 +12,6 @@ subdir = src/backend/utils/mmgr
 top_builddir = ../../../..
 include $(top_builddir)/src/Makefile.global
 
-OBJS = aset.o dsa.o freepage.o mcxt.o memdebug.o portalmem.o slab.o
+OBJS = aset.o dsa.o freepage.o generation.o mcxt.o memdebug.o portalmem.o slab.o
 
 include $(top_srcdir)/src/backend/common.mk
diff --git a/src/backend/utils/mmgr/README b/src/backend/utils/mmgr/README
index 387c337985..a42e568d5c 100644
--- a/src/backend/utils/mmgr/README
+++ b/src/backend/utils/mmgr/README
@@ -177,8 +177,7 @@ every other context is a direct or indirect child of this one.  Allocating
 here is essentially the same as "malloc", because this context will never
 be reset or deleted.  This is for stuff that should live forever, or for
 stuff that the controlling module will take care of deleting at the
-appropriate time.  An example is fd.c's tables of open files, as well as
-the context management nodes for memory contexts themselves.  Avoid
+appropriate time.  An example is fd.c's tables of open files.  Avoid
 allocating stuff here unless really necessary, and especially avoid
 running with CurrentMemoryContext pointing here.
 
@@ -402,7 +401,7 @@ GetMemoryChunkContext())
 
 and then invoke the corresponding method for the context
 
-    (*context->methods->free_p) (p);
+    context->methods->free_p(p);
 
 
 More Control Over aset.c Behavior
@@ -420,14 +419,36 @@ a maximum block size.  Selecting smaller values can prevent wastage of
 space in contexts that aren't expected to hold very much (an example
 is the relcache's per-relation contexts).
 
-Also, it is possible to specify a minimum context size.  If this
-value is greater than zero then a block of that size will be grabbed
-immediately upon context creation, and cleared but not released during
-context resets.  This feature is needed for ErrorContext (see above),
-but will most likely not be used for other contexts.
+Also, it is possible to specify a minimum context size, in case for some
+reason that should be different from the initial size for additional
+blocks.  An aset.c context will always contain at least one block,
+of size minContextSize if that is specified, otherwise initBlockSize.
 
 We expect that per-tuple contexts will be reset frequently and typically
 will not allocate very much space per tuple cycle.  To make this usage
 pattern cheap, the first block allocated in a context is not given
 back to malloc() during reset, but just cleared.  This avoids malloc
 thrashing.
+
+
+Alternative Memory Context Implementations
+------------------------------------------
+
+aset.c is our default general-purpose implementation, working fine
+in most situations. We also have two implementations optimized for
+special use cases, providing either better performance or lower memory
+usage compared to aset.c (or both).
+
+* slab.c (SlabContext) is designed for allocations of fixed-length
+  chunks, and does not allow allocations of chunks with different size.
+
+* generation.c (GenerationContext) is designed for cases when chunks
+  are allocated in groups with similar lifespan (generations), or
+  roughly in FIFO order.
+
+Both memory contexts aim to free memory back to the operating system
+(unlike aset.c, which keeps the freed chunks in a freelist, and only
+returns the memory when reset/deleted).
+
+These memory contexts were initially developed for ReorderBuffer, but
+may be useful elsewhere as long as the allocation patterns match.
diff --git a/src/backend/utils/mmgr/aset.c b/src/backend/utils/mmgr/aset.c
index 7033042e2d..3f9b18844f 100644
--- a/src/backend/utils/mmgr/aset.c
+++ b/src/backend/utils/mmgr/aset.c
@@ -7,7 +7,7 @@
  * type.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -93,6 +93,9 @@
  *
  * Blocks allocated to hold oversize chunks do not follow this rule, however;
  * they are just however big they need to be to hold that single chunk.
+ *
+ * Also, if a minContextSize is specified, the first block has that size,
+ * and then initBlockSize is used for the next one.
  *--------------------
  */
 
@@ -113,7 +116,7 @@ typedef void *AllocPointer;
  *
  * Note: header.isReset means there is nothing for AllocSetReset to do.
  * This is different from the aset being physically empty (empty blocks list)
- * because we may still have a keeper block.  It's also different from the set
+ * because we will still have a keeper block.  It's also different from the set
  * being logically empty, because we don't attempt to detect pfree'ing the
  * last active chunk.
  */
@@ -127,8 +130,11 @@ typedef struct AllocSetContext
 	Size		initBlockSize;	/* initial block size */
 	Size		maxBlockSize;	/* maximum block size */
 	Size		nextBlockSize;	/* next block size to allocate */
+	Size		headerSize;		/* allocated size of context header */
 	Size		allocChunkLimit;	/* effective chunk size limit */
-	AllocBlock	keeper;			/* if not NULL, keep this block over resets */
+	AllocBlock	keeper;			/* keep this block over resets */
+	/* freelist this context could be put in, or -1 if not a candidate: */
+	int			freeListIndex;	/* index in context_freelists[], or -1 */
 } AllocSetContext;
 
 typedef AllocSetContext *AllocSet;
@@ -157,6 +163,14 @@ typedef struct AllocBlockData
 /*
  * AllocChunk
  *		The prefix of each piece of memory in an AllocBlock
+ *
+ * Note: to meet the memory context APIs, the payload area of the chunk must
+ * be maxaligned, and the "aset" link must be immediately adjacent to the
+ * payload area (cf. GetMemoryChunkContext).  We simplify matters for this
+ * module by requiring sizeof(AllocChunkData) to be maxaligned, and then
+ * we can ensure things work by adding any required alignment padding before
+ * the "aset" field.  There is a static assertion below that the alignment
+ * is done correctly.
  */
 typedef struct AllocChunkData
 {
@@ -166,18 +180,30 @@ typedef struct AllocChunkData
 	/* when debugging memory usage, also store actual requested size */
 	/* this is zero in a free chunk */
 	Size		requested_size;
-#if MAXIMUM_ALIGNOF > 4 && SIZEOF_VOID_P == 4
-	Size		padding;
-#endif
 
+#define ALLOCCHUNK_RAWSIZE  (SIZEOF_SIZE_T * 2 + SIZEOF_VOID_P)
+#else
+#define ALLOCCHUNK_RAWSIZE  (SIZEOF_SIZE_T + SIZEOF_VOID_P)
 #endif							/* MEMORY_CONTEXT_CHECKING */
 
+	/* ensure proper alignment by adding padding if needed */
+#if (ALLOCCHUNK_RAWSIZE % MAXIMUM_ALIGNOF) != 0
+	char		padding[MAXIMUM_ALIGNOF - ALLOCCHUNK_RAWSIZE % MAXIMUM_ALIGNOF];
+#endif
+
 	/* aset is the owning aset if allocated, or the freelist link if free */
 	void	   *aset;
-
 	/* there must not be any padding to reach a MAXALIGN boundary here! */
 }			AllocChunkData;
 
+/*
+ * Only the "aset" field should be accessed outside this module.
+ * We keep the rest of an allocated chunk's header marked NOACCESS when using
+ * valgrind.  But note that chunk headers that are in a freelist are kept
+ * accessible, for simplicity.
+ */
+#define ALLOCCHUNK_PRIVATE_LEN	offsetof(AllocChunkData, aset)
+
 /*
  * AllocPointerIsValid
  *		True iff pointer is valid allocation pointer.
@@ -195,13 +221,57 @@ typedef struct AllocChunkData
 #define AllocChunkGetPointer(chk)	\
 					((AllocPointer)(((char *)(chk)) + ALLOC_CHUNKHDRSZ))
 
+/*
+ * Rather than repeatedly creating and deleting memory contexts, we keep some
+ * freed contexts in freelists so that we can hand them out again with little
+ * work.  Before putting a context in a freelist, we reset it so that it has
+ * only its initial malloc chunk and no others.  To be a candidate for a
+ * freelist, a context must have the same minContextSize/initBlockSize as
+ * other contexts in the list; but its maxBlockSize is irrelevant since that
+ * doesn't affect the size of the initial chunk.  Also, candidate contexts
+ * *must not* use MEMCONTEXT_COPY_NAME since that would make their header size
+ * variable.  (We currently insist that all flags be zero, since other flags
+ * would likely make the contexts less interchangeable, too.)
+ *
+ * We currently provide one freelist for ALLOCSET_DEFAULT_SIZES contexts
+ * and one for ALLOCSET_SMALL_SIZES contexts; the latter works for
+ * ALLOCSET_START_SMALL_SIZES too, since only the maxBlockSize differs.
+ *
+ * Ordinarily, we re-use freelist contexts in last-in-first-out order, in
+ * hopes of improving locality of reference.  But if there get to be too
+ * many contexts in the list, we'd prefer to drop the most-recently-created
+ * contexts in hopes of keeping the process memory map compact.
+ * We approximate that by simply deleting all existing entries when the list
+ * overflows, on the assumption that queries that allocate a lot of contexts
+ * will probably free them in more or less reverse order of allocation.
+ *
+ * Contexts in a freelist are chained via their nextchild pointers.
+ */
+#define MAX_FREE_CONTEXTS 100	/* arbitrary limit on freelist length */
+
+typedef struct AllocSetFreeList
+{
+	int			num_free;		/* current list length */
+	AllocSetContext *first_free;	/* list header */
+} AllocSetFreeList;
+
+/* context_freelists[0] is for default params, [1] for small params */
+static AllocSetFreeList context_freelists[2] =
+{
+	{
+		0, NULL
+	},
+	{
+		0, NULL
+	}
+};
+
 /*
  * These functions implement the MemoryContext API for AllocSet contexts.
  */
 static void *AllocSetAlloc(MemoryContext context, Size size);
 static void AllocSetFree(MemoryContext context, void *pointer);
 static void *AllocSetRealloc(MemoryContext context, void *pointer, Size size);
-static void AllocSetInit(MemoryContext context);
 static void AllocSetReset(MemoryContext context);
 static void AllocSetDelete(MemoryContext context);
 static Size AllocSetGetChunkSpace(MemoryContext context, void *pointer);
@@ -216,11 +286,10 @@ static void AllocSetCheck(MemoryContext context);
 /*
  * This is the virtual function table for AllocSet contexts.
  */
-static MemoryContextMethods AllocSetMethods = {
+static const MemoryContextMethods AllocSetMethods = {
 	AllocSetAlloc,
 	AllocSetFree,
 	AllocSetRealloc,
-	AllocSetInit,
 	AllocSetReset,
 	AllocSetDelete,
 	AllocSetGetChunkSpace,
@@ -305,63 +374,163 @@ AllocSetFreeIndex(Size size)
 
 
 /*
- * AllocSetContextCreate
+ * AllocSetContextCreateExtended
  *		Create a new AllocSet context.
  *
  * parent: parent context, or NULL if top-level context
  * name: name of context (for debugging only, need not be unique)
+ * flags: bitmask of MEMCONTEXT_XXX option flags
  * minContextSize: minimum context size
  * initBlockSize: initial allocation block size
  * maxBlockSize: maximum allocation block size
  *
- * Notes: the name string will be copied into context-lifespan storage.
+ * Notes: if flags & MEMCONTEXT_COPY_NAME, the name string will be copied into
+ * context-lifespan storage; otherwise, it had better be statically allocated.
  * Most callers should abstract the context size parameters using a macro
- * such as ALLOCSET_DEFAULT_SIZES.
+ * such as ALLOCSET_DEFAULT_SIZES.  (This is now *required* when going
+ * through the AllocSetContextCreate macro.)
  */
 MemoryContext
-AllocSetContextCreate(MemoryContext parent,
-					  const char *name,
-					  Size minContextSize,
-					  Size initBlockSize,
-					  Size maxBlockSize)
+AllocSetContextCreateExtended(MemoryContext parent,
+							  const char *name,
+							  int flags,
+							  Size minContextSize,
+							  Size initBlockSize,
+							  Size maxBlockSize)
 {
+	int			freeListIndex;
+	Size		headerSize;
+	Size		firstBlockSize;
 	AllocSet	set;
+	AllocBlock	block;
 
+	/* Assert we padded AllocChunkData properly */
+	StaticAssertStmt(ALLOC_CHUNKHDRSZ == MAXALIGN(ALLOC_CHUNKHDRSZ),
+					 "sizeof(AllocChunkData) is not maxaligned");
 	StaticAssertStmt(offsetof(AllocChunkData, aset) + sizeof(MemoryContext) ==
-					 MAXALIGN(sizeof(AllocChunkData)),
+					 ALLOC_CHUNKHDRSZ,
 					 "padding calculation in AllocChunkData is wrong");
 
 	/*
-	 * First, validate allocation parameters.  (If we're going to throw an
-	 * error, we should do so before the context is created, not after.)  We
-	 * somewhat arbitrarily enforce a minimum 1K block size.
+	 * First, validate allocation parameters.  Once these were regular runtime
+	 * test and elog's, but in practice Asserts seem sufficient because nobody
+	 * varies their parameters at runtime.  We somewhat arbitrarily enforce a
+	 * minimum 1K block size.
 	 */
-	if (initBlockSize != MAXALIGN(initBlockSize) ||
-		initBlockSize < 1024)
-		elog(ERROR, "invalid initBlockSize for memory context: %zu",
-			 initBlockSize);
-	if (maxBlockSize != MAXALIGN(maxBlockSize) ||
-		maxBlockSize < initBlockSize ||
-		!AllocHugeSizeIsValid(maxBlockSize))	/* must be safe to double */
-		elog(ERROR, "invalid maxBlockSize for memory context: %zu",
-			 maxBlockSize);
-	if (minContextSize != 0 &&
-		(minContextSize != MAXALIGN(minContextSize) ||
-		 minContextSize <= ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ))
-		elog(ERROR, "invalid minContextSize for memory context: %zu",
-			 minContextSize);
-
-	/* Do the type-independent part of context creation */
-	set = (AllocSet) MemoryContextCreate(T_AllocSetContext,
-										 sizeof(AllocSetContext),
-										 &AllocSetMethods,
-										 parent,
-										 name);
-
-	/* Save allocation parameters */
+	Assert(initBlockSize == MAXALIGN(initBlockSize) &&
+		   initBlockSize >= 1024);
+	Assert(maxBlockSize == MAXALIGN(maxBlockSize) &&
+		   maxBlockSize >= initBlockSize &&
+		   AllocHugeSizeIsValid(maxBlockSize)); /* must be safe to double */
+	Assert(minContextSize == 0 ||
+		   (minContextSize == MAXALIGN(minContextSize) &&
+			minContextSize >= 1024 &&
+			minContextSize <= maxBlockSize));
+
+	/*
+	 * Check whether the parameters match either available freelist.  We do
+	 * not need to demand a match of maxBlockSize.
+	 */
+	if (flags == 0 &&
+		minContextSize == ALLOCSET_DEFAULT_MINSIZE &&
+		initBlockSize == ALLOCSET_DEFAULT_INITSIZE)
+		freeListIndex = 0;
+	else if (flags == 0 &&
+			 minContextSize == ALLOCSET_SMALL_MINSIZE &&
+			 initBlockSize == ALLOCSET_SMALL_INITSIZE)
+		freeListIndex = 1;
+	else
+		freeListIndex = -1;
+
+	/*
+	 * If a suitable freelist entry exists, just recycle that context.
+	 */
+	if (freeListIndex >= 0)
+	{
+		AllocSetFreeList *freelist = &context_freelists[freeListIndex];
+
+		if (freelist->first_free != NULL)
+		{
+			/* Remove entry from freelist */
+			set = freelist->first_free;
+			freelist->first_free = (AllocSet) set->header.nextchild;
+			freelist->num_free--;
+
+			/* Update its maxBlockSize; everything else should be OK */
+			set->maxBlockSize = maxBlockSize;
+
+			/* Reinitialize its header, installing correct name and parent */
+			MemoryContextCreate((MemoryContext) set,
+								T_AllocSetContext,
+								set->headerSize,
+								sizeof(AllocSetContext),
+								&AllocSetMethods,
+								parent,
+								name,
+								flags);
+
+			return (MemoryContext) set;
+		}
+	}
+
+	/* Size of the memory context header, including name storage if needed */
+	if (flags & MEMCONTEXT_COPY_NAME)
+		headerSize = MAXALIGN(sizeof(AllocSetContext) + strlen(name) + 1);
+	else
+		headerSize = MAXALIGN(sizeof(AllocSetContext));
+
+	/* Determine size of initial block */
+	firstBlockSize = headerSize + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ;
+	if (minContextSize != 0)
+		firstBlockSize = Max(firstBlockSize, minContextSize);
+	else
+		firstBlockSize = Max(firstBlockSize, initBlockSize);
+
+	/*
+	 * Allocate the initial block.  Unlike other aset.c blocks, it starts with
+	 * the context header and its block header follows that.
+	 */
+	set = (AllocSet) malloc(firstBlockSize);
+	if (set == NULL)
+	{
+		if (TopMemoryContext)
+			MemoryContextStats(TopMemoryContext);
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory"),
+				 errdetail("Failed while creating memory context \"%s\".",
+						   name)));
+	}
+
+	/*
+	 * Avoid writing code that can fail between here and MemoryContextCreate;
+	 * we'd leak the header/initial block if we ereport in this stretch.
+	 */
+
+	/* Fill in the initial block's block header */
+	block = (AllocBlock) (((char *) set) + headerSize);
+	block->aset = set;
+	block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
+	block->endptr = ((char *) set) + firstBlockSize;
+	block->prev = NULL;
+	block->next = NULL;
+
+	/* Mark unallocated space NOACCESS; leave the block header alone. */
+	VALGRIND_MAKE_MEM_NOACCESS(block->freeptr, block->endptr - block->freeptr);
+
+	/* Remember block as part of block list */
+	set->blocks = block;
+	/* Mark block as not to be released at reset time */
+	set->keeper = block;
+
+	/* Finish filling in aset-specific parts of the context header */
+	MemSetAligned(set->freelist, 0, sizeof(set->freelist));
+
 	set->initBlockSize = initBlockSize;
 	set->maxBlockSize = maxBlockSize;
 	set->nextBlockSize = initBlockSize;
+	set->headerSize = headerSize;
+	set->freeListIndex = freeListIndex;
 
 	/*
 	 * Compute the allocation chunk size limit for this context.  It can't be
@@ -387,64 +556,19 @@ AllocSetContextCreate(MemoryContext parent,
 		   (Size) ((maxBlockSize - ALLOC_BLOCKHDRSZ) / ALLOC_CHUNK_FRACTION))
 		set->allocChunkLimit >>= 1;
 
-	/*
-	 * Grab always-allocated space, if requested
-	 */
-	if (minContextSize > 0)
-	{
-		Size		blksize = minContextSize;
-		AllocBlock	block;
-
-		block = (AllocBlock) malloc(blksize);
-		if (block == NULL)
-		{
-			MemoryContextStats(TopMemoryContext);
-			ereport(ERROR,
-					(errcode(ERRCODE_OUT_OF_MEMORY),
-					 errmsg("out of memory"),
-					 errdetail("Failed while creating memory context \"%s\".",
-							   name)));
-		}
-		block->aset = set;
-		block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
-		block->endptr = ((char *) block) + blksize;
-		block->prev = NULL;
-		block->next = set->blocks;
-		if (block->next)
-			block->next->prev = block;
-		set->blocks = block;
-		/* Mark block as not to be released at reset time */
-		set->keeper = block;
-
-		/* Mark unallocated space NOACCESS; leave the block header alone. */
-		VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
-								   blksize - ALLOC_BLOCKHDRSZ);
-	}
+	/* Finally, do the type-independent part of context creation */
+	MemoryContextCreate((MemoryContext) set,
+						T_AllocSetContext,
+						headerSize,
+						sizeof(AllocSetContext),
+						&AllocSetMethods,
+						parent,
+						name,
+						flags);
 
 	return (MemoryContext) set;
 }
 
-/*
- * AllocSetInit
- *		Context-type-specific initialization routine.
- *
- * This is called by MemoryContextCreate() after setting up the
- * generic MemoryContext fields and before linking the new context
- * into the context tree.  We must do whatever is needed to make the
- * new context minimally valid for deletion.  We must *not* risk
- * failure --- thus, for example, allocating more memory is not cool.
- * (AllocSetContextCreate can allocate memory when it gets control
- * back, however.)
- */
-static void
-AllocSetInit(MemoryContext context)
-{
-	/*
-	 * Since MemoryContextCreate already zeroed the context node, we don't
-	 * have to do anything here: it's already OK.
-	 */
-}
-
 /*
  * AllocSetReset
  *		Frees all memory which is allocated in the given set.
@@ -452,9 +576,10 @@ AllocSetInit(MemoryContext context)
  * Actually, this routine has some discretion about what to do.
  * It should mark all allocated chunks freed, but it need not necessarily
  * give back all the resources the set owns.  Our actual implementation is
- * that we hang onto any "keeper" block specified for the set.  In this way,
- * we don't thrash malloc() when a context is repeatedly reset after small
- * allocations, which is typical behavior for per-tuple contexts.
+ * that we give back all but the "keeper" block (which we must keep, since
+ * it shares a malloc chunk with the context header).  In this way, we don't
+ * thrash malloc() when a context is repeatedly reset after small allocations,
+ * which is typical behavior for per-tuple contexts.
  */
 static void
 AllocSetReset(MemoryContext context)
@@ -474,7 +599,7 @@ AllocSetReset(MemoryContext context)
 
 	block = set->blocks;
 
-	/* New blocks list is either empty or just the keeper block */
+	/* New blocks list will be just the keeper block */
 	set->blocks = set->keeper;
 
 	while (block != NULL)
@@ -517,7 +642,6 @@ AllocSetReset(MemoryContext context)
  *		in preparation for deletion of the set.
  *
  * Unlike AllocSetReset, this *must* free all resources of the set.
- * But note we are not responsible for deleting the context node itself.
  */
 static void
 AllocSetDelete(MemoryContext context)
@@ -532,11 +656,49 @@ AllocSetDelete(MemoryContext context)
 	AllocSetCheck(context);
 #endif
 
-	/* Make it look empty, just in case... */
-	MemSetAligned(set->freelist, 0, sizeof(set->freelist));
-	set->blocks = NULL;
-	set->keeper = NULL;
+	/*
+	 * If the context is a candidate for a freelist, put it into that freelist
+	 * instead of destroying it.
+	 */
+	if (set->freeListIndex >= 0)
+	{
+		AllocSetFreeList *freelist = &context_freelists[set->freeListIndex];
+
+		/*
+		 * Reset the context, if it needs it, so that we aren't hanging on to
+		 * more than the initial malloc chunk.
+		 */
+		if (!context->isReset)
+			MemoryContextResetOnly(context);
+
+		/*
+		 * If the freelist is full, just discard what's already in it.  See
+		 * comments with context_freelists[].
+		 */
+		if (freelist->num_free >= MAX_FREE_CONTEXTS)
+		{
+			while (freelist->first_free != NULL)
+			{
+				AllocSetContext *oldset = freelist->first_free;
+
+				freelist->first_free = (AllocSetContext *) oldset->header.nextchild;
+				freelist->num_free--;
+
+				/* All that remains is to free the header/initial block */
+				free(oldset);
+			}
+			Assert(freelist->num_free == 0);
+		}
+
+		/* Now add the just-deleted context to the freelist. */
+		set->header.nextchild = (MemoryContext) freelist->first_free;
+		freelist->first_free = set;
+		freelist->num_free++;
 
+		return;
+	}
+
+	/* Free all blocks, except the keeper which is part of context header */
 	while (block != NULL)
 	{
 		AllocBlock	next = block->next;
@@ -544,9 +706,15 @@ AllocSetDelete(MemoryContext context)
 #ifdef CLOBBER_FREED_MEMORY
 		wipe_mem(block, block->freeptr - ((char *) block));
 #endif
-		free(block);
+
+		if (block != set->keeper)
+			free(block);
+
 		block = next;
 	}
+
+	/* Finally, free the context header, including the keeper block */
+	free(set);
 }
 
 /*
@@ -557,6 +725,10 @@ AllocSetDelete(MemoryContext context)
  * No request may exceed:
  *		MAXALIGN_DOWN(SIZE_MAX) - ALLOC_BLOCKHDRSZ - ALLOC_CHUNKHDRSZ
  * All callers use a much-lower limit.
+ *
+ * Note: when using valgrind, it doesn't matter how the returned allocation
+ * is marked, as mcxt.c will set it to UNDEFINED.  In some paths we will
+ * return space that is marked NOACCESS - AllocSetRealloc has to beware!
  */
 static void *
 AllocSetAlloc(MemoryContext context, Size size)
@@ -588,7 +760,6 @@ AllocSetAlloc(MemoryContext context, Size size)
 		chunk->aset = set;
 		chunk->size = chunk_size;
 #ifdef MEMORY_CONTEXT_CHECKING
-		/* Valgrind: Will be made NOACCESS below. */
 		chunk->requested_size = size;
 		/* set mark to catch clobber of "unused" space */
 		if (size < chunk_size)
@@ -620,14 +791,12 @@ AllocSetAlloc(MemoryContext context, Size size)
 
 		AllocAllocInfo(set, chunk);
 
-		/*
-		 * Chunk's metadata fields remain DEFINED.  The requested allocation
-		 * itself can be NOACCESS or UNDEFINED; our caller will soon make it
-		 * UNDEFINED.  Make extra space at the end of the chunk, if any,
-		 * NOACCESS.
-		 */
-		VALGRIND_MAKE_MEM_NOACCESS((char *) chunk + ALLOC_CHUNKHDRSZ,
-								   chunk_size - ALLOC_CHUNKHDRSZ);
+		/* Ensure any padding bytes are marked NOACCESS. */
+		VALGRIND_MAKE_MEM_NOACCESS((char *) AllocChunkGetPointer(chunk) + size,
+								   chunk_size - size);
+
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
 
 		return AllocChunkGetPointer(chunk);
 	}
@@ -649,10 +818,7 @@ AllocSetAlloc(MemoryContext context, Size size)
 		chunk->aset = (void *) set;
 
 #ifdef MEMORY_CONTEXT_CHECKING
-		/* Valgrind: Free list requested_size should be DEFINED. */
 		chunk->requested_size = size;
-		VALGRIND_MAKE_MEM_NOACCESS(&chunk->requested_size,
-								   sizeof(chunk->requested_size));
 		/* set mark to catch clobber of "unused" space */
 		if (size < chunk->size)
 			set_sentinel(AllocChunkGetPointer(chunk), size);
@@ -663,6 +829,14 @@ AllocSetAlloc(MemoryContext context, Size size)
 #endif
 
 		AllocAllocInfo(set, chunk);
+
+		/* Ensure any padding bytes are marked NOACCESS. */
+		VALGRIND_MAKE_MEM_NOACCESS((char *) AllocChunkGetPointer(chunk) + size,
+								   chunk->size - size);
+
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 		return AllocChunkGetPointer(chunk);
 	}
 
@@ -778,18 +952,6 @@ AllocSetAlloc(MemoryContext context, Size size)
 		block->freeptr = ((char *) block) + ALLOC_BLOCKHDRSZ;
 		block->endptr = ((char *) block) + blksize;
 
-		/*
-		 * If this is the first block of the set, make it the "keeper" block.
-		 * Formerly, a keeper block could only be created during context
-		 * creation, but allowing it to happen here lets us have fast reset
-		 * cycling even for contexts created with minContextSize = 0; that way
-		 * we don't have to force space to be allocated in contexts that might
-		 * never need any space.  Don't mark an oversize block as a keeper,
-		 * however.
-		 */
-		if (set->keeper == NULL && blksize == set->initBlockSize)
-			set->keeper = block;
-
 		/* Mark unallocated space NOACCESS. */
 		VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
 								   blksize - ALLOC_BLOCKHDRSZ);
@@ -816,8 +978,6 @@ AllocSetAlloc(MemoryContext context, Size size)
 	chunk->size = chunk_size;
 #ifdef MEMORY_CONTEXT_CHECKING
 	chunk->requested_size = size;
-	VALGRIND_MAKE_MEM_NOACCESS(&chunk->requested_size,
-							   sizeof(chunk->requested_size));
 	/* set mark to catch clobber of "unused" space */
 	if (size < chunk->size)
 		set_sentinel(AllocChunkGetPointer(chunk), size);
@@ -828,6 +988,14 @@ AllocSetAlloc(MemoryContext context, Size size)
 #endif
 
 	AllocAllocInfo(set, chunk);
+
+	/* Ensure any padding bytes are marked NOACCESS. */
+	VALGRIND_MAKE_MEM_NOACCESS((char *) AllocChunkGetPointer(chunk) + size,
+							   chunk_size - size);
+
+	/* Disallow external access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 	return AllocChunkGetPointer(chunk);
 }
 
@@ -841,11 +1009,12 @@ AllocSetFree(MemoryContext context, void *pointer)
 	AllocSet	set = (AllocSet) context;
 	AllocChunk	chunk = AllocPointerGetChunk(pointer);
 
+	/* Allow access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_DEFINED(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 	AllocFreeInfo(set, chunk);
 
 #ifdef MEMORY_CONTEXT_CHECKING
-	VALGRIND_MAKE_MEM_DEFINED(&chunk->requested_size,
-							  sizeof(chunk->requested_size));
 	/* Test for someone scribbling on unused space in chunk */
 	if (chunk->requested_size < chunk->size)
 		if (!sentinel_ok(pointer, chunk->requested_size))
@@ -920,11 +1089,14 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 {
 	AllocSet	set = (AllocSet) context;
 	AllocChunk	chunk = AllocPointerGetChunk(pointer);
-	Size		oldsize = chunk->size;
+	Size		oldsize;
+
+	/* Allow access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_DEFINED(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
+	oldsize = chunk->size;
 
 #ifdef MEMORY_CONTEXT_CHECKING
-	VALGRIND_MAKE_MEM_DEFINED(&chunk->requested_size,
-							  sizeof(chunk->requested_size));
 	/* Test for someone scribbling on unused space in chunk */
 	if (chunk->requested_size < oldsize)
 		if (!sentinel_ok(pointer, chunk->requested_size))
@@ -950,8 +1122,6 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 #endif
 
 		chunk->requested_size = size;
-		VALGRIND_MAKE_MEM_NOACCESS(&chunk->requested_size,
-								   sizeof(chunk->requested_size));
 
 		/*
 		 * If this is an increase, mark any newly-available part UNDEFINED.
@@ -978,6 +1148,9 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 		VALGRIND_MAKE_MEM_DEFINED(pointer, size);
 #endif
 
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 		return pointer;
 	}
 
@@ -1008,7 +1181,11 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 		blksize = chksize + ALLOC_BLOCKHDRSZ + ALLOC_CHUNKHDRSZ;
 		block = (AllocBlock) realloc(block, blksize);
 		if (block == NULL)
+		{
+			/* Disallow external access to private part of chunk header. */
+			VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
 			return NULL;
+		}
 		block->freeptr = block->endptr = ((char *) block) + blksize;
 
 		/* Update pointers since block has likely been moved */
@@ -1038,8 +1215,6 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 									oldsize - chunk->requested_size);
 
 		chunk->requested_size = size;
-		VALGRIND_MAKE_MEM_NOACCESS(&chunk->requested_size,
-								   sizeof(chunk->requested_size));
 
 		/* set mark to catch clobber of "unused" space */
 		if (size < chunk->size)
@@ -1054,9 +1229,12 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 		VALGRIND_MAKE_MEM_DEFINED(pointer, oldsize);
 #endif
 
-		/* Make any trailing alignment padding NOACCESS. */
+		/* Ensure any padding bytes are marked NOACCESS. */
 		VALGRIND_MAKE_MEM_NOACCESS((char *) pointer + size, chksize - size);
 
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 		return pointer;
 	}
 	else
@@ -1079,14 +1257,19 @@ AllocSetRealloc(MemoryContext context, void *pointer, Size size)
 
 		/* leave immediately if request was not completed */
 		if (newPointer == NULL)
+		{
+			/* Disallow external access to private part of chunk header. */
+			VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
 			return NULL;
+		}
 
 		/*
-		 * AllocSetAlloc() just made the region NOACCESS.  Change it to
-		 * UNDEFINED for the moment; memcpy() will then transfer definedness
-		 * from the old allocation to the new.  If we know the old allocation,
-		 * copy just that much.  Otherwise, make the entire old chunk defined
-		 * to avoid errors as we copy the currently-NOACCESS trailing bytes.
+		 * AllocSetAlloc() may have returned a region that is still NOACCESS.
+		 * Change it to UNDEFINED for the moment; memcpy() will then transfer
+		 * definedness from the old allocation to the new.  If we know the old
+		 * allocation, copy just that much.  Otherwise, make the entire old
+		 * chunk defined to avoid errors as we copy the currently-NOACCESS
+		 * trailing bytes.
 		 */
 		VALGRIND_MAKE_MEM_UNDEFINED(newPointer, size);
 #ifdef MEMORY_CONTEXT_CHECKING
@@ -1114,8 +1297,12 @@ static Size
 AllocSetGetChunkSpace(MemoryContext context, void *pointer)
 {
 	AllocChunk	chunk = AllocPointerGetChunk(pointer);
+	Size		result;
 
-	return chunk->size + ALLOC_CHUNKHDRSZ;
+	VALGRIND_MAKE_MEM_DEFINED(chunk, ALLOCCHUNK_PRIVATE_LEN);
+	result = chunk->size + ALLOC_CHUNKHDRSZ;
+	VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+	return result;
 }
 
 /*
@@ -1151,11 +1338,14 @@ AllocSetStats(MemoryContext context, int level, bool print,
 	AllocSet	set = (AllocSet) context;
 	Size		nblocks = 0;
 	Size		freechunks = 0;
-	Size		totalspace = 0;
+	Size		totalspace;
 	Size		freespace = 0;
 	AllocBlock	block;
 	int			fidx;
 
+	/* Include context header in totalspace */
+	totalspace = set->headerSize;
+
 	for (block = set->blocks; block != NULL; block = block->next)
 	{
 		nblocks++;
@@ -1210,7 +1400,7 @@ static void
 AllocSetCheck(MemoryContext context)
 {
 	AllocSet	set = (AllocSet) context;
-	char	   *name = set->header.name;
+	const char *name = set->header.name;
 	AllocBlock	prevblock;
 	AllocBlock	block;
 
@@ -1252,13 +1442,11 @@ AllocSetCheck(MemoryContext context)
 			Size		chsize,
 						dsize;
 
+			/* Allow access to private part of chunk header. */
+			VALGRIND_MAKE_MEM_DEFINED(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 			chsize = chunk->size;	/* aligned chunk size */
-			VALGRIND_MAKE_MEM_DEFINED(&chunk->requested_size,
-									  sizeof(chunk->requested_size));
 			dsize = chunk->requested_size;	/* real data */
-			if (dsize > 0)		/* not on a free list */
-				VALGRIND_MAKE_MEM_NOACCESS(&chunk->requested_size,
-										   sizeof(chunk->requested_size));
 
 			/*
 			 * Check chunk size
@@ -1279,20 +1467,28 @@ AllocSetCheck(MemoryContext context)
 			/*
 			 * If chunk is allocated, check for correct aset pointer. (If it's
 			 * free, the aset is the freelist pointer, which we can't check as
-			 * easily...)
+			 * easily...)  Note this is an incomplete test, since palloc(0)
+			 * produces an allocated chunk with requested_size == 0.
 			 */
 			if (dsize > 0 && chunk->aset != (void *) set)
 				elog(WARNING, "problem in alloc set %s: bogus aset link in block %p, chunk %p",
 					 name, block, chunk);
 
 			/*
-			 * Check for overwrite of "unallocated" space in chunk
+			 * Check for overwrite of padding space in an allocated chunk.
 			 */
-			if (dsize > 0 && dsize < chsize &&
+			if (chunk->aset == (void *) set && dsize < chsize &&
 				!sentinel_ok(chunk, ALLOC_CHUNKHDRSZ + dsize))
 				elog(WARNING, "problem in alloc set %s: detected write past chunk end in block %p, chunk %p",
 					 name, block, chunk);
 
+			/*
+			 * If chunk is allocated, disallow external access to private part
+			 * of chunk header.
+			 */
+			if (chunk->aset == (void *) set)
+				VALGRIND_MAKE_MEM_NOACCESS(chunk, ALLOCCHUNK_PRIVATE_LEN);
+
 			blk_data += chsize;
 			nchunks++;
 
diff --git a/src/backend/utils/mmgr/dsa.c b/src/backend/utils/mmgr/dsa.c
index b3327f676b..c2b13100a2 100644
--- a/src/backend/utils/mmgr/dsa.c
+++ b/src/backend/utils/mmgr/dsa.c
@@ -39,7 +39,7 @@
  * empty and be returned to the free page manager, and whole segments can
  * become empty and be returned to the operating system.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -707,7 +707,7 @@ dsa_allocate_extended(dsa_area *area, Size size, int flags)
 			dsa_free(area, span_pointer);
 
 			/* Raise error unless asked not to. */
-			if ((flags & MCXT_ALLOC_NO_OOM) == 0)
+			if ((flags & DSA_ALLOC_NO_OOM) == 0)
 				ereport(ERROR,
 						(errcode(ERRCODE_OUT_OF_MEMORY),
 						 errmsg("out of memory"),
diff --git a/src/backend/utils/mmgr/freepage.c b/src/backend/utils/mmgr/freepage.c
index b455484bef..5bddfefed4 100644
--- a/src/backend/utils/mmgr/freepage.c
+++ b/src/backend/utils/mmgr/freepage.c
@@ -42,7 +42,7 @@
  * where memory fragmentation is very severe, only a tiny fraction of
  * the pages under management are consumed by this btree.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/mmgr/generation.c b/src/backend/utils/mmgr/generation.c
new file mode 100644
index 0000000000..338386a5d1
--- /dev/null
+++ b/src/backend/utils/mmgr/generation.c
@@ -0,0 +1,846 @@
+/*-------------------------------------------------------------------------
+ *
+ * generation.c
+ *	  Generational allocator definitions.
+ *
+ * Generation is a custom MemoryContext implementation designed for cases of
+ * chunks with similar lifespan.
+ *
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *	  src/backend/utils/mmgr/generation.c
+ *
+ *
+ *	This memory context is based on the assumption that the chunks are freed
+ *	roughly in the same order as they were allocated (FIFO), or in groups with
+ *	similar lifespan (generations - hence the name of the context). This is
+ *	typical for various queue-like use cases, i.e. when tuples are constructed,
+ *	processed and then thrown away.
+ *
+ *	The memory context uses a very simple approach to free space management.
+ *	Instead of a complex global freelist, each block tracks a number
+ *	of allocated and freed chunks. Freed chunks are not reused, and once all
+ *	chunks in a block are freed, the whole block is thrown away. When the
+ *	chunks allocated in the same block have similar lifespan, this works
+ *	very well and is very cheap.
+ *
+ *	The current implementation only uses a fixed block size - maybe it should
+ *	adapt a min/max block size range, and grow the blocks automatically.
+ *	It already uses dedicated blocks for oversized chunks.
+ *
+ *	XXX It might be possible to improve this by keeping a small freelist for
+ *	only a small number of recent blocks, but it's not clear it's worth the
+ *	additional complexity.
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "lib/ilist.h"
+#include "utils/memdebug.h"
+#include "utils/memutils.h"
+
+
+#define Generation_BLOCKHDRSZ	MAXALIGN(sizeof(GenerationBlock))
+#define Generation_CHUNKHDRSZ	sizeof(GenerationChunk)
+
+typedef struct GenerationBlock GenerationBlock; /* forward reference */
+typedef struct GenerationChunk GenerationChunk;
+
+typedef void *GenerationPointer;
+
+/*
+ * GenerationContext is a simple memory context not reusing allocated chunks,
+ * and freeing blocks once all chunks are freed.
+ */
+typedef struct GenerationContext
+{
+	MemoryContextData header;	/* Standard memory-context fields */
+
+	/* Generational context parameters */
+	Size		blockSize;		/* standard block size */
+	Size		headerSize;		/* allocated size of context header */
+
+	GenerationBlock *block;		/* current (most recently allocated) block */
+	dlist_head	blocks;			/* list of blocks */
+} GenerationContext;
+
+/*
+ * GenerationBlock
+ *		GenerationBlock is the unit of memory that is obtained by generation.c
+ *		from malloc().  It contains one or more GenerationChunks, which are
+ *		the units requested by palloc() and freed by pfree().  GenerationChunks
+ *		cannot be returned to malloc() individually, instead pfree()
+ *		updates the free counter of the block and when all chunks in a block
+ *		are free the whole block is returned to malloc().
+ *
+ *		GenerationBlock is the header data for a block --- the usable space
+ *		within the block begins at the next alignment boundary.
+ */
+struct GenerationBlock
+{
+	dlist_node	node;			/* doubly-linked list of blocks */
+	Size		blksize;		/* allocated size of this block */
+	int			nchunks;		/* number of chunks in the block */
+	int			nfree;			/* number of free chunks */
+	char	   *freeptr;		/* start of free space in this block */
+	char	   *endptr;			/* end of space in this block */
+};
+
+/*
+ * GenerationChunk
+ *		The prefix of each piece of memory in a GenerationBlock
+ *
+ * Note: to meet the memory context APIs, the payload area of the chunk must
+ * be maxaligned, and the "context" link must be immediately adjacent to the
+ * payload area (cf. GetMemoryChunkContext).  We simplify matters for this
+ * module by requiring sizeof(GenerationChunk) to be maxaligned, and then
+ * we can ensure things work by adding any required alignment padding before
+ * the pointer fields.  There is a static assertion below that the alignment
+ * is done correctly.
+ */
+struct GenerationChunk
+{
+	/* size is always the size of the usable space in the chunk */
+	Size		size;
+#ifdef MEMORY_CONTEXT_CHECKING
+	/* when debugging memory usage, also store actual requested size */
+	/* this is zero in a free chunk */
+	Size		requested_size;
+
+#define GENERATIONCHUNK_RAWSIZE  (SIZEOF_SIZE_T * 2 + SIZEOF_VOID_P * 2)
+#else
+#define GENERATIONCHUNK_RAWSIZE  (SIZEOF_SIZE_T + SIZEOF_VOID_P * 2)
+#endif							/* MEMORY_CONTEXT_CHECKING */
+
+	/* ensure proper alignment by adding padding if needed */
+#if (GENERATIONCHUNK_RAWSIZE % MAXIMUM_ALIGNOF) != 0
+	char		padding[MAXIMUM_ALIGNOF - GENERATIONCHUNK_RAWSIZE % MAXIMUM_ALIGNOF];
+#endif
+
+	GenerationBlock *block;		/* block owning this chunk */
+	GenerationContext *context; /* owning context, or NULL if freed chunk */
+	/* there must not be any padding to reach a MAXALIGN boundary here! */
+};
+
+/*
+ * Only the "context" field should be accessed outside this module.
+ * We keep the rest of an allocated chunk's header marked NOACCESS when using
+ * valgrind.  But note that freed chunk headers are kept accessible, for
+ * simplicity.
+ */
+#define GENERATIONCHUNK_PRIVATE_LEN	offsetof(GenerationChunk, context)
+
+/*
+ * GenerationIsValid
+ *		True iff set is valid allocation set.
+ */
+#define GenerationIsValid(set) PointerIsValid(set)
+
+#define GenerationPointerGetChunk(ptr) \
+	((GenerationChunk *)(((char *)(ptr)) - Generation_CHUNKHDRSZ))
+#define GenerationChunkGetPointer(chk) \
+	((GenerationPointer *)(((char *)(chk)) + Generation_CHUNKHDRSZ))
+
+/*
+ * These functions implement the MemoryContext API for Generation contexts.
+ */
+static void *GenerationAlloc(MemoryContext context, Size size);
+static void GenerationFree(MemoryContext context, void *pointer);
+static void *GenerationRealloc(MemoryContext context, void *pointer, Size size);
+static void GenerationReset(MemoryContext context);
+static void GenerationDelete(MemoryContext context);
+static Size GenerationGetChunkSpace(MemoryContext context, void *pointer);
+static bool GenerationIsEmpty(MemoryContext context);
+static void GenerationStats(MemoryContext context, int level, bool print,
+				MemoryContextCounters *totals);
+
+#ifdef MEMORY_CONTEXT_CHECKING
+static void GenerationCheck(MemoryContext context);
+#endif
+
+/*
+ * This is the virtual function table for Generation contexts.
+ */
+static const MemoryContextMethods GenerationMethods = {
+	GenerationAlloc,
+	GenerationFree,
+	GenerationRealloc,
+	GenerationReset,
+	GenerationDelete,
+	GenerationGetChunkSpace,
+	GenerationIsEmpty,
+	GenerationStats
+#ifdef MEMORY_CONTEXT_CHECKING
+	,GenerationCheck
+#endif
+};
+
+/* ----------
+ * Debug macros
+ * ----------
+ */
+#ifdef HAVE_ALLOCINFO
+#define GenerationFreeInfo(_cxt, _chunk) \
+			fprintf(stderr, "GenerationFree: %s: %p, %lu\n", \
+				(_cxt)->name, (_chunk), (_chunk)->size)
+#define GenerationAllocInfo(_cxt, _chunk) \
+			fprintf(stderr, "GenerationAlloc: %s: %p, %lu\n", \
+				(_cxt)->name, (_chunk), (_chunk)->size)
+#else
+#define GenerationFreeInfo(_cxt, _chunk)
+#define GenerationAllocInfo(_cxt, _chunk)
+#endif
+
+
+/*
+ * Public routines
+ */
+
+
+/*
+ * GenerationContextCreate
+ *		Create a new Generation context.
+ */
+MemoryContext
+GenerationContextCreate(MemoryContext parent,
+						const char *name,
+						int flags,
+						Size blockSize)
+{
+	Size		headerSize;
+	GenerationContext *set;
+
+	/* Assert we padded GenerationChunk properly */
+	StaticAssertStmt(Generation_CHUNKHDRSZ == MAXALIGN(Generation_CHUNKHDRSZ),
+					 "sizeof(GenerationChunk) is not maxaligned");
+	StaticAssertStmt(offsetof(GenerationChunk, context) + sizeof(MemoryContext) ==
+					 Generation_CHUNKHDRSZ,
+					 "padding calculation in GenerationChunk is wrong");
+
+	/*
+	 * First, validate allocation parameters.  (If we're going to throw an
+	 * error, we should do so before the context is created, not after.)  We
+	 * somewhat arbitrarily enforce a minimum 1K block size, mostly because
+	 * that's what AllocSet does.
+	 */
+	if (blockSize != MAXALIGN(blockSize) ||
+		blockSize < 1024 ||
+		!AllocHugeSizeIsValid(blockSize))
+		elog(ERROR, "invalid blockSize for memory context: %zu",
+			 blockSize);
+
+	/*
+	 * Allocate the context header.  Unlike aset.c, we never try to combine
+	 * this with the first regular block, since that would prevent us from
+	 * freeing the first generation of allocations.
+	 */
+
+	/* Size of the memory context header, including name storage if needed */
+	if (flags & MEMCONTEXT_COPY_NAME)
+		headerSize = MAXALIGN(sizeof(GenerationContext) + strlen(name) + 1);
+	else
+		headerSize = MAXALIGN(sizeof(GenerationContext));
+
+	set = (GenerationContext *) malloc(headerSize);
+	if (set == NULL)
+	{
+		MemoryContextStats(TopMemoryContext);
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory"),
+				 errdetail("Failed while creating memory context \"%s\".",
+						   name)));
+	}
+
+	/*
+	 * Avoid writing code that can fail between here and MemoryContextCreate;
+	 * we'd leak the header if we ereport in this stretch.
+	 */
+
+	/* Fill in GenerationContext-specific header fields */
+	set->blockSize = blockSize;
+	set->headerSize = headerSize;
+	set->block = NULL;
+	dlist_init(&set->blocks);
+
+	/* Finally, do the type-independent part of context creation */
+	MemoryContextCreate((MemoryContext) set,
+						T_GenerationContext,
+						headerSize,
+						sizeof(GenerationContext),
+						&GenerationMethods,
+						parent,
+						name,
+						flags);
+
+	return (MemoryContext) set;
+}
+
+/*
+ * GenerationReset
+ *		Frees all memory which is allocated in the given set.
+ *
+ * The code simply frees all the blocks in the context - we don't keep any
+ * keeper blocks or anything like that.
+ */
+static void
+GenerationReset(MemoryContext context)
+{
+	GenerationContext *set = (GenerationContext *) context;
+	dlist_mutable_iter miter;
+
+	AssertArg(GenerationIsValid(set));
+
+#ifdef MEMORY_CONTEXT_CHECKING
+	/* Check for corruption and leaks before freeing */
+	GenerationCheck(context);
+#endif
+
+	dlist_foreach_modify(miter, &set->blocks)
+	{
+		GenerationBlock *block = dlist_container(GenerationBlock, node, miter.cur);
+
+		dlist_delete(miter.cur);
+
+#ifdef CLOBBER_FREED_MEMORY
+		wipe_mem(block, block->blksize);
+#endif
+
+		free(block);
+	}
+
+	set->block = NULL;
+
+	Assert(dlist_is_empty(&set->blocks));
+}
+
+/*
+ * GenerationDelete
+ *		Free all memory which is allocated in the given context.
+ */
+static void
+GenerationDelete(MemoryContext context)
+{
+	/* Reset to release all the GenerationBlocks */
+	GenerationReset(context);
+	/* And free the context header */
+	free(context);
+}
+
+/*
+ * GenerationAlloc
+ *		Returns pointer to allocated memory of given size or NULL if
+ *		request could not be completed; memory is added to the set.
+ *
+ * No request may exceed:
+ *		MAXALIGN_DOWN(SIZE_MAX) - Generation_BLOCKHDRSZ - Generation_CHUNKHDRSZ
+ * All callers use a much-lower limit.
+ *
+ * Note: when using valgrind, it doesn't matter how the returned allocation
+ * is marked, as mcxt.c will set it to UNDEFINED.  In some paths we will
+ * return space that is marked NOACCESS - GenerationRealloc has to beware!
+ */
+static void *
+GenerationAlloc(MemoryContext context, Size size)
+{
+	GenerationContext *set = (GenerationContext *) context;
+	GenerationBlock *block;
+	GenerationChunk *chunk;
+	Size		chunk_size = MAXALIGN(size);
+
+	/* is it an over-sized chunk? if yes, allocate special block */
+	if (chunk_size > set->blockSize / 8)
+	{
+		Size		blksize = chunk_size + Generation_BLOCKHDRSZ + Generation_CHUNKHDRSZ;
+
+		block = (GenerationBlock *) malloc(blksize);
+		if (block == NULL)
+			return NULL;
+
+		/* block with a single (used) chunk */
+		block->blksize = blksize;
+		block->nchunks = 1;
+		block->nfree = 0;
+
+		/* the block is completely full */
+		block->freeptr = block->endptr = ((char *) block) + blksize;
+
+		chunk = (GenerationChunk *) (((char *) block) + Generation_BLOCKHDRSZ);
+		chunk->block = block;
+		chunk->context = set;
+		chunk->size = chunk_size;
+
+#ifdef MEMORY_CONTEXT_CHECKING
+		chunk->requested_size = size;
+		/* set mark to catch clobber of "unused" space */
+		if (size < chunk_size)
+			set_sentinel(GenerationChunkGetPointer(chunk), size);
+#endif
+#ifdef RANDOMIZE_ALLOCATED_MEMORY
+		/* fill the allocated space with junk */
+		randomize_mem((char *) GenerationChunkGetPointer(chunk), size);
+#endif
+
+		/* add the block to the list of allocated blocks */
+		dlist_push_head(&set->blocks, &block->node);
+
+		GenerationAllocInfo(set, chunk);
+
+		/* Ensure any padding bytes are marked NOACCESS. */
+		VALGRIND_MAKE_MEM_NOACCESS((char *) GenerationChunkGetPointer(chunk) + size,
+								   chunk_size - size);
+
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+		return GenerationChunkGetPointer(chunk);
+	}
+
+	/*
+	 * Not an over-sized chunk. Is there enough space in the current block? If
+	 * not, allocate a new "regular" block.
+	 */
+	block = set->block;
+
+	if ((block == NULL) ||
+		(block->endptr - block->freeptr) < Generation_CHUNKHDRSZ + chunk_size)
+	{
+		Size		blksize = set->blockSize;
+
+		block = (GenerationBlock *) malloc(blksize);
+
+		if (block == NULL)
+			return NULL;
+
+		block->blksize = blksize;
+		block->nchunks = 0;
+		block->nfree = 0;
+
+		block->freeptr = ((char *) block) + Generation_BLOCKHDRSZ;
+		block->endptr = ((char *) block) + blksize;
+
+		/* Mark unallocated space NOACCESS. */
+		VALGRIND_MAKE_MEM_NOACCESS(block->freeptr,
+								   blksize - Generation_BLOCKHDRSZ);
+
+		/* add it to the doubly-linked list of blocks */
+		dlist_push_head(&set->blocks, &block->node);
+
+		/* and also use it as the current allocation block */
+		set->block = block;
+	}
+
+	/* we're supposed to have a block with enough free space now */
+	Assert(block != NULL);
+	Assert((block->endptr - block->freeptr) >= Generation_CHUNKHDRSZ + chunk_size);
+
+	chunk = (GenerationChunk *) block->freeptr;
+
+	/* Prepare to initialize the chunk header. */
+	VALGRIND_MAKE_MEM_UNDEFINED(chunk, Generation_CHUNKHDRSZ);
+
+	block->nchunks += 1;
+	block->freeptr += (Generation_CHUNKHDRSZ + chunk_size);
+
+	Assert(block->freeptr <= block->endptr);
+
+	chunk->block = block;
+	chunk->context = set;
+	chunk->size = chunk_size;
+
+#ifdef MEMORY_CONTEXT_CHECKING
+	chunk->requested_size = size;
+	/* set mark to catch clobber of "unused" space */
+	if (size < chunk->size)
+		set_sentinel(GenerationChunkGetPointer(chunk), size);
+#endif
+#ifdef RANDOMIZE_ALLOCATED_MEMORY
+	/* fill the allocated space with junk */
+	randomize_mem((char *) GenerationChunkGetPointer(chunk), size);
+#endif
+
+	GenerationAllocInfo(set, chunk);
+
+	/* Ensure any padding bytes are marked NOACCESS. */
+	VALGRIND_MAKE_MEM_NOACCESS((char *) GenerationChunkGetPointer(chunk) + size,
+							   chunk_size - size);
+
+	/* Disallow external access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+	return GenerationChunkGetPointer(chunk);
+}
+
+/*
+ * GenerationFree
+ *		Update number of chunks in the block, and if all chunks in the block
+ *		are now free then discard the block.
+ */
+static void
+GenerationFree(MemoryContext context, void *pointer)
+{
+	GenerationContext *set = (GenerationContext *) context;
+	GenerationChunk *chunk = GenerationPointerGetChunk(pointer);
+	GenerationBlock *block;
+
+	/* Allow access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_DEFINED(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+	block = chunk->block;
+
+#ifdef MEMORY_CONTEXT_CHECKING
+	/* Test for someone scribbling on unused space in chunk */
+	if (chunk->requested_size < chunk->size)
+		if (!sentinel_ok(pointer, chunk->requested_size))
+			elog(WARNING, "detected write past chunk end in %s %p",
+				 ((MemoryContext) set)->name, chunk);
+#endif
+
+#ifdef CLOBBER_FREED_MEMORY
+	wipe_mem(pointer, chunk->size);
+#endif
+
+	/* Reset context to NULL in freed chunks */
+	chunk->context = NULL;
+
+#ifdef MEMORY_CONTEXT_CHECKING
+	/* Reset requested_size to 0 in freed chunks */
+	chunk->requested_size = 0;
+#endif
+
+	block->nfree += 1;
+
+	Assert(block->nchunks > 0);
+	Assert(block->nfree <= block->nchunks);
+
+	/* If there are still allocated chunks in the block, we're done. */
+	if (block->nfree < block->nchunks)
+		return;
+
+	/*
+	 * The block is empty, so let's get rid of it. First remove it from the
+	 * list of blocks, then return it to malloc().
+	 */
+	dlist_delete(&block->node);
+
+	/* Also make sure the block is not marked as the current block. */
+	if (set->block == block)
+		set->block = NULL;
+
+	free(block);
+}
+
+/*
+ * GenerationRealloc
+ *		When handling repalloc, we simply allocate a new chunk, copy the data
+ *		and discard the old one. The only exception is when the new size fits
+ *		into the old chunk - in that case we just update chunk header.
+ */
+static void *
+GenerationRealloc(MemoryContext context, void *pointer, Size size)
+{
+	GenerationContext *set = (GenerationContext *) context;
+	GenerationChunk *chunk = GenerationPointerGetChunk(pointer);
+	GenerationPointer newPointer;
+	Size		oldsize;
+
+	/* Allow access to private part of chunk header. */
+	VALGRIND_MAKE_MEM_DEFINED(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+	oldsize = chunk->size;
+
+#ifdef MEMORY_CONTEXT_CHECKING
+	/* Test for someone scribbling on unused space in chunk */
+	if (chunk->requested_size < oldsize)
+		if (!sentinel_ok(pointer, chunk->requested_size))
+			elog(WARNING, "detected write past chunk end in %s %p",
+				 ((MemoryContext) set)->name, chunk);
+#endif
+
+	/*
+	 * Maybe the allocated area already is >= the new size.  (In particular,
+	 * we always fall out here if the requested size is a decrease.)
+	 *
+	 * This memory context does not use power-of-2 chunk sizing and instead
+	 * carves the chunks to be as small as possible, so most repalloc() calls
+	 * will end up in the palloc/memcpy/pfree branch.
+	 *
+	 * XXX Perhaps we should annotate this condition with unlikely()?
+	 */
+	if (oldsize >= size)
+	{
+#ifdef MEMORY_CONTEXT_CHECKING
+		Size		oldrequest = chunk->requested_size;
+
+#ifdef RANDOMIZE_ALLOCATED_MEMORY
+		/* We can only fill the extra space if we know the prior request */
+		if (size > oldrequest)
+			randomize_mem((char *) pointer + oldrequest,
+						  size - oldrequest);
+#endif
+
+		chunk->requested_size = size;
+
+		/*
+		 * If this is an increase, mark any newly-available part UNDEFINED.
+		 * Otherwise, mark the obsolete part NOACCESS.
+		 */
+		if (size > oldrequest)
+			VALGRIND_MAKE_MEM_UNDEFINED((char *) pointer + oldrequest,
+										size - oldrequest);
+		else
+			VALGRIND_MAKE_MEM_NOACCESS((char *) pointer + size,
+									   oldsize - size);
+
+		/* set mark to catch clobber of "unused" space */
+		if (size < oldsize)
+			set_sentinel(pointer, size);
+#else							/* !MEMORY_CONTEXT_CHECKING */
+
+		/*
+		 * We don't have the information to determine whether we're growing
+		 * the old request or shrinking it, so we conservatively mark the
+		 * entire new allocation DEFINED.
+		 */
+		VALGRIND_MAKE_MEM_NOACCESS(pointer, oldsize);
+		VALGRIND_MAKE_MEM_DEFINED(pointer, size);
+#endif
+
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+		return pointer;
+	}
+
+	/* allocate new chunk */
+	newPointer = GenerationAlloc((MemoryContext) set, size);
+
+	/* leave immediately if request was not completed */
+	if (newPointer == NULL)
+	{
+		/* Disallow external access to private part of chunk header. */
+		VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+		return NULL;
+	}
+
+	/*
+	 * GenerationAlloc() may have returned a region that is still NOACCESS.
+	 * Change it to UNDEFINED for the moment; memcpy() will then transfer
+	 * definedness from the old allocation to the new.  If we know the old
+	 * allocation, copy just that much.  Otherwise, make the entire old chunk
+	 * defined to avoid errors as we copy the currently-NOACCESS trailing
+	 * bytes.
+	 */
+	VALGRIND_MAKE_MEM_UNDEFINED(newPointer, size);
+#ifdef MEMORY_CONTEXT_CHECKING
+	oldsize = chunk->requested_size;
+#else
+	VALGRIND_MAKE_MEM_DEFINED(pointer, oldsize);
+#endif
+
+	/* transfer existing data (certain to fit) */
+	memcpy(newPointer, pointer, oldsize);
+
+	/* free old chunk */
+	GenerationFree((MemoryContext) set, pointer);
+
+	return newPointer;
+}
+
+/*
+ * GenerationGetChunkSpace
+ *		Given a currently-allocated chunk, determine the total space
+ *		it occupies (including all memory-allocation overhead).
+ */
+static Size
+GenerationGetChunkSpace(MemoryContext context, void *pointer)
+{
+	GenerationChunk *chunk = GenerationPointerGetChunk(pointer);
+	Size		result;
+
+	VALGRIND_MAKE_MEM_DEFINED(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+	result = chunk->size + Generation_CHUNKHDRSZ;
+	VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+	return result;
+}
+
+/*
+ * GenerationIsEmpty
+ *		Is a GenerationContext empty of any allocated space?
+ */
+static bool
+GenerationIsEmpty(MemoryContext context)
+{
+	GenerationContext *set = (GenerationContext *) context;
+
+	return dlist_is_empty(&set->blocks);
+}
+
+/*
+ * GenerationStats
+ *		Compute stats about memory consumption of a Generation context.
+ *
+ * level: recursion level (0 at top level); used for print indentation.
+ * print: true to print stats to stderr.
+ * totals: if not NULL, add stats about this Generation into *totals.
+ *
+ * XXX freespace only accounts for empty space at the end of the block, not
+ * space of freed chunks (which is unknown).
+ */
+static void
+GenerationStats(MemoryContext context, int level, bool print,
+				MemoryContextCounters *totals)
+{
+	GenerationContext *set = (GenerationContext *) context;
+	Size		nblocks = 0;
+	Size		nchunks = 0;
+	Size		nfreechunks = 0;
+	Size		totalspace;
+	Size		freespace = 0;
+	dlist_iter	iter;
+
+	/* Include context header in totalspace */
+	totalspace = set->headerSize;
+
+	dlist_foreach(iter, &set->blocks)
+	{
+		GenerationBlock *block = dlist_container(GenerationBlock, node, iter.cur);
+
+		nblocks++;
+		nchunks += block->nchunks;
+		nfreechunks += block->nfree;
+		totalspace += block->blksize;
+		freespace += (block->endptr - block->freeptr);
+	}
+
+	if (print)
+	{
+		int			i;
+
+		for (i = 0; i < level; i++)
+			fprintf(stderr, "  ");
+		fprintf(stderr,
+				"Generation: %s: %zu total in %zd blocks (%zd chunks); %zu free (%zd chunks); %zu used\n",
+				((MemoryContext) set)->name, totalspace, nblocks, nchunks, freespace,
+				nfreechunks, totalspace - freespace);
+	}
+
+	if (totals)
+	{
+		totals->nblocks += nblocks;
+		totals->freechunks += nfreechunks;
+		totals->totalspace += totalspace;
+		totals->freespace += freespace;
+	}
+}
+
+
+#ifdef MEMORY_CONTEXT_CHECKING
+
+/*
+ * GenerationCheck
+ *		Walk through chunks and check consistency of memory.
+ *
+ * NOTE: report errors as WARNING, *not* ERROR or FATAL.  Otherwise you'll
+ * find yourself in an infinite loop when trouble occurs, because this
+ * routine will be entered again when elog cleanup tries to release memory!
+ */
+static void
+GenerationCheck(MemoryContext context)
+{
+	GenerationContext *gen = (GenerationContext *) context;
+	const char *name = context->name;
+	dlist_iter	iter;
+
+	/* walk all blocks in this context */
+	dlist_foreach(iter, &gen->blocks)
+	{
+		GenerationBlock *block = dlist_container(GenerationBlock, node, iter.cur);
+		int			nfree,
+					nchunks;
+		char	   *ptr;
+
+		/*
+		 * nfree > nchunks is surely wrong, and we don't expect to see
+		 * equality either, because such a block should have gotten freed.
+		 */
+		if (block->nfree >= block->nchunks)
+			elog(WARNING, "problem in Generation %s: number of free chunks %d in block %p exceeds %d allocated",
+				 name, block->nfree, block, block->nchunks);
+
+		/* Now walk through the chunks and count them. */
+		nfree = 0;
+		nchunks = 0;
+		ptr = ((char *) block) + Generation_BLOCKHDRSZ;
+
+		while (ptr < block->freeptr)
+		{
+			GenerationChunk *chunk = (GenerationChunk *) ptr;
+
+			/* Allow access to private part of chunk header. */
+			VALGRIND_MAKE_MEM_DEFINED(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+
+			/* move to the next chunk */
+			ptr += (chunk->size + Generation_CHUNKHDRSZ);
+
+			nchunks += 1;
+
+			/* chunks have both block and context pointers, so check both */
+			if (chunk->block != block)
+				elog(WARNING, "problem in Generation %s: bogus block link in block %p, chunk %p",
+					 name, block, chunk);
+
+			/*
+			 * Check for valid context pointer.  Note this is an incomplete
+			 * test, since palloc(0) produces an allocated chunk with
+			 * requested_size == 0.
+			 */
+			if ((chunk->requested_size > 0 && chunk->context != gen) ||
+				(chunk->context != gen && chunk->context != NULL))
+				elog(WARNING, "problem in Generation %s: bogus context link in block %p, chunk %p",
+					 name, block, chunk);
+
+			/* now make sure the chunk size is correct */
+			if (chunk->size < chunk->requested_size ||
+				chunk->size != MAXALIGN(chunk->size))
+				elog(WARNING, "problem in Generation %s: bogus chunk size in block %p, chunk %p",
+					 name, block, chunk);
+
+			/* is chunk allocated? */
+			if (chunk->context != NULL)
+			{
+				/* check sentinel, but only in allocated blocks */
+				if (chunk->requested_size < chunk->size &&
+					!sentinel_ok(chunk, Generation_CHUNKHDRSZ + chunk->requested_size))
+					elog(WARNING, "problem in Generation %s: detected write past chunk end in block %p, chunk %p",
+						 name, block, chunk);
+			}
+			else
+				nfree += 1;
+
+			/*
+			 * If chunk is allocated, disallow external access to private part
+			 * of chunk header.
+			 */
+			if (chunk->context != NULL)
+				VALGRIND_MAKE_MEM_NOACCESS(chunk, GENERATIONCHUNK_PRIVATE_LEN);
+		}
+
+		/*
+		 * Make sure we got the expected number of allocated and free chunks
+		 * (as tracked in the block header).
+		 */
+		if (nchunks != block->nchunks)
+			elog(WARNING, "problem in Generation %s: number of allocated chunks %d in block %p does not match header %d",
+				 name, nchunks, block, block->nchunks);
+
+		if (nfree != block->nfree)
+			elog(WARNING, "problem in Generation %s: number of free chunks %d in block %p does not match header %d",
+				 name, nfree, block, block->nfree);
+	}
+}
+
+#endif							/* MEMORY_CONTEXT_CHECKING */
diff --git a/src/backend/utils/mmgr/mcxt.c b/src/backend/utils/mmgr/mcxt.c
index 5d173d7e60..d7baa54808 100644
--- a/src/backend/utils/mmgr/mcxt.c
+++ b/src/backend/utils/mmgr/mcxt.c
@@ -9,7 +9,7 @@
  * context's MemoryContextMethods struct.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -91,9 +91,7 @@ MemoryContextInit(void)
 	AssertState(TopMemoryContext == NULL);
 
 	/*
-	 * First, initialize TopMemoryContext, which will hold the MemoryContext
-	 * nodes for all other contexts.  (There is special-case code in
-	 * MemoryContextCreate() to handle this call.)
+	 * First, initialize TopMemoryContext, which is the parent of all others.
 	 */
 	TopMemoryContext = AllocSetContextCreate((MemoryContext) NULL,
 											 "TopMemoryContext",
@@ -118,11 +116,12 @@ MemoryContextInit(void)
 	 * This should be the last step in this function, as elog.c assumes memory
 	 * management works once ErrorContext is non-null.
 	 */
-	ErrorContext = AllocSetContextCreate(TopMemoryContext,
-										 "ErrorContext",
-										 8 * 1024,
-										 8 * 1024,
-										 8 * 1024);
+	ErrorContext = AllocSetContextCreateExtended(TopMemoryContext,
+												 "ErrorContext",
+												 0,
+												 8 * 1024,
+												 8 * 1024,
+												 8 * 1024);
 	MemoryContextAllowInCriticalSection(ErrorContext, true);
 }
 
@@ -159,7 +158,7 @@ MemoryContextResetOnly(MemoryContext context)
 	if (!context->isReset)
 	{
 		MemoryContextCallResetCallbacks(context);
-		(*context->methods->reset) (context);
+		context->methods->reset(context);
 		context->isReset = true;
 		VALGRIND_DESTROY_MEMPOOL(context);
 		VALGRIND_CREATE_MEMPOOL(context, 0, false);
@@ -191,10 +190,9 @@ MemoryContextResetChildren(MemoryContext context)
  *		Delete a context and its descendants, and release all space
  *		allocated therein.
  *
- * The type-specific delete routine removes all subsidiary storage
- * for the context, but we have to delete the context node itself,
- * as well as recurse to get the children.  We must also delink the
- * node from its parent, if it has one.
+ * The type-specific delete routine removes all storage for the context,
+ * but we have to recurse to handle the children.
+ * We must also delink the context from its parent, if it has one.
  */
 void
 MemoryContextDelete(MemoryContext context)
@@ -205,7 +203,9 @@ MemoryContextDelete(MemoryContext context)
 	/* And not CurrentMemoryContext, either */
 	Assert(context != CurrentMemoryContext);
 
-	MemoryContextDeleteChildren(context);
+	/* save a function call in common case where there are no children */
+	if (context->firstchild != NULL)
+		MemoryContextDeleteChildren(context);
 
 	/*
 	 * It's not entirely clear whether 'tis better to do this before or after
@@ -222,9 +222,9 @@ MemoryContextDelete(MemoryContext context)
 	 */
 	MemoryContextSetParent(context, NULL);
 
-	(*context->methods->delete_context) (context);
+	context->methods->delete_context(context);
+
 	VALGRIND_DESTROY_MEMPOOL(context);
-	pfree(context);
 }
 
 /*
@@ -291,7 +291,7 @@ MemoryContextCallResetCallbacks(MemoryContext context)
 	while ((cb = context->reset_cbs) != NULL)
 	{
 		context->reset_cbs = cb->next;
-		(*cb->func) (cb->arg);
+		cb->func(cb->arg);
 	}
 }
 
@@ -391,8 +391,7 @@ GetMemoryChunkSpace(void *pointer)
 {
 	MemoryContext context = GetMemoryChunkContext(pointer);
 
-	return (context->methods->get_chunk_space) (context,
-												pointer);
+	return context->methods->get_chunk_space(context, pointer);
 }
 
 /*
@@ -423,7 +422,7 @@ MemoryContextIsEmpty(MemoryContext context)
 	if (context->firstchild != NULL)
 		return false;
 	/* Otherwise use the type-specific inquiry */
-	return (*context->methods->is_empty) (context);
+	return context->methods->is_empty(context);
 }
 
 /*
@@ -481,7 +480,7 @@ MemoryContextStatsInternal(MemoryContext context, int level,
 	AssertArg(MemoryContextIsValid(context));
 
 	/* Examine the context itself */
-	(*context->methods->stats) (context, level, print, totals);
+	context->methods->stats(context, level, print, totals);
 
 	/*
 	 * Examine children.  If there are more than max_children of them, we do
@@ -546,7 +545,7 @@ MemoryContextCheck(MemoryContext context)
 
 	AssertArg(MemoryContextIsValid(context));
 
-	(*context->methods->check) (context);
+	context->methods->check(context);
 	for (child = context->firstchild; child != NULL; child = child->nextchild)
 		MemoryContextCheck(child);
 }
@@ -588,100 +587,85 @@ MemoryContextContains(MemoryContext context, void *pointer)
 	return ptr_context == context;
 }
 
-/*--------------------
+/*
  * MemoryContextCreate
  *		Context-type-independent part of context creation.
  *
  * This is only intended to be called by context-type-specific
  * context creation routines, not by the unwashed masses.
  *
- * The context creation procedure is a little bit tricky because
- * we want to be sure that we don't leave the context tree invalid
- * in case of failure (such as insufficient memory to allocate the
- * context node itself).  The procedure goes like this:
- *	1.  Context-type-specific routine first calls MemoryContextCreate(),
- *		passing the appropriate tag/size/methods values (the methods
- *		pointer will ordinarily point to statically allocated data).
- *		The parent and name parameters usually come from the caller.
- *	2.  MemoryContextCreate() attempts to allocate the context node,
- *		plus space for the name.  If this fails we can ereport() with no
- *		damage done.
- *	3.  We fill in all of the type-independent MemoryContext fields.
- *	4.  We call the type-specific init routine (using the methods pointer).
- *		The init routine is required to make the node minimally valid
- *		with zero chance of failure --- it can't allocate more memory,
- *		for example.
- *	5.  Now we have a minimally valid node that can behave correctly
- *		when told to reset or delete itself.  We link the node to its
- *		parent (if any), making the node part of the context tree.
- *	6.  We return to the context-type-specific routine, which finishes
+ * The memory context creation procedure goes like this:
+ *	1.  Context-type-specific routine makes some initial space allocation,
+ *		including enough space for the context header.  If it fails,
+ *		it can ereport() with no damage done.
+ *	2.	Context-type-specific routine sets up all type-specific fields of
+ *		the header (those beyond MemoryContextData proper), as well as any
+ *		other management fields it needs to have a fully valid context.
+ *		Usually, failure in this step is impossible, but if it's possible
+ *		the initial space allocation should be freed before ereport'ing.
+ *	3.	Context-type-specific routine calls MemoryContextCreate() to fill in
+ *		the generic header fields and link the context into the context tree.
+ *	4.  We return to the context-type-specific routine, which finishes
  *		up type-specific initialization.  This routine can now do things
  *		that might fail (like allocate more memory), so long as it's
  *		sure the node is left in a state that delete will handle.
  *
- * This protocol doesn't prevent us from leaking memory if step 6 fails
- * during creation of a top-level context, since there's no parent link
- * in that case.  However, if you run out of memory while you're building
- * a top-level context, you might as well go home anyway...
- *
- * Normally, the context node and the name are allocated from
- * TopMemoryContext (NOT from the parent context, since the node must
- * survive resets of its parent context!).  However, this routine is itself
- * used to create TopMemoryContext!  If we see that TopMemoryContext is NULL,
- * we assume we are creating TopMemoryContext and use malloc() to allocate
- * the node.
+ * node: the as-yet-uninitialized common part of the context header node.
+ * tag: NodeTag code identifying the memory context type.
+ * size: total size of context header including context-type-specific fields,
+ *		as well as space for the context name if MEMCONTEXT_COPY_NAME is set.
+ * nameoffset: where within the "size" space to insert the context name.
+ * methods: context-type-specific methods (usually statically allocated).
+ * parent: parent context, or NULL if this will be a top-level context.
+ * name: name of context (for debugging only, need not be unique).
+ * flags: bitmask of MEMCONTEXT_XXX option flags.
  *
- * Note that the name field of a MemoryContext does not point to
- * separately-allocated storage, so it should not be freed at context
- * deletion.
- *--------------------
+ * Context routines generally assume that MemoryContextCreate can't fail,
+ * so this can contain Assert but not elog/ereport.
  */
-MemoryContext
-MemoryContextCreate(NodeTag tag, Size size,
-					MemoryContextMethods *methods,
+void
+MemoryContextCreate(MemoryContext node,
+					NodeTag tag, Size size, Size nameoffset,
+					const MemoryContextMethods *methods,
 					MemoryContext parent,
-					const char *name)
+					const char *name,
+					int flags)
 {
-	MemoryContext node;
-	Size		needed = size + strlen(name) + 1;
-
-	/* creating new memory contexts is not allowed in a critical section */
+	/* Creating new memory contexts is not allowed in a critical section */
 	Assert(CritSectionCount == 0);
 
-	/* Get space for node and name */
-	if (TopMemoryContext != NULL)
-	{
-		/* Normal case: allocate the node in TopMemoryContext */
-		node = (MemoryContext) MemoryContextAlloc(TopMemoryContext,
-												  needed);
-	}
-	else
-	{
-		/* Special case for startup: use good ol' malloc */
-		node = (MemoryContext) malloc(needed);
-		Assert(node != NULL);
-	}
+	/* Check size is sane */
+	Assert(nameoffset >= sizeof(MemoryContextData));
+	Assert((flags & MEMCONTEXT_COPY_NAME) ?
+		   size >= nameoffset + strlen(name) + 1 :
+		   size >= nameoffset);
 
-	/* Initialize the node as best we can */
-	MemSet(node, 0, size);
+	/* Initialize all standard fields of memory context header */
 	node->type = tag;
+	node->isReset = true;
 	node->methods = methods;
-	node->parent = NULL;		/* for the moment */
+	node->parent = parent;
 	node->firstchild = NULL;
 	node->prevchild = NULL;
-	node->nextchild = NULL;
-	node->isReset = true;
-	node->name = ((char *) node) + size;
-	strcpy(node->name, name);
+	node->reset_cbs = NULL;
+
+	if (flags & MEMCONTEXT_COPY_NAME)
+	{
+		/* Insert context name into space reserved for it */
+		char	   *namecopy = ((char *) node) + nameoffset;
 
-	/* Type-specific routine finishes any other essential initialization */
-	(*node->methods->init) (node);
+		node->name = namecopy;
+		strcpy(namecopy, name);
+	}
+	else
+	{
+		/* Assume the passed-in name is statically allocated */
+		node->name = name;
+	}
 
-	/* OK to link node to parent (if any) */
-	/* Could use MemoryContextSetParent here, but doesn't seem worthwhile */
+	/* OK to link node into context tree */
 	if (parent)
 	{
-		node->parent = parent;
 		node->nextchild = parent->firstchild;
 		if (parent->firstchild != NULL)
 			parent->firstchild->prevchild = node;
@@ -689,11 +673,13 @@ MemoryContextCreate(NodeTag tag, Size size,
 		/* inherit allowInCritSection flag from parent */
 		node->allowInCritSection = parent->allowInCritSection;
 	}
+	else
+	{
+		node->nextchild = NULL;
+		node->allowInCritSection = false;
+	}
 
 	VALGRIND_CREATE_MEMPOOL(node, 0, false);
-
-	/* Return to type-specific creation routine to finish up */
-	return node;
 }
 
 /*
@@ -716,7 +702,7 @@ MemoryContextAlloc(MemoryContext context, Size size)
 
 	context->isReset = false;
 
-	ret = (*context->methods->alloc) (context, size);
+	ret = context->methods->alloc(context, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -751,7 +737,7 @@ MemoryContextAllocZero(MemoryContext context, Size size)
 
 	context->isReset = false;
 
-	ret = (*context->methods->alloc) (context, size);
+	ret = context->methods->alloc(context, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -788,7 +774,7 @@ MemoryContextAllocZeroAligned(MemoryContext context, Size size)
 
 	context->isReset = false;
 
-	ret = (*context->methods->alloc) (context, size);
+	ret = context->methods->alloc(context, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -823,7 +809,7 @@ MemoryContextAllocExtended(MemoryContext context, Size size, int flags)
 
 	context->isReset = false;
 
-	ret = (*context->methods->alloc) (context, size);
+	ret = context->methods->alloc(context, size);
 	if (ret == NULL)
 	{
 		if ((flags & MCXT_ALLOC_NO_OOM) == 0)
@@ -859,7 +845,7 @@ palloc(Size size)
 
 	CurrentMemoryContext->isReset = false;
 
-	ret = (*CurrentMemoryContext->methods->alloc) (CurrentMemoryContext, size);
+	ret = CurrentMemoryContext->methods->alloc(CurrentMemoryContext, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -888,7 +874,7 @@ palloc0(Size size)
 
 	CurrentMemoryContext->isReset = false;
 
-	ret = (*CurrentMemoryContext->methods->alloc) (CurrentMemoryContext, size);
+	ret = CurrentMemoryContext->methods->alloc(CurrentMemoryContext, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -920,7 +906,7 @@ palloc_extended(Size size, int flags)
 
 	CurrentMemoryContext->isReset = false;
 
-	ret = (*CurrentMemoryContext->methods->alloc) (CurrentMemoryContext, size);
+	ret = CurrentMemoryContext->methods->alloc(CurrentMemoryContext, size);
 	if (ret == NULL)
 	{
 		if ((flags & MCXT_ALLOC_NO_OOM) == 0)
@@ -951,7 +937,7 @@ pfree(void *pointer)
 {
 	MemoryContext context = GetMemoryChunkContext(pointer);
 
-	(*context->methods->free_p) (context, pointer);
+	context->methods->free_p(context, pointer);
 	VALGRIND_MEMPOOL_FREE(context, pointer);
 }
 
@@ -973,7 +959,7 @@ repalloc(void *pointer, Size size)
 	/* isReset must be false already */
 	Assert(!context->isReset);
 
-	ret = (*context->methods->realloc) (context, pointer, size);
+	ret = context->methods->realloc(context, pointer, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -1007,7 +993,7 @@ MemoryContextAllocHuge(MemoryContext context, Size size)
 
 	context->isReset = false;
 
-	ret = (*context->methods->alloc) (context, size);
+	ret = context->methods->alloc(context, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -1041,7 +1027,7 @@ repalloc_huge(void *pointer, Size size)
 	/* isReset must be false already */
 	Assert(!context->isReset);
 
-	ret = (*context->methods->realloc) (context, pointer, size);
+	ret = context->methods->realloc(context, pointer, size);
 	if (ret == NULL)
 	{
 		MemoryContextStats(TopMemoryContext);
@@ -1087,10 +1073,14 @@ pstrdup(const char *in)
 char *
 pnstrdup(const char *in, Size len)
 {
-	char	   *out = palloc(len + 1);
+	char	   *out;
+
+	len = strnlen(in, len);
 
+	out = palloc(len + 1);
 	memcpy(out, in, len);
 	out[len] = '\0';
+
 	return out;
 }
 
diff --git a/src/backend/utils/mmgr/memdebug.c b/src/backend/utils/mmgr/memdebug.c
index f0a87d3f20..d45534d293 100644
--- a/src/backend/utils/mmgr/memdebug.c
+++ b/src/backend/utils/mmgr/memdebug.c
@@ -5,7 +5,7 @@
  *	  public API of the memory management subsystem.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/backend/utils/memdebug.c
diff --git a/src/backend/utils/mmgr/portalmem.c b/src/backend/utils/mmgr/portalmem.c
index 369e181709..75a6dde32b 100644
--- a/src/backend/utils/mmgr/portalmem.c
+++ b/src/backend/utils/mmgr/portalmem.c
@@ -8,7 +8,7 @@
  * doesn't actually run the executor for them.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -22,6 +22,7 @@
 #include "catalog/pg_type.h"
 #include "commands/portalcmds.h"
 #include "miscadmin.h"
+#include "storage/ipc.h"
 #include "utils/builtins.h"
 #include "utils/memutils.h"
 #include "utils/snapmgr.h"
@@ -87,7 +88,7 @@ do { \
 		elog(WARNING, "trying to delete portal name that does not exist"); \
 } while(0)
 
-static MemoryContext PortalMemory = NULL;
+static MemoryContext TopPortalContext = NULL;
 
 
 /* ----------------------------------------------------------------
@@ -104,10 +105,10 @@ EnablePortalManager(void)
 {
 	HASHCTL		ctl;
 
-	Assert(PortalMemory == NULL);
+	Assert(TopPortalContext == NULL);
 
-	PortalMemory = AllocSetContextCreate(TopMemoryContext,
-										 "PortalMemory",
+	TopPortalContext = AllocSetContextCreate(TopMemoryContext,
+										 "TopPortalContext",
 										 ALLOCSET_DEFAULT_SIZES);
 
 	ctl.keysize = MAX_PORTALNAME_LEN;
@@ -193,12 +194,12 @@ CreatePortal(const char *name, bool allowDup, bool dupSilent)
 	}
 
 	/* make new portal structure */
-	portal = (Portal) MemoryContextAllocZero(PortalMemory, sizeof *portal);
+	portal = (Portal) MemoryContextAllocZero(TopPortalContext, sizeof *portal);
 
-	/* initialize portal heap context; typically it won't store much */
-	portal->heap = AllocSetContextCreate(PortalMemory,
-										 "PortalHeapMemory",
-										 ALLOCSET_SMALL_SIZES);
+	/* initialize portal context; typically it won't store much */
+	portal->portalContext = AllocSetContextCreate(TopPortalContext,
+												  "PortalContext",
+												  ALLOCSET_SMALL_SIZES);
 
 	/* create a resource owner for the portal */
 	portal->resowner = ResourceOwnerCreate(CurTransactionResourceOwner,
@@ -263,7 +264,7 @@ CreateNewPortal(void)
  *
  * If cplan is NULL, then it is the caller's responsibility to ensure that
  * the passed plan trees have adequate lifetime.  Typically this is done by
- * copying them into the portal's heap context.
+ * copying them into the portal's context.
  *
  * The caller is also responsible for ensuring that the passed prepStmtName
  * (if not NULL) and sourceText have adequate lifetime.
@@ -331,10 +332,10 @@ PortalCreateHoldStore(Portal portal)
 
 	/*
 	 * Create the memory context that is used for storage of the tuple set.
-	 * Note this is NOT a child of the portal's heap memory.
+	 * Note this is NOT a child of the portal's portalContext.
 	 */
 	portal->holdContext =
-		AllocSetContextCreate(PortalMemory,
+		AllocSetContextCreate(TopPortalContext,
 							  "PortalHoldContext",
 							  ALLOCSET_DEFAULT_SIZES);
 
@@ -420,7 +421,7 @@ MarkPortalDone(Portal portal)
 	 */
 	if (PointerIsValid(portal->cleanup))
 	{
-		(*portal->cleanup) (portal);
+		portal->cleanup(portal);
 		portal->cleanup = NULL;
 	}
 }
@@ -448,7 +449,7 @@ MarkPortalFailed(Portal portal)
 	 */
 	if (PointerIsValid(portal->cleanup))
 	{
-		(*portal->cleanup) (portal);
+		portal->cleanup(portal);
 		portal->cleanup = NULL;
 	}
 }
@@ -464,11 +465,17 @@ PortalDrop(Portal portal, bool isTopCommit)
 
 	/*
 	 * Don't allow dropping a pinned portal, it's still needed by whoever
-	 * pinned it. Not sure if the PORTAL_ACTIVE case can validly happen or
-	 * not...
+	 * pinned it.
 	 */
-	if (portal->portalPinned ||
-		portal->status == PORTAL_ACTIVE)
+	if (portal->portalPinned)
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_CURSOR_STATE),
+				 errmsg("cannot drop pinned portal \"%s\"", portal->name)));
+
+	/*
+	 * Not sure if the PORTAL_ACTIVE case can validly happen or not...
+	 */
+	if (portal->status == PORTAL_ACTIVE)
 		ereport(ERROR,
 				(errcode(ERRCODE_INVALID_CURSOR_STATE),
 				 errmsg("cannot drop active portal \"%s\"", portal->name)));
@@ -486,7 +493,7 @@ PortalDrop(Portal portal, bool isTopCommit)
 	 */
 	if (PointerIsValid(portal->cleanup))
 	{
-		(*portal->cleanup) (portal);
+		portal->cleanup(portal);
 		portal->cleanup = NULL;
 	}
 
@@ -576,9 +583,9 @@ PortalDrop(Portal portal, bool isTopCommit)
 		MemoryContextDelete(portal->holdContext);
 
 	/* release subsidiary storage */
-	MemoryContextDelete(PortalGetHeapMemory(portal));
+	MemoryContextDelete(portal->portalContext);
 
-	/* release portal struct (it's in PortalMemory) */
+	/* release portal struct (it's in TopPortalContext) */
 	pfree(portal);
 }
 
@@ -623,8 +630,8 @@ PortalHashTableDeleteAll(void)
  * simply removed.  Portals remaining from prior transactions should be
  * left untouched.
  *
- * Returns TRUE if any portals changed state (possibly causing user-defined
- * code to be run), FALSE if not.
+ * Returns true if any portals changed state (possibly causing user-defined
+ * code to be run), false if not.
  */
 bool
 PreCommit_Portals(bool isPrepare)
@@ -736,11 +743,8 @@ PreCommit_Portals(bool isPrepare)
 /*
  * Abort processing for portals.
  *
- * At this point we reset "active" status and run the cleanup hook if
- * present, but we can't release the portal's memory until the cleanup call.
- *
- * The reason we need to reset active is so that we can replace the unnamed
- * portal, else we'll fail to execute ROLLBACK when it arrives.
+ * At this point we run the cleanup hook if present, but we can't release the
+ * portal's memory until the cleanup call.
  */
 void
 AtAbort_Portals(void)
@@ -755,14 +759,10 @@ AtAbort_Portals(void)
 		Portal		portal = hentry->portal;
 
 		/*
-		 * See similar code in AtSubAbort_Portals().  This would fire if code
-		 * orchestrating multiple top-level transactions within a portal, such
-		 * as VACUUM, caught errors and continued under the same portal with a
-		 * fresh transaction.  No part of core PostgreSQL functions that way.
-		 * XXX Such code would wish the portal to remain ACTIVE, as in
-		 * PreCommit_Portals().
+		 * When elog(FATAL) is progress, we need to set the active portal to
+		 * failed, so that PortalCleanup() doesn't run the executor shutdown.
 		 */
-		if (portal->status == PORTAL_ACTIVE)
+		if (portal->status == PORTAL_ACTIVE && shmem_exit_inprogress)
 			MarkPortalFailed(portal);
 
 		/*
@@ -786,7 +786,7 @@ AtAbort_Portals(void)
 		 */
 		if (PointerIsValid(portal->cleanup))
 		{
-			(*portal->cleanup) (portal);
+			portal->cleanup(portal);
 			portal->cleanup = NULL;
 		}
 
@@ -804,9 +804,10 @@ AtAbort_Portals(void)
 		 * Although we can't delete the portal data structure proper, we can
 		 * release any memory in subsidiary contexts, such as executor state.
 		 * The cleanup hook was the last thing that might have needed data
-		 * there.
+		 * there.  But leave active portals alone.
 		 */
-		MemoryContextDeleteChildren(PortalGetHeapMemory(portal));
+		if (portal->status != PORTAL_ACTIVE)
+			MemoryContextDeleteChildren(portal->portalContext);
 	}
 }
 
@@ -826,6 +827,13 @@ AtCleanup_Portals(void)
 	{
 		Portal		portal = hentry->portal;
 
+		/*
+		 * Do not touch active portals --- this can only happen in the case of
+		 * a multi-transaction command.
+		 */
+		if (portal->status == PORTAL_ACTIVE)
+			continue;
+
 		/* Do nothing to cursors held over from a previous transaction */
 		if (portal->createSubid == InvalidSubTransactionId)
 		{
@@ -980,7 +988,7 @@ AtSubAbort_Portals(SubTransactionId mySubid,
 		 */
 		if (PointerIsValid(portal->cleanup))
 		{
-			(*portal->cleanup) (portal);
+			portal->cleanup(portal);
 			portal->cleanup = NULL;
 		}
 
@@ -1000,7 +1008,7 @@ AtSubAbort_Portals(SubTransactionId mySubid,
 		 * The cleanup hook was the last thing that might have needed data
 		 * there.
 		 */
-		MemoryContextDeleteChildren(PortalGetHeapMemory(portal));
+		MemoryContextDeleteChildren(portal->portalContext);
 	}
 }
 
@@ -1155,3 +1163,22 @@ ThereAreNoReadyPortals(void)
 
 	return true;
 }
+
+bool
+ThereArePinnedPortals(void)
+{
+	HASH_SEQ_STATUS status;
+	PortalHashEnt *hentry;
+
+	hash_seq_init(&status, PortalHashTable);
+
+	while ((hentry = (PortalHashEnt *) hash_seq_search(&status)) != NULL)
+	{
+		Portal		portal = hentry->portal;
+
+		if (portal->portalPinned)
+			return true;
+	}
+
+	return false;
+}
diff --git a/src/backend/utils/mmgr/slab.c b/src/backend/utils/mmgr/slab.c
index 35de6b6d82..58beb64ab9 100644
--- a/src/backend/utils/mmgr/slab.c
+++ b/src/backend/utils/mmgr/slab.c
@@ -7,7 +7,7 @@
  * numbers of equally-sized objects are allocated (and freed).
  *
  *
- * Portions Copyright (c) 2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/backend/utils/mmgr/slab.c
@@ -67,6 +67,7 @@ typedef struct SlabContext
 	Size		chunkSize;		/* chunk size */
 	Size		fullChunkSize;	/* chunk size including header and alignment */
 	Size		blockSize;		/* block size */
+	Size		headerSize;		/* allocated size of context header */
 	int			chunksPerBlock; /* number of chunks per block */
 	int			minFreeChunks;	/* min number of free chunks in any block */
 	int			nblocks;		/* number of blocks allocated */
@@ -91,12 +92,18 @@ typedef struct SlabBlock
 
 /*
  * SlabChunk
- *		The prefix of each piece of memory in an SlabBlock
+ *		The prefix of each piece of memory in a SlabBlock
+ *
+ * Note: to meet the memory context APIs, the payload area of the chunk must
+ * be maxaligned, and the "slab" link must be immediately adjacent to the
+ * payload area (cf. GetMemoryChunkContext).  Since we support no machines on
+ * which MAXALIGN is more than twice sizeof(void *), this happens without any
+ * special hacking in this struct declaration.  But there is a static
+ * assertion below that the alignment is done correctly.
  */
 typedef struct SlabChunk
 {
-	/* block owning this chunk */
-	void	   *block;
+	SlabBlock  *block;			/* block owning this chunk */
 	SlabContext *slab;			/* owning context */
 	/* there must not be any padding to reach a MAXALIGN boundary here! */
 } SlabChunk;
@@ -120,7 +127,6 @@ typedef struct SlabChunk
 static void *SlabAlloc(MemoryContext context, Size size);
 static void SlabFree(MemoryContext context, void *pointer);
 static void *SlabRealloc(MemoryContext context, void *pointer, Size size);
-static void SlabInit(MemoryContext context);
 static void SlabReset(MemoryContext context);
 static void SlabDelete(MemoryContext context);
 static Size SlabGetChunkSpace(MemoryContext context, void *pointer);
@@ -134,11 +140,10 @@ static void SlabCheck(MemoryContext context);
 /*
  * This is the virtual function table for Slab contexts.
  */
-static MemoryContextMethods SlabMethods = {
+static const MemoryContextMethods SlabMethods = {
 	SlabAlloc,
 	SlabFree,
 	SlabRealloc,
-	SlabInit,
 	SlabReset,
 	SlabDelete,
 	SlabGetChunkSpace,
@@ -171,27 +176,36 @@ static MemoryContextMethods SlabMethods = {
  *		Create a new Slab context.
  *
  * parent: parent context, or NULL if top-level context
- * name: name of context (for debugging --- string will be copied)
+ * name: name of context (for debugging only, need not be unique)
+ * flags: bitmask of MEMCONTEXT_XXX option flags
  * blockSize: allocation block size
  * chunkSize: allocation chunk size
  *
+ * Notes: if flags & MEMCONTEXT_COPY_NAME, the name string will be copied into
+ * context-lifespan storage; otherwise, it had better be statically allocated.
  * The chunkSize may not exceed:
  *		MAXALIGN_DOWN(SIZE_MAX) - MAXALIGN(sizeof(SlabBlock)) - SLAB_CHUNKHDRSZ
- *
  */
 MemoryContext
 SlabContextCreate(MemoryContext parent,
 				  const char *name,
+				  int flags,
 				  Size blockSize,
 				  Size chunkSize)
 {
 	int			chunksPerBlock;
 	Size		fullChunkSize;
 	Size		freelistSize;
+	Size		nameOffset;
+	Size		headerSize;
 	SlabContext *slab;
+	int			i;
 
+	/* Assert we padded SlabChunk properly */
+	StaticAssertStmt(sizeof(SlabChunk) == MAXALIGN(sizeof(SlabChunk)),
+					 "sizeof(SlabChunk) is not maxaligned");
 	StaticAssertStmt(offsetof(SlabChunk, slab) + sizeof(MemoryContext) ==
-					 MAXALIGN(sizeof(SlabChunk)),
+					 sizeof(SlabChunk),
 					 "padding calculation in SlabChunk is wrong");
 
 	/* Make sure the linked list node fits inside a freed chunk */
@@ -199,10 +213,10 @@ SlabContextCreate(MemoryContext parent,
 		chunkSize = sizeof(int);
 
 	/* chunk, including SLAB header (both addresses nicely aligned) */
-	fullChunkSize = MAXALIGN(sizeof(SlabChunk) + MAXALIGN(chunkSize));
+	fullChunkSize = sizeof(SlabChunk) + MAXALIGN(chunkSize);
 
 	/* Make sure the block can store at least one chunk. */
-	if (blockSize - sizeof(SlabBlock) < fullChunkSize)
+	if (blockSize < fullChunkSize + sizeof(SlabBlock))
 		elog(ERROR, "block size %zu for slab is too small for %zu chunks",
 			 blockSize, chunkSize);
 
@@ -212,45 +226,58 @@ SlabContextCreate(MemoryContext parent,
 	/* The freelist starts with 0, ends with chunksPerBlock. */
 	freelistSize = sizeof(dlist_head) * (chunksPerBlock + 1);
 
-	/* if we can't fit at least one chunk into the block, we're hosed */
-	Assert(chunksPerBlock > 0);
+	/*
+	 * Allocate the context header.  Unlike aset.c, we never try to combine
+	 * this with the first regular block; not worth the extra complication.
+	 */
+
+	/* Size of the memory context header, including name storage if needed */
+	nameOffset = offsetof(SlabContext, freelist) + freelistSize;
+	if (flags & MEMCONTEXT_COPY_NAME)
+		headerSize = nameOffset + strlen(name) + 1;
+	else
+		headerSize = nameOffset;
 
-	/* make sure the chunks actually fit on the block	*/
-	Assert((fullChunkSize * chunksPerBlock) + sizeof(SlabBlock) <= blockSize);
+	slab = (SlabContext *) malloc(headerSize);
+	if (slab == NULL)
+	{
+		MemoryContextStats(TopMemoryContext);
+		ereport(ERROR,
+				(errcode(ERRCODE_OUT_OF_MEMORY),
+				 errmsg("out of memory"),
+				 errdetail("Failed while creating memory context \"%s\".",
+						   name)));
+	}
 
-	/* Do the type-independent part of context creation */
-	slab = (SlabContext *)
-		MemoryContextCreate(T_SlabContext,
-							(offsetof(SlabContext, freelist) + freelistSize),
-							&SlabMethods,
-							parent,
-							name);
+	/*
+	 * Avoid writing code that can fail between here and MemoryContextCreate;
+	 * we'd leak the header if we ereport in this stretch.
+	 */
 
-	slab->blockSize = blockSize;
+	/* Fill in SlabContext-specific header fields */
 	slab->chunkSize = chunkSize;
 	slab->fullChunkSize = fullChunkSize;
+	slab->blockSize = blockSize;
+	slab->headerSize = headerSize;
 	slab->chunksPerBlock = chunksPerBlock;
-	slab->nblocks = 0;
 	slab->minFreeChunks = 0;
-
-	return (MemoryContext) slab;
-}
-
-/*
- * SlabInit
- *		Context-type-specific initialization routine.
- */
-static void
-SlabInit(MemoryContext context)
-{
-	int			i;
-	SlabContext *slab = castNode(SlabContext, context);
-
-	Assert(slab);
+	slab->nblocks = 0;
 
 	/* initialize the freelist slots */
 	for (i = 0; i < (slab->chunksPerBlock + 1); i++)
 		dlist_init(&slab->freelist[i]);
+
+	/* Finally, do the type-independent part of context creation */
+	MemoryContextCreate((MemoryContext) slab,
+						T_SlabContext,
+						headerSize,
+						nameOffset,
+						&SlabMethods,
+						parent,
+						name,
+						flags);
+
+	return (MemoryContext) slab;
 }
 
 /*
@@ -299,14 +326,15 @@ SlabReset(MemoryContext context)
 
 /*
  * SlabDelete
- *		Frees all memory which is allocated in the given slab, in preparation
- *		for deletion of the slab. We simply call SlabReset().
+ *		Free all memory which is allocated in the given context.
  */
 static void
 SlabDelete(MemoryContext context)
 {
-	/* just reset the context */
+	/* Reset to release all the SlabBlocks */
 	SlabReset(context);
+	/* And free the context header */
+	free(context);
 }
 
 /*
@@ -443,7 +471,7 @@ SlabAlloc(MemoryContext context, Size size)
 	/* Prepare to initialize the chunk header. */
 	VALGRIND_MAKE_MEM_UNDEFINED(chunk, sizeof(SlabChunk));
 
-	chunk->block = (void *) block;
+	chunk->block = block;
 	chunk->slab = slab;
 
 #ifdef MEMORY_CONTEXT_CHECKING
@@ -604,7 +632,7 @@ SlabIsEmpty(MemoryContext context)
 
 /*
  * SlabStats
- *		Compute stats about memory consumption of an Slab.
+ *		Compute stats about memory consumption of a Slab context.
  *
  * level: recursion level (0 at top level); used for print indentation.
  * print: true to print stats to stderr.
@@ -617,11 +645,12 @@ SlabStats(MemoryContext context, int level, bool print,
 	SlabContext *slab = castNode(SlabContext, context);
 	Size		nblocks = 0;
 	Size		freechunks = 0;
-	Size		totalspace = 0;
+	Size		totalspace;
 	Size		freespace = 0;
 	int			i;
 
-	Assert(slab);
+	/* Include context header in totalspace */
+	totalspace = slab->headerSize;
 
 	for (i = 0; i <= slab->chunksPerBlock; i++)
 	{
@@ -673,7 +702,7 @@ SlabCheck(MemoryContext context)
 {
 	int			i;
 	SlabContext *slab = castNode(SlabContext, context);
-	char	   *name = slab->header.name;
+	const char *name = slab->header.name;
 	char	   *freechunks;
 
 	Assert(slab);
diff --git a/src/backend/utils/probes.d b/src/backend/utils/probes.d
index 214dc712ca..ad06e8e2ea 100644
--- a/src/backend/utils/probes.d
+++ b/src/backend/utils/probes.d
@@ -1,7 +1,7 @@
 /* ----------
  *	DTrace probes for PostgreSQL backend
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/backend/utils/probes.d
  * ----------
@@ -52,7 +52,7 @@ provider postgresql {
 	probe query__done(const char *);
 	probe statement__status(const char *);
 
-	probe sort__start(int, bool, int, int, bool);
+	probe sort__start(int, bool, int, int, bool, int);
 	probe sort__done(bool, long);
 
 	probe buffer__read__start(ForkNumber, BlockNumber, Oid, Oid, Oid, int, bool);
diff --git a/src/backend/utils/resowner/README b/src/backend/utils/resowner/README
index e7b9ddfa59..2998f6bb36 100644
--- a/src/backend/utils/resowner/README
+++ b/src/backend/utils/resowner/README
@@ -80,7 +80,3 @@ CurrentResourceOwner must point to the same resource owner that was current
 when the buffer, lock, or cache reference was acquired.  It would be possible
 to relax this restriction given additional bookkeeping effort, but at present
 there seems no need.
-
-Code that transiently changes CurrentResourceOwner should generally use a
-PG_TRY construct to ensure that the previous value of CurrentResourceOwner
-is restored if control is lost during an error exit.
diff --git a/src/backend/utils/resowner/resowner.c b/src/backend/utils/resowner/resowner.c
index 4a4a287148..e09a4f1ddb 100644
--- a/src/backend/utils/resowner/resowner.c
+++ b/src/backend/utils/resowner/resowner.c
@@ -9,7 +9,7 @@
  * See utils/resowner/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -473,21 +473,8 @@ ResourceOwnerRelease(ResourceOwner owner,
 					 bool isCommit,
 					 bool isTopLevel)
 {
-	/* Rather than PG_TRY at every level of recursion, set it up once */
-	ResourceOwner save;
-
-	save = CurrentResourceOwner;
-	PG_TRY();
-	{
-		ResourceOwnerReleaseInternal(owner, phase, isCommit, isTopLevel);
-	}
-	PG_CATCH();
-	{
-		CurrentResourceOwner = save;
-		PG_RE_THROW();
-	}
-	PG_END_TRY();
-	CurrentResourceOwner = save;
+	/* There's not currently any setup needed before recursing */
+	ResourceOwnerReleaseInternal(owner, phase, isCommit, isTopLevel);
 }
 
 static void
@@ -507,8 +494,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 
 	/*
 	 * Make CurrentResourceOwner point to me, so that ReleaseBuffer etc don't
-	 * get confused.  We needn't PG_TRY here because the outermost level will
-	 * fix it on error abort.
+	 * get confused.
 	 */
 	save = CurrentResourceOwner;
 	CurrentResourceOwner = owner;
@@ -672,7 +658,7 @@ ResourceOwnerReleaseInternal(ResourceOwner owner,
 
 	/* Let add-on modules get a chance too */
 	for (item = ResourceRelease_callbacks; item; item = item->next)
-		(*item->callback) (phase, isCommit, isTopLevel, item->arg);
+		item->callback(phase, isCommit, isTopLevel, item->arg);
 
 	CurrentResourceOwner = save;
 }
diff --git a/src/backend/utils/sort/Makefile b/src/backend/utils/sort/Makefile
index 370b12cee6..d8c08ac25e 100644
--- a/src/backend/utils/sort/Makefile
+++ b/src/backend/utils/sort/Makefile
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
 
 override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
-OBJS = logtape.o sortsupport.o tuplesort.o tuplestore.o
+OBJS = logtape.o sharedtuplestore.o sortsupport.o tuplesort.o tuplestore.o
 
 tuplesort.o: qsort_tuple.c
 
diff --git a/src/backend/utils/sort/logtape.c b/src/backend/utils/sort/logtape.c
index 5ebb6fb11a..05dde631dd 100644
--- a/src/backend/utils/sort/logtape.c
+++ b/src/backend/utils/sort/logtape.c
@@ -64,7 +64,15 @@
  * care that all calls for a single LogicalTapeSet are made in the same
  * palloc context.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * To support parallel sort operations involving coordinated callers to
+ * tuplesort.c routines across multiple workers, it is necessary to
+ * concatenate each worker BufFile/tapeset into one single logical tapeset
+ * managed by the leader.  Workers should have produced one final
+ * materialized tape (their entire output) when this happens in leader.
+ * There will always be the same number of runs as input tapes, and the same
+ * number of input tapes as participants (worker Tuplesortstates).
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -76,7 +84,9 @@
 #include "postgres.h"
 
 #include "storage/buffile.h"
+#include "utils/builtins.h"
 #include "utils/logtape.h"
+#include "utils/memdebug.h"
 #include "utils/memutils.h"
 
 /*
@@ -129,16 +139,21 @@ typedef struct LogicalTape
 	 * a frozen tape.  (When reading from an unfrozen tape, we use a larger
 	 * read buffer that holds multiple blocks, so the "current" block is
 	 * ambiguous.)
+	 *
+	 * When concatenation of worker tape BufFiles is performed, an offset to
+	 * the first block in the unified BufFile space is applied during reads.
 	 */
 	long		firstBlockNumber;
 	long		curBlockNumber;
 	long		nextBlockNumber;
+	long		offsetBlockNumber;
 
 	/*
 	 * Buffer for current data block(s).
 	 */
 	char	   *buffer;			/* physical buffer (separately palloc'd) */
 	int			buffer_size;	/* allocated size of the buffer */
+	int			max_size;		/* highest useful, safe buffer_size */
 	int			pos;			/* next read/write position in buffer */
 	int			nbytes;			/* total # of valid bytes in buffer */
 } LogicalTape;
@@ -159,10 +174,13 @@ struct LogicalTapeSet
 	 * by ltsGetFreeBlock(), and it is always greater than or equal to
 	 * nBlocksWritten.  Blocks between nBlocksAllocated and nBlocksWritten are
 	 * blocks that have been allocated for a tape, but have not been written
-	 * to the underlying file yet.
+	 * to the underlying file yet.  nHoleBlocks tracks the total number of
+	 * blocks that are in unused holes between worker spaces following BufFile
+	 * concatenation.
 	 */
 	long		nBlocksAllocated;	/* # of blocks allocated */
 	long		nBlocksWritten; /* # of blocks used in underlying file */
+	long		nHoleBlocks;	/* # of "hole" blocks left */
 
 	/*
 	 * We store the numbers of recycled-and-available blocks in freeBlocks[].
@@ -192,6 +210,8 @@ static void ltsWriteBlock(LogicalTapeSet *lts, long blocknum, void *buffer);
 static void ltsReadBlock(LogicalTapeSet *lts, long blocknum, void *buffer);
 static long ltsGetFreeBlock(LogicalTapeSet *lts);
 static void ltsReleaseBlock(LogicalTapeSet *lts, long blocknum);
+static void ltsConcatWorkerTapes(LogicalTapeSet *lts, TapeShare *shared,
+					 SharedFileSet *fileset);
 
 
 /*
@@ -213,6 +233,11 @@ ltsWriteBlock(LogicalTapeSet *lts, long blocknum, void *buffer)
 	 * previous tape isn't flushed to disk until the end of the sort, so you
 	 * get one-block hole, where the last block of the previous tape will
 	 * later go.
+	 *
+	 * Note that BufFile concatenation can leave "holes" in BufFile between
+	 * worker-owned block ranges.  These are tracked for reporting purposes
+	 * only.  We never read from nor write to these hole blocks, and so they
+	 * are not considered here.
 	 */
 	while (blocknum > lts->nBlocksWritten)
 	{
@@ -267,15 +292,18 @@ ltsReadFillBuffer(LogicalTapeSet *lts, LogicalTape *lt)
 	do
 	{
 		char	   *thisbuf = lt->buffer + lt->nbytes;
+		long		datablocknum = lt->nextBlockNumber;
 
 		/* Fetch next block number */
-		if (lt->nextBlockNumber == -1L)
+		if (datablocknum == -1L)
 			break;				/* EOF */
+		/* Apply worker offset, needed for leader tapesets */
+		datablocknum += lt->offsetBlockNumber;
 
 		/* Read the block */
-		ltsReadBlock(lts, lt->nextBlockNumber, (void *) thisbuf);
+		ltsReadBlock(lts, datablocknum, (void *) thisbuf);
 		if (!lt->frozen)
-			ltsReleaseBlock(lts, lt->nextBlockNumber);
+			ltsReleaseBlock(lts, datablocknum);
 		lt->curBlockNumber = lt->nextBlockNumber;
 
 		lt->nbytes += TapeBlockGetNBytes(thisbuf);
@@ -370,13 +398,116 @@ ltsReleaseBlock(LogicalTapeSet *lts, long blocknum)
 		lts->blocksSorted = false;
 }
 
+/*
+ * Claim ownership of a set of logical tapes from existing shared BufFiles.
+ *
+ * Caller should be leader process.  Though tapes are marked as frozen in
+ * workers, they are not frozen when opened within leader, since unfrozen tapes
+ * use a larger read buffer. (Frozen tapes have smaller read buffer, optimized
+ * for random access.)
+ */
+static void
+ltsConcatWorkerTapes(LogicalTapeSet *lts, TapeShare *shared,
+					 SharedFileSet *fileset)
+{
+	LogicalTape *lt = NULL;
+	long		tapeblocks = 0L;
+	long		nphysicalblocks = 0L;
+	int			i;
+
+	/* Should have at least one worker tape, plus leader's tape */
+	Assert(lts->nTapes >= 2);
+
+	/*
+	 * Build concatenated view of all BufFiles, remembering the block number
+	 * where each source file begins.  No changes are needed for leader/last
+	 * tape.
+	 */
+	for (i = 0; i < lts->nTapes - 1; i++)
+	{
+		char		filename[MAXPGPATH];
+		BufFile    *file;
+
+		lt = &lts->tapes[i];
+
+		pg_itoa(i, filename);
+		file = BufFileOpenShared(fileset, filename);
+
+		/*
+		 * Stash first BufFile, and concatenate subsequent BufFiles to that.
+		 * Store block offset into each tape as we go.
+		 */
+		lt->firstBlockNumber = shared[i].firstblocknumber;
+		if (i == 0)
+		{
+			lts->pfile = file;
+			lt->offsetBlockNumber = 0L;
+		}
+		else
+		{
+			lt->offsetBlockNumber = BufFileAppend(lts->pfile, file);
+		}
+		/* Don't allocate more for read buffer than could possibly help */
+		lt->max_size = Min(MaxAllocSize, shared[i].buffilesize);
+		tapeblocks = shared[i].buffilesize / BLCKSZ;
+		nphysicalblocks += tapeblocks;
+	}
+
+	/*
+	 * Set # of allocated blocks, as well as # blocks written.  Use extent of
+	 * new BufFile space (from 0 to end of last worker's tape space) for this.
+	 * Allocated/written blocks should include space used by holes left
+	 * between concatenated BufFiles.
+	 */
+	lts->nBlocksAllocated = lt->offsetBlockNumber + tapeblocks;
+	lts->nBlocksWritten = lts->nBlocksAllocated;
+
+	/*
+	 * Compute number of hole blocks so that we can later work backwards, and
+	 * instrument number of physical blocks.  We don't simply use physical
+	 * blocks directly for instrumentation because this would break if we ever
+	 * subsequently wrote to worker tape.
+	 *
+	 * Working backwards like this keeps our options open.  If shared BufFiles
+	 * ever support being written to post-export, logtape.c can automatically
+	 * take advantage of that.  We'd then support writing to the leader tape
+	 * while recycling space from worker tapes, because the leader tape has a
+	 * zero offset (write routines won't need to have extra logic to apply an
+	 * offset).
+	 *
+	 * The only thing that currently prevents writing to the leader tape from
+	 * working is the fact that BufFiles opened using BufFileOpenShared() are
+	 * read-only by definition, but that could be changed if it seemed
+	 * worthwhile.  For now, writing to the leader tape will raise a "Bad file
+	 * descriptor" error, so tuplesort must avoid writing to the leader tape
+	 * altogether.
+	 */
+	lts->nHoleBlocks = lts->nBlocksAllocated - nphysicalblocks;
+}
+
 /*
  * Create a set of logical tapes in a temporary underlying file.
  *
- * Each tape is initialized in write state.
+ * Each tape is initialized in write state.  Serial callers pass ntapes,
+ * NULL argument for shared, and -1 for worker.  Parallel worker callers
+ * pass ntapes, a shared file handle, NULL shared argument,  and their own
+ * worker number.  Leader callers, which claim shared worker tapes here,
+ * must supply non-sentinel values for all arguments except worker number,
+ * which should be -1.
+ *
+ * Leader caller is passing back an array of metadata each worker captured
+ * when LogicalTapeFreeze() was called for their final result tapes.  Passed
+ * tapes array is actually sized ntapes - 1, because it includes only
+ * worker tapes, whereas leader requires its own leader tape.  Note that we
+ * rely on the assumption that reclaimed worker tapes will only be read
+ * from once by leader, and never written to again (tapes are initialized
+ * for writing, but that's only to be consistent).  Leader may not write to
+ * its own tape purely due to a restriction in the shared buffile
+ * infrastructure that may be lifted in the future.
  */
 LogicalTapeSet *
-LogicalTapeSetCreate(int ntapes)
+LogicalTapeSetCreate(int ntapes, TapeShare *shared, SharedFileSet *fileset,
+					 int worker)
 {
 	LogicalTapeSet *lts;
 	LogicalTape *lt;
@@ -388,9 +519,9 @@ LogicalTapeSetCreate(int ntapes)
 	Assert(ntapes > 0);
 	lts = (LogicalTapeSet *) palloc(offsetof(LogicalTapeSet, tapes) +
 									ntapes * sizeof(LogicalTape));
-	lts->pfile = BufFileCreateTemp(false);
 	lts->nBlocksAllocated = 0L;
 	lts->nBlocksWritten = 0L;
+	lts->nHoleBlocks = 0L;
 	lts->forgetFreeSpace = false;
 	lts->blocksSorted = true;	/* a zero-length array is sorted ... */
 	lts->freeBlocksLen = 32;	/* reasonable initial guess */
@@ -412,11 +543,36 @@ LogicalTapeSetCreate(int ntapes)
 		lt->dirty = false;
 		lt->firstBlockNumber = -1L;
 		lt->curBlockNumber = -1L;
+		lt->nextBlockNumber = -1L;
+		lt->offsetBlockNumber = 0L;
 		lt->buffer = NULL;
 		lt->buffer_size = 0;
+		/* palloc() larger than MaxAllocSize would fail */
+		lt->max_size = MaxAllocSize;
 		lt->pos = 0;
 		lt->nbytes = 0;
 	}
+
+	/*
+	 * Create temp BufFile storage as required.
+	 *
+	 * Leader concatenates worker tapes, which requires special adjustment to
+	 * final tapeset data.  Things are simpler for the worker case and the
+	 * serial case, though.  They are generally very similar -- workers use a
+	 * shared fileset, whereas serial sorts use a conventional serial BufFile.
+	 */
+	if (shared)
+		ltsConcatWorkerTapes(lts, shared, fileset);
+	else if (fileset)
+	{
+		char		filename[MAXPGPATH];
+
+		pg_itoa(worker, filename);
+		lts->pfile = BufFileCreateShared(fileset, filename);
+	}
+	else
+		lts->pfile = BufFileCreateTemp(false);
+
 	return lts;
 }
 
@@ -470,6 +626,7 @@ LogicalTapeWrite(LogicalTapeSet *lts, int tapenum,
 	Assert(tapenum >= 0 && tapenum < lts->nTapes);
 	lt = &lts->tapes[tapenum];
 	Assert(lt->writing);
+	Assert(lt->offsetBlockNumber == 0L);
 
 	/* Allocate data buffer and first block on first write */
 	if (lt->buffer == NULL)
@@ -566,12 +723,9 @@ LogicalTapeRewindForRead(LogicalTapeSet *lts, int tapenum, size_t buffer_size)
 		if (buffer_size < BLCKSZ)
 			buffer_size = BLCKSZ;
 
-		/*
-		 * palloc() larger than MaxAllocSize would fail (a multi-gigabyte
-		 * buffer is unlikely to be helpful, anyway)
-		 */
-		if (buffer_size > MaxAllocSize)
-			buffer_size = MaxAllocSize;
+		/* palloc() larger than max_size is unlikely to be helpful */
+		if (buffer_size > lt->max_size)
+			buffer_size = lt->max_size;
 
 		/* round down to BLCKSZ boundary */
 		buffer_size -= buffer_size % BLCKSZ;
@@ -585,6 +739,18 @@ LogicalTapeRewindForRead(LogicalTapeSet *lts, int tapenum, size_t buffer_size)
 		 */
 		if (lt->dirty)
 		{
+			/*
+			 * As long as we've filled the buffer at least once, its contents
+			 * are entirely defined from valgrind's point of view, even though
+			 * contents beyond the current end point may be stale.  But it's
+			 * possible - at least in the case of a parallel sort - to sort
+			 * such small amount of data that we do not fill the buffer even
+			 * once.  Tell valgrind that its contents are defined, so it
+			 * doesn't bleat.
+			 */
+			VALGRIND_MAKE_MEM_DEFINED(lt->buffer + lt->nbytes,
+									  lt->buffer_size - lt->nbytes);
+
 			TapeBlockSetNBytes(lt->buffer, lt->nbytes);
 			ltsWriteBlock(lts, lt->curBlockNumber, (void *) lt->buffer);
 		}
@@ -698,15 +864,22 @@ LogicalTapeRead(LogicalTapeSet *lts, int tapenum,
  * tape is rewound (after rewind is too late!).  It performs a rewind
  * and switch to read mode "for free".  An immediately following rewind-
  * for-read call is OK but not necessary.
+ *
+ * share output argument is set with details of storage used for tape after
+ * freezing, which may be passed to LogicalTapeSetCreate within leader
+ * process later.  This metadata is only of interest to worker callers
+ * freezing their final output for leader (single materialized tape).
+ * Serial sorts should set share to NULL.
  */
 void
-LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum)
+LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum, TapeShare *share)
 {
 	LogicalTape *lt;
 
 	Assert(tapenum >= 0 && tapenum < lts->nTapes);
 	lt = &lts->tapes[tapenum];
 	Assert(lt->writing);
+	Assert(lt->offsetBlockNumber == 0L);
 
 	/*
 	 * Completion of a write phase.  Flush last partial data block, and rewind
@@ -714,6 +887,17 @@ LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum)
 	 */
 	if (lt->dirty)
 	{
+		/*
+		 * As long as we've filled the buffer at least once, its contents are
+		 * entirely defined from valgrind's point of view, even though
+		 * contents beyond the current end point may be stale.  But it's
+		 * possible - at least in the case of a parallel sort - to sort such
+		 * small amount of data that we do not fill the buffer even once. Tell
+		 * valgrind that its contents are defined, so it doesn't bleat.
+		 */
+		VALGRIND_MAKE_MEM_DEFINED(lt->buffer + lt->nbytes,
+								  lt->buffer_size - lt->nbytes);
+
 		TapeBlockSetNBytes(lt->buffer, lt->nbytes);
 		ltsWriteBlock(lts, lt->curBlockNumber, (void *) lt->buffer);
 		lt->writing = false;
@@ -749,6 +933,14 @@ LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum)
 	else
 		lt->nextBlockNumber = TapeBlockGetTrailer(lt->buffer)->next;
 	lt->nbytes = TapeBlockGetNBytes(lt->buffer);
+
+	/* Handle extra steps when caller is to share its tapeset */
+	if (share)
+	{
+		BufFileExportShared(lts->pfile);
+		share->firstblocknumber = lt->firstBlockNumber;
+		share->buffilesize = BufFileSize(lts->pfile);
+	}
 }
 
 /*
@@ -874,6 +1066,7 @@ LogicalTapeTell(LogicalTapeSet *lts, int tapenum,
 
 	Assert(tapenum >= 0 && tapenum < lts->nTapes);
 	lt = &lts->tapes[tapenum];
+	Assert(lt->offsetBlockNumber == 0L);
 
 	/* With a larger buffer, 'pos' wouldn't be the same as offset within page */
 	Assert(lt->buffer_size == BLCKSZ);
@@ -888,5 +1081,5 @@ LogicalTapeTell(LogicalTapeSet *lts, int tapenum,
 long
 LogicalTapeSetBlocks(LogicalTapeSet *lts)
 {
-	return lts->nBlocksAllocated;
+	return lts->nBlocksAllocated - lts->nHoleBlocks;
 }
diff --git a/src/backend/utils/sort/sharedtuplestore.c b/src/backend/utils/sort/sharedtuplestore.c
new file mode 100644
index 0000000000..e453cc0383
--- /dev/null
+++ b/src/backend/utils/sort/sharedtuplestore.c
@@ -0,0 +1,633 @@
+/*-------------------------------------------------------------------------
+ *
+ * sharedtuplestore.c
+ *	  Simple mechanism for sharing tuples between backends.
+ *
+ * This module contains a shared temporary tuple storage mechanism providing
+ * a parallel-aware subset of the features of tuplestore.c.  Multiple backends
+ * can write to a SharedTuplestore, and then multiple backends can later scan
+ * the stored tuples.  Currently, the only scan type supported is a parallel
+ * scan where each backend reads an arbitrary subset of the tuples that were
+ * written.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/backend/util/sort/sharedtuplestore.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "access/htup.h"
+#include "access/htup_details.h"
+#include "miscadmin.h"
+#include "storage/buffile.h"
+#include "storage/lwlock.h"
+#include "storage/sharedfileset.h"
+#include "utils/sharedtuplestore.h"
+
+#include <limits.h>
+
+/*
+ * The size of chunks, in pages.  This is somewhat arbitrarily set to match
+ * the size of HASH_CHUNK, so that Parallel Hash obtains new chunks of tuples
+ * at approximately the same rate as it allocates new chunks of memory to
+ * insert them into.
+ */
+#define STS_CHUNK_PAGES 4
+#define STS_CHUNK_HEADER_SIZE offsetof(SharedTuplestoreChunk, data)
+#define STS_CHUNK_DATA_SIZE (STS_CHUNK_PAGES * BLCKSZ - STS_CHUNK_HEADER_SIZE)
+
+/* Chunk written to disk. */
+typedef struct SharedTuplestoreChunk
+{
+	int			ntuples;		/* Number of tuples in this chunk. */
+	int			overflow;		/* If overflow, how many including this one? */
+	char		data[FLEXIBLE_ARRAY_MEMBER];
+}			SharedTuplestoreChunk;
+
+/* Per-participant shared state. */
+typedef struct SharedTuplestoreParticipant
+{
+	LWLock		lock;
+	BlockNumber read_page;		/* Page number for next read. */
+	BlockNumber npages;			/* Number of pages written. */
+	bool		writing;		/* Used only for assertions. */
+}			SharedTuplestoreParticipant;
+
+/* The control object that lives in shared memory. */
+struct SharedTuplestore
+{
+	int			nparticipants;	/* Number of participants that can write. */
+	int			flags;			/* Flag bits from SHARED_TUPLESTORE_XXX */
+	size_t		meta_data_size; /* Size of per-tuple header. */
+	char		name[NAMEDATALEN];	/* A name for this tuplestore. */
+
+	/* Followed by per-participant shared state. */
+	SharedTuplestoreParticipant participants[FLEXIBLE_ARRAY_MEMBER];
+};
+
+/* Per-participant state that lives in backend-local memory. */
+struct SharedTuplestoreAccessor
+{
+	int			participant;	/* My participant number. */
+	SharedTuplestore *sts;		/* The shared state. */
+	SharedFileSet *fileset;		/* The SharedFileSet holding files. */
+	MemoryContext context;		/* Memory context for buffers. */
+
+	/* State for reading. */
+	int			read_participant;	/* The current participant to read from. */
+	BufFile    *read_file;		/* The current file to read from. */
+	int			read_ntuples_available; /* The number of tuples in chunk. */
+	int			read_ntuples;	/* How many tuples have we read from chunk? */
+	size_t		read_bytes;		/* How many bytes have we read from chunk? */
+	char	   *read_buffer;	/* A buffer for loading tuples. */
+	size_t		read_buffer_size;
+	BlockNumber read_next_page; /* Lowest block we'll consider reading. */
+
+	/* State for writing. */
+	SharedTuplestoreChunk *write_chunk; /* Buffer for writing. */
+	BufFile    *write_file;		/* The current file to write to. */
+	BlockNumber write_page;		/* The next page to write to. */
+	char	   *write_pointer;	/* Current write pointer within chunk. */
+	char	   *write_end;		/* One past the end of the current chunk. */
+};
+
+static void sts_filename(char *name, SharedTuplestoreAccessor *accessor,
+			 int participant);
+
+/*
+ * Return the amount of shared memory required to hold SharedTuplestore for a
+ * given number of participants.
+ */
+size_t
+sts_estimate(int participants)
+{
+	return offsetof(SharedTuplestore, participants) +
+		sizeof(SharedTuplestoreParticipant) * participants;
+}
+
+/*
+ * Initialize a SharedTuplestore in existing shared memory.  There must be
+ * space for sts_estimate(participants) bytes.  If flags includes the value
+ * SHARED_TUPLESTORE_SINGLE_PASS, the files may in future be removed more
+ * eagerly (but this isn't yet implemented).
+ *
+ * Tuples that are stored may optionally carry a piece of fixed sized
+ * meta-data which will be retrieved along with the tuple.  This is useful for
+ * the hash values used in multi-batch hash joins, but could have other
+ * applications.
+ *
+ * The caller must supply a SharedFileSet, which is essentially a directory
+ * that will be cleaned up automatically, and a name which must be unique
+ * across all SharedTuplestores created in the same SharedFileSet.
+ */
+SharedTuplestoreAccessor *
+sts_initialize(SharedTuplestore *sts, int participants,
+			   int my_participant_number,
+			   size_t meta_data_size,
+			   int flags,
+			   SharedFileSet *fileset,
+			   const char *name)
+{
+	SharedTuplestoreAccessor *accessor;
+	int			i;
+
+	Assert(my_participant_number < participants);
+
+	sts->nparticipants = participants;
+	sts->meta_data_size = meta_data_size;
+	sts->flags = flags;
+
+	if (strlen(name) > sizeof(sts->name) - 1)
+		elog(ERROR, "SharedTuplestore name too long");
+	strcpy(sts->name, name);
+
+	/*
+	 * Limit meta-data so it + tuple size always fits into a single chunk.
+	 * sts_puttuple() and sts_read_tuple() could be made to support scenarios
+	 * where that's not the case, but it's not currently required. If so,
+	 * meta-data size probably should be made variable, too.
+	 */
+	if (meta_data_size + sizeof(uint32) >= STS_CHUNK_DATA_SIZE)
+		elog(ERROR, "meta-data too long");
+
+	for (i = 0; i < participants; ++i)
+	{
+		LWLockInitialize(&sts->participants[i].lock,
+						 LWTRANCHE_SHARED_TUPLESTORE);
+		sts->participants[i].read_page = 0;
+		sts->participants[i].writing = false;
+	}
+
+	accessor = palloc0(sizeof(SharedTuplestoreAccessor));
+	accessor->participant = my_participant_number;
+	accessor->sts = sts;
+	accessor->fileset = fileset;
+	accessor->context = CurrentMemoryContext;
+
+	return accessor;
+}
+
+/*
+ * Attach to a SharedTupleStore that has been initialized by another backend,
+ * so that this backend can read and write tuples.
+ */
+SharedTuplestoreAccessor *
+sts_attach(SharedTuplestore *sts,
+		   int my_participant_number,
+		   SharedFileSet *fileset)
+{
+	SharedTuplestoreAccessor *accessor;
+
+	Assert(my_participant_number < sts->nparticipants);
+
+	accessor = palloc0(sizeof(SharedTuplestoreAccessor));
+	accessor->participant = my_participant_number;
+	accessor->sts = sts;
+	accessor->fileset = fileset;
+	accessor->context = CurrentMemoryContext;
+
+	return accessor;
+}
+
+static void
+sts_flush_chunk(SharedTuplestoreAccessor *accessor)
+{
+	size_t		size;
+	size_t		written;
+
+	size = STS_CHUNK_PAGES * BLCKSZ;
+	written = BufFileWrite(accessor->write_file, accessor->write_chunk, size);
+	if (written != size)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not write to temporary file: %m")));
+	memset(accessor->write_chunk, 0, size);
+	accessor->write_pointer = &accessor->write_chunk->data[0];
+	accessor->sts->participants[accessor->participant].npages +=
+		STS_CHUNK_PAGES;
+}
+
+/*
+ * Finish writing tuples.  This must be called by all backends that have
+ * written data before any backend begins reading it.
+ */
+void
+sts_end_write(SharedTuplestoreAccessor *accessor)
+{
+	if (accessor->write_file != NULL)
+	{
+		sts_flush_chunk(accessor);
+		BufFileClose(accessor->write_file);
+		pfree(accessor->write_chunk);
+		accessor->write_chunk = NULL;
+		accessor->write_file = NULL;
+		accessor->sts->participants[accessor->participant].writing = false;
+	}
+}
+
+/*
+ * Prepare to rescan.  Only one participant must call this.  After it returns,
+ * all participants may call sts_begin_parallel_scan() and then loop over
+ * sts_parallel_scan_next().  This function must not be called concurrently
+ * with a scan, and synchronization to avoid that is the caller's
+ * responsibility.
+ */
+void
+sts_reinitialize(SharedTuplestoreAccessor *accessor)
+{
+	int			i;
+
+	/*
+	 * Reset the shared read head for all participants' files.  Also set the
+	 * initial chunk size to the minimum (any increases from that size will be
+	 * recorded in chunk_expansion_log).
+	 */
+	for (i = 0; i < accessor->sts->nparticipants; ++i)
+	{
+		accessor->sts->participants[i].read_page = 0;
+	}
+}
+
+/*
+ * Begin scanning the contents in parallel.
+ */
+void
+sts_begin_parallel_scan(SharedTuplestoreAccessor *accessor)
+{
+	int			i PG_USED_FOR_ASSERTS_ONLY;
+
+	/* End any existing scan that was in progress. */
+	sts_end_parallel_scan(accessor);
+
+	/*
+	 * Any backend that might have written into this shared tuplestore must
+	 * have called sts_end_write(), so that all buffers are flushed and the
+	 * files have stopped growing.
+	 */
+	for (i = 0; i < accessor->sts->nparticipants; ++i)
+		Assert(!accessor->sts->participants[i].writing);
+
+	/*
+	 * We will start out reading the file that THIS backend wrote.  There may
+	 * be some caching locality advantage to that.
+	 */
+	accessor->read_participant = accessor->participant;
+	accessor->read_file = NULL;
+	accessor->read_next_page = 0;
+}
+
+/*
+ * Finish a parallel scan, freeing associated backend-local resources.
+ */
+void
+sts_end_parallel_scan(SharedTuplestoreAccessor *accessor)
+{
+	/*
+	 * Here we could delete all files if SHARED_TUPLESTORE_SINGLE_PASS, but
+	 * we'd probably need a reference count of current parallel scanners so we
+	 * could safely do it only when the reference count reaches zero.
+	 */
+	if (accessor->read_file != NULL)
+	{
+		BufFileClose(accessor->read_file);
+		accessor->read_file = NULL;
+	}
+}
+
+/*
+ * Write a tuple.  If a meta-data size was provided to sts_initialize, then a
+ * pointer to meta data of that size must be provided.
+ */
+void
+sts_puttuple(SharedTuplestoreAccessor *accessor, void *meta_data,
+			 MinimalTuple tuple)
+{
+	size_t		size;
+
+	/* Do we have our own file yet? */
+	if (accessor->write_file == NULL)
+	{
+		SharedTuplestoreParticipant *participant;
+		char		name[MAXPGPATH];
+
+		/* Create one.  Only this backend will write into it. */
+		sts_filename(name, accessor, accessor->participant);
+		accessor->write_file = BufFileCreateShared(accessor->fileset, name);
+
+		/* Set up the shared state for this backend's file. */
+		participant = &accessor->sts->participants[accessor->participant];
+		participant->writing = true;	/* for assertions only */
+	}
+
+	/* Do we have space? */
+	size = accessor->sts->meta_data_size + tuple->t_len;
+	if (accessor->write_pointer + size >= accessor->write_end)
+	{
+		if (accessor->write_chunk == NULL)
+		{
+			/* First time through.  Allocate chunk. */
+			accessor->write_chunk = (SharedTuplestoreChunk *)
+				MemoryContextAllocZero(accessor->context,
+									   STS_CHUNK_PAGES * BLCKSZ);
+			accessor->write_chunk->ntuples = 0;
+			accessor->write_pointer = &accessor->write_chunk->data[0];
+			accessor->write_end = (char *)
+				accessor->write_chunk + STS_CHUNK_PAGES * BLCKSZ;
+		}
+		else
+		{
+			/* See if flushing helps. */
+			sts_flush_chunk(accessor);
+		}
+
+		/* It may still not be enough in the case of a gigantic tuple. */
+		if (accessor->write_pointer + size >= accessor->write_end)
+		{
+			size_t		written;
+
+			/*
+			 * We'll write the beginning of the oversized tuple, and then
+			 * write the rest in some number of 'overflow' chunks.
+			 *
+			 * sts_initialize() verifies that the size of the tuple +
+			 * meta-data always fits into a chunk. Because the chunk has been
+			 * flushed above, we can be sure to have all of a chunk's usable
+			 * space available.
+			 */
+			Assert(accessor->write_pointer + accessor->sts->meta_data_size +
+				   sizeof(uint32) < accessor->write_end);
+
+			/* Write the meta-data as one chunk. */
+			if (accessor->sts->meta_data_size > 0)
+				memcpy(accessor->write_pointer, meta_data,
+					   accessor->sts->meta_data_size);
+
+			/*
+			 * Write as much of the tuple as we can fit. This includes the
+			 * tuple's size at the start.
+			 */
+			written = accessor->write_end - accessor->write_pointer -
+				accessor->sts->meta_data_size;
+			memcpy(accessor->write_pointer + accessor->sts->meta_data_size,
+				   tuple, written);
+			++accessor->write_chunk->ntuples;
+			size -= accessor->sts->meta_data_size;
+			size -= written;
+			/* Now write as many overflow chunks as we need for the rest. */
+			while (size > 0)
+			{
+				size_t		written_this_chunk;
+
+				sts_flush_chunk(accessor);
+
+				/*
+				 * How many oveflow chunks to go?  This will allow readers to
+				 * skip all of them at once instead of reading each one.
+				 */
+				accessor->write_chunk->overflow = (size + STS_CHUNK_DATA_SIZE - 1) /
+					STS_CHUNK_DATA_SIZE;
+				written_this_chunk =
+					Min(accessor->write_end - accessor->write_pointer, size);
+				memcpy(accessor->write_pointer, (char *) tuple + written,
+					   written_this_chunk);
+				accessor->write_pointer += written_this_chunk;
+				size -= written_this_chunk;
+				written += written_this_chunk;
+			}
+			return;
+		}
+	}
+
+	/* Copy meta-data and tuple into buffer. */
+	if (accessor->sts->meta_data_size > 0)
+		memcpy(accessor->write_pointer, meta_data,
+			   accessor->sts->meta_data_size);
+	memcpy(accessor->write_pointer + accessor->sts->meta_data_size, tuple,
+		   tuple->t_len);
+	accessor->write_pointer += size;
+	++accessor->write_chunk->ntuples;
+}
+
+static MinimalTuple
+sts_read_tuple(SharedTuplestoreAccessor *accessor, void *meta_data)
+{
+	MinimalTuple tuple;
+	uint32		size;
+	size_t		remaining_size;
+	size_t		this_chunk_size;
+	char	   *destination;
+
+	/*
+	 * We'll keep track of bytes read from this chunk so that we can detect an
+	 * overflowing tuple and switch to reading overflow pages.
+	 */
+	if (accessor->sts->meta_data_size > 0)
+	{
+		if (BufFileRead(accessor->read_file,
+						meta_data,
+						accessor->sts->meta_data_size) !=
+			accessor->sts->meta_data_size)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not read from shared tuplestore temporary file"),
+					 errdetail_internal("Short read while reading meta-data.")));
+		accessor->read_bytes += accessor->sts->meta_data_size;
+	}
+	if (BufFileRead(accessor->read_file,
+					&size,
+					sizeof(size)) != sizeof(size))
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not read from shared tuplestore temporary file"),
+				 errdetail_internal("Short read while reading size.")));
+	accessor->read_bytes += sizeof(size);
+	if (size > accessor->read_buffer_size)
+	{
+		size_t		new_read_buffer_size;
+
+		if (accessor->read_buffer != NULL)
+			pfree(accessor->read_buffer);
+		new_read_buffer_size = Max(size, accessor->read_buffer_size * 2);
+		accessor->read_buffer =
+			MemoryContextAlloc(accessor->context, new_read_buffer_size);
+		accessor->read_buffer_size = new_read_buffer_size;
+	}
+	remaining_size = size - sizeof(uint32);
+	this_chunk_size = Min(remaining_size,
+						  BLCKSZ * STS_CHUNK_PAGES - accessor->read_bytes);
+	destination = accessor->read_buffer + sizeof(uint32);
+	if (BufFileRead(accessor->read_file,
+					destination,
+					this_chunk_size) != this_chunk_size)
+		ereport(ERROR,
+				(errcode_for_file_access(),
+				 errmsg("could not read from shared tuplestore temporary file"),
+				 errdetail_internal("Short read while reading tuple.")));
+	accessor->read_bytes += this_chunk_size;
+	remaining_size -= this_chunk_size;
+	destination += this_chunk_size;
+	++accessor->read_ntuples;
+
+	/* Check if we need to read any overflow chunks. */
+	while (remaining_size > 0)
+	{
+		/* We are now positioned at the start of an overflow chunk. */
+		SharedTuplestoreChunk chunk_header;
+
+		if (BufFileRead(accessor->read_file, &chunk_header, STS_CHUNK_HEADER_SIZE) !=
+			STS_CHUNK_HEADER_SIZE)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not read from shared tuplestore temporary file"),
+					 errdetail_internal("Short read while reading overflow chunk header.")));
+		accessor->read_bytes = STS_CHUNK_HEADER_SIZE;
+		if (chunk_header.overflow == 0)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("unexpected chunk in shared tuplestore temporary file"),
+					 errdetail_internal("Expected overflow chunk.")));
+		accessor->read_next_page += STS_CHUNK_PAGES;
+		this_chunk_size = Min(remaining_size,
+							  BLCKSZ * STS_CHUNK_PAGES -
+							  STS_CHUNK_HEADER_SIZE);
+		if (BufFileRead(accessor->read_file,
+						destination,
+						this_chunk_size) != this_chunk_size)
+			ereport(ERROR,
+					(errcode_for_file_access(),
+					 errmsg("could not read from shared tuplestore temporary file"),
+					 errdetail_internal("Short read while reading tuple.")));
+		accessor->read_bytes += this_chunk_size;
+		remaining_size -= this_chunk_size;
+		destination += this_chunk_size;
+
+		/*
+		 * These will be used to count regular tuples following the oversized
+		 * tuple that spilled into this overflow chunk.
+		 */
+		accessor->read_ntuples = 0;
+		accessor->read_ntuples_available = chunk_header.ntuples;
+	}
+
+	tuple = (MinimalTuple) accessor->read_buffer;
+	tuple->t_len = size;
+
+	return tuple;
+}
+
+/*
+ * Get the next tuple in the current parallel scan.
+ */
+MinimalTuple
+sts_parallel_scan_next(SharedTuplestoreAccessor *accessor, void *meta_data)
+{
+	SharedTuplestoreParticipant *p;
+	BlockNumber read_page;
+	bool		eof;
+
+	for (;;)
+	{
+		/* Can we read more tuples from the current chunk? */
+		if (accessor->read_ntuples < accessor->read_ntuples_available)
+			return sts_read_tuple(accessor, meta_data);
+
+		/* Find the location of a new chunk to read. */
+		p = &accessor->sts->participants[accessor->read_participant];
+
+		LWLockAcquire(&p->lock, LW_EXCLUSIVE);
+		/* We can skip directly past overflow pages we know about. */
+		if (p->read_page < accessor->read_next_page)
+			p->read_page = accessor->read_next_page;
+		eof = p->read_page >= p->npages;
+		if (!eof)
+		{
+			/* Claim the next chunk. */
+			read_page = p->read_page;
+			/* Advance the read head for the next reader. */
+			p->read_page += STS_CHUNK_PAGES;
+			accessor->read_next_page = p->read_page;
+		}
+		LWLockRelease(&p->lock);
+
+		if (!eof)
+		{
+			SharedTuplestoreChunk chunk_header;
+
+			/* Make sure we have the file open. */
+			if (accessor->read_file == NULL)
+			{
+				char		name[MAXPGPATH];
+
+				sts_filename(name, accessor, accessor->read_participant);
+				accessor->read_file =
+					BufFileOpenShared(accessor->fileset, name);
+			}
+
+			/* Seek and load the chunk header. */
+			if (BufFileSeekBlock(accessor->read_file, read_page) != 0)
+				ereport(ERROR,
+						(errcode_for_file_access(),
+						 errmsg("could not read from shared tuplestore temporary file"),
+						 errdetail_internal("Could not seek to next block.")));
+			if (BufFileRead(accessor->read_file, &chunk_header,
+							STS_CHUNK_HEADER_SIZE) != STS_CHUNK_HEADER_SIZE)
+				ereport(ERROR,
+						(errcode_for_file_access(),
+						 errmsg("could not read from shared tuplestore temporary file"),
+						 errdetail_internal("Short read while reading chunk header.")));
+
+			/*
+			 * If this is an overflow chunk, we skip it and any following
+			 * overflow chunks all at once.
+			 */
+			if (chunk_header.overflow > 0)
+			{
+				accessor->read_next_page = read_page +
+					chunk_header.overflow * STS_CHUNK_PAGES;
+				continue;
+			}
+
+			accessor->read_ntuples = 0;
+			accessor->read_ntuples_available = chunk_header.ntuples;
+			accessor->read_bytes = STS_CHUNK_HEADER_SIZE;
+
+			/* Go around again, so we can get a tuple from this chunk. */
+		}
+		else
+		{
+			if (accessor->read_file != NULL)
+			{
+				BufFileClose(accessor->read_file);
+				accessor->read_file = NULL;
+			}
+
+			/*
+			 * Try the next participant's file.  If we've gone full circle,
+			 * we're done.
+			 */
+			accessor->read_participant = (accessor->read_participant + 1) %
+				accessor->sts->nparticipants;
+			if (accessor->read_participant == accessor->participant)
+				break;
+			accessor->read_next_page = 0;
+
+			/* Go around again, so we can get a chunk from this file. */
+		}
+	}
+
+	return NULL;
+}
+
+/*
+ * Create the name used for the BufFile that a given participant will write.
+ */
+static void
+sts_filename(char *name, SharedTuplestoreAccessor *accessor, int participant)
+{
+	snprintf(name, MAXPGPATH, "%s.p%d", accessor->sts->name, participant);
+}
diff --git a/src/backend/utils/sort/sortsupport.c b/src/backend/utils/sort/sortsupport.c
index 73170b7429..8c09fe4a43 100644
--- a/src/backend/utils/sort/sortsupport.c
+++ b/src/backend/utils/sort/sortsupport.c
@@ -4,7 +4,7 @@
  *	  Support routines for accelerated sorting.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/backend/utils/sort/tuplesort.c b/src/backend/utils/sort/tuplesort.c
index 59cd28e595..041bdc2fa7 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -13,47 +13,11 @@
  * See Knuth, volume 3, for more than you want to know about the external
  * sorting algorithm.  Historically, we divided the input into sorted runs
  * using replacement selection, in the form of a priority tree implemented
- * as a heap (essentially his Algorithm 5.2.3H), but now we only do that
- * for the first run, and only if the run would otherwise end up being very
- * short.  We merge the runs using polyphase merge, Knuth's Algorithm
- * 5.4.2D.  The logical "tapes" used by Algorithm D are implemented by
- * logtape.c, which avoids space wastage by recycling disk space as soon
- * as each block is read from its "tape".
- *
- * We do not use Knuth's recommended data structure (Algorithm 5.4.1R) for
- * the replacement selection, because it uses a fixed number of records
- * in memory at all times.  Since we are dealing with tuples that may vary
- * considerably in size, we want to be able to vary the number of records
- * kept in memory to ensure full utilization of the allowed sort memory
- * space.  So, we keep the tuples in a variable-size heap, with the next
- * record to go out at the top of the heap.  Like Algorithm 5.4.1R, each
- * record is stored with the run number that it must go into, and we use
- * (run number, key) as the ordering key for the heap.  When the run number
- * at the top of the heap changes, we know that no more records of the prior
- * run are left in the heap.  Note that there are in practice only ever two
- * distinct run numbers, because since PostgreSQL 9.6, we only use
- * replacement selection to form the first run.
- *
- * In PostgreSQL 9.6, a heap (based on Knuth's Algorithm H, with some small
- * customizations) is only used with the aim of producing just one run,
- * thereby avoiding all merging.  Only the first run can use replacement
- * selection, which is why there are now only two possible valid run
- * numbers, and why heapification is customized to not distinguish between
- * tuples in the second run (those will be quicksorted).  We generally
- * prefer a simple hybrid sort-merge strategy, where runs are sorted in much
- * the same way as the entire input of an internal sort is sorted (using
- * qsort()).  The replacement_sort_tuples GUC controls the limited remaining
- * use of replacement selection for the first run.
- *
- * There are several reasons to favor a hybrid sort-merge strategy.
- * Maintaining a priority tree/heap has poor CPU cache characteristics.
- * Furthermore, the growth in main memory sizes has greatly diminished the
- * value of having runs that are larger than available memory, even in the
- * case where there is partially sorted input and runs can be made far
- * larger by using a heap.  In most cases, a single-pass merge step is all
- * that is required even when runs are no larger than available memory.
- * Avoiding multiple merge passes was traditionally considered to be the
- * major advantage of using replacement selection.
+ * as a heap (essentially his Algorithm 5.2.3H), but now we always use
+ * quicksort for run generation.  We merge the runs using polyphase merge,
+ * Knuth's Algorithm 5.4.2D.  The logical "tapes" used by Algorithm D are
+ * implemented by logtape.c, which avoids space wastage by recycling disk
+ * space as soon as each block is read from its "tape".
  *
  * The approximate amount of memory allowed for any one sort operation
  * is specified in kilobytes by the caller (most pass work_mem).  Initially,
@@ -64,9 +28,8 @@
  * workMem, we begin to emit tuples into sorted runs in temporary tapes.
  * When tuples are dumped in batch after quicksorting, we begin a new run
  * with a new output tape (selected per Algorithm D).  After the end of the
- * input is reached, we dump out remaining tuples in memory into a final run
- * (or two, when replacement selection is still used), then merge the runs
- * using Algorithm D.
+ * input is reached, we dump out remaining tuples in memory into a final run,
+ * then merge the runs using Algorithm D.
  *
  * When merging runs, we use a heap containing just the frontmost tuple from
  * each source run; we repeatedly output the smallest tuple and replace it
@@ -111,8 +74,16 @@
  * above.  Nonetheless, with large workMem we can have many tapes (but not
  * too many -- see the comments in tuplesort_merge_order).
  *
+ * This module supports parallel sorting.  Parallel sorts involve coordination
+ * among one or more worker processes, and a leader process, each with its own
+ * tuplesort state.  The leader process (or, more accurately, the
+ * Tuplesortstate associated with a leader process) creates a full tapeset
+ * consisting of worker tapes with one run to merge; a run for every
+ * worker process.  This is then merged.  Worker processes are guaranteed to
+ * produce exactly one output run from their partial input.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -150,6 +121,10 @@
 #define DATUM_SORT		2
 #define CLUSTER_SORT	3
 
+/* Sort parallel code from state for sort__start probes */
+#define PARALLEL_SORT(state)	((state)->shared == NULL ? 0 : \
+								 (state)->worker >= 0 ? 1 : 2)
+
 /* GUC variables */
 #ifdef TRACE_SORT
 bool		trace_sort = false;
@@ -188,13 +163,8 @@ bool		optimize_bounded_sort = true;
  * described above.  Accordingly, "tuple" is always used in preference to
  * datum1 as the authoritative value for pass-by-reference cases.
  *
- * While building initial runs, tupindex holds the tuple's run number.
- * Historically, the run number could meaningfully distinguish many runs, but
- * it now only distinguishes RUN_FIRST and HEAP_RUN_NEXT, since replacement
- * selection is always abandoned after the first run; no other run number
- * should be represented here.  During merge passes, we re-use it to hold the
- * input tape number that each tuple in the heap was read from.  tupindex goes
- * unused if the sort occurs entirely in memory.
+ * tupindex holds the input tape number that each tuple in the heap was read
+ * from during merge passes.
  */
 typedef struct
 {
@@ -253,15 +223,6 @@ typedef enum
 #define TAPE_BUFFER_OVERHEAD		BLCKSZ
 #define MERGE_BUFFER_SIZE			(BLCKSZ * 32)
 
- /*
-  * Run numbers, used during external sort operations.
-  *
-  * HEAP_RUN_NEXT is only used for SortTuple.tupindex, never state.currentRun.
-  */
-#define RUN_FIRST		0
-#define HEAP_RUN_NEXT	INT_MAX
-#define RUN_SECOND		1
-
 typedef int (*SortTupleComparator) (const SortTuple *a, const SortTuple *b,
 									Tuplesortstate *state);
 
@@ -381,16 +342,8 @@ struct Tuplesortstate
 	void	   *lastReturnedTuple;
 
 	/*
-	 * While building initial runs, this indicates if the replacement
-	 * selection strategy is in use.  When it isn't, then a simple hybrid
-	 * sort-merge strategy is in use instead (runs are quicksorted).
-	 */
-	bool		replaceActive;
-
-	/*
-	 * While building initial runs, this is the current output run number
-	 * (starting at RUN_FIRST).  Afterwards, it is the number of initial runs
-	 * we made.
+	 * While building initial runs, this is the current output run number.
+	 * Afterwards, it is the number of initial runs we made.
 	 */
 	int			currentRun;
 
@@ -433,6 +386,25 @@ struct Tuplesortstate
 	int			markpos_offset; /* saved "current", or offset in tape block */
 	bool		markpos_eof;	/* saved "eof_reached" */
 
+	/*
+	 * These variables are used during parallel sorting.
+	 *
+	 * worker is our worker identifier.  Follows the general convention that
+	 * -1 value relates to a leader tuplesort, and values >= 0 worker
+	 * tuplesorts. (-1 can also be a serial tuplesort.)
+	 *
+	 * shared is mutable shared memory state, which is used to coordinate
+	 * parallel sorts.
+	 *
+	 * nParticipants is the number of worker Tuplesortstates known by the
+	 * leader to have actually been launched, which implies that they must
+	 * finish a run leader can merge.  Typically includes a worker state held
+	 * by the leader process itself.  Set in the leader Tuplesortstate only.
+	 */
+	int			worker;
+	Sharedsort *shared;
+	int			nParticipants;
+
 	/*
 	 * The sortKeys variable is used by every case other than the hash index
 	 * case; it is set by tuplesort_begin_xxx.  tupDesc is only used by the
@@ -494,6 +466,39 @@ struct Tuplesortstate
 #endif
 };
 
+/*
+ * Private mutable state of tuplesort-parallel-operation.  This is allocated
+ * in shared memory.
+ */
+struct Sharedsort
+{
+	/* mutex protects all fields prior to tapes */
+	slock_t		mutex;
+
+	/*
+	 * currentWorker generates ordinal identifier numbers for parallel sort
+	 * workers.  These start from 0, and are always gapless.
+	 *
+	 * Workers increment workersFinished to indicate having finished.  If this
+	 * is equal to state.nParticipants within the leader, leader is ready to
+	 * merge worker runs.
+	 */
+	int			currentWorker;
+	int			workersFinished;
+
+	/* Temporary file space */
+	SharedFileSet fileset;
+
+	/* Size of tapes flexible array */
+	int			nTapes;
+
+	/*
+	 * Tapes array used by workers to report back information needed by the
+	 * leader to concatenate all worker tapes into one for merging
+	 */
+	TapeShare	tapes[FLEXIBLE_ARRAY_MEMBER];
+};
+
 /*
  * Is the given tuple allocated from the slab memory arena?
  */
@@ -524,6 +529,9 @@ struct Tuplesortstate
 #define LACKMEM(state)		((state)->availMem < 0 && !(state)->slabAllocatorUsed)
 #define USEMEM(state,amt)	((state)->availMem -= (amt))
 #define FREEMEM(state,amt)	((state)->availMem += (amt))
+#define SERIAL(state)		((state)->shared == NULL)
+#define WORKER(state)		((state)->shared && (state)->worker != -1)
+#define LEADER(state)		((state)->shared && (state)->worker == -1)
 
 /*
  * NOTES about on-tape representation of tuples:
@@ -580,11 +588,13 @@ struct Tuplesortstate
 	} while(0)
 
 
-static Tuplesortstate *tuplesort_begin_common(int workMem, bool randomAccess);
+static Tuplesortstate *tuplesort_begin_common(int workMem,
+					   SortCoordinate coordinate,
+					   bool randomAccess);
 static void puttuple_common(Tuplesortstate *state, SortTuple *tuple);
 static bool consider_abort_common(Tuplesortstate *state);
-static bool useselection(Tuplesortstate *state);
-static void inittapes(Tuplesortstate *state);
+static void inittapes(Tuplesortstate *state, bool mergeruns);
+static void inittapestate(Tuplesortstate *state, int maxTapes);
 static void selectnewtape(Tuplesortstate *state);
 static void init_slab_allocator(Tuplesortstate *state, int numSlots);
 static void mergeruns(Tuplesortstate *state);
@@ -592,15 +602,12 @@ static void mergeonerun(Tuplesortstate *state);
 static void beginmerge(Tuplesortstate *state);
 static bool mergereadnext(Tuplesortstate *state, int srcTape, SortTuple *stup);
 static void dumptuples(Tuplesortstate *state, bool alltuples);
-static void dumpbatch(Tuplesortstate *state, bool alltuples);
 static void make_bounded_heap(Tuplesortstate *state);
 static void sort_bounded_heap(Tuplesortstate *state);
 static void tuplesort_sort_memtuples(Tuplesortstate *state);
-static void tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple,
-					  bool checkIndex);
-static void tuplesort_heap_replace_top(Tuplesortstate *state, SortTuple *tuple,
-						   bool checkIndex);
-static void tuplesort_heap_delete_top(Tuplesortstate *state, bool checkIndex);
+static void tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple);
+static void tuplesort_heap_replace_top(Tuplesortstate *state, SortTuple *tuple);
+static void tuplesort_heap_delete_top(Tuplesortstate *state);
 static void reversedirection(Tuplesortstate *state);
 static unsigned int getlen(Tuplesortstate *state, int tapenum, bool eofOK);
 static void markrunend(Tuplesortstate *state, int tapenum);
@@ -635,6 +642,10 @@ static void writetup_datum(Tuplesortstate *state, int tapenum,
 			   SortTuple *stup);
 static void readtup_datum(Tuplesortstate *state, SortTuple *stup,
 			  int tapenum, unsigned int len);
+static int	worker_get_identifier(Tuplesortstate *state);
+static void worker_freeze_result_tape(Tuplesortstate *state);
+static void worker_nomergeruns(Tuplesortstate *state);
+static void leader_takeover_tapes(Tuplesortstate *state);
 static void free_sort_tuple(Tuplesortstate *state, SortTuple *stup);
 
 /*
@@ -667,13 +678,18 @@ static void free_sort_tuple(Tuplesortstate *state, SortTuple *stup);
  */
 
 static Tuplesortstate *
-tuplesort_begin_common(int workMem, bool randomAccess)
+tuplesort_begin_common(int workMem, SortCoordinate coordinate,
+					   bool randomAccess)
 {
 	Tuplesortstate *state;
 	MemoryContext sortcontext;
 	MemoryContext tuplecontext;
 	MemoryContext oldcontext;
 
+	/* See leader_takeover_tapes() remarks on randomAccess support */
+	if (coordinate && randomAccess)
+		elog(ERROR, "random access disallowed under parallel sort");
+
 	/*
 	 * Create a working memory context for this sort operation. All data
 	 * needed by the sort will live inside this context.
@@ -713,7 +729,14 @@ tuplesort_begin_common(int workMem, bool randomAccess)
 	state->bounded = false;
 	state->tuples = true;
 	state->boundUsed = false;
-	state->allowedMem = workMem * (int64) 1024;
+
+	/*
+	 * workMem is forced to be at least 64KB, the current minimum valid value
+	 * for the work_mem GUC.  This is a defense against parallel sort callers
+	 * that divide out memory among many workers in a way that leaves each
+	 * with very little memory.
+	 */
+	state->allowedMem = Max(workMem, 64) * (int64) 1024;
 	state->availMem = state->allowedMem;
 	state->sortcontext = sortcontext;
 	state->tuplecontext = tuplecontext;
@@ -738,7 +761,7 @@ tuplesort_begin_common(int workMem, bool randomAccess)
 	if (LACKMEM(state))
 		elog(ERROR, "insufficient memory allowed for sort");
 
-	state->currentRun = RUN_FIRST;
+	state->currentRun = 0;
 
 	/*
 	 * maxTapes, tapeRange, and Algorithm D variables will be initialized by
@@ -747,6 +770,33 @@ tuplesort_begin_common(int workMem, bool randomAccess)
 
 	state->result_tape = -1;	/* flag that result tape has not been formed */
 
+	/*
+	 * Initialize parallel-related state based on coordination information
+	 * from caller
+	 */
+	if (!coordinate)
+	{
+		/* Serial sort */
+		state->shared = NULL;
+		state->worker = -1;
+		state->nParticipants = -1;
+	}
+	else if (coordinate->isWorker)
+	{
+		/* Parallel worker produces exactly one final run from all input */
+		state->shared = coordinate->sharedsort;
+		state->worker = worker_get_identifier(state);
+		state->nParticipants = -1;
+	}
+	else
+	{
+		/* Parallel leader state only used for final merge */
+		state->shared = coordinate->sharedsort;
+		state->worker = -1;
+		state->nParticipants = coordinate->nParticipants;
+		Assert(state->nParticipants >= 1);
+	}
+
 	MemoryContextSwitchTo(oldcontext);
 
 	return state;
@@ -757,9 +807,10 @@ tuplesort_begin_heap(TupleDesc tupDesc,
 					 int nkeys, AttrNumber *attNums,
 					 Oid *sortOperators, Oid *sortCollations,
 					 bool *nullsFirstFlags,
-					 int workMem, bool randomAccess)
+					 int workMem, SortCoordinate coordinate, bool randomAccess)
 {
-	Tuplesortstate *state = tuplesort_begin_common(workMem, randomAccess);
+	Tuplesortstate *state = tuplesort_begin_common(workMem, coordinate,
+												   randomAccess);
 	MemoryContext oldcontext;
 	int			i;
 
@@ -780,7 +831,8 @@ tuplesort_begin_heap(TupleDesc tupDesc,
 								false,	/* no unique check */
 								nkeys,
 								workMem,
-								randomAccess);
+								randomAccess,
+								PARALLEL_SORT(state));
 
 	state->comparetup = comparetup_heap;
 	state->copytup = copytup_heap;
@@ -827,9 +879,11 @@ tuplesort_begin_heap(TupleDesc tupDesc,
 Tuplesortstate *
 tuplesort_begin_cluster(TupleDesc tupDesc,
 						Relation indexRel,
-						int workMem, bool randomAccess)
+						int workMem,
+						SortCoordinate coordinate, bool randomAccess)
 {
-	Tuplesortstate *state = tuplesort_begin_common(workMem, randomAccess);
+	Tuplesortstate *state = tuplesort_begin_common(workMem, coordinate,
+												   randomAccess);
 	ScanKey		indexScanKey;
 	MemoryContext oldcontext;
 	int			i;
@@ -852,7 +906,8 @@ tuplesort_begin_cluster(TupleDesc tupDesc,
 								false,	/* no unique check */
 								state->nKeys,
 								workMem,
-								randomAccess);
+								randomAccess,
+								PARALLEL_SORT(state));
 
 	state->comparetup = comparetup_cluster;
 	state->copytup = copytup_cluster;
@@ -920,9 +975,12 @@ Tuplesortstate *
 tuplesort_begin_index_btree(Relation heapRel,
 							Relation indexRel,
 							bool enforceUnique,
-							int workMem, bool randomAccess)
+							int workMem,
+							SortCoordinate coordinate,
+							bool randomAccess)
 {
-	Tuplesortstate *state = tuplesort_begin_common(workMem, randomAccess);
+	Tuplesortstate *state = tuplesort_begin_common(workMem, coordinate,
+												   randomAccess);
 	ScanKey		indexScanKey;
 	MemoryContext oldcontext;
 	int			i;
@@ -943,7 +1001,8 @@ tuplesort_begin_index_btree(Relation heapRel,
 								enforceUnique,
 								state->nKeys,
 								workMem,
-								randomAccess);
+								randomAccess,
+								PARALLEL_SORT(state));
 
 	state->comparetup = comparetup_index_btree;
 	state->copytup = copytup_index;
@@ -997,9 +1056,12 @@ tuplesort_begin_index_hash(Relation heapRel,
 						   uint32 high_mask,
 						   uint32 low_mask,
 						   uint32 max_buckets,
-						   int workMem, bool randomAccess)
+						   int workMem,
+						   SortCoordinate coordinate,
+						   bool randomAccess)
 {
-	Tuplesortstate *state = tuplesort_begin_common(workMem, randomAccess);
+	Tuplesortstate *state = tuplesort_begin_common(workMem, coordinate,
+												   randomAccess);
 	MemoryContext oldcontext;
 
 	oldcontext = MemoryContextSwitchTo(state->sortcontext);
@@ -1036,10 +1098,11 @@ tuplesort_begin_index_hash(Relation heapRel,
 
 Tuplesortstate *
 tuplesort_begin_datum(Oid datumType, Oid sortOperator, Oid sortCollation,
-					  bool nullsFirstFlag,
-					  int workMem, bool randomAccess)
+					  bool nullsFirstFlag, int workMem,
+					  SortCoordinate coordinate, bool randomAccess)
 {
-	Tuplesortstate *state = tuplesort_begin_common(workMem, randomAccess);
+	Tuplesortstate *state = tuplesort_begin_common(workMem, coordinate,
+												   randomAccess);
 	MemoryContext oldcontext;
 	int16		typlen;
 	bool		typbyval;
@@ -1059,7 +1122,8 @@ tuplesort_begin_datum(Oid datumType, Oid sortOperator, Oid sortCollation,
 								false,	/* no unique check */
 								1,
 								workMem,
-								randomAccess);
+								randomAccess,
+								PARALLEL_SORT(state));
 
 	state->comparetup = comparetup_datum;
 	state->copytup = copytup_datum;
@@ -1117,7 +1181,7 @@ tuplesort_begin_datum(Oid datumType, Oid sortOperator, Oid sortCollation,
  * delayed calls at the moment.)
  *
  * This is a hint only. The tuplesort may still return more tuples than
- * requested.
+ * requested.  Parallel leader tuplesorts will always ignore the hint.
  */
 void
 tuplesort_set_bound(Tuplesortstate *state, int64 bound)
@@ -1126,6 +1190,7 @@ tuplesort_set_bound(Tuplesortstate *state, int64 bound)
 	Assert(state->status == TSS_INITIAL);
 	Assert(state->memtupcount == 0);
 	Assert(!state->bounded);
+	Assert(!WORKER(state));
 
 #ifdef DEBUG_BOUNDED_SORT
 	/* Honor GUC setting that disables the feature (for easy testing) */
@@ -1133,6 +1198,10 @@ tuplesort_set_bound(Tuplesortstate *state, int64 bound)
 		return;
 #endif
 
+	/* Parallel leader ignores hint */
+	if (LEADER(state))
+		return;
+
 	/* We want to be able to compute bound * 2, so limit the setting */
 	if (bound > (int64) (INT_MAX / 2))
 		return;
@@ -1191,11 +1260,13 @@ tuplesort_end(Tuplesortstate *state)
 	if (trace_sort)
 	{
 		if (state->tapeset)
-			elog(LOG, "external sort ended, %ld disk blocks used: %s",
-				 spaceUsed, pg_rusage_show(&state->ru_start));
+			elog(LOG, "%s of %d ended, %ld disk blocks used: %s",
+				 SERIAL(state) ? "external sort" : "parallel external sort",
+				 state->worker, spaceUsed, pg_rusage_show(&state->ru_start));
 		else
-			elog(LOG, "internal sort ended, %ld KB used: %s",
-				 spaceUsed, pg_rusage_show(&state->ru_start));
+			elog(LOG, "%s of %d ended, %ld KB used: %s",
+				 SERIAL(state) ? "internal sort" : "unperformed parallel sort",
+				 state->worker, spaceUsed, pg_rusage_show(&state->ru_start));
 	}
 
 	TRACE_POSTGRESQL_SORT_DONE(state->tapeset != NULL, spaceUsed);
@@ -1229,7 +1300,7 @@ tuplesort_end(Tuplesortstate *state)
 /*
  * Grow the memtuples[] array, if possible within our memory constraint.  We
  * must not exceed INT_MAX tuples in memory or the caller-provided memory
- * limit.  Return TRUE if we were able to enlarge the array, FALSE if not.
+ * limit.  Return true if we were able to enlarge the array, false if not.
  *
  * Normally, at each increment we double the size of the array.  When doing
  * that would exceed a limit, we attempt one last, smaller increase (and then
@@ -1566,6 +1637,8 @@ tuplesort_putdatum(Tuplesortstate *state, Datum val, bool isNull)
 static void
 puttuple_common(Tuplesortstate *state, SortTuple *tuple)
 {
+	Assert(!LEADER(state));
+
 	switch (state->status)
 	{
 		case TSS_INITIAL:
@@ -1619,10 +1692,10 @@ puttuple_common(Tuplesortstate *state, SortTuple *tuple)
 			/*
 			 * Nope; time to switch to tape-based operation.
 			 */
-			inittapes(state);
+			inittapes(state, true);
 
 			/*
-			 * Dump tuples until we are back under the limit.
+			 * Dump all tuples.
 			 */
 			dumptuples(state, false);
 			break;
@@ -1647,74 +1720,19 @@ puttuple_common(Tuplesortstate *state, SortTuple *tuple)
 			{
 				/* discard top of heap, replacing it with the new tuple */
 				free_sort_tuple(state, &state->memtuples[0]);
-				tuple->tupindex = 0;	/* not used */
-				tuplesort_heap_replace_top(state, tuple, false);
+				tuplesort_heap_replace_top(state, tuple);
 			}
 			break;
 
 		case TSS_BUILDRUNS:
 
 			/*
-			 * Insert the tuple into the heap, with run number currentRun if
-			 * it can go into the current run, else HEAP_RUN_NEXT.  The tuple
-			 * can go into the current run if it is >= the first
-			 * not-yet-output tuple.  (Actually, it could go into the current
-			 * run if it is >= the most recently output tuple ... but that
-			 * would require keeping around the tuple we last output, and it's
-			 * simplest to let writetup free each tuple as soon as it's
-			 * written.)
-			 *
-			 * Note that this only applies when:
-			 *
-			 * - currentRun is RUN_FIRST
-			 *
-			 * - Replacement selection is in use (typically it is never used).
-			 *
-			 * When these two conditions are not both true, all tuples are
-			 * appended indifferently, much like the TSS_INITIAL case.
-			 *
-			 * There should always be room to store the incoming tuple.
+			 * Save the tuple into the unsorted array (there must be space)
 			 */
-			Assert(!state->replaceActive || state->memtupcount > 0);
-			if (state->replaceActive &&
-				COMPARETUP(state, tuple, &state->memtuples[0]) >= 0)
-			{
-				Assert(state->currentRun == RUN_FIRST);
-
-				/*
-				 * Insert tuple into first, fully heapified run.
-				 *
-				 * Unlike classic replacement selection, which this module was
-				 * previously based on, only RUN_FIRST tuples are fully
-				 * heapified.  Any second/next run tuples are appended
-				 * indifferently.  While HEAP_RUN_NEXT tuples may be sifted
-				 * out of the way of first run tuples, COMPARETUP() will never
-				 * be called for the run's tuples during sifting (only our
-				 * initial COMPARETUP() call is required for the tuple, to
-				 * determine that the tuple does not belong in RUN_FIRST).
-				 */
-				tuple->tupindex = state->currentRun;
-				tuplesort_heap_insert(state, tuple, true);
-			}
-			else
-			{
-				/*
-				 * Tuple was determined to not belong to heapified RUN_FIRST,
-				 * or replacement selection not in play.  Append the tuple to
-				 * memtuples indifferently.
-				 *
-				 * dumptuples() does not trust that the next run's tuples are
-				 * heapified.  Anything past the first run will always be
-				 * quicksorted even when replacement selection is initially
-				 * used.  (When it's never used, every tuple still takes this
-				 * path.)
-				 */
-				tuple->tupindex = HEAP_RUN_NEXT;
-				state->memtuples[state->memtupcount++] = *tuple;
-			}
+			state->memtuples[state->memtupcount++] = *tuple;
 
 			/*
-			 * If we are over the memory limit, dump tuples till we're under.
+			 * If we are over the memory limit, dump all tuples.
 			 */
 			dumptuples(state, false);
 			break;
@@ -1776,8 +1794,8 @@ tuplesort_performsort(Tuplesortstate *state)
 
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "performsort starting: %s",
-			 pg_rusage_show(&state->ru_start));
+		elog(LOG, "performsort of %d starting: %s",
+			 state->worker, pg_rusage_show(&state->ru_start));
 #endif
 
 	switch (state->status)
@@ -1786,14 +1804,39 @@ tuplesort_performsort(Tuplesortstate *state)
 
 			/*
 			 * We were able to accumulate all the tuples within the allowed
-			 * amount of memory.  Just qsort 'em and we're done.
+			 * amount of memory, or leader to take over worker tapes
 			 */
-			tuplesort_sort_memtuples(state);
+			if (SERIAL(state))
+			{
+				/* Just qsort 'em and we're done */
+				tuplesort_sort_memtuples(state);
+				state->status = TSS_SORTEDINMEM;
+			}
+			else if (WORKER(state))
+			{
+				/*
+				 * Parallel workers must still dump out tuples to tape.  No
+				 * merge is required to produce single output run, though.
+				 */
+				inittapes(state, false);
+				dumptuples(state, true);
+				worker_nomergeruns(state);
+				state->status = TSS_SORTEDONTAPE;
+			}
+			else
+			{
+				/*
+				 * Leader will take over worker tapes and merge worker runs.
+				 * Note that mergeruns sets the correct state->status.
+				 */
+				leader_takeover_tapes(state);
+				mergeruns(state);
+			}
 			state->current = 0;
 			state->eof_reached = false;
+			state->markpos_block = 0L;
 			state->markpos_offset = 0;
 			state->markpos_eof = false;
-			state->status = TSS_SORTEDINMEM;
 			break;
 
 		case TSS_BOUNDED:
@@ -1816,8 +1859,8 @@ tuplesort_performsort(Tuplesortstate *state)
 			/*
 			 * Finish tape-based sort.  First, flush all tuples remaining in
 			 * memory out to tape; then merge until we have a single remaining
-			 * run (or, if !randomAccess, one run per tape). Note that
-			 * mergeruns sets the correct state->status.
+			 * run (or, if !randomAccess and !WORKER(), one run per tape).
+			 * Note that mergeruns sets the correct state->status.
 			 */
 			dumptuples(state, true);
 			mergeruns(state);
@@ -1836,12 +1879,12 @@ tuplesort_performsort(Tuplesortstate *state)
 	if (trace_sort)
 	{
 		if (state->status == TSS_FINALMERGE)
-			elog(LOG, "performsort done (except %d-way final merge): %s",
-				 state->activeTapes,
+			elog(LOG, "performsort of %d done (except %d-way final merge): %s",
+				 state->worker, state->activeTapes,
 				 pg_rusage_show(&state->ru_start));
 		else
-			elog(LOG, "performsort done: %s",
-				 pg_rusage_show(&state->ru_start));
+			elog(LOG, "performsort of %d done: %s",
+				 state->worker, pg_rusage_show(&state->ru_start));
 	}
 #endif
 
@@ -1850,7 +1893,7 @@ tuplesort_performsort(Tuplesortstate *state)
 
 /*
  * Internal routine to fetch the next tuple in either forward or back
- * direction into *stup.  Returns FALSE if no more tuples.
+ * direction into *stup.  Returns false if no more tuples.
  * Returned tuple belongs to tuplesort memory context, and must not be freed
  * by caller.  Note that fetched tuple is stored in memory that may be
  * recycled by any future fetch.
@@ -1862,6 +1905,8 @@ tuplesort_gettuple_common(Tuplesortstate *state, bool forward,
 	unsigned int tuplen;
 	size_t		nmoved;
 
+	Assert(!WORKER(state));
+
 	switch (state->status)
 	{
 		case TSS_SORTEDINMEM:
@@ -2068,7 +2113,7 @@ tuplesort_gettuple_common(Tuplesortstate *state, bool forward,
 					 * If no more data, we've reached end of run on this tape.
 					 * Remove the top node from the heap.
 					 */
-					tuplesort_heap_delete_top(state, false);
+					tuplesort_heap_delete_top(state);
 
 					/*
 					 * Rewind to free the read buffer.  It'd go away at the
@@ -2079,7 +2124,7 @@ tuplesort_gettuple_common(Tuplesortstate *state, bool forward,
 					return true;
 				}
 				newtup.tupindex = srcTape;
-				tuplesort_heap_replace_top(state, &newtup, false);
+				tuplesort_heap_replace_top(state, &newtup);
 				return true;
 			}
 			return false;
@@ -2092,10 +2137,10 @@ tuplesort_gettuple_common(Tuplesortstate *state, bool forward,
 
 /*
  * Fetch the next tuple in either forward or back direction.
- * If successful, put tuple in slot and return TRUE; else, clear the slot
- * and return FALSE.
+ * If successful, put tuple in slot and return true; else, clear the slot
+ * and return false.
  *
- * Caller may optionally be passed back abbreviated value (on TRUE return
+ * Caller may optionally be passed back abbreviated value (on true return
  * value) when abbreviation was used, which can be used to cheaply avoid
  * equality checks that might otherwise be required.  Caller can safely make a
  * determination of "non-equal tuple" based on simple binary inequality.  A
@@ -2182,13 +2227,13 @@ tuplesort_getindextuple(Tuplesortstate *state, bool forward)
 
 /*
  * Fetch the next Datum in either forward or back direction.
- * Returns FALSE if no more datums.
+ * Returns false if no more datums.
  *
  * If the Datum is pass-by-ref type, the returned value is freshly palloc'd
  * and is now owned by the caller (this differs from similar routines for
  * other types of tuplesorts).
  *
- * Caller may optionally be passed back abbreviated value (on TRUE return
+ * Caller may optionally be passed back abbreviated value (on true return
  * value) when abbreviation was used, which can be used to cheaply avoid
  * equality checks that might otherwise be required.  Caller can safely make a
  * determination of "non-equal tuple" based on simple binary inequality.  A
@@ -2232,7 +2277,7 @@ tuplesort_getdatum(Tuplesortstate *state, bool forward,
 /*
  * Advance over N tuples in either forward or back direction,
  * without returning any data.  N==0 is a no-op.
- * Returns TRUE if successful, FALSE if ran out of tuples.
+ * Returns true if successful, false if ran out of tuples.
  */
 bool
 tuplesort_skiptuples(Tuplesortstate *state, int64 ntuples, bool forward)
@@ -2245,6 +2290,7 @@ tuplesort_skiptuples(Tuplesortstate *state, int64 ntuples, bool forward)
 	 */
 	Assert(forward);
 	Assert(ntuples >= 0);
+	Assert(!WORKER(state));
 
 	switch (state->status)
 	{
@@ -2336,121 +2382,45 @@ tuplesort_merge_order(int64 allowedMem)
 	return mOrder;
 }
 
-/*
- * useselection - determine algorithm to use to sort first run.
- *
- * It can sometimes be useful to use the replacement selection algorithm if it
- * results in one large run, and there is little available workMem.  See
- * remarks on RUN_SECOND optimization within dumptuples().
- */
-static bool
-useselection(Tuplesortstate *state)
-{
-	/*
-	 * memtupsize might be noticeably higher than memtupcount here in atypical
-	 * cases.  It seems slightly preferable to not allow recent outliers to
-	 * impact this determination.  Note that caller's trace_sort output
-	 * reports memtupcount instead.
-	 */
-	if (state->memtupsize <= replacement_sort_tuples)
-		return true;
-
-	return false;
-}
-
 /*
  * inittapes - initialize for tape sorting.
  *
- * This is called only if we have found we don't have room to sort in memory.
+ * This is called only if we have found we won't sort in memory.
  */
 static void
-inittapes(Tuplesortstate *state)
+inittapes(Tuplesortstate *state, bool mergeruns)
 {
 	int			maxTapes,
 				j;
-	int64		tapeSpace;
-
-	/* Compute number of tapes to use: merge order plus 1 */
-	maxTapes = tuplesort_merge_order(state->allowedMem) + 1;
-
-	state->maxTapes = maxTapes;
-	state->tapeRange = maxTapes - 1;
-
-#ifdef TRACE_SORT
-	if (trace_sort)
-		elog(LOG, "switching to external sort with %d tapes: %s",
-			 maxTapes, pg_rusage_show(&state->ru_start));
-#endif
 
-	/*
-	 * Decrease availMem to reflect the space needed for tape buffers, when
-	 * writing the initial runs; but don't decrease it to the point that we
-	 * have no room for tuples.  (That case is only likely to occur if sorting
-	 * pass-by-value Datums; in all other scenarios the memtuples[] array is
-	 * unlikely to occupy more than half of allowedMem.  In the pass-by-value
-	 * case it's not important to account for tuple space, so we don't care if
-	 * LACKMEM becomes inaccurate.)
-	 */
-	tapeSpace = (int64) maxTapes * TAPE_BUFFER_OVERHEAD;
+	Assert(!LEADER(state));
 
-	if (tapeSpace + GetMemoryChunkSpace(state->memtuples) < state->allowedMem)
-		USEMEM(state, tapeSpace);
-
-	/*
-	 * Make sure that the temp file(s) underlying the tape set are created in
-	 * suitable temp tablespaces.
-	 */
-	PrepareTempTablespaces();
-
-	/*
-	 * Create the tape set and allocate the per-tape data arrays.
-	 */
-	state->tapeset = LogicalTapeSetCreate(maxTapes);
-
-	state->mergeactive = (bool *) palloc0(maxTapes * sizeof(bool));
-	state->tp_fib = (int *) palloc0(maxTapes * sizeof(int));
-	state->tp_runs = (int *) palloc0(maxTapes * sizeof(int));
-	state->tp_dummy = (int *) palloc0(maxTapes * sizeof(int));
-	state->tp_tapenum = (int *) palloc0(maxTapes * sizeof(int));
-
-	/*
-	 * Give replacement selection a try based on user setting.  There will be
-	 * a switch to a simple hybrid sort-merge strategy after the first run
-	 * (iff we could not output one long run).
-	 */
-	state->replaceActive = useselection(state);
-
-	if (state->replaceActive)
+	if (mergeruns)
 	{
-		/*
-		 * Convert the unsorted contents of memtuples[] into a heap. Each
-		 * tuple is marked as belonging to run number zero.
-		 *
-		 * NOTE: we pass false for checkIndex since there's no point in
-		 * comparing indexes in this step, even though we do intend the
-		 * indexes to be part of the sort key...
-		 */
-		int			ntuples = state->memtupcount;
+		/* Compute number of tapes to use: merge order plus 1 */
+		maxTapes = tuplesort_merge_order(state->allowedMem) + 1;
+	}
+	else
+	{
+		/* Workers can sometimes produce single run, output without merge */
+		Assert(WORKER(state));
+		maxTapes = MINORDER + 1;
+	}
 
 #ifdef TRACE_SORT
-		if (trace_sort)
-			elog(LOG, "replacement selection will sort %d first run tuples",
-				 state->memtupcount);
+	if (trace_sort)
+		elog(LOG, "%d switching to external sort with %d tapes: %s",
+			 state->worker, maxTapes, pg_rusage_show(&state->ru_start));
 #endif
-		state->memtupcount = 0; /* make the heap empty */
 
-		for (j = 0; j < ntuples; j++)
-		{
-			/* Must copy source tuple to avoid possible overwrite */
-			SortTuple	stup = state->memtuples[j];
+	/* Create the tape set and allocate the per-tape data arrays */
+	inittapestate(state, maxTapes);
+	state->tapeset =
+		LogicalTapeSetCreate(maxTapes, NULL,
+							 state->shared ? &state->shared->fileset : NULL,
+							 state->worker);
 
-			stup.tupindex = RUN_FIRST;
-			tuplesort_heap_insert(state, &stup, false);
-		}
-		Assert(state->memtupcount == ntuples);
-	}
-
-	state->currentRun = RUN_FIRST;
+	state->currentRun = 0;
 
 	/*
 	 * Initialize variables of Algorithm D (step D1).
@@ -2471,6 +2441,47 @@ inittapes(Tuplesortstate *state)
 	state->status = TSS_BUILDRUNS;
 }
 
+/*
+ * inittapestate - initialize generic tape management state
+ */
+static void
+inittapestate(Tuplesortstate *state, int maxTapes)
+{
+	int64		tapeSpace;
+
+	/*
+	 * Decrease availMem to reflect the space needed for tape buffers; but
+	 * don't decrease it to the point that we have no room for tuples. (That
+	 * case is only likely to occur if sorting pass-by-value Datums; in all
+	 * other scenarios the memtuples[] array is unlikely to occupy more than
+	 * half of allowedMem.  In the pass-by-value case it's not important to
+	 * account for tuple space, so we don't care if LACKMEM becomes
+	 * inaccurate.)
+	 */
+	tapeSpace = (int64) maxTapes * TAPE_BUFFER_OVERHEAD;
+
+	if (tapeSpace + GetMemoryChunkSpace(state->memtuples) < state->allowedMem)
+		USEMEM(state, tapeSpace);
+
+	/*
+	 * Make sure that the temp file(s) underlying the tape set are created in
+	 * suitable temp tablespaces.  For parallel sorts, this should have been
+	 * called already, but it doesn't matter if it is called a second time.
+	 */
+	PrepareTempTablespaces();
+
+	state->mergeactive = (bool *) palloc0(maxTapes * sizeof(bool));
+	state->tp_fib = (int *) palloc0(maxTapes * sizeof(int));
+	state->tp_runs = (int *) palloc0(maxTapes * sizeof(int));
+	state->tp_dummy = (int *) palloc0(maxTapes * sizeof(int));
+	state->tp_tapenum = (int *) palloc0(maxTapes * sizeof(int));
+
+	/* Record # of tapes allocated (for duration of sort) */
+	state->maxTapes = maxTapes;
+	/* Record maximum # of tapes usable as inputs when merging */
+	state->tapeRange = maxTapes - 1;
+}
+
 /*
  * selectnewtape -- select new tape for new initial run.
  *
@@ -2624,22 +2635,6 @@ mergeruns(Tuplesortstate *state)
 	else
 		init_slab_allocator(state, 0);
 
-	/*
-	 * If we produced only one initial run (quite likely if the total data
-	 * volume is between 1X and 2X workMem when replacement selection is used,
-	 * but something we particularly count on when input is presorted), we can
-	 * just use that tape as the finished output, rather than doing a useless
-	 * merge.  (This obvious optimization is not in Knuth's algorithm.)
-	 */
-	if (state->currentRun == RUN_SECOND)
-	{
-		state->result_tape = state->tp_tapenum[state->destTape];
-		/* must freeze and rewind the finished output tape */
-		LogicalTapeFreeze(state->tapeset, state->result_tape);
-		state->status = TSS_SORTEDONTAPE;
-		return;
-	}
-
 	/*
 	 * Allocate a new 'memtuples' array, for the heap.  It will hold one tuple
 	 * from each input tape.
@@ -2652,11 +2647,6 @@ mergeruns(Tuplesortstate *state)
 	 * Use all the remaining memory we have available for read buffers among
 	 * the input tapes.
 	 *
-	 * We do this only after checking for the case that we produced only one
-	 * initial run, because there is no need to use a large read buffer when
-	 * we're reading from a single tape.  With one tape, the I/O pattern will
-	 * be the same regardless of the buffer size.
-	 *
 	 * We don't try to "rebalance" the memory among tapes, when we start a new
 	 * merge phase, even if some tapes are inactive in the new phase.  That
 	 * would be hard, because logtape.c doesn't know where one run ends and
@@ -2669,8 +2659,8 @@ mergeruns(Tuplesortstate *state)
 	 */
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "using " INT64_FORMAT " KB of memory for read buffers among %d input tapes",
-			 (state->availMem) / 1024, numInputTapes);
+		elog(LOG, "%d using " INT64_FORMAT " KB of memory for read buffers among %d input tapes",
+			 state->worker, state->availMem / 1024, numInputTapes);
 #endif
 
 	state->read_buffer_size = Max(state->availMem / numInputTapes, 0);
@@ -2688,7 +2678,7 @@ mergeruns(Tuplesortstate *state)
 		 * pass remains.  If we don't have to produce a materialized sorted
 		 * tape, we can stop at this point and do the final merge on-the-fly.
 		 */
-		if (!state->randomAccess)
+		if (!state->randomAccess && !WORKER(state))
 		{
 			bool		allOneRun = true;
 
@@ -2773,7 +2763,10 @@ mergeruns(Tuplesortstate *state)
 	 * a waste of cycles anyway...
 	 */
 	state->result_tape = state->tp_tapenum[state->tapeRange];
-	LogicalTapeFreeze(state->tapeset, state->result_tape);
+	if (!WORKER(state))
+		LogicalTapeFreeze(state->tapeset, state->result_tape, NULL);
+	else
+		worker_freeze_result_tape(state);
 	state->status = TSS_SORTEDONTAPE;
 
 	/* Release the read buffers of all the other tapes, by rewinding them. */
@@ -2826,11 +2819,11 @@ mergeonerun(Tuplesortstate *state)
 		if (mergereadnext(state, srcTape, &stup))
 		{
 			stup.tupindex = srcTape;
-			tuplesort_heap_replace_top(state, &stup, false);
+			tuplesort_heap_replace_top(state, &stup);
 
 		}
 		else
-			tuplesort_heap_delete_top(state, false);
+			tuplesort_heap_delete_top(state);
 	}
 
 	/*
@@ -2842,8 +2835,8 @@ mergeonerun(Tuplesortstate *state)
 
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "finished %d-way merge step: %s", state->activeTapes,
-			 pg_rusage_show(&state->ru_start));
+		elog(LOG, "%d finished %d-way merge step: %s", state->worker,
+			 state->activeTapes, pg_rusage_show(&state->ru_start));
 #endif
 }
 
@@ -2892,7 +2885,7 @@ beginmerge(Tuplesortstate *state)
 		if (mergereadnext(state, srcTape, &tup))
 		{
 			tup.tupindex = srcTape;
-			tuplesort_heap_insert(state, &tup, false);
+			tuplesort_heap_insert(state, &tup);
 		}
 	}
 }
@@ -2922,124 +2915,25 @@ mergereadnext(Tuplesortstate *state, int srcTape, SortTuple *stup)
 }
 
 /*
- * dumptuples - remove tuples from memtuples and write to tape
- *
- * This is used during initial-run building, but not during merging.
+ * dumptuples - remove tuples from memtuples and write initial run to tape
  *
- * When alltuples = false and replacement selection is still active, dump
- * only enough tuples to get under the availMem limit (and leave at least
- * one tuple in memtuples, since puttuple will then assume it is a heap that
- * has a tuple to compare to).  We always insist there be at least one free
- * slot in the memtuples[] array.
- *
- * When alltuples = true, dump everything currently in memory.  (This
- * case is only used at end of input data, although in practice only the
- * first run could fail to dump all tuples when we LACKMEM(), and only
- * when replacement selection is active.)
- *
- * If, when replacement selection is active, we see that the tuple run
- * number at the top of the heap has changed, start a new run.  This must be
- * the first run, because replacement selection is always abandoned for all
- * further runs.
+ * When alltuples = true, dump everything currently in memory.  (This case is
+ * only used at end of input data.)
  */
 static void
 dumptuples(Tuplesortstate *state, bool alltuples)
-{
-	while (alltuples ||
-		   (LACKMEM(state) && state->memtupcount > 1) ||
-		   state->memtupcount >= state->memtupsize)
-	{
-		if (state->replaceActive)
-		{
-			/*
-			 * Still holding out for a case favorable to replacement
-			 * selection. Still incrementally spilling using heap.
-			 *
-			 * Dump the heap's frontmost entry, and remove it from the heap.
-			 */
-			Assert(state->memtupcount > 0);
-			WRITETUP(state, state->tp_tapenum[state->destTape],
-					 &state->memtuples[0]);
-			tuplesort_heap_delete_top(state, true);
-		}
-		else
-		{
-			/*
-			 * Once committed to quicksorting runs, never incrementally spill
-			 */
-			dumpbatch(state, alltuples);
-			break;
-		}
-
-		/*
-		 * If top run number has changed, we've finished the current run (this
-		 * can only be the first run), and will no longer spill incrementally.
-		 */
-		if (state->memtupcount == 0 ||
-			state->memtuples[0].tupindex == HEAP_RUN_NEXT)
-		{
-			markrunend(state, state->tp_tapenum[state->destTape]);
-			Assert(state->currentRun == RUN_FIRST);
-			state->currentRun++;
-			state->tp_runs[state->destTape]++;
-			state->tp_dummy[state->destTape]--; /* per Alg D step D2 */
-
-#ifdef TRACE_SORT
-			if (trace_sort)
-				elog(LOG, "finished incrementally writing %s run %d to tape %d: %s",
-					 (state->memtupcount == 0) ? "only" : "first",
-					 state->currentRun, state->destTape,
-					 pg_rusage_show(&state->ru_start));
-#endif
-
-			/*
-			 * Done if heap is empty, which is possible when there is only one
-			 * long run.
-			 */
-			Assert(state->currentRun == RUN_SECOND);
-			if (state->memtupcount == 0)
-			{
-				/*
-				 * Replacement selection best case; no final merge required,
-				 * because there was only one initial run (second run has no
-				 * tuples).  See RUN_SECOND case in mergeruns().
-				 */
-				break;
-			}
-
-			/*
-			 * Abandon replacement selection for second run (as well as any
-			 * subsequent runs).
-			 */
-			state->replaceActive = false;
-
-			/*
-			 * First tuple of next run should not be heapified, and so will
-			 * bear placeholder run number.  In practice this must actually be
-			 * the second run, which just became the currentRun, so we're
-			 * clear to quicksort and dump the tuples in batch next time
-			 * memtuples becomes full.
-			 */
-			Assert(state->memtuples[0].tupindex == HEAP_RUN_NEXT);
-			selectnewtape(state);
-		}
-	}
-}
-
-/*
- * dumpbatch - sort and dump all memtuples, forming one run on tape
- *
- * Second or subsequent runs are never heapified by this module (although
- * heapification still respects run number differences between the first and
- * second runs), and a heap (replacement selection priority queue) is often
- * avoided in the first place.
- */
-static void
-dumpbatch(Tuplesortstate *state, bool alltuples)
 {
 	int			memtupwrite;
 	int			i;
 
+	/*
+	 * Nothing to do if we still fit in available memory and have array slots,
+	 * unless this is the final call during initial run generation.
+	 */
+	if (state->memtupcount < state->memtupsize && !LACKMEM(state) &&
+		!alltuples)
+		return;
+
 	/*
 	 * Final call might require no sorting, in rare cases where we just so
 	 * happen to have previously LACKMEM()'d at the point where exactly all
@@ -3076,8 +2970,9 @@ dumpbatch(Tuplesortstate *state, bool alltuples)
 
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "starting quicksort of run %d: %s",
-			 state->currentRun, pg_rusage_show(&state->ru_start));
+		elog(LOG, "%d starting quicksort of run %d: %s",
+			 state->worker, state->currentRun,
+			 pg_rusage_show(&state->ru_start));
 #endif
 
 	/*
@@ -3088,8 +2983,9 @@ dumpbatch(Tuplesortstate *state, bool alltuples)
 
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "finished quicksort of run %d: %s",
-			 state->currentRun, pg_rusage_show(&state->ru_start));
+		elog(LOG, "%d finished quicksort of run %d: %s",
+			 state->worker, state->currentRun,
+			 pg_rusage_show(&state->ru_start));
 #endif
 
 	memtupwrite = state->memtupcount;
@@ -3115,8 +3011,8 @@ dumpbatch(Tuplesortstate *state, bool alltuples)
 
 #ifdef TRACE_SORT
 	if (trace_sort)
-		elog(LOG, "finished writing run %d to tape %d: %s",
-			 state->currentRun, state->destTape,
+		elog(LOG, "%d finished writing run %d to tape %d: %s",
+			 state->worker, state->currentRun, state->destTape,
 			 pg_rusage_show(&state->ru_start));
 #endif
 
@@ -3227,13 +3123,10 @@ tuplesort_restorepos(Tuplesortstate *state)
  *
  * This can be called after tuplesort_performsort() finishes to obtain
  * printable summary information about how the sort was performed.
- * spaceUsed is measured in kilobytes.
  */
 void
 tuplesort_get_stats(Tuplesortstate *state,
-					const char **sortMethod,
-					const char **spaceType,
-					long *spaceUsed)
+					TuplesortInstrumentation *stats)
 {
 	/*
 	 * Note: it might seem we should provide both memory and disk usage for a
@@ -3246,52 +3139,72 @@ tuplesort_get_stats(Tuplesortstate *state,
 	 */
 	if (state->tapeset)
 	{
-		*spaceType = "Disk";
-		*spaceUsed = LogicalTapeSetBlocks(state->tapeset) * (BLCKSZ / 1024);
+		stats->spaceType = SORT_SPACE_TYPE_DISK;
+		stats->spaceUsed = LogicalTapeSetBlocks(state->tapeset) * (BLCKSZ / 1024);
 	}
 	else
 	{
-		*spaceType = "Memory";
-		*spaceUsed = (state->allowedMem - state->availMem + 1023) / 1024;
+		stats->spaceType = SORT_SPACE_TYPE_MEMORY;
+		stats->spaceUsed = (state->allowedMem - state->availMem + 1023) / 1024;
 	}
 
 	switch (state->status)
 	{
 		case TSS_SORTEDINMEM:
 			if (state->boundUsed)
-				*sortMethod = "top-N heapsort";
+				stats->sortMethod = SORT_TYPE_TOP_N_HEAPSORT;
 			else
-				*sortMethod = "quicksort";
+				stats->sortMethod = SORT_TYPE_QUICKSORT;
 			break;
 		case TSS_SORTEDONTAPE:
-			*sortMethod = "external sort";
+			stats->sortMethod = SORT_TYPE_EXTERNAL_SORT;
 			break;
 		case TSS_FINALMERGE:
-			*sortMethod = "external merge";
+			stats->sortMethod = SORT_TYPE_EXTERNAL_MERGE;
 			break;
 		default:
-			*sortMethod = "still in progress";
+			stats->sortMethod = SORT_TYPE_STILL_IN_PROGRESS;
 			break;
 	}
 }
 
+/*
+ * Convert TuplesortMethod to a string.
+ */
+const char *
+tuplesort_method_name(TuplesortMethod m)
+{
+	switch (m)
+	{
+		case SORT_TYPE_STILL_IN_PROGRESS:
+			return "still in progress";
+		case SORT_TYPE_TOP_N_HEAPSORT:
+			return "top-N heapsort";
+		case SORT_TYPE_QUICKSORT:
+			return "quicksort";
+		case SORT_TYPE_EXTERNAL_SORT:
+			return "external sort";
+		case SORT_TYPE_EXTERNAL_MERGE:
+			return "external merge";
+	}
+
+	return "unknown";
+}
 
 /*
- * Heap manipulation routines, per Knuth's Algorithm 5.2.3H.
- *
- * Compare two SortTuples.  If checkIndex is true, use the tuple index
- * as the front of the sort key; otherwise, no.
- *
- * Note that for checkIndex callers, the heap invariant is never
- * maintained beyond the first run, and so there are no COMPARETUP()
- * calls needed to distinguish tuples in HEAP_RUN_NEXT.
+ * Convert TuplesortSpaceType to a string.
  */
+const char *
+tuplesort_space_type_name(TuplesortSpaceType t)
+{
+	Assert(t == SORT_SPACE_TYPE_DISK || t == SORT_SPACE_TYPE_MEMORY);
+	return t == SORT_SPACE_TYPE_DISK ? "Disk" : "Memory";
+}
 
-#define HEAPCOMPARE(tup1,tup2) \
-	(checkIndex && ((tup1)->tupindex != (tup2)->tupindex || \
-					(tup1)->tupindex == HEAP_RUN_NEXT) ? \
-	 ((tup1)->tupindex) - ((tup2)->tupindex) : \
-	 COMPARETUP(state, tup1, tup2))
+
+/*
+ * Heap manipulation routines, per Knuth's Algorithm 5.2.3H.
+ */
 
 /*
  * Convert the existing unordered array of SortTuples to a bounded heap,
@@ -3301,10 +3214,6 @@ tuplesort_get_stats(Tuplesortstate *state,
  * at the root (array entry zero), instead of the smallest as in the normal
  * sort case.  This allows us to discard the largest entry cheaply.
  * Therefore, we temporarily reverse the sort direction.
- *
- * We assume that all entries in a bounded heap will always have tupindex
- * zero; it therefore doesn't matter that HEAPCOMPARE() doesn't reverse
- * the direction of comparison for tupindexes.
  */
 static void
 make_bounded_heap(Tuplesortstate *state)
@@ -3315,6 +3224,7 @@ make_bounded_heap(Tuplesortstate *state)
 	Assert(state->status == TSS_INITIAL);
 	Assert(state->bounded);
 	Assert(tupcount >= state->bound);
+	Assert(SERIAL(state));
 
 	/* Reverse sort direction so largest entry will be at root */
 	reversedirection(state);
@@ -3328,8 +3238,7 @@ make_bounded_heap(Tuplesortstate *state)
 			/* Must copy source tuple to avoid possible overwrite */
 			SortTuple	stup = state->memtuples[i];
 
-			stup.tupindex = 0;	/* not used */
-			tuplesort_heap_insert(state, &stup, false);
+			tuplesort_heap_insert(state, &stup);
 		}
 		else
 		{
@@ -3344,7 +3253,7 @@ make_bounded_heap(Tuplesortstate *state)
 				CHECK_FOR_INTERRUPTS();
 			}
 			else
-				tuplesort_heap_replace_top(state, &state->memtuples[i], false);
+				tuplesort_heap_replace_top(state, &state->memtuples[i]);
 		}
 	}
 
@@ -3363,6 +3272,7 @@ sort_bounded_heap(Tuplesortstate *state)
 	Assert(state->status == TSS_BOUNDED);
 	Assert(state->bounded);
 	Assert(tupcount == state->bound);
+	Assert(SERIAL(state));
 
 	/*
 	 * We can unheapify in place because each delete-top call will remove the
@@ -3374,7 +3284,7 @@ sort_bounded_heap(Tuplesortstate *state)
 		SortTuple	stup = state->memtuples[0];
 
 		/* this sifts-up the next-largest entry and decreases memtupcount */
-		tuplesort_heap_delete_top(state, false);
+		tuplesort_heap_delete_top(state);
 		state->memtuples[state->memtupcount] = stup;
 	}
 	state->memtupcount = tupcount;
@@ -3392,14 +3302,13 @@ sort_bounded_heap(Tuplesortstate *state)
 /*
  * Sort all memtuples using specialized qsort() routines.
  *
- * Quicksort is used for small in-memory sorts.  Quicksort is also generally
- * preferred to replacement selection for generating runs during external sort
- * operations, although replacement selection is sometimes used for the first
- * run.
+ * Quicksort is used for small in-memory sorts, and external sort runs.
  */
 static void
 tuplesort_sort_memtuples(Tuplesortstate *state)
 {
+	Assert(!LEADER(state));
+
 	if (state->memtupcount > 1)
 	{
 		/* Can we use the single-key sort function? */
@@ -3424,15 +3333,13 @@ tuplesort_sort_memtuples(Tuplesortstate *state)
  * is, it might get overwritten before being moved into the heap!
  */
 static void
-tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple,
-					  bool checkIndex)
+tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple)
 {
 	SortTuple  *memtuples;
 	int			j;
 
 	memtuples = state->memtuples;
 	Assert(state->memtupcount < state->memtupsize);
-	Assert(!checkIndex || tuple->tupindex == RUN_FIRST);
 
 	CHECK_FOR_INTERRUPTS();
 
@@ -3445,7 +3352,7 @@ tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple,
 	{
 		int			i = (j - 1) >> 1;
 
-		if (HEAPCOMPARE(tuple, &memtuples[i]) >= 0)
+		if (COMPARETUP(state, tuple, &memtuples[i]) >= 0)
 			break;
 		memtuples[j] = memtuples[i];
 		j = i;
@@ -3461,12 +3368,11 @@ tuplesort_heap_insert(Tuplesortstate *state, SortTuple *tuple,
  * if necessary.
  */
 static void
-tuplesort_heap_delete_top(Tuplesortstate *state, bool checkIndex)
+tuplesort_heap_delete_top(Tuplesortstate *state)
 {
 	SortTuple  *memtuples = state->memtuples;
 	SortTuple  *tuple;
 
-	Assert(!checkIndex || state->currentRun == RUN_FIRST);
 	if (--state->memtupcount <= 0)
 		return;
 
@@ -3475,7 +3381,7 @@ tuplesort_heap_delete_top(Tuplesortstate *state, bool checkIndex)
 	 * current top node with it.
 	 */
 	tuple = &memtuples[state->memtupcount];
-	tuplesort_heap_replace_top(state, tuple, checkIndex);
+	tuplesort_heap_replace_top(state, tuple);
 }
 
 /*
@@ -3486,14 +3392,12 @@ tuplesort_heap_delete_top(Tuplesortstate *state, bool checkIndex)
  * Heapsort, steps H3-H8).
  */
 static void
-tuplesort_heap_replace_top(Tuplesortstate *state, SortTuple *tuple,
-						   bool checkIndex)
+tuplesort_heap_replace_top(Tuplesortstate *state, SortTuple *tuple)
 {
 	SortTuple  *memtuples = state->memtuples;
 	unsigned int i,
 				n;
 
-	Assert(!checkIndex || state->currentRun == RUN_FIRST);
 	Assert(state->memtupcount >= 1);
 
 	CHECK_FOR_INTERRUPTS();
@@ -3512,9 +3416,9 @@ tuplesort_heap_replace_top(Tuplesortstate *state, SortTuple *tuple,
 		if (j >= n)
 			break;
 		if (j + 1 < n &&
-			HEAPCOMPARE(&memtuples[j], &memtuples[j + 1]) > 0)
+			COMPARETUP(state, &memtuples[j], &memtuples[j + 1]) > 0)
 			j++;
-		if (HEAPCOMPARE(tuple, &memtuples[j]) <= 0)
+		if (COMPARETUP(state, tuple, &memtuples[j]) <= 0)
 			break;
 		memtuples[i] = memtuples[j];
 		i = j;
@@ -4444,6 +4348,230 @@ readtup_datum(Tuplesortstate *state, SortTuple *stup,
 							 &tuplen, sizeof(tuplen));
 }
 
+/*
+ * Parallel sort routines
+ */
+
+/*
+ * tuplesort_estimate_shared - estimate required shared memory allocation
+ *
+ * nWorkers is an estimate of the number of workers (it's the number that
+ * will be requested).
+ */
+Size
+tuplesort_estimate_shared(int nWorkers)
+{
+	Size		tapesSize;
+
+	Assert(nWorkers > 0);
+
+	/* Make sure that BufFile shared state is MAXALIGN'd */
+	tapesSize = mul_size(sizeof(TapeShare), nWorkers);
+	tapesSize = MAXALIGN(add_size(tapesSize, offsetof(Sharedsort, tapes)));
+
+	return tapesSize;
+}
+
+/*
+ * tuplesort_initialize_shared - initialize shared tuplesort state
+ *
+ * Must be called from leader process before workers are launched, to
+ * establish state needed up-front for worker tuplesortstates.  nWorkers
+ * should match the argument passed to tuplesort_estimate_shared().
+ */
+void
+tuplesort_initialize_shared(Sharedsort *shared, int nWorkers, dsm_segment *seg)
+{
+	int			i;
+
+	Assert(nWorkers > 0);
+
+	SpinLockInit(&shared->mutex);
+	shared->currentWorker = 0;
+	shared->workersFinished = 0;
+	SharedFileSetInit(&shared->fileset, seg);
+	shared->nTapes = nWorkers;
+	for (i = 0; i < nWorkers; i++)
+	{
+		shared->tapes[i].firstblocknumber = 0L;
+		shared->tapes[i].buffilesize = 0;
+	}
+}
+
+/*
+ * tuplesort_attach_shared - attach to shared tuplesort state
+ *
+ * Must be called by all worker processes.
+ */
+void
+tuplesort_attach_shared(Sharedsort *shared, dsm_segment *seg)
+{
+	/* Attach to SharedFileSet */
+	SharedFileSetAttach(&shared->fileset, seg);
+}
+
+/*
+ * worker_get_identifier - Assign and return ordinal identifier for worker
+ *
+ * The order in which these are assigned is not well defined, and should not
+ * matter; worker numbers across parallel sort participants need only be
+ * distinct and gapless.  logtape.c requires this.
+ *
+ * Note that the identifiers assigned from here have no relation to
+ * ParallelWorkerNumber number, to avoid making any assumption about
+ * caller's requirements.  However, we do follow the ParallelWorkerNumber
+ * convention of representing a non-worker with worker number -1.  This
+ * includes the leader, as well as serial Tuplesort processes.
+ */
+static int
+worker_get_identifier(Tuplesortstate *state)
+{
+	Sharedsort *shared = state->shared;
+	int			worker;
+
+	Assert(WORKER(state));
+
+	SpinLockAcquire(&shared->mutex);
+	worker = shared->currentWorker++;
+	SpinLockRelease(&shared->mutex);
+
+	return worker;
+}
+
+/*
+ * worker_freeze_result_tape - freeze worker's result tape for leader
+ *
+ * This is called by workers just after the result tape has been determined,
+ * instead of calling LogicalTapeFreeze() directly.  They do so because
+ * workers require a few additional steps over similar serial
+ * TSS_SORTEDONTAPE external sort cases, which also happen here.  The extra
+ * steps are around freeing now unneeded resources, and representing to
+ * leader that worker's input run is available for its merge.
+ *
+ * There should only be one final output run for each worker, which consists
+ * of all tuples that were originally input into worker.
+ */
+static void
+worker_freeze_result_tape(Tuplesortstate *state)
+{
+	Sharedsort *shared = state->shared;
+	TapeShare	output;
+
+	Assert(WORKER(state));
+	Assert(state->result_tape != -1);
+	Assert(state->memtupcount == 0);
+
+	/*
+	 * Free most remaining memory, in case caller is sensitive to our holding
+	 * on to it.  memtuples may not be a tiny merge heap at this point.
+	 */
+	pfree(state->memtuples);
+	/* Be tidy */
+	state->memtuples = NULL;
+	state->memtupsize = 0;
+
+	/*
+	 * Parallel worker requires result tape metadata, which is to be stored in
+	 * shared memory for leader
+	 */
+	LogicalTapeFreeze(state->tapeset, state->result_tape, &output);
+
+	/* Store properties of output tape, and update finished worker count */
+	SpinLockAcquire(&shared->mutex);
+	shared->tapes[state->worker] = output;
+	shared->workersFinished++;
+	SpinLockRelease(&shared->mutex);
+}
+
+/*
+ * worker_nomergeruns - dump memtuples in worker, without merging
+ *
+ * This called as an alternative to mergeruns() with a worker when no
+ * merging is required.
+ */
+static void
+worker_nomergeruns(Tuplesortstate *state)
+{
+	Assert(WORKER(state));
+	Assert(state->result_tape == -1);
+
+	state->result_tape = state->tp_tapenum[state->destTape];
+	worker_freeze_result_tape(state);
+}
+
+/*
+ * leader_takeover_tapes - create tapeset for leader from worker tapes
+ *
+ * So far, leader Tuplesortstate has performed no actual sorting.  By now, all
+ * sorting has occurred in workers, all of which must have already returned
+ * from tuplesort_performsort().
+ *
+ * When this returns, leader process is left in a state that is virtually
+ * indistinguishable from it having generated runs as a serial external sort
+ * might have.
+ */
+static void
+leader_takeover_tapes(Tuplesortstate *state)
+{
+	Sharedsort *shared = state->shared;
+	int			nParticipants = state->nParticipants;
+	int			workersFinished;
+	int			j;
+
+	Assert(LEADER(state));
+	Assert(nParticipants >= 1);
+
+	SpinLockAcquire(&shared->mutex);
+	workersFinished = shared->workersFinished;
+	SpinLockRelease(&shared->mutex);
+
+	if (nParticipants != workersFinished)
+		elog(ERROR, "cannot take over tapes before all workers finish");
+
+	/*
+	 * Create the tapeset from worker tapes, including a leader-owned tape at
+	 * the end.  Parallel workers are far more expensive than logical tapes,
+	 * so the number of tapes allocated here should never be excessive.
+	 *
+	 * We still have a leader tape, though it's not possible to write to it
+	 * due to restrictions in the shared fileset infrastructure used by
+	 * logtape.c.  It will never be written to in practice because
+	 * randomAccess is disallowed for parallel sorts.
+	 */
+	inittapestate(state, nParticipants + 1);
+	state->tapeset = LogicalTapeSetCreate(nParticipants + 1, shared->tapes,
+										  &shared->fileset, state->worker);
+
+	/* mergeruns() relies on currentRun for # of runs (in one-pass cases) */
+	state->currentRun = nParticipants;
+
+	/*
+	 * Initialize variables of Algorithm D to be consistent with runs from
+	 * workers having been generated in the leader.
+	 *
+	 * There will always be exactly 1 run per worker, and exactly one input
+	 * tape per run, because workers always output exactly 1 run, even when
+	 * there were no input tuples for workers to sort.
+	 */
+	for (j = 0; j < state->maxTapes; j++)
+	{
+		/* One real run; no dummy runs for worker tapes */
+		state->tp_fib[j] = 1;
+		state->tp_runs[j] = 1;
+		state->tp_dummy[j] = 0;
+		state->tp_tapenum[j] = j;
+	}
+	/* Leader tape gets one dummy run, and no real runs */
+	state->tp_fib[state->tapeRange] = 0;
+	state->tp_runs[state->tapeRange] = 0;
+	state->tp_dummy[state->tapeRange] = 1;
+
+	state->Level = 1;
+	state->destTape = 0;
+
+	state->status = TSS_BUILDRUNS;
+}
+
 /*
  * Convenience routine to free a tuple previously loaded into sort memory
  */
diff --git a/src/backend/utils/sort/tuplestore.c b/src/backend/utils/sort/tuplestore.c
index 98c006b663..d602753ca9 100644
--- a/src/backend/utils/sort/tuplestore.c
+++ b/src/backend/utils/sort/tuplestore.c
@@ -43,7 +43,7 @@
  * before switching to the other state or activating a different read pointer.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -562,7 +562,7 @@ tuplestore_ateof(Tuplestorestate *state)
 /*
  * Grow the memtuples[] array, if possible within our memory constraint.  We
  * must not exceed INT_MAX tuples in memory or the caller-provided memory
- * limit.  Return TRUE if we were able to enlarge the array, FALSE if not.
+ * limit.  Return true if we were able to enlarge the array, false if not.
  *
  * Normally, at each increment we double the size of the array.  When doing
  * that would exceed a limit, we attempt one last, smaller increase (and then
@@ -1064,12 +1064,12 @@ tuplestore_gettuple(Tuplestorestate *state, bool forward,
 /*
  * tuplestore_gettupleslot - exported function to fetch a MinimalTuple
  *
- * If successful, put tuple in slot and return TRUE; else, clear the slot
- * and return FALSE.
+ * If successful, put tuple in slot and return true; else, clear the slot
+ * and return false.
  *
- * If copy is TRUE, the slot receives a copied tuple (allocated in current
+ * If copy is true, the slot receives a copied tuple (allocated in current
  * memory context) that will stay valid regardless of future manipulations of
- * the tuplestore's state.  If copy is FALSE, the slot may just receive a
+ * the tuplestore's state.  If copy is false, the slot may just receive a
  * pointer to a tuple held within the tuplestore.  The latter is more
  * efficient but the slot contents may be corrupted if additional writes to
  * the tuplestore occur.  (If using tuplestore_trim, see comments therein.)
@@ -1129,7 +1129,7 @@ tuplestore_advance(Tuplestorestate *state, bool forward)
 /*
  * Advance over N tuples in either forward or back direction,
  * without returning any data.  N<=0 is a no-op.
- * Returns TRUE if successful, FALSE if ran out of tuples.
+ * Returns true if successful, false if ran out of tuples.
  */
 bool
 tuplestore_skiptuples(Tuplestorestate *state, int64 ntuples, bool forward)
diff --git a/src/backend/utils/time/combocid.c b/src/backend/utils/time/combocid.c
index c7e4331efb..d789f02bfa 100644
--- a/src/backend/utils/time/combocid.c
+++ b/src/backend/utils/time/combocid.c
@@ -30,7 +30,7 @@
  * destroyed at the end of each transaction.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -142,8 +142,8 @@ HeapTupleHeaderGetCmax(HeapTupleHeader tup)
  * into its t_cid field.
  *
  * If we don't need a combo CID, *cmax is unchanged and *iscombo is set to
- * FALSE.  If we do need one, *cmax is replaced by a combo CID and *iscombo
- * is set to TRUE.
+ * false.  If we do need one, *cmax is replaced by a combo CID and *iscombo
+ * is set to true.
  *
  * The reason this is separate from the actual HeapTupleHeaderSetCmax()
  * operation is that this could fail due to out-of-memory conditions.  Hence
diff --git a/src/backend/utils/time/snapmgr.c b/src/backend/utils/time/snapmgr.c
index 08a08c8e8f..e58c69dbd7 100644
--- a/src/backend/utils/time/snapmgr.c
+++ b/src/backend/utils/time/snapmgr.c
@@ -35,7 +35,7 @@
  * stack is empty.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -625,7 +625,7 @@ SetTransactionSnapshot(Snapshot sourcesnap, VirtualTransactionId *sourcevxid,
 		ereport(ERROR,
 				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 				 errmsg("could not import the requested snapshot"),
-				 errdetail("The source process with pid %d is not running anymore.",
+				 errdetail("The source process with PID %d is not running anymore.",
 						   sourcepid)));
 
 	/*
@@ -1619,32 +1619,38 @@ DeleteAllExportedSnapshotFiles(void)
 	DIR		   *s_dir;
 	struct dirent *s_de;
 
-	if (!(s_dir = AllocateDir(SNAPSHOT_EXPORT_DIR)))
-	{
-		/*
-		 * We really should have that directory in a sane cluster setup. But
-		 * then again if we don't, it's not fatal enough to make it FATAL.
-		 * Since we're running in the postmaster, LOG is our best bet.
-		 */
-		elog(LOG, "could not open directory \"%s\": %m", SNAPSHOT_EXPORT_DIR);
-		return;
-	}
+	/*
+	 * Problems in reading the directory, or unlinking files, are reported at
+	 * LOG level.  Since we're running in the startup process, ERROR level
+	 * would prevent database start, and it's not important enough for that.
+	 */
+	s_dir = AllocateDir(SNAPSHOT_EXPORT_DIR);
 
-	while ((s_de = ReadDir(s_dir, SNAPSHOT_EXPORT_DIR)) != NULL)
+	while ((s_de = ReadDirExtended(s_dir, SNAPSHOT_EXPORT_DIR, LOG)) != NULL)
 	{
 		if (strcmp(s_de->d_name, ".") == 0 ||
 			strcmp(s_de->d_name, "..") == 0)
 			continue;
 
 		snprintf(buf, sizeof(buf), SNAPSHOT_EXPORT_DIR "/%s", s_de->d_name);
-		/* Again, unlink failure is not worthy of FATAL */
-		if (unlink(buf))
-			elog(LOG, "could not unlink file \"%s\": %m", buf);
+
+		if (unlink(buf) != 0)
+			ereport(LOG,
+					(errcode_for_file_access(),
+					 errmsg("could not remove file \"%s\": %m", buf)));
 	}
 
 	FreeDir(s_dir);
 }
 
+/*
+ * ThereAreNoPriorRegisteredSnapshots
+ *		Is the registered snapshot count less than or equal to one?
+ *
+ * Don't use this to settle important decisions.  While zero registrations and
+ * no ActiveSnapshot would confirm a certain idleness, the system makes no
+ * guarantees about the significance of one registered snapshot.
+ */
 bool
 ThereAreNoPriorRegisteredSnapshots(void)
 {
diff --git a/src/backend/utils/time/tqual.c b/src/backend/utils/time/tqual.c
index f9da9e17f5..f7c4c9188c 100644
--- a/src/backend/utils/time/tqual.c
+++ b/src/backend/utils/time/tqual.c
@@ -45,12 +45,14 @@
  *		  like HeapTupleSatisfiesSelf(), but includes open transactions
  *	 HeapTupleSatisfiesVacuum()
  *		  visible to any running transaction, used by VACUUM
+ *	 HeapTupleSatisfiesNonVacuumable()
+ *		  Snapshot-style API for HeapTupleSatisfiesVacuum
  *	 HeapTupleSatisfiesToast()
  *		  visible unless part of interrupted vacuum, used for TOAST
  *	 HeapTupleSatisfiesAny()
  *		  all tuples are visible
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -79,8 +81,6 @@
 SnapshotData SnapshotSelfData = {HeapTupleSatisfiesSelf};
 SnapshotData SnapshotAnyData = {HeapTupleSatisfiesAny};
 
-/* local functions */
-static bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
 
 /*
  * SetHintBits()
@@ -1311,49 +1311,40 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 
 	if (tuple->t_infomask & HEAP_XMAX_IS_MULTI)
 	{
-		TransactionId xmax;
-
-		if (MultiXactIdIsRunning(HeapTupleHeaderGetRawXmax(tuple), false))
-		{
-			/* already checked above */
-			Assert(!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask));
-
-			xmax = HeapTupleGetUpdateXid(tuple);
-
-			/* not LOCKED_ONLY, so it has to have an xmax */
-			Assert(TransactionIdIsValid(xmax));
-
-			if (TransactionIdIsInProgress(xmax))
-				return HEAPTUPLE_DELETE_IN_PROGRESS;
-			else if (TransactionIdDidCommit(xmax))
-				/* there are still lockers around -- can't return DEAD here */
-				return HEAPTUPLE_RECENTLY_DEAD;
-			/* updating transaction aborted */
-			return HEAPTUPLE_LIVE;
-		}
+		TransactionId xmax = HeapTupleGetUpdateXid(tuple);
 
-		Assert(!(tuple->t_infomask & HEAP_XMAX_COMMITTED));
-
-		xmax = HeapTupleGetUpdateXid(tuple);
+		/* already checked above */
+		Assert(!HEAP_XMAX_IS_LOCKED_ONLY(tuple->t_infomask));
 
 		/* not LOCKED_ONLY, so it has to have an xmax */
 		Assert(TransactionIdIsValid(xmax));
 
-		/* multi is not running -- updating xact cannot be */
-		Assert(!TransactionIdIsInProgress(xmax));
-		if (TransactionIdDidCommit(xmax))
+		if (TransactionIdIsInProgress(xmax))
+			return HEAPTUPLE_DELETE_IN_PROGRESS;
+		else if (TransactionIdDidCommit(xmax))
 		{
+			/*
+			 * The multixact might still be running due to lockers.  If the
+			 * updater is below the xid horizon, we have to return DEAD
+			 * regardless -- otherwise we could end up with a tuple where the
+			 * updater has to be removed due to the horizon, but is not pruned
+			 * away.  It's not a problem to prune that tuple, because any
+			 * remaining lockers will also be present in newer tuple versions.
+			 */
 			if (!TransactionIdPrecedes(xmax, OldestXmin))
 				return HEAPTUPLE_RECENTLY_DEAD;
-			else
-				return HEAPTUPLE_DEAD;
+
+			return HEAPTUPLE_DEAD;
+		}
+		else if (!MultiXactIdIsRunning(HeapTupleHeaderGetRawXmax(tuple), false))
+		{
+			/*
+			 * Not in Progress, Not Committed, so either Aborted or crashed.
+			 * Mark the Xmax as invalid.
+			 */
+			SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
 		}
 
-		/*
-		 * Not in Progress, Not Committed, so either Aborted or crashed.
-		 * Remove the Xmax.
-		 */
-		SetHintBits(tuple, buffer, HEAP_XMAX_INVALID, InvalidTransactionId);
 		return HEAPTUPLE_LIVE;
 	}
 
@@ -1392,6 +1383,26 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
 	return HEAPTUPLE_DEAD;
 }
 
+
+/*
+ * HeapTupleSatisfiesNonVacuumable
+ *
+ *	True if tuple might be visible to some transaction; false if it's
+ *	surely dead to everyone, ie, vacuumable.
+ *
+ *	This is an interface to HeapTupleSatisfiesVacuum that meets the
+ *	SnapshotSatisfiesFunc API, so it can be used through a Snapshot.
+ *	snapshot->xmin must have been set up with the xmin horizon to use.
+ */
+bool
+HeapTupleSatisfiesNonVacuumable(HeapTuple htup, Snapshot snapshot,
+								Buffer buffer)
+{
+	return HeapTupleSatisfiesVacuum(htup, snapshot->xmin, buffer)
+		!= HEAPTUPLE_DEAD;
+}
+
+
 /*
  * HeapTupleIsSurelyDead
  *
@@ -1402,7 +1413,7 @@ HeapTupleSatisfiesVacuum(HeapTuple htup, TransactionId OldestXmin,
  *	should already be set.  We assume that if no hint bits are set, the xmin
  *	or xmax transaction is still running.  This is therefore faster than
  *	HeapTupleSatisfiesVacuum, because we don't consult PGXACT nor CLOG.
- *	It's okay to return FALSE when in doubt, but we must return TRUE only
+ *	It's okay to return false when in doubt, but we must return true only
  *	if the tuple is removable.
  */
 bool
@@ -1457,10 +1468,10 @@ HeapTupleIsSurelyDead(HeapTuple htup, TransactionId OldestXmin)
  * Note: GetSnapshotData never stores either top xid or subxids of our own
  * backend into a snapshot, so these xids will not be reported as "running"
  * by this function.  This is OK for current uses, because we always check
- * TransactionIdIsCurrentTransactionId first, except for known-committed
- * XIDs which could not be ours anyway.
+ * TransactionIdIsCurrentTransactionId first, except when it's known the
+ * XID could not be ours anyway.
  */
-static bool
+bool
 XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot)
 {
 	uint32		i;
diff --git a/src/bin/Makefile b/src/bin/Makefile
index bc96f37dfc..3b35835abe 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin (client programs)
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/Makefile
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
index ec26652e82..dae3daf8bd 100644
--- a/src/bin/initdb/Makefile
+++ b/src/bin/initdb/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/initdb
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/initdb/Makefile
diff --git a/src/bin/initdb/findtimezone.c b/src/bin/initdb/findtimezone.c
index c9b4141a16..4c3a91a122 100644
--- a/src/bin/initdb/findtimezone.c
+++ b/src/bin/initdb/findtimezone.c
@@ -3,7 +3,7 @@
  * findtimezone.c
  *	  Functions for determining the default timezone to use.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/bin/initdb/findtimezone.c
diff --git a/src/bin/initdb/initdb.c b/src/bin/initdb/initdb.c
index 7303bbe892..2efd3b75b1 100644
--- a/src/bin/initdb/initdb.c
+++ b/src/bin/initdb/initdb.c
@@ -38,7 +38,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/initdb/initdb.c
@@ -59,6 +59,7 @@
 #include "sys/mman.h"
 #endif
 
+#include "access/xlog_internal.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_authid.h"
 #include "catalog/pg_class.h"
@@ -118,34 +119,36 @@ static const char *const auth_methods_local[] = {
 static char *share_path = NULL;
 
 /* values to be obtained from arguments */
-static char *pg_data = "";
-static char *encoding = "";
-static char *locale = "";
-static char *lc_collate = "";
-static char *lc_ctype = "";
-static char *lc_monetary = "";
-static char *lc_numeric = "";
-static char *lc_time = "";
-static char *lc_messages = "";
-static const char *default_text_search_config = "";
-static char *username = "";
+static char *pg_data = NULL;
+static char *encoding = NULL;
+static char *locale = NULL;
+static char *lc_collate = NULL;
+static char *lc_ctype = NULL;
+static char *lc_monetary = NULL;
+static char *lc_numeric = NULL;
+static char *lc_time = NULL;
+static char *lc_messages = NULL;
+static const char *default_text_search_config = NULL;
+static char *username = NULL;
 static bool pwprompt = false;
 static char *pwfilename = NULL;
 static char *superuser_password = NULL;
-static const char *authmethodhost = "";
-static const char *authmethodlocal = "";
+static const char *authmethodhost = NULL;
+static const char *authmethodlocal = NULL;
 static bool debug = false;
 static bool noclean = false;
 static bool do_sync = true;
 static bool sync_only = false;
 static bool show_setting = false;
 static bool data_checksums = false;
-static char *xlog_dir = "";
+static char *xlog_dir = NULL;
+static char *str_wal_segment_size_mb = NULL;
+static int	wal_segment_size_mb;
 
 
 /* internal vars */
 static const char *progname;
-static char *encodingid = "0";
+static int	encodingid;
 static char *bki_file;
 static char *desc_file;
 static char *shdesc_file;
@@ -234,12 +237,12 @@ static char **filter_lines_with_token(char **lines, const char *token);
 static char **readfile(const char *path);
 static void writefile(char *path, char **lines);
 static FILE *popen_check(const char *command, const char *mode);
-static void exit_nicely(void);
+static void exit_nicely(void) pg_attribute_noreturn();
 static char *get_id(void);
-static char *get_encoding_id(char *encoding_name);
-static void set_input(char **dest, char *filename);
+static int	get_encoding_id(const char *encoding_name);
+static void set_input(char **dest, const char *filename);
 static void check_input(char *path);
-static void write_version_file(char *extrapath);
+static void write_version_file(const char *extrapath);
 static void set_null_conf(void);
 static void test_config_settings(void);
 static void setup_config(void);
@@ -636,15 +639,15 @@ encodingid_to_string(int enc)
 /*
  * get the encoding id for a given encoding name
  */
-static char *
-get_encoding_id(char *encoding_name)
+static int
+get_encoding_id(const char *encoding_name)
 {
 	int			enc;
 
 	if (encoding_name && *encoding_name)
 	{
 		if ((enc = pg_valid_server_encoding(encoding_name)) >= 0)
-			return encodingid_to_string(enc);
+			return enc;
 	}
 	fprintf(stderr, _("%s: \"%s\" is not a valid server encoding name\n"),
 			progname, encoding_name ? encoding_name : "(null)");
@@ -748,7 +751,7 @@ find_matching_ts_config(const char *lc_type)
  * set name of given input file variable under data directory
  */
 static void
-set_input(char **dest, char *filename)
+set_input(char **dest, const char *filename)
 {
 	*dest = psprintf("%s/%s", share_path, filename);
 }
@@ -798,7 +801,7 @@ check_input(char *path)
  * if extrapath is not NULL
  */
 static void
-write_version_file(char *extrapath)
+write_version_file(const char *extrapath)
 {
 	FILE	   *version_file;
 	char	   *path;
@@ -999,6 +1002,23 @@ test_config_settings(void)
 	printf("%s\n", dynamic_shared_memory_type);
 }
 
+/*
+ * Calculate the default wal_size with a "pretty" unit.
+ */
+static char *
+pretty_wal_size(int segment_count)
+{
+	int			sz = wal_segment_size_mb * segment_count;
+	char	   *result = pg_malloc(11);
+
+	if ((sz % 1024) == 0)
+		snprintf(result, 11, "%dGB", sz / 1024);
+	else
+		snprintf(result, 11, "%dMB", sz);
+
+	return result;
+}
+
 /*
  * set up all the config files
  */
@@ -1043,6 +1063,15 @@ setup_config(void)
 	conflines = replace_token(conflines, "#port = 5432", repltok);
 #endif
 
+	/* set default max_wal_size and min_wal_size */
+	snprintf(repltok, sizeof(repltok), "min_wal_size = %s",
+			 pretty_wal_size(DEFAULT_MIN_WAL_SEGS));
+	conflines = replace_token(conflines, "#min_wal_size = 80MB", repltok);
+
+	snprintf(repltok, sizeof(repltok), "max_wal_size = %s",
+			 pretty_wal_size(DEFAULT_MAX_WAL_SEGS));
+	conflines = replace_token(conflines, "#max_wal_size = 1GB", repltok);
+
 	snprintf(repltok, sizeof(repltok), "lc_messages = '%s'",
 			 escape_quotes(lc_messages));
 	conflines = replace_token(conflines, "#lc_messages = 'C'", repltok);
@@ -1285,7 +1314,6 @@ bootstrap_template1(void)
 {
 	PG_CMD_DECL;
 	char	  **line;
-	char	   *talkargs = "";
 	char	  **bki_lines;
 	char		headerline[MAXPGPATH];
 	char		buf[64];
@@ -1293,9 +1321,6 @@ bootstrap_template1(void)
 	printf(_("running bootstrap script ... "));
 	fflush(stdout);
 
-	if (debug)
-		talkargs = "-d 5";
-
 	bki_lines = readfile(bki_file);
 
 	/* Check that bki file appears to be of the right version */
@@ -1332,7 +1357,7 @@ bootstrap_template1(void)
 
 	bki_lines = replace_token(bki_lines, "POSTGRES", escape_quotes(username));
 
-	bki_lines = replace_token(bki_lines, "ENCODING", encodingid);
+	bki_lines = replace_token(bki_lines, "ENCODING", encodingid_to_string(encodingid));
 
 	bki_lines = replace_token(bki_lines, "LC_COLLATE", escape_quotes(lc_collate));
 
@@ -1356,10 +1381,13 @@ bootstrap_template1(void)
 	unsetenv("PGCLIENTENCODING");
 
 	snprintf(cmd, sizeof(cmd),
-			 "\"%s\" --boot -x1 %s %s %s",
+			 "\"%s\" --boot -x1 -X %u %s %s %s",
 			 backend_exec,
+			 wal_segment_size_mb * (1024 * 1024),
 			 data_checksums ? "-k" : "",
-			 boot_options, talkargs);
+			 boot_options,
+			 debug ? "-d 5" : "");
+
 
 	PG_CMD_OPEN;
 
@@ -2136,6 +2164,10 @@ check_locale_name(int category, const char *locale, char **canonname)
 	/* save may be pointing at a modifiable scratch variable, so copy it. */
 	save = pg_strdup(save);
 
+	/* for setlocale() call */
+	if (!locale)
+		locale = "";
+
 	/* set the locale with setlocale, to see if it accepts it. */
 	res = setlocale(category, locale);
 
@@ -2223,19 +2255,19 @@ setlocales(void)
 
 	/* set empty lc_* values to locale config if set */
 
-	if (strlen(locale) > 0)
+	if (locale)
 	{
-		if (strlen(lc_ctype) == 0)
+		if (!lc_ctype)
 			lc_ctype = locale;
-		if (strlen(lc_collate) == 0)
+		if (!lc_collate)
 			lc_collate = locale;
-		if (strlen(lc_numeric) == 0)
+		if (!lc_numeric)
 			lc_numeric = locale;
-		if (strlen(lc_time) == 0)
+		if (!lc_time)
 			lc_time = locale;
-		if (strlen(lc_monetary) == 0)
+		if (!lc_monetary)
 			lc_monetary = locale;
-		if (strlen(lc_messages) == 0)
+		if (!lc_messages)
 			lc_messages = locale;
 	}
 
@@ -2291,6 +2323,7 @@ usage(const char *progname)
 	printf(_("  -U, --username=NAME       database superuser name\n"));
 	printf(_("  -W, --pwprompt            prompt for a password for the new superuser\n"));
 	printf(_("  -X, --waldir=WALDIR       location for the write-ahead log directory\n"));
+	printf(_("      --wal-segsize=SIZE    size of wal segment size\n"));
 	printf(_("\nLess commonly used options:\n"));
 	printf(_("  -d, --debug               generate lots of debugging output\n"));
 	printf(_("  -k, --data-checksums      use data page checksums\n"));
@@ -2310,7 +2343,7 @@ usage(const char *progname)
 static void
 check_authmethod_unspecified(const char **authmethod)
 {
-	if (*authmethod == NULL || strlen(*authmethod) == 0)
+	if (*authmethod == NULL)
 	{
 		authwarning = _("\nWARNING: enabling \"trust\" authentication for local connections\n"
 						"You can change this by editing pg_hba.conf or using the option -A, or\n"
@@ -2367,7 +2400,7 @@ setup_pgdata(void)
 	char	   *pgdata_get_env,
 			   *pgdata_set_env;
 
-	if (strlen(pg_data) == 0)
+	if (!pg_data)
 	{
 		pgdata_get_env = getenv("PGDATA");
 		if (pgdata_get_env && strlen(pgdata_get_env))
@@ -2452,8 +2485,6 @@ setup_bin_paths(const char *argv0)
 void
 setup_locale_encoding(void)
 {
-	int			user_enc;
-
 	setlocales();
 
 	if (strcmp(lc_ctype, lc_collate) == 0 &&
@@ -2479,7 +2510,7 @@ setup_locale_encoding(void)
 			   lc_time);
 	}
 
-	if (strlen(encoding) == 0)
+	if (!encoding)
 	{
 		int			ctype_enc;
 
@@ -2503,12 +2534,11 @@ setup_locale_encoding(void)
 			 * UTF-8.
 			 */
 #ifdef WIN32
+			encodingid = PG_UTF8;
 			printf(_("Encoding \"%s\" implied by locale is not allowed as a server-side encoding.\n"
 					 "The default database encoding will be set to \"%s\" instead.\n"),
 				   pg_encoding_to_char(ctype_enc),
-				   pg_encoding_to_char(PG_UTF8));
-			ctype_enc = PG_UTF8;
-			encodingid = encodingid_to_string(ctype_enc);
+				   pg_encoding_to_char(encodingid));
 #else
 			fprintf(stderr,
 					_("%s: locale \"%s\" requires unsupported encoding \"%s\"\n"),
@@ -2522,17 +2552,16 @@ setup_locale_encoding(void)
 		}
 		else
 		{
-			encodingid = encodingid_to_string(ctype_enc);
+			encodingid = ctype_enc;
 			printf(_("The default database encoding has accordingly been set to \"%s\".\n"),
-				   pg_encoding_to_char(ctype_enc));
+				   pg_encoding_to_char(encodingid));
 		}
 	}
 	else
 		encodingid = get_encoding_id(encoding);
 
-	user_enc = atoi(encodingid);
-	if (!check_locale_encoding(lc_ctype, user_enc) ||
-		!check_locale_encoding(lc_collate, user_enc))
+	if (!check_locale_encoding(lc_ctype, encodingid) ||
+		!check_locale_encoding(lc_collate, encodingid))
 		exit(1);				/* check_locale_encoding printed the error */
 
 }
@@ -2589,10 +2618,10 @@ setup_data_file_paths(void)
 void
 setup_text_search(void)
 {
-	if (strlen(default_text_search_config) == 0)
+	if (!default_text_search_config)
 	{
 		default_text_search_config = find_matching_ts_config(lc_ctype);
-		if (default_text_search_config == NULL)
+		if (!default_text_search_config)
 		{
 			printf(_("%s: could not find suitable text search configuration for locale \"%s\"\n"),
 				   progname, lc_ctype);
@@ -2728,7 +2757,7 @@ create_xlog_or_symlink(void)
 	/* form name of the place for the subdirectory or symlink */
 	subdirloc = psprintf("%s/pg_wal", pg_data);
 
-	if (strcmp(xlog_dir, "") != 0)
+	if (xlog_dir)
 	{
 		int			ret;
 
@@ -2985,6 +3014,7 @@ main(int argc, char *argv[])
 		{"no-sync", no_argument, NULL, 'N'},
 		{"sync-only", no_argument, NULL, 'S'},
 		{"waldir", required_argument, NULL, 'X'},
+		{"wal-segsize", required_argument, NULL, 12},
 		{"data-checksums", no_argument, NULL, 'k'},
 		{NULL, 0, NULL, 0}
 	};
@@ -3118,6 +3148,9 @@ main(int argc, char *argv[])
 			case 'X':
 				xlog_dir = pg_strdup(optarg);
 				break;
+			case 12:
+				str_wal_segment_size_mb = pg_strdup(optarg);
+				break;
 			default:
 				/* getopt_long already emitted a complaint */
 				fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
@@ -3131,7 +3164,7 @@ main(int argc, char *argv[])
 	 * Non-option argument specifies data directory as long as it wasn't
 	 * already specified with -D / --pgdata
 	 */
-	if (optind < argc && strlen(pg_data) == 0)
+	if (optind < argc && !pg_data)
 	{
 		pg_data = pg_strdup(argv[optind]);
 		optind++;
@@ -3180,6 +3213,27 @@ main(int argc, char *argv[])
 
 	check_need_password(authmethodlocal, authmethodhost);
 
+	/* set wal segment size */
+	if (str_wal_segment_size_mb == NULL)
+		wal_segment_size_mb = (DEFAULT_XLOG_SEG_SIZE) / (1024 * 1024);
+	else
+	{
+		char	   *endptr;
+
+		/* check that the argument is a number */
+		wal_segment_size_mb = strtol(str_wal_segment_size_mb, &endptr, 10);
+
+		/* verify that wal segment size is valid */
+		if (*endptr != '\0' ||
+			!IsValidWalSegSize(wal_segment_size_mb * 1024 * 1024))
+		{
+			fprintf(stderr,
+					_("%s: --wal-segsize must be a power of two between 1 and 1024\n"),
+					progname);
+			exit(1);
+		}
+	}
+
 	get_restricted_token(progname);
 
 	setup_pgdata();
@@ -3187,7 +3241,7 @@ main(int argc, char *argv[])
 	setup_bin_paths(argv[0]);
 
 	effective_user = get_id();
-	if (strlen(username) == 0)
+	if (!username)
 		username = effective_user;
 
 	if (strncmp(username, "pg_", 3) == 0)
diff --git a/src/bin/pg_archivecleanup/.gitignore b/src/bin/pg_archivecleanup/.gitignore
index 804089070d..bd05d00156 100644
--- a/src/bin/pg_archivecleanup/.gitignore
+++ b/src/bin/pg_archivecleanup/.gitignore
@@ -1 +1,3 @@
 /pg_archivecleanup
+
+/tmp_check/
diff --git a/src/bin/pg_archivecleanup/Makefile b/src/bin/pg_archivecleanup/Makefile
index 5bda78490c..c5bf99db0f 100644
--- a/src/bin/pg_archivecleanup/Makefile
+++ b/src/bin/pg_archivecleanup/Makefile
@@ -25,3 +25,10 @@ uninstall:
 
 clean distclean maintainer-clean:
 	rm -f pg_archivecleanup$(X) $(OBJS)
+	rm -rf tmp_check
+
+check:
+	$(prove_check)
+
+installcheck:
+	$(prove_installcheck)
diff --git a/src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl b/src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl
new file mode 100644
index 0000000000..1d3a1e4fb9
--- /dev/null
+++ b/src/bin/pg_archivecleanup/t/010_pg_archivecleanup.pl
@@ -0,0 +1,81 @@
+use strict;
+use warnings;
+use TestLib;
+use Test::More tests => 42;
+
+program_help_ok('pg_archivecleanup');
+program_version_ok('pg_archivecleanup');
+program_options_handling_ok('pg_archivecleanup');
+
+my $tempdir = TestLib::tempdir;
+
+my @walfiles = (
+	'00000001000000370000000C.gz',
+	'00000001000000370000000D',
+	'00000001000000370000000E',
+	'00000001000000370000000F.partial',
+);
+
+sub create_files
+{
+	foreach my $fn (@walfiles, 'unrelated_file')
+	{
+		open my $file, '>', "$tempdir/$fn";
+		print $file 'CONTENT';
+		close $file;
+	}
+}
+
+create_files();
+
+command_fails_like(['pg_archivecleanup'],
+				   qr/must specify archive location/,
+				   'fails if archive location is not specified');
+
+command_fails_like(['pg_archivecleanup', $tempdir],
+				   qr/must specify oldest kept WAL file/,
+				   'fails if oldest kept WAL file name is not specified');
+
+command_fails_like(['pg_archivecleanup', 'notexist', 'foo'],
+				   qr/archive location .* does not exist/,
+				   'fails if archive location does not exist');
+
+command_fails_like(['pg_archivecleanup', $tempdir, 'foo', 'bar'],
+				   qr/too many command-line arguments/,
+				   'fails with too many command-line arguments');
+
+command_fails_like(['pg_archivecleanup', $tempdir, 'foo'],
+				   qr/invalid file name argument/,
+				   'fails with invalid restart file name');
+
+{
+	# like command_like but checking stderr
+	my $stderr;
+	my $result = IPC::Run::run ['pg_archivecleanup', '-d', '-n', $tempdir, $walfiles[2]], '2>', \$stderr;
+	ok($result, "pg_archivecleanup dry run: exit code 0");
+	like($stderr, qr/$walfiles[1].*would be removed/, "pg_archivecleanup dry run: matches");
+	foreach my $fn (@walfiles)
+	{
+		ok(-f "$tempdir/$fn", "$fn not removed");
+	}
+}
+
+sub run_check
+{
+	my ($suffix, $test_name) = @_;
+
+	create_files();
+
+	command_ok(['pg_archivecleanup', '-x', '.gz', $tempdir, $walfiles[2] . $suffix],
+			   "$test_name: runs");
+
+	ok(! -f "$tempdir/$walfiles[0]", "$test_name: first older WAL file was cleaned up");
+	ok(! -f "$tempdir/$walfiles[1]", "$test_name: second older WAL file was cleaned up");
+	ok(-f "$tempdir/$walfiles[2]", "$test_name: restartfile was not cleaned up");
+	ok(-f "$tempdir/$walfiles[3]", "$test_name: newer WAL file was not cleaned up");
+	ok(-f "$tempdir/unrelated_file", "$test_name: unrelated file was not cleaned up");
+}
+
+run_check('', 'pg_archivecleanup');
+run_check('.partial', 'pg_archivecleanup with .partial file');
+run_check('.00000020.backup', 'pg_archivecleanup with .backup file');
diff --git a/src/bin/pg_basebackup/Makefile b/src/bin/pg_basebackup/Makefile
index b707af9d26..54f915eec7 100644
--- a/src/bin/pg_basebackup/Makefile
+++ b/src/bin/pg_basebackup/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_basebackup
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/pg_basebackup/Makefile
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
index dfb9b5ddcb..1b32592063 100644
--- a/src/bin/pg_basebackup/pg_basebackup.c
+++ b/src/bin/pg_basebackup/pg_basebackup.c
@@ -4,7 +4,7 @@
  *
  * Author: Magnus Hagander <magnus@hagander.net>
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/pg_basebackup.c
@@ -26,6 +26,7 @@
 #include <zlib.h>
 #endif
 
+#include "access/xlog_internal.h"
 #include "common/file_utils.h"
 #include "common/string.h"
 #include "fe_utils/string_utils.h"
@@ -76,7 +77,7 @@ typedef enum
 /* Global options */
 static char *basedir = NULL;
 static TablespaceList tablespace_dirs = {NULL, NULL};
-static char *xlog_dir = "";
+static char *xlog_dir = NULL;
 static char format = 'p';		/* p(lain)/t(ar) */
 static char *label = "pg_basebackup base backup";
 static bool noclean = false;
@@ -92,6 +93,8 @@ static pg_time_t last_progress_report = 0;
 static int32 maxrate = 0;		/* no limit by default */
 static char *replication_slot = NULL;
 static bool temp_replication_slot = true;
+static bool create_slot = false;
+static bool no_slot = false;
 
 static bool success = false;
 static bool made_new_pgdata = false;
@@ -129,7 +132,7 @@ static PQExpBuffer recoveryconfcontents = NULL;
 
 /* Function headers */
 static void usage(void);
-static void disconnect_and_exit(int code);
+static void disconnect_and_exit(int code) pg_attribute_noreturn();
 static void verify_dir_is_empty_or_create(char *dirname, bool *created, bool *found);
 static void progress_report(int tablespacenum, const char *filename, bool force);
 
@@ -295,6 +298,11 @@ tablespace_list_append(const char *arg)
 		exit(1);
 	}
 
+	/*
+	 * Comparisons done with these values should involve similarly
+	 * canonicalized path values.  This is particularly sensitive on Windows
+	 * where path values may not necessarily use Unix slashes.
+	 */
 	canonicalize_path(cell->old_dir);
 	canonicalize_path(cell->new_dir);
 
@@ -335,22 +343,23 @@ usage(void)
 			 "                         (in kB/s, or use suffix \"k\" or \"M\")\n"));
 	printf(_("  -R, --write-recovery-conf\n"
 			 "                         write recovery.conf for replication\n"));
-	printf(_("  -S, --slot=SLOTNAME    replication slot to use\n"));
-	printf(_("      --no-slot          prevent creation of temporary replication slot\n"));
 	printf(_("  -T, --tablespace-mapping=OLDDIR=NEWDIR\n"
 			 "                         relocate tablespace in OLDDIR to NEWDIR\n"));
+	printf(_("      --waldir=WALDIR    location for the write-ahead log directory\n"));
 	printf(_("  -X, --wal-method=none|fetch|stream\n"
 			 "                         include required WAL files with specified method\n"));
-	printf(_("      --waldir=WALDIR    location for the write-ahead log directory\n"));
 	printf(_("  -z, --gzip             compress tar output\n"));
 	printf(_("  -Z, --compress=0-9     compress tar output with given compression level\n"));
 	printf(_("\nGeneral options:\n"));
 	printf(_("  -c, --checkpoint=fast|spread\n"
 			 "                         set fast or spread checkpointing\n"));
+	printf(_("  -C, --create-slot      create replication slot\n"));
 	printf(_("  -l, --label=LABEL      set backup label\n"));
 	printf(_("  -n, --no-clean         do not clean up after errors\n"));
 	printf(_("  -N, --no-sync          do not wait for changes to be written safely to disk\n"));
 	printf(_("  -P, --progress         show progress information\n"));
+	printf(_("  -S, --slot=SLOTNAME    replication slot to use\n"));
+	printf(_("      --no-slot          prevent creation of temporary replication slot\n"));
 	printf(_("  -v, --verbose          output verbose messages\n"));
 	printf(_("  -V, --version          output version information, then exit\n"));
 	printf(_("  -?, --help             show this help, then exit\n"));
@@ -465,7 +474,6 @@ typedef struct
 	char		xlog[MAXPGPATH];	/* directory or tarfile depending on mode */
 	char	   *sysidentifier;
 	int			timeline;
-	bool		temp_slot;
 } logstreamer_param;
 
 static int
@@ -491,9 +499,6 @@ LogStreamerMain(logstreamer_param *param)
 	stream.mark_done = true;
 	stream.partial_suffix = NULL;
 	stream.replication_slot = replication_slot;
-	stream.temp_slot = param->temp_slot;
-	if (stream.temp_slot && !stream.replication_slot)
-		stream.replication_slot = psprintf("pg_basebackup_%d", (int) PQbackendPID(param->bgconn));
 
 	if (format == 'p')
 		stream.walmethod = CreateWalDirectoryMethod(param->xlog, 0, do_sync);
@@ -555,7 +560,7 @@ StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier)
 	}
 	param->startptr = ((uint64) hi) << 32 | lo;
 	/* Round off to even segment position */
-	param->startptr -= param->startptr % XLOG_SEG_SIZE;
+	param->startptr -= XLogSegmentOffset(param->startptr, WalSegSz);
 
 #ifndef WIN32
 	/* Create our background pipe */
@@ -582,9 +587,29 @@ StartLogStreamer(char *startpos, uint32 timeline, char *sysidentifier)
 
 	/* Temporary replication slots are only supported in 10 and newer */
 	if (PQserverVersion(conn) < MINIMUM_VERSION_FOR_TEMP_SLOTS)
-		param->temp_slot = false;
-	else
-		param->temp_slot = temp_replication_slot;
+		temp_replication_slot = false;
+
+	/*
+	 * Create replication slot if requested
+	 */
+	if (temp_replication_slot && !replication_slot)
+		replication_slot = psprintf("pg_basebackup_%d", (int) PQbackendPID(param->bgconn));
+	if (temp_replication_slot || create_slot)
+	{
+		if (!CreateReplicationSlot(param->bgconn, replication_slot, NULL,
+								   temp_replication_slot, true, true, false))
+			disconnect_and_exit(1);
+
+		if (verbose)
+		{
+			if (temp_replication_slot)
+				fprintf(stderr, _("%s: created temporary replication slot \"%s\"\n"),
+						progname, replication_slot);
+			else
+				fprintf(stderr, _("%s: created replication slot \"%s\"\n"),
+						progname, replication_slot);
+		}
+	}
 
 	if (format == 'p')
 	{
@@ -786,7 +811,10 @@ progress_report(int tablespacenum, const char *filename, bool force)
 				totaldone_str, totalsize_str, percent,
 				tablespacenum, tablespacecount);
 
-	fprintf(stderr, "\r");
+	if (isatty(fileno(stderr)))
+		fprintf(stderr, "\r");
+	else
+		fprintf(stderr, "\n");
 }
 
 static int32
@@ -1283,9 +1311,14 @@ static const char *
 get_tablespace_mapping(const char *dir)
 {
 	TablespaceListCell *cell;
+	char		canon_dir[MAXPGPATH];
+
+	/* Canonicalize path for comparison consistency */
+	strlcpy(canon_dir, dir, sizeof(canon_dir));
+	canonicalize_path(canon_dir);
 
 	for (cell = tablespace_dirs.head; cell; cell = cell->next)
-		if (strcmp(dir, cell->old_dir) == 0)
+		if (strcmp(canon_dir, cell->old_dir) == 0)
 			return cell->new_dir;
 
 	return dir;
@@ -1766,7 +1799,13 @@ BaseBackup(void)
 				progname);
 
 	if (showprogress && !verbose)
-		fprintf(stderr, "waiting for checkpoint\r");
+	{
+		fprintf(stderr, "waiting for checkpoint");
+		if (isatty(fileno(stderr)))
+			fprintf(stderr, "\r");
+		else
+			fprintf(stderr, "\n");
+	}
 
 	basebkp =
 		psprintf("BASE_BACKUP LABEL '%s' %s %s %s %s %s %s",
@@ -1899,7 +1938,8 @@ BaseBackup(void)
 	if (showprogress)
 	{
 		progress_report(PQntuples(res), NULL, true);
-		fprintf(stderr, "\n");	/* Need to move to next line */
+		if (isatty(fileno(stderr)))
+			fprintf(stderr, "\n");	/* Need to move to next line */
 	}
 
 	PQclear(res);
@@ -2078,6 +2118,7 @@ main(int argc, char **argv)
 		{"pgdata", required_argument, NULL, 'D'},
 		{"format", required_argument, NULL, 'F'},
 		{"checkpoint", required_argument, NULL, 'c'},
+		{"create-slot", no_argument, NULL, 'C'},
 		{"max-rate", required_argument, NULL, 'r'},
 		{"write-recovery-conf", no_argument, NULL, 'R'},
 		{"slot", required_argument, NULL, 'S'},
@@ -2104,7 +2145,6 @@ main(int argc, char **argv)
 	int			c;
 
 	int			option_index;
-	bool		no_slot = false;
 
 	progname = get_progname(argv[0]);
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_basebackup"));
@@ -2126,11 +2166,14 @@ main(int argc, char **argv)
 
 	atexit(cleanup_directories_atexit);
 
-	while ((c = getopt_long(argc, argv, "D:F:r:RT:X:l:nNzZ:d:c:h:p:U:s:S:wWvP",
+	while ((c = getopt_long(argc, argv, "CD:F:r:RS:T:X:l:nNzZ:d:c:h:p:U:s:wWvP",
 							long_options, &option_index)) != -1)
 	{
 		switch (c)
 		{
+			case 'C':
+				create_slot = true;
+				break;
 			case 'D':
 				basedir = pg_strdup(optarg);
 				break;
@@ -2347,7 +2390,30 @@ main(int argc, char **argv)
 		temp_replication_slot = false;
 	}
 
-	if (strcmp(xlog_dir, "") != 0)
+	if (create_slot)
+	{
+		if (!replication_slot)
+		{
+			fprintf(stderr,
+					_("%s: --create-slot needs a slot to be specified using --slot\n"),
+					progname);
+			fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+					progname);
+			exit(1);
+		}
+
+		if (no_slot)
+		{
+			fprintf(stderr,
+					_("%s: --create-slot and --no-slot are incompatible options\n"),
+					progname);
+			fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+					progname);
+			exit(1);
+		}
+	}
+
+	if (xlog_dir)
 	{
 		if (format != 'p')
 		{
@@ -2397,8 +2463,12 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	/* determine remote server's xlog segment size */
+	if (!RetrieveWalSegSize(conn))
+		disconnect_and_exit(1);
+
 	/* Create pg_wal symlink, if required */
-	if (strcmp(xlog_dir, "") != 0)
+	if (xlog_dir)
 	{
 		char	   *linkloc;
 
diff --git a/src/bin/pg_basebackup/pg_receivewal.c b/src/bin/pg_basebackup/pg_receivewal.c
index 4a1a5658fb..b82e073b86 100644
--- a/src/bin/pg_basebackup/pg_receivewal.c
+++ b/src/bin/pg_basebackup/pg_receivewal.c
@@ -5,7 +5,7 @@
  *
  * Author: Magnus Hagander <magnus@hagander.net>
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/pg_receivewal.c
@@ -36,12 +36,14 @@ static int	verbose = 0;
 static int	compresslevel = 0;
 static int	noloop = 0;
 static int	standby_message_timeout = 10 * 1000;	/* 10 sec = default */
-static volatile bool time_to_abort = false;
+static volatile bool time_to_stop = false;
 static bool do_create_slot = false;
 static bool slot_exists_ok = false;
 static bool do_drop_slot = false;
+static bool do_sync = true;
 static bool synchronous = false;
 static char *replication_slot = NULL;
+static XLogRecPtr endpos = InvalidXLogRecPtr;
 
 
 static void usage(void);
@@ -77,8 +79,10 @@ usage(void)
 	printf(_("  %s [OPTION]...\n"), progname);
 	printf(_("\nOptions:\n"));
 	printf(_("  -D, --directory=DIR    receive write-ahead log files into this directory\n"));
+	printf(_("  -E, --endpos=LSN       exit after receiving the specified LSN\n"));
 	printf(_("      --if-not-exists    do not error if slot already exists when creating a slot\n"));
 	printf(_("  -n, --no-loop          do not loop on connection lost\n"));
+	printf(_("      --no-sync          do not wait for changes to be written safely to disk\n"));
 	printf(_("  -s, --status-interval=SECS\n"
 			 "                         time between status packets sent to server (default: %d)\n"), (standby_message_timeout / 1000));
 	printf(_("  -S, --slot=SLOTNAME    replication slot to use\n"));
@@ -112,6 +116,16 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 				progname, (uint32) (xlogpos >> 32), (uint32) xlogpos,
 				timeline);
 
+	if (!XLogRecPtrIsInvalid(endpos) && endpos < xlogpos)
+	{
+		if (verbose)
+			fprintf(stderr, _("%s: stopped streaming at %X/%X (timeline %u)\n"),
+					progname, (uint32) (xlogpos >> 32), (uint32) xlogpos,
+					timeline);
+		time_to_stop = true;
+		return true;
+	}
+
 	/*
 	 * Note that we report the previous, not current, position here. After a
 	 * timeline switch, xlogpos points to the beginning of the segment because
@@ -128,7 +142,7 @@ stop_streaming(XLogRecPtr xlogpos, uint32 timeline, bool segment_finished)
 	prevtimeline = timeline;
 	prevpos = xlogpos;
 
-	if (time_to_abort)
+	if (time_to_stop)
 	{
 		if (verbose)
 			fprintf(stderr, _("%s: received interrupt signal, exiting\n"),
@@ -179,7 +193,7 @@ close_destination_dir(DIR *dest_dir, char *dest_folder)
 /*
  * Determine starting location for streaming, based on any existing xlog
  * segments in the directory. We start at the end of the last one that is
- * complete (size matches XLogSegSize), on the timeline with highest ID.
+ * complete (size matches wal segment size), on the timeline with highest ID.
  *
  * If there are no WAL files in the directory, returns InvalidXLogRecPtr.
  */
@@ -230,7 +244,7 @@ FindStreamingStart(uint32 *tli)
 		/*
 		 * Looks like an xlog file. Parse its position.
 		 */
-		XLogFromFileName(dirent->d_name, &tli, &segno);
+		XLogFromFileName(dirent->d_name, &tli, &segno, WalSegSz);
 
 		/*
 		 * Check that the segment has the right size, if it's supposed to be
@@ -255,7 +269,7 @@ FindStreamingStart(uint32 *tli)
 				disconnect_and_exit(1);
 			}
 
-			if (statbuf.st_size != XLOG_SEG_SIZE)
+			if (statbuf.st_size != WalSegSz)
 			{
 				fprintf(stderr,
 						_("%s: segment file \"%s\" has incorrect size %d, skipping\n"),
@@ -296,7 +310,7 @@ FindStreamingStart(uint32 *tli)
 			bytes_out = (buf[3] << 24) | (buf[2] << 16) |
 				(buf[1] << 8) | buf[0];
 
-			if (bytes_out != XLOG_SEG_SIZE)
+			if (bytes_out != WalSegSz)
 			{
 				fprintf(stderr,
 						_("%s: compressed segment file \"%s\" has incorrect uncompressed size %d, skipping\n"),
@@ -337,7 +351,7 @@ FindStreamingStart(uint32 *tli)
 		if (!high_ispartial)
 			high_segno++;
 
-		XLogSegNoOffsetToRecPtr(high_segno, 0, high_ptr);
+		XLogSegNoOffsetToRecPtr(high_segno, 0, high_ptr, WalSegSz);
 
 		*tli = high_tli;
 		return high_ptr;
@@ -398,7 +412,7 @@ StreamLog(void)
 	/*
 	 * Always start streaming at the beginning of a segment
 	 */
-	stream.startpos -= stream.startpos % XLOG_SEG_SIZE;
+	stream.startpos -= XLogSegmentOffset(stream.startpos, WalSegSz);
 
 	/*
 	 * Start the replication
@@ -413,13 +427,12 @@ StreamLog(void)
 	stream.stop_socket = PGINVALID_SOCKET;
 	stream.standby_message_timeout = standby_message_timeout;
 	stream.synchronous = synchronous;
-	stream.do_sync = true;
+	stream.do_sync = do_sync;
 	stream.mark_done = false;
 	stream.walmethod = CreateWalDirectoryMethod(basedir, compresslevel,
 												stream.do_sync);
 	stream.partial_suffix = ".partial";
 	stream.replication_slot = replication_slot;
-	stream.temp_slot = false;
 
 	ReceiveXlogStream(conn, &stream);
 
@@ -448,7 +461,7 @@ StreamLog(void)
 static void
 sigint_handler(int signum)
 {
-	time_to_abort = true;
+	time_to_stop = true;
 }
 #endif
 
@@ -460,6 +473,7 @@ main(int argc, char **argv)
 		{"version", no_argument, NULL, 'V'},
 		{"directory", required_argument, NULL, 'D'},
 		{"dbname", required_argument, NULL, 'd'},
+		{"endpos", required_argument, NULL, 'E'},
 		{"host", required_argument, NULL, 'h'},
 		{"port", required_argument, NULL, 'p'},
 		{"username", required_argument, NULL, 'U'},
@@ -475,12 +489,15 @@ main(int argc, char **argv)
 		{"drop-slot", no_argument, NULL, 2},
 		{"if-not-exists", no_argument, NULL, 3},
 		{"synchronous", no_argument, NULL, 4},
+		{"no-sync", no_argument, NULL, 5},
 		{NULL, 0, NULL, 0}
 	};
 
 	int			c;
 	int			option_index;
 	char	   *db_name;
+	uint32		hi,
+				lo;
 
 	progname = get_progname(argv[0]);
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_basebackup"));
@@ -500,7 +517,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	while ((c = getopt_long(argc, argv, "D:d:h:p:U:s:S:nwWvZ:",
+	while ((c = getopt_long(argc, argv, "D:d:E:h:p:U:s:S:nwWvZ:",
 							long_options, &option_index)) != -1)
 	{
 		switch (c)
@@ -544,6 +561,16 @@ main(int argc, char **argv)
 			case 'S':
 				replication_slot = pg_strdup(optarg);
 				break;
+			case 'E':
+				if (sscanf(optarg, "%X/%X", &hi, &lo) != 2)
+				{
+					fprintf(stderr,
+							_("%s: could not parse end position \"%s\"\n"),
+							progname, optarg);
+					exit(1);
+				}
+				endpos = ((uint64) hi) << 32 | lo;
+				break;
 			case 'n':
 				noloop = 1;
 				break;
@@ -572,6 +599,9 @@ main(int argc, char **argv)
 			case 4:
 				synchronous = true;
 				break;
+			case 5:
+				do_sync = false;
+				break;
 			default:
 
 				/*
@@ -614,6 +644,14 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	if (synchronous && !do_sync)
+	{
+		fprintf(stderr, _("%s: cannot use --synchronous together with --no-sync\n"), progname);
+		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
+				progname);
+		exit(1);
+	}
+
 	/*
 	 * Required arguments
 	 */
@@ -665,6 +703,10 @@ main(int argc, char **argv)
 	if (!RunIdentifySystem(conn, NULL, NULL, NULL, &db_name))
 		disconnect_and_exit(1);
 
+	/* determine remote server's xlog segment size */
+	if (!RetrieveWalSegSize(conn))
+		disconnect_and_exit(1);
+
 	/*
 	 * Check that there is a database associated with connection, none should
 	 * be defined in this context.
@@ -700,7 +742,7 @@ main(int argc, char **argv)
 					_("%s: creating replication slot \"%s\"\n"),
 					progname, replication_slot);
 
-		if (!CreateReplicationSlot(conn, replication_slot, NULL, true,
+		if (!CreateReplicationSlot(conn, replication_slot, NULL, false, true, false,
 								   slot_exists_ok))
 			disconnect_and_exit(1);
 		disconnect_and_exit(0);
@@ -714,11 +756,11 @@ main(int argc, char **argv)
 	while (true)
 	{
 		StreamLog();
-		if (time_to_abort)
+		if (time_to_stop)
 		{
 			/*
-			 * We've been Ctrl-C'ed. That's not an error, so exit without an
-			 * errorcode.
+			 * We've been Ctrl-C'ed or end of streaming position has been
+			 * willingly reached, so exit without an error code.
 			 */
 			exit(0);
 		}
diff --git a/src/bin/pg_basebackup/pg_recvlogical.c b/src/bin/pg_basebackup/pg_recvlogical.c
index 6811a55e76..53e4661d68 100644
--- a/src/bin/pg_basebackup/pg_recvlogical.c
+++ b/src/bin/pg_basebackup/pg_recvlogical.c
@@ -3,7 +3,7 @@
  * pg_recvlogical.c - receive data from a logical decoding slot in a streaming
  *					  fashion and write it to a local file.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/pg_recvlogical.c
@@ -64,7 +64,7 @@ static XLogRecPtr output_fsync_lsn = InvalidXLogRecPtr;
 
 static void usage(void);
 static void StreamLogicalLog(void);
-static void disconnect_and_exit(int code);
+static void disconnect_and_exit(int code) pg_attribute_noreturn();
 static bool flushAndSendFeedback(PGconn *conn, TimestampTz *now);
 static void prepareToTerminate(PGconn *conn, XLogRecPtr endpos,
 				   bool keepalive, XLogRecPtr lsn);
@@ -979,8 +979,8 @@ main(int argc, char **argv)
 					_("%s: creating replication slot \"%s\"\n"),
 					progname, replication_slot);
 
-		if (!CreateReplicationSlot(conn, replication_slot, plugin,
-								   false, slot_exists_ok))
+		if (!CreateReplicationSlot(conn, replication_slot, plugin, false,
+								   false, false, slot_exists_ok))
 			disconnect_and_exit(1);
 		startpos = InvalidXLogRecPtr;
 	}
@@ -1037,7 +1037,7 @@ flushAndSendFeedback(PGconn *conn, TimestampTz *now)
 }
 
 /*
- * Try to inform the server about of upcoming demise, but don't wait around or
+ * Try to inform the server about our upcoming demise, but don't wait around or
  * retry on failure.
  */
 static void
diff --git a/src/bin/pg_basebackup/receivelog.c b/src/bin/pg_basebackup/receivelog.c
index 888458f4a9..1076878630 100644
--- a/src/bin/pg_basebackup/receivelog.c
+++ b/src/bin/pg_basebackup/receivelog.c
@@ -5,7 +5,7 @@
  *
  * Author: Magnus Hagander <magnus@hagander.net>
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/receivelog.c
@@ -95,17 +95,17 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 	ssize_t		size;
 	XLogSegNo	segno;
 
-	XLByteToSeg(startpoint, segno);
-	XLogFileName(current_walfile_name, stream->timeline, segno);
+	XLByteToSeg(startpoint, segno, WalSegSz);
+	XLogFileName(current_walfile_name, stream->timeline, segno, WalSegSz);
 
 	snprintf(fn, sizeof(fn), "%s%s", current_walfile_name,
 			 stream->partial_suffix ? stream->partial_suffix : "");
 
 	/*
 	 * When streaming to files, if an existing file exists we verify that it's
-	 * either empty (just created), or a complete XLogSegSize segment (in
-	 * which case it has been created and padded). Anything else indicates a
-	 * corrupt file.
+	 * either empty (just created), or a complete WalSegSz segment (in which
+	 * case it has been created and padded). Anything else indicates a corrupt
+	 * file.
 	 *
 	 * When streaming to tar, no file with this name will exist before, so we
 	 * never have to verify a size.
@@ -120,7 +120,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 					progname, fn, stream->walmethod->getlasterror());
 			return false;
 		}
-		if (size == XLogSegSize)
+		if (size == WalSegSz)
 		{
 			/* Already padded file. Open it for use */
 			f = stream->walmethod->open_for_write(current_walfile_name, stream->partial_suffix, 0);
@@ -154,7 +154,7 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 					ngettext("%s: write-ahead log file \"%s\" has %d byte, should be 0 or %d\n",
 							 "%s: write-ahead log file \"%s\" has %d bytes, should be 0 or %d\n",
 							 size),
-					progname, fn, (int) size, XLogSegSize);
+					progname, fn, (int) size, WalSegSz);
 			return false;
 		}
 		/* File existed and was empty, so fall through and open */
@@ -162,7 +162,8 @@ open_walfile(StreamCtl *stream, XLogRecPtr startpoint)
 
 	/* No file existed, so create one */
 
-	f = stream->walmethod->open_for_write(current_walfile_name, stream->partial_suffix, XLogSegSize);
+	f = stream->walmethod->open_for_write(current_walfile_name,
+										  stream->partial_suffix, WalSegSz);
 	if (f == NULL)
 	{
 		fprintf(stderr,
@@ -203,7 +204,7 @@ close_walfile(StreamCtl *stream, XLogRecPtr pos)
 
 	if (stream->partial_suffix)
 	{
-		if (currpos == XLOG_SEG_SIZE)
+		if (currpos == WalSegSz)
 			r = stream->walmethod->close(walfile, CLOSE_NORMAL);
 		else
 		{
@@ -231,7 +232,7 @@ close_walfile(StreamCtl *stream, XLogRecPtr pos)
 	 * new node. This is in line with walreceiver.c always doing a
 	 * XLogArchiveForceDone() after a complete segment.
 	 */
-	if (currpos == XLOG_SEG_SIZE && stream->mark_done)
+	if (currpos == WalSegSz && stream->mark_done)
 	{
 		/* writes error message if failed */
 		if (!mark_file_as_archived(stream, current_walfile_name))
@@ -521,24 +522,6 @@ ReceiveXlogStream(PGconn *conn, StreamCtl *stream)
 		PQclear(res);
 	}
 
-	/*
-	 * Create temporary replication slot if one is needed
-	 */
-	if (stream->temp_slot)
-	{
-		snprintf(query, sizeof(query),
-				 "CREATE_REPLICATION_SLOT \"%s\" TEMPORARY PHYSICAL RESERVE_WAL",
-				 stream->replication_slot);
-		res = PQexec(conn, query);
-		if (PQresultStatus(res) != PGRES_TUPLES_OK)
-		{
-			fprintf(stderr, _("%s: could not create temporary replication slot \"%s\": %s"),
-					progname, stream->replication_slot, PQerrorMessage(conn));
-			PQclear(res);
-			return false;
-		}
-	}
-
 	/*
 	 * initialize flush position to starting point, it's the caller's
 	 * responsibility that that's sane.
@@ -676,7 +659,8 @@ ReceiveXlogStream(PGconn *conn, StreamCtl *stream)
 			 * start streaming at the beginning of a segment.
 			 */
 			stream->timeline = newtimeline;
-			stream->startpos = stream->startpos - (stream->startpos % XLOG_SEG_SIZE);
+			stream->startpos = stream->startpos -
+				XLogSegmentOffset(stream->startpos, WalSegSz);
 			continue;
 		}
 		else if (PQresultStatus(res) == PGRES_COMMAND_OK)
@@ -763,7 +747,7 @@ ReadEndOfStreamingResult(PGresult *res, XLogRecPtr *startpos, uint32 *timeline)
 
 /*
  * The main loop of ReceiveXlogStream. Handles the COPY stream after
- * initiating streaming with the START_STREAMING command.
+ * initiating streaming with the START_REPLICATION command.
  *
  * If the COPY ends (not necessarily successfully) due a message from the
  * server, returns a PGresult and sets *stoppos to the last byte written.
@@ -1111,7 +1095,7 @@ ProcessXLogDataMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
 	*blockpos = fe_recvint64(&copybuf[1]);
 
 	/* Extract WAL location for this block */
-	xlogoff = *blockpos % XLOG_SEG_SIZE;
+	xlogoff = XLogSegmentOffset(*blockpos, WalSegSz);
 
 	/*
 	 * Verify that the initial location in the stream matches where we think
@@ -1148,11 +1132,11 @@ ProcessXLogDataMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
 		int			bytes_to_write;
 
 		/*
-		 * If crossing a WAL boundary, only write up until we reach
-		 * XLOG_SEG_SIZE.
+		 * If crossing a WAL boundary, only write up until we reach wal
+		 * segment size.
 		 */
-		if (xlogoff + bytes_left > XLOG_SEG_SIZE)
-			bytes_to_write = XLOG_SEG_SIZE - xlogoff;
+		if (xlogoff + bytes_left > WalSegSz)
+			bytes_to_write = WalSegSz - xlogoff;
 		else
 			bytes_to_write = bytes_left;
 
@@ -1182,7 +1166,7 @@ ProcessXLogDataMsg(PGconn *conn, StreamCtl *stream, char *copybuf, int len,
 		xlogoff += bytes_to_write;
 
 		/* Did we reach the end of a WAL segment? */
-		if (*blockpos % XLOG_SEG_SIZE == 0)
+		if (XLogSegmentOffset(*blockpos, WalSegSz) == 0)
 		{
 			if (!close_walfile(stream, *blockpos))
 				/* Error message written in close_walfile() */
diff --git a/src/bin/pg_basebackup/receivelog.h b/src/bin/pg_basebackup/receivelog.h
index bb786ce289..a636cf3fa0 100644
--- a/src/bin/pg_basebackup/receivelog.h
+++ b/src/bin/pg_basebackup/receivelog.h
@@ -2,7 +2,7 @@
  *
  * receivelog.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/receivelog.h
@@ -47,7 +47,6 @@ typedef struct StreamCtl
 	WalWriteMethod *walmethod;	/* How to write the WAL */
 	char	   *partial_suffix; /* Suffix appended to partially received files */
 	char	   *replication_slot;	/* Replication slot to use, or NULL */
-	bool		temp_slot;		/* Create temporary replication slot */
 } StreamCtl;
 
 
diff --git a/src/bin/pg_basebackup/streamutil.c b/src/bin/pg_basebackup/streamutil.c
index 9d40744a34..296b1888aa 100644
--- a/src/bin/pg_basebackup/streamutil.c
+++ b/src/bin/pg_basebackup/streamutil.c
@@ -5,7 +5,7 @@
  *
  * Author: Magnus Hagander <magnus@hagander.net>
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/streamutil.c
@@ -17,20 +17,24 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-/* for ntohl/htonl */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 /* local includes */
 #include "receivelog.h"
 #include "streamutil.h"
 
-#include "pqexpbuffer.h"
+#include "access/xlog_internal.h"
 #include "common/fe_memutils.h"
 #include "datatype/timestamp.h"
+#include "fe_utils/connect.h"
+#include "port/pg_bswap.h"
+#include "pqexpbuffer.h"
 
 #define ERRCODE_DUPLICATE_OBJECT  "42710"
 
+uint32		WalSegSz;
+
+/* SHOW command for replication connection was introduced in version 10 */
+#define MINIMUM_VERSION_FOR_SHOW_CMD 100000
+
 const char *progname;
 char	   *connection_string = NULL;
 char	   *dbhost = NULL;
@@ -205,6 +209,23 @@ GetConnection(void)
 	if (conn_opts)
 		PQconninfoFree(conn_opts);
 
+	/* Set always-secure search path, so malicious users can't get control. */
+	if (dbname != NULL)
+	{
+		PGresult   *res;
+
+		res = PQexec(tmpconn, ALWAYS_SECURE_SEARCH_PATH_SQL);
+		if (PQresultStatus(res) != PGRES_TUPLES_OK)
+		{
+			fprintf(stderr, _("%s: could not clear search_path: %s\n"),
+					progname, PQerrorMessage(tmpconn));
+			PQclear(res);
+			PQfinish(tmpconn);
+			exit(1);
+		}
+		PQclear(res);
+	}
+
 	/*
 	 * Ensure we have the same value of integer_datetimes (now always "on") as
 	 * the server we are connecting to.
@@ -231,6 +252,76 @@ GetConnection(void)
 	return tmpconn;
 }
 
+/*
+ * From version 10, explicitly set wal segment size using SHOW wal_segment_size
+ * since ControlFile is not accessible here.
+ */
+bool
+RetrieveWalSegSize(PGconn *conn)
+{
+	PGresult   *res;
+	char		xlog_unit[3];
+	int			xlog_val,
+				multiplier = 1;
+
+	/* check connection existence */
+	Assert(conn != NULL);
+
+	/* for previous versions set the default xlog seg size */
+	if (PQserverVersion(conn) < MINIMUM_VERSION_FOR_SHOW_CMD)
+	{
+		WalSegSz = DEFAULT_XLOG_SEG_SIZE;
+		return true;
+	}
+
+	res = PQexec(conn, "SHOW wal_segment_size");
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		fprintf(stderr, _("%s: could not send replication command \"%s\": %s\n"),
+				progname, "SHOW wal_segment_size", PQerrorMessage(conn));
+
+		PQclear(res);
+		return false;
+	}
+	if (PQntuples(res) != 1 || PQnfields(res) < 1)
+	{
+		fprintf(stderr,
+				_("%s: could not fetch WAL segment size: got %d rows and %d fields, expected %d rows and %d or more fields\n"),
+				progname, PQntuples(res), PQnfields(res), 1, 1);
+
+		PQclear(res);
+		return false;
+	}
+
+	/* fetch xlog value and unit from the result */
+	if (sscanf(PQgetvalue(res, 0, 0), "%d%s", &xlog_val, xlog_unit) != 2)
+	{
+		fprintf(stderr, _("%s: WAL segment size could not be parsed\n"),
+				progname);
+		return false;
+	}
+
+	/* set the multiplier based on unit to convert xlog_val to bytes */
+	if (strcmp(xlog_unit, "MB") == 0)
+		multiplier = 1024 * 1024;
+	else if (strcmp(xlog_unit, "GB") == 0)
+		multiplier = 1024 * 1024 * 1024;
+
+	/* convert and set WalSegSz */
+	WalSegSz = xlog_val * multiplier;
+
+	if (!IsValidWalSegSize(WalSegSz))
+	{
+		fprintf(stderr,
+				_("%s: WAL segment size must be a power of two between 1MB and 1GB, but the remote server reported a value of %d bytes\n"),
+				progname, WalSegSz);
+		return false;
+	}
+
+	PQclear(res);
+	return true;
+}
+
 /*
  * Run IDENTIFY_SYSTEM through a given connection and give back to caller
  * some result information if requested:
@@ -322,7 +413,8 @@ RunIdentifySystem(PGconn *conn, char **sysid, TimeLineID *starttli,
  */
 bool
 CreateReplicationSlot(PGconn *conn, const char *slot_name, const char *plugin,
-					  bool is_physical, bool slot_exists_ok)
+					  bool is_temporary, bool is_physical, bool reserve_wal,
+					  bool slot_exists_ok)
 {
 	PQExpBuffer query;
 	PGresult   *res;
@@ -334,13 +426,18 @@ CreateReplicationSlot(PGconn *conn, const char *slot_name, const char *plugin,
 	Assert(slot_name != NULL);
 
 	/* Build query */
+	appendPQExpBuffer(query, "CREATE_REPLICATION_SLOT \"%s\"", slot_name);
+	if (is_temporary)
+		appendPQExpBuffer(query, " TEMPORARY");
 	if (is_physical)
-		appendPQExpBuffer(query, "CREATE_REPLICATION_SLOT \"%s\" PHYSICAL",
-						  slot_name);
+	{
+		appendPQExpBuffer(query, " PHYSICAL");
+		if (reserve_wal)
+			appendPQExpBuffer(query, " RESERVE_WAL");
+	}
 	else
 	{
-		appendPQExpBuffer(query, "CREATE_REPLICATION_SLOT \"%s\" LOGICAL \"%s\"",
-						  slot_name, plugin);
+		appendPQExpBuffer(query, " LOGICAL \"%s\"", plugin);
 		if (PQserverVersion(conn) >= 100000)
 			/* pg_recvlogical doesn't use an exported snapshot, so suppress */
 			appendPQExpBuffer(query, " NOEXPORT_SNAPSHOT");
@@ -494,17 +591,9 @@ feTimestampDifferenceExceeds(TimestampTz start_time,
 void
 fe_sendint64(int64 i, char *buf)
 {
-	uint32		n32;
+	uint64		n64 = pg_hton64(i);
 
-	/* High order half first, since we're doing MSB-first */
-	n32 = (uint32) (i >> 32);
-	n32 = htonl(n32);
-	memcpy(&buf[0], &n32, 4);
-
-	/* Now the low order half */
-	n32 = (uint32) i;
-	n32 = htonl(n32);
-	memcpy(&buf[4], &n32, 4);
+	memcpy(buf, &n64, sizeof(n64));
 }
 
 /*
@@ -513,18 +602,9 @@ fe_sendint64(int64 i, char *buf)
 int64
 fe_recvint64(char *buf)
 {
-	int64		result;
-	uint32		h32;
-	uint32		l32;
-
-	memcpy(&h32, buf, 4);
-	memcpy(&l32, buf + 4, 4);
-	h32 = ntohl(h32);
-	l32 = ntohl(l32);
+	uint64		n64;
 
-	result = h32;
-	result <<= 32;
-	result |= l32;
+	memcpy(&n64, buf, sizeof(n64));
 
-	return result;
+	return pg_ntoh64(n64);
 }
diff --git a/src/bin/pg_basebackup/streamutil.h b/src/bin/pg_basebackup/streamutil.h
index 6f6878679f..6854bbc31d 100644
--- a/src/bin/pg_basebackup/streamutil.h
+++ b/src/bin/pg_basebackup/streamutil.h
@@ -2,7 +2,7 @@
  *
  * streamutil.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/streamutil.h
@@ -24,6 +24,7 @@ extern char *dbuser;
 extern char *dbport;
 extern char *dbname;
 extern int	dbgetpassword;
+extern uint32 WalSegSz;
 
 /* Connection kept global so we can disconnect easily */
 extern PGconn *conn;
@@ -32,13 +33,15 @@ extern PGconn *GetConnection(void);
 
 /* Replication commands */
 extern bool CreateReplicationSlot(PGconn *conn, const char *slot_name,
-					  const char *plugin, bool is_physical,
+					  const char *plugin, bool is_temporary,
+					  bool is_physical, bool reserve_wal,
 					  bool slot_exists_ok);
 extern bool DropReplicationSlot(PGconn *conn, const char *slot_name);
 extern bool RunIdentifySystem(PGconn *conn, char **sysid,
 				  TimeLineID *starttli,
 				  XLogRecPtr *startpos,
 				  char **db_name);
+extern bool RetrieveWalSegSize(PGconn *conn);
 extern TimestampTz feGetCurrentTimestamp(void);
 extern void feTimestampDifference(TimestampTz start_time, TimestampTz stop_time,
 					  long *secs, int *microsecs);
diff --git a/src/bin/pg_basebackup/t/010_pg_basebackup.pl b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
index a00f7b0e1a..cdf4f5be37 100644
--- a/src/bin/pg_basebackup/t/010_pg_basebackup.pl
+++ b/src/bin/pg_basebackup/t/010_pg_basebackup.pl
@@ -4,7 +4,7 @@
 use Config;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 72;
+use Test::More tests => 79;
 
 program_help_ok('pg_basebackup');
 program_version_ok('pg_basebackup');
@@ -61,6 +61,11 @@
 	close $file;
 }
 
+# Connect to a database to create global/pg_internal.init.  If this is removed
+# the test to ensure global/pg_internal.init is not copied will return a false
+# positive.
+$node->safe_psql('postgres', 'SELECT 1;');
+
 $node->command_ok([ 'pg_basebackup', '-D', "$tempdir/backup", '-X', 'none' ],
 	'pg_basebackup runs');
 ok(-f "$tempdir/backup/PG_VERSION", 'backup was created');
@@ -84,7 +89,8 @@
 
 # These files should not be copied.
 foreach my $filename (
-	qw(postgresql.auto.conf.tmp postmaster.opts postmaster.pid tablespace_map current_logfiles.tmp)
+	qw(postgresql.auto.conf.tmp postmaster.opts postmaster.pid tablespace_map current_logfiles.tmp
+		global/pg_internal.init)
   )
 {
 	ok(!-f "$tempdir/backup/$filename", "$filename not copied");
@@ -255,22 +261,45 @@
 		'stream',                '--no-slot' ],
 	'pg_basebackup -X stream runs with --no-slot');
 
-$node->command_fails(
-	[ 'pg_basebackup', '-D', "$tempdir/fail", '-S', 'slot1' ],
-	'pg_basebackup with replication slot fails without -X stream');
 $node->command_fails(
 	[   'pg_basebackup',             '-D',
 		"$tempdir/backupxs_sl_fail", '-X',
 		'stream',                    '-S',
-		'slot1' ],
+		'slot0' ],
 	'pg_basebackup fails with nonexistent replication slot');
 
+$node->command_fails(
+	[   'pg_basebackup', '-D', "$tempdir/backupxs_slot", '-C' ],
+	'pg_basebackup -C fails without slot name');
+
+$node->command_fails(
+	[   'pg_basebackup', '-D', "$tempdir/backupxs_slot", '-C', '-S', 'slot0', '--no-slot' ],
+	'pg_basebackup fails with -C -S --no-slot');
+
+$node->command_ok(
+	[   'pg_basebackup', '-D', "$tempdir/backupxs_slot", '-C', '-S', 'slot0' ],
+	'pg_basebackup -C runs');
+
+is($node->safe_psql('postgres', q{SELECT slot_name FROM pg_replication_slots WHERE slot_name = 'slot0'}),
+   'slot0',
+   'replication slot was created');
+isnt($node->safe_psql('postgres', q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot0'}),
+   '',
+   'restart LSN of new slot is not null');
+
+$node->command_fails(
+	[   'pg_basebackup', '-D', "$tempdir/backupxs_slot1", '-C', '-S', 'slot0' ],
+	'pg_basebackup fails with -C -S and a previously existing slot');
+
 $node->safe_psql('postgres',
 	q{SELECT * FROM pg_create_physical_replication_slot('slot1')});
 my $lsn = $node->safe_psql('postgres',
 	q{SELECT restart_lsn FROM pg_replication_slots WHERE slot_name = 'slot1'}
 );
 is($lsn, '', 'restart LSN of new slot is null');
+$node->command_fails(
+	[ 'pg_basebackup', '-D', "$tempdir/fail", '-S', 'slot1', '-X', 'none' ],
+	'pg_basebackup with replication slot fails without WAL streaming');
 $node->command_ok(
 	[   'pg_basebackup', '-D', "$tempdir/backupxs_sl", '-X',
 		'stream',        '-S', 'slot1' ],
diff --git a/src/bin/pg_basebackup/t/020_pg_receivewal.pl b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
index b4cb6f729d..64e3a35a87 100644
--- a/src/bin/pg_basebackup/t/020_pg_receivewal.pl
+++ b/src/bin/pg_basebackup/t/020_pg_receivewal.pl
@@ -1,8 +1,58 @@
 use strict;
 use warnings;
 use TestLib;
-use Test::More tests => 8;
+use PostgresNode;
+use Test::More tests => 18;
 
 program_help_ok('pg_receivewal');
 program_version_ok('pg_receivewal');
 program_options_handling_ok('pg_receivewal');
+
+my $primary = get_new_node('primary');
+$primary->init(allows_streaming => 1);
+$primary->start;
+
+my $stream_dir = $primary->basedir . '/archive_wal';
+mkdir($stream_dir);
+
+# Sanity checks for command line options.
+$primary->command_fails(['pg_receivewal'],
+	'pg_receivewal needs target directory specified');
+$primary->command_fails(
+	[ 'pg_receivewal', '-D', $stream_dir, '--create-slot', '--drop-slot' ],
+	'failure if both --create-slot and --drop-slot specified');
+$primary->command_fails(
+	[ 'pg_receivewal', '-D', $stream_dir, '--create-slot' ],
+	'failure if --create-slot specified without --slot');
+$primary->command_fails(
+	[ 'pg_receivewal', '-D', $stream_dir, '--synchronous', '--no-sync' ],
+	'failure if --synchronous specified with --no-sync');
+
+# Slot creation and drop
+my $slot_name = 'test';
+$primary->command_ok(
+	[ 'pg_receivewal', '--slot', $slot_name, '--create-slot' ],
+	'creating a replication slot');
+my $slot = $primary->slot($slot_name);
+is($slot->{'slot_type'}, 'physical', 'physical replication slot was created');
+is($slot->{'restart_lsn'}, '', 'restart LSN of new slot is null');
+$primary->command_ok([ 'pg_receivewal', '--slot', $slot_name, '--drop-slot' ],
+	'dropping a replication slot');
+is($primary->slot($slot_name)->{'slot_type'}, '', 'replication slot was removed');
+
+# Generate some WAL.  Use --synchronous at the same time to add more
+# code coverage.  Switch to the next segment first so that subsequent
+# restarts of pg_receivewal will see this segment as full..
+$primary->psql('postgres', 'CREATE TABLE test_table(x integer);');
+$primary->psql('postgres', 'SELECT pg_switch_wal();');
+my $nextlsn =
+  $primary->safe_psql('postgres', 'SELECT pg_current_wal_insert_lsn();');
+chomp($nextlsn);
+$primary->psql('postgres',
+	'INSERT INTO test_table VALUES (generate_series(1,100));');
+
+# Stream up to the given position.
+$primary->command_ok(
+	[   'pg_receivewal', '-D',     $stream_dir,     '--verbose',
+		'--endpos',      $nextlsn, '--synchronous', '--no-loop' ],
+	'streaming some WAL with --synchronous');
diff --git a/src/bin/pg_basebackup/walmethods.c b/src/bin/pg_basebackup/walmethods.c
index 02d368b242..b4558a0184 100644
--- a/src/bin/pg_basebackup/walmethods.c
+++ b/src/bin/pg_basebackup/walmethods.c
@@ -5,7 +5,7 @@
  * NOTE! The caller must ensure that only one method is instantiated in
  *		 any given program, and that it's only instantiated once!
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/walmethods.c
diff --git a/src/bin/pg_basebackup/walmethods.h b/src/bin/pg_basebackup/walmethods.h
index 3fdc947ab9..2d1a10fc63 100644
--- a/src/bin/pg_basebackup/walmethods.h
+++ b/src/bin/pg_basebackup/walmethods.h
@@ -2,7 +2,7 @@
  *
  * walmethods.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_basebackup/walmethods.h
diff --git a/src/bin/pg_config/Makefile b/src/bin/pg_config/Makefile
index c41008763e..02e6f9da0e 100644
--- a/src/bin/pg_config/Makefile
+++ b/src/bin/pg_config/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_config
 #
-# Copyright (c) 1998-2017, PostgreSQL Global Development Group
+# Copyright (c) 1998-2018, PostgreSQL Global Development Group
 #
 # src/bin/pg_config/Makefile
 #
diff --git a/src/bin/pg_config/pg_config.c b/src/bin/pg_config/pg_config.c
index fa2a5a9943..a341b756de 100644
--- a/src/bin/pg_config/pg_config.c
+++ b/src/bin/pg_config/pg_config.c
@@ -15,7 +15,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/bin/pg_config/pg_config.c
  *
diff --git a/src/bin/pg_controldata/Makefile b/src/bin/pg_controldata/Makefile
index fd87daa11a..28d6d666fe 100644
--- a/src/bin/pg_controldata/Makefile
+++ b/src/bin/pg_controldata/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_controldata
 #
-# Copyright (c) 1998-2017, PostgreSQL Global Development Group
+# Copyright (c) 1998-2018, PostgreSQL Global Development Group
 #
 # src/bin/pg_controldata/Makefile
 #
diff --git a/src/bin/pg_controldata/pg_controldata.c b/src/bin/pg_controldata/pg_controldata.c
index 2ea893179a..cc73b7d6c2 100644
--- a/src/bin/pg_controldata/pg_controldata.c
+++ b/src/bin/pg_controldata/pg_controldata.c
@@ -99,6 +99,7 @@ main(int argc, char *argv[])
 	char		xlogfilename[MAXFNAMELEN];
 	int			c;
 	int			i;
+	int			WalSegSz;
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_controldata"));
 
@@ -164,6 +165,15 @@ main(int argc, char *argv[])
 				 "Either the file is corrupt, or it has a different layout than this program\n"
 				 "is expecting.  The results below are untrustworthy.\n\n"));
 
+	/* set wal segment size */
+	WalSegSz = ControlFile->xlog_seg_size;
+
+	if (!IsValidWalSegSize(WalSegSz))
+		fprintf(stderr,
+				_("WARNING: WAL segment size specified, %d bytes, is not a power of two between 1MB and 1GB.\n"
+				  "The file is corrupt and the results below are untrustworthy.\n"),
+				WalSegSz);
+
 	/*
 	 * This slightly-chintzy coding will work as long as the control file
 	 * timestamps are within the range of time_t; that should be the case in
@@ -184,8 +194,9 @@ main(int argc, char *argv[])
 	 * Calculate name of the WAL file containing the latest checkpoint's REDO
 	 * start point.
 	 */
-	XLByteToSeg(ControlFile->checkPointCopy.redo, segno);
-	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID, segno);
+	XLByteToSeg(ControlFile->checkPointCopy.redo, segno, WalSegSz);
+	XLogFileName(xlogfilename, ControlFile->checkPointCopy.ThisTimeLineID,
+				 segno, WalSegSz);
 
 	/*
 	 * Format system_identifier and mock_authentication_nonce separately to
@@ -211,9 +222,6 @@ main(int argc, char *argv[])
 	printf(_("Latest checkpoint location:           %X/%X\n"),
 		   (uint32) (ControlFile->checkPoint >> 32),
 		   (uint32) ControlFile->checkPoint);
-	printf(_("Prior checkpoint location:            %X/%X\n"),
-		   (uint32) (ControlFile->prevCheckPoint >> 32),
-		   (uint32) ControlFile->prevCheckPoint);
 	printf(_("Latest checkpoint's REDO location:    %X/%X\n"),
 		   (uint32) (ControlFile->checkPointCopy.redo >> 32),
 		   (uint32) ControlFile->checkPointCopy.redo);
diff --git a/src/bin/pg_ctl/Makefile b/src/bin/pg_ctl/Makefile
index e734c952a2..4afc791cad 100644
--- a/src/bin/pg_ctl/Makefile
+++ b/src/bin/pg_ctl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_ctl
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/pg_ctl/Makefile
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 4e02c4cea1..9bc830b085 100644
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -2,21 +2,13 @@
  *
  * pg_ctl --- start/stops/restarts the PostgreSQL server
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/bin/pg_ctl/pg_ctl.c
  *
  *-------------------------------------------------------------------------
  */
 
-#ifdef WIN32
-/*
- * Need this to get defines for restricted tokens and jobs. And it
- * has to be set before any header from the Win32 API is loaded.
- */
-#define _WIN32_WINNT 0x0501
-#endif
-
 #include "postgres_fe.h"
 
 #include <fcntl.h>
@@ -152,6 +144,7 @@ static void WINAPI pgwin32_ServiceHandler(DWORD);
 static void WINAPI pgwin32_ServiceMain(DWORD, LPTSTR *);
 static void pgwin32_doRunAsService(void);
 static int	CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_service);
+static PTOKEN_PRIVILEGES GetPrivilegesToDelete(HANDLE hToken);
 #endif
 
 static pgpid_t get_pgpid(bool is_status_request);
@@ -965,7 +958,7 @@ do_restart(void)
 		write_stderr(_("%s: PID file \"%s\" does not exist\n"),
 					 progname, pid_file);
 		write_stderr(_("Is server running?\n"));
-		write_stderr(_("starting server anyway\n"));
+		write_stderr(_("trying to start server anyway\n"));
 		do_start();
 		return;
 	}
@@ -1631,11 +1624,6 @@ typedef BOOL (WINAPI * __SetInformationJobObject) (HANDLE, JOBOBJECTINFOCLASS, L
 typedef BOOL (WINAPI * __AssignProcessToJobObject) (HANDLE, HANDLE);
 typedef BOOL (WINAPI * __QueryInformationJobObject) (HANDLE, JOBOBJECTINFOCLASS, LPVOID, DWORD, LPDWORD);
 
-/* Windows API define missing from some versions of MingW headers */
-#ifndef  DISABLE_MAX_PRIVILEGE
-#define DISABLE_MAX_PRIVILEGE	0x1
-#endif
-
 /*
  * Create a restricted token, a job object sandbox, and execute the specified
  * process with it.
@@ -1658,6 +1646,7 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	HANDLE		restrictedToken;
 	SID_IDENTIFIER_AUTHORITY NtAuthority = {SECURITY_NT_AUTHORITY};
 	SID_AND_ATTRIBUTES dropSids[2];
+	PTOKEN_PRIVILEGES delPrivs;
 
 	/* Functions loaded dynamically */
 	__CreateRestrictedToken _CreateRestrictedToken = NULL;
@@ -1716,14 +1705,21 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 		return 0;
 	}
 
+	/* Get list of privileges to remove */
+	delPrivs = GetPrivilegesToDelete(origToken);
+	if (delPrivs == NULL)
+		/* Error message already printed */
+		return 0;
+
 	b = _CreateRestrictedToken(origToken,
-							   DISABLE_MAX_PRIVILEGE,
+							   0,
 							   sizeof(dropSids) / sizeof(dropSids[0]),
 							   dropSids,
-							   0, NULL,
+							   delPrivs->PrivilegeCount, delPrivs->Privileges,
 							   0, NULL,
 							   &restrictedToken);
 
+	free(delPrivs);
 	FreeSid(dropSids[1].Sid);
 	FreeSid(dropSids[0].Sid);
 	CloseHandle(origToken);
@@ -1840,6 +1836,65 @@ CreateRestrictedProcess(char *cmd, PROCESS_INFORMATION *processInfo, bool as_ser
 	 */
 	return r;
 }
+
+/*
+ * Get a list of privileges to delete from the access token. We delete all privileges
+ * except SeLockMemoryPrivilege which is needed to use large pages, and
+ * SeChangeNotifyPrivilege which is enabled by default in DISABLE_MAX_PRIVILEGE.
+ */
+static PTOKEN_PRIVILEGES
+GetPrivilegesToDelete(HANDLE hToken)
+{
+	int			i, j;
+	DWORD		length;
+	PTOKEN_PRIVILEGES tokenPrivs;
+	LUID		luidLockPages;
+	LUID		luidChangeNotify;
+
+	if (!LookupPrivilegeValue(NULL, SE_LOCK_MEMORY_NAME, &luidLockPages) ||
+		!LookupPrivilegeValue(NULL, SE_CHANGE_NOTIFY_NAME, &luidChangeNotify))
+	{
+		write_stderr(_("%s: could not get LUIDs for privileges: error code %lu\n"),
+					 progname, (unsigned long) GetLastError());
+		return NULL;
+	}
+
+	if (!GetTokenInformation(hToken, TokenPrivileges, NULL, 0, &length) &&
+		GetLastError() != ERROR_INSUFFICIENT_BUFFER)
+	{
+		write_stderr(_("%s: could not get token information: error code %lu\n"),
+					 progname, (unsigned long) GetLastError());
+		return NULL;
+	}
+
+	tokenPrivs = (PTOKEN_PRIVILEGES) malloc(length);
+	if (tokenPrivs == NULL)
+	{
+		write_stderr(_("%s: out of memory\n"), progname);
+		return NULL;
+	}
+
+	if (!GetTokenInformation(hToken, TokenPrivileges, tokenPrivs, length, &length))
+	{
+		write_stderr(_("%s: could not get token information: error code %lu\n"),
+					 progname, (unsigned long) GetLastError());
+		free(tokenPrivs);
+		return NULL;
+	}
+
+	for (i = 0; i < tokenPrivs->PrivilegeCount; i++)
+	{
+		if (memcmp(&tokenPrivs->Privileges[i].Luid, &luidLockPages, sizeof(LUID)) == 0 ||
+			memcmp(&tokenPrivs->Privileges[i].Luid, &luidChangeNotify, sizeof(LUID)) == 0)
+		{
+			for (j = i; j < tokenPrivs->PrivilegeCount - 1; j++)
+				tokenPrivs->Privileges[j] = tokenPrivs->Privileges[j + 1];
+			tokenPrivs->PrivilegeCount--;
+		}
+	}
+
+	return tokenPrivs;
+}
 #endif							/* WIN32 */
 
 static void
@@ -1903,7 +1958,7 @@ do_help(void)
 	printf(_("  immediate   quit without complete shutdown; will lead to recovery on restart\n"));
 
 	printf(_("\nAllowed signal names for kill:\n"));
-	printf("  ABRT HUP INT QUIT TERM USR1 USR2\n");
+	printf("  ABRT HUP INT KILL QUIT TERM USR1 USR2\n");
 
 #ifdef WIN32
 	printf(_("\nOptions for register and unregister:\n"));
@@ -1961,11 +2016,8 @@ set_sig(char *signame)
 		sig = SIGQUIT;
 	else if (strcmp(signame, "ABRT") == 0)
 		sig = SIGABRT;
-#if 0
-	/* probably should NOT provide SIGKILL */
 	else if (strcmp(signame, "KILL") == 0)
 		sig = SIGKILL;
-#endif
 	else if (strcmp(signame, "TERM") == 0)
 		sig = SIGTERM;
 	else if (strcmp(signame, "USR1") == 0)
diff --git a/src/bin/pg_dump/Makefile b/src/bin/pg_dump/Makefile
index 3700884720..e3bfc95f16 100644
--- a/src/bin/pg_dump/Makefile
+++ b/src/bin/pg_dump/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_dump
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/pg_dump/Makefile
diff --git a/src/bin/pg_dump/common.c b/src/bin/pg_dump/common.c
index 4b47951de1..0a758f14bf 100644
--- a/src/bin/pg_dump/common.c
+++ b/src/bin/pg_dump/common.c
@@ -4,7 +4,7 @@
  *	Catalog routines used by pg_dump; long ago these were shared
  *	by another dump tool, but not anymore.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -68,6 +68,7 @@ static int	numextmembers;
 
 static void flagInhTables(Archive *fout, TableInfo *tbinfo, int numTables,
 			  InhInfo *inhinfo, int numInherits);
+static void flagInhIndexes(Archive *fout, TableInfo *tblinfo, int numTables);
 static void flagInhAttrs(DumpOptions *dopt, TableInfo *tblinfo, int numTables);
 static DumpableObject **buildIndexArray(void *objArray, int numObjs,
 				Size objSize);
@@ -76,6 +77,8 @@ static int	ExtensionMemberIdCompare(const void *p1, const void *p2);
 static void findParentsByOid(TableInfo *self,
 				 InhInfo *inhinfo, int numInherits);
 static int	strInArray(const char *pattern, char **arr, int arr_size);
+static IndxInfo *findIndexByOid(Oid oid, DumpableObject **idxinfoindex,
+			   int numIndexes);
 
 
 /*
@@ -257,9 +260,13 @@ getSchemaData(Archive *fout, int *numTablesPtr)
 		write_msg(NULL, "reading indexes\n");
 	getIndexes(fout, tblinfo, numTables);
 
+	if (g_verbose)
+		write_msg(NULL, "flagging indexes in partitioned tables\n");
+	flagInhIndexes(fout, tblinfo, numTables);
+
 	if (g_verbose)
 		write_msg(NULL, "reading extended statistics\n");
-	getExtendedStatistics(fout, tblinfo, numTables);
+	getExtendedStatistics(fout);
 
 	if (g_verbose)
 		write_msg(NULL, "reading constraints\n");
@@ -342,7 +349,10 @@ flagInhTables(Archive *fout, TableInfo *tblinfo, int numTables,
 		if (find_parents)
 			findParentsByOid(&tblinfo[i], inhinfo, numInherits);
 
-		/* If needed, mark the parents as interesting for getTableAttrs. */
+		/*
+		 * If needed, mark the parents as interesting for getTableAttrs
+		 * and getIndexes.
+		 */
 		if (mark_parents)
 		{
 			int			numParents = tblinfo[i].numParents;
@@ -354,6 +364,89 @@ flagInhTables(Archive *fout, TableInfo *tblinfo, int numTables,
 	}
 }
 
+/*
+ * flagInhIndexes -
+ *	 Create AttachIndexInfo objects for partitioned indexes, and add
+ *	 appropriate dependency links.
+ */
+static void
+flagInhIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
+{
+	int		i,
+			j,
+			k;
+	DumpableObject ***parentIndexArray;
+
+	parentIndexArray = (DumpableObject ***)
+		pg_malloc0(getMaxDumpId() * sizeof(DumpableObject **));
+
+	for (i = 0; i < numTables; i++)
+	{
+		TableInfo	   *parenttbl;
+		IndexAttachInfo *attachinfo;
+
+		if (!tblinfo[i].ispartition || tblinfo[i].numParents == 0)
+			continue;
+
+		Assert(tblinfo[i].numParents == 1);
+		parenttbl = tblinfo[i].parents[0];
+
+		/*
+		 * We need access to each parent table's index list, but there is no
+		 * index to cover them outside of this function.  To avoid having to
+		 * sort every parent table's indexes each time we come across each of
+		 * its partitions, create an indexed array for each parent the first
+		 * time it is required.
+		 */
+		if (parentIndexArray[parenttbl->dobj.dumpId] == NULL)
+			parentIndexArray[parenttbl->dobj.dumpId] =
+				buildIndexArray(parenttbl->indexes,
+								parenttbl->numIndexes,
+								sizeof(IndxInfo));
+
+		attachinfo = (IndexAttachInfo *)
+			pg_malloc0(tblinfo[i].numIndexes * sizeof(IndexAttachInfo));
+		for (j = 0, k = 0; j < tblinfo[i].numIndexes; j++)
+		{
+			IndxInfo   *index = &(tblinfo[i].indexes[j]);
+			IndxInfo   *parentidx;
+
+			if (index->parentidx == 0)
+				continue;
+
+			parentidx = findIndexByOid(index->parentidx,
+									   parentIndexArray[parenttbl->dobj.dumpId],
+									   parenttbl->numIndexes);
+			if (parentidx == NULL)
+				continue;
+
+			attachinfo[k].dobj.objType = DO_INDEX_ATTACH;
+			attachinfo[k].dobj.catId.tableoid = 0;
+			attachinfo[k].dobj.catId.oid = 0;
+			AssignDumpId(&attachinfo[k].dobj);
+			attachinfo[k].dobj.name = pg_strdup(index->dobj.name);
+			attachinfo[k].parentIdx = parentidx;
+			attachinfo[k].partitionIdx = index;
+
+			/*
+			 * We want dependencies from parent to partition (so that the
+			 * partition index is created first), and another one from
+			 * attach object to parent (so that the partition index is
+			 * attached once the parent index has been created).
+			 */
+			addObjectDependency(&parentidx->dobj, index->dobj.dumpId);
+			addObjectDependency(&attachinfo[k].dobj, parentidx->dobj.dumpId);
+
+			k++;
+		}
+	}
+
+	for (i = 0; i < numTables; i++)
+		if (parentIndexArray[i])
+			pg_free(parentIndexArray[i]);
+	pg_free(parentIndexArray);
+}
+
 /* flagInhAttrs -
  *	 for each dumpable table in tblinfo, flag its inherited attributes
  *
@@ -827,6 +920,18 @@ findExtensionByOid(Oid oid)
 	return (ExtensionInfo *) findObjectByOid(oid, extinfoindex, numExtensions);
 }
 
+/*
+ * findIndexByOid
+ *		find the entry of the index with the given oid
+ *
+ * This one's signature is different from the previous ones because we lack a
+ * global array of all indexes, so caller must pass their array as argument.
+ */
+static IndxInfo *
+findIndexByOid(Oid oid, DumpableObject **idxinfoindex, int numIndexes)
+{
+	return (IndxInfo *) findObjectByOid(oid, idxinfoindex, numIndexes);
+}
 
 /*
  * setExtensionMembership
diff --git a/src/bin/pg_dump/compress_io.c b/src/bin/pg_dump/compress_io.c
index 54003f7da6..a96da15dc1 100644
--- a/src/bin/pg_dump/compress_io.c
+++ b/src/bin/pg_dump/compress_io.c
@@ -4,7 +4,7 @@
  *	 Routines for archivers to write an uncompressed or compressed data
  *	 stream.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * This file includes two APIs for dealing with compressed data. The first
diff --git a/src/bin/pg_dump/compress_io.h b/src/bin/pg_dump/compress_io.h
index f42eb84007..10fde8bdef 100644
--- a/src/bin/pg_dump/compress_io.h
+++ b/src/bin/pg_dump/compress_io.h
@@ -3,7 +3,7 @@
  * compress_io.h
  *	 Interface to compress_io.c routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/bin/pg_dump/dumputils.c b/src/bin/pg_dump/dumputils.c
index dfc611848b..7f5bb1343e 100644
--- a/src/bin/pg_dump/dumputils.c
+++ b/src/bin/pg_dump/dumputils.c
@@ -5,7 +5,7 @@
  * Basically this is stuff that is useful in both pg_dump and pg_dumpall.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/dumputils.c
@@ -32,8 +32,9 @@ static void AddAcl(PQExpBuffer aclbuf, const char *keyword,
  *
  *	name: the object name, in the form to use in the commands (already quoted)
  *	subname: the sub-object name, if any (already quoted); NULL if none
+ *	nspname: the namespace the object is in (NULL if none); not pre-quoted
  *	type: the object type (as seen in GRANT command: must be one of
- *		TABLE, SEQUENCE, FUNCTION, LANGUAGE, SCHEMA, DATABASE, TABLESPACE,
+ *		TABLE, SEQUENCE, FUNCTION, PROCEDURE, LANGUAGE, SCHEMA, DATABASE, TABLESPACE,
  *		FOREIGN DATA WRAPPER, SERVER, or LARGE OBJECT)
  *	acls: the ACL string fetched from the database
  *	racls: the ACL string of any initial-but-now-revoked privileges
@@ -42,7 +43,7 @@ static void AddAcl(PQExpBuffer aclbuf, const char *keyword,
  *	prefix: string to prefix to each generated command; typically empty
  *	remoteVersion: version of database
  *
- * Returns TRUE if okay, FALSE if could not parse the acl string.
+ * Returns true if okay, false if could not parse the acl string.
  * The resulting commands (if any) are appended to the contents of 'sql'.
  *
  * Note: when processing a default ACL, prefix is "ALTER DEFAULT PRIVILEGES "
@@ -52,7 +53,7 @@ static void AddAcl(PQExpBuffer aclbuf, const char *keyword,
  * since this routine uses fmtId() internally.
  */
 bool
-buildACLCommands(const char *name, const char *subname,
+buildACLCommands(const char *name, const char *subname, const char *nspname,
 				 const char *type, const char *acls, const char *racls,
 				 const char *owner, const char *prefix, int remoteVersion,
 				 PQExpBuffer sql)
@@ -152,7 +153,10 @@ buildACLCommands(const char *name, const char *subname,
 		appendPQExpBuffer(firstsql, "%sREVOKE ALL", prefix);
 		if (subname)
 			appendPQExpBuffer(firstsql, "(%s)", subname);
-		appendPQExpBuffer(firstsql, " ON %s %s FROM PUBLIC;\n", type, name);
+		appendPQExpBuffer(firstsql, " ON %s ", type);
+		if (nspname && *nspname)
+			appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+		appendPQExpBuffer(firstsql, "%s FROM PUBLIC;\n", name);
 	}
 	else
 	{
@@ -170,8 +174,11 @@ buildACLCommands(const char *name, const char *subname,
 			{
 				if (privs->len > 0)
 				{
-					appendPQExpBuffer(firstsql, "%sREVOKE %s ON %s %s FROM ",
-									  prefix, privs->data, type, name);
+					appendPQExpBuffer(firstsql, "%sREVOKE %s ON %s ",
+									  prefix, privs->data, type);
+					if (nspname && *nspname)
+						appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+					appendPQExpBuffer(firstsql, "%s FROM ", name);
 					if (grantee->len == 0)
 						appendPQExpBufferStr(firstsql, "PUBLIC;\n");
 					else if (strncmp(grantee->data, "group ",
@@ -185,8 +192,11 @@ buildACLCommands(const char *name, const char *subname,
 				if (privswgo->len > 0)
 				{
 					appendPQExpBuffer(firstsql,
-									  "%sREVOKE GRANT OPTION FOR %s ON %s %s FROM ",
-									  prefix, privswgo->data, type, name);
+									  "%sREVOKE GRANT OPTION FOR %s ON %s ",
+									  prefix, privswgo->data, type);
+					if (nspname && *nspname)
+						appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+					appendPQExpBuffer(firstsql, "%s FROM ", name);
 					if (grantee->len == 0)
 						appendPQExpBufferStr(firstsql, "PUBLIC");
 					else if (strncmp(grantee->data, "group ",
@@ -251,18 +261,33 @@ buildACLCommands(const char *name, const char *subname,
 					appendPQExpBuffer(firstsql, "%sREVOKE ALL", prefix);
 					if (subname)
 						appendPQExpBuffer(firstsql, "(%s)", subname);
-					appendPQExpBuffer(firstsql, " ON %s %s FROM %s;\n",
-									  type, name, fmtId(grantee->data));
+					appendPQExpBuffer(firstsql, " ON %s ", type);
+					if (nspname && *nspname)
+						appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+					appendPQExpBuffer(firstsql, "%s FROM %s;\n",
+									  name, fmtId(grantee->data));
 					if (privs->len > 0)
+					{
 						appendPQExpBuffer(firstsql,
-										  "%sGRANT %s ON %s %s TO %s;\n",
-										  prefix, privs->data, type, name,
-										  fmtId(grantee->data));
+										  "%sGRANT %s ON %s ",
+										  prefix, privs->data, type);
+						if (nspname && *nspname)
+							appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+						appendPQExpBuffer(firstsql,
+										  "%s TO %s;\n",
+										  name, fmtId(grantee->data));
+					}
 					if (privswgo->len > 0)
+					{
 						appendPQExpBuffer(firstsql,
-										  "%sGRANT %s ON %s %s TO %s WITH GRANT OPTION;\n",
-										  prefix, privswgo->data, type, name,
-										  fmtId(grantee->data));
+										  "%sGRANT %s ON %s ",
+										  prefix, privswgo->data, type);
+						if (nspname && *nspname)
+							appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+						appendPQExpBuffer(firstsql,
+										  "%s TO %s WITH GRANT OPTION;\n",
+										  name, fmtId(grantee->data));
+					}
 				}
 			}
 			else
@@ -284,8 +309,11 @@ buildACLCommands(const char *name, const char *subname,
 
 				if (privs->len > 0)
 				{
-					appendPQExpBuffer(secondsql, "%sGRANT %s ON %s %s TO ",
-									  prefix, privs->data, type, name);
+					appendPQExpBuffer(secondsql, "%sGRANT %s ON %s ",
+									  prefix, privs->data, type);
+					if (nspname && *nspname)
+						appendPQExpBuffer(secondsql, "%s.", fmtId(nspname));
+					appendPQExpBuffer(secondsql, "%s TO ", name);
 					if (grantee->len == 0)
 						appendPQExpBufferStr(secondsql, "PUBLIC;\n");
 					else if (strncmp(grantee->data, "group ",
@@ -297,8 +325,11 @@ buildACLCommands(const char *name, const char *subname,
 				}
 				if (privswgo->len > 0)
 				{
-					appendPQExpBuffer(secondsql, "%sGRANT %s ON %s %s TO ",
-									  prefix, privswgo->data, type, name);
+					appendPQExpBuffer(secondsql, "%sGRANT %s ON %s ",
+									  prefix, privswgo->data, type);
+					if (nspname && *nspname)
+						appendPQExpBuffer(secondsql, "%s.", fmtId(nspname));
+					appendPQExpBuffer(secondsql, "%s TO ", name);
 					if (grantee->len == 0)
 						appendPQExpBufferStr(secondsql, "PUBLIC");
 					else if (strncmp(grantee->data, "group ",
@@ -328,8 +359,11 @@ buildACLCommands(const char *name, const char *subname,
 		appendPQExpBuffer(firstsql, "%sREVOKE ALL", prefix);
 		if (subname)
 			appendPQExpBuffer(firstsql, "(%s)", subname);
-		appendPQExpBuffer(firstsql, " ON %s %s FROM %s;\n",
-						  type, name, fmtId(owner));
+		appendPQExpBuffer(firstsql, " ON %s ", type);
+		if (nspname && *nspname)
+			appendPQExpBuffer(firstsql, "%s.", fmtId(nspname));
+		appendPQExpBuffer(firstsql, "%s FROM %s;\n",
+						  name, fmtId(owner));
 	}
 
 	destroyPQExpBuffer(grantee);
@@ -359,7 +393,7 @@ buildACLCommands(const char *name, const char *subname,
  *	owner: username of privileges owner (will be passed through fmtId)
  *	remoteVersion: version of database
  *
- * Returns TRUE if okay, FALSE if could not parse the acl string.
+ * Returns true if okay, false if could not parse the acl string.
  * The resulting commands (if any) are appended to the contents of 'sql'.
  */
 bool
@@ -388,7 +422,8 @@ buildDefaultACLCommands(const char *type, const char *nspname,
 	if (strlen(initacls) != 0 || strlen(initracls) != 0)
 	{
 		appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\n");
-		if (!buildACLCommands("", NULL, type, initacls, initracls, owner,
+		if (!buildACLCommands("", NULL, NULL, type,
+							  initacls, initracls, owner,
 							  prefix->data, remoteVersion, sql))
 		{
 			destroyPQExpBuffer(prefix);
@@ -397,7 +432,8 @@ buildDefaultACLCommands(const char *type, const char *nspname,
 		appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\n");
 	}
 
-	if (!buildACLCommands("", NULL, type, acls, racls, owner,
+	if (!buildACLCommands("", NULL, NULL, type,
+						  acls, racls, owner,
 						  prefix->data, remoteVersion, sql))
 	{
 		destroyPQExpBuffer(prefix);
@@ -524,6 +560,9 @@ do { \
 	else if (strcmp(type, "FUNCTION") == 0 ||
 			 strcmp(type, "FUNCTIONS") == 0)
 		CONVERT_PRIV('X', "EXECUTE");
+	else if (strcmp(type, "PROCEDURE") == 0 ||
+			 strcmp(type, "PROCEDURES") == 0)
+		CONVERT_PRIV('X', "EXECUTE");
 	else if (strcmp(type, "LANGUAGE") == 0)
 		CONVERT_PRIV('U', "USAGE");
 	else if (strcmp(type, "SCHEMA") == 0 ||
@@ -638,26 +677,32 @@ AddAcl(PQExpBuffer aclbuf, const char *keyword, const char *subname)
  * buildShSecLabelQuery
  *
  * Build a query to retrieve security labels for a shared object.
+ * The object is identified by its OID plus the name of the catalog
+ * it can be found in (e.g., "pg_database" for database names).
+ * The query is appended to "sql".  (We don't execute it here so as to
+ * keep this file free of assumptions about how to deal with SQL errors.)
  */
 void
-buildShSecLabelQuery(PGconn *conn, const char *catalog_name, uint32 objectId,
+buildShSecLabelQuery(PGconn *conn, const char *catalog_name, Oid objectId,
 					 PQExpBuffer sql)
 {
 	appendPQExpBuffer(sql,
 					  "SELECT provider, label FROM pg_catalog.pg_shseclabel "
-					  "WHERE classoid = '%s'::pg_catalog.regclass AND "
-					  "objoid = %u", catalog_name, objectId);
+					  "WHERE classoid = 'pg_catalog.%s'::pg_catalog.regclass "
+					  "AND objoid = '%u'", catalog_name, objectId);
 }
 
 /*
  * emitShSecLabels
  *
- * Format security label data retrieved by the query generated in
- * buildShSecLabelQuery.
+ * Construct SECURITY LABEL commands using the data retrieved by the query
+ * generated by buildShSecLabelQuery, and append them to "buffer".
+ * Here, the target object is identified by its type name (e.g. "DATABASE")
+ * and its name (not pre-quoted).
  */
 void
 emitShSecLabels(PGconn *conn, PGresult *res, PQExpBuffer buffer,
-				const char *target, const char *objname)
+				const char *objtype, const char *objname)
 {
 	int			i;
 
@@ -669,7 +714,7 @@ emitShSecLabels(PGconn *conn, PGresult *res, PQExpBuffer buffer,
 		/* must use fmtId result before calling it again */
 		appendPQExpBuffer(buffer,
 						  "SECURITY LABEL FOR %s ON %s",
-						  fmtId(provider), target);
+						  fmtId(provider), objtype);
 		appendPQExpBuffer(buffer,
 						  " %s IS ",
 						  fmtId(objname));
@@ -722,21 +767,36 @@ buildACLQueries(PQExpBuffer acl_subquery, PQExpBuffer racl_subquery,
 	 * We always perform this delta on all ACLs and expect that by the time
 	 * these are run the initial privileges will be in place, even in a binary
 	 * upgrade situation (see below).
+	 *
+	 * Finally, the order in which privileges are in the ACL string (the order
+	 * they been GRANT'd in, which the backend maintains) must be preserved to
+	 * ensure that GRANTs WITH GRANT OPTION and subsequent GRANTs based on
+	 * those are dumped in the correct order.
 	 */
-	printfPQExpBuffer(acl_subquery, "(SELECT pg_catalog.array_agg(acl) FROM "
-					  "(SELECT pg_catalog.unnest(coalesce(%s,pg_catalog.acldefault(%s,%s))) AS acl "
-					  "EXCEPT "
-					  "SELECT pg_catalog.unnest(coalesce(pip.initprivs,pg_catalog.acldefault(%s,%s)))) as foo)",
+	printfPQExpBuffer(acl_subquery,
+					  "(SELECT pg_catalog.array_agg(acl ORDER BY row_n) FROM "
+					  "(SELECT acl, row_n FROM "
+					  "pg_catalog.unnest(coalesce(%s,pg_catalog.acldefault(%s,%s))) "
+					  "WITH ORDINALITY AS perm(acl,row_n) "
+					  "WHERE NOT EXISTS ( "
+					  "SELECT 1 FROM "
+					  "pg_catalog.unnest(coalesce(pip.initprivs,pg_catalog.acldefault(%s,%s))) "
+					  "AS init(init_acl) WHERE acl = init_acl)) as foo)",
 					  acl_column,
 					  obj_kind,
 					  acl_owner,
 					  obj_kind,
 					  acl_owner);
 
-	printfPQExpBuffer(racl_subquery, "(SELECT pg_catalog.array_agg(acl) FROM "
-					  "(SELECT pg_catalog.unnest(coalesce(pip.initprivs,pg_catalog.acldefault(%s,%s))) AS acl "
-					  "EXCEPT "
-					  "SELECT pg_catalog.unnest(coalesce(%s,pg_catalog.acldefault(%s,%s)))) as foo)",
+	printfPQExpBuffer(racl_subquery,
+					  "(SELECT pg_catalog.array_agg(acl ORDER BY row_n) FROM "
+					  "(SELECT acl, row_n FROM "
+					  "pg_catalog.unnest(coalesce(pip.initprivs,pg_catalog.acldefault(%s,%s))) "
+					  "WITH ORDINALITY AS initp(acl,row_n) "
+					  "WHERE NOT EXISTS ( "
+					  "SELECT 1 FROM "
+					  "pg_catalog.unnest(coalesce(%s,pg_catalog.acldefault(%s,%s))) "
+					  "AS permp(orig_acl) WHERE acl = orig_acl)) as foo)",
 					  obj_kind,
 					  acl_owner,
 					  acl_column,
@@ -761,19 +821,25 @@ buildACLQueries(PQExpBuffer acl_subquery, PQExpBuffer racl_subquery,
 	{
 		printfPQExpBuffer(init_acl_subquery,
 						  "CASE WHEN privtype = 'e' THEN "
-						  "(SELECT pg_catalog.array_agg(acl) FROM "
-						  "(SELECT pg_catalog.unnest(pip.initprivs) AS acl "
-						  "EXCEPT "
-						  "SELECT pg_catalog.unnest(pg_catalog.acldefault(%s,%s))) as foo) END",
+						  "(SELECT pg_catalog.array_agg(acl ORDER BY row_n) FROM "
+						  "(SELECT acl, row_n FROM pg_catalog.unnest(pip.initprivs) "
+						  "WITH ORDINALITY AS initp(acl,row_n) "
+						  "WHERE NOT EXISTS ( "
+						  "SELECT 1 FROM "
+						  "pg_catalog.unnest(pg_catalog.acldefault(%s,%s)) "
+						  "AS privm(orig_acl) WHERE acl = orig_acl)) as foo) END",
 						  obj_kind,
 						  acl_owner);
 
 		printfPQExpBuffer(init_racl_subquery,
 						  "CASE WHEN privtype = 'e' THEN "
 						  "(SELECT pg_catalog.array_agg(acl) FROM "
-						  "(SELECT pg_catalog.unnest(pg_catalog.acldefault(%s,%s)) AS acl "
-						  "EXCEPT "
-						  "SELECT pg_catalog.unnest(pip.initprivs)) as foo) END",
+						  "(SELECT acl, row_n FROM "
+						  "pg_catalog.unnest(pg_catalog.acldefault(%s,%s)) "
+						  "WITH ORDINALITY AS privp(acl,row_n) "
+						  "WHERE NOT EXISTS ( "
+						  "SELECT 1 FROM pg_catalog.unnest(pip.initprivs) "
+						  "AS initp(init_acl) WHERE acl = init_acl)) as foo) END",
 						  obj_kind,
 						  acl_owner);
 	}
@@ -783,3 +849,54 @@ buildACLQueries(PQExpBuffer acl_subquery, PQExpBuffer racl_subquery,
 		printfPQExpBuffer(init_racl_subquery, "NULL");
 	}
 }
+
+/*
+ * Helper function for dumping "ALTER DATABASE/ROLE SET ..." commands.
+ *
+ * Parse the contents of configitem (a "name=value" string), wrap it in
+ * a complete ALTER command, and append it to buf.
+ *
+ * type is DATABASE or ROLE, and name is the name of the database or role.
+ * If we need an "IN" clause, type2 and name2 similarly define what to put
+ * there; otherwise they should be NULL.
+ * conn is used only to determine string-literal quoting conventions.
+ */
+void
+makeAlterConfigCommand(PGconn *conn, const char *configitem,
+					   const char *type, const char *name,
+					   const char *type2, const char *name2,
+					   PQExpBuffer buf)
+{
+	char	   *mine;
+	char	   *pos;
+
+	/* Parse the configitem.  If we can't find an "=", silently do nothing. */
+	mine = pg_strdup(configitem);
+	pos = strchr(mine, '=');
+	if (pos == NULL)
+	{
+		pg_free(mine);
+		return;
+	}
+	*pos++ = '\0';
+
+	/* Build the command, with suitable quoting for everything. */
+	appendPQExpBuffer(buf, "ALTER %s %s ", type, fmtId(name));
+	if (type2 != NULL && name2 != NULL)
+		appendPQExpBuffer(buf, "IN %s %s ", type2, fmtId(name2));
+	appendPQExpBuffer(buf, "SET %s TO ", fmtId(mine));
+
+	/*
+	 * Some GUC variable names are 'LIST' type and hence must not be quoted.
+	 * XXX this list is incomplete ...
+	 */
+	if (pg_strcasecmp(mine, "DateStyle") == 0
+		|| pg_strcasecmp(mine, "search_path") == 0)
+		appendPQExpBufferStr(buf, pos);
+	else
+		appendStringLiteralConn(buf, pos, conn);
+
+	appendPQExpBufferStr(buf, ";\n");
+
+	pg_free(mine);
+}
diff --git a/src/bin/pg_dump/dumputils.h b/src/bin/pg_dump/dumputils.h
index fe364dd8c4..a9e26ae72a 100644
--- a/src/bin/pg_dump/dumputils.h
+++ b/src/bin/pg_dump/dumputils.h
@@ -5,7 +5,7 @@
  * Basically this is stuff that is useful in both pg_dump and pg_dumpall.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/dumputils.h
@@ -36,7 +36,7 @@
 #endif
 
 
-extern bool buildACLCommands(const char *name, const char *subname,
+extern bool buildACLCommands(const char *name, const char *subname, const char *nspname,
 				 const char *type, const char *acls, const char *racls,
 				 const char *owner, const char *prefix, int remoteVersion,
 				 PQExpBuffer sql);
@@ -47,13 +47,18 @@ extern bool buildDefaultACLCommands(const char *type, const char *nspname,
 						int remoteVersion,
 						PQExpBuffer sql);
 extern void buildShSecLabelQuery(PGconn *conn, const char *catalog_name,
-					 uint32 objectId, PQExpBuffer sql);
+					 Oid objectId, PQExpBuffer sql);
 extern void emitShSecLabels(PGconn *conn, PGresult *res,
-				PQExpBuffer buffer, const char *target, const char *objname);
+				PQExpBuffer buffer, const char *objtype, const char *objname);
 
 extern void buildACLQueries(PQExpBuffer acl_subquery, PQExpBuffer racl_subquery,
 				PQExpBuffer init_acl_subquery, PQExpBuffer init_racl_subquery,
 				const char *acl_column, const char *acl_owner,
 				const char *obj_kind, bool binary_upgrade);
 
+extern void makeAlterConfigCommand(PGconn *conn, const char *configitem,
+					   const char *type, const char *name,
+					   const char *type2, const char *name2,
+					   PQExpBuffer buf);
+
 #endif							/* DUMPUTILS_H */
diff --git a/src/bin/pg_dump/parallel.c b/src/bin/pg_dump/parallel.c
index 8ad51942ff..02e79f2f27 100644
--- a/src/bin/pg_dump/parallel.c
+++ b/src/bin/pg_dump/parallel.c
@@ -4,7 +4,7 @@
  *
  *	Parallel support for pg_dump and pg_restore
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -63,7 +63,9 @@
 
 #include "parallel.h"
 #include "pg_backup_utils.h"
+
 #include "fe_utils/string_utils.h"
+#include "port/pg_bswap.h"
 
 /* Mnemonic macros for indexing the fd array returned by pipe(2) */
 #define PIPE_READ							0
@@ -1764,8 +1766,8 @@ pgpipe(int handles[2])
 
 	memset((void *) &serv_addr, 0, sizeof(serv_addr));
 	serv_addr.sin_family = AF_INET;
-	serv_addr.sin_port = htons(0);
-	serv_addr.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+	serv_addr.sin_port = pg_hton16(0);
+	serv_addr.sin_addr.s_addr = pg_hton32(INADDR_LOOPBACK);
 	if (bind(s, (SOCKADDR *) &serv_addr, len) == SOCKET_ERROR)
 	{
 		write_msg(modulename, "pgpipe: could not bind: error code %d\n",
diff --git a/src/bin/pg_dump/parallel.h b/src/bin/pg_dump/parallel.h
index 8d800bdf83..1577400622 100644
--- a/src/bin/pg_dump/parallel.h
+++ b/src/bin/pg_dump/parallel.h
@@ -4,7 +4,7 @@
  *
  *	Parallel support for pg_dump and pg_restore
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/bin/pg_dump/pg_backup.h b/src/bin/pg_dump/pg_backup.h
index ce3100f09d..ceedd481fb 100644
--- a/src/bin/pg_dump/pg_backup.h
+++ b/src/bin/pg_dump/pg_backup.h
@@ -74,6 +74,7 @@ typedef struct _restoreOptions
 	int			dump_inserts;
 	int			column_inserts;
 	int			if_exists;
+	int			no_comments;	/* Skip comments */
 	int			no_publications;	/* Skip publication entries */
 	int			no_security_labels; /* Skip security label entries */
 	int			no_subscriptions;	/* Skip subscription entries */
@@ -146,6 +147,7 @@ typedef struct _dumpOptions
 	int			dump_inserts;
 	int			column_inserts;
 	int			if_exists;
+	int			no_comments;
 	int			no_security_labels;
 	int			no_publications;
 	int			no_subscriptions;
@@ -195,6 +197,9 @@ typedef struct Archive
 	/* info needed for string escaping */
 	int			encoding;		/* libpq code for client_encoding */
 	bool		std_strings;	/* standard_conforming_strings */
+
+	/* other important stuff */
+	char	   *searchpath;		/* search_path to set during restore */
 	char	   *use_role;		/* Issue SET ROLE to this */
 
 	/* error handling */
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
index 4cfb71c013..fc233a608f 100644
--- a/src/bin/pg_dump/pg_backup_archiver.c
+++ b/src/bin/pg_dump/pg_backup_archiver.c
@@ -70,7 +70,8 @@ static void _selectOutputSchema(ArchiveHandle *AH, const char *schemaName);
 static void _selectTablespace(ArchiveHandle *AH, const char *tablespace);
 static void processEncodingEntry(ArchiveHandle *AH, TocEntry *te);
 static void processStdStringsEntry(ArchiveHandle *AH, TocEntry *te);
-static teReqs _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt);
+static void processSearchPathEntry(ArchiveHandle *AH, TocEntry *te);
+static teReqs _tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH);
 static RestorePass _tocEntryRestorePass(TocEntry *te);
 static bool _tocEntryIsACL(TocEntry *te);
 static void _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te);
@@ -169,9 +170,9 @@ dumpOptionsFromRestoreOptions(RestoreOptions *ropt)
 	dopt->outputNoTablespaces = ropt->noTablespace;
 	dopt->disable_triggers = ropt->disable_triggers;
 	dopt->use_setsessauth = ropt->use_setsessauth;
-
 	dopt->disable_dollar_quoting = ropt->disable_dollar_quoting;
 	dopt->dump_inserts = ropt->dump_inserts;
+	dopt->no_comments = ropt->no_comments;
 	dopt->no_publications = ropt->no_publications;
 	dopt->no_security_labels = ropt->no_security_labels;
 	dopt->no_subscriptions = ropt->no_subscriptions;
@@ -202,7 +203,7 @@ setupRestoreWorker(Archive *AHX)
 {
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
 
-	(AH->ReopenPtr) (AH);
+	AH->ReopenPtr(AH);
 }
 
 
@@ -237,7 +238,7 @@ CloseArchive(Archive *AHX)
 	int			res = 0;
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
 
-	(*AH->ClosePtr) (AH);
+	AH->ClosePtr(AH);
 
 	/* Close the output */
 	if (AH->gzOut)
@@ -312,7 +313,7 @@ ProcessArchiveRestoreOptions(Archive *AHX)
 		if (te->section != SECTION_NONE)
 			curSection = te->section;
 
-		te->reqs = _tocEntryRequired(te, curSection, ropt);
+		te->reqs = _tocEntryRequired(te, curSection, AH);
 	}
 
 	/* Enforce strict names checking */
@@ -359,7 +360,7 @@ RestoreArchive(Archive *AHX)
 		 * It's also not gonna work if we can't reopen the input file, so
 		 * let's try that immediately.
 		 */
-		(AH->ReopenPtr) (AH);
+		AH->ReopenPtr(AH);
 	}
 
 	/*
@@ -488,17 +489,13 @@ RestoreArchive(Archive *AHX)
 			 * In createDB mode, issue a DROP *only* for the database as a
 			 * whole.  Issuing drops against anything else would be wrong,
 			 * because at this point we're connected to the wrong database.
-			 * Conversely, if we're not in createDB mode, we'd better not
-			 * issue a DROP against the database at all.
+			 * (The DATABASE PROPERTIES entry, if any, should be treated like
+			 * the DATABASE entry.)
 			 */
 			if (ropt->createDB)
 			{
-				if (strcmp(te->desc, "DATABASE") != 0)
-					continue;
-			}
-			else
-			{
-				if (strcmp(te->desc, "DATABASE") == 0)
+				if (strcmp(te->desc, "DATABASE") != 0 &&
+					strcmp(te->desc, "DATABASE PROPERTIES") != 0)
 					continue;
 			}
 
@@ -558,6 +555,8 @@ RestoreArchive(Archive *AHX)
 							 * we simply emit the original command for DEFAULT
 							 * objects (modulo the adjustment made above).
 							 *
+							 * Likewise, don't mess with DATABASE PROPERTIES.
+							 *
 							 * If we used CREATE OR REPLACE VIEW as a means of
 							 * quasi-dropping an ON SELECT rule, that should
 							 * be emitted unchanged as well.
@@ -570,6 +569,7 @@ RestoreArchive(Archive *AHX)
 							 * search for hardcoded "DROP CONSTRAINT" instead.
 							 */
 							if (strcmp(te->desc, "DEFAULT") == 0 ||
+								strcmp(te->desc, "DATABASE PROPERTIES") == 0 ||
 								strncmp(dropStmt, "CREATE OR REPLACE VIEW", 22) == 0)
 								appendPQExpBufferStr(ftStmt, dropStmt);
 							else
@@ -746,17 +746,6 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 
 	AH->currentTE = te;
 
-	/* Work out what, if anything, we want from this entry */
-	reqs = te->reqs;
-
-	/*
-	 * Ignore DATABASE entry unless we should create it.  We must check this
-	 * here, not in _tocEntryRequired, because the createDB option should not
-	 * affect emitting a DATABASE entry to an archive file.
-	 */
-	if (!ropt->createDB && strcmp(te->desc, "DATABASE") == 0)
-		reqs = 0;
-
 	/* Dump any relevant dump warnings to stderr */
 	if (!ropt->suppressDumpWarnings && strcmp(te->desc, "WARNING") == 0)
 	{
@@ -766,6 +755,9 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 			write_msg(modulename, "warning from original dump file: %s\n", te->copyStmt);
 	}
 
+	/* Work out what, if anything, we want from this entry */
+	reqs = te->reqs;
+
 	defnDumped = false;
 
 	/*
@@ -819,8 +811,13 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 			}
 		}
 
-		/* If we created a DB, connect to it... */
-		if (strcmp(te->desc, "DATABASE") == 0)
+		/*
+		 * If we created a DB, connect to it.  Also, if we changed DB
+		 * properties, reconnect to ensure that relevant GUC settings are
+		 * applied to our session.
+		 */
+		if (strcmp(te->desc, "DATABASE") == 0 ||
+			strcmp(te->desc, "DATABASE PROPERTIES") == 0)
 		{
 			PQExpBufferData connstr;
 
@@ -865,7 +862,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 					if (strcmp(te->desc, "BLOB COMMENTS") == 0)
 						AH->outputKind = OUTPUT_OTHERDATA;
 
-					(*AH->PrintTocDataPtr) (AH, te);
+					AH->PrintTocDataPtr(AH, te);
 
 					AH->outputKind = OUTPUT_SQLCMDS;
 				}
@@ -904,7 +901,9 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 						ahprintf(AH, "TRUNCATE TABLE %s%s;\n\n",
 								 (PQserverVersion(AH->connection) >= 80400 ?
 								  "ONLY " : ""),
-								 fmtId(te->tag));
+								 fmtQualifiedId(PQserverVersion(AH->connection),
+												te->namespace,
+												te->tag));
 					}
 
 					/*
@@ -918,7 +917,7 @@ restore_toc_entry(ArchiveHandle *AH, TocEntry *te, bool is_parallel)
 					else
 						AH->outputKind = OUTPUT_OTHERDATA;
 
-					(*AH->PrintTocDataPtr) (AH, te);
+					AH->PrintTocDataPtr(AH, te);
 
 					/*
 					 * Terminate COPY if needed.
@@ -991,10 +990,10 @@ _disableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te)
 	/*
 	 * Disable them.
 	 */
-	_selectOutputSchema(AH, te->namespace);
-
 	ahprintf(AH, "ALTER TABLE %s DISABLE TRIGGER ALL;\n\n",
-			 fmtId(te->tag));
+			 fmtQualifiedId(PQserverVersion(AH->connection),
+							te->namespace,
+							te->tag));
 }
 
 static void
@@ -1019,10 +1018,10 @@ _enableTriggersIfNecessary(ArchiveHandle *AH, TocEntry *te)
 	/*
 	 * Enable them.
 	 */
-	_selectOutputSchema(AH, te->namespace);
-
 	ahprintf(AH, "ALTER TABLE %s ENABLE TRIGGER ALL;\n\n",
-			 fmtId(te->tag));
+			 fmtQualifiedId(PQserverVersion(AH->connection),
+							te->namespace,
+							te->tag));
 }
 
 /*
@@ -1038,7 +1037,7 @@ WriteData(Archive *AHX, const void *data, size_t dLen)
 	if (!AH->currToc)
 		exit_horribly(modulename, "internal error -- WriteData cannot be called outside the context of a DataDumper routine\n");
 
-	(*AH->WriteDataPtr) (AH, data, dLen);
+	AH->WriteDataPtr(AH, data, dLen);
 
 	return;
 }
@@ -1109,7 +1108,7 @@ ArchiveEntry(Archive *AHX,
 	newToc->formatData = NULL;
 
 	if (AH->ArchiveEntryPtr != NULL)
-		(*AH->ArchiveEntryPtr) (AH, newToc);
+		AH->ArchiveEntryPtr(AH, newToc);
 }
 
 /* Public */
@@ -1172,7 +1171,7 @@ PrintTOCSummary(Archive *AHX)
 		if (te->section != SECTION_NONE)
 			curSection = te->section;
 		if (ropt->verbose ||
-			(_tocEntryRequired(te, curSection, ropt) & (REQ_SCHEMA | REQ_DATA)) != 0)
+			(_tocEntryRequired(te, curSection, AH) & (REQ_SCHEMA | REQ_DATA)) != 0)
 		{
 			char	   *sanitized_name;
 			char	   *sanitized_schema;
@@ -1236,7 +1235,7 @@ StartBlob(Archive *AHX, Oid oid)
 	if (!AH->StartBlobPtr)
 		exit_horribly(modulename, "large-object output not supported in chosen format\n");
 
-	(*AH->StartBlobPtr) (AH, AH->currToc, oid);
+	AH->StartBlobPtr(AH, AH->currToc, oid);
 
 	return 1;
 }
@@ -1248,7 +1247,7 @@ EndBlob(Archive *AHX, Oid oid)
 	ArchiveHandle *AH = (ArchiveHandle *) AHX;
 
 	if (AH->EndBlobPtr)
-		(*AH->EndBlobPtr) (AH, AH->currToc, oid);
+		AH->EndBlobPtr(AH, AH->currToc, oid);
 
 	return 1;
 }
@@ -1920,12 +1919,12 @@ WriteOffset(ArchiveHandle *AH, pgoff_t o, int wasSet)
 	int			off;
 
 	/* Save the flag */
-	(*AH->WriteBytePtr) (AH, wasSet);
+	AH->WriteBytePtr(AH, wasSet);
 
 	/* Write out pgoff_t smallest byte first, prevents endian mismatch */
 	for (off = 0; off < sizeof(pgoff_t); off++)
 	{
-		(*AH->WriteBytePtr) (AH, o & 0xFF);
+		AH->WriteBytePtr(AH, o & 0xFF);
 		o >>= 8;
 	}
 	return sizeof(pgoff_t) + 1;
@@ -1964,7 +1963,7 @@ ReadOffset(ArchiveHandle *AH, pgoff_t * o)
 	 * This used to be handled by a negative or zero pointer, now we use an
 	 * extra byte specifically for the state.
 	 */
-	offsetFlg = (*AH->ReadBytePtr) (AH) & 0xFF;
+	offsetFlg = AH->ReadBytePtr(AH) & 0xFF;
 
 	switch (offsetFlg)
 	{
@@ -1984,10 +1983,10 @@ ReadOffset(ArchiveHandle *AH, pgoff_t * o)
 	for (off = 0; off < AH->offSize; off++)
 	{
 		if (off < sizeof(pgoff_t))
-			*o |= ((pgoff_t) ((*AH->ReadBytePtr) (AH))) << (off * 8);
+			*o |= ((pgoff_t) (AH->ReadBytePtr(AH))) << (off * 8);
 		else
 		{
-			if ((*AH->ReadBytePtr) (AH) != 0)
+			if (AH->ReadBytePtr(AH) != 0)
 				exit_horribly(modulename, "file offset in dump file is too large\n");
 		}
 	}
@@ -2011,15 +2010,15 @@ WriteInt(ArchiveHandle *AH, int i)
 	/* SIGN byte */
 	if (i < 0)
 	{
-		(*AH->WriteBytePtr) (AH, 1);
+		AH->WriteBytePtr(AH, 1);
 		i = -i;
 	}
 	else
-		(*AH->WriteBytePtr) (AH, 0);
+		AH->WriteBytePtr(AH, 0);
 
 	for (b = 0; b < AH->intSize; b++)
 	{
-		(*AH->WriteBytePtr) (AH, i & 0xFF);
+		AH->WriteBytePtr(AH, i & 0xFF);
 		i >>= 8;
 	}
 
@@ -2037,11 +2036,11 @@ ReadInt(ArchiveHandle *AH)
 
 	if (AH->version > K_VERS_1_0)
 		/* Read a sign byte */
-		sign = (*AH->ReadBytePtr) (AH);
+		sign = AH->ReadBytePtr(AH);
 
 	for (b = 0; b < AH->intSize; b++)
 	{
-		bv = (*AH->ReadBytePtr) (AH) & 0xFF;
+		bv = AH->ReadBytePtr(AH) & 0xFF;
 		if (bv != 0)
 			res = res + (bv << bitShift);
 		bitShift += 8;
@@ -2063,7 +2062,7 @@ WriteStr(ArchiveHandle *AH, const char *c)
 		int			len = strlen(c);
 
 		res = WriteInt(AH, len);
-		(*AH->WriteBufPtr) (AH, c, len);
+		AH->WriteBufPtr(AH, c, len);
 		res += len;
 	}
 	else
@@ -2084,7 +2083,7 @@ ReadStr(ArchiveHandle *AH)
 	else
 	{
 		buf = (char *) pg_malloc(l + 1);
-		(*AH->ReadBufPtr) (AH, (void *) buf, l);
+		AH->ReadBufPtr(AH, (void *) buf, l);
 
 		buf[l] = '\0';
 	}
@@ -2495,7 +2494,7 @@ WriteDataChunksForTocEntry(ArchiveHandle *AH, TocEntry *te)
 	/*
 	 * The user-provided DataDumper routine needs to call AH->WriteData
 	 */
-	(*te->dataDumper) ((Archive *) AH, te->dataDumperArg);
+	te->dataDumper((Archive *) AH, te->dataDumperArg);
 
 	if (endPtr != NULL)
 		(*endPtr) (AH, te);
@@ -2557,7 +2556,7 @@ WriteToc(ArchiveHandle *AH)
 		WriteStr(AH, NULL);		/* Terminate List */
 
 		if (AH->WriteExtraTocPtr)
-			(*AH->WriteExtraTocPtr) (AH, te);
+			AH->WriteExtraTocPtr(AH, te);
 	}
 }
 
@@ -2699,7 +2698,7 @@ ReadToc(ArchiveHandle *AH)
 		}
 
 		if (AH->ReadExtraTocPtr)
-			(*AH->ReadExtraTocPtr) (AH, te);
+			AH->ReadExtraTocPtr(AH, te);
 
 		ahlog(AH, 3, "read TOC entry %d (ID %d) for %s %s\n",
 			  i, te->dumpId, te->desc, te->tag);
@@ -2715,6 +2714,8 @@ ReadToc(ArchiveHandle *AH)
 			processEncodingEntry(AH, te);
 		else if (strcmp(te->desc, "STDSTRINGS") == 0)
 			processStdStringsEntry(AH, te);
+		else if (strcmp(te->desc, "SEARCHPATH") == 0)
+			processSearchPathEntry(AH, te);
 	}
 }
 
@@ -2762,6 +2763,16 @@ processStdStringsEntry(ArchiveHandle *AH, TocEntry *te)
 					  te->defn);
 }
 
+static void
+processSearchPathEntry(ArchiveHandle *AH, TocEntry *te)
+{
+	/*
+	 * te->defn should contain a command to set search_path.  We just copy it
+	 * verbatim for use later.
+	 */
+	AH->public.searchpath = pg_strdup(te->defn);
+}
+
 static void
 StrictNamesCheck(RestoreOptions *ropt)
 {
@@ -2805,29 +2816,60 @@ StrictNamesCheck(RestoreOptions *ropt)
 	}
 }
 
+/*
+ * Determine whether we want to restore this TOC entry.
+ *
+ * Returns 0 if entry should be skipped, or some combination of the
+ * REQ_SCHEMA and REQ_DATA bits if we want to restore schema and/or data
+ * portions of this TOC entry, or REQ_SPECIAL if it's a special entry.
+ */
 static teReqs
-_tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
+_tocEntryRequired(TocEntry *te, teSection curSection, ArchiveHandle *AH)
 {
 	teReqs		res = REQ_SCHEMA | REQ_DATA;
+	RestoreOptions *ropt = AH->public.ropt;
 
-	/* ENCODING and STDSTRINGS items are treated specially */
+	/* These items are treated specially */
 	if (strcmp(te->desc, "ENCODING") == 0 ||
-		strcmp(te->desc, "STDSTRINGS") == 0)
+		strcmp(te->desc, "STDSTRINGS") == 0 ||
+		strcmp(te->desc, "SEARCHPATH") == 0)
 		return REQ_SPECIAL;
 
+	/*
+	 * DATABASE and DATABASE PROPERTIES also have a special rule: they are
+	 * restored in createDB mode, and not restored otherwise, independently of
+	 * all else.
+	 */
+	if (strcmp(te->desc, "DATABASE") == 0 ||
+		strcmp(te->desc, "DATABASE PROPERTIES") == 0)
+	{
+		if (ropt->createDB)
+			return REQ_SCHEMA;
+		else
+			return 0;
+	}
+
+	/*
+	 * Process exclusions that affect certain classes of TOC entries.
+	 */
+
 	/* If it's an ACL, maybe ignore it */
 	if (ropt->aclsSkip && _tocEntryIsACL(te))
 		return 0;
 
+	/* If it's a comment, maybe ignore it */
+	if (ropt->no_comments && strcmp(te->desc, "COMMENT") == 0)
+		return 0;
+
 	/* If it's a publication, maybe ignore it */
 	if (ropt->no_publications && strcmp(te->desc, "PUBLICATION") == 0)
 		return 0;
 
-	/* If it's security labels, maybe ignore it */
+	/* If it's a security label, maybe ignore it */
 	if (ropt->no_security_labels && strcmp(te->desc, "SECURITY LABEL") == 0)
 		return 0;
 
-	/* If it's a subcription, maybe ignore it */
+	/* If it's a subscription, maybe ignore it */
 	if (ropt->no_subscriptions && strcmp(te->desc, "SUBSCRIPTION") == 0)
 		return 0;
 
@@ -2851,64 +2893,118 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 			return 0;
 	}
 
-	/* Check options for selective dump/restore */
-	if (ropt->schemaNames.head != NULL)
-	{
-		/* If no namespace is specified, it means all. */
-		if (!te->namespace)
-			return 0;
-		if (!(simple_string_list_member(&ropt->schemaNames, te->namespace)))
-			return 0;
-	}
-
-	if (ropt->schemaExcludeNames.head != NULL &&
-		te->namespace &&
-		simple_string_list_member(&ropt->schemaExcludeNames, te->namespace))
+	/* Ignore it if rejected by idWanted[] (cf. SortTocFromFile) */
+	if (ropt->idWanted && !ropt->idWanted[te->dumpId - 1])
 		return 0;
 
-	if (ropt->selTypes)
+	/*
+	 * Check options for selective dump/restore.
+	 */
+	if (strcmp(te->desc, "ACL") == 0 ||
+		strcmp(te->desc, "COMMENT") == 0 ||
+		strcmp(te->desc, "SECURITY LABEL") == 0)
 	{
-		if (strcmp(te->desc, "TABLE") == 0 ||
-			strcmp(te->desc, "TABLE DATA") == 0 ||
-			strcmp(te->desc, "VIEW") == 0 ||
-			strcmp(te->desc, "FOREIGN TABLE") == 0 ||
-			strcmp(te->desc, "MATERIALIZED VIEW") == 0 ||
-			strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0 ||
-			strcmp(te->desc, "SEQUENCE") == 0 ||
-			strcmp(te->desc, "SEQUENCE SET") == 0)
+		/* Database properties react to createDB, not selectivity options. */
+		if (strncmp(te->tag, "DATABASE ", 9) == 0)
 		{
-			if (!ropt->selTable)
-				return 0;
-			if (ropt->tableNames.head != NULL && (!(simple_string_list_member(&ropt->tableNames, te->tag))))
+			if (!ropt->createDB)
 				return 0;
 		}
-		else if (strcmp(te->desc, "INDEX") == 0)
+		else if (ropt->schemaNames.head != NULL ||
+				 ropt->schemaExcludeNames.head != NULL ||
+				 ropt->selTypes)
 		{
-			if (!ropt->selIndex)
-				return 0;
-			if (ropt->indexNames.head != NULL && (!(simple_string_list_member(&ropt->indexNames, te->tag))))
+			/*
+			 * In a selective dump/restore, we want to restore these dependent
+			 * TOC entry types only if their parent object is being restored.
+			 * Without selectivity options, we let through everything in the
+			 * archive.  Note there may be such entries with no parent, eg
+			 * non-default ACLs for built-in objects.
+			 *
+			 * This code depends on the parent having been marked already,
+			 * which should be the case; if it isn't, perhaps due to
+			 * SortTocFromFile rearrangement, skipping the dependent entry
+			 * seems prudent anyway.
+			 *
+			 * Ideally we'd handle, eg, table CHECK constraints this way too.
+			 * But it's hard to tell which of their dependencies is the one to
+			 * consult.
+			 */
+			if (te->nDeps != 1 ||
+				TocIDRequired(AH, te->dependencies[0]) == 0)
 				return 0;
 		}
-		else if (strcmp(te->desc, "FUNCTION") == 0)
+	}
+	else
+	{
+		/* Apply selective-restore rules for standalone TOC entries. */
+		if (ropt->schemaNames.head != NULL)
 		{
-			if (!ropt->selFunction)
+			/* If no namespace is specified, it means all. */
+			if (!te->namespace)
 				return 0;
-			if (ropt->functionNames.head != NULL && (!(simple_string_list_member(&ropt->functionNames, te->tag))))
+			if (!simple_string_list_member(&ropt->schemaNames, te->namespace))
 				return 0;
 		}
-		else if (strcmp(te->desc, "TRIGGER") == 0)
+
+		if (ropt->schemaExcludeNames.head != NULL &&
+			te->namespace &&
+			simple_string_list_member(&ropt->schemaExcludeNames, te->namespace))
+			return 0;
+
+		if (ropt->selTypes)
 		{
-			if (!ropt->selTrigger)
-				return 0;
-			if (ropt->triggerNames.head != NULL && (!(simple_string_list_member(&ropt->triggerNames, te->tag))))
+			if (strcmp(te->desc, "TABLE") == 0 ||
+				strcmp(te->desc, "TABLE DATA") == 0 ||
+				strcmp(te->desc, "VIEW") == 0 ||
+				strcmp(te->desc, "FOREIGN TABLE") == 0 ||
+				strcmp(te->desc, "MATERIALIZED VIEW") == 0 ||
+				strcmp(te->desc, "MATERIALIZED VIEW DATA") == 0 ||
+				strcmp(te->desc, "SEQUENCE") == 0 ||
+				strcmp(te->desc, "SEQUENCE SET") == 0)
+			{
+				if (!ropt->selTable)
+					return 0;
+				if (ropt->tableNames.head != NULL &&
+					!simple_string_list_member(&ropt->tableNames, te->tag))
+					return 0;
+			}
+			else if (strcmp(te->desc, "INDEX") == 0)
+			{
+				if (!ropt->selIndex)
+					return 0;
+				if (ropt->indexNames.head != NULL &&
+					!simple_string_list_member(&ropt->indexNames, te->tag))
+					return 0;
+			}
+			else if (strcmp(te->desc, "FUNCTION") == 0 ||
+					 strcmp(te->desc, "AGGREGATE") == 0 ||
+					 strcmp(te->desc, "PROCEDURE") == 0)
+			{
+				if (!ropt->selFunction)
+					return 0;
+				if (ropt->functionNames.head != NULL &&
+					!simple_string_list_member(&ropt->functionNames, te->tag))
+					return 0;
+			}
+			else if (strcmp(te->desc, "TRIGGER") == 0)
+			{
+				if (!ropt->selTrigger)
+					return 0;
+				if (ropt->triggerNames.head != NULL &&
+					!simple_string_list_member(&ropt->triggerNames, te->tag))
+					return 0;
+			}
+			else
 				return 0;
 		}
-		else
-			return 0;
 	}
 
 	/*
-	 * Check if we had a dataDumper. Indicates if the entry is schema or data
+	 * Determine whether the TOC entry contains schema and/or data components,
+	 * and mask off inapplicable REQ bits.  If it had a dataDumper, assume
+	 * it's both schema and data.  Otherwise it's probably schema-only, but
+	 * there are exceptions.
 	 */
 	if (!te->hadDumper)
 	{
@@ -2916,8 +3012,8 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 		 * Special Case: If 'SEQUENCE SET' or anything to do with BLOBs, then
 		 * it is considered a data entry.  We don't need to check for the
 		 * BLOBS entry or old-style BLOB COMMENTS, because they will have
-		 * hadDumper = true ... but we do need to check new-style BLOB
-		 * comments.
+		 * hadDumper = true ... but we do need to check new-style BLOB ACLs,
+		 * comments, etc.
 		 */
 		if (strcmp(te->desc, "SEQUENCE SET") == 0 ||
 			strcmp(te->desc, "BLOB") == 0 ||
@@ -2932,6 +3028,10 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 			res = res & ~REQ_DATA;
 	}
 
+	/* If there's no definition command, there's no schema component */
+	if (!te->defn || !te->defn[0])
+		res = res & ~REQ_SCHEMA;
+
 	/*
 	 * Special case: <Init> type with <Max OID> tag; this is obsolete and we
 	 * always ignore it.
@@ -2943,14 +3043,22 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 	if (ropt->schemaOnly)
 	{
 		/*
-		 * In binary-upgrade mode, even with schema-only set, we do not mask
-		 * out large objects.  Only large object definitions, comments and
-		 * other information should be generated in binary-upgrade mode (not
-		 * the actual data).
+		 * The sequence_data option overrides schemaOnly for SEQUENCE SET.
+		 *
+		 * In binary-upgrade mode, even with schemaOnly set, we do not mask
+		 * out large objects.  (Only large object definitions, comments and
+		 * other metadata should be generated in binary-upgrade mode, not the
+		 * actual data, but that need not concern us here.)
 		 */
 		if (!(ropt->sequence_data && strcmp(te->desc, "SEQUENCE SET") == 0) &&
-			!(ropt->binary_upgrade && strcmp(te->desc, "BLOB") == 0) &&
-			!(ropt->binary_upgrade && strncmp(te->tag, "LARGE OBJECT ", 13) == 0))
+			!(ropt->binary_upgrade &&
+			  (strcmp(te->desc, "BLOB") == 0 ||
+			   (strcmp(te->desc, "ACL") == 0 &&
+				strncmp(te->tag, "LARGE OBJECT ", 13) == 0) ||
+			   (strcmp(te->desc, "COMMENT") == 0 &&
+				strncmp(te->tag, "LARGE OBJECT ", 13) == 0) ||
+			   (strcmp(te->desc, "SECURITY LABEL") == 0 &&
+				strncmp(te->tag, "LARGE OBJECT ", 13) == 0))))
 			res = res & REQ_SCHEMA;
 	}
 
@@ -2958,14 +3066,6 @@ _tocEntryRequired(TocEntry *te, teSection curSection, RestoreOptions *ropt)
 	if (ropt->dataOnly)
 		res = res & REQ_DATA;
 
-	/* Mask it if we don't have a schema contribution */
-	if (!te->defn || strlen(te->defn) == 0)
-		res = res & ~REQ_SCHEMA;
-
-	/* Finally, if there's a per-ID filter, limit based on that as well */
-	if (ropt->idWanted && !ropt->idWanted[te->dumpId - 1])
-		return 0;
-
 	return res;
 }
 
@@ -3033,6 +3133,10 @@ _doSetFixedOutputState(ArchiveHandle *AH)
 	if (ropt && ropt->use_role)
 		ahprintf(AH, "SET ROLE %s;\n", fmtId(ropt->use_role));
 
+	/* Select the dump-time search_path */
+	if (AH->public.searchpath)
+		ahprintf(AH, "%s", AH->public.searchpath);
+
 	/* Make sure function checking is disabled */
 	ahprintf(AH, "SET check_function_bodies = false;\n");
 
@@ -3237,6 +3341,15 @@ _selectOutputSchema(ArchiveHandle *AH, const char *schemaName)
 {
 	PQExpBuffer qry;
 
+	/*
+	 * If there was a SEARCHPATH TOC entry, we're supposed to just stay with
+	 * that search_path rather than switching to entry-specific paths.
+	 * Otherwise, it's an old archive that will not restore correctly unless
+	 * we set the search_path as it's expecting.
+	 */
+	if (AH->public.searchpath)
+		return;
+
 	if (!schemaName || *schemaName == '\0' ||
 		(AH->currSchema && strcmp(AH->currSchema, schemaName) == 0))
 		return;					/* no need to do anything */
@@ -3357,6 +3470,7 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 		strcmp(type, "FOREIGN TABLE") == 0 ||
 		strcmp(type, "TEXT SEARCH DICTIONARY") == 0 ||
 		strcmp(type, "TEXT SEARCH CONFIGURATION") == 0 ||
+		strcmp(type, "STATISTICS") == 0 ||
 	/* non-schema-specified objects */
 		strcmp(type, "DATABASE") == 0 ||
 		strcmp(type, "PROCEDURAL LANGUAGE") == 0 ||
@@ -3368,8 +3482,10 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 		strcmp(type, "SUBSCRIPTION") == 0 ||
 		strcmp(type, "USER MAPPING") == 0)
 	{
-		/* We already know that search_path was set properly */
-		appendPQExpBuffer(buf, "%s %s", type, fmtId(te->tag));
+		appendPQExpBuffer(buf, "%s ", type);
+		if (te->namespace && *te->namespace)
+			appendPQExpBuffer(buf, "%s.", fmtId(te->namespace));
+		appendPQExpBufferStr(buf, fmtId(te->tag));
 		return;
 	}
 
@@ -3388,7 +3504,8 @@ _getObjectDescription(PQExpBuffer buf, TocEntry *te, ArchiveHandle *AH)
 		strcmp(type, "FUNCTION") == 0 ||
 		strcmp(type, "OPERATOR") == 0 ||
 		strcmp(type, "OPERATOR CLASS") == 0 ||
-		strcmp(type, "OPERATOR FAMILY") == 0)
+		strcmp(type, "OPERATOR FAMILY") == 0 ||
+		strcmp(type, "PROCEDURE") == 0)
 	{
 		/* Chop "DROP " off the front and make a modifiable copy */
 		char	   *first = pg_strdup(te->dropStmt + 5);
@@ -3424,29 +3541,6 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 {
 	RestoreOptions *ropt = AH->public.ropt;
 
-	/*
-	 * Avoid dumping the public schema, as it will already be created ...
-	 * unless we are using --clean mode (and *not* --create mode), in which
-	 * case we've previously issued a DROP for it so we'd better recreate it.
-	 *
-	 * Likewise for its comment, if any.  (We could try issuing the COMMENT
-	 * command anyway; but it'd fail if the restore is done as non-super-user,
-	 * so let's not.)
-	 *
-	 * XXX it looks pretty ugly to hard-wire the public schema like this, but
-	 * it sits in a sort of no-mans-land between being a system object and a
-	 * user object, so it really is special in a way.
-	 */
-	if (!(ropt->dropSchema && !ropt->createDB))
-	{
-		if (strcmp(te->desc, "SCHEMA") == 0 &&
-			strcmp(te->tag, "public") == 0)
-			return;
-		if (strcmp(te->desc, "COMMENT") == 0 &&
-			strcmp(te->tag, "SCHEMA public") == 0)
-			return;
-	}
-
 	/* Select owner, schema, and tablespace as necessary */
 	_becomeOwner(AH, te);
 	_selectOutputSchema(AH, te->namespace);
@@ -3520,7 +3614,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 		ahprintf(AH, "\n");
 
 		if (AH->PrintExtraTocPtr != NULL)
-			(*AH->PrintExtraTocPtr) (AH, te);
+			AH->PrintExtraTocPtr(AH, te);
 		ahprintf(AH, "--\n\n");
 	}
 
@@ -3560,6 +3654,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 			strcmp(te->desc, "OPERATOR") == 0 ||
 			strcmp(te->desc, "OPERATOR CLASS") == 0 ||
 			strcmp(te->desc, "OPERATOR FAMILY") == 0 ||
+			strcmp(te->desc, "PROCEDURE") == 0 ||
 			strcmp(te->desc, "PROCEDURAL LANGUAGE") == 0 ||
 			strcmp(te->desc, "SCHEMA") == 0 ||
 			strcmp(te->desc, "EVENT TRIGGER") == 0 ||
@@ -3573,6 +3668,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 			strcmp(te->desc, "TEXT SEARCH CONFIGURATION") == 0 ||
 			strcmp(te->desc, "FOREIGN DATA WRAPPER") == 0 ||
 			strcmp(te->desc, "SERVER") == 0 ||
+			strcmp(te->desc, "STATISTICS") == 0 ||
 			strcmp(te->desc, "PUBLICATION") == 0 ||
 			strcmp(te->desc, "SUBSCRIPTION") == 0)
 		{
@@ -3587,6 +3683,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 		else if (strcmp(te->desc, "CAST") == 0 ||
 				 strcmp(te->desc, "CHECK CONSTRAINT") == 0 ||
 				 strcmp(te->desc, "CONSTRAINT") == 0 ||
+				 strcmp(te->desc, "DATABASE PROPERTIES") == 0 ||
 				 strcmp(te->desc, "DEFAULT") == 0 ||
 				 strcmp(te->desc, "FK CONSTRAINT") == 0 ||
 				 strcmp(te->desc, "INDEX") == 0 ||
@@ -3594,8 +3691,7 @@ _printTocEntry(ArchiveHandle *AH, TocEntry *te, bool isData)
 				 strcmp(te->desc, "TRIGGER") == 0 ||
 				 strcmp(te->desc, "ROW SECURITY") == 0 ||
 				 strcmp(te->desc, "POLICY") == 0 ||
-				 strcmp(te->desc, "USER MAPPING") == 0 ||
-				 strcmp(te->desc, "STATISTICS") == 0)
+				 strcmp(te->desc, "USER MAPPING") == 0)
 		{
 			/* these object types don't have separate owners */
 		}
@@ -3648,13 +3744,13 @@ WriteHead(ArchiveHandle *AH)
 {
 	struct tm	crtm;
 
-	(*AH->WriteBufPtr) (AH, "PGDMP", 5);	/* Magic code */
-	(*AH->WriteBytePtr) (AH, ARCHIVE_MAJOR(AH->version));
-	(*AH->WriteBytePtr) (AH, ARCHIVE_MINOR(AH->version));
-	(*AH->WriteBytePtr) (AH, ARCHIVE_REV(AH->version));
-	(*AH->WriteBytePtr) (AH, AH->intSize);
-	(*AH->WriteBytePtr) (AH, AH->offSize);
-	(*AH->WriteBytePtr) (AH, AH->format);
+	AH->WriteBufPtr(AH, "PGDMP", 5);	/* Magic code */
+	AH->WriteBytePtr(AH, ARCHIVE_MAJOR(AH->version));
+	AH->WriteBytePtr(AH, ARCHIVE_MINOR(AH->version));
+	AH->WriteBytePtr(AH, ARCHIVE_REV(AH->version));
+	AH->WriteBytePtr(AH, AH->intSize);
+	AH->WriteBytePtr(AH, AH->offSize);
+	AH->WriteBytePtr(AH, AH->format);
 	WriteInt(AH, AH->compression);
 	crtm = *localtime(&AH->createDate);
 	WriteInt(AH, crtm.tm_sec);
@@ -3688,16 +3784,16 @@ ReadHead(ArchiveHandle *AH)
 					vmin,
 					vrev;
 
-		(*AH->ReadBufPtr) (AH, tmpMag, 5);
+		AH->ReadBufPtr(AH, tmpMag, 5);
 
 		if (strncmp(tmpMag, "PGDMP", 5) != 0)
 			exit_horribly(modulename, "did not find magic string in file header\n");
 
-		vmaj = (*AH->ReadBytePtr) (AH);
-		vmin = (*AH->ReadBytePtr) (AH);
+		vmaj = AH->ReadBytePtr(AH);
+		vmin = AH->ReadBytePtr(AH);
 
 		if (vmaj > 1 || (vmaj == 1 && vmin > 0))	/* Version > 1.0 */
-			vrev = (*AH->ReadBytePtr) (AH);
+			vrev = AH->ReadBytePtr(AH);
 		else
 			vrev = 0;
 
@@ -3707,7 +3803,7 @@ ReadHead(ArchiveHandle *AH)
 			exit_horribly(modulename, "unsupported version (%d.%d) in file header\n",
 						  vmaj, vmin);
 
-		AH->intSize = (*AH->ReadBytePtr) (AH);
+		AH->intSize = AH->ReadBytePtr(AH);
 		if (AH->intSize > 32)
 			exit_horribly(modulename, "sanity check on integer size (%lu) failed\n",
 						  (unsigned long) AH->intSize);
@@ -3716,11 +3812,11 @@ ReadHead(ArchiveHandle *AH)
 			write_msg(modulename, "WARNING: archive was made on a machine with larger integers, some operations might fail\n");
 
 		if (AH->version >= K_VERS_1_7)
-			AH->offSize = (*AH->ReadBytePtr) (AH);
+			AH->offSize = AH->ReadBytePtr(AH);
 		else
 			AH->offSize = AH->intSize;
 
-		fmt = (*AH->ReadBytePtr) (AH);
+		fmt = AH->ReadBytePtr(AH);
 
 		if (AH->format != fmt)
 			exit_horribly(modulename, "expected format (%d) differs from format found in file (%d)\n",
@@ -3730,7 +3826,7 @@ ReadHead(ArchiveHandle *AH)
 	if (AH->version >= K_VERS_1_2)
 	{
 		if (AH->version < K_VERS_1_4)
-			AH->compression = (*AH->ReadBytePtr) (AH);
+			AH->compression = AH->ReadBytePtr(AH);
 		else
 			AH->compression = ReadInt(AH);
 	}
@@ -3851,8 +3947,9 @@ restore_toc_entries_prefork(ArchiveHandle *AH, TocEntry *pending_list)
 	 *
 	 * Note: as of 9.2, it should be guaranteed that all PRE_DATA items appear
 	 * before DATA items, and all DATA items before POST_DATA items.  That is
-	 * not certain to be true in older archives, though, so this loop is coded
-	 * to not assume it.
+	 * not certain to be true in older archives, though, and in any case use
+	 * of a list file would destroy that ordering (cf. SortTocFromFile).  So
+	 * this loop cannot assume that it holds.
 	 */
 	AH->restorePass = RESTORE_PASS_MAIN;
 	skipped_some = false;
@@ -3899,7 +3996,7 @@ restore_toc_entries_prefork(ArchiveHandle *AH, TocEntry *pending_list)
 
 			(void) restore_toc_entry(AH, next_work_item, false);
 
-			/* there should be no touch of ready_list here, so pass NULL */
+			/* Reduce dependencies, but don't move anything to ready_list */
 			reduce_dependencies(AH, next_work_item, NULL);
 		}
 		else
@@ -4545,7 +4642,7 @@ identify_locking_dependencies(ArchiveHandle *AH, TocEntry *te)
 /*
  * Remove the specified TOC entry from the depCounts of items that depend on
  * it, thereby possibly making them ready-to-run.  Any pending item that
- * becomes ready should be moved to the ready list.
+ * becomes ready should be moved to the ready_list, if that's provided.
  */
 static void
 reduce_dependencies(ArchiveHandle *AH, TocEntry *te, TocEntry *ready_list)
@@ -4562,15 +4659,19 @@ reduce_dependencies(ArchiveHandle *AH, TocEntry *te, TocEntry *ready_list)
 		otherte->depCount--;
 
 		/*
-		 * It's ready if it has no remaining dependencies and it belongs in
-		 * the current restore pass.  However, don't move it if it has not yet
-		 * been put into the pending list.
+		 * It's ready if it has no remaining dependencies, and it belongs in
+		 * the current restore pass, and it is currently a member of the
+		 * pending list (that check is needed to prevent double restore in
+		 * some cases where a list-file forces out-of-order restoring).
+		 * However, if ready_list == NULL then caller doesn't want any list
+		 * memberships changed.
 		 */
 		if (otherte->depCount == 0 &&
 			_tocEntryRestorePass(otherte) == AH->restorePass &&
-			otherte->par_prev != NULL)
+			otherte->par_prev != NULL &&
+			ready_list != NULL)
 		{
-			/* It must be in the pending list, so remove it ... */
+			/* Remove it from pending list ... */
 			par_list_remove(otherte);
 			/* ... and add to ready_list */
 			par_list_append(ready_list, otherte);
@@ -4695,7 +4796,7 @@ CloneArchive(ArchiveHandle *AH)
 	}
 
 	/* Let the format-specific code have a chance too */
-	(clone->ClonePtr) (clone);
+	clone->ClonePtr(clone);
 
 	Assert(clone->connection != NULL);
 	return clone;
@@ -4713,7 +4814,7 @@ DeCloneArchive(ArchiveHandle *AH)
 	Assert(AH->connection == NULL);
 
 	/* Clear format-specific state */
-	(AH->DeClonePtr) (AH);
+	AH->DeClonePtr(AH);
 
 	/* Clear state allocated by CloneArchive */
 	if (AH->sqlparse.curCmd)
diff --git a/src/bin/pg_dump/pg_backup_archiver.h b/src/bin/pg_dump/pg_backup_archiver.h
index fd0d01b506..8dd1915998 100644
--- a/src/bin/pg_dump/pg_backup_archiver.h
+++ b/src/bin/pg_dump/pg_backup_archiver.h
@@ -92,10 +92,12 @@ typedef z_stream *z_streamp;
 													 * indicator */
 #define K_VERS_1_12 MAKE_ARCHIVE_VERSION(1, 12, 0)	/* add separate BLOB
 													 * entries */
+#define K_VERS_1_13 MAKE_ARCHIVE_VERSION(1, 13, 0)	/* change search_path
+													 * behavior */
 
 /* Current archive version number (the format we can output) */
 #define K_VERS_MAJOR 1
-#define K_VERS_MINOR 12
+#define K_VERS_MINOR 13
 #define K_VERS_REV 0
 #define K_VERS_SELF MAKE_ARCHIVE_VERSION(K_VERS_MAJOR, K_VERS_MINOR, K_VERS_REV);
 
@@ -448,7 +450,7 @@ extern void InitArchiveFmt_Tar(ArchiveHandle *AH);
 
 extern bool isValidTarHeader(char *header);
 
-extern int	ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *newUser);
+extern void ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *newUser);
 extern void DropBlobIfExists(ArchiveHandle *AH, Oid oid);
 
 void		ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH);
diff --git a/src/bin/pg_dump/pg_backup_db.c b/src/bin/pg_dump/pg_backup_db.c
index befcde4630..5e32ee8a5b 100644
--- a/src/bin/pg_dump/pg_backup_db.c
+++ b/src/bin/pg_dump/pg_backup_db.c
@@ -12,6 +12,7 @@
 #include "postgres_fe.h"
 
 #include "dumputils.h"
+#include "fe_utils/connect.h"
 #include "fe_utils/string_utils.h"
 #include "parallel.h"
 #include "pg_backup_archiver.h"
@@ -76,13 +77,9 @@ _check_database_version(ArchiveHandle *AH)
 /*
  * Reconnect to the server.  If dbname is not NULL, use that database,
  * else the one associated with the archive handle.  If username is
- * not NULL, use that user name, else the one from the handle.  If
- * both the database and the user match the existing connection already,
- * nothing will be done.
- *
- * Returns 1 in any case.
+ * not NULL, use that user name, else the one from the handle.
  */
-int
+void
 ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *username)
 {
 	PGconn	   *newConn;
@@ -99,11 +96,6 @@ ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *username)
 	else
 		newusername = username;
 
-	/* Let's see if the request is already satisfied */
-	if (strcmp(newdbname, PQdb(AH->connection)) == 0 &&
-		strcmp(newusername, PQuser(AH->connection)) == 0)
-		return 1;
-
 	newConn = _connectDB(AH, newdbname, newusername);
 
 	/* Update ArchiveHandle's connCancel before closing old connection */
@@ -112,7 +104,9 @@ ReconnectToServer(ArchiveHandle *AH, const char *dbname, const char *username)
 	PQfinish(AH->connection);
 	AH->connection = newConn;
 
-	return 1;
+	/* Start strict; later phases may override this. */
+	PQclear(ExecuteSqlQueryForSingleRow((Archive *) AH,
+										ALWAYS_SECURE_SEARCH_PATH_SQL));
 }
 
 /*
@@ -315,6 +309,10 @@ ConnectDatabase(Archive *AHX,
 					  PQdb(AH->connection) ? PQdb(AH->connection) : "",
 					  PQerrorMessage(AH->connection));
 
+	/* Start strict; later phases may override this. */
+	PQclear(ExecuteSqlQueryForSingleRow((Archive *) AH,
+										ALWAYS_SECURE_SEARCH_PATH_SQL));
+
 	/*
 	 * We want to remember connection's actual password, whether or not we got
 	 * it by prompting.  So we don't just store the password variable.
@@ -419,7 +417,7 @@ ExecuteSqlQuery(Archive *AHX, const char *query, ExecStatusType status)
  * Execute an SQL query and verify that we got exactly one row back.
  */
 PGresult *
-ExecuteSqlQueryForSingleRow(Archive *fout, char *query)
+ExecuteSqlQueryForSingleRow(Archive *fout, const char *query)
 {
 	PGresult   *res;
 	int			ntups;
diff --git a/src/bin/pg_dump/pg_backup_db.h b/src/bin/pg_dump/pg_backup_db.h
index 527449e044..a79f5283fe 100644
--- a/src/bin/pg_dump/pg_backup_db.h
+++ b/src/bin/pg_dump/pg_backup_db.h
@@ -16,7 +16,7 @@ extern int	ExecuteSqlCommandBuf(Archive *AHX, const char *buf, size_t bufLen);
 extern void ExecuteSqlStatement(Archive *AHX, const char *query);
 extern PGresult *ExecuteSqlQuery(Archive *AHX, const char *query,
 				ExecStatusType status);
-extern PGresult *ExecuteSqlQueryForSingleRow(Archive *fout, char *query);
+extern PGresult *ExecuteSqlQueryForSingleRow(Archive *fout, const char *query);
 
 extern void EndDBCopyMode(Archive *AHX, const char *tocEntryTag);
 
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
index 112fbb0f0c..4aabb40f59 100644
--- a/src/bin/pg_dump/pg_backup_directory.c
+++ b/src/bin/pg_dump/pg_backup_directory.c
@@ -17,7 +17,7 @@
  *	sync.
  *
  *
- *	Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *	Portions Copyright (c) 2000, Philip Warner
  *
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
index ff419bb82f..62f6e624f0 100644
--- a/src/bin/pg_dump/pg_backup_null.c
+++ b/src/bin/pg_dump/pg_backup_null.c
@@ -202,7 +202,7 @@ _PrintTocData(ArchiveHandle *AH, TocEntry *te)
 		if (strcmp(te->desc, "BLOBS") == 0)
 			_StartBlobs(AH, te);
 
-		(*te->dataDumper) ((Archive *) AH, te->dataDumperArg);
+		te->dataDumper((Archive *) AH, te->dataDumperArg);
 
 		if (strcmp(te->desc, "BLOBS") == 0)
 			_EndBlobs(AH, te);
diff --git a/src/bin/pg_dump/pg_backup_utils.c b/src/bin/pg_dump/pg_backup_utils.c
index 1e5967e5cc..df5fe708ba 100644
--- a/src/bin/pg_dump/pg_backup_utils.c
+++ b/src/bin/pg_dump/pg_backup_utils.c
@@ -4,7 +4,7 @@
  *	Utility routines shared by pg_dump and pg_restore
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/pg_backup_utils.c
@@ -144,8 +144,8 @@ exit_nicely(int code)
 	int			i;
 
 	for (i = on_exit_nicely_index - 1; i >= 0; i--)
-		(*on_exit_nicely_list[i].function) (code,
-											on_exit_nicely_list[i].arg);
+		on_exit_nicely_list[i].function(code,
+										on_exit_nicely_list[i].arg);
 
 #ifdef WIN32
 	if (parallel_init_done && GetCurrentThreadId() != mainThreadId)
diff --git a/src/bin/pg_dump/pg_backup_utils.h b/src/bin/pg_dump/pg_backup_utils.h
index 14661a1160..6eaf302fc7 100644
--- a/src/bin/pg_dump/pg_backup_utils.h
+++ b/src/bin/pg_dump/pg_backup_utils.h
@@ -4,7 +4,7 @@
  *	Utility routines shared by pg_dump and pg_restore.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/pg_backup_utils.h
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
index 75f08cd792..2c934e6365 100644
--- a/src/bin/pg_dump/pg_dump.c
+++ b/src/bin/pg_dump/pg_dump.c
@@ -4,7 +4,7 @@
  *	  pg_dump is a utility for dumping out a postgres database
  *	  into a script file.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	pg_dump will read the system catalogs in a database and dump out a
@@ -42,6 +42,7 @@
 #include "access/attnum.h"
 #include "access/sysattr.h"
 #include "access/transam.h"
+#include "catalog/pg_aggregate.h"
 #include "catalog/pg_am.h"
 #include "catalog/pg_attribute.h"
 #include "catalog/pg_cast.h"
@@ -59,6 +60,7 @@
 #include "pg_backup_db.h"
 #include "pg_backup_utils.h"
 #include "pg_dump.h"
+#include "fe_utils/connect.h"
 #include "fe_utils/string_utils.h"
 
 
@@ -131,6 +133,15 @@ char		g_comment_end[10];
 
 static const CatalogId nilCatalogId = {0, 0};
 
+/*
+ * Macro for producing quoted, schema-qualified name of a dumpable object.
+ * Note implicit dependence on "fout"; we should get rid of that argument.
+ */
+#define fmtQualifiedDumpable(obj) \
+	fmtQualifiedId(fout->remoteVersion, \
+				   (obj)->dobj.namespace->dobj.name, \
+				   (obj)->dobj.name)
+
 static void help(const char *progname);
 static void setup_connection(Archive *AH,
 				 const char *dumpencoding, const char *dumpsnapshot,
@@ -148,13 +159,13 @@ static NamespaceInfo *findNamespace(Archive *fout, Oid nsoid);
 static void dumpTableData(Archive *fout, TableDataInfo *tdinfo);
 static void refreshMatViewData(Archive *fout, TableDataInfo *tdinfo);
 static void guessConstraintInheritance(TableInfo *tblinfo, int numTables);
-static void dumpComment(Archive *fout, const char *target,
+static void dumpComment(Archive *fout, const char *type, const char *name,
 			const char *namespace, const char *owner,
 			CatalogId catalogId, int subid, DumpId dumpId);
 static int findComments(Archive *fout, Oid classoid, Oid objoid,
 			 CommentItem **items);
 static int	collectComments(Archive *fout, CommentItem **items);
-static void dumpSecLabel(Archive *fout, const char *target,
+static void dumpSecLabel(Archive *fout, const char *type, const char *name,
 			 const char *namespace, const char *owner,
 			 CatalogId catalogId, int subid, DumpId dumpId);
 static int findSecLabels(Archive *fout, Oid classoid, Oid objoid,
@@ -192,6 +203,7 @@ static void dumpAttrDef(Archive *fout, AttrDefInfo *adinfo);
 static void dumpSequence(Archive *fout, TableInfo *tbinfo);
 static void dumpSequenceData(Archive *fout, TableDataInfo *tdinfo);
 static void dumpIndex(Archive *fout, IndxInfo *indxinfo);
+static void dumpIndexAttach(Archive *fout, IndexAttachInfo *attachinfo);
 static void dumpStatisticsExt(Archive *fout, StatsExtInfo *statsextinfo);
 static void dumpConstraint(Archive *fout, ConstraintInfo *coninfo);
 static void dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo);
@@ -208,7 +220,7 @@ static void dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo);
 
 static void dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 		const char *type, const char *name, const char *subname,
-		const char *tag, const char *nspname, const char *owner,
+		const char *nspname, const char *owner,
 		const char *acls, const char *racls,
 		const char *initacls, const char *initracls);
 
@@ -237,10 +249,9 @@ static char *format_function_signature(Archive *fout,
 						  FuncInfo *finfo, bool honor_quotes);
 static char *convertRegProcReference(Archive *fout,
 						const char *proc);
-static char *convertOperatorReference(Archive *fout, const char *opr);
+static char *getFormattedOperatorName(Archive *fout, const char *oproid);
 static char *convertTSFunction(Archive *fout, Oid funcOid);
 static Oid	findLastBuiltinOid_V71(Archive *fout, const char *);
-static void selectSourceSchema(Archive *fout, const char *schemaName);
 static char *getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts);
 static void getBlobs(Archive *fout);
 static void dumpBlob(Archive *fout, BlobInfo *binfo);
@@ -250,10 +261,15 @@ static void dumpPublication(Archive *fout, PublicationInfo *pubinfo);
 static void dumpPublicationTable(Archive *fout, PublicationRelInfo *pubrinfo);
 static void dumpSubscription(Archive *fout, SubscriptionInfo *subinfo);
 static void dumpDatabase(Archive *AH);
+static void dumpDatabaseConfig(Archive *AH, PQExpBuffer outbuf,
+				   const char *dbname, Oid dboid);
 static void dumpEncoding(Archive *AH);
 static void dumpStdStrings(Archive *AH);
+static void dumpSearchPath(Archive *AH);
 static void binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
-										 PQExpBuffer upgrade_buffer, Oid pg_type_oid);
+										 PQExpBuffer upgrade_buffer,
+										 Oid pg_type_oid,
+										 bool force_array_type);
 static bool binary_upgrade_set_type_oids_by_rel_oid(Archive *fout,
 										PQExpBuffer upgrade_buffer, Oid pg_rel_oid);
 static void binary_upgrade_set_pg_class_oids(Archive *fout,
@@ -261,7 +277,9 @@ static void binary_upgrade_set_pg_class_oids(Archive *fout,
 								 Oid pg_class_oid, bool is_index);
 static void binary_upgrade_extension_member(PQExpBuffer upgrade_buffer,
 								DumpableObject *dobj,
-								const char *objlabel);
+								const char *objtype,
+								const char *objname,
+								const char *objnamespace);
 static const char *getAttrName(int attrnum, TableInfo *tblInfo);
 static const char *fmtCopyColumnList(const TableInfo *ti, PQExpBuffer buffer);
 static bool nonemptyReloptions(const char *reloptions);
@@ -353,6 +371,7 @@ main(int argc, char **argv)
 		{"snapshot", required_argument, NULL, 6},
 		{"strict-names", no_argument, &strict_names, 1},
 		{"use-set-session-authorization", no_argument, &dopt.use_setsessauth, 1},
+		{"no-comments", no_argument, &dopt.no_comments, 1},
 		{"no-publications", no_argument, &dopt.no_publications, 1},
 		{"no-security-labels", no_argument, &dopt.no_security_labels, 1},
 		{"no-synchronized-snapshots", no_argument, &dopt.no_synchronized_snapshots, 1},
@@ -625,6 +644,13 @@ main(int argc, char **argv)
 	compressLevel = 0;
 #endif
 
+	/*
+	 * If emitting an archive format, we always want to emit a DATABASE item,
+	 * in case --create is specified at pg_restore time.
+	 */
+	if (!plainText)
+		dopt.outputCreateDB = 1;
+
 	/*
 	 * On Windows we can only have at most MAXIMUM_WAIT_OBJECTS (= 64 usually)
 	 * parallel jobs because that's the maximum limit for the
@@ -830,12 +856,13 @@ main(int argc, char **argv)
 	 * order.
 	 */
 
-	/* First the special ENCODING and STDSTRINGS entries. */
+	/* First the special ENCODING, STDSTRINGS, and SEARCHPATH entries. */
 	dumpEncoding(fout);
 	dumpStdStrings(fout);
+	dumpSearchPath(fout);
 
-	/* The database item is always next, unless we don't want it at all */
-	if (dopt.include_everything && !dopt.dataOnly)
+	/* The database items are always next, unless we don't want them at all */
+	if (dopt.outputCreateDB)
 		dumpDatabase(fout);
 
 	/* Now the rearrangeable objects. */
@@ -864,6 +891,7 @@ main(int argc, char **argv)
 	ropt->use_setsessauth = dopt.use_setsessauth;
 	ropt->disable_dollar_quoting = dopt.disable_dollar_quoting;
 	ropt->dump_inserts = dopt.dump_inserts;
+	ropt->no_comments = dopt.no_comments;
 	ropt->no_publications = dopt.no_publications;
 	ropt->no_security_labels = dopt.no_security_labels;
 	ropt->no_subscriptions = dopt.no_subscriptions;
@@ -954,6 +982,7 @@ help(const char *progname)
 	printf(_("  --exclude-table-data=TABLE   do NOT dump data for the named table(s)\n"));
 	printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
 	printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
+	printf(_("  --no-comments                do not dump comments\n"));
 	printf(_("  --no-publications            do not dump publications\n"));
 	printf(_("  --no-security-labels         do not dump security label assignments\n"));
 	printf(_("  --no-subscriptions           do not dump subscriptions\n"));
@@ -993,6 +1022,8 @@ setup_connection(Archive *AH, const char *dumpencoding,
 	PGconn	   *conn = GetConnection(AH);
 	const char *std_strings;
 
+	PQclear(ExecuteSqlQueryForSingleRow(AH, ALWAYS_SECURE_SEARCH_PATH_SQL));
+
 	/*
 	 * Set the client encoding if requested.
 	 */
@@ -1283,11 +1314,18 @@ expand_table_name_patterns(Archive *fout,
 
 	for (cell = patterns->head; cell; cell = cell->next)
 	{
+		/*
+		 * Query must remain ABSOLUTELY devoid of unqualified names.  This
+		 * would be unnecessary given a pg_table_is_visible() variant taking a
+		 * search_path argument.
+		 */
 		appendPQExpBuffer(query,
 						  "SELECT c.oid"
 						  "\nFROM pg_catalog.pg_class c"
-						  "\n     LEFT JOIN pg_catalog.pg_namespace n ON n.oid = c.relnamespace"
-						  "\nWHERE c.relkind in ('%c', '%c', '%c', '%c', '%c', '%c')\n",
+						  "\n     LEFT JOIN pg_catalog.pg_namespace n"
+						  "\n     ON n.oid OPERATOR(pg_catalog.=) c.relnamespace"
+						  "\nWHERE c.relkind OPERATOR(pg_catalog.=) ANY"
+						  "\n    (array['%c', '%c', '%c', '%c', '%c', '%c'])\n",
 						  RELKIND_RELATION, RELKIND_SEQUENCE, RELKIND_VIEW,
 						  RELKIND_MATVIEW, RELKIND_FOREIGN_TABLE,
 						  RELKIND_PARTITIONED_TABLE);
@@ -1295,7 +1333,10 @@ expand_table_name_patterns(Archive *fout,
 							  false, "n.nspname", "c.relname", NULL,
 							  "pg_catalog.pg_table_is_visible(c.oid)");
 
+		ExecuteSqlStatement(fout, "RESET search_path");
 		res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
+		PQclear(ExecuteSqlQueryForSingleRow(fout,
+											ALWAYS_SECURE_SEARCH_PATH_SQL));
 		if (strict_names && PQntuples(res) == 0)
 			exit_horribly(NULL, "no matching tables were found for pattern \"%s\"\n", cell->val);
 
@@ -1401,6 +1442,19 @@ selectDumpableNamespace(NamespaceInfo *nsinfo, Archive *fout)
 		/* Other system schemas don't get dumped */
 		nsinfo->dobj.dump_contains = nsinfo->dobj.dump = DUMP_COMPONENT_NONE;
 	}
+	else if (strcmp(nsinfo->dobj.name, "public") == 0)
+	{
+		/*
+		 * The public schema is a strange beast that sits in a sort of
+		 * no-mans-land between being a system object and a user object.  We
+		 * don't want to dump creation or comment commands for it, because
+		 * that complicates matters for non-superuser use of pg_dump.  But we
+		 * should dump any ACL changes that have occurred for it, and of
+		 * course we should dump contained objects.
+		 */
+		nsinfo->dobj.dump = DUMP_COMPONENT_ACL;
+		nsinfo->dobj.dump_contains = DUMP_COMPONENT_ALL;
+	}
 	else
 		nsinfo->dobj.dump_contains = nsinfo->dobj.dump = DUMP_COMPONENT_ALL;
 
@@ -1611,21 +1665,21 @@ selectDumpableAccessMethod(AccessMethodInfo *method, Archive *fout)
  * selectDumpableExtension: policy-setting subroutine
  *		Mark an extension as to be dumped or not
  *
- * Normally, we dump all extensions, or none of them if include_everything
- * is false (i.e., a --schema or --table switch was given).  However, in
- * binary-upgrade mode it's necessary to skip built-in extensions, since we
+ * Built-in extensions should be skipped except for checking ACLs, since we
  * assume those will already be installed in the target database.  We identify
  * such extensions by their having OIDs in the range reserved for initdb.
+ * We dump all user-added extensions by default, or none of them if
+ * include_everything is false (i.e., a --schema or --table switch was given).
  */
 static void
 selectDumpableExtension(ExtensionInfo *extinfo, DumpOptions *dopt)
 {
 	/*
-	 * Use DUMP_COMPONENT_ACL for from-initdb extensions, to allow users to
-	 * change permissions on those objects, if they wish to, and have those
-	 * changes preserved.
+	 * Use DUMP_COMPONENT_ACL for built-in extensions, to allow users to
+	 * change permissions on their member objects, if they wish to, and have
+	 * those changes preserved.
 	 */
-	if (dopt->binary_upgrade && extinfo->dobj.catId.oid <= (Oid) g_last_builtin_oid)
+	if (extinfo->dobj.catId.oid <= (Oid) g_last_builtin_oid)
 		extinfo->dobj.dump = extinfo->dobj.dump_contains = DUMP_COMPONENT_ACL;
 	else
 		extinfo->dobj.dump = extinfo->dobj.dump_contains =
@@ -1704,14 +1758,6 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 		write_msg(NULL, "dumping contents of table \"%s.%s\"\n",
 				  tbinfo->dobj.namespace->dobj.name, classname);
 
-	/*
-	 * Make sure we are in proper schema.  We will qualify the table name
-	 * below anyway (in case its name conflicts with a pg_catalog table); but
-	 * this ensures reproducible results in case the table contains regproc,
-	 * regclass, etc columns.
-	 */
-	selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 	/*
 	 * Specify the column list explicitly so that we have no possibility of
 	 * retrieving data in the wrong column order.  (The default column
@@ -1723,9 +1769,7 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 	if (oids && hasoids)
 	{
 		appendPQExpBuffer(q, "COPY %s %s WITH OIDS TO stdout;",
-						  fmtQualifiedId(fout->remoteVersion,
-										 tbinfo->dobj.namespace->dobj.name,
-										 classname),
+						  fmtQualifiedDumpable(tbinfo),
 						  column_list);
 	}
 	else if (tdinfo->filtercond)
@@ -1741,17 +1785,13 @@ dumpTableData_copy(Archive *fout, void *dcontext)
 		else
 			appendPQExpBufferStr(q, "* ");
 		appendPQExpBuffer(q, "FROM %s %s) TO stdout;",
-						  fmtQualifiedId(fout->remoteVersion,
-										 tbinfo->dobj.namespace->dobj.name,
-										 classname),
+						  fmtQualifiedDumpable(tbinfo),
 						  tdinfo->filtercond);
 	}
 	else
 	{
 		appendPQExpBuffer(q, "COPY %s %s TO stdout;",
-						  fmtQualifiedId(fout->remoteVersion,
-										 tbinfo->dobj.namespace->dobj.name,
-										 classname),
+						  fmtQualifiedDumpable(tbinfo),
 						  column_list);
 	}
 	res = ExecuteSqlQuery(fout, q->data, PGRES_COPY_OUT);
@@ -1861,7 +1901,6 @@ dumpTableData_insert(Archive *fout, void *dcontext)
 {
 	TableDataInfo *tdinfo = (TableDataInfo *) dcontext;
 	TableInfo  *tbinfo = tdinfo->tdtable;
-	const char *classname = tbinfo->dobj.name;
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer insertStmt = NULL;
@@ -1870,19 +1909,9 @@ dumpTableData_insert(Archive *fout, void *dcontext)
 	int			nfields;
 	int			field;
 
-	/*
-	 * Make sure we are in proper schema.  We will qualify the table name
-	 * below anyway (in case its name conflicts with a pg_catalog table); but
-	 * this ensures reproducible results in case the table contains regproc,
-	 * regclass, etc columns.
-	 */
-	selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 	appendPQExpBuffer(q, "DECLARE _pg_dump_cursor CURSOR FOR "
 					  "SELECT * FROM ONLY %s",
-					  fmtQualifiedId(fout->remoteVersion,
-									 tbinfo->dobj.namespace->dobj.name,
-									 classname));
+					  fmtQualifiedDumpable(tbinfo));
 	if (tdinfo->filtercond)
 		appendPQExpBuffer(q, " %s", tdinfo->filtercond);
 
@@ -1904,6 +1933,8 @@ dumpTableData_insert(Archive *fout, void *dcontext)
 			 */
 			if (insertStmt == NULL)
 			{
+				TableInfo  *targettab;
+
 				insertStmt = createPQExpBuffer();
 
 				/*
@@ -1912,25 +1943,12 @@ dumpTableData_insert(Archive *fout, void *dcontext)
 				 * through the root table.
 				 */
 				if (dopt->load_via_partition_root && tbinfo->ispartition)
-				{
-					TableInfo  *parentTbinfo;
-
-					parentTbinfo = getRootTableInfo(tbinfo);
-
-					/*
-					 * When we loading data through the root, we will qualify
-					 * the table name. This is needed because earlier
-					 * search_path will be set for the partition table.
-					 */
-					classname = (char *) fmtQualifiedId(fout->remoteVersion,
-														parentTbinfo->dobj.namespace->dobj.name,
-														parentTbinfo->dobj.name);
-				}
+					targettab = getRootTableInfo(tbinfo);
 				else
-					classname = fmtId(tbinfo->dobj.name);
+					targettab = tbinfo;
 
 				appendPQExpBuffer(insertStmt, "INSERT INTO %s ",
-								  classname);
+								  fmtQualifiedDumpable(targettab));
 
 				/* corner case for zero-column table */
 				if (nfields == 0)
@@ -2106,17 +2124,10 @@ dumpTableData(Archive *fout, TableDataInfo *tdinfo)
 			TableInfo  *parentTbinfo;
 
 			parentTbinfo = getRootTableInfo(tbinfo);
-
-			/*
-			 * When we load data through the root, we will qualify the table
-			 * name, because search_path is set for the partition.
-			 */
-			copyFrom = fmtQualifiedId(fout->remoteVersion,
-									  parentTbinfo->dobj.namespace->dobj.name,
-									  parentTbinfo->dobj.name);
+			copyFrom = fmtQualifiedDumpable(parentTbinfo);
 		}
 		else
-			copyFrom = fmtId(tbinfo->dobj.name);
+			copyFrom = fmtQualifiedDumpable(tbinfo);
 
 		/* must use 2 steps here 'cause fmtId is nonreentrant */
 		appendPQExpBuffer(copyBuf, "COPY %s ",
@@ -2171,7 +2182,7 @@ refreshMatViewData(Archive *fout, TableDataInfo *tdinfo)
 	q = createPQExpBuffer();
 
 	appendPQExpBuffer(q, "REFRESH MATERIALIZED VIEW %s;\n",
-					  fmtId(tbinfo->dobj.name));
+					  fmtQualifiedDumpable(tbinfo));
 
 	if (tdinfo->dobj.dump & DUMP_COMPONENT_DATA)
 		ArchiveEntry(fout,
@@ -2299,9 +2310,6 @@ buildMatViewRefreshDependencies(Archive *fout)
 	if (fout->remoteVersion < 90300)
 		return;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	query = createPQExpBuffer();
 
 	appendPQExpBufferStr(query, "WITH RECURSIVE w AS "
@@ -2452,7 +2460,7 @@ getTableDataFKConstraints(void)
  *	In 8.4 and up we can rely on the conislocal field to decide which
  *	constraints must be dumped; much safer.
  *
- *	This function assumes all conislocal flags were initialized to TRUE.
+ *	This function assumes all conislocal flags were initialized to true.
  *	It clears the flag on anything that seems to be inherited.
  */
 static void
@@ -2525,6 +2533,7 @@ dumpDatabase(Archive *fout)
 	PQExpBuffer dbQry = createPQExpBuffer();
 	PQExpBuffer delQry = createPQExpBuffer();
 	PQExpBuffer creaQry = createPQExpBuffer();
+	PQExpBuffer labelq = createPQExpBuffer();
 	PGconn	   *conn = GetConnection(fout);
 	PGresult   *res;
 	int			i_tableoid,
@@ -2535,6 +2544,10 @@ dumpDatabase(Archive *fout)
 				i_ctype,
 				i_frozenxid,
 				i_minmxid,
+				i_datacl,
+				i_rdatacl,
+				i_datistemplate,
+				i_datconnlimit,
 				i_tablespace;
 	CatalogId	dbCatId;
 	DumpId		dbDumpId;
@@ -2543,25 +2556,52 @@ dumpDatabase(Archive *fout)
 			   *encoding,
 			   *collate,
 			   *ctype,
+			   *datacl,
+			   *rdatacl,
+			   *datistemplate,
+			   *datconnlimit,
 			   *tablespace;
 	uint32		frozenxid,
 				minmxid;
+	char	   *qdatname;
 
 	datname = PQdb(conn);
+	qdatname = pg_strdup(fmtId(datname));
 
 	if (g_verbose)
 		write_msg(NULL, "saving database definition\n");
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
+	/* Fetch the database-level properties for this database */
+	if (fout->remoteVersion >= 90600)
+	{
+		appendPQExpBuffer(dbQry, "SELECT tableoid, oid, "
+						  "(%s datdba) AS dba, "
+						  "pg_encoding_to_char(encoding) AS encoding, "
+						  "datcollate, datctype, datfrozenxid, datminmxid, "
+						  "(SELECT array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
+						  "  SELECT unnest(coalesce(datacl,acldefault('d',datdba))) AS acl "
+						  "  EXCEPT SELECT unnest(acldefault('d',datdba))) as datacls)"
+						  " AS datacl, "
+						  "(SELECT array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
+						  "  SELECT unnest(acldefault('d',datdba)) AS acl "
+						  "  EXCEPT SELECT unnest(coalesce(datacl,acldefault('d',datdba)))) as rdatacls)"
+						  " AS rdatacl, "
+						  "datistemplate, datconnlimit, "
+						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
+						  "shobj_description(oid, 'pg_database') AS description "
 
-	/* Get the database owner and parameters from pg_database */
-	if (fout->remoteVersion >= 90300)
+						  "FROM pg_database "
+						  "WHERE datname = ",
+						  username_subquery);
+		appendStringLiteralAH(dbQry, datname, fout);
+	}
+	else if (fout->remoteVersion >= 90300)
 	{
 		appendPQExpBuffer(dbQry, "SELECT tableoid, oid, "
 						  "(%s datdba) AS dba, "
 						  "pg_encoding_to_char(encoding) AS encoding, "
 						  "datcollate, datctype, datfrozenxid, datminmxid, "
+						  "datacl, '' as rdatacl, datistemplate, datconnlimit, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
 						  "shobj_description(oid, 'pg_database') AS description "
 
@@ -2576,6 +2616,7 @@ dumpDatabase(Archive *fout)
 						  "(%s datdba) AS dba, "
 						  "pg_encoding_to_char(encoding) AS encoding, "
 						  "datcollate, datctype, datfrozenxid, 0 AS datminmxid, "
+						  "datacl, '' as rdatacl, datistemplate, datconnlimit, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
 						  "shobj_description(oid, 'pg_database') AS description "
 
@@ -2590,6 +2631,7 @@ dumpDatabase(Archive *fout)
 						  "(%s datdba) AS dba, "
 						  "pg_encoding_to_char(encoding) AS encoding, "
 						  "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, "
+						  "datacl, '' as rdatacl, datistemplate, datconnlimit, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace, "
 						  "shobj_description(oid, 'pg_database') AS description "
 
@@ -2604,6 +2646,8 @@ dumpDatabase(Archive *fout)
 						  "(%s datdba) AS dba, "
 						  "pg_encoding_to_char(encoding) AS encoding, "
 						  "NULL AS datcollate, NULL AS datctype, datfrozenxid, 0 AS datminmxid, "
+						  "datacl, '' as rdatacl, datistemplate, "
+						  "-1 as datconnlimit, "
 						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = dattablespace) AS tablespace "
 						  "FROM pg_database "
 						  "WHERE datname = ",
@@ -2621,6 +2665,10 @@ dumpDatabase(Archive *fout)
 	i_ctype = PQfnumber(res, "datctype");
 	i_frozenxid = PQfnumber(res, "datfrozenxid");
 	i_minmxid = PQfnumber(res, "datminmxid");
+	i_datacl = PQfnumber(res, "datacl");
+	i_rdatacl = PQfnumber(res, "rdatacl");
+	i_datistemplate = PQfnumber(res, "datistemplate");
+	i_datconnlimit = PQfnumber(res, "datconnlimit");
 	i_tablespace = PQfnumber(res, "tablespace");
 
 	dbCatId.tableoid = atooid(PQgetvalue(res, 0, i_tableoid));
@@ -2631,10 +2679,20 @@ dumpDatabase(Archive *fout)
 	ctype = PQgetvalue(res, 0, i_ctype);
 	frozenxid = atooid(PQgetvalue(res, 0, i_frozenxid));
 	minmxid = atooid(PQgetvalue(res, 0, i_minmxid));
+	datacl = PQgetvalue(res, 0, i_datacl);
+	rdatacl = PQgetvalue(res, 0, i_rdatacl);
+	datistemplate = PQgetvalue(res, 0, i_datistemplate);
+	datconnlimit = PQgetvalue(res, 0, i_datconnlimit);
 	tablespace = PQgetvalue(res, 0, i_tablespace);
 
+	/*
+	 * Prepare the CREATE DATABASE command.  We must specify encoding, locale,
+	 * and tablespace since those can't be altered later.  Other DB properties
+	 * are left to the DATABASE PROPERTIES entry, so that they can be applied
+	 * after reconnecting to the target DB.
+	 */
 	appendPQExpBuffer(creaQry, "CREATE DATABASE %s WITH TEMPLATE = template0",
-					  fmtId(datname));
+					  qdatname);
 	if (strlen(encoding) > 0)
 	{
 		appendPQExpBufferStr(creaQry, " ENCODING = ");
@@ -2650,26 +2708,23 @@ dumpDatabase(Archive *fout)
 		appendPQExpBufferStr(creaQry, " LC_CTYPE = ");
 		appendStringLiteralAH(creaQry, ctype, fout);
 	}
+
+	/*
+	 * Note: looking at dopt->outputNoTablespaces here is completely the wrong
+	 * thing; the decision whether to specify a tablespace should be left till
+	 * pg_restore, so that pg_restore --no-tablespaces applies.  Ideally we'd
+	 * label the DATABASE entry with the tablespace and let the normal
+	 * tablespace selection logic work ... but CREATE DATABASE doesn't pay
+	 * attention to default_tablespace, so that won't work.
+	 */
 	if (strlen(tablespace) > 0 && strcmp(tablespace, "pg_default") != 0 &&
 		!dopt->outputNoTablespaces)
 		appendPQExpBuffer(creaQry, " TABLESPACE = %s",
 						  fmtId(tablespace));
 	appendPQExpBufferStr(creaQry, ";\n");
 
-	if (dopt->binary_upgrade)
-	{
-		appendPQExpBufferStr(creaQry, "\n-- For binary upgrade, set datfrozenxid and datminmxid.\n");
-		appendPQExpBuffer(creaQry, "UPDATE pg_catalog.pg_database\n"
-						  "SET datfrozenxid = '%u', datminmxid = '%u'\n"
-						  "WHERE datname = ",
-						  frozenxid, minmxid);
-		appendStringLiteralAH(creaQry, datname, fout);
-		appendPQExpBufferStr(creaQry, ";\n");
-
-	}
-
 	appendPQExpBuffer(delQry, "DROP DATABASE %s;\n",
-					  fmtId(datname));
+					  qdatname);
 
 	dbDumpId = createDumpId();
 
@@ -2691,6 +2746,135 @@ dumpDatabase(Archive *fout)
 				 NULL,			/* Dumper */
 				 NULL);			/* Dumper Arg */
 
+	/* Compute correct tag for archive entry */
+	appendPQExpBuffer(labelq, "DATABASE %s", qdatname);
+
+	/* Dump DB comment if any */
+	if (fout->remoteVersion >= 80200)
+	{
+		/*
+		 * 8.2 and up keep comments on shared objects in a shared table, so we
+		 * cannot use the dumpComment() code used for other database objects.
+		 * Be careful that the ArchiveEntry parameters match that function.
+		 */
+		char	   *comment = PQgetvalue(res, 0, PQfnumber(res, "description"));
+
+		if (comment && *comment && !dopt->no_comments)
+		{
+			resetPQExpBuffer(dbQry);
+
+			/*
+			 * Generates warning when loaded into a differently-named
+			 * database.
+			 */
+			appendPQExpBuffer(dbQry, "COMMENT ON DATABASE %s IS ", qdatname);
+			appendStringLiteralAH(dbQry, comment, fout);
+			appendPQExpBufferStr(dbQry, ";\n");
+
+			ArchiveEntry(fout, nilCatalogId, createDumpId(),
+						 labelq->data, NULL, NULL, dba,
+						 false, "COMMENT", SECTION_NONE,
+						 dbQry->data, "", NULL,
+						 &(dbDumpId), 1,
+						 NULL, NULL);
+		}
+	}
+	else
+	{
+		dumpComment(fout, "DATABASE", qdatname, NULL, dba,
+					dbCatId, 0, dbDumpId);
+	}
+
+	/* Dump DB security label, if enabled */
+	if (!dopt->no_security_labels && fout->remoteVersion >= 90200)
+	{
+		PGresult   *shres;
+		PQExpBuffer seclabelQry;
+
+		seclabelQry = createPQExpBuffer();
+
+		buildShSecLabelQuery(conn, "pg_database", dbCatId.oid, seclabelQry);
+		shres = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK);
+		resetPQExpBuffer(seclabelQry);
+		emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname);
+		if (seclabelQry->len > 0)
+			ArchiveEntry(fout, nilCatalogId, createDumpId(),
+						 labelq->data, NULL, NULL, dba,
+						 false, "SECURITY LABEL", SECTION_NONE,
+						 seclabelQry->data, "", NULL,
+						 &(dbDumpId), 1,
+						 NULL, NULL);
+		destroyPQExpBuffer(seclabelQry);
+		PQclear(shres);
+	}
+
+	/*
+	 * Dump ACL if any.  Note that we do not support initial privileges
+	 * (pg_init_privs) on databases.
+	 */
+	dumpACL(fout, dbCatId, dbDumpId, "DATABASE",
+			qdatname, NULL, NULL,
+			dba, datacl, rdatacl, "", "");
+
+	/*
+	 * Now construct a DATABASE PROPERTIES archive entry to restore any
+	 * non-default database-level properties.  (The reason this must be
+	 * separate is that we cannot put any additional commands into the TOC
+	 * entry that has CREATE DATABASE.  pg_restore would execute such a group
+	 * in an implicit transaction block, and the backend won't allow CREATE
+	 * DATABASE in that context.)
+	 */
+	resetPQExpBuffer(creaQry);
+	resetPQExpBuffer(delQry);
+
+	if (strlen(datconnlimit) > 0 && strcmp(datconnlimit, "-1") != 0)
+		appendPQExpBuffer(creaQry, "ALTER DATABASE %s CONNECTION LIMIT = %s;\n",
+						  qdatname, datconnlimit);
+
+	if (strcmp(datistemplate, "t") == 0)
+	{
+		appendPQExpBuffer(creaQry, "ALTER DATABASE %s IS_TEMPLATE = true;\n",
+						  qdatname);
+
+		/*
+		 * The backend won't accept DROP DATABASE on a template database.  We
+		 * can deal with that by removing the template marking before the DROP
+		 * gets issued.  We'd prefer to use ALTER DATABASE IF EXISTS here, but
+		 * since no such command is currently supported, fake it with a direct
+		 * UPDATE on pg_database.
+		 */
+		appendPQExpBufferStr(delQry, "UPDATE pg_catalog.pg_database "
+							 "SET datistemplate = false WHERE datname = ");
+		appendStringLiteralAH(delQry, datname, fout);
+		appendPQExpBufferStr(delQry, ";\n");
+	}
+
+	/* Add database-specific SET options */
+	dumpDatabaseConfig(fout, creaQry, datname, dbCatId.oid);
+
+	/*
+	 * We stick this binary-upgrade query into the DATABASE PROPERTIES archive
+	 * entry, too, for lack of a better place.
+	 */
+	if (dopt->binary_upgrade)
+	{
+		appendPQExpBufferStr(creaQry, "\n-- For binary upgrade, set datfrozenxid and datminmxid.\n");
+		appendPQExpBuffer(creaQry, "UPDATE pg_catalog.pg_database\n"
+						  "SET datfrozenxid = '%u', datminmxid = '%u'\n"
+						  "WHERE datname = ",
+						  frozenxid, minmxid);
+		appendStringLiteralAH(creaQry, datname, fout);
+		appendPQExpBufferStr(creaQry, ";\n");
+	}
+
+	if (creaQry->len > 0)
+		ArchiveEntry(fout, nilCatalogId, createDumpId(),
+					 datname, NULL, NULL, dba,
+					 false, "DATABASE PROPERTIES", SECTION_PRE_DATA,
+					 creaQry->data, delQry->data, NULL,
+					 &(dbDumpId), 1,
+					 NULL, NULL);
+
 	/*
 	 * pg_largeobject and pg_largeobject_metadata come from the old system
 	 * intact, so set their relfrozenxids and relminmxids.
@@ -2726,8 +2910,8 @@ dumpDatabase(Archive *fout)
 		appendPQExpBuffer(loOutQry, "UPDATE pg_catalog.pg_class\n"
 						  "SET relfrozenxid = '%u', relminmxid = '%u'\n"
 						  "WHERE oid = %u;\n",
-						  atoi(PQgetvalue(lo_res, 0, i_relfrozenxid)),
-						  atoi(PQgetvalue(lo_res, 0, i_relminmxid)),
+						  atooid(PQgetvalue(lo_res, 0, i_relfrozenxid)),
+						  atooid(PQgetvalue(lo_res, 0, i_relminmxid)),
 						  LargeObjectRelationId);
 		ArchiveEntry(fout, nilCatalogId, createDumpId(),
 					 "pg_largeobject", NULL, NULL, "",
@@ -2766,8 +2950,8 @@ dumpDatabase(Archive *fout)
 			appendPQExpBuffer(loOutQry, "UPDATE pg_catalog.pg_class\n"
 							  "SET relfrozenxid = '%u', relminmxid = '%u'\n"
 							  "WHERE oid = %u;\n",
-							  atoi(PQgetvalue(lo_res, 0, i_relfrozenxid)),
-							  atoi(PQgetvalue(lo_res, 0, i_relminmxid)),
+							  atooid(PQgetvalue(lo_res, 0, i_relfrozenxid)),
+							  atooid(PQgetvalue(lo_res, 0, i_relminmxid)),
 							  LargeObjectMetadataRelationId);
 			ArchiveEntry(fout, nilCatalogId, createDumpId(),
 						 "pg_largeobject_metadata", NULL, NULL, "",
@@ -2783,67 +2967,85 @@ dumpDatabase(Archive *fout)
 		destroyPQExpBuffer(loOutQry);
 	}
 
-	/* Dump DB comment if any */
-	if (fout->remoteVersion >= 80200)
-	{
-		/*
-		 * 8.2 keeps comments on shared objects in a shared table, so we
-		 * cannot use the dumpComment used for other database objects.
-		 */
-		char	   *comment = PQgetvalue(res, 0, PQfnumber(res, "description"));
+	PQclear(res);
 
-		if (comment && strlen(comment))
-		{
-			resetPQExpBuffer(dbQry);
+	free(qdatname);
+	destroyPQExpBuffer(dbQry);
+	destroyPQExpBuffer(delQry);
+	destroyPQExpBuffer(creaQry);
+	destroyPQExpBuffer(labelq);
+}
 
-			/*
-			 * Generates warning when loaded into a differently-named
-			 * database.
-			 */
-			appendPQExpBuffer(dbQry, "COMMENT ON DATABASE %s IS ", fmtId(datname));
-			appendStringLiteralAH(dbQry, comment, fout);
-			appendPQExpBufferStr(dbQry, ";\n");
+/*
+ * Collect any database-specific or role-and-database-specific SET options
+ * for this database, and append them to outbuf.
+ */
+static void
+dumpDatabaseConfig(Archive *AH, PQExpBuffer outbuf,
+				   const char *dbname, Oid dboid)
+{
+	PGconn	   *conn = GetConnection(AH);
+	PQExpBuffer buf = createPQExpBuffer();
+	PGresult   *res;
+	int			count = 1;
 
-			ArchiveEntry(fout, dbCatId, createDumpId(), datname, NULL, NULL,
-						 dba, false, "COMMENT", SECTION_NONE,
-						 dbQry->data, "", NULL,
-						 &dbDumpId, 1, NULL, NULL);
-		}
-	}
-	else
+	/*
+	 * First collect database-specific options.  Pre-8.4 server versions lack
+	 * unnest(), so we do this the hard way by querying once per subscript.
+	 */
+	for (;;)
 	{
-		resetPQExpBuffer(dbQry);
-		appendPQExpBuffer(dbQry, "DATABASE %s", fmtId(datname));
-		dumpComment(fout, dbQry->data, NULL, "",
-					dbCatId, 0, dbDumpId);
+		if (AH->remoteVersion >= 90000)
+			printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting "
+							  "WHERE setrole = 0 AND setdatabase = '%u'::oid",
+							  count, dboid);
+		else
+			printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE oid = '%u'::oid", count, dboid);
+
+		res = ExecuteSqlQuery(AH, buf->data, PGRES_TUPLES_OK);
+
+		if (PQntuples(res) == 1 &&
+			!PQgetisnull(res, 0, 0))
+		{
+			makeAlterConfigCommand(conn, PQgetvalue(res, 0, 0),
+								   "DATABASE", dbname, NULL, NULL,
+								   outbuf);
+			PQclear(res);
+			count++;
+		}
+		else
+		{
+			PQclear(res);
+			break;
+		}
 	}
 
-	/* Dump shared security label. */
-	if (!dopt->no_security_labels && fout->remoteVersion >= 90200)
+	/* Now look for role-and-database-specific options */
+	if (AH->remoteVersion >= 90000)
 	{
-		PGresult   *shres;
-		PQExpBuffer seclabelQry;
+		/* Here we can assume we have unnest() */
+		printfPQExpBuffer(buf, "SELECT rolname, unnest(setconfig) "
+						  "FROM pg_db_role_setting s, pg_roles r "
+						  "WHERE setrole = r.oid AND setdatabase = '%u'::oid",
+						  dboid);
 
-		seclabelQry = createPQExpBuffer();
+		res = ExecuteSqlQuery(AH, buf->data, PGRES_TUPLES_OK);
 
-		buildShSecLabelQuery(conn, "pg_database", dbCatId.oid, seclabelQry);
-		shres = ExecuteSqlQuery(fout, seclabelQry->data, PGRES_TUPLES_OK);
-		resetPQExpBuffer(seclabelQry);
-		emitShSecLabels(conn, shres, seclabelQry, "DATABASE", datname);
-		if (strlen(seclabelQry->data))
-			ArchiveEntry(fout, dbCatId, createDumpId(), datname, NULL, NULL,
-						 dba, false, "SECURITY LABEL", SECTION_NONE,
-						 seclabelQry->data, "", NULL,
-						 &dbDumpId, 1, NULL, NULL);
-		destroyPQExpBuffer(seclabelQry);
-		PQclear(shres);
-	}
+		if (PQntuples(res) > 0)
+		{
+			int			i;
 
-	PQclear(res);
+			for (i = 0; i < PQntuples(res); i++)
+				makeAlterConfigCommand(conn, PQgetvalue(res, i, 1),
+									   "ROLE", PQgetvalue(res, i, 0),
+									   "DATABASE", dbname,
+									   outbuf);
+		}
 
-	destroyPQExpBuffer(dbQry);
-	destroyPQExpBuffer(delQry);
-	destroyPQExpBuffer(creaQry);
+		PQclear(res);
+	}
+
+	destroyPQExpBuffer(buf);
 }
 
 /*
@@ -2899,6 +3101,69 @@ dumpStdStrings(Archive *AH)
 	destroyPQExpBuffer(qry);
 }
 
+/*
+ * dumpSearchPath: record the active search_path in the archive
+ */
+static void
+dumpSearchPath(Archive *AH)
+{
+	PQExpBuffer qry = createPQExpBuffer();
+	PQExpBuffer path = createPQExpBuffer();
+	PGresult   *res;
+	char	  **schemanames = NULL;
+	int			nschemanames = 0;
+	int			i;
+
+	/*
+	 * We use the result of current_schemas(), not the search_path GUC,
+	 * because that might contain wildcards such as "$user", which won't
+	 * necessarily have the same value during restore.  Also, this way avoids
+	 * listing schemas that may appear in search_path but not actually exist,
+	 * which seems like a prudent exclusion.
+	 */
+	res = ExecuteSqlQueryForSingleRow(AH,
+									  "SELECT pg_catalog.current_schemas(false)");
+
+	if (!parsePGArray(PQgetvalue(res, 0, 0), &schemanames, &nschemanames))
+		exit_horribly(NULL, "could not parse result of current_schemas()\n");
+
+	/*
+	 * We use set_config(), not a simple "SET search_path" command, because
+	 * the latter has less-clean behavior if the search path is empty.  While
+	 * that's likely to get fixed at some point, it seems like a good idea to
+	 * be as backwards-compatible as possible in what we put into archives.
+	 */
+	for (i = 0; i < nschemanames; i++)
+	{
+		if (i > 0)
+			appendPQExpBufferStr(path, ", ");
+		appendPQExpBufferStr(path, fmtId(schemanames[i]));
+	}
+
+	appendPQExpBufferStr(qry, "SELECT pg_catalog.set_config('search_path', ");
+	appendStringLiteralAH(qry, path->data, AH);
+	appendPQExpBufferStr(qry, ", false);\n");
+
+	if (g_verbose)
+		write_msg(NULL, "saving search_path = %s\n", path->data);
+
+	ArchiveEntry(AH, nilCatalogId, createDumpId(),
+				 "SEARCHPATH", NULL, NULL, "",
+				 false, "SEARCHPATH", SECTION_PRE_DATA,
+				 qry->data, "", NULL,
+				 NULL, 0,
+				 NULL, NULL);
+
+	/* Also save it in AH->searchpath, in case we're doing plain text dump */
+	AH->searchpath = pg_strdup(qry->data);
+
+	if (schemanames)
+		free(schemanames);
+	PQclear(res);
+	destroyPQExpBuffer(qry);
+	destroyPQExpBuffer(path);
+}
+
 
 /*
  * getBlobs:
@@ -2925,9 +3190,6 @@ getBlobs(Archive *fout)
 	if (g_verbose)
 		write_msg(NULL, "reading large objects\n");
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/* Fetch BLOB OIDs, and owner/ACL data if >= 9.0 */
 	if (fout->remoteVersion >= 90600)
 	{
@@ -3074,26 +3336,22 @@ dumpBlob(Archive *fout, BlobInfo *binfo)
 					 NULL, 0,
 					 NULL, NULL);
 
-	/* set up tag for comment and/or ACL */
-	resetPQExpBuffer(cquery);
-	appendPQExpBuffer(cquery, "LARGE OBJECT %s", binfo->dobj.name);
-
 	/* Dump comment if any */
 	if (binfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, cquery->data,
+		dumpComment(fout, "LARGE OBJECT", binfo->dobj.name,
 					NULL, binfo->rolname,
 					binfo->dobj.catId, 0, binfo->dobj.dumpId);
 
 	/* Dump security label if any */
 	if (binfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, cquery->data,
+		dumpSecLabel(fout, "LARGE OBJECT", binfo->dobj.name,
 					 NULL, binfo->rolname,
 					 binfo->dobj.catId, 0, binfo->dobj.dumpId);
 
 	/* Dump ACL if any */
 	if (binfo->blobacl && (binfo->dobj.dump & DUMP_COMPONENT_ACL))
 		dumpACL(fout, binfo->dobj.catId, binfo->dobj.dumpId, "LARGE OBJECT",
-				binfo->dobj.name, NULL, cquery->data,
+				binfo->dobj.name, NULL,
 				NULL, binfo->rolname, binfo->blobacl, binfo->rblobacl,
 				binfo->initblobacl, binfo->initrblobacl);
 
@@ -3120,9 +3378,6 @@ dumpBlobs(Archive *fout, void *arg)
 	if (g_verbose)
 		write_msg(NULL, "saving large objects\n");
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * Currently, we re-fetch all BLOB OIDs using a cursor.  Consider scanning
 	 * the already-in-memory dumpable objects instead...
@@ -3252,11 +3507,6 @@ getPolicies(Archive *fout, TableInfo tblinfo[], int numTables)
 					  tbinfo->dobj.namespace->dobj.name,
 					  tbinfo->dobj.name);
 
-		/*
-		 * select table schema to ensure regproc name is qualified if needed
-		 */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		resetPQExpBuffer(query);
 
 		/* Get the policies for the table. */
@@ -3369,7 +3619,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
 		query = createPQExpBuffer();
 
 		appendPQExpBuffer(query, "ALTER TABLE %s ENABLE ROW LEVEL SECURITY;",
-						  fmtId(polinfo->dobj.name));
+						  fmtQualifiedDumpable(polinfo));
 
 		if (polinfo->dobj.dump & DUMP_COMPONENT_POLICY)
 			ArchiveEntry(fout, polinfo->dobj.catId, polinfo->dobj.dumpId,
@@ -3408,7 +3658,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
 
 	appendPQExpBuffer(query, "CREATE POLICY %s", fmtId(polinfo->polname));
 
-	appendPQExpBuffer(query, " ON %s%s%s", fmtId(tbinfo->dobj.name),
+	appendPQExpBuffer(query, " ON %s%s%s", fmtQualifiedDumpable(tbinfo),
 					  !polinfo->polpermissive ? " AS RESTRICTIVE" : "", cmd);
 
 	if (polinfo->polroles != NULL)
@@ -3423,7 +3673,7 @@ dumpPolicy(Archive *fout, PolicyInfo *polinfo)
 	appendPQExpBuffer(query, ";\n");
 
 	appendPQExpBuffer(delqry, "DROP POLICY %s", fmtId(polinfo->polname));
-	appendPQExpBuffer(delqry, " ON %s;\n", fmtId(tbinfo->dobj.name));
+	appendPQExpBuffer(delqry, " ON %s;\n", fmtQualifiedDumpable(tbinfo));
 
 	tag = psprintf("%s %s", tbinfo->dobj.name, polinfo->dobj.name);
 
@@ -3477,7 +3727,7 @@ getPublications(Archive *fout)
 					  "SELECT p.tableoid, p.oid, p.pubname, "
 					  "(%s p.pubowner) AS rolname, "
 					  "p.puballtables, p.pubinsert, p.pubupdate, p.pubdelete "
-					  "FROM pg_catalog.pg_publication p",
+					  "FROM pg_publication p",
 					  username_subquery);
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -3534,7 +3784,7 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo)
 {
 	PQExpBuffer delq;
 	PQExpBuffer query;
-	PQExpBuffer labelq;
+	char	   *qpubname;
 	bool		first = true;
 
 	if (!(pubinfo->dobj.dump & DUMP_COMPONENT_DEFINITION))
@@ -3542,15 +3792,14 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo)
 
 	delq = createPQExpBuffer();
 	query = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+
+	qpubname = pg_strdup(fmtId(pubinfo->dobj.name));
 
 	appendPQExpBuffer(delq, "DROP PUBLICATION %s;\n",
-					  fmtId(pubinfo->dobj.name));
+					  qpubname);
 
 	appendPQExpBuffer(query, "CREATE PUBLICATION %s",
-					  fmtId(pubinfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "PUBLICATION %s", fmtId(pubinfo->dobj.name));
+					  qpubname);
 
 	if (pubinfo->puballtables)
 		appendPQExpBufferStr(query, " FOR ALL TABLES");
@@ -3593,17 +3842,18 @@ dumpPublication(Archive *fout, PublicationInfo *pubinfo)
 				 NULL, NULL);
 
 	if (pubinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "PUBLICATION", qpubname,
 					NULL, pubinfo->rolname,
 					pubinfo->dobj.catId, 0, pubinfo->dobj.dumpId);
 
 	if (pubinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "PUBLICATION", qpubname,
 					 NULL, pubinfo->rolname,
 					 pubinfo->dobj.catId, 0, pubinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(delq);
 	destroyPQExpBuffer(query);
+	free(qpubname);
 }
 
 /*
@@ -3653,8 +3903,7 @@ getPublicationTables(Archive *fout, TableInfo tblinfo[], int numTables)
 		/* Get the publication membership for the table. */
 		appendPQExpBuffer(query,
 						  "SELECT pr.tableoid, pr.oid, p.pubname "
-						  "FROM pg_catalog.pg_publication_rel pr,"
-						  "     pg_catalog.pg_publication p "
+						  "FROM pg_publication_rel pr, pg_publication p "
 						  "WHERE pr.prrelid = '%u'"
 						  "  AND p.oid = pr.prpubid",
 						  tbinfo->dobj.catId.oid);
@@ -3717,8 +3966,8 @@ dumpPublicationTable(Archive *fout, PublicationRelInfo *pubrinfo)
 
 	appendPQExpBuffer(query, "ALTER PUBLICATION %s ADD TABLE ONLY",
 					  fmtId(pubrinfo->pubname));
-	appendPQExpBuffer(query, " %s;",
-					  fmtId(tbinfo->dobj.name));
+	appendPQExpBuffer(query, " %s;\n",
+					  fmtQualifiedDumpable(tbinfo));
 
 	/*
 	 * There is no point in creating drop query as drop query as the drop is
@@ -3786,7 +4035,7 @@ getSubscriptions(Archive *fout)
 
 		res = ExecuteSqlQuery(fout,
 							  "SELECT count(*) FROM pg_subscription "
-							  "WHERE subdbid = (SELECT oid FROM pg_catalog.pg_database"
+							  "WHERE subdbid = (SELECT oid FROM pg_database"
 							  "                 WHERE datname = current_database())",
 							  PGRES_TUPLES_OK);
 		n = atoi(PQgetvalue(res, 0, 0));
@@ -3806,8 +4055,8 @@ getSubscriptions(Archive *fout)
 					  "(%s s.subowner) AS rolname, "
 					  " s.subconninfo, s.subslotname, s.subsynccommit, "
 					  " s.subpublications "
-					  "FROM pg_catalog.pg_subscription s "
-					  "WHERE s.subdbid = (SELECT oid FROM pg_catalog.pg_database"
+					  "FROM pg_subscription s "
+					  "WHERE s.subdbid = (SELECT oid FROM pg_database"
 					  "                   WHERE datname = current_database())",
 					  username_subquery);
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -3865,8 +4114,8 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
 {
 	PQExpBuffer delq;
 	PQExpBuffer query;
-	PQExpBuffer labelq;
 	PQExpBuffer publications;
+	char	   *qsubname;
 	char	  **pubnames = NULL;
 	int			npubnames = 0;
 	int			i;
@@ -3876,13 +4125,14 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
 
 	delq = createPQExpBuffer();
 	query = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+
+	qsubname = pg_strdup(fmtId(subinfo->dobj.name));
 
 	appendPQExpBuffer(delq, "DROP SUBSCRIPTION %s;\n",
-					  fmtId(subinfo->dobj.name));
+					  qsubname);
 
 	appendPQExpBuffer(query, "CREATE SUBSCRIPTION %s CONNECTION ",
-					  fmtId(subinfo->dobj.name));
+					  qsubname);
 	appendStringLiteralAH(query, subinfo->subconninfo, fout);
 
 	/* Build list of quoted publications and append them to query. */
@@ -3916,8 +4166,6 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
 
 	appendPQExpBufferStr(query, ");\n");
 
-	appendPQExpBuffer(labelq, "SUBSCRIPTION %s", fmtId(subinfo->dobj.name));
-
 	ArchiveEntry(fout, subinfo->dobj.catId, subinfo->dobj.dumpId,
 				 subinfo->dobj.name,
 				 NULL,
@@ -3929,12 +4177,12 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
 				 NULL, NULL);
 
 	if (subinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "SUBSCRIPTION", qsubname,
 					NULL, subinfo->rolname,
 					subinfo->dobj.catId, 0, subinfo->dobj.dumpId);
 
 	if (subinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "SUBSCRIPTION", qsubname,
 					 NULL, subinfo->rolname,
 					 subinfo->dobj.catId, 0, subinfo->dobj.dumpId);
 
@@ -3944,15 +4192,17 @@ dumpSubscription(Archive *fout, SubscriptionInfo *subinfo)
 
 	destroyPQExpBuffer(delq);
 	destroyPQExpBuffer(query);
+	free(qsubname);
 }
 
 static void
 binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
 										 PQExpBuffer upgrade_buffer,
-										 Oid pg_type_oid)
+										 Oid pg_type_oid,
+										 bool force_array_type)
 {
 	PQExpBuffer upgrade_query = createPQExpBuffer();
-	PGresult   *upgrade_res;
+	PGresult   *res;
 	Oid			pg_type_array_oid;
 
 	appendPQExpBufferStr(upgrade_buffer, "\n-- For binary upgrade, must preserve pg_type oid\n");
@@ -3964,12 +4214,43 @@ binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
 	appendPQExpBuffer(upgrade_query,
 					  "SELECT typarray "
 					  "FROM pg_catalog.pg_type "
-					  "WHERE pg_type.oid = '%u'::pg_catalog.oid;",
+					  "WHERE oid = '%u'::pg_catalog.oid;",
 					  pg_type_oid);
 
-	upgrade_res = ExecuteSqlQueryForSingleRow(fout, upgrade_query->data);
+	res = ExecuteSqlQueryForSingleRow(fout, upgrade_query->data);
+
+	pg_type_array_oid = atooid(PQgetvalue(res, 0, PQfnumber(res, "typarray")));
+
+	PQclear(res);
+
+	if (!OidIsValid(pg_type_array_oid) && force_array_type)
+	{
+		/*
+		 * If the old version didn't assign an array type, but the new version
+		 * does, we must select an unused type OID to assign.  This currently
+		 * only happens for domains, when upgrading pre-v11 to v11 and up.
+		 *
+		 * Note: local state here is kind of ugly, but we must have some,
+		 * since we mustn't choose the same unused OID more than once.
+		 */
+		static Oid	next_possible_free_oid = FirstNormalObjectId;
+		bool		is_dup;
 
-	pg_type_array_oid = atooid(PQgetvalue(upgrade_res, 0, PQfnumber(upgrade_res, "typarray")));
+		do
+		{
+			++next_possible_free_oid;
+			printfPQExpBuffer(upgrade_query,
+							  "SELECT EXISTS(SELECT 1 "
+							  "FROM pg_catalog.pg_type "
+							  "WHERE oid = '%u'::pg_catalog.oid);",
+							  next_possible_free_oid);
+			res = ExecuteSqlQueryForSingleRow(fout, upgrade_query->data);
+			is_dup = (PQgetvalue(res, 0, 0)[0] == 't');
+			PQclear(res);
+		} while (is_dup);
+
+		pg_type_array_oid = next_possible_free_oid;
+	}
 
 	if (OidIsValid(pg_type_array_oid))
 	{
@@ -3980,7 +4261,6 @@ binary_upgrade_set_type_oids_by_type_oid(Archive *fout,
 						  pg_type_array_oid);
 	}
 
-	PQclear(upgrade_res);
 	destroyPQExpBuffer(upgrade_query);
 }
 
@@ -4008,7 +4288,7 @@ binary_upgrade_set_type_oids_by_rel_oid(Archive *fout,
 	pg_type_oid = atooid(PQgetvalue(upgrade_res, 0, PQfnumber(upgrade_res, "crel")));
 
 	binary_upgrade_set_type_oids_by_type_oid(fout, upgrade_buffer,
-											 pg_type_oid);
+											 pg_type_oid, false);
 
 	if (!PQgetisnull(upgrade_res, 0, PQfnumber(upgrade_res, "trel")))
 	{
@@ -4096,11 +4376,16 @@ binary_upgrade_set_pg_class_oids(Archive *fout,
 /*
  * If the DumpableObject is a member of an extension, add a suitable
  * ALTER EXTENSION ADD command to the creation commands in upgrade_buffer.
+ *
+ * For somewhat historical reasons, objname should already be quoted,
+ * but not objnamespace (if any).
  */
 static void
 binary_upgrade_extension_member(PQExpBuffer upgrade_buffer,
 								DumpableObject *dobj,
-								const char *objlabel)
+								const char *objtype,
+								const char *objname,
+								const char *objnamespace)
 {
 	DumpableObject *extobj = NULL;
 	int			i;
@@ -4122,13 +4407,17 @@ binary_upgrade_extension_member(PQExpBuffer upgrade_buffer,
 		extobj = NULL;
 	}
 	if (extobj == NULL)
-		exit_horribly(NULL, "could not find parent extension for %s\n", objlabel);
+		exit_horribly(NULL, "could not find parent extension for %s %s\n",
+					  objtype, objname);
 
 	appendPQExpBufferStr(upgrade_buffer,
 						 "\n-- For binary upgrade, handle extension membership the hard way\n");
-	appendPQExpBuffer(upgrade_buffer, "ALTER EXTENSION %s ADD %s;\n",
+	appendPQExpBuffer(upgrade_buffer, "ALTER EXTENSION %s ADD %s ",
 					  fmtId(extobj->name),
-					  objlabel);
+					  objtype);
+	if (objnamespace && *objnamespace)
+		appendPQExpBuffer(upgrade_buffer, "%s.", fmtId(objnamespace));
+	appendPQExpBuffer(upgrade_buffer, "%s;\n", objname);
 }
 
 /*
@@ -4158,9 +4447,6 @@ getNamespaces(Archive *fout, int *numNamespaces)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * we fetch all namespaces including system ones, so that every object we
 	 * read in can be linked to a containing namespace.
@@ -4193,29 +4479,6 @@ getNamespaces(Archive *fout, int *numNamespaces)
 						  init_acl_subquery->data,
 						  init_racl_subquery->data);
 
-		/*
-		 * When we are doing a 'clean' run, we will be dropping and recreating
-		 * the 'public' schema (the only object which has that kind of
-		 * treatment in the backend and which has an entry in pg_init_privs)
-		 * and therefore we should not consider any initial privileges in
-		 * pg_init_privs in that case.
-		 *
-		 * See pg_backup_archiver.c:_printTocEntry() for the details on why
-		 * the public schema is special in this regard.
-		 *
-		 * Note that if the public schema is dropped and re-created, this is
-		 * essentially a no-op because the new public schema won't have an
-		 * entry in pg_init_privs anyway, as the entry will be removed when
-		 * the public schema is dropped.
-		 *
-		 * Further, we have to handle the case where the public schema does
-		 * not exist at all.
-		 */
-		if (dopt->outputClean)
-			appendPQExpBuffer(query, " AND pip.objoid <> "
-							  "coalesce((select oid from pg_namespace "
-							  "where nspname = 'public'),0)");
-
 		appendPQExpBuffer(query, ") ");
 
 		destroyPQExpBuffer(acl_subquery);
@@ -4339,9 +4602,6 @@ getExtensions(Archive *fout, int *numExtensions)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBufferStr(query, "SELECT x.tableoid, x.oid, "
 						 "x.extname, n.nspname, x.extrelocatable, x.extversion, x.extconfig, x.extcondition "
 						 "FROM pg_extension x "
@@ -4439,9 +4699,6 @@ getTypes(Archive *fout, int *numTypes)
 	 * be revisited if the backend ever allows renaming of array types.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90600)
 	{
 		PQExpBuffer acl_subquery = createPQExpBuffer();
@@ -4671,9 +4928,6 @@ getOperators(Archive *fout, int *numOprs)
 	 * system-defined operators at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, oprname, "
 					  "oprnamespace, "
 					  "(%s oprowner) AS rolname, "
@@ -4764,9 +5018,6 @@ getCollations(Archive *fout, int *numCollations)
 	 * system-defined collations at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, collname, "
 					  "collnamespace, "
 					  "(%s collowner) AS rolname "
@@ -4840,9 +5091,6 @@ getConversions(Archive *fout, int *numConversions)
 	 * system-defined conversions at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, conname, "
 					  "connamespace, "
 					  "(%s conowner) AS rolname "
@@ -4918,9 +5166,6 @@ getAccessMethods(Archive *fout, int *numAccessMethods)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/* Select all access methods from pg_am table */
 	appendPQExpBuffer(query, "SELECT tableoid, oid, amname, amtype, "
 					  "amhandler::pg_catalog.regproc AS amhandler "
@@ -4991,9 +5236,6 @@ getOpclasses(Archive *fout, int *numOpclasses)
 	 * system-defined opclasses at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, opcname, "
 					  "opcnamespace, "
 					  "(%s opcowner) AS rolname "
@@ -5078,9 +5320,6 @@ getOpfamilies(Archive *fout, int *numOpfamilies)
 	 * system-defined opfamilies at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, opfname, "
 					  "opfnamespace, "
 					  "(%s opfowner) AS rolname "
@@ -5158,9 +5397,6 @@ getAggregates(Archive *fout, int *numAggs)
 	int			i_initaggacl;
 	int			i_initraggacl;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * Find all interesting aggregates.  See comment in getFuncs() for the
 	 * rationale behind the filtering logic.
@@ -5352,9 +5588,6 @@ getFuncs(Archive *fout, int *numFuncs)
 	int			i_initproacl;
 	int			i_initrproacl;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * Find all interesting functions.  This is a bit complicated:
 	 *
@@ -5611,9 +5844,6 @@ getTables(Archive *fout, int *numTables)
 	int			i_ispartition;
 	int			i_partbound;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * Find all the tables and table-like objects.
 	 *
@@ -6306,7 +6536,8 @@ getTables(Archive *fout, int *numTables)
 		 * alterations to parent tables.
 		 *
 		 * NOTE: it'd be kinda nice to lock other relations too, not only
-		 * plain tables, but the backend doesn't presently allow that.
+		 * plain or partitioned tables, but the backend doesn't presently
+		 * allow that.
 		 *
 		 * We only need to lock the table for certain components; see
 		 * pg_dump.h
@@ -6319,9 +6550,7 @@ getTables(Archive *fout, int *numTables)
 			resetPQExpBuffer(query);
 			appendPQExpBuffer(query,
 							  "LOCK TABLE %s IN ACCESS SHARE MODE",
-							  fmtQualifiedId(fout->remoteVersion,
-											 tblinfo[i].dobj.namespace->dobj.name,
-											 tblinfo[i].dobj.name));
+							  fmtQualifiedDumpable(&tblinfo[i]));
 			ExecuteSqlStatement(fout, query->data);
 		}
 
@@ -6413,9 +6642,6 @@ getInherits(Archive *fout, int *numInherits)
 	int			i_inhrelid;
 	int			i_inhparent;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	/*
 	 * Find all the inheritance information, excluding implicit inheritance
 	 * via partitioning.  We handle that case using getPartitions(), because
@@ -6467,6 +6693,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 	int			i_tableoid,
 				i_oid,
 				i_indexname,
+				i_parentidx,
 				i_indexdef,
 				i_indnkeys,
 				i_indkey,
@@ -6488,15 +6715,17 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 	{
 		TableInfo  *tbinfo = &tblinfo[i];
 
-		/* Only plain tables and materialized views have indexes. */
-		if (tbinfo->relkind != RELKIND_RELATION &&
-			tbinfo->relkind != RELKIND_MATVIEW)
-			continue;
 		if (!tbinfo->hasindex)
 			continue;
 
-		/* Ignore indexes of tables whose definitions are not to be dumped */
-		if (!(tbinfo->dobj.dump & DUMP_COMPONENT_DEFINITION))
+		/*
+		 * Ignore indexes of tables whose definitions are not to be dumped.
+		 *
+		 * We also need indexes on partitioned tables which have partitions to
+		 * be dumped, in order to dump the indexes on the partitions.
+		 */
+		if (!(tbinfo->dobj.dump & DUMP_COMPONENT_DEFINITION) &&
+			!tbinfo->interesting)
 			continue;
 
 		if (g_verbose)
@@ -6504,9 +6733,6 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 					  tbinfo->dobj.namespace->dobj.name,
 					  tbinfo->dobj.name);
 
-		/* Make sure we are in proper schema so indexdef is right */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		/*
 		 * The point of the messy-looking outer join is to find a constraint
 		 * that is related by an internal dependency link to the index. If we
@@ -6519,7 +6745,39 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 		 * is not.
 		 */
 		resetPQExpBuffer(query);
-		if (fout->remoteVersion >= 90400)
+		if (fout->remoteVersion >= 110000)
+		{
+			appendPQExpBuffer(query,
+							  "SELECT t.tableoid, t.oid, "
+							  "t.relname AS indexname, "
+							  "inh.inhparent AS parentidx, "
+							  "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
+							  "t.relnatts AS indnkeys, "
+							  "i.indkey, i.indisclustered, "
+							  "i.indisreplident, t.relpages, "
+							  "c.contype, c.conname, "
+							  "c.condeferrable, c.condeferred, "
+							  "c.tableoid AS contableoid, "
+							  "c.oid AS conoid, "
+							  "pg_catalog.pg_get_constraintdef(c.oid, false) AS condef, "
+							  "(SELECT spcname FROM pg_catalog.pg_tablespace s WHERE s.oid = t.reltablespace) AS tablespace, "
+							  "t.reloptions AS indreloptions "
+							  "FROM pg_catalog.pg_index i "
+							  "JOIN pg_catalog.pg_class t ON (t.oid = i.indexrelid) "
+							  "JOIN pg_catalog.pg_class t2 ON (t2.oid = i.indrelid) "
+							  "LEFT JOIN pg_catalog.pg_constraint c "
+							  "ON (i.indrelid = c.conrelid AND "
+							  "i.indexrelid = c.conindid AND "
+							  "c.contype IN ('p','u','x')) "
+							  "LEFT JOIN pg_catalog.pg_inherits inh "
+							  "ON (inh.inhrelid = indexrelid) "
+							  "WHERE i.indrelid = '%u'::pg_catalog.oid "
+							  "AND (i.indisvalid OR t2.relkind = 'p') "
+							  "AND i.indisready "
+							  "ORDER BY indexname",
+							  tbinfo->dobj.catId.oid);
+		}
+		else if (fout->remoteVersion >= 90400)
 		{
 			/*
 			 * the test on indisready is necessary in 9.2, and harmless in
@@ -6528,6 +6786,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 			appendPQExpBuffer(query,
 							  "SELECT t.tableoid, t.oid, "
 							  "t.relname AS indexname, "
+							  "0 AS parentidx, "
 							  "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
 							  "t.relnatts AS indnkeys, "
 							  "i.indkey, i.indisclustered, "
@@ -6559,6 +6818,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 			appendPQExpBuffer(query,
 							  "SELECT t.tableoid, t.oid, "
 							  "t.relname AS indexname, "
+							  "0 AS parentidx, "
 							  "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
 							  "t.relnatts AS indnkeys, "
 							  "i.indkey, i.indisclustered, "
@@ -6586,6 +6846,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 			appendPQExpBuffer(query,
 							  "SELECT t.tableoid, t.oid, "
 							  "t.relname AS indexname, "
+							  "0 AS parentidx, "
 							  "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
 							  "t.relnatts AS indnkeys, "
 							  "i.indkey, i.indisclustered, "
@@ -6616,6 +6877,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 			appendPQExpBuffer(query,
 							  "SELECT t.tableoid, t.oid, "
 							  "t.relname AS indexname, "
+							  "0 AS parentidx, "
 							  "pg_catalog.pg_get_indexdef(i.indexrelid) AS indexdef, "
 							  "t.relnatts AS indnkeys, "
 							  "i.indkey, i.indisclustered, "
@@ -6648,6 +6910,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 		i_tableoid = PQfnumber(res, "tableoid");
 		i_oid = PQfnumber(res, "oid");
 		i_indexname = PQfnumber(res, "indexname");
+		i_parentidx = PQfnumber(res, "parentidx");
 		i_indexdef = PQfnumber(res, "indexdef");
 		i_indnkeys = PQfnumber(res, "indnkeys");
 		i_indkey = PQfnumber(res, "indkey");
@@ -6664,8 +6927,10 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 		i_tablespace = PQfnumber(res, "tablespace");
 		i_indreloptions = PQfnumber(res, "indreloptions");
 
-		indxinfo = (IndxInfo *) pg_malloc(ntups * sizeof(IndxInfo));
+		tbinfo->indexes = indxinfo =
+			(IndxInfo *) pg_malloc(ntups * sizeof(IndxInfo));
 		constrinfo = (ConstraintInfo *) pg_malloc(ntups * sizeof(ConstraintInfo));
+		tbinfo->numIndexes = ntups;
 
 		for (j = 0; j < ntups; j++)
 		{
@@ -6675,6 +6940,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 			indxinfo[j].dobj.catId.tableoid = atooid(PQgetvalue(res, j, i_tableoid));
 			indxinfo[j].dobj.catId.oid = atooid(PQgetvalue(res, j, i_oid));
 			AssignDumpId(&indxinfo[j].dobj);
+			indxinfo[j].dobj.dump = tbinfo->dobj.dump;
 			indxinfo[j].dobj.name = pg_strdup(PQgetvalue(res, j, i_indexname));
 			indxinfo[j].dobj.namespace = tbinfo->dobj.namespace;
 			indxinfo[j].indextable = tbinfo;
@@ -6687,6 +6953,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 						  indxinfo[j].indkeys, indxinfo[j].indnkeys);
 			indxinfo[j].indisclustered = (PQgetvalue(res, j, i_indisclustered)[0] == 't');
 			indxinfo[j].indisreplident = (PQgetvalue(res, j, i_indisreplident)[0] == 't');
+			indxinfo[j].parentidx = atooid(PQgetvalue(res, j, i_parentidx));
 			indxinfo[j].relpages = atoi(PQgetvalue(res, j, i_relpages));
 			contype = *(PQgetvalue(res, j, i_contype));
 
@@ -6700,6 +6967,7 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 				constrinfo[j].dobj.catId.tableoid = atooid(PQgetvalue(res, j, i_contableoid));
 				constrinfo[j].dobj.catId.oid = atooid(PQgetvalue(res, j, i_conoid));
 				AssignDumpId(&constrinfo[j].dobj);
+				constrinfo[j].dobj.dump = tbinfo->dobj.dump;
 				constrinfo[j].dobj.name = pg_strdup(PQgetvalue(res, j, i_conname));
 				constrinfo[j].dobj.namespace = tbinfo->dobj.namespace;
 				constrinfo[j].contable = tbinfo;
@@ -6733,99 +7001,68 @@ getIndexes(Archive *fout, TableInfo tblinfo[], int numTables)
 
 /*
  * getExtendedStatistics
- *	  get information about extended statistics on a dumpable table
- *	  or materialized view.
+ *	  get information about extended-statistics objects.
  *
  * Note: extended statistics data is not returned directly to the caller, but
  * it does get entered into the DumpableObject tables.
  */
 void
-getExtendedStatistics(Archive *fout, TableInfo tblinfo[], int numTables)
+getExtendedStatistics(Archive *fout)
 {
-	int			i,
-				j;
 	PQExpBuffer query;
-	PGresult   *res;
-	StatsExtInfo *statsextinfo;
-	int			ntups;
-	int			i_tableoid;
-	int			i_oid;
-	int			i_stxname;
-	int			i_stxdef;
-
-	/* Extended statistics were new in v10 */
-	if (fout->remoteVersion < 100000)
-		return;
-
-	query = createPQExpBuffer();
-
-	for (i = 0; i < numTables; i++)
-	{
-		TableInfo  *tbinfo = &tblinfo[i];
-
-		/*
-		 * Only plain tables, materialized views, foreign tables and
-		 * partitioned tables can have extended statistics.
-		 */
-		if (tbinfo->relkind != RELKIND_RELATION &&
-			tbinfo->relkind != RELKIND_MATVIEW &&
-			tbinfo->relkind != RELKIND_FOREIGN_TABLE &&
-			tbinfo->relkind != RELKIND_PARTITIONED_TABLE)
-			continue;
-
-		/*
-		 * Ignore extended statistics of tables whose definitions are not to
-		 * be dumped.
-		 */
-		if (!(tbinfo->dobj.dump & DUMP_COMPONENT_DEFINITION))
-			continue;
+	PGresult   *res;
+	StatsExtInfo *statsextinfo;
+	int			ntups;
+	int			i_tableoid;
+	int			i_oid;
+	int			i_stxname;
+	int			i_stxnamespace;
+	int			i_rolname;
+	int			i;
 
-		if (g_verbose)
-			write_msg(NULL, "reading extended statistics for table \"%s.%s\"\n",
-					  tbinfo->dobj.namespace->dobj.name,
-					  tbinfo->dobj.name);
+	/* Extended statistics were new in v10 */
+	if (fout->remoteVersion < 100000)
+		return;
 
-		/* Make sure we are in proper schema so stadef is right */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
+	query = createPQExpBuffer();
 
-		resetPQExpBuffer(query);
+	appendPQExpBuffer(query, "SELECT tableoid, oid, stxname, "
+					  "stxnamespace, (%s stxowner) AS rolname "
+					  "FROM pg_catalog.pg_statistic_ext",
+					  username_subquery);
 
-		appendPQExpBuffer(query,
-						  "SELECT "
-						  "tableoid, "
-						  "oid, "
-						  "stxname, "
-						  "pg_catalog.pg_get_statisticsobjdef(oid) AS stxdef "
-						  "FROM pg_statistic_ext "
-						  "WHERE stxrelid = '%u' "
-						  "ORDER BY stxname", tbinfo->dobj.catId.oid);
+	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
 
-		res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
+	ntups = PQntuples(res);
 
-		ntups = PQntuples(res);
+	i_tableoid = PQfnumber(res, "tableoid");
+	i_oid = PQfnumber(res, "oid");
+	i_stxname = PQfnumber(res, "stxname");
+	i_stxnamespace = PQfnumber(res, "stxnamespace");
+	i_rolname = PQfnumber(res, "rolname");
 
-		i_tableoid = PQfnumber(res, "tableoid");
-		i_oid = PQfnumber(res, "oid");
-		i_stxname = PQfnumber(res, "stxname");
-		i_stxdef = PQfnumber(res, "stxdef");
+	statsextinfo = (StatsExtInfo *) pg_malloc(ntups * sizeof(StatsExtInfo));
 
-		statsextinfo = (StatsExtInfo *) pg_malloc(ntups * sizeof(StatsExtInfo));
+	for (i = 0; i < ntups; i++)
+	{
+		statsextinfo[i].dobj.objType = DO_STATSEXT;
+		statsextinfo[i].dobj.catId.tableoid = atooid(PQgetvalue(res, i, i_tableoid));
+		statsextinfo[i].dobj.catId.oid = atooid(PQgetvalue(res, i, i_oid));
+		AssignDumpId(&statsextinfo[i].dobj);
+		statsextinfo[i].dobj.name = pg_strdup(PQgetvalue(res, i, i_stxname));
+		statsextinfo[i].dobj.namespace =
+			findNamespace(fout,
+						  atooid(PQgetvalue(res, i, i_stxnamespace)));
+		statsextinfo[i].rolname = pg_strdup(PQgetvalue(res, i, i_rolname));
 
-		for (j = 0; j < ntups; j++)
-		{
-			statsextinfo[j].dobj.objType = DO_STATSEXT;
-			statsextinfo[j].dobj.catId.tableoid = atooid(PQgetvalue(res, j, i_tableoid));
-			statsextinfo[j].dobj.catId.oid = atooid(PQgetvalue(res, j, i_oid));
-			AssignDumpId(&statsextinfo[j].dobj);
-			statsextinfo[j].dobj.name = pg_strdup(PQgetvalue(res, j, i_stxname));
-			statsextinfo[j].dobj.namespace = tbinfo->dobj.namespace;
-			statsextinfo[j].statsexttable = tbinfo;
-			statsextinfo[j].statsextdef = pg_strdup(PQgetvalue(res, j, i_stxdef));
-		}
+		/* Decide whether we want to dump it */
+		selectDumpableObject(&(statsextinfo[i].dobj), fout);
 
-		PQclear(res);
+		/* Stats objects do not currently have ACLs. */
+		statsextinfo[i].dobj.dump &= ~DUMP_COMPONENT_ACL;
 	}
 
+	PQclear(res);
 	destroyPQExpBuffer(query);
 }
 
@@ -6868,12 +7105,6 @@ getConstraints(Archive *fout, TableInfo tblinfo[], int numTables)
 					  tbinfo->dobj.namespace->dobj.name,
 					  tbinfo->dobj.name);
 
-		/*
-		 * select table schema to ensure constraint expr is qualified if
-		 * needed
-		 */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		resetPQExpBuffer(query);
 		appendPQExpBuffer(query,
 						  "SELECT tableoid, oid, conname, confrelid, "
@@ -6938,12 +7169,6 @@ getDomainConstraints(Archive *fout, TypeInfo *tyinfo)
 				i_consrc;
 	int			ntups;
 
-	/*
-	 * select appropriate schema to ensure names in constraint are properly
-	 * qualified
-	 */
-	selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
-
 	query = createPQExpBuffer();
 
 	if (fout->remoteVersion >= 90100)
@@ -7038,9 +7263,6 @@ getRules(Archive *fout, int *numRules)
 	int			i_is_instead;
 	int			i_ev_enabled;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 80300)
 	{
 		appendPQExpBufferStr(query, "SELECT "
@@ -7176,11 +7398,6 @@ getTriggers(Archive *fout, TableInfo tblinfo[], int numTables)
 					  tbinfo->dobj.namespace->dobj.name,
 					  tbinfo->dobj.name);
 
-		/*
-		 * select table schema to ensure regproc name is qualified if needed
-		 */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		resetPQExpBuffer(query);
 		if (fout->remoteVersion >= 90000)
 		{
@@ -7364,9 +7581,6 @@ getEventTriggers(Archive *fout, int *numEventTriggers)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query,
 					  "SELECT e.tableoid, e.oid, evtname, evtenabled, "
 					  "evtevent, (%s evtowner) AS evtowner, "
@@ -7454,9 +7668,6 @@ getProcLangs(Archive *fout, int *numProcLangs)
 	int			i_initrlanacl;
 	int			i_lanowner;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90600)
 	{
 		PQExpBuffer acl_subquery = createPQExpBuffer();
@@ -7629,9 +7840,6 @@ getCasts(Archive *fout, int *numCasts)
 	int			i_castcontext;
 	int			i_castmethod;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 80400)
 	{
 		appendPQExpBufferStr(query, "SELECT tableoid, oid, "
@@ -7753,9 +7961,6 @@ getTransforms(Archive *fout, int *numTransforms)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, "
 					  "trftype, trflang, trffromsql::oid, trftosql::oid "
 					  "FROM pg_transform "
@@ -7869,12 +8074,6 @@ getTableAttrs(Archive *fout, TableInfo *tblinfo, int numTables)
 		if (!tbinfo->interesting)
 			continue;
 
-		/*
-		 * Make sure we are in proper schema for this table; this allows
-		 * correct retrieval of formatted type names and default exprs
-		 */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		/* find all the user attributes and their types */
 
 		/*
@@ -8349,9 +8548,6 @@ getTSParsers(Archive *fout, int *numTSParsers)
 	 * system-defined objects at dump-out time.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBufferStr(query, "SELECT tableoid, oid, prsname, prsnamespace, "
 						 "prsstart::oid, prstoken::oid, "
 						 "prsend::oid, prsheadline::oid, prslextype::oid "
@@ -8436,9 +8632,6 @@ getTSDictionaries(Archive *fout, int *numTSDicts)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, dictname, "
 					  "dictnamespace, (%s dictowner) AS rolname, "
 					  "dicttemplate, dictinitoption "
@@ -8522,9 +8715,6 @@ getTSTemplates(Archive *fout, int *numTSTemplates)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBufferStr(query, "SELECT tableoid, oid, tmplname, "
 						 "tmplnamespace, tmplinit::oid, tmpllexize::oid "
 						 "FROM pg_ts_template");
@@ -8601,9 +8791,6 @@ getTSConfigurations(Archive *fout, int *numTSConfigs)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query, "SELECT tableoid, oid, cfgname, "
 					  "cfgnamespace, (%s cfgowner) AS rolname, cfgparser "
 					  "FROM pg_ts_config",
@@ -8687,9 +8874,6 @@ getForeignDataWrappers(Archive *fout, int *numForeignDataWrappers)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90600)
 	{
 		PQExpBuffer acl_subquery = createPQExpBuffer();
@@ -8857,9 +9041,6 @@ getForeignServers(Archive *fout, int *numForeignServers)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90600)
 	{
 		PQExpBuffer acl_subquery = createPQExpBuffer();
@@ -9006,9 +9187,6 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
 
 	query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90600)
 	{
 		PQExpBuffer acl_subquery = createPQExpBuffer();
@@ -9109,13 +9287,18 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
  * dumpComment --
  *
  * This routine is used to dump any comments associated with the
- * object handed to this routine. The routine takes a constant character
- * string for the target part of the comment-creation command, plus
+ * object handed to this routine. The routine takes the object type
+ * and object name (ready to print, except for schema decoration), plus
  * the namespace and owner of the object (for labeling the ArchiveEntry),
  * plus catalog ID and subid which are the lookup key for pg_description,
  * plus the dump ID for the object (for setting a dependency).
  * If a matching pg_description entry is found, it is dumped.
  *
+ * Note: in some cases, such as comments for triggers and rules, the "type"
+ * string really looks like, e.g., "TRIGGER name ON".  This is a bit of a hack
+ * but it doesn't seem worth complicating the API for all callers to make
+ * it cleaner.
+ *
  * Note: although this routine takes a dumpId for dependency purposes,
  * that purpose is just to mark the dependency in the emitted dump file
  * for possible future use by pg_restore.  We do NOT use it for determining
@@ -9124,7 +9307,7 @@ getDefaultACLs(Archive *fout, int *numDefaultACLs)
  * calling ArchiveEntry() for the specified object.
  */
 static void
-dumpComment(Archive *fout, const char *target,
+dumpComment(Archive *fout, const char *type, const char *name,
 			const char *namespace, const char *owner,
 			CatalogId catalogId, int subid, DumpId dumpId)
 {
@@ -9132,8 +9315,12 @@ dumpComment(Archive *fout, const char *target,
 	CommentItem *comments;
 	int			ncomments;
 
+	/* do nothing, if --no-comments is supplied */
+	if (dopt->no_comments)
+		return;
+
 	/* Comments are schema not data ... except blob comments are data */
-	if (strncmp(target, "LARGE OBJECT ", 13) != 0)
+	if (strcmp(type, "LARGE OBJECT") != 0)
 	{
 		if (dopt->dataOnly)
 			return;
@@ -9162,24 +9349,31 @@ dumpComment(Archive *fout, const char *target,
 	if (ncomments > 0)
 	{
 		PQExpBuffer query = createPQExpBuffer();
+		PQExpBuffer tag = createPQExpBuffer();
 
-		appendPQExpBuffer(query, "COMMENT ON %s IS ", target);
+		appendPQExpBuffer(query, "COMMENT ON %s ", type);
+		if (namespace && *namespace)
+			appendPQExpBuffer(query, "%s.", fmtId(namespace));
+		appendPQExpBuffer(query, "%s IS ", name);
 		appendStringLiteralAH(query, comments->descr, fout);
 		appendPQExpBufferStr(query, ";\n");
 
+		appendPQExpBuffer(tag, "%s %s", type, name);
+
 		/*
 		 * We mark comments as SECTION_NONE because they really belong in the
 		 * same section as their parent, whether that is pre-data or
 		 * post-data.
 		 */
 		ArchiveEntry(fout, nilCatalogId, createDumpId(),
-					 target, namespace, NULL, owner,
+					 tag->data, namespace, NULL, owner,
 					 false, "COMMENT", SECTION_NONE,
 					 query->data, "", NULL,
 					 &(dumpId), 1,
 					 NULL, NULL);
 
 		destroyPQExpBuffer(query);
+		destroyPQExpBuffer(tag);
 	}
 }
 
@@ -9197,7 +9391,11 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
 	CommentItem *comments;
 	int			ncomments;
 	PQExpBuffer query;
-	PQExpBuffer target;
+	PQExpBuffer tag;
+
+	/* do nothing, if --no-comments is supplied */
+	if (dopt->no_comments)
+		return;
 
 	/* Comments are SCHEMA not data */
 	if (dopt->dataOnly)
@@ -9214,7 +9412,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
 		return;
 
 	query = createPQExpBuffer();
-	target = createPQExpBuffer();
+	tag = createPQExpBuffer();
 
 	while (ncomments > 0)
 	{
@@ -9223,17 +9421,18 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
 
 		if (objsubid == 0)
 		{
-			resetPQExpBuffer(target);
-			appendPQExpBuffer(target, "%s %s", reltypename,
+			resetPQExpBuffer(tag);
+			appendPQExpBuffer(tag, "%s %s", reltypename,
 							  fmtId(tbinfo->dobj.name));
 
 			resetPQExpBuffer(query);
-			appendPQExpBuffer(query, "COMMENT ON %s IS ", target->data);
+			appendPQExpBuffer(query, "COMMENT ON %s %s IS ", reltypename,
+							  fmtQualifiedDumpable(tbinfo));
 			appendStringLiteralAH(query, descr, fout);
 			appendPQExpBufferStr(query, ";\n");
 
 			ArchiveEntry(fout, nilCatalogId, createDumpId(),
-						 target->data,
+						 tag->data,
 						 tbinfo->dobj.namespace->dobj.name,
 						 NULL, tbinfo->rolname,
 						 false, "COMMENT", SECTION_NONE,
@@ -9243,18 +9442,21 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
 		}
 		else if (objsubid > 0 && objsubid <= tbinfo->numatts)
 		{
-			resetPQExpBuffer(target);
-			appendPQExpBuffer(target, "COLUMN %s.",
+			resetPQExpBuffer(tag);
+			appendPQExpBuffer(tag, "COLUMN %s.",
 							  fmtId(tbinfo->dobj.name));
-			appendPQExpBufferStr(target, fmtId(tbinfo->attnames[objsubid - 1]));
+			appendPQExpBufferStr(tag, fmtId(tbinfo->attnames[objsubid - 1]));
 
 			resetPQExpBuffer(query);
-			appendPQExpBuffer(query, "COMMENT ON %s IS ", target->data);
+			appendPQExpBuffer(query, "COMMENT ON COLUMN %s.",
+							  fmtQualifiedDumpable(tbinfo));
+			appendPQExpBuffer(query, "%s IS ",
+							  fmtId(tbinfo->attnames[objsubid - 1]));
 			appendStringLiteralAH(query, descr, fout);
 			appendPQExpBufferStr(query, ";\n");
 
 			ArchiveEntry(fout, nilCatalogId, createDumpId(),
-						 target->data,
+						 tag->data,
 						 tbinfo->dobj.namespace->dobj.name,
 						 NULL, tbinfo->rolname,
 						 false, "COMMENT", SECTION_NONE,
@@ -9268,7 +9470,7 @@ dumpTableComment(Archive *fout, TableInfo *tbinfo,
 	}
 
 	destroyPQExpBuffer(query);
-	destroyPQExpBuffer(target);
+	destroyPQExpBuffer(tag);
 }
 
 /*
@@ -9375,11 +9577,6 @@ collectComments(Archive *fout, CommentItem **items)
 	int			i;
 	CommentItem *comments;
 
-	/*
-	 * Note we do NOT change source schema here; preserve the caller's
-	 * setting, instead.
-	 */
-
 	query = createPQExpBuffer();
 
 	appendPQExpBufferStr(query, "SELECT description, classoid, objoid, objsubid "
@@ -9470,6 +9667,9 @@ dumpDumpableObject(Archive *fout, DumpableObject *dobj)
 		case DO_INDEX:
 			dumpIndex(fout, (IndxInfo *) dobj);
 			break;
+		case DO_INDEX_ATTACH:
+			dumpIndexAttach(fout, (IndexAttachInfo *) dobj);
+			break;
 		case DO_STATSEXT:
 			dumpStatisticsExt(fout, (StatsExtInfo *) dobj);
 			break;
@@ -9571,7 +9771,6 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	char	   *qnspname;
 
 	/* Skip if not to be dumped */
@@ -9580,7 +9779,6 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
 	qnspname = pg_strdup(fmtId(nspinfo->dobj.name));
 
@@ -9588,10 +9786,9 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
 
 	appendPQExpBuffer(q, "CREATE SCHEMA %s;\n", qnspname);
 
-	appendPQExpBuffer(labelq, "SCHEMA %s", qnspname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &nspinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &nspinfo->dobj,
+										"SCHEMA", qnspname, NULL);
 
 	if (nspinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, nspinfo->dobj.catId, nspinfo->dobj.dumpId,
@@ -9605,18 +9802,18 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
 
 	/* Dump Schema Comments and Security Labels */
 	if (nspinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "SCHEMA", qnspname,
 					NULL, nspinfo->rolname,
 					nspinfo->dobj.catId, 0, nspinfo->dobj.dumpId);
 
 	if (nspinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "SCHEMA", qnspname,
 					 NULL, nspinfo->rolname,
 					 nspinfo->dobj.catId, 0, nspinfo->dobj.dumpId);
 
 	if (nspinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, nspinfo->dobj.catId, nspinfo->dobj.dumpId, "SCHEMA",
-				qnspname, NULL, nspinfo->dobj.name, NULL,
+				qnspname, NULL, NULL,
 				nspinfo->rolname, nspinfo->nspacl, nspinfo->rnspacl,
 				nspinfo->initnspacl, nspinfo->initrnspacl);
 
@@ -9624,7 +9821,6 @@ dumpNamespace(Archive *fout, NamespaceInfo *nspinfo)
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 }
 
 /*
@@ -9637,7 +9833,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	char	   *qextname;
 
 	/* Skip if not to be dumped */
@@ -9646,7 +9841,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
 	qextname = pg_strdup(fmtId(extinfo->dobj.name));
 
@@ -9655,20 +9849,28 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 	if (!dopt->binary_upgrade)
 	{
 		/*
-		 * In a regular dump, we use IF NOT EXISTS so that there isn't a
-		 * problem if the extension already exists in the target database;
-		 * this is essential for installed-by-default extensions such as
-		 * plpgsql.
+		 * In a regular dump, we simply create the extension, intentionally
+		 * not specifying a version, so that the destination installation's
+		 * default version is used.
 		 *
-		 * In binary-upgrade mode, that doesn't work well, so instead we skip
-		 * built-in extensions based on their OIDs; see
-		 * selectDumpableExtension.
+		 * Use of IF NOT EXISTS here is unlike our behavior for other object
+		 * types; but there are various scenarios in which it's convenient to
+		 * manually create the desired extension before restoring, so we
+		 * prefer to allow it to exist already.
 		 */
 		appendPQExpBuffer(q, "CREATE EXTENSION IF NOT EXISTS %s WITH SCHEMA %s;\n",
 						  qextname, fmtId(extinfo->namespace));
 	}
 	else
 	{
+		/*
+		 * In binary-upgrade mode, it's critical to reproduce the state of the
+		 * database exactly, so our procedure is to create an empty extension,
+		 * restore all the contained objects normally, and add them to the
+		 * extension one by one.  This function performs just the first of
+		 * those steps.  binary_upgrade_extension_member() takes care of
+		 * adding member objects as they're created.
+		 */
 		int			i;
 		int			n;
 
@@ -9678,8 +9880,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 		 * We unconditionally create the extension, so we must drop it if it
 		 * exists.  This could happen if the user deleted 'plpgsql' and then
 		 * readded it, causing its oid to be greater than g_last_builtin_oid.
-		 * The g_last_builtin_oid test was kept to avoid repeatedly dropping
-		 * and recreating extensions like 'plpgsql'.
 		 */
 		appendPQExpBuffer(q, "DROP EXTENSION IF EXISTS %s;\n", qextname);
 
@@ -9726,8 +9926,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 		appendPQExpBufferStr(q, ");\n");
 	}
 
-	appendPQExpBuffer(labelq, "EXTENSION %s", qextname);
-
 	if (extinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, extinfo->dobj.catId, extinfo->dobj.dumpId,
 					 extinfo->dobj.name,
@@ -9740,12 +9938,12 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 
 	/* Dump Extension Comments and Security Labels */
 	if (extinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "EXTENSION", qextname,
 					NULL, "",
 					extinfo->dobj.catId, 0, extinfo->dobj.dumpId);
 
 	if (extinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "EXTENSION", qextname,
 					 NULL, "",
 					 extinfo->dobj.catId, 0, extinfo->dobj.dumpId);
 
@@ -9753,7 +9951,6 @@ dumpExtension(Archive *fout, ExtensionInfo *extinfo)
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 }
 
 /*
@@ -9797,18 +9994,15 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	int			num,
 				i;
 	Oid			enum_oid;
 	char	   *qtypname;
+	char	   *qualtypname;
 	char	   *label;
 
-	/* Set proper schema search path */
-	selectSourceSchema(fout, "pg_catalog");
-
 	if (fout->remoteVersion >= 90100)
 		appendPQExpBuffer(query, "SELECT oid, enumlabel "
 						  "FROM pg_catalog.pg_enum "
@@ -9827,23 +10021,21 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
 	num = PQntuples(res);
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
 	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog.
 	 * CASCADE shouldn't be required here as for normal types since the I/O
 	 * functions are generic and do not get dropped.
 	 */
-	appendPQExpBuffer(delq, "DROP TYPE %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  qtypname);
+	appendPQExpBuffer(delq, "DROP TYPE %s;\n", qualtypname);
 
 	if (dopt->binary_upgrade)
 		binary_upgrade_set_type_oids_by_type_oid(fout, q,
-												 tyinfo->dobj.catId.oid);
+												 tyinfo->dobj.catId.oid,
+												 false);
 
 	appendPQExpBuffer(q, "CREATE TYPE %s AS ENUM (",
-					  qtypname);
+					  qualtypname);
 
 	if (!dopt->binary_upgrade)
 	{
@@ -9873,19 +10065,16 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
 			appendPQExpBuffer(q,
 							  "SELECT pg_catalog.binary_upgrade_set_next_pg_enum_oid('%u'::pg_catalog.oid);\n",
 							  enum_oid);
-			appendPQExpBuffer(q, "ALTER TYPE %s.",
-							  fmtId(tyinfo->dobj.namespace->dobj.name));
-			appendPQExpBuffer(q, "%s ADD VALUE ",
-							  qtypname);
+			appendPQExpBuffer(q, "ALTER TYPE %s ADD VALUE ", qualtypname);
 			appendStringLiteralAH(q, label, fout);
 			appendPQExpBufferStr(q, ";\n\n");
 		}
 	}
 
-	appendPQExpBuffer(labelq, "TYPE %s", qtypname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"TYPE", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -9900,18 +10089,18 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Type Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TYPE", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "TYPE", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
@@ -9919,8 +10108,9 @@ dumpEnumType(Archive *fout, TypeInfo *tyinfo)
 	PQclear(res);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qtypname);
+	free(qualtypname);
 }
 
 /*
@@ -9933,19 +10123,13 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	Oid			collationOid;
 	char	   *qtypname;
+	char	   *qualtypname;
 	char	   *procname;
 
-	/*
-	 * select appropriate schema to ensure names in CREATE are properly
-	 * qualified
-	 */
-	selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
-
 	appendPQExpBuffer(query,
 					  "SELECT pg_catalog.format_type(rngsubtype, NULL) AS rngsubtype, "
 					  "opc.opcname AS opcname, "
@@ -9964,23 +10148,21 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 	res = ExecuteSqlQueryForSingleRow(fout, query->data);
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
 	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog.
 	 * CASCADE shouldn't be required here as for normal types since the I/O
 	 * functions are generic and do not get dropped.
 	 */
-	appendPQExpBuffer(delq, "DROP TYPE %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  qtypname);
+	appendPQExpBuffer(delq, "DROP TYPE %s;\n", qualtypname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_set_type_oids_by_type_oid(fout,
-												 q, tyinfo->dobj.catId.oid);
+		binary_upgrade_set_type_oids_by_type_oid(fout, q,
+												 tyinfo->dobj.catId.oid,
+												 false);
 
 	appendPQExpBuffer(q, "CREATE TYPE %s AS RANGE (",
-					  qtypname);
+					  qualtypname);
 
 	appendPQExpBuffer(q, "\n    subtype = %s",
 					  PQgetvalue(res, 0, PQfnumber(res, "rngsubtype")));
@@ -9991,7 +10173,6 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 		char	   *opcname = PQgetvalue(res, 0, PQfnumber(res, "opcname"));
 		char	   *nspname = PQgetvalue(res, 0, PQfnumber(res, "opcnsp"));
 
-		/* always schema-qualify, don't try to be smart */
 		appendPQExpBuffer(q, ",\n    subtype_opclass = %s.",
 						  fmtId(nspname));
 		appendPQExpBufferStr(q, fmtId(opcname));
@@ -10003,12 +10184,8 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 		CollInfo   *coll = findCollationByOid(collationOid);
 
 		if (coll)
-		{
-			/* always schema-qualify, don't try to be smart */
-			appendPQExpBuffer(q, ",\n    collation = %s.",
-							  fmtId(coll->dobj.namespace->dobj.name));
-			appendPQExpBufferStr(q, fmtId(coll->dobj.name));
-		}
+			appendPQExpBuffer(q, ",\n    collation = %s",
+							  fmtQualifiedDumpable(coll));
 	}
 
 	procname = PQgetvalue(res, 0, PQfnumber(res, "rngcanonical"));
@@ -10021,10 +10198,10 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 
 	appendPQExpBufferStr(q, "\n);\n");
 
-	appendPQExpBuffer(labelq, "TYPE %s", qtypname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"TYPE", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -10039,18 +10216,18 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Type Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TYPE", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "TYPE", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
@@ -10058,8 +10235,9 @@ dumpRangeType(Archive *fout, TypeInfo *tyinfo)
 	PQclear(res);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qtypname);
+	free(qualtypname);
 }
 
 /*
@@ -10077,30 +10255,26 @@ dumpUndefinedType(Archive *fout, TypeInfo *tyinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	char	   *qtypname;
+	char	   *qualtypname;
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog.
-	 */
-	appendPQExpBuffer(delq, "DROP TYPE %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  qtypname);
+	appendPQExpBuffer(delq, "DROP TYPE %s;\n", qualtypname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_set_type_oids_by_type_oid(fout,
-												 q, tyinfo->dobj.catId.oid);
+		binary_upgrade_set_type_oids_by_type_oid(fout, q,
+												 tyinfo->dobj.catId.oid,
+												 false);
 
 	appendPQExpBuffer(q, "CREATE TYPE %s;\n",
-					  qtypname);
-
-	appendPQExpBuffer(labelq, "TYPE %s", qtypname);
+					  qualtypname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"TYPE", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -10115,25 +10289,26 @@ dumpUndefinedType(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Type Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TYPE", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "TYPE", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qtypname);
+	free(qualtypname);
 }
 
 /*
@@ -10146,10 +10321,10 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	char	   *qtypname;
+	char	   *qualtypname;
 	char	   *typlen;
 	char	   *typinput;
 	char	   *typoutput;
@@ -10173,9 +10348,6 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 	char	   *typdefault;
 	bool		typdefault_is_literal = false;
 
-	/* Set proper schema search path so regproc references list correctly */
-	selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
-
 	/* Fetch type-specific details */
 	if (fout->remoteVersion >= 90100)
 	{
@@ -10284,27 +10456,28 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 		typdefault = NULL;
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
 	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog.
 	 * The reason we include CASCADE is that the circular dependency between
 	 * the type and its I/O functions makes it impossible to drop the type any
 	 * other way.
 	 */
-	appendPQExpBuffer(delq, "DROP TYPE %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s CASCADE;\n",
-					  qtypname);
+	appendPQExpBuffer(delq, "DROP TYPE %s CASCADE;\n", qualtypname);
 
-	/* We might already have a shell type, but setting pg_type_oid is harmless */
+	/*
+	 * We might already have a shell type, but setting pg_type_oid is
+	 * harmless, and in any case we'd better set the array type OID.
+	 */
 	if (dopt->binary_upgrade)
 		binary_upgrade_set_type_oids_by_type_oid(fout, q,
-												 tyinfo->dobj.catId.oid);
+												 tyinfo->dobj.catId.oid,
+												 false);
 
 	appendPQExpBuffer(q,
 					  "CREATE TYPE %s (\n"
 					  "    INTERNALLENGTH = %s",
-					  qtypname,
+					  qualtypname,
 					  (strcmp(typlen, "-1") == 0) ? "variable" : typlen);
 
 	/* regproc result is sufficiently quoted already */
@@ -10337,8 +10510,6 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 	{
 		char	   *elemType;
 
-		/* reselect schema in case changed by function dump */
-		selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
 		elemType = getFormattedTypeName(fout, tyinfo->typelem, zeroAsOpaque);
 		appendPQExpBuffer(q, ",\n    ELEMENT = %s", elemType);
 		free(elemType);
@@ -10382,10 +10553,10 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 
 	appendPQExpBufferStr(q, "\n);\n");
 
-	appendPQExpBuffer(labelq, "TYPE %s", qtypname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"TYPE", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -10400,18 +10571,18 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Type Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TYPE", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "TYPE", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
@@ -10419,8 +10590,9 @@ dumpBaseType(Archive *fout, TypeInfo *tyinfo)
 	PQclear(res);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qtypname);
+	free(qualtypname);
 }
 
 /*
@@ -10433,20 +10605,17 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	int			i;
 	char	   *qtypname;
+	char	   *qualtypname;
 	char	   *typnotnull;
 	char	   *typdefn;
 	char	   *typdefault;
 	Oid			typcollation;
 	bool		typdefault_is_literal = false;
 
-	/* Set proper schema search path so type references list correctly */
-	selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
-
 	/* Fetch domain specific details */
 	if (fout->remoteVersion >= 90100)
 	{
@@ -10490,13 +10659,15 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 
 	if (dopt->binary_upgrade)
 		binary_upgrade_set_type_oids_by_type_oid(fout, q,
-												 tyinfo->dobj.catId.oid);
+												 tyinfo->dobj.catId.oid,
+												 true); /* force array type */
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
 	appendPQExpBuffer(q,
 					  "CREATE DOMAIN %s AS %s",
-					  qtypname,
+					  qualtypname,
 					  typdefn);
 
 	/* Print collation only if different from base type's collation */
@@ -10506,12 +10677,7 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 
 		coll = findCollationByOid(typcollation);
 		if (coll)
-		{
-			/* always schema-qualify, don't try to be smart */
-			appendPQExpBuffer(q, " COLLATE %s.",
-							  fmtId(coll->dobj.namespace->dobj.name));
-			appendPQExpBufferStr(q, fmtId(coll->dobj.name));
-		}
+			appendPQExpBuffer(q, " COLLATE %s", fmtQualifiedDumpable(coll));
 	}
 
 	if (typnotnull[0] == 't')
@@ -10542,18 +10708,12 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 
 	appendPQExpBufferStr(q, ";\n");
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP DOMAIN %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  qtypname);
-
-	appendPQExpBuffer(labelq, "DOMAIN %s", qtypname);
+	appendPQExpBuffer(delq, "DROP DOMAIN %s;\n", qualtypname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"DOMAIN", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -10568,18 +10728,18 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Domain Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "DOMAIN", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "DOMAIN", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
@@ -10588,26 +10748,25 @@ dumpDomain(Archive *fout, TypeInfo *tyinfo)
 	for (i = 0; i < tyinfo->nDomChecks; i++)
 	{
 		ConstraintInfo *domcheck = &(tyinfo->domChecks[i]);
-		PQExpBuffer labelq = createPQExpBuffer();
+		PQExpBuffer conprefix = createPQExpBuffer();
 
-		appendPQExpBuffer(labelq, "CONSTRAINT %s ",
+		appendPQExpBuffer(conprefix, "CONSTRAINT %s ON DOMAIN",
 						  fmtId(domcheck->dobj.name));
-		appendPQExpBuffer(labelq, "ON DOMAIN %s",
-						  qtypname);
 
 		if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-			dumpComment(fout, labelq->data,
+			dumpComment(fout, conprefix->data, qtypname,
 						tyinfo->dobj.namespace->dobj.name,
 						tyinfo->rolname,
 						domcheck->dobj.catId, 0, tyinfo->dobj.dumpId);
 
-		destroyPQExpBuffer(labelq);
+		destroyPQExpBuffer(conprefix);
 	}
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qtypname);
+	free(qualtypname);
 }
 
 /*
@@ -10622,10 +10781,10 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer dropped = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
 	PQExpBuffer query = createPQExpBuffer();
 	PGresult   *res;
 	char	   *qtypname;
+	char	   *qualtypname;
 	int			ntups;
 	int			i_attname;
 	int			i_atttypdefn;
@@ -10636,9 +10795,6 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 	int			i;
 	int			actual_atts;
 
-	/* Set proper schema search path so type references list correctly */
-	selectSourceSchema(fout, tyinfo->dobj.namespace->dobj.name);
-
 	/* Fetch type specific details */
 	if (fout->remoteVersion >= 90100)
 	{
@@ -10692,14 +10848,16 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 	if (dopt->binary_upgrade)
 	{
 		binary_upgrade_set_type_oids_by_type_oid(fout, q,
-												 tyinfo->dobj.catId.oid);
+												 tyinfo->dobj.catId.oid,
+												 false);
 		binary_upgrade_set_pg_class_oids(fout, q, tyinfo->typrelid, false);
 	}
 
 	qtypname = pg_strdup(fmtId(tyinfo->dobj.name));
+	qualtypname = pg_strdup(fmtQualifiedDumpable(tyinfo));
 
 	appendPQExpBuffer(q, "CREATE TYPE %s AS (",
-					  qtypname);
+					  qualtypname);
 
 	actual_atts = 0;
 	for (i = 0; i < ntups; i++)
@@ -10737,12 +10895,8 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 
 				coll = findCollationByOid(attcollation);
 				if (coll)
-				{
-					/* always schema-qualify, don't try to be smart */
-					appendPQExpBuffer(q, " COLLATE %s.",
-									  fmtId(coll->dobj.namespace->dobj.name));
-					appendPQExpBufferStr(q, fmtId(coll->dobj.name));
-				}
+					appendPQExpBuffer(q, " COLLATE %s",
+									  fmtQualifiedDumpable(coll));
 			}
 		}
 		else
@@ -10764,11 +10918,11 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 							  "WHERE attname = ", attlen, attalign);
 			appendStringLiteralAH(dropped, attname, fout);
 			appendPQExpBufferStr(dropped, "\n  AND attrelid = ");
-			appendStringLiteralAH(dropped, qtypname, fout);
+			appendStringLiteralAH(dropped, qualtypname, fout);
 			appendPQExpBufferStr(dropped, "::pg_catalog.regclass;\n");
 
 			appendPQExpBuffer(dropped, "ALTER TYPE %s ",
-							  qtypname);
+							  qualtypname);
 			appendPQExpBuffer(dropped, "DROP ATTRIBUTE %s;\n",
 							  fmtId(attname));
 		}
@@ -10776,18 +10930,12 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 	appendPQExpBufferStr(q, "\n);\n");
 	appendPQExpBufferStr(q, dropped->data);
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP TYPE %s.",
-					  fmtId(tyinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  qtypname);
-
-	appendPQExpBuffer(labelq, "TYPE %s", qtypname);
+	appendPQExpBuffer(delq, "DROP TYPE %s;\n", qualtypname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tyinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tyinfo->dobj,
+										"TYPE", qtypname,
+										tyinfo->dobj.namespace->dobj.name);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId,
@@ -10803,18 +10951,18 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 
 	/* Dump Type Comments and Security Labels */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TYPE", qtypname,
 					tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "TYPE", qtypname,
 					 tyinfo->dobj.namespace->dobj.name, tyinfo->rolname,
 					 tyinfo->dobj.catId, 0, tyinfo->dobj.dumpId);
 
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, tyinfo->dobj.catId, tyinfo->dobj.dumpId, "TYPE",
-				qtypname, NULL, tyinfo->dobj.name,
+				qtypname, NULL,
 				tyinfo->dobj.namespace->dobj.name,
 				tyinfo->rolname, tyinfo->typacl, tyinfo->rtypacl,
 				tyinfo->inittypacl, tyinfo->initrtypacl);
@@ -10823,8 +10971,9 @@ dumpCompositeType(Archive *fout, TypeInfo *tyinfo)
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(dropped);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qtypname);
+	free(qualtypname);
 
 	/* Dump any per-column comments */
 	if (tyinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
@@ -10850,6 +10999,10 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo)
 	int			i_attname;
 	int			i_attnum;
 
+	/* do nothing, if --no-comments is supplied */
+	if (fout->dopt->no_comments)
+		return;
+
 	query = createPQExpBuffer();
 
 	appendPQExpBuffer(query,
@@ -10915,7 +11068,9 @@ dumpCompositeTypeColComments(Archive *fout, TypeInfo *tyinfo)
 			appendPQExpBufferStr(target, fmtId(attname));
 
 			resetPQExpBuffer(query);
-			appendPQExpBuffer(query, "COMMENT ON %s IS ", target->data);
+			appendPQExpBuffer(query, "COMMENT ON COLUMN %s.",
+							  fmtQualifiedDumpable(tyinfo));
+			appendPQExpBuffer(query, "%s IS ", fmtId(attname));
 			appendStringLiteralAH(query, descr, fout);
 			appendPQExpBufferStr(query, ";\n");
 
@@ -10967,10 +11122,11 @@ dumpShellType(Archive *fout, ShellTypeInfo *stinfo)
 
 	if (dopt->binary_upgrade)
 		binary_upgrade_set_type_oids_by_type_oid(fout, q,
-												 stinfo->baseType->dobj.catId.oid);
+												 stinfo->baseType->dobj.catId.oid,
+												 false);
 
 	appendPQExpBuffer(q, "CREATE TYPE %s;\n",
-					  fmtId(stinfo->dobj.name));
+					  fmtQualifiedDumpable(stinfo));
 
 	if (stinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, stinfo->dobj.catId, stinfo->dobj.dumpId,
@@ -10997,10 +11153,8 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer defqry;
 	PQExpBuffer delqry;
-	PQExpBuffer labelq;
 	bool		useParams;
 	char	   *qlanname;
-	char	   *lanschema;
 	FuncInfo   *funcInfo;
 	FuncInfo   *inlineInfo = NULL;
 	FuncInfo   *validatorInfo = NULL;
@@ -11046,20 +11200,9 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 
 	defqry = createPQExpBuffer();
 	delqry = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
 	qlanname = pg_strdup(fmtId(plang->dobj.name));
 
-	/*
-	 * If dumping a HANDLER clause, treat the language as being in the handler
-	 * function's schema; this avoids cluttering the HANDLER clause. Otherwise
-	 * it doesn't really have a schema.
-	 */
-	if (useParams)
-		lanschema = funcInfo->dobj.namespace->dobj.name;
-	else
-		lanschema = NULL;
-
 	appendPQExpBuffer(delqry, "DROP PROCEDURAL LANGUAGE %s;\n",
 					  qlanname);
 
@@ -11069,25 +11212,13 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 						  plang->lanpltrusted ? "TRUSTED " : "",
 						  qlanname);
 		appendPQExpBuffer(defqry, " HANDLER %s",
-						  fmtId(funcInfo->dobj.name));
+						  fmtQualifiedDumpable(funcInfo));
 		if (OidIsValid(plang->laninline))
-		{
-			appendPQExpBufferStr(defqry, " INLINE ");
-			/* Cope with possibility that inline is in different schema */
-			if (inlineInfo->dobj.namespace != funcInfo->dobj.namespace)
-				appendPQExpBuffer(defqry, "%s.",
-								  fmtId(inlineInfo->dobj.namespace->dobj.name));
-			appendPQExpBufferStr(defqry, fmtId(inlineInfo->dobj.name));
-		}
+			appendPQExpBuffer(defqry, " INLINE %s",
+							  fmtQualifiedDumpable(inlineInfo));
 		if (OidIsValid(plang->lanvalidator))
-		{
-			appendPQExpBufferStr(defqry, " VALIDATOR ");
-			/* Cope with possibility that validator is in different schema */
-			if (validatorInfo->dobj.namespace != funcInfo->dobj.namespace)
-				appendPQExpBuffer(defqry, "%s.",
-								  fmtId(validatorInfo->dobj.namespace->dobj.name));
-			appendPQExpBufferStr(defqry, fmtId(validatorInfo->dobj.name));
-		}
+			appendPQExpBuffer(defqry, " VALIDATOR %s",
+							  fmtQualifiedDumpable(validatorInfo));
 	}
 	else
 	{
@@ -11105,15 +11236,14 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 	}
 	appendPQExpBufferStr(defqry, ";\n");
 
-	appendPQExpBuffer(labelq, "LANGUAGE %s", qlanname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(defqry, &plang->dobj, labelq->data);
+		binary_upgrade_extension_member(defqry, &plang->dobj,
+										"LANGUAGE", qlanname, NULL);
 
 	if (plang->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, plang->dobj.catId, plang->dobj.dumpId,
 					 plang->dobj.name,
-					 lanschema, NULL, plang->lanowner,
+					 NULL, NULL, plang->lanowner,
 					 false, "PROCEDURAL LANGUAGE", SECTION_PRE_DATA,
 					 defqry->data, delqry->data, NULL,
 					 NULL, 0,
@@ -11121,19 +11251,18 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 
 	/* Dump Proc Lang Comments and Security Labels */
 	if (plang->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					lanschema, plang->lanowner,
+		dumpComment(fout, "LANGUAGE", qlanname,
+					NULL, plang->lanowner,
 					plang->dobj.catId, 0, plang->dobj.dumpId);
 
 	if (plang->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
-					 lanschema, plang->lanowner,
+		dumpSecLabel(fout, "LANGUAGE", qlanname,
+					 NULL, plang->lanowner,
 					 plang->dobj.catId, 0, plang->dobj.dumpId);
 
 	if (plang->lanpltrusted && plang->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, plang->dobj.catId, plang->dobj.dumpId, "LANGUAGE",
-				qlanname, NULL, plang->dobj.name,
-				lanschema,
+				qlanname, NULL, NULL,
 				plang->lanowner, plang->lanacl, plang->rlanacl,
 				plang->initlanacl, plang->initrlanacl);
 
@@ -11141,7 +11270,6 @@ dumpProcLang(Archive *fout, ProcLangInfo *plang)
 
 	destroyPQExpBuffer(defqry);
 	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(labelq);
 }
 
 /*
@@ -11285,7 +11413,6 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delqry;
-	PQExpBuffer labelq;
 	PQExpBuffer asPart;
 	PGresult   *res;
 	char	   *funcsig;		/* identity signature */
@@ -11297,6 +11424,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	char	   *funcargs;
 	char	   *funciargs;
 	char	   *funcresult;
+	bool		is_procedure;
 	char	   *proallargtypes;
 	char	   *proargmodes;
 	char	   *proargnames;
@@ -11318,6 +11446,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	char	  **argnames = NULL;
 	char	  **configitems = NULL;
 	int			nconfigitems = 0;
+	const char *keyword;
 	int			i;
 
 	/* Skip if not to be dumped */
@@ -11327,12 +11456,8 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delqry = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	asPart = createPQExpBuffer();
 
-	/* Set proper schema search path so type references list correctly */
-	selectSourceSchema(fout, finfo->dobj.namespace->dobj.name);
-
 	/* Fetch function-specific details */
 	if (fout->remoteVersion >= 90600)
 	{
@@ -11461,7 +11586,11 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	{
 		funcargs = PQgetvalue(res, 0, PQfnumber(res, "funcargs"));
 		funciargs = PQgetvalue(res, 0, PQfnumber(res, "funciargs"));
-		funcresult = PQgetvalue(res, 0, PQfnumber(res, "funcresult"));
+		is_procedure = PQgetisnull(res, 0, PQfnumber(res, "funcresult"));
+		if (is_procedure)
+			funcresult = NULL;
+		else
+			funcresult = PQgetvalue(res, 0, PQfnumber(res, "funcresult"));
 		proallargtypes = proargmodes = proargnames = NULL;
 	}
 	else
@@ -11470,6 +11599,7 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 		proargmodes = PQgetvalue(res, 0, PQfnumber(res, "proargmodes"));
 		proargnames = PQgetvalue(res, 0, PQfnumber(res, "proargnames"));
 		funcargs = funciargs = funcresult = NULL;
+		is_procedure = false;
 	}
 	if (PQfnumber(res, "protrftypes") != -1)
 		protrftypes = PQgetvalue(res, 0, PQfnumber(res, "protrftypes"));
@@ -11601,22 +11731,28 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 
 	funcsig_tag = format_function_signature(fout, finfo, false);
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delqry, "DROP FUNCTION %s.%s;\n",
+	keyword = is_procedure ? "PROCEDURE" : "FUNCTION";
+
+	appendPQExpBuffer(delqry, "DROP %s %s.%s;\n",
+					  keyword,
 					  fmtId(finfo->dobj.namespace->dobj.name),
 					  funcsig);
 
-	appendPQExpBuffer(q, "CREATE FUNCTION %s ", funcfullsig ? funcfullsig :
+	appendPQExpBuffer(q, "CREATE %s %s.%s",
+					  keyword,
+					  fmtId(finfo->dobj.namespace->dobj.name),
+					  funcfullsig ? funcfullsig :
 					  funcsig);
-	if (funcresult)
-		appendPQExpBuffer(q, "RETURNS %s", funcresult);
+
+	if (is_procedure)
+		;
+	else if (funcresult)
+		appendPQExpBuffer(q, " RETURNS %s", funcresult);
 	else
 	{
 		rettypename = getFormattedTypeName(fout, finfo->prorettype,
 										   zeroAsOpaque);
-		appendPQExpBuffer(q, "RETURNS %s%s",
+		appendPQExpBuffer(q, " RETURNS %s%s",
 						  (proretset[0] == 't') ? "SETOF " : "",
 						  rettypename);
 		free(rettypename);
@@ -11723,10 +11859,10 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 
 	appendPQExpBuffer(q, "\n    %s;\n", asPart->data);
 
-	appendPQExpBuffer(labelq, "FUNCTION %s", funcsig);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &finfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &finfo->dobj,
+										keyword, funcsig,
+										finfo->dobj.namespace->dobj.name);
 
 	if (finfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, finfo->dobj.catId, finfo->dobj.dumpId,
@@ -11734,25 +11870,25 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 					 finfo->dobj.namespace->dobj.name,
 					 NULL,
 					 finfo->rolname, false,
-					 "FUNCTION", SECTION_PRE_DATA,
+					 keyword, SECTION_PRE_DATA,
 					 q->data, delqry->data, NULL,
 					 NULL, 0,
 					 NULL, NULL);
 
 	/* Dump Function Comments and Security Labels */
 	if (finfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, keyword, funcsig,
 					finfo->dobj.namespace->dobj.name, finfo->rolname,
 					finfo->dobj.catId, 0, finfo->dobj.dumpId);
 
 	if (finfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, keyword, funcsig,
 					 finfo->dobj.namespace->dobj.name, finfo->rolname,
 					 finfo->dobj.catId, 0, finfo->dobj.dumpId);
 
 	if (finfo->dobj.dump & DUMP_COMPONENT_ACL)
-		dumpACL(fout, finfo->dobj.catId, finfo->dobj.dumpId, "FUNCTION",
-				funcsig, NULL, funcsig_tag,
+		dumpACL(fout, finfo->dobj.catId, finfo->dobj.dumpId, keyword,
+				funcsig, NULL,
 				finfo->dobj.namespace->dobj.name,
 				finfo->rolname, finfo->proacl, finfo->rproacl,
 				finfo->initproacl, finfo->initrproacl);
@@ -11762,7 +11898,6 @@ dumpFunc(Archive *fout, FuncInfo *finfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(asPart);
 	free(funcsig);
 	if (funcfullsig)
@@ -11789,6 +11924,7 @@ dumpCast(Archive *fout, CastInfo *cast)
 	PQExpBuffer defqry;
 	PQExpBuffer delqry;
 	PQExpBuffer labelq;
+	PQExpBuffer castargs;
 	FuncInfo   *funcInfo = NULL;
 	char	   *sourceType;
 	char	   *targetType;
@@ -11806,15 +11942,10 @@ dumpCast(Archive *fout, CastInfo *cast)
 						  cast->castfunc);
 	}
 
-	/*
-	 * Make sure we are in proper schema (needed for getFormattedTypeName).
-	 * Casts don't have a schema of their own, so use pg_catalog.
-	 */
-	selectSourceSchema(fout, "pg_catalog");
-
 	defqry = createPQExpBuffer();
 	delqry = createPQExpBuffer();
 	labelq = createPQExpBuffer();
+	castargs = createPQExpBuffer();
 
 	sourceType = getFormattedTypeName(fout, cast->castsource, zeroAsNone);
 	targetType = getFormattedTypeName(fout, cast->casttarget, zeroAsNone);
@@ -11838,9 +11969,8 @@ dumpCast(Archive *fout, CastInfo *cast)
 				char	   *fsig = format_function_signature(fout, funcInfo, true);
 
 				/*
-				 * Always qualify the function name, in case it is not in
-				 * pg_catalog schema (format_function_signature won't qualify
-				 * it).
+				 * Always qualify the function name (format_function_signature
+				 * won't qualify it).
 				 */
 				appendPQExpBuffer(defqry, "WITH FUNCTION %s.%s",
 								  fmtId(funcInfo->dobj.namespace->dobj.name), fsig);
@@ -11862,13 +11992,17 @@ dumpCast(Archive *fout, CastInfo *cast)
 	appendPQExpBuffer(labelq, "CAST (%s AS %s)",
 					  sourceType, targetType);
 
+	appendPQExpBuffer(castargs, "(%s AS %s)",
+					  sourceType, targetType);
+
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(defqry, &cast->dobj, labelq->data);
+		binary_upgrade_extension_member(defqry, &cast->dobj,
+										"CAST", castargs->data, NULL);
 
 	if (cast->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, cast->dobj.catId, cast->dobj.dumpId,
 					 labelq->data,
-					 "pg_catalog", NULL, "",
+					 NULL, NULL, "",
 					 false, "CAST", SECTION_PRE_DATA,
 					 defqry->data, delqry->data, NULL,
 					 NULL, 0,
@@ -11876,8 +12010,8 @@ dumpCast(Archive *fout, CastInfo *cast)
 
 	/* Dump Cast Comments */
 	if (cast->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					"pg_catalog", "",
+		dumpComment(fout, "CAST", castargs->data,
+					NULL, "",
 					cast->dobj.catId, 0, cast->dobj.dumpId);
 
 	free(sourceType);
@@ -11886,6 +12020,7 @@ dumpCast(Archive *fout, CastInfo *cast)
 	destroyPQExpBuffer(defqry);
 	destroyPQExpBuffer(delqry);
 	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(castargs);
 }
 
 /*
@@ -11898,6 +12033,7 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 	PQExpBuffer defqry;
 	PQExpBuffer delqry;
 	PQExpBuffer labelq;
+	PQExpBuffer transformargs;
 	FuncInfo   *fromsqlFuncInfo = NULL;
 	FuncInfo   *tosqlFuncInfo = NULL;
 	char	   *lanname;
@@ -11923,12 +12059,10 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 						  transform->trftosql);
 	}
 
-	/* Make sure we are in proper schema (needed for getFormattedTypeName) */
-	selectSourceSchema(fout, "pg_catalog");
-
 	defqry = createPQExpBuffer();
 	delqry = createPQExpBuffer();
 	labelq = createPQExpBuffer();
+	transformargs = createPQExpBuffer();
 
 	lanname = get_language_name(fout, transform->trflang);
 	transformType = getFormattedTypeName(fout, transform->trftype, zeroAsNone);
@@ -11949,8 +12083,8 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 			char	   *fsig = format_function_signature(fout, fromsqlFuncInfo, true);
 
 			/*
-			 * Always qualify the function name, in case it is not in
-			 * pg_catalog schema (format_function_signature won't qualify it).
+			 * Always qualify the function name (format_function_signature
+			 * won't qualify it).
 			 */
 			appendPQExpBuffer(defqry, "FROM SQL WITH FUNCTION %s.%s",
 							  fmtId(fromsqlFuncInfo->dobj.namespace->dobj.name), fsig);
@@ -11970,8 +12104,8 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 			char	   *fsig = format_function_signature(fout, tosqlFuncInfo, true);
 
 			/*
-			 * Always qualify the function name, in case it is not in
-			 * pg_catalog schema (format_function_signature won't qualify it).
+			 * Always qualify the function name (format_function_signature
+			 * won't qualify it).
 			 */
 			appendPQExpBuffer(defqry, "TO SQL WITH FUNCTION %s.%s",
 							  fmtId(tosqlFuncInfo->dobj.namespace->dobj.name), fsig);
@@ -11986,13 +12120,17 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 	appendPQExpBuffer(labelq, "TRANSFORM FOR %s LANGUAGE %s",
 					  transformType, lanname);
 
+	appendPQExpBuffer(transformargs, "FOR %s LANGUAGE %s",
+					  transformType, lanname);
+
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(defqry, &transform->dobj, labelq->data);
+		binary_upgrade_extension_member(defqry, &transform->dobj,
+										"TRANSFORM", transformargs->data, NULL);
 
 	if (transform->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, transform->dobj.catId, transform->dobj.dumpId,
 					 labelq->data,
-					 "pg_catalog", NULL, "",
+					 NULL, NULL, "",
 					 false, "TRANSFORM", SECTION_PRE_DATA,
 					 defqry->data, delqry->data, NULL,
 					 transform->dobj.dependencies, transform->dobj.nDeps,
@@ -12000,8 +12138,8 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 
 	/* Dump Transform Comments */
 	if (transform->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					"pg_catalog", "",
+		dumpComment(fout, "TRANSFORM", transformargs->data,
+					NULL, "",
 					transform->dobj.catId, 0, transform->dobj.dumpId);
 
 	free(lanname);
@@ -12009,6 +12147,7 @@ dumpTransform(Archive *fout, TransformInfo *transform)
 	destroyPQExpBuffer(defqry);
 	destroyPQExpBuffer(delqry);
 	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(transformargs);
 }
 
 
@@ -12023,7 +12162,6 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	PQExpBuffer oprid;
 	PQExpBuffer details;
 	PGresult   *res;
@@ -12064,21 +12202,17 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	oprid = createPQExpBuffer();
 	details = createPQExpBuffer();
 
-	/* Make sure we are in proper schema so regoperator works correctly */
-	selectSourceSchema(fout, oprinfo->dobj.namespace->dobj.name);
-
 	if (fout->remoteVersion >= 80300)
 	{
 		appendPQExpBuffer(query, "SELECT oprkind, "
 						  "oprcode::pg_catalog.regprocedure, "
 						  "oprleft::pg_catalog.regtype, "
 						  "oprright::pg_catalog.regtype, "
-						  "oprcom::pg_catalog.regoperator, "
-						  "oprnegate::pg_catalog.regoperator, "
+						  "oprcom, "
+						  "oprnegate, "
 						  "oprrest::pg_catalog.regprocedure, "
 						  "oprjoin::pg_catalog.regprocedure, "
 						  "oprcanmerge, oprcanhash "
@@ -12092,8 +12226,8 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 						  "oprcode::pg_catalog.regprocedure, "
 						  "oprleft::pg_catalog.regtype, "
 						  "oprright::pg_catalog.regtype, "
-						  "oprcom::pg_catalog.regoperator, "
-						  "oprnegate::pg_catalog.regoperator, "
+						  "oprcom, "
+						  "oprnegate, "
 						  "oprrest::pg_catalog.regprocedure, "
 						  "oprjoin::pg_catalog.regprocedure, "
 						  "(oprlsortop != 0) AS oprcanmerge, "
@@ -12159,14 +12293,14 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	else
 		appendPQExpBufferStr(oprid, ", NONE)");
 
-	oprref = convertOperatorReference(fout, oprcom);
+	oprref = getFormattedOperatorName(fout, oprcom);
 	if (oprref)
 	{
 		appendPQExpBuffer(details, ",\n    COMMUTATOR = %s", oprref);
 		free(oprref);
 	}
 
-	oprref = convertOperatorReference(fout, oprnegate);
+	oprref = getFormattedOperatorName(fout, oprnegate);
 	if (oprref)
 	{
 		appendPQExpBuffer(details, ",\n    NEGATOR = %s", oprref);
@@ -12193,20 +12327,18 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 		free(oprregproc);
 	}
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	appendPQExpBuffer(delq, "DROP OPERATOR %s.%s;\n",
 					  fmtId(oprinfo->dobj.namespace->dobj.name),
 					  oprid->data);
 
-	appendPQExpBuffer(q, "CREATE OPERATOR %s (\n%s\n);\n",
+	appendPQExpBuffer(q, "CREATE OPERATOR %s.%s (\n%s\n);\n",
+					  fmtId(oprinfo->dobj.namespace->dobj.name),
 					  oprinfo->dobj.name, details->data);
 
-	appendPQExpBuffer(labelq, "OPERATOR %s", oprid->data);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &oprinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &oprinfo->dobj,
+										"OPERATOR", oprid->data,
+										oprinfo->dobj.namespace->dobj.name);
 
 	if (oprinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, oprinfo->dobj.catId, oprinfo->dobj.dumpId,
@@ -12221,7 +12353,7 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 
 	/* Dump Operator Comments */
 	if (oprinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "OPERATOR", oprid->data,
 					oprinfo->dobj.namespace->dobj.name, oprinfo->rolname,
 					oprinfo->dobj.catId, 0, oprinfo->dobj.dumpId);
 
@@ -12230,7 +12362,6 @@ dumpOpr(Archive *fout, OprInfo *oprinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(oprid);
 	destroyPQExpBuffer(details);
 }
@@ -12272,49 +12403,39 @@ convertRegProcReference(Archive *fout, const char *proc)
 }
 
 /*
- * Convert an operator cross-reference obtained from pg_operator
+ * getFormattedOperatorName - retrieve the operator name for the
+ * given operator OID (presented in string form).
  *
- * Returns an allocated string of what to print, or NULL to print nothing.
+ * Returns an allocated string, or NULL if the given OID is invalid.
  * Caller is responsible for free'ing result string.
  *
- * The input is a REGOPERATOR display; we have to strip the argument-types
- * part, and add OPERATOR() decoration if the name is schema-qualified.
+ * What we produce has the format "OPERATOR(schema.oprname)".  This is only
+ * useful in commands where the operator's argument types can be inferred from
+ * context.  We always schema-qualify the name, though.  The predecessor to
+ * this code tried to skip the schema qualification if possible, but that led
+ * to wrong results in corner cases, such as if an operator and its negator
+ * are in different schemas.
  */
 static char *
-convertOperatorReference(Archive *fout, const char *opr)
+getFormattedOperatorName(Archive *fout, const char *oproid)
 {
-	char	   *name;
-	char	   *oname;
-	char	   *ptr;
-	bool		inquote;
-	bool		sawdot;
+	OprInfo    *oprInfo;
 
 	/* In all cases "0" means a null reference */
-	if (strcmp(opr, "0") == 0)
+	if (strcmp(oproid, "0") == 0)
 		return NULL;
 
-	name = pg_strdup(opr);
-	/* find non-double-quoted left paren, and check for non-quoted dot */
-	inquote = false;
-	sawdot = false;
-	for (ptr = name; *ptr; ptr++)
+	oprInfo = findOprByOid(atooid(oproid));
+	if (oprInfo == NULL)
 	{
-		if (*ptr == '"')
-			inquote = !inquote;
-		else if (*ptr == '.' && !inquote)
-			sawdot = true;
-		else if (*ptr == '(' && !inquote)
-		{
-			*ptr = '\0';
-			break;
-		}
+		write_msg(NULL, "WARNING: could not find operator with OID %s\n",
+				  oproid);
+		return NULL;
 	}
-	/* If not schema-qualified, don't need to add OPERATOR() */
-	if (!sawdot)
-		return name;
-	oname = psprintf("OPERATOR(%s)", name);
-	free(name);
-	return oname;
+
+	return psprintf("OPERATOR(%s.%s)",
+					fmtId(oprInfo->dobj.namespace->dobj.name),
+					oprInfo->dobj.name);
 }
 
 /*
@@ -12353,7 +12474,6 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	char	   *qamname;
 
 	/* Skip if not to be dumped */
@@ -12362,7 +12482,6 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
 	qamname = pg_strdup(fmtId(aminfo->dobj.name));
 
@@ -12376,10 +12495,9 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
 		default:
 			write_msg(NULL, "WARNING: invalid type \"%c\" of access method \"%s\"\n",
 					  aminfo->amtype, qamname);
-			pg_free(qamname);
 			destroyPQExpBuffer(q);
 			destroyPQExpBuffer(delq);
-			destroyPQExpBuffer(labelq);
+			free(qamname);
 			return;
 	}
 
@@ -12388,11 +12506,9 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
 	appendPQExpBuffer(delq, "DROP ACCESS METHOD %s;\n",
 					  qamname);
 
-	appendPQExpBuffer(labelq, "ACCESS METHOD %s",
-					  qamname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &aminfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &aminfo->dobj,
+										"ACCESS METHOD", qamname, NULL);
 
 	if (aminfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, aminfo->dobj.catId, aminfo->dobj.dumpId,
@@ -12407,15 +12523,13 @@ dumpAccessMethod(Archive *fout, AccessMethodInfo *aminfo)
 
 	/* Dump Access Method Comments */
 	if (aminfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "ACCESS METHOD", qamname,
 					NULL, "",
 					aminfo->dobj.catId, 0, aminfo->dobj.dumpId);
 
-	pg_free(qamname);
-
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qamname);
 }
 
 /*
@@ -12429,7 +12543,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	PQExpBuffer nameusing;
 	PGresult   *res;
 	int			ntups;
 	int			i_opcintype;
@@ -12474,10 +12588,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
-
-	/* Make sure we are in proper schema so regoperator works correctly */
-	selectSourceSchema(fout, opcinfo->dobj.namespace->dobj.name);
+	nameusing = createPQExpBuffer();
 
 	/* Get additional fields from the pg_opclass row */
 	if (fout->remoteVersion >= 80300)
@@ -12528,19 +12639,14 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	/* amname will still be needed after we PQclear res */
 	amname = pg_strdup(PQgetvalue(res, 0, i_amname));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	appendPQExpBuffer(delq, "DROP OPERATOR CLASS %s",
-					  fmtId(opcinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s",
-					  fmtId(opcinfo->dobj.name));
+					  fmtQualifiedDumpable(opcinfo));
 	appendPQExpBuffer(delq, " USING %s;\n",
 					  fmtId(amname));
 
 	/* Build the fixed portion of the CREATE command */
 	appendPQExpBuffer(q, "CREATE OPERATOR CLASS %s\n    ",
-					  fmtId(opcinfo->dobj.name));
+					  fmtQualifiedDumpable(opcinfo));
 	if (strcmp(opcdefault, "t") == 0)
 		appendPQExpBufferStr(q, "DEFAULT ");
 	appendPQExpBuffer(q, "FOR TYPE %s USING %s",
@@ -12549,8 +12655,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	if (strlen(opcfamilyname) > 0)
 	{
 		appendPQExpBufferStr(q, " FAMILY ");
-		if (strcmp(opcfamilynsp, opcinfo->dobj.namespace->dobj.name) != 0)
-			appendPQExpBuffer(q, "%s.", fmtId(opcfamilynsp));
+		appendPQExpBuffer(q, "%s.", fmtId(opcfamilynsp));
 		appendPQExpBufferStr(q, fmtId(opcfamilyname));
 	}
 	appendPQExpBufferStr(q, " AS\n    ");
@@ -12668,8 +12773,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 		if (strlen(sortfamily) > 0)
 		{
 			appendPQExpBufferStr(q, " FOR ORDER BY ");
-			if (strcmp(sortfamilynsp, opcinfo->dobj.namespace->dobj.name) != 0)
-				appendPQExpBuffer(q, "%s.", fmtId(sortfamilynsp));
+			appendPQExpBuffer(q, "%s.", fmtId(sortfamilynsp));
 			appendPQExpBufferStr(q, fmtId(sortfamily));
 		}
 
@@ -12763,13 +12867,14 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 
 	appendPQExpBufferStr(q, ";\n");
 
-	appendPQExpBuffer(labelq, "OPERATOR CLASS %s",
-					  fmtId(opcinfo->dobj.name));
-	appendPQExpBuffer(labelq, " USING %s",
+	appendPQExpBufferStr(nameusing, fmtId(opcinfo->dobj.name));
+	appendPQExpBuffer(nameusing, " USING %s",
 					  fmtId(amname));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &opcinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &opcinfo->dobj,
+										"OPERATOR CLASS", nameusing->data,
+										opcinfo->dobj.namespace->dobj.name);
 
 	if (opcinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, opcinfo->dobj.catId, opcinfo->dobj.dumpId,
@@ -12784,7 +12889,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 
 	/* Dump Operator Class Comments */
 	if (opcinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "OPERATOR CLASS", nameusing->data,
 					opcinfo->dobj.namespace->dobj.name, opcinfo->rolname,
 					opcinfo->dobj.catId, 0, opcinfo->dobj.dumpId);
 
@@ -12794,7 +12899,7 @@ dumpOpclass(Archive *fout, OpclassInfo *opcinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(nameusing);
 }
 
 /*
@@ -12811,7 +12916,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	PQExpBuffer nameusing;
 	PGresult   *res;
 	PGresult   *res_ops;
 	PGresult   *res_procs;
@@ -12846,10 +12951,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
-
-	/* Make sure we are in proper schema so regoperator works correctly */
-	selectSourceSchema(fout, opfinfo->dobj.namespace->dobj.name);
+	nameusing = createPQExpBuffer();
 
 	/*
 	 * Fetch only those opfamily members that are tied directly to the
@@ -12941,19 +13043,14 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	/* amname will still be needed after we PQclear res */
 	amname = pg_strdup(PQgetvalue(res, 0, i_amname));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	appendPQExpBuffer(delq, "DROP OPERATOR FAMILY %s",
-					  fmtId(opfinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s",
-					  fmtId(opfinfo->dobj.name));
+					  fmtQualifiedDumpable(opfinfo));
 	appendPQExpBuffer(delq, " USING %s;\n",
 					  fmtId(amname));
 
 	/* Build the fixed portion of the CREATE command */
 	appendPQExpBuffer(q, "CREATE OPERATOR FAMILY %s",
-					  fmtId(opfinfo->dobj.name));
+					  fmtQualifiedDumpable(opfinfo));
 	appendPQExpBuffer(q, " USING %s;\n",
 					  fmtId(amname));
 
@@ -12963,7 +13060,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	if (PQntuples(res_ops) > 0 || PQntuples(res_procs) > 0)
 	{
 		appendPQExpBuffer(q, "ALTER OPERATOR FAMILY %s",
-						  fmtId(opfinfo->dobj.name));
+						  fmtQualifiedDumpable(opfinfo));
 		appendPQExpBuffer(q, " USING %s ADD\n    ",
 						  fmtId(amname));
 
@@ -12997,8 +13094,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 			if (strlen(sortfamily) > 0)
 			{
 				appendPQExpBufferStr(q, " FOR ORDER BY ");
-				if (strcmp(sortfamilynsp, opfinfo->dobj.namespace->dobj.name) != 0)
-					appendPQExpBuffer(q, "%s.", fmtId(sortfamilynsp));
+				appendPQExpBuffer(q, "%s.", fmtId(sortfamilynsp));
 				appendPQExpBufferStr(q, fmtId(sortfamily));
 			}
 
@@ -13038,13 +13134,14 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 		appendPQExpBufferStr(q, ";\n");
 	}
 
-	appendPQExpBuffer(labelq, "OPERATOR FAMILY %s",
-					  fmtId(opfinfo->dobj.name));
-	appendPQExpBuffer(labelq, " USING %s",
+	appendPQExpBufferStr(nameusing, fmtId(opfinfo->dobj.name));
+	appendPQExpBuffer(nameusing, " USING %s",
 					  fmtId(amname));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &opfinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &opfinfo->dobj,
+										"OPERATOR FAMILY", nameusing->data,
+										opfinfo->dobj.namespace->dobj.name);
 
 	if (opfinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, opfinfo->dobj.catId, opfinfo->dobj.dumpId,
@@ -13059,7 +13156,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 
 	/* Dump Operator Family Comments */
 	if (opfinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "OPERATOR FAMILY", nameusing->data,
 					opfinfo->dobj.namespace->dobj.name, opfinfo->rolname,
 					opfinfo->dobj.catId, 0, opfinfo->dobj.dumpId);
 
@@ -13069,7 +13166,7 @@ dumpOpfamily(Archive *fout, OpfamilyInfo *opfinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(nameusing);
 }
 
 /*
@@ -13083,7 +13180,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	char	   *qcollname;
 	PGresult   *res;
 	int			i_collprovider;
 	int			i_collcollate;
@@ -13099,10 +13196,8 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, collinfo->dobj.namespace->dobj.name);
+	qcollname = pg_strdup(fmtId(collinfo->dobj.name));
 
 	/* Get collation-specific details */
 	if (fout->remoteVersion >= 100000)
@@ -13116,7 +13211,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 						  collinfo->dobj.catId.oid);
 	else
 		appendPQExpBuffer(query, "SELECT "
-						  "'c'::char AS collprovider, "
+						  "'c' AS collprovider, "
 						  "collcollate, "
 						  "collctype, "
 						  "NULL AS collversion "
@@ -13134,16 +13229,11 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 	collcollate = PQgetvalue(res, 0, i_collcollate);
 	collctype = PQgetvalue(res, 0, i_collctype);
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP COLLATION %s",
-					  fmtId(collinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(collinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP COLLATION %s;\n",
+					  fmtQualifiedDumpable(collinfo));
 
 	appendPQExpBuffer(q, "CREATE COLLATION %s (",
-					  fmtId(collinfo->dobj.name));
+					  fmtQualifiedDumpable(collinfo));
 
 	appendPQExpBufferStr(q, "provider = ");
 	if (collprovider[0] == 'c')
@@ -13191,10 +13281,10 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 
 	appendPQExpBufferStr(q, ");\n");
 
-	appendPQExpBuffer(labelq, "COLLATION %s", fmtId(collinfo->dobj.name));
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &collinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &collinfo->dobj,
+										"COLLATION", qcollname,
+										collinfo->dobj.namespace->dobj.name);
 
 	if (collinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, collinfo->dobj.catId, collinfo->dobj.dumpId,
@@ -13209,7 +13299,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 
 	/* Dump Collation Comments */
 	if (collinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "COLLATION", qcollname,
 					collinfo->dobj.namespace->dobj.name, collinfo->rolname,
 					collinfo->dobj.catId, 0, collinfo->dobj.dumpId);
 
@@ -13218,7 +13308,7 @@ dumpCollation(Archive *fout, CollInfo *collinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qcollname);
 }
 
 /*
@@ -13232,7 +13322,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	char	   *qconvname;
 	PGresult   *res;
 	int			i_conforencoding;
 	int			i_contoencoding;
@@ -13250,10 +13340,8 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, convinfo->dobj.namespace->dobj.name);
+	qconvname = pg_strdup(fmtId(convinfo->dobj.name));
 
 	/* Get conversion-specific details */
 	appendPQExpBuffer(query, "SELECT "
@@ -13276,27 +13364,22 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	conproc = PQgetvalue(res, 0, i_conproc);
 	condefault = (PQgetvalue(res, 0, i_condefault)[0] == 't');
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP CONVERSION %s",
-					  fmtId(convinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(convinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP CONVERSION %s;\n",
+					  fmtQualifiedDumpable(convinfo));
 
 	appendPQExpBuffer(q, "CREATE %sCONVERSION %s FOR ",
 					  (condefault) ? "DEFAULT " : "",
-					  fmtId(convinfo->dobj.name));
+					  fmtQualifiedDumpable(convinfo));
 	appendStringLiteralAH(q, conforencoding, fout);
 	appendPQExpBufferStr(q, " TO ");
 	appendStringLiteralAH(q, contoencoding, fout);
 	/* regproc output is already sufficiently quoted */
 	appendPQExpBuffer(q, " FROM %s;\n", conproc);
 
-	appendPQExpBuffer(labelq, "CONVERSION %s", fmtId(convinfo->dobj.name));
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &convinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &convinfo->dobj,
+										"CONVERSION", qconvname,
+										convinfo->dobj.namespace->dobj.name);
 
 	if (convinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, convinfo->dobj.catId, convinfo->dobj.dumpId,
@@ -13311,7 +13394,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 
 	/* Dump Conversion Comments */
 	if (convinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "CONVERSION", qconvname,
 					convinfo->dobj.namespace->dobj.name, convinfo->rolname,
 					convinfo->dobj.catId, 0, convinfo->dobj.dumpId);
 
@@ -13320,7 +13403,7 @@ dumpConversion(Archive *fout, ConvInfo *convinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qconvname);
 }
 
 /*
@@ -13374,7 +13457,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	PQExpBuffer query;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	PQExpBuffer details;
 	char	   *aggsig;			/* identity signature */
 	char	   *aggfullsig = NULL;	/* full signature */
@@ -13390,8 +13472,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	int			i_aggmfinalfn;
 	int			i_aggfinalextra;
 	int			i_aggmfinalextra;
+	int			i_aggfinalmodify;
+	int			i_aggmfinalmodify;
 	int			i_aggsortop;
-	int			i_hypothetical;
+	int			i_aggkind;
 	int			i_aggtranstype;
 	int			i_aggtransspace;
 	int			i_aggmtranstype;
@@ -13410,9 +13494,11 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	const char *aggmfinalfn;
 	bool		aggfinalextra;
 	bool		aggmfinalextra;
+	char		aggfinalmodify;
+	char		aggmfinalmodify;
 	const char *aggsortop;
 	char	   *aggsortconvop;
-	bool		hypothetical;
+	char		aggkind;
 	const char *aggtranstype;
 	const char *aggtransspace;
 	const char *aggmtranstype;
@@ -13421,6 +13507,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	const char *aggminitval;
 	bool		convertok;
 	const char *proparallel;
+	char		defaultfinalmodify;
 
 	/* Skip if not to be dumped */
 	if (!agginfo->aggfn.dobj.dump || dopt->dataOnly)
@@ -13429,22 +13516,40 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	query = createPQExpBuffer();
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	details = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, agginfo->aggfn.dobj.namespace->dobj.name);
-
 	/* Get aggregate-specific details */
-	if (fout->remoteVersion >= 90600)
+	if (fout->remoteVersion >= 110000)
+	{
+		appendPQExpBuffer(query, "SELECT aggtransfn, "
+						  "aggfinalfn, aggtranstype::pg_catalog.regtype, "
+						  "aggcombinefn, aggserialfn, aggdeserialfn, aggmtransfn, "
+						  "aggminvtransfn, aggmfinalfn, aggmtranstype::pg_catalog.regtype, "
+						  "aggfinalextra, aggmfinalextra, "
+						  "aggfinalmodify, aggmfinalmodify, "
+						  "aggsortop, "
+						  "aggkind, "
+						  "aggtransspace, agginitval, "
+						  "aggmtransspace, aggminitval, "
+						  "true AS convertok, "
+						  "pg_catalog.pg_get_function_arguments(p.oid) AS funcargs, "
+						  "pg_catalog.pg_get_function_identity_arguments(p.oid) AS funciargs, "
+						  "p.proparallel "
+						  "FROM pg_catalog.pg_aggregate a, pg_catalog.pg_proc p "
+						  "WHERE a.aggfnoid = p.oid "
+						  "AND p.oid = '%u'::pg_catalog.oid",
+						  agginfo->aggfn.dobj.catId.oid);
+	}
+	else if (fout->remoteVersion >= 90600)
 	{
 		appendPQExpBuffer(query, "SELECT aggtransfn, "
 						  "aggfinalfn, aggtranstype::pg_catalog.regtype, "
 						  "aggcombinefn, aggserialfn, aggdeserialfn, aggmtransfn, "
 						  "aggminvtransfn, aggmfinalfn, aggmtranstype::pg_catalog.regtype, "
 						  "aggfinalextra, aggmfinalextra, "
-						  "aggsortop::pg_catalog.regoperator, "
-						  "(aggkind = 'h') AS hypothetical, "
+						  "'0' AS aggfinalmodify, '0' AS aggmfinalmodify, "
+						  "aggsortop, "
+						  "aggkind, "
 						  "aggtransspace, agginitval, "
 						  "aggmtransspace, aggminitval, "
 						  "true AS convertok, "
@@ -13464,8 +13569,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  "'-' AS aggdeserialfn, aggmtransfn, aggminvtransfn, "
 						  "aggmfinalfn, aggmtranstype::pg_catalog.regtype, "
 						  "aggfinalextra, aggmfinalextra, "
-						  "aggsortop::pg_catalog.regoperator, "
-						  "(aggkind = 'h') AS hypothetical, "
+						  "'0' AS aggfinalmodify, '0' AS aggmfinalmodify, "
+						  "aggsortop, "
+						  "aggkind, "
 						  "aggtransspace, agginitval, "
 						  "aggmtransspace, aggminitval, "
 						  "true AS convertok, "
@@ -13485,8 +13591,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
 						  "0 AS aggmtranstype, false AS aggfinalextra, "
 						  "false AS aggmfinalextra, "
-						  "aggsortop::pg_catalog.regoperator, "
-						  "false AS hypothetical, "
+						  "'0' AS aggfinalmodify, '0' AS aggmfinalmodify, "
+						  "aggsortop, "
+						  "'n' AS aggkind, "
 						  "0 AS aggtransspace, agginitval, "
 						  "0 AS aggmtransspace, NULL AS aggminitval, "
 						  "true AS convertok, "
@@ -13506,8 +13613,9 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
 						  "0 AS aggmtranstype, false AS aggfinalextra, "
 						  "false AS aggmfinalextra, "
-						  "aggsortop::pg_catalog.regoperator, "
-						  "false AS hypothetical, "
+						  "'0' AS aggfinalmodify, '0' AS aggmfinalmodify, "
+						  "aggsortop, "
+						  "'n' AS aggkind, "
 						  "0 AS aggtransspace, agginitval, "
 						  "0 AS aggmtransspace, NULL AS aggminitval, "
 						  "true AS convertok "
@@ -13524,8 +13632,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  "'-' AS aggdeserialfn, '-' AS aggmtransfn, "
 						  "'-' AS aggminvtransfn, '-' AS aggmfinalfn, "
 						  "0 AS aggmtranstype, false AS aggfinalextra, "
-						  "false AS aggmfinalextra, 0 AS aggsortop, "
-						  "false AS hypothetical, "
+						  "false AS aggmfinalextra, "
+						  "'0' AS aggfinalmodify, '0' AS aggmfinalmodify, "
+						  "0 AS aggsortop, "
+						  "'n' AS aggkind, "
 						  "0 AS aggtransspace, agginitval, "
 						  "0 AS aggmtransspace, NULL AS aggminitval, "
 						  "true AS convertok "
@@ -13547,8 +13657,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	i_aggmfinalfn = PQfnumber(res, "aggmfinalfn");
 	i_aggfinalextra = PQfnumber(res, "aggfinalextra");
 	i_aggmfinalextra = PQfnumber(res, "aggmfinalextra");
+	i_aggfinalmodify = PQfnumber(res, "aggfinalmodify");
+	i_aggmfinalmodify = PQfnumber(res, "aggmfinalmodify");
 	i_aggsortop = PQfnumber(res, "aggsortop");
-	i_hypothetical = PQfnumber(res, "hypothetical");
+	i_aggkind = PQfnumber(res, "aggkind");
 	i_aggtranstype = PQfnumber(res, "aggtranstype");
 	i_aggtransspace = PQfnumber(res, "aggtransspace");
 	i_aggmtranstype = PQfnumber(res, "aggmtranstype");
@@ -13568,8 +13680,10 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	aggmfinalfn = PQgetvalue(res, 0, i_aggmfinalfn);
 	aggfinalextra = (PQgetvalue(res, 0, i_aggfinalextra)[0] == 't');
 	aggmfinalextra = (PQgetvalue(res, 0, i_aggmfinalextra)[0] == 't');
+	aggfinalmodify = PQgetvalue(res, 0, i_aggfinalmodify)[0];
+	aggmfinalmodify = PQgetvalue(res, 0, i_aggmfinalmodify)[0];
 	aggsortop = PQgetvalue(res, 0, i_aggsortop);
-	hypothetical = (PQgetvalue(res, 0, i_hypothetical)[0] == 't');
+	aggkind = PQgetvalue(res, 0, i_aggkind)[0];
 	aggtranstype = PQgetvalue(res, 0, i_aggtranstype);
 	aggtransspace = PQgetvalue(res, 0, i_aggtransspace);
 	aggmtranstype = PQgetvalue(res, 0, i_aggmtranstype);
@@ -13613,6 +13727,14 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 		return;
 	}
 
+	/* identify default modify flag for aggkind (must match DefineAggregate) */
+	defaultfinalmodify = (aggkind == AGGKIND_NORMAL) ? AGGMODIFY_READ_ONLY : AGGMODIFY_READ_WRITE;
+	/* replace omitted flags for old versions */
+	if (aggfinalmodify == '0')
+		aggfinalmodify = defaultfinalmodify;
+	if (aggmfinalmodify == '0')
+		aggmfinalmodify = defaultfinalmodify;
+
 	/* regproc and regtype output is already sufficiently quoted */
 	appendPQExpBuffer(details, "    SFUNC = %s,\n    STYPE = %s",
 					  aggtransfn, aggtranstype);
@@ -13635,6 +13757,25 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  aggfinalfn);
 		if (aggfinalextra)
 			appendPQExpBufferStr(details, ",\n    FINALFUNC_EXTRA");
+		if (aggfinalmodify != defaultfinalmodify)
+		{
+			switch (aggfinalmodify)
+			{
+				case AGGMODIFY_READ_ONLY:
+					appendPQExpBufferStr(details, ",\n    FINALFUNC_MODIFY = READ_ONLY");
+					break;
+				case AGGMODIFY_SHARABLE:
+					appendPQExpBufferStr(details, ",\n    FINALFUNC_MODIFY = SHARABLE");
+					break;
+				case AGGMODIFY_READ_WRITE:
+					appendPQExpBufferStr(details, ",\n    FINALFUNC_MODIFY = READ_WRITE");
+					break;
+				default:
+					exit_horribly(NULL, "unrecognized aggfinalmodify value for aggregate \"%s\"\n",
+								  agginfo->aggfn.dobj.name);
+					break;
+			}
+		}
 	}
 
 	if (strcmp(aggcombinefn, "-") != 0)
@@ -13672,9 +13813,28 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  aggmfinalfn);
 		if (aggmfinalextra)
 			appendPQExpBufferStr(details, ",\n    MFINALFUNC_EXTRA");
+		if (aggmfinalmodify != defaultfinalmodify)
+		{
+			switch (aggmfinalmodify)
+			{
+				case AGGMODIFY_READ_ONLY:
+					appendPQExpBufferStr(details, ",\n    MFINALFUNC_MODIFY = READ_ONLY");
+					break;
+				case AGGMODIFY_SHARABLE:
+					appendPQExpBufferStr(details, ",\n    MFINALFUNC_MODIFY = SHARABLE");
+					break;
+				case AGGMODIFY_READ_WRITE:
+					appendPQExpBufferStr(details, ",\n    MFINALFUNC_MODIFY = READ_WRITE");
+					break;
+				default:
+					exit_horribly(NULL, "unrecognized aggmfinalmodify value for aggregate \"%s\"\n",
+								  agginfo->aggfn.dobj.name);
+					break;
+			}
+		}
 	}
 
-	aggsortconvop = convertOperatorReference(fout, aggsortop);
+	aggsortconvop = getFormattedOperatorName(fout, aggsortop);
 	if (aggsortconvop)
 	{
 		appendPQExpBuffer(details, ",\n    SORTOP = %s",
@@ -13682,7 +13842,7 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 		free(aggsortconvop);
 	}
 
-	if (hypothetical)
+	if (aggkind == AGGKIND_HYPOTHETICAL)
 		appendPQExpBufferStr(details, ",\n    HYPOTHETICAL");
 
 	if (proparallel != NULL && proparallel[0] != PROPARALLEL_UNSAFE)
@@ -13696,20 +13856,18 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 						  agginfo->aggfn.dobj.name);
 	}
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	appendPQExpBuffer(delq, "DROP AGGREGATE %s.%s;\n",
 					  fmtId(agginfo->aggfn.dobj.namespace->dobj.name),
 					  aggsig);
 
-	appendPQExpBuffer(q, "CREATE AGGREGATE %s (\n%s\n);\n",
+	appendPQExpBuffer(q, "CREATE AGGREGATE %s.%s (\n%s\n);\n",
+					  fmtId(agginfo->aggfn.dobj.namespace->dobj.name),
 					  aggfullsig ? aggfullsig : aggsig, details->data);
 
-	appendPQExpBuffer(labelq, "AGGREGATE %s", aggsig);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &agginfo->aggfn.dobj, labelq->data);
+		binary_upgrade_extension_member(q, &agginfo->aggfn.dobj,
+										"AGGREGATE", aggsig,
+										agginfo->aggfn.dobj.namespace->dobj.name);
 
 	if (agginfo->aggfn.dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, agginfo->aggfn.dobj.catId,
@@ -13725,13 +13883,13 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 
 	/* Dump Aggregate Comments */
 	if (agginfo->aggfn.dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "AGGREGATE", aggsig,
 					agginfo->aggfn.dobj.namespace->dobj.name,
 					agginfo->aggfn.rolname,
 					agginfo->aggfn.dobj.catId, 0, agginfo->aggfn.dobj.dumpId);
 
 	if (agginfo->aggfn.dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "AGGREGATE", aggsig,
 					 agginfo->aggfn.dobj.namespace->dobj.name,
 					 agginfo->aggfn.rolname,
 					 agginfo->aggfn.dobj.catId, 0, agginfo->aggfn.dobj.dumpId);
@@ -13742,15 +13900,12 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	 * syntax for zero-argument aggregates and ordered-set aggregates.
 	 */
 	free(aggsig);
-	free(aggsig_tag);
 
 	aggsig = format_function_signature(fout, &agginfo->aggfn, true);
-	aggsig_tag = format_function_signature(fout, &agginfo->aggfn, false);
 
 	if (agginfo->aggfn.dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, agginfo->aggfn.dobj.catId, agginfo->aggfn.dobj.dumpId,
-				"FUNCTION",
-				aggsig, NULL, aggsig_tag,
+				"FUNCTION", aggsig, NULL,
 				agginfo->aggfn.dobj.namespace->dobj.name,
 				agginfo->aggfn.rolname, agginfo->aggfn.proacl,
 				agginfo->aggfn.rproacl,
@@ -13766,7 +13921,6 @@ dumpAgg(Archive *fout, AggInfo *agginfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(details);
 }
 
@@ -13780,7 +13934,7 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	char	   *qprsname;
 
 	/* Skip if not to be dumped */
 	if (!prsinfo->dobj.dump || dopt->dataOnly)
@@ -13788,13 +13942,11 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, prsinfo->dobj.namespace->dobj.name);
+	qprsname = pg_strdup(fmtId(prsinfo->dobj.name));
 
 	appendPQExpBuffer(q, "CREATE TEXT SEARCH PARSER %s (\n",
-					  fmtId(prsinfo->dobj.name));
+					  fmtQualifiedDumpable(prsinfo));
 
 	appendPQExpBuffer(q, "    START = %s,\n",
 					  convertTSFunction(fout, prsinfo->prsstart));
@@ -13808,19 +13960,13 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
 	appendPQExpBuffer(q, "    LEXTYPES = %s );\n",
 					  convertTSFunction(fout, prsinfo->prslextype));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP TEXT SEARCH PARSER %s",
-					  fmtId(prsinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(prsinfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "TEXT SEARCH PARSER %s",
-					  fmtId(prsinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH PARSER %s;\n",
+					  fmtQualifiedDumpable(prsinfo));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &prsinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &prsinfo->dobj,
+										"TEXT SEARCH PARSER", qprsname,
+										prsinfo->dobj.namespace->dobj.name);
 
 	if (prsinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, prsinfo->dobj.catId, prsinfo->dobj.dumpId,
@@ -13835,13 +13981,13 @@ dumpTSParser(Archive *fout, TSParserInfo *prsinfo)
 
 	/* Dump Parser Comments */
 	if (prsinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TEXT SEARCH PARSER", qprsname,
 					prsinfo->dobj.namespace->dobj.name, "",
 					prsinfo->dobj.catId, 0, prsinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qprsname);
 }
 
 /*
@@ -13854,8 +14000,8 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	PQExpBuffer query;
+	char	   *qdictname;
 	PGresult   *res;
 	char	   *nspname;
 	char	   *tmplname;
@@ -13866,11 +14012,11 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	query = createPQExpBuffer();
 
+	qdictname = pg_strdup(fmtId(dictinfo->dobj.name));
+
 	/* Fetch name and namespace of the dictionary's template */
-	selectSourceSchema(fout, "pg_catalog");
 	appendPQExpBuffer(query, "SELECT nspname, tmplname "
 					  "FROM pg_ts_template p, pg_namespace n "
 					  "WHERE p.oid = '%u' AND n.oid = tmplnamespace",
@@ -13879,15 +14025,11 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 	nspname = PQgetvalue(res, 0, 0);
 	tmplname = PQgetvalue(res, 0, 1);
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, dictinfo->dobj.namespace->dobj.name);
-
 	appendPQExpBuffer(q, "CREATE TEXT SEARCH DICTIONARY %s (\n",
-					  fmtId(dictinfo->dobj.name));
+					  fmtQualifiedDumpable(dictinfo));
 
 	appendPQExpBufferStr(q, "    TEMPLATE = ");
-	if (strcmp(nspname, dictinfo->dobj.namespace->dobj.name) != 0)
-		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "%s.", fmtId(nspname));
 	appendPQExpBufferStr(q, fmtId(tmplname));
 
 	PQclear(res);
@@ -13898,19 +14040,13 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 
 	appendPQExpBufferStr(q, " );\n");
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP TEXT SEARCH DICTIONARY %s",
-					  fmtId(dictinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(dictinfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "TEXT SEARCH DICTIONARY %s",
-					  fmtId(dictinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH DICTIONARY %s;\n",
+					  fmtQualifiedDumpable(dictinfo));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &dictinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &dictinfo->dobj,
+										"TEXT SEARCH DICTIONARY", qdictname,
+										dictinfo->dobj.namespace->dobj.name);
 
 	if (dictinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, dictinfo->dobj.catId, dictinfo->dobj.dumpId,
@@ -13925,14 +14061,14 @@ dumpTSDictionary(Archive *fout, TSDictInfo *dictinfo)
 
 	/* Dump Dictionary Comments */
 	if (dictinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TEXT SEARCH DICTIONARY", qdictname,
 					dictinfo->dobj.namespace->dobj.name, dictinfo->rolname,
 					dictinfo->dobj.catId, 0, dictinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qdictname);
 }
 
 /*
@@ -13945,7 +14081,7 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	char	   *qtmplname;
 
 	/* Skip if not to be dumped */
 	if (!tmplinfo->dobj.dump || dopt->dataOnly)
@@ -13953,13 +14089,11 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, tmplinfo->dobj.namespace->dobj.name);
+	qtmplname = pg_strdup(fmtId(tmplinfo->dobj.name));
 
 	appendPQExpBuffer(q, "CREATE TEXT SEARCH TEMPLATE %s (\n",
-					  fmtId(tmplinfo->dobj.name));
+					  fmtQualifiedDumpable(tmplinfo));
 
 	if (tmplinfo->tmplinit != InvalidOid)
 		appendPQExpBuffer(q, "    INIT = %s,\n",
@@ -13967,19 +14101,13 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
 	appendPQExpBuffer(q, "    LEXIZE = %s );\n",
 					  convertTSFunction(fout, tmplinfo->tmpllexize));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP TEXT SEARCH TEMPLATE %s",
-					  fmtId(tmplinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(tmplinfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "TEXT SEARCH TEMPLATE %s",
-					  fmtId(tmplinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH TEMPLATE %s;\n",
+					  fmtQualifiedDumpable(tmplinfo));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tmplinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tmplinfo->dobj,
+										"TEXT SEARCH TEMPLATE", qtmplname,
+										tmplinfo->dobj.namespace->dobj.name);
 
 	if (tmplinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tmplinfo->dobj.catId, tmplinfo->dobj.dumpId,
@@ -13994,13 +14122,13 @@ dumpTSTemplate(Archive *fout, TSTemplateInfo *tmplinfo)
 
 	/* Dump Template Comments */
 	if (tmplinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TEXT SEARCH TEMPLATE", qtmplname,
 					tmplinfo->dobj.namespace->dobj.name, "",
 					tmplinfo->dobj.catId, 0, tmplinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qtmplname);
 }
 
 /*
@@ -14013,8 +14141,8 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	PQExpBuffer query;
+	char	   *qcfgname;
 	PGresult   *res;
 	char	   *nspname;
 	char	   *prsname;
@@ -14029,11 +14157,11 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	query = createPQExpBuffer();
 
+	qcfgname = pg_strdup(fmtId(cfginfo->dobj.name));
+
 	/* Fetch name and namespace of the config's parser */
-	selectSourceSchema(fout, "pg_catalog");
 	appendPQExpBuffer(query, "SELECT nspname, prsname "
 					  "FROM pg_ts_parser p, pg_namespace n "
 					  "WHERE p.oid = '%u' AND n.oid = prsnamespace",
@@ -14042,15 +14170,10 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 	nspname = PQgetvalue(res, 0, 0);
 	prsname = PQgetvalue(res, 0, 1);
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, cfginfo->dobj.namespace->dobj.name);
-
 	appendPQExpBuffer(q, "CREATE TEXT SEARCH CONFIGURATION %s (\n",
-					  fmtId(cfginfo->dobj.name));
+					  fmtQualifiedDumpable(cfginfo));
 
-	appendPQExpBufferStr(q, "    PARSER = ");
-	if (strcmp(nspname, cfginfo->dobj.namespace->dobj.name) != 0)
-		appendPQExpBuffer(q, "%s.", fmtId(nspname));
+	appendPQExpBuffer(q, "    PARSER = %s.", fmtId(nspname));
 	appendPQExpBuffer(q, "%s );\n", fmtId(prsname));
 
 	PQclear(res);
@@ -14084,7 +14207,7 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 			if (i > 0)
 				appendPQExpBufferStr(q, ";\n");
 			appendPQExpBuffer(q, "\nALTER TEXT SEARCH CONFIGURATION %s\n",
-							  fmtId(cfginfo->dobj.name));
+							  fmtQualifiedDumpable(cfginfo));
 			/* tokenname needs quoting, dictname does NOT */
 			appendPQExpBuffer(q, "    ADD MAPPING FOR %s WITH %s",
 							  fmtId(tokenname), dictname);
@@ -14098,19 +14221,13 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 
 	PQclear(res);
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "DROP TEXT SEARCH CONFIGURATION %s",
-					  fmtId(cfginfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, ".%s;\n",
-					  fmtId(cfginfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "TEXT SEARCH CONFIGURATION %s",
-					  fmtId(cfginfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP TEXT SEARCH CONFIGURATION %s;\n",
+					  fmtQualifiedDumpable(cfginfo));
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &cfginfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &cfginfo->dobj,
+										"TEXT SEARCH CONFIGURATION", qcfgname,
+										cfginfo->dobj.namespace->dobj.name);
 
 	if (cfginfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, cfginfo->dobj.catId, cfginfo->dobj.dumpId,
@@ -14125,14 +14242,14 @@ dumpTSConfig(Archive *fout, TSConfigInfo *cfginfo)
 
 	/* Dump Configuration Comments */
 	if (cfginfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "TEXT SEARCH CONFIGURATION", qcfgname,
 					cfginfo->dobj.namespace->dobj.name, cfginfo->rolname,
 					cfginfo->dobj.catId, 0, cfginfo->dobj.dumpId);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
+	free(qcfgname);
 }
 
 /*
@@ -14145,7 +14262,6 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	char	   *qfdwname;
 
 	/* Skip if not to be dumped */
@@ -14154,7 +14270,6 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
 	qfdwname = pg_strdup(fmtId(fdwinfo->dobj.name));
 
@@ -14175,11 +14290,10 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
 	appendPQExpBuffer(delq, "DROP FOREIGN DATA WRAPPER %s;\n",
 					  qfdwname);
 
-	appendPQExpBuffer(labelq, "FOREIGN DATA WRAPPER %s",
-					  qfdwname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &fdwinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &fdwinfo->dobj,
+										"FOREIGN DATA WRAPPER", qfdwname,
+										NULL);
 
 	if (fdwinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, fdwinfo->dobj.catId, fdwinfo->dobj.dumpId,
@@ -14192,26 +14306,24 @@ dumpForeignDataWrapper(Archive *fout, FdwInfo *fdwinfo)
 					 NULL, 0,
 					 NULL, NULL);
 
+	/* Dump Foreign Data Wrapper Comments */
+	if (fdwinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
+		dumpComment(fout, "FOREIGN DATA WRAPPER", qfdwname,
+					NULL, fdwinfo->rolname,
+					fdwinfo->dobj.catId, 0, fdwinfo->dobj.dumpId);
+
 	/* Handle the ACL */
 	if (fdwinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, fdwinfo->dobj.catId, fdwinfo->dobj.dumpId,
-				"FOREIGN DATA WRAPPER",
-				qfdwname, NULL, fdwinfo->dobj.name,
+				"FOREIGN DATA WRAPPER", qfdwname, NULL,
 				NULL, fdwinfo->rolname,
 				fdwinfo->fdwacl, fdwinfo->rfdwacl,
 				fdwinfo->initfdwacl, fdwinfo->initrfdwacl);
 
-	/* Dump Foreign Data Wrapper Comments */
-	if (fdwinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					NULL, fdwinfo->rolname,
-					fdwinfo->dobj.catId, 0, fdwinfo->dobj.dumpId);
-
 	free(qfdwname);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 }
 
 /*
@@ -14224,7 +14336,6 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
 	PQExpBuffer query;
 	PGresult   *res;
 	char	   *qsrvname;
@@ -14236,13 +14347,11 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 	query = createPQExpBuffer();
 
 	qsrvname = pg_strdup(fmtId(srvinfo->dobj.name));
 
 	/* look up the foreign-data wrapper */
-	selectSourceSchema(fout, "pg_catalog");
 	appendPQExpBuffer(query, "SELECT fdwname "
 					  "FROM pg_foreign_data_wrapper w "
 					  "WHERE w.oid = '%u'",
@@ -14273,10 +14382,9 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 	appendPQExpBuffer(delq, "DROP SERVER %s;\n",
 					  qsrvname);
 
-	appendPQExpBuffer(labelq, "SERVER %s", qsrvname);
-
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &srvinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &srvinfo->dobj,
+										"SERVER", qsrvname, NULL);
 
 	if (srvinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
@@ -14289,11 +14397,16 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 					 NULL, 0,
 					 NULL, NULL);
 
+	/* Dump Foreign Server Comments */
+	if (srvinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
+		dumpComment(fout, "SERVER", qsrvname,
+					NULL, srvinfo->rolname,
+					srvinfo->dobj.catId, 0, srvinfo->dobj.dumpId);
+
 	/* Handle the ACL */
 	if (srvinfo->dobj.dump & DUMP_COMPONENT_ACL)
 		dumpACL(fout, srvinfo->dobj.catId, srvinfo->dobj.dumpId,
-				"FOREIGN SERVER",
-				qsrvname, NULL, srvinfo->dobj.name,
+				"FOREIGN SERVER", qsrvname, NULL,
 				NULL, srvinfo->rolname,
 				srvinfo->srvacl, srvinfo->rsrvacl,
 				srvinfo->initsrvacl, srvinfo->initrsrvacl);
@@ -14305,17 +14418,10 @@ dumpForeignServer(Archive *fout, ForeignServerInfo *srvinfo)
 						 srvinfo->rolname,
 						 srvinfo->dobj.catId, srvinfo->dobj.dumpId);
 
-	/* Dump Foreign Server Comments */
-	if (srvinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					NULL, srvinfo->rolname,
-					srvinfo->dobj.catId, 0, srvinfo->dobj.dumpId);
-
 	free(qsrvname);
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
 	destroyPQExpBuffer(query);
 }
 
@@ -14355,8 +14461,6 @@ dumpUserMappings(Archive *fout,
 	 * OPTIONS clause.  A possible alternative is to skip such mappings
 	 * altogether, but it's not clear that that's an improvement.
 	 */
-	selectSourceSchema(fout, "pg_catalog");
-
 	appendPQExpBuffer(query,
 					  "SELECT usename, "
 					  "array_to_string(ARRAY("
@@ -14504,7 +14608,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
  *		FOREIGN DATA WRAPPER, SERVER, or LARGE OBJECT.
  * 'name' is the formatted name of the object.  Must be quoted etc. already.
  * 'subname' is the formatted name of the sub-object, if any.  Must be quoted.
- * 'tag' is the tag for the archive entry (typ. unquoted name of object).
+ *		(Currently we assume that subname is only provided for table columns.)
  * 'nspname' is the namespace the object is in (NULL if none).
  * 'owner' is the owner, NULL if there is no owner (for languages).
  * 'acls' contains the ACL string of the object from the appropriate system
@@ -14526,7 +14630,7 @@ dumpDefaultACL(Archive *fout, DefaultACLInfo *daclinfo)
 static void
 dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 		const char *type, const char *name, const char *subname,
-		const char *tag, const char *nspname, const char *owner,
+		const char *nspname, const char *owner,
 		const char *acls, const char *racls,
 		const char *initacls, const char *initracls)
 {
@@ -14554,7 +14658,8 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 	if (strlen(initacls) != 0 || strlen(initracls) != 0)
 	{
 		appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\n");
-		if (!buildACLCommands(name, subname, type, initacls, initracls, owner,
+		if (!buildACLCommands(name, subname, nspname, type,
+							  initacls, initracls, owner,
 							  "", fout->remoteVersion, sql))
 			exit_horribly(NULL,
 						  "could not parse initial GRANT ACL list (%s) or initial REVOKE ACL list (%s) for object \"%s\" (%s)\n",
@@ -14562,21 +14667,32 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
 		appendPQExpBuffer(sql, "SELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\n");
 	}
 
-	if (!buildACLCommands(name, subname, type, acls, racls, owner,
+	if (!buildACLCommands(name, subname, nspname, type,
+						  acls, racls, owner,
 						  "", fout->remoteVersion, sql))
 		exit_horribly(NULL,
 					  "could not parse GRANT ACL list (%s) or REVOKE ACL list (%s) for object \"%s\" (%s)\n",
 					  acls, racls, name, type);
 
 	if (sql->len > 0)
+	{
+		PQExpBuffer tag = createPQExpBuffer();
+
+		if (subname)
+			appendPQExpBuffer(tag, "COLUMN %s.%s", name, subname);
+		else
+			appendPQExpBuffer(tag, "%s %s", type, name);
+
 		ArchiveEntry(fout, nilCatalogId, createDumpId(),
-					 tag, nspname,
+					 tag->data, nspname,
 					 NULL,
 					 owner ? owner : "",
 					 false, "ACL", SECTION_NONE,
 					 sql->data, "", NULL,
 					 &(objDumpId), 1,
 					 NULL, NULL);
+		destroyPQExpBuffer(tag);
+	}
 
 	destroyPQExpBuffer(sql);
 }
@@ -14585,8 +14701,8 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
  * dumpSecLabel
  *
  * This routine is used to dump any security labels associated with the
- * object handed to this routine. The routine takes a constant character
- * string for the target part of the security-label command, plus
+ * object handed to this routine. The routine takes the object type
+ * and object name (ready to print, except for schema decoration), plus
  * the namespace and owner of the object (for labeling the ArchiveEntry),
  * plus catalog ID and subid which are the lookup key for pg_seclabel,
  * plus the dump ID for the object (for setting a dependency).
@@ -14600,7 +14716,7 @@ dumpACL(Archive *fout, CatalogId objCatId, DumpId objDumpId,
  * calling ArchiveEntry() for the specified object.
  */
 static void
-dumpSecLabel(Archive *fout, const char *target,
+dumpSecLabel(Archive *fout, const char *type, const char *name,
 			 const char *namespace, const char *owner,
 			 CatalogId catalogId, int subid, DumpId dumpId)
 {
@@ -14614,8 +14730,8 @@ dumpSecLabel(Archive *fout, const char *target,
 	if (dopt->no_security_labels)
 		return;
 
-	/* Comments are schema not data ... except blob comments are data */
-	if (strncmp(target, "LARGE OBJECT ", 13) != 0)
+	/* Security labels are schema not data ... except blob labels are data */
+	if (strcmp(type, "LARGE OBJECT") != 0)
 	{
 		if (dopt->dataOnly)
 			return;
@@ -14641,21 +14757,29 @@ dumpSecLabel(Archive *fout, const char *target,
 			continue;
 
 		appendPQExpBuffer(query,
-						  "SECURITY LABEL FOR %s ON %s IS ",
-						  fmtId(labels[i].provider), target);
+						  "SECURITY LABEL FOR %s ON %s ",
+						  fmtId(labels[i].provider), type);
+		if (namespace && *namespace)
+			appendPQExpBuffer(query, "%s.", fmtId(namespace));
+		appendPQExpBuffer(query, "%s IS ", name);
 		appendStringLiteralAH(query, labels[i].label, fout);
 		appendPQExpBufferStr(query, ";\n");
 	}
 
 	if (query->len > 0)
 	{
+		PQExpBuffer tag = createPQExpBuffer();
+
+		appendPQExpBuffer(tag, "%s %s", type, name);
 		ArchiveEntry(fout, nilCatalogId, createDumpId(),
-					 target, namespace, NULL, owner,
+					 tag->data, namespace, NULL, owner,
 					 false, "SECURITY LABEL", SECTION_NONE,
 					 query->data, "", NULL,
 					 &(dumpId), 1,
 					 NULL, NULL);
+		destroyPQExpBuffer(tag);
 	}
+
 	destroyPQExpBuffer(query);
 }
 
@@ -14707,13 +14831,14 @@ dumpTableSecLabel(Archive *fout, TableInfo *tbinfo, const char *reltypename)
 		if (objsubid == 0)
 		{
 			appendPQExpBuffer(target, "%s %s", reltypename,
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
 		}
 		else
 		{
 			colname = getAttrName(objsubid, tbinfo);
-			/* first fmtId result must be consumed before calling it again */
-			appendPQExpBuffer(target, "COLUMN %s", fmtId(tbinfo->dobj.name));
+			/* first fmtXXX result must be consumed before calling again */
+			appendPQExpBuffer(target, "COLUMN %s",
+							  fmtQualifiedDumpable(tbinfo));
 			appendPQExpBuffer(target, ".%s", fmtId(colname));
 		}
 		appendPQExpBuffer(query, "SECURITY LABEL FOR %s ON %s IS ",
@@ -14908,13 +15033,16 @@ dumpTable(Archive *fout, TableInfo *tbinfo)
 	/* Handle the ACL here */
 	namecopy = pg_strdup(fmtId(tbinfo->dobj.name));
 	if (tbinfo->dobj.dump & DUMP_COMPONENT_ACL)
+	{
+		const char *objtype =
+		(tbinfo->relkind == RELKIND_SEQUENCE) ? "SEQUENCE" : "TABLE";
+
 		dumpACL(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
-				(tbinfo->relkind == RELKIND_SEQUENCE) ? "SEQUENCE" :
-				"TABLE",
-				namecopy, NULL, tbinfo->dobj.name,
+				objtype, namecopy, NULL,
 				tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
 				tbinfo->relacl, tbinfo->rrelacl,
 				tbinfo->initrelacl, tbinfo->initrrelacl);
+	}
 
 	/*
 	 * Handle column ACLs, if any.  Note: we pull these with a separate query
@@ -14995,17 +15123,14 @@ dumpTable(Archive *fout, TableInfo *tbinfo)
 			char	   *initattacl = PQgetvalue(res, i, 3);
 			char	   *initrattacl = PQgetvalue(res, i, 4);
 			char	   *attnamecopy;
-			char	   *acltag;
 
 			attnamecopy = pg_strdup(fmtId(attname));
-			acltag = psprintf("%s.%s", tbinfo->dobj.name, attname);
 			/* Column's GRANT type is always TABLE */
-			dumpACL(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId, "TABLE",
-					namecopy, attnamecopy, acltag,
+			dumpACL(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
+					"TABLE", namecopy, attnamecopy,
 					tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
 					attacl, rattacl, initattacl, initrattacl);
 			free(attnamecopy);
-			free(acltag);
 		}
 		PQclear(res);
 		destroyPQExpBuffer(query);
@@ -15097,12 +15222,8 @@ createDummyViewAsClause(Archive *fout, TableInfo *tbinfo)
 
 			coll = findCollationByOid(tbinfo->attcollation[j]);
 			if (coll)
-			{
-				/* always schema-qualify, don't try to be smart */
-				appendPQExpBuffer(result, " COLLATE %s.",
-								  fmtId(coll->dobj.namespace->dobj.name));
-				appendPQExpBufferStr(result, fmtId(coll->dobj.name));
-			}
+				appendPQExpBuffer(result, " COLLATE %s",
+								  fmtQualifiedDumpable(coll));
 		}
 
 		appendPQExpBuffer(result, " AS %s", fmtId(tbinfo->attnames[j]));
@@ -15121,7 +15242,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer q = createPQExpBuffer();
 	PQExpBuffer delq = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
+	char	   *qrelname;
+	char	   *qualrelname;
 	int			numParents;
 	TableInfo **parents;
 	int			actual_atts;	/* number of attrs in this CREATE statement */
@@ -15132,8 +15254,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 	int			j,
 				k;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
+	qrelname = pg_strdup(fmtId(tbinfo->dobj.name));
+	qualrelname = pg_strdup(fmtQualifiedDumpable(tbinfo));
 
 	if (dopt->binary_upgrade)
 		binary_upgrade_set_type_oids_by_rel_oid(fout, q,
@@ -15150,20 +15272,14 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 		reltypename = "VIEW";
 
-		/*
-		 * DROP must be fully qualified in case same name appears in
-		 * pg_catalog
-		 */
-		appendPQExpBuffer(delq, "DROP VIEW %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delq, "%s;\n",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delq, "DROP VIEW %s;\n", qualrelname);
 
 		if (dopt->binary_upgrade)
 			binary_upgrade_set_pg_class_oids(fout, q,
 											 tbinfo->dobj.catId.oid, false);
 
-		appendPQExpBuffer(q, "CREATE VIEW %s", fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(q, "CREATE VIEW %s", qualrelname);
+
 		if (tbinfo->dummy_view)
 			result = createDummyViewAsClause(fout, tbinfo);
 		else
@@ -15182,9 +15298,6 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		if (tbinfo->checkoption != NULL && !tbinfo->dummy_view)
 			appendPQExpBuffer(q, "\n  WITH %s CHECK OPTION", tbinfo->checkoption);
 		appendPQExpBufferStr(q, ";\n");
-
-		appendPQExpBuffer(labelq, "VIEW %s",
-						  fmtId(tbinfo->dobj.name));
 	}
 	else
 	{
@@ -15236,17 +15349,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		numParents = tbinfo->numParents;
 		parents = tbinfo->parents;
 
-		/*
-		 * DROP must be fully qualified in case same name appears in
-		 * pg_catalog
-		 */
-		appendPQExpBuffer(delq, "DROP %s %s.", reltypename,
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delq, "%s;\n",
-						  fmtId(tbinfo->dobj.name));
-
-		appendPQExpBuffer(labelq, "%s %s", reltypename,
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delq, "DROP %s %s;\n", reltypename, qualrelname);
 
 		if (dopt->binary_upgrade)
 			binary_upgrade_set_pg_class_oids(fout, q,
@@ -15256,7 +15359,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 						  tbinfo->relpersistence == RELPERSISTENCE_UNLOGGED ?
 						  "UNLOGGED " : "",
 						  reltypename,
-						  fmtId(tbinfo->dobj.name));
+						  qualrelname);
 
 		/*
 		 * Attach to type, if reloftype; except in case of a binary upgrade,
@@ -15282,11 +15385,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				exit_horribly(NULL, "invalid number of parents %d for table \"%s\"\n",
 							  tbinfo->numParents, tbinfo->dobj.name);
 
-			appendPQExpBuffer(q, " PARTITION OF ");
-			if (parentRel->dobj.namespace != tbinfo->dobj.namespace)
-				appendPQExpBuffer(q, "%s.",
-								  fmtId(parentRel->dobj.namespace->dobj.name));
-			appendPQExpBufferStr(q, fmtId(parentRel->dobj.name));
+			appendPQExpBuffer(q, " PARTITION OF %s",
+							  fmtQualifiedDumpable(parentRel));
 		}
 
 		if (tbinfo->relkind != RELKIND_MATVIEW)
@@ -15371,12 +15471,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 						coll = findCollationByOid(tbinfo->attcollation[j]);
 						if (coll)
-						{
-							/* always schema-qualify, don't try to be smart */
-							appendPQExpBuffer(q, " COLLATE %s.",
-											  fmtId(coll->dobj.namespace->dobj.name));
-							appendPQExpBufferStr(q, fmtId(coll->dobj.name));
-						}
+							appendPQExpBuffer(q, " COLLATE %s",
+											  fmtQualifiedDumpable(coll));
 					}
 
 					if (has_default)
@@ -15440,10 +15536,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 					if (k > 0)
 						appendPQExpBufferStr(q, ", ");
-					if (parentRel->dobj.namespace != tbinfo->dobj.namespace)
-						appendPQExpBuffer(q, "%s.",
-										  fmtId(parentRel->dobj.namespace->dobj.name));
-					appendPQExpBufferStr(q, fmtId(parentRel->dobj.name));
+					appendPQExpBufferStr(q, fmtQualifiedDumpable(parentRel));
 				}
 				appendPQExpBufferChar(q, ')');
 			}
@@ -15508,6 +15601,14 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		 * column order.  That also means we have to take care about setting
 		 * attislocal correctly, plus fix up any inherited CHECK constraints.
 		 * Analogously, we set up typed tables using ALTER TABLE / OF here.
+		 *
+		 * We process foreign and partitioned tables here, even though they
+		 * lack heap storage, because they can participate in inheritance
+		 * relationships and we want this stuff to be consistent across the
+		 * inheritance tree.  We can exclude indexes, toast tables, sequences
+		 * and matviews, even though they have storage, because we don't
+		 * support altering or dropping columns in them, nor can they be part
+		 * of inheritance trees.
 		 */
 		if (dopt->binary_upgrade &&
 			(tbinfo->relkind == RELKIND_RELATION ||
@@ -15527,16 +15628,16 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 									  tbinfo->attalign[j]);
 					appendStringLiteralAH(q, tbinfo->attnames[j], fout);
 					appendPQExpBufferStr(q, "\n  AND attrelid = ");
-					appendStringLiteralAH(q, fmtId(tbinfo->dobj.name), fout);
+					appendStringLiteralAH(q, qualrelname, fout);
 					appendPQExpBufferStr(q, "::pg_catalog.regclass;\n");
 
 					if (tbinfo->relkind == RELKIND_RELATION ||
 						tbinfo->relkind == RELKIND_PARTITIONED_TABLE)
 						appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-										  fmtId(tbinfo->dobj.name));
+										  qualrelname);
 					else
 						appendPQExpBuffer(q, "ALTER FOREIGN TABLE ONLY %s ",
-										  fmtId(tbinfo->dobj.name));
+										  qualrelname);
 					appendPQExpBuffer(q, "DROP COLUMN %s;\n",
 									  fmtId(tbinfo->attnames[j]));
 				}
@@ -15548,7 +15649,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 										 "WHERE attname = ");
 					appendStringLiteralAH(q, tbinfo->attnames[j], fout);
 					appendPQExpBufferStr(q, "\n  AND attrelid = ");
-					appendStringLiteralAH(q, fmtId(tbinfo->dobj.name), fout);
+					appendStringLiteralAH(q, qualrelname, fout);
 					appendPQExpBufferStr(q, "::pg_catalog.regclass;\n");
 				}
 			}
@@ -15562,7 +15663,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 				appendPQExpBufferStr(q, "\n-- For binary upgrade, set up inherited constraint.\n");
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-								  fmtId(tbinfo->dobj.name));
+								  qualrelname);
 				appendPQExpBuffer(q, " ADD CONSTRAINT %s ",
 								  fmtId(constr->dobj.name));
 				appendPQExpBuffer(q, "%s;\n", constr->condef);
@@ -15571,7 +15672,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 									 "WHERE contype = 'c' AND conname = ");
 				appendStringLiteralAH(q, constr->dobj.name, fout);
 				appendPQExpBufferStr(q, "\n  AND conrelid = ");
-				appendStringLiteralAH(q, fmtId(tbinfo->dobj.name), fout);
+				appendStringLiteralAH(q, qualrelname, fout);
 				appendPQExpBufferStr(q, "::pg_catalog.regclass;\n");
 			}
 
@@ -15581,34 +15682,24 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				for (k = 0; k < numParents; k++)
 				{
 					TableInfo  *parentRel = parents[k];
-					PQExpBuffer parentname = createPQExpBuffer();
-
-					/* Schema-qualify the parent table, if necessary */
-					if (parentRel->dobj.namespace != tbinfo->dobj.namespace)
-						appendPQExpBuffer(parentname, "%s.",
-										  fmtId(parentRel->dobj.namespace->dobj.name));
-
-					appendPQExpBuffer(parentname, "%s",
-									  fmtId(parentRel->dobj.name));
 
 					/* In the partitioning case, we alter the parent */
 					if (tbinfo->ispartition)
 						appendPQExpBuffer(q,
 										  "ALTER TABLE ONLY %s ATTACH PARTITION ",
-										  parentname->data);
+										  fmtQualifiedDumpable(parentRel));
 					else
 						appendPQExpBuffer(q, "ALTER TABLE ONLY %s INHERIT ",
-										  fmtId(tbinfo->dobj.name));
+										  qualrelname);
 
 					/* Partition needs specifying the bounds */
 					if (tbinfo->ispartition)
 						appendPQExpBuffer(q, "%s %s;\n",
-										  fmtId(tbinfo->dobj.name),
+										  qualrelname,
 										  tbinfo->partbound);
 					else
-						appendPQExpBuffer(q, "%s;\n", parentname->data);
-
-					destroyPQExpBuffer(parentname);
+						appendPQExpBuffer(q, "%s;\n",
+										  fmtQualifiedDumpable(parentRel));
 				}
 			}
 
@@ -15616,21 +15707,36 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			{
 				appendPQExpBufferStr(q, "\n-- For binary upgrade, set up typed tables this way.\n");
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s OF %s;\n",
-								  fmtId(tbinfo->dobj.name),
+								  qualrelname,
 								  tbinfo->reloftype);
 			}
+		}
 
+		/*
+		 * In binary_upgrade mode, arrange to restore the old relfrozenxid and
+		 * relminmxid of all vacuumable relations.  (While vacuum.c processes
+		 * TOAST tables semi-independently, here we see them only as children
+		 * of other relations; so this "if" lacks RELKIND_TOASTVALUE, and the
+		 * child toast table is handled below.)
+		 */
+		if (dopt->binary_upgrade &&
+			(tbinfo->relkind == RELKIND_RELATION ||
+			 tbinfo->relkind == RELKIND_MATVIEW))
+		{
 			appendPQExpBufferStr(q, "\n-- For binary upgrade, set heap's relfrozenxid and relminmxid\n");
 			appendPQExpBuffer(q, "UPDATE pg_catalog.pg_class\n"
 							  "SET relfrozenxid = '%u', relminmxid = '%u'\n"
 							  "WHERE oid = ",
 							  tbinfo->frozenxid, tbinfo->minmxid);
-			appendStringLiteralAH(q, fmtId(tbinfo->dobj.name), fout);
+			appendStringLiteralAH(q, qualrelname, fout);
 			appendPQExpBufferStr(q, "::pg_catalog.regclass;\n");
 
 			if (tbinfo->toast_oid)
 			{
-				/* We preserve the toast oids, so we can use it during restore */
+				/*
+				 * The toast table will have the same OID at restore, so we
+				 * can safely target it by OID.
+				 */
 				appendPQExpBufferStr(q, "\n-- For binary upgrade, set toast's relfrozenxid and relminmxid\n");
 				appendPQExpBuffer(q, "UPDATE pg_catalog.pg_class\n"
 								  "SET relfrozenxid = '%u', relminmxid = '%u'\n"
@@ -15644,7 +15750,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		 * In binary_upgrade mode, restore matviews' populated status by
 		 * poking pg_class directly.  This is pretty ugly, but we can't use
 		 * REFRESH MATERIALIZED VIEW since it's possible that some underlying
-		 * matview is not populated even though this matview is.
+		 * matview is not populated even though this matview is; in any case,
+		 * we want to transfer the matview's heap storage, not run REFRESH.
 		 */
 		if (dopt->binary_upgrade && tbinfo->relkind == RELKIND_MATVIEW &&
 			tbinfo->relispopulated)
@@ -15653,7 +15760,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			appendPQExpBufferStr(q, "UPDATE pg_catalog.pg_class\n"
 								 "SET relispopulated = 't'\n"
 								 "WHERE oid = ");
-			appendStringLiteralAH(q, fmtId(tbinfo->dobj.name), fout);
+			appendStringLiteralAH(q, qualrelname, fout);
 			appendPQExpBufferStr(q, "::pg_catalog.regclass;\n");
 		}
 
@@ -15676,7 +15783,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				tbinfo->notnull[j] && !tbinfo->inhNotNull[j])
 			{
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-								  fmtId(tbinfo->dobj.name));
+								  qualrelname);
 				appendPQExpBuffer(q, "ALTER COLUMN %s SET NOT NULL;\n",
 								  fmtId(tbinfo->attnames[j]));
 			}
@@ -15689,7 +15796,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			if (tbinfo->attstattarget[j] >= 0)
 			{
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-								  fmtId(tbinfo->dobj.name));
+								  qualrelname);
 				appendPQExpBuffer(q, "ALTER COLUMN %s ",
 								  fmtId(tbinfo->attnames[j]));
 				appendPQExpBuffer(q, "SET STATISTICS %d;\n",
@@ -15726,7 +15833,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				if (storage != NULL)
 				{
 					appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-									  fmtId(tbinfo->dobj.name));
+									  qualrelname);
 					appendPQExpBuffer(q, "ALTER COLUMN %s ",
 									  fmtId(tbinfo->attnames[j]));
 					appendPQExpBuffer(q, "SET STORAGE %s;\n",
@@ -15740,7 +15847,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 			if (tbinfo->attoptions[j] && tbinfo->attoptions[j][0] != '\0')
 			{
 				appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-								  fmtId(tbinfo->dobj.name));
+								  qualrelname);
 				appendPQExpBuffer(q, "ALTER COLUMN %s ",
 								  fmtId(tbinfo->attnames[j]));
 				appendPQExpBuffer(q, "SET (%s);\n",
@@ -15755,7 +15862,7 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 				tbinfo->attfdwoptions[j][0] != '\0')
 			{
 				appendPQExpBuffer(q, "ALTER FOREIGN TABLE %s ",
-								  fmtId(tbinfo->dobj.name));
+								  qualrelname);
 				appendPQExpBuffer(q, "ALTER COLUMN %s ",
 								  fmtId(tbinfo->attnames[j]));
 				appendPQExpBuffer(q, "OPTIONS (\n    %s\n);\n",
@@ -15779,25 +15886,27 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 		else if (tbinfo->relreplident == REPLICA_IDENTITY_NOTHING)
 		{
 			appendPQExpBuffer(q, "\nALTER TABLE ONLY %s REPLICA IDENTITY NOTHING;\n",
-							  fmtId(tbinfo->dobj.name));
+							  qualrelname);
 		}
 		else if (tbinfo->relreplident == REPLICA_IDENTITY_FULL)
 		{
 			appendPQExpBuffer(q, "\nALTER TABLE ONLY %s REPLICA IDENTITY FULL;\n",
-							  fmtId(tbinfo->dobj.name));
+							  qualrelname);
 		}
 	}
 
 	if (tbinfo->relkind == RELKIND_FOREIGN_TABLE && tbinfo->hasoids)
 		appendPQExpBuffer(q, "\nALTER TABLE ONLY %s SET WITH OIDS;\n",
-						  fmtId(tbinfo->dobj.name));
+						  qualrelname);
 
 	if (tbinfo->forcerowsec)
 		appendPQExpBuffer(q, "\nALTER TABLE ONLY %s FORCE ROW LEVEL SECURITY;\n",
-						  fmtId(tbinfo->dobj.name));
+						  qualrelname);
 
 	if (dopt->binary_upgrade)
-		binary_upgrade_extension_member(q, &tbinfo->dobj, labelq->data);
+		binary_upgrade_extension_member(q, &tbinfo->dobj,
+										reltypename, qrelname,
+										tbinfo->dobj.namespace->dobj.name);
 
 	if (tbinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
@@ -15836,7 +15945,8 @@ dumpTableSchema(Archive *fout, TableInfo *tbinfo)
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qrelname);
+	free(qualrelname);
 }
 
 /*
@@ -15850,6 +15960,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
 	int			adnum = adinfo->adnum;
 	PQExpBuffer q;
 	PQExpBuffer delq;
+	char	   *qualrelname;
 	char	   *tag;
 
 	/* Skip if table definition not to be dumped */
@@ -15863,19 +15974,16 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
 
+	qualrelname = pg_strdup(fmtQualifiedDumpable(tbinfo));
+
 	appendPQExpBuffer(q, "ALTER TABLE ONLY %s ",
-					  fmtId(tbinfo->dobj.name));
+					  qualrelname);
 	appendPQExpBuffer(q, "ALTER COLUMN %s SET DEFAULT %s;\n",
 					  fmtId(tbinfo->attnames[adnum - 1]),
 					  adinfo->adef_expr);
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
-	appendPQExpBuffer(delq, "ALTER TABLE %s.",
-					  fmtId(tbinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s ",
-					  fmtId(tbinfo->dobj.name));
+	appendPQExpBuffer(delq, "ALTER TABLE %s ",
+					  qualrelname);
 	appendPQExpBuffer(delq, "ALTER COLUMN %s DROP DEFAULT;\n",
 					  fmtId(tbinfo->attnames[adnum - 1]));
 
@@ -15895,6 +16003,7 @@ dumpAttrDef(Archive *fout, AttrDefInfo *adinfo)
 	free(tag);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
+	free(qualrelname);
 }
 
 /*
@@ -15943,17 +16052,15 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 	bool		is_constraint = (indxinfo->indexconstraint != 0);
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	char	   *qindxname;
 
 	if (dopt->dataOnly)
 		return;
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
 
-	appendPQExpBuffer(labelq, "INDEX %s",
-					  fmtId(indxinfo->dobj.name));
+	qindxname = pg_strdup(fmtId(indxinfo->dobj.name));
 
 	/*
 	 * If there's an associated constraint, don't dump the index per se, but
@@ -15975,28 +16082,24 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 		if (indxinfo->indisclustered)
 		{
 			appendPQExpBuffer(q, "\nALTER TABLE %s CLUSTER",
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
+			/* index name is not qualified in this syntax */
 			appendPQExpBuffer(q, " ON %s;\n",
-							  fmtId(indxinfo->dobj.name));
+							  qindxname);
 		}
 
 		/* If the index defines identity, we need to record that. */
 		if (indxinfo->indisreplident)
 		{
 			appendPQExpBuffer(q, "\nALTER TABLE ONLY %s REPLICA IDENTITY USING",
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
+			/* index name is not qualified in this syntax */
 			appendPQExpBuffer(q, " INDEX %s;\n",
-							  fmtId(indxinfo->dobj.name));
+							  qindxname);
 		}
 
-		/*
-		 * DROP must be fully qualified in case same name appears in
-		 * pg_catalog
-		 */
-		appendPQExpBuffer(delq, "DROP INDEX %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delq, "%s;\n",
-						  fmtId(indxinfo->dobj.name));
+		appendPQExpBuffer(delq, "DROP INDEX %s;\n",
+						  fmtQualifiedDumpable(indxinfo));
 
 		if (indxinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 			ArchiveEntry(fout, indxinfo->dobj.catId, indxinfo->dobj.dumpId,
@@ -16012,7 +16115,7 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 
 	/* Dump Index Comments */
 	if (indxinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "INDEX", qindxname,
 					tbinfo->dobj.namespace->dobj.name,
 					tbinfo->rolname,
 					indxinfo->dobj.catId, 0,
@@ -16021,7 +16124,39 @@ dumpIndex(Archive *fout, IndxInfo *indxinfo)
 
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	free(qindxname);
+}
+
+/*
+ * dumpIndexAttach
+ *	  write out to fout a partitioned-index attachment clause
+ */
+static void
+dumpIndexAttach(Archive *fout, IndexAttachInfo *attachinfo)
+{
+	if (fout->dopt->dataOnly)
+		return;
+
+	if (attachinfo->partitionIdx->dobj.dump & DUMP_COMPONENT_DEFINITION)
+	{
+		PQExpBuffer q = createPQExpBuffer();
+
+		appendPQExpBuffer(q, "\nALTER INDEX %s ",
+						  fmtQualifiedDumpable(attachinfo->parentIdx));
+		appendPQExpBuffer(q, "ATTACH PARTITION %s;\n",
+						  fmtQualifiedDumpable(attachinfo->partitionIdx));
+
+		ArchiveEntry(fout, attachinfo->dobj.catId, attachinfo->dobj.dumpId,
+					 attachinfo->dobj.name,
+					 NULL, NULL,
+					 "",
+					 false, "INDEX ATTACH", SECTION_POST_DATA,
+					 q->data, "", NULL,
+					 NULL, 0,
+					 NULL, NULL);
+
+		destroyPQExpBuffer(q);
+	}
 }
 
 /*
@@ -16032,35 +16167,44 @@ static void
 dumpStatisticsExt(Archive *fout, StatsExtInfo *statsextinfo)
 {
 	DumpOptions *dopt = fout->dopt;
-	TableInfo  *tbinfo = statsextinfo->statsexttable;
 	PQExpBuffer q;
 	PQExpBuffer delq;
-	PQExpBuffer labelq;
+	PQExpBuffer query;
+	char	   *qstatsextname;
+	PGresult   *res;
+	char	   *stxdef;
 
-	if (dopt->dataOnly)
+	/* Skip if not to be dumped */
+	if (!statsextinfo->dobj.dump || dopt->dataOnly)
 		return;
 
 	q = createPQExpBuffer();
 	delq = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+	query = createPQExpBuffer();
+
+	qstatsextname = pg_strdup(fmtId(statsextinfo->dobj.name));
+
+	appendPQExpBuffer(query, "SELECT "
+					  "pg_catalog.pg_get_statisticsobjdef('%u'::pg_catalog.oid)",
+					  statsextinfo->dobj.catId.oid);
+
+	res = ExecuteSqlQueryForSingleRow(fout, query->data);
 
-	appendPQExpBuffer(labelq, "STATISTICS %s",
-					  fmtId(statsextinfo->dobj.name));
+	stxdef = PQgetvalue(res, 0, 0);
 
-	appendPQExpBuffer(q, "%s;\n", statsextinfo->statsextdef);
+	/* Result of pg_get_statisticsobjdef is complete except for semicolon */
+	appendPQExpBuffer(q, "%s;\n", stxdef);
 
-	appendPQExpBuffer(delq, "DROP STATISTICS %s.",
-					  fmtId(tbinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delq, "%s;\n",
-					  fmtId(statsextinfo->dobj.name));
+	appendPQExpBuffer(delq, "DROP STATISTICS %s;\n",
+					  fmtQualifiedDumpable(statsextinfo));
 
 	if (statsextinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, statsextinfo->dobj.catId,
 					 statsextinfo->dobj.dumpId,
 					 statsextinfo->dobj.name,
-					 tbinfo->dobj.namespace->dobj.name,
+					 statsextinfo->dobj.namespace->dobj.name,
 					 NULL,
-					 tbinfo->rolname, false,
+					 statsextinfo->rolname, false,
 					 "STATISTICS", SECTION_POST_DATA,
 					 q->data, delq->data, NULL,
 					 NULL, 0,
@@ -16068,15 +16212,17 @@ dumpStatisticsExt(Archive *fout, StatsExtInfo *statsextinfo)
 
 	/* Dump Statistics Comments */
 	if (statsextinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
-					tbinfo->dobj.namespace->dobj.name,
-					tbinfo->rolname,
+		dumpComment(fout, "STATISTICS", qstatsextname,
+					statsextinfo->dobj.namespace->dobj.name,
+					statsextinfo->rolname,
 					statsextinfo->dobj.catId, 0,
 					statsextinfo->dobj.dumpId);
 
+	PQclear(res);
 	destroyPQExpBuffer(q);
 	destroyPQExpBuffer(delq);
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(query);
+	free(qstatsextname);
 }
 
 /*
@@ -16118,7 +16264,7 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 											 indxinfo->dobj.catId.oid, true);
 
 		appendPQExpBuffer(q, "ALTER TABLE ONLY %s\n",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 		appendPQExpBuffer(q, "    ADD CONSTRAINT %s ",
 						  fmtId(coninfo->dobj.name));
 
@@ -16168,19 +16314,14 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 		if (indxinfo->indisclustered)
 		{
 			appendPQExpBuffer(q, "\nALTER TABLE %s CLUSTER",
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
+			/* index name is not qualified in this syntax */
 			appendPQExpBuffer(q, " ON %s;\n",
 							  fmtId(indxinfo->dobj.name));
 		}
 
-		/*
-		 * DROP must be fully qualified in case same name appears in
-		 * pg_catalog
-		 */
-		appendPQExpBuffer(delq, "ALTER TABLE ONLY %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delq, "%s ",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delq, "ALTER TABLE ONLY %s ",
+						  fmtQualifiedDumpable(tbinfo));
 		appendPQExpBuffer(delq, "DROP CONSTRAINT %s;\n",
 						  fmtId(coninfo->dobj.name));
 
@@ -16204,19 +16345,13 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 		 * current table data is not processed
 		 */
 		appendPQExpBuffer(q, "ALTER TABLE ONLY %s\n",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 		appendPQExpBuffer(q, "    ADD CONSTRAINT %s %s;\n",
 						  fmtId(coninfo->dobj.name),
 						  coninfo->condef);
 
-		/*
-		 * DROP must be fully qualified in case same name appears in
-		 * pg_catalog
-		 */
-		appendPQExpBuffer(delq, "ALTER TABLE ONLY %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delq, "%s ",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delq, "ALTER TABLE ONLY %s ",
+						  fmtQualifiedDumpable(tbinfo));
 		appendPQExpBuffer(delq, "DROP CONSTRAINT %s;\n",
 						  fmtId(coninfo->dobj.name));
 
@@ -16242,19 +16377,13 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 		{
 			/* not ONLY since we want it to propagate to children */
 			appendPQExpBuffer(q, "ALTER TABLE %s\n",
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
 			appendPQExpBuffer(q, "    ADD CONSTRAINT %s %s;\n",
 							  fmtId(coninfo->dobj.name),
 							  coninfo->condef);
 
-			/*
-			 * DROP must be fully qualified in case same name appears in
-			 * pg_catalog
-			 */
-			appendPQExpBuffer(delq, "ALTER TABLE %s.",
-							  fmtId(tbinfo->dobj.namespace->dobj.name));
-			appendPQExpBuffer(delq, "%s ",
-							  fmtId(tbinfo->dobj.name));
+			appendPQExpBuffer(delq, "ALTER TABLE %s ",
+							  fmtQualifiedDumpable(tbinfo));
 			appendPQExpBuffer(delq, "DROP CONSTRAINT %s;\n",
 							  fmtId(coninfo->dobj.name));
 
@@ -16281,19 +16410,13 @@ dumpConstraint(Archive *fout, ConstraintInfo *coninfo)
 		if (coninfo->separate)
 		{
 			appendPQExpBuffer(q, "ALTER DOMAIN %s\n",
-							  fmtId(tyinfo->dobj.name));
+							  fmtQualifiedDumpable(tyinfo));
 			appendPQExpBuffer(q, "    ADD CONSTRAINT %s %s;\n",
 							  fmtId(coninfo->dobj.name),
 							  coninfo->condef);
 
-			/*
-			 * DROP must be fully qualified in case same name appears in
-			 * pg_catalog
-			 */
-			appendPQExpBuffer(delq, "ALTER DOMAIN %s.",
-							  fmtId(tyinfo->dobj.namespace->dobj.name));
-			appendPQExpBuffer(delq, "%s ",
-							  fmtId(tyinfo->dobj.name));
+			appendPQExpBuffer(delq, "ALTER DOMAIN %s ",
+							  fmtQualifiedDumpable(tyinfo));
 			appendPQExpBuffer(delq, "DROP CONSTRAINT %s;\n",
 							  fmtId(coninfo->dobj.name));
 
@@ -16338,21 +16461,23 @@ static void
 dumpTableConstraintComment(Archive *fout, ConstraintInfo *coninfo)
 {
 	TableInfo  *tbinfo = coninfo->contable;
-	PQExpBuffer labelq = createPQExpBuffer();
+	PQExpBuffer conprefix = createPQExpBuffer();
+	char	   *qtabname;
 
-	appendPQExpBuffer(labelq, "CONSTRAINT %s ",
+	qtabname = pg_strdup(fmtId(tbinfo->dobj.name));
+
+	appendPQExpBuffer(conprefix, "CONSTRAINT %s ON",
 					  fmtId(coninfo->dobj.name));
-	appendPQExpBuffer(labelq, "ON %s",
-					  fmtId(tbinfo->dobj.name));
 
 	if (coninfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, conprefix->data, qtabname,
 					tbinfo->dobj.namespace->dobj.name,
 					tbinfo->rolname,
 					coninfo->dobj.catId, 0,
 					coninfo->separate ? coninfo->dobj.dumpId : tbinfo->dobj.dumpId);
 
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(conprefix);
+	free(qtabname);
 }
 
 /*
@@ -16399,51 +16524,48 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 			   *seqtype;
 	bool		cycled;
 	bool		is_ascending;
+	int64		default_minv,
+				default_maxv;
+	char		bufm[32],
+				bufx[32];
 	PQExpBuffer query = createPQExpBuffer();
 	PQExpBuffer delqry = createPQExpBuffer();
-	PQExpBuffer labelq = createPQExpBuffer();
+	char	   *qseqname;
+
+	qseqname = pg_strdup(fmtId(tbinfo->dobj.name));
 
 	if (fout->remoteVersion >= 100000)
 	{
-		/* Make sure we are in proper schema */
-		selectSourceSchema(fout, "pg_catalog");
-
 		appendPQExpBuffer(query,
 						  "SELECT format_type(seqtypid, NULL), "
 						  "seqstart, seqincrement, "
 						  "seqmax, seqmin, "
 						  "seqcache, seqcycle "
-						  "FROM pg_class c "
-						  "JOIN pg_sequence s ON (s.seqrelid = c.oid) "
-						  "WHERE c.oid = '%u'::oid",
+						  "FROM pg_catalog.pg_sequence "
+						  "WHERE seqrelid = '%u'::oid",
 						  tbinfo->dobj.catId.oid);
 	}
 	else if (fout->remoteVersion >= 80400)
 	{
 		/*
-		 * Before PostgreSQL 10, sequence metadata is in the sequence itself,
-		 * so switch to the sequence's schema instead of pg_catalog.
+		 * Before PostgreSQL 10, sequence metadata is in the sequence itself.
+		 *
+		 * Note: it might seem that 'bigint' potentially needs to be
+		 * schema-qualified, but actually that's a keyword.
 		 */
-
-		/* Make sure we are in proper schema */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		appendPQExpBuffer(query,
-						  "SELECT 'bigint'::name AS sequence_type, "
+						  "SELECT 'bigint' AS sequence_type, "
 						  "start_value, increment_by, max_value, min_value, "
 						  "cache_value, is_cycled FROM %s",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 	}
 	else
 	{
-		/* Make sure we are in proper schema */
-		selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 		appendPQExpBuffer(query,
-						  "SELECT 'bigint'::name AS sequence_type, "
+						  "SELECT 'bigint' AS sequence_type, "
 						  "0 AS start_value, increment_by, max_value, min_value, "
 						  "cache_value, is_cycled FROM %s",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 	}
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
@@ -16465,50 +16587,49 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 	cache = PQgetvalue(res, 0, 5);
 	cycled = (strcmp(PQgetvalue(res, 0, 6), "t") == 0);
 
-	is_ascending = incby[0] != '-';
-
-	if (is_ascending && atoi(minv) == 1)
-		minv = NULL;
-	if (!is_ascending && atoi(maxv) == -1)
-		maxv = NULL;
-
+	/* Calculate default limits for a sequence of this type */
+	is_ascending = (incby[0] != '-');
 	if (strcmp(seqtype, "smallint") == 0)
 	{
-		if (!is_ascending && atoi(minv) == PG_INT16_MIN)
-			minv = NULL;
-		if (is_ascending && atoi(maxv) == PG_INT16_MAX)
-			maxv = NULL;
+		default_minv = is_ascending ? 1 : PG_INT16_MIN;
+		default_maxv = is_ascending ? PG_INT16_MAX : -1;
 	}
 	else if (strcmp(seqtype, "integer") == 0)
 	{
-		if (!is_ascending && atoi(minv) == PG_INT32_MIN)
-			minv = NULL;
-		if (is_ascending && atoi(maxv) == PG_INT32_MAX)
-			maxv = NULL;
+		default_minv = is_ascending ? 1 : PG_INT32_MIN;
+		default_maxv = is_ascending ? PG_INT32_MAX : -1;
 	}
 	else if (strcmp(seqtype, "bigint") == 0)
 	{
-		char		bufm[100],
-					bufx[100];
+		default_minv = is_ascending ? 1 : PG_INT64_MIN;
+		default_maxv = is_ascending ? PG_INT64_MAX : -1;
+	}
+	else
+	{
+		exit_horribly(NULL, "unrecognized sequence type: %s\n", seqtype);
+		default_minv = default_maxv = 0;	/* keep compiler quiet */
+	}
 
-		snprintf(bufm, sizeof(bufm), INT64_FORMAT, PG_INT64_MIN);
-		snprintf(bufx, sizeof(bufx), INT64_FORMAT, PG_INT64_MAX);
+	/*
+	 * 64-bit strtol() isn't very portable, so convert the limits to strings
+	 * and compare that way.
+	 */
+	snprintf(bufm, sizeof(bufm), INT64_FORMAT, default_minv);
+	snprintf(bufx, sizeof(bufx), INT64_FORMAT, default_maxv);
 
-		if (!is_ascending && strcmp(minv, bufm) == 0)
-			minv = NULL;
-		if (is_ascending && strcmp(maxv, bufx) == 0)
-			maxv = NULL;
-	}
+	/* Don't print minv/maxv if they match the respective default limit */
+	if (strcmp(minv, bufm) == 0)
+		minv = NULL;
+	if (strcmp(maxv, bufx) == 0)
+		maxv = NULL;
 
 	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
+	 * Identity sequences are not to be dropped separately.
 	 */
 	if (!tbinfo->is_identity_sequence)
 	{
-		appendPQExpBuffer(delqry, "DROP SEQUENCE %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delqry, "%s;\n",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delqry, "DROP SEQUENCE %s;\n",
+						  fmtQualifiedDumpable(tbinfo));
 	}
 
 	resetPQExpBuffer(query);
@@ -16527,7 +16648,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 
 		appendPQExpBuffer(query,
 						  "ALTER TABLE %s ",
-						  fmtId(owning_tab->dobj.name));
+						  fmtQualifiedDumpable(owning_tab));
 		appendPQExpBuffer(query,
 						  "ALTER COLUMN %s ADD GENERATED ",
 						  fmtId(owning_tab->attnames[tbinfo->owning_col - 1]));
@@ -16536,13 +16657,13 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 		else if (owning_tab->attidentity[tbinfo->owning_col - 1] == ATTRIBUTE_IDENTITY_BY_DEFAULT)
 			appendPQExpBuffer(query, "BY DEFAULT");
 		appendPQExpBuffer(query, " AS IDENTITY (\n    SEQUENCE NAME %s\n",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 	}
 	else
 	{
 		appendPQExpBuffer(query,
 						  "CREATE SEQUENCE %s\n",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 
 		if (strcmp(seqtype, "bigint") != 0)
 			appendPQExpBuffer(query, "    AS %s\n", seqtype);
@@ -16572,13 +16693,12 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 	else
 		appendPQExpBufferStr(query, ";\n");
 
-	appendPQExpBuffer(labelq, "SEQUENCE %s", fmtId(tbinfo->dobj.name));
-
 	/* binary_upgrade:	no need to clear TOAST table oid */
 
 	if (dopt->binary_upgrade)
 		binary_upgrade_extension_member(query, &tbinfo->dobj,
-										labelq->data);
+										"SEQUENCE", qseqname,
+										tbinfo->dobj.namespace->dobj.name);
 
 	if (tbinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, tbinfo->dobj.catId, tbinfo->dobj.dumpId,
@@ -16615,9 +16735,9 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 		{
 			resetPQExpBuffer(query);
 			appendPQExpBuffer(query, "ALTER SEQUENCE %s",
-							  fmtId(tbinfo->dobj.name));
+							  fmtQualifiedDumpable(tbinfo));
 			appendPQExpBuffer(query, " OWNED BY %s",
-							  fmtId(owning_tab->dobj.name));
+							  fmtQualifiedDumpable(owning_tab));
 			appendPQExpBuffer(query, ".%s;\n",
 							  fmtId(owning_tab->attnames[tbinfo->owning_col - 1]));
 
@@ -16636,12 +16756,12 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 
 	/* Dump Sequence Comments and Security Labels */
 	if (tbinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "SEQUENCE", qseqname,
 					tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
 					tbinfo->dobj.catId, 0, tbinfo->dobj.dumpId);
 
 	if (tbinfo->dobj.dump & DUMP_COMPONENT_SECLABEL)
-		dumpSecLabel(fout, labelq->data,
+		dumpSecLabel(fout, "SEQUENCE", qseqname,
 					 tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
 					 tbinfo->dobj.catId, 0, tbinfo->dobj.dumpId);
 
@@ -16649,7 +16769,7 @@ dumpSequence(Archive *fout, TableInfo *tbinfo)
 
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(labelq);
+	free(qseqname);
 }
 
 /*
@@ -16665,12 +16785,9 @@ dumpSequenceData(Archive *fout, TableDataInfo *tdinfo)
 	bool		called;
 	PQExpBuffer query = createPQExpBuffer();
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 	appendPQExpBuffer(query,
 					  "SELECT last_value, is_called FROM %s",
-					  fmtId(tbinfo->dobj.name));
+					  fmtQualifiedDumpable(tbinfo));
 
 	res = ExecuteSqlQuery(fout, query->data, PGRES_TUPLES_OK);
 
@@ -16688,7 +16805,7 @@ dumpSequenceData(Archive *fout, TableDataInfo *tdinfo)
 
 	resetPQExpBuffer(query);
 	appendPQExpBufferStr(query, "SELECT pg_catalog.setval(");
-	appendStringLiteralAH(query, fmtId(tbinfo->dobj.name), fout);
+	appendStringLiteralAH(query, fmtQualifiedDumpable(tbinfo), fout);
 	appendPQExpBuffer(query, ", %s, %s);\n",
 					  last, (called ? "true" : "false"));
 
@@ -16719,7 +16836,8 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 	TableInfo  *tbinfo = tginfo->tgtable;
 	PQExpBuffer query;
 	PQExpBuffer delqry;
-	PQExpBuffer labelq;
+	PQExpBuffer trigprefix;
+	char	   *qtabname;
 	char	   *tgargs;
 	size_t		lentgargs;
 	const char *p;
@@ -16735,17 +16853,14 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 
 	query = createPQExpBuffer();
 	delqry = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+	trigprefix = createPQExpBuffer();
+
+	qtabname = pg_strdup(fmtId(tbinfo->dobj.name));
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	appendPQExpBuffer(delqry, "DROP TRIGGER %s ",
 					  fmtId(tginfo->dobj.name));
-	appendPQExpBuffer(delqry, "ON %s.",
-					  fmtId(tbinfo->dobj.namespace->dobj.name));
-	appendPQExpBuffer(delqry, "%s;\n",
-					  fmtId(tbinfo->dobj.name));
+	appendPQExpBuffer(delqry, "ON %s;\n",
+					  fmtQualifiedDumpable(tbinfo));
 
 	if (tginfo->tgdef)
 	{
@@ -16809,7 +16924,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 			findx++;
 		}
 		appendPQExpBuffer(query, " ON %s\n",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 
 		if (tginfo->tgisconstraint)
 		{
@@ -16867,7 +16982,7 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 	if (tginfo->tgenabled != 't' && tginfo->tgenabled != 'O')
 	{
 		appendPQExpBuffer(query, "\nALTER TABLE %s ",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 		switch (tginfo->tgenabled)
 		{
 			case 'D':
@@ -16888,10 +17003,8 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 						  fmtId(tginfo->dobj.name));
 	}
 
-	appendPQExpBuffer(labelq, "TRIGGER %s ",
+	appendPQExpBuffer(trigprefix, "TRIGGER %s ON",
 					  fmtId(tginfo->dobj.name));
-	appendPQExpBuffer(labelq, "ON %s",
-					  fmtId(tbinfo->dobj.name));
 
 	tag = psprintf("%s %s", tbinfo->dobj.name, tginfo->dobj.name);
 
@@ -16907,14 +17020,15 @@ dumpTrigger(Archive *fout, TriggerInfo *tginfo)
 					 NULL, NULL);
 
 	if (tginfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, trigprefix->data, qtabname,
 					tbinfo->dobj.namespace->dobj.name, tbinfo->rolname,
 					tginfo->dobj.catId, 0, tginfo->dobj.dumpId);
 
 	free(tag);
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(trigprefix);
+	free(qtabname);
 }
 
 /*
@@ -16927,7 +17041,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 	DumpOptions *dopt = fout->dopt;
 	PQExpBuffer query;
 	PQExpBuffer delqry;
-	PQExpBuffer labelq;
+	char	   *qevtname;
 
 	/* Skip if not to be dumped */
 	if (!evtinfo->dobj.dump || dopt->dataOnly)
@@ -16935,10 +17049,11 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 
 	query = createPQExpBuffer();
 	delqry = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+
+	qevtname = pg_strdup(fmtId(evtinfo->dobj.name));
 
 	appendPQExpBufferStr(query, "CREATE EVENT TRIGGER ");
-	appendPQExpBufferStr(query, fmtId(evtinfo->dobj.name));
+	appendPQExpBufferStr(query, qevtname);
 	appendPQExpBufferStr(query, " ON ");
 	appendPQExpBufferStr(query, fmtId(evtinfo->evtevent));
 
@@ -16956,7 +17071,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 	if (evtinfo->evtenabled != 'O')
 	{
 		appendPQExpBuffer(query, "\nALTER EVENT TRIGGER %s ",
-						  fmtId(evtinfo->dobj.name));
+						  qevtname);
 		switch (evtinfo->evtenabled)
 		{
 			case 'D':
@@ -16976,10 +17091,7 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 	}
 
 	appendPQExpBuffer(delqry, "DROP EVENT TRIGGER %s;\n",
-					  fmtId(evtinfo->dobj.name));
-
-	appendPQExpBuffer(labelq, "EVENT TRIGGER %s",
-					  fmtId(evtinfo->dobj.name));
+					  qevtname);
 
 	if (evtinfo->dobj.dump & DUMP_COMPONENT_DEFINITION)
 		ArchiveEntry(fout, evtinfo->dobj.catId, evtinfo->dobj.dumpId,
@@ -16991,13 +17103,13 @@ dumpEventTrigger(Archive *fout, EventTriggerInfo *evtinfo)
 					 NULL, NULL);
 
 	if (evtinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, "EVENT TRIGGER", qevtname,
 					NULL, evtinfo->evtowner,
 					evtinfo->dobj.catId, 0, evtinfo->dobj.dumpId);
 
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(delqry);
-	destroyPQExpBuffer(labelq);
+	free(qevtname);
 }
 
 /*
@@ -17013,7 +17125,8 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 	PQExpBuffer query;
 	PQExpBuffer cmd;
 	PQExpBuffer delcmd;
-	PQExpBuffer labelq;
+	PQExpBuffer ruleprefix;
+	char	   *qtabname;
 	PGresult   *res;
 	char	   *tag;
 
@@ -17034,15 +17147,12 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 	 */
 	is_view = (rinfo->ev_type == '1' && rinfo->is_instead);
 
-	/*
-	 * Make sure we are in proper schema.
-	 */
-	selectSourceSchema(fout, tbinfo->dobj.namespace->dobj.name);
-
 	query = createPQExpBuffer();
 	cmd = createPQExpBuffer();
 	delcmd = createPQExpBuffer();
-	labelq = createPQExpBuffer();
+	ruleprefix = createPQExpBuffer();
+
+	qtabname = pg_strdup(fmtId(tbinfo->dobj.name));
 
 	if (is_view)
 	{
@@ -17053,7 +17163,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 		 * Otherwise this should look largely like the regular view dump code.
 		 */
 		appendPQExpBuffer(cmd, "CREATE OR REPLACE VIEW %s",
-						  fmtId(tbinfo->dobj.name));
+						  fmtQualifiedDumpable(tbinfo));
 		if (nonemptyReloptions(tbinfo->reloptions))
 		{
 			appendPQExpBufferStr(cmd, " WITH (");
@@ -17095,7 +17205,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 	 */
 	if (rinfo->ev_enabled != 'O')
 	{
-		appendPQExpBuffer(cmd, "ALTER TABLE %s ", fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(cmd, "ALTER TABLE %s ", fmtQualifiedDumpable(tbinfo));
 		switch (rinfo->ev_enabled)
 		{
 			case 'A':
@@ -17113,9 +17223,6 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 		}
 	}
 
-	/*
-	 * DROP must be fully qualified in case same name appears in pg_catalog
-	 */
 	if (is_view)
 	{
 		/*
@@ -17125,9 +17232,8 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 		 */
 		PQExpBuffer result;
 
-		appendPQExpBuffer(delcmd, "CREATE OR REPLACE VIEW %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBufferStr(delcmd, fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delcmd, "CREATE OR REPLACE VIEW %s",
+						  fmtQualifiedDumpable(tbinfo));
 		result = createDummyViewAsClause(fout, tbinfo);
 		appendPQExpBuffer(delcmd, " AS\n%s;\n", result->data);
 		destroyPQExpBuffer(result);
@@ -17136,16 +17242,12 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 	{
 		appendPQExpBuffer(delcmd, "DROP RULE %s ",
 						  fmtId(rinfo->dobj.name));
-		appendPQExpBuffer(delcmd, "ON %s.",
-						  fmtId(tbinfo->dobj.namespace->dobj.name));
-		appendPQExpBuffer(delcmd, "%s;\n",
-						  fmtId(tbinfo->dobj.name));
+		appendPQExpBuffer(delcmd, "ON %s;\n",
+						  fmtQualifiedDumpable(tbinfo));
 	}
 
-	appendPQExpBuffer(labelq, "RULE %s",
+	appendPQExpBuffer(ruleprefix, "RULE %s ON",
 					  fmtId(rinfo->dobj.name));
-	appendPQExpBuffer(labelq, " ON %s",
-					  fmtId(tbinfo->dobj.name));
 
 	tag = psprintf("%s %s", tbinfo->dobj.name, rinfo->dobj.name);
 
@@ -17162,7 +17264,7 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 
 	/* Dump rule comments */
 	if (rinfo->dobj.dump & DUMP_COMPONENT_COMMENT)
-		dumpComment(fout, labelq->data,
+		dumpComment(fout, ruleprefix->data, qtabname,
 					tbinfo->dobj.namespace->dobj.name,
 					tbinfo->rolname,
 					rinfo->dobj.catId, 0, rinfo->dobj.dumpId);
@@ -17171,7 +17273,8 @@ dumpRule(Archive *fout, RuleInfo *rinfo)
 	destroyPQExpBuffer(query);
 	destroyPQExpBuffer(cmd);
 	destroyPQExpBuffer(delcmd);
-	destroyPQExpBuffer(labelq);
+	destroyPQExpBuffer(ruleprefix);
+	free(qtabname);
 }
 
 /*
@@ -17203,9 +17306,6 @@ getExtensionMembership(Archive *fout, ExtensionInfo extinfo[],
 	if (numExtensions == 0)
 		return;
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	query = createPQExpBuffer();
 
 	/* refclassid constraint is redundant but may speed the search */
@@ -17405,9 +17505,6 @@ processExtensionTables(Archive *fout, ExtensionInfo extinfo[],
 	 * recreated after the data has been loaded.
 	 */
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	query = createPQExpBuffer();
 
 	printfPQExpBuffer(query,
@@ -17475,9 +17572,6 @@ getDependencies(Archive *fout)
 	if (g_verbose)
 		write_msg(NULL, "reading dependency data\n");
 
-	/* Make sure we are in proper schema */
-	selectSourceSchema(fout, "pg_catalog");
-
 	query = createPQExpBuffer();
 
 	/*
@@ -17652,6 +17746,7 @@ addBoundaryDependencies(DumpableObject **dobjs, int numObjs,
 				addObjectDependency(postDataBound, dobj->dumpId);
 				break;
 			case DO_INDEX:
+			case DO_INDEX_ATTACH:
 			case DO_STATSEXT:
 			case DO_REFRESH_MATVIEW:
 			case DO_TRIGGER:
@@ -17805,46 +17900,14 @@ findDumpableDependencies(ArchiveHandle *AH, DumpableObject *dobj,
 }
 
 
-/*
- * selectSourceSchema - make the specified schema the active search path
- * in the source database.
- *
- * NB: pg_catalog is explicitly searched after the specified schema;
- * so user names are only qualified if they are cross-schema references,
- * and system names are only qualified if they conflict with a user name
- * in the current schema.
- *
- * Whenever the selected schema is not pg_catalog, be careful to qualify
- * references to system catalogs and types in our emitted commands!
- *
- * This function is called only from selectSourceSchemaOnAH and
- * selectSourceSchema.
- */
-static void
-selectSourceSchema(Archive *fout, const char *schemaName)
-{
-	PQExpBuffer query;
-
-	/* This is checked by the callers already */
-	Assert(schemaName != NULL && *schemaName != '\0');
-
-	query = createPQExpBuffer();
-	appendPQExpBuffer(query, "SET search_path = %s",
-					  fmtId(schemaName));
-	if (strcmp(schemaName, "pg_catalog") != 0)
-		appendPQExpBufferStr(query, ", pg_catalog");
-
-	ExecuteSqlStatement(fout, query->data);
-
-	destroyPQExpBuffer(query);
-}
-
 /*
  * getFormattedTypeName - retrieve a nicely-formatted type name for the
- * given type name.
+ * given type OID.
+ *
+ * This does not guarantee to schema-qualify the output, so it should not
+ * be used to create the target object name for CREATE or ALTER commands.
  *
- * NB: the result may depend on the currently-selected search_path; this is
- * why we don't try to cache the names.
+ * TODO: there might be some value in caching the results.
  */
 static char *
 getFormattedTypeName(Archive *fout, Oid oid, OidOptions opts)
diff --git a/src/bin/pg_dump/pg_dump.h b/src/bin/pg_dump/pg_dump.h
index e7593e6da7..a4d6d926a8 100644
--- a/src/bin/pg_dump/pg_dump.h
+++ b/src/bin/pg_dump/pg_dump.h
@@ -3,7 +3,7 @@
  * pg_dump.h
  *	  Common header file for the pg_dump utility
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_dump/pg_dump.h
@@ -56,6 +56,7 @@ typedef enum
 	DO_TABLE,
 	DO_ATTRDEF,
 	DO_INDEX,
+	DO_INDEX_ATTACH,
 	DO_STATSEXT,
 	DO_RULE,
 	DO_TRIGGER,
@@ -328,6 +329,8 @@ typedef struct _tableInfo
 	 */
 	int			numParents;		/* number of (immediate) parent tables */
 	struct _tableInfo **parents;	/* TableInfos of immediate parents */
+	int			numIndexes;		/* number of indexes */
+	struct _indxInfo *indexes;	/* indexes */
 	struct _tableDataInfo *dataObj; /* TableDataInfo, if dumping its data */
 	int			numTriggers;	/* number of triggers for table */
 	struct _triggerInfo *triggers;	/* array of TriggerInfo structs */
@@ -339,7 +342,7 @@ typedef struct _attrDefInfo
 	TableInfo  *adtable;		/* link to table of attribute */
 	int			adnum;
 	char	   *adef_expr;		/* decompiled DEFAULT expression */
-	bool		separate;		/* TRUE if must dump as separate item */
+	bool		separate;		/* true if must dump as separate item */
 } AttrDefInfo;
 
 typedef struct _tableDataInfo
@@ -361,16 +364,23 @@ typedef struct _indxInfo
 	Oid		   *indkeys;
 	bool		indisclustered;
 	bool		indisreplident;
+	Oid			parentidx;		/* if partitioned, parent index OID */
 	/* if there is an associated constraint object, its dumpId: */
 	DumpId		indexconstraint;
 	int			relpages;		/* relpages of the underlying table */
 } IndxInfo;
 
+typedef struct _indexAttachInfo
+{
+	DumpableObject dobj;
+	IndxInfo   *parentIdx;		/* link to index on partitioned table */
+	IndxInfo   *partitionIdx;	/* link to index on partition */
+} IndexAttachInfo;
+
 typedef struct _statsExtInfo
 {
 	DumpableObject dobj;
-	TableInfo  *statsexttable;	/* link to table the stats ext is for */
-	char	   *statsextdef;
+	char	   *rolname;		/* name of owner, or empty string */
 } StatsExtInfo;
 
 typedef struct _ruleInfo
@@ -380,7 +390,7 @@ typedef struct _ruleInfo
 	char		ev_type;
 	bool		is_instead;
 	char		ev_enabled;
-	bool		separate;		/* TRUE if must dump as separate item */
+	bool		separate;		/* true if must dump as separate item */
 	/* separate is always true for non-ON SELECT rules */
 } RuleInfo;
 
@@ -430,10 +440,10 @@ typedef struct _constraintInfo
 	char	   *condef;			/* definition, if CHECK or FOREIGN KEY */
 	Oid			confrelid;		/* referenced table, if FOREIGN KEY */
 	DumpId		conindex;		/* identifies associated index if any */
-	bool		condeferrable;	/* TRUE if constraint is DEFERRABLE */
-	bool		condeferred;	/* TRUE if constraint is INITIALLY DEFERRED */
-	bool		conislocal;		/* TRUE if constraint has local definition */
-	bool		separate;		/* TRUE if must dump as separate item */
+	bool		condeferrable;	/* true if constraint is DEFERRABLE */
+	bool		condeferred;	/* true if constraint is INITIALLY DEFERRED */
+	bool		conislocal;		/* true if constraint has local definition */
+	bool		separate;		/* true if must dump as separate item */
 } ConstraintInfo;
 
 typedef struct _procLangInfo
@@ -683,7 +693,7 @@ extern TableInfo *getTables(Archive *fout, int *numTables);
 extern void getOwnedSeqs(Archive *fout, TableInfo tblinfo[], int numTables);
 extern InhInfo *getInherits(Archive *fout, int *numInherits);
 extern void getIndexes(Archive *fout, TableInfo tblinfo[], int numTables);
-extern void getExtendedStatistics(Archive *fout, TableInfo tblinfo[], int numTables);
+extern void getExtendedStatistics(Archive *fout);
 extern void getConstraints(Archive *fout, TableInfo tblinfo[], int numTables);
 extern RuleInfo *getRules(Archive *fout, int *numRules);
 extern void getTriggers(Archive *fout, TableInfo tblinfo[], int numTables);
diff --git a/src/bin/pg_dump/pg_dump_sort.c b/src/bin/pg_dump/pg_dump_sort.c
index 5044a76787..5ce3c5d485 100644
--- a/src/bin/pg_dump/pg_dump_sort.c
+++ b/src/bin/pg_dump/pg_dump_sort.c
@@ -4,7 +4,7 @@
  *	  Sort the items of a dump into a safe order for dumping
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -35,6 +35,10 @@ static const char *modulename = gettext_noop("sorter");
  * pg_dump.c; that is, PRE_DATA objects must sort before DO_PRE_DATA_BOUNDARY,
  * POST_DATA objects must sort after DO_POST_DATA_BOUNDARY, and DATA objects
  * must sort between them.
+ *
+ * Note: sortDataAndIndexObjectsBySize wants to have all DO_TABLE_DATA and
+ * DO_INDEX objects in contiguous chunks, so do not reuse the values for those
+ * for other object types.
  */
 static const int dbObjectTypePriority[] =
 {
@@ -53,11 +57,12 @@ static const int dbObjectTypePriority[] =
 	18,							/* DO_TABLE */
 	20,							/* DO_ATTRDEF */
 	28,							/* DO_INDEX */
-	29,							/* DO_STATSEXT */
-	30,							/* DO_RULE */
-	31,							/* DO_TRIGGER */
+	29,							/* DO_INDEX_ATTACH */
+	30,							/* DO_STATSEXT */
+	31,							/* DO_RULE */
+	32,							/* DO_TRIGGER */
 	27,							/* DO_CONSTRAINT */
-	32,							/* DO_FK_CONSTRAINT */
+	33,							/* DO_FK_CONSTRAINT */
 	2,							/* DO_PROCLANG */
 	10,							/* DO_CAST */
 	23,							/* DO_TABLE_DATA */
@@ -69,18 +74,18 @@ static const int dbObjectTypePriority[] =
 	15,							/* DO_TSCONFIG */
 	16,							/* DO_FDW */
 	17,							/* DO_FOREIGN_SERVER */
-	32,							/* DO_DEFAULT_ACL */
+	33,							/* DO_DEFAULT_ACL */
 	3,							/* DO_TRANSFORM */
 	21,							/* DO_BLOB */
 	25,							/* DO_BLOB_DATA */
 	22,							/* DO_PRE_DATA_BOUNDARY */
 	26,							/* DO_POST_DATA_BOUNDARY */
-	33,							/* DO_EVENT_TRIGGER */
-	38,							/* DO_REFRESH_MATVIEW */
-	34,							/* DO_POLICY */
-	35,							/* DO_PUBLICATION */
-	36,							/* DO_PUBLICATION_REL */
-	37							/* DO_SUBSCRIPTION */
+	34,							/* DO_EVENT_TRIGGER */
+	39,							/* DO_REFRESH_MATVIEW */
+	35,							/* DO_POLICY */
+	36,							/* DO_PUBLICATION */
+	37,							/* DO_PUBLICATION_REL */
+	38							/* DO_SUBSCRIPTION */
 };
 
 static DumpId preDataBoundId;
@@ -342,13 +347,13 @@ sortDumpableObjects(DumpableObject **objs, int numObjs,
  * The input is the list of numObjs objects in objs[].  This list is not
  * modified.
  *
- * Returns TRUE if able to build an ordering that satisfies all the
- * constraints, FALSE if not (there are contradictory constraints).
+ * Returns true if able to build an ordering that satisfies all the
+ * constraints, false if not (there are contradictory constraints).
  *
- * On success (TRUE result), ordering[] is filled with a sorted array of
+ * On success (true result), ordering[] is filled with a sorted array of
  * DumpableObject pointers, of length equal to the input list length.
  *
- * On failure (FALSE result), ordering[] is filled with an unsorted array of
+ * On failure (false result), ordering[] is filled with an unsorted array of
  * DumpableObject pointers of length *nOrdering, listing the objects that
  * prevented the sort from being completed.  In general, these objects either
  * participate directly in a dependency cycle, or are depended on by objects
@@ -937,6 +942,13 @@ repairDomainConstraintMultiLoop(DumpableObject *domainobj,
 	addObjectDependency(constraintobj, postDataBoundId);
 }
 
+static void
+repairIndexLoop(DumpableObject *partedindex,
+				DumpableObject *partindex)
+{
+	removeObjectDependency(partedindex, partindex->dumpId);
+}
+
 /*
  * Fix a dependency loop, or die trying ...
  *
@@ -1099,6 +1111,23 @@ repairDependencyLoop(DumpableObject **loop,
 		return;
 	}
 
+	/* index on partitioned table and corresponding index on partition */
+	if (nLoop == 2 &&
+		loop[0]->objType == DO_INDEX &&
+		loop[1]->objType == DO_INDEX)
+	{
+		if (((IndxInfo *) loop[0])->parentidx == loop[1]->catId.oid)
+		{
+			repairIndexLoop(loop[0], loop[1]);
+			return;
+		}
+		else if (((IndxInfo *) loop[1])->parentidx == loop[0]->catId.oid)
+		{
+			repairIndexLoop(loop[1], loop[0]);
+			return;
+		}
+	}
+
 	/* Indirect loop involving table and attribute default */
 	if (nLoop > 2)
 	{
@@ -1292,6 +1321,11 @@ describeDumpableObject(DumpableObject *obj, char *buf, int bufsize)
 					 "INDEX %s  (ID %d OID %u)",
 					 obj->name, obj->dumpId, obj->catId.oid);
 			return;
+		case DO_INDEX_ATTACH:
+			snprintf(buf, bufsize,
+					 "INDEX ATTACH %s  (ID %d)",
+					 obj->name, obj->dumpId);
+			return;
 		case DO_STATSEXT:
 			snprintf(buf, bufsize,
 					 "STATISTICS %s  (ID %d OID %u)",
diff --git a/src/bin/pg_dump/pg_dumpall.c b/src/bin/pg_dump/pg_dumpall.c
index 806b537e64..75e4a539bf 100644
--- a/src/bin/pg_dump/pg_dumpall.c
+++ b/src/bin/pg_dump/pg_dumpall.c
@@ -2,7 +2,7 @@
  *
  * pg_dumpall.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * pg_dumpall forces all pg_dump output to be text, since it also outputs
@@ -23,6 +23,7 @@
 #include "dumputils.h"
 #include "pg_backup.h"
 #include "common/file_utils.h"
+#include "fe_utils/connect.h"
 #include "fe_utils/string_utils.h"
 
 /* version string we expect back from pg_dump */
@@ -38,20 +39,14 @@ static void dumpGroups(PGconn *conn);
 static void dropTablespaces(PGconn *conn);
 static void dumpTablespaces(PGconn *conn);
 static void dropDBs(PGconn *conn);
-static void dumpCreateDB(PGconn *conn);
-static void dumpDatabaseConfig(PGconn *conn, const char *dbname);
 static void dumpUserConfig(PGconn *conn, const char *username);
-static void dumpDbRoleConfig(PGconn *conn);
-static void makeAlterConfigCommand(PGconn *conn, const char *arrayitem,
-					   const char *type, const char *name, const char *type2,
-					   const char *name2);
 static void dumpDatabases(PGconn *conn);
 static void dumpTimestamp(const char *msg);
-
-static int	runPgDump(const char *dbname);
-static void buildShSecLabels(PGconn *conn, const char *catalog_name,
-				 uint32 objectId, PQExpBuffer buffer,
-				 const char *target, const char *objname);
+static int	runPgDump(const char *dbname, const char *create_opts);
+static void buildShSecLabels(PGconn *conn,
+				 const char *catalog_name, Oid objectId,
+				 const char *objtype, const char *objname,
+				 PQExpBuffer buffer);
 static PGconn *connectDatabase(const char *dbname, const char *connstr, const char *pghost, const char *pgport,
 				const char *pguser, trivalue prompt_password, bool fail_on_error);
 static char *constructConnStr(const char **keywords, const char **values);
@@ -62,6 +57,7 @@ static char pg_dump_bin[MAXPGPATH];
 static const char *progname;
 static PQExpBuffer pgdumpopts;
 static char *connstr = "";
+static bool output_clean = false;
 static bool skip_acls = false;
 static bool verbose = false;
 static bool dosync = true;
@@ -74,6 +70,7 @@ static int	if_exists = 0;
 static int	inserts = 0;
 static int	no_tablespaces = 0;
 static int	use_setsessauth = 0;
+static int	no_comments = 0;
 static int	no_publications = 0;
 static int	no_security_labels = 0;
 static int	no_subscriptions = 0;
@@ -97,6 +94,7 @@ main(int argc, char *argv[])
 	static struct option long_options[] = {
 		{"data-only", no_argument, NULL, 'a'},
 		{"clean", no_argument, NULL, 'c'},
+		{"encoding", required_argument, NULL, 'E'},
 		{"file", required_argument, NULL, 'f'},
 		{"globals-only", no_argument, NULL, 'g'},
 		{"host", required_argument, NULL, 'h'},
@@ -132,6 +130,7 @@ main(int argc, char *argv[])
 		{"load-via-partition-root", no_argument, &load_via_partition_root, 1},
 		{"role", required_argument, NULL, 3},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"no-comments", no_argument, &no_comments, 1},
 		{"no-publications", no_argument, &no_publications, 1},
 		{"no-role-passwords", no_argument, &no_role_passwords, 1},
 		{"no-security-labels", no_argument, &no_security_labels, 1},
@@ -147,10 +146,10 @@ main(int argc, char *argv[])
 	char	   *pguser = NULL;
 	char	   *pgdb = NULL;
 	char	   *use_role = NULL;
+	const char *dumpencoding = NULL;
 	trivalue	prompt_password = TRI_DEFAULT;
 	bool		data_only = false;
 	bool		globals_only = false;
-	bool		output_clean = false;
 	bool		roles_only = false;
 	bool		tablespaces_only = false;
 	PGconn	   *conn;
@@ -204,7 +203,7 @@ main(int argc, char *argv[])
 
 	pgdumpopts = createPQExpBuffer();
 
-	while ((c = getopt_long(argc, argv, "acd:f:gh:l:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "acd:E:f:gh:l:oOp:rsS:tU:vwWx", long_options, &optindex)) != -1)
 	{
 		switch (c)
 		{
@@ -221,6 +220,12 @@ main(int argc, char *argv[])
 				connstr = pg_strdup(optarg);
 				break;
 
+			case 'E':
+				dumpencoding = pg_strdup(optarg);
+				appendPQExpBufferStr(pgdumpopts, " -E ");
+				appendShellString(pgdumpopts, optarg);
+				break;
+
 			case 'f':
 				filename = pg_strdup(optarg);
 				appendPQExpBufferStr(pgdumpopts, " -f ");
@@ -391,6 +396,8 @@ main(int argc, char *argv[])
 		appendPQExpBufferStr(pgdumpopts, " --load-via-partition-root");
 	if (use_setsessauth)
 		appendPQExpBufferStr(pgdumpopts, " --use-set-session-authorization");
+	if (no_comments)
+		appendPQExpBufferStr(pgdumpopts, " --no-comments");
 	if (no_publications)
 		appendPQExpBufferStr(pgdumpopts, " --no-publications");
 	if (no_security_labels)
@@ -453,6 +460,19 @@ main(int argc, char *argv[])
 	else
 		OPF = stdout;
 
+	/*
+	 * Set the client encoding if requested.
+	 */
+	if (dumpencoding)
+	{
+		if (PQsetClientEncoding(conn, dumpencoding) < 0)
+		{
+			fprintf(stderr, _("%s: invalid client encoding \"%s\" specified\n"),
+					progname, dumpencoding);
+			exit_nicely(1);
+		}
+	}
+
 	/*
 	 * Get the active encoding and the standard_conforming_strings setting, so
 	 * we know how to escape strings.
@@ -537,17 +557,6 @@ main(int argc, char *argv[])
 		/* Dump tablespaces */
 		if (!roles_only && !no_tablespaces)
 			dumpTablespaces(conn);
-
-		/* Dump CREATE DATABASE commands */
-		if (binary_upgrade || (!globals_only && !roles_only && !tablespaces_only))
-			dumpCreateDB(conn);
-
-		/* Dump role/database settings */
-		if (!tablespaces_only && !roles_only)
-		{
-			if (server_version >= 90000)
-				dumpDbRoleConfig(conn);
-		}
 	}
 
 	if (!globals_only && !roles_only && !tablespaces_only)
@@ -588,6 +597,7 @@ help(void)
 	printf(_("\nOptions controlling the output content:\n"));
 	printf(_("  -a, --data-only              dump only the data, not the schema\n"));
 	printf(_("  -c, --clean                  clean (drop) databases before recreating\n"));
+	printf(_("  -E, --encoding=ENCODING      dump the data in encoding ENCODING\n"));
 	printf(_("  -g, --globals-only           dump only global objects, no databases\n"));
 	printf(_("  -o, --oids                   include OIDs in dump\n"));
 	printf(_("  -O, --no-owner               skip restoration of object ownership\n"));
@@ -602,6 +612,7 @@ help(void)
 	printf(_("  --disable-triggers           disable triggers during data-only restore\n"));
 	printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
 	printf(_("  --inserts                    dump data as INSERT commands, rather than COPY\n"));
+	printf(_("  --no-comments                do not dump comments\n"));
 	printf(_("  --no-publications            do not dump publications\n"));
 	printf(_("  --no-role-passwords          do not dump passwords for roles\n"));
 	printf(_("  --no-security-labels         do not dump security label assignments\n"));
@@ -910,7 +921,7 @@ dumpRoles(PGconn *conn)
 
 		appendPQExpBufferStr(buf, ";\n");
 
-		if (!PQgetisnull(res, i, i_rolcomment))
+		if (!no_comments && !PQgetisnull(res, i, i_rolcomment))
 		{
 			appendPQExpBuffer(buf, "COMMENT ON ROLE %s IS ", fmtId(rolename));
 			appendStringLiteralConn(buf, PQgetvalue(res, i, i_rolcomment), conn);
@@ -919,7 +930,8 @@ dumpRoles(PGconn *conn)
 
 		if (!no_security_labels && server_version >= 90200)
 			buildShSecLabels(conn, "pg_authid", auth_oid,
-							 buf, "ROLE", rolename);
+							 "ROLE", rolename,
+							 buf);
 
 		fprintf(OPF, "%s", buf->data);
 	}
@@ -1182,7 +1194,7 @@ dumpTablespaces(PGconn *conn)
 	for (i = 0; i < PQntuples(res); i++)
 	{
 		PQExpBuffer buf = createPQExpBuffer();
-		uint32		spcoid = atooid(PQgetvalue(res, i, 0));
+		Oid			spcoid = atooid(PQgetvalue(res, i, 0));
 		char	   *spcname = PQgetvalue(res, i, 1);
 		char	   *spcowner = PQgetvalue(res, i, 2);
 		char	   *spclocation = PQgetvalue(res, i, 3);
@@ -1207,16 +1219,17 @@ dumpTablespaces(PGconn *conn)
 							  fspcname, spcoptions);
 
 		if (!skip_acls &&
-			!buildACLCommands(fspcname, NULL, "TABLESPACE", spcacl, rspcacl,
+			!buildACLCommands(fspcname, NULL, NULL, "TABLESPACE",
+							  spcacl, rspcacl,
 							  spcowner, "", server_version, buf))
 		{
 			fprintf(stderr, _("%s: could not parse ACL list (%s) for tablespace \"%s\"\n"),
-					progname, spcacl, fspcname);
+					progname, spcacl, spcname);
 			PQfinish(conn);
 			exit_nicely(1);
 		}
 
-		if (spccomment && strlen(spccomment))
+		if (!no_comments && spccomment && spccomment[0] != '\0')
 		{
 			appendPQExpBuffer(buf, "COMMENT ON TABLESPACE %s IS ", fspcname);
 			appendStringLiteralConn(buf, spccomment, conn);
@@ -1225,7 +1238,8 @@ dumpTablespaces(PGconn *conn)
 
 		if (!no_security_labels && server_version >= 90200)
 			buildShSecLabels(conn, "pg_tablespace", spcoid,
-							 buf, "TABLESPACE", fspcname);
+							 "TABLESPACE", spcname,
+							 buf);
 
 		fprintf(OPF, "%s", buf->data);
 
@@ -1240,8 +1254,6 @@ dumpTablespaces(PGconn *conn)
 
 /*
  * Dump commands to drop each database.
- *
- * This should match the set of databases targeted by dumpCreateDB().
  */
 static void
 dropDBs(PGconn *conn)
@@ -1249,24 +1261,30 @@ dropDBs(PGconn *conn)
 	PGresult   *res;
 	int			i;
 
+	/*
+	 * Skip databases marked not datallowconn, since we'd be unable to connect
+	 * to them anyway.  This must agree with dumpDatabases().
+	 */
 	res = executeQuery(conn,
 					   "SELECT datname "
 					   "FROM pg_database d "
-					   "WHERE datallowconn ORDER BY 1");
+					   "WHERE datallowconn "
+					   "ORDER BY datname");
 
 	if (PQntuples(res) > 0)
-		fprintf(OPF, "--\n-- Drop databases\n--\n\n");
+		fprintf(OPF, "--\n-- Drop databases (except postgres and template1)\n--\n\n");
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
 		char	   *dbname = PQgetvalue(res, i, 0);
 
 		/*
-		 * Skip "template1" and "postgres"; the restore script is almost
-		 * certainly going to be run in one or the other, and we don't know
-		 * which.  This must agree with dumpCreateDB's choices!
+		 * Skip "postgres" and "template1"; dumpDatabases() will deal with
+		 * them specially.  Also, be sure to skip "template0", even if for
+		 * some reason it's not marked !datallowconn.
 		 */
 		if (strcmp(dbname, "template1") != 0 &&
+			strcmp(dbname, "template0") != 0 &&
 			strcmp(dbname, "postgres") != 0)
 		{
 			fprintf(OPF, "DROP DATABASE %s%s;\n",
@@ -1280,323 +1298,6 @@ dropDBs(PGconn *conn)
 	fprintf(OPF, "\n\n");
 }
 
-/*
- * Dump commands to create each database.
- *
- * To minimize the number of reconnections (and possibly ensuing
- * password prompts) required by the output script, we emit all CREATE
- * DATABASE commands during the initial phase of the script, and then
- * run pg_dump for each database to dump the contents of that
- * database.  We skip databases marked not datallowconn, since we'd be
- * unable to connect to them anyway (and besides, we don't want to
- * dump template0).
- */
-static void
-dumpCreateDB(PGconn *conn)
-{
-	PQExpBuffer buf = createPQExpBuffer();
-	char	   *default_encoding = NULL;
-	char	   *default_collate = NULL;
-	char	   *default_ctype = NULL;
-	PGresult   *res;
-	int			i;
-
-	fprintf(OPF, "--\n-- Database creation\n--\n\n");
-
-	/*
-	 * First, get the installation's default encoding and locale information.
-	 * We will dump encoding and locale specifications in the CREATE DATABASE
-	 * commands for just those databases with values different from defaults.
-	 *
-	 * We consider template0's encoding and locale to define the installation
-	 * default.  Pre-8.4 installations do not have per-database locale
-	 * settings; for them, every database must necessarily be using the
-	 * installation default, so there's no need to do anything.
-	 */
-	if (server_version >= 80400)
-		res = executeQuery(conn,
-						   "SELECT pg_encoding_to_char(encoding), "
-						   "datcollate, datctype "
-						   "FROM pg_database "
-						   "WHERE datname = 'template0'");
-	else
-		res = executeQuery(conn,
-						   "SELECT pg_encoding_to_char(encoding), "
-						   "null::text AS datcollate, null::text AS datctype "
-						   "FROM pg_database "
-						   "WHERE datname = 'template0'");
-
-	/* If for some reason the template DB isn't there, treat as unknown */
-	if (PQntuples(res) > 0)
-	{
-		if (!PQgetisnull(res, 0, 0))
-			default_encoding = pg_strdup(PQgetvalue(res, 0, 0));
-		if (!PQgetisnull(res, 0, 1))
-			default_collate = pg_strdup(PQgetvalue(res, 0, 1));
-		if (!PQgetisnull(res, 0, 2))
-			default_ctype = pg_strdup(PQgetvalue(res, 0, 2));
-	}
-
-	PQclear(res);
-
-
-	/*
-	 * Now collect all the information about databases to dump.
-	 *
-	 * For the database ACLs, as of 9.6, we extract both the positive (as
-	 * datacl) and negative (as rdatacl) ACLs, relative to the default ACL for
-	 * databases, which are then passed to buildACLCommands() below.
-	 *
-	 * See buildACLQueries() and buildACLCommands().
-	 *
-	 * Note that we do not support initial privileges (pg_init_privs) on
-	 * databases.
-	 */
-	if (server_version >= 90600)
-		printfPQExpBuffer(buf,
-						  "SELECT datname, "
-						  "coalesce(rolname, (select rolname from %s where oid=(select datdba from pg_database where datname='template0'))), "
-						  "pg_encoding_to_char(d.encoding), "
-						  "datcollate, datctype, datfrozenxid, datminmxid, "
-						  "datistemplate, "
-						  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
-						  "  SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba))) AS acl "
-						  "  EXCEPT SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba))) as datacls)"
-						  "AS datacl, "
-						  "(SELECT pg_catalog.array_agg(acl ORDER BY acl::text COLLATE \"C\") FROM ( "
-						  "  SELECT pg_catalog.unnest(pg_catalog.acldefault('d',datdba)) AS acl "
-						  "  EXCEPT SELECT pg_catalog.unnest(coalesce(datacl,pg_catalog.acldefault('d',datdba)))) as rdatacls)"
-						  "AS rdatacl, "
-						  "datconnlimit, "
-						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
-						  "FROM pg_database d LEFT JOIN %s u ON (datdba = u.oid) "
-						  "WHERE datallowconn ORDER BY 1", role_catalog, role_catalog);
-	else if (server_version >= 90300)
-		printfPQExpBuffer(buf,
-						  "SELECT datname, "
-						  "coalesce(rolname, (select rolname from %s where oid=(select datdba from pg_database where datname='template0'))), "
-						  "pg_encoding_to_char(d.encoding), "
-						  "datcollate, datctype, datfrozenxid, datminmxid, "
-						  "datistemplate, datacl, '' as rdatacl, "
-						  "datconnlimit, "
-						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
-						  "FROM pg_database d LEFT JOIN %s u ON (datdba = u.oid) "
-						  "WHERE datallowconn ORDER BY 1", role_catalog, role_catalog);
-	else if (server_version >= 80400)
-		printfPQExpBuffer(buf,
-						  "SELECT datname, "
-						  "coalesce(rolname, (select rolname from %s where oid=(select datdba from pg_database where datname='template0'))), "
-						  "pg_encoding_to_char(d.encoding), "
-						  "datcollate, datctype, datfrozenxid, 0 AS datminmxid, "
-						  "datistemplate, datacl, '' as rdatacl, "
-						  "datconnlimit, "
-						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
-						  "FROM pg_database d LEFT JOIN %s u ON (datdba = u.oid) "
-						  "WHERE datallowconn ORDER BY 1", role_catalog, role_catalog);
-	else if (server_version >= 80100)
-		printfPQExpBuffer(buf,
-						  "SELECT datname, "
-						  "coalesce(rolname, (select rolname from %s where oid=(select datdba from pg_database where datname='template0'))), "
-						  "pg_encoding_to_char(d.encoding), "
-						  "null::text AS datcollate, null::text AS datctype, datfrozenxid, 0 AS datminmxid, "
-						  "datistemplate, datacl, '' as rdatacl, "
-						  "datconnlimit, "
-						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
-						  "FROM pg_database d LEFT JOIN %s u ON (datdba = u.oid) "
-						  "WHERE datallowconn ORDER BY 1", role_catalog, role_catalog);
-	else
-		printfPQExpBuffer(buf,
-						  "SELECT datname, "
-						  "coalesce(usename, (select usename from pg_shadow where usesysid=(select datdba from pg_database where datname='template0'))), "
-						  "pg_encoding_to_char(d.encoding), "
-						  "null::text AS datcollate, null::text AS datctype, datfrozenxid, 0 AS datminmxid, "
-						  "datistemplate, datacl, '' as rdatacl, "
-						  "-1 as datconnlimit, "
-						  "(SELECT spcname FROM pg_tablespace t WHERE t.oid = d.dattablespace) AS dattablespace "
-						  "FROM pg_database d LEFT JOIN pg_shadow u ON (datdba = usesysid) "
-						  "WHERE datallowconn ORDER BY 1");
-
-	res = executeQuery(conn, buf->data);
-
-	for (i = 0; i < PQntuples(res); i++)
-	{
-		char	   *dbname = PQgetvalue(res, i, 0);
-		char	   *dbowner = PQgetvalue(res, i, 1);
-		char	   *dbencoding = PQgetvalue(res, i, 2);
-		char	   *dbcollate = PQgetvalue(res, i, 3);
-		char	   *dbctype = PQgetvalue(res, i, 4);
-		uint32		dbfrozenxid = atooid(PQgetvalue(res, i, 5));
-		uint32		dbminmxid = atooid(PQgetvalue(res, i, 6));
-		char	   *dbistemplate = PQgetvalue(res, i, 7);
-		char	   *dbacl = PQgetvalue(res, i, 8);
-		char	   *rdbacl = PQgetvalue(res, i, 9);
-		char	   *dbconnlimit = PQgetvalue(res, i, 10);
-		char	   *dbtablespace = PQgetvalue(res, i, 11);
-		char	   *fdbname;
-
-		fdbname = pg_strdup(fmtId(dbname));
-
-		resetPQExpBuffer(buf);
-
-		/*
-		 * Skip the CREATE DATABASE commands for "template1" and "postgres",
-		 * since they are presumably already there in the destination cluster.
-		 * We do want to emit their ACLs and config options if any, however.
-		 */
-		if (strcmp(dbname, "template1") != 0 &&
-			strcmp(dbname, "postgres") != 0)
-		{
-			appendPQExpBuffer(buf, "CREATE DATABASE %s", fdbname);
-
-			appendPQExpBufferStr(buf, " WITH TEMPLATE = template0");
-
-			if (strlen(dbowner) != 0)
-				appendPQExpBuffer(buf, " OWNER = %s", fmtId(dbowner));
-
-			if (default_encoding && strcmp(dbencoding, default_encoding) != 0)
-			{
-				appendPQExpBufferStr(buf, " ENCODING = ");
-				appendStringLiteralConn(buf, dbencoding, conn);
-			}
-
-			if (default_collate && strcmp(dbcollate, default_collate) != 0)
-			{
-				appendPQExpBufferStr(buf, " LC_COLLATE = ");
-				appendStringLiteralConn(buf, dbcollate, conn);
-			}
-
-			if (default_ctype && strcmp(dbctype, default_ctype) != 0)
-			{
-				appendPQExpBufferStr(buf, " LC_CTYPE = ");
-				appendStringLiteralConn(buf, dbctype, conn);
-			}
-
-			/*
-			 * Output tablespace if it isn't the default.  For default, it
-			 * uses the default from the template database.  If tablespace is
-			 * specified and tablespace creation failed earlier, (e.g. no such
-			 * directory), the database creation will fail too.  One solution
-			 * would be to use 'SET default_tablespace' like we do in pg_dump
-			 * for setting non-default database locations.
-			 */
-			if (strcmp(dbtablespace, "pg_default") != 0 && !no_tablespaces)
-				appendPQExpBuffer(buf, " TABLESPACE = %s",
-								  fmtId(dbtablespace));
-
-			if (strcmp(dbistemplate, "t") == 0)
-				appendPQExpBuffer(buf, " IS_TEMPLATE = true");
-
-			if (strcmp(dbconnlimit, "-1") != 0)
-				appendPQExpBuffer(buf, " CONNECTION LIMIT = %s",
-								  dbconnlimit);
-
-			appendPQExpBufferStr(buf, ";\n");
-		}
-		else if (strcmp(dbtablespace, "pg_default") != 0 && !no_tablespaces)
-		{
-			/*
-			 * Cannot change tablespace of the database we're connected to, so
-			 * to move "postgres" to another tablespace, we connect to
-			 * "template1", and vice versa.
-			 */
-			if (strcmp(dbname, "postgres") == 0)
-				appendPQExpBuffer(buf, "\\connect template1\n");
-			else
-				appendPQExpBuffer(buf, "\\connect postgres\n");
-
-			appendPQExpBuffer(buf, "ALTER DATABASE %s SET TABLESPACE %s;\n",
-							  fdbname, fmtId(dbtablespace));
-
-			/* connect to original database */
-			appendPsqlMetaConnect(buf, dbname);
-		}
-
-		if (binary_upgrade)
-		{
-			appendPQExpBufferStr(buf, "-- For binary upgrade, set datfrozenxid and datminmxid.\n");
-			appendPQExpBuffer(buf, "UPDATE pg_catalog.pg_database "
-							  "SET datfrozenxid = '%u', datminmxid = '%u' "
-							  "WHERE datname = ",
-							  dbfrozenxid, dbminmxid);
-			appendStringLiteralConn(buf, dbname, conn);
-			appendPQExpBufferStr(buf, ";\n");
-		}
-
-		if (!skip_acls &&
-			!buildACLCommands(fdbname, NULL, "DATABASE",
-							  dbacl, rdbacl, dbowner,
-							  "", server_version, buf))
-		{
-			fprintf(stderr, _("%s: could not parse ACL list (%s) for database \"%s\"\n"),
-					progname, dbacl, fdbname);
-			PQfinish(conn);
-			exit_nicely(1);
-		}
-
-		fprintf(OPF, "%s", buf->data);
-
-		dumpDatabaseConfig(conn, dbname);
-
-		free(fdbname);
-	}
-
-	if (default_encoding)
-		free(default_encoding);
-	if (default_collate)
-		free(default_collate);
-	if (default_ctype)
-		free(default_ctype);
-
-	PQclear(res);
-	destroyPQExpBuffer(buf);
-
-	fprintf(OPF, "\n\n");
-}
-
-
-/*
- * Dump database-specific configuration
- */
-static void
-dumpDatabaseConfig(PGconn *conn, const char *dbname)
-{
-	PQExpBuffer buf = createPQExpBuffer();
-	int			count = 1;
-
-	for (;;)
-	{
-		PGresult   *res;
-
-		if (server_version >= 90000)
-			printfPQExpBuffer(buf, "SELECT setconfig[%d] FROM pg_db_role_setting WHERE "
-							  "setrole = 0 AND setdatabase = (SELECT oid FROM pg_database WHERE datname = ", count);
-		else
-			printfPQExpBuffer(buf, "SELECT datconfig[%d] FROM pg_database WHERE datname = ", count);
-		appendStringLiteralConn(buf, dbname, conn);
-
-		if (server_version >= 90000)
-			appendPQExpBufferChar(buf, ')');
-
-		res = executeQuery(conn, buf->data);
-		if (PQntuples(res) == 1 &&
-			!PQgetisnull(res, 0, 0))
-		{
-			makeAlterConfigCommand(conn, PQgetvalue(res, 0, 0),
-								   "DATABASE", dbname, NULL, NULL);
-			PQclear(res);
-			count++;
-		}
-		else
-		{
-			PQclear(res);
-			break;
-		}
-	}
-
-	destroyPQExpBuffer(buf);
-}
-
-
 
 /*
  * Dump user-specific configuration
@@ -1627,8 +1328,11 @@ dumpUserConfig(PGconn *conn, const char *username)
 		if (PQntuples(res) == 1 &&
 			!PQgetisnull(res, 0, 0))
 		{
+			resetPQExpBuffer(buf);
 			makeAlterConfigCommand(conn, PQgetvalue(res, 0, 0),
-								   "ROLE", username, NULL, NULL);
+								   "ROLE", username, NULL, NULL,
+								   buf);
+			fprintf(OPF, "%s", buf->data);
 			PQclear(res);
 			count++;
 		}
@@ -1643,85 +1347,6 @@ dumpUserConfig(PGconn *conn, const char *username)
 }
 
 
-/*
- * Dump user-and-database-specific configuration
- */
-static void
-dumpDbRoleConfig(PGconn *conn)
-{
-	PQExpBuffer buf = createPQExpBuffer();
-	PGresult   *res;
-	int			i;
-
-	printfPQExpBuffer(buf, "SELECT rolname, datname, unnest(setconfig) "
-					  "FROM pg_db_role_setting, %s u, pg_database "
-					  "WHERE setrole = u.oid AND setdatabase = pg_database.oid", role_catalog);
-	res = executeQuery(conn, buf->data);
-
-	if (PQntuples(res) > 0)
-	{
-		fprintf(OPF, "--\n-- Per-Database Role Settings \n--\n\n");
-
-		for (i = 0; i < PQntuples(res); i++)
-		{
-			makeAlterConfigCommand(conn, PQgetvalue(res, i, 2),
-								   "ROLE", PQgetvalue(res, i, 0),
-								   "DATABASE", PQgetvalue(res, i, 1));
-		}
-
-		fprintf(OPF, "\n\n");
-	}
-
-	PQclear(res);
-	destroyPQExpBuffer(buf);
-}
-
-
-/*
- * Helper function for dumpXXXConfig().
- */
-static void
-makeAlterConfigCommand(PGconn *conn, const char *arrayitem,
-					   const char *type, const char *name,
-					   const char *type2, const char *name2)
-{
-	char	   *pos;
-	char	   *mine;
-	PQExpBuffer buf;
-
-	mine = pg_strdup(arrayitem);
-	pos = strchr(mine, '=');
-	if (pos == NULL)
-	{
-		free(mine);
-		return;
-	}
-
-	buf = createPQExpBuffer();
-
-	*pos = 0;
-	appendPQExpBuffer(buf, "ALTER %s %s ", type, fmtId(name));
-	if (type2 != NULL && name2 != NULL)
-		appendPQExpBuffer(buf, "IN %s %s ", type2, fmtId(name2));
-	appendPQExpBuffer(buf, "SET %s TO ", fmtId(mine));
-
-	/*
-	 * Some GUC variable names are 'LIST' type and hence must not be quoted.
-	 */
-	if (pg_strcasecmp(mine, "DateStyle") == 0
-		|| pg_strcasecmp(mine, "search_path") == 0)
-		appendPQExpBufferStr(buf, pos + 1);
-	else
-		appendStringLiteralConn(buf, pos + 1, conn);
-	appendPQExpBufferStr(buf, ";\n");
-
-	fprintf(OPF, "%s", buf->data);
-	destroyPQExpBuffer(buf);
-	free(mine);
-}
-
-
-
 /*
  * Dump contents of databases.
  */
@@ -1731,38 +1356,62 @@ dumpDatabases(PGconn *conn)
 	PGresult   *res;
 	int			i;
 
-	res = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1");
+	/*
+	 * Skip databases marked not datallowconn, since we'd be unable to connect
+	 * to them anyway.  This must agree with dropDBs().
+	 *
+	 * We arrange for template1 to be processed first, then we process other
+	 * DBs in alphabetical order.  If we just did them all alphabetically, we
+	 * might find ourselves trying to drop the "postgres" database while still
+	 * connected to it.  This makes trying to run the restore script while
+	 * connected to "template1" a bad idea, but there's no fixed order that
+	 * doesn't have some failure mode with --clean.
+	 */
+	res = executeQuery(conn,
+					   "SELECT datname "
+					   "FROM pg_database d "
+					   "WHERE datallowconn "
+					   "ORDER BY (datname <> 'template1'), datname");
 
 	for (i = 0; i < PQntuples(res); i++)
 	{
+		char	   *dbname = PQgetvalue(res, i, 0);
+		const char *create_opts;
 		int			ret;
 
-		char	   *dbname = PQgetvalue(res, i, 0);
-		PQExpBufferData connectbuf;
+		/* Skip template0, even if it's not marked !datallowconn. */
+		if (strcmp(dbname, "template0") == 0)
+			continue;
 
 		if (verbose)
 			fprintf(stderr, _("%s: dumping database \"%s\"...\n"), progname, dbname);
 
-		initPQExpBuffer(&connectbuf);
-		appendPsqlMetaConnect(&connectbuf, dbname);
-		fprintf(OPF, "%s\n", connectbuf.data);
-		termPQExpBuffer(&connectbuf);
-
 		/*
-		 * Restore will need to write to the target cluster.  This connection
-		 * setting is emitted for pg_dumpall rather than in the code also used
-		 * by pg_dump, so that a cluster with databases or users which have
-		 * this flag turned on can still be replicated through pg_dumpall
-		 * without editing the file or stream.  With pg_dump there are many
-		 * other ways to allow the file to be used, and leaving it out allows
-		 * users to protect databases from being accidental restore targets.
+		 * We assume that "template1" and "postgres" already exist in the
+		 * target installation.  dropDBs() won't have removed them, for fear
+		 * of removing the DB the restore script is initially connected to. If
+		 * --clean was specified, tell pg_dump to drop and recreate them;
+		 * otherwise we'll merely restore their contents.  Other databases
+		 * should simply be created.
 		 */
-		fprintf(OPF, "SET default_transaction_read_only = off;\n\n");
+		if (strcmp(dbname, "template1") == 0 || strcmp(dbname, "postgres") == 0)
+		{
+			if (output_clean)
+				create_opts = "--clean --create";
+			else
+			{
+				create_opts = "";
+				/* Since pg_dump won't emit a \connect command, we must */
+				fprintf(OPF, "\\connect %s\n\n", dbname);
+			}
+		}
+		else
+			create_opts = "--create";
 
 		if (filename)
 			fclose(OPF);
 
-		ret = runPgDump(dbname);
+		ret = runPgDump(dbname, create_opts);
 		if (ret != 0)
 		{
 			fprintf(stderr, _("%s: pg_dump failed on database \"%s\", exiting\n"), progname, dbname);
@@ -1788,17 +1437,17 @@ dumpDatabases(PGconn *conn)
 
 
 /*
- * Run pg_dump on dbname.
+ * Run pg_dump on dbname, with specified options.
  */
 static int
-runPgDump(const char *dbname)
+runPgDump(const char *dbname, const char *create_opts)
 {
 	PQExpBuffer connstrbuf = createPQExpBuffer();
 	PQExpBuffer cmd = createPQExpBuffer();
 	int			ret;
 
-	appendPQExpBuffer(cmd, "\"%s\" %s", pg_dump_bin,
-					  pgdumpopts->data);
+	appendPQExpBuffer(cmd, "\"%s\" %s %s", pg_dump_bin,
+					  pgdumpopts->data, create_opts);
 
 	/*
 	 * If we have a filename, use the undocumented plain-append pg_dump
@@ -1837,19 +1486,23 @@ runPgDump(const char *dbname)
  *
  * Build SECURITY LABEL command(s) for a shared object
  *
- * The caller has to provide object type and identifier to select security
- * labels from pg_seclabels system view.
+ * The caller has to provide object type and identity in two separate formats:
+ * catalog_name (e.g., "pg_database") and object OID, as well as
+ * type name (e.g., "DATABASE") and object name (not pre-quoted).
+ *
+ * The command(s) are appended to "buffer".
  */
 static void
-buildShSecLabels(PGconn *conn, const char *catalog_name, uint32 objectId,
-				 PQExpBuffer buffer, const char *target, const char *objname)
+buildShSecLabels(PGconn *conn, const char *catalog_name, Oid objectId,
+				 const char *objtype, const char *objname,
+				 PQExpBuffer buffer)
 {
 	PQExpBuffer sql = createPQExpBuffer();
 	PGresult   *res;
 
 	buildShSecLabelQuery(conn, catalog_name, objectId, sql);
 	res = executeQuery(conn, sql->data);
-	emitShSecLabels(conn, res, buffer, target, objname);
+	emitShSecLabels(conn, res, buffer, objtype, objname);
 
 	PQclear(res);
 	destroyPQExpBuffer(sql);
@@ -2065,10 +1718,7 @@ connectDatabase(const char *dbname, const char *connection_string,
 		exit_nicely(1);
 	}
 
-	/*
-	 * Make sure we are not fooled by non-system schemas in the search path.
-	 */
-	executeCommand(conn, "SET search_path = pg_catalog");
+	PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL));
 
 	return conn;
 }
diff --git a/src/bin/pg_dump/pg_restore.c b/src/bin/pg_dump/pg_restore.c
index 860a211a3c..edc14f176f 100644
--- a/src/bin/pg_dump/pg_restore.c
+++ b/src/bin/pg_dump/pg_restore.c
@@ -71,6 +71,7 @@ main(int argc, char **argv)
 	static int	no_data_for_failed_tables = 0;
 	static int	outputNoTablespaces = 0;
 	static int	use_setsessauth = 0;
+	static int	no_comments = 0;
 	static int	no_publications = 0;
 	static int	no_security_labels = 0;
 	static int	no_subscriptions = 0;
@@ -119,6 +120,7 @@ main(int argc, char **argv)
 		{"section", required_argument, NULL, 3},
 		{"strict-names", no_argument, &strict_names, 1},
 		{"use-set-session-authorization", no_argument, &use_setsessauth, 1},
+		{"no-comments", no_argument, &no_comments, 1},
 		{"no-publications", no_argument, &no_publications, 1},
 		{"no-security-labels", no_argument, &no_security_labels, 1},
 		{"no-subscriptions", no_argument, &no_subscriptions, 1},
@@ -358,6 +360,7 @@ main(int argc, char **argv)
 	opts->noDataForFailedTables = no_data_for_failed_tables;
 	opts->noTablespace = outputNoTablespaces;
 	opts->use_setsessauth = use_setsessauth;
+	opts->no_comments = no_comments;
 	opts->no_publications = no_publications;
 	opts->no_security_labels = no_security_labels;
 	opts->no_subscriptions = no_subscriptions;
@@ -482,6 +485,7 @@ usage(const char *progname)
 	printf(_("  --if-exists                  use IF EXISTS when dropping objects\n"));
 	printf(_("  --no-data-for-failed-tables  do not restore data of tables that could not be\n"
 			 "                               created\n"));
+	printf(_("  --no-comments                do not dump comments\n"));
 	printf(_("  --no-publications            do not restore publications\n"));
 	printf(_("  --no-security-labels         do not restore security labels\n"));
 	printf(_("  --no-subscriptions           do not restore subscriptions\n"));
diff --git a/src/bin/pg_dump/t/002_pg_dump.pl b/src/bin/pg_dump/t/002_pg_dump.pl
index c492fbdc24..6f74e15805 100644
--- a/src/bin/pg_dump/t/002_pg_dump.pl
+++ b/src/bin/pg_dump/t/002_pg_dump.pl
@@ -460,7 +460,7 @@
 	'ALTER COLLATION test0 OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER COLLATION test0 OWNER TO .*;/m,
+		regexp    => qr/^ALTER COLLATION public.test0 OWNER TO .*;/m,
 		collation => 1,
 		like      => {
 			binary_upgrade           => 1,
@@ -604,7 +604,7 @@
 						 FUNCTION 1 (int4, int4) btint4cmp(int4,int4),
 						 FUNCTION 2 (int4, int4) btint4sortsupport(internal);',
 		regexp => qr/^
-			\QALTER OPERATOR FAMILY op_family USING btree ADD\E\n\s+
+			\QALTER OPERATOR FAMILY dump_test.op_family USING btree ADD\E\n\s+
 			\QOPERATOR 1 <(bigint,integer) ,\E\n\s+
 			\QOPERATOR 2 <=(bigint,integer) ,\E\n\s+
 			\QOPERATOR 3 =(bigint,integer) ,\E\n\s+
@@ -809,7 +809,7 @@
 	'ALTER SEQUENCE test_table_col1_seq' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QALTER SEQUENCE test_table_col1_seq OWNED BY test_table.col1;\E
+			\QALTER SEQUENCE dump_test.test_table_col1_seq OWNED BY dump_test.test_table.col1;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -842,7 +842,7 @@
 	'ALTER SEQUENCE test_third_table_col1_seq' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QALTER SEQUENCE test_third_table_col1_seq OWNED BY test_third_table.col1;\E
+			\QALTER SEQUENCE dump_test_second_schema.test_third_table_col1_seq OWNED BY dump_test_second_schema.test_third_table.col1;\E
 			/xm,
 		like => {
 			binary_upgrade           => 1,
@@ -876,7 +876,7 @@
 		all_runs  => 1,
 		catch_all => 'ALTER TABLE ... commands',
 		regexp    => qr/^
-			\QALTER TABLE ONLY test_table\E \n^\s+
+			\QALTER TABLE ONLY dump_test.test_table\E \n^\s+
 			\QADD CONSTRAINT test_table_pkey PRIMARY KEY (col1);\E
 			/xm,
 		like => {
@@ -911,7 +911,7 @@
 		create_sql =>
 'ALTER TABLE dump_test.test_table ALTER COLUMN col1 SET STATISTICS 90;',
 		regexp => qr/^
-			\QALTER TABLE ONLY test_table ALTER COLUMN col1 SET STATISTICS 90;\E\n
+			\QALTER TABLE ONLY dump_test.test_table ALTER COLUMN col1 SET STATISTICS 90;\E\n
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -945,7 +945,7 @@
 		create_sql =>
 'ALTER TABLE dump_test.test_table ALTER COLUMN col2 SET STORAGE EXTERNAL;',
 		regexp => qr/^
-			\QALTER TABLE ONLY test_table ALTER COLUMN col2 SET STORAGE EXTERNAL;\E\n
+			\QALTER TABLE ONLY dump_test.test_table ALTER COLUMN col2 SET STORAGE EXTERNAL;\E\n
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -979,7 +979,7 @@
 		create_sql =>
 'ALTER TABLE dump_test.test_table ALTER COLUMN col3 SET STORAGE MAIN;',
 		regexp => qr/^
-			\QALTER TABLE ONLY test_table ALTER COLUMN col3 SET STORAGE MAIN;\E\n
+			\QALTER TABLE ONLY dump_test.test_table ALTER COLUMN col3 SET STORAGE MAIN;\E\n
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1013,7 +1013,7 @@
 		create_sql =>
 'ALTER TABLE dump_test.test_table ALTER COLUMN col4 SET (n_distinct = 10);',
 		regexp => qr/^
-			\QALTER TABLE ONLY test_table ALTER COLUMN col4 SET (n_distinct=10);\E\n
+			\QALTER TABLE ONLY dump_test.test_table ALTER COLUMN col4 SET (n_distinct=10);\E\n
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1044,7 +1044,7 @@
 	  => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QALTER TABLE ONLY dump_test.measurement ATTACH PARTITION measurement_y2006m2 \E
+			\QALTER TABLE ONLY dump_test.measurement ATTACH PARTITION dump_test_second_schema.measurement_y2006m2 \E
 			\QFOR VALUES FROM ('2006-02-01') TO ('2006-03-01');\E\n
 			/xm,
 		like   => { binary_upgrade => 1, },
@@ -1081,7 +1081,7 @@
 		create_sql =>
 		  'ALTER TABLE dump_test.test_table CLUSTER ON test_table_pkey',
 		regexp => qr/^
-			\QALTER TABLE test_table CLUSTER ON test_table_pkey;\E\n
+			\QALTER TABLE dump_test.test_table CLUSTER ON test_table_pkey;\E\n
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1112,10 +1112,10 @@
 		all_runs => 1,
 		regexp   => qr/^
 			\QSET SESSION AUTHORIZATION 'test_superuser';\E\n\n
-			\QALTER TABLE test_table DISABLE TRIGGER ALL;\E\n\n
-			\QCOPY test_table (col1, col2, col3, col4) FROM stdin;\E
+			\QALTER TABLE dump_test.test_table DISABLE TRIGGER ALL;\E\n\n
+			\QCOPY dump_test.test_table (col1, col2, col3, col4) FROM stdin;\E
 			\n(?:\d\t\\N\t\\N\t\\N\n){9}\\\.\n\n\n
-			\QALTER TABLE test_table ENABLE TRIGGER ALL;\E/xm,
+			\QALTER TABLE dump_test.test_table ENABLE TRIGGER ALL;\E/xm,
 		like   => { data_only => 1, },
 		unlike => {
 			binary_upgrade           => 1,
@@ -1147,7 +1147,7 @@
 		all_runs  => 1,
 		catch_all => 'ALTER TABLE ... commands',
 		regexp    => qr/^
-			\QALTER FOREIGN TABLE foreign_table ALTER COLUMN c1 OPTIONS (\E\n
+			\QALTER FOREIGN TABLE dump_test.foreign_table ALTER COLUMN c1 OPTIONS (\E\n
 			\s+\Qcolumn_name 'col1'\E\n
 			\Q);\E\n
 			/xm,
@@ -1178,7 +1178,7 @@
 	'ALTER TABLE test_table OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER TABLE test_table OWNER TO .*;/m,
+		regexp    => qr/^ALTER TABLE dump_test.test_table OWNER TO .*;/m,
 		like      => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1207,7 +1207,7 @@
 		create_order => 23,
 		create_sql   => 'ALTER TABLE dump_test.test_table
 					   ENABLE ROW LEVEL SECURITY;',
-		regexp => qr/^ALTER TABLE test_table ENABLE ROW LEVEL SECURITY;/m,
+		regexp => qr/^ALTER TABLE dump_test.test_table ENABLE ROW LEVEL SECURITY;/m,
 		like   => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1235,7 +1235,7 @@
 	'ALTER TABLE test_second_table OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER TABLE test_second_table OWNER TO .*;/m,
+		regexp    => qr/^ALTER TABLE dump_test.test_second_table OWNER TO .*;/m,
 		like      => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1261,7 +1261,7 @@
 	'ALTER TABLE test_third_table OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER TABLE test_third_table OWNER TO .*;/m,
+		regexp    => qr/^ALTER TABLE dump_test_second_schema.test_third_table OWNER TO .*;/m,
 		like      => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -1287,7 +1287,7 @@
 	'ALTER TABLE measurement OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER TABLE measurement OWNER TO .*;/m,
+		regexp    => qr/^ALTER TABLE dump_test.measurement OWNER TO .*;/m,
 		like      => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1313,7 +1313,7 @@
 	'ALTER TABLE measurement_y2006m2 OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER TABLE measurement_y2006m2 OWNER TO .*;/m,
+		regexp    => qr/^ALTER TABLE dump_test_second_schema.measurement_y2006m2 OWNER TO .*;/m,
 		like      => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -1339,7 +1339,7 @@
 	'ALTER FOREIGN TABLE foreign_table OWNER TO' => {
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
-		regexp    => qr/^ALTER FOREIGN TABLE foreign_table OWNER TO .*;/m,
+		regexp    => qr/^ALTER FOREIGN TABLE dump_test.foreign_table OWNER TO .*;/m,
 		like      => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1366,7 +1366,7 @@
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
 		regexp =>
-		  qr/^ALTER TEXT SEARCH CONFIGURATION alt_ts_conf1 OWNER TO .*;/m,
+		  qr/^ALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1 OWNER TO .*;/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1393,7 +1393,7 @@
 		all_runs  => 1,
 		catch_all => 'ALTER ... OWNER commands (except post-data objects)',
 		regexp =>
-		  qr/^ALTER TEXT SEARCH DICTIONARY alt_ts_dict1 OWNER TO .*;/m,
+		  qr/^ALTER TEXT SEARCH DICTIONARY dump_test.alt_ts_dict1 OWNER TO .*;/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1420,7 +1420,7 @@
 	'ALTER ... OWNER commands (except post-data objects)' => {
 		all_runs => 0,    # catch-all
 		regexp =>
-qr/^ALTER (?!EVENT TRIGGER|LARGE OBJECT|PUBLICATION|SUBSCRIPTION)(.*) OWNER TO .*;/m,
+qr/^ALTER (?!EVENT TRIGGER|LARGE OBJECT|STATISTICS|PUBLICATION|SUBSCRIPTION)(.*) OWNER TO .*;/m,
 		like   => {},     # use more-specific options above
 		unlike => {
 			column_inserts           => 1,
@@ -1516,11 +1516,14 @@
 		all_runs  => 1,
 		catch_all => 'COMMENT commands',
 		regexp    => qr/^COMMENT ON DATABASE postgres IS .*;/m,
-		like      => {
+		# Should appear in the same tests as "CREATE DATABASE postgres"
+		like   => { createdb => 1, },
+		unlike => {
 			binary_upgrade           => 1,
 			clean                    => 1,
 			clean_if_exists          => 1,
-			createdb                 => 1,
+			column_inserts           => 1,
+			data_only                => 1,
 			defaults                 => 1,
 			exclude_dump_test_schema => 1,
 			exclude_test_table       => 1,
@@ -1528,47 +1531,48 @@
 			no_blobs                 => 1,
 			no_privs                 => 1,
 			no_owner                 => 1,
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
 			pg_dumpall_dbprivs       => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			role                     => 1,
 			schema_only              => 1,
 			section_pre_data         => 1,
-			with_oids                => 1, },
-		unlike => {
-			column_inserts         => 1,
-			data_only              => 1,
-			only_dump_test_schema  => 1,
-			only_dump_test_table   => 1,
-			role                   => 1,
-			section_post_data      => 1,
-			test_schema_plus_blobs => 1, }, },
+			section_data             => 1,
+			section_post_data        => 1,
+			test_schema_plus_blobs   => 1,
+			with_oids                => 1, }, },
 
 	'COMMENT ON EXTENSION plpgsql' => {
 		all_runs  => 1,
 		catch_all => 'COMMENT commands',
 		regexp    => qr/^COMMENT ON EXTENSION plpgsql IS .*;/m,
-		like      => {
+		# this shouldn't ever get emitted anymore
+		like      => {},
+		unlike => {
+			binary_upgrade           => 1,
 			clean                    => 1,
 			clean_if_exists          => 1,
+			column_inserts           => 1,
 			createdb                 => 1,
+			data_only                => 1,
 			defaults                 => 1,
 			exclude_dump_test_schema => 1,
 			exclude_test_table       => 1,
 			exclude_test_table_data  => 1,
 			no_blobs                 => 1,
-			no_privs                 => 1,
 			no_owner                 => 1,
+			no_privs                 => 1,
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
 			pg_dumpall_dbprivs       => 1,
+			role                     => 1,
 			schema_only              => 1,
+			section_post_data        => 1,
 			section_pre_data         => 1,
-			with_oids                => 1, },
-		unlike => {
-			binary_upgrade         => 1,
-			column_inserts         => 1,
-			data_only              => 1,
-			only_dump_test_schema  => 1,
-			only_dump_test_table   => 1,
-			role                   => 1,
-			section_post_data      => 1,
-			test_schema_plus_blobs => 1, }, },
+			test_schema_plus_blobs   => 1,
+			with_oids                => 1, }, },
 
 	'COMMENT ON TABLE dump_test.test_table' => {
 		all_runs     => 1,
@@ -1576,7 +1580,7 @@
 		create_order => 36,
 		create_sql   => 'COMMENT ON TABLE dump_test.test_table
 					   IS \'comment on table\';',
-		regexp => qr/^COMMENT ON TABLE test_table IS 'comment on table';/m,
+		regexp => qr/^COMMENT ON TABLE dump_test.test_table IS 'comment on table';/m,
 		like   => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1609,7 +1613,7 @@
 		create_sql   => 'COMMENT ON COLUMN dump_test.test_table.col1
 					   IS \'comment on column\';',
 		regexp => qr/^
-			\QCOMMENT ON COLUMN test_table.col1 IS 'comment on column';\E
+			\QCOMMENT ON COLUMN dump_test.test_table.col1 IS 'comment on column';\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1643,7 +1647,7 @@
 		create_sql   => 'COMMENT ON COLUMN dump_test.composite.f1
 					   IS \'comment on column of type\';',
 		regexp => qr/^
-			\QCOMMENT ON COLUMN composite.f1 IS 'comment on column of type';\E
+			\QCOMMENT ON COLUMN dump_test.composite.f1 IS 'comment on column of type';\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1677,7 +1681,7 @@
 		create_sql   => 'COMMENT ON COLUMN dump_test.test_second_table.col1
 					   IS \'comment on column col1\';',
 		regexp => qr/^
-			\QCOMMENT ON COLUMN test_second_table.col1 IS 'comment on column col1';\E
+			\QCOMMENT ON COLUMN dump_test.test_second_table.col1 IS 'comment on column col1';\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1711,7 +1715,7 @@
 		create_sql   => 'COMMENT ON COLUMN dump_test.test_second_table.col2
 					   IS \'comment on column col2\';',
 		regexp => qr/^
-			\QCOMMENT ON COLUMN test_second_table.col2 IS 'comment on column col2';\E
+			\QCOMMENT ON COLUMN dump_test.test_second_table.col2 IS 'comment on column col2';\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -1745,7 +1749,7 @@
 		create_sql   => 'COMMENT ON CONVERSION dump_test.test_conversion
 					   IS \'comment on test conversion\';',
 		regexp =>
-qr/^COMMENT ON CONVERSION test_conversion IS 'comment on test conversion';/m,
+qr/^COMMENT ON CONVERSION dump_test.test_conversion IS 'comment on test conversion';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1778,7 +1782,7 @@
 		create_sql   => 'COMMENT ON COLLATION test0
 					   IS \'comment on test0 collation\';',
 		regexp =>
-		  qr/^COMMENT ON COLLATION test0 IS 'comment on test0 collation';/m,
+		  qr/^COMMENT ON COLLATION public.test0 IS 'comment on test0 collation';/m,
 		collation => 1,
 		like      => {
 			binary_upgrade           => 1,
@@ -1924,7 +1928,7 @@
 		  'COMMENT ON TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1
 					   IS \'comment on text search configuration\';',
 		regexp =>
-qr/^COMMENT ON TEXT SEARCH CONFIGURATION alt_ts_conf1 IS 'comment on text search configuration';/m,
+qr/^COMMENT ON TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1 IS 'comment on text search configuration';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1958,7 +1962,7 @@
 		  'COMMENT ON TEXT SEARCH DICTIONARY dump_test.alt_ts_dict1
 					   IS \'comment on text search dictionary\';',
 		regexp =>
-qr/^COMMENT ON TEXT SEARCH DICTIONARY alt_ts_dict1 IS 'comment on text search dictionary';/m,
+qr/^COMMENT ON TEXT SEARCH DICTIONARY dump_test.alt_ts_dict1 IS 'comment on text search dictionary';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -1991,7 +1995,7 @@
 		create_sql   => 'COMMENT ON TEXT SEARCH PARSER dump_test.alt_ts_prs1
 					   IS \'comment on text search parser\';',
 		regexp =>
-qr/^COMMENT ON TEXT SEARCH PARSER alt_ts_prs1 IS 'comment on text search parser';/m,
+qr/^COMMENT ON TEXT SEARCH PARSER dump_test.alt_ts_prs1 IS 'comment on text search parser';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2024,7 +2028,7 @@
 		create_sql => 'COMMENT ON TEXT SEARCH TEMPLATE dump_test.alt_ts_temp1
 					   IS \'comment on text search template\';',
 		regexp =>
-qr/^COMMENT ON TEXT SEARCH TEMPLATE alt_ts_temp1 IS 'comment on text search template';/m,
+qr/^COMMENT ON TEXT SEARCH TEMPLATE dump_test.alt_ts_temp1 IS 'comment on text search template';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2056,7 +2060,7 @@
 		create_order => 68,
 		create_sql   => 'COMMENT ON TYPE dump_test.planets
 					   IS \'comment on enum type\';',
-		regexp => qr/^COMMENT ON TYPE planets IS 'comment on enum type';/m,
+		regexp => qr/^COMMENT ON TYPE dump_test.planets IS 'comment on enum type';/m,
 		like   => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2088,7 +2092,7 @@
 		create_order => 69,
 		create_sql   => 'COMMENT ON TYPE dump_test.textrange
 					   IS \'comment on range type\';',
-		regexp => qr/^COMMENT ON TYPE textrange IS 'comment on range type';/m,
+		regexp => qr/^COMMENT ON TYPE dump_test.textrange IS 'comment on range type';/m,
 		like   => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2120,7 +2124,7 @@
 		create_order => 70,
 		create_sql   => 'COMMENT ON TYPE dump_test.int42
 					   IS \'comment on regular type\';',
-		regexp => qr/^COMMENT ON TYPE int42 IS 'comment on regular type';/m,
+		regexp => qr/^COMMENT ON TYPE dump_test.int42 IS 'comment on regular type';/m,
 		like   => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2153,7 +2157,7 @@
 		create_sql   => 'COMMENT ON TYPE dump_test.undefined
 					   IS \'comment on undefined type\';',
 		regexp =>
-		  qr/^COMMENT ON TYPE undefined IS 'comment on undefined type';/m,
+		  qr/^COMMENT ON TYPE dump_test.undefined IS 'comment on undefined type';/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2196,7 +2200,7 @@
 		create_sql   => 'INSERT INTO dump_test.test_table (col1) '
 		  . 'SELECT generate_series FROM generate_series(1,9);',
 		regexp => qr/^
-			\QCOPY test_table (col1, col2, col3, col4) FROM stdin;\E
+			\QCOPY dump_test.test_table (col1, col2, col3, col4) FROM stdin;\E
 			\n(?:\d\t\\N\t\\N\t\\N\n){9}\\\.\n
 			/xm,
 		like => {
@@ -2227,7 +2231,7 @@
 		create_sql => 'INSERT INTO dump_test.fk_reference_test_table (col1) '
 		  . 'SELECT generate_series FROM generate_series(1,5);',
 		regexp => qr/^
-			\QCOPY fk_reference_test_table (col1) FROM stdin;\E
+			\QCOPY dump_test.fk_reference_test_table (col1) FROM stdin;\E
 			\n(?:\d\n){5}\\\.\n
 			/xm,
 		like => {
@@ -2258,9 +2262,9 @@
 		all_runs  => 0,                     # really only for data-only
 		catch_all => 'COPY ... commands',
 		regexp    => qr/^
-			\QCOPY test_table (col1, col2, col3, col4) FROM stdin;\E
+			\QCOPY dump_test.test_table (col1, col2, col3, col4) FROM stdin;\E
 			\n(?:\d\t\\N\t\\N\t\\N\n){9}\\\.\n.*
-			\QCOPY fk_reference_test_table (col1) FROM stdin;\E
+			\QCOPY dump_test.fk_reference_test_table (col1) FROM stdin;\E
 			\n(?:\d\n){5}\\\.\n
 			/xms,
 		like   => { data_only => 1, },
@@ -2274,7 +2278,7 @@
 		  . 'SELECT generate_series, generate_series::text '
 		  . 'FROM generate_series(1,9);',
 		regexp => qr/^
-			\QCOPY test_second_table (col1, col2) FROM stdin;\E
+			\QCOPY dump_test.test_second_table (col1, col2) FROM stdin;\E
 			\n(?:\d\t\d\n){9}\\\.\n
 			/xm,
 		like => {
@@ -2306,7 +2310,7 @@
 		  'INSERT INTO dump_test_second_schema.test_third_table (col1) '
 		  . 'SELECT generate_series FROM generate_series(1,9);',
 		regexp => qr/^
-			\QCOPY test_third_table (col1) FROM stdin;\E
+			\QCOPY dump_test_second_schema.test_third_table (col1) FROM stdin;\E
 			\n(?:\d\n){9}\\\.\n
 			/xm,
 		like => {
@@ -2334,7 +2338,7 @@
 		all_runs  => 1,
 		catch_all => 'COPY ... commands',
 		regexp    => qr/^
-			\QCOPY test_third_table (col1) WITH OIDS FROM stdin;\E
+			\QCOPY dump_test_second_schema.test_third_table (col1) WITH OIDS FROM stdin;\E
 			\n(?:\d+\t\d\n){9}\\\.\n
 			/xm,
 		like   => { with_oids => 1, },
@@ -2364,7 +2368,7 @@
 		create_sql =>
 		  'INSERT INTO dump_test.test_fourth_table DEFAULT VALUES;',
 		regexp => qr/^
-			\QCOPY test_fourth_table  FROM stdin;\E
+			\QCOPY dump_test.test_fourth_table  FROM stdin;\E
 			\n\n\\\.\n
 			/xm,
 		like => {
@@ -2395,7 +2399,7 @@
 		create_sql =>
 'INSERT INTO dump_test.test_fifth_table VALUES (NULL, true, false, \'11001\'::bit(5), \'NaN\');',
 		regexp => qr/^
-			\QCOPY test_fifth_table (col1, col2, col3, col4, col5) FROM stdin;\E
+			\QCOPY dump_test.test_fifth_table (col1, col2, col3, col4, col5) FROM stdin;\E
 			\n\\N\tt\tf\t11001\tNaN\n\\\.\n
 			/xm,
 		like => {
@@ -2426,7 +2430,7 @@
 		create_sql =>
 'INSERT INTO dump_test.test_table_identity (col2) VALUES (\'test\');',
 		regexp => qr/^
-			\QCOPY test_table_identity (col1, col2) FROM stdin;\E
+			\QCOPY dump_test.test_table_identity (col1, col2) FROM stdin;\E
 			\n1\ttest\n\\\.\n
 			/xm,
 		like => {
@@ -2467,7 +2471,7 @@
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
 		regexp    => qr/^
-			(?:INSERT\ INTO\ test_table\ \(col1,\ col2,\ col3,\ col4\)\ VALUES\ \(\d,\ NULL,\ NULL,\ NULL\);\n){9}
+			(?:INSERT\ INTO\ dump_test.test_table\ \(col1,\ col2,\ col3,\ col4\)\ VALUES\ \(\d,\ NULL,\ NULL,\ NULL\);\n){9}
 			/xm,
 		like   => { column_inserts => 1, },
 		unlike => {}, },
@@ -2476,7 +2480,7 @@
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
 		regexp    => qr/^
-			(?:INSERT\ INTO\ test_second_table\ \(col1,\ col2\)
+			(?:INSERT\ INTO\ dump_test.test_second_table\ \(col1,\ col2\)
 			   \ VALUES\ \(\d,\ '\d'\);\n){9}/xm,
 		like   => { column_inserts => 1, },
 		unlike => {}, },
@@ -2485,7 +2489,7 @@
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
 		regexp    => qr/^
-			(?:INSERT\ INTO\ test_third_table\ \(col1\)
+			(?:INSERT\ INTO\ dump_test_second_schema.test_third_table\ \(col1\)
 			   \ VALUES\ \(\d\);\n){9}/xm,
 		like   => { column_inserts => 1, },
 		unlike => {}, },
@@ -2493,7 +2497,7 @@
 	'INSERT INTO test_fourth_table' => {
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
-		regexp    => qr/^\QINSERT INTO test_fourth_table DEFAULT VALUES;\E/m,
+		regexp    => qr/^\QINSERT INTO dump_test.test_fourth_table DEFAULT VALUES;\E/m,
 		like      => { column_inserts => 1, },
 		unlike    => {}, },
 
@@ -2501,7 +2505,7 @@
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
 		regexp =>
-qr/^\QINSERT INTO test_fifth_table (col1, col2, col3, col4, col5) VALUES (NULL, true, false, B'11001', 'NaN');\E/m,
+qr/^\QINSERT INTO dump_test.test_fifth_table (col1, col2, col3, col4, col5) VALUES (NULL, true, false, B'11001', 'NaN');\E/m,
 		like   => { column_inserts => 1, },
 		unlike => {}, },
 
@@ -2509,7 +2513,7 @@
 		all_runs  => 1,
 		catch_all => 'INSERT INTO ...',
 		regexp =>
-qr/^\QINSERT INTO test_table_identity (col1, col2) OVERRIDING SYSTEM VALUE VALUES (1, 'test');\E/m,
+qr/^\QINSERT INTO dump_test.test_table_identity (col1, col2) OVERRIDING SYSTEM VALUE VALUES (1, 'test');\E/m,
 		like   => { column_inserts => 1, },
 		unlike => {}, },
 
@@ -2617,7 +2621,7 @@
 		create_order => 76,
 		create_sql   => 'CREATE COLLATION test0 FROM "C";',
 		regexp       => qr/^
-		  \QCREATE COLLATION test0 (provider = libc, locale = 'C');\E/xm,
+		  \QCREATE COLLATION public.test0 (provider = libc, locale = 'C');\E/xm,
 		collation => 1,
 		like      => {
 			binary_upgrade           => 1,
@@ -2748,33 +2752,34 @@
 		regexp   => qr/^
 			\QCREATE EXTENSION IF NOT EXISTS plpgsql WITH SCHEMA pg_catalog;\E
 			/xm,
-		like => {
+		# this shouldn't ever get emitted anymore
+		like => {},
+		unlike => {
+			binary_upgrade           => 1,
 			clean                    => 1,
 			clean_if_exists          => 1,
+			column_inserts           => 1,
 			createdb                 => 1,
+			data_only                => 1,
 			defaults                 => 1,
 			exclude_dump_test_schema => 1,
 			exclude_test_table       => 1,
 			exclude_test_table_data  => 1,
 			no_blobs                 => 1,
-			no_privs                 => 1,
 			no_owner                 => 1,
-			pg_dumpall_dbprivs       => 1,
-			schema_only              => 1,
-			section_pre_data         => 1,
-			with_oids                => 1, },
-		unlike => {
-			binary_upgrade           => 1,
-			column_inserts           => 1,
-			data_only                => 1,
+			no_privs                 => 1,
 			only_dump_test_schema    => 1,
 			only_dump_test_table     => 1,
+			pg_dumpall_dbprivs       => 1,
 			pg_dumpall_globals       => 1,
 			pg_dumpall_globals_clean => 1,
 			role                     => 1,
+			schema_only              => 1,
 			section_data             => 1,
 			section_post_data        => 1,
-			test_schema_plus_blobs   => 1, }, },
+			section_pre_data         => 1,
+			test_schema_plus_blobs   => 1,
+			with_oids                => 1, }, },
 
 	'CREATE AGGREGATE dump_test.newavg' => {
 		all_runs     => 1,
@@ -2784,14 +2789,16 @@
 						  basetype = int4,
 						  stype = _int8,
 						  finalfunc = int8_avg,
+						  finalfunc_modify = sharable,
 						  initcond1 = \'{0,0}\'
 					   );',
 		regexp => qr/^
-			\QCREATE AGGREGATE newavg(integer) (\E
+			\QCREATE AGGREGATE dump_test.newavg(integer) (\E
 			\n\s+\QSFUNC = int4_avg_accum,\E
 			\n\s+\QSTYPE = bigint[],\E
 			\n\s+\QINITCOND = '{0,0}',\E
-			\n\s+\QFINALFUNC = int8_avg\E
+			\n\s+\QFINALFUNC = int8_avg,\E
+			\n\s+\QFINALFUNC_MODIFY = SHARABLE\E
 			\n\);/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -2827,7 +2834,7 @@
 		create_sql =>
 'CREATE DEFAULT CONVERSION dump_test.test_conversion FOR \'LATIN1\' TO \'UTF8\' FROM iso8859_1_to_utf8;',
 		regexp =>
-qr/^\QCREATE DEFAULT CONVERSION test_conversion FOR 'LATIN1' TO 'UTF8' FROM iso8859_1_to_utf8;\E/xm,
+qr/^\QCREATE DEFAULT CONVERSION dump_test.test_conversion FOR 'LATIN1' TO 'UTF8' FROM iso8859_1_to_utf8;\E/xm,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -2865,7 +2872,7 @@
 					   CHECK(VALUE ~ \'^\d{5}$\' OR
 							 VALUE ~ \'^\d{5}-\d{4}$\');',
 		regexp => qr/^
-			\QCREATE DOMAIN us_postal_code AS text COLLATE pg_catalog."C" DEFAULT '10014'::text\E\n\s+
+			\QCREATE DOMAIN dump_test.us_postal_code AS text COLLATE pg_catalog."C" DEFAULT '10014'::text\E\n\s+
 			\QCONSTRAINT us_postal_code_check CHECK \E
 			\Q(((VALUE ~ '^\d{5}\E
 			\$\Q'::text) OR (VALUE ~ '^\d{5}-\d{4}\E\$
@@ -2906,7 +2913,7 @@
 					   RETURNS LANGUAGE_HANDLER AS \'$libdir/plpgsql\',
 					   \'plpgsql_call_handler\' LANGUAGE C;',
 		regexp => qr/^
-			\QCREATE FUNCTION pltestlang_call_handler() \E
+			\QCREATE FUNCTION dump_test.pltestlang_call_handler() \E
 			\QRETURNS language_handler\E
 			\n\s+\QLANGUAGE c\E
 			\n\s+AS\ \'\$
@@ -2947,7 +2954,7 @@
 					   RETURNS trigger LANGUAGE plpgsql
 					   AS $$ BEGIN RETURN NULL; END;$$;',
 		regexp => qr/^
-			\QCREATE FUNCTION trigger_func() RETURNS trigger\E
+			\QCREATE FUNCTION dump_test.trigger_func() RETURNS trigger\E
 			\n\s+\QLANGUAGE plpgsql\E
 			\n\s+AS\ \$\$
 			\Q BEGIN RETURN NULL; END;\E
@@ -2987,7 +2994,7 @@
 					   RETURNS event_trigger LANGUAGE plpgsql
 					   AS $$ BEGIN RETURN; END;$$;',
 		regexp => qr/^
-			\QCREATE FUNCTION event_trigger_func() RETURNS event_trigger\E
+			\QCREATE FUNCTION dump_test.event_trigger_func() RETURNS event_trigger\E
 			\n\s+\QLANGUAGE plpgsql\E
 			\n\s+AS\ \$\$
 			\Q BEGIN RETURN; END;\E
@@ -3026,7 +3033,7 @@
 		create_sql =>
 		  'CREATE OPERATOR FAMILY dump_test.op_family USING btree;',
 		regexp => qr/^
-			\QCREATE OPERATOR FAMILY op_family USING btree;\E
+			\QCREATE OPERATOR FAMILY dump_test.op_family USING btree;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -3070,8 +3077,8 @@
 						 FUNCTION 1 btint8cmp(bigint,bigint),
 						 FUNCTION 2 btint8sortsupport(internal);',
 		regexp => qr/^
-			\QCREATE OPERATOR CLASS op_class\E\n\s+
-			\QFOR TYPE bigint USING btree FAMILY op_family AS\E\n\s+
+			\QCREATE OPERATOR CLASS dump_test.op_class\E\n\s+
+			\QFOR TYPE bigint USING btree FAMILY dump_test.op_family AS\E\n\s+
 			\QOPERATOR 1 <(bigint,bigint) ,\E\n\s+
 			\QOPERATOR 2 <=(bigint,bigint) ,\E\n\s+
 			\QOPERATOR 3 =(bigint,bigint) ,\E\n\s+
@@ -3155,9 +3162,9 @@
 					   FOR EACH ROW WHEN (NEW.col1 > 10)
 					   EXECUTE PROCEDURE dump_test.trigger_func();',
 		regexp => qr/^
-			\QCREATE TRIGGER test_trigger BEFORE INSERT ON test_table \E
+			\QCREATE TRIGGER test_trigger BEFORE INSERT ON dump_test.test_table \E
 			\QFOR EACH ROW WHEN ((new.col1 > 10)) \E
-			\QEXECUTE PROCEDURE trigger_func();\E
+			\QEXECUTE PROCEDURE dump_test.trigger_func();\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -3193,7 +3200,7 @@
 		create_sql   => 'CREATE TYPE dump_test.planets
 					   AS ENUM ( \'venus\', \'earth\', \'mars\' );',
 		regexp => qr/^
-			\QCREATE TYPE planets AS ENUM (\E
+			\QCREATE TYPE dump_test.planets AS ENUM (\E
 			\n\s+'venus',
 			\n\s+'earth',
 			\n\s+'mars'
@@ -3229,7 +3236,7 @@
 	'CREATE TYPE dump_test.planets AS ENUM pg_upgrade' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QCREATE TYPE planets AS ENUM (\E
+			\QCREATE TYPE dump_test.planets AS ENUM (\E
 			\n\);.*^
 			\QALTER TYPE dump_test.planets ADD VALUE 'venus';\E
 			\n.*^
@@ -3271,7 +3278,7 @@
 		create_sql   => 'CREATE TYPE dump_test.textrange
 					   AS RANGE (subtype=text, collation="C");',
 		regexp => qr/^
-			\QCREATE TYPE textrange AS RANGE (\E
+			\QCREATE TYPE dump_test.textrange AS RANGE (\E
 			\n\s+\Qsubtype = text,\E
 			\n\s+\Qcollation = pg_catalog."C"\E
 			\n\);/xm,
@@ -3307,7 +3314,7 @@
 		all_runs     => 1,
 		create_order => 39,
 		create_sql   => 'CREATE TYPE dump_test.int42;',
-		regexp       => qr/^CREATE TYPE int42;/m,
+		regexp       => qr/^CREATE TYPE dump_test.int42;/m,
 		like         => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -3342,7 +3349,7 @@
 		create_sql =>
 'CREATE TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1 (copy=english);',
 		regexp => qr/^
-			\QCREATE TEXT SEARCH CONFIGURATION alt_ts_conf1 (\E\n
+			\QCREATE TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1 (\E\n
 			\s+\QPARSER = pg_catalog."default" );\E/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -3375,61 +3382,61 @@
 	'ALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1 ...' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR asciiword WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR word WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR numword WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR email WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR url WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR host WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR sfloat WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR version WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR hword_numpart WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR hword_part WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR hword_asciipart WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR numhword WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR asciihword WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR hword WITH english_stem;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR url_path WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR file WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR "float" WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR "int" WITH simple;\E\n
 			\n
-			\QALTER TEXT SEARCH CONFIGURATION alt_ts_conf1\E\n
+			\QALTER TEXT SEARCH CONFIGURATION dump_test.alt_ts_conf1\E\n
 			\s+\QADD MAPPING FOR uint WITH simple;\E\n
 			\n
 			/xm,
@@ -3467,7 +3474,7 @@
 		create_sql =>
 'CREATE TEXT SEARCH TEMPLATE dump_test.alt_ts_temp1 (lexize=dsimple_lexize);',
 		regexp => qr/^
-			\QCREATE TEXT SEARCH TEMPLATE alt_ts_temp1 (\E\n
+			\QCREATE TEXT SEARCH TEMPLATE dump_test.alt_ts_temp1 (\E\n
 			\s+\QLEXIZE = dsimple_lexize );\E/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -3503,7 +3510,7 @@
 		create_sql   => 'CREATE TEXT SEARCH PARSER dump_test.alt_ts_prs1
 		(start = prsd_start, gettoken = prsd_nexttoken, end = prsd_end, lextypes = prsd_lextype);',
 		regexp => qr/^
-			\QCREATE TEXT SEARCH PARSER alt_ts_prs1 (\E\n
+			\QCREATE TEXT SEARCH PARSER dump_test.alt_ts_prs1 (\E\n
 			\s+\QSTART = prsd_start,\E\n
 			\s+\QGETTOKEN = prsd_nexttoken,\E\n
 			\s+\QEND = prsd_end,\E\n
@@ -3543,7 +3550,7 @@
 		create_sql =>
 'CREATE TEXT SEARCH DICTIONARY dump_test.alt_ts_dict1 (template=simple);',
 		regexp => qr/^
-			\QCREATE TEXT SEARCH DICTIONARY alt_ts_dict1 (\E\n
+			\QCREATE TEXT SEARCH DICTIONARY dump_test.alt_ts_dict1 (\E\n
 			\s+\QTEMPLATE = pg_catalog.simple );\E\n
 			/xm,
 		like => {
@@ -3581,7 +3588,7 @@
 					   RETURNS dump_test.int42 AS \'int4in\'
 					   LANGUAGE internal STRICT IMMUTABLE;',
 		regexp => qr/^
-			\QCREATE FUNCTION int42_in(cstring) RETURNS int42\E
+			\QCREATE FUNCTION dump_test.int42_in(cstring) RETURNS dump_test.int42\E
 			\n\s+\QLANGUAGE internal IMMUTABLE STRICT\E
 			\n\s+AS\ \$\$int4in\$\$;
 			/xm,
@@ -3620,7 +3627,7 @@
 					   RETURNS cstring AS \'int4out\'
 					   LANGUAGE internal STRICT IMMUTABLE;',
 		regexp => qr/^
-			\QCREATE FUNCTION int42_out(int42) RETURNS cstring\E
+			\QCREATE FUNCTION dump_test.int42_out(dump_test.int42) RETURNS cstring\E
 			\n\s+\QLANGUAGE internal IMMUTABLE STRICT\E
 			\n\s+AS\ \$\$int4out\$\$;
 			/xm,
@@ -3652,6 +3659,44 @@
 			section_data             => 1,
 			section_post_data        => 1, }, },
 
+	'CREATE PROCEDURE dump_test.ptest1' => {
+		all_runs     => 1,
+		create_order => 41,
+		create_sql   => 'CREATE PROCEDURE dump_test.ptest1(a int)
+					   LANGUAGE SQL AS $$ INSERT INTO dump_test.test_table (col1) VALUES (a) $$;',
+		regexp => qr/^
+			\QCREATE PROCEDURE dump_test.ptest1(a integer)\E
+			\n\s+\QLANGUAGE sql\E
+			\n\s+AS\ \$\$\Q INSERT INTO dump_test.test_table (col1) VALUES (a) \E\$\$;
+			/xm,
+		like => {
+			binary_upgrade          => 1,
+			clean                   => 1,
+			clean_if_exists         => 1,
+			createdb                => 1,
+			defaults                => 1,
+			exclude_test_table      => 1,
+			exclude_test_table_data => 1,
+			no_blobs                => 1,
+			no_privs                => 1,
+			no_owner                => 1,
+			only_dump_test_schema   => 1,
+			pg_dumpall_dbprivs      => 1,
+			schema_only             => 1,
+			section_pre_data        => 1,
+			test_schema_plus_blobs  => 1,
+			with_oids               => 1, },
+		unlike => {
+			column_inserts           => 1,
+			data_only                => 1,
+			exclude_dump_test_schema => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			role                     => 1,
+			section_data             => 1,
+			section_post_data        => 1, }, },
+
 	'CREATE TYPE dump_test.int42 populated' => {
 		all_runs     => 1,
 		create_order => 42,
@@ -3663,10 +3708,10 @@
 						   default = 42,
 						   passedbyvalue);',
 		regexp => qr/^
-			\QCREATE TYPE int42 (\E
+			\QCREATE TYPE dump_test.int42 (\E
 			\n\s+\QINTERNALLENGTH = 4,\E
-			\n\s+\QINPUT = int42_in,\E
-			\n\s+\QOUTPUT = int42_out,\E
+			\n\s+\QINPUT = dump_test.int42_in,\E
+			\n\s+\QOUTPUT = dump_test.int42_out,\E
 			\n\s+\QDEFAULT = '42',\E
 			\n\s+\QALIGNMENT = int4,\E
 			\n\s+\QSTORAGE = plain,\E
@@ -3708,9 +3753,9 @@
 						   f2 dump_test.int42
 					   );',
 		regexp => qr/^
-			\QCREATE TYPE composite AS (\E
+			\QCREATE TYPE dump_test.composite AS (\E
 			\n\s+\Qf1 integer,\E
-			\n\s+\Qf2 int42\E
+			\n\s+\Qf2 dump_test.int42\E
 			\n\);
 			/xm,
 		like => {
@@ -3745,7 +3790,7 @@
 		all_runs     => 1,
 		create_order => 39,
 		create_sql   => 'CREATE TYPE dump_test.undefined;',
-		regexp       => qr/^CREATE TYPE undefined;/m,
+		regexp       => qr/^CREATE TYPE dump_test.undefined;/m,
 		like         => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -3847,7 +3892,7 @@
 'CREATE FOREIGN TABLE dump_test.foreign_table (c1 int options (column_name \'col1\'))
 						SERVER s1 OPTIONS (schema_name \'x1\');',
 		regexp => qr/
-			\QCREATE FOREIGN TABLE foreign_table (\E\n
+			\QCREATE FOREIGN TABLE dump_test.foreign_table (\E\n
 			\s+\Qc1 integer\E\n
 			\Q)\E\n
 			\QSERVER s1\E\n
@@ -3961,7 +4006,7 @@
 					   HANDLER dump_test.pltestlang_call_handler;',
 		regexp => qr/^
 			\QCREATE PROCEDURAL LANGUAGE pltestlang \E
-			\QHANDLER pltestlang_call_handler;\E
+			\QHANDLER dump_test.pltestlang_call_handler;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -3995,9 +4040,9 @@
 		create_sql   => 'CREATE MATERIALIZED VIEW dump_test.matview (col1) AS
 					   SELECT col1 FROM dump_test.test_table;',
 		regexp => qr/^
-			\QCREATE MATERIALIZED VIEW matview AS\E
+			\QCREATE MATERIALIZED VIEW dump_test.matview AS\E
 			\n\s+\QSELECT test_table.col1\E
-			\n\s+\QFROM test_table\E
+			\n\s+\QFROM dump_test.test_table\E
 			\n\s+\QWITH NO DATA;\E
 			/xm,
 		like => {
@@ -4033,9 +4078,9 @@
 						   dump_test.matview_second (col1) AS
 						   SELECT * FROM dump_test.matview;',
 		regexp => qr/^
-			\QCREATE MATERIALIZED VIEW matview_second AS\E
+			\QCREATE MATERIALIZED VIEW dump_test.matview_second AS\E
 			\n\s+\QSELECT matview.col1\E
-			\n\s+\QFROM matview\E
+			\n\s+\QFROM dump_test.matview\E
 			\n\s+\QWITH NO DATA;\E
 			/xm,
 		like => {
@@ -4071,9 +4116,9 @@
 						   dump_test.matview_third (col1) AS
 						   SELECT * FROM dump_test.matview_second WITH NO DATA;',
 		regexp => qr/^
-			\QCREATE MATERIALIZED VIEW matview_third AS\E
+			\QCREATE MATERIALIZED VIEW dump_test.matview_third AS\E
 			\n\s+\QSELECT matview_second.col1\E
-			\n\s+\QFROM matview_second\E
+			\n\s+\QFROM dump_test.matview_second\E
 			\n\s+\QWITH NO DATA;\E
 			/xm,
 		like => {
@@ -4109,9 +4154,9 @@
 						   dump_test.matview_fourth (col1) AS
 						   SELECT * FROM dump_test.matview_third WITH NO DATA;',
 		regexp => qr/^
-			\QCREATE MATERIALIZED VIEW matview_fourth AS\E
+			\QCREATE MATERIALIZED VIEW dump_test.matview_fourth AS\E
 			\n\s+\QSELECT matview_third.col1\E
-			\n\s+\QFROM matview_third\E
+			\n\s+\QFROM dump_test.matview_third\E
 			\n\s+\QWITH NO DATA;\E
 			/xm,
 		like => {
@@ -4147,7 +4192,7 @@
 						   USING (true)
 						   WITH CHECK (true);',
 		regexp => qr/^
-			\QCREATE POLICY p1 ON test_table \E
+			\QCREATE POLICY p1 ON dump_test.test_table \E
 			\QUSING (true) WITH CHECK (true);\E
 			/xm,
 		like => {
@@ -4182,7 +4227,7 @@
 		create_sql   => 'CREATE POLICY p2 ON dump_test.test_table
 						   FOR SELECT TO regress_dump_test_role USING (true);',
 		regexp => qr/^
-			\QCREATE POLICY p2 ON test_table FOR SELECT TO regress_dump_test_role \E
+			\QCREATE POLICY p2 ON dump_test.test_table FOR SELECT TO regress_dump_test_role \E
 			\QUSING (true);\E
 			/xm,
 		like => {
@@ -4217,7 +4262,7 @@
 		create_sql   => 'CREATE POLICY p3 ON dump_test.test_table
 						   FOR INSERT TO regress_dump_test_role WITH CHECK (true);',
 		regexp => qr/^
-			\QCREATE POLICY p3 ON test_table FOR INSERT \E
+			\QCREATE POLICY p3 ON dump_test.test_table FOR INSERT \E
 			\QTO regress_dump_test_role WITH CHECK (true);\E
 			/xm,
 		like => {
@@ -4252,7 +4297,7 @@
 		create_sql   => 'CREATE POLICY p4 ON dump_test.test_table FOR UPDATE
 						   TO regress_dump_test_role USING (true) WITH CHECK (true);',
 		regexp => qr/^
-			\QCREATE POLICY p4 ON test_table FOR UPDATE TO regress_dump_test_role \E
+			\QCREATE POLICY p4 ON dump_test.test_table FOR UPDATE TO regress_dump_test_role \E
 			\QUSING (true) WITH CHECK (true);\E
 			/xm,
 		like => {
@@ -4287,7 +4332,7 @@
 		create_sql   => 'CREATE POLICY p5 ON dump_test.test_table
 						   FOR DELETE TO regress_dump_test_role USING (true);',
 		regexp => qr/^
-			\QCREATE POLICY p5 ON test_table FOR DELETE \E
+			\QCREATE POLICY p5 ON dump_test.test_table FOR DELETE \E
 			\QTO regress_dump_test_role USING (true);\E
 			/xm,
 		like => {
@@ -4322,7 +4367,7 @@
 		create_sql => 'CREATE POLICY p6 ON dump_test.test_table AS RESTRICTIVE
 						   USING (false);',
 		regexp => qr/^
-			\QCREATE POLICY p6 ON test_table AS RESTRICTIVE \E
+			\QCREATE POLICY p6 ON dump_test.test_table AS RESTRICTIVE \E
 			\QUSING (false);\E
 			/xm,
 		like => {
@@ -4460,7 +4505,7 @@
 		create_sql =>
 		  'ALTER PUBLICATION pub1 ADD TABLE dump_test.test_table;',
 		regexp => qr/^
-			\QALTER PUBLICATION pub1 ADD TABLE ONLY test_table;\E
+			\QALTER PUBLICATION pub1 ADD TABLE ONLY dump_test.test_table;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -4494,7 +4539,7 @@
 		create_sql =>
 		  'ALTER PUBLICATION pub1 ADD TABLE dump_test.test_second_table;',
 		regexp => qr/^
-			\QALTER PUBLICATION pub1 ADD TABLE ONLY test_second_table;\E
+			\QALTER PUBLICATION pub1 ADD TABLE ONLY dump_test.test_second_table;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -4522,11 +4567,12 @@
 		all_runs  => 1,
 		catch_all => 'CREATE ... commands',
 		regexp    => qr/^CREATE SCHEMA public;/m,
-		like      => {
-			clean           => 1,
-			clean_if_exists => 1, },
+		# this shouldn't ever get emitted anymore
+		like      => {},
 		unlike => {
 			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
 			createdb                 => 1,
 			defaults                 => 1,
 			exclude_test_table       => 1,
@@ -4621,7 +4667,7 @@
 						   CHECK (col1 <= 1000)
 					   ) WITH (autovacuum_enabled = false, fillfactor=80);',
 		regexp => qr/^
-			\QCREATE TABLE test_table (\E\n
+			\QCREATE TABLE dump_test.test_table (\E\n
 			\s+\Qcol1 integer NOT NULL,\E\n
 			\s+\Qcol2 text,\E\n
 			\s+\Qcol3 text,\E\n
@@ -4662,7 +4708,7 @@
 						   col1 int primary key references dump_test.test_table
 					   );',
 		regexp => qr/^
-			\QCREATE TABLE fk_reference_test_table (\E
+			\QCREATE TABLE dump_test.fk_reference_test_table (\E
 			\n\s+\Qcol1 integer NOT NULL\E
 			\n\);
 			/xm,
@@ -4700,7 +4746,7 @@
 						   col2 text
 					   );',
 		regexp => qr/^
-			\QCREATE TABLE test_second_table (\E
+			\QCREATE TABLE dump_test.test_second_table (\E
 			\n\s+\Qcol1 integer,\E
 			\n\s+\Qcol2 text\E
 			\n\);
@@ -4744,7 +4790,7 @@
 			(\Q-- TOC entry \E[0-9]+\ \(class\ 1259\ OID\ [0-9]+\)\n)?
 			\Q-- Name: test_third_table;\E.*\n
 			\Q--\E\n\n
-			\QCREATE UNLOGGED TABLE test_third_table (\E
+			\QCREATE UNLOGGED TABLE dump_test_second_schema.test_third_table (\E
 			\n\s+\Qcol1 integer NOT NULL\E
 			\n\);\n
 			/xm,
@@ -4786,7 +4832,7 @@
 		regexp => qr/^
 			\Q-- Name: measurement;\E.*\n
 			\Q--\E\n\n
-			\QCREATE TABLE measurement (\E\n
+			\QCREATE TABLE dump_test.measurement (\E\n
 			\s+\Qcity_id integer NOT NULL,\E\n
 			\s+\Qlogdate date NOT NULL,\E\n
 			\s+\Qpeaktemp integer,\E\n
@@ -4830,7 +4876,7 @@
 		regexp => qr/^
 			\Q-- Name: measurement_y2006m2;\E.*\n
 			\Q--\E\n\n
-			\QCREATE TABLE measurement_y2006m2 PARTITION OF dump_test.measurement\E\n
+			\QCREATE TABLE dump_test_second_schema.measurement_y2006m2 PARTITION OF dump_test.measurement\E\n
 			\QFOR VALUES FROM ('2006-02-01') TO ('2006-03-01');\E\n
 			/xm,
 		like => {
@@ -4865,7 +4911,7 @@
 		create_sql   => 'CREATE TABLE dump_test.test_fourth_table (
 					   );',
 		regexp => qr/^
-			\QCREATE TABLE test_fourth_table (\E
+			\QCREATE TABLE dump_test.test_fourth_table (\E
 			\n\);
 			/xm,
 		like => {
@@ -4905,7 +4951,7 @@
 							col5 float8
 					   );',
 		regexp => qr/^
-			\QCREATE TABLE test_fifth_table (\E
+			\QCREATE TABLE dump_test.test_fifth_table (\E
 			\n\s+\Qcol1 integer,\E
 			\n\s+\Qcol2 boolean,\E
 			\n\s+\Qcol3 boolean,\E
@@ -4947,13 +4993,13 @@
 						   col2 text
 					   );',
 		regexp => qr/^
-			\QCREATE TABLE test_table_identity (\E\n
+			\QCREATE TABLE dump_test.test_table_identity (\E\n
 			\s+\Qcol1 integer NOT NULL,\E\n
 			\s+\Qcol2 text\E\n
 			\);
 			.*
-			\QALTER TABLE test_table_identity ALTER COLUMN col1 ADD GENERATED ALWAYS AS IDENTITY (\E\n
-			\s+\QSEQUENCE NAME test_table_identity_col1_seq\E\n
+			\QALTER TABLE dump_test.test_table_identity ALTER COLUMN col1 ADD GENERATED ALWAYS AS IDENTITY (\E\n
+			\s+\QSEQUENCE NAME dump_test.test_table_identity_col1_seq\E\n
 			\s+\QSTART WITH 1\E\n
 			\s+\QINCREMENT BY 1\E\n
 			\s+\QNO MINVALUE\E\n
@@ -4993,7 +5039,7 @@
 		create_sql   => 'CREATE STATISTICS dump_test.test_ext_stats_no_options
 							ON col1, col2 FROM dump_test.test_fifth_table',
 		regexp => qr/^
-			\QCREATE STATISTICS dump_test.test_ext_stats_no_options ON col1, col2 FROM test_fifth_table;\E
+			\QCREATE STATISTICS dump_test.test_ext_stats_no_options ON col1, col2 FROM dump_test.test_fifth_table;\E
 		    /xms,
 		like => {
 			binary_upgrade          => 1,
@@ -5027,7 +5073,7 @@
 		create_sql   => 'CREATE STATISTICS dump_test.test_ext_stats_opts
 							(ndistinct) ON col1, col2 FROM dump_test.test_fifth_table',
 		regexp => qr/^
-			\QCREATE STATISTICS dump_test.test_ext_stats_opts (ndistinct) ON col1, col2 FROM test_fifth_table;\E
+			\QCREATE STATISTICS dump_test.test_ext_stats_opts (ndistinct) ON col1, col2 FROM dump_test.test_fifth_table;\E
 		    /xms,
 		like => {
 			binary_upgrade          => 1,
@@ -5058,7 +5104,7 @@
 		all_runs  => 1,
 		catch_all => 'CREATE ... commands',
 		regexp    => qr/^
-			\QCREATE SEQUENCE test_table_col1_seq\E
+			\QCREATE SEQUENCE dump_test.test_table_col1_seq\E
 			\n\s+\QAS integer\E
 			\n\s+\QSTART WITH 1\E
 			\n\s+\QINCREMENT BY 1\E
@@ -5095,7 +5141,7 @@
 		all_runs  => 1,
 		catch_all => 'CREATE ... commands',
 		regexp    => qr/^
-			\QCREATE SEQUENCE test_third_table_col1_seq\E
+			\QCREATE SEQUENCE dump_test_second_schema.test_third_table_col1_seq\E
 			\n\s+\QAS integer\E
 			\n\s+\QSTART WITH 1\E
 			\n\s+\QINCREMENT BY 1\E
@@ -5136,7 +5182,7 @@
 					   ON dump_test_second_schema.test_third_table (col1);',
 		regexp => qr/^
 			\QCREATE UNIQUE INDEX test_third_table_idx \E
-			\QON test_third_table USING btree (col1);\E
+			\QON dump_test_second_schema.test_third_table USING btree (col1);\E
 			/xm,
 		like => {
 			binary_upgrade           => 1,
@@ -5163,6 +5209,166 @@
 			section_pre_data         => 1,
 			test_schema_plus_blobs   => 1, }, },
 
+	'CREATE INDEX ON ONLY measurement' => {
+		all_runs     => 1,
+		catch_all    => 'CREATE ... commands',
+		create_order => 92,
+		create_sql   => 'CREATE INDEX ON dump_test.measurement (city_id, logdate);',
+		regexp => qr/^
+		\QCREATE INDEX measurement_city_id_logdate_idx ON ONLY dump_test.measurement USING\E
+		/xm,
+		like => {
+			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
+			createdb                 => 1,
+			defaults                 => 1,
+			exclude_test_table       => 1,
+			exclude_test_table_data  => 1,
+			no_blobs                 => 1,
+			no_privs                 => 1,
+			no_owner                 => 1,
+			only_dump_test_schema    => 1,
+			pg_dumpall_dbprivs       => 1,
+			schema_only              => 1,
+			section_post_data        => 1,
+			test_schema_plus_blobs   => 1,
+			with_oids                => 1, },
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			role                     => 1,
+			section_pre_data         => 1, }, },
+
+	'ALTER TABLE measurement PRIMARY KEY' => {
+		all_runs     => 1,
+		catch_all    => 'CREATE ... commands',
+		create_order => 93,
+		create_sql   => 'ALTER TABLE dump_test.measurement ADD PRIMARY KEY (city_id, logdate);',
+		regexp => qr/^
+			\QALTER TABLE ONLY dump_test.measurement\E \n^\s+
+			\QADD CONSTRAINT measurement_pkey PRIMARY KEY (city_id, logdate);\E
+		/xm,
+		like => {
+			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
+			createdb                 => 1,
+			defaults                 => 1,
+			exclude_test_table       => 1,
+			exclude_test_table_data  => 1,
+			no_blobs                 => 1,
+			no_privs                 => 1,
+			no_owner                 => 1,
+			only_dump_test_schema    => 1,
+			pg_dumpall_dbprivs       => 1,
+			schema_only              => 1,
+			section_post_data        => 1,
+			test_schema_plus_blobs   => 1,
+			with_oids                => 1, },
+		unlike => {
+			exclude_dump_test_schema => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			role                     => 1,
+			section_pre_data         => 1, }, },
+
+	'CREATE INDEX ... ON measurement_y2006_m2' => {
+		all_runs     => 1,
+		catch_all    => 'CREATE ... commands',
+		regexp       => qr/^
+		\QCREATE INDEX measurement_y2006m2_city_id_logdate_idx ON dump_test_second_schema.measurement_y2006m2 \E
+		/xm,
+		like => {
+			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
+			createdb                 => 1,
+			defaults                 => 1,
+			exclude_dump_test_schema => 1,
+			exclude_test_table       => 1,
+			exclude_test_table_data  => 1,
+			no_blobs                 => 1,
+			no_privs                 => 1,
+			no_owner                 => 1,
+			pg_dumpall_dbprivs       => 1,
+			role                     => 1,
+			schema_only              => 1,
+			section_post_data        => 1,
+			with_oids                => 1, },
+		unlike => {
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			section_pre_data         => 1,
+			test_schema_plus_blobs   => 1, }, },
+
+	'ALTER INDEX ... ATTACH PARTITION' => {
+		all_runs     => 1,
+		catch_all    => 'CREATE ... commands',
+		regexp       => qr/^
+		\QALTER INDEX dump_test.measurement_city_id_logdate_idx ATTACH PARTITION dump_test_second_schema.measurement_y2006m2_city_id_logdate_idx\E
+		/xm,
+		like => {
+			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
+			createdb                 => 1,
+			defaults                 => 1,
+			exclude_dump_test_schema => 1,
+			exclude_test_table       => 1,
+			exclude_test_table_data  => 1,
+			no_blobs                 => 1,
+			no_privs                 => 1,
+			no_owner                 => 1,
+			pg_dumpall_dbprivs       => 1,
+			role                     => 1,
+			schema_only              => 1,
+			section_post_data        => 1,
+			with_oids                => 1, },
+		unlike => {
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			section_pre_data         => 1,
+			test_schema_plus_blobs   => 1, }, },
+
+	'ALTER INDEX ... ATTACH PARTITION (primary key)' => {
+		all_runs     => 1,
+		catch_all    => 'CREATE ... commands',
+		regexp       => qr/^
+		\QALTER INDEX dump_test.measurement_pkey ATTACH PARTITION dump_test_second_schema.measurement_y2006m2_pkey\E
+		/xm,
+		like => {
+			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
+			createdb                 => 1,
+			defaults                 => 1,
+			exclude_dump_test_schema => 1,
+			exclude_test_table       => 1,
+			exclude_test_table_data  => 1,
+			no_blobs                 => 1,
+			no_privs                 => 1,
+			no_owner                 => 1,
+			pg_dumpall_dbprivs       => 1,
+			role                     => 1,
+			schema_only              => 1,
+			section_post_data        => 1,
+			with_oids                => 1, },
+		unlike => {
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
+			pg_dumpall_globals       => 1,
+			pg_dumpall_globals_clean => 1,
+			section_pre_data         => 1,
+			test_schema_plus_blobs   => 1, }, },
+
 	'CREATE VIEW test_view' => {
 		all_runs     => 1,
 		catch_all    => 'CREATE ... commands',
@@ -5171,9 +5377,9 @@
 		                   WITH (check_option = \'local\', security_barrier = true) AS
 		                   SELECT col1 FROM dump_test.test_table;',
 		regexp => qr/^
-			\QCREATE VIEW test_view WITH (security_barrier='true') AS\E
+			\QCREATE VIEW dump_test.test_view WITH (security_barrier='true') AS\E
 			\n\s+\QSELECT test_table.col1\E
-			\n\s+\QFROM test_table\E
+			\n\s+\QFROM dump_test.test_table\E
 			\n\s+\QWITH LOCAL CHECK OPTION;\E/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -5207,7 +5413,7 @@
 		create_sql =>
 		  'ALTER VIEW dump_test.test_view ALTER COLUMN col1 SET DEFAULT 1;',
 		regexp => qr/^
-			\QALTER TABLE ONLY test_view ALTER COLUMN col1 SET DEFAULT 1;\E/xm,
+			\QALTER TABLE ONLY dump_test.test_view ALTER COLUMN col1 SET DEFAULT 1;\E/xm,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -5257,8 +5463,10 @@
 		all_runs  => 1,
 		catch_all => 'DROP ... commands',
 		regexp    => qr/^DROP SCHEMA public;/m,
-		like      => { clean => 1 },
+		# this shouldn't ever get emitted anymore
+		like      => {},
 		unlike    => {
+			clean                    => 1,
 			clean_if_exists          => 1,
 			pg_dumpall_globals_clean => 1, }, },
 
@@ -5266,17 +5474,21 @@
 		all_runs  => 1,
 		catch_all => 'DROP ... commands',
 		regexp    => qr/^DROP SCHEMA IF EXISTS public;/m,
-		like      => { clean_if_exists => 1 },
+		# this shouldn't ever get emitted anymore
+		like      => {},
 		unlike    => {
 			clean                    => 1,
+			clean_if_exists          => 1,
 			pg_dumpall_globals_clean => 1, }, },
 
 	'DROP EXTENSION plpgsql' => {
 		all_runs  => 1,
 		catch_all => 'DROP ... commands',
 		regexp    => qr/^DROP EXTENSION plpgsql;/m,
-		like      => { clean => 1, },
+		# this shouldn't ever get emitted anymore
+		like      => {},
 		unlike    => {
+			clean => 1,
 			clean_if_exists          => 1,
 			pg_dumpall_globals_clean => 1, }, },
 
@@ -5356,9 +5568,11 @@
 		all_runs  => 1,
 		catch_all => 'DROP ... commands',
 		regexp    => qr/^DROP EXTENSION IF EXISTS plpgsql;/m,
-		like      => { clean_if_exists => 1, },
+		# this shouldn't ever get emitted anymore
+		like      => {},
 		unlike    => {
 			clean                    => 1,
+			clean_if_exists          => 1,
 			pg_dumpall_globals_clean => 1, }, },
 
 	'DROP FUNCTION IF EXISTS dump_test.pltestlang_call_handler()' => {
@@ -5585,7 +5799,7 @@
 		create_sql =>
 'GRANT USAGE ON DOMAIN dump_test.us_postal_code TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON TYPE us_postal_code TO regress_dump_test_role;\E
+			\QGRANT ALL ON TYPE dump_test.us_postal_code TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -5622,7 +5836,7 @@
 		create_sql =>
 		  'GRANT USAGE ON TYPE dump_test.int42 TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON TYPE int42 TO regress_dump_test_role;\E
+			\QGRANT ALL ON TYPE dump_test.int42 TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -5659,7 +5873,7 @@
 		create_sql =>
 		  'GRANT USAGE ON TYPE dump_test.planets TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON TYPE planets TO regress_dump_test_role;\E
+			\QGRANT ALL ON TYPE dump_test.planets TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -5696,7 +5910,7 @@
 		create_sql =>
 'GRANT USAGE ON TYPE dump_test.textrange TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON TYPE textrange TO regress_dump_test_role;\E
+			\QGRANT ALL ON TYPE dump_test.textrange TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -5765,7 +5979,7 @@
 		create_sql   => 'GRANT SELECT ON TABLE dump_test.test_table
 						   TO regress_dump_test_role;',
 		regexp =>
-		  qr/^GRANT SELECT ON TABLE test_table TO regress_dump_test_role;/m,
+		  qr/^GRANT SELECT ON TABLE dump_test.test_table TO regress_dump_test_role;/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -5798,7 +6012,7 @@
 						   TABLE dump_test_second_schema.test_third_table
 						   TO regress_dump_test_role;',
 		regexp =>
-qr/^GRANT SELECT ON TABLE test_third_table TO regress_dump_test_role;/m,
+qr/^GRANT SELECT ON TABLE dump_test_second_schema.test_third_table TO regress_dump_test_role;/m,
 		like => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -5831,7 +6045,7 @@
 						   dump_test_second_schema.test_third_table_col1_seq
 						   TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON SEQUENCE test_third_table_col1_seq TO regress_dump_test_role;\E
+			\QGRANT ALL ON SEQUENCE dump_test_second_schema.test_third_table_col1_seq TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade           => 1,
@@ -5865,7 +6079,7 @@
 						   TABLE dump_test.measurement
 						   TO regress_dump_test_role;',
 		regexp =>
-		  qr/^GRANT SELECT ON TABLE measurement TO regress_dump_test_role;/m,
+		  qr/^GRANT SELECT ON TABLE dump_test.measurement TO regress_dump_test_role;/m,
 		like => {
 			binary_upgrade          => 1,
 			clean                   => 1,
@@ -5898,7 +6112,7 @@
 						   TABLE dump_test_second_schema.measurement_y2006m2
 						   TO regress_dump_test_role;',
 		regexp =>
-qr/^GRANT SELECT ON TABLE measurement_y2006m2 TO regress_dump_test_role;/m,
+qr/^GRANT SELECT ON TABLE dump_test_second_schema.measurement_y2006m2 TO regress_dump_test_role;/m,
 		like => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -5969,7 +6183,7 @@
 		  'GRANT INSERT (col1) ON TABLE dump_test.test_second_table
 						   TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT INSERT(col1) ON TABLE test_second_table TO regress_dump_test_role;\E
+			\QGRANT INSERT(col1) ON TABLE dump_test.test_second_table TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade          => 1,
@@ -6002,7 +6216,7 @@
 		create_sql   => 'GRANT EXECUTE ON FUNCTION pg_sleep(float8)
 						   TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT ALL ON FUNCTION pg_sleep(double precision) TO regress_dump_test_role;\E
+			\QGRANT ALL ON FUNCTION pg_catalog.pg_sleep(double precision) TO regress_dump_test_role;\E
 			/xm,
 		like => {
 			binary_upgrade           => 1,
@@ -6066,37 +6280,37 @@
 						   proacl
 						) ON TABLE pg_proc TO public;',
 		regexp => qr/
-		\QGRANT SELECT(tableoid) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(oid) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proname) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(pronamespace) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proowner) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(prolang) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(procost) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(prorows) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(provariadic) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(protransform) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proisagg) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proiswindow) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(prosecdef) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proleakproof) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proisstrict) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proretset) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(provolatile) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proparallel) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(pronargs) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(pronargdefaults) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(prorettype) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proargtypes) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proallargtypes) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proargmodes) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proargnames) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proargdefaults) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(protrftypes) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(prosrc) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(probin) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proconfig) ON TABLE pg_proc TO PUBLIC;\E\n.*
-		\QGRANT SELECT(proacl) ON TABLE pg_proc TO PUBLIC;\E/xms,
+		\QGRANT SELECT(tableoid) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(oid) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proname) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(pronamespace) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proowner) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(prolang) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(procost) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(prorows) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(provariadic) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(protransform) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proisagg) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proiswindow) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(prosecdef) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proleakproof) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proisstrict) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proretset) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(provolatile) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proparallel) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(pronargs) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(pronargdefaults) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(prorettype) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proargtypes) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proallargtypes) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proargmodes) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proargnames) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proargdefaults) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(protrftypes) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(prosrc) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(probin) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proconfig) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E\n.*
+		\QGRANT SELECT(proacl) ON TABLE pg_catalog.pg_proc TO PUBLIC;\E/xms,
 		like => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -6126,11 +6340,12 @@
 			\Q--\E\n\n
 			\QGRANT USAGE ON SCHEMA public TO PUBLIC;\E
 			/xm,
-		like => {
-			clean           => 1,
-			clean_if_exists => 1, },
+		# this shouldn't ever get emitted anymore
+		like => {},
 		unlike => {
 			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
 			createdb                 => 1,
 			defaults                 => 1,
 			exclude_dump_test_schema => 1,
@@ -6161,7 +6376,7 @@
 
 	'REFRESH MATERIALIZED VIEW matview' => {
 		all_runs => 1,
-		regexp   => qr/^REFRESH MATERIALIZED VIEW matview;/m,
+		regexp   => qr/^REFRESH MATERIALIZED VIEW dump_test.matview;/m,
 		like     => {
 			clean                   => 1,
 			clean_if_exists         => 1,
@@ -6193,9 +6408,9 @@
 	'REFRESH MATERIALIZED VIEW matview_second' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QREFRESH MATERIALIZED VIEW matview;\E
+			\QREFRESH MATERIALIZED VIEW dump_test.matview;\E
 			\n.*
-			\QREFRESH MATERIALIZED VIEW matview_second;\E
+			\QREFRESH MATERIALIZED VIEW dump_test.matview_second;\E
 			/xms,
 		like => {
 			clean                   => 1,
@@ -6228,7 +6443,7 @@
 	'REFRESH MATERIALIZED VIEW matview_third' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QREFRESH MATERIALIZED VIEW matview_third;\E
+			\QREFRESH MATERIALIZED VIEW dump_test.matview_third;\E
 			/xms,
 		like   => {},
 		unlike => {
@@ -6261,7 +6476,7 @@
 	'REFRESH MATERIALIZED VIEW matview_fourth' => {
 		all_runs => 1,
 		regexp   => qr/^
-			\QREFRESH MATERIALIZED VIEW matview_fourth;\E
+			\QREFRESH MATERIALIZED VIEW dump_test.matview_fourth;\E
 			/xms,
 		like   => {},
 		unlike => {
@@ -6332,7 +6547,7 @@
 		create_sql   => 'REVOKE EXECUTE ON FUNCTION pg_sleep(float8)
 						   FROM public;',
 		regexp => qr/^
-			\QREVOKE ALL ON FUNCTION pg_sleep(double precision) FROM PUBLIC;\E
+			\QREVOKE ALL ON FUNCTION pg_catalog.pg_sleep(double precision) FROM PUBLIC;\E
 			/xm,
 		like => {
 			binary_upgrade           => 1,
@@ -6363,7 +6578,7 @@
 		catch_all    => 'REVOKE commands',
 		create_order => 45,
 		create_sql   => 'REVOKE SELECT ON TABLE pg_proc FROM public;',
-		regexp       => qr/^REVOKE SELECT ON TABLE pg_proc FROM PUBLIC;/m,
+		regexp       => qr/^REVOKE SELECT ON TABLE pg_catalog.pg_proc FROM PUBLIC;/m,
 		like         => {
 			binary_upgrade           => 1,
 			clean                    => 1,
@@ -6399,6 +6614,8 @@
 			/xm,
 		like => {
 			binary_upgrade           => 1,
+			clean                    => 1,
+			clean_if_exists          => 1,
 			createdb                 => 1,
 			defaults                 => 1,
 			exclude_dump_test_schema => 1,
@@ -6411,8 +6628,6 @@
 			section_pre_data         => 1,
 			with_oids                => 1, },
 		unlike => {
-			clean                    => 1,
-			clean_if_exists          => 1,
 			only_dump_test_schema    => 1,
 			only_dump_test_table     => 1,
 			pg_dumpall_globals_clean => 1,
@@ -6438,18 +6653,18 @@
 			exclude_test_table_data  => 1,
 			no_blobs                 => 1,
 			no_owner                 => 1,
+			only_dump_test_schema    => 1,
+			only_dump_test_table     => 1,
 			pg_dumpall_dbprivs       => 1,
+			role                     => 1,
 			schema_only              => 1,
 			section_pre_data         => 1,
+			test_schema_plus_blobs   => 1,
 			with_oids                => 1, },
 		unlike => {
-			only_dump_test_schema    => 1,
-			only_dump_test_table     => 1,
 			pg_dumpall_globals_clean => 1,
-			role                     => 1,
 			section_data             => 1,
-			section_post_data        => 1,
-			test_schema_plus_blobs   => 1, }, },
+			section_post_data        => 1, }, },
 
 	'REVOKE commands' => {    # catch-all for REVOKE commands
 		all_runs => 0,               # catch-all
diff --git a/src/bin/pg_resetwal/Makefile b/src/bin/pg_resetwal/Makefile
index 0f6e5da255..5ab7ad33e0 100644
--- a/src/bin/pg_resetwal/Makefile
+++ b/src/bin/pg_resetwal/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_resetwal
 #
-# Copyright (c) 1998-2017, PostgreSQL Global Development Group
+# Copyright (c) 1998-2018, PostgreSQL Global Development Group
 #
 # src/bin/pg_resetwal/Makefile
 #
diff --git a/src/bin/pg_resetwal/pg_resetwal.c b/src/bin/pg_resetwal/pg_resetwal.c
index ac67831779..a132cf2e9f 100644
--- a/src/bin/pg_resetwal/pg_resetwal.c
+++ b/src/bin/pg_resetwal/pg_resetwal.c
@@ -20,7 +20,7 @@
  * step 2 ...
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pg_resetwal/pg_resetwal.c
@@ -70,6 +70,7 @@ static MultiXactId set_mxid = 0;
 static MultiXactOffset set_mxoff = (MultiXactOffset) -1;
 static uint32 minXlogTli = 0;
 static XLogSegNo minXlogSegNo = 0;
+static int	WalSegSz;
 
 static void CheckDataVersion(void);
 static bool ReadControlFile(void);
@@ -94,6 +95,7 @@ main(int argc, char *argv[])
 	char	   *endptr;
 	char	   *endptr2;
 	char	   *DataDir = NULL;
+	char	   *log_fname = NULL;
 	int			fd;
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_resetwal"));
@@ -265,7 +267,12 @@ main(int argc, char *argv[])
 					fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
 					exit(1);
 				}
-				XLogFromFileName(optarg, &minXlogTli, &minXlogSegNo);
+
+				/*
+				 * XLogFromFileName requires wal segment size which is not yet
+				 * set. Hence wal details are set later on.
+				 */
+				log_fname = pg_strdup(optarg);
 				break;
 
 			default:
@@ -350,6 +357,9 @@ main(int argc, char *argv[])
 	if (!ReadControlFile())
 		GuessControlValues();
 
+	if (log_fname != NULL)
+		XLogFromFileName(log_fname, &minXlogTli, &minXlogSegNo, WalSegSz);
+
 	/*
 	 * Also look at existing segment files to set up newXlogSegNo
 	 */
@@ -573,18 +583,27 @@ ReadControlFile(void)
 					offsetof(ControlFileData, crc));
 		FIN_CRC32C(crc);
 
-		if (EQ_CRC32C(crc, ((ControlFileData *) buffer)->crc))
+		if (!EQ_CRC32C(crc, ((ControlFileData *) buffer)->crc))
 		{
-			/* Valid data... */
-			memcpy(&ControlFile, buffer, sizeof(ControlFile));
-			return true;
+			/* We will use the data but treat it as guessed. */
+			fprintf(stderr,
+					_("%s: pg_control exists but has invalid CRC; proceed with caution\n"),
+					progname);
+			guessed = true;
 		}
 
-		fprintf(stderr, _("%s: pg_control exists but has invalid CRC; proceed with caution\n"),
-				progname);
-		/* We will use the data anyway, but treat it as guessed. */
 		memcpy(&ControlFile, buffer, sizeof(ControlFile));
-		guessed = true;
+		WalSegSz = ControlFile.xlog_seg_size;
+
+		/* return false if WalSegSz is not valid */
+		if (!IsValidWalSegSize(WalSegSz))
+		{
+			fprintf(stderr,
+					_("%s: pg_control specifies invalid WAL segment size (%d bytes); proceed with caution \n"),
+					progname, WalSegSz);
+			guessed = true;
+		}
+
 		return true;
 	}
 
@@ -660,7 +679,7 @@ GuessControlValues(void)
 	ControlFile.blcksz = BLCKSZ;
 	ControlFile.relseg_size = RELSEG_SIZE;
 	ControlFile.xlog_blcksz = XLOG_BLCKSZ;
-	ControlFile.xlog_seg_size = XLOG_SEG_SIZE;
+	ControlFile.xlog_seg_size = DEFAULT_XLOG_SEG_SIZE;
 	ControlFile.nameDataLen = NAMEDATALEN;
 	ControlFile.indexMaxKeys = INDEX_MAX_KEYS;
 	ControlFile.toast_max_chunk_size = TOAST_MAX_CHUNK_SIZE;
@@ -773,7 +792,8 @@ PrintNewControlValues(void)
 	/* This will be always printed in order to keep format same. */
 	printf(_("\n\nValues to be changed:\n\n"));
 
-	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID, newXlogSegNo);
+	XLogFileName(fname, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
 	printf(_("First log segment after reset:        %s\n"), fname);
 
 	if (set_mxid != 0)
@@ -850,13 +870,12 @@ RewriteControlFile(void)
 	 * newXlogSegNo.
 	 */
 	XLogSegNoOffsetToRecPtr(newXlogSegNo, SizeOfXLogLongPHD,
-							ControlFile.checkPointCopy.redo);
+							ControlFile.checkPointCopy.redo, WalSegSz);
 	ControlFile.checkPointCopy.time = (pg_time_t) time(NULL);
 
 	ControlFile.state = DB_SHUTDOWNED;
 	ControlFile.time = (pg_time_t) time(NULL);
 	ControlFile.checkPoint = ControlFile.checkPointCopy.redo;
-	ControlFile.prevCheckPoint = 0;
 	ControlFile.minRecoveryPoint = 0;
 	ControlFile.minRecoveryPointTLI = 0;
 	ControlFile.backupStartPoint = 0;
@@ -877,7 +896,7 @@ RewriteControlFile(void)
 	ControlFile.max_locks_per_xact = 64;
 
 	/* Now we can force the recorded xlog seg size to the right thing. */
-	ControlFile.xlog_seg_size = XLogSegSize;
+	ControlFile.xlog_seg_size = WalSegSz;
 
 	/* Contents are protected with a CRC */
 	INIT_CRC32C(ControlFile.crc);
@@ -1014,7 +1033,7 @@ FindEndOfXLOG(void)
 	 * are in virgin territory.
 	 */
 	xlogbytepos = newXlogSegNo * ControlFile.xlog_seg_size;
-	newXlogSegNo = (xlogbytepos + XLogSegSize - 1) / XLogSegSize;
+	newXlogSegNo = (xlogbytepos + WalSegSz - 1) / WalSegSz;
 	newXlogSegNo++;
 }
 
@@ -1151,7 +1170,7 @@ WriteEmptyXLOG(void)
 	page->xlp_pageaddr = ControlFile.checkPointCopy.redo - SizeOfXLogLongPHD;
 	longpage = (XLogLongPageHeader) page;
 	longpage->xlp_sysid = ControlFile.system_identifier;
-	longpage->xlp_seg_size = XLogSegSize;
+	longpage->xlp_seg_size = WalSegSz;
 	longpage->xlp_xlog_blcksz = XLOG_BLCKSZ;
 
 	/* Insert the initial checkpoint record */
@@ -1176,7 +1195,8 @@ WriteEmptyXLOG(void)
 	record->xl_crc = crc;
 
 	/* Write the first page */
-	XLogFilePath(path, ControlFile.checkPointCopy.ThisTimeLineID, newXlogSegNo);
+	XLogFilePath(path, ControlFile.checkPointCopy.ThisTimeLineID,
+				 newXlogSegNo, WalSegSz);
 
 	unlink(path);
 
@@ -1202,7 +1222,7 @@ WriteEmptyXLOG(void)
 
 	/* Fill the rest of the file with zeroes */
 	memset(buffer, 0, XLOG_BLCKSZ);
-	for (nbytes = XLOG_BLCKSZ; nbytes < XLogSegSize; nbytes += XLOG_BLCKSZ)
+	for (nbytes = XLOG_BLCKSZ; nbytes < WalSegSz; nbytes += XLOG_BLCKSZ)
 	{
 		errno = 0;
 		if (write(fd, buffer, XLOG_BLCKSZ) != XLOG_BLCKSZ)
diff --git a/src/bin/pg_rewind/Makefile b/src/bin/pg_rewind/Makefile
index e64ad76509..422c3eeba8 100644
--- a/src/bin/pg_rewind/Makefile
+++ b/src/bin/pg_rewind/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pg_rewind
 #
-# Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
 #
 # src/bin/pg_rewind/Makefile
 #
diff --git a/src/bin/pg_rewind/RewindTest.pm b/src/bin/pg_rewind/RewindTest.pm
index 6649c22b4f..00b5b42dd7 100644
--- a/src/bin/pg_rewind/RewindTest.pm
+++ b/src/bin/pg_rewind/RewindTest.pm
@@ -35,6 +35,7 @@ package RewindTest;
 use strict;
 use warnings;
 
+use Carp;
 use Config;
 use Exporter 'import';
 use File::Copy;
@@ -114,10 +115,16 @@ sub check_query
 
 sub setup_cluster
 {
+	my $extra_name = shift;
 
 	# Initialize master, data checksums are mandatory
-	$node_master = get_new_node('master');
+	$node_master = get_new_node('master' . ($extra_name ? "_${extra_name}" : ''));
 	$node_master->init(allows_streaming => 1);
+	# Set wal_keep_segments to prevent WAL segment recycling after enforced
+	# checkpoints in the tests.
+	$node_master->append_conf('postgresql.conf', qq(
+wal_keep_segments = 20
+));
 }
 
 sub start_master
@@ -130,7 +137,9 @@ sub start_master
 
 sub create_standby
 {
-	$node_standby = get_new_node('standby');
+	my $extra_name = shift;
+
+	$node_standby = get_new_node('standby' . ($extra_name ? "_${extra_name}" : ''));
 	$node_master->backup('my_backup');
 	$node_standby->init_from_backup($node_master, 'my_backup');
 	my $connstr_master = $node_master->connstr();
@@ -155,10 +164,7 @@ sub promote_standby
 	# up standby
 
 	# Wait for the standby to receive and write all WAL.
-	my $wal_received_query =
-"SELECT pg_current_wal_lsn() = write_lsn FROM pg_stat_replication WHERE application_name = 'rewind_standby';";
-	$node_master->poll_query_until('postgres', $wal_received_query)
-	  or die "Timed out while waiting for standby to receive and write WAL";
+	$node_master->wait_for_catchup('rewind_standby', 'write');
 
 	# Now promote standby and insert some new data on master, this will put
 	# the master out-of-sync with the standby.
@@ -223,7 +229,7 @@ sub run_pg_rewind
 	{
 
 		# Cannot come here normally
-		die("Incorrect test mode specified");
+		croak("Incorrect test mode specified");
 	}
 
 	# Now move back postgresql.conf with old settings
diff --git a/src/bin/pg_rewind/copy_fetch.c b/src/bin/pg_rewind/copy_fetch.c
index f7ac5b30b5..04db409675 100644
--- a/src/bin/pg_rewind/copy_fetch.c
+++ b/src/bin/pg_rewind/copy_fetch.c
@@ -3,7 +3,7 @@
  * copy_fetch.c
  *	  Functions for using a data directory as the source.
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -156,7 +156,7 @@ recurse_dir(const char *datadir, const char *parentpath,
  * If 'trunc' is true, any existing file with the same name is truncated.
  */
 static void
-copy_file_range(const char *path, off_t begin, off_t end, bool trunc)
+rewind_copy_file_range(const char *path, off_t begin, off_t end, bool trunc)
 {
 	char		buf[BLCKSZ];
 	char		srcpath[MAXPGPATH];
@@ -222,7 +222,7 @@ copy_executeFileMap(filemap_t *map)
 				break;
 
 			case FILE_ACTION_COPY:
-				copy_file_range(entry->path, 0, entry->newsize, true);
+				rewind_copy_file_range(entry->path, 0, entry->newsize, true);
 				break;
 
 			case FILE_ACTION_TRUNCATE:
@@ -230,7 +230,8 @@ copy_executeFileMap(filemap_t *map)
 				break;
 
 			case FILE_ACTION_COPY_TAIL:
-				copy_file_range(entry->path, entry->oldsize, entry->newsize, false);
+				rewind_copy_file_range(entry->path, entry->oldsize,
+									   entry->newsize, false);
 				break;
 
 			case FILE_ACTION_CREATE:
@@ -257,7 +258,7 @@ execute_pagemap(datapagemap_t *pagemap, const char *path)
 	while (datapagemap_next(iter, &blkno))
 	{
 		offset = blkno * BLCKSZ;
-		copy_file_range(path, offset, offset + BLCKSZ, false);
+		rewind_copy_file_range(path, offset, offset + BLCKSZ, false);
 		/* Ok, this block has now been copied from new data dir to old */
 	}
 	pg_free(iter);
diff --git a/src/bin/pg_rewind/datapagemap.c b/src/bin/pg_rewind/datapagemap.c
index e53920d556..01bb1a4694 100644
--- a/src/bin/pg_rewind/datapagemap.c
+++ b/src/bin/pg_rewind/datapagemap.c
@@ -5,7 +5,7 @@
  *
  * This is a fairly simple bitmap.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/datapagemap.h b/src/bin/pg_rewind/datapagemap.h
index db991c16df..50c0ef779c 100644
--- a/src/bin/pg_rewind/datapagemap.h
+++ b/src/bin/pg_rewind/datapagemap.h
@@ -2,7 +2,7 @@
  *
  * datapagemap.h
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/fetch.c b/src/bin/pg_rewind/fetch.c
index e9353d8866..5a35a8f2e3 100644
--- a/src/bin/pg_rewind/fetch.c
+++ b/src/bin/pg_rewind/fetch.c
@@ -10,7 +10,7 @@
  * connection (libpq_fetch.c)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -51,7 +51,7 @@ executeFileMap(void)
  * handy for text files.
  */
 char *
-fetchFile(char *filename, size_t *filesize)
+fetchFile(const char *filename, size_t *filesize)
 {
 	if (datadir_source)
 		return slurpFile(datadir_source, filename, filesize);
diff --git a/src/bin/pg_rewind/fetch.h b/src/bin/pg_rewind/fetch.h
index 1e08f76b3e..5ee06817b6 100644
--- a/src/bin/pg_rewind/fetch.h
+++ b/src/bin/pg_rewind/fetch.h
@@ -8,7 +8,7 @@
  * directory (copy method), or a remote PostgreSQL server (libpq fetch
  * method).
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -24,7 +24,7 @@
  * config options.
  */
 extern void fetchSourceFileList(void);
-extern char *fetchFile(char *filename, size_t *filesize);
+extern char *fetchFile(const char *filename, size_t *filesize);
 extern void executeFileMap(void);
 
 /* in libpq_fetch.c */
diff --git a/src/bin/pg_rewind/file_ops.c b/src/bin/pg_rewind/file_ops.c
index 4229f0e056..705383d184 100644
--- a/src/bin/pg_rewind/file_ops.c
+++ b/src/bin/pg_rewind/file_ops.c
@@ -8,7 +8,7 @@
  * do nothing if it's enabled. You should avoid accessing the target files
  * directly but if you do, make sure you honor the --dry-run mode!
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/file_ops.h b/src/bin/pg_rewind/file_ops.h
index f9aea52d6d..be580ee4db 100644
--- a/src/bin/pg_rewind/file_ops.h
+++ b/src/bin/pg_rewind/file_ops.h
@@ -3,7 +3,7 @@
  * file_ops.h
  *	  Helper functions for operating on files
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/filemap.c b/src/bin/pg_rewind/filemap.c
index dd6919025d..19da1ee7e0 100644
--- a/src/bin/pg_rewind/filemap.c
+++ b/src/bin/pg_rewind/filemap.c
@@ -3,7 +3,7 @@
  * filemap.c
  *	  A data structure for keeping track of files that have changed.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/filemap.h b/src/bin/pg_rewind/filemap.h
index 6c97fa74d1..63ba32a6cd 100644
--- a/src/bin/pg_rewind/filemap.h
+++ b/src/bin/pg_rewind/filemap.h
@@ -2,7 +2,7 @@
  *
  * filemap.h
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *-------------------------------------------------------------------------
  */
 #ifndef FILEMAP_H
diff --git a/src/bin/pg_rewind/libpq_fetch.c b/src/bin/pg_rewind/libpq_fetch.c
index a6ff4e3817..8f8d504455 100644
--- a/src/bin/pg_rewind/libpq_fetch.c
+++ b/src/bin/pg_rewind/libpq_fetch.c
@@ -3,7 +3,7 @@
  * libpq_fetch.c
  *	  Functions for fetching files from a remote server.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -14,10 +14,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-/* for ntohl/htonl */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include "pg_rewind.h"
 #include "datapagemap.h"
 #include "fetch.h"
@@ -28,6 +24,8 @@
 #include "libpq-fe.h"
 #include "catalog/catalog.h"
 #include "catalog/pg_type.h"
+#include "fe_utils/connect.h"
+#include "port/pg_bswap.h"
 
 static PGconn *conn = NULL;
 
@@ -57,6 +55,12 @@ libpqConnect(const char *connstr)
 
 	pg_log(PG_PROGRESS, "connected to server\n");
 
+	res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
+	if (PQresultStatus(res) != PGRES_TUPLES_OK)
+		pg_fatal("could not clear search_path: %s",
+				 PQresultErrorMessage(res));
+	PQclear(res);
+
 	/*
 	 * Check that the server is not in hot standby mode. There is no
 	 * fundamental reason that couldn't be made to work, but it doesn't
@@ -220,28 +224,6 @@ libpqProcessFileList(void)
 	PQclear(res);
 }
 
-/*
- * Converts an int64 from network byte order to native format.
- */
-static int64
-pg_recvint64(int64 value)
-{
-	union
-	{
-		int64		i64;
-		uint32		i32[2];
-	}			swap;
-	int64		result;
-
-	swap.i64 = value;
-
-	result = (uint32) ntohl(swap.i32[0]);
-	result <<= 32;
-	result |= (uint32) ntohl(swap.i32[1]);
-
-	return result;
-}
-
 /*----
  * Runs a query, which returns pieces of files from the remote source data
  * directory, and overwrites the corresponding parts of target files with
@@ -270,6 +252,7 @@ receiveFileChunks(const char *sql)
 		char	   *filename;
 		int			filenamelen;
 		int64		chunkoff;
+		char		chunkoff_str[32];
 		int			chunksize;
 		char	   *chunk;
 
@@ -317,7 +300,7 @@ receiveFileChunks(const char *sql)
 
 		/* Read result set to local variables */
 		memcpy(&chunkoff, PQgetvalue(res, 0, 1), sizeof(int64));
-		chunkoff = pg_recvint64(chunkoff);
+		chunkoff = pg_ntoh64(chunkoff);
 		chunksize = PQgetlength(res, 0, 2);
 
 		filenamelen = PQgetlength(res, 0, 0);
@@ -342,8 +325,13 @@ receiveFileChunks(const char *sql)
 			continue;
 		}
 
-		pg_log(PG_DEBUG, "received chunk for file \"%s\", offset " INT64_FORMAT ", size %d\n",
-			   filename, chunkoff, chunksize);
+		/*
+		 * Separate step to keep platform-dependent format code out of
+		 * translatable strings.
+		 */
+		snprintf(chunkoff_str, sizeof(chunkoff_str), INT64_FORMAT, chunkoff);
+		pg_log(PG_DEBUG, "received chunk for file \"%s\", offset %s, size %d\n",
+			   filename, chunkoff_str, chunksize);
 
 		open_target_file(filename, false);
 
diff --git a/src/bin/pg_rewind/logging.c b/src/bin/pg_rewind/logging.c
index cae776df12..f48f7e9070 100644
--- a/src/bin/pg_rewind/logging.c
+++ b/src/bin/pg_rewind/logging.c
@@ -3,7 +3,7 @@
  * logging.c
  *	 logging functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_rewind/logging.h b/src/bin/pg_rewind/logging.h
index c665194050..66455039db 100644
--- a/src/bin/pg_rewind/logging.h
+++ b/src/bin/pg_rewind/logging.h
@@ -4,7 +4,7 @@
  *	 prototypes for logging functions
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
diff --git a/src/bin/pg_rewind/parsexlog.c b/src/bin/pg_rewind/parsexlog.c
index 1befdbdeea..b4c1f827a6 100644
--- a/src/bin/pg_rewind/parsexlog.c
+++ b/src/bin/pg_rewind/parsexlog.c
@@ -3,7 +3,7 @@
  * parsexlog.c
  *	  Functions for reading Write-Ahead-Log
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -69,7 +69,8 @@ extractPageMap(const char *datadir, XLogRecPtr startpoint, int tliIndex,
 
 	private.datadir = datadir;
 	private.tliIndex = tliIndex;
-	xlogreader = XLogReaderAllocate(&SimpleXLogPageRead, &private);
+	xlogreader = XLogReaderAllocate(WalSegSz, &SimpleXLogPageRead,
+									&private);
 	if (xlogreader == NULL)
 		pg_fatal("out of memory\n");
 
@@ -122,7 +123,8 @@ readOneRecord(const char *datadir, XLogRecPtr ptr, int tliIndex)
 
 	private.datadir = datadir;
 	private.tliIndex = tliIndex;
-	xlogreader = XLogReaderAllocate(&SimpleXLogPageRead, &private);
+	xlogreader = XLogReaderAllocate(WalSegSz, &SimpleXLogPageRead,
+									&private);
 	if (xlogreader == NULL)
 		pg_fatal("out of memory\n");
 
@@ -170,11 +172,17 @@ findLastCheckpoint(const char *datadir, XLogRecPtr forkptr, int tliIndex,
 	 * header in that case to find the next record.
 	 */
 	if (forkptr % XLOG_BLCKSZ == 0)
-		forkptr += (forkptr % XLogSegSize == 0) ? SizeOfXLogLongPHD : SizeOfXLogShortPHD;
+	{
+		if (XLogSegmentOffset(forkptr, WalSegSz) == 0)
+			forkptr += SizeOfXLogLongPHD;
+		else
+			forkptr += SizeOfXLogShortPHD;
+	}
 
 	private.datadir = datadir;
 	private.tliIndex = tliIndex;
-	xlogreader = XLogReaderAllocate(&SimpleXLogPageRead, &private);
+	xlogreader = XLogReaderAllocate(WalSegSz, &SimpleXLogPageRead,
+									&private);
 	if (xlogreader == NULL)
 		pg_fatal("out of memory\n");
 
@@ -239,21 +247,22 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 	XLogRecPtr	targetSegEnd;
 	XLogSegNo	targetSegNo;
 
-	XLByteToSeg(targetPagePtr, targetSegNo);
-	XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, targetSegEnd);
-	targetPageOff = targetPagePtr % XLogSegSize;
+	XLByteToSeg(targetPagePtr, targetSegNo, WalSegSz);
+	XLogSegNoOffsetToRecPtr(targetSegNo + 1, 0, targetSegEnd, WalSegSz);
+	targetPageOff = XLogSegmentOffset(targetPagePtr, WalSegSz);
 
 	/*
 	 * See if we need to switch to a new segment because the requested record
 	 * is not in the currently open one.
 	 */
-	if (xlogreadfd >= 0 && !XLByteInSeg(targetPagePtr, xlogreadsegno))
+	if (xlogreadfd >= 0 &&
+		!XLByteInSeg(targetPagePtr, xlogreadsegno, WalSegSz))
 	{
 		close(xlogreadfd);
 		xlogreadfd = -1;
 	}
 
-	XLByteToSeg(targetPagePtr, xlogreadsegno);
+	XLByteToSeg(targetPagePtr, xlogreadsegno, WalSegSz);
 
 	if (xlogreadfd < 0)
 	{
@@ -272,7 +281,8 @@ SimpleXLogPageRead(XLogReaderState *xlogreader, XLogRecPtr targetPagePtr,
 			   targetHistory[private->tliIndex].begin >= targetSegEnd)
 			private->tliIndex--;
 
-		XLogFileName(xlogfname, targetHistory[private->tliIndex].tli, xlogreadsegno);
+		XLogFileName(xlogfname, targetHistory[private->tliIndex].tli,
+					 xlogreadsegno, WalSegSz);
 
 		snprintf(xlogfpath, MAXPGPATH, "%s/" XLOGDIR "/%s", private->datadir, xlogfname);
 
diff --git a/src/bin/pg_rewind/pg_rewind.c b/src/bin/pg_rewind/pg_rewind.c
index 4bd1a75973..72ab2f8d5e 100644
--- a/src/bin/pg_rewind/pg_rewind.c
+++ b/src/bin/pg_rewind/pg_rewind.c
@@ -3,7 +3,7 @@
  * pg_rewind.c
  *	  Synchronizes a PostgreSQL data directory to a new timeline
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -44,6 +44,7 @@ static ControlFileData ControlFile_target;
 static ControlFileData ControlFile_source;
 
 const char *progname;
+int			WalSegSz;
 
 /* Configuration options */
 char	   *datadir_target = NULL;
@@ -572,8 +573,8 @@ createBackupLabel(XLogRecPtr startpoint, TimeLineID starttli, XLogRecPtr checkpo
 	char		buf[1000];
 	int			len;
 
-	XLByteToSeg(startpoint, startsegno);
-	XLogFileName(xlogfilename, starttli, startsegno);
+	XLByteToSeg(startpoint, startsegno, WalSegSz);
+	XLogFileName(xlogfilename, starttli, startsegno, WalSegSz);
 
 	/*
 	 * Construct backup label file
@@ -631,6 +632,13 @@ digestControlFile(ControlFileData *ControlFile, char *src, size_t size)
 
 	memcpy(ControlFile, src, sizeof(ControlFileData));
 
+	/* set and validate WalSegSz */
+	WalSegSz = ControlFile->xlog_seg_size;
+
+	if (!IsValidWalSegSize(WalSegSz))
+		pg_fatal("WAL segment size must be a power of two between 1MB and 1GB, but the control file specifies %d bytes\n",
+				 WalSegSz);
+
 	/* Additional checks on control file */
 	checkControlFile(ControlFile);
 }
diff --git a/src/bin/pg_rewind/pg_rewind.h b/src/bin/pg_rewind/pg_rewind.h
index 31353dd354..3f4ba7a267 100644
--- a/src/bin/pg_rewind/pg_rewind.h
+++ b/src/bin/pg_rewind/pg_rewind.h
@@ -3,7 +3,7 @@
  * pg_rewind.h
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -24,6 +24,7 @@ extern char *connstr_source;
 extern bool debug;
 extern bool showprogress;
 extern bool dry_run;
+extern int	WalSegSz;
 
 /* Target history */
 extern TimeLineHistoryEntry *targetHistory;
diff --git a/src/bin/pg_rewind/t/001_basic.pl b/src/bin/pg_rewind/t/001_basic.pl
index 1764b17c90..736f34eae3 100644
--- a/src/bin/pg_rewind/t/001_basic.pl
+++ b/src/bin/pg_rewind/t/001_basic.pl
@@ -9,7 +9,7 @@ sub run_test
 {
 	my $test_mode = shift;
 
-	RewindTest::setup_cluster();
+	RewindTest::setup_cluster($test_mode);
 	RewindTest::start_master();
 
 	# Create a test table and insert a row in master.
@@ -28,7 +28,7 @@ sub run_test
 
 	master_psql("CHECKPOINT");
 
-	RewindTest::create_standby();
+	RewindTest::create_standby($test_mode);
 
 	# Insert additional data on master that will be replicated to standby
 	master_psql("INSERT INTO tbl1 values ('in master, before promotion')");
diff --git a/src/bin/pg_rewind/t/002_databases.pl b/src/bin/pg_rewind/t/002_databases.pl
index 20bdb4ab59..37cdd712f3 100644
--- a/src/bin/pg_rewind/t/002_databases.pl
+++ b/src/bin/pg_rewind/t/002_databases.pl
@@ -9,13 +9,13 @@ sub run_test
 {
 	my $test_mode = shift;
 
-	RewindTest::setup_cluster();
+	RewindTest::setup_cluster($test_mode);
 	RewindTest::start_master();
 
 	# Create a database in master.
 	master_psql('CREATE DATABASE inmaster');
 
-	RewindTest::create_standby();
+	RewindTest::create_standby($test_mode);
 
 	# Create another database, the creation is replicated to the standby
 	master_psql('CREATE DATABASE beforepromotion');
diff --git a/src/bin/pg_rewind/t/003_extrafiles.pl b/src/bin/pg_rewind/t/003_extrafiles.pl
index cedde1409b..2433a4aab6 100644
--- a/src/bin/pg_rewind/t/003_extrafiles.pl
+++ b/src/bin/pg_rewind/t/003_extrafiles.pl
@@ -14,7 +14,7 @@ sub run_test
 {
 	my $test_mode = shift;
 
-	RewindTest::setup_cluster();
+	RewindTest::setup_cluster($test_mode);
 	RewindTest::start_master();
 
 	my $test_master_datadir = $node_master->data_dir;
@@ -27,7 +27,7 @@ sub run_test
 	append_to_file "$test_master_datadir/tst_both_dir/both_subdir/both_file3",
 	  "in both3";
 
-	RewindTest::create_standby();
+	RewindTest::create_standby($test_mode);
 
 	# Create different subdirs and files in master and standby
 	my $test_standby_datadir = $node_standby->data_dir;
diff --git a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
index 12950ea1ca..feadaa6a0f 100644
--- a/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
+++ b/src/bin/pg_rewind/t/004_pg_xlog_symlink.pl
@@ -26,7 +26,7 @@ sub run_test
 	my $master_xlogdir = "${TestLib::tmp_check}/xlog_master";
 
 	rmtree($master_xlogdir);
-	RewindTest::setup_cluster();
+	RewindTest::setup_cluster($test_mode);
 
 	my $test_master_datadir = $node_master->data_dir;
 
@@ -43,7 +43,7 @@ sub run_test
 
 	master_psql("CHECKPOINT");
 
-	RewindTest::create_standby();
+	RewindTest::create_standby($test_mode);
 
 	# Insert additional data on master that will be replicated to standby
 	master_psql("INSERT INTO tbl1 values ('in master, before promotion')");
diff --git a/src/bin/pg_rewind/timeline.c b/src/bin/pg_rewind/timeline.c
index 3cd5af57f2..8a8c587440 100644
--- a/src/bin/pg_rewind/timeline.c
+++ b/src/bin/pg_rewind/timeline.c
@@ -3,7 +3,7 @@
  * timeline.c
  *	  timeline-related functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/bin/pg_test_fsync/pg_test_fsync.c b/src/bin/pg_test_fsync/pg_test_fsync.c
index 266b2b6e41..e6f7ef8557 100644
--- a/src/bin/pg_test_fsync/pg_test_fsync.c
+++ b/src/bin/pg_test_fsync/pg_test_fsync.c
@@ -25,8 +25,9 @@
 #define XLOG_BLCKSZ_K	(XLOG_BLCKSZ / 1024)
 
 #define LABEL_FORMAT		"        %-30s"
-#define NA_FORMAT			"%20s"
-#define OPS_FORMAT			"%13.3f ops/sec  %6.0f usecs/op"
+#define NA_FORMAT			"%21s\n"
+/* translator: maintain alignment with NA_FORMAT */
+#define OPS_FORMAT			gettext_noop("%13.3f ops/sec  %6.0f usecs/op\n")
 #define USECS_SEC			1000000
 
 /* These are macros to avoid timing the function call overhead. */
@@ -45,7 +46,7 @@ do { \
 	if (CreateThread(NULL, 0, process_alarm, NULL, 0, NULL) == \
 		INVALID_HANDLE_VALUE) \
 	{ \
-		fprintf(stderr, _("Cannot create thread for alarm\n")); \
+		fprintf(stderr, _("Could not create thread for alarm\n")); \
 		exit(1); \
 	} \
 	gettimeofday(&start_t, NULL); \
@@ -63,7 +64,7 @@ static const char *progname;
 
 static int	secs_per_test = 5;
 static int	needs_unlink = 0;
-static char full_buf[XLOG_SEG_SIZE],
+static char full_buf[DEFAULT_XLOG_SEG_SIZE],
 		   *buf,
 		   *filename = FSYNC_FILENAME;
 static struct timeval start_t,
@@ -191,7 +192,10 @@ handle_args(int argc, char *argv[])
 		exit(1);
 	}
 
-	printf(_("%d seconds per test\n"), secs_per_test);
+	printf(ngettext("%d second per test\n",
+					"%d seconds per test\n",
+					secs_per_test),
+		   secs_per_test);
 #if PG_O_DIRECT != 0
 	printf(_("O_DIRECT supported on this platform for open_datasync and open_sync.\n"));
 #else
@@ -205,7 +209,7 @@ prepare_buf(void)
 	int			ops;
 
 	/* write random data into buffer */
-	for (ops = 0; ops < XLOG_SEG_SIZE; ops++)
+	for (ops = 0; ops < DEFAULT_XLOG_SEG_SIZE; ops++)
 		full_buf[ops] = random();
 
 	buf = (char *) TYPEALIGN(XLOG_BLCKSZ, full_buf);
@@ -222,7 +226,8 @@ test_open(void)
 	if ((tmpfile = open(filename, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR)) == -1)
 		die("could not open output file");
 	needs_unlink = 1;
-	if (write(tmpfile, full_buf, XLOG_SEG_SIZE) != XLOG_SEG_SIZE)
+	if (write(tmpfile, full_buf, DEFAULT_XLOG_SEG_SIZE) !=
+		DEFAULT_XLOG_SEG_SIZE)
 		die("write failed");
 
 	/* fsync now so that dirty buffers don't skew later tests */
@@ -255,7 +260,7 @@ test_sync(int writes_per_op)
 #ifdef OPEN_DATASYNC_FLAG
 	if ((tmpfile = open(filename, O_RDWR | O_DSYNC | PG_O_DIRECT, 0)) == -1)
 	{
-		printf(NA_FORMAT, _("n/a*\n"));
+		printf(NA_FORMAT, _("n/a*"));
 		fs_warning = true;
 	}
 	else
@@ -273,7 +278,7 @@ test_sync(int writes_per_op)
 		close(tmpfile);
 	}
 #else
-	printf(NA_FORMAT, _("n/a\n"));
+	printf(NA_FORMAT, _("n/a"));
 #endif
 
 /*
@@ -298,7 +303,7 @@ test_sync(int writes_per_op)
 	STOP_TIMER;
 	close(tmpfile);
 #else
-	printf(NA_FORMAT, _("n/a\n"));
+	printf(NA_FORMAT, _("n/a"));
 #endif
 
 /*
@@ -346,7 +351,7 @@ test_sync(int writes_per_op)
 	STOP_TIMER;
 	close(tmpfile);
 #else
-	printf(NA_FORMAT, _("n/a\n"));
+	printf(NA_FORMAT, _("n/a"));
 #endif
 
 /*
@@ -358,7 +363,7 @@ test_sync(int writes_per_op)
 #ifdef OPEN_SYNC_FLAG
 	if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG | PG_O_DIRECT, 0)) == -1)
 	{
-		printf(NA_FORMAT, _("n/a*\n"));
+		printf(NA_FORMAT, _("n/a*"));
 		fs_warning = true;
 	}
 	else
@@ -383,7 +388,7 @@ test_sync(int writes_per_op)
 		close(tmpfile);
 	}
 #else
-	printf(NA_FORMAT, _("n/a\n"));
+	printf(NA_FORMAT, _("n/a"));
 #endif
 
 	if (fs_warning)
@@ -424,7 +429,7 @@ test_open_sync(const char *msg, int writes_size)
 
 #ifdef OPEN_SYNC_FLAG
 	if ((tmpfile = open(filename, O_RDWR | OPEN_SYNC_FLAG | PG_O_DIRECT, 0)) == -1)
-		printf(NA_FORMAT, _("n/a*\n"));
+		printf(NA_FORMAT, _("n/a*"));
 	else
 	{
 		START_TIMER;
@@ -441,7 +446,7 @@ test_open_sync(const char *msg, int writes_size)
 		close(tmpfile);
 	}
 #else
-	printf(NA_FORMAT, _("n/a\n"));
+	printf(NA_FORMAT, _("n/a"));
 #endif
 }
 
@@ -577,7 +582,7 @@ print_elapse(struct timeval start_t, struct timeval stop_t, int ops)
 	double		per_second = ops / total_time;
 	double		avg_op_time_us = (total_time / ops) * USECS_SEC;
 
-	printf(OPS_FORMAT "\n", per_second, avg_op_time_us);
+	printf(_(OPS_FORMAT), per_second, avg_op_time_us);
 }
 
 #ifndef WIN32
diff --git a/src/bin/pg_test_timing/pg_test_timing.c b/src/bin/pg_test_timing/pg_test_timing.c
index 2f1ab7cd60..6e2fd1ab8c 100644
--- a/src/bin/pg_test_timing/pg_test_timing.c
+++ b/src/bin/pg_test_timing/pg_test_timing.c
@@ -172,13 +172,22 @@ output(uint64 loop_count)
 {
 	int64		max_bit = 31,
 				i;
+	char	   *header1 = _("< us");
+	char	   *header2 = /* xgettext:no-c-format */ _("% of total");
+	char	   *header3 = _("count");
+	int			len1 = strlen(header1);
+	int			len2 = strlen(header2);
+	int			len3 = strlen(header3);
 
 	/* find highest bit value */
 	while (max_bit > 0 && histogram[max_bit] == 0)
 		max_bit--;
 
 	printf(_("Histogram of timing durations:\n"));
-	printf("%6s   %10s %10s\n", _("< us"), _("% of total"), _("count"));
+	printf("%*s   %*s %*s\n",
+		   Max(6, len1), header1,
+		   Max(10, len2), header2,
+		   Max(10, len3), header3);
 
 	for (i = 0; i <= max_bit; i++)
 	{
@@ -186,7 +195,9 @@ output(uint64 loop_count)
 
 		/* lame hack to work around INT64_FORMAT deficiencies */
 		snprintf(buf, sizeof(buf), INT64_FORMAT, histogram[i]);
-		printf("%6ld    %9.5f %10s\n", 1l << i,
-			   (double) histogram[i] * 100 / loop_count, buf);
+		printf("%*ld    %*.5f %*s\n",
+			   Max(6, len1), 1l << i,
+			   Max(10, len2) - 1, (double) histogram[i] * 100 / loop_count,
+			   Max(10, len3), buf);
 	}
 }
diff --git a/src/bin/pg_upgrade/check.c b/src/bin/pg_upgrade/check.c
index 11f804b7e8..8d4f254f9f 100644
--- a/src/bin/pg_upgrade/check.c
+++ b/src/bin/pg_upgrade/check.c
@@ -3,7 +3,7 @@
  *
  *	server checks and output routines
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/check.c
  */
 
@@ -62,13 +62,15 @@ output_check_banner(bool live_check)
 {
 	if (user_opts.check && live_check)
 	{
-		pg_log(PG_REPORT, "Performing Consistency Checks on Old Live Server\n");
-		pg_log(PG_REPORT, "------------------------------------------------\n");
+		pg_log(PG_REPORT,
+			   "Performing Consistency Checks on Old Live Server\n"
+			   "------------------------------------------------\n");
 	}
 	else
 	{
-		pg_log(PG_REPORT, "Performing Consistency Checks\n");
-		pg_log(PG_REPORT, "-----------------------------\n");
+		pg_log(PG_REPORT,
+			   "Performing Consistency Checks\n"
+			   "-----------------------------\n");
 	}
 }
 
@@ -232,9 +234,9 @@ check_cluster_versions(void)
 {
 	prep_status("Checking cluster versions");
 
-	/* get old and new cluster versions */
-	old_cluster.major_version = get_major_server_version(&old_cluster);
-	new_cluster.major_version = get_major_server_version(&new_cluster);
+	/* cluster versions should already have been obtained */
+	Assert(old_cluster.major_version != 0);
+	Assert(new_cluster.major_version != 0);
 
 	/*
 	 * We allow upgrades from/to the same major version for alpha/beta
@@ -277,12 +279,6 @@ check_cluster_compatibility(bool live_check)
 	get_control_data(&new_cluster, false);
 	check_control_data(&old_cluster.controldata, &new_cluster.controldata);
 
-	/* Is it 9.0 but without tablespace directories? */
-	if (GET_MAJOR_VERSION(new_cluster.major_version) == 900 &&
-		new_cluster.controldata.cat_ver < TABLE_SPACE_SUBDIRS_CAT_VER)
-		pg_fatal("This utility can only upgrade to PostgreSQL version 9.0 after 2010-01-11\n"
-				 "because of backend API changes made during development.\n");
-
 	/* We read the real port number for PG >= 9.1 */
 	if (live_check && GET_MAJOR_VERSION(old_cluster.major_version) < 901 &&
 		old_cluster.port == DEF_PGUPORT)
@@ -991,7 +987,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
 	bool		found = false;
 	char		output_path[MAXPGPATH];
 
-	prep_status("Checking for JSONB user data types");
+	prep_status("Checking for incompatible \"jsonb\" data type");
 
 	snprintf(output_path, sizeof(output_path), "tables_using_jsonb.txt");
 
@@ -1022,7 +1018,7 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
 								"		a.atttypid = 'pg_catalog.jsonb'::pg_catalog.regtype AND "
 								"		c.relnamespace = n.oid AND "
 		/* exclude possible orphaned temp tables */
-								"  		n.nspname !~ '^pg_temp_' AND "
+								"		n.nspname !~ '^pg_temp_' AND "
 								"		n.nspname NOT IN ('pg_catalog', 'information_schema')");
 
 		ntups = PQntuples(res);
@@ -1057,8 +1053,8 @@ check_for_jsonb_9_4_usage(ClusterInfo *cluster)
 	if (found)
 	{
 		pg_log(PG_REPORT, "fatal\n");
-		pg_fatal("Your installation contains one of the JSONB data types in user tables.\n"
-				 "The internal format of JSONB changed during 9.4 beta so this cluster cannot currently\n"
+		pg_fatal("Your installation contains the \"jsonb\" data type in user tables.\n"
+				 "The internal format of \"jsonb\" changed during 9.4 beta so this cluster cannot currently\n"
 				 "be upgraded.  You can remove the problem tables and restart the upgrade.  A list\n"
 				 "of the problem columns is in the file:\n"
 				 "    %s\n\n", output_path);
@@ -1078,7 +1074,7 @@ check_for_pg_role_prefix(ClusterInfo *cluster)
 	PGresult   *res;
 	PGconn	   *conn = connectToServer(cluster, "template1");
 
-	prep_status("Checking for roles starting with 'pg_'");
+	prep_status("Checking for roles starting with \"pg_\"");
 
 	res = executeQueryOrDie(conn,
 							"SELECT * "
@@ -1088,9 +1084,9 @@ check_for_pg_role_prefix(ClusterInfo *cluster)
 	if (PQntuples(res) != 0)
 	{
 		if (cluster == &old_cluster)
-			pg_fatal("The source cluster contains roles starting with 'pg_'\n");
+			pg_fatal("The source cluster contains roles starting with \"pg_\"\n");
 		else
-			pg_fatal("The target cluster contains roles starting with 'pg_'\n");
+			pg_fatal("The target cluster contains roles starting with \"pg_\"\n");
 	}
 
 	PQclear(res);
diff --git a/src/bin/pg_upgrade/controldata.c b/src/bin/pg_upgrade/controldata.c
index ca3db1a2f6..0fe98a550e 100644
--- a/src/bin/pg_upgrade/controldata.c
+++ b/src/bin/pg_upgrade/controldata.c
@@ -3,7 +3,7 @@
  *
  *	controldata functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/controldata.c
  */
 
diff --git a/src/bin/pg_upgrade/dump.c b/src/bin/pg_upgrade/dump.c
index 77c03ac05b..def22c6521 100644
--- a/src/bin/pg_upgrade/dump.c
+++ b/src/bin/pg_upgrade/dump.c
@@ -3,7 +3,7 @@
  *
  *	dump functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/dump.c
  */
 
@@ -18,12 +18,11 @@ void
 generate_old_dump(void)
 {
 	int			dbnum;
-	mode_t		old_umask;
 
 	prep_status("Creating dump of global objects");
 
 	/* run new pg_dumpall binary for globals */
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/pg_dumpall\" %s --globals-only --quote-all-identifiers "
 			  "--binary-upgrade %s -f %s",
 			  new_cluster.bindir, cluster_conn_opts(&old_cluster),
@@ -33,13 +32,6 @@ generate_old_dump(void)
 
 	prep_status("Creating dump of database schemas\n");
 
-	/*
-	 * Set umask for this function, all functions it calls, and all
-	 * subprocesses/threads it creates.  We can't use fopen_priv() as Windows
-	 * uses threads and umask is process-global.
-	 */
-	old_umask = umask(S_IRWXG | S_IRWXO);
-
 	/* create per-db dump files */
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
 	{
@@ -74,8 +66,6 @@ generate_old_dump(void)
 	while (reap_child(true) == true)
 		;
 
-	umask(old_umask);
-
 	end_progress_output();
 	check_ok();
 }
diff --git a/src/bin/pg_upgrade/exec.c b/src/bin/pg_upgrade/exec.c
index cc4b4078db..9122e2769e 100644
--- a/src/bin/pg_upgrade/exec.c
+++ b/src/bin/pg_upgrade/exec.c
@@ -3,7 +3,7 @@
  *
  *	execution functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/exec.c
  */
 
@@ -26,7 +26,7 @@ static int	win32_check_directory_write_permissions(void);
 /*
  * get_bin_version
  *
- *	Fetch versions of binaries for cluster.
+ *	Fetch major version of binaries for cluster.
  */
 static void
 get_bin_version(ClusterInfo *cluster)
@@ -34,8 +34,8 @@ get_bin_version(ClusterInfo *cluster)
 	char		cmd[MAXPGPATH],
 				cmd_output[MAX_STRING];
 	FILE	   *output;
-	int			pre_dot = 0,
-				post_dot = 0;
+	int			v1 = 0,
+				v2 = 0;
 
 	snprintf(cmd, sizeof(cmd), "\"%s/pg_ctl\" --version", cluster->bindir);
 
@@ -46,14 +46,19 @@ get_bin_version(ClusterInfo *cluster)
 
 	pclose(output);
 
-	/* Remove trailing newline */
-	if (strchr(cmd_output, '\n') != NULL)
-		*strchr(cmd_output, '\n') = '\0';
+	if (sscanf(cmd_output, "%*s %*s %d.%d", &v1, &v2) < 1)
+		pg_fatal("could not get pg_ctl version output from %s\n", cmd);
 
-	if (sscanf(cmd_output, "%*s %*s %d.%d", &pre_dot, &post_dot) < 1)
-		pg_fatal("could not get version from %s\n", cmd);
-
-	cluster->bin_version = (pre_dot * 100 + post_dot) * 100;
+	if (v1 < 10)
+	{
+		/* old style, e.g. 9.6.1 */
+		cluster->bin_version = v1 * 10000 + v2 * 100;
+	}
+	else
+	{
+		/* new style, e.g. 10.1 */
+		cluster->bin_version = v1 * 10000;
+	}
 }
 
 
@@ -66,16 +71,14 @@ get_bin_version(ClusterInfo *cluster)
  * and attempts to execute that command.  If the command executes
  * successfully, exec_prog() returns true.
  *
- * If the command fails, an error message is saved to the specified log_file.
- * If throw_error is true, this raises a PG_FATAL error and pg_upgrade
- * terminates; otherwise it is just reported as PG_REPORT and exec_prog()
- * returns false.
+ * If the command fails, an error message is optionally written to the specified
+ * log_file, and the program optionally exits.
  *
  * The code requires it be called first from the primary thread on Windows.
  */
 bool
 exec_prog(const char *log_file, const char *opt_log_file,
-		  bool throw_error, const char *fmt,...)
+		  bool report_error, bool exit_on_error, const char *fmt,...)
 {
 	int			result = 0;
 	int			written;
@@ -107,7 +110,6 @@ exec_prog(const char *log_file, const char *opt_log_file,
 	pg_log(PG_VERBOSE, "%s\n", cmd);
 
 #ifdef WIN32
-
 	/*
 	 * For some reason, Windows issues a file-in-use error if we write data to
 	 * the log file from a non-primary thread just before we create a
@@ -143,7 +145,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 #endif
 
 	if (log == NULL)
-		pg_fatal("cannot write to log file %s\n", log_file);
+		pg_fatal("could not write to log file \"%s\"\n", log_file);
 
 #ifdef WIN32
 	/* Are we printing "command:" before its output? */
@@ -169,7 +171,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 #endif
 		result = system(cmd);
 
-	if (result != 0)
+	if (result != 0 && report_error)
 	{
 		/* we might be in on a progress status line, so go to the next line */
 		report_status(PG_REPORT, "\n*failure*");
@@ -177,19 +179,18 @@ exec_prog(const char *log_file, const char *opt_log_file,
 
 		pg_log(PG_VERBOSE, "There were problems executing \"%s\"\n", cmd);
 		if (opt_log_file)
-			pg_log(throw_error ? PG_FATAL : PG_REPORT,
+			pg_log(exit_on_error ? PG_FATAL : PG_REPORT,
 				   "Consult the last few lines of \"%s\" or \"%s\" for\n"
 				   "the probable cause of the failure.\n",
 				   log_file, opt_log_file);
 		else
-			pg_log(throw_error ? PG_FATAL : PG_REPORT,
+			pg_log(exit_on_error ? PG_FATAL : PG_REPORT,
 				   "Consult the last few lines of \"%s\" for\n"
 				   "the probable cause of the failure.\n",
 				   log_file);
 	}
 
 #ifndef WIN32
-
 	/*
 	 * We can't do this on Windows because it will keep the "pg_ctl start"
 	 * output filename open until the server stops, so we do the \n\n above on
@@ -198,7 +199,7 @@ exec_prog(const char *log_file, const char *opt_log_file,
 	 * log these commands to a third file, but that just adds complexity.
 	 */
 	if ((log = fopen(log_file, "a")) == NULL)
-		pg_fatal("cannot write to log file %s\n", log_file);
+		pg_fatal("could not write to log file \"%s\"\n", log_file);
 	fprintf(log, "\n\n");
 	fclose(log);
 #endif
@@ -307,7 +308,7 @@ check_single_dir(const char *pg_data, const char *subdir)
 		report_status(PG_FATAL, "check for \"%s\" failed: %s\n",
 					  subDirName, strerror(errno));
 	else if (!S_ISDIR(statBuf.st_mode))
-		report_status(PG_FATAL, "%s is not a directory\n",
+		report_status(PG_FATAL, "\"%s\" is not a directory\n",
 					  subDirName);
 }
 
@@ -326,9 +327,8 @@ check_data_dir(ClusterInfo *cluster)
 {
 	const char *pg_data = cluster->pgdata;
 
-	/* get old and new cluster versions */
-	old_cluster.major_version = get_major_server_version(&old_cluster);
-	new_cluster.major_version = get_major_server_version(&new_cluster);
+	/* get the cluster version */
+	cluster->major_version = get_major_server_version(cluster);
 
 	check_single_dir(pg_data, "");
 	check_single_dir(pg_data, "base");
@@ -370,19 +370,18 @@ check_bin_dir(ClusterInfo *cluster)
 		report_status(PG_FATAL, "check for \"%s\" failed: %s\n",
 					  cluster->bindir, strerror(errno));
 	else if (!S_ISDIR(statBuf.st_mode))
-		report_status(PG_FATAL, "%s is not a directory\n",
+		report_status(PG_FATAL, "\"%s\" is not a directory\n",
 					  cluster->bindir);
 
 	validate_exec(cluster->bindir, "postgres");
 	validate_exec(cluster->bindir, "pg_ctl");
 
 	/*
-	 * Fetch the binary versions after checking for the existence of pg_ctl,
-	 * this gives a correct error if the binary used itself for the version
-	 * fetching is broken.
+	 * Fetch the binary version after checking for the existence of pg_ctl.
+	 * This way we report a useful error if the pg_ctl binary used for version
+	 * fetching is missing/broken.
 	 */
-	get_bin_version(&old_cluster);
-	get_bin_version(&new_cluster);
+	get_bin_version(cluster);
 
 	/* pg_resetxlog has been renamed to pg_resetwal in version 10 */
 	if (GET_MAJOR_VERSION(cluster->bin_version) < 1000)
@@ -426,7 +425,7 @@ validate_exec(const char *dir, const char *cmdName)
 		pg_fatal("check for \"%s\" failed: %s\n",
 				 path, strerror(errno));
 	else if (!S_ISREG(buf.st_mode))
-		pg_fatal("check for \"%s\" failed: not an executable file\n",
+		pg_fatal("check for \"%s\" failed: not a regular file\n",
 				 path);
 
 	/*
diff --git a/src/bin/pg_upgrade/file.c b/src/bin/pg_upgrade/file.c
index eb925d1e0f..f38bfacf02 100644
--- a/src/bin/pg_upgrade/file.c
+++ b/src/bin/pg_upgrade/file.c
@@ -3,7 +3,7 @@
  *
  *	file system operations
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/file.c
  */
 
@@ -290,7 +290,7 @@ check_hard_link(void)
 
 	if (pg_link_file(existing_file, new_link_file) < 0)
 		pg_fatal("could not create hard link between old and new data directories: %s\n"
-				 "In link mode the old and new data directories must be on the same file system volume.\n",
+				 "In link mode the old and new data directories must be on the same file system.\n",
 				 strerror(errno));
 
 	unlink(new_link_file);
@@ -314,18 +314,3 @@ win32_pghardlink(const char *src, const char *dst)
 		return 0;
 }
 #endif
-
-
-/* fopen() file with no group/other permissions */
-FILE *
-fopen_priv(const char *path, const char *mode)
-{
-	mode_t		old_umask = umask(S_IRWXG | S_IRWXO);
-	FILE	   *fp;
-
-	fp = fopen(path, mode);
-
-	umask(old_umask);			/* we assume this can't change errno */
-
-	return fp;
-}
diff --git a/src/bin/pg_upgrade/function.c b/src/bin/pg_upgrade/function.c
index 8383b75325..d61fa38c92 100644
--- a/src/bin/pg_upgrade/function.c
+++ b/src/bin/pg_upgrade/function.c
@@ -3,7 +3,7 @@
  *
  *	server-side function support
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/function.c
  */
 
@@ -252,7 +252,7 @@ check_loadable_libraries(void)
 			if (script == NULL && (script = fopen_priv(output_path, "w")) == NULL)
 				pg_fatal("could not open file \"%s\": %s\n",
 						 output_path, strerror(errno));
-			fprintf(script, _("could not load library \"%s\":\n%s\n"),
+			fprintf(script, _("could not load library \"%s\": %s"),
 					lib,
 					PQerrorMessage(conn));
 		}
diff --git a/src/bin/pg_upgrade/info.c b/src/bin/pg_upgrade/info.c
index 0b14998f4b..f9f07f491c 100644
--- a/src/bin/pg_upgrade/info.c
+++ b/src/bin/pg_upgrade/info.c
@@ -3,7 +3,7 @@
  *
  *	information support functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/info.c
  */
 
diff --git a/src/bin/pg_upgrade/option.c b/src/bin/pg_upgrade/option.c
index bbe364741c..9dbc9225a6 100644
--- a/src/bin/pg_upgrade/option.c
+++ b/src/bin/pg_upgrade/option.c
@@ -3,7 +3,7 @@
  *
  *	options functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/option.c
  */
 
@@ -22,7 +22,7 @@
 
 static void usage(void);
 static void check_required_directory(char **dirpath, char **configpath,
-						 char *envVarName, char *cmdLineOption, char *description);
+						 const char *envVarName, const char *cmdLineOption, const char *description);
 #define FIX_DEFAULT_READ_ONLY "-c default_transaction_read_only=false"
 
 
@@ -98,7 +98,7 @@ parseCommandLine(int argc, char *argv[])
 		pg_fatal("%s: cannot be run as root\n", os_info.progname);
 
 	if ((log_opts.internal = fopen_priv(INTERNAL_LOG_FILE, "a")) == NULL)
-		pg_fatal("cannot write to log file %s\n", INTERNAL_LOG_FILE);
+		pg_fatal("could not write to log file \"%s\"\n", INTERNAL_LOG_FILE);
 
 	while ((option = getopt_long(argc, argv, "d:D:b:B:cj:ko:O:p:P:rU:v",
 								 long_options, &optindex)) != -1)
@@ -214,7 +214,7 @@ parseCommandLine(int argc, char *argv[])
 	for (filename = output_files; *filename != NULL; filename++)
 	{
 		if ((fp = fopen_priv(*filename, "a")) == NULL)
-			pg_fatal("cannot write to log file %s\n", *filename);
+			pg_fatal("could not write to log file \"%s\"\n", *filename);
 
 		/* Start with newline because we might be appending to a file. */
 		fprintf(fp, "\n"
@@ -262,7 +262,7 @@ parseCommandLine(int argc, char *argv[])
 		canonicalize_path(new_cluster_pgdata);
 
 		if (!getcwd(cwd, MAXPGPATH))
-			pg_fatal("cannot find current directory\n");
+			pg_fatal("could not determine current directory\n");
 		canonicalize_path(cwd);
 		if (path_is_prefix_of_path(new_cluster_pgdata, cwd))
 			pg_fatal("cannot run pg_upgrade from inside the new cluster data directory on Windows\n");
@@ -341,8 +341,8 @@ usage(void)
  */
 static void
 check_required_directory(char **dirpath, char **configpath,
-						 char *envVarName, char *cmdLineOption,
-						 char *description)
+						 const char *envVarName, const char *cmdLineOption,
+						 const char *description)
 {
 	if (*dirpath == NULL || strlen(*dirpath) == 0)
 	{
@@ -459,7 +459,7 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 			/* Use the current directory for the socket */
 			cluster->sockdir = pg_malloc(MAXPGPATH);
 			if (!getcwd(cluster->sockdir, MAXPGPATH))
-				pg_fatal("cannot find current directory\n");
+				pg_fatal("could not determine current directory\n");
 		}
 		else
 		{
@@ -477,14 +477,16 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 			snprintf(filename, sizeof(filename), "%s/postmaster.pid",
 					 cluster->pgdata);
 			if ((fp = fopen(filename, "r")) == NULL)
-				pg_fatal("Cannot open file %s: %m\n", filename);
+				pg_fatal("could not open file \"%s\": %s\n",
+						 filename, strerror(errno));
 
 			for (lineno = 1;
 				 lineno <= Max(LOCK_FILE_LINE_PORT, LOCK_FILE_LINE_SOCKET_DIR);
 				 lineno++)
 			{
 				if (fgets(line, sizeof(line), fp) == NULL)
-					pg_fatal("Cannot read line %d from %s: %m\n", lineno, filename);
+					pg_fatal("could not read line %d from file \"%s\": %s\n",
+							 lineno, filename, strerror(errno));
 
 				/* potentially overwrite user-supplied value */
 				if (lineno == LOCK_FILE_LINE_PORT)
@@ -501,7 +503,7 @@ get_sock_dir(ClusterInfo *cluster, bool live_check)
 
 			/* warn of port number correction */
 			if (orig_port != DEF_PGUPORT && old_cluster.port != orig_port)
-				pg_log(PG_WARNING, "User-supplied old port number %hu corrected to %hu\n",
+				pg_log(PG_WARNING, "user-supplied old port number %hu corrected to %hu\n",
 					   orig_port, cluster->port);
 		}
 	}
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
index 7c85a13a99..23f869f6c7 100644
--- a/src/bin/pg_upgrade/parallel.c
+++ b/src/bin/pg_upgrade/parallel.c
@@ -3,7 +3,7 @@
  *
  *	multi-process support
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/parallel.c
  */
 
@@ -78,8 +78,8 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 	va_end(args);
 
 	if (user_opts.jobs <= 1)
-		/* throw_error must be true to allow jobs */
-		exec_prog(log_file, opt_log_file, true, "%s", cmd);
+		/* exit_on_error must be true to allow jobs */
+		exec_prog(log_file, opt_log_file, true, true, "%s", cmd);
 	else
 	{
 		/* parallel */
@@ -122,7 +122,7 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 		child = fork();
 		if (child == 0)
 			/* use _exit to skip atexit() functions */
-			_exit(!exec_prog(log_file, opt_log_file, true, "%s", cmd));
+			_exit(!exec_prog(log_file, opt_log_file, true, true, "%s", cmd));
 		else if (child < 0)
 			/* fork failed */
 			pg_fatal("could not create worker process: %s\n", strerror(errno));
@@ -160,7 +160,7 @@ win32_exec_prog(exec_thread_arg *args)
 {
 	int			ret;
 
-	ret = !exec_prog(args->log_file, args->opt_log_file, true, "%s", args->cmd);
+	ret = !exec_prog(args->log_file, args->opt_log_file, true, true, "%s", args->cmd);
 
 	/* terminates thread */
 	return ret;
@@ -187,7 +187,6 @@ parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
 #endif
 
 	if (user_opts.jobs <= 1)
-		/* throw_error must be true to allow jobs */
 		transfer_all_new_dbs(old_db_arr, new_db_arr, old_pgdata, new_pgdata, NULL);
 	else
 	{
diff --git a/src/bin/pg_upgrade/pg_upgrade.c b/src/bin/pg_upgrade/pg_upgrade.c
index ef9793f3bd..d12412799f 100644
--- a/src/bin/pg_upgrade/pg_upgrade.c
+++ b/src/bin/pg_upgrade/pg_upgrade.c
@@ -3,7 +3,7 @@
  *
  *	main source file
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/pg_upgrade.c
  */
 
@@ -46,7 +46,7 @@
 #endif
 
 static void prepare_new_cluster(void);
-static void prepare_new_databases(void);
+static void prepare_new_globals(void);
 static void create_new_objects(void);
 static void copy_xact_xlog_xid(void);
 static void set_frozenxids(bool minmxid_only);
@@ -77,6 +77,10 @@ main(int argc, char **argv)
 	bool		live_check = false;
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("pg_upgrade"));
+
+	/* Ensure that all files created by pg_upgrade are non-world-readable */
+	umask(S_IRWXG | S_IRWXO);
+
 	parseCommandLine(argc, argv);
 
 	get_restricted_token(os_info.progname);
@@ -104,8 +108,10 @@ main(int argc, char **argv)
 	check_new_cluster();
 	report_clusters_compatible();
 
-	pg_log(PG_REPORT, "\nPerforming Upgrade\n");
-	pg_log(PG_REPORT, "------------------\n");
+	pg_log(PG_REPORT,
+		   "\n"
+		   "Performing Upgrade\n"
+		   "------------------\n");
 
 	prepare_new_cluster();
 
@@ -122,7 +128,7 @@ main(int argc, char **argv)
 	/* -- NEW -- */
 	start_postmaster(&new_cluster, true);
 
-	prepare_new_databases();
+	prepare_new_globals();
 
 	create_new_objects();
 
@@ -147,14 +153,14 @@ main(int argc, char **argv)
 	 * because there is no need to have the schema load use new oids.
 	 */
 	prep_status("Setting next OID for new cluster");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/pg_resetwal\" -o %u \"%s\"",
 			  new_cluster.bindir, old_cluster.controldata.chkpnt_nxtoid,
 			  new_cluster.pgdata);
 	check_ok();
 
 	prep_status("Sync data directory to disk");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/initdb\" --sync-only \"%s\"", new_cluster.bindir,
 			  new_cluster.pgdata);
 	check_ok();
@@ -164,8 +170,10 @@ main(int argc, char **argv)
 
 	issue_warnings_and_set_wal_level();
 
-	pg_log(PG_REPORT, "\nUpgrade Complete\n");
-	pg_log(PG_REPORT, "----------------\n");
+	pg_log(PG_REPORT,
+		   "\n"
+		   "Upgrade Complete\n"
+		   "----------------\n");
 
 	output_completion_banner(analyze_script_file_name,
 							 deletion_script_file_name);
@@ -245,7 +253,7 @@ prepare_new_cluster(void)
 	 * --analyze so autovacuum doesn't update statistics later
 	 */
 	prep_status("Analyzing all rows in the new cluster");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/vacuumdb\" %s --all --analyze %s",
 			  new_cluster.bindir, cluster_conn_opts(&new_cluster),
 			  log_opts.verbose ? "--verbose" : "");
@@ -257,8 +265,8 @@ prepare_new_cluster(void)
 	 * datfrozenxid, relfrozenxids, and relminmxid later to match the new xid
 	 * counter later.
 	 */
-	prep_status("Freezing all rows on the new cluster");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	prep_status("Freezing all rows in the new cluster");
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/vacuumdb\" %s --all --freeze %s",
 			  new_cluster.bindir, cluster_conn_opts(&new_cluster),
 			  log_opts.verbose ? "--verbose" : "");
@@ -267,32 +275,23 @@ prepare_new_cluster(void)
 
 
 static void
-prepare_new_databases(void)
+prepare_new_globals(void)
 {
 	/*
-	 * We set autovacuum_freeze_max_age to its maximum value so autovacuum
-	 * does not launch here and delete clog files, before the frozen xids are
-	 * set.
+	 * Before we restore anything, set frozenxids of initdb-created tables.
 	 */
-
 	set_frozenxids(false);
 
-	prep_status("Restoring global objects in the new cluster");
-
 	/*
-	 * We have to create the databases first so we can install support
-	 * functions in all the other databases.  Ideally we could create the
-	 * support functions in template1 but pg_dumpall creates database using
-	 * the template0 template.
+	 * Now restore global objects (roles and tablespaces).
 	 */
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	prep_status("Restoring global objects in the new cluster");
+
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/psql\" " EXEC_PSQL_ARGS " %s -f \"%s\"",
 			  new_cluster.bindir, cluster_conn_opts(&new_cluster),
 			  GLOBALS_DUMP_FILE);
 	check_ok();
-
-	/* we load this to get a current list of databases */
-	get_db_and_rel_infos(&new_cluster);
 }
 
 
@@ -303,38 +302,82 @@ create_new_objects(void)
 
 	prep_status("Restoring database schemas in the new cluster\n");
 
+	/*
+	 * We cannot process the template1 database concurrently with others,
+	 * because when it's transiently dropped, connection attempts would fail.
+	 * So handle it in a separate non-parallelized pass.
+	 */
+	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
+	{
+		char		sql_file_name[MAXPGPATH],
+					log_file_name[MAXPGPATH];
+		DbInfo	   *old_db = &old_cluster.dbarr.dbs[dbnum];
+		const char *create_opts;
+
+		/* Process only template1 in this pass */
+		if (strcmp(old_db->db_name, "template1") != 0)
+			continue;
+
+		pg_log(PG_STATUS, "%s", old_db->db_name);
+		snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
+		snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
+
+		/*
+		 * template1 and postgres databases will already exist in the target
+		 * installation, so tell pg_restore to drop and recreate them;
+		 * otherwise we would fail to propagate their database-level
+		 * properties.
+		 */
+		create_opts = "--clean --create";
+
+		exec_prog(log_file_name,
+				  NULL,
+				  true,
+				  true,
+				  "\"%s/pg_restore\" %s %s --exit-on-error --verbose "
+				  "--dbname postgres \"%s\"",
+				  new_cluster.bindir,
+				  cluster_conn_opts(&new_cluster),
+				  create_opts,
+				  sql_file_name);
+
+		break;					/* done once we've processed template1 */
+	}
+
 	for (dbnum = 0; dbnum < old_cluster.dbarr.ndbs; dbnum++)
 	{
 		char		sql_file_name[MAXPGPATH],
 					log_file_name[MAXPGPATH];
 		DbInfo	   *old_db = &old_cluster.dbarr.dbs[dbnum];
-		PQExpBufferData connstr,
-					escaped_connstr;
+		const char *create_opts;
 
-		initPQExpBuffer(&connstr);
-		appendPQExpBuffer(&connstr, "dbname=");
-		appendConnStrVal(&connstr, old_db->db_name);
-		initPQExpBuffer(&escaped_connstr);
-		appendShellString(&escaped_connstr, connstr.data);
-		termPQExpBuffer(&connstr);
+		/* Skip template1 in this pass */
+		if (strcmp(old_db->db_name, "template1") == 0)
+			continue;
 
 		pg_log(PG_STATUS, "%s", old_db->db_name);
 		snprintf(sql_file_name, sizeof(sql_file_name), DB_DUMP_FILE_MASK, old_db->db_oid);
 		snprintf(log_file_name, sizeof(log_file_name), DB_DUMP_LOG_FILE_MASK, old_db->db_oid);
 
 		/*
-		 * pg_dump only produces its output at the end, so there is little
-		 * parallelism if using the pipe.
+		 * template1 and postgres databases will already exist in the target
+		 * installation, so tell pg_restore to drop and recreate them;
+		 * otherwise we would fail to propagate their database-level
+		 * properties.
 		 */
+		if (strcmp(old_db->db_name, "postgres") == 0)
+			create_opts = "--clean --create";
+		else
+			create_opts = "--create";
+
 		parallel_exec_prog(log_file_name,
 						   NULL,
-						   "\"%s/pg_restore\" %s --exit-on-error --verbose --dbname %s \"%s\"",
+						   "\"%s/pg_restore\" %s %s --exit-on-error --verbose "
+						   "--dbname template1 \"%s\"",
 						   new_cluster.bindir,
 						   cluster_conn_opts(&new_cluster),
-						   escaped_connstr.data,
+						   create_opts,
 						   sql_file_name);
-
-		termPQExpBuffer(&escaped_connstr);
 	}
 
 	/* reap all children */
@@ -351,7 +394,7 @@ create_new_objects(void)
 	if (GET_MAJOR_VERSION(old_cluster.major_version) < 903)
 		set_frozenxids(true);
 
-	/* regenerate now that we have objects in the databases */
+	/* update new_cluster info now that we have objects in the databases */
 	get_db_and_rel_infos(&new_cluster);
 }
 
@@ -359,7 +402,7 @@ create_new_objects(void)
  * Delete the given subdirectory contents from the new cluster
  */
 static void
-remove_new_subdir(char *subdir, bool rmtopdir)
+remove_new_subdir(const char *subdir, bool rmtopdir)
 {
 	char		new_path[MAXPGPATH];
 
@@ -376,7 +419,7 @@ remove_new_subdir(char *subdir, bool rmtopdir)
  * Copy the files from the old cluster into it
  */
 static void
-copy_subdir_files(char *old_subdir, char *new_subdir)
+copy_subdir_files(const char *old_subdir, const char *new_subdir)
 {
 	char		old_path[MAXPGPATH];
 	char		new_path[MAXPGPATH];
@@ -388,7 +431,7 @@ copy_subdir_files(char *old_subdir, char *new_subdir)
 
 	prep_status("Copying old %s to new server", old_subdir);
 
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 #ifndef WIN32
 			  "cp -Rf \"%s\" \"%s\"",
 #else
@@ -414,16 +457,16 @@ copy_xact_xlog_xid(void)
 
 	/* set the next transaction id and epoch of the new cluster */
 	prep_status("Setting next transaction ID and epoch for new cluster");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/pg_resetwal\" -f -x %u \"%s\"",
 			  new_cluster.bindir, old_cluster.controldata.chkpnt_nxtxid,
 			  new_cluster.pgdata);
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/pg_resetwal\" -f -e %u \"%s\"",
 			  new_cluster.bindir, old_cluster.controldata.chkpnt_nxtepoch,
 			  new_cluster.pgdata);
 	/* must reset commit timestamp limits also */
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 			  "\"%s/pg_resetwal\" -f -c %u,%u \"%s\"",
 			  new_cluster.bindir,
 			  old_cluster.controldata.chkpnt_nxtxid,
@@ -449,7 +492,7 @@ copy_xact_xlog_xid(void)
 		 * we preserve all files and contents, so we must preserve both "next"
 		 * counters here and the oldest multi present on system.
 		 */
-		exec_prog(UTILITY_LOG_FILE, NULL, true,
+		exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 				  "\"%s/pg_resetwal\" -O %u -m %u,%u \"%s\"",
 				  new_cluster.bindir,
 				  old_cluster.controldata.chkpnt_nxtmxoff,
@@ -467,7 +510,7 @@ copy_xact_xlog_xid(void)
 		 */
 		remove_new_subdir("pg_multixact/offsets", false);
 
-		prep_status("Setting oldest multixact ID on new cluster");
+		prep_status("Setting oldest multixact ID in new cluster");
 
 		/*
 		 * We don't preserve files in this case, but it's important that the
@@ -477,7 +520,7 @@ copy_xact_xlog_xid(void)
 		 * might end up wrapped around (i.e. 0) if the old cluster had
 		 * next=MaxMultiXactId, but multixact.c can cope with that just fine.
 		 */
-		exec_prog(UTILITY_LOG_FILE, NULL, true,
+		exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 				  "\"%s/pg_resetwal\" -m %u,%u \"%s\"",
 				  new_cluster.bindir,
 				  old_cluster.controldata.chkpnt_nxtmulti + 1,
@@ -488,7 +531,7 @@ copy_xact_xlog_xid(void)
 
 	/* now reset the wal archives in the new cluster */
 	prep_status("Resetting WAL archives");
-	exec_prog(UTILITY_LOG_FILE, NULL, true,
+	exec_prog(UTILITY_LOG_FILE, NULL, true, true,
 	/* use timeline 1 to match controldata and no WAL history file */
 			  "\"%s/pg_resetwal\" -l 00000001%s \"%s\"", new_cluster.bindir,
 			  old_cluster.controldata.nextxlogfile + 8,
@@ -500,14 +543,25 @@ copy_xact_xlog_xid(void)
 /*
  *	set_frozenxids()
  *
- *	We have frozen all xids, so set datfrozenxid, relfrozenxid, and
- *	relminmxid to be the old cluster's xid counter, which we just set
- *	in the new cluster.  User-table frozenxid and minmxid values will
- *	be set by pg_dump --binary-upgrade, but objects not set by the pg_dump
- *	must have proper frozen counters.
+ * This is called on the new cluster before we restore anything, with
+ * minmxid_only = false.  Its purpose is to ensure that all initdb-created
+ * vacuumable tables have relfrozenxid/relminmxid matching the old cluster's
+ * xid/mxid counters.  We also initialize the datfrozenxid/datminmxid of the
+ * built-in databases to match.
+ *
+ * As we create user tables later, their relfrozenxid/relminmxid fields will
+ * be restored properly by the binary-upgrade restore script.  Likewise for
+ * user-database datfrozenxid/datminmxid.  However, if we're upgrading from a
+ * pre-9.3 database, which does not store per-table or per-DB minmxid, then
+ * the relminmxid/datminmxid values filled in by the restore script will just
+ * be zeroes.
+ *
+ * Hence, with a pre-9.3 source database, a second call occurs after
+ * everything is restored, with minmxid_only = true.  This pass will
+ * initialize all tables and databases, both those made by initdb and user
+ * objects, with the desired minmxid value.  frozenxid values are left alone.
  */
-static
-void
+static void
 set_frozenxids(bool minmxid_only)
 {
 	int			dbnum;
diff --git a/src/bin/pg_upgrade/pg_upgrade.h b/src/bin/pg_upgrade/pg_upgrade.h
index dae068ed83..7e5e971294 100644
--- a/src/bin/pg_upgrade/pg_upgrade.h
+++ b/src/bin/pg_upgrade/pg_upgrade.h
@@ -1,7 +1,7 @@
 /*
  *	pg_upgrade.h
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/pg_upgrade.h
  */
 
@@ -95,10 +95,12 @@ extern char *output_files[];
 #endif
 
 
-/* OID system catalog preservation added during PG 9.0 development */
-#define TABLE_SPACE_SUBDIRS_CAT_VER 201001111
-/* postmaster/postgres -b (binary_upgrade) flag added during PG 9.1 development */
+/*
+ * postmaster/postgres -b (binary_upgrade) flag added during PG 9.1
+ * development
+ */
 #define BINARY_UPGRADE_SERVER_FLAG_CAT_VER 201104251
+
 /*
  *	Visibility map changed with this 9.2 commit,
  *	8f9fe6edce358f7904e0db119416b4d1080a83aa; pick later catalog version.
@@ -109,6 +111,7 @@ extern char *output_files[];
  * The format of visibility map is changed with this 9.6 commit,
  */
 #define VISIBILITY_MAP_FROZEN_BIT_CAT_VER 201603011
+
 /*
  * pg_multixact format changed in 9.3 commit 0ac5ad5134f2769ccbaefec73844f85,
  * ("Improve concurrency of foreign key locking") which also updated catalog
@@ -128,6 +131,7 @@ extern char *output_files[];
  */
 #define JSONB_FORMAT_CHANGE_CAT_VER 201409291
 
+
 /*
  * Each relation is represented by a relinfo structure.
  */
@@ -280,7 +284,7 @@ typedef struct
 typedef struct
 {
 	FILE	   *internal;		/* internal log FILE */
-	bool		verbose;		/* TRUE -> be verbose in messages */
+	bool		verbose;		/* true -> be verbose in messages */
 	bool		retain;			/* retain log files on success */
 } LogOpts;
 
@@ -290,7 +294,7 @@ typedef struct
 */
 typedef struct
 {
-	bool		check;			/* TRUE -> ask user for permission to make
+	bool		check;			/* true -> ask user for permission to make
 								 * changes */
 	transferMode transfer_mode; /* copy files or link them? */
 	int			jobs;
@@ -356,7 +360,7 @@ void		generate_old_dump(void);
 #define EXEC_PSQL_ARGS "--echo-queries --set ON_ERROR_STOP=on --no-psqlrc --dbname=template1"
 
 bool exec_prog(const char *log_file, const char *opt_log_file,
-		  bool throw_error, const char *fmt,...) pg_attribute_printf(4, 5);
+		  bool report_error, bool exit_on_error, const char *fmt,...) pg_attribute_printf(5, 6);
 void		verify_directories(void);
 bool		pid_lock_file_exists(const char *datadir);
 
@@ -370,7 +374,9 @@ void linkFile(const char *src, const char *dst,
 void rewriteVisibilityMap(const char *fromfile, const char *tofile,
 					 const char *schemaName, const char *relName);
 void		check_hard_link(void);
-FILE	   *fopen_priv(const char *path, const char *mode);
+
+/* fopen_priv() is no longer different from fopen() */
+#define fopen_priv(path, mode)	fopen(path, mode)
 
 /* function.c */
 
@@ -412,8 +418,8 @@ PGresult   *executeQueryOrDie(PGconn *conn, const char *fmt,...) pg_attribute_pr
 
 char	   *cluster_conn_opts(ClusterInfo *cluster);
 
-bool		start_postmaster(ClusterInfo *cluster, bool throw_error);
-void		stop_postmaster(bool fast);
+bool		start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error);
+void		stop_postmaster(bool in_atexit);
 uint32		get_major_server_version(ClusterInfo *cluster);
 void		check_pghost_envvar(void);
 
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
index 06d3ed04a7..50bee281f8 100644
--- a/src/bin/pg_upgrade/relfilenode.c
+++ b/src/bin/pg_upgrade/relfilenode.c
@@ -3,7 +3,7 @@
  *
  *	relfilenode functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/relfilenode.c
  */
 
@@ -194,7 +194,7 @@ transfer_relfile(FileNameMap *map, const char *type_suffix, bool vm_must_add_fro
 	/*
 	 * Now copy/link any related segments as well. Remember, PG breaks large
 	 * files into 1GB segments, the first segment has no extension, subsequent
-	 * segments are named relfilenode.1, relfilenode.2, relfilenode.3. copied.
+	 * segments are named relfilenode.1, relfilenode.2, relfilenode.3.
 	 */
 	for (segno = 0;; segno++)
 	{
diff --git a/src/bin/pg_upgrade/server.c b/src/bin/pg_upgrade/server.c
index 58e3593896..5273ef6681 100644
--- a/src/bin/pg_upgrade/server.c
+++ b/src/bin/pg_upgrade/server.c
@@ -3,12 +3,13 @@
  *
  *	database server functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/server.c
  */
 
 #include "postgres_fe.h"
 
+#include "fe_utils/connect.h"
 #include "fe_utils/string_utils.h"
 #include "pg_upgrade.h"
 
@@ -30,7 +31,7 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
 
 	if (conn == NULL || PQstatus(conn) != CONNECTION_OK)
 	{
-		pg_log(PG_REPORT, "connection to database failed: %s\n",
+		pg_log(PG_REPORT, "connection to database failed: %s",
 			   PQerrorMessage(conn));
 
 		if (conn)
@@ -40,6 +41,8 @@ connectToServer(ClusterInfo *cluster, const char *db_name)
 		exit(1);
 	}
 
+	PQclear(executeQueryOrDie(conn, ALWAYS_SECURE_SEARCH_PATH_SQL));
+
 	return conn;
 }
 
@@ -132,7 +135,7 @@ executeQueryOrDie(PGconn *conn, const char *fmt,...)
 
 	if ((status != PGRES_TUPLES_OK) && (status != PGRES_COMMAND_OK))
 	{
-		pg_log(PG_REPORT, "SQL command failed\n%s\n%s\n", query,
+		pg_log(PG_REPORT, "SQL command failed\n%s\n%s", query,
 			   PQerrorMessage(conn));
 		PQclear(result);
 		PQfinish(conn);
@@ -156,8 +159,8 @@ get_major_server_version(ClusterInfo *cluster)
 {
 	FILE	   *version_fd;
 	char		ver_filename[MAXPGPATH];
-	int			integer_version = 0;
-	int			fractional_version = 0;
+	int			v1 = 0,
+				v2 = 0;
 
 	snprintf(ver_filename, sizeof(ver_filename), "%s/PG_VERSION",
 			 cluster->pgdata);
@@ -165,13 +168,21 @@ get_major_server_version(ClusterInfo *cluster)
 		pg_fatal("could not open version file: %s\n", ver_filename);
 
 	if (fscanf(version_fd, "%63s", cluster->major_version_str) == 0 ||
-		sscanf(cluster->major_version_str, "%d.%d", &integer_version,
-			   &fractional_version) < 1)
-		pg_fatal("could not get version from %s\n", cluster->pgdata);
+		sscanf(cluster->major_version_str, "%d.%d", &v1, &v2) < 1)
+		pg_fatal("could not parse PG_VERSION file from %s\n", cluster->pgdata);
 
 	fclose(version_fd);
 
-	return (100 * integer_version + fractional_version) * 100;
+	if (v1 < 10)
+	{
+		/* old style, e.g. 9.6.1 */
+		return v1 * 10000 + v2 * 100;
+	}
+	else
+	{
+		/* new style, e.g. 10.1 */
+		return v1 * 10000;
+	}
 }
 
 
@@ -183,7 +194,7 @@ stop_postmaster_atexit(void)
 
 
 bool
-start_postmaster(ClusterInfo *cluster, bool throw_error)
+start_postmaster(ClusterInfo *cluster, bool report_and_exit_on_error)
 {
 	char		cmd[MAXPGPATH * 4 + 1000];
 	PGconn	   *conn;
@@ -249,11 +260,11 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
 							  (strcmp(SERVER_LOG_FILE,
 									  SERVER_START_LOG_FILE) != 0) ?
 							  SERVER_LOG_FILE : NULL,
-							  false,
+							  report_and_exit_on_error, false,
 							  "%s", cmd);
 
 	/* Did it fail and we are just testing if the server could be started? */
-	if (!pg_ctl_return && !throw_error)
+	if (!pg_ctl_return && !report_and_exit_on_error)
 		return false;
 
 	/*
@@ -281,7 +292,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
 	if ((conn = get_db_conn(cluster, "template1")) == NULL ||
 		PQstatus(conn) != CONNECTION_OK)
 	{
-		pg_log(PG_REPORT, "\nconnection to database failed: %s\n",
+		pg_log(PG_REPORT, "\nconnection to database failed: %s",
 			   PQerrorMessage(conn));
 		if (conn)
 			PQfinish(conn);
@@ -297,9 +308,9 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
 	PQfinish(conn);
 
 	/*
-	 * If pg_ctl failed, and the connection didn't fail, and throw_error is
-	 * enabled, fail now.  This could happen if the server was already
-	 * running.
+	 * If pg_ctl failed, and the connection didn't fail, and
+	 * report_and_exit_on_error is enabled, fail now.  This
+	 * could happen if the server was already running.
 	 */
 	if (!pg_ctl_return)
 	{
@@ -314,7 +325,7 @@ start_postmaster(ClusterInfo *cluster, bool throw_error)
 
 
 void
-stop_postmaster(bool fast)
+stop_postmaster(bool in_atexit)
 {
 	ClusterInfo *cluster;
 
@@ -325,11 +336,11 @@ stop_postmaster(bool fast)
 	else
 		return;					/* no cluster running */
 
-	exec_prog(SERVER_STOP_LOG_FILE, NULL, !fast,
+	exec_prog(SERVER_STOP_LOG_FILE, NULL, !in_atexit, !in_atexit,
 			  "\"%s/pg_ctl\" -w -D \"%s\" -o \"%s\" %s stop",
 			  cluster->bindir, cluster->pgconfig,
 			  cluster->pgopts ? cluster->pgopts : "",
-			  fast ? "-m fast" : "-m smart");
+			  in_atexit ? "-m fast" : "-m smart");
 
 	os_info.running_cluster = NULL;
 }
diff --git a/src/bin/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c
index 31958d5c67..b0cbf81f7d 100644
--- a/src/bin/pg_upgrade/tablespace.c
+++ b/src/bin/pg_upgrade/tablespace.c
@@ -3,7 +3,7 @@
  *
  *	tablespace functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/tablespace.c
  */
 
diff --git a/src/bin/pg_upgrade/test.sh b/src/bin/pg_upgrade/test.sh
index f4556341f3..39983abea1 100644
--- a/src/bin/pg_upgrade/test.sh
+++ b/src/bin/pg_upgrade/test.sh
@@ -6,7 +6,7 @@
 # runs the regression tests (to put in some data), runs pg_dumpall,
 # runs pg_upgrade, runs pg_dumpall again, compares the dumps.
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 
 set -e
@@ -20,7 +20,9 @@ unset MAKELEVEL
 # Run a given "initdb" binary and overlay the regression testing
 # authentication configuration.
 standard_initdb() {
-	"$1" -N
+	# To increase coverage of non-standard segment size without
+	# increase test runtime, run these tests with a lower setting.
+	"$1" -N --wal-segsize 1
 	if [ -n "$TEMP_CONFIG" -a -r "$TEMP_CONFIG" ]
 	then
 		cat "$TEMP_CONFIG" >> "$PGDATA/postgresql.conf"
diff --git a/src/bin/pg_upgrade/util.c b/src/bin/pg_upgrade/util.c
index 44c1bc880e..4dec77b3b6 100644
--- a/src/bin/pg_upgrade/util.c
+++ b/src/bin/pg_upgrade/util.c
@@ -3,7 +3,7 @@
  *
  *	utility functions
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/util.c
  */
 
diff --git a/src/bin/pg_upgrade/version.c b/src/bin/pg_upgrade/version.c
index a9071a3448..76e9d65537 100644
--- a/src/bin/pg_upgrade/version.c
+++ b/src/bin/pg_upgrade/version.c
@@ -3,7 +3,7 @@
  *
  *	Postgres-version-specific routines
  *
- *	Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *	src/bin/pg_upgrade/version.c
  */
 
@@ -82,7 +82,7 @@ new_9_0_populate_pg_largeobject_metadata(ClusterInfo *cluster, bool check_mode)
 			pg_log(PG_WARNING, "\n"
 				   "Your installation contains large objects.  The new database has an\n"
 				   "additional large object permission table.  After upgrading, you will be\n"
-				   "given a command to populate the pg_largeobject permission table with\n"
+				   "given a command to populate the pg_largeobject_metadata table with\n"
 				   "default permissions.\n\n");
 		else
 			pg_log(PG_WARNING, "\n"
@@ -115,7 +115,7 @@ old_9_3_check_for_line_data_type_usage(ClusterInfo *cluster)
 	bool		found = false;
 	char		output_path[MAXPGPATH];
 
-	prep_status("Checking for invalid \"line\" user columns");
+	prep_status("Checking for incompatible \"line\" data type");
 
 	snprintf(output_path, sizeof(output_path), "tables_using_line.txt");
 
@@ -390,7 +390,7 @@ old_9_6_invalidate_hash_indexes(ClusterInfo *cluster, bool check_mode)
 			pg_log(PG_WARNING, "\n"
 				   "Your installation contains hash indexes.  These indexes have different\n"
 				   "internal formats between your old and new clusters, so they must be\n"
-				   "reindexed with the REINDEX command.  The file:\n"
+				   "reindexed with the REINDEX command.  The file\n"
 				   "    %s\n"
 				   "when executed by psql by the database superuser will recreate all invalid\n"
 				   "indexes; until then, none of these indexes will be used.\n\n",
diff --git a/src/bin/pg_waldump/compat.c b/src/bin/pg_waldump/compat.c
index 19a3a9d0c5..6ff9eb7e77 100644
--- a/src/bin/pg_waldump/compat.c
+++ b/src/bin/pg_waldump/compat.c
@@ -3,7 +3,7 @@
  * compat.c
  *		Reimplementations of various backend functions.
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/bin/pg_waldump/compat.c
diff --git a/src/bin/pg_waldump/pg_waldump.c b/src/bin/pg_waldump/pg_waldump.c
index 81ec3e32fd..242aff2d68 100644
--- a/src/bin/pg_waldump/pg_waldump.c
+++ b/src/bin/pg_waldump/pg_waldump.c
@@ -2,7 +2,7 @@
  *
  * pg_waldump.c - decode and display WAL
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/bin/pg_waldump/pg_waldump.c
@@ -13,6 +13,7 @@
 #include "postgres.h"
 
 #include <dirent.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
 #include "access/xlogreader.h"
@@ -26,6 +27,8 @@
 
 static const char *progname;
 
+static int	WalSegSz;
+
 typedef struct XLogDumpPrivate
 {
 	TimeLineID	timeline;
@@ -144,77 +147,166 @@ split_path(const char *path, char **dir, char **fname)
 }
 
 /*
- * Try to find the file in several places:
- * if directory == NULL:
- *	 fname
- *	 XLOGDIR / fname
- *	 $PGDATA / XLOGDIR / fname
- * else
- *	 directory / fname
- *	 directory / XLOGDIR / fname
+ * Open the file in the valid target directory.
  *
  * return a read only fd
  */
 static int
-fuzzy_open_file(const char *directory, const char *fname)
+open_file_in_directory(const char *directory, const char *fname)
 {
 	int			fd = -1;
 	char		fpath[MAXPGPATH];
 
-	if (directory == NULL)
+	Assert(directory != NULL);
+
+	snprintf(fpath, MAXPGPATH, "%s/%s", directory, fname);
+	fd = open(fpath, O_RDONLY | PG_BINARY, 0);
+
+	if (fd < 0 && errno != ENOENT)
+		fatal_error("could not open file \"%s\": %s",
+					fname, strerror(errno));
+	return fd;
+}
+
+/*
+ * Try to find fname in the given directory. Returns true if it is found,
+ * false otherwise. If fname is NULL, search the complete directory for any
+ * file with a valid WAL file name. If file is successfully opened, set the
+ * wal segment size.
+ */
+static bool
+search_directory(const char *directory, const char *fname)
+{
+	int			fd = -1;
+	DIR		   *xldir;
+
+	/* open file if valid filename is provided */
+	if (fname != NULL)
+		fd = open_file_in_directory(directory, fname);
+
+	/*
+	 * A valid file name is not passed, so search the complete directory.  If
+	 * we find any file whose name is a valid WAL file name then try to open
+	 * it.  If we cannot open it, bail out.
+	 */
+	else if ((xldir = opendir(directory)) != NULL)
+	{
+		struct dirent *xlde;
+
+		while ((xlde = readdir(xldir)) != NULL)
+		{
+			if (IsXLogFileName(xlde->d_name))
+			{
+				fd = open_file_in_directory(directory, xlde->d_name);
+				fname = xlde->d_name;
+				break;
+			}
+		}
+
+		closedir(xldir);
+	}
+
+	/* set WalSegSz if file is successfully opened */
+	if (fd >= 0)
+	{
+		char		buf[XLOG_BLCKSZ];
+
+		if (read(fd, buf, XLOG_BLCKSZ) == XLOG_BLCKSZ)
+		{
+			XLogLongPageHeader longhdr = (XLogLongPageHeader) buf;
+
+			WalSegSz = longhdr->xlp_seg_size;
+
+			if (!IsValidWalSegSize(WalSegSz))
+				fatal_error("WAL segment size must be a power of two between 1MB and 1GB, but the WAL file \"%s\" header specifies %d bytes",
+							fname, WalSegSz);
+		}
+		else
+		{
+			if (errno != 0)
+				fatal_error("could not read file \"%s\": %s",
+							fname, strerror(errno));
+			else
+				fatal_error("not enough data in file \"%s\"", fname);
+		}
+		close(fd);
+		return true;
+	}
+
+	return false;
+}
+
+/*
+ * Identify the target directory and set WalSegSz.
+ *
+ * Try to find the file in several places:
+ * if directory != NULL:
+ *	 directory /
+ *	 directory / XLOGDIR /
+ * else
+ *	 .
+ *	 XLOGDIR /
+ *	 $PGDATA / XLOGDIR /
+ *
+ * Set the valid target directory in private->inpath.
+ */
+static void
+identify_target_directory(XLogDumpPrivate *private, char *directory,
+						  char *fname)
+{
+	char		fpath[MAXPGPATH];
+
+	if (directory != NULL)
+	{
+		if (search_directory(directory, fname))
+		{
+			private->inpath = strdup(directory);
+			return;
+		}
+
+		/* directory / XLOGDIR */
+		snprintf(fpath, MAXPGPATH, "%s/%s", directory, XLOGDIR);
+		if (search_directory(fpath, fname))
+		{
+			private->inpath = strdup(fpath);
+			return;
+		}
+	}
+	else
 	{
 		const char *datadir;
 
-		/* fname */
-		fd = open(fname, O_RDONLY | PG_BINARY, 0);
-		if (fd < 0 && errno != ENOENT)
-			return -1;
-		else if (fd >= 0)
-			return fd;
-
-		/* XLOGDIR / fname */
-		snprintf(fpath, MAXPGPATH, "%s/%s",
-				 XLOGDIR, fname);
-		fd = open(fpath, O_RDONLY | PG_BINARY, 0);
-		if (fd < 0 && errno != ENOENT)
-			return -1;
-		else if (fd >= 0)
-			return fd;
+		/* current directory */
+		if (search_directory(".", fname))
+		{
+			private->inpath = strdup(".");
+			return;
+		}
+		/* XLOGDIR */
+		if (search_directory(XLOGDIR, fname))
+		{
+			private->inpath = strdup(XLOGDIR);
+			return;
+		}
 
 		datadir = getenv("PGDATA");
-		/* $PGDATA / XLOGDIR / fname */
+		/* $PGDATA / XLOGDIR */
 		if (datadir != NULL)
 		{
-			snprintf(fpath, MAXPGPATH, "%s/%s/%s",
-					 datadir, XLOGDIR, fname);
-			fd = open(fpath, O_RDONLY | PG_BINARY, 0);
-			if (fd < 0 && errno != ENOENT)
-				return -1;
-			else if (fd >= 0)
-				return fd;
+			snprintf(fpath, MAXPGPATH, "%s/%s", datadir, XLOGDIR);
+			if (search_directory(fpath, fname))
+			{
+				private->inpath = strdup(fpath);
+				return;
+			}
 		}
 	}
+
+	/* could not locate WAL file */
+	if (fname)
+		fatal_error("could not locate WAL file \"%s\"", fname);
 	else
-	{
-		/* directory / fname */
-		snprintf(fpath, MAXPGPATH, "%s/%s",
-				 directory, fname);
-		fd = open(fpath, O_RDONLY | PG_BINARY, 0);
-		if (fd < 0 && errno != ENOENT)
-			return -1;
-		else if (fd >= 0)
-			return fd;
-
-		/* directory / XLOGDIR / fname */
-		snprintf(fpath, MAXPGPATH, "%s/%s/%s",
-				 directory, XLOGDIR, fname);
-		fd = open(fpath, O_RDONLY | PG_BINARY, 0);
-		if (fd < 0 && errno != ENOENT)
-			return -1;
-		else if (fd >= 0)
-			return fd;
-	}
-	return -1;
+		fatal_error("could not find any WAL file");
 }
 
 /*
@@ -244,9 +336,9 @@ XLogDumpXLogRead(const char *directory, TimeLineID timeline_id,
 		int			segbytes;
 		int			readbytes;
 
-		startoff = recptr % XLogSegSize;
+		startoff = XLogSegmentOffset(recptr, WalSegSz);
 
-		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo))
+		if (sendFile < 0 || !XLByteInSeg(recptr, sendSegNo, WalSegSz))
 		{
 			char		fname[MAXFNAMELEN];
 			int			tries;
@@ -255,9 +347,9 @@ XLogDumpXLogRead(const char *directory, TimeLineID timeline_id,
 			if (sendFile >= 0)
 				close(sendFile);
 
-			XLByteToSeg(recptr, sendSegNo);
+			XLByteToSeg(recptr, sendSegNo, WalSegSz);
 
-			XLogFileName(fname, timeline_id, sendSegNo);
+			XLogFileName(fname, timeline_id, sendSegNo, WalSegSz);
 
 			/*
 			 * In follow mode there is a short period of time after the server
@@ -267,7 +359,7 @@ XLogDumpXLogRead(const char *directory, TimeLineID timeline_id,
 			 */
 			for (tries = 0; tries < 10; tries++)
 			{
-				sendFile = fuzzy_open_file(directory, fname);
+				sendFile = open_file_in_directory(directory, fname);
 				if (sendFile >= 0)
 					break;
 				if (errno == ENOENT)
@@ -298,17 +390,17 @@ XLogDumpXLogRead(const char *directory, TimeLineID timeline_id,
 				int			err = errno;
 				char		fname[MAXPGPATH];
 
-				XLogFileName(fname, timeline_id, sendSegNo);
+				XLogFileName(fname, timeline_id, sendSegNo, WalSegSz);
 
-				fatal_error("could not seek in log segment %s to offset %u: %s",
+				fatal_error("could not seek in log file %s to offset %u: %s",
 							fname, startoff, strerror(err));
 			}
 			sendOff = startoff;
 		}
 
 		/* How many bytes are within this segment? */
-		if (nbytes > (XLogSegSize - startoff))
-			segbytes = XLogSegSize - startoff;
+		if (nbytes > (WalSegSz - startoff))
+			segbytes = WalSegSz - startoff;
 		else
 			segbytes = nbytes;
 
@@ -318,9 +410,9 @@ XLogDumpXLogRead(const char *directory, TimeLineID timeline_id,
 			int			err = errno;
 			char		fname[MAXPGPATH];
 
-			XLogFileName(fname, timeline_id, sendSegNo);
+			XLogFileName(fname, timeline_id, sendSegNo, WalSegSz);
 
-			fatal_error("could not read from log segment %s, offset %d, length %d: %s",
+			fatal_error("could not read from log file %s, offset %u, length %d: %s",
 						fname, sendOff, segbytes, strerror(err));
 		}
 
@@ -710,14 +802,14 @@ usage(void)
 	printf(_("  -n, --limit=N          number of records to display\n"));
 	printf(_("  -p, --path=PATH        directory in which to find log segment files or a\n"
 			 "                         directory with a ./pg_wal that contains such files\n"
-			 "                         (default: current directory, ./pg_wal, PGDATA/pg_wal)\n"));
-	printf(_("  -r, --rmgr=RMGR        only show records generated by resource manager RMGR\n"
+			 "                         (default: current directory, ./pg_wal, $PGDATA/pg_wal)\n"));
+	printf(_("  -r, --rmgr=RMGR        only show records generated by resource manager RMGR;\n"
 			 "                         use --rmgr=list to list valid resource manager names\n"));
 	printf(_("  -s, --start=RECPTR     start reading at WAL location RECPTR\n"));
 	printf(_("  -t, --timeline=TLI     timeline from which to read log records\n"
 			 "                         (default: 1 or the value used in STARTSEG)\n"));
 	printf(_("  -V, --version          output version information, then exit\n"));
-	printf(_("  -x, --xid=XID          only show records with TransactionId XID\n"));
+	printf(_("  -x, --xid=XID          only show records with transaction ID XID\n"));
 	printf(_("  -z, --stats[=record]   show statistics instead of records\n"
 			 "                         (optionally, show per-record statistics)\n"));
 	printf(_("  -?, --help             show this help, then exit\n"));
@@ -870,7 +962,7 @@ main(int argc, char **argv)
 			case 'x':
 				if (sscanf(optarg, "%u", &config.filter_by_xid) != 1)
 				{
-					fprintf(stderr, _("%s: could not parse \"%s\" as a valid xid\n"),
+					fprintf(stderr, _("%s: could not parse \"%s\" as a transaction ID\n"),
 							progname, optarg);
 					goto bad_argument;
 				}
@@ -910,7 +1002,7 @@ main(int argc, char **argv)
 		if (!verify_directory(private.inpath))
 		{
 			fprintf(stderr,
-					_("%s: path \"%s\" cannot be opened: %s\n"),
+					_("%s: path \"%s\" could not be opened: %s\n"),
 					progname, private.inpath, strerror(errno));
 			goto bad_argument;
 		}
@@ -931,21 +1023,22 @@ main(int argc, char **argv)
 			private.inpath = directory;
 
 			if (!verify_directory(private.inpath))
-				fatal_error("cannot open directory \"%s\": %s",
+				fatal_error("could not open directory \"%s\": %s",
 							private.inpath, strerror(errno));
 		}
 
-		fd = fuzzy_open_file(private.inpath, fname);
+		identify_target_directory(&private, private.inpath, fname);
+		fd = open_file_in_directory(private.inpath, fname);
 		if (fd < 0)
 			fatal_error("could not open file \"%s\"", fname);
 		close(fd);
 
 		/* parse position from file */
-		XLogFromFileName(fname, &private.timeline, &segno);
+		XLogFromFileName(fname, &private.timeline, &segno, WalSegSz);
 
 		if (XLogRecPtrIsInvalid(private.startptr))
-			XLogSegNoOffsetToRecPtr(segno, 0, private.startptr);
-		else if (!XLByteInSeg(private.startptr, segno))
+			XLogSegNoOffsetToRecPtr(segno, 0, private.startptr, WalSegSz);
+		else if (!XLByteInSeg(private.startptr, segno, WalSegSz))
 		{
 			fprintf(stderr,
 					_("%s: start WAL location %X/%X is not inside file \"%s\"\n"),
@@ -958,7 +1051,7 @@ main(int argc, char **argv)
 
 		/* no second file specified, set end position */
 		if (!(optind + 1 < argc) && XLogRecPtrIsInvalid(private.endptr))
-			XLogSegNoOffsetToRecPtr(segno + 1, 0, private.endptr);
+			XLogSegNoOffsetToRecPtr(segno + 1, 0, private.endptr, WalSegSz);
 
 		/* parse ENDSEG if passed */
 		if (optind + 1 < argc)
@@ -968,28 +1061,29 @@ main(int argc, char **argv)
 			/* ignore directory, already have that */
 			split_path(argv[optind + 1], &directory, &fname);
 
-			fd = fuzzy_open_file(private.inpath, fname);
+			fd = open_file_in_directory(private.inpath, fname);
 			if (fd < 0)
 				fatal_error("could not open file \"%s\"", fname);
 			close(fd);
 
 			/* parse position from file */
-			XLogFromFileName(fname, &private.timeline, &endsegno);
+			XLogFromFileName(fname, &private.timeline, &endsegno, WalSegSz);
 
 			if (endsegno < segno)
 				fatal_error("ENDSEG %s is before STARTSEG %s",
 							argv[optind + 1], argv[optind]);
 
 			if (XLogRecPtrIsInvalid(private.endptr))
-				XLogSegNoOffsetToRecPtr(endsegno + 1, 0, private.endptr);
+				XLogSegNoOffsetToRecPtr(endsegno + 1, 0, private.endptr,
+										WalSegSz);
 
 			/* set segno to endsegno for check of --end */
 			segno = endsegno;
 		}
 
 
-		if (!XLByteInSeg(private.endptr, segno) &&
-			private.endptr != (segno + 1) * XLogSegSize)
+		if (!XLByteInSeg(private.endptr, segno, WalSegSz) &&
+			private.endptr != (segno + 1) * WalSegSz)
 		{
 			fprintf(stderr,
 					_("%s: end WAL location %X/%X is not inside file \"%s\"\n"),
@@ -1000,6 +1094,8 @@ main(int argc, char **argv)
 			goto bad_argument;
 		}
 	}
+	else
+		identify_target_directory(&private, private.inpath, NULL);
 
 	/* we don't know what to print */
 	if (XLogRecPtrIsInvalid(private.startptr))
@@ -1011,7 +1107,8 @@ main(int argc, char **argv)
 	/* done with argument parsing, do the actual work */
 
 	/* we have everything we need, start reading */
-	xlogreader_state = XLogReaderAllocate(XLogDumpReadPage, &private);
+	xlogreader_state = XLogReaderAllocate(WalSegSz, XLogDumpReadPage,
+										  &private);
 	if (!xlogreader_state)
 		fatal_error("out of memory");
 
@@ -1028,8 +1125,11 @@ main(int argc, char **argv)
 	 * to the start of a record and also wasn't a pointer to the beginning of
 	 * a segment (e.g. we were used in file mode).
 	 */
-	if (first_record != private.startptr && (private.startptr % XLogSegSize) != 0)
-		printf(_("first record is after %X/%X, at %X/%X, skipping over %u bytes\n"),
+	if (first_record != private.startptr &&
+		XLogSegmentOffset(private.startptr, WalSegSz) != 0)
+		printf(ngettext("first record is after %X/%X, at %X/%X, skipping over %u byte\n",
+						"first record is after %X/%X, at %X/%X, skipping over %u bytes\n",
+						(first_record - private.startptr)),
 			   (uint32) (private.startptr >> 32), (uint32) private.startptr,
 			   (uint32) (first_record >> 32), (uint32) first_record,
 			   (uint32) (first_record - private.startptr));
diff --git a/src/bin/pgbench/exprparse.y b/src/bin/pgbench/exprparse.y
index b3a2d9bfd3..e23ca51786 100644
--- a/src/bin/pgbench/exprparse.y
+++ b/src/bin/pgbench/exprparse.y
@@ -4,7 +4,7 @@
  * exprparse.y
  *	  bison grammar for a simple expression syntax
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pgbench/exprparse.y
@@ -19,13 +19,17 @@
 PgBenchExpr *expr_parse_result;
 
 static PgBenchExprList *make_elist(PgBenchExpr *exp, PgBenchExprList *list);
+static PgBenchExpr *make_null_constant(void);
+static PgBenchExpr *make_boolean_constant(bool bval);
 static PgBenchExpr *make_integer_constant(int64 ival);
 static PgBenchExpr *make_double_constant(double dval);
 static PgBenchExpr *make_variable(char *varname);
 static PgBenchExpr *make_op(yyscan_t yyscanner, const char *operator,
 		PgBenchExpr *lexpr, PgBenchExpr *rexpr);
+static PgBenchExpr *make_uop(yyscan_t yyscanner, const char *operator, PgBenchExpr *expr);
 static int	find_func(yyscan_t yyscanner, const char *fname);
 static PgBenchExpr *make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args);
+static PgBenchExpr *make_case(yyscan_t yyscanner, PgBenchExprList *when_then_list, PgBenchExpr *else_part);
 
 %}
 
@@ -40,53 +44,126 @@ static PgBenchExpr *make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *
 {
 	int64		ival;
 	double		dval;
+	bool		bval;
 	char	   *str;
 	PgBenchExpr *expr;
 	PgBenchExprList *elist;
 }
 
-%type <elist> elist
-%type <expr> expr
+%type <elist> elist when_then_list
+%type <expr> expr case_control
 %type <ival> INTEGER_CONST function
 %type <dval> DOUBLE_CONST
+%type <bval> BOOLEAN_CONST
 %type <str> VARIABLE FUNCTION
 
-%token INTEGER_CONST DOUBLE_CONST VARIABLE FUNCTION
-
-/* Precedence: lowest to highest */
+%token NULL_CONST INTEGER_CONST DOUBLE_CONST BOOLEAN_CONST VARIABLE FUNCTION
+%token AND_OP OR_OP NOT_OP NE_OP LE_OP GE_OP LS_OP RS_OP IS_OP
+%token CASE_KW WHEN_KW THEN_KW ELSE_KW END_KW
+
+/* Precedence: lowest to highest, taken from postgres SQL parser */
+%left	OR_OP
+%left	AND_OP
+%right  NOT_OP
+%nonassoc IS_OP ISNULL_OP NOTNULL_OP
+%nonassoc '<' '>' '=' LE_OP GE_OP NE_OP
+%left   '|' '#' '&' LS_OP RS_OP '~'
 %left	'+' '-'
 %left	'*' '/' '%'
-%right	UMINUS
+%right	UNARY
 
 %%
 
 result: expr				{ expr_parse_result = $1; }
 
-elist:                  	{ $$ = NULL; }
-	| expr 					{ $$ = make_elist($1, NULL); }
+elist:						{ $$ = NULL; }
+	| expr					{ $$ = make_elist($1, NULL); }
 	| elist ',' expr		{ $$ = make_elist($3, $1); }
 	;
 
 expr: '(' expr ')'			{ $$ = $2; }
-	| '+' expr %prec UMINUS	{ $$ = $2; }
-	| '-' expr %prec UMINUS	{ $$ = make_op(yyscanner, "-",
+	| '+' expr %prec UNARY	{ $$ = $2; }
+	/* unary minus "-x" implemented as "0 - x" */
+	| '-' expr %prec UNARY	{ $$ = make_op(yyscanner, "-",
 										   make_integer_constant(0), $2); }
+	/* binary ones complement "~x" implemented as 0xffff... xor x" */
+	| '~' expr				{ $$ = make_op(yyscanner, "#",
+										   make_integer_constant(~INT64CONST(0)), $2); }
+	| NOT_OP expr			{ $$ = make_uop(yyscanner, "!not", $2); }
 	| expr '+' expr			{ $$ = make_op(yyscanner, "+", $1, $3); }
 	| expr '-' expr			{ $$ = make_op(yyscanner, "-", $1, $3); }
 	| expr '*' expr			{ $$ = make_op(yyscanner, "*", $1, $3); }
 	| expr '/' expr			{ $$ = make_op(yyscanner, "/", $1, $3); }
-	| expr '%' expr			{ $$ = make_op(yyscanner, "%", $1, $3); }
+	| expr '%' expr			{ $$ = make_op(yyscanner, "mod", $1, $3); }
+	| expr '<' expr			{ $$ = make_op(yyscanner, "<", $1, $3); }
+	| expr LE_OP expr		{ $$ = make_op(yyscanner, "<=", $1, $3); }
+	| expr '>' expr			{ $$ = make_op(yyscanner, "<", $3, $1); }
+	| expr GE_OP expr		{ $$ = make_op(yyscanner, "<=", $3, $1); }
+	| expr '=' expr			{ $$ = make_op(yyscanner, "=", $1, $3); }
+	| expr NE_OP expr		{ $$ = make_op(yyscanner, "<>", $1, $3); }
+	| expr '&' expr			{ $$ = make_op(yyscanner, "&", $1, $3); }
+	| expr '|' expr			{ $$ = make_op(yyscanner, "|", $1, $3); }
+	| expr '#' expr			{ $$ = make_op(yyscanner, "#", $1, $3); }
+	| expr LS_OP expr		{ $$ = make_op(yyscanner, "<<", $1, $3); }
+	| expr RS_OP expr		{ $$ = make_op(yyscanner, ">>", $1, $3); }
+	| expr AND_OP expr		{ $$ = make_op(yyscanner, "!and", $1, $3); }
+	| expr OR_OP expr		{ $$ = make_op(yyscanner, "!or", $1, $3); }
+	/* IS variants */
+	| expr ISNULL_OP		{ $$ = make_op(yyscanner, "!is", $1, make_null_constant()); }
+	| expr NOTNULL_OP		{
+								$$ = make_uop(yyscanner, "!not",
+											  make_op(yyscanner, "!is", $1, make_null_constant()));
+							}
+	| expr IS_OP NULL_CONST	{ $$ = make_op(yyscanner, "!is", $1, make_null_constant()); }
+	| expr IS_OP NOT_OP NULL_CONST
+							{
+								$$ = make_uop(yyscanner, "!not",
+											  make_op(yyscanner, "!is", $1, make_null_constant()));
+							}
+	| expr IS_OP BOOLEAN_CONST
+							{
+								$$ = make_op(yyscanner, "!is", $1, make_boolean_constant($3));
+							}
+	| expr IS_OP NOT_OP BOOLEAN_CONST
+							{
+								$$ = make_uop(yyscanner, "!not",
+											  make_op(yyscanner, "!is", $1, make_boolean_constant($4)));
+							}
+	/* constants */
+	| NULL_CONST			{ $$ = make_null_constant(); }
+	| BOOLEAN_CONST			{ $$ = make_boolean_constant($1); }
 	| INTEGER_CONST			{ $$ = make_integer_constant($1); }
 	| DOUBLE_CONST			{ $$ = make_double_constant($1); }
-	| VARIABLE 				{ $$ = make_variable($1); }
+	/* misc */
+	| VARIABLE				{ $$ = make_variable($1); }
 	| function '(' elist ')' { $$ = make_func(yyscanner, $1, $3); }
+	| case_control			{ $$ = $1; }
 	;
 
+when_then_list:
+	  when_then_list WHEN_KW expr THEN_KW expr { $$ = make_elist($5, make_elist($3, $1)); }
+	| WHEN_KW expr THEN_KW expr { $$ = make_elist($4, make_elist($2, NULL)); }
+
+case_control:
+	  CASE_KW when_then_list END_KW { $$ = make_case(yyscanner, $2, make_null_constant()); }
+	| CASE_KW when_then_list ELSE_KW expr END_KW { $$ = make_case(yyscanner, $2, $4); }
+
 function: FUNCTION			{ $$ = find_func(yyscanner, $1); pg_free($1); }
 	;
 
 %%
 
+static PgBenchExpr *
+make_null_constant(void)
+{
+	PgBenchExpr *expr = pg_malloc(sizeof(PgBenchExpr));
+
+	expr->etype = ENODE_CONSTANT;
+	expr->u.constant.type = PGBT_NULL;
+	expr->u.constant.u.ival = 0;
+	return expr;
+}
+
 static PgBenchExpr *
 make_integer_constant(int64 ival)
 {
@@ -109,6 +186,17 @@ make_double_constant(double dval)
 	return expr;
 }
 
+static PgBenchExpr *
+make_boolean_constant(bool bval)
+{
+	PgBenchExpr *expr = pg_malloc(sizeof(PgBenchExpr));
+
+	expr->etype = ENODE_CONSTANT;
+	expr->u.constant.type = PGBT_BOOLEAN;
+	expr->u.constant.u.bval = bval;
+	return expr;
+}
+
 static PgBenchExpr *
 make_variable(char *varname)
 {
@@ -119,6 +207,7 @@ make_variable(char *varname)
 	return expr;
 }
 
+/* binary operators */
 static PgBenchExpr *
 make_op(yyscan_t yyscanner, const char *operator,
 		PgBenchExpr *lexpr, PgBenchExpr *rexpr)
@@ -127,11 +216,19 @@ make_op(yyscan_t yyscanner, const char *operator,
 					 make_elist(rexpr, make_elist(lexpr, NULL)));
 }
 
+/* unary operator */
+static PgBenchExpr *
+make_uop(yyscan_t yyscanner, const char *operator, PgBenchExpr *expr)
+{
+	return make_func(yyscanner, find_func(yyscanner, operator), make_elist(expr, NULL));
+}
+
 /*
  * List of available functions:
- * - fname: function name
+ * - fname: function name, "!..." for special internal functions
  * - nargs: number of arguments
  *			-1 is a special value for least & greatest meaning #args >= 1
+ *			-2 is for the "CASE WHEN ..." function, which has #args >= 3 and odd
  * - tag: function identifier from PgBenchFunction enum
  */
 static const struct
@@ -155,7 +252,7 @@ static const struct
 		"/", 2, PGBENCH_DIV
 	},
 	{
-		"%", 2, PGBENCH_MOD
+		"mod", 2, PGBENCH_MOD
 	},
 	/* actual functions */
 	{
@@ -176,6 +273,12 @@ static const struct
 	{
 		"sqrt", 1, PGBENCH_SQRT
 	},
+	{
+		"ln", 1, PGBENCH_LN
+	},
+	{
+		"exp", 1, PGBENCH_EXP
+	},
 	{
 		"int", 1, PGBENCH_INT
 	},
@@ -191,6 +294,61 @@ static const struct
 	{
 		"random_exponential", 3, PGBENCH_RANDOM_EXPONENTIAL
 	},
+	{
+		"random_zipfian", 3, PGBENCH_RANDOM_ZIPFIAN
+	},
+	{
+		"pow", 2, PGBENCH_POW
+	},
+	{
+		"power", 2, PGBENCH_POW
+	},
+	/* logical operators */
+	{
+		"!and", 2, PGBENCH_AND
+	},
+	{
+		"!or", 2, PGBENCH_OR
+	},
+	{
+		"!not", 1, PGBENCH_NOT
+	},
+	/* bitwise integer operators */
+	{
+		"&", 2, PGBENCH_BITAND
+	},
+	{
+		"|", 2, PGBENCH_BITOR
+	},
+	{
+		"#", 2, PGBENCH_BITXOR
+	},
+	{
+		"<<", 2, PGBENCH_LSHIFT
+	},
+	{
+		">>", 2, PGBENCH_RSHIFT
+	},
+	/* comparison operators */
+	{
+		"=", 2, PGBENCH_EQ
+	},
+	{
+		"<>", 2, PGBENCH_NE
+	},
+	{
+		"<=", 2, PGBENCH_LE
+	},
+	{
+		"<", 2, PGBENCH_LT
+	},
+	{
+		"!is", 2, PGBENCH_IS
+	},
+	/* "case when ... then ... else ... end" construction */
+	{
+		"!case_end", -2, PGBENCH_CASE
+	},
 	/* keep as last array element */
 	{
 		NULL, 0, 0
@@ -279,6 +437,16 @@ make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args)
 		elist_length(args) == 0)
 		expr_yyerror_more(yyscanner, "at least one argument expected",
 						  PGBENCH_FUNCTIONS[fnumber].fname);
+	/* special case: case (when ... then ...)+ (else ...)? end */
+	if (PGBENCH_FUNCTIONS[fnumber].nargs == -2)
+	{
+		int len = elist_length(args);
+
+		/* 'else' branch is always present, but could be a NULL-constant */
+		if (len < 3 || len % 2 != 1)
+			expr_yyerror_more(yyscanner, "odd and >= 3 number of arguments expected",
+							  "case control structure");
+	}
 
 	expr->etype = ENODE_FUNCTION;
 	expr->u.function.function = PGBENCH_FUNCTIONS[fnumber].tag;
@@ -291,6 +459,14 @@ make_func(yyscan_t yyscanner, int fnumber, PgBenchExprList *args)
 	return expr;
 }
 
+static PgBenchExpr *
+make_case(yyscan_t yyscanner, PgBenchExprList *when_then_list, PgBenchExpr *else_part)
+{
+	return make_func(yyscanner,
+					 find_func(yyscanner, "!case_end"),
+					 make_elist(else_part, when_then_list));
+}
+
 /*
  * exprscan.l is compiled as part of exprparse.y.  Currently, this is
  * unavoidable because exprparse does not create a .h file to export
diff --git a/src/bin/pgbench/exprscan.l b/src/bin/pgbench/exprscan.l
index dc1367bbdb..5c1bd88128 100644
--- a/src/bin/pgbench/exprscan.l
+++ b/src/bin/pgbench/exprscan.l
@@ -15,7 +15,7 @@
  *
  * Note that this lexer operates within the framework created by psqlscan.l,
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/pgbench/exprscan.l
@@ -43,6 +43,8 @@ static bool last_was_newline = false;
 extern int	expr_yyget_column(yyscan_t yyscanner);
 extern void expr_yyset_column(int column_no, yyscan_t yyscanner);
 
+/* LCOV_EXCL_START */
+
 %}
 
 /* Except for the prefix, these options should match psqlscan.l */
@@ -58,9 +60,9 @@ extern void expr_yyset_column(int column_no, yyscan_t yyscanner);
 %option prefix="expr_yy"
 
 /* Character classes */
-alpha			[a-zA-Z_]
+alpha			[a-zA-Z\200-\377_]
 digit			[0-9]
-alnum			[a-zA-Z0-9_]
+alnum			[A-Za-z\200-\377_0-9]
 /* {space} + {nonspace} + {newline} should cover all characters */
 space			[ \t\r\f\v]
 nonspace		[^ \t\r\f\v\n]
@@ -69,6 +71,22 @@ newline			[\n]
 /* Line continuation marker */
 continuation	\\{newline}
 
+/* case insensitive keywords */
+and				[Aa][Nn][Dd]
+or				[Oo][Rr]
+not				[Nn][Oo][Tt]
+case			[Cc][Aa][Ss][Ee]
+when			[Ww][Hh][Ee][Nn]
+then			[Tt][Hh][Ee][Nn]
+else			[Ee][Ll][Ss][Ee]
+end				[Ee][Nn][Dd]
+true			[Tt][Rr][Uu][Ee]
+false			[Ff][Aa][Ll][Ss][Ee]
+null			[Nn][Uu][Ll][Ll]
+is				[Ii][Ss]
+isnull			[Ii][Ss][Nn][Uu][Ll][Ll]
+notnull			[Nn][Oo][Tt][Nn][Uu][Ll][Ll]
+
 /* Exclusive states */
 %x EXPR
 
@@ -127,15 +145,52 @@ continuation	\\{newline}
 "-"				{ return '-'; }
 "*"				{ return '*'; }
 "/"				{ return '/'; }
-"%"				{ return '%'; }
+"%"				{ return '%'; } /* C version, also in Pg SQL */
+"="				{ return '='; }
+"<>"			{ return NE_OP; }
+"!="			{ return NE_OP; } /* C version, also in Pg SQL */
+"<="			{ return LE_OP; }
+">="			{ return GE_OP; }
+"<<"			{ return LS_OP; }
+">>"			{ return RS_OP; }
+"<"				{ return '<'; }
+">"				{ return '>'; }
+"|"				{ return '|'; }
+"&"				{ return '&'; }
+"#"				{ return '#'; }
+"~"				{ return '~'; }
+
 "("				{ return '('; }
 ")"				{ return ')'; }
 ","				{ return ','; }
 
+{and}			{ return AND_OP; }
+{or}			{ return OR_OP; }
+{not}			{ return NOT_OP; }
+{is}			{ return IS_OP; }
+{isnull}		{ return ISNULL_OP; }
+{notnull}		{ return NOTNULL_OP; }
+
+{case}			{ return CASE_KW; }
+{when}			{ return WHEN_KW; }
+{then}			{ return THEN_KW; }
+{else}			{ return ELSE_KW; }
+{end}			{ return END_KW; }
+
 :{alnum}+		{
 					yylval->str = pg_strdup(yytext + 1);
 					return VARIABLE;
 				}
+
+{null}			{ return NULL_CONST; }
+{true}			{
+					yylval->bval = true;
+					return BOOLEAN_CONST;
+				}
+{false}			{
+					yylval->bval = false;
+					return BOOLEAN_CONST;
+				}
 {digit}+		{
 					yylval->ival = strtoint64(yytext);
 					return INTEGER_CONST;
@@ -190,6 +245,8 @@ continuation	\\{newline}
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 void
 expr_yyerror_more(yyscan_t yyscanner, const char *message, const char *more)
 {
@@ -197,7 +254,6 @@ expr_yyerror_more(yyscan_t yyscanner, const char *message, const char *more)
 	int			error_detection_offset = expr_scanner_offset(state) - 1;
 	YYSTYPE		lval;
 	char	   *full_line;
-	size_t		l;
 
 	/*
 	 * While parsing an expression, we may not have collected the whole line
@@ -210,13 +266,11 @@ expr_yyerror_more(yyscan_t yyscanner, const char *message, const char *more)
 			 /* skip */ ;
 	}
 
+	/* Extract the line, trimming trailing newline if any */
 	full_line = expr_scanner_get_substring(state,
 										   expr_start_offset,
-										   expr_scanner_offset(state));
-	/* Trim trailing newline if any */
-	l = strlen(full_line);
-	while (l > 0 && full_line[l - 1] == '\n')
-		full_line[--l] = '\0';
+										   expr_scanner_offset(state),
+										   true);
 
 	syntax_error(expr_source, expr_lineno, full_line, expr_command,
 				 message, more, error_detection_offset - expr_start_offset);
@@ -341,19 +395,30 @@ expr_scanner_offset(PsqlScanState state)
 
 /*
  * Get a malloc'd copy of the lexer input string from start_offset
- * to just before end_offset.
+ * to just before end_offset.  If chomp is true, drop any trailing
+ * newline(s).
  */
 char *
 expr_scanner_get_substring(PsqlScanState state,
-						   int start_offset, int end_offset)
+						   int start_offset, int end_offset,
+						   bool chomp)
 {
 	char	   *result;
+	const char *scanptr = state->scanbuf + start_offset;
 	int			slen = end_offset - start_offset;
 
 	Assert(slen >= 0);
 	Assert(end_offset <= strlen(state->scanbuf));
+
+	if (chomp)
+	{
+		while (slen > 0 &&
+			   (scanptr[slen - 1] == '\n' || scanptr[slen - 1] == '\r'))
+			slen--;
+	}
+
 	result = (char *) pg_malloc(slen + 1);
-	memcpy(result, state->scanbuf + start_offset, slen);
+	memcpy(result, scanptr, slen);
 	result[slen] = '\0';
 
 	return result;
diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index ae78c7b1d4..d4209421f5 100644
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -5,7 +5,7 @@
  * Originally written by Tatsuo Ishii and enhanced by many contributors.
  *
  * src/bin/pgbench/pgbench.c
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  * ALL RIGHTS RESERVED;
  *
  * Permission to use, copy, modify, and distribute this software and its
@@ -90,10 +90,15 @@ static int	pthread_join(pthread_t th, void **thread_return);
 #define MAXCLIENTS	1024
 #endif
 
+#define DEFAULT_INIT_STEPS "dtgvp"	/* default -I setting */
+
 #define LOG_STEP_SECONDS	5	/* seconds between log messages */
 #define DEFAULT_NXACTS	10		/* default nxacts */
 
+#define ZIPF_CACHE_SIZE	15		/* cache cells number */
+
 #define MIN_GAUSSIAN_PARAM		2.0 /* minimum parameter for gauss */
+#define MAX_ZIPFIAN_PARAM		1000	/* maximum parameter for zipfian */
 
 int			nxacts = 0;			/* number of transactions per client */
 int			duration = 0;		/* duration in seconds */
@@ -111,15 +116,10 @@ int			scale = 1;
  */
 int			fillfactor = 100;
 
-/*
- * create foreign key constraints on the tables?
- */
-int			foreign_keys = 0;
-
 /*
  * use unlogged tables?
  */
-int			unlogged_tables = 0;
+bool		unlogged_tables = false;
 
 /*
  * log sampling rate (1.0 = log everything, 0.0 = option not given)
@@ -189,19 +189,20 @@ const char *progname;
 volatile bool timer_exceeded = false;	/* flag from signal handler */
 
 /*
- * Variable definitions.  If a variable has a string value, "value" is that
- * value, is_numeric is false, and num_value is undefined.  If the value is
- * known to be numeric, is_numeric is true and num_value contains the value
- * (in any permitted numeric variant).  In this case "value" contains the
- * string equivalent of the number, if we've had occasion to compute that,
- * or NULL if we haven't.
+ * Variable definitions.
+ *
+ * If a variable only has a string value, "svalue" is that value, and value is
+ * "not set".  If the value is known, "value" contains the value (in any
+ * variant).
+ *
+ * In this case "svalue" contains the string equivalent of the value, if we've
+ * had occasion to compute that, or NULL if we haven't.
  */
 typedef struct
 {
 	char	   *name;			/* variable's name */
-	char	   *value;			/* its value in string form, if known */
-	bool		is_numeric;		/* is numeric value known? */
-	PgBenchValue num_value;		/* variable's value in numeric form */
+	char	   *svalue;			/* its value in string form, if known */
+	PgBenchValue value;			/* actual variable's value */
 } Variable;
 
 #define MAX_SCRIPTS		128		/* max number of SQL scripts allowed */
@@ -229,7 +230,7 @@ typedef struct SimpleStats
 typedef struct StatsData
 {
 	time_t		start_time;		/* interval start time, for aggregates */
-	int64		cnt;			/* number of transactions */
+	int64		cnt;			/* number of transactions, including skipped */
 	int64		skipped;		/* number of transactions skipped under --rate
 								 * and --latency-limit */
 	SimpleStats latency;
@@ -329,10 +330,39 @@ typedef struct
 	bool		prepared[MAX_SCRIPTS];	/* whether client prepared the script */
 
 	/* per client collected stats */
-	int64		cnt;			/* transaction count */
+	int64		cnt;			/* client transaction count, for -t */
 	int			ecnt;			/* error count */
 } CState;
 
+/*
+ * Cache cell for zipfian_random call
+ */
+typedef struct
+{
+	/* cell keys */
+	double		s;				/* s - parameter of zipfan_random function */
+	int64		n;				/* number of elements in range (max - min + 1) */
+
+	double		harmonicn;		/* generalizedHarmonicNumber(n, s) */
+	double		alpha;
+	double		beta;
+	double		eta;
+
+	uint64		last_used;		/* last used logical time */
+} ZipfCell;
+
+/*
+ * Zipf cache for zeta values
+ */
+typedef struct
+{
+	uint64		current;		/* counter for LRU cache replacement algorithm */
+
+	int			nb_cells;		/* number of filled cells */
+	int			overflowCount;	/* number of cache overflows */
+	ZipfCell	cells[ZIPF_CACHE_SIZE];
+} ZipfCache;
+
 /*
  * Thread state
  */
@@ -345,6 +375,8 @@ typedef struct
 	unsigned short random_state[3]; /* separate randomness for each thread */
 	int64		throttle_trigger;	/* previous/next throttling (us) */
 	FILE	   *logfile;		/* where to log, or NULL */
+	ZipfCache	zipf_cache;		/* for thread-safe  zipfian random number
+								 * generation */
 
 	/* per thread collected stats */
 	instr_time	start_time;		/* thread start time */
@@ -362,6 +394,15 @@ typedef struct
 #define META_COMMAND	2
 #define MAX_ARGS		10
 
+typedef enum MetaCommand
+{
+	META_NONE,					/* not a known meta-command */
+	META_SET,					/* \set */
+	META_SETSHELL,				/* \setshell */
+	META_SHELL,					/* \shell */
+	META_SLEEP					/* \sleep */
+} MetaCommand;
+
 typedef enum QueryMode
 {
 	QUERY_SIMPLE,				/* simple query */
@@ -378,6 +419,7 @@ typedef struct
 	char	   *line;			/* text of command line */
 	int			command_num;	/* unique index of this Command struct */
 	int			type;			/* command type (SQL_COMMAND or META_COMMAND) */
+	MetaCommand meta;			/* meta command identifier, or META_NONE */
 	int			argc;			/* number of command words */
 	char	   *argv[MAX_ARGS]; /* command word list */
 	PgBenchExpr *expr;			/* parsed expression, if needed */
@@ -447,6 +489,8 @@ static const BuiltinScript builtin_script[] =
 
 
 /* Function prototypes */
+static void setNullValue(PgBenchValue *pv);
+static void setBoolValue(PgBenchValue *pv, bool bval);
 static void setIntValue(PgBenchValue *pv, int64 ival);
 static void setDoubleValue(PgBenchValue *pv, double dval);
 static bool evaluateExpr(TState *, CState *, PgBenchExpr *, PgBenchValue *);
@@ -475,8 +519,10 @@ usage(void)
 		   "  %s [OPTION]... [DBNAME]\n"
 		   "\nInitialization options:\n"
 		   "  -i, --initialize         invokes initialization mode\n"
+		   "  -I, --init-steps=[dtgvpf]+ (default \"dtgvp\")\n"
+		   "                           run selected initialization steps\n"
 		   "  -F, --fillfactor=NUM     set fill factor\n"
-		   "  -n, --no-vacuum          do not run VACUUM after initialization\n"
+		   "  -n, --no-vacuum          do not run VACUUM during initialization\n"
 		   "  -q, --quiet              quiet logging (one message each 5 seconds)\n"
 		   "  -s, --scale=NUM          scaling factor\n"
 		   "  --foreign-keys           create foreign key constraints between tables\n"
@@ -737,6 +783,137 @@ getPoissonRand(TState *thread, int64 center)
 	return (int64) (-log(uniform) * ((double) center) + 0.5);
 }
 
+/* helper function for getZipfianRand */
+static double
+generalizedHarmonicNumber(int64 n, double s)
+{
+	int			i;
+	double		ans = 0.0;
+
+	for (i = n; i > 1; i--)
+		ans += pow(i, -s);
+	return ans + 1.0;
+}
+
+/* set harmonicn and other parameters to cache cell */
+static void
+zipfSetCacheCell(ZipfCell * cell, int64 n, double s)
+{
+	double		harmonic2;
+
+	cell->n = n;
+	cell->s = s;
+
+	harmonic2 = generalizedHarmonicNumber(2, s);
+	cell->harmonicn = generalizedHarmonicNumber(n, s);
+
+	cell->alpha = 1.0 / (1.0 - s);
+	cell->beta = pow(0.5, s);
+	cell->eta = (1.0 - pow(2.0 / n, 1.0 - s)) / (1.0 - harmonic2 / cell->harmonicn);
+}
+
+/*
+ * search for cache cell with keys (n, s)
+ * and create new cell if it does not exist
+ */
+static ZipfCell *
+zipfFindOrCreateCacheCell(ZipfCache * cache, int64 n, double s)
+{
+	int			i,
+				least_recently_used = 0;
+	ZipfCell   *cell;
+
+	/* search cached cell for given parameters */
+	for (i = 0; i < cache->nb_cells; i++)
+	{
+		cell = &cache->cells[i];
+		if (cell->n == n && cell->s == s)
+			return &cache->cells[i];
+
+		if (cell->last_used < cache->cells[least_recently_used].last_used)
+			least_recently_used = i;
+	}
+
+	/* create new one if it does not exist */
+	if (cache->nb_cells < ZIPF_CACHE_SIZE)
+		i = cache->nb_cells++;
+	else
+	{
+		/* replace LRU cell if cache is full */
+		i = least_recently_used;
+		cache->overflowCount++;
+	}
+
+	zipfSetCacheCell(&cache->cells[i], n, s);
+
+	cache->cells[i].last_used = cache->current++;
+	return &cache->cells[i];
+}
+
+/*
+ * Computing zipfian using rejection method, based on
+ * "Non-Uniform Random Variate Generation",
+ * Luc Devroye, p. 550-551, Springer 1986.
+ */
+static int64
+computeIterativeZipfian(TState *thread, int64 n, double s)
+{
+	double		b = pow(2.0, s - 1.0);
+	double		x,
+				t,
+				u,
+				v;
+
+	while (true)
+	{
+		/* random variates */
+		u = pg_erand48(thread->random_state);
+		v = pg_erand48(thread->random_state);
+
+		x = floor(pow(u, -1.0 / (s - 1.0)));
+
+		t = pow(1.0 + 1.0 / x, s - 1.0);
+		/* reject if too large or out of bound */
+		if (v * x * (t - 1.0) / (b - 1.0) <= t / b && x <= n)
+			break;
+	}
+	return (int64) x;
+}
+
+/*
+ * Computing zipfian using harmonic numbers, based on algorithm described in
+ * "Quickly Generating Billion-Record Synthetic Databases",
+ * Jim Gray et al, SIGMOD 1994
+ */
+static int64
+computeHarmonicZipfian(TState *thread, int64 n, double s)
+{
+	ZipfCell   *cell = zipfFindOrCreateCacheCell(&thread->zipf_cache, n, s);
+	double		uniform = pg_erand48(thread->random_state);
+	double		uz = uniform * cell->harmonicn;
+
+	if (uz < 1.0)
+		return 1;
+	if (uz < 1.0 + cell->beta)
+		return 2;
+	return 1 + (int64) (cell->n * pow(cell->eta * uniform - cell->eta + 1.0, cell->alpha));
+}
+
+/* random number generator: zipfian distribution from min to max inclusive */
+static int64
+getZipfianRand(TState *thread, int64 min, int64 max, double s)
+{
+	int64		n = max - min + 1;
+
+	/* abort if parameter is invalid */
+	Assert(s > 0.0 && s != 1.0 && s <= MAX_ZIPFIAN_PARAM);
+
+
+	return min - 1 + ((s > 1)
+					  ? computeIterativeZipfian(thread, n, s)
+					  : computeHarmonicZipfian(thread, n, s));
+}
+
 /*
  * Initialize the given SimpleStats struct to all zeroes
  */
@@ -972,67 +1149,118 @@ getVariable(CState *st, char *name)
 	if (var == NULL)
 		return NULL;			/* not found */
 
-	if (var->value)
-		return var->value;		/* we have it in string form */
+	if (var->svalue)
+		return var->svalue;		/* we have it in string form */
 
-	/* We need to produce a string equivalent of the numeric value */
-	Assert(var->is_numeric);
-	if (var->num_value.type == PGBT_INT)
+	/* We need to produce a string equivalent of the value */
+	Assert(var->value.type != PGBT_NO_VALUE);
+	if (var->value.type == PGBT_NULL)
+		snprintf(stringform, sizeof(stringform), "NULL");
+	else if (var->value.type == PGBT_BOOLEAN)
 		snprintf(stringform, sizeof(stringform),
-				 INT64_FORMAT, var->num_value.u.ival);
-	else
-	{
-		Assert(var->num_value.type == PGBT_DOUBLE);
+				 "%s", var->value.u.bval ? "true" : "false");
+	else if (var->value.type == PGBT_INT)
 		snprintf(stringform, sizeof(stringform),
-				 "%.*g", DBL_DIG, var->num_value.u.dval);
-	}
-	var->value = pg_strdup(stringform);
-	return var->value;
+				 INT64_FORMAT, var->value.u.ival);
+	else if (var->value.type == PGBT_DOUBLE)
+		snprintf(stringform, sizeof(stringform),
+				 "%.*g", DBL_DIG, var->value.u.dval);
+	else /* internal error, unexpected type */
+		Assert(0);
+	var->svalue = pg_strdup(stringform);
+	return var->svalue;
 }
 
-/* Try to convert variable to numeric form; return false on failure */
+/* Try to convert variable to a value; return false on failure */
 static bool
-makeVariableNumeric(Variable *var)
+makeVariableValue(Variable *var)
 {
-	if (var->is_numeric)
+	size_t slen;
+
+	if (var->value.type != PGBT_NO_VALUE)
 		return true;			/* no work */
 
-	if (is_an_int(var->value))
+	slen = strlen(var->svalue);
+
+	if (slen == 0)
+		/* what should it do on ""? */
+		return false;
+
+	if (pg_strcasecmp(var->svalue, "null") == 0)
+	{
+		setNullValue(&var->value);
+	}
+	/*
+	 * accept prefixes such as y, ye, n, no... but not for "o".
+	 * 0/1 are recognized later as an int, which is converted
+	 * to bool if needed.
+	 */
+	else if (pg_strncasecmp(var->svalue, "true", slen) == 0 ||
+			 pg_strncasecmp(var->svalue, "yes", slen) == 0 ||
+			 pg_strcasecmp(var->svalue, "on") == 0)
+	{
+		setBoolValue(&var->value, true);
+	}
+	else if (pg_strncasecmp(var->svalue, "false", slen) == 0 ||
+			 pg_strncasecmp(var->svalue, "no", slen) == 0 ||
+			 pg_strcasecmp(var->svalue, "off") == 0 ||
+			 pg_strcasecmp(var->svalue, "of") == 0)
+	{
+		setBoolValue(&var->value, false);
+	}
+	else if (is_an_int(var->svalue))
 	{
-		setIntValue(&var->num_value, strtoint64(var->value));
-		var->is_numeric = true;
+		setIntValue(&var->value, strtoint64(var->svalue));
 	}
 	else						/* type should be double */
 	{
 		double		dv;
 		char		xs;
 
-		if (sscanf(var->value, "%lf%c", &dv, &xs) != 1)
+		if (sscanf(var->svalue, "%lf%c", &dv, &xs) != 1)
 		{
 			fprintf(stderr,
 					"malformed variable \"%s\" value: \"%s\"\n",
-					var->name, var->value);
+					var->name, var->svalue);
 			return false;
 		}
-		setDoubleValue(&var->num_value, dv);
-		var->is_numeric = true;
+		setDoubleValue(&var->value, dv);
 	}
 	return true;
 }
 
-/* check whether the name consists of alphabets, numerals and underscores. */
+/*
+ * Check whether a variable's name is allowed.
+ *
+ * We allow any non-ASCII character, as well as ASCII letters, digits, and
+ * underscore.
+ *
+ * Keep this in sync with the definitions of variable name characters in
+ * "src/fe_utils/psqlscan.l", "src/bin/psql/psqlscanslash.l" and
+ * "src/bin/pgbench/exprscan.l".  Also see parseVariable(), below.
+ *
+ * Note: this static function is copied from "src/bin/psql/variables.c"
+ */
 static bool
-isLegalVariableName(const char *name)
+valid_variable_name(const char *name)
 {
-	int			i;
+	const unsigned char *ptr = (const unsigned char *) name;
+
+	/* Mustn't be zero-length */
+	if (*ptr == '\0')
+		return false;
 
-	for (i = 0; name[i] != '\0'; i++)
+	while (*ptr)
 	{
-		if (!isalnum((unsigned char) name[i]) && name[i] != '_')
+		if (IS_HIGHBIT_SET(*ptr) ||
+			strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"
+				   "_0123456789", *ptr) != NULL)
+			ptr++;
+		else
 			return false;
 	}
 
-	return (i > 0);				/* must be non-empty */
+	return true;
 }
 
 /*
@@ -1054,7 +1282,7 @@ lookupCreateVariable(CState *st, const char *context, char *name)
 		 * Check for the name only when declaring a new variable to avoid
 		 * overhead.
 		 */
-		if (!isLegalVariableName(name))
+		if (!valid_variable_name(name))
 		{
 			fprintf(stderr, "%s: invalid variable name: \"%s\"\n",
 					context, name);
@@ -1073,7 +1301,7 @@ lookupCreateVariable(CState *st, const char *context, char *name)
 		var = &newvars[st->nvariables];
 
 		var->name = pg_strdup(name);
-		var->value = NULL;
+		var->svalue = NULL;
 		/* caller is expected to initialize remaining fields */
 
 		st->nvariables++;
@@ -1099,18 +1327,18 @@ putVariable(CState *st, const char *context, char *name, const char *value)
 	/* dup then free, in case value is pointing at this variable */
 	val = pg_strdup(value);
 
-	if (var->value)
-		free(var->value);
-	var->value = val;
-	var->is_numeric = false;
+	if (var->svalue)
+		free(var->svalue);
+	var->svalue = val;
+	var->value.type = PGBT_NO_VALUE;
 
 	return true;
 }
 
-/* Assign a numeric value to a variable, creating it if need be */
+/* Assign a value to a variable, creating it if need be */
 /* Returns false on failure (bad name) */
 static bool
-putVariableNumber(CState *st, const char *context, char *name,
+putVariableValue(CState *st, const char *context, char *name,
 				  const PgBenchValue *value)
 {
 	Variable   *var;
@@ -1119,11 +1347,10 @@ putVariableNumber(CState *st, const char *context, char *name,
 	if (!var)
 		return false;
 
-	if (var->value)
-		free(var->value);
-	var->value = NULL;
-	var->is_numeric = true;
-	var->num_value = *value;
+	if (var->svalue)
+		free(var->svalue);
+	var->svalue = NULL;
+	var->value = *value;
 
 	return true;
 }
@@ -1136,9 +1363,17 @@ putVariableInt(CState *st, const char *context, char *name, int64 value)
 	PgBenchValue val;
 
 	setIntValue(&val, value);
-	return putVariableNumber(st, context, name, &val);
+	return putVariableValue(st, context, name, &val);
 }
 
+/*
+ * Parse a possible variable reference (:varname).
+ *
+ * "sql" points at a colon.  If what follows it looks like a valid
+ * variable name, return a malloc'd string containing the variable name,
+ * and set *eaten to the number of characters consumed.
+ * Otherwise, return NULL.
+ */
 static char *
 parseVariable(const char *sql, int *eaten)
 {
@@ -1148,9 +1383,11 @@ parseVariable(const char *sql, int *eaten)
 	do
 	{
 		i++;
-	} while (isalnum((unsigned char) sql[i]) || sql[i] == '_');
+	} while (IS_HIGHBIT_SET(sql[i]) ||
+			 strchr("ABCDEFGHIJKLMNOPQRSTUVWXYZ" "abcdefghijklmnopqrstuvwxyz"
+					"_0123456789", sql[i]) != NULL);
 	if (i == 1)
-		return NULL;
+		return NULL;			/* no valid variable name chars */
 
 	name = pg_malloc(i);
 	memcpy(name, &sql[1], i - 1);
@@ -1225,6 +1462,68 @@ getQueryParams(CState *st, const Command *command, const char **params)
 		params[i] = getVariable(st, command->argv[i + 1]);
 }
 
+static char *
+valueTypeName(PgBenchValue *pval)
+{
+	if (pval->type == PGBT_NO_VALUE)
+		return "none";
+	else if (pval->type == PGBT_NULL)
+		return "null";
+	else if (pval->type == PGBT_INT)
+		return "int";
+	else if (pval->type == PGBT_DOUBLE)
+		return "double";
+	else if (pval->type == PGBT_BOOLEAN)
+		return "boolean";
+	else
+	{
+		/* internal error, should never get there */
+		Assert(false);
+		return NULL;
+	}
+}
+
+/* get a value as a boolean, or tell if there is a problem */
+static bool
+coerceToBool(PgBenchValue *pval, bool *bval)
+{
+	if (pval->type == PGBT_BOOLEAN)
+	{
+		*bval = pval->u.bval;
+		return true;
+	}
+	else /* NULL, INT or DOUBLE */
+	{
+		fprintf(stderr, "cannot coerce %s to boolean\n", valueTypeName(pval));
+		*bval = false;			/* suppress uninitialized-variable warnings */
+		return false;
+	}
+}
+
+/*
+ * Return true or false from an expression for conditional purposes.
+ * Non zero numerical values are true, zero and NULL are false.
+ */
+static bool
+valueTruth(PgBenchValue *pval)
+{
+	switch (pval->type)
+	{
+		case PGBT_NULL:
+			return false;
+		case PGBT_BOOLEAN:
+			return pval->u.bval;
+		case PGBT_INT:
+			return pval->u.ival != 0;
+		case PGBT_DOUBLE:
+			return pval->u.dval != 0.0;
+		default:
+			/* internal error, unexpected type */
+			Assert(0);
+			return false;
+	}
+}
+
 /* get a value as an int, tell if there is a problem */
 static bool
 coerceToInt(PgBenchValue *pval, int64 *ival)
@@ -1234,11 +1533,10 @@ coerceToInt(PgBenchValue *pval, int64 *ival)
 		*ival = pval->u.ival;
 		return true;
 	}
-	else
+	else if (pval->type == PGBT_DOUBLE)
 	{
 		double		dval = pval->u.dval;
 
-		Assert(pval->type == PGBT_DOUBLE);
 		if (dval < PG_INT64_MIN || PG_INT64_MAX < dval)
 		{
 			fprintf(stderr, "double to int overflow for %f\n", dval);
@@ -1247,6 +1545,11 @@ coerceToInt(PgBenchValue *pval, int64 *ival)
 		*ival = (int64) dval;
 		return true;
 	}
+	else /* BOOLEAN or NULL */
+	{
+		fprintf(stderr, "cannot coerce %s to int\n", valueTypeName(pval));
+		return false;
+	}
 }
 
 /* get a value as a double, or tell if there is a problem */
@@ -1258,14 +1561,33 @@ coerceToDouble(PgBenchValue *pval, double *dval)
 		*dval = pval->u.dval;
 		return true;
 	}
-	else
+	else if (pval->type == PGBT_INT)
 	{
-		Assert(pval->type == PGBT_INT);
 		*dval = (double) pval->u.ival;
 		return true;
 	}
+	else /* BOOLEAN or NULL */
+	{
+		fprintf(stderr, "cannot coerce %s to double\n", valueTypeName(pval));
+		return false;
+	}
+}
+
+/* assign a null value */
+static void
+setNullValue(PgBenchValue *pv)
+{
+	pv->type = PGBT_NULL;
+	pv->u.ival = 0;
 }
 
+/* assign a boolean value */
+static void
+setBoolValue(PgBenchValue *pv, bool bval)
+{
+	pv->type = PGBT_BOOLEAN;
+	pv->u.bval = bval;
+}
 /* assign an integer value */
 static void
 setIntValue(PgBenchValue *pv, int64 ival)
@@ -1282,24 +1604,144 @@ setDoubleValue(PgBenchValue *pv, double dval)
 	pv->u.dval = dval;
 }
 
+static bool isLazyFunc(PgBenchFunction func)
+{
+	return func == PGBENCH_AND || func == PGBENCH_OR || func == PGBENCH_CASE;
+}
+
+/* lazy evaluation of some functions */
+static bool
+evalLazyFunc(TState *thread, CState *st,
+			 PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval)
+{
+	PgBenchValue a1, a2;
+	bool ba1, ba2;
+
+	Assert(isLazyFunc(func) && args != NULL && args->next != NULL);
+
+	/* args points to first condition */
+	if (!evaluateExpr(thread, st, args->expr, &a1))
+		return false;
+
+	/* second condition for AND/OR and corresponding branch for CASE */
+	args = args->next;
+
+	switch (func)
+	{
+	case PGBENCH_AND:
+		if (a1.type == PGBT_NULL)
+		{
+			setNullValue(retval);
+			return true;
+		}
+
+		if (!coerceToBool(&a1, &ba1))
+			return false;
+
+		if (!ba1)
+		{
+			setBoolValue(retval, false);
+			return true;
+		}
+
+		if (!evaluateExpr(thread, st, args->expr, &a2))
+			return false;
+
+		if (a2.type == PGBT_NULL)
+		{
+			setNullValue(retval);
+			return true;
+		}
+		else if (!coerceToBool(&a2, &ba2))
+			return false;
+		else
+		{
+			setBoolValue(retval, ba2);
+			return true;
+		}
+
+		return true;
+
+	case PGBENCH_OR:
+
+		if (a1.type == PGBT_NULL)
+		{
+			setNullValue(retval);
+			return true;
+		}
+
+		if (!coerceToBool(&a1, &ba1))
+			return false;
+
+		if (ba1)
+		{
+			setBoolValue(retval, true);
+			return true;
+		}
+
+		if (!evaluateExpr(thread, st, args->expr, &a2))
+			return false;
+
+		if (a2.type == PGBT_NULL)
+		{
+			setNullValue(retval);
+			return true;
+		}
+		else if (!coerceToBool(&a2, &ba2))
+			return false;
+		else
+		{
+			setBoolValue(retval, ba2);
+			return true;
+		}
+
+	case PGBENCH_CASE:
+		/* when true, execute branch */
+		if (valueTruth(&a1))
+			return evaluateExpr(thread, st, args->expr, retval);
+
+		/* now args contains next condition or final else expression */
+		args = args->next;
+
+		/* final else case? */
+		if (args->next == NULL)
+			return evaluateExpr(thread, st, args->expr, retval);
+
+		/* no, another when, proceed */
+		return evalLazyFunc(thread, st, PGBENCH_CASE, args, retval);
+
+	default:
+		/* internal error, cannot get here */
+		Assert(0);
+		break;
+	}
+	return false;
+}
+
 /* maximum number of function arguments */
 #define MAX_FARGS 16
 
 /*
- * Recursive evaluation of functions
+ * Recursive evaluation of standard functions,
+ * which do not require lazy evaluation.
  */
 static bool
-evalFunc(TState *thread, CState *st,
-		 PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval)
+evalStandardFunc(TState *thread, CState *st,
+				 PgBenchFunction func, PgBenchExprLink *args,
+				 PgBenchValue *retval)
 {
 	/* evaluate all function arguments */
-	int			nargs = 0;
-	PgBenchValue vargs[MAX_FARGS];
+	int				nargs = 0;
+	PgBenchValue	vargs[MAX_FARGS];
 	PgBenchExprLink *l = args;
+	bool			has_null = false;
 
 	for (nargs = 0; nargs < MAX_FARGS && l != NULL; nargs++, l = l->next)
+	{
 		if (!evaluateExpr(thread, st, l->expr, &vargs[nargs]))
 			return false;
+		has_null |= vargs[nargs].type == PGBT_NULL;
+	}
 
 	if (l != NULL)
 	{
@@ -1308,6 +1750,13 @@ evalFunc(TState *thread, CState *st,
 		return false;
 	}
 
+	/* NULL arguments */
+	if (has_null && func != PGBENCH_IS && func != PGBENCH_DEBUG)
+	{
+		setNullValue(retval);
+		return true;
+	}
+
 	/* then evaluate function */
 	switch (func)
 	{
@@ -1317,6 +1766,10 @@ evalFunc(TState *thread, CState *st,
 		case PGBENCH_MUL:
 		case PGBENCH_DIV:
 		case PGBENCH_MOD:
+		case PGBENCH_EQ:
+		case PGBENCH_NE:
+		case PGBENCH_LE:
+		case PGBENCH_LT:
 			{
 				PgBenchValue *lval = &vargs[0],
 						   *rval = &vargs[1];
@@ -1352,6 +1805,22 @@ evalFunc(TState *thread, CState *st,
 							setDoubleValue(retval, ld / rd);
 							return true;
 
+						case PGBENCH_EQ:
+							setBoolValue(retval, ld == rd);
+							return true;
+
+						case PGBENCH_NE:
+							setBoolValue(retval, ld != rd);
+							return true;
+
+						case PGBENCH_LE:
+							setBoolValue(retval, ld <= rd);
+							return true;
+
+						case PGBENCH_LT:
+							setBoolValue(retval, ld < rd);
+							return true;
+
 						default:
 							/* cannot get here */
 							Assert(0);
@@ -1380,6 +1849,22 @@ evalFunc(TState *thread, CState *st,
 							setIntValue(retval, li * ri);
 							return true;
 
+						case PGBENCH_EQ:
+							setBoolValue(retval, li == ri);
+							return true;
+
+						case PGBENCH_NE:
+							setBoolValue(retval, li != ri);
+							return true;
+
+						case PGBENCH_LE:
+							setBoolValue(retval, li <= ri);
+							return true;
+
+						case PGBENCH_LT:
+							setBoolValue(retval, li < ri);
+							return true;
+
 						case PGBENCH_DIV:
 						case PGBENCH_MOD:
 							if (ri == 0)
@@ -1420,6 +1905,45 @@ evalFunc(TState *thread, CState *st,
 				}
 			}
 
+			/* integer bitwise operators */
+		case PGBENCH_BITAND:
+		case PGBENCH_BITOR:
+		case PGBENCH_BITXOR:
+		case PGBENCH_LSHIFT:
+		case PGBENCH_RSHIFT:
+			{
+				int64 li, ri;
+
+				if (!coerceToInt(&vargs[0], &li) || !coerceToInt(&vargs[1], &ri))
+					return false;
+
+				if (func == PGBENCH_BITAND)
+					setIntValue(retval, li & ri);
+				else if (func == PGBENCH_BITOR)
+					setIntValue(retval, li | ri);
+				else if (func == PGBENCH_BITXOR)
+					setIntValue(retval, li ^ ri);
+				else if (func == PGBENCH_LSHIFT)
+					setIntValue(retval, li << ri);
+				else if (func == PGBENCH_RSHIFT)
+					setIntValue(retval, li >> ri);
+				else /* cannot get here */
+					Assert(0);
+
+				return true;
+			}
+
+			/* logical operators */
+		case PGBENCH_NOT:
+			{
+				bool b;
+				if (!coerceToBool(&vargs[0], &b))
+					return false;
+
+				setBoolValue(retval, !b);
+				return true;
+			}
+
 			/* no arguments */
 		case PGBENCH_PI:
 			setDoubleValue(retval, M_PI);
@@ -1458,13 +1982,16 @@ evalFunc(TState *thread, CState *st,
 				fprintf(stderr, "debug(script=%d,command=%d): ",
 						st->use_file, st->command + 1);
 
-				if (varg->type == PGBT_INT)
+				if (varg->type == PGBT_NULL)
+					fprintf(stderr, "null\n");
+				else if (varg->type == PGBT_BOOLEAN)
+					fprintf(stderr, "boolean %s\n", varg->u.bval ? "true" : "false");
+				else if (varg->type == PGBT_INT)
 					fprintf(stderr, "int " INT64_FORMAT "\n", varg->u.ival);
-				else
-				{
-					Assert(varg->type == PGBT_DOUBLE);
+				else if (varg->type == PGBT_DOUBLE)
 					fprintf(stderr, "double %.*g\n", DBL_DIG, varg->u.dval);
-				}
+				else /* internal error, unexpected type */
+					Assert(0);
 
 				*retval = *varg;
 
@@ -1474,6 +2001,8 @@ evalFunc(TState *thread, CState *st,
 			/* 1 double argument */
 		case PGBENCH_DOUBLE:
 		case PGBENCH_SQRT:
+		case PGBENCH_LN:
+		case PGBENCH_EXP:
 			{
 				double		dval;
 
@@ -1484,6 +2013,11 @@ evalFunc(TState *thread, CState *st,
 
 				if (func == PGBENCH_SQRT)
 					dval = sqrt(dval);
+				else if (func == PGBENCH_LN)
+					dval = log(dval);
+				else if (func == PGBENCH_EXP)
+					dval = exp(dval);
+				/* else is cast: do nothing */
 
 				setDoubleValue(retval, dval);
 				return true;
@@ -1567,6 +2101,7 @@ evalFunc(TState *thread, CState *st,
 		case PGBENCH_RANDOM:
 		case PGBENCH_RANDOM_EXPONENTIAL:
 		case PGBENCH_RANDOM_GAUSSIAN:
+		case PGBENCH_RANDOM_ZIPFIAN:
 			{
 				int64		imin,
 							imax;
@@ -1617,6 +2152,18 @@ evalFunc(TState *thread, CState *st,
 						setIntValue(retval,
 									getGaussianRand(thread, imin, imax, param));
 					}
+					else if (func == PGBENCH_RANDOM_ZIPFIAN)
+					{
+						if (param <= 0.0 || param == 1.0 || param > MAX_ZIPFIAN_PARAM)
+						{
+							fprintf(stderr,
+									"zipfian parameter must be in range (0, 1) U (1, %d]"
+									" (got %f)\n", MAX_ZIPFIAN_PARAM, param);
+							return false;
+						}
+						setIntValue(retval,
+									getZipfianRand(thread, imin, imax, param));
+					}
 					else		/* exponential */
 					{
 						if (param <= 0.0)
@@ -1627,14 +2174,42 @@ evalFunc(TState *thread, CState *st,
 							return false;
 						}
 
-						setIntValue(retval,
-									getExponentialRand(thread, imin, imax, param));
-					}
-				}
+						setIntValue(retval,
+									getExponentialRand(thread, imin, imax, param));
+					}
+				}
+
+				return true;
+			}
+
+		case PGBENCH_POW:
+			{
+				PgBenchValue *lval = &vargs[0];
+				PgBenchValue *rval = &vargs[1];
+				double		ld,
+							rd;
+
+				Assert(nargs == 2);
+
+				if (!coerceToDouble(lval, &ld) ||
+					!coerceToDouble(rval, &rd))
+					return false;
+
+				setDoubleValue(retval, pow(ld, rd));
 
 				return true;
 			}
 
+		case PGBENCH_IS:
+			{
+				Assert(nargs == 2);
+				/* note: this simple implementation is more permissive than SQL */
+				setBoolValue(retval,
+							 vargs[0].type == vargs[1].type &&
+							 vargs[0].u.bval == vargs[1].u.bval);
+				return true;
+			}
+
 		default:
 			/* cannot get here */
 			Assert(0);
@@ -1643,6 +2218,17 @@ evalFunc(TState *thread, CState *st,
 	}
 }
 
+/* evaluate some function */
+static bool
+evalFunc(TState *thread, CState *st,
+		 PgBenchFunction func, PgBenchExprLink *args, PgBenchValue *retval)
+{
+	if (isLazyFunc(func))
+		return evalLazyFunc(thread, st, func, args, retval);
+	else
+		return evalStandardFunc(thread, st, func, args, retval);
+}
+
 /*
  * Recursive evaluation of an expression in a pgbench script
  * using the current state of variables.
@@ -1671,10 +2257,10 @@ evaluateExpr(TState *thread, CState *st, PgBenchExpr *expr, PgBenchValue *retval
 					return false;
 				}
 
-				if (!makeVariableNumeric(var))
+				if (!makeVariableValue(var))
 					return false;
 
-				*retval = var->num_value;
+				*retval = var->value;
 				return true;
 			}
 
@@ -1692,6 +2278,29 @@ evaluateExpr(TState *thread, CState *st, PgBenchExpr *expr, PgBenchValue *retval
 	}
 }
 
+/*
+ * Convert command name to meta-command enum identifier
+ */
+static MetaCommand
+getMetaCommand(const char *cmd)
+{
+	MetaCommand mc;
+
+	if (cmd == NULL)
+		mc = META_NONE;
+	else if (pg_strcasecmp(cmd, "set") == 0)
+		mc = META_SET;
+	else if (pg_strcasecmp(cmd, "setshell") == 0)
+		mc = META_SETSHELL;
+	else if (pg_strcasecmp(cmd, "shell") == 0)
+		mc = META_SHELL;
+	else if (pg_strcasecmp(cmd, "sleep") == 0)
+		mc = META_SLEEP;
+	else
+		mc = META_NONE;
+	return mc;
+}
+
 /*
  * Run a shell command. The result is assigned to the variable if not NULL.
  * Return true if succeeded, or false on error.
@@ -1808,7 +2417,7 @@ preparedStatementName(char *buffer, int file, int state)
 }
 
 static void
-commandFailed(CState *st, char *message)
+commandFailed(CState *st, const char *message)
 {
 	fprintf(stderr,
 			"client %d aborted in command %d of script %d; %s\n",
@@ -2033,10 +2642,11 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 				}
 
 				/*
-				 * If this --latency-limit is used, and this slot is already
-				 * late so that the transaction will miss the latency limit
-				 * even if it completed immediately, we skip this time slot
-				 * and iterate till the next slot that isn't late yet.
+				 * If --latency-limit is used, and this slot is already late
+				 * so that the transaction will miss the latency limit even if
+				 * it completed immediately, we skip this time slot and
+				 * iterate till the next slot that isn't late yet.  But don't
+				 * iterate beyond the -t limit, if one is given.
 				 */
 				if (latency_limit)
 				{
@@ -2045,7 +2655,8 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 					if (INSTR_TIME_IS_ZERO(now))
 						INSTR_TIME_SET_CURRENT(now);
 					now_us = INSTR_TIME_GET_MICROSEC(now);
-					while (thread->throttle_trigger < now_us - latency_limit)
+					while (thread->throttle_trigger < now_us - latency_limit &&
+						   (nxacts <= 0 || st->cnt < nxacts))
 					{
 						processXactStats(thread, st, &now, true, agg);
 						/* next rendez-vous */
@@ -2053,6 +2664,12 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 						thread->throttle_trigger += wait;
 						st->txn_scheduled = thread->throttle_trigger;
 					}
+					/* stop client if -t exceeded */
+					if (nxacts > 0 && st->cnt >= nxacts)
+					{
+						st->state = CSTATE_FINISHED;
+						break;
+					}
 				}
 
 				st->state = CSTATE_THROTTLE;
@@ -2157,12 +2774,8 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 				{
 					if (!sendCommand(st, command))
 					{
-						/*
-						 * Failed. Stay in CSTATE_START_COMMAND state, to
-						 * retry. ??? What the point or retrying? Should
-						 * rather abort?
-						 */
-						return;
+						commandFailed(st, "SQL command send failed");
+						st->state = CSTATE_ABORTED;
 					}
 					else
 						st->state = CSTATE_WAIT_RESULT;
@@ -2181,7 +2794,7 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 						fprintf(stderr, "\n");
 					}
 
-					if (pg_strcasecmp(argv[0], "sleep") == 0)
+					if (command->meta == META_SLEEP)
 					{
 						/*
 						 * A \sleep doesn't execute anything, we just get the
@@ -2207,7 +2820,7 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 					}
 					else
 					{
-						if (pg_strcasecmp(argv[0], "set") == 0)
+						if (command->meta == META_SET)
 						{
 							PgBenchExpr *expr = command->expr;
 							PgBenchValue result;
@@ -2219,14 +2832,14 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 								break;
 							}
 
-							if (!putVariableNumber(st, argv[0], argv[1], &result))
+							if (!putVariableValue(st, argv[0], argv[1], &result))
 							{
 								commandFailed(st, "assignment of meta-command 'set' failed");
 								st->state = CSTATE_ABORTED;
 								break;
 							}
 						}
-						else if (pg_strcasecmp(argv[0], "setshell") == 0)
+						else if (command->meta == META_SETSHELL)
 						{
 							bool		ret = runShellCommand(st, argv[1], argv + 2, argc - 2);
 
@@ -2246,7 +2859,7 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 								/* succeeded */
 							}
 						}
-						else if (pg_strcasecmp(argv[0], "shell") == 0)
+						else if (command->meta == META_SHELL)
 						{
 							bool		ret = runShellCommand(st, NULL, argv + 1, argc - 1);
 
@@ -2364,15 +2977,8 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 				 */
 			case CSTATE_END_TX:
 
-				/*
-				 * transaction finished: calculate latency and log the
-				 * transaction
-				 */
-				if (progress || throttle_delay || latency_limit ||
-					per_script_stats || use_log)
-					processXactStats(thread, st, &now, false, agg);
-				else
-					thread->stats.cnt++;
+				/* transaction finished: calculate latency and do log */
+				processXactStats(thread, st, &now, false, agg);
 
 				if (is_connect)
 				{
@@ -2381,7 +2987,6 @@ doCustom(TState *thread, CState *st, StatsData *agg)
 					INSTR_TIME_SET_ZERO(now);
 				}
 
-				++st->cnt;
 				if ((st->cnt >= nxacts && duration <= 0) || timer_exceeded)
 				{
 					/* exit success */
@@ -2511,7 +3116,8 @@ doLog(TState *thread, CState *st,
 /*
  * Accumulate and report statistics at end of a transaction.
  *
- * (This is also called when a transaction is late and thus skipped.)
+ * (This is also called when a transaction is late and thus skipped.
+ * Note that even skipped transactions are counted in the "cnt" fields.)
  */
 static void
 processXactStats(TState *thread, CState *st, instr_time *now,
@@ -2519,19 +3125,22 @@ processXactStats(TState *thread, CState *st, instr_time *now,
 {
 	double		latency = 0.0,
 				lag = 0.0;
+	bool		thread_details = progress || throttle_delay || latency_limit,
+				detailed = thread_details || use_log || per_script_stats;
 
-	if ((!skipped) && INSTR_TIME_IS_ZERO(*now))
-		INSTR_TIME_SET_CURRENT(*now);
-
-	if (!skipped)
+	if (detailed && !skipped)
 	{
+		if (INSTR_TIME_IS_ZERO(*now))
+			INSTR_TIME_SET_CURRENT(*now);
+
 		/* compute latency & lag */
 		latency = INSTR_TIME_GET_MICROSEC(*now) - st->txn_scheduled;
 		lag = INSTR_TIME_GET_MICROSEC(st->txn_begin) - st->txn_scheduled;
 	}
 
-	if (progress || throttle_delay || latency_limit)
+	if (thread_details)
 	{
+		/* keep detailed thread stats */
 		accumStats(&thread->stats, skipped, latency, lag);
 
 		/* count transactions over the latency limit, if needed */
@@ -2539,7 +3148,13 @@ processXactStats(TState *thread, CState *st, instr_time *now,
 			thread->latency_late++;
 	}
 	else
+	{
+		/* no detailed stats, just count */
 		thread->stats.cnt++;
+	}
+
+	/* client stat is just counting */
+	st->cnt++;
 
 	if (use_log)
 		doLog(thread, st, agg, skipped, latency, lag);
@@ -2566,17 +3181,39 @@ disconnect_all(CState *state, int length)
 	}
 }
 
-/* create tables and setup data */
+/*
+ * Remove old pgbench tables, if any exist
+ */
 static void
-init(bool is_no_vacuum)
+initDropTables(PGconn *con)
 {
+	fprintf(stderr, "dropping old tables...\n");
+
+	/*
+	 * We drop all the tables in one command, so that whether there are
+	 * foreign key dependencies or not doesn't matter.
+	 */
+	executeStatement(con, "drop table if exists "
+					 "pgbench_accounts, "
+					 "pgbench_branches, "
+					 "pgbench_history, "
+					 "pgbench_tellers");
+}
+
 /*
- * The scale factor at/beyond which 32-bit integers are insufficient for
- * storing TPC-B account IDs.
- *
- * Although the actual threshold is 21474, we use 20000 because it is easier to
- * document and remember, and isn't that far away from the real threshold.
+ * Create pgbench's standard tables
  */
+static void
+initCreateTables(PGconn *con)
+{
+	/*
+	 * The scale factor at/beyond which 32-bit integers are insufficient for
+	 * storing TPC-B account IDs.
+	 *
+	 * Although the actual threshold is 21474, we use 20000 because it is
+	 * easier to document and remember, and isn't that far away from the real
+	 * threshold.
+	 */
 #define SCALE_32BIT_THRESHOLD 20000
 
 	/*
@@ -2623,34 +3260,9 @@ init(bool is_no_vacuum)
 			1
 		}
 	};
-	static const char *const DDLINDEXes[] = {
-		"alter table pgbench_branches add primary key (bid)",
-		"alter table pgbench_tellers add primary key (tid)",
-		"alter table pgbench_accounts add primary key (aid)"
-	};
-	static const char *const DDLKEYs[] = {
-		"alter table pgbench_tellers add foreign key (bid) references pgbench_branches",
-		"alter table pgbench_accounts add foreign key (bid) references pgbench_branches",
-		"alter table pgbench_history add foreign key (bid) references pgbench_branches",
-		"alter table pgbench_history add foreign key (tid) references pgbench_tellers",
-		"alter table pgbench_history add foreign key (aid) references pgbench_accounts"
-	};
-
-	PGconn	   *con;
-	PGresult   *res;
-	char		sql[256];
 	int			i;
-	int64		k;
-
-	/* used to track elapsed time and estimate of the remaining time */
-	instr_time	start,
-				diff;
-	double		elapsed_sec,
-				remaining_sec;
-	int			log_interval = 1;
 
-	if ((con = doConnect()) == NULL)
-		exit(1);
+	fprintf(stderr, "creating tables...\n");
 
 	for (i = 0; i < lengthof(DDLs); i++)
 	{
@@ -2659,10 +3271,6 @@ init(bool is_no_vacuum)
 		const struct ddlinfo *ddl = &DDLs[i];
 		const char *cols;
 
-		/* Remove old table, if it exists. */
-		snprintf(buffer, sizeof(buffer), "drop table if exists %s", ddl->table);
-		executeStatement(con, buffer);
-
 		/* Construct new create table statement. */
 		opts[0] = '\0';
 		if (ddl->declare_fillfactor)
@@ -2687,9 +3295,48 @@ init(bool is_no_vacuum)
 
 		executeStatement(con, buffer);
 	}
+}
+
+/*
+ * Fill the standard tables with some data
+ */
+static void
+initGenerateData(PGconn *con)
+{
+	char		sql[256];
+	PGresult   *res;
+	int			i;
+	int64		k;
+
+	/* used to track elapsed time and estimate of the remaining time */
+	instr_time	start,
+				diff;
+	double		elapsed_sec,
+				remaining_sec;
+	int			log_interval = 1;
 
+	fprintf(stderr, "generating data...\n");
+
+	/*
+	 * we do all of this in one transaction to enable the backend's
+	 * data-loading optimizations
+	 */
 	executeStatement(con, "begin");
 
+	/*
+	 * truncate away any old data, in one command in case there are foreign
+	 * keys
+	 */
+	executeStatement(con, "truncate table "
+					 "pgbench_accounts, "
+					 "pgbench_branches, "
+					 "pgbench_history, "
+					 "pgbench_tellers");
+
+	/*
+	 * fill branches, tellers, accounts in that order in case foreign keys
+	 * already exist
+	 */
 	for (i = 0; i < nbranches * scale; i++)
 	{
 		/* "filler" column defaults to NULL */
@@ -2708,16 +3355,9 @@ init(bool is_no_vacuum)
 		executeStatement(con, sql);
 	}
 
-	executeStatement(con, "commit");
-
 	/*
-	 * fill the pgbench_accounts table with some data
+	 * accounts is big enough to be worth using COPY and tracking runtime
 	 */
-	fprintf(stderr, "creating tables...\n");
-
-	executeStatement(con, "begin");
-	executeStatement(con, "truncate pgbench_accounts");
-
 	res = PQexec(con, "copy pgbench_accounts from stdin");
 	if (PQresultStatus(res) != PGRES_COPY_IN)
 	{
@@ -2791,22 +3431,37 @@ init(bool is_no_vacuum)
 		fprintf(stderr, "PQendcopy failed\n");
 		exit(1);
 	}
+
 	executeStatement(con, "commit");
+}
 
-	/* vacuum */
-	if (!is_no_vacuum)
-	{
-		fprintf(stderr, "vacuum...\n");
-		executeStatement(con, "vacuum analyze pgbench_branches");
-		executeStatement(con, "vacuum analyze pgbench_tellers");
-		executeStatement(con, "vacuum analyze pgbench_accounts");
-		executeStatement(con, "vacuum analyze pgbench_history");
-	}
+/*
+ * Invoke vacuum on the standard tables
+ */
+static void
+initVacuum(PGconn *con)
+{
+	fprintf(stderr, "vacuuming...\n");
+	executeStatement(con, "vacuum analyze pgbench_branches");
+	executeStatement(con, "vacuum analyze pgbench_tellers");
+	executeStatement(con, "vacuum analyze pgbench_accounts");
+	executeStatement(con, "vacuum analyze pgbench_history");
+}
 
-	/*
-	 * create indexes
-	 */
-	fprintf(stderr, "set primary keys...\n");
+/*
+ * Create primary keys on the standard tables
+ */
+static void
+initCreatePKeys(PGconn *con)
+{
+	static const char *const DDLINDEXes[] = {
+		"alter table pgbench_branches add primary key (bid)",
+		"alter table pgbench_tellers add primary key (tid)",
+		"alter table pgbench_accounts add primary key (aid)"
+	};
+	int			i;
+
+	fprintf(stderr, "creating primary keys...\n");
 	for (i = 0; i < lengthof(DDLINDEXes); i++)
 	{
 		char		buffer[256];
@@ -2826,16 +3481,101 @@ init(bool is_no_vacuum)
 
 		executeStatement(con, buffer);
 	}
+}
 
-	/*
-	 * create foreign keys
-	 */
-	if (foreign_keys)
+/*
+ * Create foreign key constraints between the standard tables
+ */
+static void
+initCreateFKeys(PGconn *con)
+{
+	static const char *const DDLKEYs[] = {
+		"alter table pgbench_tellers add constraint pgbench_tellers_bid_fkey foreign key (bid) references pgbench_branches",
+		"alter table pgbench_accounts add constraint pgbench_accounts_bid_fkey foreign key (bid) references pgbench_branches",
+		"alter table pgbench_history add constraint pgbench_history_bid_fkey foreign key (bid) references pgbench_branches",
+		"alter table pgbench_history add constraint pgbench_history_tid_fkey foreign key (tid) references pgbench_tellers",
+		"alter table pgbench_history add constraint pgbench_history_aid_fkey foreign key (aid) references pgbench_accounts"
+	};
+	int			i;
+
+	fprintf(stderr, "creating foreign keys...\n");
+	for (i = 0; i < lengthof(DDLKEYs); i++)
+	{
+		executeStatement(con, DDLKEYs[i]);
+	}
+}
+
+/*
+ * Validate an initialization-steps string
+ *
+ * (We could just leave it to runInitSteps() to fail if there are wrong
+ * characters, but since initialization can take awhile, it seems friendlier
+ * to check during option parsing.)
+ */
+static void
+checkInitSteps(const char *initialize_steps)
+{
+	const char *step;
+
+	if (initialize_steps[0] == '\0')
+	{
+		fprintf(stderr, "no initialization steps specified\n");
+		exit(1);
+	}
+
+	for (step = initialize_steps; *step != '\0'; step++)
+	{
+		if (strchr("dtgvpf ", *step) == NULL)
+		{
+			fprintf(stderr, "unrecognized initialization step \"%c\"\n",
+					*step);
+			fprintf(stderr, "allowed steps are: \"d\", \"t\", \"g\", \"v\", \"p\", \"f\"\n");
+			exit(1);
+		}
+	}
+}
+
+/*
+ * Invoke each initialization step in the given string
+ */
+static void
+runInitSteps(const char *initialize_steps)
+{
+	PGconn	   *con;
+	const char *step;
+
+	if ((con = doConnect()) == NULL)
+		exit(1);
+
+	for (step = initialize_steps; *step != '\0'; step++)
 	{
-		fprintf(stderr, "set foreign keys...\n");
-		for (i = 0; i < lengthof(DDLKEYs); i++)
+		switch (*step)
 		{
-			executeStatement(con, DDLKEYs[i]);
+			case 'd':
+				initDropTables(con);
+				break;
+			case 't':
+				initCreateTables(con);
+				break;
+			case 'g':
+				initGenerateData(con);
+				break;
+			case 'v':
+				initVacuum(con);
+				break;
+			case 'p':
+				initCreatePKeys(con);
+				break;
+			case 'f':
+				initCreateFKeys(con);
+				break;
+			case ' ':
+				break;			/* ignore */
+			default:
+				fprintf(stderr, "unrecognized initialization step \"%c\"\n",
+						*step);
+				PQfinish(con);
+				exit(1);
 		}
 	}
 
@@ -2988,6 +3728,7 @@ process_sql_command(PQExpBuffer buf, const char *source)
 	my_command = (Command *) pg_malloc0(sizeof(Command));
 	my_command->command_num = num_commands++;
 	my_command->type = SQL_COMMAND;
+	my_command->meta = META_NONE;
 	initSimpleStats(&my_command->stats);
 
 	/*
@@ -3026,8 +3767,7 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 	PQExpBufferData word_buf;
 	int			word_offset;
 	int			offsets[MAX_ARGS];	/* offsets of argument words */
-	int			start_offset,
-				end_offset;
+	int			start_offset;
 	int			lineno;
 	int			j;
 
@@ -3057,7 +3797,10 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 	my_command->argv[j++] = pg_strdup(word_buf.data);
 	my_command->argc++;
 
-	if (pg_strcasecmp(my_command->argv[0], "set") == 0)
+	/* ... and convert it to enum form */
+	my_command->meta = getMetaCommand(my_command->argv[0]);
+
+	if (my_command->meta == META_SET)
 	{
 		/* For \set, collect var name, then lex the expression. */
 		yyscan_t	yyscanner;
@@ -3081,13 +3824,11 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 
 		my_command->expr = expr_parse_result;
 
-		/* Get location of the ending newline */
-		end_offset = expr_scanner_offset(sstate) - 1;
-
-		/* Save line */
+		/* Save line, trimming any trailing newline */
 		my_command->line = expr_scanner_get_substring(sstate,
 													  start_offset,
-													  end_offset);
+													  expr_scanner_offset(sstate),
+													  true);
 
 		expr_scanner_finish(yyscanner);
 
@@ -3108,15 +3849,13 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 		my_command->argc++;
 	}
 
-	/* Get location of the ending newline */
-	end_offset = expr_scanner_offset(sstate) - 1;
-
-	/* Save line */
+	/* Save line, trimming any trailing newline */
 	my_command->line = expr_scanner_get_substring(sstate,
 												  start_offset,
-												  end_offset);
+												  expr_scanner_offset(sstate),
+												  true);
 
-	if (pg_strcasecmp(my_command->argv[0], "sleep") == 0)
+	if (my_command->meta == META_SLEEP)
 	{
 		if (my_command->argc < 2)
 			syntax_error(source, lineno, my_command->line, my_command->argv[0],
@@ -3157,13 +3896,13 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 							 my_command->argv[2], offsets[2] - start_offset);
 		}
 	}
-	else if (pg_strcasecmp(my_command->argv[0], "setshell") == 0)
+	else if (my_command->meta == META_SETSHELL)
 	{
 		if (my_command->argc < 3)
 			syntax_error(source, lineno, my_command->line, my_command->argv[0],
 						 "missing argument", NULL, -1);
 	}
-	else if (pg_strcasecmp(my_command->argv[0], "shell") == 0)
+	else if (my_command->meta == META_SHELL)
 	{
 		if (my_command->argc < 2)
 			syntax_error(source, lineno, my_command->line, my_command->argv[0],
@@ -3171,6 +3910,7 @@ process_backslash_command(PsqlScanState sstate, const char *source)
 	}
 	else
 	{
+		/* my_command->meta == META_NONE */
 		syntax_error(source, lineno, my_command->line, my_command->argv[0],
 					 "invalid command", NULL, -1);
 	}
@@ -3470,29 +4210,36 @@ addScript(ParsedScript script)
 }
 
 static void
-printSimpleStats(char *prefix, SimpleStats *ss)
+printSimpleStats(const char *prefix, SimpleStats *ss)
 {
-	/* print NaN if no transactions where executed */
-	double		latency = ss->sum / ss->count;
-	double		stddev = sqrt(ss->sum2 / ss->count - latency * latency);
+	if (ss->count > 0)
+	{
+		double		latency = ss->sum / ss->count;
+		double		stddev = sqrt(ss->sum2 / ss->count - latency * latency);
 
-	printf("%s average = %.3f ms\n", prefix, 0.001 * latency);
-	printf("%s stddev = %.3f ms\n", prefix, 0.001 * stddev);
+		printf("%s average = %.3f ms\n", prefix, 0.001 * latency);
+		printf("%s stddev = %.3f ms\n", prefix, 0.001 * stddev);
+	}
 }
 
 /* print out results */
 static void
 printResults(TState *threads, StatsData *total, instr_time total_time,
-			 instr_time conn_total_time, int latency_late)
+			 instr_time conn_total_time, int64 latency_late)
 {
 	double		time_include,
 				tps_include,
 				tps_exclude;
+	int64		ntx = total->cnt - total->skipped;
+	int			i,
+				totalCacheOverflows = 0;
 
 	time_include = INSTR_TIME_GET_DOUBLE(total_time);
-	tps_include = total->cnt / time_include;
-	tps_exclude = total->cnt / (time_include -
-								(INSTR_TIME_GET_DOUBLE(conn_total_time) / nclients));
+
+	/* tps is about actually executed transactions */
+	tps_include = ntx / time_include;
+	tps_exclude = ntx /
+		(time_include - (INSTR_TIME_GET_DOUBLE(conn_total_time) / nclients));
 
 	/* Report test parameters. */
 	printf("transaction type: %s\n",
@@ -3505,13 +4252,22 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
 	{
 		printf("number of transactions per client: %d\n", nxacts);
 		printf("number of transactions actually processed: " INT64_FORMAT "/%d\n",
-			   total->cnt, nxacts * nclients);
+			   ntx, nxacts * nclients);
 	}
 	else
 	{
 		printf("duration: %d s\n", duration);
 		printf("number of transactions actually processed: " INT64_FORMAT "\n",
-			   total->cnt);
+			   ntx);
+	}
+	/* Report zipfian cache overflow */
+	for (i = 0; i < nthreads; i++)
+	{
+		totalCacheOverflows += threads[i].zipf_cache.overflowCount;
+	}
+	if (totalCacheOverflows > 0)
+	{
+		printf("zipfian cache array overflowed %d time(s)\n", totalCacheOverflows);
 	}
 
 	/* Remaining stats are nonsensical if we failed to execute any xacts */
@@ -3521,12 +4277,12 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
 	if (throttle_delay && latency_limit)
 		printf("number of transactions skipped: " INT64_FORMAT " (%.3f %%)\n",
 			   total->skipped,
-			   100.0 * total->skipped / (total->skipped + total->cnt));
+			   100.0 * total->skipped / total->cnt);
 
 	if (latency_limit)
-		printf("number of transactions above the %.1f ms latency limit: %d (%.3f %%)\n",
-			   latency_limit / 1000.0, latency_late,
-			   100.0 * latency_late / (total->skipped + total->cnt));
+		printf("number of transactions above the %.1f ms latency limit: " INT64_FORMAT "/" INT64_FORMAT " (%.3f %%)\n",
+			   latency_limit / 1000.0, latency_late, ntx,
+			   (ntx > 0) ? 100.0 * latency_late / ntx : 0.0);
 
 	if (throttle_delay || progress || latency_limit)
 		printSimpleStats("latency", &total->latency);
@@ -3553,48 +4309,55 @@ printResults(TState *threads, StatsData *total, instr_time total_time,
 	printf("tps = %f (excluding connections establishing)\n", tps_exclude);
 
 	/* Report per-script/command statistics */
-	if (per_script_stats || latency_limit || is_latencies)
+	if (per_script_stats || is_latencies)
 	{
 		int			i;
 
 		for (i = 0; i < num_scripts; i++)
 		{
-			if (num_scripts > 1)
+			if (per_script_stats)
+			{
+				StatsData  *sstats = &sql_script[i].stats;
+
 				printf("SQL script %d: %s\n"
 					   " - weight: %d (targets %.1f%% of total)\n"
 					   " - " INT64_FORMAT " transactions (%.1f%% of total, tps = %f)\n",
 					   i + 1, sql_script[i].desc,
 					   sql_script[i].weight,
 					   100.0 * sql_script[i].weight / total_weight,
-					   sql_script[i].stats.cnt,
-					   100.0 * sql_script[i].stats.cnt / total->cnt,
-					   sql_script[i].stats.cnt / time_include);
-			else
-				printf("script statistics:\n");
+					   sstats->cnt,
+					   100.0 * sstats->cnt / total->cnt,
+					   (sstats->cnt - sstats->skipped) / time_include);
 
-			if (latency_limit)
-				printf(" - number of transactions skipped: " INT64_FORMAT " (%.3f%%)\n",
-					   sql_script[i].stats.skipped,
-					   100.0 * sql_script[i].stats.skipped /
-					   (sql_script[i].stats.skipped + sql_script[i].stats.cnt));
+				if (throttle_delay && latency_limit && sstats->cnt > 0)
+					printf(" - number of transactions skipped: " INT64_FORMAT " (%.3f%%)\n",
+						   sstats->skipped,
+						   100.0 * sstats->skipped / sstats->cnt);
 
-			if (num_scripts > 1)
-				printSimpleStats(" - latency", &sql_script[i].stats.latency);
+				printSimpleStats(" - latency", &sstats->latency);
+			}
 
 			/* Report per-command latencies */
 			if (is_latencies)
 			{
 				Command   **commands;
 
-				printf(" - statement latencies in milliseconds:\n");
+				if (per_script_stats)
+					printf(" - statement latencies in milliseconds:\n");
+				else
+					printf("statement latencies in milliseconds:\n");
 
 				for (commands = sql_script[i].commands;
 					 *commands != NULL;
 					 commands++)
+				{
+					SimpleStats *cstats = &(*commands)->stats;
+
 					printf("   %11.3f  %s\n",
-						   1000.0 * (*commands)->stats.sum /
-						   (*commands)->stats.count,
+						   (cstats->count > 0) ?
+						   1000.0 * cstats->sum / cstats->count : 0.0,
 						   (*commands)->line);
+				}
 			}
 		}
 	}
@@ -3615,6 +4378,7 @@ main(int argc, char **argv)
 		{"fillfactor", required_argument, NULL, 'F'},
 		{"host", required_argument, NULL, 'h'},
 		{"initialize", no_argument, NULL, 'i'},
+		{"init-steps", required_argument, NULL, 'I'},
 		{"jobs", required_argument, NULL, 'j'},
 		{"log", no_argument, NULL, 'l'},
 		{"latency-limit", required_argument, NULL, 'L'},
@@ -3633,21 +4397,23 @@ main(int argc, char **argv)
 		{"username", required_argument, NULL, 'U'},
 		{"vacuum-all", no_argument, NULL, 'v'},
 		/* long-named only options */
-		{"foreign-keys", no_argument, &foreign_keys, 1},
-		{"index-tablespace", required_argument, NULL, 3},
+		{"unlogged-tables", no_argument, NULL, 1},
 		{"tablespace", required_argument, NULL, 2},
-		{"unlogged-tables", no_argument, &unlogged_tables, 1},
+		{"index-tablespace", required_argument, NULL, 3},
 		{"sampling-rate", required_argument, NULL, 4},
 		{"aggregate-interval", required_argument, NULL, 5},
 		{"progress-timestamp", no_argument, NULL, 6},
 		{"log-prefix", required_argument, NULL, 7},
+		{"foreign-keys", no_argument, NULL, 8},
 		{NULL, 0, NULL, 0}
 	};
 
 	int			c;
-	int			is_init_mode = 0;	/* initialize mode? */
-	int			is_no_vacuum = 0;	/* no vacuum at all before testing? */
-	int			do_vacuum_accounts = 0; /* do vacuum accounts before testing? */
+	bool		is_init_mode = false;	/* initialize mode? */
+	char	   *initialize_steps = NULL;
+	bool		foreign_keys = false;
+	bool		is_no_vacuum = false;
+	bool		do_vacuum_accounts = false; /* vacuum accounts table? */
 	int			optindex;
 	bool		scale_given = false;
 
@@ -3707,23 +4473,31 @@ main(int argc, char **argv)
 	state = (CState *) pg_malloc(sizeof(CState));
 	memset(state, 0, sizeof(CState));
 
-	while ((c = getopt_long(argc, argv, "ih:nvp:dqb:SNc:j:Crs:t:T:U:lf:D:F:M:P:R:L:", long_options, &optindex)) != -1)
+	while ((c = getopt_long(argc, argv, "iI:h:nvp:dqb:SNc:j:Crs:t:T:U:lf:D:F:M:P:R:L:", long_options, &optindex)) != -1)
 	{
 		char	   *script;
 
 		switch (c)
 		{
 			case 'i':
-				is_init_mode++;
+				is_init_mode = true;
+				break;
+			case 'I':
+				if (initialize_steps)
+					pg_free(initialize_steps);
+				initialize_steps = pg_strdup(optarg);
+				checkInitSteps(initialize_steps);
+				initialization_option_set = true;
 				break;
 			case 'h':
 				pghost = pg_strdup(optarg);
 				break;
 			case 'n':
-				is_no_vacuum++;
+				is_no_vacuum = true;
 				break;
 			case 'v':
-				do_vacuum_accounts++;
+				benchmarking_option_set = true;
+				do_vacuum_accounts = true;
 				break;
 			case 'p':
 				pgport = pg_strdup(optarg);
@@ -3782,7 +4556,6 @@ main(int argc, char **argv)
 				break;
 			case 'r':
 				benchmarking_option_set = true;
-				per_script_stats = true;
 				is_latencies = true;
 				break;
 			case 's':
@@ -3796,11 +4569,6 @@ main(int argc, char **argv)
 				break;
 			case 't':
 				benchmarking_option_set = true;
-				if (duration > 0)
-				{
-					fprintf(stderr, "specify either a number of transactions (-t) or a duration (-T), not both\n");
-					exit(1);
-				}
 				nxacts = atoi(optarg);
 				if (nxacts <= 0)
 				{
@@ -3811,11 +4579,6 @@ main(int argc, char **argv)
 				break;
 			case 'T':
 				benchmarking_option_set = true;
-				if (nxacts > 0)
-				{
-					fprintf(stderr, "specify either a number of transactions (-t) or a duration (-T), not both\n");
-					exit(1);
-				}
 				duration = atoi(optarg);
 				if (duration <= 0)
 				{
@@ -3834,20 +4597,17 @@ main(int argc, char **argv)
 				initialization_option_set = true;
 				use_quiet = true;
 				break;
-
 			case 'b':
 				if (strcmp(optarg, "list") == 0)
 				{
 					listAvailableScripts();
 					exit(0);
 				}
-
 				weight = parseScriptWeight(optarg, &script);
 				process_builtin(findBuiltin(script), weight);
 				benchmarking_option_set = true;
 				internal_script_used = true;
 				break;
-
 			case 'S':
 				process_builtin(findBuiltin("select-only"), 1);
 				benchmarking_option_set = true;
@@ -3942,10 +4702,9 @@ main(int argc, char **argv)
 					latency_limit = (int64) (limit_ms * 1000);
 				}
 				break;
-			case 0:
-				/* This covers long options which take no argument. */
-				if (foreign_keys || unlogged_tables)
-					initialization_option_set = true;
+			case 1:				/* unlogged-tables */
+				initialization_option_set = true;
+				unlogged_tables = true;
 				break;
 			case 2:				/* tablespace */
 				initialization_option_set = true;
@@ -3955,7 +4714,7 @@ main(int argc, char **argv)
 				initialization_option_set = true;
 				index_tablespace = pg_strdup(optarg);
 				break;
-			case 4:
+			case 4:				/* sampling-rate */
 				benchmarking_option_set = true;
 				sample_rate = atof(optarg);
 				if (sample_rate <= 0.0 || sample_rate > 1.0)
@@ -3964,7 +4723,7 @@ main(int argc, char **argv)
 					exit(1);
 				}
 				break;
-			case 5:
+			case 5:				/* aggregate-interval */
 				benchmarking_option_set = true;
 				agg_interval = atoi(optarg);
 				if (agg_interval <= 0)
@@ -3974,14 +4733,18 @@ main(int argc, char **argv)
 					exit(1);
 				}
 				break;
-			case 6:
+			case 6:				/* progress-timestamp */
 				progress_timestamp = true;
 				benchmarking_option_set = true;
 				break;
-			case 7:
+			case 7:				/* log-prefix */
 				benchmarking_option_set = true;
 				logfile_prefix = pg_strdup(optarg);
 				break;
+			case 8:				/* foreign-keys */
+				initialization_option_set = true;
+				foreign_keys = true;
+				break;
 			default:
 				fprintf(stderr, _("Try \"%s --help\" for more information.\n"), progname);
 				exit(1);
@@ -4061,7 +4824,31 @@ main(int argc, char **argv)
 			exit(1);
 		}
 
-		init(is_no_vacuum);
+		if (initialize_steps == NULL)
+			initialize_steps = pg_strdup(DEFAULT_INIT_STEPS);
+
+		if (is_no_vacuum)
+		{
+			/* Remove any vacuum step in initialize_steps */
+			char	   *p;
+
+			while ((p = strchr(initialize_steps, 'v')) != NULL)
+				*p = ' ';
+		}
+
+		if (foreign_keys)
+		{
+			/* Add 'f' to end of initialize_steps, if not already there */
+			if (strchr(initialize_steps, 'f') == NULL)
+			{
+				initialize_steps = (char *)
+					pg_realloc(initialize_steps,
+							   strlen(initialize_steps) + 2);
+				strcat(initialize_steps, "f");
+			}
+		}
+
+		runInitSteps(initialize_steps);
 		exit(0);
 	}
 	else
@@ -4073,6 +4860,12 @@ main(int argc, char **argv)
 		}
 	}
 
+	if (nxacts > 0 && duration > 0)
+	{
+		fprintf(stderr, "specify either a number of transactions (-t) or a duration (-T), not both\n");
+		exit(1);
+	}
+
 	/* Use DEFAULT_NXACTS if neither nxacts nor duration is specified. */
 	if (nxacts <= 0 && duration <= 0)
 		nxacts = DEFAULT_NXACTS;
@@ -4115,6 +4908,12 @@ main(int argc, char **argv)
 		exit(1);
 	}
 
+	if (progress_timestamp && progress == 0)
+	{
+		fprintf(stderr, "--progress-timestamp is allowed only under --progress\n");
+		exit(1);
+	}
+
 	/*
 	 * save main process id in the global variable because process id will be
 	 * changed after fork.
@@ -4136,16 +4935,16 @@ main(int argc, char **argv)
 			{
 				Variable   *var = &state[0].variables[j];
 
-				if (var->is_numeric)
+				if (var->value.type != PGBT_NO_VALUE)
 				{
-					if (!putVariableNumber(&state[i], "startup",
-										   var->name, &var->num_value))
+					if (!putVariableValue(&state[i], "startup",
+										   var->name, &var->value))
 						exit(1);
 				}
 				else
 				{
 					if (!putVariable(&state[i], "startup",
-									 var->name, var->value))
+									 var->name, var->svalue))
 						exit(1);
 				}
 			}
@@ -4273,6 +5072,9 @@ main(int argc, char **argv)
 		thread->random_state[2] = random();
 		thread->logfile = NULL; /* filled in later */
 		thread->latency_late = 0;
+		thread->zipf_cache.nb_cells = 0;
+		thread->zipf_cache.current = 0;
+		thread->zipf_cache.overflowCount = 0;
 		initStats(&thread->stats, 0);
 
 		nclients_dealt += thread->nstate;
@@ -4543,20 +5345,30 @@ threadRun(void *arg)
 		 * or it's time to print a progress report.  Update input_mask to show
 		 * which client(s) received data.
 		 */
-		if (min_usec > 0 && maxsock != -1)
+		if (min_usec > 0)
 		{
-			int			nsocks; /* return from select(2) */
+			int			nsocks = 0; /* return from select(2) if called */
 
 			if (min_usec != PG_INT64_MAX)
 			{
-				struct timeval timeout;
+				if (maxsock != -1)
+				{
+					struct timeval timeout;
 
-				timeout.tv_sec = min_usec / 1000000;
-				timeout.tv_usec = min_usec % 1000000;
-				nsocks = select(maxsock + 1, &input_mask, NULL, NULL, &timeout);
+					timeout.tv_sec = min_usec / 1000000;
+					timeout.tv_usec = min_usec % 1000000;
+					nsocks = select(maxsock + 1, &input_mask, NULL, NULL, &timeout);
+				}
+				else			/* nothing active, simple sleep */
+				{
+					pg_usleep(min_usec);
+				}
 			}
-			else
+			else				/* no explicit delay, select without timeout */
+			{
 				nsocks = select(maxsock + 1, &input_mask, NULL, NULL, NULL);
+			}
+
 			if (nsocks < 0)
 			{
 				if (errno == EINTR)
@@ -4571,6 +5383,8 @@ threadRun(void *arg)
 		}
 		else
 		{
+			/* min_usec == 0, i.e. something needs to be executed */
+
 			/* If we didn't call select(), don't try to read any data */
 			FD_ZERO(&input_mask);
 		}
@@ -4621,7 +5435,8 @@ threadRun(void *arg)
 			{
 				/* generate and show report */
 				StatsData	cur;
-				int64		run = now - last_report;
+				int64		run = now - last_report,
+							ntx;
 				double		tps,
 							total_run,
 							latency,
@@ -4636,7 +5451,7 @@ threadRun(void *arg)
 				 * XXX: No locking. There is no guarantee that we get an
 				 * atomic snapshot of the transaction count and latencies, so
 				 * these figures can well be off by a small amount. The
-				 * progress is report's purpose is to give a quick overview of
+				 * progress report's purpose is to give a quick overview of
 				 * how the test is going, so that shouldn't matter too much.
 				 * (If a read from a 64-bit integer is not atomic, you might
 				 * get a "torn" read and completely bogus latencies though!)
@@ -4650,15 +5465,21 @@ threadRun(void *arg)
 					cur.skipped += thread[i].stats.skipped;
 				}
 
+				/* we count only actually executed transactions */
+				ntx = (cur.cnt - cur.skipped) - (last.cnt - last.skipped);
 				total_run = (now - thread_start) / 1000000.0;
-				tps = 1000000.0 * (cur.cnt - last.cnt) / run;
-				latency = 0.001 * (cur.latency.sum - last.latency.sum) /
-					(cur.cnt - last.cnt);
-				sqlat = 1.0 * (cur.latency.sum2 - last.latency.sum2)
-					/ (cur.cnt - last.cnt);
-				stdev = 0.001 * sqrt(sqlat - 1000000.0 * latency * latency);
-				lag = 0.001 * (cur.lag.sum - last.lag.sum) /
-					(cur.cnt - last.cnt);
+				tps = 1000000.0 * ntx / run;
+				if (ntx > 0)
+				{
+					latency = 0.001 * (cur.latency.sum - last.latency.sum) / ntx;
+					sqlat = 1.0 * (cur.latency.sum2 - last.latency.sum2) / ntx;
+					stdev = 0.001 * sqrt(sqlat - 1000000.0 * latency * latency);
+					lag = 0.001 * (cur.lag.sum - last.lag.sum) / ntx;
+				}
+				else
+				{
+					latency = sqlat = stdev = lag = 0;
+				}
 
 				if (progress_timestamp)
 				{
@@ -4675,7 +5496,10 @@ threadRun(void *arg)
 							 (long) tv.tv_sec, (long) (tv.tv_usec / 1000));
 				}
 				else
+				{
+					/* round seconds are expected, but the thread may be late */
 					snprintf(tbuf, sizeof(tbuf), "%.1f s", total_run);
+				}
 
 				fprintf(stderr,
 						"progress: %s, %.1f tps, lat %.3f ms stddev %.3f",
diff --git a/src/bin/pgbench/pgbench.h b/src/bin/pgbench/pgbench.h
index abc13e9463..0705ccdf0d 100644
--- a/src/bin/pgbench/pgbench.h
+++ b/src/bin/pgbench/pgbench.h
@@ -2,7 +2,7 @@
  *
  * pgbench.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -33,8 +33,11 @@ union YYSTYPE;
  */
 typedef enum
 {
+	PGBT_NO_VALUE,
+	PGBT_NULL,
 	PGBT_INT,
-	PGBT_DOUBLE
+	PGBT_DOUBLE,
+	PGBT_BOOLEAN
 	/* add other types here */
 } PgBenchValueType;
 
@@ -45,6 +48,7 @@ typedef struct
 	{
 		int64		ival;
 		double		dval;
+		bool		bval;
 		/* add other types here */
 	}			u;
 } PgBenchValue;
@@ -73,9 +77,27 @@ typedef enum PgBenchFunction
 	PGBENCH_DOUBLE,
 	PGBENCH_PI,
 	PGBENCH_SQRT,
+	PGBENCH_LN,
+	PGBENCH_EXP,
 	PGBENCH_RANDOM,
 	PGBENCH_RANDOM_GAUSSIAN,
-	PGBENCH_RANDOM_EXPONENTIAL
+	PGBENCH_RANDOM_EXPONENTIAL,
+	PGBENCH_RANDOM_ZIPFIAN,
+	PGBENCH_POW,
+	PGBENCH_AND,
+	PGBENCH_OR,
+	PGBENCH_NOT,
+	PGBENCH_BITAND,
+	PGBENCH_BITOR,
+	PGBENCH_BITXOR,
+	PGBENCH_LSHIFT,
+	PGBENCH_RSHIFT,
+	PGBENCH_EQ,
+	PGBENCH_NE,
+	PGBENCH_LE,
+	PGBENCH_LT,
+	PGBENCH_IS,
+	PGBENCH_CASE
 } PgBenchFunction;
 
 typedef struct PgBenchExpr PgBenchExpr;
@@ -128,7 +150,8 @@ extern yyscan_t expr_scanner_init(PsqlScanState state,
 extern void expr_scanner_finish(yyscan_t yyscanner);
 extern int	expr_scanner_offset(PsqlScanState state);
 extern char *expr_scanner_get_substring(PsqlScanState state,
-						   int start_offset, int end_offset);
+						   int start_offset, int end_offset,
+						   bool chomp);
 extern int	expr_scanner_get_lineno(PsqlScanState state, int offset);
 
 extern void syntax_error(const char *source, int lineno, const char *line,
diff --git a/src/bin/pgbench/t/001_pgbench.pl b/src/bin/pgbench/t/001_pgbench.pl
deleted file mode 100644
index 34d686ea86..0000000000
--- a/src/bin/pgbench/t/001_pgbench.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-use strict;
-use warnings;
-
-use PostgresNode;
-use TestLib;
-use Test::More tests => 3;
-
-# Test concurrent insertion into table with UNIQUE oid column.  DDL expects
-# GetNewOidWithIndex() to successfully avoid violating uniqueness for indexes
-# like pg_class_oid_index and pg_proc_oid_index.  This indirectly exercises
-# LWLock and spinlock concurrency.  This test makes a 5-MiB table.
-my $node = get_new_node('main');
-$node->init;
-$node->start;
-$node->safe_psql('postgres',
-	    'CREATE UNLOGGED TABLE oid_tbl () WITH OIDS; '
-	  . 'ALTER TABLE oid_tbl ADD UNIQUE (oid);');
-my $script = $node->basedir . '/pgbench_script';
-append_to_file($script,
-	'INSERT INTO oid_tbl SELECT FROM generate_series(1,1000);');
-$node->command_like(
-	[   qw(pgbench --no-vacuum --client=5 --protocol=prepared
-		  --transactions=25 --file), $script ],
-	qr{processed: 125/125},
-	'concurrent OID generation');
diff --git a/src/bin/pgbench/t/001_pgbench_with_server.pl b/src/bin/pgbench/t/001_pgbench_with_server.pl
new file mode 100644
index 0000000000..e585220dc0
--- /dev/null
+++ b/src/bin/pgbench/t/001_pgbench_with_server.pl
@@ -0,0 +1,630 @@
+use strict;
+use warnings;
+
+use PostgresNode;
+use TestLib;
+use Test::More;
+
+# start a pgbench specific server
+my $node = get_new_node('main');
+$node->init;
+$node->start;
+
+# invoke pgbench
+sub pgbench
+{
+	my ($opts, $stat, $out, $err, $name, $files) = @_;
+	my @cmd = ('pgbench', split /\s+/, $opts);
+	my @filenames = ();
+	if (defined $files)
+	{
+
+		# note: files are ordered for determinism
+		for my $fn (sort keys %$files)
+		{
+			my $filename = $node->basedir . '/' . $fn;
+			push @cmd, '-f', $filename;
+
+			# cleanup file weight
+			$filename =~ s/\@\d+$//;
+
+			#push @filenames, $filename;
+			append_to_file($filename, $$files{$fn});
+		}
+	}
+	$node->command_checks_all(\@cmd, $stat, $out, $err, $name);
+
+	# cleanup?
+	#unlink @filenames or die "cannot unlink files (@filenames): $!";
+}
+
+# Test concurrent insertion into table with UNIQUE oid column.  DDL expects
+# GetNewOidWithIndex() to successfully avoid violating uniqueness for indexes
+# like pg_class_oid_index and pg_proc_oid_index.  This indirectly exercises
+# LWLock and spinlock concurrency.  This test makes a 5-MiB table.
+
+$node->safe_psql('postgres',
+	    'CREATE UNLOGGED TABLE oid_tbl () WITH OIDS; '
+	  . 'ALTER TABLE oid_tbl ADD UNIQUE (oid);');
+
+pgbench(
+	'--no-vacuum --client=5 --protocol=prepared --transactions=25',
+	0,
+	[qr{processed: 125/125}],
+	[qr{^$}],
+	'concurrency OID generation',
+	{   '001_pgbench_concurrent_oid_generation' =>
+		  'INSERT INTO oid_tbl SELECT FROM generate_series(1,1000);' });
+
+# cleanup
+$node->safe_psql('postgres', 'DROP TABLE oid_tbl;');
+
+# Trigger various connection errors
+pgbench(
+	'no-such-database',
+	1,
+	[qr{^$}],
+	[   qr{connection to database "no-such-database" failed},
+		qr{FATAL:  database "no-such-database" does not exist} ],
+	'no such database');
+
+pgbench(
+	'-S -t 1', 1, [qr{^$}],
+	[qr{Perhaps you need to do initialization}],
+	'run without init');
+
+# Initialize pgbench tables scale 1
+pgbench(
+	'-i', 0, [qr{^$}],
+	[ qr{creating tables}, qr{vacuuming}, qr{creating primary keys}, qr{done\.} ],
+	'pgbench scale 1 initialization',);
+
+# Again, with all possible options
+pgbench(
+'--initialize --init-steps=dtpvg --scale=1 --unlogged-tables --fillfactor=98 --foreign-keys --quiet --tablespace=pg_default --index-tablespace=pg_default',
+	0,
+	[qr{^$}i],
+	[   qr{dropping old tables},
+		qr{creating tables},
+		qr{vacuuming},
+		qr{creating primary keys},
+		qr{creating foreign keys},
+		qr{done\.} ],
+	'pgbench scale 1 initialization');
+
+# Test interaction of --init-steps with legacy step-selection options
+pgbench(
+	'--initialize --init-steps=dtpvgvv --no-vacuum --foreign-keys --unlogged-tables',
+	0, [qr{^$}],
+	[   qr{dropping old tables},
+		qr{creating tables},
+		qr{creating primary keys},
+		qr{.* of .* tuples \(.*\) done},
+		qr{creating foreign keys},
+		qr{done\.} ],
+	'pgbench --init-steps');
+
+# Run all builtin scripts, for a few transactions each
+pgbench(
+	'--transactions=5 -Dfoo=bla --client=2 --protocol=simple --builtin=t'
+	  . ' --connect -n -v -n',
+	0,
+	[   qr{builtin: TPC-B},
+		qr{clients: 2\b},
+		qr{processed: 10/10},
+		qr{mode: simple} ],
+	[qr{^$}],
+	'pgbench tpcb-like');
+
+pgbench(
+'--transactions=20 --client=5 -M extended --builtin=si -C --no-vacuum -s 1',
+	0,
+	[   qr{builtin: simple update},
+		qr{clients: 5\b},
+		qr{threads: 1\b},
+		qr{processed: 100/100},
+		qr{mode: extended} ],
+	[qr{scale option ignored}],
+	'pgbench simple update');
+
+pgbench(
+	'-t 100 -c 7 -M prepared -b se --debug',
+	0,
+	[   qr{builtin: select only},
+		qr{clients: 7\b},
+		qr{threads: 1\b},
+		qr{processed: 700/700},
+		qr{mode: prepared} ],
+	[   qr{vacuum},    qr{client 0}, qr{client 1}, qr{sending},
+		qr{receiving}, qr{executing} ],
+	'pgbench select only');
+
+# check if threads are supported
+my $nthreads = 2;
+
+{
+	my ($stderr);
+	run_log([ 'pgbench', '-j', '2', '--bad-option' ], '2>', \$stderr);
+	$nthreads = 1 if $stderr =~ m/threads are not supported on this platform/;
+}
+
+# run custom scripts
+pgbench(
+	"-t 100 -c 1 -j $nthreads -M prepared -n",
+	0,
+	[   qr{type: multiple scripts},
+		qr{mode: prepared},
+		qr{script 1: .*/001_pgbench_custom_script_1},
+		qr{weight: 2},
+		qr{script 2: .*/001_pgbench_custom_script_2},
+		qr{weight: 1},
+		qr{processed: 100/100} ],
+	[qr{^$}],
+	'pgbench custom scripts',
+	{   '001_pgbench_custom_script_1@1' => q{-- select only
+\set aid random(1, :scale * 100000)
+SELECT abalance::INTEGER AS balance
+  FROM pgbench_accounts
+  WHERE aid=:aid;
+},
+		'001_pgbench_custom_script_2@2' => q{-- special variables
+BEGIN;
+\set foo 1
+-- cast are needed for typing under -M prepared
+SELECT :foo::INT + :scale::INT * :client_id::INT AS bla;
+COMMIT;
+} });
+
+pgbench(
+	'-n -t 10 -c 1 -M simple',
+	0,
+	[   qr{type: .*/001_pgbench_custom_script_3},
+		qr{processed: 10/10},
+		qr{mode: simple} ],
+	[qr{^$}],
+	'pgbench custom script',
+	{   '001_pgbench_custom_script_3' => q{-- select only variant
+\set aid random(1, :scale * 100000)
+BEGIN;
+SELECT abalance::INTEGER AS balance
+  FROM pgbench_accounts
+  WHERE aid=:aid;
+COMMIT;
+} });
+
+pgbench(
+	'-n -t 10 -c 2 -M extended',
+	0,
+	[   qr{type: .*/001_pgbench_custom_script_4},
+		qr{processed: 20/20},
+		qr{mode: extended} ],
+	[qr{^$}],
+	'pgbench custom script',
+	{   '001_pgbench_custom_script_4' => q{-- select only variant
+\set aid random(1, :scale * 100000)
+BEGIN;
+SELECT abalance::INTEGER AS balance
+  FROM pgbench_accounts
+  WHERE aid=:aid;
+COMMIT;
+} });
+
+# test expressions
+pgbench(
+	'-t 1 -Dfoo=-10.1 -Dbla=false -Di=+3 -Dminint=-9223372036854775808 -Dn=null -Dt=t -Df=of -Dd=1.0',
+	0,
+	[ qr{type: .*/001_pgbench_expressions}, qr{processed: 1/1} ],
+	[   qr{command=1.: int 1\d\b},
+	    qr{command=2.: int 1\d\d\b},
+	    qr{command=3.: int 1\d\d\d\b},
+	    qr{command=4.: int 4\b},
+		qr{command=5.: int 5\b},
+		qr{command=6.: int 6\b},
+		qr{command=7.: int 7\b},
+		qr{command=8.: int 8\b},
+		qr{command=9.: int 9\b},
+		qr{command=10.: int 10\b},
+		qr{command=11.: int 11\b},
+		qr{command=12.: int 12\b},
+		qr{command=15.: double 15\b},
+		qr{command=16.: double 16\b},
+		qr{command=17.: double 17\b},
+		qr{command=18.: int 9223372036854775807\b},
+		qr{command=20.: int [1-9]\b},
+		qr{command=21.: double -27\b},
+		qr{command=22.: double 1024\b},
+		qr{command=23.: double 1\b},
+		qr{command=24.: double 1\b},
+		qr{command=25.: double -0.125\b},
+		qr{command=26.: double -0.125\b},
+		qr{command=27.: double -0.00032\b},
+		qr{command=28.: double 8.50705917302346e\+0?37\b},
+		qr{command=29.: double 1e\+0?30\b},
+		qr{command=30.: boolean false\b},
+		qr{command=31.: boolean true\b},
+		qr{command=32.: int 32\b},
+		qr{command=33.: int 33\b},
+		qr{command=34.: double 34\b},
+		qr{command=35.: int 35\b},
+		qr{command=36.: int 36\b},
+		qr{command=37.: double 37\b},
+		qr{command=38.: int 38\b},
+		qr{command=39.: int 39\b},
+		qr{command=40.: boolean true\b},
+		qr{command=41.: null\b},
+		qr{command=42.: null\b},
+		qr{command=43.: boolean true\b},
+		qr{command=44.: boolean true\b},
+		qr{command=45.: boolean true\b},
+		qr{command=46.: int 46\b},
+		qr{command=47.: boolean true\b},
+		qr{command=48.: boolean true\b},
+	],
+	'pgbench expressions',
+	{   '001_pgbench_expressions' => q{-- integer functions
+\set i1 debug(random(10, 19))
+\set i2 debug(random_exponential(100, 199, 10.0))
+\set i3 debug(random_gaussian(1000, 1999, 10.0))
+\set i4 debug(abs(-4))
+\set i5 debug(greatest(5, 4, 3, 2))
+\set i6 debug(11 + least(-5, -4, -3, -2))
+\set i7 debug(int(7.3))
+-- integer arithmetic and bit-wise operators
+\set i8 debug(17 / (4|1) + ( 4 + (7 >> 2)))
+\set i9 debug(- (3 * 4 - (-(~ 1) + -(~ 0))) / -1 + 3 % -1)
+\set ia debug(10 + (0 + 0 * 0 - 0 / 1))
+\set ib debug(:ia + :scale)
+\set ic debug(64 % (((2 + 1 * 2 + (1 # 2) | 4 * (2 & 11)) - (1 << 2)) + 2))
+-- double functions and operators
+\set d1 debug(sqrt(+1.5 * 2.0) * abs(-0.8E1))
+\set d2 debug(double(1 + 1) * (-75.0 / :foo))
+\set pi debug(pi() * 4.9)
+\set d4 debug(greatest(4, 2, -1.17) * 4.0 * Ln(Exp(1.0)))
+\set d5 debug(least(-5.18, .0E0, 1.0/0) * -3.3)
+-- forced overflow
+\set maxint debug(:minint - 1)
+-- reset a variable
+\set i1 0
+-- yet another integer function
+\set id debug(random_zipfian(1, 9, 1.3))
+--- pow and power
+\set poweri debug(pow(-3,3))
+\set powerd debug(pow(2.0,10))
+\set poweriz debug(pow(0,0))
+\set powerdz debug(pow(0.0,0.0))
+\set powernegi debug(pow(-2,-3))
+\set powernegd debug(pow(-2.0,-3.0))
+\set powernegd2 debug(power(-5.0,-5.0))
+\set powerov debug(pow(9223372036854775807, 2))
+\set powerov2 debug(pow(10,30))
+-- comparisons and logical operations
+\set c0 debug(1.0 = 0.0 and 1.0 != 0.0)
+\set c1 debug(0 = 1 Or 1.0 = 1)
+\set c4 debug(case when 0 < 1 then 32 else 0 end)
+\set c5 debug(case when true then 33 else 0 end)
+\set c6 debug(case when false THEN -1 when 1 = 1 then 13 + 19 + 2.0 end )
+\set c7 debug(case when (1 > 0) and (1 >= 0) and (0 < 1) and (0 <= 1) and (0 != 1) and (0 = 0) and (0 <> 1) then 35 else 0 end)
+\set c8 debug(CASE \
+                WHEN (1.0 > 0.0) AND (1.0 >= 0.0) AND (0.0 < 1.0) AND (0.0 <= 1.0) AND \
+                     (0.0 != 1.0) AND (0.0 = 0.0) AND (0.0 <> 1.0) AND (0.0 = 0.0) \
+                  THEN 36 \
+                  ELSE 0 \
+              END)
+\set c9 debug(CASE WHEN NOT FALSE THEN 3 * 12.3333334 END)
+\set ca debug(case when false then 0 when 1-1 <> 0 then 1 else 38 end)
+\set cb debug(10 + mod(13 * 7 + 12, 13) - mod(-19 * 11 - 17, 19))
+\set cc debug(NOT (0 > 1) AND (1 <= 1) AND NOT (0 >= 1) AND (0 < 1) AND \
+    NOT (false and true) AND (false OR TRUE) AND (NOT :f) AND (NOT FALSE) AND \
+    NOT (NOT TRUE))
+-- NULL value and associated operators
+\set n0 debug(NULL + NULL * exp(NULL))
+\set n1 debug(:n0)
+\set n2 debug(NOT (:n0 IS NOT NULL OR :d1 IS NULL))
+\set n3 debug(:n0 IS NULL AND :d1 IS NOT NULL AND :d1 NOTNULL)
+\set n4 debug(:n0 ISNULL AND NOT :n0 IS TRUE AND :n0 IS NOT FALSE)
+\set n5 debug(CASE WHEN :n IS NULL THEN 46 ELSE NULL END)
+-- use a variables of all types
+\set n6 debug(:n IS NULL AND NOT :f AND :t)
+-- conditional truth
+\set cs debug(CASE WHEN 1 THEN TRUE END AND CASE WHEN 1.0 THEN TRUE END AND CASE WHEN :n THEN NULL ELSE TRUE END)
+-- lazy evaluation
+\set zy 0
+\set yz debug(case when :zy = 0 then -1 else (1 / :zy) end)
+\set yz debug(case when :zy = 0 or (1 / :zy) < 0 then -1 else (1 / :zy) end)
+\set yz debug(case when :zy > 0 and (1 / :zy) < 0 then (1 / :zy) else 1 end)
+-- substitute variables of all possible types
+\set v0 NULL
+\set v1 TRUE
+\set v2 5432
+\set v3 -54.21E-2
+SELECT :v0, :v1, :v2, :v3;
+} });
+
+# backslash commands
+pgbench(
+	'-t 1', 0,
+	[   qr{type: .*/001_pgbench_backslash_commands},
+		qr{processed: 1/1},
+		qr{shell-echo-output} ],
+	[qr{command=8.: int 2\b}],
+	'pgbench backslash commands',
+	{   '001_pgbench_backslash_commands' => q{-- run set
+\set zero 0
+\set one 1.0
+-- sleep
+\sleep :one ms
+\sleep 100 us
+\sleep 0 s
+\sleep :zero
+-- setshell and continuation
+\setshell two\
+  expr \
+    1 + :one
+\set n debug(:two)
+-- shell
+\shell echo shell-echo-output
+} });
+
+# trigger many expression errors
+my @errors = (
+
+	# [ test name, script number, status, stderr match ]
+	# SQL
+	[   'sql syntax error',
+		0,
+		[   qr{ERROR:  syntax error}, qr{prepared statement .* does not exist}
+		],
+		q{-- SQL syntax error
+    SELECT 1 + ;
+} ],
+	[   'sql too many args', 1, [qr{statement has too many arguments.*\b9\b}],
+		q{-- MAX_ARGS=10 for prepared
+\set i 0
+SELECT LEAST(:i, :i, :i, :i, :i, :i, :i, :i, :i, :i, :i);
+} ],
+
+	# SHELL
+	[   'shell bad command',               0,
+		[qr{meta-command 'shell' failed}], q{\shell no-such-command} ],
+	[   'shell undefined variable', 0,
+		[qr{undefined variable ":nosuchvariable"}],
+		q{-- undefined variable in shell
+\shell echo ::foo :nosuchvariable
+} ],
+	[ 'shell missing command', 1, [qr{missing command }], q{\shell} ],
+	[   'shell too many args', 1, [qr{too many arguments in command "shell"}],
+		q{-- 257 arguments to \shell
+\shell echo \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F \
+ 0 1 2 3 4 5 6 7 8 9 A B C D E F
+} ],
+
+	# SET
+	[   'set syntax error',                  1,
+		[qr{syntax error in command "set"}], q{\set i 1 +} ],
+	[   'set no such function',         1,
+		[qr{unexpected function name}], q{\set i noSuchFunction()} ],
+	[   'set invalid variable name', 0,
+		[qr{invalid variable name}], q{\set . 1} ],
+	[   'set int overflow',                   0,
+		[qr{double to int overflow for 100}], q{\set i int(1E32)} ],
+	[ 'set division by zero', 0, [qr{division by zero}], q{\set i 1/0} ],
+	[   'set bigint out of range', 0,
+		[qr{bigint out of range}], q{\set i 9223372036854775808 / -1} ],
+	[   'set undefined variable',
+		0,
+		[qr{undefined variable "nosuchvariable"}],
+		q{\set i :nosuchvariable} ],
+	[ 'set unexpected char', 1, [qr{unexpected character .;.}], q{\set i ;} ],
+	[   'set too many args',
+		0,
+		[qr{too many function arguments}],
+		q{\set i least(0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16)} ],
+	[   'set empty random range',          0,
+		[qr{empty range given to random}], q{\set i random(5,3)} ],
+	[   'set random range too large',
+		0,
+		[qr{random range is too large}],
+		q{\set i random(-9223372036854775808, 9223372036854775807)} ],
+	[   'set gaussian param too small',
+		0,
+		[qr{gaussian param.* at least 2}],
+		q{\set i random_gaussian(0, 10, 1.0)} ],
+	[   'set exponential param greater 0',
+		0,
+		[qr{exponential parameter must be greater }],
+		q{\set i random_exponential(0, 10, 0.0)} ],
+	[	'set zipfian param to 1',
+		0,
+		[qr{zipfian parameter must be in range \(0, 1\) U \(1, \d+\]}],
+		q{\set i random_zipfian(0, 10, 1)} ],
+	[	'set zipfian param too large',
+		0,
+		[qr{zipfian parameter must be in range \(0, 1\) U \(1, \d+\]}],
+		q{\set i random_zipfian(0, 10, 1000000)} ],
+	[   'set non numeric value',                     0,
+		[qr{malformed variable "foo" value: "bla"}], q{\set i :foo + 1} ],
+	[ 'set no expression',
+		1,
+		[qr{syntax error}],
+		q{\set i} ],
+	[ 'set missing argument',
+		1,
+		[qr{missing argument}i],
+		q{\set} ],
+	[ 'set not a bool',
+		0,
+		[ qr{cannot coerce double to boolean} ],
+		q{\set b NOT 0.0} ],
+	[ 'set not an int',
+		0,
+		[ qr{cannot coerce boolean to int} ],
+		q{\set i TRUE + 2} ],
+	[ 'set not an double',
+		0,
+		[ qr{cannot coerce boolean to double} ],
+		q{\set d ln(TRUE)} ],
+	[ 'set case error',
+		1,
+		[ qr{syntax error in command "set"} ],
+		q{\set i CASE TRUE THEN 1 ELSE 0 END} ],
+	[ 'set random error',
+		0,
+		[ qr{cannot coerce boolean to int} ],
+		q{\set b random(FALSE, TRUE)} ],
+	[ 'set number of args mismatch',
+		1,
+		[ qr{unexpected number of arguments} ],
+		q{\set d ln(1.0, 2.0))} ],
+	[ 'set at least one arg',
+		1,
+		[ qr{at least one argument expected} ],
+		q{\set i greatest())} ],
+
+	# SETSHELL
+	[   'setshell not an int',                0,
+		[qr{command must return an integer}], q{\setshell i echo -n one} ],
+	[ 'setshell missing arg', 1, [qr{missing argument }], q{\setshell var} ],
+	[   'setshell no such command',   0,
+		[qr{could not read result }], q{\setshell var no-such-command} ],
+
+	# SLEEP
+	[   'sleep undefined variable',      0,
+		[qr{sleep: undefined variable}], q{\sleep :nosuchvariable} ],
+	[   'sleep too many args',    1,
+		[qr{too many arguments}], q{\sleep too many args} ],
+	[   'sleep missing arg', 1,
+		[ qr{missing argument}, qr{\\sleep} ], q{\sleep} ],
+	[   'sleep unknown unit',         1,
+		[qr{unrecognized time unit}], q{\sleep 1 week} ],
+
+	# MISC
+	[   'misc invalid backslash command',         1,
+		[qr{invalid command .* "nosuchcommand"}], q{\nosuchcommand} ],
+	[ 'misc empty script', 1, [qr{empty command list for script}], q{} ],
+	[ 'bad boolean', 0, [qr{malformed variable.*trueXXX}], q{\set b :badtrue or true} ],
+    );
+
+
+for my $e (@errors)
+{
+	my ($name, $status, $re, $script) = @$e;
+	my $n = '001_pgbench_error_' . $name;
+	$n =~ s/ /_/g;
+	pgbench(
+		'-n -t 1 -Dfoo=bla -Dnull=null -Dtrue=true -Done=1 -Dzero=0.0 -Dbadtrue=trueXXX -M prepared',
+		$status,
+		[ $status ? qr{^$} : qr{processed: 0/1} ],
+		$re,
+		'pgbench script error: ' . $name,
+		{ $n => $script });
+}
+
+# zipfian cache array overflow
+pgbench(
+	'-t 1', 0,
+	[ qr{processed: 1/1}, qr{zipfian cache array overflowed 1 time\(s\)} ],
+	[ qr{^} ],
+	'pgbench zipfian array overflow on random_zipfian',
+	{   '001_pgbench_random_zipfian' => q{
+\set i random_zipfian(1, 100, 0.5)
+\set i random_zipfian(2, 100, 0.5)
+\set i random_zipfian(3, 100, 0.5)
+\set i random_zipfian(4, 100, 0.5)
+\set i random_zipfian(5, 100, 0.5)
+\set i random_zipfian(6, 100, 0.5)
+\set i random_zipfian(7, 100, 0.5)
+\set i random_zipfian(8, 100, 0.5)
+\set i random_zipfian(9, 100, 0.5)
+\set i random_zipfian(10, 100, 0.5)
+\set i random_zipfian(11, 100, 0.5)
+\set i random_zipfian(12, 100, 0.5)
+\set i random_zipfian(13, 100, 0.5)
+\set i random_zipfian(14, 100, 0.5)
+\set i random_zipfian(15, 100, 0.5)
+\set i random_zipfian(16, 100, 0.5)
+} });
+
+# throttling
+pgbench(
+	'-t 100 -S --rate=100000 --latency-limit=1000000 -c 2 -n -r',
+	0,
+	[ qr{processed: 200/200}, qr{builtin: select only} ],
+	[qr{^$}],
+	'pgbench throttling');
+
+pgbench(
+
+   # given the expected rate and the 2 ms tx duration, at most one is executed
+	'-t 10 --rate=100000 --latency-limit=1 -n -r',
+	0,
+	[   qr{processed: [01]/10},
+		qr{type: .*/001_pgbench_sleep},
+		qr{above the 1.0 ms latency limit: [01]/} ],
+	[qr{^$}i],
+	'pgbench late throttling',
+	{ '001_pgbench_sleep' => q{\sleep 2ms} });
+
+# check log contents and cleanup
+sub check_pgbench_logs
+{
+	my ($prefix, $nb, $min, $max, $re) = @_;
+
+	my @logs = glob "$prefix.*";
+	ok(@logs == $nb, "number of log files");
+	ok(grep(/^$prefix\.\d+(\.\d+)?$/, @logs) == $nb, "file name format");
+
+	my $log_number = 0;
+	for my $log (sort @logs)
+	{
+		eval {
+			open my $fh, '<', $log or die "$@";
+			my @contents = <$fh>;
+			my $clen     = @contents;
+			ok( $min <= $clen && $clen <= $max,
+				"transaction count for $log ($clen)");
+			ok( grep($re, @contents) == $clen,
+				"transaction format for $prefix");
+			close $fh or die "$@";
+		};
+	}
+	ok(unlink(@logs), "remove log files");
+}
+
+# with sampling rate
+pgbench(
+'-n -S -t 50 -c 2 --log --log-prefix=001_pgbench_log_2 --sampling-rate=0.5',
+	0,
+	[ qr{select only}, qr{processed: 100/100} ],
+	[qr{^$}],
+	'pgbench logs');
+
+check_pgbench_logs('001_pgbench_log_2', 1, 8, 92,
+	qr{^0 \d{1,2} \d+ \d \d+ \d+$});
+
+# check log file in some detail
+pgbench(
+	'-n -b se -t 10 -l --log-prefix=001_pgbench_log_3',
+	0, [ qr{select only}, qr{processed: 10/10} ],
+	[qr{^$}], 'pgbench logs contents');
+
+check_pgbench_logs('001_pgbench_log_3', 1, 10, 10,
+	qr{^\d \d{1,2} \d+ \d \d+ \d+$});
+
+# done
+$node->stop;
+done_testing();
diff --git a/src/bin/pgbench/t/002_pgbench_no_server.pl b/src/bin/pgbench/t/002_pgbench_no_server.pl
new file mode 100644
index 0000000000..6ea55f8dae
--- /dev/null
+++ b/src/bin/pgbench/t/002_pgbench_no_server.pl
@@ -0,0 +1,128 @@
+#
+# pgbench tests which do not need a server
+#
+
+use strict;
+use warnings;
+
+use TestLib;
+use Test::More;
+
+# invoke pgbench
+sub pgbench
+{
+	my ($opts, $stat, $out, $err, $name) = @_;
+	print STDERR "opts=$opts, stat=$stat, out=$out, err=$err, name=$name";
+	command_checks_all([ 'pgbench', split(/\s+/, $opts) ],
+		$stat, $out, $err, $name);
+}
+
+#
+# Option various errors
+#
+
+my @options = (
+
+	# name, options, stderr checks
+	[   'bad option',
+		'-h home -p 5432 -U calvin -d --bad-option',
+		[ qr{(unrecognized|illegal) option}, qr{--help.*more information} ] ],
+	[   'no file',
+		'-f no-such-file',
+		[qr{could not open file "no-such-file":}] ],
+	[   'no builtin',
+		'-b no-such-builtin',
+		[qr{no builtin script .* "no-such-builtin"}] ],
+	[   'invalid weight',
+		'--builtin=select-only@one',
+		[qr{invalid weight specification: \@one}] ],
+	[   'invalid weight',
+		'-b select-only@-1',
+		[qr{weight spec.* out of range .*: -1}] ],
+	[ 'too many scripts', '-S ' x 129, [qr{at most 128 SQL scripts}] ],
+	[ 'bad #clients', '-c three', [qr{invalid number of clients: "three"}] ],
+	[   'bad #threads', '-j eleven', [qr{invalid number of threads: "eleven"}]
+	],
+	[ 'bad scale', '-i -s two', [qr{invalid scaling factor: "two"}] ],
+	[   'invalid #transactions',
+		'-t zil',
+		[qr{invalid number of transactions: "zil"}] ],
+	[ 'invalid duration', '-T ten', [qr{invalid duration: "ten"}] ],
+	[   '-t XOR -T',
+		'-N -l --aggregate-interval=5 --log-prefix=notused -t 1000 -T 1',
+		[qr{specify either }] ],
+	[   '-T XOR -t',
+		'-P 1 --progress-timestamp -l --sampling-rate=0.001 -T 10 -t 1000',
+		[qr{specify either }] ],
+	[ 'bad variable', '--define foobla', [qr{invalid variable definition}] ],
+	[ 'invalid fillfactor', '-F 1',            [qr{invalid fillfactor}] ],
+	[ 'invalid query mode', '-M no-such-mode', [qr{invalid query mode}] ],
+	[   'invalid progress', '--progress=0',
+		[qr{invalid thread progress delay}] ],
+	[ 'invalid rate',    '--rate=0.0',          [qr{invalid rate limit}] ],
+	[ 'invalid latency', '--latency-limit=0.0', [qr{invalid latency limit}] ],
+	[   'invalid sampling rate', '--sampling-rate=0',
+		[qr{invalid sampling rate}] ],
+	[   'invalid aggregate interval', '--aggregate-interval=-3',
+		[qr{invalid .* seconds for}] ],
+	[   'weight zero',
+		'-b se@0 -b si@0 -b tpcb@0',
+		[qr{weight must not be zero}] ],
+	[ 'init vs run', '-i -S',    [qr{cannot be used in initialization}] ],
+	[ 'run vs init', '-S -F 90', [qr{cannot be used in benchmarking}] ],
+	[ 'ambiguous builtin', '-b s', [qr{ambiguous}] ],
+	[   '--progress-timestamp => --progress', '--progress-timestamp',
+		[qr{allowed only under}] ],
+	[ '-I without init option', '-I dtg',
+		[qr{cannot be used in benchmarking mode}] ],
+	[ 'invalid init step', '-i -I dta',
+		[qr{unrecognized initialization step},
+		 qr{allowed steps are} ] ],
+
+	# loging sub-options
+	[   'sampling => log', '--sampling-rate=0.01',
+		[qr{log sampling .* only when}] ],
+	[   'sampling XOR aggregate',
+		'-l --sampling-rate=0.1 --aggregate-interval=3',
+		[qr{sampling .* aggregation .* cannot be used at the same time}] ],
+	[   'aggregate => log', '--aggregate-interval=3',
+		[qr{aggregation .* only when}] ],
+	[ 'log-prefix => log', '--log-prefix=x', [qr{prefix .* only when}] ],
+	[   'duration & aggregation',
+		'-l -T 1 --aggregate-interval=3',
+		[qr{aggr.* not be higher}] ],
+	[   'duration % aggregation',
+		'-l -T 5 --aggregate-interval=3',
+		[qr{multiple}] ],);
+
+for my $o (@options)
+{
+	my ($name, $opts, $err_checks) = @$o;
+	pgbench($opts, 1, [qr{^$}], $err_checks,
+		'pgbench option error: ' . $name);
+}
+
+# Help
+pgbench(
+	'--help', 0,
+	[   qr{benchmarking tool for PostgreSQL},
+		qr{Usage},
+		qr{Initialization options:},
+		qr{Common options:},
+		qr{Report bugs to} ],
+	[qr{^$}],
+	'pgbench help');
+
+# Version
+pgbench('-V', 0, [qr{^pgbench .PostgreSQL. }], [qr{^$}], 'pgbench version');
+
+# list of builtins
+pgbench(
+	'-b list',
+	0,
+	[qr{^$}],
+	[   qr{Available builtin scripts:}, qr{tpcb-like},
+		qr{simple-update},              qr{select-only} ],
+	'pgbench builtin list');
+
+done_testing();
diff --git a/src/bin/pgevent/Makefile b/src/bin/pgevent/Makefile
index 6e6797ba13..5c79eb8e44 100644
--- a/src/bin/pgevent/Makefile
+++ b/src/bin/pgevent/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/pgevent
 #
-# Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Copyright (c) 1996-2018, PostgreSQL Global Development Group
 #
 #-------------------------------------------------------------------------
 
diff --git a/src/bin/psql/Makefile b/src/bin/psql/Makefile
index cabfe15f97..c8eb2f95cc 100644
--- a/src/bin/psql/Makefile
+++ b/src/bin/psql/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/psql
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/psql/Makefile
diff --git a/src/bin/psql/command.c b/src/bin/psql/command.c
index 96f3a402a4..3560318749 100644
--- a/src/bin/psql/command.c
+++ b/src/bin/psql/command.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/command.c
  */
@@ -71,10 +71,8 @@ static backslashResult exec_command_d(PsqlScanState scan_state, bool active_bran
 			   const char *cmd);
 static backslashResult exec_command_edit(PsqlScanState scan_state, bool active_branch,
 				  PQExpBuffer query_buf, PQExpBuffer previous_buf);
-static backslashResult exec_command_ef(PsqlScanState scan_state, bool active_branch,
-				PQExpBuffer query_buf);
-static backslashResult exec_command_ev(PsqlScanState scan_state, bool active_branch,
-				PQExpBuffer query_buf);
+static backslashResult exec_command_ef_ev(PsqlScanState scan_state, bool active_branch,
+				   PQExpBuffer query_buf, bool is_func);
 static backslashResult exec_command_echo(PsqlScanState scan_state, bool active_branch,
 				  const char *cmd);
 static backslashResult exec_command_elif(PsqlScanState scan_state, ConditionalStack cstack,
@@ -88,6 +86,7 @@ static backslashResult exec_command_errverbose(PsqlScanState scan_state, bool ac
 static backslashResult exec_command_f(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_g(PsqlScanState scan_state, bool active_branch,
 			   const char *cmd);
+static backslashResult exec_command_gdesc(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_gexec(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_gset(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_help(PsqlScanState scan_state, bool active_branch);
@@ -114,10 +113,8 @@ static backslashResult exec_command_s(PsqlScanState scan_state, bool active_bran
 static backslashResult exec_command_set(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_setenv(PsqlScanState scan_state, bool active_branch,
 					const char *cmd);
-static backslashResult exec_command_sf(PsqlScanState scan_state, bool active_branch,
-				const char *cmd);
-static backslashResult exec_command_sv(PsqlScanState scan_state, bool active_branch,
-				const char *cmd);
+static backslashResult exec_command_sf_sv(PsqlScanState scan_state, bool active_branch,
+				   const char *cmd, bool is_func);
 static backslashResult exec_command_t(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_T(PsqlScanState scan_state, bool active_branch);
 static backslashResult exec_command_timing(PsqlScanState scan_state, bool active_branch);
@@ -318,9 +315,9 @@ exec_command(const char *cmd,
 		status = exec_command_edit(scan_state, active_branch,
 								   query_buf, previous_buf);
 	else if (strcmp(cmd, "ef") == 0)
-		status = exec_command_ef(scan_state, active_branch, query_buf);
+		status = exec_command_ef_ev(scan_state, active_branch, query_buf, true);
 	else if (strcmp(cmd, "ev") == 0)
-		status = exec_command_ev(scan_state, active_branch, query_buf);
+		status = exec_command_ef_ev(scan_state, active_branch, query_buf, false);
 	else if (strcmp(cmd, "echo") == 0 || strcmp(cmd, "qecho") == 0)
 		status = exec_command_echo(scan_state, active_branch, cmd);
 	else if (strcmp(cmd, "elif") == 0)
@@ -337,6 +334,8 @@ exec_command(const char *cmd,
 		status = exec_command_f(scan_state, active_branch);
 	else if (strcmp(cmd, "g") == 0 || strcmp(cmd, "gx") == 0)
 		status = exec_command_g(scan_state, active_branch, cmd);
+	else if (strcmp(cmd, "gdesc") == 0)
+		status = exec_command_gdesc(scan_state, active_branch);
 	else if (strcmp(cmd, "gexec") == 0)
 		status = exec_command_gexec(scan_state, active_branch);
 	else if (strcmp(cmd, "gset") == 0)
@@ -377,9 +376,9 @@ exec_command(const char *cmd,
 	else if (strcmp(cmd, "setenv") == 0)
 		status = exec_command_setenv(scan_state, active_branch, cmd);
 	else if (strcmp(cmd, "sf") == 0 || strcmp(cmd, "sf+") == 0)
-		status = exec_command_sf(scan_state, active_branch, cmd);
+		status = exec_command_sf_sv(scan_state, active_branch, cmd, true);
 	else if (strcmp(cmd, "sv") == 0 || strcmp(cmd, "sv+") == 0)
-		status = exec_command_sv(scan_state, active_branch, cmd);
+		status = exec_command_sf_sv(scan_state, active_branch, cmd, false);
 	else if (strcmp(cmd, "t") == 0)
 		status = exec_command_t(scan_state, active_branch);
 	else if (strcmp(cmd, "T") == 0)
@@ -976,28 +975,34 @@ exec_command_edit(PsqlScanState scan_state, bool active_branch,
 }
 
 /*
- * \ef -- edit the named function, or present a blank CREATE FUNCTION
- * template if no argument is given
+ * \ef/\ev -- edit the named function/view, or
+ * present a blank CREATE FUNCTION/VIEW template if no argument is given
  */
 static backslashResult
-exec_command_ef(PsqlScanState scan_state, bool active_branch,
-				PQExpBuffer query_buf)
+exec_command_ef_ev(PsqlScanState scan_state, bool active_branch,
+				   PQExpBuffer query_buf, bool is_func)
 {
 	backslashResult status = PSQL_CMD_SKIP_LINE;
 
 	if (active_branch)
 	{
-		char	   *func = psql_scan_slash_option(scan_state,
-												  OT_WHOLE_LINE, NULL, true);
+		char	   *obj_desc = psql_scan_slash_option(scan_state,
+													  OT_WHOLE_LINE,
+													  NULL, true);
 		int			lineno = -1;
 
-		if (pset.sversion < 80400)
+		if (pset.sversion < (is_func ? 80400 : 70400))
 		{
 			char		sverbuf[32];
 
-			psql_error("The server (version %s) does not support editing function source.\n",
-					   formatPGVersionNumber(pset.sversion, false,
-											 sverbuf, sizeof(sverbuf)));
+			formatPGVersionNumber(pset.sversion, false,
+								  sverbuf, sizeof(sverbuf));
+			if (is_func)
+				psql_error("The server (version %s) does not support editing function source.\n",
+						   sverbuf);
+			else
+				psql_error("The server (version %s) does not support editing view definitions.\n",
+						   sverbuf);
 			status = PSQL_CMD_ERROR;
 		}
 		else if (!query_buf)
@@ -1007,36 +1012,44 @@ exec_command_ef(PsqlScanState scan_state, bool active_branch,
 		}
 		else
 		{
-			Oid			foid = InvalidOid;
+			Oid			obj_oid = InvalidOid;
+			EditableObjectType eot = is_func ? EditableFunction : EditableView;
 
-			lineno = strip_lineno_from_objdesc(func);
+			lineno = strip_lineno_from_objdesc(obj_desc);
 			if (lineno == 0)
 			{
 				/* error already reported */
 				status = PSQL_CMD_ERROR;
 			}
-			else if (!func)
+			else if (!obj_desc)
 			{
 				/* set up an empty command to fill in */
-				printfPQExpBuffer(query_buf,
-								  "CREATE FUNCTION ( )\n"
-								  " RETURNS \n"
-								  " LANGUAGE \n"
-								  " -- common options:  IMMUTABLE  STABLE  STRICT  SECURITY DEFINER\n"
-								  "AS $function$\n"
-								  "\n$function$\n");
+				resetPQExpBuffer(query_buf);
+				if (is_func)
+					appendPQExpBufferStr(query_buf,
+										 "CREATE FUNCTION ( )\n"
+										 " RETURNS \n"
+										 " LANGUAGE \n"
+										 " -- common options:  IMMUTABLE  STABLE  STRICT  SECURITY DEFINER\n"
+										 "AS $function$\n"
+										 "\n$function$\n");
+				else
+					appendPQExpBufferStr(query_buf,
+										 "CREATE VIEW  AS\n"
+										 " SELECT \n"
+										 "  -- something...\n");
 			}
-			else if (!lookup_object_oid(EditableFunction, func, &foid))
+			else if (!lookup_object_oid(eot, obj_desc, &obj_oid))
 			{
 				/* error already reported */
 				status = PSQL_CMD_ERROR;
 			}
-			else if (!get_create_object_cmd(EditableFunction, foid, query_buf))
+			else if (!get_create_object_cmd(eot, obj_oid, query_buf))
 			{
 				/* error already reported */
 				status = PSQL_CMD_ERROR;
 			}
-			else if (lineno > 0)
+			else if (is_func && lineno > 0)
 			{
 				/*
 				 * lineno "1" should correspond to the first line of the
@@ -1075,89 +1088,8 @@ exec_command_ef(PsqlScanState scan_state, bool active_branch,
 				status = PSQL_CMD_NEWEDIT;
 		}
 
-		if (func)
-			free(func);
-	}
-	else
-		ignore_slash_whole_line(scan_state);
-
-	return status;
-}
-
-/*
- * \ev -- edit the named view, or present a blank CREATE VIEW
- * template if no argument is given
- */
-static backslashResult
-exec_command_ev(PsqlScanState scan_state, bool active_branch,
-				PQExpBuffer query_buf)
-{
-	backslashResult status = PSQL_CMD_SKIP_LINE;
-
-	if (active_branch)
-	{
-		char	   *view = psql_scan_slash_option(scan_state,
-												  OT_WHOLE_LINE, NULL, true);
-		int			lineno = -1;
-
-		if (pset.sversion < 70400)
-		{
-			char		sverbuf[32];
-
-			psql_error("The server (version %s) does not support editing view definitions.\n",
-					   formatPGVersionNumber(pset.sversion, false,
-											 sverbuf, sizeof(sverbuf)));
-			status = PSQL_CMD_ERROR;
-		}
-		else if (!query_buf)
-		{
-			psql_error("no query buffer\n");
-			status = PSQL_CMD_ERROR;
-		}
-		else
-		{
-			Oid			view_oid = InvalidOid;
-
-			lineno = strip_lineno_from_objdesc(view);
-			if (lineno == 0)
-			{
-				/* error already reported */
-				status = PSQL_CMD_ERROR;
-			}
-			else if (!view)
-			{
-				/* set up an empty command to fill in */
-				printfPQExpBuffer(query_buf,
-								  "CREATE VIEW  AS\n"
-								  " SELECT \n"
-								  "  -- something...\n");
-			}
-			else if (!lookup_object_oid(EditableView, view, &view_oid))
-			{
-				/* error already reported */
-				status = PSQL_CMD_ERROR;
-			}
-			else if (!get_create_object_cmd(EditableView, view_oid, query_buf))
-			{
-				/* error already reported */
-				status = PSQL_CMD_ERROR;
-			}
-		}
-
-		if (status != PSQL_CMD_ERROR)
-		{
-			bool		edited = false;
-
-			if (!do_edit(NULL, query_buf, lineno, &edited))
-				status = PSQL_CMD_ERROR;
-			else if (!edited)
-				puts(_("No changes"));
-			else
-				status = PSQL_CMD_NEWEDIT;
-		}
-
-		if (view)
-			free(view);
+		if (obj_desc)
+			free(obj_desc);
 	}
 	else
 		ignore_slash_whole_line(scan_state);
@@ -1330,6 +1262,23 @@ exec_command_g(PsqlScanState scan_state, bool active_branch, const char *cmd)
 	return status;
 }
 
+/*
+ * \gdesc -- describe query result
+ */
+static backslashResult
+exec_command_gdesc(PsqlScanState scan_state, bool active_branch)
+{
+	backslashResult status = PSQL_CMD_SKIP_LINE;
+
+	if (active_branch)
+	{
+		pset.gdesc_flag = true;
+		status = PSQL_CMD_SEND;
+	}
+
+	return status;
+}
+
 /*
  * \gexec -- send query and execute each field of result
  */
@@ -2214,43 +2163,53 @@ exec_command_setenv(PsqlScanState scan_state, bool active_branch,
 }
 
 /*
- * \sf -- show a function's source code
+ * \sf/\sv -- show a function/view's source code
  */
 static backslashResult
-exec_command_sf(PsqlScanState scan_state, bool active_branch, const char *cmd)
+exec_command_sf_sv(PsqlScanState scan_state, bool active_branch,
+				   const char *cmd, bool is_func)
 {
 	backslashResult status = PSQL_CMD_SKIP_LINE;
 
 	if (active_branch)
 	{
-		bool		show_linenumbers = (strcmp(cmd, "sf+") == 0);
-		PQExpBuffer func_buf;
-		char	   *func;
-		Oid			foid = InvalidOid;
+		bool		show_linenumbers = (strchr(cmd, '+') != NULL);
+		PQExpBuffer buf;
+		char	   *obj_desc;
+		Oid			obj_oid = InvalidOid;
+		EditableObjectType eot = is_func ? EditableFunction : EditableView;
 
-		func_buf = createPQExpBuffer();
-		func = psql_scan_slash_option(scan_state,
-									  OT_WHOLE_LINE, NULL, true);
-		if (pset.sversion < 80400)
+		buf = createPQExpBuffer();
+		obj_desc = psql_scan_slash_option(scan_state,
+										  OT_WHOLE_LINE, NULL, true);
+		if (pset.sversion < (is_func ? 80400 : 70400))
 		{
 			char		sverbuf[32];
 
-			psql_error("The server (version %s) does not support showing function source.\n",
-					   formatPGVersionNumber(pset.sversion, false,
-											 sverbuf, sizeof(sverbuf)));
+			formatPGVersionNumber(pset.sversion, false,
+								  sverbuf, sizeof(sverbuf));
+			if (is_func)
+				psql_error("The server (version %s) does not support showing function source.\n",
+						   sverbuf);
+			else
+				psql_error("The server (version %s) does not support showing view definitions.\n",
+						   sverbuf);
 			status = PSQL_CMD_ERROR;
 		}
-		else if (!func)
+		else if (!obj_desc)
 		{
-			psql_error("function name is required\n");
+			if (is_func)
+				psql_error("function name is required\n");
+			else
+				psql_error("view name is required\n");
 			status = PSQL_CMD_ERROR;
 		}
-		else if (!lookup_object_oid(EditableFunction, func, &foid))
+		else if (!lookup_object_oid(eot, obj_desc, &obj_oid))
 		{
 			/* error already reported */
 			status = PSQL_CMD_ERROR;
 		}
-		else if (!get_create_object_cmd(EditableFunction, foid, func_buf))
+		else if (!get_create_object_cmd(eot, obj_oid, buf))
 		{
 			/* error already reported */
 			status = PSQL_CMD_ERROR;
@@ -2264,7 +2223,7 @@ exec_command_sf(PsqlScanState scan_state, bool active_branch, const char *cmd)
 			if (pset.queryFout == stdout)
 			{
 				/* count lines in function to see if pager is needed */
-				int			lineno = count_lines_in_buf(func_buf);
+				int			lineno = count_lines_in_buf(buf);
 
 				output = PageOutput(lineno, &(pset.popt.topt));
 				is_pager = true;
@@ -2279,115 +2238,28 @@ exec_command_sf(PsqlScanState scan_state, bool active_branch, const char *cmd)
 			if (show_linenumbers)
 			{
 				/*
-				 * lineno "1" should correspond to the first line of the
-				 * function body.  We expect that pg_get_functiondef() will
-				 * emit that on a line beginning with "AS ", and that there
-				 * can be no such line before the real start of the function
-				 * body.
+				 * For functions, lineno "1" should correspond to the first
+				 * line of the function body.  We expect that
+				 * pg_get_functiondef() will emit that on a line beginning
+				 * with "AS ", and that there can be no such line before the
+				 * real start of the function body.
 				 */
-				print_with_linenumbers(output, func_buf->data, "AS ");
+				print_with_linenumbers(output, buf->data,
+									   is_func ? "AS " : NULL);
 			}
 			else
 			{
-				/* just send the function definition to output */
-				fputs(func_buf->data, output);
+				/* just send the definition to output */
+				fputs(buf->data, output);
 			}
 
 			if (is_pager)
 				ClosePager(output);
 		}
 
-		if (func)
-			free(func);
-		destroyPQExpBuffer(func_buf);
-	}
-	else
-		ignore_slash_whole_line(scan_state);
-
-	return status;
-}
-
-/*
- * \sv -- show a view's source code
- */
-static backslashResult
-exec_command_sv(PsqlScanState scan_state, bool active_branch, const char *cmd)
-{
-	backslashResult status = PSQL_CMD_SKIP_LINE;
-
-	if (active_branch)
-	{
-		bool		show_linenumbers = (strcmp(cmd, "sv+") == 0);
-		PQExpBuffer view_buf;
-		char	   *view;
-		Oid			view_oid = InvalidOid;
-
-		view_buf = createPQExpBuffer();
-		view = psql_scan_slash_option(scan_state,
-									  OT_WHOLE_LINE, NULL, true);
-		if (pset.sversion < 70400)
-		{
-			char		sverbuf[32];
-
-			psql_error("The server (version %s) does not support showing view definitions.\n",
-					   formatPGVersionNumber(pset.sversion, false,
-											 sverbuf, sizeof(sverbuf)));
-			status = PSQL_CMD_ERROR;
-		}
-		else if (!view)
-		{
-			psql_error("view name is required\n");
-			status = PSQL_CMD_ERROR;
-		}
-		else if (!lookup_object_oid(EditableView, view, &view_oid))
-		{
-			/* error already reported */
-			status = PSQL_CMD_ERROR;
-		}
-		else if (!get_create_object_cmd(EditableView, view_oid, view_buf))
-		{
-			/* error already reported */
-			status = PSQL_CMD_ERROR;
-		}
-		else
-		{
-			FILE	   *output;
-			bool		is_pager;
-
-			/* Select output stream: stdout, pager, or file */
-			if (pset.queryFout == stdout)
-			{
-				/* count lines in view to see if pager is needed */
-				int			lineno = count_lines_in_buf(view_buf);
-
-				output = PageOutput(lineno, &(pset.popt.topt));
-				is_pager = true;
-			}
-			else
-			{
-				/* use previously set output file, without pager */
-				output = pset.queryFout;
-				is_pager = false;
-			}
-
-			if (show_linenumbers)
-			{
-				/* add line numbers, numbering all lines */
-				print_with_linenumbers(output, view_buf->data, NULL);
-			}
-			else
-			{
-				/* just send the view definition to output */
-				fputs(view_buf->data, output);
-			}
-
-			if (is_pager)
-				ClosePager(output);
-		}
-
-		if (view)
-			free(view);
-		destroyPQExpBuffer(view_buf);
+		if (obj_desc)
+			free(obj_desc);
+		destroyPQExpBuffer(buf);
 	}
 	else
 		ignore_slash_whole_line(scan_state);
@@ -2957,7 +2829,7 @@ prompt_for_password(const char *username)
 {
 	char		buf[100];
 
-	if (username == NULL)
+	if (username == NULL || username[0] == '\0')
 		simple_prompt("Password: ", buf, sizeof(buf), false);
 	else
 	{
@@ -3088,7 +2960,14 @@ do_connect(enum trivalue reuse_previous_specification,
 	 */
 	if (pset.getPassword == TRI_YES)
 	{
-		password = prompt_for_password(user);
+		/*
+		 * If a connstring or URI is provided, we can't be sure we know which
+		 * username will be used, since we haven't parsed that argument yet.
+		 * Don't risk issuing a misleading prompt.  As in startup.c, it does
+		 * not seem worth working harder, since this getPassword option is
+		 * normally only used in noninteractive cases.
+		 */
+		password = prompt_for_password(has_connection_string ? NULL : user);
 	}
 	else if (o_conn && keep_password)
 	{
@@ -3154,8 +3033,12 @@ do_connect(enum trivalue reuse_previous_specification,
 		 */
 		if (!password && PQconnectionNeedsPassword(n_conn) && pset.getPassword != TRI_NO)
 		{
+			/*
+			 * Prompt for password using the username we actually connected
+			 * with --- it might've come out of "dbname" rather than "user".
+			 */
+			password = prompt_for_password(PQuser(n_conn));
 			PQfinish(n_conn);
-			password = prompt_for_password(user);
 			continue;
 		}
 
@@ -3337,6 +3220,9 @@ checkWin32Codepage(void)
 void
 SyncVariables(void)
 {
+	char		vbuf[32];
+	const char *server_version;
+
 	/* get stuff from connection */
 	pset.encoding = PQclientEncoding(pset.db);
 	pset.popt.topt.encoding = pset.encoding;
@@ -3348,6 +3234,20 @@ SyncVariables(void)
 	SetVariable(pset.vars, "PORT", PQport(pset.db));
 	SetVariable(pset.vars, "ENCODING", pg_encoding_to_char(pset.encoding));
 
+	/* this bit should match connection_warnings(): */
+	/* Try to get full text form of version, might include "devel" etc */
+	server_version = PQparameterStatus(pset.db, "server_version");
+	/* Otherwise fall back on pset.sversion */
+	if (!server_version)
+	{
+		formatPGVersionNumber(pset.sversion, true, vbuf, sizeof(vbuf));
+		server_version = vbuf;
+	}
+	SetVariable(pset.vars, "SERVER_VERSION_NAME", server_version);
+
+	snprintf(vbuf, sizeof(vbuf), "%d", pset.sversion);
+	SetVariable(pset.vars, "SERVER_VERSION_NUM", vbuf);
+
 	/* send stuff to it, too */
 	PQsetErrorVerbosity(pset.db, pset.verbosity);
 	PQsetErrorContextVisibility(pset.db, pset.show_context);
@@ -3366,6 +3266,8 @@ UnsyncVariables(void)
 	SetVariable(pset.vars, "HOST", NULL);
 	SetVariable(pset.vars, "PORT", NULL);
 	SetVariable(pset.vars, "ENCODING", NULL);
+	SetVariable(pset.vars, "SERVER_VERSION_NAME", NULL);
+	SetVariable(pset.vars, "SERVER_VERSION_NUM", NULL);
 }
 
 
@@ -4479,7 +4381,7 @@ echo_hidden_command(const char *query)
 
 /*
  * Look up the object identified by obj_type and desc.  If successful,
- * store its OID in *obj_oid and return TRUE, else return FALSE.
+ * store its OID in *obj_oid and return true, else return false.
  *
  * Note that we'll fail if the object doesn't exist OR if there are multiple
  * matching candidates OR if there's something syntactically wrong with the
diff --git a/src/bin/psql/command.h b/src/bin/psql/command.h
index 7aedd0d625..95ad02dfe2 100644
--- a/src/bin/psql/command.h
+++ b/src/bin/psql/command.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/command.h
  */
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
index 044cdb82a7..1c82180efb 100644
--- a/src/bin/psql/common.c
+++ b/src/bin/psql/common.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/common.c
  */
@@ -29,6 +29,7 @@
 #include "fe_utils/mbprint.h"
 
 
+static bool DescribeQuery(const char *query, double *elapsed_msec);
 static bool ExecQueryUsingCursor(const char *query, double *elapsed_msec);
 static bool command_no_begin(const char *query);
 static bool is_select_command(const char *query);
@@ -43,7 +44,7 @@ static bool is_select_command(const char *query);
  * Returns output file pointer into *fout, and is-a-pipe flag into *is_pipe.
  * Caller is responsible for adjusting SIGPIPE state if it's a pipe.
  *
- * On error, reports suitable error message and returns FALSE.
+ * On error, reports suitable error message and returns false.
  */
 bool
 openQueryOutputFile(const char *fname, FILE **fout, bool *is_pipe)
@@ -265,7 +266,7 @@ NoticeProcessor(void *arg, const char *message)
  * database queries.  In most places, this is accomplished by checking
  * cancel_pressed during long-running loops.  However, that won't work when
  * blocked on user input (in readline() or fgets()).  In those places, we
- * set sigint_interrupt_enabled TRUE while blocked, instructing the signal
+ * set sigint_interrupt_enabled true while blocked, instructing the signal
  * catcher to longjmp through sigint_interrupt_jmp.  We assume readline and
  * fgets are coded to handle possible interruption.  (XXX currently this does
  * not work on win32, so control-C is less useful there)
@@ -547,11 +548,58 @@ AcceptResult(const PGresult *result)
 }
 
 
+/*
+ * Set special variables from a query result
+ * - ERROR: true/false, whether an error occurred on this query
+ * - SQLSTATE: code of error, or "00000" if no error, or "" if unknown
+ * - ROW_COUNT: how many rows were returned or affected, or "0"
+ * - LAST_ERROR_SQLSTATE: same for last error
+ * - LAST_ERROR_MESSAGE: message of last error
+ *
+ * Note: current policy is to apply this only to the results of queries
+ * entered by the user, not queries generated by slash commands.
+ */
+static void
+SetResultVariables(PGresult *results, bool success)
+{
+	if (success)
+	{
+		const char *ntuples = PQcmdTuples(results);
+
+		SetVariable(pset.vars, "ERROR", "false");
+		SetVariable(pset.vars, "SQLSTATE", "00000");
+		SetVariable(pset.vars, "ROW_COUNT", *ntuples ? ntuples : "0");
+	}
+	else
+	{
+		const char *code = PQresultErrorField(results, PG_DIAG_SQLSTATE);
+		const char *mesg = PQresultErrorField(results, PG_DIAG_MESSAGE_PRIMARY);
+
+		SetVariable(pset.vars, "ERROR", "true");
+
+		/*
+		 * If there is no SQLSTATE code, use an empty string.  This can happen
+		 * for libpq-detected errors (e.g., lost connection, ENOMEM).
+		 */
+		if (code == NULL)
+			code = "";
+		SetVariable(pset.vars, "SQLSTATE", code);
+		SetVariable(pset.vars, "ROW_COUNT", "0");
+		SetVariable(pset.vars, "LAST_ERROR_SQLSTATE", code);
+		SetVariable(pset.vars, "LAST_ERROR_MESSAGE", mesg ? mesg : "");
+	}
+}
+
+
 /*
  * ClearOrSaveResult
  *
  * If the result represents an error, remember it for possible display by
  * \errverbose.  Otherwise, just PQclear() it.
+ *
+ * Note: current policy is to apply this to the results of all queries,
+ * including "back door" queries, for debugging's sake.  It's OK to use
+ * PQclear() directly on results known to not be error results, however.
  */
 static void
 ClearOrSaveResult(PGresult *result)
@@ -1106,6 +1154,8 @@ ProcessResult(PGresult **results)
 		first_cycle = false;
 	}
 
+	SetResultVariables(*results, success);
+
 	/* may need this to recover from conn loss during COPY */
 	if (!first_cycle && !CheckConnection())
 		return false;
@@ -1323,8 +1373,15 @@ SendQuery(const char *query)
 		}
 	}
 
-	if (pset.fetch_count <= 0 || pset.gexec_flag ||
-		pset.crosstab_flag || !is_select_command(query))
+	if (pset.gdesc_flag)
+	{
+		/* Describe query's result columns, without executing it */
+		OK = DescribeQuery(query, &elapsed_msec);
+		ResetCancelConn();
+		results = NULL;			/* PQclear(NULL) does nothing */
+	}
+	else if (pset.fetch_count <= 0 || pset.gexec_flag ||
+			 pset.crosstab_flag || !is_select_command(query))
 	{
 		/* Default fetch-it-all-and-print mode */
 		instr_time	before,
@@ -1467,6 +1524,9 @@ SendQuery(const char *query)
 		pset.gset_prefix = NULL;
 	}
 
+	/* reset \gdesc trigger */
+	pset.gdesc_flag = false;
+
 	/* reset \gexec trigger */
 	pset.gexec_flag = false;
 
@@ -1482,6 +1542,120 @@ SendQuery(const char *query)
 }
 
 
+/*
+ * DescribeQuery: describe the result columns of a query, without executing it
+ *
+ * Returns true if the operation executed successfully, false otherwise.
+ *
+ * If pset.timing is on, total query time (exclusive of result-printing) is
+ * stored into *elapsed_msec.
+ */
+static bool
+DescribeQuery(const char *query, double *elapsed_msec)
+{
+	PGresult   *results;
+	bool		OK;
+	instr_time	before,
+				after;
+
+	*elapsed_msec = 0;
+
+	if (pset.timing)
+		INSTR_TIME_SET_CURRENT(before);
+
+	/*
+	 * To parse the query but not execute it, we prepare it, using the unnamed
+	 * prepared statement.  This is invisible to psql users, since there's no
+	 * way to access the unnamed prepared statement from psql user space. The
+	 * next Parse or Query protocol message would overwrite the statement
+	 * anyway.  (So there's no great need to clear it when done, which is a
+	 * good thing because libpq provides no easy way to do that.)
+	 */
+	results = PQprepare(pset.db, "", query, 0, NULL);
+	if (PQresultStatus(results) != PGRES_COMMAND_OK)
+	{
+		psql_error("%s", PQerrorMessage(pset.db));
+		SetResultVariables(results, false);
+		ClearOrSaveResult(results);
+		return false;
+	}
+	PQclear(results);
+
+	results = PQdescribePrepared(pset.db, "");
+	OK = AcceptResult(results) &&
+		(PQresultStatus(results) == PGRES_COMMAND_OK);
+	if (OK && results)
+	{
+		if (PQnfields(results) > 0)
+		{
+			PQExpBufferData buf;
+			int			i;
+
+			initPQExpBuffer(&buf);
+
+			printfPQExpBuffer(&buf,
+							  "SELECT name AS \"%s\", pg_catalog.format_type(tp, tpm) AS \"%s\"\n"
+							  "FROM (VALUES ",
+							  gettext_noop("Column"),
+							  gettext_noop("Type"));
+
+			for (i = 0; i < PQnfields(results); i++)
+			{
+				const char *name;
+				char	   *escname;
+
+				if (i > 0)
+					appendPQExpBufferStr(&buf, ",");
+
+				name = PQfname(results, i);
+				escname = PQescapeLiteral(pset.db, name, strlen(name));
+
+				if (escname == NULL)
+				{
+					psql_error("%s", PQerrorMessage(pset.db));
+					PQclear(results);
+					termPQExpBuffer(&buf);
+					return false;
+				}
+
+				appendPQExpBuffer(&buf, "(%s, '%u'::pg_catalog.oid, %d)",
+								  escname,
+								  PQftype(results, i),
+								  PQfmod(results, i));
+
+				PQfreemem(escname);
+			}
+
+			appendPQExpBufferStr(&buf, ") s(name, tp, tpm)");
+			PQclear(results);
+
+			results = PQexec(pset.db, buf.data);
+			OK = AcceptResult(results);
+
+			if (pset.timing)
+			{
+				INSTR_TIME_SET_CURRENT(after);
+				INSTR_TIME_SUBTRACT(after, before);
+				*elapsed_msec += INSTR_TIME_GET_MILLISEC(after);
+			}
+
+			if (OK && results)
+				OK = PrintQueryResults(results);
+
+			termPQExpBuffer(&buf);
+		}
+		else
+			fprintf(pset.queryFout,
+					_("The command has no result, or the result has no columns.\n"));
+	}
+
+	SetResultVariables(results, OK);
+	ClearOrSaveResult(results);
+
+	return OK;
+}
+
+
 /*
  * ExecQueryUsingCursor: run a SELECT-like query using a cursor
  *
@@ -1503,6 +1677,7 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 	bool		is_pipe;
 	bool		is_pager = false;
 	bool		started_txn = false;
+	int64		total_tuples = 0;
 	int			ntuples;
 	int			fetch_count;
 	char		fetch_cmd[64];
@@ -1540,6 +1715,8 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 	results = PQexec(pset.db, buf.data);
 	OK = AcceptResult(results) &&
 		(PQresultStatus(results) == PGRES_COMMAND_OK);
+	if (!OK)
+		SetResultVariables(results, OK);
 	ClearOrSaveResult(results);
 	termPQExpBuffer(&buf);
 	if (!OK)
@@ -1565,6 +1742,10 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 			 "FETCH FORWARD %d FROM _psql_cursor",
 			 fetch_count);
 
+	/* one-shot expanded output requested via \gx */
+	if (pset.g_expanded)
+		my_popt.topt.expanded = 1;
+
 	/* prepare to write output to \g argument, if any */
 	if (pset.gfname)
 	{
@@ -1611,6 +1792,7 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 
 			OK = AcceptResult(results);
 			Assert(!OK);
+			SetResultVariables(results, OK);
 			ClearOrSaveResult(results);
 			break;
 		}
@@ -1623,9 +1805,12 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 			break;
 		}
 
-		/* Note we do not deal with \gexec or \crosstabview modes here */
+		/*
+		 * Note we do not deal with \gdesc, \gexec or \crosstabview modes here
+		 */
 
 		ntuples = PQntuples(results);
+		total_tuples += ntuples;
 
 		if (ntuples < fetch_count)
 		{
@@ -1687,6 +1872,21 @@ ExecQueryUsingCursor(const char *query, double *elapsed_msec)
 		ClosePager(fout);
 	}
 
+	if (OK)
+	{
+		/*
+		 * We don't have a PGresult here, and even if we did it wouldn't have
+		 * the right row count, so fake SetResultVariables().  In error cases,
+		 * we already set the result variables above.
+		 */
+		char		buf[32];
+
+		SetVariable(pset.vars, "ERROR", "false");
+		SetVariable(pset.vars, "SQLSTATE", "00000");
+		snprintf(buf, sizeof(buf), INT64_FORMAT, total_tuples);
+		SetVariable(pset.vars, "ROW_COUNT", buf);
+	}
+
 cleanup:
 	if (pset.timing)
 		INSTR_TIME_SET_CURRENT(before);
diff --git a/src/bin/psql/common.h b/src/bin/psql/common.h
index f34868b54e..43142a7aa6 100644
--- a/src/bin/psql/common.h
+++ b/src/bin/psql/common.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/common.h
  */
diff --git a/src/bin/psql/conditional.c b/src/bin/psql/conditional.c
index 63977ce5dd..cebf8c766c 100644
--- a/src/bin/psql/conditional.c
+++ b/src/bin/psql/conditional.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/conditional.c
  */
diff --git a/src/bin/psql/conditional.h b/src/bin/psql/conditional.h
index 0957627742..565875ac31 100644
--- a/src/bin/psql/conditional.h
+++ b/src/bin/psql/conditional.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/conditional.h
  */
diff --git a/src/bin/psql/copy.c b/src/bin/psql/copy.c
index 724ea9211a..555c6331a3 100644
--- a/src/bin/psql/copy.c
+++ b/src/bin/psql/copy.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/copy.c
  */
diff --git a/src/bin/psql/copy.h b/src/bin/psql/copy.h
index a79550de19..f4107d70b0 100644
--- a/src/bin/psql/copy.h
+++ b/src/bin/psql/copy.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/copy.h
  */
diff --git a/src/bin/psql/create_help.pl b/src/bin/psql/create_help.pl
index cedb767b27..cb0e6e806e 100644
--- a/src/bin/psql/create_help.pl
+++ b/src/bin/psql/create_help.pl
@@ -3,7 +3,7 @@
 #################################################################
 # create_help.pl -- converts SGML docs to internal psql help
 #
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 #
 # src/bin/psql/create_help.pl
 #################################################################
@@ -51,8 +51,7 @@
  * *** Do not change this file by hand. It is automatically
  * *** generated from the DocBook documentation.
  *
- * generated by
- *     $^X $0 @ARGV
+ * generated by src/bin/psql/create_help.pl
  *
  */
 
@@ -76,8 +75,7 @@
  * *** Do not change this file by hand. It is automatically
  * *** generated from the DocBook documentation.
  *
- * generated by
- *     $^X $0 @ARGV
+ * generated by src/bin/psql/create_help.pl
  *
  */
 
@@ -131,7 +129,7 @@
 		my $nl_count = () = $cmdsynopsis =~ /\n/g;
 
 		$cmdsynopsis =~ m!</>!
-		  and die "$0:$file: null end tag not supported in synopsis\n";
+		  and die "$0: $file: null end tag not supported in synopsis\n";
 		$cmdsynopsis =~ s/%/%%/g;
 
 		while ($cmdsynopsis =~ m!<(\w+)[^>]*>(.+?)</\1[^>]*>!)
diff --git a/src/bin/psql/crosstabview.c b/src/bin/psql/crosstabview.c
index ed61c346ee..05042b3e13 100644
--- a/src/bin/psql/crosstabview.c
+++ b/src/bin/psql/crosstabview.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/crosstabview.c
  */
diff --git a/src/bin/psql/crosstabview.h b/src/bin/psql/crosstabview.h
index ad63ddef50..596637f3ff 100644
--- a/src/bin/psql/crosstabview.h
+++ b/src/bin/psql/crosstabview.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/crosstabview.h
  */
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
index f6049cc9e5..466a78004b 100644
--- a/src/bin/psql/describe.c
+++ b/src/bin/psql/describe.c
@@ -6,7 +6,7 @@
  * with servers of versions 7.4 and up.  It's okay to omit irrelevant
  * information for an old server, but not to fail outright.
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/describe.c
  */
@@ -353,6 +353,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
 						  " CASE\n"
 						  "  WHEN p.proisagg THEN '%s'\n"
 						  "  WHEN p.proiswindow THEN '%s'\n"
+						  "  WHEN p.prorettype = 0 THEN '%s'\n"
 						  "  WHEN p.prorettype = 'pg_catalog.trigger'::pg_catalog.regtype THEN '%s'\n"
 						  "  ELSE '%s'\n"
 						  " END as \"%s\"",
@@ -361,8 +362,9 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
 		/* translator: "agg" is short for "aggregate" */
 						  gettext_noop("agg"),
 						  gettext_noop("window"),
+						  gettext_noop("proc"),
 						  gettext_noop("trigger"),
-						  gettext_noop("normal"),
+						  gettext_noop("func"),
 						  gettext_noop("Type"));
 	else if (pset.sversion >= 80100)
 		appendPQExpBuffer(&buf,
@@ -407,7 +409,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
 		/* translator: "agg" is short for "aggregate" */
 						  gettext_noop("agg"),
 						  gettext_noop("trigger"),
-						  gettext_noop("normal"),
+						  gettext_noop("func"),
 						  gettext_noop("Type"));
 	else
 		appendPQExpBuffer(&buf,
@@ -424,7 +426,7 @@ describeFunctions(const char *functypes, const char *pattern, bool verbose, bool
 		/* translator: "agg" is short for "aggregate" */
 						  gettext_noop("agg"),
 						  gettext_noop("trigger"),
-						  gettext_noop("normal"),
+						  gettext_noop("func"),
 						  gettext_noop("Type"));
 
 	if (verbose)
@@ -1380,8 +1382,6 @@ describeOneTableDetails(const char *schemaname,
 	int			i;
 	char	   *view_def = NULL;
 	char	   *headers[11];
-	char	  **seq_values = NULL;
-	char	  **ptr;
 	PQExpBufferData title;
 	PQExpBufferData tmpbuf;
 	int			cols;
@@ -1563,27 +1563,125 @@ describeOneTableDetails(const char *schemaname,
 	res = NULL;
 
 	/*
-	 * If it's a sequence, fetch its values and store into an array that will
-	 * be used later.
+	 * If it's a sequence, deal with it here separately.
 	 */
 	if (tableinfo.relkind == RELKIND_SEQUENCE)
 	{
-		printfPQExpBuffer(&buf, "SELECT * FROM %s", fmtId(schemaname));
-		/* must be separate because fmtId isn't reentrant */
-		appendPQExpBuffer(&buf, ".%s;", fmtId(relationname));
+		PGresult   *result = NULL;
+		printQueryOpt myopt = pset.popt;
+		char	   *footers[2] = {NULL, NULL};
+
+		if (pset.sversion >= 100000)
+		{
+			printfPQExpBuffer(&buf,
+							  "SELECT pg_catalog.format_type(seqtypid, NULL) AS \"%s\",\n"
+							  "       seqstart AS \"%s\",\n"
+							  "       seqmin AS \"%s\",\n"
+							  "       seqmax AS \"%s\",\n"
+							  "       seqincrement AS \"%s\",\n"
+							  "       CASE WHEN seqcycle THEN '%s' ELSE '%s' END AS \"%s\",\n"
+							  "       seqcache AS \"%s\"\n",
+							  gettext_noop("Type"),
+							  gettext_noop("Start"),
+							  gettext_noop("Minimum"),
+							  gettext_noop("Maximum"),
+							  gettext_noop("Increment"),
+							  gettext_noop("yes"),
+							  gettext_noop("no"),
+							  gettext_noop("Cycles?"),
+							  gettext_noop("Cache"));
+			appendPQExpBuffer(&buf,
+							  "FROM pg_catalog.pg_sequence\n"
+							  "WHERE seqrelid = '%s';",
+							  oid);
+		}
+		else
+		{
+			printfPQExpBuffer(&buf,
+							  "SELECT 'bigint' AS \"%s\",\n"
+							  "       start_value AS \"%s\",\n"
+							  "       min_value AS \"%s\",\n"
+							  "       max_value AS \"%s\",\n"
+							  "       increment_by AS \"%s\",\n"
+							  "       CASE WHEN is_cycled THEN '%s' ELSE '%s' END AS \"%s\",\n"
+							  "       cache_value AS \"%s\"\n",
+							  gettext_noop("Type"),
+							  gettext_noop("Start"),
+							  gettext_noop("Minimum"),
+							  gettext_noop("Maximum"),
+							  gettext_noop("Increment"),
+							  gettext_noop("yes"),
+							  gettext_noop("no"),
+							  gettext_noop("Cycles?"),
+							  gettext_noop("Cache"));
+			appendPQExpBuffer(&buf, "FROM %s", fmtId(schemaname));
+			/* must be separate because fmtId isn't reentrant */
+			appendPQExpBuffer(&buf, ".%s;", fmtId(relationname));
+		}
 
 		res = PSQLexec(buf.data);
 		if (!res)
 			goto error_return;
 
-		seq_values = pg_malloc((PQnfields(res) + 1) * sizeof(*seq_values));
+		/* Footer information about a sequence */
 
-		for (i = 0; i < PQnfields(res); i++)
-			seq_values[i] = pg_strdup(PQgetvalue(res, 0, i));
-		seq_values[i] = NULL;
+		/* Get the column that owns this sequence */
+		printfPQExpBuffer(&buf, "SELECT pg_catalog.quote_ident(nspname) || '.' ||"
+						  "\n   pg_catalog.quote_ident(relname) || '.' ||"
+						  "\n   pg_catalog.quote_ident(attname),"
+						  "\n   d.deptype"
+						  "\nFROM pg_catalog.pg_class c"
+						  "\nINNER JOIN pg_catalog.pg_depend d ON c.oid=d.refobjid"
+						  "\nINNER JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace"
+						  "\nINNER JOIN pg_catalog.pg_attribute a ON ("
+						  "\n a.attrelid=c.oid AND"
+						  "\n a.attnum=d.refobjsubid)"
+						  "\nWHERE d.classid='pg_catalog.pg_class'::pg_catalog.regclass"
+						  "\n AND d.refclassid='pg_catalog.pg_class'::pg_catalog.regclass"
+						  "\n AND d.objid='%s'"
+						  "\n AND d.deptype IN ('a', 'i')",
+						  oid);
 
-		PQclear(res);
-		res = NULL;
+		result = PSQLexec(buf.data);
+
+		/*
+		 * If we get no rows back, don't show anything (obviously). We should
+		 * never get more than one row back, but if we do, just ignore it and
+		 * don't print anything.
+		 */
+		if (!result)
+			goto error_return;
+		else if (PQntuples(result) == 1)
+		{
+			switch (PQgetvalue(result, 0, 1)[0])
+			{
+				case 'a':
+					footers[0] = psprintf(_("Owned by: %s"),
+										  PQgetvalue(result, 0, 0));
+					break;
+				case 'i':
+					footers[0] = psprintf(_("Sequence for identity column: %s"),
+										  PQgetvalue(result, 0, 0));
+					break;
+			}
+		}
+		PQclear(result);
+
+		printfPQExpBuffer(&title, _("Sequence \"%s.%s\""),
+						  schemaname, relationname);
+
+		myopt.footers = footers;
+		myopt.topt.default_footer = false;
+		myopt.title = title.data;
+		myopt.translate_header = true;
+
+		printQuery(res, &myopt, pset.queryFout, false, pset.logfile);
+
+		if (footers[0])
+			free(footers[0]);
+
+		retval = true;
+		goto error_return;		/* not an error, just return early */
 	}
 
 	/*
@@ -1607,7 +1705,8 @@ describeOneTableDetails(const char *schemaname,
 		appendPQExpBufferStr(&buf, ",\n  a.attidentity");
 	else
 		appendPQExpBufferStr(&buf, ",\n  ''::pg_catalog.char AS attidentity");
-	if (tableinfo.relkind == RELKIND_INDEX)
+	if (tableinfo.relkind == RELKIND_INDEX ||
+		tableinfo.relkind == RELKIND_PARTITIONED_INDEX)
 		appendPQExpBufferStr(&buf, ",\n  pg_catalog.pg_get_indexdef(a.attrelid, a.attnum, TRUE) AS indexdef");
 	else
 		appendPQExpBufferStr(&buf, ",\n  NULL AS indexdef");
@@ -1624,7 +1723,7 @@ describeOneTableDetails(const char *schemaname,
 
 		/*
 		 * In 9.0+, we have column comments for: relations, views, composite
-		 * types, and foreign tables (c.f. CommentObject() in comment.c).
+		 * types, and foreign tables (cf. CommentObject() in comment.c).
 		 */
 		if (tableinfo.relkind == RELKIND_RELATION ||
 			tableinfo.relkind == RELKIND_VIEW ||
@@ -1667,11 +1766,8 @@ describeOneTableDetails(const char *schemaname,
 				printfPQExpBuffer(&title, _("Materialized view \"%s.%s\""),
 								  schemaname, relationname);
 			break;
-		case RELKIND_SEQUENCE:
-			printfPQExpBuffer(&title, _("Sequence \"%s.%s\""),
-							  schemaname, relationname);
-			break;
 		case RELKIND_INDEX:
+		case RELKIND_PARTITIONED_INDEX:
 			if (tableinfo.relpersistence == 'u')
 				printfPQExpBuffer(&title, _("Unlogged index \"%s.%s\""),
 								  schemaname, relationname);
@@ -1729,10 +1825,8 @@ describeOneTableDetails(const char *schemaname,
 		show_column_details = true;
 	}
 
-	if (tableinfo.relkind == RELKIND_SEQUENCE)
-		headers[cols++] = gettext_noop("Value");
-
-	if (tableinfo.relkind == RELKIND_INDEX)
+	if (tableinfo.relkind == RELKIND_INDEX ||
+		tableinfo.relkind == RELKIND_PARTITIONED_INDEX)
 		headers[cols++] = gettext_noop("Definition");
 
 	if (tableinfo.relkind == RELKIND_FOREIGN_TABLE && pset.sversion >= 90200)
@@ -1742,6 +1836,8 @@ describeOneTableDetails(const char *schemaname,
 	{
 		headers[cols++] = gettext_noop("Storage");
 		if (tableinfo.relkind == RELKIND_RELATION ||
+			tableinfo.relkind == RELKIND_INDEX ||
+			tableinfo.relkind == RELKIND_PARTITIONED_INDEX ||
 			tableinfo.relkind == RELKIND_MATVIEW ||
 			tableinfo.relkind == RELKIND_FOREIGN_TABLE ||
 			tableinfo.relkind == RELKIND_PARTITIONED_TABLE)
@@ -1813,12 +1909,9 @@ describeOneTableDetails(const char *schemaname,
 			printTableAddCell(&cont, default_str, false, false);
 		}
 
-		/* Value: for sequences only */
-		if (tableinfo.relkind == RELKIND_SEQUENCE)
-			printTableAddCell(&cont, seq_values[i], false, false);
-
 		/* Expression for index column */
-		if (tableinfo.relkind == RELKIND_INDEX)
+		if (tableinfo.relkind == RELKIND_INDEX ||
+			tableinfo.relkind == RELKIND_PARTITIONED_INDEX)
 			printTableAddCell(&cont, PQgetvalue(res, i, 7), false, false);
 
 		/* FDW options for foreign table column, only for 9.2 or later */
@@ -1841,6 +1934,8 @@ describeOneTableDetails(const char *schemaname,
 
 			/* Statistics target, if the relkind supports this feature */
 			if (tableinfo.relkind == RELKIND_RELATION ||
+				tableinfo.relkind == RELKIND_INDEX ||
+				tableinfo.relkind == RELKIND_PARTITIONED_INDEX ||
 				tableinfo.relkind == RELKIND_MATVIEW ||
 				tableinfo.relkind == RELKIND_FOREIGN_TABLE ||
 				tableinfo.relkind == RELKIND_PARTITIONED_TABLE)
@@ -1891,17 +1986,21 @@ describeOneTableDetails(const char *schemaname,
 			parent_name = PQgetvalue(result, 0, 0);
 			partdef = PQgetvalue(result, 0, 1);
 
-			if (PQnfields(result) == 3)
+			if (PQnfields(result) == 3 && !PQgetisnull(result, 0, 2))
 				partconstraintdef = PQgetvalue(result, 0, 2);
 
 			printfPQExpBuffer(&tmpbuf, _("Partition of: %s %s"), parent_name,
 							  partdef);
 			printTableAddFooter(&cont, tmpbuf.data);
 
-			if (partconstraintdef)
+			if (verbose)
 			{
-				printfPQExpBuffer(&tmpbuf, _("Partition constraint: %s"),
-								  partconstraintdef);
+				/* If there isn't any constraint, show that explicitly */
+				if (partconstraintdef == NULL || partconstraintdef[0] == '\0')
+					printfPQExpBuffer(&tmpbuf, _("No partition constraint"));
+				else
+					printfPQExpBuffer(&tmpbuf, _("Partition constraint: %s"),
+									  partconstraintdef);
 				printTableAddFooter(&cont, tmpbuf.data);
 			}
 
@@ -1928,7 +2027,8 @@ describeOneTableDetails(const char *schemaname,
 		PQclear(result);
 	}
 
-	if (tableinfo.relkind == RELKIND_INDEX)
+	if (tableinfo.relkind == RELKIND_INDEX ||
+		tableinfo.relkind == RELKIND_PARTITIONED_INDEX)
 	{
 		/* Footer information about an index */
 		PGresult   *result;
@@ -2027,55 +2127,6 @@ describeOneTableDetails(const char *schemaname,
 
 		PQclear(result);
 	}
-	else if (tableinfo.relkind == RELKIND_SEQUENCE)
-	{
-		/* Footer information about a sequence */
-		PGresult   *result = NULL;
-
-		/* Get the column that owns this sequence */
-		printfPQExpBuffer(&buf, "SELECT pg_catalog.quote_ident(nspname) || '.' ||"
-						  "\n   pg_catalog.quote_ident(relname) || '.' ||"
-						  "\n   pg_catalog.quote_ident(attname),"
-						  "\n   d.deptype"
-						  "\nFROM pg_catalog.pg_class c"
-						  "\nINNER JOIN pg_catalog.pg_depend d ON c.oid=d.refobjid"
-						  "\nINNER JOIN pg_catalog.pg_namespace n ON n.oid=c.relnamespace"
-						  "\nINNER JOIN pg_catalog.pg_attribute a ON ("
-						  "\n a.attrelid=c.oid AND"
-						  "\n a.attnum=d.refobjsubid)"
-						  "\nWHERE d.classid='pg_catalog.pg_class'::pg_catalog.regclass"
-						  "\n AND d.refclassid='pg_catalog.pg_class'::pg_catalog.regclass"
-						  "\n AND d.objid='%s'"
-						  "\n AND d.deptype IN ('a', 'i')",
-						  oid);
-
-		result = PSQLexec(buf.data);
-		if (!result)
-			goto error_return;
-		else if (PQntuples(result) == 1)
-		{
-			switch (PQgetvalue(result, 0, 1)[0])
-			{
-				case 'a':
-					printfPQExpBuffer(&buf, _("Owned by: %s"),
-									  PQgetvalue(result, 0, 0));
-					printTableAddFooter(&cont, buf.data);
-					break;
-				case 'i':
-					printfPQExpBuffer(&buf, _("Sequence for identity column: %s"),
-									  PQgetvalue(result, 0, 0));
-					printTableAddFooter(&cont, buf.data);
-					break;
-			}
-		}
-
-		/*
-		 * If we get no rows back, don't show anything (obviously). We should
-		 * never get more than one row back, but if we do, just ignore it and
-		 * don't print anything.
-		 */
-		PQclear(result);
-	}
 	else if (tableinfo.relkind == RELKIND_RELATION ||
 			 tableinfo.relkind == RELKIND_MATVIEW ||
 			 tableinfo.relkind == RELKIND_FOREIGN_TABLE ||
@@ -2381,8 +2432,8 @@ describeOneTableDetails(const char *schemaname,
 							  "   FROM pg_catalog.unnest(stxkeys) s(attnum)\n"
 							  "   JOIN pg_catalog.pg_attribute a ON (stxrelid = a.attrelid AND\n"
 							  "        a.attnum = s.attnum AND NOT attisdropped)) AS columns,\n"
-							  "  (stxkind @> '{d}') AS ndist_enabled,\n"
-							  "  (stxkind @> '{f}') AS deps_enabled\n"
+							  "  'd' = any(stxkind) AS ndist_enabled,\n"
+							  "  'f' = any(stxkind) AS deps_enabled\n"
 							  "FROM pg_catalog.pg_statistic_ext stat "
 							  "WHERE stxrelid = '%s'\n"
 							  "ORDER BY 1;",
@@ -2447,7 +2498,7 @@ describeOneTableDetails(const char *schemaname,
 			{
 				printfPQExpBuffer(&buf,
 								  "SELECT r.rulename, trim(trailing ';' from pg_catalog.pg_get_ruledef(r.oid, true)), "
-								  "'O'::char AS ev_enabled\n"
+								  "'O' AS ev_enabled\n"
 								  "FROM pg_catalog.pg_rewrite r\n"
 								  "WHERE r.ev_class = '%s' ORDER BY 1;",
 								  oid);
@@ -2828,10 +2879,13 @@ describeOneTableDetails(const char *schemaname,
 		/* print child tables (with additional info if partitions) */
 		if (pset.sversion >= 100000)
 			printfPQExpBuffer(&buf,
-							  "SELECT c.oid::pg_catalog.regclass, pg_catalog.pg_get_expr(c.relpartbound, c.oid)"
+							  "SELECT c.oid::pg_catalog.regclass,"
+							  "       pg_catalog.pg_get_expr(c.relpartbound, c.oid),"
+							  "       c.relkind"
 							  " FROM pg_catalog.pg_class c, pg_catalog.pg_inherits i"
 							  " WHERE c.oid=i.inhrelid AND i.inhparent = '%s'"
-							  " ORDER BY c.oid::pg_catalog.regclass::pg_catalog.text;", oid);
+							  " ORDER BY pg_catalog.pg_get_expr(c.relpartbound, c.oid) = 'DEFAULT',"
+							  "          c.oid::pg_catalog.regclass::pg_catalog.text;", oid);
 		else if (pset.sversion >= 80300)
 			printfPQExpBuffer(&buf,
 							  "SELECT c.oid::pg_catalog.regclass"
@@ -2851,7 +2905,18 @@ describeOneTableDetails(const char *schemaname,
 		else
 			tuples = PQntuples(result);
 
-		if (!verbose)
+		/*
+		 * For a partitioned table with no partitions, always print the number
+		 * of partitions as zero, even when verbose output is expected.
+		 * Otherwise, we will not print "Partitions" section for a partitioned
+		 * table without any partitions.
+		 */
+		if (tableinfo.relkind == RELKIND_PARTITIONED_TABLE && tuples == 0)
+		{
+			printfPQExpBuffer(&buf, _("Number of partitions: %d"), tuples);
+			printTableAddFooter(&cont, buf.data);
+		}
+		else if (!verbose)
 		{
 			/* print the number of child tables, if any */
 			if (tuples > 0)
@@ -2883,12 +2948,21 @@ describeOneTableDetails(const char *schemaname,
 				}
 				else
 				{
+					char	   *partitioned_note;
+
+					if (*PQgetvalue(result, i, 2) == RELKIND_PARTITIONED_TABLE)
+						partitioned_note = ", PARTITIONED";
+					else
+						partitioned_note = "";
+
 					if (i == 0)
-						printfPQExpBuffer(&buf, "%s: %s %s",
-										  ct, PQgetvalue(result, i, 0), PQgetvalue(result, i, 1));
+						printfPQExpBuffer(&buf, "%s: %s %s%s",
+										  ct, PQgetvalue(result, i, 0), PQgetvalue(result, i, 1),
+										  partitioned_note);
 					else
-						printfPQExpBuffer(&buf, "%*s  %s %s",
-										  ctw, "", PQgetvalue(result, i, 0), PQgetvalue(result, i, 1));
+						printfPQExpBuffer(&buf, "%*s  %s %s%s",
+										  ctw, "", PQgetvalue(result, i, 0), PQgetvalue(result, i, 1),
+										  partitioned_note);
 				}
 				if (i < tuples - 1)
 					appendPQExpBufferChar(&buf, ',');
@@ -2960,13 +3034,6 @@ describeOneTableDetails(const char *schemaname,
 	termPQExpBuffer(&title);
 	termPQExpBuffer(&tmpbuf);
 
-	if (seq_values)
-	{
-		for (ptr = seq_values; *ptr; ptr++)
-			free(*ptr);
-		free(seq_values);
-	}
-
 	if (view_def)
 		free(view_def);
 
@@ -3337,6 +3404,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 					  " WHEN 's' THEN '%s'"
 					  " WHEN " CppAsString2(RELKIND_FOREIGN_TABLE) " THEN '%s'"
 					  " WHEN " CppAsString2(RELKIND_PARTITIONED_TABLE) " THEN '%s'"
+					  " WHEN " CppAsString2(RELKIND_PARTITIONED_INDEX) " THEN '%s'"
 					  " END as \"%s\",\n"
 					  "  pg_catalog.pg_get_userbyid(c.relowner) as \"%s\"",
 					  gettext_noop("Schema"),
@@ -3349,6 +3417,7 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 					  gettext_noop("special"),
 					  gettext_noop("foreign table"),
 					  gettext_noop("table"),	/* partitioned table */
+					  gettext_noop("index"),	/* partitioned index */
 					  gettext_noop("Type"),
 					  gettext_noop("Owner"));
 
@@ -3394,7 +3463,8 @@ listTables(const char *tabtypes, const char *pattern, bool verbose, bool showSys
 	if (showMatViews)
 		appendPQExpBufferStr(&buf, CppAsString2(RELKIND_MATVIEW) ",");
 	if (showIndexes)
-		appendPQExpBufferStr(&buf, CppAsString2(RELKIND_INDEX) ",");
+		appendPQExpBufferStr(&buf, CppAsString2(RELKIND_INDEX) ","
+							 CppAsString2(RELKIND_PARTITIONED_INDEX) ",");
 	if (showSeq)
 		appendPQExpBufferStr(&buf, CppAsString2(RELKIND_SEQUENCE) ",");
 	if (showSystem || pattern)
@@ -5328,7 +5398,7 @@ describeSubscriptions(const char *pattern, bool verbose)
 						 "FROM pg_catalog.pg_subscription\n"
 						 "WHERE subdbid = (SELECT oid\n"
 						 "                 FROM pg_catalog.pg_database\n"
-						 "                 WHERE datname = current_database())");
+						 "                 WHERE datname = pg_catalog.current_database())");
 
 	processSQLNamePattern(pset.db, &buf, pattern, true, false,
 						  NULL, "subname", NULL,
diff --git a/src/bin/psql/describe.h b/src/bin/psql/describe.h
index 14a5667f3e..a4cc5efae0 100644
--- a/src/bin/psql/describe.h
+++ b/src/bin/psql/describe.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/describe.h
  */
diff --git a/src/bin/psql/help.c b/src/bin/psql/help.c
index b3dbb5946e..702e742af4 100644
--- a/src/bin/psql/help.c
+++ b/src/bin/psql/help.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/help.c
  */
@@ -167,13 +167,14 @@ slashUsage(unsigned short int pager)
 	 * Use "psql --help=commands | wc" to count correctly.  It's okay to count
 	 * the USE_READLINE line even in builds without that.
 	 */
-	output = PageOutput(122, pager ? &(pset.popt.topt) : NULL);
+	output = PageOutput(125, pager ? &(pset.popt.topt) : NULL);
 
 	fprintf(output, _("General\n"));
 	fprintf(output, _("  \\copyright             show PostgreSQL usage and distribution terms\n"));
 	fprintf(output, _("  \\crosstabview [COLUMNS] execute query and display results in crosstab\n"));
 	fprintf(output, _("  \\errverbose            show most recent error message at maximum verbosity\n"));
 	fprintf(output, _("  \\g [FILE] or ;         execute query (and send results to file or |pipe)\n"));
+	fprintf(output, _("  \\gdesc                 describe result of query, without executing it\n"));
 	fprintf(output, _("  \\gexec                 execute query, then execute each value in its result\n"));
 	fprintf(output, _("  \\gset [PREFIX]         execute query and store results in psql variables\n"));
 	fprintf(output, _("  \\gx [FILE]             as \\g, but forces expanded output mode\n"));
@@ -336,7 +337,7 @@ helpVariables(unsigned short int pager)
 	 * Windows builds currently print one more line than non-Windows builds.
 	 * Using the larger number is fine.
 	 */
-	output = PageOutput(88, pager ? &(pset.popt.topt) : NULL);
+	output = PageOutput(156, pager ? &(pset.popt.topt) : NULL);
 
 	fprintf(output, _("List of specially treated variables\n\n"));
 
@@ -344,62 +345,118 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("Usage:\n"));
 	fprintf(output, _("  psql --set=NAME=VALUE\n  or \\set NAME VALUE inside psql\n\n"));
 
-	fprintf(output, _("  AUTOCOMMIT         if set, successful SQL commands are automatically committed\n"));
-	fprintf(output, _("  COMP_KEYWORD_CASE  determines the case used to complete SQL key words\n"
-					  "                     [lower, upper, preserve-lower, preserve-upper]\n"));
-	fprintf(output, _("  DBNAME             the currently connected database name\n"));
-	fprintf(output, _("  ECHO               controls what input is written to standard output\n"
-					  "                     [all, errors, none, queries]\n"));
-	fprintf(output, _("  ECHO_HIDDEN        if set, display internal queries executed by backslash commands;\n"
-					  "                     if set to \"noexec\", just show without execution\n"));
-	fprintf(output, _("  ENCODING           current client character set encoding\n"));
-	fprintf(output, _("  FETCH_COUNT        the number of result rows to fetch and display at a time\n"
-					  "                     (default: 0=unlimited)\n"));
-	fprintf(output, _("  HISTCONTROL        controls command history [ignorespace, ignoredups, ignoreboth]\n"));
-	fprintf(output, _("  HISTFILE           file name used to store the command history\n"));
-	fprintf(output, _("  HISTSIZE           max number of commands to store in the command history\n"));
-	fprintf(output, _("  HOST               the currently connected database server host\n"));
-	fprintf(output, _("  IGNOREEOF          number of EOFs needed to terminate an interactive session\n"));
-	fprintf(output, _("  LASTOID            value of the last affected OID\n"));
-	fprintf(output, _("  ON_ERROR_ROLLBACK  if set, an error doesn't stop a transaction (uses implicit savepoints)\n"));
-	fprintf(output, _("  ON_ERROR_STOP      stop batch execution after error\n"));
-	fprintf(output, _("  PORT               server port of the current connection\n"));
-	fprintf(output, _("  PROMPT1            specifies the standard psql prompt\n"));
-	fprintf(output, _("  PROMPT2            specifies the prompt used when a statement continues from a previous line\n"));
-	fprintf(output, _("  PROMPT3            specifies the prompt used during COPY ... FROM STDIN\n"));
-	fprintf(output, _("  QUIET              run quietly (same as -q option)\n"));
-	fprintf(output, _("  SHOW_CONTEXT       controls display of message context fields [never, errors, always]\n"));
-	fprintf(output, _("  SINGLELINE         end of line terminates SQL command mode (same as -S option)\n"));
-	fprintf(output, _("  SINGLESTEP         single-step mode (same as -s option)\n"));
-	fprintf(output, _("  USER               the currently connected database user\n"));
-	fprintf(output, _("  VERBOSITY          controls verbosity of error reports [default, verbose, terse]\n"));
+	fprintf(output, _("  AUTOCOMMIT\n"
+					  "    if set, successful SQL commands are automatically committed\n"));
+	fprintf(output, _("  COMP_KEYWORD_CASE\n"
+					  "    determines the case used to complete SQL key words\n"
+					  "    [lower, upper, preserve-lower, preserve-upper]\n"));
+	fprintf(output, _("  DBNAME\n"
+					  "    the currently connected database name\n"));
+	fprintf(output, _("  ECHO\n"
+					  "    controls what input is written to standard output\n"
+					  "    [all, errors, none, queries]\n"));
+	fprintf(output, _("  ECHO_HIDDEN\n"
+					  "    if set, display internal queries executed by backslash commands;\n"
+					  "    if set to \"noexec\", just show them without execution\n"));
+	fprintf(output, _("  ENCODING\n"
+					  "    current client character set encoding\n"));
+	fprintf(output, _("  ERROR\n"
+					  "    true if last query failed, else false\n"));
+	fprintf(output, _("  FETCH_COUNT\n"
+					  "    the number of result rows to fetch and display at a time (0 = unlimited)\n"));
+	fprintf(output, _("  HISTCONTROL\n"
+					  "    controls command history [ignorespace, ignoredups, ignoreboth]\n"));
+	fprintf(output, _("  HISTFILE\n"
+					  "    file name used to store the command history\n"));
+	fprintf(output, _("  HISTSIZE\n"
+					  "    max number of commands to store in the command history\n"));
+	fprintf(output, _("  HOST\n"
+					  "    the currently connected database server host\n"));
+	fprintf(output, _("  IGNOREEOF\n"
+					  "    number of EOFs needed to terminate an interactive session\n"));
+	fprintf(output, _("  LASTOID\n"
+					  "    value of the last affected OID\n"));
+	fprintf(output, _("  LAST_ERROR_MESSAGE\n"
+					  "  LAST_ERROR_SQLSTATE\n"
+					  "    message and SQLSTATE of last error, or empty string and \"00000\" if none\n"));
+	fprintf(output, _("  ON_ERROR_ROLLBACK\n"
+					  "    if set, an error doesn't stop a transaction (uses implicit savepoints)\n"));
+	fprintf(output, _("  ON_ERROR_STOP\n"
+					  "    stop batch execution after error\n"));
+	fprintf(output, _("  PORT\n"
+					  "    server port of the current connection\n"));
+	fprintf(output, _("  PROMPT1\n"
+					  "    specifies the standard psql prompt\n"));
+	fprintf(output, _("  PROMPT2\n"
+					  "    specifies the prompt used when a statement continues from a previous line\n"));
+	fprintf(output, _("  PROMPT3\n"
+					  "    specifies the prompt used during COPY ... FROM STDIN\n"));
+	fprintf(output, _("  QUIET\n"
+					  "    run quietly (same as -q option)\n"));
+	fprintf(output, _("  ROW_COUNT\n"
+					  "    number of rows returned or affected by last query, or 0\n"));
+	fprintf(output, _("  SERVER_VERSION_NAME\n"
+					  "  SERVER_VERSION_NUM\n"
+					  "    server's version (in short string or numeric format)\n"));
+	fprintf(output, _("  SHOW_CONTEXT\n"
+					  "    controls display of message context fields [never, errors, always]\n"));
+	fprintf(output, _("  SINGLELINE\n"
+					  "    if set, end of line terminates SQL commands (same as -S option)\n"));
+	fprintf(output, _("  SINGLESTEP\n"
+					  "    single-step mode (same as -s option)\n"));
+	fprintf(output, _("  SQLSTATE\n"
+					  "    SQLSTATE of last query, or \"00000\" if no error\n"));
+	fprintf(output, _("  USER\n"
+					  "    the currently connected database user\n"));
+	fprintf(output, _("  VERBOSITY\n"
+					  "    controls verbosity of error reports [default, verbose, terse]\n"));
+	fprintf(output, _("  VERSION\n"
+					  "  VERSION_NAME\n"
+					  "  VERSION_NUM\n"
+					  "    psql's version (in verbose string, short string, or numeric format)\n"));
 
 	fprintf(output, _("\nDisplay settings:\n"));
 	fprintf(output, _("Usage:\n"));
 	fprintf(output, _("  psql --pset=NAME[=VALUE]\n  or \\pset NAME [VALUE] inside psql\n\n"));
 
-	fprintf(output, _("  border             border style (number)\n"));
-	fprintf(output, _("  columns            target width for the wrapped format\n"));
-	fprintf(output, _("  expanded (or x)    expanded output [on, off, auto]\n"));
-	fprintf(output, _("  fieldsep           field separator for unaligned output (default \"%s\")\n"), DEFAULT_FIELD_SEP);
-	fprintf(output, _("  fieldsep_zero      set field separator for unaligned output to zero byte\n"));
-	fprintf(output, _("  footer             enable or disable display of the table footer [on, off]\n"));
-	fprintf(output, _("  format             set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
-	fprintf(output, _("  linestyle          set the border line drawing style [ascii, old-ascii, unicode]\n"));
-	fprintf(output, _("  null               set the string to be printed in place of a null value\n"));
-	fprintf(output, _("  numericlocale      enable or disable display of a locale-specific character to separate\n"
-					  "                     groups of digits [on, off]\n"));
-	fprintf(output, _("  pager              control when an external pager is used [yes, no, always]\n"));
-	fprintf(output, _("  recordsep          record (line) separator for unaligned output\n"));
-	fprintf(output, _("  recordsep_zero     set record separator for unaligned output to zero byte\n"));
-	fprintf(output, _("  tableattr (or T)   specify attributes for table tag in html format or proportional\n"
-					  "                     column widths for left-aligned data types in latex-longtable format\n"));
-	fprintf(output, _("  title              set the table title for any subsequently printed tables\n"));
-	fprintf(output, _("  tuples_only        if set, only actual table data is shown\n"));
+	fprintf(output, _("  border\n"
+					  "    border style (number)\n"));
+	fprintf(output, _("  columns\n"
+					  "    target width for the wrapped format\n"));
+	fprintf(output, _("  expanded (or x)\n"
+					  "    expanded output [on, off, auto]\n"));
+	fprintf(output, _("  fieldsep\n"
+					  "    field separator for unaligned output (default \"%s\")\n"),
+			DEFAULT_FIELD_SEP);
+	fprintf(output, _("  fieldsep_zero\n"
+					  "    set field separator for unaligned output to a zero byte\n"));
+	fprintf(output, _("  footer\n"
+					  "    enable or disable display of the table footer [on, off]\n"));
+	fprintf(output, _("  format\n"
+					  "    set output format [unaligned, aligned, wrapped, html, asciidoc, ...]\n"));
+	fprintf(output, _("  linestyle\n"
+					  "    set the border line drawing style [ascii, old-ascii, unicode]\n"));
+	fprintf(output, _("  null\n"
+					  "    set the string to be printed in place of a null value\n"));
+	fprintf(output, _("  numericlocale\n"
+					  "    enable display of a locale-specific character to separate groups of digits\n"));
+	fprintf(output, _("  pager\n"
+					  "    control when an external pager is used [yes, no, always]\n"));
+	fprintf(output, _("  recordsep\n"
+					  "    record (line) separator for unaligned output\n"));
+	fprintf(output, _("  recordsep_zero\n"
+					  "    set record separator for unaligned output to a zero byte\n"));
+	fprintf(output, _("  tableattr (or T)\n"
+					  "    specify attributes for table tag in html format, or proportional\n"
+					  "    column widths for left-aligned data types in latex-longtable format\n"));
+	fprintf(output, _("  title\n"
+					  "    set the table title for subsequently printed tables\n"));
+	fprintf(output, _("  tuples_only\n"
+					  "    if set, only actual table data is shown\n"));
 	fprintf(output, _("  unicode_border_linestyle\n"
 					  "  unicode_column_linestyle\n"
 					  "  unicode_header_linestyle\n"
-					  "                     set the style of Unicode line drawing [single, double]\n"));
+					  "    set the style of Unicode line drawing [single, double]\n"));
 
 	fprintf(output, _("\nEnvironment variables:\n"));
 	fprintf(output, _("Usage:\n"));
@@ -410,23 +467,36 @@ helpVariables(unsigned short int pager)
 	fprintf(output, _("  set NAME=VALUE\n  psql ...\n  or \\setenv NAME [VALUE] inside psql\n\n"));
 #endif
 
-	fprintf(output, _("  COLUMNS            number of columns for wrapped format\n"));
-	fprintf(output, _("  PAGER              name of external pager program\n"));
-	fprintf(output, _("  PGAPPNAME          same as the application_name connection parameter\n"));
-	fprintf(output, _("  PGDATABASE         same as the dbname connection parameter\n"));
-	fprintf(output, _("  PGHOST             same as the host connection parameter\n"));
-	fprintf(output, _("  PGPASSWORD         connection password (not recommended)\n"));
-	fprintf(output, _("  PGPASSFILE         password file name\n"));
-	fprintf(output, _("  PGPORT             same as the port connection parameter\n"));
-	fprintf(output, _("  PGUSER             same as the user connection parameter\n"));
+	fprintf(output, _("  COLUMNS\n"
+					  "    number of columns for wrapped format\n"));
+	fprintf(output, _("  PGAPPNAME\n"
+					  "    same as the application_name connection parameter\n"));
+	fprintf(output, _("  PGDATABASE\n"
+					  "    same as the dbname connection parameter\n"));
+	fprintf(output, _("  PGHOST\n"
+					  "    same as the host connection parameter\n"));
+	fprintf(output, _("  PGPASSWORD\n"
+					  "    connection password (not recommended)\n"));
+	fprintf(output, _("  PGPASSFILE\n"
+					  "    password file name\n"));
+	fprintf(output, _("  PGPORT\n"
+					  "    same as the port connection parameter\n"));
+	fprintf(output, _("  PGUSER\n"
+					  "    same as the user connection parameter\n"));
 	fprintf(output, _("  PSQL_EDITOR, EDITOR, VISUAL\n"
-					  "                     editor used by the \\e, \\ef, and \\ev commands\n"));
+					  "    editor used by the \\e, \\ef, and \\ev commands\n"));
 	fprintf(output, _("  PSQL_EDITOR_LINENUMBER_ARG\n"
-					  "                     how to specify a line number when invoking the editor\n"));
-	fprintf(output, _("  PSQL_HISTORY       alternative location for the command history file\n"));
-	fprintf(output, _("  PSQLRC             alternative location for the user's .psqlrc file\n"));
-	fprintf(output, _("  SHELL              shell used by the \\! command\n"));
-	fprintf(output, _("  TMPDIR             directory for temporary files\n"));
+					  "    how to specify a line number when invoking the editor\n"));
+	fprintf(output, _("  PSQL_HISTORY\n"
+					  "    alternative location for the command history file\n"));
+	fprintf(output, _("  PSQL_PAGER, PAGER\n"
+					  "    name of external pager program\n"));
+	fprintf(output, _("  PSQLRC\n"
+					  "    alternative location for the user's .psqlrc file\n"));
+	fprintf(output, _("  SHELL\n"
+					  "    shell used by the \\! command\n"));
+	fprintf(output, _("  TMPDIR\n"
+					  "    directory for temporary files\n"));
 
 	ClosePager(output);
 }
@@ -583,7 +653,7 @@ print_copyright(void)
 	puts(
 		 "PostgreSQL Database Management System\n"
 		 "(formerly known as Postgres, then as Postgres95)\n\n"
-		 "Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group\n\n"
+		 "Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group\n\n"
 		 "Portions Copyright (c) 1994, The Regents of the University of California\n\n"
 		 "Permission to use, copy, modify, and distribute this software and its\n"
 		 "documentation for any purpose, without fee, and without a written agreement\n"
diff --git a/src/bin/psql/help.h b/src/bin/psql/help.h
index 3ef4094476..7a292497e7 100644
--- a/src/bin/psql/help.h
+++ b/src/bin/psql/help.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/help.h
  */
diff --git a/src/bin/psql/input.c b/src/bin/psql/input.c
index 62f5f77383..8e32cd0b33 100644
--- a/src/bin/psql/input.c
+++ b/src/bin/psql/input.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/input.c
  */
diff --git a/src/bin/psql/input.h b/src/bin/psql/input.h
index 35886dae22..6c2ff61540 100644
--- a/src/bin/psql/input.h
+++ b/src/bin/psql/input.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/input.h
  */
diff --git a/src/bin/psql/large_obj.c b/src/bin/psql/large_obj.c
index 2a3416b369..7faf5591b3 100644
--- a/src/bin/psql/large_obj.c
+++ b/src/bin/psql/large_obj.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/large_obj.c
  */
@@ -48,7 +48,7 @@ print_lo_result(const char *fmt,...)
  * Prepare to do a large-object operation.  We *must* be inside a transaction
  * block for all these operations, so start one if needed.
  *
- * Returns TRUE if okay, FALSE if failed.  *own_transaction is set to indicate
+ * Returns true if okay, false if failed.  *own_transaction is set to indicate
  * if we started our own transaction or not.
  */
 static bool
diff --git a/src/bin/psql/large_obj.h b/src/bin/psql/large_obj.h
index 5750b5d9cc..e749a824c5 100644
--- a/src/bin/psql/large_obj.h
+++ b/src/bin/psql/large_obj.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/large_obj.h
  */
diff --git a/src/bin/psql/mainloop.c b/src/bin/psql/mainloop.c
index 0162ee8d2f..c06ce3ca09 100644
--- a/src/bin/psql/mainloop.c
+++ b/src/bin/psql/mainloop.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/mainloop.c
  */
@@ -216,21 +216,133 @@ MainLoop(FILE *source)
 			continue;
 		}
 
-		/* A request for help? Be friendly and give them some guidance */
-		if (pset.cur_cmd_interactive && query_buf->len == 0 &&
-			pg_strncasecmp(line, "help", 4) == 0 &&
-			(line[4] == '\0' || line[4] == ';' || isspace((unsigned char) line[4])))
+		/* Recognize "help", "quit", "exit" only in interactive mode */
+		if (pset.cur_cmd_interactive)
 		{
-			free(line);
-			puts(_("You are using psql, the command-line interface to PostgreSQL."));
-			printf(_("Type:  \\copyright for distribution terms\n"
-					 "       \\h for help with SQL commands\n"
-					 "       \\? for help with psql commands\n"
-					 "       \\g or terminate with semicolon to execute query\n"
-					 "       \\q to quit\n"));
+			char	   *first_word = line;
+			char	   *rest_of_line = NULL;
+			bool		found_help = false;
+			bool		found_exit_or_quit = false;
+			bool		found_q = false;
+
+			/* Search for the words we recognize;  must be first word */
+			if (pg_strncasecmp(first_word, "help", 4) == 0)
+			{
+				rest_of_line = first_word + 4;
+				found_help = true;
+			}
+			else if (pg_strncasecmp(first_word, "exit", 4) == 0 ||
+					 pg_strncasecmp(first_word, "quit", 4) == 0)
+			{
+				rest_of_line = first_word + 4;
+				found_exit_or_quit = true;
+			}
 
-			fflush(stdout);
-			continue;
+			else if (strncmp(first_word, "\\q", 2) == 0)
+			{
+				rest_of_line = first_word + 2;
+				found_q = true;
+			}
+
+			/*
+			 * If we found a command word, check whether the rest of the line
+			 * contains only whitespace plus maybe one semicolon.  If not,
+			 * ignore the command word after all.  These commands are only
+			 * for compatibility with other SQL clients and are not
+			 * documented.
+			 */
+			if (rest_of_line != NULL)
+			{
+				/*
+				 * Ignore unless rest of line is whitespace, plus maybe one
+				 * semicolon
+				 */
+				while (isspace((unsigned char) *rest_of_line))
+					++rest_of_line;
+				if (*rest_of_line == ';')
+					++rest_of_line;
+				while (isspace((unsigned char) *rest_of_line))
+					++rest_of_line;
+				if (*rest_of_line != '\0')
+				{
+					found_help = false;
+					found_exit_or_quit = false;
+				}
+			}
+
+			/*
+			 * "help" is only a command when the query buffer is empty, but we
+			 * emit a one-line message even when it isn't to help confused
+			 * users.  The text is still added to the query buffer in that
+			 * case.
+			 */
+			if (found_help)
+			{
+				if (query_buf->len != 0)
+#ifndef WIN32
+					puts(_("Use \\? for help or press control-C to clear the input buffer."));
+#else
+					puts(_("Use \\? for help."));
+#endif
+				else
+				{
+					puts(_("You are using psql, the command-line interface to PostgreSQL."));
+					printf(_("Type:  \\copyright for distribution terms\n"
+							 "       \\h for help with SQL commands\n"
+							 "       \\? for help with psql commands\n"
+							 "       \\g or terminate with semicolon to execute query\n"
+							 "       \\q to quit\n"));
+					free(line);
+					fflush(stdout);
+					continue;
+				}
+			}
+
+			/*
+			 * "quit" and "exit" are only commands when the query buffer is
+			 * empty, but we emit a one-line message even when it isn't to
+			 * help confused users.  The text is still added to the query
+			 * buffer in that case.
+			 */
+			if (found_exit_or_quit)
+			{
+				if (query_buf->len != 0)
+				{
+					if (prompt_status == PROMPT_READY ||
+						prompt_status == PROMPT_CONTINUE ||
+						prompt_status == PROMPT_PAREN)
+						puts(_("Use \\q to quit."));
+					else
+#ifndef WIN32
+						puts(_("Use control-D to quit."));
+#else
+						puts(_("Use control-C to quit."));
+#endif
+				}
+				else
+				{
+					/* exit app */
+					free(line);
+					fflush(stdout);
+					successResult = EXIT_SUCCESS;
+					break;
+				}
+			}
+
+			/*
+			 * If they typed "\q" in a place where "\q" is not active,
+			 * supply a hint.  The text is still added to the query
+			 * buffer.
+			 */
+			if (found_q && query_buf->len != 0 &&
+				prompt_status != PROMPT_READY &&
+				prompt_status != PROMPT_CONTINUE &&
+				prompt_status != PROMPT_PAREN)
+#ifndef WIN32
+					puts(_("Use control-D to quit."));
+#else
+					puts(_("Use control-C to quit."));
+#endif
 		}
 
 		/* echo back if flag is set, unless interactive */
@@ -456,14 +568,19 @@ MainLoop(FILE *source)
 	}							/* while !endoffile/session */
 
 	/*
-	 * Process query at the end of file without a semicolon
+	 * If we have a non-semicolon-terminated query at the end of file, we
+	 * process it unless the input source is interactive --- in that case it
+	 * seems better to go ahead and quit.  Also skip if this is an error exit.
 	 */
 	if (query_buf->len > 0 && !pset.cur_cmd_interactive &&
 		successResult == EXIT_SUCCESS)
 	{
 		/* save query in history */
+		/* currently unneeded since we don't use this block if interactive */
+#ifdef NOT_USED
 		if (pset.cur_cmd_interactive)
 			pg_send_history(history_buf);
+#endif
 
 		/* execute query unless we're in an inactive \if branch */
 		if (conditional_active(cond_stack))
diff --git a/src/bin/psql/mainloop.h b/src/bin/psql/mainloop.h
index 8ef8cc1bd6..6cd90f03b8 100644
--- a/src/bin/psql/mainloop.h
+++ b/src/bin/psql/mainloop.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/mainloop.h
  */
diff --git a/src/bin/psql/prompt.c b/src/bin/psql/prompt.c
index 913b23e4cd..b176972884 100644
--- a/src/bin/psql/prompt.c
+++ b/src/bin/psql/prompt.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/prompt.c
  */
diff --git a/src/bin/psql/prompt.h b/src/bin/psql/prompt.h
index a7a95effb4..2354b8f8c7 100644
--- a/src/bin/psql/prompt.h
+++ b/src/bin/psql/prompt.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/prompt.h
  */
diff --git a/src/bin/psql/psqlscanslash.h b/src/bin/psql/psqlscanslash.h
index db76061332..8e8efb2f0b 100644
--- a/src/bin/psql/psqlscanslash.h
+++ b/src/bin/psql/psqlscanslash.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/psqlscanslash.h
  */
diff --git a/src/bin/psql/psqlscanslash.l b/src/bin/psql/psqlscanslash.l
index db7a1b9eea..5e0bd0e774 100644
--- a/src/bin/psql/psqlscanslash.l
+++ b/src/bin/psql/psqlscanslash.l
@@ -8,7 +8,7 @@
  *
  * See fe_utils/psqlscan_int.h for additional commentary.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -67,6 +67,8 @@ static void evaluate_backtick(PsqlScanState state);
 extern int	slash_yyget_column(yyscan_t yyscanner);
 extern void slash_yyset_column(int column_no, yyscan_t yyscanner);
 
+/* LCOV_EXCL_START */
+
 %}
 
 /* Except for the prefix, these options should match psqlscan.l */
@@ -281,6 +283,10 @@ other			.
 					unquoted_option_chars = 0;
 				}
 
+:\{\?{variable_char}+\}	{
+					psqlscan_test_variable(cur_state, yytext, yyleng);
+				}
+
 :'{variable_char}*	{
 					/* Throw back everything but the colon */
 					yyless(1);
@@ -295,6 +301,20 @@ other			.
 					ECHO;
 				}
 
+:\{\?{variable_char}*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					unquoted_option_chars++;
+					ECHO;
+				}
+
+:\{		{
+					/* Throw back everything but the colon */
+					yyless(1);
+					unquoted_option_chars++;
+					ECHO;
+				}
+
 {other}			{
 					unquoted_option_chars++;
 					ECHO;
@@ -450,6 +470,8 @@ other			.
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 /*
  * Scan the command name of a psql backslash command.  This should be called
  * after psql_scan() returns PSCAN_BACKSLASH.  It is assumed that the input
diff --git a/src/bin/psql/settings.h b/src/bin/psql/settings.h
index b78f151acd..69e617e6b5 100644
--- a/src/bin/psql/settings.h
+++ b/src/bin/psql/settings.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/settings.h
  */
@@ -93,7 +93,8 @@ typedef struct _psqlSettings
 	char	   *gfname;			/* one-shot file output argument for \g */
 	bool		g_expanded;		/* one-shot expanded output requested via \gx */
 	char	   *gset_prefix;	/* one-shot prefix argument for \gset */
-	bool		gexec_flag;		/* one-shot flag to execute query's results */
+	bool		gdesc_flag;		/* one-shot request to describe query results */
+	bool		gexec_flag;		/* one-shot request to execute query results */
 	bool		crosstab_flag;	/* one-shot request to crosstab results */
 	char	   *ctv_args[4];	/* \crosstabview arguments */
 
diff --git a/src/bin/psql/startup.c b/src/bin/psql/startup.c
index 7f767976a5..be57574cd3 100644
--- a/src/bin/psql/startup.c
+++ b/src/bin/psql/startup.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/startup.c
  */
@@ -101,7 +101,6 @@ main(int argc, char *argv[])
 	int			successResult;
 	bool		have_password = false;
 	char		password[100];
-	char	   *password_prompt = NULL;
 	bool		new_pass;
 
 	set_pglocale_pgservice(argv[0], PG_TEXTDOMAIN("psql"));
@@ -160,7 +159,14 @@ main(int argc, char *argv[])
 
 	EstablishVariableSpace();
 
+	/* Create variables showing psql version number */
 	SetVariable(pset.vars, "VERSION", PG_VERSION_STR);
+	SetVariable(pset.vars, "VERSION_NAME", PG_VERSION);
+	SetVariable(pset.vars, "VERSION_NUM", CppAsString2(PG_VERSION_NUM));
+
+	/* Initialize variables for last error */
+	SetVariable(pset.vars, "LAST_ERROR_MESSAGE", "");
+	SetVariable(pset.vars, "LAST_ERROR_SQLSTATE", "00000");
 
 	/* Default values for variables (that don't match the result of \unset) */
 	SetVariableBool(pset.vars, "AUTOCOMMIT");
@@ -198,15 +204,14 @@ main(int argc, char *argv[])
 		pset.popt.topt.recordSep.separator_zero = false;
 	}
 
-	if (options.username == NULL)
-		password_prompt = pg_strdup(_("Password: "));
-	else
-		password_prompt = psprintf(_("Password for user %s: "),
-								   options.username);
-
 	if (pset.getPassword == TRI_YES)
 	{
-		simple_prompt(password_prompt, password, sizeof(password), false);
+		/*
+		 * We can't be sure yet of the username that will be used, so don't
+		 * offer a potentially wrong one.  Typical uses of this option are
+		 * noninteractive anyway.
+		 */
+		simple_prompt("Password: ", password, sizeof(password), false);
 		have_password = true;
 	}
 
@@ -245,15 +250,28 @@ main(int argc, char *argv[])
 			!have_password &&
 			pset.getPassword != TRI_NO)
 		{
+			/*
+			 * Before closing the old PGconn, extract the user name that was
+			 * actually connected with --- it might've come out of a URI or
+			 * connstring "database name" rather than options.username.
+			 */
+			const char *realusername = PQuser(pset.db);
+			char	   *password_prompt;
+
+			if (realusername && realusername[0])
+				password_prompt = psprintf(_("Password for user %s: "),
+										   realusername);
+			else
+				password_prompt = pg_strdup(_("Password: "));
 			PQfinish(pset.db);
+
 			simple_prompt(password_prompt, password, sizeof(password), false);
+			free(password_prompt);
 			have_password = true;
 			new_pass = true;
 		}
 	} while (new_pass);
 
-	free(password_prompt);
-
 	if (PQstatus(pset.db) == CONNECTION_BAD)
 	{
 		fprintf(stderr, "%s: %s", pset.progname, PQerrorMessage(pset.db));
diff --git a/src/bin/psql/stringutils.c b/src/bin/psql/stringutils.c
index 959381d085..29b9c9c7f0 100644
--- a/src/bin/psql/stringutils.c
+++ b/src/bin/psql/stringutils.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/stringutils.c
  */
@@ -27,8 +27,8 @@
  * delim -		set of non-whitespace separator characters (or NULL)
  * quote -		set of characters that can quote a token (NULL if none)
  * escape -		character that can quote quotes (0 if none)
- * e_strings -	if TRUE, treat E'...' syntax as a valid token
- * del_quotes - if TRUE, strip quotes from the returned token, else return
+ * e_strings -	if true, treat E'...' syntax as a valid token
+ * del_quotes - if true, strip quotes from the returned token, else return
  *				it exactly as found in the string
  * encoding -	the active character-set encoding
  *
@@ -39,7 +39,7 @@
  * a single quote character in the data.  If escape isn't 0, then escape
  * followed by anything (except \0) is a data character too.
  *
- * The combination of e_strings and del_quotes both TRUE is not currently
+ * The combination of e_strings and del_quotes both true is not currently
  * handled.  This could be fixed but it's not needed anywhere at the moment.
  *
  * Note that the string s is _not_ overwritten in this implementation.
diff --git a/src/bin/psql/stringutils.h b/src/bin/psql/stringutils.h
index 213473f919..d843d7119b 100644
--- a/src/bin/psql/stringutils.h
+++ b/src/bin/psql/stringutils.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/stringutils.h
  */
diff --git a/src/bin/psql/tab-complete.c b/src/bin/psql/tab-complete.c
index 1583cfa998..8bc4a194a5 100644
--- a/src/bin/psql/tab-complete.c
+++ b/src/bin/psql/tab-complete.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/tab-complete.c
  */
@@ -397,7 +397,7 @@ static const SchemaQuery Query_for_list_of_functions = {
 	/* catname */
 	"pg_catalog.pg_proc p",
 	/* selcondition */
-	NULL,
+	"p.prorettype <> 0",
 	/* viscondition */
 	"pg_catalog.pg_function_is_visible(p.oid)",
 	/* namespace */
@@ -412,7 +412,8 @@ static const SchemaQuery Query_for_list_of_indexes = {
 	/* catname */
 	"pg_catalog.pg_class c",
 	/* selcondition */
-	"c.relkind IN (" CppAsString2(RELKIND_INDEX) ")",
+	"c.relkind IN (" CppAsString2(RELKIND_INDEX) ", "
+	CppAsString2(RELKIND_PARTITIONED_INDEX) ")",
 	/* viscondition */
 	"pg_catalog.pg_table_is_visible(c.oid)",
 	/* namespace */
@@ -423,6 +424,36 @@ static const SchemaQuery Query_for_list_of_indexes = {
 	NULL
 };
 
+static const SchemaQuery Query_for_list_of_procedures = {
+	/* catname */
+	"pg_catalog.pg_proc p",
+	/* selcondition */
+	"p.prorettype = 0",
+	/* viscondition */
+	"pg_catalog.pg_function_is_visible(p.oid)",
+	/* namespace */
+	"p.pronamespace",
+	/* result */
+	"pg_catalog.quote_ident(p.proname)",
+	/* qualresult */
+	NULL
+};
+
+static const SchemaQuery Query_for_list_of_routines = {
+	/* catname */
+	"pg_catalog.pg_proc p",
+	/* selcondition */
+	NULL,
+	/* viscondition */
+	"pg_catalog.pg_function_is_visible(p.oid)",
+	/* namespace */
+	"p.pronamespace",
+	/* result */
+	"pg_catalog.quote_ident(p.proname)",
+	/* qualresult */
+	NULL
+};
+
 static const SchemaQuery Query_for_list_of_sequences = {
 	/* catname */
 	"pg_catalog.pg_class c",
@@ -570,6 +601,23 @@ static const SchemaQuery Query_for_list_of_tmf = {
 	NULL
 };
 
+static const SchemaQuery Query_for_list_of_tpm = {
+	/* catname */
+	"pg_catalog.pg_class c",
+	/* selcondition */
+	"c.relkind IN (" CppAsString2(RELKIND_RELATION) ", "
+	CppAsString2(RELKIND_PARTITIONED_TABLE) ", "
+	CppAsString2(RELKIND_MATVIEW) ")",
+	/* viscondition */
+	"pg_catalog.pg_table_is_visible(c.oid)",
+	/* namespace */
+	"c.relnamespace",
+	/* result */
+	"pg_catalog.quote_ident(c.relname)",
+	/* qualresult */
+	NULL
+};
+
 static const SchemaQuery Query_for_list_of_tm = {
 	/* catname */
 	"pg_catalog.pg_class c",
@@ -1032,8 +1080,10 @@ static const pgsql_thing_t words_after_create[] = {
 	{"OWNED", NULL, NULL, THING_NO_CREATE | THING_NO_ALTER},	/* for DROP OWNED BY ... */
 	{"PARSER", Query_for_list_of_ts_parsers, NULL, THING_NO_SHOW},
 	{"POLICY", NULL, NULL},
+	{"PROCEDURE", NULL, &Query_for_list_of_procedures},
 	{"PUBLICATION", Query_for_list_of_publications},
 	{"ROLE", Query_for_list_of_roles},
+	{"ROUTINE", NULL, &Query_for_list_of_routines, THING_NO_CREATE},
 	{"RULE", "SELECT pg_catalog.quote_ident(rulename) FROM pg_catalog.pg_rules WHERE substring(pg_catalog.quote_ident(rulename),1,%d)='%s'"},
 	{"SCHEMA", Query_for_list_of_schemas},
 	{"SEQUENCE", NULL, &Query_for_list_of_sequences},
@@ -1407,7 +1457,7 @@ psql_completion(const char *text, int start, int end)
 
 	/* Known command-starting keywords. */
 	static const char *const sql_commands[] = {
-		"ABORT", "ALTER", "ANALYZE", "BEGIN", "CHECKPOINT", "CLOSE", "CLUSTER",
+		"ABORT", "ALTER", "ANALYZE", "BEGIN", "CALL", "CHECKPOINT", "CLOSE", "CLUSTER",
 		"COMMENT", "COMMIT", "COPY", "CREATE", "DEALLOCATE", "DECLARE",
 		"DELETE FROM", "DISCARD", "DO", "DROP", "END", "EXECUTE", "EXPLAIN",
 		"FETCH", "GRANT", "IMPORT", "INSERT", "LISTEN", "LOAD", "LOCK",
@@ -1433,7 +1483,7 @@ psql_completion(const char *text, int start, int end)
 		"\\e", "\\echo", "\\ef", "\\elif", "\\else", "\\encoding",
 		"\\endif", "\\errverbose", "\\ev",
 		"\\f",
-		"\\g", "\\gexec", "\\gset", "\\gx",
+		"\\g", "\\gdesc", "\\gexec", "\\gset", "\\gx",
 		"\\h", "\\help", "\\H",
 		"\\i", "\\if", "\\ir",
 		"\\l", "\\lo_import", "\\lo_export", "\\lo_list", "\\lo_unlink",
@@ -1520,11 +1570,11 @@ psql_completion(const char *text, int start, int end)
 	/* ALTER TABLE,INDEX,MATERIALIZED VIEW ALL IN TABLESPACE xxx OWNED BY xxx */
 	else if (TailMatches7("ALL", "IN", "TABLESPACE", MatchAny, "OWNED", "BY", MatchAny))
 		COMPLETE_WITH_CONST("SET TABLESPACE");
-	/* ALTER AGGREGATE,FUNCTION <name> */
-	else if (Matches3("ALTER", "AGGREGATE|FUNCTION", MatchAny))
+	/* ALTER AGGREGATE,FUNCTION,PROCEDURE,ROUTINE <name> */
+	else if (Matches3("ALTER", "AGGREGATE|FUNCTION|PROCEDURE|ROUTINE", MatchAny))
 		COMPLETE_WITH_CONST("(");
-	/* ALTER AGGREGATE,FUNCTION <name> (...) */
-	else if (Matches4("ALTER", "AGGREGATE|FUNCTION", MatchAny, MatchAny))
+	/* ALTER AGGREGATE,FUNCTION,PROCEDURE,ROUTINE <name> (...) */
+	else if (Matches4("ALTER", "AGGREGATE|FUNCTION|PROCEDURE|ROUTINE", MatchAny, MatchAny))
 	{
 		if (ends_with(prev_wd, ')'))
 			COMPLETE_WITH_LIST3("OWNER TO", "RENAME TO", "SET SCHEMA");
@@ -1644,7 +1694,15 @@ psql_completion(const char *text, int start, int end)
 								   "UNION SELECT 'ALL IN TABLESPACE'");
 	/* ALTER INDEX <name> */
 	else if (Matches3("ALTER", "INDEX", MatchAny))
-		COMPLETE_WITH_LIST4("OWNER TO", "RENAME TO", "SET", "RESET");
+		COMPLETE_WITH_LIST6("ALTER COLUMN", "OWNER TO", "RENAME TO", "SET",
+							"RESET", "ATTACH PARTITION");
+	else if (Matches4("ALTER", "INDEX", MatchAny, "ATTACH"))
+		COMPLETE_WITH_CONST("PARTITION");
+	else if (Matches5("ALTER", "INDEX", MatchAny, "ATTACH", "PARTITION"))
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes, NULL);
+	/* ALTER INDEX <name> ALTER COLUMN <colnum> */
+	else if (Matches6("ALTER", "INDEX", MatchAny, "ALTER", "COLUMN", MatchAny))
+		COMPLETE_WITH_CONST("SET STATISTICS");
 	/* ALTER INDEX <name> SET */
 	else if (Matches4("ALTER", "INDEX", MatchAny, "SET"))
 		COMPLETE_WITH_LIST2("(", "TABLESPACE");
@@ -2050,9 +2108,9 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tables, "");
 	/* Limited completion support for partition bound specification */
 	else if (TailMatches3("ATTACH", "PARTITION", MatchAny))
-		COMPLETE_WITH_CONST("FOR VALUES");
+		COMPLETE_WITH_LIST2("FOR VALUES", "DEFAULT");
 	else if (TailMatches2("FOR", "VALUES"))
-		COMPLETE_WITH_LIST2("FROM (", "IN (");
+		COMPLETE_WITH_LIST3("FROM (", "IN (", "WITH (");
 
 	/*
 	 * If we have ALTER TABLE <foo> DETACH PARTITION, provide a list of
@@ -2142,6 +2200,11 @@ psql_completion(const char *text, int start, int end)
 /* ROLLBACK */
 	else if (Matches1("ROLLBACK"))
 		COMPLETE_WITH_LIST4("WORK", "TRANSACTION", "TO SAVEPOINT", "PREPARED");
+/* CALL */
+	else if (Matches1("CALL"))
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_procedures, NULL);
+	else if (Matches2("CALL", MatchAny))
+		COMPLETE_WITH_CONST("(");
 /* CLUSTER */
 	else if (Matches1("CLUSTER"))
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, "UNION SELECT 'VERBOSE'");
@@ -2173,6 +2236,7 @@ psql_completion(const char *text, int start, int end)
 			"SERVER", "INDEX", "LANGUAGE", "POLICY", "PUBLICATION", "RULE",
 			"SCHEMA", "SEQUENCE", "STATISTICS", "SUBSCRIPTION",
 			"TABLE", "TYPE", "VIEW", "MATERIALIZED VIEW", "COLUMN", "AGGREGATE", "FUNCTION",
+			"PROCEDURE", "ROUTINE",
 			"OPERATOR", "TRIGGER", "CONSTRAINT", "DOMAIN", "LARGE OBJECT",
 		"TABLESPACE", "TEXT SEARCH", "ROLE", NULL};
 
@@ -2297,10 +2361,13 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_indexes,
 								   " UNION SELECT 'ON'"
 								   " UNION SELECT 'CONCURRENTLY'");
-	/* Complete ... INDEX|CONCURRENTLY [<name>] ON with a list of tables  */
+	/*
+	 * Complete ... INDEX|CONCURRENTLY [<name>] ON with a list of relations
+	 * that can indexes can be created on
+	 */
 	else if (TailMatches3("INDEX|CONCURRENTLY", MatchAny, "ON") ||
 			 TailMatches2("INDEX|CONCURRENTLY", "ON"))
-		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tm, NULL);
+		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tpm, NULL);
 
 	/*
 	 * Complete CREATE|UNIQUE INDEX CONCURRENTLY with "ON" and existing
@@ -2489,7 +2556,7 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_partitioned_tables, "");
 	/* Limited completion support for partition bound specification */
 	else if (TailMatches3("PARTITION", "OF", MatchAny))
-		COMPLETE_WITH_CONST("FOR VALUES");
+		COMPLETE_WITH_LIST2("FOR VALUES", "DEFAULT");
 
 /* CREATE TABLESPACE */
 	else if (Matches3("CREATE", "TABLESPACE", MatchAny))
@@ -2682,7 +2749,7 @@ psql_completion(const char *text, int start, int end)
 					  "COLLATION|CONVERSION|DOMAIN|EXTENSION|LANGUAGE|PUBLICATION|SCHEMA|SEQUENCE|SERVER|SUBSCRIPTION|STATISTICS|TABLE|TYPE|VIEW",
 					  MatchAny) ||
 			 Matches4("DROP", "ACCESS", "METHOD", MatchAny) ||
-			 (Matches4("DROP", "AGGREGATE|FUNCTION", MatchAny, MatchAny) &&
+			 (Matches4("DROP", "AGGREGATE|FUNCTION|PROCEDURE|ROUTINE", MatchAny, MatchAny) &&
 			  ends_with(prev_wd, ')')) ||
 			 Matches4("DROP", "EVENT", "TRIGGER", MatchAny) ||
 			 Matches5("DROP", "FOREIGN", "DATA", "WRAPPER", MatchAny) ||
@@ -2691,9 +2758,9 @@ psql_completion(const char *text, int start, int end)
 		COMPLETE_WITH_LIST2("CASCADE", "RESTRICT");
 
 	/* help completing some of the variants */
-	else if (Matches3("DROP", "AGGREGATE|FUNCTION", MatchAny))
+	else if (Matches3("DROP", "AGGREGATE|FUNCTION|PROCEDURE|ROUTINE", MatchAny))
 		COMPLETE_WITH_CONST("(");
-	else if (Matches4("DROP", "AGGREGATE|FUNCTION", MatchAny, "("))
+	else if (Matches4("DROP", "AGGREGATE|FUNCTION|PROCEDURE|ROUTINE", MatchAny, "("))
 		COMPLETE_WITH_FUNCTION_ARG(prev2_wd);
 	else if (Matches2("DROP", "FOREIGN"))
 		COMPLETE_WITH_LIST2("DATA WRAPPER", "TABLE");
@@ -2890,10 +2957,12 @@ psql_completion(const char *text, int start, int end)
 		 * objects supported.
 		 */
 		if (HeadMatches3("ALTER", "DEFAULT", "PRIVILEGES"))
-			COMPLETE_WITH_LIST5("TABLES", "SEQUENCES", "FUNCTIONS", "TYPES", "SCHEMAS");
+			COMPLETE_WITH_LIST7("TABLES", "SEQUENCES", "FUNCTIONS", "PROCEDURES", "ROUTINES", "TYPES", "SCHEMAS");
 		else
 			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_tsvmf,
 									   " UNION SELECT 'ALL FUNCTIONS IN SCHEMA'"
+									   " UNION SELECT 'ALL PROCEDURES IN SCHEMA'"
+									   " UNION SELECT 'ALL ROUTINES IN SCHEMA'"
 									   " UNION SELECT 'ALL SEQUENCES IN SCHEMA'"
 									   " UNION SELECT 'ALL TABLES IN SCHEMA'"
 									   " UNION SELECT 'DATABASE'"
@@ -2903,6 +2972,8 @@ psql_completion(const char *text, int start, int end)
 									   " UNION SELECT 'FUNCTION'"
 									   " UNION SELECT 'LANGUAGE'"
 									   " UNION SELECT 'LARGE OBJECT'"
+									   " UNION SELECT 'PROCEDURE'"
+									   " UNION SELECT 'ROUTINE'"
 									   " UNION SELECT 'SCHEMA'"
 									   " UNION SELECT 'SEQUENCE'"
 									   " UNION SELECT 'TABLE'"
@@ -2910,7 +2981,10 @@ psql_completion(const char *text, int start, int end)
 									   " UNION SELECT 'TYPE'");
 	}
 	else if (TailMatches4("GRANT|REVOKE", MatchAny, "ON", "ALL"))
-		COMPLETE_WITH_LIST3("FUNCTIONS IN SCHEMA", "SEQUENCES IN SCHEMA",
+		COMPLETE_WITH_LIST5("FUNCTIONS IN SCHEMA",
+							"PROCEDURES IN SCHEMA",
+							"ROUTINES IN SCHEMA",
+							"SEQUENCES IN SCHEMA",
 							"TABLES IN SCHEMA");
 	else if (TailMatches4("GRANT|REVOKE", MatchAny, "ON", "FOREIGN"))
 		COMPLETE_WITH_LIST2("DATA WRAPPER", "SERVER");
@@ -2931,6 +3005,10 @@ psql_completion(const char *text, int start, int end)
 			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_functions, NULL);
 		else if (TailMatches1("LANGUAGE"))
 			COMPLETE_WITH_QUERY(Query_for_list_of_languages);
+		else if (TailMatches1("PROCEDURE"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_procedures, NULL);
+		else if (TailMatches1("ROUTINE"))
+			COMPLETE_WITH_SCHEMA_QUERY(Query_for_list_of_routines, NULL);
 		else if (TailMatches1("SCHEMA"))
 			COMPLETE_WITH_QUERY(Query_for_list_of_schemas);
 		else if (TailMatches1("SEQUENCE"))
@@ -3160,7 +3238,7 @@ psql_completion(const char *text, int start, int end)
 		static const char *const list_SECURITY_LABEL[] =
 		{"TABLE", "COLUMN", "AGGREGATE", "DATABASE", "DOMAIN",
 			"EVENT TRIGGER", "FOREIGN TABLE", "FUNCTION", "LARGE OBJECT",
-			"MATERIALIZED VIEW", "LANGUAGE", "PUBLICATION", "ROLE", "SCHEMA",
+			"MATERIALIZED VIEW", "LANGUAGE", "PUBLICATION", "PROCEDURE", "ROLE", "ROUTINE", "SCHEMA",
 		"SEQUENCE", "SUBSCRIPTION", "TABLESPACE", "TYPE", "VIEW", NULL};
 
 		COMPLETE_WITH_LIST(list_SECURITY_LABEL);
@@ -3230,8 +3308,8 @@ psql_completion(const char *text, int start, int end)
 	/* Complete SET <var> with "TO" */
 	else if (Matches2("SET", MatchAny))
 		COMPLETE_WITH_CONST("TO");
-	/* Complete ALTER DATABASE|FUNCTION|ROLE|USER ... SET <name> */
-	else if (HeadMatches2("ALTER", "DATABASE|FUNCTION|ROLE|USER") &&
+	/* Complete ALTER DATABASE|FUNCTION||PROCEDURE|ROLE|ROUTINE|USER ... SET <name> */
+	else if (HeadMatches2("ALTER", "DATABASE|FUNCTION|PROCEDURE|ROLE|ROUTINE|USER") &&
 			 TailMatches2("SET", MatchAny))
 		COMPLETE_WITH_LIST2("FROM CURRENT", "TO");
 	/* Suggest possible variable values */
diff --git a/src/bin/psql/tab-complete.h b/src/bin/psql/tab-complete.h
index 1a42ef1c66..544318c36d 100644
--- a/src/bin/psql/tab-complete.h
+++ b/src/bin/psql/tab-complete.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/tab-complete.h
  */
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
index 806d39bfbe..f093442644 100644
--- a/src/bin/psql/variables.c
+++ b/src/bin/psql/variables.c
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/bin/psql/variables.c
  */
@@ -136,7 +136,7 @@ ParseVariableBool(const char *value, const char *name, bool *result)
 	{
 		/* string is not recognized; don't clobber *result */
 		if (name)
-			psql_error("unrecognized value \"%s\" for \"%s\": boolean expected\n",
+			psql_error("unrecognized value \"%s\" for \"%s\": Boolean expected\n",
 					   value, name);
 		valid = false;
 	}
@@ -246,10 +246,10 @@ SetVariable(VariableSpace space, const char *name, const char *value)
 			bool		confirmed;
 
 			if (current->substitute_hook)
-				new_value = (*current->substitute_hook) (new_value);
+				new_value = current->substitute_hook(new_value);
 
 			if (current->assign_hook)
-				confirmed = (*current->assign_hook) (new_value);
+				confirmed = current->assign_hook(new_value);
 			else
 				confirmed = true;
 
diff --git a/src/bin/psql/variables.h b/src/bin/psql/variables.h
index 02d85b1bc2..03af11197c 100644
--- a/src/bin/psql/variables.h
+++ b/src/bin/psql/variables.h
@@ -1,7 +1,7 @@
 /*
  * psql - the PostgreSQL interactive terminal
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * This implements a sort of variable repository.  One could also think of it
  * as a cheap version of an associative array.  Each variable has a string
diff --git a/src/bin/scripts/Makefile b/src/bin/scripts/Makefile
index a9c24a9f83..0cc528e965 100644
--- a/src/bin/scripts/Makefile
+++ b/src/bin/scripts/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/bin/scripts
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/bin/scripts/Makefile
diff --git a/src/bin/scripts/clusterdb.c b/src/bin/scripts/clusterdb.c
index a6640aa57b..650d2ae261 100644
--- a/src/bin/scripts/clusterdb.c
+++ b/src/bin/scripts/clusterdb.c
@@ -2,7 +2,7 @@
  *
  * clusterdb
  *
- * Portions Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/bin/scripts/clusterdb.c
  *
@@ -195,17 +195,21 @@ cluster_one_database(const char *dbname, bool verbose, const char *table,
 
 	PGconn	   *conn;
 
+	conn = connectDatabase(dbname, host, port, username, prompt_password,
+						   progname, echo, false, false);
+
 	initPQExpBuffer(&sql);
 
 	appendPQExpBufferStr(&sql, "CLUSTER");
 	if (verbose)
 		appendPQExpBufferStr(&sql, " VERBOSE");
 	if (table)
-		appendPQExpBuffer(&sql, " %s", table);
+	{
+		appendPQExpBufferChar(&sql, ' ');
+		appendQualifiedRelation(&sql, table, conn, progname, echo);
+	}
 	appendPQExpBufferChar(&sql, ';');
 
-	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, false);
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
 	{
 		if (table)
@@ -234,7 +238,7 @@ cluster_all_databases(bool verbose, const char *maintenance_db,
 	int			i;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-									  prompt_password, progname);
+									  prompt_password, progname, echo);
 	result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
 	PQfinish(conn);
 
diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 7394bf293e..db2b9f0d68 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -4,7 +4,7 @@
  *		Common support routines for bin/scripts/
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/common.c
@@ -18,6 +18,8 @@
 #include <unistd.h>
 
 #include "common.h"
+#include "fe_utils/connect.h"
+#include "fe_utils/string_utils.h"
 
 
 static PGcancel *volatile cancelConn = NULL;
@@ -63,9 +65,10 @@ handle_help_version_opts(int argc, char *argv[],
  * as before, else we might create password exposure hazards.)
  */
 PGconn *
-connectDatabase(const char *dbname, const char *pghost, const char *pgport,
-				const char *pguser, enum trivalue prompt_password,
-				const char *progname, bool fail_ok, bool allow_password_reuse)
+connectDatabase(const char *dbname, const char *pghost,
+				const char *pgport, const char *pguser,
+				enum trivalue prompt_password, const char *progname,
+				bool echo, bool fail_ok, bool allow_password_reuse)
 {
 	PGconn	   *conn;
 	bool		new_pass;
@@ -142,6 +145,10 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
 		exit(1);
 	}
 
+	if (PQserverVersion(conn) >= 70300)
+		PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
+							 progname, echo));
+
 	return conn;
 }
 
@@ -149,24 +156,24 @@ connectDatabase(const char *dbname, const char *pghost, const char *pgport,
  * Try to connect to the appropriate maintenance database.
  */
 PGconn *
-connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
-						   const char *pgport, const char *pguser,
-						   enum trivalue prompt_password,
-						   const char *progname)
+connectMaintenanceDatabase(const char *maintenance_db,
+						   const char *pghost, const char *pgport,
+						   const char *pguser, enum trivalue prompt_password,
+						   const char *progname, bool echo)
 {
 	PGconn	   *conn;
 
 	/* If a maintenance database name was specified, just connect to it. */
 	if (maintenance_db)
 		return connectDatabase(maintenance_db, pghost, pgport, pguser,
-							   prompt_password, progname, false, false);
+							   prompt_password, progname, echo, false, false);
 
 	/* Otherwise, try postgres first and then template1. */
 	conn = connectDatabase("postgres", pghost, pgport, pguser, prompt_password,
-						   progname, true, false);
+						   progname, echo, true, false);
 	if (!conn)
 		conn = connectDatabase("template1", pghost, pgport, pguser,
-							   prompt_password, progname, false, false);
+							   prompt_password, progname, echo, false, false);
 
 	return conn;
 }
@@ -252,6 +259,116 @@ executeMaintenanceCommand(PGconn *conn, const char *query, bool echo)
 	return r;
 }
 
+
+/*
+ * Split TABLE[(COLUMNS)] into TABLE and [(COLUMNS)] portions.  When you
+ * finish using them, pg_free(*table).  *columns is a pointer into "spec",
+ * possibly to its NUL terminator.
+ */
+static void
+split_table_columns_spec(const char *spec, int encoding,
+						 char **table, const char **columns)
+{
+	bool		inquotes = false;
+	const char *cp = spec;
+
+	/*
+	 * Find the first '(' not identifier-quoted.  Based on
+	 * dequote_downcase_identifier().
+	 */
+	while (*cp && (*cp != '(' || inquotes))
+	{
+		if (*cp == '"')
+		{
+			if (inquotes && cp[1] == '"')
+				cp++;			/* pair does not affect quoting */
+			else
+				inquotes = !inquotes;
+			cp++;
+		}
+		else
+			cp += PQmblen(cp, encoding);
+	}
+	*table = pg_strdup(spec);
+	(*table)[cp - spec] = '\0'; /* no strndup */
+	*columns = cp;
+}
+
+/*
+ * Break apart TABLE[(COLUMNS)] of "spec".  With the reset_val of search_path
+ * in effect, have regclassin() interpret the TABLE portion.  Append to "buf"
+ * the qualified name of TABLE, followed by any (COLUMNS).  Exit on failure.
+ * We use this to interpret --table=foo under the search path psql would get,
+ * in advance of "ANALYZE public.foo" under the always-secure search path.
+ */
+void
+appendQualifiedRelation(PQExpBuffer buf, const char *spec,
+						PGconn *conn, const char *progname, bool echo)
+{
+	char	   *table;
+	const char *columns;
+	PQExpBufferData sql;
+	PGresult   *res;
+	int			ntups;
+
+	/* Before 7.3, the concept of qualifying a name did not exist. */
+	if (PQserverVersion(conn) < 70300)
+	{
+		appendPQExpBufferStr(&sql, spec);
+		return;
+	}
+
+	split_table_columns_spec(spec, PQclientEncoding(conn), &table, &columns);
+
+	/*
+	 * Query must remain ABSOLUTELY devoid of unqualified names.  This would
+	 * be unnecessary given a regclassin() variant taking a search_path
+	 * argument.
+	 */
+	initPQExpBuffer(&sql);
+	appendPQExpBufferStr(&sql,
+						 "SELECT c.relname, ns.nspname\n"
+						 " FROM pg_catalog.pg_class c,"
+						 " pg_catalog.pg_namespace ns\n"
+						 " WHERE c.relnamespace OPERATOR(pg_catalog.=) ns.oid\n"
+						 "  AND c.oid OPERATOR(pg_catalog.=) ");
+	appendStringLiteralConn(&sql, table, conn);
+	appendPQExpBufferStr(&sql, "::pg_catalog.regclass;");
+
+	executeCommand(conn, "RESET search_path", progname, echo);
+
+	/*
+	 * One row is a typical result, as is a nonexistent relation ERROR.
+	 * regclassin() unconditionally accepts all-digits input as an OID; if no
+	 * relation has that OID; this query returns no rows.  Catalog corruption
+	 * might elicit other row counts.
+	 */
+	res = executeQuery(conn, sql.data, progname, echo);
+	ntups = PQntuples(res);
+	if (ntups != 1)
+	{
+		fprintf(stderr,
+				ngettext("%s: query returned %d row instead of one: %s\n",
+						 "%s: query returned %d rows instead of one: %s\n",
+						 ntups),
+				progname, ntups, sql.data);
+		PQfinish(conn);
+		exit(1);
+	}
+	appendPQExpBufferStr(buf,
+						 fmtQualifiedId(PQserverVersion(conn),
+										PQgetvalue(res, 0, 1),
+										PQgetvalue(res, 0, 0)));
+	appendPQExpBufferStr(buf, columns);
+	PQclear(res);
+	termPQExpBuffer(&sql);
+	pg_free(table);
+
+	PQclear(executeQuery(conn, ALWAYS_SECURE_SEARCH_PATH_SQL,
+						 progname, echo));
+}
+
+
 /*
  * Check yes/no answer in a localized way.  1=yes, 0=no, -1=neither.
  */
diff --git a/src/bin/scripts/common.h b/src/bin/scripts/common.h
index 18d8d12d15..30a39a6247 100644
--- a/src/bin/scripts/common.h
+++ b/src/bin/scripts/common.h
@@ -2,7 +2,7 @@
  *	common.h
  *		Common support routines for bin/scripts/
  *
- *	Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  *	src/bin/scripts/common.h
  */
@@ -32,11 +32,12 @@ extern void handle_help_version_opts(int argc, char *argv[],
 extern PGconn *connectDatabase(const char *dbname, const char *pghost,
 				const char *pgport, const char *pguser,
 				enum trivalue prompt_password, const char *progname,
-				bool fail_ok, bool allow_password_reuse);
+				bool echo, bool fail_ok, bool allow_password_reuse);
 
 extern PGconn *connectMaintenanceDatabase(const char *maintenance_db,
-						   const char *pghost, const char *pgport, const char *pguser,
-						   enum trivalue prompt_password, const char *progname);
+						   const char *pghost, const char *pgport,
+						   const char *pguser, enum trivalue prompt_password,
+						   const char *progname, bool echo);
 
 extern PGresult *executeQuery(PGconn *conn, const char *query,
 			 const char *progname, bool echo);
@@ -47,6 +48,9 @@ extern void executeCommand(PGconn *conn, const char *query,
 extern bool executeMaintenanceCommand(PGconn *conn, const char *query,
 						  bool echo);
 
+extern void appendQualifiedRelation(PQExpBuffer buf, const char *name,
+						PGconn *conn, const char *progname, bool echo);
+
 extern bool yesno_prompt(const char *question);
 
 extern void setup_cancel_handler(void);
diff --git a/src/bin/scripts/createdb.c b/src/bin/scripts/createdb.c
index 88ea401e39..fc108882e4 100644
--- a/src/bin/scripts/createdb.c
+++ b/src/bin/scripts/createdb.c
@@ -2,7 +2,7 @@
  *
  * createdb
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/createdb.c
@@ -202,7 +202,7 @@ main(int argc, char *argv[])
 		maintenance_db = "template1";
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-									  prompt_password, progname);
+									  prompt_password, progname, echo);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/createuser.c b/src/bin/scripts/createuser.c
index 0e36edcc5d..3420e62fdd 100644
--- a/src/bin/scripts/createuser.c
+++ b/src/bin/scripts/createuser.c
@@ -2,7 +2,7 @@
  *
  * createuser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/createuser.c
@@ -252,7 +252,7 @@ main(int argc, char *argv[])
 		login = TRI_YES;
 
 	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false, false);
+						   progname, echo, false, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/dropdb.c b/src/bin/scripts/dropdb.c
index 5dc8558e8e..ba0038891d 100644
--- a/src/bin/scripts/dropdb.c
+++ b/src/bin/scripts/dropdb.c
@@ -2,7 +2,7 @@
  *
  * dropdb
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/dropdb.c
@@ -129,7 +129,8 @@ main(int argc, char *argv[])
 		maintenance_db = "template1";
 
 	conn = connectMaintenanceDatabase(maintenance_db,
-									  host, port, username, prompt_password, progname);
+									  host, port, username, prompt_password,
+									  progname, echo);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/dropuser.c b/src/bin/scripts/dropuser.c
index 095c0a39ff..d9e7f7b036 100644
--- a/src/bin/scripts/dropuser.c
+++ b/src/bin/scripts/dropuser.c
@@ -2,7 +2,7 @@
  *
  * dropuser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/dropuser.c
@@ -134,7 +134,7 @@ main(int argc, char *argv[])
 					  (if_exists ? "IF EXISTS " : ""), fmtId(dropuser));
 
 	conn = connectDatabase("postgres", host, port, username, prompt_password,
-						   progname, false, false);
+						   progname, echo, false, false);
 
 	if (echo)
 		printf("%s\n", sql.data);
diff --git a/src/bin/scripts/pg_isready.c b/src/bin/scripts/pg_isready.c
index c7c06cc6ff..f7ad7b40f0 100644
--- a/src/bin/scripts/pg_isready.c
+++ b/src/bin/scripts/pg_isready.c
@@ -2,7 +2,7 @@
  *
  * pg_isready --- checks the status of the PostgreSQL server
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * src/bin/scripts/pg_isready.c
  *
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index ffd611e7bb..be1c06ebbd 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -2,7 +2,7 @@
  *
  * reindexdb
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/bin/scripts/reindexdb.c
  *
@@ -282,23 +282,24 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
 	PGconn	   *conn;
 
 	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, false);
+						   progname, echo, false, false);
 
 	initPQExpBuffer(&sql);
 
-	appendPQExpBufferStr(&sql, "REINDEX");
+	appendPQExpBufferStr(&sql, "REINDEX ");
 
 	if (verbose)
-		appendPQExpBufferStr(&sql, " (VERBOSE)");
+		appendPQExpBufferStr(&sql, "(VERBOSE) ");
 
-	if (strcmp(type, "TABLE") == 0)
-		appendPQExpBuffer(&sql, " TABLE %s", name);
-	else if (strcmp(type, "INDEX") == 0)
-		appendPQExpBuffer(&sql, " INDEX %s", name);
+	appendPQExpBufferStr(&sql, type);
+	appendPQExpBufferChar(&sql, ' ');
+	if (strcmp(type, "TABLE") == 0 ||
+		strcmp(type, "INDEX") == 0)
+		appendQualifiedRelation(&sql, name, conn, progname, echo);
 	else if (strcmp(type, "SCHEMA") == 0)
-		appendPQExpBuffer(&sql, " SCHEMA %s", name);
+		appendPQExpBufferStr(&sql, name);
 	else if (strcmp(type, "DATABASE") == 0)
-		appendPQExpBuffer(&sql, " DATABASE %s", fmtId(PQdb(conn)));
+		appendPQExpBufferStr(&sql, fmtId(PQdb(conn)));
 	appendPQExpBufferChar(&sql, ';');
 
 	if (!executeMaintenanceCommand(conn, sql.data, echo))
@@ -335,7 +336,7 @@ reindex_all_databases(const char *maintenance_db,
 	int			i;
 
 	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
-									  prompt_password, progname);
+									  prompt_password, progname, echo);
 	result = executeQuery(conn, "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;", progname, echo);
 	PQfinish(conn);
 
@@ -372,7 +373,7 @@ reindex_system_catalogs(const char *dbname, const char *host, const char *port,
 	PQExpBufferData sql;
 
 	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, false);
+						   progname, echo, false, false);
 
 	initPQExpBuffer(&sql);
 
diff --git a/src/bin/scripts/t/010_clusterdb.pl b/src/bin/scripts/t/010_clusterdb.pl
index e2cff0fcab..a767338f92 100644
--- a/src/bin/scripts/t/010_clusterdb.pl
+++ b/src/bin/scripts/t/010_clusterdb.pl
@@ -26,7 +26,7 @@
 );
 $node->issues_sql_like(
 	[ 'clusterdb', '-t', 'test1' ],
-	qr/statement: CLUSTER test1;/,
+	qr/statement: CLUSTER public\.test1;/,
 	'cluster specific table');
 
 $node->command_ok([qw(clusterdb --echo --verbose dbname=template1)],
diff --git a/src/bin/scripts/t/080_pg_isready.pl b/src/bin/scripts/t/080_pg_isready.pl
index d9830b5b3a..d01804da37 100644
--- a/src/bin/scripts/t/080_pg_isready.pl
+++ b/src/bin/scripts/t/080_pg_isready.pl
@@ -15,4 +15,5 @@
 $node->init;
 $node->start;
 
-$node->command_ok(['pg_isready'], 'succeeds with server running');
+# use a long timeout for the benefit of very slow buildfarm machines
+$node->command_ok([qw(pg_isready --timeout=60)], 'succeeds with server running');
diff --git a/src/bin/scripts/t/090_reindexdb.pl b/src/bin/scripts/t/090_reindexdb.pl
index 3aa3a95350..e57a5e2bad 100644
--- a/src/bin/scripts/t/090_reindexdb.pl
+++ b/src/bin/scripts/t/090_reindexdb.pl
@@ -24,11 +24,11 @@
 	'CREATE TABLE test1 (a int); CREATE INDEX test1x ON test1 (a);');
 $node->issues_sql_like(
 	[ 'reindexdb', '-t', 'test1', 'postgres' ],
-	qr/statement: REINDEX TABLE test1;/,
+	qr/statement: REINDEX TABLE public\.test1;/,
 	'reindex specific table');
 $node->issues_sql_like(
 	[ 'reindexdb', '-i', 'test1x', 'postgres' ],
-	qr/statement: REINDEX INDEX test1x;/,
+	qr/statement: REINDEX INDEX public\.test1x;/,
 	'reindex specific index');
 $node->issues_sql_like(
 	[ 'reindexdb', '-S', 'pg_catalog', 'postgres' ],
@@ -40,7 +40,7 @@
 	'reindex system tables');
 $node->issues_sql_like(
 	[ 'reindexdb', '-v', '-t', 'test1', 'postgres' ],
-	qr/statement: REINDEX \(VERBOSE\) TABLE test1;/,
+	qr/statement: REINDEX \(VERBOSE\) TABLE public\.test1;/,
 	'reindex with verbose output');
 
 $node->command_ok([qw(reindexdb --echo --table=pg_am dbname=template1)],
diff --git a/src/bin/scripts/t/100_vacuumdb.pl b/src/bin/scripts/t/100_vacuumdb.pl
index dd98df8c08..382210e3b6 100644
--- a/src/bin/scripts/t/100_vacuumdb.pl
+++ b/src/bin/scripts/t/100_vacuumdb.pl
@@ -3,7 +3,7 @@
 
 use PostgresNode;
 use TestLib;
-use Test::More tests => 19;
+use Test::More tests => 23;
 
 program_help_ok('vacuumdb');
 program_version_ok('vacuumdb');
@@ -26,12 +26,32 @@
 	qr/statement: VACUUM \(FREEZE\);/,
 	'vacuumdb -F');
 $node->issues_sql_like(
-	[ 'vacuumdb', '-z', 'postgres' ],
-	qr/statement: VACUUM \(ANALYZE\);/,
-	'vacuumdb -z');
+	[ 'vacuumdb', '-zj2', 'postgres' ],
+	qr/statement: VACUUM \(ANALYZE\) pg_catalog\./,
+	'vacuumdb -zj2');
 $node->issues_sql_like(
 	[ 'vacuumdb', '-Z', 'postgres' ],
 	qr/statement: ANALYZE;/,
 	'vacuumdb -Z');
 $node->command_ok([qw(vacuumdb -Z --table=pg_am dbname=template1)],
 	'vacuumdb with connection string');
+
+$node->command_fails([qw(vacuumdb -Zt pg_am;ABORT postgres)],
+	'trailing command in "-t", without COLUMNS');
+# Unwanted; better if it failed.
+$node->command_ok([qw(vacuumdb -Zt pg_am(amname);ABORT postgres)],
+	'trailing command in "-t", with COLUMNS');
+
+$node->safe_psql('postgres', q|
+  CREATE TABLE "need""q(uot" (")x" text);
+
+  CREATE FUNCTION f0(int) RETURNS int LANGUAGE SQL AS 'SELECT $1 * $1';
+  CREATE FUNCTION f1(int) RETURNS int LANGUAGE SQL AS 'SELECT f0($1)';
+  CREATE TABLE funcidx (x int);
+  INSERT INTO funcidx VALUES (0),(1),(2),(3);
+  CREATE INDEX i0 ON funcidx ((f1(x)));
+|);
+$node->command_ok([qw|vacuumdb -Z --table="need""q(uot"(")x") postgres|],
+	'column list');
+$node->command_fails([qw|vacuumdb -Zt funcidx postgres|],
+	'unqualifed name via functional index');
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index 5d2869ea6b..887fa48fbd 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -2,7 +2,7 @@
  *
  * vacuumdb
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/bin/scripts/vacuumdb.c
@@ -61,7 +61,9 @@ static void vacuum_all_databases(vacuumingOptions *vacopts,
 					 const char *progname, bool echo, bool quiet);
 
 static void prepare_vacuum_command(PQExpBuffer sql, PGconn *conn,
-					   vacuumingOptions *vacopts, const char *table);
+					   vacuumingOptions *vacopts, const char *table,
+					   bool table_pre_qualified,
+					   const char *progname, bool echo);
 
 static void run_vacuum_command(PGconn *conn, const char *sql, bool echo,
 				   const char *table, const char *progname, bool async);
@@ -361,7 +363,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		   (stage >= 0 && stage < ANALYZE_NUM_STAGES));
 
 	conn = connectDatabase(dbname, host, port, username, prompt_password,
-						   progname, false, true);
+						   progname, echo, false, true);
 
 	if (!quiet)
 	{
@@ -437,7 +439,7 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		for (i = 1; i < concurrentCons; i++)
 		{
 			conn = connectDatabase(dbname, host, port, username, prompt_password,
-								   progname, false, true);
+								   progname, echo, false, true);
 			init_slot(slots + i, conn, progname);
 		}
 	}
@@ -463,7 +465,8 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
 		ParallelSlot *free_slot;
 		const char *tabname = cell ? cell->val : NULL;
 
-		prepare_vacuum_command(&sql, conn, vacopts, tabname);
+		prepare_vacuum_command(&sql, conn, vacopts, tabname,
+							   tables == &dbtables, progname, echo);
 
 		if (CancelRequested)
 		{
@@ -554,8 +557,8 @@ vacuum_all_databases(vacuumingOptions *vacopts,
 	int			stage;
 	int			i;
 
-	conn = connectMaintenanceDatabase(maintenance_db, host, port,
-									  username, prompt_password, progname);
+	conn = connectMaintenanceDatabase(maintenance_db, host, port, username,
+									  prompt_password, progname, echo);
 	result = executeQuery(conn,
 						  "SELECT datname FROM pg_database WHERE datallowconn ORDER BY 1;",
 						  progname, echo);
@@ -618,8 +621,10 @@ vacuum_all_databases(vacuumingOptions *vacopts,
  * quoted.  The command is semicolon-terminated.
  */
 static void
-prepare_vacuum_command(PQExpBuffer sql, PGconn *conn, vacuumingOptions *vacopts,
-					   const char *table)
+prepare_vacuum_command(PQExpBuffer sql, PGconn *conn,
+					   vacuumingOptions *vacopts, const char *table,
+					   bool table_pre_qualified,
+					   const char *progname, bool echo)
 {
 	resetPQExpBuffer(sql);
 
@@ -675,7 +680,13 @@ prepare_vacuum_command(PQExpBuffer sql, PGconn *conn, vacuumingOptions *vacopts,
 	}
 
 	if (table)
-		appendPQExpBuffer(sql, " %s", table);
+	{
+		appendPQExpBufferChar(sql, ' ');
+		if (table_pre_qualified)
+			appendPQExpBufferStr(sql, table);
+		else
+			appendQualifiedRelation(sql, table, conn, progname, echo);
+	}
 	appendPQExpBufferChar(sql, ';');
 }
 
diff --git a/src/common/base64.c b/src/common/base64.c
index e8e28ecca4..c6fde2a8dd 100644
--- a/src/common/base64.c
+++ b/src/common/base64.c
@@ -3,7 +3,7 @@
  * base64.c
  *	  Encoding and decoding routines for base64 without whitespace.
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/common/config_info.c b/src/common/config_info.c
index e0841a5af2..55e688e656 100644
--- a/src/common/config_info.c
+++ b/src/common/config_info.c
@@ -4,7 +4,7 @@
  *		Common code for pg_config output
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/controldata_utils.c b/src/common/controldata_utils.c
index f1a097a974..f12a188856 100644
--- a/src/common/controldata_utils.c
+++ b/src/common/controldata_utils.c
@@ -4,7 +4,7 @@
  *		Common code for control data file output.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/exec.c b/src/common/exec.c
index 67bf4d1d79..e3e81c1db8 100644
--- a/src/common/exec.c
+++ b/src/common/exec.c
@@ -4,7 +4,7 @@
  *		Functions for finding and validating executable files
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/fe_memutils.c b/src/common/fe_memutils.c
index fb38067d97..2538661e19 100644
--- a/src/common/fe_memutils.c
+++ b/src/common/fe_memutils.c
@@ -3,7 +3,7 @@
  * fe_memutils.c
  *	  memory management support for frontend code
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/file_utils.c b/src/common/file_utils.c
index 4304058acb..48876061c3 100644
--- a/src/common/file_utils.c
+++ b/src/common/file_utils.c
@@ -5,7 +5,7 @@
  * Assorted utility functions to work on files.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/common/file_utils.c
diff --git a/src/common/ip.c b/src/common/ip.c
index bb536d3e86..caca7be9e5 100644
--- a/src/common/ip.c
+++ b/src/common/ip.c
@@ -3,7 +3,7 @@
  * ip.c
  *	  IPv6-aware network access.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/keywords.c b/src/common/keywords.c
index a5c6c41cb8..0c0c794c68 100644
--- a/src/common/keywords.c
+++ b/src/common/keywords.c
@@ -4,7 +4,7 @@
  *	  lexical token lookup for key words in PostgreSQL
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/md5.c b/src/common/md5.c
index ba65b02af6..c3936618b6 100644
--- a/src/common/md5.c
+++ b/src/common/md5.c
@@ -10,7 +10,7 @@
  *
  *	Sverre H. Huseby <sverrehu@online.no>
  *
- *	Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -317,7 +317,7 @@ pg_md5_binary(const void *buff, size_t len, void *outbuf)
  * Output format is "md5" followed by a 32-hex-digit MD5 checksum.
  * Hence, the output buffer "buf" must be at least 36 bytes long.
  *
- * Returns TRUE if okay, FALSE on error (out of memory).
+ * Returns true if okay, false on error (out of memory).
  */
 bool
 pg_md5_encrypt(const char *passwd, const char *salt, size_t salt_len,
diff --git a/src/common/pg_lzcompress.c b/src/common/pg_lzcompress.c
index 67f570c362..a2f87cff8b 100644
--- a/src/common/pg_lzcompress.c
+++ b/src/common/pg_lzcompress.c
@@ -166,7 +166,7 @@
  *
  *			Jan Wieck
  *
- * Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  * src/common/pg_lzcompress.c
  * ----------
diff --git a/src/common/pgfnames.c b/src/common/pgfnames.c
index e161d7dc04..ec50a36db7 100644
--- a/src/common/pgfnames.c
+++ b/src/common/pgfnames.c
@@ -3,7 +3,7 @@
  * pgfnames.c
  *	  directory handling functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/common/psprintf.c b/src/common/psprintf.c
index 8f5903d519..b974a99be1 100644
--- a/src/common/psprintf.c
+++ b/src/common/psprintf.c
@@ -4,7 +4,7 @@
  *		sprintf into an allocated-on-demand buffer
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/relpath.c b/src/common/relpath.c
index c2f36625c1..d98050c590 100644
--- a/src/common/relpath.c
+++ b/src/common/relpath.c
@@ -4,7 +4,7 @@
  *
  * This module also contains some logic associated with fork names.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/common/restricted_token.c b/src/common/restricted_token.c
index 57591aaae2..8c5583da7a 100644
--- a/src/common/restricted_token.c
+++ b/src/common/restricted_token.c
@@ -4,7 +4,7 @@
  *		helper routine to ensure restricted token on Windows
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/rmtree.c b/src/common/rmtree.c
index 09824b5463..fcf63eb953 100644
--- a/src/common/rmtree.c
+++ b/src/common/rmtree.c
@@ -2,7 +2,7 @@
  *
  * rmtree.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/common/saslprep.c b/src/common/saslprep.c
index 0a3585850b..271021550a 100644
--- a/src/common/saslprep.c
+++ b/src/common/saslprep.c
@@ -12,7 +12,7 @@
  *	  http://www.ietf.org/rfc/rfc4013.txt
  *
  *
- * Portions Copyright (c) 2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/common/saslprep.c
diff --git a/src/common/scram-common.c b/src/common/scram-common.c
index e43d035d4d..dc4160714f 100644
--- a/src/common/scram-common.c
+++ b/src/common/scram-common.c
@@ -6,7 +6,7 @@
  * backend, for implement the Salted Challenge Response Authentication
  * Mechanism (SCRAM), per IETF's RFC 5802.
  *
- * Portions Copyright (c) 2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/common/scram-common.c
@@ -19,12 +19,9 @@
 #include "postgres_fe.h"
 #endif
 
-/* for htonl */
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #include "common/base64.h"
 #include "common/scram-common.h"
+#include "port/pg_bswap.h"
 
 #define HMAC_IPAD 0x36
 #define HMAC_OPAD 0x5C
@@ -109,7 +106,7 @@ scram_SaltedPassword(const char *password,
 					 uint8 *result)
 {
 	int			password_len = strlen(password);
-	uint32		one = htonl(1);
+	uint32		one = pg_hton32(1);
 	int			i,
 				j;
 	uint8		Ui[SCRAM_KEY_LEN];
diff --git a/src/common/sha2.c b/src/common/sha2.c
index d7992f1d20..5aa678f8e3 100644
--- a/src/common/sha2.c
+++ b/src/common/sha2.c
@@ -6,7 +6,7 @@
  * This is the set of in-core functions used when there are no other
  * alternative options like OpenSSL.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/common/sha2.c
diff --git a/src/common/sha2_openssl.c b/src/common/sha2_openssl.c
index b8e2e1139f..362e1318db 100644
--- a/src/common/sha2_openssl.c
+++ b/src/common/sha2_openssl.c
@@ -6,7 +6,7 @@
  *
  * This should only be used if code is compiled with OpenSSL support.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/common/sha2_openssl.c
diff --git a/src/common/string.c b/src/common/string.c
index 159d9ea7b6..0e3557076a 100644
--- a/src/common/string.c
+++ b/src/common/string.c
@@ -4,7 +4,7 @@
  *		string handling helpers
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/common/unicode/generate-norm_test_table.pl b/src/common/unicode/generate-norm_test_table.pl
index 310d32fd29..e3510b5c81 100644
--- a/src/common/unicode/generate-norm_test_table.pl
+++ b/src/common/unicode/generate-norm_test_table.pl
@@ -5,7 +5,7 @@
 #
 # NormalizationTest.txt is part of the Unicode Character Database.
 #
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use strict;
 use warnings;
@@ -30,7 +30,7 @@
  * norm_test_table.h
  *	  Test strings for Unicode normalization.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/common/unicode/norm_test_table.h
diff --git a/src/common/unicode/generate-unicode_norm_table.pl b/src/common/unicode/generate-unicode_norm_table.pl
index 1d77bb6380..f9cb406f1b 100644
--- a/src/common/unicode/generate-unicode_norm_table.pl
+++ b/src/common/unicode/generate-unicode_norm_table.pl
@@ -5,7 +5,7 @@
 # Input: UnicodeData.txt and CompositionExclusions.txt
 # Output: unicode_norm_table.h
 #
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use strict;
 use warnings;
@@ -74,7 +74,7 @@
  * unicode_norm_table.h
  *	  Composition table used for Unicode normalization
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/unicode_norm_table.h
diff --git a/src/common/unicode/norm_test.c b/src/common/unicode/norm_test.c
index f1bd99fce4..56759bee8d 100644
--- a/src/common/unicode/norm_test.c
+++ b/src/common/unicode/norm_test.c
@@ -2,7 +2,7 @@
  * norm_test.c
  *		Program to test Unicode normalization functions.
  *
- * Portions Copyright (c) 2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/common/unicode_norm.c
diff --git a/src/common/unicode_norm.c b/src/common/unicode_norm.c
index 5361f5f111..1eacdb298f 100644
--- a/src/common/unicode_norm.c
+++ b/src/common/unicode_norm.c
@@ -5,7 +5,7 @@
  * This implements Unicode normalization, per the documentation at
  * http://www.unicode.org/reports/tr15/.
  *
- * Portions Copyright (c) 2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/common/unicode_norm.c
diff --git a/src/common/username.c b/src/common/username.c
index 7187bbde42..af382f95a5 100644
--- a/src/common/username.c
+++ b/src/common/username.c
@@ -3,7 +3,7 @@
  * username.c
  *	  get user name
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/common/wait_error.c b/src/common/wait_error.c
index f824a5f2af..941b606999 100644
--- a/src/common/wait_error.c
+++ b/src/common/wait_error.c
@@ -4,7 +4,7 @@
  *		Convert a wait/waitpid(2) result code to a human-readable string
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/fe_utils/Makefile b/src/fe_utils/Makefile
index ebce38ceb4..3f4ba8bf7c 100644
--- a/src/fe_utils/Makefile
+++ b/src/fe_utils/Makefile
@@ -5,7 +5,7 @@
 # This makefile generates a static library, libpgfeutils.a,
 # for use by client applications
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # IDENTIFICATION
diff --git a/src/fe_utils/mbprint.c b/src/fe_utils/mbprint.c
index 9aabe59f38..07c348ec49 100644
--- a/src/fe_utils/mbprint.c
+++ b/src/fe_utils/mbprint.c
@@ -3,7 +3,7 @@
  * Multibyte character printing support for frontend code
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/fe_utils/mbprint.c
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
index f756f767e5..ec5ad45a30 100644
--- a/src/fe_utils/print.c
+++ b/src/fe_utils/print.c
@@ -8,7 +8,7 @@
  * pager open/close functions, all that stuff came with it.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/fe_utils/print.c
@@ -2870,7 +2870,9 @@ PageOutput(int lines, const printTableOpt *topt)
 			const char *pagerprog;
 			FILE	   *pagerpipe;
 
-			pagerprog = getenv("PAGER");
+			pagerprog = getenv("PSQL_PAGER");
+			if (!pagerprog)
+				pagerprog = getenv("PAGER");
 			if (!pagerprog)
 				pagerprog = DEFAULT_PAGER;
 			else
diff --git a/src/fe_utils/psqlscan.l b/src/fe_utils/psqlscan.l
index 27689d72da..1cc587be34 100644
--- a/src/fe_utils/psqlscan.l
+++ b/src/fe_utils/psqlscan.l
@@ -23,7 +23,7 @@
  *
  * See psqlscan_int.h for additional commentary.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -71,6 +71,8 @@ typedef int YYSTYPE;
 extern int	psql_yyget_column(yyscan_t yyscanner);
 extern void psql_yyset_column(int column_no, yyscan_t yyscanner);
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option reentrant
@@ -745,9 +747,13 @@ other			.
 											 PQUOTE_SQL_IDENT);
 				}
 
+:\{\?{variable_char}+\}	{
+					psqlscan_test_variable(cur_state, yytext, yyleng);
+				}
+
 	/*
 	 * These rules just avoid the need for scanner backup if one of the
-	 * two rules above fails to match completely.
+	 * three rules above fails to match completely.
 	 */
 
 :'{variable_char}*	{
@@ -762,6 +768,17 @@ other			.
 					ECHO;
 				}
 
+:\{\?{variable_char}*	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+				}
+:\{	{
+					/* Throw back everything but the colon */
+					yyless(1);
+					ECHO;
+				}
+
 	/*
 	 * Back to backend-compatible rules.
 	 */
@@ -884,6 +901,8 @@ other			.
 
 %%
 
+/* LCOV_EXCL_STOP */
+
 /*
  * Create a lexer working state struct.
  *
@@ -1442,3 +1461,28 @@ psqlscan_escape_variable(PsqlScanState state, const char *txt, int len,
 		psqlscan_emit(state, txt, len);
 	}
 }
+
+void
+psqlscan_test_variable(PsqlScanState state, const char *txt, int len)
+{
+	char	*varname;
+	char	*value;
+
+	varname = psqlscan_extract_substring(state, txt + 3, len - 4);
+	if (state->callbacks->get_variable)
+		value = state->callbacks->get_variable(varname, PQUOTE_PLAIN,
+											   state->cb_passthrough);
+	else
+		value = NULL;
+	free(varname);
+
+	if (value != NULL)
+	{
+		psqlscan_emit(state, "TRUE", 4);
+		free(value);
+	}
+	else
+	{
+		psqlscan_emit(state, "FALSE", 5);
+	}
+}
diff --git a/src/fe_utils/simple_list.c b/src/fe_utils/simple_list.c
index 21a2e57297..ef94b34cd1 100644
--- a/src/fe_utils/simple_list.c
+++ b/src/fe_utils/simple_list.c
@@ -7,7 +7,7 @@
  * it's all we need in, eg, pg_dump.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/fe_utils/simple_list.c
diff --git a/src/fe_utils/string_utils.c b/src/fe_utils/string_utils.c
index c7e42ddec9..b47a396af1 100644
--- a/src/fe_utils/string_utils.c
+++ b/src/fe_utils/string_utils.c
@@ -6,7 +6,7 @@
  * and interpreting backend output.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/fe_utils/string_utils.c
@@ -956,8 +956,9 @@ processSQLNamePattern(PGconn *conn, PQExpBuffer buf, const char *pattern,
 	}
 
 	/*
-	 * Now decide what we need to emit.  Note there will be a leading "^(" in
-	 * the patterns in any case.
+	 * Now decide what we need to emit.  We may run under a hostile
+	 * search_path, so qualify EVERY name.  Note there will be a leading "^("
+	 * in the patterns in any case.
 	 */
 	if (namebuf.len > 2)
 	{
@@ -970,15 +971,18 @@ processSQLNamePattern(PGconn *conn, PQExpBuffer buf, const char *pattern,
 			WHEREAND();
 			if (altnamevar)
 			{
-				appendPQExpBuffer(buf, "(%s ~ ", namevar);
+				appendPQExpBuffer(buf,
+								  "(%s OPERATOR(pg_catalog.~) ", namevar);
 				appendStringLiteralConn(buf, namebuf.data, conn);
-				appendPQExpBuffer(buf, "\n        OR %s ~ ", altnamevar);
+				appendPQExpBuffer(buf,
+								  "\n        OR %s OPERATOR(pg_catalog.~) ",
+								  altnamevar);
 				appendStringLiteralConn(buf, namebuf.data, conn);
 				appendPQExpBufferStr(buf, ")\n");
 			}
 			else
 			{
-				appendPQExpBuffer(buf, "%s ~ ", namevar);
+				appendPQExpBuffer(buf, "%s OPERATOR(pg_catalog.~) ", namevar);
 				appendStringLiteralConn(buf, namebuf.data, conn);
 				appendPQExpBufferChar(buf, '\n');
 			}
@@ -994,7 +998,7 @@ processSQLNamePattern(PGconn *conn, PQExpBuffer buf, const char *pattern,
 		if (strcmp(schemabuf.data, "^(.*)$") != 0 && schemavar)
 		{
 			WHEREAND();
-			appendPQExpBuffer(buf, "%s ~ ", schemavar);
+			appendPQExpBuffer(buf, "%s OPERATOR(pg_catalog.~) ", schemavar);
 			appendStringLiteralConn(buf, schemabuf.data, conn);
 			appendPQExpBufferChar(buf, '\n');
 		}
diff --git a/src/include/access/amapi.h b/src/include/access/amapi.h
index 0db4fc73ac..8d7bc246e6 100644
--- a/src/include/access/amapi.h
+++ b/src/include/access/amapi.h
@@ -3,7 +3,7 @@
  * amapi.h
  *	  API for Postgres index access methods.
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * src/include/access/amapi.h
  *
diff --git a/src/include/access/amvalidate.h b/src/include/access/amvalidate.h
index 04b7429a78..e50afbd556 100644
--- a/src/include/access/amvalidate.h
+++ b/src/include/access/amvalidate.h
@@ -3,7 +3,7 @@
  * amvalidate.h
  *	  Support routines for index access methods' amvalidate functions.
  *
- * Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/access/amvalidate.h
  *
diff --git a/src/include/access/attnum.h b/src/include/access/attnum.h
index d23888b098..c45a1acaaa 100644
--- a/src/include/access/attnum.h
+++ b/src/include/access/attnum.h
@@ -4,7 +4,7 @@
  *	  POSTGRES attribute number definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/attnum.h
diff --git a/src/include/access/brin.h b/src/include/access/brin.h
index 61a38804ca..10999a38b5 100644
--- a/src/include/access/brin.h
+++ b/src/include/access/brin.h
@@ -1,7 +1,7 @@
 /*
  * AM-callable functions for BRIN indexes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_internal.h b/src/include/access/brin_internal.h
index 3ed67438b2..d3134f9dcd 100644
--- a/src/include/access/brin_internal.h
+++ b/src/include/access/brin_internal.h
@@ -2,7 +2,7 @@
  * brin_internal.h
  *		internal declarations for BRIN indexes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_page.h b/src/include/access/brin_page.h
index bf03a6e9f8..82d5972c85 100644
--- a/src/include/access/brin_page.h
+++ b/src/include/access/brin_page.h
@@ -2,7 +2,7 @@
  * brin_page.h
  *		Prototypes and definitions for BRIN page layouts
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_pageops.h b/src/include/access/brin_pageops.h
index e0f5641635..8b389de4a5 100644
--- a/src/include/access/brin_pageops.h
+++ b/src/include/access/brin_pageops.h
@@ -2,7 +2,7 @@
  * brin_pageops.h
  *		Prototypes for operating on BRIN pages.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_revmap.h b/src/include/access/brin_revmap.h
index ddd87e040b..4dd844888f 100644
--- a/src/include/access/brin_revmap.h
+++ b/src/include/access/brin_revmap.h
@@ -2,7 +2,7 @@
  * brin_revmap.h
  *		Prototypes for BRIN reverse range maps
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_tuple.h b/src/include/access/brin_tuple.h
index 6545c0a6ff..2adaf9125e 100644
--- a/src/include/access/brin_tuple.h
+++ b/src/include/access/brin_tuple.h
@@ -2,7 +2,7 @@
  * brin_tuple.h
  *		Declarations for dealing with BRIN-specific tuples.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/access/brin_xlog.h b/src/include/access/brin_xlog.h
index 10e90d3c78..40e9772c89 100644
--- a/src/include/access/brin_xlog.h
+++ b/src/include/access/brin_xlog.h
@@ -4,7 +4,7 @@
  *	  POSTGRES BRIN access XLOG definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/brin_xlog.h
diff --git a/src/include/access/bufmask.h b/src/include/access/bufmask.h
index 95c6c3ae02..c00be32ff6 100644
--- a/src/include/access/bufmask.h
+++ b/src/include/access/bufmask.h
@@ -7,7 +7,7 @@
  *	  individual rmgr, but we make things easier by providing some
  *	  common routines to handle cases which occur in multiple rmgrs.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/access/bufmask.h
  *
@@ -23,7 +23,7 @@
 /* Marker used to mask pages consistently */
 #define MASK_MARKER		0
 
-extern void mask_page_lsn(Page page);
+extern void mask_page_lsn_and_checksum(Page page);
 extern void mask_page_hint_bits(Page page);
 extern void mask_unused_space(Page page);
 extern void mask_lp_flags(Page page);
diff --git a/src/include/access/clog.h b/src/include/access/clog.h
index 7bae0902b5..7681ed90ae 100644
--- a/src/include/access/clog.h
+++ b/src/include/access/clog.h
@@ -3,7 +3,7 @@
  *
  * PostgreSQL transaction-commit-log manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/clog.h
diff --git a/src/include/access/commit_ts.h b/src/include/access/commit_ts.h
index 31936faf08..2f40d59695 100644
--- a/src/include/access/commit_ts.h
+++ b/src/include/access/commit_ts.h
@@ -3,7 +3,7 @@
  *
  * PostgreSQL commit timestamp manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/commit_ts.h
diff --git a/src/include/access/genam.h b/src/include/access/genam.h
index b56a44f902..24c720bf42 100644
--- a/src/include/access/genam.h
+++ b/src/include/access/genam.h
@@ -4,7 +4,7 @@
  *	  POSTGRES generalized index access method definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/genam.h
diff --git a/src/include/access/generic_xlog.h b/src/include/access/generic_xlog.h
index 02696141ea..b23e1f684b 100644
--- a/src/include/access/generic_xlog.h
+++ b/src/include/access/generic_xlog.h
@@ -4,7 +4,7 @@
  *	  Generic xlog API definition.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/generic_xlog.h
diff --git a/src/include/access/gin.h b/src/include/access/gin.h
index ec83058095..0acdb88241 100644
--- a/src/include/access/gin.h
+++ b/src/include/access/gin.h
@@ -2,7 +2,7 @@
  * gin.h
  *	  Public header file for Generalized Inverted Index access method.
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/include/access/gin.h
  *--------------------------------------------------------------------------
diff --git a/src/include/access/gin_private.h b/src/include/access/gin_private.h
index adfdb0c6d9..a709596a7a 100644
--- a/src/include/access/gin_private.h
+++ b/src/include/access/gin_private.h
@@ -2,7 +2,7 @@
  * gin_private.h
  *	  header file for postgres inverted index access method implementation.
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/include/access/gin_private.h
  *--------------------------------------------------------------------------
@@ -300,7 +300,7 @@ typedef struct GinScanKeyData
 
 	/*
 	 * Match status data.  curItem is the TID most recently tested (could be a
-	 * lossy-page pointer).  curItemMatches is TRUE if it passes the
+	 * lossy-page pointer).  curItemMatches is true if it passes the
 	 * consistentFn test; if so, recheckCurItem is the recheck flag.
 	 * isFinished means that all the input entry streams are finished, so this
 	 * key cannot succeed for any later TIDs.
@@ -439,7 +439,7 @@ extern void ginHeapTupleFastCollect(GinState *ginstate,
 						OffsetNumber attnum, Datum value, bool isNull,
 						ItemPointer ht_ctid);
 extern void ginInsertCleanup(GinState *ginstate, bool full_clean,
-				 bool fill_fsm, IndexBulkDeleteResult *stats);
+				 bool fill_fsm, bool forceCleanup, IndexBulkDeleteResult *stats);
 
 /* ginpostinglist.c */
 
diff --git a/src/include/access/ginblock.h b/src/include/access/ginblock.h
index 114370c7d7..553566529a 100644
--- a/src/include/access/ginblock.h
+++ b/src/include/access/ginblock.h
@@ -2,7 +2,7 @@
  * ginblock.h
  *	  details of structures stored in GIN index blocks
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/include/access/ginblock.h
  *--------------------------------------------------------------------------
@@ -188,8 +188,11 @@ typedef struct
 
 /*
  * Category codes to distinguish placeholder nulls from ordinary NULL keys.
- * Note that the datatype size and the first two code values are chosen to be
- * compatible with the usual usage of bool isNull flags.
+ *
+ * The first two code values were chosen to be compatible with the usual usage
+ * of bool isNull flags.  However, casting between bool and GinNullCategory is
+ * risky because of the possibility of different bit patterns and type sizes,
+ * so it is no longer done.
  *
  * GIN_CAT_EMPTY_QUERY is never stored in the index; and notice that it is
  * chosen to sort before not after regular key values.
diff --git a/src/include/access/ginxlog.h b/src/include/access/ginxlog.h
index 42e0ae90c3..64a3c9e18b 100644
--- a/src/include/access/ginxlog.h
+++ b/src/include/access/ginxlog.h
@@ -2,7 +2,7 @@
  * ginxlog.h
  *	  header file for postgres inverted index xlog implementation.
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/include/access/ginxlog.h
  *--------------------------------------------------------------------------
diff --git a/src/include/access/gist.h b/src/include/access/gist.h
index 83642189db..827566dc6e 100644
--- a/src/include/access/gist.h
+++ b/src/include/access/gist.h
@@ -6,7 +6,7 @@
  *	  changes should be made with care.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/gist.h
diff --git a/src/include/access/gist_private.h b/src/include/access/gist_private.h
index bfef2df420..36ed7244ba 100644
--- a/src/include/access/gist_private.h
+++ b/src/include/access/gist_private.h
@@ -4,7 +4,7 @@
  *	  private declarations for GiST -- declarations related to the
  *	  internal implementation of GiST, not the public API
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/gist_private.h
@@ -503,7 +503,7 @@ extern void gistSplitByKey(Relation r, Page page, IndexTuple *itup,
 /* gistbuild.c */
 extern IndexBuildResult *gistbuild(Relation heap, Relation index,
 		  struct IndexInfo *indexInfo);
-extern void gistValidateBufferingOption(char *value);
+extern void gistValidateBufferingOption(const char *value);
 
 /* gistbuildbuffers.c */
 extern GISTBuildBuffers *gistInitBuildBuffers(int pagesPerBuffer, int levelStep,
diff --git a/src/include/access/gistscan.h b/src/include/access/gistscan.h
index 2aea6ad309..e04409afc0 100644
--- a/src/include/access/gistscan.h
+++ b/src/include/access/gistscan.h
@@ -4,7 +4,7 @@
  *	  routines defined in access/gist/gistscan.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/gistscan.h
diff --git a/src/include/access/gistxlog.h b/src/include/access/gistxlog.h
index 3b126eca2a..1a2b9496d0 100644
--- a/src/include/access/gistxlog.h
+++ b/src/include/access/gistxlog.h
@@ -3,7 +3,7 @@
  * gistxlog.h
  *	  gist xlog routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/gistxlog.h
diff --git a/src/include/access/hash.h b/src/include/access/hash.h
index 72fce3038c..65d23f32ef 100644
--- a/src/include/access/hash.h
+++ b/src/include/access/hash.h
@@ -4,7 +4,7 @@
  *	  header file for postgres hash access method implementation
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/hash.h
@@ -38,6 +38,17 @@ typedef uint32 Bucket;
 #define BUCKET_TO_BLKNO(metap,B) \
 		((BlockNumber) ((B) + ((B) ? (metap)->hashm_spares[_hash_spareindex((B)+1)-1] : 0)) + 1)
 
+/*
+ * Rotate the high 32 bits and the low 32 bits separately.  The standard
+ * hash function sometimes rotates the low 32 bits by one bit when
+ * combining elements.  We want extended hash functions to be compatible with
+ * that algorithm when the seed is 0, so we can't just do a normal rotation.
+ * This works, though.
+ */
+#define ROTATE_HIGH_AND_LOW_32BITS(v) \
+	((((v) << 1) & UINT64CONST(0xfffffffefffffffe)) | \
+	(((v) >> 31) & UINT64CONST(0x100000001)))
+
 /*
  * Special space for hash index pages.
  *
@@ -103,6 +114,51 @@ typedef struct HashScanPosItem	/* what we remember about each match */
 	OffsetNumber indexOffset;	/* index item's location within page */
 } HashScanPosItem;
 
+typedef struct HashScanPosData
+{
+	Buffer		buf;			/* if valid, the buffer is pinned */
+	BlockNumber currPage;		/* current hash index page */
+	BlockNumber nextPage;		/* next overflow page */
+	BlockNumber prevPage;		/* prev overflow or bucket page */
+
+	/*
+	 * The items array is always ordered in index order (ie, increasing
+	 * indexoffset).  When scanning backwards it is convenient to fill the
+	 * array back-to-front, so we start at the last slot and fill downwards.
+	 * Hence we need both a first-valid-entry and a last-valid-entry counter.
+	 * itemIndex is a cursor showing which entry was last returned to caller.
+	 */
+	int			firstItem;		/* first valid index in items[] */
+	int			lastItem;		/* last valid index in items[] */
+	int			itemIndex;		/* current index in items[] */
+
+	HashScanPosItem items[MaxIndexTuplesPerPage];	/* MUST BE LAST */
+} HashScanPosData;
+
+#define HashScanPosIsPinned(scanpos) \
+( \
+	AssertMacro(BlockNumberIsValid((scanpos).currPage) || \
+				!BufferIsValid((scanpos).buf)), \
+	BufferIsValid((scanpos).buf) \
+)
+
+#define HashScanPosIsValid(scanpos) \
+( \
+	AssertMacro(BlockNumberIsValid((scanpos).currPage) || \
+				!BufferIsValid((scanpos).buf)), \
+	BlockNumberIsValid((scanpos).currPage) \
+)
+
+#define HashScanPosInvalidate(scanpos) \
+	do { \
+		(scanpos).buf = InvalidBuffer; \
+		(scanpos).currPage = InvalidBlockNumber; \
+		(scanpos).nextPage = InvalidBlockNumber; \
+		(scanpos).prevPage = InvalidBlockNumber; \
+		(scanpos).firstItem = 0; \
+		(scanpos).lastItem = 0; \
+		(scanpos).itemIndex = 0; \
+	} while (0);
 
 /*
  *	HashScanOpaqueData is private state for a hash index scan.
@@ -112,14 +168,6 @@ typedef struct HashScanOpaqueData
 	/* Hash value of the scan key, ie, the hash key we seek */
 	uint32		hashso_sk_hash;
 
-	/*
-	 * We also want to remember which buffer we're currently examining in the
-	 * scan. We keep the buffer pinned (but not locked) across hashgettuple
-	 * calls, in order to avoid doing a ReadBuffer() for every tuple in the
-	 * index.
-	 */
-	Buffer		hashso_curbuf;
-
 	/* remember the buffer associated with primary bucket */
 	Buffer		hashso_bucket_buf;
 
@@ -130,12 +178,6 @@ typedef struct HashScanOpaqueData
 	 */
 	Buffer		hashso_split_bucket_buf;
 
-	/* Current position of the scan, as an index TID */
-	ItemPointerData hashso_curpos;
-
-	/* Current position of the scan, as a heap TID */
-	ItemPointerData hashso_heappos;
-
 	/* Whether scan starts on bucket being populated due to split */
 	bool		hashso_buc_populated;
 
@@ -145,8 +187,14 @@ typedef struct HashScanOpaqueData
 	 */
 	bool		hashso_buc_split;
 	/* info about killed items if any (killedItems is NULL if never used) */
-	HashScanPosItem *killedItems;	/* tids and offset numbers of killed items */
+	int		   *killedItems;	/* currPos.items indexes of killed items */
 	int			numKilled;		/* number of currently stored items */
+
+	/*
+	 * Identify all the matching items on a page and save them in
+	 * HashScanPosData
+	 */
+	HashScanPosData currPos;	/* current position data */
 } HashScanOpaqueData;
 
 typedef HashScanOpaqueData *HashScanOpaque;
@@ -289,12 +337,20 @@ typedef HashMetaPageData *HashMetaPage;
 #define HTMaxStrategyNumber				1
 
 /*
- *	When a new operator class is declared, we require that the user supply
- *	us with an amproc procudure for hashing a key of the new type.
- *	Since we only have one such proc in amproc, it's number 1.
+ * When a new operator class is declared, we require that the user supply
+ * us with an amproc procedure for hashing a key of the new type, returning
+ * a 32-bit hash value.  We call this the "standard" hash procedure.  We
+ * also allow an optional "extended" hash procedure which accepts a salt and
+ * returns a 64-bit hash value.  This is highly recommended but, for reasons
+ * of backward compatibility, optional.
+ *
+ * When the salt is 0, the low 32 bits of the value returned by the extended
+ * hash procedure should match the value that would have been returned by the
+ * standard hash procedure.
  */
-#define HASHPROC		1
-#define HASHNProcs		1
+#define HASHSTANDARD_PROC		1
+#define HASHEXTENDED_PROC		2
+#define HASHNProcs				2
 
 
 /* public routines */
@@ -322,7 +378,10 @@ extern bytea *hashoptions(Datum reloptions, bool validate);
 extern bool hashvalidate(Oid opclassoid);
 
 extern Datum hash_any(register const unsigned char *k, register int keylen);
+extern Datum hash_any_extended(register const unsigned char *k,
+				  register int keylen, uint64 seed);
 extern Datum hash_uint32(uint32 k);
+extern Datum hash_uint32_extended(uint32 k, uint64 seed);
 
 /* private routines */
 
@@ -379,7 +438,6 @@ extern void _hash_finish_split(Relation rel, Buffer metabuf, Buffer obuf,
 /* hashsearch.c */
 extern bool _hash_next(IndexScanDesc scan, ScanDirection dir);
 extern bool _hash_first(IndexScanDesc scan, ScanDirection dir);
-extern bool _hash_step(IndexScanDesc scan, Buffer *bufP, ScanDirection dir);
 
 /* hashsort.c */
 typedef struct HSpool HSpool;	/* opaque struct in hashsort.c */
diff --git a/src/include/access/hash_xlog.h b/src/include/access/hash_xlog.h
index c778fdc8df..527138440b 100644
--- a/src/include/access/hash_xlog.h
+++ b/src/include/access/hash_xlog.h
@@ -4,7 +4,7 @@
  *	  header file for Postgres hash AM implementation
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/hash_xlog.h
@@ -149,7 +149,7 @@ typedef struct xl_hash_split_complete
 typedef struct xl_hash_move_page_contents
 {
 	uint16		ntups;
-	bool		is_prim_bucket_same_wrt;	/* TRUE if the page to which
+	bool		is_prim_bucket_same_wrt;	/* true if the page to which
 											 * tuples are moved is same as
 											 * primary bucket page */
 } xl_hash_move_page_contents;
@@ -174,10 +174,10 @@ typedef struct xl_hash_squeeze_page
 	BlockNumber prevblkno;
 	BlockNumber nextblkno;
 	uint16		ntups;
-	bool		is_prim_bucket_same_wrt;	/* TRUE if the page to which
+	bool		is_prim_bucket_same_wrt;	/* true if the page to which
 											 * tuples are moved is same as
 											 * primary bucket page */
-	bool		is_prev_bucket_same_wrt;	/* TRUE if the page to which
+	bool		is_prev_bucket_same_wrt;	/* true if the page to which
 											 * tuples are moved is the page
 											 * previous to the freed overflow
 											 * page */
@@ -196,9 +196,9 @@ typedef struct xl_hash_squeeze_page
  */
 typedef struct xl_hash_delete
 {
-	bool		clear_dead_marking; /* TRUE if this operation clears
+	bool		clear_dead_marking; /* true if this operation clears
 									 * LH_PAGE_HAS_DEAD_TUPLES flag */
-	bool		is_primary_bucket_page; /* TRUE if the operation is for
+	bool		is_primary_bucket_page; /* true if the operation is for
 										 * primary bucket page */
 } xl_hash_delete;
 
diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h
index b2132e723e..4c0256b18a 100644
--- a/src/include/access/heapam.h
+++ b/src/include/access/heapam.h
@@ -4,7 +4,7 @@
  *	  POSTGRES heap access method definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/heapam.h
@@ -130,6 +130,7 @@ extern HeapTuple heap_getnext(HeapScanDesc scan, ScanDirection direction);
 extern Size heap_parallelscan_estimate(Snapshot snapshot);
 extern void heap_parallelscan_initialize(ParallelHeapScanDesc target,
 							 Relation relation, Snapshot snapshot);
+extern void heap_parallelscan_reinitialize(ParallelHeapScanDesc parallel_scan);
 extern HeapScanDesc heap_beginscan_parallel(Relation, ParallelHeapScanDesc);
 
 extern bool heap_fetch(Relation relation, Snapshot snapshot,
@@ -167,8 +168,9 @@ extern HTSU_Result heap_lock_tuple(Relation relation, HeapTuple tuple,
 				bool follow_update,
 				Buffer *buffer, HeapUpdateFailureData *hufd);
 extern void heap_inplace_update(Relation relation, HeapTuple tuple);
-extern bool heap_freeze_tuple(HeapTupleHeader tuple, TransactionId cutoff_xid,
-				  TransactionId cutoff_multi);
+extern bool heap_freeze_tuple(HeapTupleHeader tuple,
+				  TransactionId relfrozenxid, TransactionId relminmxid,
+				  TransactionId cutoff_xid, TransactionId cutoff_multi);
 extern bool heap_tuple_needs_freeze(HeapTupleHeader tuple, TransactionId cutoff_xid,
 						MultiXactId cutoff_multi, Buffer buf);
 extern bool heap_tuple_needs_eventual_freeze(HeapTupleHeader tuple);
diff --git a/src/include/access/heapam_xlog.h b/src/include/access/heapam_xlog.h
index 81a6a395c4..700e25c36a 100644
--- a/src/include/access/heapam_xlog.h
+++ b/src/include/access/heapam_xlog.h
@@ -4,7 +4,7 @@
  *	  POSTGRES heap access XLOG definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/heapam_xlog.h
@@ -339,13 +339,7 @@ typedef struct xl_heap_new_cid
 	TransactionId top_xid;
 	CommandId	cmin;
 	CommandId	cmax;
-
-	/*
-	 * don't really need the combocid since we have the actual values right in
-	 * this struct, but the padding makes it free and its useful for
-	 * debugging.
-	 */
-	CommandId	combocid;
+	CommandId	combocid;		/* just for debugging */
 
 	/*
 	 * Store the relfilenode/ctid pair to facilitate lookups.
@@ -390,6 +384,8 @@ extern XLogRecPtr log_heap_freeze(Relation reln, Buffer buffer,
 				TransactionId cutoff_xid, xl_heap_freeze_tuple *tuples,
 				int ntuples);
 extern bool heap_prepare_freeze_tuple(HeapTupleHeader tuple,
+						  TransactionId relfrozenxid,
+						  TransactionId relminmxid,
 						  TransactionId cutoff_xid,
 						  TransactionId cutoff_multi,
 						  xl_heap_freeze_tuple *frz,
diff --git a/src/include/access/hio.h b/src/include/access/hio.h
index 4a8beb63a6..9993d5be70 100644
--- a/src/include/access/hio.h
+++ b/src/include/access/hio.h
@@ -4,7 +4,7 @@
  *	  POSTGRES heap access method input/output definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/hio.h
diff --git a/src/include/access/htup.h b/src/include/access/htup.h
index 61b3e68639..e78d804756 100644
--- a/src/include/access/htup.h
+++ b/src/include/access/htup.h
@@ -4,7 +4,7 @@
  *	  POSTGRES heap tuple definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/htup.h
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
index 3e1676c7e6..2ab1815390 100644
--- a/src/include/access/htup_details.h
+++ b/src/include/access/htup_details.h
@@ -4,7 +4,7 @@
  *	  POSTGRES heap tuple header definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/htup_details.h
@@ -134,6 +134,11 @@ typedef struct DatumTupleFields
 	Oid			datum_typeid;	/* composite type OID, or RECORDOID */
 
 	/*
+	 * datum_typeid cannot be a domain over composite, only plain composite,
+	 * even if the datum is meant as a value of a domain-over-composite type.
+	 * This is in line with the general principle that CoerceToDomain does not
+	 * change the physical representation of the base type value.
+	 *
 	 * Note: field ordering is chosen with thought that Oid might someday
 	 * widen to 64 bits.
 	 */
@@ -722,11 +727,11 @@ struct MinimalTupleData
 	(*(isnull) = false),											\
 	HeapTupleNoNulls(tup) ?											\
 	(																\
-		(tupleDesc)->attrs[(attnum)-1]->attcacheoff >= 0 ?			\
+		TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff >= 0 ?	\
 		(															\
-			fetchatt((tupleDesc)->attrs[(attnum)-1],				\
+			fetchatt(TupleDescAttr((tupleDesc), (attnum)-1),		\
 				(char *) (tup)->t_data + (tup)->t_data->t_hoff +	\
-					(tupleDesc)->attrs[(attnum)-1]->attcacheoff)	\
+				TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff)\
 		)															\
 		:															\
 			nocachegetattr((tup), (attnum), (tupleDesc))			\
diff --git a/src/include/access/itup.h b/src/include/access/itup.h
index a94e7948b4..0ffa91d686 100644
--- a/src/include/access/itup.h
+++ b/src/include/access/itup.h
@@ -4,7 +4,7 @@
  *	  POSTGRES index tuple definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/itup.h
@@ -103,11 +103,11 @@ typedef IndexAttributeBitMapData * IndexAttributeBitMap;
 	*(isnull) = false, \
 	!IndexTupleHasNulls(tup) ? \
 	( \
-		(tupleDesc)->attrs[(attnum)-1]->attcacheoff >= 0 ? \
+		TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff >= 0 ? \
 		( \
-			fetchatt((tupleDesc)->attrs[(attnum)-1], \
+			fetchatt(TupleDescAttr((tupleDesc), (attnum)-1), \
 			(char *) (tup) + IndexInfoFindDataOffset((tup)->t_info) \
-			+ (tupleDesc)->attrs[(attnum)-1]->attcacheoff) \
+			+ TupleDescAttr((tupleDesc), (attnum)-1)->attcacheoff) \
 		) \
 		: \
 			nocache_index_getattr((tup), (attnum), (tupleDesc)) \
diff --git a/src/include/access/multixact.h b/src/include/access/multixact.h
index d5e18c6733..18fe380c5f 100644
--- a/src/include/access/multixact.h
+++ b/src/include/access/multixact.h
@@ -3,7 +3,7 @@
  *
  * PostgreSQL multi-transaction-log manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/multixact.h
diff --git a/src/include/access/nbtree.h b/src/include/access/nbtree.h
index e6abbec280..2b0b1da763 100644
--- a/src/include/access/nbtree.h
+++ b/src/include/access/nbtree.h
@@ -4,7 +4,7 @@
  *	  header file for postgres btree access method implementation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/nbtree.h
@@ -21,6 +21,7 @@
 #include "catalog/pg_index.h"
 #include "lib/stringinfo.h"
 #include "storage/bufmgr.h"
+#include "storage/shm_toc.h"
 
 /* There's room for a 16-bit vacuum cycle ID in BTPageOpaqueData */
 typedef uint16 BTCycleId;
@@ -173,14 +174,14 @@ typedef struct BTMetaPageData
  */
 #define P_LEFTMOST(opaque)		((opaque)->btpo_prev == P_NONE)
 #define P_RIGHTMOST(opaque)		((opaque)->btpo_next == P_NONE)
-#define P_ISLEAF(opaque)		((opaque)->btpo_flags & BTP_LEAF)
-#define P_ISROOT(opaque)		((opaque)->btpo_flags & BTP_ROOT)
-#define P_ISDELETED(opaque)		((opaque)->btpo_flags & BTP_DELETED)
-#define P_ISMETA(opaque)		((opaque)->btpo_flags & BTP_META)
-#define P_ISHALFDEAD(opaque)	((opaque)->btpo_flags & BTP_HALF_DEAD)
-#define P_IGNORE(opaque)		((opaque)->btpo_flags & (BTP_DELETED|BTP_HALF_DEAD))
-#define P_HAS_GARBAGE(opaque)	((opaque)->btpo_flags & BTP_HAS_GARBAGE)
-#define P_INCOMPLETE_SPLIT(opaque)	((opaque)->btpo_flags & BTP_INCOMPLETE_SPLIT)
+#define P_ISLEAF(opaque)		(((opaque)->btpo_flags & BTP_LEAF) != 0)
+#define P_ISROOT(opaque)		(((opaque)->btpo_flags & BTP_ROOT) != 0)
+#define P_ISDELETED(opaque)		(((opaque)->btpo_flags & BTP_DELETED) != 0)
+#define P_ISMETA(opaque)		(((opaque)->btpo_flags & BTP_META) != 0)
+#define P_ISHALFDEAD(opaque)	(((opaque)->btpo_flags & BTP_HALF_DEAD) != 0)
+#define P_IGNORE(opaque)		(((opaque)->btpo_flags & (BTP_DELETED|BTP_HALF_DEAD)) != 0)
+#define P_HAS_GARBAGE(opaque)	(((opaque)->btpo_flags & BTP_HAS_GARBAGE) != 0)
+#define P_INCOMPLETE_SPLIT(opaque)	(((opaque)->btpo_flags & BTP_INCOMPLETE_SPLIT) != 0)
 
 /*
  *	Lehman and Yao's algorithm requires a ``high key'' on every non-rightmost
@@ -224,11 +225,17 @@ typedef struct BTMetaPageData
  *	To facilitate accelerated sorting, an operator class may choose to
  *	offer a second procedure (BTSORTSUPPORT_PROC).  For full details, see
  *	src/include/utils/sortsupport.h.
+ *
+ *	To support window frames defined by "RANGE offset PRECEDING/FOLLOWING",
+ *	an operator class may choose to offer a third amproc procedure
+ *	(BTINRANGE_PROC), independently of whether it offers sortsupport.
+ *	For full details, see doc/src/sgml/btree.sgml.
  */
 
 #define BTORDER_PROC		1
 #define BTSORTSUPPORT_PROC	2
-#define BTNProcs			2
+#define BTINRANGE_PROC		3
+#define BTNProcs			3
 
 /*
  *	We need to be able to tell the difference between read and write
@@ -430,8 +437,6 @@ typedef BTScanOpaqueData *BTScanOpaque;
 /*
  * external entry points for btree, in nbtree.c
  */
-extern IndexBuildResult *btbuild(Relation heap, Relation index,
-		struct IndexInfo *indexInfo);
 extern void btbuildempty(Relation index);
 extern bool btinsert(Relation rel, Datum *values, bool *isnull,
 		 ItemPointer ht_ctid, Relation heapRel,
@@ -547,13 +552,8 @@ extern bool btvalidate(Oid opclassoid);
 /*
  * prototypes for functions in nbtsort.c
  */
-typedef struct BTSpool BTSpool; /* opaque type known only within nbtsort.c */
-
-extern BTSpool *_bt_spoolinit(Relation heap, Relation index,
-			  bool isunique, bool isdead);
-extern void _bt_spooldestroy(BTSpool *btspool);
-extern void _bt_spool(BTSpool *btspool, ItemPointer self,
-		  Datum *values, bool *isnull);
-extern void _bt_leafbuild(BTSpool *btspool, BTSpool *spool2);
+extern IndexBuildResult *btbuild(Relation heap, Relation index,
+		struct IndexInfo *indexInfo);
+extern void _bt_parallel_build_main(dsm_segment *seg, shm_toc *toc);
 
 #endif							/* NBTREE_H */
diff --git a/src/include/access/nbtxlog.h b/src/include/access/nbtxlog.h
index e3cddb2e64..8297df75fe 100644
--- a/src/include/access/nbtxlog.h
+++ b/src/include/access/nbtxlog.h
@@ -3,7 +3,7 @@
  * nbtxlog.h
  *	  header file for postgres btree xlog routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/nbtxlog.h
diff --git a/src/include/access/parallel.h b/src/include/access/parallel.h
index e3e0cecf1e..025691fd82 100644
--- a/src/include/access/parallel.h
+++ b/src/include/access/parallel.h
@@ -3,7 +3,7 @@
  * parallel.h
  *	  Infrastructure for launching parallel workers
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/parallel.h
@@ -43,18 +43,29 @@ typedef struct ParallelContext
 	void	   *private_memory;
 	shm_toc    *toc;
 	ParallelWorkerInfo *worker;
+	int			nknown_attached_workers;
+	bool	   *known_attached_workers;
 } ParallelContext;
 
+typedef struct ParallelWorkerContext
+{
+	dsm_segment *seg;
+	shm_toc    *toc;
+} ParallelWorkerContext;
+
 extern volatile bool ParallelMessagePending;
-extern int	ParallelWorkerNumber;
-extern bool InitializingParallelWorker;
+extern PGDLLIMPORT int ParallelWorkerNumber;
+extern PGDLLIMPORT bool InitializingParallelWorker;
 
 #define		IsParallelWorker()		(ParallelWorkerNumber >= 0)
 
-extern ParallelContext *CreateParallelContext(const char *library_name, const char *function_name, int nworkers);
+extern ParallelContext *CreateParallelContext(const char *library_name,
+					  const char *function_name, int nworkers,
+					  bool serializable_okay);
 extern void InitializeParallelDSM(ParallelContext *pcxt);
 extern void ReinitializeParallelDSM(ParallelContext *pcxt);
 extern void LaunchParallelWorkers(ParallelContext *pcxt);
+extern void WaitForParallelWorkersToAttach(ParallelContext *pcxt);
 extern void WaitForParallelWorkersToFinish(ParallelContext *pcxt);
 extern void DestroyParallelContext(ParallelContext *pcxt);
 extern bool ParallelContextActive(void);
diff --git a/src/include/access/printsimple.h b/src/include/access/printsimple.h
index edf28cece9..4184f16560 100644
--- a/src/include/access/printsimple.h
+++ b/src/include/access/printsimple.h
@@ -3,7 +3,7 @@
  * printsimple.h
  *	  print simple tuples without catalog access
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/printsimple.h
diff --git a/src/include/access/printtup.h b/src/include/access/printtup.h
index 641715e416..94f8d705b5 100644
--- a/src/include/access/printtup.h
+++ b/src/include/access/printtup.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/printtup.h
@@ -20,8 +20,8 @@ extern DestReceiver *printtup_create_DR(CommandDest dest);
 
 extern void SetRemoteDestReceiverParams(DestReceiver *self, Portal portal);
 
-extern void SendRowDescriptionMessage(TupleDesc typeinfo, List *targetlist,
-						  int16 *formats);
+extern void SendRowDescriptionMessage(StringInfo buf,
+						  TupleDesc typeinfo, List *targetlist, int16 *formats);
 
 extern void debugStartup(DestReceiver *self, int operation,
 			 TupleDesc typeinfo);
diff --git a/src/include/access/reloptions.h b/src/include/access/reloptions.h
index 5cdaa3bff1..b32c1e9efe 100644
--- a/src/include/access/reloptions.h
+++ b/src/include/access/reloptions.h
@@ -9,7 +9,7 @@
  * into a lot of low-level code.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/reloptions.h
@@ -108,7 +108,7 @@ typedef struct relopt_real
 } relopt_real;
 
 /* validation routines for strings */
-typedef void (*validate_string_relopt) (char *value);
+typedef void (*validate_string_relopt) (const char *value);
 
 typedef struct relopt_string
 {
@@ -166,7 +166,7 @@ typedef struct
  *	code block.
  */
 #define HAVE_RELOPTION(optname, option) \
-	(pg_strncasecmp(option.gen->name, optname, option.gen->namelen + 1) == 0)
+	(strncmp(option.gen->name, optname, option.gen->namelen + 1) == 0)
 
 #define HANDLE_INT_RELOPTION(optname, var, option, wasset)		\
 	do {														\
@@ -246,17 +246,17 @@ typedef struct
 
 
 extern relopt_kind add_reloption_kind(void);
-extern void add_bool_reloption(bits32 kinds, char *name, char *desc,
+extern void add_bool_reloption(bits32 kinds, const char *name, const char *desc,
 				   bool default_val);
-extern void add_int_reloption(bits32 kinds, char *name, char *desc,
+extern void add_int_reloption(bits32 kinds, const char *name, const char *desc,
 				  int default_val, int min_val, int max_val);
-extern void add_real_reloption(bits32 kinds, char *name, char *desc,
+extern void add_real_reloption(bits32 kinds, const char *name, const char *desc,
 				   double default_val, double min_val, double max_val);
-extern void add_string_reloption(bits32 kinds, char *name, char *desc,
-					 char *default_val, validate_string_relopt validator);
+extern void add_string_reloption(bits32 kinds, const char *name, const char *desc,
+					 const char *default_val, validate_string_relopt validator);
 
 extern Datum transformRelOptions(Datum oldOptions, List *defList,
-					char *namspace, char *validnsps[],
+					const char *namspace, char *validnsps[],
 					bool ignoreOids, bool isReset);
 extern List *untransformRelOptions(Datum options);
 extern bytea *extractRelOptions(HeapTuple tuple, TupleDesc tupdesc,
diff --git a/src/include/access/relscan.h b/src/include/access/relscan.h
index 147f862a2b..18c7dedd5d 100644
--- a/src/include/access/relscan.h
+++ b/src/include/access/relscan.h
@@ -4,7 +4,7 @@
  *	  POSTGRES relation scan descriptor definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/relscan.h
@@ -39,6 +39,7 @@ typedef struct ParallelHeapScanDescData
 	BlockNumber phs_startblock; /* starting block number */
 	pg_atomic_uint64 phs_nallocated;	/* number of blocks allocated to
 										 * workers so far. */
+	bool		phs_snapshot_any;	/* SnapshotAny, not phs_snapshot_data? */
 	char		phs_snapshot_data[FLEXIBLE_ARRAY_MEMBER];
 }			ParallelHeapScanDescData;
 
diff --git a/src/include/access/rewriteheap.h b/src/include/access/rewriteheap.h
index 91ff36707a..6d7f669cbc 100644
--- a/src/include/access/rewriteheap.h
+++ b/src/include/access/rewriteheap.h
@@ -3,7 +3,7 @@
  * rewriteheap.h
  *	  Declarations for heap rewrite support functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * src/include/access/rewriteheap.h
diff --git a/src/include/access/rmgrlist.h b/src/include/access/rmgrlist.h
index 2f43c199d3..0bbe9879ca 100644
--- a/src/include/access/rmgrlist.h
+++ b/src/include/access/rmgrlist.h
@@ -6,7 +6,7 @@
  * by the PG_RMGR macro, which is not defined in this file; it can be
  * defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/rmgrlist.h
diff --git a/src/include/access/sdir.h b/src/include/access/sdir.h
index 65eab48551..490bac11d3 100644
--- a/src/include/access/sdir.h
+++ b/src/include/access/sdir.h
@@ -4,7 +4,7 @@
  *	  POSTGRES scan direction definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/sdir.h
diff --git a/src/include/access/session.h b/src/include/access/session.h
new file mode 100644
index 0000000000..37971c1c66
--- /dev/null
+++ b/src/include/access/session.h
@@ -0,0 +1,44 @@
+/*-------------------------------------------------------------------------
+ *
+ * session.h
+ *	  Encapsulation of user session.
+ *
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
+ *
+ * src/include/access/session.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef SESSION_H
+#define SESSION_H
+
+#include "lib/dshash.h"
+
+/* Avoid including typcache.h */
+struct SharedRecordTypmodRegistry;
+
+/*
+ * A struct encapsulating some elements of a user's session.  For now this
+ * manages state that applies to parallel query, but it principle it could
+ * include other things that are currently global variables.
+ */
+typedef struct Session
+{
+	dsm_segment *segment;		/* The session-scoped DSM segment. */
+	dsa_area   *area;			/* The session-scoped DSA area. */
+
+	/* State managed by typcache.c. */
+	struct SharedRecordTypmodRegistry *shared_typmod_registry;
+	dshash_table *shared_record_table;
+	dshash_table *shared_typmod_table;
+} Session;
+
+extern void InitializeSession(void);
+extern dsm_handle GetSessionDsmHandle(void);
+extern void AttachSession(dsm_handle handle);
+extern void DetachSession(void);
+
+/* The current session, or NULL for none. */
+extern Session *CurrentSession;
+
+#endif							/* SESSION_H */
diff --git a/src/include/access/skey.h b/src/include/access/skey.h
index 2f4814f140..ab3bb2c8eb 100644
--- a/src/include/access/skey.h
+++ b/src/include/access/skey.h
@@ -4,7 +4,7 @@
  *	  POSTGRES scan key definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/skey.h
diff --git a/src/include/access/slru.h b/src/include/access/slru.h
index d829a6fab4..0e89e48c97 100644
--- a/src/include/access/slru.h
+++ b/src/include/access/slru.h
@@ -3,7 +3,7 @@
  * slru.h
  *		Simple LRU buffering for transaction status logfiles
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/slru.h
@@ -37,7 +37,7 @@
 
 /*
  * Page status codes.  Note that these do not include the "dirty" bit.
- * page_dirty can be TRUE only in the VALID or WRITE_IN_PROGRESS states;
+ * page_dirty can be true only in the VALID or WRITE_IN_PROGRESS states;
  * in the latter case it implies that the page has been re-dirtied since
  * the write started.
  */
diff --git a/src/include/access/spgist.h b/src/include/access/spgist.h
index d1bc396e6d..c6d7e22a38 100644
--- a/src/include/access/spgist.h
+++ b/src/include/access/spgist.h
@@ -4,7 +4,7 @@
  *	  Public header file for SP-GiST access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/spgist.h
@@ -30,7 +30,9 @@
 #define SPGIST_PICKSPLIT_PROC			3
 #define SPGIST_INNER_CONSISTENT_PROC	4
 #define SPGIST_LEAF_CONSISTENT_PROC		5
-#define SPGISTNProc						5
+#define SPGIST_COMPRESS_PROC			6
+#define SPGISTNRequiredProc				5
+#define SPGISTNProc						6
 
 /*
  * Argument structs for spg_config method
@@ -44,6 +46,7 @@ typedef struct spgConfigOut
 {
 	Oid			prefixType;		/* Data type of inner-tuple prefixes */
 	Oid			labelType;		/* Data type of inner-tuple node labels */
+	Oid			leafType;		/* Data type of leaf-tuple values */
 	bool		canReturnData;	/* Opclass can reconstruct original data */
 	bool		longValuesOK;	/* Opclass can cope with values > 1 page */
 } spgConfigOut;
diff --git a/src/include/access/spgist_private.h b/src/include/access/spgist_private.h
index 1c4b321b6c..6d5f1c6046 100644
--- a/src/include/access/spgist_private.h
+++ b/src/include/access/spgist_private.h
@@ -4,7 +4,7 @@
  *	  Private declarations for SP-GiST access method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/spgist_private.h
@@ -119,7 +119,8 @@ typedef struct SpGistState
 {
 	spgConfigOut config;		/* filled in by opclass config method */
 
-	SpGistTypeDesc attType;		/* type of input data and leaf values */
+	SpGistTypeDesc attType;		/* type of values to be indexed/restored */
+	SpGistTypeDesc attLeafType;		/* type of leaf-tuple values */
 	SpGistTypeDesc attPrefixType;	/* type of inner-tuple prefix values */
 	SpGistTypeDesc attLabelType;	/* type of node label values */
 
@@ -178,7 +179,8 @@ typedef struct SpGistCache
 {
 	spgConfigOut config;		/* filled in by opclass config method */
 
-	SpGistTypeDesc attType;		/* type of input data and leaf values */
+	SpGistTypeDesc attType;		/* type of values to be indexed/restored */
+	SpGistTypeDesc attLeafType;		/* type of leaf-tuple values */
 	SpGistTypeDesc attPrefixType;	/* type of inner-tuple prefix values */
 	SpGistTypeDesc attLabelType;	/* type of node label values */
 
@@ -300,7 +302,7 @@ typedef SpGistLeafTupleData *SpGistLeafTuple;
 
 #define SGLTHDRSZ			MAXALIGN(sizeof(SpGistLeafTupleData))
 #define SGLTDATAPTR(x)		(((char *) (x)) + SGLTHDRSZ)
-#define SGLTDATUM(x, s)		((s)->attType.attbyval ? \
+#define SGLTDATUM(x, s)		((s)->attLeafType.attbyval ? \
 							 *(Datum *) SGLTDATAPTR(x) : \
 							 PointerGetDatum(SGLTDATAPTR(x)))
 
diff --git a/src/include/access/spgxlog.h b/src/include/access/spgxlog.h
index cf4331be4a..b72ccb5cc4 100644
--- a/src/include/access/spgxlog.h
+++ b/src/include/access/spgxlog.h
@@ -3,7 +3,7 @@
  * spgxlog.h
  *	  xlog declarations for SP-GiST access method.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/spgxlog.h
diff --git a/src/include/access/stratnum.h b/src/include/access/stratnum.h
index 91d57605b2..bddfac4c10 100644
--- a/src/include/access/stratnum.h
+++ b/src/include/access/stratnum.h
@@ -4,7 +4,7 @@
  *	  POSTGRES strategy number definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/stratnum.h
diff --git a/src/include/access/subtrans.h b/src/include/access/subtrans.h
index 41716d7b71..ce700a60de 100644
--- a/src/include/access/subtrans.h
+++ b/src/include/access/subtrans.h
@@ -3,7 +3,7 @@
  *
  * PostgreSQL subtransaction-log manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/subtrans.h
diff --git a/src/include/access/sysattr.h b/src/include/access/sysattr.h
index b88c5e1141..c6f244011a 100644
--- a/src/include/access/sysattr.h
+++ b/src/include/access/sysattr.h
@@ -4,7 +4,7 @@
  *	  POSTGRES system attribute definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/sysattr.h
diff --git a/src/include/access/timeline.h b/src/include/access/timeline.h
index 4bdb0c1f4f..a9bf18cab6 100644
--- a/src/include/access/timeline.h
+++ b/src/include/access/timeline.h
@@ -3,7 +3,7 @@
  *
  * Functions for reading and writing timeline history files.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/timeline.h
diff --git a/src/include/access/transam.h b/src/include/access/transam.h
index 86076dede1..83ec3f1979 100644
--- a/src/include/access/transam.h
+++ b/src/include/access/transam.h
@@ -4,7 +4,7 @@
  *	  postgres transaction access method support code
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/transam.h
diff --git a/src/include/access/tsmapi.h b/src/include/access/tsmapi.h
index 3d94cc6466..3ecd4737e5 100644
--- a/src/include/access/tsmapi.h
+++ b/src/include/access/tsmapi.h
@@ -3,7 +3,7 @@
  * tsmapi.h
  *	  API for tablesample methods
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * src/include/access/tsmapi.h
  *
diff --git a/src/include/access/tupconvert.h b/src/include/access/tupconvert.h
index 173904adae..66c0ed0882 100644
--- a/src/include/access/tupconvert.h
+++ b/src/include/access/tupconvert.h
@@ -4,7 +4,7 @@
  *	  Tuple conversion support.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/tupconvert.h
diff --git a/src/include/access/tupdesc.h b/src/include/access/tupdesc.h
index e7065d70ba..415efbab97 100644
--- a/src/include/access/tupdesc.h
+++ b/src/include/access/tupdesc.h
@@ -4,7 +4,7 @@
  *	  POSTGRES tuple descriptor definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/tupdesc.h
@@ -60,6 +60,12 @@ typedef struct tupleConstr
  * row type, or a value >= 0 to allow the rowtype to be looked up in the
  * typcache.c type cache.
  *
+ * Note that tdtypeid is never the OID of a domain over composite, even if
+ * we are dealing with values that are known (at some higher level) to be of
+ * a domain-over-composite type.  This is because tdtypeid/tdtypmod need to
+ * match up with the type labeling of composite Datums, and those are never
+ * explicitly marked as being of a domain type, either.
+ *
  * Tuple descriptors that live in caches (relcache or typcache, at present)
  * are reference-counted: they can be deleted when their reference count goes
  * to zero.  Tuple descriptors created by the executor need no reference
@@ -71,15 +77,17 @@ typedef struct tupleConstr
 typedef struct tupleDesc
 {
 	int			natts;			/* number of attributes in the tuple */
-	Form_pg_attribute *attrs;
-	/* attrs[N] is a pointer to the description of Attribute Number N+1 */
-	TupleConstr *constr;		/* constraints, or NULL if none */
 	Oid			tdtypeid;		/* composite type ID for tuple type */
 	int32		tdtypmod;		/* typmod for tuple type */
 	bool		tdhasoid;		/* tuple has oid attribute in its header */
 	int			tdrefcount;		/* reference count, or -1 if not counting */
+	TupleConstr *constr;		/* constraints, or NULL if none */
+	/* attrs[N] is the description of Attribute Number N+1 */
+	FormData_pg_attribute attrs[FLEXIBLE_ARRAY_MEMBER];
 }		   *TupleDesc;
 
+/* Accessor for the i'th attribute of tupdesc. */
+#define TupleDescAttr(tupdesc, i) (&(tupdesc)->attrs[(i)])
 
 extern TupleDesc CreateTemplateTupleDesc(int natts, bool hasoid);
 
@@ -90,6 +98,12 @@ extern TupleDesc CreateTupleDescCopy(TupleDesc tupdesc);
 
 extern TupleDesc CreateTupleDescCopyConstr(TupleDesc tupdesc);
 
+#define TupleDescSize(src) \
+	(offsetof(struct tupleDesc, attrs) + \
+	 (src)->natts * sizeof(FormData_pg_attribute))
+
+extern void TupleDescCopy(TupleDesc dst, TupleDesc src);
+
 extern void TupleDescCopyEntry(TupleDesc dst, AttrNumber dstAttno,
 				   TupleDesc src, AttrNumber srcAttno);
 
@@ -112,6 +126,8 @@ extern void DecrTupleDescRefCount(TupleDesc tupdesc);
 
 extern bool equalTupleDescs(TupleDesc tupdesc1, TupleDesc tupdesc2);
 
+extern uint32 hashTupleDesc(TupleDesc tupdesc);
+
 extern void TupleDescInitEntry(TupleDesc desc,
 				   AttrNumber attributeNumber,
 				   const char *attributeName,
diff --git a/src/include/access/tupmacs.h b/src/include/access/tupmacs.h
index 6746203828..1c3741da65 100644
--- a/src/include/access/tupmacs.h
+++ b/src/include/access/tupmacs.h
@@ -4,7 +4,7 @@
  *	  Tuple macros used by both index tuples and heap tuples.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/tupmacs.h
diff --git a/src/include/access/tuptoaster.h b/src/include/access/tuptoaster.h
index fd9f83ac44..f99291e30d 100644
--- a/src/include/access/tuptoaster.h
+++ b/src/include/access/tuptoaster.h
@@ -4,7 +4,7 @@
  *	  POSTGRES definitions for external and compressed storage
  *	  of variable size attributes.
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/include/access/tuptoaster.h
  *
diff --git a/src/include/access/twophase.h b/src/include/access/twophase.h
index 54dec4eeaf..34d9470811 100644
--- a/src/include/access/twophase.h
+++ b/src/include/access/twophase.h
@@ -4,7 +4,7 @@
  *	  Two-phase-commit related declarations.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/twophase.h
@@ -25,7 +25,7 @@
 typedef struct GlobalTransactionData *GlobalTransaction;
 
 /* GUC variable */
-extern int	max_prepared_xacts;
+extern PGDLLIMPORT int max_prepared_xacts;
 
 extern Size TwoPhaseShmemSize(void);
 extern void TwoPhaseShmemInit(void);
diff --git a/src/include/access/twophase_rmgr.h b/src/include/access/twophase_rmgr.h
index 44cd6d202f..ba9cd932a7 100644
--- a/src/include/access/twophase_rmgr.h
+++ b/src/include/access/twophase_rmgr.h
@@ -4,7 +4,7 @@
  *	  Two-phase-commit resource managers definition
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/twophase_rmgr.h
diff --git a/src/include/access/valid.h b/src/include/access/valid.h
index 53a7d0685a..1e2d23f645 100644
--- a/src/include/access/valid.h
+++ b/src/include/access/valid.h
@@ -4,7 +4,7 @@
  *	  POSTGRES tuple qualification validity definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/valid.h
diff --git a/src/include/access/visibilitymap.h b/src/include/access/visibilitymap.h
index da0e76d6be..b168612b4b 100644
--- a/src/include/access/visibilitymap.h
+++ b/src/include/access/visibilitymap.h
@@ -4,7 +4,7 @@
  *		visibility map interface
  *
  *
- * Portions Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2007-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/visibilitymap.h
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index ad5aad96df..6445bbc46f 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -4,7 +4,7 @@
  *	  postgres transaction system definitions
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xact.h
@@ -350,12 +350,14 @@ extern void CommitTransactionCommand(void);
 extern void AbortCurrentTransaction(void);
 extern void BeginTransactionBlock(void);
 extern bool EndTransactionBlock(void);
-extern bool PrepareTransactionBlock(char *gid);
+extern bool PrepareTransactionBlock(const char *gid);
 extern void UserAbortTransactionBlock(void);
+extern void BeginImplicitTransactionBlock(void);
+extern void EndImplicitTransactionBlock(void);
 extern void ReleaseSavepoint(List *options);
-extern void DefineSavepoint(char *name);
+extern void DefineSavepoint(const char *name);
 extern void RollbackToSavepoint(List *options);
-extern void BeginInternalSubTransaction(char *name);
+extern void BeginInternalSubTransaction(const char *name);
 extern void ReleaseCurrentSubTransaction(void);
 extern void RollbackAndReleaseCurrentSubTransaction(void);
 extern bool IsSubTransaction(void);
diff --git a/src/include/access/xlog.h b/src/include/access/xlog.h
index 66bfb77295..421ba6d775 100644
--- a/src/include/access/xlog.h
+++ b/src/include/access/xlog.h
@@ -3,7 +3,7 @@
  *
  * PostgreSQL write-ahead log manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xlog.h
@@ -43,7 +43,7 @@ extern bool InRecovery;
 /*
  * Like InRecovery, standbyState is only valid in the startup process.
  * In all other processes it will have the value STANDBY_DISABLED (so
- * InHotStandby will read as FALSE).
+ * InHotStandby will read as false).
  *
  * In DISABLED state, we're performing crash recovery or hot standby was
  * disabled in postgresql.conf.
@@ -94,6 +94,7 @@ extern PGDLLIMPORT XLogRecPtr XactLastCommitEnd;
 extern bool reachedConsistency;
 
 /* these variables are GUC parameters related to XLOG */
+extern int	wal_segment_size;
 extern int	min_wal_size_mb;
 extern int	max_wal_size_mb;
 extern int	wal_keep_segments;
@@ -261,6 +262,7 @@ extern XLogRecPtr GetFakeLSNForUnloggedRel(void);
 extern Size XLOGShmemSize(void);
 extern void XLOGShmemInit(void);
 extern void BootStrapXLOG(void);
+extern void LocalProcessControlFile(bool reset);
 extern void StartupXLOG(void);
 extern void ShutdownXLOG(int code, Datum arg);
 extern void InitXLOGAccess(void);
@@ -308,7 +310,7 @@ typedef enum SessionBackupState
 } SessionBackupState;
 
 extern XLogRecPtr do_pg_start_backup(const char *backupidstr, bool fast,
-				   TimeLineID *starttli_p, StringInfo labelfile, DIR *tblspcdir,
+				   TimeLineID *starttli_p, StringInfo labelfile,
 				   List **tablespaces, StringInfo tblspcmapfile, bool infotbssize,
 				   bool needtblspcmapfile);
 extern XLogRecPtr do_pg_stop_backup(char *labelfile, bool waitforarchive,
diff --git a/src/include/access/xlog_internal.h b/src/include/access/xlog_internal.h
index 7453dcbd0e..a5c074642f 100644
--- a/src/include/access/xlog_internal.h
+++ b/src/include/access/xlog_internal.h
@@ -11,7 +11,7 @@
  * Note: This file must be includable in both frontend and backend contexts,
  * to allow stand-alone tools like pg_receivewal to deal with WAL files.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xlog_internal.h
@@ -85,15 +85,27 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
 #define XLogPageHeaderSize(hdr)		\
 	(((hdr)->xlp_info & XLP_LONG_HEADER) ? SizeOfXLogLongPHD : SizeOfXLogShortPHD)
 
-/*
- * The XLOG is split into WAL segments (physical files) of the size indicated
- * by XLOG_SEG_SIZE.
- */
-#define XLogSegSize		((uint32) XLOG_SEG_SIZE)
-#define XLogSegmentsPerXLogId	(UINT64CONST(0x100000000) / XLOG_SEG_SIZE)
+/* wal_segment_size can range from 1MB to 1GB */
+#define WalSegMinSize 1024 * 1024
+#define WalSegMaxSize 1024 * 1024 * 1024
+/* default number of min and max wal segments */
+#define DEFAULT_MIN_WAL_SEGS 5
+#define DEFAULT_MAX_WAL_SEGS 64
+
+/* check that the given size is a valid wal_segment_size */
+#define IsPowerOf2(x) (x > 0 && ((x) & ((x)-1)) == 0)
+#define IsValidWalSegSize(size) \
+	 (IsPowerOf2(size) && \
+	 ((size) >= WalSegMinSize && (size) <= WalSegMaxSize))
+
+#define XLogSegmentsPerXLogId(wal_segsz_bytes)	\
+	(UINT64CONST(0x100000000) / (wal_segsz_bytes))
+
+#define XLogSegNoOffsetToRecPtr(segno, offset, dest, wal_segsz_bytes) \
+		(dest) = (segno) * (wal_segsz_bytes) + (offset)
 
-#define XLogSegNoOffsetToRecPtr(segno, offset, dest) \
-		(dest) = (segno) * XLOG_SEG_SIZE + (offset)
+#define XLogSegmentOffset(xlogptr, wal_segsz_bytes)	\
+	((xlogptr) & ((wal_segsz_bytes) - 1))
 
 /*
  * Compute a segment number from an XLogRecPtr.
@@ -103,11 +115,11 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
  * for deciding which segment to write given a pointer to a record end,
  * for example.
  */
-#define XLByteToSeg(xlrp, logSegNo) \
-	logSegNo = (xlrp) / XLogSegSize
+#define XLByteToSeg(xlrp, logSegNo, wal_segsz_bytes) \
+	logSegNo = (xlrp) / (wal_segsz_bytes)
 
-#define XLByteToPrevSeg(xlrp, logSegNo) \
-	logSegNo = ((xlrp) - 1) / XLogSegSize
+#define XLByteToPrevSeg(xlrp, logSegNo, wal_segsz_bytes) \
+	logSegNo = ((xlrp) - 1) / (wal_segsz_bytes)
 
 /*
  * Is an XLogRecPtr within a particular XLOG segment?
@@ -115,11 +127,11 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
  * For XLByteInSeg, do the computation at face value.  For XLByteInPrevSeg,
  * a boundary byte is taken to be in the previous segment.
  */
-#define XLByteInSeg(xlrp, logSegNo) \
-	(((xlrp) / XLogSegSize) == (logSegNo))
+#define XLByteInSeg(xlrp, logSegNo, wal_segsz_bytes) \
+	(((xlrp) / (wal_segsz_bytes)) == (logSegNo))
 
-#define XLByteInPrevSeg(xlrp, logSegNo) \
-	((((xlrp) - 1) / XLogSegSize) == (logSegNo))
+#define XLByteInPrevSeg(xlrp, logSegNo, wal_segsz_bytes) \
+	((((xlrp) - 1) / (wal_segsz_bytes)) == (logSegNo))
 
 /* Check if an XLogRecPtr value is in a plausible range */
 #define XRecOffIsValid(xlrp) \
@@ -140,10 +152,10 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
 /* Length of XLog file name */
 #define XLOG_FNAME_LEN	   24
 
-#define XLogFileName(fname, tli, logSegNo)	\
+#define XLogFileName(fname, tli, logSegNo, wal_segsz_bytes)	\
 	snprintf(fname, MAXFNAMELEN, "%08X%08X%08X", tli,		\
-			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId), \
-			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId))
+			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId(wal_segsz_bytes)))
 
 #define XLogFileNameById(fname, tli, log, seg)	\
 	snprintf(fname, MAXFNAMELEN, "%08X%08X%08X", tli, log, seg)
@@ -162,18 +174,18 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
 	 strspn(fname, "0123456789ABCDEF") == XLOG_FNAME_LEN &&		\
 	 strcmp((fname) + XLOG_FNAME_LEN, ".partial") == 0)
 
-#define XLogFromFileName(fname, tli, logSegNo)	\
+#define XLogFromFileName(fname, tli, logSegNo, wal_segsz_bytes)	\
 	do {												\
 		uint32 log;										\
 		uint32 seg;										\
 		sscanf(fname, "%08X%08X%08X", tli, &log, &seg); \
-		*logSegNo = (uint64) log * XLogSegmentsPerXLogId + seg; \
+		*logSegNo = (uint64) log * XLogSegmentsPerXLogId(wal_segsz_bytes) + seg; \
 	} while (0)
 
-#define XLogFilePath(path, tli, logSegNo)	\
-	snprintf(path, MAXPGPATH, XLOGDIR "/%08X%08X%08X", tli,				\
-			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId),				\
-			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId))
+#define XLogFilePath(path, tli, logSegNo, wal_segsz_bytes)	\
+	snprintf(path, MAXPGPATH, XLOGDIR "/%08X%08X%08X", tli,	\
+			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId(wal_segsz_bytes)))
 
 #define TLHistoryFileName(fname, tli)	\
 	snprintf(fname, MAXFNAMELEN, "%08X.history", tli)
@@ -189,20 +201,22 @@ typedef XLogLongPageHeaderData *XLogLongPageHeader;
 #define StatusFilePath(path, xlog, suffix)	\
 	snprintf(path, MAXPGPATH, XLOGDIR "/archive_status/%s%s", xlog, suffix)
 
-#define BackupHistoryFileName(fname, tli, logSegNo, offset) \
+#define BackupHistoryFileName(fname, tli, logSegNo, startpoint, wal_segsz_bytes) \
 	snprintf(fname, MAXFNAMELEN, "%08X%08X%08X.%08X.backup", tli, \
-			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId),		  \
-			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId), offset)
+			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) (XLogSegmentOffset(startpoint, wal_segsz_bytes)))
 
 #define IsBackupHistoryFileName(fname) \
 	(strlen(fname) > XLOG_FNAME_LEN && \
 	 strspn(fname, "0123456789ABCDEF") == XLOG_FNAME_LEN && \
 	 strcmp((fname) + strlen(fname) - strlen(".backup"), ".backup") == 0)
 
-#define BackupHistoryFilePath(path, tli, logSegNo, offset)	\
+#define BackupHistoryFilePath(path, tli, logSegNo, startpoint, wal_segsz_bytes)	\
 	snprintf(path, MAXPGPATH, XLOGDIR "/%08X%08X%08X.%08X.backup", tli, \
-			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId), \
-			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId), offset)
+			 (uint32) ((logSegNo) / XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) ((logSegNo) % XLogSegmentsPerXLogId(wal_segsz_bytes)), \
+			 (uint32) (XLogSegmentOffset((startpoint), wal_segsz_bytes)))
 
 /*
  * Information logged when we detect a change in one of the parameters
@@ -307,9 +321,9 @@ extern char *recoveryRestoreCommand;
 extern bool RestoreArchivedFile(char *path, const char *xlogfname,
 					const char *recovername, off_t expectedSize,
 					bool cleanupEnabled);
-extern void ExecuteRecoveryCommand(char *command, char *commandName,
+extern void ExecuteRecoveryCommand(const char *command, const char *commandName,
 					   bool failOnerror);
-extern void KeepFileRestoredFromArchive(char *path, char *xlogfname);
+extern void KeepFileRestoredFromArchive(const char *path, const char *xlogfname);
 extern void XLogArchiveNotify(const char *xlog);
 extern void XLogArchiveNotifySeg(XLogSegNo segno);
 extern void XLogArchiveForceDone(const char *xlog);
diff --git a/src/include/access/xlogdefs.h b/src/include/access/xlogdefs.h
index 3a80d6be6f..0a48d1cfb4 100644
--- a/src/include/access/xlogdefs.h
+++ b/src/include/access/xlogdefs.h
@@ -4,7 +4,7 @@
  * Postgres write-ahead log manager record pointer and
  * timeline number definitions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xlogdefs.h
diff --git a/src/include/access/xloginsert.h b/src/include/access/xloginsert.h
index 174c88677f..fa62f915af 100644
--- a/src/include/access/xloginsert.h
+++ b/src/include/access/xloginsert.h
@@ -3,7 +3,7 @@
  *
  * Functions for generating WAL records
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xloginsert.h
diff --git a/src/include/access/xlogreader.h b/src/include/access/xlogreader.h
index 7671598334..688422f61c 100644
--- a/src/include/access/xlogreader.h
+++ b/src/include/access/xlogreader.h
@@ -3,7 +3,7 @@
  * xlogreader.h
  *		Definitions for the generic XLog reading facility
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/access/xlogreader.h
@@ -73,6 +73,11 @@ struct XLogReaderState
 	 * ----------------------------------------
 	 */
 
+	/*
+	 * Segment size of the to-be-parsed data (mandatory).
+	 */
+	int			wal_segment_size;
+
 	/*
 	 * Data input callback (mandatory).
 	 *
@@ -189,7 +194,8 @@ struct XLogReaderState
 };
 
 /* Get a new XLogReader */
-extern XLogReaderState *XLogReaderAllocate(XLogPageReadCB pagereadfunc,
+extern XLogReaderState *XLogReaderAllocate(int wal_segment_size,
+				   XLogPageReadCB pagereadfunc,
 				   void *private_data);
 
 /* Free an XLogReader */
diff --git a/src/include/access/xlogrecord.h b/src/include/access/xlogrecord.h
index b53960e112..863781937e 100644
--- a/src/include/access/xlogrecord.h
+++ b/src/include/access/xlogrecord.h
@@ -3,7 +3,7 @@
  *
  * Definitions for the WAL record format.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xlogrecord.h
diff --git a/src/include/access/xlogutils.h b/src/include/access/xlogutils.h
index 114ffbcc53..c406699936 100644
--- a/src/include/access/xlogutils.h
+++ b/src/include/access/xlogutils.h
@@ -3,7 +3,7 @@
  *
  * Utilities for replaying WAL records.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/access/xlogutils.h
diff --git a/src/include/bootstrap/bootstrap.h b/src/include/bootstrap/bootstrap.h
index 35eb9a4ff5..4f4129419f 100644
--- a/src/include/bootstrap/bootstrap.h
+++ b/src/include/bootstrap/bootstrap.h
@@ -4,7 +4,7 @@
  *	  include file for the bootstrapping code
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/bootstrap/bootstrap.h
diff --git a/src/include/c.h b/src/include/c.h
index 60e3fa333f..65581afeac 100644
--- a/src/include/c.h
+++ b/src/include/c.h
@@ -9,7 +9,7 @@
  *	  polluting the namespace with lots of stuff...
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/c.h
@@ -26,19 +26,20 @@
  *	  section	description
  *	  -------	------------------------------------------------
  *		0)		pg_config.h and standard system headers
- *		1)		hacks to cope with non-ANSI C compilers
- *		2)		bool, true, false, TRUE, FALSE, NULL
+ *		1)		compiler characteristics
+ *		2)		bool, true, false
  *		3)		standard system types
  *		4)		IsValid macros for system types
- *		5)		offsetof, lengthof, endof, alignment
+ *		5)		offsetof, lengthof, alignment
  *		6)		assertions
  *		7)		widely useful macros
  *		8)		random stuff
  *		9)		system-specific hacks
  *
- * NOTE: since this file is included by both frontend and backend modules, it's
- * almost certainly wrong to put an "extern" declaration here.  typedefs and
- * macros are the kind of thing that might go here.
+ * NOTE: since this file is included by both frontend and backend modules,
+ * it's usually wrong to put an "extern" declaration here, unless it's
+ * ifdef'd so that it's seen in only one case or the other.
+ * typedefs and macros are the kind of thing that might go here.
  *
  *----------------------------------------------------------------
  */
@@ -52,36 +53,9 @@
 
 #include "pg_config.h"
 #include "pg_config_manual.h"	/* must be after pg_config.h */
-
-/*
- * We always rely on the WIN32 macro being set by our build system,
- * but _WIN32 is the compiler pre-defined macro. So make sure we define
- * WIN32 whenever _WIN32 is set, to facilitate standalone building.
- */
-#if defined(_WIN32) && !defined(WIN32)
-#define WIN32
-#endif
-
-#if !defined(WIN32) && !defined(__CYGWIN__) /* win32 includes further down */
 #include "pg_config_os.h"		/* must be before any system header files */
-#endif
-
-#if _MSC_VER >= 1400 || defined(HAVE_CRTDEFS_H)
-#define errcode __msvc_errcode
-#include <crtdefs.h>
-#undef errcode
-#endif
-
-#if _MSC_VER >= 1800 && defined(USE_FP_STRICT)
-#pragma fenv_access (off)
-#endif
-
-/*
- * We have to include stdlib.h here because it defines many of these macros
- * on some platforms, and we only want our definitions used if stdlib.h doesn't
- * have its own.  The same goes for stddef and stdarg if present.
- */
 
+/* System header files that should be available everywhere in Postgres */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -94,61 +68,152 @@
 #include <stdint.h>
 #endif
 #include <sys/types.h>
-
 #include <errno.h>
 #if defined(WIN32) || defined(__CYGWIN__)
 #include <fcntl.h>				/* ensure O_BINARY is available */
 #endif
-
-#if defined(WIN32) || defined(__CYGWIN__)
-/* We have to redefine some system functions after they are included above. */
-#include "pg_config_os.h"
+#include <locale.h>
+#ifdef ENABLE_NLS
+#include <libintl.h>
 #endif
 
-/*
- * Force disable inlining if PG_FORCE_DISABLE_INLINE is defined. This is used
- * to work around compiler bugs and might also be useful for investigatory
- * purposes by defining the symbol in the platform's header..
+
+/* ----------------------------------------------------------------
+ *				Section 1: compiler characteristics
  *
- * This is done early (in slightly the wrong section) as functionality later
- * in this file might want to rely on inline functions.
+ * type prefixes (const, signed, volatile, inline) are handled in pg_config.h.
+ * ----------------------------------------------------------------
+ */
+
+/*
+ * Disable "inline" if PG_FORCE_DISABLE_INLINE is defined.
+ * This is used to work around compiler bugs and might also be useful for
+ * investigatory purposes.
  */
 #ifdef PG_FORCE_DISABLE_INLINE
 #undef inline
 #define inline
 #endif
 
-/* Must be before gettext() games below */
-#include <locale.h>
+/*
+ * Attribute macros
+ *
+ * GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
+ * GCC: https://gcc.gnu.org/onlinedocs/gcc/Type-Attributes.html
+ * Sunpro: https://docs.oracle.com/cd/E18659_01/html/821-1384/gjzke.html
+ * XLC: http://www-01.ibm.com/support/knowledgecenter/SSGH2K_11.1.0/com.ibm.xlc111.aix.doc/language_ref/function_attributes.html
+ * XLC: http://www-01.ibm.com/support/knowledgecenter/SSGH2K_11.1.0/com.ibm.xlc111.aix.doc/language_ref/type_attrib.html
+ */
 
-#define _(x) gettext(x)
+/* only GCC supports the unused attribute */
+#ifdef __GNUC__
+#define pg_attribute_unused() __attribute__((unused))
+#else
+#define pg_attribute_unused()
+#endif
 
-#ifdef ENABLE_NLS
-#include <libintl.h>
+/* restrict attribute */
+#ifdef HAVE_RESTRICT
+#define pg_restrict restrict
 #else
-#define gettext(x) (x)
-#define dgettext(d,x) (x)
-#define ngettext(s,p,n) ((n) == 1 ? (s) : (p))
-#define dngettext(d,s,p,n) ((n) == 1 ? (s) : (p))
+#define pg_restrict
 #endif
 
 /*
- *	Use this to mark string constants as needing translation at some later
- *	time, rather than immediately.  This is useful for cases where you need
- *	access to the original string and translated string, and for cases where
- *	immediate translation is not possible, like when initializing global
- *	variables.
- *		http://www.gnu.org/software/autoconf/manual/gettext/Special-cases.html
+ * Append PG_USED_FOR_ASSERTS_ONLY to definitions of variables that are only
+ * used in assert-enabled builds, to avoid compiler warnings about unused
+ * variables in assert-disabled builds.
  */
-#define gettext_noop(x) (x)
+#ifdef USE_ASSERT_CHECKING
+#define PG_USED_FOR_ASSERTS_ONLY
+#else
+#define PG_USED_FOR_ASSERTS_ONLY pg_attribute_unused()
+#endif
+
+/* GCC and XLC support format attributes */
+#if defined(__GNUC__) || defined(__IBMC__)
+#define pg_attribute_format_arg(a) __attribute__((format_arg(a)))
+#define pg_attribute_printf(f,a) __attribute__((format(PG_PRINTF_ATTRIBUTE, f, a)))
+#else
+#define pg_attribute_format_arg(a)
+#define pg_attribute_printf(f,a)
+#endif
 
+/* GCC, Sunpro and XLC support aligned, packed and noreturn */
+#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
+#define pg_attribute_aligned(a) __attribute__((aligned(a)))
+#define pg_attribute_noreturn() __attribute__((noreturn))
+#define pg_attribute_packed() __attribute__((packed))
+#define HAVE_PG_ATTRIBUTE_NORETURN 1
+#else
+/*
+ * NB: aligned and packed are not given default definitions because they
+ * affect code functionality; they *must* be implemented by the compiler
+ * if they are to be used.
+ */
+#define pg_attribute_noreturn()
+#endif
 
-/* ----------------------------------------------------------------
- *				Section 1: hacks to cope with non-ANSI C compilers
+/*
+ * Use "pg_attribute_always_inline" in place of "inline" for functions that
+ * we wish to force inlining of, even when the compiler's heuristics would
+ * choose not to.  But, if possible, don't force inlining in unoptimized
+ * debug builds.
+ */
+#if (defined(__GNUC__) && __GNUC__ > 3 && defined(__OPTIMIZE__)) || defined(__SUNPRO_C) || defined(__IBMC__)
+/* GCC > 3, Sunpro and XLC support always_inline via __attribute__ */
+#define pg_attribute_always_inline __attribute__((always_inline)) inline
+#elif defined(_MSC_VER)
+/* MSVC has a special keyword for this */
+#define pg_attribute_always_inline __forceinline
+#else
+/* Otherwise, the best we can do is to say "inline" */
+#define pg_attribute_always_inline inline
+#endif
+
+/*
+ * Forcing a function not to be inlined can be useful if it's the slow path of
+ * a performance-critical function, or should be visible in profiles to allow
+ * for proper cost attribution.  Note that unlike the pg_attribute_XXX macros
+ * above, this should be placed before the function's return type and name.
+ */
+/* GCC, Sunpro and XLC support noinline via __attribute__ */
+#if (defined(__GNUC__) && __GNUC__ > 2) || defined(__SUNPRO_C) || defined(__IBMC__)
+#define pg_noinline __attribute__((noinline))
+/* msvc via declspec */
+#elif defined(_MSC_VER)
+#define pg_noinline __declspec(noinline)
+#else
+#define pg_noinline
+#endif
+
+/*
+ * Mark a point as unreachable in a portable fashion.  This should preferably
+ * be something that the compiler understands, to aid code generation.
+ * In assert-enabled builds, we prefer abort() for debugging reasons.
+ */
+#if defined(HAVE__BUILTIN_UNREACHABLE) && !defined(USE_ASSERT_CHECKING)
+#define pg_unreachable() __builtin_unreachable()
+#elif defined(_MSC_VER) && !defined(USE_ASSERT_CHECKING)
+#define pg_unreachable() __assume(0)
+#else
+#define pg_unreachable() abort()
+#endif
+
+/*
+ * Hints to the compiler about the likelihood of a branch. Both likely() and
+ * unlikely() return the boolean value of the contained expression.
  *
- * type prefixes (const, signed, volatile, inline) are handled in pg_config.h.
- * ----------------------------------------------------------------
+ * These should only be used sparingly, in very hot code paths. It's very easy
+ * to mis-estimate likelihoods.
  */
+#if __GNUC__ >= 3
+#define likely(x)	__builtin_expect((x) != 0, 1)
+#define unlikely(x) __builtin_expect((x) != 0, 0)
+#else
+#define likely(x)	((x) != 0)
+#define unlikely(x) ((x) != 0)
+#endif
 
 /*
  * CppAsString
@@ -187,8 +252,9 @@
 #endif
 #endif
 
+
 /* ----------------------------------------------------------------
- *				Section 2:	bool, true, false, TRUE, FALSE, NULL
+ *				Section 2:	bool, true, false
  * ----------------------------------------------------------------
  */
 
@@ -213,25 +279,8 @@ typedef char bool;
 #ifndef false
 #define false	((bool) 0)
 #endif
-#endif							/* not C++ */
 
-typedef bool *BoolPtr;
-
-#ifndef TRUE
-#define TRUE	1
-#endif
-
-#ifndef FALSE
-#define FALSE	0
-#endif
-
-/*
- * NULL
- *		Null pointer.
- */
-#ifndef NULL
-#define NULL	((void *) 0)
-#endif
+#endif							/* not C++ */
 
 
 /* ----------------------------------------------------------------
@@ -292,6 +341,8 @@ typedef long int int64;
 #ifndef HAVE_UINT64
 typedef unsigned long int uint64;
 #endif
+#define INT64CONST(x)  (x##L)
+#define UINT64CONST(x) (x##UL)
 #elif defined(HAVE_LONG_LONG_INT_64)
 /* We have working support for "long long int", use that */
 
@@ -301,28 +352,24 @@ typedef long long int int64;
 #ifndef HAVE_UINT64
 typedef unsigned long long int uint64;
 #endif
+#define INT64CONST(x)  (x##LL)
+#define UINT64CONST(x) (x##ULL)
 #else
 /* neither HAVE_LONG_INT_64 nor HAVE_LONG_LONG_INT_64 */
 #error must have a working 64-bit integer datatype
 #endif
 
-/* Decide if we need to decorate 64-bit constants */
-#ifdef HAVE_LL_CONSTANTS
-#define INT64CONST(x)  ((int64) x##LL)
-#define UINT64CONST(x) ((uint64) x##ULL)
-#else
-#define INT64CONST(x)  ((int64) x)
-#define UINT64CONST(x) ((uint64) x)
-#endif
-
 /* snprintf format strings to use for 64-bit integers */
 #define INT64_FORMAT "%" INT64_MODIFIER "d"
 #define UINT64_FORMAT "%" INT64_MODIFIER "u"
 
 /*
  * 128-bit signed and unsigned integers
- *		There currently is only a limited support for the type. E.g. 128bit
- *		literals and snprintf are not supported; but math is.
+ *		There currently is only limited support for such types.
+ *		E.g. 128bit literals and snprintf are not supported; but math is.
+ *		Also, because we exclude such types when choosing MAXIMUM_ALIGNOF,
+ *		it must be possible to coerce the compiler to allocate them on no
+ *		more than MAXALIGN boundaries.
  */
 #if defined(HAVE_INT128)
 typedef PG_INT128_TYPE int128;
@@ -341,11 +388,20 @@ typedef unsigned PG_INT128_TYPE uint128;
 #define PG_UINT16_MAX	(0xFFFF)
 #define PG_INT32_MIN	(-0x7FFFFFFF-1)
 #define PG_INT32_MAX	(0x7FFFFFFF)
-#define PG_UINT32_MAX	(0xFFFFFFFF)
+#define PG_UINT32_MAX	(0xFFFFFFFFU)
 #define PG_INT64_MIN	(-INT64CONST(0x7FFFFFFFFFFFFFFF) - 1)
 #define PG_INT64_MAX	INT64CONST(0x7FFFFFFFFFFFFFFF)
 #define PG_UINT64_MAX	UINT64CONST(0xFFFFFFFFFFFFFFFF)
 
+/* Max value of size_t might also be missing if we don't have stdint.h */
+#ifndef SIZE_MAX
+#if SIZEOF_SIZE_T == 8
+#define SIZE_MAX PG_UINT64_MAX
+#else
+#define SIZE_MAX PG_UINT32_MAX
+#endif
+#endif
+
 /*
  * We now always use int64 timestamps, but keep this symbol defined for the
  * benefit of external code that might test it.
@@ -501,16 +557,6 @@ typedef NameData *Name;
 
 #define NameStr(name)	((name).data)
 
-/*
- * Support macros for escaping strings.  escape_backslash should be TRUE
- * if generating a non-standard-conforming string.  Prefixing a string
- * with ESCAPE_STRING_SYNTAX guarantees it is non-standard-conforming.
- * Beware of multiple evaluation of the "ch" argument!
- */
-#define SQL_STR_DOUBLE(ch, escape_backslash)	\
-	((ch) == '\'' || ((ch) == '\\' && (escape_backslash)))
-
-#define ESCAPE_STRING_SYNTAX	'E'
 
 /* ----------------------------------------------------------------
  *				Section 4:	IsValid macros for system types
@@ -544,7 +590,7 @@ typedef NameData *Name;
 
 
 /* ----------------------------------------------------------------
- *				Section 5:	offsetof, lengthof, endof, alignment
+ *				Section 5:	offsetof, lengthof, alignment
  * ----------------------------------------------------------------
  */
 /*
@@ -564,12 +610,6 @@ typedef NameData *Name;
  */
 #define lengthof(array) (sizeof (array) / sizeof ((array)[0]))
 
-/*
- * endof
- *		Address of the element one past the last in an array.
- */
-#define endof(array)	(&(array)[lengthof(array)])
-
 /* ----------------
  * Alignment macros: align a length or address appropriately for a given type.
  * The fooALIGN() macros round up to a multiple of the required alignment,
@@ -578,6 +618,9 @@ typedef NameData *Name;
  *
  * NOTE: TYPEALIGN[_DOWN] will not work if ALIGNVAL is not a power of 2.
  * That case seems extremely unlikely to be needed in practice, however.
+ *
+ * NOTE: MAXIMUM_ALIGNOF, and hence MAXALIGN(), intentionally exclude any
+ * larger-than-8-byte types the compiler might have.
  * ----------------
  */
 
@@ -615,47 +658,6 @@ typedef NameData *Name;
 /* we don't currently need wider versions of the other ALIGN macros */
 #define MAXALIGN64(LEN)			TYPEALIGN64(MAXIMUM_ALIGNOF, (LEN))
 
-/* ----------------
- * Attribute macros
- *
- * GCC: https://gcc.gnu.org/onlinedocs/gcc/Function-Attributes.html
- * GCC: https://gcc.gnu.org/onlinedocs/gcc/Type-Attributes.html
- * Sunpro: https://docs.oracle.com/cd/E18659_01/html/821-1384/gjzke.html
- * XLC: http://www-01.ibm.com/support/knowledgecenter/SSGH2K_11.1.0/com.ibm.xlc111.aix.doc/language_ref/function_attributes.html
- * XLC: http://www-01.ibm.com/support/knowledgecenter/SSGH2K_11.1.0/com.ibm.xlc111.aix.doc/language_ref/type_attrib.html
- * ----------------
- */
-
-/* only GCC supports the unused attribute */
-#ifdef __GNUC__
-#define pg_attribute_unused() __attribute__((unused))
-#else
-#define pg_attribute_unused()
-#endif
-
-/* GCC and XLC support format attributes */
-#if defined(__GNUC__) || defined(__IBMC__)
-#define pg_attribute_format_arg(a) __attribute__((format_arg(a)))
-#define pg_attribute_printf(f,a) __attribute__((format(PG_PRINTF_ATTRIBUTE, f, a)))
-#else
-#define pg_attribute_format_arg(a)
-#define pg_attribute_printf(f,a)
-#endif
-
-/* GCC, Sunpro and XLC support aligned, packed and noreturn */
-#if defined(__GNUC__) || defined(__SUNPRO_C) || defined(__IBMC__)
-#define pg_attribute_aligned(a) __attribute__((aligned(a)))
-#define pg_attribute_noreturn() __attribute__((noreturn))
-#define pg_attribute_packed() __attribute__((packed))
-#define HAVE_PG_ATTRIBUTE_NORETURN 1
-#else
-/*
- * NB: aligned and packed are not given default definitions because they
- * affect code functionality; they *must* be implemented by the compiler
- * if they are to be used.
- */
-#define pg_attribute_noreturn()
-#endif
 
 /* ----------------------------------------------------------------
  *				Section 6:	assertions
@@ -692,6 +694,7 @@ typedef NameData *Name;
 #define AssertArg(condition) assert(condition)
 #define AssertState(condition) assert(condition)
 #define AssertPointerAlignment(ptr, bndr)	((void)true)
+
 #else							/* USE_ASSERT_CHECKING && !FRONTEND */
 
 /*
@@ -738,6 +741,18 @@ typedef NameData *Name;
 
 #endif							/* USE_ASSERT_CHECKING && !FRONTEND */
 
+/*
+ * ExceptionalCondition is compiled into the backend whether or not
+ * USE_ASSERT_CHECKING is defined, so as to support use of extensions
+ * that are built with that #define with a backend that isn't.  Hence,
+ * we should declare it as long as !FRONTEND.
+ */
+#ifndef FRONTEND
+extern void ExceptionalCondition(const char *conditionName,
+					 const char *errorType,
+					 const char *fileName, int lineNumber) pg_attribute_noreturn();
+#endif
+
 /*
  * Macros to support compile-time assertion checks.
  *
@@ -752,17 +767,31 @@ typedef NameData *Name;
  * about a negative width for a struct bit-field.  This will not include a
  * helpful error message, but it beats not getting an error at all.
  */
+#ifndef __cplusplus
 #ifdef HAVE__STATIC_ASSERT
 #define StaticAssertStmt(condition, errmessage) \
 	do { _Static_assert(condition, errmessage); } while(0)
 #define StaticAssertExpr(condition, errmessage) \
-	({ StaticAssertStmt(condition, errmessage); true; })
+	((void) ({ StaticAssertStmt(condition, errmessage); true; }))
 #else							/* !HAVE__STATIC_ASSERT */
 #define StaticAssertStmt(condition, errmessage) \
 	((void) sizeof(struct { int static_assert_failure : (condition) ? 1 : -1; }))
 #define StaticAssertExpr(condition, errmessage) \
 	StaticAssertStmt(condition, errmessage)
 #endif							/* HAVE__STATIC_ASSERT */
+#else							/* C++ */
+#if defined(__cpp_static_assert) && __cpp_static_assert >= 200410
+#define StaticAssertStmt(condition, errmessage) \
+	static_assert(condition, errmessage)
+#define StaticAssertExpr(condition, errmessage) \
+	({ static_assert(condition, errmessage); })
+#else
+#define StaticAssertStmt(condition, errmessage) \
+	do { struct static_assert_struct { int static_assert_failure : (condition) ? 1 : -1; }; } while(0)
+#define StaticAssertExpr(condition, errmessage) \
+	((void) ({ StaticAssertStmt(condition, errmessage); }))
+#endif
+#endif							/* C++ */
 
 
 /*
@@ -781,14 +810,14 @@ typedef NameData *Name;
 	StaticAssertStmt(__builtin_types_compatible_p(__typeof__(varname), typename), \
 	CppAsString(varname) " does not have type " CppAsString(typename))
 #define AssertVariableIsOfTypeMacro(varname, typename) \
-	((void) StaticAssertExpr(__builtin_types_compatible_p(__typeof__(varname), typename), \
+	(StaticAssertExpr(__builtin_types_compatible_p(__typeof__(varname), typename), \
 	 CppAsString(varname) " does not have type " CppAsString(typename)))
 #else							/* !HAVE__BUILTIN_TYPES_COMPATIBLE_P */
 #define AssertVariableIsOfType(varname, typename) \
 	StaticAssertStmt(sizeof(varname) == sizeof(typename), \
 	CppAsString(varname) " does not have type " CppAsString(typename))
 #define AssertVariableIsOfTypeMacro(varname, typename) \
-	((void) StaticAssertExpr(sizeof(varname) == sizeof(typename),		\
+	(StaticAssertExpr(sizeof(varname) == sizeof(typename), \
 	 CppAsString(varname) " does not have type " CppAsString(typename)))
 #endif							/* HAVE__BUILTIN_TYPES_COMPATIBLE_P */
 
@@ -937,36 +966,6 @@ typedef NameData *Name;
 	} while (0)
 
 
-/*
- * Mark a point as unreachable in a portable fashion.  This should preferably
- * be something that the compiler understands, to aid code generation.
- * In assert-enabled builds, we prefer abort() for debugging reasons.
- */
-#if defined(HAVE__BUILTIN_UNREACHABLE) && !defined(USE_ASSERT_CHECKING)
-#define pg_unreachable() __builtin_unreachable()
-#elif defined(_MSC_VER) && !defined(USE_ASSERT_CHECKING)
-#define pg_unreachable() __assume(0)
-#else
-#define pg_unreachable() abort()
-#endif
-
-
-/*
- * Hints to the compiler about the likelihood of a branch. Both likely() and
- * unlikely() return the boolean value of the contained expression.
- *
- * These should only be used sparingly, in very hot code paths. It's very easy
- * to mis-estimate likelihoods.
- */
-#if __GNUC__ >= 3
-#define likely(x)	__builtin_expect((x) != 0, 1)
-#define unlikely(x) __builtin_expect((x) != 0, 0)
-#else
-#define likely(x)	((x) != 0)
-#define unlikely(x) ((x) != 0)
-#endif
-
-
 /* ----------------------------------------------------------------
  *				Section 8:	random stuff
  * ----------------------------------------------------------------
@@ -976,26 +975,47 @@ typedef NameData *Name;
 #define HIGHBIT					(0x80)
 #define IS_HIGHBIT_SET(ch)		((unsigned char)(ch) & HIGHBIT)
 
+/*
+ * Support macros for escaping strings.  escape_backslash should be true
+ * if generating a non-standard-conforming string.  Prefixing a string
+ * with ESCAPE_STRING_SYNTAX guarantees it is non-standard-conforming.
+ * Beware of multiple evaluation of the "ch" argument!
+ */
+#define SQL_STR_DOUBLE(ch, escape_backslash)	\
+	((ch) == '\'' || ((ch) == '\\' && (escape_backslash)))
+
+#define ESCAPE_STRING_SYNTAX	'E'
+
+
 #define STATUS_OK				(0)
 #define STATUS_ERROR			(-1)
 #define STATUS_EOF				(-2)
 #define STATUS_FOUND			(1)
 #define STATUS_WAITING			(2)
 
-
 /*
- * Append PG_USED_FOR_ASSERTS_ONLY to definitions of variables that are only
- * used in assert-enabled builds, to avoid compiler warnings about unused
- * variables in assert-disabled builds.
+ * gettext support
  */
-#ifdef USE_ASSERT_CHECKING
-#define PG_USED_FOR_ASSERTS_ONLY
-#else
-#define PG_USED_FOR_ASSERTS_ONLY pg_attribute_unused()
+
+#ifndef ENABLE_NLS
+/* stuff we'd otherwise get from <libintl.h> */
+#define gettext(x) (x)
+#define dgettext(d,x) (x)
+#define ngettext(s,p,n) ((n) == 1 ? (s) : (p))
+#define dngettext(d,s,p,n) ((n) == 1 ? (s) : (p))
 #endif
 
+#define _(x) gettext(x)
 
-/* gettext domain name mangling */
+/*
+ *	Use this to mark string constants as needing translation at some later
+ *	time, rather than immediately.  This is useful for cases where you need
+ *	access to the original string and translated string, and for cases where
+ *	immediate translation is not possible, like when initializing global
+ *	variables.
+ *		http://www.gnu.org/software/autoconf/manual/gettext/Special-cases.html
+ */
+#define gettext_noop(x) (x)
 
 /*
  * To better support parallel installations of major PostgreSQL
@@ -1110,14 +1130,6 @@ extern int	fdatasync(int fildes);
 #define HAVE_STRTOULL 1
 #endif
 
-/*
- * We assume if we have these two functions, we have their friends too, and
- * can use the wide-character functions.
- */
-#if defined(HAVE_WCSTOMBS) && defined(HAVE_TOWLOWER)
-#define USE_WIDE_UPPER_LOWER
-#endif
-
 /* EXEC_BACKEND defines */
 #ifdef EXEC_BACKEND
 #define NON_EXEC_STATIC
diff --git a/src/include/catalog/binary_upgrade.h b/src/include/catalog/binary_upgrade.h
index 5ff365fe53..abc6e1ae1d 100644
--- a/src/include/catalog/binary_upgrade.h
+++ b/src/include/catalog/binary_upgrade.h
@@ -4,7 +4,7 @@
  *	  variables used for binary upgrades
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/binary_upgrade.h
diff --git a/src/include/catalog/catalog.h b/src/include/catalog/catalog.h
index 8ce9a9966a..3e280b3750 100644
--- a/src/include/catalog/catalog.h
+++ b/src/include/catalog/catalog.h
@@ -4,7 +4,7 @@
  *	  prototypes for functions in backend/catalog/catalog.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/catalog.h
diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h
index 0dafd6bf2a..e9484e10a4 100644
--- a/src/include/catalog/catversion.h
+++ b/src/include/catalog/catversion.h
@@ -34,7 +34,7 @@
  * database contents or layout, such as altering tuple headers.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/catversion.h
@@ -53,6 +53,6 @@
  */
 
 /*							yyyymmddN */
-#define CATALOG_VERSION_NO	201707211
+#define CATALOG_VERSION_NO	201802241
 
 #endif
diff --git a/src/include/catalog/dependency.h b/src/include/catalog/dependency.h
index b9f98423cc..46c271a46c 100644
--- a/src/include/catalog/dependency.h
+++ b/src/include/catalog/dependency.h
@@ -4,7 +4,7 @@
  *	  Routines to support inter-object dependencies.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/dependency.h
@@ -49,6 +49,20 @@
  * Example: a trigger that's created to enforce a foreign-key constraint
  * is made internally dependent on the constraint's pg_constraint entry.
  *
+ * DEPENDENCY_INTERNAL_AUTO ('I'): the dependent object was created as
+ * part of creation of the referenced object, and is really just a part
+ * of its internal implementation.  A DROP of the dependent object will
+ * be disallowed outright (we'll tell the user to issue a DROP against the
+ * referenced object, instead).  While a regular internal dependency will
+ * prevent the dependent object from being dropped while any such
+ * dependencies remain, DEPENDENCY_INTERNAL_AUTO will allow such a drop as
+ * long as the object can be found by following any of such dependencies.
+ * Example: an index on a partition is made internal-auto-dependent on
+ * both the partition itself as well as on the index on the parent
+ * partitioned table; so the partition index is dropped together with
+ * either the partition it indexes, or with the parent index it is attached
+ * to.
+
  * DEPENDENCY_EXTENSION ('e'): the dependent object is a member of the
  * extension that is the referenced object.  The dependent object can be
  * dropped only via DROP EXTENSION on the referenced object.  Functionally
@@ -75,6 +89,7 @@ typedef enum DependencyType
 	DEPENDENCY_NORMAL = 'n',
 	DEPENDENCY_AUTO = 'a',
 	DEPENDENCY_INTERNAL = 'i',
+	DEPENDENCY_INTERNAL_AUTO = 'I',
 	DEPENDENCY_EXTENSION = 'e',
 	DEPENDENCY_AUTO_EXTENSION = 'x',
 	DEPENDENCY_PIN = 'p'
diff --git a/src/include/catalog/genbki.h b/src/include/catalog/genbki.h
index a2cb313d4a..96ac4025de 100644
--- a/src/include/catalog/genbki.h
+++ b/src/include/catalog/genbki.h
@@ -9,7 +9,7 @@
  * bootstrap file from these header files.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/genbki.h
@@ -31,6 +31,9 @@
 #define BKI_FORCE_NULL
 #define BKI_FORCE_NOT_NULL
 
+/* Specifies a default value for a catalog field */
+#define BKI_DEFAULT(value)
+
 /*
  * This is never defined; it's here only for documentation.
  *
diff --git a/src/include/catalog/heap.h b/src/include/catalog/heap.h
index cb1bc887f8..9bdc63ceb5 100644
--- a/src/include/catalog/heap.h
+++ b/src/include/catalog/heap.h
@@ -4,7 +4,7 @@
  *	  prototypes for functions in backend/catalog/heap.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/heap.h
@@ -109,7 +109,7 @@ extern Node *cookDefault(ParseState *pstate,
 			Node *raw_default,
 			Oid atttypid,
 			int32 atttypmod,
-			char *attname);
+			const char *attname);
 
 extern void DeleteRelationTuple(Oid relid);
 extern void DeleteAttributeTuples(Oid relid);
diff --git a/src/include/catalog/index.h b/src/include/catalog/index.h
index 1d4ec09f8f..f20c5f789b 100644
--- a/src/include/catalog/index.h
+++ b/src/include/catalog/index.h
@@ -4,7 +4,7 @@
  *	  prototypes for catalog/index.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/index.h
@@ -42,9 +42,19 @@ extern void index_check_primary_key(Relation heapRel,
 						IndexInfo *indexInfo,
 						bool is_alter_table);
 
+#define	INDEX_CREATE_IS_PRIMARY				(1 << 0)
+#define	INDEX_CREATE_ADD_CONSTRAINT			(1 << 1)
+#define	INDEX_CREATE_SKIP_BUILD				(1 << 2)
+#define	INDEX_CREATE_CONCURRENT				(1 << 3)
+#define	INDEX_CREATE_IF_NOT_EXISTS			(1 << 4)
+#define	INDEX_CREATE_PARTITIONED			(1 << 5)
+#define INDEX_CREATE_INVALID				(1 << 6)
+
 extern Oid index_create(Relation heapRelation,
 			 const char *indexRelationName,
 			 Oid indexRelationId,
+			 Oid parentIndexRelid,
+			 Oid parentConstraintId,
 			 Oid relFileNode,
 			 IndexInfo *indexInfo,
 			 List *indexColNames,
@@ -54,26 +64,25 @@ extern Oid index_create(Relation heapRelation,
 			 Oid *classObjectId,
 			 int16 *coloptions,
 			 Datum reloptions,
-			 bool isprimary,
-			 bool isconstraint,
-			 bool deferrable,
-			 bool initdeferred,
+			 bits16 flags,
+			 bits16 constr_flags,
 			 bool allow_system_table_mods,
-			 bool skip_build,
-			 bool concurrent,
 			 bool is_internal,
-			 bool if_not_exists);
+			 Oid *constraintId);
+
+#define	INDEX_CONSTR_CREATE_MARK_AS_PRIMARY	(1 << 0)
+#define	INDEX_CONSTR_CREATE_DEFERRABLE		(1 << 1)
+#define	INDEX_CONSTR_CREATE_INIT_DEFERRED	(1 << 2)
+#define	INDEX_CONSTR_CREATE_UPDATE_INDEX	(1 << 3)
+#define	INDEX_CONSTR_CREATE_REMOVE_OLD_DEPS	(1 << 4)
 
 extern ObjectAddress index_constraint_create(Relation heapRelation,
 						Oid indexRelationId,
+						Oid parentConstraintId,
 						IndexInfo *indexInfo,
 						const char *constraintName,
 						char constraintType,
-						bool deferrable,
-						bool initdeferred,
-						bool mark_as_primary,
-						bool update_pgindex,
-						bool remove_old_dependencies,
+						bits16 constr_flags,
 						bool allow_system_table_mods,
 						bool is_internal);
 
@@ -81,6 +90,11 @@ extern void index_drop(Oid indexId, bool concurrent);
 
 extern IndexInfo *BuildIndexInfo(Relation index);
 
+extern bool CompareIndexInfo(IndexInfo *info1, IndexInfo *info2,
+				 Oid *collations1, Oid *collations2,
+				 Oid *opfamilies1, Oid *opfamilies2,
+				 AttrNumber *attmap, int maplen);
+
 extern void BuildSpeculativeIndexInfo(Relation index, IndexInfo *ii);
 
 extern void FormIndexDatum(IndexInfo *indexInfo,
@@ -93,14 +107,16 @@ extern void index_build(Relation heapRelation,
 			Relation indexRelation,
 			IndexInfo *indexInfo,
 			bool isprimary,
-			bool isreindex);
+			bool isreindex,
+			bool parallel);
 
 extern double IndexBuildHeapScan(Relation heapRelation,
 				   Relation indexRelation,
 				   IndexInfo *indexInfo,
 				   bool allow_sync,
 				   IndexBuildCallback callback,
-				   void *callback_state);
+				   void *callback_state,
+				   HeapScanDesc scan);
 extern double IndexBuildHeapRangeScan(Relation heapRelation,
 						Relation indexRelation,
 						IndexInfo *indexInfo,
@@ -109,7 +125,8 @@ extern double IndexBuildHeapRangeScan(Relation heapRelation,
 						BlockNumber start_blockno,
 						BlockNumber end_blockno,
 						IndexBuildCallback callback,
-						void *callback_state);
+						void *callback_state,
+						HeapScanDesc scan);
 
 extern void validate_index(Oid heapId, Oid indexId, Snapshot snapshot);
 
@@ -131,4 +148,10 @@ extern bool ReindexIsProcessingHeap(Oid heapOid);
 extern bool ReindexIsProcessingIndex(Oid indexOid);
 extern Oid	IndexGetRelation(Oid indexId, bool missing_ok);
 
+extern Size EstimateReindexStateSpace(void);
+extern void SerializeReindexState(Size maxsize, char *start_address);
+extern void RestoreReindexState(void *reindexstate);
+
+extern void IndexSetParentIndex(Relation idx, Oid parentOid);
+
 #endif							/* INDEX_H */
diff --git a/src/include/catalog/indexing.h b/src/include/catalog/indexing.h
index ef8493674c..0bb875441e 100644
--- a/src/include/catalog/indexing.h
+++ b/src/include/catalog/indexing.h
@@ -5,7 +5,7 @@
  *	  on system catalogs
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/indexing.h
diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h
index f2ee935623..5f8cf4992e 100644
--- a/src/include/catalog/namespace.h
+++ b/src/include/catalog/namespace.h
@@ -4,7 +4,7 @@
  *	  prototypes for functions in backend/catalog/namespace.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/namespace.h
diff --git a/src/include/catalog/objectaccess.h b/src/include/catalog/objectaccess.h
index 251eb6fd88..2ce2217b1e 100644
--- a/src/include/catalog/objectaccess.h
+++ b/src/include/catalog/objectaccess.h
@@ -3,7 +3,7 @@
  *
  *		Object access hooks.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  */
 
diff --git a/src/include/catalog/objectaddress.h b/src/include/catalog/objectaddress.h
index 5fc54d0e57..6a9b1eec73 100644
--- a/src/include/catalog/objectaddress.h
+++ b/src/include/catalog/objectaddress.h
@@ -3,7 +3,7 @@
  * objectaddress.h
  *	  functions for working with object addresses
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/objectaddress.h
@@ -62,7 +62,7 @@ extern AttrNumber get_object_attnum_name(Oid class_id);
 extern AttrNumber get_object_attnum_namespace(Oid class_id);
 extern AttrNumber get_object_attnum_owner(Oid class_id);
 extern AttrNumber get_object_attnum_acl(Oid class_id);
-extern AclObjectKind get_object_aclkind(Oid class_id);
+extern ObjectType get_object_type(Oid class_id, Oid object_id);
 extern bool get_object_namensp_unique(Oid class_id);
 
 extern HeapTuple get_catalog_object_by_oid(Relation catalog,
@@ -78,4 +78,6 @@ extern char *getObjectIdentityParts(const ObjectAddress *address,
 					   List **objname, List **objargs);
 extern ArrayType *strlist_to_textarray(List *list);
 
+extern ObjectType get_relkind_objtype(char relkind);
+
 #endif							/* OBJECTADDRESS_H */
diff --git a/src/include/catalog/opfam_internal.h b/src/include/catalog/opfam_internal.h
index c4a010029a..e9ac904c72 100644
--- a/src/include/catalog/opfam_internal.h
+++ b/src/include/catalog/opfam_internal.h
@@ -2,7 +2,7 @@
  *
  * opfam_internal.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/opfam_internal.h
diff --git a/src/include/catalog/partition.h b/src/include/catalog/partition.h
index bef7a0f5fb..2faf0ca26e 100644
--- a/src/include/catalog/partition.h
+++ b/src/include/catalog/partition.h
@@ -4,7 +4,7 @@
  *		Header file for structures and utility functions related to
  *		partitioning
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * src/include/catalog/partition.h
  *
@@ -19,6 +19,9 @@
 #include "parser/parse_node.h"
 #include "utils/rel.h"
 
+/* Seed for the extended hash function */
+#define HASH_PARTITION_SEED UINT64CONST(0x7A5B22367996DCFD)
+
 /*
  * PartitionBoundInfo encapsulates a set of partition bounds.  It is usually
  * associated with partitioned tables as part of its partition descriptor.
@@ -39,65 +42,35 @@ typedef struct PartitionDescData
 
 typedef struct PartitionDescData *PartitionDesc;
 
-/*-----------------------
- * PartitionDispatch - information about one partitioned table in a partition
- * hierarchy required to route a tuple to one of its partitions
- *
- *	reldesc		Relation descriptor of the table
- *	key			Partition key information of the table
- *	keystate	Execution state required for expressions in the partition key
- *	partdesc	Partition descriptor of the table
- *	tupslot		A standalone TupleTableSlot initialized with this table's tuple
- *				descriptor
- *	tupmap		TupleConversionMap to convert from the parent's rowtype to
- *				this table's rowtype (when extracting the partition key of a
- *				tuple just before routing it through this table)
- *	indexes		Array with partdesc->nparts members (for details on what
- *				individual members represent, see how they are set in
- *				RelationGetPartitionDispatchInfo())
- *-----------------------
- */
-typedef struct PartitionDispatchData
-{
-	Relation	reldesc;
-	PartitionKey key;
-	List	   *keystate;		/* list of ExprState */
-	PartitionDesc partdesc;
-	TupleTableSlot *tupslot;
-	TupleConversionMap *tupmap;
-	int		   *indexes;
-} PartitionDispatchData;
-
-typedef struct PartitionDispatchData *PartitionDispatch;
-
 extern void RelationBuildPartitionDesc(Relation relation);
 extern bool partition_bounds_equal(int partnatts, int16 *parttyplen,
 					   bool *parttypbyval, PartitionBoundInfo b1,
 					   PartitionBoundInfo b2);
+extern PartitionBoundInfo partition_bounds_copy(PartitionBoundInfo src,
+					  PartitionKey key);
 
 extern void check_new_partition_bound(char *relname, Relation parent,
 						  PartitionBoundSpec *spec);
 extern Oid	get_partition_parent(Oid relid);
 extern List *get_qual_from_partbound(Relation rel, Relation parent,
 						PartitionBoundSpec *spec);
-extern List *map_partition_varattnos(List *expr, int target_varno,
-						Relation partrel, Relation parent,
+extern List *map_partition_varattnos(List *expr, int fromrel_varno,
+						Relation to_rel, Relation from_rel,
 						bool *found_whole_row);
 extern List *RelationGetPartitionQual(Relation rel);
 extern Expr *get_partition_qual_relid(Oid relid);
+extern bool has_partition_attrs(Relation rel, Bitmapset *attnums,
+					bool *used_in_expr);
+
+extern Oid	get_default_oid_from_partdesc(PartitionDesc partdesc);
+extern Oid	get_default_partition_oid(Oid parentId);
+extern void update_default_partition_oid(Oid parentId, Oid defaultPartId);
+extern void check_default_allows_bound(Relation parent, Relation defaultRel,
+						   PartitionBoundSpec *new_spec);
+extern List *get_proposed_default_constraint(List *new_part_constaints);
 
 /* For tuple routing */
-extern PartitionDispatch *RelationGetPartitionDispatchInfo(Relation rel,
-								 int lockmode, int *num_parted,
-								 List **leaf_part_oids);
-extern void FormPartitionKeyDatum(PartitionDispatch pd,
-					  TupleTableSlot *slot,
-					  EState *estate,
-					  Datum *values,
-					  bool *isnull);
-extern int get_partition_for_tuple(PartitionDispatch *pd,
-						TupleTableSlot *slot,
-						EState *estate,
-						PartitionDispatchData **failed_at,
-						TupleTableSlot **failed_slot);
+extern int get_partition_for_tuple(Relation relation, Datum *values,
+						bool *isnull);
+
 #endif							/* PARTITION_H */
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index 4d5b9bb9a6..125bb5b479 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_aggregate.h
@@ -20,8 +20,6 @@
 #define PG_AGGREGATE_H
 
 #include "catalog/genbki.h"
-#include "catalog/objectaddress.h"
-#include "nodes/pg_list.h"
 
 /* ----------------------------------------------------------------
  *		pg_aggregate definition.
@@ -41,6 +39,8 @@
  *	aggmfinalfn			final function for moving-aggregate mode (0 if none)
  *	aggfinalextra		true to pass extra dummy arguments to aggfinalfn
  *	aggmfinalextra		true to pass extra dummy arguments to aggmfinalfn
+ *	aggfinalmodify		tells whether aggfinalfn modifies transition state
+ *	aggmfinalmodify		tells whether aggmfinalfn modifies transition state
  *	aggsortop			associated sort operator (0 if none)
  *	aggtranstype		type of aggregate's transition (state) data
  *	aggtransspace		estimated size of state data (0 for default estimate)
@@ -67,6 +67,8 @@ CATALOG(pg_aggregate,2600) BKI_WITHOUT_OIDS
 	regproc		aggmfinalfn;
 	bool		aggfinalextra;
 	bool		aggmfinalextra;
+	char		aggfinalmodify;
+	char		aggmfinalmodify;
 	Oid			aggsortop;
 	Oid			aggtranstype;
 	int32		aggtransspace;
@@ -91,7 +93,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
  * ----------------
  */
 
-#define Natts_pg_aggregate					20
+#define Natts_pg_aggregate					22
 #define Anum_pg_aggregate_aggfnoid			1
 #define Anum_pg_aggregate_aggkind			2
 #define Anum_pg_aggregate_aggnumdirectargs	3
@@ -105,13 +107,15 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
 #define Anum_pg_aggregate_aggmfinalfn		11
 #define Anum_pg_aggregate_aggfinalextra		12
 #define Anum_pg_aggregate_aggmfinalextra	13
-#define Anum_pg_aggregate_aggsortop			14
-#define Anum_pg_aggregate_aggtranstype		15
-#define Anum_pg_aggregate_aggtransspace		16
-#define Anum_pg_aggregate_aggmtranstype		17
-#define Anum_pg_aggregate_aggmtransspace	18
-#define Anum_pg_aggregate_agginitval		19
-#define Anum_pg_aggregate_aggminitval		20
+#define Anum_pg_aggregate_aggfinalmodify	14
+#define Anum_pg_aggregate_aggmfinalmodify	15
+#define Anum_pg_aggregate_aggsortop			16
+#define Anum_pg_aggregate_aggtranstype		17
+#define Anum_pg_aggregate_aggtransspace		18
+#define Anum_pg_aggregate_aggmtranstype		19
+#define Anum_pg_aggregate_aggmtransspace	20
+#define Anum_pg_aggregate_agginitval		21
+#define Anum_pg_aggregate_aggminitval		22
 
 /*
  * Symbolic values for aggkind column.  We distinguish normal aggregates
@@ -128,6 +132,18 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
 /* Use this macro to test for "ordered-set agg including hypothetical case" */
 #define AGGKIND_IS_ORDERED_SET(kind)  ((kind) != AGGKIND_NORMAL)
 
+/*
+ * Symbolic values for aggfinalmodify and aggmfinalmodify columns.
+ * Preferably, finalfns do not modify the transition state value at all,
+ * but in some cases that would cost too much performance.  We distinguish
+ * "pure read only" and "trashes it arbitrarily" cases, as well as the
+ * intermediate case where multiple finalfn calls are allowed but the
+ * transfn cannot be applied anymore after the first finalfn call.
+ */
+#define AGGMODIFY_READ_ONLY			'r'
+#define AGGMODIFY_SHARABLE			's'
+#define AGGMODIFY_READ_WRITE		'w'
+
 
 /* ----------------
  * initial contents of pg_aggregate
@@ -135,217 +151,183 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
  */
 
 /* avg */
-DATA(insert ( 2100	n 0 int8_avg_accum		numeric_poly_avg	int8_avg_combine	int8_avg_serialize		int8_avg_deserialize	int8_avg_accum	int8_avg_accum_inv	numeric_poly_avg	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2101	n 0 int4_avg_accum		int8_avg			int4_avg_combine	-						-						int4_avg_accum	int4_avg_accum_inv	int8_avg			f f 0	1016	0	1016	0	"{0,0}" "{0,0}" ));
-DATA(insert ( 2102	n 0 int2_avg_accum		int8_avg			int4_avg_combine	-						-						int2_avg_accum	int2_avg_accum_inv	int8_avg			f f 0	1016	0	1016	0	"{0,0}" "{0,0}" ));
-DATA(insert ( 2103	n 0 numeric_avg_accum	numeric_avg			numeric_avg_combine numeric_avg_serialize	numeric_avg_deserialize numeric_avg_accum numeric_accum_inv numeric_avg			f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2104	n 0 float4_accum		float8_avg			float8_combine		-						-						-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2105	n 0 float8_accum		float8_avg			float8_combine		-						-						-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2106	n 0 interval_accum		interval_avg		interval_combine	-						-						interval_accum	interval_accum_inv	interval_avg		f f 0	1187	0	1187	0	"{0 second,0 second}" "{0 second,0 second}" ));
+DATA(insert ( 2100	n 0 int8_avg_accum		numeric_poly_avg	int8_avg_combine	int8_avg_serialize		int8_avg_deserialize	int8_avg_accum	int8_avg_accum_inv	numeric_poly_avg	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2101	n 0 int4_avg_accum		int8_avg			int4_avg_combine	-						-						int4_avg_accum	int4_avg_accum_inv	int8_avg			f f r r 0	1016	0	1016	0	"{0,0}" "{0,0}" ));
+DATA(insert ( 2102	n 0 int2_avg_accum		int8_avg			int4_avg_combine	-						-						int2_avg_accum	int2_avg_accum_inv	int8_avg			f f r r 0	1016	0	1016	0	"{0,0}" "{0,0}" ));
+DATA(insert ( 2103	n 0 numeric_avg_accum	numeric_avg			numeric_avg_combine numeric_avg_serialize	numeric_avg_deserialize numeric_avg_accum numeric_accum_inv numeric_avg			f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2104	n 0 float4_accum		float8_avg			float8_combine		-						-						-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2105	n 0 float8_accum		float8_avg			float8_combine		-						-						-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2106	n 0 interval_accum		interval_avg		interval_combine	-						-						interval_accum	interval_accum_inv	interval_avg		f f r r 0	1187	0	1187	0	"{0 second,0 second}" "{0 second,0 second}" ));
 
 /* sum */
-DATA(insert ( 2107	n 0 int8_avg_accum		numeric_poly_sum	int8_avg_combine	int8_avg_serialize		int8_avg_deserialize	int8_avg_accum	int8_avg_accum_inv	numeric_poly_sum	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2108	n 0 int4_sum			-					int8pl				-						-						int4_avg_accum	int4_avg_accum_inv	int2int4_sum		f f 0	20		0	1016	0	_null_ "{0,0}" ));
-DATA(insert ( 2109	n 0 int2_sum			-					int8pl				-						-						int2_avg_accum	int2_avg_accum_inv	int2int4_sum		f f 0	20		0	1016	0	_null_ "{0,0}" ));
-DATA(insert ( 2110	n 0 float4pl			-					float4pl			-						-						-				-					-					f f 0	700		0	0		0	_null_ _null_ ));
-DATA(insert ( 2111	n 0 float8pl			-					float8pl			-						-						-				-					-					f f 0	701		0	0		0	_null_ _null_ ));
-DATA(insert ( 2112	n 0 cash_pl				-					cash_pl				-						-						cash_pl			cash_mi				-					f f 0	790		0	790		0	_null_ _null_ ));
-DATA(insert ( 2113	n 0 interval_pl			-					interval_pl			-						-						interval_pl		interval_mi			-					f f 0	1186	0	1186	0	_null_ _null_ ));
-DATA(insert ( 2114	n 0 numeric_avg_accum	numeric_sum			numeric_avg_combine numeric_avg_serialize	numeric_avg_deserialize numeric_avg_accum numeric_accum_inv numeric_sum			f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2107	n 0 int8_avg_accum		numeric_poly_sum	int8_avg_combine	int8_avg_serialize		int8_avg_deserialize	int8_avg_accum	int8_avg_accum_inv	numeric_poly_sum	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2108	n 0 int4_sum			-					int8pl				-						-						int4_avg_accum	int4_avg_accum_inv	int2int4_sum		f f r r 0	20		0	1016	0	_null_ "{0,0}" ));
+DATA(insert ( 2109	n 0 int2_sum			-					int8pl				-						-						int2_avg_accum	int2_avg_accum_inv	int2int4_sum		f f r r 0	20		0	1016	0	_null_ "{0,0}" ));
+DATA(insert ( 2110	n 0 float4pl			-					float4pl			-						-						-				-					-					f f r r 0	700		0	0		0	_null_ _null_ ));
+DATA(insert ( 2111	n 0 float8pl			-					float8pl			-						-						-				-					-					f f r r 0	701		0	0		0	_null_ _null_ ));
+DATA(insert ( 2112	n 0 cash_pl				-					cash_pl				-						-						cash_pl			cash_mi				-					f f r r 0	790		0	790		0	_null_ _null_ ));
+DATA(insert ( 2113	n 0 interval_pl			-					interval_pl			-						-						interval_pl		interval_mi			-					f f r r 0	1186	0	1186	0	_null_ _null_ ));
+DATA(insert ( 2114	n 0 numeric_avg_accum	numeric_sum			numeric_avg_combine numeric_avg_serialize	numeric_avg_deserialize numeric_avg_accum numeric_accum_inv numeric_sum			f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* max */
-DATA(insert ( 2115	n 0 int8larger		-				int8larger			-	-	-				-				-				f f 413		20		0	0		0	_null_ _null_ ));
-DATA(insert ( 2116	n 0 int4larger		-				int4larger			-	-	-				-				-				f f 521		23		0	0		0	_null_ _null_ ));
-DATA(insert ( 2117	n 0 int2larger		-				int2larger			-	-	-				-				-				f f 520		21		0	0		0	_null_ _null_ ));
-DATA(insert ( 2118	n 0 oidlarger		-				oidlarger			-	-	-				-				-				f f 610		26		0	0		0	_null_ _null_ ));
-DATA(insert ( 2119	n 0 float4larger	-				float4larger		-	-	-				-				-				f f 623		700		0	0		0	_null_ _null_ ));
-DATA(insert ( 2120	n 0 float8larger	-				float8larger		-	-	-				-				-				f f 674		701		0	0		0	_null_ _null_ ));
-DATA(insert ( 2121	n 0 int4larger		-				int4larger			-	-	-				-				-				f f 563		702		0	0		0	_null_ _null_ ));
-DATA(insert ( 2122	n 0 date_larger		-				date_larger			-	-	-				-				-				f f 1097	1082	0	0		0	_null_ _null_ ));
-DATA(insert ( 2123	n 0 time_larger		-				time_larger			-	-	-				-				-				f f 1112	1083	0	0		0	_null_ _null_ ));
-DATA(insert ( 2124	n 0 timetz_larger	-				timetz_larger		-	-	-				-				-				f f 1554	1266	0	0		0	_null_ _null_ ));
-DATA(insert ( 2125	n 0 cashlarger		-				cashlarger			-	-	-				-				-				f f 903		790		0	0		0	_null_ _null_ ));
-DATA(insert ( 2126	n 0 timestamp_larger	-			timestamp_larger	-	-	-				-				-				f f 2064	1114	0	0		0	_null_ _null_ ));
-DATA(insert ( 2127	n 0 timestamptz_larger	-			timestamptz_larger	-	-	-				-				-				f f 1324	1184	0	0		0	_null_ _null_ ));
-DATA(insert ( 2128	n 0 interval_larger -				interval_larger		-	-	-				-				-				f f 1334	1186	0	0		0	_null_ _null_ ));
-DATA(insert ( 2129	n 0 text_larger		-				text_larger			-	-	-				-				-				f f 666		25		0	0		0	_null_ _null_ ));
-DATA(insert ( 2130	n 0 numeric_larger	-				numeric_larger		-	-	-				-				-				f f 1756	1700	0	0		0	_null_ _null_ ));
-DATA(insert ( 2050	n 0 array_larger	-				array_larger		-	-	-				-				-				f f 1073	2277	0	0		0	_null_ _null_ ));
-DATA(insert ( 2244	n 0 bpchar_larger	-				bpchar_larger		-	-	-				-				-				f f 1060	1042	0	0		0	_null_ _null_ ));
-DATA(insert ( 2797	n 0 tidlarger		-				tidlarger			-	-	-				-				-				f f 2800	27		0	0		0	_null_ _null_ ));
-DATA(insert ( 3526	n 0 enum_larger		-				enum_larger			-	-	-				-				-				f f 3519	3500	0	0		0	_null_ _null_ ));
-DATA(insert ( 3564	n 0 network_larger	-				network_larger		-	-	-				-				-				f f 1205	869		0	0		0	_null_ _null_ ));
+DATA(insert ( 2115	n 0 int8larger		-				int8larger			-	-	-				-				-				f f r r 413		20		0	0		0	_null_ _null_ ));
+DATA(insert ( 2116	n 0 int4larger		-				int4larger			-	-	-				-				-				f f r r 521		23		0	0		0	_null_ _null_ ));
+DATA(insert ( 2117	n 0 int2larger		-				int2larger			-	-	-				-				-				f f r r 520		21		0	0		0	_null_ _null_ ));
+DATA(insert ( 2118	n 0 oidlarger		-				oidlarger			-	-	-				-				-				f f r r 610		26		0	0		0	_null_ _null_ ));
+DATA(insert ( 2119	n 0 float4larger	-				float4larger		-	-	-				-				-				f f r r 623		700		0	0		0	_null_ _null_ ));
+DATA(insert ( 2120	n 0 float8larger	-				float8larger		-	-	-				-				-				f f r r 674		701		0	0		0	_null_ _null_ ));
+DATA(insert ( 2121	n 0 int4larger		-				int4larger			-	-	-				-				-				f f r r 563		702		0	0		0	_null_ _null_ ));
+DATA(insert ( 2122	n 0 date_larger		-				date_larger			-	-	-				-				-				f f r r 1097	1082	0	0		0	_null_ _null_ ));
+DATA(insert ( 2123	n 0 time_larger		-				time_larger			-	-	-				-				-				f f r r 1112	1083	0	0		0	_null_ _null_ ));
+DATA(insert ( 2124	n 0 timetz_larger	-				timetz_larger		-	-	-				-				-				f f r r 1554	1266	0	0		0	_null_ _null_ ));
+DATA(insert ( 2125	n 0 cashlarger		-				cashlarger			-	-	-				-				-				f f r r 903		790		0	0		0	_null_ _null_ ));
+DATA(insert ( 2126	n 0 timestamp_larger	-			timestamp_larger	-	-	-				-				-				f f r r 2064	1114	0	0		0	_null_ _null_ ));
+DATA(insert ( 2127	n 0 timestamptz_larger	-			timestamptz_larger	-	-	-				-				-				f f r r 1324	1184	0	0		0	_null_ _null_ ));
+DATA(insert ( 2128	n 0 interval_larger -				interval_larger		-	-	-				-				-				f f r r 1334	1186	0	0		0	_null_ _null_ ));
+DATA(insert ( 2129	n 0 text_larger		-				text_larger			-	-	-				-				-				f f r r 666		25		0	0		0	_null_ _null_ ));
+DATA(insert ( 2130	n 0 numeric_larger	-				numeric_larger		-	-	-				-				-				f f r r 1756	1700	0	0		0	_null_ _null_ ));
+DATA(insert ( 2050	n 0 array_larger	-				array_larger		-	-	-				-				-				f f r r 1073	2277	0	0		0	_null_ _null_ ));
+DATA(insert ( 2244	n 0 bpchar_larger	-				bpchar_larger		-	-	-				-				-				f f r r 1060	1042	0	0		0	_null_ _null_ ));
+DATA(insert ( 2797	n 0 tidlarger		-				tidlarger			-	-	-				-				-				f f r r 2800	27		0	0		0	_null_ _null_ ));
+DATA(insert ( 3526	n 0 enum_larger		-				enum_larger			-	-	-				-				-				f f r r 3519	3500	0	0		0	_null_ _null_ ));
+DATA(insert ( 3564	n 0 network_larger	-				network_larger		-	-	-				-				-				f f r r 1205	869		0	0		0	_null_ _null_ ));
 
 /* min */
-DATA(insert ( 2131	n 0 int8smaller		-				int8smaller			-	-	-				-				-				f f 412		20		0	0		0	_null_ _null_ ));
-DATA(insert ( 2132	n 0 int4smaller		-				int4smaller			-	-	-				-				-				f f 97		23		0	0		0	_null_ _null_ ));
-DATA(insert ( 2133	n 0 int2smaller		-				int2smaller			-	-	-				-				-				f f 95		21		0	0		0	_null_ _null_ ));
-DATA(insert ( 2134	n 0 oidsmaller		-				oidsmaller			-	-	-				-				-				f f 609		26		0	0		0	_null_ _null_ ));
-DATA(insert ( 2135	n 0 float4smaller	-				float4smaller		-	-	-				-				-				f f 622		700		0	0		0	_null_ _null_ ));
-DATA(insert ( 2136	n 0 float8smaller	-				float8smaller		-	-	-				-				-				f f 672		701		0	0		0	_null_ _null_ ));
-DATA(insert ( 2137	n 0 int4smaller		-				int4smaller			-	-	-				-				-				f f 562		702		0	0		0	_null_ _null_ ));
-DATA(insert ( 2138	n 0 date_smaller	-				date_smaller		-	-	-				-				-				f f 1095	1082	0	0		0	_null_ _null_ ));
-DATA(insert ( 2139	n 0 time_smaller	-				time_smaller		-	-	-				-				-				f f 1110	1083	0	0		0	_null_ _null_ ));
-DATA(insert ( 2140	n 0 timetz_smaller	-				timetz_smaller		-	-	-				-				-				f f 1552	1266	0	0		0	_null_ _null_ ));
-DATA(insert ( 2141	n 0 cashsmaller		-				cashsmaller			-	-	-				-				-				f f 902		790		0	0		0	_null_ _null_ ));
-DATA(insert ( 2142	n 0 timestamp_smaller	-			timestamp_smaller	-	-	-				-				-				f f 2062	1114	0	0		0	_null_ _null_ ));
-DATA(insert ( 2143	n 0 timestamptz_smaller -			timestamptz_smaller -	-	-				-				-				f f 1322	1184	0	0		0	_null_ _null_ ));
-DATA(insert ( 2144	n 0 interval_smaller	-			interval_smaller	-	-	-				-				-				f f 1332	1186	0	0		0	_null_ _null_ ));
-DATA(insert ( 2145	n 0 text_smaller	-				text_smaller		-	-	-				-				-				f f 664		25		0	0		0	_null_ _null_ ));
-DATA(insert ( 2146	n 0 numeric_smaller -				numeric_smaller		-	-	-				-				-				f f 1754	1700	0	0		0	_null_ _null_ ));
-DATA(insert ( 2051	n 0 array_smaller	-				array_smaller		-	-	-				-				-				f f 1072	2277	0	0		0	_null_ _null_ ));
-DATA(insert ( 2245	n 0 bpchar_smaller	-				bpchar_smaller		-	-	-				-				-				f f 1058	1042	0	0		0	_null_ _null_ ));
-DATA(insert ( 2798	n 0 tidsmaller		-				tidsmaller			-	-	-				-				-				f f 2799	27		0	0		0	_null_ _null_ ));
-DATA(insert ( 3527	n 0 enum_smaller	-				enum_smaller		-	-	-				-				-				f f 3518	3500	0	0		0	_null_ _null_ ));
-DATA(insert ( 3565	n 0 network_smaller -				network_smaller		-	-	-				-				-				f f 1203	869		0	0		0	_null_ _null_ ));
+DATA(insert ( 2131	n 0 int8smaller		-				int8smaller			-	-	-				-				-				f f r r 412		20		0	0		0	_null_ _null_ ));
+DATA(insert ( 2132	n 0 int4smaller		-				int4smaller			-	-	-				-				-				f f r r 97		23		0	0		0	_null_ _null_ ));
+DATA(insert ( 2133	n 0 int2smaller		-				int2smaller			-	-	-				-				-				f f r r 95		21		0	0		0	_null_ _null_ ));
+DATA(insert ( 2134	n 0 oidsmaller		-				oidsmaller			-	-	-				-				-				f f r r 609		26		0	0		0	_null_ _null_ ));
+DATA(insert ( 2135	n 0 float4smaller	-				float4smaller		-	-	-				-				-				f f r r 622		700		0	0		0	_null_ _null_ ));
+DATA(insert ( 2136	n 0 float8smaller	-				float8smaller		-	-	-				-				-				f f r r 672		701		0	0		0	_null_ _null_ ));
+DATA(insert ( 2137	n 0 int4smaller		-				int4smaller			-	-	-				-				-				f f r r 562		702		0	0		0	_null_ _null_ ));
+DATA(insert ( 2138	n 0 date_smaller	-				date_smaller		-	-	-				-				-				f f r r 1095	1082	0	0		0	_null_ _null_ ));
+DATA(insert ( 2139	n 0 time_smaller	-				time_smaller		-	-	-				-				-				f f r r 1110	1083	0	0		0	_null_ _null_ ));
+DATA(insert ( 2140	n 0 timetz_smaller	-				timetz_smaller		-	-	-				-				-				f f r r 1552	1266	0	0		0	_null_ _null_ ));
+DATA(insert ( 2141	n 0 cashsmaller		-				cashsmaller			-	-	-				-				-				f f r r 902		790		0	0		0	_null_ _null_ ));
+DATA(insert ( 2142	n 0 timestamp_smaller	-			timestamp_smaller	-	-	-				-				-				f f r r 2062	1114	0	0		0	_null_ _null_ ));
+DATA(insert ( 2143	n 0 timestamptz_smaller -			timestamptz_smaller -	-	-				-				-				f f r r 1322	1184	0	0		0	_null_ _null_ ));
+DATA(insert ( 2144	n 0 interval_smaller	-			interval_smaller	-	-	-				-				-				f f r r 1332	1186	0	0		0	_null_ _null_ ));
+DATA(insert ( 2145	n 0 text_smaller	-				text_smaller		-	-	-				-				-				f f r r 664		25		0	0		0	_null_ _null_ ));
+DATA(insert ( 2146	n 0 numeric_smaller -				numeric_smaller		-	-	-				-				-				f f r r 1754	1700	0	0		0	_null_ _null_ ));
+DATA(insert ( 2051	n 0 array_smaller	-				array_smaller		-	-	-				-				-				f f r r 1072	2277	0	0		0	_null_ _null_ ));
+DATA(insert ( 2245	n 0 bpchar_smaller	-				bpchar_smaller		-	-	-				-				-				f f r r 1058	1042	0	0		0	_null_ _null_ ));
+DATA(insert ( 2798	n 0 tidsmaller		-				tidsmaller			-	-	-				-				-				f f r r 2799	27		0	0		0	_null_ _null_ ));
+DATA(insert ( 3527	n 0 enum_smaller	-				enum_smaller		-	-	-				-				-				f f r r 3518	3500	0	0		0	_null_ _null_ ));
+DATA(insert ( 3565	n 0 network_smaller -				network_smaller		-	-	-				-				-				f f r r 1203	869		0	0		0	_null_ _null_ ));
 
 /* count */
-DATA(insert ( 2147	n 0 int8inc_any		-				int8pl	-	-	int8inc_any		int8dec_any		-				f f 0		20		0	20		0	"0" "0" ));
-DATA(insert ( 2803	n 0 int8inc			-				int8pl	-	-	int8inc			int8dec			-				f f 0		20		0	20		0	"0" "0" ));
+DATA(insert ( 2147	n 0 int8inc_any		-				int8pl	-	-	int8inc_any		int8dec_any		-				f f r r 0		20		0	20		0	"0" "0" ));
+DATA(insert ( 2803	n 0 int8inc			-				int8pl	-	-	int8inc			int8dec			-				f f r r 0		20		0	20		0	"0" "0" ));
 
 /* var_pop */
-DATA(insert ( 2718	n 0 int8_accum		numeric_var_pop			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_pop			f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2719	n 0 int4_accum		numeric_poly_var_pop	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_pop	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2720	n 0 int2_accum		numeric_poly_var_pop	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_pop	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2721	n 0 float4_accum	float8_var_pop			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2722	n 0 float8_accum	float8_var_pop			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2723	n 0 numeric_accum	numeric_var_pop			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_pop		f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2718	n 0 int8_accum		numeric_var_pop			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_pop			f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2719	n 0 int4_accum		numeric_poly_var_pop	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_pop	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2720	n 0 int2_accum		numeric_poly_var_pop	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_pop	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2721	n 0 float4_accum	float8_var_pop			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2722	n 0 float8_accum	float8_var_pop			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2723	n 0 numeric_accum	numeric_var_pop			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_pop		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* var_samp */
-DATA(insert ( 2641	n 0 int8_accum		numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2642	n 0 int4_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2643	n 0 int2_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2644	n 0 float4_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2645	n 0 float8_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2646	n 0 numeric_accum	numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2641	n 0 int8_accum		numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2642	n 0 int4_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2643	n 0 int2_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2644	n 0 float4_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2645	n 0 float8_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2646	n 0 numeric_accum	numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* variance: historical Postgres syntax for var_samp */
-DATA(insert ( 2148	n 0 int8_accum		numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2149	n 0 int4_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2150	n 0 int2_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2151	n 0 float4_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2152	n 0 float8_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2153	n 0 numeric_accum	numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2148	n 0 int8_accum		numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_var_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2149	n 0 int4_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_var_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2150	n 0 int2_accum		numeric_poly_var_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_var_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2151	n 0 float4_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2152	n 0 float8_accum	float8_var_samp			float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2153	n 0 numeric_accum	numeric_var_samp		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_var_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* stddev_pop */
-DATA(insert ( 2724	n 0 int8_accum		numeric_stddev_pop		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_stddev_pop		f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2725	n 0 int4_accum		numeric_poly_stddev_pop numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_stddev_pop f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2726	n 0 int2_accum		numeric_poly_stddev_pop numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_stddev_pop f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2727	n 0 float4_accum	float8_stddev_pop		float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2728	n 0 float8_accum	float8_stddev_pop		float8_combine			-						-							-				-				-						f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2729	n 0 numeric_accum	numeric_stddev_pop		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_stddev_pop	f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2724	n 0 int8_accum		numeric_stddev_pop		numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_stddev_pop		f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2725	n 0 int4_accum		numeric_poly_stddev_pop numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_stddev_pop f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2726	n 0 int2_accum		numeric_poly_stddev_pop numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_stddev_pop f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2727	n 0 float4_accum	float8_stddev_pop		float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2728	n 0 float8_accum	float8_stddev_pop		float8_combine			-						-							-				-				-						f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2729	n 0 numeric_accum	numeric_stddev_pop		numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_stddev_pop	f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* stddev_samp */
-DATA(insert ( 2712	n 0 int8_accum		numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum	int8_accum_inv	numeric_stddev_samp			f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2713	n 0 int4_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum	int4_accum_inv	numeric_poly_stddev_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2714	n 0 int2_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum	int2_accum_inv	numeric_poly_stddev_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2715	n 0 float4_accum	float8_stddev_samp			float8_combine			-						-							-			-				-							f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2716	n 0 float8_accum	float8_stddev_samp			float8_combine			-						-							-			-				-							f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2717	n 0 numeric_accum	numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum numeric_accum_inv numeric_stddev_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2712	n 0 int8_accum		numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum	int8_accum_inv	numeric_stddev_samp			f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2713	n 0 int4_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum	int4_accum_inv	numeric_poly_stddev_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2714	n 0 int2_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum	int2_accum_inv	numeric_poly_stddev_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2715	n 0 float4_accum	float8_stddev_samp			float8_combine			-						-							-			-				-							f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2716	n 0 float8_accum	float8_stddev_samp			float8_combine			-						-							-			-				-							f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2717	n 0 numeric_accum	numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum numeric_accum_inv numeric_stddev_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* stddev: historical Postgres syntax for stddev_samp */
-DATA(insert ( 2154	n 0 int8_accum		numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_stddev_samp			f f 0	2281	128 2281	128 _null_ _null_ ));
-DATA(insert ( 2155	n 0 int4_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_stddev_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2156	n 0 int2_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_stddev_samp	f f 0	2281	48	2281	48	_null_ _null_ ));
-DATA(insert ( 2157	n 0 float4_accum	float8_stddev_samp			float8_combine			-						-							-				-				-							f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2158	n 0 float8_accum	float8_stddev_samp			float8_combine			-						-							-				-				-							f f 0	1022	0	0		0	"{0,0,0}" _null_ ));
-DATA(insert ( 2159	n 0 numeric_accum	numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_stddev_samp		f f 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2154	n 0 int8_accum		numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			int8_accum		int8_accum_inv	numeric_stddev_samp			f f r r 0	2281	128 2281	128 _null_ _null_ ));
+DATA(insert ( 2155	n 0 int4_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int4_accum		int4_accum_inv	numeric_poly_stddev_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2156	n 0 int2_accum		numeric_poly_stddev_samp	numeric_poly_combine	numeric_poly_serialize	numeric_poly_deserialize	int2_accum		int2_accum_inv	numeric_poly_stddev_samp	f f r r 0	2281	48	2281	48	_null_ _null_ ));
+DATA(insert ( 2157	n 0 float4_accum	float8_stddev_samp			float8_combine			-						-							-				-				-							f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2158	n 0 float8_accum	float8_stddev_samp			float8_combine			-						-							-				-				-							f f r r 0	1022	0	0		0	"{0,0,0}" _null_ ));
+DATA(insert ( 2159	n 0 numeric_accum	numeric_stddev_samp			numeric_combine			numeric_serialize		numeric_deserialize			numeric_accum	numeric_accum_inv numeric_stddev_samp		f f r r 0	2281	128 2281	128 _null_ _null_ ));
 
 /* SQL2003 binary regression aggregates */
-DATA(insert ( 2818	n 0 int8inc_float8_float8	-					int8pl				-	-	-				-				-			f f 0	20		0	0		0	"0" _null_ ));
-DATA(insert ( 2819	n 0 float8_regr_accum	float8_regr_sxx			float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2820	n 0 float8_regr_accum	float8_regr_syy			float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2821	n 0 float8_regr_accum	float8_regr_sxy			float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2822	n 0 float8_regr_accum	float8_regr_avgx		float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2823	n 0 float8_regr_accum	float8_regr_avgy		float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2824	n 0 float8_regr_accum	float8_regr_r2			float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2825	n 0 float8_regr_accum	float8_regr_slope		float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2826	n 0 float8_regr_accum	float8_regr_intercept	float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2827	n 0 float8_regr_accum	float8_covar_pop		float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2828	n 0 float8_regr_accum	float8_covar_samp		float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
-DATA(insert ( 2829	n 0 float8_regr_accum	float8_corr				float8_regr_combine -	-	-				-				-			f f 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2818	n 0 int8inc_float8_float8	-					int8pl				-	-	-				-				-			f f r r 0	20		0	0		0	"0" _null_ ));
+DATA(insert ( 2819	n 0 float8_regr_accum	float8_regr_sxx			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2820	n 0 float8_regr_accum	float8_regr_syy			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2821	n 0 float8_regr_accum	float8_regr_sxy			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2822	n 0 float8_regr_accum	float8_regr_avgx		float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2823	n 0 float8_regr_accum	float8_regr_avgy		float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2824	n 0 float8_regr_accum	float8_regr_r2			float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2825	n 0 float8_regr_accum	float8_regr_slope		float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2826	n 0 float8_regr_accum	float8_regr_intercept	float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2827	n 0 float8_regr_accum	float8_covar_pop		float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2828	n 0 float8_regr_accum	float8_covar_samp		float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
+DATA(insert ( 2829	n 0 float8_regr_accum	float8_corr				float8_regr_combine -	-	-				-				-			f f r r 0	1022	0	0		0	"{0,0,0,0,0,0}" _null_ ));
 
 /* boolean-and and boolean-or */
-DATA(insert ( 2517	n 0 booland_statefunc	-	booland_statefunc	-	-	bool_accum	bool_accum_inv	bool_alltrue	f f 58	16	0	2281	16	_null_ _null_ ));
-DATA(insert ( 2518	n 0 boolor_statefunc	-	boolor_statefunc	-	-	bool_accum	bool_accum_inv	bool_anytrue	f f 59	16	0	2281	16	_null_ _null_ ));
-DATA(insert ( 2519	n 0 booland_statefunc	-	booland_statefunc	-	-	bool_accum	bool_accum_inv	bool_alltrue	f f 58	16	0	2281	16	_null_ _null_ ));
+DATA(insert ( 2517	n 0 booland_statefunc	-	booland_statefunc	-	-	bool_accum	bool_accum_inv	bool_alltrue	f f r r 58	16	0	2281	16	_null_ _null_ ));
+DATA(insert ( 2518	n 0 boolor_statefunc	-	boolor_statefunc	-	-	bool_accum	bool_accum_inv	bool_anytrue	f f r r 59	16	0	2281	16	_null_ _null_ ));
+DATA(insert ( 2519	n 0 booland_statefunc	-	booland_statefunc	-	-	bool_accum	bool_accum_inv	bool_alltrue	f f r r 58	16	0	2281	16	_null_ _null_ ));
 
 /* bitwise integer */
-DATA(insert ( 2236	n 0 int2and		-				int2and -	-	-				-				-				f f 0	21		0	0		0	_null_ _null_ ));
-DATA(insert ( 2237	n 0 int2or		-				int2or	-	-	-				-				-				f f 0	21		0	0		0	_null_ _null_ ));
-DATA(insert ( 2238	n 0 int4and		-				int4and -	-	-				-				-				f f 0	23		0	0		0	_null_ _null_ ));
-DATA(insert ( 2239	n 0 int4or		-				int4or	-	-	-				-				-				f f 0	23		0	0		0	_null_ _null_ ));
-DATA(insert ( 2240	n 0 int8and		-				int8and -	-	-				-				-				f f 0	20		0	0		0	_null_ _null_ ));
-DATA(insert ( 2241	n 0 int8or		-				int8or	-	-	-				-				-				f f 0	20		0	0		0	_null_ _null_ ));
-DATA(insert ( 2242	n 0 bitand		-				bitand	-	-	-				-				-				f f 0	1560	0	0		0	_null_ _null_ ));
-DATA(insert ( 2243	n 0 bitor		-				bitor	-	-	-				-				-				f f 0	1560	0	0		0	_null_ _null_ ));
+DATA(insert ( 2236	n 0 int2and		-				int2and -	-	-				-				-				f f r r 0	21		0	0		0	_null_ _null_ ));
+DATA(insert ( 2237	n 0 int2or		-				int2or	-	-	-				-				-				f f r r 0	21		0	0		0	_null_ _null_ ));
+DATA(insert ( 2238	n 0 int4and		-				int4and -	-	-				-				-				f f r r 0	23		0	0		0	_null_ _null_ ));
+DATA(insert ( 2239	n 0 int4or		-				int4or	-	-	-				-				-				f f r r 0	23		0	0		0	_null_ _null_ ));
+DATA(insert ( 2240	n 0 int8and		-				int8and -	-	-				-				-				f f r r 0	20		0	0		0	_null_ _null_ ));
+DATA(insert ( 2241	n 0 int8or		-				int8or	-	-	-				-				-				f f r r 0	20		0	0		0	_null_ _null_ ));
+DATA(insert ( 2242	n 0 bitand		-				bitand	-	-	-				-				-				f f r r 0	1560	0	0		0	_null_ _null_ ));
+DATA(insert ( 2243	n 0 bitor		-				bitor	-	-	-				-				-				f f r r 0	1560	0	0		0	_null_ _null_ ));
 
 /* xml */
-DATA(insert ( 2901	n 0 xmlconcat2	-				-		-	-	-				-				-				f f 0	142		0	0		0	_null_ _null_ ));
+DATA(insert ( 2901	n 0 xmlconcat2	-				-		-	-	-				-				-				f f r r 0	142		0	0		0	_null_ _null_ ));
 
 /* array */
-DATA(insert ( 2335	n 0 array_agg_transfn		array_agg_finalfn		-	-	-	-		-				-				t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 4053	n 0 array_agg_array_transfn array_agg_array_finalfn -	-	-	-		-				-				t f 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 2335	n 0 array_agg_transfn		array_agg_finalfn		-	-	-	-		-				-				t f r r 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 4053	n 0 array_agg_array_transfn array_agg_array_finalfn -	-	-	-		-				-				t f r r 0	2281	0	0		0	_null_ _null_ ));
 
 /* text */
-DATA(insert ( 3538	n 0 string_agg_transfn	string_agg_finalfn	-	-	-	-				-				-				f f 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3538	n 0 string_agg_transfn	string_agg_finalfn	-	-	-	-				-				-				f f r r 0	2281	0	0		0	_null_ _null_ ));
 
 /* bytea */
-DATA(insert ( 3545	n 0 bytea_string_agg_transfn	bytea_string_agg_finalfn	-	-	-	-				-				-		f f 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3545	n 0 bytea_string_agg_transfn	bytea_string_agg_finalfn	-	-	-	-				-				-		f f r r 0	2281	0	0		0	_null_ _null_ ));
 
 /* json */
-DATA(insert ( 3175	n 0 json_agg_transfn	json_agg_finalfn			-	-	-	-				-				-				f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3197	n 0 json_object_agg_transfn json_object_agg_finalfn -	-	-	-				-				-				f f 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3175	n 0 json_agg_transfn	json_agg_finalfn			-	-	-	-				-				-				f f r r 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3197	n 0 json_object_agg_transfn json_object_agg_finalfn -	-	-	-				-				-				f f r r 0	2281	0	0		0	_null_ _null_ ));
 
 /* jsonb */
-DATA(insert ( 3267	n 0 jsonb_agg_transfn	jsonb_agg_finalfn				-	-	-	-				-				-			f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3270	n 0 jsonb_object_agg_transfn jsonb_object_agg_finalfn	-	-	-	-				-				-			f f 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3267	n 0 jsonb_agg_transfn	jsonb_agg_finalfn				-	-	-	-				-				-			f f r r 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3270	n 0 jsonb_object_agg_transfn jsonb_object_agg_finalfn	-	-	-	-				-				-			f f r r 0	2281	0	0		0	_null_ _null_ ));
 
 /* ordered-set and hypothetical-set aggregates */
-DATA(insert ( 3972	o 1 ordered_set_transition			percentile_disc_final					-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3974	o 1 ordered_set_transition			percentile_cont_float8_final			-	-	-	-		-		-		f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3976	o 1 ordered_set_transition			percentile_cont_interval_final			-	-	-	-		-		-		f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3978	o 1 ordered_set_transition			percentile_disc_multi_final				-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3980	o 1 ordered_set_transition			percentile_cont_float8_multi_final		-	-	-	-		-		-		f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3982	o 1 ordered_set_transition			percentile_cont_interval_multi_final	-	-	-	-		-		-		f f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3984	o 0 ordered_set_transition			mode_final								-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3986	h 1 ordered_set_transition_multi	rank_final								-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3988	h 1 ordered_set_transition_multi	percent_rank_final						-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3990	h 1 ordered_set_transition_multi	cume_dist_final							-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-DATA(insert ( 3992	h 1 ordered_set_transition_multi	dense_rank_final						-	-	-	-		-		-		t f 0	2281	0	0		0	_null_ _null_ ));
-
-
-/*
- * prototypes for functions in pg_aggregate.c
- */
-extern ObjectAddress AggregateCreate(const char *aggName,
-				Oid aggNamespace,
-				char aggKind,
-				int numArgs,
-				int numDirectArgs,
-				oidvector *parameterTypes,
-				Datum allParameterTypes,
-				Datum parameterModes,
-				Datum parameterNames,
-				List *parameterDefaults,
-				Oid variadicArgType,
-				List *aggtransfnName,
-				List *aggfinalfnName,
-				List *aggcombinefnName,
-				List *aggserialfnName,
-				List *aggdeserialfnName,
-				List *aggmtransfnName,
-				List *aggminvtransfnName,
-				List *aggmfinalfnName,
-				bool finalfnExtraArgs,
-				bool mfinalfnExtraArgs,
-				List *aggsortopName,
-				Oid aggTransType,
-				int32 aggTransSpace,
-				Oid aggmTransType,
-				int32 aggmTransSpace,
-				const char *agginitval,
-				const char *aggminitval,
-				char proparallel);
+DATA(insert ( 3972	o 1 ordered_set_transition			percentile_disc_final					-	-	-	-		-		-		t f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3974	o 1 ordered_set_transition			percentile_cont_float8_final			-	-	-	-		-		-		f f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3976	o 1 ordered_set_transition			percentile_cont_interval_final			-	-	-	-		-		-		f f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3978	o 1 ordered_set_transition			percentile_disc_multi_final				-	-	-	-		-		-		t f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3980	o 1 ordered_set_transition			percentile_cont_float8_multi_final		-	-	-	-		-		-		f f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3982	o 1 ordered_set_transition			percentile_cont_interval_multi_final	-	-	-	-		-		-		f f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3984	o 0 ordered_set_transition			mode_final								-	-	-	-		-		-		t f s s 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3986	h 1 ordered_set_transition_multi	rank_final								-	-	-	-		-		-		t f w w 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3988	h 1 ordered_set_transition_multi	percent_rank_final						-	-	-	-		-		-		t f w w 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3990	h 1 ordered_set_transition_multi	cume_dist_final							-	-	-	-		-		-		t f w w 0	2281	0	0		0	_null_ _null_ ));
+DATA(insert ( 3992	h 1 ordered_set_transition_multi	dense_rank_final						-	-	-	-		-		-		t f w w 0	2281	0	0		0	_null_ _null_ ));
 
 #endif							/* PG_AGGREGATE_H */
diff --git a/src/include/catalog/pg_aggregate_fn.h b/src/include/catalog/pg_aggregate_fn.h
new file mode 100644
index 0000000000..00f533ae48
--- /dev/null
+++ b/src/include/catalog/pg_aggregate_fn.h
@@ -0,0 +1,52 @@
+/*-------------------------------------------------------------------------
+ *
+ * pg_aggregate_fn.h
+ *	  prototypes for functions in catalog/pg_aggregate.c
+ *
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/catalog/pg_aggregate_fn.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_AGGREGATE_FN_H
+#define PG_AGGREGATE_FN_H
+
+#include "catalog/objectaddress.h"
+#include "nodes/pg_list.h"
+
+extern ObjectAddress AggregateCreate(const char *aggName,
+				Oid aggNamespace,
+				char aggKind,
+				int numArgs,
+				int numDirectArgs,
+				oidvector *parameterTypes,
+				Datum allParameterTypes,
+				Datum parameterModes,
+				Datum parameterNames,
+				List *parameterDefaults,
+				Oid variadicArgType,
+				List *aggtransfnName,
+				List *aggfinalfnName,
+				List *aggcombinefnName,
+				List *aggserialfnName,
+				List *aggdeserialfnName,
+				List *aggmtransfnName,
+				List *aggminvtransfnName,
+				List *aggmfinalfnName,
+				bool finalfnExtraArgs,
+				bool mfinalfnExtraArgs,
+				char finalfnModify,
+				char mfinalfnModify,
+				List *aggsortopName,
+				Oid aggTransType,
+				int32 aggTransSpace,
+				Oid aggmTransType,
+				int32 aggmTransSpace,
+				const char *agginitval,
+				const char *aggminitval,
+				char proparallel);
+
+#endif							/* PG_AGGREGATE_FN_H */
diff --git a/src/include/catalog/pg_am.h b/src/include/catalog/pg_am.h
index e021f5b894..2e785c4cec 100644
--- a/src/include/catalog/pg_am.h
+++ b/src/include/catalog/pg_am.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_am.h
diff --git a/src/include/catalog/pg_amop.h b/src/include/catalog/pg_amop.h
index f850be490a..03af581df4 100644
--- a/src/include/catalog/pg_amop.h
+++ b/src/include/catalog/pg_amop.h
@@ -30,7 +30,7 @@
  * intentional denormalization of the catalogs to buy lookup speed.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_amop.h
@@ -857,6 +857,22 @@ DATA(insert (	5000	603  603 10 s	2570	4000 0 ));
 DATA(insert (	5000	603  603 11 s	2573	4000 0 ));
 DATA(insert (	5000	603  603 12 s	2572	4000 0 ));
 
+/*
+ * SP-GiST poly_ops (supports polygons)
+ */
+DATA(insert (	5008   604	604  1 s	 485	4000 0 ));
+DATA(insert (	5008   604	604  2 s	 486	4000 0 ));
+DATA(insert (	5008   604	604  3 s	 492	4000 0 ));
+DATA(insert (	5008   604	604  4 s	 487	4000 0 ));
+DATA(insert (	5008   604	604  5 s	 488	4000 0 ));
+DATA(insert (	5008   604	604  6 s	 491	4000 0 ));
+DATA(insert (	5008   604	604  7 s	 490	4000 0 ));
+DATA(insert (	5008   604	604  8 s	 489	4000 0 ));
+DATA(insert (	5008   604	604  9 s	2575	4000 0 ));
+DATA(insert (	5008   604	604 10 s	2574	4000 0 ));
+DATA(insert (	5008   604	604 11 s	2577	4000 0 ));
+DATA(insert (	5008   604	604 12 s	2576	4000 0 ));
+
 /*
  * GiST inet_ops
  */
diff --git a/src/include/catalog/pg_amproc.h b/src/include/catalog/pg_amproc.h
index 7d245b1271..eb595e81db 100644
--- a/src/include/catalog/pg_amproc.h
+++ b/src/include/catalog/pg_amproc.h
@@ -19,7 +19,7 @@
  * some don't pay attention to non-default functions at all.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_amproc.h
@@ -96,39 +96,55 @@ DATA(insert (	434   1184 1184 1 1314 ));
 DATA(insert (	434   1184 1184 2 3137 ));
 DATA(insert (	434   1184 1082 1 2383 ));
 DATA(insert (	434   1184 1114 1 2533 ));
+DATA(insert (	434   1082 1186 3 4133 ));
+DATA(insert (	434   1114 1186 3 4134 ));
+DATA(insert (	434   1184 1186 3 4135 ));
 DATA(insert (	1970   700 700 1 354 ));
 DATA(insert (	1970   700 700 2 3132 ));
 DATA(insert (	1970   700 701 1 2194 ));
 DATA(insert (	1970   701 701 1 355 ));
 DATA(insert (	1970   701 701 2 3133 ));
 DATA(insert (	1970   701 700 1 2195 ));
+DATA(insert (	1970   701 701 3 4139 ));
+DATA(insert (	1970   700 701 3 4140 ));
 DATA(insert (	1974   869 869 1 926 ));
 DATA(insert (	1976   21 21 1 350 ));
 DATA(insert (	1976   21 21 2 3129 ));
 DATA(insert (	1976   21 23 1 2190 ));
 DATA(insert (	1976   21 20 1 2192 ));
+DATA(insert (	1976   21 20 3 4130 ));
+DATA(insert (	1976   21 23 3 4131 ));
+DATA(insert (	1976   21 21 3 4132 ));
 DATA(insert (	1976   23 23 1 351 ));
 DATA(insert (	1976   23 23 2 3130 ));
 DATA(insert (	1976   23 20 1 2188 ));
 DATA(insert (	1976   23 21 1 2191 ));
+DATA(insert (	1976   23 20 3 4127 ));
+DATA(insert (	1976   23 23 3 4128 ));
+DATA(insert (	1976   23 21 3 4129 ));
 DATA(insert (	1976   20 20 1 842 ));
 DATA(insert (	1976   20 20 2 3131 ));
 DATA(insert (	1976   20 23 1 2189 ));
 DATA(insert (	1976   20 21 1 2193 ));
+DATA(insert (	1976   20 20 3 4126 ));
 DATA(insert (	1982   1186 1186 1 1315 ));
+DATA(insert (	1982   1186 1186 3 4136 ));
 DATA(insert (	1984   829 829 1 836 ));
 DATA(insert (	1984   829 829 2 3359 ));
 DATA(insert (	1986   19 19 1 359 ));
 DATA(insert (	1986   19 19 2 3135 ));
 DATA(insert (	1988   1700 1700 1 1769 ));
 DATA(insert (	1988   1700 1700 2 3283 ));
+DATA(insert (	1988   1700 1700 3 4141 ));
 DATA(insert (	1989   26 26 1 356 ));
 DATA(insert (	1989   26 26 2 3134 ));
 DATA(insert (	1991   30 30 1 404 ));
 DATA(insert (	1994   25 25 1 360 ));
 DATA(insert (	1994   25 25 2 3255 ));
 DATA(insert (	1996   1083 1083 1 1107 ));
+DATA(insert (	1996   1083 1186 3 4137 ));
 DATA(insert (	2000   1266 1266 1 1358 ));
+DATA(insert (	2000   1266 1186 3 4138 ));
 DATA(insert (	2002   1562 1562 1 1672 ));
 DATA(insert (	2095   25 25 1 2166 ));
 DATA(insert (	2095   25 25 2 3332 ));
@@ -153,48 +169,83 @@ DATA(insert (	4033   3802 3802 1 4044 ));
 
 /* hash */
 DATA(insert (	427   1042 1042 1 1080 ));
+DATA(insert (	427   1042 1042 2 972 ));
 DATA(insert (	431   18 18 1 454 ));
+DATA(insert (	431   18 18 2 446 ));
 DATA(insert (	435   1082 1082 1 450 ));
+DATA(insert (	435   1082 1082 2 425 ));
 DATA(insert (	627   2277 2277 1 626 ));
+DATA(insert (	627   2277 2277 2 782 ));
 DATA(insert (	1971   700 700 1 451 ));
+DATA(insert (	1971   700 700 2 443 ));
 DATA(insert (	1971   701 701 1 452 ));
+DATA(insert (	1971   701 701 2 444 ));
 DATA(insert (	1975   869 869 1 422 ));
+DATA(insert (	1975   869 869 2 779 ));
 DATA(insert (	1977   21 21 1 449 ));
+DATA(insert (	1977   21 21 2 441 ));
 DATA(insert (	1977   23 23 1 450 ));
+DATA(insert (	1977   23 23 2 425 ));
 DATA(insert (	1977   20 20 1 949 ));
+DATA(insert (	1977   20 20 2 442 ));
 DATA(insert (	1983   1186 1186 1 1697 ));
+DATA(insert (	1983   1186 1186 2 3418 ));
 DATA(insert (	1985   829 829 1 399 ));
+DATA(insert (	1985   829 829 2 778 ));
 DATA(insert (	1987   19 19 1 455 ));
+DATA(insert (	1987   19 19 2 447 ));
 DATA(insert (	1990   26 26 1 453 ));
+DATA(insert (	1990   26 26 2 445 ));
 DATA(insert (	1992   30 30 1 457 ));
+DATA(insert (	1992   30 30 2 776 ));
 DATA(insert (	1995   25 25 1 400 ));
+DATA(insert (	1995   25 25 2 448));
 DATA(insert (	1997   1083 1083 1 1688 ));
+DATA(insert (	1997   1083 1083 2 3409 ));
 DATA(insert (	1998   1700 1700 1 432 ));
+DATA(insert (	1998   1700 1700 2 780 ));
 DATA(insert (	1999   1184 1184 1 2039 ));
+DATA(insert (	1999   1184 1184 2 3411 ));
 DATA(insert (	2001   1266 1266 1 1696 ));
+DATA(insert (	2001   1266 1266 2 3410 ));
 DATA(insert (	2040   1114 1114 1 2039 ));
+DATA(insert (	2040   1114 1114 2 3411 ));
 DATA(insert (	2222   16 16 1 454 ));
+DATA(insert (	2222   16 16 2 446 ));
 DATA(insert (	2223   17 17 1 456 ));
+DATA(insert (	2223   17 17 2 772 ));
 DATA(insert (	2225   28 28 1 450 ));
+DATA(insert (	2225   28 28 2 425));
 DATA(insert (	2226   29 29 1 450 ));
+DATA(insert (	2226   29 29 2 425 ));
 DATA(insert (	2227   702 702 1 450 ));
+DATA(insert (	2227   702 702 2 425 ));
 DATA(insert (	2228   703 703 1 450 ));
+DATA(insert (	2228   703 703 2 425 ));
 DATA(insert (	2229   25 25 1 400 ));
+DATA(insert (	2229   25 25 2 448 ));
 DATA(insert (	2231   1042 1042 1 1080 ));
+DATA(insert (	2231   1042 1042 2 972 ));
 DATA(insert (	2235   1033 1033 1 329 ));
+DATA(insert (	2235   1033 1033 2 777 ));
 DATA(insert (	2969   2950 2950 1 2963 ));
+DATA(insert (	2969   2950 2950 2 3412 ));
 DATA(insert (	3254   3220 3220 1 3252 ));
+DATA(insert (	3254   3220 3220 2 3413 ));
 DATA(insert (	3372   774 774 1 328 ));
+DATA(insert (	3372   774 774 2 781 ));
 DATA(insert (	3523   3500 3500 1 3515 ));
+DATA(insert (	3523   3500 3500 2 3414 ));
 DATA(insert (	3903   3831 3831 1 3902 ));
+DATA(insert (	3903   3831 3831 2 3417 ));
 DATA(insert (	4034   3802 3802 1 4045 ));
+DATA(insert (	4034   3802 3802 2 3416));
 
 
 /* gist */
 DATA(insert (	1029   600 600 1 2179 ));
 DATA(insert (	1029   600 600 2 2583 ));
 DATA(insert (	1029   600 600 3 1030 ));
-DATA(insert (	1029   600 600 4 2580 ));
 DATA(insert (	1029   600 600 5 2581 ));
 DATA(insert (	1029   600 600 6 2582 ));
 DATA(insert (	1029   600 600 7 2584 ));
@@ -202,16 +253,12 @@ DATA(insert (	1029   600 600 8 3064 ));
 DATA(insert (	1029   600 600 9 3282 ));
 DATA(insert (	2593   603 603 1 2578 ));
 DATA(insert (	2593   603 603 2 2583 ));
-DATA(insert (	2593   603 603 3 2579 ));
-DATA(insert (	2593   603 603 4 2580 ));
 DATA(insert (	2593   603 603 5 2581 ));
 DATA(insert (	2593   603 603 6 2582 ));
 DATA(insert (	2593   603 603 7 2584 ));
-DATA(insert (	2593   603 603 9 3281 ));
 DATA(insert (	2594   604 604 1 2585 ));
 DATA(insert (	2594   604 604 2 2583 ));
 DATA(insert (	2594   604 604 3 2586 ));
-DATA(insert (	2594   604 604 4 2580 ));
 DATA(insert (	2594   604 604 5 2581 ));
 DATA(insert (	2594   604 604 6 2582 ));
 DATA(insert (	2594   604 604 7 2584 ));
@@ -219,7 +266,6 @@ DATA(insert (	2594   604 604 8 3288 ));
 DATA(insert (	2595   718 718 1 2591 ));
 DATA(insert (	2595   718 718 2 2583 ));
 DATA(insert (	2595   718 718 3 2592 ));
-DATA(insert (	2595   718 718 4 2580 ));
 DATA(insert (	2595   718 718 5 2581 ));
 DATA(insert (	2595   718 718 6 2582 ));
 DATA(insert (	2595   718 718 7 2584 ));
@@ -234,22 +280,17 @@ DATA(insert (	3655   3614 3614 7 3652 ));
 DATA(insert (	3702   3615 3615 1 3701 ));
 DATA(insert (	3702   3615 3615 2 3698 ));
 DATA(insert (	3702   3615 3615 3 3695 ));
-DATA(insert (	3702   3615 3615 4 3696 ));
 DATA(insert (	3702   3615 3615 5 3700 ));
 DATA(insert (	3702   3615 3615 6 3697 ));
 DATA(insert (	3702   3615 3615 7 3699 ));
 DATA(insert (	3919   3831 3831 1 3875 ));
 DATA(insert (	3919   3831 3831 2 3876 ));
-DATA(insert (	3919   3831 3831 3 3877 ));
-DATA(insert (	3919   3831 3831 4 3878 ));
 DATA(insert (	3919   3831 3831 5 3879 ));
 DATA(insert (	3919   3831 3831 6 3880 ));
 DATA(insert (	3919   3831 3831 7 3881 ));
-DATA(insert (	3919   3831 3831 9 3996 ));
 DATA(insert (	3550   869 869 1 3553 ));
 DATA(insert (	3550   869 869 2 3554 ));
 DATA(insert (	3550   869 869 3 3555 ));
-DATA(insert (	3550   869 869 4 3556 ));
 DATA(insert (	3550   869 869 5 3557 ));
 DATA(insert (	3550   869 869 6 3558 ));
 DATA(insert (	3550   869 869 7 3559 ));
@@ -309,6 +350,12 @@ DATA(insert (	5000   603 603 2 5013 ));
 DATA(insert (	5000   603 603 3 5014 ));
 DATA(insert (	5000   603 603 4 5015 ));
 DATA(insert (	5000   603 603 5 5016 ));
+DATA(insert (	5008   604 604 1 5010 ));
+DATA(insert (	5008   604 604 2 5013 ));
+DATA(insert (	5008   604 604 3 5014 ));
+DATA(insert (	5008   604 604 4 5015 ));
+DATA(insert (	5008   604 604 5 5016 ));
+DATA(insert (	5008   604 604 6 5011 ));
 
 /* BRIN opclasses */
 /* minmax bytea */
diff --git a/src/include/catalog/pg_attrdef.h b/src/include/catalog/pg_attrdef.h
index b877f42a2d..8a8b8cac52 100644
--- a/src/include/catalog/pg_attrdef.h
+++ b/src/include/catalog/pg_attrdef.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_attrdef.h
diff --git a/src/include/catalog/pg_attribute.h b/src/include/catalog/pg_attribute.h
index bcf28e8f04..8159383834 100644
--- a/src/include/catalog/pg_attribute.h
+++ b/src/include/catalog/pg_attribute.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_attribute.h
@@ -54,7 +54,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	 * that no value has been explicitly set for this column, so ANALYZE
 	 * should use the default setting.
 	 */
-	int32		attstattarget;
+	int32		attstattarget BKI_DEFAULT(-1);
 
 	/*
 	 * attlen is a copy of the typlen field from pg_type for this attribute.
@@ -90,7 +90,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	 * descriptor, we may then update attcacheoff in the copies. This speeds
 	 * up the attribute walking process.
 	 */
-	int32		attcacheoff;
+	int32		attcacheoff BKI_DEFAULT(-1);
 
 	/*
 	 * atttypmod records type-specific data supplied at table creation time
@@ -98,7 +98,7 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	 * type-specific input and output functions as the third argument. The
 	 * value will generally be -1 for types that do not need typmod.
 	 */
-	int32		atttypmod;
+	int32		atttypmod BKI_DEFAULT(-1);
 
 	/*
 	 * attbyval is a copy of the typbyval field from pg_type for this
@@ -131,13 +131,13 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	bool		attnotnull;
 
 	/* Has DEFAULT value or not */
-	bool		atthasdef;
+	bool		atthasdef BKI_DEFAULT(f);
 
 	/* One of the ATTRIBUTE_IDENTITY_* constants below, or '\0' */
-	char		attidentity;
+	char		attidentity BKI_DEFAULT("");
 
 	/* Is dropped (ie, logically invisible) or not */
-	bool		attisdropped;
+	bool		attisdropped BKI_DEFAULT(f);
 
 	/*
 	 * This flag specifies whether this column has ever had a local
@@ -148,10 +148,10 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	 * not dropped by a parent's DROP COLUMN even if this causes the column's
 	 * attinhcount to become zero.
 	 */
-	bool		attislocal;
+	bool		attislocal BKI_DEFAULT(t);
 
 	/* Number of times inherited from direct parent relation(s) */
-	int32		attinhcount;
+	int32		attinhcount BKI_DEFAULT(0);
 
 	/* attribute's collation */
 	Oid			attcollation;
@@ -160,13 +160,13 @@ CATALOG(pg_attribute,1249) BKI_BOOTSTRAP BKI_WITHOUT_OIDS BKI_ROWTYPE_OID(75) BK
 	/* NOTE: The following fields are not present in tuple descriptors. */
 
 	/* Column-level access permissions */
-	aclitem		attacl[1];
+	aclitem		attacl[1] BKI_DEFAULT(_null_);
 
 	/* Column-level options */
-	text		attoptions[1];
+	text		attoptions[1] BKI_DEFAULT(_null_);
 
 	/* Column-level FDW options */
-	text		attfdwoptions[1];
+	text		attfdwoptions[1] BKI_DEFAULT(_null_);
 #endif
 } FormData_pg_attribute;
 
diff --git a/src/include/catalog/pg_auth_members.h b/src/include/catalog/pg_auth_members.h
index 6a954fff97..ae3c14aa7a 100644
--- a/src/include/catalog/pg_auth_members.h
+++ b/src/include/catalog/pg_auth_members.h
@@ -5,7 +5,7 @@
  *	  (pg_auth_members) along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_auth_members.h
diff --git a/src/include/catalog/pg_authid.h b/src/include/catalog/pg_authid.h
index 9b6b52c9f9..772e9153c4 100644
--- a/src/include/catalog/pg_authid.h
+++ b/src/include/catalog/pg_authid.h
@@ -7,7 +7,7 @@
  *	  pg_shadow and pg_group are now publicly accessible views on pg_authid.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_authid.h
diff --git a/src/include/catalog/pg_cast.h b/src/include/catalog/pg_cast.h
index 17827531ad..b4478188ca 100644
--- a/src/include/catalog/pg_cast.h
+++ b/src/include/catalog/pg_cast.h
@@ -8,7 +8,7 @@
  * but also length coercion functions.
  *
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/include/catalog/pg_cast.h
  *
diff --git a/src/include/catalog/pg_class.h b/src/include/catalog/pg_class.h
index b256657bda..26b1866c69 100644
--- a/src/include/catalog/pg_class.h
+++ b/src/include/catalog/pg_class.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_class.h
@@ -166,6 +166,7 @@ DESCR("");
 #define		  RELKIND_COMPOSITE_TYPE  'c'	/* composite type */
 #define		  RELKIND_FOREIGN_TABLE   'f'	/* foreign table */
 #define		  RELKIND_PARTITIONED_TABLE 'p' /* partitioned table */
+#define		  RELKIND_PARTITIONED_INDEX 'I' /* partitioned index */
 
 #define		  RELPERSISTENCE_PERMANENT	'p' /* regular table */
 #define		  RELPERSISTENCE_UNLOGGED	'u' /* unlogged permanent table */
diff --git a/src/include/catalog/pg_collation.h b/src/include/catalog/pg_collation.h
index 0cac7cae72..8a3aa74b94 100644
--- a/src/include/catalog/pg_collation.h
+++ b/src/include/catalog/pg_collation.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/catalog/pg_collation_fn.h b/src/include/catalog/pg_collation_fn.h
index 0ef31389d5..f01f2ae65e 100644
--- a/src/include/catalog/pg_collation_fn.h
+++ b/src/include/catalog/pg_collation_fn.h
@@ -4,7 +4,7 @@
  *	 prototypes for functions in catalog/pg_collation.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_collation_fn.h
diff --git a/src/include/catalog/pg_constraint.h b/src/include/catalog/pg_constraint.h
index ec035d8434..8fca86d71e 100644
--- a/src/include/catalog/pg_constraint.h
+++ b/src/include/catalog/pg_constraint.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_constraint.h
diff --git a/src/include/catalog/pg_constraint_fn.h b/src/include/catalog/pg_constraint_fn.h
index a4c46897ed..d3351f4a83 100644
--- a/src/include/catalog/pg_constraint_fn.h
+++ b/src/include/catalog/pg_constraint_fn.h
@@ -4,7 +4,7 @@
  *	 prototypes for functions in catalog/pg_constraint.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_constraint_fn.h
@@ -58,7 +58,6 @@ extern Oid CreateConstraintEntry(const char *constraintName,
 
 extern void RemoveConstraintById(Oid conId);
 extern void RenameConstraintById(Oid conId, const char *newname);
-extern void SetValidatedConstraintById(Oid conId);
 
 extern bool ConstraintNameIsUsed(ConstraintCategory conCat, Oid objId,
 					 Oid objNamespace, const char *conname);
@@ -68,8 +67,13 @@ extern char *ChooseConstraintName(const char *name1, const char *name2,
 
 extern void AlterConstraintNamespaces(Oid ownerId, Oid oldNspId,
 						  Oid newNspId, bool isType, ObjectAddresses *objsMoved);
+extern void ConstraintSetParentConstraint(Oid childConstrId,
+							  Oid parentConstrId);
 extern Oid	get_relation_constraint_oid(Oid relid, const char *conname, bool missing_ok);
+extern Bitmapset *get_relation_constraint_attnos(Oid relid, const char *conname,
+							   bool missing_ok, Oid *constraintOid);
 extern Oid	get_domain_constraint_oid(Oid typid, const char *conname, bool missing_ok);
+extern Oid get_relation_idx_constraint_oid(Oid relationId, Oid indexId);
 
 extern Bitmapset *get_primary_key_attnos(Oid relid, bool deferrableOk,
 					   Oid *constraintOid);
diff --git a/src/include/catalog/pg_control.h b/src/include/catalog/pg_control.h
index 1ec03caf5f..773d9e6eba 100644
--- a/src/include/catalog/pg_control.h
+++ b/src/include/catalog/pg_control.h
@@ -5,7 +5,7 @@
  *	  However, we define it here so that the format is documented.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_control.h
@@ -21,7 +21,7 @@
 
 
 /* Version identifier for this pg_control format */
-#define PG_CONTROL_VERSION	1002
+#define PG_CONTROL_VERSION	1100
 
 /* Nonce key length, see below */
 #define MOCK_AUTH_NONCE_LEN		32
@@ -127,7 +127,6 @@ typedef struct ControlFileData
 	DBState		state;			/* see enum above */
 	pg_time_t	time;			/* time stamp of last pg_control update */
 	XLogRecPtr	checkPoint;		/* last check point record ptr */
-	XLogRecPtr	prevCheckPoint; /* previous check point record ptr */
 
 	CheckPoint	checkPointCopy; /* copy of last check point record */
 
diff --git a/src/include/catalog/pg_conversion.h b/src/include/catalog/pg_conversion.h
index 0682d7eb22..29f3c9d65a 100644
--- a/src/include/catalog/pg_conversion.h
+++ b/src/include/catalog/pg_conversion.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_conversion.h
@@ -32,7 +32,7 @@
  *	conforencoding		FOR encoding id
  *	contoencoding		TO encoding id
  *	conproc				OID of the conversion proc
- *	condefault			TRUE if this is a default conversion
+ *	condefault			true if this is a default conversion
  * ----------------------------------------------------------------
  */
 #define ConversionRelationId  2607
diff --git a/src/include/catalog/pg_conversion_fn.h b/src/include/catalog/pg_conversion_fn.h
index 7074bcf13a..f8f8a78b7d 100644
--- a/src/include/catalog/pg_conversion_fn.h
+++ b/src/include/catalog/pg_conversion_fn.h
@@ -4,7 +4,7 @@
  *	 prototypes for functions in catalog/pg_conversion.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_conversion_fn.h
diff --git a/src/include/catalog/pg_database.h b/src/include/catalog/pg_database.h
index e7cbca49cf..56f9960dfe 100644
--- a/src/include/catalog/pg_database.h
+++ b/src/include/catalog/pg_database.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_database.h
diff --git a/src/include/catalog/pg_db_role_setting.h b/src/include/catalog/pg_db_role_setting.h
index 4a8e3370c9..86cc17d725 100644
--- a/src/include/catalog/pg_db_role_setting.h
+++ b/src/include/catalog/pg_db_role_setting.h
@@ -4,7 +4,7 @@
  *	definition of configuration settings
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_db_role_setting.h
diff --git a/src/include/catalog/pg_default_acl.h b/src/include/catalog/pg_default_acl.h
index 09587abee6..11b306037d 100644
--- a/src/include/catalog/pg_default_acl.h
+++ b/src/include/catalog/pg_default_acl.h
@@ -4,7 +4,7 @@
  *	  definition of default ACLs for new objects.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_default_acl.h
diff --git a/src/include/catalog/pg_depend.h b/src/include/catalog/pg_depend.h
index 8bda78d9ef..be3867bbf2 100644
--- a/src/include/catalog/pg_depend.h
+++ b/src/include/catalog/pg_depend.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_depend.h
diff --git a/src/include/catalog/pg_description.h b/src/include/catalog/pg_description.h
index e0499ca2d6..d29100013e 100644
--- a/src/include/catalog/pg_description.h
+++ b/src/include/catalog/pg_description.h
@@ -19,7 +19,7 @@
  * for example).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_description.h
diff --git a/src/include/catalog/pg_enum.h b/src/include/catalog/pg_enum.h
index 5938ba5cac..a65a8f45b6 100644
--- a/src/include/catalog/pg_enum.h
+++ b/src/include/catalog/pg_enum.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  * src/include/catalog/pg_enum.h
  *
diff --git a/src/include/catalog/pg_event_trigger.h b/src/include/catalog/pg_event_trigger.h
index f9f568b27b..e03c81997c 100644
--- a/src/include/catalog/pg_event_trigger.h
+++ b/src/include/catalog/pg_event_trigger.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_event_trigger.h
diff --git a/src/include/catalog/pg_extension.h b/src/include/catalog/pg_extension.h
index 2ce575d17e..9ca6ca7936 100644
--- a/src/include/catalog/pg_extension.h
+++ b/src/include/catalog/pg_extension.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_extension.h
diff --git a/src/include/catalog/pg_foreign_data_wrapper.h b/src/include/catalog/pg_foreign_data_wrapper.h
index af602c74ee..dd00586b6e 100644
--- a/src/include/catalog/pg_foreign_data_wrapper.h
+++ b/src/include/catalog/pg_foreign_data_wrapper.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_foreign_data_wrapper.h
diff --git a/src/include/catalog/pg_foreign_server.h b/src/include/catalog/pg_foreign_server.h
index 689dbbb4e7..a8c9e87540 100644
--- a/src/include/catalog/pg_foreign_server.h
+++ b/src/include/catalog/pg_foreign_server.h
@@ -3,7 +3,7 @@
  * pg_foreign_server.h
  *	  definition of the system "foreign server" relation (pg_foreign_server)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_foreign_server.h
diff --git a/src/include/catalog/pg_foreign_table.h b/src/include/catalog/pg_foreign_table.h
index c5dbcceef1..210e77b79a 100644
--- a/src/include/catalog/pg_foreign_table.h
+++ b/src/include/catalog/pg_foreign_table.h
@@ -3,7 +3,7 @@
  * pg_foreign_table.h
  *	  definition of the system "foreign table" relation (pg_foreign_table)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_foreign_table.h
diff --git a/src/include/catalog/pg_index.h b/src/include/catalog/pg_index.h
index 8505c3be5f..057a9f7fe4 100644
--- a/src/include/catalog/pg_index.h
+++ b/src/include/catalog/pg_index.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_index.h
diff --git a/src/include/catalog/pg_inherits.h b/src/include/catalog/pg_inherits.h
index 26bfab5db6..3c572f421b 100644
--- a/src/include/catalog/pg_inherits.h
+++ b/src/include/catalog/pg_inherits.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_inherits.h
diff --git a/src/include/catalog/pg_inherits_fn.h b/src/include/catalog/pg_inherits_fn.h
index 7743388899..eebee977a5 100644
--- a/src/include/catalog/pg_inherits_fn.h
+++ b/src/include/catalog/pg_inherits_fn.h
@@ -4,7 +4,7 @@
  *	  prototypes for functions in catalog/pg_inherits.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_inherits_fn.h
@@ -23,5 +23,8 @@ extern List *find_all_inheritors(Oid parentrelId, LOCKMODE lockmode,
 extern bool has_subclass(Oid relationId);
 extern bool has_superclass(Oid relationId);
 extern bool typeInheritsFrom(Oid subclassTypeId, Oid superclassTypeId);
+extern void StoreSingleInheritance(Oid relationId, Oid parentOid,
+					   int32 seqNumber);
+extern bool DeleteInheritsTuple(Oid inhrelid, Oid inhparent);
 
 #endif							/* PG_INHERITS_FN_H */
diff --git a/src/include/catalog/pg_init_privs.h b/src/include/catalog/pg_init_privs.h
index 5fca36334b..6ea005fdeb 100644
--- a/src/include/catalog/pg_init_privs.h
+++ b/src/include/catalog/pg_init_privs.h
@@ -15,7 +15,7 @@
  * for a table itself, so that it is distinct from any column privilege.
  * Currently, objsubid is unused and zero for all other kinds of objects.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_init_privs.h
diff --git a/src/include/catalog/pg_language.h b/src/include/catalog/pg_language.h
index ad244e839b..8ae78a0898 100644
--- a/src/include/catalog/pg_language.h
+++ b/src/include/catalog/pg_language.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_language.h
diff --git a/src/include/catalog/pg_largeobject.h b/src/include/catalog/pg_largeobject.h
index f2df67c35f..0a15649ddd 100644
--- a/src/include/catalog/pg_largeobject.h
+++ b/src/include/catalog/pg_largeobject.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_largeobject.h
diff --git a/src/include/catalog/pg_largeobject_metadata.h b/src/include/catalog/pg_largeobject_metadata.h
index 7ae6d8c02b..4535b51b53 100644
--- a/src/include/catalog/pg_largeobject_metadata.h
+++ b/src/include/catalog/pg_largeobject_metadata.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_largeobject_metadata.h
diff --git a/src/include/catalog/pg_namespace.h b/src/include/catalog/pg_namespace.h
index a61a8635f6..ac22d8918e 100644
--- a/src/include/catalog/pg_namespace.h
+++ b/src/include/catalog/pg_namespace.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_namespace.h
diff --git a/src/include/catalog/pg_opclass.h b/src/include/catalog/pg_opclass.h
index 28dbc747d5..e11d52eaa8 100644
--- a/src/include/catalog/pg_opclass.h
+++ b/src/include/catalog/pg_opclass.h
@@ -25,7 +25,7 @@
  * AMs support this.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_opclass.h
@@ -205,6 +205,7 @@ DATA(insert (	4000	box_ops				PGNSP PGUID 5000  603  t 0 ));
 DATA(insert (	4000	quad_point_ops		PGNSP PGUID 4015  600 t 0 ));
 DATA(insert (	4000	kd_point_ops		PGNSP PGUID 4016  600 f 0 ));
 DATA(insert (	4000	text_ops			PGNSP PGUID 4017  25 t 0 ));
+DATA(insert (	4000	poly_ops			PGNSP PGUID 5008  604 t 603 ));
 DATA(insert (	403		jsonb_ops			PGNSP PGUID 4033  3802 t 0 ));
 DATA(insert (	405		jsonb_ops			PGNSP PGUID 4034  3802 t 0 ));
 DATA(insert (	2742	jsonb_ops			PGNSP PGUID 4036  3802 t 25 ));
diff --git a/src/include/catalog/pg_operator.h b/src/include/catalog/pg_operator.h
index ffabc2003b..e74f963eb5 100644
--- a/src/include/catalog/pg_operator.h
+++ b/src/include/catalog/pg_operator.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_operator.h
@@ -97,9 +97,9 @@ DATA(insert OID =  37 ( "<"		   PGNSP PGUID b f f	23	20	16 419	82 int48lt scalar
 DESCR("less than");
 DATA(insert OID =  76 ( ">"		   PGNSP PGUID b f f	23	20	16 418	80 int48gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID =  80 ( "<="	   PGNSP PGUID b f f	23	20	16 430	76 int48le scalarltsel scalarltjoinsel ));
+DATA(insert OID =  80 ( "<="	   PGNSP PGUID b f f	23	20	16 430	76 int48le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID =  82 ( ">="	   PGNSP PGUID b f f	23	20	16 420	37 int48ge scalargtsel scalargtjoinsel ));
+DATA(insert OID =  82 ( ">="	   PGNSP PGUID b f f	23	20	16 420	37 int48ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID =  58 ( "<"		   PGNSP PGUID b f f	16	16	16	59	1695 boollt scalarltsel scalarltjoinsel ));
@@ -112,9 +112,9 @@ DESCR("not equal");
 DATA(insert OID =  91 ( "="		   PGNSP PGUID b t t	16	16	16	91	85 booleq eqsel eqjoinsel ));
 DESCR("equal");
 #define BooleanEqualOperator   91
-DATA(insert OID = 1694 (  "<="	   PGNSP PGUID b f f	16	16	16 1695 59 boolle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1694 (  "<="	   PGNSP PGUID b f f	16	16	16 1695 59 boolle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1695 (  ">="	   PGNSP PGUID b f f	16	16	16 1694 58 boolge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1695 (  ">="	   PGNSP PGUID b f f	16	16	16 1694 58 boolge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID =  92 ( "="		   PGNSP PGUID b t t	18	18	16	92 630 chareq eqsel eqjoinsel ));
@@ -167,9 +167,9 @@ DESCR("less than");
 #define TIDLessOperator    2799
 DATA(insert OID = 2800 (  ">"	   PGNSP PGUID b f f	27	27	16 2799 2801 tidgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 2801 (  "<="	   PGNSP PGUID b f f	27	27	16 2802 2800 tidle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2801 (  "<="	   PGNSP PGUID b f f	27	27	16 2802 2800 tidle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 2802 (  ">="	   PGNSP PGUID b f f	27	27	16 2801 2799 tidge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2802 (  ">="	   PGNSP PGUID b f f	27	27	16 2801 2799 tidge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 410 ( "="		   PGNSP PGUID b t t	20	20	16 410 411 int8eq eqsel eqjoinsel ));
@@ -181,9 +181,9 @@ DESCR("less than");
 #define Int8LessOperator	412
 DATA(insert OID = 413 ( ">"		   PGNSP PGUID b f f	20	20	16 412 414 int8gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 414 ( "<="	   PGNSP PGUID b f f	20	20	16 415 413 int8le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 414 ( "<="	   PGNSP PGUID b f f	20	20	16 415 413 int8le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 415 ( ">="	   PGNSP PGUID b f f	20	20	16 414 412 int8ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 415 ( ">="	   PGNSP PGUID b f f	20	20	16 414 412 int8ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 416 ( "="		   PGNSP PGUID b t t	20	23	16	15 417 int84eq eqsel eqjoinsel ));
@@ -194,9 +194,9 @@ DATA(insert OID = 418 ( "<"		   PGNSP PGUID b f f	20	23	16	76 430 int84lt scalar
 DESCR("less than");
 DATA(insert OID = 419 ( ">"		   PGNSP PGUID b f f	20	23	16	37 420 int84gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 420 ( "<="	   PGNSP PGUID b f f	20	23	16	82 419 int84le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 420 ( "<="	   PGNSP PGUID b f f	20	23	16	82 419 int84le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 430 ( ">="	   PGNSP PGUID b f f	20	23	16	80 418 int84ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 430 ( ">="	   PGNSP PGUID b f f	20	23	16	80 418 int84ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 439 (  "%"	   PGNSP PGUID b f f	20	20	20	 0	 0 int8mod - - ));
 DESCR("modulus");
@@ -277,13 +277,13 @@ DATA(insert OID = 520 (  ">"	   PGNSP PGUID b f f	21	21	16	95 522 int2gt scalarg
 DESCR("greater than");
 DATA(insert OID = 521 (  ">"	   PGNSP PGUID b f f	23	23	16	97 523 int4gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 522 (  "<="	   PGNSP PGUID b f f	21	21	16 524 520 int2le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 522 (  "<="	   PGNSP PGUID b f f	21	21	16 524 520 int2le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 523 (  "<="	   PGNSP PGUID b f f	23	23	16 525 521 int4le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 523 (  "<="	   PGNSP PGUID b f f	23	23	16 525 521 int4le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 524 (  ">="	   PGNSP PGUID b f f	21	21	16 522	95 int2ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 524 (  ">="	   PGNSP PGUID b f f	21	21	16 522	95 int2ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
-DATA(insert OID = 525 (  ">="	   PGNSP PGUID b f f	23	23	16 523	97 int4ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 525 (  ">="	   PGNSP PGUID b f f	23	23	16 523	97 int4ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 526 (  "*"	   PGNSP PGUID b f f	21	21	21 526	 0 int2mul - - ));
 DESCR("multiply");
@@ -313,13 +313,13 @@ DATA(insert OID = 538 (  "<>"	   PGNSP PGUID b f f	21	23	16 539 532 int24ne neqs
 DESCR("not equal");
 DATA(insert OID = 539 (  "<>"	   PGNSP PGUID b f f	23	21	16 538 533 int42ne neqsel neqjoinsel ));
 DESCR("not equal");
-DATA(insert OID = 540 (  "<="	   PGNSP PGUID b f f	21	23	16 543 536 int24le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 540 (  "<="	   PGNSP PGUID b f f	21	23	16 543 536 int24le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 541 (  "<="	   PGNSP PGUID b f f	23	21	16 542 537 int42le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 541 (  "<="	   PGNSP PGUID b f f	23	21	16 542 537 int42le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 542 (  ">="	   PGNSP PGUID b f f	21	23	16 541 534 int24ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 542 (  ">="	   PGNSP PGUID b f f	21	23	16 541 534 int24ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
-DATA(insert OID = 543 (  ">="	   PGNSP PGUID b f f	23	21	16 540 535 int42ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 543 (  ">="	   PGNSP PGUID b f f	23	21	16 540 535 int42ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 544 (  "*"	   PGNSP PGUID b f f	21	23	23 545	 0 int24mul - - ));
 DESCR("multiply");
@@ -357,9 +357,9 @@ DATA(insert OID = 562 (  "<"	   PGNSP PGUID b f f 702 702	16 563 565 abstimelt s
 DESCR("less than");
 DATA(insert OID = 563 (  ">"	   PGNSP PGUID b f f 702 702	16 562 564 abstimegt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 564 (  "<="	   PGNSP PGUID b f f 702 702	16 565 563 abstimele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 564 (  "<="	   PGNSP PGUID b f f 702 702	16 565 563 abstimele scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 565 (  ">="	   PGNSP PGUID b f f 702 702	16 564 562 abstimege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 565 (  ">="	   PGNSP PGUID b f f 702 702	16 564 562 abstimege scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 566 (  "="	   PGNSP PGUID b t t 703 703	16 566 567 reltimeeq eqsel eqjoinsel ));
 DESCR("equal");
@@ -369,9 +369,9 @@ DATA(insert OID = 568 (  "<"	   PGNSP PGUID b f f 703 703	16 569 571 reltimelt s
 DESCR("less than");
 DATA(insert OID = 569 (  ">"	   PGNSP PGUID b f f 703 703	16 568 570 reltimegt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 570 (  "<="	   PGNSP PGUID b f f 703 703	16 571 569 reltimele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 570 (  "<="	   PGNSP PGUID b f f 703 703	16 571 569 reltimele scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 571 (  ">="	   PGNSP PGUID b f f 703 703	16 570 568 reltimege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 571 (  ">="	   PGNSP PGUID b f f 703 703	16 570 568 reltimege scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 572 (  "~="	   PGNSP PGUID b f f 704 704	16 572	 0 tintervalsame eqsel eqjoinsel ));
 DESCR("same as");
@@ -438,9 +438,9 @@ DATA(insert OID = 609 (  "<"	   PGNSP PGUID b f f	26	26	16 610 612 oidlt scalarl
 DESCR("less than");
 DATA(insert OID = 610 (  ">"	   PGNSP PGUID b f f	26	26	16 609 611 oidgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 611 (  "<="	   PGNSP PGUID b f f	26	26	16 612 610 oidle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 611 (  "<="	   PGNSP PGUID b f f	26	26	16 612 610 oidle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 612 (  ">="	   PGNSP PGUID b f f	26	26	16 611 609 oidge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 612 (  ">="	   PGNSP PGUID b f f	26	26	16 611 609 oidge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 644 (  "<>"	   PGNSP PGUID b f f	30	30	16 644 649 oidvectorne neqsel neqjoinsel ));
@@ -449,9 +449,9 @@ DATA(insert OID = 645 (  "<"	   PGNSP PGUID b f f	30	30	16 646 648 oidvectorlt s
 DESCR("less than");
 DATA(insert OID = 646 (  ">"	   PGNSP PGUID b f f	30	30	16 645 647 oidvectorgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 647 (  "<="	   PGNSP PGUID b f f	30	30	16 648 646 oidvectorle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 647 (  "<="	   PGNSP PGUID b f f	30	30	16 648 646 oidvectorle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 648 (  ">="	   PGNSP PGUID b f f	30	30	16 647 645 oidvectorge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 648 (  ">="	   PGNSP PGUID b f f	30	30	16 647 645 oidvectorge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 649 (  "="	   PGNSP PGUID b t t	30	30	16 649 644 oidvectoreq eqsel eqjoinsel ));
 DESCR("equal");
@@ -477,20 +477,20 @@ DATA(insert OID = 622 (  "<"	   PGNSP PGUID b f f	700  700	16 623 625 float4lt s
 DESCR("less than");
 DATA(insert OID = 623 (  ">"	   PGNSP PGUID b f f	700  700	16 622 624 float4gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 624 (  "<="	   PGNSP PGUID b f f	700  700	16 625 623 float4le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 624 (  "<="	   PGNSP PGUID b f f	700  700	16 625 623 float4le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 625 (  ">="	   PGNSP PGUID b f f	700  700	16 624 622 float4ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 625 (  ">="	   PGNSP PGUID b f f	700  700	16 624 622 float4ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 630 (  "<>"	   PGNSP PGUID b f f	18	18		16 630	92	charne neqsel neqjoinsel ));
 DESCR("not equal");
 
 DATA(insert OID = 631 (  "<"	   PGNSP PGUID b f f	18	18	16 633 634 charlt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 632 (  "<="	   PGNSP PGUID b f f	18	18	16 634 633 charle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 632 (  "<="	   PGNSP PGUID b f f	18	18	16 634 633 charle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 633 (  ">"	   PGNSP PGUID b f f	18	18	16 631 632 chargt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 634 (  ">="	   PGNSP PGUID b f f	18	18	16 632 631 charge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 634 (  ">="	   PGNSP PGUID b f f	18	18	16 632 631 charge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 639 (  "~"	   PGNSP PGUID b f f	19	25	16 0 640 nameregexeq regexeqsel regexeqjoinsel ));
@@ -510,19 +510,19 @@ DESCR("concatenate");
 
 DATA(insert OID = 660 (  "<"	   PGNSP PGUID b f f	19	19	16 662 663 namelt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 661 (  "<="	   PGNSP PGUID b f f	19	19	16 663 662 namele scalarltsel scalarltjoinsel ));
+DATA(insert OID = 661 (  "<="	   PGNSP PGUID b f f	19	19	16 663 662 namele scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 662 (  ">"	   PGNSP PGUID b f f	19	19	16 660 661 namegt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 663 (  ">="	   PGNSP PGUID b f f	19	19	16 661 660 namege scalargtsel scalargtjoinsel ));
+DATA(insert OID = 663 (  ">="	   PGNSP PGUID b f f	19	19	16 661 660 namege scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 664 (  "<"	   PGNSP PGUID b f f	25	25	16 666 667 text_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 665 (  "<="	   PGNSP PGUID b f f	25	25	16 667 666 text_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 665 (  "<="	   PGNSP PGUID b f f	25	25	16 667 666 text_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 666 (  ">"	   PGNSP PGUID b f f	25	25	16 664 665 text_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 667 (  ">="	   PGNSP PGUID b f f	25	25	16 665 664 text_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 667 (  ">="	   PGNSP PGUID b f f	25	25	16 665 664 text_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 670 (  "="	   PGNSP PGUID b t t	701  701	16 670 671 float8eq eqsel eqjoinsel ));
@@ -532,11 +532,11 @@ DESCR("not equal");
 DATA(insert OID = 672 (  "<"	   PGNSP PGUID b f f	701  701	16 674 675 float8lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
 #define Float8LessOperator	672
-DATA(insert OID = 673 (  "<="	   PGNSP PGUID b f f	701  701	16 675 674 float8le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 673 (  "<="	   PGNSP PGUID b f f	701  701	16 675 674 float8le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 674 (  ">"	   PGNSP PGUID b f f	701  701	16 672 673 float8gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 675 (  ">="	   PGNSP PGUID b f f	701  701	16 673 672 float8ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 675 (  ">="	   PGNSP PGUID b f f	701  701	16 673 672 float8ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 682 (  "@"	   PGNSP PGUID l f f	 0	21	21	 0	 0 int2abs - - ));
@@ -677,9 +677,9 @@ DATA(insert OID = 813 (  "<"	   PGNSP PGUID b f f 704 704	16 814 816 tintervallt
 DESCR("less than");
 DATA(insert OID = 814 (  ">"	   PGNSP PGUID b f f 704 704	16 813 815 tintervalgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 815 (  "<="	   PGNSP PGUID b f f 704 704	16 816 814 tintervalle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 815 (  "<="	   PGNSP PGUID b f f 704 704	16 816 814 tintervalle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 816 (  ">="	   PGNSP PGUID b f f 704 704	16 815 813 tintervalge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 816 (  ">="	   PGNSP PGUID b f f 704 704	16 815 813 tintervalge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 843 (  "*"	   PGNSP PGUID b f f	790  700	790 845   0 cash_mul_flt4 - - ));
@@ -697,9 +697,9 @@ DATA(insert OID = 902 (  "<"	   PGNSP PGUID b f f	790  790	16 903 905 cash_lt sc
 DESCR("less than");
 DATA(insert OID = 903 (  ">"	   PGNSP PGUID b f f	790  790	16 902 904 cash_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 904 (  "<="	   PGNSP PGUID b f f	790  790	16 905 903 cash_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 904 (  "<="	   PGNSP PGUID b f f	790  790	16 905 903 cash_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 905 (  ">="	   PGNSP PGUID b f f	790  790	16 904 902 cash_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 905 (  ">="	   PGNSP PGUID b f f	790  790	16 904 902 cash_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 906 (  "+"	   PGNSP PGUID b f f	790  790	790 906   0 cash_pl - - ));
 DESCR("add");
@@ -763,11 +763,11 @@ DATA(insert OID = 1057 ( "<>"	   PGNSP PGUID b f f 1042 1042	 16 1057 1054 bpcha
 DESCR("not equal");
 DATA(insert OID = 1058 ( "<"	   PGNSP PGUID b f f 1042 1042	 16 1060 1061 bpcharlt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1059 ( "<="	   PGNSP PGUID b f f 1042 1042	 16 1061 1060 bpcharle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1059 ( "<="	   PGNSP PGUID b f f 1042 1042	 16 1061 1060 bpcharle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1060 ( ">"	   PGNSP PGUID b f f 1042 1042	 16 1058 1059 bpchargt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1061 ( ">="	   PGNSP PGUID b f f 1042 1042	 16 1059 1058 bpcharge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1061 ( ">="	   PGNSP PGUID b f f 1042 1042	 16 1059 1058 bpcharge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* generic array comparison operators */
@@ -782,9 +782,9 @@ DESCR("less than");
 DATA(insert OID = 1073 (  ">"	   PGNSP PGUID b f f 2277 2277 16 1072 1074 array_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
 #define ARRAY_GT_OP 1073
-DATA(insert OID = 1074 (  "<="	   PGNSP PGUID b f f 2277 2277 16 1075 1073 array_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1074 (  "<="	   PGNSP PGUID b f f 2277 2277 16 1075 1073 array_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1075 (  ">="	   PGNSP PGUID b f f 2277 2277 16 1074 1072 array_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1075 (  ">="	   PGNSP PGUID b f f 2277 2277 16 1074 1072 array_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* date operators */
@@ -798,11 +798,11 @@ DATA(insert OID = 1094 ( "<>"	   PGNSP PGUID b f f	1082	1082   16 1094 1093 date
 DESCR("not equal");
 DATA(insert OID = 1095 ( "<"	   PGNSP PGUID b f f	1082	1082   16 1097 1098 date_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1096 ( "<="	   PGNSP PGUID b f f	1082	1082   16 1098 1097 date_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1096 ( "<="	   PGNSP PGUID b f f	1082	1082   16 1098 1097 date_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1097 ( ">"	   PGNSP PGUID b f f	1082	1082   16 1095 1096 date_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1098 ( ">="	   PGNSP PGUID b f f	1082	1082   16 1096 1095 date_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1098 ( ">="	   PGNSP PGUID b f f	1082	1082   16 1096 1095 date_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 1099 ( "-"	   PGNSP PGUID b f f	1082	1082   23 0 0 date_mi - - ));
 DESCR("subtract");
@@ -818,11 +818,11 @@ DATA(insert OID = 1109 ( "<>"	   PGNSP PGUID b f f	1083	1083  16 1109 1108 time_
 DESCR("not equal");
 DATA(insert OID = 1110 ( "<"	   PGNSP PGUID b f f	1083	1083  16 1112 1113 time_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1111 ( "<="	   PGNSP PGUID b f f	1083	1083  16 1113 1112 time_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1111 ( "<="	   PGNSP PGUID b f f	1083	1083  16 1113 1112 time_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1112 ( ">"	   PGNSP PGUID b f f	1083	1083  16 1110 1111 time_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1113 ( ">="	   PGNSP PGUID b f f	1083	1083  16 1111 1110 time_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1113 ( ">="	   PGNSP PGUID b f f	1083	1083  16 1111 1110 time_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* timetz operators */
@@ -832,11 +832,11 @@ DATA(insert OID = 1551 ( "<>"	   PGNSP PGUID b f f	1266 1266	16 1551 1550 timetz
 DESCR("not equal");
 DATA(insert OID = 1552 ( "<"	   PGNSP PGUID b f f	1266 1266	16 1554 1555 timetz_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1553 ( "<="	   PGNSP PGUID b f f	1266 1266	16 1555 1554 timetz_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1553 ( "<="	   PGNSP PGUID b f f	1266 1266	16 1555 1554 timetz_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1554 ( ">"	   PGNSP PGUID b f f	1266 1266	16 1552 1553 timetz_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1555 ( ">="	   PGNSP PGUID b f f	1266 1266	16 1553 1552 timetz_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1555 ( ">="	   PGNSP PGUID b f f	1266 1266	16 1553 1552 timetz_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* float48 operators */
@@ -856,9 +856,9 @@ DATA(insert OID = 1122 (  "<"		PGNSP PGUID b f f  700	701  16 1133 1125 float48l
 DESCR("less than");
 DATA(insert OID = 1123 (  ">"		PGNSP PGUID b f f  700	701  16 1132 1124 float48gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1124 (  "<="		PGNSP PGUID b f f  700	701  16 1135 1123 float48le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1124 (  "<="		PGNSP PGUID b f f  700	701  16 1135 1123 float48le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1125 (  ">="		PGNSP PGUID b f f  700	701  16 1134 1122 float48ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1125 (  ">="		PGNSP PGUID b f f  700	701  16 1134 1122 float48ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* float84 operators */
@@ -878,9 +878,9 @@ DATA(insert OID = 1132 (  "<"		PGNSP PGUID b f f  701	700  16 1123 1135 float84l
 DESCR("less than");
 DATA(insert OID = 1133 (  ">"		PGNSP PGUID b f f  701	700  16 1122 1134 float84gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1134 (  "<="		PGNSP PGUID b f f  701	700  16 1125 1133 float84le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1134 (  "<="		PGNSP PGUID b f f  701	700  16 1125 1133 float84le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1135 (  ">="		PGNSP PGUID b f f  701	700  16 1124 1132 float84ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1135 (  ">="		PGNSP PGUID b f f  701	700  16 1124 1132 float84ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 
@@ -925,11 +925,11 @@ DATA(insert OID = 1321 (  "<>"	   PGNSP PGUID b f f 1184 1184	 16 1321 1320 time
 DESCR("not equal");
 DATA(insert OID = 1322 (  "<"	   PGNSP PGUID b f f 1184 1184	 16 1324 1325 timestamptz_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1323 (  "<="	   PGNSP PGUID b f f 1184 1184	 16 1325 1324 timestamptz_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1323 (  "<="	   PGNSP PGUID b f f 1184 1184	 16 1325 1324 timestamptz_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1324 (  ">"	   PGNSP PGUID b f f 1184 1184	 16 1322 1323 timestamptz_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1325 (  ">="	   PGNSP PGUID b f f 1184 1184	 16 1323 1322 timestamptz_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1325 (  ">="	   PGNSP PGUID b f f 1184 1184	 16 1323 1322 timestamptz_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 1327 (  "+"	   PGNSP PGUID b f f 1184 1186 1184  2554 0 timestamptz_pl_interval - - ));
 DESCR("add");
@@ -945,11 +945,11 @@ DATA(insert OID = 1331 (  "<>"	   PGNSP PGUID b f f 1186 1186	 16 1331 1330 inte
 DESCR("not equal");
 DATA(insert OID = 1332 (  "<"	   PGNSP PGUID b f f 1186 1186	 16 1334 1335 interval_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1333 (  "<="	   PGNSP PGUID b f f 1186 1186	 16 1335 1334 interval_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1333 (  "<="	   PGNSP PGUID b f f 1186 1186	 16 1335 1334 interval_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1334 (  ">"	   PGNSP PGUID b f f 1186 1186	 16 1332 1333 interval_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1335 (  ">="	   PGNSP PGUID b f f 1186 1186	 16 1333 1332 interval_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1335 (  ">="	   PGNSP PGUID b f f 1186 1186	 16 1333 1332 interval_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 1336 (  "-"	   PGNSP PGUID l f f	0 1186 1186    0	0 interval_um - - ));
@@ -1126,11 +1126,11 @@ DATA(insert OID = 1221 (  "<>"	   PGNSP PGUID b f f 829 829	 16 1221 1220 macadd
 DESCR("not equal");
 DATA(insert OID = 1222 (  "<"	   PGNSP PGUID b f f 829 829	 16 1224 1225 macaddr_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1223 (  "<="	   PGNSP PGUID b f f 829 829	 16 1225 1224 macaddr_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1223 (  "<="	   PGNSP PGUID b f f 829 829	 16 1225 1224 macaddr_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1224 (  ">"	   PGNSP PGUID b f f 829 829	 16 1222 1223 macaddr_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1225 (  ">="	   PGNSP PGUID b f f 829 829	 16 1223 1222 macaddr_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1225 (  ">="	   PGNSP PGUID b f f 829 829	 16 1223 1222 macaddr_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 3147 (  "~"	   PGNSP PGUID l f f	  0 829 829 0 0 macaddr_not - - ));
@@ -1147,11 +1147,11 @@ DATA(insert OID = 3363 (  "<>"	   PGNSP PGUID b f f 774 774	 16 3363 3362 macadd
 DESCR("not equal");
 DATA(insert OID = 3364 (  "<"	   PGNSP PGUID b f f 774 774	 16 3366 3367 macaddr8_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 3365 (  "<="	   PGNSP PGUID b f f 774 774	 16 3367 3366 macaddr8_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3365 (  "<="	   PGNSP PGUID b f f 774 774	 16 3367 3366 macaddr8_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 3366 (  ">"	   PGNSP PGUID b f f 774 774	 16 3364 3365 macaddr8_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 3367 (  ">="	   PGNSP PGUID b f f 774 774	 16 3365 3364 macaddr8_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3367 (  ">="	   PGNSP PGUID b f f 774 774	 16 3365 3364 macaddr8_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 3368 (  "~"	   PGNSP PGUID l f f	  0 774 774 0 0 macaddr8_not - - ));
@@ -1168,11 +1168,11 @@ DATA(insert OID = 1202 (  "<>"	   PGNSP PGUID b f f 869 869	 16 1202 1201 networ
 DESCR("not equal");
 DATA(insert OID = 1203 (  "<"	   PGNSP PGUID b f f 869 869	 16 1205 1206 network_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1204 (  "<="	   PGNSP PGUID b f f 869 869	 16 1206 1205 network_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1204 (  "<="	   PGNSP PGUID b f f 869 869	 16 1206 1205 network_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1205 (  ">"	   PGNSP PGUID b f f 869 869	 16 1203 1204 network_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1206 (  ">="	   PGNSP PGUID b f f 869 869	 16 1204 1203 network_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1206 (  ">="	   PGNSP PGUID b f f 869 869	 16 1204 1203 network_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 931  (  "<<"	   PGNSP PGUID b f f 869 869	 16 933		0 network_sub networksel networkjoinsel ));
 DESCR("is subnet");
@@ -1231,11 +1231,11 @@ DATA(insert OID = 1753 (  "<>"	   PGNSP PGUID b f f 1700 1700	 16 1753 1752 nume
 DESCR("not equal");
 DATA(insert OID = 1754 (  "<"	   PGNSP PGUID b f f 1700 1700	 16 1756 1757 numeric_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1755 (  "<="	   PGNSP PGUID b f f 1700 1700	 16 1757 1756 numeric_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1755 (  "<="	   PGNSP PGUID b f f 1700 1700	 16 1757 1756 numeric_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1756 (  ">"	   PGNSP PGUID b f f 1700 1700	 16 1754 1755 numeric_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1757 (  ">="	   PGNSP PGUID b f f 1700 1700	 16 1755 1754 numeric_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1757 (  ">="	   PGNSP PGUID b f f 1700 1700	 16 1755 1754 numeric_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 1758 (  "+"	   PGNSP PGUID b f f 1700 1700 1700 1758	0 numeric_add - - ));
 DESCR("add");
@@ -1260,9 +1260,9 @@ DATA(insert OID = 1786 (  "<"	  PGNSP PGUID b f f 1560 1560 16 1787 1789 bitlt s
 DESCR("less than");
 DATA(insert OID = 1787 (  ">"	  PGNSP PGUID b f f 1560 1560 16 1786 1788 bitgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1788 (  "<="	  PGNSP PGUID b f f 1560 1560 16 1789 1787 bitle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1788 (  "<="	  PGNSP PGUID b f f 1560 1560 16 1789 1787 bitle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1789 (  ">="	  PGNSP PGUID b f f 1560 1560 16 1788 1786 bitge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1789 (  ">="	  PGNSP PGUID b f f 1560 1560 16 1788 1786 bitge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 1791 (  "&"	  PGNSP PGUID b f f 1560 1560 1560 1791  0 bitand - - ));
 DESCR("bitwise and");
@@ -1296,9 +1296,9 @@ DATA(insert OID = 1806 (  "<"	  PGNSP PGUID b f f 1562 1562 16 1807 1809 varbitl
 DESCR("less than");
 DATA(insert OID = 1807 (  ">"	  PGNSP PGUID b f f 1562 1562 16 1806 1808 varbitgt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1808 (  "<="	  PGNSP PGUID b f f 1562 1562 16 1809 1807 varbitle scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1808 (  "<="	  PGNSP PGUID b f f 1562 1562 16 1809 1807 varbitle scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1809 (  ">="	  PGNSP PGUID b f f 1562 1562 16 1808 1806 varbitge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1809 (  ">="	  PGNSP PGUID b f f 1562 1562 16 1808 1806 varbitge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 1849 (  "+"	   PGNSP PGUID b f f 1186 1083 1083  1800 0 interval_pl_time - - ));
@@ -1312,9 +1312,9 @@ DATA(insert OID = 1864 ( "<"	   PGNSP PGUID b f f	21	20	16 1871  1867 int28lt sc
 DESCR("less than");
 DATA(insert OID = 1865 ( ">"	   PGNSP PGUID b f f	21	20	16 1870  1866 int28gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1866 ( "<="	   PGNSP PGUID b f f	21	20	16 1873  1865 int28le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1866 ( "<="	   PGNSP PGUID b f f	21	20	16 1873  1865 int28le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1867 ( ">="	   PGNSP PGUID b f f	21	20	16 1872  1864 int28ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1867 ( ">="	   PGNSP PGUID b f f	21	20	16 1872  1864 int28ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 1868 ( "="	   PGNSP PGUID b t t	20	21	16	1862 1869 int82eq eqsel eqjoinsel ));
@@ -1325,9 +1325,9 @@ DATA(insert OID = 1870 ( "<"	   PGNSP PGUID b f f	20	21	16	1865 1873 int82lt sca
 DESCR("less than");
 DATA(insert OID = 1871 ( ">"	   PGNSP PGUID b f f	20	21	16	1864 1872 int82gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1872 ( "<="	   PGNSP PGUID b f f	20	21	16	1867 1871 int82le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1872 ( "<="	   PGNSP PGUID b f f	20	21	16	1867 1871 int82le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 1873 ( ">="	   PGNSP PGUID b f f	20	21	16	1866 1870 int82ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1873 ( ">="	   PGNSP PGUID b f f	20	21	16	1866 1870 int82ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 1874 ( "&"	   PGNSP PGUID b f f	21	21	21	1874  0 int2and - - ));
@@ -1389,11 +1389,11 @@ DATA(insert OID = 1956 ( "<>"	   PGNSP PGUID b f f 17 17	16 1956 1955 byteane ne
 DESCR("not equal");
 DATA(insert OID = 1957 ( "<"	   PGNSP PGUID b f f 17 17	16 1959 1960 bytealt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 1958 ( "<="	   PGNSP PGUID b f f 17 17	16 1960 1959 byteale scalarltsel scalarltjoinsel ));
+DATA(insert OID = 1958 ( "<="	   PGNSP PGUID b f f 17 17	16 1960 1959 byteale scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 1959 ( ">"	   PGNSP PGUID b f f 17 17	16 1957 1958 byteagt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 1960 ( ">="	   PGNSP PGUID b f f 17 17	16 1958 1957 byteage scalargtsel scalargtjoinsel ));
+DATA(insert OID = 1960 ( ">="	   PGNSP PGUID b f f 17 17	16 1958 1957 byteage scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 DATA(insert OID = 2016 (  "~~"	   PGNSP PGUID b f f 17 17	16 0	2017 bytealike likesel likejoinsel ));
@@ -1411,11 +1411,11 @@ DATA(insert OID = 2061 (  "<>"	   PGNSP PGUID b f f 1114 1114	 16 2061 2060 time
 DESCR("not equal");
 DATA(insert OID = 2062 (  "<"	   PGNSP PGUID b f f 1114 1114	 16 2064 2065 timestamp_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2063 (  "<="	   PGNSP PGUID b f f 1114 1114	 16 2065 2064 timestamp_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2063 (  "<="	   PGNSP PGUID b f f 1114 1114	 16 2065 2064 timestamp_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2064 (  ">"	   PGNSP PGUID b f f 1114 1114	 16 2062 2063 timestamp_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 2065 (  ">="	   PGNSP PGUID b f f 1114 1114	 16 2063 2062 timestamp_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2065 (  ">="	   PGNSP PGUID b f f 1114 1114	 16 2063 2062 timestamp_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2066 (  "+"	   PGNSP PGUID b f f 1114 1186 1114  2553 0 timestamp_pl_interval - - ));
 DESCR("add");
@@ -1428,18 +1428,18 @@ DESCR("subtract");
 
 DATA(insert OID = 2314 ( "~<~"	PGNSP PGUID b f f 25 25 16 2318 2317 text_pattern_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2315 ( "~<=~" PGNSP PGUID b f f 25 25 16 2317 2318 text_pattern_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2315 ( "~<=~" PGNSP PGUID b f f 25 25 16 2317 2318 text_pattern_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 2317 ( "~>=~" PGNSP PGUID b f f 25 25 16 2315 2314 text_pattern_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2317 ( "~>=~" PGNSP PGUID b f f 25 25 16 2315 2314 text_pattern_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2318 ( "~>~"	PGNSP PGUID b f f 25 25 16 2314 2315 text_pattern_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
 
 DATA(insert OID = 2326 ( "~<~"	PGNSP PGUID b f f 1042 1042 16 2330 2329 bpchar_pattern_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2327 ( "~<=~" PGNSP PGUID b f f 1042 1042 16 2329 2330 bpchar_pattern_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2327 ( "~<=~" PGNSP PGUID b f f 1042 1042 16 2329 2330 bpchar_pattern_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 2329 ( "~>=~" PGNSP PGUID b f f 1042 1042 16 2327 2326 bpchar_pattern_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2329 ( "~>=~" PGNSP PGUID b f f 1042 1042 16 2327 2326 bpchar_pattern_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2330 ( "~>~"	PGNSP PGUID b f f 1042 1042 16 2326 2327 bpchar_pattern_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1448,11 +1448,11 @@ DESCR("greater than");
 
 DATA(insert OID = 2345 ( "<"	   PGNSP PGUID b f f	1082	1114   16 2375 2348 date_lt_timestamp scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2346 ( "<="	   PGNSP PGUID b f f	1082	1114   16 2374 2349 date_le_timestamp scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2346 ( "<="	   PGNSP PGUID b f f	1082	1114   16 2374 2349 date_le_timestamp scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2347 ( "="	   PGNSP PGUID b t f	1082	1114   16 2373 2350 date_eq_timestamp eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2348 ( ">="	   PGNSP PGUID b f f	1082	1114   16 2372 2345 date_ge_timestamp scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2348 ( ">="	   PGNSP PGUID b f f	1082	1114   16 2372 2345 date_ge_timestamp scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2349 ( ">"	   PGNSP PGUID b f f	1082	1114   16 2371 2346 date_gt_timestamp scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1461,11 +1461,11 @@ DESCR("not equal");
 
 DATA(insert OID = 2358 ( "<"	   PGNSP PGUID b f f	1082	1184   16 2388 2361 date_lt_timestamptz scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2359 ( "<="	   PGNSP PGUID b f f	1082	1184   16 2387 2362 date_le_timestamptz scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2359 ( "<="	   PGNSP PGUID b f f	1082	1184   16 2387 2362 date_le_timestamptz scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2360 ( "="	   PGNSP PGUID b t f	1082	1184   16 2386 2363 date_eq_timestamptz eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2361 ( ">="	   PGNSP PGUID b f f	1082	1184   16 2385 2358 date_ge_timestamptz scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2361 ( ">="	   PGNSP PGUID b f f	1082	1184   16 2385 2358 date_ge_timestamptz scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2362 ( ">"	   PGNSP PGUID b f f	1082	1184   16 2384 2359 date_gt_timestamptz scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1474,11 +1474,11 @@ DESCR("not equal");
 
 DATA(insert OID = 2371 ( "<"	   PGNSP PGUID b f f	1114	1082   16 2349 2374 timestamp_lt_date scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2372 ( "<="	   PGNSP PGUID b f f	1114	1082   16 2348 2375 timestamp_le_date scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2372 ( "<="	   PGNSP PGUID b f f	1114	1082   16 2348 2375 timestamp_le_date scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2373 ( "="	   PGNSP PGUID b t f	1114	1082   16 2347 2376 timestamp_eq_date eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2374 ( ">="	   PGNSP PGUID b f f	1114	1082   16 2346 2371 timestamp_ge_date scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2374 ( ">="	   PGNSP PGUID b f f	1114	1082   16 2346 2371 timestamp_ge_date scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2375 ( ">"	   PGNSP PGUID b f f	1114	1082   16 2345 2372 timestamp_gt_date scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1487,11 +1487,11 @@ DESCR("not equal");
 
 DATA(insert OID = 2384 ( "<"	   PGNSP PGUID b f f	1184	1082   16 2362 2387 timestamptz_lt_date scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2385 ( "<="	   PGNSP PGUID b f f	1184	1082   16 2361 2388 timestamptz_le_date scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2385 ( "<="	   PGNSP PGUID b f f	1184	1082   16 2361 2388 timestamptz_le_date scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2386 ( "="	   PGNSP PGUID b t f	1184	1082   16 2360 2389 timestamptz_eq_date eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2387 ( ">="	   PGNSP PGUID b f f	1184	1082   16 2359 2384 timestamptz_ge_date scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2387 ( ">="	   PGNSP PGUID b f f	1184	1082   16 2359 2384 timestamptz_ge_date scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2388 ( ">"	   PGNSP PGUID b f f	1184	1082   16 2358 2385 timestamptz_gt_date scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1502,11 +1502,11 @@ DESCR("not equal");
 
 DATA(insert OID = 2534 ( "<"	   PGNSP PGUID b f f	1114	1184   16 2544 2537 timestamp_lt_timestamptz scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2535 ( "<="	   PGNSP PGUID b f f	1114	1184   16 2543 2538 timestamp_le_timestamptz scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2535 ( "<="	   PGNSP PGUID b f f	1114	1184   16 2543 2538 timestamp_le_timestamptz scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2536 ( "="	   PGNSP PGUID b t f	1114	1184   16 2542 2539 timestamp_eq_timestamptz eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2537 ( ">="	   PGNSP PGUID b f f	1114	1184   16 2541 2534 timestamp_ge_timestamptz scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2537 ( ">="	   PGNSP PGUID b f f	1114	1184   16 2541 2534 timestamp_ge_timestamptz scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2538 ( ">"	   PGNSP PGUID b f f	1114	1184   16 2540 2535 timestamp_gt_timestamptz scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1515,11 +1515,11 @@ DESCR("not equal");
 
 DATA(insert OID = 2540 ( "<"	   PGNSP PGUID b f f	1184	1114   16 2538 2543 timestamptz_lt_timestamp scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 2541 ( "<="	   PGNSP PGUID b f f	1184	1114   16 2537 2544 timestamptz_le_timestamp scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2541 ( "<="	   PGNSP PGUID b f f	1184	1114   16 2537 2544 timestamptz_le_timestamp scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 2542 ( "="	   PGNSP PGUID b t f	1184	1114   16 2536 2545 timestamptz_eq_timestamp eqsel eqjoinsel ));
 DESCR("equal");
-DATA(insert OID = 2543 ( ">="	   PGNSP PGUID b f f	1184	1114   16 2535 2540 timestamptz_ge_timestamp scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2543 ( ">="	   PGNSP PGUID b f f	1184	1114   16 2535 2540 timestamptz_ge_timestamp scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 2544 ( ">"	   PGNSP PGUID b f f	1184	1114   16 2534 2541 timestamptz_gt_timestamp scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1624,9 +1624,9 @@ DATA(insert OID = 2974 (  "<"	   PGNSP PGUID b f f 2950 2950 16 2975 2977 uuid_l
 DESCR("less than");
 DATA(insert OID = 2975 (  ">"	   PGNSP PGUID b f f 2950 2950 16 2974 2976 uuid_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 2976 (  "<="	   PGNSP PGUID b f f 2950 2950 16 2977 2975 uuid_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2976 (  "<="	   PGNSP PGUID b f f 2950 2950 16 2977 2975 uuid_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 2977 (  ">="	   PGNSP PGUID b f f 2950 2950 16 2976 2974 uuid_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2977 (  ">="	   PGNSP PGUID b f f 2950 2950 16 2976 2974 uuid_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* pg_lsn operators */
@@ -1638,9 +1638,9 @@ DATA(insert OID = 3224 (  "<"	   PGNSP PGUID b f f 3220 3220 16 3225 3227 pg_lsn
 DESCR("less than");
 DATA(insert OID = 3225 (  ">"	   PGNSP PGUID b f f 3220 3220 16 3224 3226 pg_lsn_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 3226 (  "<="	   PGNSP PGUID b f f 3220 3220 16 3227 3225 pg_lsn_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3226 (  "<="	   PGNSP PGUID b f f 3220 3220 16 3227 3225 pg_lsn_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 3227 (  ">="	   PGNSP PGUID b f f 3220 3220 16 3226 3224 pg_lsn_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3227 (  ">="	   PGNSP PGUID b f f 3220 3220 16 3226 3224 pg_lsn_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 3228 (  "-"	   PGNSP PGUID b f f 3220 3220 1700    0	0 pg_lsn_mi - - ));
 DESCR("minus");
@@ -1654,9 +1654,9 @@ DATA(insert OID = 3518 (  "<"	   PGNSP PGUID b f f 3500 3500 16 3519 3521 enum_l
 DESCR("less than");
 DATA(insert OID = 3519 (  ">"	   PGNSP PGUID b f f 3500 3500 16 3518 3520 enum_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 3520 (  "<="	   PGNSP PGUID b f f 3500 3500 16 3521 3519 enum_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3520 (  "<="	   PGNSP PGUID b f f 3500 3500 16 3521 3519 enum_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 3521 (  ">="	   PGNSP PGUID b f f 3500 3500 16 3520 3518 enum_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3521 (  ">="	   PGNSP PGUID b f f 3500 3500 16 3520 3518 enum_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /*
@@ -1664,13 +1664,13 @@ DESCR("greater than or equal");
  */
 DATA(insert OID = 3627 (  "<"	   PGNSP PGUID b f f 3614	 3614	 16 3632 3631	 tsvector_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 3628 (  "<="	   PGNSP PGUID b f f 3614	 3614	 16 3631 3632	 tsvector_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3628 (  "<="	   PGNSP PGUID b f f 3614	 3614	 16 3631 3632	 tsvector_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 3629 (  "="	   PGNSP PGUID b t f 3614	 3614	 16 3629 3630	 tsvector_eq eqsel eqjoinsel ));
 DESCR("equal");
 DATA(insert OID = 3630 (  "<>"	   PGNSP PGUID b f f 3614	 3614	 16 3630 3629	 tsvector_ne neqsel neqjoinsel ));
 DESCR("not equal");
-DATA(insert OID = 3631 (  ">="	   PGNSP PGUID b f f 3614	 3614	 16 3628 3627	 tsvector_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3631 (  ">="	   PGNSP PGUID b f f 3614	 3614	 16 3628 3627	 tsvector_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 3632 (  ">"	   PGNSP PGUID b f f 3614	 3614	 16 3627 3628	 tsvector_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1686,13 +1686,13 @@ DATA(insert OID = 3661 (  "@@@"    PGNSP PGUID b f f 3615	 3614	 16 3660	0	 ts_m
 DESCR("deprecated, use @@ instead");
 DATA(insert OID = 3674 (  "<"	   PGNSP PGUID b f f 3615	 3615	 16 3679 3678	 tsquery_lt scalarltsel scalarltjoinsel ));
 DESCR("less than");
-DATA(insert OID = 3675 (  "<="	   PGNSP PGUID b f f 3615	 3615	 16 3678 3679	 tsquery_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3675 (  "<="	   PGNSP PGUID b f f 3615	 3615	 16 3678 3679	 tsquery_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
 DATA(insert OID = 3676 (  "="	   PGNSP PGUID b t f 3615	 3615	 16 3676 3677	 tsquery_eq eqsel eqjoinsel ));
 DESCR("equal");
 DATA(insert OID = 3677 (  "<>"	   PGNSP PGUID b f f 3615	 3615	 16 3677 3676	 tsquery_ne neqsel neqjoinsel ));
 DESCR("not equal");
-DATA(insert OID = 3678 (  ">="	   PGNSP PGUID b f f 3615	 3615	 16 3675 3674	 tsquery_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3678 (  ">="	   PGNSP PGUID b f f 3615	 3615	 16 3675 3674	 tsquery_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 3679 (  ">"	   PGNSP PGUID b f f 3615	 3615	 16 3674 3675	 tsquery_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
@@ -1726,9 +1726,9 @@ DESCR("less than");
 DATA(insert OID = 2991 (  ">"	   PGNSP PGUID b f f 2249 2249 16 2990 2992 record_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
 #define RECORD_GT_OP 2991
-DATA(insert OID = 2992 (  "<="	   PGNSP PGUID b f f 2249 2249 16 2993 2991 record_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 2992 (  "<="	   PGNSP PGUID b f f 2249 2249 16 2993 2991 record_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 2993 (  ">="	   PGNSP PGUID b f f 2249 2249 16 2992 2990 record_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 2993 (  ">="	   PGNSP PGUID b f f 2249 2249 16 2992 2990 record_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* byte-oriented tests for identical rows and fast sorting */
@@ -1740,9 +1740,9 @@ DATA(insert OID = 3190 (  "*<"	   PGNSP PGUID b f f 2249 2249 16 3191 3193 recor
 DESCR("less than");
 DATA(insert OID = 3191 (  "*>"	   PGNSP PGUID b f f 2249 2249 16 3190 3192 record_image_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 3192 (  "*<="   PGNSP PGUID b f f 2249 2249 16 3193 3191 record_image_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3192 (  "*<="   PGNSP PGUID b f f 2249 2249 16 3193 3191 record_image_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 3193 (  "*>="   PGNSP PGUID b f f 2249 2249 16 3192 3190 record_image_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3193 (  "*>="   PGNSP PGUID b f f 2249 2249 16 3192 3190 record_image_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 
 /* generic range type operators */
@@ -1753,10 +1753,10 @@ DESCR("not equal");
 DATA(insert OID = 3884 (  "<"	   PGNSP PGUID b f f 3831 3831 16 3887 3886 range_lt rangesel scalarltjoinsel ));
 DESCR("less than");
 #define OID_RANGE_LESS_OP 3884
-DATA(insert OID = 3885 (  "<="	   PGNSP PGUID b f f 3831 3831 16 3886 3887 range_le rangesel scalarltjoinsel ));
+DATA(insert OID = 3885 (  "<="	   PGNSP PGUID b f f 3831 3831 16 3886 3887 range_le rangesel scalarlejoinsel ));
 DESCR("less than or equal");
 #define OID_RANGE_LESS_EQUAL_OP 3885
-DATA(insert OID = 3886 (  ">="	   PGNSP PGUID b f f 3831 3831 16 3885 3884 range_ge rangesel scalargtjoinsel ));
+DATA(insert OID = 3886 (  ">="	   PGNSP PGUID b f f 3831 3831 16 3885 3884 range_ge rangesel scalargejoinsel ));
 DESCR("greater than or equal");
 #define OID_RANGE_GREATER_EQUAL_OP 3886
 DATA(insert OID = 3887 (  ">"	   PGNSP PGUID b f f 3831 3831 16 3884 3885 range_gt rangesel scalargtjoinsel ));
@@ -1829,9 +1829,9 @@ DATA(insert OID = 3242 (  "<"		PGNSP PGUID b f f 3802 3802 16 3243 3245 jsonb_lt
 DESCR("less than");
 DATA(insert OID = 3243 (  ">"		PGNSP PGUID b f f 3802 3802 16 3242 3244 jsonb_gt scalargtsel scalargtjoinsel ));
 DESCR("greater than");
-DATA(insert OID = 3244 (  "<="	PGNSP PGUID b f f 3802 3802 16 3245 3243 jsonb_le scalarltsel scalarltjoinsel ));
+DATA(insert OID = 3244 (  "<="	PGNSP PGUID b f f 3802 3802 16 3245 3243 jsonb_le scalarlesel scalarlejoinsel ));
 DESCR("less than or equal");
-DATA(insert OID = 3245 (  ">="	PGNSP PGUID b f f 3802 3802 16 3244 3242 jsonb_ge scalargtsel scalargtjoinsel ));
+DATA(insert OID = 3245 (  ">="	PGNSP PGUID b f f 3802 3802 16 3244 3242 jsonb_ge scalargesel scalargejoinsel ));
 DESCR("greater than or equal");
 DATA(insert OID = 3246 (  "@>"	   PGNSP PGUID b f f 3802 3802 16 3250 0 jsonb_contains contsel contjoinsel ));
 DESCR("contains");
diff --git a/src/include/catalog/pg_operator_fn.h b/src/include/catalog/pg_operator_fn.h
index 37f5c712fe..6a2b39c2e7 100644
--- a/src/include/catalog/pg_operator_fn.h
+++ b/src/include/catalog/pg_operator_fn.h
@@ -4,7 +4,7 @@
 *	 prototypes for functions in catalog/pg_operator.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_operator_fn.h
diff --git a/src/include/catalog/pg_opfamily.h b/src/include/catalog/pg_opfamily.h
index 0d0ba7c66a..b544474254 100644
--- a/src/include/catalog/pg_opfamily.h
+++ b/src/include/catalog/pg_opfamily.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_opfamily.h
@@ -186,5 +186,6 @@ DATA(insert OID = 4103 (	3580	range_inclusion_ops		PGNSP PGUID ));
 DATA(insert OID = 4082 (	3580	pg_lsn_minmax_ops		PGNSP PGUID ));
 DATA(insert OID = 4104 (	3580	box_inclusion_ops		PGNSP PGUID ));
 DATA(insert OID = 5000 (	4000	box_ops		PGNSP PGUID ));
+DATA(insert OID = 5008 (	4000	poly_ops				PGNSP PGUID ));
 
 #endif							/* PG_OPFAMILY_H */
diff --git a/src/include/catalog/pg_partitioned_table.h b/src/include/catalog/pg_partitioned_table.h
index 38d64d6511..9dc66f4954 100644
--- a/src/include/catalog/pg_partitioned_table.h
+++ b/src/include/catalog/pg_partitioned_table.h
@@ -5,12 +5,12 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/catalog/pg_partitioned_table.h
  *
  * NOTES
- *	  the genbki.sh script reads this file and generates .bki
+ *	  the genbki.pl script reads this file and generates .bki
  *	  information from the DATA() statements.
  *
  *-------------------------------------------------------------------------
@@ -32,6 +32,8 @@ CATALOG(pg_partitioned_table,3350) BKI_WITHOUT_OIDS
 	Oid			partrelid;		/* partitioned table oid */
 	char		partstrat;		/* partitioning strategy */
 	int16		partnatts;		/* number of partition key columns */
+	Oid			partdefid;		/* default partition oid; InvalidOid if there
+								 * isn't one */
 
 	/*
 	 * variable-length fields start here, but we allow direct access to
@@ -62,13 +64,14 @@ typedef FormData_pg_partitioned_table *Form_pg_partitioned_table;
  *		compiler constants for pg_partitioned_table
  * ----------------
  */
-#define Natts_pg_partitioned_table				7
+#define Natts_pg_partitioned_table				8
 #define Anum_pg_partitioned_table_partrelid		1
 #define Anum_pg_partitioned_table_partstrat		2
 #define Anum_pg_partitioned_table_partnatts		3
-#define Anum_pg_partitioned_table_partattrs		4
-#define Anum_pg_partitioned_table_partclass		5
-#define Anum_pg_partitioned_table_partcollation 6
-#define Anum_pg_partitioned_table_partexprs		7
+#define Anum_pg_partitioned_table_partdefid		4
+#define Anum_pg_partitioned_table_partattrs		5
+#define Anum_pg_partitioned_table_partclass		6
+#define Anum_pg_partitioned_table_partcollation 7
+#define Anum_pg_partitioned_table_partexprs		8
 
 #endif							/* PG_PARTITIONED_TABLE_H */
diff --git a/src/include/catalog/pg_pltemplate.h b/src/include/catalog/pg_pltemplate.h
index fbe71bd0c3..d89f2db9e6 100644
--- a/src/include/catalog/pg_pltemplate.h
+++ b/src/include/catalog/pg_pltemplate.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_pltemplate.h
diff --git a/src/include/catalog/pg_policy.h b/src/include/catalog/pg_policy.h
index 86000737fa..0d94f1ad72 100644
--- a/src/include/catalog/pg_policy.h
+++ b/src/include/catalog/pg_policy.h
@@ -2,7 +2,7 @@
  * pg_policy.h
  *	 definition of the system "policy" relation (pg_policy)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  */
diff --git a/src/include/catalog/pg_proc.h b/src/include/catalog/pg_proc.h
index 8b33b4e0ea..c00d055940 100644
--- a/src/include/catalog/pg_proc.h
+++ b/src/include/catalog/pg_proc.h
@@ -4,7 +4,7 @@
  *	  definition of the system "procedure" relation (pg_proc)
  *	  along with the relation's initial contents.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_proc.h
@@ -264,6 +264,15 @@ DESCR("join selectivity of < and related operators on scalar datatypes");
 DATA(insert OID = 108 (  scalargtjoinsel   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 5 0 701 "2281 26 2281 21 2281" _null_ _null_ _null_ _null_ _null_ scalargtjoinsel _null_ _null_ _null_ ));
 DESCR("join selectivity of > and related operators on scalar datatypes");
 
+DATA(insert OID = 336 (  scalarlesel	   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 4 0 701 "2281 26 2281 23" _null_ _null_ _null_ _null_ _null_	scalarlesel _null_ _null_ _null_ ));
+DESCR("restriction selectivity of <= and related operators on scalar datatypes");
+DATA(insert OID = 337 (  scalargesel	   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 4 0 701 "2281 26 2281 23" _null_ _null_ _null_ _null_ _null_	scalargesel _null_ _null_ _null_ ));
+DESCR("restriction selectivity of >= and related operators on scalar datatypes");
+DATA(insert OID = 386 (  scalarlejoinsel   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 5 0 701 "2281 26 2281 21 2281" _null_ _null_ _null_ _null_ _null_ scalarlejoinsel _null_ _null_ _null_ ));
+DESCR("join selectivity of <= and related operators on scalar datatypes");
+DATA(insert OID = 398 (  scalargejoinsel   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 5 0 701 "2281 26 2281 21 2281" _null_ _null_ _null_ _null_ _null_ scalargejoinsel _null_ _null_ _null_ ));
+DESCR("join selectivity of >= and related operators on scalar datatypes");
+
 DATA(insert OID =  109 (  unknownin		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 705 "2275" _null_ _null_ _null_ _null_ _null_ unknownin _null_ _null_ _null_ ));
 DESCR("I/O");
 DATA(insert OID =  110 (  unknownout	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2275 "705" _null_ _null_ _null_ _null_ _null_ unknownout _null_ _null_ _null_ ));
@@ -638,6 +647,26 @@ DATA(insert OID = 381 (  bttintervalcmp    PGNSP PGUID 12 1 0 0 0 f f f f t f i
 DESCR("less-equal-greater");
 DATA(insert OID = 382 (  btarraycmp		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 23 "2277 2277" _null_ _null_ _null_ _null_ _null_ btarraycmp _null_ _null_ _null_ ));
 DESCR("less-equal-greater");
+DATA(insert OID = 4126 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "20 20 20 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int8_int8 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4127 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "23 23 20 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int4_int8 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4128 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "23 23 23 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int4_int4 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4129 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "23 23 21 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int4_int2 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4130 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "21 21 20 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int2_int8 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4131 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "21 21 23 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int2_int4 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4132 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "21 21 21 16 16" _null_ _null_ _null_ _null_ _null_ in_range_int2_int2 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4139 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "701 701 701 16 16" _null_ _null_ _null_ _null_ _null_ in_range_float8_float8 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4140 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "700 700 701 16 16" _null_ _null_ _null_ _null_ _null_ in_range_float4_float8 _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4141 ( in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1700 1700 1700 16 16" _null_ _null_ _null_ _null_ _null_ in_range_numeric_numeric _null_ _null_ _null_ ));
+DESCR("window RANGE support");
 
 DATA(insert OID = 361 (  lseg_distance	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 701 "601 601" _null_ _null_ _null_ _null_ _null_	lseg_distance _null_ _null_ _null_ ));
 DATA(insert OID = 362 (  lseg_interpt	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 600 "601 601" _null_ _null_ _null_ _null_ _null_	lseg_interpt _null_ _null_ _null_ ));
@@ -668,36 +697,68 @@ DESCR("convert char(n) to name");
 
 DATA(insert OID = 449 (  hashint2		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "21" _null_ _null_ _null_ _null_ _null_ hashint2 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 441 (  hashint2extended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "21 20" _null_ _null_ _null_ _null_ _null_ hashint2extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 450 (  hashint4		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "23" _null_ _null_ _null_ _null_ _null_ hashint4 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 425 (  hashint4extended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "23 20" _null_ _null_ _null_ _null_ _null_ hashint4extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 949 (  hashint8		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "20" _null_ _null_ _null_ _null_ _null_ hashint8 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 442 (  hashint8extended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "20 20" _null_ _null_ _null_ _null_ _null_ hashint8extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 451 (  hashfloat4		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "700" _null_ _null_ _null_ _null_ _null_ hashfloat4 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 443 (  hashfloat4extended	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "700 20" _null_ _null_ _null_ _null_ _null_ hashfloat4extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 452 (  hashfloat8		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "701" _null_ _null_ _null_ _null_ _null_ hashfloat8 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 444 (  hashfloat8extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "701 20" _null_ _null_ _null_ _null_ _null_ hashfloat8extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 453 (  hashoid		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "26" _null_ _null_ _null_ _null_ _null_ hashoid _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 445 (  hashoidextended   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "26 20" _null_ _null_ _null_ _null_ _null_ hashoidextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 454 (  hashchar		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "18" _null_ _null_ _null_ _null_ _null_ hashchar _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 446 (  hashcharextended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "18 20" _null_ _null_ _null_ _null_ _null_ hashcharextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 455 (  hashname		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "19" _null_ _null_ _null_ _null_ _null_ hashname _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 447 (  hashnameextended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "19 20" _null_ _null_ _null_ _null_ _null_ hashnameextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 400 (  hashtext		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "25" _null_ _null_ _null_ _null_ _null_ hashtext _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 448 (  hashtextextended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "25 20" _null_ _null_ _null_ _null_ _null_ hashtextextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 456 (  hashvarlena	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "2281" _null_ _null_ _null_ _null_ _null_ hashvarlena _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 772 (  hashvarlenaextended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "2281 20" _null_ _null_ _null_ _null_ _null_ hashvarlenaextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 457 (  hashoidvector	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "30" _null_ _null_ _null_ _null_ _null_ hashoidvector _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 776 (  hashoidvectorextended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "30 20" _null_ _null_ _null_ _null_ _null_ hashoidvectorextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 329 (  hash_aclitem	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1033" _null_ _null_ _null_ _null_ _null_	hash_aclitem _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 777 (  hash_aclitem_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1033 20" _null_ _null_ _null_ _null_ _null_ hash_aclitem_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 399 (  hashmacaddr	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "829" _null_ _null_ _null_ _null_ _null_ hashmacaddr _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 778 (  hashmacaddrextended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "829 20" _null_ _null_ _null_ _null_ _null_ hashmacaddrextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 422 (  hashinet		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "869" _null_ _null_ _null_ _null_ _null_ hashinet _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 779 (  hashinetextended  PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "869 20" _null_ _null_ _null_ _null_ _null_ hashinetextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 432 (  hash_numeric	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1700" _null_ _null_ _null_ _null_ _null_ hash_numeric _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 780 (  hash_numeric_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1700 20" _null_ _null_ _null_ _null_ _null_ hash_numeric_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 328 (  hashmacaddr8	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "774" _null_ _null_ _null_ _null_ _null_ hashmacaddr8 _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 781 (  hashmacaddr8extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "774 20" _null_ _null_ _null_ _null_ _null_ hashmacaddr8extended _null_ _null_ _null_ ));
+DESCR("hash");
 
 DATA(insert OID = 438 (  num_nulls		   PGNSP PGUID 12 1 0 2276 0 f f f f f f i s 1 0 23 "2276" "{2276}" "{v}" _null_ _null_ _null_ pg_num_nulls _null_ _null_ _null_ ));
 DESCR("count the number of NULL arguments");
@@ -747,6 +808,8 @@ DESCR("convert float8 to int8");
 
 DATA(insert OID = 626 (  hash_array		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "2277" _null_ _null_ _null_ _null_ _null_ hash_array _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 782 (  hash_array_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "2277 20" _null_ _null_ _null_ _null_ _null_ hash_array_extended _null_ _null_ _null_ ));
+DESCR("hash");
 
 DATA(insert OID = 652 (  float4			   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 700 "20" _null_ _null_ _null_ _null_ _null_ i8tof _null_ _null_ _null_ ));
 DESCR("convert int8 to float4");
@@ -1155,6 +1218,8 @@ DATA(insert OID = 3328 ( bpchar_sortsupport PGNSP PGUID 12 1 0 0 0 f f f f t f i
 DESCR("sort support");
 DATA(insert OID = 1080 (  hashbpchar	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1042" _null_ _null_ _null_ _null_ _null_	hashbpchar _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 972  (  hashbpcharextended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1042 20" _null_ _null_ _null_ _null_ _null_	hashbpcharextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 1081 (  format_type	   PGNSP PGUID 12 1 0 0 0 f f f f f f s s 2 0 25 "26 23" _null_ _null_ _null_ _null_ _null_ format_type _null_ _null_ _null_ ));
 DESCR("format a type oid and atttypmod to canonical SQL");
 DATA(insert OID = 1084 (  date_in		   PGNSP PGUID 12 1 0 0 0 f f f f t f s s 1 0 1082 "2275" _null_ _null_ _null_ _null_ _null_ date_in _null_ _null_ _null_ ));
@@ -1171,6 +1236,8 @@ DATA(insert OID = 1092 (  date_cmp		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2
 DESCR("less-equal-greater");
 DATA(insert OID = 3136 (  date_sortsupport PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2278 "2281" _null_ _null_ _null_ _null_ _null_ date_sortsupport _null_ _null_ _null_ ));
 DESCR("sort support");
+DATA(insert OID = 4133 (  in_range		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1082 1082 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_date_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
 
 /* OIDS 1100 - 1199 */
 
@@ -2248,8 +2315,6 @@ DATA(insert OID = 3554 (  inet_gist_union		PGNSP PGUID 12 1 0 0 0 f f f f t f i
 DESCR("GiST support");
 DATA(insert OID = 3555 (  inet_gist_compress	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ inet_gist_compress _null_ _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 3556 (  inet_gist_decompress	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ inet_gist_decompress _null_ _null_ _null_ ));
-DESCR("GiST support");
 DATA(insert OID = 3573 (  inet_gist_fetch		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ inet_gist_fetch _null_ _null_ _null_ ));
 DESCR("GiST support");
 DATA(insert OID = 3557 (  inet_gist_penalty		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 3 0 2281 "2281 2281 2281" _null_ _null_ _null_ _null_ _null_ inet_gist_penalty _null_ _null_ _null_ ));
@@ -2286,10 +2351,16 @@ DESCR("less-equal-greater");
 
 DATA(insert OID = 1688 (  time_hash			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1083" _null_ _null_ _null_ _null_ _null_ time_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3409 (  time_hash_extended	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1083 20" _null_ _null_ _null_ _null_ _null_ time_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 1696 (  timetz_hash		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1266" _null_ _null_ _null_ _null_ _null_ timetz_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3410 (  timetz_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1266 20" _null_ _null_ _null_ _null_ _null_ timetz_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 1697 (  interval_hash		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1186" _null_ _null_ _null_ _null_ _null_ interval_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3418 (  interval_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1186 20" _null_ _null_ _null_ _null_ _null_ interval_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 
 
 /* OID's 1700 - 1799 NUMERIC data type */
@@ -3078,6 +3149,8 @@ DATA(insert OID = 2038 (  timezone			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0
 DESCR("adjust time with time zone to new zone");
 DATA(insert OID = 2039 (  timestamp_hash	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "1114" _null_ _null_ _null_ _null_ _null_ timestamp_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3411 (  timestamp_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "1114 20" _null_ _null_ _null_ _null_ _null_ timestamp_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 2041 ( overlaps			PGNSP PGUID 12 1 0 0 0 f f f f f f i s 4 0 16 "1114 1114 1114 1114" _null_ _null_ _null_ _null_ _null_	overlaps_timestamp _null_ _null_ _null_ ));
 DESCR("intervals overlap?");
 DATA(insert OID = 2042 ( overlaps			PGNSP PGUID 14 1 0 0 0 f f f f f f i s 4 0 16 "1114 1186 1114 1186" _null_ _null_ _null_ _null_ _null_ "select ($1, ($1 + $2)) overlaps ($3, ($3 + $4))" _null_ _null_ _null_ ));
@@ -3090,6 +3163,18 @@ DATA(insert OID = 2045 (  timestamp_cmp		PGNSP PGUID 12 1 0 0 0 f f f f t f i s
 DESCR("less-equal-greater");
 DATA(insert OID = 3137 (  timestamp_sortsupport PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2278 "2281" _null_ _null_ _null_ _null_ _null_ timestamp_sortsupport _null_ _null_ _null_ ));
 DESCR("sort support");
+
+DATA(insert OID = 4134 (  in_range			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1114 1114 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_timestamp_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4135 (  in_range			PGNSP PGUID 12 1 0 0 0 f f f f t f s s 5 0 16 "1184 1184 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_timestamptz_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4136 (  in_range			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1186 1186 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_interval_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4137 (  in_range			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1083 1083 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_time_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+DATA(insert OID = 4138 (  in_range			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "1266 1266 1186 16 16" _null_ _null_ _null_ _null_ _null_ in_range_timetz_interval _null_ _null_ _null_ ));
+DESCR("window RANGE support");
+
 DATA(insert OID = 2046 (  time				PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 1083 "1266" _null_ _null_ _null_ _null_ _null_ timetz_time _null_ _null_ _null_ ));
 DESCR("convert time with time zone to time");
 DATA(insert OID = 2047 (  timetz			PGNSP PGUID 12 1 0 0 0 f f f f t f s s 1 0 1266 "1083" _null_ _null_ _null_ _null_ _null_ time_timetz _null_ _null_ _null_ ));
@@ -3838,10 +3923,18 @@ DATA(insert OID = 3314 (  system			PGNSP PGUID 12 1 0 0 0 f f f f t f v s 1 0 33
 DESCR("SYSTEM tablesample method handler");
 
 /* cryptographic */
-DATA(insert OID =  2311 (  md5	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 25 "25" _null_ _null_ _null_ _null_ _null_ md5_text _null_ _null_ _null_ ));
+DATA(insert OID =  2311 (  md5	   PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 25 "25" _null_ _null_ _null_ _null_ _null_ md5_text _null_ _null_ _null_ ));
 DESCR("MD5 hash");
-DATA(insert OID =  2321 (  md5	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 25 "17" _null_ _null_ _null_ _null_ _null_ md5_bytea _null_ _null_ _null_ ));
+DATA(insert OID =  2321 (  md5	   PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 25 "17" _null_ _null_ _null_ _null_ _null_ md5_bytea _null_ _null_ _null_ ));
 DESCR("MD5 hash");
+DATA(insert OID =  3419 (  sha224  PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 17 "17" _null_ _null_ _null_ _null_ _null_ sha224_bytea _null_ _null_ _null_ ));
+DESCR("SHA-224 hash");
+DATA(insert OID =  3420 (  sha256  PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 17 "17" _null_ _null_ _null_ _null_ _null_ sha256_bytea _null_ _null_ _null_ ));
+DESCR("SHA-256 hash");
+DATA(insert OID =  3421 (  sha384  PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 17 "17" _null_ _null_ _null_ _null_ _null_ sha384_bytea _null_ _null_ _null_ ));
+DESCR("SHA-384 hash");
+DATA(insert OID =  3422 (  sha512  PGNSP PGUID 12 1 0 0 0 f f f t t f i s 1 0 17 "17" _null_ _null_ _null_ _null_ _null_ sha512_bytea _null_ _null_ _null_ ));
+DESCR("SHA-512 hash");
 
 /* crosstype operations for date vs. timestamp and timestamptz */
 DATA(insert OID = 2338 (  date_lt_timestamp		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "1082 1114" _null_ _null_ _null_ _null_ _null_ date_lt_timestamp _null_ _null_ _null_ ));
@@ -4257,12 +4350,6 @@ DATA(insert OID = 2588 (  circle_overabove		PGNSP PGUID 12 1 0 0 0 f f f f t f i
 /* support functions for GiST r-tree emulation */
 DATA(insert OID = 2578 (  gist_box_consistent	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 5 0 16 "2281 603 21 26 2281" _null_ _null_ _null_ _null_ _null_	gist_box_consistent _null_ _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 2579 (  gist_box_compress		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ gist_box_compress _null_ _null_ _null_ ));
-DESCR("GiST support");
-DATA(insert OID = 2580 (  gist_box_decompress	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ gist_box_decompress _null_ _null_ _null_ ));
-DESCR("GiST support");
-DATA(insert OID = 3281 (  gist_box_fetch	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ gist_box_fetch _null_ _null_ _null_ ));
-DESCR("GiST support");
 DATA(insert OID = 2581 (  gist_box_penalty		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 3 0 2281 "2281 2281 2281" _null_ _null_ _null_ _null_ _null_ gist_box_penalty _null_ _null_ _null_ ));
 DESCR("GiST support");
 DATA(insert OID = 2582 (  gist_box_picksplit	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 2281 "2281 2281" _null_ _null_ _null_ _null_ _null_	gist_box_picksplit _null_ _null_ _null_ ));
@@ -4543,6 +4630,8 @@ DATA(insert OID = 2962 (  uuid_send		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1
 DESCR("I/O");
 DATA(insert OID = 2963 (  uuid_hash		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "2950" _null_ _null_ _null_ _null_ _null_ uuid_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3412 (  uuid_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "2950 20" _null_ _null_ _null_ _null_ _null_ uuid_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 
 /* pg_lsn */
 DATA(insert OID = 3229 (  pg_lsn_in		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 3220 "2275" _null_ _null_ _null_ _null_ _null_ pg_lsn_in _null_ _null_ _null_ ));
@@ -4564,6 +4653,8 @@ DATA(insert OID = 3251 (  pg_lsn_cmp	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0
 DESCR("less-equal-greater");
 DATA(insert OID = 3252 (  pg_lsn_hash	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "3220" _null_ _null_ _null_ _null_ _null_ pg_lsn_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3413 (  pg_lsn_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "3220 20" _null_ _null_ _null_ _null_ _null_ pg_lsn_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 
 /* enum related procs */
 DATA(insert OID = 3504 (  anyenum_in	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 3500 "2275" _null_ _null_ _null_ _null_ _null_ anyenum_in _null_ _null_ _null_ ));
@@ -4584,6 +4675,8 @@ DATA(insert OID = 3514 (  enum_cmp		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 2
 DESCR("less-equal-greater");
 DATA(insert OID = 3515 (  hashenum		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "3500" _null_ _null_ _null_ _null_ _null_ hashenum _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3414 (  hashenumextended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "3500 20" _null_ _null_ _null_ _null_ _null_ hashenumextended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 3524 (  enum_smaller	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 3500 "3500 3500" _null_ _null_ _null_ _null_ _null_ enum_smaller _null_ _null_ _null_ ));
 DESCR("smaller of two");
 DATA(insert OID = 3525 (  enum_larger	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 3500 "3500 3500" _null_ _null_ _null_ _null_ _null_ enum_larger _null_ _null_ _null_ ));
@@ -4737,8 +4830,6 @@ DESCR("rewrite tsquery");
 
 DATA(insert OID = 3695 (  gtsquery_compress				PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ gtsquery_compress _null_ _null_ _null_ ));
 DESCR("GiST tsquery support");
-DATA(insert OID = 3696 (  gtsquery_decompress			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ gtsquery_decompress _null_ _null_ _null_ ));
-DESCR("GiST tsquery support");
 DATA(insert OID = 3697 (  gtsquery_picksplit			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 2281 "2281 2281" _null_ _null_ _null_ _null_ _null_ gtsquery_picksplit _null_ _null_ _null_ ));
 DESCR("GiST tsquery support");
 DATA(insert OID = 3698 (  gtsquery_union				PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "2281 2281" _null_ _null_ _null_ _null_ _null_ gtsquery_union _null_ _null_ _null_ ));
@@ -4981,6 +5072,8 @@ DATA(insert OID = 4044 (  jsonb_cmp		   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2
 DESCR("less-equal-greater");
 DATA(insert OID = 4045 (  jsonb_hash	   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "3802" _null_ _null_ _null_ _null_ _null_ jsonb_hash _null_ _null_ _null_ ));
 DESCR("hash");
+DATA(insert OID = 3416 (  jsonb_hash_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "3802 20" _null_ _null_ _null_ _null_ _null_ jsonb_hash_extended _null_ _null_ _null_ ));
+DESCR("hash");
 DATA(insert OID = 4046 (  jsonb_contains   PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "3802 3802" _null_ _null_ _null_ _null_ _null_ jsonb_contains _null_ _null_ _null_ ));
 DATA(insert OID = 4047 (  jsonb_exists	 PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "3802 25" _null_ _null_ _null_ _null_ _null_ jsonb_exists _null_ _null_ _null_ ));
 DATA(insert OID = 4048 (  jsonb_exists_any	 PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "3802 1009" _null_ _null_ _null_ _null_ _null_ jsonb_exists_any _null_ _null_ _null_ ));
@@ -5157,12 +5250,6 @@ DATA(insert OID = 3875 (  range_gist_consistent PGNSP PGUID 12 1 0 0 0 f f f f t
 DESCR("GiST support");
 DATA(insert OID = 3876 (  range_gist_union		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 3831 "2281 2281" _null_ _null_ _null_ _null_ _null_ range_gist_union _null_ _null_ _null_ ));
 DESCR("GiST support");
-DATA(insert OID = 3877 (  range_gist_compress	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ range_gist_compress _null_ _null_ _null_ ));
-DESCR("GiST support");
-DATA(insert OID = 3878 (  range_gist_decompress PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ range_gist_decompress _null_ _null_ _null_ ));
-DESCR("GiST support");
-DATA(insert OID = 3996 (  range_gist_fetch		PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 2281 "2281" _null_ _null_ _null_ _null_ _null_ range_gist_fetch _null_ _null_ _null_ ));
-DESCR("GiST support");
 DATA(insert OID = 3879 (  range_gist_penalty	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 3 0 2281 "2281 2281 2281" _null_ _null_ _null_ _null_ _null_ range_gist_penalty _null_ _null_ _null_ ));
 DESCR("GiST support");
 DATA(insert OID = 3880 (  range_gist_picksplit	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 2281 "2281 2281" _null_ _null_ _null_ _null_ _null_ range_gist_picksplit _null_ _null_ _null_ ));
@@ -5171,6 +5258,8 @@ DATA(insert OID = 3881 (  range_gist_same		PGNSP PGUID 12 1 0 0 0 f f f f t f i
 DESCR("GiST support");
 DATA(insert OID = 3902 (  hash_range			PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 23 "3831" _null_ _null_ _null_ _null_ _null_ hash_range _null_ _null_ _null_ ));
 DESCR("hash a range");
+DATA(insert OID = 3417 (  hash_range_extended PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 20 "3831 20" _null_ _null_ _null_ _null_ _null_ hash_range_extended _null_ _null_ _null_ ));
+DESCR("hash a range");
 DATA(insert OID = 3916 (  range_typanalyze		PGNSP PGUID 12 1 0 0 0 f f f f t f s s 1 0 16 "2281" _null_ _null_ _null_ _null_ _null_ range_typanalyze _null_ _null_ _null_ ));
 DESCR("range typanalyze");
 DATA(insert OID = 3169 (  rangesel				PGNSP PGUID 12 1 0 0 0 f f f f t f s s 4 0 701 "2281 26 2281 23" _null_ _null_ _null_ _null_ _null_ rangesel _null_ _null_ _null_ ));
@@ -5288,6 +5377,11 @@ DESCR("SP-GiST support for quad tree over box");
 DATA(insert OID = 5016 (  spg_box_quad_leaf_consistent	PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 16 "2281 2281" _null_ _null_ _null_ _null_  _null_ spg_box_quad_leaf_consistent _null_ _null_ _null_ ));
 DESCR("SP-GiST support for quad tree over box");
 
+DATA(insert OID = 5010 (  spg_bbox_quad_config PGNSP PGUID 12 1 0 0 0 f f f f t f i s 2 0 2278 "2281 2281" _null_ _null_ _null_ _null_  _null_ spg_bbox_quad_config _null_ _null_ _null_ ));
+DESCR("SP-GiST support for quad tree over 2-D types represented by their bounding boxes");
+DATA(insert OID = 5011 (  spg_poly_quad_compress PGNSP PGUID 12 1 0 0 0 f f f f t f i s 1 0 603 "604" _null_ _null_ _null_ _null_  _null_ spg_poly_quad_compress _null_ _null_ _null_ ));
+DESCR("SP-GiST support for quad tree over polygons");
+
 /* replication slots */
 DATA(insert OID = 3779 (  pg_create_physical_replication_slot PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 2249 "19 16 16" "{19,16,16,19,3220}" "{i,i,i,o,o}" "{slot_name,immediately_reserve,temporary,slot_name,lsn}" _null_ _null_ pg_create_physical_replication_slot _null_ _null_ _null_ ));
 DESCR("create a physical replication slot");
@@ -5305,6 +5399,8 @@ DATA(insert OID = 3784 (  pg_logical_slot_peek_changes PGNSP PGUID 12 1000 1000
 DESCR("peek at changes from replication slot");
 DATA(insert OID = 3785 (  pg_logical_slot_peek_binary_changes PGNSP PGUID 12 1000 1000 25 0 f f f f f t v u 4 0 2249 "19 3220 23 1009" "{19,3220,23,1009,3220,28,17}" "{i,i,i,v,o,o,o}" "{slot_name,upto_lsn,upto_nchanges,options,lsn,xid,data}" _null_ _null_ pg_logical_slot_peek_binary_changes _null_ _null_ _null_ ));
 DESCR("peek at binary changes from replication slot");
+DATA(insert OID = 3878 (  pg_replication_slot_advance PGNSP PGUID 12 1 0 0 0 f f f f t f v u 2 0 2249 "19 3220" "{19,3220,19,3220}" "{i,i,o,o}" "{slot_name,upto_lsn,slot_name,end_lsn}" _null_ _null_ pg_replication_slot_advance _null_ _null_ _null_ ));
+DESCR("advance logical replication slot");
 DATA(insert OID = 3577 (  pg_logical_emit_message PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 3220 "16 25 25" _null_ _null_ _null_ _null_ _null_ pg_logical_emit_message_text _null_ _null_ _null_ ));
 DESCR("emit a textual logical decoding message");
 DATA(insert OID = 3578 (  pg_logical_emit_message PGNSP PGUID 12 1 0 0 0 f f f f t f v u 3 0 3220 "16 25 17" _null_ _null_ _null_ _null_ _null_ pg_logical_emit_message_bytea _null_ _null_ _null_ ));
@@ -5453,7 +5549,7 @@ DESCR("pg_config binary as a function");
 DATA(insert OID = 3441 ( pg_control_system PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{23,23,20,1184}" "{o,o,o,o}" "{pg_control_version,catalog_version_no,system_identifier,pg_control_last_modified}" _null_ _null_ pg_control_system _null_ _null_ _null_ ));
 DESCR("pg_controldata general state information as a function");
 
-DATA(insert OID = 3442 ( pg_control_checkpoint PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_lsn,prior_lsn,redo_lsn,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_control_checkpoint _null_ _null_ _null_ ));
+DATA(insert OID = 3442 ( pg_control_checkpoint PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,3220,25,23,23,16,25,26,28,28,28,26,28,28,26,28,28,1184}" "{o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o,o}" "{checkpoint_lsn,redo_lsn,redo_wal_file,timeline_id,prev_timeline_id,full_page_writes,next_xid,next_oid,next_multixact_id,next_multi_offset,oldest_xid,oldest_xid_dbid,oldest_active_xid,oldest_multi_xid,oldest_multi_dbid,oldest_commit_ts_xid,newest_commit_ts_xid,checkpoint_time}" _null_ _null_ pg_control_checkpoint _null_ _null_ _null_ ));
 DESCR("pg_controldata checkpoint state information as a function");
 
 DATA(insert OID = 3443 ( pg_control_recovery PGNSP PGUID 12 1 0 0 0 f f f f t f v s 0 0 2249 "" "{3220,23,3220,3220,16}" "{o,o,o,o,o}" "{min_recovery_end_lsn,min_recovery_end_timeline,backup_start_lsn,backup_end_lsn,end_of_backup_record_required}" _null_ _null_ pg_control_recovery _null_ _null_ _null_ ));
@@ -5475,6 +5571,10 @@ DESCR("list files in the log directory");
 DATA(insert OID = 3354 (  pg_ls_waldir				 PGNSP PGUID 12 10 20 0 0 f f f f t t v s 0 0 2249 "" "{25,20,1184}" "{o,o,o}" "{name,size,modification}" _null_ _null_ pg_ls_waldir _null_ _null_ _null_ ));
 DESCR("list of files in the WAL directory");
 
+/* hash partitioning constraint function */
+DATA(insert OID = 5028 ( satisfies_hash_partition PGNSP PGUID 12 1 0 2276 0 f f f f f f i s 4 0 16 "26 23 23 2276" _null_ "{i,i,i,v}" _null_ _null_ _null_ satisfies_hash_partition _null_ _null_ _null_ ));
+DESCR("hash partition CHECK constraint");
+
 /*
  * Symbolic values for provolatile column: these indicate whether the result
  * of a function is dependent *only* on the values of its explicit arguments,
diff --git a/src/include/catalog/pg_proc_fn.h b/src/include/catalog/pg_proc_fn.h
index 2c85f5d267..098e2e6f07 100644
--- a/src/include/catalog/pg_proc_fn.h
+++ b/src/include/catalog/pg_proc_fn.h
@@ -4,7 +4,7 @@
  *	 prototypes for functions in catalog/pg_proc.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_proc_fn.h
diff --git a/src/include/catalog/pg_publication.h b/src/include/catalog/pg_publication.h
index aa148960cd..37e77b8be7 100644
--- a/src/include/catalog/pg_publication.h
+++ b/src/include/catalog/pg_publication.h
@@ -3,7 +3,7 @@
  * pg_publication.h
  *	  definition of the relation sets relation (pg_publication)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_publication.h
@@ -93,6 +93,7 @@ extern List *GetPublicationRelations(Oid pubid);
 extern List *GetAllTablesPublications(void);
 extern List *GetAllTablesPublicationRelations(void);
 
+extern bool is_publishable_relation(Relation rel);
 extern ObjectAddress publication_add_relation(Oid pubid, Relation targetrel,
 						 bool if_not_exists);
 
diff --git a/src/include/catalog/pg_publication_rel.h b/src/include/catalog/pg_publication_rel.h
index 3729e5abdc..033b600cee 100644
--- a/src/include/catalog/pg_publication_rel.h
+++ b/src/include/catalog/pg_publication_rel.h
@@ -3,7 +3,7 @@
  * pg_publication_rel.h
  *	  definition of the publication to relation map (pg_publication_rel)
   *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_publication_rel.h
diff --git a/src/include/catalog/pg_range.h b/src/include/catalog/pg_range.h
index f12e82b2f2..00d02d1712 100644
--- a/src/include/catalog/pg_range.h
+++ b/src/include/catalog/pg_range.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_range.h
diff --git a/src/include/catalog/pg_replication_origin.h b/src/include/catalog/pg_replication_origin.h
index 24c8a8430c..9656179ad4 100644
--- a/src/include/catalog/pg_replication_origin.h
+++ b/src/include/catalog/pg_replication_origin.h
@@ -3,7 +3,7 @@
  * pg_replication_origin.h
  *	  Persistent replication origin registry
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_replication_origin.h
diff --git a/src/include/catalog/pg_rewrite.h b/src/include/catalog/pg_rewrite.h
index 48b9333a9d..81f2b19a74 100644
--- a/src/include/catalog/pg_rewrite.h
+++ b/src/include/catalog/pg_rewrite.h
@@ -8,7 +8,7 @@
  * --- ie, rule names are only unique among the rules of a given table.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_rewrite.h
diff --git a/src/include/catalog/pg_seclabel.h b/src/include/catalog/pg_seclabel.h
index 3db9612fc3..70dc01ebfc 100644
--- a/src/include/catalog/pg_seclabel.h
+++ b/src/include/catalog/pg_seclabel.h
@@ -3,7 +3,7 @@
  * pg_seclabel.h
  *	  definition of the system "security label" relation (pg_seclabel)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
diff --git a/src/include/catalog/pg_sequence.h b/src/include/catalog/pg_sequence.h
index 8ae6b7143d..a78417eaeb 100644
--- a/src/include/catalog/pg_sequence.h
+++ b/src/include/catalog/pg_sequence.h
@@ -1,3 +1,13 @@
+/* -------------------------------------------------------------------------
+ *
+ * pg_sequence.h
+ *	  definition of the system "sequence" relation (pg_sequence)
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * -------------------------------------------------------------------------
+ */
 #ifndef PG_SEQUENCE_H
 #define PG_SEQUENCE_H
 
diff --git a/src/include/catalog/pg_shdepend.h b/src/include/catalog/pg_shdepend.h
index 51b6588d3e..ae40377e4e 100644
--- a/src/include/catalog/pg_shdepend.h
+++ b/src/include/catalog/pg_shdepend.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_shdepend.h
diff --git a/src/include/catalog/pg_shdescription.h b/src/include/catalog/pg_shdescription.h
index 154c48b584..d4ec616f3b 100644
--- a/src/include/catalog/pg_shdescription.h
+++ b/src/include/catalog/pg_shdescription.h
@@ -12,7 +12,7 @@
  * across tables.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_shdescription.h
diff --git a/src/include/catalog/pg_shseclabel.h b/src/include/catalog/pg_shseclabel.h
index f8a906bb12..57b854c217 100644
--- a/src/include/catalog/pg_shseclabel.h
+++ b/src/include/catalog/pg_shseclabel.h
@@ -3,7 +3,7 @@
  * pg_shseclabel.h
  *	  definition of the system "security label" relation (pg_shseclabel)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
diff --git a/src/include/catalog/pg_statistic.h b/src/include/catalog/pg_statistic.h
index 3713a56bbd..a5c85feffe 100644
--- a/src/include/catalog/pg_statistic.h
+++ b/src/include/catalog/pg_statistic.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_statistic.h
@@ -161,12 +161,10 @@ typedef FormData_pg_statistic *Form_pg_statistic;
 #define Anum_pg_statistic_stavalues5	26
 
 /*
- * Currently, five statistical slot "kinds" are defined by core PostgreSQL,
- * as documented below.  Additional "kinds" will probably appear in
- * future to help cope with non-scalar datatypes.  Also, custom data types
- * can define their own "kind" codes by mutual agreement between a custom
- * typanalyze routine and the selectivity estimation functions of the type's
- * operators.
+ * Several statistical slot "kinds" are defined by core PostgreSQL, as
+ * documented below.  Also, custom data types can define their own "kind"
+ * codes by mutual agreement between a custom typanalyze routine and the
+ * selectivity estimation functions of the type's operators.
  *
  * Code reading the pg_statistic relation should not assume that a particular
  * data "kind" will appear in any particular slot.  Instead, search the
diff --git a/src/include/catalog/pg_statistic_ext.h b/src/include/catalog/pg_statistic_ext.h
index 78138026db..2f5ef78c6c 100644
--- a/src/include/catalog/pg_statistic_ext.h
+++ b/src/include/catalog/pg_statistic_ext.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_statistic_ext.h
@@ -45,7 +45,7 @@ CATALOG(pg_statistic_ext,3381)
 	int2vector	stxkeys;		/* array of column keys */
 
 #ifdef CATALOG_VARLEN
-	char		stxkind[1] BKI_FORCE_NOT_NULL;	/* statistic types requested
+	char		stxkind[1] BKI_FORCE_NOT_NULL;	/* statistics kinds requested
 												 * to build */
 	pg_ndistinct stxndistinct;	/* ndistinct coefficients (serialized) */
 	pg_dependencies stxdependencies;	/* dependencies (serialized) */
diff --git a/src/include/catalog/pg_subscription.h b/src/include/catalog/pg_subscription.h
index 274ff6bc42..46d0b48232 100644
--- a/src/include/catalog/pg_subscription.h
+++ b/src/include/catalog/pg_subscription.h
@@ -3,7 +3,7 @@
  * pg_subscription.h
  *		Definition of the subscription catalog (pg_subscription).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
diff --git a/src/include/catalog/pg_subscription_rel.h b/src/include/catalog/pg_subscription_rel.h
index 991ca9d552..d936973a9d 100644
--- a/src/include/catalog/pg_subscription_rel.h
+++ b/src/include/catalog/pg_subscription_rel.h
@@ -4,7 +4,7 @@
  *		Local info about tables that come from the publisher of a
  *		subscription (pg_subscription_rel).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
@@ -23,15 +23,12 @@
  */
 #define SubscriptionRelRelationId			6102
 
-/* Workaround for genbki not knowing about XLogRecPtr */
-#define pg_lsn XLogRecPtr
-
 CATALOG(pg_subscription_rel,6102) BKI_WITHOUT_OIDS
 {
 	Oid			srsubid;		/* Oid of subscription */
 	Oid			srrelid;		/* Oid of relation */
 	char		srsubstate;		/* state of the relation in subscription */
-	pg_lsn		srsublsn;		/* remote lsn of the state change used for
+	XLogRecPtr	srsublsn;		/* remote lsn of the state change used for
 								 * synchronization coordination */
 } FormData_pg_subscription_rel;
 
diff --git a/src/include/catalog/pg_tablespace.h b/src/include/catalog/pg_tablespace.h
index b759d5cea4..3967056649 100644
--- a/src/include/catalog/pg_tablespace.h
+++ b/src/include/catalog/pg_tablespace.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_tablespace.h
diff --git a/src/include/catalog/pg_transform.h b/src/include/catalog/pg_transform.h
index 8b1610bb83..d4fc4649d5 100644
--- a/src/include/catalog/pg_transform.h
+++ b/src/include/catalog/pg_transform.h
@@ -2,7 +2,7 @@
  *
  * pg_transform.h
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * src/include/catalog/pg_transform.h
  *
diff --git a/src/include/catalog/pg_trigger.h b/src/include/catalog/pg_trigger.h
index f413caf34f..c80a3aa54d 100644
--- a/src/include/catalog/pg_trigger.h
+++ b/src/include/catalog/pg_trigger.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_trigger.h
diff --git a/src/include/catalog/pg_ts_config.h b/src/include/catalog/pg_ts_config.h
index 0ba79a596f..51b535ee4f 100644
--- a/src/include/catalog/pg_ts_config.h
+++ b/src/include/catalog/pg_ts_config.h
@@ -4,7 +4,7 @@
  *	definition of configuration of tsearch
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_ts_config.h
diff --git a/src/include/catalog/pg_ts_config_map.h b/src/include/catalog/pg_ts_config_map.h
index 3df05195be..a3d9e3f21f 100644
--- a/src/include/catalog/pg_ts_config_map.h
+++ b/src/include/catalog/pg_ts_config_map.h
@@ -4,7 +4,7 @@
  *	definition of token mappings for configurations of tsearch
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_ts_config_map.h
diff --git a/src/include/catalog/pg_ts_dict.h b/src/include/catalog/pg_ts_dict.h
index 634ea703e3..9d9c06a982 100644
--- a/src/include/catalog/pg_ts_dict.h
+++ b/src/include/catalog/pg_ts_dict.h
@@ -4,7 +4,7 @@
  *	definition of dictionaries for tsearch
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_ts_dict.h
diff --git a/src/include/catalog/pg_ts_parser.h b/src/include/catalog/pg_ts_parser.h
index 96e09bdcd8..96ffd818d7 100644
--- a/src/include/catalog/pg_ts_parser.h
+++ b/src/include/catalog/pg_ts_parser.h
@@ -4,7 +4,7 @@
  *	definition of parsers for tsearch
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_ts_parser.h
diff --git a/src/include/catalog/pg_ts_template.h b/src/include/catalog/pg_ts_template.h
index dc0148c68b..8a7203f0a7 100644
--- a/src/include/catalog/pg_ts_template.h
+++ b/src/include/catalog/pg_ts_template.h
@@ -4,7 +4,7 @@
  *	definition of dictionary templates for tsearch
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_ts_template.h
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
index ffdb452b02..5b5b1218de 100644
--- a/src/include/catalog/pg_type.h
+++ b/src/include/catalog/pg_type.h
@@ -5,7 +5,7 @@
  *	  along with the relation's initial contents.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_type.h
@@ -51,7 +51,7 @@ CATALOG(pg_type,1247) BKI_BOOTSTRAP BKI_ROWTYPE_OID(71) BKI_SCHEMA_MACRO
 
 	/*
 	 * typbyval determines whether internal Postgres routines pass a value of
-	 * this type by value or by reference.  typbyval had better be FALSE if
+	 * this type by value or by reference.  typbyval had better be false if
 	 * the length is not 1, 2, or 4 (or 8 on 8-byte-Datum machines).
 	 * Variable-length types are always passed by reference. Note that
 	 * typbyval can be false even if the length would allow pass-by-value;
diff --git a/src/include/catalog/pg_type_fn.h b/src/include/catalog/pg_type_fn.h
index b570d3588f..0ea0e9029a 100644
--- a/src/include/catalog/pg_type_fn.h
+++ b/src/include/catalog/pg_type_fn.h
@@ -4,7 +4,7 @@
  *	 prototypes for functions in catalog/pg_type.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_type_fn.h
diff --git a/src/include/catalog/pg_user_mapping.h b/src/include/catalog/pg_user_mapping.h
index f08e6a72ed..686562a4d2 100644
--- a/src/include/catalog/pg_user_mapping.h
+++ b/src/include/catalog/pg_user_mapping.h
@@ -3,7 +3,7 @@
  * pg_user_mapping.h
  *	  definition of the system "user mapping" relation (pg_user_mapping)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/pg_user_mapping.h
diff --git a/src/include/catalog/storage.h b/src/include/catalog/storage.h
index a3a97db929..ef52d85803 100644
--- a/src/include/catalog/storage.h
+++ b/src/include/catalog/storage.h
@@ -4,7 +4,7 @@
  *	  prototypes for functions in backend/catalog/storage.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/storage.h
diff --git a/src/include/catalog/storage_xlog.h b/src/include/catalog/storage_xlog.h
index 4c08005228..5738071598 100644
--- a/src/include/catalog/storage_xlog.h
+++ b/src/include/catalog/storage_xlog.h
@@ -4,7 +4,7 @@
  *	  prototypes for XLog support for backend/catalog/storage.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/storage_xlog.h
diff --git a/src/include/catalog/toasting.h b/src/include/catalog/toasting.h
index f82a799572..f6387ae143 100644
--- a/src/include/catalog/toasting.h
+++ b/src/include/catalog/toasting.h
@@ -4,7 +4,7 @@
  *	  This file provides some definitions to support creation of toast tables
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/catalog/toasting.h
diff --git a/src/include/commands/alter.h b/src/include/commands/alter.h
index 4365357ab8..402a4b2d58 100644
--- a/src/include/commands/alter.h
+++ b/src/include/commands/alter.h
@@ -4,7 +4,7 @@
  *	  prototypes for commands/alter.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/alter.h
diff --git a/src/include/commands/async.h b/src/include/commands/async.h
index 939711d8d9..d5868c42a0 100644
--- a/src/include/commands/async.h
+++ b/src/include/commands/async.h
@@ -3,7 +3,7 @@
  * async.h
  *	  Asynchronous notification: NOTIFY, LISTEN, UNLISTEN
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/async.h
diff --git a/src/include/commands/cluster.h b/src/include/commands/cluster.h
index 7bade9fad2..b338cb1098 100644
--- a/src/include/commands/cluster.h
+++ b/src/include/commands/cluster.h
@@ -3,7 +3,7 @@
  * cluster.h
  *	  header file for postgres cluster command stuff
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * src/include/commands/cluster.h
diff --git a/src/include/commands/collationcmds.h b/src/include/commands/collationcmds.h
index 30e847432e..9b0f00a997 100644
--- a/src/include/commands/collationcmds.h
+++ b/src/include/commands/collationcmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for collationcmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/collationcmds.h
diff --git a/src/include/commands/comment.h b/src/include/commands/comment.h
index 85bd801513..411433f862 100644
--- a/src/include/commands/comment.h
+++ b/src/include/commands/comment.h
@@ -7,7 +7,7 @@
  *
  * Prototypes for functions in commands/comment.c
  *
- * Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -34,11 +34,11 @@ extern ObjectAddress CommentObject(CommentStmt *stmt);
 
 extern void DeleteComments(Oid oid, Oid classoid, int32 subid);
 
-extern void CreateComments(Oid oid, Oid classoid, int32 subid, char *comment);
+extern void CreateComments(Oid oid, Oid classoid, int32 subid, const char *comment);
 
 extern void DeleteSharedComments(Oid oid, Oid classoid);
 
-extern void CreateSharedComments(Oid oid, Oid classoid, char *comment);
+extern void CreateSharedComments(Oid oid, Oid classoid, const char *comment);
 
 extern char *GetComment(Oid oid, Oid classoid, int32 subid);
 
diff --git a/src/include/commands/conversioncmds.h b/src/include/commands/conversioncmds.h
index 7054505794..9fd40cb6f0 100644
--- a/src/include/commands/conversioncmds.h
+++ b/src/include/commands/conversioncmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for conversioncmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/conversioncmds.h
diff --git a/src/include/commands/copy.h b/src/include/commands/copy.h
index 8b2971d287..f393e7e73d 100644
--- a/src/include/commands/copy.h
+++ b/src/include/commands/copy.h
@@ -4,7 +4,7 @@
  *	  Definitions for using the POSTGRES copy command.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/copy.h
diff --git a/src/include/commands/createas.h b/src/include/commands/createas.h
index aaf4fac97b..03ba21ded8 100644
--- a/src/include/commands/createas.h
+++ b/src/include/commands/createas.h
@@ -4,7 +4,7 @@
  *	  prototypes for createas.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/createas.h
diff --git a/src/include/commands/dbcommands.h b/src/include/commands/dbcommands.h
index f42c8cdbe3..677c7fc5fc 100644
--- a/src/include/commands/dbcommands.h
+++ b/src/include/commands/dbcommands.h
@@ -4,7 +4,7 @@
  *		Database management commands (create/drop database).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/dbcommands.h
diff --git a/src/include/commands/dbcommands_xlog.h b/src/include/commands/dbcommands_xlog.h
index 63b1a6470c..83048d6c5b 100644
--- a/src/include/commands/dbcommands_xlog.h
+++ b/src/include/commands/dbcommands_xlog.h
@@ -4,7 +4,7 @@
  *		Database resource manager XLOG definitions (create/drop database).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/dbcommands_xlog.h
diff --git a/src/include/commands/defrem.h b/src/include/commands/defrem.h
index f7bb4a54f7..c829abfea7 100644
--- a/src/include/commands/defrem.h
+++ b/src/include/commands/defrem.h
@@ -4,7 +4,7 @@
  *	  POSTGRES define and remove utility definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/defrem.h
@@ -15,6 +15,7 @@
 #define DEFREM_H
 
 #include "catalog/objectaddress.h"
+#include "nodes/params.h"
 #include "nodes/parsenodes.h"
 #include "utils/array.h"
 
@@ -25,12 +26,14 @@ extern void RemoveObjects(DropStmt *stmt);
 extern ObjectAddress DefineIndex(Oid relationId,
 			IndexStmt *stmt,
 			Oid indexRelationId,
+			Oid parentIndexId,
+			Oid parentConstraintId,
 			bool is_alter_table,
 			bool check_rights,
 			bool check_not_in_use,
 			bool skip_build,
 			bool quiet);
-extern Oid	ReindexIndex(RangeVar *indexRelation, int options);
+extern void ReindexIndex(RangeVar *indexRelation, int options);
 extern Oid	ReindexTable(RangeVar *relation, int options);
 extern void ReindexMultipleTables(const char *objectName, ReindexObjectType objectKind,
 					  int options);
@@ -39,12 +42,12 @@ extern char *makeObjectName(const char *name1, const char *name2,
 extern char *ChooseRelationName(const char *name1, const char *name2,
 				   const char *label, Oid namespaceid);
 extern bool CheckIndexCompatible(Oid oldId,
-					 char *accessMethodName,
+					 const char *accessMethodName,
 					 List *attributeList,
 					 List *exclusionOpNames);
 extern Oid	GetDefaultOpClass(Oid type_id, Oid am_id);
 extern Oid ResolveOpClass(List *opclass, Oid attrType,
-			   char *accessMethodName, Oid accessMethodId);
+			   const char *accessMethodName, Oid accessMethodId);
 
 /* commands/functioncmds.c */
 extern ObjectAddress CreateFunction(ParseState *pstate, CreateFunctionStmt *stmt);
@@ -58,13 +61,14 @@ extern ObjectAddress CreateTransform(CreateTransformStmt *stmt);
 extern void DropTransformById(Oid transformOid);
 extern void IsThereFunctionInNamespace(const char *proname, int pronargs,
 						   oidvector *proargtypes, Oid nspOid);
-extern void ExecuteDoStmt(DoStmt *stmt);
+extern void ExecuteDoStmt(DoStmt *stmt, bool atomic);
+extern void ExecuteCallStmt(CallStmt *stmt, ParamListInfo params, bool atomic);
 extern Oid	get_cast_oid(Oid sourcetypeid, Oid targettypeid, bool missing_ok);
 extern Oid	get_transform_oid(Oid type_id, Oid lang_id, bool missing_ok);
 extern void interpret_function_parameter_list(ParseState *pstate,
 								  List *parameters,
 								  Oid languageOid,
-								  bool is_aggregate,
+								  ObjectType objtype,
 								  oidvector **parameterTypes,
 								  ArrayType **allParameterTypes,
 								  ArrayType **parameterModes,
diff --git a/src/include/commands/discard.h b/src/include/commands/discard.h
index 8ea0b30ddf..bbec7ef6ef 100644
--- a/src/include/commands/discard.h
+++ b/src/include/commands/discard.h
@@ -4,7 +4,7 @@
  *	  prototypes for discard.c.
  *
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/commands/discard.h
  *
diff --git a/src/include/commands/event_trigger.h b/src/include/commands/event_trigger.h
index 2ce528272c..0e1959462e 100644
--- a/src/include/commands/event_trigger.h
+++ b/src/include/commands/event_trigger.h
@@ -3,7 +3,7 @@
  * event_trigger.h
  *	  Declarations for command trigger handling.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/event_trigger.h
@@ -50,7 +50,6 @@ extern void AlterEventTriggerOwner_oid(Oid, Oid newOwnerId);
 
 extern bool EventTriggerSupportsObjectType(ObjectType obtype);
 extern bool EventTriggerSupportsObjectClass(ObjectClass objclass);
-extern bool EventTriggerSupportsGrantObjectType(GrantObjectType objtype);
 extern void EventTriggerDDLCommandStart(Node *parsetree);
 extern void EventTriggerDDLCommandEnd(Node *parsetree);
 extern void EventTriggerSQLDrop(Node *parsetree);
diff --git a/src/include/commands/explain.h b/src/include/commands/explain.h
index 78822b766a..0c3986ae17 100644
--- a/src/include/commands/explain.h
+++ b/src/include/commands/explain.h
@@ -3,7 +3,7 @@
  * explain.h
  *	  prototypes for explain.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994-5, Regents of the University of California
  *
  * src/include/commands/explain.h
@@ -53,7 +53,8 @@ typedef void (*ExplainOneQuery_hook_type) (Query *query,
 										   IntoClause *into,
 										   ExplainState *es,
 										   const char *queryString,
-										   ParamListInfo params);
+										   ParamListInfo params,
+										   QueryEnvironment *queryEnv);
 extern PGDLLIMPORT ExplainOneQuery_hook_type ExplainOneQuery_hook;
 
 /* Hook for plugins to get control in explain_get_index_name() */
@@ -101,4 +102,9 @@ extern void ExplainPropertyFloat(const char *qlabel, double value, int ndigits,
 extern void ExplainPropertyBool(const char *qlabel, bool value,
 					ExplainState *es);
 
+extern void ExplainOpenGroup(const char *objtype, const char *labelname,
+				 bool labeled, ExplainState *es);
+extern void ExplainCloseGroup(const char *objtype, const char *labelname,
+				  bool labeled, ExplainState *es);
+
 #endif							/* EXPLAIN_H */
diff --git a/src/include/commands/extension.h b/src/include/commands/extension.h
index 73bba3c784..068a3754aa 100644
--- a/src/include/commands/extension.h
+++ b/src/include/commands/extension.h
@@ -4,7 +4,7 @@
  *		Extension management commands (create/drop extension).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/extension.h
@@ -28,7 +28,7 @@
  * them from the extension first.
  */
 extern PGDLLIMPORT bool creating_extension;
-extern Oid	CurrentExtensionObject;
+extern PGDLLIMPORT Oid CurrentExtensionObject;
 
 
 extern ObjectAddress CreateExtension(ParseState *pstate, CreateExtensionStmt *stmt);
diff --git a/src/include/commands/lockcmds.h b/src/include/commands/lockcmds.h
index cdb5c62a52..6420e13e75 100644
--- a/src/include/commands/lockcmds.h
+++ b/src/include/commands/lockcmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for lockcmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/lockcmds.h
diff --git a/src/include/commands/matview.h b/src/include/commands/matview.h
index 3feb137ef4..3b30ad76b2 100644
--- a/src/include/commands/matview.h
+++ b/src/include/commands/matview.h
@@ -4,7 +4,7 @@
  *	  prototypes for matview.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/matview.h
diff --git a/src/include/commands/policy.h b/src/include/commands/policy.h
index d6a920ccef..acf621a8ec 100644
--- a/src/include/commands/policy.h
+++ b/src/include/commands/policy.h
@@ -4,7 +4,7 @@
  *	  prototypes for policy.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/policy.h
diff --git a/src/include/commands/portalcmds.h b/src/include/commands/portalcmds.h
index 488ce60cd6..99dd04594f 100644
--- a/src/include/commands/portalcmds.h
+++ b/src/include/commands/portalcmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for portalcmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/portalcmds.h
diff --git a/src/include/commands/prepare.h b/src/include/commands/prepare.h
index 5ec1200e0a..ffec029df4 100644
--- a/src/include/commands/prepare.h
+++ b/src/include/commands/prepare.h
@@ -4,7 +4,7 @@
  *	  PREPARE, EXECUTE and DEALLOCATE commands, and prepared-stmt storage
  *
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/include/commands/prepare.h
  *
diff --git a/src/include/commands/progress.h b/src/include/commands/progress.h
index 9472ecca63..6a6b467fee 100644
--- a/src/include/commands/progress.h
+++ b/src/include/commands/progress.h
@@ -7,7 +7,7 @@
  *	  constants, you probably also need to update the views based on them
  *	  in system_views.sql.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/progress.h
diff --git a/src/include/commands/publicationcmds.h b/src/include/commands/publicationcmds.h
index a2e0f4a21e..0c0d7795cf 100644
--- a/src/include/commands/publicationcmds.h
+++ b/src/include/commands/publicationcmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for publicationcmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/publicationcmds.h
diff --git a/src/include/commands/schemacmds.h b/src/include/commands/schemacmds.h
index 381e5b8dae..bf00754245 100644
--- a/src/include/commands/schemacmds.h
+++ b/src/include/commands/schemacmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for schemacmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/schemacmds.h
diff --git a/src/include/commands/seclabel.h b/src/include/commands/seclabel.h
index a97c3293b2..85f2cf67aa 100644
--- a/src/include/commands/seclabel.h
+++ b/src/include/commands/seclabel.h
@@ -3,7 +3,7 @@
  *
  * Prototypes for functions in commands/seclabel.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  */
 #ifndef SECLABEL_H
diff --git a/src/include/commands/sequence.h b/src/include/commands/sequence.h
index caab195130..3f58bae31a 100644
--- a/src/include/commands/sequence.h
+++ b/src/include/commands/sequence.h
@@ -3,7 +3,7 @@
  * sequence.h
  *	  prototypes for sequence.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/sequence.h
diff --git a/src/include/commands/subscriptioncmds.h b/src/include/commands/subscriptioncmds.h
index 3d92a682a1..6d70ad71b1 100644
--- a/src/include/commands/subscriptioncmds.h
+++ b/src/include/commands/subscriptioncmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for subscriptioncmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/subscriptioncmds.h
diff --git a/src/include/commands/tablecmds.h b/src/include/commands/tablecmds.h
index abd31b68d4..06e5180a30 100644
--- a/src/include/commands/tablecmds.h
+++ b/src/include/commands/tablecmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for tablecmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/tablecmds.h
@@ -18,6 +18,7 @@
 #include "catalog/dependency.h"
 #include "catalog/objectaddress.h"
 #include "nodes/parsenodes.h"
+#include "catalog/partition.h"
 #include "storage/lock.h"
 #include "utils/relcache.h"
 
@@ -87,4 +88,7 @@ extern void RangeVarCallbackOwnsTable(const RangeVar *relation,
 
 extern void RangeVarCallbackOwnsRelation(const RangeVar *relation,
 							 Oid relId, Oid oldRelId, void *noCatalogs);
+extern bool PartConstraintImpliedByRelConstraint(Relation scanrel,
+									 List *partConstraint);
+
 #endif							/* TABLECMDS_H */
diff --git a/src/include/commands/tablespace.h b/src/include/commands/tablespace.h
index ba8de32c7b..d52b73d57a 100644
--- a/src/include/commands/tablespace.h
+++ b/src/include/commands/tablespace.h
@@ -4,7 +4,7 @@
  *		Tablespace management commands (create/drop tablespace).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/tablespace.h
diff --git a/src/include/commands/trigger.h b/src/include/commands/trigger.h
index aeb363f13e..ff5546cf28 100644
--- a/src/include/commands/trigger.h
+++ b/src/include/commands/trigger.h
@@ -3,7 +3,7 @@
  * trigger.h
  *	  Declarations for trigger handling.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/trigger.h
@@ -43,13 +43,21 @@ typedef struct TriggerData
 
 /*
  * The state for capturing old and new tuples into transition tables for a
- * single ModifyTable node.
+ * single ModifyTable node (or other operation source, e.g. copy.c).
+ *
+ * This is per-caller to avoid conflicts in setting tcs_map or
+ * tcs_original_insert_tuple.  Note, however, that the pointed-to
+ * private data may be shared across multiple callers.
  */
+struct AfterTriggersTableData;	/* private in trigger.c */
+
 typedef struct TransitionCaptureState
 {
 	/*
 	 * Is there at least one trigger specifying each transition relation on
 	 * the relation explicitly named in the DML statement or COPY command?
+	 * Note: in current usage, these flags could be part of the private state,
+	 * but it seems possibly useful to let callers see them.
 	 */
 	bool		tcs_delete_old_table;
 	bool		tcs_update_old_table;
@@ -60,7 +68,7 @@ typedef struct TransitionCaptureState
 	 * For UPDATE and DELETE, AfterTriggerSaveEvent may need to convert the
 	 * new and old tuples from a child table's format to the format of the
 	 * relation named in a query so that it is compatible with the transition
-	 * tuplestores.
+	 * tuplestores.  The caller must store the conversion map here if so.
 	 */
 	TupleConversionMap *tcs_map;
 
@@ -74,17 +82,9 @@ typedef struct TransitionCaptureState
 	HeapTuple	tcs_original_insert_tuple;
 
 	/*
-	 * The tuplestores backing the transition tables.  We use separate
-	 * tuplestores for INSERT and UPDATE, because INSERT ... ON CONFLICT ...
-	 * DO UPDATE causes INSERT and UPDATE triggers to fire and needs a way to
-	 * keep track of the new tuple images resulting from the two cases
-	 * separately.  We only need a single old image tuplestore, because there
-	 * is no statement that can both update and delete at the same time.
+	 * Private data including the tuplestore(s) into which to insert tuples.
 	 */
-	Tuplestorestate *tcs_old_tuplestore;	/* for DELETE and UPDATE old
-											 * images */
-	Tuplestorestate *tcs_insert_tuplestore; /* for INSERT new images */
-	Tuplestorestate *tcs_update_tuplestore; /* for UPDATE new images */
+	struct AfterTriggersTableData *tcs_private;
 } TransitionCaptureState;
 
 /*
@@ -174,8 +174,9 @@ extern void RelationBuildTriggers(Relation relation);
 extern TriggerDesc *CopyTriggerDesc(TriggerDesc *trigdesc);
 
 extern const char *FindTriggerIncompatibleWithInheritance(TriggerDesc *trigdesc);
-extern TransitionCaptureState *MakeTransitionCaptureState(TriggerDesc *trigdesc);
-extern void DestroyTransitionCaptureState(TransitionCaptureState *tcs);
+
+extern TransitionCaptureState *MakeTransitionCaptureState(TriggerDesc *trigdesc,
+						   Oid relid, CmdType cmdType);
 
 extern void FreeTriggerDesc(TriggerDesc *trigdesc);
 
diff --git a/src/include/commands/typecmds.h b/src/include/commands/typecmds.h
index 34f6fe328f..a04f3405de 100644
--- a/src/include/commands/typecmds.h
+++ b/src/include/commands/typecmds.h
@@ -4,7 +4,7 @@
  *	  prototypes for typecmds.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/typecmds.h
@@ -26,7 +26,7 @@ extern void RemoveTypeById(Oid typeOid);
 extern ObjectAddress DefineDomain(CreateDomainStmt *stmt);
 extern ObjectAddress DefineEnum(CreateEnumStmt *stmt);
 extern ObjectAddress DefineRange(CreateRangeStmt *stmt);
-extern ObjectAddress AlterEnum(AlterEnumStmt *stmt);
+extern ObjectAddress AlterEnum(AlterEnumStmt *stmt, bool isTopLevel);
 extern ObjectAddress DefineCompositeType(RangeVar *typevar, List *coldeflist);
 extern Oid	AssignTypeArrayOid(void);
 
@@ -34,7 +34,7 @@ extern ObjectAddress AlterDomainDefault(List *names, Node *defaultRaw);
 extern ObjectAddress AlterDomainNotNull(List *names, bool notNull);
 extern ObjectAddress AlterDomainAddConstraint(List *names, Node *constr,
 						 ObjectAddress *constrAddr);
-extern ObjectAddress AlterDomainValidateConstraint(List *names, char *constrName);
+extern ObjectAddress AlterDomainValidateConstraint(List *names, const char *constrName);
 extern ObjectAddress AlterDomainDropConstraint(List *names, const char *constrName,
 						  DropBehavior behavior, bool missing_ok);
 
diff --git a/src/include/commands/vacuum.h b/src/include/commands/vacuum.h
index a9035112e9..797b6dfec8 100644
--- a/src/include/commands/vacuum.h
+++ b/src/include/commands/vacuum.h
@@ -4,7 +4,7 @@
  *	  header file for postgres vacuum cleaner and statistics analyzer
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/vacuum.h
@@ -29,8 +29,8 @@
  * so they live until the end of the ANALYZE operation.
  *
  * The type-specific typanalyze function is passed a pointer to this struct
- * and must return TRUE to continue analysis, FALSE to skip analysis of this
- * column.  In the TRUE case it must set the compute_stats and minrows fields,
+ * and must return true to continue analysis, false to skip analysis of this
+ * column.  In the true case it must set the compute_stats and minrows fields,
  * and can optionally set extra_data to pass additional info to compute_stats.
  * minrows is its request for the minimum number of sample rows to be gathered
  * (but note this request might not be honored, eg if there are fewer rows
@@ -45,7 +45,7 @@
  * The fetchfunc may be called with rownum running from 0 to samplerows-1.
  * It returns a Datum and an isNull flag.
  *
- * compute_stats should set stats_valid TRUE if it is able to compute
+ * compute_stats should set stats_valid true if it is able to compute
  * any useful statistics.  If it does, the remainder of the struct holds
  * the information to be stored in a pg_statistic row for the column.  Be
  * careful to allocate any pointed-to data in anl_context, which will NOT
@@ -86,7 +86,7 @@ typedef struct VacAttrStats
 
 	/*
 	 * These fields must be filled in by the typanalyze routine, unless it
-	 * returns FALSE.
+	 * returns false.
 	 */
 	AnalyzeAttrComputeStatsFunc compute_stats;	/* function pointer */
 	int			minrows;		/* Minimum # of rows wanted for stats */
@@ -157,8 +157,7 @@ extern int	vacuum_multixact_freeze_table_age;
 
 /* in commands/vacuum.c */
 extern void ExecVacuum(VacuumStmt *vacstmt, bool isTopLevel);
-extern void vacuum(int options, RangeVar *relation, Oid relid,
-	   VacuumParams *params, List *va_cols,
+extern void vacuum(int options, List *relations, VacuumParams *params,
 	   BufferAccessStrategy bstrategy, bool isTopLevel);
 extern void vac_open_indexes(Relation relation, LOCKMODE lockmode,
 				 int *nindexes, Relation **Irel);
diff --git a/src/include/commands/variable.h b/src/include/commands/variable.h
index 575339a6d8..4ea3b0209b 100644
--- a/src/include/commands/variable.h
+++ b/src/include/commands/variable.h
@@ -2,7 +2,7 @@
  * variable.h
  *		Routines for handling specialized SET variables.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/variable.h
diff --git a/src/include/commands/view.h b/src/include/commands/view.h
index cf08ce2ac7..4703922ff6 100644
--- a/src/include/commands/view.h
+++ b/src/include/commands/view.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/commands/view.h
@@ -17,7 +17,7 @@
 #include "catalog/objectaddress.h"
 #include "nodes/parsenodes.h"
 
-extern void validateWithCheckOption(char *value);
+extern void validateWithCheckOption(const char *value);
 
 extern ObjectAddress DefineView(ViewStmt *stmt, const char *queryString,
 		   int stmt_location, int stmt_len);
diff --git a/src/include/common/base64.h b/src/include/common/base64.h
index 7fe19bb432..32cec4b210 100644
--- a/src/include/common/base64.h
+++ b/src/include/common/base64.h
@@ -3,7 +3,7 @@
  *	  Encoding and decoding routines for base64 without whitespace
  *	  support.
  *
- * Portions Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * src/include/common/base64.h
  */
diff --git a/src/include/common/config_info.h b/src/include/common/config_info.h
index f775327861..72014a915a 100644
--- a/src/include/common/config_info.h
+++ b/src/include/common/config_info.h
@@ -2,7 +2,7 @@
  * config_info.h
  *		Common code for pg_config output
  *
- *	Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  *	src/include/common/config_info.h
  */
diff --git a/src/include/common/controldata_utils.h b/src/include/common/controldata_utils.h
index e97abe6a51..d8fd316396 100644
--- a/src/include/common/controldata_utils.h
+++ b/src/include/common/controldata_utils.h
@@ -2,7 +2,7 @@
  * controldata_utils.h
  *		Common code for pg_controldata output
  *
- *	Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/include/common/controldata_utils.h
diff --git a/src/include/common/fe_memutils.h b/src/include/common/fe_memutils.h
index 6708670b96..458743dd40 100644
--- a/src/include/common/fe_memutils.h
+++ b/src/include/common/fe_memutils.h
@@ -2,7 +2,7 @@
  *	fe_memutils.h
  *		memory management support for frontend code
  *
- *	Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  *	src/include/common/fe_memutils.h
  */
diff --git a/src/include/common/file_utils.h b/src/include/common/file_utils.h
index 52af7f0baa..71f638562e 100644
--- a/src/include/common/file_utils.h
+++ b/src/include/common/file_utils.h
@@ -5,7 +5,7 @@
  * Assorted utility functions to work on files.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/file_utils.h
diff --git a/src/include/common/int.h b/src/include/common/int.h
new file mode 100644
index 0000000000..82e38d4b7b
--- /dev/null
+++ b/src/include/common/int.h
@@ -0,0 +1,273 @@
+/*-------------------------------------------------------------------------
+ *
+ * int.h
+ *	  Routines to perform integer math, while checking for overflows.
+ *
+ * The routines in this file are intended to be well defined C, without
+ * relying on compiler flags like -fwrapv.
+ *
+ * To reduce the overhead of these routines try to use compiler intrinsics
+ * where available. That's not that important for the 16, 32 bit cases, but
+ * the 64 bit cases can be considerably faster with intrinsics. In case no
+ * intrinsics are available 128 bit math is used where available.
+ *
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
+ *
+ * src/include/common/int.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef COMMON_INT_H
+#define COMMON_INT_H
+
+/*
+ * If a + b overflows, return true, otherwise store the result of a + b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_add_s16_overflow(int16 a, int16 b, int16 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_add_overflow(a, b, result);
+#else
+	int32		res = (int32) a + (int32) b;
+
+	if (res > PG_INT16_MAX || res < PG_INT16_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int16) res;
+	return false;
+#endif
+}
+
+/*
+ * If a - b overflows, return true, otherwise store the result of a - b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_sub_s16_overflow(int16 a, int16 b, int16 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_sub_overflow(a, b, result);
+#else
+	int32		res = (int32) a - (int32) b;
+
+	if (res > PG_INT16_MAX || res < PG_INT16_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int16) res;
+	return false;
+#endif
+}
+
+/*
+ * If a * b overflows, return true, otherwise store the result of a * b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_mul_s16_overflow(int16 a, int16 b, int16 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_mul_overflow(a, b, result);
+#else
+	int32		res = (int32) a * (int32) b;
+
+	if (res > PG_INT16_MAX || res < PG_INT16_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int16) res;
+	return false;
+#endif
+}
+
+/*
+ * If a + b overflows, return true, otherwise store the result of a + b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_add_s32_overflow(int32 a, int32 b, int32 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_add_overflow(a, b, result);
+#else
+	int64		res = (int64) a + (int64) b;
+
+	if (res > PG_INT32_MAX || res < PG_INT32_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int32) res;
+	return false;
+#endif
+}
+
+/*
+ * If a - b overflows, return true, otherwise store the result of a - b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_sub_s32_overflow(int32 a, int32 b, int32 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_sub_overflow(a, b, result);
+#else
+	int64		res = (int64) a - (int64) b;
+
+	if (res > PG_INT32_MAX || res < PG_INT32_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int32) res;
+	return false;
+#endif
+}
+
+/*
+ * If a * b overflows, return true, otherwise store the result of a * b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_mul_s32_overflow(int32 a, int32 b, int32 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_mul_overflow(a, b, result);
+#else
+	int64		res = (int64) a * (int64) b;
+
+	if (res > PG_INT32_MAX || res < PG_INT32_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int32) res;
+	return false;
+#endif
+}
+
+/*
+ * If a + b overflows, return true, otherwise store the result of a + b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_add_s64_overflow(int64 a, int64 b, int64 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_add_overflow(a, b, result);
+#elif defined(HAVE_INT128)
+	int128		res = (int128) a + (int128) b;
+
+	if (res > PG_INT64_MAX || res < PG_INT64_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int64) res;
+	return false;
+#else
+	if ((a > 0 && b > 0 && a > PG_INT64_MAX - b) ||
+		(a < 0 && b < 0 && a < PG_INT64_MIN - b))
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = a + b;
+	return false;
+#endif
+}
+
+/*
+ * If a - b overflows, return true, otherwise store the result of a - b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_sub_s64_overflow(int64 a, int64 b, int64 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_sub_overflow(a, b, result);
+#elif defined(HAVE_INT128)
+	int128		res = (int128) a - (int128) b;
+
+	if (res > PG_INT64_MAX || res < PG_INT64_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int64) res;
+	return false;
+#else
+	if ((a < 0 && b > 0 && a < PG_INT64_MIN + b) ||
+		(a > 0 && b < 0 && a > PG_INT64_MAX + b))
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = a - b;
+	return false;
+#endif
+}
+
+/*
+ * If a * b overflows, return true, otherwise store the result of a * b into
+ * *result. The content of *result is implementation defined in case of
+ * overflow.
+ */
+static inline bool
+pg_mul_s64_overflow(int64 a, int64 b, int64 *result)
+{
+#if defined(HAVE__BUILTIN_OP_OVERFLOW)
+	return __builtin_mul_overflow(a, b, result);
+#elif defined(HAVE_INT128)
+	int128		res = (int128) a * (int128) b;
+
+	if (res > PG_INT64_MAX || res < PG_INT64_MIN)
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = (int64) res;
+	return false;
+#else
+	/*
+	 * Overflow can only happen if at least one value is outside the range
+	 * sqrt(min)..sqrt(max) so check that first as the division can be quite a
+	 * bit more expensive than the multiplication.
+	 *
+	 * Multiplying by 0 or 1 can't overflow of course and checking for 0
+	 * separately avoids any risk of dividing by 0.  Be careful about dividing
+	 * INT_MIN by -1 also, note reversing the a and b to ensure we're always
+	 * dividing it by a positive value.
+	 *
+	 */
+	if ((a > PG_INT32_MAX || a < PG_INT32_MIN ||
+		 b > PG_INT32_MAX || b < PG_INT32_MIN) &&
+		a != 0 && a != 1 && b != 0 && b != 1 &&
+		((a > 0 && b > 0 && a > PG_INT64_MAX / b) ||
+		 (a > 0 && b < 0 && b < PG_INT64_MIN / a) ||
+		 (a < 0 && b > 0 && a < PG_INT64_MIN / b) ||
+		 (a < 0 && b < 0 && a < PG_INT64_MAX / b)))
+	{
+		*result = 0x5EED; /* to avoid spurious warnings */
+		return true;
+	}
+	*result = a * b;
+	return false;
+#endif
+}
+
+#endif							/* COMMON_INT_H */
diff --git a/src/include/common/int128.h b/src/include/common/int128.h
index af2c93da46..2654f18f85 100644
--- a/src/include/common/int128.h
+++ b/src/include/common/int128.h
@@ -8,7 +8,7 @@
  *
  * See src/tools/testint128.c for a simple test harness for this file.
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * src/include/common/int128.h
  *
diff --git a/src/include/common/ip.h b/src/include/common/ip.h
index f530139876..33147891d1 100644
--- a/src/include/common/ip.h
+++ b/src/include/common/ip.h
@@ -5,7 +5,7 @@
  *
  * These definitions are used by both frontend and backend code.
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/common/ip.h
  *
diff --git a/src/include/common/keywords.h b/src/include/common/keywords.h
index 60522715a8..0b31505b66 100644
--- a/src/include/common/keywords.h
+++ b/src/include/common/keywords.h
@@ -4,7 +4,7 @@
  *	  lexical token lookup for key words in PostgreSQL
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/keywords.h
diff --git a/src/include/common/md5.h b/src/include/common/md5.h
index ccaaeddbf4..905d3aa219 100644
--- a/src/include/common/md5.h
+++ b/src/include/common/md5.h
@@ -6,7 +6,7 @@
  * These definitions are needed by both frontend and backend code to work
  * with MD5-encrypted passwords.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/md5.h
diff --git a/src/include/common/relpath.h b/src/include/common/relpath.h
index ec5ef99451..9137dc9ed3 100644
--- a/src/include/common/relpath.h
+++ b/src/include/common/relpath.h
@@ -3,7 +3,7 @@
  * relpath.h
  *		Declarations for GetRelationPath() and friends
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/relpath.h
diff --git a/src/include/common/restricted_token.h b/src/include/common/restricted_token.h
index 51be5a760c..a4a263fdee 100644
--- a/src/include/common/restricted_token.h
+++ b/src/include/common/restricted_token.h
@@ -2,7 +2,7 @@
  *	restricted_token.h
  *		helper routine to ensure restricted token on Windows
  *
- *	Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/include/common/restricted_token.h
diff --git a/src/include/common/saslprep.h b/src/include/common/saslprep.h
index c7b620cf19..dc1af15030 100644
--- a/src/include/common/saslprep.h
+++ b/src/include/common/saslprep.h
@@ -5,7 +5,7 @@
  *
  * These definitions are used by both frontend and backend code.
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * src/include/common/saslprep.h
  *
diff --git a/src/include/common/scram-common.h b/src/include/common/scram-common.h
index ebb733df4b..17373cce3a 100644
--- a/src/include/common/scram-common.h
+++ b/src/include/common/scram-common.h
@@ -3,7 +3,7 @@
  * scram-common.h
  *		Declarations for helper functions used for SCRAM authentication
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/scram-common.h
@@ -15,6 +15,14 @@
 
 #include "common/sha2.h"
 
+/* Name of SCRAM mechanisms per IANA */
+#define SCRAM_SHA_256_NAME "SCRAM-SHA-256"
+#define SCRAM_SHA_256_PLUS_NAME "SCRAM-SHA-256-PLUS" /* with channel binding */
+
+/* Channel binding types */
+#define SCRAM_CHANNEL_BINDING_TLS_UNIQUE    "tls-unique"
+#define SCRAM_CHANNEL_BINDING_TLS_END_POINT	"tls-server-end-point"
+
 /* Length of SCRAM keys (client and server) */
 #define SCRAM_KEY_LEN				PG_SHA256_DIGEST_LENGTH
 
@@ -28,10 +36,17 @@
  */
 #define SCRAM_RAW_NONCE_LEN			18
 
-/* length of salt when generating new verifiers */
-#define SCRAM_DEFAULT_SALT_LEN		12
+/*
+ * Length of salt when generating new verifiers, in bytes.  (It will be stored
+ * and sent over the wire encoded in Base64.)  16 bytes is what the example in
+ * RFC 7677 uses.
+ */
+#define SCRAM_DEFAULT_SALT_LEN		16
 
-/* default number of iterations when generating verifier */
+/*
+ * Default number of iterations when generating verifier.  Should be at least
+ * 4096 per RFC 7677.
+ */
 #define SCRAM_DEFAULT_ITERATIONS	4096
 
 /*
diff --git a/src/include/common/sha2.h b/src/include/common/sha2.h
index a31b3979d8..f3fd0d0d28 100644
--- a/src/include/common/sha2.h
+++ b/src/include/common/sha2.h
@@ -3,7 +3,7 @@
  * sha2.h
  *	  Generic headers for SHA224, 256, 384 AND 512 functions of PostgreSQL.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		  src/include/common/sha2.h
diff --git a/src/include/common/string.h b/src/include/common/string.h
index 5f3ea71d61..06934b9914 100644
--- a/src/include/common/string.h
+++ b/src/include/common/string.h
@@ -2,7 +2,7 @@
  *	string.h
  *		string handling helpers
  *
- *	Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ *	Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *	Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/include/common/string.h
diff --git a/src/include/common/unicode_norm.h b/src/include/common/unicode_norm.h
index 8741209751..34ca2622ec 100644
--- a/src/include/common/unicode_norm.h
+++ b/src/include/common/unicode_norm.h
@@ -5,7 +5,7 @@
  *
  * These definitions are used by both frontend and backend code.
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * src/include/common/unicode_norm.h
  *
diff --git a/src/include/common/unicode_norm_table.h b/src/include/common/unicode_norm_table.h
index da08e487e3..3444bc8d80 100644
--- a/src/include/common/unicode_norm_table.h
+++ b/src/include/common/unicode_norm_table.h
@@ -3,7 +3,7 @@
  * unicode_norm_table.h
  *	  Composition table used for Unicode normalization
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/common/unicode_norm_table.h
diff --git a/src/include/common/username.h b/src/include/common/username.h
index 735572d382..1bb3496f9e 100644
--- a/src/include/common/username.h
+++ b/src/include/common/username.h
@@ -2,7 +2,7 @@
  *	username.h
  *		lookup effective username
  *
- *	Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  *	src/include/common/username.h
  */
diff --git a/src/include/datatype/timestamp.h b/src/include/datatype/timestamp.h
index 6f48d1c71b..f5b6026ef5 100644
--- a/src/include/datatype/timestamp.h
+++ b/src/include/datatype/timestamp.h
@@ -5,7 +5,7 @@
  *
  * Note: this file must be includable in both frontend and backend contexts.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/datatype/timestamp.h
diff --git a/src/include/executor/execExpr.h b/src/include/executor/execExpr.h
index 8ee0496e01..0cab431f65 100644
--- a/src/include/executor/execExpr.h
+++ b/src/include/executor/execExpr.h
@@ -4,7 +4,7 @@
  *	  Low level infrastructure related to expression evaluation
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/execExpr.h
@@ -14,9 +14,11 @@
 #ifndef EXEC_EXPR_H
 #define EXEC_EXPR_H
 
+#include "executor/nodeAgg.h"
 #include "nodes/execnodes.h"
 
-/* forward reference to avoid circularity */
+/* forward references to avoid circularity */
+struct ExprEvalStep;
 struct ArrayRefState;
 
 /* Bits in ExprState->flags (see also execnodes.h for public flag bits): */
@@ -25,6 +27,11 @@ struct ArrayRefState;
 /* jump-threading is in use */
 #define EEO_FLAG_DIRECT_THREADED			(1 << 2)
 
+/* Typical API for out-of-line evaluation subroutines */
+typedef void (*ExecEvalSubroutine) (ExprState *state,
+									struct ExprEvalStep *op,
+									ExprContext *econtext);
+
 /*
  * Discriminator for ExprEvalSteps.
  *
@@ -45,12 +52,8 @@ typedef enum ExprEvalOp
 	EEOP_SCAN_FETCHSOME,
 
 	/* compute non-system Var value */
-	/* "FIRST" variants are used only the first time through */
-	EEOP_INNER_VAR_FIRST,
 	EEOP_INNER_VAR,
-	EEOP_OUTER_VAR_FIRST,
 	EEOP_OUTER_VAR,
-	EEOP_SCAN_VAR_FIRST,
 	EEOP_SCAN_VAR,
 
 	/* compute system Var value */
@@ -61,8 +64,11 @@ typedef enum ExprEvalOp
 	/* compute wholerow Var */
 	EEOP_WHOLEROW,
 
-	/* compute non-system Var value, assign it into ExprState's resultslot */
-	/* (these are not used if _FIRST checks would be needed) */
+	/*
+	 * Compute non-system Var value, assign it into ExprState's resultslot.
+	 * These are not used if a CheckVarSlotCompatibility() check would be
+	 * needed.
+	 */
 	EEOP_ASSIGN_INNER_VAR,
 	EEOP_ASSIGN_OUTER_VAR,
 	EEOP_ASSIGN_SCAN_VAR,
@@ -131,6 +137,7 @@ typedef enum ExprEvalOp
 	/* evaluate PARAM_EXEC/EXTERN parameters */
 	EEOP_PARAM_EXEC,
 	EEOP_PARAM_EXTERN,
+	EEOP_PARAM_CALLBACK,
 
 	/* return CaseTestExpr value */
 	EEOP_CASE_TESTVAL,
@@ -141,6 +148,7 @@ typedef enum ExprEvalOp
 	/* evaluate assorted special-purpose expression types */
 	EEOP_IOCOERCE,
 	EEOP_DISTINCT,
+	EEOP_NOT_DISTINCT,
 	EEOP_NULLIF,
 	EEOP_SQLVALUEFUNCTION,
 	EEOP_CURRENTOFEXPR,
@@ -212,6 +220,17 @@ typedef enum ExprEvalOp
 	EEOP_SUBPLAN,
 	EEOP_ALTERNATIVE_SUBPLAN,
 
+	/* aggregation related nodes */
+	EEOP_AGG_STRICT_DESERIALIZE,
+	EEOP_AGG_DESERIALIZE,
+	EEOP_AGG_STRICT_INPUT_CHECK,
+	EEOP_AGG_INIT_TRANS,
+	EEOP_AGG_STRICT_TRANS_CHECK,
+	EEOP_AGG_PLAIN_TRANS_BYVAL,
+	EEOP_AGG_PLAIN_TRANS,
+	EEOP_AGG_ORDERED_TRANS_DATUM,
+	EEOP_AGG_ORDERED_TRANS_TUPLE,
+
 	/* non-existent operation, used e.g. to check array lengths */
 	EEOP_LAST
 } ExprEvalOp;
@@ -331,6 +350,15 @@ typedef struct ExprEvalStep
 			Oid			paramtype;	/* OID of parameter's datatype */
 		}			param;
 
+		/* for EEOP_PARAM_CALLBACK */
+		struct
+		{
+			ExecEvalSubroutine paramfunc;	/* add-on evaluation subroutine */
+			void	   *paramarg;	/* private data for same */
+			int			paramid;	/* numeric ID for parameter */
+			Oid			paramtype;	/* OID of parameter's datatype */
+		}			cparam;
+
 		/* for EEOP_CASE_TESTVAL/DOMAIN_TESTVAL */
 		struct
 		{
@@ -385,10 +413,8 @@ typedef struct ExprEvalStep
 		/* for EEOP_ARRAYCOERCE */
 		struct
 		{
-			ArrayCoerceExpr *coerceexpr;
+			ExprState  *elemexprstate;	/* null if no per-element work */
 			Oid			resultelemtype; /* element type of result array */
-			FmgrInfo   *elemfunc;	/* lookup info for element coercion
-									 * function */
 			struct ArrayMapState *amstate;	/* workspace for array_map */
 		}			arraycoerce;
 
@@ -560,6 +586,55 @@ typedef struct ExprEvalStep
 			/* out-of-line state, created by nodeSubplan.c */
 			AlternativeSubPlanState *asstate;
 		}			alternative_subplan;
+
+		/* for EEOP_AGG_*DESERIALIZE */
+		struct
+		{
+			AggState   *aggstate;
+			FunctionCallInfo fcinfo_data;
+			int			jumpnull;
+		}			agg_deserialize;
+
+		/* for EEOP_AGG_STRICT_INPUT_CHECK */
+		struct
+		{
+			bool	   *nulls;
+			int			nargs;
+			int			jumpnull;
+		}			agg_strict_input_check;
+
+		/* for EEOP_AGG_INIT_TRANS */
+		struct
+		{
+			AggState   *aggstate;
+			AggStatePerTrans pertrans;
+			ExprContext *aggcontext;
+			int			setno;
+			int			transno;
+			int			setoff;
+			int			jumpnull;
+		}			agg_init_trans;
+
+		/* for EEOP_AGG_STRICT_TRANS_CHECK */
+		struct
+		{
+			AggState   *aggstate;
+			int			setno;
+			int			transno;
+			int			setoff;
+			int			jumpnull;
+		}			agg_strict_trans_check;
+
+		/* for EEOP_AGG_{PLAIN,ORDERED}_TRANS* */
+		struct
+		{
+			AggState   *aggstate;
+			AggStatePerTrans pertrans;
+			ExprContext *aggcontext;
+			int			setno;
+			int			transno;
+			int			setoff;
+		}			agg_trans;
 	}			d;
 } ExprEvalStep;
 
@@ -600,10 +675,16 @@ typedef struct ArrayRefState
 } ArrayRefState;
 
 
-extern void ExecReadyInterpretedExpr(ExprState *state);
+/* functions in execExpr.c */
+extern void ExprEvalPushStep(ExprState *es, const ExprEvalStep *s);
 
+/* functions in execExprInterp.c */
+extern void ExecReadyInterpretedExpr(ExprState *state);
 extern ExprEvalOp ExecEvalStepOp(ExprState *state, ExprEvalStep *op);
 
+extern Datum ExecInterpExprStillValid(ExprState *state, ExprContext *econtext, bool *isNull);
+extern void CheckExprStillValid(ExprState *state, ExprContext *econtext);
+
 /*
  * Non fast-path execution functions. These are externs instead of statics in
  * execExprInterp.c, because that allows them to be used by other methods of
@@ -611,6 +692,7 @@ extern ExprEvalOp ExecEvalStepOp(ExprState *state, ExprEvalStep *op);
  */
 extern void ExecEvalParamExec(ExprState *state, ExprEvalStep *op,
 				  ExprContext *econtext);
+extern void ExecEvalParamExecParams(Bitmapset *params, EState *estate);
 extern void ExecEvalParamExtern(ExprState *state, ExprEvalStep *op,
 					ExprContext *econtext);
 extern void ExecEvalSQLValueFunction(ExprState *state, ExprEvalStep *op);
@@ -621,7 +703,8 @@ extern void ExecEvalRowNull(ExprState *state, ExprEvalStep *op,
 extern void ExecEvalRowNotNull(ExprState *state, ExprEvalStep *op,
 				   ExprContext *econtext);
 extern void ExecEvalArrayExpr(ExprState *state, ExprEvalStep *op);
-extern void ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op);
+extern void ExecEvalArrayCoerce(ExprState *state, ExprEvalStep *op,
+					ExprContext *econtext);
 extern void ExecEvalRow(ExprState *state, ExprEvalStep *op);
 extern void ExecEvalMinMax(ExprState *state, ExprEvalStep *op);
 extern void ExecEvalFieldSelect(ExprState *state, ExprEvalStep *op,
@@ -648,4 +731,13 @@ extern void ExecEvalAlternativeSubPlan(ExprState *state, ExprEvalStep *op,
 extern void ExecEvalWholeRowVar(ExprState *state, ExprEvalStep *op,
 					ExprContext *econtext);
 
+extern void ExecAggInitGroup(AggState *aggstate, AggStatePerTrans pertrans, AggStatePerGroup pergroup);
+extern Datum ExecAggTransReparent(AggState *aggstate, AggStatePerTrans pertrans,
+					 Datum newValue, bool newValueIsNull,
+					 Datum oldValue, bool oldValueIsNull);
+extern void ExecEvalAggOrderedTransDatum(ExprState *state, ExprEvalStep *op,
+							 ExprContext *econtext);
+extern void ExecEvalAggOrderedTransTuple(ExprState *state, ExprEvalStep *op,
+							 ExprContext *econtext);
+
 #endif							/* EXEC_EXPR_H */
diff --git a/src/include/executor/execParallel.h b/src/include/executor/execParallel.h
index bd0a87fa04..626a66c27a 100644
--- a/src/include/executor/execParallel.h
+++ b/src/include/executor/execParallel.h
@@ -2,7 +2,7 @@
  * execParallel.h
  *		POSTGRES parallel execution interface
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -23,20 +23,26 @@ typedef struct SharedExecutorInstrumentation SharedExecutorInstrumentation;
 
 typedef struct ParallelExecutorInfo
 {
-	PlanState  *planstate;
-	ParallelContext *pcxt;
-	BufferUsage *buffer_usage;
-	SharedExecutorInstrumentation *instrumentation;
-	shm_mq_handle **tqueue;
-	dsa_area   *area;
-	bool		finished;
+	PlanState  *planstate;		/* plan subtree we're running in parallel */
+	ParallelContext *pcxt;		/* parallel context we're using */
+	BufferUsage *buffer_usage;	/* points to bufusage area in DSM */
+	SharedExecutorInstrumentation *instrumentation; /* optional */
+	dsa_area   *area;			/* points to DSA area in DSM */
+	dsa_pointer param_exec;		/* serialized PARAM_EXEC parameters */
+	bool		finished;		/* set true by ExecParallelFinish */
+	/* These two arrays have pcxt->nworkers_launched entries: */
+	shm_mq_handle **tqueue;		/* tuple queues for worker output */
+	struct TupleQueueReader **reader;	/* tuple reader/writer support */
 } ParallelExecutorInfo;
 
 extern ParallelExecutorInfo *ExecInitParallelPlan(PlanState *planstate,
-					 EState *estate, int nworkers);
+					 EState *estate, Bitmapset *sendParam, int nworkers,
+					 int64 tuples_needed);
+extern void ExecParallelCreateReaders(ParallelExecutorInfo *pei);
 extern void ExecParallelFinish(ParallelExecutorInfo *pei);
 extern void ExecParallelCleanup(ParallelExecutorInfo *pei);
-extern void ExecParallelReinitialize(ParallelExecutorInfo *pei);
+extern void ExecParallelReinitialize(PlanState *planstate,
+						 ParallelExecutorInfo *pei, Bitmapset *sendParam);
 
 extern void ParallelQueryMain(dsm_segment *seg, shm_toc *toc);
 
diff --git a/src/include/executor/execPartition.h b/src/include/executor/execPartition.h
new file mode 100644
index 0000000000..03a599ad57
--- /dev/null
+++ b/src/include/executor/execPartition.h
@@ -0,0 +1,130 @@
+/*--------------------------------------------------------------------
+ * execPartition.h
+ *		POSTGRES partitioning executor interface
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *		src/include/executor/execPartition.h
+ *--------------------------------------------------------------------
+ */
+
+#ifndef EXECPARTITION_H
+#define EXECPARTITION_H
+
+#include "catalog/partition.h"
+#include "nodes/execnodes.h"
+#include "nodes/parsenodes.h"
+#include "nodes/plannodes.h"
+
+/*-----------------------
+ * PartitionDispatch - information about one partitioned table in a partition
+ * hierarchy required to route a tuple to one of its partitions
+ *
+ *	reldesc		Relation descriptor of the table
+ *	key			Partition key information of the table
+ *	keystate	Execution state required for expressions in the partition key
+ *	partdesc	Partition descriptor of the table
+ *	tupslot		A standalone TupleTableSlot initialized with this table's tuple
+ *				descriptor
+ *	tupmap		TupleConversionMap to convert from the parent's rowtype to
+ *				this table's rowtype (when extracting the partition key of a
+ *				tuple just before routing it through this table)
+ *	indexes		Array with partdesc->nparts members (for details on what
+ *				individual members represent, see how they are set in
+ *				get_partition_dispatch_recurse())
+ *-----------------------
+ */
+typedef struct PartitionDispatchData
+{
+	Relation	reldesc;
+	PartitionKey key;
+	List	   *keystate;		/* list of ExprState */
+	PartitionDesc partdesc;
+	TupleTableSlot *tupslot;
+	TupleConversionMap *tupmap;
+	int		   *indexes;
+} PartitionDispatchData;
+
+typedef struct PartitionDispatchData *PartitionDispatch;
+
+/*-----------------------
+ * PartitionTupleRouting - Encapsulates all information required to execute
+ * tuple-routing between partitions.
+ *
+ * partition_dispatch_info		Array of PartitionDispatch objects with one
+ *								entry for every partitioned table in the
+ *								partition tree.
+ * num_dispatch					number of partitioned tables in the partition
+ *								tree (= length of partition_dispatch_info[])
+ * partition_oids				Array of leaf partitions OIDs with one entry
+ *								for every leaf partition in the partition tree,
+ *								initialized in full by
+ *								ExecSetupPartitionTupleRouting.
+ * partitions					Array of ResultRelInfo* objects with one entry
+ *								for every leaf partition in the partition tree,
+ *								initialized lazily by ExecInitPartitionInfo.
+ * num_partitions				Number of leaf partitions in the partition tree
+ *								(= 'partitions_oid'/'partitions' array length)
+ * parent_child_tupconv_maps	Array of TupleConversionMap objects with one
+ *								entry for every leaf partition (required to
+ *								convert tuple from the root table's rowtype to
+ *								a leaf partition's rowtype after tuple routing
+ *								is done)
+ * child_parent_tupconv_maps	Array of TupleConversionMap objects with one
+ *								entry for every leaf partition (required to
+ *								convert an updated tuple from the leaf
+ *								partition's rowtype to the root table's rowtype
+ *								so that tuple routing can be done)
+ * child_parent_map_not_required  Array of bool. True value means that a map is
+ *								determined to be not required for the given
+ *								partition. False means either we haven't yet
+ *								checked if a map is required, or it was
+ *								determined to be required.
+ * subplan_partition_offsets	Integer array ordered by UPDATE subplans. Each
+ *								element of this array has the index into the
+ *								corresponding partition in partitions array.
+ * num_subplan_partition_offsets  Length of 'subplan_partition_offsets' array
+ * partition_tuple_slot			TupleTableSlot to be used to manipulate any
+ *								given leaf partition's rowtype after that
+ *								partition is chosen for insertion by
+ *								tuple-routing.
+ *-----------------------
+ */
+typedef struct PartitionTupleRouting
+{
+	PartitionDispatch *partition_dispatch_info;
+	int			num_dispatch;
+	Oid		   *partition_oids;
+	ResultRelInfo **partitions;
+	int			num_partitions;
+	TupleConversionMap **parent_child_tupconv_maps;
+	TupleConversionMap **child_parent_tupconv_maps;
+	bool	   *child_parent_map_not_required;
+	int		   *subplan_partition_offsets;
+	int			num_subplan_partition_offsets;
+	TupleTableSlot *partition_tuple_slot;
+	TupleTableSlot *root_tuple_slot;
+} PartitionTupleRouting;
+
+extern PartitionTupleRouting *ExecSetupPartitionTupleRouting(ModifyTableState *mtstate,
+							   Relation rel);
+extern int ExecFindPartition(ResultRelInfo *resultRelInfo,
+				  PartitionDispatch *pd,
+				  TupleTableSlot *slot,
+				  EState *estate);
+extern ResultRelInfo *ExecInitPartitionInfo(ModifyTableState *mtstate,
+					ResultRelInfo *resultRelInfo,
+					PartitionTupleRouting *proute,
+					EState *estate, int partidx);
+extern void ExecSetupChildParentMapForLeaf(PartitionTupleRouting *proute);
+extern TupleConversionMap *TupConvMapForLeaf(PartitionTupleRouting *proute,
+				  ResultRelInfo *rootRelInfo, int leaf_index);
+extern HeapTuple ConvertPartitionTupleSlot(TupleConversionMap *map,
+						  HeapTuple tuple,
+						  TupleTableSlot *new_slot,
+						  TupleTableSlot **p_my_slot);
+extern void ExecCleanupTupleRouting(PartitionTupleRouting *proute);
+
+#endif							/* EXECPARTITION_H */
diff --git a/src/include/executor/execdebug.h b/src/include/executor/execdebug.h
index cd04b60176..236b2cc4fd 100644
--- a/src/include/executor/execdebug.h
+++ b/src/include/executor/execdebug.h
@@ -7,7 +7,7 @@
  * for debug printouts, because that's more flexible than printf().
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/execdebug.h
diff --git a/src/include/executor/execdesc.h b/src/include/executor/execdesc.h
index 8c09961e28..10e9ded246 100644
--- a/src/include/executor/execdesc.h
+++ b/src/include/executor/execdesc.h
@@ -5,7 +5,7 @@
  *	  and related modules.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/execdesc.h
diff --git a/src/include/executor/executor.h b/src/include/executor/executor.h
index 60326f9d03..45a077a949 100644
--- a/src/include/executor/executor.h
+++ b/src/include/executor/executor.h
@@ -4,7 +4,7 @@
  *	  support for the POSTGRES executor module
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/executor.h
@@ -17,6 +17,7 @@
 #include "catalog/partition.h"
 #include "executor/execdesc.h"
 #include "nodes/parsenodes.h"
+#include "utils/memutils.h"
 
 
 /*
@@ -112,26 +113,19 @@ extern bool execCurrentOf(CurrentOfExpr *cexpr,
 /*
  * prototypes from functions in execGrouping.c
  */
-extern bool execTuplesMatch(TupleTableSlot *slot1,
-				TupleTableSlot *slot2,
-				int numCols,
-				AttrNumber *matchColIdx,
-				FmgrInfo *eqfunctions,
-				MemoryContext evalContext);
-extern bool execTuplesUnequal(TupleTableSlot *slot1,
-				  TupleTableSlot *slot2,
-				  int numCols,
-				  AttrNumber *matchColIdx,
-				  FmgrInfo *eqfunctions,
-				  MemoryContext evalContext);
-extern FmgrInfo *execTuplesMatchPrepare(int numCols,
-					   Oid *eqOperators);
+extern ExprState *execTuplesMatchPrepare(TupleDesc desc,
+					   int numCols,
+					   AttrNumber *keyColIdx,
+					   Oid *eqOperators,
+					   PlanState *parent);
 extern void execTuplesHashPrepare(int numCols,
 					  Oid *eqOperators,
-					  FmgrInfo **eqFunctions,
+					  Oid **eqFuncOids,
 					  FmgrInfo **hashFunctions);
-extern TupleHashTable BuildTupleHashTable(int numCols, AttrNumber *keyColIdx,
-					FmgrInfo *eqfunctions,
+extern TupleHashTable BuildTupleHashTable(PlanState *parent,
+					TupleDesc inputDesc,
+					int numCols, AttrNumber *keyColIdx,
+					Oid *eqfuncoids,
 					FmgrInfo *hashfunctions,
 					long nbuckets, Size additionalsize,
 					MemoryContext tablecxt,
@@ -141,7 +135,7 @@ extern TupleHashEntry LookupTupleHashEntry(TupleHashTable hashtable,
 					 bool *isnew);
 extern TupleHashEntry FindTupleHashEntry(TupleHashTable hashtable,
 				   TupleTableSlot *slot,
-				   FmgrInfo *eqfunctions,
+				   ExprState *eqcomp,
 				   FmgrInfo *hashfunctions);
 
 /*
@@ -177,7 +171,7 @@ extern void ExecutorEnd(QueryDesc *queryDesc);
 extern void standard_ExecutorEnd(QueryDesc *queryDesc);
 extern void ExecutorRewind(QueryDesc *queryDesc);
 extern bool ExecCheckRTPerms(List *rangeTable, bool ereport_on_violation);
-extern void CheckValidResultRel(Relation resultRel, CmdType operation);
+extern void CheckValidResultRel(ResultRelInfo *resultRelInfo, CmdType operation);
 extern void InitResultRelInfo(ResultRelInfo *resultRelInfo,
 				  Relation resultRelationDesc,
 				  Index resultRelationIndex,
@@ -187,7 +181,12 @@ extern ResultRelInfo *ExecGetTriggerResultRel(EState *estate, Oid relid);
 extern void ExecCleanUpTriggerState(EState *estate);
 extern bool ExecContextForcesOids(PlanState *planstate, bool *hasoids);
 extern void ExecConstraints(ResultRelInfo *resultRelInfo,
-				TupleTableSlot *slot, EState *estate);
+				TupleTableSlot *slot, EState *estate,
+				bool check_partition_constraint);
+extern bool ExecPartitionCheck(ResultRelInfo *resultRelInfo,
+				   TupleTableSlot *slot, EState *estate);
+extern void ExecPartitionCheckEmitError(ResultRelInfo *resultRelInfo,
+							TupleTableSlot *slot, EState *estate);
 extern void ExecWithCheckOptions(WCOKind kind, ResultRelInfo *resultRelInfo,
 					 TupleTableSlot *slot, EState *estate);
 extern LockTupleMode ExecUpdateLockMode(EState *estate, ResultRelInfo *relinfo);
@@ -206,17 +205,6 @@ extern void EvalPlanQualSetPlan(EPQState *epqstate,
 extern void EvalPlanQualSetTuple(EPQState *epqstate, Index rti,
 					 HeapTuple tuple);
 extern HeapTuple EvalPlanQualGetTuple(EPQState *epqstate, Index rti);
-extern void ExecSetupPartitionTupleRouting(Relation rel,
-							   Index resultRTindex,
-							   PartitionDispatch **pd,
-							   ResultRelInfo **partitions,
-							   TupleConversionMap ***tup_conv_maps,
-							   TupleTableSlot **partition_tuple_slot,
-							   int *num_parted, int *num_partitions);
-extern int ExecFindPartition(ResultRelInfo *resultRelInfo,
-				  PartitionDispatch *pd,
-				  TupleTableSlot *slot,
-				  EState *estate);
 
 #define EvalPlanQualSetSlot(epqstate, slot)  ((epqstate)->origslot = (slot))
 extern void EvalPlanQualFetchRowMarks(EPQState *epqstate);
@@ -228,9 +216,11 @@ extern void EvalPlanQualEnd(EPQState *epqstate);
  * functions in execProcnode.c
  */
 extern PlanState *ExecInitNode(Plan *node, EState *estate, int eflags);
+extern void ExecSetExecProcNode(PlanState *node, ExecProcNodeMtd function);
 extern Node *MultiExecProcNode(PlanState *node);
 extern void ExecEndNode(PlanState *node);
 extern bool ExecShutdownNode(PlanState *node);
+extern void ExecSetTupleBound(int64 tuples_needed, PlanState *child_node);
 
 
 /* ----------------------------------------------------------------
@@ -254,9 +244,17 @@ ExecProcNode(PlanState *node)
  * prototypes from functions in execExpr.c
  */
 extern ExprState *ExecInitExpr(Expr *node, PlanState *parent);
+extern ExprState *ExecInitExprWithParams(Expr *node, ParamListInfo ext_params);
 extern ExprState *ExecInitQual(List *qual, PlanState *parent);
 extern ExprState *ExecInitCheck(List *qual, PlanState *parent);
 extern List *ExecInitExprList(List *nodes, PlanState *parent);
+extern ExprState *ExecBuildAggTrans(AggState *aggstate, struct AggStatePerPhaseData *phase,
+				  bool doSort, bool doHash);
+extern ExprState *ExecBuildGroupingEqual(TupleDesc ldesc, TupleDesc rdesc,
+					   int numCols,
+					   AttrNumber *keyColIdx,
+					   Oid *eqfunctions,
+					   PlanState *parent);
 extern ProjectionInfo *ExecBuildProjectionInfo(List *targetList,
 						ExprContext *econtext,
 						TupleTableSlot *slot,
@@ -285,7 +283,7 @@ ExecEvalExpr(ExprState *state,
 			 ExprContext *econtext,
 			 bool *isNull)
 {
-	return (*state->evalfunc) (state, econtext, isNull);
+	return state->evalfunc(state, econtext, isNull);
 }
 #endif
 
@@ -304,7 +302,7 @@ ExecEvalExprSwitchContext(ExprState *state,
 	MemoryContext oldContext;
 
 	oldContext = MemoryContextSwitchTo(econtext->ecxt_per_tuple_memory);
-	retDatum = (*state->evalfunc) (state, econtext, isNull);
+	retDatum = state->evalfunc(state, econtext, isNull);
 	MemoryContextSwitchTo(oldContext);
 	return retDatum;
 }
@@ -382,6 +380,22 @@ ExecQual(ExprState *state, ExprContext *econtext)
 }
 #endif
 
+/*
+ * ExecQualAndReset() - evaluate qual with ExecQual() and reset expression
+ * context.
+ */
+#ifndef FRONTEND
+static inline bool
+ExecQualAndReset(ExprState *state, ExprContext *econtext)
+{
+	bool		ret = ExecQual(state, econtext);
+
+	/* inline ResetExprContext, to avoid ordering issue in this file */
+	MemoryContextReset(econtext->ecxt_per_tuple_memory);
+	return ret;
+}
+#endif
+
 extern bool ExecCheck(ExprState *state, ExprContext *context);
 
 /*
@@ -398,6 +412,7 @@ extern SetExprState *ExecInitFunctionResultSet(Expr *expr,
 						  ExprContext *econtext, PlanState *parent);
 extern Datum ExecMakeFunctionResultSet(SetExprState *fcache,
 						  ExprContext *econtext,
+						  MemoryContext argContext,
 						  bool *isNull,
 						  ExprDoneCond *isDone);
 
@@ -416,9 +431,10 @@ extern void ExecScanReScan(ScanState *node);
 /*
  * prototypes from functions in execTuples.c
  */
-extern void ExecInitResultTupleSlot(EState *estate, PlanState *planstate);
-extern void ExecInitScanTupleSlot(EState *estate, ScanState *scanstate);
-extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate);
+extern void ExecInitResultTupleSlotTL(EState *estate, PlanState *planstate);
+extern void ExecInitScanTupleSlot(EState *estate, ScanState *scanstate, TupleDesc tupleDesc);
+extern TupleTableSlot *ExecInitExtraTupleSlot(EState *estate,
+					  TupleDesc tupleDesc);
 extern TupleTableSlot *ExecInitNullTupleSlot(EState *estate,
 					  TupleDesc tupType);
 extern TupleDesc ExecTypeFromTL(List *targetList, bool hasoid);
@@ -487,14 +503,14 @@ extern ExprContext *MakePerTupleExprContext(EState *estate);
 	} while (0)
 
 extern void ExecAssignExprContext(EState *estate, PlanState *planstate);
-extern void ExecAssignResultType(PlanState *planstate, TupleDesc tupDesc);
-extern void ExecAssignResultTypeFromTL(PlanState *planstate);
 extern TupleDesc ExecGetResultType(PlanState *planstate);
 extern void ExecAssignProjectionInfo(PlanState *planstate,
 						 TupleDesc inputDesc);
+extern void ExecConditionalAssignProjectionInfo(PlanState *planstate,
+									TupleDesc inputDesc, Index varno);
 extern void ExecFreeExprContext(PlanState *planstate);
 extern void ExecAssignScanType(ScanState *scanstate, TupleDesc tupDesc);
-extern void ExecAssignScanTypeFromOuterPlan(ScanState *scanstate);
+extern void ExecCreateScanSlotFromOuterPlan(EState *estate, ScanState *scanstate);
 
 extern bool ExecRelationIsTargetRelation(EState *estate, Index scanrelid);
 
diff --git a/src/include/executor/functions.h b/src/include/executor/functions.h
index 718d8947a3..e7454ee790 100644
--- a/src/include/executor/functions.h
+++ b/src/include/executor/functions.h
@@ -4,7 +4,7 @@
  *		Declarations for execution of SQL-language functions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/functions.h
diff --git a/src/include/executor/hashjoin.h b/src/include/executor/hashjoin.h
index 82acadf85b..6fb2dc04f6 100644
--- a/src/include/executor/hashjoin.h
+++ b/src/include/executor/hashjoin.h
@@ -4,7 +4,7 @@
  *	  internal structures for hash joins
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/hashjoin.h
@@ -15,7 +15,10 @@
 #define HASHJOIN_H
 
 #include "nodes/execnodes.h"
+#include "port/atomics.h"
+#include "storage/barrier.h"
 #include "storage/buffile.h"
+#include "storage/lwlock.h"
 
 /* ----------------------------------------------------------------
  *				hash-join hash table structures
@@ -63,7 +66,12 @@
 
 typedef struct HashJoinTupleData
 {
-	struct HashJoinTupleData *next; /* link to next tuple in same bucket */
+	/* link to next tuple in same bucket */
+	union
+	{
+		struct HashJoinTupleData *unshared;
+		dsa_pointer shared;
+	}			next;
 	uint32		hashvalue;		/* tuple's hash code */
 	/* Tuple data, in MinimalTuple format, follows on a MAXALIGN boundary */
 }			HashJoinTupleData;
@@ -109,20 +117,170 @@ typedef struct HashSkewBucket
 typedef struct HashMemoryChunkData
 {
 	int			ntuples;		/* number of tuples stored in this chunk */
-	size_t		maxlen;			/* size of the buffer holding the tuples */
+	size_t		maxlen;			/* size of the chunk's tuple buffer */
 	size_t		used;			/* number of buffer bytes already used */
 
-	struct HashMemoryChunkData *next;	/* pointer to the next chunk (linked
-										 * list) */
+	/* pointer to the next chunk (linked list) */
+	union
+	{
+		struct HashMemoryChunkData *unshared;
+		dsa_pointer shared;
+	}			next;
 
-	char		data[FLEXIBLE_ARRAY_MEMBER];	/* buffer allocated at the end */
+	/*
+	 * The chunk's tuple buffer starts after the HashMemoryChunkData struct,
+	 * at offset HASH_CHUNK_HEADER_SIZE (which must be maxaligned).  Note that
+	 * that offset is not included in "maxlen" or "used".
+	 */
 }			HashMemoryChunkData;
 
 typedef struct HashMemoryChunkData *HashMemoryChunk;
 
 #define HASH_CHUNK_SIZE			(32 * 1024L)
+#define HASH_CHUNK_HEADER_SIZE	MAXALIGN(sizeof(HashMemoryChunkData))
+#define HASH_CHUNK_DATA(hc)		(((char *) (hc)) + HASH_CHUNK_HEADER_SIZE)
+/* tuples exceeding HASH_CHUNK_THRESHOLD bytes are put in their own chunk */
 #define HASH_CHUNK_THRESHOLD	(HASH_CHUNK_SIZE / 4)
 
+/*
+ * For each batch of a Parallel Hash Join, we have a ParallelHashJoinBatch
+ * object in shared memory to coordinate access to it.  Since they are
+ * followed by variable-sized objects, they are arranged in contiguous memory
+ * but not accessed directly as an array.
+ */
+typedef struct ParallelHashJoinBatch
+{
+	dsa_pointer buckets;		/* array of hash table buckets */
+	Barrier		batch_barrier;	/* synchronization for joining this batch */
+
+	dsa_pointer chunks;			/* chunks of tuples loaded */
+	size_t		size;			/* size of buckets + chunks in memory */
+	size_t		estimated_size; /* size of buckets + chunks while writing */
+	size_t		ntuples;		/* number of tuples loaded */
+	size_t		old_ntuples;	/* number of tuples before repartitioning */
+	bool		space_exhausted;
+
+	/*
+	 * Variable-sized SharedTuplestore objects follow this struct in memory.
+	 * See the accessor macros below.
+	 */
+} ParallelHashJoinBatch;
+
+/* Accessor for inner batch tuplestore following a ParallelHashJoinBatch. */
+#define ParallelHashJoinBatchInner(batch)							\
+	((SharedTuplestore *)											\
+	 ((char *) (batch) + MAXALIGN(sizeof(ParallelHashJoinBatch))))
+
+/* Accessor for outer batch tuplestore following a ParallelHashJoinBatch. */
+#define ParallelHashJoinBatchOuter(batch, nparticipants) \
+	((SharedTuplestore *)												\
+	 ((char *) ParallelHashJoinBatchInner(batch) +						\
+	  MAXALIGN(sts_estimate(nparticipants))))
+
+/* Total size of a ParallelHashJoinBatch and tuplestores. */
+#define EstimateParallelHashJoinBatch(hashtable)						\
+	(MAXALIGN(sizeof(ParallelHashJoinBatch)) +							\
+	 MAXALIGN(sts_estimate((hashtable)->parallel_state->nparticipants)) * 2)
+
+/* Accessor for the nth ParallelHashJoinBatch given the base. */
+#define NthParallelHashJoinBatch(base, n)								\
+	((ParallelHashJoinBatch *)											\
+	 ((char *) (base) +													\
+	  EstimateParallelHashJoinBatch(hashtable) *  (n)))
+
+/*
+ * Each backend requires a small amount of per-batch state to interact with
+ * each ParalellHashJoinBatch.
+ */
+typedef struct ParallelHashJoinBatchAccessor
+{
+	ParallelHashJoinBatch *shared;	/* pointer to shared state */
+
+	/* Per-backend partial counters to reduce contention. */
+	size_t		preallocated;	/* pre-allocated space for this backend */
+	size_t		ntuples;		/* number of tuples */
+	size_t		size;			/* size of partition in memory */
+	size_t		estimated_size; /* size of partition on disk */
+	size_t		old_ntuples;	/* how many tuples before repartioning? */
+	bool		at_least_one_chunk; /* has this backend allocated a chunk? */
+
+	bool		done;			/* flag to remember that a batch is done */
+	SharedTuplestoreAccessor *inner_tuples;
+	SharedTuplestoreAccessor *outer_tuples;
+} ParallelHashJoinBatchAccessor;
+
+/*
+ * While hashing the inner relation, any participant might determine that it's
+ * time to increase the number of buckets to reduce the load factor or batches
+ * to reduce the memory size.  This is indicated by setting the growth flag to
+ * these values.
+ */
+typedef enum ParallelHashGrowth
+{
+	/* The current dimensions are sufficient. */
+	PHJ_GROWTH_OK,
+	/* The load factor is too high, so we need to add buckets. */
+	PHJ_GROWTH_NEED_MORE_BUCKETS,
+	/* The memory budget would be exhausted, so we need to repartition. */
+	PHJ_GROWTH_NEED_MORE_BATCHES,
+	/* Repartitioning didn't help last time, so don't try to do that again. */
+	PHJ_GROWTH_DISABLED
+} ParallelHashGrowth;
+
+/*
+ * The shared state used to coordinate a Parallel Hash Join.  This is stored
+ * in the DSM segment.
+ */
+typedef struct ParallelHashJoinState
+{
+	dsa_pointer batches;		/* array of ParallelHashJoinBatch */
+	dsa_pointer old_batches;	/* previous generation during repartition */
+	int			nbatch;			/* number of batches now */
+	int			old_nbatch;		/* previous number of batches */
+	int			nbuckets;		/* number of buckets */
+	ParallelHashGrowth growth;	/* control batch/bucket growth */
+	dsa_pointer chunk_work_queue;	/* chunk work queue */
+	int			nparticipants;
+	size_t		space_allowed;
+	size_t		total_tuples;	/* total number of inner tuples */
+	LWLock		lock;			/* lock protecting the above */
+
+	Barrier		build_barrier;	/* synchronization for the build phases */
+	Barrier		grow_batches_barrier;
+	Barrier		grow_buckets_barrier;
+	pg_atomic_uint32 distributor;	/* counter for load balancing */
+
+	SharedFileSet fileset;		/* space for shared temporary files */
+} ParallelHashJoinState;
+
+/* The phases for building batches, used by build_barrier. */
+#define PHJ_BUILD_ELECTING				0
+#define PHJ_BUILD_ALLOCATING			1
+#define PHJ_BUILD_HASHING_INNER			2
+#define PHJ_BUILD_HASHING_OUTER			3
+#define PHJ_BUILD_DONE					4
+
+/* The phases for probing each batch, used by for batch_barrier. */
+#define PHJ_BATCH_ELECTING				0
+#define PHJ_BATCH_ALLOCATING			1
+#define PHJ_BATCH_LOADING				2
+#define PHJ_BATCH_PROBING				3
+#define PHJ_BATCH_DONE					4
+
+/* The phases of batch growth while hashing, for grow_batches_barrier. */
+#define PHJ_GROW_BATCHES_ELECTING		0
+#define PHJ_GROW_BATCHES_ALLOCATING		1
+#define PHJ_GROW_BATCHES_REPARTITIONING 2
+#define PHJ_GROW_BATCHES_DECIDING		3
+#define PHJ_GROW_BATCHES_FINISHING		4
+#define PHJ_GROW_BATCHES_PHASE(n)		((n) % 5)	/* circular phases */
+
+/* The phases of bucket growth while hashing, for grow_buckets_barrier. */
+#define PHJ_GROW_BUCKETS_ELECTING		0
+#define PHJ_GROW_BUCKETS_ALLOCATING		1
+#define PHJ_GROW_BUCKETS_REINSERTING	2
+#define PHJ_GROW_BUCKETS_PHASE(n)		((n) % 3)	/* circular phases */
+
 typedef struct HashJoinTableData
 {
 	int			nbuckets;		/* # buckets in the in-memory hash table */
@@ -133,8 +291,13 @@ typedef struct HashJoinTableData
 	int			log2_nbuckets_optimal;	/* log2(nbuckets_optimal) */
 
 	/* buckets[i] is head of list of tuples in i'th in-memory bucket */
-	struct HashJoinTupleData **buckets;
-	/* buckets array is per-batch storage, as are all the tuples */
+	union
+	{
+		/* unshared array is per-batch storage, as are all the tuples */
+		struct HashJoinTupleData **unshared;
+		/* shared array is per-query DSA area, as are all the tuples */
+		dsa_pointer_atomic *shared;
+	}			buckets;
 
 	bool		keepNulls;		/* true to store unmatchable NULL tuples */
 
@@ -153,6 +316,7 @@ typedef struct HashJoinTableData
 	bool		growEnabled;	/* flag to shut off nbatch increases */
 
 	double		totalTuples;	/* # tuples obtained from inner plan */
+	double		partialTuples;	/* # tuples obtained from inner plan by me */
 	double		skewTuples;		/* # tuples inserted into skew tuples */
 
 	/*
@@ -185,6 +349,13 @@ typedef struct HashJoinTableData
 
 	/* used for dense allocation of tuples (into linked chunks) */
 	HashMemoryChunk chunks;		/* one list for the whole batch */
+
+	/* Shared and private state for Parallel Hash. */
+	HashMemoryChunk current_chunk;	/* this backend's current chunk */
+	dsa_area   *area;			/* DSA area to allocate memory from */
+	ParallelHashJoinState *parallel_state;
+	ParallelHashJoinBatchAccessor *batches;
+	dsa_pointer current_chunk_shared;
 }			HashJoinTableData;
 
 #endif							/* HASHJOIN_H */
diff --git a/src/include/executor/instrument.h b/src/include/executor/instrument.h
index 31573145a9..b72f91898a 100644
--- a/src/include/executor/instrument.h
+++ b/src/include/executor/instrument.h
@@ -4,7 +4,7 @@
  *	  definitions for run-time statistics collection
  *
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * src/include/executor/instrument.h
  *
@@ -44,10 +44,10 @@ typedef enum InstrumentOption
 typedef struct Instrumentation
 {
 	/* Parameters set at node creation: */
-	bool		need_timer;		/* TRUE if we need timer data */
-	bool		need_bufusage;	/* TRUE if we need buffer usage data */
+	bool		need_timer;		/* true if we need timer data */
+	bool		need_bufusage;	/* true if we need buffer usage data */
 	/* Info about current plan cycle: */
-	bool		running;		/* TRUE if we've completed first tuple */
+	bool		running;		/* true if we've completed first tuple */
 	instr_time	starttime;		/* Start time of current iteration of node */
 	instr_time	counter;		/* Accumulated runtime for this node */
 	double		firsttuple;		/* Time for first tuple of this cycle */
diff --git a/src/include/executor/nodeAgg.h b/src/include/executor/nodeAgg.h
index eff5af9c2a..aa6ebaaf97 100644
--- a/src/include/executor/nodeAgg.h
+++ b/src/include/executor/nodeAgg.h
@@ -4,7 +4,7 @@
  *	  prototypes for nodeAgg.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeAgg.h
@@ -16,6 +16,292 @@
 
 #include "nodes/execnodes.h"
 
+
+/*
+ * AggStatePerTransData - per aggregate state value information
+ *
+ * Working state for updating the aggregate's state value, by calling the
+ * transition function with an input row. This struct does not store the
+ * information needed to produce the final aggregate result from the transition
+ * state, that's stored in AggStatePerAggData instead. This separation allows
+ * multiple aggregate results to be produced from a single state value.
+ */
+typedef struct AggStatePerTransData
+{
+	/*
+	 * These values are set up during ExecInitAgg() and do not change
+	 * thereafter:
+	 */
+
+	/*
+	 * Link to an Aggref expr this state value is for.
+	 *
+	 * There can be multiple Aggref's sharing the same state value, so long as
+	 * the inputs and transition functions are identical and the final
+	 * functions are not read-write.  This points to the first one of them.
+	 */
+	Aggref	   *aggref;
+
+	/*
+	 * Is this state value actually being shared by more than one Aggref?
+	 */
+	bool		aggshared;
+
+	/*
+	 * Number of aggregated input columns.  This includes ORDER BY expressions
+	 * in both the plain-agg and ordered-set cases.  Ordered-set direct args
+	 * are not counted, though.
+	 */
+	int			numInputs;
+
+	/*
+	 * Number of aggregated input columns to pass to the transfn.  This
+	 * includes the ORDER BY columns for ordered-set aggs, but not for plain
+	 * aggs.  (This doesn't count the transition state value!)
+	 */
+	int			numTransInputs;
+
+	/* Oid of the state transition or combine function */
+	Oid			transfn_oid;
+
+	/* Oid of the serialization function or InvalidOid */
+	Oid			serialfn_oid;
+
+	/* Oid of the deserialization function or InvalidOid */
+	Oid			deserialfn_oid;
+
+	/* Oid of state value's datatype */
+	Oid			aggtranstype;
+
+	/*
+	 * fmgr lookup data for transition function or combine function.  Note in
+	 * particular that the fn_strict flag is kept here.
+	 */
+	FmgrInfo	transfn;
+
+	/* fmgr lookup data for serialization function */
+	FmgrInfo	serialfn;
+
+	/* fmgr lookup data for deserialization function */
+	FmgrInfo	deserialfn;
+
+	/* Input collation derived for aggregate */
+	Oid			aggCollation;
+
+	/* number of sorting columns */
+	int			numSortCols;
+
+	/* number of sorting columns to consider in DISTINCT comparisons */
+	/* (this is either zero or the same as numSortCols) */
+	int			numDistinctCols;
+
+	/* deconstructed sorting information (arrays of length numSortCols) */
+	AttrNumber *sortColIdx;
+	Oid		   *sortOperators;
+	Oid		   *sortCollations;
+	bool	   *sortNullsFirst;
+
+	/*
+	 * Comparators for input columns --- only set/used when aggregate has
+	 * DISTINCT flag. equalfnOne version is used for single-column
+	 * commparisons, equalfnMulti for the case of multiple columns.
+	 */
+	FmgrInfo	equalfnOne;
+	ExprState  *equalfnMulti;
+
+	/*
+	 * initial value from pg_aggregate entry
+	 */
+	Datum		initValue;
+	bool		initValueIsNull;
+
+	/*
+	 * We need the len and byval info for the agg's input and transition data
+	 * types in order to know how to copy/delete values.
+	 *
+	 * Note that the info for the input type is used only when handling
+	 * DISTINCT aggs with just one argument, so there is only one input type.
+	 */
+	int16		inputtypeLen,
+				transtypeLen;
+	bool		inputtypeByVal,
+				transtypeByVal;
+
+	/*
+	 * Slots for holding the evaluated input arguments.  These are set up
+	 * during ExecInitAgg() and then used for each input row requiring either
+	 * FILTER or ORDER BY/DISTINCT processing.
+	 */
+	TupleTableSlot *sortslot;	/* current input tuple */
+	TupleTableSlot *uniqslot;	/* used for multi-column DISTINCT */
+	TupleDesc	sortdesc;		/* descriptor of input tuples */
+
+	/*
+	 * These values are working state that is initialized at the start of an
+	 * input tuple group and updated for each input tuple.
+	 *
+	 * For a simple (non DISTINCT/ORDER BY) aggregate, we just feed the input
+	 * values straight to the transition function.  If it's DISTINCT or
+	 * requires ORDER BY, we pass the input values into a Tuplesort object;
+	 * then at completion of the input tuple group, we scan the sorted values,
+	 * eliminate duplicates if needed, and run the transition function on the
+	 * rest.
+	 *
+	 * We need a separate tuplesort for each grouping set.
+	 */
+
+	Tuplesortstate **sortstates;	/* sort objects, if DISTINCT or ORDER BY */
+
+	/*
+	 * This field is a pre-initialized FunctionCallInfo struct used for
+	 * calling this aggregate's transfn.  We save a few cycles per row by not
+	 * re-initializing the unchanging fields; which isn't much, but it seems
+	 * worth the extra space consumption.
+	 */
+	FunctionCallInfoData transfn_fcinfo;
+
+	/* Likewise for serialization and deserialization functions */
+	FunctionCallInfoData serialfn_fcinfo;
+
+	FunctionCallInfoData deserialfn_fcinfo;
+}			AggStatePerTransData;
+
+/*
+ * AggStatePerAggData - per-aggregate information
+ *
+ * This contains the information needed to call the final function, to produce
+ * a final aggregate result from the state value. If there are multiple
+ * identical Aggrefs in the query, they can all share the same per-agg data.
+ *
+ * These values are set up during ExecInitAgg() and do not change thereafter.
+ */
+typedef struct AggStatePerAggData
+{
+	/*
+	 * Link to an Aggref expr this state value is for.
+	 *
+	 * There can be multiple identical Aggref's sharing the same per-agg. This
+	 * points to the first one of them.
+	 */
+	Aggref	   *aggref;
+
+	/* index to the state value which this agg should use */
+	int			transno;
+
+	/* Optional Oid of final function (may be InvalidOid) */
+	Oid			finalfn_oid;
+
+	/*
+	 * fmgr lookup data for final function --- only valid when finalfn_oid is
+	 * not InvalidOid.
+	 */
+	FmgrInfo	finalfn;
+
+	/*
+	 * Number of arguments to pass to the finalfn.  This is always at least 1
+	 * (the transition state value) plus any ordered-set direct args. If the
+	 * finalfn wants extra args then we pass nulls corresponding to the
+	 * aggregated input columns.
+	 */
+	int			numFinalArgs;
+
+	/* ExprStates for any direct-argument expressions */
+	List	   *aggdirectargs;
+
+	/*
+	 * We need the len and byval info for the agg's result data type in order
+	 * to know how to copy/delete values.
+	 */
+	int16		resulttypeLen;
+	bool		resulttypeByVal;
+
+	/*
+	 * "sharable" is false if this agg cannot share state values with other
+	 * aggregates because the final function is read-write.
+	 */
+	bool		sharable;
+}			AggStatePerAggData;
+
+/*
+ * AggStatePerGroupData - per-aggregate-per-group working state
+ *
+ * These values are working state that is initialized at the start of
+ * an input tuple group and updated for each input tuple.
+ *
+ * In AGG_PLAIN and AGG_SORTED modes, we have a single array of these
+ * structs (pointed to by aggstate->pergroup); we re-use the array for
+ * each input group, if it's AGG_SORTED mode.  In AGG_HASHED mode, the
+ * hash table contains an array of these structs for each tuple group.
+ *
+ * Logically, the sortstate field belongs in this struct, but we do not
+ * keep it here for space reasons: we don't support DISTINCT aggregates
+ * in AGG_HASHED mode, so there's no reason to use up a pointer field
+ * in every entry of the hashtable.
+ */
+typedef struct AggStatePerGroupData
+{
+	Datum		transValue;		/* current transition value */
+	bool		transValueIsNull;
+
+	bool		noTransValue;	/* true if transValue not set yet */
+
+	/*
+	 * Note: noTransValue initially has the same value as transValueIsNull,
+	 * and if true both are cleared to false at the same time.  They are not
+	 * the same though: if transfn later returns a NULL, we want to keep that
+	 * NULL and not auto-replace it with a later input value. Only the first
+	 * non-NULL input will be auto-substituted.
+	 */
+}			AggStatePerGroupData;
+
+/*
+ * AggStatePerPhaseData - per-grouping-set-phase state
+ *
+ * Grouping sets are divided into "phases", where a single phase can be
+ * processed in one pass over the input. If there is more than one phase, then
+ * at the end of input from the current phase, state is reset and another pass
+ * taken over the data which has been re-sorted in the mean time.
+ *
+ * Accordingly, each phase specifies a list of grouping sets and group clause
+ * information, plus each phase after the first also has a sort order.
+ */
+typedef struct AggStatePerPhaseData
+{
+	AggStrategy aggstrategy;	/* strategy for this phase */
+	int			numsets;		/* number of grouping sets (or 0) */
+	int		   *gset_lengths;	/* lengths of grouping sets */
+	Bitmapset **grouped_cols;	/* column groupings for rollup */
+	ExprState **eqfunctions;	/* expression returning equality, indexed by
+								 * nr of cols to compare */
+	Agg		   *aggnode;		/* Agg node for phase data */
+	Sort	   *sortnode;		/* Sort node for input ordering for phase */
+
+	ExprState  *evaltrans;		/* evaluation of transition functions  */
+}			AggStatePerPhaseData;
+
+/*
+ * AggStatePerHashData - per-hashtable state
+ *
+ * When doing grouping sets with hashing, we have one of these for each
+ * grouping set. (When doing hashing without grouping sets, we have just one of
+ * them.)
+ */
+typedef struct AggStatePerHashData
+{
+	TupleHashTable hashtable;	/* hash table with one entry per group */
+	TupleHashIterator hashiter; /* for iterating through hash table */
+	TupleTableSlot *hashslot;	/* slot for loading hash table */
+	FmgrInfo   *hashfunctions;	/* per-grouping-field hash fns */
+	Oid		   *eqfuncoids;		/* per-grouping-field equality fns */
+	int			numCols;		/* number of hash key columns */
+	int			numhashGrpCols; /* number of columns in hash table */
+	int			largestGrpColIdx;	/* largest col required for hashing */
+	AttrNumber *hashGrpColIdxInput; /* hash col indices in input slot */
+	AttrNumber *hashGrpColIdxHash;	/* indices in hashtbl tuples */
+	Agg		   *aggnode;		/* original Agg node, for numGroups etc. */
+}			AggStatePerHashData;
+
+
 extern AggState *ExecInitAgg(Agg *node, EState *estate, int eflags);
 extern void ExecEndAgg(AggState *node);
 extern void ExecReScanAgg(AggState *node);
diff --git a/src/include/executor/nodeAppend.h b/src/include/executor/nodeAppend.h
index 4e38a1380e..4e31a9fcd8 100644
--- a/src/include/executor/nodeAppend.h
+++ b/src/include/executor/nodeAppend.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeAppend.h
@@ -14,10 +14,15 @@
 #ifndef NODEAPPEND_H
 #define NODEAPPEND_H
 
+#include "access/parallel.h"
 #include "nodes/execnodes.h"
 
 extern AppendState *ExecInitAppend(Append *node, EState *estate, int eflags);
 extern void ExecEndAppend(AppendState *node);
 extern void ExecReScanAppend(AppendState *node);
+extern void ExecAppendEstimate(AppendState *node, ParallelContext *pcxt);
+extern void ExecAppendInitializeDSM(AppendState *node, ParallelContext *pcxt);
+extern void ExecAppendReInitializeDSM(AppendState *node, ParallelContext *pcxt);
+extern void ExecAppendInitializeWorker(AppendState *node, ParallelWorkerContext *pwcxt);
 
 #endif							/* NODEAPPEND_H */
diff --git a/src/include/executor/nodeBitmapAnd.h b/src/include/executor/nodeBitmapAnd.h
index 5d848b61af..029e5b600d 100644
--- a/src/include/executor/nodeBitmapAnd.h
+++ b/src/include/executor/nodeBitmapAnd.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeBitmapAnd.h
diff --git a/src/include/executor/nodeBitmapHeapscan.h b/src/include/executor/nodeBitmapHeapscan.h
index c77694cf22..e86d3e10d4 100644
--- a/src/include/executor/nodeBitmapHeapscan.h
+++ b/src/include/executor/nodeBitmapHeapscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeBitmapHeapscan.h
@@ -24,7 +24,9 @@ extern void ExecBitmapHeapEstimate(BitmapHeapScanState *node,
 					   ParallelContext *pcxt);
 extern void ExecBitmapHeapInitializeDSM(BitmapHeapScanState *node,
 							ParallelContext *pcxt);
+extern void ExecBitmapHeapReInitializeDSM(BitmapHeapScanState *node,
+							  ParallelContext *pcxt);
 extern void ExecBitmapHeapInitializeWorker(BitmapHeapScanState *node,
-							   shm_toc *toc);
+							   ParallelWorkerContext *pwcxt);
 
 #endif							/* NODEBITMAPHEAPSCAN_H */
diff --git a/src/include/executor/nodeBitmapIndexscan.h b/src/include/executor/nodeBitmapIndexscan.h
index 842193f4df..8b93baabea 100644
--- a/src/include/executor/nodeBitmapIndexscan.h
+++ b/src/include/executor/nodeBitmapIndexscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeBitmapIndexscan.h
diff --git a/src/include/executor/nodeBitmapOr.h b/src/include/executor/nodeBitmapOr.h
index 526904eb4d..96f84d22ed 100644
--- a/src/include/executor/nodeBitmapOr.h
+++ b/src/include/executor/nodeBitmapOr.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeBitmapOr.h
diff --git a/src/include/executor/nodeCtescan.h b/src/include/executor/nodeCtescan.h
index d2fbcbd586..21f4f191cd 100644
--- a/src/include/executor/nodeCtescan.h
+++ b/src/include/executor/nodeCtescan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeCtescan.h
diff --git a/src/include/executor/nodeCustom.h b/src/include/executor/nodeCustom.h
index a1cc63ae1f..454a684a40 100644
--- a/src/include/executor/nodeCustom.h
+++ b/src/include/executor/nodeCustom.h
@@ -4,7 +4,7 @@
  *
  * prototypes for CustomScan nodes
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * ------------------------------------------------------------------------
@@ -34,8 +34,10 @@ extern void ExecCustomScanEstimate(CustomScanState *node,
 					   ParallelContext *pcxt);
 extern void ExecCustomScanInitializeDSM(CustomScanState *node,
 							ParallelContext *pcxt);
+extern void ExecCustomScanReInitializeDSM(CustomScanState *node,
+							  ParallelContext *pcxt);
 extern void ExecCustomScanInitializeWorker(CustomScanState *node,
-							   shm_toc *toc);
+							   ParallelWorkerContext *pwcxt);
 extern void ExecShutdownCustomScan(CustomScanState *node);
 
 #endif							/* NODECUSTOM_H */
diff --git a/src/include/executor/nodeForeignscan.h b/src/include/executor/nodeForeignscan.h
index 0b662597d8..ccb66be733 100644
--- a/src/include/executor/nodeForeignscan.h
+++ b/src/include/executor/nodeForeignscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeForeignscan.h
@@ -25,8 +25,10 @@ extern void ExecForeignScanEstimate(ForeignScanState *node,
 						ParallelContext *pcxt);
 extern void ExecForeignScanInitializeDSM(ForeignScanState *node,
 							 ParallelContext *pcxt);
+extern void ExecForeignScanReInitializeDSM(ForeignScanState *node,
+							   ParallelContext *pcxt);
 extern void ExecForeignScanInitializeWorker(ForeignScanState *node,
-								shm_toc *toc);
+								ParallelWorkerContext *pwcxt);
 extern void ExecShutdownForeignScan(ForeignScanState *node);
 
 #endif							/* NODEFOREIGNSCAN_H */
diff --git a/src/include/executor/nodeFunctionscan.h b/src/include/executor/nodeFunctionscan.h
index aaa9d8c316..5de8d15a5f 100644
--- a/src/include/executor/nodeFunctionscan.h
+++ b/src/include/executor/nodeFunctionscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeFunctionscan.h
diff --git a/src/include/executor/nodeGather.h b/src/include/executor/nodeGather.h
index 189bd70041..4477b855c4 100644
--- a/src/include/executor/nodeGather.h
+++ b/src/include/executor/nodeGather.h
@@ -4,7 +4,7 @@
  *		prototypes for nodeGather.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeGather.h
diff --git a/src/include/executor/nodeGatherMerge.h b/src/include/executor/nodeGatherMerge.h
index 0154d73312..1e514ff090 100644
--- a/src/include/executor/nodeGatherMerge.h
+++ b/src/include/executor/nodeGatherMerge.h
@@ -4,7 +4,7 @@
  *		prototypes for nodeGatherMerge.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeGatherMerge.h
diff --git a/src/include/executor/nodeGroup.h b/src/include/executor/nodeGroup.h
index b0d7e312c9..483390db8c 100644
--- a/src/include/executor/nodeGroup.h
+++ b/src/include/executor/nodeGroup.h
@@ -4,7 +4,7 @@
  *	  prototypes for nodeGroup.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeGroup.h
diff --git a/src/include/executor/nodeHash.h b/src/include/executor/nodeHash.h
index 3ae556fb6c..8d700c06c5 100644
--- a/src/include/executor/nodeHash.h
+++ b/src/include/executor/nodeHash.h
@@ -4,7 +4,7 @@
  *	  prototypes for nodeHash.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeHash.h
@@ -14,19 +14,35 @@
 #ifndef NODEHASH_H
 #define NODEHASH_H
 
+#include "access/parallel.h"
 #include "nodes/execnodes.h"
 
+struct SharedHashJoinBatch;
+
 extern HashState *ExecInitHash(Hash *node, EState *estate, int eflags);
 extern Node *MultiExecHash(HashState *node);
 extern void ExecEndHash(HashState *node);
 extern void ExecReScanHash(HashState *node);
 
-extern HashJoinTable ExecHashTableCreate(Hash *node, List *hashOperators,
+extern HashJoinTable ExecHashTableCreate(HashState *state, List *hashOperators,
 					bool keepNulls);
+extern void ExecParallelHashTableAlloc(HashJoinTable hashtable,
+						   int batchno);
 extern void ExecHashTableDestroy(HashJoinTable hashtable);
+extern void ExecHashTableDetach(HashJoinTable hashtable);
+extern void ExecHashTableDetachBatch(HashJoinTable hashtable);
+extern void ExecParallelHashTableSetCurrentBatch(HashJoinTable hashtable,
+									 int batchno);
+
 extern void ExecHashTableInsert(HashJoinTable hashtable,
 					TupleTableSlot *slot,
 					uint32 hashvalue);
+extern void ExecParallelHashTableInsert(HashJoinTable hashtable,
+							TupleTableSlot *slot,
+							uint32 hashvalue);
+extern void ExecParallelHashTableInsertCurrentBatch(HashJoinTable hashtable,
+										TupleTableSlot *slot,
+										uint32 hashvalue);
 extern bool ExecHashGetHashValue(HashJoinTable hashtable,
 					 ExprContext *econtext,
 					 List *hashkeys,
@@ -38,15 +54,26 @@ extern void ExecHashGetBucketAndBatch(HashJoinTable hashtable,
 						  int *bucketno,
 						  int *batchno);
 extern bool ExecScanHashBucket(HashJoinState *hjstate, ExprContext *econtext);
+extern bool ExecParallelScanHashBucket(HashJoinState *hjstate, ExprContext *econtext);
 extern void ExecPrepHashTableForUnmatched(HashJoinState *hjstate);
 extern bool ExecScanHashTableForUnmatched(HashJoinState *hjstate,
 							  ExprContext *econtext);
 extern void ExecHashTableReset(HashJoinTable hashtable);
 extern void ExecHashTableResetMatchFlags(HashJoinTable hashtable);
 extern void ExecChooseHashTableSize(double ntuples, int tupwidth, bool useskew,
+						bool try_combined_work_mem,
+						int parallel_workers,
+						size_t *space_allowed,
 						int *numbuckets,
 						int *numbatches,
 						int *num_skew_mcvs);
 extern int	ExecHashGetSkewBucket(HashJoinTable hashtable, uint32 hashvalue);
+extern void ExecHashEstimate(HashState *node, ParallelContext *pcxt);
+extern void ExecHashInitializeDSM(HashState *node, ParallelContext *pcxt);
+extern void ExecHashInitializeWorker(HashState *node, ParallelWorkerContext *pwcxt);
+extern void ExecHashRetrieveInstrumentation(HashState *node);
+extern void ExecShutdownHash(HashState *node);
+extern void ExecHashGetInstrumentation(HashInstrumentation *instrument,
+						   HashJoinTable hashtable);
 
 #endif							/* NODEHASH_H */
diff --git a/src/include/executor/nodeHashjoin.h b/src/include/executor/nodeHashjoin.h
index 7469bfbf60..4086dd5382 100644
--- a/src/include/executor/nodeHashjoin.h
+++ b/src/include/executor/nodeHashjoin.h
@@ -4,7 +4,7 @@
  *	  prototypes for nodeHashjoin.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeHashjoin.h
@@ -14,12 +14,19 @@
 #ifndef NODEHASHJOIN_H
 #define NODEHASHJOIN_H
 
+#include "access/parallel.h"
 #include "nodes/execnodes.h"
 #include "storage/buffile.h"
 
 extern HashJoinState *ExecInitHashJoin(HashJoin *node, EState *estate, int eflags);
 extern void ExecEndHashJoin(HashJoinState *node);
 extern void ExecReScanHashJoin(HashJoinState *node);
+extern void ExecShutdownHashJoin(HashJoinState *node);
+extern void ExecHashJoinEstimate(HashJoinState *state, ParallelContext *pcxt);
+extern void ExecHashJoinInitializeDSM(HashJoinState *state, ParallelContext *pcxt);
+extern void ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *pcxt);
+extern void ExecHashJoinInitializeWorker(HashJoinState *state,
+							 ParallelWorkerContext *pwcxt);
 
 extern void ExecHashJoinSaveTuple(MinimalTuple tuple, uint32 hashvalue,
 					  BufFile **fileptr);
diff --git a/src/include/executor/nodeIndexonlyscan.h b/src/include/executor/nodeIndexonlyscan.h
index c8a709c26e..8f6c5a8d09 100644
--- a/src/include/executor/nodeIndexonlyscan.h
+++ b/src/include/executor/nodeIndexonlyscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeIndexonlyscan.h
@@ -28,7 +28,9 @@ extern void ExecIndexOnlyScanEstimate(IndexOnlyScanState *node,
 						  ParallelContext *pcxt);
 extern void ExecIndexOnlyScanInitializeDSM(IndexOnlyScanState *node,
 							   ParallelContext *pcxt);
+extern void ExecIndexOnlyScanReInitializeDSM(IndexOnlyScanState *node,
+								 ParallelContext *pcxt);
 extern void ExecIndexOnlyScanInitializeWorker(IndexOnlyScanState *node,
-								  shm_toc *toc);
+								  ParallelWorkerContext *pwcxt);
 
 #endif							/* NODEINDEXONLYSCAN_H */
diff --git a/src/include/executor/nodeIndexscan.h b/src/include/executor/nodeIndexscan.h
index 1668e347ee..822a9c9fad 100644
--- a/src/include/executor/nodeIndexscan.h
+++ b/src/include/executor/nodeIndexscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeIndexscan.h
@@ -24,7 +24,9 @@ extern void ExecIndexRestrPos(IndexScanState *node);
 extern void ExecReScanIndexScan(IndexScanState *node);
 extern void ExecIndexScanEstimate(IndexScanState *node, ParallelContext *pcxt);
 extern void ExecIndexScanInitializeDSM(IndexScanState *node, ParallelContext *pcxt);
-extern void ExecIndexScanInitializeWorker(IndexScanState *node, shm_toc *toc);
+extern void ExecIndexScanReInitializeDSM(IndexScanState *node, ParallelContext *pcxt);
+extern void ExecIndexScanInitializeWorker(IndexScanState *node,
+							  ParallelWorkerContext *pwcxt);
 
 /*
  * These routines are exported to share code with nodeIndexonlyscan.c and
diff --git a/src/include/executor/nodeLimit.h b/src/include/executor/nodeLimit.h
index db65b5524c..160ae5b026 100644
--- a/src/include/executor/nodeLimit.h
+++ b/src/include/executor/nodeLimit.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeLimit.h
diff --git a/src/include/executor/nodeLockRows.h b/src/include/executor/nodeLockRows.h
index c9d05b87f1..e3d77dff56 100644
--- a/src/include/executor/nodeLockRows.h
+++ b/src/include/executor/nodeLockRows.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeLockRows.h
diff --git a/src/include/executor/nodeMaterial.h b/src/include/executor/nodeMaterial.h
index 4b3c2578c9..84004efd5e 100644
--- a/src/include/executor/nodeMaterial.h
+++ b/src/include/executor/nodeMaterial.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeMaterial.h
diff --git a/src/include/executor/nodeMergeAppend.h b/src/include/executor/nodeMergeAppend.h
index a0ccbae965..e3bb7d91ff 100644
--- a/src/include/executor/nodeMergeAppend.h
+++ b/src/include/executor/nodeMergeAppend.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeMergeAppend.h
diff --git a/src/include/executor/nodeMergejoin.h b/src/include/executor/nodeMergejoin.h
index d20e41505d..456a39d914 100644
--- a/src/include/executor/nodeMergejoin.h
+++ b/src/include/executor/nodeMergejoin.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeMergejoin.h
diff --git a/src/include/executor/nodeModifyTable.h b/src/include/executor/nodeModifyTable.h
index a2e7af98de..0d7e579e1c 100644
--- a/src/include/executor/nodeModifyTable.h
+++ b/src/include/executor/nodeModifyTable.h
@@ -3,7 +3,7 @@
  * nodeModifyTable.h
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeModifyTable.h
diff --git a/src/include/executor/nodeNamedtuplestorescan.h b/src/include/executor/nodeNamedtuplestorescan.h
index 395d978f62..6c7300bcb8 100644
--- a/src/include/executor/nodeNamedtuplestorescan.h
+++ b/src/include/executor/nodeNamedtuplestorescan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeNamedtuplestorescan.h
diff --git a/src/include/executor/nodeNestloop.h b/src/include/executor/nodeNestloop.h
index 0d6486cc57..06b90d150e 100644
--- a/src/include/executor/nodeNestloop.h
+++ b/src/include/executor/nodeNestloop.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeNestloop.h
diff --git a/src/include/executor/nodeProjectSet.h b/src/include/executor/nodeProjectSet.h
index a0b0521f8d..c365589754 100644
--- a/src/include/executor/nodeProjectSet.h
+++ b/src/include/executor/nodeProjectSet.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeProjectSet.h
diff --git a/src/include/executor/nodeRecursiveunion.h b/src/include/executor/nodeRecursiveunion.h
index e6ce1b4783..09f211c500 100644
--- a/src/include/executor/nodeRecursiveunion.h
+++ b/src/include/executor/nodeRecursiveunion.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeRecursiveunion.h
diff --git a/src/include/executor/nodeResult.h b/src/include/executor/nodeResult.h
index 20e0063410..422a2ffd47 100644
--- a/src/include/executor/nodeResult.h
+++ b/src/include/executor/nodeResult.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeResult.h
diff --git a/src/include/executor/nodeSamplescan.h b/src/include/executor/nodeSamplescan.h
index 607bbd9412..0d489496cd 100644
--- a/src/include/executor/nodeSamplescan.h
+++ b/src/include/executor/nodeSamplescan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSamplescan.h
diff --git a/src/include/executor/nodeSeqscan.h b/src/include/executor/nodeSeqscan.h
index 0fba79f8de..020b40c6b7 100644
--- a/src/include/executor/nodeSeqscan.h
+++ b/src/include/executor/nodeSeqscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSeqscan.h
@@ -24,6 +24,8 @@ extern void ExecReScanSeqScan(SeqScanState *node);
 /* parallel scan support */
 extern void ExecSeqScanEstimate(SeqScanState *node, ParallelContext *pcxt);
 extern void ExecSeqScanInitializeDSM(SeqScanState *node, ParallelContext *pcxt);
-extern void ExecSeqScanInitializeWorker(SeqScanState *node, shm_toc *toc);
+extern void ExecSeqScanReInitializeDSM(SeqScanState *node, ParallelContext *pcxt);
+extern void ExecSeqScanInitializeWorker(SeqScanState *node,
+							ParallelWorkerContext *pwcxt);
 
 #endif							/* NODESEQSCAN_H */
diff --git a/src/include/executor/nodeSetOp.h b/src/include/executor/nodeSetOp.h
index c15f945046..d41fcbdc6e 100644
--- a/src/include/executor/nodeSetOp.h
+++ b/src/include/executor/nodeSetOp.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSetOp.h
diff --git a/src/include/executor/nodeSort.h b/src/include/executor/nodeSort.h
index ed0e9dbb53..22f69ee1ea 100644
--- a/src/include/executor/nodeSort.h
+++ b/src/include/executor/nodeSort.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSort.h
@@ -14,6 +14,7 @@
 #ifndef NODESORT_H
 #define NODESORT_H
 
+#include "access/parallel.h"
 #include "nodes/execnodes.h"
 
 extern SortState *ExecInitSort(Sort *node, EState *estate, int eflags);
@@ -22,4 +23,10 @@ extern void ExecSortMarkPos(SortState *node);
 extern void ExecSortRestrPos(SortState *node);
 extern void ExecReScanSort(SortState *node);
 
+/* parallel instrumentation support */
+extern void ExecSortEstimate(SortState *node, ParallelContext *pcxt);
+extern void ExecSortInitializeDSM(SortState *node, ParallelContext *pcxt);
+extern void ExecSortInitializeWorker(SortState *node, ParallelWorkerContext *pwcxt);
+extern void ExecSortRetrieveInstrumentation(SortState *node);
+
 #endif							/* NODESORT_H */
diff --git a/src/include/executor/nodeSubplan.h b/src/include/executor/nodeSubplan.h
index 5dbaeeb29a..d9784a2b71 100644
--- a/src/include/executor/nodeSubplan.h
+++ b/src/include/executor/nodeSubplan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSubplan.h
diff --git a/src/include/executor/nodeSubqueryscan.h b/src/include/executor/nodeSubqueryscan.h
index 710e050285..4bd292159c 100644
--- a/src/include/executor/nodeSubqueryscan.h
+++ b/src/include/executor/nodeSubqueryscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeSubqueryscan.h
diff --git a/src/include/executor/nodeTableFuncscan.h b/src/include/executor/nodeTableFuncscan.h
index c4672c0ac0..06ebbf31eb 100644
--- a/src/include/executor/nodeTableFuncscan.h
+++ b/src/include/executor/nodeTableFuncscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeTableFuncscan.h
diff --git a/src/include/executor/nodeTidscan.h b/src/include/executor/nodeTidscan.h
index e68aaf3829..30d21ff229 100644
--- a/src/include/executor/nodeTidscan.h
+++ b/src/include/executor/nodeTidscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeTidscan.h
diff --git a/src/include/executor/nodeUnique.h b/src/include/executor/nodeUnique.h
index 008774ae0f..b8a44b73c1 100644
--- a/src/include/executor/nodeUnique.h
+++ b/src/include/executor/nodeUnique.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeUnique.h
diff --git a/src/include/executor/nodeValuesscan.h b/src/include/executor/nodeValuesscan.h
index 772a5e9705..b4f384b111 100644
--- a/src/include/executor/nodeValuesscan.h
+++ b/src/include/executor/nodeValuesscan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeValuesscan.h
diff --git a/src/include/executor/nodeWindowAgg.h b/src/include/executor/nodeWindowAgg.h
index 1c177309ae..677e2d8d07 100644
--- a/src/include/executor/nodeWindowAgg.h
+++ b/src/include/executor/nodeWindowAgg.h
@@ -4,7 +4,7 @@
  *	  prototypes for nodeWindowAgg.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeWindowAgg.h
diff --git a/src/include/executor/nodeWorktablescan.h b/src/include/executor/nodeWorktablescan.h
index df05e75111..7daee1e40a 100644
--- a/src/include/executor/nodeWorktablescan.h
+++ b/src/include/executor/nodeWorktablescan.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/nodeWorktablescan.h
diff --git a/src/include/executor/spi.h b/src/include/executor/spi.h
index acade7e92e..e5bdaecc4e 100644
--- a/src/include/executor/spi.h
+++ b/src/include/executor/spi.h
@@ -3,7 +3,7 @@
  * spi.h
  *				Server Programming Interface public declarations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/spi.h
@@ -65,6 +65,8 @@ typedef struct _SPI_plan *SPIPlanPtr;
 #define SPI_OK_REL_UNREGISTER	16
 #define SPI_OK_TD_REGISTER		17
 
+#define SPI_OPT_NONATOMIC		(1 << 0)
+
 /* These used to be functions, now just no-ops for backwards compatibility */
 #define SPI_push()	((void) 0)
 #define SPI_pop()	((void) 0)
@@ -78,6 +80,7 @@ extern PGDLLIMPORT SPITupleTable *SPI_tuptable;
 extern PGDLLIMPORT int SPI_result;
 
 extern int	SPI_connect(void);
+extern int	SPI_connect_ext(int options);
 extern int	SPI_finish(void);
 extern int	SPI_execute(const char *src, bool read_only, long tcount);
 extern int SPI_execute_plan(SPIPlanPtr plan, Datum *Values, const char *Nulls,
@@ -156,6 +159,10 @@ extern int	SPI_register_relation(EphemeralNamedRelation enr);
 extern int	SPI_unregister_relation(const char *name);
 extern int	SPI_register_trigger_data(TriggerData *tdata);
 
+extern void SPI_start_transaction(void);
+extern void SPI_commit(void);
+extern void SPI_rollback(void);
+
 extern void AtEOXact_SPI(bool isCommit);
 extern void AtEOSubXact_SPI(bool isCommit, SubTransactionId mySubid);
 
diff --git a/src/include/executor/spi_priv.h b/src/include/executor/spi_priv.h
index ba7fb98875..263c8f1453 100644
--- a/src/include/executor/spi_priv.h
+++ b/src/include/executor/spi_priv.h
@@ -3,7 +3,7 @@
  * spi_priv.h
  *				Server Programming Interface private declarations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/spi_priv.h
@@ -26,6 +26,9 @@ typedef struct
 	Oid			lastoid;
 	SPITupleTable *tuptable;	/* tuptable currently being built */
 
+	/* subtransaction in which current Executor call was started */
+	SubTransactionId execSubid;
+
 	/* resources of this execution context */
 	slist_head	tuptables;		/* list of all live SPITupleTables */
 	MemoryContext procCxt;		/* procedure context */
@@ -33,6 +36,10 @@ typedef struct
 	MemoryContext savedcxt;		/* context of SPI_connect's caller */
 	SubTransactionId connectSubid;	/* ID of connecting subtransaction */
 	QueryEnvironment *queryEnv; /* query environment setup for SPI level */
+
+	/* transaction management support */
+	bool		atomic;			/* atomic execution context, does not allow transactions */
+	bool		internal_xact;	/* SPI-managed transaction boundary, skip cleanup */
 } _SPI_connection;
 
 /*
diff --git a/src/include/executor/tablefunc.h b/src/include/executor/tablefunc.h
index a24a555b75..29c546f83e 100644
--- a/src/include/executor/tablefunc.h
+++ b/src/include/executor/tablefunc.h
@@ -3,7 +3,7 @@
  * tablefunc.h
  *				interface for TableFunc executor node
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/tablefunc.h
@@ -53,11 +53,11 @@ typedef struct TableFuncRoutine
 {
 	void		(*InitOpaque) (struct TableFuncScanState *state, int natts);
 	void		(*SetDocument) (struct TableFuncScanState *state, Datum value);
-	void		(*SetNamespace) (struct TableFuncScanState *state, char *name,
-								 char *uri);
-	void		(*SetRowFilter) (struct TableFuncScanState *state, char *path);
+	void		(*SetNamespace) (struct TableFuncScanState *state, const char *name,
+								 const char *uri);
+	void		(*SetRowFilter) (struct TableFuncScanState *state, const char *path);
 	void		(*SetColumnFilter) (struct TableFuncScanState *state,
-									char *path, int colnum);
+									const char *path, int colnum);
 	bool		(*FetchRow) (struct TableFuncScanState *state);
 	Datum		(*GetValue) (struct TableFuncScanState *state, int colnum,
 							 Oid typid, int32 typmod, bool *isnull);
diff --git a/src/include/executor/tqueue.h b/src/include/executor/tqueue.h
index a717ac6184..0fe3639252 100644
--- a/src/include/executor/tqueue.h
+++ b/src/include/executor/tqueue.h
@@ -3,7 +3,7 @@
  * tqueue.h
  *	  Use shm_mq to send & receive tuples between parallel backends
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/tqueue.h
@@ -24,8 +24,7 @@ typedef struct TupleQueueReader TupleQueueReader;
 extern DestReceiver *CreateTupleQueueDestReceiver(shm_mq_handle *handle);
 
 /* Use these to receive tuples from a shm_mq. */
-extern TupleQueueReader *CreateTupleQueueReader(shm_mq_handle *handle,
-					   TupleDesc tupledesc);
+extern TupleQueueReader *CreateTupleQueueReader(shm_mq_handle *handle);
 extern void DestroyTupleQueueReader(TupleQueueReader *reader);
 extern HeapTuple TupleQueueReaderNext(TupleQueueReader *reader,
 					 bool nowait, bool *done);
diff --git a/src/include/executor/tstoreReceiver.h b/src/include/executor/tstoreReceiver.h
index ac4de3a663..5e2f83123c 100644
--- a/src/include/executor/tstoreReceiver.h
+++ b/src/include/executor/tstoreReceiver.h
@@ -4,7 +4,7 @@
  *	  prototypes for tstoreReceiver.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/tstoreReceiver.h
diff --git a/src/include/executor/tuptable.h b/src/include/executor/tuptable.h
index 55f4cce4ee..0642a3ada5 100644
--- a/src/include/executor/tuptable.h
+++ b/src/include/executor/tuptable.h
@@ -4,7 +4,7 @@
  *	  tuple table support stuff
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/executor/tuptable.h
@@ -68,7 +68,7 @@
  * A TupleTableSlot can also be "empty", holding no valid data.  This is
  * the only valid state for a freshly-created slot that has not yet had a
  * tuple descriptor assigned to it.  In this state, tts_isempty must be
- * TRUE, tts_shouldFree FALSE, tts_tuple NULL, tts_buffer InvalidBuffer,
+ * true, tts_shouldFree false, tts_tuple NULL, tts_buffer InvalidBuffer,
  * and tts_nvalid zero.
  *
  * The tupleDescriptor is simply referenced, not copied, by the TupleTableSlot
@@ -126,7 +126,8 @@ typedef struct TupleTableSlot
 	bool	   *tts_isnull;		/* current per-attribute isnull flags */
 	MinimalTuple tts_mintuple;	/* minimal tuple, or NULL if none */
 	HeapTupleData tts_minhdr;	/* workspace for minimal-tuple-only case */
-	long		tts_off;		/* saved state for slot_deform_tuple */
+	uint32		tts_off;		/* saved state for slot_deform_tuple */
+	bool		tts_fixedTupleDescriptor; /* descriptor can't be changed */
 } TupleTableSlot;
 
 #define TTS_HAS_PHYSICAL_TUPLE(slot)  \
@@ -139,8 +140,8 @@ typedef struct TupleTableSlot
 	((slot) == NULL || (slot)->tts_isempty)
 
 /* in executor/execTuples.c */
-extern TupleTableSlot *MakeTupleTableSlot(void);
-extern TupleTableSlot *ExecAllocTableSlot(List **tupleTable);
+extern TupleTableSlot *MakeTupleTableSlot(TupleDesc desc);
+extern TupleTableSlot *ExecAllocTableSlot(List **tupleTable, TupleDesc desc);
 extern void ExecResetTupleTable(List *tupleTable, bool shouldFree);
 extern TupleTableSlot *MakeSingleTupleTableSlot(TupleDesc tupdesc);
 extern void ExecDropSingleTupleTableSlot(TupleTableSlot *slot);
diff --git a/src/include/fe_utils/connect.h b/src/include/fe_utils/connect.h
new file mode 100644
index 0000000000..fa293d2458
--- /dev/null
+++ b/src/include/fe_utils/connect.h
@@ -0,0 +1,28 @@
+/*-------------------------------------------------------------------------
+ *
+ * Interfaces in support of FE/BE connections.
+ *
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/fe_utils/connect.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef CONNECT_H
+#define CONNECT_H
+
+/*
+ * This SQL statement installs an always-secure search path, so malicious
+ * users can't take control.  CREATE of an unqualified name will fail, because
+ * this selects no creation schema.  This does not demote pg_temp, so it is
+ * suitable where we control the entire FE/BE connection but not suitable in
+ * SECURITY DEFINER functions.  This is portable to PostgreSQL 7.3, which
+ * introduced schemas.  When connected to an older version from code that
+ * might work with the old server, skip this.
+ */
+#define ALWAYS_SECURE_SEARCH_PATH_SQL \
+	"SELECT pg_catalog.set_config('search_path', '', false)"
+
+#endif							/* CONNECT_H */
diff --git a/src/include/fe_utils/mbprint.h b/src/include/fe_utils/mbprint.h
index e3cfaf3ddd..7d8019c203 100644
--- a/src/include/fe_utils/mbprint.h
+++ b/src/include/fe_utils/mbprint.h
@@ -3,7 +3,7 @@
  * Multibyte character printing support for frontend code
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/mbprint.h
diff --git a/src/include/fe_utils/print.h b/src/include/fe_utils/print.h
index 36b89e7d57..83320d06bd 100644
--- a/src/include/fe_utils/print.h
+++ b/src/include/fe_utils/print.h
@@ -3,7 +3,7 @@
  * Query-result printing support for frontend code
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/print.h
diff --git a/src/include/fe_utils/psqlscan.h b/src/include/fe_utils/psqlscan.h
index c199a2917e..2d58c071f3 100644
--- a/src/include/fe_utils/psqlscan.h
+++ b/src/include/fe_utils/psqlscan.h
@@ -10,7 +10,7 @@
  * backslash commands.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/psqlscan.h
diff --git a/src/include/fe_utils/psqlscan_int.h b/src/include/fe_utils/psqlscan_int.h
index c70ff29f4e..0be0db69ab 100644
--- a/src/include/fe_utils/psqlscan_int.h
+++ b/src/include/fe_utils/psqlscan_int.h
@@ -34,7 +34,7 @@
  * same flex version, or if they don't use the same flex options.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/psqlscan_int.h
@@ -142,5 +142,7 @@ extern char *psqlscan_extract_substring(PsqlScanState state,
 extern void psqlscan_escape_variable(PsqlScanState state,
 						 const char *txt, int len,
 						 PsqlScanQuoteType quote);
+extern void psqlscan_test_variable(PsqlScanState state,
+					   const char *txt, int len);
 
 #endif							/* PSQLSCAN_INT_H */
diff --git a/src/include/fe_utils/simple_list.h b/src/include/fe_utils/simple_list.h
index 97bb34f191..9785489128 100644
--- a/src/include/fe_utils/simple_list.h
+++ b/src/include/fe_utils/simple_list.h
@@ -7,7 +7,7 @@
  * it's all we need in, eg, pg_dump.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/simple_list.h
diff --git a/src/include/fe_utils/string_utils.h b/src/include/fe_utils/string_utils.h
index bc6b87d6f1..9a311e0f0f 100644
--- a/src/include/fe_utils/string_utils.h
+++ b/src/include/fe_utils/string_utils.h
@@ -6,7 +6,7 @@
  * assorted contexts.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fe_utils/string_utils.h
diff --git a/src/include/fmgr.h b/src/include/fmgr.h
index 0216965bfc..69786bfca8 100644
--- a/src/include/fmgr.h
+++ b/src/include/fmgr.h
@@ -8,7 +8,7 @@
  * or call fmgr-callable functions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/fmgr.h
@@ -325,6 +325,7 @@ extern struct varlena *pg_detoast_datum_packed(struct varlena *datum);
 #define PG_RETURN_FLOAT4(x)  return Float4GetDatum(x)
 #define PG_RETURN_FLOAT8(x)  return Float8GetDatum(x)
 #define PG_RETURN_INT64(x)	 return Int64GetDatum(x)
+#define PG_RETURN_UINT64(x)  return UInt64GetDatum(x)
 /* RETURN macros for other pass-by-ref types will typically look like this: */
 #define PG_RETURN_BYTEA_P(x)   PG_RETURN_POINTER(x)
 #define PG_RETURN_TEXT_P(x)    PG_RETURN_POINTER(x)
@@ -697,6 +698,7 @@ extern int AggCheckCallContext(FunctionCallInfo fcinfo,
 					MemoryContext *aggcontext);
 extern fmAggrefPtr AggGetAggref(FunctionCallInfo fcinfo);
 extern MemoryContext AggGetTempMemoryContext(FunctionCallInfo fcinfo);
+extern bool AggStateIsShared(FunctionCallInfo fcinfo);
 extern void AggRegisterCallback(FunctionCallInfo fcinfo,
 					fmExprContextCallbackFunction func,
 					Datum arg);
@@ -728,19 +730,4 @@ extern PGDLLIMPORT fmgr_hook_type fmgr_hook;
 #define FmgrHookIsNeeded(fn_oid)							\
 	(!needs_fmgr_hook ? false : (*needs_fmgr_hook)(fn_oid))
 
-/*
- * !!! OLD INTERFACE !!!
- *
- * fmgr() is the only remaining vestige of the old-style caller support
- * functions.  It's no longer used anywhere in the Postgres distribution,
- * but we should leave it around for a release or two to ease the transition
- * for user-supplied C functions.  OidFunctionCallN() replaces it for new
- * code.
- */
-
-/*
- * DEPRECATED, DO NOT USE IN NEW CODE
- */
-extern char *fmgr(Oid procedureId,...);
-
 #endif							/* FMGR_H */
diff --git a/src/include/foreign/fdwapi.h b/src/include/foreign/fdwapi.h
index e391f20fb8..e88fee301f 100644
--- a/src/include/foreign/fdwapi.h
+++ b/src/include/foreign/fdwapi.h
@@ -3,7 +3,7 @@
  * fdwapi.h
  *	  API for foreign-data wrappers
  *
- * Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * src/include/foreign/fdwapi.h
  *
@@ -148,6 +148,9 @@ typedef Size (*EstimateDSMForeignScan_function) (ForeignScanState *node,
 typedef void (*InitializeDSMForeignScan_function) (ForeignScanState *node,
 												   ParallelContext *pcxt,
 												   void *coordinate);
+typedef void (*ReInitializeDSMForeignScan_function) (ForeignScanState *node,
+													 ParallelContext *pcxt,
+													 void *coordinate);
 typedef void (*InitializeWorkerForeignScan_function) (ForeignScanState *node,
 													  shm_toc *toc,
 													  void *coordinate);
@@ -155,6 +158,9 @@ typedef void (*ShutdownForeignScan_function) (ForeignScanState *node);
 typedef bool (*IsForeignScanParallelSafe_function) (PlannerInfo *root,
 													RelOptInfo *rel,
 													RangeTblEntry *rte);
+typedef List *(*ReparameterizeForeignPathByChild_function) (PlannerInfo *root,
+															List *fdw_private,
+															RelOptInfo *child_rel);
 
 /*
  * FdwRoutine is the struct returned by a foreign-data wrapper's handler
@@ -224,8 +230,12 @@ typedef struct FdwRoutine
 	IsForeignScanParallelSafe_function IsForeignScanParallelSafe;
 	EstimateDSMForeignScan_function EstimateDSMForeignScan;
 	InitializeDSMForeignScan_function InitializeDSMForeignScan;
+	ReInitializeDSMForeignScan_function ReInitializeDSMForeignScan;
 	InitializeWorkerForeignScan_function InitializeWorkerForeignScan;
 	ShutdownForeignScan_function ShutdownForeignScan;
+
+	/* Support functions for path reparameterization. */
+	ReparameterizeForeignPathByChild_function ReparameterizeForeignPathByChild;
 } FdwRoutine;
 
 
diff --git a/src/include/foreign/foreign.h b/src/include/foreign/foreign.h
index 2f4c569d1d..3ca12e64d2 100644
--- a/src/include/foreign/foreign.h
+++ b/src/include/foreign/foreign.h
@@ -4,7 +4,7 @@
  *	  support for foreign-data wrappers, servers and user mappings.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/foreign/foreign.h
  *
diff --git a/src/include/funcapi.h b/src/include/funcapi.h
index 951af2aad3..c2da2eb157 100644
--- a/src/include/funcapi.h
+++ b/src/include/funcapi.h
@@ -2,12 +2,13 @@
  *
  * funcapi.h
  *	  Definitions for functions which return composite type and/or sets
+ *	  or work on VARIADIC inputs.
  *
  * This file must be included by all Postgres modules that either define
  * or call FUNCAPI-callable functions or macros.
  *
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/include/funcapi.h
  *
@@ -143,6 +144,10 @@ typedef struct FuncCallContext
  *		get_call_result_type.  Note: the cases in which rowtypes cannot be
  *		determined are different from the cases for get_call_result_type.
  *		Do *not* use this if you can use one of the others.
+ *
+ * See also get_expr_result_tupdesc(), which is a convenient wrapper around
+ * get_expr_result_type() for use when the caller only cares about
+ * determinable-rowtype cases.
  *----------
  */
 
@@ -151,6 +156,7 @@ typedef enum TypeFuncClass
 {
 	TYPEFUNC_SCALAR,			/* scalar result type */
 	TYPEFUNC_COMPOSITE,			/* determinable rowtype result */
+	TYPEFUNC_COMPOSITE_DOMAIN,	/* domain over determinable rowtype result */
 	TYPEFUNC_RECORD,			/* indeterminate rowtype result */
 	TYPEFUNC_OTHER				/* bogus type, eg pseudotype */
 } TypeFuncClass;
@@ -165,6 +171,8 @@ extern TypeFuncClass get_func_result_type(Oid functionId,
 					 Oid *resultTypeId,
 					 TupleDesc *resultTupleDesc);
 
+extern TupleDesc get_expr_result_tupdesc(Node *expr, bool noError);
+
 extern bool resolve_polymorphic_argtypes(int numargs, Oid *argtypes,
 							 char *argmodes,
 							 Node *call_expr);
@@ -315,4 +323,26 @@ extern void end_MultiFuncCall(PG_FUNCTION_ARGS, FuncCallContext *funcctx);
 		PG_RETURN_NULL(); \
 	} while (0)
 
+/*----------
+ *	Support to ease writing of functions dealing with VARIADIC inputs
+ *----------
+ *
+ * This function extracts a set of argument values, types and NULL markers
+ * for a given input function. This returns a set of data:
+ * - **values includes the set of Datum values extracted.
+ * - **types the data type OID for each element.
+ * - **nulls tracks if an element is NULL.
+ *
+ * variadic_start indicates the argument number where the VARIADIC argument
+ * starts.
+ * convert_unknown set to true will enforce the conversion of arguments
+ * with unknown data type to text.
+ *
+ * The return result is the number of elements stored, or -1 in the case of
+ * "VARIADIC NULL".
+ */
+extern int extract_variadic_args(FunctionCallInfo fcinfo, int variadic_start,
+					  bool convert_unknown, Datum **values,
+					  Oid **types, bool **nulls);
+
 #endif							/* FUNCAPI_H */
diff --git a/src/include/getaddrinfo.h b/src/include/getaddrinfo.h
index 3dcfc1fa25..1b460a3e5f 100644
--- a/src/include/getaddrinfo.h
+++ b/src/include/getaddrinfo.h
@@ -13,7 +13,7 @@
  * This code will also work on platforms where struct addrinfo is defined
  * in the system headers but no getaddrinfo() can be located.
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/getaddrinfo.h
  *
diff --git a/src/include/getopt_long.h b/src/include/getopt_long.h
index c55d45348a..a9013b40f7 100644
--- a/src/include/getopt_long.h
+++ b/src/include/getopt_long.h
@@ -2,7 +2,7 @@
  * Portions Copyright (c) 1987, 1993, 1994
  * The Regents of the University of California.  All rights reserved.
  *
- * Portions Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/getopt_long.h
  */
diff --git a/src/include/lib/binaryheap.h b/src/include/lib/binaryheap.h
index da7504bd55..9399e0d60b 100644
--- a/src/include/lib/binaryheap.h
+++ b/src/include/lib/binaryheap.h
@@ -3,7 +3,7 @@
  *
  * A simple binary heap implementation
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * src/include/lib/binaryheap.h
  */
diff --git a/src/include/lib/bipartite_match.h b/src/include/lib/bipartite_match.h
index 8f580bbd97..c184c0d38e 100644
--- a/src/include/lib/bipartite_match.h
+++ b/src/include/lib/bipartite_match.h
@@ -1,7 +1,7 @@
 /*
  * bipartite_match.h
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * src/include/lib/bipartite_match.h
  */
diff --git a/src/include/lib/dshash.h b/src/include/lib/dshash.h
new file mode 100644
index 0000000000..afee6516af
--- /dev/null
+++ b/src/include/lib/dshash.h
@@ -0,0 +1,90 @@
+/*-------------------------------------------------------------------------
+ *
+ * dshash.h
+ *	  Concurrent hash tables backed by dynamic shared memory areas.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/include/lib/dshash.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef DSHASH_H
+#define DSHASH_H
+
+#include "utils/dsa.h"
+
+/* The opaque type representing a hash table. */
+struct dshash_table;
+typedef struct dshash_table dshash_table;
+
+/* A handle for a dshash_table which can be shared with other processes. */
+typedef dsa_pointer dshash_table_handle;
+
+/* The type for hash values. */
+typedef uint32 dshash_hash;
+
+/* A function type for comparing keys. */
+typedef int (*dshash_compare_function) (const void *a, const void *b,
+										size_t size, void *arg);
+
+/* A function type for computing hash values for keys. */
+typedef dshash_hash (*dshash_hash_function) (const void *v, size_t size,
+											 void *arg);
+
+/*
+ * The set of parameters needed to create or attach to a hash table.  The
+ * members tranche_id and tranche_name do not need to be initialized when
+ * attaching to an existing hash table.
+ *
+ * Compare and hash functions must be supplied even when attaching, because we
+ * can't safely share function pointers between backends in general.  Either
+ * the arg variants or the non-arg variants should be supplied; the other
+ * function pointers should be NULL.  If the arg varants are supplied then the
+ * user data pointer supplied to the create and attach functions will be
+ * passed to the hash and compare functions.
+ */
+typedef struct dshash_parameters
+{
+	size_t		key_size;		/* Size of the key (initial bytes of entry) */
+	size_t		entry_size;		/* Total size of entry */
+	dshash_compare_function compare_function;	/* Compare function */
+	dshash_hash_function hash_function; /* Hash function */
+	int			tranche_id;		/* The tranche ID to use for locks */
+} dshash_parameters;
+
+/* Forward declaration of private types for use only by dht.c. */
+struct dshash_table_item;
+typedef struct dshash_table_item dshash_table_item;
+
+/* Creating, sharing and destroying from hash tables. */
+extern dshash_table *dshash_create(dsa_area *area,
+			  const dshash_parameters *params,
+			  void *arg);
+extern dshash_table *dshash_attach(dsa_area *area,
+			  const dshash_parameters *params,
+			  dshash_table_handle handle,
+			  void *arg);
+extern void dshash_detach(dshash_table *hash_table);
+extern dshash_table_handle dshash_get_hash_table_handle(dshash_table *hash_table);
+extern void dshash_destroy(dshash_table *hash_table);
+
+/* Finding, creating, deleting entries. */
+extern void *dshash_find(dshash_table *hash_table,
+			const void *key, bool exclusive);
+extern void *dshash_find_or_insert(dshash_table *hash_table,
+					  const void *key, bool *found);
+extern bool dshash_delete_key(dshash_table *hash_table, const void *key);
+extern void dshash_delete_entry(dshash_table *hash_table, void *entry);
+extern void dshash_release_lock(dshash_table *hash_table, void *entry);
+
+/* Convenience hash and compare functions wrapping memcmp and tag_hash. */
+extern int	dshash_memcmp(const void *a, const void *b, size_t size, void *arg);
+extern dshash_hash dshash_memhash(const void *v, size_t size, void *arg);
+
+/* Debugging support. */
+extern void dshash_dump(dshash_table *hash_table);
+
+#endif							/* DSHASH_H */
diff --git a/src/include/lib/hyperloglog.h b/src/include/lib/hyperloglog.h
index 7a249cd252..f735111f91 100644
--- a/src/include/lib/hyperloglog.h
+++ b/src/include/lib/hyperloglog.h
@@ -3,7 +3,7 @@
  *
  * A simple HyperLogLog cardinality estimator implementation
  *
- * Portions Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * Based on Hideaki Ohno's C++ implementation.  The copyright terms of Ohno's
  * original version (the MIT license) follow.
diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h
index e5ac5c218a..fc9d6b3ee4 100644
--- a/src/include/lib/ilist.h
+++ b/src/include/lib/ilist.h
@@ -96,7 +96,7 @@
  * }
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/lib/knapsack.h b/src/include/lib/knapsack.h
index 4485738e2a..9f17004d48 100644
--- a/src/include/lib/knapsack.h
+++ b/src/include/lib/knapsack.h
@@ -1,14 +1,13 @@
 /*
  * knapsack.h
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  * src/include/lib/knapsack.h
  */
 #ifndef KNAPSACK_H
 #define KNAPSACK_H
 
-#include "postgres.h"
 #include "nodes/bitmapset.h"
 
 extern Bitmapset *DiscreteKnapsack(int max_weight, int num_items,
diff --git a/src/include/lib/pairingheap.h b/src/include/lib/pairingheap.h
index e3a75f51f7..9d3de79601 100644
--- a/src/include/lib/pairingheap.h
+++ b/src/include/lib/pairingheap.h
@@ -3,7 +3,7 @@
  *
  * A Pairing Heap implementation
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * src/include/lib/pairingheap.h
  */
diff --git a/src/include/lib/rbtree.h b/src/include/lib/rbtree.h
index a7183bb0b4..c46db47a75 100644
--- a/src/include/lib/rbtree.h
+++ b/src/include/lib/rbtree.h
@@ -3,7 +3,7 @@
  * rbtree.h
  *	  interface for PostgreSQL generic Red-Black binary tree package
  *
- * Copyright (c) 2009-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2009-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/lib/rbtree.h
@@ -35,9 +35,7 @@ typedef struct RBTree RBTree;
 typedef enum RBOrderControl
 {
 	LeftRightWalk,				/* inorder: left child, node, right child */
-	RightLeftWalk,				/* reverse inorder: right, node, left */
-	DirectWalk,					/* preorder: node, left child, right child */
-	InvertedWalk				/* postorder: left child, right child, node */
+	RightLeftWalk				/* reverse inorder: right, node, left */
 } RBOrderControl;
 
 /*
@@ -52,7 +50,6 @@ struct RBTreeIterator
 	RBTree	   *rb;
 	RBNode	   *(*iterate) (RBTreeIterator *iter);
 	RBNode	   *last_visited;
-	char		next_step;
 	bool		is_over;
 };
 
diff --git a/src/include/lib/simplehash.h b/src/include/lib/simplehash.h
index c5af5b96a7..5273d49460 100644
--- a/src/include/lib/simplehash.h
+++ b/src/include/lib/simplehash.h
@@ -174,6 +174,10 @@ SH_SCOPE void SH_STAT(SH_TYPE * tb);
 #ifndef SH_GROW_MAX_MOVE
 #define SH_GROW_MAX_MOVE 150
 #endif
+#ifndef SH_GROW_MIN_FILLFACTOR
+/* but do not grow due to SH_GROW_MAX_* if below */
+#define SH_GROW_MIN_FILLFACTOR 0.1
+#endif
 
 #ifdef SH_STORE_HASH
 #define SH_COMPARE_KEYS(tb, ahash, akey, b) (ahash == SH_GET_HASH(tb, b) && SH_EQUAL(tb, b->SH_KEY, akey))
@@ -574,9 +578,12 @@ SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found)
 				 * hashtables, grow the hashtable if collisions would require
 				 * us to move a lot of entries.  The most likely cause of such
 				 * imbalance is filling a (currently) small table, from a
-				 * currently big one, in hash-table order.
+				 * currently big one, in hash-table order.  Don't grow if the
+				 * hashtable would be too empty, to prevent quick space
+				 * explosion for some weird edge cases.
 				 */
-				if (++emptydist > SH_GROW_MAX_MOVE)
+				if (unlikely(++emptydist > SH_GROW_MAX_MOVE) &&
+					((double) tb->members / tb->size) >= SH_GROW_MIN_FILLFACTOR)
 				{
 					tb->grow_threshold = 0;
 					goto restart;
@@ -621,9 +628,12 @@ SH_INSERT(SH_TYPE * tb, SH_KEY_TYPE key, bool *found)
 		 * To avoid negative consequences from overly imbalanced hashtables,
 		 * grow the hashtable if collisions lead to large runs. The most
 		 * likely cause of such imbalance is filling a (currently) small
-		 * table, from a currently big one, in hash-table order.
+		 * table, from a currently big one, in hash-table order.  Don't grow
+		 * if the hashtable would be too empty, to prevent quick space
+		 * explosion for some weird edge cases.
 		 */
-		if (insertdist > SH_GROW_MAX_DIB)
+		if (unlikely(insertdist > SH_GROW_MAX_DIB) &&
+			((double) tb->members / tb->size) >= SH_GROW_MIN_FILLFACTOR)
 		{
 			tb->grow_threshold = 0;
 			goto restart;
@@ -923,6 +933,7 @@ SH_STAT(SH_TYPE * tb)
 #undef SH_MAX_FILLFACTOR
 #undef SH_GROW_MAX_DIB
 #undef SH_GROW_MAX_MOVE
+#undef SH_GROW_MIN_FILLFACTOR
 #undef SH_MAX_SIZE
 
 /* types */
diff --git a/src/include/lib/stringinfo.h b/src/include/lib/stringinfo.h
index 9694ea3f21..8551237fc6 100644
--- a/src/include/lib/stringinfo.h
+++ b/src/include/lib/stringinfo.h
@@ -7,7 +7,7 @@
  * It can be used to buffer either ordinary C strings (null-terminated text)
  * or arbitrary binary data.  All storage is allocated with palloc().
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/lib/stringinfo.h
@@ -143,6 +143,14 @@ extern void appendStringInfoSpaces(StringInfo str, int count);
 extern void appendBinaryStringInfo(StringInfo str,
 					   const char *data, int datalen);
 
+/*------------------------
+ * appendBinaryStringInfoNT
+ * Append arbitrary binary data to a StringInfo, allocating more space
+ * if necessary. Does not ensure a trailing null-byte exists.
+ */
+extern void appendBinaryStringInfoNT(StringInfo str,
+						 const char *data, int datalen);
+
 /*------------------------
  * enlargeStringInfo
  * Make sure a StringInfo's buffer can hold at least 'needed' more bytes.
diff --git a/src/include/libpq/auth.h b/src/include/libpq/auth.h
index 871cc03add..e8a1dc14ff 100644
--- a/src/include/libpq/auth.h
+++ b/src/include/libpq/auth.h
@@ -4,7 +4,7 @@
  *	  Definitions for network authentication routines
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/auth.h
diff --git a/src/include/libpq/be-fsstubs.h b/src/include/libpq/be-fsstubs.h
index 96bcaa0f08..ed31e54323 100644
--- a/src/include/libpq/be-fsstubs.h
+++ b/src/include/libpq/be-fsstubs.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/be-fsstubs.h
@@ -14,11 +14,6 @@
 #ifndef BE_FSSTUBS_H
 #define BE_FSSTUBS_H
 
-/*
- * compatibility option for access control
- */
-extern bool lo_compat_privileges;
-
 /*
  * These are not fmgr-callable, but are available to C code.
  * Probably these should have had the underscore-free names,
diff --git a/src/include/libpq/crypt.h b/src/include/libpq/crypt.h
index 9bad67c890..4279a4a9ed 100644
--- a/src/include/libpq/crypt.h
+++ b/src/include/libpq/crypt.h
@@ -3,7 +3,7 @@
  * crypt.h
  *	  Interface to libpq/crypt.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/crypt.h
diff --git a/src/include/libpq/hba.h b/src/include/libpq/hba.h
index 07d92d4f9f..5f68f4c666 100644
--- a/src/include/libpq/hba.h
+++ b/src/include/libpq/hba.h
@@ -75,11 +75,13 @@ typedef struct HbaLine
 	char	   *pamservice;
 	bool		pam_use_hostname;
 	bool		ldaptls;
+	char	   *ldapscheme;
 	char	   *ldapserver;
 	int			ldapport;
 	char	   *ldapbinddn;
 	char	   *ldapbindpasswd;
 	char	   *ldapsearchattribute;
+	char	   *ldapsearchfilter;
 	char	   *ldapbasedn;
 	int			ldapscope;
 	char	   *ldapprefix;
diff --git a/src/include/libpq/ifaddr.h b/src/include/libpq/ifaddr.h
index be19ff8823..1d35597a7f 100644
--- a/src/include/libpq/ifaddr.h
+++ b/src/include/libpq/ifaddr.h
@@ -3,7 +3,7 @@
  * ifaddr.h
  *	  IP netmask calculations, and enumerating network interfaces.
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/libpq/ifaddr.h
  *
diff --git a/src/include/libpq/libpq-be.h b/src/include/libpq/libpq-be.h
index 7bde744d51..7698cd1f88 100644
--- a/src/include/libpq/libpq-be.h
+++ b/src/include/libpq/libpq-be.h
@@ -8,7 +8,7 @@
  *	  Structs that need to be client-visible are in pqcomm.h.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/libpq-be.h
@@ -193,22 +193,89 @@ typedef struct Port
 } Port;
 
 #ifdef USE_SSL
+/*
+ *	Hardcoded DH parameters, used in ephemeral DH keying.  (See also
+ *	README.SSL for more details on EDH.)
+ *
+ *	If you want to create your own hardcoded DH parameters
+ *	for fun and profit, review "Assigned Number for SKIP
+ *	Protocols" (http://www.skip-vpn.org/spec/numbers.html)
+ *	for suggestions.
+ */
+#define FILE_DH2048 \
+"-----BEGIN DH PARAMETERS-----\n\
+MIIBCAKCAQEA9kJXtwh/CBdyorrWqULzBej5UxE5T7bxbrlLOCDaAadWoxTpj0BV\n\
+89AHxstDqZSt90xkhkn4DIO9ZekX1KHTUPj1WV/cdlJPPT2N286Z4VeSWc39uK50\n\
+T8X8dryDxUcwYc58yWb/Ffm7/ZFexwGq01uejaClcjrUGvC/RgBYK+X0iP1YTknb\n\
+zSC0neSRBzZrM2w4DUUdD3yIsxx8Wy2O9vPJI8BD8KVbGI2Ou1WMuF040zT9fBdX\n\
+Q6MdGGzeMyEstSr/POGxKUAYEY18hKcKctaGxAMZyAcpesqVDNmWn6vQClCbAkbT\n\
+CD1mpF1Bn5x8vYlLIhkmuquiXsNV6TILOwIBAg==\n\
+-----END DH PARAMETERS-----\n"
+
 /*
  * These functions are implemented by the glue code specific to each
  * SSL implementation (e.g. be-secure-openssl.c)
  */
+
+/*
+ * Initialize global SSL context.
+ *
+ * If isServerStart is true, report any errors as FATAL (so we don't return).
+ * Otherwise, log errors at LOG level and return -1 to indicate trouble,
+ * preserving the old SSL state if any.  Returns 0 if OK.
+ */
 extern int	be_tls_init(bool isServerStart);
+
+/*
+ * Destroy global SSL context, if any.
+ */
 extern void be_tls_destroy(void);
+
+/*
+ * Attempt to negotiate SSL connection.
+ */
 extern int	be_tls_open_server(Port *port);
+
+/*
+ * Close SSL connection.
+ */
 extern void be_tls_close(Port *port);
+
+/*
+ * Read data from a secure connection.
+ */
 extern ssize_t be_tls_read(Port *port, void *ptr, size_t len, int *waitfor);
+
+/*
+ * Write data to a secure connection.
+ */
 extern ssize_t be_tls_write(Port *port, void *ptr, size_t len, int *waitfor);
 
+/*
+ * Return information about the SSL connection.
+ */
 extern int	be_tls_get_cipher_bits(Port *port);
 extern bool be_tls_get_compression(Port *port);
-extern void be_tls_get_version(Port *port, char *ptr, size_t len);
-extern void be_tls_get_cipher(Port *port, char *ptr, size_t len);
+extern const char *be_tls_get_version(Port *port);
+extern const char *be_tls_get_cipher(Port *port);
 extern void be_tls_get_peerdn_name(Port *port, char *ptr, size_t len);
+
+/*
+ * Get the expected TLS Finished message information from the client, useful
+ * for authorization when doing channel binding.
+ *
+ * Result is a palloc'd copy of the TLS Finished message with its size.
+ */
+extern char *be_tls_get_peer_finished(Port *port, size_t *len);
+
+/*
+ * Get the server certificate hash for SCRAM channel binding type
+ * tls-server-end-point.
+ *
+ * The result is a palloc'd hash of the server certificate with its
+ * size, and NULL if there is no certificate available.
+ */
+extern char *be_tls_get_certificate_hash(Port *port, size_t *len);
 #endif
 
 extern ProtocolVersion FrontendProtocol;
diff --git a/src/include/libpq/libpq-fs.h b/src/include/libpq/libpq-fs.h
index ce4b2a1892..e63d11ef19 100644
--- a/src/include/libpq/libpq-fs.h
+++ b/src/include/libpq/libpq-fs.h
@@ -4,7 +4,7 @@
  *	  definitions for using Inversion file system routines (ie, large objects)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/libpq-fs.h
diff --git a/src/include/libpq/libpq.h b/src/include/libpq/libpq.h
index fd2dd5853c..255222acd7 100644
--- a/src/include/libpq/libpq.h
+++ b/src/include/libpq/libpq.h
@@ -4,7 +4,7 @@
  *	  POSTGRES LIBPQ buffer structure definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/libpq.h
@@ -90,6 +90,7 @@ extern ssize_t secure_read(Port *port, void *ptr, size_t len);
 extern ssize_t secure_write(Port *port, void *ptr, size_t len);
 extern ssize_t secure_raw_read(Port *port, void *ptr, size_t len);
 extern ssize_t secure_raw_write(Port *port, const void *ptr, size_t len);
+extern bool check_ssl_key_file_permissions(const char *ssl_key_file, bool isServerStart);
 
 extern bool ssl_loaded_verify_locations;
 
diff --git a/src/include/libpq/pqcomm.h b/src/include/libpq/pqcomm.h
index 10c7434c41..cc0e0b32c7 100644
--- a/src/include/libpq/pqcomm.h
+++ b/src/include/libpq/pqcomm.h
@@ -6,7 +6,7 @@
  * NOTE: for historical reasons, this does not correspond to pqcomm.c.
  * pqcomm.c's routines are declared in libpq.h.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/pqcomm.h
diff --git a/src/include/libpq/pqformat.h b/src/include/libpq/pqformat.h
index 32112547a0..57bde691e8 100644
--- a/src/include/libpq/pqformat.h
+++ b/src/include/libpq/pqformat.h
@@ -3,7 +3,7 @@
  * pqformat.h
  *		Definitions for formatting and parsing frontend/backend messages
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/pqformat.h
@@ -14,20 +14,183 @@
 #define PQFORMAT_H
 
 #include "lib/stringinfo.h"
+#include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
 
 extern void pq_beginmessage(StringInfo buf, char msgtype);
-extern void pq_sendbyte(StringInfo buf, int byt);
+extern void pq_beginmessage_reuse(StringInfo buf, char msgtype);
+extern void pq_endmessage(StringInfo buf);
+extern void pq_endmessage_reuse(StringInfo buf);
+
 extern void pq_sendbytes(StringInfo buf, const char *data, int datalen);
 extern void pq_sendcountedtext(StringInfo buf, const char *str, int slen,
 				   bool countincludesself);
 extern void pq_sendtext(StringInfo buf, const char *str, int slen);
 extern void pq_sendstring(StringInfo buf, const char *str);
 extern void pq_send_ascii_string(StringInfo buf, const char *str);
-extern void pq_sendint(StringInfo buf, int i, int b);
-extern void pq_sendint64(StringInfo buf, int64 i);
 extern void pq_sendfloat4(StringInfo buf, float4 f);
 extern void pq_sendfloat8(StringInfo buf, float8 f);
-extern void pq_endmessage(StringInfo buf);
+
+extern void pq_sendfloat4(StringInfo buf, float4 f);
+extern void pq_sendfloat8(StringInfo buf, float8 f);
+
+/*
+ * Append an int8 to a StringInfo buffer, which already has enough space
+ * preallocated.
+ *
+ * The use of pg_restrict allows the compiler to optimize the code based on
+ * the assumption that buf, buf->len, buf->data and *buf->data don't
+ * overlap. Without the annotation buf->len etc cannot be kept in a register
+ * over subsequent pq_writeintN calls.
+ *
+ * The use of StringInfoData * rather than StringInfo is due to MSVC being
+ * overly picky and demanding a * before a restrict.
+ */
+static inline void
+pq_writeint8(StringInfoData *pg_restrict buf, int8 i)
+{
+	int8		ni = i;
+
+	Assert(buf->len + (int) sizeof(int8) <= buf->maxlen);
+	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int8));
+	buf->len += sizeof(int8);
+}
+
+/*
+ * Append an int16 to a StringInfo buffer, which already has enough space
+ * preallocated.
+ */
+static inline void
+pq_writeint16(StringInfoData *pg_restrict buf, int16 i)
+{
+	int16		ni = pg_hton16(i);
+
+	Assert(buf->len + (int) sizeof(int16) <= buf->maxlen);
+	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int16));
+	buf->len += sizeof(int16);
+}
+
+/*
+ * Append an int32 to a StringInfo buffer, which already has enough space
+ * preallocated.
+ */
+static inline void
+pq_writeint32(StringInfoData *pg_restrict buf, int32 i)
+{
+	int32		ni = pg_hton32(i);
+
+	Assert(buf->len + (int) sizeof(int32) <= buf->maxlen);
+	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int32));
+	buf->len += sizeof(int32);
+}
+
+/*
+ * Append an int64 to a StringInfo buffer, which already has enough space
+ * preallocated.
+ */
+static inline void
+pq_writeint64(StringInfoData *pg_restrict buf, int64 i)
+{
+	int64		ni = pg_hton64(i);
+
+	Assert(buf->len + (int) sizeof(int64) <= buf->maxlen);
+	memcpy((char *pg_restrict) (buf->data + buf->len), &ni, sizeof(int64));
+	buf->len += sizeof(int64);
+}
+
+/*
+ * Append a null-terminated text string (with conversion) to a buffer with
+ * preallocated space.
+ *
+ * NB: The pre-allocated space needs to be sufficient for the string after
+ * converting to client encoding.
+ *
+ * NB: passed text string must be null-terminated, and so is the data
+ * sent to the frontend.
+ */
+static inline void
+pq_writestring(StringInfoData *pg_restrict buf, const char *pg_restrict str)
+{
+	int			slen = strlen(str);
+	char	   *p;
+
+	p = pg_server_to_client(str, slen);
+	if (p != str)				/* actual conversion has been done? */
+		slen = strlen(p);
+
+	Assert(buf->len + slen + 1 <= buf->maxlen);
+
+	memcpy(((char *pg_restrict) buf->data + buf->len), p, slen + 1);
+	buf->len += slen + 1;
+
+	if (p != str)
+		pfree(p);
+}
+
+/* append a binary int8 to a StringInfo buffer */
+static inline void
+pq_sendint8(StringInfo buf, int8 i)
+{
+	enlargeStringInfo(buf, sizeof(int8));
+	pq_writeint8(buf, i);
+}
+
+/* append a binary int16 to a StringInfo buffer */
+static inline void
+pq_sendint16(StringInfo buf, int16 i)
+{
+	enlargeStringInfo(buf, sizeof(int16));
+	pq_writeint16(buf, i);
+}
+
+/* append a binary int32 to a StringInfo buffer */
+static inline void
+pq_sendint32(StringInfo buf, int32 i)
+{
+	enlargeStringInfo(buf, sizeof(int32));
+	pq_writeint32(buf, i);
+}
+
+/* append a binary int64 to a StringInfo buffer */
+static inline void
+pq_sendint64(StringInfo buf, int64 i)
+{
+	enlargeStringInfo(buf, sizeof(int64));
+	pq_writeint64(buf, i);
+}
+
+/* append a binary byte to a StringInfo buffer */
+static inline void
+pq_sendbyte(StringInfo buf, int8 byt)
+{
+	pq_sendint8(buf, byt);
+}
+
+/*
+ * Append a binary integer to a StringInfo buffer
+ *
+ * This function is deprecated; prefer use of the functions above.
+ */
+static inline void
+pq_sendint(StringInfo buf, int i, int b)
+{
+	switch (b)
+	{
+		case 1:
+			pq_sendint8(buf, (int8) i);
+			break;
+		case 2:
+			pq_sendint16(buf, (int16) i);
+			break;
+		case 4:
+			pq_sendint32(buf, (int32) i);
+			break;
+		default:
+			elog(ERROR, "unsupported integer size %d", b);
+			break;
+	}
+}
+
 
 extern void pq_begintypsend(StringInfo buf);
 extern bytea *pq_endtypsend(StringInfo buf);
diff --git a/src/include/libpq/pqmq.h b/src/include/libpq/pqmq.h
index 86436d6753..e273656fde 100644
--- a/src/include/libpq/pqmq.h
+++ b/src/include/libpq/pqmq.h
@@ -3,7 +3,7 @@
  * pqmq.h
  *	  Use the frontend/backend protocol for communication over a shm_mq
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/pqmq.h
diff --git a/src/include/libpq/pqsignal.h b/src/include/libpq/pqsignal.h
index af4e61ba4d..f292591dfc 100644
--- a/src/include/libpq/pqsignal.h
+++ b/src/include/libpq/pqsignal.h
@@ -3,7 +3,7 @@
  * pqsignal.h
  *	  Backend signal(2) support (see also src/port/pqsignal.c)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/pqsignal.h
diff --git a/src/include/libpq/scram.h b/src/include/libpq/scram.h
index 0166e1945d..91872fcd08 100644
--- a/src/include/libpq/scram.h
+++ b/src/include/libpq/scram.h
@@ -3,7 +3,7 @@
  * scram.h
  *	  Interface to libpq/scram.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/libpq/scram.h
@@ -13,8 +13,7 @@
 #ifndef PG_SCRAM_H
 #define PG_SCRAM_H
 
-/* Name of SCRAM-SHA-256 per IANA */
-#define SCRAM_SHA256_NAME "SCRAM-SHA-256"
+#include "libpq/libpq-be.h"
 
 /* Status codes for message exchange */
 #define SASL_EXCHANGE_CONTINUE		0
@@ -22,7 +21,7 @@
 #define SASL_EXCHANGE_FAILURE		2
 
 /* Routines dedicated to authentication */
-extern void *pg_be_scram_init(const char *username, const char *shadow_pass);
+extern void *pg_be_scram_init(Port *port, const char *shadow_pass);
 extern int pg_be_scram_exchange(void *opaq, char *input, int inputlen,
 					 char **output, int *outputlen, char **logdetail);
 
diff --git a/src/include/mb/pg_wchar.h b/src/include/mb/pg_wchar.h
index d57ef017cb..1d26cb51da 100644
--- a/src/include/mb/pg_wchar.h
+++ b/src/include/mb/pg_wchar.h
@@ -3,7 +3,7 @@
  * pg_wchar.h
  *	  multibyte-character support
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/mb/pg_wchar.h
@@ -304,6 +304,17 @@ typedef enum pg_enc
 /* On FE are possible all encodings */
 #define PG_VALID_FE_ENCODING(_enc)	PG_VALID_ENCODING(_enc)
 
+/*
+ * When converting strings between different encodings, we assume that space
+ * for converted result is 4-to-1 growth in the worst case. The rate for
+ * currently supported encoding pairs are within 3 (SJIS JIS X0201 half width
+ * kanna -> UTF8 is the worst case).  So "4" should be enough for the moment.
+ *
+ * Note that this is not the same as the maximum character width in any
+ * particular encoding.
+ */
+#define MAX_CONVERSION_GROWTH  4
+
 /*
  * Table for mapping an encoding number to official encoding name and
  * possibly other subsidiary data.  Be careful to check encoding number
diff --git a/src/include/miscadmin.h b/src/include/miscadmin.h
index dad98de98d..a4574cd533 100644
--- a/src/include/miscadmin.h
+++ b/src/include/miscadmin.h
@@ -10,7 +10,7 @@
  *	  Over time, this has also become the preferred place for widely known
  *	  resource-limitation stuff, such as work_mem and check_stack_depth().
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/miscadmin.h
@@ -150,15 +150,15 @@ extern PGDLLIMPORT bool IsUnderPostmaster;
 extern PGDLLIMPORT bool IsBackgroundWorker;
 extern PGDLLIMPORT bool IsBinaryUpgrade;
 
-extern bool ExitOnAnyError;
+extern PGDLLIMPORT bool ExitOnAnyError;
 
 extern PGDLLIMPORT char *DataDir;
 
 extern PGDLLIMPORT int NBuffers;
-extern int	MaxBackends;
-extern int	MaxConnections;
-extern int	max_worker_processes;
-extern int	max_parallel_workers;
+extern PGDLLIMPORT int MaxBackends;
+extern PGDLLIMPORT int MaxConnections;
+extern PGDLLIMPORT int max_worker_processes;
+extern PGDLLIMPORT int max_parallel_workers;
 
 extern PGDLLIMPORT int MyProcPid;
 extern PGDLLIMPORT pg_time_t MyStartTime;
@@ -238,10 +238,10 @@ extern PGDLLIMPORT int IntervalStyle;
 #define MAXTZLEN		10		/* max TZ name len, not counting tr. null */
 
 extern bool enableFsync;
-extern bool allowSystemTableMods;
+extern PGDLLIMPORT bool allowSystemTableMods;
 extern PGDLLIMPORT int work_mem;
 extern PGDLLIMPORT int maintenance_work_mem;
-extern PGDLLIMPORT int replacement_sort_tuples;
+extern PGDLLIMPORT int max_parallel_maintenance_workers;
 
 extern int	VacuumCostPageHit;
 extern int	VacuumCostPageMiss;
diff --git a/src/include/nodes/bitmapset.h b/src/include/nodes/bitmapset.h
index aa3fb253c2..67e8920f65 100644
--- a/src/include/nodes/bitmapset.h
+++ b/src/include/nodes/bitmapset.h
@@ -11,7 +11,7 @@
  * bms_is_empty() in preference to testing for NULL.)
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/nodes/bitmapset.h
  *
@@ -65,6 +65,7 @@ typedef enum
 
 extern Bitmapset *bms_copy(const Bitmapset *a);
 extern bool bms_equal(const Bitmapset *a, const Bitmapset *b);
+extern int	bms_compare(const Bitmapset *a, const Bitmapset *b);
 extern Bitmapset *bms_make_singleton(int x);
 extern void bms_free(Bitmapset *a);
 
@@ -90,6 +91,7 @@ extern bool bms_is_empty(const Bitmapset *a);
 extern Bitmapset *bms_add_member(Bitmapset *a, int x);
 extern Bitmapset *bms_del_member(Bitmapset *a, int x);
 extern Bitmapset *bms_add_members(Bitmapset *a, const Bitmapset *b);
+extern Bitmapset *bms_add_range(Bitmapset *a, int lower, int upper);
 extern Bitmapset *bms_int_members(Bitmapset *a, const Bitmapset *b);
 extern Bitmapset *bms_del_members(Bitmapset *a, const Bitmapset *b);
 extern Bitmapset *bms_join(Bitmapset *a, Bitmapset *b);
diff --git a/src/include/nodes/execnodes.h b/src/include/nodes/execnodes.h
index 577499465d..a953820f43 100644
--- a/src/include/nodes/execnodes.h
+++ b/src/include/nodes/execnodes.h
@@ -4,7 +4,7 @@
  *	  definitions for executor state nodes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/execnodes.h
@@ -24,6 +24,7 @@
 #include "utils/hsearch.h"
 #include "utils/queryenvironment.h"
 #include "utils/reltrigger.h"
+#include "utils/sharedtuplestore.h"
 #include "utils/sortsupport.h"
 #include "utils/tuplestore.h"
 #include "utils/tuplesort.h"
@@ -31,6 +32,13 @@
 #include "storage/condition_variable.h"
 
 
+struct PlanState;				/* forward references in this file */
+struct ParallelHashJoinState;
+struct ExprState;
+struct ExprContext;
+struct ExprEvalStep;			/* avoid including execExpr.h everywhere */
+
+
 /* ----------------
  *		ExprState node
  *
@@ -38,10 +46,6 @@
  * It contains instructions (in ->steps) to evaluate the expression.
  * ----------------
  */
-struct ExprState;				/* forward references in this file */
-struct ExprContext;
-struct ExprEvalStep;			/* avoid including execExpr.h everywhere */
-
 typedef Datum (*ExprStateEvalFunc) (struct ExprState *expression,
 									struct ExprContext *econtext,
 									bool *isNull);
@@ -82,13 +86,20 @@ typedef struct ExprState
 	/* original expression tree, for debugging only */
 	Expr	   *expr;
 
+	/* private state for an evalfunc */
+	void	   *evalfunc_private;
+
 	/*
-	 * XXX: following only needed during "compilation", could be thrown away.
+	 * XXX: following fields only needed during "compilation" (ExecInitExpr);
+	 * could be thrown away afterwards.
 	 */
 
 	int			steps_len;		/* number of steps currently */
 	int			steps_alloc;	/* allocated length of steps array */
 
+	struct PlanState *parent;	/* parent PlanState node, if any */
+	ParamListInfo ext_params;	/* for compiling PARAM_EXTERN nodes */
+
 	Datum	   *innermost_caseval;
 	bool	   *innermost_casenull;
 
@@ -121,11 +132,12 @@ typedef struct ExprState
  *		ReadyForInserts		is it valid for inserts?
  *		Concurrent			are we doing a concurrent index build?
  *		BrokenHotChain		did we detect any broken HOT chains?
+ *		ParallelWorkers		# of workers requested (excludes leader)
  *		AmCache				private cache area for index AM
  *		Context				memory context holding this IndexInfo
  *
- * ii_Concurrent and ii_BrokenHotChain are used only during index build;
- * they're conventionally set to false otherwise.
+ * ii_Concurrent, ii_BrokenHotChain, and ii_ParallelWorkers are used only
+ * during index build; they're conventionally zeroed otherwise.
  * ----------------
  */
 typedef struct IndexInfo
@@ -147,6 +159,8 @@ typedef struct IndexInfo
 	bool		ii_ReadyForInserts;
 	bool		ii_Concurrent;
 	bool		ii_BrokenHotChain;
+	int			ii_ParallelWorkers;
+	Oid			ii_Am;
 	void	   *ii_AmCache;
 	MemoryContext ii_Context;
 } IndexInfo;
@@ -452,6 +466,12 @@ typedef struct EState
 	ResultRelInfo *es_root_result_relations;	/* array of ResultRelInfos */
 	int			es_num_root_result_relations;	/* length of the array */
 
+	/*
+	 * The following list contains ResultRelInfos created by the tuple
+	 * routing code for partitions that don't already have one.
+	 */
+	List	   *es_tuple_routing_result_relations;
+
 	/* Stuff used for firing triggers: */
 	List	   *es_trig_target_relations;	/* trigger-only ResultRelInfos */
 	TupleTableSlot *es_trig_tuple_slot; /* for trigger output tuples */
@@ -504,6 +524,8 @@ typedef struct EState
 	bool	   *es_epqTupleSet; /* true if EPQ tuple is provided */
 	bool	   *es_epqScanDone; /* true if EPQ tuple has been fetched */
 
+	bool		es_use_parallel_mode;	/* can we use parallel workers? */
+
 	/* The per-query shared memory area to use for parallel execution. */
 	struct dsa_area *es_query_dsa;
 } EState;
@@ -572,10 +594,10 @@ typedef struct ExecAuxRowMark
  * Normally these are the only functions used, but FindTupleHashEntry()
  * supports searching a hashtable using cross-data-type hashing.  For that,
  * the caller must supply hash functions for the LHS datatype as well as
- * the cross-type equality operators to use.  in_hash_funcs and cur_eq_funcs
+ * the cross-type equality operators to use.  in_hash_funcs and cur_eq_func
  * are set to point to the caller's function arrays while doing such a search.
  * During LookupTupleHashEntry(), they point to tab_hash_funcs and
- * tab_eq_funcs respectively.
+ * tab_eq_func respectively.
  * ----------------------------------------------------------------
  */
 typedef struct TupleHashEntryData *TupleHashEntry;
@@ -603,7 +625,7 @@ typedef struct TupleHashTableData
 	int			numCols;		/* number of columns in lookup key */
 	AttrNumber *keyColIdx;		/* attr numbers of key columns */
 	FmgrInfo   *tab_hash_funcs; /* hash functions for table datatype(s) */
-	FmgrInfo   *tab_eq_funcs;	/* equality functions for table datatype(s) */
+	ExprState  *tab_eq_func;	/* comparator for table datatype(s) */
 	MemoryContext tablecxt;		/* memory context containing table */
 	MemoryContext tempcxt;		/* context for function evaluations */
 	Size		entrysize;		/* actual size to make each hash entry */
@@ -611,8 +633,9 @@ typedef struct TupleHashTableData
 	/* The following fields are set transiently for each table search: */
 	TupleTableSlot *inputslot;	/* current input tuple's slot */
 	FmgrInfo   *in_hash_funcs;	/* hash functions for input datatype(s) */
-	FmgrInfo   *cur_eq_funcs;	/* equality functions for input vs. table */
+	ExprState  *cur_eq_func;	/* comparator for for input vs. table */
 	uint32		hash_iv;		/* hash-function IV */
+	ExprContext *exprcontext;	/* expression context */
 }			TupleHashTableData;
 
 typedef tuplehash_iterator TupleHashIterator;
@@ -759,20 +782,23 @@ typedef struct SubPlanState
 	HeapTuple	curTuple;		/* copy of most recent tuple from subplan */
 	Datum		curArray;		/* most recent array from ARRAY() subplan */
 	/* these are used when hashing the subselect's output: */
+	TupleDesc	descRight;		/* subselect desc after projection */
 	ProjectionInfo *projLeft;	/* for projecting lefthand exprs */
 	ProjectionInfo *projRight;	/* for projecting subselect output */
 	TupleHashTable hashtable;	/* hash table for no-nulls subselect rows */
 	TupleHashTable hashnulls;	/* hash table for rows with null(s) */
-	bool		havehashrows;	/* TRUE if hashtable is not empty */
-	bool		havenullrows;	/* TRUE if hashnulls is not empty */
+	bool		havehashrows;	/* true if hashtable is not empty */
+	bool		havenullrows;	/* true if hashnulls is not empty */
 	MemoryContext hashtablecxt; /* memory context containing hash tables */
 	MemoryContext hashtempcxt;	/* temp memory context for hash tables */
 	ExprContext *innerecontext; /* econtext for computing inner tuples */
 	AttrNumber *keyColIdx;		/* control data for hash tables */
+	Oid		   *tab_eq_funcoids;/* equality func oids for table datatype(s) */
 	FmgrInfo   *tab_hash_funcs; /* hash functions for table datatype(s) */
 	FmgrInfo   *tab_eq_funcs;	/* equality functions for table datatype(s) */
 	FmgrInfo   *lhs_hash_funcs; /* hash functions for lefthand datatype(s) */
 	FmgrInfo   *cur_eq_funcs;	/* equality functions for LHS vs. table */
+	ExprState  *cur_eq_comp;	/* equality comparator for LHS vs. table */
 } SubPlanState;
 
 /* ----------------
@@ -818,8 +844,6 @@ typedef struct DomainConstraintState
  * ----------------------------------------------------------------
  */
 
-struct PlanState;
-
 /* ----------------
  *	 ExecProcNodeMtd
  *
@@ -943,6 +967,7 @@ typedef struct ProjectSetState
 	ExprDoneCond *elemdone;		/* array of per-SRF is-done states */
 	int			nelems;			/* length of elemdone[] array */
 	bool		pending_srf_tuples; /* still evaluating srfs in tlist? */
+	MemoryContext argcontext;	/* context for SRF arguments */
 } ProjectSetState;
 
 /* ----------------
@@ -970,19 +995,14 @@ typedef struct ModifyTableState
 	TupleTableSlot *mt_existing;	/* slot to store existing target tuple in */
 	List	   *mt_excludedtlist;	/* the excluded pseudo relation's tlist  */
 	TupleTableSlot *mt_conflproj;	/* CONFLICT ... SET ... projection target */
-	struct PartitionDispatchData **mt_partition_dispatch_info;
+	struct PartitionTupleRouting *mt_partition_tuple_routing;
 	/* Tuple-routing support info */
-	int			mt_num_dispatch;	/* Number of entries in the above array */
-	int			mt_num_partitions;	/* Number of members in the following
-									 * arrays */
-	ResultRelInfo *mt_partitions;	/* Per partition result relation */
-	TupleConversionMap **mt_partition_tupconv_maps;
-	/* Per partition tuple conversion map */
-	TupleTableSlot *mt_partition_tuple_slot;
 	struct TransitionCaptureState *mt_transition_capture;
-	/* controls transition table population */
-	TupleConversionMap **mt_transition_tupconv_maps;
-	/* Per plan/partition tuple conversion */
+	/* controls transition table population for specified operation */
+	struct TransitionCaptureState *mt_oc_transition_capture;
+	/* controls transition table population for INSERT...ON CONFLICT UPDATE */
+	TupleConversionMap **mt_per_subplan_tupconv_maps;
+	/* Per plan map for tuple conversion from child to root */
 } ModifyTableState;
 
 /* ----------------
@@ -992,13 +1012,22 @@ typedef struct ModifyTableState
  *		whichplan		which plan is being executed (0 .. n-1)
  * ----------------
  */
-typedef struct AppendState
+
+struct AppendState;
+typedef struct AppendState AppendState;
+struct ParallelAppendState;
+typedef struct ParallelAppendState ParallelAppendState;
+
+struct AppendState
 {
 	PlanState	ps;				/* its first field is NodeTag */
 	PlanState **appendplans;	/* array of PlanStates for my inputs */
 	int			as_nplans;
 	int			as_whichplan;
-} AppendState;
+	ParallelAppendState *as_pstate; /* parallel coordination info */
+	Size		pstate_len;		/* size of parallel coordination info */
+	bool		(*choose_next_subplan) (AppendState *);
+};
 
 /* ----------------
  *	 MergeAppendState information
@@ -1042,7 +1071,7 @@ typedef struct RecursiveUnionState
 	Tuplestorestate *working_table;
 	Tuplestorestate *intermediate_table;
 	/* Remaining fields are unused in UNION ALL case */
-	FmgrInfo   *eqfunctions;	/* per-grouping-field equality fns */
+	Oid		   *eqfuncoids;		/* per-grouping-field equality fns */
 	FmgrInfo   *hashfunctions;	/* per-grouping-field hash fns */
 	MemoryContext tempContext;	/* short-term context for comparisons */
 	TupleHashTable hashtable;	/* hash table for tuples already seen */
@@ -1323,6 +1352,10 @@ typedef struct ParallelBitmapHeapState
  *		tbm				   bitmap obtained from child index scan(s)
  *		tbmiterator		   iterator for scanning current pages
  *		tbmres			   current-page data
+ *		can_skip_fetch	   can we potentially skip tuple fetches in this scan?
+ *		skip_fetch		   are we skipping tuple fetches on this page?
+ *		vmbuffer		   buffer for visibility-map lookups
+ *		pvmbuffer		   ditto, for prefetched pages
  *		exact_pages		   total number of exact pages retrieved
  *		lossy_pages		   total number of lossy pages retrieved
  *		prefetch_iterator  iterator for prefetching ahead of current page
@@ -1343,6 +1376,10 @@ typedef struct BitmapHeapScanState
 	TIDBitmap  *tbm;
 	TBMIterator *tbmiterator;
 	TBMIterateResult *tbmres;
+	bool		can_skip_fetch;
+	bool		skip_fetch;
+	Buffer		vmbuffer;
+	Buffer		pvmbuffer;
 	long		exact_pages;
 	long		lossy_pages;
 	TBMIterator *prefetch_iterator;
@@ -1727,6 +1764,16 @@ typedef struct MaterialState
 	Tuplestorestate *tuplestorestate;
 } MaterialState;
 
+/* ----------------
+ *	 Shared memory container for per-worker sort information
+ * ----------------
+ */
+typedef struct SharedSortInfo
+{
+	int			num_workers;
+	TuplesortInstrumentation sinstrument[FLEXIBLE_ARRAY_MEMBER];
+} SharedSortInfo;
+
 /* ----------------
  *	 SortState information
  * ----------------
@@ -1741,6 +1788,8 @@ typedef struct SortState
 	bool		bounded_Done;	/* value of bounded we did the sort with */
 	int64		bound_Done;		/* value of bound we did the sort with */
 	void	   *tuplesortstate; /* private state of tuplesort.c */
+	bool		am_worker;		/* are we a worker? */
+	SharedSortInfo *shared_info;	/* one entry per worker */
 } SortState;
 
 /* ---------------------
@@ -1750,7 +1799,7 @@ typedef struct SortState
 typedef struct GroupState
 {
 	ScanState	ss;				/* its first field is NodeTag */
-	FmgrInfo   *eqfunctions;	/* per-field lookup data for equality fns */
+	ExprState  *eqfunction;		/* equality function */
 	bool		grp_done;		/* indicates completion of Group scan */
 } GroupState;
 
@@ -1790,7 +1839,8 @@ typedef struct AggState
 	ExprContext **aggcontexts;	/* econtexts for long-lived data (per GS) */
 	ExprContext *tmpcontext;	/* econtext for input expressions */
 	ExprContext *curaggcontext; /* currently active aggcontext */
-	AggStatePerTrans curpertrans;	/* currently active trans state */
+	AggStatePerAgg curperagg;	/* currently active aggregate, if any */
+	AggStatePerTrans curpertrans;	/* currently active trans state, if any */
 	bool		input_done;		/* indicates end of input */
 	bool		agg_done;		/* indicates completion of Agg scan */
 	int			projected_set;	/* The last projected grouping set */
@@ -1804,17 +1854,20 @@ typedef struct AggState
 	Tuplesortstate *sort_out;	/* input is copied here for next phase */
 	TupleTableSlot *sort_slot;	/* slot for sort results */
 	/* these fields are used in AGG_PLAIN and AGG_SORTED modes: */
-	AggStatePerGroup pergroup;	/* per-Aggref-per-group working state */
+	AggStatePerGroup *pergroups;	/* grouping set indexed array of per-group
+									 * pointers */
 	HeapTuple	grp_firstTuple; /* copy of first tuple of current group */
 	/* these fields are used in AGG_HASHED and AGG_MIXED modes: */
 	bool		table_filled;	/* hash table filled yet? */
 	int			num_hashes;
-	AggStatePerHash perhash;
-	AggStatePerGroup *hash_pergroup;	/* array of per-group pointers */
-	/* support for evaluation of agg inputs */
-	TupleTableSlot *evalslot;	/* slot for agg inputs */
-	ProjectionInfo *evalproj;	/* projection machinery */
-	TupleDesc	evaldesc;		/* descriptor of input tuples */
+	AggStatePerHash perhash;	/* array of per-hashtable data */
+	AggStatePerGroup *hash_pergroup;	/* grouping set indexed array of
+										 * per-group pointers */
+
+	/* support for evaluation of agg input expressions: */
+	AggStatePerGroup *all_pergroups;	/* array of first ->pergroups, than
+										 * ->hash_pergroup */
+	ProjectionInfo *combinedproj;	/* projection machinery */
 } AggState;
 
 /* ----------------
@@ -1836,14 +1889,17 @@ typedef struct WindowAggState
 
 	WindowStatePerFunc perfunc; /* per-window-function information */
 	WindowStatePerAgg peragg;	/* per-plain-aggregate information */
-	FmgrInfo   *partEqfunctions;	/* equality funcs for partition columns */
-	FmgrInfo   *ordEqfunctions; /* equality funcs for ordering columns */
+	ExprState  *partEqfunction;	/* equality funcs for partition columns */
+	ExprState  *ordEqfunction; /* equality funcs for ordering columns */
 	Tuplestorestate *buffer;	/* stores rows of current partition */
-	int			current_ptr;	/* read pointer # for current */
+	int			current_ptr;	/* read pointer # for current row */
+	int			framehead_ptr;	/* read pointer # for frame head, if used */
+	int			frametail_ptr;	/* read pointer # for frame tail, if used */
+	int			grouptail_ptr;	/* read pointer # for group tail, if used */
 	int64		spooled_rows;	/* total # of rows in buffer */
 	int64		currentpos;		/* position of current row in partition */
 	int64		frameheadpos;	/* current frame head position */
-	int64		frametailpos;	/* current frame tail position */
+	int64		frametailpos;	/* current frame tail position (frame end+1) */
 	/* use struct pointer to avoid including windowapi.h here */
 	struct WindowObjectData *agg_winobj;	/* winobj for aggregate fetches */
 	int64		aggregatedbase; /* start row for current aggregates */
@@ -1855,6 +1911,20 @@ typedef struct WindowAggState
 	Datum		startOffsetValue;	/* result of startOffset evaluation */
 	Datum		endOffsetValue; /* result of endOffset evaluation */
 
+	/* these fields are used with RANGE offset PRECEDING/FOLLOWING: */
+	FmgrInfo	startInRangeFunc;	/* in_range function for startOffset */
+	FmgrInfo	endInRangeFunc; /* in_range function for endOffset */
+	Oid			inRangeColl;	/* collation for in_range tests */
+	bool		inRangeAsc;		/* use ASC sort order for in_range tests? */
+	bool		inRangeNullsFirst;	/* nulls sort first for in_range tests? */
+
+	/* these fields are used in GROUPS mode: */
+	int64		currentgroup;	/* peer group # of current row in partition */
+	int64		frameheadgroup; /* peer group # of frame head row */
+	int64		frametailgroup; /* peer group # of frame tail row */
+	int64		groupheadpos;	/* current row's peer group head position */
+	int64		grouptailpos;	/* " " " " tail position (group end+1) */
+
 	MemoryContext partcontext;	/* context for partition-lifespan data */
 	MemoryContext aggcontext;	/* shared context for aggregate working data */
 	MemoryContext curaggcontext;	/* current aggregate's working data */
@@ -1870,9 +1940,13 @@ typedef struct WindowAggState
 									 * date for current row */
 	bool		frametail_valid;	/* true if frametailpos is known up to
 									 * date for current row */
+	bool		grouptail_valid;	/* true if grouptailpos is known up to
+									 * date for current row */
 
 	TupleTableSlot *first_part_slot;	/* first tuple of current or next
 										 * partition */
+	TupleTableSlot *framehead_slot; /* first tuple of current frame */
+	TupleTableSlot *frametail_slot; /* first tuple after current frame */
 
 	/* temporary slots for tuples fetched back from tuplestore */
 	TupleTableSlot *agg_row_slot;
@@ -1894,8 +1968,7 @@ typedef struct WindowAggState
 typedef struct UniqueState
 {
 	PlanState	ps;				/* its first field is NodeTag */
-	FmgrInfo   *eqfunctions;	/* per-field lookup data for equality fns */
-	MemoryContext tempContext;	/* short-term context for comparisons */
+	ExprState   *eqfunction;		/* tuple equality qual */
 } UniqueState;
 
 /* ----------------
@@ -1908,14 +1981,17 @@ typedef struct UniqueState
 typedef struct GatherState
 {
 	PlanState	ps;				/* its first field is NodeTag */
-	bool		initialized;
-	struct ParallelExecutorInfo *pei;
-	int			nreaders;
-	int			nextreader;
-	int			nworkers_launched;
-	struct TupleQueueReader **reader;
+	bool		initialized;	/* workers launched? */
+	bool		need_to_scan_locally;	/* need to read from local plan? */
+	int64		tuples_needed;	/* tuple bound, see ExecSetTupleBound */
+	/* these fields are set up once: */
 	TupleTableSlot *funnel_slot;
-	bool		need_to_scan_locally;
+	struct ParallelExecutorInfo *pei;
+	/* all remaining fields are reinitialized during a rescan: */
+	int			nworkers_launched;	/* original number of workers */
+	int			nreaders;		/* number of still-active workers */
+	int			nextreader;		/* next one to try to read from */
+	struct TupleQueueReader **reader;	/* array with nreaders active entries */
 } GatherState;
 
 /* ----------------
@@ -1926,26 +2002,53 @@ typedef struct GatherState
  *		merge the results into a single sorted stream.
  * ----------------
  */
-struct GMReaderTuple;
+struct GMReaderTupleBuffer;		/* private in nodeGatherMerge.c */
 
 typedef struct GatherMergeState
 {
 	PlanState	ps;				/* its first field is NodeTag */
-	bool		initialized;
+	bool		initialized;	/* workers launched? */
+	bool		gm_initialized; /* gather_merge_init() done? */
+	bool		need_to_scan_locally;	/* need to read from local plan? */
+	int64		tuples_needed;	/* tuple bound, see ExecSetTupleBound */
+	/* these fields are set up once: */
+	TupleDesc	tupDesc;		/* descriptor for subplan result tuples */
+	int			gm_nkeys;		/* number of sort columns */
+	SortSupport gm_sortkeys;	/* array of length gm_nkeys */
 	struct ParallelExecutorInfo *pei;
-	int			nreaders;
-	int			nworkers_launched;
-	struct TupleQueueReader **reader;
-	TupleDesc	tupDesc;
-	TupleTableSlot **gm_slots;
+	/* all remaining fields are reinitialized during a rescan */
+	/* (but the arrays are not reallocated, just cleared) */
+	int			nworkers_launched;	/* original number of workers */
+	int			nreaders;		/* number of active workers */
+	TupleTableSlot **gm_slots;	/* array with nreaders+1 entries */
+	struct TupleQueueReader **reader;	/* array with nreaders active entries */
+	struct GMReaderTupleBuffer *gm_tuple_buffers;	/* nreaders tuple buffers */
 	struct binaryheap *gm_heap; /* binary heap of slot indices */
-	bool		gm_initialized; /* gather merge initilized ? */
-	bool		need_to_scan_locally;
-	int			gm_nkeys;
-	SortSupport gm_sortkeys;	/* array of length ms_nkeys */
-	struct GMReaderTupleBuffer *gm_tuple_buffers;	/* tuple buffer per reader */
 } GatherMergeState;
 
+/* ----------------
+ *	 Values displayed by EXPLAIN ANALYZE
+ * ----------------
+ */
+typedef struct HashInstrumentation
+{
+	int			nbuckets;		/* number of buckets at end of execution */
+	int			nbuckets_original;	/* planned number of buckets */
+	int			nbatch;			/* number of batches at end of execution */
+	int			nbatch_original;	/* planned number of batches */
+	size_t		space_peak;		/* speak memory usage in bytes */
+} HashInstrumentation;
+
+/* ----------------
+ *	 Shared memory container for per-worker hash information
+ * ----------------
+ */
+typedef struct SharedHashInfo
+{
+	int			num_workers;
+	HashInstrumentation hinstrument[FLEXIBLE_ARRAY_MEMBER];
+} SharedHashInfo;
+
 /* ----------------
  *	 HashState information
  * ----------------
@@ -1956,6 +2059,12 @@ typedef struct HashState
 	HashJoinTable hashtable;	/* hash table for the hashjoin */
 	List	   *hashkeys;		/* list of ExprState nodes */
 	/* hashkeys is same as parent's hj_InnerHashKeys */
+
+	SharedHashInfo *shared_info;	/* one entry per worker */
+	HashInstrumentation *hinstrument;	/* this worker's entry */
+
+	/* Parallel hash state. */
+	struct ParallelHashJoinState *parallel_state;
 } HashState;
 
 /* ----------------
@@ -1973,11 +2082,11 @@ typedef struct SetOpStatePerGroupData *SetOpStatePerGroup;
 typedef struct SetOpState
 {
 	PlanState	ps;				/* its first field is NodeTag */
-	FmgrInfo   *eqfunctions;	/* per-grouping-field equality fns */
+	ExprState  *eqfunction;		/* equality comparator */
+	Oid		   *eqfuncoids;		/* per-grouping-field equality fns */
 	FmgrInfo   *hashfunctions;	/* per-grouping-field hash fns */
 	bool		setop_done;		/* indicates completion of output scan */
 	long		numOutput;		/* number of dups left to output */
-	MemoryContext tempContext;	/* short-term context for comparisons */
 	/* these fields are used in SETOP_SORTED mode: */
 	SetOpStatePerGroup pergroup;	/* per-group working state */
 	HeapTuple	grp_firstTuple; /* copy of first tuple of current group */
diff --git a/src/include/nodes/extensible.h b/src/include/nodes/extensible.h
index 7325bf536a..3f909fb459 100644
--- a/src/include/nodes/extensible.h
+++ b/src/include/nodes/extensible.h
@@ -4,7 +4,7 @@
  *	  Definitions for extensible nodes and custom scans
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/extensible.h
@@ -96,6 +96,9 @@ typedef struct CustomPathMethods
 									List *tlist,
 									List *clauses,
 									List *custom_plans);
+	struct List *(*ReparameterizeCustomPathByChild) (PlannerInfo *root,
+													 List *custom_private,
+													 RelOptInfo *child_rel);
 }			CustomPathMethods;
 
 /*
@@ -136,6 +139,9 @@ typedef struct CustomExecMethods
 	void		(*InitializeDSMCustomScan) (CustomScanState *node,
 											ParallelContext *pcxt,
 											void *coordinate);
+	void		(*ReInitializeDSMCustomScan) (CustomScanState *node,
+											  ParallelContext *pcxt,
+											  void *coordinate);
 	void		(*InitializeWorkerCustomScan) (CustomScanState *node,
 											   shm_toc *toc,
 											   void *coordinate);
diff --git a/src/include/nodes/lockoptions.h b/src/include/nodes/lockoptions.h
index e0981dac6f..24afd6efd4 100644
--- a/src/include/nodes/lockoptions.h
+++ b/src/include/nodes/lockoptions.h
@@ -4,7 +4,7 @@
  *	  Common header for some locking-related declarations.
  *
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * src/include/nodes/lockoptions.h
  *
diff --git a/src/include/nodes/makefuncs.h b/src/include/nodes/makefuncs.h
index 46a79b1817..57bd52ff24 100644
--- a/src/include/nodes/makefuncs.h
+++ b/src/include/nodes/makefuncs.h
@@ -4,7 +4,7 @@
  *	  prototypes for the creator functions (for primitive nodes)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/makefuncs.h
@@ -86,4 +86,6 @@ extern DefElem *makeDefElemExtended(char *nameSpace, char *name, Node *arg,
 
 extern GroupingSet *makeGroupingSet(GroupingSetKind kind, List *content, int location);
 
+extern VacuumRelation *makeVacuumRelation(RangeVar *relation, Oid oid, List *va_cols);
+
 #endif							/* MAKEFUNC_H */
diff --git a/src/include/nodes/memnodes.h b/src/include/nodes/memnodes.h
index 7a0c6763df..ccb64f01a7 100644
--- a/src/include/nodes/memnodes.h
+++ b/src/include/nodes/memnodes.h
@@ -4,7 +4,7 @@
  *	  POSTGRES memory context node definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/memnodes.h
@@ -57,7 +57,6 @@ typedef struct MemoryContextMethods
 	/* call this free_p in case someone #define's free() */
 	void		(*free_p) (MemoryContext context, void *pointer);
 	void	   *(*realloc) (MemoryContext context, void *pointer, Size size);
-	void		(*init) (MemoryContext context);
 	void		(*reset) (MemoryContext context);
 	void		(*delete_context) (MemoryContext context);
 	Size		(*get_chunk_space) (MemoryContext context, void *pointer);
@@ -76,12 +75,12 @@ typedef struct MemoryContextData
 	/* these two fields are placed here to minimize alignment wastage: */
 	bool		isReset;		/* T = no space alloced since last reset */
 	bool		allowInCritSection; /* allow palloc in critical section */
-	MemoryContextMethods *methods;	/* virtual function table */
+	const MemoryContextMethods *methods;	/* virtual function table */
 	MemoryContext parent;		/* NULL if no parent (toplevel context) */
 	MemoryContext firstchild;	/* head of linked list of children */
 	MemoryContext prevchild;	/* previous child of same parent */
 	MemoryContext nextchild;	/* next child of same parent */
-	char	   *name;			/* context name (just for debugging) */
+	const char *name;			/* context name (just for debugging) */
 	MemoryContextCallback *reset_cbs;	/* list of reset/delete callbacks */
 } MemoryContextData;
 
@@ -96,6 +95,8 @@ typedef struct MemoryContextData
  */
 #define MemoryContextIsValid(context) \
 	((context) != NULL && \
-	 (IsA((context), AllocSetContext) || IsA((context), SlabContext)))
+	 (IsA((context), AllocSetContext) || \
+	  IsA((context), SlabContext) || \
+	  IsA((context), GenerationContext)))
 
 #endif							/* MEMNODES_H */
diff --git a/src/include/nodes/nodeFuncs.h b/src/include/nodes/nodeFuncs.h
index 3366983936..849f34d2a8 100644
--- a/src/include/nodes/nodeFuncs.h
+++ b/src/include/nodes/nodeFuncs.h
@@ -3,7 +3,7 @@
  * nodeFuncs.h
  *		Various general-purpose manipulations of Node trees
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/nodeFuncs.h
diff --git a/src/include/nodes/nodes.h b/src/include/nodes/nodes.h
index 27bd4f3363..74b094a9c3 100644
--- a/src/include/nodes/nodes.h
+++ b/src/include/nodes/nodes.h
@@ -4,7 +4,7 @@
  *	  Definitions for tagged nodes.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/nodes.h
@@ -274,6 +274,7 @@ typedef enum NodeTag
 	T_MemoryContext,
 	T_AllocSetContext,
 	T_SlabContext,
+	T_GenerationContext,
 
 	/*
 	 * TAGS FOR VALUE NODES (value.h)
@@ -413,6 +414,7 @@ typedef enum NodeTag
 	T_DropSubscriptionStmt,
 	T_CreateStatsStmt,
 	T_AlterCollationStmt,
+	T_CallStmt,
 
 	/*
 	 * TAGS FOR PARSE TREE NODES (parsenodes.h)
@@ -468,6 +470,7 @@ typedef enum NodeTag
 	T_PartitionBoundSpec,
 	T_PartitionRangeDatum,
 	T_PartitionCmd,
+	T_VacuumRelation,
 
 	/*
 	 * TAGS FOR REPLICATION GRAMMAR PARSE NODES (replnodes.h)
@@ -497,7 +500,8 @@ typedef enum NodeTag
 	T_FdwRoutine,				/* in foreign/fdwapi.h */
 	T_IndexAmRoutine,			/* in access/amapi.h */
 	T_TsmRoutine,				/* in access/tsmapi.h */
-	T_ForeignKeyCacheInfo		/* in utils/rel.h */
+	T_ForeignKeyCacheInfo,		/* in utils/rel.h */
+	T_CallContext				/* in nodes/parsenodes.h */
 } NodeTag;
 
 /*
diff --git a/src/include/nodes/params.h b/src/include/nodes/params.h
index 55219dab6e..04b03c7303 100644
--- a/src/include/nodes/params.h
+++ b/src/include/nodes/params.h
@@ -4,7 +4,7 @@
  *	  Support for finding the values associated with Param nodes.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/params.h
@@ -16,16 +16,23 @@
 
 /* Forward declarations, to avoid including other headers */
 struct Bitmapset;
+struct ExprState;
+struct Param;
 struct ParseState;
 
 
-/* ----------------
+/*
  *	  ParamListInfo
  *
- *	  ParamListInfo arrays are used to pass parameters into the executor
- *	  for parameterized plans.  Each entry in the array defines the value
- *	  to be substituted for a PARAM_EXTERN parameter.  The "paramid"
- *	  of a PARAM_EXTERN Param can range from 1 to numParams.
+ *	  ParamListInfo structures are used to pass parameters into the executor
+ *	  for parameterized plans.  We support two basic approaches to supplying
+ *	  parameter values, the "static" way and the "dynamic" way.
+ *
+ *	  In the static approach, per-parameter data is stored in an array of
+ *	  ParamExternData structs appended to the ParamListInfo struct.
+ *	  Each entry in the array defines the value to be substituted for a
+ *	  PARAM_EXTERN parameter.  The "paramid" of a PARAM_EXTERN Param
+ *	  can range from 1 to numParams.
  *
  *	  Although parameter numbers are normally consecutive, we allow
  *	  ptype == InvalidOid to signal an unused array entry.
@@ -35,18 +42,47 @@ struct ParseState;
  *	  as a constant (i.e., generate a plan that works only for this value
  *	  of the parameter).
  *
- *	  There are two hook functions that can be associated with a ParamListInfo
- *	  array to support dynamic parameter handling.  First, if paramFetch
- *	  isn't null and the executor requires a value for an invalid parameter
- *	  (one with ptype == InvalidOid), the paramFetch hook is called to give
- *	  it a chance to fill in the parameter value.  Second, a parserSetup
- *	  hook can be supplied to re-instantiate the original parsing hooks if
- *	  a query needs to be re-parsed/planned (as a substitute for supposing
- *	  that the current ptype values represent a fixed set of parameter types).
-
+ *	  In the dynamic approach, all access to parameter values is done through
+ *	  hook functions found in the ParamListInfo struct.  In this case,
+ *	  the ParamExternData array is typically unused and not allocated;
+ *	  but the legal range of paramid is still 1 to numParams.
+ *
  *	  Although the data structure is really an array, not a list, we keep
  *	  the old typedef name to avoid unnecessary code changes.
- * ----------------
+ *
+ *	  There are 3 hook functions that can be associated with a ParamListInfo
+ *	  structure:
+ *
+ *	  If paramFetch isn't null, it is called to fetch the ParamExternData
+ *	  for a particular param ID, rather than accessing the relevant element
+ *	  of the ParamExternData array.  This supports the case where the array
+ *	  isn't there at all, as well as cases where the data in the array
+ *	  might be obsolete or lazily evaluated.  paramFetch must return the
+ *	  address of a ParamExternData struct describing the specified param ID;
+ *	  the convention above about ptype == InvalidOid signaling an invalid
+ *	  param ID still applies.  The returned struct can either be placed in
+ *	  the "workspace" supplied by the caller, or it can be in storage
+ *	  controlled by the paramFetch hook if that's more convenient.
+ *	  (In either case, the struct is not expected to be long-lived.)
+ *	  If "speculative" is true, the paramFetch hook should not risk errors
+ *	  in trying to fetch the parameter value, and should report an invalid
+ *	  parameter instead.
+ *
+ *	  If paramCompile isn't null, then it controls what execExpr.c compiles
+ *	  for PARAM_EXTERN Param nodes --- typically, this hook would emit a
+ *	  EEOP_PARAM_CALLBACK step.  This allows unnecessary work to be
+ *	  optimized away in compiled expressions.
+ *
+ *	  If parserSetup isn't null, then it is called to re-instantiate the
+ *	  original parsing hooks when a query needs to be re-parsed/planned.
+ *	  This is especially useful if the types of parameters might change
+ *	  from time to time, since it can replace the need to supply a fixed
+ *	  list of parameter types to the parser.
+ *
+ *	  Notice that the paramFetch and paramCompile hooks are actually passed
+ *	  the ParamListInfo struct's address; they can therefore access all
+ *	  three of the "arg" fields, and the distinction between paramFetchArg
+ *	  and paramCompileArg is rather arbitrary.
  */
 
 #define PARAM_FLAG_CONST	0x0001	/* parameter is constant */
@@ -61,7 +97,13 @@ typedef struct ParamExternData
 
 typedef struct ParamListInfoData *ParamListInfo;
 
-typedef void (*ParamFetchHook) (ParamListInfo params, int paramid);
+typedef ParamExternData *(*ParamFetchHook) (ParamListInfo params,
+											int paramid, bool speculative,
+											ParamExternData *workspace);
+
+typedef void (*ParamCompileHook) (ParamListInfo params, struct Param *param,
+								  struct ExprState *state,
+								  Datum *resv, bool *resnull);
 
 typedef void (*ParserSetupHook) (struct ParseState *pstate, void *arg);
 
@@ -69,10 +111,16 @@ typedef struct ParamListInfoData
 {
 	ParamFetchHook paramFetch;	/* parameter fetch hook */
 	void	   *paramFetchArg;
+	ParamCompileHook paramCompile;	/* parameter compile hook */
+	void	   *paramCompileArg;
 	ParserSetupHook parserSetup;	/* parser setup hook */
 	void	   *parserSetupArg;
-	int			numParams;		/* number of ParamExternDatas following */
-	struct Bitmapset *paramMask;	/* if non-NULL, can ignore omitted params */
+	int			numParams;		/* nominal/maximum # of Params represented */
+
+	/*
+	 * params[] may be of length zero if paramFetch is supplied; otherwise it
+	 * must be of length numParams.
+	 */
 	ParamExternData params[FLEXIBLE_ARRAY_MEMBER];
 }			ParamListInfoData;
 
diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 5f2a4a75da..ac292bc6e7 100644
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -12,7 +12,7 @@
  * identifying statement boundaries in multi-statement source strings.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/parsenodes.h
@@ -111,7 +111,7 @@ typedef struct Query
 
 	QuerySource querySource;	/* where did I come from? */
 
-	uint32		queryId;		/* query identifier (can be set by plugins) */
+	uint64		queryId;		/* query identifier (can be set by plugins) */
 
 	bool		canSetTag;		/* do I set the command result tag? */
 
@@ -198,7 +198,7 @@ typedef struct Query
  * Similarly, if "typmods" is NIL then the actual typmod is expected to
  * be prespecified in typemod, otherwise typemod is unused.
  *
- * If pct_type is TRUE, then names is actually a field name and we look up
+ * If pct_type is true, then names is actually a field name and we look up
  * the type of that field.  Otherwise (the normal case), names is a type
  * name possibly qualified with schema and database name.
  */
@@ -499,27 +499,33 @@ typedef struct WindowDef
  * which were defaulted; the correct behavioral bits must be set either way.
  * The START_foo and END_foo options must come in pairs of adjacent bits for
  * the convenience of gram.y, even though some of them are useless/invalid.
- * We will need more bits (and fields) to cover the full SQL:2008 option set.
  */
 #define FRAMEOPTION_NONDEFAULT					0x00001 /* any specified? */
 #define FRAMEOPTION_RANGE						0x00002 /* RANGE behavior */
 #define FRAMEOPTION_ROWS						0x00004 /* ROWS behavior */
-#define FRAMEOPTION_BETWEEN						0x00008 /* BETWEEN given? */
-#define FRAMEOPTION_START_UNBOUNDED_PRECEDING	0x00010 /* start is U. P. */
-#define FRAMEOPTION_END_UNBOUNDED_PRECEDING		0x00020 /* (disallowed) */
-#define FRAMEOPTION_START_UNBOUNDED_FOLLOWING	0x00040 /* (disallowed) */
-#define FRAMEOPTION_END_UNBOUNDED_FOLLOWING		0x00080 /* end is U. F. */
-#define FRAMEOPTION_START_CURRENT_ROW			0x00100 /* start is C. R. */
-#define FRAMEOPTION_END_CURRENT_ROW				0x00200 /* end is C. R. */
-#define FRAMEOPTION_START_VALUE_PRECEDING		0x00400 /* start is V. P. */
-#define FRAMEOPTION_END_VALUE_PRECEDING			0x00800 /* end is V. P. */
-#define FRAMEOPTION_START_VALUE_FOLLOWING		0x01000 /* start is V. F. */
-#define FRAMEOPTION_END_VALUE_FOLLOWING			0x02000 /* end is V. F. */
-
-#define FRAMEOPTION_START_VALUE \
-	(FRAMEOPTION_START_VALUE_PRECEDING | FRAMEOPTION_START_VALUE_FOLLOWING)
-#define FRAMEOPTION_END_VALUE \
-	(FRAMEOPTION_END_VALUE_PRECEDING | FRAMEOPTION_END_VALUE_FOLLOWING)
+#define FRAMEOPTION_GROUPS						0x00008 /* GROUPS behavior */
+#define FRAMEOPTION_BETWEEN						0x00010 /* BETWEEN given? */
+#define FRAMEOPTION_START_UNBOUNDED_PRECEDING	0x00020 /* start is U. P. */
+#define FRAMEOPTION_END_UNBOUNDED_PRECEDING		0x00040 /* (disallowed) */
+#define FRAMEOPTION_START_UNBOUNDED_FOLLOWING	0x00080 /* (disallowed) */
+#define FRAMEOPTION_END_UNBOUNDED_FOLLOWING		0x00100 /* end is U. F. */
+#define FRAMEOPTION_START_CURRENT_ROW			0x00200 /* start is C. R. */
+#define FRAMEOPTION_END_CURRENT_ROW				0x00400 /* end is C. R. */
+#define FRAMEOPTION_START_OFFSET_PRECEDING		0x00800 /* start is O. P. */
+#define FRAMEOPTION_END_OFFSET_PRECEDING		0x01000 /* end is O. P. */
+#define FRAMEOPTION_START_OFFSET_FOLLOWING		0x02000 /* start is O. F. */
+#define FRAMEOPTION_END_OFFSET_FOLLOWING		0x04000 /* end is O. F. */
+#define FRAMEOPTION_EXCLUDE_CURRENT_ROW			0x08000 /* omit C.R. */
+#define FRAMEOPTION_EXCLUDE_GROUP				0x10000 /* omit C.R. & peers */
+#define FRAMEOPTION_EXCLUDE_TIES				0x20000 /* omit C.R.'s peers */
+
+#define FRAMEOPTION_START_OFFSET \
+	(FRAMEOPTION_START_OFFSET_PRECEDING | FRAMEOPTION_START_OFFSET_FOLLOWING)
+#define FRAMEOPTION_END_OFFSET \
+	(FRAMEOPTION_END_OFFSET_PRECEDING | FRAMEOPTION_END_OFFSET_FOLLOWING)
+#define FRAMEOPTION_EXCLUSION \
+	(FRAMEOPTION_EXCLUDE_CURRENT_ROW | FRAMEOPTION_EXCLUDE_GROUP | \
+	 FRAMEOPTION_EXCLUDE_TIES)
 
 #define FRAMEOPTION_DEFAULTS \
 	(FRAMEOPTION_RANGE | FRAMEOPTION_START_UNBOUNDED_PRECEDING | \
@@ -647,6 +653,8 @@ typedef struct ColumnDef
 	Node	   *raw_default;	/* default value (untransformed parse tree) */
 	Node	   *cooked_default; /* default value (transformed expr tree) */
 	char		identity;		/* attidentity setting */
+	RangeVar   *identitySequence; /* to store identity sequence name for ALTER
+								   * TABLE ... ADD COLUMN */
 	CollateClause *collClause;	/* untransformed COLLATE spec, if any */
 	Oid			collOid;		/* collation OID (InvalidOid if not set) */
 	List	   *constraints;	/* other constraints on column */
@@ -777,12 +785,14 @@ typedef struct PartitionElem
 typedef struct PartitionSpec
 {
 	NodeTag		type;
-	char	   *strategy;		/* partitioning strategy ('list' or 'range') */
+	char	   *strategy;		/* partitioning strategy ('hash', 'list' or
+								 * 'range') */
 	List	   *partParams;		/* List of PartitionElems */
 	int			location;		/* token location, or -1 if unknown */
 } PartitionSpec;
 
 /* Internal codes for partitioning strategies */
+#define PARTITION_STRATEGY_HASH		'h'
 #define PARTITION_STRATEGY_LIST		'l'
 #define PARTITION_STRATEGY_RANGE	'r'
 
@@ -797,6 +807,11 @@ typedef struct PartitionBoundSpec
 	NodeTag		type;
 
 	char		strategy;		/* see PARTITION_STRATEGY codes above */
+	bool		is_default;		/* is it a default partition bound? */
+
+	/* Partitioning info for HASH strategy: */
+	int			modulus;
+	int			remainder;
 
 	/* Partitioning info for LIST strategy: */
 	List	   *listdatums;		/* List of Consts (or A_Consts in raw tree) */
@@ -832,7 +847,7 @@ typedef struct PartitionRangeDatum
 } PartitionRangeDatum;
 
 /*
- * PartitionCmd - info for ALTER TABLE ATTACH/DETACH PARTITION commands
+ * PartitionCmd - info for ALTER TABLE/INDEX ATTACH/DETACH PARTITION commands
  */
 typedef struct PartitionCmd
 {
@@ -887,8 +902,8 @@ typedef struct PartitionCmd
  *	  them from the joinaliasvars list, because that would affect the attnums
  *	  of Vars referencing the rest of the list.)
  *
- *	  inh is TRUE for relation references that should be expanded to include
- *	  inheritance children, if the rel has any.  This *must* be FALSE for
+ *	  inh is true for relation references that should be expanded to include
+ *	  inheritance children, if the rel has any.  This *must* be false for
  *	  RTEs other than RTE_RELATION entries.
  *
  *	  inFromCl marks those range variables that are listed in the FROM clause.
@@ -1025,6 +1040,11 @@ typedef struct RangeTblEntry
 	 * from the catalogs if 'relid' was supplied, but we'd still need these
 	 * for TupleDesc-based ENRs, so we might as well always store the type
 	 * info here).
+	 *
+	 * For ENRs only, we have to consider the possibility of dropped columns.
+	 * A dropped column is included in these lists, but it will have zeroes in
+	 * all three lists (as well as an empty-string entry in eref).  Testing
+	 * for zero coltype is the standard way to detect a dropped column.
 	 */
 	List	   *coltypes;		/* OID list of column type OIDs */
 	List	   *coltypmods;		/* integer list of column typmods */
@@ -1141,7 +1161,7 @@ typedef struct WithCheckOption
  *		or InvalidOid if not available.
  * nulls_first means about what you'd expect.  If sortop is InvalidOid
  *		then nulls_first is meaningless and should be set to false.
- * hashable is TRUE if eqop is hashable (note this condition also depends
+ * hashable is true if eqop is hashable (note this condition also depends
  *		on the datatype of the input expression).
  *
  * In an ORDER BY item, all fields must be valid.  (The eqop isn't essential
@@ -1263,6 +1283,9 @@ typedef struct GroupingSet
  * if the clause originally came from WINDOW, and is NULL if it originally
  * was an OVER clause (but note that we collapse out duplicate OVERs).
  * partitionClause and orderClause are lists of SortGroupClause structs.
+ * If we have RANGE with offset PRECEDING/FOLLOWING, the semantics of that are
+ * specified by startInRangeFunc/inRangeColl/inRangeAsc/inRangeNullsFirst
+ * for the start offset, or endInRangeFunc/inRange* for the end offset.
  * winref is an ID number referenced by WindowFunc nodes; it must be unique
  * among the members of a Query's windowClause list.
  * When refname isn't null, the partitionClause is always copied from there;
@@ -1279,6 +1302,11 @@ typedef struct WindowClause
 	int			frameOptions;	/* frame_clause options, see WindowDef */
 	Node	   *startOffset;	/* expression for starting bound, if any */
 	Node	   *endOffset;		/* expression for ending bound, if any */
+	Oid			startInRangeFunc;	/* in_range function for startOffset */
+	Oid			endInRangeFunc; /* in_range function for endOffset */
+	Oid			inRangeColl;	/* collation for in_range tests */
+	bool		inRangeAsc;		/* use ASC sort order for in_range tests? */
+	bool		inRangeNullsFirst;	/* nulls sort first for in_range tests? */
 	Index		winref;			/* ID referenced by window functions */
 	bool		copiedOrder;	/* did we copy orderClause from refname? */
 } WindowClause;
@@ -1630,9 +1658,11 @@ typedef enum ObjectType
 	OBJECT_OPERATOR,
 	OBJECT_OPFAMILY,
 	OBJECT_POLICY,
+	OBJECT_PROCEDURE,
 	OBJECT_PUBLICATION,
 	OBJECT_PUBLICATION_REL,
 	OBJECT_ROLE,
+	OBJECT_ROUTINE,
 	OBJECT_RULE,
 	OBJECT_SCHEMA,
 	OBJECT_SEQUENCE,
@@ -1707,6 +1737,7 @@ typedef enum AlterTableType
 	AT_AddConstraint,			/* add constraint */
 	AT_AddConstraintRecurse,	/* internal to commands/tablecmds.c */
 	AT_ReAddConstraint,			/* internal to commands/tablecmds.c */
+	AT_ReAddDomainConstraint,	/* internal to commands/tablecmds.c */
 	AT_AlterConstraint,			/* alter constraint */
 	AT_ValidateConstraint,		/* validate constraint */
 	AT_ValidateConstraintRecurse,	/* internal to commands/tablecmds.c */
@@ -1772,6 +1803,8 @@ typedef struct AlterTableCmd	/* one subcommand of an ALTER TABLE */
 	AlterTableType subtype;		/* Type of table alteration to apply */
 	char	   *name;			/* column, constraint, or trigger to act on,
 								 * or tablespace */
+	int16		num;			/* attribute number for columns referenced by
+								 * number */
 	RoleSpec   *newowner;
 	Node	   *def;			/* definition of new column, index,
 								 * constraint, or parent table */
@@ -1828,29 +1861,12 @@ typedef enum GrantTargetType
 	ACL_TARGET_DEFAULTS			/* ALTER DEFAULT PRIVILEGES */
 } GrantTargetType;
 
-typedef enum GrantObjectType
-{
-	ACL_OBJECT_COLUMN,			/* column */
-	ACL_OBJECT_RELATION,		/* table, view */
-	ACL_OBJECT_SEQUENCE,		/* sequence */
-	ACL_OBJECT_DATABASE,		/* database */
-	ACL_OBJECT_DOMAIN,			/* domain */
-	ACL_OBJECT_FDW,				/* foreign-data wrapper */
-	ACL_OBJECT_FOREIGN_SERVER,	/* foreign server */
-	ACL_OBJECT_FUNCTION,		/* function */
-	ACL_OBJECT_LANGUAGE,		/* procedural language */
-	ACL_OBJECT_LARGEOBJECT,		/* largeobject */
-	ACL_OBJECT_NAMESPACE,		/* namespace */
-	ACL_OBJECT_TABLESPACE,		/* tablespace */
-	ACL_OBJECT_TYPE				/* type */
-} GrantObjectType;
-
 typedef struct GrantStmt
 {
 	NodeTag		type;
 	bool		is_grant;		/* true = GRANT, false = REVOKE */
 	GrantTargetType targtype;	/* type of the grant target */
-	GrantObjectType objtype;	/* kind of object being operated on */
+	ObjectType	objtype;		/* kind of object being operated on */
 	List	   *objects;		/* list of RangeVar nodes, ObjectWithArgs
 								 * nodes, or plain names (as Value strings) */
 	List	   *privileges;		/* list of AccessPriv nodes */
@@ -2671,7 +2687,7 @@ typedef struct FetchStmt
 	FetchDirection direction;	/* see above */
 	long		howMany;		/* number of rows, or position argument */
 	char	   *portalname;		/* name of portal (cursor) */
-	bool		ismove;			/* TRUE if MOVE */
+	bool		ismove;			/* true if MOVE */
 } FetchStmt;
 
 /* ----------------------
@@ -2683,6 +2699,10 @@ typedef struct FetchStmt
  * index, just a UNIQUE/PKEY constraint using an existing index.  isconstraint
  * must always be true in this case, and the fields describing the index
  * properties are empty.
+ *
+ * The relation to build the index on can be represented either by name
+ * (in which case the RangeVar indicates whether to recurse or not) or by OID
+ * (in which case the command is always recursive).
  * ----------------------
  */
 typedef struct IndexStmt
@@ -2690,6 +2710,7 @@ typedef struct IndexStmt
 	NodeTag		type;
 	char	   *idxname;		/* name of new index, or NULL for default */
 	RangeVar   *relation;		/* relation to build index on */
+	Oid			relationId;		/* OID of relation to build index on */
 	char	   *accessMethod;	/* name of access method (eg. btree) */
 	char	   *tableSpace;		/* tablespace, or NULL for default */
 	List	   *indexParams;	/* columns to index: a list of IndexElem */
@@ -2730,12 +2751,12 @@ typedef struct CreateStatsStmt
 typedef struct CreateFunctionStmt
 {
 	NodeTag		type;
+	bool		is_procedure;	/* it's really CREATE PROCEDURE */
 	bool		replace;		/* T => replace if already exists */
 	List	   *funcname;		/* qualified name of function to create */
 	List	   *parameters;		/* a list of FunctionParameter */
 	TypeName   *returnType;		/* the return type */
 	List	   *options;		/* a list of DefElem */
-	List	   *withClause;		/* a list of DefElem */
 } CreateFunctionStmt;
 
 typedef enum FunctionParameterMode
@@ -2760,6 +2781,7 @@ typedef struct FunctionParameter
 typedef struct AlterFunctionStmt
 {
 	NodeTag		type;
+	ObjectType	objtype;
 	ObjectWithArgs *func;		/* name and args of function */
 	List	   *actions;		/* list of DefElem */
 } AlterFunctionStmt;
@@ -2782,8 +2804,26 @@ typedef struct InlineCodeBlock
 	char	   *source_text;	/* source text of anonymous code block */
 	Oid			langOid;		/* OID of selected language */
 	bool		langIsTrusted;	/* trusted property of the language */
+	bool		atomic;			/* atomic execution context */
 } InlineCodeBlock;
 
+/* ----------------------
+ *		CALL statement
+ * ----------------------
+ */
+typedef struct CallStmt
+{
+	NodeTag		type;
+	FuncCall   *funccall;		/* from the parser */
+	FuncExpr   *funcexpr;		/* transformed */
+} CallStmt;
+
+typedef struct CallContext
+{
+	NodeTag		type;
+	bool		atomic;
+} CallContext;
+
 /* ----------------------
  *		Alter Object Rename Statement
  * ----------------------
@@ -3090,12 +3130,26 @@ typedef enum VacuumOption
 	VACOPT_DISABLE_PAGE_SKIPPING = 1 << 7	/* don't skip any pages */
 } VacuumOption;
 
+/*
+ * Info about a single target table of VACUUM/ANALYZE.
+ *
+ * If the OID field is set, it always identifies the table to process.
+ * Then the relation field can be NULL; if it isn't, it's used only to report
+ * failure to open/lock the relation.
+ */
+typedef struct VacuumRelation
+{
+	NodeTag		type;
+	RangeVar   *relation;		/* table name to process, or NULL */
+	Oid			oid;			/* table's OID; InvalidOid if not looked up */
+	List	   *va_cols;		/* list of column names, or NIL for all */
+} VacuumRelation;
+
 typedef struct VacuumStmt
 {
 	NodeTag		type;
 	int			options;		/* OR of VacuumOption flags */
-	RangeVar   *relation;		/* single table to process, or NULL */
-	List	   *va_cols;		/* list of column names, or NIL for all */
+	List	   *rels;			/* list of VacuumRelation, or NIL for all */
 } VacuumStmt;
 
 /* ----------------------
diff --git a/src/include/nodes/pg_list.h b/src/include/nodes/pg_list.h
index 667d5e269c..e6cd2cdfba 100644
--- a/src/include/nodes/pg_list.h
+++ b/src/include/nodes/pg_list.h
@@ -27,7 +27,7 @@
  * always be so; try to be careful to maintain the distinction.)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/pg_list.h
@@ -269,6 +269,9 @@ extern void list_free_deep(List *list);
 extern List *list_copy(const List *list);
 extern List *list_copy_tail(const List *list, int nskip);
 
+typedef int (*list_qsort_comparator) (const void *a, const void *b);
+extern List *list_qsort(const List *list, list_qsort_comparator cmp);
+
 /*
  * To ease migration to the new list API, a set of compatibility
  * macros are provided that reduce the impact of the list API changes
diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h
index 7c51e7f9d2..f2e19eae68 100644
--- a/src/include/nodes/plannodes.h
+++ b/src/include/nodes/plannodes.h
@@ -4,7 +4,7 @@
  *	  definitions for query plan nodes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/plannodes.h
@@ -44,7 +44,7 @@ typedef struct PlannedStmt
 
 	CmdType		commandType;	/* select|insert|update|delete|utility */
 
-	uint32		queryId;		/* query identifier (copied from Query) */
+	uint64		queryId;		/* query identifier (copied from Query) */
 
 	bool		hasReturning;	/* is it insert|update|delete RETURNING? */
 
@@ -89,7 +89,7 @@ typedef struct PlannedStmt
 
 	List	   *invalItems;		/* other dependencies, as PlanInvalItems */
 
-	int			nParamExec;		/* number of PARAM_EXEC Params used */
+	List	   *paramExecTypes; /* type OIDs for PARAM_EXEC Params */
 
 	Node	   *utilityStmt;	/* non-null if this is utility stmt */
 
@@ -219,6 +219,7 @@ typedef struct ModifyTable
 	Index		nominalRelation;	/* Parent RT index for use of EXPLAIN */
 	/* RT indexes of non-leaf tables in a partition tree */
 	List	   *partitioned_rels;
+	bool		partColsUpdated;	/* some part key in hierarchy updated */
 	List	   *resultRelations;	/* integer list of RT indexes */
 	int			resultRelIndex; /* index of first resultRel in plan's list */
 	int			rootResultRelIndex; /* index of the partitioned table root */
@@ -248,6 +249,7 @@ typedef struct Append
 	/* RT indexes of non-leaf tables in a partition tree */
 	List	   *partitioned_rels;
 	List	   *appendplans;
+	int			first_partial_plan;
 } Append;
 
 /* ----------------
@@ -809,6 +811,12 @@ typedef struct WindowAgg
 	int			frameOptions;	/* frame_clause options, see WindowDef */
 	Node	   *startOffset;	/* expression for starting bound, if any */
 	Node	   *endOffset;		/* expression for ending bound, if any */
+	/* these fields are used with RANGE offset PRECEDING/FOLLOWING: */
+	Oid			startInRangeFunc;	/* in_range function for startOffset */
+	Oid			endInRangeFunc; /* in_range function for endOffset */
+	Oid			inRangeColl;	/* collation for in_range tests */
+	bool		inRangeAsc;		/* use ASC sort order for in_range tests? */
+	bool		inRangeNullsFirst;	/* nulls sort first for in_range tests? */
 } WindowAgg;
 
 /* ----------------
@@ -825,14 +833,24 @@ typedef struct Unique
 
 /* ------------
  *		gather node
+ *
+ * Note: rescan_param is the ID of a PARAM_EXEC parameter slot.  That slot
+ * will never actually contain a value, but the Gather node must flag it as
+ * having changed whenever it is rescanned.  The child parallel-aware scan
+ * nodes are marked as depending on that parameter, so that the rescan
+ * machinery is aware that their output is likely to change across rescans.
+ * In some cases we don't need a rescan Param, so rescan_param is set to -1.
  * ------------
  */
 typedef struct Gather
 {
 	Plan		plan;
-	int			num_workers;
-	bool		single_copy;
+	int			num_workers;	/* planned number of worker processes */
+	int			rescan_param;	/* ID of Param that signals a rescan, or -1 */
+	bool		single_copy;	/* don't execute plan more than once */
 	bool		invisible;		/* suppress EXPLAIN display (for testing)? */
+	Bitmapset  *initParam;		/* param id's of initplans which are referred
+								 * at gather or one of it's child node */
 } Gather;
 
 /* ------------
@@ -842,13 +860,16 @@ typedef struct Gather
 typedef struct GatherMerge
 {
 	Plan		plan;
-	int			num_workers;
+	int			num_workers;	/* planned number of worker processes */
+	int			rescan_param;	/* ID of Param that signals a rescan, or -1 */
 	/* remaining fields are just like the sort-key info in struct Sort */
 	int			numCols;		/* number of sort-key columns */
 	AttrNumber *sortColIdx;		/* their indexes in the target list */
 	Oid		   *sortOperators;	/* OIDs of operators to sort them by */
 	Oid		   *collations;		/* OIDs of collations */
 	bool	   *nullsFirst;		/* NULLS FIRST/LAST directions */
+	Bitmapset  *initParam;		/* param id's of initplans which are referred
+								 * at gather merge or one of it's child node */
 } GatherMerge;
 
 /* ----------------
@@ -866,6 +887,7 @@ typedef struct Hash
 	AttrNumber	skewColumn;		/* outer join key's column #, or zero */
 	bool		skewInherit;	/* is outer join rel an inheritance tree? */
 	/* all other info is in the parent HashJoin node */
+	double		rows_total;		/* estimate total rows if parallel_aware */
 } Hash;
 
 /* ----------------
diff --git a/src/include/nodes/primnodes.h b/src/include/nodes/primnodes.h
index 8c536a8d38..1b4b0d75af 100644
--- a/src/include/nodes/primnodes.h
+++ b/src/include/nodes/primnodes.h
@@ -7,7 +7,7 @@
  *	  and join trees.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/primnodes.h
@@ -166,7 +166,7 @@ typedef struct Var
 	Index		varno;			/* index of this var's relation in the range
 								 * table, or INNER_VAR/OUTER_VAR/INDEX_VAR */
 	AttrNumber	varattno;		/* attribute number of this var, or zero for
-								 * all */
+								 * all attrs ("whole-row Var") */
 	Oid			vartype;		/* pg_type OID for the type of this var */
 	int32		vartypmod;		/* pg_attribute typmod value */
 	Oid			varcollid;		/* OID of collation, or InvalidOid if none */
@@ -302,7 +302,7 @@ typedef struct Aggref
 	List	   *aggorder;		/* ORDER BY (list of SortGroupClause) */
 	List	   *aggdistinct;	/* DISTINCT (list of SortGroupClause) */
 	Expr	   *aggfilter;		/* FILTER expression, if any */
-	bool		aggstar;		/* TRUE if argument list was really '*' */
+	bool		aggstar;		/* true if argument list was really '*' */
 	bool		aggvariadic;	/* true if variadic arguments have been
 								 * combined into an array last argument */
 	char		aggkind;		/* aggregate kind (see pg_aggregate.h) */
@@ -359,7 +359,7 @@ typedef struct WindowFunc
 	List	   *args;			/* arguments to the window function */
 	Expr	   *aggfilter;		/* FILTER expression, if any */
 	Index		winref;			/* index of associated WindowClause */
-	bool		winstar;		/* TRUE if argument list was really '*' */
+	bool		winstar;		/* true if argument list was really '*' */
 	bool		winagg;			/* is function a simple aggregate? */
 	int			location;		/* token location, or -1 if unknown */
 } WindowFunc;
@@ -695,9 +695,9 @@ typedef struct SubPlan
 	Oid			firstColCollation;	/* Collation of first column of subplan
 									 * result */
 	/* Information about execution strategy: */
-	bool		useHashTable;	/* TRUE to store subselect output in a hash
+	bool		useHashTable;	/* true to store subselect output in a hash
 								 * table (implies we are doing "IN") */
-	bool		unknownEqFalse; /* TRUE if it's okay to return FALSE when the
+	bool		unknownEqFalse; /* true if it's okay to return FALSE when the
 								 * spec result is UNKNOWN; this allows much
 								 * simpler handling of null values */
 	bool		parallel_safe;	/* is the subplan parallel-safe? */
@@ -755,6 +755,9 @@ typedef struct FieldSelect
  * the assign case of ArrayRef, this is used to implement UPDATE of a
  * portion of a column.
  *
+ * resulttype is always a named composite type (not a domain).  To update
+ * a composite domain value, apply CoerceToDomain to the FieldStore.
+ *
  * A single FieldStore can actually represent updates of several different
  * fields.  The parser only generates FieldStores with single-element lists,
  * but the planner will collapse multiple updates of the same base column
@@ -820,11 +823,12 @@ typedef struct CoerceViaIO
  * ArrayCoerceExpr
  *
  * ArrayCoerceExpr represents a type coercion from one array type to another,
- * which is implemented by applying the indicated element-type coercion
- * function to each element of the source array.  If elemfuncid is InvalidOid
- * then the element types are binary-compatible, but the coercion still
- * requires some effort (we have to fix the element type ID stored in the
- * array header).
+ * which is implemented by applying the per-element coercion expression
+ * "elemexpr" to each element of the source array.  Within elemexpr, the
+ * source element is represented by a CaseTestExpr node.  Note that even if
+ * elemexpr is a no-op (that is, just CaseTestExpr + RelabelType), the
+ * coercion still requires some effort: we have to fix the element type OID
+ * stored in the array header.
  * ----------------
  */
 
@@ -832,11 +836,10 @@ typedef struct ArrayCoerceExpr
 {
 	Expr		xpr;
 	Expr	   *arg;			/* input expression (yields an array) */
-	Oid			elemfuncid;		/* OID of element coercion function, or 0 */
+	Expr	   *elemexpr;		/* expression representing per-element work */
 	Oid			resulttype;		/* output type of coercion (an array type) */
 	int32		resulttypmod;	/* output typmod (also element typmod) */
 	Oid			resultcollid;	/* OID of collation, or InvalidOid if none */
-	bool		isExplicit;		/* conversion semantics flag to pass to func */
 	CoercionForm coerceformat;	/* how to display this node */
 	int			location;		/* token location, or -1 if unknown */
 } ArrayCoerceExpr;
@@ -849,7 +852,8 @@ typedef struct ArrayCoerceExpr
  * needed for the destination type plus possibly others; the columns need not
  * be in the same positions, but are matched up by name.  This is primarily
  * used to convert a whole-row value of an inheritance child table into a
- * valid whole-row value of its parent table's rowtype.
+ * valid whole-row value of its parent table's rowtype.  Both resulttype
+ * and the exposed type of "arg" must be named composite types (not domains).
  * ----------------
  */
 
@@ -987,6 +991,9 @@ typedef struct RowExpr
 	Oid			row_typeid;		/* RECORDOID or a composite type's ID */
 
 	/*
+	 * row_typeid cannot be a domain over composite, only plain composite.  To
+	 * create a composite domain value, apply CoerceToDomain to the RowExpr.
+	 *
 	 * Note: we deliberately do NOT store a typmod.  Although a typmod will be
 	 * associated with specific RECORD types at runtime, it will differ for
 	 * different backends, and so cannot safely be stored in stored
diff --git a/src/include/nodes/print.h b/src/include/nodes/print.h
index fa01c2ad84..fba87c6c13 100644
--- a/src/include/nodes/print.h
+++ b/src/include/nodes/print.h
@@ -4,7 +4,7 @@
  *	  definitions for nodes/print.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/print.h
diff --git a/src/include/nodes/readfuncs.h b/src/include/nodes/readfuncs.h
index c80fae2311..491e61c459 100644
--- a/src/include/nodes/readfuncs.h
+++ b/src/include/nodes/readfuncs.h
@@ -4,7 +4,7 @@
  *	  header file for read.c and readfuncs.c. These functions are internal
  *	  to the stringToNode interface and should not be used by anyone else.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/readfuncs.h
diff --git a/src/include/nodes/relation.h b/src/include/nodes/relation.h
index 3ccc9d1b03..db8de2dfd0 100644
--- a/src/include/nodes/relation.h
+++ b/src/include/nodes/relation.h
@@ -4,7 +4,7 @@
  *	  Definitions for planner's internal data structures.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/relation.h
@@ -71,6 +71,8 @@ typedef struct AggClauseCosts
 typedef enum UpperRelationKind
 {
 	UPPERREL_SETOP,				/* result of UNION/INTERSECT/EXCEPT, if any */
+	UPPERREL_PARTIAL_GROUP_AGG, /* result of partial grouping/aggregation, if
+								 * any */
 	UPPERREL_GROUP_AGG,			/* result of grouping/aggregation, if any */
 	UPPERREL_WINDOW,			/* result of window functions, if any */
 	UPPERREL_DISTINCT,			/* result of "SELECT DISTINCT", if any */
@@ -114,7 +116,7 @@ typedef struct PlannerGlobal
 
 	List	   *invalItems;		/* other dependencies, as PlanInvalItems */
 
-	int			nParamExec;		/* number of PARAM_EXEC Params used */
+	List	   *paramExecTypes; /* type OIDs for PARAM_EXEC Params */
 
 	Index		lastPHId;		/* highest PlaceHolderVar ID assigned */
 
@@ -266,6 +268,9 @@ typedef struct PlannerInfo
 	List	   *distinct_pathkeys;	/* distinctClause pathkeys, if any */
 	List	   *sort_pathkeys;	/* sortClause pathkeys, if any */
 
+	List	   *part_schemes;	/* Canonicalised partition schemes used in the
+								 * query. */
+
 	List	   *initial_rels;	/* RelOptInfos we are now trying to join */
 
 	/* Use fetch_upper_rel() to get any particular upper rel */
@@ -326,6 +331,34 @@ typedef struct PlannerInfo
 	((root)->simple_rte_array ? (root)->simple_rte_array[rti] : \
 	 rt_fetch(rti, (root)->parse->rtable))
 
+/*
+ * If multiple relations are partitioned the same way, all such partitions
+ * will have a pointer to the same PartitionScheme.  A list of PartitionScheme
+ * objects is attached to the PlannerInfo.  By design, the partition scheme
+ * incorporates only the general properties of the partition method (LIST vs.
+ * RANGE, number of partitioning columns and the type information for each)
+ * and not the specific bounds.
+ *
+ * We store the opclass-declared input data types instead of the partition key
+ * datatypes since the former rather than the latter are used to compare
+ * partition bounds. Since partition key data types and the opclass declared
+ * input data types are expected to be binary compatible (per ResolveOpClass),
+ * both of those should have same byval and length properties.
+ */
+typedef struct PartitionSchemeData
+{
+	char		strategy;		/* partition strategy */
+	int16		partnatts;		/* number of partition attributes */
+	Oid		   *partopfamily;	/* OIDs of operator families */
+	Oid		   *partopcintype;	/* OIDs of opclass declared input data types */
+	Oid		   *parttypcoll;	/* OIDs of collations of partition keys. */
+
+	/* Cached information about partition key data types. */
+	int16	   *parttyplen;
+	bool	   *parttypbyval;
+}			PartitionSchemeData;
+
+typedef struct PartitionSchemeData *PartitionScheme;
 
 /*----------
  * RelOptInfo
@@ -360,6 +393,11 @@ typedef struct PlannerInfo
  * handling join alias Vars.  Currently this is not needed because all join
  * alias Vars are expanded to non-aliased form during preprocess_expression.
  *
+ * We also have relations representing joins between child relations of
+ * different partitioned tables. These relations are not added to
+ * join_rel_level lists as they are not joined directly by the dynamic
+ * programming algorithm.
+ *
  * There is also a RelOptKind for "upper" relations, which are RelOptInfos
  * that describe post-scan/join processing steps, such as aggregation.
  * Many of the fields in these RelOptInfos are meaningless, but their Path
@@ -456,7 +494,7 @@ typedef struct PlannerInfo
  *					other rels for which we have tried and failed to prove
  *					this one unique
  *
- * The presence of the remaining fields depends on the restrictions
+ * The presence of the following fields depends on the restrictions
  * and joins that the relation participates in:
  *
  *		baserestrictinfo - List of RestrictInfo nodes, containing info about
@@ -487,6 +525,25 @@ typedef struct PlannerInfo
  * We store baserestrictcost in the RelOptInfo (for base relations) because
  * we know we will need it at least once (to price the sequential scan)
  * and may need it multiple times to price index scans.
+ *
+ * If the relation is partitioned, these fields will be set:
+ *
+ * 		part_scheme - Partitioning scheme of the relation
+ * 		boundinfo - Partition bounds
+ * 		nparts - Number of partitions
+ * 		part_rels - RelOptInfos for each partition
+ * 		partexprs, nullable_partexprs - Partition key expressions
+ *
+ * Note: A base relation always has only one set of partition keys, but a join
+ * relation may have as many sets of partition keys as the number of relations
+ * being joined. partexprs and nullable_partexprs are arrays containing
+ * part_scheme->partnatts elements each. Each of these elements is a list of
+ * partition key expressions.  For a base relation each list in partexprs
+ * contains only one expression and nullable_partexprs is not populated. For a
+ * join relation, partexprs and nullable_partexprs contain partition key
+ * expressions from non-nullable and nullable relations resp. Lists at any
+ * given position in those arrays together contain as many elements as the
+ * number of joining relations.
  *----------
  */
 typedef enum RelOptKind
@@ -494,6 +551,7 @@ typedef enum RelOptKind
 	RELOPT_BASEREL,
 	RELOPT_JOINREL,
 	RELOPT_OTHER_MEMBER_REL,
+	RELOPT_OTHER_JOINREL,
 	RELOPT_UPPER_REL,
 	RELOPT_DEADREL
 } RelOptKind;
@@ -507,13 +565,17 @@ typedef enum RelOptKind
 	 (rel)->reloptkind == RELOPT_OTHER_MEMBER_REL)
 
 /* Is the given relation a join relation? */
-#define IS_JOIN_REL(rel) ((rel)->reloptkind == RELOPT_JOINREL)
+#define IS_JOIN_REL(rel)	\
+	((rel)->reloptkind == RELOPT_JOINREL || \
+	 (rel)->reloptkind == RELOPT_OTHER_JOINREL)
 
 /* Is the given relation an upper relation? */
 #define IS_UPPER_REL(rel) ((rel)->reloptkind == RELOPT_UPPER_REL)
 
 /* Is the given relation an "other" relation? */
-#define IS_OTHER_REL(rel) ((rel)->reloptkind == RELOPT_OTHER_MEMBER_REL)
+#define IS_OTHER_REL(rel) \
+	((rel)->reloptkind == RELOPT_OTHER_MEMBER_REL || \
+	 (rel)->reloptkind == RELOPT_OTHER_JOINREL)
 
 typedef struct RelOptInfo
 {
@@ -592,8 +654,40 @@ typedef struct RelOptInfo
 
 	/* used by "other" relations */
 	Relids		top_parent_relids;	/* Relids of topmost parents */
+
+	/* used for partitioned relations */
+	PartitionScheme part_scheme;	/* Partitioning scheme. */
+	int			nparts;			/* number of partitions */
+	struct PartitionBoundInfoData *boundinfo;	/* Partition bounds */
+	struct RelOptInfo **part_rels;	/* Array of RelOptInfos of partitions,
+									 * stored in the same order of bounds */
+	List	  **partexprs;		/* Non-nullable partition key expressions. */
+	List	  **nullable_partexprs; /* Nullable partition key expressions. */
 } RelOptInfo;
 
+/*
+ * Is given relation partitioned?
+ *
+ * It's not enough to test whether rel->part_scheme is set, because it might
+ * be that the basic partitioning properties of the input relations matched
+ * but the partition bounds did not.
+ *
+ * We treat dummy relations as unpartitioned.  We could alternatively
+ * treat them as partitioned, but it's not clear whether that's a useful thing
+ * to do.
+ */
+#define IS_PARTITIONED_REL(rel) \
+	((rel)->part_scheme && (rel)->boundinfo && (rel)->nparts > 0 && \
+	 (rel)->part_rels && !(IS_DUMMY_REL(rel)))
+
+/*
+ * Convenience macro to make sure that a partitioned relation has all the
+ * required members set.
+ */
+#define REL_HAS_ALL_PART_PROPS(rel)	\
+	((rel)->part_scheme && (rel)->boundinfo && (rel)->nparts > 0 && \
+	 (rel)->part_rels && (rel)->partexprs && (rel)->nullable_partexprs)
+
 /*
  * IndexOptInfo
  *		Per-index information for planning/optimization
@@ -1167,6 +1261,9 @@ typedef struct CustomPath
  * AppendPath represents an Append plan, ie, successive execution of
  * several member plans.
  *
+ * For partial Append, 'subpaths' contains non-partial subpaths followed by
+ * partial subpaths.
+ *
  * Note: it is possible for "subpaths" to contain only one, or even no,
  * elements.  These cases are optimized during create_append_plan.
  * In particular, an AppendPath with no subpaths is a "dummy" path that
@@ -1178,6 +1275,9 @@ typedef struct AppendPath
 	/* RT indexes of non-leaf tables in a partition tree */
 	List	   *partitioned_rels;
 	List	   *subpaths;		/* list of component Paths */
+
+	/* Index of first partial path in subpaths */
+	int			first_partial_path;
 } AppendPath;
 
 #define IS_DUMMY_PATH(p) \
@@ -1268,9 +1368,9 @@ typedef struct GatherPath
 } GatherPath;
 
 /*
- * GatherMergePath runs several copies of a plan in parallel and
- * collects the results. For gather merge parallel leader always execute the
- * plan.
+ * GatherMergePath runs several copies of a plan in parallel and collects
+ * the results, preserving their common sort order.  For gather merge, the
+ * parallel leader always executes the plan too, so we don't need single_copy.
  */
 typedef struct GatherMergePath
 {
@@ -1335,14 +1435,14 @@ typedef JoinPath NestPath;
  * mergejoin.  If it is not NIL then it is a PathKeys list describing
  * the ordering that must be created by an explicit Sort node.
  *
- * skip_mark_restore is TRUE if the executor need not do mark/restore calls.
+ * skip_mark_restore is true if the executor need not do mark/restore calls.
  * Mark/restore overhead is usually required, but can be skipped if we know
  * that the executor need find only one match per outer tuple, and that the
  * mergeclauses are sufficient to identify a match.  In such cases the
  * executor can immediately advance the outer relation after processing a
  * match, and therefoere it need never back up the inner relation.
  *
- * materialize_inner is TRUE if a Material node should be placed atop the
+ * materialize_inner is true if a Material node should be placed atop the
  * inner input.  This may appear with or without an inner Sort step.
  */
 
@@ -1370,6 +1470,7 @@ typedef struct HashPath
 	JoinPath	jpath;
 	List	   *path_hashclauses;	/* join clauses used for hashing */
 	int			num_batches;	/* number of batches expected */
+	double		inner_rows_total;	/* total inner rows expected */
 } HashPath;
 
 /*
@@ -1579,6 +1680,7 @@ typedef struct ModifyTablePath
 	Index		nominalRelation;	/* Parent RT index for use of EXPLAIN */
 	/* RT indexes of non-leaf tables in a partition tree */
 	List	   *partitioned_rels;
+	bool		partColsUpdated;	/* some part key in hierarchy updated */
 	List	   *resultRelations;	/* integer list of RT indexes */
 	List	   *subpaths;		/* Path(s) producing source data */
 	List	   *subroots;		/* per-target-table PlannerInfos */
@@ -1746,15 +1848,15 @@ typedef struct RestrictInfo
 
 	Expr	   *clause;			/* the represented clause of WHERE or JOIN */
 
-	bool		is_pushed_down; /* TRUE if clause was pushed down in level */
+	bool		is_pushed_down; /* true if clause was pushed down in level */
 
-	bool		outerjoin_delayed;	/* TRUE if delayed by lower outer join */
+	bool		outerjoin_delayed;	/* true if delayed by lower outer join */
 
 	bool		can_join;		/* see comment above */
 
 	bool		pseudoconstant; /* see comment above */
 
-	bool		leakproof;		/* TRUE if known to contain no leaked Vars */
+	bool		leakproof;		/* true if known to contain no leaked Vars */
 
 	Index		security_level; /* see comment above */
 
@@ -1885,7 +1987,7 @@ typedef struct PlaceHolderVar
  * syntactically below this special join.  (These are needed to help compute
  * min_lefthand and min_righthand for higher joins.)
  *
- * delay_upper_joins is set TRUE if we detect a pushed-down clause that has
+ * delay_upper_joins is set true if we detect a pushed-down clause that has
  * to be evaluated after this join is formed (because it references the RHS).
  * Any outer joins that have such a clause and this join in their RHS cannot
  * commute with this join, because that would leave noplace to check the
@@ -1935,10 +2037,10 @@ typedef struct SpecialJoinInfo
  *
  * When we expand an inheritable table or a UNION-ALL subselect into an
  * "append relation" (essentially, a list of child RTEs), we build an
- * AppendRelInfo for each non-partitioned child RTE.  The list of
- * AppendRelInfos indicates which child RTEs must be included when expanding
- * the parent, and each node carries information needed to translate Vars
- * referencing the parent into Vars referencing that child.
+ * AppendRelInfo for each child RTE.  The list of AppendRelInfos indicates
+ * which child RTEs must be included when expanding the parent, and each node
+ * carries information needed to translate Vars referencing the parent into
+ * Vars referencing that child.
  *
  * These structs are kept in the PlannerInfo node's append_rel_list.
  * Note that we just throw all the structs into one list, and scan the
@@ -2029,6 +2131,8 @@ typedef struct PartitionedChildRelInfo
 
 	Index		parent_relid;
 	List	   *child_rels;
+	bool		part_cols_updated;	/* is the partition key of any of
+									 * the partitioned tables updated? */
 } PartitionedChildRelInfo;
 
 /*
@@ -2131,8 +2235,8 @@ typedef struct MinMaxAggInfo
  * from subplans (values that are setParam items for those subplans).  These
  * IDs need not be tracked via PlannerParamItems, since we do not need any
  * duplicate-elimination nor later processing of the represented expressions.
- * Instead, we just record the assignment of the slot number by incrementing
- * root->glob->nParamExec.
+ * Instead, we just record the assignment of the slot number by appending to
+ * root->glob->paramExecTypes.
  */
 typedef struct PlannerParamItem
 {
@@ -2221,6 +2325,7 @@ typedef struct JoinCostWorkspace
 	/* private for cost_hashjoin code */
 	int			numbuckets;
 	int			numbatches;
+	double		inner_rows_total;
 } JoinCostWorkspace;
 
 #endif							/* RELATION_H */
diff --git a/src/include/nodes/replnodes.h b/src/include/nodes/replnodes.h
index dea61e90e9..66c948d85e 100644
--- a/src/include/nodes/replnodes.h
+++ b/src/include/nodes/replnodes.h
@@ -4,7 +4,7 @@
  *	  definitions for replication grammar parse nodes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/nodes/replnodes.h
@@ -68,6 +68,7 @@ typedef struct DropReplicationSlotCmd
 {
 	NodeTag		type;
 	char	   *slotname;
+	bool		wait;
 } DropReplicationSlotCmd;
 
 
diff --git a/src/include/nodes/tidbitmap.h b/src/include/nodes/tidbitmap.h
index f9a1902da8..31532e9769 100644
--- a/src/include/nodes/tidbitmap.h
+++ b/src/include/nodes/tidbitmap.h
@@ -13,7 +13,7 @@
  * fact that a particular page needs to be visited.
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/nodes/tidbitmap.h
  *
@@ -70,5 +70,6 @@ extern void tbm_end_iterate(TBMIterator *iterator);
 extern void tbm_end_shared_iterate(TBMSharedIterator *iterator);
 extern TBMSharedIterator *tbm_attach_shared_iterate(dsa_area *dsa,
 						  dsa_pointer dp);
+extern long tbm_calculate_entries(double maxbytes);
 
 #endif							/* TIDBITMAP_H */
diff --git a/src/include/nodes/value.h b/src/include/nodes/value.h
index 83f5a19fe9..94d09e176e 100644
--- a/src/include/nodes/value.h
+++ b/src/include/nodes/value.h
@@ -4,7 +4,7 @@
  *	  interface for Value nodes
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/nodes/value.h
  *
diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h
index e3672218f3..ba4fa4b68b 100644
--- a/src/include/optimizer/clauses.h
+++ b/src/include/optimizer/clauses.h
@@ -4,7 +4,7 @@
  *	  prototypes for clauses.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/clauses.h
diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h
index 63feba06e7..132e35551b 100644
--- a/src/include/optimizer/cost.h
+++ b/src/include/optimizer/cost.h
@@ -4,7 +4,7 @@
  *	  prototypes for costsize.c and clausesel.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/cost.h
@@ -53,21 +53,24 @@ extern PGDLLIMPORT double cpu_operator_cost;
 extern PGDLLIMPORT double parallel_tuple_cost;
 extern PGDLLIMPORT double parallel_setup_cost;
 extern PGDLLIMPORT int effective_cache_size;
-extern Cost disable_cost;
-extern int	max_parallel_workers_per_gather;
-extern bool enable_seqscan;
-extern bool enable_indexscan;
-extern bool enable_indexonlyscan;
-extern bool enable_bitmapscan;
-extern bool enable_tidscan;
-extern bool enable_sort;
-extern bool enable_hashagg;
-extern bool enable_nestloop;
-extern bool enable_material;
-extern bool enable_mergejoin;
-extern bool enable_hashjoin;
-extern bool enable_gathermerge;
-extern int	constraint_exclusion;
+extern PGDLLIMPORT Cost disable_cost;
+extern PGDLLIMPORT int	max_parallel_workers_per_gather;
+extern PGDLLIMPORT bool enable_seqscan;
+extern PGDLLIMPORT bool enable_indexscan;
+extern PGDLLIMPORT bool enable_indexonlyscan;
+extern PGDLLIMPORT bool enable_bitmapscan;
+extern PGDLLIMPORT bool enable_tidscan;
+extern PGDLLIMPORT bool enable_sort;
+extern PGDLLIMPORT bool enable_hashagg;
+extern PGDLLIMPORT bool enable_nestloop;
+extern PGDLLIMPORT bool enable_material;
+extern PGDLLIMPORT bool enable_mergejoin;
+extern PGDLLIMPORT bool enable_hashjoin;
+extern PGDLLIMPORT bool enable_gathermerge;
+extern PGDLLIMPORT bool enable_partitionwise_join;
+extern PGDLLIMPORT bool enable_parallel_append;
+extern PGDLLIMPORT bool enable_parallel_hash;
+extern PGDLLIMPORT int	constraint_exclusion;
 
 extern double clamp_row_est(double nrows);
 extern double index_pages_fetched(double tuples_fetched, BlockNumber pages,
@@ -105,6 +108,7 @@ extern void cost_sort(Path *path, PlannerInfo *root,
 		  List *pathkeys, Cost input_cost, double tuples, int width,
 		  Cost comparison_cost, int sort_mem,
 		  double limit_tuples);
+extern void cost_append(AppendPath *path);
 extern void cost_merge_append(Path *path, PlannerInfo *root,
 				  List *pathkeys, int n_streams,
 				  Cost input_startup_cost, Cost input_total_cost,
@@ -115,6 +119,7 @@ extern void cost_material(Path *path,
 extern void cost_agg(Path *path, PlannerInfo *root,
 		 AggStrategy aggstrategy, const AggClauseCosts *aggcosts,
 		 int numGroupCols, double numGroups,
+		 List *quals,
 		 Cost input_startup_cost, Cost input_total_cost,
 		 double input_tuples);
 extern void cost_windowagg(Path *path, PlannerInfo *root,
@@ -123,6 +128,7 @@ extern void cost_windowagg(Path *path, PlannerInfo *root,
 			   double input_tuples);
 extern void cost_group(Path *path, PlannerInfo *root,
 		   int numGroupCols, double numGroups,
+		   List *quals,
 		   Cost input_startup_cost, Cost input_total_cost,
 		   double input_tuples);
 extern void initial_cost_nestloop(PlannerInfo *root,
@@ -148,7 +154,8 @@ extern void initial_cost_hashjoin(PlannerInfo *root,
 					  JoinType jointype,
 					  List *hashclauses,
 					  Path *outer_path, Path *inner_path,
-					  JoinPathExtraData *extra);
+					  JoinPathExtraData *extra,
+					  bool parallel_hash);
 extern void final_cost_hashjoin(PlannerInfo *root, HashPath *path,
 					JoinCostWorkspace *workspace,
 					JoinPathExtraData *extra);
diff --git a/src/include/optimizer/geqo.h b/src/include/optimizer/geqo.h
index d0158d7adf..4ae4b6374a 100644
--- a/src/include/optimizer/geqo.h
+++ b/src/include/optimizer/geqo.h
@@ -3,7 +3,7 @@
  * geqo.h
  *	  prototypes for various files in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo.h
diff --git a/src/include/optimizer/geqo_copy.h b/src/include/optimizer/geqo_copy.h
index 4035b4ff13..f70786bef4 100644
--- a/src/include/optimizer/geqo_copy.h
+++ b/src/include/optimizer/geqo_copy.h
@@ -3,7 +3,7 @@
  * geqo_copy.h
  *	  prototypes for copy functions in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_copy.h
diff --git a/src/include/optimizer/geqo_gene.h b/src/include/optimizer/geqo_gene.h
index 3282193284..3ddd268449 100644
--- a/src/include/optimizer/geqo_gene.h
+++ b/src/include/optimizer/geqo_gene.h
@@ -3,7 +3,7 @@
  * geqo_gene.h
  *	  genome representation in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_gene.h
diff --git a/src/include/optimizer/geqo_misc.h b/src/include/optimizer/geqo_misc.h
index 89f91b3a4d..26a3669006 100644
--- a/src/include/optimizer/geqo_misc.h
+++ b/src/include/optimizer/geqo_misc.h
@@ -3,7 +3,7 @@
  * geqo_misc.h
  *	  prototypes for printout routines in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_misc.h
diff --git a/src/include/optimizer/geqo_mutation.h b/src/include/optimizer/geqo_mutation.h
index c5a94e03cf..c9a0025523 100644
--- a/src/include/optimizer/geqo_mutation.h
+++ b/src/include/optimizer/geqo_mutation.h
@@ -3,7 +3,7 @@
  * geqo_mutation.h
  *	  prototypes for mutation functions in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_mutation.h
diff --git a/src/include/optimizer/geqo_pool.h b/src/include/optimizer/geqo_pool.h
index 9fac307d69..eb343412f8 100644
--- a/src/include/optimizer/geqo_pool.h
+++ b/src/include/optimizer/geqo_pool.h
@@ -3,7 +3,7 @@
  * geqo_pool.h
  *	  pool representation in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_pool.h
diff --git a/src/include/optimizer/geqo_random.h b/src/include/optimizer/geqo_random.h
index 2665a096b3..03bd0ae8eb 100644
--- a/src/include/optimizer/geqo_random.h
+++ b/src/include/optimizer/geqo_random.h
@@ -3,7 +3,7 @@
  * geqo_random.h
  *	  random number generator
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_random.h
diff --git a/src/include/optimizer/geqo_recombination.h b/src/include/optimizer/geqo_recombination.h
index 60286c6c27..3ca89d8091 100644
--- a/src/include/optimizer/geqo_recombination.h
+++ b/src/include/optimizer/geqo_recombination.h
@@ -3,7 +3,7 @@
  * geqo_recombination.h
  *	  prototypes for recombination in the genetic query optimizer
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_recombination.h
diff --git a/src/include/optimizer/geqo_selection.h b/src/include/optimizer/geqo_selection.h
index 69ce2b4b8a..d6bea3c2bd 100644
--- a/src/include/optimizer/geqo_selection.h
+++ b/src/include/optimizer/geqo_selection.h
@@ -3,7 +3,7 @@
  * geqo_selection.h
  *	  prototypes for selection routines in optimizer/geqo
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/geqo_selection.h
diff --git a/src/include/optimizer/joininfo.h b/src/include/optimizer/joininfo.h
index 4450d81408..48f6d625e2 100644
--- a/src/include/optimizer/joininfo.h
+++ b/src/include/optimizer/joininfo.h
@@ -4,7 +4,7 @@
  *	  prototypes for joininfo.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/joininfo.h
diff --git a/src/include/optimizer/orclauses.h b/src/include/optimizer/orclauses.h
index a3d8e1d9f9..2154e66746 100644
--- a/src/include/optimizer/orclauses.h
+++ b/src/include/optimizer/orclauses.h
@@ -4,7 +4,7 @@
  *	  prototypes for orclauses.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/orclauses.h
diff --git a/src/include/optimizer/pathnode.h b/src/include/optimizer/pathnode.h
index e372f8862b..ef7173fbf8 100644
--- a/src/include/optimizer/pathnode.h
+++ b/src/include/optimizer/pathnode.h
@@ -4,7 +4,7 @@
  *	  prototypes for pathnode.c, relnode.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/pathnode.h
@@ -14,6 +14,7 @@
 #ifndef PATHNODE_H
 #define PATHNODE_H
 
+#include "nodes/bitmapset.h"
 #include "nodes/relation.h"
 
 
@@ -63,9 +64,11 @@ extern BitmapOrPath *create_bitmap_or_path(PlannerInfo *root,
 					  List *bitmapquals);
 extern TidPath *create_tidscan_path(PlannerInfo *root, RelOptInfo *rel,
 					List *tidquals, Relids required_outer);
-extern AppendPath *create_append_path(RelOptInfo *rel, List *subpaths,
-				   Relids required_outer, int parallel_workers,
-				   List *partitioned_rels);
+extern AppendPath *create_append_path(RelOptInfo *rel,
+				   List *subpaths, List *partial_subpaths,
+				   Relids required_outer,
+				   int parallel_workers, bool parallel_aware,
+				   List *partitioned_rels, double rows);
 extern MergeAppendPath *create_merge_append_path(PlannerInfo *root,
 						 RelOptInfo *rel,
 						 List *subpaths,
@@ -150,6 +153,7 @@ extern HashPath *create_hashjoin_path(PlannerInfo *root,
 					 JoinPathExtraData *extra,
 					 Path *outer_path,
 					 Path *inner_path,
+					 bool parallel_hash,
 					 List *restrict_clauses,
 					 Relids required_outer,
 					 List *hashclauses);
@@ -238,6 +242,7 @@ extern ModifyTablePath *create_modifytable_path(PlannerInfo *root,
 						RelOptInfo *rel,
 						CmdType operation, bool canSetTag,
 						Index nominalRelation, List *partitioned_rels,
+						bool partColsUpdated,
 						List *resultRelations, List *subpaths,
 						List *subroots,
 						List *withCheckOptionLists, List *returningLists,
@@ -251,6 +256,8 @@ extern LimitPath *create_limit_path(PlannerInfo *root, RelOptInfo *rel,
 extern Path *reparameterize_path(PlannerInfo *root, Path *path,
 					Relids required_outer,
 					double loop_count);
+extern Path *reparameterize_path_by_child(PlannerInfo *root, Path *path,
+							 RelOptInfo *child_rel);
 
 /*
  * prototypes for relnode.c
@@ -290,5 +297,9 @@ extern ParamPathInfo *get_appendrel_parampathinfo(RelOptInfo *appendrel,
 							Relids required_outer);
 extern ParamPathInfo *find_param_path_info(RelOptInfo *rel,
 					 Relids required_outer);
+extern RelOptInfo *build_child_join_rel(PlannerInfo *root,
+					 RelOptInfo *outer_rel, RelOptInfo *inner_rel,
+					 RelOptInfo *parent_joinrel, List *restrictlist,
+					 SpecialJoinInfo *sjinfo, JoinType jointype);
 
 #endif							/* PATHNODE_H */
diff --git a/src/include/optimizer/paths.h b/src/include/optimizer/paths.h
index 4e06b2e299..94f9bb2b57 100644
--- a/src/include/optimizer/paths.h
+++ b/src/include/optimizer/paths.h
@@ -4,7 +4,7 @@
  *	  prototypes for various files in optimizer/path
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/paths.h
@@ -20,10 +20,10 @@
 /*
  * allpaths.c
  */
-extern bool enable_geqo;
-extern int	geqo_threshold;
-extern int	min_parallel_table_scan_size;
-extern int	min_parallel_index_scan_size;
+extern PGDLLIMPORT bool enable_geqo;
+extern PGDLLIMPORT int	geqo_threshold;
+extern PGDLLIMPORT int	min_parallel_table_scan_size;
+extern PGDLLIMPORT int	min_parallel_index_scan_size;
 
 /* Hook for plugins to get control in set_rel_pathlist() */
 typedef void (*set_rel_pathlist_hook_type) (PlannerInfo *root,
@@ -53,11 +53,14 @@ extern void set_dummy_rel_pathlist(RelOptInfo *rel);
 extern RelOptInfo *standard_join_search(PlannerInfo *root, int levels_needed,
 					 List *initial_rels);
 
-extern void generate_gather_paths(PlannerInfo *root, RelOptInfo *rel);
+extern void generate_gather_paths(PlannerInfo *root, RelOptInfo *rel,
+					  bool override_rows);
 extern int compute_parallel_worker(RelOptInfo *rel, double heap_pages,
-						double index_pages);
+						double index_pages, int max_workers);
 extern void create_partial_bitmap_paths(PlannerInfo *root, RelOptInfo *rel,
 							Path *bitmapqual);
+extern void generate_partitionwise_join_paths(PlannerInfo *root,
+								   RelOptInfo *rel);
 
 #ifdef OPTIMIZER_DEBUG
 extern void debug_print_rel(PlannerInfo *root, RelOptInfo *rel);
@@ -111,6 +114,9 @@ extern bool have_join_order_restriction(PlannerInfo *root,
 							RelOptInfo *rel1, RelOptInfo *rel2);
 extern bool have_dangerous_phv(PlannerInfo *root,
 				   Relids outer_relids, Relids inner_params);
+extern void mark_dummy_rel(RelOptInfo *rel);
+extern bool have_partkey_equi_join(RelOptInfo *rel1, RelOptInfo *rel2,
+					   JoinType jointype, List *restrictlist);
 
 /*
  * equivclass.c
@@ -122,7 +128,8 @@ typedef bool (*ec_matches_callback_type) (PlannerInfo *root,
 										  EquivalenceMember *em,
 										  void *arg);
 
-extern bool process_equivalence(PlannerInfo *root, RestrictInfo *restrictinfo,
+extern bool process_equivalence(PlannerInfo *root,
+					RestrictInfo **p_restrictinfo,
 					bool below_outer_join);
 extern Expr *canonicalize_ec_expression(Expr *expr,
 						   Oid req_type, Oid req_collation);
@@ -210,16 +217,18 @@ extern void initialize_mergeclause_eclasses(PlannerInfo *root,
 								RestrictInfo *restrictinfo);
 extern void update_mergeclause_eclasses(PlannerInfo *root,
 							RestrictInfo *restrictinfo);
-extern List *find_mergeclauses_for_pathkeys(PlannerInfo *root,
-							   List *pathkeys,
-							   bool outer_keys,
-							   List *restrictinfos);
+extern List *find_mergeclauses_for_outer_pathkeys(PlannerInfo *root,
+									 List *pathkeys,
+									 List *restrictinfos);
 extern List *select_outer_pathkeys_for_merge(PlannerInfo *root,
 								List *mergeclauses,
 								RelOptInfo *joinrel);
 extern List *make_inner_pathkeys_for_merge(PlannerInfo *root,
 							  List *mergeclauses,
 							  List *outer_pathkeys);
+extern List *trim_mergeclauses_for_inner_pathkeys(PlannerInfo *root,
+									 List *mergeclauses,
+									 List *pathkeys);
 extern List *truncate_useless_pathkeys(PlannerInfo *root,
 						  RelOptInfo *rel,
 						  List *pathkeys);
diff --git a/src/include/optimizer/placeholder.h b/src/include/optimizer/placeholder.h
index 5a4d46ba9d..91ebdb90fc 100644
--- a/src/include/optimizer/placeholder.h
+++ b/src/include/optimizer/placeholder.h
@@ -4,7 +4,7 @@
  *	  prototypes for optimizer/util/placeholder.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/placeholder.h
@@ -28,5 +28,7 @@ extern void fix_placeholder_input_needed_levels(PlannerInfo *root);
 extern void add_placeholders_to_base_rels(PlannerInfo *root);
 extern void add_placeholders_to_joinrel(PlannerInfo *root, RelOptInfo *joinrel,
 							RelOptInfo *outer_rel, RelOptInfo *inner_rel);
+extern void add_placeholders_to_child_joinrel(PlannerInfo *root,
+								  RelOptInfo *childrel, RelOptInfo *parentrel);
 
 #endif							/* PLACEHOLDER_H */
diff --git a/src/include/optimizer/plancat.h b/src/include/optimizer/plancat.h
index 71f0faf938..7d53cbbb87 100644
--- a/src/include/optimizer/plancat.h
+++ b/src/include/optimizer/plancat.h
@@ -4,7 +4,7 @@
  *	  prototypes for plancat.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/plancat.h
diff --git a/src/include/optimizer/planmain.h b/src/include/optimizer/planmain.h
index f1d16cffab..7132c88242 100644
--- a/src/include/optimizer/planmain.h
+++ b/src/include/optimizer/planmain.h
@@ -4,7 +4,7 @@
  *	  prototypes for various files in optimizer/plan
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/planmain.h
@@ -29,6 +29,7 @@ typedef enum
 #define DEFAULT_CURSOR_TUPLE_FRACTION 0.1
 extern double cursor_tuple_fraction;
 extern int	force_parallel_mode;
+extern bool parallel_leader_participation;
 
 /* query_planner callback to compute query_pathkeys */
 typedef void (*query_pathkeys_callback) (PlannerInfo *root, void *extra);
diff --git a/src/include/optimizer/planner.h b/src/include/optimizer/planner.h
index 2a4cf71e10..0d8b88d78b 100644
--- a/src/include/optimizer/planner.h
+++ b/src/include/optimizer/planner.h
@@ -4,7 +4,7 @@
  *	  prototypes for planner.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/planner.h
@@ -56,7 +56,11 @@ extern Expr *expression_planner(Expr *expr);
 extern Expr *preprocess_phv_expression(PlannerInfo *root, Expr *expr);
 
 extern bool plan_cluster_use_sort(Oid tableOid, Oid indexOid);
+extern int	plan_create_index_workers(Oid tableOid, Oid indexOid);
 
-extern List *get_partitioned_child_rels(PlannerInfo *root, Index rti);
+extern List *get_partitioned_child_rels(PlannerInfo *root, Index rti,
+						   bool *part_cols_updated);
+extern List *get_partitioned_child_rels_for_join(PlannerInfo *root,
+									Relids join_relids);
 
 #endif							/* PLANNER_H */
diff --git a/src/include/optimizer/predtest.h b/src/include/optimizer/predtest.h
index bccb8d63a9..88d2ca7e44 100644
--- a/src/include/optimizer/predtest.h
+++ b/src/include/optimizer/predtest.h
@@ -4,7 +4,7 @@
  *	  prototypes for predtest.c
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/predtest.h
diff --git a/src/include/optimizer/prep.h b/src/include/optimizer/prep.h
index 4be0afd566..89b7ef337c 100644
--- a/src/include/optimizer/prep.h
+++ b/src/include/optimizer/prep.h
@@ -4,7 +4,7 @@
  *	  prototypes for files in optimizer/prep/
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/prep.h
@@ -38,10 +38,7 @@ extern Expr *canonicalize_qual(Expr *qual);
 /*
  * prototypes for preptlist.c
  */
-extern List *preprocess_targetlist(PlannerInfo *root, List *tlist);
-
-extern List *preprocess_onconflict_targetlist(List *tlist,
-								 int result_relation, List *range_table);
+extern List *preprocess_targetlist(PlannerInfo *root);
 
 extern PlanRowMark *get_plan_rowmark(List *rowmarks, Index rtindex);
 
@@ -62,4 +59,10 @@ extern Node *adjust_appendrel_attrs_multilevel(PlannerInfo *root, Node *node,
 extern AppendRelInfo **find_appinfos_by_relids(PlannerInfo *root,
 						Relids relids, int *nappinfos);
 
+extern SpecialJoinInfo *build_child_join_sjinfo(PlannerInfo *root,
+						SpecialJoinInfo *parent_sjinfo,
+						Relids left_relids, Relids right_relids);
+extern Relids adjust_child_relids_multilevel(PlannerInfo *root, Relids relids,
+							   Relids child_relids, Relids top_parent_relids);
+
 #endif							/* PREP_H */
diff --git a/src/include/optimizer/restrictinfo.h b/src/include/optimizer/restrictinfo.h
index b2a69998fd..9cd874d07e 100644
--- a/src/include/optimizer/restrictinfo.h
+++ b/src/include/optimizer/restrictinfo.h
@@ -4,7 +4,7 @@
  *	  prototypes for restrictinfo.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/restrictinfo.h
diff --git a/src/include/optimizer/subselect.h b/src/include/optimizer/subselect.h
index ecd2011d54..d28c993b3a 100644
--- a/src/include/optimizer/subselect.h
+++ b/src/include/optimizer/subselect.h
@@ -2,7 +2,7 @@
  *
  * subselect.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/subselect.h
diff --git a/src/include/optimizer/tlist.h b/src/include/optimizer/tlist.h
index 0d3ec920dd..9fa52e1278 100644
--- a/src/include/optimizer/tlist.h
+++ b/src/include/optimizer/tlist.h
@@ -4,7 +4,7 @@
  *	  prototypes for tlist.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/tlist.h
diff --git a/src/include/optimizer/var.h b/src/include/optimizer/var.h
index 61861528af..43c53b5344 100644
--- a/src/include/optimizer/var.h
+++ b/src/include/optimizer/var.h
@@ -4,7 +4,7 @@
  *	  prototypes for optimizer/util/var.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/optimizer/var.h
diff --git a/src/include/parser/analyze.h b/src/include/parser/analyze.h
index 40f22339f1..687ae1b5b7 100644
--- a/src/include/parser/analyze.h
+++ b/src/include/parser/analyze.h
@@ -4,7 +4,7 @@
  *		parse analysis for optimizable statements
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/analyze.h
diff --git a/src/include/parser/gramparse.h b/src/include/parser/gramparse.h
index b6b67fb92c..42e7edee6d 100644
--- a/src/include/parser/gramparse.h
+++ b/src/include/parser/gramparse.h
@@ -8,7 +8,7 @@
  * Definitions that are needed outside the core parser should be in parser.h.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/gramparse.h
diff --git a/src/include/parser/kwlist.h b/src/include/parser/kwlist.h
index f50e45e886..cf32197bc3 100644
--- a/src/include/parser/kwlist.h
+++ b/src/include/parser/kwlist.h
@@ -7,7 +7,7 @@
  * by the PG_KEYWORD macro, which is not defined in this file; it can
  * be defined by the caller for special purposes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -63,6 +63,7 @@ PG_KEYWORD("boolean", BOOLEAN_P, COL_NAME_KEYWORD)
 PG_KEYWORD("both", BOTH, RESERVED_KEYWORD)
 PG_KEYWORD("by", BY, UNRESERVED_KEYWORD)
 PG_KEYWORD("cache", CACHE, UNRESERVED_KEYWORD)
+PG_KEYWORD("call", CALL, UNRESERVED_KEYWORD)
 PG_KEYWORD("called", CALLED, UNRESERVED_KEYWORD)
 PG_KEYWORD("cascade", CASCADE, UNRESERVED_KEYWORD)
 PG_KEYWORD("cascaded", CASCADED, UNRESERVED_KEYWORD)
@@ -181,6 +182,7 @@ PG_KEYWORD("granted", GRANTED, UNRESERVED_KEYWORD)
 PG_KEYWORD("greatest", GREATEST, COL_NAME_KEYWORD)
 PG_KEYWORD("group", GROUP_P, RESERVED_KEYWORD)
 PG_KEYWORD("grouping", GROUPING, COL_NAME_KEYWORD)
+PG_KEYWORD("groups", GROUPS, UNRESERVED_KEYWORD)
 PG_KEYWORD("handler", HANDLER, UNRESERVED_KEYWORD)
 PG_KEYWORD("having", HAVING, RESERVED_KEYWORD)
 PG_KEYWORD("header", HEADER_P, UNRESERVED_KEYWORD)
@@ -282,6 +284,7 @@ PG_KEYWORD("options", OPTIONS, UNRESERVED_KEYWORD)
 PG_KEYWORD("or", OR, RESERVED_KEYWORD)
 PG_KEYWORD("order", ORDER, RESERVED_KEYWORD)
 PG_KEYWORD("ordinality", ORDINALITY, UNRESERVED_KEYWORD)
+PG_KEYWORD("others", OTHERS, UNRESERVED_KEYWORD)
 PG_KEYWORD("out", OUT_P, COL_NAME_KEYWORD)
 PG_KEYWORD("outer", OUTER_P, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("over", OVER, UNRESERVED_KEYWORD)
@@ -310,6 +313,7 @@ PG_KEYWORD("prior", PRIOR, UNRESERVED_KEYWORD)
 PG_KEYWORD("privileges", PRIVILEGES, UNRESERVED_KEYWORD)
 PG_KEYWORD("procedural", PROCEDURAL, UNRESERVED_KEYWORD)
 PG_KEYWORD("procedure", PROCEDURE, UNRESERVED_KEYWORD)
+PG_KEYWORD("procedures", PROCEDURES, UNRESERVED_KEYWORD)
 PG_KEYWORD("program", PROGRAM, UNRESERVED_KEYWORD)
 PG_KEYWORD("publication", PUBLICATION, UNRESERVED_KEYWORD)
 PG_KEYWORD("quote", QUOTE, UNRESERVED_KEYWORD)
@@ -340,6 +344,8 @@ PG_KEYWORD("right", RIGHT, TYPE_FUNC_NAME_KEYWORD)
 PG_KEYWORD("role", ROLE, UNRESERVED_KEYWORD)
 PG_KEYWORD("rollback", ROLLBACK, UNRESERVED_KEYWORD)
 PG_KEYWORD("rollup", ROLLUP, UNRESERVED_KEYWORD)
+PG_KEYWORD("routine", ROUTINE, UNRESERVED_KEYWORD)
+PG_KEYWORD("routines", ROUTINES, UNRESERVED_KEYWORD)
 PG_KEYWORD("row", ROW, COL_NAME_KEYWORD)
 PG_KEYWORD("rows", ROWS, UNRESERVED_KEYWORD)
 PG_KEYWORD("rule", RULE, UNRESERVED_KEYWORD)
@@ -393,6 +399,7 @@ PG_KEYWORD("template", TEMPLATE, UNRESERVED_KEYWORD)
 PG_KEYWORD("temporary", TEMPORARY, UNRESERVED_KEYWORD)
 PG_KEYWORD("text", TEXT_P, UNRESERVED_KEYWORD)
 PG_KEYWORD("then", THEN, RESERVED_KEYWORD)
+PG_KEYWORD("ties", TIES, UNRESERVED_KEYWORD)
 PG_KEYWORD("time", TIME, COL_NAME_KEYWORD)
 PG_KEYWORD("timestamp", TIMESTAMP, COL_NAME_KEYWORD)
 PG_KEYWORD("to", TO, RESERVED_KEYWORD)
diff --git a/src/include/parser/parse_agg.h b/src/include/parser/parse_agg.h
index 6947a0186e..0e6adffe57 100644
--- a/src/include/parser/parse_agg.h
+++ b/src/include/parser/parse_agg.h
@@ -3,7 +3,7 @@
  * parse_agg.h
  *	  handle aggregates and window functions in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_agg.h
diff --git a/src/include/parser/parse_clause.h b/src/include/parser/parse_clause.h
index 1d205c6327..2c0e092862 100644
--- a/src/include/parser/parse_clause.h
+++ b/src/include/parser/parse_clause.h
@@ -4,7 +4,7 @@
  *	  handle clauses in parser
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_clause.h
diff --git a/src/include/parser/parse_coerce.h b/src/include/parser/parse_coerce.h
index 06f65293cb..af12c136ef 100644
--- a/src/include/parser/parse_coerce.h
+++ b/src/include/parser/parse_coerce.h
@@ -4,7 +4,7 @@
  *	Routines for type coercion.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_coerce.h
@@ -48,9 +48,8 @@ extern Node *coerce_type(ParseState *pstate, Node *node,
 			CoercionContext ccontext, CoercionForm cformat, int location);
 extern Node *coerce_to_domain(Node *arg, Oid baseTypeId, int32 baseTypeMod,
 				 Oid typeId,
-				 CoercionForm cformat, int location,
-				 bool hideInputCoercion,
-				 bool lengthCoercionDone);
+				 CoercionContext ccontext, CoercionForm cformat, int location,
+				 bool hideInputCoercion);
 
 extern Node *coerce_to_boolean(ParseState *pstate, Node *node,
 				  const char *constructName);
diff --git a/src/include/parser/parse_collate.h b/src/include/parser/parse_collate.h
index 7279fa4e7c..aea297ce38 100644
--- a/src/include/parser/parse_collate.h
+++ b/src/include/parser/parse_collate.h
@@ -4,7 +4,7 @@
  *	Routines for assigning collation information.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_collate.h
diff --git a/src/include/parser/parse_cte.h b/src/include/parser/parse_cte.h
index 695e88c7ed..7e862d1906 100644
--- a/src/include/parser/parse_cte.h
+++ b/src/include/parser/parse_cte.h
@@ -4,7 +4,7 @@
  *	  handle CTEs (common table expressions) in parser
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_cte.h
diff --git a/src/include/parser/parse_enr.h b/src/include/parser/parse_enr.h
index 9c68ddbb04..e8af457e02 100644
--- a/src/include/parser/parse_enr.h
+++ b/src/include/parser/parse_enr.h
@@ -4,7 +4,7 @@
  *		Internal definitions for parser
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_enr.h
diff --git a/src/include/parser/parse_expr.h b/src/include/parser/parse_expr.h
index 3af09b0056..e5aff61b8f 100644
--- a/src/include/parser/parse_expr.h
+++ b/src/include/parser/parse_expr.h
@@ -3,7 +3,7 @@
  * parse_expr.h
  *	  handle expressions in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_expr.h
diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h
index b4b6084b1b..2e3810fc32 100644
--- a/src/include/parser/parse_func.h
+++ b/src/include/parser/parse_func.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_func.h
@@ -24,6 +24,7 @@ typedef enum
 	FUNCDETAIL_NOTFOUND,		/* no matching function */
 	FUNCDETAIL_MULTIPLE,		/* too many matching functions */
 	FUNCDETAIL_NORMAL,			/* found a matching regular function */
+	FUNCDETAIL_PROCEDURE,		/* found a matching procedure */
 	FUNCDETAIL_AGGREGATE,		/* found a matching aggregate function */
 	FUNCDETAIL_WINDOWFUNC,		/* found a matching window function */
 	FUNCDETAIL_COERCION			/* it's a type coercion request */
@@ -31,7 +32,8 @@ typedef enum
 
 
 extern Node *ParseFuncOrColumn(ParseState *pstate, List *funcname, List *fargs,
-				  Node *last_srf, FuncCall *fn, int location);
+							   Node *last_srf, FuncCall *fn, bool proc_call,
+							   int location);
 
 extern FuncDetailCode func_get_detail(List *funcname,
 				List *fargs, List *fargnames,
@@ -62,10 +64,8 @@ extern const char *func_signature_string(List *funcname, int nargs,
 
 extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes,
 			   bool noError);
-extern Oid LookupFuncWithArgs(ObjectWithArgs *func,
+extern Oid LookupFuncWithArgs(ObjectType objtype, ObjectWithArgs *func,
 				   bool noError);
-extern Oid LookupAggWithArgs(ObjectWithArgs *agg,
-				  bool noError);
 
 extern void check_srf_call_placement(ParseState *pstate, Node *last_srf,
 						 int location);
diff --git a/src/include/parser/parse_node.h b/src/include/parser/parse_node.h
index 68930c1f4a..0230543810 100644
--- a/src/include/parser/parse_node.h
+++ b/src/include/parser/parse_node.h
@@ -4,7 +4,7 @@
  *		Internal definitions for parser
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_node.h
@@ -45,6 +45,7 @@ typedef enum ParseExprKind
 	EXPR_KIND_WINDOW_ORDER,		/* window definition ORDER BY */
 	EXPR_KIND_WINDOW_FRAME_RANGE,	/* window frame clause with RANGE */
 	EXPR_KIND_WINDOW_FRAME_ROWS,	/* window frame clause with ROWS */
+	EXPR_KIND_WINDOW_FRAME_GROUPS,	/* window frame clause with GROUPS */
 	EXPR_KIND_SELECT_TARGET,	/* SELECT target list item */
 	EXPR_KIND_INSERT_TARGET,	/* INSERT target list item */
 	EXPR_KIND_UPDATE_SOURCE,	/* UPDATE assignment source item */
@@ -67,7 +68,8 @@ typedef enum ParseExprKind
 	EXPR_KIND_EXECUTE_PARAMETER,	/* parameter value in EXECUTE */
 	EXPR_KIND_TRIGGER_WHEN,		/* WHEN condition in CREATE TRIGGER */
 	EXPR_KIND_POLICY,			/* USING or WITH CHECK expr in policy */
-	EXPR_KIND_PARTITION_EXPRESSION	/* PARTITION BY expression */
+	EXPR_KIND_PARTITION_EXPRESSION, /* PARTITION BY expression */
+	EXPR_KIND_CALL_ARGUMENT		/* procedure argument in CALL */
 } ParseExprKind;
 
 
@@ -111,7 +113,7 @@ typedef Node *(*CoerceParamHook) (ParseState *pstate, Param *param,
  * namespace for table and column lookup.  (The RTEs listed here may be just
  * a subset of the whole rtable.  See ParseNamespaceItem comments below.)
  *
- * p_lateral_active: TRUE if we are currently parsing a LATERAL subexpression
+ * p_lateral_active: true if we are currently parsing a LATERAL subexpression
  * of this parse level.  This makes p_lateral_only namespace items visible,
  * whereas they are not visible when p_lateral_active is FALSE.
  *
diff --git a/src/include/parser/parse_oper.h b/src/include/parser/parse_oper.h
index 3cab732b1f..da9cd3877c 100644
--- a/src/include/parser/parse_oper.h
+++ b/src/include/parser/parse_oper.h
@@ -4,7 +4,7 @@
  *		handle operator things for parser
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_oper.h
diff --git a/src/include/parser/parse_param.h b/src/include/parser/parse_param.h
index 50c21cfc9d..fd6c695ebf 100644
--- a/src/include/parser/parse_param.h
+++ b/src/include/parser/parse_param.h
@@ -3,7 +3,7 @@
  * parse_param.h
  *	  handle parameters in parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_param.h
diff --git a/src/include/parser/parse_relation.h b/src/include/parser/parse_relation.h
index 91542d4f15..b9792acdae 100644
--- a/src/include/parser/parse_relation.h
+++ b/src/include/parser/parse_relation.h
@@ -4,7 +4,7 @@
  *	  prototypes for parse_relation.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_relation.h
@@ -54,9 +54,9 @@ extern RangeTblEntry *GetRTEByRangeTablePosn(ParseState *pstate,
 extern CommonTableExpr *GetCTEForRTE(ParseState *pstate, RangeTblEntry *rte,
 			 int rtelevelsup);
 extern Node *scanRTEForColumn(ParseState *pstate, RangeTblEntry *rte,
-				 char *colname, int location,
+				 const char *colname, int location,
 				 int fuzzy_rte_penalty, FuzzyAttrMatchState *fuzzystate);
-extern Node *colNameToVar(ParseState *pstate, char *colname, bool localonly,
+extern Node *colNameToVar(ParseState *pstate, const char *colname, bool localonly,
 			 int location);
 extern void markVarForSelectPriv(ParseState *pstate, Var *var,
 					 RangeTblEntry *rte);
@@ -117,7 +117,7 @@ extern void addRTEtoQuery(ParseState *pstate, RangeTblEntry *rte,
 			  bool addToRelNameSpace, bool addToVarNameSpace);
 extern void errorMissingRTE(ParseState *pstate, RangeVar *relation) pg_attribute_noreturn();
 extern void errorMissingColumn(ParseState *pstate,
-				   char *relname, char *colname, int location) pg_attribute_noreturn();
+				   const char *relname, const char *colname, int location) pg_attribute_noreturn();
 extern void expandRTE(RangeTblEntry *rte, int rtindex, int sublevels_up,
 		  int location, bool include_dropped,
 		  List **colnames, List **colvars);
diff --git a/src/include/parser/parse_target.h b/src/include/parser/parse_target.h
index 44af46b1aa..ec6e0c102f 100644
--- a/src/include/parser/parse_target.h
+++ b/src/include/parser/parse_target.h
@@ -4,7 +4,7 @@
  *	  handle target lists
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_target.h
@@ -28,7 +28,7 @@ extern TargetEntry *transformTargetEntry(ParseState *pstate,
 					 char *colname, bool resjunk);
 extern Expr *transformAssignedExpr(ParseState *pstate, Expr *expr,
 					  ParseExprKind exprKind,
-					  char *colname,
+					  const char *colname,
 					  int attrno,
 					  List *indirection,
 					  int location);
diff --git a/src/include/parser/parse_type.h b/src/include/parser/parse_type.h
index 7b843d0b9d..ab16737d57 100644
--- a/src/include/parser/parse_type.h
+++ b/src/include/parser/parse_type.h
@@ -3,7 +3,7 @@
  * parse_type.h
  *		handle type operations for parser
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_type.h
@@ -46,10 +46,12 @@ extern Oid	typeTypeCollation(Type typ);
 extern Datum stringTypeDatum(Type tp, char *string, int32 atttypmod);
 
 extern Oid	typeidTypeRelid(Oid type_id);
+extern Oid	typeOrDomainTypeRelid(Oid type_id);
 
 extern TypeName *typeStringToTypeName(const char *str);
 extern void parseTypeString(const char *str, Oid *typeid_p, int32 *typmod_p, bool missing_ok);
 
-#define ISCOMPLEX(typeid) (typeidTypeRelid(typeid) != InvalidOid)
+/* true if typeid is composite, or domain over composite, but not RECORD */
+#define ISCOMPLEX(typeid) (typeOrDomainTypeRelid(typeid) != InvalidOid)
 
 #endif							/* PARSE_TYPE_H */
diff --git a/src/include/parser/parse_utilcmd.h b/src/include/parser/parse_utilcmd.h
index e749432ef0..35ac97940a 100644
--- a/src/include/parser/parse_utilcmd.h
+++ b/src/include/parser/parse_utilcmd.h
@@ -4,7 +4,7 @@
  *		parse analysis for utility commands
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parse_utilcmd.h
@@ -27,5 +27,9 @@ extern void transformRuleStmt(RuleStmt *stmt, const char *queryString,
 extern List *transformCreateSchemaStmt(CreateSchemaStmt *stmt);
 extern PartitionBoundSpec *transformPartitionBound(ParseState *pstate, Relation parent,
 						PartitionBoundSpec *spec);
+extern IndexStmt *generateClonedIndexStmt(RangeVar *heapRel, Oid heapOid,
+						Relation source_idx,
+						const AttrNumber *attmap, int attmap_length,
+						Oid *constraintOid);
 
 #endif							/* PARSE_UTILCMD_H */
diff --git a/src/include/parser/parser.h b/src/include/parser/parser.h
index 8370df6bbb..f26f6e22e1 100644
--- a/src/include/parser/parser.h
+++ b/src/include/parser/parser.h
@@ -5,7 +5,7 @@
  *
  * This is the external API for the raw lexing/parsing functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parser.h
diff --git a/src/include/parser/parsetree.h b/src/include/parser/parsetree.h
index 96cb2e2f67..dd9ae658ac 100644
--- a/src/include/parser/parsetree.h
+++ b/src/include/parser/parsetree.h
@@ -5,7 +5,7 @@
  *	  parse trees.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/parsetree.h
diff --git a/src/include/parser/scanner.h b/src/include/parser/scanner.h
index bb95de730b..20bf1e6672 100644
--- a/src/include/parser/scanner.h
+++ b/src/include/parser/scanner.h
@@ -8,7 +8,7 @@
  * higher-level API provided by parser.h.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/scanner.h
diff --git a/src/include/parser/scansup.h b/src/include/parser/scansup.h
index f9a36b5cbd..766b3f908a 100644
--- a/src/include/parser/scansup.h
+++ b/src/include/parser/scansup.h
@@ -4,7 +4,7 @@
  *	  scanner support routines.  used by both the bootstrap lexer
  * as well as the normal lexer
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/parser/scansup.h
diff --git a/src/include/pg_config.h.in b/src/include/pg_config.h.in
index dcb7a1a320..f98f773ff0 100644
--- a/src/include/pg_config.h.in
+++ b/src/include/pg_config.h.in
@@ -27,6 +27,9 @@
 /* The normal alignment of `long long int', in bytes. */
 #undef ALIGNOF_LONG_LONG_INT
 
+/* The normal alignment of `PG_INT128_TYPE', in bytes. */
+#undef ALIGNOF_PG_INT128_TYPE
+
 /* The normal alignment of `short', in bytes. */
 #undef ALIGNOF_SHORT
 
@@ -147,6 +150,10 @@
    don't. */
 #undef HAVE_DECL_STRLCPY
 
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#undef HAVE_DECL_STRNLEN
+
 /* Define to 1 if you have the declaration of `sys_siglist', and to 0 if you
    don't. */
 #undef HAVE_DECL_SYS_SIGLIST
@@ -303,6 +310,9 @@
 /* Define to 1 if you have the <ldap.h> header file. */
 #undef HAVE_LDAP_H
 
+/* Define to 1 if you have the `ldap_initialize' function. */
+#undef HAVE_LDAP_INITIALIZE
+
 /* Define to 1 if you have the `crypto' library (-lcrypto). */
 #undef HAVE_LIBCRYPTO
 
@@ -339,10 +349,6 @@
 /* Define to 1 if you have the `z' library (-lz). */
 #undef HAVE_LIBZ
 
-/* Define to 1 if constants of type 'long long int' should have the suffix LL.
-   */
-#undef HAVE_LL_CONSTANTS
-
 /* Define to 1 if the system has the type `locale_t'. */
 #undef HAVE_LOCALE_T
 
@@ -397,6 +403,9 @@
 /* Define to 1 if you have the `posix_fadvise' function. */
 #undef HAVE_POSIX_FADVISE
 
+/* Define to 1 if you have the `posix_fallocate' function. */
+#undef HAVE_POSIX_FALLOCATE
+
 /* Define to 1 if the assembler supports PPC's LWARX mutex hint bit. */
 #undef HAVE_PPC_LWARX_MUTEX_HINT
 
@@ -497,6 +506,9 @@
 /* Define to 1 if you have the `strlcpy' function. */
 #undef HAVE_STRLCPY
 
+/* Define to 1 if you have the `strnlen' function. */
+#undef HAVE_STRNLEN
+
 /* Define to use have a strong random number source */
 #undef HAVE_STRONG_RANDOM
 
@@ -597,9 +609,6 @@
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 #undef HAVE_TM_ZONE
 
-/* Define to 1 if you have the `towlower' function. */
-#undef HAVE_TOWLOWER
-
 /* Define to 1 if your compiler understands `typeof' or something similar. */
 #undef HAVE_TYPEOF
 
@@ -663,9 +672,6 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #undef HAVE_WCHAR_H
 
-/* Define to 1 if you have the `wcstombs' function. */
-#undef HAVE_WCSTOMBS
-
 /* Define to 1 if you have the `wcstombs_l' function. */
 #undef HAVE_WCSTOMBS_L
 
@@ -675,6 +681,12 @@
 /* Define to 1 if you have the <winldap.h> header file. */
 #undef HAVE_WINLDAP_H
 
+/* Define to 1 if you have the `X509_get_signature_nid' function. */
+#undef HAVE_X509_GET_SIGNATURE_NID
+
+/* Define to 1 if your compiler understands __builtin_bswap16. */
+#undef HAVE__BUILTIN_BSWAP16
+
 /* Define to 1 if your compiler understands __builtin_bswap32. */
 #undef HAVE__BUILTIN_BSWAP32
 
@@ -684,6 +696,9 @@
 /* Define to 1 if your compiler understands __builtin_constant_p. */
 #undef HAVE__BUILTIN_CONSTANT_P
 
+/* Define to 1 if your compiler understands __builtin_$op_overflow. */
+#undef HAVE__BUILTIN_OP_OVERFLOW
+
 /* Define to 1 if your compiler understands __builtin_types_compatible_p. */
 #undef HAVE__BUILTIN_TYPES_COMPATIBLE_P
 
@@ -899,11 +914,6 @@
    */
 #undef XLOG_BLCKSZ
 
-/* XLOG_SEG_SIZE is the size of a single WAL file. This must be a power of 2
-   and larger than XLOG_BLCKSZ (preferably, a great deal larger than
-   XLOG_BLCKSZ). Changing XLOG_SEG_SIZE requires an initdb. */
-#undef XLOG_SEG_SIZE
-
 
 
 /* Number of bits in a file offset, on hosts where this is settable. */
@@ -925,6 +935,24 @@
    if such a type exists, and if the system does not define it. */
 #undef intptr_t
 
+/* Define to keyword to use for C99 restrict support, or to nothing if not
+   supported */
+#undef pg_restrict
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+#undef restrict
+/* Work around a bug in Sun C++: it does not support _Restrict or
+   __restrict__, even though the corresponding Sun C compiler ends up with
+   "#define restrict _Restrict" or "#define restrict __restrict__" in the
+   previous line.  Perhaps some future version of Sun C++ will work with
+   restrict; if so, hopefully it defines __RESTRICT like Sun C does.  */
+#if defined __SUNPRO_CC && !defined __RESTRICT
+# define _Restrict
+# define __restrict__
+#endif
+
 /* Define to empty if the C compiler does not understand signed types. */
 #undef signed
 
diff --git a/src/include/pg_config.h.win32 b/src/include/pg_config.h.win32
index 0b4110472e..7150f7614f 100644
--- a/src/include/pg_config.h.win32
+++ b/src/include/pg_config.h.win32
@@ -34,6 +34,9 @@
 /* The alignment requirement of a `long long int'. */
 #define ALIGNOF_LONG_LONG_INT 8
 
+/* The normal alignment of `PG_INT128_TYPE', in bytes. */
+#undef ALIGNOF_PG_INT128_TYPE
+
 /* The alignment requirement of a `short'. */
 #define ALIGNOF_SHORT 2
 
@@ -99,6 +102,10 @@
    don't. */
 #define HAVE_DECL_SNPRINTF 1
 
+/* Define to 1 if you have the declaration of `strnlen', and to 0 if you
+   don't. */
+#define HAVE_DECL_STRNLEN 1
+
 /* Define to 1 if you have the declaration of `vsnprintf', and to 0 if you
    don't. */
 #define HAVE_DECL_VSNPRINTF 1
@@ -223,21 +230,20 @@
 /* Define to 1 if you have the `z' library (-lz). */
 /* #undef HAVE_LIBZ */
 
-/* Define to 1 if constants of type 'long long int' should have the suffix LL.
-   */
-#if (_MSC_VER > 1200)
-#define HAVE_LL_CONSTANTS 1
-#endif
-
 /* Define to 1 if the system has the type `locale_t'. */
 #define HAVE_LOCALE_T 1
 
 /* Define to 1 if `long int' works and is 64 bits. */
 /* #undef HAVE_LONG_INT_64 */
 
+/* Define to 1 if the system has the type `long long int'. */
+#if (_MSC_VER > 1200)
+#define HAVE_LONG_LONG_INT 1
+#endif
+
 /* Define to 1 if `long long int' works and is 64 bits. */
 #if (_MSC_VER > 1200)
-#define HAVE_LONG_LONG_INT_64
+#define HAVE_LONG_LONG_INT_64 1
 #endif
 
 /* Define to 1 if you have the `mbstowcs_l' function. */
@@ -261,12 +267,18 @@
 /* Define to 1 if you have the <pam/pam_appl.h> header file. */
 /* #undef HAVE_PAM_PAM_APPL_H */
 
+/* Define to 1 if you have the `strnlen' function. */
+#define HAVE_STRNLEN 1
+
 /* Define to 1 if you have the `poll' function. */
 /* #undef HAVE_POLL */
 
 /* Define to 1 if you have the <poll.h> header file. */
 /* #undef HAVE_POLL_H */
 
+/* Define to 1 if you have the `posix_fallocate' function. */
+/* #undef HAVE_POSIX_FALLOCATE */
+
 /* Define to 1 if you have the `pstat' function. */
 /* #undef HAVE_PSTAT */
 
@@ -448,9 +460,6 @@
    `HAVE_STRUCT_TM_TM_ZONE' instead. */
 /* #undef HAVE_TM_ZONE */
 
-/* Define to 1 if you have the `towlower' function. */
-#define HAVE_TOWLOWER 1
-
 /* Define to 1 if your compiler understands `typeof' or something similar. */
 /* #undef HAVE_TYPEOF */
 
@@ -490,9 +499,6 @@
 /* Define to 1 if you have the <wchar.h> header file. */
 #define HAVE_WCHAR_H 1
 
-/* Define to 1 if you have the `wcstombs' function. */
-#define HAVE_WCSTOMBS 1
-
 /* Define to 1 if you have the `wcstombs_l' function. */
 #define HAVE_WCSTOMBS_L 1
 
@@ -502,6 +508,9 @@
 /* Define to 1 if you have the <winldap.h> header file. */
 /* #undef HAVE_WINLDAP_H */
 
+/* Define to 1 if your compiler understands __builtin_bswap16. */
+/* #undef HAVE__BUILTIN_BSWAP16 */
+
 /* Define to 1 if your compiler understands __builtin_bswap32. */
 /* #undef HAVE__BUILTIN_BSWAP32 */
 
@@ -511,6 +520,9 @@
 /* Define to 1 if your compiler understands __builtin_constant_p. */
 /* #undef HAVE__BUILTIN_CONSTANT_P */
 
+/* Define to 1 if your compiler understands __builtin_$op_overflow. */
+/* #undef HAVE__BUILTIN_OP_OVERFLOW */
+
 /* Define to 1 if your compiler understands __builtin_types_compatible_p. */
 /* #undef HAVE__BUILTIN_TYPES_COMPATIBLE_P */
 
@@ -680,6 +692,20 @@
 #define inline __inline
 #endif
 
+/* Define to keyword to use for C99 restrict support, or to nothing if this is
+   not supported */
+/* Works for C and C++ in Visual Studio 2008 and upwards */
+#if (_MSC_VER >= 1500)
+#define pg_restrict __restrict
+#else
+#define pg_restrict
+#endif
+
+/* Define to the equivalent of the C99 'restrict' keyword, or to
+   nothing if this is not supported.  Do not define if restrict is
+   supported directly.  */
+/* not defined, because it'd conflict with __declspec(restrict) */
+
 /* Define to empty if the C compiler does not understand signed types. */
 /* #undef signed */
 
diff --git a/src/include/pg_config_cmake.in b/src/include/pg_config_cmake.in
index 616067a57e..448db2e56c 100644
--- a/src/include/pg_config_cmake.in
+++ b/src/include/pg_config_cmake.in
@@ -84,6 +84,12 @@
 /* Define to 1 if you have the <atomic.h> header file. */
 #cmakedefine HAVE_ATOMIC_H 1
 
+/* Define to 1 if you have the `BIO_get_data' function. */
+#cmakedefine HAVE_BIO_GET_DATA
+
+/* Define to 1 if you have the `BIO_meth_new' function. */
+#cmakedefine HAVE_BIO_METH_NEW
+#
 /* Define if you have the `cbrt' function. */
 #cmakedefine HAVE_CBRT 1
 
@@ -316,6 +322,9 @@
    */
 #cmakedefine HAVE_LL_CONSTANTS 1
 
+/* Define restrict */
+#cmakedefine HAVE_RESTRICT 1
+
 /* Define to 1 if the system has the type `locale_t'. */
 #cmakedefine HAVE_LOCALE_T
 
diff --git a/src/include/pg_config_manual.h b/src/include/pg_config_manual.h
index f3b35297d1..b309395f11 100644
--- a/src/include/pg_config_manual.h
+++ b/src/include/pg_config_manual.h
@@ -6,13 +6,19 @@
  * for developers.  If you edit any of these, be sure to do a *full*
  * rebuild (and an initdb if noted).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/pg_config_manual.h
  *------------------------------------------------------------------------
  */
 
+/*
+ * This is default value for wal_segment_size to be used at initdb when run
+ * without --walsegsize option. Must be a valid segment size.
+ */
+#define DEFAULT_XLOG_SEG_SIZE	(16*1024*1024)
+
 /*
  * Maximum length for identifiers (e.g. table names, column names,
  * function names).  Names actually are limited to one less byte than this,
@@ -66,16 +72,6 @@
  */
 #define NUM_ATOMICS_SEMAPHORES		64
 
-/*
- * Define this if you want to allow the lo_import and lo_export SQL
- * functions to be executed by ordinary users.  By default these
- * functions are only available to the Postgres superuser.  CAUTION:
- * These functions are SECURITY HOLES since they can read and write
- * any file that the PostgreSQL server has permission to access.  If
- * you turn this on, don't say we didn't warn you.
- */
-/* #define ALLOW_DANGEROUS_LO_FUNCTIONS */
-
 /*
  * MAXPGPATH: standard size of a pathname buffer in PostgreSQL (hence,
  * maximum usable pathname length is one less).
diff --git a/src/include/pg_getopt.h b/src/include/pg_getopt.h
index 16d5a326f9..c050f2025f 100644
--- a/src/include/pg_getopt.h
+++ b/src/include/pg_getopt.h
@@ -2,7 +2,7 @@
  * Portions Copyright (c) 1987, 1993, 1994
  * The Regents of the University of California.  All rights reserved.
  *
- * Portions Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * src/include/pg_getopt.h
  */
diff --git a/src/include/pg_trace.h b/src/include/pg_trace.h
index 29bc95d0d3..e00e39da4e 100644
--- a/src/include/pg_trace.h
+++ b/src/include/pg_trace.h
@@ -3,7 +3,7 @@
  *
  *	Definitions for the PostgreSQL tracing framework
  *
- *	Copyright (c) 2006-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2006-2018, PostgreSQL Global Development Group
  *
  *	src/include/pg_trace.h
  * ----------
diff --git a/src/include/pgstat.h b/src/include/pgstat.h
index cb05d9b81e..be2f59239b 100644
--- a/src/include/pgstat.h
+++ b/src/include/pgstat.h
@@ -3,7 +3,7 @@
  *
  *	Definitions for the PostgreSQL statistics collector daemon.
  *
- *	Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ *	Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  *	src/include/pgstat.h
  * ----------
@@ -803,6 +803,21 @@ typedef enum
 	WAIT_EVENT_BGWORKER_STARTUP,
 	WAIT_EVENT_BTREE_PAGE,
 	WAIT_EVENT_EXECUTE_GATHER,
+	WAIT_EVENT_HASH_BATCH_ALLOCATING,
+	WAIT_EVENT_HASH_BATCH_ELECTING,
+	WAIT_EVENT_HASH_BATCH_LOADING,
+	WAIT_EVENT_HASH_BUILD_ALLOCATING,
+	WAIT_EVENT_HASH_BUILD_ELECTING,
+	WAIT_EVENT_HASH_BUILD_HASHING_INNER,
+	WAIT_EVENT_HASH_BUILD_HASHING_OUTER,
+	WAIT_EVENT_HASH_GROW_BATCHES_ELECTING,
+	WAIT_EVENT_HASH_GROW_BATCHES_FINISHING,
+	WAIT_EVENT_HASH_GROW_BATCHES_REPARTITIONING,
+	WAIT_EVENT_HASH_GROW_BATCHES_ALLOCATING,
+	WAIT_EVENT_HASH_GROW_BATCHES_DECIDING,
+	WAIT_EVENT_HASH_GROW_BUCKETS_ELECTING,
+	WAIT_EVENT_HASH_GROW_BUCKETS_REINSERTING,
+	WAIT_EVENT_HASH_GROW_BUCKETS_ALLOCATING,
 	WAIT_EVENT_LOGICAL_SYNC_DATA,
 	WAIT_EVENT_LOGICAL_SYNC_STATE_CHANGE,
 	WAIT_EVENT_MQ_INTERNAL,
@@ -811,7 +826,9 @@ typedef enum
 	WAIT_EVENT_MQ_SEND,
 	WAIT_EVENT_PARALLEL_FINISH,
 	WAIT_EVENT_PARALLEL_BITMAP_SCAN,
+	WAIT_EVENT_PARALLEL_CREATE_INDEX_SCAN,
 	WAIT_EVENT_PROCARRAY_GROUP_UPDATE,
+	WAIT_EVENT_CLOG_GROUP_UPDATE,
 	WAIT_EVENT_REPLICATION_ORIGIN_DROP,
 	WAIT_EVENT_REPLICATION_SLOT_DROP,
 	WAIT_EVENT_SAFE_SNAPSHOT,
@@ -1002,8 +1019,14 @@ typedef struct PgBackendStatus
 	/* application name; MUST be null-terminated */
 	char	   *st_appname;
 
-	/* current command string; MUST be null-terminated */
-	char	   *st_activity;
+	/*
+	 * Current command string; MUST be null-terminated. Note that this string
+	 * possibly is truncated in the middle of a multi-byte character. As
+	 * activity strings are stored more frequently than read, that allows to
+	 * move the cost of correct truncation to the display side. Use
+	 * pgstat_clip_activity() to truncate correctly.
+	 */
+	char	   *st_activity_raw;
 
 	/*
 	 * Command progress reporting.  Any command which wishes can advertise
@@ -1192,6 +1215,8 @@ extern PgStat_BackendFunctionEntry *find_funcstat_entry(Oid func_id);
 
 extern void pgstat_initstats(Relation rel);
 
+extern char *pgstat_clip_activity(const char *raw_activity);
+
 /* ----------
  * pgstat_report_wait_start() -
  *
diff --git a/src/include/pgtar.h b/src/include/pgtar.h
index 9a1be4c9f6..9eaa8bf15d 100644
--- a/src/include/pgtar.h
+++ b/src/include/pgtar.h
@@ -4,7 +4,7 @@
  *	  Functions for manipulating tarfile datastructures (src/port/tar.c)
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/pgtar.h
diff --git a/src/include/pgtime.h b/src/include/pgtime.h
index 4fd8f75ef9..5f18b04b20 100644
--- a/src/include/pgtime.h
+++ b/src/include/pgtime.h
@@ -3,7 +3,7 @@
  * pgtime.h
  *	  PostgreSQL internal timezone library
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/include/pgtime.h
@@ -70,7 +70,7 @@ extern size_t pg_strftime(char *s, size_t max, const char *format,
 
 /* these functions and variables are in pgtz.c */
 
-extern pg_tz *session_timezone;
+extern PGDLLIMPORT pg_tz *session_timezone;
 extern pg_tz *log_timezone;
 
 extern void pg_timezone_initialize(void);
diff --git a/src/include/port.h b/src/include/port.h
index b1ba645655..3e528fa172 100644
--- a/src/include/port.h
+++ b/src/include/port.h
@@ -3,7 +3,7 @@
  * port.h
  *	  Header for src/port/ compatibility functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/port.h
@@ -17,6 +17,15 @@
 #include <netdb.h>
 #include <pwd.h>
 
+/*
+ * Windows has enough specialized port stuff that we push most of it off
+ * into another file.
+ * Note: Some CYGWIN includes might #define WIN32.
+ */
+#if defined(WIN32) && !defined(__CYGWIN__)
+#include "port/win32_port.h"
+#endif
+
 /* socket has a different definition on WIN32 */
 #ifndef WIN32
 typedef int pgsocket;
@@ -101,11 +110,6 @@ extern int find_other_exec(const char *argv0, const char *target,
 /* Doesn't belong here, but this is used with find_other_exec(), so... */
 #define PG_BACKEND_VERSIONSTR "postgres (PostgreSQL) " PG_VERSION "\n"
 
-/* Windows security token manipulation (in exec.c) */
-#ifdef WIN32
-extern BOOL AddUserToTokenDacl(HANDLE hToken);
-#endif
-
 
 #if defined(WIN32) || defined(__CYGWIN__)
 #define EXE ".exe"
@@ -185,36 +189,10 @@ extern int	pg_printf(const char *fmt,...) pg_attribute_printf(1, 2);
 #endif
 #endif							/* USE_REPL_SNPRINTF */
 
-#if defined(WIN32)
-/*
- * Versions of libintl >= 0.18? try to replace setlocale() with a macro
- * to their own versions.  Remove the macro, if it exists, because it
- * ends up calling the wrong version when the backend and libintl use
- * different versions of msvcrt.
- */
-#if defined(setlocale)
-#undef setlocale
-#endif
-
-/*
- * Define our own wrapper macro around setlocale() to work around bugs in
- * Windows' native setlocale() function.
- */
-extern char *pgwin32_setlocale(int category, const char *locale);
-
-#define setlocale(a,b) pgwin32_setlocale(a,b)
-#endif							/* WIN32 */
-
 /* Portable prompt handling */
 extern void simple_prompt(const char *prompt, char *destination, size_t destlen,
 			  bool echo);
 
-#ifdef WIN32
-#define PG_SIGNAL_COUNT 32
-#define kill(pid,sig)	pgkill(pid,sig)
-extern int	pgkill(int pid, int sig);
-#endif
-
 extern int	pclose_check(FILE *stream);
 
 /* Global variable holding time zone information. */
@@ -262,23 +240,6 @@ extern bool pgwin32_is_junction(const char *path);
 
 extern bool rmtree(const char *path, bool rmtopdir);
 
-/*
- * stat() is not guaranteed to set the st_size field on win32, so we
- * redefine it to our own implementation that is.
- *
- * We must pull in sys/stat.h here so the system header definition
- * goes in first, and we redefine that, and not the other way around.
- *
- * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
- * is defined we don't bother with this.
- */
-#if defined(WIN32) && !defined(__CYGWIN__) && !defined(UNSAFE_STAT_OK)
-#include <sys/stat.h>
-extern int	pgwin32_safestat(const char *path, struct stat *buf);
-
-#define stat(a,b) pgwin32_safestat(a,b)
-#endif
-
 #if defined(WIN32) && !defined(__CYGWIN__)
 
 /*
@@ -353,7 +314,7 @@ extern int	gettimeofday(struct timeval *tp, struct timezone *tzp);
 extern char *crypt(const char *key, const char *setting);
 #endif
 
-/* WIN32 handled in port/win32.h */
+/* WIN32 handled in port/win32_port.h */
 #ifndef WIN32
 #define pgoff_t off_t
 #ifdef __NetBSD__
@@ -406,6 +367,10 @@ extern size_t strlcat(char *dst, const char *src, size_t siz);
 extern size_t strlcpy(char *dst, const char *src, size_t siz);
 #endif
 
+#if !HAVE_DECL_STRNLEN
+extern size_t strnlen(const char *str, size_t maxlen);
+#endif
+
 #if !defined(HAVE_RANDOM)
 extern long random(void);
 #endif
diff --git a/src/include/port/atomics.h b/src/include/port/atomics.h
index 2bfd1ed728..8c825bd926 100644
--- a/src/include/port/atomics.h
+++ b/src/include/port/atomics.h
@@ -28,7 +28,7 @@
  * For an introduction to using memory barriers within the PostgreSQL backend,
  * see src/backend/storage/lmgr/README.barrier
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/port/atomics.h
diff --git a/src/include/port/atomics/arch-arm.h b/src/include/port/atomics/arch-arm.h
index 58614ae2ca..99fe3bbfd2 100644
--- a/src/include/port/atomics/arch-arm.h
+++ b/src/include/port/atomics/arch-arm.h
@@ -3,7 +3,7 @@
  * arch-arm.h
  *	  Atomic operations considerations specific to ARM
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * NOTES:
  *
diff --git a/src/include/port/atomics/arch-hppa.h b/src/include/port/atomics/arch-hppa.h
index c4176c6f42..818a3e0c87 100644
--- a/src/include/port/atomics/arch-hppa.h
+++ b/src/include/port/atomics/arch-hppa.h
@@ -3,7 +3,7 @@
  * arch-hppa.h
  *	  Atomic operations considerations specific to HPPA
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/arch-ia64.h b/src/include/port/atomics/arch-ia64.h
index 3dc4b298e1..571a79ee67 100644
--- a/src/include/port/atomics/arch-ia64.h
+++ b/src/include/port/atomics/arch-ia64.h
@@ -3,7 +3,7 @@
  * arch-ia64.h
  *	  Atomic operations considerations specific to intel itanium
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/arch-ppc.h b/src/include/port/atomics/arch-ppc.h
index ed30468398..faeb7a5d15 100644
--- a/src/include/port/atomics/arch-ppc.h
+++ b/src/include/port/atomics/arch-ppc.h
@@ -3,7 +3,7 @@
  * arch-ppc.h
  *	  Atomic operations considerations specific to PowerPC
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/arch-x86.h b/src/include/port/atomics/arch-x86.h
index bf8152573d..5a3d95e056 100644
--- a/src/include/port/atomics/arch-x86.h
+++ b/src/include/port/atomics/arch-x86.h
@@ -7,7 +7,7 @@
  * support for xadd and cmpxchg. Given that the 386 isn't supported anywhere
  * anymore that's not much of a restriction luckily.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/fallback.h b/src/include/port/atomics/fallback.h
index 4e07add0a4..7b9dcad807 100644
--- a/src/include/port/atomics/fallback.h
+++ b/src/include/port/atomics/fallback.h
@@ -4,7 +4,7 @@
  *    Fallback for platforms without spinlock and/or atomics support. Slower
  *    than native atomics support, but not unusably slow.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/port/atomics/fallback.h
diff --git a/src/include/port/atomics/generic-acc.h b/src/include/port/atomics/generic-acc.h
index 4ea3ed3fc7..bd6caaf817 100644
--- a/src/include/port/atomics/generic-acc.h
+++ b/src/include/port/atomics/generic-acc.h
@@ -3,7 +3,7 @@
  * generic-acc.h
  *	  Atomic operations support when using HPs acc on HPUX
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/generic-gcc.h b/src/include/port/atomics/generic-gcc.h
index 7efc0861e7..3a1dc88377 100644
--- a/src/include/port/atomics/generic-gcc.h
+++ b/src/include/port/atomics/generic-gcc.h
@@ -3,7 +3,7 @@
  * generic-gcc.h
  *	  Atomic operations, implemented using gcc (or compatible) intrinsics.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
@@ -176,6 +176,8 @@ pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
 }
 #endif
 
+/* if we have 32-bit __sync_val_compare_and_swap, assume we have these too: */
+
 #if !defined(PG_HAVE_ATOMIC_FETCH_ADD_U32) && defined(HAVE_GCC__SYNC_INT32_CAS)
 #define PG_HAVE_ATOMIC_FETCH_ADD_U32
 static inline uint32
@@ -185,6 +187,33 @@ pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 }
 #endif
 
+#if !defined(PG_HAVE_ATOMIC_FETCH_SUB_U32) && defined(HAVE_GCC__SYNC_INT32_CAS)
+#define PG_HAVE_ATOMIC_FETCH_SUB_U32
+static inline uint32
+pg_atomic_fetch_sub_u32_impl(volatile pg_atomic_uint32 *ptr, int32 sub_)
+{
+	return __sync_fetch_and_sub(&ptr->value, sub_);
+}
+#endif
+
+#if !defined(PG_HAVE_ATOMIC_FETCH_AND_U32) && defined(HAVE_GCC__SYNC_INT32_CAS)
+#define PG_HAVE_ATOMIC_FETCH_AND_U32
+static inline uint32
+pg_atomic_fetch_and_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 and_)
+{
+	return __sync_fetch_and_and(&ptr->value, and_);
+}
+#endif
+
+#if !defined(PG_HAVE_ATOMIC_FETCH_OR_U32) && defined(HAVE_GCC__SYNC_INT32_CAS)
+#define PG_HAVE_ATOMIC_FETCH_OR_U32
+static inline uint32
+pg_atomic_fetch_or_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 or_)
+{
+	return __sync_fetch_and_or(&ptr->value, or_);
+}
+#endif
+
 
 #if !defined(PG_DISABLE_64_BIT_ATOMICS)
 
@@ -214,6 +243,8 @@ pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
 }
 #endif
 
+/* if we have 64-bit __sync_val_compare_and_swap, assume we have these too: */
+
 #if !defined(PG_HAVE_ATOMIC_FETCH_ADD_U64) && defined(HAVE_GCC__SYNC_INT64_CAS)
 #define PG_HAVE_ATOMIC_FETCH_ADD_U64
 static inline uint64
@@ -223,6 +254,33 @@ pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
 }
 #endif
 
+#if !defined(PG_HAVE_ATOMIC_FETCH_SUB_U64) && defined(HAVE_GCC__SYNC_INT64_CAS)
+#define PG_HAVE_ATOMIC_FETCH_SUB_U64
+static inline uint64
+pg_atomic_fetch_sub_u64_impl(volatile pg_atomic_uint64 *ptr, int64 sub_)
+{
+	return __sync_fetch_and_sub(&ptr->value, sub_);
+}
+#endif
+
+#if !defined(PG_HAVE_ATOMIC_FETCH_AND_U64) && defined(HAVE_GCC__SYNC_INT64_CAS)
+#define PG_HAVE_ATOMIC_FETCH_AND_U64
+static inline uint64
+pg_atomic_fetch_and_u64_impl(volatile pg_atomic_uint64 *ptr, uint64 and_)
+{
+	return __sync_fetch_and_and(&ptr->value, and_);
+}
+#endif
+
+#if !defined(PG_HAVE_ATOMIC_FETCH_OR_U64) && defined(HAVE_GCC__SYNC_INT64_CAS)
+#define PG_HAVE_ATOMIC_FETCH_OR_U64
+static inline uint64
+pg_atomic_fetch_or_u64_impl(volatile pg_atomic_uint64 *ptr, uint64 or_)
+{
+	return __sync_fetch_and_or(&ptr->value, or_);
+}
+#endif
+
 #endif /* !defined(PG_DISABLE_64_BIT_ATOMICS) */
 
 #endif /* defined(HAVE_ATOMICS) */
diff --git a/src/include/port/atomics/generic-msvc.h b/src/include/port/atomics/generic-msvc.h
index f82cfec8ec..59211c2203 100644
--- a/src/include/port/atomics/generic-msvc.h
+++ b/src/include/port/atomics/generic-msvc.h
@@ -3,7 +3,7 @@
  * generic-msvc.h
  *	  Atomic operations support when using MSVC
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * NOTES:
diff --git a/src/include/port/atomics/generic-sunpro.h b/src/include/port/atomics/generic-sunpro.h
index a58e8e3bad..e903243b68 100644
--- a/src/include/port/atomics/generic-sunpro.h
+++ b/src/include/port/atomics/generic-sunpro.h
@@ -3,7 +3,7 @@
  * generic-sunpro.h
  *	  Atomic operations for solaris' CC
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * NOTES:
  *
diff --git a/src/include/port/atomics/generic-xlc.h b/src/include/port/atomics/generic-xlc.h
index f854612d39..f18207568c 100644
--- a/src/include/port/atomics/generic-xlc.h
+++ b/src/include/port/atomics/generic-xlc.h
@@ -3,7 +3,7 @@
  * generic-xlc.h
  *	  Atomic operations for IBM's CC
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * NOTES:
  *
diff --git a/src/include/port/atomics/generic.h b/src/include/port/atomics/generic.h
index 424543604a..ea11698a35 100644
--- a/src/include/port/atomics/generic.h
+++ b/src/include/port/atomics/generic.h
@@ -4,7 +4,7 @@
  *	  Implement higher level operations based on some lower level atomic
  *	  operations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/port/atomics/generic.h
@@ -45,7 +45,7 @@ typedef pg_atomic_uint32 pg_atomic_flag;
 static inline uint32
 pg_atomic_read_u32_impl(volatile pg_atomic_uint32 *ptr)
 {
-	return *(&ptr->value);
+	return ptr->value;
 }
 #endif
 
@@ -170,12 +170,9 @@ static inline uint32
 pg_atomic_exchange_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 xchg_)
 {
 	uint32 old;
-	while (true)
-	{
-		old = pg_atomic_read_u32_impl(ptr);
-		if (pg_atomic_compare_exchange_u32_impl(ptr, &old, xchg_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u32_impl(ptr, &old, xchg_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -186,12 +183,9 @@ static inline uint32
 pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
 {
 	uint32 old;
-	while (true)
-	{
-		old = pg_atomic_read_u32_impl(ptr);
-		if (pg_atomic_compare_exchange_u32_impl(ptr, &old, old + add_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u32_impl(ptr, &old, old + add_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -211,12 +205,9 @@ static inline uint32
 pg_atomic_fetch_and_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 and_)
 {
 	uint32 old;
-	while (true)
-	{
-		old = pg_atomic_read_u32_impl(ptr);
-		if (pg_atomic_compare_exchange_u32_impl(ptr, &old, old & and_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u32_impl(ptr, &old, old & and_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -227,12 +218,9 @@ static inline uint32
 pg_atomic_fetch_or_u32_impl(volatile pg_atomic_uint32 *ptr, uint32 or_)
 {
 	uint32 old;
-	while (true)
-	{
-		old = pg_atomic_read_u32_impl(ptr);
-		if (pg_atomic_compare_exchange_u32_impl(ptr, &old, old | or_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u32_impl(ptr, &old, old | or_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -261,12 +249,9 @@ static inline uint64
 pg_atomic_exchange_u64_impl(volatile pg_atomic_uint64 *ptr, uint64 xchg_)
 {
 	uint64 old;
-	while (true)
-	{
-		old = ptr->value;
-		if (pg_atomic_compare_exchange_u64_impl(ptr, &old, xchg_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u64_impl(ptr, &old, xchg_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -314,12 +299,10 @@ static inline uint64
 pg_atomic_read_u64_impl(volatile pg_atomic_uint64 *ptr)
 {
 	/*
-	 * On this platform aligned 64bit reads are guaranteed to be atomic,
-	 * except if using the fallback implementation, where can't guarantee the
-	 * required alignment.
+	 * On this platform aligned 64-bit reads are guaranteed to be atomic.
 	 */
 	AssertPointerAlignment(ptr, 8);
-	return *(&ptr->value);
+	return ptr->value;
 }
 
 #else
@@ -330,10 +313,10 @@ pg_atomic_read_u64_impl(volatile pg_atomic_uint64 *ptr)
 	uint64 old = 0;
 
 	/*
-	 * 64 bit reads aren't safe on all platforms. In the generic
+	 * 64-bit reads aren't atomic on all platforms. In the generic
 	 * implementation implement them as a compare/exchange with 0. That'll
-	 * fail or succeed, but always return the old value. Possible might store
-	 * a 0, but only if the prev. value also was a 0 - i.e. harmless.
+	 * fail or succeed, but always return the old value. Possibly might store
+	 * a 0, but only if the previous value also was a 0 - i.e. harmless.
 	 */
 	pg_atomic_compare_exchange_u64_impl(ptr, &old, 0);
 
@@ -357,12 +340,9 @@ static inline uint64
 pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
 {
 	uint64 old;
-	while (true)
-	{
-		old = pg_atomic_read_u64_impl(ptr);
-		if (pg_atomic_compare_exchange_u64_impl(ptr, &old, old + add_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u64_impl(ptr, &old, old + add_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -382,12 +362,9 @@ static inline uint64
 pg_atomic_fetch_and_u64_impl(volatile pg_atomic_uint64 *ptr, uint64 and_)
 {
 	uint64 old;
-	while (true)
-	{
-		old = pg_atomic_read_u64_impl(ptr);
-		if (pg_atomic_compare_exchange_u64_impl(ptr, &old, old & and_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u64_impl(ptr, &old, old & and_))
+		/* skip */;
 	return old;
 }
 #endif
@@ -398,12 +375,9 @@ static inline uint64
 pg_atomic_fetch_or_u64_impl(volatile pg_atomic_uint64 *ptr, uint64 or_)
 {
 	uint64 old;
-	while (true)
-	{
-		old = pg_atomic_read_u64_impl(ptr);
-		if (pg_atomic_compare_exchange_u64_impl(ptr, &old, old | or_))
-			break;
-	}
+	old = ptr->value;			/* ok if read is not atomic */
+	while (!pg_atomic_compare_exchange_u64_impl(ptr, &old, old | or_))
+		/* skip */;
 	return old;
 }
 #endif
diff --git a/src/include/port/pg_bswap.h b/src/include/port/pg_bswap.h
index 50a6bd106b..0f09c05d6f 100644
--- a/src/include/port/pg_bswap.h
+++ b/src/include/port/pg_bswap.h
@@ -3,17 +3,15 @@
  * pg_bswap.h
  *	  Byte swapping.
  *
- * Macros for reversing the byte order of 32-bit and 64-bit unsigned integers.
+ * Macros for reversing the byte order of 16, 32 and 64-bit unsigned integers.
  * For example, 0xAABBCCDD becomes 0xDDCCBBAA.  These are just wrappers for
  * built-in functions provided by the compiler where support exists.
- * Elsewhere, beware of multiple evaluations of the arguments!
  *
- * Note that the GCC built-in functions __builtin_bswap32() and
- * __builtin_bswap64() are documented as accepting single arguments of type
- * uint32_t and uint64_t respectively (these are also the respective return
- * types).  Use caution when using these wrapper macros with signed integers.
+ * Note that all of these functions accept unsigned integers as arguments and
+ * return the same.  Use caution when using these wrapper macros with signed
+ * integers.
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * src/include/port/pg_bswap.h
  *
@@ -22,28 +20,114 @@
 #ifndef PG_BSWAP_H
 #define PG_BSWAP_H
 
-#ifdef HAVE__BUILTIN_BSWAP32
-#define BSWAP32(x) __builtin_bswap32(x)
+
+/*
+ * In all supported versions msvc provides _byteswap_* functions in stdlib.h,
+ * already included by c.h.
+ */
+
+
+/* implementation of uint16 pg_bswap16(uint16) */
+#if defined(HAVE__BUILTIN_BSWAP16)
+
+#define pg_bswap16(x) __builtin_bswap16(x)
+
+#elif defined(_MSC_VER)
+
+#define pg_bswap16(x) _byteswap_ushort(x)
+
 #else
-#define BSWAP32(x) ((((x) << 24) & 0xff000000) | \
-					(((x) << 8)  & 0x00ff0000) | \
-					(((x) >> 8)  & 0x0000ff00) | \
-					(((x) >> 24) & 0x000000ff))
+
+static inline uint16
+pg_bswap16(uint16 x)
+{
+	return
+		((x << 8) & 0xff00) |
+		((x >> 8) & 0x00ff);
+}
+
+#endif							/* HAVE__BUILTIN_BSWAP16 */
+
+
+/* implementation of uint32 pg_bswap32(uint32) */
+#if defined(HAVE__BUILTIN_BSWAP32)
+
+#define pg_bswap32(x) __builtin_bswap32(x)
+
+#elif defined(_MSC_VER)
+
+#define pg_bswap32(x) _byteswap_ulong(x)
+
+#else
+
+static inline uint32
+pg_bswap32(uint32 x)
+{
+	return
+		((x << 24) & 0xff000000) |
+		((x << 8) & 0x00ff0000) |
+		((x >> 8) & 0x0000ff00) |
+		((x >> 24) & 0x000000ff);
+}
+
 #endif							/* HAVE__BUILTIN_BSWAP32 */
 
-#ifdef HAVE__BUILTIN_BSWAP64
-#define BSWAP64(x) __builtin_bswap64(x)
+
+/* implementation of uint64 pg_bswap64(uint64) */
+#if defined(HAVE__BUILTIN_BSWAP64)
+
+#define pg_bswap64(x) __builtin_bswap64(x)
+
+
+#elif defined(_MSC_VER)
+
+#define pg_bswap64(x) _byteswap_uint64(x)
+
 #else
-#define BSWAP64(x) ((((x) << 56) & UINT64CONST(0xff00000000000000)) | \
-					(((x) << 40) & UINT64CONST(0x00ff000000000000)) | \
-					(((x) << 24) & UINT64CONST(0x0000ff0000000000)) | \
-					(((x) << 8)  & UINT64CONST(0x000000ff00000000)) | \
-					(((x) >> 8)  & UINT64CONST(0x00000000ff000000)) | \
-					(((x) >> 24) & UINT64CONST(0x0000000000ff0000)) | \
-					(((x) >> 40) & UINT64CONST(0x000000000000ff00)) | \
-					(((x) >> 56) & UINT64CONST(0x00000000000000ff)))
+
+static inline uint64
+pg_bswap64(uint64 x)
+{
+	return
+		((x << 56) & UINT64CONST(0xff00000000000000)) |
+		((x << 40) & UINT64CONST(0x00ff000000000000)) |
+		((x << 24) & UINT64CONST(0x0000ff0000000000)) |
+		((x << 8) & UINT64CONST(0x000000ff00000000)) |
+		((x >> 8) & UINT64CONST(0x00000000ff000000)) |
+		((x >> 24) & UINT64CONST(0x0000000000ff0000)) |
+		((x >> 40) & UINT64CONST(0x000000000000ff00)) |
+		((x >> 56) & UINT64CONST(0x00000000000000ff));
+}
 #endif							/* HAVE__BUILTIN_BSWAP64 */
 
+
+/*
+ * Portable and fast equivalents for for ntohs, ntohl, htons, htonl,
+ * additionally extended to 64 bits.
+ */
+#ifdef WORDS_BIGENDIAN
+
+#define pg_hton16(x)		(x)
+#define pg_hton32(x)		(x)
+#define pg_hton64(x)		(x)
+
+#define pg_ntoh16(x)		(x)
+#define pg_ntoh32(x)		(x)
+#define pg_ntoh64(x)		(x)
+
+#else
+
+#define pg_hton16(x)		pg_bswap16(x)
+#define pg_hton32(x)		pg_bswap32(x)
+#define pg_hton64(x)		pg_bswap64(x)
+
+#define pg_ntoh16(x)		pg_bswap16(x)
+#define pg_ntoh32(x)		pg_bswap32(x)
+#define pg_ntoh64(x)		pg_bswap64(x)
+
+#endif							/* WORDS_BIGENDIAN */
+
+
 /*
  * Rearrange the bytes of a Datum from big-endian order into the native byte
  * order.  On big-endian machines, this does nothing at all.  Note that the C
@@ -60,9 +144,9 @@
 #define		DatumBigEndianToNative(x)	(x)
 #else							/* !WORDS_BIGENDIAN */
 #if SIZEOF_DATUM == 8
-#define		DatumBigEndianToNative(x)	BSWAP64(x)
+#define		DatumBigEndianToNative(x)	pg_bswap64(x)
 #else							/* SIZEOF_DATUM != 8 */
-#define		DatumBigEndianToNative(x)	BSWAP32(x)
+#define		DatumBigEndianToNative(x)	pg_bswap32(x)
 #endif							/* SIZEOF_DATUM == 8 */
 #endif							/* WORDS_BIGENDIAN */
 
diff --git a/src/include/port/pg_crc32c.h b/src/include/port/pg_crc32c.h
index cd58ecc988..ae2701e958 100644
--- a/src/include/port/pg_crc32c.h
+++ b/src/include/port/pg_crc32c.h
@@ -23,7 +23,7 @@
  * EQ_CRC32C(c1, c2)
  *		Check for equality of two CRCs.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/port/pg_crc32c.h
@@ -73,7 +73,7 @@ extern pg_crc32c (*pg_comp_crc32c) (pg_crc32c crc, const void *data, size_t len)
 #define COMP_CRC32C(crc, data, len) \
 	((crc) = pg_comp_crc32c_sb8((crc), (data), (len)))
 #ifdef WORDS_BIGENDIAN
-#define FIN_CRC32C(crc) ((crc) = BSWAP32(crc) ^ 0xFFFFFFFF)
+#define FIN_CRC32C(crc) ((crc) = pg_bswap32(crc) ^ 0xFFFFFFFF)
 #else
 #define FIN_CRC32C(crc) ((crc) ^= 0xFFFFFFFF)
 #endif
diff --git a/src/include/port/win32.h b/src/include/port/win32.h
index 23f89748ac..9f48a58aed 100644
--- a/src/include/port/win32.h
+++ b/src/include/port/win32.h
@@ -1,16 +1,22 @@
 /* src/include/port/win32.h */
 
+/*
+ * We always rely on the WIN32 macro being set by our build system,
+ * but _WIN32 is the compiler pre-defined macro. So make sure we define
+ * WIN32 whenever _WIN32 is set, to facilitate standalone building.
+ */
+#if defined(_WIN32) && !defined(WIN32)
+#define WIN32
+#endif
+
 /*
  * Make sure _WIN32_WINNT has the minimum required value.
  * Leave a higher value in place. When building with at least Visual
  * Studio 2015 the minimum requirement is Windows Vista (0x0600) to
  * get support for GetLocaleInfoEx() with locales. For everything else
  * the minimum version is Windows XP (0x0501).
- * Also for VS2015, add a define that stops compiler complaints about
- * using the old Winsock API.
  */
 #if defined(_MSC_VER) && _MSC_VER >= 1900
-#define  _WINSOCK_DEPRECATED_NO_WARNINGS
 #define MIN_WINNT 0x0600
 #else
 #define MIN_WINNT 0x0501
@@ -25,64 +31,23 @@
 #endif
 
 /*
- * Always build with SSPI support. Keep it as a #define in case
- * we want a switch to disable it sometime in the future.
+ * We need to prevent <crtdefs.h> from defining a symbol conflicting with
+ * our errcode() function.  Since it's likely to get included by standard
+ * system headers, pre-emptively include it now.
  */
-#define ENABLE_SSPI 1
-
-/* undefine and redefine after #include */
-#undef mkdir
-
-#undef ERROR
-
-/*
- * The Mingw64 headers choke if this is already defined - they
- * define it themselves.
- */
-#if !defined(__MINGW64_VERSION_MAJOR) || defined(_MSC_VER)
-#define _WINSOCKAPI_
+#if _MSC_VER >= 1400 || defined(HAVE_CRTDEFS_H)
+#define errcode __msvc_errcode
+#include <crtdefs.h>
+#undef errcode
 #endif
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#include <windows.h>
-#undef small
-#include <process.h>
-#include <signal.h>
-#include <errno.h>
-#include <direct.h>
-#include <sys/utime.h>			/* for non-unicode version */
-#undef near
-
-/* Must be here to avoid conflicting with prototype in windows.h */
-#define mkdir(a,b)	mkdir(a)
-
-#define ftruncate(a,b)	chsize(a,b)
-
-/* Windows doesn't have fsync() as such, use _commit() */
-#define fsync(fd) _commit(fd)
 
 /*
- * For historical reasons, we allow setting wal_sync_method to
- * fsync_writethrough on Windows, even though it's really identical to fsync
- * (both code paths wind up at _commit()).
+ * defines for dynamic linking on Win32 platform
  */
-#define HAVE_FSYNC_WRITETHROUGH
-#define FSYNC_WRITETHROUGH_IS_FSYNC
-
-#define USES_WINSOCK
-
-/* defines for dynamic linking on Win32 platform
- *
- *	http://support.microsoft.com/kb/132044
- *	http://msdn.microsoft.com/en-us/library/8fskxacy(v=vs.80).aspx
- *	http://msdn.microsoft.com/en-us/library/a90k134d(v=vs.80).aspx
- */
-
-#if defined(WIN32) || defined(__CYGWIN__)
 
 #ifdef BUILDING_DLL
 #define PGDLLIMPORT __declspec (dllexport)
-#else							/* not BUILDING_DLL */
+#else
 #define PGDLLIMPORT __declspec (dllimport)
 #endif
 
@@ -91,365 +56,3 @@
 #else
 #define PGDLLEXPORT
 #endif
-#else							/* not CYGWIN, not MSVC, not MingW */
-#define PGDLLIMPORT
-#define PGDLLEXPORT
-#endif
-
-
-/*
- *	IPC defines
- */
-#undef HAVE_UNION_SEMUN
-#define HAVE_UNION_SEMUN 1
-
-#define IPC_RMID 256
-#define IPC_CREAT 512
-#define IPC_EXCL 1024
-#define IPC_PRIVATE 234564
-#define IPC_NOWAIT	2048
-#define IPC_STAT 4096
-
-#define EACCESS 2048
-#ifndef EIDRM
-#define EIDRM 4096
-#endif
-
-#define SETALL 8192
-#define GETNCNT 16384
-#define GETVAL 65536
-#define SETVAL 131072
-#define GETPID 262144
-
-
-/*
- *	Signal stuff
- *
- *	For WIN32, there is no wait() call so there are no wait() macros
- *	to interpret the return value of system().  Instead, system()
- *	return values < 0x100 are used for exit() termination, and higher
- *	values are used to indicated non-exit() termination, which is
- *	similar to a unix-style signal exit (think SIGSEGV ==
- *	STATUS_ACCESS_VIOLATION).  Return values are broken up into groups:
- *
- *	http://msdn2.microsoft.com/en-gb/library/aa489609.aspx
- *
- *		NT_SUCCESS			0 - 0x3FFFFFFF
- *		NT_INFORMATION		0x40000000 - 0x7FFFFFFF
- *		NT_WARNING			0x80000000 - 0xBFFFFFFF
- *		NT_ERROR			0xC0000000 - 0xFFFFFFFF
- *
- *	Effectively, we don't care on the severity of the return value from
- *	system(), we just need to know if it was because of exit() or generated
- *	by the system, and it seems values >= 0x100 are system-generated.
- *	See this URL for a list of WIN32 STATUS_* values:
- *
- *		Wine (URL used in our error messages) -
- *			http://source.winehq.org/source/include/ntstatus.h
- *		Descriptions - http://www.comp.nus.edu.sg/~wuyongzh/my_doc/ntstatus.txt
- *		MS SDK - http://www.nologs.com/ntstatus.html
- *
- *	It seems the exception lists are in both ntstatus.h and winnt.h, but
- *	ntstatus.h has a more comprehensive list, and it only contains
- *	exception values, rather than winnt, which contains lots of other
- *	things:
- *
- *		http://www.microsoft.com/msj/0197/exception/exception.aspx
- *
- *		The ExceptionCode parameter is the number that the operating system
- *		assigned to the exception. You can see a list of various exception codes
- *		in WINNT.H by searching for #defines that start with "STATUS_". For
- *		example, the code for the all-too-familiar STATUS_ACCESS_VIOLATION is
- *		0xC0000005. A more complete set of exception codes can be found in
- *		NTSTATUS.H from the Windows NT DDK.
- *
- *	Some day we might want to print descriptions for the most common
- *	exceptions, rather than printing an include file name.  We could use
- *	RtlNtStatusToDosError() and pass to FormatMessage(), which can print
- *	the text of error values, but MinGW does not support
- *	RtlNtStatusToDosError().
- */
-#define WIFEXITED(w)	(((w) & 0XFFFFFF00) == 0)
-#define WIFSIGNALED(w)	(!WIFEXITED(w))
-#define WEXITSTATUS(w)	(w)
-#define WTERMSIG(w)		(w)
-
-#define sigmask(sig) ( 1 << ((sig)-1) )
-
-/* Signal function return values */
-#undef SIG_DFL
-#undef SIG_ERR
-#undef SIG_IGN
-#define SIG_DFL ((pqsigfunc)0)
-#define SIG_ERR ((pqsigfunc)-1)
-#define SIG_IGN ((pqsigfunc)1)
-
-/* Some extra signals */
-#define SIGHUP				1
-#define SIGQUIT				3
-#define SIGTRAP				5
-#define SIGABRT				22	/* Set to match W32 value -- not UNIX value */
-#define SIGKILL				9
-#define SIGPIPE				13
-#define SIGALRM				14
-#define SIGSTOP				17
-#define SIGTSTP				18
-#define SIGCONT				19
-#define SIGCHLD				20
-#define SIGTTIN				21
-#define SIGTTOU				22	/* Same as SIGABRT -- no problem, I hope */
-#define SIGWINCH			28
-#define SIGUSR1				30
-#define SIGUSR2				31
-
-/*
- * New versions of mingw have gettimeofday() and also declare
- * struct timezone to support it.
- */
-#ifndef HAVE_GETTIMEOFDAY
-struct timezone
-{
-	int			tz_minuteswest; /* Minutes west of GMT.  */
-	int			tz_dsttime;		/* Nonzero if DST is ever in effect.  */
-};
-#endif
-
-/* for setitimer in backend/port/win32/timer.c */
-#define ITIMER_REAL 0
-struct itimerval
-{
-	struct timeval it_interval;
-	struct timeval it_value;
-};
-
-int			setitimer(int which, const struct itimerval *value, struct itimerval *ovalue);
-
-/*
- * WIN32 does not provide 64-bit off_t, but does provide the functions operating
- * with 64-bit offsets.
- */
-#define pgoff_t __int64
-#ifdef _MSC_VER
-#define fseeko(stream, offset, origin) _fseeki64(stream, offset, origin)
-#define ftello(stream) _ftelli64(stream)
-#else
-#ifndef fseeko
-#define fseeko(stream, offset, origin) fseeko64(stream, offset, origin)
-#endif
-#ifndef ftello
-#define ftello(stream) ftello64(stream)
-#endif
-#endif
-
-/*
- * Supplement to <sys/types.h>.
- *
- * Perl already has typedefs for uid_t and gid_t.
- */
-#ifndef PLPERL_HAVE_UID_GID
-typedef int uid_t;
-typedef int gid_t;
-#endif
-typedef long key_t;
-
-#ifdef _MSC_VER
-typedef int pid_t;
-#endif
-
-/*
- * Supplement to <sys/stat.h>.
- */
-#define lstat(path, sb) stat((path), (sb))
-
-/*
- * Supplement to <fcntl.h>.
- * This is the same value as _O_NOINHERIT in the MS header file. This is
- * to ensure that we don't collide with a future definition. It means
- * we cannot use _O_NOINHERIT ourselves.
- */
-#define O_DSYNC 0x0080
-
-/*
- * Supplement to <errno.h>.
- *
- * We redefine network-related Berkeley error symbols as the corresponding WSA
- * constants.  This allows elog.c to recognize them as being in the Winsock
- * error code range and pass them off to pgwin32_socket_strerror(), since
- * Windows' version of plain strerror() won't cope.  Note that this will break
- * if these names are used for anything else besides Windows Sockets errors.
- * See TranslateSocketError() when changing this list.
- */
-#undef EAGAIN
-#define EAGAIN WSAEWOULDBLOCK
-#undef EINTR
-#define EINTR WSAEINTR
-#undef EMSGSIZE
-#define EMSGSIZE WSAEMSGSIZE
-#undef EAFNOSUPPORT
-#define EAFNOSUPPORT WSAEAFNOSUPPORT
-#undef EWOULDBLOCK
-#define EWOULDBLOCK WSAEWOULDBLOCK
-#undef ECONNABORTED
-#define ECONNABORTED WSAECONNABORTED
-#undef ECONNRESET
-#define ECONNRESET WSAECONNRESET
-#undef EINPROGRESS
-#define EINPROGRESS WSAEINPROGRESS
-#undef EISCONN
-#define EISCONN WSAEISCONN
-#undef ENOBUFS
-#define ENOBUFS WSAENOBUFS
-#undef EPROTONOSUPPORT
-#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
-#undef ECONNREFUSED
-#define ECONNREFUSED WSAECONNREFUSED
-#undef ENOTSOCK
-#define ENOTSOCK WSAENOTSOCK
-#undef EOPNOTSUPP
-#define EOPNOTSUPP WSAEOPNOTSUPP
-#undef EADDRINUSE
-#define EADDRINUSE WSAEADDRINUSE
-#undef EADDRNOTAVAIL
-#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
-#undef EHOSTUNREACH
-#define EHOSTUNREACH WSAEHOSTUNREACH
-#undef ENOTCONN
-#define ENOTCONN WSAENOTCONN
-
-/*
- * Extended locale functions with gratuitous underscore prefixes.
- * (These APIs are nevertheless fully documented by Microsoft.)
- */
-#define locale_t _locale_t
-#define tolower_l _tolower_l
-#define toupper_l _toupper_l
-#define towlower_l _towlower_l
-#define towupper_l _towupper_l
-#define isdigit_l _isdigit_l
-#define iswdigit_l _iswdigit_l
-#define isalpha_l _isalpha_l
-#define iswalpha_l _iswalpha_l
-#define isalnum_l _isalnum_l
-#define iswalnum_l _iswalnum_l
-#define isupper_l _isupper_l
-#define iswupper_l _iswupper_l
-#define islower_l _islower_l
-#define iswlower_l _iswlower_l
-#define isgraph_l _isgraph_l
-#define iswgraph_l _iswgraph_l
-#define isprint_l _isprint_l
-#define iswprint_l _iswprint_l
-#define ispunct_l _ispunct_l
-#define iswpunct_l _iswpunct_l
-#define isspace_l _isspace_l
-#define iswspace_l _iswspace_l
-#define strcoll_l _strcoll_l
-#define strxfrm_l _strxfrm_l
-#define wcscoll_l _wcscoll_l
-#define wcstombs_l _wcstombs_l
-#define mbstowcs_l _mbstowcs_l
-
-
-/* In backend/port/win32/signal.c */
-extern PGDLLIMPORT volatile int pg_signal_queue;
-extern PGDLLIMPORT int pg_signal_mask;
-extern HANDLE pgwin32_signal_event;
-extern HANDLE pgwin32_initial_signal_pipe;
-
-#define UNBLOCKED_SIGNAL_QUEUE()	(pg_signal_queue & ~pg_signal_mask)
-
-
-void		pgwin32_signal_initialize(void);
-HANDLE		pgwin32_create_signal_listener(pid_t pid);
-void		pgwin32_dispatch_queued_signals(void);
-void		pg_queue_signal(int signum);
-
-/* In backend/port/win32/socket.c */
-#ifndef FRONTEND
-#define socket(af, type, protocol) pgwin32_socket(af, type, protocol)
-#define bind(s, addr, addrlen) pgwin32_bind(s, addr, addrlen)
-#define listen(s, backlog) pgwin32_listen(s, backlog)
-#define accept(s, addr, addrlen) pgwin32_accept(s, addr, addrlen)
-#define connect(s, name, namelen) pgwin32_connect(s, name, namelen)
-#define select(n, r, w, e, timeout) pgwin32_select(n, r, w, e, timeout)
-#define recv(s, buf, len, flags) pgwin32_recv(s, buf, len, flags)
-#define send(s, buf, len, flags) pgwin32_send(s, buf, len, flags)
-
-SOCKET		pgwin32_socket(int af, int type, int protocol);
-int			pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen);
-int			pgwin32_listen(SOCKET s, int backlog);
-SOCKET		pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
-int			pgwin32_connect(SOCKET s, const struct sockaddr *name, int namelen);
-int			pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout);
-int			pgwin32_recv(SOCKET s, char *buf, int len, int flags);
-int			pgwin32_send(SOCKET s, const void *buf, int len, int flags);
-
-const char *pgwin32_socket_strerror(int err);
-int			pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout);
-
-extern int	pgwin32_noblock;
-
-#endif
-
-/* in backend/port/win32_shmem.c */
-extern int	pgwin32_ReserveSharedMemoryRegion(HANDLE);
-
-/* in backend/port/win32/crashdump.c */
-extern void pgwin32_install_crashdump_handler(void);
-
-/* in port/win32error.c */
-extern void _dosmaperr(unsigned long);
-
-/* in port/win32env.c */
-extern int	pgwin32_putenv(const char *);
-extern void pgwin32_unsetenv(const char *);
-
-/* in port/win32security.c */
-extern int	pgwin32_is_service(void);
-extern int	pgwin32_is_admin(void);
-
-#define putenv(x) pgwin32_putenv(x)
-#define unsetenv(x) pgwin32_unsetenv(x)
-
-/* Things that exist in MingW headers, but need to be added to MSVC */
-#ifdef _MSC_VER
-
-#ifndef _WIN64
-typedef long ssize_t;
-#else
-typedef __int64 ssize_t;
-#endif
-
-typedef unsigned short mode_t;
-
-#define S_IRUSR _S_IREAD
-#define S_IWUSR _S_IWRITE
-#define S_IXUSR _S_IEXEC
-#define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
-/* see also S_IRGRP etc below */
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
-
-#define F_OK 0
-#define W_OK 2
-#define R_OK 4
-
-#if (_MSC_VER < 1800)
-#define isinf(x) ((_fpclass(x) == _FPCLASS_PINF) || (_fpclass(x) == _FPCLASS_NINF))
-#define isnan(x) _isnan(x)
-#endif
-
-/* Pulled from Makefile.port in mingw */
-#define DLSUFFIX ".dll"
-
-#endif							/* _MSC_VER */
-
-/* These aren't provided by either MingW or MSVC */
-#define S_IRGRP 0
-#define S_IWGRP 0
-#define S_IXGRP 0
-#define S_IRWXG 0
-#define S_IROTH 0
-#define S_IWOTH 0
-#define S_IXOTH 0
-#define S_IRWXO 0
diff --git a/src/include/port/win32_port.h b/src/include/port/win32_port.h
new file mode 100644
index 0000000000..d31c28f7d4
--- /dev/null
+++ b/src/include/port/win32_port.h
@@ -0,0 +1,515 @@
+/*-------------------------------------------------------------------------
+ *
+ * win32_port.h
+ *	  Windows-specific compatibility stuff.
+ *
+ * Note this is read in MinGW as well as native Windows builds,
+ * but not in Cygwin builds.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/port/win32_port.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef PG_WIN32_PORT_H
+#define PG_WIN32_PORT_H
+
+/*
+ * Always build with SSPI support. Keep it as a #define in case
+ * we want a switch to disable it sometime in the future.
+ */
+#define ENABLE_SSPI 1
+
+/* undefine and redefine after #include */
+#undef mkdir
+
+#undef ERROR
+
+/*
+ * VS2013 and later issue warnings about using the old Winsock API,
+ * which we don't really want to hear about.
+ */
+#ifdef _MSC_VER
+#define _WINSOCK_DEPRECATED_NO_WARNINGS
+#endif
+
+/*
+ * The MinGW64 headers choke if this is already defined - they
+ * define it themselves.
+ */
+#if !defined(__MINGW64_VERSION_MAJOR) || defined(_MSC_VER)
+#define _WINSOCKAPI_
+#endif
+
+#include <winsock2.h>
+#include <ws2tcpip.h>
+#include <windows.h>
+#undef small
+#include <process.h>
+#include <signal.h>
+#include <direct.h>
+#include <sys/utime.h>			/* for non-unicode version */
+#undef near
+#include <sys/stat.h>			/* needed before sys/stat hacking below */
+
+/* Must be here to avoid conflicting with prototype in windows.h */
+#define mkdir(a,b)	mkdir(a)
+
+#define ftruncate(a,b)	chsize(a,b)
+
+/* Windows doesn't have fsync() as such, use _commit() */
+#define fsync(fd) _commit(fd)
+
+/*
+ * For historical reasons, we allow setting wal_sync_method to
+ * fsync_writethrough on Windows, even though it's really identical to fsync
+ * (both code paths wind up at _commit()).
+ */
+#define HAVE_FSYNC_WRITETHROUGH
+#define FSYNC_WRITETHROUGH_IS_FSYNC
+
+#define USES_WINSOCK
+
+/*
+ *	IPC defines
+ */
+#undef HAVE_UNION_SEMUN
+#define HAVE_UNION_SEMUN 1
+
+#define IPC_RMID 256
+#define IPC_CREAT 512
+#define IPC_EXCL 1024
+#define IPC_PRIVATE 234564
+#define IPC_NOWAIT	2048
+#define IPC_STAT 4096
+
+#define EACCESS 2048
+#ifndef EIDRM
+#define EIDRM 4096
+#endif
+
+#define SETALL 8192
+#define GETNCNT 16384
+#define GETVAL 65536
+#define SETVAL 131072
+#define GETPID 262144
+
+
+/*
+ *	Signal stuff
+ *
+ *	For WIN32, there is no wait() call so there are no wait() macros
+ *	to interpret the return value of system().  Instead, system()
+ *	return values < 0x100 are used for exit() termination, and higher
+ *	values are used to indicated non-exit() termination, which is
+ *	similar to a unix-style signal exit (think SIGSEGV ==
+ *	STATUS_ACCESS_VIOLATION).  Return values are broken up into groups:
+ *
+ *	http://msdn2.microsoft.com/en-gb/library/aa489609.aspx
+ *
+ *		NT_SUCCESS			0 - 0x3FFFFFFF
+ *		NT_INFORMATION		0x40000000 - 0x7FFFFFFF
+ *		NT_WARNING			0x80000000 - 0xBFFFFFFF
+ *		NT_ERROR			0xC0000000 - 0xFFFFFFFF
+ *
+ *	Effectively, we don't care on the severity of the return value from
+ *	system(), we just need to know if it was because of exit() or generated
+ *	by the system, and it seems values >= 0x100 are system-generated.
+ *	See this URL for a list of WIN32 STATUS_* values:
+ *
+ *		Wine (URL used in our error messages) -
+ *			http://source.winehq.org/source/include/ntstatus.h
+ *		Descriptions - http://www.comp.nus.edu.sg/~wuyongzh/my_doc/ntstatus.txt
+ *		MS SDK - http://www.nologs.com/ntstatus.html
+ *
+ *	It seems the exception lists are in both ntstatus.h and winnt.h, but
+ *	ntstatus.h has a more comprehensive list, and it only contains
+ *	exception values, rather than winnt, which contains lots of other
+ *	things:
+ *
+ *		http://www.microsoft.com/msj/0197/exception/exception.aspx
+ *
+ *		The ExceptionCode parameter is the number that the operating system
+ *		assigned to the exception. You can see a list of various exception codes
+ *		in WINNT.H by searching for #defines that start with "STATUS_". For
+ *		example, the code for the all-too-familiar STATUS_ACCESS_VIOLATION is
+ *		0xC0000005. A more complete set of exception codes can be found in
+ *		NTSTATUS.H from the Windows NT DDK.
+ *
+ *	Some day we might want to print descriptions for the most common
+ *	exceptions, rather than printing an include file name.  We could use
+ *	RtlNtStatusToDosError() and pass to FormatMessage(), which can print
+ *	the text of error values, but MinGW does not support
+ *	RtlNtStatusToDosError().
+ */
+#define WIFEXITED(w)	(((w) & 0XFFFFFF00) == 0)
+#define WIFSIGNALED(w)	(!WIFEXITED(w))
+#define WEXITSTATUS(w)	(w)
+#define WTERMSIG(w)		(w)
+
+#define sigmask(sig) ( 1 << ((sig)-1) )
+
+/* Signal function return values */
+#undef SIG_DFL
+#undef SIG_ERR
+#undef SIG_IGN
+#define SIG_DFL ((pqsigfunc)0)
+#define SIG_ERR ((pqsigfunc)-1)
+#define SIG_IGN ((pqsigfunc)1)
+
+/* Some extra signals */
+#define SIGHUP				1
+#define SIGQUIT				3
+#define SIGTRAP				5
+#define SIGABRT				22	/* Set to match W32 value -- not UNIX value */
+#define SIGKILL				9
+#define SIGPIPE				13
+#define SIGALRM				14
+#define SIGSTOP				17
+#define SIGTSTP				18
+#define SIGCONT				19
+#define SIGCHLD				20
+#define SIGTTIN				21
+#define SIGTTOU				22	/* Same as SIGABRT -- no problem, I hope */
+#define SIGWINCH			28
+#define SIGUSR1				30
+#define SIGUSR2				31
+
+/*
+ * New versions of MinGW have gettimeofday() and also declare
+ * struct timezone to support it.
+ */
+#ifndef HAVE_GETTIMEOFDAY
+struct timezone
+{
+	int			tz_minuteswest; /* Minutes west of GMT.  */
+	int			tz_dsttime;		/* Nonzero if DST is ever in effect.  */
+};
+#endif
+
+/* for setitimer in backend/port/win32/timer.c */
+#define ITIMER_REAL 0
+struct itimerval
+{
+	struct timeval it_interval;
+	struct timeval it_value;
+};
+
+int			setitimer(int which, const struct itimerval *value, struct itimerval *ovalue);
+
+/*
+ * WIN32 does not provide 64-bit off_t, but does provide the functions operating
+ * with 64-bit offsets.
+ */
+#define pgoff_t __int64
+#ifdef _MSC_VER
+#define fseeko(stream, offset, origin) _fseeki64(stream, offset, origin)
+#define ftello(stream) _ftelli64(stream)
+#else
+#ifndef fseeko
+#define fseeko(stream, offset, origin) fseeko64(stream, offset, origin)
+#endif
+#ifndef ftello
+#define ftello(stream) ftello64(stream)
+#endif
+#endif
+
+/*
+ *	Win32 also doesn't have symlinks, but we can emulate them with
+ *	junction points on newer Win32 versions.
+ *
+ *	Cygwin has its own symlinks which work on Win95/98/ME where
+ *	junction points don't, so use those instead.  We have no way of
+ *	knowing what type of system Cygwin binaries will be run on.
+ *		Note: Some CYGWIN includes might #define WIN32.
+ */
+extern int	pgsymlink(const char *oldpath, const char *newpath);
+extern int	pgreadlink(const char *path, char *buf, size_t size);
+extern bool pgwin32_is_junction(const char *path);
+
+#define symlink(oldpath, newpath)	pgsymlink(oldpath, newpath)
+#define readlink(path, buf, size)	pgreadlink(path, buf, size)
+
+/*
+ * Supplement to <sys/types.h>.
+ *
+ * Perl already has typedefs for uid_t and gid_t.
+ */
+#ifndef PLPERL_HAVE_UID_GID
+typedef int uid_t;
+typedef int gid_t;
+#endif
+typedef long key_t;
+
+#ifdef _MSC_VER
+typedef int pid_t;
+#endif
+
+/*
+ * Supplement to <sys/stat.h>.
+ *
+ * We must pull in sys/stat.h before this part, else our overrides lose.
+ */
+#define lstat(path, sb) stat(path, sb)
+
+/*
+ * stat() is not guaranteed to set the st_size field on win32, so we
+ * redefine it to our own implementation that is.
+ *
+ * Some frontends don't need the size from stat, so if UNSAFE_STAT_OK
+ * is defined we don't bother with this.
+ */
+#ifndef UNSAFE_STAT_OK
+extern int	pgwin32_safestat(const char *path, struct stat *buf);
+#define stat(a,b) pgwin32_safestat(a,b)
+#endif
+
+/* These macros are not provided by older MinGW, nor by MSVC */
+#ifndef S_IRUSR
+#define S_IRUSR _S_IREAD
+#endif
+#ifndef S_IWUSR
+#define S_IWUSR _S_IWRITE
+#endif
+#ifndef S_IXUSR
+#define S_IXUSR _S_IEXEC
+#endif
+#ifndef S_IRWXU
+#define S_IRWXU (S_IRUSR | S_IWUSR | S_IXUSR)
+#endif
+#ifndef S_IRGRP
+#define S_IRGRP 0
+#endif
+#ifndef S_IWGRP
+#define S_IWGRP 0
+#endif
+#ifndef S_IXGRP
+#define S_IXGRP 0
+#endif
+#ifndef S_IRWXG
+#define S_IRWXG 0
+#endif
+#ifndef S_IROTH
+#define S_IROTH 0
+#endif
+#ifndef S_IWOTH
+#define S_IWOTH 0
+#endif
+#ifndef S_IXOTH
+#define S_IXOTH 0
+#endif
+#ifndef S_IRWXO
+#define S_IRWXO 0
+#endif
+#ifndef S_ISDIR
+#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+#endif
+#ifndef S_ISREG
+#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+#endif
+
+/*
+ * Supplement to <fcntl.h>.
+ * This is the same value as _O_NOINHERIT in the MS header file. This is
+ * to ensure that we don't collide with a future definition. It means
+ * we cannot use _O_NOINHERIT ourselves.
+ */
+#define O_DSYNC 0x0080
+
+/*
+ * Supplement to <errno.h>.
+ *
+ * We redefine network-related Berkeley error symbols as the corresponding WSA
+ * constants.  This allows elog.c to recognize them as being in the Winsock
+ * error code range and pass them off to pgwin32_socket_strerror(), since
+ * Windows' version of plain strerror() won't cope.  Note that this will break
+ * if these names are used for anything else besides Windows Sockets errors.
+ * See TranslateSocketError() when changing this list.
+ */
+#undef EAGAIN
+#define EAGAIN WSAEWOULDBLOCK
+#undef EINTR
+#define EINTR WSAEINTR
+#undef EMSGSIZE
+#define EMSGSIZE WSAEMSGSIZE
+#undef EAFNOSUPPORT
+#define EAFNOSUPPORT WSAEAFNOSUPPORT
+#undef EWOULDBLOCK
+#define EWOULDBLOCK WSAEWOULDBLOCK
+#undef ECONNABORTED
+#define ECONNABORTED WSAECONNABORTED
+#undef ECONNRESET
+#define ECONNRESET WSAECONNRESET
+#undef EINPROGRESS
+#define EINPROGRESS WSAEINPROGRESS
+#undef EISCONN
+#define EISCONN WSAEISCONN
+#undef ENOBUFS
+#define ENOBUFS WSAENOBUFS
+#undef EPROTONOSUPPORT
+#define EPROTONOSUPPORT WSAEPROTONOSUPPORT
+#undef ECONNREFUSED
+#define ECONNREFUSED WSAECONNREFUSED
+#undef ENOTSOCK
+#define ENOTSOCK WSAENOTSOCK
+#undef EOPNOTSUPP
+#define EOPNOTSUPP WSAEOPNOTSUPP
+#undef EADDRINUSE
+#define EADDRINUSE WSAEADDRINUSE
+#undef EADDRNOTAVAIL
+#define EADDRNOTAVAIL WSAEADDRNOTAVAIL
+#undef EHOSTUNREACH
+#define EHOSTUNREACH WSAEHOSTUNREACH
+#undef ENOTCONN
+#define ENOTCONN WSAENOTCONN
+
+/*
+ * Locale stuff.
+ *
+ * Extended locale functions with gratuitous underscore prefixes.
+ * (These APIs are nevertheless fully documented by Microsoft.)
+ */
+#define locale_t _locale_t
+#define tolower_l _tolower_l
+#define toupper_l _toupper_l
+#define towlower_l _towlower_l
+#define towupper_l _towupper_l
+#define isdigit_l _isdigit_l
+#define iswdigit_l _iswdigit_l
+#define isalpha_l _isalpha_l
+#define iswalpha_l _iswalpha_l
+#define isalnum_l _isalnum_l
+#define iswalnum_l _iswalnum_l
+#define isupper_l _isupper_l
+#define iswupper_l _iswupper_l
+#define islower_l _islower_l
+#define iswlower_l _iswlower_l
+#define isgraph_l _isgraph_l
+#define iswgraph_l _iswgraph_l
+#define isprint_l _isprint_l
+#define iswprint_l _iswprint_l
+#define ispunct_l _ispunct_l
+#define iswpunct_l _iswpunct_l
+#define isspace_l _isspace_l
+#define iswspace_l _iswspace_l
+#define strcoll_l _strcoll_l
+#define strxfrm_l _strxfrm_l
+#define wcscoll_l _wcscoll_l
+#define wcstombs_l _wcstombs_l
+#define mbstowcs_l _mbstowcs_l
+
+/*
+ * Versions of libintl >= 0.18? try to replace setlocale() with a macro
+ * to their own versions.  Remove the macro, if it exists, because it
+ * ends up calling the wrong version when the backend and libintl use
+ * different versions of msvcrt.
+ */
+#if defined(setlocale)
+#undef setlocale
+#endif
+
+/*
+ * Define our own wrapper macro around setlocale() to work around bugs in
+ * Windows' native setlocale() function.
+ */
+extern char *pgwin32_setlocale(int category, const char *locale);
+
+#define setlocale(a,b) pgwin32_setlocale(a,b)
+
+
+/* In backend/port/win32/signal.c */
+extern PGDLLIMPORT volatile int pg_signal_queue;
+extern PGDLLIMPORT int pg_signal_mask;
+extern HANDLE pgwin32_signal_event;
+extern HANDLE pgwin32_initial_signal_pipe;
+
+#define UNBLOCKED_SIGNAL_QUEUE()	(pg_signal_queue & ~pg_signal_mask)
+#define PG_SIGNAL_COUNT 32
+
+void		pgwin32_signal_initialize(void);
+HANDLE		pgwin32_create_signal_listener(pid_t pid);
+void		pgwin32_dispatch_queued_signals(void);
+void		pg_queue_signal(int signum);
+
+/* In src/port/kill.c */
+#define kill(pid,sig)	pgkill(pid,sig)
+extern int	pgkill(int pid, int sig);
+
+/* In backend/port/win32/socket.c */
+#ifndef FRONTEND
+#define socket(af, type, protocol) pgwin32_socket(af, type, protocol)
+#define bind(s, addr, addrlen) pgwin32_bind(s, addr, addrlen)
+#define listen(s, backlog) pgwin32_listen(s, backlog)
+#define accept(s, addr, addrlen) pgwin32_accept(s, addr, addrlen)
+#define connect(s, name, namelen) pgwin32_connect(s, name, namelen)
+#define select(n, r, w, e, timeout) pgwin32_select(n, r, w, e, timeout)
+#define recv(s, buf, len, flags) pgwin32_recv(s, buf, len, flags)
+#define send(s, buf, len, flags) pgwin32_send(s, buf, len, flags)
+
+SOCKET		pgwin32_socket(int af, int type, int protocol);
+int			pgwin32_bind(SOCKET s, struct sockaddr *addr, int addrlen);
+int			pgwin32_listen(SOCKET s, int backlog);
+SOCKET		pgwin32_accept(SOCKET s, struct sockaddr *addr, int *addrlen);
+int			pgwin32_connect(SOCKET s, const struct sockaddr *name, int namelen);
+int			pgwin32_select(int nfds, fd_set *readfs, fd_set *writefds, fd_set *exceptfds, const struct timeval *timeout);
+int			pgwin32_recv(SOCKET s, char *buf, int len, int flags);
+int			pgwin32_send(SOCKET s, const void *buf, int len, int flags);
+
+const char *pgwin32_socket_strerror(int err);
+int			pgwin32_waitforsinglesocket(SOCKET s, int what, int timeout);
+
+extern int	pgwin32_noblock;
+
+#endif							/* FRONTEND */
+
+/* in backend/port/win32_shmem.c */
+extern int	pgwin32_ReserveSharedMemoryRegion(HANDLE);
+
+/* in backend/port/win32/crashdump.c */
+extern void pgwin32_install_crashdump_handler(void);
+
+/* in port/win32error.c */
+extern void _dosmaperr(unsigned long);
+
+/* in port/win32env.c */
+extern int	pgwin32_putenv(const char *);
+extern void pgwin32_unsetenv(const char *);
+
+/* in port/win32security.c */
+extern int	pgwin32_is_service(void);
+extern int	pgwin32_is_admin(void);
+
+/* Windows security token manipulation (in src/common/exec.c) */
+extern BOOL AddUserToTokenDacl(HANDLE hToken);
+
+#define putenv(x) pgwin32_putenv(x)
+#define unsetenv(x) pgwin32_unsetenv(x)
+
+/* Things that exist in MinGW headers, but need to be added to MSVC */
+#ifdef _MSC_VER
+
+#ifndef _WIN64
+typedef long ssize_t;
+#else
+typedef __int64 ssize_t;
+#endif
+
+typedef unsigned short mode_t;
+
+#define F_OK 0
+#define W_OK 2
+#define R_OK 4
+
+#if (_MSC_VER < 1800)
+#define isinf(x) ((_fpclass(x) == _FPCLASS_PINF) || (_fpclass(x) == _FPCLASS_NINF))
+#define isnan(x) _isnan(x)
+#endif
+
+/* Pulled from Makefile.port in MinGW */
+#define DLSUFFIX ".dll"
+
+#endif							/* _MSC_VER */
+
+#endif							/* PG_WIN32_PORT_H */
diff --git a/src/include/portability/instr_time.h b/src/include/portability/instr_time.h
index b6e8c58d44..f968444671 100644
--- a/src/include/portability/instr_time.h
+++ b/src/include/portability/instr_time.h
@@ -43,7 +43,7 @@
  * Beware of multiple evaluations of the macro arguments.
  *
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * src/include/portability/instr_time.h
  *
diff --git a/src/include/portability/mem.h b/src/include/portability/mem.h
index fa507c2581..ba183f5368 100644
--- a/src/include/portability/mem.h
+++ b/src/include/portability/mem.h
@@ -3,7 +3,7 @@
  * mem.h
  *	  portability definitions for various memory operations
  *
- * Copyright (c) 2001-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2001-2018, PostgreSQL Global Development Group
  *
  * src/include/portability/mem.h
  *
diff --git a/src/include/postgres.h b/src/include/postgres.h
index 1ca9b60ea1..bbcb50e41f 100644
--- a/src/include/postgres.h
+++ b/src/include/postgres.h
@@ -7,7 +7,7 @@
  * Client-side code should include postgres_fe.h instead.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
  * src/include/postgres.h
@@ -24,8 +24,7 @@
  *	  section	description
  *	  -------	------------------------------------------------
  *		1)		variable-length datatypes (TOAST support)
- *		2)		datum type + support macros
- *		3)		exception handling backend support
+ *		2)		Datum type + support macros
  *
  *	 NOTES
  *
@@ -349,60 +348,38 @@ typedef struct
 
 
 /* ----------------------------------------------------------------
- *				Section 2:	datum type + support macros
+ *				Section 2:	Datum type + support macros
  * ----------------------------------------------------------------
  */
 
 /*
- * Port Notes:
- *	Postgres makes the following assumptions about datatype sizes:
+ * A Datum contains either a value of a pass-by-value type or a pointer to a
+ * value of a pass-by-reference type.  Therefore, we require:
  *
- *	sizeof(Datum) == sizeof(void *) == 4 or 8
- *	sizeof(char) == 1
- *	sizeof(short) == 2
+ * sizeof(Datum) == sizeof(void *) == 4 or 8
  *
- * When a type narrower than Datum is stored in a Datum, we place it in the
- * low-order bits and are careful that the DatumGetXXX macro for it discards
- * the unused high-order bits (as opposed to, say, assuming they are zero).
- * This is needed to support old-style user-defined functions, since depending
- * on architecture and compiler, the return value of a function returning char
- * or short may contain garbage when called as if it returned Datum.
+ * The macros below and the analogous macros for other types should be used to
+ * convert between a Datum and the appropriate C type.
  */
 
 typedef uintptr_t Datum;
 
 #define SIZEOF_DATUM SIZEOF_VOID_P
 
-typedef Datum *DatumPtr;
-
-#define GET_1_BYTE(datum)	(((Datum) (datum)) & 0x000000ff)
-#define GET_2_BYTES(datum)	(((Datum) (datum)) & 0x0000ffff)
-#define GET_4_BYTES(datum)	(((Datum) (datum)) & 0xffffffff)
-#if SIZEOF_DATUM == 8
-#define GET_8_BYTES(datum)	((Datum) (datum))
-#endif
-#define SET_1_BYTE(value)	(((Datum) (value)) & 0x000000ff)
-#define SET_2_BYTES(value)	(((Datum) (value)) & 0x0000ffff)
-#define SET_4_BYTES(value)	(((Datum) (value)) & 0xffffffff)
-#if SIZEOF_DATUM == 8
-#define SET_8_BYTES(value)	((Datum) (value))
-#endif
-
 /*
  * DatumGetBool
  *		Returns boolean value of a datum.
  *
- * Note: any nonzero value will be considered TRUE, but we ignore bits to
- * the left of the width of bool, per comment above.
+ * Note: any nonzero value will be considered true.
  */
 
-#define DatumGetBool(X) ((bool) (GET_1_BYTE(X) != 0))
+#define DatumGetBool(X) ((bool) ((X) != 0))
 
 /*
  * BoolGetDatum
  *		Returns datum representation for a boolean.
  *
- * Note: any nonzero value will be considered TRUE.
+ * Note: any nonzero value will be considered true.
  */
 
 #define BoolGetDatum(X) ((Datum) ((X) ? 1 : 0))
@@ -412,140 +389,140 @@ typedef Datum *DatumPtr;
  *		Returns character value of a datum.
  */
 
-#define DatumGetChar(X) ((char) GET_1_BYTE(X))
+#define DatumGetChar(X) ((char) (X))
 
 /*
  * CharGetDatum
  *		Returns datum representation for a character.
  */
 
-#define CharGetDatum(X) ((Datum) SET_1_BYTE(X))
+#define CharGetDatum(X) ((Datum) (X))
 
 /*
  * Int8GetDatum
  *		Returns datum representation for an 8-bit integer.
  */
 
-#define Int8GetDatum(X) ((Datum) SET_1_BYTE(X))
+#define Int8GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetUInt8
  *		Returns 8-bit unsigned integer value of a datum.
  */
 
-#define DatumGetUInt8(X) ((uint8) GET_1_BYTE(X))
+#define DatumGetUInt8(X) ((uint8) (X))
 
 /*
  * UInt8GetDatum
  *		Returns datum representation for an 8-bit unsigned integer.
  */
 
-#define UInt8GetDatum(X) ((Datum) SET_1_BYTE(X))
+#define UInt8GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetInt16
  *		Returns 16-bit integer value of a datum.
  */
 
-#define DatumGetInt16(X) ((int16) GET_2_BYTES(X))
+#define DatumGetInt16(X) ((int16) (X))
 
 /*
  * Int16GetDatum
  *		Returns datum representation for a 16-bit integer.
  */
 
-#define Int16GetDatum(X) ((Datum) SET_2_BYTES(X))
+#define Int16GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetUInt16
  *		Returns 16-bit unsigned integer value of a datum.
  */
 
-#define DatumGetUInt16(X) ((uint16) GET_2_BYTES(X))
+#define DatumGetUInt16(X) ((uint16) (X))
 
 /*
  * UInt16GetDatum
  *		Returns datum representation for a 16-bit unsigned integer.
  */
 
-#define UInt16GetDatum(X) ((Datum) SET_2_BYTES(X))
+#define UInt16GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetInt32
  *		Returns 32-bit integer value of a datum.
  */
 
-#define DatumGetInt32(X) ((int32) GET_4_BYTES(X))
+#define DatumGetInt32(X) ((int32) (X))
 
 /*
  * Int32GetDatum
  *		Returns datum representation for a 32-bit integer.
  */
 
-#define Int32GetDatum(X) ((Datum) SET_4_BYTES(X))
+#define Int32GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetUInt32
  *		Returns 32-bit unsigned integer value of a datum.
  */
 
-#define DatumGetUInt32(X) ((uint32) GET_4_BYTES(X))
+#define DatumGetUInt32(X) ((uint32) (X))
 
 /*
  * UInt32GetDatum
  *		Returns datum representation for a 32-bit unsigned integer.
  */
 
-#define UInt32GetDatum(X) ((Datum) SET_4_BYTES(X))
+#define UInt32GetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetObjectId
  *		Returns object identifier value of a datum.
  */
 
-#define DatumGetObjectId(X) ((Oid) GET_4_BYTES(X))
+#define DatumGetObjectId(X) ((Oid) (X))
 
 /*
  * ObjectIdGetDatum
  *		Returns datum representation for an object identifier.
  */
 
-#define ObjectIdGetDatum(X) ((Datum) SET_4_BYTES(X))
+#define ObjectIdGetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetTransactionId
  *		Returns transaction identifier value of a datum.
  */
 
-#define DatumGetTransactionId(X) ((TransactionId) GET_4_BYTES(X))
+#define DatumGetTransactionId(X) ((TransactionId) (X))
 
 /*
  * TransactionIdGetDatum
  *		Returns datum representation for a transaction identifier.
  */
 
-#define TransactionIdGetDatum(X) ((Datum) SET_4_BYTES((X)))
+#define TransactionIdGetDatum(X) ((Datum) (X))
 
 /*
  * MultiXactIdGetDatum
  *		Returns datum representation for a multixact identifier.
  */
 
-#define MultiXactIdGetDatum(X) ((Datum) SET_4_BYTES((X)))
+#define MultiXactIdGetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetCommandId
  *		Returns command identifier value of a datum.
  */
 
-#define DatumGetCommandId(X) ((CommandId) GET_4_BYTES(X))
+#define DatumGetCommandId(X) ((CommandId) (X))
 
 /*
  * CommandIdGetDatum
  *		Returns datum representation for a command identifier.
  */
 
-#define CommandIdGetDatum(X) ((Datum) SET_4_BYTES(X))
+#define CommandIdGetDatum(X) ((Datum) (X))
 
 /*
  * DatumGetPointer
@@ -608,7 +585,7 @@ typedef Datum *DatumPtr;
  */
 
 #ifdef USE_FLOAT8_BYVAL
-#define DatumGetInt64(X) ((int64) GET_8_BYTES(X))
+#define DatumGetInt64(X) ((int64) (X))
 #else
 #define DatumGetInt64(X) (* ((int64 *) DatumGetPointer(X)))
 #endif
@@ -622,7 +599,7 @@ typedef Datum *DatumPtr;
  */
 
 #ifdef USE_FLOAT8_BYVAL
-#define Int64GetDatum(X) ((Datum) SET_8_BYTES(X))
+#define Int64GetDatum(X) ((Datum) (X))
 #else
 extern Datum Int64GetDatum(int64 X);
 #endif
@@ -635,7 +612,7 @@ extern Datum Int64GetDatum(int64 X);
  */
 
 #ifdef USE_FLOAT8_BYVAL
-#define DatumGetUInt64(X) ((uint64) GET_8_BYTES(X))
+#define DatumGetUInt64(X) ((uint64) (X))
 #else
 #define DatumGetUInt64(X) (* ((uint64 *) DatumGetPointer(X)))
 #endif
@@ -649,7 +626,7 @@ extern Datum Int64GetDatum(int64 X);
  */
 
 #ifdef USE_FLOAT8_BYVAL
-#define UInt64GetDatum(X) ((Datum) SET_8_BYTES(X))
+#define UInt64GetDatum(X) ((Datum) (X))
 #else
 #define UInt64GetDatum(X) Int64GetDatum((int64) (X))
 #endif
@@ -788,19 +765,4 @@ extern Datum Float8GetDatum(float8 X);
 #define Float4GetDatumFast(X) PointerGetDatum(&(X))
 #endif
 
-
-/* ----------------------------------------------------------------
- *				Section 3:	exception handling backend support
- * ----------------------------------------------------------------
- */
-
-/*
- * Backend only infrastructure for the assertion-related macros in c.h.
- *
- * ExceptionalCondition must be present even when assertions are not enabled.
- */
-extern void ExceptionalCondition(const char *conditionName,
-					 const char *errorType,
-					 const char *fileName, int lineNumber) pg_attribute_noreturn();
-
 #endif							/* POSTGRES_H */
diff --git a/src/include/postgres_fe.h b/src/include/postgres_fe.h
index 1dd01d0283..14567953f2 100644
--- a/src/include/postgres_fe.h
+++ b/src/include/postgres_fe.h
@@ -8,7 +8,7 @@
  * postgres.h.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
  * src/include/postgres_fe.h
diff --git a/src/include/postmaster/autovacuum.h b/src/include/postmaster/autovacuum.h
index 3469915ae2..18cff540b7 100644
--- a/src/include/postmaster/autovacuum.h
+++ b/src/include/postmaster/autovacuum.h
@@ -4,7 +4,7 @@
  *	  header file for integrated autovacuum daemon
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/postmaster/autovacuum.h
diff --git a/src/include/postmaster/bgworker.h b/src/include/postmaster/bgworker.h
index e2ecd3c9eb..0c04529f47 100644
--- a/src/include/postmaster/bgworker.h
+++ b/src/include/postmaster/bgworker.h
@@ -31,7 +31,7 @@
  * different) code.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -88,6 +88,7 @@ typedef enum
 typedef struct BackgroundWorker
 {
 	char		bgw_name[BGW_MAXLEN];
+	char		bgw_type[BGW_MAXLEN];
 	int			bgw_flags;
 	BgWorkerStartTime bgw_start_time;
 	int			bgw_restart_time;	/* in seconds, or BGW_NEVER_RESTART */
@@ -122,6 +123,7 @@ extern BgwHandleStatus GetBackgroundWorkerPid(BackgroundWorkerHandle *handle,
 extern BgwHandleStatus WaitForBackgroundWorkerStartup(BackgroundWorkerHandle *handle, pid_t *pid);
 extern BgwHandleStatus
 			WaitForBackgroundWorkerShutdown(BackgroundWorkerHandle *);
+extern const char *GetBackgroundWorkerTypeByPid(pid_t pid);
 
 /* Terminate a bgworker */
 extern void TerminateBackgroundWorker(BackgroundWorkerHandle *handle);
@@ -138,7 +140,7 @@ extern PGDLLIMPORT BackgroundWorker *MyBgworkerEntry;
  * If dbname is NULL, connection is made to no specific database;
  * only shared catalogs can be accessed.
  */
-extern void BackgroundWorkerInitializeConnection(char *dbname, char *username);
+extern void BackgroundWorkerInitializeConnection(const char *dbname, const char *username);
 
 /* Just like the above, but specifying database and user by OID. */
 extern void BackgroundWorkerInitializeConnectionByOid(Oid dboid, Oid useroid);
diff --git a/src/include/postmaster/bgworker_internals.h b/src/include/postmaster/bgworker_internals.h
index bff10ba53c..548dc1c146 100644
--- a/src/include/postmaster/bgworker_internals.h
+++ b/src/include/postmaster/bgworker_internals.h
@@ -2,7 +2,7 @@
  * bgworker_internals.h
  *		POSTGRES pluggable background workers internals
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/postmaster/bgwriter.h b/src/include/postmaster/bgwriter.h
index a9b8bc7e8e..941c6aba7d 100644
--- a/src/include/postmaster/bgwriter.h
+++ b/src/include/postmaster/bgwriter.h
@@ -6,7 +6,7 @@
  * The bgwriter process used to handle checkpointing duties too.  Now
  * there is a separate process, but we did not bother to split this header.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/postmaster/bgwriter.h
  *
diff --git a/src/include/postmaster/fork_process.h b/src/include/postmaster/fork_process.h
index 9d5b97aca7..d552e0297c 100644
--- a/src/include/postmaster/fork_process.h
+++ b/src/include/postmaster/fork_process.h
@@ -3,7 +3,7 @@
  * fork_process.h
  *	  Exports from postmaster/fork_process.c.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/postmaster/fork_process.h
  *
diff --git a/src/include/postmaster/pgarch.h b/src/include/postmaster/pgarch.h
index ab1ddcf52c..292e63a26a 100644
--- a/src/include/postmaster/pgarch.h
+++ b/src/include/postmaster/pgarch.h
@@ -3,7 +3,7 @@
  * pgarch.h
  *	  Exports from postmaster/pgarch.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/postmaster/pgarch.h
diff --git a/src/include/postmaster/postmaster.h b/src/include/postmaster/postmaster.h
index 0f85908b09..1877eef239 100644
--- a/src/include/postmaster/postmaster.h
+++ b/src/include/postmaster/postmaster.h
@@ -3,7 +3,7 @@
  * postmaster.h
  *	  Exports from postmaster/postmaster.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/postmaster/postmaster.h
@@ -16,7 +16,7 @@
 /* GUC options */
 extern bool EnableSSL;
 extern int	ReservedBackends;
-extern int	PostPortNumber;
+extern PGDLLIMPORT int PostPortNumber;
 extern int	Unix_socket_permissions;
 extern char *Unix_socket_group;
 extern char *Unix_socket_directories;
@@ -44,7 +44,7 @@ extern int	postmaster_alive_fds[2];
 #define POSTMASTER_FD_OWN		1	/* kept open by postmaster only */
 #endif
 
-extern const char *progname;
+extern PGDLLIMPORT const char *progname;
 
 extern void PostmasterMain(int argc, char *argv[]) pg_attribute_noreturn();
 extern void ClosePostmasterPorts(bool am_syslogger);
diff --git a/src/include/postmaster/startup.h b/src/include/postmaster/startup.h
index 883bd395bd..1bef7239b2 100644
--- a/src/include/postmaster/startup.h
+++ b/src/include/postmaster/startup.h
@@ -3,7 +3,7 @@
  * startup.h
  *	  Exports from postmaster/startup.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/postmaster/startup.h
  *
diff --git a/src/include/postmaster/syslogger.h b/src/include/postmaster/syslogger.h
index f4248ef5d4..b35fadc1bd 100644
--- a/src/include/postmaster/syslogger.h
+++ b/src/include/postmaster/syslogger.h
@@ -3,7 +3,7 @@
  * syslogger.h
  *	  Exports from postmaster/syslogger.c.
  *
- * Copyright (c) 2004-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2004-2018, PostgreSQL Global Development Group
  *
  * src/include/postmaster/syslogger.h
  *
diff --git a/src/include/postmaster/walwriter.h b/src/include/postmaster/walwriter.h
index f0eb425802..26ec256b96 100644
--- a/src/include/postmaster/walwriter.h
+++ b/src/include/postmaster/walwriter.h
@@ -3,7 +3,7 @@
  * walwriter.h
  *	  Exports from postmaster/walwriter.c.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/postmaster/walwriter.h
  *
diff --git a/src/include/regex/regexport.h b/src/include/regex/regexport.h
index 1c84d15d55..ff6ff3d791 100644
--- a/src/include/regex/regexport.h
+++ b/src/include/regex/regexport.h
@@ -17,7 +17,7 @@
  * line and start/end of string.  Colors are numbered 0..C-1, but note that
  * color 0 is "white" (all unused characters) and can generally be ignored.
  *
- * Portions Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2013-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1998, 1999 Henry Spencer
  *
  * IDENTIFICATION
diff --git a/src/include/replication/basebackup.h b/src/include/replication/basebackup.h
index 1a165c860b..941d07b99f 100644
--- a/src/include/replication/basebackup.h
+++ b/src/include/replication/basebackup.h
@@ -3,7 +3,7 @@
  * basebackup.h
  *	  Exports from replication/basebackup.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/basebackup.h
  *
diff --git a/src/include/replication/decode.h b/src/include/replication/decode.h
index f9d81d77d0..0e63c0b296 100644
--- a/src/include/replication/decode.h
+++ b/src/include/replication/decode.h
@@ -2,7 +2,7 @@
  * decode.h
  *	   PostgreSQL WAL to logical transformation
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/replication/logical.h b/src/include/replication/logical.h
index 7f0e0fa881..619c5f4d73 100644
--- a/src/include/replication/logical.h
+++ b/src/include/replication/logical.h
@@ -2,7 +2,7 @@
  * logical.h
  *	   PostgreSQL logical decoding coordination
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -45,6 +45,13 @@ typedef struct LogicalDecodingContext
 	struct ReorderBuffer *reorder;
 	struct SnapBuild *snapshot_builder;
 
+	/*
+	 * Marks the logical decoding context as fast forward decoding one.
+	 * Such a context does not have plugin loaded so most of the the following
+	 * properties are unused.
+	 */
+	bool fast_forward;
+
 	OutputPluginCallbacks callbacks;
 	OutputPluginOptions options;
 
@@ -97,6 +104,7 @@ extern LogicalDecodingContext *CreateInitDecodingContext(char *plugin,
 extern LogicalDecodingContext *CreateDecodingContext(
 					  XLogRecPtr start_lsn,
 					  List *output_plugin_options,
+					  bool fast_forward,
 					  XLogPageReadCB read_page,
 					  LogicalOutputPluginWriterPrepareWrite prepare_write,
 					  LogicalOutputPluginWriterWrite do_write,
diff --git a/src/include/replication/logicalfuncs.h b/src/include/replication/logicalfuncs.h
index 71faee18cf..4236b40bc6 100644
--- a/src/include/replication/logicalfuncs.h
+++ b/src/include/replication/logicalfuncs.h
@@ -2,7 +2,7 @@
  * logicalfuncs.h
  *	   PostgreSQL WAL to logical transformation support functions
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/replication/logicallauncher.h b/src/include/replication/logicallauncher.h
index 78016c448f..ef02512412 100644
--- a/src/include/replication/logicallauncher.h
+++ b/src/include/replication/logicallauncher.h
@@ -3,7 +3,7 @@
  * logicallauncher.h
  *	  Exports for logical replication launcher.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/logicallauncher.h
  *
diff --git a/src/include/replication/logicalproto.h b/src/include/replication/logicalproto.h
index a9736e1bf6..0eb21057c5 100644
--- a/src/include/replication/logicalproto.h
+++ b/src/include/replication/logicalproto.h
@@ -3,7 +3,7 @@
  * logicalproto.h
  *		logical replication protocol
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/replication/logicalproto.h
diff --git a/src/include/replication/logicalrelation.h b/src/include/replication/logicalrelation.h
index 8352705650..d4250c2608 100644
--- a/src/include/replication/logicalrelation.h
+++ b/src/include/replication/logicalrelation.h
@@ -3,7 +3,7 @@
  * logicalrelation.h
  *	  Relation definitions for logical replication relation mapping.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/logicalrelation.h
  *
diff --git a/src/include/replication/logicalworker.h b/src/include/replication/logicalworker.h
index 2557d5a23b..6379aae7ce 100644
--- a/src/include/replication/logicalworker.h
+++ b/src/include/replication/logicalworker.h
@@ -3,7 +3,7 @@
  * logicalworker.h
  *	  Exports for logical replication workers.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/logicalworker.h
  *
diff --git a/src/include/replication/message.h b/src/include/replication/message.h
index 1f2d0bb535..37e1bd32d6 100644
--- a/src/include/replication/message.h
+++ b/src/include/replication/message.h
@@ -2,7 +2,7 @@
  * message.h
  *	   Exports from replication/logical/message.c
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/message.h
  *-------------------------------------------------------------------------
diff --git a/src/include/replication/origin.h b/src/include/replication/origin.h
index a9595c3c3d..34fc01207d 100644
--- a/src/include/replication/origin.h
+++ b/src/include/replication/origin.h
@@ -2,7 +2,7 @@
  * origin.h
  *	   Exports from replication/logical/origin.c
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/origin.h
  *-------------------------------------------------------------------------
diff --git a/src/include/replication/output_plugin.h b/src/include/replication/output_plugin.h
index 26ff024882..78fd38bb16 100644
--- a/src/include/replication/output_plugin.h
+++ b/src/include/replication/output_plugin.h
@@ -2,7 +2,7 @@
  * output_plugin.h
  *	   PostgreSQL Logical Decode Plugin Interface
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/include/replication/pgoutput.h b/src/include/replication/pgoutput.h
index 1ec4500d9d..29178da1d1 100644
--- a/src/include/replication/pgoutput.h
+++ b/src/include/replication/pgoutput.h
@@ -3,7 +3,7 @@
  * pgoutput.h
  *		Logical Replication output plugin
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		pgoutput.h
diff --git a/src/include/replication/reorderbuffer.h b/src/include/replication/reorderbuffer.h
index 86effe106b..0970abca52 100644
--- a/src/include/replication/reorderbuffer.h
+++ b/src/include/replication/reorderbuffer.h
@@ -2,7 +2,7 @@
  * reorderbuffer.h
  *	  PostgreSQL logical replay/reorder buffer management.
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/reorderbuffer.h
  */
@@ -168,6 +168,8 @@ typedef struct ReorderBufferTXN
 	 * * plain abort record
 	 * * prepared transaction abort
 	 * * error during decoding
+	 * * for a crashed transaction, the LSN of the last change, regardless of
+	 *   what it was.
 	 * ----
 	 */
 	XLogRecPtr	final_lsn;
@@ -344,20 +346,7 @@ struct ReorderBuffer
 	 */
 	MemoryContext change_context;
 	MemoryContext txn_context;
-
-	/*
-	 * Data structure slab cache.
-	 *
-	 * We allocate/deallocate some structures very frequently, to avoid bigger
-	 * overhead we cache some unused ones here.
-	 *
-	 * The maximum number of cached entries is controlled by const variables
-	 * on top of reorderbuffer.c
-	 */
-
-	/* cached ReorderBufferTupleBufs */
-	slist_head	cached_tuplebufs;
-	Size		nr_cached_tuplebufs;
+	MemoryContext tup_context;
 
 	XLogRecPtr	current_restart_decoding_lsn;
 
diff --git a/src/include/replication/slot.h b/src/include/replication/slot.h
index 0bf2611fe9..76a88c6de7 100644
--- a/src/include/replication/slot.h
+++ b/src/include/replication/slot.h
@@ -2,7 +2,7 @@
  * slot.h
  *	   Replication slot management.
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  *-------------------------------------------------------------------------
  */
@@ -22,9 +22,13 @@
  *
  * Slots marked as PERSISTENT are crash-safe and will not be dropped when
  * released. Slots marked as EPHEMERAL will be dropped when released or after
- * restarts.
+ * restarts.  Slots marked TEMPORARY will be dropped at the end of a session
+ * or on error.
  *
- * EPHEMERAL slots can be made PERSISTENT by calling ReplicationSlotPersist().
+ * EPHEMERAL is used as a not-quite-ready state when creating persistent
+ * slots.  EPHEMERAL slots can be made PERSISTENT by calling
+ * ReplicationSlotPersist().  For a slot that goes away at the end of a
+ * session, TEMPORARY is the appropriate choice.
  */
 typedef enum ReplicationSlotPersistency
 {
diff --git a/src/include/replication/snapbuild.h b/src/include/replication/snapbuild.h
index 7653717f83..56257430ae 100644
--- a/src/include/replication/snapbuild.h
+++ b/src/include/replication/snapbuild.h
@@ -3,7 +3,7 @@
  * snapbuild.h
  *	  Exports from replication/logical/snapbuild.c.
  *
- * Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/snapbuild.h
  *
diff --git a/src/include/replication/syncrep.h b/src/include/replication/syncrep.h
index ceafe2cbea..bc43b4e109 100644
--- a/src/include/replication/syncrep.h
+++ b/src/include/replication/syncrep.h
@@ -3,7 +3,7 @@
  * syncrep.h
  *	  Exports from replication/syncrep.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/replication/syncrep.h
diff --git a/src/include/replication/walreceiver.h b/src/include/replication/walreceiver.h
index 9a8b2e207e..ea7967f6fc 100644
--- a/src/include/replication/walreceiver.h
+++ b/src/include/replication/walreceiver.h
@@ -3,7 +3,7 @@
  * walreceiver.h
  *	  Exports from replication/walreceiverfuncs.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/walreceiver.h
  *
@@ -117,14 +117,6 @@ typedef struct
 	/* set true once conninfo is ready to display (obfuscated pwds etc) */
 	bool		ready_to_display;
 
-	slock_t		mutex;			/* locks shared variables shown above */
-
-	/*
-	 * force walreceiver reply?  This doesn't need to be locked; memory
-	 * barriers for ordering are sufficient.
-	 */
-	bool		force_reply;
-
 	/*
 	 * Latch used by startup process to wake up walreceiver after telling it
 	 * where to start streaming (after setting receiveStart and
@@ -133,6 +125,15 @@ typedef struct
 	 * normally mapped to procLatch when walreceiver is running.
 	 */
 	Latch	   *latch;
+
+	slock_t		mutex;			/* locks shared variables shown above */
+
+	/*
+	 * force walreceiver reply?  This doesn't need to be locked; memory
+	 * barriers for ordering are sufficient.  But we do need atomic fetch and
+	 * store semantics, so use sig_atomic_t.
+	 */
+	sig_atomic_t force_reply;	/* used as a bool */
 } WalRcvData;
 
 extern WalRcvData *WalRcv;
diff --git a/src/include/replication/walsender.h b/src/include/replication/walsender.h
index 1f20db827a..45b72a76db 100644
--- a/src/include/replication/walsender.h
+++ b/src/include/replication/walsender.h
@@ -3,7 +3,7 @@
  * walsender.h
  *	  Exports from replication/walsender.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/walsender.h
  *
diff --git a/src/include/replication/walsender_private.h b/src/include/replication/walsender_private.h
index 17c68cba23..4b90477936 100644
--- a/src/include/replication/walsender_private.h
+++ b/src/include/replication/walsender_private.h
@@ -3,7 +3,7 @@
  * walsender_private.h
  *	  Private definitions from replication/walsender.c.
  *
- * Portions Copyright (c) 2010-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2010-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/walsender_private.h
  *
diff --git a/src/include/replication/worker_internal.h b/src/include/replication/worker_internal.h
index 7b8728cced..1ce3b6b058 100644
--- a/src/include/replication/worker_internal.h
+++ b/src/include/replication/worker_internal.h
@@ -3,7 +3,7 @@
  * worker_internal.h
  *	  Internal headers shared by logical replication workers.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * src/include/replication/worker_internal.h
  *
diff --git a/src/include/rewrite/prs2lock.h b/src/include/rewrite/prs2lock.h
index 419d140bd5..9e7c87a8c1 100644
--- a/src/include/rewrite/prs2lock.h
+++ b/src/include/rewrite/prs2lock.h
@@ -3,7 +3,7 @@
  * prs2lock.h
  *	  data structures for POSTGRES Rule System II (rewrite rules only)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/prs2lock.h
diff --git a/src/include/rewrite/rewriteDefine.h b/src/include/rewrite/rewriteDefine.h
index 2e25288bb4..4ceaaffee7 100644
--- a/src/include/rewrite/rewriteDefine.h
+++ b/src/include/rewrite/rewriteDefine.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/rewriteDefine.h
@@ -25,7 +25,7 @@
 
 extern ObjectAddress DefineRule(RuleStmt *stmt, const char *queryString);
 
-extern ObjectAddress DefineQueryRewrite(char *rulename,
+extern ObjectAddress DefineQueryRewrite(const char *rulename,
 				   Oid event_relid,
 				   Node *event_qual,
 				   CmdType event_type,
diff --git a/src/include/rewrite/rewriteHandler.h b/src/include/rewrite/rewriteHandler.h
index 494fa29f10..8128199fc3 100644
--- a/src/include/rewrite/rewriteHandler.h
+++ b/src/include/rewrite/rewriteHandler.h
@@ -4,7 +4,7 @@
  *		External interface to query rewriter.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/rewriteHandler.h
@@ -23,6 +23,9 @@ extern void AcquireRewriteLocks(Query *parsetree,
 					bool forUpdatePushedDown);
 
 extern Node *build_column_default(Relation rel, int attrno);
+extern void rewriteTargetListUD(Query *parsetree, RangeTblEntry *target_rte,
+					Relation target_relation);
+
 extern Query *get_view_query(Relation view);
 extern const char *view_query_is_auto_updatable(Query *viewquery,
 							 bool check_cols);
diff --git a/src/include/rewrite/rewriteManip.h b/src/include/rewrite/rewriteManip.h
index f0a7a8b2cd..f0299bc703 100644
--- a/src/include/rewrite/rewriteManip.h
+++ b/src/include/rewrite/rewriteManip.h
@@ -4,7 +4,7 @@
  *		Querytree manipulation subroutines for query rewriter.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/rewriteManip.h
diff --git a/src/include/rewrite/rewriteRemove.h b/src/include/rewrite/rewriteRemove.h
index d7d53b0137..351e26c307 100644
--- a/src/include/rewrite/rewriteRemove.h
+++ b/src/include/rewrite/rewriteRemove.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/rewriteRemove.h
diff --git a/src/include/rewrite/rewriteSupport.h b/src/include/rewrite/rewriteSupport.h
index 60800aae25..f34bfda05f 100644
--- a/src/include/rewrite/rewriteSupport.h
+++ b/src/include/rewrite/rewriteSupport.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rewrite/rewriteSupport.h
diff --git a/src/include/rewrite/rowsecurity.h b/src/include/rewrite/rowsecurity.h
index 0dbc1a4bee..f2f5251c71 100644
--- a/src/include/rewrite/rowsecurity.h
+++ b/src/include/rewrite/rowsecurity.h
@@ -5,7 +5,7 @@
  *	  prototypes for rewrite/rowsecurity.c and the structures for managing
  *	  the row security policies for relations in relcache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * -------------------------------------------------------------------------
diff --git a/src/include/rusagestub.h b/src/include/rusagestub.h
index f54f66e6f3..1423e2699e 100644
--- a/src/include/rusagestub.h
+++ b/src/include/rusagestub.h
@@ -4,7 +4,7 @@
  *	  Stubs for getrusage(3).
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/rusagestub.h
diff --git a/src/include/snowball/header.h b/src/include/snowball/header.h
index 10acf4c53d..c0450ae4eb 100644
--- a/src/include/snowball/header.h
+++ b/src/include/snowball/header.h
@@ -13,7 +13,7 @@
  *
  * NOTE: this file should not be included into any non-snowball sources!
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/snowball/header.h
  *
diff --git a/src/include/statistics/extended_stats_internal.h b/src/include/statistics/extended_stats_internal.h
index 738ff3fadc..b3ca0c1229 100644
--- a/src/include/statistics/extended_stats_internal.h
+++ b/src/include/statistics/extended_stats_internal.h
@@ -3,7 +3,7 @@
  * extended_stats_internal.h
  *	  POSTGRES extended statistics internal declarations
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/statistics/statistics.h b/src/include/statistics/statistics.h
index 1d68c39df0..8009fee322 100644
--- a/src/include/statistics/statistics.h
+++ b/src/include/statistics/statistics.h
@@ -3,7 +3,7 @@
  * statistics.h
  *	  Extended statistics and selectivity estimation functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/statistics/statistics.h
diff --git a/src/include/storage/backendid.h b/src/include/storage/backendid.h
index bf31ba4f48..e000bb848c 100644
--- a/src/include/storage/backendid.h
+++ b/src/include/storage/backendid.h
@@ -4,7 +4,7 @@
  *	  POSTGRES backend id communication definitions
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/backendid.h
diff --git a/src/include/storage/barrier.h b/src/include/storage/barrier.h
new file mode 100644
index 0000000000..8b5a3751ea
--- /dev/null
+++ b/src/include/storage/barrier.h
@@ -0,0 +1,45 @@
+/*-------------------------------------------------------------------------
+ *
+ * barrier.h
+ *	  Barriers for synchronizing cooperating processes.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/storage/barrier.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef BARRIER_H
+#define BARRIER_H
+
+/*
+ * For the header previously known as "barrier.h", please include
+ * "port/atomics.h", which deals with atomics, compiler barriers and memory
+ * barriers.
+ */
+
+#include "storage/condition_variable.h"
+#include "storage/spin.h"
+
+typedef struct Barrier
+{
+	slock_t		mutex;
+	int			phase;			/* phase counter */
+	int			participants;	/* the number of participants attached */
+	int			arrived;		/* the number of participants that have
+								 * arrived */
+	int			elected;		/* highest phase elected */
+	bool		static_party;	/* used only for assertions */
+	ConditionVariable condition_variable;
+} Barrier;
+
+extern void BarrierInit(Barrier *barrier, int num_workers);
+extern bool BarrierArriveAndWait(Barrier *barrier, uint32 wait_event_info);
+extern bool BarrierArriveAndDetach(Barrier *barrier);
+extern int	BarrierAttach(Barrier *barrier);
+extern bool BarrierDetach(Barrier *barrier);
+extern int	BarrierPhase(Barrier *barrier);
+extern int	BarrierParticipants(Barrier *barrier);
+
+#endif							/* BARRIER_H */
diff --git a/src/include/storage/block.h b/src/include/storage/block.h
index 33840798a8..e2bfa11e37 100644
--- a/src/include/storage/block.h
+++ b/src/include/storage/block.h
@@ -4,7 +4,7 @@
  *	  POSTGRES disk block definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/block.h
diff --git a/src/include/storage/buf.h b/src/include/storage/buf.h
index 054f482bd7..3b89983b42 100644
--- a/src/include/storage/buf.h
+++ b/src/include/storage/buf.h
@@ -4,7 +4,7 @@
  *	  Basic buffer manager data types.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/buf.h
diff --git a/src/include/storage/buf_internals.h b/src/include/storage/buf_internals.h
index b768b6fc96..5370035f0c 100644
--- a/src/include/storage/buf_internals.h
+++ b/src/include/storage/buf_internals.h
@@ -5,7 +5,7 @@
  *	  strategy.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/buf_internals.h
@@ -317,6 +317,7 @@ extern void StrategyNotifyBgWriter(int bgwprocno);
 
 extern Size StrategyShmemSize(void);
 extern void StrategyInitialize(bool init);
+extern bool have_free_buffer(void);
 
 /* buf_table.c */
 extern Size BufTableShmemSize(int size);
diff --git a/src/include/storage/buffile.h b/src/include/storage/buffile.h
index fafcb3f089..a6cdeb451c 100644
--- a/src/include/storage/buffile.h
+++ b/src/include/storage/buffile.h
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  *
  * buffile.h
- *	  Management of large buffered files, primarily temporary files.
+ *	  Management of large buffered temporary files.
  *
  * The BufFile routines provide a partial replacement for stdio atop
  * virtual file descriptors managed by fd.c.  Currently they only support
@@ -15,7 +15,7 @@
  * but currently we have no need for oversize temp files without buffered
  * access.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/buffile.h
@@ -26,6 +26,8 @@
 #ifndef BUFFILE_H
 #define BUFFILE_H
 
+#include "storage/sharedfileset.h"
+
 /* BufFile is an opaque type whose details are not known outside buffile.c. */
 
 typedef struct BufFile BufFile;
@@ -41,5 +43,12 @@ extern size_t BufFileWrite(BufFile *file, void *ptr, size_t size);
 extern int	BufFileSeek(BufFile *file, int fileno, off_t offset, int whence);
 extern void BufFileTell(BufFile *file, int *fileno, off_t *offset);
 extern int	BufFileSeekBlock(BufFile *file, long blknum);
+extern off_t BufFileSize(BufFile *file);
+extern long BufFileAppend(BufFile *target, BufFile *source);
+
+extern BufFile *BufFileCreateShared(SharedFileSet *fileset, const char *name);
+extern void BufFileExportShared(BufFile *file);
+extern BufFile *BufFileOpenShared(SharedFileSet *fileset, const char *name);
+extern void BufFileDeleteShared(SharedFileSet *fileset, const char *name);
 
 #endif							/* BUFFILE_H */
diff --git a/src/include/storage/bufmgr.h b/src/include/storage/bufmgr.h
index 98b63fc5ba..3cce3906a0 100644
--- a/src/include/storage/bufmgr.h
+++ b/src/include/storage/bufmgr.h
@@ -4,7 +4,7 @@
  *	  POSTGRES buffer manager definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/bufmgr.h
diff --git a/src/include/storage/bufpage.h b/src/include/storage/bufpage.h
index 50c72a3c8d..85dd10c45a 100644
--- a/src/include/storage/bufpage.h
+++ b/src/include/storage/bufpage.h
@@ -4,7 +4,7 @@
  *	  Standard POSTGRES buffer page definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/bufpage.h
diff --git a/src/include/storage/checksum.h b/src/include/storage/checksum.h
index b85f714712..433755e279 100644
--- a/src/include/storage/checksum.h
+++ b/src/include/storage/checksum.h
@@ -3,7 +3,7 @@
  * checksum.h
  *	  Checksum implementation for data pages.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/checksum.h
diff --git a/src/include/storage/checksum_impl.h b/src/include/storage/checksum_impl.h
index bffd061de8..64d76229ad 100644
--- a/src/include/storage/checksum_impl.h
+++ b/src/include/storage/checksum_impl.h
@@ -8,7 +8,7 @@
  * referenced by storage/checksum.h.  (Note: you may need to redefine
  * Assert() as empty to compile this successfully externally.)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/checksum_impl.h
diff --git a/src/include/storage/condition_variable.h b/src/include/storage/condition_variable.h
index f77c0b22ad..32e645c02a 100644
--- a/src/include/storage/condition_variable.h
+++ b/src/include/storage/condition_variable.h
@@ -12,7 +12,7 @@
  * can be cancelled prior to the fulfillment of the condition) and do not
  * use pointers internally (so that they are safe to use within DSMs).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/condition_variable.h
@@ -27,33 +27,34 @@
 
 typedef struct
 {
-	slock_t		mutex;
-	proclist_head wakeup;
+	slock_t		mutex;			/* spinlock protecting the wakeup list */
+	proclist_head wakeup;		/* list of wake-able processes */
 } ConditionVariable;
 
 /* Initialize a condition variable. */
-extern void ConditionVariableInit(ConditionVariable *);
+extern void ConditionVariableInit(ConditionVariable *cv);
 
 /*
  * To sleep on a condition variable, a process should use a loop which first
  * checks the condition, exiting the loop if it is met, and then calls
  * ConditionVariableSleep.  Spurious wakeups are possible, but should be
- * infrequent.  After exiting the loop, ConditionVariableCancelSleep should
+ * infrequent.  After exiting the loop, ConditionVariableCancelSleep must
  * be called to ensure that the process is no longer in the wait list for
  * the condition variable.
  */
-extern void ConditionVariableSleep(ConditionVariable *, uint32 wait_event_info);
+extern void ConditionVariableSleep(ConditionVariable *cv, uint32 wait_event_info);
 extern void ConditionVariableCancelSleep(void);
 
 /*
- * The use of this function is optional and not necessary for correctness;
- * for efficiency, it should be called prior entering the loop described above
- * if it is thought that the condition is unlikely to hold immediately.
+ * Optionally, ConditionVariablePrepareToSleep can be called before entering
+ * the test-and-sleep loop described above.  Doing so is more efficient if
+ * at least one sleep is needed, whereas not doing so is more efficient when
+ * no sleep is needed because the test condition is true the first time.
  */
-extern void ConditionVariablePrepareToSleep(ConditionVariable *);
+extern void ConditionVariablePrepareToSleep(ConditionVariable *cv);
 
 /* Wake up a single waiter (via signal) or all waiters (via broadcast). */
-extern bool ConditionVariableSignal(ConditionVariable *);
-extern int	ConditionVariableBroadcast(ConditionVariable *);
+extern void ConditionVariableSignal(ConditionVariable *cv);
+extern void ConditionVariableBroadcast(ConditionVariable *cv);
 
 #endif							/* CONDITION_VARIABLE_H */
diff --git a/src/include/storage/copydir.h b/src/include/storage/copydir.h
index f88a044509..4fef3e2107 100644
--- a/src/include/storage/copydir.h
+++ b/src/include/storage/copydir.h
@@ -3,7 +3,7 @@
  * copydir.h
  *	  Copy a directory.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/copydir.h
diff --git a/src/include/storage/dsm.h b/src/include/storage/dsm.h
index 31b1f4da9c..169de946f7 100644
--- a/src/include/storage/dsm.h
+++ b/src/include/storage/dsm.h
@@ -3,7 +3,7 @@
  * dsm.h
  *	  manage dynamic shared memory segments
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/dsm.h
diff --git a/src/include/storage/dsm_impl.h b/src/include/storage/dsm_impl.h
index c2060431ba..0e5730f7c5 100644
--- a/src/include/storage/dsm_impl.h
+++ b/src/include/storage/dsm_impl.h
@@ -3,7 +3,7 @@
  * dsm_impl.h
  *	  low-level dynamic shared memory primitives
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/dsm_impl.h
diff --git a/src/include/storage/fd.h b/src/include/storage/fd.h
index faef39e78d..4244e7b1fd 100644
--- a/src/include/storage/fd.h
+++ b/src/include/storage/fd.h
@@ -4,7 +4,7 @@
  *	  Virtual file descriptor definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/fd.h
@@ -22,7 +22,7 @@
  * Use them for all file activity...
  *
  *	File fd;
- *	fd = PathNameOpenFile("foo", O_RDONLY, 0600);
+ *	fd = PathNameOpenFile("foo", O_RDONLY);
  *
  *	AllocateFile();
  *	FreeFile();
@@ -46,13 +46,11 @@
  * FileSeek uses the standard UNIX lseek(2) flags.
  */
 
-typedef char *FileName;
-
 typedef int File;
 
 
 /* GUC parameter */
-extern int	max_files_per_process;
+extern PGDLLIMPORT int max_files_per_process;
 
 /*
  * This is private to fd.c, but exported for save/restore_backend_variables()
@@ -65,7 +63,8 @@ extern int	max_safe_fds;
  */
 
 /* Operations on virtual Files --- equivalent to Unix kernel file ops */
-extern File PathNameOpenFile(FileName fileName, int fileFlags, int fileMode);
+extern File PathNameOpenFile(const char *fileName, int fileFlags);
+extern File PathNameOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode);
 extern File OpenTemporaryFile(bool interXact);
 extern void FileClose(File file);
 extern int	FilePrefetch(File file, off_t offset, int amount, uint32 wait_event_info);
@@ -78,7 +77,16 @@ extern void FileWriteback(File file, off_t offset, off_t nbytes, uint32 wait_eve
 extern char *FilePathName(File file);
 extern int	FileGetRawDesc(File file);
 extern int	FileGetRawFlags(File file);
-extern int	FileGetRawMode(File file);
+extern mode_t FileGetRawMode(File file);
+extern off_t FileGetSize(File file);
+
+/* Operations used for sharing named temporary files */
+extern File PathNameCreateTemporaryFile(const char *name, bool error_on_failure);
+extern File PathNameOpenTemporaryFile(const char *name);
+extern bool PathNameDeleteTemporaryFile(const char *name, bool error_on_failure);
+extern void PathNameCreateTemporaryDir(const char *base, const char *name);
+extern void PathNameDeleteTemporaryDir(const char *name);
+extern void TempTablespacePath(char *path, Oid tablespace);
 
 /* Operations that allow use of regular stdio --- USE WITH CAUTION */
 extern FILE *AllocateFile(const char *name, const char *mode);
@@ -91,14 +99,18 @@ extern int	ClosePipeStream(FILE *file);
 /* Operations to allow use of the <dirent.h> library routines */
 extern DIR *AllocateDir(const char *dirname);
 extern struct dirent *ReadDir(DIR *dir, const char *dirname);
+extern struct dirent *ReadDirExtended(DIR *dir, const char *dirname,
+				int elevel);
 extern int	FreeDir(DIR *dir);
 
 /* Operations to allow use of a plain kernel FD, with automatic cleanup */
-extern int	OpenTransientFile(FileName fileName, int fileFlags, int fileMode);
+extern int	OpenTransientFile(const char *fileName, int fileFlags);
+extern int	OpenTransientFilePerm(const char *fileName, int fileFlags, mode_t fileMode);
 extern int	CloseTransientFile(int fd);
 
 /* If you've really really gotta have a plain kernel FD, use this */
-extern int	BasicOpenFile(FileName fileName, int fileFlags, int fileMode);
+extern int	BasicOpenFile(const char *fileName, int fileFlags);
+extern int	BasicOpenFilePerm(const char *fileName, int fileFlags, mode_t fileMode);
 
 /* Miscellaneous support routines */
 extern void InitFileAccess(void);
@@ -106,6 +118,7 @@ extern void set_max_safe_fds(void);
 extern void closeAllVfds(void);
 extern void SetTempTablespaces(Oid *tableSpaces, int numSpaces);
 extern bool TempTablespacesAreSet(void);
+extern int	GetTempTablespaces(Oid *tableSpaces, int numSpaces);
 extern Oid	GetNextTempTableSpace(void);
 extern void AtEOXact_Files(void);
 extern void AtEOSubXact_Files(bool isCommit, SubTransactionId mySubid,
@@ -123,7 +136,7 @@ extern int	durable_unlink(const char *fname, int loglevel);
 extern int	durable_link_or_rename(const char *oldfile, const char *newfile, int loglevel);
 extern void SyncDataDirectory(void);
 
-/* Filename components for OpenTemporaryFile */
+/* Filename components */
 #define PG_TEMP_FILES_DIR "pgsql_tmp"
 #define PG_TEMP_FILE_PREFIX "pgsql_tmp"
 
diff --git a/src/include/storage/freespace.h b/src/include/storage/freespace.h
index d110f006af..a517d7ec43 100644
--- a/src/include/storage/freespace.h
+++ b/src/include/storage/freespace.h
@@ -4,7 +4,7 @@
  *	  POSTGRES free space map for quickly finding free space in relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/freespace.h
diff --git a/src/include/storage/fsm_internals.h b/src/include/storage/fsm_internals.h
index 722e649123..d6b8187861 100644
--- a/src/include/storage/fsm_internals.h
+++ b/src/include/storage/fsm_internals.h
@@ -4,7 +4,7 @@
  *	  internal functions for free space map
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/fsm_internals.h
diff --git a/src/include/storage/indexfsm.h b/src/include/storage/indexfsm.h
index f8045f0df8..07cbef4106 100644
--- a/src/include/storage/indexfsm.h
+++ b/src/include/storage/indexfsm.h
@@ -4,7 +4,7 @@
  *	  POSTGRES free space map for quickly finding an unused page in index
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/indexfsm.h
diff --git a/src/include/storage/ipc.h b/src/include/storage/ipc.h
index bde635f502..6a05a89349 100644
--- a/src/include/storage/ipc.h
+++ b/src/include/storage/ipc.h
@@ -8,7 +8,7 @@
  * exit-time cleanup for either a postmaster or a backend.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/ipc.h
@@ -63,6 +63,7 @@ typedef void (*shmem_startup_hook_type) (void);
 
 /* ipc.c */
 extern PGDLLIMPORT bool proc_exit_inprogress;
+extern PGDLLIMPORT bool shmem_exit_inprogress;
 
 extern void proc_exit(int code) pg_attribute_noreturn();
 extern void shmem_exit(int code);
diff --git a/src/include/storage/item.h b/src/include/storage/item.h
index 72426a2d48..44a52fbdfb 100644
--- a/src/include/storage/item.h
+++ b/src/include/storage/item.h
@@ -4,7 +4,7 @@
  *	  POSTGRES disk item definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/item.h
diff --git a/src/include/storage/itemid.h b/src/include/storage/itemid.h
index 2ec86b57fc..60570cc53d 100644
--- a/src/include/storage/itemid.h
+++ b/src/include/storage/itemid.h
@@ -4,7 +4,7 @@
  *	  Standard POSTGRES buffer page item identifier definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/itemid.h
diff --git a/src/include/storage/itemptr.h b/src/include/storage/itemptr.h
index 8f8e22444a..6c9ed3696b 100644
--- a/src/include/storage/itemptr.h
+++ b/src/include/storage/itemptr.h
@@ -4,7 +4,7 @@
  *	  POSTGRES disk item pointer definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/itemptr.h
diff --git a/src/include/storage/large_object.h b/src/include/storage/large_object.h
index 796a8fdeea..a234d5cf8e 100644
--- a/src/include/storage/large_object.h
+++ b/src/include/storage/large_object.h
@@ -5,7 +5,7 @@
  *	  zillions of large objects (internal, external, jaquith, inversion).
  *	  Now we only support inversion.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/large_object.h
@@ -27,9 +27,9 @@
  * offset is the current seek offset within the LO
  * flags contains some flag bits
  *
- * NOTE: in current usage, flag bit IFS_RDLOCK is *always* set, and we don't
- * bother to test for it.  Permission checks are made at first read or write
- * attempt, not during inv_open(), so we have other bits to remember that.
+ * NOTE: as of v11, permission checks are made when the large object is
+ * opened; therefore IFS_RDLOCK/IFS_WRLOCK indicate that read or write mode
+ * has been requested *and* the corresponding permission has been checked.
  *
  * NOTE: before 7.1, we also had to store references to the separate table
  * and index of a specific large object.  Now they all live in pg_largeobject
@@ -47,8 +47,6 @@ typedef struct LargeObjectDesc
 /* bits in flags: */
 #define IFS_RDLOCK		(1 << 0)	/* LO was opened for reading */
 #define IFS_WRLOCK		(1 << 1)	/* LO was opened for writing */
-#define IFS_RD_PERM_OK	(1 << 2)	/* read permission has been verified */
-#define IFS_WR_PERM_OK	(1 << 3)	/* write permission has been verified */
 
 } LargeObjectDesc;
 
@@ -78,6 +76,11 @@ typedef struct LargeObjectDesc
 #define MAX_LARGE_OBJECT_SIZE	((int64) INT_MAX * LOBLKSIZE)
 
 
+/*
+ * GUC: backwards-compatibility flag to suppress LO permission checks
+ */
+extern bool lo_compat_privileges;
+
 /*
  * Function definitions...
  */
diff --git a/src/include/storage/latch.h b/src/include/storage/latch.h
index a43193c916..a4bcb48874 100644
--- a/src/include/storage/latch.h
+++ b/src/include/storage/latch.h
@@ -90,7 +90,7 @@
  * efficient than using WaitLatch or WaitLatchOrSocket.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/latch.h
diff --git a/src/include/storage/lmgr.h b/src/include/storage/lmgr.h
index 0b923227a2..a217de9716 100644
--- a/src/include/storage/lmgr.h
+++ b/src/include/storage/lmgr.h
@@ -4,7 +4,7 @@
  *	  POSTGRES lock manager definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/lmgr.h
diff --git a/src/include/storage/lock.h b/src/include/storage/lock.h
index 765431e299..777da71679 100644
--- a/src/include/storage/lock.h
+++ b/src/include/storage/lock.h
@@ -4,7 +4,7 @@
  *	  POSTGRES low-level lock mechanism
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/lock.h
diff --git a/src/include/storage/lockdefs.h b/src/include/storage/lockdefs.h
index fe9f7cb310..72eca39f17 100644
--- a/src/include/storage/lockdefs.h
+++ b/src/include/storage/lockdefs.h
@@ -7,7 +7,7 @@
  * contains definition that have to (indirectly) be available when included by
  * FRONTEND code.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/lockdefs.h
diff --git a/src/include/storage/lwlock.h b/src/include/storage/lwlock.h
index 3d16132c88..c21bfe2f66 100644
--- a/src/include/storage/lwlock.h
+++ b/src/include/storage/lwlock.h
@@ -4,7 +4,7 @@
  *	  Lightweight lock manager
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/lwlock.h
@@ -184,7 +184,7 @@ extern LWLockPadded *GetNamedLWLockTranche(const char *tranche_name);
  * registration in the main shared memory segment wouldn't work for that case.
  */
 extern int	LWLockNewTrancheId(void);
-extern void LWLockRegisterTranche(int tranche_id, char *tranche_name);
+extern void LWLockRegisterTranche(int tranche_id, const char *tranche_name);
 extern void LWLockInitialize(LWLock *lock, int tranche_id);
 
 /*
@@ -211,8 +211,14 @@ typedef enum BuiltinTrancheIds
 	LWTRANCHE_BUFFER_MAPPING,
 	LWTRANCHE_LOCK_MANAGER,
 	LWTRANCHE_PREDICATE_LOCK_MANAGER,
+	LWTRANCHE_PARALLEL_HASH_JOIN,
 	LWTRANCHE_PARALLEL_QUERY_DSA,
+	LWTRANCHE_SESSION_DSA,
+	LWTRANCHE_SESSION_RECORD_TABLE,
+	LWTRANCHE_SESSION_TYPMOD_TABLE,
+	LWTRANCHE_SHARED_TUPLESTORE,
 	LWTRANCHE_TBM,
+	LWTRANCHE_PARALLEL_APPEND,
 	LWTRANCHE_FIRST_USER_DEFINED
 }			BuiltinTrancheIds;
 
diff --git a/src/include/storage/off.h b/src/include/storage/off.h
index 7228808b94..6179f2f854 100644
--- a/src/include/storage/off.h
+++ b/src/include/storage/off.h
@@ -4,7 +4,7 @@
  *	  POSTGRES disk "offset" definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/off.h
diff --git a/src/include/storage/pg_sema.h b/src/include/storage/pg_sema.h
index 65db86f578..2072cf0e8f 100644
--- a/src/include/storage/pg_sema.h
+++ b/src/include/storage/pg_sema.h
@@ -10,7 +10,7 @@
  * be provided by each port.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/pg_sema.h
diff --git a/src/include/storage/pg_shmem.h b/src/include/storage/pg_shmem.h
index e3ee096229..6b1e040251 100644
--- a/src/include/storage/pg_shmem.h
+++ b/src/include/storage/pg_shmem.h
@@ -14,7 +14,7 @@
  * only one ID number.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/pg_shmem.h
diff --git a/src/include/storage/pmsignal.h b/src/include/storage/pmsignal.h
index 4b954d7614..bec162cc16 100644
--- a/src/include/storage/pmsignal.h
+++ b/src/include/storage/pmsignal.h
@@ -4,7 +4,7 @@
  *	  routines for signaling the postmaster from its child processes
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/pmsignal.h
diff --git a/src/include/storage/predicate.h b/src/include/storage/predicate.h
index 06bcbf2471..6a3464daa1 100644
--- a/src/include/storage/predicate.h
+++ b/src/include/storage/predicate.h
@@ -4,7 +4,7 @@
  *	  POSTGRES public predicate locking definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/predicate.h
diff --git a/src/include/storage/predicate_internals.h b/src/include/storage/predicate_internals.h
index 89874a5c3b..0f736d37df 100644
--- a/src/include/storage/predicate_internals.h
+++ b/src/include/storage/predicate_internals.h
@@ -4,7 +4,7 @@
  *	  POSTGRES internal predicate locking definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/predicate_internals.h
diff --git a/src/include/storage/proc.h b/src/include/storage/proc.h
index 7dbaa81a8f..5c19a61dcf 100644
--- a/src/include/storage/proc.h
+++ b/src/include/storage/proc.h
@@ -4,7 +4,7 @@
  *	  per-process shared memory data structures
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/proc.h
@@ -14,6 +14,7 @@
 #ifndef _PROC_H_
 #define _PROC_H_
 
+#include "access/clog.h"
 #include "access/xlogdefs.h"
 #include "lib/ilist.h"
 #include "storage/latch.h"
@@ -171,6 +172,17 @@ struct PGPROC
 
 	uint32		wait_event_info;	/* proc's wait information */
 
+	/* Support for group transaction status update. */
+	bool		clogGroupMember;	/* true, if member of clog group */
+	pg_atomic_uint32 clogGroupNext; /* next clog group member */
+	TransactionId clogGroupMemberXid;	/* transaction id of clog group member */
+	XidStatus	clogGroupMemberXidStatus;	/* transaction status of clog
+											 * group member */
+	int			clogGroupMemberPage;	/* clog page corresponding to
+										 * transaction id of clog group member */
+	XLogRecPtr	clogGroupMemberLsn; /* WAL location of commit record for clog
+									 * group member */
+
 	/* Per-backend LWLock.  Protects fields below (but not group fields). */
 	LWLock		backendLock;
 
@@ -242,6 +254,8 @@ typedef struct PROC_HDR
 	PGPROC	   *bgworkerFreeProcs;
 	/* First pgproc waiting for group XID clear */
 	pg_atomic_uint32 procArrayGroupFirst;
+	/* First pgproc waiting for group transaction status update */
+	pg_atomic_uint32 clogGroupFirst;
 	/* WALWriter process's latch */
 	Latch	   *walwriterLatch;
 	/* Checkpointer process's latch */
@@ -255,7 +269,7 @@ typedef struct PROC_HDR
 	int			startupBufferPinWaitBufId;
 } PROC_HDR;
 
-extern PROC_HDR *ProcGlobal;
+extern PGDLLIMPORT PROC_HDR *ProcGlobal;
 
 extern PGPROC *PreparedXactProcs;
 
@@ -273,7 +287,7 @@ extern PGPROC *PreparedXactProcs;
 #define NUM_AUXILIARY_PROCS		4
 
 /* configurable options */
-extern int	DeadlockTimeout;
+extern PGDLLIMPORT int DeadlockTimeout;
 extern int	StatementTimeout;
 extern int	LockTimeout;
 extern int	IdleInTransactionSessionTimeout;
diff --git a/src/include/storage/procarray.h b/src/include/storage/procarray.h
index 174c537be4..75bab2985f 100644
--- a/src/include/storage/procarray.h
+++ b/src/include/storage/procarray.h
@@ -4,7 +4,7 @@
  *	  POSTGRES process array definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/procarray.h
diff --git a/src/include/storage/proclist.h b/src/include/storage/proclist.h
index 9f22f3fd48..59a478e1f6 100644
--- a/src/include/storage/proclist.h
+++ b/src/include/storage/proclist.h
@@ -10,7 +10,7 @@
  * See proclist_types.h for the structs that these functions operate on.  They
  * are separated to break a header dependency cycle with proc.h.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/storage/proclist.h
@@ -42,7 +42,7 @@ proclist_is_empty(proclist_head *list)
 
 /*
  * Get a pointer to a proclist_node inside a given PGPROC, given a procno and
- * an offset.
+ * the proclist_node field's offset within struct PGPROC.
  */
 static inline proclist_node *
 proclist_node_get(int procno, size_t node_offset)
@@ -53,13 +53,15 @@ proclist_node_get(int procno, size_t node_offset)
 }
 
 /*
- * Insert a node at the beginning of a list.
+ * Insert a process at the beginning of a list.
  */
 static inline void
 proclist_push_head_offset(proclist_head *list, int procno, size_t node_offset)
 {
 	proclist_node *node = proclist_node_get(procno, node_offset);
 
+	Assert(node->next == 0 && node->prev == 0);
+
 	if (list->head == INVALID_PGPROCNO)
 	{
 		Assert(list->tail == INVALID_PGPROCNO);
@@ -79,13 +81,15 @@ proclist_push_head_offset(proclist_head *list, int procno, size_t node_offset)
 }
 
 /*
- * Insert a node at the end of a list.
+ * Insert a process at the end of a list.
  */
 static inline void
 proclist_push_tail_offset(proclist_head *list, int procno, size_t node_offset)
 {
 	proclist_node *node = proclist_node_get(procno, node_offset);
 
+	Assert(node->next == 0 && node->prev == 0);
+
 	if (list->tail == INVALID_PGPROCNO)
 	{
 		Assert(list->head == INVALID_PGPROCNO);
@@ -105,30 +109,38 @@ proclist_push_tail_offset(proclist_head *list, int procno, size_t node_offset)
 }
 
 /*
- * Delete a node.  The node must be in the list.
+ * Delete a process from a list --- it must be in the list!
  */
 static inline void
 proclist_delete_offset(proclist_head *list, int procno, size_t node_offset)
 {
 	proclist_node *node = proclist_node_get(procno, node_offset);
 
+	Assert(node->next != 0 || node->prev != 0);
+
 	if (node->prev == INVALID_PGPROCNO)
+	{
+		Assert(list->head == procno);
 		list->head = node->next;
+	}
 	else
 		proclist_node_get(node->prev, node_offset)->next = node->next;
 
 	if (node->next == INVALID_PGPROCNO)
+	{
+		Assert(list->tail == procno);
 		list->tail = node->prev;
+	}
 	else
 		proclist_node_get(node->next, node_offset)->prev = node->prev;
 
-	node->next = node->prev = INVALID_PGPROCNO;
+	node->next = node->prev = 0;
 }
 
 /*
- * Check if a node is currently in a list.  It must be known that the node is
- * not in any _other_ proclist that uses the same proclist_node, so that the
- * only possibilities are that it is in this list or none.
+ * Check if a process is currently in a list.  It must be known that the
+ * process is not in any _other_ proclist that uses the same proclist_node,
+ * so that the only possibilities are that it is in this list or none.
  */
 static inline bool
 proclist_contains_offset(proclist_head *list, int procno,
@@ -136,27 +148,26 @@ proclist_contains_offset(proclist_head *list, int procno,
 {
 	proclist_node *node = proclist_node_get(procno, node_offset);
 
-	/*
-	 * If this is not a member of a proclist, then the next and prev pointers
-	 * should be 0. Circular lists are not allowed so this condition is not
-	 * confusable with a real pgprocno 0.
-	 */
+	/* If it's not in any list, it's definitely not in this one. */
 	if (node->prev == 0 && node->next == 0)
 		return false;
 
-	/* If there is a previous node, then this node must be in the list. */
-	if (node->prev != INVALID_PGPROCNO)
-		return true;
-
 	/*
-	 * There is no previous node, so the only way this node can be in the list
-	 * is if it's the head node.
+	 * It must, in fact, be in this list.  Ideally, in assert-enabled builds,
+	 * we'd verify that.  But since this function is typically used while
+	 * holding a spinlock, crawling the whole list is unacceptable.  However,
+	 * we can verify matters in O(1) time when the node is a list head or
+	 * tail, and that seems worth doing, since in practice that should often
+	 * be enough to catch mistakes.
 	 */
-	return list->head == procno;
+	Assert(node->prev != INVALID_PGPROCNO || list->head == procno);
+	Assert(node->next != INVALID_PGPROCNO || list->tail == procno);
+
+	return true;
 }
 
 /*
- * Remove and return the first node from a list (there must be one).
+ * Remove and return the first process from a list (there must be one).
  */
 static inline PGPROC *
 proclist_pop_head_node_offset(proclist_head *list, size_t node_offset)
@@ -205,4 +216,4 @@ proclist_pop_head_node_offset(proclist_head *list, size_t node_offset)
 			 proclist_node_get((iter).cur,									\
 							   offsetof(PGPROC, link_member))->next)
 
-#endif
+#endif							/* PROCLIST_H */
diff --git a/src/include/storage/proclist_types.h b/src/include/storage/proclist_types.h
index 716c4498d5..f4dac10fb6 100644
--- a/src/include/storage/proclist_types.h
+++ b/src/include/storage/proclist_types.h
@@ -5,7 +5,7 @@
  *
  * See proclist.h for functions that operate on these types.
  *
- * Portions Copyright (c) 2016-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2016-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/include/storage/proclist_types.h
@@ -16,7 +16,12 @@
 #define PROCLIST_TYPES_H
 
 /*
- * A node in a list of processes.
+ * A node in a doubly-linked list of processes.  The link fields contain
+ * the 0-based PGPROC indexes of the next and previous process, or
+ * INVALID_PGPROCNO in the next-link of the last node and the prev-link
+ * of the first node.  A node that is currently not in any list
+ * should have next == prev == 0; this is not a possible state for a node
+ * that is in a list, because we disallow circularity.
  */
 typedef struct proclist_node
 {
@@ -25,7 +30,8 @@ typedef struct proclist_node
 } proclist_node;
 
 /*
- * Head of a doubly-linked list of PGPROCs, identified by pgprocno.
+ * Header of a doubly-linked list of PGPROCs, identified by pgprocno.
+ * An empty list is represented by head == tail == INVALID_PGPROCNO.
  */
 typedef struct proclist_head
 {
@@ -42,4 +48,4 @@ typedef struct proclist_mutable_iter
 	int			next;			/* pgprocno of the next PGPROC */
 } proclist_mutable_iter;
 
-#endif
+#endif							/* PROCLIST_TYPES_H */
diff --git a/src/include/storage/procsignal.h b/src/include/storage/procsignal.h
index 20bb05b177..6db0d69b71 100644
--- a/src/include/storage/procsignal.h
+++ b/src/include/storage/procsignal.h
@@ -4,7 +4,7 @@
  *	  Routines for interprocess signalling
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/procsignal.h
diff --git a/src/include/storage/reinit.h b/src/include/storage/reinit.h
index 90e494e933..addda2c0ea 100644
--- a/src/include/storage/reinit.h
+++ b/src/include/storage/reinit.h
@@ -4,7 +4,7 @@
  *	  Reinitialization of unlogged relations
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/reinit.h
diff --git a/src/include/storage/relfilenode.h b/src/include/storage/relfilenode.h
index fb596e2ee7..abffd84a1c 100644
--- a/src/include/storage/relfilenode.h
+++ b/src/include/storage/relfilenode.h
@@ -4,7 +4,7 @@
  *	  Physical access information for relations.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/relfilenode.h
diff --git a/src/include/storage/s_lock.h b/src/include/storage/s_lock.h
index bbf505e246..04175dbaaa 100644
--- a/src/include/storage/s_lock.h
+++ b/src/include/storage/s_lock.h
@@ -22,7 +22,7 @@
  *		Unlock a previously acquired lock.
  *
  *	bool S_LOCK_FREE(slock_t *lock)
- *		Tests if the lock is free. Returns TRUE if free, FALSE if locked.
+ *		Tests if the lock is free. Returns true if free, false if locked.
  *		This does *not* change the state of the lock.
  *
  *	void SPIN_DELAY(void)
@@ -86,7 +86,7 @@
  *	when using the SysV semaphore code.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	  src/include/storage/s_lock.h
@@ -543,6 +543,30 @@ tas(volatile slock_t *lock)
 #endif	 /* (__mc68000__ || __m68k__) && __linux__ */
 
 
+/* Motorola 88k */
+#if defined(__m88k__)
+#define HAS_TEST_AND_SET
+
+typedef unsigned int slock_t;
+
+#define TAS(lock) tas(lock)
+
+static __inline__ int
+tas(volatile slock_t *lock)
+{
+	register slock_t _res = 1;
+
+	__asm__ __volatile__(
+		"	xmem	%0, %2, %%r0	\n"
+:		"+r"(_res), "+m"(*lock)
+:		"r"(lock)
+:		"memory");
+	return (int) _res;
+}
+
+#endif	 /* __m88k__ */
+
+
 /*
  * VAXen -- even multiprocessor ones
  * (thanks to Tom Ivar Helbekkmo)
diff --git a/src/include/storage/sharedfileset.h b/src/include/storage/sharedfileset.h
new file mode 100644
index 0000000000..d74c488e59
--- /dev/null
+++ b/src/include/storage/sharedfileset.h
@@ -0,0 +1,45 @@
+/*-------------------------------------------------------------------------
+ *
+ * sharedfileset.h
+ *	  Shared temporary file management.
+ *
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/storage/sharedfilespace.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef SHAREDFILESET_H
+#define SHAREDFILESET_H
+
+#include "storage/dsm.h"
+#include "storage/fd.h"
+#include "storage/spin.h"
+
+/*
+ * A set of temporary files that can be shared by multiple backends.
+ */
+typedef struct SharedFileSet
+{
+	pid_t		creator_pid;	/* PID of the creating process */
+	uint32		number;			/* per-PID identifier */
+	slock_t		mutex;			/* mutex protecting the reference count */
+	int			refcnt;			/* number of attached backends */
+	int			ntablespaces;	/* number of tablespaces to use */
+	Oid			tablespaces[8]; /* OIDs of tablespaces to use. Assumes that
+								 * it's rare that there more than temp
+								 * tablespaces. */
+} SharedFileSet;
+
+extern void SharedFileSetInit(SharedFileSet *fileset, dsm_segment *seg);
+extern void SharedFileSetAttach(SharedFileSet *fileset, dsm_segment *seg);
+extern File SharedFileSetCreate(SharedFileSet *fileset, const char *name);
+extern File SharedFileSetOpen(SharedFileSet *fileset, const char *name);
+extern bool SharedFileSetDelete(SharedFileSet *fileset, const char *name,
+					bool error_on_failure);
+extern void SharedFileSetDeleteAll(SharedFileSet *fileset);
+
+#endif
diff --git a/src/include/storage/shm_mq.h b/src/include/storage/shm_mq.h
index 02a93e0222..f85f2eb7d1 100644
--- a/src/include/storage/shm_mq.h
+++ b/src/include/storage/shm_mq.h
@@ -3,7 +3,7 @@
  * shm_mq.h
  *	  single-reader, single-writer shared memory message queue
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/shm_mq.h
@@ -62,8 +62,8 @@ extern shm_mq_handle *shm_mq_attach(shm_mq *mq, dsm_segment *seg,
 /* Associate worker handle with shm_mq. */
 extern void shm_mq_set_handle(shm_mq_handle *, BackgroundWorkerHandle *);
 
-/* Break connection. */
-extern void shm_mq_detach(shm_mq *);
+/* Break connection, release handle resources. */
+extern void shm_mq_detach(shm_mq_handle *mqh);
 
 /* Get the shm_mq from handle. */
 extern shm_mq *shm_mq_get_queue(shm_mq_handle *mqh);
diff --git a/src/include/storage/shm_toc.h b/src/include/storage/shm_toc.h
index 8ccd35d96b..4efe1723b4 100644
--- a/src/include/storage/shm_toc.h
+++ b/src/include/storage/shm_toc.h
@@ -12,7 +12,7 @@
  * other data structure within the segment and only put the pointer to
  * the data structure itself in the table of contents.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/shm_toc.h
diff --git a/src/include/storage/shmem.h b/src/include/storage/shmem.h
index c6993387ff..b84d104347 100644
--- a/src/include/storage/shmem.h
+++ b/src/include/storage/shmem.h
@@ -11,7 +11,7 @@
  * at the same address.  This means shared memory pointers can be passed
  * around directly between different processes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/shmem.h
diff --git a/src/include/storage/sinval.h b/src/include/storage/sinval.h
index 84c0b02da0..7156780215 100644
--- a/src/include/storage/sinval.h
+++ b/src/include/storage/sinval.h
@@ -4,7 +4,7 @@
  *	  POSTGRES shared cache invalidation communication definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/sinval.h
diff --git a/src/include/storage/sinvaladt.h b/src/include/storage/sinvaladt.h
index 751735fc9a..2652b87b60 100644
--- a/src/include/storage/sinvaladt.h
+++ b/src/include/storage/sinvaladt.h
@@ -12,7 +12,7 @@
  * The struct type SharedInvalidationMessage, defining the contents of
  * a single message, is defined in sinval.h.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/sinvaladt.h
diff --git a/src/include/storage/smgr.h b/src/include/storage/smgr.h
index 2279134588..558e4d8518 100644
--- a/src/include/storage/smgr.h
+++ b/src/include/storage/smgr.h
@@ -4,7 +4,7 @@
  *	  storage manager switch public interface declarations.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/smgr.h
diff --git a/src/include/storage/spin.h b/src/include/storage/spin.h
index 66698645c2..b49fc10aa4 100644
--- a/src/include/storage/spin.h
+++ b/src/include/storage/spin.h
@@ -19,7 +19,7 @@
  *		Unlock a previously acquired lock.
  *
  *	bool SpinLockFree(slock_t *lock)
- *		Tests if the lock is free. Returns TRUE if free, FALSE if locked.
+ *		Tests if the lock is free. Returns true if free, false if locked.
  *		This does *not* change the state of the lock.
  *
  *	Callers must beware that the macro argument may be evaluated multiple
@@ -41,7 +41,7 @@
  *	be again.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/spin.h
diff --git a/src/include/storage/standby.h b/src/include/storage/standby.h
index f5404b4c1f..28bf8f2f39 100644
--- a/src/include/storage/standby.h
+++ b/src/include/storage/standby.h
@@ -4,7 +4,7 @@
  *	  Definitions for hot standby mode.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/standby.h
diff --git a/src/include/storage/standbydefs.h b/src/include/storage/standbydefs.h
index a0af6788e9..bb6144805a 100644
--- a/src/include/storage/standbydefs.h
+++ b/src/include/storage/standbydefs.h
@@ -4,7 +4,7 @@
  *	   Frontend exposed definitions for hot standby mode.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/storage/standbydefs.h
diff --git a/src/include/tcop/deparse_utility.h b/src/include/tcop/deparse_utility.h
index 9c4e608934..8459463391 100644
--- a/src/include/tcop/deparse_utility.h
+++ b/src/include/tcop/deparse_utility.h
@@ -2,7 +2,7 @@
  *
  * deparse_utility.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/deparse_utility.h
@@ -97,7 +97,7 @@ typedef struct CollectedCommand
 		/* ALTER DEFAULT PRIVILEGES */
 		struct
 		{
-			GrantObjectType objtype;
+			ObjectType	objtype;
 		}			defprivs;
 	}			d;
 } CollectedCommand;
diff --git a/src/include/tcop/dest.h b/src/include/tcop/dest.h
index c990544a16..82f0f2e741 100644
--- a/src/include/tcop/dest.h
+++ b/src/include/tcop/dest.h
@@ -57,7 +57,7 @@
  * calls in portal and cursor manipulations.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/dest.h
@@ -129,7 +129,8 @@ struct _DestReceiver
 	/* Private fields might appear beyond this point... */
 };
 
-extern DestReceiver *None_Receiver; /* permanent receiver for DestNone */
+extern PGDLLIMPORT DestReceiver *None_Receiver; /* permanent receiver for
+												 * DestNone */
 
 /* The primary destination management functions */
 
diff --git a/src/include/tcop/fastpath.h b/src/include/tcop/fastpath.h
index 4a7c35f1a9..6e1608a4fa 100644
--- a/src/include/tcop/fastpath.h
+++ b/src/include/tcop/fastpath.h
@@ -3,7 +3,7 @@
  * fastpath.h
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/fastpath.h
diff --git a/src/include/tcop/pquery.h b/src/include/tcop/pquery.h
index 6abfe7b282..507d89cf69 100644
--- a/src/include/tcop/pquery.h
+++ b/src/include/tcop/pquery.h
@@ -4,7 +4,7 @@
  *	  prototypes for pquery.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/pquery.h
diff --git a/src/include/tcop/tcopprot.h b/src/include/tcop/tcopprot.h
index f8c535c91e..63b4e4864d 100644
--- a/src/include/tcop/tcopprot.h
+++ b/src/include/tcop/tcopprot.h
@@ -4,7 +4,7 @@
  *	  prototypes for postgres.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/tcopprot.h
@@ -45,7 +45,7 @@ typedef enum
 	LOGSTMT_ALL					/* log all statements */
 } LogStmtLevel;
 
-extern int	log_statement;
+extern PGDLLIMPORT int log_statement;
 
 extern List *pg_parse_query(const char *query_string);
 extern List *pg_analyze_and_rewrite(RawStmt *parsetree,
diff --git a/src/include/tcop/utility.h b/src/include/tcop/utility.h
index 5bd386ddaa..5550055710 100644
--- a/src/include/tcop/utility.h
+++ b/src/include/tcop/utility.h
@@ -4,7 +4,7 @@
  *	  prototypes for utility.c.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tcop/utility.h
diff --git a/src/include/tsearch/dicts/regis.h b/src/include/tsearch/dicts/regis.h
index 7fdf82af65..15dba3a505 100644
--- a/src/include/tsearch/dicts/regis.h
+++ b/src/include/tsearch/dicts/regis.h
@@ -4,7 +4,7 @@
  *
  * Declarations for fast regex subset, used by ISpell
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/dicts/regis.h
  *
diff --git a/src/include/tsearch/dicts/spell.h b/src/include/tsearch/dicts/spell.h
index 3032d0b508..210f97dda9 100644
--- a/src/include/tsearch/dicts/spell.h
+++ b/src/include/tsearch/dicts/spell.h
@@ -4,7 +4,7 @@
  *
  * Declarations for ISpell dictionary
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/dicts/spell.h
  *
diff --git a/src/include/tsearch/ts_cache.h b/src/include/tsearch/ts_cache.h
index abff0fdfcc..410f1d54af 100644
--- a/src/include/tsearch/ts_cache.h
+++ b/src/include/tsearch/ts_cache.h
@@ -3,7 +3,7 @@
  * ts_cache.h
  *	  Tsearch related object caches.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/tsearch/ts_cache.h
diff --git a/src/include/tsearch/ts_locale.h b/src/include/tsearch/ts_locale.h
index c32f0743aa..02809539dd 100644
--- a/src/include/tsearch/ts_locale.h
+++ b/src/include/tsearch/ts_locale.h
@@ -3,7 +3,7 @@
  * ts_locale.h
  *		locale compatibility layer for tsearch
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/ts_locale.h
  *
@@ -41,27 +41,15 @@ typedef struct
 
 #define TOUCHAR(x)	(*((const unsigned char *) (x)))
 
-#ifdef USE_WIDE_UPPER_LOWER
-
-extern int	t_isdigit(const char *ptr);
-extern int	t_isspace(const char *ptr);
-extern int	t_isalpha(const char *ptr);
-extern int	t_isprint(const char *ptr);
-
 /* The second argument of t_iseq() must be a plain ASCII character */
 #define t_iseq(x,c)		(TOUCHAR(x) == (unsigned char) (c))
 
 #define COPYCHAR(d,s)	memcpy(d, s, pg_mblen(s))
-#else							/* not USE_WIDE_UPPER_LOWER */
 
-#define t_isdigit(x)	isdigit(TOUCHAR(x))
-#define t_isspace(x)	isspace(TOUCHAR(x))
-#define t_isalpha(x)	isalpha(TOUCHAR(x))
-#define t_isprint(x)	isprint(TOUCHAR(x))
-#define t_iseq(x,c)		(TOUCHAR(x) == (unsigned char) (c))
-
-#define COPYCHAR(d,s)	(*((unsigned char *) (d)) = TOUCHAR(s))
-#endif							/* USE_WIDE_UPPER_LOWER */
+extern int	t_isdigit(const char *ptr);
+extern int	t_isspace(const char *ptr);
+extern int	t_isalpha(const char *ptr);
+extern int	t_isprint(const char *ptr);
 
 extern char *lowerstr(const char *str);
 extern char *lowerstr_with_len(const char *str, int len);
diff --git a/src/include/tsearch/ts_public.h b/src/include/tsearch/ts_public.h
index 94ba7fcb20..0b7a5aa68e 100644
--- a/src/include/tsearch/ts_public.h
+++ b/src/include/tsearch/ts_public.h
@@ -4,7 +4,7 @@
  *	  Public interface to various tsearch modules, such as
  *	  parsers and dictionaries.
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/ts_public.h
  *
diff --git a/src/include/tsearch/ts_type.h b/src/include/tsearch/ts_type.h
index 30d7c4bccd..ccf5701aa3 100644
--- a/src/include/tsearch/ts_type.h
+++ b/src/include/tsearch/ts_type.h
@@ -3,7 +3,7 @@
  * ts_type.h
  *	  Definitions for the tsvector and tsquery types
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/ts_type.h
  *
diff --git a/src/include/tsearch/ts_utils.h b/src/include/tsearch/ts_utils.h
index 3312353026..f8ddce5ecb 100644
--- a/src/include/tsearch/ts_utils.h
+++ b/src/include/tsearch/ts_utils.h
@@ -3,7 +3,7 @@
  * ts_utils.h
  *	  helper utilities for tsearch
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * src/include/tsearch/ts_utils.h
  *
@@ -146,7 +146,7 @@ typedef struct ExecPhraseData
  * val: lexeme to test for presence of
  * data: to be filled with lexeme positions; NULL if position data not needed
  *
- * Return TRUE if lexeme is present in data, else FALSE.  If data is not
+ * Return true if lexeme is present in data, else false.  If data is not
  * NULL, it should be filled with lexeme positions, but function can leave
  * it as zeroes if position data is not available.
  */
@@ -167,7 +167,7 @@ typedef bool (*TSExecuteCallback) (void *arg, QueryOperand *val,
 #define TS_EXEC_CALC_NOT		(0x01)
 /*
  * If TS_EXEC_PHRASE_NO_POS is set, allow OP_PHRASE to be executed lossily
- * in the absence of position information: a TRUE result indicates that the
+ * in the absence of position information: a true result indicates that the
  * phrase might be present.  Without this flag, OP_PHRASE always returns
  * false if lexeme position information is not available.
  */
diff --git a/src/include/utils/acl.h b/src/include/utils/acl.h
index 43273eaab5..f4d4be8d0d 100644
--- a/src/include/utils/acl.h
+++ b/src/include/utils/acl.h
@@ -4,7 +4,7 @@
  *	  Definition of (and support for) access control list data structures.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/acl.h
@@ -12,9 +12,17 @@
  * NOTES
  *	  An ACL array is simply an array of AclItems, representing the union
  *	  of the privileges represented by the individual items.  A zero-length
- *	  array represents "no privileges".  There are no assumptions about the
- *	  ordering of the items, but we do expect that there are no two entries
- *	  in the array with the same grantor and grantee.
+ *	  array represents "no privileges".
+ *
+ *	  The order of items in the array is important as client utilities (in
+ *	  particular, pg_dump, though possibly other clients) expect to be able
+ *	  to issue GRANTs in the ordering of the items in the array.  The reason
+ *	  this matters is that GRANTs WITH GRANT OPTION must be before any GRANTs
+ *	  which depend on it.  This happens naturally in the backend during
+ *	  operations as we update ACLs in-place, new items are appended, and
+ *	  existing entries are only removed if there's no dependency on them (no
+ *	  GRANT can been based on it, or, if there was, those GRANTs are also
+ *	  removed).
  *
  *	  For backward-compatibility purposes we have to allow null ACL entries
  *	  in system catalogs.  A null ACL will be treated as meaning "default
@@ -155,7 +163,7 @@ typedef ArrayType Acl;
 #define ACL_ALL_RIGHTS_FUNCTION		(ACL_EXECUTE)
 #define ACL_ALL_RIGHTS_LANGUAGE		(ACL_USAGE)
 #define ACL_ALL_RIGHTS_LARGEOBJECT	(ACL_SELECT|ACL_UPDATE)
-#define ACL_ALL_RIGHTS_NAMESPACE	(ACL_USAGE|ACL_CREATE)
+#define ACL_ALL_RIGHTS_SCHEMA		(ACL_USAGE|ACL_CREATE)
 #define ACL_ALL_RIGHTS_TABLESPACE	(ACL_CREATE)
 #define ACL_ALL_RIGHTS_TYPE			(ACL_USAGE)
 
@@ -174,43 +182,12 @@ typedef enum
 	ACLCHECK_NOT_OWNER
 } AclResult;
 
-/* this enum covers all object types that can have privilege errors */
-/* currently it's only used to tell aclcheck_error what to say */
-typedef enum AclObjectKind
-{
-	ACL_KIND_COLUMN,			/* pg_attribute */
-	ACL_KIND_CLASS,				/* pg_class */
-	ACL_KIND_SEQUENCE,			/* pg_sequence */
-	ACL_KIND_DATABASE,			/* pg_database */
-	ACL_KIND_PROC,				/* pg_proc */
-	ACL_KIND_OPER,				/* pg_operator */
-	ACL_KIND_TYPE,				/* pg_type */
-	ACL_KIND_LANGUAGE,			/* pg_language */
-	ACL_KIND_LARGEOBJECT,		/* pg_largeobject */
-	ACL_KIND_NAMESPACE,			/* pg_namespace */
-	ACL_KIND_OPCLASS,			/* pg_opclass */
-	ACL_KIND_OPFAMILY,			/* pg_opfamily */
-	ACL_KIND_COLLATION,			/* pg_collation */
-	ACL_KIND_CONVERSION,		/* pg_conversion */
-	ACL_KIND_STATISTICS,		/* pg_statistic_ext */
-	ACL_KIND_TABLESPACE,		/* pg_tablespace */
-	ACL_KIND_TSDICTIONARY,		/* pg_ts_dict */
-	ACL_KIND_TSCONFIGURATION,	/* pg_ts_config */
-	ACL_KIND_FDW,				/* pg_foreign_data_wrapper */
-	ACL_KIND_FOREIGN_SERVER,	/* pg_foreign_server */
-	ACL_KIND_EVENT_TRIGGER,		/* pg_event_trigger */
-	ACL_KIND_EXTENSION,			/* pg_extension */
-	ACL_KIND_PUBLICATION,		/* pg_publication */
-	ACL_KIND_SUBSCRIPTION,		/* pg_subscription */
-	MAX_ACL_KIND				/* MUST BE LAST */
-} AclObjectKind;
-
 
 /*
  * routines used internally
  */
-extern Acl *acldefault(GrantObjectType objtype, Oid ownerId);
-extern Acl *get_user_default_acl(GrantObjectType objtype, Oid ownerId,
+extern Acl *acldefault(ObjectType objtype, Oid ownerId);
+extern Acl *get_user_default_acl(ObjectType objtype, Oid ownerId,
 					 Oid nsp_oid);
 
 extern Acl *aclupdate(const Acl *old_acl, const AclItem *mod_aip,
@@ -293,10 +270,10 @@ extern AclResult pg_foreign_data_wrapper_aclcheck(Oid fdw_oid, Oid roleid, AclMo
 extern AclResult pg_foreign_server_aclcheck(Oid srv_oid, Oid roleid, AclMode mode);
 extern AclResult pg_type_aclcheck(Oid type_oid, Oid roleid, AclMode mode);
 
-extern void aclcheck_error(AclResult aclerr, AclObjectKind objectkind,
+extern void aclcheck_error(AclResult aclerr, ObjectType objtype,
 			   const char *objectname);
 
-extern void aclcheck_error_col(AclResult aclerr, AclObjectKind objectkind,
+extern void aclcheck_error_col(AclResult aclerr, ObjectType objtype,
 				   const char *objectname, const char *colname);
 
 extern void aclcheck_error_type(AclResult aclerr, Oid typeOid);
diff --git a/src/include/utils/aclchk_internal.h b/src/include/utils/aclchk_internal.h
index 3374edb638..f7c44fcd4b 100644
--- a/src/include/utils/aclchk_internal.h
+++ b/src/include/utils/aclchk_internal.h
@@ -2,7 +2,7 @@
  *
  * aclchk_internal.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/aclchk_internal.h
@@ -26,12 +26,12 @@
  * Note: 'all_privs' and 'privileges' represent object-level privileges only.
  * There might also be column-level privilege specifications, which are
  * represented in col_privs (this is a list of untransformed AccessPriv nodes).
- * Column privileges are only valid for objtype ACL_OBJECT_RELATION.
+ * Column privileges are only valid for objtype OBJECT_TABLE.
  */
 typedef struct
 {
 	bool		is_grant;
-	GrantObjectType objtype;
+	ObjectType	objtype;
 	List	   *objects;
 	bool		all_privs;
 	AclMode		privileges;
diff --git a/src/include/utils/array.h b/src/include/utils/array.h
index 61a67a21e3..afbb532e9c 100644
--- a/src/include/utils/array.h
+++ b/src/include/utils/array.h
@@ -51,7 +51,7 @@
  * arrays holding the elements.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/array.h
@@ -64,6 +64,10 @@
 #include "fmgr.h"
 #include "utils/expandeddatum.h"
 
+/* avoid including execnodes.h here */
+struct ExprState;
+struct ExprContext;
+
 
 /*
  * Arrays are varlena objects, so must meet the varlena convention that
@@ -252,7 +256,7 @@ typedef struct ArrayIteratorData *ArrayIterator;
 #define PG_RETURN_EXPANDED_ARRAY(x)  PG_RETURN_DATUM(EOHPGetRWDatum(&(x)->hdr))
 
 /* fmgr macros for AnyArrayType (ie, get either varlena or expanded form) */
-#define PG_GETARG_ANY_ARRAY(n)	DatumGetAnyArray(PG_GETARG_DATUM(n))
+#define PG_GETARG_ANY_ARRAY_P(n)	DatumGetAnyArrayP(PG_GETARG_DATUM(n))
 
 /*
  * Access macros for varlena array header fields.
@@ -360,8 +364,9 @@ extern ArrayType *array_set(ArrayType *array, int nSubscripts, int *indx,
 		  Datum dataValue, bool isNull,
 		  int arraytyplen, int elmlen, bool elmbyval, char elmalign);
 
-extern Datum array_map(FunctionCallInfo fcinfo, Oid retType,
-		  ArrayMapState *amstate);
+extern Datum array_map(Datum arrayd,
+		  struct ExprState *exprstate, struct ExprContext *econtext,
+		  Oid retType, ArrayMapState *amstate);
 
 extern void array_bitmap_copy(bits8 *destbitmap, int destoffset,
 				  const bits8 *srcbitmap, int srcoffset,
@@ -440,7 +445,7 @@ extern Datum expand_array(Datum arraydatum, MemoryContext parentcontext,
 extern ExpandedArrayHeader *DatumGetExpandedArray(Datum d);
 extern ExpandedArrayHeader *DatumGetExpandedArrayX(Datum d,
 					   ArrayMetaState *metacache);
-extern AnyArrayType *DatumGetAnyArray(Datum d);
+extern AnyArrayType *DatumGetAnyArrayP(Datum d);
 extern void deconstruct_expanded_array(ExpandedArrayHeader *eah);
 
 #endif							/* ARRAY_H */
diff --git a/src/include/utils/arrayaccess.h b/src/include/utils/arrayaccess.h
index 7655c80bed..f04752213e 100644
--- a/src/include/utils/arrayaccess.h
+++ b/src/include/utils/arrayaccess.h
@@ -4,7 +4,7 @@
  *	  Declarations for element-by-element access to Postgres arrays.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/arrayaccess.h
diff --git a/src/include/utils/ascii.h b/src/include/utils/ascii.h
index d3b183f11f..9ecf164047 100644
--- a/src/include/utils/ascii.h
+++ b/src/include/utils/ascii.h
@@ -1,7 +1,7 @@
 /*-----------------------------------------------------------------------
  * ascii.h
  *
- *	 Portions Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ *	 Portions Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  * src/include/utils/ascii.h
  *
diff --git a/src/include/utils/attoptcache.h b/src/include/utils/attoptcache.h
index 4eef793181..f36ce279ac 100644
--- a/src/include/utils/attoptcache.h
+++ b/src/include/utils/attoptcache.h
@@ -3,7 +3,7 @@
  * attoptcache.h
  *	  Attribute options cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/attoptcache.h
diff --git a/src/include/utils/backend_random.h b/src/include/utils/backend_random.h
index 9781aea0ac..99ea2cb9fb 100644
--- a/src/include/utils/backend_random.h
+++ b/src/include/utils/backend_random.h
@@ -3,7 +3,7 @@
  * backend_random.h
  *		Declarations for backend random number generation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *	  src/include/utils/backend_random.h
  *
diff --git a/src/include/utils/builtins.h b/src/include/utils/builtins.h
index 762532f636..3e462f1a9c 100644
--- a/src/include/utils/builtins.h
+++ b/src/include/utils/builtins.h
@@ -4,7 +4,7 @@
  *	  Declarations for operations on built-in types.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/builtins.h
@@ -112,10 +112,17 @@ extern void clean_ipv6_addr(int addr_family, char *addr);
 extern Datum numeric_float8_no_overflow(PG_FUNCTION_ARGS);
 
 /* format_type.c */
+
+/* Control flags for format_type_extended */
+#define FORMAT_TYPE_TYPEMOD_GIVEN	0x01	/* typemod defined by caller */
+#define FORMAT_TYPE_ALLOW_INVALID	0x02	/* allow invalid types */
+#define FORMAT_TYPE_FORCE_QUALIFY	0x04	/* force qualification of type */
+extern char *format_type_extended(Oid type_oid, int32 typemod, bits16 flags);
+
 extern char *format_type_be(Oid type_oid);
 extern char *format_type_be_qualified(Oid type_oid);
 extern char *format_type_with_typemod(Oid type_oid, int32 typemod);
-extern char *format_type_with_typemod_qualified(Oid type_oid, int32 typemod);
+
 extern int32 type_maximum_size(Oid type_oid, int32 typemod);
 
 /* quote.c */
diff --git a/src/include/utils/bytea.h b/src/include/utils/bytea.h
index d7bd30842e..a959dde791 100644
--- a/src/include/utils/bytea.h
+++ b/src/include/utils/bytea.h
@@ -4,7 +4,7 @@
  *	  Declarations for BYTEA data type support.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/bytea.h
diff --git a/src/include/utils/catcache.h b/src/include/utils/catcache.h
index 200a3022e7..7b22f9c7bc 100644
--- a/src/include/utils/catcache.h
+++ b/src/include/utils/catcache.h
@@ -10,7 +10,7 @@
  * guarantee that there can only be one matching row for a key combination.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/catcache.h
@@ -34,25 +34,33 @@
 
 #define CATCACHE_MAXKEYS		4
 
+
+/* function computing a datum's hash */
+typedef uint32 (*CCHashFN) (Datum datum);
+
+/* function computing equality of two datums */
+typedef bool (*CCFastEqualFN) (Datum a, Datum b);
+
 typedef struct catcache
 {
 	int			id;				/* cache identifier --- see syscache.h */
-	slist_node	cc_next;		/* list link */
+	int			cc_nbuckets;	/* # of hash buckets in this cache */
+	TupleDesc	cc_tupdesc;		/* tuple descriptor (copied from reldesc) */
+	dlist_head *cc_bucket;		/* hash buckets */
+	CCHashFN	cc_hashfunc[CATCACHE_MAXKEYS];	/* hash function for each key */
+	CCFastEqualFN cc_fastequal[CATCACHE_MAXKEYS];	/* fast equal function for
+													 * each key */
+	int			cc_keyno[CATCACHE_MAXKEYS]; /* AttrNumber of each key */
+	dlist_head	cc_lists;		/* list of CatCList structs */
+	int			cc_ntup;		/* # of tuples currently in this cache */
+	int			cc_nkeys;		/* # of keys (1..CATCACHE_MAXKEYS) */
 	const char *cc_relname;		/* name of relation the tuples come from */
 	Oid			cc_reloid;		/* OID of relation the tuples come from */
 	Oid			cc_indexoid;	/* OID of index matching cache keys */
 	bool		cc_relisshared; /* is relation shared across databases? */
-	TupleDesc	cc_tupdesc;		/* tuple descriptor (copied from reldesc) */
-	int			cc_ntup;		/* # of tuples currently in this cache */
-	int			cc_nbuckets;	/* # of hash buckets in this cache */
-	int			cc_nkeys;		/* # of keys (1..CATCACHE_MAXKEYS) */
-	int			cc_key[CATCACHE_MAXKEYS];	/* AttrNumber of each key */
-	PGFunction	cc_hashfunc[CATCACHE_MAXKEYS];	/* hash function for each key */
+	slist_node	cc_next;		/* list link */
 	ScanKeyData cc_skey[CATCACHE_MAXKEYS];	/* precomputed key info for heap
 											 * scans */
-	bool		cc_isname[CATCACHE_MAXKEYS];	/* flag "name" key columns */
-	dlist_head	cc_lists;		/* list of CatCList structs */
-	dlist_head *cc_bucket;		/* hash buckets */
 
 	/*
 	 * Keep these at the end, so that compiling catcache.c with CATCACHE_STATS
@@ -79,7 +87,14 @@ typedef struct catctup
 {
 	int			ct_magic;		/* for identifying CatCTup entries */
 #define CT_MAGIC   0x57261502
-	CatCache   *my_cache;		/* link to owning catcache */
+
+	uint32		hash_value;		/* hash value for this tuple's keys */
+
+	/*
+	 * Lookup keys for the entry. By-reference datums point into the tuple for
+	 * positive cache entries, and are separately allocated for negative ones.
+	 */
+	Datum		keys[CATCACHE_MAXKEYS];
 
 	/*
 	 * Each tuple in a cache is a member of a dlist that stores the elements
@@ -88,15 +103,6 @@ typedef struct catctup
 	 */
 	dlist_node	cache_elem;		/* list member of per-bucket list */
 
-	/*
-	 * The tuple may also be a member of at most one CatCList.  (If a single
-	 * catcache is list-searched with varying numbers of keys, we may have to
-	 * make multiple entries for the same tuple because of this restriction.
-	 * Currently, that's not expected to be common, so we accept the potential
-	 * inefficiency.)
-	 */
-	struct catclist *c_list;	/* containing CatCList, or NULL if none */
-
 	/*
 	 * A tuple marked "dead" must not be returned by subsequent searches.
 	 * However, it won't be physically deleted from the cache until its
@@ -112,46 +118,63 @@ typedef struct catctup
 	int			refcount;		/* number of active references */
 	bool		dead;			/* dead but not yet removed? */
 	bool		negative;		/* negative cache entry? */
-	uint32		hash_value;		/* hash value for this tuple's keys */
 	HeapTupleData tuple;		/* tuple management header */
+
+	/*
+	 * The tuple may also be a member of at most one CatCList.  (If a single
+	 * catcache is list-searched with varying numbers of keys, we may have to
+	 * make multiple entries for the same tuple because of this restriction.
+	 * Currently, that's not expected to be common, so we accept the potential
+	 * inefficiency.)
+	 */
+	struct catclist *c_list;	/* containing CatCList, or NULL if none */
+
+	CatCache   *my_cache;		/* link to owning catcache */
+	/* properly aligned tuple data follows, unless a negative entry */
 } CatCTup;
 
 
+/*
+ * A CatCList describes the result of a partial search, ie, a search using
+ * only the first K key columns of an N-key cache.  We store the keys used
+ * into the keys attribute to represent the stored key set.  The CatCList
+ * object contains links to cache entries for all the table rows satisfying
+ * the partial key.  (Note: none of these will be negative cache entries.)
+ *
+ * A CatCList is only a member of a per-cache list; we do not currently
+ * divide them into hash buckets.
+ *
+ * A list marked "dead" must not be returned by subsequent searches.
+ * However, it won't be physically deleted from the cache until its
+ * refcount goes to zero.  (A list should be marked dead if any of its
+ * member entries are dead.)
+ *
+ * If "ordered" is true then the member tuples appear in the order of the
+ * cache's underlying index.  This will be true in normal operation, but
+ * might not be true during bootstrap or recovery operations. (namespace.c
+ * is able to save some cycles when it is true.)
+ */
 typedef struct catclist
 {
 	int			cl_magic;		/* for identifying CatCList entries */
 #define CL_MAGIC   0x52765103
-	CatCache   *my_cache;		/* link to owning catcache */
+
+	uint32		hash_value;		/* hash value for lookup keys */
+
+	dlist_node	cache_elem;		/* list member of per-catcache list */
 
 	/*
-	 * A CatCList describes the result of a partial search, ie, a search using
-	 * only the first K key columns of an N-key cache.  We form the keys used
-	 * into a tuple (with other attributes NULL) to represent the stored key
-	 * set.  The CatCList object contains links to cache entries for all the
-	 * table rows satisfying the partial key.  (Note: none of these will be
-	 * negative cache entries.)
-	 *
-	 * A CatCList is only a member of a per-cache list; we do not currently
-	 * divide them into hash buckets.
-	 *
-	 * A list marked "dead" must not be returned by subsequent searches.
-	 * However, it won't be physically deleted from the cache until its
-	 * refcount goes to zero.  (A list should be marked dead if any of its
-	 * member entries are dead.)
-	 *
-	 * If "ordered" is true then the member tuples appear in the order of the
-	 * cache's underlying index.  This will be true in normal operation, but
-	 * might not be true during bootstrap or recovery operations. (namespace.c
-	 * is able to save some cycles when it is true.)
+	 * Lookup keys for the entry, with the first nkeys elements being valid.
+	 * All by-reference are separately allocated.
 	 */
-	dlist_node	cache_elem;		/* list member of per-catcache list */
+	Datum		keys[CATCACHE_MAXKEYS];
+
 	int			refcount;		/* number of active references */
 	bool		dead;			/* dead but not yet removed? */
 	bool		ordered;		/* members listed in index order? */
 	short		nkeys;			/* number of lookup keys specified */
-	uint32		hash_value;		/* hash value for lookup keys */
-	HeapTupleData tuple;		/* header for tuple holding keys */
 	int			n_members;		/* number of member tuples */
+	CatCache   *my_cache;		/* link to owning catcache */
 	CatCTup    *members[FLEXIBLE_ARRAY_MEMBER]; /* members */
 } CatCList;
 
@@ -174,8 +197,15 @@ extern CatCache *InitCatCache(int id, Oid reloid, Oid indexoid,
 extern void InitCatCachePhase2(CatCache *cache, bool touch_index);
 
 extern HeapTuple SearchCatCache(CatCache *cache,
-			   Datum v1, Datum v2,
-			   Datum v3, Datum v4);
+			   Datum v1, Datum v2, Datum v3, Datum v4);
+extern HeapTuple SearchCatCache1(CatCache *cache,
+				Datum v1);
+extern HeapTuple SearchCatCache2(CatCache *cache,
+				Datum v1, Datum v2);
+extern HeapTuple SearchCatCache3(CatCache *cache,
+				Datum v1, Datum v2, Datum v3);
+extern HeapTuple SearchCatCache4(CatCache *cache,
+				Datum v1, Datum v2, Datum v3, Datum v4);
 extern void ReleaseCatCache(HeapTuple tuple);
 
 extern uint32 GetCatCacheHashValue(CatCache *cache,
@@ -184,7 +214,7 @@ extern uint32 GetCatCacheHashValue(CatCache *cache,
 
 extern CatCList *SearchCatCacheList(CatCache *cache, int nkeys,
 				   Datum v1, Datum v2,
-				   Datum v3, Datum v4);
+				   Datum v3);
 extern void ReleaseCatCacheList(CatCList *list);
 
 extern void ResetCatalogCaches(void);
diff --git a/src/include/utils/combocid.h b/src/include/utils/combocid.h
index 6d8be8bf0f..094a9cf98b 100644
--- a/src/include/utils/combocid.h
+++ b/src/include/utils/combocid.h
@@ -4,7 +4,7 @@
  *	  Combo command ID support routines
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/combocid.h
diff --git a/src/include/utils/date.h b/src/include/utils/date.h
index 0736a72946..eb6d2a16fe 100644
--- a/src/include/utils/date.h
+++ b/src/include/utils/date.h
@@ -4,7 +4,7 @@
  *	  Definitions for the SQL "date" and "time" types.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/date.h
@@ -17,7 +17,8 @@
 #include <math.h>
 
 #include "fmgr.h"
-
+#include "pgtime.h"
+#include "datatype/timestamp.h"
 
 typedef int32 DateADT;
 
@@ -73,5 +74,7 @@ extern void EncodeSpecialDate(DateADT dt, char *str);
 extern DateADT GetSQLCurrentDate(void);
 extern TimeTzADT *GetSQLCurrentTime(int32 typmod);
 extern TimeADT GetSQLLocalTime(int32 typmod);
+extern int	time2tm(TimeADT time, struct pg_tm *tm, fsec_t *fsec);
+extern int	timetz2tm(TimeTzADT *time, struct pg_tm *tm, fsec_t *fsec, int *tzp);
 
 #endif							/* DATE_H */
diff --git a/src/include/utils/datetime.h b/src/include/utils/datetime.h
index 7968569fda..d66582b7a2 100644
--- a/src/include/utils/datetime.h
+++ b/src/include/utils/datetime.h
@@ -6,7 +6,7 @@
  *	   including abstime, reltime, date, and time.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/datetime.h
diff --git a/src/include/utils/datum.h b/src/include/utils/datum.h
index d2f0f9ed51..90ab5381aa 100644
--- a/src/include/utils/datum.h
+++ b/src/include/utils/datum.h
@@ -8,7 +8,7 @@
  * of the Datum.  (We do it this way because in most situations the caller
  * can look up the info just once and use it for many per-datum operations.)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/datum.h
diff --git a/src/include/utils/dsa.h b/src/include/utils/dsa.h
index 516ef610f0..5be6aab292 100644
--- a/src/include/utils/dsa.h
+++ b/src/include/utils/dsa.h
@@ -3,7 +3,7 @@
  * dsa.h
  *	  Dynamic shared memory areas.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/utils/dynahash.h b/src/include/utils/dynahash.h
index 8e03245a03..4365e1b439 100644
--- a/src/include/utils/dynahash.h
+++ b/src/include/utils/dynahash.h
@@ -4,7 +4,7 @@
  *	  POSTGRES dynahash.h file definitions
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/dynahash.h
diff --git a/src/include/utils/dynamic_loader.h b/src/include/utils/dynamic_loader.h
index 6c9287b611..e2455b52ca 100644
--- a/src/include/utils/dynamic_loader.h
+++ b/src/include/utils/dynamic_loader.h
@@ -4,7 +4,7 @@
  *
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/dynamic_loader.h
@@ -17,8 +17,8 @@
 #include "fmgr.h"
 
 
-extern void *pg_dlopen(char *filename);
-extern PGFunction pg_dlsym(void *handle, char *funcname);
+extern void *pg_dlopen(const char *filename);
+extern PGFunction pg_dlsym(void *handle, const char *funcname);
 extern void pg_dlclose(void *handle);
 extern char *pg_dlerror(void);
 
diff --git a/src/include/utils/elog.h b/src/include/utils/elog.h
index 7bfd25a9e9..7a9ba7f2ff 100644
--- a/src/include/utils/elog.h
+++ b/src/include/utils/elog.h
@@ -4,7 +4,7 @@
  *	  POSTGRES error reporting/logging definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/elog.h
diff --git a/src/include/utils/evtcache.h b/src/include/utils/evtcache.h
index 9774eac5a6..727b6ba588 100644
--- a/src/include/utils/evtcache.h
+++ b/src/include/utils/evtcache.h
@@ -3,7 +3,7 @@
  * evtcache.c
  *	  Special-purpose cache for event trigger data.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/include/utils/expandeddatum.h b/src/include/utils/expandeddatum.h
index 7116b860cc..3361bb25ad 100644
--- a/src/include/utils/expandeddatum.h
+++ b/src/include/utils/expandeddatum.h
@@ -34,7 +34,7 @@
  * value if they fail partway through.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/expandeddatum.h
diff --git a/src/include/utils/expandedrecord.h b/src/include/utils/expandedrecord.h
new file mode 100644
index 0000000000..a95c9cce22
--- /dev/null
+++ b/src/include/utils/expandedrecord.h
@@ -0,0 +1,227 @@
+/*-------------------------------------------------------------------------
+ *
+ * expandedrecord.h
+ *	  Declarations for composite expanded objects.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/utils/expandedrecord.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef EXPANDEDRECORD_H
+#define EXPANDEDRECORD_H
+
+#include "access/htup.h"
+#include "access/tupdesc.h"
+#include "fmgr.h"
+#include "utils/expandeddatum.h"
+
+
+/*
+ * An expanded record is contained within a private memory context (as
+ * all expanded objects must be) and has a control structure as below.
+ *
+ * The expanded record might contain a regular "flat" tuple if that was the
+ * original input and we've not modified it.  Otherwise, the contents are
+ * represented by Datum/isnull arrays plus type information.  We could also
+ * have both forms, if we've deconstructed the original tuple for access
+ * purposes but not yet changed it.  For pass-by-reference field types, the
+ * Datums would point into the flat tuple in this situation.  Once we start
+ * modifying tuple fields, new pass-by-ref fields are separately palloc'd
+ * within the memory context.
+ *
+ * It's possible to build an expanded record that references a "flat" tuple
+ * stored externally, if the caller can guarantee that that tuple will not
+ * change for the lifetime of the expanded record.  (This frammish is mainly
+ * meant to avoid unnecessary data copying in trigger functions.)
+ */
+#define ER_MAGIC 1384727874		/* ID for debugging crosschecks */
+
+typedef struct ExpandedRecordHeader
+{
+	/* Standard header for expanded objects */
+	ExpandedObjectHeader hdr;
+
+	/* Magic value identifying an expanded record (for debugging only) */
+	int			er_magic;
+
+	/* Assorted flag bits */
+	int			flags;
+#define ER_FLAG_FVALUE_VALID	0x0001	/* fvalue is up to date? */
+#define ER_FLAG_FVALUE_ALLOCED	0x0002	/* fvalue is local storage? */
+#define ER_FLAG_DVALUES_VALID	0x0004	/* dvalues/dnulls are up to date? */
+#define ER_FLAG_DVALUES_ALLOCED	0x0008	/* any field values local storage? */
+#define ER_FLAG_HAVE_EXTERNAL	0x0010	/* any field values are external? */
+#define ER_FLAG_TUPDESC_ALLOCED	0x0020	/* tupdesc is local storage? */
+#define ER_FLAG_IS_DOMAIN		0x0040	/* er_decltypeid is domain? */
+#define ER_FLAG_IS_DUMMY		0x0080	/* this header is dummy (see below) */
+/* flag bits that are not to be cleared when replacing tuple data: */
+#define ER_FLAGS_NON_DATA \
+	(ER_FLAG_TUPDESC_ALLOCED | ER_FLAG_IS_DOMAIN | ER_FLAG_IS_DUMMY)
+
+	/* Declared type of the record variable (could be a domain type) */
+	Oid			er_decltypeid;
+
+	/*
+	 * Actual composite type/typmod; never a domain (if ER_FLAG_IS_DOMAIN,
+	 * these identify the composite base type).  These will match
+	 * er_tupdesc->tdtypeid/tdtypmod, as well as the header fields of
+	 * composite datums made from or stored in this expanded record.
+	 */
+	Oid			er_typeid;		/* type OID of the composite type */
+	int32		er_typmod;		/* typmod of the composite type */
+
+	/*
+	 * Tuple descriptor, if we have one, else NULL.  This may point to a
+	 * reference-counted tupdesc originally belonging to the typcache, in
+	 * which case we use a memory context reset callback to release the
+	 * refcount.  It can also be locally allocated in this object's private
+	 * context (in which case ER_FLAG_TUPDESC_ALLOCED is set).
+	 */
+	TupleDesc	er_tupdesc;
+
+	/*
+	 * Unique-within-process identifier for the tupdesc (see typcache.h). This
+	 * field will never be equal to INVALID_TUPLEDESC_IDENTIFIER.
+	 */
+	uint64		er_tupdesc_id;
+
+	/*
+	 * If we have a Datum-array representation of the record, it's kept here;
+	 * else ER_FLAG_DVALUES_VALID is not set, and dvalues/dnulls may be NULL
+	 * if they've not yet been allocated.  If allocated, the dvalues and
+	 * dnulls arrays are palloc'd within the object private context, and are
+	 * of length matching er_tupdesc->natts.  For pass-by-ref field types,
+	 * dvalues entries might point either into the fstartptr..fendptr area, or
+	 * to separately palloc'd chunks.
+	 */
+	Datum	   *dvalues;		/* array of Datums */
+	bool	   *dnulls;			/* array of is-null flags for Datums */
+	int			nfields;		/* length of above arrays */
+
+	/*
+	 * flat_size is the current space requirement for the flat equivalent of
+	 * the expanded record, if known; otherwise it's 0.  We store this to make
+	 * consecutive calls of get_flat_size cheap.  If flat_size is not 0, the
+	 * component values data_len, hoff, and hasnull must be valid too.
+	 */
+	Size		flat_size;
+
+	Size		data_len;		/* data len within flat_size */
+	int			hoff;			/* header offset */
+	bool		hasnull;		/* null bitmap needed? */
+
+	/*
+	 * fvalue points to the flat representation if we have one, else it is
+	 * NULL.  If the flat representation is valid (up to date) then
+	 * ER_FLAG_FVALUE_VALID is set.  Even if we've outdated the flat
+	 * representation due to changes of user fields, it can still be used to
+	 * fetch system column values.  If we have a flat representation then
+	 * fstartptr/fendptr point to the start and end+1 of its data area; this
+	 * is so that we can tell which Datum pointers point into the flat
+	 * representation rather than being pointers to separately palloc'd data.
+	 */
+	HeapTuple	fvalue;			/* might or might not be private storage */
+	char	   *fstartptr;		/* start of its data area */
+	char	   *fendptr;		/* end+1 of its data area */
+
+	/* Working state for domain checking, used if ER_FLAG_IS_DOMAIN is set */
+	MemoryContext er_domain_check_cxt;	/* short-term memory context */
+	struct ExpandedRecordHeader *er_dummy_header;	/* dummy record header */
+	void	   *er_domaininfo;	/* cache space for domain_check() */
+
+	/* Callback info (it's active if er_mcb.arg is not NULL) */
+	MemoryContextCallback er_mcb;
+} ExpandedRecordHeader;
+
+/* fmgr macros for expanded record objects */
+#define PG_GETARG_EXPANDED_RECORD(n)  DatumGetExpandedRecord(PG_GETARG_DATUM(n))
+#define ExpandedRecordGetDatum(erh)   EOHPGetRWDatum(&(erh)->hdr)
+#define ExpandedRecordGetRODatum(erh) EOHPGetRODatum(&(erh)->hdr)
+#define PG_RETURN_EXPANDED_RECORD(x)  PG_RETURN_DATUM(ExpandedRecordGetDatum(x))
+
+/* assorted other macros */
+#define ExpandedRecordIsEmpty(erh) \
+	(((erh)->flags & (ER_FLAG_DVALUES_VALID | ER_FLAG_FVALUE_VALID)) == 0)
+#define ExpandedRecordIsDomain(erh) \
+	(((erh)->flags & ER_FLAG_IS_DOMAIN) != 0)
+
+/* this can substitute for TransferExpandedObject() when we already have erh */
+#define TransferExpandedRecord(erh, cxt) \
+	MemoryContextSetParent((erh)->hdr.eoh_context, cxt)
+
+/* information returned by expanded_record_lookup_field() */
+typedef struct ExpandedRecordFieldInfo
+{
+	int			fnumber;		/* field's attr number in record */
+	Oid			ftypeid;		/* field's type/typmod info */
+	int32		ftypmod;
+	Oid			fcollation;		/* field's collation if any */
+} ExpandedRecordFieldInfo;
+
+/*
+ * prototypes for functions defined in expandedrecord.c
+ */
+extern ExpandedRecordHeader *make_expanded_record_from_typeid(Oid type_id, int32 typmod,
+								 MemoryContext parentcontext);
+extern ExpandedRecordHeader *make_expanded_record_from_tupdesc(TupleDesc tupdesc,
+								  MemoryContext parentcontext);
+extern ExpandedRecordHeader *make_expanded_record_from_exprecord(ExpandedRecordHeader *olderh,
+									MemoryContext parentcontext);
+extern void expanded_record_set_tuple(ExpandedRecordHeader *erh,
+						  HeapTuple tuple, bool copy);
+extern Datum make_expanded_record_from_datum(Datum recorddatum,
+								MemoryContext parentcontext);
+extern TupleDesc expanded_record_fetch_tupdesc(ExpandedRecordHeader *erh);
+extern HeapTuple expanded_record_get_tuple(ExpandedRecordHeader *erh);
+extern ExpandedRecordHeader *DatumGetExpandedRecord(Datum d);
+extern void deconstruct_expanded_record(ExpandedRecordHeader *erh);
+extern bool expanded_record_lookup_field(ExpandedRecordHeader *erh,
+							 const char *fieldname,
+							 ExpandedRecordFieldInfo *finfo);
+extern Datum expanded_record_fetch_field(ExpandedRecordHeader *erh, int fnumber,
+							bool *isnull);
+extern void expanded_record_set_field_internal(ExpandedRecordHeader *erh,
+								   int fnumber,
+								   Datum newValue, bool isnull,
+								   bool check_constraints);
+extern void expanded_record_set_fields(ExpandedRecordHeader *erh,
+						   const Datum *newValues, const bool *isnulls);
+
+/* outside code should never call expanded_record_set_field_internal as such */
+#define expanded_record_set_field(erh, fnumber, newValue, isnull) \
+	expanded_record_set_field_internal(erh, fnumber, newValue, isnull, true)
+
+/*
+ * Inline-able fast cases.  The expanded_record_fetch_xxx functions above
+ * handle the general cases.
+ */
+
+/* Get the tupdesc for the expanded record's actual type */
+static inline TupleDesc
+expanded_record_get_tupdesc(ExpandedRecordHeader *erh)
+{
+	if (likely(erh->er_tupdesc != NULL))
+		return erh->er_tupdesc;
+	else
+		return expanded_record_fetch_tupdesc(erh);
+}
+
+/* Get value of record field */
+static inline Datum
+expanded_record_get_field(ExpandedRecordHeader *erh, int fnumber,
+						  bool *isnull)
+{
+	if ((erh->flags & ER_FLAG_DVALUES_VALID) &&
+		likely(fnumber > 0 && fnumber <= erh->nfields))
+	{
+		*isnull = erh->dnulls[fnumber - 1];
+		return erh->dvalues[fnumber - 1];
+	}
+	else
+		return expanded_record_fetch_field(erh, fnumber, isnull);
+}
+
+#endif							/* EXPANDEDRECORD_H */
diff --git a/src/include/utils/fmgrtab.h b/src/include/utils/fmgrtab.h
index 6130ef8f9c..d8317eb3ea 100644
--- a/src/include/utils/fmgrtab.h
+++ b/src/include/utils/fmgrtab.h
@@ -3,7 +3,7 @@
  * fmgrtab.h
  *	  The function manager's table of internal functions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/fmgrtab.h
@@ -13,13 +13,13 @@
 #ifndef FMGRTAB_H
 #define FMGRTAB_H
 
+#include "access/transam.h"
 #include "fmgr.h"
 
 
 /*
  * This table stores info about all the built-in functions (ie, functions
- * that are compiled into the Postgres executable).  The table entries are
- * required to appear in Oid order, so that binary search can be used.
+ * that are compiled into the Postgres executable).
  */
 
 typedef struct
@@ -36,4 +36,11 @@ extern const FmgrBuiltin fmgr_builtins[];
 
 extern const int fmgr_nbuiltins;	/* number of entries in table */
 
+/*
+ * Mapping from a builtin function's oid to the index in the fmgr_builtins
+ * array.
+ */
+#define InvalidOidBuiltinMapping PG_UINT16_MAX
+extern const uint16 fmgr_builtin_oid_index[FirstBootstrapObjectId];
+
 #endif							/* FMGRTAB_H */
diff --git a/src/include/utils/formatting.h b/src/include/utils/formatting.h
index 8eaf2c3052..a9f5548b46 100644
--- a/src/include/utils/formatting.h
+++ b/src/include/utils/formatting.h
@@ -4,7 +4,7 @@
  * src/include/utils/formatting.h
  *
  *
- *	 Portions Copyright (c) 1999-2017, PostgreSQL Global Development Group
+ *	 Portions Copyright (c) 1999-2018, PostgreSQL Global Development Group
  *
  *	 The PostgreSQL routines for a DateTime/int/float/numeric formatting,
  *	 inspire with Oracle TO_CHAR() / TO_DATE() / TO_NUMBER() routines.
diff --git a/src/include/utils/freepage.h b/src/include/utils/freepage.h
index c370c733ee..cbbf267fb3 100644
--- a/src/include/utils/freepage.h
+++ b/src/include/utils/freepage.h
@@ -3,7 +3,7 @@
  * freepage.h
  *	  Management of page-organized free memory.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/freepage.h
diff --git a/src/include/utils/geo_decls.h b/src/include/utils/geo_decls.h
index 44c6381b85..a589e4239f 100644
--- a/src/include/utils/geo_decls.h
+++ b/src/include/utils/geo_decls.h
@@ -3,7 +3,7 @@
  * geo_decls.h - Declarations for various 2D constructs.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/geo_decls.h
@@ -178,9 +178,10 @@ typedef struct
  * in geo_ops.c
  */
 
-/* private point routines */
+/* private routines */
 extern double point_dt(Point *pt1, Point *pt2);
 extern double point_sl(Point *pt1, Point *pt2);
 extern double pg_hypot(double x, double y);
+extern BOX *box_copy(BOX *box);
 
 #endif							/* GEO_DECLS_H */
diff --git a/src/include/utils/guc.h b/src/include/utils/guc.h
index c1870d2130..2e03640c0b 100644
--- a/src/include/utils/guc.h
+++ b/src/include/utils/guc.h
@@ -4,7 +4,7 @@
  * External declarations pertaining to backend/utils/misc/guc.c and
  * backend/utils/misc/guc-file.l
  *
- * Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2000-2018, PostgreSQL Global Development Group
  * Written by Peter Eisentraut <peter_e@gmx.net>.
  *
  * src/include/utils/guc.h
@@ -219,6 +219,7 @@ typedef enum
 #define GUC_UNIT_BLOCKS			0x2000	/* value is in blocks */
 #define GUC_UNIT_XBLOCKS		0x3000	/* value is in xlog blocks */
 #define GUC_UNIT_MB				0x4000	/* value is in megabytes */
+#define GUC_UNIT_BYTE			0x8000	/* value is in bytes */
 #define GUC_UNIT_MEMORY			0xF000	/* mask for size-related units */
 
 #define GUC_UNIT_MS			   0x10000	/* value is in milliseconds */
@@ -244,10 +245,11 @@ extern bool log_btree_build_stats;
 
 extern PGDLLIMPORT bool check_function_bodies;
 extern bool default_with_oids;
+extern bool session_auth_is_superuser;
 
 extern int	log_min_error_statement;
-extern int	log_min_messages;
-extern int	client_min_messages;
+extern PGDLLIMPORT int log_min_messages;
+extern PGDLLIMPORT int client_min_messages;
 extern int	log_min_duration_statement;
 extern int	log_temp_files;
 
@@ -256,12 +258,12 @@ extern int	temp_file_limit;
 extern int	num_temp_buffers;
 
 extern char *cluster_name;
-extern char *ConfigFileName;
+extern PGDLLIMPORT char *ConfigFileName;
 extern char *HbaFileName;
 extern char *IdentFileName;
 extern char *external_pid_file;
 
-extern char *application_name;
+extern PGDLLIMPORT char *application_name;
 
 extern int	tcp_keepalives_idle;
 extern int	tcp_keepalives_interval;
diff --git a/src/include/utils/guc_tables.h b/src/include/utils/guc_tables.h
index 042f7a0152..668d9efd35 100644
--- a/src/include/utils/guc_tables.h
+++ b/src/include/utils/guc_tables.h
@@ -5,7 +5,7 @@
  *
  * See src/backend/utils/misc/README for design notes.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *	  src/include/utils/guc_tables.h
  *
@@ -56,7 +56,8 @@ enum config_group
 	FILE_LOCATIONS,
 	CONN_AUTH,
 	CONN_AUTH_SETTINGS,
-	CONN_AUTH_SECURITY,
+	CONN_AUTH_AUTH,
+	CONN_AUTH_SSL,
 	RESOURCES,
 	RESOURCES_MEM,
 	RESOURCES_DISK,
diff --git a/src/include/utils/hashutils.h b/src/include/utils/hashutils.h
new file mode 100644
index 0000000000..5e9fe65012
--- /dev/null
+++ b/src/include/utils/hashutils.h
@@ -0,0 +1,53 @@
+/*
+ * Utilities for working with hash values.
+ *
+ * Portions Copyright (c) 2017-2018, PostgreSQL Global Development Group
+ */
+
+#ifndef HASHUTILS_H
+#define HASHUTILS_H
+
+/*
+ * Combine two 32-bit hash values, resulting in another hash value, with
+ * decent bit mixing.
+ *
+ * Similar to boost's hash_combine().
+ */
+static inline uint32
+hash_combine(uint32 a, uint32 b)
+{
+	a ^= b + 0x9e3779b9 + (a << 6) + (a >> 2);
+	return a;
+}
+
+/*
+ * Combine two 64-bit hash values, resulting in another hash value, using the
+ * same kind of technique as hash_combine().  Testing shows that this also
+ * produces good bit mixing.
+ */
+static inline uint64
+hash_combine64(uint64 a, uint64 b)
+{
+	/* 0x49a0f4dd15e5a8e3 is 64bit random data */
+	a ^= b + UINT64CONST(0x49a0f4dd15e5a8e3) + (a << 54) + (a >> 7);
+	return a;
+}
+
+/*
+ * Simple inline murmur hash implementation hashing a 32 bit integer, for
+ * performance.
+ */
+static inline uint32
+murmurhash32(uint32 data)
+{
+	uint32		h = data;
+
+	h ^= h >> 16;
+	h *= 0x85ebca6b;
+	h ^= h >> 13;
+	h *= 0xc2b2ae35;
+	h ^= h >> 16;
+	return h;
+}
+
+#endif							/* HASHUTILS_H */
diff --git a/src/include/utils/help_config.h b/src/include/utils/help_config.h
index 3f433d10d7..f35d4da8a8 100644
--- a/src/include/utils/help_config.h
+++ b/src/include/utils/help_config.h
@@ -3,7 +3,7 @@
  * help_config.h
  *		Interface to the --help-config option of main.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *	  src/include/utils/help_config.h
  *
diff --git a/src/include/utils/hsearch.h b/src/include/utils/hsearch.h
index bc5873ed20..8357faac5a 100644
--- a/src/include/utils/hsearch.h
+++ b/src/include/utils/hsearch.h
@@ -4,7 +4,7 @@
  *	  exported definitions for utils/hash/dynahash.c; see notes therein
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/hsearch.h
diff --git a/src/include/utils/index_selfuncs.h b/src/include/utils/index_selfuncs.h
index 24f2f3a866..ae2b96943d 100644
--- a/src/include/utils/index_selfuncs.h
+++ b/src/include/utils/index_selfuncs.h
@@ -9,7 +9,7 @@
  * If you make it depend on anything besides access/amapi.h, that's likely
  * a mistake.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/index_selfuncs.h
diff --git a/src/include/utils/inet.h b/src/include/utils/inet.h
index f2aa864a35..e3bec398b1 100644
--- a/src/include/utils/inet.h
+++ b/src/include/utils/inet.h
@@ -4,7 +4,7 @@
  *	  Declarations for operations on INET datatypes.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/inet.h
diff --git a/src/include/utils/int8.h b/src/include/utils/int8.h
index 8b78983fee..91171ee4cc 100644
--- a/src/include/utils/int8.h
+++ b/src/include/utils/int8.h
@@ -4,7 +4,7 @@
  *	  Declarations for operations on 64-bit integers.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/int8.h
diff --git a/src/include/utils/inval.h b/src/include/utils/inval.h
index 361543f412..7a66d466f7 100644
--- a/src/include/utils/inval.h
+++ b/src/include/utils/inval.h
@@ -4,7 +4,7 @@
  *	  POSTGRES cache invalidation dispatcher definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/inval.h
diff --git a/src/include/utils/json.h b/src/include/utils/json.h
index e3ffe6fc44..549bd4d287 100644
--- a/src/include/utils/json.h
+++ b/src/include/utils/json.h
@@ -3,7 +3,7 @@
  * json.h
  *	  Declarations for JSON data type support.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/json.h
diff --git a/src/include/utils/jsonapi.h b/src/include/utils/jsonapi.h
index 4336823de2..e39572e00f 100644
--- a/src/include/utils/jsonapi.h
+++ b/src/include/utils/jsonapi.h
@@ -3,7 +3,7 @@
  * jsonapi.h
  *	  Declarations for JSON API support.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/jsonapi.h
@@ -147,4 +147,6 @@ extern Jsonb *transform_jsonb_string_values(Jsonb *jsonb, void *action_state,
 extern text *transform_json_string_values(text *json, void *action_state,
 							 JsonTransformStringValuesAction transform_action);
 
+extern char *JsonEncodeDateTime(char *buf, Datum value, Oid typid);
+
 #endif							/* JSONAPI_H */
diff --git a/src/include/utils/jsonb.h b/src/include/utils/jsonb.h
index ea9dd17540..27873d4d10 100644
--- a/src/include/utils/jsonb.h
+++ b/src/include/utils/jsonb.h
@@ -3,7 +3,7 @@
  * jsonb.h
  *	  Declarations for jsonb data type support.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/include/utils/jsonb.h
  *
@@ -65,10 +65,10 @@ typedef enum
 #define JGIN_MAXLENGTH	125		/* max length of text part before hashing */
 
 /* Convenience macros */
-#define DatumGetJsonb(d)	((Jsonb *) PG_DETOAST_DATUM(d))
-#define JsonbGetDatum(p)	PointerGetDatum(p)
-#define PG_GETARG_JSONB(x)	DatumGetJsonb(PG_GETARG_DATUM(x))
-#define PG_RETURN_JSONB(x)	PG_RETURN_POINTER(x)
+#define DatumGetJsonbP(d)	((Jsonb *) PG_DETOAST_DATUM(d))
+#define JsonbPGetDatum(p)	PointerGetDatum(p)
+#define PG_GETARG_JSONB_P(x)	DatumGetJsonbP(PG_GETARG_DATUM(x))
+#define PG_RETURN_JSONB_P(x)	PG_RETURN_POINTER(x)
 
 typedef struct JsonbPair JsonbPair;
 typedef struct JsonbValue JsonbValue;
@@ -370,6 +370,8 @@ extern Jsonb *JsonbValueToJsonb(JsonbValue *val);
 extern bool JsonbDeepContains(JsonbIterator **val,
 				  JsonbIterator **mContained);
 extern void JsonbHashScalarValue(const JsonbValue *scalarVal, uint32 *hash);
+extern void JsonbHashScalarValueExtended(const JsonbValue *scalarVal,
+							 uint64 *hash, uint64 seed);
 
 /* jsonb.c support functions */
 extern char *JsonbToCString(StringInfo out, JsonbContainer *in,
diff --git a/src/include/utils/logtape.h b/src/include/utils/logtape.h
index a1e869b80c..9bf1d80142 100644
--- a/src/include/utils/logtape.h
+++ b/src/include/utils/logtape.h
@@ -5,7 +5,7 @@
  *
  * See logtape.c for explanations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/logtape.h
@@ -16,15 +16,49 @@
 #ifndef LOGTAPE_H
 #define LOGTAPE_H
 
+#include "storage/sharedfileset.h"
+
 /* LogicalTapeSet is an opaque type whose details are not known outside logtape.c. */
 
 typedef struct LogicalTapeSet LogicalTapeSet;
 
+/*
+ * The approach tuplesort.c takes to parallel external sorts is that workers,
+ * whose state is almost the same as independent serial sorts, are made to
+ * produce a final materialized tape of sorted output in all cases.  This is
+ * frozen, just like any case requiring a final materialized tape.  However,
+ * there is one difference, which is that freezing will also export an
+ * underlying shared fileset BufFile for sharing.  Freezing produces TapeShare
+ * metadata for the worker when this happens, which is passed along through
+ * shared memory to leader.
+ *
+ * The leader process can then pass an array of TapeShare metadata (one per
+ * worker participant) to LogicalTapeSetCreate(), alongside a handle to a
+ * shared fileset, which is sufficient to construct a new logical tapeset that
+ * consists of each of the tapes materialized by workers.
+ *
+ * Note that while logtape.c does create an empty leader tape at the end of the
+ * tapeset in the leader case, it can never be written to due to a restriction
+ * in the shared buffile infrastructure.
+ */
+typedef struct TapeShare
+{
+	/*
+	 * firstblocknumber is first block that should be read from materialized
+	 * tape.
+	 *
+	 * buffilesize is the size of associated BufFile following freezing.
+	 */
+	long		firstblocknumber;
+	off_t		buffilesize;
+} TapeShare;
+
 /*
  * prototypes for functions in logtape.c
  */
 
-extern LogicalTapeSet *LogicalTapeSetCreate(int ntapes);
+extern LogicalTapeSet *LogicalTapeSetCreate(int ntapes, TapeShare *shared,
+					 SharedFileSet *fileset, int worker);
 extern void LogicalTapeSetClose(LogicalTapeSet *lts);
 extern void LogicalTapeSetForgetFreeSpace(LogicalTapeSet *lts);
 extern size_t LogicalTapeRead(LogicalTapeSet *lts, int tapenum,
@@ -34,7 +68,8 @@ extern void LogicalTapeWrite(LogicalTapeSet *lts, int tapenum,
 extern void LogicalTapeRewindForRead(LogicalTapeSet *lts, int tapenum,
 						 size_t buffer_size);
 extern void LogicalTapeRewindForWrite(LogicalTapeSet *lts, int tapenum);
-extern void LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum);
+extern void LogicalTapeFreeze(LogicalTapeSet *lts, int tapenum,
+				  TapeShare *share);
 extern size_t LogicalTapeBackspace(LogicalTapeSet *lts, int tapenum,
 					 size_t size);
 extern void LogicalTapeSeek(LogicalTapeSet *lts, int tapenum,
diff --git a/src/include/utils/lsyscache.h b/src/include/utils/lsyscache.h
index 07208b56ce..1f6c04a8f3 100644
--- a/src/include/utils/lsyscache.h
+++ b/src/include/utils/lsyscache.h
@@ -3,7 +3,7 @@
  * lsyscache.h
  *	  Convenience routines for common queries in the system catalog cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/lsyscache.h
@@ -83,8 +83,7 @@ extern List *get_op_btree_interpretation(Oid opno);
 extern bool equality_ops_are_compatible(Oid opno1, Oid opno2);
 extern Oid get_opfamily_proc(Oid opfamily, Oid lefttype, Oid righttype,
 				  int16 procnum);
-extern char *get_attname(Oid relid, AttrNumber attnum);
-extern char *get_relid_attribute_name(Oid relid, AttrNumber attnum);
+extern char *get_attname(Oid relid, AttrNumber attnum, bool missing_ok);
 extern AttrNumber get_attnum(Oid relid, const char *attname);
 extern char get_attidentity(Oid relid, AttrNumber attnum);
 extern Oid	get_atttype(Oid relid, AttrNumber attnum);
@@ -118,6 +117,7 @@ extern bool get_func_retset(Oid funcid);
 extern bool func_strict(Oid funcid);
 extern char func_volatile(Oid funcid);
 extern char func_parallel(Oid funcid);
+extern bool get_func_isagg(Oid funcid);
 extern bool get_func_leakproof(Oid funcid);
 extern float4 get_func_cost(Oid funcid);
 extern float4 get_func_rows(Oid funcid);
diff --git a/src/include/utils/memdebug.h b/src/include/utils/memdebug.h
index a73d505be8..c2c58b9cdd 100644
--- a/src/include/utils/memdebug.h
+++ b/src/include/utils/memdebug.h
@@ -7,7 +7,7 @@
  * empty definitions for Valgrind client request macros we use.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/memdebug.h
diff --git a/src/include/utils/memutils.h b/src/include/utils/memutils.h
index c553349066..6e6c6f2e4c 100644
--- a/src/include/utils/memutils.h
+++ b/src/include/utils/memutils.h
@@ -7,7 +7,7 @@
  *	  of the API of the memory management subsystem.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/memutils.h
@@ -41,7 +41,7 @@
 
 #define AllocSizeIsValid(size)	((Size) (size) <= MaxAllocSize)
 
-#define MaxAllocHugeSize	((Size) -1 >> 1)	/* SIZE_MAX / 2 */
+#define MaxAllocHugeSize	(SIZE_MAX / 2)
 
 #define AllocHugeSizeIsValid(size)	((Size) (size) <= MaxAllocHugeSize)
 
@@ -132,10 +132,12 @@ GetMemoryChunkContext(void *pointer)
  * context creation.  It's intended to be called from context-type-
  * specific creation routines, and noplace else.
  */
-extern MemoryContext MemoryContextCreate(NodeTag tag, Size size,
-					MemoryContextMethods *methods,
+extern void MemoryContextCreate(MemoryContext node,
+					NodeTag tag, Size size, Size nameoffset,
+					const MemoryContextMethods *methods,
 					MemoryContext parent,
-					const char *name);
+					const char *name,
+					int flags);
 
 
 /*
@@ -143,18 +145,48 @@ extern MemoryContext MemoryContextCreate(NodeTag tag, Size size,
  */
 
 /* aset.c */
-extern MemoryContext AllocSetContextCreate(MemoryContext parent,
-					  const char *name,
-					  Size minContextSize,
-					  Size initBlockSize,
-					  Size maxBlockSize);
+extern MemoryContext AllocSetContextCreateExtended(MemoryContext parent,
+							  const char *name,
+							  int flags,
+							  Size minContextSize,
+							  Size initBlockSize,
+							  Size maxBlockSize);
+
+/*
+ * This backwards compatibility macro only works for constant context names,
+ * and you must specify block sizes with one of the abstraction macros below.
+ */
+#ifdef HAVE__BUILTIN_CONSTANT_P
+#define AllocSetContextCreate(parent, name, allocparams) \
+	(StaticAssertExpr(__builtin_constant_p(name), \
+					  "Use AllocSetContextCreateExtended with MEMCONTEXT_COPY_NAME for non-constant context names"), \
+	 AllocSetContextCreateExtended(parent, name, 0, allocparams))
+#else
+#define AllocSetContextCreate(parent, name, allocparams) \
+	AllocSetContextCreateExtended(parent, name, 0, allocparams)
+#endif
 
 /* slab.c */
 extern MemoryContext SlabContextCreate(MemoryContext parent,
 				  const char *name,
+				  int flags,
 				  Size blockSize,
 				  Size chunkSize);
 
+/* generation.c */
+extern MemoryContext GenerationContextCreate(MemoryContext parent,
+						const char *name,
+						int flags,
+						Size blockSize);
+
+/*
+ * Flag option bits for FooContextCreate functions.
+ * In future, some of these might be relevant to only some context types.
+ *
+ * COPY_NAME: FooContextCreate's name argument is not a constant string
+ */
+#define MEMCONTEXT_COPY_NAME		0x0001	/* is passed name transient? */
+
 /*
  * Recommended default alloc parameters, suitable for "ordinary" contexts
  * that might hold quite a lot of data.
diff --git a/src/include/utils/nabstime.h b/src/include/utils/nabstime.h
index 69133952d1..293a49f022 100644
--- a/src/include/utils/nabstime.h
+++ b/src/include/utils/nabstime.h
@@ -4,7 +4,7 @@
  *	  Definitions for the "new" abstime code.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/nabstime.h
diff --git a/src/include/utils/numeric.h b/src/include/utils/numeric.h
index 3aa7fef947..cd8da8bdc2 100644
--- a/src/include/utils/numeric.h
+++ b/src/include/utils/numeric.h
@@ -5,7 +5,7 @@
  *
  * Original coding 1998, Jan Wieck.  Heavily revised 2003, Tom Lane.
  *
- * Copyright (c) 1998-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1998-2018, PostgreSQL Global Development Group
  *
  * src/include/utils/numeric.h
  *
diff --git a/src/include/utils/palloc.h b/src/include/utils/palloc.h
index a7dc837724..781e948f69 100644
--- a/src/include/utils/palloc.h
+++ b/src/include/utils/palloc.h
@@ -18,7 +18,7 @@
  * everything that should be freed.  See utils/mmgr/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/palloc.h
diff --git a/src/include/utils/pg_crc.h b/src/include/utils/pg_crc.h
index 9ea0622321..48bca045c2 100644
--- a/src/include/utils/pg_crc.h
+++ b/src/include/utils/pg_crc.h
@@ -26,7 +26,7 @@
  *
  * The CRC-32C variant is in port/pg_crc32c.h.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/pg_crc.h
diff --git a/src/include/utils/pg_locale.h b/src/include/utils/pg_locale.h
index f3e04d4d8c..88a3134862 100644
--- a/src/include/utils/pg_locale.h
+++ b/src/include/utils/pg_locale.h
@@ -4,7 +4,7 @@
  *
  * src/include/utils/pg_locale.h
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  *-----------------------------------------------------------------------
  */
@@ -110,11 +110,9 @@ extern int32_t icu_from_uchar(char **result, const UChar *buff_uchar, int32_t le
 #endif
 
 /* These functions convert from/to libc's wchar_t, *not* pg_wchar_t */
-#ifdef USE_WIDE_UPPER_LOWER
 extern size_t wchar2char(char *to, const wchar_t *from, size_t tolen,
 		   pg_locale_t locale);
 extern size_t char2wchar(wchar_t *to, size_t tolen,
 		   const char *from, size_t fromlen, pg_locale_t locale);
-#endif
 
 #endif							/* _PG_LOCALE_ */
diff --git a/src/include/utils/pg_lsn.h b/src/include/utils/pg_lsn.h
index cc51b2a078..0db478a259 100644
--- a/src/include/utils/pg_lsn.h
+++ b/src/include/utils/pg_lsn.h
@@ -5,7 +5,7 @@
  *		PostgreSQL.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/pg_lsn.h
diff --git a/src/include/utils/pg_rusage.h b/src/include/utils/pg_rusage.h
index cea51f0cb2..5768caab81 100644
--- a/src/include/utils/pg_rusage.h
+++ b/src/include/utils/pg_rusage.h
@@ -4,7 +4,7 @@
  *	  header file for resource usage measurement support routines
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/pg_rusage.h
diff --git a/src/include/utils/pidfile.h b/src/include/utils/pidfile.h
index c3db4c46e3..d3c47aea42 100644
--- a/src/include/utils/pidfile.h
+++ b/src/include/utils/pidfile.h
@@ -3,7 +3,7 @@
  * pidfile.h
  *	  Declarations describing the data directory lock file (postmaster.pid)
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/pidfile.h
diff --git a/src/include/utils/plancache.h b/src/include/utils/plancache.h
index 87fab19f3c..ab20aa04b0 100644
--- a/src/include/utils/plancache.h
+++ b/src/include/utils/plancache.h
@@ -5,7 +5,7 @@
  *
  * See plancache.c for comments.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/plancache.h
diff --git a/src/include/utils/portal.h b/src/include/utils/portal.h
index cb6f00081d..b903cb0fbe 100644
--- a/src/include/utils/portal.h
+++ b/src/include/utils/portal.h
@@ -36,7 +36,7 @@
  * to look like NO SCROLL cursors.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/portal.h
@@ -116,7 +116,7 @@ typedef struct PortalData
 	/* Bookkeeping data */
 	const char *name;			/* portal's name */
 	const char *prepStmtName;	/* source prepared statement (NULL if none) */
-	MemoryContext heap;			/* subsidiary memory for portal */
+	MemoryContext portalContext;/* subsidiary memory for portal */
 	ResourceOwner resowner;		/* resources owned by portal */
 	void		(*cleanup) (Portal portal); /* cleanup hook */
 
@@ -198,12 +198,6 @@ typedef struct PortalData
  */
 #define PortalIsValid(p) PointerIsValid(p)
 
-/*
- * Access macros for Portal ... use these in preference to field access.
- */
-#define PortalGetQueryDesc(portal)	((portal)->queryDesc)
-#define PortalGetHeapMemory(portal) ((portal)->heap)
-
 
 /* Prototypes for functions in utils/mmgr/portalmem.c */
 extern void EnablePortalManager(void);
@@ -237,5 +231,6 @@ extern PlannedStmt *PortalGetPrimaryStmt(Portal portal);
 extern void PortalCreateHoldStore(Portal portal);
 extern void PortalHashTableDeleteAll(void);
 extern bool ThereAreNoReadyPortals(void);
+extern bool ThereArePinnedPortals(void);
 
 #endif							/* PORTAL_H */
diff --git a/src/include/utils/queryenvironment.h b/src/include/utils/queryenvironment.h
index 08e6051b4e..34fde6401f 100644
--- a/src/include/utils/queryenvironment.h
+++ b/src/include/utils/queryenvironment.h
@@ -4,7 +4,7 @@
  *	  Access to functions to mutate the query environment and retrieve the
  *	  actual data related to entries (if any).
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/queryenvironment.h
diff --git a/src/include/utils/rangetypes.h b/src/include/utils/rangetypes.h
index 5544889317..83e94e005b 100644
--- a/src/include/utils/rangetypes.h
+++ b/src/include/utils/rangetypes.h
@@ -4,7 +4,7 @@
  *	  Declarations for Postgres range types.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/rangetypes.h
@@ -68,12 +68,12 @@ typedef struct
 /*
  * fmgr macros for range type objects
  */
-#define DatumGetRangeType(X)		((RangeType *) PG_DETOAST_DATUM(X))
-#define DatumGetRangeTypeCopy(X)	((RangeType *) PG_DETOAST_DATUM_COPY(X))
-#define RangeTypeGetDatum(X)		PointerGetDatum(X)
-#define PG_GETARG_RANGE(n)			DatumGetRangeType(PG_GETARG_DATUM(n))
-#define PG_GETARG_RANGE_COPY(n)		DatumGetRangeTypeCopy(PG_GETARG_DATUM(n))
-#define PG_RETURN_RANGE(x)			return RangeTypeGetDatum(x)
+#define DatumGetRangeTypeP(X)		((RangeType *) PG_DETOAST_DATUM(X))
+#define DatumGetRangeTypePCopy(X)	((RangeType *) PG_DETOAST_DATUM_COPY(X))
+#define RangeTypePGetDatum(X)		PointerGetDatum(X)
+#define PG_GETARG_RANGE_P(n)		DatumGetRangeTypeP(PG_GETARG_DATUM(n))
+#define PG_GETARG_RANGE_P_COPY(n)	DatumGetRangeTypePCopy(PG_GETARG_DATUM(n))
+#define PG_RETURN_RANGE_P(x)		return RangeTypePGetDatum(x)
 
 /* Operator strategy numbers used in the GiST and SP-GiST range opclasses */
 /* Numbers are chosen to match up operator names with existing usages */
diff --git a/src/include/utils/regproc.h b/src/include/utils/regproc.h
index ba46bd7d58..5b9a8cbee8 100644
--- a/src/include/utils/regproc.h
+++ b/src/include/utils/regproc.h
@@ -3,7 +3,7 @@
  * regproc.h
  *	  Functions for the built-in types regproc, regclass, regtype, etc.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/regproc.h
diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h
index 4bc61e5380..aa8add544a 100644
--- a/src/include/utils/rel.h
+++ b/src/include/utils/rel.h
@@ -4,7 +4,7 @@
  *	  POSTGRES relation descriptor (a/k/a relcache entry) definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/rel.h
@@ -277,6 +277,7 @@ typedef struct StdRdOptions
 {
 	int32		vl_len_;		/* varlena header (do not touch directly!) */
 	int			fillfactor;		/* page fill factor in percent (0..100) */
+	int			toast_tuple_target; /* target for tuple toasting */
 	AutoVacOpts autovacuum;		/* autovacuum-related options */
 	bool		user_catalog_table; /* use as an additional catalog relation */
 	int			parallel_workers;	/* max number of parallel workers */
@@ -285,6 +286,14 @@ typedef struct StdRdOptions
 #define HEAP_MIN_FILLFACTOR			10
 #define HEAP_DEFAULT_FILLFACTOR		100
 
+/*
+ * RelationGetToastTupleTarget
+ *		Returns the relation's toast_tuple_target.  Note multiple eval of argument!
+ */
+#define RelationGetToastTupleTarget(relation, defaulttarg) \
+	((relation)->rd_options ? \
+	 ((StdRdOptions *) (relation)->rd_options)->toast_tuple_target : (defaulttarg))
+
 /*
  * RelationGetFillFactor
  *		Returns the relation's fillfactor.  Note multiple eval of argument!
diff --git a/src/include/utils/relcache.h b/src/include/utils/relcache.h
index 3c53cefe4b..8a546aba28 100644
--- a/src/include/utils/relcache.h
+++ b/src/include/utils/relcache.h
@@ -4,7 +4,7 @@
  *	  Relation descriptor cache definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/relcache.h
@@ -18,6 +18,11 @@
 #include "nodes/bitmapset.h"
 
 
+/*
+ * Name of relcache init file(s), used to speed up backend startup
+ */
+#define RELCACHE_INIT_FILENAME	"pg_internal.init"
+
 typedef struct RelationData *Relation;
 
 /* ----------------
diff --git a/src/include/utils/relfilenodemap.h b/src/include/utils/relfilenodemap.h
index b3ee555fb7..e79115d34f 100644
--- a/src/include/utils/relfilenodemap.h
+++ b/src/include/utils/relfilenodemap.h
@@ -3,7 +3,7 @@
  * relfilenodemap.h
  *	  relfilenode to oid mapping cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/relfilenodemap.h
diff --git a/src/include/utils/relmapper.h b/src/include/utils/relmapper.h
index 7af69ba6cf..f69b1006bf 100644
--- a/src/include/utils/relmapper.h
+++ b/src/include/utils/relmapper.h
@@ -4,7 +4,7 @@
  *	  Catalog-to-filenode mapping
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/relmapper.h
diff --git a/src/include/utils/relptr.h b/src/include/utils/relptr.h
index 06e592e0c6..4b74571e91 100644
--- a/src/include/utils/relptr.h
+++ b/src/include/utils/relptr.h
@@ -3,7 +3,7 @@
  * relptr.h
  *	  This file contains basic declarations for relative pointers.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/relptr.h
diff --git a/src/include/utils/reltrigger.h b/src/include/utils/reltrigger.h
index 2169b0306b..9b4dc7f810 100644
--- a/src/include/utils/reltrigger.h
+++ b/src/include/utils/reltrigger.h
@@ -4,7 +4,7 @@
  *	  POSTGRES relation trigger definitions.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/reltrigger.h
diff --git a/src/include/utils/resowner.h b/src/include/utils/resowner.h
index 07d30d93bc..fe7f49119b 100644
--- a/src/include/utils/resowner.h
+++ b/src/include/utils/resowner.h
@@ -9,7 +9,7 @@
  * See utils/resowner/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/resowner.h
diff --git a/src/include/utils/resowner_private.h b/src/include/utils/resowner_private.h
index 2420b651b3..22b377c0df 100644
--- a/src/include/utils/resowner_private.h
+++ b/src/include/utils/resowner_private.h
@@ -6,7 +6,7 @@
  * See utils/resowner/README for more info.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/resowner_private.h
diff --git a/src/include/utils/rls.h b/src/include/utils/rls.h
index f9780ad0c0..f3b4858333 100644
--- a/src/include/utils/rls.h
+++ b/src/include/utils/rls.h
@@ -4,7 +4,7 @@
  *	  Header file for Row Level Security (RLS) utility commands to be used
  *	  with the rowsecurity feature.
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * src/include/utils/rls.h
  *
diff --git a/src/include/utils/ruleutils.h b/src/include/utils/ruleutils.h
index e9c5193855..9f9b029ab8 100644
--- a/src/include/utils/ruleutils.h
+++ b/src/include/utils/ruleutils.h
@@ -3,7 +3,7 @@
  * ruleutils.h
  *		Declarations for ruleutils.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/ruleutils.h
diff --git a/src/include/utils/sampling.h b/src/include/utils/sampling.h
index f566e0b866..c82148515d 100644
--- a/src/include/utils/sampling.h
+++ b/src/include/utils/sampling.h
@@ -3,7 +3,7 @@
  * sampling.h
  *	  definitions for sampling functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/sampling.h
diff --git a/src/include/utils/selfuncs.h b/src/include/utils/selfuncs.h
index dc6069d435..299c9f846a 100644
--- a/src/include/utils/selfuncs.h
+++ b/src/include/utils/selfuncs.h
@@ -5,7 +5,7 @@
  *	  infrastructure for selectivity and cost estimation.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/selfuncs.h
@@ -81,7 +81,7 @@ typedef struct VariableStatData
 #define ReleaseVariableStats(vardata)  \
 	do { \
 		if (HeapTupleIsValid((vardata).statsTuple)) \
-			(* (vardata).freefunc) ((vardata).statsTuple); \
+			(vardata).freefunc((vardata).statsTuple); \
 	} while(0)
 
 
diff --git a/src/include/utils/sharedtuplestore.h b/src/include/utils/sharedtuplestore.h
new file mode 100644
index 0000000000..834773511d
--- /dev/null
+++ b/src/include/utils/sharedtuplestore.h
@@ -0,0 +1,61 @@
+/*-------------------------------------------------------------------------
+ *
+ * sharedtuplestore.h
+ *	  Simple mechinism for sharing tuples between backends.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * src/include/utils/sharedtuplestore.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#ifndef SHAREDTUPLESTORE_H
+#define SHAREDTUPLESTORE_H
+
+#include "access/htup.h"
+#include "storage/fd.h"
+#include "storage/sharedfileset.h"
+
+struct SharedTuplestore;
+typedef struct SharedTuplestore SharedTuplestore;
+
+struct SharedTuplestoreAccessor;
+typedef struct SharedTuplestoreAccessor SharedTuplestoreAccessor;
+
+/*
+ * A flag indicating that the tuplestore will only be scanned once, so backing
+ * files can be unlinked early.
+ */
+#define SHARED_TUPLESTORE_SINGLE_PASS 0x01
+
+extern size_t sts_estimate(int participants);
+
+extern SharedTuplestoreAccessor *sts_initialize(SharedTuplestore *sts,
+			   int participants,
+			   int my_participant_number,
+			   size_t meta_data_size,
+			   int flags,
+			   SharedFileSet *fileset,
+			   const char *name);
+
+extern SharedTuplestoreAccessor *sts_attach(SharedTuplestore *sts,
+		   int my_participant_number,
+		   SharedFileSet *fileset);
+
+extern void sts_end_write(SharedTuplestoreAccessor *accessor);
+
+extern void sts_reinitialize(SharedTuplestoreAccessor *accessor);
+
+extern void sts_begin_parallel_scan(SharedTuplestoreAccessor *accessor);
+
+extern void sts_end_parallel_scan(SharedTuplestoreAccessor *accessor);
+
+extern void sts_puttuple(SharedTuplestoreAccessor *accessor,
+			 void *meta_data,
+			 MinimalTuple tuple);
+
+extern MinimalTuple sts_parallel_scan_next(SharedTuplestoreAccessor *accessor,
+					   void *meta_data);
+
+#endif							/* SHAREDTUPLESTORE_H */
diff --git a/src/include/utils/snapmgr.h b/src/include/utils/snapmgr.h
index fc64153780..83806f3040 100644
--- a/src/include/utils/snapmgr.h
+++ b/src/include/utils/snapmgr.h
@@ -3,7 +3,7 @@
  * snapmgr.h
  *	  POSTGRES snapshot manager
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/snapmgr.h
@@ -56,10 +56,10 @@ extern TimestampTz GetOldSnapshotThresholdTimestamp(void);
 
 extern bool FirstSnapshotSet;
 
-extern TransactionId TransactionXmin;
-extern TransactionId RecentXmin;
+extern PGDLLIMPORT TransactionId TransactionXmin;
+extern PGDLLIMPORT TransactionId RecentXmin;
 extern PGDLLIMPORT TransactionId RecentGlobalXmin;
-extern TransactionId RecentGlobalDataXmin;
+extern PGDLLIMPORT TransactionId RecentGlobalDataXmin;
 
 extern Snapshot GetTransactionSnapshot(void);
 extern Snapshot GetLatestSnapshot(void);
diff --git a/src/include/utils/snapshot.h b/src/include/utils/snapshot.h
index 074cc81864..a8a5a8f4c0 100644
--- a/src/include/utils/snapshot.h
+++ b/src/include/utils/snapshot.h
@@ -3,7 +3,7 @@
  * snapshot.h
  *	  POSTGRES snapshot definition
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/snapshot.h
@@ -41,6 +41,7 @@ typedef bool (*SnapshotSatisfiesFunc) (HeapTuple htup,
  * * MVCC snapshots taken during recovery (in Hot-Standby mode)
  * * Historic MVCC snapshots used during logical decoding
  * * snapshots passed to HeapTupleSatisfiesDirty()
+ * * snapshots passed to HeapTupleSatisfiesNonVacuumable()
  * * snapshots used for SatisfiesAny, Toast, Self where no members are
  *	 accessed.
  *
@@ -56,7 +57,8 @@ typedef struct SnapshotData
 	/*
 	 * The remaining fields are used only for MVCC snapshots, and are normally
 	 * just zeroes in special snapshots.  (But xmin and xmax are used
-	 * specially by HeapTupleSatisfiesDirty.)
+	 * specially by HeapTupleSatisfiesDirty, and xmin is used specially by
+	 * HeapTupleSatisfiesNonVacuumable.)
 	 *
 	 * An MVCC snapshot can never see the effects of XIDs >= xmax. It can see
 	 * the effects of all older XIDs except those listed in the snapshot. xmin
diff --git a/src/include/utils/sortsupport.h b/src/include/utils/sortsupport.h
index 6e8444b4ff..53b692e9a2 100644
--- a/src/include/utils/sortsupport.h
+++ b/src/include/utils/sortsupport.h
@@ -42,7 +42,7 @@
  * function for such cases, but probably not any other acceleration method.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/sortsupport.h
@@ -222,7 +222,7 @@ ApplySortComparator(Datum datum1, bool isNull1,
 	}
 	else
 	{
-		compare = (*ssup->comparator) (datum1, datum2, ssup);
+		compare = ssup->comparator(datum1, datum2, ssup);
 		if (ssup->ssup_reverse)
 			compare = -compare;
 	}
@@ -260,7 +260,7 @@ ApplySortAbbrevFullComparator(Datum datum1, bool isNull1,
 	}
 	else
 	{
-		compare = (*ssup->abbrev_full_comparator) (datum1, datum2, ssup);
+		compare = ssup->abbrev_full_comparator(datum1, datum2, ssup);
 		if (ssup->ssup_reverse)
 			compare = -compare;
 	}
diff --git a/src/include/utils/spccache.h b/src/include/utils/spccache.h
index 7c45bb11eb..2f30c982b2 100644
--- a/src/include/utils/spccache.h
+++ b/src/include/utils/spccache.h
@@ -3,7 +3,7 @@
  * spccache.h
  *	  Tablespace cache.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/spccache.h
diff --git a/src/include/utils/syscache.h b/src/include/utils/syscache.h
index 8352b40f4e..4f333586ee 100644
--- a/src/include/utils/syscache.h
+++ b/src/include/utils/syscache.h
@@ -6,7 +6,7 @@
  * See also lsyscache.h, which provides convenience routines for
  * common cache-lookup operations.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/syscache.h
@@ -117,6 +117,20 @@ extern void InitCatalogCachePhase2(void);
 
 extern HeapTuple SearchSysCache(int cacheId,
 			   Datum key1, Datum key2, Datum key3, Datum key4);
+
+/*
+ * The use of argument specific numbers is encouraged. They're faster, and
+ * insulates the caller from changes in the maximum number of keys.
+ */
+extern HeapTuple SearchSysCache1(int cacheId,
+				Datum key1);
+extern HeapTuple SearchSysCache2(int cacheId,
+				Datum key1, Datum key2);
+extern HeapTuple SearchSysCache3(int cacheId,
+				Datum key1, Datum key2, Datum key3);
+extern HeapTuple SearchSysCache4(int cacheId,
+				Datum key1, Datum key2, Datum key3, Datum key4);
+
 extern void ReleaseSysCache(HeapTuple tuple);
 
 /* convenience routines */
@@ -131,6 +145,9 @@ extern HeapTuple SearchSysCacheAttName(Oid relid, const char *attname);
 extern HeapTuple SearchSysCacheCopyAttName(Oid relid, const char *attname);
 extern bool SearchSysCacheExistsAttName(Oid relid, const char *attname);
 
+extern HeapTuple SearchSysCacheAttNum(Oid relid, int16 attnum);
+extern HeapTuple SearchSysCacheCopyAttNum(Oid relid, int16 attnum);
+
 extern Datum SysCacheGetAttr(int cacheId, HeapTuple tup,
 				AttrNumber attributeNumber, bool *isNull);
 
@@ -140,7 +157,7 @@ extern uint32 GetSysCacheHashValue(int cacheId,
 /* list-search interface.  Users of this must import catcache.h too */
 struct catclist;
 extern struct catclist *SearchSysCacheList(int cacheId, int nkeys,
-				   Datum key1, Datum key2, Datum key3, Datum key4);
+				   Datum key1, Datum key2, Datum key3);
 
 extern void SysCacheInvalidate(int cacheId, uint32 hashValue);
 
@@ -153,15 +170,6 @@ extern bool RelationSupportsSysCache(Oid relid);
  * functions is encouraged, as it insulates the caller from changes in the
  * maximum number of keys.
  */
-#define SearchSysCache1(cacheId, key1) \
-	SearchSysCache(cacheId, key1, 0, 0, 0)
-#define SearchSysCache2(cacheId, key1, key2) \
-	SearchSysCache(cacheId, key1, key2, 0, 0)
-#define SearchSysCache3(cacheId, key1, key2, key3) \
-	SearchSysCache(cacheId, key1, key2, key3, 0)
-#define SearchSysCache4(cacheId, key1, key2, key3, key4) \
-	SearchSysCache(cacheId, key1, key2, key3, key4)
-
 #define SearchSysCacheCopy1(cacheId, key1) \
 	SearchSysCacheCopy(cacheId, key1, 0, 0, 0)
 #define SearchSysCacheCopy2(cacheId, key1, key2) \
@@ -199,13 +207,11 @@ extern bool RelationSupportsSysCache(Oid relid);
 	GetSysCacheHashValue(cacheId, key1, key2, key3, key4)
 
 #define SearchSysCacheList1(cacheId, key1) \
-	SearchSysCacheList(cacheId, 1, key1, 0, 0, 0)
+	SearchSysCacheList(cacheId, 1, key1, 0, 0)
 #define SearchSysCacheList2(cacheId, key1, key2) \
-	SearchSysCacheList(cacheId, 2, key1, key2, 0, 0)
+	SearchSysCacheList(cacheId, 2, key1, key2, 0)
 #define SearchSysCacheList3(cacheId, key1, key2, key3) \
-	SearchSysCacheList(cacheId, 3, key1, key2, key3, 0)
-#define SearchSysCacheList4(cacheId, key1, key2, key3, key4) \
-	SearchSysCacheList(cacheId, 4, key1, key2, key3, key4)
+	SearchSysCacheList(cacheId, 3, key1, key2, key3)
 
 #define ReleaseSysCacheList(x)	ReleaseCatCacheList(x)
 
diff --git a/src/include/utils/timeout.h b/src/include/utils/timeout.h
index 5a2efc0dd9..dcc7307c16 100644
--- a/src/include/utils/timeout.h
+++ b/src/include/utils/timeout.h
@@ -4,7 +4,7 @@
  *	  Routines to multiplex SIGALRM interrupts for multiple timeout reasons.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/timeout.h
diff --git a/src/include/utils/timestamp.h b/src/include/utils/timestamp.h
index 3f2d31dec8..2b3b35703e 100644
--- a/src/include/utils/timestamp.h
+++ b/src/include/utils/timestamp.h
@@ -3,7 +3,7 @@
  * timestamp.h
  *	  Definitions for the SQL "timestamp" and "interval" types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/timestamp.h
diff --git a/src/include/utils/tqual.h b/src/include/utils/tqual.h
index 036d9898d6..d3b6e99bb4 100644
--- a/src/include/utils/tqual.h
+++ b/src/include/utils/tqual.h
@@ -5,7 +5,7 @@
  *
  *	  Should be moved/renamed...    - vadim 07/28/98
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/tqual.h
@@ -66,6 +66,8 @@ extern bool HeapTupleSatisfiesToast(HeapTuple htup,
 						Snapshot snapshot, Buffer buffer);
 extern bool HeapTupleSatisfiesDirty(HeapTuple htup,
 						Snapshot snapshot, Buffer buffer);
+extern bool HeapTupleSatisfiesNonVacuumable(HeapTuple htup,
+								Snapshot snapshot, Buffer buffer);
 extern bool HeapTupleSatisfiesHistoricMVCC(HeapTuple htup,
 							   Snapshot snapshot, Buffer buffer);
 
@@ -76,6 +78,7 @@ extern HTSV_Result HeapTupleSatisfiesVacuum(HeapTuple htup,
 						 TransactionId OldestXmin, Buffer buffer);
 extern bool HeapTupleIsSurelyDead(HeapTuple htup,
 					  TransactionId OldestXmin);
+extern bool XidInMVCCSnapshot(TransactionId xid, Snapshot snapshot);
 
 extern void HeapTupleSetHintBits(HeapTupleHeader tuple, Buffer buffer,
 					 uint16 infomask, TransactionId xid);
@@ -100,6 +103,14 @@ extern bool ResolveCminCmaxDuringDecoding(struct HTAB *tuplecid_data,
 #define InitDirtySnapshot(snapshotdata)  \
 	((snapshotdata).satisfies = HeapTupleSatisfiesDirty)
 
+/*
+ * Similarly, some initialization is required for a NonVacuumable snapshot.
+ * The caller must supply the xmin horizon to use (e.g., RecentGlobalXmin).
+ */
+#define InitNonVacuumableSnapshot(snapshotdata, xmin_horizon)  \
+	((snapshotdata).satisfies = HeapTupleSatisfiesNonVacuumable, \
+	 (snapshotdata).xmin = (xmin_horizon))
+
 /*
  * Similarly, some initialization is required for SnapshotToast.  We need
  * to set lsn and whenTaken correctly to support snapshot_too_old.
diff --git a/src/include/utils/tuplesort.h b/src/include/utils/tuplesort.h
index 28c168a801..d2e6754f04 100644
--- a/src/include/utils/tuplesort.h
+++ b/src/include/utils/tuplesort.h
@@ -8,9 +8,10 @@
  * if necessary).  It works efficiently for both small and large amounts
  * of data.  Small amounts are sorted in-memory using qsort().  Large
  * amounts are sorted using temporary files and a standard external sort
- * algorithm.
+ * algorithm.  Parallel sorts use a variant of this external sort
+ * algorithm, and are typically only used for large amounts of data.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/tuplesort.h
@@ -23,13 +24,67 @@
 #include "access/itup.h"
 #include "executor/tuptable.h"
 #include "fmgr.h"
+#include "storage/dsm.h"
 #include "utils/relcache.h"
 
 
-/* Tuplesortstate is an opaque type whose details are not known outside
- * tuplesort.c.
+/*
+ * Tuplesortstate and Sharedsort are opaque types whose details are not
+ * known outside tuplesort.c.
  */
 typedef struct Tuplesortstate Tuplesortstate;
+typedef struct Sharedsort Sharedsort;
+
+/*
+ * Tuplesort parallel coordination state, allocated by each participant in
+ * local memory.  Participant caller initializes everything.  See usage notes
+ * below.
+ */
+typedef struct SortCoordinateData
+{
+	/* Worker process?  If not, must be leader. */
+	bool		isWorker;
+
+	/*
+	 * Leader-process-passed number of participants known launched (workers
+	 * set this to -1).  Includes state within leader needed for it to
+	 * participate as a worker, if any.
+	 */
+	int			nParticipants;
+
+	/* Private opaque state (points to shared memory) */
+	Sharedsort *sharedsort;
+} SortCoordinateData;
+
+typedef struct SortCoordinateData *SortCoordinate;
+
+/*
+ * Data structures for reporting sort statistics.  Note that
+ * TuplesortInstrumentation can't contain any pointers because we
+ * sometimes put it in shared memory.
+ */
+typedef enum
+{
+	SORT_TYPE_STILL_IN_PROGRESS = 0,
+	SORT_TYPE_TOP_N_HEAPSORT,
+	SORT_TYPE_QUICKSORT,
+	SORT_TYPE_EXTERNAL_SORT,
+	SORT_TYPE_EXTERNAL_MERGE
+} TuplesortMethod;
+
+typedef enum
+{
+	SORT_SPACE_TYPE_DISK,
+	SORT_SPACE_TYPE_MEMORY
+} TuplesortSpaceType;
+
+typedef struct TuplesortInstrumentation
+{
+	TuplesortMethod sortMethod; /* sort algorithm used */
+	TuplesortSpaceType spaceType;	/* type of space spaceUsed represents */
+	long		spaceUsed;		/* space consumption, in kB */
+} TuplesortInstrumentation;
+
 
 /*
  * We provide multiple interfaces to what is essentially the same code,
@@ -38,6 +93,8 @@ typedef struct Tuplesortstate Tuplesortstate;
  * sorting HeapTuples and two more for sorting IndexTuples.  Yet another
  * API supports sorting bare Datums.
  *
+ * Serial sort callers should pass NULL for their coordinate argument.
+ *
  * The "heap" API actually stores/sorts MinimalTuples, which means it doesn't
  * preserve the system columns (tuple identity and transaction visibility
  * info).  The sort keys are specified by column numbers within the tuples
@@ -56,30 +113,107 @@ typedef struct Tuplesortstate Tuplesortstate;
  *
  * The "index_hash" API is similar to index_btree, but the tuples are
  * actually sorted by their hash codes not the raw data.
+ *
+ * Parallel sort callers are required to coordinate multiple tuplesort states
+ * in a leader process and one or more worker processes.  The leader process
+ * must launch workers, and have each perform an independent "partial"
+ * tuplesort, typically fed by the parallel heap interface.  The leader later
+ * produces the final output (internally, it merges runs output by workers).
+ *
+ * Callers must do the following to perform a sort in parallel using multiple
+ * worker processes:
+ *
+ * 1. Request tuplesort-private shared memory for n workers.  Use
+ *    tuplesort_estimate_shared() to get the required size.
+ * 2. Have leader process initialize allocated shared memory using
+ *    tuplesort_initialize_shared().  Launch workers.
+ * 3. Initialize a coordinate argument within both the leader process, and
+ *    for each worker process.  This has a pointer to the shared
+ *    tuplesort-private structure, as well as some caller-initialized fields.
+ *    Leader's coordinate argument reliably indicates number of workers
+ *    launched (this is unused by workers).
+ * 4. Begin a tuplesort using some appropriate tuplesort_begin* routine,
+ *    (passing the coordinate argument) within each worker.  The workMem
+ *    arguments need not be identical.  All other arguments should match
+ *    exactly, though.
+ * 5. tuplesort_attach_shared() should be called by all workers.  Feed tuples
+ *    to each worker, and call tuplesort_performsort() within each when input
+ *    is exhausted.
+ * 6. Call tuplesort_end() in each worker process.  Worker processes can shut
+ *    down once tuplesort_end() returns.
+ * 7. Begin a tuplesort in the leader using the same tuplesort_begin*
+ *    routine, passing a leader-appropriate coordinate argument (this can
+ *    happen as early as during step 3, actually, since we only need to know
+ *    the number of workers successfully launched).  The leader must now wait
+ *    for workers to finish.  Caller must use own mechanism for ensuring that
+ *    next step isn't reached until all workers have called and returned from
+ *    tuplesort_performsort().  (Note that it's okay if workers have already
+ *    also called tuplesort_end() by then.)
+ * 8. Call tuplesort_performsort() in leader.  Consume output using the
+ *    appropriate tuplesort_get* routine.  Leader can skip this step if
+ *    tuplesort turns out to be unnecessary.
+ * 9. Call tuplesort_end() in leader.
+ *
+ * This division of labor assumes nothing about how input tuples are produced,
+ * but does require that caller combine the state of multiple tuplesorts for
+ * any purpose other than producing the final output.  For example, callers
+ * must consider that tuplesort_get_stats() reports on only one worker's role
+ * in a sort (or the leader's role), and not statistics for the sort as a
+ * whole.
+ *
+ * Note that callers may use the leader process to sort runs as if it was an
+ * independent worker process (prior to the process performing a leader sort
+ * to produce the final sorted output).  Doing so only requires a second
+ * "partial" tuplesort within the leader process, initialized like that of a
+ * worker process.  The steps above don't touch on this directly.  The only
+ * difference is that the tuplesort_attach_shared() call is never needed within
+ * leader process, because the backend as a whole holds the shared fileset
+ * reference.  A worker Tuplesortstate in leader is expected to do exactly the
+ * same amount of total initial processing work as a worker process
+ * Tuplesortstate, since the leader process has nothing else to do before
+ * workers finish.
+ *
+ * Note that only a very small amount of memory will be allocated prior to
+ * the leader state first consuming input, and that workers will free the
+ * vast majority of their memory upon returning from tuplesort_performsort().
+ * Callers can rely on this to arrange for memory to be used in a way that
+ * respects a workMem-style budget across an entire parallel sort operation.
+ *
+ * Callers are responsible for parallel safety in general.  However, they
+ * can at least rely on there being no parallel safety hazards within
+ * tuplesort, because tuplesort thinks of the sort as several independent
+ * sorts whose results are combined.  Since, in general, the behavior of
+ * sort operators is immutable, caller need only worry about the parallel
+ * safety of whatever the process is through which input tuples are
+ * generated (typically, caller uses a parallel heap scan).
  */
 
 extern Tuplesortstate *tuplesort_begin_heap(TupleDesc tupDesc,
 					 int nkeys, AttrNumber *attNums,
 					 Oid *sortOperators, Oid *sortCollations,
 					 bool *nullsFirstFlags,
-					 int workMem, bool randomAccess);
+					 int workMem, SortCoordinate coordinate,
+					 bool randomAccess);
 extern Tuplesortstate *tuplesort_begin_cluster(TupleDesc tupDesc,
-						Relation indexRel,
-						int workMem, bool randomAccess);
+						Relation indexRel, int workMem,
+						SortCoordinate coordinate, bool randomAccess);
 extern Tuplesortstate *tuplesort_begin_index_btree(Relation heapRel,
 							Relation indexRel,
 							bool enforceUnique,
-							int workMem, bool randomAccess);
+							int workMem, SortCoordinate coordinate,
+							bool randomAccess);
 extern Tuplesortstate *tuplesort_begin_index_hash(Relation heapRel,
 						   Relation indexRel,
 						   uint32 high_mask,
 						   uint32 low_mask,
 						   uint32 max_buckets,
-						   int workMem, bool randomAccess);
+						   int workMem, SortCoordinate coordinate,
+						   bool randomAccess);
 extern Tuplesortstate *tuplesort_begin_datum(Oid datumType,
 					  Oid sortOperator, Oid sortCollation,
 					  bool nullsFirstFlag,
-					  int workMem, bool randomAccess);
+					  int workMem, SortCoordinate coordinate,
+					  bool randomAccess);
 
 extern void tuplesort_set_bound(Tuplesortstate *state, int64 bound);
 
@@ -107,16 +241,22 @@ extern bool tuplesort_skiptuples(Tuplesortstate *state, int64 ntuples,
 extern void tuplesort_end(Tuplesortstate *state);
 
 extern void tuplesort_get_stats(Tuplesortstate *state,
-					const char **sortMethod,
-					const char **spaceType,
-					long *spaceUsed);
+					TuplesortInstrumentation *stats);
+extern const char *tuplesort_method_name(TuplesortMethod m);
+extern const char *tuplesort_space_type_name(TuplesortSpaceType t);
 
 extern int	tuplesort_merge_order(int64 allowedMem);
 
+extern Size tuplesort_estimate_shared(int nworkers);
+extern void tuplesort_initialize_shared(Sharedsort *shared, int nWorkers,
+							dsm_segment *seg);
+extern void tuplesort_attach_shared(Sharedsort *shared, dsm_segment *seg);
+
 /*
  * These routines may only be called if randomAccess was specified 'true'.
  * Likewise, backwards scan in gettuple/getdatum is only allowed if
- * randomAccess was specified.
+ * randomAccess was specified.  Note that parallel sorts do not support
+ * randomAccess.
  */
 
 extern void tuplesort_rescan(Tuplesortstate *state);
diff --git a/src/include/utils/tuplestore.h b/src/include/utils/tuplestore.h
index 7f4e1e318f..2c0c3f8219 100644
--- a/src/include/utils/tuplestore.h
+++ b/src/include/utils/tuplestore.h
@@ -21,7 +21,7 @@
  * Also, we have changed the API to return tuples in TupleTableSlots,
  * so that there is a check to prevent attempted access to system columns.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/tuplestore.h
diff --git a/src/include/utils/typcache.h b/src/include/utils/typcache.h
index c12631dafe..217d064da5 100644
--- a/src/include/utils/typcache.h
+++ b/src/include/utils/typcache.h
@@ -6,7 +6,7 @@
  * The type cache exists to speed lookup of certain information about data
  * types that is not directly available from a type's pg_type row.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/typcache.h
@@ -18,6 +18,8 @@
 
 #include "access/tupdesc.h"
 #include "fmgr.h"
+#include "storage/dsm.h"
+#include "utils/dsa.h"
 
 
 /* DomainConstraintCache is an opaque struct known only within typcache.c */
@@ -38,6 +40,7 @@ typedef struct TypeCacheEntry
 	char		typstorage;
 	char		typtype;
 	Oid			typrelid;
+	Oid			typelem;
 
 	/*
 	 * Information obtained from opfamily entries
@@ -56,6 +59,7 @@ typedef struct TypeCacheEntry
 	Oid			gt_opr;			/* the greater-than operator */
 	Oid			cmp_proc;		/* the btree comparison function */
 	Oid			hash_proc;		/* the hash calculation function */
+	Oid			hash_extended_proc; /* the extended hash calculation function */
 
 	/*
 	 * Pre-set-up fmgr call info for the equality operator, the btree
@@ -67,13 +71,19 @@ typedef struct TypeCacheEntry
 	FmgrInfo	eq_opr_finfo;
 	FmgrInfo	cmp_proc_finfo;
 	FmgrInfo	hash_proc_finfo;
+	FmgrInfo	hash_extended_proc_finfo;
 
 	/*
 	 * Tuple descriptor if it's a composite type (row type).  NULL if not
 	 * composite or information hasn't yet been requested.  (NOTE: this is a
 	 * reference-counted tupledesc.)
+	 *
+	 * To simplify caching dependent info, tupDesc_identifier is an identifier
+	 * for this tupledesc that is unique for the life of the process, and
+	 * changes anytime the tupledesc does.  Zero if not yet determined.
 	 */
 	TupleDesc	tupDesc;
+	uint64		tupDesc_identifier;
 
 	/*
 	 * Fields computed when TYPECACHE_RANGE_INFO is requested.  Zeroes if not
@@ -87,6 +97,13 @@ typedef struct TypeCacheEntry
 	FmgrInfo	rng_canonical_finfo;	/* canonicalization function, if any */
 	FmgrInfo	rng_subdiff_finfo;	/* difference function, if any */
 
+	/*
+	 * Domain's base type and typmod if it's a domain type.  Zeroes if not
+	 * domain, or if information hasn't been requested.
+	 */
+	Oid			domainBaseType;
+	int32		domainBaseTypmod;
+
 	/*
 	 * Domain constraint data if it's a domain type.  NULL if not domain, or
 	 * if domain has no constraints, or if information hasn't been requested.
@@ -119,7 +136,13 @@ typedef struct TypeCacheEntry
 #define TYPECACHE_BTREE_OPFAMILY	0x0200
 #define TYPECACHE_HASH_OPFAMILY		0x0400
 #define TYPECACHE_RANGE_INFO		0x0800
-#define TYPECACHE_DOMAIN_INFO		0x1000
+#define TYPECACHE_DOMAIN_BASE_INFO			0x1000
+#define TYPECACHE_DOMAIN_CONSTR_INFO		0x2000
+#define TYPECACHE_HASH_EXTENDED_PROC		0x4000
+#define TYPECACHE_HASH_EXTENDED_PROC_FINFO	0x8000
+
+/* This value will not equal any valid tupledesc identifier, nor 0 */
+#define INVALID_TUPLEDESC_IDENTIFIER ((uint64) 1)
 
 /*
  * Callers wishing to maintain a long-lived reference to a domain's constraint
@@ -139,6 +162,7 @@ typedef struct DomainConstraintRef
 	MemoryContextCallback callback; /* used to release refcount when done */
 } DomainConstraintRef;
 
+typedef struct SharedRecordTypmodRegistry SharedRecordTypmodRegistry;
 
 extern TypeCacheEntry *lookup_type_cache(Oid type_id, int flags);
 
@@ -156,8 +180,20 @@ extern TupleDesc lookup_rowtype_tupdesc_noerror(Oid type_id, int32 typmod,
 
 extern TupleDesc lookup_rowtype_tupdesc_copy(Oid type_id, int32 typmod);
 
+extern TupleDesc lookup_rowtype_tupdesc_domain(Oid type_id, int32 typmod,
+							  bool noError);
+
 extern void assign_record_type_typmod(TupleDesc tupDesc);
 
+extern uint64 assign_record_type_identifier(Oid type_id, int32 typmod);
+
 extern int	compare_values_of_enum(TypeCacheEntry *tcache, Oid arg1, Oid arg2);
 
+extern size_t SharedRecordTypmodRegistryEstimate(void);
+
+extern void SharedRecordTypmodRegistryInit(SharedRecordTypmodRegistry *,
+							   dsm_segment *segment, dsa_area *area);
+
+extern void SharedRecordTypmodRegistryAttach(SharedRecordTypmodRegistry *);
+
 #endif							/* TYPCACHE_H */
diff --git a/src/include/utils/tzparser.h b/src/include/utils/tzparser.h
index 1e444e1159..5a16d12103 100644
--- a/src/include/utils/tzparser.h
+++ b/src/include/utils/tzparser.h
@@ -3,7 +3,7 @@
  * tzparser.h
  *	  Timezone offset file parsing definitions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/tzparser.h
diff --git a/src/include/utils/uuid.h b/src/include/utils/uuid.h
index ed3ec28959..312c8c48c6 100644
--- a/src/include/utils/uuid.h
+++ b/src/include/utils/uuid.h
@@ -5,7 +5,7 @@
  *	  to avoid conflicts with any uuid_t type that might be defined by
  *	  the system headers.
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * src/include/utils/uuid.h
  *
diff --git a/src/include/utils/varbit.h b/src/include/utils/varbit.h
index 2a4ec67698..3278cb5461 100644
--- a/src/include/utils/varbit.h
+++ b/src/include/utils/varbit.h
@@ -5,7 +5,7 @@
  *
  * Code originally contributed by Adriaan Joubert.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/varbit.h
diff --git a/src/include/utils/varlena.h b/src/include/utils/varlena.h
index cab82ee888..90e131a3a0 100644
--- a/src/include/utils/varlena.h
+++ b/src/include/utils/varlena.h
@@ -3,7 +3,7 @@
  * varlena.h
  *	  Functions for the variable-length built-in types.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/varlena.h
@@ -16,7 +16,7 @@
 #include "nodes/pg_list.h"
 #include "utils/sortsupport.h"
 
-extern int	varstr_cmp(char *arg1, int len1, char *arg2, int len2, Oid collid);
+extern int	varstr_cmp(const char *arg1, int len1, const char *arg2, int len2, Oid collid);
 extern void varstr_sortsupport(SortSupport ssup, Oid collid, bool bpchar);
 extern int varstr_levenshtein(const char *source, int slen,
 				   const char *target, int tlen,
diff --git a/src/include/utils/xml.h b/src/include/utils/xml.h
index e6fa0e2051..fe488da42e 100644
--- a/src/include/utils/xml.h
+++ b/src/include/utils/xml.h
@@ -4,7 +4,7 @@
  *	  Declarations for XML data type support.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/include/utils/xml.h
@@ -65,14 +65,14 @@ extern xmltype *xmlelement(XmlExpr *xexpr,
 		   Datum *named_argvalue, bool *named_argnull,
 		   Datum *argvalue, bool *argnull);
 extern xmltype *xmlparse(text *data, XmlOptionType xmloption, bool preserve_whitespace);
-extern xmltype *xmlpi(char *target, text *arg, bool arg_is_null, bool *result_is_null);
+extern xmltype *xmlpi(const char *target, text *arg, bool arg_is_null, bool *result_is_null);
 extern xmltype *xmlroot(xmltype *data, text *version, int standalone);
 extern bool xml_is_document(xmltype *arg);
 extern text *xmltotext_with_xmloption(xmltype *data, XmlOptionType xmloption_arg);
 extern char *escape_xml(const char *str);
 
-extern char *map_sql_identifier_to_xml_name(char *ident, bool fully_escaped, bool escape_period);
-extern char *map_xml_name_to_sql_identifier(char *name);
+extern char *map_sql_identifier_to_xml_name(const char *ident, bool fully_escaped, bool escape_period);
+extern char *map_xml_name_to_sql_identifier(const char *name);
 extern char *map_sql_value_to_xml_value(Datum value, Oid type, bool xml_escape_strings);
 
 extern int	xmlbinary;			/* XmlBinaryType, but int for guc enum */
diff --git a/src/include/windowapi.h b/src/include/windowapi.h
index 0aa23ef2f5..f6f18e5159 100644
--- a/src/include/windowapi.h
+++ b/src/include/windowapi.h
@@ -19,7 +19,7 @@
  * function in nodeWindowAgg.c for details.
  *
  *
- * Portions Copyright (c) 2000-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2000-2018, PostgreSQL Global Development Group
  *
  * src/include/windowapi.h
  *
diff --git a/src/interfaces/ecpg/compatlib/.gitignore b/src/interfaces/ecpg/compatlib/.gitignore
index 6eb8a0dc06..ad5ba1354c 100644
--- a/src/interfaces/ecpg/compatlib/.gitignore
+++ b/src/interfaces/ecpg/compatlib/.gitignore
@@ -2,3 +2,4 @@
 /blibecpg_compatdll.def
 /exports.list
 /snprintf.c
+/strnlen.c
diff --git a/src/interfaces/ecpg/compatlib/Makefile b/src/interfaces/ecpg/compatlib/Makefile
index 04ddcfeab2..cd03af56a9 100644
--- a/src/interfaces/ecpg/compatlib/Makefile
+++ b/src/interfaces/ecpg/compatlib/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for ecpg compatibility library
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/interfaces/ecpg/compatlib/Makefile
@@ -31,7 +31,7 @@ SHLIB_EXPORTS = exports.txt
 # Need to recompile any libpgport object files
 LIBS := $(filter-out -lpgport, $(LIBS))
 
-OBJS= informix.o $(filter snprintf.o, $(LIBOBJS)) $(WIN32RES)
+OBJS= informix.o $(filter snprintf.o strnlen.o, $(LIBOBJS)) $(WIN32RES)
 
 PKG_CONFIG_REQUIRES_PRIVATE = libecpg libpgtypes
 
@@ -48,7 +48,7 @@ submake-pgtypeslib:
 # Shared library stuff
 include $(top_srcdir)/src/Makefile.shlib
 
-snprintf.c: % : $(top_srcdir)/src/port/%
+snprintf.c strnlen.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 install: all installdirs install-lib
@@ -58,6 +58,6 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib
 
 clean distclean: clean-lib
-	rm -f $(OBJS) snprintf.c
+	rm -f $(OBJS) snprintf.c strnlen.c
 
 maintainer-clean: distclean maintainer-clean-lib
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
index 2508ed9b8f..13058cf7bf 100644
--- a/src/interfaces/ecpg/compatlib/informix.c
+++ b/src/interfaces/ecpg/compatlib/informix.c
@@ -79,7 +79,7 @@ deccall2(decimal *arg1, decimal *arg2, int (*ptr) (numeric *, numeric *))
 	PGTYPESnumeric_free(a1);
 	PGTYPESnumeric_free(a2);
 
-	return (i);
+	return i;
 }
 
 static int
@@ -143,7 +143,7 @@ deccall3(decimal *arg1, decimal *arg2, decimal *result, int (*ptr) (numeric *, n
 	PGTYPESnumeric_free(a1);
 	PGTYPESnumeric_free(a2);
 
-	return (i);
+	return i;
 }
 
 /* we start with the numeric functions */
@@ -166,7 +166,7 @@ decadd(decimal *arg1, decimal *arg2, decimal *sum)
 int
 deccmp(decimal *arg1, decimal *arg2)
 {
-	return (deccall2(arg1, arg2, PGTYPESnumeric_cmp));
+	return deccall2(arg1, arg2, PGTYPESnumeric_cmp);
 }
 
 void
@@ -195,7 +195,7 @@ ecpg_strndup(const char *str, size_t len)
 }
 
 int
-deccvasc(char *cp, int len, decimal *np)
+deccvasc(const char *cp, int len, decimal *np)
 {
 	char	   *str;
 	int			ret = 0;
@@ -261,7 +261,7 @@ deccvdbl(double dbl, decimal *np)
 		result = PGTYPESnumeric_to_decimal(nres, np);
 
 	PGTYPESnumeric_free(nres);
-	return (result);
+	return result;
 }
 
 int
@@ -283,7 +283,7 @@ deccvint(int in, decimal *np)
 		result = PGTYPESnumeric_to_decimal(nres, np);
 
 	PGTYPESnumeric_free(nres);
-	return (result);
+	return result;
 }
 
 int
@@ -305,7 +305,7 @@ deccvlong(long lng, decimal *np)
 		result = PGTYPESnumeric_to_decimal(nres, np);
 
 	PGTYPESnumeric_free(nres);
-	return (result);
+	return result;
 }
 
 int
@@ -520,7 +520,7 @@ rdatestr(date d, char *str)
 *
 */
 int
-rstrdate(char *str, date * d)
+rstrdate(const char *str, date * d)
 {
 	return rdefmtdate(d, "mm/dd/yyyy", str);
 }
@@ -545,7 +545,7 @@ rjulmdy(date d, short mdy[3])
 }
 
 int
-rdefmtdate(date * d, char *fmt, char *str)
+rdefmtdate(date * d, const char *fmt, const char *str)
 {
 	/* TODO: take care of DBCENTURY environment variable */
 	/* PGSQL functions allow all centuries */
@@ -571,7 +571,7 @@ rdefmtdate(date * d, char *fmt, char *str)
 }
 
 int
-rfmtdate(date d, char *fmt, char *str)
+rfmtdate(date d, const char *fmt, char *str)
 {
 	errno = 0;
 	if (PGTYPESdate_fmt_asc(d, fmt, str) == 0)
@@ -598,7 +598,7 @@ rmdyjul(short mdy[3], date * d)
 int
 rdayofweek(date d)
 {
-	return (PGTYPESdate_dayofweek(d));
+	return PGTYPESdate_dayofweek(d);
 }
 
 /* And the datetime stuff */
@@ -747,7 +747,7 @@ initValue(long lng_val)
 
 /* return the position oft the right-most dot in some string */
 static int
-getRightMostDot(char *str)
+getRightMostDot(const char *str)
 {
 	size_t		len = strlen(str);
 	int			i,
@@ -765,7 +765,7 @@ getRightMostDot(char *str)
 
 /* And finally some misc functions */
 int
-rfmtlong(long lng_val, char *fmt, char *outbuf)
+rfmtlong(long lng_val, const char *fmt, char *outbuf)
 {
 	size_t		fmt_len = strlen(fmt);
 	size_t		temp_len;
@@ -1047,7 +1047,7 @@ rsetnull(int t, char *ptr)
 }
 
 int
-risnull(int t, char *ptr)
+risnull(int t, const char *ptr)
 {
-	return (ECPGis_noind_null(t, ptr));
+	return ECPGis_noind_null(t, ptr);
 }
diff --git a/src/interfaces/ecpg/ecpglib/.gitignore b/src/interfaces/ecpg/ecpglib/.gitignore
index 8ef6401dd0..1619e970c2 100644
--- a/src/interfaces/ecpg/ecpglib/.gitignore
+++ b/src/interfaces/ecpg/ecpglib/.gitignore
@@ -5,6 +5,7 @@
 /pgstrcasecmp.c
 /snprintf.c
 /strlcpy.c
+/strnlen.c
 /thread.c
 /win32setlocale.c
 /isinf.c
diff --git a/src/interfaces/ecpg/ecpglib/Makefile b/src/interfaces/ecpg/ecpglib/Makefile
index fbb14073ce..bc20cf77af 100644
--- a/src/interfaces/ecpg/ecpglib/Makefile
+++ b/src/interfaces/ecpg/ecpglib/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for ecpg library
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/interfaces/ecpg/ecpglib/Makefile
@@ -27,7 +27,8 @@ LIBS := $(filter-out -lpgport, $(LIBS))
 
 OBJS= execute.o typename.o descriptor.o sqlda.o data.o error.o prepare.o memory.o \
 	connect.o misc.o path.o pgstrcasecmp.o \
-	$(filter snprintf.o strlcpy.o win32setlocale.o isinf.o, $(LIBOBJS)) $(WIN32RES)
+	$(filter snprintf.o strlcpy.o strnlen.o win32setlocale.o isinf.o, $(LIBOBJS)) \
+	$(WIN32RES)
 
 # thread.c is needed only for non-WIN32 implementation of path.c
 ifneq ($(PORTNAME), win32)
@@ -55,7 +56,7 @@ include $(top_srcdir)/src/Makefile.shlib
 # necessarily use the same object files as the backend uses. Instead,
 # symlink the source files in here and build our own object file.
 
-path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/%
+path.c pgstrcasecmp.c snprintf.c strlcpy.c strnlen.c thread.c win32setlocale.c isinf.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 misc.o: misc.c $(top_builddir)/src/port/pg_config_paths.h
@@ -72,6 +73,6 @@ uninstall: uninstall-lib
 
 clean distclean: clean-lib
 	rm -f $(OBJS)
-	rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c thread.c win32setlocale.c isinf.c
+	rm -f path.c pgstrcasecmp.c snprintf.c strlcpy.c strnlen.c thread.c win32setlocale.c isinf.c
 
 maintainer-clean: distclean maintainer-clean-lib
diff --git a/src/interfaces/ecpg/ecpglib/connect.c b/src/interfaces/ecpg/ecpglib/connect.c
index 0716abdd7e..71fa275363 100644
--- a/src/interfaces/ecpg/ecpglib/connect.c
+++ b/src/interfaces/ecpg/ecpglib/connect.c
@@ -67,7 +67,7 @@ ecpg_get_connection_nr(const char *connection_name)
 		ret = con;
 	}
 
-	return (ret);
+	return ret;
 }
 
 struct connection *
@@ -106,7 +106,7 @@ ecpg_get_connection(const char *connection_name)
 #endif
 	}
 
-	return (ret);
+	return ret;
 }
 
 static void
@@ -168,7 +168,7 @@ ECPGsetcommit(int lineno, const char *mode, const char *connection_name)
 	PGresult   *results;
 
 	if (!ecpg_init(con, connection_name, lineno))
-		return (false);
+		return false;
 
 	ecpg_log("ECPGsetcommit on line %d: action \"%s\"; connection \"%s\"\n", lineno, mode, con->name);
 
@@ -204,7 +204,7 @@ ECPGsetconn(int lineno, const char *connection_name)
 	struct connection *con = ecpg_get_connection(connection_name);
 
 	if (!ecpg_init(con, connection_name, lineno))
-		return (false);
+		return false;
 
 #ifdef ENABLE_THREAD_SAFETY
 	pthread_setspecific(actual_connection_key, con);
@@ -675,7 +675,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
 	{
 		ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
 				   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-		return (false);
+		return false;
 	}
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -702,7 +702,7 @@ ECPGdisconnect(int lineno, const char *connection_name)
 #ifdef ENABLE_THREAD_SAFETY
 			pthread_mutex_unlock(&connections_mutex);
 #endif
-			return (false);
+			return false;
 		}
 		else
 			ecpg_finish(con);
diff --git a/src/interfaces/ecpg/ecpglib/data.c b/src/interfaces/ecpg/ecpglib/data.c
index 5dbfded873..871e2011f3 100644
--- a/src/interfaces/ecpg/ecpglib/data.c
+++ b/src/interfaces/ecpg/ecpglib/data.c
@@ -44,7 +44,7 @@ array_boundary(enum ARRAY_TYPE isarray, char c)
 
 /* returns true if some garbage is found at the end of the scanned string */
 static bool
-garbage_left(enum ARRAY_TYPE isarray, char *scan_length, enum COMPAT_MODE compat)
+garbage_left(enum ARRAY_TYPE isarray, char **scan_length, enum COMPAT_MODE compat)
 {
 	/*
 	 * INFORMIX allows for selecting a numeric into an int, the result is
@@ -52,13 +52,19 @@ garbage_left(enum ARRAY_TYPE isarray, char *scan_length, enum COMPAT_MODE compat
 	 */
 	if (isarray == ECPG_ARRAY_NONE)
 	{
-		if (INFORMIX_MODE(compat) && *scan_length == '.')
-			return false;
+		if (INFORMIX_MODE(compat) && **scan_length == '.')
+		{
+			/* skip invalid characters */
+			do
+			{
+				(*scan_length)++;
+			} while (isdigit((unsigned char) **scan_length));
+		}
 
-		if (*scan_length != ' ' && *scan_length != '\0')
+		if (**scan_length != ' ' && **scan_length != '\0')
 			return true;
 	}
-	else if (ECPG_IS_ARRAY(isarray) && !array_delimiter(isarray, *scan_length) && !array_boundary(isarray, *scan_length))
+	else if (ECPG_IS_ARRAY(isarray) && !array_delimiter(isarray, **scan_length) && !array_boundary(isarray, **scan_length))
 		return true;
 
 	return false;
@@ -134,7 +140,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 	{
 		ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
 				   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-		return (false);
+		return false;
 	}
 
 	/*
@@ -156,7 +162,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 		 * at least one tuple, but let's play it safe.
 		 */
 		ecpg_raise(lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL);
-		return (false);
+		return false;
 	}
 
 	/* We will have to decode the value */
@@ -204,7 +210,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					ecpg_raise(lineno, ECPG_MISSING_INDICATOR,
 							   ECPG_SQLSTATE_NULL_VALUE_NO_INDICATOR_PARAMETER,
 							   NULL);
-					return (false);
+					return false;
 				}
 			}
 			break;
@@ -212,12 +218,12 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 			ecpg_raise(lineno, ECPG_UNSUPPORTED,
 					   ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
 					   ecpg_type_name(ind_type));
-			return (false);
+			return false;
 			break;
 	}
 
 	if (value_for_indicator == -1)
-		return (true);
+		return true;
 
 	/* let's check if it really is an array if it should be one */
 	if (isarray == ECPG_ARRAY_ARRAY)
@@ -226,7 +232,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 		{
 			ecpg_raise(lineno, ECPG_DATA_NOT_ARRAY,
 					   ECPG_SQLSTATE_DATATYPE_MISMATCH, NULL);
-			return (false);
+			return false;
 		}
 
 		switch (type)
@@ -303,11 +309,11 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 				case ECPGt_int:
 				case ECPGt_long:
 					res = strtol(pval, &scan_length, 10);
-					if (garbage_left(isarray, scan_length, compat))
+					if (garbage_left(isarray, &scan_length, compat))
 					{
 						ecpg_raise(lineno, ECPG_INT_FORMAT,
 								   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-						return (false);
+						return false;
 					}
 					pval = scan_length;
 
@@ -332,11 +338,11 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 				case ECPGt_unsigned_int:
 				case ECPGt_unsigned_long:
 					ures = strtoul(pval, &scan_length, 10);
-					if (garbage_left(isarray, scan_length, compat))
+					if (garbage_left(isarray, &scan_length, compat))
 					{
 						ecpg_raise(lineno, ECPG_UINT_FORMAT,
 								   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-						return (false);
+						return false;
 					}
 					pval = scan_length;
 
@@ -361,10 +367,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 #ifdef HAVE_STRTOLL
 				case ECPGt_long_long:
 					*((long long int *) (var + offset * act_tuple)) = strtoll(pval, &scan_length, 10);
-					if (garbage_left(isarray, scan_length, compat))
+					if (garbage_left(isarray, &scan_length, compat))
 					{
 						ecpg_raise(lineno, ECPG_INT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-						return (false);
+						return false;
 					}
 					pval = scan_length;
 
@@ -373,10 +379,10 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 #ifdef HAVE_STRTOULL
 				case ECPGt_unsigned_long_long:
 					*((unsigned long long int *) (var + offset * act_tuple)) = strtoull(pval, &scan_length, 10);
-					if (garbage_left(isarray, scan_length, compat))
+					if (garbage_left(isarray, &scan_length, compat))
 					{
 						ecpg_raise(lineno, ECPG_UINT_FORMAT, ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-						return (false);
+						return false;
 					}
 					pval = scan_length;
 
@@ -395,11 +401,12 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					if (isarray && *scan_length == '"')
 						scan_length++;
 
-					if (garbage_left(isarray, scan_length, compat))
+					/* no special INFORMIX treatment for floats */
+					if (garbage_left(isarray, &scan_length, ECPG_COMPAT_PGSQL))
 					{
 						ecpg_raise(lineno, ECPG_FLOAT_FORMAT,
 								   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-						return (false);
+						return false;
 					}
 					pval = scan_length;
 
@@ -438,7 +445,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 
 					ecpg_raise(lineno, ECPG_CONVERT_BOOL,
 							   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-					return (false);
+					return false;
 					break;
 
 				case ECPGt_char:
@@ -581,24 +588,24 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							{
 								ecpg_raise(lineno, ECPG_OUT_OF_MEMORY,
 										   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-								return (false);
+								return false;
 							}
 						}
 						else
 						{
 							ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					else
 					{
-						if (!isarray && garbage_left(isarray, scan_length, compat))
+						if (!isarray && garbage_left(isarray, &scan_length, compat))
 						{
 							free(nres);
 							ecpg_raise(lineno, ECPG_NUMERIC_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					pval = scan_length;
@@ -635,7 +642,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 							 */
 							ires = (interval *) ecpg_alloc(sizeof(interval), lineno);
 							if (!ires)
-								return (false);
+								return false;
 
 							ECPGset_noind_null(ECPGt_interval, ires);
 						}
@@ -643,7 +650,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						{
 							ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					else
@@ -651,12 +658,12 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						if (*scan_length == '"')
 							scan_length++;
 
-						if (!isarray && garbage_left(isarray, scan_length, compat))
+						if (!isarray && garbage_left(isarray, &scan_length, compat))
 						{
 							free(ires);
 							ecpg_raise(lineno, ECPG_INTERVAL_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					pval = scan_length;
@@ -693,7 +700,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						{
 							ecpg_raise(lineno, ECPG_DATE_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					else
@@ -701,11 +708,11 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						if (*scan_length == '"')
 							scan_length++;
 
-						if (!isarray && garbage_left(isarray, scan_length, compat))
+						if (!isarray && garbage_left(isarray, &scan_length, compat))
 						{
 							ecpg_raise(lineno, ECPG_DATE_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 
@@ -741,7 +748,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						{
 							ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 					else
@@ -749,11 +756,11 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 						if (*scan_length == '"')
 							scan_length++;
 
-						if (!isarray && garbage_left(isarray, scan_length, compat))
+						if (!isarray && garbage_left(isarray, &scan_length, compat))
 						{
 							ecpg_raise(lineno, ECPG_TIMESTAMP_FORMAT,
 									   ECPG_SQLSTATE_DATATYPE_MISMATCH, pval);
-							return (false);
+							return false;
 						}
 					}
 
@@ -765,7 +772,7 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 					ecpg_raise(lineno, ECPG_UNSUPPORTED,
 							   ECPG_SQLSTATE_ECPG_INTERNAL_ERROR,
 							   ecpg_type_name(type));
-					return (false);
+					return false;
 					break;
 			}
 			if (ECPG_IS_ARRAY(isarray))
@@ -791,5 +798,5 @@ ecpg_get_data(const PGresult *results, int act_tuple, int act_field, int lineno,
 		}
 	} while (*pval != '\0' && !array_boundary(isarray, *pval));
 
-	return (true);
+	return true;
 }
diff --git a/src/interfaces/ecpg/ecpglib/descriptor.c b/src/interfaces/ecpg/ecpglib/descriptor.c
index 1fa00b892f..bdd25184dc 100644
--- a/src/interfaces/ecpg/ecpglib/descriptor.c
+++ b/src/interfaces/ecpg/ecpglib/descriptor.c
@@ -150,10 +150,10 @@ get_int_item(int lineno, void *var, enum ECPGttype vartype, int value)
 			break;
 		default:
 			ecpg_raise(lineno, ECPG_VAR_NOT_NUMERIC, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-			return (false);
+			return false;
 	}
 
-	return (true);
+	return true;
 }
 
 static bool
@@ -195,7 +195,7 @@ set_int_item(int lineno, int *target, const void *var, enum ECPGttype vartype)
 			break;
 		default:
 			ecpg_raise(lineno, ECPG_VAR_NOT_NUMERIC, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-			return (false);
+			return false;
 	}
 
 	return true;
@@ -228,17 +228,17 @@ get_char_item(int lineno, void *var, enum ECPGttype vartype, char *value, int va
 			break;
 		default:
 			ecpg_raise(lineno, ECPG_VAR_NOT_CHAR, ECPG_SQLSTATE_RESTRICTED_DATA_TYPE_ATTRIBUTE_VIOLATION, NULL);
-			return (false);
+			return false;
 	}
 
-	return (true);
+	return true;
 }
 
 #define RETURN_IF_NO_DATA	if (ntuples < 1) \
 				{ \
 					va_end(args); \
 					ecpg_raise(lineno, ECPG_NOT_FOUND, ECPG_SQLSTATE_NO_DATA, NULL); \
-					return (false); \
+					return false; \
 				}
 
 bool
@@ -265,7 +265,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 	if (!ECPGresult)
 	{
 		va_end(args);
-		return (false);
+		return false;
 	}
 
 	ntuples = PQntuples(ECPGresult);
@@ -274,7 +274,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 	{
 		ecpg_raise(lineno, ECPG_INVALID_DESCRIPTOR_INDEX, ECPG_SQLSTATE_INVALID_DESCRIPTOR_INDEX, NULL);
 		va_end(args);
-		return (false);
+		return false;
 	}
 
 	ecpg_log("ECPGget_desc: reading items for tuple %d\n", index);
@@ -333,7 +333,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_char_item(lineno, var, vartype, PQfname(ECPGresult, index), varcharsize))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: NAME = %s\n", PQfname(ECPGresult, index));
@@ -343,7 +343,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, 1))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				break;
@@ -352,7 +352,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, 0))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				break;
@@ -361,7 +361,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, (PQfmod(ECPGresult, index) - VARHDRSZ) & 0xffff))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: SCALE = %d\n", (PQfmod(ECPGresult, index) - VARHDRSZ) & 0xffff);
@@ -371,7 +371,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, PQfmod(ECPGresult, index) >> 16))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: PRECISION = %d\n", PQfmod(ECPGresult, index) >> 16);
@@ -381,7 +381,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, PQfsize(ECPGresult, index)))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: OCTET_LENGTH = %d\n", PQfsize(ECPGresult, index));
@@ -391,7 +391,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, PQfmod(ECPGresult, index) - VARHDRSZ))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: LENGTH = %d\n", PQfmod(ECPGresult, index) - VARHDRSZ);
@@ -401,7 +401,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, ecpg_dynamic_type(PQftype(ECPGresult, index))))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: TYPE = %d\n", ecpg_dynamic_type(PQftype(ECPGresult, index)));
@@ -411,7 +411,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, ecpg_dynamic_type_DDT(PQftype(ECPGresult, index))))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: TYPE = %d\n", ecpg_dynamic_type_DDT(PQftype(ECPGresult, index)));
@@ -421,7 +421,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				if (!get_int_item(lineno, var, vartype, PQntuples(ECPGresult)))
 				{
 					va_end(args);
-					return (false);
+					return false;
 				}
 
 				ecpg_log("ECPGget_desc: CARDINALITY = %d\n", PQntuples(ECPGresult));
@@ -462,7 +462,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 					if (!get_int_item(lineno, var, vartype, PQgetlength(ECPGresult, act_tuple, index)))
 					{
 						va_end(args);
-						return (false);
+						return false;
 					}
 					var = (char *) var + offset;
 					ecpg_log("ECPGget_desc: RETURNED[%d] = %d\n", act_tuple, PQgetlength(ECPGresult, act_tuple, index));
@@ -473,7 +473,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 				snprintf(type_str, sizeof(type_str), "%d", type);
 				ecpg_raise(lineno, ECPG_UNKNOWN_DESCRIPTOR_ITEM, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, type_str);
 				va_end(args);
-				return (false);
+				return false;
 		}
 
 		type = va_arg(args, enum ECPGdtype);
@@ -539,7 +539,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 			if (!get_int_item(lineno, data_var.ind_value, data_var.ind_type, -PQgetisnull(ECPGresult, act_tuple, index)))
 			{
 				va_end(args);
-				return (false);
+				return false;
 			}
 			data_var.ind_value = (char *) data_var.ind_value + data_var.ind_offset;
 			ecpg_log("ECPGget_desc: INDICATOR[%d] = %d\n", act_tuple, -PQgetisnull(ECPGresult, act_tuple, index));
@@ -547,7 +547,7 @@ ECPGget_desc(int lineno, const char *desc_name, int index,...)
 	}
 	sqlca->sqlerrd[2] = ntuples;
 	va_end(args);
-	return (true);
+	return true;
 }
 
 #undef RETURN_IF_NO_DATA
diff --git a/src/interfaces/ecpg/ecpglib/error.c b/src/interfaces/ecpg/ecpglib/error.c
index 77d6cc2dae..f34ae4afb8 100644
--- a/src/interfaces/ecpg/ecpglib/error.c
+++ b/src/interfaces/ecpg/ecpglib/error.c
@@ -286,23 +286,23 @@ ecpg_check_PQresult(PGresult *results, int lineno, PGconn *connection, enum COMP
 	{
 		ecpg_log("ecpg_check_PQresult on line %d: no result - %s", lineno, PQerrorMessage(connection));
 		ecpg_raise_backend(lineno, NULL, connection, compat);
-		return (false);
+		return false;
 	}
 
 	switch (PQresultStatus(results))
 	{
 
 		case PGRES_TUPLES_OK:
-			return (true);
+			return true;
 			break;
 		case PGRES_EMPTY_QUERY:
 			/* do nothing */
 			ecpg_raise(lineno, ECPG_EMPTY, ECPG_SQLSTATE_ECPG_INTERNAL_ERROR, NULL);
 			PQclear(results);
-			return (false);
+			return false;
 			break;
 		case PGRES_COMMAND_OK:
-			return (true);
+			return true;
 			break;
 		case PGRES_NONFATAL_ERROR:
 		case PGRES_FATAL_ERROR:
@@ -310,23 +310,23 @@ ecpg_check_PQresult(PGresult *results, int lineno, PGconn *connection, enum COMP
 			ecpg_log("ecpg_check_PQresult on line %d: bad response - %s", lineno, PQresultErrorMessage(results));
 			ecpg_raise_backend(lineno, results, connection, compat);
 			PQclear(results);
-			return (false);
+			return false;
 			break;
 		case PGRES_COPY_OUT:
-			return (true);
+			return true;
 			break;
 		case PGRES_COPY_IN:
 			ecpg_log("ecpg_check_PQresult on line %d: COPY IN data transfer in progress\n", lineno);
 			PQendcopy(connection);
 			PQclear(results);
-			return (false);
+			return false;
 			break;
 		default:
 			ecpg_log("ecpg_check_PQresult on line %d: unknown execution status type\n",
 					 lineno);
 			ecpg_raise_backend(lineno, results, connection, compat);
 			PQclear(results);
-			return (false);
+			return false;
 			break;
 	}
 }
diff --git a/src/interfaces/ecpg/ecpglib/execute.c b/src/interfaces/ecpg/ecpglib/execute.c
index 03c55d3593..7d6d7d0754 100644
--- a/src/interfaces/ecpg/ecpglib/execute.c
+++ b/src/interfaces/ecpg/ecpglib/execute.c
@@ -58,7 +58,7 @@ quote_postgres(char *arg, bool quote, int lineno)
 		buffer_len = 2 * length + 1;
 		res = (char *) ecpg_alloc(buffer_len + 3, lineno);
 		if (!res)
-			return (res);
+			return res;
 		escaped_len = PQescapeString(res + 1, arg, buffer_len);
 		if (length == escaped_len)
 		{
@@ -108,14 +108,14 @@ free_statement(struct statement *stmt)
 }
 
 static int
-next_insert(char *text, int pos, bool questionmarks)
+next_insert(char *text, int pos, bool questionmarks, bool std_strings)
 {
 	bool		string = false;
 	int			p = pos;
 
 	for (; text[p] != '\0'; p++)
 	{
-		if (text[p] == '\\')	/* escape character */
+		if (string && !std_strings && text[p] == '\\')	/* escape character */
 			p++;
 		else if (text[p] == '\'')
 			string = string ? false : true;
@@ -151,13 +151,13 @@ ecpg_type_infocache_push(struct ECPGtype_information_cache **cache, int oid, enu
 	= (struct ECPGtype_information_cache *) ecpg_alloc(sizeof(struct ECPGtype_information_cache), lineno);
 
 	if (new_entry == NULL)
-		return (false);
+		return false;
 
 	new_entry->oid = oid;
 	new_entry->isarray = isarray;
 	new_entry->next = *cache;
 	*cache = new_entry;
-	return (true);
+	return true;
 }
 
 static enum ARRAY_TYPE
@@ -178,89 +178,89 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 
 		/* populate cache with well known types to speed things up */
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOOLOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BYTEAOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NAMEOID, not_an_array_in_ecpg, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT8OID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2OID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT2VECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INT4OID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), REGPROCOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TEXTOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), XIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), OIDVECTOROID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POINTOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LSEGOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), PATHOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BOXOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), POLYGONOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), LINEOID, ECPG_ARRAY_VECTOR, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT4OID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), FLOAT8OID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ABSTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), RELTIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TINTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), UNKNOWNOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIRCLEOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CASHOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INETOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), CIDROID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), BPCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARCHAROID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), DATEOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMEOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMESTAMPTZOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), INTERVALOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), TIMETZOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), ZPBITOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), VARBITOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 		if (!ecpg_type_infocache_push(&(stmt->connection->cache_head), NUMERICOID, ECPG_ARRAY_NONE, stmt->lineno))
-			return (ECPG_ARRAY_ERROR);
+			return ECPG_ARRAY_ERROR;
 	}
 
 	for (cache_entry = (stmt->connection->cache_head); cache_entry != NULL; cache_entry = cache_entry->next)
@@ -271,13 +271,13 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 
 	array_query = (char *) ecpg_alloc(strlen("select typlen from pg_type where oid= and typelem<>0") + 11, stmt->lineno);
 	if (array_query == NULL)
-		return (ECPG_ARRAY_ERROR);
+		return ECPG_ARRAY_ERROR;
 
 	sprintf(array_query, "select typlen from pg_type where oid=%d and typelem<>0", type);
 	query = PQexec(stmt->connection->connection, array_query);
 	ecpg_free(array_query);
 	if (!ecpg_check_PQresult(query, stmt->lineno, stmt->connection->connection, stmt->compat))
-		return (ECPG_ARRAY_ERROR);
+		return ECPG_ARRAY_ERROR;
 	else if (PQresultStatus(query) == PGRES_TUPLES_OK)
 	{
 		if (PQntuples(query) == 0)
@@ -297,7 +297,7 @@ ecpg_is_type_an_array(int type, const struct statement *stmt, const struct varia
 		PQclear(query);
 	}
 	else
-		return (ECPG_ARRAY_ERROR);
+		return ECPG_ARRAY_ERROR;
 
 	ecpg_type_infocache_push(&(stmt->connection->cache_head), type, isarray, stmt->lineno);
 	ecpg_log("ecpg_is_type_an_array on line %d: type (%d); C (%d); array (%s)\n", stmt->lineno, type, var->type, ECPG_IS_ARRAY(isarray) ? "yes" : "no");
@@ -1109,6 +1109,13 @@ ecpg_build_params(struct statement *stmt)
 	struct variable *var;
 	int			desc_counter = 0;
 	int			position = 0;
+	const char *value;
+	bool		std_strings = false;
+
+	/* Get standard_conforming_strings setting. */
+	value = PQparameterStatus(stmt->connection->connection, "standard_conforming_strings");
+	if (value && strcmp(value, "on") == 0)
+		std_strings = true;
 
 	/*
 	 * If the type is one of the fill in types then we take the argument and
@@ -1299,7 +1306,7 @@ ecpg_build_params(struct statement *stmt)
 		 * now tobeinserted points to an area that contains the next
 		 * parameter; now find the position in the string where it belongs
 		 */
-		if ((position = next_insert(stmt->command, position, stmt->questionmarks) + 1) == 0)
+		if ((position = next_insert(stmt->command, position, stmt->questionmarks, std_strings) + 1) == 0)
 		{
 			/*
 			 * We have an argument but we dont have the matched up placeholder
@@ -1386,7 +1393,7 @@ ecpg_build_params(struct statement *stmt)
 	}
 
 	/* Check if there are unmatched things left. */
-	if (next_insert(stmt->command, position, stmt->questionmarks) >= 0)
+	if (next_insert(stmt->command, position, stmt->questionmarks, std_strings) >= 0)
 	{
 		ecpg_raise(stmt->lineno, ECPG_TOO_FEW_ARGUMENTS,
 				   ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_PARAMETERS, NULL);
@@ -1486,7 +1493,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
 	{
 		ecpg_raise(stmt->lineno, ECPG_OUT_OF_MEMORY,
 				   ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY, NULL);
-		return (false);
+		return false;
 	}
 
 	var = stmt->outlist;
@@ -1654,7 +1661,7 @@ ecpg_process_output(struct statement *stmt, bool clear_result)
 					else if (!INFORMIX_MODE(stmt->compat))
 					{
 						ecpg_raise(stmt->lineno, ECPG_TOO_FEW_ARGUMENTS, ECPG_SQLSTATE_USING_CLAUSE_DOES_NOT_MATCH_TARGETS, NULL);
-						return (false);
+						return false;
 					}
 				}
 
@@ -1830,7 +1837,7 @@ ecpg_do_prologue(int lineno, const int compat, const int force_indicator,
 		{
 			ecpg_raise(lineno, ECPG_INVALID_STMT, ECPG_SQLSTATE_INVALID_SQL_STATEMENT_NAME, stmt->command);
 			ecpg_do_epilogue(stmt);
-			return (false);
+			return false;
 		}
 	}
 
diff --git a/src/interfaces/ecpg/ecpglib/memory.c b/src/interfaces/ecpg/ecpglib/memory.c
index a7268bb0f6..dc548a4cda 100644
--- a/src/interfaces/ecpg/ecpglib/memory.c
+++ b/src/interfaces/ecpg/ecpglib/memory.c
@@ -26,7 +26,7 @@ ecpg_alloc(long size, int lineno)
 		return NULL;
 	}
 
-	return (new);
+	return new;
 }
 
 char *
@@ -40,7 +40,7 @@ ecpg_realloc(void *ptr, long size, int lineno)
 		return NULL;
 	}
 
-	return (new);
+	return new;
 }
 
 char *
@@ -58,7 +58,7 @@ ecpg_strdup(const char *string, int lineno)
 		return NULL;
 	}
 
-	return (new);
+	return new;
 }
 
 /* keep a list of memory we allocated for the user */
diff --git a/src/interfaces/ecpg/ecpglib/misc.c b/src/interfaces/ecpg/ecpglib/misc.c
index edd7302d54..be9cac6e7b 100644
--- a/src/interfaces/ecpg/ecpglib/misc.c
+++ b/src/interfaces/ecpg/ecpglib/misc.c
@@ -110,7 +110,7 @@ ecpg_init(const struct connection *con, const char *connection_name, const int l
 	{
 		ecpg_raise(lineno, ECPG_OUT_OF_MEMORY, ECPG_SQLSTATE_ECPG_OUT_OF_MEMORY,
 				   NULL);
-		return (false);
+		return false;
 	}
 
 	ecpg_init_sqlca(sqlca);
@@ -118,10 +118,10 @@ ecpg_init(const struct connection *con, const char *connection_name, const int l
 	{
 		ecpg_raise(lineno, ECPG_NO_CONN, ECPG_SQLSTATE_CONNECTION_DOES_NOT_EXIST,
 				   connection_name ? connection_name : ecpg_gettext("NULL"));
-		return (false);
+		return false;
 	}
 
-	return (true);
+	return true;
 }
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -155,9 +155,9 @@ ECPGget_sqlca(void)
 		ecpg_init_sqlca(sqlca);
 		pthread_setspecific(sqlca_key, sqlca);
 	}
-	return (sqlca);
+	return sqlca;
 #else
-	return (&sqlca);
+	return &sqlca;
 #endif
 }
 
@@ -167,7 +167,7 @@ ECPGstatus(int lineno, const char *connection_name)
 	struct connection *con = ecpg_get_connection(connection_name);
 
 	if (!ecpg_init(con, connection_name, lineno))
-		return (false);
+		return false;
 
 	/* are we connected? */
 	if (con->connection == NULL)
@@ -176,7 +176,7 @@ ECPGstatus(int lineno, const char *connection_name)
 		return false;
 	}
 
-	return (true);
+	return true;
 }
 
 PGTransactionStatusType
@@ -202,7 +202,7 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 	struct connection *con = ecpg_get_connection(connection_name);
 
 	if (!ecpg_init(con, connection_name, lineno))
-		return (false);
+		return false;
 
 	ecpg_log("ECPGtrans on line %d: action \"%s\"; connection \"%s\"\n", lineno, transaction, con ? con->name : "null");
 
@@ -225,13 +225,13 @@ ECPGtrans(int lineno, const char *connection_name, const char *transaction)
 		{
 			res = PQexec(con->connection, "begin transaction");
 			if (!ecpg_check_PQresult(res, lineno, con->connection, ECPG_COMPAT_PGSQL))
-				return FALSE;
+				return false;
 			PQclear(res);
 		}
 
 		res = PQexec(con->connection, transaction);
 		if (!ecpg_check_PQresult(res, lineno, con->connection, ECPG_COMPAT_PGSQL))
-			return FALSE;
+			return false;
 		PQclear(res);
 	}
 
@@ -375,7 +375,7 @@ ECPGset_noind_null(enum ECPGttype type, void *ptr)
 }
 
 static bool
-_check(unsigned char *ptr, int length)
+_check(const unsigned char *ptr, int length)
 {
 	for (length--; length >= 0; length--)
 		if (ptr[length] != 0xff)
@@ -385,62 +385,62 @@ _check(unsigned char *ptr, int length)
 }
 
 bool
-ECPGis_noind_null(enum ECPGttype type, void *ptr)
+ECPGis_noind_null(enum ECPGttype type, const void *ptr)
 {
 	switch (type)
 	{
 		case ECPGt_char:
 		case ECPGt_unsigned_char:
 		case ECPGt_string:
-			if (*((char *) ptr) == '\0')
+			if (*((const char *) ptr) == '\0')
 				return true;
 			break;
 		case ECPGt_short:
 		case ECPGt_unsigned_short:
-			if (*((short int *) ptr) == SHRT_MIN)
+			if (*((const short int *) ptr) == SHRT_MIN)
 				return true;
 			break;
 		case ECPGt_int:
 		case ECPGt_unsigned_int:
-			if (*((int *) ptr) == INT_MIN)
+			if (*((const int *) ptr) == INT_MIN)
 				return true;
 			break;
 		case ECPGt_long:
 		case ECPGt_unsigned_long:
 		case ECPGt_date:
-			if (*((long *) ptr) == LONG_MIN)
+			if (*((const long *) ptr) == LONG_MIN)
 				return true;
 			break;
 #ifdef HAVE_LONG_LONG_INT
 		case ECPGt_long_long:
 		case ECPGt_unsigned_long_long:
-			if (*((long long *) ptr) == LONG_LONG_MIN)
+			if (*((const long long *) ptr) == LONG_LONG_MIN)
 				return true;
 			break;
 #endif							/* HAVE_LONG_LONG_INT */
 		case ECPGt_float:
-			return (_check(ptr, sizeof(float)));
+			return _check(ptr, sizeof(float));
 			break;
 		case ECPGt_double:
-			return (_check(ptr, sizeof(double)));
+			return _check(ptr, sizeof(double));
 			break;
 		case ECPGt_varchar:
-			if (*(((struct ECPGgeneric_varchar *) ptr)->arr) == 0x00)
+			if (*(((const struct ECPGgeneric_varchar *) ptr)->arr) == 0x00)
 				return true;
 			break;
 		case ECPGt_decimal:
-			if (((decimal *) ptr)->sign == NUMERIC_NULL)
+			if (((const decimal *) ptr)->sign == NUMERIC_NULL)
 				return true;
 			break;
 		case ECPGt_numeric:
-			if (((numeric *) ptr)->sign == NUMERIC_NULL)
+			if (((const numeric *) ptr)->sign == NUMERIC_NULL)
 				return true;
 			break;
 		case ECPGt_interval:
-			return (_check(ptr, sizeof(interval)));
+			return _check(ptr, sizeof(interval));
 			break;
 		case ECPGt_timestamp:
-			return (_check(ptr, sizeof(timestamp)));
+			return _check(ptr, sizeof(timestamp));
 			break;
 		default:
 			break;
diff --git a/src/interfaces/ecpg/ecpglib/pg_type.h b/src/interfaces/ecpg/ecpglib/pg_type.h
index 94d2d9287b..5d9eeca03a 100644
--- a/src/interfaces/ecpg/ecpglib/pg_type.h
+++ b/src/interfaces/ecpg/ecpglib/pg_type.h
@@ -5,7 +5,7 @@
  *
  * XXX keep this in sync with src/include/catalog/pg_type.h
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/ecpg/ecpglib/pg_type.h
diff --git a/src/interfaces/ecpg/ecpglib/prepare.c b/src/interfaces/ecpg/ecpglib/prepare.c
index 151aa80dc6..e76b645024 100644
--- a/src/interfaces/ecpg/ecpglib/prepare.c
+++ b/src/interfaces/ecpg/ecpglib/prepare.c
@@ -42,7 +42,7 @@ isvarchar(unsigned char c)
 	if (c >= 128)
 		return true;
 
-	return (false);
+	return false;
 }
 
 static bool
@@ -371,7 +371,7 @@ SearchStmtCache(const char *ecpgQuery)
 	if (entIx >= stmtCacheEntPerBucket)
 		entNo = 0;
 
-	return (entNo);
+	return entNo;
 }
 
 /*
@@ -389,14 +389,14 @@ ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)	/* entry # to free */
 
 	entry = &stmtCacheEntries[entNo];
 	if (!entry->stmtID[0])		/* return if the entry isn't in use     */
-		return (0);
+		return 0;
 
 	con = ecpg_get_connection(entry->connection);
 
 	/* free the 'prepared_statement' list entry		  */
 	this = ecpg_find_prepared_statement(entry->stmtID, con, &prev);
 	if (this && !deallocate_one(lineno, compat, con, prev, this))
-		return (-1);
+		return -1;
 
 	entry->stmtID[0] = '\0';
 
@@ -407,7 +407,7 @@ ecpg_freeStmtCacheEntry(int lineno, int compat, int entNo)	/* entry # to free */
 		entry->ecpgQuery = 0;
 	}
 
-	return (entNo);
+	return entNo;
 }
 
 /*
@@ -450,7 +450,7 @@ AddStmtToCache(int lineno,		/* line # of statement		*/
 
 /* 'entNo' is the entry to use - make sure its free										*/
 	if (ecpg_freeStmtCacheEntry(lineno, compat, entNo) < 0)
-		return (-1);
+		return -1;
 
 /* add the query to the entry															*/
 	entry = &stmtCacheEntries[entNo];
@@ -460,7 +460,7 @@ AddStmtToCache(int lineno,		/* line # of statement		*/
 	entry->execs = 0;
 	memcpy(entry->stmtID, stmtID, sizeof(entry->stmtID));
 
-	return (entNo);
+	return entNo;
 }
 
 /* handle cache and preparation of statements in auto-prepare mode */
@@ -487,7 +487,7 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
 		prep = ecpg_find_prepared_statement(stmtID, con, NULL);
 		/* This prepared name doesn't exist on this connection. */
 		if (!prep && !prepare_common(lineno, con, stmtID, query))
-			return (false);
+			return false;
 
 		*name = ecpg_strdup(stmtID, lineno);
 	}
@@ -501,9 +501,9 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
 		sprintf(stmtID, "ecpg%d", nextStmtID++);
 
 		if (!ECPGprepare(lineno, connection_name, 0, stmtID, query))
-			return (false);
+			return false;
 		if (AddStmtToCache(lineno, stmtID, connection_name, compat, query) < 0)
-			return (false);
+			return false;
 
 		*name = ecpg_strdup(stmtID, lineno);
 	}
@@ -511,5 +511,5 @@ ecpg_auto_prepare(int lineno, const char *connection_name, const int compat, cha
 	/* increase usage counter */
 	stmtCacheEntries[entNo].execs++;
 
-	return (true);
+	return true;
 }
diff --git a/src/interfaces/ecpg/include/ecpg_informix.h b/src/interfaces/ecpg/include/ecpg_informix.h
index dd6258152a..a5260a5542 100644
--- a/src/interfaces/ecpg/include/ecpg_informix.h
+++ b/src/interfaces/ecpg/include/ecpg_informix.h
@@ -36,15 +36,15 @@ extern "C"
 extern int	rdatestr(date, char *);
 extern void rtoday(date *);
 extern int	rjulmdy(date, short *);
-extern int	rdefmtdate(date *, char *, char *);
-extern int	rfmtdate(date, char *, char *);
+extern int	rdefmtdate(date *, const char *, const char *);
+extern int	rfmtdate(date, const char *, char *);
 extern int	rmdyjul(short *, date *);
-extern int	rstrdate(char *, date *);
+extern int	rstrdate(const char *, date *);
 extern int	rdayofweek(date);
 
-extern int	rfmtlong(long, char *, char *);
+extern int	rfmtlong(long, const char *, char *);
 extern int	rgetmsg(int, char *, int);
-extern int	risnull(int, char *);
+extern int	risnull(int, const char *);
 extern int	rsetnull(int, char *);
 extern int	rtypalign(int, int);
 extern int	rtypmsize(int, int);
@@ -62,7 +62,7 @@ extern void ECPG_informix_reset_sqlca(void);
 int			decadd(decimal *, decimal *, decimal *);
 int			deccmp(decimal *, decimal *);
 void		deccopy(decimal *, decimal *);
-int			deccvasc(char *, int, decimal *);
+int			deccvasc(const char *, int, decimal *);
 int			deccvdbl(double, decimal *);
 int			deccvint(int, decimal *);
 int			deccvlong(long, decimal *);
diff --git a/src/interfaces/ecpg/include/ecpglib.h b/src/interfaces/ecpg/include/ecpglib.h
index 536b7506ff..8a601996d2 100644
--- a/src/interfaces/ecpg/include/ecpglib.h
+++ b/src/interfaces/ecpg/include/ecpglib.h
@@ -80,7 +80,7 @@ bool		ECPGset_desc_header(int, const char *, int);
 bool		ECPGset_desc(int, const char *, int,...);
 
 void		ECPGset_noind_null(enum ECPGttype, void *);
-bool		ECPGis_noind_null(enum ECPGttype, void *);
+bool		ECPGis_noind_null(enum ECPGttype, const void *);
 bool		ECPGdescribe(int, int, bool, const char *, const char *,...);
 
 void		ECPGset_var(int, void *, int);
diff --git a/src/interfaces/ecpg/include/pgtypes_date.h b/src/interfaces/ecpg/include/pgtypes_date.h
index 3d1a181b2b..caf8a33d12 100644
--- a/src/interfaces/ecpg/include/pgtypes_date.h
+++ b/src/interfaces/ecpg/include/pgtypes_date.h
@@ -21,7 +21,7 @@ extern void PGTYPESdate_julmdy(date, int *);
 extern void PGTYPESdate_mdyjul(int *, date *);
 extern int	PGTYPESdate_dayofweek(date);
 extern void PGTYPESdate_today(date *);
-extern int	PGTYPESdate_defmt_asc(date *, const char *, char *);
+extern int	PGTYPESdate_defmt_asc(date *, const char *, const char *);
 extern int	PGTYPESdate_fmt_asc(date, const char *, char *);
 
 #ifdef __cplusplus
diff --git a/src/interfaces/ecpg/include/pgtypes_timestamp.h b/src/interfaces/ecpg/include/pgtypes_timestamp.h
index 283ecca25e..1545be4ee9 100644
--- a/src/interfaces/ecpg/include/pgtypes_timestamp.h
+++ b/src/interfaces/ecpg/include/pgtypes_timestamp.h
@@ -19,7 +19,7 @@ extern char *PGTYPEStimestamp_to_asc(timestamp);
 extern int	PGTYPEStimestamp_sub(timestamp *, timestamp *, interval *);
 extern int	PGTYPEStimestamp_fmt_asc(timestamp *, char *, int, const char *);
 extern void PGTYPEStimestamp_current(timestamp *);
-extern int	PGTYPEStimestamp_defmt_asc(char *, const char *, timestamp *);
+extern int	PGTYPEStimestamp_defmt_asc(const char *, const char *, timestamp *);
 extern int	PGTYPEStimestamp_add_interval(timestamp * tin, interval * span, timestamp * tout);
 extern int	PGTYPEStimestamp_sub_interval(timestamp * tin, interval * span, timestamp * tout);
 
diff --git a/src/interfaces/ecpg/pgtypeslib/.gitignore b/src/interfaces/ecpg/pgtypeslib/.gitignore
index fbcd68d7d3..df46a79972 100644
--- a/src/interfaces/ecpg/pgtypeslib/.gitignore
+++ b/src/interfaces/ecpg/pgtypeslib/.gitignore
@@ -4,3 +4,4 @@
 /pgstrcasecmp.c
 /rint.c
 /snprintf.c
+/strnlen.c
diff --git a/src/interfaces/ecpg/pgtypeslib/Makefile b/src/interfaces/ecpg/pgtypeslib/Makefile
index 9fc75661b5..01206568f1 100644
--- a/src/interfaces/ecpg/pgtypeslib/Makefile
+++ b/src/interfaces/ecpg/pgtypeslib/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for ecpg pgtypes library
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/interfaces/ecpg/pgtypeslib/Makefile
@@ -31,7 +31,8 @@ SHLIB_EXPORTS = exports.txt
 
 OBJS= numeric.o datetime.o common.o dt_common.o timestamp.o interval.o \
 	pgstrcasecmp.o \
-	$(filter rint.o snprintf.o, $(LIBOBJS)) $(WIN32RES)
+	$(filter rint.o snprintf.o strnlen.o, $(LIBOBJS)) \
+	$(WIN32RES)
 
 all: all-lib
 
@@ -43,7 +44,7 @@ include $(top_srcdir)/src/Makefile.shlib
 # necessarily use the same object files as the backend uses. Instead,
 # symlink the source files in here and build our own object file.
 
-pgstrcasecmp.c rint.c snprintf.c: % : $(top_srcdir)/src/port/%
+pgstrcasecmp.c rint.c snprintf.c strnlen.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 install: all installdirs install-lib
@@ -53,6 +54,6 @@ installdirs: installdirs-lib
 uninstall: uninstall-lib
 
 clean distclean: clean-lib
-	rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c
+	rm -f $(OBJS) pgstrcasecmp.c rint.c snprintf.c strnlen.c
 
 maintainer-clean: distclean maintainer-clean-lib
diff --git a/src/interfaces/ecpg/pgtypeslib/common.c b/src/interfaces/ecpg/pgtypeslib/common.c
index 9084fd06b4..ae29b6c4ab 100644
--- a/src/interfaces/ecpg/pgtypeslib/common.c
+++ b/src/interfaces/ecpg/pgtypeslib/common.c
@@ -12,7 +12,7 @@ pgtypes_alloc(long size)
 
 	if (!new)
 		errno = ENOMEM;
-	return (new);
+	return new;
 }
 
 char *
@@ -22,7 +22,7 @@ pgtypes_strdup(const char *str)
 
 	if (!new)
 		errno = ENOMEM;
-	return (new);
+	return new;
 }
 
 int
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
index 33c9011a71..1e692a5f9e 100644
--- a/src/interfaces/ecpg/pgtypeslib/datetime.c
+++ b/src/interfaces/ecpg/pgtypeslib/datetime.c
@@ -59,7 +59,7 @@ PGTYPESdate_from_asc(char *str, char **endptr)
 	char	   *realptr;
 	char	  **ptr = (endptr != NULL) ? endptr : &realptr;
 
-	bool		EuroDates = FALSE;
+	bool		EuroDates = false;
 
 	errno = 0;
 	if (strlen(str) > MAXDATELEN)
@@ -105,7 +105,7 @@ PGTYPESdate_to_asc(date dDate)
 			   *tm = &tt;
 	char		buf[MAXDATELEN + 1];
 	int			DateStyle = 1;
-	bool		EuroDates = FALSE;
+	bool		EuroDates = false;
 
 	j2date(dDate + date2j(2000, 1, 1), &(tm->tm_year), &(tm->tm_mon), &(tm->tm_mday));
 	EncodeDateOnly(tm, DateStyle, buf, EuroDates);
@@ -329,7 +329,7 @@ PGTYPESdate_fmt_asc(date dDate, const char *fmtstring, char *outbuf)
 
 #define PGTYPES_DATE_MONTH_MAXLENGTH		20	/* probably even less  :-) */
 int
-PGTYPESdate_defmt_asc(date * d, const char *fmt, char *str)
+PGTYPESdate_defmt_asc(date * d, const char *fmt, const char *str)
 {
 	/*
 	 * token[2] = { 4,6 } means that token 2 starts at position 4 and ends at
diff --git a/src/interfaces/ecpg/pgtypeslib/dt.h b/src/interfaces/ecpg/pgtypeslib/dt.h
index 5a192ddc45..8cf03bfedf 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt.h
+++ b/src/interfaces/ecpg/pgtypeslib/dt.h
@@ -313,12 +313,12 @@ do { \
 
 int			DecodeInterval(char **, int *, int, int *, struct tm *, fsec_t *);
 int			DecodeTime(char *, int *, struct tm *, fsec_t *);
-int			EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates);
-int			EncodeInterval(struct tm *tm, fsec_t fsec, int style, char *str);
+void		EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates);
+void		EncodeInterval(struct tm *tm, fsec_t fsec, int style, char *str);
 int			tm2timestamp(struct tm *, fsec_t, int *, timestamp *);
 int			DecodeUnits(int field, char *lowtoken, int *val);
 bool		CheckDateTokenTables(void);
-int			EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates);
+void		EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates);
 int			GetEpochTime(struct tm *);
 int			ParseDateTime(char *, char *, char **, int *, int *, char **);
 int			DecodeDateTime(char **, int *, int, int *, struct tm *, fsec_t *, bool);
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
index a26d61b32c..994389f4a1 100644
--- a/src/interfaces/ecpg/pgtypeslib/dt_common.c
+++ b/src/interfaces/ecpg/pgtypeslib/dt_common.c
@@ -671,11 +671,10 @@ DecodeSpecial(int field, char *lowtoken, int *val)
 /* EncodeDateOnly()
  * Encode date as local time.
  */
-int
+void
 EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates)
 {
-	if (tm->tm_mon < 1 || tm->tm_mon > MONTHS_PER_YEAR)
-		return -1;
+	Assert(tm->tm_mon >= 1 && tm->tm_mon <= MONTHS_PER_YEAR);
 
 	switch (style)
 	{
@@ -723,9 +722,7 @@ EncodeDateOnly(struct tm *tm, int style, char *str, bool EuroDates)
 				sprintf(str + 5, "-%04d %s", -(tm->tm_year - 1), "BC");
 			break;
 	}
-
-	return TRUE;
-}								/* EncodeDateOnly() */
+}
 
 void
 TrimTrailingZeros(char *str)
@@ -758,7 +755,7 @@ TrimTrailingZeros(char *str)
  *	US - mm/dd/yyyy
  *	European - dd/mm/yyyy
  */
-int
+void
 EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tzn, int style, char *str, bool EuroDates)
 {
 	int			day,
@@ -951,9 +948,7 @@ EncodeDateTime(struct tm *tm, fsec_t fsec, bool print_tz, int tz, const char *tz
 			}
 			break;
 	}
-
-	return TRUE;
-}								/* EncodeDateTime() */
+}
 
 int
 GetEpochTime(struct tm *tm)
@@ -1094,7 +1089,7 @@ dt2time(double jd, int *hour, int *min, int *sec, fsec_t *fsec)
  */
 static int
 DecodeNumberField(int len, char *str, int fmask,
-				  int *tmask, struct tm *tm, fsec_t *fsec, int *is2digits)
+				  int *tmask, struct tm *tm, fsec_t *fsec, bool *is2digits)
 {
 	char	   *cp;
 
@@ -1149,7 +1144,7 @@ DecodeNumberField(int len, char *str, int fmask,
 			tm->tm_mon = atoi(str + 2);
 			*(str + 2) = '\0';
 			tm->tm_year = atoi(str + 0);
-			*is2digits = TRUE;
+			*is2digits = true;
 
 			return DTK_DATE;
 		}
@@ -1161,7 +1156,7 @@ DecodeNumberField(int len, char *str, int fmask,
 			*(str + 2) = '\0';
 			tm->tm_mon = 1;
 			tm->tm_year = atoi(str + 0);
-			*is2digits = TRUE;
+			*is2digits = true;
 
 			return DTK_DATE;
 		}
@@ -1204,7 +1199,7 @@ DecodeNumberField(int len, char *str, int fmask,
  */
 static int
 DecodeNumber(int flen, char *str, int fmask,
-			 int *tmask, struct tm *tm, fsec_t *fsec, int *is2digits, bool EuroDates)
+			 int *tmask, struct tm *tm, fsec_t *fsec, bool *is2digits, bool EuroDates)
 {
 	int			val;
 	char	   *cp;
@@ -1319,8 +1314,8 @@ DecodeDate(char *str, int fmask, int *tmask, struct tm *tm, bool EuroDates)
 	int			nf = 0;
 	int			i,
 				len;
-	int			bc = FALSE;
-	int			is2digits = FALSE;
+	bool		bc = false;
+	bool		is2digits = false;
 	int			type,
 				val,
 				dmask = 0;
@@ -1797,9 +1792,9 @@ DecodeDateTime(char **field, int *ftype, int nf,
 	int			i;
 	int			val;
 	int			mer = HR24;
-	int			haveTextMonth = FALSE;
-	int			is2digits = FALSE;
-	int			bc = FALSE;
+	bool		haveTextMonth = false;
+	bool		is2digits = false;
+	bool		bc = false;
 	int			t = 0;
 	int		   *tzp = &t;
 
@@ -2205,7 +2200,7 @@ DecodeDateTime(char **field, int *ftype, int nf,
 							tm->tm_mday = tm->tm_mon;
 							tmask = DTK_M(DAY);
 						}
-						haveTextMonth = TRUE;
+						haveTextMonth = true;
 						tm->tm_mon = val;
 						break;
 
diff --git a/src/interfaces/ecpg/pgtypeslib/interval.c b/src/interfaces/ecpg/pgtypeslib/interval.c
index 30f2ccbcb7..24a2f36d4d 100644
--- a/src/interfaces/ecpg/pgtypeslib/interval.c
+++ b/src/interfaces/ecpg/pgtypeslib/interval.c
@@ -65,7 +65,7 @@ AdjustFractDays(double frac, struct /* pg_ */ tm *tm, fsec_t *fsec, int scale)
 
 /* copy&pasted from .../src/backend/utils/adt/datetime.c */
 static int
-ParseISO8601Number(char *str, char **endptr, int *ipart, double *fpart)
+ParseISO8601Number(const char *str, char **endptr, int *ipart, double *fpart)
 {
 	double		val;
 
@@ -90,7 +90,7 @@ ParseISO8601Number(char *str, char **endptr, int *ipart, double *fpart)
 
 /* copy&pasted from .../src/backend/utils/adt/datetime.c */
 static int
-ISO8601IntegerWidth(char *fieldstart)
+ISO8601IntegerWidth(const char *fieldstart)
 {
 	/* We might have had a leading '-' */
 	if (*fieldstart == '-')
@@ -331,8 +331,6 @@ DecodeISO8601Interval(char *str,
  *	* ECPG semes not to have a global IntervalStyle
  *	  so added
  *		int IntervalStyle = INTSTYLE_POSTGRES;
- *
- *	* Assert wasn't available so removed it.
  */
 int
 DecodeInterval(char **field, int *ftype, int nf,	/* int range, */
@@ -340,7 +338,7 @@ DecodeInterval(char **field, int *ftype, int nf,	/* int range, */
 {
 	int			IntervalStyle = INTSTYLE_POSTGRES_VERBOSE;
 	int			range = INTERVAL_FULL_RANGE;
-	bool		is_before = FALSE;
+	bool		is_before = false;
 	char	   *cp;
 	int			fmask = 0,
 				tmask,
@@ -374,7 +372,7 @@ DecodeInterval(char **field, int *ftype, int nf,	/* int range, */
 				 * least one digit; there could be ':', '.', '-' embedded in
 				 * it as well.
 				 */
-				/* Assert(*field[i] == '-' || *field[i] == '+'); */
+				Assert(*field[i] == '-' || *field[i] == '+');
 
 				/*
 				 * Try for hh:mm or hh:mm:ss.  If not, fall through to
@@ -585,7 +583,7 @@ DecodeInterval(char **field, int *ftype, int nf,	/* int range, */
 						break;
 
 					case AGO:
-						is_before = TRUE;
+						is_before = true;
 						type = val;
 						break;
 
@@ -707,7 +705,7 @@ AddVerboseIntPart(char *cp, int value, const char *units,
 	else if (*is_before)
 		value = -value;
 	sprintf(cp, " %d %s%s", value, units, (value == 1) ? "" : "s");
-	*is_zero = FALSE;
+	*is_zero = false;
 	return cp + strlen(cp);
 }
 
@@ -730,7 +728,7 @@ AddPostgresIntPart(char *cp, int value, const char *units,
 	 * tad bizarre but it's how it worked before...
 	 */
 	*is_before = (value < 0);
-	*is_zero = FALSE;
+	*is_zero = false;
 	return cp + strlen(cp);
 }
 
@@ -771,7 +769,7 @@ AppendSeconds(char *cp, int sec, fsec_t fsec, int precision, bool fillzeros)
  * Change pg_tm to tm
  */
 
-int
+void
 EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 {
 	char	   *cp = str;
@@ -781,8 +779,8 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 	int			hour = tm->tm_hour;
 	int			min = tm->tm_min;
 	int			sec = tm->tm_sec;
-	bool		is_before = FALSE;
-	bool		is_zero = TRUE;
+	bool		is_before = false;
+	bool		is_zero = true;
 
 	/*
 	 * The sign of year and month are guaranteed to match, since they are
@@ -928,7 +926,7 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 				if (sec < 0 || (sec == 0 && fsec < 0))
 				{
 					if (is_zero)
-						is_before = TRUE;
+						is_before = true;
 					else if (!is_before)
 						*cp++ = '-';
 				}
@@ -938,7 +936,7 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 				cp += strlen(cp);
 				sprintf(cp, " sec%s",
 						(abs(sec) != 1 || fsec != 0) ? "s" : "");
-				is_zero = FALSE;
+				is_zero = false;
 			}
 			/* identically zero? then put in a unitless zero... */
 			if (is_zero)
@@ -947,9 +945,7 @@ EncodeInterval(struct /* pg_ */ tm *tm, fsec_t fsec, int style, char *str)
 				strcat(cp, " ago");
 			break;
 	}
-
-	return 0;
-}								/* EncodeInterval() */
+}
 
 
 /* interval2tm()
@@ -1091,11 +1087,7 @@ PGTYPESinterval_to_asc(interval * span)
 		return NULL;
 	}
 
-	if (EncodeInterval(tm, fsec, IntervalStyle, buf) != 0)
-	{
-		errno = PGTYPES_INTVL_BAD_INTERVAL;
-		return NULL;
-	}
+	EncodeInterval(tm, fsec, IntervalStyle, buf);
 
 	return pgtypes_strdup(buf);
 }
diff --git a/src/interfaces/ecpg/pgtypeslib/numeric.c b/src/interfaces/ecpg/pgtypeslib/numeric.c
index a93d074de2..6643242ab1 100644
--- a/src/interfaces/ecpg/pgtypeslib/numeric.c
+++ b/src/interfaces/ecpg/pgtypeslib/numeric.c
@@ -40,7 +40,7 @@ apply_typmod(numeric *var, long typmod)
 
 	/* Do nothing if we have a default typmod (-1) */
 	if (typmod < (long) (VARHDRSZ))
-		return (0);
+		return 0;
 
 	typmod -= VARHDRSZ;
 	precision = (typmod >> 16) & 0xffff;
@@ -100,7 +100,7 @@ apply_typmod(numeric *var, long typmod)
 
 	var->rscale = scale;
 	var->dscale = scale;
-	return (0);
+	return 0;
 }
 #endif
 
@@ -162,7 +162,7 @@ PGTYPESdecimal_new(void)
 static int
 set_var_from_str(char *str, char **ptr, numeric *dest)
 {
-	bool		have_dp = FALSE;
+	bool		have_dp = false;
 	int			i = 0;
 
 	errno = 0;
@@ -214,7 +214,7 @@ set_var_from_str(char *str, char **ptr, numeric *dest)
 
 	if (*(*ptr) == '.')
 	{
-		have_dp = TRUE;
+		have_dp = true;
 		(*ptr)++;
 	}
 
@@ -241,7 +241,7 @@ set_var_from_str(char *str, char **ptr, numeric *dest)
 				errno = PGTYPES_NUM_BAD_NUMERIC;
 				return -1;
 			}
-			have_dp = TRUE;
+			have_dp = true;
 			(*ptr)++;
 		}
 		else
@@ -296,7 +296,7 @@ set_var_from_str(char *str, char **ptr, numeric *dest)
 		dest->weight = 0;
 
 	dest->rscale = dest->dscale;
-	return (0);
+	return 0;
 }
 
 
@@ -412,16 +412,16 @@ PGTYPESnumeric_from_asc(char *str, char **endptr)
 	char	  **ptr = (endptr != NULL) ? endptr : &realptr;
 
 	if (!value)
-		return (NULL);
+		return NULL;
 
 	ret = set_var_from_str(str, ptr, value);
 	if (ret)
 	{
 		PGTYPESnumeric_free(value);
-		return (NULL);
+		return NULL;
 	}
 
-	return (value);
+	return value;
 }
 
 char *
@@ -445,7 +445,7 @@ PGTYPESnumeric_to_asc(numeric *num, int dscale)
 	/* get_str_from_var may change its argument */
 	s = get_str_from_var(numcopy, dscale);
 	PGTYPESnumeric_free(numcopy);
-	return (s);
+	return s;
 }
 
 /* ----------
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
index 78931399e6..abccc268dc 100644
--- a/src/interfaces/ecpg/pgtypeslib/timestamp.c
+++ b/src/interfaces/ecpg/pgtypeslib/timestamp.c
@@ -192,7 +192,7 @@ timestamp2tm(timestamp dt, int *tzp, struct tm *tm, fsec_t *fsec, const char **t
 /* EncodeSpecialTimestamp()
  *	* Convert reserved timestamp data type to string.
  *	 */
-static int
+static void
 EncodeSpecialTimestamp(timestamp dt, char *str)
 {
 	if (TIMESTAMP_IS_NOBEGIN(dt))
@@ -200,10 +200,8 @@ EncodeSpecialTimestamp(timestamp dt, char *str)
 	else if (TIMESTAMP_IS_NOEND(dt))
 		strcpy(str, LATE);
 	else
-		return FALSE;
-
-	return TRUE;
-}								/* EncodeSpecialTimestamp() */
+		abort();				/* shouldn't happen */
+}
 
 timestamp
 PGTYPEStimestamp_from_asc(char *str, char **endptr)
@@ -224,14 +222,14 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 	if (strlen(str) > MAXDATELEN)
 	{
 		errno = PGTYPES_TS_BAD_TIMESTAMP;
-		return (noresult);
+		return noresult;
 	}
 
 	if (ParseDateTime(str, lowstr, field, ftype, &nf, ptr) != 0 ||
 		DecodeDateTime(field, ftype, nf, &dtype, tm, &fsec, 0) != 0)
 	{
 		errno = PGTYPES_TS_BAD_TIMESTAMP;
-		return (noresult);
+		return noresult;
 	}
 
 	switch (dtype)
@@ -240,7 +238,7 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 			if (tm2timestamp(tm, fsec, NULL, &result) != 0)
 			{
 				errno = PGTYPES_TS_BAD_TIMESTAMP;
-				return (noresult);
+				return noresult;
 			}
 			break;
 
@@ -258,11 +256,11 @@ PGTYPEStimestamp_from_asc(char *str, char **endptr)
 
 		case DTK_INVALID:
 			errno = PGTYPES_TS_BAD_TIMESTAMP;
-			return (noresult);
+			return noresult;
 
 		default:
 			errno = PGTYPES_TS_BAD_TIMESTAMP;
-			return (noresult);
+			return noresult;
 	}
 
 	/* AdjustTimestampForTypmod(&result, typmod); */
@@ -815,7 +813,7 @@ PGTYPEStimestamp_sub(timestamp * ts1, timestamp * ts2, interval * iv)
 }
 
 int
-PGTYPEStimestamp_defmt_asc(char *str, const char *fmt, timestamp * d)
+PGTYPEStimestamp_defmt_asc(const char *str, const char *fmt, timestamp * d)
 {
 	int			year,
 				month,
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 02a6e65daf..0a00893b43 100644
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/interfaces/ecpg/preproc
 #
-# Copyright (c) 1998-2017, PostgreSQL Global Development Group
+# Copyright (c) 1998-2018, PostgreSQL Global Development Group
 #
 # src/interfaces/ecpg/preproc/Makefile
 #
diff --git a/src/interfaces/ecpg/preproc/check_rules.pl b/src/interfaces/ecpg/preproc/check_rules.pl
index e681943856..4c2151c1b6 100644
--- a/src/interfaces/ecpg/preproc/check_rules.pl
+++ b/src/interfaces/ecpg/preproc/check_rules.pl
@@ -3,7 +3,7 @@
 # test parser generater for ecpg
 # call with backend parser as stdin
 #
-# Copyright (c) 2009-2017, PostgreSQL Global Development Group
+# Copyright (c) 2009-2018, PostgreSQL Global Development Group
 #
 # Written by Michael Meskes <meskes@postgresql.org>
 #            Andy Colson <andy@squeakycode.net>
diff --git a/src/interfaces/ecpg/preproc/ecpg.c b/src/interfaces/ecpg/preproc/ecpg.c
index bad0a667fc..cd770c8b15 100644
--- a/src/interfaces/ecpg/preproc/ecpg.c
+++ b/src/interfaces/ecpg/preproc/ecpg.c
@@ -1,7 +1,7 @@
 /* src/interfaces/ecpg/preproc/ecpg.c */
 
 /* Main for ecpg, the PostgreSQL embedded SQL precompiler. */
-/* Copyright (c) 1996-2017, PostgreSQL Global Development Group */
+/* Copyright (c) 1996-2018, PostgreSQL Global Development Group */
 
 #include "postgres_fe.h"
 
@@ -137,7 +137,7 @@ main(int argc, char *const argv[])
 	if (find_my_exec(argv[0], my_exec_path) < 0)
 	{
 		fprintf(stderr, _("%s: could not locate my own executable path\n"), argv[0]);
-		return (ILLEGAL_OPTION);
+		return ILLEGAL_OPTION;
 	}
 
 	if (argc > 1)
@@ -198,12 +198,12 @@ main(int argc, char *const argv[])
 				system_includes = true;
 				break;
 			case 'C':
-				if (strncmp(optarg, "INFORMIX", strlen("INFORMIX")) == 0)
+				if (pg_strcasecmp(optarg, "INFORMIX") == 0 || pg_strcasecmp(optarg, "INFORMIX_SE") == 0)
 				{
 					char		pkginclude_path[MAXPGPATH];
 					char		informix_path[MAXPGPATH];
 
-					compat = (strcmp(optarg, "INFORMIX") == 0) ? ECPG_COMPAT_INFORMIX : ECPG_COMPAT_INFORMIX_SE;
+					compat = (pg_strcasecmp(optarg, "INFORMIX") == 0) ? ECPG_COMPAT_INFORMIX : ECPG_COMPAT_INFORMIX_SE;
 					get_pkginclude_path(my_exec_path, pkginclude_path);
 					snprintf(informix_path, MAXPGPATH, "%s/informix/esql", pkginclude_path);
 					add_include_path(informix_path);
@@ -266,7 +266,7 @@ main(int argc, char *const argv[])
 	{
 		fprintf(stderr, _("%s: no input files specified\n"), progname);
 		fprintf(stderr, _("Try \"%s --help\" for more information.\n"), argv[0]);
-		return (ILLEGAL_OPTION);
+		return ILLEGAL_OPTION;
 	}
 	else
 	{
diff --git a/src/interfaces/ecpg/preproc/ecpg.header b/src/interfaces/ecpg/preproc/ecpg.header
index 2562366bbe..8921bcbeae 100644
--- a/src/interfaces/ecpg/preproc/ecpg.header
+++ b/src/interfaces/ecpg/preproc/ecpg.header
@@ -142,7 +142,7 @@ cat2_str(char *str1, char *str2)
 	strcat(res_str, str2);
 	free(str1);
 	free(str2);
-	return(res_str);
+	return res_str;
 }
 
 static char *
@@ -162,7 +162,7 @@ cat_str(int count, ...)
 
 	va_end(args);
 
-	return(res_str);
+	return res_str;
 }
 
 static char *
@@ -174,7 +174,7 @@ make2_str(char *str1, char *str2)
 	strcat(res_str, str2);
 	free(str1);
 	free(str2);
-	return(res_str);
+	return res_str;
 }
 
 static char *
@@ -188,7 +188,7 @@ make3_str(char *str1, char *str2, char *str3)
 	free(str1);
 	free(str2);
 	free(str3);
-	return(res_str);
+	return res_str;
 }
 
 /* and the rest */
@@ -233,7 +233,7 @@ create_questionmarks(char *name, bool array)
 	/* removed the trailing " ," */
 
 	result[strlen(result)-3] = '\0';
-	return(result);
+	return result;
 }
 
 static char *
@@ -352,7 +352,7 @@ adjust_outofscope_cursor_vars(struct cursor *cur)
 				else
 				{
 					newvar = new_variable(cat_str(4, mm_strdup("("),
-												  mm_strdup(ecpg_type_name(ptr->variable->type->type)),
+												  mm_strdup(ecpg_type_name(ptr->variable->type->u.element->type)),
 												  mm_strdup(" *)(ECPGget_var("),
 												  mm_strdup(var_text)),
 										  ECPGmake_array_type(ECPGmake_simple_type(ptr->variable->type->u.element->type,
diff --git a/src/interfaces/ecpg/preproc/ecpg.tokens b/src/interfaces/ecpg/preproc/ecpg.tokens
index 68ba925efe..1d613af02f 100644
--- a/src/interfaces/ecpg/preproc/ecpg.tokens
+++ b/src/interfaces/ecpg/preproc/ecpg.tokens
@@ -2,7 +2,7 @@
 
 /* special embedded SQL tokens */
 %token  SQL_ALLOCATE SQL_AUTOCOMMIT SQL_BOOL SQL_BREAK
-                SQL_CALL SQL_CARDINALITY SQL_CONNECT
+                SQL_CARDINALITY SQL_CONNECT
                 SQL_COUNT
                 SQL_DATETIME_INTERVAL_CODE
                 SQL_DATETIME_INTERVAL_PRECISION SQL_DESCRIBE
diff --git a/src/interfaces/ecpg/preproc/ecpg.trailer b/src/interfaces/ecpg/preproc/ecpg.trailer
index d273070dab..19dc781885 100644
--- a/src/interfaces/ecpg/preproc/ecpg.trailer
+++ b/src/interfaces/ecpg/preproc/ecpg.trailer
@@ -1454,13 +1454,19 @@ action : CONTINUE_P
 			$<action>$.command = NULL;
 			$<action>$.str = mm_strdup("break");
 		}
-		| SQL_CALL name '(' c_args ')'
+		| DO CONTINUE_P
+		{
+			$<action>$.code = W_CONTINUE;
+			$<action>$.command = NULL;
+			$<action>$.str = mm_strdup("continue");
+		}
+		| CALL name '(' c_args ')'
 		{
 			$<action>$.code = W_DO;
 			$<action>$.command = cat_str(4, $2, mm_strdup("("), $4, mm_strdup(")"));
 			$<action>$.str = cat2_str(mm_strdup("call"), mm_strdup($<action>$.command));
 		}
-		| SQL_CALL name
+		| CALL name
 		{
 			$<action>$.code = W_DO;
 			$<action>$.command = cat2_str($2, mm_strdup("()"));
@@ -1476,7 +1482,6 @@ ECPGKeywords: ECPGKeywords_vanames	{ $$ = $1; }
 		;
 
 ECPGKeywords_vanames:  SQL_BREAK		{ $$ = mm_strdup("break"); }
-		| SQL_CALL						{ $$ = mm_strdup("call"); }
 		| SQL_CARDINALITY				{ $$ = mm_strdup("cardinality"); }
 		| SQL_COUNT						{ $$ = mm_strdup("count"); }
 		| SQL_DATETIME_INTERVAL_CODE	{ $$ = mm_strdup("datetime_interval_code"); }
diff --git a/src/interfaces/ecpg/preproc/ecpg_keywords.c b/src/interfaces/ecpg/preproc/ecpg_keywords.c
index 3b52b8f3a2..848b2d4849 100644
--- a/src/interfaces/ecpg/preproc/ecpg_keywords.c
+++ b/src/interfaces/ecpg/preproc/ecpg_keywords.c
@@ -33,7 +33,6 @@ static const ScanKeyword ECPGScanKeywords[] = {
 	{"autocommit", SQL_AUTOCOMMIT, 0},
 	{"bool", SQL_BOOL, 0},
 	{"break", SQL_BREAK, 0},
-	{"call", SQL_CALL, 0},
 	{"cardinality", SQL_CARDINALITY, 0},
 	{"connect", SQL_CONNECT, 0},
 	{"count", SQL_COUNT, 0},
diff --git a/src/interfaces/ecpg/preproc/keywords.c b/src/interfaces/ecpg/preproc/keywords.c
index f016d7fc6f..21e1f928fd 100644
--- a/src/interfaces/ecpg/preproc/keywords.c
+++ b/src/interfaces/ecpg/preproc/keywords.c
@@ -4,7 +4,7 @@
  *	  lexical token lookup for key words in PostgreSQL
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/interfaces/ecpg/preproc/output.c b/src/interfaces/ecpg/preproc/output.c
index 0479c93c99..a55bf2b06a 100644
--- a/src/interfaces/ecpg/preproc/output.c
+++ b/src/interfaces/ecpg/preproc/output.c
@@ -51,6 +51,9 @@ print_action(struct when *w)
 		case W_BREAK:
 			fprintf(base_yyout, "break;");
 			break;
+		case W_CONTINUE:
+			fprintf(base_yyout, "continue;");
+			break;
 		default:
 			fprintf(base_yyout, "{/* %d not implemented yet */}", w->code);
 			break;
diff --git a/src/interfaces/ecpg/preproc/parse.pl b/src/interfaces/ecpg/preproc/parse.pl
index 768df3a6b1..e68cc26f52 100644
--- a/src/interfaces/ecpg/preproc/parse.pl
+++ b/src/interfaces/ecpg/preproc/parse.pl
@@ -3,7 +3,7 @@
 # parser generater for ecpg version 2
 # call with backend parser as stdin
 #
-# Copyright (c) 2007-2017, PostgreSQL Global Development Group
+# Copyright (c) 2007-2018, PostgreSQL Global Development Group
 #
 # Written by Mike Aubury <mike.aubury@aubit.com>
 #            Michael Meskes <meskes@postgresql.org>
diff --git a/src/interfaces/ecpg/preproc/parser.c b/src/interfaces/ecpg/preproc/parser.c
index 0c2705cd2b..e5a8f9d170 100644
--- a/src/interfaces/ecpg/preproc/parser.c
+++ b/src/interfaces/ecpg/preproc/parser.c
@@ -7,7 +7,7 @@
  * need to bother with re-entrant interfaces.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/interfaces/ecpg/preproc/pgc.l b/src/interfaces/ecpg/preproc/pgc.l
index 3598a200d0..e99b7ff586 100644
--- a/src/interfaces/ecpg/preproc/pgc.l
+++ b/src/interfaces/ecpg/preproc/pgc.l
@@ -7,7 +7,7 @@
  * This is a modified version of src/backend/parser/scan.l
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -79,6 +79,8 @@ static struct _if_value
 	short else_branch;
 } stacked_if_value[MAX_NESTED_IF];
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option 8bit
@@ -768,7 +770,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					}
 <SQL>:{identifier}((("->"|\.){identifier})|(\[{array}\]))*	{
 						base_yylval.str = mm_strdup(yytext+1);
-						return(CVARIABLE);
+						return CVARIABLE;
 					}
 <SQL>{identifier}	{
 						const ScanKeyword  *keyword;
@@ -832,7 +834,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 						{
 							base_yylval.str = mm_strdup(yytext);
-							return(CPP_LINE);
+							return CPP_LINE;
 						}
 					}
 <C>{cppinclude_next}		{
@@ -844,12 +846,12 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 						{
 							base_yylval.str = mm_strdup(yytext);
-							return(CPP_LINE);
+							return CPP_LINE;
 						}
 					}
 <C,SQL>{cppline}	{
 						base_yylval.str = mm_strdup(yytext);
-						return(CPP_LINE);
+						return CPP_LINE;
 					}
 <C>{identifier}		{
 						const ScanKeyword		*keyword;
@@ -879,38 +881,38 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						}
 					}
 <C>{xcstop}			{ mmerror(PARSE_ERROR, ET_ERROR, "nested /* ... */ comments"); }
-<C>":"				{ return(':'); }
-<C>";"				{ return(';'); }
-<C>","				{ return(','); }
-<C>"*"				{ return('*'); }
-<C>"%"				{ return('%'); }
-<C>"/"				{ return('/'); }
-<C>"+"				{ return('+'); }
-<C>"-"				{ return('-'); }
-<C>"("				{ parenths_open++; return('('); }
-<C>")"				{ parenths_open--; return(')'); }
+<C>":"				{ return ':'; }
+<C>";"				{ return ';'; }
+<C>","				{ return ','; }
+<C>"*"				{ return '*'; }
+<C>"%"				{ return '%'; }
+<C>"/"				{ return '/'; }
+<C>"+"				{ return '+'; }
+<C>"-"				{ return '-'; }
+<C>"("				{ parenths_open++; return '('; }
+<C>")"				{ parenths_open--; return ')'; }
 <C,xskip>{space}		{ ECHO; }
-<C>\{				{ return('{'); }
-<C>\}				{ return('}'); }
-<C>\[				{ return('['); }
-<C>\]				{ return(']'); }
-<C>\=				{ return('='); }
-<C>"->"				{ return(S_MEMBER); }
-<C>">>"				{ return(S_RSHIFT); }
-<C>"<<"				{ return(S_LSHIFT); }
-<C>"||"				{ return(S_OR); }
-<C>"&&"				{ return(S_AND); }
-<C>"++"				{ return(S_INC); }
-<C>"--"				{ return(S_DEC); }
-<C>"=="				{ return(S_EQUAL); }
-<C>"!="				{ return(S_NEQUAL); }
-<C>"+="				{ return(S_ADD); }
-<C>"-="				{ return(S_SUB); }
-<C>"*="				{ return(S_MUL); }
-<C>"/="				{ return(S_DIV); }
-<C>"%="				{ return(S_MOD); }
-<C>"->*"			{ return(S_MEMPOINT); }
-<C>".*"				{ return(S_DOTPOINT); }
+<C>\{				{ return '{'; }
+<C>\}				{ return '}'; }
+<C>\[				{ return '['; }
+<C>\]				{ return ']'; }
+<C>\=				{ return '='; }
+<C>"->"				{ return S_MEMBER; }
+<C>">>"				{ return S_RSHIFT; }
+<C>"<<"				{ return S_LSHIFT; }
+<C>"||"				{ return S_OR; }
+<C>"&&"				{ return S_AND; }
+<C>"++"				{ return S_INC; }
+<C>"--"				{ return S_DEC; }
+<C>"=="				{ return S_EQUAL; }
+<C>"!="				{ return S_NEQUAL; }
+<C>"+="				{ return S_ADD; }
+<C>"-="				{ return S_SUB; }
+<C>"*="				{ return S_MUL; }
+<C>"/="				{ return S_DIV; }
+<C>"%="				{ return S_MOD; }
+<C>"->*"			{ return S_MEMPOINT; }
+<C>".*"				{ return S_DOTPOINT; }
 <C>{other}			{ return S_ANYTHING; }
 <C>{exec_sql}{define}{space}*	{ BEGIN(def_ident); }
 <C>{informix_special}{define}{space}*	{
@@ -922,7 +924,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 						{
 							yyless(1);
-							return (S_ANYTHING);
+							return S_ANYTHING;
 						}
 					}
 <C>{exec_sql}{undef}{space}*		{ BEGIN(undef); }
@@ -935,7 +937,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 						{
 							yyless(1);
-							return (S_ANYTHING);
+							return S_ANYTHING;
 						}
 					}
 <undef>{identifier}{space}*";" {
@@ -984,35 +986,35 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					  else
 					  {
 						  yyless(1);
-						  return (S_ANYTHING);
+						  return S_ANYTHING;
 					  }
 					}
-<C,xskip>{exec_sql}{ifdef}{space}*	{ ifcond = TRUE; BEGIN(xcond); }
+<C,xskip>{exec_sql}{ifdef}{space}*	{ ifcond = true; BEGIN(xcond); }
 <C,xskip>{informix_special}{ifdef}{space}* {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
 					  {
-						  ifcond = TRUE;
+						  ifcond = true;
 						  BEGIN(xcond);
 					  }
 					  else
 					  {
 						  yyless(1);
-						  return (S_ANYTHING);
+						  return S_ANYTHING;
 					  }
 					}
-<C,xskip>{exec_sql}{ifndef}{space}* { ifcond = FALSE; BEGIN(xcond); }
+<C,xskip>{exec_sql}{ifndef}{space}* { ifcond = false; BEGIN(xcond); }
 <C,xskip>{informix_special}{ifndef}{space}* {
 					  /* are we simulating Informix? */
 					  if (INFORMIX_MODE)
 					  {
-						  ifcond = FALSE;
+						  ifcond = false;
 						  BEGIN(xcond);
 					  }
 					  else
 					  {
 						  yyless(1);
-						  return (S_ANYTHING);
+						  return S_ANYTHING;
 					  }
 					}
 <C,xskip>{exec_sql}{elif}{space}*	{	/* pop stack */
@@ -1024,7 +1026,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 							preproc_tos--;
 
-						ifcond = TRUE; BEGIN(xcond);
+						ifcond = true; BEGIN(xcond);
 					}
 <C,xskip>{informix_special}{elif}{space}* {
 					/* are we simulating Informix? */
@@ -1037,13 +1039,13 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						else
 							preproc_tos--;
 
-						ifcond = TRUE;
+						ifcond = true;
 						BEGIN(xcond);
 					}
 					else
 					{
 						yyless(1);
-						return (S_ANYTHING);
+						return S_ANYTHING;
 					}
 				}
 
@@ -1052,7 +1054,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 						mmfatal(PARSE_ERROR, "more than one EXEC SQL ELSE");
 					else
 					{
-						stacked_if_value[preproc_tos].else_branch = TRUE;
+						stacked_if_value[preproc_tos].else_branch = true;
 						stacked_if_value[preproc_tos].condition =
 							(stacked_if_value[preproc_tos-1].condition &&
 							 !stacked_if_value[preproc_tos].condition);
@@ -1071,7 +1073,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 							mmfatal(PARSE_ERROR, "more than one EXEC SQL ELSE");
 						else
 						{
-							stacked_if_value[preproc_tos].else_branch = TRUE;
+							stacked_if_value[preproc_tos].else_branch = true;
 							stacked_if_value[preproc_tos].condition =
 							(stacked_if_value[preproc_tos-1].condition &&
 							 !stacked_if_value[preproc_tos].condition);
@@ -1085,7 +1087,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					else
 					{
 						yyless(1);
-						return (S_ANYTHING);
+						return S_ANYTHING;
 					}
 				}
 <C,xskip>{exec_sql}{endif}{space}*";" {
@@ -1116,7 +1118,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					else
 					{
 						yyless(1);
-						return (S_ANYTHING);
+						return S_ANYTHING;
 					}
 				}
 
@@ -1145,7 +1147,7 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 							 defptr = defptr->next);
 
 						preproc_tos++;
-						stacked_if_value[preproc_tos].else_branch = FALSE;
+						stacked_if_value[preproc_tos].else_branch = false;
 						stacked_if_value[preproc_tos].condition =
 						(defptr ? ifcond : !ifcond) && stacked_if_value[preproc_tos-1].condition;
 					}
@@ -1249,7 +1251,11 @@ cppline			{space}*#([^i][A-Za-z]*|{if}|{ifdef}|{ifndef}|{import})((\/\*[^*/]*\*+
 					}
 				}
 <INITIAL>{other}|\n	{ mmfatal(PARSE_ERROR, "internal error: unreachable state; please report this to <pgsql-bugs@postgresql.org>"); }
+
 %%
+
+/* LCOV_EXCL_STOP */
+
 void
 lex_init(void)
 {
@@ -1259,9 +1265,9 @@ lex_init(void)
 
 	preproc_tos = 0;
 	yylineno = 1;
-	ifcond = TRUE;
+	ifcond = true;
 	stacked_if_value[preproc_tos].condition = ifcond;
-	stacked_if_value[preproc_tos].else_branch = FALSE;
+	stacked_if_value[preproc_tos].else_branch = false;
 
 	/* initialize literal buffer to a reasonable but expansible size */
 	if (literalbuf == NULL)
@@ -1406,7 +1412,7 @@ parse_include(void)
 }
 
 /*
- * ecpg_isspace() --- return TRUE if flex scanner considers char whitespace
+ * ecpg_isspace() --- return true if flex scanner considers char whitespace
  */
 static bool
 ecpg_isspace(char ch)
diff --git a/src/interfaces/ecpg/preproc/type.c b/src/interfaces/ecpg/preproc/type.c
index 750cdf9c7c..fa1a05c302 100644
--- a/src/interfaces/ecpg/preproc/type.c
+++ b/src/interfaces/ecpg/preproc/type.c
@@ -69,12 +69,12 @@ ECPGstruct_member_dup(struct ECPGstruct_member *rm)
 		rm = rm->next;
 	}
 
-	return (new);
+	return new;
 }
 
 /* The NAME argument is copied. The type argument is preserved as a pointer. */
 void
-ECPGmake_struct_member(char *name, struct ECPGtype *type, struct ECPGstruct_member **start)
+ECPGmake_struct_member(const char *name, struct ECPGtype *type, struct ECPGstruct_member **start)
 {
 	struct ECPGstruct_member *ptr,
 			   *ne =
@@ -135,78 +135,78 @@ get_type(enum ECPGttype type)
 	switch (type)
 	{
 		case ECPGt_char:
-			return ("ECPGt_char");
+			return "ECPGt_char";
 			break;
 		case ECPGt_unsigned_char:
-			return ("ECPGt_unsigned_char");
+			return "ECPGt_unsigned_char";
 			break;
 		case ECPGt_short:
-			return ("ECPGt_short");
+			return "ECPGt_short";
 			break;
 		case ECPGt_unsigned_short:
-			return ("ECPGt_unsigned_short");
+			return "ECPGt_unsigned_short";
 			break;
 		case ECPGt_int:
-			return ("ECPGt_int");
+			return "ECPGt_int";
 			break;
 		case ECPGt_unsigned_int:
-			return ("ECPGt_unsigned_int");
+			return "ECPGt_unsigned_int";
 			break;
 		case ECPGt_long:
-			return ("ECPGt_long");
+			return "ECPGt_long";
 			break;
 		case ECPGt_unsigned_long:
-			return ("ECPGt_unsigned_long");
+			return "ECPGt_unsigned_long";
 			break;
 		case ECPGt_long_long:
-			return ("ECPGt_long_long");
+			return "ECPGt_long_long";
 			break;
 		case ECPGt_unsigned_long_long:
-			return ("ECPGt_unsigned_long_long");
+			return "ECPGt_unsigned_long_long";
 			break;
 		case ECPGt_float:
-			return ("ECPGt_float");
+			return "ECPGt_float";
 			break;
 		case ECPGt_double:
-			return ("ECPGt_double");
+			return "ECPGt_double";
 			break;
 		case ECPGt_bool:
-			return ("ECPGt_bool");
+			return "ECPGt_bool";
 			break;
 		case ECPGt_varchar:
-			return ("ECPGt_varchar");
+			return "ECPGt_varchar";
 		case ECPGt_NO_INDICATOR:	/* no indicator */
-			return ("ECPGt_NO_INDICATOR");
+			return "ECPGt_NO_INDICATOR";
 			break;
 		case ECPGt_char_variable:	/* string that should not be quoted */
-			return ("ECPGt_char_variable");
+			return "ECPGt_char_variable";
 			break;
 		case ECPGt_const:		/* constant string quoted */
-			return ("ECPGt_const");
+			return "ECPGt_const";
 			break;
 		case ECPGt_decimal:
-			return ("ECPGt_decimal");
+			return "ECPGt_decimal";
 			break;
 		case ECPGt_numeric:
-			return ("ECPGt_numeric");
+			return "ECPGt_numeric";
 			break;
 		case ECPGt_interval:
-			return ("ECPGt_interval");
+			return "ECPGt_interval";
 			break;
 		case ECPGt_descriptor:
-			return ("ECPGt_descriptor");
+			return "ECPGt_descriptor";
 			break;
 		case ECPGt_sqlda:
-			return ("ECPGt_sqlda");
+			return "ECPGt_sqlda";
 			break;
 		case ECPGt_date:
-			return ("ECPGt_date");
+			return "ECPGt_date";
 			break;
 		case ECPGt_timestamp:
-			return ("ECPGt_timestamp");
+			return "ECPGt_timestamp";
 			break;
 		case ECPGt_string:
-			return ("ECPGt_string");
+			return "ECPGt_string";
 			break;
 		default:
 			mmerror(PARSE_ERROR, ET_ERROR, "unrecognized variable type code %d", type);
@@ -609,7 +609,17 @@ ECPGdump_a_struct(FILE *o, const char *name, const char *ind_name, char *arrsize
 						prefix, ind_prefix, arrsize, type->struct_sizeof,
 						(ind_p != NULL) ? ind_type->struct_sizeof : NULL);
 		if (ind_p != NULL && ind_p != &struct_no_indicator)
+		{
 			ind_p = ind_p->next;
+			if (ind_p == NULL && p->next != NULL) {
+				mmerror(PARSE_ERROR, ET_WARNING, "indicator struct \"%s\" has too few members", ind_name);
+				ind_p = &struct_no_indicator;
+			}
+		}
+	}
+
+	if (ind_type != NULL && ind_p != NULL && ind_p != &struct_no_indicator) {
+		mmerror(PARSE_ERROR, ET_WARNING, "indicator struct \"%s\" has too many members", ind_name);
 	}
 
 	free(pbuf);
@@ -674,51 +684,51 @@ get_dtype(enum ECPGdtype type)
 	switch (type)
 	{
 		case ECPGd_count:
-			return ("ECPGd_countr");
+			return "ECPGd_countr";
 			break;
 		case ECPGd_data:
-			return ("ECPGd_data");
+			return "ECPGd_data";
 			break;
 		case ECPGd_di_code:
-			return ("ECPGd_di_code");
+			return "ECPGd_di_code";
 			break;
 		case ECPGd_di_precision:
-			return ("ECPGd_di_precision");
+			return "ECPGd_di_precision";
 			break;
 		case ECPGd_indicator:
-			return ("ECPGd_indicator");
+			return "ECPGd_indicator";
 			break;
 		case ECPGd_key_member:
-			return ("ECPGd_key_member");
+			return "ECPGd_key_member";
 			break;
 		case ECPGd_length:
-			return ("ECPGd_length");
+			return "ECPGd_length";
 			break;
 		case ECPGd_name:
-			return ("ECPGd_name");
+			return "ECPGd_name";
 			break;
 		case ECPGd_nullable:
-			return ("ECPGd_nullable");
+			return "ECPGd_nullable";
 			break;
 		case ECPGd_octet:
-			return ("ECPGd_octet");
+			return "ECPGd_octet";
 			break;
 		case ECPGd_precision:
-			return ("ECPGd_precision");
+			return "ECPGd_precision";
 			break;
 		case ECPGd_ret_length:
-			return ("ECPGd_ret_length");
+			return "ECPGd_ret_length";
 		case ECPGd_ret_octet:
-			return ("ECPGd_ret_octet");
+			return "ECPGd_ret_octet";
 			break;
 		case ECPGd_scale:
-			return ("ECPGd_scale");
+			return "ECPGd_scale";
 			break;
 		case ECPGd_type:
-			return ("ECPGd_type");
+			return "ECPGd_type";
 			break;
 		case ECPGd_cardinality:
-			return ("ECPGd_cardinality");
+			return "ECPGd_cardinality";
 		default:
 			mmerror(PARSE_ERROR, ET_ERROR, "unrecognized descriptor item code %d", type);
 	}
diff --git a/src/interfaces/ecpg/preproc/type.h b/src/interfaces/ecpg/preproc/type.h
index 4b93336480..fc70d7d218 100644
--- a/src/interfaces/ecpg/preproc/type.h
+++ b/src/interfaces/ecpg/preproc/type.h
@@ -33,7 +33,7 @@ struct ECPGtype
 };
 
 /* Everything is malloced. */
-void		ECPGmake_struct_member(char *, struct ECPGtype *, struct ECPGstruct_member **);
+void		ECPGmake_struct_member(const char *, struct ECPGtype *, struct ECPGstruct_member **);
 struct ECPGtype *ECPGmake_simple_type(enum ECPGttype, char *, int);
 struct ECPGtype *ECPGmake_array_type(struct ECPGtype *, char *);
 struct ECPGtype *ECPGmake_struct_type(struct ECPGstruct_member *, enum ECPGttype, char *, char *);
diff --git a/src/interfaces/ecpg/preproc/variable.c b/src/interfaces/ecpg/preproc/variable.c
index 31225738e0..39bf3b2474 100644
--- a/src/interfaces/ecpg/preproc/variable.c
+++ b/src/interfaces/ecpg/preproc/variable.c
@@ -18,7 +18,7 @@ new_variable(const char *name, struct ECPGtype *type, int brace_level)
 	p->next = allvariables;
 	allvariables = p;
 
-	return (p);
+	return p;
 }
 
 static struct variable *
@@ -44,12 +44,12 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
 				switch (members->type->type)
 				{
 					case ECPGt_array:
-						return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), members->type->size), brace_level));
+						return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), members->type->size), brace_level);
 					case ECPGt_struct:
 					case ECPGt_union:
-						return (new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->type_name, members->type->struct_sizeof), brace_level));
+						return new_variable(name, ECPGmake_struct_type(members->type->u.members, members->type->type, members->type->type_name, members->type->struct_sizeof), brace_level);
 					default:
-						return (new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size, members->type->counter), brace_level));
+						return new_variable(name, ECPGmake_simple_type(members->type->type, members->type->size, members->type->counter), brace_level);
 				}
 			}
 			else
@@ -91,26 +91,26 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
 						switch (members->type->u.element->type)
 						{
 							case ECPGt_array:
-								return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->u.element->type, members->type->u.element->u.element->size, members->type->u.element->u.element->counter), members->type->u.element->size), brace_level));
+								return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(members->type->u.element->u.element->type, members->type->u.element->u.element->size, members->type->u.element->u.element->counter), members->type->u.element->size), brace_level);
 							case ECPGt_struct:
 							case ECPGt_union:
-								return (new_variable(name, ECPGmake_struct_type(members->type->u.element->u.members, members->type->u.element->type, members->type->u.element->type_name, members->type->u.element->struct_sizeof), brace_level));
+								return new_variable(name, ECPGmake_struct_type(members->type->u.element->u.members, members->type->u.element->type, members->type->u.element->type_name, members->type->u.element->struct_sizeof), brace_level);
 							default:
-								return (new_variable(name, ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), brace_level));
+								return new_variable(name, ECPGmake_simple_type(members->type->u.element->type, members->type->u.element->size, members->type->u.element->counter), brace_level);
 						}
 						break;
 					case '-':
 						if (members->type->type == ECPGt_array)
-							return (find_struct_member(name, ++end, members->type->u.element->u.members, brace_level));
+							return find_struct_member(name, ++end, members->type->u.element->u.members, brace_level);
 						else
-							return (find_struct_member(name, ++end, members->type->u.members, brace_level));
+							return find_struct_member(name, ++end, members->type->u.members, brace_level);
 						break;
 						break;
 					case '.':
 						if (members->type->type == ECPGt_array)
-							return (find_struct_member(name, end, members->type->u.element->u.members, brace_level));
+							return find_struct_member(name, end, members->type->u.element->u.members, brace_level);
 						else
-							return (find_struct_member(name, end, members->type->u.members, brace_level));
+							return find_struct_member(name, end, members->type->u.members, brace_level);
 						break;
 					default:
 						mmfatal(PARSE_ERROR, "incorrectly formed variable \"%s\"", name);
@@ -120,7 +120,7 @@ find_struct_member(char *name, char *str, struct ECPGstruct_member *members, int
 		}
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 static struct variable *
@@ -185,7 +185,7 @@ find_simple(char *name)
 			return p;
 	}
 
-	return (NULL);
+	return NULL;
 }
 
 /* Note that this function will end the program in case of an unknown */
@@ -236,12 +236,12 @@ find_variable(char *name)
 				switch (p->type->u.element->type)
 				{
 					case ECPGt_array:
-						return (new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(p->type->u.element->u.element->type, p->type->u.element->u.element->size, p->type->u.element->u.element->counter), p->type->u.element->size), p->brace_level));
+						return new_variable(name, ECPGmake_array_type(ECPGmake_simple_type(p->type->u.element->u.element->type, p->type->u.element->u.element->size, p->type->u.element->u.element->counter), p->type->u.element->size), p->brace_level);
 					case ECPGt_struct:
 					case ECPGt_union:
-						return (new_variable(name, ECPGmake_struct_type(p->type->u.element->u.members, p->type->u.element->type, p->type->u.element->type_name, p->type->u.element->struct_sizeof), p->brace_level));
+						return new_variable(name, ECPGmake_struct_type(p->type->u.element->u.members, p->type->u.element->type, p->type->u.element->type_name, p->type->u.element->struct_sizeof), p->brace_level);
 					default:
-						return (new_variable(name, ECPGmake_simple_type(p->type->u.element->type, p->type->u.element->size, p->type->u.element->counter), p->brace_level));
+						return new_variable(name, ECPGmake_simple_type(p->type->u.element->type, p->type->u.element->size, p->type->u.element->counter), p->brace_level);
 				}
 			}
 		}
@@ -254,7 +254,7 @@ find_variable(char *name)
 	if (p == NULL)
 		mmfatal(PARSE_ERROR, "variable \"%s\" is not declared", name);
 
-	return (p);
+	return p;
 }
 
 void
@@ -505,7 +505,7 @@ get_typedef(char *name)
 	if (!this)
 		mmfatal(PARSE_ERROR, "unrecognized data type name \"%s\"", name);
 
-	return (this);
+	return this;
 }
 
 void
diff --git a/src/interfaces/ecpg/test/Makefile b/src/interfaces/ecpg/test/Makefile
index 73ac9e2ac0..45a4b07837 100644
--- a/src/interfaces/ecpg/test/Makefile
+++ b/src/interfaces/ecpg/test/Makefile
@@ -80,9 +80,9 @@ REGRESS_OPTS = --dbname=ecpg1_regression,ecpg2_regression --create-role=regress_
 check: all
 	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
 
-# the same options, but with --listen-on-tcp
-checktcp: all
-	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule_tcp --host=localhost
+# Connect to the server using TCP, and add a TCP-specific test.
+checktcp: all | temp-install
+	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule --host=localhost sql/twophase connect/test1
 
 installcheck: all
 	./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule
@@ -95,5 +95,5 @@ installcheck: all
 installcheck-prepared-txns: all
 	./pg_regress $(REGRESS_OPTS) --bindir='$(bindir)' $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
 
-check-prepared-txns: all
+check-prepared-txns: all | temp-install
 	$(with_temp_install) ./pg_regress $(REGRESS_OPTS) --temp-instance=./tmp_check $(TEMP_CONF) --bindir= $(pg_regress_locale_flags) $(THREAD) --schedule=$(srcdir)/ecpg_schedule sql/twophase
diff --git a/src/interfaces/ecpg/test/compat_informix/dec_test.pgc b/src/interfaces/ecpg/test/compat_informix/dec_test.pgc
index b374bda724..c6a4ed85ee 100644
--- a/src/interfaces/ecpg/test/compat_informix/dec_test.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/dec_test.pgc
@@ -206,7 +206,7 @@ main(void)
 	}
 	free(decarr);
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/compat_informix/describe.pgc b/src/interfaces/ecpg/test/compat_informix/describe.pgc
index 6fcccc6ab4..4ee7254dff 100644
--- a/src/interfaces/ecpg/test/compat_informix/describe.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/describe.pgc
@@ -195,5 +195,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/compat_informix/rfmtdate.pgc b/src/interfaces/ecpg/test/compat_informix/rfmtdate.pgc
index c799de6762..a147f405ab 100644
--- a/src/interfaces/ecpg/test/compat_informix/rfmtdate.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/rfmtdate.pgc
@@ -13,7 +13,7 @@ static void
 check_return(int ret);
 
 static void
-date_test_strdate(char *input)
+date_test_strdate(const char *input)
 {
 	static int i;
 	date d;
@@ -38,7 +38,7 @@ date_test_strdate(char *input)
 }
 
 static void
-date_test_defmt(char *fmt, char *input)
+date_test_defmt(const char *fmt, const char *input)
 {
 	static int i;
 	char dbuf[11];
@@ -63,7 +63,7 @@ date_test_defmt(char *fmt, char *input)
 }
 
 static void
-date_test_fmt(date d, char *fmt)
+date_test_fmt(date d, const char *fmt)
 {
 	static int i;
 	char buf[200];
@@ -147,7 +147,7 @@ main(void)
 	/* ECPG_INFORMIX_BAD_YEAR */
 	/* ??? */
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/compat_informix/rfmtlong.pgc b/src/interfaces/ecpg/test/compat_informix/rfmtlong.pgc
index 162b42505f..2ecf09c837 100644
--- a/src/interfaces/ecpg/test/compat_informix/rfmtlong.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/rfmtlong.pgc
@@ -13,7 +13,7 @@ static void
 check_return(int ret);
 
 static void
-fmtlong(long lng, char *fmt)
+fmtlong(long lng, const char *fmt)
 {
 	static int i;
 	int r;
@@ -45,7 +45,7 @@ main(void)
 	fmtlong(-8494493, "abc: ################+-+");
 	fmtlong(-8494493, "+<<<<,<<<,<<<,<<<");
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/compat_informix/sqlda.pgc b/src/interfaces/ecpg/test/compat_informix/sqlda.pgc
index e1142d2b22..423ce41089 100644
--- a/src/interfaces/ecpg/test/compat_informix/sqlda.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/sqlda.pgc
@@ -246,5 +246,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc b/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc
index 0386093d70..5380f9eb5a 100644
--- a/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc
+++ b/src/interfaces/ecpg/test/compat_informix/test_informix2.pgc
@@ -7,7 +7,7 @@ EXEC SQL include ../regression;
 EXEC SQL DEFINE MAXDBLEN 30;
 
 /* Check SQLCODE, and produce a "standard error" if it's wrong! */
-static void sql_check(char *fn, char *caller, int ignore)
+static void sql_check(const char *fn, const char *caller, int ignore)
 {
   char errorstring[255];
 
diff --git a/src/interfaces/ecpg/test/connect/test1.pgc b/src/interfaces/ecpg/test/connect/test1.pgc
index 4868b3dd81..101b806d5b 100644
--- a/src/interfaces/ecpg/test/connect/test1.pgc
+++ b/src/interfaces/ecpg/test/connect/test1.pgc
@@ -54,12 +54,12 @@ exec sql end declare section;
 	exec sql disconnect;
 
 	/* wrong port */
-	exec sql connect to tcp:postgresql://localhost:20/ecpg2_regression user regress_ecpg_user1 identified by connectpw;
+	exec sql connect to tcp:postgresql://127.0.0.1:20/ecpg2_regression user regress_ecpg_user1 identified by connectpw;
 	/* no disconnect necessary */
 
 	/* wrong password */
 	exec sql connect to unix:postgresql://localhost/ecpg2_regression user regress_ecpg_user1 identified by "wrongpw";
 	/* no disconnect necessary */
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/connect/test2.pgc b/src/interfaces/ecpg/test/connect/test2.pgc
index 0ced76ec6e..f31a7f9bb0 100644
--- a/src/interfaces/ecpg/test/connect/test2.pgc
+++ b/src/interfaces/ecpg/test/connect/test2.pgc
@@ -42,5 +42,5 @@ exec sql end declare section;
 	/* disconnect from "second" */
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/connect/test3.pgc b/src/interfaces/ecpg/test/connect/test3.pgc
index ecf68d42ac..5d075f0e99 100644
--- a/src/interfaces/ecpg/test/connect/test3.pgc
+++ b/src/interfaces/ecpg/test/connect/test3.pgc
@@ -48,5 +48,5 @@ exec sql end declare section;
 	 *     are used in other tests
 	 */
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/connect/test4.pgc b/src/interfaces/ecpg/test/connect/test4.pgc
index 185582ca2a..b20b17471c 100644
--- a/src/interfaces/ecpg/test/connect/test4.pgc
+++ b/src/interfaces/ecpg/test/connect/test4.pgc
@@ -16,5 +16,5 @@ main(void)
 
 	exec sql disconnect DEFAULT;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/connect/test5.pgc b/src/interfaces/ecpg/test/connect/test5.pgc
index d64ca50c93..53b86556b1 100644
--- a/src/interfaces/ecpg/test/connect/test5.pgc
+++ b/src/interfaces/ecpg/test/connect/test5.pgc
@@ -72,5 +72,5 @@ exec sql end declare section;
 	/* not connected */
 	exec sql disconnect nonexistant;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/ecpg_schedule b/src/interfaces/ecpg/test/ecpg_schedule
index c3ec125c36..cff4eebfde 100644
--- a/src/interfaces/ecpg/test/ecpg_schedule
+++ b/src/interfaces/ecpg/test/ecpg_schedule
@@ -28,6 +28,7 @@ test: preproc/type
 test: preproc/variable
 test: preproc/outofscope
 test: preproc/whenever
+test: preproc/whenever_do_continue
 test: sql/array
 test: sql/binary
 test: sql/code100
diff --git a/src/interfaces/ecpg/test/ecpg_schedule_tcp b/src/interfaces/ecpg/test/ecpg_schedule_tcp
deleted file mode 100644
index 77481b5147..0000000000
--- a/src/interfaces/ecpg/test/ecpg_schedule_tcp
+++ /dev/null
@@ -1,55 +0,0 @@
-test: compat_informix/dec_test
-test: compat_informix/charfuncs
-test: compat_informix/rfmtdate
-test: compat_informix/rfmtlong
-test: compat_informix/rnull
-test: compat_informix/sqlda
-test: compat_informix/describe
-test: compat_informix/test_informix
-test: compat_informix/test_informix2
-test: connect/test2
-test: connect/test3
-test: connect/test4
-test: connect/test5
-test: pgtypeslib/dt_test
-test: pgtypeslib/dt_test2
-test: pgtypeslib/num_test
-test: pgtypeslib/num_test2
-test: pgtypeslib/nan_test
-test: preproc/array_of_struct
-test: preproc/autoprep
-test: preproc/comment
-test: preproc/cursor
-test: preproc/define
-test: preproc/init
-test: preproc/strings
-test: preproc/type
-test: preproc/variable
-test: preproc/outofscope
-test: preproc/whenever
-test: sql/array
-test: sql/binary
-test: sql/code100
-test: sql/copystdout
-test: sql/define
-test: sql/desc
-test: sql/sqlda
-test: sql/describe
-test: sql/dynalloc
-test: sql/dynalloc2
-test: sql/dyntest
-test: sql/execute
-test: sql/fetch
-test: sql/func
-test: sql/indicators
-test: sql/oldexec
-test: sql/quote
-test: sql/show
-test: sql/insupd
-test: sql/parser
-test: thread/thread
-test: thread/thread_implicit
-test: thread/prep
-test: thread/alloc
-test: thread/descriptor
-test: connect/test1
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
index 3b443e3ffd..8951cdb227 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-dec_test.c
@@ -226,7 +226,7 @@ main(void)
 	}
 	free(decarr);
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-describe.c b/src/interfaces/ecpg/test/expected/compat_informix-describe.c
index 1b5aae0df7..031a2d776c 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-describe.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-describe.c
@@ -463,5 +463,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 196 "describe.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c b/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c
index ac133c52ef..68be08276d 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-rfmtdate.c
@@ -24,7 +24,7 @@ static void
 check_return(int ret);
 
 static void
-date_test_strdate(char *input)
+date_test_strdate(const char *input)
 {
 	static int i;
 	date d;
@@ -49,7 +49,7 @@ date_test_strdate(char *input)
 }
 
 static void
-date_test_defmt(char *fmt, char *input)
+date_test_defmt(const char *fmt, const char *input)
 {
 	static int i;
 	char dbuf[11];
@@ -74,7 +74,7 @@ date_test_defmt(char *fmt, char *input)
 }
 
 static void
-date_test_fmt(date d, char *fmt)
+date_test_fmt(date d, const char *fmt)
 {
 	static int i;
 	char buf[200];
@@ -158,7 +158,7 @@ main(void)
 	/* ECPG_INFORMIX_BAD_YEAR */
 	/* ??? */
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c b/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c
index 5f44b35ee7..b2e397e38c 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-rfmtlong.c
@@ -24,7 +24,7 @@ static void
 check_return(int ret);
 
 static void
-fmtlong(long lng, char *fmt)
+fmtlong(long lng, const char *fmt)
 {
 	static int i;
 	int r;
@@ -56,7 +56,7 @@ main(void)
 	fmtlong(-8494493, "abc: ################+-+");
 	fmtlong(-8494493, "+<<<<,<<<,<<<,<<<");
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
index 1df87f83ef..fa2e569bbd 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-sqlda.c
@@ -526,5 +526,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 247 "sqlda.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
index 4e372a5799..eeb9b62ab4 100644
--- a/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
+++ b/src/interfaces/ecpg/test/expected/compat_informix-test_informix2.c
@@ -97,7 +97,7 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 
 /* Check SQLCODE, and produce a "standard error" if it's wrong! */
-static void sql_check(char *fn, char *caller, int ignore)
+static void sql_check(const char *fn, const char *caller, int ignore)
 {
   char errorstring[255];
 
diff --git a/src/interfaces/ecpg/test/expected/connect-test1.c b/src/interfaces/ecpg/test/expected/connect-test1.c
index 6471abb623..98b7e717c7 100644
--- a/src/interfaces/ecpg/test/expected/connect-test1.c
+++ b/src/interfaces/ecpg/test/expected/connect-test1.c
@@ -109,7 +109,7 @@ main(void)
 
 
 	/* wrong port */
-	{ ECPGconnect(__LINE__, 0, "tcp:postgresql://localhost:20/ecpg2_regression" , "regress_ecpg_user1" , "connectpw" , NULL, 0); }
+	{ ECPGconnect(__LINE__, 0, "tcp:postgresql://127.0.0.1:20/ecpg2_regression" , "regress_ecpg_user1" , "connectpw" , NULL, 0); }
 #line 57 "test1.pgc"
 
 	/* no disconnect necessary */
@@ -120,5 +120,5 @@ main(void)
 
 	/* no disconnect necessary */
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/connect-test1.stderr b/src/interfaces/ecpg/test/expected/connect-test1.stderr
index 0e43a1a398..ad806a0225 100644
--- a/src/interfaces/ecpg/test/expected/connect-test1.stderr
+++ b/src/interfaces/ecpg/test/expected/connect-test1.stderr
@@ -63,13 +63,10 @@
 [NO_PID]: sqlca: code: -402, state: 08001
 [NO_PID]: raising sqlcode -220 on line 54: connection "CURRENT" does not exist on line 54
 [NO_PID]: sqlca: code: -220, state: 08003
-[NO_PID]: ECPGconnect: opening database ecpg2_regression on localhost port <REGRESSION_PORT>  for user regress_ecpg_user1
+[NO_PID]: ECPGconnect: opening database ecpg2_regression on 127.0.0.1 port <REGRESSION_PORT>  for user regress_ecpg_user1
 [NO_PID]: sqlca: code: 0, state: 00000
 [NO_PID]: ECPGconnect: could not open database: could not connect to server: Connection refused
-	Is the server running on host "localhost" (::1) and accepting
-	TCP/IP connections on port 20?
-could not connect to server: Connection refused
-	Is the server running on host "localhost" (127.0.0.1) and accepting
+	Is the server running on host "127.0.0.1" and accepting
 	TCP/IP connections on port 20?
 
 [NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/ecpg/test/expected/connect-test2.c b/src/interfaces/ecpg/test/expected/connect-test2.c
index cf87c63386..deb7f19170 100644
--- a/src/interfaces/ecpg/test/expected/connect-test2.c
+++ b/src/interfaces/ecpg/test/expected/connect-test2.c
@@ -100,5 +100,5 @@ main(void)
 #line 43 "test2.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/connect-test3.c b/src/interfaces/ecpg/test/expected/connect-test3.c
index 5bab6ba8f0..1a74a06973 100644
--- a/src/interfaces/ecpg/test/expected/connect-test3.c
+++ b/src/interfaces/ecpg/test/expected/connect-test3.c
@@ -102,5 +102,5 @@ main(void)
 	 *     are used in other tests
 	 */
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/connect-test4.c b/src/interfaces/ecpg/test/expected/connect-test4.c
index e1ae3e9a66..ff13e4ec41 100644
--- a/src/interfaces/ecpg/test/expected/connect-test4.c
+++ b/src/interfaces/ecpg/test/expected/connect-test4.c
@@ -40,5 +40,5 @@ main(void)
 #line 17 "test4.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/connect-test5.c b/src/interfaces/ecpg/test/expected/connect-test5.c
index e991ee79b6..4b6569e763 100644
--- a/src/interfaces/ecpg/test/expected/connect-test5.c
+++ b/src/interfaces/ecpg/test/expected/connect-test5.c
@@ -158,5 +158,5 @@ main(void)
 #line 73 "test5.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
index 00d43915b2..3f90022b54 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test.c
@@ -155,7 +155,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 
 	/* rdate_defmt_asc() */
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "In the year 1995, the month of December, it is the 25th day";
 	/*    0123456789012345678901234567890123456789012345678901234567890
@@ -166,7 +166,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc1: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmmm. dd. yyyy";
 	in = "12/25/95";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -174,7 +174,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc2: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "95/12/25";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -182,7 +182,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc3: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "1995, December 25th";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -190,7 +190,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc4: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "dd-mm-yy";
 	in = "This is 25th day of December, 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -198,7 +198,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc5: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmddyy";
 	in = "Dec. 25th, 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -206,7 +206,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc6: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmm. dd. yyyy";
 	in = "dec 25th 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -214,7 +214,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc7: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmm. dd. yyyy";
 	in = "DEC-25-1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -222,7 +222,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc8: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mm yy   dd.";
 	in = "12199525";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -230,7 +230,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc9: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yyyy fierj mm   dd.";
 	in = "19951225";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -238,7 +238,7 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 	printf("date_defmt_asc10: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mm/dd/yy";
 	in = "122595";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -449,5 +449,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 366 "dt_test.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c
index b6e77562b2..4024980f1e 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-dt_test2.c
@@ -182,5 +182,5 @@ main(void)
 		PGTYPESinterval_free(i1);
 	}
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c
index ecd2343117..c831284059 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-nan_test.c
@@ -269,5 +269,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 91 "nan_test.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
index 8019a8f63e..47c320291f 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test.c
@@ -157,5 +157,5 @@ if (sqlca.sqlcode < 0) sqlprint ( );}
 #line 94 "num_test.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
index 83636ad880..d31834e2c0 100644
--- a/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
+++ b/src/interfaces/ecpg/test/expected/pgtypeslib-num_test2.c
@@ -228,7 +228,7 @@ main(void)
 	}
 	free(numarr);
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c b/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
index c4ae862b49..1cf371092f 100644
--- a/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
+++ b/src/interfaces/ecpg/test/expected/preproc-array_of_struct.c
@@ -284,5 +284,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 92 "array_of_struct.pgc"
 
 
-    return( 0 );
+    return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-cursor.c b/src/interfaces/ecpg/test/expected/preproc-cursor.c
index f7da753a3d..4822901742 100644
--- a/src/interfaces/ecpg/test/expected/preproc-cursor.c
+++ b/src/interfaces/ecpg/test/expected/preproc-cursor.c
@@ -830,5 +830,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 253 "cursor.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-define.c b/src/interfaces/ecpg/test/expected/preproc-define.c
index c8ae6f98dc..bde15b74a0 100644
--- a/src/interfaces/ecpg/test/expected/preproc-define.c
+++ b/src/interfaces/ecpg/test/expected/preproc-define.c
@@ -164,5 +164,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 59 "define.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-describe.c b/src/interfaces/ecpg/test/expected/preproc-describe.c
index 1a9dd85438..143e966261 100644
--- a/src/interfaces/ecpg/test/expected/preproc-describe.c
+++ b/src/interfaces/ecpg/test/expected/preproc-describe.c
@@ -477,5 +477,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 144 "describe.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-init.c b/src/interfaces/ecpg/test/expected/preproc-init.c
index ca23d348d6..b0e04731fe 100644
--- a/src/interfaces/ecpg/test/expected/preproc-init.c
+++ b/src/interfaces/ecpg/test/expected/preproc-init.c
@@ -114,7 +114,7 @@ static int fe(enum e x)
 	return (int)x;
 }
 
-static void sqlnotice(char *notice, short trans)
+static void sqlnotice(const char *notice, short trans)
 {
 	if (!notice)
 		notice = "-empty-";
diff --git a/src/interfaces/ecpg/test/expected/preproc-outofscope.c b/src/interfaces/ecpg/test/expected/preproc-outofscope.c
index b3deb221d7..f4676a083a 100644
--- a/src/interfaces/ecpg/test/expected/preproc-outofscope.c
+++ b/src/interfaces/ecpg/test/expected/preproc-outofscope.c
@@ -374,5 +374,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 124 "outofscope.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-pointer_to_struct.c b/src/interfaces/ecpg/test/expected/preproc-pointer_to_struct.c
index 5a0f9caee3..7b1f58e835 100644
--- a/src/interfaces/ecpg/test/expected/preproc-pointer_to_struct.c
+++ b/src/interfaces/ecpg/test/expected/preproc-pointer_to_struct.c
@@ -289,5 +289,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 
 	/* All the memory will anyway be freed at the end */
-    return( 0 );
+    return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-strings.c b/src/interfaces/ecpg/test/expected/preproc-strings.c
index 89d17e96c9..2053443e81 100644
--- a/src/interfaces/ecpg/test/expected/preproc-strings.c
+++ b/src/interfaces/ecpg/test/expected/preproc-strings.c
@@ -66,5 +66,5 @@ int main(void)
   { ECPGdisconnect(__LINE__, "CURRENT");}
 #line 25 "strings.pgc"
 
-  return (0);
+  return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-variable.c b/src/interfaces/ecpg/test/expected/preproc-variable.c
index 7fd03ba7d3..08e2355d16 100644
--- a/src/interfaces/ecpg/test/expected/preproc-variable.c
+++ b/src/interfaces/ecpg/test/expected/preproc-variable.c
@@ -272,5 +272,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 98 "variable.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever.c b/src/interfaces/ecpg/test/expected/preproc-whenever.c
index 922ef76b92..332ef85b10 100644
--- a/src/interfaces/ecpg/test/expected/preproc-whenever.c
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever.c
@@ -24,7 +24,7 @@
 #line 5 "whenever.pgc"
 
 
-static void print(char *msg)
+static void print(const char *msg)
 {
         fprintf(stderr, "Error in statement '%s':\n", msg);
         sqlprint();
diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.c b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.c
new file mode 100644
index 0000000000..a367af00f3
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.c
@@ -0,0 +1,161 @@
+/* Processed by ecpg (regression mode) */
+/* These include files are added by the preprocessor */
+#include <ecpglib.h>
+#include <ecpgerrno.h>
+#include <sqlca.h>
+/* End of automatic include section */
+#define ECPGdebug(X,Y) ECPGdebug((X)+100,(Y))
+
+#line 1 "whenever_do_continue.pgc"
+#include <stdlib.h>
+
+
+#line 1 "regression.h"
+
+
+
+
+
+
+#line 3 "whenever_do_continue.pgc"
+
+
+/* exec sql whenever sqlerror  sqlprint ; */
+#line 5 "whenever_do_continue.pgc"
+
+
+int main(void)
+{
+	/* exec sql begin declare section */
+	
+	
+		 
+		 
+		 
+	 
+
+	 
+	
+#line 15 "whenever_do_continue.pgc"
+ struct { 
+#line 12 "whenever_do_continue.pgc"
+ char ename [ 12 ] ;
+ 
+#line 13 "whenever_do_continue.pgc"
+ float sal ;
+ 
+#line 14 "whenever_do_continue.pgc"
+ float comm ;
+ } emp ;
+ 
+#line 17 "whenever_do_continue.pgc"
+ char msg [ 128 ] ;
+/* exec sql end declare section */
+#line 18 "whenever_do_continue.pgc"
+
+
+	ECPGdebug(1, stderr);
+
+	strcpy(msg, "connect");
+	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); 
+#line 23 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 23 "whenever_do_continue.pgc"
+
+
+	strcpy(msg, "create");
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table emp ( ename varchar , sal double precision , comm double precision )", ECPGt_EOIT, ECPGt_EORT);
+#line 26 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 26 "whenever_do_continue.pgc"
+
+
+	strcpy(msg, "insert");
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into emp values ( 'Ram' , 111100 , 21 )", ECPGt_EOIT, ECPGt_EORT);
+#line 29 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 29 "whenever_do_continue.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into emp values ( 'aryan' , 11110 , null )", ECPGt_EOIT, ECPGt_EORT);
+#line 30 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 30 "whenever_do_continue.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into emp values ( 'josh' , 10000 , 10 )", ECPGt_EOIT, ECPGt_EORT);
+#line 31 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 31 "whenever_do_continue.pgc"
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "insert into emp values ( 'tom' , 20000 , null )", ECPGt_EOIT, ECPGt_EORT);
+#line 32 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 32 "whenever_do_continue.pgc"
+
+
+	/* declare c cursor for select ename , sal , comm from emp order by ename collate \"C\" asc */
+#line 34 "whenever_do_continue.pgc"
+
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "declare c cursor for select ename , sal , comm from emp order by ename collate \"C\" asc", ECPGt_EOIT, ECPGt_EORT);
+#line 36 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) sqlprint();}
+#line 36 "whenever_do_continue.pgc"
+
+
+	/* The 'BREAK' condition to exit the loop. */
+	/* exec sql whenever not found  break ; */
+#line 39 "whenever_do_continue.pgc"
+
+
+	/* The DO CONTINUE makes the loop start at the next iteration when an error occurs.*/
+	/* exec sql whenever sqlerror  continue ; */
+#line 42 "whenever_do_continue.pgc"
+
+
+	while (1)
+	{
+		{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "fetch c", ECPGt_EOIT, 
+	ECPGt_char,&(emp.ename),(long)12,(long)1,(12)*sizeof(char), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_float,&(emp.sal),(long)1,(long)1,sizeof(float), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
+	ECPGt_float,&(emp.comm),(long)1,(long)1,sizeof(float), 
+	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
+#line 46 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode == ECPG_NOT_FOUND) break;
+#line 46 "whenever_do_continue.pgc"
+
+if (sqlca.sqlcode < 0) continue;}
+#line 46 "whenever_do_continue.pgc"
+
+		/* The employees with non-NULL commissions will be displayed. */
+		printf("%s %7.2f %9.2f\n", emp.ename, emp.sal, emp.comm);
+	}
+
+	/*
+	 * This 'CONTINUE' shuts off the 'DO CONTINUE' and allow the program to
+	 * proceed if any further errors do occur.
+	 */
+	/* exec sql whenever sqlerror  continue ; */
+#line 55 "whenever_do_continue.pgc"
+
+
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "close c", ECPGt_EOIT, ECPGt_EORT);}
+#line 57 "whenever_do_continue.pgc"
+
+
+	strcpy(msg, "drop");
+	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table emp", ECPGt_EOIT, ECPGt_EORT);}
+#line 60 "whenever_do_continue.pgc"
+
+
+	exit(0);
+}
diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stderr b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stderr
new file mode 100644
index 0000000000..46bc4a5600
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stderr
@@ -0,0 +1,112 @@
+[NO_PID]: ECPGdebug: set to 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ECPGconnect: opening database ecpg1_regression on <DEFAULT> port <DEFAULT>  
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 26: query: create table emp ( ename varchar , sal double precision , comm double precision ); with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 26: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 26: OK: CREATE TABLE
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 29: query: insert into emp values ( 'Ram' , 111100 , 21 ); with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 29: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 29: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: query: insert into emp values ( 'aryan' , 11110 , null ); with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 30: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 30: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: query: insert into emp values ( 'josh' , 10000 , 10 ); with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 31: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 31: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 32: query: insert into emp values ( 'tom' , 20000 , null ); with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 32: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 32: OK: INSERT 0 1
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 36: query: declare c cursor for select ename , sal , comm from emp order by ename collate "C" asc; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 36: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 36: OK: DECLARE CURSOR
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: query: fetch c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 46: correctly got 1 tuples with 3 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: Ram offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 111100 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 21 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: query: fetch c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 46: correctly got 1 tuples with 3 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: aryan offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 11110 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT:  offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: raising sqlcode -213 on line 46: null value without indicator on line 46
+[NO_PID]: sqlca: code: -213, state: 22002
+[NO_PID]: ecpg_execute on line 46: query: fetch c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 46: correctly got 1 tuples with 3 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: josh offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 10000 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 10 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: query: fetch c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 46: correctly got 1 tuples with 3 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: tom offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT: 20000 offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_get_data on line 46: RESULT:  offset: -1; array: no
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: raising sqlcode -213 on line 46: null value without indicator on line 46
+[NO_PID]: sqlca: code: -213, state: 22002
+[NO_PID]: ecpg_execute on line 46: query: fetch c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 46: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 46: correctly got 0 tuples with 3 fields
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: raising sqlcode 100 on line 46: no data found on line 46
+[NO_PID]: sqlca: code: 100, state: 02000
+[NO_PID]: ecpg_execute on line 57: query: close c; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 57: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 57: OK: CLOSE CURSOR
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 60: query: drop table emp; with 0 parameter(s) on connection ecpg1_regression
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_execute on line 60: using PQexec
+[NO_PID]: sqlca: code: 0, state: 00000
+[NO_PID]: ecpg_process_output on line 60: OK: DROP TABLE
+[NO_PID]: sqlca: code: 0, state: 00000
diff --git a/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stdout b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stdout
new file mode 100644
index 0000000000..d6ac5a0280
--- /dev/null
+++ b/src/interfaces/ecpg/test/expected/preproc-whenever_do_continue.stdout
@@ -0,0 +1,2 @@
+Ram 111100.00     21.00
+josh 10000.00     10.00
diff --git a/src/interfaces/ecpg/test/expected/sql-array.c b/src/interfaces/ecpg/test/expected/sql-array.c
index 781c426771..f5eb73d185 100644
--- a/src/interfaces/ecpg/test/expected/sql-array.c
+++ b/src/interfaces/ecpg/test/expected/sql-array.c
@@ -351,5 +351,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
 	free(t);
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/sql-describe.c b/src/interfaces/ecpg/test/expected/sql-describe.c
index 155e206f29..b79a6f4016 100644
--- a/src/interfaces/ecpg/test/expected/sql-describe.c
+++ b/src/interfaces/ecpg/test/expected/sql-describe.c
@@ -461,5 +461,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 196 "describe.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/sql-execute.c b/src/interfaces/ecpg/test/expected/sql-execute.c
index aee3c1bcb7..cac91dc599 100644
--- a/src/interfaces/ecpg/test/expected/sql-execute.c
+++ b/src/interfaces/ecpg/test/expected/sql-execute.c
@@ -327,5 +327,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 110 "execute.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/sql-oldexec.c b/src/interfaces/ecpg/test/expected/sql-oldexec.c
index 5b74dda9b5..d6a661e3fb 100644
--- a/src/interfaces/ecpg/test/expected/sql-oldexec.c
+++ b/src/interfaces/ecpg/test/expected/sql-oldexec.c
@@ -247,5 +247,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 87 "oldexec.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/sql-sqlda.c b/src/interfaces/ecpg/test/expected/sql-sqlda.c
index 15c81c6b12..ffaf52ca5c 100644
--- a/src/interfaces/ecpg/test/expected/sql-sqlda.c
+++ b/src/interfaces/ecpg/test/expected/sql-sqlda.c
@@ -527,5 +527,5 @@ if (sqlca.sqlcode < 0) exit (1);}
 #line 247 "sqlda.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/sql-twophase.c b/src/interfaces/ecpg/test/expected/sql-twophase.c
index cf491fc078..20b54d35e5 100644
--- a/src/interfaces/ecpg/test/expected/sql-twophase.c
+++ b/src/interfaces/ecpg/test/expected/sql-twophase.c
@@ -110,5 +110,5 @@ if (sqlca.sqlcode < 0) sqlprint();}
 #line 41 "twophase.pgc"
 
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/expected/thread-alloc.c b/src/interfaces/ecpg/test/expected/thread-alloc.c
index 9f8ac59430..e7b69b387f 100644
--- a/src/interfaces/ecpg/test/expected/thread-alloc.c
+++ b/src/interfaces/ecpg/test/expected/thread-alloc.c
@@ -22,6 +22,7 @@ main(void)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -99,7 +100,7 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 #endif
 
-#line 24 "alloc.pgc"
+#line 25 "alloc.pgc"
 
 
 #line 1 "regression.h"
@@ -109,14 +110,14 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 
 
-#line 25 "alloc.pgc"
+#line 26 "alloc.pgc"
 
 
 /* exec sql whenever sqlerror  sqlprint ; */
-#line 27 "alloc.pgc"
+#line 28 "alloc.pgc"
 
 /* exec sql whenever not found  sqlprint ; */
-#line 28 "alloc.pgc"
+#line 29 "alloc.pgc"
 
 
 #ifdef WIN32
@@ -132,54 +133,60 @@ static void* fn(void* arg)
 	 
 	   
 	
-#line 39 "alloc.pgc"
+#line 40 "alloc.pgc"
  int value ;
  
-#line 40 "alloc.pgc"
+#line 41 "alloc.pgc"
  char name [ 100 ] ;
  
-#line 41 "alloc.pgc"
+#line 42 "alloc.pgc"
  char ** r = NULL ;
 /* exec sql end declare section */
-#line 42 "alloc.pgc"
+#line 43 "alloc.pgc"
+
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
 
 	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , name, 0); 
-#line 47 "alloc.pgc"
+#line 54 "alloc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 47 "alloc.pgc"
+#line 54 "alloc.pgc"
 
 	{ ECPGsetcommit(__LINE__, "on", NULL);
-#line 48 "alloc.pgc"
+#line 55 "alloc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 48 "alloc.pgc"
+#line 55 "alloc.pgc"
 
 	for (i = 1; i <= REPEATS; ++i)
 	{
 		{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select relname from pg_class where relname = 'pg_class'", ECPGt_EOIT, 
 	ECPGt_char,&(r),(long)0,(long)0,(1)*sizeof(char), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);
-#line 51 "alloc.pgc"
+#line 58 "alloc.pgc"
 
 if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint();
-#line 51 "alloc.pgc"
+#line 58 "alloc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 51 "alloc.pgc"
+#line 58 "alloc.pgc"
 
 		free(r);
 		r = NULL;
 	}
 	{ ECPGdisconnect(__LINE__, name);
-#line 55 "alloc.pgc"
+#line 62 "alloc.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 55 "alloc.pgc"
+#line 62 "alloc.pgc"
 
 
 	return 0;
diff --git a/src/interfaces/ecpg/test/expected/thread-descriptor.c b/src/interfaces/ecpg/test/expected/thread-descriptor.c
index 607df7ce24..03cebad603 100644
--- a/src/interfaces/ecpg/test/expected/thread-descriptor.c
+++ b/src/interfaces/ecpg/test/expected/thread-descriptor.c
@@ -12,6 +12,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -90,13 +91,13 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 #endif
 
-#line 15 "descriptor.pgc"
+#line 16 "descriptor.pgc"
 
 /* exec sql whenever sqlerror  sqlprint ; */
-#line 16 "descriptor.pgc"
+#line 17 "descriptor.pgc"
 
 /* exec sql whenever not found  sqlprint ; */
-#line 17 "descriptor.pgc"
+#line 18 "descriptor.pgc"
 
 
 #if defined(ENABLE_THREAD_SAFETY) && defined(WIN32)
@@ -107,19 +108,25 @@ static void* fn(void* arg)
 {
 	int i;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
 	for (i = 1; i <= REPEATS; ++i)
 	{
 		ECPGallocate_desc(__LINE__, "mydesc");
-#line 29 "descriptor.pgc"
+#line 36 "descriptor.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 29 "descriptor.pgc"
+#line 36 "descriptor.pgc"
 
 		ECPGdeallocate_desc(__LINE__, "mydesc");
-#line 30 "descriptor.pgc"
+#line 37 "descriptor.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();
-#line 30 "descriptor.pgc"
+#line 37 "descriptor.pgc"
 
 	}
 
diff --git a/src/interfaces/ecpg/test/expected/thread-prep.c b/src/interfaces/ecpg/test/expected/thread-prep.c
index 72ca568151..94e02933cd 100644
--- a/src/interfaces/ecpg/test/expected/thread-prep.c
+++ b/src/interfaces/ecpg/test/expected/thread-prep.c
@@ -22,6 +22,7 @@ main(void)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -99,7 +100,7 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 #endif
 
-#line 24 "prep.pgc"
+#line 25 "prep.pgc"
 
 
 #line 1 "regression.h"
@@ -109,14 +110,14 @@ struct sqlca_t *ECPGget_sqlca(void);
 
 
 
-#line 25 "prep.pgc"
+#line 26 "prep.pgc"
 
 
 /* exec sql whenever sqlerror  sqlprint ; */
-#line 27 "prep.pgc"
+#line 28 "prep.pgc"
 
 /* exec sql whenever not found  sqlprint ; */
-#line 28 "prep.pgc"
+#line 29 "prep.pgc"
 
 
 #ifdef WIN32
@@ -132,64 +133,70 @@ static void* fn(void* arg)
 	 
 	   
 	
-#line 39 "prep.pgc"
+#line 40 "prep.pgc"
  int value ;
  
-#line 40 "prep.pgc"
+#line 41 "prep.pgc"
  char name [ 100 ] ;
  
-#line 41 "prep.pgc"
+#line 42 "prep.pgc"
  char query [ 256 ] = "INSERT INTO T VALUES ( ? )" ;
 /* exec sql end declare section */
-#line 42 "prep.pgc"
+#line 43 "prep.pgc"
+
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
 
 	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
 	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , name, 0); 
-#line 47 "prep.pgc"
+#line 54 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 47 "prep.pgc"
+#line 54 "prep.pgc"
 
 	{ ECPGsetcommit(__LINE__, "on", NULL);
-#line 48 "prep.pgc"
+#line 55 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 48 "prep.pgc"
+#line 55 "prep.pgc"
 
 	for (i = 1; i <= REPEATS; ++i)
 	{
 		{ ECPGprepare(__LINE__, NULL, 0, "i", query);
-#line 51 "prep.pgc"
+#line 58 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 51 "prep.pgc"
+#line 58 "prep.pgc"
 
 		{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_execute, "i", 
 	ECPGt_int,&(value),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 52 "prep.pgc"
+#line 59 "prep.pgc"
 
 if (sqlca.sqlcode == ECPG_NOT_FOUND) sqlprint();
-#line 52 "prep.pgc"
+#line 59 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 52 "prep.pgc"
+#line 59 "prep.pgc"
 
 	}
 	{ ECPGdeallocate(__LINE__, 0, NULL, "i");
-#line 54 "prep.pgc"
+#line 61 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 54 "prep.pgc"
+#line 61 "prep.pgc"
 
 	{ ECPGdisconnect(__LINE__, name);
-#line 55 "prep.pgc"
+#line 62 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 55 "prep.pgc"
+#line 62 "prep.pgc"
 
 
 	return 0;
@@ -205,34 +212,34 @@ int main ()
 #endif
 
 	{ ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); 
-#line 69 "prep.pgc"
+#line 76 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 69 "prep.pgc"
+#line 76 "prep.pgc"
 
 	{ ECPGsetcommit(__LINE__, "on", NULL);
-#line 70 "prep.pgc"
+#line 77 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 70 "prep.pgc"
+#line 77 "prep.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table if exists T", ECPGt_EOIT, ECPGt_EORT);
-#line 71 "prep.pgc"
+#line 78 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 71 "prep.pgc"
+#line 78 "prep.pgc"
 
 	{ ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table T ( i int )", ECPGt_EOIT, ECPGt_EORT);
-#line 72 "prep.pgc"
+#line 79 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 72 "prep.pgc"
+#line 79 "prep.pgc"
 
 	{ ECPGdisconnect(__LINE__, "CURRENT");
-#line 73 "prep.pgc"
+#line 80 "prep.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 73 "prep.pgc"
+#line 80 "prep.pgc"
 
 
 #ifdef WIN32
diff --git a/src/interfaces/ecpg/test/expected/thread-thread.c b/src/interfaces/ecpg/test/expected/thread-thread.c
index 61d3c5c6e4..420bbf194a 100644
--- a/src/interfaces/ecpg/test/expected/thread-thread.c
+++ b/src/interfaces/ecpg/test/expected/thread-thread.c
@@ -26,6 +26,7 @@ main(void)
 #include <pthread.h>
 #else
 #include <windows.h>
+#include <locale.h>
 #endif
 
 
@@ -36,7 +37,7 @@ main(void)
 
 
 
-#line 22 "thread.pgc"
+#line 23 "thread.pgc"
 
 
 void *test_thread(void *arg);
@@ -55,10 +56,10 @@ int main()
   /* exec sql begin declare section */
    
   
-#line 38 "thread.pgc"
+#line 39 "thread.pgc"
  int l_rows ;
 /* exec sql end declare section */
-#line 39 "thread.pgc"
+#line 40 "thread.pgc"
 
 
  /* Do not switch on debug output for regression tests. The threads get executed in
@@ -67,22 +68,22 @@ int main()
 
   /* setup test_thread table */
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); }
-#line 46 "thread.pgc"
+#line 47 "thread.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test_thread", ECPGt_EOIT, ECPGt_EORT);}
-#line 47 "thread.pgc"
+#line 48 "thread.pgc"
  /* DROP might fail */
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 48 "thread.pgc"
+#line 49 "thread.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test_thread ( tstamp timestamp not null default cast ( timeofday ( ) as timestamp ) , thread text not null , iteration integer not null , primary key ( thread , iteration ) )", ECPGt_EOIT, ECPGt_EORT);}
-#line 53 "thread.pgc"
+#line 54 "thread.pgc"
 
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 54 "thread.pgc"
+#line 55 "thread.pgc"
 
   { ECPGdisconnect(__LINE__, "CURRENT");}
-#line 55 "thread.pgc"
+#line 56 "thread.pgc"
 
 
   /* create, and start, threads */
@@ -90,7 +91,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -114,42 +115,49 @@ int main()
 
   /* and check results */
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); }
-#line 85 "thread.pgc"
+#line 86 "thread.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select count ( * ) from test_thread", ECPGt_EOIT, 
 	ECPGt_int,&(l_rows),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
-#line 86 "thread.pgc"
+#line 87 "thread.pgc"
 
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 87 "thread.pgc"
+#line 88 "thread.pgc"
 
   { ECPGdisconnect(__LINE__, "CURRENT");}
-#line 88 "thread.pgc"
+#line 89 "thread.pgc"
 
   if( l_rows == (nthreads * iterations) )
     printf("Success.\n");
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
 {
   long threadnum = (long)arg;
+
   /* exec sql begin declare section */
     
    
   
-#line 101 "thread.pgc"
+#line 103 "thread.pgc"
  int l_i ;
  
-#line 102 "thread.pgc"
+#line 104 "thread.pgc"
  char l_connection [ 128 ] ;
 /* exec sql end declare section */
-#line 103 "thread.pgc"
+#line 105 "thread.pgc"
+
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
 
   /* build up connection name, and connect to database */
 #ifndef _MSC_VER
@@ -158,24 +166,24 @@ void *test_thread(void *arg)
   _snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum);
 #endif
   /* exec sql whenever sqlerror  sqlprint ; */
-#line 111 "thread.pgc"
+#line 119 "thread.pgc"
 
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , l_connection, 0); 
-#line 112 "thread.pgc"
+#line 120 "thread.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 112 "thread.pgc"
+#line 120 "thread.pgc"
 
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   { ECPGtrans(__LINE__, l_connection, "begin");
-#line 118 "thread.pgc"
+#line 126 "thread.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 118 "thread.pgc"
+#line 126 "thread.pgc"
 
 
   /* insert into test_thread table */
@@ -186,10 +194,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 123 "thread.pgc"
+#line 131 "thread.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 123 "thread.pgc"
+#line 131 "thread.pgc"
 
       if( sqlca.sqlcode != 0 )
 	printf("%s: ERROR: insert failed!\n", l_connection);
@@ -197,17 +205,17 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
   /* all done */
   { ECPGtrans(__LINE__, l_connection, "commit");
-#line 129 "thread.pgc"
+#line 137 "thread.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 129 "thread.pgc"
+#line 137 "thread.pgc"
 
   { ECPGdisconnect(__LINE__, l_connection);
-#line 130 "thread.pgc"
+#line 138 "thread.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 130 "thread.pgc"
+#line 138 "thread.pgc"
 
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
diff --git a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c
index c43c1ada46..4bddca9fb9 100644
--- a/src/interfaces/ecpg/test/expected/thread-thread_implicit.c
+++ b/src/interfaces/ecpg/test/expected/thread-thread_implicit.c
@@ -27,6 +27,7 @@ main(void)
 #include <pthread.h>
 #else
 #include <windows.h>
+#include <locale.h>
 #endif
 
 
@@ -37,7 +38,7 @@ main(void)
 
 
 
-#line 23 "thread_implicit.pgc"
+#line 24 "thread_implicit.pgc"
 
 
 void *test_thread(void *arg);
@@ -56,10 +57,10 @@ int main()
   /* exec sql begin declare section */
    
   
-#line 39 "thread_implicit.pgc"
+#line 40 "thread_implicit.pgc"
  int l_rows ;
 /* exec sql end declare section */
-#line 40 "thread_implicit.pgc"
+#line 41 "thread_implicit.pgc"
 
 
  /* Do not switch on debug output for regression tests. The threads get executed in
@@ -68,22 +69,22 @@ int main()
 
   /* setup test_thread table */
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); }
-#line 47 "thread_implicit.pgc"
+#line 48 "thread_implicit.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "drop table test_thread", ECPGt_EOIT, ECPGt_EORT);}
-#line 48 "thread_implicit.pgc"
+#line 49 "thread_implicit.pgc"
  /* DROP might fail */
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 49 "thread_implicit.pgc"
+#line 50 "thread_implicit.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "create table test_thread ( tstamp timestamp not null default cast ( timeofday ( ) as timestamp ) , thread text not null , iteration integer not null , primary key ( thread , iteration ) )", ECPGt_EOIT, ECPGt_EORT);}
-#line 54 "thread_implicit.pgc"
+#line 55 "thread_implicit.pgc"
 
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 55 "thread_implicit.pgc"
+#line 56 "thread_implicit.pgc"
 
   { ECPGdisconnect(__LINE__, "CURRENT");}
-#line 56 "thread_implicit.pgc"
+#line 57 "thread_implicit.pgc"
 
 
   /* create, and start, threads */
@@ -91,7 +92,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -115,42 +116,49 @@ int main()
 
   /* and check results */
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , NULL, 0); }
-#line 86 "thread_implicit.pgc"
+#line 87 "thread_implicit.pgc"
 
   { ECPGdo(__LINE__, 0, 1, NULL, 0, ECPGst_normal, "select count ( * ) from test_thread", ECPGt_EOIT, 
 	ECPGt_int,&(l_rows),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EORT);}
-#line 87 "thread_implicit.pgc"
+#line 88 "thread_implicit.pgc"
 
   { ECPGtrans(__LINE__, NULL, "commit");}
-#line 88 "thread_implicit.pgc"
+#line 89 "thread_implicit.pgc"
 
   { ECPGdisconnect(__LINE__, "CURRENT");}
-#line 89 "thread_implicit.pgc"
+#line 90 "thread_implicit.pgc"
 
   if( l_rows == (nthreads * iterations) )
     printf("Success.\n");
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
 {
   long threadnum = (long)arg;
+
   /* exec sql begin declare section */
     
    
   
-#line 102 "thread_implicit.pgc"
+#line 104 "thread_implicit.pgc"
  int l_i ;
  
-#line 103 "thread_implicit.pgc"
+#line 105 "thread_implicit.pgc"
  char l_connection [ 128 ] ;
 /* exec sql end declare section */
-#line 104 "thread_implicit.pgc"
+#line 106 "thread_implicit.pgc"
+
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
 
   /* build up connection name, and connect to database */
 #ifndef _MSC_VER
@@ -159,24 +167,24 @@ void *test_thread(void *arg)
   _snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum);
 #endif
   /* exec sql whenever sqlerror  sqlprint ; */
-#line 112 "thread_implicit.pgc"
+#line 120 "thread_implicit.pgc"
 
   { ECPGconnect(__LINE__, 0, "ecpg1_regression" , NULL, NULL , l_connection, 0); 
-#line 113 "thread_implicit.pgc"
+#line 121 "thread_implicit.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 113 "thread_implicit.pgc"
+#line 121 "thread_implicit.pgc"
 
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   { ECPGtrans(__LINE__, NULL, "begin");
-#line 119 "thread_implicit.pgc"
+#line 127 "thread_implicit.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 119 "thread_implicit.pgc"
+#line 127 "thread_implicit.pgc"
 
 
   /* insert into test_thread table */
@@ -187,10 +195,10 @@ if (sqlca.sqlcode < 0) sqlprint();}
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, 
 	ECPGt_int,&(l_i),(long)1,(long)1,sizeof(int), 
 	ECPGt_NO_INDICATOR, NULL , 0L, 0L, 0L, ECPGt_EOIT, ECPGt_EORT);
-#line 124 "thread_implicit.pgc"
+#line 132 "thread_implicit.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 124 "thread_implicit.pgc"
+#line 132 "thread_implicit.pgc"
 
       if( sqlca.sqlcode != 0 )
 	printf("%s: ERROR: insert failed!\n", l_connection);
@@ -198,17 +206,17 @@ if (sqlca.sqlcode < 0) sqlprint();}
 
   /* all done */
   { ECPGtrans(__LINE__, NULL, "commit");
-#line 130 "thread_implicit.pgc"
+#line 138 "thread_implicit.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 130 "thread_implicit.pgc"
+#line 138 "thread_implicit.pgc"
 
   { ECPGdisconnect(__LINE__, l_connection);
-#line 131 "thread_implicit.pgc"
+#line 139 "thread_implicit.pgc"
 
 if (sqlca.sqlcode < 0) sqlprint();}
-#line 131 "thread_implicit.pgc"
+#line 139 "thread_implicit.pgc"
 
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
diff --git a/src/interfaces/ecpg/test/performance/perftest.pgc b/src/interfaces/ecpg/test/performance/perftest.pgc
index 3ed2ba0f5e..c8a9934986 100644
--- a/src/interfaces/ecpg/test/performance/perftest.pgc
+++ b/src/interfaces/ecpg/test/performance/perftest.pgc
@@ -140,5 +140,5 @@ exec sql end declare section;
 
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/pg_regress_ecpg.c b/src/interfaces/ecpg/test/pg_regress_ecpg.c
index b6ecb618e6..a975a7e4e4 100644
--- a/src/interfaces/ecpg/test/pg_regress_ecpg.c
+++ b/src/interfaces/ecpg/test/pg_regress_ecpg.c
@@ -8,7 +8,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/ecpg/test/pg_regress_ecpg.c
diff --git a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc
index 768cbd5e6f..1cc156c3dc 100644
--- a/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc
+++ b/src/interfaces/ecpg/test/pgtypeslib/dt_test.pgc
@@ -81,7 +81,7 @@ main(void)
 
 	/* rdate_defmt_asc() */
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "In the year 1995, the month of December, it is the 25th day";
 	/*    0123456789012345678901234567890123456789012345678901234567890
@@ -92,7 +92,7 @@ main(void)
 	printf("date_defmt_asc1: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmmm. dd. yyyy";
 	in = "12/25/95";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -100,7 +100,7 @@ main(void)
 	printf("date_defmt_asc2: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "95/12/25";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -108,7 +108,7 @@ main(void)
 	printf("date_defmt_asc3: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yy/mm/dd";
 	in = "1995, December 25th";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -116,7 +116,7 @@ main(void)
 	printf("date_defmt_asc4: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "dd-mm-yy";
 	in = "This is 25th day of December, 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -124,7 +124,7 @@ main(void)
 	printf("date_defmt_asc5: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmddyy";
 	in = "Dec. 25th, 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -132,7 +132,7 @@ main(void)
 	printf("date_defmt_asc6: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmm. dd. yyyy";
 	in = "dec 25th 1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -140,7 +140,7 @@ main(void)
 	printf("date_defmt_asc7: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mmm. dd. yyyy";
 	in = "DEC-25-1995";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -148,7 +148,7 @@ main(void)
 	printf("date_defmt_asc8: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mm yy   dd.";
 	in = "12199525";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -156,7 +156,7 @@ main(void)
 	printf("date_defmt_asc9: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "yyyy fierj mm   dd.";
 	in = "19951225";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -164,7 +164,7 @@ main(void)
 	printf("date_defmt_asc10: %s\n", text);
 	free(text);
 
-	date1 = 0; text = "";
+	date1 = 0;
 	fmt = "mm/dd/yy";
 	in = "122595";
 	PGTYPESdate_defmt_asc(&date1, fmt, in);
@@ -365,5 +365,5 @@ main(void)
 	exec sql rollback;
         exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc b/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc
index d519305e18..9e1f432823 100644
--- a/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc
+++ b/src/interfaces/ecpg/test/pgtypeslib/dt_test2.pgc
@@ -147,5 +147,5 @@ main(void)
 		PGTYPESinterval_free(i1);
 	}
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc
index 3b5781632e..bc682b93d5 100644
--- a/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc
+++ b/src/interfaces/ecpg/test/pgtypeslib/nan_test.pgc
@@ -90,5 +90,5 @@ main(void)
 	exec sql rollback;
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc b/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc
index a024c8702f..d276f70772 100644
--- a/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc
+++ b/src/interfaces/ecpg/test/pgtypeslib/num_test.pgc
@@ -93,5 +93,5 @@ main(void)
 	exec sql rollback;
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc b/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
index 2ac666f7c0..16ca6a44a5 100644
--- a/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
+++ b/src/interfaces/ecpg/test/pgtypeslib/num_test2.pgc
@@ -210,7 +210,7 @@ main(void)
 	}
 	free(numarr);
 
-	return (0);
+	return 0;
 }
 
 static void
diff --git a/src/interfaces/ecpg/test/preproc/.gitignore b/src/interfaces/ecpg/test/preproc/.gitignore
index ffca98e8c0..fd63e645a3 100644
--- a/src/interfaces/ecpg/test/preproc/.gitignore
+++ b/src/interfaces/ecpg/test/preproc/.gitignore
@@ -22,3 +22,5 @@
 /variable.c
 /whenever
 /whenever.c
+/whenever_do_continue
+/whenever_do_continue.c
diff --git a/src/interfaces/ecpg/test/preproc/Makefile b/src/interfaces/ecpg/test/preproc/Makefile
index d658a4d6b2..39b1974f5f 100644
--- a/src/interfaces/ecpg/test/preproc/Makefile
+++ b/src/interfaces/ecpg/test/preproc/Makefile
@@ -15,6 +15,7 @@ TESTS = array_of_struct array_of_struct.c \
 	type type.c \
 	variable variable.c \
 	whenever whenever.c \
+	whenever_do_continue whenever_do_continue.c \
 	pointer_to_struct pointer_to_struct.c
 
 all: $(TESTS)
diff --git a/src/interfaces/ecpg/test/preproc/array_of_struct.pgc b/src/interfaces/ecpg/test/preproc/array_of_struct.pgc
index f9e1946b3f..69f5758474 100644
--- a/src/interfaces/ecpg/test/preproc/array_of_struct.pgc
+++ b/src/interfaces/ecpg/test/preproc/array_of_struct.pgc
@@ -91,5 +91,5 @@ int main()
 
     EXEC SQL disconnect all;
 
-    return( 0 );
+    return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/cursor.pgc b/src/interfaces/ecpg/test/preproc/cursor.pgc
index 4247912989..8a286ad523 100644
--- a/src/interfaces/ecpg/test/preproc/cursor.pgc
+++ b/src/interfaces/ecpg/test/preproc/cursor.pgc
@@ -252,5 +252,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect all;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/define.pgc b/src/interfaces/ecpg/test/preproc/define.pgc
index 2161733f49..0d07ebfe63 100644
--- a/src/interfaces/ecpg/test/preproc/define.pgc
+++ b/src/interfaces/ecpg/test/preproc/define.pgc
@@ -58,5 +58,5 @@ exec sql end declare section;
 	exec sql commit;
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/init.pgc b/src/interfaces/ecpg/test/preproc/init.pgc
index 11dc01ade4..b1f71997a2 100644
--- a/src/interfaces/ecpg/test/preproc/init.pgc
+++ b/src/interfaces/ecpg/test/preproc/init.pgc
@@ -35,7 +35,7 @@ static int fe(enum e x)
 	return (int)x;
 }
 
-static void sqlnotice(char *notice, short trans)
+static void sqlnotice(const char *notice, short trans)
 {
 	if (!notice)
 		notice = "-empty-";
diff --git a/src/interfaces/ecpg/test/preproc/outofscope.pgc b/src/interfaces/ecpg/test/preproc/outofscope.pgc
index 6b5d2707ce..aae53250a5 100644
--- a/src/interfaces/ecpg/test/preproc/outofscope.pgc
+++ b/src/interfaces/ecpg/test/preproc/outofscope.pgc
@@ -123,5 +123,5 @@ main (void)
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/pointer_to_struct.pgc b/src/interfaces/ecpg/test/preproc/pointer_to_struct.pgc
index ec94273408..1ec651e3fc 100644
--- a/src/interfaces/ecpg/test/preproc/pointer_to_struct.pgc
+++ b/src/interfaces/ecpg/test/preproc/pointer_to_struct.pgc
@@ -96,5 +96,5 @@ int main()
     EXEC SQL disconnect all;
 
 	/* All the memory will anyway be freed at the end */
-    return( 0 );
+    return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/strings.pgc b/src/interfaces/ecpg/test/preproc/strings.pgc
index d6ec9a4cb8..f004ddf6dc 100644
--- a/src/interfaces/ecpg/test/preproc/strings.pgc
+++ b/src/interfaces/ecpg/test/preproc/strings.pgc
@@ -23,5 +23,5 @@ int main(void)
   printf("%s %s %s %s %s %s\n", s1, s2, s3, s4, s5, s6);
 
   exec sql disconnect;
-  return (0);
+  return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/variable.pgc b/src/interfaces/ecpg/test/preproc/variable.pgc
index 05420afdb2..697a7dc814 100644
--- a/src/interfaces/ecpg/test/preproc/variable.pgc
+++ b/src/interfaces/ecpg/test/preproc/variable.pgc
@@ -97,5 +97,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/preproc/whenever.pgc b/src/interfaces/ecpg/test/preproc/whenever.pgc
index 9b3ae9e9ec..14cf571e6a 100644
--- a/src/interfaces/ecpg/test/preproc/whenever.pgc
+++ b/src/interfaces/ecpg/test/preproc/whenever.pgc
@@ -4,7 +4,7 @@ exec sql include ../regression;
 
 exec sql whenever sqlerror sqlprint;
 
-static void print(char *msg)
+static void print(const char *msg)
 {
         fprintf(stderr, "Error in statement '%s':\n", msg);
         sqlprint();
diff --git a/src/interfaces/ecpg/test/preproc/whenever_do_continue.pgc b/src/interfaces/ecpg/test/preproc/whenever_do_continue.pgc
new file mode 100644
index 0000000000..2a925a3c54
--- /dev/null
+++ b/src/interfaces/ecpg/test/preproc/whenever_do_continue.pgc
@@ -0,0 +1,63 @@
+#include <stdlib.h>
+
+exec sql include ../regression;
+
+exec sql whenever sqlerror sqlprint;
+
+int main(void)
+{
+	exec sql begin declare section;
+	struct
+	{
+		char ename[12];
+		float sal;
+		float comm;
+	} emp;
+
+	char msg[128];
+	exec sql end declare section;
+
+	ECPGdebug(1, stderr);
+
+	strcpy(msg, "connect");
+	exec sql connect to REGRESSDB1;
+
+	strcpy(msg, "create");
+	exec sql  create table emp(ename varchar,sal double precision, comm double precision);
+
+	strcpy(msg, "insert");
+	exec sql insert into emp values ('Ram',111100,21);
+	exec sql insert into emp values ('aryan',11110,null);
+	exec sql insert into emp values ('josh',10000,10);
+	exec sql insert into emp values ('tom',20000,null);
+
+	exec sql declare c cursor for select ename, sal, comm from emp order by ename collate "C" asc;
+
+	exec sql open c;
+
+	/* The 'BREAK' condition to exit the loop. */
+	exec sql whenever not found do break;
+
+	/* The DO CONTINUE makes the loop start at the next iteration when an error occurs.*/
+	exec sql whenever sqlerror do continue;
+
+	while (1)
+	{
+		exec sql fetch c into :emp;
+		/* The employees with non-NULL commissions will be displayed. */
+		printf("%s %7.2f %9.2f\n", emp.ename, emp.sal, emp.comm);
+	}
+
+	/*
+	 * This 'CONTINUE' shuts off the 'DO CONTINUE' and allow the program to
+	 * proceed if any further errors do occur.
+	 */
+	exec sql whenever sqlerror continue;
+
+	exec sql close c;
+
+	strcpy(msg, "drop");
+	exec sql drop table emp;
+
+	exit(0);
+}
diff --git a/src/interfaces/ecpg/test/sql/array.pgc b/src/interfaces/ecpg/test/sql/array.pgc
index 5f12c472c9..15c9cfa5f7 100644
--- a/src/interfaces/ecpg/test/sql/array.pgc
+++ b/src/interfaces/ecpg/test/sql/array.pgc
@@ -107,5 +107,5 @@ EXEC SQL END DECLARE SECTION;
 
 	free(t);
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/sql/describe.pgc b/src/interfaces/ecpg/test/sql/describe.pgc
index b95ab351bd..87d6bd9a29 100644
--- a/src/interfaces/ecpg/test/sql/describe.pgc
+++ b/src/interfaces/ecpg/test/sql/describe.pgc
@@ -195,5 +195,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/sql/execute.pgc b/src/interfaces/ecpg/test/sql/execute.pgc
index b8364c78bb..cc9814e9be 100644
--- a/src/interfaces/ecpg/test/sql/execute.pgc
+++ b/src/interfaces/ecpg/test/sql/execute.pgc
@@ -109,5 +109,5 @@ exec sql end declare section;
 	exec sql commit;
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/sql/oldexec.pgc b/src/interfaces/ecpg/test/sql/oldexec.pgc
index 2988f2ab8a..4f94a18aa1 100644
--- a/src/interfaces/ecpg/test/sql/oldexec.pgc
+++ b/src/interfaces/ecpg/test/sql/oldexec.pgc
@@ -86,5 +86,5 @@ exec sql end declare section;
 	exec sql commit;
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/sql/sqlda.pgc b/src/interfaces/ecpg/test/sql/sqlda.pgc
index 29774b5909..eaf5c6f7e1 100644
--- a/src/interfaces/ecpg/test/sql/sqlda.pgc
+++ b/src/interfaces/ecpg/test/sql/sqlda.pgc
@@ -246,5 +246,5 @@ exec sql end declare section;
 	strcpy(msg, "disconnect");
 	exec sql disconnect;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/sql/twophase.pgc b/src/interfaces/ecpg/test/sql/twophase.pgc
index 867a28e4c4..38913d7af2 100644
--- a/src/interfaces/ecpg/test/sql/twophase.pgc
+++ b/src/interfaces/ecpg/test/sql/twophase.pgc
@@ -40,5 +40,5 @@ int main(void)
 	strcpy(msg, "disconnect");
 	exec sql disconnect current;
 
-	return (0);
+	return 0;
 }
diff --git a/src/interfaces/ecpg/test/thread/alloc.pgc b/src/interfaces/ecpg/test/thread/alloc.pgc
index ea98495be4..b13bcb860b 100644
--- a/src/interfaces/ecpg/test/thread/alloc.pgc
+++ b/src/interfaces/ecpg/test/thread/alloc.pgc
@@ -13,6 +13,7 @@ main(void)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -41,6 +42,12 @@ static void* fn(void* arg)
 	char **r = NULL;
 	EXEC SQL END DECLARE SECTION;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
 	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
diff --git a/src/interfaces/ecpg/test/thread/descriptor.pgc b/src/interfaces/ecpg/test/thread/descriptor.pgc
index e07a5e22b7..3f28c6d329 100644
--- a/src/interfaces/ecpg/test/thread/descriptor.pgc
+++ b/src/interfaces/ecpg/test/thread/descriptor.pgc
@@ -3,6 +3,7 @@
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -24,6 +25,12 @@ static void* fn(void* arg)
 {
 	int i;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
 	for (i = 1; i <= REPEATS; ++i)
 	{
 		EXEC SQL ALLOCATE DESCRIPTOR mydesc;
diff --git a/src/interfaces/ecpg/test/thread/prep.pgc b/src/interfaces/ecpg/test/thread/prep.pgc
index 45205ddc8b..3a2467c9ab 100644
--- a/src/interfaces/ecpg/test/thread/prep.pgc
+++ b/src/interfaces/ecpg/test/thread/prep.pgc
@@ -13,6 +13,7 @@ main(void)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <process.h>
+#include <locale.h>
 #else
 #include <pthread.h>
 #endif
@@ -41,6 +42,12 @@ static void* fn(void* arg)
 	char query[256] = "INSERT INTO T VALUES ( ? )";
 	EXEC SQL END DECLARE SECTION;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
 	value = (long)arg;
 	sprintf(name, "Connection: %d", value);
 
diff --git a/src/interfaces/ecpg/test/thread/thread.pgc b/src/interfaces/ecpg/test/thread/thread.pgc
index cc23b82484..ae6b229962 100644
--- a/src/interfaces/ecpg/test/thread/thread.pgc
+++ b/src/interfaces/ecpg/test/thread/thread.pgc
@@ -17,6 +17,7 @@ main(void)
 #include <pthread.h>
 #else
 #include <windows.h>
+#include <locale.h>
 #endif
 
 exec sql include ../regression;
@@ -59,7 +60,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -91,17 +92,24 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
 {
   long threadnum = (long)arg;
+
   EXEC SQL BEGIN DECLARE SECTION;
   int  l_i;
   char l_connection[128];
   EXEC SQL END DECLARE SECTION;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
   /* build up connection name, and connect to database */
 #ifndef _MSC_VER
   snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum);
@@ -113,7 +121,7 @@ void *test_thread(void *arg)
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   EXEC SQL AT :l_connection BEGIN;
 
@@ -128,6 +136,6 @@ void *test_thread(void *arg)
   /* all done */
   EXEC SQL AT :l_connection COMMIT;
   EXEC SQL DISCONNECT :l_connection;
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
diff --git a/src/interfaces/ecpg/test/thread/thread_implicit.pgc b/src/interfaces/ecpg/test/thread/thread_implicit.pgc
index 96e0e993ac..0dfcb7172b 100644
--- a/src/interfaces/ecpg/test/thread/thread_implicit.pgc
+++ b/src/interfaces/ecpg/test/thread/thread_implicit.pgc
@@ -18,6 +18,7 @@ main(void)
 #include <pthread.h>
 #else
 #include <windows.h>
+#include <locale.h>
 #endif
 
 exec sql include ../regression;
@@ -60,7 +61,7 @@ int main()
   if( threads == NULL )
     {
       fprintf(stderr, "Cannot alloc memory\n");
-      return( 1 );
+      return 1;
     }
   for( n = 0; n < nthreads; n++ )
     {
@@ -92,17 +93,24 @@ int main()
   else
     printf("ERROR: Failure - expecting %d rows, got %d.\n", nthreads * iterations, l_rows);
 
-  return( 0 );
+  return 0;
 }
 
 void *test_thread(void *arg)
 {
   long threadnum = (long)arg;
+
   EXEC SQL BEGIN DECLARE SECTION;
   int  l_i;
   char l_connection[128];
   EXEC SQL END DECLARE SECTION;
 
+#ifdef WIN32
+#ifdef _MSC_VER                /* requires MSVC */
+	_configthreadlocale(_ENABLE_PER_THREAD_LOCALE);
+#endif
+#endif
+
   /* build up connection name, and connect to database */
 #ifndef _MSC_VER
   snprintf(l_connection, sizeof(l_connection), "thread_%03ld", threadnum);
@@ -114,7 +122,7 @@ void *test_thread(void *arg)
   if( sqlca.sqlcode != 0 )
     {
       printf("%s: ERROR: cannot connect to database!\n", l_connection);
-      return( NULL );
+      return NULL;
     }
   EXEC SQL BEGIN;
 
@@ -129,6 +137,6 @@ void *test_thread(void *arg)
   /* all done */
   EXEC SQL COMMIT;
   EXEC SQL DISCONNECT :l_connection;
-  return( NULL );
+  return NULL;
 }
 #endif /* ENABLE_THREAD_SAFETY */
diff --git a/src/interfaces/libpq/.gitignore b/src/interfaces/libpq/.gitignore
index 6c02dc7055..5c232ae2d1 100644
--- a/src/interfaces/libpq/.gitignore
+++ b/src/interfaces/libpq/.gitignore
@@ -18,6 +18,7 @@
 /snprintf.c
 /strerror.c
 /strlcpy.c
+/strnlen.c
 /thread.c
 /win32error.c
 /win32setlocale.c
diff --git a/src/interfaces/libpq/CMakeLists.txt b/src/interfaces/libpq/CMakeLists.txt
index b0b8723489..9cc685b6ea 100644
--- a/src/interfaces/libpq/CMakeLists.txt
+++ b/src/interfaces/libpq/CMakeLists.txt
@@ -1,124 +1,125 @@
-include_directories(BEFORE
-	"${CMAKE_CURRENT_SOURCE_DIR}"
-	"${PROJECT_SOURCE_DIR}/src/port"
-)
-
-if(USE_OPENSSL)
-	include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
-	set(pq_ssl_SRCS
-		fe-secure-openssl.c
-		${PROJECT_SOURCE_DIR}/src/common/sha2_openssl.c
-	)
-else()
-	set(pq_ssl_SRCS ${PROJECT_SOURCE_DIR}/src/common/sha2.c)
-endif(USE_OPENSSL)
-
-set(pq_SRCS
-	fe-auth.c
-	fe-connect.c
-	fe-exec.c
-	fe-misc.c
-	fe-print.c
-	fe-lobj.c
-	fe-protocol2.c
-	fe-protocol3.c
-	fe-auth-scram.c
-	pqexpbuffer.c
-	fe-secure.c
-	libpq-events.c
-
-	${PORT_DIR}/chklocale.c
-	${PORT_DIR}/inet_net_ntop.c
-	${PORT_DIR}/noblock.c
-	${PORT_DIR}/pgstrcasecmp.c
-	${PORT_DIR}/pqsignal.c
-	${PORT_DIR}/thread.c
-
-	${PROJECT_SOURCE_DIR}/src/common/ip.c
-	${PROJECT_SOURCE_DIR}/src/common/md5.c
-	${PROJECT_SOURCE_DIR}/src/common/base64.c
-	${PROJECT_SOURCE_DIR}/src/common/scram-common.c
-	${PROJECT_SOURCE_DIR}/src/common/saslprep.c
-	${PROJECT_SOURCE_DIR}/src/common/unicode_norm.c
-	${MB_UTILS_BACKEND_DIR}/encnames.c
-	${MB_UTILS_BACKEND_DIR}/wchar.c
-
-	${fallback_SRCS}
-	${pq_ssl_SRCS}
-)
-
-if(USE_REPL_SNPRINTF)
-	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/snprintf.c)
-endif()
-
-if(HAVE_STRONG_RANDOM)
-	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/pg_strong_random.c)
-else()
-	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/erand48.c)
-endif()
-
-set(RES_FILES "")
-if(WIN32)
-	set(pq_SRCS ${pq_SRCS}
-		win32.c
-		${PORT_DIR}/win32error.c
-		${PORT_DIR}/win32setlocale.c
-		${PORT_DIR}/pgsleep.c
-		${PORT_DIR}/open.c
-		${PORT_DIR}/system.c
-		${PORT_DIR}/inet_aton.c
-		${PORT_DIR}/thread.c
-		${PORT_DIR}/getaddrinfo.c
-	)
-	if (Threads_FOUND)
-		set(pq_SRCS ${pq_SRCS} pthread-win32.c)
-	endif()
-	set(RES_FILES "libpq.rc")
-	set(CMAKE_RC_COMPILER_INIT windres)
-	ENABLE_LANGUAGE(RC)
-	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
-endif()
-
-add_library(pq SHARED ${pq_SRCS} ${RES_FILES})
-target_link_libraries(pq
-	${CMAKE_THREAD_LIBS_INIT}
-	${LIBSOCKET_LIBRARIES}
-	${GSS_LIBS}
-)
-if(USE_OPENSSL)
-	target_link_libraries(pq ${OPENSSL_LIBRARIES})
-endif()
-if (MSVC)
-	gen_def(pq)
-endif()
-if(CRYPT_LIB)
-	target_link_libraries(pq ${CRYPT_LIB})
-endif()
-if(WIN32)
-	target_link_libraries(pq
-		#port
-		Secur32
-		ws2_32
-	)
-endif()
-
-if(LDAP_FOUND)
-	target_link_libraries(pq ${LDAP_LIBRARIES})
-endif()
-
-if(USE_OPENSSL)
-	target_include_directories(pq PUBLIC ${OPENSSL_INCLUDE_DIR})
-endif()
-
-
-target_compile_definitions(pq PRIVATE -DFRONTEND -DUNSAFE_STAT_OK)
-install(TARGETS pq
-		RUNTIME DESTINATION ${PGBINDIR}
-		LIBRARY DESTINATION ${LIBDIR})
-
-if(ENABLE_NLS)
-	MAKE_MO(libpq "cs;de;es;fr;it;ja;ko;pl;pt_BR;ru;tr;zh_CN;zh_TW;he;sv")
-endif()
-
-#TODO 
-#set_target_properties(pq PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports.list")
+include_directories(BEFORE
+	"${CMAKE_CURRENT_SOURCE_DIR}"
+	"${PROJECT_SOURCE_DIR}/src/port"
+)
+
+if(USE_OPENSSL)
+	include_directories(BEFORE ${OPENSSL_INCLUDE_DIR})
+	set(pq_ssl_SRCS
+		fe-secure-openssl.c
+		${PROJECT_SOURCE_DIR}/src/common/sha2_openssl.c
+	)
+else()
+	set(pq_ssl_SRCS ${PROJECT_SOURCE_DIR}/src/common/sha2.c)
+endif(USE_OPENSSL)
+
+set(pq_SRCS
+	fe-auth.c
+	fe-connect.c
+	fe-exec.c
+	fe-misc.c
+	fe-print.c
+	fe-lobj.c
+	fe-protocol2.c
+	fe-protocol3.c
+	fe-auth-scram.c
+	pqexpbuffer.c
+	fe-secure.c
+	fe-secure-common.c
+	libpq-events.c
+
+	${PORT_DIR}/chklocale.c
+	${PORT_DIR}/inet_net_ntop.c
+	${PORT_DIR}/noblock.c
+	${PORT_DIR}/pgstrcasecmp.c
+	${PORT_DIR}/pqsignal.c
+	${PORT_DIR}/thread.c
+
+	${PROJECT_SOURCE_DIR}/src/common/ip.c
+	${PROJECT_SOURCE_DIR}/src/common/md5.c
+	${PROJECT_SOURCE_DIR}/src/common/base64.c
+	${PROJECT_SOURCE_DIR}/src/common/scram-common.c
+	${PROJECT_SOURCE_DIR}/src/common/saslprep.c
+	${PROJECT_SOURCE_DIR}/src/common/unicode_norm.c
+	${MB_UTILS_BACKEND_DIR}/encnames.c
+	${MB_UTILS_BACKEND_DIR}/wchar.c
+
+	${fallback_SRCS}
+	${pq_ssl_SRCS}
+)
+
+if(USE_REPL_SNPRINTF)
+	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/snprintf.c)
+endif()
+
+if(HAVE_STRONG_RANDOM)
+	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/pg_strong_random.c)
+else()
+	set(pq_SRCS ${pq_SRCS} ${PORT_DIR}/erand48.c)
+endif()
+
+set(RES_FILES "")
+if(WIN32)
+	set(pq_SRCS ${pq_SRCS}
+		win32.c
+		${PORT_DIR}/win32error.c
+		${PORT_DIR}/win32setlocale.c
+		${PORT_DIR}/pgsleep.c
+		${PORT_DIR}/open.c
+		${PORT_DIR}/system.c
+		${PORT_DIR}/inet_aton.c
+		${PORT_DIR}/thread.c
+		${PORT_DIR}/getaddrinfo.c
+	)
+	if (Threads_FOUND)
+		set(pq_SRCS ${pq_SRCS} pthread-win32.c)
+	endif()
+	set(RES_FILES "libpq.rc")
+	set(CMAKE_RC_COMPILER_INIT windres)
+	ENABLE_LANGUAGE(RC)
+	SET(CMAKE_RC_COMPILE_OBJECT "<CMAKE_RC_COMPILER> <FLAGS> -O coff <DEFINES> -i <SOURCE> -o <OBJECT>")
+endif()
+
+add_library(pq SHARED ${pq_SRCS} ${RES_FILES})
+target_link_libraries(pq
+	${CMAKE_THREAD_LIBS_INIT}
+	${LIBSOCKET_LIBRARIES}
+	${GSS_LIBS}
+)
+if(USE_OPENSSL)
+	target_link_libraries(pq ${OPENSSL_LIBRARIES})
+endif()
+if (MSVC)
+	gen_def(pq)
+endif()
+if(CRYPT_LIB)
+	target_link_libraries(pq ${CRYPT_LIB})
+endif()
+if(WIN32)
+	target_link_libraries(pq
+		#port
+		Secur32
+		ws2_32
+	)
+endif()
+
+if(LDAP_FOUND)
+	target_link_libraries(pq ${LDAP_LIBRARIES})
+endif()
+
+if(USE_OPENSSL)
+	target_include_directories(pq PUBLIC ${OPENSSL_INCLUDE_DIR})
+endif()
+
+
+target_compile_definitions(pq PRIVATE -DFRONTEND -DUNSAFE_STAT_OK)
+install(TARGETS pq
+		RUNTIME DESTINATION ${PGBINDIR}
+		LIBRARY DESTINATION ${LIBDIR})
+
+if(ENABLE_NLS)
+	MAKE_MO(libpq "cs;de;es;fr;it;ja;ko;pl;pt_BR;ru;tr;zh_CN;zh_TW;he;sv")
+endif()
+
+#TODO 
+#set_target_properties(pq PROPERTIES LINK_FLAGS "-Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exports.list")
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
index 87f22d242f..abe0a50e98 100644
--- a/src/interfaces/libpq/Makefile
+++ b/src/interfaces/libpq/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/interfaces/libpq library
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/interfaces/libpq/Makefile
@@ -38,7 +38,7 @@ OBJS=	fe-auth.o fe-auth-scram.o fe-connect.o fe-exec.o fe-misc.o fe-print.o fe-l
 OBJS += chklocale.o inet_net_ntop.o noblock.o pgstrcasecmp.o pqsignal.o \
 	thread.o
 # libpgport C files that are needed if identified by configure
-OBJS += $(filter crypt.o getaddrinfo.o getpeereid.o inet_aton.o open.o system.o snprintf.o strerror.o strlcpy.o win32error.o win32setlocale.o, $(LIBOBJS))
+OBJS += $(filter crypt.o getaddrinfo.o getpeereid.o inet_aton.o open.o system.o snprintf.o strerror.o strlcpy.o strnlen.o win32error.o win32setlocale.o, $(LIBOBJS))
 
 ifeq ($(enable_strong_random), yes)
 OBJS += pg_strong_random.o
@@ -52,7 +52,7 @@ OBJS += encnames.o wchar.o
 OBJS += base64.o ip.o md5.o scram-common.o saslprep.o unicode_norm.o
 
 ifeq ($(with_openssl),yes)
-OBJS += fe-secure-openssl.o sha2_openssl.o
+OBJS += fe-secure-openssl.o fe-secure-common.o sha2_openssl.o
 else
 OBJS += sha2.o
 endif
@@ -103,7 +103,7 @@ backend_src = $(top_srcdir)/src/backend
 # the module is needed (see filter hack in OBJS, above).
 # When you add a file here, remember to add it in the "clean" target below.
 
-chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c: % : $(top_srcdir)/src/port/%
+chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c strnlen.c thread.c win32error.c win32setlocale.c: % : $(top_srcdir)/src/port/%
 	rm -f $@ && $(LN_S) $< .
 
 ip.c md5.c base64.c scram-common.c sha2.c sha2_openssl.c saslprep.c unicode_norm.c: % : $(top_srcdir)/src/common/%
@@ -155,7 +155,7 @@ clean distclean: clean-lib
 # Might be left over from a Win32 client-only build
 	rm -f pg_config_paths.h
 # Remove files we (may have) symlinked in from src/port and other places
-	rm -f chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c thread.c win32error.c win32setlocale.c
+	rm -f chklocale.c crypt.c erand48.c getaddrinfo.c getpeereid.c inet_aton.c inet_net_ntop.c noblock.c open.c system.c pgsleep.c pg_strong_random.c pgstrcasecmp.c pqsignal.c snprintf.c strerror.c strlcpy.c strnlen.c thread.c win32error.c win32setlocale.c
 	rm -f ip.c md5.c base64.c scram-common.c sha2.c sha2_openssl.c saslprep.c unicode_norm.c
 	rm -f encnames.c wchar.c
 
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
index d1c7037101..8415bbb5c6 100644
--- a/src/interfaces/libpq/fe-auth-scram.c
+++ b/src/interfaces/libpq/fe-auth-scram.c
@@ -3,7 +3,7 @@
  * fe-auth-scram.c
  *	   The front-end (client) implementation of SCRAM authentication.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -42,8 +42,9 @@ typedef struct
 	fe_scram_state_enum state;
 
 	/* These are supplied by the user */
-	const char *username;
+	PGconn	   *conn;
 	char	   *password;
+	char	   *sasl_mechanism;
 
 	/* We construct these */
 	uint8		SaltedPassword[SCRAM_KEY_LEN];
@@ -63,14 +64,10 @@ typedef struct
 	char		ServerSignature[SCRAM_KEY_LEN];
 } fe_scram_state;
 
-static bool read_server_first_message(fe_scram_state *state, char *input,
-						  PQExpBuffer errormessage);
-static bool read_server_final_message(fe_scram_state *state, char *input,
-						  PQExpBuffer errormessage);
-static char *build_client_first_message(fe_scram_state *state,
-						   PQExpBuffer errormessage);
-static char *build_client_final_message(fe_scram_state *state,
-						   PQExpBuffer errormessage);
+static bool read_server_first_message(fe_scram_state *state, char *input);
+static bool read_server_final_message(fe_scram_state *state, char *input);
+static char *build_client_first_message(fe_scram_state *state);
+static char *build_client_final_message(fe_scram_state *state);
 static bool verify_server_signature(fe_scram_state *state);
 static void calculate_client_proof(fe_scram_state *state,
 					   const char *client_final_message_without_proof,
@@ -81,23 +78,35 @@ static bool pg_frontend_random(char *dst, int len);
  * Initialize SCRAM exchange status.
  */
 void *
-pg_fe_scram_init(const char *username, const char *password)
+pg_fe_scram_init(PGconn *conn,
+				 const char *password,
+				 const char *sasl_mechanism)
 {
 	fe_scram_state *state;
 	char	   *prep_password;
 	pg_saslprep_rc rc;
 
+	Assert(sasl_mechanism != NULL);
+
 	state = (fe_scram_state *) malloc(sizeof(fe_scram_state));
 	if (!state)
 		return NULL;
 	memset(state, 0, sizeof(fe_scram_state));
+	state->conn = conn;
 	state->state = FE_SCRAM_INIT;
-	state->username = username;
+	state->sasl_mechanism = strdup(sasl_mechanism);
+
+	if (!state->sasl_mechanism)
+	{
+		free(state);
+		return NULL;
+	}
 
 	/* Normalize the password with SASLprep, if possible */
 	rc = pg_saslprep(password, &prep_password);
 	if (rc == SASLPREP_OOM)
 	{
+		free(state->sasl_mechanism);
 		free(state);
 		return NULL;
 	}
@@ -106,6 +115,7 @@ pg_fe_scram_init(const char *username, const char *password)
 		prep_password = strdup(password);
 		if (!prep_password)
 		{
+			free(state->sasl_mechanism);
 			free(state);
 			return NULL;
 		}
@@ -125,6 +135,8 @@ pg_fe_scram_free(void *opaq)
 
 	if (state->password)
 		free(state->password);
+	if (state->sasl_mechanism)
+		free(state->sasl_mechanism);
 
 	/* client messages */
 	if (state->client_nonce)
@@ -155,9 +167,10 @@ pg_fe_scram_free(void *opaq)
 void
 pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 					 char **output, int *outputlen,
-					 bool *done, bool *success, PQExpBuffer errorMessage)
+					 bool *done, bool *success)
 {
 	fe_scram_state *state = (fe_scram_state *) opaq;
+	PGconn	   *conn = state->conn;
 
 	*done = false;
 	*success = false;
@@ -172,13 +185,13 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 	{
 		if (inputlen == 0)
 		{
-			printfPQExpBuffer(errorMessage,
+			printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext("malformed SCRAM message (empty message)\n"));
 			goto error;
 		}
 		if (inputlen != strlen(input))
 		{
-			printfPQExpBuffer(errorMessage,
+			printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext("malformed SCRAM message (length mismatch)\n"));
 			goto error;
 		}
@@ -188,7 +201,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 	{
 		case FE_SCRAM_INIT:
 			/* Begin the SCRAM handshake, by sending client nonce */
-			*output = build_client_first_message(state, errorMessage);
+			*output = build_client_first_message(state);
 			if (*output == NULL)
 				goto error;
 
@@ -199,10 +212,10 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 
 		case FE_SCRAM_NONCE_SENT:
 			/* Receive salt and server nonce, send response. */
-			if (!read_server_first_message(state, input, errorMessage))
+			if (!read_server_first_message(state, input))
 				goto error;
 
-			*output = build_client_final_message(state, errorMessage);
+			*output = build_client_final_message(state);
 			if (*output == NULL)
 				goto error;
 
@@ -213,7 +226,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 
 		case FE_SCRAM_PROOF_SENT:
 			/* Receive server signature */
-			if (!read_server_final_message(state, input, errorMessage))
+			if (!read_server_final_message(state, input))
 				goto error;
 
 			/*
@@ -227,8 +240,8 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 			else
 			{
 				*success = false;
-				printfPQExpBuffer(errorMessage,
-								  libpq_gettext("invalid server signature\n"));
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("incorrect server signature\n"));
 			}
 			*done = true;
 			state->state = FE_SCRAM_FINISHED;
@@ -236,7 +249,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 
 		default:
 			/* shouldn't happen */
-			printfPQExpBuffer(errorMessage,
+			printfPQExpBuffer(&conn->errorMessage,
 							  libpq_gettext("invalid SCRAM exchange state\n"));
 			goto error;
 	}
@@ -249,7 +262,7 @@ pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 }
 
 /*
- * Read value for an attribute part of a SASL message.
+ * Read value for an attribute part of a SCRAM message.
  */
 static char *
 read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
@@ -260,7 +273,7 @@ read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
 	if (*begin != attr)
 	{
 		printfPQExpBuffer(errorMessage,
-						  libpq_gettext("malformed SCRAM message (%c expected)\n"),
+						  libpq_gettext("malformed SCRAM message (attribute \"%c\" expected)\n"),
 						  attr);
 		return NULL;
 	}
@@ -269,7 +282,7 @@ read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
 	if (*begin != '=')
 	{
 		printfPQExpBuffer(errorMessage,
-						  libpq_gettext("malformed SCRAM message (expected = in attr '%c')\n"),
+						  libpq_gettext("malformed SCRAM message (expected character \"=\" for attribute \"%c\")\n"),
 						  attr);
 		return NULL;
 	}
@@ -294,12 +307,14 @@ read_attr_value(char **input, char attr, PQExpBuffer errorMessage)
  * Build the first exchange message sent by the client.
  */
 static char *
-build_client_first_message(fe_scram_state *state, PQExpBuffer errormessage)
+build_client_first_message(fe_scram_state *state)
 {
+	PGconn	   *conn = state->conn;
 	char		raw_nonce[SCRAM_RAW_NONCE_LEN + 1];
-	char	   *buf;
-	char		buflen;
+	char	   *result;
+	int			channel_info_len;
 	int			encoded_len;
+	PQExpBufferData buf;
 
 	/*
 	 * Generate a "raw" nonce.  This is converted to ASCII-printable form by
@@ -307,7 +322,7 @@ build_client_first_message(fe_scram_state *state, PQExpBuffer errormessage)
 	 */
 	if (!pg_frontend_random(raw_nonce, SCRAM_RAW_NONCE_LEN))
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("could not generate nonce\n"));
 		return NULL;
 	}
@@ -315,7 +330,7 @@ build_client_first_message(fe_scram_state *state, PQExpBuffer errormessage)
 	state->client_nonce = malloc(pg_b64_enc_len(SCRAM_RAW_NONCE_LEN) + 1);
 	if (state->client_nonce == NULL)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("out of memory\n"));
 		return NULL;
 	}
@@ -328,35 +343,80 @@ build_client_first_message(fe_scram_state *state, PQExpBuffer errormessage)
 	 * prepared with SASLprep, the message parsing would fail if it includes
 	 * '=' or ',' characters.
 	 */
-	buflen = 8 + strlen(state->client_nonce) + 1;
-	buf = malloc(buflen);
-	if (buf == NULL)
+
+	initPQExpBuffer(&buf);
+
+	/*
+	 * First build the gs2-header with channel binding information.
+	 */
+	if (strcmp(state->sasl_mechanism, SCRAM_SHA_256_PLUS_NAME) == 0)
 	{
-		printfPQExpBuffer(errormessage,
-						  libpq_gettext("out of memory\n"));
-		return NULL;
+		Assert(conn->ssl_in_use);
+		appendPQExpBuffer(&buf, "p=%s", conn->scram_channel_binding);
 	}
-	snprintf(buf, buflen, "n,,n=,r=%s", state->client_nonce);
-
-	state->client_first_message_bare = strdup(buf + 3);
-	if (!state->client_first_message_bare)
+	else if (conn->scram_channel_binding == NULL ||
+			 strlen(conn->scram_channel_binding) == 0)
 	{
-		free(buf);
-		printfPQExpBuffer(errormessage,
-						  libpq_gettext("out of memory\n"));
-		return NULL;
+		/*
+		 * Client has chosen to not show to server that it supports channel
+		 * binding.
+		 */
+		appendPQExpBuffer(&buf, "n");
 	}
+	else if (conn->ssl_in_use)
+	{
+		/*
+		 * Client supports channel binding, but thinks the server does not.
+		 */
+		appendPQExpBuffer(&buf, "y");
+	}
+	else
+	{
+		/*
+		 * Client does not support channel binding.
+		 */
+		appendPQExpBuffer(&buf, "n");
+	}
+
+	if (PQExpBufferDataBroken(buf))
+		goto oom_error;
+
+	channel_info_len = buf.len;
+
+	appendPQExpBuffer(&buf, ",,n=,r=%s", state->client_nonce);
+	if (PQExpBufferDataBroken(buf))
+		goto oom_error;
+
+	/*
+	 * The first message content needs to be saved without channel binding
+	 * information.
+	 */
+	state->client_first_message_bare = strdup(buf.data + channel_info_len + 2);
+	if (!state->client_first_message_bare)
+		goto oom_error;
 
-	return buf;
+	result = strdup(buf.data);
+	if (result == NULL)
+		goto oom_error;
+
+	termPQExpBuffer(&buf);
+	return result;
+
+oom_error:
+	termPQExpBuffer(&buf);
+	printfPQExpBuffer(&conn->errorMessage,
+					  libpq_gettext("out of memory\n"));
+	return NULL;
 }
 
 /*
  * Build the final exchange message sent from the client.
  */
 static char *
-build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
+build_client_final_message(fe_scram_state *state)
 {
 	PQExpBufferData buf;
+	PGconn	   *conn = state->conn;
 	uint8		client_proof[SCRAM_KEY_LEN];
 	char	   *result;
 
@@ -365,8 +425,102 @@ build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
 	/*
 	 * Construct client-final-message-without-proof.  We need to remember it
 	 * for verifying the server proof in the final step of authentication.
+	 *
+	 * The channel binding flag handling (p/y/n) must be consistent with
+	 * build_client_first_message(), because the server will check that it's
+	 * the same flag both times.
 	 */
-	appendPQExpBuffer(&buf, "c=biws,r=%s", state->nonce);
+	if (strcmp(state->sasl_mechanism, SCRAM_SHA_256_PLUS_NAME) == 0)
+	{
+		char	   *cbind_data = NULL;
+		size_t		cbind_data_len = 0;
+		size_t		cbind_header_len;
+		char	   *cbind_input;
+		size_t		cbind_input_len;
+
+		if (strcmp(conn->scram_channel_binding, SCRAM_CHANNEL_BINDING_TLS_UNIQUE) == 0)
+		{
+#ifdef USE_SSL
+			cbind_data = pgtls_get_finished(state->conn, &cbind_data_len);
+			if (cbind_data == NULL)
+				goto oom_error;
+#endif
+		}
+		else if (strcmp(conn->scram_channel_binding,
+						SCRAM_CHANNEL_BINDING_TLS_END_POINT) == 0)
+		{
+			/* Fetch hash data of server's SSL certificate */
+#ifdef USE_SSL
+			cbind_data =
+				pgtls_get_peer_certificate_hash(state->conn,
+												&cbind_data_len);
+			if (cbind_data == NULL)
+			{
+				/* error message is already set on error */
+				return NULL;
+			}
+#endif
+		}
+		else
+		{
+			/* should not happen */
+			termPQExpBuffer(&buf);
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("invalid channel binding type\n"));
+			return NULL;
+		}
+
+		/* should not happen */
+		if (cbind_data == NULL || cbind_data_len == 0)
+		{
+			if (cbind_data != NULL)
+				free(cbind_data);
+			termPQExpBuffer(&buf);
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("empty channel binding data for channel binding type \"%s\"\n"),
+							  conn->scram_channel_binding);
+			return NULL;
+		}
+
+		appendPQExpBuffer(&buf, "c=");
+
+		/* p=type,, */
+		cbind_header_len = 4 + strlen(conn->scram_channel_binding);
+		cbind_input_len = cbind_header_len + cbind_data_len;
+		cbind_input = malloc(cbind_input_len);
+		if (!cbind_input)
+		{
+			free(cbind_data);
+			goto oom_error;
+		}
+		snprintf(cbind_input, cbind_input_len, "p=%s,,",
+				 conn->scram_channel_binding);
+		memcpy(cbind_input + cbind_header_len, cbind_data, cbind_data_len);
+
+		if (!enlargePQExpBuffer(&buf, pg_b64_enc_len(cbind_input_len)))
+		{
+			free(cbind_data);
+			free(cbind_input);
+			goto oom_error;
+		}
+		buf.len += pg_b64_encode(cbind_input, cbind_input_len, buf.data + buf.len);
+		buf.data[buf.len] = '\0';
+
+		free(cbind_data);
+		free(cbind_input);
+	}
+	else if (conn->scram_channel_binding == NULL ||
+			 strlen(conn->scram_channel_binding) == 0)
+		appendPQExpBuffer(&buf, "c=biws");	/* base64 of "n,," */
+	else if (conn->ssl_in_use)
+		appendPQExpBuffer(&buf, "c=eSws");	/* base64 of "y,," */
+	else
+		appendPQExpBuffer(&buf, "c=biws");	/* base64 of "n,," */
+
+	if (PQExpBufferDataBroken(buf))
+		goto oom_error;
+
+	appendPQExpBuffer(&buf, ",r=%s", state->nonce);
 	if (PQExpBufferDataBroken(buf))
 		goto oom_error;
 
@@ -396,7 +550,7 @@ build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
 
 oom_error:
 	termPQExpBuffer(&buf);
-	printfPQExpBuffer(errormessage,
+	printfPQExpBuffer(&conn->errorMessage,
 					  libpq_gettext("out of memory\n"));
 	return NULL;
 }
@@ -405,9 +559,9 @@ build_client_final_message(fe_scram_state *state, PQExpBuffer errormessage)
  * Read the first exchange message coming from the server.
  */
 static bool
-read_server_first_message(fe_scram_state *state, char *input,
-						  PQExpBuffer errormessage)
+read_server_first_message(fe_scram_state *state, char *input)
 {
+	PGconn	   *conn = state->conn;
 	char	   *iterations_str;
 	char	   *endptr;
 	char	   *encoded_salt;
@@ -416,13 +570,14 @@ read_server_first_message(fe_scram_state *state, char *input,
 	state->server_first_message = strdup(input);
 	if (state->server_first_message == NULL)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("out of memory\n"));
 		return false;
 	}
 
 	/* parse the message */
-	nonce = read_attr_value(&input, 'r', errormessage);
+	nonce = read_attr_value(&input, 'r',
+							&conn->errorMessage);
 	if (nonce == NULL)
 	{
 		/* read_attr_value() has generated an error string */
@@ -433,7 +588,7 @@ read_server_first_message(fe_scram_state *state, char *input,
 	if (strlen(nonce) < strlen(state->client_nonce) ||
 		memcmp(nonce, state->client_nonce, strlen(state->client_nonce)) != 0)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("invalid SCRAM response (nonce mismatch)\n"));
 		return false;
 	}
@@ -441,12 +596,12 @@ read_server_first_message(fe_scram_state *state, char *input,
 	state->nonce = strdup(nonce);
 	if (state->nonce == NULL)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("out of memory\n"));
 		return false;
 	}
 
-	encoded_salt = read_attr_value(&input, 's', errormessage);
+	encoded_salt = read_attr_value(&input, 's', &conn->errorMessage);
 	if (encoded_salt == NULL)
 	{
 		/* read_attr_value() has generated an error string */
@@ -455,7 +610,7 @@ read_server_first_message(fe_scram_state *state, char *input,
 	state->salt = malloc(pg_b64_dec_len(strlen(encoded_salt)));
 	if (state->salt == NULL)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("out of memory\n"));
 		return false;
 	}
@@ -463,7 +618,7 @@ read_server_first_message(fe_scram_state *state, char *input,
 								   strlen(encoded_salt),
 								   state->salt);
 
-	iterations_str = read_attr_value(&input, 'i', errormessage);
+	iterations_str = read_attr_value(&input, 'i', &conn->errorMessage);
 	if (iterations_str == NULL)
 	{
 		/* read_attr_value() has generated an error string */
@@ -472,13 +627,13 @@ read_server_first_message(fe_scram_state *state, char *input,
 	state->iterations = strtol(iterations_str, &endptr, 10);
 	if (*endptr != '\0' || state->iterations < 1)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("malformed SCRAM message (invalid iteration count)\n"));
 		return false;
 	}
 
 	if (*input != '\0')
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("malformed SCRAM message (garbage at end of server-first-message)\n"));
 
 	return true;
@@ -488,16 +643,16 @@ read_server_first_message(fe_scram_state *state, char *input,
  * Read the final exchange message coming from the server.
  */
 static bool
-read_server_final_message(fe_scram_state *state, char *input,
-						  PQExpBuffer errormessage)
+read_server_final_message(fe_scram_state *state, char *input)
 {
+	PGconn	   *conn = state->conn;
 	char	   *encoded_server_signature;
 	int			server_signature_len;
 
 	state->server_final_message = strdup(input);
 	if (!state->server_final_message)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("out of memory\n"));
 		return false;
 	}
@@ -505,16 +660,18 @@ read_server_final_message(fe_scram_state *state, char *input,
 	/* Check for error result. */
 	if (*input == 'e')
 	{
-		char	   *errmsg = read_attr_value(&input, 'e', errormessage);
+		char	   *errmsg = read_attr_value(&input, 'e',
+											 &conn->errorMessage);
 
-		printfPQExpBuffer(errormessage,
-						  libpq_gettext("error received from server in SASL exchange: %s\n"),
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("error received from server in SCRAM exchange: %s\n"),
 						  errmsg);
 		return false;
 	}
 
 	/* Parse the message. */
-	encoded_server_signature = read_attr_value(&input, 'v', errormessage);
+	encoded_server_signature = read_attr_value(&input, 'v',
+											   &conn->errorMessage);
 	if (encoded_server_signature == NULL)
 	{
 		/* read_attr_value() has generated an error message */
@@ -522,7 +679,7 @@ read_server_final_message(fe_scram_state *state, char *input,
 	}
 
 	if (*input != '\0')
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("malformed SCRAM message (garbage at end of server-final-message)\n"));
 
 	server_signature_len = pg_b64_decode(encoded_server_signature,
@@ -530,7 +687,7 @@ read_server_final_message(fe_scram_state *state, char *input,
 										 state->ServerSignature);
 	if (server_signature_len != SCRAM_KEY_LEN)
 	{
-		printfPQExpBuffer(errormessage,
+		printfPQExpBuffer(&conn->errorMessage,
 						  libpq_gettext("malformed SCRAM message (invalid server signature)\n"));
 		return false;
 	}
diff --git a/src/interfaces/libpq/fe-auth.c b/src/interfaces/libpq/fe-auth.c
index 382558f3f8..3b2073a47f 100644
--- a/src/interfaces/libpq/fe-auth.c
+++ b/src/interfaces/libpq/fe-auth.c
@@ -3,7 +3,7 @@
  * fe-auth.c
  *	   The front-end (client) authorization routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -39,8 +39,8 @@
 #endif
 
 #include "common/md5.h"
+#include "common/scram-common.h"
 #include "libpq-fe.h"
-#include "libpq/scram.h"
 #include "fe-auth.h"
 
 
@@ -491,6 +491,7 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 	bool		success;
 	const char *selected_mechanism;
 	PQExpBufferData mechanism_buf;
+	char	   *password;
 
 	initPQExpBuffer(&mechanism_buf);
 
@@ -504,7 +505,8 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 	/*
 	 * Parse the list of SASL authentication mechanisms in the
 	 * AuthenticationSASL message, and select the best mechanism that we
-	 * support.  (Only SCRAM-SHA-256 is supported at the moment.)
+	 * support.  SCRAM-SHA-256-PLUS and SCRAM-SHA-256 are the only ones
+	 * supported at the moment, listed by order of decreasing importance.
 	 */
 	selected_mechanism = NULL;
 	for (;;)
@@ -523,35 +525,19 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 			break;
 
 		/*
-		 * If we have already selected a mechanism, just skip through the rest
-		 * of the list.
+		 * Select the mechanism to use.  Pick SCRAM-SHA-256-PLUS over anything
+		 * else if a channel binding type is set.  Pick SCRAM-SHA-256 if
+		 * nothing else has already been picked.  If we add more mechanisms, a
+		 * more refined priority mechanism might become necessary.
 		 */
-		if (selected_mechanism)
-			continue;
-
-		/*
-		 * Do we support this mechanism?
-		 */
-		if (strcmp(mechanism_buf.data, SCRAM_SHA256_NAME) == 0)
-		{
-			char	   *password;
-
-			conn->password_needed = true;
-			password = conn->connhost[conn->whichhost].password;
-			if (password == NULL)
-				password = conn->pgpass;
-			if (password == NULL || password[0] == '\0')
-			{
-				printfPQExpBuffer(&conn->errorMessage,
-								  PQnoPasswordSupplied);
-				goto error;
-			}
-
-			conn->sasl_state = pg_fe_scram_init(conn->pguser, password);
-			if (!conn->sasl_state)
-				goto oom_error;
-			selected_mechanism = SCRAM_SHA256_NAME;
-		}
+		if (conn->ssl_in_use &&
+			conn->scram_channel_binding &&
+			strlen(conn->scram_channel_binding) > 0 &&
+			strcmp(mechanism_buf.data, SCRAM_SHA_256_PLUS_NAME) == 0)
+			selected_mechanism = SCRAM_SHA_256_PLUS_NAME;
+		else if (strcmp(mechanism_buf.data, SCRAM_SHA_256_NAME) == 0 &&
+				 !selected_mechanism)
+			selected_mechanism = SCRAM_SHA_256_NAME;
 	}
 
 	if (!selected_mechanism)
@@ -561,11 +547,44 @@ pg_SASL_init(PGconn *conn, int payloadlen)
 		goto error;
 	}
 
+	/*
+	 * Now that the SASL mechanism has been chosen for the exchange,
+	 * initialize its state information.
+	 */
+
+	/*
+	 * First, select the password to use for the exchange, complaining if
+	 * there isn't one.  Currently, all supported SASL mechanisms require a
+	 * password, so we can just go ahead here without further distinction.
+	 */
+	conn->password_needed = true;
+	password = conn->connhost[conn->whichhost].password;
+	if (password == NULL)
+		password = conn->pgpass;
+	if (password == NULL || password[0] == '\0')
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  PQnoPasswordSupplied);
+		goto error;
+	}
+
+	/*
+	 * Initialize the SASL state information with all the information gathered
+	 * during the initial exchange.
+	 *
+	 * Note: Only tls-unique is supported for the moment.
+	 */
+	conn->sasl_state = pg_fe_scram_init(conn,
+										password,
+										selected_mechanism);
+	if (!conn->sasl_state)
+		goto oom_error;
+
 	/* Get the mechanism-specific Initial Client Response, if any */
 	pg_fe_scram_exchange(conn->sasl_state,
 						 NULL, -1,
 						 &initialresponse, &initialresponselen,
-						 &done, &success, &conn->errorMessage);
+						 &done, &success);
 
 	if (done && !success)
 		goto error;
@@ -646,7 +665,7 @@ pg_SASL_continue(PGconn *conn, int payloadlen, bool final)
 	pg_fe_scram_exchange(conn->sasl_state,
 						 challenge, payloadlen,
 						 &output, &outputlen,
-						 &done, &success, &conn->errorMessage);
+						 &done, &success);
 	free(challenge);			/* don't need the input anymore */
 
 	if (final && !done)
diff --git a/src/interfaces/libpq/fe-auth.h b/src/interfaces/libpq/fe-auth.h
index 5dc6bb5341..a8a27c24a6 100644
--- a/src/interfaces/libpq/fe-auth.h
+++ b/src/interfaces/libpq/fe-auth.h
@@ -4,7 +4,7 @@
  *
  *	  Definitions for network authentication routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/fe-auth.h
@@ -23,11 +23,13 @@ extern int	pg_fe_sendauth(AuthRequest areq, int payloadlen, PGconn *conn);
 extern char *pg_fe_getauthname(PQExpBuffer errorMessage);
 
 /* Prototypes for functions in fe-auth-scram.c */
-extern void *pg_fe_scram_init(const char *username, const char *password);
+extern void *pg_fe_scram_init(PGconn *conn,
+				 const char *password,
+				 const char *sasl_mechanism);
 extern void pg_fe_scram_free(void *opaq);
 extern void pg_fe_scram_exchange(void *opaq, char *input, int inputlen,
 					 char **output, int *outputlen,
-					 bool *done, bool *success, PQExpBuffer errorMessage);
+					 bool *done, bool *success);
 extern char *pg_fe_scram_build_verifier(const char *password);
 
 #endif							/* FE_AUTH_H */
diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c
index d0e97ecdd4..77eebb0ba1 100644
--- a/src/interfaces/libpq/fe-connect.c
+++ b/src/interfaces/libpq/fe-connect.c
@@ -3,7 +3,7 @@
  * fe-connect.c
  *	  functions related to setting up a connection to the backend
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -47,7 +47,6 @@
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#include <arpa/inet.h>
 #endif
 
 #ifdef ENABLE_THREAD_SAFETY
@@ -72,7 +71,9 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
 #endif
 
 #include "common/ip.h"
+#include "common/scram-common.h"
 #include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
 
 
 #ifndef WIN32
@@ -122,6 +123,7 @@ static int ldapServiceLookup(const char *purl, PQconninfoOption *options,
 #define DefaultOption	""
 #define DefaultAuthtype		  ""
 #define DefaultTargetSessionAttrs	"any"
+#define DefaultSCRAMChannelBinding	SCRAM_CHANNEL_BINDING_TLS_UNIQUE
 #ifdef USE_SSL
 #define DefaultSSLMode "prefer"
 #else
@@ -262,6 +264,11 @@ static const internalPQconninfoOption PQconninfoOptions[] = {
 		"TCP-Keepalives-Count", "", 10, /* strlen(INT32_MAX) == 10 */
 	offsetof(struct pg_conn, keepalives_count)},
 
+	{"scram_channel_binding", NULL, DefaultSCRAMChannelBinding, NULL,
+		"SCRAM-Channel-Binding", "D",
+		21,	/* sizeof("tls-server-end-point") == 21 */
+	offsetof(struct pg_conn, scram_channel_binding)},
+
 	/*
 	 * ssl options are allowed even without client SSL support because the
 	 * client can still handle SSL modes "disable" and "allow". Other
@@ -398,9 +405,9 @@ static int parseServiceFile(const char *serviceFile,
 				 PQconninfoOption *options,
 				 PQExpBuffer errorMessage,
 				 bool *group_found);
-static char *pwdfMatchesString(char *buf, char *token);
-static char *passwordFromFile(char *hostname, char *port, char *dbname,
-				 char *username, char *pgpassfile);
+static char *pwdfMatchesString(char *buf, const char *token);
+static char *passwordFromFile(const char *hostname, const char *port, const char *dbname,
+				 const char *username, const char *pgpassfile);
 static void pgpassfileWarning(PGconn *conn);
 static void default_threadlock(int acquire);
 
@@ -965,7 +972,7 @@ connectOptions2(PGconn *conn)
 		{
 			conn->status = CONNECTION_BAD;
 			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("could not match %d host names to %d hostaddrs\n"),
+							  libpq_gettext("could not match %d host names to %d hostaddr values\n"),
 							  count_comma_separated_elems(conn->pghost), conn->nconnhost);
 			return false;
 		}
@@ -1063,52 +1070,51 @@ connectOptions2(PGconn *conn)
 	 */
 	if (conn->pgpass == NULL || conn->pgpass[0] == '\0')
 	{
-		int			i;
-
+		/* If password file wasn't specified, use ~/PGPASSFILE */
 		if (conn->pgpassfile == NULL || conn->pgpassfile[0] == '\0')
 		{
-			/* Identify password file to use; fail if we can't */
 			char		homedir[MAXPGPATH];
 
-			if (!pqGetHomeDirectory(homedir, sizeof(homedir)))
+			if (pqGetHomeDirectory(homedir, sizeof(homedir)))
 			{
-				conn->status = CONNECTION_BAD;
-				printfPQExpBuffer(&conn->errorMessage,
-								  libpq_gettext("could not get home directory to locate password file\n"));
-				return false;
+				if (conn->pgpassfile)
+					free(conn->pgpassfile);
+				conn->pgpassfile = malloc(MAXPGPATH);
+				if (!conn->pgpassfile)
+					goto oom_error;
+				snprintf(conn->pgpassfile, MAXPGPATH, "%s/%s",
+						 homedir, PGPASSFILE);
 			}
-
-			if (conn->pgpassfile)
-				free(conn->pgpassfile);
-			conn->pgpassfile = malloc(MAXPGPATH);
-			if (!conn->pgpassfile)
-				goto oom_error;
-
-			snprintf(conn->pgpassfile, MAXPGPATH, "%s/%s", homedir, PGPASSFILE);
 		}
 
-		for (i = 0; i < conn->nconnhost; i++)
+		if (conn->pgpassfile != NULL && conn->pgpassfile[0] != '\0')
 		{
-			/*
-			 * Try to get a password for this host from pgpassfile. We use
-			 * host name rather than host address in the same manner to
-			 * PQhost().
-			 */
-			char	   *pwhost = conn->connhost[i].host;
-
-			if (conn->connhost[i].type == CHT_HOST_ADDRESS &&
-				conn->connhost[i].host != NULL && conn->connhost[i].host[0] != '\0')
-				pwhost = conn->connhost[i].hostaddr;
-
-			conn->connhost[i].password =
-				passwordFromFile(pwhost,
-								 conn->connhost[i].port,
-								 conn->dbName,
-								 conn->pguser,
-								 conn->pgpassfile);
-			/* If we got one, set pgpassfile_used */
-			if (conn->connhost[i].password != NULL)
-				conn->pgpassfile_used = true;
+			int			i;
+
+			for (i = 0; i < conn->nconnhost; i++)
+			{
+				/*
+				 * Try to get a password for this host from pgpassfile. We use
+				 * host name rather than host address in the same manner as
+				 * PQhost().
+				 */
+				char	   *pwhost = conn->connhost[i].host;
+
+				if (conn->connhost[i].type == CHT_HOST_ADDRESS &&
+					conn->connhost[i].host != NULL &&
+					conn->connhost[i].host[0] != '\0')
+					pwhost = conn->connhost[i].hostaddr;
+
+				conn->connhost[i].password =
+					passwordFromFile(pwhost,
+									 conn->connhost[i].port,
+									 conn->dbName,
+									 conn->pguser,
+									 conn->pgpassfile);
+				/* If we got one, set pgpassfile_used */
+				if (conn->connhost[i].password != NULL)
+					conn->pgpassfile_used = true;
+			}
 		}
 	}
 
@@ -2443,7 +2449,7 @@ PQconnectPoll(PGconn *conn)
 					 * shouldn't since we only got here if the socket is
 					 * write-ready.
 					 */
-					pv = htonl(NEGOTIATE_SSL_CODE);
+					pv = pg_hton32(NEGOTIATE_SSL_CODE);
 					if (pqPacketSend(conn, 0, &pv, sizeof(pv)) != STATUS_OK)
 					{
 						appendPQExpBuffer(&conn->errorMessage,
@@ -3470,6 +3476,8 @@ freePGconn(PGconn *conn)
 		free(conn->keepalives_interval);
 	if (conn->keepalives_count)
 		free(conn->keepalives_count);
+	if (conn->scram_channel_binding)
+		free(conn->scram_channel_binding);
 	if (conn->sslmode)
 		free(conn->sslmode);
 	if (conn->sslcert)
@@ -3587,7 +3595,7 @@ closePGconn(PGconn *conn)
 	 * Don't call PQsetnonblocking() because it will fail if it's unable to
 	 * flush the connection.
 	 */
-	conn->nonblocking = FALSE;
+	conn->nonblocking = false;
 
 	/*
 	 * Close the connection, reset all transient state, flush I/O buffers.
@@ -3782,8 +3790,8 @@ PQfreeCancel(PGcancel *cancel)
  * PQcancel and PQrequestCancel: attempt to request cancellation of the
  * current operation.
  *
- * The return value is TRUE if the cancel request was successfully
- * dispatched, FALSE if not (in which case an error message is available).
+ * The return value is true if the cancel request was successfully
+ * dispatched, false if not (in which case an error message is available).
  * Note: successful dispatch is no guarantee that there will be any effect at
  * the backend.  The application must read the operation result as usual.
  *
@@ -3838,10 +3846,10 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key,
 
 	/* Create and send the cancel request packet. */
 
-	crp.packetlen = htonl((uint32) sizeof(crp));
-	crp.cp.cancelRequestCode = (MsgType) htonl(CANCEL_REQUEST_CODE);
-	crp.cp.backendPID = htonl(be_pid);
-	crp.cp.cancelAuthCode = htonl(be_key);
+	crp.packetlen = pg_hton32((uint32) sizeof(crp));
+	crp.cp.cancelRequestCode = (MsgType) pg_hton32(CANCEL_REQUEST_CODE);
+	crp.cp.backendPID = pg_hton32(be_pid);
+	crp.cp.cancelAuthCode = pg_hton32(be_key);
 
 retry4:
 	if (send(tmpsock, (char *) &crp, sizeof(crp), 0) != (int) sizeof(crp))
@@ -3872,7 +3880,7 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key,
 	/* All done */
 	closesocket(tmpsock);
 	SOCK_ERRNO_SET(save_errno);
-	return TRUE;
+	return true;
 
 cancel_errReturn:
 
@@ -3890,13 +3898,13 @@ internal_cancel(SockAddr *raddr, int be_pid, int be_key,
 	if (tmpsock != PGINVALID_SOCKET)
 		closesocket(tmpsock);
 	SOCK_ERRNO_SET(save_errno);
-	return FALSE;
+	return false;
 }
 
 /*
  * PQcancel: request query cancel
  *
- * Returns TRUE if able to send the cancel request, FALSE if not.
+ * Returns true if able to send the cancel request, false if not.
  *
  * On failure, an error message is stored in *errbuf, which must be of size
  * errbufsize (recommended size is 256 bytes).  *errbuf is not changed on
@@ -3908,7 +3916,7 @@ PQcancel(PGcancel *cancel, char *errbuf, int errbufsize)
 	if (!cancel)
 	{
 		strlcpy(errbuf, "PQcancel() -- no cancel object supplied", errbufsize);
-		return FALSE;
+		return false;
 	}
 
 	return internal_cancel(&cancel->raddr, cancel->be_pid, cancel->be_key,
@@ -3918,7 +3926,7 @@ PQcancel(PGcancel *cancel, char *errbuf, int errbufsize)
 /*
  * PQrequestCancel: old, not thread-safe function for requesting query cancel
  *
- * Returns TRUE if able to send the cancel request, FALSE if not.
+ * Returns true if able to send the cancel request, false if not.
  *
  * On failure, the error message is saved in conn->errorMessage; this means
  * that this can't be used when there might be other active operations on
@@ -3934,7 +3942,7 @@ PQrequestCancel(PGconn *conn)
 
 	/* Check we have an open connection */
 	if (!conn)
-		return FALSE;
+		return false;
 
 	if (conn->sock == PGINVALID_SOCKET)
 	{
@@ -3943,7 +3951,7 @@ PQrequestCancel(PGconn *conn)
 				conn->errorMessage.maxlen);
 		conn->errorMessage.len = strlen(conn->errorMessage.data);
 
-		return FALSE;
+		return false;
 	}
 
 	r = internal_cancel(&conn->raddr, conn->be_pid, conn->be_key,
@@ -4469,6 +4477,16 @@ ldapServiceLookup(const char *purl, PQconninfoOption *options,
 
 #define MAXBUFSIZE 256
 
+/*
+ * parseServiceInfo: if a service name has been given, look it up and absorb
+ * connection options from it into *options.
+ *
+ * Returns 0 on success, nonzero on failure.  On failure, if errorMessage
+ * isn't null, also store an error message there.  (Note: the only reason
+ * this function and related ones don't dump core on errorMessage == NULL
+ * is the undocumented fact that printfPQExpBuffer does nothing when passed
+ * a null PQExpBuffer pointer.)
+ */
 static int
 parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 {
@@ -4487,9 +4505,14 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 	if (service == NULL)
 		service = getenv("PGSERVICE");
 
+	/* If no service name given, nothing to do */
 	if (service == NULL)
 		return 0;
 
+	/*
+	 * Try PGSERVICEFILE if specified, else try ~/.pg_service.conf (if that
+	 * exists).
+	 */
 	if ((env = getenv("PGSERVICEFILE")) != NULL)
 		strlcpy(serviceFile, env, sizeof(serviceFile));
 	else
@@ -4497,13 +4520,9 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 		char		homedir[MAXPGPATH];
 
 		if (!pqGetHomeDirectory(homedir, sizeof(homedir)))
-		{
-			printfPQExpBuffer(errorMessage, libpq_gettext("could not get home directory to locate service definition file"));
-			return 1;
-		}
+			goto next_file;
 		snprintf(serviceFile, MAXPGPATH, "%s/%s", homedir, ".pg_service.conf");
-		errno = 0;
-		if (stat(serviceFile, &stat_buf) != 0 && errno == ENOENT)
+		if (stat(serviceFile, &stat_buf) != 0)
 			goto next_file;
 	}
 
@@ -4519,8 +4538,7 @@ parseServiceInfo(PQconninfoOption *options, PQExpBuffer errorMessage)
 	 */
 	snprintf(serviceFile, MAXPGPATH, "%s/pg_service.conf",
 			 getenv("PGSYSCONFDIR") ? getenv("PGSYSCONFDIR") : SYSCONFDIR);
-	errno = 0;
-	if (stat(serviceFile, &stat_buf) != 0 && errno == ENOENT)
+	if (stat(serviceFile, &stat_buf) != 0)
 		goto last_file;
 
 	status = parseServiceFile(serviceFile, service, options, errorMessage, &group_found);
@@ -4772,7 +4790,7 @@ conninfo_init(PQExpBuffer errorMessage)
  * Returns a malloc'd PQconninfoOption array, if parsing is successful.
  * Otherwise, NULL is returned and an error message is left in errorMessage.
  *
- * If use_defaults is TRUE, default values are filled in (from a service file,
+ * If use_defaults is true, default values are filled in (from a service file,
  * environment variables, etc).
  */
 static PQconninfoOption *
@@ -4995,7 +5013,7 @@ conninfo_parse(const char *conninfo, PQExpBuffer errorMessage,
  * If not successful, NULL is returned and an error message is
  * left in errorMessage.
  * Defaults are supplied (from a service file, environment variables, etc)
- * for unspecified options, but only if use_defaults is TRUE.
+ * for unspecified options, but only if use_defaults is true.
  *
  * If expand_dbname is non-zero, and the value passed for the first occurrence
  * of "dbname" keyword is a connection string (as indicated by
@@ -5166,7 +5184,7 @@ conninfo_array_parse(const char *const *keywords, const char *const *values,
  *
  * Defaults are obtained from a service file, environment variables, etc.
  *
- * Returns TRUE if successful, otherwise FALSE; errorMessage, if supplied,
+ * Returns true if successful, otherwise false; errorMessage, if supplied,
  * is filled in upon failure.  Note that failure to locate a default value
  * is not an error condition here --- we just leave the option's value as
  * NULL.
@@ -5817,7 +5835,7 @@ conninfo_getval(PQconninfoOption *connOptions,
  *
  * If not successful, returns NULL and fills errorMessage accordingly.
  * However, if the reason of failure is an invalid keyword being passed and
- * ignoreMissing is TRUE, errorMessage will be left untouched.
+ * ignoreMissing is true, errorMessage will be left untouched.
  */
 static PQconninfoOption *
 conninfo_storeval(PQconninfoOption *connOptions,
@@ -6297,8 +6315,8 @@ defaultNoticeReceiver(void *arg, const PGresult *res)
 {
 	(void) arg;					/* not used */
 	if (res->noticeHooks.noticeProc != NULL)
-		(*res->noticeHooks.noticeProc) (res->noticeHooks.noticeProcArg,
-										PQresultErrorMessage(res));
+		res->noticeHooks.noticeProc(res->noticeHooks.noticeProcArg,
+									PQresultErrorMessage(res));
 }
 
 /*
@@ -6320,10 +6338,10 @@ defaultNoticeProcessor(void *arg, const char *message)
  * token doesn't match
  */
 static char *
-pwdfMatchesString(char *buf, char *token)
+pwdfMatchesString(char *buf, const char *token)
 {
-	char	   *tbuf,
-			   *ttok;
+	char	   *tbuf;
+	const char *ttok;
 	bool		bslash = false;
 
 	if (buf == NULL || token == NULL)
@@ -6357,8 +6375,8 @@ pwdfMatchesString(char *buf, char *token)
 
 /* Get a password from the password file. Return value is malloc'd. */
 static char *
-passwordFromFile(char *hostname, char *port, char *dbname,
-				 char *username, char *pgpassfile)
+passwordFromFile(const char *hostname, const char *port, const char *dbname,
+				 const char *username, const char *pgpassfile)
 {
 	FILE	   *fp;
 	struct stat stat_buf;
@@ -6510,7 +6528,15 @@ pgpassfileWarning(PGconn *conn)
  *
  * This is essentially the same as get_home_path(), but we don't use that
  * because we don't want to pull path.c into libpq (it pollutes application
- * namespace)
+ * namespace).
+ *
+ * Returns true on success, false on failure to obtain the directory name.
+ *
+ * CAUTION: although in most situations failure is unexpected, there are users
+ * who like to run applications in a home-directory-less environment.  On
+ * failure, you almost certainly DO NOT want to report an error.  Just act as
+ * though whatever file you were hoping to find in the home directory isn't
+ * there (which it isn't).
  */
 bool
 pqGetHomeDirectory(char *buf, int bufsize)
diff --git a/src/interfaces/libpq/fe-exec.c b/src/interfaces/libpq/fe-exec.c
index e1e2d18e3a..4c0114c514 100644
--- a/src/interfaces/libpq/fe-exec.c
+++ b/src/interfaces/libpq/fe-exec.c
@@ -3,7 +3,7 @@
  * fe-exec.c
  *	  functions related to sending a query down to the backend
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -16,6 +16,7 @@
 
 #include <ctype.h>
 #include <fcntl.h>
+#include <limits.h>
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
@@ -51,7 +52,8 @@ static bool static_std_strings = false;
 
 
 static PGEvent *dupEvents(PGEvent *events, int count);
-static bool pqAddTuple(PGresult *res, PGresAttValue *tup);
+static bool pqAddTuple(PGresult *res, PGresAttValue *tup,
+		   const char **errmsgp);
 static bool PQsendQueryStart(PGconn *conn);
 static int PQsendQueryGuts(PGconn *conn,
 				const char *command,
@@ -229,17 +231,17 @@ PQsetResultAttrs(PGresult *res, int numAttributes, PGresAttDesc *attDescs)
 
 	/* If attrs already exist, they cannot be overwritten. */
 	if (!res || res->numAttributes > 0)
-		return FALSE;
+		return false;
 
 	/* ignore no-op request */
 	if (numAttributes <= 0 || !attDescs)
-		return TRUE;
+		return true;
 
 	res->attDescs = (PGresAttDesc *)
 		PQresultAlloc(res, numAttributes * sizeof(PGresAttDesc));
 
 	if (!res->attDescs)
-		return FALSE;
+		return false;
 
 	res->numAttributes = numAttributes;
 	memcpy(res->attDescs, attDescs, numAttributes * sizeof(PGresAttDesc));
@@ -254,13 +256,13 @@ PQsetResultAttrs(PGresult *res, int numAttributes, PGresAttDesc *attDescs)
 			res->attDescs[i].name = res->null_field;
 
 		if (!res->attDescs[i].name)
-			return FALSE;
+			return false;
 
 		if (res->attDescs[i].format == 0)
 			res->binary = 0;
 	}
 
-	return TRUE;
+	return true;
 }
 
 /*
@@ -366,7 +368,7 @@ PQcopyResult(const PGresult *src, int flags)
 				PQclear(dest);
 				return NULL;
 			}
-			dest->events[i].resultInitialized = TRUE;
+			dest->events[i].resultInitialized = true;
 		}
 	}
 
@@ -396,7 +398,7 @@ dupEvents(PGEvent *events, int count)
 		newEvents[i].proc = events[i].proc;
 		newEvents[i].passThrough = events[i].passThrough;
 		newEvents[i].data = NULL;
-		newEvents[i].resultInitialized = FALSE;
+		newEvents[i].resultInitialized = false;
 		newEvents[i].name = strdup(events[i].name);
 		if (!newEvents[i].name)
 		{
@@ -416,18 +418,26 @@ dupEvents(PGEvent *events, int count)
  * equal to PQntuples(res).  If it is equal, a new tuple is created and
  * added to the result.
  * Returns a non-zero value for success and zero for failure.
+ * (On failure, we report the specific problem via pqInternalNotice.)
  */
 int
 PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 {
 	PGresAttValue *attval;
+	const char *errmsg = NULL;
 
+	/* Note that this check also protects us against null "res" */
 	if (!check_field_number(res, field_num))
-		return FALSE;
+		return false;
 
 	/* Invalid tup_num, must be <= ntups */
 	if (tup_num < 0 || tup_num > res->ntups)
-		return FALSE;
+	{
+		pqInternalNotice(&res->noticeHooks,
+						 "row number %d is out of range 0..%d",
+						 tup_num, res->ntups);
+		return false;
+	}
 
 	/* need to allocate a new tuple? */
 	if (tup_num == res->ntups)
@@ -437,10 +447,10 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 
 		tup = (PGresAttValue *)
 			pqResultAlloc(res, res->numAttributes * sizeof(PGresAttValue),
-						  TRUE);
+						  true);
 
 		if (!tup)
-			return FALSE;
+			goto fail;
 
 		/* initialize each column to NULL */
 		for (i = 0; i < res->numAttributes; i++)
@@ -450,8 +460,8 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 		}
 
 		/* add it to the array */
-		if (!pqAddTuple(res, tup))
-			return FALSE;
+		if (!pqAddTuple(res, tup, &errmsg))
+			goto fail;
 	}
 
 	attval = &res->tuples[tup_num][field_num];
@@ -469,15 +479,26 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 	}
 	else
 	{
-		attval->value = (char *) pqResultAlloc(res, len + 1, TRUE);
+		attval->value = (char *) pqResultAlloc(res, len + 1, true);
 		if (!attval->value)
-			return FALSE;
+			goto fail;
 		attval->len = len;
 		memcpy(attval->value, value, len);
 		attval->value[len] = '\0';
 	}
 
-	return TRUE;
+	return true;
+
+	/*
+	 * Report failure via pqInternalNotice.  If preceding code didn't provide
+	 * an error message, assume "out of memory" was meant.
+	 */
+fail:
+	if (!errmsg)
+		errmsg = libpq_gettext("out of memory");
+	pqInternalNotice(&res->noticeHooks, "%s", errmsg);
+
+	return false;
 }
 
 /*
@@ -489,7 +510,7 @@ PQsetvalue(PGresult *res, int tup_num, int field_num, char *value, int len)
 void *
 PQresultAlloc(PGresult *res, size_t nBytes)
 {
-	return pqResultAlloc(res, nBytes, TRUE);
+	return pqResultAlloc(res, nBytes, true);
 }
 
 /*
@@ -601,7 +622,7 @@ pqResultAlloc(PGresult *res, size_t nBytes, bool isBinary)
 char *
 pqResultStrdup(PGresult *res, const char *str)
 {
-	char	   *space = (char *) pqResultAlloc(res, strlen(str) + 1, FALSE);
+	char	   *space = (char *) pqResultAlloc(res, strlen(str) + 1, false);
 
 	if (space)
 		strcpy(space, str);
@@ -831,7 +852,7 @@ pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...)
 	 * Result text is always just the primary message + newline. If we can't
 	 * allocate it, don't bother invoking the receiver.
 	 */
-	res->errMsg = (char *) pqResultAlloc(res, strlen(msgBuf) + 2, FALSE);
+	res->errMsg = (char *) pqResultAlloc(res, strlen(msgBuf) + 2, false);
 	if (res->errMsg)
 	{
 		sprintf(res->errMsg, "%s\n", msgBuf);
@@ -839,7 +860,7 @@ pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...)
 		/*
 		 * Pass to receiver, then free it.
 		 */
-		(*res->noticeHooks.noticeRec) (res->noticeHooks.noticeRecArg, res);
+		res->noticeHooks.noticeRec(res->noticeHooks.noticeRecArg, res);
 	}
 	PQclear(res);
 }
@@ -847,10 +868,13 @@ pqInternalNotice(const PGNoticeHooks *hooks, const char *fmt,...)
 /*
  * pqAddTuple
  *	  add a row pointer to the PGresult structure, growing it if necessary
- *	  Returns TRUE if OK, FALSE if not enough memory to add the row
+ *	  Returns true if OK, false if an error prevented adding the row
+ *
+ * On error, *errmsgp can be set to an error string to be returned.
+ * If it is left NULL, the error is presumed to be "out of memory".
  */
 static bool
-pqAddTuple(PGresult *res, PGresAttValue *tup)
+pqAddTuple(PGresult *res, PGresAttValue *tup, const char **errmsgp)
 {
 	if (res->ntups >= res->tupArrSize)
 	{
@@ -865,9 +889,36 @@ pqAddTuple(PGresult *res, PGresAttValue *tup)
 		 * existing allocation. Note that the positions beyond res->ntups are
 		 * garbage, not necessarily NULL.
 		 */
-		int			newSize = (res->tupArrSize > 0) ? res->tupArrSize * 2 : 128;
+		int			newSize;
 		PGresAttValue **newTuples;
 
+		/*
+		 * Since we use integers for row numbers, we can't support more than
+		 * INT_MAX rows.  Make sure we allow that many, though.
+		 */
+		if (res->tupArrSize <= INT_MAX / 2)
+			newSize = (res->tupArrSize > 0) ? res->tupArrSize * 2 : 128;
+		else if (res->tupArrSize < INT_MAX)
+			newSize = INT_MAX;
+		else
+		{
+			*errmsgp = libpq_gettext("PGresult cannot support more than INT_MAX tuples");
+			return false;
+		}
+
+		/*
+		 * Also, on 32-bit platforms we could, in theory, overflow size_t even
+		 * before newSize gets to INT_MAX.  (In practice we'd doubtless hit
+		 * OOM long before that, but let's check.)
+		 */
+#if INT_MAX >= (SIZE_MAX / 2)
+		if (newSize > SIZE_MAX / sizeof(PGresAttValue *))
+		{
+			*errmsgp = libpq_gettext("size_t overflow");
+			return false;
+		}
+#endif
+
 		if (res->tuples == NULL)
 			newTuples = (PGresAttValue **)
 				malloc(newSize * sizeof(PGresAttValue *));
@@ -875,13 +926,13 @@ pqAddTuple(PGresult *res, PGresAttValue *tup)
 			newTuples = (PGresAttValue **)
 				realloc(res->tuples, newSize * sizeof(PGresAttValue *));
 		if (!newTuples)
-			return FALSE;		/* malloc or realloc failed */
+			return false;		/* malloc or realloc failed */
 		res->tupArrSize = newSize;
 		res->tuples = newTuples;
 	}
 	res->tuples[res->ntups] = tup;
 	res->ntups++;
-	return TRUE;
+	return true;
 }
 
 /*
@@ -896,7 +947,7 @@ pqSaveMessageField(PGresult *res, char code, const char *value)
 		pqResultAlloc(res,
 					  offsetof(PGMessageField, contents) +
 					  strlen(value) + 1,
-					  TRUE);
+					  true);
 	if (!pfield)
 		return;					/* out of memory? */
 	pfield->code = code;
@@ -1060,7 +1111,7 @@ pqRowProcessor(PGconn *conn, const char **errmsgp)
 	 * memory for gettext() to do anything.
 	 */
 	tup = (PGresAttValue *)
-		pqResultAlloc(res, nfields * sizeof(PGresAttValue), TRUE);
+		pqResultAlloc(res, nfields * sizeof(PGresAttValue), true);
 	if (tup == NULL)
 		goto fail;
 
@@ -1093,7 +1144,7 @@ pqRowProcessor(PGconn *conn, const char **errmsgp)
 	}
 
 	/* And add the tuple to the PGresult's tuple array */
-	if (!pqAddTuple(res, tup))
+	if (!pqAddTuple(res, tup, errmsgp))
 		goto fail;
 
 	/*
@@ -1674,14 +1725,14 @@ parseInput(PGconn *conn)
 
 /*
  * PQisBusy
- *	 Return TRUE if PQgetResult would block waiting for input.
+ *	 Return true if PQgetResult would block waiting for input.
  */
 
 int
 PQisBusy(PGconn *conn)
 {
 	if (!conn)
-		return FALSE;
+		return false;
 
 	/* Parse any available data, if our state permits. */
 	parseInput(conn);
@@ -1720,7 +1771,7 @@ PQgetResult(PGconn *conn)
 		 */
 		while ((flushResult = pqFlush(conn)) > 0)
 		{
-			if (pqWait(FALSE, TRUE, conn))
+			if (pqWait(false, true, conn))
 			{
 				flushResult = -1;
 				break;
@@ -1729,7 +1780,7 @@ PQgetResult(PGconn *conn)
 
 		/* Wait for some more data, and load it. */
 		if (flushResult ||
-			pqWait(TRUE, FALSE, conn) ||
+			pqWait(true, false, conn) ||
 			pqReadData(conn) < 0)
 		{
 			/*
@@ -1793,7 +1844,7 @@ PQgetResult(PGconn *conn)
 				res->resultStatus = PGRES_FATAL_ERROR;
 				break;
 			}
-			res->events[i].resultInitialized = TRUE;
+			res->events[i].resultInitialized = true;
 		}
 	}
 
@@ -2695,22 +2746,22 @@ PQbinaryTuples(const PGresult *res)
 
 /*
  * Helper routines to range-check field numbers and tuple numbers.
- * Return TRUE if OK, FALSE if not
+ * Return true if OK, false if not
  */
 
 static int
 check_field_number(const PGresult *res, int field_num)
 {
 	if (!res)
-		return FALSE;			/* no way to display error message... */
+		return false;			/* no way to display error message... */
 	if (field_num < 0 || field_num >= res->numAttributes)
 	{
 		pqInternalNotice(&res->noticeHooks,
 						 "column number %d is out of range 0..%d",
 						 field_num, res->numAttributes - 1);
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
 
 static int
@@ -2718,38 +2769,38 @@ check_tuple_field_number(const PGresult *res,
 						 int tup_num, int field_num)
 {
 	if (!res)
-		return FALSE;			/* no way to display error message... */
+		return false;			/* no way to display error message... */
 	if (tup_num < 0 || tup_num >= res->ntups)
 	{
 		pqInternalNotice(&res->noticeHooks,
 						 "row number %d is out of range 0..%d",
 						 tup_num, res->ntups - 1);
-		return FALSE;
+		return false;
 	}
 	if (field_num < 0 || field_num >= res->numAttributes)
 	{
 		pqInternalNotice(&res->noticeHooks,
 						 "column number %d is out of range 0..%d",
 						 field_num, res->numAttributes - 1);
-		return FALSE;
+		return false;
 	}
-	return TRUE;
+	return true;
 }
 
 static int
 check_param_number(const PGresult *res, int param_num)
 {
 	if (!res)
-		return FALSE;			/* no way to display error message... */
+		return false;			/* no way to display error message... */
 	if (param_num < 0 || param_num >= res->numParameters)
 	{
 		pqInternalNotice(&res->noticeHooks,
 						 "parameter number %d is out of range 0..%d",
 						 param_num, res->numParameters - 1);
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 /*
@@ -3126,8 +3177,8 @@ PQparamtype(const PGresult *res, int param_num)
 
 
 /* PQsetnonblocking:
- *	sets the PGconn's database connection non-blocking if the arg is TRUE
- *	or makes it blocking if the arg is FALSE, this will not protect
+ *	sets the PGconn's database connection non-blocking if the arg is true
+ *	or makes it blocking if the arg is false, this will not protect
  *	you from PQexec(), you'll only be safe when using the non-blocking API.
  *	Needs to be called only on a connected database connection.
  */
@@ -3139,7 +3190,7 @@ PQsetnonblocking(PGconn *conn, int arg)
 	if (!conn || conn->status == CONNECTION_BAD)
 		return -1;
 
-	barg = (arg ? TRUE : FALSE);
+	barg = (arg ? true : false);
 
 	/* early out if the socket is already in the state requested */
 	if (barg == conn->nonblocking)
@@ -3162,7 +3213,7 @@ PQsetnonblocking(PGconn *conn, int arg)
 
 /*
  * return the blocking status of the database connection
- *		TRUE == nonblocking, FALSE == blocking
+ *		true == nonblocking, false == blocking
  */
 int
 PQisnonblocking(const PGconn *conn)
diff --git a/src/interfaces/libpq/fe-lobj.c b/src/interfaces/libpq/fe-lobj.c
index 343e5303d9..a5ad3af258 100644
--- a/src/interfaces/libpq/fe-lobj.c
+++ b/src/interfaces/libpq/fe-lobj.c
@@ -3,7 +3,7 @@
  * fe-lobj.c
  *	  Front-end large object interface
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -33,12 +33,11 @@
 #include <fcntl.h>
 #include <limits.h>
 #include <sys/stat.h>
-#include <netinet/in.h>			/* for ntohl/htonl */
-#include <arpa/inet.h>
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "libpq/libpq-fs.h"		/* must come after sys/stat.h */
+#include "port/pg_bswap.h"
 
 #define LO_BUFSIZE		  8192
 
@@ -1070,11 +1069,11 @@ lo_hton64(pg_int64 host64)
 
 	/* High order half first, since we're doing MSB-first */
 	t = (uint32) (host64 >> 32);
-	swap.i32[0] = htonl(t);
+	swap.i32[0] = pg_hton32(t);
 
 	/* Now the low order half */
 	t = (uint32) host64;
-	swap.i32[1] = htonl(t);
+	swap.i32[1] = pg_hton32(t);
 
 	return swap.i64;
 }
@@ -1095,9 +1094,9 @@ lo_ntoh64(pg_int64 net64)
 
 	swap.i64 = net64;
 
-	result = (uint32) ntohl(swap.i32[0]);
+	result = (uint32) pg_ntoh32(swap.i32[0]);
 	result <<= 32;
-	result |= (uint32) ntohl(swap.i32[1]);
+	result |= (uint32) pg_ntoh32(swap.i32[1]);
 
 	return result;
 }
diff --git a/src/interfaces/libpq/fe-misc.c b/src/interfaces/libpq/fe-misc.c
index cac6359585..2a6637fdda 100644
--- a/src/interfaces/libpq/fe-misc.c
+++ b/src/interfaces/libpq/fe-misc.c
@@ -19,7 +19,7 @@
  * routines.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
@@ -33,9 +33,6 @@
 #include <signal.h>
 #include <time.h>
 
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
 #ifdef WIN32
 #include "win32.h"
 #else
@@ -53,6 +50,7 @@
 #include "libpq-fe.h"
 #include "libpq-int.h"
 #include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
 #include "pg_config_paths.h"
 
 
@@ -278,14 +276,14 @@ pqGetInt(int *result, size_t bytes, PGconn *conn)
 				return EOF;
 			memcpy(&tmp2, conn->inBuffer + conn->inCursor, 2);
 			conn->inCursor += 2;
-			*result = (int) ntohs(tmp2);
+			*result = (int) pg_ntoh16(tmp2);
 			break;
 		case 4:
 			if (conn->inCursor + 4 > conn->inEnd)
 				return EOF;
 			memcpy(&tmp4, conn->inBuffer + conn->inCursor, 4);
 			conn->inCursor += 4;
-			*result = (int) ntohl(tmp4);
+			*result = (int) pg_ntoh32(tmp4);
 			break;
 		default:
 			pqInternalNotice(&conn->noticeHooks,
@@ -314,12 +312,12 @@ pqPutInt(int value, size_t bytes, PGconn *conn)
 	switch (bytes)
 	{
 		case 2:
-			tmp2 = htons((uint16) value);
+			tmp2 = pg_hton16((uint16) value);
 			if (pqPutMsgBytes((const char *) &tmp2, 2, conn))
 				return EOF;
 			break;
 		case 4:
-			tmp4 = htonl((uint32) value);
+			tmp4 = pg_hton32((uint32) value);
 			if (pqPutMsgBytes((const char *) &tmp4, 4, conn))
 				return EOF;
 			break;
@@ -597,7 +595,7 @@ pqPutMsgEnd(PGconn *conn)
 	{
 		uint32		msgLen = conn->outMsgEnd - conn->outMsgStart;
 
-		msgLen = htonl(msgLen);
+		msgLen = pg_hton32(msgLen);
 		memcpy(conn->outBuffer + conn->outMsgStart, &msgLen, 4);
 	}
 
@@ -936,7 +934,7 @@ pqSendSome(PGconn *conn, int len)
 				break;
 			}
 
-			if (pqWait(TRUE, TRUE, conn))
+			if (pqWait(true, true, conn))
 			{
 				result = -1;
 				break;
diff --git a/src/interfaces/libpq/fe-print.c b/src/interfaces/libpq/fe-print.c
index 89bc4c5429..95de270b93 100644
--- a/src/interfaces/libpq/fe-print.c
+++ b/src/interfaces/libpq/fe-print.c
@@ -3,7 +3,7 @@
  * fe-print.c
  *	  functions for pretty-printing query results
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * These functions were formerly part of fe-exec.c, but they
@@ -165,6 +165,13 @@ PQprint(FILE *fout, const PGresult *res, const PQprintOpt *po)
 			screen_size.ws_row = 24;
 			screen_size.ws_col = 80;
 #endif
+
+			/*
+			 * Since this function is no longer used by psql, we don't examine
+			 * PSQL_PAGER.  It's possible that the hypothetical external users
+			 * of the function would like that to happen, but in the name of
+			 * backwards compatibility, we'll stick to just examining PAGER.
+			 */
 			pagerenv = getenv("PAGER");
 			/* if PAGER is unset, empty or all-white-space, don't use pager */
 			if (pagerenv != NULL &&
diff --git a/src/interfaces/libpq/fe-protocol2.c b/src/interfaces/libpq/fe-protocol2.c
index a58f701e18..7dcef808dd 100644
--- a/src/interfaces/libpq/fe-protocol2.c
+++ b/src/interfaces/libpq/fe-protocol2.c
@@ -3,7 +3,7 @@
  * fe-protocol2.c
  *	  functions that are specific to frontend/backend protocol version 2
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -19,17 +19,16 @@
 
 #include "libpq-fe.h"
 #include "libpq-int.h"
+#include "port/pg_bswap.h"
 
 
 #ifdef WIN32
 #include "win32.h"
 #else
 #include <unistd.h>
-#include <netinet/in.h>
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#include <arpa/inet.h>
 #endif
 
 
@@ -584,7 +583,7 @@ pqParseInput2(PGconn *conn)
 					if (conn->result != NULL)
 					{
 						/* Read another tuple of a normal query response */
-						if (getAnotherTuple(conn, FALSE))
+						if (getAnotherTuple(conn, false))
 							return;
 						/* getAnotherTuple() moves inStart itself */
 						continue;
@@ -602,7 +601,7 @@ pqParseInput2(PGconn *conn)
 					if (conn->result != NULL)
 					{
 						/* Read another tuple of a normal query response */
-						if (getAnotherTuple(conn, TRUE))
+						if (getAnotherTuple(conn, true))
 							return;
 						/* getAnotherTuple() moves inStart itself */
 						continue;
@@ -680,7 +679,7 @@ getRowDescriptions(PGconn *conn)
 	if (nfields > 0)
 	{
 		result->attDescs = (PGresAttDesc *)
-			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), TRUE);
+			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), true);
 		if (!result->attDescs)
 		{
 			errmsg = NULL;		/* means "out of memory", see below */
@@ -1055,7 +1054,7 @@ pqGetErrorNotice2(PGconn *conn, bool isError)
 		if (res)
 		{
 			if (res->noticeHooks.noticeRec != NULL)
-				(*res->noticeHooks.noticeRec) (res->noticeHooks.noticeRecArg, res);
+				res->noticeHooks.noticeRec(res->noticeHooks.noticeRecArg, res);
 			PQclear(res);
 		}
 	}
@@ -1219,7 +1218,7 @@ pqGetCopyData2(PGconn *conn, char **buffer, int async)
 		if (async)
 			return 0;
 		/* Need to load more data */
-		if (pqWait(TRUE, FALSE, conn) ||
+		if (pqWait(true, false, conn) ||
 			pqReadData(conn) < 0)
 			return -2;
 	}
@@ -1264,7 +1263,7 @@ pqGetline2(PGconn *conn, char *s, int maxlen)
 		else
 		{
 			/* need to load more data */
-			if (pqWait(TRUE, FALSE, conn) ||
+			if (pqWait(true, false, conn) ||
 				pqReadData(conn) < 0)
 			{
 				result = EOF;
@@ -1485,7 +1484,7 @@ pqFunctionCall2(PGconn *conn, Oid fnid,
 		if (needInput)
 		{
 			/* Wait for some data to arrive (or for the channel to close) */
-			if (pqWait(TRUE, FALSE, conn) ||
+			if (pqWait(true, false, conn) ||
 				pqReadData(conn) < 0)
 				break;
 		}
@@ -1609,7 +1608,7 @@ pqBuildStartupPacket2(PGconn *conn, int *packetlen,
 
 	MemSet(startpacket, 0, sizeof(StartupPacket));
 
-	startpacket->protoVersion = htonl(conn->pversion);
+	startpacket->protoVersion = pg_hton32(conn->pversion);
 
 	/* strncpy is safe here: postmaster will handle full fields correctly */
 	strncpy(startpacket->user, conn->pguser, SM_USER);
diff --git a/src/interfaces/libpq/fe-protocol3.c b/src/interfaces/libpq/fe-protocol3.c
index a484fe80a1..d3ca5d25f6 100644
--- a/src/interfaces/libpq/fe-protocol3.c
+++ b/src/interfaces/libpq/fe-protocol3.c
@@ -3,7 +3,7 @@
  * fe-protocol3.c
  *	  functions that are specific to frontend/backend protocol version 3
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -21,16 +21,15 @@
 #include "libpq-int.h"
 
 #include "mb/pg_wchar.h"
+#include "port/pg_bswap.h"
 
 #ifdef WIN32
 #include "win32.h"
 #else
 #include <unistd.h>
-#include <netinet/in.h>
 #ifdef HAVE_NETINET_TCP_H
 #include <netinet/tcp.h>
 #endif
-#include <arpa/inet.h>
 #endif
 
 
@@ -511,7 +510,7 @@ getRowDescriptions(PGconn *conn, int msgLength)
 	if (nfields > 0)
 	{
 		result->attDescs = (PGresAttDesc *)
-			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), TRUE);
+			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), true);
 		if (!result->attDescs)
 		{
 			errmsg = NULL;		/* means "out of memory", see below */
@@ -669,7 +668,7 @@ getParamDescriptions(PGconn *conn, int msgLength)
 	if (nparams > 0)
 	{
 		result->paramDescs = (PGresParamDesc *)
-			pqResultAlloc(result, nparams * sizeof(PGresParamDesc), TRUE);
+			pqResultAlloc(result, nparams * sizeof(PGresParamDesc), true);
 		if (!result->paramDescs)
 			goto advance_and_error;
 		MemSet(result->paramDescs, 0, nparams * sizeof(PGresParamDesc));
@@ -960,7 +959,7 @@ pqGetErrorNotice3(PGconn *conn, bool isError)
 			/* We can cheat a little here and not copy the message. */
 			res->errMsg = workBuf.data;
 			if (res->noticeHooks.noticeRec != NULL)
-				(*res->noticeHooks.noticeRec) (res->noticeHooks.noticeRecArg, res);
+				res->noticeHooks.noticeRec(res->noticeHooks.noticeRecArg, res);
 			PQclear(res);
 		}
 	}
@@ -1467,7 +1466,7 @@ getCopyStart(PGconn *conn, ExecStatusType copytype)
 	if (nfields > 0)
 	{
 		result->attDescs = (PGresAttDesc *)
-			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), TRUE);
+			pqResultAlloc(result, nfields * sizeof(PGresAttDesc), true);
 		if (!result->attDescs)
 			goto failure;
 		MemSet(result->attDescs, 0, nfields * sizeof(PGresAttDesc));
@@ -1658,7 +1657,7 @@ pqGetCopyData3(PGconn *conn, char **buffer, int async)
 			if (async)
 				return 0;
 			/* Need to load more data */
-			if (pqWait(TRUE, FALSE, conn) ||
+			if (pqWait(true, false, conn) ||
 				pqReadData(conn) < 0)
 				return -2;
 			continue;
@@ -1716,7 +1715,7 @@ pqGetline3(PGconn *conn, char *s, int maxlen)
 	while ((status = PQgetlineAsync(conn, s, maxlen - 1)) == 0)
 	{
 		/* need to load more data */
-		if (pqWait(TRUE, FALSE, conn) ||
+		if (pqWait(true, false, conn) ||
 			pqReadData(conn) < 0)
 		{
 			*s = '\0';
@@ -1969,7 +1968,7 @@ pqFunctionCall3(PGconn *conn, Oid fnid,
 		if (needInput)
 		{
 			/* Wait for some data to arrive (or for the channel to close) */
-			if (pqWait(TRUE, FALSE, conn) ||
+			if (pqWait(true, false, conn) ||
 				pqReadData(conn) < 0)
 				break;
 		}
@@ -2148,7 +2147,7 @@ build_startup_packet(const PGconn *conn, char *packet,
 	/* Protocol version comes first. */
 	if (packet)
 	{
-		ProtocolVersion pv = htonl(conn->pversion);
+		ProtocolVersion pv = pg_hton32(conn->pversion);
 
 		memcpy(packet + packet_len, &pv, sizeof(ProtocolVersion));
 	}
diff --git a/src/interfaces/libpq/fe-secure-common.c b/src/interfaces/libpq/fe-secure-common.c
new file mode 100644
index 0000000000..40203f3b64
--- /dev/null
+++ b/src/interfaces/libpq/fe-secure-common.c
@@ -0,0 +1,204 @@
+/*-------------------------------------------------------------------------
+ *
+ * fe-secure-common.c
+ *
+ * common implementation-independent SSL support code
+ *
+ * While fe-secure.c contains the interfaces that the rest of libpq call, this
+ * file contains support routines that are used by the library-specific
+ * implementations such as fe-secure-openssl.c.
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/interfaces/libpq/fe-secure-common.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "postgres_fe.h"
+
+#include "fe-secure-common.h"
+
+#include "libpq-int.h"
+#include "pqexpbuffer.h"
+
+/*
+ * Check if a wildcard certificate matches the server hostname.
+ *
+ * The rule for this is:
+ *	1. We only match the '*' character as wildcard
+ *	2. We match only wildcards at the start of the string
+ *	3. The '*' character does *not* match '.', meaning that we match only
+ *	   a single pathname component.
+ *	4. We don't support more than one '*' in a single pattern.
+ *
+ * This is roughly in line with RFC2818, but contrary to what most browsers
+ * appear to be implementing (point 3 being the difference)
+ *
+ * Matching is always case-insensitive, since DNS is case insensitive.
+ */
+static bool
+wildcard_certificate_match(const char *pattern, const char *string)
+{
+	int			lenpat = strlen(pattern);
+	int			lenstr = strlen(string);
+
+	/* If we don't start with a wildcard, it's not a match (rule 1 & 2) */
+	if (lenpat < 3 ||
+		pattern[0] != '*' ||
+		pattern[1] != '.')
+		return false;
+
+	/* If pattern is longer than the string, we can never match */
+	if (lenpat > lenstr)
+		return false;
+
+	/*
+	 * If string does not end in pattern (minus the wildcard), we don't match
+	 */
+	if (pg_strcasecmp(pattern + 1, string + lenstr - lenpat + 1) != 0)
+		return false;
+
+	/*
+	 * If there is a dot left of where the pattern started to match, we don't
+	 * match (rule 3)
+	 */
+	if (strchr(string, '.') < string + lenstr - lenpat)
+		return false;
+
+	/* String ended with pattern, and didn't have a dot before, so we match */
+	return true;
+}
+
+/*
+ * Check if a name from a server's certificate matches the peer's hostname.
+ *
+ * Returns 1 if the name matches, and 0 if it does not. On error, returns
+ * -1, and sets the libpq error message.
+ *
+ * The name extracted from the certificate is returned in *store_name. The
+ * caller is responsible for freeing it.
+ */
+int
+pq_verify_peer_name_matches_certificate_name(PGconn *conn,
+											 const char *namedata, size_t namelen,
+											 char **store_name)
+{
+	char	   *name;
+	int			result;
+	char	   *host = PQhost(conn);
+
+	*store_name = NULL;
+
+	/*
+	 * There is no guarantee the string returned from the certificate is
+	 * NULL-terminated, so make a copy that is.
+	 */
+	name = malloc(namelen + 1);
+	if (name == NULL)
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("out of memory\n"));
+		return -1;
+	}
+	memcpy(name, namedata, namelen);
+	name[namelen] = '\0';
+
+	/*
+	 * Reject embedded NULLs in certificate common or alternative name to
+	 * prevent attacks like CVE-2009-4034.
+	 */
+	if (namelen != strlen(name))
+	{
+		free(name);
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("SSL certificate's name contains embedded null\n"));
+		return -1;
+	}
+
+	if (pg_strcasecmp(name, host) == 0)
+	{
+		/* Exact name match */
+		result = 1;
+	}
+	else if (wildcard_certificate_match(name, host))
+	{
+		/* Matched wildcard name */
+		result = 1;
+	}
+	else
+	{
+		result = 0;
+	}
+
+	*store_name = name;
+	return result;
+}
+
+/*
+ * Verify that the server certificate matches the hostname we connected to.
+ *
+ * The certificate's Common Name and Subject Alternative Names are considered.
+ */
+bool
+pq_verify_peer_name_matches_certificate(PGconn *conn)
+{
+	char	   *host = PQhost(conn);
+	int			rc;
+	int			names_examined = 0;
+	char	   *first_name = NULL;
+
+	/*
+	 * If told not to verify the peer name, don't do it. Return true
+	 * indicating that the verification was successful.
+	 */
+	if (strcmp(conn->sslmode, "verify-full") != 0)
+		return true;
+
+	/* Check that we have a hostname to compare with. */
+	if (!(host && host[0] != '\0'))
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("host name must be specified for a verified SSL connection\n"));
+		return false;
+	}
+
+	rc = pgtls_verify_peer_name_matches_certificate_guts(conn, &names_examined, &first_name);
+
+	if (rc == 0)
+	{
+		/*
+		 * No match. Include the name from the server certificate in the error
+		 * message, to aid debugging broken configurations. If there are
+		 * multiple names, only print the first one to avoid an overly long
+		 * error message.
+		 */
+		if (names_examined > 1)
+		{
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_ngettext("server certificate for \"%s\" (and %d other name) does not match host name \"%s\"\n",
+											 "server certificate for \"%s\" (and %d other names) does not match host name \"%s\"\n",
+											 names_examined - 1),
+							  first_name, names_examined - 1, host);
+		}
+		else if (names_examined == 1)
+		{
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("server certificate for \"%s\" does not match host name \"%s\"\n"),
+							  first_name, host);
+		}
+		else
+		{
+			printfPQExpBuffer(&conn->errorMessage,
+							  libpq_gettext("could not get server's host name from server certificate\n"));
+		}
+	}
+
+	/* clean up */
+	if (first_name)
+		free(first_name);
+
+	return (rc == 1);
+}
diff --git a/src/interfaces/libpq/fe-secure-common.h b/src/interfaces/libpq/fe-secure-common.h
new file mode 100644
index 0000000000..980a58af25
--- /dev/null
+++ b/src/interfaces/libpq/fe-secure-common.h
@@ -0,0 +1,26 @@
+/*-------------------------------------------------------------------------
+ *
+ * fe-secure-common.h
+ *
+ * common implementation-independent SSL support code
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/interfaces/libpq/fe-secure-common.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#ifndef FE_SECURE_COMMON_H
+#define FE_SECURE_COMMON_H
+
+#include "libpq-fe.h"
+
+extern int pq_verify_peer_name_matches_certificate_name(PGconn *conn,
+											 const char *namedata, size_t namelen,
+											 char **store_name);
+extern bool pq_verify_peer_name_matches_certificate(PGconn *conn);
+
+#endif							/* FE_SECURE_COMMON_H */
diff --git a/src/interfaces/libpq/fe-secure-openssl.c b/src/interfaces/libpq/fe-secure-openssl.c
index 2f29820e82..cade4e157c 100644
--- a/src/interfaces/libpq/fe-secure-openssl.c
+++ b/src/interfaces/libpq/fe-secure-openssl.c
@@ -4,7 +4,7 @@
  *	  OpenSSL support
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -28,6 +28,7 @@
 
 #include "libpq-fe.h"
 #include "fe-auth.h"
+#include "fe-secure-common.h"
 #include "libpq-int.h"
 
 #ifdef WIN32
@@ -60,9 +61,8 @@
 #endif
 #include <openssl/x509v3.h>
 
-static bool verify_peer_name_matches_certificate(PGconn *);
 static int	verify_cb(int ok, X509_STORE_CTX *ctx);
-static int verify_peer_name_matches_certificate_name(PGconn *conn,
+static int openssl_verify_peer_name_matches_certificate_name(PGconn *conn,
 										  ASN1_STRING *name,
 										  char **store_name);
 static void destroy_ssl_system(void);
@@ -98,10 +98,6 @@ static long win32_ssl_create_mutex = 0;
 /*			 Procedures common to all secure sessions			*/
 /* ------------------------------------------------------------ */
 
-/*
- *	Exported function to allow application to tell us it's already
- *	initialized OpenSSL and/or libcrypto.
- */
 void
 pgtls_init_library(bool do_ssl, int do_crypto)
 {
@@ -119,9 +115,6 @@ pgtls_init_library(bool do_ssl, int do_crypto)
 	pq_init_crypto_lib = do_crypto;
 }
 
-/*
- *	Begin or continue negotiating a secure session.
- */
 PostgresPollingStatusType
 pgtls_open_client(PGconn *conn)
 {
@@ -144,22 +137,6 @@ pgtls_open_client(PGconn *conn)
 	return open_client_SSL(conn);
 }
 
-/*
- *	Is there unread data waiting in the SSL read buffer?
- */
-bool
-pgtls_read_pending(PGconn *conn)
-{
-	return SSL_pending(conn->ssl);
-}
-
-/*
- *	Read data from a secure connection.
- *
- * On failure, this function is responsible for putting a suitable message
- * into conn->errorMessage.  The caller must still inspect errno, but only
- * to determine whether to continue/retry after error.
- */
 ssize_t
 pgtls_read(PGconn *conn, void *ptr, size_t len)
 {
@@ -284,13 +261,12 @@ pgtls_read(PGconn *conn, void *ptr, size_t len)
 	return n;
 }
 
-/*
- *	Write data to a secure connection.
- *
- * On failure, this function is responsible for putting a suitable message
- * into conn->errorMessage.  The caller must still inspect errno, but only
- * to determine whether to continue/retry after error.
- */
+bool
+pgtls_read_pending(PGconn *conn)
+{
+	return SSL_pending(conn->ssl);
+}
+
 ssize_t
 pgtls_write(PGconn *conn, const void *ptr, size_t len)
 {
@@ -393,6 +369,106 @@ pgtls_write(PGconn *conn, const void *ptr, size_t len)
 	return n;
 }
 
+char *
+pgtls_get_finished(PGconn *conn, size_t *len)
+{
+	char		dummy[1];
+	char	   *result;
+
+	/*
+	 * OpenSSL does not offer an API to get directly the length of the TLS
+	 * Finished message sent, so first do a dummy call to grab this
+	 * information and then do an allocation with the correct size.
+	 */
+	*len = SSL_get_finished(conn->ssl, dummy, sizeof(dummy));
+	result = malloc(*len);
+	if (result == NULL)
+		return NULL;
+	(void) SSL_get_finished(conn->ssl, result, *len);
+
+	return result;
+}
+
+char *
+pgtls_get_peer_certificate_hash(PGconn *conn, size_t *len)
+{
+#ifdef HAVE_X509_GET_SIGNATURE_NID
+	X509	   *peer_cert;
+	const EVP_MD *algo_type;
+	unsigned char hash[EVP_MAX_MD_SIZE];	/* size for SHA-512 */
+	unsigned int hash_size;
+	int			algo_nid;
+	char	   *cert_hash;
+
+	*len = 0;
+
+	if (!conn->peer)
+		return NULL;
+
+	peer_cert = conn->peer;
+
+	/*
+	 * Get the signature algorithm of the certificate to determine the hash
+	 * algorithm to use for the result.
+	 */
+	if (!OBJ_find_sigid_algs(X509_get_signature_nid(peer_cert),
+							 &algo_nid, NULL))
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("could not determine server certificate signature algorithm\n"));
+		return NULL;
+	}
+
+	/*
+	 * The TLS server's certificate bytes need to be hashed with SHA-256 if
+	 * its signature algorithm is MD5 or SHA-1 as per RFC 5929
+	 * (https://tools.ietf.org/html/rfc5929#section-4.1).  If something else
+	 * is used, the same hash as the signature algorithm is used.
+	 */
+	switch (algo_nid)
+	{
+		case NID_md5:
+		case NID_sha1:
+			algo_type = EVP_sha256();
+			break;
+		default:
+			algo_type = EVP_get_digestbynid(algo_nid);
+			if (algo_type == NULL)
+			{
+				printfPQExpBuffer(&conn->errorMessage,
+								  libpq_gettext("could not find digest for NID %s\n"),
+								  OBJ_nid2sn(algo_nid));
+				return NULL;
+			}
+			break;
+	}
+
+	if (!X509_digest(peer_cert, algo_type, hash, &hash_size))
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("could not generate peer certificate hash\n"));
+		return NULL;
+	}
+
+	/* save result */
+	cert_hash = malloc(hash_size);
+	if (cert_hash == NULL)
+	{
+		printfPQExpBuffer(&conn->errorMessage,
+						  libpq_gettext("out of memory\n"));
+		return NULL;
+	}
+	memcpy(cert_hash, hash, hash_size);
+	*len = hash_size;
+
+	return cert_hash;
+#else
+	printfPQExpBuffer(&conn->errorMessage,
+					  libpq_gettext("channel binding type \"tls-server-end-point\" is not supported by this build\n"));
+	return NULL;
+#endif
+}
+
 /* ------------------------------------------------------------ */
 /*						OpenSSL specific code					*/
 /* ------------------------------------------------------------ */
@@ -416,76 +492,16 @@ verify_cb(int ok, X509_STORE_CTX *ctx)
 
 
 /*
- * Check if a wildcard certificate matches the server hostname.
- *
- * The rule for this is:
- *	1. We only match the '*' character as wildcard
- *	2. We match only wildcards at the start of the string
- *	3. The '*' character does *not* match '.', meaning that we match only
- *	   a single pathname component.
- *	4. We don't support more than one '*' in a single pattern.
- *
- * This is roughly in line with RFC2818, but contrary to what most browsers
- * appear to be implementing (point 3 being the difference)
- *
- * Matching is always case-insensitive, since DNS is case insensitive.
+ * OpenSSL-specific wrapper around
+ * pq_verify_peer_name_matches_certificate_name(), converting the ASN1_STRING
+ * into a plain C string.
  */
 static int
-wildcard_certificate_match(const char *pattern, const char *string)
-{
-	int			lenpat = strlen(pattern);
-	int			lenstr = strlen(string);
-
-	/* If we don't start with a wildcard, it's not a match (rule 1 & 2) */
-	if (lenpat < 3 ||
-		pattern[0] != '*' ||
-		pattern[1] != '.')
-		return 0;
-
-	if (lenpat > lenstr)
-		/* If pattern is longer than the string, we can never match */
-		return 0;
-
-	if (pg_strcasecmp(pattern + 1, string + lenstr - lenpat + 1) != 0)
-
-		/*
-		 * If string does not end in pattern (minus the wildcard), we don't
-		 * match
-		 */
-		return 0;
-
-	if (strchr(string, '.') < string + lenstr - lenpat)
-
-		/*
-		 * If there is a dot left of where the pattern started to match, we
-		 * don't match (rule 3)
-		 */
-		return 0;
-
-	/* String ended with pattern, and didn't have a dot before, so we match */
-	return 1;
-}
-
-/*
- * Check if a name from a server's certificate matches the peer's hostname.
- *
- * Returns 1 if the name matches, and 0 if it does not. On error, returns
- * -1, and sets the libpq error message.
- *
- * The name extracted from the certificate is returned in *store_name. The
- * caller is responsible for freeing it.
- */
-static int
-verify_peer_name_matches_certificate_name(PGconn *conn, ASN1_STRING *name_entry,
-										  char **store_name)
+openssl_verify_peer_name_matches_certificate_name(PGconn *conn, ASN1_STRING *name_entry,
+												  char **store_name)
 {
 	int			len;
-	char	   *name;
 	const unsigned char *namedata;
-	int			result;
-	char	   *host = PQhost(conn);
-
-	*store_name = NULL;
 
 	/* Should not happen... */
 	if (name_entry == NULL)
@@ -497,9 +513,6 @@ verify_peer_name_matches_certificate_name(PGconn *conn, ASN1_STRING *name_entry,
 
 	/*
 	 * GEN_DNS can be only IA5String, equivalent to US ASCII.
-	 *
-	 * There is no guarantee the string returned from the certificate is
-	 * NULL-terminated, so make a copy that is.
 	 */
 #ifdef HAVE_ASN1_STRING_GET0_DATA
 	namedata = ASN1_STRING_get0_data(name_entry);
@@ -507,45 +520,9 @@ verify_peer_name_matches_certificate_name(PGconn *conn, ASN1_STRING *name_entry,
 	namedata = ASN1_STRING_data(name_entry);
 #endif
 	len = ASN1_STRING_length(name_entry);
-	name = malloc(len + 1);
-	if (name == NULL)
-	{
-		printfPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("out of memory\n"));
-		return -1;
-	}
-	memcpy(name, namedata, len);
-	name[len] = '\0';
-
-	/*
-	 * Reject embedded NULLs in certificate common or alternative name to
-	 * prevent attacks like CVE-2009-4034.
-	 */
-	if (len != strlen(name))
-	{
-		free(name);
-		printfPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("SSL certificate's name contains embedded null\n"));
-		return -1;
-	}
-
-	if (pg_strcasecmp(name, host) == 0)
-	{
-		/* Exact name match */
-		result = 1;
-	}
-	else if (wildcard_certificate_match(name, host))
-	{
-		/* Matched wildcard name */
-		result = 1;
-	}
-	else
-	{
-		result = 0;
-	}
 
-	*store_name = name;
-	return result;
+	/* OK to cast from unsigned to plain char, since it's all ASCII. */
+	return pq_verify_peer_name_matches_certificate_name(conn, (const char *) namedata, len, store_name);
 }
 
 /*
@@ -553,33 +530,14 @@ verify_peer_name_matches_certificate_name(PGconn *conn, ASN1_STRING *name_entry,
  *
  * The certificate's Common Name and Subject Alternative Names are considered.
  */
-static bool
-verify_peer_name_matches_certificate(PGconn *conn)
+int
+pgtls_verify_peer_name_matches_certificate_guts(PGconn *conn,
+												int *names_examined,
+												char **first_name)
 {
-	int			names_examined = 0;
-	bool		found_match = false;
-	bool		got_error = false;
-	char	   *first_name = NULL;
-
 	STACK_OF(GENERAL_NAME) *peer_san;
 	int			i;
-	int			rc;
-	char	   *host = PQhost(conn);
-
-	/*
-	 * If told not to verify the peer name, don't do it. Return true
-	 * indicating that the verification was successful.
-	 */
-	if (strcmp(conn->sslmode, "verify-full") != 0)
-		return true;
-
-	/* Check that we have a hostname to compare with. */
-	if (!(host && host[0] != '\0'))
-	{
-		printfPQExpBuffer(&conn->errorMessage,
-						  libpq_gettext("host name must be specified for a verified SSL connection\n"));
-		return false;
-	}
+	int			rc = 0;
 
 	/*
 	 * First, get the Subject Alternative Names (SANs) from the certificate,
@@ -600,24 +558,20 @@ verify_peer_name_matches_certificate(PGconn *conn)
 			{
 				char	   *alt_name;
 
-				names_examined++;
-				rc = verify_peer_name_matches_certificate_name(conn,
+				(*names_examined)++;
+				rc = openssl_verify_peer_name_matches_certificate_name(conn,
 															   name->d.dNSName,
 															   &alt_name);
-				if (rc == -1)
-					got_error = true;
-				if (rc == 1)
-					found_match = true;
 
 				if (alt_name)
 				{
-					if (!first_name)
-						first_name = alt_name;
+					if (!*first_name)
+						*first_name = alt_name;
 					else
 						free(alt_name);
 				}
 			}
-			if (found_match || got_error)
+			if (rc != 0)
 				break;
 		}
 		sk_GENERAL_NAME_free(peer_san);
@@ -630,7 +584,7 @@ verify_peer_name_matches_certificate(PGconn *conn)
 	 * (Per RFC 2818 and RFC 6125, if the subjectAltName extension of type
 	 * dNSName is present, the CN must be ignored.)
 	 */
-	if (names_examined == 0)
+	if (*names_examined == 0)
 	{
 		X509_NAME  *subject_name;
 
@@ -643,55 +597,17 @@ verify_peer_name_matches_certificate(PGconn *conn)
 												  NID_commonName, -1);
 			if (cn_index >= 0)
 			{
-				names_examined++;
-				rc = verify_peer_name_matches_certificate_name(
+				(*names_examined)++;
+				rc = openssl_verify_peer_name_matches_certificate_name(
 															   conn,
 															   X509_NAME_ENTRY_get_data(
 																						X509_NAME_get_entry(subject_name, cn_index)),
-															   &first_name);
-
-				if (rc == -1)
-					got_error = true;
-				else if (rc == 1)
-					found_match = true;
+															   first_name);
 			}
 		}
 	}
 
-	if (!found_match && !got_error)
-	{
-		/*
-		 * No match. Include the name from the server certificate in the error
-		 * message, to aid debugging broken configurations. If there are
-		 * multiple names, only print the first one to avoid an overly long
-		 * error message.
-		 */
-		if (names_examined > 1)
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_ngettext("server certificate for \"%s\" (and %d other name) does not match host name \"%s\"\n",
-											 "server certificate for \"%s\" (and %d other names) does not match host name \"%s\"\n",
-											 names_examined - 1),
-							  first_name, names_examined - 1, host);
-		}
-		else if (names_examined == 1)
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("server certificate for \"%s\" does not match host name \"%s\"\n"),
-							  first_name, host);
-		}
-		else
-		{
-			printfPQExpBuffer(&conn->errorMessage,
-							  libpq_gettext("could not get server's host name from server certificate\n"));
-		}
-	}
-
-	/* clean up */
-	if (first_name)
-		free(first_name);
-
-	return found_match && !got_error;
+	return rc;
 }
 
 #if defined(ENABLE_THREAD_SAFETY) && defined(HAVE_CRYPTO_LOCK)
@@ -741,11 +657,6 @@ pq_lockingcallback(int mode, int n, const char *file, int line)
  * If the caller has told us (through PQinitOpenSSL) that he's taking care
  * of libcrypto, we expect that callbacks are already set, and won't try to
  * override it.
- *
- * The conn parameter is only used to be able to pass back an error
- * message - no connection-local setup is made here.
- *
- * Returns 0 if OK, -1 on failure (with a message in conn->errorMessage).
  */
 int
 pgtls_init(PGconn *conn)
@@ -1370,7 +1281,7 @@ open_client_SSL(PGconn *conn)
 		return PGRES_POLLING_FAILED;
 	}
 
-	if (!verify_peer_name_matches_certificate(conn))
+	if (!pq_verify_peer_name_matches_certificate(conn))
 	{
 		pgtls_close(conn);
 		return PGRES_POLLING_FAILED;
@@ -1380,9 +1291,6 @@ open_client_SSL(PGconn *conn)
 	return PGRES_POLLING_OK;
 }
 
-/*
- *	Close SSL connection.
- */
 void
 pgtls_close(PGconn *conn)
 {
@@ -1479,14 +1387,6 @@ SSLerrfree(char *buf)
 /*					SSL information functions					*/
 /* ------------------------------------------------------------ */
 
-int
-PQsslInUse(PGconn *conn)
-{
-	if (!conn)
-		return 0;
-	return conn->ssl_in_use;
-}
-
 /*
  *	Return pointer to OpenSSL object.
  */
diff --git a/src/interfaces/libpq/fe-secure.c b/src/interfaces/libpq/fe-secure.c
index 7c2d0cb4e6..cfb77f6d85 100644
--- a/src/interfaces/libpq/fe-secure.c
+++ b/src/interfaces/libpq/fe-secure.c
@@ -6,7 +6,7 @@
  *	  message integrity and endpoint authentication.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -129,6 +129,14 @@ struct sigpipe_info
 /* ------------------------------------------------------------ */
 
 
+int
+PQsslInUse(PGconn *conn)
+{
+	if (!conn)
+		return 0;
+	return conn->ssl_in_use;
+}
+
 /*
  *	Exported function to allow application to tell us it's already
  *	initialized OpenSSL.
@@ -384,12 +392,6 @@ pqsecure_raw_write(PGconn *conn, const void *ptr, size_t len)
 /* Dummy versions of SSL info functions, when built without SSL support */
 #ifndef USE_SSL
 
-int
-PQsslInUse(PGconn *conn)
-{
-	return 0;
-}
-
 void *
 PQgetssl(PGconn *conn)
 {
@@ -465,10 +467,10 @@ pq_block_sigpipe(sigset_t *osigset, bool *sigpipe_pending)
  * As long as it doesn't queue multiple events, we're OK because the caller
  * can't tell the difference.
  *
- * The caller should say got_epipe = FALSE if it is certain that it
+ * The caller should say got_epipe = false if it is certain that it
  * didn't get an EPIPE error; in that case we'll skip the clear operation
  * and things are definitely OK, queuing or no.  If it got one or might have
- * gotten one, pass got_epipe = TRUE.
+ * gotten one, pass got_epipe = true.
  *
  * We do not want this to change errno, since if it did that could lose
  * the error code from a preceding send().  We essentially assume that if
diff --git a/src/interfaces/libpq/libpq-events.c b/src/interfaces/libpq/libpq-events.c
index e533017a03..09f9c7f9bb 100644
--- a/src/interfaces/libpq/libpq-events.c
+++ b/src/interfaces/libpq/libpq-events.c
@@ -3,7 +3,7 @@
  * libpq-events.c
  *	  functions for supporting the libpq "events" API
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -44,12 +44,12 @@ PQregisterEventProc(PGconn *conn, PGEventProc proc,
 	PGEventRegister regevt;
 
 	if (!proc || !conn || !name || !*name)
-		return FALSE;			/* bad arguments */
+		return false;			/* bad arguments */
 
 	for (i = 0; i < conn->nEvents; i++)
 	{
 		if (conn->events[i].proc == proc)
-			return FALSE;		/* already registered */
+			return false;		/* already registered */
 	}
 
 	if (conn->nEvents >= conn->eventArraySize)
@@ -64,7 +64,7 @@ PQregisterEventProc(PGconn *conn, PGEventProc proc,
 			e = (PGEvent *) malloc(newSize * sizeof(PGEvent));
 
 		if (!e)
-			return FALSE;
+			return false;
 
 		conn->eventArraySize = newSize;
 		conn->events = e;
@@ -73,10 +73,10 @@ PQregisterEventProc(PGconn *conn, PGEventProc proc,
 	conn->events[conn->nEvents].proc = proc;
 	conn->events[conn->nEvents].name = strdup(name);
 	if (!conn->events[conn->nEvents].name)
-		return FALSE;
+		return false;
 	conn->events[conn->nEvents].passThrough = passThrough;
 	conn->events[conn->nEvents].data = NULL;
-	conn->events[conn->nEvents].resultInitialized = FALSE;
+	conn->events[conn->nEvents].resultInitialized = false;
 	conn->nEvents++;
 
 	regevt.conn = conn;
@@ -84,10 +84,10 @@ PQregisterEventProc(PGconn *conn, PGEventProc proc,
 	{
 		conn->nEvents--;
 		free(conn->events[conn->nEvents].name);
-		return FALSE;
+		return false;
 	}
 
-	return TRUE;
+	return true;
 }
 
 /*
@@ -100,18 +100,18 @@ PQsetInstanceData(PGconn *conn, PGEventProc proc, void *data)
 	int			i;
 
 	if (!conn || !proc)
-		return FALSE;
+		return false;
 
 	for (i = 0; i < conn->nEvents; i++)
 	{
 		if (conn->events[i].proc == proc)
 		{
 			conn->events[i].data = data;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 /*
@@ -144,18 +144,18 @@ PQresultSetInstanceData(PGresult *result, PGEventProc proc, void *data)
 	int			i;
 
 	if (!result || !proc)
-		return FALSE;
+		return false;
 
 	for (i = 0; i < result->nEvents; i++)
 	{
 		if (result->events[i].proc == proc)
 		{
 			result->events[i].data = data;
-			return TRUE;
+			return true;
 		}
 	}
 
-	return FALSE;
+	return false;
 }
 
 /*
@@ -187,7 +187,7 @@ PQfireResultCreateEvents(PGconn *conn, PGresult *res)
 	int			i;
 
 	if (!res)
-		return FALSE;
+		return false;
 
 	for (i = 0; i < res->nEvents; i++)
 	{
@@ -199,11 +199,11 @@ PQfireResultCreateEvents(PGconn *conn, PGresult *res)
 			evt.result = res;
 			if (!res->events[i].proc(PGEVT_RESULTCREATE, &evt,
 									 res->events[i].passThrough))
-				return FALSE;
+				return false;
 
-			res->events[i].resultInitialized = TRUE;
+			res->events[i].resultInitialized = true;
 		}
 	}
 
-	return TRUE;
+	return true;
 }
diff --git a/src/interfaces/libpq/libpq-events.h b/src/interfaces/libpq/libpq-events.h
index 20af1ffe6d..7d0726a839 100644
--- a/src/interfaces/libpq/libpq-events.h
+++ b/src/interfaces/libpq/libpq-events.h
@@ -5,7 +5,7 @@
  *	  that invoke the libpq "events" API, but are not interesting to
  *	  ordinary users of libpq.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/libpq-events.h
diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h
index 1d915e7915..ed9c806861 100644
--- a/src/interfaces/libpq/libpq-fe.h
+++ b/src/interfaces/libpq/libpq-fe.h
@@ -4,7 +4,7 @@
  *	  This file contains definitions for structures and
  *	  externs for functions used by frontend postgres applications.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/libpq-fe.h
diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h
index 42913604e3..eba23dcecc 100644
--- a/src/interfaces/libpq/libpq-int.h
+++ b/src/interfaces/libpq/libpq-int.h
@@ -9,7 +9,7 @@
  *	  more likely to break across PostgreSQL releases than code that uses
  *	  only the official API.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/libpq-int.h
@@ -349,6 +349,7 @@ struct pg_conn
 										 * retransmits */
 	char	   *keepalives_count;	/* maximum number of TCP keepalive
 									 * retransmits */
+	char	   *scram_channel_binding; /* SCRAM channel binding type */
 	char	   *sslmode;		/* SSL mode (require,prefer,allow,disable) */
 	char	   *sslcompression; /* SSL compression (0 or 1) */
 	char	   *sslkey;			/* client key filename */
@@ -453,11 +454,13 @@ struct pg_conn
 	/* Assorted state for SASL, SSL, GSS, etc */
 	void	   *sasl_state;
 
+	/* SSL structures */
+	bool		ssl_in_use;
+
 #ifdef USE_SSL
 	bool		allow_ssl_try;	/* Allowed to try SSL negotiation */
 	bool		wait_ssl_try;	/* Delay SSL negotiation until after
 								 * attempting normal connection */
-	bool		ssl_in_use;
 #ifdef USE_OPENSSL
 	SSL		   *ssl;			/* SSL status, if have SSL connection */
 	X509	   *peer;			/* X509 cert of server */
@@ -658,17 +661,92 @@ extern void pq_reset_sigpipe(sigset_t *osigset, bool sigpipe_pending,
 				 bool got_epipe);
 #endif
 
+/* === SSL === */
+
 /*
- * The SSL implementation provides these functions (fe-secure-openssl.c)
+ * The SSL implementation provides these functions.
+ */
+
+/*
+ *	Implementation of PQinitSSL().
  */
 extern void pgtls_init_library(bool do_ssl, int do_crypto);
+
+/*
+ * Initialize SSL library.
+ *
+ * The conn parameter is only used to be able to pass back an error
+ * message - no connection-local setup is made here.
+ *
+ * Returns 0 if OK, -1 on failure (with a message in conn->errorMessage).
+ */
 extern int	pgtls_init(PGconn *conn);
+
+/*
+ *	Begin or continue negotiating a secure session.
+ */
 extern PostgresPollingStatusType pgtls_open_client(PGconn *conn);
+
+/*
+ *	Close SSL connection.
+ */
 extern void pgtls_close(PGconn *conn);
+
+/*
+ *	Read data from a secure connection.
+ *
+ * On failure, this function is responsible for putting a suitable message
+ * into conn->errorMessage.  The caller must still inspect errno, but only
+ * to determine whether to continue/retry after error.
+ */
 extern ssize_t pgtls_read(PGconn *conn, void *ptr, size_t len);
+
+/*
+ *	Is there unread data waiting in the SSL read buffer?
+ */
 extern bool pgtls_read_pending(PGconn *conn);
+
+/*
+ *	Write data to a secure connection.
+ *
+ * On failure, this function is responsible for putting a suitable message
+ * into conn->errorMessage.  The caller must still inspect errno, but only
+ * to determine whether to continue/retry after error.
+ */
 extern ssize_t pgtls_write(PGconn *conn, const void *ptr, size_t len);
 
+/*
+ * Get the TLS finish message sent during last handshake.
+ *
+ * This information is useful for callers doing channel binding during
+ * authentication.
+ */
+extern char *pgtls_get_finished(PGconn *conn, size_t *len);
+
+/*
+ * Get the hash of the server certificate, for SCRAM channel binding type
+ * tls-server-end-point.
+ *
+ * NULL is sent back to the caller in the event of an error, with an
+ * error message for the caller to consume.
+ */
+extern char *pgtls_get_peer_certificate_hash(PGconn *conn, size_t *len);
+
+/*
+ * Verify that the server certificate matches the host name we connected to.
+ *
+ * The certificate's Common Name and Subject Alternative Names are considered.
+ *
+ * Returns 1 if the name matches, and 0 if it does not. On error, returns
+ * -1, and sets the libpq error message.
+ *
+ */
+extern int pgtls_verify_peer_name_matches_certificate_guts(PGconn *conn,
+														   int *names_examined,
+														   char **first_name);
+
+/* === miscellaneous macros === */
+
 /*
  * this is so that we can check if a connection is non-blocking internally
  * without the overhead of a function call
diff --git a/src/interfaces/libpq/libpq.rc.in b/src/interfaces/libpq/libpq.rc.in
index 437c45d602..bc89cd2a43 100644
--- a/src/interfaces/libpq/libpq.rc.in
+++ b/src/interfaces/libpq/libpq.rc.in
@@ -17,7 +17,7 @@ BEGIN
             VALUE "FileDescription", "PostgreSQL Access Library\0"
             VALUE "FileVersion", "11.0\0"
             VALUE "InternalName", "libpq\0"
-            VALUE "LegalCopyright", "Copyright (C) 2017\0"
+            VALUE "LegalCopyright", "Copyright (C) 2018\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "libpq.dll\0"
             VALUE "ProductName", "PostgreSQL\0"
diff --git a/src/interfaces/libpq/nls.mk b/src/interfaces/libpq/nls.mk
index 2c5659e262..4196870b49 100644
--- a/src/interfaces/libpq/nls.mk
+++ b/src/interfaces/libpq/nls.mk
@@ -1,6 +1,6 @@
 # src/interfaces/libpq/nls.mk
 CATALOG_NAME     = libpq
 AVAIL_LANGUAGES  = cs de es fr he it ja ko pl pt_BR ru sv tr zh_CN zh_TW
-GETTEXT_FILES    = fe-auth.c fe-auth-scram.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c fe-secure-openssl.c win32.c
+GETTEXT_FILES    = fe-auth.c fe-auth-scram.c fe-connect.c fe-exec.c fe-lobj.c fe-misc.c fe-protocol2.c fe-protocol3.c fe-secure.c fe-secure-common.c fe-secure-openssl.c win32.c
 GETTEXT_TRIGGERS = libpq_gettext pqInternalNotice:2
 GETTEXT_FLAGS    = libpq_gettext:1:pass-c-format pqInternalNotice:2:c-format
diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c
index f4aa7c9cef..86b16e60fb 100644
--- a/src/interfaces/libpq/pqexpbuffer.c
+++ b/src/interfaces/libpq/pqexpbuffer.c
@@ -15,7 +15,7 @@
  * a usable vsnprintf(), then a copy of our own implementation of it will
  * be linked into libpq.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/pqexpbuffer.c
diff --git a/src/interfaces/libpq/pqexpbuffer.h b/src/interfaces/libpq/pqexpbuffer.h
index 19633f9b79..771602af09 100644
--- a/src/interfaces/libpq/pqexpbuffer.h
+++ b/src/interfaces/libpq/pqexpbuffer.h
@@ -15,7 +15,7 @@
  * a usable vsnprintf(), then a copy of our own implementation of it will
  * be linked into libpq.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/interfaces/libpq/pqexpbuffer.h
diff --git a/src/interfaces/libpq/pthread-win32.c b/src/interfaces/libpq/pthread-win32.c
index 0e0d3eeb88..f6d675d5c4 100644
--- a/src/interfaces/libpq/pthread-win32.c
+++ b/src/interfaces/libpq/pthread-win32.c
@@ -3,7 +3,7 @@
 * pthread-win32.c
 *	 partial pthread implementation for win32
 *
-* Copyright (c) 2004-2017, PostgreSQL Global Development Group
+* Copyright (c) 2004-2018, PostgreSQL Global Development Group
 * IDENTIFICATION
 *	src/interfaces/libpq/pthread-win32.c
 *
diff --git a/src/interfaces/libpq/test/uri-regress.c b/src/interfaces/libpq/test/uri-regress.c
index fac849bab2..4590f37008 100644
--- a/src/interfaces/libpq/test/uri-regress.c
+++ b/src/interfaces/libpq/test/uri-regress.c
@@ -7,7 +7,7 @@
  * prints out the values from the parsed PQconninfoOption struct that differ
  * from the defaults (obtained from PQconndefaults).
  *
- * Portions Copyright (c) 2012-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 2012-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/interfaces/libpq/test/uri-regress.c
diff --git a/src/interfaces/libpq/win32.c b/src/interfaces/libpq/win32.c
index 11abb0be04..79768e4e0b 100644
--- a/src/interfaces/libpq/win32.c
+++ b/src/interfaces/libpq/win32.c
@@ -15,7 +15,7 @@
  * The error constants are taken from the Frambak Bakfram LGSOCKET
  * library guys who in turn took them from the Winsock FAQ.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  */
diff --git a/src/pl/plperl/GNUmakefile b/src/pl/plperl/GNUmakefile
index 191f74067a..933abb47c4 100644
--- a/src/pl/plperl/GNUmakefile
+++ b/src/pl/plperl/GNUmakefile
@@ -55,7 +55,7 @@ endif # win32
 SHLIB_LINK = $(perl_embed_ldflags)
 
 REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=plperl  --load-extension=plperlu
-REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array
+REGRESS = plperl plperl_lc plperl_trigger plperl_shared plperl_elog plperl_util plperl_init plperlu plperl_array plperl_call plperl_transaction
 # if Perl can support two interpreters in one backend,
 # test plperl-and-plperlu cases
 ifneq ($(PERL),)
@@ -81,13 +81,14 @@ perlchunks.h: $(PERLCHUNKS)
 
 all: all-lib
 
-SPI.c: SPI.xs plperl_helpers.h
-	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
-	$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
-
-Util.c: Util.xs plperl_helpers.h
+%.c: %.xs
 	@if [ x"$(perl_privlibexp)" = x"" ]; then echo "configure switch --with-perl was not specified."; exit 1; fi
+# xsubpp -output option is required for coverage+vpath, but requires Perl 5.9.3
+ifeq ($(enable_coverage)$(vpath_build),yesyes)
+	$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap -output $@ $<
+else
 	$(PERL) $(XSUBPPDIR)/ExtUtils/xsubpp -typemap $(perl_privlibexp)/ExtUtils/typemap $< >$@
+endif
 
 
 install: all install-lib install-data
diff --git a/src/pl/plperl/SPI.xs b/src/pl/plperl/SPI.xs
index d9e6f579d4..b98c547e8b 100644
--- a/src/pl/plperl/SPI.xs
+++ b/src/pl/plperl/SPI.xs
@@ -152,6 +152,15 @@ spi_spi_cursor_close(sv)
 		plperl_spi_cursor_close(cursor);
 		pfree(cursor);
 
+void
+spi_spi_commit()
+	CODE:
+		plperl_spi_commit();
+
+void
+spi_spi_rollback()
+	CODE:
+		plperl_spi_rollback();
 
 BOOT:
     items = 0;  /* avoid 'unused variable' warning */
diff --git a/src/pl/plperl/expected/plperl.out b/src/pl/plperl/expected/plperl.out
index 14df5f42df..ebfba3eb8d 100644
--- a/src/pl/plperl/expected/plperl.out
+++ b/src/pl/plperl/expected/plperl.out
@@ -214,8 +214,10 @@ CREATE OR REPLACE FUNCTION perl_record_set() RETURNS SETOF record AS $$
     return undef;
 $$  LANGUAGE plperl;
 SELECT perl_record_set();
-ERROR:  set-valued function called in context that cannot accept a set
-CONTEXT:  PL/Perl function "perl_record_set"
+ perl_record_set 
+-----------------
+(0 rows)
+
 SELECT * FROM perl_record_set();
 ERROR:  a column definition list is required for functions returning "record"
 LINE 1: SELECT * FROM perl_record_set();
@@ -233,7 +235,7 @@ CREATE OR REPLACE FUNCTION perl_record_set() RETURNS SETOF record AS $$
     ];
 $$  LANGUAGE plperl;
 SELECT perl_record_set();
-ERROR:  set-valued function called in context that cannot accept a set
+ERROR:  function returning record called in context that cannot accept type record
 CONTEXT:  PL/Perl function "perl_record_set"
 SELECT * FROM perl_record_set();
 ERROR:  a column definition list is required for functions returning "record"
@@ -250,7 +252,7 @@ CREATE OR REPLACE FUNCTION perl_record_set() RETURNS SETOF record AS $$
     ];
 $$  LANGUAGE plperl;
 SELECT perl_record_set();
-ERROR:  set-valued function called in context that cannot accept a set
+ERROR:  function returning record called in context that cannot accept type record
 CONTEXT:  PL/Perl function "perl_record_set"
 SELECT * FROM perl_record_set();
 ERROR:  a column definition list is required for functions returning "record"
@@ -387,6 +389,44 @@ $$ LANGUAGE plperl;
 SELECT * FROM foo_set_bad();
 ERROR:  Perl hash contains nonexistent column "z"
 CONTEXT:  PL/Perl function "foo_set_bad"
+CREATE DOMAIN orderedfootype AS footype CHECK ((VALUE).x <= (VALUE).y);
+CREATE OR REPLACE FUNCTION foo_ordered() RETURNS orderedfootype AS $$
+    return {x => 3, y => 4};
+$$ LANGUAGE plperl;
+SELECT * FROM foo_ordered();
+ x | y 
+---+---
+ 3 | 4
+(1 row)
+
+CREATE OR REPLACE FUNCTION foo_ordered() RETURNS orderedfootype AS $$
+    return {x => 5, y => 4};
+$$ LANGUAGE plperl;
+SELECT * FROM foo_ordered();  -- fail
+ERROR:  value for domain orderedfootype violates check constraint "orderedfootype_check"
+CONTEXT:  PL/Perl function "foo_ordered"
+CREATE OR REPLACE FUNCTION foo_ordered_set() RETURNS SETOF orderedfootype AS $$
+return [
+    {x => 3, y => 4},
+    {x => 4, y => 7}
+];
+$$ LANGUAGE plperl;
+SELECT * FROM foo_ordered_set();
+ x | y 
+---+---
+ 3 | 4
+ 4 | 7
+(2 rows)
+
+CREATE OR REPLACE FUNCTION foo_ordered_set() RETURNS SETOF orderedfootype AS $$
+return [
+    {x => 3, y => 4},
+    {x => 9, y => 7}
+];
+$$ LANGUAGE plperl;
+SELECT * FROM foo_ordered_set();  -- fail
+ERROR:  value for domain orderedfootype violates check constraint "orderedfootype_check"
+CONTEXT:  PL/Perl function "foo_ordered_set"
 --
 -- Check passing a tuple argument
 --
@@ -411,6 +451,46 @@ SELECT perl_get_field((11,12), 'z');
                
 (1 row)
 
+CREATE OR REPLACE FUNCTION perl_get_cfield(orderedfootype, text) RETURNS integer AS $$
+    return $_[0]->{$_[1]};
+$$ LANGUAGE plperl;
+SELECT perl_get_cfield((11,12), 'x');
+ perl_get_cfield 
+-----------------
+              11
+(1 row)
+
+SELECT perl_get_cfield((11,12), 'y');
+ perl_get_cfield 
+-----------------
+              12
+(1 row)
+
+SELECT perl_get_cfield((12,11), 'x');  -- fail
+ERROR:  value for domain orderedfootype violates check constraint "orderedfootype_check"
+CREATE OR REPLACE FUNCTION perl_get_rfield(record, text) RETURNS integer AS $$
+    return $_[0]->{$_[1]};
+$$ LANGUAGE plperl;
+SELECT perl_get_rfield((11,12), 'f1');
+ perl_get_rfield 
+-----------------
+              11
+(1 row)
+
+SELECT perl_get_rfield((11,12)::footype, 'y');
+ perl_get_rfield 
+-----------------
+              12
+(1 row)
+
+SELECT perl_get_rfield((11,12)::orderedfootype, 'x');
+ perl_get_rfield 
+-----------------
+              11
+(1 row)
+
+SELECT perl_get_rfield((12,11)::orderedfootype, 'x');  -- fail
+ERROR:  value for domain orderedfootype violates check constraint "orderedfootype_check"
 --
 -- Test return_next
 --
diff --git a/src/pl/plperl/expected/plperl_call.out b/src/pl/plperl/expected/plperl_call.out
new file mode 100644
index 0000000000..4bccfcb7c8
--- /dev/null
+++ b/src/pl/plperl/expected/plperl_call.out
@@ -0,0 +1,29 @@
+CREATE PROCEDURE test_proc1()
+LANGUAGE plperl
+AS $$
+undef;
+$$;
+CALL test_proc1();
+CREATE PROCEDURE test_proc2()
+LANGUAGE plperl
+AS $$
+return 5
+$$;
+CALL test_proc2();
+CREATE TABLE test1 (a int);
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plperl
+AS $$
+spi_exec_query("INSERT INTO test1 VALUES ($_[0])");
+$$;
+CALL test_proc3(55);
+SELECT * FROM test1;
+ a  
+----
+ 55
+(1 row)
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+DROP TABLE test1;
diff --git a/src/pl/plperl/expected/plperl_transaction.out b/src/pl/plperl/expected/plperl_transaction.out
new file mode 100644
index 0000000000..bd7b7f8660
--- /dev/null
+++ b/src/pl/plperl/expected/plperl_transaction.out
@@ -0,0 +1,133 @@
+CREATE TABLE test1 (a int, b text);
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plperl
+AS $$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+$$;
+CALL transaction_test1();
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+DO
+LANGUAGE plperl
+$$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+$$;
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plperl
+AS $$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+return 1;
+$$;
+SELECT transaction_test2();
+ERROR:  invalid transaction termination at line 5.
+CONTEXT:  PL/Perl function "transaction_test2"
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plperl
+AS $$
+spi_exec_query("CALL transaction_test1()");
+return 1;
+$$;
+SELECT transaction_test3();
+ERROR:  invalid transaction termination at line 5. at line 2.
+CONTEXT:  PL/Perl function "transaction_test3"
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plperl
+AS $$
+spi_exec_query('DO LANGUAGE plperl $x$ spi_commit(); $x$');
+return 1;
+$$;
+SELECT transaction_test4();
+ERROR:  invalid transaction termination at line 1. at line 2.
+CONTEXT:  PL/Perl function "transaction_test4"
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+TRUNCATE test1;
+DO LANGUAGE plperl $$
+my $sth = spi_query("SELECT * FROM test2 ORDER BY x");
+my $row;
+while (defined($row = spi_fetchrow($sth))) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES (" . $row->{x} . ")");
+    spi_commit();
+}
+$$;
+ERROR:  cannot commit transaction while a cursor is open at line 6.
+CONTEXT:  PL/Perl anonymous code block
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+DO LANGUAGE plperl $$
+my $sth = spi_query("SELECT * FROM test2 ORDER BY x");
+my $row;
+while (defined($row = spi_fetchrow($sth))) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES (" . $row->{x} . ")");
+    spi_rollback();
+}
+$$;
+ERROR:  cannot abort transaction while a cursor is open at line 6.
+CONTEXT:  PL/Perl anonymous code block
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/pl/plperl/expected/plperl_util.out b/src/pl/plperl/expected/plperl_util.out
index 7cd027f33e..698a8a17fe 100644
--- a/src/pl/plperl/expected/plperl_util.out
+++ b/src/pl/plperl/expected/plperl_util.out
@@ -172,11 +172,13 @@ select perl_looks_like_number();
 -- test encode_typed_literal
 create type perl_foo as (a integer, b text[]);
 create type perl_bar as (c perl_foo[]);
+create domain perl_foo_pos as perl_foo check((value).a > 0);
 create or replace function perl_encode_typed_literal() returns setof text language plperl as $$
 	return_next encode_typed_literal(undef, 'text');
 	return_next encode_typed_literal([[1,2,3],[3,2,1],[1,3,2]], 'integer[]');
 	return_next encode_typed_literal({a => 1, b => ['PL','/','Perl']}, 'perl_foo');
 	return_next encode_typed_literal({c => [{a => 9, b => ['PostgreSQL']}, {b => ['Postgres'], a => 1}]}, 'perl_bar');
+	return_next encode_typed_literal({a => 1, b => ['PL','/','Perl']}, 'perl_foo_pos');
 $$;
 select perl_encode_typed_literal();
            perl_encode_typed_literal           
@@ -185,5 +187,12 @@ select perl_encode_typed_literal();
  {{1,2,3},{3,2,1},{1,3,2}}
  (1,"{PL,/,Perl}")
  ("{""(9,{PostgreSQL})"",""(1,{Postgres})""}")
-(4 rows)
+ (1,"{PL,/,Perl}")
+(5 rows)
 
+create or replace function perl_encode_typed_literal() returns setof text language plperl as $$
+	return_next encode_typed_literal({a => 0, b => ['PL','/','Perl']}, 'perl_foo_pos');
+$$;
+select perl_encode_typed_literal();  -- fail
+ERROR:  value for domain perl_foo_pos violates check constraint "perl_foo_pos_check"
+CONTEXT:  PL/Perl function "perl_encode_typed_literal"
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
index afebec910d..77c41b2821 100644
--- a/src/pl/plperl/plperl.c
+++ b/src/pl/plperl/plperl.c
@@ -179,8 +179,11 @@ typedef struct plperl_call_data
 {
 	plperl_proc_desc *prodesc;
 	FunctionCallInfo fcinfo;
+	/* remaining fields are used only in a function returning set: */
 	Tuplestorestate *tuple_store;
 	TupleDesc	ret_tdesc;
+	Oid			cdomain_oid;	/* 0 unless returning domain-over-composite */
+	void	   *cdomain_info;
 	MemoryContext tmp_cxt;
 } plperl_call_data;
 
@@ -290,7 +293,7 @@ static void plperl_return_next_internal(SV *sv);
 static char *hek2cstr(HE *he);
 static SV **hv_store_string(HV *hv, const char *key, SV *val);
 static SV **hv_fetch_string(HV *hv, const char *key);
-static void plperl_create_sub(plperl_proc_desc *desc, char *s, Oid fn_oid);
+static void plperl_create_sub(plperl_proc_desc *desc, const char *s, Oid fn_oid);
 static SV  *plperl_call_perl_func(plperl_proc_desc *desc,
 					  FunctionCallInfo fcinfo);
 static void plperl_compile_callback(void *arg);
@@ -1095,6 +1098,7 @@ plperl_build_tuple_result(HV *perlhash, TupleDesc td)
 		SV		   *val = HeVAL(he);
 		char	   *key = hek2cstr(he);
 		int			attn = SPI_fnumber(td, key);
+		Form_pg_attribute attr = TupleDescAttr(td, attn - 1);
 
 		if (attn == SPI_ERROR_NOATTRIBUTE)
 			ereport(ERROR,
@@ -1108,8 +1112,8 @@ plperl_build_tuple_result(HV *perlhash, TupleDesc td)
 							key)));
 
 		values[attn - 1] = plperl_sv_to_datum(val,
-											  td->attrs[attn - 1]->atttypid,
-											  td->attrs[attn - 1]->atttypmod,
+											  attr->atttypid,
+											  attr->atttypmod,
 											  NULL,
 											  NULL,
 											  InvalidOid,
@@ -1355,6 +1359,7 @@ plperl_sv_to_datum(SV *sv, Oid typid, int32 typmod,
 			/* handle a hashref */
 			Datum		ret;
 			TupleDesc	td;
+			bool		isdomain;
 
 			if (!type_is_rowtype(typid))
 				ereport(ERROR,
@@ -1362,20 +1367,36 @@ plperl_sv_to_datum(SV *sv, Oid typid, int32 typmod,
 						 errmsg("cannot convert Perl hash to non-composite type %s",
 								format_type_be(typid))));
 
-			td = lookup_rowtype_tupdesc_noerror(typid, typmod, true);
-			if (td == NULL)
+			td = lookup_rowtype_tupdesc_domain(typid, typmod, true);
+			if (td != NULL)
 			{
-				/* Try to look it up based on our result type */
-				if (fcinfo == NULL ||
-					get_call_result_type(fcinfo, NULL, &td) != TYPEFUNC_COMPOSITE)
+				/* Did we look through a domain? */
+				isdomain = (typid != td->tdtypeid);
+			}
+			else
+			{
+				/* Must be RECORD, try to resolve based on call info */
+				TypeFuncClass funcclass;
+
+				if (fcinfo)
+					funcclass = get_call_result_type(fcinfo, &typid, &td);
+				else
+					funcclass = TYPEFUNC_OTHER;
+				if (funcclass != TYPEFUNC_COMPOSITE &&
+					funcclass != TYPEFUNC_COMPOSITE_DOMAIN)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("function returning record called in context "
 									"that cannot accept type record")));
+				Assert(td);
+				isdomain = (funcclass == TYPEFUNC_COMPOSITE_DOMAIN);
 			}
 
 			ret = plperl_hash_to_datum(sv, td);
 
+			if (isdomain)
+				domain_check(ret, false, typid, NULL, NULL);
+
 			/* Release on the result of get_call_result_type is harmless */
 			ReleaseTupleDesc(td);
 
@@ -1757,6 +1778,7 @@ plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
 		char	   *key = hek2cstr(he);
 		SV		   *val = HeVAL(he);
 		int			attn = SPI_fnumber(tupdesc, key);
+		Form_pg_attribute attr = TupleDescAttr(tupdesc, attn - 1);
 
 		if (attn == SPI_ERROR_NOATTRIBUTE)
 			ereport(ERROR,
@@ -1770,8 +1792,8 @@ plperl_modify_tuple(HV *hvTD, TriggerData *tdata, HeapTuple otup)
 							key)));
 
 		modvalues[attn - 1] = plperl_sv_to_datum(val,
-												 tupdesc->attrs[attn - 1]->atttypid,
-												 tupdesc->attrs[attn - 1]->atttypmod,
+												 attr->atttypid,
+												 attr->atttypmod,
 												 NULL,
 												 NULL,
 												 InvalidOid,
@@ -1893,7 +1915,7 @@ plperl_inline_handler(PG_FUNCTION_ARGS)
 	desc.fn_retistuple = false;
 	desc.fn_retisset = false;
 	desc.fn_retisarray = false;
-	desc.result_oid = VOIDOID;
+	desc.result_oid = InvalidOid;
 	desc.nargs = 0;
 	desc.reference = NULL;
 
@@ -1907,7 +1929,7 @@ plperl_inline_handler(PG_FUNCTION_ARGS)
 
 		current_call_data = &this_call_data;
 
-		if (SPI_connect() != SPI_OK_CONNECT)
+		if (SPI_connect_ext(codeblock->atomic ? 0 : SPI_OPT_NONATOMIC) != SPI_OK_CONNECT)
 			elog(ERROR, "could not connect to SPI manager");
 
 		select_perl_context(desc.lanpltrusted);
@@ -2061,7 +2083,7 @@ plperlu_validator(PG_FUNCTION_ARGS)
  * supplied in s, and returns a reference to it
  */
 static void
-plperl_create_sub(plperl_proc_desc *prodesc, char *s, Oid fn_oid)
+plperl_create_sub(plperl_proc_desc *prodesc, const char *s, Oid fn_oid)
 {
 	dTHX;
 	dSP;
@@ -2374,13 +2396,18 @@ plperl_call_perl_event_trigger_func(plperl_proc_desc *desc,
 static Datum
 plperl_func_handler(PG_FUNCTION_ARGS)
 {
+	bool		nonatomic;
 	plperl_proc_desc *prodesc;
 	SV		   *perlret;
 	Datum		retval = 0;
 	ReturnSetInfo *rsi;
 	ErrorContextCallback pl_error_context;
 
-	if (SPI_connect() != SPI_OK_CONNECT)
+	nonatomic = fcinfo->context &&
+		IsA(fcinfo->context, CallContext) &&
+		!castNode(CallContext, fcinfo->context)->atomic;
+
+	if (SPI_connect_ext(nonatomic ? SPI_OPT_NONATOMIC : 0) != SPI_OK_CONNECT)
 		elog(ERROR, "could not connect to SPI manager");
 
 	prodesc = compile_plperl_function(fcinfo->flinfo->fn_oid, false, false);
@@ -2399,8 +2426,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 	{
 		/* Check context before allowing the call to go through */
 		if (!rsi || !IsA(rsi, ReturnSetInfo) ||
-			(rsi->allowedModes & SFRM_Materialize) == 0 ||
-			rsi->expectedDesc == NULL)
+			(rsi->allowedModes & SFRM_Materialize) == 0)
 			ereport(ERROR,
 					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 					 errmsg("set-valued function called in context that "
@@ -2460,7 +2486,7 @@ plperl_func_handler(PG_FUNCTION_ARGS)
 		}
 		retval = (Datum) 0;
 	}
-	else
+	else if (prodesc->result_oid)
 	{
 		retval = plperl_sv_to_datum(perlret,
 									prodesc->result_oid,
@@ -2756,9 +2782,10 @@ compile_plperl_function(Oid fn_oid, bool is_trigger, bool is_event_trigger)
 		/************************************************************
 		 * Allocate a context that will hold all PG data for the procedure.
 		 ************************************************************/
-		proc_cxt = AllocSetContextCreate(TopMemoryContext,
-										 NameStr(procStruct->proname),
-										 ALLOCSET_SMALL_SIZES);
+		proc_cxt = AllocSetContextCreateExtended(TopMemoryContext,
+												 NameStr(procStruct->proname),
+												 MEMCONTEXT_COPY_NAME,
+												 ALLOCSET_SMALL_SIZES);
 
 		/************************************************************
 		 * Allocate and fill a new procedure description block.
@@ -2805,24 +2832,23 @@ compile_plperl_function(Oid fn_oid, bool is_trigger, bool is_event_trigger)
 		 * Get the required information for input conversion of the
 		 * return value.
 		 ************************************************************/
-		if (!is_trigger && !is_event_trigger)
+		if (!is_trigger && !is_event_trigger && procStruct->prorettype)
 		{
-			typeTup =
-				SearchSysCache1(TYPEOID,
-								ObjectIdGetDatum(procStruct->prorettype));
+			Oid			rettype = procStruct->prorettype;
+
+			typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettype));
 			if (!HeapTupleIsValid(typeTup))
-				elog(ERROR, "cache lookup failed for type %u",
-					 procStruct->prorettype);
+				elog(ERROR, "cache lookup failed for type %u", rettype);
 			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			/* Disallow pseudotype result, except VOID or RECORD */
 			if (typeStruct->typtype == TYPTYPE_PSEUDO)
 			{
-				if (procStruct->prorettype == VOIDOID ||
-					procStruct->prorettype == RECORDOID)
+				if (rettype == VOIDOID ||
+					rettype == RECORDOID)
 					 /* okay */ ;
-				else if (procStruct->prorettype == TRIGGEROID ||
-						 procStruct->prorettype == EVTTRIGGEROID)
+				else if (rettype == TRIGGEROID ||
+						 rettype == EVTTRIGGEROID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("trigger functions can only be called "
@@ -2831,13 +2857,12 @@ compile_plperl_function(Oid fn_oid, bool is_trigger, bool is_event_trigger)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Perl functions cannot return type %s",
-									format_type_be(procStruct->prorettype))));
+									format_type_be(rettype))));
 			}
 
-			prodesc->result_oid = procStruct->prorettype;
+			prodesc->result_oid = rettype;
 			prodesc->fn_retisset = procStruct->proretset;
-			prodesc->fn_retistuple = (procStruct->prorettype == RECORDOID ||
-									  typeStruct->typtype == TYPTYPE_COMPOSITE);
+			prodesc->fn_retistuple = type_is_rowtype(rettype);
 
 			prodesc->fn_retisarray =
 				(typeStruct->typlen == -1 && typeStruct->typelem);
@@ -2860,23 +2885,22 @@ compile_plperl_function(Oid fn_oid, bool is_trigger, bool is_event_trigger)
 
 			for (i = 0; i < prodesc->nargs; i++)
 			{
-				typeTup = SearchSysCache1(TYPEOID,
-										  ObjectIdGetDatum(procStruct->proargtypes.values[i]));
+				Oid			argtype = procStruct->proargtypes.values[i];
+
+				typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(argtype));
 				if (!HeapTupleIsValid(typeTup))
-					elog(ERROR, "cache lookup failed for type %u",
-						 procStruct->proargtypes.values[i]);
+					elog(ERROR, "cache lookup failed for type %u", argtype);
 				typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
-				/* Disallow pseudotype argument */
+				/* Disallow pseudotype argument, except RECORD */
 				if (typeStruct->typtype == TYPTYPE_PSEUDO &&
-					procStruct->proargtypes.values[i] != RECORDOID)
+					argtype != RECORDOID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Perl functions cannot accept type %s",
-									format_type_be(procStruct->proargtypes.values[i]))));
+									format_type_be(argtype))));
 
-				if (typeStruct->typtype == TYPTYPE_COMPOSITE ||
-					procStruct->proargtypes.values[i] == RECORDOID)
+				if (type_is_rowtype(argtype))
 					prodesc->arg_is_rowtype[i] = true;
 				else
 				{
@@ -2886,9 +2910,9 @@ compile_plperl_function(Oid fn_oid, bool is_trigger, bool is_event_trigger)
 								  proc_cxt);
 				}
 
-				/* Identify array attributes */
+				/* Identify array-type arguments */
 				if (typeStruct->typelem != 0 && typeStruct->typlen == -1)
-					prodesc->arg_arraytype[i] = procStruct->proargtypes.values[i];
+					prodesc->arg_arraytype[i] = argtype;
 				else
 					prodesc->arg_arraytype[i] = InvalidOid;
 
@@ -3014,11 +3038,12 @@ plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)
 					typisvarlena;
 		char	   *attname;
 		Oid			typoutput;
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
 
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
-		attname = NameStr(tupdesc->attrs[i]->attname);
+		attname = NameStr(att->attname);
 		attr = heap_getattr(tuple, i + 1, tupdesc, &isnull);
 
 		if (isnull)
@@ -3032,7 +3057,7 @@ plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)
 			continue;
 		}
 
-		if (type_is_rowtype(tupdesc->attrs[i]->atttypid))
+		if (type_is_rowtype(att->atttypid))
 		{
 			SV		   *sv = plperl_hash_from_datum(attr);
 
@@ -3043,17 +3068,16 @@ plperl_hash_from_tuple(HeapTuple tuple, TupleDesc tupdesc)
 			SV		   *sv;
 			Oid			funcid;
 
-			if (OidIsValid(get_base_element_type(tupdesc->attrs[i]->atttypid)))
-				sv = plperl_ref_from_pg_array(attr, tupdesc->attrs[i]->atttypid);
-			else if ((funcid = get_transform_fromsql(tupdesc->attrs[i]->atttypid, current_call_data->prodesc->lang_oid, current_call_data->prodesc->trftypes)))
+			if (OidIsValid(get_base_element_type(att->atttypid)))
+				sv = plperl_ref_from_pg_array(attr, att->atttypid);
+			else if ((funcid = get_transform_fromsql(att->atttypid, current_call_data->prodesc->lang_oid, current_call_data->prodesc->trftypes)))
 				sv = (SV *) DatumGetPointer(OidFunctionCall1(funcid, attr));
 			else
 			{
 				char	   *outputstr;
 
 				/* XXX should have a way to cache these lookups */
-				getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
-								  &typoutput, &typisvarlena);
+				getTypeOutputInfo(att->atttypid, &typoutput, &typisvarlena);
 
 				outputstr = OidOutputFunctionCall(typoutput, attr);
 				sv = cstr2sv(outputstr);
@@ -3247,11 +3271,25 @@ plperl_return_next_internal(SV *sv)
 
 		/*
 		 * This is the first call to return_next in the current PL/Perl
-		 * function call, so identify the output tuple descriptor and create a
+		 * function call, so identify the output tuple type and create a
 		 * tuplestore to hold the result rows.
 		 */
 		if (prodesc->fn_retistuple)
-			(void) get_call_result_type(fcinfo, NULL, &tupdesc);
+		{
+			TypeFuncClass funcclass;
+			Oid			typid;
+
+			funcclass = get_call_result_type(fcinfo, &typid, &tupdesc);
+			if (funcclass != TYPEFUNC_COMPOSITE &&
+				funcclass != TYPEFUNC_COMPOSITE_DOMAIN)
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("function returning record called in context "
+								"that cannot accept type record")));
+			/* if domain-over-composite, remember the domain's type OID */
+			if (funcclass == TYPEFUNC_COMPOSITE_DOMAIN)
+				current_call_data->cdomain_oid = typid;
+		}
 		else
 		{
 			tupdesc = rsi->expectedDesc;
@@ -3302,9 +3340,16 @@ plperl_return_next_internal(SV *sv)
 
 		tuple = plperl_build_tuple_result((HV *) SvRV(sv),
 										  current_call_data->ret_tdesc);
+
+		if (OidIsValid(current_call_data->cdomain_oid))
+			domain_check(HeapTupleGetDatum(tuple), false,
+						 current_call_data->cdomain_oid,
+						 &current_call_data->cdomain_info,
+						 rsi->econtext->ecxt_per_query_memory);
+
 		tuplestore_puttuple(current_call_data->tuple_store, tuple);
 	}
-	else
+	else if (prodesc->result_oid)
 	{
 		Datum		ret[1];
 		bool		isNull[1];
@@ -3366,6 +3411,8 @@ plperl_spi_query(char *query)
 				 SPI_result_code_string(SPI_result));
 		cursor = cstr2sv(portal->name);
 
+		PinPortal(portal);
+
 		/* Commit the inner transaction, return to outer xact context */
 		ReleaseCurrentSubTransaction();
 		MemoryContextSwitchTo(oldcontext);
@@ -3429,6 +3476,7 @@ plperl_spi_fetchrow(char *cursor)
 			SPI_cursor_fetch(p, true, 1);
 			if (SPI_processed == 0)
 			{
+				UnpinPortal(p);
 				SPI_cursor_close(p);
 				row = &PL_sv_undef;
 			}
@@ -3480,7 +3528,10 @@ plperl_spi_cursor_close(char *cursor)
 	p = SPI_cursor_find(cursor);
 
 	if (p)
+	{
+		UnpinPortal(p);
 		SPI_cursor_close(p);
+	}
 }
 
 SV *
@@ -3844,6 +3895,8 @@ plperl_spi_query_prepared(char *query, int argc, SV **argv)
 
 		cursor = cstr2sv(portal->name);
 
+		PinPortal(portal);
+
 		/* Commit the inner transaction, return to outer xact context */
 		ReleaseCurrentSubTransaction();
 		MemoryContextSwitchTo(oldcontext);
@@ -3905,6 +3958,66 @@ plperl_spi_freeplan(char *query)
 	SPI_freeplan(plan);
 }
 
+void
+plperl_spi_commit(void)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		if (ThereArePinnedPortals())
+			ereport(ERROR,
+					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+					 errmsg("cannot commit transaction while a cursor is open")));
+
+		SPI_commit();
+		SPI_start_transaction();
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Save error info */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		/* Punt the error to Perl */
+		croak_cstr(edata->message);
+	}
+	PG_END_TRY();
+}
+
+void
+plperl_spi_rollback(void)
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		if (ThereArePinnedPortals())
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+					 errmsg("cannot abort transaction while a cursor is open")));
+
+		SPI_rollback();
+		SPI_start_transaction();
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Save error info */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		/* Punt the error to Perl */
+		croak_cstr(edata->message);
+	}
+	PG_END_TRY();
+}
+
 /*
  * Implementation of plperl's elog() function
  *
diff --git a/src/pl/plperl/plperl.h b/src/pl/plperl/plperl.h
index c4e06d089f..6fe7803088 100644
--- a/src/pl/plperl/plperl.h
+++ b/src/pl/plperl/plperl.h
@@ -5,7 +5,7 @@
  *
  * This should be included _AFTER_ postgres.h and system include files
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1995, Regents of the University of California
  *
  * src/pl/plperl/plperl.h
@@ -42,6 +42,14 @@
 #undef vsnprintf
 #endif
 
+/*
+ * ActivePerl 5.18 and later are MinGW-built, and their headers use GCC's
+ * __inline__.  Translate to something MSVC recognizes.
+ */
+#ifdef _MSC_VER
+#define __inline__ inline
+#endif
+
 
 /*
  * Get the basic Perl API.  We use PERL_NO_GET_CONTEXT mode so that our code
@@ -117,6 +125,8 @@ HV		   *plperl_spi_exec_prepared(char *, HV *, int, SV **);
 SV		   *plperl_spi_query_prepared(char *, int, SV **);
 void		plperl_spi_freeplan(char *);
 void		plperl_spi_cursor_close(char *);
+void		plperl_spi_commit(void);
+void		plperl_spi_rollback(void);
 char	   *plperl_sv_to_literal(SV *, char *);
 void		plperl_util_elog(int level, SV *msg);
 
diff --git a/src/pl/plperl/sql/plperl.sql b/src/pl/plperl/sql/plperl.sql
index dc6b169464..c36da0ff04 100644
--- a/src/pl/plperl/sql/plperl.sql
+++ b/src/pl/plperl/sql/plperl.sql
@@ -231,6 +231,38 @@ $$ LANGUAGE plperl;
 
 SELECT * FROM foo_set_bad();
 
+CREATE DOMAIN orderedfootype AS footype CHECK ((VALUE).x <= (VALUE).y);
+
+CREATE OR REPLACE FUNCTION foo_ordered() RETURNS orderedfootype AS $$
+    return {x => 3, y => 4};
+$$ LANGUAGE plperl;
+
+SELECT * FROM foo_ordered();
+
+CREATE OR REPLACE FUNCTION foo_ordered() RETURNS orderedfootype AS $$
+    return {x => 5, y => 4};
+$$ LANGUAGE plperl;
+
+SELECT * FROM foo_ordered();  -- fail
+
+CREATE OR REPLACE FUNCTION foo_ordered_set() RETURNS SETOF orderedfootype AS $$
+return [
+    {x => 3, y => 4},
+    {x => 4, y => 7}
+];
+$$ LANGUAGE plperl;
+
+SELECT * FROM foo_ordered_set();
+
+CREATE OR REPLACE FUNCTION foo_ordered_set() RETURNS SETOF orderedfootype AS $$
+return [
+    {x => 3, y => 4},
+    {x => 9, y => 7}
+];
+$$ LANGUAGE plperl;
+
+SELECT * FROM foo_ordered_set();  -- fail
+
 --
 -- Check passing a tuple argument
 --
@@ -243,6 +275,23 @@ SELECT perl_get_field((11,12), 'x');
 SELECT perl_get_field((11,12), 'y');
 SELECT perl_get_field((11,12), 'z');
 
+CREATE OR REPLACE FUNCTION perl_get_cfield(orderedfootype, text) RETURNS integer AS $$
+    return $_[0]->{$_[1]};
+$$ LANGUAGE plperl;
+
+SELECT perl_get_cfield((11,12), 'x');
+SELECT perl_get_cfield((11,12), 'y');
+SELECT perl_get_cfield((12,11), 'x');  -- fail
+
+CREATE OR REPLACE FUNCTION perl_get_rfield(record, text) RETURNS integer AS $$
+    return $_[0]->{$_[1]};
+$$ LANGUAGE plperl;
+
+SELECT perl_get_rfield((11,12), 'f1');
+SELECT perl_get_rfield((11,12)::footype, 'y');
+SELECT perl_get_rfield((11,12)::orderedfootype, 'x');
+SELECT perl_get_rfield((12,11)::orderedfootype, 'x');  -- fail
+
 --
 -- Test return_next
 --
diff --git a/src/pl/plperl/sql/plperl_call.sql b/src/pl/plperl/sql/plperl_call.sql
new file mode 100644
index 0000000000..bd2b63b418
--- /dev/null
+++ b/src/pl/plperl/sql/plperl_call.sql
@@ -0,0 +1,36 @@
+CREATE PROCEDURE test_proc1()
+LANGUAGE plperl
+AS $$
+undef;
+$$;
+
+CALL test_proc1();
+
+
+CREATE PROCEDURE test_proc2()
+LANGUAGE plperl
+AS $$
+return 5
+$$;
+
+CALL test_proc2();
+
+
+CREATE TABLE test1 (a int);
+
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plperl
+AS $$
+spi_exec_query("INSERT INTO test1 VALUES ($_[0])");
+$$;
+
+CALL test_proc3(55);
+
+SELECT * FROM test1;
+
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+
+DROP TABLE test1;
diff --git a/src/pl/plperl/sql/plperl_transaction.sql b/src/pl/plperl/sql/plperl_transaction.sql
new file mode 100644
index 0000000000..5c14d4732e
--- /dev/null
+++ b/src/pl/plperl/sql/plperl_transaction.sql
@@ -0,0 +1,120 @@
+CREATE TABLE test1 (a int, b text);
+
+
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plperl
+AS $$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+$$;
+
+CALL transaction_test1();
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+DO
+LANGUAGE plperl
+$$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+$$;
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plperl
+AS $$
+foreach my $i (0..9) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES ($i)");
+    if ($i % 2 == 0) {
+        spi_commit();
+    } else {
+        spi_rollback();
+    }
+}
+return 1;
+$$;
+
+SELECT transaction_test2();
+
+SELECT * FROM test1;
+
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plperl
+AS $$
+spi_exec_query("CALL transaction_test1()");
+return 1;
+$$;
+
+SELECT transaction_test3();
+
+SELECT * FROM test1;
+
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plperl
+AS $$
+spi_exec_query('DO LANGUAGE plperl $x$ spi_commit(); $x$');
+return 1;
+$$;
+
+SELECT transaction_test4();
+
+
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+
+TRUNCATE test1;
+
+DO LANGUAGE plperl $$
+my $sth = spi_query("SELECT * FROM test2 ORDER BY x");
+my $row;
+while (defined($row = spi_fetchrow($sth))) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES (" . $row->{x} . ")");
+    spi_commit();
+}
+$$;
+
+SELECT * FROM test1;
+
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+
+DO LANGUAGE plperl $$
+my $sth = spi_query("SELECT * FROM test2 ORDER BY x");
+my $row;
+while (defined($row = spi_fetchrow($sth))) {
+    spi_exec_query("INSERT INTO test1 (a) VALUES (" . $row->{x} . ")");
+    spi_rollback();
+}
+$$;
+
+SELECT * FROM test1;
+
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/pl/plperl/sql/plperl_util.sql b/src/pl/plperl/sql/plperl_util.sql
index 143d047802..5b31605ccd 100644
--- a/src/pl/plperl/sql/plperl_util.sql
+++ b/src/pl/plperl/sql/plperl_util.sql
@@ -102,11 +102,20 @@ select perl_looks_like_number();
 -- test encode_typed_literal
 create type perl_foo as (a integer, b text[]);
 create type perl_bar as (c perl_foo[]);
+create domain perl_foo_pos as perl_foo check((value).a > 0);
+
 create or replace function perl_encode_typed_literal() returns setof text language plperl as $$
 	return_next encode_typed_literal(undef, 'text');
 	return_next encode_typed_literal([[1,2,3],[3,2,1],[1,3,2]], 'integer[]');
 	return_next encode_typed_literal({a => 1, b => ['PL','/','Perl']}, 'perl_foo');
 	return_next encode_typed_literal({c => [{a => 9, b => ['PostgreSQL']}, {b => ['Postgres'], a => 1}]}, 'perl_bar');
+	return_next encode_typed_literal({a => 1, b => ['PL','/','Perl']}, 'perl_foo_pos');
 $$;
 
 select perl_encode_typed_literal();
+
+create or replace function perl_encode_typed_literal() returns setof text language plperl as $$
+	return_next encode_typed_literal({a => 0, b => ['PL','/','Perl']}, 'perl_foo_pos');
+$$;
+
+select perl_encode_typed_literal();  -- fail
diff --git a/src/pl/plperl/text2macro.pl b/src/pl/plperl/text2macro.pl
index e681fca21a..27c6ef7e42 100644
--- a/src/pl/plperl/text2macro.pl
+++ b/src/pl/plperl/text2macro.pl
@@ -40,7 +40,7 @@ =head1 DESCRIPTION
 print qq{
 /*
  * DO NOT EDIT - THIS FILE IS AUTOGENERATED - CHANGES WILL BE LOST
- * Written by $0 from @ARGV
+ * Generated by src/pl/plperl/text2macro.pl
  */
 };
 
diff --git a/src/pl/plpgsql/src/.gitignore b/src/pl/plpgsql/src/.gitignore
index 92387fa3cb..ff6ac965fd 100644
--- a/src/pl/plpgsql/src/.gitignore
+++ b/src/pl/plpgsql/src/.gitignore
@@ -1,3 +1,6 @@
 /pl_gram.c
 /pl_gram.h
 /plerrcodes.h
+/log/
+/results/
+/tmp_check/
diff --git a/src/pl/plpgsql/src/Makefile b/src/pl/plpgsql/src/Makefile
index 95348179ac..fc60618618 100644
--- a/src/pl/plpgsql/src/Makefile
+++ b/src/pl/plpgsql/src/Makefile
@@ -24,6 +24,11 @@ OBJS = pl_gram.o pl_handler.o pl_comp.o pl_exec.o \
 
 DATA = plpgsql.control plpgsql--1.0.sql plpgsql--unpackaged--1.0.sql
 
+REGRESS_OPTS = --dbname=$(PL_TESTDB)
+
+REGRESS = plpgsql_call plpgsql_control plpgsql_domain plpgsql_record \
+	plpgsql_transaction plpgsql_varprops
+
 all: all-lib
 
 # Shared library stuff
@@ -65,12 +70,25 @@ pl_gram.c: BISONFLAGS += -d
 plerrcodes.h: $(top_srcdir)/src/backend/utils/errcodes.txt generate-plerrcodes.pl
 	$(PERL) $(srcdir)/generate-plerrcodes.pl $< > $@
 
+
+check: submake
+	$(pg_regress_check) $(REGRESS_OPTS) $(REGRESS)
+
+installcheck: submake
+	$(pg_regress_installcheck) $(REGRESS_OPTS) $(REGRESS)
+
+.PHONY: submake
+submake:
+	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress$(X)
+
+
 distprep: pl_gram.h pl_gram.c plerrcodes.h
 
 # pl_gram.c, pl_gram.h and plerrcodes.h are in the distribution tarball,
 # so they are not cleaned here.
 clean distclean: clean-lib
 	rm -f $(OBJS)
+	rm -rf $(pg_regress_clean_files)
 
-maintainer-clean: clean
+maintainer-clean: distclean
 	rm -f pl_gram.c pl_gram.h plerrcodes.h
diff --git a/src/pl/plpgsql/src/expected/plpgsql_call.out b/src/pl/plpgsql/src/expected/plpgsql_call.out
new file mode 100644
index 0000000000..e2442c603c
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_call.out
@@ -0,0 +1,60 @@
+--
+-- Tests for procedures / CALL syntax
+--
+CREATE PROCEDURE test_proc1()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    NULL;
+END;
+$$;
+CALL test_proc1();
+-- error: can't return non-NULL
+CREATE PROCEDURE test_proc2()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    RETURN 5;
+END;
+$$;
+CALL test_proc2();
+ERROR:  cannot return a value from a procedure
+CONTEXT:  PL/pgSQL function test_proc2() while casting return value to function's return type
+CREATE TABLE test1 (a int);
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    INSERT INTO test1 VALUES (x);
+END;
+$$;
+CALL test_proc3(55);
+SELECT * FROM test1;
+ a  
+----
+ 55
+(1 row)
+
+-- nested CALL
+TRUNCATE TABLE test1;
+CREATE PROCEDURE test_proc4(y int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    CALL test_proc3(y);
+    CALL test_proc3($1);
+END;
+$$;
+CALL test_proc4(66);
+SELECT * FROM test1;
+ a  
+----
+ 66
+ 66
+(2 rows)
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+DROP PROCEDURE test_proc4;
+DROP TABLE test1;
diff --git a/src/pl/plpgsql/src/expected/plpgsql_control.out b/src/pl/plpgsql/src/expected/plpgsql_control.out
new file mode 100644
index 0000000000..73b23a35e5
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_control.out
@@ -0,0 +1,672 @@
+--
+-- Tests for PL/pgSQL control structures
+--
+-- integer FOR loop
+do $$
+begin
+  -- basic case
+  for i in 1..3 loop
+    raise notice '1..3: i = %', i;
+  end loop;
+  -- with BY, end matches exactly
+  for i in 1..10 by 3 loop
+    raise notice '1..10 by 3: i = %', i;
+  end loop;
+  -- with BY, end does not match
+  for i in 1..11 by 3 loop
+    raise notice '1..11 by 3: i = %', i;
+  end loop;
+  -- zero iterations
+  for i in 1..0 by 3 loop
+    raise notice '1..0 by 3: i = %', i;
+  end loop;
+  -- REVERSE
+  for i in reverse 10..0 by 3 loop
+    raise notice 'reverse 10..0 by 3: i = %', i;
+  end loop;
+  -- potential overflow
+  for i in 2147483620..2147483647 by 10 loop
+    raise notice '2147483620..2147483647 by 10: i = %', i;
+  end loop;
+  -- potential overflow, reverse direction
+  for i in reverse -2147483620..-2147483647 by 10 loop
+    raise notice 'reverse -2147483620..-2147483647 by 10: i = %', i;
+  end loop;
+end$$;
+NOTICE:  1..3: i = 1
+NOTICE:  1..3: i = 2
+NOTICE:  1..3: i = 3
+NOTICE:  1..10 by 3: i = 1
+NOTICE:  1..10 by 3: i = 4
+NOTICE:  1..10 by 3: i = 7
+NOTICE:  1..10 by 3: i = 10
+NOTICE:  1..11 by 3: i = 1
+NOTICE:  1..11 by 3: i = 4
+NOTICE:  1..11 by 3: i = 7
+NOTICE:  1..11 by 3: i = 10
+NOTICE:  reverse 10..0 by 3: i = 10
+NOTICE:  reverse 10..0 by 3: i = 7
+NOTICE:  reverse 10..0 by 3: i = 4
+NOTICE:  reverse 10..0 by 3: i = 1
+NOTICE:  2147483620..2147483647 by 10: i = 2147483620
+NOTICE:  2147483620..2147483647 by 10: i = 2147483630
+NOTICE:  2147483620..2147483647 by 10: i = 2147483640
+NOTICE:  reverse -2147483620..-2147483647 by 10: i = -2147483620
+NOTICE:  reverse -2147483620..-2147483647 by 10: i = -2147483630
+NOTICE:  reverse -2147483620..-2147483647 by 10: i = -2147483640
+-- BY can't be zero or negative
+do $$
+begin
+  for i in 1..3 by 0 loop
+    raise notice '1..3 by 0: i = %', i;
+  end loop;
+end$$;
+ERROR:  BY value of FOR loop must be greater than zero
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at FOR with integer loop variable
+do $$
+begin
+  for i in 1..3 by -1 loop
+    raise notice '1..3 by -1: i = %', i;
+  end loop;
+end$$;
+ERROR:  BY value of FOR loop must be greater than zero
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at FOR with integer loop variable
+do $$
+begin
+  for i in reverse 1..3 by -1 loop
+    raise notice 'reverse 1..3 by -1: i = %', i;
+  end loop;
+end$$;
+ERROR:  BY value of FOR loop must be greater than zero
+CONTEXT:  PL/pgSQL function inline_code_block line 3 at FOR with integer loop variable
+-- CONTINUE statement
+create table conttesttbl(idx serial, v integer);
+insert into conttesttbl(v) values(10);
+insert into conttesttbl(v) values(20);
+insert into conttesttbl(v) values(30);
+insert into conttesttbl(v) values(40);
+create function continue_test1() returns void as $$
+declare _i integer = 0; _r record;
+begin
+  raise notice '---1---';
+  loop
+    _i := _i + 1;
+    raise notice '%', _i;
+    continue when _i < 10;
+    exit;
+  end loop;
+
+  raise notice '---2---';
+  <<lbl>>
+  loop
+    _i := _i - 1;
+    loop
+      raise notice '%', _i;
+      continue lbl when _i > 0;
+      exit lbl;
+    end loop;
+  end loop;
+
+  raise notice '---3---';
+  <<the_loop>>
+  while _i < 10 loop
+    _i := _i + 1;
+    continue the_loop when _i % 2 = 0;
+    raise notice '%', _i;
+  end loop;
+
+  raise notice '---4---';
+  for _i in 1..10 loop
+    begin
+      -- applies to outer loop, not the nested begin block
+      continue when _i < 5;
+      raise notice '%', _i;
+    end;
+  end loop;
+
+  raise notice '---5---';
+  for _r in select * from conttesttbl loop
+    continue when _r.v <= 20;
+    raise notice '%', _r.v;
+  end loop;
+
+  raise notice '---6---';
+  for _r in execute 'select * from conttesttbl' loop
+    continue when _r.v <= 20;
+    raise notice '%', _r.v;
+  end loop;
+
+  raise notice '---7---';
+  <<looplabel>>
+  for _i in 1..3 loop
+    continue looplabel when _i = 2;
+    raise notice '%', _i;
+  end loop;
+
+  raise notice '---8---';
+  _i := 1;
+  while _i <= 3 loop
+    raise notice '%', _i;
+    _i := _i + 1;
+    continue when _i = 3;
+  end loop;
+
+  raise notice '---9---';
+  for _r in select * from conttesttbl order by v limit 1 loop
+    raise notice '%', _r.v;
+    continue;
+  end loop;
+
+  raise notice '---10---';
+  for _r in execute 'select * from conttesttbl order by v limit 1' loop
+    raise notice '%', _r.v;
+    continue;
+  end loop;
+
+  raise notice '---11---';
+  <<outerlooplabel>>
+  for _i in 1..2 loop
+    raise notice 'outer %', _i;
+    <<innerlooplabel>>
+    for _j in 1..3 loop
+      continue outerlooplabel when _j = 2;
+      raise notice 'inner %', _j;
+    end loop;
+  end loop;
+end; $$ language plpgsql;
+select continue_test1();
+NOTICE:  ---1---
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+NOTICE:  4
+NOTICE:  5
+NOTICE:  6
+NOTICE:  7
+NOTICE:  8
+NOTICE:  9
+NOTICE:  10
+NOTICE:  ---2---
+NOTICE:  9
+NOTICE:  8
+NOTICE:  7
+NOTICE:  6
+NOTICE:  5
+NOTICE:  4
+NOTICE:  3
+NOTICE:  2
+NOTICE:  1
+NOTICE:  0
+NOTICE:  ---3---
+NOTICE:  1
+NOTICE:  3
+NOTICE:  5
+NOTICE:  7
+NOTICE:  9
+NOTICE:  ---4---
+NOTICE:  5
+NOTICE:  6
+NOTICE:  7
+NOTICE:  8
+NOTICE:  9
+NOTICE:  10
+NOTICE:  ---5---
+NOTICE:  30
+NOTICE:  40
+NOTICE:  ---6---
+NOTICE:  30
+NOTICE:  40
+NOTICE:  ---7---
+NOTICE:  1
+NOTICE:  3
+NOTICE:  ---8---
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+NOTICE:  ---9---
+NOTICE:  10
+NOTICE:  ---10---
+NOTICE:  10
+NOTICE:  ---11---
+NOTICE:  outer 1
+NOTICE:  inner 1
+NOTICE:  outer 2
+NOTICE:  inner 1
+ continue_test1 
+----------------
+ 
+(1 row)
+
+-- should fail: CONTINUE is only legal inside a loop
+create function continue_error1() returns void as $$
+begin
+    begin
+        continue;
+    end;
+end;
+$$ language plpgsql;
+ERROR:  CONTINUE cannot be used outside a loop
+LINE 4:         continue;
+                ^
+-- should fail: unlabeled EXIT is only legal inside a loop
+create function exit_error1() returns void as $$
+begin
+    begin
+        exit;
+    end;
+end;
+$$ language plpgsql;
+ERROR:  EXIT cannot be used outside a loop, unless it has a label
+LINE 4:         exit;
+                ^
+-- should fail: no such label
+create function continue_error2() returns void as $$
+begin
+    begin
+        loop
+            continue no_such_label;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
+LINE 5:             continue no_such_label;
+                             ^
+-- should fail: no such label
+create function exit_error2() returns void as $$
+begin
+    begin
+        loop
+            exit no_such_label;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
+LINE 5:             exit no_such_label;
+                         ^
+-- should fail: CONTINUE can't reference the label of a named block
+create function continue_error3() returns void as $$
+begin
+    <<begin_block1>>
+    begin
+        loop
+            continue begin_block1;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+ERROR:  block label "begin_block1" cannot be used in CONTINUE
+LINE 6:             continue begin_block1;
+                             ^
+-- On the other hand, EXIT *can* reference the label of a named block
+create function exit_block1() returns void as $$
+begin
+    <<begin_block1>>
+    begin
+        loop
+            exit begin_block1;
+            raise exception 'should not get here';
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+select exit_block1();
+ exit_block1 
+-------------
+ 
+(1 row)
+
+-- verbose end block and end loop
+create function end_label1() returns void as $$
+<<blbl>>
+begin
+  <<flbl1>>
+  for i in 1 .. 10 loop
+    raise notice 'i = %', i;
+    exit flbl1;
+  end loop flbl1;
+  <<flbl2>>
+  for j in 1 .. 10 loop
+    raise notice 'j = %', j;
+    exit flbl2;
+  end loop;
+end blbl;
+$$ language plpgsql;
+select end_label1();
+NOTICE:  i = 1
+NOTICE:  j = 1
+ end_label1 
+------------
+ 
+(1 row)
+
+-- should fail: undefined end label
+create function end_label2() returns void as $$
+begin
+  for _i in 1 .. 10 loop
+    exit;
+  end loop flbl1;
+end;
+$$ language plpgsql;
+ERROR:  end label "flbl1" specified for unlabelled block
+LINE 5:   end loop flbl1;
+                   ^
+-- should fail: end label does not match start label
+create function end_label3() returns void as $$
+<<outer_label>>
+begin
+  <<inner_label>>
+  for _i in 1 .. 10 loop
+    exit;
+  end loop outer_label;
+end;
+$$ language plpgsql;
+ERROR:  end label "outer_label" differs from block's label "inner_label"
+LINE 7:   end loop outer_label;
+                   ^
+-- should fail: end label on a block without a start label
+create function end_label4() returns void as $$
+<<outer_label>>
+begin
+  for _i in 1 .. 10 loop
+    exit;
+  end loop outer_label;
+end;
+$$ language plpgsql;
+ERROR:  end label "outer_label" specified for unlabelled block
+LINE 6:   end loop outer_label;
+                   ^
+-- unlabeled exit matches no blocks
+do $$
+begin
+for i in 1..10 loop
+  <<innerblock>>
+  begin
+    begin  -- unlabeled block
+      exit;
+      raise notice 'should not get here';
+    end;
+    raise notice 'should not get here, either';
+  end;
+  raise notice 'nor here';
+end loop;
+raise notice 'should get here';
+end$$;
+NOTICE:  should get here
+-- check exit out of an unlabeled block to a labeled one
+do $$
+<<outerblock>>
+begin
+  <<innerblock>>
+  begin
+    <<moreinnerblock>>
+    begin
+      begin  -- unlabeled block
+        exit innerblock;
+        raise notice 'should not get here';
+      end;
+      raise notice 'should not get here, either';
+    end;
+    raise notice 'nor here';
+  end;
+  raise notice 'should get here';
+end$$;
+NOTICE:  should get here
+-- unlabeled exit does match a while loop
+do $$
+begin
+  <<outermostwhile>>
+  while 1 > 0 loop
+    <<outerwhile>>
+    while 1 > 0 loop
+      <<innerwhile>>
+      while 1 > 0 loop
+        exit;
+        raise notice 'should not get here';
+      end loop;
+      raise notice 'should get here';
+      exit outermostwhile;
+      raise notice 'should not get here, either';
+    end loop;
+    raise notice 'nor here';
+  end loop;
+  raise notice 'should get here, too';
+end$$;
+NOTICE:  should get here
+NOTICE:  should get here, too
+-- check exit out of an unlabeled while to a labeled one
+do $$
+begin
+  <<outerwhile>>
+  while 1 > 0 loop
+    while 1 > 0 loop
+      exit outerwhile;
+      raise notice 'should not get here';
+    end loop;
+    raise notice 'should not get here, either';
+  end loop;
+  raise notice 'should get here';
+end$$;
+NOTICE:  should get here
+-- continue to an outer while
+do $$
+declare i int := 0;
+begin
+  <<outermostwhile>>
+  while i < 2 loop
+    raise notice 'outermostwhile, i = %', i;
+    i := i + 1;
+    <<outerwhile>>
+    while 1 > 0 loop
+      <<innerwhile>>
+      while 1 > 0 loop
+        continue outermostwhile;
+        raise notice 'should not get here';
+      end loop;
+      raise notice 'should not get here, either';
+    end loop;
+    raise notice 'nor here';
+  end loop;
+  raise notice 'out of outermostwhile, i = %', i;
+end$$;
+NOTICE:  outermostwhile, i = 0
+NOTICE:  outermostwhile, i = 1
+NOTICE:  out of outermostwhile, i = 2
+-- return out of a while
+create function return_from_while() returns int language plpgsql as $$
+declare i int := 0;
+begin
+  while i < 10 loop
+    if i > 2 then
+      return i;
+    end if;
+    i := i + 1;
+  end loop;
+  return null;
+end$$;
+select return_from_while();
+ return_from_while 
+-------------------
+                 3
+(1 row)
+
+-- using list of scalars in fori and fore stmts
+create function for_vect() returns void as $proc$
+<<lbl>>declare a integer; b varchar; c varchar; r record;
+begin
+  -- fori
+  for i in 1 .. 3 loop
+    raise notice '%', i;
+  end loop;
+  -- fore with record var
+  for r in select gs as aa, 'BB' as bb, 'CC' as cc from generate_series(1,4) gs loop
+    raise notice '% % %', r.aa, r.bb, r.cc;
+  end loop;
+  -- fore with single scalar
+  for a in select gs from generate_series(1,4) gs loop
+    raise notice '%', a;
+  end loop;
+  -- fore with multiple scalars
+  for a,b,c in select gs, 'BB','CC' from generate_series(1,4) gs loop
+    raise notice '% % %', a, b, c;
+  end loop;
+  -- using qualified names in fors, fore is enabled, disabled only for fori
+  for lbl.a, lbl.b, lbl.c in execute $$select gs, 'bb','cc' from generate_series(1,4) gs$$ loop
+    raise notice '% % %', a, b, c;
+  end loop;
+end;
+$proc$ language plpgsql;
+select for_vect();
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+NOTICE:  1 BB CC
+NOTICE:  2 BB CC
+NOTICE:  3 BB CC
+NOTICE:  4 BB CC
+NOTICE:  1
+NOTICE:  2
+NOTICE:  3
+NOTICE:  4
+NOTICE:  1 BB CC
+NOTICE:  2 BB CC
+NOTICE:  3 BB CC
+NOTICE:  4 BB CC
+NOTICE:  1 bb cc
+NOTICE:  2 bb cc
+NOTICE:  3 bb cc
+NOTICE:  4 bb cc
+ for_vect 
+----------
+ 
+(1 row)
+
+-- CASE statement
+create or replace function case_test(bigint) returns text as $$
+declare a int = 10;
+        b int = 1;
+begin
+  case $1
+    when 1 then
+      return 'one';
+    when 2 then
+      return 'two';
+    when 3,4,3+5 then
+      return 'three, four or eight';
+    when a then
+      return 'ten';
+    when a+b, a+b+1 then
+      return 'eleven, twelve';
+  end case;
+end;
+$$ language plpgsql immutable;
+select case_test(1);
+ case_test 
+-----------
+ one
+(1 row)
+
+select case_test(2);
+ case_test 
+-----------
+ two
+(1 row)
+
+select case_test(3);
+      case_test       
+----------------------
+ three, four or eight
+(1 row)
+
+select case_test(4);
+      case_test       
+----------------------
+ three, four or eight
+(1 row)
+
+select case_test(5); -- fails
+ERROR:  case not found
+HINT:  CASE statement is missing ELSE part.
+CONTEXT:  PL/pgSQL function case_test(bigint) line 5 at CASE
+select case_test(8);
+      case_test       
+----------------------
+ three, four or eight
+(1 row)
+
+select case_test(10);
+ case_test 
+-----------
+ ten
+(1 row)
+
+select case_test(11);
+   case_test    
+----------------
+ eleven, twelve
+(1 row)
+
+select case_test(12);
+   case_test    
+----------------
+ eleven, twelve
+(1 row)
+
+select case_test(13); -- fails
+ERROR:  case not found
+HINT:  CASE statement is missing ELSE part.
+CONTEXT:  PL/pgSQL function case_test(bigint) line 5 at CASE
+create or replace function catch() returns void as $$
+begin
+  raise notice '%', case_test(6);
+exception
+  when case_not_found then
+    raise notice 'caught case_not_found % %', SQLSTATE, SQLERRM;
+end
+$$ language plpgsql;
+select catch();
+NOTICE:  caught case_not_found 20000 case not found
+ catch 
+-------
+ 
+(1 row)
+
+-- test the searched variant too, as well as ELSE
+create or replace function case_test(bigint) returns text as $$
+declare a int = 10;
+begin
+  case
+    when $1 = 1 then
+      return 'one';
+    when $1 = a + 2 then
+      return 'twelve';
+    else
+      return 'other';
+  end case;
+end;
+$$ language plpgsql immutable;
+select case_test(1);
+ case_test 
+-----------
+ one
+(1 row)
+
+select case_test(2);
+ case_test 
+-----------
+ other
+(1 row)
+
+select case_test(12);
+ case_test 
+-----------
+ twelve
+(1 row)
+
+select case_test(13);
+ case_test 
+-----------
+ other
+(1 row)
+
diff --git a/src/pl/plpgsql/src/expected/plpgsql_domain.out b/src/pl/plpgsql/src/expected/plpgsql_domain.out
new file mode 100644
index 0000000000..efc877cdd1
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_domain.out
@@ -0,0 +1,397 @@
+--
+-- Tests for PL/pgSQL's behavior with domain types
+--
+CREATE DOMAIN booltrue AS bool CHECK (VALUE IS TRUE OR VALUE IS NULL);
+CREATE FUNCTION test_argresult_booltrue(x booltrue, y bool) RETURNS booltrue AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_argresult_booltrue(true, true);
+ test_argresult_booltrue 
+-------------------------
+ t
+(1 row)
+
+SELECT * FROM test_argresult_booltrue(false, true);
+ERROR:  value for domain booltrue violates check constraint "booltrue_check"
+SELECT * FROM test_argresult_booltrue(true, false);
+ERROR:  value for domain booltrue violates check constraint "booltrue_check"
+CONTEXT:  PL/pgSQL function test_argresult_booltrue(booltrue,boolean) while casting return value to function's return type
+CREATE FUNCTION test_assign_booltrue(x bool, y bool) RETURNS booltrue AS $$
+declare v booltrue := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_booltrue(true, true);
+ test_assign_booltrue 
+----------------------
+ t
+(1 row)
+
+SELECT * FROM test_assign_booltrue(false, true);
+ERROR:  value for domain booltrue violates check constraint "booltrue_check"
+CONTEXT:  PL/pgSQL function test_assign_booltrue(boolean,boolean) line 3 during statement block local variable initialization
+SELECT * FROM test_assign_booltrue(true, false);
+ERROR:  value for domain booltrue violates check constraint "booltrue_check"
+CONTEXT:  PL/pgSQL function test_assign_booltrue(boolean,boolean) line 4 at assignment
+CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
+CREATE FUNCTION test_argresult_uint2(x uint2, y int) RETURNS uint2 AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_argresult_uint2(100::uint2, 50);
+ test_argresult_uint2 
+----------------------
+                   50
+(1 row)
+
+SELECT * FROM test_argresult_uint2(100::uint2, -50);
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  PL/pgSQL function test_argresult_uint2(uint2,integer) while casting return value to function's return type
+SELECT * FROM test_argresult_uint2(null, 1);
+ test_argresult_uint2 
+----------------------
+                    1
+(1 row)
+
+CREATE FUNCTION test_assign_uint2(x int, y int) RETURNS uint2 AS $$
+declare v uint2 := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_uint2(100, 50);
+ test_assign_uint2 
+-------------------
+                50
+(1 row)
+
+SELECT * FROM test_assign_uint2(100, -50);
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  PL/pgSQL function test_assign_uint2(integer,integer) line 4 at assignment
+SELECT * FROM test_assign_uint2(-100, 50);
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  PL/pgSQL function test_assign_uint2(integer,integer) line 3 during statement block local variable initialization
+SELECT * FROM test_assign_uint2(null, 1);
+ test_assign_uint2 
+-------------------
+                 1
+(1 row)
+
+CREATE DOMAIN nnint AS int NOT NULL;
+CREATE FUNCTION test_argresult_nnint(x nnint, y int) RETURNS nnint AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_argresult_nnint(10, 20);
+ test_argresult_nnint 
+----------------------
+                   20
+(1 row)
+
+SELECT * FROM test_argresult_nnint(null, 20);
+ERROR:  domain nnint does not allow null values
+SELECT * FROM test_argresult_nnint(10, null);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_argresult_nnint(nnint,integer) while casting return value to function's return type
+CREATE FUNCTION test_assign_nnint(x int, y int) RETURNS nnint AS $$
+declare v nnint := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_nnint(10, 20);
+ test_assign_nnint 
+-------------------
+                20
+(1 row)
+
+SELECT * FROM test_assign_nnint(null, 20);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_assign_nnint(integer,integer) line 3 during statement block local variable initialization
+SELECT * FROM test_assign_nnint(10, null);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_assign_nnint(integer,integer) line 4 at assignment
+--
+-- Domains over arrays
+--
+CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
+CREATE FUNCTION test_argresult_array_domain(x ordered_pair_domain)
+  RETURNS ordered_pair_domain AS $$
+begin
+return x;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_argresult_array_domain(ARRAY[0, 100]::ordered_pair_domain);
+ test_argresult_array_domain 
+-----------------------------
+ {0,100}
+(1 row)
+
+SELECT * FROM test_argresult_array_domain(NULL::ordered_pair_domain);
+ test_argresult_array_domain 
+-----------------------------
+ 
+(1 row)
+
+CREATE FUNCTION test_argresult_array_domain_check_violation()
+  RETURNS ordered_pair_domain AS $$
+begin
+return array[2,1];
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_argresult_array_domain_check_violation();
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CONTEXT:  PL/pgSQL function test_argresult_array_domain_check_violation() while casting return value to function's return type
+CREATE FUNCTION test_assign_ordered_pair_domain(x int, y int, z int) RETURNS ordered_pair_domain AS $$
+declare v ordered_pair_domain := array[x, y];
+begin
+v[2] := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_ordered_pair_domain(1,2,3);
+ test_assign_ordered_pair_domain 
+---------------------------------
+ {1,3}
+(1 row)
+
+SELECT * FROM test_assign_ordered_pair_domain(1,2,0);
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CONTEXT:  PL/pgSQL function test_assign_ordered_pair_domain(integer,integer,integer) line 4 at assignment
+SELECT * FROM test_assign_ordered_pair_domain(2,1,3);
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CONTEXT:  PL/pgSQL function test_assign_ordered_pair_domain(integer,integer,integer) line 3 during statement block local variable initialization
+--
+-- Arrays of domains
+--
+CREATE FUNCTION test_read_uint2_array(x uint2[]) RETURNS uint2 AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+select test_read_uint2_array(array[1::uint2]);
+ test_read_uint2_array 
+-----------------------
+                     1
+(1 row)
+
+CREATE FUNCTION test_build_uint2_array(x int2) RETURNS uint2[] AS $$
+begin
+return array[x, x];
+end
+$$ LANGUAGE plpgsql;
+select test_build_uint2_array(1::int2);
+ test_build_uint2_array 
+------------------------
+ {1,1}
+(1 row)
+
+select test_build_uint2_array(-1::int2);  -- fail
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  PL/pgSQL function test_build_uint2_array(smallint) while casting return value to function's return type
+CREATE FUNCTION test_argresult_domain_array(x integer[])
+  RETURNS ordered_pair_domain[] AS $$
+begin
+return array[x::ordered_pair_domain, x::ordered_pair_domain];
+end
+$$ LANGUAGE plpgsql;
+select test_argresult_domain_array(array[2,4]);
+ test_argresult_domain_array 
+-----------------------------
+ {"{2,4}","{2,4}"}
+(1 row)
+
+select test_argresult_domain_array(array[4,2]);  -- fail
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CONTEXT:  PL/pgSQL function test_argresult_domain_array(integer[]) line 3 at RETURN
+CREATE FUNCTION test_argresult_domain_array2(x ordered_pair_domain)
+  RETURNS integer AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+select test_argresult_domain_array2(array[2,4]);
+ test_argresult_domain_array2 
+------------------------------
+                            2
+(1 row)
+
+select test_argresult_domain_array2(array[4,2]);  -- fail
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CREATE FUNCTION test_argresult_array_domain_array(x ordered_pair_domain[])
+  RETURNS ordered_pair_domain AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+select test_argresult_array_domain_array(array[array[2,4]::ordered_pair_domain]);
+ test_argresult_array_domain_array 
+-----------------------------------
+ {2,4}
+(1 row)
+
+--
+-- Domains within composite
+--
+CREATE TYPE nnint_container AS (f1 int, f2 nnint);
+CREATE FUNCTION test_result_nnint_container(x int, y int)
+  RETURNS nnint_container AS $$
+begin
+return row(x, y)::nnint_container;
+end
+$$ LANGUAGE plpgsql;
+SELECT test_result_nnint_container(null, 3);
+ test_result_nnint_container 
+-----------------------------
+ (,3)
+(1 row)
+
+SELECT test_result_nnint_container(3, null);  -- fail
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_result_nnint_container(integer,integer) line 3 at RETURN
+CREATE FUNCTION test_assign_nnint_container(x int, y int, z int)
+  RETURNS nnint_container AS $$
+declare v nnint_container := row(x, y);
+begin
+v.f2 := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_nnint_container(1,2,3);
+ f1 | f2 
+----+----
+  1 |  3
+(1 row)
+
+SELECT * FROM test_assign_nnint_container(1,2,null);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_assign_nnint_container(integer,integer,integer) line 4 at assignment
+SELECT * FROM test_assign_nnint_container(1,null,3);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_assign_nnint_container(integer,integer,integer) line 3 during statement block local variable initialization
+-- Since core system allows this:
+SELECT null::nnint_container;
+ nnint_container 
+-----------------
+ 
+(1 row)
+
+-- so should PL/PgSQL
+CREATE FUNCTION test_assign_nnint_container2(x int, y int, z int)
+  RETURNS nnint_container AS $$
+declare v nnint_container;
+begin
+v.f2 := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_nnint_container2(1,2,3);
+ f1 | f2 
+----+----
+    |  3
+(1 row)
+
+SELECT * FROM test_assign_nnint_container2(1,2,null);
+ERROR:  domain nnint does not allow null values
+CONTEXT:  PL/pgSQL function test_assign_nnint_container2(integer,integer,integer) line 4 at assignment
+--
+-- Domains of composite
+--
+CREATE TYPE named_pair AS (
+    i integer,
+    j integer
+);
+CREATE DOMAIN ordered_named_pair AS named_pair CHECK((VALUE).i <= (VALUE).j);
+CREATE FUNCTION read_ordered_named_pair(p ordered_named_pair) RETURNS integer AS $$
+begin
+return p.i + p.j;
+end
+$$ LANGUAGE plpgsql;
+SELECT read_ordered_named_pair(row(1, 2));
+ read_ordered_named_pair 
+-------------------------
+                       3
+(1 row)
+
+SELECT read_ordered_named_pair(row(2, 1));  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CREATE FUNCTION build_ordered_named_pair(i int, j int) RETURNS ordered_named_pair AS $$
+begin
+return row(i, j);
+end
+$$ LANGUAGE plpgsql;
+SELECT build_ordered_named_pair(1,2);
+ build_ordered_named_pair 
+--------------------------
+ (1,2)
+(1 row)
+
+SELECT build_ordered_named_pair(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  PL/pgSQL function build_ordered_named_pair(integer,integer) while casting return value to function's return type
+CREATE FUNCTION test_assign_ordered_named_pair(x int, y int, z int)
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair := row(x, y);
+begin
+v.j := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_ordered_named_pair(1,2,3);
+ i | j 
+---+---
+ 1 | 3
+(1 row)
+
+SELECT * FROM test_assign_ordered_named_pair(1,2,0);
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  PL/pgSQL function test_assign_ordered_named_pair(integer,integer,integer) line 4 at assignment
+SELECT * FROM test_assign_ordered_named_pair(2,1,3);
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  PL/pgSQL function test_assign_ordered_named_pair(integer,integer,integer) line 3 during statement block local variable initialization
+CREATE FUNCTION build_ordered_named_pairs(i int, j int) RETURNS ordered_named_pair[] AS $$
+begin
+return array[row(i, j), row(i, j+1)];
+end
+$$ LANGUAGE plpgsql;
+SELECT build_ordered_named_pairs(1,2);
+ build_ordered_named_pairs 
+---------------------------
+ {"(1,2)","(1,3)"}
+(1 row)
+
+SELECT build_ordered_named_pairs(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  PL/pgSQL function build_ordered_named_pairs(integer,integer) while casting return value to function's return type
+CREATE FUNCTION test_assign_ordered_named_pairs(x int, y int, z int)
+  RETURNS ordered_named_pair[] AS $$
+declare v ordered_named_pair[] := array[row(x, y)];
+begin
+-- ideally this would work, but it doesn't yet:
+-- v[1].j := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+SELECT * FROM test_assign_ordered_named_pairs(1,2,3);
+ test_assign_ordered_named_pairs 
+---------------------------------
+ {"(1,2)"}
+(1 row)
+
+SELECT * FROM test_assign_ordered_named_pairs(2,1,3);
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  PL/pgSQL function test_assign_ordered_named_pairs(integer,integer,integer) line 3 during statement block local variable initialization
+SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
+ test_assign_ordered_named_pairs 
+---------------------------------
+ {"(1,2)"}
+(1 row)
+
diff --git a/src/pl/plpgsql/src/expected/plpgsql_record.out b/src/pl/plpgsql/src/expected/plpgsql_record.out
new file mode 100644
index 0000000000..29e42fda6c
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_record.out
@@ -0,0 +1,666 @@
+--
+-- Tests for PL/pgSQL handling of composite (record) variables
+--
+create type two_int4s as (f1 int4, f2 int4);
+create type two_int8s as (q1 int8, q2 int8);
+-- base-case return of a composite type
+create function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1,1)::two_int8s; end $$;
+select retc(42);
+  retc  
+--------
+ (42,1)
+(1 row)
+
+-- ok to return a matching record type
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1::int8, 1::int8); end $$;
+select retc(42);
+  retc  
+--------
+ (42,1)
+(1 row)
+
+-- we don't currently support implicit casting
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1,1); end $$;
+select retc(42);
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 1.
+CONTEXT:  PL/pgSQL function retc(integer) while casting return value to function's return type
+-- nor extra columns
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1::int8, 1::int8, 42); end $$;
+select retc(42);
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (3) does not match expected column count (2).
+CONTEXT:  PL/pgSQL function retc(integer) while casting return value to function's return type
+-- same cases with an intermediate "record" variable
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1::int8, 1::int8); return r; end $$;
+select retc(42);
+  retc  
+--------
+ (42,1)
+(1 row)
+
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1,1); return r; end $$;
+select retc(42);
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 1.
+CONTEXT:  PL/pgSQL function retc(integer) while casting return value to function's return type
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1::int8, 1::int8, 42); return r; end $$;
+select retc(42);
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (3) does not match expected column count (2).
+CONTEXT:  PL/pgSQL function retc(integer) while casting return value to function's return type
+-- but, for mostly historical reasons, we do convert when assigning
+-- to a named-composite-type variable
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r two_int8s; begin r := row($1::int8, 1::int8, 42); return r; end $$;
+select retc(42);
+  retc  
+--------
+ (42,1)
+(1 row)
+
+do $$ declare c two_int8s;
+begin c := row(1,2); raise notice 'c = %', c; end$$;
+NOTICE:  c = (1,2)
+do $$ declare c two_int8s;
+begin for c in select 1,2 loop raise notice 'c = %', c; end loop; end$$;
+NOTICE:  c = (1,2)
+do $$ declare c4 two_int4s; c8 two_int8s;
+begin
+  c8 := row(1,2);
+  c4 := c8;
+  c8 := c4;
+  raise notice 'c4 = %', c4;
+  raise notice 'c8 = %', c8;
+end$$;
+NOTICE:  c4 = (1,2)
+NOTICE:  c8 = (1,2)
+-- check passing composite result to another function
+create function getq1(two_int8s) returns int8 language plpgsql as $$
+declare r two_int8s; begin r := $1; return r.q1; end $$;
+select getq1(retc(344));
+ getq1 
+-------
+   344
+(1 row)
+
+select getq1(row(1,2));
+ getq1 
+-------
+     1
+(1 row)
+
+do $$
+declare r1 two_int8s; r2 record; x int8;
+begin
+  r1 := retc(345);
+  perform getq1(r1);
+  x := getq1(r1);
+  raise notice 'x = %', x;
+  r2 := retc(346);
+  perform getq1(r2);
+  x := getq1(r2);
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = 345
+NOTICE:  x = 346
+-- check assignments of composites
+do $$
+declare r1 two_int8s; r2 two_int8s; r3 record; r4 record;
+begin
+  r1 := row(1,2);
+  raise notice 'r1 = %', r1;
+  r1 := r1;  -- shouldn't do anything
+  raise notice 'r1 = %', r1;
+  r2 := r1;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r2.q2 = r1.q1 + 3;  -- check that r2 has distinct storage
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r1 := null;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r1 := row(7,11)::two_int8s;
+  r2 := r1;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r3 := row(1,2);
+  r4 := r3;
+  raise notice 'r3 = %', r3;
+  raise notice 'r4 = %', r4;
+  r4.f1 := r4.f1 + 3;  -- check that r4 has distinct storage
+  raise notice 'r3 = %', r3;
+  raise notice 'r4 = %', r4;
+  r1 := r3;
+  raise notice 'r1 = %', r1;
+  r4 := r1;
+  raise notice 'r4 = %', r4;
+  r4.q2 := r4.q2 + 1;  -- r4's field names have changed
+  raise notice 'r4 = %', r4;
+end$$;
+NOTICE:  r1 = (1,2)
+NOTICE:  r1 = (1,2)
+NOTICE:  r1 = (1,2)
+NOTICE:  r2 = (1,2)
+NOTICE:  r1 = (1,2)
+NOTICE:  r2 = (1,4)
+NOTICE:  r1 = <NULL>
+NOTICE:  r2 = (1,4)
+NOTICE:  r1 = (7,11)
+NOTICE:  r2 = (7,11)
+NOTICE:  r3 = (1,2)
+NOTICE:  r4 = (1,2)
+NOTICE:  r3 = (1,2)
+NOTICE:  r4 = (4,2)
+NOTICE:  r1 = (1,2)
+NOTICE:  r4 = (1,2)
+NOTICE:  r4 = (1,3)
+-- fields of named-type vars read as null if uninitialized
+do $$
+declare r1 two_int8s;
+begin
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.q1 = %', r1.q1;
+  raise notice 'r1.q2 = %', r1.q2;
+  raise notice 'r1 = %', r1;
+end$$;
+NOTICE:  r1 = <NULL>
+NOTICE:  r1.q1 = <NULL>
+NOTICE:  r1.q2 = <NULL>
+NOTICE:  r1 = <NULL>
+do $$
+declare r1 two_int8s;
+begin
+  raise notice 'r1.q1 = %', r1.q1;
+  raise notice 'r1.q2 = %', r1.q2;
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.nosuchfield = %', r1.nosuchfield;
+end$$;
+NOTICE:  r1.q1 = <NULL>
+NOTICE:  r1.q2 = <NULL>
+NOTICE:  r1 = <NULL>
+ERROR:  record "r1" has no field "nosuchfield"
+CONTEXT:  SQL statement "SELECT r1.nosuchfield"
+PL/pgSQL function inline_code_block line 7 at RAISE
+-- records, not so much
+do $$
+declare r1 record;
+begin
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.f1 = %', r1.f1;
+  raise notice 'r1.f2 = %', r1.f2;
+  raise notice 'r1 = %', r1;
+end$$;
+NOTICE:  r1 = <NULL>
+ERROR:  record "r1" is not assigned yet
+DETAIL:  The tuple structure of a not-yet-assigned record is indeterminate.
+CONTEXT:  SQL statement "SELECT r1.f1"
+PL/pgSQL function inline_code_block line 5 at RAISE
+-- but OK if you assign first
+do $$
+declare r1 record;
+begin
+  raise notice 'r1 = %', r1;
+  r1 := row(1,2);
+  raise notice 'r1.f1 = %', r1.f1;
+  raise notice 'r1.f2 = %', r1.f2;
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.nosuchfield = %', r1.nosuchfield;
+end$$;
+NOTICE:  r1 = <NULL>
+NOTICE:  r1.f1 = 1
+NOTICE:  r1.f2 = 2
+NOTICE:  r1 = (1,2)
+ERROR:  record "r1" has no field "nosuchfield"
+CONTEXT:  SQL statement "SELECT r1.nosuchfield"
+PL/pgSQL function inline_code_block line 9 at RAISE
+-- check repeated assignments to composite fields
+create table some_table (id int, data text);
+do $$
+declare r some_table;
+begin
+  r := (23, 'skidoo');
+  for i in 1 .. 10 loop
+    r.id := r.id + i;
+    r.data := r.data || ' ' || i;
+  end loop;
+  raise notice 'r = %', r;
+end$$;
+NOTICE:  r = (78,"skidoo 1 2 3 4 5 6 7 8 9 10")
+-- check behavior of function declared to return "record"
+create function returnsrecord(int) returns record language plpgsql as
+$$ begin return row($1,$1+1); end $$;
+select returnsrecord(42);
+ returnsrecord 
+---------------
+ (42,43)
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int);
+ x  | y  
+----+----
+ 42 | 43
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (2) does not match expected column count (3).
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 2.
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+-- same with an intermediate record variable
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ declare r record; begin r := row($1,$1+1); return r; end $$;
+select returnsrecord(42);
+ returnsrecord 
+---------------
+ (42,43)
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int);
+ x  | y  
+----+----
+ 42 | 43
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (2) does not match expected column count (3).
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 2.
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+-- should work the same with a missing column in the actual result value
+create table has_hole(f1 int, f2 int, f3 int);
+alter table has_hole drop column f2;
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ begin return row($1,$1+1)::has_hole; end $$;
+select returnsrecord(42);
+ returnsrecord 
+---------------
+ (42,43)
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int);
+ x  | y  
+----+----
+ 42 | 43
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (2) does not match expected column count (3).
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 2.
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+-- same with an intermediate record variable
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ declare r record; begin r := row($1,$1+1)::has_hole; return r; end $$;
+select returnsrecord(42);
+ returnsrecord 
+---------------
+ (42,43)
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int);
+ x  | y  
+----+----
+ 42 | 43
+(1 row)
+
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (2) does not match expected column count (3).
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+ERROR:  returned record type does not match expected record type
+DETAIL:  Returned type integer does not match expected type bigint in column 2.
+CONTEXT:  PL/pgSQL function returnsrecord(integer) while casting return value to function's return type
+-- check access to a field of an argument declared "record"
+create function getf1(x record) returns int language plpgsql as
+$$ begin return x.f1; end $$;
+select getf1(1);
+ERROR:  function getf1(integer) does not exist
+LINE 1: select getf1(1);
+               ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+select getf1(row(1,2));
+ getf1 
+-------
+     1
+(1 row)
+
+-- a CLOBBER_CACHE_ALWAYS build will report this error with a different
+-- context stack than other builds, so suppress context output
+\set SHOW_CONTEXT never
+select getf1(row(1,2)::two_int8s);
+ERROR:  record "x" has no field "f1"
+\set SHOW_CONTEXT errors
+select getf1(row(1,2));
+ getf1 
+-------
+     1
+(1 row)
+
+-- check behavior when assignment to FOR-loop variable requires coercion
+do $$
+declare r two_int8s;
+begin
+  for r in select i, i+1 from generate_series(1,4) i
+  loop
+    raise notice 'r = %', r;
+  end loop;
+end$$;
+NOTICE:  r = (1,2)
+NOTICE:  r = (2,3)
+NOTICE:  r = (3,4)
+NOTICE:  r = (4,5)
+-- check behavior when returning setof composite
+create function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+declare r record;
+  h has_hole;
+begin
+  return next h;
+  r := (1,2);
+  h := (3,4);
+  return next r;
+  return next h;
+  return next row(5,6);
+  return next row(7,8)::has_hole;
+end$$;
+select returnssetofholes();
+ returnssetofholes 
+-------------------
+ (,)
+ (1,2)
+ (3,4)
+ (5,6)
+ (7,8)
+(5 rows)
+
+create or replace function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+declare r record;
+begin
+  return next r;  -- fails, not assigned yet
+end$$;
+select returnssetofholes();
+ERROR:  record "r" is not assigned yet
+DETAIL:  The tuple structure of a not-yet-assigned record is indeterminate.
+CONTEXT:  PL/pgSQL function returnssetofholes() line 4 at RETURN NEXT
+create or replace function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+begin
+  return next row(1,2,3);  -- fails
+end$$;
+select returnssetofholes();
+ERROR:  returned record type does not match expected record type
+DETAIL:  Number of returned columns (3) does not match expected column count (2).
+CONTEXT:  PL/pgSQL function returnssetofholes() line 3 at RETURN NEXT
+-- check behavior with changes of a named rowtype
+create table mutable(f1 int, f2 text);
+create function sillyaddone(int) returns int language plpgsql as
+$$ declare r mutable; begin r.f1 := $1; return r.f1 + 1; end $$;
+select sillyaddone(42);
+ sillyaddone 
+-------------
+          43
+(1 row)
+
+alter table mutable drop column f1;
+alter table mutable add column f1 float8;
+-- currently, this fails due to cached plan for "r.f1 + 1" expression
+-- select sillyaddone(42);
+\c -
+-- but it's OK after a reconnect
+select sillyaddone(42);
+ sillyaddone 
+-------------
+          43
+(1 row)
+
+alter table mutable drop column f1;
+select sillyaddone(42);  -- fail
+ERROR:  record "r" has no field "f1"
+CONTEXT:  PL/pgSQL function sillyaddone(integer) line 1 at assignment
+create function getf3(x mutable) returns int language plpgsql as
+$$ begin return x.f3; end $$;
+select getf3(null::mutable);  -- doesn't work yet
+ERROR:  record "x" has no field "f3"
+CONTEXT:  SQL statement "SELECT x.f3"
+PL/pgSQL function getf3(mutable) line 1 at RETURN
+alter table mutable add column f3 int;
+select getf3(null::mutable);  -- now it works
+ getf3 
+-------
+      
+(1 row)
+
+alter table mutable drop column f3;
+-- a CLOBBER_CACHE_ALWAYS build will report this error with a different
+-- context stack than other builds, so suppress context output
+\set SHOW_CONTEXT never
+select getf3(null::mutable);  -- fails again
+ERROR:  record "x" has no field "f3"
+\set SHOW_CONTEXT errors
+-- check access to system columns in a record variable
+create function sillytrig() returns trigger language plpgsql as
+$$begin
+  raise notice 'old.ctid = %', old.ctid;
+  raise notice 'old.tableoid = %', old.tableoid::regclass;
+  return new;
+end$$;
+create trigger mutable_trig before update on mutable for each row
+execute procedure sillytrig();
+insert into mutable values ('foo'), ('bar');
+update mutable set f2 = f2 || ' baz';
+NOTICE:  old.ctid = (0,1)
+NOTICE:  old.tableoid = mutable
+NOTICE:  old.ctid = (0,2)
+NOTICE:  old.tableoid = mutable
+table mutable;
+   f2    
+---------
+ foo baz
+ bar baz
+(2 rows)
+
+-- check returning a composite datum from a trigger
+create or replace function sillytrig() returns trigger language plpgsql as
+$$begin
+  return row(new.*);
+end$$;
+update mutable set f2 = f2 || ' baz';
+table mutable;
+     f2      
+-------------
+ foo baz baz
+ bar baz baz
+(2 rows)
+
+create or replace function sillytrig() returns trigger language plpgsql as
+$$declare r record;
+begin
+  r := row(new.*);
+  return r;
+end$$;
+update mutable set f2 = f2 || ' baz';
+table mutable;
+       f2        
+-----------------
+ foo baz baz baz
+ bar baz baz baz
+(2 rows)
+
+--
+-- Domains of composite
+--
+create domain ordered_int8s as two_int8s check((value).q1 <= (value).q2);
+create function read_ordered_int8s(p ordered_int8s) returns int8 as $$
+begin return p.q1 + p.q2; end
+$$ language plpgsql;
+select read_ordered_int8s(row(1, 2));
+ read_ordered_int8s 
+--------------------
+                  3
+(1 row)
+
+select read_ordered_int8s(row(2, 1));  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+create function build_ordered_int8s(i int8, j int8) returns ordered_int8s as $$
+begin return row(i,j); end
+$$ language plpgsql;
+select build_ordered_int8s(1,2);
+ build_ordered_int8s 
+---------------------
+ (1,2)
+(1 row)
+
+select build_ordered_int8s(2,1);  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function build_ordered_int8s(bigint,bigint) while casting return value to function's return type
+create function build_ordered_int8s_2(i int8, j int8) returns ordered_int8s as $$
+declare r record; begin r := row(i,j); return r; end
+$$ language plpgsql;
+select build_ordered_int8s_2(1,2);
+ build_ordered_int8s_2 
+-----------------------
+ (1,2)
+(1 row)
+
+select build_ordered_int8s_2(2,1);  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function build_ordered_int8s_2(bigint,bigint) while casting return value to function's return type
+create function build_ordered_int8s_3(i int8, j int8) returns ordered_int8s as $$
+declare r two_int8s; begin r := row(i,j); return r; end
+$$ language plpgsql;
+select build_ordered_int8s_3(1,2);
+ build_ordered_int8s_3 
+-----------------------
+ (1,2)
+(1 row)
+
+select build_ordered_int8s_3(2,1);  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function build_ordered_int8s_3(bigint,bigint) while casting return value to function's return type
+create function build_ordered_int8s_4(i int8, j int8) returns ordered_int8s as $$
+declare r ordered_int8s; begin r := row(i,j); return r; end
+$$ language plpgsql;
+select build_ordered_int8s_4(1,2);
+ build_ordered_int8s_4 
+-----------------------
+ (1,2)
+(1 row)
+
+select build_ordered_int8s_4(2,1);  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function build_ordered_int8s_4(bigint,bigint) line 2 at assignment
+create function build_ordered_int8s_a(i int8, j int8) returns ordered_int8s[] as $$
+begin return array[row(i,j), row(i,j+1)]; end
+$$ language plpgsql;
+select build_ordered_int8s_a(1,2);
+ build_ordered_int8s_a 
+-----------------------
+ {"(1,2)","(1,3)"}
+(1 row)
+
+select build_ordered_int8s_a(2,1);  -- fail
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function build_ordered_int8s_a(bigint,bigint) while casting return value to function's return type
+-- check field assignment
+do $$
+declare r ordered_int8s;
+begin
+  r.q1 := null;
+  r.q2 := 43;
+  r.q1 := 42;
+  r.q2 := 41;  -- fail
+end$$;
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at assignment
+-- check whole-row assignment
+do $$
+declare r ordered_int8s;
+begin
+  r := null;
+  r := row(null,null);
+  r := row(1,2);
+  r := row(2,1);  -- fail
+end$$;
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at assignment
+-- check assignment in for-loop
+do $$
+declare r ordered_int8s;
+begin
+  for r in values (1,2),(3,4),(6,5) loop
+    raise notice 'r = %', r;
+  end loop;
+end$$;
+NOTICE:  r = (1,2)
+NOTICE:  r = (3,4)
+ERROR:  value for domain ordered_int8s violates check constraint "ordered_int8s_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at FOR over SELECT rows
+-- check behavior with toastable fields, too
+create type two_texts as (f1 text, f2 text);
+create domain ordered_texts as two_texts check((value).f1 <= (value).f2);
+create table sometable (id int, a text, b text);
+-- b should be compressed, but in-line
+insert into sometable values (1, 'a', repeat('ffoob',1000));
+-- this b should be out-of-line
+insert into sometable values (2, 'a', repeat('ffoob',100000));
+-- this pair should fail the domain check
+insert into sometable values (3, 'z', repeat('ffoob',100000));
+do $$
+declare d ordered_texts;
+begin
+  for d in select a, b from sometable loop
+    raise notice 'succeeded at "%"', d.f1;
+  end loop;
+end$$;
+NOTICE:  succeeded at "a"
+NOTICE:  succeeded at "a"
+ERROR:  value for domain ordered_texts violates check constraint "ordered_texts_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 4 at FOR over SELECT rows
+do $$
+declare r record; d ordered_texts;
+begin
+  for r in select * from sometable loop
+    raise notice 'processing row %', r.id;
+    d := row(r.a, r.b);
+  end loop;
+end$$;
+NOTICE:  processing row 1
+NOTICE:  processing row 2
+NOTICE:  processing row 3
+ERROR:  value for domain ordered_texts violates check constraint "ordered_texts_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 6 at assignment
+do $$
+declare r record; d ordered_texts;
+begin
+  for r in select * from sometable loop
+    raise notice 'processing row %', r.id;
+    d := null;
+    d.f1 := r.a;
+    d.f2 := r.b;
+  end loop;
+end$$;
+NOTICE:  processing row 1
+NOTICE:  processing row 2
+NOTICE:  processing row 3
+ERROR:  value for domain ordered_texts violates check constraint "ordered_texts_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 8 at assignment
diff --git a/src/pl/plpgsql/src/expected/plpgsql_transaction.out b/src/pl/plpgsql/src/expected/plpgsql_transaction.out
new file mode 100644
index 0000000000..8ec22c646c
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_transaction.out
@@ -0,0 +1,241 @@
+CREATE TABLE test1 (a int, b text);
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+END
+$$;
+CALL transaction_test1();
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+DO
+LANGUAGE plpgsql
+$$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+END
+$$;
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+-- transaction commands not allowed when called in transaction block
+START TRANSACTION;
+CALL transaction_test1();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function transaction_test1() line 6 at COMMIT
+COMMIT;
+START TRANSACTION;
+DO LANGUAGE plpgsql $$ BEGIN COMMIT; END $$;
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function inline_code_block line 1 at COMMIT
+COMMIT;
+TRUNCATE test1;
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+    RETURN 1;
+END
+$$;
+SELECT transaction_test2();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function transaction_test2() line 6 at COMMIT
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    CALL transaction_test1();
+    RETURN 1;
+END;
+$$;
+SELECT transaction_test3();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function transaction_test1() line 6 at COMMIT
+SQL statement "CALL transaction_test1()"
+PL/pgSQL function transaction_test3() line 3 at SQL statement
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    EXECUTE 'DO LANGUAGE plpgsql $x$ BEGIN COMMIT; END $x$';
+    RETURN 1;
+END;
+$$;
+SELECT transaction_test4();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function inline_code_block line 1 at COMMIT
+SQL statement "DO LANGUAGE plpgsql $x$ BEGIN COMMIT; END $x$"
+PL/pgSQL function transaction_test4() line 3 at EXECUTE
+-- proconfig settings currently disallow transaction statements
+CREATE PROCEDURE transaction_test5()
+LANGUAGE plpgsql
+SET work_mem = 555
+AS $$
+BEGIN
+    COMMIT;
+END;
+$$;
+CALL transaction_test5();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/pgSQL function transaction_test5() line 3 at COMMIT
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+TRUNCATE test1;
+DO LANGUAGE plpgsql $$
+DECLARE
+    r RECORD;
+BEGIN
+    FOR r IN SELECT * FROM test2 ORDER BY x LOOP
+        INSERT INTO test1 (a) VALUES (r.x);
+        COMMIT;
+    END LOOP;
+END;
+$$;
+ERROR:  committing inside a cursor loop is not supported
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at COMMIT
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+DO LANGUAGE plpgsql $$
+DECLARE
+    r RECORD;
+BEGIN
+    FOR r IN SELECT * FROM test2 ORDER BY x LOOP
+        INSERT INTO test1 (a) VALUES (r.x);
+        ROLLBACK;
+    END LOOP;
+END;
+$$;
+ERROR:  cannot abort transaction inside a cursor loop
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at ROLLBACK
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- commit inside block with exception handler
+TRUNCATE test1;
+DO LANGUAGE plpgsql $$
+BEGIN
+    BEGIN
+        INSERT INTO test1 (a) VALUES (1);
+        COMMIT;
+        INSERT INTO test1 (a) VALUES (1/0);
+        COMMIT;
+    EXCEPTION
+        WHEN division_by_zero THEN
+            RAISE NOTICE 'caught division_by_zero';
+    END;
+END;
+$$;
+ERROR:  cannot commit while a subtransaction is active
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at COMMIT
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- rollback inside block with exception handler
+TRUNCATE test1;
+DO LANGUAGE plpgsql $$
+BEGIN
+    BEGIN
+        INSERT INTO test1 (a) VALUES (1);
+        ROLLBACK;
+        INSERT INTO test1 (a) VALUES (1/0);
+        ROLLBACK;
+    EXCEPTION
+        WHEN division_by_zero THEN
+            RAISE NOTICE 'caught division_by_zero';
+    END;
+END;
+$$;
+ERROR:  cannot roll back while a subtransaction is active
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at ROLLBACK
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- COMMIT failures
+DO LANGUAGE plpgsql $$
+BEGIN
+    CREATE TABLE test3 (y int UNIQUE DEFERRABLE INITIALLY DEFERRED);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (1);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (1);
+    INSERT INTO test3 (y) VALUES (2);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (3);  -- won't get here
+END;
+$$;
+ERROR:  duplicate key value violates unique constraint "test3_y_key"
+DETAIL:  Key (y)=(1) already exists.
+CONTEXT:  PL/pgSQL function inline_code_block line 9 at COMMIT
+SELECT * FROM test3;
+ y 
+---
+ 1
+(1 row)
+
+DROP TABLE test1;
+DROP TABLE test2;
+DROP TABLE test3;
diff --git a/src/pl/plpgsql/src/expected/plpgsql_varprops.out b/src/pl/plpgsql/src/expected/plpgsql_varprops.out
new file mode 100644
index 0000000000..18f03d75b4
--- /dev/null
+++ b/src/pl/plpgsql/src/expected/plpgsql_varprops.out
@@ -0,0 +1,298 @@
+--
+-- Tests for PL/pgSQL variable properties: CONSTANT, NOT NULL, initializers
+--
+create type var_record as (f1 int4, f2 int4);
+create domain int_nn as int not null;
+create domain var_record_nn as var_record not null;
+create domain var_record_colnn as var_record check((value).f2 is not null);
+-- CONSTANT
+do $$
+declare x constant int := 42;
+begin
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = 42
+do $$
+declare x constant int;
+begin
+  x := 42;  -- fail
+end$$;
+ERROR:  variable "x" is declared CONSTANT
+LINE 4:   x := 42;  -- fail
+          ^
+do $$
+declare x constant int; y int;
+begin
+  for x, y in select 1, 2 loop  -- fail
+  end loop;
+end$$;
+ERROR:  variable "x" is declared CONSTANT
+LINE 4:   for x, y in select 1, 2 loop  -- fail
+              ^
+do $$
+declare x constant int[];
+begin
+  x[1] := 42;  -- fail
+end$$;
+ERROR:  variable "x" is declared CONSTANT
+LINE 4:   x[1] := 42;  -- fail
+          ^
+do $$
+declare x constant int[]; y int;
+begin
+  for x[1], y in select 1, 2 loop  -- fail (currently, unsupported syntax)
+  end loop;
+end$$;
+ERROR:  syntax error at or near "["
+LINE 4:   for x[1], y in select 1, 2 loop  -- fail (currently, unsup...
+               ^
+do $$
+declare x constant var_record;
+begin
+  x.f1 := 42;  -- fail
+end$$;
+ERROR:  variable "x" is declared CONSTANT
+LINE 4:   x.f1 := 42;  -- fail
+          ^
+do $$
+declare x constant var_record; y int;
+begin
+  for x.f1, y in select 1, 2 loop  -- fail
+  end loop;
+end$$;
+ERROR:  variable "x" is declared CONSTANT
+LINE 4:   for x.f1, y in select 1, 2 loop  -- fail
+              ^
+-- initializer expressions
+do $$
+declare x int := sin(0);
+begin
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = 0
+do $$
+declare x int := 1/0;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  division by zero
+CONTEXT:  SQL statement "SELECT 1/0"
+PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x bigint[] := array[1,3,5];
+begin
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = {1,3,5}
+do $$
+declare x record := row(1,2,3);
+begin
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = (1,2,3)
+do $$
+declare x var_record := row(1,2);
+begin
+  raise notice 'x = %', x;
+end$$;
+NOTICE:  x = (1,2)
+-- NOT NULL
+do $$
+declare x int not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  variable "x" must have a default value, since it's declared NOT NULL
+LINE 2: declare x int not null;  -- fail
+                      ^
+do $$
+declare x int not null := 42;
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+NOTICE:  x = 42
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at assignment
+do $$
+declare x int not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x record not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  variable "x" must have a default value, since it's declared NOT NULL
+LINE 2: declare x record not null;  -- fail
+                         ^
+do $$
+declare x record not null := row(42);
+begin
+  raise notice 'x = %', x;
+  x := row(null);  -- ok
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+NOTICE:  x = (42)
+NOTICE:  x = ()
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at assignment
+do $$
+declare x record not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  variable "x" must have a default value, since it's declared NOT NULL
+LINE 2: declare x var_record not null;  -- fail
+                             ^
+do $$
+declare x var_record not null := row(41,42);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- ok
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+NOTICE:  x = (41,42)
+NOTICE:  x = (,)
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 7 at assignment
+do $$
+declare x var_record not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  null value cannot be assigned to variable "x" declared NOT NULL
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+-- Check that variables are reinitialized on block re-entry.
+do $$
+begin
+  for i in 1..3 loop
+    declare
+      x int;
+      y int := i;
+      r record;
+      c var_record;
+    begin
+      if i = 1 then
+        x := 42;
+        r := row(i, i+1);
+        c := row(i, i+1);
+      end if;
+      raise notice 'x = %', x;
+      raise notice 'y = %', y;
+      raise notice 'r = %', r;
+      raise notice 'c = %', c;
+    end;
+  end loop;
+end$$;
+NOTICE:  x = 42
+NOTICE:  y = 1
+NOTICE:  r = (1,2)
+NOTICE:  c = (1,2)
+NOTICE:  x = <NULL>
+NOTICE:  y = 2
+NOTICE:  r = <NULL>
+NOTICE:  c = <NULL>
+NOTICE:  x = <NULL>
+NOTICE:  y = 3
+NOTICE:  r = <NULL>
+NOTICE:  c = <NULL>
+-- Check enforcement of domain constraints during initialization
+do $$
+declare x int_nn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  domain int_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x int_nn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  domain int_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x int_nn := 42;
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+NOTICE:  x = 42
+ERROR:  domain int_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at assignment
+do $$
+declare x var_record_nn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  domain var_record_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record_nn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  domain var_record_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record_nn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- ok
+  x := null;  -- fail
+end$$;
+NOTICE:  x = (1,2)
+ERROR:  domain var_record_nn does not allow null values
+CONTEXT:  PL/pgSQL function inline_code_block line 6 at assignment
+do $$
+declare x var_record_colnn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  value for domain var_record_colnn violates check constraint "var_record_colnn_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record_colnn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  value for domain var_record_colnn violates check constraint "var_record_colnn_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record_colnn := row(1,null);  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+ERROR:  value for domain var_record_colnn violates check constraint "var_record_colnn_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 3 during statement block local variable initialization
+do $$
+declare x var_record_colnn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+NOTICE:  x = (1,2)
+ERROR:  value for domain var_record_colnn violates check constraint "var_record_colnn_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at assignment
+do $$
+declare x var_record_colnn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- fail
+end$$;
+NOTICE:  x = (1,2)
+ERROR:  value for domain var_record_colnn violates check constraint "var_record_colnn_check"
+CONTEXT:  PL/pgSQL function inline_code_block line 5 at assignment
diff --git a/src/pl/plpgsql/src/generate-plerrcodes.pl b/src/pl/plpgsql/src/generate-plerrcodes.pl
index eb135bc25e..834cd5058f 100644
--- a/src/pl/plpgsql/src/generate-plerrcodes.pl
+++ b/src/pl/plpgsql/src/generate-plerrcodes.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate the plerrcodes.h header from errcodes.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/pl/plpgsql/src/pl_comp.c b/src/pl/plpgsql/src/pl_comp.c
index 662b3c97d7..d07a16a7ea 100644
--- a/src/pl/plpgsql/src/pl_comp.c
+++ b/src/pl/plpgsql/src/pl_comp.c
@@ -3,7 +3,7 @@
  * pl_comp.c		- Compiler part of the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -32,6 +32,7 @@
 #include "utils/regproc.h"
 #include "utils/rel.h"
 #include "utils/syscache.h"
+#include "utils/typcache.h"
 
 #include "plpgsql.h"
 
@@ -104,7 +105,6 @@ static Node *plpgsql_param_ref(ParseState *pstate, ParamRef *pref);
 static Node *resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
 				   ColumnRef *cref, bool error_if_no_field);
 static Node *make_datum_param(PLpgSQL_expr *expr, int dno, int location);
-static PLpgSQL_row *build_row_from_class(Oid classOid);
 static PLpgSQL_row *build_row_from_vars(PLpgSQL_variable **vars, int numvars);
 static PLpgSQL_type *build_datatype(HeapTuple typeTup, int32 typmod, Oid collation);
 static void plpgsql_start_datums(void);
@@ -275,7 +275,6 @@ do_compile(FunctionCallInfo fcinfo,
 	bool		isnull;
 	char	   *proc_source;
 	HeapTuple	typeTup;
-	Form_pg_type typeStruct;
 	PLpgSQL_variable *var;
 	PLpgSQL_rec *rec;
 	int			i;
@@ -426,16 +425,20 @@ do_compile(FunctionCallInfo fcinfo,
 				/* Disallow pseudotype argument */
 				/* (note we already replaced polymorphic types) */
 				/* (build_variable would do this, but wrong message) */
-				if (argdtype->ttype != PLPGSQL_TTYPE_SCALAR &&
-					argdtype->ttype != PLPGSQL_TTYPE_ROW)
+				if (argdtype->ttype == PLPGSQL_TTYPE_PSEUDO)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/pgSQL functions cannot accept type %s",
 									format_type_be(argtypeid))));
 
-				/* Build variable and add to datum list */
-				argvariable = plpgsql_build_variable(buf, 0,
-													 argdtype, false);
+				/*
+				 * Build variable and add to datum list.  If there's a name
+				 * for the argument, use that as refname, else use $n name.
+				 */
+				argvariable = plpgsql_build_variable((argnames &&
+													  argnames[i][0] != '\0') ?
+													 argnames[i] : buf,
+													 0, argdtype, false);
 
 				if (argvariable->dtype == PLPGSQL_DTYPE_VAR)
 				{
@@ -443,8 +446,8 @@ do_compile(FunctionCallInfo fcinfo,
 				}
 				else
 				{
-					Assert(argvariable->dtype == PLPGSQL_DTYPE_ROW);
-					argitemtype = PLPGSQL_NSTYPE_ROW;
+					Assert(argvariable->dtype == PLPGSQL_DTYPE_REC);
+					argitemtype = PLPGSQL_NSTYPE_REC;
 				}
 
 				/* Remember arguments in appropriate arrays */
@@ -526,34 +529,35 @@ do_compile(FunctionCallInfo fcinfo,
 			/*
 			 * Lookup the function's return type
 			 */
-			typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettypeid));
-			if (!HeapTupleIsValid(typeTup))
-				elog(ERROR, "cache lookup failed for type %u", rettypeid);
-			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
-
-			/* Disallow pseudotype result, except VOID or RECORD */
-			/* (note we already replaced polymorphic types) */
-			if (typeStruct->typtype == TYPTYPE_PSEUDO)
+			if (rettypeid)
 			{
-				if (rettypeid == VOIDOID ||
-					rettypeid == RECORDOID)
-					 /* okay */ ;
-				else if (rettypeid == TRIGGEROID || rettypeid == EVTTRIGGEROID)
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("trigger functions can only be called as triggers")));
-				else
-					ereport(ERROR,
-							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-							 errmsg("PL/pgSQL functions cannot return type %s",
-									format_type_be(rettypeid))));
-			}
+				Form_pg_type typeStruct;
 
-			if (typeStruct->typrelid != InvalidOid ||
-				rettypeid == RECORDOID)
-				function->fn_retistuple = true;
-			else
-			{
+				typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettypeid));
+				if (!HeapTupleIsValid(typeTup))
+					elog(ERROR, "cache lookup failed for type %u", rettypeid);
+				typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
+
+				/* Disallow pseudotype result, except VOID or RECORD */
+				/* (note we already replaced polymorphic types) */
+				if (typeStruct->typtype == TYPTYPE_PSEUDO)
+				{
+					if (rettypeid == VOIDOID ||
+						rettypeid == RECORDOID)
+						 /* okay */ ;
+					else if (rettypeid == TRIGGEROID || rettypeid == EVTTRIGGEROID)
+						ereport(ERROR,
+								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								 errmsg("trigger functions can only be called as triggers")));
+					else
+						ereport(ERROR,
+								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+								 errmsg("PL/pgSQL functions cannot return type %s",
+										format_type_be(rettypeid))));
+				}
+
+				function->fn_retistuple = type_is_rowtype(rettypeid);
+				function->fn_retisdomain = (typeStruct->typtype == TYPTYPE_DOMAIN);
 				function->fn_retbyval = typeStruct->typbyval;
 				function->fn_rettyplen = typeStruct->typlen;
 
@@ -571,8 +575,9 @@ do_compile(FunctionCallInfo fcinfo,
 																 function->fn_input_collation),
 												  true);
 				}
+
+				ReleaseSysCache(typeTup);
 			}
-			ReleaseSysCache(typeTup);
 			break;
 
 		case PLPGSQL_DML_TRIGGER:
@@ -580,6 +585,7 @@ do_compile(FunctionCallInfo fcinfo,
 			function->fn_rettype = InvalidOid;
 			function->fn_retbyval = false;
 			function->fn_retistuple = true;
+			function->fn_retisdomain = false;
 			function->fn_retset = false;
 
 			/* shouldn't be any declared arguments */
@@ -590,11 +596,11 @@ do_compile(FunctionCallInfo fcinfo,
 						 errhint("The arguments of the trigger can be accessed through TG_NARGS and TG_ARGV instead.")));
 
 			/* Add the record for referencing NEW ROW */
-			rec = plpgsql_build_record("new", 0, true);
+			rec = plpgsql_build_record("new", 0, NULL, RECORDOID, true);
 			function->new_varno = rec->dno;
 
 			/* Add the record for referencing OLD ROW */
-			rec = plpgsql_build_record("old", 0, true);
+			rec = plpgsql_build_record("old", 0, NULL, RECORDOID, true);
 			function->old_varno = rec->dno;
 
 			/* Add the variable tg_name */
@@ -603,7 +609,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_name_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_NAME;
 
 			/* Add the variable tg_when */
 			var = plpgsql_build_variable("tg_when", 0,
@@ -611,7 +619,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_when_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_WHEN;
 
 			/* Add the variable tg_level */
 			var = plpgsql_build_variable("tg_level", 0,
@@ -619,7 +629,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_level_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_LEVEL;
 
 			/* Add the variable tg_op */
 			var = plpgsql_build_variable("tg_op", 0,
@@ -627,7 +639,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_op_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_OP;
 
 			/* Add the variable tg_relid */
 			var = plpgsql_build_variable("tg_relid", 0,
@@ -635,7 +649,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_relid_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_RELID;
 
 			/* Add the variable tg_relname */
 			var = plpgsql_build_variable("tg_relname", 0,
@@ -643,7 +659,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_relname_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_TABLE_NAME;
 
 			/* tg_table_name is now preferred to tg_relname */
 			var = plpgsql_build_variable("tg_table_name", 0,
@@ -651,7 +669,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_table_name_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_TABLE_NAME;
 
 			/* add the variable tg_table_schema */
 			var = plpgsql_build_variable("tg_table_schema", 0,
@@ -659,7 +679,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_table_schema_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_TABLE_SCHEMA;
 
 			/* Add the variable tg_nargs */
 			var = plpgsql_build_variable("tg_nargs", 0,
@@ -667,7 +689,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																InvalidOid),
 										 true);
-			function->tg_nargs_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_NARGS;
 
 			/* Add the variable tg_argv */
 			var = plpgsql_build_variable("tg_argv", 0,
@@ -675,7 +699,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_argv_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_ARGV;
 
 			break;
 
@@ -683,6 +709,7 @@ do_compile(FunctionCallInfo fcinfo,
 			function->fn_rettype = VOIDOID;
 			function->fn_retbyval = false;
 			function->fn_retistuple = true;
+			function->fn_retisdomain = false;
 			function->fn_retset = false;
 
 			/* shouldn't be any declared arguments */
@@ -697,7 +724,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_event_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_EVENT;
 
 			/* Add the variable tg_tag */
 			var = plpgsql_build_variable("tg_tag", 0,
@@ -705,7 +734,9 @@ do_compile(FunctionCallInfo fcinfo,
 																-1,
 																function->fn_input_collation),
 										 true);
-			function->tg_tag_varno = var->dno;
+			Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+			var->dtype = PLPGSQL_DTYPE_PROMISE;
+			((PLpgSQL_var *) var)->promise = PLPGSQL_PROMISE_TG_TAG;
 
 			break;
 
@@ -858,13 +889,14 @@ plpgsql_compile_inline(char *proc_source)
 	function->fn_rettype = VOIDOID;
 	function->fn_retset = false;
 	function->fn_retistuple = false;
+	function->fn_retisdomain = false;
 	/* a bit of hardwired knowledge about type VOID here */
 	function->fn_retbyval = true;
 	function->fn_rettyplen = sizeof(int32);
 
 	/*
 	 * Remember if function is STABLE/IMMUTABLE.  XXX would it be better to
-	 * set this TRUE inside a read-only transaction?  Not clear.
+	 * set this true inside a read-only transaction?  Not clear.
 	 */
 	function->fn_readonly = false;
 
@@ -1231,19 +1263,22 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
 			if (nnames == nnames_field)
 			{
 				/* colname could be a field in this record */
+				PLpgSQL_rec *rec = (PLpgSQL_rec *) estate->datums[nse->itemno];
 				int			i;
 
 				/* search for a datum referencing this field */
-				for (i = 0; i < estate->ndatums; i++)
+				i = rec->firstfield;
+				while (i >= 0)
 				{
 					PLpgSQL_recfield *fld = (PLpgSQL_recfield *) estate->datums[i];
 
-					if (fld->dtype == PLPGSQL_DTYPE_RECFIELD &&
-						fld->recparentno == nse->itemno &&
-						strcmp(fld->fieldname, colname) == 0)
+					Assert(fld->dtype == PLPGSQL_DTYPE_RECFIELD &&
+						   fld->recparentno == nse->itemno);
+					if (strcmp(fld->fieldname, colname) == 0)
 					{
 						return make_datum_param(expr, i, cref->location);
 					}
+					i = fld->nextfield;
 				}
 
 				/*
@@ -1261,34 +1296,6 @@ resolve_column_ref(ParseState *pstate, PLpgSQL_expr *expr,
 							 parser_errposition(pstate, cref->location)));
 			}
 			break;
-		case PLPGSQL_NSTYPE_ROW:
-			if (nnames == nnames_wholerow)
-				return make_datum_param(expr, nse->itemno, cref->location);
-			if (nnames == nnames_field)
-			{
-				/* colname could be a field in this row */
-				PLpgSQL_row *row = (PLpgSQL_row *) estate->datums[nse->itemno];
-				int			i;
-
-				for (i = 0; i < row->nfields; i++)
-				{
-					if (row->fieldnames[i] &&
-						strcmp(row->fieldnames[i], colname) == 0)
-					{
-						return make_datum_param(expr, row->varnos[i],
-												cref->location);
-					}
-				}
-				/* Not found, so throw error or return NULL */
-				if (error_if_no_field)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("record \"%s\" has no field \"%s\"",
-									(nnames_field == 1) ? name1 : name2,
-									colname),
-							 parser_errposition(pstate, cref->location)));
-			}
-			break;
 		default:
 			elog(ERROR, "unrecognized plpgsql itemtype: %d", nse->itemtype);
 	}
@@ -1345,8 +1352,8 @@ make_datum_param(PLpgSQL_expr *expr, int dno, int location)
  * yytxt is the original token text; we need this to check for quoting,
  * so that later checks for unreserved keywords work properly.
  *
- * If recognized as a variable, fill in *wdatum and return TRUE;
- * if not recognized, fill in *word and return FALSE.
+ * If recognized as a variable, fill in *wdatum and return true;
+ * if not recognized, fill in *word and return false.
  * (Note: those two pointers actually point to members of the same union,
  * but for notational reasons we pass them separately.)
  * ----------
@@ -1376,7 +1383,6 @@ plpgsql_parse_word(char *word1, const char *yytxt,
 			switch (ns->itemtype)
 			{
 				case PLPGSQL_NSTYPE_VAR:
-				case PLPGSQL_NSTYPE_ROW:
 				case PLPGSQL_NSTYPE_REC:
 					wdatum->datum = plpgsql_Datums[ns->itemno];
 					wdatum->ident = word1;
@@ -1452,14 +1458,11 @@ plpgsql_parse_dblword(char *word1, char *word2,
 						 * datum whether it is or not --- any error will be
 						 * detected later.
 						 */
+						PLpgSQL_rec *rec;
 						PLpgSQL_recfield *new;
 
-						new = palloc(sizeof(PLpgSQL_recfield));
-						new->dtype = PLPGSQL_DTYPE_RECFIELD;
-						new->fieldname = pstrdup(word2);
-						new->recparentno = ns->itemno;
-
-						plpgsql_adddatum((PLpgSQL_datum *) new);
+						rec = (PLpgSQL_rec *) (plpgsql_Datums[ns->itemno]);
+						new = plpgsql_build_recfield(rec, word2);
 
 						wdatum->datum = (PLpgSQL_datum *) new;
 					}
@@ -1473,43 +1476,6 @@ plpgsql_parse_dblword(char *word1, char *word2,
 					wdatum->idents = idents;
 					return true;
 
-				case PLPGSQL_NSTYPE_ROW:
-					if (nnames == 1)
-					{
-						/*
-						 * First word is a row name, so second word could be a
-						 * field in this row.  Again, no error now if it
-						 * isn't.
-						 */
-						PLpgSQL_row *row;
-						int			i;
-
-						row = (PLpgSQL_row *) (plpgsql_Datums[ns->itemno]);
-						for (i = 0; i < row->nfields; i++)
-						{
-							if (row->fieldnames[i] &&
-								strcmp(row->fieldnames[i], word2) == 0)
-							{
-								wdatum->datum = plpgsql_Datums[row->varnos[i]];
-								wdatum->ident = NULL;
-								wdatum->quoted = false; /* not used */
-								wdatum->idents = idents;
-								return true;
-							}
-						}
-						/* fall through to return CWORD */
-					}
-					else
-					{
-						/* Block-qualified reference to row variable. */
-						wdatum->datum = plpgsql_Datums[ns->itemno];
-						wdatum->ident = NULL;
-						wdatum->quoted = false; /* not used */
-						wdatum->idents = idents;
-						return true;
-					}
-					break;
-
 				default:
 					break;
 			}
@@ -1563,14 +1529,11 @@ plpgsql_parse_tripword(char *word1, char *word2, char *word3,
 						 * words 1/2 are a record name, so third word could be
 						 * a field in this record.
 						 */
+						PLpgSQL_rec *rec;
 						PLpgSQL_recfield *new;
 
-						new = palloc(sizeof(PLpgSQL_recfield));
-						new->dtype = PLPGSQL_DTYPE_RECFIELD;
-						new->fieldname = pstrdup(word3);
-						new->recparentno = ns->itemno;
-
-						plpgsql_adddatum((PLpgSQL_datum *) new);
+						rec = (PLpgSQL_rec *) (plpgsql_Datums[ns->itemno]);
+						new = plpgsql_build_recfield(rec, word3);
 
 						wdatum->datum = (PLpgSQL_datum *) new;
 						wdatum->ident = NULL;
@@ -1579,32 +1542,6 @@ plpgsql_parse_tripword(char *word1, char *word2, char *word3,
 						return true;
 					}
 
-				case PLPGSQL_NSTYPE_ROW:
-					{
-						/*
-						 * words 1/2 are a row name, so third word could be a
-						 * field in this row.
-						 */
-						PLpgSQL_row *row;
-						int			i;
-
-						row = (PLpgSQL_row *) (plpgsql_Datums[ns->itemno]);
-						for (i = 0; i < row->nfields; i++)
-						{
-							if (row->fieldnames[i] &&
-								strcmp(row->fieldnames[i], word3) == 0)
-							{
-								wdatum->datum = plpgsql_Datums[row->varnos[i]];
-								wdatum->ident = NULL;
-								wdatum->quoted = false; /* not used */
-								wdatum->idents = idents;
-								return true;
-							}
-						}
-						/* fall through to return CWORD */
-						break;
-					}
-
 				default:
 					break;
 			}
@@ -1855,8 +1792,8 @@ plpgsql_parse_cwordrowtype(List *idents)
  * plpgsql_build_variable - build a datum-array entry of a given
  * datatype
  *
- * The returned struct may be a PLpgSQL_var, PLpgSQL_row, or
- * PLpgSQL_rec depending on the given datatype, and is allocated via
+ * The returned struct may be a PLpgSQL_var or PLpgSQL_rec
+ * depending on the given datatype, and is allocated via
  * palloc.  The struct is automatically added to the current datum
  * array, and optionally to the current namespace.
  */
@@ -1878,7 +1815,7 @@ plpgsql_build_variable(const char *refname, int lineno, PLpgSQL_type *dtype,
 				var->refname = pstrdup(refname);
 				var->lineno = lineno;
 				var->datatype = dtype;
-				/* other fields might be filled by caller */
+				/* other fields are left as 0, might be changed by caller */
 
 				/* preset to NULL */
 				var->value = 0;
@@ -1893,31 +1830,14 @@ plpgsql_build_variable(const char *refname, int lineno, PLpgSQL_type *dtype,
 				result = (PLpgSQL_variable *) var;
 				break;
 			}
-		case PLPGSQL_TTYPE_ROW:
-			{
-				/* Composite type -- build a row variable */
-				PLpgSQL_row *row;
-
-				row = build_row_from_class(dtype->typrelid);
-
-				row->dtype = PLPGSQL_DTYPE_ROW;
-				row->refname = pstrdup(refname);
-				row->lineno = lineno;
-
-				plpgsql_adddatum((PLpgSQL_datum *) row);
-				if (add2namespace)
-					plpgsql_ns_additem(PLPGSQL_NSTYPE_ROW,
-									   row->dno,
-									   refname);
-				result = (PLpgSQL_variable *) row;
-				break;
-			}
 		case PLPGSQL_TTYPE_REC:
 			{
-				/* "record" type -- build a record variable */
+				/* Composite type -- build a record variable */
 				PLpgSQL_rec *rec;
 
-				rec = plpgsql_build_record(refname, lineno, add2namespace);
+				rec = plpgsql_build_record(refname, lineno,
+										   dtype, dtype->typoid,
+										   add2namespace);
 				result = (PLpgSQL_variable *) rec;
 				break;
 			}
@@ -1941,7 +1861,9 @@ plpgsql_build_variable(const char *refname, int lineno, PLpgSQL_type *dtype,
  * Build empty named record variable, and optionally add it to namespace
  */
 PLpgSQL_rec *
-plpgsql_build_record(const char *refname, int lineno, bool add2namespace)
+plpgsql_build_record(const char *refname, int lineno,
+					 PLpgSQL_type *dtype, Oid rectypeid,
+					 bool add2namespace)
 {
 	PLpgSQL_rec *rec;
 
@@ -1949,10 +1871,11 @@ plpgsql_build_record(const char *refname, int lineno, bool add2namespace)
 	rec->dtype = PLPGSQL_DTYPE_REC;
 	rec->refname = pstrdup(refname);
 	rec->lineno = lineno;
-	rec->tup = NULL;
-	rec->tupdesc = NULL;
-	rec->freetup = false;
-	rec->freetupdesc = false;
+	/* other fields are left as 0, might be changed by caller */
+	rec->datatype = dtype;
+	rec->rectypeid = rectypeid;
+	rec->firstfield = -1;
+	rec->erh = NULL;
 	plpgsql_adddatum((PLpgSQL_datum *) rec);
 	if (add2namespace)
 		plpgsql_ns_additem(PLPGSQL_NSTYPE_REC, rec->dno, rec->refname);
@@ -1960,104 +1883,9 @@ plpgsql_build_record(const char *refname, int lineno, bool add2namespace)
 	return rec;
 }
 
-/*
- * Build a row-variable data structure given the pg_class OID.
- */
-static PLpgSQL_row *
-build_row_from_class(Oid classOid)
-{
-	PLpgSQL_row *row;
-	Relation	rel;
-	Form_pg_class classStruct;
-	const char *relname;
-	int			i;
-
-	/*
-	 * Open the relation to get info.
-	 */
-	rel = relation_open(classOid, AccessShareLock);
-	classStruct = RelationGetForm(rel);
-	relname = RelationGetRelationName(rel);
-
-	/*
-	 * Accept relation, sequence, view, materialized view, composite type, or
-	 * foreign table.
-	 */
-	if (classStruct->relkind != RELKIND_RELATION &&
-		classStruct->relkind != RELKIND_SEQUENCE &&
-		classStruct->relkind != RELKIND_VIEW &&
-		classStruct->relkind != RELKIND_MATVIEW &&
-		classStruct->relkind != RELKIND_COMPOSITE_TYPE &&
-		classStruct->relkind != RELKIND_FOREIGN_TABLE &&
-		classStruct->relkind != RELKIND_PARTITIONED_TABLE)
-		ereport(ERROR,
-				(errcode(ERRCODE_WRONG_OBJECT_TYPE),
-				 errmsg("relation \"%s\" is not a table", relname)));
-
-	/*
-	 * Create a row datum entry and all the required variables that it will
-	 * point to.
-	 */
-	row = palloc0(sizeof(PLpgSQL_row));
-	row->dtype = PLPGSQL_DTYPE_ROW;
-	row->rowtupdesc = CreateTupleDescCopy(RelationGetDescr(rel));
-	row->nfields = classStruct->relnatts;
-	row->fieldnames = palloc(sizeof(char *) * row->nfields);
-	row->varnos = palloc(sizeof(int) * row->nfields);
-
-	for (i = 0; i < row->nfields; i++)
-	{
-		Form_pg_attribute attrStruct;
-
-		/*
-		 * Get the attribute and check for dropped column
-		 */
-		attrStruct = row->rowtupdesc->attrs[i];
-
-		if (!attrStruct->attisdropped)
-		{
-			char	   *attname;
-			char		refname[(NAMEDATALEN * 2) + 100];
-			PLpgSQL_variable *var;
-
-			attname = NameStr(attrStruct->attname);
-			snprintf(refname, sizeof(refname), "%s.%s", relname, attname);
-
-			/*
-			 * Create the internal variable for the field
-			 *
-			 * We know if the table definitions contain a default value or if
-			 * the field is declared in the table as NOT NULL. But it's
-			 * possible to create a table field as NOT NULL without a default
-			 * value and that would lead to problems later when initializing
-			 * the variables due to entering a block at execution time. Thus
-			 * we ignore this information for now.
-			 */
-			var = plpgsql_build_variable(refname, 0,
-										 plpgsql_build_datatype(attrStruct->atttypid,
-																attrStruct->atttypmod,
-																attrStruct->attcollation),
-										 false);
-
-			/* Add the variable to the row */
-			row->fieldnames[i] = attname;
-			row->varnos[i] = var->dno;
-		}
-		else
-		{
-			/* Leave a hole in the row structure for the dropped col */
-			row->fieldnames[i] = NULL;
-			row->varnos[i] = -1;
-		}
-	}
-
-	relation_close(rel, AccessShareLock);
-
-	return row;
-}
-
 /*
  * Build a row-variable data structure given the component variables.
+ * Include a rowtupdesc, since we will need to materialize the row result.
  */
 static PLpgSQL_row *
 build_row_from_vars(PLpgSQL_variable **vars, int numvars)
@@ -2075,32 +1903,34 @@ build_row_from_vars(PLpgSQL_variable **vars, int numvars)
 	for (i = 0; i < numvars; i++)
 	{
 		PLpgSQL_variable *var = vars[i];
-		Oid			typoid = RECORDOID;
-		int32		typmod = -1;
-		Oid			typcoll = InvalidOid;
+		Oid			typoid;
+		int32		typmod;
+		Oid			typcoll;
+
+		/* Member vars of a row should never be const */
+		Assert(!var->isconst);
 
 		switch (var->dtype)
 		{
 			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
 				typoid = ((PLpgSQL_var *) var)->datatype->typoid;
 				typmod = ((PLpgSQL_var *) var)->datatype->atttypmod;
 				typcoll = ((PLpgSQL_var *) var)->datatype->collation;
 				break;
 
 			case PLPGSQL_DTYPE_REC:
-				break;
-
-			case PLPGSQL_DTYPE_ROW:
-				if (((PLpgSQL_row *) var)->rowtupdesc)
-				{
-					typoid = ((PLpgSQL_row *) var)->rowtupdesc->tdtypeid;
-					typmod = ((PLpgSQL_row *) var)->rowtupdesc->tdtypmod;
-					/* composite types have no collation */
-				}
+				typoid = ((PLpgSQL_rec *) var)->rectypeid;
+				typmod = -1;	/* don't know typmod, if it's used at all */
+				typcoll = InvalidOid;	/* composite types have no collation */
 				break;
 
 			default:
 				elog(ERROR, "unrecognized dtype: %d", var->dtype);
+				typoid = InvalidOid;	/* keep compiler quiet */
+				typmod = 0;
+				typcoll = InvalidOid;
+				break;
 		}
 
 		row->fieldnames[i] = var->refname;
@@ -2116,6 +1946,46 @@ build_row_from_vars(PLpgSQL_variable **vars, int numvars)
 	return row;
 }
 
+/*
+ * Build a RECFIELD datum for the named field of the specified record variable
+ *
+ * If there's already such a datum, just return it; we don't need duplicates.
+ */
+PLpgSQL_recfield *
+plpgsql_build_recfield(PLpgSQL_rec *rec, const char *fldname)
+{
+	PLpgSQL_recfield *recfield;
+	int			i;
+
+	/* search for an existing datum referencing this field */
+	i = rec->firstfield;
+	while (i >= 0)
+	{
+		PLpgSQL_recfield *fld = (PLpgSQL_recfield *) plpgsql_Datums[i];
+
+		Assert(fld->dtype == PLPGSQL_DTYPE_RECFIELD &&
+			   fld->recparentno == rec->dno);
+		if (strcmp(fld->fieldname, fldname) == 0)
+			return fld;
+		i = fld->nextfield;
+	}
+
+	/* nope, so make a new one */
+	recfield = palloc0(sizeof(PLpgSQL_recfield));
+	recfield->dtype = PLPGSQL_DTYPE_RECFIELD;
+	recfield->fieldname = pstrdup(fldname);
+	recfield->recparentno = rec->dno;
+	recfield->rectupledescid = INVALID_TUPLEDESC_IDENTIFIER;
+
+	plpgsql_adddatum((PLpgSQL_datum *) recfield);
+
+	/* now we can link it into the parent's chain */
+	recfield->nextfield = rec->firstfield;
+	rec->firstfield = recfield->dno;
+
+	return recfield;
+}
+
 /*
  * plpgsql_build_datatype
  *		Build PLpgSQL_type struct given type OID, typmod, and collation.
@@ -2162,14 +2032,18 @@ build_datatype(HeapTuple typeTup, int32 typmod, Oid collation)
 	switch (typeStruct->typtype)
 	{
 		case TYPTYPE_BASE:
-		case TYPTYPE_DOMAIN:
 		case TYPTYPE_ENUM:
 		case TYPTYPE_RANGE:
 			typ->ttype = PLPGSQL_TTYPE_SCALAR;
 			break;
 		case TYPTYPE_COMPOSITE:
-			Assert(OidIsValid(typeStruct->typrelid));
-			typ->ttype = PLPGSQL_TTYPE_ROW;
+			typ->ttype = PLPGSQL_TTYPE_REC;
+			break;
+		case TYPTYPE_DOMAIN:
+			if (type_is_rowtype(typeStruct->typbasetype))
+				typ->ttype = PLPGSQL_TTYPE_REC;
+			else
+				typ->ttype = PLPGSQL_TTYPE_SCALAR;
 			break;
 		case TYPTYPE_PSEUDO:
 			if (typ->typoid == RECORDOID)
@@ -2185,7 +2059,6 @@ build_datatype(HeapTuple typeTup, int32 typmod, Oid collation)
 	typ->typlen = typeStruct->typlen;
 	typ->typbyval = typeStruct->typbyval;
 	typ->typtype = typeStruct->typtype;
-	typ->typrelid = typeStruct->typrelid;
 	typ->collation = typeStruct->typcollation;
 	if (OidIsValid(collation) && OidIsValid(typ->collation))
 		typ->collation = collation;
@@ -2341,15 +2214,12 @@ plpgsql_adddatum(PLpgSQL_datum *new)
 
 /* ----------
  * plpgsql_finish_datums	Copy completed datum info into function struct.
- *
- * This is also responsible for building resettable_datums, a bitmapset
- * of the dnos of all ROW, REC, and RECFIELD datums in the function.
  * ----------
  */
 static void
 plpgsql_finish_datums(PLpgSQL_function *function)
 {
-	Bitmapset  *resettable_datums = NULL;
+	Size		copiable_size = 0;
 	int			i;
 
 	function->ndatums = plpgsql_nDatums;
@@ -2357,32 +2227,35 @@ plpgsql_finish_datums(PLpgSQL_function *function)
 	for (i = 0; i < plpgsql_nDatums; i++)
 	{
 		function->datums[i] = plpgsql_Datums[i];
+
+		/* This must agree with copy_plpgsql_datums on what is copiable */
 		switch (function->datums[i]->dtype)
 		{
-			case PLPGSQL_DTYPE_ROW:
+			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
+				copiable_size += MAXALIGN(sizeof(PLpgSQL_var));
+				break;
 			case PLPGSQL_DTYPE_REC:
-			case PLPGSQL_DTYPE_RECFIELD:
-				resettable_datums = bms_add_member(resettable_datums, i);
+				copiable_size += MAXALIGN(sizeof(PLpgSQL_rec));
 				break;
-
 			default:
 				break;
 		}
 	}
-	function->resettable_datums = resettable_datums;
+	function->copiable_size = copiable_size;
 }
 
 
 /* ----------
  * plpgsql_add_initdatums		Make an array of the datum numbers of
- *					all the simple VAR datums created since the last call
+ *					all the initializable datums created since the last call
  *					to this function.
  *
  * If varnos is NULL, we just forget any datum entries created since the
  * last call.
  *
- * This is used around a DECLARE section to create a list of the VARs
- * that have to be initialized at block entry.  Note that VARs can also
+ * This is used around a DECLARE section to create a list of the datums
+ * that have to be initialized at block entry.  Note that datums can also
  * be created elsewhere than DECLARE, eg by a FOR-loop, but it is then
  * the responsibility of special-purpose code to initialize them.
  * ----------
@@ -2393,11 +2266,16 @@ plpgsql_add_initdatums(int **varnos)
 	int			i;
 	int			n = 0;
 
+	/*
+	 * The set of dtypes recognized here must match what exec_stmt_block()
+	 * cares about (re)initializing at block entry.
+	 */
 	for (i = datums_last; i < plpgsql_nDatums; i++)
 	{
 		switch (plpgsql_Datums[i]->dtype)
 		{
 			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_REC:
 				n++;
 				break;
 
@@ -2418,6 +2296,7 @@ plpgsql_add_initdatums(int **varnos)
 				switch (plpgsql_Datums[i]->dtype)
 				{
 					case PLPGSQL_DTYPE_VAR:
+					case PLPGSQL_DTYPE_REC:
 						(*varnos)[n++] = plpgsql_Datums[i]->dno;
 
 					default:
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
index 616f5e30f8..4ff87e0879 100644
--- a/src/pl/plpgsql/src/pl_exec.c
+++ b/src/pl/plpgsql/src/pl_exec.c
@@ -3,7 +3,7 @@
  * pl_exec.c		- Executor for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -22,6 +22,7 @@
 #include "access/tupconvert.h"
 #include "catalog/pg_proc.h"
 #include "catalog/pg_type.h"
+#include "executor/execExpr.h"
 #include "executor/spi.h"
 #include "funcapi.h"
 #include "miscadmin.h"
@@ -154,11 +155,90 @@ typedef struct					/* cast_hash table entry */
 static MemoryContext shared_cast_context = NULL;
 static HTAB *shared_cast_hash = NULL;
 
+/*
+ * LOOP_RC_PROCESSING encapsulates common logic for looping statements to
+ * handle return/exit/continue result codes from the loop body statement(s).
+ * It's meant to be used like this:
+ *
+ *		int rc = PLPGSQL_RC_OK;
+ *		for (...)
+ *		{
+ *			...
+ *			rc = exec_stmts(estate, stmt->body);
+ *			LOOP_RC_PROCESSING(stmt->label, break);
+ *			...
+ *		}
+ *		return rc;
+ *
+ * If execution of the loop should terminate, LOOP_RC_PROCESSING will execute
+ * "exit_action" (typically a "break" or "goto"), after updating "rc" to the
+ * value the current statement should return.  If execution should continue,
+ * LOOP_RC_PROCESSING will do nothing except reset "rc" to PLPGSQL_RC_OK.
+ *
+ * estate and rc are implicit arguments to the macro.
+ * estate->exitlabel is examined and possibly updated.
+ */
+#define LOOP_RC_PROCESSING(looplabel, exit_action) \
+	if (rc == PLPGSQL_RC_RETURN) \
+	{ \
+		/* RETURN, so propagate RC_RETURN out */ \
+		exit_action; \
+	} \
+	else if (rc == PLPGSQL_RC_EXIT) \
+	{ \
+		if (estate->exitlabel == NULL) \
+		{ \
+			/* unlabelled EXIT terminates this loop */ \
+			rc = PLPGSQL_RC_OK; \
+			exit_action; \
+		} \
+		else if ((looplabel) != NULL && \
+				 strcmp(looplabel, estate->exitlabel) == 0) \
+		{ \
+			/* labelled EXIT matching this loop, so terminate loop */ \
+			estate->exitlabel = NULL; \
+			rc = PLPGSQL_RC_OK; \
+			exit_action; \
+		} \
+		else \
+		{ \
+			/* non-matching labelled EXIT, propagate RC_EXIT out */ \
+			exit_action; \
+		} \
+	} \
+	else if (rc == PLPGSQL_RC_CONTINUE) \
+	{ \
+		if (estate->exitlabel == NULL) \
+		{ \
+			/* unlabelled CONTINUE matches this loop, so continue in loop */ \
+			rc = PLPGSQL_RC_OK; \
+		} \
+		else if ((looplabel) != NULL && \
+				 strcmp(looplabel, estate->exitlabel) == 0) \
+		{ \
+			/* labelled CONTINUE matching this loop, so continue in loop */ \
+			estate->exitlabel = NULL; \
+			rc = PLPGSQL_RC_OK; \
+		} \
+		else \
+		{ \
+			/* non-matching labelled CONTINUE, propagate RC_CONTINUE out */ \
+			exit_action; \
+		} \
+	} \
+	else \
+		Assert(rc == PLPGSQL_RC_OK)
+
 /************************************************************
  * Local function forward declarations
  ************************************************************/
+static void coerce_function_result_tuple(PLpgSQL_execstate *estate,
+							 TupleDesc tupdesc);
 static void plpgsql_exec_error_callback(void *arg);
-static PLpgSQL_datum *copy_plpgsql_datum(PLpgSQL_datum *datum);
+static void copy_plpgsql_datums(PLpgSQL_execstate *estate,
+					PLpgSQL_function *func);
+static void plpgsql_fulfill_promise(PLpgSQL_execstate *estate,
+						PLpgSQL_var *var);
 static MemoryContext get_stmt_mcontext(PLpgSQL_execstate *estate);
 static void push_stmt_mcontext(PLpgSQL_execstate *estate);
 static void pop_stmt_mcontext(PLpgSQL_execstate *estate);
@@ -215,6 +295,10 @@ static int exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 					 PLpgSQL_stmt_dynexecute *stmt);
 static int exec_stmt_dynfors(PLpgSQL_execstate *estate,
 				  PLpgSQL_stmt_dynfors *stmt);
+static int exec_stmt_commit(PLpgSQL_execstate *estate,
+				 PLpgSQL_stmt_commit *stmt);
+static int exec_stmt_rollback(PLpgSQL_execstate *estate,
+				   PLpgSQL_stmt_rollback *stmt);
 
 static void plpgsql_estate_setup(PLpgSQL_execstate *estate,
 					 PLpgSQL_function *func,
@@ -268,22 +352,45 @@ static int exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 			   Portal portal, bool prefetch_ok);
 static ParamListInfo setup_param_list(PLpgSQL_execstate *estate,
 				 PLpgSQL_expr *expr);
-static ParamListInfo setup_unshared_param_list(PLpgSQL_execstate *estate,
-						  PLpgSQL_expr *expr);
-static void plpgsql_param_fetch(ParamListInfo params, int paramid);
+static ParamExternData *plpgsql_param_fetch(ParamListInfo params,
+					int paramid, bool speculative,
+					ParamExternData *workspace);
+static void plpgsql_param_compile(ParamListInfo params, Param *param,
+					  ExprState *state,
+					  Datum *resv, bool *resnull);
+static void plpgsql_param_eval_var(ExprState *state, ExprEvalStep *op,
+					   ExprContext *econtext);
+static void plpgsql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
+						  ExprContext *econtext);
+static void plpgsql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
+							ExprContext *econtext);
+static void plpgsql_param_eval_generic(ExprState *state, ExprEvalStep *op,
+						   ExprContext *econtext);
+static void plpgsql_param_eval_generic_ro(ExprState *state, ExprEvalStep *op,
+							  ExprContext *econtext);
 static void exec_move_row(PLpgSQL_execstate *estate,
-			  PLpgSQL_rec *rec,
-			  PLpgSQL_row *row,
+			  PLpgSQL_variable *target,
 			  HeapTuple tup, TupleDesc tupdesc);
+static ExpandedRecordHeader *make_expanded_record_for_rec(PLpgSQL_execstate *estate,
+							 PLpgSQL_rec *rec,
+							 TupleDesc srctupdesc,
+							 ExpandedRecordHeader *srcerh);
+static void exec_move_row_from_fields(PLpgSQL_execstate *estate,
+						  PLpgSQL_variable *target,
+						  ExpandedRecordHeader *newerh,
+						  Datum *values, bool *nulls,
+						  TupleDesc tupdesc);
+static bool compatible_tupdescs(TupleDesc src_tupdesc, TupleDesc dst_tupdesc);
 static HeapTuple make_tuple_from_row(PLpgSQL_execstate *estate,
 					PLpgSQL_row *row,
 					TupleDesc tupdesc);
-static HeapTuple get_tuple_from_datum(Datum value);
-static TupleDesc get_tupdesc_from_datum(Datum value);
+static TupleDesc deconstruct_composite_datum(Datum value,
+							HeapTupleData *tmptup);
 static void exec_move_row_from_datum(PLpgSQL_execstate *estate,
-						 PLpgSQL_rec *rec,
-						 PLpgSQL_row *row,
+						 PLpgSQL_variable *target,
 						 Datum value);
+static void instantiate_empty_record_variable(PLpgSQL_execstate *estate,
+								  PLpgSQL_rec *rec);
 static char *convert_value_to_string(PLpgSQL_execstate *estate,
 						Datum value, Oid valtype);
 static Datum exec_cast_value(PLpgSQL_execstate *estate,
@@ -301,6 +408,8 @@ static void assign_simple_var(PLpgSQL_execstate *estate, PLpgSQL_var *var,
 				  Datum newvalue, bool isnull, bool freeable);
 static void assign_text_var(PLpgSQL_execstate *estate, PLpgSQL_var *var,
 				const char *str);
+static void assign_record_var(PLpgSQL_execstate *estate, PLpgSQL_rec *rec,
+				  ExpandedRecordHeader *erh);
 static PreparedParamsData *exec_eval_using_params(PLpgSQL_execstate *estate,
 					   List *params);
 static Portal exec_dynquery_with_params(PLpgSQL_execstate *estate,
@@ -352,8 +461,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 	 * Make local execution copies of all the datums
 	 */
 	estate.err_text = gettext_noop("during initialization of execution state");
-	for (i = 0; i < estate.ndatums; i++)
-		estate.datums[i] = copy_plpgsql_datum(func->datums[i]);
+	copy_plpgsql_datums(&estate, func);
 
 	/*
 	 * Store the actual call argument values into the appropriate variables
@@ -396,7 +504,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 							/* take ownership of R/W object */
 							assign_simple_var(&estate, var,
 											  TransferExpandedObject(var->value,
-																	 CurrentMemoryContext),
+																	 estate.datum_context),
 											  false,
 											  true);
 						}
@@ -409,7 +517,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 							/* flat array, so force to expanded form */
 							assign_simple_var(&estate, var,
 											  expand_array(var->value,
-														   CurrentMemoryContext,
+														   estate.datum_context,
 														   NULL),
 											  false,
 											  true);
@@ -418,20 +526,22 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 				}
 				break;
 
-			case PLPGSQL_DTYPE_ROW:
+			case PLPGSQL_DTYPE_REC:
 				{
-					PLpgSQL_row *row = (PLpgSQL_row *) estate.datums[n];
+					PLpgSQL_rec *rec = (PLpgSQL_rec *) estate.datums[n];
 
 					if (!fcinfo->argnull[i])
 					{
 						/* Assign row value from composite datum */
-						exec_move_row_from_datum(&estate, NULL, row,
+						exec_move_row_from_datum(&estate,
+												 (PLpgSQL_variable *) rec,
 												 fcinfo->arg[i]);
 					}
 					else
 					{
-						/* If arg is null, treat it as an empty row */
-						exec_move_row(&estate, NULL, row, NULL, NULL);
+						/* If arg is null, set variable to null */
+						exec_move_row(&estate, (PLpgSQL_variable *) rec,
+									  NULL, NULL);
 					}
 					/* clean up after exec_move_row() */
 					exec_eval_cleanup(&estate);
@@ -439,6 +549,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 				break;
 
 			default:
+				/* Anything else should not be an argument variable */
 				elog(ERROR, "unrecognized dtype: %d", func->datums[i]->dtype);
 		}
 	}
@@ -462,7 +573,7 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 	estate.err_text = NULL;
 	estate.err_stmt = (PLpgSQL_stmt *) (func->action);
 	rc = exec_stmt_block(&estate, func->action);
-	if (rc != PLPGSQL_RC_RETURN)
+	if (rc != PLPGSQL_RC_RETURN && func->fn_rettype)
 	{
 		estate.err_stmt = NULL;
 		estate.err_text = NULL;
@@ -494,72 +605,93 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 		/* If we produced any tuples, send back the result */
 		if (estate.tuple_store)
 		{
-			rsi->setResult = estate.tuple_store;
-			if (estate.rettupdesc)
-			{
-				MemoryContext oldcxt;
+			MemoryContext oldcxt;
 
-				oldcxt = MemoryContextSwitchTo(estate.tuple_store_cxt);
-				rsi->setDesc = CreateTupleDescCopy(estate.rettupdesc);
-				MemoryContextSwitchTo(oldcxt);
-			}
+			rsi->setResult = estate.tuple_store;
+			oldcxt = MemoryContextSwitchTo(estate.tuple_store_cxt);
+			rsi->setDesc = CreateTupleDescCopy(estate.tuple_store_desc);
+			MemoryContextSwitchTo(oldcxt);
 		}
 		estate.retval = (Datum) 0;
 		fcinfo->isnull = true;
 	}
 	else if (!estate.retisnull)
 	{
+		if (!func->fn_rettype)
+			ereport(ERROR,
+					(errmsg("cannot return a value from a procedure")));
+
+		/*
+		 * Cast result value to function's declared result type, and copy it
+		 * out to the upper executor memory context.  We must treat tuple
+		 * results specially in order to deal with cases like rowtypes
+		 * involving dropped columns.
+		 */
 		if (estate.retistuple)
 		{
-			/*
-			 * We have to check that the returned tuple actually matches the
-			 * expected result type.  XXX would be better to cache the tupdesc
-			 * instead of repeating get_call_result_type()
-			 */
-			HeapTuple	rettup = (HeapTuple) DatumGetPointer(estate.retval);
-			TupleDesc	tupdesc;
-			TupleConversionMap *tupmap;
-
-			switch (get_call_result_type(fcinfo, NULL, &tupdesc))
+			/* Don't need coercion if rowtype is known to match */
+			if (func->fn_rettype == estate.rettype &&
+				func->fn_rettype != RECORDOID)
 			{
-				case TYPEFUNC_COMPOSITE:
-					/* got the expected result rowtype, now check it */
-					tupmap = convert_tuples_by_position(estate.rettupdesc,
-														tupdesc,
-														gettext_noop("returned record type does not match expected record type"));
-					/* it might need conversion */
-					if (tupmap)
-						rettup = do_convert_tuple(rettup, tupmap);
-					/* no need to free map, we're about to return anyway */
-					break;
-				case TYPEFUNC_RECORD:
+				/*
+				 * Copy the tuple result into upper executor memory context.
+				 * However, if we have a R/W expanded datum, we can just
+				 * transfer its ownership out to the upper context.
+				 */
+				estate.retval = SPI_datumTransfer(estate.retval,
+												  false,
+												  -1);
+			}
+			else
+			{
+				/*
+				 * Need to look up the expected result type.  XXX would be
+				 * better to cache the tupdesc instead of repeating
+				 * get_call_result_type(), but the only easy place to save it
+				 * is in the PLpgSQL_function struct, and that's too
+				 * long-lived: composite types could change during the
+				 * existence of a PLpgSQL_function.
+				 */
+				Oid			resultTypeId;
+				TupleDesc	tupdesc;
 
-					/*
-					 * Failed to determine actual type of RECORD.  We could
-					 * raise an error here, but what this means in practice is
-					 * that the caller is expecting any old generic rowtype,
-					 * so we don't really need to be restrictive. Pass back
-					 * the generated result type, instead.
-					 */
-					tupdesc = estate.rettupdesc;
-					if (tupdesc == NULL)	/* shouldn't happen */
+				switch (get_call_result_type(fcinfo, &resultTypeId, &tupdesc))
+				{
+					case TYPEFUNC_COMPOSITE:
+						/* got the expected result rowtype, now coerce it */
+						coerce_function_result_tuple(&estate, tupdesc);
+						break;
+					case TYPEFUNC_COMPOSITE_DOMAIN:
+						/* got the expected result rowtype, now coerce it */
+						coerce_function_result_tuple(&estate, tupdesc);
+						/* and check domain constraints */
+						/* XXX allowing caching here would be good, too */
+						domain_check(estate.retval, false, resultTypeId,
+									 NULL, NULL);
+						break;
+					case TYPEFUNC_RECORD:
+
+						/*
+						 * Failed to determine actual type of RECORD.  We
+						 * could raise an error here, but what this means in
+						 * practice is that the caller is expecting any old
+						 * generic rowtype, so we don't really need to be
+						 * restrictive.  Pass back the generated result as-is.
+						 */
+						estate.retval = SPI_datumTransfer(estate.retval,
+														  false,
+														  -1);
+						break;
+					default:
+						/* shouldn't get here if retistuple is true ... */
 						elog(ERROR, "return type must be a row type");
-					break;
-				default:
-					/* shouldn't get here if retistuple is true ... */
-					elog(ERROR, "return type must be a row type");
-					break;
+						break;
+				}
 			}
-
-			/*
-			 * Copy tuple to upper executor memory, as a tuple Datum. Make
-			 * sure it is labeled with the caller-supplied tuple type.
-			 */
-			estate.retval = PointerGetDatum(SPI_returntuple(rettup, tupdesc));
 		}
 		else
 		{
-			/* Cast value to proper type */
+			/* Scalar case: use exec_cast_value */
 			estate.retval = exec_cast_value(&estate,
 											estate.retval,
 											&fcinfo->isnull,
@@ -580,6 +712,22 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 												  func->fn_rettyplen);
 		}
 	}
+	else
+	{
+		/*
+		 * We're returning a NULL, which normally requires no conversion work
+		 * regardless of datatypes.  But, if we are casting it to a domain
+		 * return type, we'd better check that the domain's constraints pass.
+		 */
+		if (func->fn_retisdomain)
+			estate.retval = exec_cast_value(&estate,
+											estate.retval,
+											&fcinfo->isnull,
+											estate.rettype,
+											-1,
+											func->fn_rettype,
+											-1);
+	}
 
 	estate.err_text = gettext_noop("during function exit");
 
@@ -605,6 +753,94 @@ plpgsql_exec_function(PLpgSQL_function *func, FunctionCallInfo fcinfo,
 	return estate.retval;
 }
 
+/*
+ * Helper for plpgsql_exec_function: coerce composite result to the specified
+ * tuple descriptor, and copy it out to upper executor memory.  This is split
+ * out mostly for cosmetic reasons --- the logic would be very deeply nested
+ * otherwise.
+ *
+ * estate->retval is updated in-place.
+ */
+static void
+coerce_function_result_tuple(PLpgSQL_execstate *estate, TupleDesc tupdesc)
+{
+	HeapTuple	rettup;
+	TupleDesc	retdesc;
+	TupleConversionMap *tupmap;
+
+	/* We assume exec_stmt_return verified that result is composite */
+	Assert(type_is_rowtype(estate->rettype));
+
+	/* We can special-case expanded records for speed */
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(estate->retval)))
+	{
+		ExpandedRecordHeader *erh = (ExpandedRecordHeader *) DatumGetEOHP(estate->retval);
+
+		Assert(erh->er_magic == ER_MAGIC);
+
+		/* Extract record's TupleDesc */
+		retdesc = expanded_record_get_tupdesc(erh);
+
+		/* check rowtype compatibility */
+		tupmap = convert_tuples_by_position(retdesc,
+											tupdesc,
+											gettext_noop("returned record type does not match expected record type"));
+
+		/* it might need conversion */
+		if (tupmap)
+		{
+			rettup = expanded_record_get_tuple(erh);
+			Assert(rettup);
+			rettup = do_convert_tuple(rettup, tupmap);
+
+			/*
+			 * Copy tuple to upper executor memory, as a tuple Datum.  Make
+			 * sure it is labeled with the caller-supplied tuple type.
+			 */
+			estate->retval = PointerGetDatum(SPI_returntuple(rettup, tupdesc));
+			/* no need to free map, we're about to return anyway */
+		}
+		else
+		{
+			/*
+			 * We need only copy result into upper executor memory context.
+			 * However, if we have a R/W expanded datum, we can just transfer
+			 * its ownership out to the upper executor context.
+			 */
+			estate->retval = SPI_datumTransfer(estate->retval,
+											   false,
+											   -1);
+		}
+	}
+	else
+	{
+		/* Convert composite datum to a HeapTuple and TupleDesc */
+		HeapTupleData tmptup;
+
+		retdesc = deconstruct_composite_datum(estate->retval, &tmptup);
+		rettup = &tmptup;
+
+		/* check rowtype compatibility */
+		tupmap = convert_tuples_by_position(retdesc,
+											tupdesc,
+											gettext_noop("returned record type does not match expected record type"));
+
+		/* it might need conversion */
+		if (tupmap)
+			rettup = do_convert_tuple(rettup, tupmap);
+
+		/*
+		 * Copy tuple to upper executor memory, as a tuple Datum.  Make sure
+		 * it is labeled with the caller-supplied tuple type.
+		 */
+		estate->retval = PointerGetDatum(SPI_returntuple(rettup, tupdesc));
+
+		/* no need to free map, we're about to return anyway */
+
+		ReleaseTupleDesc(retdesc);
+	}
+}
+
 
 /* ----------
  * plpgsql_exec_trigger		Called by the call handler for
@@ -617,9 +853,8 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 {
 	PLpgSQL_execstate estate;
 	ErrorContextCallback plerrcontext;
-	int			i;
 	int			rc;
-	PLpgSQL_var *var;
+	TupleDesc	tupdesc;
 	PLpgSQL_rec *rec_new,
 			   *rec_old;
 	HeapTuple	rettup;
@@ -628,6 +863,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 	 * Setup the execution state
 	 */
 	plpgsql_estate_setup(&estate, func, NULL, NULL);
+	estate.trigdata = trigdata;
 
 	/*
 	 * Setup error traceback support for ereport()
@@ -641,8 +877,7 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 	 * Make local execution copies of all the datums
 	 */
 	estate.err_text = gettext_noop("during initialization of execution state");
-	for (i = 0; i < estate.ndatums; i++)
-		estate.datums[i] = copy_plpgsql_datum(func->datums[i]);
+	copy_plpgsql_datums(&estate, func);
 
 	/*
 	 * Put the OLD and NEW tuples into record variables
@@ -653,37 +888,34 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 	 * might have a test like "if (TG_OP = 'INSERT' and NEW.foo = 'xyz')",
 	 * which should parse regardless of the current trigger type.
 	 */
+	tupdesc = RelationGetDescr(trigdata->tg_relation);
+
 	rec_new = (PLpgSQL_rec *) (estate.datums[func->new_varno]);
-	rec_new->freetup = false;
-	rec_new->tupdesc = trigdata->tg_relation->rd_att;
-	rec_new->freetupdesc = false;
 	rec_old = (PLpgSQL_rec *) (estate.datums[func->old_varno]);
-	rec_old->freetup = false;
-	rec_old->tupdesc = trigdata->tg_relation->rd_att;
-	rec_old->freetupdesc = false;
+
+	rec_new->erh = make_expanded_record_from_tupdesc(tupdesc,
+													 estate.datum_context);
+	rec_old->erh = make_expanded_record_from_exprecord(rec_new->erh,
+													   estate.datum_context);
 
 	if (!TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
 	{
 		/*
 		 * Per-statement triggers don't use OLD/NEW variables
 		 */
-		rec_new->tup = NULL;
-		rec_old->tup = NULL;
 	}
 	else if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
 	{
-		rec_new->tup = trigdata->tg_trigtuple;
-		rec_old->tup = NULL;
+		expanded_record_set_tuple(rec_new->erh, trigdata->tg_trigtuple, false);
 	}
 	else if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
 	{
-		rec_new->tup = trigdata->tg_newtuple;
-		rec_old->tup = trigdata->tg_trigtuple;
+		expanded_record_set_tuple(rec_new->erh, trigdata->tg_newtuple, false);
+		expanded_record_set_tuple(rec_old->erh, trigdata->tg_trigtuple, false);
 	}
 	else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
 	{
-		rec_new->tup = NULL;
-		rec_old->tup = trigdata->tg_trigtuple;
+		expanded_record_set_tuple(rec_old->erh, trigdata->tg_trigtuple, false);
 	}
 	else
 		elog(ERROR, "unrecognized trigger action: not INSERT, DELETE, or UPDATE");
@@ -692,106 +924,6 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 	rc = SPI_register_trigger_data(trigdata);
 	Assert(rc >= 0);
 
-	/*
-	 * Assign the special tg_ variables
-	 */
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_op_varno]);
-	if (TRIGGER_FIRED_BY_INSERT(trigdata->tg_event))
-		assign_text_var(&estate, var, "INSERT");
-	else if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
-		assign_text_var(&estate, var, "UPDATE");
-	else if (TRIGGER_FIRED_BY_DELETE(trigdata->tg_event))
-		assign_text_var(&estate, var, "DELETE");
-	else if (TRIGGER_FIRED_BY_TRUNCATE(trigdata->tg_event))
-		assign_text_var(&estate, var, "TRUNCATE");
-	else
-		elog(ERROR, "unrecognized trigger action: not INSERT, DELETE, UPDATE, or TRUNCATE");
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_name_varno]);
-	assign_simple_var(&estate, var,
-					  DirectFunctionCall1(namein,
-										  CStringGetDatum(trigdata->tg_trigger->tgname)),
-					  false, true);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_when_varno]);
-	if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
-		assign_text_var(&estate, var, "BEFORE");
-	else if (TRIGGER_FIRED_AFTER(trigdata->tg_event))
-		assign_text_var(&estate, var, "AFTER");
-	else if (TRIGGER_FIRED_INSTEAD(trigdata->tg_event))
-		assign_text_var(&estate, var, "INSTEAD OF");
-	else
-		elog(ERROR, "unrecognized trigger execution time: not BEFORE, AFTER, or INSTEAD OF");
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_level_varno]);
-	if (TRIGGER_FIRED_FOR_ROW(trigdata->tg_event))
-		assign_text_var(&estate, var, "ROW");
-	else if (TRIGGER_FIRED_FOR_STATEMENT(trigdata->tg_event))
-		assign_text_var(&estate, var, "STATEMENT");
-	else
-		elog(ERROR, "unrecognized trigger event type: not ROW or STATEMENT");
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_relid_varno]);
-	assign_simple_var(&estate, var,
-					  ObjectIdGetDatum(trigdata->tg_relation->rd_id),
-					  false, false);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_relname_varno]);
-	assign_simple_var(&estate, var,
-					  DirectFunctionCall1(namein,
-										  CStringGetDatum(RelationGetRelationName(trigdata->tg_relation))),
-					  false, true);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_table_name_varno]);
-	assign_simple_var(&estate, var,
-					  DirectFunctionCall1(namein,
-										  CStringGetDatum(RelationGetRelationName(trigdata->tg_relation))),
-					  false, true);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_table_schema_varno]);
-	assign_simple_var(&estate, var,
-					  DirectFunctionCall1(namein,
-										  CStringGetDatum(get_namespace_name(
-																			 RelationGetNamespace(
-																								  trigdata->tg_relation)))),
-					  false, true);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_nargs_varno]);
-	assign_simple_var(&estate, var,
-					  Int16GetDatum(trigdata->tg_trigger->tgnargs),
-					  false, false);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_argv_varno]);
-	if (trigdata->tg_trigger->tgnargs > 0)
-	{
-		/*
-		 * For historical reasons, tg_argv[] subscripts start at zero not one.
-		 * So we can't use construct_array().
-		 */
-		int			nelems = trigdata->tg_trigger->tgnargs;
-		Datum	   *elems;
-		int			dims[1];
-		int			lbs[1];
-
-		elems = palloc(sizeof(Datum) * nelems);
-		for (i = 0; i < nelems; i++)
-			elems[i] = CStringGetTextDatum(trigdata->tg_trigger->tgargs[i]);
-		dims[0] = nelems;
-		lbs[0] = 0;
-
-		assign_simple_var(&estate, var,
-						  PointerGetDatum(construct_md_array(elems, NULL,
-															 1, dims, lbs,
-															 TEXTOID,
-															 -1, false, 'i')),
-						  false, true);
-	}
-	else
-	{
-		assign_simple_var(&estate, var, (Datum) 0, true, false);
-	}
-
 	estate.err_text = gettext_noop("during function entry");
 
 	/*
@@ -842,20 +974,68 @@ plpgsql_exec_trigger(PLpgSQL_function *func,
 		rettup = NULL;
 	else
 	{
+		TupleDesc	retdesc;
 		TupleConversionMap *tupmap;
 
-		rettup = (HeapTuple) DatumGetPointer(estate.retval);
-		/* check rowtype compatibility */
-		tupmap = convert_tuples_by_position(estate.rettupdesc,
-											trigdata->tg_relation->rd_att,
-											gettext_noop("returned row structure does not match the structure of the triggering table"));
-		/* it might need conversion */
-		if (tupmap)
-			rettup = do_convert_tuple(rettup, tupmap);
-		/* no need to free map, we're about to return anyway */
+		/* We assume exec_stmt_return verified that result is composite */
+		Assert(type_is_rowtype(estate.rettype));
+
+		/* We can special-case expanded records for speed */
+		if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(estate.retval)))
+		{
+			ExpandedRecordHeader *erh = (ExpandedRecordHeader *) DatumGetEOHP(estate.retval);
+
+			Assert(erh->er_magic == ER_MAGIC);
+
+			/* Extract HeapTuple and TupleDesc */
+			rettup = expanded_record_get_tuple(erh);
+			Assert(rettup);
+			retdesc = expanded_record_get_tupdesc(erh);
+
+			if (retdesc != RelationGetDescr(trigdata->tg_relation))
+			{
+				/* check rowtype compatibility */
+				tupmap = convert_tuples_by_position(retdesc,
+													RelationGetDescr(trigdata->tg_relation),
+													gettext_noop("returned row structure does not match the structure of the triggering table"));
+				/* it might need conversion */
+				if (tupmap)
+					rettup = do_convert_tuple(rettup, tupmap);
+				/* no need to free map, we're about to return anyway */
+			}
+
+			/*
+			 * Copy tuple to upper executor memory.  But if user just did
+			 * "return new" or "return old" without changing anything, there's
+			 * no need to copy; we can return the original tuple (which will
+			 * save a few cycles in trigger.c as well as here).
+			 */
+			if (rettup != trigdata->tg_newtuple &&
+				rettup != trigdata->tg_trigtuple)
+				rettup = SPI_copytuple(rettup);
+		}
+		else
+		{
+			/* Convert composite datum to a HeapTuple and TupleDesc */
+			HeapTupleData tmptup;
+
+			retdesc = deconstruct_composite_datum(estate.retval, &tmptup);
+			rettup = &tmptup;
+
+			/* check rowtype compatibility */
+			tupmap = convert_tuples_by_position(retdesc,
+												RelationGetDescr(trigdata->tg_relation),
+												gettext_noop("returned row structure does not match the structure of the triggering table"));
+			/* it might need conversion */
+			if (tupmap)
+				rettup = do_convert_tuple(rettup, tupmap);
+
+			ReleaseTupleDesc(retdesc);
+			/* no need to free map, we're about to return anyway */
 
-		/* Copy tuple to upper executor memory */
-		rettup = SPI_copytuple(rettup);
+			/* Copy tuple to upper executor memory */
+			rettup = SPI_copytuple(rettup);
+		}
 	}
 
 	/*
@@ -890,14 +1070,13 @@ plpgsql_exec_event_trigger(PLpgSQL_function *func, EventTriggerData *trigdata)
 {
 	PLpgSQL_execstate estate;
 	ErrorContextCallback plerrcontext;
-	int			i;
 	int			rc;
-	PLpgSQL_var *var;
 
 	/*
 	 * Setup the execution state
 	 */
 	plpgsql_estate_setup(&estate, func, NULL, NULL);
+	estate.evtrigdata = trigdata;
 
 	/*
 	 * Setup error traceback support for ereport()
@@ -911,17 +1090,7 @@ plpgsql_exec_event_trigger(PLpgSQL_function *func, EventTriggerData *trigdata)
 	 * Make local execution copies of all the datums
 	 */
 	estate.err_text = gettext_noop("during initialization of execution state");
-	for (i = 0; i < estate.ndatums; i++)
-		estate.datums[i] = copy_plpgsql_datum(func->datums[i]);
-
-	/*
-	 * Assign the special tg_ variables
-	 */
-	var = (PLpgSQL_var *) (estate.datums[func->tg_event_varno]);
-	assign_text_var(&estate, var, trigdata->event);
-
-	var = (PLpgSQL_var *) (estate.datums[func->tg_tag_varno]);
-	assign_text_var(&estate, var, trigdata->tag);
+	copy_plpgsql_datums(&estate, func);
 
 	/*
 	 * Let the instrumentation plugin peek at this function
@@ -1027,60 +1196,234 @@ plpgsql_exec_error_callback(void *arg)
  * Support function for initializing local execution variables
  * ----------
  */
-static PLpgSQL_datum *
-copy_plpgsql_datum(PLpgSQL_datum *datum)
+static void
+copy_plpgsql_datums(PLpgSQL_execstate *estate,
+					PLpgSQL_function *func)
 {
-	PLpgSQL_datum *result;
+	int			ndatums = estate->ndatums;
+	PLpgSQL_datum **indatums;
+	PLpgSQL_datum **outdatums;
+	char	   *workspace;
+	char	   *ws_next;
+	int			i;
 
-	switch (datum->dtype)
+	/* Allocate local datum-pointer array */
+	estate->datums = (PLpgSQL_datum **)
+		palloc(sizeof(PLpgSQL_datum *) * ndatums);
+
+	/*
+	 * To reduce palloc overhead, we make a single palloc request for all the
+	 * space needed for locally-instantiated datums.
+	 */
+	workspace = palloc(func->copiable_size);
+	ws_next = workspace;
+
+	/* Fill datum-pointer array, copying datums into workspace as needed */
+	indatums = func->datums;
+	outdatums = estate->datums;
+	for (i = 0; i < ndatums; i++)
 	{
-		case PLPGSQL_DTYPE_VAR:
-			{
-				PLpgSQL_var *new = palloc(sizeof(PLpgSQL_var));
+		PLpgSQL_datum *indatum = indatums[i];
+		PLpgSQL_datum *outdatum;
 
-				memcpy(new, datum, sizeof(PLpgSQL_var));
-				/* should be preset to null/non-freeable */
-				Assert(new->isnull);
-				Assert(!new->freeval);
+		/* This must agree with plpgsql_finish_datums on what is copiable */
+		switch (indatum->dtype)
+		{
+			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
+				outdatum = (PLpgSQL_datum *) ws_next;
+				memcpy(outdatum, indatum, sizeof(PLpgSQL_var));
+				ws_next += MAXALIGN(sizeof(PLpgSQL_var));
+				break;
 
-				result = (PLpgSQL_datum *) new;
-			}
+			case PLPGSQL_DTYPE_REC:
+				outdatum = (PLpgSQL_datum *) ws_next;
+				memcpy(outdatum, indatum, sizeof(PLpgSQL_rec));
+				ws_next += MAXALIGN(sizeof(PLpgSQL_rec));
+				break;
+
+			case PLPGSQL_DTYPE_ROW:
+			case PLPGSQL_DTYPE_RECFIELD:
+			case PLPGSQL_DTYPE_ARRAYELEM:
+
+				/*
+				 * These datum records are read-only at runtime, so no need to
+				 * copy them (well, RECFIELD and ARRAYELEM contain cached
+				 * data, but we'd just as soon centralize the caching anyway).
+				 */
+				outdatum = indatum;
+				break;
+
+			default:
+				elog(ERROR, "unrecognized dtype: %d", indatum->dtype);
+				outdatum = NULL;	/* keep compiler quiet */
+				break;
+		}
+
+		outdatums[i] = outdatum;
+	}
+
+	Assert(ws_next == workspace + func->copiable_size);
+}
+
+/*
+ * If the variable has an armed "promise", compute the promised value
+ * and assign it to the variable.
+ * The assignment automatically disarms the promise.
+ */
+static void
+plpgsql_fulfill_promise(PLpgSQL_execstate *estate,
+						PLpgSQL_var *var)
+{
+	MemoryContext oldcontext;
+
+	if (var->promise == PLPGSQL_PROMISE_NONE)
+		return;					/* nothing to do */
+
+	/*
+	 * This will typically be invoked in a short-lived context such as the
+	 * mcontext.  We must create variable values in the estate's datum
+	 * context.  This quick-and-dirty solution risks leaking some additional
+	 * cruft there, but since any one promise is honored at most once per
+	 * function call, it's probably not worth being more careful.
+	 */
+	oldcontext = MemoryContextSwitchTo(estate->datum_context);
+
+	switch (var->promise)
+	{
+		case PLPGSQL_PROMISE_TG_NAME:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			assign_simple_var(estate, var,
+							  DirectFunctionCall1(namein,
+												  CStringGetDatum(estate->trigdata->tg_trigger->tgname)),
+							  false, true);
 			break;
 
-		case PLPGSQL_DTYPE_REC:
-			{
-				PLpgSQL_rec *new = palloc(sizeof(PLpgSQL_rec));
+		case PLPGSQL_PROMISE_TG_WHEN:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			if (TRIGGER_FIRED_BEFORE(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "BEFORE");
+			else if (TRIGGER_FIRED_AFTER(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "AFTER");
+			else if (TRIGGER_FIRED_INSTEAD(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "INSTEAD OF");
+			else
+				elog(ERROR, "unrecognized trigger execution time: not BEFORE, AFTER, or INSTEAD OF");
+			break;
+
+		case PLPGSQL_PROMISE_TG_LEVEL:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			if (TRIGGER_FIRED_FOR_ROW(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "ROW");
+			else if (TRIGGER_FIRED_FOR_STATEMENT(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "STATEMENT");
+			else
+				elog(ERROR, "unrecognized trigger event type: not ROW or STATEMENT");
+			break;
+
+		case PLPGSQL_PROMISE_TG_OP:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			if (TRIGGER_FIRED_BY_INSERT(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "INSERT");
+			else if (TRIGGER_FIRED_BY_UPDATE(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "UPDATE");
+			else if (TRIGGER_FIRED_BY_DELETE(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "DELETE");
+			else if (TRIGGER_FIRED_BY_TRUNCATE(estate->trigdata->tg_event))
+				assign_text_var(estate, var, "TRUNCATE");
+			else
+				elog(ERROR, "unrecognized trigger action: not INSERT, DELETE, UPDATE, or TRUNCATE");
+			break;
+
+		case PLPGSQL_PROMISE_TG_RELID:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			assign_simple_var(estate, var,
+							  ObjectIdGetDatum(estate->trigdata->tg_relation->rd_id),
+							  false, false);
+			break;
+
+		case PLPGSQL_PROMISE_TG_TABLE_NAME:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			assign_simple_var(estate, var,
+							  DirectFunctionCall1(namein,
+												  CStringGetDatum(RelationGetRelationName(estate->trigdata->tg_relation))),
+							  false, true);
+			break;
 
-				memcpy(new, datum, sizeof(PLpgSQL_rec));
-				/* should be preset to null/non-freeable */
-				Assert(new->tup == NULL);
-				Assert(new->tupdesc == NULL);
-				Assert(!new->freetup);
-				Assert(!new->freetupdesc);
+		case PLPGSQL_PROMISE_TG_TABLE_SCHEMA:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			assign_simple_var(estate, var,
+							  DirectFunctionCall1(namein,
+												  CStringGetDatum(get_namespace_name(RelationGetNamespace(estate->trigdata->tg_relation)))),
+							  false, true);
+			break;
+
+		case PLPGSQL_PROMISE_TG_NARGS:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			assign_simple_var(estate, var,
+							  Int16GetDatum(estate->trigdata->tg_trigger->tgnargs),
+							  false, false);
+			break;
+
+		case PLPGSQL_PROMISE_TG_ARGV:
+			if (estate->trigdata == NULL)
+				elog(ERROR, "trigger promise is not in a trigger function");
+			if (estate->trigdata->tg_trigger->tgnargs > 0)
+			{
+				/*
+				 * For historical reasons, tg_argv[] subscripts start at zero
+				 * not one.  So we can't use construct_array().
+				 */
+				int			nelems = estate->trigdata->tg_trigger->tgnargs;
+				Datum	   *elems;
+				int			dims[1];
+				int			lbs[1];
+				int			i;
 
-				result = (PLpgSQL_datum *) new;
+				elems = palloc(sizeof(Datum) * nelems);
+				for (i = 0; i < nelems; i++)
+					elems[i] = CStringGetTextDatum(estate->trigdata->tg_trigger->tgargs[i]);
+				dims[0] = nelems;
+				lbs[0] = 0;
+
+				assign_simple_var(estate, var,
+								  PointerGetDatum(construct_md_array(elems, NULL,
+																	 1, dims, lbs,
+																	 TEXTOID,
+																	 -1, false, 'i')),
+								  false, true);
+			}
+			else
+			{
+				assign_simple_var(estate, var, (Datum) 0, true, false);
 			}
 			break;
 
-		case PLPGSQL_DTYPE_ROW:
-		case PLPGSQL_DTYPE_RECFIELD:
-		case PLPGSQL_DTYPE_ARRAYELEM:
+		case PLPGSQL_PROMISE_TG_EVENT:
+			if (estate->evtrigdata == NULL)
+				elog(ERROR, "event trigger promise is not in an event trigger function");
+			assign_text_var(estate, var, estate->evtrigdata->event);
+			break;
 
-			/*
-			 * These datum records are read-only at runtime, so no need to
-			 * copy them (well, ARRAYELEM contains some cached type data, but
-			 * we'd just as soon centralize the caching anyway)
-			 */
-			result = datum;
+		case PLPGSQL_PROMISE_TG_TAG:
+			if (estate->evtrigdata == NULL)
+				elog(ERROR, "event trigger promise is not in an event trigger function");
+			assign_text_var(estate, var, estate->evtrigdata->tag);
 			break;
 
 		default:
-			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
-			result = NULL;		/* keep compiler quiet */
-			break;
+			elog(ERROR, "unrecognized promise type: %d", var->promise);
 	}
 
-	return result;
+	MemoryContextSwitchTo(oldcontext);
 }
 
 /*
@@ -1178,7 +1521,6 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 {
 	volatile int rc = -1;
 	int			i;
-	int			n;
 
 	/*
 	 * First initialize all variables declared in this block
@@ -1187,13 +1529,21 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 
 	for (i = 0; i < block->n_initvars; i++)
 	{
-		n = block->initvarnos[i];
+		int			n = block->initvarnos[i];
+		PLpgSQL_datum *datum = estate->datums[n];
 
-		switch (estate->datums[n]->dtype)
+		/*
+		 * The set of dtypes handled here must match plpgsql_add_initdatums().
+		 *
+		 * Note that we currently don't support promise datums within blocks,
+		 * only at a function's outermost scope, so we needn't handle those
+		 * here.
+		 */
+		switch (datum->dtype)
 		{
 			case PLPGSQL_DTYPE_VAR:
 				{
-					PLpgSQL_var *var = (PLpgSQL_var *) (estate->datums[n]);
+					PLpgSQL_var *var = (PLpgSQL_var *) datum;
 
 					/*
 					 * Free any old value, in case re-entering block, and
@@ -1205,11 +1555,9 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 					{
 						/*
 						 * If needed, give the datatype a chance to reject
-						 * NULLs, by assigning a NULL to the variable. We
+						 * NULLs, by assigning a NULL to the variable.  We
 						 * claim the value is of type UNKNOWN, not the var's
-						 * datatype, else coercion will be skipped. (Do this
-						 * before the notnull check to be consistent with
-						 * exec_assign_value.)
+						 * datatype, else coercion will be skipped.
 						 */
 						if (var->datatype->typtype == TYPTYPE_DOMAIN)
 							exec_assign_value(estate,
@@ -1219,11 +1567,8 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 											  UNKNOWNOID,
 											  -1);
 
-						if (var->notnull)
-							ereport(ERROR,
-									(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
-									 errmsg("variable \"%s\" declared NOT NULL cannot default to NULL",
-											var->refname)));
+						/* parser should have rejected NOT NULL */
+						Assert(!var->notnull);
 					}
 					else
 					{
@@ -1235,30 +1580,35 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 
 			case PLPGSQL_DTYPE_REC:
 				{
-					PLpgSQL_rec *rec = (PLpgSQL_rec *) (estate->datums[n]);
+					PLpgSQL_rec *rec = (PLpgSQL_rec *) datum;
 
-					if (rec->freetup)
+					/*
+					 * Deletion of any existing object will be handled during
+					 * the assignments below, and in some cases it's more
+					 * efficient for us not to get rid of it beforehand.
+					 */
+					if (rec->default_val == NULL)
 					{
-						heap_freetuple(rec->tup);
-						rec->freetup = false;
+						/*
+						 * If needed, give the datatype a chance to reject
+						 * NULLs, by assigning a NULL to the variable.
+						 */
+						exec_move_row(estate, (PLpgSQL_variable *) rec,
+									  NULL, NULL);
+
+						/* parser should have rejected NOT NULL */
+						Assert(!rec->notnull);
 					}
-					if (rec->freetupdesc)
+					else
 					{
-						FreeTupleDesc(rec->tupdesc);
-						rec->freetupdesc = false;
+						exec_assign_expr(estate, (PLpgSQL_datum *) rec,
+										 rec->default_val);
 					}
-					rec->tup = NULL;
-					rec->tupdesc = NULL;
 				}
 				break;
 
-			case PLPGSQL_DTYPE_RECFIELD:
-			case PLPGSQL_DTYPE_ARRAYELEM:
-				break;
-
 			default:
-				elog(ERROR, "unrecognized dtype: %d",
-					 estate->datums[n]->dtype);
+				elog(ERROR, "unrecognized dtype: %d", datum->dtype);
 		}
 	}
 
@@ -1309,16 +1659,12 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 
 			/*
 			 * If the block ended with RETURN, we may need to copy the return
-			 * value out of the subtransaction eval_context.  This is
-			 * currently only needed for scalar result types --- rowtype
-			 * values will always exist in the function's main memory context,
-			 * cf. exec_stmt_return().  We can avoid a physical copy if the
-			 * value happens to be a R/W expanded object.
+			 * value out of the subtransaction eval_context.  We can avoid a
+			 * physical copy if the value happens to be a R/W expanded object.
 			 */
 			if (rc == PLPGSQL_RC_RETURN &&
 				!estate->retisset &&
-				!estate->retisnull &&
-				estate->rettupdesc == NULL)
+				!estate->retisnull)
 			{
 				int16		resTypLen;
 				bool		resTypByVal;
@@ -1462,7 +1808,9 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 	estate->err_text = NULL;
 
 	/*
-	 * Handle the return code.
+	 * Handle the return code.  This is intentionally different from
+	 * LOOP_RC_PROCESSING(): CONTINUE never matches a block, and EXIT matches
+	 * a block only if there is a label match.
 	 */
 	switch (rc)
 	{
@@ -1472,11 +1820,6 @@ exec_stmt_block(PLpgSQL_execstate *estate, PLpgSQL_stmt_block *block)
 			return rc;
 
 		case PLPGSQL_RC_EXIT:
-
-			/*
-			 * This is intentionally different from the handling of RC_EXIT
-			 * for loops: to match a block, we require a match by label.
-			 */
 			if (estate->exitlabel == NULL)
 				return PLPGSQL_RC_EXIT;
 			if (block->label == NULL)
@@ -1646,9 +1989,17 @@ exec_stmt(PLpgSQL_execstate *estate, PLpgSQL_stmt *stmt)
 			rc = exec_stmt_close(estate, (PLpgSQL_stmt_close *) stmt);
 			break;
 
-		default:
+		case PLPGSQL_STMT_COMMIT:
+			rc = exec_stmt_commit(estate, (PLpgSQL_stmt_commit *) stmt);
+			break;
+
+		case PLPGSQL_STMT_ROLLBACK:
+			rc = exec_stmt_rollback(estate, (PLpgSQL_stmt_rollback *) stmt);
+			break;
+
+		default:
 			estate->err_stmt = save_estmt;
-			elog(ERROR, "unrecognized cmdtype: %d", stmt->cmd_type);
+			elog(ERROR, "unrecognized cmd_type: %d", stmt->cmd_type);
 	}
 
 	/* Let the plugin know that we have finished executing this statement */
@@ -1934,45 +2285,16 @@ exec_stmt_case(PLpgSQL_execstate *estate, PLpgSQL_stmt_case *stmt)
 static int
 exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt)
 {
+	int			rc = PLPGSQL_RC_OK;
+
 	for (;;)
 	{
-		int			rc = exec_stmts(estate, stmt->body);
-
-		switch (rc)
-		{
-			case PLPGSQL_RC_OK:
-				break;
-
-			case PLPGSQL_RC_EXIT:
-				if (estate->exitlabel == NULL)
-					return PLPGSQL_RC_OK;
-				if (stmt->label == NULL)
-					return PLPGSQL_RC_EXIT;
-				if (strcmp(stmt->label, estate->exitlabel) != 0)
-					return PLPGSQL_RC_EXIT;
-				estate->exitlabel = NULL;
-				return PLPGSQL_RC_OK;
-
-			case PLPGSQL_RC_CONTINUE:
-				if (estate->exitlabel == NULL)
-					/* anonymous continue, so re-run the loop */
-					break;
-				else if (stmt->label != NULL &&
-						 strcmp(stmt->label, estate->exitlabel) == 0)
-					/* label matches named continue, so re-run loop */
-					estate->exitlabel = NULL;
-				else
-					/* label doesn't match named continue, so propagate upward */
-					return PLPGSQL_RC_CONTINUE;
-				break;
-
-			case PLPGSQL_RC_RETURN:
-				return rc;
+		rc = exec_stmts(estate, stmt->body);
 
-			default:
-				elog(ERROR, "unrecognized rc: %d", rc);
-		}
+		LOOP_RC_PROCESSING(stmt->label, break);
 	}
+
+	return rc;
 }
 
 
@@ -1985,9 +2307,10 @@ exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt)
 static int
 exec_stmt_while(PLpgSQL_execstate *estate, PLpgSQL_stmt_while *stmt)
 {
+	int			rc = PLPGSQL_RC_OK;
+
 	for (;;)
 	{
-		int			rc;
 		bool		value;
 		bool		isnull;
 
@@ -1999,43 +2322,10 @@ exec_stmt_while(PLpgSQL_execstate *estate, PLpgSQL_stmt_while *stmt)
 
 		rc = exec_stmts(estate, stmt->body);
 
-		switch (rc)
-		{
-			case PLPGSQL_RC_OK:
-				break;
-
-			case PLPGSQL_RC_EXIT:
-				if (estate->exitlabel == NULL)
-					return PLPGSQL_RC_OK;
-				if (stmt->label == NULL)
-					return PLPGSQL_RC_EXIT;
-				if (strcmp(stmt->label, estate->exitlabel) != 0)
-					return PLPGSQL_RC_EXIT;
-				estate->exitlabel = NULL;
-				return PLPGSQL_RC_OK;
-
-			case PLPGSQL_RC_CONTINUE:
-				if (estate->exitlabel == NULL)
-					/* anonymous continue, so re-run loop */
-					break;
-				else if (stmt->label != NULL &&
-						 strcmp(stmt->label, estate->exitlabel) == 0)
-					/* label matches named continue, so re-run loop */
-					estate->exitlabel = NULL;
-				else
-					/* label doesn't match named continue, propagate upward */
-					return PLPGSQL_RC_CONTINUE;
-				break;
-
-			case PLPGSQL_RC_RETURN:
-				return rc;
-
-			default:
-				elog(ERROR, "unrecognized rc: %d", rc);
-		}
+		LOOP_RC_PROCESSING(stmt->label, break);
 	}
 
-	return PLPGSQL_RC_OK;
+	return rc;
 }
 
 
@@ -2149,50 +2439,7 @@ exec_stmt_fori(PLpgSQL_execstate *estate, PLpgSQL_stmt_fori *stmt)
 		 */
 		rc = exec_stmts(estate, stmt->body);
 
-		if (rc == PLPGSQL_RC_RETURN)
-			break;				/* break out of the loop */
-		else if (rc == PLPGSQL_RC_EXIT)
-		{
-			if (estate->exitlabel == NULL)
-				/* unlabelled exit, finish the current loop */
-				rc = PLPGSQL_RC_OK;
-			else if (stmt->label != NULL &&
-					 strcmp(stmt->label, estate->exitlabel) == 0)
-			{
-				/* labelled exit, matches the current stmt's label */
-				estate->exitlabel = NULL;
-				rc = PLPGSQL_RC_OK;
-			}
-
-			/*
-			 * otherwise, this is a labelled exit that does not match the
-			 * current statement's label, if any: return RC_EXIT so that the
-			 * EXIT continues to propagate up the stack.
-			 */
-			break;
-		}
-		else if (rc == PLPGSQL_RC_CONTINUE)
-		{
-			if (estate->exitlabel == NULL)
-				/* unlabelled continue, so re-run the current loop */
-				rc = PLPGSQL_RC_OK;
-			else if (stmt->label != NULL &&
-					 strcmp(stmt->label, estate->exitlabel) == 0)
-			{
-				/* label matches named continue, so re-run loop */
-				estate->exitlabel = NULL;
-				rc = PLPGSQL_RC_OK;
-			}
-			else
-			{
-				/*
-				 * otherwise, this is a named continue that does not match the
-				 * current statement's label, if any: return RC_CONTINUE so
-				 * that the CONTINUE will propagate up the stack.
-				 */
-				break;
-			}
-		}
+		LOOP_RC_PROCESSING(stmt->label, break);
 
 		/*
 		 * Increase/decrease loop value, unless it would overflow, in which
@@ -2321,7 +2568,7 @@ exec_stmt_forc(PLpgSQL_execstate *estate, PLpgSQL_stmt_forc *stmt)
 		set_args.sqlstmt = stmt->argquery;
 		set_args.into = true;
 		/* XXX historically this has not been STRICT */
-		set_args.row = (PLpgSQL_row *)
+		set_args.target = (PLpgSQL_variable *)
 			(estate->datums[curvar->cursor_explicit_argrow]);
 
 		if (exec_stmt_execsql(estate, &set_args) != PLPGSQL_RC_OK)
@@ -2342,9 +2589,9 @@ exec_stmt_forc(PLpgSQL_execstate *estate, PLpgSQL_stmt_forc *stmt)
 		exec_prepare_plan(estate, query, curvar->cursor_options);
 
 	/*
-	 * Set up short-lived ParamListInfo
+	 * Set up ParamListInfo for this query
 	 */
-	paramLI = setup_unshared_param_list(estate, query);
+	paramLI = setup_param_list(estate, query);
 
 	/*
 	 * Open the cursor (the paramlist will get copied into the portal)
@@ -2522,51 +2769,7 @@ exec_stmt_foreach_a(PLpgSQL_execstate *estate, PLpgSQL_stmt_foreach_a *stmt)
 		 */
 		rc = exec_stmts(estate, stmt->body);
 
-		/* Handle the return code */
-		if (rc == PLPGSQL_RC_RETURN)
-			break;				/* break out of the loop */
-		else if (rc == PLPGSQL_RC_EXIT)
-		{
-			if (estate->exitlabel == NULL)
-				/* unlabelled exit, finish the current loop */
-				rc = PLPGSQL_RC_OK;
-			else if (stmt->label != NULL &&
-					 strcmp(stmt->label, estate->exitlabel) == 0)
-			{
-				/* labelled exit, matches the current stmt's label */
-				estate->exitlabel = NULL;
-				rc = PLPGSQL_RC_OK;
-			}
-
-			/*
-			 * otherwise, this is a labelled exit that does not match the
-			 * current statement's label, if any: return RC_EXIT so that the
-			 * EXIT continues to propagate up the stack.
-			 */
-			break;
-		}
-		else if (rc == PLPGSQL_RC_CONTINUE)
-		{
-			if (estate->exitlabel == NULL)
-				/* unlabelled continue, so re-run the current loop */
-				rc = PLPGSQL_RC_OK;
-			else if (stmt->label != NULL &&
-					 strcmp(stmt->label, estate->exitlabel) == 0)
-			{
-				/* label matches named continue, so re-run loop */
-				estate->exitlabel = NULL;
-				rc = PLPGSQL_RC_OK;
-			}
-			else
-			{
-				/*
-				 * otherwise, this is a named continue that does not match the
-				 * current statement's label, if any: return RC_CONTINUE so
-				 * that the CONTINUE will propagate up the stack.
-				 */
-				break;
-			}
-		}
+		LOOP_RC_PROCESSING(stmt->label, break);
 
 		MemoryContextSwitchTo(stmt_mcontext);
 	}
@@ -2625,12 +2828,8 @@ exec_stmt_exit(PLpgSQL_execstate *estate, PLpgSQL_stmt_exit *stmt)
  * exec_stmt_return			Evaluate an expression and start
  *					returning from the function.
  *
- * Note: in the retistuple code paths, the returned tuple is always in the
- * function's main context, whereas for non-tuple data types the result may
- * be in the eval_mcontext.  The former case is not a memory leak since we're
- * about to exit the function anyway.  (If you want to change it, note that
- * exec_stmt_block() knows about this behavior.)  The latter case means that
- * we must not do exec_eval_cleanup while unwinding the control stack.
+ * Note: The result may be in the eval_mcontext.  Therefore, we must not
+ * do exec_eval_cleanup while unwinding the control stack.
  * ----------
  */
 static int
@@ -2644,9 +2843,8 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 	if (estate->retisset)
 		return PLPGSQL_RC_RETURN;
 
-	/* initialize for null result (possibly a tuple) */
+	/* initialize for null result */
 	estate->retval = (Datum) 0;
-	estate->rettupdesc = NULL;
 	estate->retisnull = true;
 	estate->rettype = InvalidOid;
 
@@ -2668,6 +2866,12 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 
 		switch (retvar->dtype)
 		{
+			case PLPGSQL_DTYPE_PROMISE:
+				/* fulfill promise if needed, then handle like regular var */
+				plpgsql_fulfill_promise(estate, (PLpgSQL_var *) retvar);
+
+				/* FALL THRU */
+
 			case PLPGSQL_DTYPE_VAR:
 				{
 					PLpgSQL_var *var = (PLpgSQL_var *) retvar;
@@ -2677,10 +2881,12 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 					estate->rettype = var->datatype->typoid;
 
 					/*
-					 * Cope with retistuple case.  A PLpgSQL_var could not be
-					 * of composite type, so we needn't make any effort to
-					 * convert.  However, for consistency with the expression
-					 * code path, don't throw error if the result is NULL.
+					 * A PLpgSQL_var could not be of composite type, so
+					 * conversion must fail if retistuple.  We throw a custom
+					 * error mainly for consistency with historical behavior.
+					 * For the same reason, we don't throw error if the result
+					 * is NULL.  (Note that plpgsql_exec_trigger assumes that
+					 * any non-null result has been verified to be composite.)
 					 */
 					if (estate->retistuple && !estate->retisnull)
 						ereport(ERROR,
@@ -2692,23 +2898,13 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 			case PLPGSQL_DTYPE_REC:
 				{
 					PLpgSQL_rec *rec = (PLpgSQL_rec *) retvar;
-					int32		rettypmod;
 
-					if (HeapTupleIsValid(rec->tup))
+					/* If record is empty, we return NULL not a row of nulls */
+					if (rec->erh && !ExpandedRecordIsEmpty(rec->erh))
 					{
-						if (estate->retistuple)
-						{
-							estate->retval = PointerGetDatum(rec->tup);
-							estate->rettupdesc = rec->tupdesc;
-							estate->retisnull = false;
-						}
-						else
-							exec_eval_datum(estate,
-											retvar,
-											&estate->rettype,
-											&rettypmod,
-											&estate->retval,
-											&estate->retisnull);
+						estate->retval = ExpandedRecordGetDatum(rec->erh);
+						estate->retisnull = false;
+						estate->rettype = rec->rectypeid;
 					}
 				}
 				break;
@@ -2718,26 +2914,13 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 					PLpgSQL_row *row = (PLpgSQL_row *) retvar;
 					int32		rettypmod;
 
-					if (estate->retistuple)
-					{
-						HeapTuple	tup;
-
-						if (!row->rowtupdesc)	/* should not happen */
-							elog(ERROR, "row variable has no tupdesc");
-						tup = make_tuple_from_row(estate, row, row->rowtupdesc);
-						if (tup == NULL)	/* should not happen */
-							elog(ERROR, "row not compatible with its own tupdesc");
-						estate->retval = PointerGetDatum(tup);
-						estate->rettupdesc = row->rowtupdesc;
-						estate->retisnull = false;
-					}
-					else
-						exec_eval_datum(estate,
-										retvar,
-										&estate->rettype,
-										&rettypmod,
-										&estate->retval,
-										&estate->retisnull);
+					/* We get here if there are multiple OUT parameters */
+					exec_eval_datum(estate,
+									(PLpgSQL_datum *) row,
+									&estate->rettype,
+									&rettypmod,
+									&estate->retval,
+									&estate->retisnull);
 				}
 				break;
 
@@ -2757,23 +2940,15 @@ exec_stmt_return(PLpgSQL_execstate *estate, PLpgSQL_stmt_return *stmt)
 										&(estate->rettype),
 										&rettypmod);
 
-		if (estate->retistuple && !estate->retisnull)
-		{
-			/* Convert composite datum to a HeapTuple and TupleDesc */
-			HeapTuple	tuple;
-			TupleDesc	tupdesc;
-
-			/* Source must be of RECORD or composite type */
-			if (!type_is_rowtype(estate->rettype))
-				ereport(ERROR,
-						(errcode(ERRCODE_DATATYPE_MISMATCH),
-						 errmsg("cannot return non-composite value from function returning composite type")));
-			tuple = get_tuple_from_datum(estate->retval);
-			tupdesc = get_tupdesc_from_datum(estate->retval);
-			estate->retval = PointerGetDatum(tuple);
-			estate->rettupdesc = CreateTupleDescCopy(tupdesc);
-			ReleaseTupleDesc(tupdesc);
-		}
+		/*
+		 * As in the DTYPE_VAR case above, throw a custom error if a non-null,
+		 * non-composite value is returned in a function returning tuple.
+		 */
+		if (estate->retistuple && !estate->retisnull &&
+			!type_is_rowtype(estate->rettype))
+			ereport(ERROR,
+					(errcode(ERRCODE_DATATYPE_MISMATCH),
+					 errmsg("cannot return non-composite value from function returning composite type")));
 
 		return PLPGSQL_RC_RETURN;
 	}
@@ -2816,8 +2991,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 	if (estate->tuple_store == NULL)
 		exec_init_tuple_store(estate);
 
-	/* rettupdesc will be filled by exec_init_tuple_store */
-	tupdesc = estate->rettupdesc;
+	/* tuple_store_desc will be filled by exec_init_tuple_store */
+	tupdesc = estate->tuple_store_desc;
 	natts = tupdesc->natts;
 
 	/*
@@ -2836,11 +3011,18 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 
 		switch (retvar->dtype)
 		{
+			case PLPGSQL_DTYPE_PROMISE:
+				/* fulfill promise if needed, then handle like regular var */
+				plpgsql_fulfill_promise(estate, (PLpgSQL_var *) retvar);
+
+				/* FALL THRU */
+
 			case PLPGSQL_DTYPE_VAR:
 				{
 					PLpgSQL_var *var = (PLpgSQL_var *) retvar;
 					Datum		retval = var->value;
 					bool		isNull = var->isnull;
+					Form_pg_attribute attr = TupleDescAttr(tupdesc, 0);
 
 					if (natts != 1)
 						ereport(ERROR,
@@ -2858,8 +3040,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 											 &isNull,
 											 var->datatype->typoid,
 											 var->datatype->atttypmod,
-											 tupdesc->attrs[0]->atttypid,
-											 tupdesc->attrs[0]->atttypmod);
+											 attr->atttypid,
+											 attr->atttypmod);
 
 					tuplestore_putvalues(estate->tuple_store, tupdesc,
 										 &retval, &isNull);
@@ -2869,22 +3051,22 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 			case PLPGSQL_DTYPE_REC:
 				{
 					PLpgSQL_rec *rec = (PLpgSQL_rec *) retvar;
+					TupleDesc	rec_tupdesc;
 					TupleConversionMap *tupmap;
 
-					if (!HeapTupleIsValid(rec->tup))
-						ereport(ERROR,
-								(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-								 errmsg("record \"%s\" is not assigned yet",
-										rec->refname),
-								 errdetail("The tuple structure of a not-yet-assigned"
-										   " record is indeterminate.")));
+					/* If rec is null, try to convert it to a row of nulls */
+					if (rec->erh == NULL)
+						instantiate_empty_record_variable(estate, rec);
+					if (ExpandedRecordIsEmpty(rec->erh))
+						deconstruct_expanded_record(rec->erh);
 
 					/* Use eval_mcontext for tuple conversion work */
 					oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
-					tupmap = convert_tuples_by_position(rec->tupdesc,
+					rec_tupdesc = expanded_record_get_tupdesc(rec->erh);
+					tupmap = convert_tuples_by_position(rec_tupdesc,
 														tupdesc,
 														gettext_noop("wrong record type supplied in RETURN NEXT"));
-					tuple = rec->tup;
+					tuple = expanded_record_get_tuple(rec->erh);
 					if (tupmap)
 						tuple = do_convert_tuple(tuple, tupmap);
 					tuplestore_puttuple(estate->tuple_store, tuple);
@@ -2896,10 +3078,12 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 				{
 					PLpgSQL_row *row = (PLpgSQL_row *) retvar;
 
+					/* We get here if there are multiple OUT parameters */
+
 					/* Use eval_mcontext for tuple conversion work */
 					oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
 					tuple = make_tuple_from_row(estate, row, tupdesc);
-					if (tuple == NULL)
+					if (tuple == NULL)	/* should not happen */
 						ereport(ERROR,
 								(errcode(ERRCODE_DATATYPE_MISMATCH),
 								 errmsg("wrong record type supplied in RETURN NEXT")));
@@ -2931,6 +3115,7 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 			/* Expression should be of RECORD or composite type */
 			if (!isNull)
 			{
+				HeapTupleData tmptup;
 				TupleDesc	retvaldesc;
 				TupleConversionMap *tupmap;
 
@@ -2941,8 +3126,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 
 				/* Use eval_mcontext for tuple conversion work */
 				oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
-				tuple = get_tuple_from_datum(retval);
-				retvaldesc = get_tupdesc_from_datum(retval);
+				retvaldesc = deconstruct_composite_datum(retval, &tmptup);
+				tuple = &tmptup;
 				tupmap = convert_tuples_by_position(retvaldesc, tupdesc,
 													gettext_noop("returned record type does not match expected record type"));
 				if (tupmap)
@@ -2968,6 +3153,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 		}
 		else
 		{
+			Form_pg_attribute attr = TupleDescAttr(tupdesc, 0);
+
 			/* Simple scalar result */
 			if (natts != 1)
 				ereport(ERROR,
@@ -2980,8 +3167,8 @@ exec_stmt_return_next(PLpgSQL_execstate *estate,
 									 &isNull,
 									 rettype,
 									 rettypmod,
-									 tupdesc->attrs[0]->atttypid,
-									 tupdesc->attrs[0]->atttypmod);
+									 attr->atttypid,
+									 attr->atttypmod);
 
 			tuplestore_putvalues(estate->tuple_store, tupdesc,
 								 &retval, &isNull);
@@ -3040,7 +3227,7 @@ exec_stmt_return_query(PLpgSQL_execstate *estate,
 	oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
 
 	tupmap = convert_tuples_by_position(portal->tupDesc,
-										estate->rettupdesc,
+										estate->tuple_store_desc,
 										gettext_noop("structure of query does not match function result type"));
 
 	while (true)
@@ -3117,7 +3304,7 @@ exec_init_tuple_store(PLpgSQL_execstate *estate)
 	CurrentResourceOwner = oldowner;
 	MemoryContextSwitchTo(oldcxt);
 
-	estate->rettupdesc = rsi->expectedDesc;
+	estate->tuple_store_desc = rsi->expectedDesc;
 }
 
 #define SET_RAISE_OPTION_TEXT(opt, name) \
@@ -3400,6 +3587,8 @@ plpgsql_estate_setup(PLpgSQL_execstate *estate,
 	func->cur_estate = estate;
 
 	estate->func = func;
+	estate->trigdata = NULL;
+	estate->evtrigdata = NULL;
 
 	estate->retval = (Datum) 0;
 	estate->retisnull = true;
@@ -3411,11 +3600,11 @@ plpgsql_estate_setup(PLpgSQL_execstate *estate,
 
 	estate->readonly_func = func->fn_readonly;
 
-	estate->rettupdesc = NULL;
 	estate->exitlabel = NULL;
 	estate->cur_error = NULL;
 
 	estate->tuple_store = NULL;
+	estate->tuple_store_desc = NULL;
 	if (rsi)
 	{
 		estate->tuple_store_cxt = rsi->econtext->ecxt_per_query_memory;
@@ -3430,20 +3619,20 @@ plpgsql_estate_setup(PLpgSQL_execstate *estate,
 
 	estate->found_varno = func->found_varno;
 	estate->ndatums = func->ndatums;
-	estate->datums = palloc(sizeof(PLpgSQL_datum *) * estate->ndatums);
-	/* caller is expected to fill the datums array */
+	estate->datums = NULL;
+	/* the datums array will be filled by copy_plpgsql_datums() */
+	estate->datum_context = CurrentMemoryContext;
 
-	/* initialize ParamListInfo with one entry per datum, all invalid */
+	/* initialize our ParamListInfo with appropriate hook functions */
 	estate->paramLI = (ParamListInfo)
-		palloc0(offsetof(ParamListInfoData, params) +
-				estate->ndatums * sizeof(ParamExternData));
+		palloc(offsetof(ParamListInfoData, params));
 	estate->paramLI->paramFetch = plpgsql_param_fetch;
 	estate->paramLI->paramFetchArg = (void *) estate;
+	estate->paramLI->paramCompile = plpgsql_param_compile;
+	estate->paramLI->paramCompileArg = NULL;	/* not needed */
 	estate->paramLI->parserSetup = (ParserSetupHook) plpgsql_parser_setup;
 	estate->paramLI->parserSetupArg = NULL; /* filled during use */
 	estate->paramLI->numParams = estate->ndatums;
-	estate->paramLI->paramMask = NULL;
-	estate->params_dirty = false;
 
 	/* set up for use of appropriate simple-expression EState and cast hash */
 	if (simple_eval_estate)
@@ -3746,8 +3935,7 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 	{
 		SPITupleTable *tuptab = SPI_tuptable;
 		uint64		n = SPI_processed;
-		PLpgSQL_rec *rec = NULL;
-		PLpgSQL_row *row = NULL;
+		PLpgSQL_variable *target;
 
 		/* If the statement did not return a tuple table, complain */
 		if (tuptab == NULL)
@@ -3755,13 +3943,8 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 					(errcode(ERRCODE_SYNTAX_ERROR),
 					 errmsg("INTO used with a command that cannot return data")));
 
-		/* Determine if we assign to a record or a row */
-		if (stmt->rec != NULL)
-			rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->dno]);
-		else if (stmt->row != NULL)
-			row = (PLpgSQL_row *) (estate->datums[stmt->row->dno]);
-		else
-			elog(ERROR, "unsupported target");
+		/* Fetch target's datum entry */
+		target = (PLpgSQL_variable *) estate->datums[stmt->target->dno];
 
 		/*
 		 * If SELECT ... INTO specified STRICT, and the query didn't find
@@ -3785,7 +3968,7 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 						 errdetail ? errdetail_internal("parameters: %s", errdetail) : 0));
 			}
 			/* set the target to NULL(s) */
-			exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+			exec_move_row(estate, target, NULL, tuptab->tupdesc);
 		}
 		else
 		{
@@ -3804,7 +3987,7 @@ exec_stmt_execsql(PLpgSQL_execstate *estate,
 						 errdetail ? errdetail_internal("parameters: %s", errdetail) : 0));
 			}
 			/* Put the first result row into the target */
-			exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
+			exec_move_row(estate, target, tuptab->vals[0], tuptab->tupdesc);
 		}
 
 		/* Clean up */
@@ -3937,8 +4120,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 	{
 		SPITupleTable *tuptab = SPI_tuptable;
 		uint64		n = SPI_processed;
-		PLpgSQL_rec *rec = NULL;
-		PLpgSQL_row *row = NULL;
+		PLpgSQL_variable *target;
 
 		/* If the statement did not return a tuple table, complain */
 		if (tuptab == NULL)
@@ -3946,13 +4128,8 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 					(errcode(ERRCODE_SYNTAX_ERROR),
 					 errmsg("INTO used with a command that cannot return data")));
 
-		/* Determine if we assign to a record or a row */
-		if (stmt->rec != NULL)
-			rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->dno]);
-		else if (stmt->row != NULL)
-			row = (PLpgSQL_row *) (estate->datums[stmt->row->dno]);
-		else
-			elog(ERROR, "unsupported target");
+		/* Fetch target's datum entry */
+		target = (PLpgSQL_variable *) estate->datums[stmt->target->dno];
 
 		/*
 		 * If SELECT ... INTO specified STRICT, and the query didn't find
@@ -3976,7 +4153,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 						 errdetail ? errdetail_internal("parameters: %s", errdetail) : 0));
 			}
 			/* set the target to NULL(s) */
-			exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+			exec_move_row(estate, target, NULL, tuptab->tupdesc);
 		}
 		else
 		{
@@ -3996,7 +4173,7 @@ exec_stmt_dynexecute(PLpgSQL_execstate *estate,
 			}
 
 			/* Put the first result row into the target */
-			exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
+			exec_move_row(estate, target, tuptab->vals[0], tuptab->tupdesc);
 		}
 		/* clean up after exec_move_row() */
 		exec_eval_cleanup(estate);
@@ -4154,7 +4331,7 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 			set_args.sqlstmt = stmt->argquery;
 			set_args.into = true;
 			/* XXX historically this has not been STRICT */
-			set_args.row = (PLpgSQL_row *)
+			set_args.target = (PLpgSQL_variable *)
 				(estate->datums[curvar->cursor_explicit_argrow]);
 
 			if (exec_stmt_execsql(estate, &set_args) != PLPGSQL_RC_OK)
@@ -4174,12 +4351,12 @@ exec_stmt_open(PLpgSQL_execstate *estate, PLpgSQL_stmt_open *stmt)
 	}
 
 	/*
-	 * Set up short-lived ParamListInfo
+	 * Set up ParamListInfo for this query
 	 */
-	paramLI = setup_unshared_param_list(estate, query);
+	paramLI = setup_param_list(estate, query);
 
 	/*
-	 * Open the cursor
+	 * Open the cursor (the paramlist will get copied into the portal)
 	 */
 	portal = SPI_cursor_open_with_paramlist(curname, query->plan,
 											paramLI,
@@ -4212,8 +4389,6 @@ static int
 exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt)
 {
 	PLpgSQL_var *curvar;
-	PLpgSQL_rec *rec = NULL;
-	PLpgSQL_row *row = NULL;
 	long		how_many = stmt->how_many;
 	SPITupleTable *tuptab;
 	Portal		portal;
@@ -4260,16 +4435,7 @@ exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt)
 
 	if (!stmt->is_move)
 	{
-		/* ----------
-		 * Determine if we fetch into a record or a row
-		 * ----------
-		 */
-		if (stmt->rec != NULL)
-			rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->dno]);
-		else if (stmt->row != NULL)
-			row = (PLpgSQL_row *) (estate->datums[stmt->row->dno]);
-		else
-			elog(ERROR, "unsupported target");
+		PLpgSQL_variable *target;
 
 		/* ----------
 		 * Fetch 1 tuple from the cursor
@@ -4283,10 +4449,11 @@ exec_stmt_fetch(PLpgSQL_execstate *estate, PLpgSQL_stmt_fetch *stmt)
 		 * Set the target appropriately.
 		 * ----------
 		 */
+		target = (PLpgSQL_variable *) estate->datums[stmt->target->dno];
 		if (n == 0)
-			exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+			exec_move_row(estate, target, NULL, tuptab->tupdesc);
 		else
-			exec_move_row(estate, rec, row, tuptab->vals[0], tuptab->tupdesc);
+			exec_move_row(estate, target, tuptab->vals[0], tuptab->tupdesc);
 
 		exec_eval_cleanup(estate);
 		SPI_freetuptable(tuptab);
@@ -4347,6 +4514,57 @@ exec_stmt_close(PLpgSQL_execstate *estate, PLpgSQL_stmt_close *stmt)
 	return PLPGSQL_RC_OK;
 }
 
+/*
+ * exec_stmt_commit
+ *
+ * Commit the transaction.
+ */
+static int
+exec_stmt_commit(PLpgSQL_execstate *estate, PLpgSQL_stmt_commit *stmt)
+{
+	/*
+	 * XXX This could be implemented by converting the pinned portals to
+	 * holdable ones and organizing the cleanup separately.
+	 */
+	if (ThereArePinnedPortals())
+		ereport(ERROR,
+				(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				 errmsg("committing inside a cursor loop is not supported")));
+
+	SPI_commit();
+	SPI_start_transaction();
+
+	estate->simple_eval_estate = NULL;
+	plpgsql_create_econtext(estate);
+
+	return PLPGSQL_RC_OK;
+}
+
+/*
+ * exec_stmt_rollback
+ *
+ * Abort the transaction.
+ */
+static int
+exec_stmt_rollback(PLpgSQL_execstate *estate, PLpgSQL_stmt_rollback *stmt)
+{
+	/*
+	 * Unlike the COMMIT case above, this might not make sense at all,
+	 * especially if the query driving the cursor loop has side effects.
+	 */
+	if (ThereArePinnedPortals())
+		ereport(ERROR,
+				(errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				 errmsg("cannot abort transaction inside a cursor loop")));
+
+	SPI_rollback();
+	SPI_start_transaction();
+
+	estate->simple_eval_estate = NULL;
+	plpgsql_create_econtext(estate);
+
+	return PLPGSQL_RC_OK;
+}
 
 /* ----------
  * exec_assign_expr			Put an expression's result into a variable.
@@ -4426,6 +4644,7 @@ exec_assign_value(PLpgSQL_execstate *estate,
 	switch (target->dtype)
 	{
 		case PLPGSQL_DTYPE_VAR:
+		case PLPGSQL_DTYPE_PROMISE:
 			{
 				/*
 				 * Target is a variable
@@ -4469,7 +4688,7 @@ exec_assign_value(PLpgSQL_execstate *estate,
 					{
 						/* array and not already R/W, so apply expand_array */
 						newvalue = expand_array(newvalue,
-												CurrentMemoryContext,
+												estate->datum_context,
 												NULL);
 					}
 					else
@@ -4488,10 +4707,16 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				 * cannot reliably be made any earlier; we have to be looking
 				 * at the object's standard R/W pointer to be sure pointer
 				 * equality is meaningful.
+				 *
+				 * Also, if it's a promise variable, we should disarm the
+				 * promise in any case --- otherwise, assigning null to an
+				 * armed promise variable would fail to disarm the promise.
 				 */
 				if (var->value != newvalue || var->isnull || isNull)
 					assign_simple_var(estate, var, newvalue, isNull,
 									  (!var->datatype->typbyval && !isNull));
+				else
+					var->promise = PLPGSQL_PROMISE_NONE;
 				break;
 			}
 
@@ -4505,7 +4730,8 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				if (isNull)
 				{
 					/* If source is null, just assign nulls to the row */
-					exec_move_row(estate, NULL, row, NULL, NULL);
+					exec_move_row(estate, (PLpgSQL_variable *) row,
+								  NULL, NULL);
 				}
 				else
 				{
@@ -4514,7 +4740,8 @@ exec_assign_value(PLpgSQL_execstate *estate,
 						ereport(ERROR,
 								(errcode(ERRCODE_DATATYPE_MISMATCH),
 								 errmsg("cannot assign non-composite value to a row variable")));
-					exec_move_row_from_datum(estate, NULL, row, value);
+					exec_move_row_from_datum(estate, (PLpgSQL_variable *) row,
+											 value);
 				}
 				break;
 			}
@@ -4528,8 +4755,15 @@ exec_assign_value(PLpgSQL_execstate *estate,
 
 				if (isNull)
 				{
-					/* If source is null, just assign nulls to the record */
-					exec_move_row(estate, rec, NULL, NULL, NULL);
+					if (rec->notnull)
+						ereport(ERROR,
+								(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+								 errmsg("null value cannot be assigned to variable \"%s\" declared NOT NULL",
+										rec->refname)));
+
+					/* Set variable to a simple NULL */
+					exec_move_row(estate, (PLpgSQL_variable *) rec,
+								  NULL, NULL);
 				}
 				else
 				{
@@ -4538,7 +4772,8 @@ exec_assign_value(PLpgSQL_execstate *estate,
 						ereport(ERROR,
 								(errcode(ERRCODE_DATATYPE_MISMATCH),
 								 errmsg("cannot assign non-composite value to a record variable")));
-					exec_move_row_from_datum(estate, rec, NULL, value);
+					exec_move_row_from_datum(estate, (PLpgSQL_variable *) rec,
+											 value);
 				}
 				break;
 			}
@@ -4550,64 +4785,58 @@ exec_assign_value(PLpgSQL_execstate *estate,
 				 */
 				PLpgSQL_recfield *recfield = (PLpgSQL_recfield *) target;
 				PLpgSQL_rec *rec;
-				int			fno;
-				HeapTuple	newtup;
-				int			colnums[1];
-				Datum		values[1];
-				bool		nulls[1];
-				Oid			atttype;
-				int32		atttypmod;
+				ExpandedRecordHeader *erh;
 
 				rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
+				erh = rec->erh;
 
 				/*
-				 * Check that there is already a tuple in the record. We need
-				 * that because records don't have any predefined field
-				 * structure.
-				 */
-				if (!HeapTupleIsValid(rec->tup))
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-
-				/*
-				 * Get the number of the record field to change.  Disallow
-				 * system columns because the code below won't cope.
+				 * If record variable is NULL, instantiate it if it has a
+				 * named composite type, else complain.  (This won't change
+				 * the logical state of the record, but if we successfully
+				 * assign below, the unassigned fields will all become NULLs.)
 				 */
-				fno = SPI_fnumber(rec->tupdesc, recfield->fieldname);
-				if (fno <= 0)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("record \"%s\" has no field \"%s\"",
-									rec->refname, recfield->fieldname)));
-				colnums[0] = fno;
+				if (erh == NULL)
+				{
+					instantiate_empty_record_variable(estate, rec);
+					erh = rec->erh;
+				}
 
 				/*
-				 * Now insert the new value, being careful to cast it to the
-				 * right type.
+				 * Look up the field's properties if we have not already, or
+				 * if the tuple descriptor ID changed since last time.
 				 */
-				atttype = rec->tupdesc->attrs[fno - 1]->atttypid;
-				atttypmod = rec->tupdesc->attrs[fno - 1]->atttypmod;
-				values[0] = exec_cast_value(estate,
-											value,
-											&isNull,
-											valtype,
-											valtypmod,
-											atttype,
-											atttypmod);
-				nulls[0] = isNull;
-
-				newtup = heap_modify_tuple_by_cols(rec->tup, rec->tupdesc,
-												   1, colnums, values, nulls);
-
-				if (rec->freetup)
-					heap_freetuple(rec->tup);
-
-				rec->tup = newtup;
-				rec->freetup = true;
+				if (unlikely(recfield->rectupledescid != erh->er_tupdesc_id))
+				{
+					if (!expanded_record_lookup_field(erh,
+													  recfield->fieldname,
+													  &recfield->finfo))
+						ereport(ERROR,
+								(errcode(ERRCODE_UNDEFINED_COLUMN),
+								 errmsg("record \"%s\" has no field \"%s\"",
+										rec->refname, recfield->fieldname)));
+					recfield->rectupledescid = erh->er_tupdesc_id;
+				}
 
+				/* We don't support assignments to system columns. */
+				if (recfield->finfo.fnumber <= 0)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("cannot assign to system column \"%s\"",
+									recfield->fieldname)));
+
+				/* Cast the new value to the right type, if needed. */
+				value = exec_cast_value(estate,
+										value,
+										&isNull,
+										valtype,
+										valtypmod,
+										recfield->finfo.ftypeid,
+										recfield->finfo.ftypmod);
+
+				/* And assign it. */
+				expanded_record_set_field(erh, recfield->finfo.fnumber,
+										  value, isNull);
 				break;
 			}
 
@@ -4837,6 +5066,12 @@ exec_eval_datum(PLpgSQL_execstate *estate,
 
 	switch (datum->dtype)
 	{
+		case PLPGSQL_DTYPE_PROMISE:
+			/* fulfill promise if needed, then handle like regular var */
+			plpgsql_fulfill_promise(estate, (PLpgSQL_var *) datum);
+
+			/* FALL THRU */
+
 		case PLPGSQL_DTYPE_VAR:
 			{
 				PLpgSQL_var *var = (PLpgSQL_var *) datum;
@@ -4853,6 +5088,7 @@ exec_eval_datum(PLpgSQL_execstate *estate,
 				PLpgSQL_row *row = (PLpgSQL_row *) datum;
 				HeapTuple	tup;
 
+				/* We get here if there are multiple OUT parameters */
 				if (!row->rowtupdesc)	/* should not happen */
 					elog(ERROR, "row variable has no tupdesc");
 				/* Make sure we have a valid type/typmod setting */
@@ -4873,22 +5109,41 @@ exec_eval_datum(PLpgSQL_execstate *estate,
 			{
 				PLpgSQL_rec *rec = (PLpgSQL_rec *) datum;
 
-				if (!HeapTupleIsValid(rec->tup))
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				Assert(rec->tupdesc != NULL);
-				/* Make sure we have a valid type/typmod setting */
-				BlessTupleDesc(rec->tupdesc);
-
-				oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
-				*typeid = rec->tupdesc->tdtypeid;
-				*typetypmod = rec->tupdesc->tdtypmod;
-				*value = heap_copy_tuple_as_datum(rec->tup, rec->tupdesc);
-				*isnull = false;
-				MemoryContextSwitchTo(oldcontext);
+				if (rec->erh == NULL)
+				{
+					/* Treat uninstantiated record as a simple NULL */
+					*value = (Datum) 0;
+					*isnull = true;
+					/* Report variable's declared type */
+					*typeid = rec->rectypeid;
+					*typetypmod = -1;
+				}
+				else
+				{
+					if (ExpandedRecordIsEmpty(rec->erh))
+					{
+						/* Empty record is also a NULL */
+						*value = (Datum) 0;
+						*isnull = true;
+					}
+					else
+					{
+						*value = ExpandedRecordGetDatum(rec->erh);
+						*isnull = false;
+					}
+					if (rec->rectypeid != RECORDOID)
+					{
+						/* Report variable's declared type, if not RECORD */
+						*typeid = rec->rectypeid;
+						*typetypmod = -1;
+					}
+					else
+					{
+						/* Report record's actual type if declared RECORD */
+						*typeid = rec->erh->er_typeid;
+						*typetypmod = rec->erh->er_typmod;
+					}
+				}
 				break;
 			}
 
@@ -4896,27 +5151,46 @@ exec_eval_datum(PLpgSQL_execstate *estate,
 			{
 				PLpgSQL_recfield *recfield = (PLpgSQL_recfield *) datum;
 				PLpgSQL_rec *rec;
-				int			fno;
+				ExpandedRecordHeader *erh;
 
 				rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
-				if (!HeapTupleIsValid(rec->tup))
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				fno = SPI_fnumber(rec->tupdesc, recfield->fieldname);
-				if (fno == SPI_ERROR_NOATTRIBUTE)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("record \"%s\" has no field \"%s\"",
-									rec->refname, recfield->fieldname)));
-				*typeid = SPI_gettypeid(rec->tupdesc, fno);
-				if (fno > 0)
-					*typetypmod = rec->tupdesc->attrs[fno - 1]->atttypmod;
-				else
-					*typetypmod = -1;
-				*value = SPI_getbinval(rec->tup, rec->tupdesc, fno, isnull);
+				erh = rec->erh;
+
+				/*
+				 * If record variable is NULL, instantiate it if it has a
+				 * named composite type, else complain.  (This won't change
+				 * the logical state of the record: it's still NULL.)
+				 */
+				if (erh == NULL)
+				{
+					instantiate_empty_record_variable(estate, rec);
+					erh = rec->erh;
+				}
+
+				/*
+				 * Look up the field's properties if we have not already, or
+				 * if the tuple descriptor ID changed since last time.
+				 */
+				if (unlikely(recfield->rectupledescid != erh->er_tupdesc_id))
+				{
+					if (!expanded_record_lookup_field(erh,
+													  recfield->fieldname,
+													  &recfield->finfo))
+						ereport(ERROR,
+								(errcode(ERRCODE_UNDEFINED_COLUMN),
+								 errmsg("record \"%s\" has no field \"%s\"",
+										rec->refname, recfield->fieldname)));
+					recfield->rectupledescid = erh->er_tupdesc_id;
+				}
+
+				/* Report type data. */
+				*typeid = recfield->finfo.ftypeid;
+				*typetypmod = recfield->finfo.ftypmod;
+
+				/* And fetch the field value. */
+				*value = expanded_record_get_field(erh,
+												   recfield->finfo.fnumber,
+												   isnull);
 				break;
 			}
 
@@ -4928,10 +5202,8 @@ exec_eval_datum(PLpgSQL_execstate *estate,
 /*
  * plpgsql_exec_get_datum_type				Get datatype of a PLpgSQL_datum
  *
- * This is the same logic as in exec_eval_datum, except that it can handle
- * some cases where exec_eval_datum has to fail; specifically, we may have
- * a tupdesc but no row value for a record variable.  (This currently can
- * happen only for a trigger's NEW/OLD records.)
+ * This is the same logic as in exec_eval_datum, but we skip acquiring
+ * the actual value of the variable.  Also, needn't support DTYPE_ROW.
  */
 Oid
 plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
@@ -4942,6 +5214,7 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
 	switch (datum->dtype)
 	{
 		case PLPGSQL_DTYPE_VAR:
+		case PLPGSQL_DTYPE_PROMISE:
 			{
 				PLpgSQL_var *var = (PLpgSQL_var *) datum;
 
@@ -4949,31 +5222,20 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
 				break;
 			}
 
-		case PLPGSQL_DTYPE_ROW:
-			{
-				PLpgSQL_row *row = (PLpgSQL_row *) datum;
-
-				if (!row->rowtupdesc)	/* should not happen */
-					elog(ERROR, "row variable has no tupdesc");
-				/* Make sure we have a valid type/typmod setting */
-				BlessTupleDesc(row->rowtupdesc);
-				typeid = row->rowtupdesc->tdtypeid;
-				break;
-			}
-
 		case PLPGSQL_DTYPE_REC:
 			{
 				PLpgSQL_rec *rec = (PLpgSQL_rec *) datum;
 
-				if (rec->tupdesc == NULL)
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				/* Make sure we have a valid type/typmod setting */
-				BlessTupleDesc(rec->tupdesc);
-				typeid = rec->tupdesc->tdtypeid;
+				if (rec->erh == NULL || rec->rectypeid != RECORDOID)
+				{
+					/* Report variable's declared type */
+					typeid = rec->rectypeid;
+				}
+				else
+				{
+					/* Report record's actual type if declared RECORD */
+					typeid = rec->erh->er_typeid;
+				}
 				break;
 			}
 
@@ -4981,22 +5243,34 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
 			{
 				PLpgSQL_recfield *recfield = (PLpgSQL_recfield *) datum;
 				PLpgSQL_rec *rec;
-				int			fno;
 
 				rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
-				if (rec->tupdesc == NULL)
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				fno = SPI_fnumber(rec->tupdesc, recfield->fieldname);
-				if (fno == SPI_ERROR_NOATTRIBUTE)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("record \"%s\" has no field \"%s\"",
-									rec->refname, recfield->fieldname)));
-				typeid = SPI_gettypeid(rec->tupdesc, fno);
+
+				/*
+				 * If record variable is NULL, instantiate it if it has a
+				 * named composite type, else complain.  (This won't change
+				 * the logical state of the record: it's still NULL.)
+				 */
+				if (rec->erh == NULL)
+					instantiate_empty_record_variable(estate, rec);
+
+				/*
+				 * Look up the field's properties if we have not already, or
+				 * if the tuple descriptor ID changed since last time.
+				 */
+				if (unlikely(recfield->rectupledescid != rec->erh->er_tupdesc_id))
+				{
+					if (!expanded_record_lookup_field(rec->erh,
+													  recfield->fieldname,
+													  &recfield->finfo))
+						ereport(ERROR,
+								(errcode(ERRCODE_UNDEFINED_COLUMN),
+								 errmsg("record \"%s\" has no field \"%s\"",
+										rec->refname, recfield->fieldname)));
+					recfield->rectupledescid = rec->erh->er_tupdesc_id;
+				}
+
+				typeid = recfield->finfo.ftypeid;
 				break;
 			}
 
@@ -5013,7 +5287,8 @@ plpgsql_exec_get_datum_type(PLpgSQL_execstate *estate,
  * plpgsql_exec_get_datum_type_info			Get datatype etc of a PLpgSQL_datum
  *
  * An extended version of plpgsql_exec_get_datum_type, which also retrieves the
- * typmod and collation of the datum.
+ * typmod and collation of the datum.  Note however that we don't report the
+ * possibly-mutable typmod of RECORD values, but say -1 always.
  */
 void
 plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
@@ -5023,6 +5298,7 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 	switch (datum->dtype)
 	{
 		case PLPGSQL_DTYPE_VAR:
+		case PLPGSQL_DTYPE_PROMISE:
 			{
 				PLpgSQL_var *var = (PLpgSQL_var *) datum;
 
@@ -5032,37 +5308,23 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 				break;
 			}
 
-		case PLPGSQL_DTYPE_ROW:
-			{
-				PLpgSQL_row *row = (PLpgSQL_row *) datum;
-
-				if (!row->rowtupdesc)	/* should not happen */
-					elog(ERROR, "row variable has no tupdesc");
-				/* Make sure we have a valid type/typmod setting */
-				BlessTupleDesc(row->rowtupdesc);
-				*typeid = row->rowtupdesc->tdtypeid;
-				/* do NOT return the mutable typmod of a RECORD variable */
-				*typmod = -1;
-				/* composite types are never collatable */
-				*collation = InvalidOid;
-				break;
-			}
-
 		case PLPGSQL_DTYPE_REC:
 			{
 				PLpgSQL_rec *rec = (PLpgSQL_rec *) datum;
 
-				if (rec->tupdesc == NULL)
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				/* Make sure we have a valid type/typmod setting */
-				BlessTupleDesc(rec->tupdesc);
-				*typeid = rec->tupdesc->tdtypeid;
-				/* do NOT return the mutable typmod of a RECORD variable */
-				*typmod = -1;
+				if (rec->erh == NULL || rec->rectypeid != RECORDOID)
+				{
+					/* Report variable's declared type */
+					*typeid = rec->rectypeid;
+					*typmod = -1;
+				}
+				else
+				{
+					/* Report record's actual type if declared RECORD */
+					*typeid = rec->erh->er_typeid;
+					/* do NOT return the mutable typmod of a RECORD variable */
+					*typmod = -1;
+				}
 				/* composite types are never collatable */
 				*collation = InvalidOid;
 				break;
@@ -5072,37 +5334,43 @@ plpgsql_exec_get_datum_type_info(PLpgSQL_execstate *estate,
 			{
 				PLpgSQL_recfield *recfield = (PLpgSQL_recfield *) datum;
 				PLpgSQL_rec *rec;
-				int			fno;
 
 				rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
-				if (rec->tupdesc == NULL)
-					ereport(ERROR,
-							(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
-							 errmsg("record \"%s\" is not assigned yet",
-									rec->refname),
-							 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
-				fno = SPI_fnumber(rec->tupdesc, recfield->fieldname);
-				if (fno == SPI_ERROR_NOATTRIBUTE)
-					ereport(ERROR,
-							(errcode(ERRCODE_UNDEFINED_COLUMN),
-							 errmsg("record \"%s\" has no field \"%s\"",
-									rec->refname, recfield->fieldname)));
-				*typeid = SPI_gettypeid(rec->tupdesc, fno);
-				if (fno > 0)
-					*typmod = rec->tupdesc->attrs[fno - 1]->atttypmod;
-				else
-					*typmod = -1;
-				if (fno > 0)
-					*collation = rec->tupdesc->attrs[fno - 1]->attcollation;
-				else			/* no system column types have collation */
-					*collation = InvalidOid;
-				break;
-			}
 
-		default:
-			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
-			*typeid = InvalidOid;	/* keep compiler quiet */
-			*typmod = -1;
+				/*
+				 * If record variable is NULL, instantiate it if it has a
+				 * named composite type, else complain.  (This won't change
+				 * the logical state of the record: it's still NULL.)
+				 */
+				if (rec->erh == NULL)
+					instantiate_empty_record_variable(estate, rec);
+
+				/*
+				 * Look up the field's properties if we have not already, or
+				 * if the tuple descriptor ID changed since last time.
+				 */
+				if (unlikely(recfield->rectupledescid != rec->erh->er_tupdesc_id))
+				{
+					if (!expanded_record_lookup_field(rec->erh,
+													  recfield->fieldname,
+													  &recfield->finfo))
+						ereport(ERROR,
+								(errcode(ERRCODE_UNDEFINED_COLUMN),
+								 errmsg("record \"%s\" has no field \"%s\"",
+										rec->refname, recfield->fieldname)));
+					recfield->rectupledescid = rec->erh->er_tupdesc_id;
+				}
+
+				*typeid = recfield->finfo.ftypeid;
+				*typmod = recfield->finfo.ftypmod;
+				*collation = recfield->finfo.fcollation;
+				break;
+			}
+
+		default:
+			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
+			*typeid = InvalidOid;	/* keep compiler quiet */
+			*typmod = -1;
 			*collation = InvalidOid;
 			break;
 	}
@@ -5172,6 +5440,7 @@ exec_eval_expr(PLpgSQL_execstate *estate,
 {
 	Datum		result = 0;
 	int			rc;
+	Form_pg_attribute attr;
 
 	/*
 	 * If first time through, create a plan for this expression.
@@ -5211,8 +5480,9 @@ exec_eval_expr(PLpgSQL_execstate *estate,
 	/*
 	 * ... and get the column's datatype.
 	 */
-	*rettype = estate->eval_tuptable->tupdesc->attrs[0]->atttypid;
-	*rettypmod = estate->eval_tuptable->tupdesc->attrs[0]->atttypmod;
+	attr = TupleDescAttr(estate->eval_tuptable->tupdesc, 0);
+	*rettype = attr->atttypid;
+	*rettypmod = attr->atttypmod;
 
 	/*
 	 * If there are no rows selected, the result is a NULL of that type.
@@ -5265,15 +5535,15 @@ exec_run_select(PLpgSQL_execstate *estate,
 						  portalP == NULL ? CURSOR_OPT_PARALLEL_OK : 0);
 
 	/*
-	 * If a portal was requested, put the query into the portal
+	 * Set up ParamListInfo to pass to executor
+	 */
+	paramLI = setup_param_list(estate, expr);
+
+	/*
+	 * If a portal was requested, put the query and paramlist into the portal
 	 */
 	if (portalP != NULL)
 	{
-		/*
-		 * Set up short-lived ParamListInfo
-		 */
-		paramLI = setup_unshared_param_list(estate, expr);
-
 		*portalP = SPI_cursor_open_with_paramlist(NULL, expr->plan,
 												  paramLI,
 												  estate->readonly_func);
@@ -5284,11 +5554,6 @@ exec_run_select(PLpgSQL_execstate *estate,
 		return SPI_OK_CURSOR;
 	}
 
-	/*
-	 * Set up ParamListInfo to pass to executor
-	 */
-	paramLI = setup_param_list(estate, expr);
-
 	/*
 	 * Execute the query
 	 */
@@ -5318,22 +5583,16 @@ static int
 exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 			   Portal portal, bool prefetch_ok)
 {
-	PLpgSQL_rec *rec = NULL;
-	PLpgSQL_row *row = NULL;
+	PLpgSQL_variable *var;
 	SPITupleTable *tuptab;
 	bool		found = false;
 	int			rc = PLPGSQL_RC_OK;
+	uint64		previous_id = INVALID_TUPLEDESC_IDENTIFIER;
+	bool		tupdescs_match = true;
 	uint64		n;
 
-	/*
-	 * Determine if we assign to a record or a row
-	 */
-	if (stmt->rec != NULL)
-		rec = (PLpgSQL_rec *) (estate->datums[stmt->rec->dno]);
-	else if (stmt->row != NULL)
-		row = (PLpgSQL_row *) (estate->datums[stmt->row->dno]);
-	else
-		elog(ERROR, "unsupported target");
+	/* Fetch loop variable's datum entry */
+	var = (PLpgSQL_variable *) estate->datums[stmt->var->dno];
 
 	/*
 	 * Make sure the portal doesn't get closed by the user statements we
@@ -5356,7 +5615,7 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 	 */
 	if (n == 0)
 	{
-		exec_move_row(estate, rec, row, NULL, tuptab->tupdesc);
+		exec_move_row(estate, var, NULL, tuptab->tupdesc);
 		exec_eval_cleanup(estate);
 	}
 	else
@@ -5372,70 +5631,64 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
 		for (i = 0; i < n; i++)
 		{
 			/*
-			 * Assign the tuple to the target
+			 * Assign the tuple to the target.  Here, because we know that all
+			 * loop iterations should be assigning the same tupdesc, we can
+			 * optimize away repeated creations of expanded records with
+			 * identical tupdescs.  Testing for changes of er_tupdesc_id is
+			 * reliable even if the loop body contains assignments that
+			 * replace the target's value entirely, because it's assigned from
+			 * a process-global counter.  The case where the tupdescs don't
+			 * match could possibly be handled more efficiently than this
+			 * coding does, but it's not clear extra effort is worthwhile.
 			 */
-			exec_move_row(estate, rec, row, tuptab->vals[i], tuptab->tupdesc);
-			exec_eval_cleanup(estate);
-
-			/*
-			 * Execute the statements
-			 */
-			rc = exec_stmts(estate, stmt->body);
-
-			if (rc != PLPGSQL_RC_OK)
+			if (var->dtype == PLPGSQL_DTYPE_REC)
 			{
-				if (rc == PLPGSQL_RC_EXIT)
-				{
-					if (estate->exitlabel == NULL)
-					{
-						/* unlabelled exit, so exit the current loop */
-						rc = PLPGSQL_RC_OK;
-					}
-					else if (stmt->label != NULL &&
-							 strcmp(stmt->label, estate->exitlabel) == 0)
-					{
-						/* label matches this loop, so exit loop */
-						estate->exitlabel = NULL;
-						rc = PLPGSQL_RC_OK;
-					}
+				PLpgSQL_rec *rec = (PLpgSQL_rec *) var;
 
-					/*
-					 * otherwise, we processed a labelled exit that does not
-					 * match the current statement's label, if any; return
-					 * RC_EXIT so that the EXIT continues to recurse upward.
-					 */
+				if (rec->erh &&
+					rec->erh->er_tupdesc_id == previous_id &&
+					tupdescs_match)
+				{
+					/* Only need to assign a new tuple value */
+					expanded_record_set_tuple(rec->erh, tuptab->vals[i], true);
 				}
-				else if (rc == PLPGSQL_RC_CONTINUE)
+				else
 				{
-					if (estate->exitlabel == NULL)
-					{
-						/* unlabelled continue, so re-run the current loop */
-						rc = PLPGSQL_RC_OK;
-						continue;
-					}
-					else if (stmt->label != NULL &&
-							 strcmp(stmt->label, estate->exitlabel) == 0)
-					{
-						/* label matches this loop, so re-run loop */
-						estate->exitlabel = NULL;
-						rc = PLPGSQL_RC_OK;
-						continue;
-					}
+					/*
+					 * First time through, or var's tupdesc changed in loop,
+					 * or we have to do it the hard way because type coercion
+					 * is needed.
+					 */
+					exec_move_row(estate, var,
+								  tuptab->vals[i], tuptab->tupdesc);
 
 					/*
-					 * otherwise, we process a labelled continue that does not
-					 * match the current statement's label, if any; return
-					 * RC_CONTINUE so that the CONTINUE will propagate up the
-					 * stack.
+					 * Check to see if physical assignment is OK next time.
+					 * Once the tupdesc comparison has failed once, we don't
+					 * bother rechecking in subsequent loop iterations.
 					 */
+					if (tupdescs_match)
+					{
+						tupdescs_match =
+							(rec->rectypeid == RECORDOID ||
+							 rec->rectypeid == tuptab->tupdesc->tdtypeid ||
+							 compatible_tupdescs(tuptab->tupdesc,
+												 expanded_record_get_tupdesc(rec->erh)));
+					}
+					previous_id = rec->erh->er_tupdesc_id;
 				}
-
-				/*
-				 * We're aborting the loop.  Need a goto to get out of two
-				 * levels of loop...
-				 */
-				goto loop_exit;
 			}
+			else
+				exec_move_row(estate, var, tuptab->vals[i], tuptab->tupdesc);
+
+			exec_eval_cleanup(estate);
+
+			/*
+			 * Execute the statements
+			 */
+			rc = exec_stmts(estate, stmt->body);
+
+			LOOP_RC_PROCESSING(stmt->label, goto loop_exit);
 		}
 
 		SPI_freetuptable(tuptab);
@@ -5474,12 +5727,12 @@ exec_for_query(PLpgSQL_execstate *estate, PLpgSQL_stmt_forq *stmt,
  *								a Datum by directly calling ExecEvalExpr().
  *
  * If successful, store results into *result, *isNull, *rettype, *rettypmod
- * and return TRUE.  If the expression cannot be handled by simple evaluation,
- * return FALSE.
+ * and return true.  If the expression cannot be handled by simple evaluation,
+ * return false.
  *
  * Because we only store one execution tree for a simple expression, we
  * can't handle recursion cases.  So, if we see the tree is already busy
- * with an evaluation in the current xact, we just return FALSE and let the
+ * with an evaluation in the current xact, we just return false and let the
  * caller run the expression the hard way.  (Other alternatives such as
  * creating a new tree for a recursive call either introduce memory leaks,
  * or add enough bookkeeping to be doubtful wins anyway.)  Another case that
@@ -5509,7 +5762,6 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 	ExprContext *econtext = estate->eval_econtext;
 	LocalTransactionId curlxid = MyProc->lxid;
 	CachedPlan *cplan;
-	ParamListInfo paramLI;
 	void	   *save_setup_arg;
 	MemoryContext oldcontext;
 
@@ -5556,6 +5808,14 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 	*rettype = expr->expr_simple_type;
 	*rettypmod = expr->expr_simple_typmod;
 
+	/*
+	 * Set up ParamListInfo to pass to executor.  For safety, save and restore
+	 * estate->paramLI->parserSetupArg around our use of the param list.
+	 */
+	save_setup_arg = estate->paramLI->parserSetupArg;
+
+	econtext->ecxt_param_list_info = setup_param_list(estate, expr);
+
 	/*
 	 * Prepare the expression for execution, if it's not been done already in
 	 * the current transaction.  (This will be forced to happen if we called
@@ -5564,7 +5824,9 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 	if (expr->expr_simple_lxid != curlxid)
 	{
 		oldcontext = MemoryContextSwitchTo(estate->simple_eval_estate->es_query_cxt);
-		expr->expr_simple_state = ExecInitExpr(expr->expr_simple_expr, NULL);
+		expr->expr_simple_state =
+			ExecInitExprWithParams(expr->expr_simple_expr,
+								   econtext->ecxt_param_list_info);
 		expr->expr_simple_in_use = false;
 		expr->expr_simple_lxid = curlxid;
 		MemoryContextSwitchTo(oldcontext);
@@ -5583,21 +5845,6 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 		PushActiveSnapshot(GetTransactionSnapshot());
 	}
 
-	/*
-	 * Set up ParamListInfo to pass to executor.  We need an unshared list if
-	 * it's going to include any R/W expanded-object pointer.  For safety,
-	 * save and restore estate->paramLI->parserSetupArg around our use of the
-	 * param list.
-	 */
-	save_setup_arg = estate->paramLI->parserSetupArg;
-
-	if (expr->rwparam >= 0)
-		paramLI = setup_unshared_param_list(estate, expr);
-	else
-		paramLI = setup_param_list(estate, expr);
-
-	econtext->ecxt_param_list_info = paramLI;
-
 	/*
 	 * Mark expression as busy for the duration of the ExecEvalExpr call.
 	 */
@@ -5637,35 +5884,17 @@ exec_eval_simple_expr(PLpgSQL_execstate *estate,
 /*
  * Create a ParamListInfo to pass to SPI
  *
- * We share a single ParamListInfo array across all SPI calls made from this
- * estate, except calls creating cursors, which use setup_unshared_param_list
- * (see its comments for reasons why), and calls that pass a R/W expanded
- * object pointer.  A shared array is generally OK since any given slot in
- * the array would need to contain the same current datum value no matter
- * which query or expression we're evaluating; but of course that doesn't
- * hold when a specific variable is being passed as a R/W pointer, because
- * other expressions in the same function probably don't want to do that.
- *
- * Note that paramLI->parserSetupArg points to the specific PLpgSQL_expr
- * being evaluated.  This is not an issue for statement-level callers, but
- * lower-level callers must save and restore estate->paramLI->parserSetupArg
- * just in case there's an active evaluation at an outer call level.
+ * We use a single ParamListInfo struct for all SPI calls made from this
+ * estate; it contains no per-param data, just hook functions, so it's
+ * effectively read-only for SPI.
  *
- * The general plan for passing parameters to SPI is that plain VAR datums
- * always have valid images in the shared param list.  This is ensured by
- * assign_simple_var(), which also marks those params as PARAM_FLAG_CONST,
- * allowing the planner to use those values in custom plans.  However, non-VAR
- * datums cannot conveniently be managed that way.  For one thing, they could
- * throw errors (for example "no such record field") and we do not want that
- * to happen in a part of the expression that might never be evaluated at
- * runtime.  For another thing, exec_eval_datum() may return short-lived
- * values stored in the estate's eval_mcontext, which will not necessarily
- * survive to the next SPI operation.  And for a third thing, ROW
- * and RECFIELD datums' values depend on other datums, and we don't have a
- * cheap way to track that.  Therefore, param slots for non-VAR datum types
- * are always reset here and then filled on-demand by plpgsql_param_fetch().
- * We can save a few cycles by not bothering with the reset loop unless at
- * least one such param has actually been filled by plpgsql_param_fetch().
+ * An exception from pure read-only-ness is that the parserSetupArg points
+ * to the specific PLpgSQL_expr being evaluated.  This is not an issue for
+ * statement-level callers, but lower-level callers must save and restore
+ * estate->paramLI->parserSetupArg just in case there's an active evaluation
+ * at an outer call level.  (A plausible alternative design would be to
+ * create a ParamListInfo struct for each PLpgSQL_expr, but for the moment
+ * that seems like a waste of memory.)
  */
 static ParamListInfo
 setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
@@ -5678,11 +5907,6 @@ setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
 	 */
 	Assert(expr->plan != NULL);
 
-	/*
-	 * Expressions with R/W parameters can't use the shared param list.
-	 */
-	Assert(expr->rwparam == -1);
-
 	/*
 	 * We only need a ParamListInfo if the expression has parameters.  In
 	 * principle we should test with bms_is_empty(), but we use a not-null
@@ -5694,25 +5918,6 @@ setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
 		/* Use the common ParamListInfo */
 		paramLI = estate->paramLI;
 
-		/*
-		 * If any resettable parameters have been passed to the executor since
-		 * last time, we need to reset those param slots to "invalid", for the
-		 * reasons mentioned in the comment above.
-		 */
-		if (estate->params_dirty)
-		{
-			Bitmapset  *resettable_datums = estate->func->resettable_datums;
-			int			dno = -1;
-
-			while ((dno = bms_next_member(resettable_datums, dno)) >= 0)
-			{
-				ParamExternData *prm = &paramLI->params[dno];
-
-				prm->ptype = InvalidOid;
-			}
-			estate->params_dirty = false;
-		}
-
 		/*
 		 * Set up link to active expr where the hook functions can find it.
 		 * Callers must save and restore parserSetupArg if there is any chance
@@ -5720,12 +5925,6 @@ setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
 		 */
 		paramLI->parserSetupArg = (void *) expr;
 
-		/*
-		 * Allow parameters that aren't needed by this expression to be
-		 * ignored.
-		 */
-		paramLI->paramMask = expr->paramnos;
-
 		/*
 		 * Also make sure this is set before parser hooks need it.  There is
 		 * no need to save and restore, since the value is always correct once
@@ -5746,275 +5945,788 @@ setup_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
 }
 
 /*
- * Create an unshared, short-lived ParamListInfo to pass to SPI
+ * plpgsql_param_fetch		paramFetch callback for dynamic parameter fetch
+ *
+ * We always use the caller's workspace to construct the returned struct.
  *
- * When creating a cursor, we do not use the shared ParamListInfo array
- * but create a short-lived one that will contain only params actually
- * referenced by the query.  The reason for this is that copyParamList() will
- * be used to copy the parameters into cursor-lifespan storage, and we don't
- * want it to copy anything that's not used by the specific cursor; that
- * could result in uselessly copying some large values.
+ * Note: this is no longer used during query execution.  It is used during
+ * planning (with speculative == true) and when the ParamListInfo we supply
+ * to the executor is copied into a cursor portal or transferred to a
+ * parallel child process.
+ */
+static ParamExternData *
+plpgsql_param_fetch(ParamListInfo params,
+					int paramid, bool speculative,
+					ParamExternData *prm)
+{
+	int			dno;
+	PLpgSQL_execstate *estate;
+	PLpgSQL_expr *expr;
+	PLpgSQL_datum *datum;
+	bool		ok = true;
+	int32		prmtypmod;
+
+	/* paramid's are 1-based, but dnos are 0-based */
+	dno = paramid - 1;
+	Assert(dno >= 0 && dno < params->numParams);
+
+	/* fetch back the hook data */
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	expr = (PLpgSQL_expr *) params->parserSetupArg;
+	Assert(params->numParams == estate->ndatums);
+
+	/* now we can access the target datum */
+	datum = estate->datums[dno];
+
+	/*
+	 * Since copyParamList() or SerializeParamList() will try to materialize
+	 * every single parameter slot, it's important to return a dummy param
+	 * when asked for a datum that's not supposed to be used by this SQL
+	 * expression.  Otherwise we risk failures in exec_eval_datum(), or
+	 * copying a lot more data than necessary.
+	 */
+	if (!bms_is_member(dno, expr->paramnos))
+		ok = false;
+
+	/*
+	 * If the access is speculative, we prefer to return no data rather than
+	 * to fail in exec_eval_datum().  Check the likely failure cases.
+	 */
+	else if (speculative)
+	{
+		switch (datum->dtype)
+		{
+			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
+				/* always safe */
+				break;
+
+			case PLPGSQL_DTYPE_ROW:
+				/* should be safe in all interesting cases */
+				break;
+
+			case PLPGSQL_DTYPE_REC:
+				/* always safe (might return NULL, that's fine) */
+				break;
+
+			case PLPGSQL_DTYPE_RECFIELD:
+				{
+					PLpgSQL_recfield *recfield = (PLpgSQL_recfield *) datum;
+					PLpgSQL_rec *rec;
+
+					rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
+
+					/*
+					 * If record variable is NULL, don't risk anything.
+					 */
+					if (rec->erh == NULL)
+						ok = false;
+
+					/*
+					 * Look up the field's properties if we have not already,
+					 * or if the tuple descriptor ID changed since last time.
+					 */
+					else if (unlikely(recfield->rectupledescid != rec->erh->er_tupdesc_id))
+					{
+						if (expanded_record_lookup_field(rec->erh,
+														 recfield->fieldname,
+														 &recfield->finfo))
+							recfield->rectupledescid = rec->erh->er_tupdesc_id;
+						else
+							ok = false;
+					}
+					break;
+				}
+
+			default:
+				ok = false;
+				break;
+		}
+	}
+
+	/* Return "no such parameter" if not ok */
+	if (!ok)
+	{
+		prm->value = (Datum) 0;
+		prm->isnull = true;
+		prm->pflags = 0;
+		prm->ptype = InvalidOid;
+		return prm;
+	}
+
+	/* OK, evaluate the value and store into the return struct */
+	exec_eval_datum(estate, datum,
+					&prm->ptype, &prmtypmod,
+					&prm->value, &prm->isnull);
+	/* We can always mark params as "const" for executor's purposes */
+	prm->pflags = PARAM_FLAG_CONST;
+
+	/*
+	 * If it's a read/write expanded datum, convert reference to read-only,
+	 * unless it's safe to pass as read-write.
+	 */
+	if (dno != expr->rwparam)
+	{
+		if (datum->dtype == PLPGSQL_DTYPE_VAR)
+			prm->value = MakeExpandedObjectReadOnly(prm->value,
+													prm->isnull,
+													((PLpgSQL_var *) datum)->datatype->typlen);
+		else if (datum->dtype == PLPGSQL_DTYPE_REC)
+			prm->value = MakeExpandedObjectReadOnly(prm->value,
+													prm->isnull,
+													-1);
+	}
+
+	return prm;
+}
+
+/*
+ * plpgsql_param_compile		paramCompile callback for plpgsql parameters
+ */
+static void
+plpgsql_param_compile(ParamListInfo params, Param *param,
+					  ExprState *state,
+					  Datum *resv, bool *resnull)
+{
+	PLpgSQL_execstate *estate;
+	PLpgSQL_expr *expr;
+	int			dno;
+	PLpgSQL_datum *datum;
+	ExprEvalStep scratch;
+
+	/* fetch back the hook data */
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	expr = (PLpgSQL_expr *) params->parserSetupArg;
+
+	/* paramid's are 1-based, but dnos are 0-based */
+	dno = param->paramid - 1;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	datum = estate->datums[dno];
+
+	scratch.opcode = EEOP_PARAM_CALLBACK;
+	scratch.resvalue = resv;
+	scratch.resnull = resnull;
+
+	/*
+	 * Select appropriate eval function.  It seems worth special-casing
+	 * DTYPE_VAR and DTYPE_RECFIELD for performance.  Also, we can determine
+	 * in advance whether MakeExpandedObjectReadOnly() will be required.
+	 * Currently, only VAR/PROMISE and REC datums could contain read/write
+	 * expanded objects.
+	 */
+	if (datum->dtype == PLPGSQL_DTYPE_VAR)
+	{
+		if (dno != expr->rwparam &&
+			((PLpgSQL_var *) datum)->datatype->typlen == -1)
+			scratch.d.cparam.paramfunc = plpgsql_param_eval_var_ro;
+		else
+			scratch.d.cparam.paramfunc = plpgsql_param_eval_var;
+	}
+	else if (datum->dtype == PLPGSQL_DTYPE_RECFIELD)
+		scratch.d.cparam.paramfunc = plpgsql_param_eval_recfield;
+	else if (datum->dtype == PLPGSQL_DTYPE_PROMISE)
+	{
+		if (dno != expr->rwparam &&
+			((PLpgSQL_var *) datum)->datatype->typlen == -1)
+			scratch.d.cparam.paramfunc = plpgsql_param_eval_generic_ro;
+		else
+			scratch.d.cparam.paramfunc = plpgsql_param_eval_generic;
+	}
+	else if (datum->dtype == PLPGSQL_DTYPE_REC &&
+			 dno != expr->rwparam)
+		scratch.d.cparam.paramfunc = plpgsql_param_eval_generic_ro;
+	else
+		scratch.d.cparam.paramfunc = plpgsql_param_eval_generic;
+
+	/*
+	 * Note: it's tempting to use paramarg to store the estate pointer and
+	 * thereby save an indirection or two in the eval functions.  But that
+	 * doesn't work because the compiled expression might be used with
+	 * different estates for the same PL/pgSQL function.
+	 */
+	scratch.d.cparam.paramarg = NULL;
+	scratch.d.cparam.paramid = param->paramid;
+	scratch.d.cparam.paramtype = param->paramtype;
+	ExprEvalPushStep(state, &scratch);
+}
+
+/*
+ * plpgsql_param_eval_var		evaluation of EEOP_PARAM_CALLBACK step
  *
- * We also use this for expressions that are passing a R/W object pointer
- * to some trusted function.  We don't want the R/W pointer to get into the
- * shared param list, where it could get passed to some less-trusted function.
+ * This is specialized to the case of DTYPE_VAR variables for which
+ * we do not need to invoke MakeExpandedObjectReadOnly.
+ */
+static void
+plpgsql_param_eval_var(ExprState *state, ExprEvalStep *op,
+					   ExprContext *econtext)
+{
+	ParamListInfo params;
+	PLpgSQL_execstate *estate;
+	int			dno = op->d.cparam.paramid - 1;
+	PLpgSQL_var *var;
+
+	/* fetch back the hook data */
+	params = econtext->ecxt_param_list_info;
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	var = (PLpgSQL_var *) estate->datums[dno];
+	Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+
+	/* inlined version of exec_eval_datum() */
+	*op->resvalue = var->value;
+	*op->resnull = var->isnull;
+
+	/* safety check -- an assertion should be sufficient */
+	Assert(var->datatype->typoid == op->d.cparam.paramtype);
+}
+
+/*
+ * plpgsql_param_eval_var_ro		evaluation of EEOP_PARAM_CALLBACK step
  *
- * The result, if not NULL, is in the estate's eval_mcontext.
+ * This is specialized to the case of DTYPE_VAR variables for which
+ * we need to invoke MakeExpandedObjectReadOnly.
+ */
+static void
+plpgsql_param_eval_var_ro(ExprState *state, ExprEvalStep *op,
+						  ExprContext *econtext)
+{
+	ParamListInfo params;
+	PLpgSQL_execstate *estate;
+	int			dno = op->d.cparam.paramid - 1;
+	PLpgSQL_var *var;
+
+	/* fetch back the hook data */
+	params = econtext->ecxt_param_list_info;
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	var = (PLpgSQL_var *) estate->datums[dno];
+	Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+
+	/*
+	 * Inlined version of exec_eval_datum() ... and while we're at it, force
+	 * expanded datums to read-only.
+	 */
+	*op->resvalue = MakeExpandedObjectReadOnly(var->value,
+											   var->isnull,
+											   -1);
+	*op->resnull = var->isnull;
+
+	/* safety check -- an assertion should be sufficient */
+	Assert(var->datatype->typoid == op->d.cparam.paramtype);
+}
+
+/*
+ * plpgsql_param_eval_recfield		evaluation of EEOP_PARAM_CALLBACK step
  *
- * XXX. Could we use ParamListInfo's new paramMask to avoid creating unshared
- * parameter lists?
+ * This is specialized to the case of DTYPE_RECFIELD variables, for which
+ * we never need to invoke MakeExpandedObjectReadOnly.
  */
-static ParamListInfo
-setup_unshared_param_list(PLpgSQL_execstate *estate, PLpgSQL_expr *expr)
+static void
+plpgsql_param_eval_recfield(ExprState *state, ExprEvalStep *op,
+							ExprContext *econtext)
 {
-	ParamListInfo paramLI;
+	ParamListInfo params;
+	PLpgSQL_execstate *estate;
+	int			dno = op->d.cparam.paramid - 1;
+	PLpgSQL_recfield *recfield;
+	PLpgSQL_rec *rec;
+	ExpandedRecordHeader *erh;
+
+	/* fetch back the hook data */
+	params = econtext->ecxt_param_list_info;
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	recfield = (PLpgSQL_recfield *) estate->datums[dno];
+	Assert(recfield->dtype == PLPGSQL_DTYPE_RECFIELD);
+
+	/* inline the relevant part of exec_eval_datum */
+	rec = (PLpgSQL_rec *) (estate->datums[recfield->recparentno]);
+	erh = rec->erh;
 
 	/*
-	 * We must have created the SPIPlan already (hence, query text has been
-	 * parsed/analyzed at least once); else we cannot rely on expr->paramnos.
+	 * If record variable is NULL, instantiate it if it has a named composite
+	 * type, else complain.  (This won't change the logical state of the
+	 * record: it's still NULL.)
 	 */
-	Assert(expr->plan != NULL);
+	if (erh == NULL)
+	{
+		instantiate_empty_record_variable(estate, rec);
+		erh = rec->erh;
+	}
 
 	/*
-	 * We only need a ParamListInfo if the expression has parameters.  In
-	 * principle we should test with bms_is_empty(), but we use a not-null
-	 * test because it's faster.  In current usage bits are never removed from
-	 * expr->paramnos, only added, so this test is correct anyway.
+	 * Look up the field's properties if we have not already, or if the tuple
+	 * descriptor ID changed since last time.
 	 */
-	if (expr->paramnos)
+	if (unlikely(recfield->rectupledescid != erh->er_tupdesc_id))
 	{
-		int			dno;
+		if (!expanded_record_lookup_field(erh,
+										  recfield->fieldname,
+										  &recfield->finfo))
+			ereport(ERROR,
+					(errcode(ERRCODE_UNDEFINED_COLUMN),
+					 errmsg("record \"%s\" has no field \"%s\"",
+							rec->refname, recfield->fieldname)));
+		recfield->rectupledescid = erh->er_tupdesc_id;
+	}
 
-		/* initialize ParamListInfo with one entry per datum, all invalid */
-		paramLI = (ParamListInfo)
-			eval_mcontext_alloc0(estate,
-								 offsetof(ParamListInfoData, params) +
-								 estate->ndatums * sizeof(ParamExternData));
-		paramLI->paramFetch = plpgsql_param_fetch;
-		paramLI->paramFetchArg = (void *) estate;
-		paramLI->parserSetup = (ParserSetupHook) plpgsql_parser_setup;
-		paramLI->parserSetupArg = (void *) expr;
-		paramLI->numParams = estate->ndatums;
-		paramLI->paramMask = NULL;
+	/* OK to fetch the field value. */
+	*op->resvalue = expanded_record_get_field(erh,
+											  recfield->finfo.fnumber,
+											  op->resnull);
+
+	/* safety check -- needed for, eg, record fields */
+	if (unlikely(recfield->finfo.ftypeid != op->d.cparam.paramtype))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("type of parameter %d (%s) does not match that when preparing the plan (%s)",
+						op->d.cparam.paramid,
+						format_type_be(recfield->finfo.ftypeid),
+						format_type_be(op->d.cparam.paramtype))));
+}
+
+/*
+ * plpgsql_param_eval_generic		evaluation of EEOP_PARAM_CALLBACK step
+ *
+ * This handles all variable types, but assumes we do not need to invoke
+ * MakeExpandedObjectReadOnly.
+ */
+static void
+plpgsql_param_eval_generic(ExprState *state, ExprEvalStep *op,
+						   ExprContext *econtext)
+{
+	ParamListInfo params;
+	PLpgSQL_execstate *estate;
+	int			dno = op->d.cparam.paramid - 1;
+	PLpgSQL_datum *datum;
+	Oid			datumtype;
+	int32		datumtypmod;
+
+	/* fetch back the hook data */
+	params = econtext->ecxt_param_list_info;
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	datum = estate->datums[dno];
+
+	/* fetch datum's value */
+	exec_eval_datum(estate, datum,
+					&datumtype, &datumtypmod,
+					op->resvalue, op->resnull);
+
+	/* safety check -- needed for, eg, record fields */
+	if (unlikely(datumtype != op->d.cparam.paramtype))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("type of parameter %d (%s) does not match that when preparing the plan (%s)",
+						op->d.cparam.paramid,
+						format_type_be(datumtype),
+						format_type_be(op->d.cparam.paramtype))));
+}
+
+/*
+ * plpgsql_param_eval_generic_ro	evaluation of EEOP_PARAM_CALLBACK step
+ *
+ * This handles all variable types, but assumes we need to invoke
+ * MakeExpandedObjectReadOnly (hence, variable must be of a varlena type).
+ */
+static void
+plpgsql_param_eval_generic_ro(ExprState *state, ExprEvalStep *op,
+							  ExprContext *econtext)
+{
+	ParamListInfo params;
+	PLpgSQL_execstate *estate;
+	int			dno = op->d.cparam.paramid - 1;
+	PLpgSQL_datum *datum;
+	Oid			datumtype;
+	int32		datumtypmod;
+
+	/* fetch back the hook data */
+	params = econtext->ecxt_param_list_info;
+	estate = (PLpgSQL_execstate *) params->paramFetchArg;
+	Assert(dno >= 0 && dno < estate->ndatums);
+
+	/* now we can access the target datum */
+	datum = estate->datums[dno];
+
+	/* fetch datum's value */
+	exec_eval_datum(estate, datum,
+					&datumtype, &datumtypmod,
+					op->resvalue, op->resnull);
+
+	/* safety check -- needed for, eg, record fields */
+	if (unlikely(datumtype != op->d.cparam.paramtype))
+		ereport(ERROR,
+				(errcode(ERRCODE_DATATYPE_MISMATCH),
+				 errmsg("type of parameter %d (%s) does not match that when preparing the plan (%s)",
+						op->d.cparam.paramid,
+						format_type_be(datumtype),
+						format_type_be(op->d.cparam.paramtype))));
+
+	/* force the value to read-only */
+	*op->resvalue = MakeExpandedObjectReadOnly(*op->resvalue,
+											   *op->resnull,
+											   -1);
+}
+
+
+/*
+ * exec_move_row			Move one tuple's values into a record or row
+ *
+ * tup and tupdesc may both be NULL if we're just assigning an indeterminate
+ * composite NULL to the target.  Alternatively, can have tup be NULL and
+ * tupdesc not NULL, in which case we assign a row of NULLs to the target.
+ *
+ * Since this uses the mcontext for workspace, caller should eventually call
+ * exec_eval_cleanup to prevent long-term memory leaks.
+ */
+static void
+exec_move_row(PLpgSQL_execstate *estate,
+			  PLpgSQL_variable *target,
+			  HeapTuple tup, TupleDesc tupdesc)
+{
+	ExpandedRecordHeader *newerh = NULL;
+
+	/*
+	 * If target is RECORD, we may be able to avoid field-by-field processing.
+	 */
+	if (target->dtype == PLPGSQL_DTYPE_REC)
+	{
+		PLpgSQL_rec *rec = (PLpgSQL_rec *) target;
 
 		/*
-		 * Instantiate values for "safe" parameters of the expression.  We
-		 * could skip this and leave them to be filled by plpgsql_param_fetch;
-		 * but then the values would not be available for query planning,
-		 * since the planner doesn't call the paramFetch hook.
+		 * If we have no source tupdesc, just set the record variable to NULL.
+		 * (If we have a source tupdesc but not a tuple, we'll set the
+		 * variable to a row of nulls, instead.  This is odd perhaps, but
+		 * backwards compatible.)
 		 */
-		dno = -1;
-		while ((dno = bms_next_member(expr->paramnos, dno)) >= 0)
+		if (tupdesc == NULL)
 		{
-			PLpgSQL_datum *datum = estate->datums[dno];
-
-			if (datum->dtype == PLPGSQL_DTYPE_VAR)
+			if (rec->datatype &&
+				rec->datatype->typtype == TYPTYPE_DOMAIN)
 			{
-				PLpgSQL_var *var = (PLpgSQL_var *) datum;
-				ParamExternData *prm = &paramLI->params[dno];
-
-				if (dno == expr->rwparam)
-					prm->value = var->value;
-				else
-					prm->value = MakeExpandedObjectReadOnly(var->value,
-															var->isnull,
-															var->datatype->typlen);
-				prm->isnull = var->isnull;
-				prm->pflags = PARAM_FLAG_CONST;
-				prm->ptype = var->datatype->typoid;
+				/*
+				 * If it's a composite domain, NULL might not be a legal
+				 * value, so we instead need to make an empty expanded record
+				 * and ensure that domain type checking gets done.  If there
+				 * is already an expanded record, piggyback on its lookups.
+				 */
+				newerh = make_expanded_record_for_rec(estate, rec,
+													  NULL, rec->erh);
+				expanded_record_set_tuple(newerh, NULL, false);
+				assign_record_var(estate, rec, newerh);
+			}
+			else
+			{
+				/* Just clear it to NULL */
+				if (rec->erh)
+					DeleteExpandedObject(ExpandedRecordGetDatum(rec->erh));
+				rec->erh = NULL;
 			}
+			return;
 		}
 
 		/*
-		 * Also make sure this is set before parser hooks need it.  There is
-		 * no need to save and restore, since the value is always correct once
-		 * set.  (Should be set already, but let's be sure.)
+		 * Build a new expanded record with appropriate tupdesc.
 		 */
-		expr->func = estate->func;
+		newerh = make_expanded_record_for_rec(estate, rec, tupdesc, NULL);
+
+		/*
+		 * If the rowtypes match, or if we have no tuple anyway, we can
+		 * complete the assignment without field-by-field processing.
+		 *
+		 * The tests here are ordered more or less in order of cheapness.  We
+		 * can easily detect it will work if the target is declared RECORD or
+		 * has the same typeid as the source.  But when assigning from a query
+		 * result, it's common to have a source tupdesc that's labeled RECORD
+		 * but is actually physically compatible with a named-composite-type
+		 * target, so it's worth spending extra cycles to check for that.
+		 */
+		if (rec->rectypeid == RECORDOID ||
+			rec->rectypeid == tupdesc->tdtypeid ||
+			!HeapTupleIsValid(tup) ||
+			compatible_tupdescs(tupdesc, expanded_record_get_tupdesc(newerh)))
+		{
+			if (!HeapTupleIsValid(tup))
+			{
+				/* No data, so force the record into all-nulls state */
+				deconstruct_expanded_record(newerh);
+			}
+			else
+			{
+				/* No coercion is needed, so just assign the row value */
+				expanded_record_set_tuple(newerh, tup, true);
+			}
+
+			/* Complete the assignment */
+			assign_record_var(estate, rec, newerh);
+
+			return;
+		}
 	}
-	else
+
+	/*
+	 * Otherwise, deconstruct the tuple and do field-by-field assignment,
+	 * using exec_move_row_from_fields.
+	 */
+	if (tupdesc && HeapTupleIsValid(tup))
 	{
+		int			td_natts = tupdesc->natts;
+		Datum	   *values;
+		bool	   *nulls;
+		Datum		values_local[64];
+		bool		nulls_local[64];
+
 		/*
-		 * Expression requires no parameters.  Be sure we represent this case
-		 * as a NULL ParamListInfo, so that plancache.c knows there is no
-		 * point in a custom plan.
+		 * Need workspace arrays.  If td_natts is small enough, use local
+		 * arrays to save doing a palloc.  Even if it's not small, we can
+		 * allocate both the Datum and isnull arrays in one palloc chunk.
+		 */
+		if (td_natts <= lengthof(values_local))
+		{
+			values = values_local;
+			nulls = nulls_local;
+		}
+		else
+		{
+			char	   *chunk;
+
+			chunk = eval_mcontext_alloc(estate,
+										td_natts * (sizeof(Datum) + sizeof(bool)));
+			values = (Datum *) chunk;
+			nulls = (bool *) (chunk + td_natts * sizeof(Datum));
+		}
+
+		heap_deform_tuple(tup, tupdesc, values, nulls);
+
+		exec_move_row_from_fields(estate, target, newerh,
+								  values, nulls, tupdesc);
+	}
+	else
+	{
+		/*
+		 * Assign all-nulls.
 		 */
-		paramLI = NULL;
+		exec_move_row_from_fields(estate, target, newerh,
+								  NULL, NULL, NULL);
 	}
-	return paramLI;
 }
 
 /*
- * plpgsql_param_fetch		paramFetch callback for dynamic parameter fetch
+ * Build an expanded record object suitable for assignment to "rec".
+ *
+ * Caller must supply either a source tuple descriptor or a source expanded
+ * record (not both).  If the record variable has declared type RECORD,
+ * it'll adopt the source's rowtype.  Even if it doesn't, we may be able to
+ * piggyback on a source expanded record to save a typcache lookup.
+ *
+ * Caller must fill the object with data, then do assign_record_var().
+ *
+ * The new record is initially put into the mcontext, so it will be cleaned up
+ * if we fail before reaching assign_record_var().
  */
-static void
-plpgsql_param_fetch(ParamListInfo params, int paramid)
+static ExpandedRecordHeader *
+make_expanded_record_for_rec(PLpgSQL_execstate *estate,
+							 PLpgSQL_rec *rec,
+							 TupleDesc srctupdesc,
+							 ExpandedRecordHeader *srcerh)
 {
-	int			dno;
-	PLpgSQL_execstate *estate;
-	PLpgSQL_expr *expr;
-	PLpgSQL_datum *datum;
-	ParamExternData *prm;
-	int32		prmtypmod;
-
-	/* paramid's are 1-based, but dnos are 0-based */
-	dno = paramid - 1;
-	Assert(dno >= 0 && dno < params->numParams);
-
-	/* fetch back the hook data */
-	estate = (PLpgSQL_execstate *) params->paramFetchArg;
-	expr = (PLpgSQL_expr *) params->parserSetupArg;
-	Assert(params->numParams == estate->ndatums);
-
-	/* now we can access the target datum */
-	datum = estate->datums[dno];
-
-	/*
-	 * Since copyParamList() or SerializeParamList() will try to materialize
-	 * every single parameter slot, it's important to do nothing when asked
-	 * for a datum that's not supposed to be used by this SQL expression.
-	 * Otherwise we risk failures in exec_eval_datum(), or copying a lot more
-	 * data than necessary.
-	 */
-	if (!bms_is_member(dno, expr->paramnos))
-		return;
+	ExpandedRecordHeader *newerh;
+	MemoryContext mcontext = get_eval_mcontext(estate);
 
-	if (params == estate->paramLI)
+	if (rec->rectypeid != RECORDOID)
 	{
 		/*
-		 * We need to mark the shared params array dirty if we're about to
-		 * evaluate a resettable datum.
+		 * New record must be of desired type, but maybe srcerh has already
+		 * done all the same lookups.
 		 */
-		switch (datum->dtype)
+		if (srcerh && rec->rectypeid == srcerh->er_decltypeid)
+			newerh = make_expanded_record_from_exprecord(srcerh,
+														 mcontext);
+		else
+			newerh = make_expanded_record_from_typeid(rec->rectypeid, -1,
+													  mcontext);
+	}
+	else
+	{
+		/*
+		 * We'll adopt the input tupdesc.  We can still use
+		 * make_expanded_record_from_exprecord, if srcerh isn't a composite
+		 * domain.  (If it is, we effectively adopt its base type.)
+		 */
+		if (srcerh && !ExpandedRecordIsDomain(srcerh))
+			newerh = make_expanded_record_from_exprecord(srcerh,
+														 mcontext);
+		else
 		{
-			case PLPGSQL_DTYPE_ROW:
-			case PLPGSQL_DTYPE_REC:
-			case PLPGSQL_DTYPE_RECFIELD:
-				estate->params_dirty = true;
-				break;
-
-			default:
-				break;
+			if (!srctupdesc)
+				srctupdesc = expanded_record_get_tupdesc(srcerh);
+			newerh = make_expanded_record_from_tupdesc(srctupdesc,
+													   mcontext);
 		}
 	}
 
-	/* OK, evaluate the value and store into the appropriate paramlist slot */
-	prm = &params->params[dno];
-	exec_eval_datum(estate, datum,
-					&prm->ptype, &prmtypmod,
-					&prm->value, &prm->isnull);
-	/* We can always mark params as "const" for executor's purposes */
-	prm->pflags = PARAM_FLAG_CONST;
-
-	/*
-	 * If it's a read/write expanded datum, convert reference to read-only,
-	 * unless it's safe to pass as read-write.
-	 */
-	if (datum->dtype == PLPGSQL_DTYPE_VAR && dno != expr->rwparam)
-		prm->value = MakeExpandedObjectReadOnly(prm->value,
-												prm->isnull,
-												((PLpgSQL_var *) datum)->datatype->typlen);
+	return newerh;
 }
 
-
-/* ----------
- * exec_move_row			Move one tuple's values into a record or row
+/*
+ * exec_move_row_from_fields	Move arrays of field values into a record or row
+ *
+ * When assigning to a record, the caller must have already created a suitable
+ * new expanded record object, newerh.  Pass NULL when assigning to a row.
  *
- * Since this uses exec_assign_value, caller should eventually call
+ * tupdesc describes the input row, which might have different column
+ * types and/or different dropped-column positions than the target.
+ * values/nulls/tupdesc can all be NULL if we just want to assign nulls to
+ * all fields of the record or row.
+ *
+ * Since this uses the mcontext for workspace, caller should eventually call
  * exec_eval_cleanup to prevent long-term memory leaks.
- * ----------
  */
 static void
-exec_move_row(PLpgSQL_execstate *estate,
-			  PLpgSQL_rec *rec,
-			  PLpgSQL_row *row,
-			  HeapTuple tup, TupleDesc tupdesc)
+exec_move_row_from_fields(PLpgSQL_execstate *estate,
+						  PLpgSQL_variable *target,
+						  ExpandedRecordHeader *newerh,
+						  Datum *values, bool *nulls,
+						  TupleDesc tupdesc)
 {
-	/*
-	 * Record is simple - just copy the tuple and its descriptor into the
-	 * record variable
-	 */
-	if (rec != NULL)
+	int			td_natts = tupdesc ? tupdesc->natts : 0;
+	int			fnum;
+	int			anum;
+
+	/* Handle RECORD-target case */
+	if (target->dtype == PLPGSQL_DTYPE_REC)
 	{
+		PLpgSQL_rec *rec = (PLpgSQL_rec *) target;
+		TupleDesc	var_tupdesc;
+		Datum		newvalues_local[64];
+		bool		newnulls_local[64];
+
+		Assert(newerh != NULL); /* caller must have built new object */
+
+		var_tupdesc = expanded_record_get_tupdesc(newerh);
+
 		/*
-		 * Copy input first, just in case it is pointing at variable's value
+		 * Coerce field values if needed.  This might involve dealing with
+		 * different sets of dropped columns and/or coercing individual column
+		 * types.  That's sort of a pain, but historically plpgsql has allowed
+		 * it, so we preserve the behavior.  However, it's worth a quick check
+		 * to see if the tupdescs are identical.  (Since expandedrecord.c
+		 * prefers to use refcounted tupdescs from the typcache, expanded
+		 * records with the same rowtype will have pointer-equal tupdescs.)
 		 */
-		if (HeapTupleIsValid(tup))
-			tup = heap_copytuple(tup);
-		else if (tupdesc)
+		if (var_tupdesc != tupdesc)
 		{
-			/* If we have a tupdesc but no data, form an all-nulls tuple */
-			bool	   *nulls;
+			int			vtd_natts = var_tupdesc->natts;
+			Datum	   *newvalues;
+			bool	   *newnulls;
 
-			nulls = (bool *)
-				eval_mcontext_alloc(estate, tupdesc->natts * sizeof(bool));
-			memset(nulls, true, tupdesc->natts * sizeof(bool));
+			/*
+			 * Need workspace arrays.  If vtd_natts is small enough, use local
+			 * arrays to save doing a palloc.  Even if it's not small, we can
+			 * allocate both the Datum and isnull arrays in one palloc chunk.
+			 */
+			if (vtd_natts <= lengthof(newvalues_local))
+			{
+				newvalues = newvalues_local;
+				newnulls = newnulls_local;
+			}
+			else
+			{
+				char	   *chunk;
 
-			tup = heap_form_tuple(tupdesc, NULL, nulls);
-		}
+				chunk = eval_mcontext_alloc(estate,
+											vtd_natts * (sizeof(Datum) + sizeof(bool)));
+				newvalues = (Datum *) chunk;
+				newnulls = (bool *) (chunk + vtd_natts * sizeof(Datum));
+			}
 
-		if (tupdesc)
-			tupdesc = CreateTupleDescCopy(tupdesc);
+			/* Walk over destination columns */
+			anum = 0;
+			for (fnum = 0; fnum < vtd_natts; fnum++)
+			{
+				Form_pg_attribute attr = TupleDescAttr(var_tupdesc, fnum);
+				Datum		value;
+				bool		isnull;
+				Oid			valtype;
+				int32		valtypmod;
 
-		/* Free the old value ... */
-		if (rec->freetup)
-		{
-			heap_freetuple(rec->tup);
-			rec->freetup = false;
-		}
-		if (rec->freetupdesc)
-		{
-			FreeTupleDesc(rec->tupdesc);
-			rec->freetupdesc = false;
-		}
+				if (attr->attisdropped)
+				{
+					/* expanded_record_set_fields should ignore this column */
+					continue;	/* skip dropped column in record */
+				}
 
-		/* ... and install the new */
-		if (HeapTupleIsValid(tup))
-		{
-			rec->tup = tup;
-			rec->freetup = true;
-		}
-		else
-			rec->tup = NULL;
+				while (anum < td_natts &&
+					   TupleDescAttr(tupdesc, anum)->attisdropped)
+					anum++;		/* skip dropped column in tuple */
 
-		if (tupdesc)
-		{
-			rec->tupdesc = tupdesc;
-			rec->freetupdesc = true;
+				if (anum < td_natts)
+				{
+					value = values[anum];
+					isnull = nulls[anum];
+					valtype = TupleDescAttr(tupdesc, anum)->atttypid;
+					valtypmod = TupleDescAttr(tupdesc, anum)->atttypmod;
+					anum++;
+				}
+				else
+				{
+					value = (Datum) 0;
+					isnull = true;
+					valtype = UNKNOWNOID;
+					valtypmod = -1;
+				}
+
+				/* Cast the new value to the right type, if needed. */
+				newvalues[fnum] = exec_cast_value(estate,
+												  value,
+												  &isnull,
+												  valtype,
+												  valtypmod,
+												  attr->atttypid,
+												  attr->atttypmod);
+				newnulls[fnum] = isnull;
+			}
+
+			values = newvalues;
+			nulls = newnulls;
 		}
-		else
-			rec->tupdesc = NULL;
+
+		/* Insert the coerced field values into the new expanded record */
+		expanded_record_set_fields(newerh, values, nulls);
+
+		/* Complete the assignment */
+		assign_record_var(estate, rec, newerh);
 
 		return;
 	}
 
+	/* newerh should not have been passed in non-RECORD cases */
+	Assert(newerh == NULL);
+
 	/*
-	 * Row is a bit more complicated in that we assign the individual
-	 * attributes of the tuple to the variables the row points to.
+	 * For a row, we assign the individual field values to the variables the
+	 * row points to.
 	 *
-	 * NOTE: this code used to demand row->nfields ==
-	 * HeapTupleHeaderGetNatts(tup->t_data), but that's wrong.  The tuple
-	 * might have more fields than we expected if it's from an
-	 * inheritance-child table of the current table, or it might have fewer if
-	 * the table has had columns added by ALTER TABLE. Ignore extra columns
-	 * and assume NULL for missing columns, the same as heap_getattr would do.
-	 * We also have to skip over dropped columns in either the source or
-	 * destination.
+	 * NOTE: both this code and the record code above silently ignore extra
+	 * columns in the source and assume NULL for missing columns.  This is
+	 * pretty dubious but it's the historical behavior.
 	 *
-	 * If we have no tuple data at all, we'll assign NULL to all columns of
+	 * If we have no input data at all, we'll assign NULL to all columns of
 	 * the row variable.
 	 */
-	if (row != NULL)
+	if (target->dtype == PLPGSQL_DTYPE_ROW)
 	{
-		int			td_natts = tupdesc ? tupdesc->natts : 0;
-		int			t_natts;
-		int			fnum;
-		int			anum;
-
-		if (HeapTupleIsValid(tup))
-			t_natts = HeapTupleHeaderGetNatts(tup->t_data);
-		else
-			t_natts = 0;
+		PLpgSQL_row *row = (PLpgSQL_row *) target;
 
 		anum = 0;
 		for (fnum = 0; fnum < row->nfields; fnum++)
@@ -6025,25 +6737,18 @@ exec_move_row(PLpgSQL_execstate *estate,
 			Oid			valtype;
 			int32		valtypmod;
 
-			if (row->varnos[fnum] < 0)
-				continue;		/* skip dropped column in row struct */
-
 			var = (PLpgSQL_var *) (estate->datums[row->varnos[fnum]]);
 
-			while (anum < td_natts && tupdesc->attrs[anum]->attisdropped)
+			while (anum < td_natts &&
+				   TupleDescAttr(tupdesc, anum)->attisdropped)
 				anum++;			/* skip dropped column in tuple */
 
 			if (anum < td_natts)
 			{
-				if (anum < t_natts)
-					value = SPI_getbinval(tup, tupdesc, anum + 1, &isnull);
-				else
-				{
-					value = (Datum) 0;
-					isnull = true;
-				}
-				valtype = tupdesc->attrs[anum]->atttypid;
-				valtypmod = tupdesc->attrs[anum]->atttypmod;
+				value = values[anum];
+				isnull = nulls[anum];
+				valtype = TupleDescAttr(tupdesc, anum)->atttypid;
+				valtypmod = TupleDescAttr(tupdesc, anum)->atttypmod;
 				anum++;
 			}
 			else
@@ -6064,6 +6769,47 @@ exec_move_row(PLpgSQL_execstate *estate,
 	elog(ERROR, "unsupported target");
 }
 
+/*
+ * compatible_tupdescs: detect whether two tupdescs are physically compatible
+ *
+ * TRUE indicates that a tuple satisfying src_tupdesc can be used directly as
+ * a value for a composite variable using dst_tupdesc.
+ */
+static bool
+compatible_tupdescs(TupleDesc src_tupdesc, TupleDesc dst_tupdesc)
+{
+	int			i;
+
+	/* Possibly we could allow src_tupdesc to have extra columns? */
+	if (dst_tupdesc->natts != src_tupdesc->natts)
+		return false;
+
+	for (i = 0; i < dst_tupdesc->natts; i++)
+	{
+		Form_pg_attribute dattr = TupleDescAttr(dst_tupdesc, i);
+		Form_pg_attribute sattr = TupleDescAttr(src_tupdesc, i);
+
+		if (dattr->attisdropped != sattr->attisdropped)
+			return false;
+		if (!dattr->attisdropped)
+		{
+			/* Normal columns must match by type and typmod */
+			if (dattr->atttypid != sattr->atttypid ||
+				(dattr->atttypmod >= 0 &&
+				 dattr->atttypmod != sattr->atttypmod))
+				return false;
+		}
+		else
+		{
+			/* Dropped columns are OK as long as length/alignment match */
+			if (dattr->attlen != sattr->attlen ||
+				dattr->attalign != sattr->attalign)
+				return false;
+		}
+	}
+	return true;
+}
+
 /* ----------
  * make_tuple_from_row		Make a tuple from the values of a row object
  *
@@ -6095,18 +6841,16 @@ make_tuple_from_row(PLpgSQL_execstate *estate,
 		Oid			fieldtypeid;
 		int32		fieldtypmod;
 
-		if (tupdesc->attrs[i]->attisdropped)
+		if (TupleDescAttr(tupdesc, i)->attisdropped)
 		{
 			nulls[i] = true;	/* leave the column as null */
 			continue;
 		}
-		if (row->varnos[i] < 0) /* should not happen */
-			elog(ERROR, "dropped rowtype entry for non-dropped column");
 
 		exec_eval_datum(estate, estate->datums[row->varnos[i]],
 						&fieldtypeid, &fieldtypmod,
 						&dvalues[i], &nulls[i]);
-		if (fieldtypeid != tupdesc->attrs[i]->atttypid)
+		if (fieldtypeid != TupleDescAttr(tupdesc, i)->atttypid)
 			return NULL;
 		/* XXX should we insist on typmod match, too? */
 	}
@@ -6116,87 +6860,290 @@ make_tuple_from_row(PLpgSQL_execstate *estate,
 	return tuple;
 }
 
-/* ----------
- * get_tuple_from_datum		extract a tuple from a composite Datum
- *
- * Returns a HeapTuple, freshly palloc'd in caller's context.
+/*
+ * deconstruct_composite_datum		extract tuple+tupdesc from composite Datum
  *
- * Note: it's caller's responsibility to be sure value is of composite type.
- * ----------
- */
-static HeapTuple
-get_tuple_from_datum(Datum value)
-{
-	HeapTupleHeader td = DatumGetHeapTupleHeader(value);
-	HeapTupleData tmptup;
-
-	/* Build a temporary HeapTuple control structure */
-	tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
-	ItemPointerSetInvalid(&(tmptup.t_self));
-	tmptup.t_tableOid = InvalidOid;
-	tmptup.t_data = td;
-
-	/* Build a copy and return it */
-	return heap_copytuple(&tmptup);
-}
-
-/* ----------
- * get_tupdesc_from_datum	get a tuple descriptor for a composite Datum
+ * The caller must supply a HeapTupleData variable, in which we set up a
+ * tuple header pointing to the composite datum's body.  To make the tuple
+ * value outlive that variable, caller would need to apply heap_copytuple...
+ * but current callers only need a short-lived tuple value anyway.
  *
- * Returns a pointer to the TupleDesc of the tuple's rowtype.
+ * Returns a pointer to the TupleDesc of the datum's rowtype.
  * Caller is responsible for calling ReleaseTupleDesc when done with it.
  *
  * Note: it's caller's responsibility to be sure value is of composite type.
- * ----------
+ * Also, best to call this in a short-lived context, as it might leak memory.
  */
 static TupleDesc
-get_tupdesc_from_datum(Datum value)
+deconstruct_composite_datum(Datum value, HeapTupleData *tmptup)
 {
-	HeapTupleHeader td = DatumGetHeapTupleHeader(value);
+	HeapTupleHeader td;
 	Oid			tupType;
 	int32		tupTypmod;
 
+	/* Get tuple body (note this could involve detoasting) */
+	td = DatumGetHeapTupleHeader(value);
+
+	/* Build a temporary HeapTuple control structure */
+	tmptup->t_len = HeapTupleHeaderGetDatumLength(td);
+	ItemPointerSetInvalid(&(tmptup->t_self));
+	tmptup->t_tableOid = InvalidOid;
+	tmptup->t_data = td;
+
 	/* Extract rowtype info and find a tupdesc */
 	tupType = HeapTupleHeaderGetTypeId(td);
 	tupTypmod = HeapTupleHeaderGetTypMod(td);
 	return lookup_rowtype_tupdesc(tupType, tupTypmod);
 }
 
-/* ----------
+/*
  * exec_move_row_from_datum		Move a composite Datum into a record or row
  *
- * This is equivalent to get_tuple_from_datum() followed by exec_move_row(),
- * but we avoid constructing an intermediate physical copy of the tuple.
- * ----------
+ * This is equivalent to deconstruct_composite_datum() followed by
+ * exec_move_row(), but we can optimize things if the Datum is an
+ * expanded-record reference.
+ *
+ * Note: it's caller's responsibility to be sure value is of composite type.
  */
 static void
 exec_move_row_from_datum(PLpgSQL_execstate *estate,
-						 PLpgSQL_rec *rec,
-						 PLpgSQL_row *row,
+						 PLpgSQL_variable *target,
 						 Datum value)
 {
-	HeapTupleHeader td = DatumGetHeapTupleHeader(value);
-	Oid			tupType;
-	int32		tupTypmod;
-	TupleDesc	tupdesc;
-	HeapTupleData tmptup;
+	/* Check to see if source is an expanded record */
+	if (VARATT_IS_EXTERNAL_EXPANDED(DatumGetPointer(value)))
+	{
+		ExpandedRecordHeader *erh = (ExpandedRecordHeader *) DatumGetEOHP(value);
+		ExpandedRecordHeader *newerh = NULL;
 
-	/* Extract rowtype info and find a tupdesc */
-	tupType = HeapTupleHeaderGetTypeId(td);
-	tupTypmod = HeapTupleHeaderGetTypMod(td);
-	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+		Assert(erh->er_magic == ER_MAGIC);
 
-	/* Build a temporary HeapTuple control structure */
-	tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
-	ItemPointerSetInvalid(&(tmptup.t_self));
-	tmptup.t_tableOid = InvalidOid;
-	tmptup.t_data = td;
+		/* These cases apply if the target is record not row... */
+		if (target->dtype == PLPGSQL_DTYPE_REC)
+		{
+			PLpgSQL_rec *rec = (PLpgSQL_rec *) target;
+
+			/*
+			 * If it's the same record already stored in the variable, do
+			 * nothing.  This would happen only in silly cases like "r := r",
+			 * but we need some check to avoid possibly freeing the variable's
+			 * live value below.  Note that this applies even if what we have
+			 * is a R/O pointer.
+			 */
+			if (erh == rec->erh)
+				return;
+
+			/*
+			 * If we have a R/W pointer, we're allowed to just commandeer
+			 * ownership of the expanded record.  If it's of the right type to
+			 * put into the record variable, do that.  (Note we don't accept
+			 * an expanded record of a composite-domain type as a RECORD
+			 * value.  We'll treat it as the base composite type instead;
+			 * compare logic in make_expanded_record_for_rec.)
+			 */
+			if (VARATT_IS_EXTERNAL_EXPANDED_RW(DatumGetPointer(value)) &&
+				(rec->rectypeid == erh->er_decltypeid ||
+				 (rec->rectypeid == RECORDOID &&
+				  !ExpandedRecordIsDomain(erh))))
+			{
+				assign_record_var(estate, rec, erh);
+				return;
+			}
+
+			/*
+			 * If we already have an expanded record object in the target
+			 * variable, and the source record contains a valid tuple
+			 * representation with the right rowtype, then we can skip making
+			 * a new expanded record and just assign the tuple with
+			 * expanded_record_set_tuple.  (We can't do the equivalent if we
+			 * have to do field-by-field assignment, since that wouldn't be
+			 * atomic if there's an error.)  We consider that there's a
+			 * rowtype match only if it's the same named composite type or
+			 * same registered rowtype; checking for matches of anonymous
+			 * rowtypes would be more expensive than this is worth.
+			 */
+			if (rec->erh &&
+				(erh->flags & ER_FLAG_FVALUE_VALID) &&
+				erh->er_typeid == rec->erh->er_typeid &&
+				(erh->er_typeid != RECORDOID ||
+				 (erh->er_typmod == rec->erh->er_typmod &&
+				  erh->er_typmod >= 0)))
+			{
+				expanded_record_set_tuple(rec->erh, erh->fvalue, true);
+				return;
+			}
+
+			/*
+			 * Otherwise we're gonna need a new expanded record object.  Make
+			 * it here in hopes of piggybacking on the source object's
+			 * previous typcache lookup.
+			 */
+			newerh = make_expanded_record_for_rec(estate, rec, NULL, erh);
+
+			/*
+			 * If the expanded record contains a valid tuple representation,
+			 * and we don't need rowtype conversion, then just copying the
+			 * tuple is probably faster than field-by-field processing.  (This
+			 * isn't duplicative of the previous check, since here we will
+			 * catch the case where the record variable was previously empty.)
+			 */
+			if ((erh->flags & ER_FLAG_FVALUE_VALID) &&
+				(rec->rectypeid == RECORDOID ||
+				 rec->rectypeid == erh->er_typeid))
+			{
+				expanded_record_set_tuple(newerh, erh->fvalue, true);
+				assign_record_var(estate, rec, newerh);
+				return;
+			}
+
+			/*
+			 * Need to special-case empty source record, else code below would
+			 * leak newerh.
+			 */
+			if (ExpandedRecordIsEmpty(erh))
+			{
+				/* Set newerh to a row of NULLs */
+				deconstruct_expanded_record(newerh);
+				assign_record_var(estate, rec, newerh);
+				return;
+			}
+		}						/* end of record-target-only cases */
+
+		/*
+		 * If the source expanded record is empty, we should treat that like a
+		 * NULL tuple value.  (We're unlikely to see such a case, but we must
+		 * check this; deconstruct_expanded_record would cause a change of
+		 * logical state, which is not OK.)
+		 */
+		if (ExpandedRecordIsEmpty(erh))
+		{
+			exec_move_row(estate, target, NULL,
+						  expanded_record_get_tupdesc(erh));
+			return;
+		}
+
+		/*
+		 * Otherwise, ensure that the source record is deconstructed, and
+		 * assign from its field values.
+		 */
+		deconstruct_expanded_record(erh);
+		exec_move_row_from_fields(estate, target, newerh,
+								  erh->dvalues, erh->dnulls,
+								  expanded_record_get_tupdesc(erh));
+	}
+	else
+	{
+		/*
+		 * Nope, we've got a plain composite Datum.  Deconstruct it; but we
+		 * don't use deconstruct_composite_datum(), because we may be able to
+		 * skip calling lookup_rowtype_tupdesc().
+		 */
+		HeapTupleHeader td;
+		HeapTupleData tmptup;
+		Oid			tupType;
+		int32		tupTypmod;
+		TupleDesc	tupdesc;
+		MemoryContext oldcontext;
+
+		/* Ensure that any detoasted data winds up in the eval_mcontext */
+		oldcontext = MemoryContextSwitchTo(get_eval_mcontext(estate));
+		/* Get tuple body (note this could involve detoasting) */
+		td = DatumGetHeapTupleHeader(value);
+		MemoryContextSwitchTo(oldcontext);
+
+		/* Build a temporary HeapTuple control structure */
+		tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
+		ItemPointerSetInvalid(&(tmptup.t_self));
+		tmptup.t_tableOid = InvalidOid;
+		tmptup.t_data = td;
+
+		/* Extract rowtype info */
+		tupType = HeapTupleHeaderGetTypeId(td);
+		tupTypmod = HeapTupleHeaderGetTypMod(td);
+
+		/* Now, if the target is record not row, maybe we can optimize ... */
+		if (target->dtype == PLPGSQL_DTYPE_REC)
+		{
+			PLpgSQL_rec *rec = (PLpgSQL_rec *) target;
+
+			/*
+			 * If we already have an expanded record object in the target
+			 * variable, and the source datum has a matching rowtype, then we
+			 * can skip making a new expanded record and just assign the tuple
+			 * with expanded_record_set_tuple.  We consider that there's a
+			 * rowtype match only if it's the same named composite type or
+			 * same registered rowtype.  (Checking to reject an anonymous
+			 * rowtype here should be redundant, but let's be safe.)
+			 */
+			if (rec->erh &&
+				tupType == rec->erh->er_typeid &&
+				(tupType != RECORDOID ||
+				 (tupTypmod == rec->erh->er_typmod &&
+				  tupTypmod >= 0)))
+			{
+				expanded_record_set_tuple(rec->erh, &tmptup, true);
+				return;
+			}
+
+			/*
+			 * If the source datum has a rowtype compatible with the target
+			 * variable, just build a new expanded record and assign the tuple
+			 * into it.  Using make_expanded_record_from_typeid() here saves
+			 * one typcache lookup compared to the code below.
+			 */
+			if (rec->rectypeid == RECORDOID || rec->rectypeid == tupType)
+			{
+				ExpandedRecordHeader *newerh;
+				MemoryContext mcontext = get_eval_mcontext(estate);
+
+				newerh = make_expanded_record_from_typeid(tupType, tupTypmod,
+														  mcontext);
+				expanded_record_set_tuple(newerh, &tmptup, true);
+				assign_record_var(estate, rec, newerh);
+				return;
+			}
+
+			/*
+			 * Otherwise, we're going to need conversion, so fall through to
+			 * do it the hard way.
+			 */
+		}
+
+		/*
+		 * ROW target, or unoptimizable RECORD target, so we have to expend a
+		 * lookup to obtain the source datum's tupdesc.
+		 */
+		tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+
+		/* Do the move */
+		exec_move_row(estate, target, &tmptup, tupdesc);
+
+		/* Release tupdesc usage count */
+		ReleaseTupleDesc(tupdesc);
+	}
+}
+
+/*
+ * If we have not created an expanded record to hold the record variable's
+ * value, do so.  The expanded record will be "empty", so this does not
+ * change the logical state of the record variable: it's still NULL.
+ * However, now we'll have a tupdesc with which we can e.g. look up fields.
+ */
+static void
+instantiate_empty_record_variable(PLpgSQL_execstate *estate, PLpgSQL_rec *rec)
+{
+	Assert(rec->erh == NULL);	/* else caller error */
 
-	/* Do the move */
-	exec_move_row(estate, rec, row, &tmptup, tupdesc);
+	/* If declared type is RECORD, we can't instantiate */
+	if (rec->rectypeid == RECORDOID)
+		ereport(ERROR,
+				(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
+				 errmsg("record \"%s\" is not assigned yet", rec->refname),
+				 errdetail("The tuple structure of a not-yet-assigned record is indeterminate.")));
 
-	/* Release tupdesc usage count */
-	ReleaseTupleDesc(tupdesc);
+	/* OK, do it */
+	rec->erh = make_expanded_record_from_typeid(rec->rectypeid, -1,
+												estate->datum_context);
 }
 
 /* ----------
@@ -6291,7 +7238,7 @@ exec_cast_value(PLpgSQL_execstate *estate,
  * or NULL if the cast is a mere no-op relabeling.  If there's work to be
  * done, the cast_exprstate field contains an expression evaluation tree
  * based on a CaseTestExpr input, and the cast_in_use field should be set
- * TRUE while executing it.
+ * true while executing it.
  * ----------
  */
 static plpgsql_CastHashEntry *
@@ -6570,8 +7517,8 @@ exec_save_simple_expr(PLpgSQL_expr *expr, CachedPlan *cplan)
 	 * force_parallel_mode is on, the planner might've stuck a Gather node
 	 * atop that.  The simplest way to deal with this is to look through the
 	 * Gather node.  The Gather node's tlist would normally contain a Var
-	 * referencing the child node's output ... but setrefs.c might also have
-	 * copied a Const as-is.
+	 * referencing the child node's output, but it could also be a Param, or
+	 * it could be a Const that setrefs.c copied as-is.
 	 */
 	plan = stmt->planTree;
 	for (;;)
@@ -6598,9 +7545,9 @@ exec_save_simple_expr(PLpgSQL_expr *expr, CachedPlan *cplan)
 			/* If setrefs.c copied up a Const, no need to look further */
 			if (IsA(tle_expr, Const))
 				break;
-			/* Otherwise, it better be an outer Var */
-			Assert(IsA(tle_expr, Var));
-			Assert(((Var *) tle_expr)->varno == OUTER_VAR);
+			/* Otherwise, it had better be a Param or an outer Var */
+			Assert(IsA(tle_expr, Param) ||(IsA(tle_expr, Var) &&
+										   ((Var *) tle_expr)->varno == OUTER_VAR));
 			/* Descend to the child node */
 			plan = plan->lefttree;
 		}
@@ -6833,8 +7780,7 @@ plpgsql_xact_cb(XactEvent event, void *arg)
 	 */
 	if (event == XACT_EVENT_COMMIT || event == XACT_EVENT_PREPARE)
 	{
-		/* Shouldn't be any econtext stack entries left at commit */
-		Assert(simple_econtext_stack == NULL);
+		simple_econtext_stack = NULL;
 
 		if (shared_simple_eval_estate)
 			FreeExecutorState(shared_simple_eval_estate);
@@ -6878,15 +7824,14 @@ plpgsql_subxact_cb(SubXactEvent event, SubTransactionId mySubid,
  * assign_simple_var --- assign a new value to any VAR datum.
  *
  * This should be the only mechanism for assignment to simple variables,
- * lest we forget to update the paramLI image.
+ * lest we do the release of the old value incorrectly.
  */
 static void
 assign_simple_var(PLpgSQL_execstate *estate, PLpgSQL_var *var,
 				  Datum newvalue, bool isnull, bool freeable)
 {
-	ParamExternData *prm;
-
-	Assert(var->dtype == PLPGSQL_DTYPE_VAR);
+	Assert(var->dtype == PLPGSQL_DTYPE_VAR ||
+		   var->dtype == PLPGSQL_DTYPE_PROMISE);
 	/* Free the old value if needed */
 	if (var->freeval)
 	{
@@ -6901,15 +7846,13 @@ assign_simple_var(PLpgSQL_execstate *estate, PLpgSQL_var *var,
 	var->value = newvalue;
 	var->isnull = isnull;
 	var->freeval = freeable;
-	/* And update the image in the common parameter list */
-	prm = &estate->paramLI->params[var->dno];
-	prm->value = MakeExpandedObjectReadOnly(newvalue,
-											isnull,
-											var->datatype->typlen);
-	prm->isnull = isnull;
-	/* these might be set already, but let's be sure */
-	prm->pflags = PARAM_FLAG_CONST;
-	prm->ptype = var->datatype->typoid;
+
+	/*
+	 * If it's a promise variable, then either we just assigned the promised
+	 * value, or the user explicitly assigned an overriding value.  Either
+	 * way, cancel the promise.
+	 */
+	var->promise = PLPGSQL_PROMISE_NONE;
 }
 
 /*
@@ -6921,6 +7864,26 @@ assign_text_var(PLpgSQL_execstate *estate, PLpgSQL_var *var, const char *str)
 	assign_simple_var(estate, var, CStringGetTextDatum(str), false, true);
 }
 
+/*
+ * assign_record_var --- assign a new value to any REC datum.
+ */
+static void
+assign_record_var(PLpgSQL_execstate *estate, PLpgSQL_rec *rec,
+				  ExpandedRecordHeader *erh)
+{
+	Assert(rec->dtype == PLPGSQL_DTYPE_REC);
+
+	/* Transfer new record object into datum_context */
+	TransferExpandedRecord(erh, estate->datum_context);
+
+	/* Free the old value ... */
+	if (rec->erh)
+		DeleteExpandedObject(ExpandedRecordGetDatum(rec->erh));
+
+	/* ... and install the new */
+	rec->erh = erh;
+}
+
 /*
  * exec_eval_using_params --- evaluate params of USING clause
  *
diff --git a/src/pl/plpgsql/src/pl_funcs.c b/src/pl/plpgsql/src/pl_funcs.c
index cd44a8e9a3..b986fc39b3 100644
--- a/src/pl/plpgsql/src/pl_funcs.c
+++ b/src/pl/plpgsql/src/pl_funcs.c
@@ -3,7 +3,7 @@
  * pl_funcs.c		- Misc functions for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -113,7 +113,7 @@ plpgsql_ns_additem(PLpgSQL_nsitem_type itemtype, int itemno, const char *name)
  *
  * Note that this only searches for variables, not labels.
  *
- * If localmode is TRUE, only the topmost block level is searched.
+ * If localmode is true, only the topmost block level is searched.
  *
  * name1 must be non-NULL.  Pass NULL for name2 and/or name3 if parsing a name
  * with fewer than three components.
@@ -284,6 +284,10 @@ plpgsql_stmt_typename(PLpgSQL_stmt *stmt)
 			return "CLOSE";
 		case PLPGSQL_STMT_PERFORM:
 			return "PERFORM";
+		case PLPGSQL_STMT_COMMIT:
+			return "COMMIT";
+		case PLPGSQL_STMT_ROLLBACK:
+			return "ROLLBACK";
 	}
 
 	return "unknown";
@@ -363,6 +367,8 @@ static void free_open(PLpgSQL_stmt_open *stmt);
 static void free_fetch(PLpgSQL_stmt_fetch *stmt);
 static void free_close(PLpgSQL_stmt_close *stmt);
 static void free_perform(PLpgSQL_stmt_perform *stmt);
+static void free_commit(PLpgSQL_stmt_commit *stmt);
+static void free_rollback(PLpgSQL_stmt_rollback *stmt);
 static void free_expr(PLpgSQL_expr *expr);
 
 
@@ -443,6 +449,12 @@ free_stmt(PLpgSQL_stmt *stmt)
 		case PLPGSQL_STMT_PERFORM:
 			free_perform((PLpgSQL_stmt_perform *) stmt);
 			break;
+		case PLPGSQL_STMT_COMMIT:
+			free_commit((PLpgSQL_stmt_commit *) stmt);
+			break;
+		case PLPGSQL_STMT_ROLLBACK:
+			free_rollback((PLpgSQL_stmt_rollback *) stmt);
+			break;
 		default:
 			elog(ERROR, "unrecognized cmd_type: %d", stmt->cmd_type);
 			break;
@@ -590,6 +602,16 @@ free_perform(PLpgSQL_stmt_perform *stmt)
 	free_expr(stmt->expr);
 }
 
+static void
+free_commit(PLpgSQL_stmt_commit *stmt)
+{
+}
+
+static void
+free_rollback(PLpgSQL_stmt_rollback *stmt)
+{
+}
+
 static void
 free_exit(PLpgSQL_stmt_exit *stmt)
 {
@@ -707,6 +729,7 @@ plpgsql_free_function_memory(PLpgSQL_function *func)
 		switch (d->dtype)
 		{
 			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
 				{
 					PLpgSQL_var *var = (PLpgSQL_var *) d;
 
@@ -717,6 +740,11 @@ plpgsql_free_function_memory(PLpgSQL_function *func)
 			case PLPGSQL_DTYPE_ROW:
 				break;
 			case PLPGSQL_DTYPE_REC:
+				{
+					PLpgSQL_rec *rec = (PLpgSQL_rec *) d;
+
+					free_expr(rec->default_val);
+				}
 				break;
 			case PLPGSQL_DTYPE_RECFIELD:
 				break;
@@ -777,6 +805,8 @@ static void dump_fetch(PLpgSQL_stmt_fetch *stmt);
 static void dump_cursor_direction(PLpgSQL_stmt_fetch *stmt);
 static void dump_close(PLpgSQL_stmt_close *stmt);
 static void dump_perform(PLpgSQL_stmt_perform *stmt);
+static void dump_commit(PLpgSQL_stmt_commit *stmt);
+static void dump_rollback(PLpgSQL_stmt_rollback *stmt);
 static void dump_expr(PLpgSQL_expr *expr);
 
 
@@ -867,6 +897,12 @@ dump_stmt(PLpgSQL_stmt *stmt)
 		case PLPGSQL_STMT_PERFORM:
 			dump_perform((PLpgSQL_stmt_perform *) stmt);
 			break;
+		case PLPGSQL_STMT_COMMIT:
+			dump_commit((PLpgSQL_stmt_commit *) stmt);
+			break;
+		case PLPGSQL_STMT_ROLLBACK:
+			dump_rollback((PLpgSQL_stmt_rollback *) stmt);
+			break;
 		default:
 			elog(ERROR, "unrecognized cmd_type: %d", stmt->cmd_type);
 			break;
@@ -1062,7 +1098,7 @@ static void
 dump_fors(PLpgSQL_stmt_fors *stmt)
 {
 	dump_ind();
-	printf("FORS %s ", (stmt->rec != NULL) ? stmt->rec->refname : stmt->row->refname);
+	printf("FORS %s ", stmt->var->refname);
 	dump_expr(stmt->query);
 	printf("\n");
 
@@ -1076,7 +1112,7 @@ static void
 dump_forc(PLpgSQL_stmt_forc *stmt)
 {
 	dump_ind();
-	printf("FORC %s ", stmt->rec->refname);
+	printf("FORC %s ", stmt->var->refname);
 	printf("curvar=%d\n", stmt->curvar);
 
 	dump_indent += 2;
@@ -1174,15 +1210,11 @@ dump_fetch(PLpgSQL_stmt_fetch *stmt)
 		dump_cursor_direction(stmt);
 
 		dump_indent += 2;
-		if (stmt->rec != NULL)
-		{
-			dump_ind();
-			printf("    target = %d %s\n", stmt->rec->dno, stmt->rec->refname);
-		}
-		if (stmt->row != NULL)
+		if (stmt->target != NULL)
 		{
 			dump_ind();
-			printf("    target = %d %s\n", stmt->row->dno, stmt->row->refname);
+			printf("    target = %d %s\n",
+				   stmt->target->dno, stmt->target->refname);
 		}
 		dump_indent -= 2;
 	}
@@ -1243,6 +1275,20 @@ dump_perform(PLpgSQL_stmt_perform *stmt)
 	printf("\n");
 }
 
+static void
+dump_commit(PLpgSQL_stmt_commit *stmt)
+{
+	dump_ind();
+	printf("COMMIT\n");
+}
+
+static void
+dump_rollback(PLpgSQL_stmt_rollback *stmt)
+{
+	dump_ind();
+	printf("ROLLBACK\n");
+}
+
 static void
 dump_exit(PLpgSQL_stmt_exit *stmt)
 {
@@ -1420,19 +1466,12 @@ dump_execsql(PLpgSQL_stmt_execsql *stmt)
 	printf("\n");
 
 	dump_indent += 2;
-	if (stmt->rec != NULL)
-	{
-		dump_ind();
-		printf("    INTO%s target = %d %s\n",
-			   stmt->strict ? " STRICT" : "",
-			   stmt->rec->dno, stmt->rec->refname);
-	}
-	if (stmt->row != NULL)
+	if (stmt->target != NULL)
 	{
 		dump_ind();
 		printf("    INTO%s target = %d %s\n",
 			   stmt->strict ? " STRICT" : "",
-			   stmt->row->dno, stmt->row->refname);
+			   stmt->target->dno, stmt->target->refname);
 	}
 	dump_indent -= 2;
 }
@@ -1446,19 +1485,12 @@ dump_dynexecute(PLpgSQL_stmt_dynexecute *stmt)
 	printf("\n");
 
 	dump_indent += 2;
-	if (stmt->rec != NULL)
-	{
-		dump_ind();
-		printf("    INTO%s target = %d %s\n",
-			   stmt->strict ? " STRICT" : "",
-			   stmt->rec->dno, stmt->rec->refname);
-	}
-	if (stmt->row != NULL)
+	if (stmt->target != NULL)
 	{
 		dump_ind();
 		printf("    INTO%s target = %d %s\n",
 			   stmt->strict ? " STRICT" : "",
-			   stmt->row->dno, stmt->row->refname);
+			   stmt->target->dno, stmt->target->refname);
 	}
 	if (stmt->params != NIL)
 	{
@@ -1485,8 +1517,7 @@ static void
 dump_dynfors(PLpgSQL_stmt_dynfors *stmt)
 {
 	dump_ind();
-	printf("FORS %s EXECUTE ",
-		   (stmt->rec != NULL) ? stmt->rec->refname : stmt->row->refname);
+	printf("FORS %s EXECUTE ", stmt->var->refname);
 	dump_expr(stmt->query);
 	printf("\n");
 	if (stmt->params != NIL)
@@ -1557,6 +1588,7 @@ plpgsql_dumptree(PLpgSQL_function *func)
 		switch (d->dtype)
 		{
 			case PLPGSQL_DTYPE_VAR:
+			case PLPGSQL_DTYPE_PROMISE:
 				{
 					PLpgSQL_var *var = (PLpgSQL_var *) d;
 
@@ -1583,6 +1615,9 @@ plpgsql_dumptree(PLpgSQL_function *func)
 						dump_expr(var->cursor_explicit_expr);
 						printf("\n");
 					}
+					if (var->promise != PLPGSQL_PROMISE_NONE)
+						printf("                                  PROMISE %d\n",
+							   (int) var->promise);
 				}
 				break;
 			case PLPGSQL_DTYPE_ROW:
@@ -1593,15 +1628,26 @@ plpgsql_dumptree(PLpgSQL_function *func)
 					printf("ROW %-16s fields", row->refname);
 					for (i = 0; i < row->nfields; i++)
 					{
-						if (row->fieldnames[i])
-							printf(" %s=var %d", row->fieldnames[i],
-								   row->varnos[i]);
+						printf(" %s=var %d", row->fieldnames[i],
+							   row->varnos[i]);
 					}
 					printf("\n");
 				}
 				break;
 			case PLPGSQL_DTYPE_REC:
-				printf("REC %s\n", ((PLpgSQL_rec *) d)->refname);
+				printf("REC %-16s typoid %u\n",
+					   ((PLpgSQL_rec *) d)->refname,
+					   ((PLpgSQL_rec *) d)->rectypeid);
+				if (((PLpgSQL_rec *) d)->isconst)
+					printf("                                  CONSTANT\n");
+				if (((PLpgSQL_rec *) d)->notnull)
+					printf("                                  NOT NULL\n");
+				if (((PLpgSQL_rec *) d)->default_val != NULL)
+				{
+					printf("                                  DEFAULT ");
+					dump_expr(((PLpgSQL_rec *) d)->default_val);
+					printf("\n");
+				}
 				break;
 			case PLPGSQL_DTYPE_RECFIELD:
 				printf("RECFIELD %-16s of REC %d\n",
diff --git a/src/pl/plpgsql/src/pl_gram.y b/src/pl/plpgsql/src/pl_gram.y
index 94f1f58593..688fbd6531 100644
--- a/src/pl/plpgsql/src/pl_gram.y
+++ b/src/pl/plpgsql/src/pl_gram.y
@@ -3,7 +3,7 @@
  *
  * pl_gram.y			- Parser for the PL/pgSQL procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -90,7 +90,7 @@ static  PLpgSQL_stmt	*make_case(int location, PLpgSQL_expr *t_expr,
 								   List *case_when_list, List *else_stmts);
 static	char			*NameOfDatum(PLwdatum *wdatum);
 static	void			 check_assignable(PLpgSQL_datum *datum, int location);
-static	void			 read_into_target(PLpgSQL_rec **rec, PLpgSQL_row **row,
+static	void			 read_into_target(PLpgSQL_variable **target,
 										  bool *strict);
 static	PLpgSQL_row		*read_into_scalar_list(char *initial_name,
 											   PLpgSQL_datum *initial_datum,
@@ -138,8 +138,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 			char *name;
 			int  lineno;
 			PLpgSQL_datum   *scalar;
-			PLpgSQL_rec		*rec;
-			PLpgSQL_row		*row;
+			PLpgSQL_datum   *row;
 		}						forvariable;
 		struct
 		{
@@ -199,6 +198,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %type <stmt>	stmt_return stmt_raise stmt_assert stmt_execsql
 %type <stmt>	stmt_dynexecute stmt_for stmt_perform stmt_getdiag
 %type <stmt>	stmt_open stmt_fetch stmt_move stmt_close stmt_null
+%type <stmt>	stmt_commit stmt_rollback
 %type <stmt>	stmt_case stmt_foreach_a
 
 %type <list>	proc_exceptions
@@ -261,6 +261,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_COLLATE
 %token <keyword>	K_COLUMN
 %token <keyword>	K_COLUMN_NAME
+%token <keyword>	K_COMMIT
 %token <keyword>	K_CONSTANT
 %token <keyword>	K_CONSTRAINT
 %token <keyword>	K_CONSTRAINT_NAME
@@ -326,6 +327,7 @@ static	void			check_raise_parameters(PLpgSQL_stmt_raise *stmt);
 %token <keyword>	K_RETURN
 %token <keyword>	K_RETURNED_SQLSTATE
 %token <keyword>	K_REVERSE
+%token <keyword>	K_ROLLBACK
 %token <keyword>	K_ROW_COUNT
 %token <keyword>	K_ROWTYPE
 %token <keyword>	K_SCHEMA
@@ -503,37 +505,20 @@ decl_statement	: decl_varname decl_const decl_datatype decl_collate decl_notnull
 
 						var = plpgsql_build_variable($1.name, $1.lineno,
 													 $3, true);
-						if ($2)
-						{
-							if (var->dtype == PLPGSQL_DTYPE_VAR)
-								((PLpgSQL_var *) var)->isconst = $2;
-							else
-								ereport(ERROR,
-										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-										 errmsg("row or record variable cannot be CONSTANT"),
-										 parser_errposition(@2)));
-						}
-						if ($5)
-						{
-							if (var->dtype == PLPGSQL_DTYPE_VAR)
-								((PLpgSQL_var *) var)->notnull = $5;
-							else
-								ereport(ERROR,
-										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-										 errmsg("row or record variable cannot be NOT NULL"),
-										 parser_errposition(@4)));
+						var->isconst = $2;
+						var->notnull = $5;
+						var->default_val = $6;
 
-						}
-						if ($6 != NULL)
-						{
-							if (var->dtype == PLPGSQL_DTYPE_VAR)
-								((PLpgSQL_var *) var)->default_val = $6;
-							else
-								ereport(ERROR,
-										(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-										 errmsg("default value for row or record variable is not supported"),
-										 parser_errposition(@5)));
-						}
+						/*
+						 * The combination of NOT NULL without an initializer
+						 * can't work, so let's reject it at compile time.
+						 */
+						if (var->notnull && var->default_val == NULL)
+							ereport(ERROR,
+									(errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
+									 errmsg("variable \"%s\" must have a default value, since it's declared NOT NULL",
+											var->refname),
+									 parser_errposition(@5)));
 					}
 				| decl_varname K_ALIAS K_FOR decl_aliasitem ';'
 					{
@@ -562,7 +547,6 @@ decl_statement	: decl_varname decl_const decl_datatype decl_collate decl_notnull
 
 						curname_def = palloc0(sizeof(PLpgSQL_expr));
 
-						curname_def->dtype = PLPGSQL_DTYPE_EXPR;
 						strcpy(buf, "SELECT ");
 						cp1 = new->refname;
 						cp2 = buf + strlen(buf);
@@ -634,6 +618,7 @@ decl_cursor_args :
 						foreach (l, $2)
 						{
 							PLpgSQL_variable *arg = (PLpgSQL_variable *) lfirst(l);
+							Assert(!arg->isconst);
 							new->fieldnames[i] = arg->refname;
 							new->varnos[i] = arg->dno;
 							i++;
@@ -898,6 +883,10 @@ proc_stmt		: pl_block ';'
 						{ $$ = $1; }
 				| stmt_null
 						{ $$ = $1; }
+				| stmt_commit
+						{ $$ = $1; }
+				| stmt_rollback
+						{ $$ = $1; }
 				;
 
 stmt_perform	: K_PERFORM expr_until_semi
@@ -1310,28 +1299,24 @@ for_control		: for_variable K_IN
 
 							new = palloc0(sizeof(PLpgSQL_stmt_dynfors));
 							new->cmd_type = PLPGSQL_STMT_DYNFORS;
-							if ($1.rec)
-							{
-								new->rec = $1.rec;
-								check_assignable((PLpgSQL_datum *) new->rec, @1);
-							}
-							else if ($1.row)
+							if ($1.row)
 							{
-								new->row = $1.row;
-								check_assignable((PLpgSQL_datum *) new->row, @1);
+								new->var = (PLpgSQL_variable *) $1.row;
+								check_assignable($1.row, @1);
 							}
 							else if ($1.scalar)
 							{
 								/* convert single scalar to list */
-								new->row = make_scalar_list1($1.name, $1.scalar,
-															 $1.lineno, @1);
-								/* no need for check_assignable */
+								new->var = (PLpgSQL_variable *)
+									make_scalar_list1($1.name, $1.scalar,
+													  $1.lineno, @1);
+								/* make_scalar_list1 did check_assignable */
 							}
 							else
 							{
 								ereport(ERROR,
 										(errcode(ERRCODE_DATATYPE_MISMATCH),
-										 errmsg("loop variable of loop over rows must be a record or row variable or list of scalar variables"),
+										 errmsg("loop variable of loop over rows must be a record variable or list of scalar variables"),
 										 parser_errposition(@1)));
 							}
 							new->query = expr;
@@ -1381,9 +1366,12 @@ for_control		: for_variable K_IN
 															 "LOOP");
 
 							/* create loop's private RECORD variable */
-							new->rec = plpgsql_build_record($1.name,
-															$1.lineno,
-															true);
+							new->var = (PLpgSQL_variable *)
+								plpgsql_build_record($1.name,
+													 $1.lineno,
+													 NULL,
+													 RECORDOID,
+													 true);
 
 							$$ = (PLpgSQL_stmt *) new;
 						}
@@ -1504,28 +1492,24 @@ for_control		: for_variable K_IN
 
 								new = palloc0(sizeof(PLpgSQL_stmt_fors));
 								new->cmd_type = PLPGSQL_STMT_FORS;
-								if ($1.rec)
+								if ($1.row)
 								{
-									new->rec = $1.rec;
-									check_assignable((PLpgSQL_datum *) new->rec, @1);
-								}
-								else if ($1.row)
-								{
-									new->row = $1.row;
-									check_assignable((PLpgSQL_datum *) new->row, @1);
+									new->var = (PLpgSQL_variable *) $1.row;
+									check_assignable($1.row, @1);
 								}
 								else if ($1.scalar)
 								{
 									/* convert single scalar to list */
-									new->row = make_scalar_list1($1.name, $1.scalar,
-																 $1.lineno, @1);
-									/* no need for check_assignable */
+									new->var = (PLpgSQL_variable *)
+										make_scalar_list1($1.name, $1.scalar,
+														  $1.lineno, @1);
+									/* make_scalar_list1 did check_assignable */
 								}
 								else
 								{
 									ereport(ERROR,
 											(errcode(ERRCODE_SYNTAX_ERROR),
-											 errmsg("loop variable of loop over rows must be a record or row variable or list of scalar variables"),
+											 errmsg("loop variable of loop over rows must be a record variable or list of scalar variables"),
 											 parser_errposition(@1)));
 								}
 
@@ -1558,32 +1542,26 @@ for_variable	: T_DATUM
 					{
 						$$.name = NameOfDatum(&($1));
 						$$.lineno = plpgsql_location_to_lineno(@1);
-						if ($1.datum->dtype == PLPGSQL_DTYPE_ROW)
+						if ($1.datum->dtype == PLPGSQL_DTYPE_ROW ||
+							$1.datum->dtype == PLPGSQL_DTYPE_REC)
 						{
 							$$.scalar = NULL;
-							$$.rec = NULL;
-							$$.row = (PLpgSQL_row *) $1.datum;
-						}
-						else if ($1.datum->dtype == PLPGSQL_DTYPE_REC)
-						{
-							$$.scalar = NULL;
-							$$.rec = (PLpgSQL_rec *) $1.datum;
-							$$.row = NULL;
+							$$.row = $1.datum;
 						}
 						else
 						{
 							int			tok;
 
 							$$.scalar = $1.datum;
-							$$.rec = NULL;
 							$$.row = NULL;
 							/* check for comma-separated list */
 							tok = yylex();
 							plpgsql_push_back_token(tok);
 							if (tok == ',')
-								$$.row = read_into_scalar_list($$.name,
-															   $$.scalar,
-															   @1);
+								$$.row = (PLpgSQL_datum *)
+									read_into_scalar_list($$.name,
+														  $$.scalar,
+														  @1);
 						}
 					}
 				| T_WORD
@@ -1593,7 +1571,6 @@ for_variable	: T_DATUM
 						$$.name = $1.ident;
 						$$.lineno = plpgsql_location_to_lineno(@1);
 						$$.scalar = NULL;
-						$$.rec = NULL;
 						$$.row = NULL;
 						/* check for comma-separated list */
 						tok = yylex();
@@ -1620,15 +1597,10 @@ stmt_foreach_a	: opt_loop_label K_FOREACH for_variable foreach_slice K_IN K_ARRA
 						new->expr = $7;
 						new->body = $8.stmts;
 
-						if ($3.rec)
-						{
-							new->varno = $3.rec->dno;
-							check_assignable((PLpgSQL_datum *) $3.rec, @3);
-						}
-						else if ($3.row)
+						if ($3.row)
 						{
 							new->varno = $3.row->dno;
-							check_assignable((PLpgSQL_datum *) $3.row, @3);
+							check_assignable($3.row, @3);
 						}
 						else if ($3.scalar)
 						{
@@ -1981,8 +1953,7 @@ stmt_dynexecute : K_EXECUTE
 						new->query = expr;
 						new->into = false;
 						new->strict = false;
-						new->rec = NULL;
-						new->row = NULL;
+						new->target = NULL;
 						new->params = NIL;
 
 						/*
@@ -1999,7 +1970,7 @@ stmt_dynexecute : K_EXECUTE
 								if (new->into)			/* multiple INTO */
 									yyerror("syntax error");
 								new->into = true;
-								read_into_target(&new->rec, &new->row, &new->strict);
+								read_into_target(&new->target, &new->strict);
 								endtoken = yylex();
 							}
 							else if (endtoken == K_USING)
@@ -2107,11 +2078,10 @@ stmt_open		: K_OPEN cursor_variable
 stmt_fetch		: K_FETCH opt_fetch_direction cursor_variable K_INTO
 					{
 						PLpgSQL_stmt_fetch *fetch = $2;
-						PLpgSQL_rec	   *rec;
-						PLpgSQL_row	   *row;
+						PLpgSQL_variable *target;
 
 						/* We have already parsed everything through the INTO keyword */
-						read_into_target(&rec, &row, NULL);
+						read_into_target(&target, NULL);
 
 						if (yylex() != ';')
 							yyerror("syntax error");
@@ -2127,8 +2097,7 @@ stmt_fetch		: K_FETCH opt_fetch_direction cursor_variable K_INTO
 									 parser_errposition(@1)));
 
 						fetch->lineno = plpgsql_location_to_lineno(@1);
-						fetch->rec		= rec;
-						fetch->row		= row;
+						fetch->target	= target;
 						fetch->curvar	= $3->dno;
 						fetch->is_move	= false;
 
@@ -2174,6 +2143,31 @@ stmt_null		: K_NULL ';'
 					}
 				;
 
+stmt_commit		: K_COMMIT ';'
+					{
+						PLpgSQL_stmt_commit *new;
+
+						new = palloc(sizeof(PLpgSQL_stmt_commit));
+						new->cmd_type = PLPGSQL_STMT_COMMIT;
+						new->lineno = plpgsql_location_to_lineno(@1);
+
+						$$ = (PLpgSQL_stmt *)new;
+					}
+				;
+
+stmt_rollback	: K_ROLLBACK ';'
+					{
+						PLpgSQL_stmt_rollback *new;
+
+						new = palloc(sizeof(PLpgSQL_stmt_rollback));
+						new->cmd_type = PLPGSQL_STMT_ROLLBACK;
+						new->lineno = plpgsql_location_to_lineno(@1);
+
+						$$ = (PLpgSQL_stmt *)new;
+					}
+				;
+
+
 cursor_variable	: T_DATUM
 					{
 						/*
@@ -2228,7 +2222,7 @@ exception_sect	:
 																			-1,
 																			plpgsql_curr_compile->fn_input_collation),
 													 true);
-						((PLpgSQL_var *) var)->isconst = true;
+						var->isconst = true;
 						new->sqlstate_varno = var->dno;
 
 						var = plpgsql_build_variable("sqlerrm", lineno,
@@ -2236,7 +2230,7 @@ exception_sect	:
 																			-1,
 																			plpgsql_curr_compile->fn_input_collation),
 													 true);
-						((PLpgSQL_var *) var)->isconst = true;
+						var->isconst = true;
 						new->sqlerrm_varno = var->dno;
 
 						$<exception_block>$ = new;
@@ -2410,6 +2404,7 @@ unreserved_keyword	:
 				| K_COLLATE
 				| K_COLUMN
 				| K_COLUMN_NAME
+				| K_COMMIT
 				| K_CONSTANT
 				| K_CONSTRAINT
 				| K_CONSTRAINT_NAME
@@ -2461,6 +2456,7 @@ unreserved_keyword	:
 				| K_RETURN
 				| K_RETURNED_SQLSTATE
 				| K_REVERSE
+				| K_ROLLBACK
 				| K_ROW_COUNT
 				| K_ROWTYPE
 				| K_SCHEMA
@@ -2685,7 +2681,6 @@ read_sql_construct(int until,
 	}
 
 	expr = palloc0(sizeof(PLpgSQL_expr));
-	expr->dtype			= PLPGSQL_DTYPE_EXPR;
 	expr->query			= pstrdup(ds.data);
 	expr->plan			= NULL;
 	expr->paramnos		= NULL;
@@ -2842,8 +2837,7 @@ make_execsql_stmt(int firsttoken, int location)
 	IdentifierLookup	save_IdentifierLookup;
 	PLpgSQL_stmt_execsql *execsql;
 	PLpgSQL_expr		*expr;
-	PLpgSQL_row			*row = NULL;
-	PLpgSQL_rec			*rec = NULL;
+	PLpgSQL_variable	*target = NULL;
 	int					tok;
 	int					prev_tok;
 	bool				have_into = false;
@@ -2907,7 +2901,7 @@ make_execsql_stmt(int firsttoken, int location)
 			have_into = true;
 			into_start_loc = yylloc;
 			plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_NORMAL;
-			read_into_target(&rec, &row, &have_strict);
+			read_into_target(&target, &have_strict);
 			plpgsql_IdentifierLookup = IDENTIFIER_LOOKUP_EXPR;
 		}
 	}
@@ -2933,7 +2927,6 @@ make_execsql_stmt(int firsttoken, int location)
 		ds.data[--ds.len] = '\0';
 
 	expr = palloc0(sizeof(PLpgSQL_expr));
-	expr->dtype			= PLPGSQL_DTYPE_EXPR;
 	expr->query			= pstrdup(ds.data);
 	expr->plan			= NULL;
 	expr->paramnos		= NULL;
@@ -2949,8 +2942,7 @@ make_execsql_stmt(int firsttoken, int location)
 	execsql->sqlstmt = expr;
 	execsql->into	 = have_into;
 	execsql->strict	 = have_strict;
-	execsql->rec	 = rec;
-	execsql->row	 = row;
+	execsql->target	 = target;
 
 	return (PLpgSQL_stmt *) execsql;
 }
@@ -3163,6 +3155,7 @@ make_return_stmt(int location)
 
 		if (tok == T_DATUM && plpgsql_peek() == ';' &&
 			(yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_VAR ||
+			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_PROMISE ||
 			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_ROW ||
 			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_REC))
 		{
@@ -3224,6 +3217,7 @@ make_return_next_stmt(int location)
 
 		if (tok == T_DATUM && plpgsql_peek() == ';' &&
 			(yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_VAR ||
+			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_PROMISE ||
 			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_ROW ||
 			 yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_REC))
 		{
@@ -3311,24 +3305,27 @@ check_assignable(PLpgSQL_datum *datum, int location)
 	switch (datum->dtype)
 	{
 		case PLPGSQL_DTYPE_VAR:
-			if (((PLpgSQL_var *) datum)->isconst)
+		case PLPGSQL_DTYPE_PROMISE:
+		case PLPGSQL_DTYPE_REC:
+			if (((PLpgSQL_variable *) datum)->isconst)
 				ereport(ERROR,
 						(errcode(ERRCODE_ERROR_IN_ASSIGNMENT),
-						 errmsg("\"%s\" is declared CONSTANT",
-								((PLpgSQL_var *) datum)->refname),
+						 errmsg("variable \"%s\" is declared CONSTANT",
+								((PLpgSQL_variable *) datum)->refname),
 						 parser_errposition(location)));
 			break;
 		case PLPGSQL_DTYPE_ROW:
-			/* always assignable? */
-			break;
-		case PLPGSQL_DTYPE_REC:
-			/* always assignable?  What about NEW/OLD? */
+			/* always assignable; member vars were checked at compile time */
 			break;
 		case PLPGSQL_DTYPE_RECFIELD:
-			/* always assignable? */
+			/* assignable if parent record is */
+			check_assignable(plpgsql_Datums[((PLpgSQL_recfield *) datum)->recparentno],
+							 location);
 			break;
 		case PLPGSQL_DTYPE_ARRAYELEM:
-			/* always assignable? */
+			/* assignable if parent array is */
+			check_assignable(plpgsql_Datums[((PLpgSQL_arrayelem *) datum)->arrayparentno],
+							 location);
 			break;
 		default:
 			elog(ERROR, "unrecognized dtype: %d", datum->dtype);
@@ -3341,13 +3338,12 @@ check_assignable(PLpgSQL_datum *datum, int location)
  * INTO keyword.
  */
 static void
-read_into_target(PLpgSQL_rec **rec, PLpgSQL_row **row, bool *strict)
+read_into_target(PLpgSQL_variable **target, bool *strict)
 {
 	int			tok;
 
 	/* Set default results */
-	*rec = NULL;
-	*row = NULL;
+	*target = NULL;
 	if (strict)
 		*strict = false;
 
@@ -3368,34 +3364,24 @@ read_into_target(PLpgSQL_rec **rec, PLpgSQL_row **row, bool *strict)
 	switch (tok)
 	{
 		case T_DATUM:
-			if (yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_ROW)
-			{
-				check_assignable(yylval.wdatum.datum, yylloc);
-				*row = (PLpgSQL_row *) yylval.wdatum.datum;
-
-				if ((tok = yylex()) == ',')
-					ereport(ERROR,
-							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("record or row variable cannot be part of multiple-item INTO list"),
-							 parser_errposition(yylloc)));
-				plpgsql_push_back_token(tok);
-			}
-			else if (yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_REC)
+			if (yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_ROW ||
+				yylval.wdatum.datum->dtype == PLPGSQL_DTYPE_REC)
 			{
 				check_assignable(yylval.wdatum.datum, yylloc);
-				*rec = (PLpgSQL_rec *) yylval.wdatum.datum;
+				*target = (PLpgSQL_variable *) yylval.wdatum.datum;
 
 				if ((tok = yylex()) == ',')
 					ereport(ERROR,
 							(errcode(ERRCODE_SYNTAX_ERROR),
-							 errmsg("record or row variable cannot be part of multiple-item INTO list"),
+							 errmsg("record variable cannot be part of multiple-item INTO list"),
 							 parser_errposition(yylloc)));
 				plpgsql_push_back_token(tok);
 			}
 			else
 			{
-				*row = read_into_scalar_list(NameOfDatum(&(yylval.wdatum)),
-											 yylval.wdatum.datum, yylloc);
+				*target = (PLpgSQL_variable *)
+					read_into_scalar_list(NameOfDatum(&(yylval.wdatum)),
+										  yylval.wdatum.datum, yylloc);
 			}
 			break;
 
@@ -3464,9 +3450,8 @@ read_into_scalar_list(char *initial_name,
 	 */
 	plpgsql_push_back_token(tok);
 
-	row = palloc(sizeof(PLpgSQL_row));
+	row = palloc0(sizeof(PLpgSQL_row));
 	row->dtype = PLPGSQL_DTYPE_ROW;
-	row->refname = pstrdup("*internal*");
 	row->lineno = plpgsql_location_to_lineno(initial_location);
 	row->rowtupdesc = NULL;
 	row->nfields = nfields;
@@ -3499,9 +3484,8 @@ make_scalar_list1(char *initial_name,
 
 	check_assignable(initial_datum, location);
 
-	row = palloc(sizeof(PLpgSQL_row));
+	row = palloc0(sizeof(PLpgSQL_row));
 	row->dtype = PLPGSQL_DTYPE_ROW;
-	row->refname = pstrdup("*internal*");
 	row->lineno = lineno;
 	row->rowtupdesc = NULL;
 	row->nfields = 1;
@@ -3817,7 +3801,6 @@ read_cursor_args(PLpgSQL_var *cursor, int until, const char *expected)
 	appendStringInfoChar(&ds, ';');
 
 	expr = palloc0(sizeof(PLpgSQL_expr));
-	expr->dtype			= PLPGSQL_DTYPE_EXPR;
 	expr->query			= pstrdup(ds.data);
 	expr->plan			= NULL;
 	expr->paramnos		= NULL;
diff --git a/src/pl/plpgsql/src/pl_handler.c b/src/pl/plpgsql/src/pl_handler.c
index 1ebb7a7b5e..f38ef04077 100644
--- a/src/pl/plpgsql/src/pl_handler.c
+++ b/src/pl/plpgsql/src/pl_handler.c
@@ -3,7 +3,7 @@
  * pl_handler.c		- Handler for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -219,15 +219,20 @@ PG_FUNCTION_INFO_V1(plpgsql_call_handler);
 Datum
 plpgsql_call_handler(PG_FUNCTION_ARGS)
 {
+	bool		nonatomic;
 	PLpgSQL_function *func;
 	PLpgSQL_execstate *save_cur_estate;
 	Datum		retval;
 	int			rc;
 
+	nonatomic = fcinfo->context &&
+		IsA(fcinfo->context, CallContext) &&
+		!castNode(CallContext, fcinfo->context)->atomic;
+
 	/*
 	 * Connect to SPI manager
 	 */
-	if ((rc = SPI_connect()) != SPI_OK_CONNECT)
+	if ((rc = SPI_connect_ext(nonatomic ? SPI_OPT_NONATOMIC : 0)) != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed: %s", SPI_result_code_string(rc));
 
 	/* Find or compile the function */
@@ -301,7 +306,7 @@ plpgsql_inline_handler(PG_FUNCTION_ARGS)
 	/*
 	 * Connect to SPI manager
 	 */
-	if ((rc = SPI_connect()) != SPI_OK_CONNECT)
+	if ((rc = SPI_connect_ext(codeblock->atomic ? 0 : SPI_OPT_NONATOMIC)) != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed: %s", SPI_result_code_string(rc));
 
 	/* Compile the anonymous code block */
@@ -438,14 +443,15 @@ plpgsql_validator(PG_FUNCTION_ARGS)
 	}
 
 	/* Disallow pseudotypes in arguments (either IN or OUT) */
-	/* except for polymorphic */
+	/* except for RECORD and polymorphic */
 	numargs = get_func_arg_info(tuple,
 								&argtypes, &argnames, &argmodes);
 	for (i = 0; i < numargs; i++)
 	{
 		if (get_typtype(argtypes[i]) == TYPTYPE_PSEUDO)
 		{
-			if (!IsPolymorphicType(argtypes[i]))
+			if (argtypes[i] != RECORDOID &&
+				!IsPolymorphicType(argtypes[i]))
 				ereport(ERROR,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("PL/pgSQL functions cannot accept type %s",
diff --git a/src/pl/plpgsql/src/pl_scanner.c b/src/pl/plpgsql/src/pl_scanner.c
index 553be8c93c..12a3e6b818 100644
--- a/src/pl/plpgsql/src/pl_scanner.c
+++ b/src/pl/plpgsql/src/pl_scanner.c
@@ -4,7 +4,7 @@
  *	  lexical scanning for PL/pgSQL
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -106,6 +106,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("collate", K_COLLATE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("column", K_COLUMN, UNRESERVED_KEYWORD)
 	PG_KEYWORD("column_name", K_COLUMN_NAME, UNRESERVED_KEYWORD)
+	PG_KEYWORD("commit", K_COMMIT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constant", K_CONSTANT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint", K_CONSTRAINT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("constraint_name", K_CONSTRAINT_NAME, UNRESERVED_KEYWORD)
@@ -158,6 +159,7 @@ static const ScanKeyword unreserved_keywords[] = {
 	PG_KEYWORD("return", K_RETURN, UNRESERVED_KEYWORD)
 	PG_KEYWORD("returned_sqlstate", K_RETURNED_SQLSTATE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("reverse", K_REVERSE, UNRESERVED_KEYWORD)
+	PG_KEYWORD("rollback", K_ROLLBACK, UNRESERVED_KEYWORD)
 	PG_KEYWORD("row_count", K_ROW_COUNT, UNRESERVED_KEYWORD)
 	PG_KEYWORD("rowtype", K_ROWTYPE, UNRESERVED_KEYWORD)
 	PG_KEYWORD("schema", K_SCHEMA, UNRESERVED_KEYWORD)
diff --git a/src/pl/plpgsql/src/plpgsql.h b/src/pl/plpgsql/src/plpgsql.h
index 2b19948562..26a7344e9a 100644
--- a/src/pl/plpgsql/src/plpgsql.h
+++ b/src/pl/plpgsql/src/plpgsql.h
@@ -3,7 +3,7 @@
  * plpgsql.h		- Definitions for the PL/pgSQL
  *			  procedural language
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -20,6 +20,8 @@
 #include "commands/event_trigger.h"
 #include "commands/trigger.h"
 #include "executor/spi.h"
+#include "utils/expandedrecord.h"
+
 
 /**********************************************************************
  * Definitions
@@ -37,10 +39,9 @@
  */
 typedef enum PLpgSQL_nsitem_type
 {
-	PLPGSQL_NSTYPE_LABEL,
-	PLPGSQL_NSTYPE_VAR,
-	PLPGSQL_NSTYPE_ROW,
-	PLPGSQL_NSTYPE_REC
+	PLPGSQL_NSTYPE_LABEL,		/* block label */
+	PLPGSQL_NSTYPE_VAR,			/* scalar variable */
+	PLPGSQL_NSTYPE_REC			/* composite variable */
 } PLpgSQL_nsitem_type;
 
 /*
@@ -63,18 +64,36 @@ typedef enum PLpgSQL_datum_type
 	PLPGSQL_DTYPE_REC,
 	PLPGSQL_DTYPE_RECFIELD,
 	PLPGSQL_DTYPE_ARRAYELEM,
-	PLPGSQL_DTYPE_EXPR
+	PLPGSQL_DTYPE_PROMISE
 } PLpgSQL_datum_type;
 
+/*
+ * DTYPE_PROMISE datums have these possible ways of computing the promise
+ */
+typedef enum PLpgSQL_promise_type
+{
+	PLPGSQL_PROMISE_NONE = 0,	/* not a promise, or promise satisfied */
+	PLPGSQL_PROMISE_TG_NAME,
+	PLPGSQL_PROMISE_TG_WHEN,
+	PLPGSQL_PROMISE_TG_LEVEL,
+	PLPGSQL_PROMISE_TG_OP,
+	PLPGSQL_PROMISE_TG_RELID,
+	PLPGSQL_PROMISE_TG_TABLE_NAME,
+	PLPGSQL_PROMISE_TG_TABLE_SCHEMA,
+	PLPGSQL_PROMISE_TG_NARGS,
+	PLPGSQL_PROMISE_TG_ARGV,
+	PLPGSQL_PROMISE_TG_EVENT,
+	PLPGSQL_PROMISE_TG_TAG
+} PLpgSQL_promise_type;
+
 /*
  * Variants distinguished in PLpgSQL_type structs
  */
 typedef enum PLpgSQL_type_type
 {
 	PLPGSQL_TTYPE_SCALAR,		/* scalar types and domains */
-	PLPGSQL_TTYPE_ROW,			/* composite types */
-	PLPGSQL_TTYPE_REC,			/* RECORD pseudotype */
-	PLPGSQL_TTYPE_PSEUDO		/* other pseudotypes */
+	PLPGSQL_TTYPE_REC,			/* composite types, including RECORD */
+	PLPGSQL_TTYPE_PSEUDO		/* pseudotypes */
 } PLpgSQL_type_type;
 
 /*
@@ -105,7 +124,9 @@ typedef enum PLpgSQL_stmt_type
 	PLPGSQL_STMT_OPEN,
 	PLPGSQL_STMT_FETCH,
 	PLPGSQL_STMT_CLOSE,
-	PLPGSQL_STMT_PERFORM
+	PLPGSQL_STMT_PERFORM,
+	PLPGSQL_STMT_COMMIT,
+	PLPGSQL_STMT_ROLLBACK
 } PLpgSQL_stmt_type;
 
 /*
@@ -181,45 +202,16 @@ typedef struct PLpgSQL_type
 	int16		typlen;			/* stuff copied from its pg_type entry */
 	bool		typbyval;
 	char		typtype;
-	Oid			typrelid;
 	Oid			collation;		/* from pg_type, but can be overridden */
 	bool		typisarray;		/* is "true" array, or domain over one */
 	int32		atttypmod;		/* typmod (taken from someplace else) */
 } PLpgSQL_type;
 
-/*
- * Generic datum array item
- *
- * PLpgSQL_datum is the common supertype for PLpgSQL_expr, PLpgSQL_var,
- * PLpgSQL_row, PLpgSQL_rec, PLpgSQL_recfield, and PLpgSQL_arrayelem
- */
-typedef struct PLpgSQL_datum
-{
-	PLpgSQL_datum_type dtype;
-	int			dno;
-} PLpgSQL_datum;
-
-/*
- * Scalar or composite variable
- *
- * The variants PLpgSQL_var, PLpgSQL_row, and PLpgSQL_rec share these
- * fields
- */
-typedef struct PLpgSQL_variable
-{
-	PLpgSQL_datum_type dtype;
-	int			dno;
-	char	   *refname;
-	int			lineno;
-} PLpgSQL_variable;
-
 /*
  * SQL Query to plan and execute
  */
 typedef struct PLpgSQL_expr
 {
-	PLpgSQL_datum_type dtype;
-	int			dno;
 	char	   *query;
 	SPIPlanPtr	plan;
 	Bitmapset  *paramnos;		/* all dnos referenced by this query */
@@ -248,8 +240,45 @@ typedef struct PLpgSQL_expr
 	LocalTransactionId expr_simple_lxid;
 } PLpgSQL_expr;
 
+/*
+ * Generic datum array item
+ *
+ * PLpgSQL_datum is the common supertype for PLpgSQL_var, PLpgSQL_row,
+ * PLpgSQL_rec, PLpgSQL_recfield, and PLpgSQL_arrayelem.
+ */
+typedef struct PLpgSQL_datum
+{
+	PLpgSQL_datum_type dtype;
+	int			dno;
+} PLpgSQL_datum;
+
+/*
+ * Scalar or composite variable
+ *
+ * The variants PLpgSQL_var, PLpgSQL_row, and PLpgSQL_rec share these
+ * fields.
+ */
+typedef struct PLpgSQL_variable
+{
+	PLpgSQL_datum_type dtype;
+	int			dno;
+	char	   *refname;
+	int			lineno;
+	bool		isconst;
+	bool		notnull;
+	PLpgSQL_expr *default_val;
+} PLpgSQL_variable;
+
 /*
  * Scalar variable
+ *
+ * DTYPE_VAR and DTYPE_PROMISE datums both use this struct type.
+ * A PROMISE datum works exactly like a VAR datum for most purposes,
+ * but if it is read without having previously been assigned to, then
+ * a special "promised" value is computed and assigned to the datum
+ * before the read is performed.  This technique avoids the overhead of
+ * computing the variable's value in cases where we expect that many
+ * functions will never read it.
  */
 typedef struct PLpgSQL_var
 {
@@ -257,22 +286,48 @@ typedef struct PLpgSQL_var
 	int			dno;
 	char	   *refname;
 	int			lineno;
+	bool		isconst;
+	bool		notnull;
+	PLpgSQL_expr *default_val;
+	/* end of PLpgSQL_variable fields */
 
 	PLpgSQL_type *datatype;
-	int			isconst;
-	int			notnull;
-	PLpgSQL_expr *default_val;
+
+	/*
+	 * Variables declared as CURSOR FOR <query> are mostly like ordinary
+	 * scalar variables of type refcursor, but they have these additional
+	 * properties:
+	 */
 	PLpgSQL_expr *cursor_explicit_expr;
 	int			cursor_explicit_argrow;
 	int			cursor_options;
 
+	/* Fields below here can change at runtime */
+
 	Datum		value;
 	bool		isnull;
 	bool		freeval;
+
+	/*
+	 * The promise field records which "promised" value to assign if the
+	 * promise must be honored.  If it's a normal variable, or the promise has
+	 * been fulfilled, this is PLPGSQL_PROMISE_NONE.
+	 */
+	PLpgSQL_promise_type promise;
 } PLpgSQL_var;
 
 /*
- * Row variable
+ * Row variable - this represents one or more variables that are listed in an
+ * INTO clause, FOR-loop targetlist, cursor argument list, etc.  We also use
+ * a row to represent a function's OUT parameters when there's more than one.
+ *
+ * Note that there's no way to name the row as such from PL/pgSQL code,
+ * so many functions don't need to support these.
+ *
+ * refname, isconst, notnull, and default_val are unsupported (and hence
+ * always zero/null) for a row.  The member variables of a row should have
+ * been checked to be writable at compile time, so isconst is correctly set
+ * to false.  notnull and default_val aren't applicable.
  */
 typedef struct PLpgSQL_row
 {
@@ -280,22 +335,25 @@ typedef struct PLpgSQL_row
 	int			dno;
 	char	   *refname;
 	int			lineno;
-
-	/* Note: TupleDesc is only set up for named rowtypes, else it is NULL. */
-	TupleDesc	rowtupdesc;
+	bool		isconst;
+	bool		notnull;
+	PLpgSQL_expr *default_val;
+	/* end of PLpgSQL_variable fields */
 
 	/*
-	 * Note: if the underlying rowtype contains a dropped column, the
-	 * corresponding fieldnames[] entry will be NULL, and there is no
-	 * corresponding var (varnos[] will be -1).
+	 * rowtupdesc is only set up if we might need to convert the row into a
+	 * composite datum, which currently only happens for OUT parameters.
+	 * Otherwise it is NULL.
 	 */
+	TupleDesc	rowtupdesc;
+
 	int			nfields;
 	char	  **fieldnames;
 	int		   *varnos;
 } PLpgSQL_row;
 
 /*
- * Record variable (non-fixed structure)
+ * Record variable (any composite type, including RECORD)
  */
 typedef struct PLpgSQL_rec
 {
@@ -303,11 +361,20 @@ typedef struct PLpgSQL_rec
 	int			dno;
 	char	   *refname;
 	int			lineno;
+	bool		isconst;
+	bool		notnull;
+	PLpgSQL_expr *default_val;
+	/* end of PLpgSQL_variable fields */
 
-	HeapTuple	tup;
-	TupleDesc	tupdesc;
-	bool		freetup;
-	bool		freetupdesc;
+	PLpgSQL_type *datatype;		/* can be NULL, if rectypeid is RECORDOID */
+	Oid			rectypeid;		/* declared type of variable */
+	/* RECFIELDs for this record are chained together for easy access */
+	int			firstfield;		/* dno of first RECFIELD, or -1 if none */
+
+	/* Fields below here can change at runtime */
+
+	/* We always store record variables as "expanded" records */
+	ExpandedRecordHeader *erh;
 } PLpgSQL_rec;
 
 /*
@@ -317,8 +384,14 @@ typedef struct PLpgSQL_recfield
 {
 	PLpgSQL_datum_type dtype;
 	int			dno;
-	char	   *fieldname;
+	/* end of PLpgSQL_datum fields */
+
+	char	   *fieldname;		/* name of field */
 	int			recparentno;	/* dno of parent record */
+	int			nextfield;		/* dno of next child, or -1 if none */
+	uint64		rectupledescid; /* record's tupledesc ID as of last lookup */
+	ExpandedRecordFieldInfo finfo;	/* field's attnum and type info */
+	/* if rectupledescid == INVALID_TUPLEDESC_IDENTIFIER, finfo isn't valid */
 } PLpgSQL_recfield;
 
 /*
@@ -328,6 +401,8 @@ typedef struct PLpgSQL_arrayelem
 {
 	PLpgSQL_datum_type dtype;
 	int			dno;
+	/* end of PLpgSQL_datum fields */
+
 	PLpgSQL_expr *subscript;
 	int			arrayparentno;	/* dno of parent array variable */
 
@@ -407,8 +482,8 @@ typedef struct PLpgSQL_stmt_block
 	int			lineno;
 	char	   *label;
 	List	   *body;			/* List of statements */
-	int			n_initvars;
-	int		   *initvarnos;
+	int			n_initvars;		/* Length of initvarnos[] */
+	int		   *initvarnos;		/* dnos of variables declared in this block */
 	PLpgSQL_exception_block *exceptions;
 } PLpgSQL_stmt_block;
 
@@ -433,6 +508,24 @@ typedef struct PLpgSQL_stmt_perform
 	PLpgSQL_expr *expr;
 } PLpgSQL_stmt_perform;
 
+/*
+ * COMMIT statement
+ */
+typedef struct PLpgSQL_stmt_commit
+{
+	PLpgSQL_stmt_type cmd_type;
+	int			lineno;
+} PLpgSQL_stmt_commit;
+
+/*
+ * ROLLBACK statement
+ */
+typedef struct PLpgSQL_stmt_rollback
+{
+	PLpgSQL_stmt_type cmd_type;
+	int			lineno;
+} PLpgSQL_stmt_rollback;
+
 /*
  * GET DIAGNOSTICS item
  */
@@ -549,8 +642,7 @@ typedef struct PLpgSQL_stmt_forq
 	PLpgSQL_stmt_type cmd_type;
 	int			lineno;
 	char	   *label;
-	PLpgSQL_rec *rec;
-	PLpgSQL_row *row;
+	PLpgSQL_variable *var;		/* Loop variable (record or row) */
 	List	   *body;			/* List of statements */
 } PLpgSQL_stmt_forq;
 
@@ -562,8 +654,7 @@ typedef struct PLpgSQL_stmt_fors
 	PLpgSQL_stmt_type cmd_type;
 	int			lineno;
 	char	   *label;
-	PLpgSQL_rec *rec;
-	PLpgSQL_row *row;
+	PLpgSQL_variable *var;		/* Loop variable (record or row) */
 	List	   *body;			/* List of statements */
 	/* end of fields that must match PLpgSQL_stmt_forq */
 	PLpgSQL_expr *query;
@@ -577,8 +668,7 @@ typedef struct PLpgSQL_stmt_forc
 	PLpgSQL_stmt_type cmd_type;
 	int			lineno;
 	char	   *label;
-	PLpgSQL_rec *rec;
-	PLpgSQL_row *row;
+	PLpgSQL_variable *var;		/* Loop variable (record or row) */
 	List	   *body;			/* List of statements */
 	/* end of fields that must match PLpgSQL_stmt_forq */
 	int			curvar;
@@ -593,8 +683,7 @@ typedef struct PLpgSQL_stmt_dynfors
 	PLpgSQL_stmt_type cmd_type;
 	int			lineno;
 	char	   *label;
-	PLpgSQL_rec *rec;
-	PLpgSQL_row *row;
+	PLpgSQL_variable *var;		/* Loop variable (record or row) */
 	List	   *body;			/* List of statements */
 	/* end of fields that must match PLpgSQL_stmt_forq */
 	PLpgSQL_expr *query;
@@ -624,7 +713,6 @@ typedef struct PLpgSQL_stmt_open
 	int			lineno;
 	int			curvar;
 	int			cursor_options;
-	PLpgSQL_row *returntype;
 	PLpgSQL_expr *argquery;
 	PLpgSQL_expr *query;
 	PLpgSQL_expr *dynquery;
@@ -638,8 +726,7 @@ typedef struct PLpgSQL_stmt_fetch
 {
 	PLpgSQL_stmt_type cmd_type;
 	int			lineno;
-	PLpgSQL_rec *rec;			/* target, as record or row */
-	PLpgSQL_row *row;
+	PLpgSQL_variable *target;	/* target (record or row) */
 	int			curvar;			/* cursor variable to fetch from */
 	FetchDirection direction;	/* fetch direction */
 	long		how_many;		/* count, if constant (expr is NULL) */
@@ -750,8 +837,7 @@ typedef struct PLpgSQL_stmt_execsql
 								 * mod_stmt is set when we plan the query */
 	bool		into;			/* INTO supplied? */
 	bool		strict;			/* INTO STRICT flag */
-	PLpgSQL_rec *rec;			/* INTO target, if record */
-	PLpgSQL_row *row;			/* INTO target, if row */
+	PLpgSQL_variable *target;	/* INTO target (record or row) */
 } PLpgSQL_stmt_execsql;
 
 /*
@@ -764,8 +850,7 @@ typedef struct PLpgSQL_stmt_dynexecute
 	PLpgSQL_expr *query;		/* string expression */
 	bool		into;			/* INTO supplied? */
 	bool		strict;			/* INTO STRICT flag */
-	PLpgSQL_rec *rec;			/* INTO target, if record */
-	PLpgSQL_row *row;			/* INTO target, if row */
+	PLpgSQL_variable *target;	/* INTO target (record or row) */
 	List	   *params;			/* USING expressions */
 } PLpgSQL_stmt_dynexecute;
 
@@ -830,6 +915,7 @@ typedef struct PLpgSQL_function
 	int			fn_rettyplen;
 	bool		fn_retbyval;
 	bool		fn_retistuple;
+	bool		fn_retisdomain;
 	bool		fn_retset;
 	bool		fn_readonly;
 
@@ -839,20 +925,6 @@ typedef struct PLpgSQL_function
 	int			found_varno;
 	int			new_varno;
 	int			old_varno;
-	int			tg_name_varno;
-	int			tg_when_varno;
-	int			tg_level_varno;
-	int			tg_op_varno;
-	int			tg_relid_varno;
-	int			tg_relname_varno;
-	int			tg_table_name_varno;
-	int			tg_table_schema_varno;
-	int			tg_nargs_varno;
-	int			tg_argv_varno;
-
-	/* for event triggers */
-	int			tg_event_varno;
-	int			tg_tag_varno;
 
 	PLpgSQL_resolve_option resolve_option;
 
@@ -865,7 +937,7 @@ typedef struct PLpgSQL_function
 	/* the datums representing the function's local variables */
 	int			ndatums;
 	PLpgSQL_datum **datums;
-	Bitmapset  *resettable_datums;	/* dnos of non-simple vars */
+	Size		copiable_size;	/* space for locally instantiated datums */
 
 	/* function body parsetree */
 	PLpgSQL_stmt_block *action;
@@ -882,6 +954,9 @@ typedef struct PLpgSQL_execstate
 {
 	PLpgSQL_function *func;		/* function being executed */
 
+	TriggerData *trigdata;		/* if regular trigger, data about firing */
+	EventTriggerData *evtrigdata;	/* if event trigger, data about firing */
+
 	Datum		retval;
 	bool		retisnull;
 	Oid			rettype;		/* type of current retval */
@@ -892,24 +967,36 @@ typedef struct PLpgSQL_execstate
 
 	bool		readonly_func;
 
-	TupleDesc	rettupdesc;
 	char	   *exitlabel;		/* the "target" label of the current EXIT or
 								 * CONTINUE stmt, if any */
 	ErrorData  *cur_error;		/* current exception handler's error */
 
 	Tuplestorestate *tuple_store;	/* SRFs accumulate results here */
+	TupleDesc	tuple_store_desc;	/* descriptor for tuples in tuple_store */
 	MemoryContext tuple_store_cxt;
 	ResourceOwner tuple_store_owner;
 	ReturnSetInfo *rsi;
 
-	/* the datums representing the function's local variables */
 	int			found_varno;
+
+	/*
+	 * The datums representing the function's local variables.  Some of these
+	 * are local storage in this execstate, but some just point to the shared
+	 * copy belonging to the PLpgSQL_function, depending on whether or not we
+	 * need any per-execution state for the datum's dtype.
+	 */
 	int			ndatums;
 	PLpgSQL_datum **datums;
+	/* context containing variable values (same as func's SPI_proc context) */
+	MemoryContext datum_context;
 
-	/* we pass datums[i] to the executor, when needed, in paramLI->params[i] */
+	/*
+	 * paramLI is what we use to pass local variable values to the executor.
+	 * It does not have a ParamExternData array; we just dynamically
+	 * instantiate parameter data as needed.  By convention, PARAM_EXTERN
+	 * Params have paramid equal to the dno of the referenced local variable.
+	 */
 	ParamListInfo paramLI;
-	bool		params_dirty;	/* T if any resettable datum has been passed */
 
 	/* EState to use for "simple" expression evaluation */
 	EState	   *simple_eval_estate;
@@ -1073,7 +1160,10 @@ extern PLpgSQL_variable *plpgsql_build_variable(const char *refname, int lineno,
 					   PLpgSQL_type *dtype,
 					   bool add2namespace);
 extern PLpgSQL_rec *plpgsql_build_record(const char *refname, int lineno,
+					 PLpgSQL_type *dtype, Oid rectypeid,
 					 bool add2namespace);
+extern PLpgSQL_recfield *plpgsql_build_recfield(PLpgSQL_rec *rec,
+					   const char *fldname);
 extern int plpgsql_recognize_err_condition(const char *condname,
 								bool allow_sqlstate);
 extern PLpgSQL_condition *plpgsql_parse_err_condition(char *condname);
diff --git a/src/pl/plpgsql/src/sql/plpgsql_call.sql b/src/pl/plpgsql/src/sql/plpgsql_call.sql
new file mode 100644
index 0000000000..321ed43af8
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_call.sql
@@ -0,0 +1,65 @@
+--
+-- Tests for procedures / CALL syntax
+--
+
+CREATE PROCEDURE test_proc1()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    NULL;
+END;
+$$;
+
+CALL test_proc1();
+
+
+-- error: can't return non-NULL
+CREATE PROCEDURE test_proc2()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    RETURN 5;
+END;
+$$;
+
+CALL test_proc2();
+
+
+CREATE TABLE test1 (a int);
+
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    INSERT INTO test1 VALUES (x);
+END;
+$$;
+
+CALL test_proc3(55);
+
+SELECT * FROM test1;
+
+
+-- nested CALL
+TRUNCATE TABLE test1;
+
+CREATE PROCEDURE test_proc4(y int)
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    CALL test_proc3(y);
+    CALL test_proc3($1);
+END;
+$$;
+
+CALL test_proc4(66);
+
+SELECT * FROM test1;
+
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+DROP PROCEDURE test_proc4;
+
+DROP TABLE test1;
diff --git a/src/pl/plpgsql/src/sql/plpgsql_control.sql b/src/pl/plpgsql/src/sql/plpgsql_control.sql
new file mode 100644
index 0000000000..61d6ca6451
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_control.sql
@@ -0,0 +1,476 @@
+--
+-- Tests for PL/pgSQL control structures
+--
+
+-- integer FOR loop
+
+do $$
+begin
+  -- basic case
+  for i in 1..3 loop
+    raise notice '1..3: i = %', i;
+  end loop;
+  -- with BY, end matches exactly
+  for i in 1..10 by 3 loop
+    raise notice '1..10 by 3: i = %', i;
+  end loop;
+  -- with BY, end does not match
+  for i in 1..11 by 3 loop
+    raise notice '1..11 by 3: i = %', i;
+  end loop;
+  -- zero iterations
+  for i in 1..0 by 3 loop
+    raise notice '1..0 by 3: i = %', i;
+  end loop;
+  -- REVERSE
+  for i in reverse 10..0 by 3 loop
+    raise notice 'reverse 10..0 by 3: i = %', i;
+  end loop;
+  -- potential overflow
+  for i in 2147483620..2147483647 by 10 loop
+    raise notice '2147483620..2147483647 by 10: i = %', i;
+  end loop;
+  -- potential overflow, reverse direction
+  for i in reverse -2147483620..-2147483647 by 10 loop
+    raise notice 'reverse -2147483620..-2147483647 by 10: i = %', i;
+  end loop;
+end$$;
+
+-- BY can't be zero or negative
+do $$
+begin
+  for i in 1..3 by 0 loop
+    raise notice '1..3 by 0: i = %', i;
+  end loop;
+end$$;
+
+do $$
+begin
+  for i in 1..3 by -1 loop
+    raise notice '1..3 by -1: i = %', i;
+  end loop;
+end$$;
+
+do $$
+begin
+  for i in reverse 1..3 by -1 loop
+    raise notice 'reverse 1..3 by -1: i = %', i;
+  end loop;
+end$$;
+
+
+-- CONTINUE statement
+
+create table conttesttbl(idx serial, v integer);
+insert into conttesttbl(v) values(10);
+insert into conttesttbl(v) values(20);
+insert into conttesttbl(v) values(30);
+insert into conttesttbl(v) values(40);
+
+create function continue_test1() returns void as $$
+declare _i integer = 0; _r record;
+begin
+  raise notice '---1---';
+  loop
+    _i := _i + 1;
+    raise notice '%', _i;
+    continue when _i < 10;
+    exit;
+  end loop;
+
+  raise notice '---2---';
+  <<lbl>>
+  loop
+    _i := _i - 1;
+    loop
+      raise notice '%', _i;
+      continue lbl when _i > 0;
+      exit lbl;
+    end loop;
+  end loop;
+
+  raise notice '---3---';
+  <<the_loop>>
+  while _i < 10 loop
+    _i := _i + 1;
+    continue the_loop when _i % 2 = 0;
+    raise notice '%', _i;
+  end loop;
+
+  raise notice '---4---';
+  for _i in 1..10 loop
+    begin
+      -- applies to outer loop, not the nested begin block
+      continue when _i < 5;
+      raise notice '%', _i;
+    end;
+  end loop;
+
+  raise notice '---5---';
+  for _r in select * from conttesttbl loop
+    continue when _r.v <= 20;
+    raise notice '%', _r.v;
+  end loop;
+
+  raise notice '---6---';
+  for _r in execute 'select * from conttesttbl' loop
+    continue when _r.v <= 20;
+    raise notice '%', _r.v;
+  end loop;
+
+  raise notice '---7---';
+  <<looplabel>>
+  for _i in 1..3 loop
+    continue looplabel when _i = 2;
+    raise notice '%', _i;
+  end loop;
+
+  raise notice '---8---';
+  _i := 1;
+  while _i <= 3 loop
+    raise notice '%', _i;
+    _i := _i + 1;
+    continue when _i = 3;
+  end loop;
+
+  raise notice '---9---';
+  for _r in select * from conttesttbl order by v limit 1 loop
+    raise notice '%', _r.v;
+    continue;
+  end loop;
+
+  raise notice '---10---';
+  for _r in execute 'select * from conttesttbl order by v limit 1' loop
+    raise notice '%', _r.v;
+    continue;
+  end loop;
+
+  raise notice '---11---';
+  <<outerlooplabel>>
+  for _i in 1..2 loop
+    raise notice 'outer %', _i;
+    <<innerlooplabel>>
+    for _j in 1..3 loop
+      continue outerlooplabel when _j = 2;
+      raise notice 'inner %', _j;
+    end loop;
+  end loop;
+end; $$ language plpgsql;
+
+select continue_test1();
+
+-- should fail: CONTINUE is only legal inside a loop
+create function continue_error1() returns void as $$
+begin
+    begin
+        continue;
+    end;
+end;
+$$ language plpgsql;
+
+-- should fail: unlabeled EXIT is only legal inside a loop
+create function exit_error1() returns void as $$
+begin
+    begin
+        exit;
+    end;
+end;
+$$ language plpgsql;
+
+-- should fail: no such label
+create function continue_error2() returns void as $$
+begin
+    begin
+        loop
+            continue no_such_label;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+
+-- should fail: no such label
+create function exit_error2() returns void as $$
+begin
+    begin
+        loop
+            exit no_such_label;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+
+-- should fail: CONTINUE can't reference the label of a named block
+create function continue_error3() returns void as $$
+begin
+    <<begin_block1>>
+    begin
+        loop
+            continue begin_block1;
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+
+-- On the other hand, EXIT *can* reference the label of a named block
+create function exit_block1() returns void as $$
+begin
+    <<begin_block1>>
+    begin
+        loop
+            exit begin_block1;
+            raise exception 'should not get here';
+        end loop;
+    end;
+end;
+$$ language plpgsql;
+
+select exit_block1();
+
+-- verbose end block and end loop
+create function end_label1() returns void as $$
+<<blbl>>
+begin
+  <<flbl1>>
+  for i in 1 .. 10 loop
+    raise notice 'i = %', i;
+    exit flbl1;
+  end loop flbl1;
+  <<flbl2>>
+  for j in 1 .. 10 loop
+    raise notice 'j = %', j;
+    exit flbl2;
+  end loop;
+end blbl;
+$$ language plpgsql;
+
+select end_label1();
+
+-- should fail: undefined end label
+create function end_label2() returns void as $$
+begin
+  for _i in 1 .. 10 loop
+    exit;
+  end loop flbl1;
+end;
+$$ language plpgsql;
+
+-- should fail: end label does not match start label
+create function end_label3() returns void as $$
+<<outer_label>>
+begin
+  <<inner_label>>
+  for _i in 1 .. 10 loop
+    exit;
+  end loop outer_label;
+end;
+$$ language plpgsql;
+
+-- should fail: end label on a block without a start label
+create function end_label4() returns void as $$
+<<outer_label>>
+begin
+  for _i in 1 .. 10 loop
+    exit;
+  end loop outer_label;
+end;
+$$ language plpgsql;
+
+-- unlabeled exit matches no blocks
+do $$
+begin
+for i in 1..10 loop
+  <<innerblock>>
+  begin
+    begin  -- unlabeled block
+      exit;
+      raise notice 'should not get here';
+    end;
+    raise notice 'should not get here, either';
+  end;
+  raise notice 'nor here';
+end loop;
+raise notice 'should get here';
+end$$;
+
+-- check exit out of an unlabeled block to a labeled one
+do $$
+<<outerblock>>
+begin
+  <<innerblock>>
+  begin
+    <<moreinnerblock>>
+    begin
+      begin  -- unlabeled block
+        exit innerblock;
+        raise notice 'should not get here';
+      end;
+      raise notice 'should not get here, either';
+    end;
+    raise notice 'nor here';
+  end;
+  raise notice 'should get here';
+end$$;
+
+-- unlabeled exit does match a while loop
+do $$
+begin
+  <<outermostwhile>>
+  while 1 > 0 loop
+    <<outerwhile>>
+    while 1 > 0 loop
+      <<innerwhile>>
+      while 1 > 0 loop
+        exit;
+        raise notice 'should not get here';
+      end loop;
+      raise notice 'should get here';
+      exit outermostwhile;
+      raise notice 'should not get here, either';
+    end loop;
+    raise notice 'nor here';
+  end loop;
+  raise notice 'should get here, too';
+end$$;
+
+-- check exit out of an unlabeled while to a labeled one
+do $$
+begin
+  <<outerwhile>>
+  while 1 > 0 loop
+    while 1 > 0 loop
+      exit outerwhile;
+      raise notice 'should not get here';
+    end loop;
+    raise notice 'should not get here, either';
+  end loop;
+  raise notice 'should get here';
+end$$;
+
+-- continue to an outer while
+do $$
+declare i int := 0;
+begin
+  <<outermostwhile>>
+  while i < 2 loop
+    raise notice 'outermostwhile, i = %', i;
+    i := i + 1;
+    <<outerwhile>>
+    while 1 > 0 loop
+      <<innerwhile>>
+      while 1 > 0 loop
+        continue outermostwhile;
+        raise notice 'should not get here';
+      end loop;
+      raise notice 'should not get here, either';
+    end loop;
+    raise notice 'nor here';
+  end loop;
+  raise notice 'out of outermostwhile, i = %', i;
+end$$;
+
+-- return out of a while
+create function return_from_while() returns int language plpgsql as $$
+declare i int := 0;
+begin
+  while i < 10 loop
+    if i > 2 then
+      return i;
+    end if;
+    i := i + 1;
+  end loop;
+  return null;
+end$$;
+
+select return_from_while();
+
+-- using list of scalars in fori and fore stmts
+create function for_vect() returns void as $proc$
+<<lbl>>declare a integer; b varchar; c varchar; r record;
+begin
+  -- fori
+  for i in 1 .. 3 loop
+    raise notice '%', i;
+  end loop;
+  -- fore with record var
+  for r in select gs as aa, 'BB' as bb, 'CC' as cc from generate_series(1,4) gs loop
+    raise notice '% % %', r.aa, r.bb, r.cc;
+  end loop;
+  -- fore with single scalar
+  for a in select gs from generate_series(1,4) gs loop
+    raise notice '%', a;
+  end loop;
+  -- fore with multiple scalars
+  for a,b,c in select gs, 'BB','CC' from generate_series(1,4) gs loop
+    raise notice '% % %', a, b, c;
+  end loop;
+  -- using qualified names in fors, fore is enabled, disabled only for fori
+  for lbl.a, lbl.b, lbl.c in execute $$select gs, 'bb','cc' from generate_series(1,4) gs$$ loop
+    raise notice '% % %', a, b, c;
+  end loop;
+end;
+$proc$ language plpgsql;
+
+select for_vect();
+
+-- CASE statement
+
+create or replace function case_test(bigint) returns text as $$
+declare a int = 10;
+        b int = 1;
+begin
+  case $1
+    when 1 then
+      return 'one';
+    when 2 then
+      return 'two';
+    when 3,4,3+5 then
+      return 'three, four or eight';
+    when a then
+      return 'ten';
+    when a+b, a+b+1 then
+      return 'eleven, twelve';
+  end case;
+end;
+$$ language plpgsql immutable;
+
+select case_test(1);
+select case_test(2);
+select case_test(3);
+select case_test(4);
+select case_test(5); -- fails
+select case_test(8);
+select case_test(10);
+select case_test(11);
+select case_test(12);
+select case_test(13); -- fails
+
+create or replace function catch() returns void as $$
+begin
+  raise notice '%', case_test(6);
+exception
+  when case_not_found then
+    raise notice 'caught case_not_found % %', SQLSTATE, SQLERRM;
+end
+$$ language plpgsql;
+
+select catch();
+
+-- test the searched variant too, as well as ELSE
+create or replace function case_test(bigint) returns text as $$
+declare a int = 10;
+begin
+  case
+    when $1 = 1 then
+      return 'one';
+    when $1 = a + 2 then
+      return 'twelve';
+    else
+      return 'other';
+  end case;
+end;
+$$ language plpgsql immutable;
+
+select case_test(1);
+select case_test(2);
+select case_test(12);
+select case_test(13);
diff --git a/src/pl/plpgsql/src/sql/plpgsql_domain.sql b/src/pl/plpgsql/src/sql/plpgsql_domain.sql
new file mode 100644
index 0000000000..8f99aae5a9
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_domain.sql
@@ -0,0 +1,279 @@
+--
+-- Tests for PL/pgSQL's behavior with domain types
+--
+
+CREATE DOMAIN booltrue AS bool CHECK (VALUE IS TRUE OR VALUE IS NULL);
+
+CREATE FUNCTION test_argresult_booltrue(x booltrue, y bool) RETURNS booltrue AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_argresult_booltrue(true, true);
+SELECT * FROM test_argresult_booltrue(false, true);
+SELECT * FROM test_argresult_booltrue(true, false);
+
+CREATE FUNCTION test_assign_booltrue(x bool, y bool) RETURNS booltrue AS $$
+declare v booltrue := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_booltrue(true, true);
+SELECT * FROM test_assign_booltrue(false, true);
+SELECT * FROM test_assign_booltrue(true, false);
+
+
+CREATE DOMAIN uint2 AS int2 CHECK (VALUE >= 0);
+
+CREATE FUNCTION test_argresult_uint2(x uint2, y int) RETURNS uint2 AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_argresult_uint2(100::uint2, 50);
+SELECT * FROM test_argresult_uint2(100::uint2, -50);
+SELECT * FROM test_argresult_uint2(null, 1);
+
+CREATE FUNCTION test_assign_uint2(x int, y int) RETURNS uint2 AS $$
+declare v uint2 := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_uint2(100, 50);
+SELECT * FROM test_assign_uint2(100, -50);
+SELECT * FROM test_assign_uint2(-100, 50);
+SELECT * FROM test_assign_uint2(null, 1);
+
+
+CREATE DOMAIN nnint AS int NOT NULL;
+
+CREATE FUNCTION test_argresult_nnint(x nnint, y int) RETURNS nnint AS $$
+begin
+return y;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_argresult_nnint(10, 20);
+SELECT * FROM test_argresult_nnint(null, 20);
+SELECT * FROM test_argresult_nnint(10, null);
+
+CREATE FUNCTION test_assign_nnint(x int, y int) RETURNS nnint AS $$
+declare v nnint := x;
+begin
+v := y;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_nnint(10, 20);
+SELECT * FROM test_assign_nnint(null, 20);
+SELECT * FROM test_assign_nnint(10, null);
+
+
+--
+-- Domains over arrays
+--
+
+CREATE DOMAIN ordered_pair_domain AS integer[] CHECK (array_length(VALUE,1)=2 AND VALUE[1] < VALUE[2]);
+
+CREATE FUNCTION test_argresult_array_domain(x ordered_pair_domain)
+  RETURNS ordered_pair_domain AS $$
+begin
+return x;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_argresult_array_domain(ARRAY[0, 100]::ordered_pair_domain);
+SELECT * FROM test_argresult_array_domain(NULL::ordered_pair_domain);
+
+CREATE FUNCTION test_argresult_array_domain_check_violation()
+  RETURNS ordered_pair_domain AS $$
+begin
+return array[2,1];
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_argresult_array_domain_check_violation();
+
+CREATE FUNCTION test_assign_ordered_pair_domain(x int, y int, z int) RETURNS ordered_pair_domain AS $$
+declare v ordered_pair_domain := array[x, y];
+begin
+v[2] := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_ordered_pair_domain(1,2,3);
+SELECT * FROM test_assign_ordered_pair_domain(1,2,0);
+SELECT * FROM test_assign_ordered_pair_domain(2,1,3);
+
+
+--
+-- Arrays of domains
+--
+
+CREATE FUNCTION test_read_uint2_array(x uint2[]) RETURNS uint2 AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+
+select test_read_uint2_array(array[1::uint2]);
+
+CREATE FUNCTION test_build_uint2_array(x int2) RETURNS uint2[] AS $$
+begin
+return array[x, x];
+end
+$$ LANGUAGE plpgsql;
+
+select test_build_uint2_array(1::int2);
+select test_build_uint2_array(-1::int2);  -- fail
+
+CREATE FUNCTION test_argresult_domain_array(x integer[])
+  RETURNS ordered_pair_domain[] AS $$
+begin
+return array[x::ordered_pair_domain, x::ordered_pair_domain];
+end
+$$ LANGUAGE plpgsql;
+
+select test_argresult_domain_array(array[2,4]);
+select test_argresult_domain_array(array[4,2]);  -- fail
+
+CREATE FUNCTION test_argresult_domain_array2(x ordered_pair_domain)
+  RETURNS integer AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+
+select test_argresult_domain_array2(array[2,4]);
+select test_argresult_domain_array2(array[4,2]);  -- fail
+
+CREATE FUNCTION test_argresult_array_domain_array(x ordered_pair_domain[])
+  RETURNS ordered_pair_domain AS $$
+begin
+return x[1];
+end
+$$ LANGUAGE plpgsql;
+
+select test_argresult_array_domain_array(array[array[2,4]::ordered_pair_domain]);
+
+
+--
+-- Domains within composite
+--
+
+CREATE TYPE nnint_container AS (f1 int, f2 nnint);
+
+CREATE FUNCTION test_result_nnint_container(x int, y int)
+  RETURNS nnint_container AS $$
+begin
+return row(x, y)::nnint_container;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT test_result_nnint_container(null, 3);
+SELECT test_result_nnint_container(3, null);  -- fail
+
+CREATE FUNCTION test_assign_nnint_container(x int, y int, z int)
+  RETURNS nnint_container AS $$
+declare v nnint_container := row(x, y);
+begin
+v.f2 := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_nnint_container(1,2,3);
+SELECT * FROM test_assign_nnint_container(1,2,null);
+SELECT * FROM test_assign_nnint_container(1,null,3);
+
+-- Since core system allows this:
+SELECT null::nnint_container;
+-- so should PL/PgSQL
+
+CREATE FUNCTION test_assign_nnint_container2(x int, y int, z int)
+  RETURNS nnint_container AS $$
+declare v nnint_container;
+begin
+v.f2 := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_nnint_container2(1,2,3);
+SELECT * FROM test_assign_nnint_container2(1,2,null);
+
+
+--
+-- Domains of composite
+--
+
+CREATE TYPE named_pair AS (
+    i integer,
+    j integer
+);
+
+CREATE DOMAIN ordered_named_pair AS named_pair CHECK((VALUE).i <= (VALUE).j);
+
+CREATE FUNCTION read_ordered_named_pair(p ordered_named_pair) RETURNS integer AS $$
+begin
+return p.i + p.j;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT read_ordered_named_pair(row(1, 2));
+SELECT read_ordered_named_pair(row(2, 1));  -- fail
+
+CREATE FUNCTION build_ordered_named_pair(i int, j int) RETURNS ordered_named_pair AS $$
+begin
+return row(i, j);
+end
+$$ LANGUAGE plpgsql;
+
+SELECT build_ordered_named_pair(1,2);
+SELECT build_ordered_named_pair(2,1);  -- fail
+
+CREATE FUNCTION test_assign_ordered_named_pair(x int, y int, z int)
+  RETURNS ordered_named_pair AS $$
+declare v ordered_named_pair := row(x, y);
+begin
+v.j := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_ordered_named_pair(1,2,3);
+SELECT * FROM test_assign_ordered_named_pair(1,2,0);
+SELECT * FROM test_assign_ordered_named_pair(2,1,3);
+
+CREATE FUNCTION build_ordered_named_pairs(i int, j int) RETURNS ordered_named_pair[] AS $$
+begin
+return array[row(i, j), row(i, j+1)];
+end
+$$ LANGUAGE plpgsql;
+
+SELECT build_ordered_named_pairs(1,2);
+SELECT build_ordered_named_pairs(2,1);  -- fail
+
+CREATE FUNCTION test_assign_ordered_named_pairs(x int, y int, z int)
+  RETURNS ordered_named_pair[] AS $$
+declare v ordered_named_pair[] := array[row(x, y)];
+begin
+-- ideally this would work, but it doesn't yet:
+-- v[1].j := z;
+return v;
+end
+$$ LANGUAGE plpgsql;
+
+SELECT * FROM test_assign_ordered_named_pairs(1,2,3);
+SELECT * FROM test_assign_ordered_named_pairs(2,1,3);
+SELECT * FROM test_assign_ordered_named_pairs(1,2,0);  -- should fail someday
diff --git a/src/pl/plpgsql/src/sql/plpgsql_record.sql b/src/pl/plpgsql/src/sql/plpgsql_record.sql
new file mode 100644
index 0000000000..781ccb0ccb
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_record.sql
@@ -0,0 +1,449 @@
+--
+-- Tests for PL/pgSQL handling of composite (record) variables
+--
+
+create type two_int4s as (f1 int4, f2 int4);
+create type two_int8s as (q1 int8, q2 int8);
+
+-- base-case return of a composite type
+create function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1,1)::two_int8s; end $$;
+select retc(42);
+
+-- ok to return a matching record type
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1::int8, 1::int8); end $$;
+select retc(42);
+
+-- we don't currently support implicit casting
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1,1); end $$;
+select retc(42);
+
+-- nor extra columns
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ begin return row($1::int8, 1::int8, 42); end $$;
+select retc(42);
+
+-- same cases with an intermediate "record" variable
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1::int8, 1::int8); return r; end $$;
+select retc(42);
+
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1,1); return r; end $$;
+select retc(42);
+
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r record; begin r := row($1::int8, 1::int8, 42); return r; end $$;
+select retc(42);
+
+-- but, for mostly historical reasons, we do convert when assigning
+-- to a named-composite-type variable
+create or replace function retc(int) returns two_int8s language plpgsql as
+$$ declare r two_int8s; begin r := row($1::int8, 1::int8, 42); return r; end $$;
+select retc(42);
+
+do $$ declare c two_int8s;
+begin c := row(1,2); raise notice 'c = %', c; end$$;
+
+do $$ declare c two_int8s;
+begin for c in select 1,2 loop raise notice 'c = %', c; end loop; end$$;
+
+do $$ declare c4 two_int4s; c8 two_int8s;
+begin
+  c8 := row(1,2);
+  c4 := c8;
+  c8 := c4;
+  raise notice 'c4 = %', c4;
+  raise notice 'c8 = %', c8;
+end$$;
+
+-- check passing composite result to another function
+create function getq1(two_int8s) returns int8 language plpgsql as $$
+declare r two_int8s; begin r := $1; return r.q1; end $$;
+
+select getq1(retc(344));
+select getq1(row(1,2));
+
+do $$
+declare r1 two_int8s; r2 record; x int8;
+begin
+  r1 := retc(345);
+  perform getq1(r1);
+  x := getq1(r1);
+  raise notice 'x = %', x;
+  r2 := retc(346);
+  perform getq1(r2);
+  x := getq1(r2);
+  raise notice 'x = %', x;
+end$$;
+
+-- check assignments of composites
+do $$
+declare r1 two_int8s; r2 two_int8s; r3 record; r4 record;
+begin
+  r1 := row(1,2);
+  raise notice 'r1 = %', r1;
+  r1 := r1;  -- shouldn't do anything
+  raise notice 'r1 = %', r1;
+  r2 := r1;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r2.q2 = r1.q1 + 3;  -- check that r2 has distinct storage
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r1 := null;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r1 := row(7,11)::two_int8s;
+  r2 := r1;
+  raise notice 'r1 = %', r1;
+  raise notice 'r2 = %', r2;
+  r3 := row(1,2);
+  r4 := r3;
+  raise notice 'r3 = %', r3;
+  raise notice 'r4 = %', r4;
+  r4.f1 := r4.f1 + 3;  -- check that r4 has distinct storage
+  raise notice 'r3 = %', r3;
+  raise notice 'r4 = %', r4;
+  r1 := r3;
+  raise notice 'r1 = %', r1;
+  r4 := r1;
+  raise notice 'r4 = %', r4;
+  r4.q2 := r4.q2 + 1;  -- r4's field names have changed
+  raise notice 'r4 = %', r4;
+end$$;
+
+-- fields of named-type vars read as null if uninitialized
+do $$
+declare r1 two_int8s;
+begin
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.q1 = %', r1.q1;
+  raise notice 'r1.q2 = %', r1.q2;
+  raise notice 'r1 = %', r1;
+end$$;
+
+do $$
+declare r1 two_int8s;
+begin
+  raise notice 'r1.q1 = %', r1.q1;
+  raise notice 'r1.q2 = %', r1.q2;
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.nosuchfield = %', r1.nosuchfield;
+end$$;
+
+-- records, not so much
+do $$
+declare r1 record;
+begin
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.f1 = %', r1.f1;
+  raise notice 'r1.f2 = %', r1.f2;
+  raise notice 'r1 = %', r1;
+end$$;
+
+-- but OK if you assign first
+do $$
+declare r1 record;
+begin
+  raise notice 'r1 = %', r1;
+  r1 := row(1,2);
+  raise notice 'r1.f1 = %', r1.f1;
+  raise notice 'r1.f2 = %', r1.f2;
+  raise notice 'r1 = %', r1;
+  raise notice 'r1.nosuchfield = %', r1.nosuchfield;
+end$$;
+
+-- check repeated assignments to composite fields
+create table some_table (id int, data text);
+
+do $$
+declare r some_table;
+begin
+  r := (23, 'skidoo');
+  for i in 1 .. 10 loop
+    r.id := r.id + i;
+    r.data := r.data || ' ' || i;
+  end loop;
+  raise notice 'r = %', r;
+end$$;
+
+-- check behavior of function declared to return "record"
+
+create function returnsrecord(int) returns record language plpgsql as
+$$ begin return row($1,$1+1); end $$;
+
+select returnsrecord(42);
+select * from returnsrecord(42) as r(x int, y int);
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+
+-- same with an intermediate record variable
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ declare r record; begin r := row($1,$1+1); return r; end $$;
+
+select returnsrecord(42);
+select * from returnsrecord(42) as r(x int, y int);
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+
+-- should work the same with a missing column in the actual result value
+create table has_hole(f1 int, f2 int, f3 int);
+alter table has_hole drop column f2;
+
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ begin return row($1,$1+1)::has_hole; end $$;
+
+select returnsrecord(42);
+select * from returnsrecord(42) as r(x int, y int);
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+
+-- same with an intermediate record variable
+create or replace function returnsrecord(int) returns record language plpgsql as
+$$ declare r record; begin r := row($1,$1+1)::has_hole; return r; end $$;
+
+select returnsrecord(42);
+select * from returnsrecord(42) as r(x int, y int);
+select * from returnsrecord(42) as r(x int, y int, z int);  -- fail
+select * from returnsrecord(42) as r(x int, y bigint);  -- fail
+
+-- check access to a field of an argument declared "record"
+create function getf1(x record) returns int language plpgsql as
+$$ begin return x.f1; end $$;
+select getf1(1);
+select getf1(row(1,2));
+-- a CLOBBER_CACHE_ALWAYS build will report this error with a different
+-- context stack than other builds, so suppress context output
+\set SHOW_CONTEXT never
+select getf1(row(1,2)::two_int8s);
+\set SHOW_CONTEXT errors
+select getf1(row(1,2));
+
+-- check behavior when assignment to FOR-loop variable requires coercion
+do $$
+declare r two_int8s;
+begin
+  for r in select i, i+1 from generate_series(1,4) i
+  loop
+    raise notice 'r = %', r;
+  end loop;
+end$$;
+
+-- check behavior when returning setof composite
+create function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+declare r record;
+  h has_hole;
+begin
+  return next h;
+  r := (1,2);
+  h := (3,4);
+  return next r;
+  return next h;
+  return next row(5,6);
+  return next row(7,8)::has_hole;
+end$$;
+select returnssetofholes();
+
+create or replace function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+declare r record;
+begin
+  return next r;  -- fails, not assigned yet
+end$$;
+select returnssetofholes();
+
+create or replace function returnssetofholes() returns setof has_hole language plpgsql as
+$$
+begin
+  return next row(1,2,3);  -- fails
+end$$;
+select returnssetofholes();
+
+-- check behavior with changes of a named rowtype
+create table mutable(f1 int, f2 text);
+
+create function sillyaddone(int) returns int language plpgsql as
+$$ declare r mutable; begin r.f1 := $1; return r.f1 + 1; end $$;
+select sillyaddone(42);
+
+alter table mutable drop column f1;
+alter table mutable add column f1 float8;
+
+-- currently, this fails due to cached plan for "r.f1 + 1" expression
+-- select sillyaddone(42);
+\c -
+-- but it's OK after a reconnect
+select sillyaddone(42);
+
+alter table mutable drop column f1;
+select sillyaddone(42);  -- fail
+
+create function getf3(x mutable) returns int language plpgsql as
+$$ begin return x.f3; end $$;
+select getf3(null::mutable);  -- doesn't work yet
+alter table mutable add column f3 int;
+select getf3(null::mutable);  -- now it works
+alter table mutable drop column f3;
+-- a CLOBBER_CACHE_ALWAYS build will report this error with a different
+-- context stack than other builds, so suppress context output
+\set SHOW_CONTEXT never
+select getf3(null::mutable);  -- fails again
+\set SHOW_CONTEXT errors
+
+-- check access to system columns in a record variable
+
+create function sillytrig() returns trigger language plpgsql as
+$$begin
+  raise notice 'old.ctid = %', old.ctid;
+  raise notice 'old.tableoid = %', old.tableoid::regclass;
+  return new;
+end$$;
+
+create trigger mutable_trig before update on mutable for each row
+execute procedure sillytrig();
+
+insert into mutable values ('foo'), ('bar');
+update mutable set f2 = f2 || ' baz';
+table mutable;
+
+-- check returning a composite datum from a trigger
+
+create or replace function sillytrig() returns trigger language plpgsql as
+$$begin
+  return row(new.*);
+end$$;
+
+update mutable set f2 = f2 || ' baz';
+table mutable;
+
+create or replace function sillytrig() returns trigger language plpgsql as
+$$declare r record;
+begin
+  r := row(new.*);
+  return r;
+end$$;
+
+update mutable set f2 = f2 || ' baz';
+table mutable;
+
+--
+-- Domains of composite
+--
+
+create domain ordered_int8s as two_int8s check((value).q1 <= (value).q2);
+
+create function read_ordered_int8s(p ordered_int8s) returns int8 as $$
+begin return p.q1 + p.q2; end
+$$ language plpgsql;
+
+select read_ordered_int8s(row(1, 2));
+select read_ordered_int8s(row(2, 1));  -- fail
+
+create function build_ordered_int8s(i int8, j int8) returns ordered_int8s as $$
+begin return row(i,j); end
+$$ language plpgsql;
+
+select build_ordered_int8s(1,2);
+select build_ordered_int8s(2,1);  -- fail
+
+create function build_ordered_int8s_2(i int8, j int8) returns ordered_int8s as $$
+declare r record; begin r := row(i,j); return r; end
+$$ language plpgsql;
+
+select build_ordered_int8s_2(1,2);
+select build_ordered_int8s_2(2,1);  -- fail
+
+create function build_ordered_int8s_3(i int8, j int8) returns ordered_int8s as $$
+declare r two_int8s; begin r := row(i,j); return r; end
+$$ language plpgsql;
+
+select build_ordered_int8s_3(1,2);
+select build_ordered_int8s_3(2,1);  -- fail
+
+create function build_ordered_int8s_4(i int8, j int8) returns ordered_int8s as $$
+declare r ordered_int8s; begin r := row(i,j); return r; end
+$$ language plpgsql;
+
+select build_ordered_int8s_4(1,2);
+select build_ordered_int8s_4(2,1);  -- fail
+
+create function build_ordered_int8s_a(i int8, j int8) returns ordered_int8s[] as $$
+begin return array[row(i,j), row(i,j+1)]; end
+$$ language plpgsql;
+
+select build_ordered_int8s_a(1,2);
+select build_ordered_int8s_a(2,1);  -- fail
+
+-- check field assignment
+do $$
+declare r ordered_int8s;
+begin
+  r.q1 := null;
+  r.q2 := 43;
+  r.q1 := 42;
+  r.q2 := 41;  -- fail
+end$$;
+
+-- check whole-row assignment
+do $$
+declare r ordered_int8s;
+begin
+  r := null;
+  r := row(null,null);
+  r := row(1,2);
+  r := row(2,1);  -- fail
+end$$;
+
+-- check assignment in for-loop
+do $$
+declare r ordered_int8s;
+begin
+  for r in values (1,2),(3,4),(6,5) loop
+    raise notice 'r = %', r;
+  end loop;
+end$$;
+
+-- check behavior with toastable fields, too
+
+create type two_texts as (f1 text, f2 text);
+create domain ordered_texts as two_texts check((value).f1 <= (value).f2);
+
+create table sometable (id int, a text, b text);
+-- b should be compressed, but in-line
+insert into sometable values (1, 'a', repeat('ffoob',1000));
+-- this b should be out-of-line
+insert into sometable values (2, 'a', repeat('ffoob',100000));
+-- this pair should fail the domain check
+insert into sometable values (3, 'z', repeat('ffoob',100000));
+
+do $$
+declare d ordered_texts;
+begin
+  for d in select a, b from sometable loop
+    raise notice 'succeeded at "%"', d.f1;
+  end loop;
+end$$;
+
+do $$
+declare r record; d ordered_texts;
+begin
+  for r in select * from sometable loop
+    raise notice 'processing row %', r.id;
+    d := row(r.a, r.b);
+  end loop;
+end$$;
+
+do $$
+declare r record; d ordered_texts;
+begin
+  for r in select * from sometable loop
+    raise notice 'processing row %', r.id;
+    d := null;
+    d.f1 := r.a;
+    d.f2 := r.b;
+  end loop;
+end$$;
diff --git a/src/pl/plpgsql/src/sql/plpgsql_transaction.sql b/src/pl/plpgsql/src/sql/plpgsql_transaction.sql
new file mode 100644
index 0000000000..02ee735079
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_transaction.sql
@@ -0,0 +1,215 @@
+CREATE TABLE test1 (a int, b text);
+
+
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+END
+$$;
+
+CALL transaction_test1();
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+DO
+LANGUAGE plpgsql
+$$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+END
+$$;
+
+SELECT * FROM test1;
+
+
+-- transaction commands not allowed when called in transaction block
+START TRANSACTION;
+CALL transaction_test1();
+COMMIT;
+
+START TRANSACTION;
+DO LANGUAGE plpgsql $$ BEGIN COMMIT; END $$;
+COMMIT;
+
+
+TRUNCATE test1;
+
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    FOR i IN 0..9 LOOP
+        INSERT INTO test1 (a) VALUES (i);
+        IF i % 2 = 0 THEN
+            COMMIT;
+        ELSE
+            ROLLBACK;
+        END IF;
+    END LOOP;
+    RETURN 1;
+END
+$$;
+
+SELECT transaction_test2();
+
+SELECT * FROM test1;
+
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    CALL transaction_test1();
+    RETURN 1;
+END;
+$$;
+
+SELECT transaction_test3();
+
+SELECT * FROM test1;
+
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plpgsql
+AS $$
+BEGIN
+    EXECUTE 'DO LANGUAGE plpgsql $x$ BEGIN COMMIT; END $x$';
+    RETURN 1;
+END;
+$$;
+
+SELECT transaction_test4();
+
+
+-- proconfig settings currently disallow transaction statements
+CREATE PROCEDURE transaction_test5()
+LANGUAGE plpgsql
+SET work_mem = 555
+AS $$
+BEGIN
+    COMMIT;
+END;
+$$;
+
+CALL transaction_test5();
+
+
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+
+TRUNCATE test1;
+
+DO LANGUAGE plpgsql $$
+DECLARE
+    r RECORD;
+BEGIN
+    FOR r IN SELECT * FROM test2 ORDER BY x LOOP
+        INSERT INTO test1 (a) VALUES (r.x);
+        COMMIT;
+    END LOOP;
+END;
+$$;
+
+SELECT * FROM test1;
+
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+
+DO LANGUAGE plpgsql $$
+DECLARE
+    r RECORD;
+BEGIN
+    FOR r IN SELECT * FROM test2 ORDER BY x LOOP
+        INSERT INTO test1 (a) VALUES (r.x);
+        ROLLBACK;
+    END LOOP;
+END;
+$$;
+
+SELECT * FROM test1;
+
+
+-- commit inside block with exception handler
+TRUNCATE test1;
+
+DO LANGUAGE plpgsql $$
+BEGIN
+    BEGIN
+        INSERT INTO test1 (a) VALUES (1);
+        COMMIT;
+        INSERT INTO test1 (a) VALUES (1/0);
+        COMMIT;
+    EXCEPTION
+        WHEN division_by_zero THEN
+            RAISE NOTICE 'caught division_by_zero';
+    END;
+END;
+$$;
+
+SELECT * FROM test1;
+
+
+-- rollback inside block with exception handler
+TRUNCATE test1;
+
+DO LANGUAGE plpgsql $$
+BEGIN
+    BEGIN
+        INSERT INTO test1 (a) VALUES (1);
+        ROLLBACK;
+        INSERT INTO test1 (a) VALUES (1/0);
+        ROLLBACK;
+    EXCEPTION
+        WHEN division_by_zero THEN
+            RAISE NOTICE 'caught division_by_zero';
+    END;
+END;
+$$;
+
+SELECT * FROM test1;
+
+
+-- COMMIT failures
+DO LANGUAGE plpgsql $$
+BEGIN
+    CREATE TABLE test3 (y int UNIQUE DEFERRABLE INITIALLY DEFERRED);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (1);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (1);
+    INSERT INTO test3 (y) VALUES (2);
+    COMMIT;
+    INSERT INTO test3 (y) VALUES (3);  -- won't get here
+END;
+$$;
+
+SELECT * FROM test3;
+
+
+DROP TABLE test1;
+DROP TABLE test2;
+DROP TABLE test3;
diff --git a/src/pl/plpgsql/src/sql/plpgsql_varprops.sql b/src/pl/plpgsql/src/sql/plpgsql_varprops.sql
new file mode 100644
index 0000000000..778119d223
--- /dev/null
+++ b/src/pl/plpgsql/src/sql/plpgsql_varprops.sql
@@ -0,0 +1,247 @@
+--
+-- Tests for PL/pgSQL variable properties: CONSTANT, NOT NULL, initializers
+--
+
+create type var_record as (f1 int4, f2 int4);
+create domain int_nn as int not null;
+create domain var_record_nn as var_record not null;
+create domain var_record_colnn as var_record check((value).f2 is not null);
+
+-- CONSTANT
+
+do $$
+declare x constant int := 42;
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x constant int;
+begin
+  x := 42;  -- fail
+end$$;
+
+do $$
+declare x constant int; y int;
+begin
+  for x, y in select 1, 2 loop  -- fail
+  end loop;
+end$$;
+
+do $$
+declare x constant int[];
+begin
+  x[1] := 42;  -- fail
+end$$;
+
+do $$
+declare x constant int[]; y int;
+begin
+  for x[1], y in select 1, 2 loop  -- fail (currently, unsupported syntax)
+  end loop;
+end$$;
+
+do $$
+declare x constant var_record;
+begin
+  x.f1 := 42;  -- fail
+end$$;
+
+do $$
+declare x constant var_record; y int;
+begin
+  for x.f1, y in select 1, 2 loop  -- fail
+  end loop;
+end$$;
+
+-- initializer expressions
+
+do $$
+declare x int := sin(0);
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x int := 1/0;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x bigint[] := array[1,3,5];
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x record := row(1,2,3);
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record := row(1,2);
+begin
+  raise notice 'x = %', x;
+end$$;
+
+-- NOT NULL
+
+do $$
+declare x int not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x int not null := 42;
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x int not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x record not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x record not null := row(42);
+begin
+  raise notice 'x = %', x;
+  x := row(null);  -- ok
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x record not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record not null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record not null := row(41,42);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- ok
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x var_record not null := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+-- Check that variables are reinitialized on block re-entry.
+
+do $$
+begin
+  for i in 1..3 loop
+    declare
+      x int;
+      y int := i;
+      r record;
+      c var_record;
+    begin
+      if i = 1 then
+        x := 42;
+        r := row(i, i+1);
+        c := row(i, i+1);
+      end if;
+      raise notice 'x = %', x;
+      raise notice 'y = %', y;
+      raise notice 'r = %', r;
+      raise notice 'c = %', c;
+    end;
+  end loop;
+end$$;
+
+-- Check enforcement of domain constraints during initialization
+
+do $$
+declare x int_nn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x int_nn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x int_nn := 42;
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x var_record_nn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record_nn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record_nn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- ok
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x var_record_colnn;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record_colnn := null;  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record_colnn := row(1,null);  -- fail
+begin
+  raise notice 'x = %', x;
+end$$;
+
+do $$
+declare x var_record_colnn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := null;  -- fail
+end$$;
+
+do $$
+declare x var_record_colnn := row(1,2);
+begin
+  raise notice 'x = %', x;
+  x := row(null,null);  -- fail
+end$$;
diff --git a/src/pl/plpython/Makefile b/src/pl/plpython/Makefile
index 7680d49cb6..d09910835d 100644
--- a/src/pl/plpython/Makefile
+++ b/src/pl/plpython/Makefile
@@ -78,6 +78,7 @@ REGRESS = \
 	plpython_spi \
 	plpython_newline \
 	plpython_void \
+	plpython_call \
 	plpython_params \
 	plpython_setof \
 	plpython_record \
@@ -89,6 +90,7 @@ REGRESS = \
 	plpython_quote \
 	plpython_composite \
 	plpython_subtransaction \
+	plpython_transaction \
 	plpython_drop
 
 REGRESS_PLPYTHON3_MANGLE := $(REGRESS)
diff --git a/src/pl/plpython/expected/plpython_call.out b/src/pl/plpython/expected/plpython_call.out
new file mode 100644
index 0000000000..90785343b6
--- /dev/null
+++ b/src/pl/plpython/expected/plpython_call.out
@@ -0,0 +1,35 @@
+--
+-- Tests for procedures / CALL syntax
+--
+CREATE PROCEDURE test_proc1()
+LANGUAGE plpythonu
+AS $$
+pass
+$$;
+CALL test_proc1();
+-- error: can't return non-None
+CREATE PROCEDURE test_proc2()
+LANGUAGE plpythonu
+AS $$
+return 5
+$$;
+CALL test_proc2();
+ERROR:  PL/Python procedure did not return None
+CONTEXT:  PL/Python procedure "test_proc2"
+CREATE TABLE test1 (a int);
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plpythonu
+AS $$
+plpy.execute("INSERT INTO test1 VALUES (%s)" % x)
+$$;
+CALL test_proc3(55);
+SELECT * FROM test1;
+ a  
+----
+ 55
+(1 row)
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+DROP TABLE test1;
diff --git a/src/pl/plpython/expected/plpython_error.out b/src/pl/plpython/expected/plpython_error.out
index 1f52af7fe0..4d615b41cc 100644
--- a/src/pl/plpython/expected/plpython_error.out
+++ b/src/pl/plpython/expected/plpython_error.out
@@ -422,3 +422,26 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* test the context stack trace for nested execution levels
+ */
+CREATE FUNCTION notice_innerfunc() RETURNS int AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$")
+return 1
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION notice_outerfunc() RETURNS int AS $$
+plpy.execute("SELECT notice_innerfunc()")
+return 1
+$$ LANGUAGE plpythonu;
+\set SHOW_CONTEXT always
+SELECT notice_outerfunc();
+NOTICE:  inside DO
+CONTEXT:  PL/Python anonymous code block
+SQL statement "DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$"
+PL/Python function "notice_innerfunc"
+SQL statement "SELECT notice_innerfunc()"
+PL/Python function "notice_outerfunc"
+ notice_outerfunc 
+------------------
+                1
+(1 row)
+
diff --git a/src/pl/plpython/expected/plpython_error_0.out b/src/pl/plpython/expected/plpython_error_0.out
index 5323906122..290902b182 100644
--- a/src/pl/plpython/expected/plpython_error_0.out
+++ b/src/pl/plpython/expected/plpython_error_0.out
@@ -422,3 +422,26 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* test the context stack trace for nested execution levels
+ */
+CREATE FUNCTION notice_innerfunc() RETURNS int AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$")
+return 1
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION notice_outerfunc() RETURNS int AS $$
+plpy.execute("SELECT notice_innerfunc()")
+return 1
+$$ LANGUAGE plpythonu;
+\set SHOW_CONTEXT always
+SELECT notice_outerfunc();
+NOTICE:  inside DO
+CONTEXT:  PL/Python anonymous code block
+SQL statement "DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$"
+PL/Python function "notice_innerfunc"
+SQL statement "SELECT notice_innerfunc()"
+PL/Python function "notice_outerfunc"
+ notice_outerfunc 
+------------------
+                1
+(1 row)
+
diff --git a/src/pl/plpython/expected/plpython_error_5.out b/src/pl/plpython/expected/plpython_error_5.out
index 5ff46ca50a..bc66ab5534 100644
--- a/src/pl/plpython/expected/plpython_error_5.out
+++ b/src/pl/plpython/expected/plpython_error_5.out
@@ -422,3 +422,26 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+/* test the context stack trace for nested execution levels
+ */
+CREATE FUNCTION notice_innerfunc() RETURNS int AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$")
+return 1
+$$ LANGUAGE plpythonu;
+CREATE FUNCTION notice_outerfunc() RETURNS int AS $$
+plpy.execute("SELECT notice_innerfunc()")
+return 1
+$$ LANGUAGE plpythonu;
+\set SHOW_CONTEXT always
+SELECT notice_outerfunc();
+NOTICE:  inside DO
+CONTEXT:  PL/Python anonymous code block
+SQL statement "DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$"
+PL/Python function "notice_innerfunc"
+SQL statement "SELECT notice_innerfunc()"
+PL/Python function "notice_outerfunc"
+ notice_outerfunc 
+------------------
+                1
+(1 row)
+
diff --git a/src/pl/plpython/expected/plpython_test.out b/src/pl/plpython/expected/plpython_test.out
index 847e4cc412..39b994f446 100644
--- a/src/pl/plpython/expected/plpython_test.out
+++ b/src/pl/plpython/expected/plpython_test.out
@@ -48,6 +48,7 @@ select module_contents();
  Error
  Fatal
  SPIError
+ commit
  cursor
  debug
  error
@@ -60,10 +61,11 @@ select module_contents();
  quote_ident
  quote_literal
  quote_nullable
+ rollback
  spiexceptions
  subtransaction
  warning
-(18 rows)
+(20 rows)
 
 CREATE FUNCTION elog_test_basic() RETURNS void
 AS $$
diff --git a/src/pl/plpython/expected/plpython_transaction.out b/src/pl/plpython/expected/plpython_transaction.out
new file mode 100644
index 0000000000..6f6dfadf9c
--- /dev/null
+++ b/src/pl/plpython/expected/plpython_transaction.out
@@ -0,0 +1,136 @@
+CREATE TABLE test1 (a int, b text);
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpythonu
+AS $$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+$$;
+CALL transaction_test1();
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+DO
+LANGUAGE plpythonu
+$$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+$$;
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plpythonu
+AS $$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+return 1
+$$;
+SELECT transaction_test2();
+ERROR:  invalid transaction termination
+CONTEXT:  PL/Python function "transaction_test2"
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plpythonu
+AS $$
+plpy.execute("CALL transaction_test1()")
+return 1
+$$;
+SELECT transaction_test3();
+ERROR:  spiexceptions.InvalidTransactionTermination: invalid transaction termination
+CONTEXT:  Traceback (most recent call last):
+  PL/Python function "transaction_test3", line 2, in <module>
+    plpy.execute("CALL transaction_test1()")
+PL/Python function "transaction_test3"
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plpythonu
+AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.commit() $x$")
+return 1
+$$;
+SELECT transaction_test4();
+ERROR:  spiexceptions.InvalidTransactionTermination: invalid transaction termination
+CONTEXT:  Traceback (most recent call last):
+  PL/Python function "transaction_test4", line 2, in <module>
+    plpy.execute("DO LANGUAGE plpythonu $x$ plpy.commit() $x$")
+PL/Python function "transaction_test4"
+-- commit inside subtransaction (prohibited)
+DO LANGUAGE plpythonu $$
+s = plpy.subtransaction()
+s.enter()
+plpy.commit()
+$$;
+WARNING:  forcibly aborting a subtransaction that has not been exited
+ERROR:  cannot commit while a subtransaction is active
+CONTEXT:  PL/Python anonymous code block
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+TRUNCATE test1;
+DO LANGUAGE plpythonu $$
+for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
+    plpy.commit()
+$$;
+ERROR:  cannot commit transaction while a cursor is open
+CONTEXT:  PL/Python anonymous code block
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+DO LANGUAGE plpythonu $$
+for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
+    plpy.rollback()
+$$;
+ERROR:  cannot abort transaction while a cursor is open
+CONTEXT:  PL/Python anonymous code block
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/pl/plpython/expected/plpython_types.out b/src/pl/plpython/expected/plpython_types.out
index 893de301dd..eda965a9e0 100644
--- a/src/pl/plpython/expected/plpython_types.out
+++ b/src/pl/plpython/expected/plpython_types.out
@@ -765,6 +765,76 @@ SELECT * FROM test_type_conversion_array_domain_check_violation();
 ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
 CONTEXT:  while creating return value
 PL/Python function "test_type_conversion_array_domain_check_violation"
+--
+-- Arrays of domains
+--
+CREATE FUNCTION test_read_uint2_array(x uint2[]) RETURNS uint2 AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+select test_read_uint2_array(array[1::uint2]);
+INFO:  ([1], <type 'list'>)
+ test_read_uint2_array 
+-----------------------
+                     1
+(1 row)
+
+CREATE FUNCTION test_build_uint2_array(x int2) RETURNS uint2[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+select test_build_uint2_array(1::int2);
+ test_build_uint2_array 
+------------------------
+ {1,1}
+(1 row)
+
+select test_build_uint2_array(-1::int2);  -- fail
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  while creating return value
+PL/Python function "test_build_uint2_array"
+--
+-- ideally this would work, but for now it doesn't, because the return value
+-- is [[2,4], [2,4]] which our conversion code thinks should become a 2-D
+-- integer array, not an array of arrays.
+--
+CREATE FUNCTION test_type_conversion_domain_array(x integer[])
+  RETURNS ordered_pair_domain[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_domain_array(array[2,4]);
+ERROR:  return value of function with array return type is not a Python sequence
+CONTEXT:  while creating return value
+PL/Python function "test_type_conversion_domain_array"
+select test_type_conversion_domain_array(array[4,2]);  -- fail
+ERROR:  return value of function with array return type is not a Python sequence
+CONTEXT:  while creating return value
+PL/Python function "test_type_conversion_domain_array"
+CREATE FUNCTION test_type_conversion_domain_array2(x ordered_pair_domain)
+  RETURNS integer AS $$
+plpy.info(x, type(x))
+return x[1]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_domain_array2(array[2,4]);
+INFO:  ([2, 4], <type 'list'>)
+ test_type_conversion_domain_array2 
+------------------------------------
+                                  4
+(1 row)
+
+select test_type_conversion_domain_array2(array[4,2]);  -- fail
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CREATE FUNCTION test_type_conversion_array_domain_array(x ordered_pair_domain[])
+  RETURNS ordered_pair_domain AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_array_domain_array(array[array[2,4]::ordered_pair_domain]);
+INFO:  ([[2, 4]], <type 'list'>)
+ test_type_conversion_array_domain_array 
+-----------------------------------------
+ {2,4}
+(1 row)
+
 ---
 --- Composite types
 ---
@@ -820,6 +890,64 @@ SELECT test_composite_type_input(row(1, 2));
                          3
 (1 row)
 
+--
+-- Domains within composite
+--
+CREATE TYPE nnint_container AS (f1 int, f2 nnint);
+CREATE FUNCTION nnint_test(x int, y int) RETURNS nnint_container AS $$
+return {'f1': x, 'f2': y}
+$$ LANGUAGE plpythonu;
+SELECT nnint_test(null, 3);
+ nnint_test 
+------------
+ (,3)
+(1 row)
+
+SELECT nnint_test(3, null);  -- fail
+ERROR:  value for domain nnint violates check constraint "nnint_check"
+CONTEXT:  while creating return value
+PL/Python function "nnint_test"
+--
+-- Domains of composite
+--
+CREATE DOMAIN ordered_named_pair AS named_pair_2 CHECK((VALUE).i <= (VALUE).j);
+CREATE FUNCTION read_ordered_named_pair(p ordered_named_pair) RETURNS integer AS $$
+return p['i'] + p['j']
+$$ LANGUAGE plpythonu;
+SELECT read_ordered_named_pair(row(1, 2));
+ read_ordered_named_pair 
+-------------------------
+                       3
+(1 row)
+
+SELECT read_ordered_named_pair(row(2, 1));  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CREATE FUNCTION build_ordered_named_pair(i int, j int) RETURNS ordered_named_pair AS $$
+return {'i': i, 'j': j}
+$$ LANGUAGE plpythonu;
+SELECT build_ordered_named_pair(1,2);
+ build_ordered_named_pair 
+--------------------------
+ (1,2)
+(1 row)
+
+SELECT build_ordered_named_pair(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  while creating return value
+PL/Python function "build_ordered_named_pair"
+CREATE FUNCTION build_ordered_named_pairs(i int, j int) RETURNS ordered_named_pair[] AS $$
+return [{'i': i, 'j': j}, {'i': i, 'j': j+1}]
+$$ LANGUAGE plpythonu;
+SELECT build_ordered_named_pairs(1,2);
+ build_ordered_named_pairs 
+---------------------------
+ {"(1,2)","(1,3)"}
+(1 row)
+
+SELECT build_ordered_named_pairs(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  while creating return value
+PL/Python function "build_ordered_named_pairs"
 --
 -- Prepared statements
 --
diff --git a/src/pl/plpython/expected/plpython_types_3.out b/src/pl/plpython/expected/plpython_types_3.out
index 2d853bd573..69f958cbf2 100644
--- a/src/pl/plpython/expected/plpython_types_3.out
+++ b/src/pl/plpython/expected/plpython_types_3.out
@@ -765,6 +765,76 @@ SELECT * FROM test_type_conversion_array_domain_check_violation();
 ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
 CONTEXT:  while creating return value
 PL/Python function "test_type_conversion_array_domain_check_violation"
+--
+-- Arrays of domains
+--
+CREATE FUNCTION test_read_uint2_array(x uint2[]) RETURNS uint2 AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+select test_read_uint2_array(array[1::uint2]);
+INFO:  ([1], <class 'list'>)
+ test_read_uint2_array 
+-----------------------
+                     1
+(1 row)
+
+CREATE FUNCTION test_build_uint2_array(x int2) RETURNS uint2[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+select test_build_uint2_array(1::int2);
+ test_build_uint2_array 
+------------------------
+ {1,1}
+(1 row)
+
+select test_build_uint2_array(-1::int2);  -- fail
+ERROR:  value for domain uint2 violates check constraint "uint2_check"
+CONTEXT:  while creating return value
+PL/Python function "test_build_uint2_array"
+--
+-- ideally this would work, but for now it doesn't, because the return value
+-- is [[2,4], [2,4]] which our conversion code thinks should become a 2-D
+-- integer array, not an array of arrays.
+--
+CREATE FUNCTION test_type_conversion_domain_array(x integer[])
+  RETURNS ordered_pair_domain[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_domain_array(array[2,4]);
+ERROR:  return value of function with array return type is not a Python sequence
+CONTEXT:  while creating return value
+PL/Python function "test_type_conversion_domain_array"
+select test_type_conversion_domain_array(array[4,2]);  -- fail
+ERROR:  return value of function with array return type is not a Python sequence
+CONTEXT:  while creating return value
+PL/Python function "test_type_conversion_domain_array"
+CREATE FUNCTION test_type_conversion_domain_array2(x ordered_pair_domain)
+  RETURNS integer AS $$
+plpy.info(x, type(x))
+return x[1]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_domain_array2(array[2,4]);
+INFO:  ([2, 4], <class 'list'>)
+ test_type_conversion_domain_array2 
+------------------------------------
+                                  4
+(1 row)
+
+select test_type_conversion_domain_array2(array[4,2]);  -- fail
+ERROR:  value for domain ordered_pair_domain violates check constraint "ordered_pair_domain_check"
+CREATE FUNCTION test_type_conversion_array_domain_array(x ordered_pair_domain[])
+  RETURNS ordered_pair_domain AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+select test_type_conversion_array_domain_array(array[array[2,4]::ordered_pair_domain]);
+INFO:  ([[2, 4]], <class 'list'>)
+ test_type_conversion_array_domain_array 
+-----------------------------------------
+ {2,4}
+(1 row)
+
 ---
 --- Composite types
 ---
@@ -820,6 +890,64 @@ SELECT test_composite_type_input(row(1, 2));
                          3
 (1 row)
 
+--
+-- Domains within composite
+--
+CREATE TYPE nnint_container AS (f1 int, f2 nnint);
+CREATE FUNCTION nnint_test(x int, y int) RETURNS nnint_container AS $$
+return {'f1': x, 'f2': y}
+$$ LANGUAGE plpythonu;
+SELECT nnint_test(null, 3);
+ nnint_test 
+------------
+ (,3)
+(1 row)
+
+SELECT nnint_test(3, null);  -- fail
+ERROR:  value for domain nnint violates check constraint "nnint_check"
+CONTEXT:  while creating return value
+PL/Python function "nnint_test"
+--
+-- Domains of composite
+--
+CREATE DOMAIN ordered_named_pair AS named_pair_2 CHECK((VALUE).i <= (VALUE).j);
+CREATE FUNCTION read_ordered_named_pair(p ordered_named_pair) RETURNS integer AS $$
+return p['i'] + p['j']
+$$ LANGUAGE plpythonu;
+SELECT read_ordered_named_pair(row(1, 2));
+ read_ordered_named_pair 
+-------------------------
+                       3
+(1 row)
+
+SELECT read_ordered_named_pair(row(2, 1));  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CREATE FUNCTION build_ordered_named_pair(i int, j int) RETURNS ordered_named_pair AS $$
+return {'i': i, 'j': j}
+$$ LANGUAGE plpythonu;
+SELECT build_ordered_named_pair(1,2);
+ build_ordered_named_pair 
+--------------------------
+ (1,2)
+(1 row)
+
+SELECT build_ordered_named_pair(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  while creating return value
+PL/Python function "build_ordered_named_pair"
+CREATE FUNCTION build_ordered_named_pairs(i int, j int) RETURNS ordered_named_pair[] AS $$
+return [{'i': i, 'j': j}, {'i': i, 'j': j+1}]
+$$ LANGUAGE plpythonu;
+SELECT build_ordered_named_pairs(1,2);
+ build_ordered_named_pairs 
+---------------------------
+ {"(1,2)","(1,3)"}
+(1 row)
+
+SELECT build_ordered_named_pairs(2,1);  -- fail
+ERROR:  value for domain ordered_named_pair violates check constraint "ordered_named_pair_check"
+CONTEXT:  while creating return value
+PL/Python function "build_ordered_named_pairs"
 --
 -- Prepared statements
 --
diff --git a/src/pl/plpython/generate-spiexceptions.pl b/src/pl/plpython/generate-spiexceptions.pl
index a9ee9601b3..73ca50e875 100644
--- a/src/pl/plpython/generate-spiexceptions.pl
+++ b/src/pl/plpython/generate-spiexceptions.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate the spiexceptions.h header from errcodes.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/pl/plpython/plpy_cursorobject.c b/src/pl/plpython/plpy_cursorobject.c
index 2ad663cf66..e32bc568bc 100644
--- a/src/pl/plpython/plpy_cursorobject.c
+++ b/src/pl/plpython/plpy_cursorobject.c
@@ -9,6 +9,7 @@
 #include <limits.h>
 
 #include "access/xact.h"
+#include "catalog/pg_type.h"
 #include "mb/pg_wchar.h"
 #include "utils/memutils.h"
 
@@ -106,6 +107,7 @@ static PyObject *
 PLy_cursor_query(const char *query)
 {
 	PLyCursorObject *cursor;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 	volatile ResourceOwner oldowner;
 
@@ -116,7 +118,11 @@ PLy_cursor_query(const char *query)
 	cursor->mcxt = AllocSetContextCreate(TopMemoryContext,
 										 "PL/Python cursor context",
 										 ALLOCSET_DEFAULT_SIZES);
-	PLy_typeinfo_init(&cursor->result, cursor->mcxt);
+
+	/* Initialize for converting result tuples to Python */
+	PLy_input_setup_func(&cursor->result, cursor->mcxt,
+						 RECORDOID, -1,
+						 exec_ctx->curr_proc);
 
 	oldcontext = CurrentMemoryContext;
 	oldowner = CurrentResourceOwner;
@@ -125,7 +131,6 @@ PLy_cursor_query(const char *query)
 
 	PG_TRY();
 	{
-		PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 		SPIPlanPtr	plan;
 		Portal		portal;
 
@@ -146,6 +151,8 @@ PLy_cursor_query(const char *query)
 
 		cursor->portalname = MemoryContextStrdup(cursor->mcxt, portal->name);
 
+		PinPortal(portal);
+
 		PLy_spi_subtransaction_commit(oldcontext, oldowner);
 	}
 	PG_CATCH();
@@ -166,6 +173,7 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 	volatile int nargs;
 	int			i;
 	PLyPlanObject *plan;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 	volatile ResourceOwner oldowner;
 
@@ -208,7 +216,11 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 	cursor->mcxt = AllocSetContextCreate(TopMemoryContext,
 										 "PL/Python cursor context",
 										 ALLOCSET_DEFAULT_SIZES);
-	PLy_typeinfo_init(&cursor->result, cursor->mcxt);
+
+	/* Initialize for converting result tuples to Python */
+	PLy_input_setup_func(&cursor->result, cursor->mcxt,
+						 RECORDOID, -1,
+						 exec_ctx->curr_proc);
 
 	oldcontext = CurrentMemoryContext;
 	oldowner = CurrentResourceOwner;
@@ -217,7 +229,6 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 
 	PG_TRY();
 	{
-		PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 		Portal		portal;
 		char	   *volatile nulls;
 		volatile int j;
@@ -229,39 +240,24 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 
 		for (j = 0; j < nargs; j++)
 		{
+			PLyObToDatum *arg = &plan->args[j];
 			PyObject   *elem;
 
 			elem = PySequence_GetItem(args, j);
-			if (elem != Py_None)
+			PG_TRY();
 			{
-				PG_TRY();
-				{
-					plan->values[j] =
-						plan->args[j].out.d.func(&(plan->args[j].out.d),
-												 -1,
-												 elem,
-												 false);
-				}
-				PG_CATCH();
-				{
-					Py_DECREF(elem);
-					PG_RE_THROW();
-				}
-				PG_END_TRY();
+				bool		isnull;
 
-				Py_DECREF(elem);
-				nulls[j] = ' ';
+				plan->values[j] = PLy_output_convert(arg, elem, &isnull);
+				nulls[j] = isnull ? 'n' : ' ';
 			}
-			else
+			PG_CATCH();
 			{
 				Py_DECREF(elem);
-				plan->values[j] =
-					InputFunctionCall(&(plan->args[j].out.d.typfunc),
-									  NULL,
-									  plan->args[j].out.d.typioparam,
-									  -1);
-				nulls[j] = 'n';
+				PG_RE_THROW();
 			}
+			PG_END_TRY();
+			Py_DECREF(elem);
 		}
 
 		portal = SPI_cursor_open(NULL, plan->plan, plan->values, nulls,
@@ -272,6 +268,8 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 
 		cursor->portalname = MemoryContextStrdup(cursor->mcxt, portal->name);
 
+		PinPortal(portal);
+
 		PLy_spi_subtransaction_commit(oldcontext, oldowner);
 	}
 	PG_CATCH();
@@ -281,7 +279,7 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 		/* cleanup plan->values array */
 		for (k = 0; k < nargs; k++)
 		{
-			if (!plan->args[k].out.d.typbyval &&
+			if (!plan->args[k].typbyval &&
 				(plan->values[k] != PointerGetDatum(NULL)))
 			{
 				pfree(DatumGetPointer(plan->values[k]));
@@ -298,7 +296,7 @@ PLy_cursor_plan(PyObject *ob, PyObject *args)
 
 	for (i = 0; i < nargs; i++)
 	{
-		if (!plan->args[i].out.d.typbyval &&
+		if (!plan->args[i].typbyval &&
 			(plan->values[i] != PointerGetDatum(NULL)))
 		{
 			pfree(DatumGetPointer(plan->values[i]));
@@ -323,7 +321,10 @@ PLy_cursor_dealloc(PyObject *arg)
 		portal = GetPortalByName(cursor->portalname);
 
 		if (PortalIsValid(portal))
+		{
+			UnpinPortal(portal);
 			SPI_cursor_close(portal);
+		}
 		cursor->closed = true;
 	}
 	if (cursor->mcxt)
@@ -339,6 +340,7 @@ PLy_cursor_iternext(PyObject *self)
 {
 	PLyCursorObject *cursor;
 	PyObject   *ret;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 	volatile ResourceOwner oldowner;
 	Portal		portal;
@@ -374,11 +376,11 @@ PLy_cursor_iternext(PyObject *self)
 		}
 		else
 		{
-			if (cursor->result.is_rowtype != 1)
-				PLy_input_tuple_funcs(&cursor->result, SPI_tuptable->tupdesc);
+			PLy_input_setup_tuple(&cursor->result, SPI_tuptable->tupdesc,
+								  exec_ctx->curr_proc);
 
-			ret = PLyDict_FromTuple(&cursor->result, SPI_tuptable->vals[0],
-									SPI_tuptable->tupdesc);
+			ret = PLy_input_from_tuple(&cursor->result, SPI_tuptable->vals[0],
+									   SPI_tuptable->tupdesc);
 		}
 
 		SPI_freetuptable(SPI_tuptable);
@@ -401,6 +403,7 @@ PLy_cursor_fetch(PyObject *self, PyObject *args)
 	PLyCursorObject *cursor;
 	int			count;
 	PLyResultObject *ret;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 	volatile ResourceOwner oldowner;
 	Portal		portal;
@@ -437,16 +440,11 @@ PLy_cursor_fetch(PyObject *self, PyObject *args)
 	{
 		SPI_cursor_fetch(portal, true, count);
 
-		if (cursor->result.is_rowtype != 1)
-			PLy_input_tuple_funcs(&cursor->result, SPI_tuptable->tupdesc);
-
 		Py_DECREF(ret->status);
 		ret->status = PyInt_FromLong(SPI_OK_FETCH);
 
 		Py_DECREF(ret->nrows);
-		ret->nrows = (SPI_processed > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) SPI_processed) :
-			PyInt_FromLong((long) SPI_processed);
+		ret->nrows = PyLong_FromUnsignedLongLong(SPI_processed);
 
 		if (SPI_processed != 0)
 		{
@@ -464,14 +462,24 @@ PLy_cursor_fetch(PyObject *self, PyObject *args)
 
 			Py_DECREF(ret->rows);
 			ret->rows = PyList_New(SPI_processed);
-
-			for (i = 0; i < SPI_processed; i++)
+			if (!ret->rows)
+			{
+				Py_DECREF(ret);
+				ret = NULL;
+			}
+			else
 			{
-				PyObject   *row = PLyDict_FromTuple(&cursor->result,
-													SPI_tuptable->vals[i],
-													SPI_tuptable->tupdesc);
+				PLy_input_setup_tuple(&cursor->result, SPI_tuptable->tupdesc,
+									  exec_ctx->curr_proc);
 
-				PyList_SetItem(ret->rows, i, row);
+				for (i = 0; i < SPI_processed; i++)
+				{
+					PyObject   *row = PLy_input_from_tuple(&cursor->result,
+														   SPI_tuptable->vals[i],
+														   SPI_tuptable->tupdesc);
+
+					PyList_SetItem(ret->rows, i, row);
+				}
 			}
 		}
 
@@ -505,10 +513,10 @@ PLy_cursor_close(PyObject *self, PyObject *unused)
 			return NULL;
 		}
 
+		UnpinPortal(portal);
 		SPI_cursor_close(portal);
 		cursor->closed = true;
 	}
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
diff --git a/src/pl/plpython/plpy_cursorobject.h b/src/pl/plpython/plpy_cursorobject.h
index 018b169cbf..e4d2c0ed25 100644
--- a/src/pl/plpython/plpy_cursorobject.h
+++ b/src/pl/plpython/plpy_cursorobject.h
@@ -12,7 +12,7 @@ typedef struct PLyCursorObject
 {
 	PyObject_HEAD
 	char	   *portalname;
-	PLyTypeInfo result;
+	PLyDatumToOb result;
 	bool		closed;
 	MemoryContext mcxt;
 } PLyCursorObject;
diff --git a/src/pl/plpython/plpy_elog.c b/src/pl/plpython/plpy_elog.c
index bb864899f6..e244104fed 100644
--- a/src/pl/plpython/plpy_elog.c
+++ b/src/pl/plpython/plpy_elog.c
@@ -44,7 +44,7 @@ static bool set_string_attr(PyObject *obj, char *attrname, char *str);
  * in the context.
  */
 void
-PLy_elog(int elevel, const char *fmt,...)
+PLy_elog_impl(int elevel, const char *fmt,...)
 {
 	char	   *xmsg;
 	char	   *tbmsg;
diff --git a/src/pl/plpython/plpy_elog.h b/src/pl/plpython/plpy_elog.h
index e73177d130..e4b30c3cca 100644
--- a/src/pl/plpython/plpy_elog.h
+++ b/src/pl/plpython/plpy_elog.h
@@ -10,7 +10,33 @@ extern PyObject *PLy_exc_error;
 extern PyObject *PLy_exc_fatal;
 extern PyObject *PLy_exc_spi_error;
 
-extern void PLy_elog(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
+/*
+ * PLy_elog()
+ *
+ * See comments at elog() about the compiler hinting.
+ */
+#ifdef HAVE__VA_ARGS
+#ifdef HAVE__BUILTIN_CONSTANT_P
+#define PLy_elog(elevel, ...) \
+	do { \
+		PLy_elog_impl(elevel, __VA_ARGS__); \
+		if (__builtin_constant_p(elevel) && (elevel) >= ERROR) \
+			pg_unreachable(); \
+	} while(0)
+#else							/* !HAVE__BUILTIN_CONSTANT_P */
+#define PLy_elog(elevel, ...)  \
+	do { \
+		const int elevel_ = (elevel); \
+		PLy_elog_impl(elevel_, __VA_ARGS__); \
+		if (elevel_ >= ERROR) \
+			pg_unreachable(); \
+	} while(0)
+#endif							/* HAVE__BUILTIN_CONSTANT_P */
+#else							/* !HAVE__VA_ARGS */
+#define PLy_elog PLy_elog_impl
+#endif							/* HAVE__VA_ARGS */
+
+extern void PLy_elog_impl(int elevel, const char *fmt,...) pg_attribute_printf(2, 3);
 
 extern void PLy_exception_set(PyObject *exc, const char *fmt,...) pg_attribute_printf(2, 3);
 
diff --git a/src/pl/plpython/plpy_exec.c b/src/pl/plpython/plpy_exec.c
index c6938d00aa..1e0f3d9d3a 100644
--- a/src/pl/plpython/plpy_exec.c
+++ b/src/pl/plpython/plpy_exec.c
@@ -57,6 +57,7 @@ static void PLy_abort_open_subtransactions(int save_subxact_level);
 Datum
 PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 {
+	bool		is_setof = proc->is_setof;
 	Datum		rv;
 	PyObject   *volatile plargs = NULL;
 	PyObject   *volatile plrv = NULL;
@@ -73,7 +74,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 
 	PG_TRY();
 	{
-		if (proc->is_setof)
+		if (is_setof)
 		{
 			/* First Call setup */
 			if (SRF_IS_FIRSTCALL())
@@ -93,6 +94,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 			funcctx = SRF_PERCALL_SETUP();
 			Assert(funcctx != NULL);
 			srfstate = (PLySRFState *) funcctx->user_fctx;
+			Assert(srfstate != NULL);
 		}
 
 		if (srfstate == NULL || srfstate->iter == NULL)
@@ -125,7 +127,7 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 		 * We stay in the SPI context while doing this, because PyIter_Next()
 		 * calls back into Python code which might contain SPI calls.
 		 */
-		if (proc->is_setof)
+		if (is_setof)
 		{
 			if (srfstate->iter == NULL)
 			{
@@ -197,12 +199,21 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 		error_context_stack = &plerrcontext;
 
 		/*
-		 * If the function is declared to return void, the Python return value
+		 * For a procedure or function declared to return void, the Python return value
 		 * must be None. For void-returning functions, we also treat a None
 		 * return value as a special "void datum" rather than NULL (as is the
 		 * case for non-void-returning functions).
 		 */
-		if (proc->result.out.d.typoid == VOIDOID)
+		if (proc->is_procedure)
+		{
+			if (plrv != Py_None)
+				ereport(ERROR,
+						(errcode(ERRCODE_DATATYPE_MISMATCH),
+						 errmsg("PL/Python procedure did not return None")));
+			fcinfo->isnull = false;
+			rv = (Datum) 0;
+		}
+		else if (proc->result.typoid == VOIDOID)
 		{
 			if (plrv != Py_None)
 				ereport(ERROR,
@@ -212,48 +223,22 @@ PLy_exec_function(FunctionCallInfo fcinfo, PLyProcedure *proc)
 			fcinfo->isnull = false;
 			rv = (Datum) 0;
 		}
-		else if (plrv == Py_None)
+		else if (plrv == Py_None &&
+				 srfstate && srfstate->iter == NULL)
 		{
-			fcinfo->isnull = true;
-
 			/*
 			 * In a SETOF function, the iteration-ending null isn't a real
 			 * value; don't pass it through the input function, which might
 			 * complain.
 			 */
-			if (srfstate && srfstate->iter == NULL)
-				rv = (Datum) 0;
-			else if (proc->result.is_rowtype < 1)
-				rv = InputFunctionCall(&proc->result.out.d.typfunc,
-									   NULL,
-									   proc->result.out.d.typioparam,
-									   -1);
-			else
-				/* Tuple as None */
-				rv = (Datum) NULL;
-		}
-		else if (proc->result.is_rowtype >= 1)
-		{
-			TupleDesc	desc;
-
-			/* make sure it's not an unnamed record */
-			Assert((proc->result.out.d.typoid == RECORDOID &&
-					proc->result.out.d.typmod != -1) ||
-				   (proc->result.out.d.typoid != RECORDOID &&
-					proc->result.out.d.typmod == -1));
-
-			desc = lookup_rowtype_tupdesc(proc->result.out.d.typoid,
-										  proc->result.out.d.typmod);
-
-			rv = PLyObject_ToCompositeDatum(&proc->result, desc, plrv, false);
-			fcinfo->isnull = (rv == (Datum) NULL);
-
-			ReleaseTupleDesc(desc);
+			fcinfo->isnull = true;
+			rv = (Datum) 0;
 		}
 		else
 		{
-			fcinfo->isnull = false;
-			rv = (proc->result.out.d.func) (&proc->result.out.d, -1, plrv, false);
+			/* Normal conversion of result */
+			rv = PLy_output_convert(&proc->result, plrv,
+									&fcinfo->isnull);
 		}
 	}
 	PG_CATCH();
@@ -328,20 +313,32 @@ PLy_exec_trigger(FunctionCallInfo fcinfo, PLyProcedure *proc)
 	PyObject   *volatile plargs = NULL;
 	PyObject   *volatile plrv = NULL;
 	TriggerData *tdata;
+	TupleDesc	rel_descr;
 
 	Assert(CALLED_AS_TRIGGER(fcinfo));
+	tdata = (TriggerData *) fcinfo->context;
 
 	/*
-	 * Input/output conversion for trigger tuples.  Use the result TypeInfo
-	 * variable to store the tuple conversion info.  We do this over again on
-	 * each call to cover the possibility that the relation's tupdesc changed
-	 * since the trigger was last called. PLy_input_tuple_funcs and
-	 * PLy_output_tuple_funcs are responsible for not doing repetitive work.
+	 * Input/output conversion for trigger tuples.  We use the result and
+	 * result_in fields to store the tuple conversion info.  We do this over
+	 * again on each call to cover the possibility that the relation's tupdesc
+	 * changed since the trigger was last called.  The PLy_xxx_setup_func
+	 * calls should only happen once, but PLy_input_setup_tuple and
+	 * PLy_output_setup_tuple are responsible for not doing repetitive work.
 	 */
-	tdata = (TriggerData *) fcinfo->context;
-
-	PLy_input_tuple_funcs(&(proc->result), tdata->tg_relation->rd_att);
-	PLy_output_tuple_funcs(&(proc->result), tdata->tg_relation->rd_att);
+	rel_descr = RelationGetDescr(tdata->tg_relation);
+	if (proc->result.typoid != rel_descr->tdtypeid)
+		PLy_output_setup_func(&proc->result, proc->mcxt,
+							  rel_descr->tdtypeid,
+							  rel_descr->tdtypmod,
+							  proc);
+	if (proc->result_in.typoid != rel_descr->tdtypeid)
+		PLy_input_setup_func(&proc->result_in, proc->mcxt,
+							 rel_descr->tdtypeid,
+							 rel_descr->tdtypmod,
+							 proc);
+	PLy_output_setup_tuple(&proc->result, rel_descr, proc);
+	PLy_input_setup_tuple(&proc->result_in, rel_descr, proc);
 
 	PG_TRY();
 	{
@@ -434,48 +431,17 @@ PLy_function_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc)
 	PG_TRY();
 	{
 		args = PyList_New(proc->nargs);
+		if (!args)
+			return NULL;
+
 		for (i = 0; i < proc->nargs; i++)
 		{
-			if (proc->args[i].is_rowtype > 0)
-			{
-				if (fcinfo->argnull[i])
-					arg = NULL;
-				else
-				{
-					HeapTupleHeader td;
-					Oid			tupType;
-					int32		tupTypmod;
-					TupleDesc	tupdesc;
-					HeapTupleData tmptup;
-
-					td = DatumGetHeapTupleHeader(fcinfo->arg[i]);
-					/* Extract rowtype info and find a tupdesc */
-					tupType = HeapTupleHeaderGetTypeId(td);
-					tupTypmod = HeapTupleHeaderGetTypMod(td);
-					tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
-
-					/* Set up I/O funcs if not done yet */
-					if (proc->args[i].is_rowtype != 1)
-						PLy_input_tuple_funcs(&(proc->args[i]), tupdesc);
-
-					/* Build a temporary HeapTuple control structure */
-					tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
-					tmptup.t_data = td;
-
-					arg = PLyDict_FromTuple(&(proc->args[i]), &tmptup, tupdesc);
-					ReleaseTupleDesc(tupdesc);
-				}
-			}
+			PLyDatumToOb *arginfo = &proc->args[i];
+
+			if (fcinfo->argnull[i])
+				arg = NULL;
 			else
-			{
-				if (fcinfo->argnull[i])
-					arg = NULL;
-				else
-				{
-					arg = (proc->args[i].in.d.func) (&(proc->args[i].in.d),
-													 fcinfo->arg[i]);
-				}
-			}
+				arg = PLy_input_convert(arginfo, fcinfo->arg[i]);
 
 			if (arg == NULL)
 			{
@@ -493,7 +459,7 @@ PLy_function_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc)
 		}
 
 		/* Set up output conversion for functions returning RECORD */
-		if (proc->result.out.d.typoid == RECORDOID)
+		if (proc->result.typoid == RECORDOID)
 		{
 			TupleDesc	desc;
 
@@ -504,7 +470,7 @@ PLy_function_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc)
 								"that cannot accept type record")));
 
 			/* cache the output conversion functions */
-			PLy_output_record_funcs(&(proc->result), desc);
+			PLy_output_setup_record(&proc->result, desc, proc);
 		}
 	}
 	PG_CATCH();
@@ -715,7 +681,8 @@ plpython_return_error_callback(void *arg)
 {
 	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 
-	if (exec_ctx->curr_proc)
+	if (exec_ctx->curr_proc &&
+		!exec_ctx->curr_proc->is_procedure)
 		errcontext("while creating return value");
 }
 
@@ -723,6 +690,7 @@ static PyObject *
 PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *rv)
 {
 	TriggerData *tdata = (TriggerData *) fcinfo->context;
+	TupleDesc	rel_descr = RelationGetDescr(tdata->tg_relation);
 	PyObject   *pltname,
 			   *pltevent,
 			   *pltwhen,
@@ -740,7 +708,7 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 	{
 		pltdata = PyDict_New();
 		if (!pltdata)
-			PLy_elog(ERROR, "could not create new dictionary while building trigger arguments");
+			return NULL;
 
 		pltname = PyString_FromString(tdata->tg_trigger->tgname);
 		PyDict_SetItemString(pltdata, "name", pltname);
@@ -790,8 +758,9 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 				pltevent = PyString_FromString("INSERT");
 
 				PyDict_SetItemString(pltdata, "old", Py_None);
-				pytnew = PLyDict_FromTuple(&(proc->result), tdata->tg_trigtuple,
-										   tdata->tg_relation->rd_att);
+				pytnew = PLy_input_from_tuple(&proc->result_in,
+											  tdata->tg_trigtuple,
+											  rel_descr);
 				PyDict_SetItemString(pltdata, "new", pytnew);
 				Py_DECREF(pytnew);
 				*rv = tdata->tg_trigtuple;
@@ -801,8 +770,9 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 				pltevent = PyString_FromString("DELETE");
 
 				PyDict_SetItemString(pltdata, "new", Py_None);
-				pytold = PLyDict_FromTuple(&(proc->result), tdata->tg_trigtuple,
-										   tdata->tg_relation->rd_att);
+				pytold = PLy_input_from_tuple(&proc->result_in,
+											  tdata->tg_trigtuple,
+											  rel_descr);
 				PyDict_SetItemString(pltdata, "old", pytold);
 				Py_DECREF(pytold);
 				*rv = tdata->tg_trigtuple;
@@ -811,12 +781,14 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 			{
 				pltevent = PyString_FromString("UPDATE");
 
-				pytnew = PLyDict_FromTuple(&(proc->result), tdata->tg_newtuple,
-										   tdata->tg_relation->rd_att);
+				pytnew = PLy_input_from_tuple(&proc->result_in,
+											  tdata->tg_newtuple,
+											  rel_descr);
 				PyDict_SetItemString(pltdata, "new", pytnew);
 				Py_DECREF(pytnew);
-				pytold = PLyDict_FromTuple(&(proc->result), tdata->tg_trigtuple,
-										   tdata->tg_relation->rd_att);
+				pytold = PLy_input_from_tuple(&proc->result_in,
+											  tdata->tg_trigtuple,
+											  rel_descr);
 				PyDict_SetItemString(pltdata, "old", pytold);
 				Py_DECREF(pytold);
 				*rv = tdata->tg_newtuple;
@@ -869,6 +841,11 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 			PyObject   *pltarg;
 
 			pltargs = PyList_New(tdata->tg_trigger->tgnargs);
+			if (!pltargs)
+			{
+				Py_DECREF(pltdata);
+				return NULL;
+			}
 			for (i = 0; i < tdata->tg_trigger->tgnargs; i++)
 			{
 				pltarg = PyString_FromString(tdata->tg_trigger->tgargs[i]);
@@ -897,6 +874,9 @@ PLy_trigger_build_args(FunctionCallInfo fcinfo, PLyProcedure *proc, HeapTuple *r
 	return pltdata;
 }
 
+/*
+ * Apply changes requested by a MODIFY return from a trigger function.
+ */
 static HeapTuple
 PLy_modify_tuple(PLyProcedure *proc, PyObject *pltd, TriggerData *tdata,
 				 HeapTuple otup)
@@ -938,7 +918,7 @@ PLy_modify_tuple(PLyProcedure *proc, PyObject *pltd, TriggerData *tdata,
 		plkeys = PyDict_Keys(plntup);
 		nkeys = PyList_Size(plkeys);
 
-		tupdesc = tdata->tg_relation->rd_att;
+		tupdesc = RelationGetDescr(tdata->tg_relation);
 
 		modvalues = (Datum *) palloc0(tupdesc->natts * sizeof(Datum));
 		modnulls = (bool *) palloc0(tupdesc->natts * sizeof(bool));
@@ -974,7 +954,6 @@ PLy_modify_tuple(PLyProcedure *proc, PyObject *pltd, TriggerData *tdata,
 						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 						 errmsg("cannot set system attribute \"%s\"",
 								plattstr)));
-			att = &proc->result.out.r.atts[attn - 1];
 
 			plval = PyDict_GetItem(plntup, platt);
 			if (plval == NULL)
@@ -982,24 +961,12 @@ PLy_modify_tuple(PLyProcedure *proc, PyObject *pltd, TriggerData *tdata,
 
 			Py_INCREF(plval);
 
-			if (plval != Py_None)
-			{
-				modvalues[attn - 1] =
-					(att->func) (att,
-								 tupdesc->attrs[attn - 1]->atttypmod,
-								 plval,
-								 false);
-				modnulls[attn - 1] = false;
-			}
-			else
-			{
-				modvalues[attn - 1] =
-					InputFunctionCall(&att->typfunc,
-									  NULL,
-									  att->typioparam,
-									  tupdesc->attrs[attn - 1]->atttypmod);
-				modnulls[attn - 1] = true;
-			}
+			/* We assume proc->result is set up to convert tuples properly */
+			att = &proc->result.u.tuple.atts[attn - 1];
+
+			modvalues[attn - 1] = PLy_output_convert(att,
+													 plval,
+													 &modnulls[attn - 1]);
 			modrepls[attn - 1] = true;
 
 			Py_DECREF(plval);
diff --git a/src/pl/plpython/plpy_main.c b/src/pl/plpython/plpy_main.c
index 7df50c09c8..6a66eba176 100644
--- a/src/pl/plpython/plpy_main.c
+++ b/src/pl/plpython/plpy_main.c
@@ -60,7 +60,7 @@ static void plpython_error_callback(void *arg);
 static void plpython_inline_error_callback(void *arg);
 static void PLy_init_interp(void);
 
-static PLyExecutionContext *PLy_push_execution_context(void);
+static PLyExecutionContext *PLy_push_execution_context(bool atomic_context);
 static void PLy_pop_execution_context(void);
 
 /* static state for Python library conflict detection */
@@ -167,7 +167,7 @@ PLy_init_interp(void)
 	PLy_interp_globals = PyModule_GetDict(mainmod);
 	PLy_interp_safe_globals = PyDict_New();
 	if (PLy_interp_safe_globals == NULL)
-		PLy_elog(ERROR, "could not create globals");
+		PLy_elog(ERROR, NULL);
 	PyDict_SetItemString(PLy_interp_globals, "GD", PLy_interp_safe_globals);
 	Py_DECREF(mainmod);
 	if (PLy_interp_globals == NULL || PyErr_Occurred())
@@ -219,36 +219,44 @@ plpython2_validator(PG_FUNCTION_ARGS)
 Datum
 plpython_call_handler(PG_FUNCTION_ARGS)
 {
+	bool		nonatomic;
 	Datum		retval;
 	PLyExecutionContext *exec_ctx;
 	ErrorContextCallback plerrcontext;
 
 	PLy_initialize();
 
+	nonatomic = fcinfo->context &&
+		IsA(fcinfo->context, CallContext) &&
+		!castNode(CallContext, fcinfo->context)->atomic;
+
 	/* Note: SPI_finish() happens in plpy_exec.c, which is dubious design */
-	if (SPI_connect() != SPI_OK_CONNECT)
+	if (SPI_connect_ext(nonatomic ? SPI_OPT_NONATOMIC : 0) != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed");
 
 	/*
 	 * Push execution context onto stack.  It is important that this get
 	 * popped again, so avoid putting anything that could throw error between
-	 * here and the PG_TRY.  (plpython_error_callback expects the stack entry
-	 * to be there, so we have to make the context first.)
-	 */
-	exec_ctx = PLy_push_execution_context();
-
-	/*
-	 * Setup error traceback support for ereport()
+	 * here and the PG_TRY.
 	 */
-	plerrcontext.callback = plpython_error_callback;
-	plerrcontext.previous = error_context_stack;
-	error_context_stack = &plerrcontext;
+	exec_ctx = PLy_push_execution_context(!nonatomic);
 
 	PG_TRY();
 	{
 		Oid			funcoid = fcinfo->flinfo->fn_oid;
 		PLyProcedure *proc;
 
+		/*
+		 * Setup error traceback support for ereport().  Note that the PG_TRY
+		 * structure pops this for us again at exit, so we needn't do that
+		 * explicitly, nor do we risk the callback getting called after we've
+		 * destroyed the exec_ctx.
+		 */
+		plerrcontext.callback = plpython_error_callback;
+		plerrcontext.arg = exec_ctx;
+		plerrcontext.previous = error_context_stack;
+		error_context_stack = &plerrcontext;
+
 		if (CALLED_AS_TRIGGER(fcinfo))
 		{
 			Relation	tgrel = ((TriggerData *) fcinfo->context)->tg_relation;
@@ -274,9 +282,7 @@ plpython_call_handler(PG_FUNCTION_ARGS)
 	}
 	PG_END_TRY();
 
-	/* Pop the error context stack */
-	error_context_stack = plerrcontext.previous;
-	/* ... and then the execution context */
+	/* Destroy the execution context */
 	PLy_pop_execution_context();
 
 	return retval;
@@ -303,7 +309,7 @@ plpython_inline_handler(PG_FUNCTION_ARGS)
 	PLy_initialize();
 
 	/* Note: SPI_finish() happens in plpy_exec.c, which is dubious design */
-	if (SPI_connect() != SPI_OK_CONNECT)
+	if (SPI_connect_ext(codeblock->atomic ? 0 : SPI_OPT_NONATOMIC) != SPI_OK_CONNECT)
 		elog(ERROR, "SPI_connect failed");
 
 	MemSet(&fake_fcinfo, 0, sizeof(fake_fcinfo));
@@ -318,26 +324,32 @@ plpython_inline_handler(PG_FUNCTION_ARGS)
 									  ALLOCSET_DEFAULT_SIZES);
 	proc.pyname = MemoryContextStrdup(proc.mcxt, "__plpython_inline_block");
 	proc.langid = codeblock->langOid;
-	proc.result.out.d.typoid = VOIDOID;
 
 	/*
-	 * Push execution context onto stack.  It is important that this get
-	 * popped again, so avoid putting anything that could throw error between
-	 * here and the PG_TRY.  (plpython_inline_error_callback doesn't currently
-	 * need the stack entry, but for consistency with plpython_call_handler we
-	 * do it in this order.)
+	 * This is currently sufficient to get PLy_exec_function to work, but
+	 * someday we might need to be honest and use PLy_output_setup_func.
 	 */
-	exec_ctx = PLy_push_execution_context();
+	proc.result.typoid = VOIDOID;
 
 	/*
-	 * Setup error traceback support for ereport()
+	 * Push execution context onto stack.  It is important that this get
+	 * popped again, so avoid putting anything that could throw error between
+	 * here and the PG_TRY.
 	 */
-	plerrcontext.callback = plpython_inline_error_callback;
-	plerrcontext.previous = error_context_stack;
-	error_context_stack = &plerrcontext;
+	exec_ctx = PLy_push_execution_context(codeblock->atomic);
 
 	PG_TRY();
 	{
+		/*
+		 * Setup error traceback support for ereport().
+		 * plpython_inline_error_callback doesn't currently need exec_ctx, but
+		 * for consistency with plpython_call_handler we do it the same way.
+		 */
+		plerrcontext.callback = plpython_inline_error_callback;
+		plerrcontext.arg = exec_ctx;
+		plerrcontext.previous = error_context_stack;
+		error_context_stack = &plerrcontext;
+
 		PLy_procedure_compile(&proc, codeblock->source_text);
 		exec_ctx->curr_proc = &proc;
 		PLy_exec_function(&fake_fcinfo, &proc);
@@ -351,9 +363,7 @@ plpython_inline_handler(PG_FUNCTION_ARGS)
 	}
 	PG_END_TRY();
 
-	/* Pop the error context stack */
-	error_context_stack = plerrcontext.previous;
-	/* ... and then the execution context */
+	/* Destroy the execution context */
 	PLy_pop_execution_context();
 
 	/* Now clean up the transient procedure we made */
@@ -381,11 +391,17 @@ PLy_procedure_is_trigger(Form_pg_proc procStruct)
 static void
 plpython_error_callback(void *arg)
 {
-	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
+	PLyExecutionContext *exec_ctx = (PLyExecutionContext *) arg;
 
 	if (exec_ctx->curr_proc)
-		errcontext("PL/Python function \"%s\"",
-				   PLy_procedure_name(exec_ctx->curr_proc));
+	{
+		if (exec_ctx->curr_proc->is_procedure)
+			errcontext("PL/Python procedure \"%s\"",
+					   PLy_procedure_name(exec_ctx->curr_proc));
+		else
+			errcontext("PL/Python function \"%s\"",
+					   PLy_procedure_name(exec_ctx->curr_proc));
+	}
 }
 
 static void
@@ -419,12 +435,14 @@ PLy_get_scratch_context(PLyExecutionContext *context)
 }
 
 static PLyExecutionContext *
-PLy_push_execution_context(void)
+PLy_push_execution_context(bool atomic_context)
 {
 	PLyExecutionContext *context;
 
+	/* Pick a memory context similar to what SPI uses. */
 	context = (PLyExecutionContext *)
-		MemoryContextAlloc(TopTransactionContext, sizeof(PLyExecutionContext));
+		MemoryContextAlloc(atomic_context ? TopTransactionContext : PortalContext,
+						   sizeof(PLyExecutionContext));
 	context->curr_proc = NULL;
 	context->scratch_ctx = NULL;
 	context->next = PLy_execution_contexts;
diff --git a/src/pl/plpython/plpy_planobject.h b/src/pl/plpython/plpy_planobject.h
index 5adc957053..729effb163 100644
--- a/src/pl/plpython/plpy_planobject.h
+++ b/src/pl/plpython/plpy_planobject.h
@@ -16,7 +16,7 @@ typedef struct PLyPlanObject
 	int			nargs;
 	Oid		   *types;
 	Datum	   *values;
-	PLyTypeInfo *args;
+	PLyObToDatum *args;
 	MemoryContext mcxt;
 } PLyPlanObject;
 
diff --git a/src/pl/plpython/plpy_plpymodule.c b/src/pl/plpython/plpy_plpymodule.c
index feaf203256..3d7dd13f0c 100644
--- a/src/pl/plpython/plpy_plpymodule.c
+++ b/src/pl/plpython/plpy_plpymodule.c
@@ -6,8 +6,10 @@
 
 #include "postgres.h"
 
+#include "access/xact.h"
 #include "mb/pg_wchar.h"
 #include "utils/builtins.h"
+#include "utils/snapmgr.h"
 
 #include "plpython.h"
 
@@ -15,6 +17,7 @@
 
 #include "plpy_cursorobject.h"
 #include "plpy_elog.h"
+#include "plpy_main.h"
 #include "plpy_planobject.h"
 #include "plpy_resultobject.h"
 #include "plpy_spi.h"
@@ -41,6 +44,8 @@ static PyObject *PLy_fatal(PyObject *self, PyObject *args, PyObject *kw);
 static PyObject *PLy_quote_literal(PyObject *self, PyObject *args);
 static PyObject *PLy_quote_nullable(PyObject *self, PyObject *args);
 static PyObject *PLy_quote_ident(PyObject *self, PyObject *args);
+static PyObject *PLy_commit(PyObject *self, PyObject *args);
+static PyObject *PLy_rollback(PyObject *self, PyObject *args);
 
 
 /* A list of all known exceptions, generated from backend/utils/errcodes.txt */
@@ -95,6 +100,12 @@ static PyMethodDef PLy_methods[] = {
 	 */
 	{"cursor", PLy_cursor, METH_VARARGS, NULL},
 
+	/*
+	 * transaction control
+	 */
+	{"commit", PLy_commit, METH_NOARGS, NULL},
+	{"rollback", PLy_rollback, METH_NOARGS, NULL},
+
 	{NULL, NULL, 0, NULL}
 };
 
@@ -233,7 +244,7 @@ PLy_create_exception(char *name, PyObject *base, PyObject *dict,
 
 	exc = PyErr_NewException(name, base, dict);
 	if (exc == NULL)
-		PLy_elog(ERROR, "could not create exception \"%s\"", name);
+		PLy_elog(ERROR, NULL);
 
 	/*
 	 * PyModule_AddObject does not add a refcount to the object, for some odd
@@ -268,7 +279,7 @@ PLy_generate_spi_exceptions(PyObject *mod, PyObject *base)
 		PyObject   *dict = PyDict_New();
 
 		if (dict == NULL)
-			PLy_elog(ERROR, "could not generate SPI exceptions");
+			PLy_elog(ERROR, NULL);
 
 		sqlstate = PyString_FromString(unpack_sql_state(exception_map[i].sqlstate));
 		if (sqlstate == NULL)
@@ -575,6 +586,43 @@ PLy_output(volatile int level, PyObject *self, PyObject *args, PyObject *kw)
 	/*
 	 * return a legal object so the interpreter will continue on its merry way
 	 */
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
+}
+
+static PyObject *
+PLy_commit(PyObject *self, PyObject *args)
+{
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
+
+	if (ThereArePinnedPortals())
+	   ereport(ERROR,
+			   (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+				errmsg("cannot commit transaction while a cursor is open")));
+
+	SPI_commit();
+	SPI_start_transaction();
+
+	/* was cleared at transaction end, reset pointer */
+	exec_ctx->scratch_ctx = NULL;
+
+	Py_RETURN_NONE;
+}
+
+static PyObject *
+PLy_rollback(PyObject *self, PyObject *args)
+{
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
+
+	if (ThereArePinnedPortals())
+	   ereport(ERROR,
+			   (errcode(ERRCODE_INVALID_TRANSACTION_TERMINATION),
+				errmsg("cannot abort transaction while a cursor is open")));
+
+	SPI_rollback();
+	SPI_start_transaction();
+
+	/* was cleared at transaction end, reset pointer */
+	exec_ctx->scratch_ctx = NULL;
+
+	Py_RETURN_NONE;
 }
diff --git a/src/pl/plpython/plpy_procedure.c b/src/pl/plpython/plpy_procedure.c
index 26acc88b27..4e06413cd4 100644
--- a/src/pl/plpython/plpy_procedure.c
+++ b/src/pl/plpython/plpy_procedure.c
@@ -15,6 +15,7 @@
 #include "utils/builtins.h"
 #include "utils/hsearch.h"
 #include "utils/inval.h"
+#include "utils/lsyscache.h"
 #include "utils/memutils.h"
 #include "utils/syscache.h"
 
@@ -29,7 +30,6 @@
 static HTAB *PLy_procedure_cache = NULL;
 
 static PLyProcedure *PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger);
-static bool PLy_procedure_argument_valid(PLyTypeInfo *arg);
 static bool PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup);
 static char *PLy_procedure_munge_source(const char *name, const char *src);
 
@@ -47,9 +47,7 @@ init_procedure_caches(void)
 }
 
 /*
- * Get the name of the last procedure called by the backend (the
- * innermost, if a plpython procedure call calls the backend and the
- * backend calls another plpython procedure).
+ * PLy_procedure_name: get the name of the specified procedure.
  *
  * NB: this returns the SQL name, not the internal Python procedure name
  */
@@ -165,9 +163,11 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 			*ptr = '_';
 	}
 
-	cxt = AllocSetContextCreate(TopMemoryContext,
-								procName,
-								ALLOCSET_DEFAULT_SIZES);
+	/* Create long-lived context that all procedure info will live in */
+	cxt = AllocSetContextCreateExtended(TopMemoryContext,
+										procName,
+										MEMCONTEXT_COPY_NAME,
+										ALLOCSET_DEFAULT_SIZES);
 
 	oldcxt = MemoryContextSwitchTo(cxt);
 
@@ -188,11 +188,10 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 		proc->fn_tid = procTup->t_self;
 		proc->fn_readonly = (procStruct->provolatile != PROVOLATILE_VOLATILE);
 		proc->is_setof = procStruct->proretset;
-		PLy_typeinfo_init(&proc->result, proc->mcxt);
+		proc->is_procedure = (procStruct->prorettype == InvalidOid);
 		proc->src = NULL;
 		proc->argnames = NULL;
-		for (i = 0; i < FUNC_MAX_ARGS; i++)
-			PLy_typeinfo_init(&proc->args[i], proc->mcxt);
+		proc->args = NULL;
 		proc->nargs = 0;
 		proc->langid = procStruct->prolang;
 		protrftypes_datum = SysCacheGetAttr(PROCOID, procTup,
@@ -207,54 +206,52 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 
 		/*
 		 * get information required for output conversion of the return value,
-		 * but only if this isn't a trigger.
+		 * but only if this isn't a trigger or procedure.
 		 */
-		if (!is_trigger)
+		if (!is_trigger && procStruct->prorettype)
 		{
+			Oid			rettype = procStruct->prorettype;
 			HeapTuple	rvTypeTup;
 			Form_pg_type rvTypeStruct;
 
-			rvTypeTup = SearchSysCache1(TYPEOID,
-										ObjectIdGetDatum(procStruct->prorettype));
+			rvTypeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettype));
 			if (!HeapTupleIsValid(rvTypeTup))
-				elog(ERROR, "cache lookup failed for type %u",
-					 procStruct->prorettype);
+				elog(ERROR, "cache lookup failed for type %u", rettype);
 			rvTypeStruct = (Form_pg_type) GETSTRUCT(rvTypeTup);
 
 			/* Disallow pseudotype result, except for void or record */
 			if (rvTypeStruct->typtype == TYPTYPE_PSEUDO)
 			{
-				if (procStruct->prorettype == TRIGGEROID)
+				if (rettype == VOIDOID ||
+					rettype == RECORDOID)
+					 /* okay */ ;
+				else if (rettype == TRIGGEROID || rettype == EVTTRIGGEROID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("trigger functions can only be called as triggers")));
-				else if (procStruct->prorettype != VOIDOID &&
-						 procStruct->prorettype != RECORDOID)
+				else
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Python functions cannot return type %s",
-									format_type_be(procStruct->prorettype))));
+									format_type_be(rettype))));
 			}
 
-			if (rvTypeStruct->typtype == TYPTYPE_COMPOSITE ||
-				procStruct->prorettype == RECORDOID)
-			{
-				/*
-				 * Tuple: set up later, during first call to
-				 * PLy_function_handler
-				 */
-				proc->result.out.d.typoid = procStruct->prorettype;
-				proc->result.out.d.typmod = -1;
-				proc->result.is_rowtype = 2;
-			}
-			else
-			{
-				/* do the real work */
-				PLy_output_datum_func(&proc->result, rvTypeTup, proc->langid, proc->trftypes);
-			}
+			/* set up output function for procedure result */
+			PLy_output_setup_func(&proc->result, proc->mcxt,
+								  rettype, -1, proc);
 
 			ReleaseSysCache(rvTypeTup);
 		}
+		else
+		{
+			/*
+			 * In a trigger function, we use proc->result and proc->result_in
+			 * for converting tuples, but we don't yet have enough info to set
+			 * them up.  PLy_exec_trigger will deal with it.
+			 */
+			proc->result.typoid = InvalidOid;
+			proc->result_in.typoid = InvalidOid;
+		}
 
 		/*
 		 * Now get information required for input conversion of the
@@ -287,7 +284,10 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 				}
 			}
 
+			/* Allocate arrays for per-input-argument data */
 			proc->argnames = (char **) palloc0(sizeof(char *) * proc->nargs);
+			proc->args = (PLyDatumToOb *) palloc0(sizeof(PLyDatumToOb) * proc->nargs);
+
 			for (i = pos = 0; i < total; i++)
 			{
 				HeapTuple	argTypeTup;
@@ -306,28 +306,17 @@ PLy_procedure_create(HeapTuple procTup, Oid fn_oid, bool is_trigger)
 					elog(ERROR, "cache lookup failed for type %u", types[i]);
 				argTypeStruct = (Form_pg_type) GETSTRUCT(argTypeTup);
 
-				/* check argument type is OK, set up I/O function info */
-				switch (argTypeStruct->typtype)
-				{
-					case TYPTYPE_PSEUDO:
-						/* Disallow pseudotype argument */
-						ereport(ERROR,
-								(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-								 errmsg("PL/Python functions cannot accept type %s",
-										format_type_be(types[i]))));
-						break;
-					case TYPTYPE_COMPOSITE:
-						/* we'll set IO funcs at first call */
-						proc->args[pos].is_rowtype = 2;
-						break;
-					default:
-						PLy_input_datum_func(&(proc->args[pos]),
-											 types[i],
-											 argTypeTup,
-											 proc->langid,
-											 proc->trftypes);
-						break;
-				}
+				/* disallow pseudotype arguments */
+				if (argTypeStruct->typtype == TYPTYPE_PSEUDO)
+					ereport(ERROR,
+							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+							 errmsg("PL/Python functions cannot accept type %s",
+									format_type_be(types[i]))));
+
+				/* set up I/O function info */
+				PLy_input_setup_func(&proc->args[pos], proc->mcxt,
+									 types[i], -1,	/* typmod not known */
+									 proc);
 
 				/* get argument name */
 				proc->argnames[pos] = names ? pstrdup(names[i]) : NULL;
@@ -379,6 +368,8 @@ PLy_procedure_compile(PLyProcedure *proc, const char *src)
 	 * all functions
 	 */
 	proc->statics = PyDict_New();
+	if (!proc->statics)
+		PLy_elog(ERROR, NULL);
 	PyDict_SetItemString(proc->globals, "SD", proc->statics);
 
 	/*
@@ -424,54 +415,12 @@ PLy_procedure_delete(PLyProcedure *proc)
 	MemoryContextDelete(proc->mcxt);
 }
 
-/*
- * Check if our cached information about a datatype is still valid
- */
-static bool
-PLy_procedure_argument_valid(PLyTypeInfo *arg)
-{
-	HeapTuple	relTup;
-	bool		valid;
-
-	/* Nothing to cache unless type is composite */
-	if (arg->is_rowtype != 1)
-		return true;
-
-	/*
-	 * Zero typ_relid means that we got called on an output argument of a
-	 * function returning an unnamed record type; the info for it can't
-	 * change.
-	 */
-	if (!OidIsValid(arg->typ_relid))
-		return true;
-
-	/* Else we should have some cached data */
-	Assert(TransactionIdIsValid(arg->typrel_xmin));
-	Assert(ItemPointerIsValid(&arg->typrel_tid));
-
-	/* Get the pg_class tuple for the data type */
-	relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(arg->typ_relid));
-	if (!HeapTupleIsValid(relTup))
-		elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
-
-	/* If it has changed, the cached data is not valid */
-	valid = (arg->typrel_xmin == HeapTupleHeaderGetRawXmin(relTup->t_data) &&
-			 ItemPointerEquals(&arg->typrel_tid, &relTup->t_self));
-
-	ReleaseSysCache(relTup);
-
-	return valid;
-}
-
 /*
  * Decide whether a cached PLyProcedure struct is still valid
  */
 static bool
 PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup)
 {
-	int			i;
-	bool		valid;
-
 	if (proc == NULL)
 		return false;
 
@@ -480,22 +429,7 @@ PLy_procedure_valid(PLyProcedure *proc, HeapTuple procTup)
 		  ItemPointerEquals(&proc->fn_tid, &procTup->t_self)))
 		return false;
 
-	/* Else check the input argument datatypes */
-	valid = true;
-	for (i = 0; i < proc->nargs; i++)
-	{
-		valid = PLy_procedure_argument_valid(&proc->args[i]);
-
-		/* Short-circuit on first changed argument */
-		if (!valid)
-			break;
-	}
-
-	/* if the output type is composite, it might have changed */
-	if (valid)
-		valid = PLy_procedure_argument_valid(&proc->result);
-
-	return valid;
+	return true;
 }
 
 static char *
diff --git a/src/pl/plpython/plpy_procedure.h b/src/pl/plpython/plpy_procedure.h
index d05944fc39..8968b5c92e 100644
--- a/src/pl/plpython/plpy_procedure.h
+++ b/src/pl/plpython/plpy_procedure.h
@@ -30,13 +30,14 @@ typedef struct PLyProcedure
 	TransactionId fn_xmin;
 	ItemPointerData fn_tid;
 	bool		fn_readonly;
-	bool		is_setof;		/* true, if procedure returns result set */
-	PLyTypeInfo result;			/* also used to store info for trigger tuple
-								 * type */
+	bool		is_setof;		/* true, if function returns result set */
+	bool		is_procedure;
+	PLyObToDatum result;		/* Function result output conversion info */
+	PLyDatumToOb result_in;		/* For converting input tuples in a trigger */
 	char	   *src;			/* textual procedure code, after mangling */
 	char	  **argnames;		/* Argument names */
-	PLyTypeInfo args[FUNC_MAX_ARGS];
-	int			nargs;
+	PLyDatumToOb *args;			/* Argument input conversion info */
+	int			nargs;			/* Number of elements in above arrays */
 	Oid			langid;			/* OID of plpython pg_language entry */
 	List	   *trftypes;		/* OID list of transform types */
 	PyObject   *code;			/* compiled procedure code */
diff --git a/src/pl/plpython/plpy_resultobject.c b/src/pl/plpython/plpy_resultobject.c
index 077bde6dc3..ca70e25689 100644
--- a/src/pl/plpython/plpy_resultobject.c
+++ b/src/pl/plpython/plpy_resultobject.c
@@ -112,6 +112,11 @@ PLy_result_new(void)
 	ob->nrows = PyInt_FromLong(-1);
 	ob->rows = PyList_New(0);
 	ob->tupdesc = NULL;
+	if (!ob->rows)
+	{
+		Py_DECREF(ob);
+		return NULL;
+	}
 
 	return (PyObject *) ob;
 }
@@ -147,8 +152,14 @@ PLy_result_colnames(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
-		PyList_SET_ITEM(list, i, PyString_FromString(NameStr(ob->tupdesc->attrs[i]->attname)));
+	{
+		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
+
+		PyList_SET_ITEM(list, i, PyString_FromString(NameStr(attr->attname)));
+	}
 
 	return list;
 }
@@ -167,8 +178,14 @@ PLy_result_coltypes(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
-		PyList_SET_ITEM(list, i, PyInt_FromLong(ob->tupdesc->attrs[i]->atttypid));
+	{
+		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
+
+		PyList_SET_ITEM(list, i, PyInt_FromLong(attr->atttypid));
+	}
 
 	return list;
 }
@@ -187,8 +204,14 @@ PLy_result_coltypmods(PyObject *self, PyObject *unused)
 	}
 
 	list = PyList_New(ob->tupdesc->natts);
+	if (!list)
+		return NULL;
 	for (i = 0; i < ob->tupdesc->natts; i++)
-		PyList_SET_ITEM(list, i, PyInt_FromLong(ob->tupdesc->attrs[i]->atttypmod));
+	{
+		Form_pg_attribute attr = TupleDescAttr(ob->tupdesc, i);
+
+		PyList_SET_ITEM(list, i, PyInt_FromLong(attr->atttypmod));
+	}
 
 	return list;
 }
diff --git a/src/pl/plpython/plpy_spi.c b/src/pl/plpython/plpy_spi.c
index 955769c5e3..41155fc81e 100644
--- a/src/pl/plpython/plpy_spi.c
+++ b/src/pl/plpython/plpy_spi.c
@@ -46,6 +46,7 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 	PyObject   *list = NULL;
 	PyObject   *volatile optr = NULL;
 	char	   *query;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 	volatile ResourceOwner oldowner;
 	volatile int nargs;
@@ -71,9 +72,9 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 	nargs = list ? PySequence_Length(list) : 0;
 
 	plan->nargs = nargs;
-	plan->types = nargs ? palloc(sizeof(Oid) * nargs) : NULL;
-	plan->values = nargs ? palloc(sizeof(Datum) * nargs) : NULL;
-	plan->args = nargs ? palloc(sizeof(PLyTypeInfo) * nargs) : NULL;
+	plan->types = nargs ? palloc0(sizeof(Oid) * nargs) : NULL;
+	plan->values = nargs ? palloc0(sizeof(Datum) * nargs) : NULL;
+	plan->args = nargs ? palloc0(sizeof(PLyObToDatum) * nargs) : NULL;
 
 	MemoryContextSwitchTo(oldcontext);
 
@@ -85,22 +86,10 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 	PG_TRY();
 	{
 		int			i;
-		PLyExecutionContext *exec_ctx = PLy_current_execution_context();
-
-		/*
-		 * the other loop might throw an exception, if PLyTypeInfo member
-		 * isn't properly initialized the Py_DECREF(plan) will go boom
-		 */
-		for (i = 0; i < nargs; i++)
-		{
-			PLy_typeinfo_init(&plan->args[i], plan->mcxt);
-			plan->values[i] = PointerGetDatum(NULL);
-		}
 
 		for (i = 0; i < nargs; i++)
 		{
 			char	   *sptr;
-			HeapTuple	typeTup;
 			Oid			typeId;
 			int32		typmod;
 
@@ -124,11 +113,6 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 
 			parseTypeString(sptr, &typeId, &typmod, false);
 
-			typeTup = SearchSysCache1(TYPEOID,
-									  ObjectIdGetDatum(typeId));
-			if (!HeapTupleIsValid(typeTup))
-				elog(ERROR, "cache lookup failed for type %u", typeId);
-
 			Py_DECREF(optr);
 
 			/*
@@ -138,8 +122,9 @@ PLy_spi_prepare(PyObject *self, PyObject *args)
 			optr = NULL;
 
 			plan->types[i] = typeId;
-			PLy_output_datum_func(&plan->args[i], typeTup, exec_ctx->curr_proc->langid, exec_ctx->curr_proc->trftypes);
-			ReleaseSysCache(typeTup);
+			PLy_output_setup_func(&plan->args[i], plan->mcxt,
+								  typeId, typmod,
+								  exec_ctx->curr_proc);
 		}
 
 		pg_verifymbstr(query, strlen(query), false);
@@ -253,39 +238,24 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 
 		for (j = 0; j < nargs; j++)
 		{
+			PLyObToDatum *arg = &plan->args[j];
 			PyObject   *elem;
 
 			elem = PySequence_GetItem(list, j);
-			if (elem != Py_None)
+			PG_TRY();
 			{
-				PG_TRY();
-				{
-					plan->values[j] =
-						plan->args[j].out.d.func(&(plan->args[j].out.d),
-												 -1,
-												 elem,
-												 false);
-				}
-				PG_CATCH();
-				{
-					Py_DECREF(elem);
-					PG_RE_THROW();
-				}
-				PG_END_TRY();
+				bool		isnull;
 
-				Py_DECREF(elem);
-				nulls[j] = ' ';
+				plan->values[j] = PLy_output_convert(arg, elem, &isnull);
+				nulls[j] = isnull ? 'n' : ' ';
 			}
-			else
+			PG_CATCH();
 			{
 				Py_DECREF(elem);
-				plan->values[j] =
-					InputFunctionCall(&(plan->args[j].out.d.typfunc),
-									  NULL,
-									  plan->args[j].out.d.typioparam,
-									  -1);
-				nulls[j] = 'n';
+				PG_RE_THROW();
 			}
+			PG_END_TRY();
+			Py_DECREF(elem);
 		}
 
 		rv = SPI_execute_plan(plan->plan, plan->values, nulls,
@@ -306,7 +276,7 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 		 */
 		for (k = 0; k < nargs; k++)
 		{
-			if (!plan->args[k].out.d.typbyval &&
+			if (!plan->args[k].typbyval &&
 				(plan->values[k] != PointerGetDatum(NULL)))
 			{
 				pfree(DatumGetPointer(plan->values[k]));
@@ -321,7 +291,7 @@ PLy_spi_execute_plan(PyObject *ob, PyObject *list, long limit)
 
 	for (i = 0; i < nargs; i++)
 	{
-		if (!plan->args[i].out.d.typbyval &&
+		if (!plan->args[i].typbyval &&
 			(plan->values[i] != PointerGetDatum(NULL)))
 		{
 			pfree(DatumGetPointer(plan->values[i]));
@@ -386,33 +356,38 @@ static PyObject *
 PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 {
 	PLyResultObject *result;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
 	volatile MemoryContext oldcontext;
 
 	result = (PLyResultObject *) PLy_result_new();
+	if (!result)
+	{
+		SPI_freetuptable(tuptable);
+		return NULL;
+	}
 	Py_DECREF(result->status);
 	result->status = PyInt_FromLong(status);
 
 	if (status > 0 && tuptable == NULL)
 	{
 		Py_DECREF(result->nrows);
-		result->nrows = (rows > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) rows) :
-			PyInt_FromLong((long) rows);
+		result->nrows = PyLong_FromUnsignedLongLong(rows);
 	}
 	else if (status > 0 && tuptable != NULL)
 	{
-		PLyTypeInfo args;
+		PLyDatumToOb ininfo;
 		MemoryContext cxt;
 
 		Py_DECREF(result->nrows);
-		result->nrows = (rows > (uint64) LONG_MAX) ?
-			PyFloat_FromDouble((double) rows) :
-			PyInt_FromLong((long) rows);
+		result->nrows = PyLong_FromUnsignedLongLong(rows);
 
 		cxt = AllocSetContextCreate(CurrentMemoryContext,
 									"PL/Python temp context",
 									ALLOCSET_DEFAULT_SIZES);
-		PLy_typeinfo_init(&args, cxt);
+
+		/* Initialize for converting result tuples to Python */
+		PLy_input_setup_func(&ininfo, cxt, RECORDOID, -1,
+							 exec_ctx->curr_proc);
 
 		oldcontext = CurrentMemoryContext;
 		PG_TRY();
@@ -435,15 +410,19 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 
 				Py_DECREF(result->rows);
 				result->rows = PyList_New(rows);
-
-				PLy_input_tuple_funcs(&args, tuptable->tupdesc);
-				for (i = 0; i < rows; i++)
+				if (result->rows)
 				{
-					PyObject   *row = PLyDict_FromTuple(&args,
-														tuptable->vals[i],
-														tuptable->tupdesc);
+					PLy_input_setup_tuple(&ininfo, tuptable->tupdesc,
+										  exec_ctx->curr_proc);
+
+					for (i = 0; i < rows; i++)
+					{
+						PyObject   *row = PLy_input_from_tuple(&ininfo,
+															   tuptable->vals[i],
+															   tuptable->tupdesc);
 
-					PyList_SetItem(result->rows, i, row);
+						PyList_SetItem(result->rows, i, row);
+					}
 				}
 			}
 
@@ -470,6 +449,13 @@ PLy_spi_execute_fetch_result(SPITupleTable *tuptable, uint64 rows, int status)
 
 		MemoryContextDelete(cxt);
 		SPI_freetuptable(tuptable);
+
+		/* in case PyList_New() failed above */
+		if (!result->rows)
+		{
+			Py_DECREF(result);
+			result = NULL;
+		}
 	}
 
 	return (PyObject *) result;
diff --git a/src/pl/plpython/plpy_spi.h b/src/pl/plpython/plpy_spi.h
index d6b0a4707b..5a0eef78dc 100644
--- a/src/pl/plpython/plpy_spi.h
+++ b/src/pl/plpython/plpy_spi.h
@@ -5,7 +5,6 @@
 #ifndef PLPY_SPI_H
 #define PLPY_SPI_H
 
-#include "utils/palloc.h"
 #include "utils/resowner.h"
 
 extern PyObject *PLy_spi_prepare(PyObject *self, PyObject *args);
diff --git a/src/pl/plpython/plpy_subxactobject.c b/src/pl/plpython/plpy_subxactobject.c
index 9f1caa87d9..331d2b859c 100644
--- a/src/pl/plpython/plpy_subxactobject.c
+++ b/src/pl/plpython/plpy_subxactobject.c
@@ -212,6 +212,5 @@ PLy_subtransaction_exit(PyObject *self, PyObject *args)
 	CurrentResourceOwner = subxactdata->oldowner;
 	pfree(subxactdata);
 
-	Py_INCREF(Py_None);
-	return Py_None;
+	Py_RETURN_NONE;
 }
diff --git a/src/pl/plpython/plpy_typeio.c b/src/pl/plpython/plpy_typeio.c
index 91ddcaa7b9..d6a6a849c3 100644
--- a/src/pl/plpython/plpy_typeio.c
+++ b/src/pl/plpython/plpy_typeio.c
@@ -7,19 +7,15 @@
 #include "postgres.h"
 
 #include "access/htup_details.h"
-#include "access/transam.h"
 #include "catalog/pg_type.h"
 #include "funcapi.h"
 #include "mb/pg_wchar.h"
-#include "parser/parse_type.h"
+#include "miscadmin.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/fmgroids.h"
 #include "utils/lsyscache.h"
 #include "utils/memutils.h"
-#include "utils/numeric.h"
-#include "utils/syscache.h"
-#include "utils/typcache.h"
 
 #include "plpython.h"
 
@@ -29,10 +25,6 @@
 #include "plpy_main.h"
 
 
-/* I/O function caching */
-static void PLy_input_datum_func2(PLyDatumToOb *arg, MemoryContext arg_mcxt, Oid typeOid, HeapTuple typeTup, Oid langid, List *trftypes);
-static void PLy_output_datum_func2(PLyObToDatum *arg, MemoryContext arg_mcxt, HeapTuple typeTup, Oid langid, List *trftypes);
-
 /* conversion from Datums to Python objects */
 static PyObject *PLyBool_FromBool(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyFloat_FromFloat4(PLyDatumToOb *arg, Datum d);
@@ -43,360 +35,365 @@ static PyObject *PLyInt_FromInt32(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyLong_FromInt64(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyLong_FromOid(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyBytes_FromBytea(PLyDatumToOb *arg, Datum d);
-static PyObject *PLyString_FromDatum(PLyDatumToOb *arg, Datum d);
+static PyObject *PLyString_FromScalar(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyObject_FromTransform(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyList_FromArray(PLyDatumToOb *arg, Datum d);
 static PyObject *PLyList_FromArray_recurse(PLyDatumToOb *elm, int *dims, int ndim, int dim,
 						  char **dataptr_p, bits8 **bitmap_p, int *bitmask_p);
+static PyObject *PLyDict_FromComposite(PLyDatumToOb *arg, Datum d);
+static PyObject *PLyDict_FromTuple(PLyDatumToOb *arg, HeapTuple tuple, TupleDesc desc);
 
 /* conversion from Python objects to Datums */
-static Datum PLyObject_ToBool(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
-static Datum PLyObject_ToBytea(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
-static Datum PLyObject_ToComposite(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
-static Datum PLyObject_ToDatum(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
-static Datum PLyObject_ToTransform(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
-static Datum PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray);
+static Datum PLyObject_ToBool(PLyObToDatum *arg, PyObject *plrv,
+				 bool *isnull, bool inarray);
+static Datum PLyObject_ToBytea(PLyObToDatum *arg, PyObject *plrv,
+				  bool *isnull, bool inarray);
+static Datum PLyObject_ToComposite(PLyObToDatum *arg, PyObject *plrv,
+					  bool *isnull, bool inarray);
+static Datum PLyObject_ToScalar(PLyObToDatum *arg, PyObject *plrv,
+				   bool *isnull, bool inarray);
+static Datum PLyObject_ToDomain(PLyObToDatum *arg, PyObject *plrv,
+				   bool *isnull, bool inarray);
+static Datum PLyObject_ToTransform(PLyObToDatum *arg, PyObject *plrv,
+					  bool *isnull, bool inarray);
+static Datum PLySequence_ToArray(PLyObToDatum *arg, PyObject *plrv,
+					bool *isnull, bool inarray);
 static void PLySequence_ToArray_recurse(PLyObToDatum *elm, PyObject *list,
 							int *dims, int ndim, int dim,
 							Datum *elems, bool *nulls, int *currelem);
 
-/* conversion from Python objects to composite Datums (used by triggers and SRFs) */
-static Datum PLyString_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *string, bool inarray);
-static Datum PLyMapping_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping);
-static Datum PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence);
-static Datum PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object, bool inarray);
+/* conversion from Python objects to composite Datums */
+static Datum PLyString_ToComposite(PLyObToDatum *arg, PyObject *string, bool inarray);
+static Datum PLyMapping_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *mapping);
+static Datum PLySequence_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *sequence);
+static Datum PLyGenericObject_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *object, bool inarray);
 
-void
-PLy_typeinfo_init(PLyTypeInfo *arg, MemoryContext mcxt)
-{
-	arg->is_rowtype = -1;
-	arg->in.r.natts = arg->out.r.natts = 0;
-	arg->in.r.atts = NULL;
-	arg->out.r.atts = NULL;
-	arg->typ_relid = InvalidOid;
-	arg->typrel_xmin = InvalidTransactionId;
-	ItemPointerSetInvalid(&arg->typrel_tid);
-	arg->mcxt = mcxt;
-}
 
 /*
  * Conversion functions.  Remember output from Python is input to
  * PostgreSQL, and vice versa.
  */
-void
-PLy_input_datum_func(PLyTypeInfo *arg, Oid typeOid, HeapTuple typeTup, Oid langid, List *trftypes)
+
+/*
+ * Perform input conversion, given correctly-set-up state information.
+ *
+ * This is the outer-level entry point for any input conversion.  Internally,
+ * the conversion functions recurse directly to each other.
+ */
+PyObject *
+PLy_input_convert(PLyDatumToOb *arg, Datum val)
 {
-	if (arg->is_rowtype > 0)
-		elog(ERROR, "PLyTypeInfo struct is initialized for Tuple");
-	arg->is_rowtype = 0;
-	PLy_input_datum_func2(&(arg->in.d), arg->mcxt, typeOid, typeTup, langid, trftypes);
+	PyObject   *result;
+	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
+	MemoryContext scratch_context = PLy_get_scratch_context(exec_ctx);
+	MemoryContext oldcontext;
+
+	/*
+	 * Do the work in the scratch context to avoid leaking memory from the
+	 * datatype output function calls.  (The individual PLyDatumToObFunc
+	 * functions can't reset the scratch context, because they recurse and an
+	 * inner one might clobber data an outer one still needs.  So we do it
+	 * once at the outermost recursion level.)
+	 *
+	 * We reset the scratch context before, not after, each conversion cycle.
+	 * This way we aren't on the hook to release a Python refcount on the
+	 * result object in case MemoryContextReset throws an error.
+	 */
+	MemoryContextReset(scratch_context);
+
+	oldcontext = MemoryContextSwitchTo(scratch_context);
+
+	result = arg->func(arg, val);
+
+	MemoryContextSwitchTo(oldcontext);
+
+	return result;
 }
 
-void
-PLy_output_datum_func(PLyTypeInfo *arg, HeapTuple typeTup, Oid langid, List *trftypes)
+/*
+ * Perform output conversion, given correctly-set-up state information.
+ *
+ * This is the outer-level entry point for any output conversion.  Internally,
+ * the conversion functions recurse directly to each other.
+ *
+ * The result, as well as any cruft generated along the way, are in the
+ * current memory context.  Caller is responsible for cleanup.
+ */
+Datum
+PLy_output_convert(PLyObToDatum *arg, PyObject *val, bool *isnull)
 {
-	if (arg->is_rowtype > 0)
-		elog(ERROR, "PLyTypeInfo struct is initialized for a Tuple");
-	arg->is_rowtype = 0;
-	PLy_output_datum_func2(&(arg->out.d), arg->mcxt, typeTup, langid, trftypes);
+	/* at outer level, we are not considering an array element */
+	return arg->func(arg, val, isnull, false);
 }
 
-void
-PLy_input_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
+/*
+ * Transform a tuple into a Python dict object.
+ *
+ * Note: the tupdesc must match the one used to set up *arg.  We could
+ * insist that this function lookup the tupdesc from what is in *arg,
+ * but in practice all callers have the right tupdesc available.
+ */
+PyObject *
+PLy_input_from_tuple(PLyDatumToOb *arg, HeapTuple tuple, TupleDesc desc)
 {
-	int			i;
+	PyObject   *dict;
 	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
-	MemoryContext oldcxt;
+	MemoryContext scratch_context = PLy_get_scratch_context(exec_ctx);
+	MemoryContext oldcontext;
 
-	oldcxt = MemoryContextSwitchTo(arg->mcxt);
+	/*
+	 * As in PLy_input_convert, do the work in the scratch context.
+	 */
+	MemoryContextReset(scratch_context);
 
-	if (arg->is_rowtype == 0)
-		elog(ERROR, "PLyTypeInfo struct is initialized for a Datum");
-	arg->is_rowtype = 1;
+	oldcontext = MemoryContextSwitchTo(scratch_context);
 
-	if (arg->in.r.natts != desc->natts)
-	{
-		if (arg->in.r.atts)
-			pfree(arg->in.r.atts);
-		arg->in.r.natts = desc->natts;
-		arg->in.r.atts = palloc0(desc->natts * sizeof(PLyDatumToOb));
-	}
+	dict = PLyDict_FromTuple(arg, tuple, desc);
 
-	/* Can this be an unnamed tuple? If not, then an Assert would be enough */
-	if (desc->tdtypmod != -1)
-		elog(ERROR, "received unnamed record type as input");
+	MemoryContextSwitchTo(oldcontext);
 
-	Assert(OidIsValid(desc->tdtypeid));
+	return dict;
+}
 
-	/*
-	 * RECORDOID means we got called to create input functions for a tuple
-	 * fetched by plpy.execute or for an anonymous record type
-	 */
-	if (desc->tdtypeid != RECORDOID)
-	{
-		HeapTuple	relTup;
+/*
+ * Initialize, or re-initialize, per-column input info for a composite type.
+ *
+ * This is separate from PLy_input_setup_func() because in cases involving
+ * anonymous record types, we need to be passed the tupdesc explicitly.
+ * It's caller's responsibility that the tupdesc has adequate lifespan
+ * in such cases.  If the tupdesc is for a named composite or registered
+ * record type, it does not need to be long-lived.
+ */
+void
+PLy_input_setup_tuple(PLyDatumToOb *arg, TupleDesc desc, PLyProcedure *proc)
+{
+	int			i;
 
-		/* Get the pg_class tuple corresponding to the type of the input */
-		arg->typ_relid = typeidTypeRelid(desc->tdtypeid);
-		relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(arg->typ_relid));
-		if (!HeapTupleIsValid(relTup))
-			elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
+	/* We should be working on a previously-set-up struct */
+	Assert(arg->func == PLyDict_FromComposite);
 
-		/* Remember XMIN and TID for later validation if cache is still OK */
-		arg->typrel_xmin = HeapTupleHeaderGetRawXmin(relTup->t_data);
-		arg->typrel_tid = relTup->t_self;
+	/* Save pointer to tupdesc, but only if this is an anonymous record type */
+	if (arg->typoid == RECORDOID && arg->typmod < 0)
+		arg->u.tuple.recdesc = desc;
 
-		ReleaseSysCache(relTup);
+	/* (Re)allocate atts array as needed */
+	if (arg->u.tuple.natts != desc->natts)
+	{
+		if (arg->u.tuple.atts)
+			pfree(arg->u.tuple.atts);
+		arg->u.tuple.natts = desc->natts;
+		arg->u.tuple.atts = (PLyDatumToOb *)
+			MemoryContextAllocZero(arg->mcxt,
+								   desc->natts * sizeof(PLyDatumToOb));
 	}
 
+	/* Fill the atts entries, except for dropped columns */
 	for (i = 0; i < desc->natts; i++)
 	{
-		HeapTuple	typeTup;
+		Form_pg_attribute attr = TupleDescAttr(desc, i);
+		PLyDatumToOb *att = &arg->u.tuple.atts[i];
 
-		if (desc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 			continue;
 
-		if (arg->in.r.atts[i].typoid == desc->attrs[i]->atttypid)
+		if (att->typoid == attr->atttypid && att->typmod == attr->atttypmod)
 			continue;			/* already set up this entry */
 
-		typeTup = SearchSysCache1(TYPEOID,
-								  ObjectIdGetDatum(desc->attrs[i]->atttypid));
-		if (!HeapTupleIsValid(typeTup))
-			elog(ERROR, "cache lookup failed for type %u",
-				 desc->attrs[i]->atttypid);
-
-		PLy_input_datum_func2(&(arg->in.r.atts[i]), arg->mcxt,
-							  desc->attrs[i]->atttypid,
-							  typeTup,
-							  exec_ctx->curr_proc->langid,
-							  exec_ctx->curr_proc->trftypes);
-
-		ReleaseSysCache(typeTup);
+		PLy_input_setup_func(att, arg->mcxt,
+							 attr->atttypid, attr->atttypmod,
+							 proc);
 	}
-
-	MemoryContextSwitchTo(oldcxt);
 }
 
+/*
+ * Initialize, or re-initialize, per-column output info for a composite type.
+ *
+ * This is separate from PLy_output_setup_func() because in cases involving
+ * anonymous record types, we need to be passed the tupdesc explicitly.
+ * It's caller's responsibility that the tupdesc has adequate lifespan
+ * in such cases.  If the tupdesc is for a named composite or registered
+ * record type, it does not need to be long-lived.
+ */
 void
-PLy_output_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc)
+PLy_output_setup_tuple(PLyObToDatum *arg, TupleDesc desc, PLyProcedure *proc)
 {
 	int			i;
-	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
-	MemoryContext oldcxt;
 
-	oldcxt = MemoryContextSwitchTo(arg->mcxt);
+	/* We should be working on a previously-set-up struct */
+	Assert(arg->func == PLyObject_ToComposite);
 
-	if (arg->is_rowtype == 0)
-		elog(ERROR, "PLyTypeInfo struct is initialized for a Datum");
-	arg->is_rowtype = 1;
+	/* Save pointer to tupdesc, but only if this is an anonymous record type */
+	if (arg->typoid == RECORDOID && arg->typmod < 0)
+		arg->u.tuple.recdesc = desc;
 
-	if (arg->out.r.natts != desc->natts)
+	/* (Re)allocate atts array as needed */
+	if (arg->u.tuple.natts != desc->natts)
 	{
-		if (arg->out.r.atts)
-			pfree(arg->out.r.atts);
-		arg->out.r.natts = desc->natts;
-		arg->out.r.atts = palloc0(desc->natts * sizeof(PLyObToDatum));
-	}
-
-	Assert(OidIsValid(desc->tdtypeid));
-
-	/*
-	 * RECORDOID means we got called to create output functions for an
-	 * anonymous record type
-	 */
-	if (desc->tdtypeid != RECORDOID)
-	{
-		HeapTuple	relTup;
-
-		/* Get the pg_class tuple corresponding to the type of the output */
-		arg->typ_relid = typeidTypeRelid(desc->tdtypeid);
-		relTup = SearchSysCache1(RELOID, ObjectIdGetDatum(arg->typ_relid));
-		if (!HeapTupleIsValid(relTup))
-			elog(ERROR, "cache lookup failed for relation %u", arg->typ_relid);
-
-		/* Remember XMIN and TID for later validation if cache is still OK */
-		arg->typrel_xmin = HeapTupleHeaderGetRawXmin(relTup->t_data);
-		arg->typrel_tid = relTup->t_self;
-
-		ReleaseSysCache(relTup);
+		if (arg->u.tuple.atts)
+			pfree(arg->u.tuple.atts);
+		arg->u.tuple.natts = desc->natts;
+		arg->u.tuple.atts = (PLyObToDatum *)
+			MemoryContextAllocZero(arg->mcxt,
+								   desc->natts * sizeof(PLyObToDatum));
 	}
 
+	/* Fill the atts entries, except for dropped columns */
 	for (i = 0; i < desc->natts; i++)
 	{
-		HeapTuple	typeTup;
+		Form_pg_attribute attr = TupleDescAttr(desc, i);
+		PLyObToDatum *att = &arg->u.tuple.atts[i];
 
-		if (desc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 			continue;
 
-		if (arg->out.r.atts[i].typoid == desc->attrs[i]->atttypid)
+		if (att->typoid == attr->atttypid && att->typmod == attr->atttypmod)
 			continue;			/* already set up this entry */
 
-		typeTup = SearchSysCache1(TYPEOID,
-								  ObjectIdGetDatum(desc->attrs[i]->atttypid));
-		if (!HeapTupleIsValid(typeTup))
-			elog(ERROR, "cache lookup failed for type %u",
-				 desc->attrs[i]->atttypid);
-
-		PLy_output_datum_func2(&(arg->out.r.atts[i]), arg->mcxt, typeTup,
-							   exec_ctx->curr_proc->langid,
-							   exec_ctx->curr_proc->trftypes);
-
-		ReleaseSysCache(typeTup);
+		PLy_output_setup_func(att, arg->mcxt,
+							  attr->atttypid, attr->atttypmod,
+							  proc);
 	}
-
-	MemoryContextSwitchTo(oldcxt);
 }
 
+/*
+ * Set up output info for a PL/Python function returning record.
+ *
+ * Note: the given tupdesc is not necessarily long-lived.
+ */
 void
-PLy_output_record_funcs(PLyTypeInfo *arg, TupleDesc desc)
+PLy_output_setup_record(PLyObToDatum *arg, TupleDesc desc, PLyProcedure *proc)
 {
+	/* Makes no sense unless RECORD */
+	Assert(arg->typoid == RECORDOID);
+	Assert(desc->tdtypeid == RECORDOID);
+
 	/*
-	 * If the output record functions are already set, we just have to check
-	 * if the record descriptor has not changed
+	 * Bless the record type if not already done.  We'd have to do this anyway
+	 * to return a tuple, so we might as well force the issue so we can use
+	 * the known-record-type code path.
 	 */
-	if ((arg->is_rowtype == 1) &&
-		(arg->out.d.typmod != -1) &&
-		(arg->out.d.typmod == desc->tdtypmod))
-		return;
-
-	/* bless the record to make it known to the typcache lookup code */
 	BlessTupleDesc(desc);
-	/* save the freshly generated typmod */
-	arg->out.d.typmod = desc->tdtypmod;
-	/* proceed with normal I/O function caching */
-	PLy_output_tuple_funcs(arg, desc);
 
 	/*
-	 * it should change is_rowtype to 1, so we won't go through this again
-	 * unless the output record description changes
+	 * Update arg->typmod, and clear the recdesc link if it's changed. The
+	 * next call of PLyObject_ToComposite will look up a long-lived tupdesc
+	 * for the record type.
 	 */
-	Assert(arg->is_rowtype == 1);
+	arg->typmod = desc->tdtypmod;
+	if (arg->u.tuple.recdesc &&
+		arg->u.tuple.recdesc->tdtypmod != arg->typmod)
+		arg->u.tuple.recdesc = NULL;
+
+	/* Update derived data if necessary */
+	PLy_output_setup_tuple(arg, desc, proc);
 }
 
 /*
- * Transform a tuple into a Python dict object.
+ * Recursively initialize the PLyObToDatum structure(s) needed to construct
+ * a SQL value of the specified typeOid/typmod from a Python value.
+ * (But note that at this point we may have RECORDOID/-1, ie, an indeterminate
+ * record type.)
+ * proc is used to look up transform functions.
  */
-PyObject *
-PLyDict_FromTuple(PLyTypeInfo *info, HeapTuple tuple, TupleDesc desc)
+void
+PLy_output_setup_func(PLyObToDatum *arg, MemoryContext arg_mcxt,
+					  Oid typeOid, int32 typmod,
+					  PLyProcedure *proc)
 {
-	PyObject   *volatile dict;
-	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
-	MemoryContext scratch_context = PLy_get_scratch_context(exec_ctx);
-	MemoryContext oldcontext = CurrentMemoryContext;
+	TypeCacheEntry *typentry;
+	char		typtype;
+	Oid			trfuncid;
+	Oid			typinput;
 
-	if (info->is_rowtype != 1)
-		elog(ERROR, "PLyTypeInfo structure describes a datum");
+	/* Since this is recursive, it could theoretically be driven to overflow */
+	check_stack_depth();
 
-	dict = PyDict_New();
-	if (dict == NULL)
-		PLy_elog(ERROR, "could not create new dictionary");
+	arg->typoid = typeOid;
+	arg->typmod = typmod;
+	arg->mcxt = arg_mcxt;
 
-	PG_TRY();
+	/*
+	 * Fetch typcache entry for the target type, asking for whatever info
+	 * we'll need later.  RECORD is a special case: just treat it as composite
+	 * without bothering with the typcache entry.
+	 */
+	if (typeOid != RECORDOID)
 	{
-		int			i;
-
-		/*
-		 * Do the work in the scratch context to avoid leaking memory from the
-		 * datatype output function calls.
-		 */
-		MemoryContextSwitchTo(scratch_context);
-		for (i = 0; i < info->in.r.natts; i++)
-		{
-			char	   *key;
-			Datum		vattr;
-			bool		is_null;
-			PyObject   *value;
-
-			if (desc->attrs[i]->attisdropped)
-				continue;
-
-			key = NameStr(desc->attrs[i]->attname);
-			vattr = heap_getattr(tuple, (i + 1), desc, &is_null);
-
-			if (is_null || info->in.r.atts[i].func == NULL)
-				PyDict_SetItemString(dict, key, Py_None);
-			else
-			{
-				value = (info->in.r.atts[i].func) (&info->in.r.atts[i], vattr);
-				PyDict_SetItemString(dict, key, value);
-				Py_DECREF(value);
-			}
-		}
-		MemoryContextSwitchTo(oldcontext);
-		MemoryContextReset(scratch_context);
+		typentry = lookup_type_cache(typeOid, TYPECACHE_DOMAIN_BASE_INFO);
+		typtype = typentry->typtype;
+		arg->typbyval = typentry->typbyval;
+		arg->typlen = typentry->typlen;
+		arg->typalign = typentry->typalign;
 	}
-	PG_CATCH();
+	else
 	{
-		MemoryContextSwitchTo(oldcontext);
-		Py_DECREF(dict);
-		PG_RE_THROW();
+		typentry = NULL;
+		typtype = TYPTYPE_COMPOSITE;
+		/* hard-wired knowledge about type RECORD: */
+		arg->typbyval = false;
+		arg->typlen = -1;
+		arg->typalign = 'd';
 	}
-	PG_END_TRY();
-
-	return dict;
-}
-
-/*
- *	Convert a Python object to a composite Datum, using all supported
- *	conversion methods: composite as a string, as a sequence, as a mapping or
- *	as an object that has __getattr__ support.
- */
-Datum
-PLyObject_ToCompositeDatum(PLyTypeInfo *info, TupleDesc desc, PyObject *plrv, bool inarray)
-{
-	Datum		datum;
-
-	if (PyString_Check(plrv) || PyUnicode_Check(plrv))
-		datum = PLyString_ToComposite(info, desc, plrv, inarray);
-	else if (PySequence_Check(plrv))
-		/* composite type as sequence (tuple, list etc) */
-		datum = PLySequence_ToComposite(info, desc, plrv);
-	else if (PyMapping_Check(plrv))
-		/* composite type as mapping (currently only dict) */
-		datum = PLyMapping_ToComposite(info, desc, plrv);
-	else
-		/* returned as smth, must provide method __getattr__(name) */
-		datum = PLyGenericObject_ToComposite(info, desc, plrv, inarray);
-
-	return datum;
-}
-
-static void
-PLy_output_datum_func2(PLyObToDatum *arg, MemoryContext arg_mcxt, HeapTuple typeTup, Oid langid, List *trftypes)
-{
-	Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
-	Oid			element_type;
-	Oid			base_type;
-	Oid			funcid;
-	MemoryContext oldcxt;
-
-	oldcxt = MemoryContextSwitchTo(arg_mcxt);
-
-	fmgr_info_cxt(typeStruct->typinput, &arg->typfunc, arg_mcxt);
-	arg->typoid = HeapTupleGetOid(typeTup);
-	arg->typmod = -1;
-	arg->typioparam = getTypeIOParam(typeTup);
-	arg->typbyval = typeStruct->typbyval;
-
-	element_type = get_base_element_type(arg->typoid);
-	base_type = getBaseType(element_type ? element_type : arg->typoid);
 
 	/*
-	 * Select a conversion function to convert Python objects to PostgreSQL
-	 * datums.
+	 * Choose conversion method.  Note that transform functions are checked
+	 * for composite and scalar types, but not for arrays or domains.  This is
+	 * somewhat historical, but we'd have a problem allowing them on domains,
+	 * since we drill down through all levels of a domain nest without looking
+	 * at the intermediate levels at all.
 	 */
-
-	if ((funcid = get_transform_tosql(base_type, langid, trftypes)))
+	if (typtype == TYPTYPE_DOMAIN)
+	{
+		/* Domain */
+		arg->func = PLyObject_ToDomain;
+		arg->u.domain.domain_info = NULL;
+		/* Recursively set up conversion info for the element type */
+		arg->u.domain.base = (PLyObToDatum *)
+			MemoryContextAllocZero(arg_mcxt, sizeof(PLyObToDatum));
+		PLy_output_setup_func(arg->u.domain.base, arg_mcxt,
+							  typentry->domainBaseType,
+							  typentry->domainBaseTypmod,
+							  proc);
+	}
+	else if (typentry &&
+			 OidIsValid(typentry->typelem) && typentry->typlen == -1)
+	{
+		/* Standard varlena array (cf. get_element_type) */
+		arg->func = PLySequence_ToArray;
+		/* Get base type OID to insert into constructed array */
+		/* (note this might not be the same as the immediate child type) */
+		arg->u.array.elmbasetype = getBaseType(typentry->typelem);
+		/* Recursively set up conversion info for the element type */
+		arg->u.array.elm = (PLyObToDatum *)
+			MemoryContextAllocZero(arg_mcxt, sizeof(PLyObToDatum));
+		PLy_output_setup_func(arg->u.array.elm, arg_mcxt,
+							  typentry->typelem, typmod,
+							  proc);
+	}
+	else if ((trfuncid = get_transform_tosql(typeOid,
+											 proc->langid,
+											 proc->trftypes)))
 	{
 		arg->func = PLyObject_ToTransform;
-		fmgr_info_cxt(funcid, &arg->typtransform, arg_mcxt);
+		fmgr_info_cxt(trfuncid, &arg->u.transform.typtransform, arg_mcxt);
 	}
-	else if (typeStruct->typtype == TYPTYPE_COMPOSITE)
+	else if (typtype == TYPTYPE_COMPOSITE)
 	{
+		/* Named composite type, or RECORD */
 		arg->func = PLyObject_ToComposite;
+		/* We'll set up the per-field data later */
+		arg->u.tuple.recdesc = NULL;
+		arg->u.tuple.typentry = typentry;
+		arg->u.tuple.tupdescid = INVALID_TUPLEDESC_IDENTIFIER;
+		arg->u.tuple.atts = NULL;
+		arg->u.tuple.natts = 0;
+		/* Mark this invalid till needed, too */
+		arg->u.tuple.recinfunc.fn_oid = InvalidOid;
 	}
 	else
-		switch (base_type)
+	{
+		/* Scalar type, but we have a couple of special cases */
+		switch (typeOid)
 		{
 			case BOOLOID:
 				arg->func = PLyObject_ToBool;
@@ -405,66 +402,111 @@ PLy_output_datum_func2(PLyObToDatum *arg, MemoryContext arg_mcxt, HeapTuple type
 				arg->func = PLyObject_ToBytea;
 				break;
 			default:
-				arg->func = PLyObject_ToDatum;
+				arg->func = PLyObject_ToScalar;
+				getTypeInputInfo(typeOid, &typinput, &arg->u.scalar.typioparam);
+				fmgr_info_cxt(typinput, &arg->u.scalar.typfunc, arg_mcxt);
 				break;
 		}
-
-	if (element_type)
-	{
-		char		dummy_delim;
-		Oid			funcid;
-
-		if (type_is_rowtype(element_type))
-			arg->func = PLyObject_ToComposite;
-
-		arg->elm = palloc0(sizeof(*arg->elm));
-		arg->elm->func = arg->func;
-		arg->elm->typtransform = arg->typtransform;
-		arg->func = PLySequence_ToArray;
-
-		arg->elm->typoid = element_type;
-		arg->elm->typmod = -1;
-		get_type_io_data(element_type, IOFunc_input,
-						 &arg->elm->typlen, &arg->elm->typbyval, &arg->elm->typalign, &dummy_delim,
-						 &arg->elm->typioparam, &funcid);
-		fmgr_info_cxt(funcid, &arg->elm->typfunc, arg_mcxt);
 	}
-
-	MemoryContextSwitchTo(oldcxt);
 }
 
-static void
-PLy_input_datum_func2(PLyDatumToOb *arg, MemoryContext arg_mcxt, Oid typeOid, HeapTuple typeTup, Oid langid, List *trftypes)
+/*
+ * Recursively initialize the PLyDatumToOb structure(s) needed to construct
+ * a Python value from a SQL value of the specified typeOid/typmod.
+ * (But note that at this point we may have RECORDOID/-1, ie, an indeterminate
+ * record type.)
+ * proc is used to look up transform functions.
+ */
+void
+PLy_input_setup_func(PLyDatumToOb *arg, MemoryContext arg_mcxt,
+					 Oid typeOid, int32 typmod,
+					 PLyProcedure *proc)
 {
-	Form_pg_type typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
-	Oid			element_type;
-	Oid			base_type;
-	Oid			funcid;
-	MemoryContext oldcxt;
-
-	oldcxt = MemoryContextSwitchTo(arg_mcxt);
+	TypeCacheEntry *typentry;
+	char		typtype;
+	Oid			trfuncid;
+	Oid			typoutput;
+	bool		typisvarlena;
 
-	/* Get the type's conversion information */
-	fmgr_info_cxt(typeStruct->typoutput, &arg->typfunc, arg_mcxt);
-	arg->typoid = HeapTupleGetOid(typeTup);
-	arg->typmod = -1;
-	arg->typioparam = getTypeIOParam(typeTup);
-	arg->typbyval = typeStruct->typbyval;
-	arg->typlen = typeStruct->typlen;
-	arg->typalign = typeStruct->typalign;
+	/* Since this is recursive, it could theoretically be driven to overflow */
+	check_stack_depth();
 
-	/* Determine which kind of Python object we will convert to */
+	arg->typoid = typeOid;
+	arg->typmod = typmod;
+	arg->mcxt = arg_mcxt;
 
-	element_type = get_base_element_type(typeOid);
-	base_type = getBaseType(element_type ? element_type : typeOid);
+	/*
+	 * Fetch typcache entry for the target type, asking for whatever info
+	 * we'll need later.  RECORD is a special case: just treat it as composite
+	 * without bothering with the typcache entry.
+	 */
+	if (typeOid != RECORDOID)
+	{
+		typentry = lookup_type_cache(typeOid, TYPECACHE_DOMAIN_BASE_INFO);
+		typtype = typentry->typtype;
+		arg->typbyval = typentry->typbyval;
+		arg->typlen = typentry->typlen;
+		arg->typalign = typentry->typalign;
+	}
+	else
+	{
+		typentry = NULL;
+		typtype = TYPTYPE_COMPOSITE;
+		/* hard-wired knowledge about type RECORD: */
+		arg->typbyval = false;
+		arg->typlen = -1;
+		arg->typalign = 'd';
+	}
 
-	if ((funcid = get_transform_fromsql(base_type, langid, trftypes)))
+	/*
+	 * Choose conversion method.  Note that transform functions are checked
+	 * for composite and scalar types, but not for arrays or domains.  This is
+	 * somewhat historical, but we'd have a problem allowing them on domains,
+	 * since we drill down through all levels of a domain nest without looking
+	 * at the intermediate levels at all.
+	 */
+	if (typtype == TYPTYPE_DOMAIN)
+	{
+		/* Domain --- we don't care, just recurse down to the base type */
+		PLy_input_setup_func(arg, arg_mcxt,
+							 typentry->domainBaseType,
+							 typentry->domainBaseTypmod,
+							 proc);
+	}
+	else if (typentry &&
+			 OidIsValid(typentry->typelem) && typentry->typlen == -1)
+	{
+		/* Standard varlena array (cf. get_element_type) */
+		arg->func = PLyList_FromArray;
+		/* Recursively set up conversion info for the element type */
+		arg->u.array.elm = (PLyDatumToOb *)
+			MemoryContextAllocZero(arg_mcxt, sizeof(PLyDatumToOb));
+		PLy_input_setup_func(arg->u.array.elm, arg_mcxt,
+							 typentry->typelem, typmod,
+							 proc);
+	}
+	else if ((trfuncid = get_transform_fromsql(typeOid,
+											   proc->langid,
+											   proc->trftypes)))
 	{
 		arg->func = PLyObject_FromTransform;
-		fmgr_info_cxt(funcid, &arg->typtransform, arg_mcxt);
+		fmgr_info_cxt(trfuncid, &arg->u.transform.typtransform, arg_mcxt);
+	}
+	else if (typtype == TYPTYPE_COMPOSITE)
+	{
+		/* Named composite type, or RECORD */
+		arg->func = PLyDict_FromComposite;
+		/* We'll set up the per-field data later */
+		arg->u.tuple.recdesc = NULL;
+		arg->u.tuple.typentry = typentry;
+		arg->u.tuple.tupdescid = INVALID_TUPLEDESC_IDENTIFIER;
+		arg->u.tuple.atts = NULL;
+		arg->u.tuple.natts = 0;
 	}
 	else
-		switch (base_type)
+	{
+		/* Scalar type, but we have a couple of special cases */
+		switch (typeOid)
 		{
 			case BOOLOID:
 				arg->func = PLyBool_FromBool;
@@ -494,30 +536,19 @@ PLy_input_datum_func2(PLyDatumToOb *arg, MemoryContext arg_mcxt, Oid typeOid, He
 				arg->func = PLyBytes_FromBytea;
 				break;
 			default:
-				arg->func = PLyString_FromDatum;
+				arg->func = PLyString_FromScalar;
+				getTypeOutputInfo(typeOid, &typoutput, &typisvarlena);
+				fmgr_info_cxt(typoutput, &arg->u.scalar.typfunc, arg_mcxt);
 				break;
 		}
-
-	if (element_type)
-	{
-		char		dummy_delim;
-		Oid			funcid;
-
-		arg->elm = palloc0(sizeof(*arg->elm));
-		arg->elm->func = arg->func;
-		arg->elm->typtransform = arg->typtransform;
-		arg->func = PLyList_FromArray;
-		arg->elm->typoid = element_type;
-		arg->elm->typmod = -1;
-		get_type_io_data(element_type, IOFunc_output,
-						 &arg->elm->typlen, &arg->elm->typbyval, &arg->elm->typalign, &dummy_delim,
-						 &arg->elm->typioparam, &funcid);
-		fmgr_info_cxt(funcid, &arg->elm->typfunc, arg_mcxt);
 	}
-
-	MemoryContextSwitchTo(oldcxt);
 }
 
+
+/*
+ * Special-purpose input converters.
+ */
+
 static PyObject *
 PLyBool_FromBool(PLyDatumToOb *arg, Datum d)
 {
@@ -587,11 +618,7 @@ PLyInt_FromInt32(PLyDatumToOb *arg, Datum d)
 static PyObject *
 PLyLong_FromInt64(PLyDatumToOb *arg, Datum d)
 {
-	/* on 32 bit platforms "long" may be too small */
-	if (sizeof(int64) > sizeof(long))
-		return PyLong_FromLongLong(DatumGetInt64(d));
-	else
-		return PyLong_FromLong(DatumGetInt64(d));
+	return PyLong_FromLongLong(DatumGetInt64(d));
 }
 
 static PyObject *
@@ -610,27 +637,40 @@ PLyBytes_FromBytea(PLyDatumToOb *arg, Datum d)
 	return PyBytes_FromStringAndSize(str, size);
 }
 
+
+/*
+ * Generic input conversion using a SQL type's output function.
+ */
 static PyObject *
-PLyString_FromDatum(PLyDatumToOb *arg, Datum d)
+PLyString_FromScalar(PLyDatumToOb *arg, Datum d)
 {
-	char	   *x = OutputFunctionCall(&arg->typfunc, d);
+	char	   *x = OutputFunctionCall(&arg->u.scalar.typfunc, d);
 	PyObject   *r = PyString_FromString(x);
 
 	pfree(x);
 	return r;
 }
 
+/*
+ * Convert using a from-SQL transform function.
+ */
 static PyObject *
 PLyObject_FromTransform(PLyDatumToOb *arg, Datum d)
 {
-	return (PyObject *) DatumGetPointer(FunctionCall1(&arg->typtransform, d));
+	Datum		t;
+
+	t = FunctionCall1(&arg->u.transform.typtransform, d);
+	return (PyObject *) DatumGetPointer(t);
 }
 
+/*
+ * Convert a SQL array to a Python list.
+ */
 static PyObject *
 PLyList_FromArray(PLyDatumToOb *arg, Datum d)
 {
 	ArrayType  *array = DatumGetArrayTypeP(d);
-	PLyDatumToOb *elm = arg->elm;
+	PLyDatumToOb *elm = arg->u.array.elm;
 	int			ndim;
 	int		   *dims;
 	char	   *dataptr;
@@ -674,6 +714,8 @@ PLyList_FromArray_recurse(PLyDatumToOb *elm, int *dims, int ndim, int dim,
 	PyObject   *list;
 
 	list = PyList_New(dims[dim]);
+	if (!list)
+		return NULL;
 
 	if (dim < ndim - 1)
 	{
@@ -735,6 +777,94 @@ PLyList_FromArray_recurse(PLyDatumToOb *elm, int *dims, int ndim, int dim,
 	return list;
 }
 
+/*
+ * Convert a composite SQL value to a Python dict.
+ */
+static PyObject *
+PLyDict_FromComposite(PLyDatumToOb *arg, Datum d)
+{
+	PyObject   *dict;
+	HeapTupleHeader td;
+	Oid			tupType;
+	int32		tupTypmod;
+	TupleDesc	tupdesc;
+	HeapTupleData tmptup;
+
+	td = DatumGetHeapTupleHeader(d);
+	/* Extract rowtype info and find a tupdesc */
+	tupType = HeapTupleHeaderGetTypeId(td);
+	tupTypmod = HeapTupleHeaderGetTypMod(td);
+	tupdesc = lookup_rowtype_tupdesc(tupType, tupTypmod);
+
+	/* Set up I/O funcs if not done yet */
+	PLy_input_setup_tuple(arg, tupdesc,
+						  PLy_current_execution_context()->curr_proc);
+
+	/* Build a temporary HeapTuple control structure */
+	tmptup.t_len = HeapTupleHeaderGetDatumLength(td);
+	tmptup.t_data = td;
+
+	dict = PLyDict_FromTuple(arg, &tmptup, tupdesc);
+
+	ReleaseTupleDesc(tupdesc);
+
+	return dict;
+}
+
+/*
+ * Transform a tuple into a Python dict object.
+ */
+static PyObject *
+PLyDict_FromTuple(PLyDatumToOb *arg, HeapTuple tuple, TupleDesc desc)
+{
+	PyObject   *volatile dict;
+
+	/* Simple sanity check that desc matches */
+	Assert(desc->natts == arg->u.tuple.natts);
+
+	dict = PyDict_New();
+	if (dict == NULL)
+		return NULL;
+
+	PG_TRY();
+	{
+		int			i;
+
+		for (i = 0; i < arg->u.tuple.natts; i++)
+		{
+			PLyDatumToOb *att = &arg->u.tuple.atts[i];
+			Form_pg_attribute attr = TupleDescAttr(desc, i);
+			char	   *key;
+			Datum		vattr;
+			bool		is_null;
+			PyObject   *value;
+
+			if (attr->attisdropped)
+				continue;
+
+			key = NameStr(attr->attname);
+			vattr = heap_getattr(tuple, (i + 1), desc, &is_null);
+
+			if (is_null)
+				PyDict_SetItemString(dict, key, Py_None);
+			else
+			{
+				value = att->func(att, vattr);
+				PyDict_SetItemString(dict, key, value);
+				Py_DECREF(value);
+			}
+		}
+	}
+	PG_CATCH();
+	{
+		Py_DECREF(dict);
+		PG_RE_THROW();
+	}
+	PG_END_TRY();
+
+	return dict;
+}
+
 /*
  * Convert a Python object to a PostgreSQL bool datum.  This can't go
  * through the generic conversion function, because Python attaches a
@@ -742,17 +872,16 @@ PLyList_FromArray_recurse(PLyDatumToOb *elm, int *dims, int ndim, int dim,
  * type can parse.
  */
 static Datum
-PLyObject_ToBool(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLyObject_ToBool(PLyObToDatum *arg, PyObject *plrv,
+				 bool *isnull, bool inarray)
 {
-	Datum		rv;
-
-	Assert(plrv != Py_None);
-	rv = BoolGetDatum(PyObject_IsTrue(plrv));
-
-	if (get_typtype(arg->typoid) == TYPTYPE_DOMAIN)
-		domain_check(rv, false, arg->typoid, &arg->typfunc.fn_extra, arg->typfunc.fn_mcxt);
-
-	return rv;
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
+	return BoolGetDatum(PyObject_IsTrue(plrv));
 }
 
 /*
@@ -761,12 +890,18 @@ PLyObject_ToBool(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
  * with embedded nulls.  And it's faster this way.
  */
 static Datum
-PLyObject_ToBytea(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLyObject_ToBytea(PLyObToDatum *arg, PyObject *plrv,
+				  bool *isnull, bool inarray)
 {
 	PyObject   *volatile plrv_so = NULL;
 	Datum		rv;
 
-	Assert(plrv != Py_None);
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
 
 	plrv_so = PyObject_Bytes(plrv);
 	if (!plrv_so)
@@ -792,9 +927,6 @@ PLyObject_ToBytea(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
 
 	Py_XDECREF(plrv_so);
 
-	if (get_typtype(arg->typoid) == TYPTYPE_DOMAIN)
-		domain_check(rv, false, arg->typoid, &arg->typfunc.fn_extra, arg->typfunc.fn_mcxt);
-
 	return rv;
 }
 
@@ -805,45 +937,87 @@ PLyObject_ToBytea(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
  * for obtaining PostgreSQL tuples.
  */
 static Datum
-PLyObject_ToComposite(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLyObject_ToComposite(PLyObToDatum *arg, PyObject *plrv,
+					  bool *isnull, bool inarray)
 {
 	Datum		rv;
-	PLyTypeInfo info;
 	TupleDesc	desc;
-	MemoryContext cxt;
 
-	if (typmod != -1)
-		elog(ERROR, "received unnamed record type as input");
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
+
+	/*
+	 * The string conversion case doesn't require a tupdesc, nor per-field
+	 * conversion data, so just go for it if that's the case to use.
+	 */
+	if (PyString_Check(plrv) || PyUnicode_Check(plrv))
+		return PLyString_ToComposite(arg, plrv, inarray);
 
-	/* Create a dummy PLyTypeInfo */
-	cxt = AllocSetContextCreate(CurrentMemoryContext,
-								"PL/Python temp context",
-								ALLOCSET_DEFAULT_SIZES);
-	MemSet(&info, 0, sizeof(PLyTypeInfo));
-	PLy_typeinfo_init(&info, cxt);
-	/* Mark it as needing output routines lookup */
-	info.is_rowtype = 2;
+	/*
+	 * If we're dealing with a named composite type, we must look up the
+	 * tupdesc every time, to protect against possible changes to the type.
+	 * RECORD types can't change between calls; but we must still be willing
+	 * to set up the info the first time, if nobody did yet.
+	 */
+	if (arg->typoid != RECORDOID)
+	{
+		desc = lookup_rowtype_tupdesc(arg->typoid, arg->typmod);
+		/* We should have the descriptor of the type's typcache entry */
+		Assert(desc == arg->u.tuple.typentry->tupDesc);
+		/* Detect change of descriptor, update cache if needed */
+		if (arg->u.tuple.tupdescid != arg->u.tuple.typentry->tupDesc_identifier)
+		{
+			PLy_output_setup_tuple(arg, desc,
+								   PLy_current_execution_context()->curr_proc);
+			arg->u.tuple.tupdescid = arg->u.tuple.typentry->tupDesc_identifier;
+		}
+	}
+	else
+	{
+		desc = arg->u.tuple.recdesc;
+		if (desc == NULL)
+		{
+			desc = lookup_rowtype_tupdesc(arg->typoid, arg->typmod);
+			arg->u.tuple.recdesc = desc;
+		}
+		else
+		{
+			/* Pin descriptor to match unpin below */
+			PinTupleDesc(desc);
+		}
+	}
 
-	desc = lookup_rowtype_tupdesc(arg->typoid, arg->typmod);
+	/* Simple sanity check on our caching */
+	Assert(desc->natts == arg->u.tuple.natts);
 
 	/*
-	 * This will set up the dummy PLyTypeInfo's output conversion routines,
-	 * since we left is_rowtype as 2. A future optimization could be caching
-	 * that info instead of looking it up every time a tuple is returned from
-	 * the function.
+	 * Convert, using the appropriate method depending on the type of the
+	 * supplied Python object.
 	 */
-	rv = PLyObject_ToCompositeDatum(&info, desc, plrv, inarray);
+	if (PySequence_Check(plrv))
+		/* composite type as sequence (tuple, list etc) */
+		rv = PLySequence_ToComposite(arg, desc, plrv);
+	else if (PyMapping_Check(plrv))
+		/* composite type as mapping (currently only dict) */
+		rv = PLyMapping_ToComposite(arg, desc, plrv);
+	else
+		/* returned as smth, must provide method __getattr__(name) */
+		rv = PLyGenericObject_ToComposite(arg, desc, plrv, inarray);
 
 	ReleaseTupleDesc(desc);
 
-	MemoryContextDelete(cxt);
-
 	return rv;
 }
 
 
 /*
  * Convert Python object to C string in server encoding.
+ *
+ * Note: this is exported for use by add-on transform modules.
  */
 char *
 PLyObject_AsString(PyObject *plrv)
@@ -900,74 +1074,71 @@ PLyObject_AsString(PyObject *plrv)
 
 
 /*
- * Generic conversion function: Convert PyObject to cstring and
+ * Generic output conversion function: convert PyObject to cstring and
  * cstring into PostgreSQL type.
  */
 static Datum
-PLyObject_ToDatum(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLyObject_ToScalar(PLyObToDatum *arg, PyObject *plrv,
+				   bool *isnull, bool inarray)
 {
 	char	   *str;
 
-	Assert(plrv != Py_None);
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
 
 	str = PLyObject_AsString(plrv);
 
-	/*
-	 * If we are parsing a composite type within an array, and the string
-	 * isn't a valid record literal, there's a high chance that the function
-	 * did something like:
-	 *
-	 * CREATE FUNCTION .. RETURNS comptype[] AS $$ return [['foo', 'bar']] $$
-	 * LANGUAGE plpython;
-	 *
-	 * Before PostgreSQL 10, that was interpreted as a single-dimensional
-	 * array, containing record ('foo', 'bar'). PostgreSQL 10 added support
-	 * for multi-dimensional arrays, and it is now interpreted as a
-	 * two-dimensional array, containing two records, 'foo', and 'bar'.
-	 * record_in() will throw an error, because "foo" is not a valid record
-	 * literal.
-	 *
-	 * To make that less confusing to users who are upgrading from older
-	 * versions, try to give a hint in the typical instances of that. If we
-	 * are parsing an array of composite types, and we see a string literal
-	 * that is not a valid record literal, give a hint. We only want to give
-	 * the hint in the narrow case of a malformed string literal, not any
-	 * error from record_in(), so check for that case here specifically.
-	 *
-	 * This check better match the one in record_in(), so that we don't forbid
-	 * literals that are actually valid!
-	 */
-	if (inarray && arg->typfunc.fn_oid == F_RECORD_IN)
-	{
-		char	   *ptr = str;
+	return InputFunctionCall(&arg->u.scalar.typfunc,
+							 str,
+							 arg->u.scalar.typioparam,
+							 arg->typmod);
+}
 
-		/* Allow leading whitespace */
-		while (*ptr && isspace((unsigned char) *ptr))
-			ptr++;
-		if (*ptr++ != '(')
-			ereport(ERROR,
-					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
-					 errmsg("malformed record literal: \"%s\"", str),
-					 errdetail("Missing left parenthesis."),
-					 errhint("To return a composite type in an array, return the composite type as a Python tuple, e.g., \"[('foo',)]\".")));
-	}
 
-	return InputFunctionCall(&arg->typfunc,
-							 str,
-							 arg->typioparam,
-							 typmod);
+/*
+ * Convert to a domain type.
+ */
+static Datum
+PLyObject_ToDomain(PLyObToDatum *arg, PyObject *plrv,
+				   bool *isnull, bool inarray)
+{
+	Datum		result;
+	PLyObToDatum *base = arg->u.domain.base;
+
+	result = base->func(base, plrv, isnull, inarray);
+	domain_check(result, *isnull, arg->typoid,
+				 &arg->u.domain.domain_info, arg->mcxt);
+	return result;
 }
 
 
+/*
+ * Convert using a to-SQL transform function.
+ */
 static Datum
-PLyObject_ToTransform(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLyObject_ToTransform(PLyObToDatum *arg, PyObject *plrv,
+					  bool *isnull, bool inarray)
 {
-	return FunctionCall1(&arg->typtransform, PointerGetDatum(plrv));
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
+	return FunctionCall1(&arg->u.transform.typtransform, PointerGetDatum(plrv));
 }
 
 
+/*
+ * Convert Python sequence to SQL array.
+ */
 static Datum
-PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarray)
+PLySequence_ToArray(PLyObToDatum *arg, PyObject *plrv,
+					bool *isnull, bool inarray)
 {
 	ArrayType  *array;
 	int			i;
@@ -978,11 +1149,15 @@ PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarra
 	int			dims[MAXDIM];
 	int			lbs[MAXDIM];
 	int			currelem;
-	Datum		rv;
 	PyObject   *pyptr = plrv;
 	PyObject   *next;
 
-	Assert(plrv != Py_None);
+	if (plrv == Py_None)
+	{
+		*isnull = true;
+		return (Datum) 0;
+	}
+	*isnull = false;
 
 	/*
 	 * Determine the number of dimensions, and their sizes.
@@ -1048,7 +1223,7 @@ PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarra
 	elems = palloc(sizeof(Datum) * len);
 	nulls = palloc(sizeof(bool) * len);
 	currelem = 0;
-	PLySequence_ToArray_recurse(arg->elm, plrv,
+	PLySequence_ToArray_recurse(arg->u.array.elm, plrv,
 								dims, ndim, 0,
 								elems, nulls, &currelem);
 
@@ -1060,19 +1235,12 @@ PLySequence_ToArray(PLyObToDatum *arg, int32 typmod, PyObject *plrv, bool inarra
 							   ndim,
 							   dims,
 							   lbs,
-							   get_base_element_type(arg->typoid),
-							   arg->elm->typlen,
-							   arg->elm->typbyval,
-							   arg->elm->typalign);
+							   arg->u.array.elmbasetype,
+							   arg->u.array.elm->typlen,
+							   arg->u.array.elm->typbyval,
+							   arg->u.array.elm->typalign);
 
-	/*
-	 * If the result type is a domain of array, the resulting array must be
-	 * checked.
-	 */
-	rv = PointerGetDatum(array);
-	if (get_typtype(arg->typoid) == TYPTYPE_DOMAIN)
-		domain_check(rv, false, arg->typoid, &arg->typfunc.fn_extra, arg->typfunc.fn_mcxt);
-	return rv;
+	return PointerGetDatum(array);
 }
 
 /*
@@ -1109,16 +1277,7 @@ PLySequence_ToArray_recurse(PLyObToDatum *elm, PyObject *list,
 		{
 			PyObject   *obj = PySequence_GetItem(list, i);
 
-			if (obj == Py_None)
-			{
-				nulls[*currelem] = true;
-				elems[*currelem] = (Datum) 0;
-			}
-			else
-			{
-				nulls[*currelem] = false;
-				elems[*currelem] = elm->func(elm, -1, obj, true);
-			}
+			elems[*currelem] = elm->func(elm, obj, &nulls[*currelem], true);
 			Py_XDECREF(obj);
 			(*currelem)++;
 		}
@@ -1126,42 +1285,72 @@ PLySequence_ToArray_recurse(PLyObToDatum *elm, PyObject *list,
 }
 
 
+/*
+ * Convert a Python string to composite, using record_in.
+ */
 static Datum
-PLyString_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *string, bool inarray)
+PLyString_ToComposite(PLyObToDatum *arg, PyObject *string, bool inarray)
 {
-	Datum		result;
-	HeapTuple	typeTup;
-	PLyTypeInfo locinfo;
-	PLyExecutionContext *exec_ctx = PLy_current_execution_context();
-	MemoryContext cxt;
-
-	/* Create a dummy PLyTypeInfo */
-	cxt = AllocSetContextCreate(CurrentMemoryContext,
-								"PL/Python temp context",
-								ALLOCSET_DEFAULT_SIZES);
-	MemSet(&locinfo, 0, sizeof(PLyTypeInfo));
-	PLy_typeinfo_init(&locinfo, cxt);
-
-	typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(desc->tdtypeid));
-	if (!HeapTupleIsValid(typeTup))
-		elog(ERROR, "cache lookup failed for type %u", desc->tdtypeid);
+	char	   *str;
 
-	PLy_output_datum_func2(&locinfo.out.d, locinfo.mcxt, typeTup,
-						   exec_ctx->curr_proc->langid,
-						   exec_ctx->curr_proc->trftypes);
+	/*
+	 * Set up call data for record_in, if we didn't already.  (We can't just
+	 * use DirectFunctionCall, because record_in needs a fn_extra field.)
+	 */
+	if (!OidIsValid(arg->u.tuple.recinfunc.fn_oid))
+		fmgr_info_cxt(F_RECORD_IN, &arg->u.tuple.recinfunc, arg->mcxt);
 
-	ReleaseSysCache(typeTup);
+	str = PLyObject_AsString(string);
 
-	result = PLyObject_ToDatum(&locinfo.out.d, desc->tdtypmod, string, inarray);
+	/*
+	 * If we are parsing a composite type within an array, and the string
+	 * isn't a valid record literal, there's a high chance that the function
+	 * did something like:
+	 *
+	 * CREATE FUNCTION .. RETURNS comptype[] AS $$ return [['foo', 'bar']] $$
+	 * LANGUAGE plpython;
+	 *
+	 * Before PostgreSQL 10, that was interpreted as a single-dimensional
+	 * array, containing record ('foo', 'bar'). PostgreSQL 10 added support
+	 * for multi-dimensional arrays, and it is now interpreted as a
+	 * two-dimensional array, containing two records, 'foo', and 'bar'.
+	 * record_in() will throw an error, because "foo" is not a valid record
+	 * literal.
+	 *
+	 * To make that less confusing to users who are upgrading from older
+	 * versions, try to give a hint in the typical instances of that. If we
+	 * are parsing an array of composite types, and we see a string literal
+	 * that is not a valid record literal, give a hint. We only want to give
+	 * the hint in the narrow case of a malformed string literal, not any
+	 * error from record_in(), so check for that case here specifically.
+	 *
+	 * This check better match the one in record_in(), so that we don't forbid
+	 * literals that are actually valid!
+	 */
+	if (inarray)
+	{
+		char	   *ptr = str;
 
-	MemoryContextDelete(cxt);
+		/* Allow leading whitespace */
+		while (*ptr && isspace((unsigned char) *ptr))
+			ptr++;
+		if (*ptr++ != '(')
+			ereport(ERROR,
+					(errcode(ERRCODE_INVALID_TEXT_REPRESENTATION),
+					 errmsg("malformed record literal: \"%s\"", str),
+					 errdetail("Missing left parenthesis."),
+					 errhint("To return a composite type in an array, return the composite type as a Python tuple, e.g., \"[('foo',)]\".")));
+	}
 
-	return result;
+	return InputFunctionCall(&arg->u.tuple.recinfunc,
+							 str,
+							 arg->typoid,
+							 arg->typmod);
 }
 
 
 static Datum
-PLyMapping_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping)
+PLyMapping_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *mapping)
 {
 	Datum		result;
 	HeapTuple	tuple;
@@ -1171,10 +1360,6 @@ PLyMapping_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping)
 
 	Assert(PyMapping_Check(mapping));
 
-	if (info->is_rowtype == 2)
-		PLy_output_tuple_funcs(info, desc);
-	Assert(info->is_rowtype == 1);
-
 	/* Build tuple */
 	values = palloc(sizeof(Datum) * desc->natts);
 	nulls = palloc(sizeof(bool) * desc->natts);
@@ -1183,37 +1368,30 @@ PLyMapping_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping)
 		char	   *key;
 		PyObject   *volatile value;
 		PLyObToDatum *att;
+		Form_pg_attribute attr = TupleDescAttr(desc, i);
 
-		if (desc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 		{
 			values[i] = (Datum) 0;
 			nulls[i] = true;
 			continue;
 		}
 
-		key = NameStr(desc->attrs[i]->attname);
+		key = NameStr(attr->attname);
 		value = NULL;
-		att = &info->out.r.atts[i];
+		att = &arg->u.tuple.atts[i];
 		PG_TRY();
 		{
 			value = PyMapping_GetItemString(mapping, key);
-			if (value == Py_None)
-			{
-				values[i] = (Datum) NULL;
-				nulls[i] = true;
-			}
-			else if (value)
-			{
-				values[i] = (att->func) (att, -1, value, false);
-				nulls[i] = false;
-			}
-			else
+			if (!value)
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_COLUMN),
 						 errmsg("key \"%s\" not found in mapping", key),
 						 errhint("To return null in a column, "
 								 "add the value None to the mapping with the key named after the column.")));
 
+			values[i] = att->func(att, value, &nulls[i], false);
+
 			Py_XDECREF(value);
 			value = NULL;
 		}
@@ -1237,7 +1415,7 @@ PLyMapping_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *mapping)
 
 
 static Datum
-PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
+PLySequence_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *sequence)
 {
 	Datum		result;
 	HeapTuple	tuple;
@@ -1256,7 +1434,7 @@ PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 	idx = 0;
 	for (i = 0; i < desc->natts; i++)
 	{
-		if (!desc->attrs[i]->attisdropped)
+		if (!TupleDescAttr(desc, i)->attisdropped)
 			idx++;
 	}
 	if (PySequence_Length(sequence) != idx)
@@ -1264,10 +1442,6 @@ PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 				(errcode(ERRCODE_DATATYPE_MISMATCH),
 				 errmsg("length of returned sequence did not match number of columns in row")));
 
-	if (info->is_rowtype == 2)
-		PLy_output_tuple_funcs(info, desc);
-	Assert(info->is_rowtype == 1);
-
 	/* Build tuple */
 	values = palloc(sizeof(Datum) * desc->natts);
 	nulls = palloc(sizeof(bool) * desc->natts);
@@ -1277,7 +1451,7 @@ PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 		PyObject   *volatile value;
 		PLyObToDatum *att;
 
-		if (desc->attrs[i]->attisdropped)
+		if (TupleDescAttr(desc, i)->attisdropped)
 		{
 			values[i] = (Datum) 0;
 			nulls[i] = true;
@@ -1285,21 +1459,13 @@ PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 		}
 
 		value = NULL;
-		att = &info->out.r.atts[i];
+		att = &arg->u.tuple.atts[i];
 		PG_TRY();
 		{
 			value = PySequence_GetItem(sequence, idx);
 			Assert(value);
-			if (value == Py_None)
-			{
-				values[i] = (Datum) NULL;
-				nulls[i] = true;
-			}
-			else if (value)
-			{
-				values[i] = (att->func) (att, -1, value, false);
-				nulls[i] = false;
-			}
+
+			values[i] = att->func(att, value, &nulls[i], false);
 
 			Py_XDECREF(value);
 			value = NULL;
@@ -1326,7 +1492,7 @@ PLySequence_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *sequence)
 
 
 static Datum
-PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object, bool inarray)
+PLyGenericObject_ToComposite(PLyObToDatum *arg, TupleDesc desc, PyObject *object, bool inarray)
 {
 	Datum		result;
 	HeapTuple	tuple;
@@ -1334,10 +1500,6 @@ PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object
 	bool	   *nulls;
 	volatile int i;
 
-	if (info->is_rowtype == 2)
-		PLy_output_tuple_funcs(info, desc);
-	Assert(info->is_rowtype == 1);
-
 	/* Build tuple */
 	values = palloc(sizeof(Datum) * desc->natts);
 	nulls = palloc(sizeof(bool) * desc->natts);
@@ -1346,31 +1508,22 @@ PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object
 		char	   *key;
 		PyObject   *volatile value;
 		PLyObToDatum *att;
+		Form_pg_attribute attr = TupleDescAttr(desc, i);
 
-		if (desc->attrs[i]->attisdropped)
+		if (attr->attisdropped)
 		{
 			values[i] = (Datum) 0;
 			nulls[i] = true;
 			continue;
 		}
 
-		key = NameStr(desc->attrs[i]->attname);
+		key = NameStr(attr->attname);
 		value = NULL;
-		att = &info->out.r.atts[i];
+		att = &arg->u.tuple.atts[i];
 		PG_TRY();
 		{
 			value = PyObject_GetAttrString(object, key);
-			if (value == Py_None)
-			{
-				values[i] = (Datum) NULL;
-				nulls[i] = true;
-			}
-			else if (value)
-			{
-				values[i] = (att->func) (att, -1, value, false);
-				nulls[i] = false;
-			}
-			else
+			if (!value)
 			{
 				/*
 				 * No attribute for this column in the object.
@@ -1381,7 +1534,7 @@ PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object
 				 * array, with a composite type (123, 'foo') in it. But now
 				 * it's interpreted as a two-dimensional array, and we try to
 				 * interpret "123" as the composite type. See also similar
-				 * heuristic in PLyObject_ToDatum().
+				 * heuristic in PLyObject_ToScalar().
 				 */
 				ereport(ERROR,
 						(errcode(ERRCODE_UNDEFINED_COLUMN),
@@ -1391,6 +1544,8 @@ PLyGenericObject_ToComposite(PLyTypeInfo *info, TupleDesc desc, PyObject *object
 						 errhint("To return null in a column, let the returned object have an attribute named after column with value None.")));
 			}
 
+			values[i] = att->func(att, value, &nulls[i], false);
+
 			Py_XDECREF(value);
 			value = NULL;
 		}
diff --git a/src/pl/plpython/plpy_typeio.h b/src/pl/plpython/plpy_typeio.h
index 95f84d8341..82bdfae548 100644
--- a/src/pl/plpython/plpy_typeio.h
+++ b/src/pl/plpython/plpy_typeio.h
@@ -6,117 +6,169 @@
 #define PLPY_TYPEIO_H
 
 #include "access/htup.h"
-#include "access/tupdesc.h"
 #include "fmgr.h"
-#include "storage/itemptr.h"
+#include "utils/typcache.h"
+
+struct PLyProcedure;			/* avoid requiring plpy_procedure.h here */
+
 
 /*
- * Conversion from PostgreSQL Datum to a Python object.
+ * "Input" conversion from PostgreSQL Datum to a Python object.
+ *
+ * arg is the previously-set-up conversion data, val is the value to convert.
+ * val mustn't be NULL.
+ *
+ * Note: the conversion data structs should be regarded as private to
+ * plpy_typeio.c.  We declare them here only so that other modules can
+ * define structs containing them.
  */
-struct PLyDatumToOb;
-typedef PyObject *(*PLyDatumToObFunc) (struct PLyDatumToOb *arg, Datum val);
+typedef struct PLyDatumToOb PLyDatumToOb;	/* forward reference */
 
-typedef struct PLyDatumToOb
+typedef PyObject *(*PLyDatumToObFunc) (PLyDatumToOb *arg, Datum val);
+
+typedef struct PLyScalarToOb
 {
-	PLyDatumToObFunc func;
-	FmgrInfo	typfunc;		/* The type's output function */
-	FmgrInfo	typtransform;	/* from-SQL transform */
-	Oid			typoid;			/* The OID of the type */
-	int32		typmod;			/* The typmod of the type */
-	Oid			typioparam;
-	bool		typbyval;
-	int16		typlen;
-	char		typalign;
-	struct PLyDatumToOb *elm;
-} PLyDatumToOb;
+	FmgrInfo	typfunc;		/* lookup info for type's output function */
+} PLyScalarToOb;
+
+typedef struct PLyArrayToOb
+{
+	PLyDatumToOb *elm;			/* conversion info for array's element type */
+} PLyArrayToOb;
 
 typedef struct PLyTupleToOb
 {
-	PLyDatumToOb *atts;
-	int			natts;
+	/* If we're dealing with a RECORD type, actual descriptor is here: */
+	TupleDesc	recdesc;
+	/* If we're dealing with a named composite type, these fields are set: */
+	TypeCacheEntry *typentry;	/* typcache entry for type */
+	uint64		tupdescid;		/* last tupdesc identifier seen in typcache */
+	/* These fields are NULL/0 if not yet set: */
+	PLyDatumToOb *atts;			/* array of per-column conversion info */
+	int			natts;			/* length of array */
 } PLyTupleToOb;
 
-typedef union PLyTypeInput
+typedef struct PLyTransformToOb
+{
+	FmgrInfo	typtransform;	/* lookup info for from-SQL transform func */
+} PLyTransformToOb;
+
+struct PLyDatumToOb
 {
-	PLyDatumToOb d;
-	PLyTupleToOb r;
-} PLyTypeInput;
+	PLyDatumToObFunc func;		/* conversion control function */
+	Oid			typoid;			/* OID of the source type */
+	int32		typmod;			/* typmod of the source type */
+	bool		typbyval;		/* its physical representation details */
+	int16		typlen;
+	char		typalign;
+	MemoryContext mcxt;			/* context this info is stored in */
+	union						/* conversion-type-specific data */
+	{
+		PLyScalarToOb scalar;
+		PLyArrayToOb array;
+		PLyTupleToOb tuple;
+		PLyTransformToOb transform;
+	}			u;
+};
 
 /*
- * Conversion from Python object to a PostgreSQL Datum.
+ * "Output" conversion from Python object to a PostgreSQL Datum.
+ *
+ * arg is the previously-set-up conversion data, val is the value to convert.
  *
- * The 'inarray' argument to the conversion function is true, if the
- * converted value was in an array (Python list). It is used to give a
- * better error message in some cases.
+ * *isnull is set to true if val is Py_None, false otherwise.
+ * (The conversion function *must* be called even for Py_None,
+ * so that domain constraints can be checked.)
+ *
+ * inarray is true if the converted value was in an array (Python list).
+ * It is used to give a better error message in some cases.
  */
-struct PLyObToDatum;
-typedef Datum (*PLyObToDatumFunc) (struct PLyObToDatum *arg, int32 typmod, PyObject *val, bool inarray);
+typedef struct PLyObToDatum PLyObToDatum;	/* forward reference */
+
+typedef Datum (*PLyObToDatumFunc) (PLyObToDatum *arg, PyObject *val,
+								   bool *isnull,
+								   bool inarray);
 
-typedef struct PLyObToDatum
+typedef struct PLyObToScalar
 {
-	PLyObToDatumFunc func;
-	FmgrInfo	typfunc;		/* The type's input function */
-	FmgrInfo	typtransform;	/* to-SQL transform */
-	Oid			typoid;			/* The OID of the type */
-	int32		typmod;			/* The typmod of the type */
-	Oid			typioparam;
-	bool		typbyval;
-	int16		typlen;
-	char		typalign;
-	struct PLyObToDatum *elm;
-} PLyObToDatum;
+	FmgrInfo	typfunc;		/* lookup info for type's input function */
+	Oid			typioparam;		/* argument to pass to it */
+} PLyObToScalar;
+
+typedef struct PLyObToArray
+{
+	PLyObToDatum *elm;			/* conversion info for array's element type */
+	Oid			elmbasetype;	/* element base type */
+} PLyObToArray;
 
 typedef struct PLyObToTuple
 {
-	PLyObToDatum *atts;
-	int			natts;
+	/* If we're dealing with a RECORD type, actual descriptor is here: */
+	TupleDesc	recdesc;
+	/* If we're dealing with a named composite type, these fields are set: */
+	TypeCacheEntry *typentry;	/* typcache entry for type */
+	uint64		tupdescid;		/* last tupdesc identifier seen in typcache */
+	/* These fields are NULL/0 if not yet set: */
+	PLyObToDatum *atts;			/* array of per-column conversion info */
+	int			natts;			/* length of array */
+	/* We might need to convert using record_in(); if so, cache info here */
+	FmgrInfo	recinfunc;		/* lookup info for record_in */
 } PLyObToTuple;
 
-typedef union PLyTypeOutput
+typedef struct PLyObToDomain
 {
-	PLyObToDatum d;
-	PLyObToTuple r;
-} PLyTypeOutput;
+	PLyObToDatum *base;			/* conversion info for domain's base type */
+	void	   *domain_info;	/* cache space for domain_check() */
+} PLyObToDomain;
 
-/* all we need to move PostgreSQL data to Python objects,
- * and vice versa
- */
-typedef struct PLyTypeInfo
+typedef struct PLyObToTransform
 {
-	PLyTypeInput in;
-	PLyTypeOutput out;
-
-	/*
-	 * is_rowtype can be: -1 = not known yet (initial state); 0 = scalar
-	 * datatype; 1 = rowtype; 2 = rowtype, but I/O functions not set up yet
-	 */
-	int			is_rowtype;
-	/* used to check if the type has been modified */
-	Oid			typ_relid;
-	TransactionId typrel_xmin;
-	ItemPointerData typrel_tid;
-
-	/* context for subsidiary data (doesn't belong to this struct though) */
-	MemoryContext mcxt;
-} PLyTypeInfo;
-
-extern void PLy_typeinfo_init(PLyTypeInfo *arg, MemoryContext mcxt);
+	FmgrInfo	typtransform;	/* lookup info for to-SQL transform function */
+} PLyObToTransform;
 
-extern void PLy_input_datum_func(PLyTypeInfo *arg, Oid typeOid, HeapTuple typeTup, Oid langid, List *trftypes);
-extern void PLy_output_datum_func(PLyTypeInfo *arg, HeapTuple typeTup, Oid langid, List *trftypes);
-
-extern void PLy_input_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc);
-extern void PLy_output_tuple_funcs(PLyTypeInfo *arg, TupleDesc desc);
-
-extern void PLy_output_record_funcs(PLyTypeInfo *arg, TupleDesc desc);
-
-/* conversion from Python objects to composite Datums */
-extern Datum PLyObject_ToCompositeDatum(PLyTypeInfo *info, TupleDesc desc, PyObject *plrv, bool isarray);
-
-/* conversion from heap tuples to Python dictionaries */
-extern PyObject *PLyDict_FromTuple(PLyTypeInfo *info, HeapTuple tuple, TupleDesc desc);
-
-/* conversion from Python objects to C strings */
+struct PLyObToDatum
+{
+	PLyObToDatumFunc func;		/* conversion control function */
+	Oid			typoid;			/* OID of the target type */
+	int32		typmod;			/* typmod of the target type */
+	bool		typbyval;		/* its physical representation details */
+	int16		typlen;
+	char		typalign;
+	MemoryContext mcxt;			/* context this info is stored in */
+	union						/* conversion-type-specific data */
+	{
+		PLyObToScalar scalar;
+		PLyObToArray array;
+		PLyObToTuple tuple;
+		PLyObToDomain domain;
+		PLyObToTransform transform;
+	}			u;
+};
+
+
+extern PyObject *PLy_input_convert(PLyDatumToOb *arg, Datum val);
+extern Datum PLy_output_convert(PLyObToDatum *arg, PyObject *val,
+				   bool *isnull);
+
+extern PyObject *PLy_input_from_tuple(PLyDatumToOb *arg, HeapTuple tuple,
+					 TupleDesc desc);
+
+extern void PLy_input_setup_func(PLyDatumToOb *arg, MemoryContext arg_mcxt,
+					 Oid typeOid, int32 typmod,
+					 struct PLyProcedure *proc);
+extern void PLy_output_setup_func(PLyObToDatum *arg, MemoryContext arg_mcxt,
+					  Oid typeOid, int32 typmod,
+					  struct PLyProcedure *proc);
+
+extern void PLy_input_setup_tuple(PLyDatumToOb *arg, TupleDesc desc,
+					  struct PLyProcedure *proc);
+extern void PLy_output_setup_tuple(PLyObToDatum *arg, TupleDesc desc,
+					   struct PLyProcedure *proc);
+
+extern void PLy_output_setup_record(PLyObToDatum *arg, TupleDesc desc,
+						struct PLyProcedure *proc);
+
+/* conversion from Python objects to C strings --- exported for transforms */
 extern char *PLyObject_AsString(PyObject *plrv);
 
 #endif							/* PLPY_TYPEIO_H */
diff --git a/src/pl/plpython/plpy_util.c b/src/pl/plpython/plpy_util.c
index 35d57a9e80..51e2461ec3 100644
--- a/src/pl/plpython/plpy_util.c
+++ b/src/pl/plpython/plpy_util.c
@@ -8,7 +8,6 @@
 
 #include "mb/pg_wchar.h"
 #include "utils/memutils.h"
-#include "utils/palloc.h"
 
 #include "plpython.h"
 
diff --git a/src/pl/plpython/plpython.h b/src/pl/plpython/plpython.h
index 9a8e8f246d..5c2e6a83f3 100644
--- a/src/pl/plpython/plpython.h
+++ b/src/pl/plpython/plpython.h
@@ -2,7 +2,7 @@
  *
  * plpython.h - Python as a procedural language for PostgreSQL
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/pl/plpython/plpython.h
diff --git a/src/pl/plpython/sql/plpython_call.sql b/src/pl/plpython/sql/plpython_call.sql
new file mode 100644
index 0000000000..3fb74de5f0
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_call.sql
@@ -0,0 +1,41 @@
+--
+-- Tests for procedures / CALL syntax
+--
+
+CREATE PROCEDURE test_proc1()
+LANGUAGE plpythonu
+AS $$
+pass
+$$;
+
+CALL test_proc1();
+
+
+-- error: can't return non-None
+CREATE PROCEDURE test_proc2()
+LANGUAGE plpythonu
+AS $$
+return 5
+$$;
+
+CALL test_proc2();
+
+
+CREATE TABLE test1 (a int);
+
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE plpythonu
+AS $$
+plpy.execute("INSERT INTO test1 VALUES (%s)" % x)
+$$;
+
+CALL test_proc3(55);
+
+SELECT * FROM test1;
+
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+
+DROP TABLE test1;
diff --git a/src/pl/plpython/sql/plpython_error.sql b/src/pl/plpython/sql/plpython_error.sql
index d0df7e607d..d712eb1078 100644
--- a/src/pl/plpython/sql/plpython_error.sql
+++ b/src/pl/plpython/sql/plpython_error.sql
@@ -328,3 +328,19 @@ EXCEPTION WHEN SQLSTATE 'SILLY' THEN
 	-- NOOP
 END
 $$ LANGUAGE plpgsql;
+
+/* test the context stack trace for nested execution levels
+ */
+CREATE FUNCTION notice_innerfunc() RETURNS int AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.notice('inside DO') $x$")
+return 1
+$$ LANGUAGE plpythonu;
+
+CREATE FUNCTION notice_outerfunc() RETURNS int AS $$
+plpy.execute("SELECT notice_innerfunc()")
+return 1
+$$ LANGUAGE plpythonu;
+
+\set SHOW_CONTEXT always
+
+SELECT notice_outerfunc();
diff --git a/src/pl/plpython/sql/plpython_transaction.sql b/src/pl/plpython/sql/plpython_transaction.sql
new file mode 100644
index 0000000000..b337d4e300
--- /dev/null
+++ b/src/pl/plpython/sql/plpython_transaction.sql
@@ -0,0 +1,116 @@
+CREATE TABLE test1 (a int, b text);
+
+
+CREATE PROCEDURE transaction_test1()
+LANGUAGE plpythonu
+AS $$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+$$;
+
+CALL transaction_test1();
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+DO
+LANGUAGE plpythonu
+$$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+$$;
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE plpythonu
+AS $$
+for i in range(0, 10):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%d)" % i)
+    if i % 2 == 0:
+        plpy.commit()
+    else:
+        plpy.rollback()
+return 1
+$$;
+
+SELECT transaction_test2();
+
+SELECT * FROM test1;
+
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE plpythonu
+AS $$
+plpy.execute("CALL transaction_test1()")
+return 1
+$$;
+
+SELECT transaction_test3();
+
+SELECT * FROM test1;
+
+
+-- DO block inside function
+CREATE FUNCTION transaction_test4() RETURNS int
+LANGUAGE plpythonu
+AS $$
+plpy.execute("DO LANGUAGE plpythonu $x$ plpy.commit() $x$")
+return 1
+$$;
+
+SELECT transaction_test4();
+
+
+-- commit inside subtransaction (prohibited)
+DO LANGUAGE plpythonu $$
+s = plpy.subtransaction()
+s.enter()
+plpy.commit()
+$$;
+
+
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+
+TRUNCATE test1;
+
+DO LANGUAGE plpythonu $$
+for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
+    plpy.commit()
+$$;
+
+SELECT * FROM test1;
+
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+
+DO LANGUAGE plpythonu $$
+for row in plpy.cursor("SELECT * FROM test2 ORDER BY x"):
+    plpy.execute("INSERT INTO test1 (a) VALUES (%s)" % row['x'])
+    plpy.rollback()
+$$;
+
+SELECT * FROM test1;
+
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/pl/plpython/sql/plpython_types.sql b/src/pl/plpython/sql/plpython_types.sql
index 8c57297c24..cc0524ee80 100644
--- a/src/pl/plpython/sql/plpython_types.sql
+++ b/src/pl/plpython/sql/plpython_types.sql
@@ -387,6 +387,55 @@ $$ LANGUAGE plpythonu;
 SELECT * FROM test_type_conversion_array_domain_check_violation();
 
 
+--
+-- Arrays of domains
+--
+
+CREATE FUNCTION test_read_uint2_array(x uint2[]) RETURNS uint2 AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+
+select test_read_uint2_array(array[1::uint2]);
+
+CREATE FUNCTION test_build_uint2_array(x int2) RETURNS uint2[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+
+select test_build_uint2_array(1::int2);
+select test_build_uint2_array(-1::int2);  -- fail
+
+--
+-- ideally this would work, but for now it doesn't, because the return value
+-- is [[2,4], [2,4]] which our conversion code thinks should become a 2-D
+-- integer array, not an array of arrays.
+--
+CREATE FUNCTION test_type_conversion_domain_array(x integer[])
+  RETURNS ordered_pair_domain[] AS $$
+return [x, x]
+$$ LANGUAGE plpythonu;
+
+select test_type_conversion_domain_array(array[2,4]);
+select test_type_conversion_domain_array(array[4,2]);  -- fail
+
+CREATE FUNCTION test_type_conversion_domain_array2(x ordered_pair_domain)
+  RETURNS integer AS $$
+plpy.info(x, type(x))
+return x[1]
+$$ LANGUAGE plpythonu;
+
+select test_type_conversion_domain_array2(array[2,4]);
+select test_type_conversion_domain_array2(array[4,2]);  -- fail
+
+CREATE FUNCTION test_type_conversion_array_domain_array(x ordered_pair_domain[])
+  RETURNS ordered_pair_domain AS $$
+plpy.info(x, type(x))
+return x[0]
+$$ LANGUAGE plpythonu;
+
+select test_type_conversion_array_domain_array(array[array[2,4]::ordered_pair_domain]);
+
+
 ---
 --- Composite types
 ---
@@ -430,6 +479,48 @@ ALTER TYPE named_pair RENAME TO named_pair_2;
 SELECT test_composite_type_input(row(1, 2));
 
 
+--
+-- Domains within composite
+--
+
+CREATE TYPE nnint_container AS (f1 int, f2 nnint);
+
+CREATE FUNCTION nnint_test(x int, y int) RETURNS nnint_container AS $$
+return {'f1': x, 'f2': y}
+$$ LANGUAGE plpythonu;
+
+SELECT nnint_test(null, 3);
+SELECT nnint_test(3, null);  -- fail
+
+
+--
+-- Domains of composite
+--
+
+CREATE DOMAIN ordered_named_pair AS named_pair_2 CHECK((VALUE).i <= (VALUE).j);
+
+CREATE FUNCTION read_ordered_named_pair(p ordered_named_pair) RETURNS integer AS $$
+return p['i'] + p['j']
+$$ LANGUAGE plpythonu;
+
+SELECT read_ordered_named_pair(row(1, 2));
+SELECT read_ordered_named_pair(row(2, 1));  -- fail
+
+CREATE FUNCTION build_ordered_named_pair(i int, j int) RETURNS ordered_named_pair AS $$
+return {'i': i, 'j': j}
+$$ LANGUAGE plpythonu;
+
+SELECT build_ordered_named_pair(1,2);
+SELECT build_ordered_named_pair(2,1);  -- fail
+
+CREATE FUNCTION build_ordered_named_pairs(i int, j int) RETURNS ordered_named_pair[] AS $$
+return [{'i': i, 'j': j}, {'i': i, 'j': j+1}]
+$$ LANGUAGE plpythonu;
+
+SELECT build_ordered_named_pairs(1,2);
+SELECT build_ordered_named_pairs(2,1);  -- fail
+
+
 --
 -- Prepared statements
 --
diff --git a/src/pl/tcl/Makefile b/src/pl/tcl/Makefile
index b8971d3cc8..ef61ee596e 100644
--- a/src/pl/tcl/Makefile
+++ b/src/pl/tcl/Makefile
@@ -28,7 +28,7 @@ DATA = pltcl.control pltcl--1.0.sql pltcl--unpackaged--1.0.sql \
        pltclu.control pltclu--1.0.sql pltclu--unpackaged--1.0.sql
 
 REGRESS_OPTS = --dbname=$(PL_TESTDB) --load-extension=pltcl
-REGRESS = pltcl_setup pltcl_queries pltcl_start_proc pltcl_subxact pltcl_unicode
+REGRESS = pltcl_setup pltcl_queries pltcl_call pltcl_start_proc pltcl_subxact pltcl_unicode pltcl_transaction
 
 # Tcl on win32 ships with import libraries only for Microsoft Visual C++,
 # which are not compatible with mingw gcc. Therefore we need to build a
diff --git a/src/pl/tcl/expected/pltcl_call.out b/src/pl/tcl/expected/pltcl_call.out
new file mode 100644
index 0000000000..7221a37ad0
--- /dev/null
+++ b/src/pl/tcl/expected/pltcl_call.out
@@ -0,0 +1,29 @@
+CREATE PROCEDURE test_proc1()
+LANGUAGE pltcl
+AS $$
+unset
+$$;
+CALL test_proc1();
+CREATE PROCEDURE test_proc2()
+LANGUAGE pltcl
+AS $$
+return 5
+$$;
+CALL test_proc2();
+CREATE TABLE test1 (a int);
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE pltcl
+AS $$
+spi_exec "INSERT INTO test1 VALUES ($1)"
+$$;
+CALL test_proc3(55);
+SELECT * FROM test1;
+ a  
+----
+ 55
+(1 row)
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+DROP TABLE test1;
diff --git a/src/pl/tcl/expected/pltcl_queries.out b/src/pl/tcl/expected/pltcl_queries.out
index 5f50f46887..736671cc1b 100644
--- a/src/pl/tcl/expected/pltcl_queries.out
+++ b/src/pl/tcl/expected/pltcl_queries.out
@@ -327,6 +327,46 @@ select tcl_composite_arg_ref2(row('tkey', 42, 'ref2'));
  ref2                
 (1 row)
 
+-- More tests for composite argument/result types
+create domain d_dta1 as T_dta1 check ((value).ref1 > 0);
+create function tcl_record_arg(record, fldname text) returns int as '
+    return $1($2)
+' language pltcl;
+select tcl_record_arg(row('tkey', 42, 'ref2')::T_dta1, 'ref1');
+ tcl_record_arg 
+----------------
+             42
+(1 row)
+
+select tcl_record_arg(row('tkey', 42, 'ref2')::d_dta1, 'ref1');
+ tcl_record_arg 
+----------------
+             42
+(1 row)
+
+select tcl_record_arg(row(2,4), 'f2');
+ tcl_record_arg 
+----------------
+              4
+(1 row)
+
+create function tcl_cdomain_arg(d_dta1) returns int as '
+    return $1(ref1)
+' language pltcl;
+select tcl_cdomain_arg(row('tkey', 42, 'ref2'));
+ tcl_cdomain_arg 
+-----------------
+              42
+(1 row)
+
+select tcl_cdomain_arg(row('tkey', 42, 'ref2')::T_dta1);
+ tcl_cdomain_arg 
+-----------------
+              42
+(1 row)
+
+select tcl_cdomain_arg(row('tkey', -1, 'ref2'));  -- fail
+ERROR:  value for domain d_dta1 violates check constraint "d_dta1_check"
 -- Test argisnull primitive
 select tcl_argisnull('foo');
  tcl_argisnull 
@@ -438,6 +478,60 @@ return_next [list a 1 b 2 cow 3]
 $$ language pltcl;
 select bad_field_srf();
 ERROR:  column name/value list contains nonexistent column name "cow"
+-- test composite and domain-over-composite results
+create function tcl_composite_result(int) returns T_dta1 as $$
+return [list tkey tkey1 ref1 $1 ref2 ref22]
+$$ language pltcl;
+select tcl_composite_result(1001);
+            tcl_composite_result            
+--------------------------------------------
+ ("tkey1     ",1001,"ref22               ")
+(1 row)
+
+select * from tcl_composite_result(1002);
+    tkey    | ref1 |         ref2         
+------------+------+----------------------
+ tkey1      | 1002 | ref22               
+(1 row)
+
+create function tcl_dcomposite_result(int) returns d_dta1 as $$
+return [list tkey tkey2 ref1 $1 ref2 ref42]
+$$ language pltcl;
+select tcl_dcomposite_result(1001);
+           tcl_dcomposite_result            
+--------------------------------------------
+ ("tkey2     ",1001,"ref42               ")
+(1 row)
+
+select * from tcl_dcomposite_result(1002);
+    tkey    | ref1 |         ref2         
+------------+------+----------------------
+ tkey2      | 1002 | ref42               
+(1 row)
+
+select * from tcl_dcomposite_result(-1);  -- fail
+ERROR:  value for domain d_dta1 violates check constraint "d_dta1_check"
+create function tcl_record_result(int) returns record as $$
+return [list q1 sometext q2 $1 q3 moretext]
+$$ language pltcl;
+select tcl_record_result(42);  -- fail
+ERROR:  function returning record called in context that cannot accept type record
+select * from tcl_record_result(42);  -- fail
+ERROR:  a column definition list is required for functions returning "record" at character 15
+select * from tcl_record_result(42) as (q1 text, q2 int, q3 text);
+    q1    | q2 |    q3    
+----------+----+----------
+ sometext | 42 | moretext
+(1 row)
+
+select * from tcl_record_result(42) as (q1 text, q2 int, q3 text, q4 int);
+    q1    | q2 |    q3    | q4 
+----------+----+----------+----
+ sometext | 42 | moretext |   
+(1 row)
+
+select * from tcl_record_result(42) as (q1 text, q2 int, q4 int);  -- fail
+ERROR:  column name/value list contains nonexistent column name "q3"
 -- test quote
 select tcl_eval('quote foo bar');
 ERROR:  wrong # args: should be "quote string"
diff --git a/src/pl/tcl/expected/pltcl_transaction.out b/src/pl/tcl/expected/pltcl_transaction.out
new file mode 100644
index 0000000000..007204b99a
--- /dev/null
+++ b/src/pl/tcl/expected/pltcl_transaction.out
@@ -0,0 +1,100 @@
+-- suppress CONTEXT so that function OIDs aren't in output
+\set VERBOSITY terse
+CREATE TABLE test1 (a int, b text);
+CREATE PROCEDURE transaction_test1()
+LANGUAGE pltcl
+AS $$
+for {set i 0} {$i < 10} {incr i} {
+    spi_exec "INSERT INTO test1 (a) VALUES ($i)"
+    if {$i % 2 == 0} {
+        commit
+    } else {
+        rollback
+    }
+}
+$$;
+CALL transaction_test1();
+SELECT * FROM test1;
+ a | b 
+---+---
+ 0 | 
+ 2 | 
+ 4 | 
+ 6 | 
+ 8 | 
+(5 rows)
+
+TRUNCATE test1;
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE pltcl
+AS $$
+for {set i 0} {$i < 10} {incr i} {
+    spi_exec "INSERT INTO test1 (a) VALUES ($i)"
+    if {$i % 2 == 0} {
+        commit
+    } else {
+        rollback
+    }
+}
+return 1
+$$;
+SELECT transaction_test2();
+ERROR:  invalid transaction termination
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE pltcl
+AS $$
+spi_exec "CALL transaction_test1()"
+return 1
+$$;
+SELECT transaction_test3();
+ERROR:  invalid transaction termination
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+TRUNCATE test1;
+CREATE PROCEDURE transaction_test4a()
+LANGUAGE pltcl
+AS $$
+spi_exec -array row "SELECT * FROM test2 ORDER BY x" {
+    spi_exec "INSERT INTO test1 (a) VALUES ($row(x))"
+    commit
+}
+$$;
+CALL transaction_test4a();
+ERROR:  cannot commit while a subtransaction is active
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+CREATE PROCEDURE transaction_test4b()
+LANGUAGE pltcl
+AS $$
+spi_exec -array row "SELECT * FROM test2 ORDER BY x" {
+    spi_exec "INSERT INTO test1 (a) VALUES ($row(x))"
+    rollback
+}
+$$;
+CALL transaction_test4b();
+ERROR:  cannot roll back while a subtransaction is active
+SELECT * FROM test1;
+ a | b 
+---+---
+(0 rows)
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/pl/tcl/generate-pltclerrcodes.pl b/src/pl/tcl/generate-pltclerrcodes.pl
index b4e429a4fb..b5a595510c 100644
--- a/src/pl/tcl/generate-pltclerrcodes.pl
+++ b/src/pl/tcl/generate-pltclerrcodes.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 #
 # Generate the pltclerrcodes.h header from errcodes.txt
-# Copyright (c) 2000-2017, PostgreSQL Global Development Group
+# Copyright (c) 2000-2018, PostgreSQL Global Development Group
 
 use warnings;
 use strict;
diff --git a/src/pl/tcl/pltcl.c b/src/pl/tcl/pltcl.c
index ed494e1210..5df4dfdf55 100644
--- a/src/pl/tcl/pltcl.c
+++ b/src/pl/tcl/pltcl.c
@@ -143,10 +143,14 @@ typedef struct pltcl_proc_desc
 	bool		fn_readonly;	/* is function readonly? */
 	bool		lanpltrusted;	/* is it pltcl (vs. pltclu)? */
 	pltcl_interp_desc *interp_desc; /* interpreter to use */
+	Oid			result_typid;	/* OID of fn's result type */
 	FmgrInfo	result_in_func; /* input function for fn's result type */
 	Oid			result_typioparam;	/* param to pass to same */
+	bool		fn_is_procedure;	/* true if this is a procedure */
 	bool		fn_retisset;	/* true if function returns a set */
 	bool		fn_retistuple;	/* true if function returns composite */
+	bool		fn_retisdomain; /* true if function returns domain */
+	void	   *domain_info;	/* opaque cache for domain checks */
 	int			nargs;			/* number of arguments */
 	/* these arrays have nargs entries: */
 	FmgrInfo   *arg_out_func;	/* output fns for arg types */
@@ -308,6 +312,10 @@ static int pltcl_SPI_lastoid(ClientData cdata, Tcl_Interp *interp,
 				  int objc, Tcl_Obj *const objv[]);
 static int pltcl_subtransaction(ClientData cdata, Tcl_Interp *interp,
 					 int objc, Tcl_Obj *const objv[]);
+static int pltcl_commit(ClientData cdata, Tcl_Interp *interp,
+					 int objc, Tcl_Obj *const objv[]);
+static int pltcl_rollback(ClientData cdata, Tcl_Interp *interp,
+					 int objc, Tcl_Obj *const objv[]);
 
 static void pltcl_subtrans_begin(MemoryContext oldcontext,
 					 ResourceOwner oldowner);
@@ -520,6 +528,10 @@ pltcl_init_interp(pltcl_interp_desc *interp_desc, Oid prolang, bool pltrusted)
 						 pltcl_SPI_lastoid, NULL, NULL);
 	Tcl_CreateObjCommand(interp, "subtransaction",
 						 pltcl_subtransaction, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "commit",
+						 pltcl_commit, NULL, NULL);
+	Tcl_CreateObjCommand(interp, "rollback",
+						 pltcl_rollback, NULL, NULL);
 
 	/************************************************************
 	 * Call the appropriate start_proc, if there is one.
@@ -614,7 +626,7 @@ call_pltcl_start_proc(Oid prolang, bool pltrusted)
 	/* Current user must have permission to call function */
 	aclresult = pg_proc_aclcheck(procOid, GetUserId(), ACL_EXECUTE);
 	if (aclresult != ACLCHECK_OK)
-		aclcheck_error(aclresult, ACL_KIND_PROC, start_proc);
+		aclcheck_error(aclresult, OBJECT_FUNCTION, start_proc);
 
 	/* Get the function's pg_proc entry */
 	procTup = SearchSysCache1(PROCOID, ObjectIdGetDatum(procOid));
@@ -793,6 +805,7 @@ static Datum
 pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 				   bool pltrusted)
 {
+	bool		nonatomic;
 	pltcl_proc_desc *prodesc;
 	Tcl_Interp *volatile interp;
 	Tcl_Obj    *tcl_cmd;
@@ -800,8 +813,12 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 	int			tcl_rc;
 	Datum		retval;
 
+	nonatomic = fcinfo->context &&
+		IsA(fcinfo->context, CallContext) &&
+		!castNode(CallContext, fcinfo->context)->atomic;
+
 	/* Connect to SPI manager */
-	if (SPI_connect() != SPI_OK_CONNECT)
+	if (SPI_connect_ext(nonatomic ? SPI_OPT_NONATOMIC : 0) != SPI_OK_CONNECT)
 		elog(ERROR, "could not connect to SPI manager");
 
 	/* Find or compile the function */
@@ -965,7 +982,7 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 		retval = (Datum) 0;
 		fcinfo->isnull = true;
 	}
-	else if (fcinfo->isnull)
+	else if (fcinfo->isnull && !prodesc->fn_is_procedure)
 	{
 		retval = InputFunctionCall(&prodesc->result_in_func,
 								   NULL,
@@ -988,11 +1005,26 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 		 * result type is a named composite type, so it's not exactly trivial.
 		 * Maybe worth improving someday.
 		 */
-		if (get_call_result_type(fcinfo, NULL, &td) != TYPEFUNC_COMPOSITE)
-			ereport(ERROR,
-					(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-					 errmsg("function returning record called in context "
-							"that cannot accept type record")));
+		switch (get_call_result_type(fcinfo, NULL, &td))
+		{
+			case TYPEFUNC_COMPOSITE:
+				/* success */
+				break;
+			case TYPEFUNC_COMPOSITE_DOMAIN:
+				Assert(prodesc->fn_retisdomain);
+				break;
+			case TYPEFUNC_RECORD:
+				/* failed to determine actual type of RECORD */
+				ereport(ERROR,
+						(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
+						 errmsg("function returning record called in context "
+								"that cannot accept type record")));
+				break;
+			default:
+				/* result type isn't composite? */
+				elog(ERROR, "return type must be a row type");
+				break;
+		}
 
 		Assert(!call_state->ret_tupdesc);
 		Assert(!call_state->attinmeta);
@@ -1008,11 +1040,13 @@ pltcl_func_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 									   call_state);
 		retval = HeapTupleGetDatum(tup);
 	}
-	else
+	else if (!prodesc->fn_is_procedure)
 		retval = InputFunctionCall(&prodesc->result_in_func,
 								   utf_u2e(Tcl_GetStringResult(interp)),
 								   prodesc->result_typioparam,
 								   -1);
+	else
+		retval = 0;
 
 	return retval;
 }
@@ -1106,11 +1140,13 @@ pltcl_trigger_handler(PG_FUNCTION_ARGS, pltcl_call_state *call_state,
 		Tcl_ListObjAppendElement(NULL, tcl_trigtup, Tcl_NewObj());
 		for (i = 0; i < tupdesc->natts; i++)
 		{
-			if (tupdesc->attrs[i]->attisdropped)
+			Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
+			if (att->attisdropped)
 				Tcl_ListObjAppendElement(NULL, tcl_trigtup, Tcl_NewObj());
 			else
 				Tcl_ListObjAppendElement(NULL, tcl_trigtup,
-										 Tcl_NewStringObj(utf_e2u(NameStr(tupdesc->attrs[i]->attname)), -1));
+										 Tcl_NewStringObj(utf_e2u(NameStr(att->attname)), -1));
 		}
 		Tcl_ListObjAppendElement(NULL, tcl_cmd, tcl_trigtup);
 
@@ -1448,9 +1484,10 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid,
 		 * Allocate a context that will hold all PG data for the procedure.
 		 * We use the internal proc name as the context name.
 		 ************************************************************/
-		proc_cxt = AllocSetContextCreate(TopMemoryContext,
-										 internal_proname,
-										 ALLOCSET_SMALL_SIZES);
+		proc_cxt = AllocSetContextCreateExtended(TopMemoryContext,
+												 internal_proname,
+												 MEMCONTEXT_COPY_NAME,
+												 ALLOCSET_SMALL_SIZES);
 
 		/************************************************************
 		 * Allocate and fill a new procedure description block.
@@ -1486,24 +1523,25 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid,
 		 * Get the required information for input conversion of the
 		 * return value.
 		 ************************************************************/
-		if (!is_trigger && !is_event_trigger)
+		prodesc->fn_is_procedure = (procStruct->prorettype == InvalidOid);
+
+		if (!is_trigger && !is_event_trigger && procStruct->prorettype)
 		{
-			typeTup =
-				SearchSysCache1(TYPEOID,
-								ObjectIdGetDatum(procStruct->prorettype));
+			Oid			rettype = procStruct->prorettype;
+
+			typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(rettype));
 			if (!HeapTupleIsValid(typeTup))
-				elog(ERROR, "cache lookup failed for type %u",
-					 procStruct->prorettype);
+				elog(ERROR, "cache lookup failed for type %u", rettype);
 			typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
 			/* Disallow pseudotype result, except VOID and RECORD */
 			if (typeStruct->typtype == TYPTYPE_PSEUDO)
 			{
-				if (procStruct->prorettype == VOIDOID ||
-					procStruct->prorettype == RECORDOID)
+				if (rettype == VOIDOID ||
+					rettype == RECORDOID)
 					 /* okay */ ;
-				else if (procStruct->prorettype == TRIGGEROID ||
-						 procStruct->prorettype == EVTTRIGGEROID)
+				else if (rettype == TRIGGEROID ||
+						 rettype == EVTTRIGGEROID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("trigger functions can only be called as triggers")));
@@ -1511,17 +1549,19 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid,
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Tcl functions cannot return type %s",
-									format_type_be(procStruct->prorettype))));
+									format_type_be(rettype))));
 			}
 
+			prodesc->result_typid = rettype;
 			fmgr_info_cxt(typeStruct->typinput,
 						  &(prodesc->result_in_func),
 						  proc_cxt);
 			prodesc->result_typioparam = getTypeIOParam(typeTup);
 
 			prodesc->fn_retisset = procStruct->proretset;
-			prodesc->fn_retistuple = (procStruct->prorettype == RECORDOID ||
-									  typeStruct->typtype == TYPTYPE_COMPOSITE);
+			prodesc->fn_retistuple = type_is_rowtype(rettype);
+			prodesc->fn_retisdomain = (typeStruct->typtype == TYPTYPE_DOMAIN);
+			prodesc->domain_info = NULL;
 
 			ReleaseSysCache(typeTup);
 		}
@@ -1535,21 +1575,22 @@ compile_pltcl_function(Oid fn_oid, Oid tgreloid,
 			proc_internal_args[0] = '\0';
 			for (i = 0; i < prodesc->nargs; i++)
 			{
-				typeTup = SearchSysCache1(TYPEOID,
-										  ObjectIdGetDatum(procStruct->proargtypes.values[i]));
+				Oid			argtype = procStruct->proargtypes.values[i];
+
+				typeTup = SearchSysCache1(TYPEOID, ObjectIdGetDatum(argtype));
 				if (!HeapTupleIsValid(typeTup))
-					elog(ERROR, "cache lookup failed for type %u",
-						 procStruct->proargtypes.values[i]);
+					elog(ERROR, "cache lookup failed for type %u", argtype);
 				typeStruct = (Form_pg_type) GETSTRUCT(typeTup);
 
-				/* Disallow pseudotype argument */
-				if (typeStruct->typtype == TYPTYPE_PSEUDO)
+				/* Disallow pseudotype argument, except RECORD */
+				if (typeStruct->typtype == TYPTYPE_PSEUDO &&
+					argtype != RECORDOID)
 					ereport(ERROR,
 							(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
 							 errmsg("PL/Tcl functions cannot accept type %s",
-									format_type_be(procStruct->proargtypes.values[i]))));
+									format_type_be(argtype))));
 
-				if (typeStruct->typtype == TYPTYPE_COMPOSITE)
+				if (type_is_rowtype(argtype))
 				{
 					prodesc->arg_is_rowtype[i] = true;
 					snprintf(buf, sizeof(buf), "__PLTcl_Tup_%d", i + 1);
@@ -2177,7 +2218,7 @@ pltcl_returnnext(ClientData cdata, Tcl_Interp *interp,
 				tuplestore_puttuple(call_state->tuple_store, tuple);
 			}
 		}
-		else
+		else if (!prodesc->fn_is_procedure)
 		{
 			Datum		retval;
 			bool		isNull = false;
@@ -2908,6 +2949,86 @@ pltcl_subtransaction(ClientData cdata, Tcl_Interp *interp,
 }
 
 
+/**********************************************************************
+ * pltcl_commit()
+ *
+ * Commit the transaction and start a new one.
+ **********************************************************************/
+static int
+pltcl_commit(ClientData cdata, Tcl_Interp *interp,
+			 int objc, Tcl_Obj *const objv[])
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		SPI_commit();
+		SPI_start_transaction();
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Save error info */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		/* Pass the error data to Tcl */
+		pltcl_construct_errorCode(interp, edata);
+		UTF_BEGIN;
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(UTF_E2U(edata->message), -1));
+		UTF_END;
+		FreeErrorData(edata);
+
+		return TCL_ERROR;
+	}
+	PG_END_TRY();
+
+	return TCL_OK;
+}
+
+
+/**********************************************************************
+ * pltcl_rollback()
+ *
+ * Abort the transaction and start a new one.
+ **********************************************************************/
+static int
+pltcl_rollback(ClientData cdata, Tcl_Interp *interp,
+			   int objc, Tcl_Obj *const objv[])
+{
+	MemoryContext oldcontext = CurrentMemoryContext;
+
+	PG_TRY();
+	{
+		SPI_rollback();
+		SPI_start_transaction();
+	}
+	PG_CATCH();
+	{
+		ErrorData  *edata;
+
+		/* Save error info */
+		MemoryContextSwitchTo(oldcontext);
+		edata = CopyErrorData();
+		FlushErrorState();
+
+		/* Pass the error data to Tcl */
+		pltcl_construct_errorCode(interp, edata);
+		UTF_BEGIN;
+		Tcl_SetObjResult(interp, Tcl_NewStringObj(UTF_E2U(edata->message), -1));
+		UTF_END;
+		FreeErrorData(edata);
+
+		return TCL_ERROR;
+	}
+	PG_END_TRY();
+
+	return TCL_OK;
+}
+
+
 /**********************************************************************
  * pltcl_set_tuple_values() - Set variables for all attributes
  *				  of a given tuple
@@ -2952,15 +3073,17 @@ pltcl_set_tuple_values(Tcl_Interp *interp, const char *arrayname,
 
 	for (i = 0; i < tupdesc->natts; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
 		/* ignore dropped attributes */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		/************************************************************
 		 * Get the attribute name
 		 ************************************************************/
 		UTF_BEGIN;
-		attname = pstrdup(UTF_E2U(NameStr(tupdesc->attrs[i]->attname)));
+		attname = pstrdup(UTF_E2U(NameStr(att->attname)));
 		UTF_END;
 
 		/************************************************************
@@ -2978,8 +3101,7 @@ pltcl_set_tuple_values(Tcl_Interp *interp, const char *arrayname,
 		 ************************************************************/
 		if (!isnull)
 		{
-			getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
-							  &typoutput, &typisvarlena);
+			getTypeOutputInfo(att->atttypid, &typoutput, &typisvarlena);
 			outputstr = OidOutputFunctionCall(typoutput, attr);
 			UTF_BEGIN;
 			Tcl_SetVar2Ex(interp, *arrptr, *nameptr,
@@ -3013,14 +3135,16 @@ pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc)
 
 	for (i = 0; i < tupdesc->natts; i++)
 	{
+		Form_pg_attribute att = TupleDescAttr(tupdesc, i);
+
 		/* ignore dropped attributes */
-		if (tupdesc->attrs[i]->attisdropped)
+		if (att->attisdropped)
 			continue;
 
 		/************************************************************
 		 * Get the attribute name
 		 ************************************************************/
-		attname = NameStr(tupdesc->attrs[i]->attname);
+		attname = NameStr(att->attname);
 
 		/************************************************************
 		 * Get the attributes value
@@ -3037,7 +3161,7 @@ pltcl_build_tuple_argument(HeapTuple tuple, TupleDesc tupdesc)
 		 ************************************************************/
 		if (!isnull)
 		{
-			getTypeOutputInfo(tupdesc->attrs[i]->atttypid,
+			getTypeOutputInfo(att->atttypid,
 							  &typoutput, &typisvarlena);
 			outputstr = OidOutputFunctionCall(typoutput, attr);
 			UTF_BEGIN;
@@ -3070,6 +3194,7 @@ static HeapTuple
 pltcl_build_tuple_result(Tcl_Interp *interp, Tcl_Obj **kvObjv, int kvObjc,
 						 pltcl_call_state *call_state)
 {
+	HeapTuple	tuple;
 	TupleDesc	tupdesc;
 	AttInMetadata *attinmeta;
 	char	  **values;
@@ -3128,7 +3253,16 @@ pltcl_build_tuple_result(Tcl_Interp *interp, Tcl_Obj **kvObjv, int kvObjc,
 		values[attn - 1] = utf_u2e(Tcl_GetString(kvObjv[i + 1]));
 	}
 
-	return BuildTupleFromCStrings(attinmeta, values);
+	tuple = BuildTupleFromCStrings(attinmeta, values);
+
+	/* if result type is domain-over-composite, check domain constraints */
+	if (call_state->prodesc->fn_retisdomain)
+		domain_check(HeapTupleGetDatum(tuple), false,
+					 call_state->prodesc->result_typid,
+					 &call_state->prodesc->domain_info,
+					 call_state->prodesc->fn_cxt);
+
+	return tuple;
 }
 
 /**********************************************************************
diff --git a/src/pl/tcl/sql/pltcl_call.sql b/src/pl/tcl/sql/pltcl_call.sql
new file mode 100644
index 0000000000..ef1f540f50
--- /dev/null
+++ b/src/pl/tcl/sql/pltcl_call.sql
@@ -0,0 +1,36 @@
+CREATE PROCEDURE test_proc1()
+LANGUAGE pltcl
+AS $$
+unset
+$$;
+
+CALL test_proc1();
+
+
+CREATE PROCEDURE test_proc2()
+LANGUAGE pltcl
+AS $$
+return 5
+$$;
+
+CALL test_proc2();
+
+
+CREATE TABLE test1 (a int);
+
+CREATE PROCEDURE test_proc3(x int)
+LANGUAGE pltcl
+AS $$
+spi_exec "INSERT INTO test1 VALUES ($1)"
+$$;
+
+CALL test_proc3(55);
+
+SELECT * FROM test1;
+
+
+DROP PROCEDURE test_proc1;
+DROP PROCEDURE test_proc2;
+DROP PROCEDURE test_proc3;
+
+DROP TABLE test1;
diff --git a/src/pl/tcl/sql/pltcl_queries.sql b/src/pl/tcl/sql/pltcl_queries.sql
index dabd8cd35f..71c1238bd2 100644
--- a/src/pl/tcl/sql/pltcl_queries.sql
+++ b/src/pl/tcl/sql/pltcl_queries.sql
@@ -89,6 +89,26 @@ truncate trigger_test;
 select tcl_composite_arg_ref1(row('tkey', 42, 'ref2'));
 select tcl_composite_arg_ref2(row('tkey', 42, 'ref2'));
 
+-- More tests for composite argument/result types
+
+create domain d_dta1 as T_dta1 check ((value).ref1 > 0);
+
+create function tcl_record_arg(record, fldname text) returns int as '
+    return $1($2)
+' language pltcl;
+
+select tcl_record_arg(row('tkey', 42, 'ref2')::T_dta1, 'ref1');
+select tcl_record_arg(row('tkey', 42, 'ref2')::d_dta1, 'ref1');
+select tcl_record_arg(row(2,4), 'f2');
+
+create function tcl_cdomain_arg(d_dta1) returns int as '
+    return $1(ref1)
+' language pltcl;
+
+select tcl_cdomain_arg(row('tkey', 42, 'ref2'));
+select tcl_cdomain_arg(row('tkey', 42, 'ref2')::T_dta1);
+select tcl_cdomain_arg(row('tkey', -1, 'ref2'));  -- fail
+
 -- Test argisnull primitive
 select tcl_argisnull('foo');
 select tcl_argisnull('');
@@ -136,6 +156,29 @@ return_next [list a 1 b 2 cow 3]
 $$ language pltcl;
 select bad_field_srf();
 
+-- test composite and domain-over-composite results
+create function tcl_composite_result(int) returns T_dta1 as $$
+return [list tkey tkey1 ref1 $1 ref2 ref22]
+$$ language pltcl;
+select tcl_composite_result(1001);
+select * from tcl_composite_result(1002);
+
+create function tcl_dcomposite_result(int) returns d_dta1 as $$
+return [list tkey tkey2 ref1 $1 ref2 ref42]
+$$ language pltcl;
+select tcl_dcomposite_result(1001);
+select * from tcl_dcomposite_result(1002);
+select * from tcl_dcomposite_result(-1);  -- fail
+
+create function tcl_record_result(int) returns record as $$
+return [list q1 sometext q2 $1 q3 moretext]
+$$ language pltcl;
+select tcl_record_result(42);  -- fail
+select * from tcl_record_result(42);  -- fail
+select * from tcl_record_result(42) as (q1 text, q2 int, q3 text);
+select * from tcl_record_result(42) as (q1 text, q2 int, q3 text, q4 int);
+select * from tcl_record_result(42) as (q1 text, q2 int, q4 int);  -- fail
+
 -- test quote
 select tcl_eval('quote foo bar');
 select tcl_eval('quote [format %c 39]');
diff --git a/src/pl/tcl/sql/pltcl_transaction.sql b/src/pl/tcl/sql/pltcl_transaction.sql
new file mode 100644
index 0000000000..c752faf665
--- /dev/null
+++ b/src/pl/tcl/sql/pltcl_transaction.sql
@@ -0,0 +1,98 @@
+-- suppress CONTEXT so that function OIDs aren't in output
+\set VERBOSITY terse
+
+CREATE TABLE test1 (a int, b text);
+
+
+CREATE PROCEDURE transaction_test1()
+LANGUAGE pltcl
+AS $$
+for {set i 0} {$i < 10} {incr i} {
+    spi_exec "INSERT INTO test1 (a) VALUES ($i)"
+    if {$i % 2 == 0} {
+        commit
+    } else {
+        rollback
+    }
+}
+$$;
+
+CALL transaction_test1();
+
+SELECT * FROM test1;
+
+
+TRUNCATE test1;
+
+-- not allowed in a function
+CREATE FUNCTION transaction_test2() RETURNS int
+LANGUAGE pltcl
+AS $$
+for {set i 0} {$i < 10} {incr i} {
+    spi_exec "INSERT INTO test1 (a) VALUES ($i)"
+    if {$i % 2 == 0} {
+        commit
+    } else {
+        rollback
+    }
+}
+return 1
+$$;
+
+SELECT transaction_test2();
+
+SELECT * FROM test1;
+
+
+-- also not allowed if procedure is called from a function
+CREATE FUNCTION transaction_test3() RETURNS int
+LANGUAGE pltcl
+AS $$
+spi_exec "CALL transaction_test1()"
+return 1
+$$;
+
+SELECT transaction_test3();
+
+SELECT * FROM test1;
+
+
+-- commit inside cursor loop
+CREATE TABLE test2 (x int);
+INSERT INTO test2 VALUES (0), (1), (2), (3), (4);
+
+TRUNCATE test1;
+
+CREATE PROCEDURE transaction_test4a()
+LANGUAGE pltcl
+AS $$
+spi_exec -array row "SELECT * FROM test2 ORDER BY x" {
+    spi_exec "INSERT INTO test1 (a) VALUES ($row(x))"
+    commit
+}
+$$;
+
+CALL transaction_test4a();
+
+SELECT * FROM test1;
+
+
+-- rollback inside cursor loop
+TRUNCATE test1;
+
+CREATE PROCEDURE transaction_test4b()
+LANGUAGE pltcl
+AS $$
+spi_exec -array row "SELECT * FROM test2 ORDER BY x" {
+    spi_exec "INSERT INTO test1 (a) VALUES ($row(x))"
+    rollback
+}
+$$;
+
+CALL transaction_test4b();
+
+SELECT * FROM test1;
+
+
+DROP TABLE test1;
+DROP TABLE test2;
diff --git a/src/port/chklocale.c b/src/port/chklocale.c
index c357fed6dc..dde913099f 100644
--- a/src/port/chklocale.c
+++ b/src/port/chklocale.c
@@ -4,7 +4,7 @@
  *		Functions for handling locale-related info
  *
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/port/dirent.c b/src/port/dirent.c
index 2bab7938a0..7d1d069647 100644
--- a/src/port/dirent.c
+++ b/src/port/dirent.c
@@ -3,7 +3,7 @@
  * dirent.c
  *	  opendir/readdir/closedir for win32/msvc
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/dirmod.c b/src/port/dirmod.c
index eac59bdfda..26611922db 100644
--- a/src/port/dirmod.c
+++ b/src/port/dirmod.c
@@ -3,7 +3,7 @@
  * dirmod.c
  *	  directory handling functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	This includes replacement versions of functions that work on
diff --git a/src/port/fls.c b/src/port/fls.c
index ddd18f17f5..46dceb59d5 100644
--- a/src/port/fls.c
+++ b/src/port/fls.c
@@ -3,7 +3,7 @@
  * fls.c
  *	  finds the last (most significant) bit that is set
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/port/fseeko.c b/src/port/fseeko.c
index e9c0b07f0b..38b9cbde91 100644
--- a/src/port/fseeko.c
+++ b/src/port/fseeko.c
@@ -3,7 +3,7 @@
  * fseeko.c
  *	  64-bit versions of fseeko/ftello()
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/getaddrinfo.c b/src/port/getaddrinfo.c
index e5b5702c79..21f1f1b94b 100644
--- a/src/port/getaddrinfo.c
+++ b/src/port/getaddrinfo.c
@@ -13,7 +13,7 @@
  * use the Windows native routines, but if not, we use our own.
  *
  *
- * Copyright (c) 2003-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2003-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/getaddrinfo.c
@@ -31,6 +31,7 @@
 
 #include "getaddrinfo.h"
 #include "libpq/pqcomm.h"		/* needed for struct sockaddr_storage */
+#include "port/pg_bswap.h"
 
 
 #ifdef WIN32
@@ -178,7 +179,7 @@ getaddrinfo(const char *node, const char *service,
 	if (node)
 	{
 		if (node[0] == '\0')
-			sin.sin_addr.s_addr = htonl(INADDR_ANY);
+			sin.sin_addr.s_addr = pg_hton32(INADDR_ANY);
 		else if (hints.ai_flags & AI_NUMERICHOST)
 		{
 			if (!inet_aton(node, &sin.sin_addr))
@@ -221,13 +222,13 @@ getaddrinfo(const char *node, const char *service,
 	else
 	{
 		if (hints.ai_flags & AI_PASSIVE)
-			sin.sin_addr.s_addr = htonl(INADDR_ANY);
+			sin.sin_addr.s_addr = pg_hton32(INADDR_ANY);
 		else
-			sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+			sin.sin_addr.s_addr = pg_hton32(INADDR_LOOPBACK);
 	}
 
 	if (service)
-		sin.sin_port = htons((unsigned short) atoi(service));
+		sin.sin_port = pg_hton16((unsigned short) atoi(service));
 
 #ifdef HAVE_STRUCT_SOCKADDR_STORAGE_SS_LEN
 	sin.sin_len = sizeof(sin);
@@ -402,7 +403,7 @@ getnameinfo(const struct sockaddr *sa, int salen,
 		if (sa->sa_family == AF_INET)
 		{
 			ret = snprintf(service, servicelen, "%d",
-						   ntohs(((struct sockaddr_in *) sa)->sin_port));
+						   pg_ntoh16(((struct sockaddr_in *) sa)->sin_port));
 		}
 		if (ret == -1 || ret >= servicelen)
 			return EAI_MEMORY;
diff --git a/src/port/getpeereid.c b/src/port/getpeereid.c
index 53fa663122..fa871ae68f 100644
--- a/src/port/getpeereid.c
+++ b/src/port/getpeereid.c
@@ -3,7 +3,7 @@
  * getpeereid.c
  *		get peer userid for UNIX-domain socket connection
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/port/getrusage.c b/src/port/getrusage.c
index d029fc2c76..229b5bb7fe 100644
--- a/src/port/getrusage.c
+++ b/src/port/getrusage.c
@@ -3,7 +3,7 @@
  * getrusage.c
  *	  get information about resource utilisation
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/inet_aton.c b/src/port/inet_aton.c
index 68efd4723e..adaf18adb3 100644
--- a/src/port/inet_aton.c
+++ b/src/port/inet_aton.c
@@ -43,6 +43,8 @@
 #include <netinet/in.h>
 #include <ctype.h>
 
+#include "port/pg_bswap.h"
+
 /*
  * Check whether "cp" is a valid ascii representation
  * of an Internet address and convert to a binary address.
@@ -142,6 +144,6 @@ inet_aton(const char *cp, struct in_addr *addr)
 			break;
 	}
 	if (addr)
-		addr->s_addr = htonl(val);
+		addr->s_addr = pg_hton32(val);
 	return 1;
 }
diff --git a/src/port/isinf.c b/src/port/isinf.c
index 570aa40fa2..9990f9c422 100644
--- a/src/port/isinf.c
+++ b/src/port/isinf.c
@@ -2,7 +2,7 @@
  *
  * isinf.c
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/kill.c b/src/port/kill.c
index 58343c4152..fee5abfdfa 100644
--- a/src/port/kill.c
+++ b/src/port/kill.c
@@ -3,7 +3,7 @@
  * kill.c
  *	  kill()
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *	This is a replacement version of kill for Win32 which sends
  *	signals that the backend can recognize.
diff --git a/src/port/mkdtemp.c b/src/port/mkdtemp.c
index 54844cb2f5..e0b3ada28a 100644
--- a/src/port/mkdtemp.c
+++ b/src/port/mkdtemp.c
@@ -3,7 +3,7 @@
  * mkdtemp.c
  *	  create a mode-0700 temporary directory
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/port/noblock.c b/src/port/noblock.c
index 673fa8aa3c..bd26bd5f52 100644
--- a/src/port/noblock.c
+++ b/src/port/noblock.c
@@ -3,7 +3,7 @@
  * noblock.c
  *	  set a file descriptor as blocking or non-blocking
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/port/open.c b/src/port/open.c
index 17a7145ad9..a3ad946a60 100644
--- a/src/port/open.c
+++ b/src/port/open.c
@@ -4,7 +4,7 @@
  *	   Win32 open() replacement
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/port/open.c
  *
diff --git a/src/port/path.c b/src/port/path.c
index 2578393624..1ac1dbea4f 100644
--- a/src/port/path.c
+++ b/src/port/path.c
@@ -3,7 +3,7 @@
  * path.c
  *	  portable path handling routines
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/pg_crc32c_choose.c b/src/port/pg_crc32c_choose.c
index e82c9c4b27..40bee67b0a 100644
--- a/src/port/pg_crc32c_choose.c
+++ b/src/port/pg_crc32c_choose.c
@@ -7,7 +7,7 @@
  * if available on the platform we're running on, but fall back to the
  * slicing-by-8 implementation otherwise.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/pg_crc32c_sb8.c b/src/port/pg_crc32c_sb8.c
index dfd6cd9f49..5205ba9cdc 100644
--- a/src/port/pg_crc32c_sb8.c
+++ b/src/port/pg_crc32c_sb8.c
@@ -8,7 +8,7 @@
  * Generation", IEEE Transactions on Computers, vol.57, no. 11,
  * pp. 1550-1560, November 2008, doi:10.1109/TC.2008.85
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/pg_crc32c_sse42.c b/src/port/pg_crc32c_sse42.c
index d698124121..b9def7e2ea 100644
--- a/src/port/pg_crc32c_sse42.c
+++ b/src/port/pg_crc32c_sse42.c
@@ -3,7 +3,7 @@
  * pg_crc32c_sse42.c
  *	  Compute CRC-32C checksum using Intel SSE 4.2 instructions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/pg_strong_random.c b/src/port/pg_strong_random.c
index c6ee5ea1d4..bc7a8aacb9 100644
--- a/src/port/pg_strong_random.c
+++ b/src/port/pg_strong_random.c
@@ -6,7 +6,7 @@
  * Our definition of "strong" is that it's suitable for generating random
  * salts and query cancellation keys, during authentication.
  *
- * Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/pg_strong_random.c
diff --git a/src/port/pgcheckdir.c b/src/port/pgcheckdir.c
index 965249eeaa..b5b999b385 100644
--- a/src/port/pgcheckdir.c
+++ b/src/port/pgcheckdir.c
@@ -5,7 +5,7 @@
  * A simple subroutine to check whether a directory exists and is empty or not.
  * Useful in both initdb and the backend.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
diff --git a/src/port/pgsleep.c b/src/port/pgsleep.c
index f2db68a33d..48536f4b7a 100644
--- a/src/port/pgsleep.c
+++ b/src/port/pgsleep.c
@@ -4,7 +4,7 @@
  *	   Portable delay handling.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/port/pgsleep.c
  *
diff --git a/src/port/pgstrcasecmp.c b/src/port/pgstrcasecmp.c
index d12778da8d..3aaea305c0 100644
--- a/src/port/pgstrcasecmp.c
+++ b/src/port/pgstrcasecmp.c
@@ -18,7 +18,7 @@
  * C library thinks the locale is.
  *
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/port/pgstrcasecmp.c
  *
diff --git a/src/port/pqsignal.c b/src/port/pqsignal.c
index f176387ca2..5d8d5042b0 100644
--- a/src/port/pqsignal.c
+++ b/src/port/pqsignal.c
@@ -4,7 +4,7 @@
  *	  reliable BSD-style signal(2) routine stolen from RWW who stole it
  *	  from Stevens...
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/quotes.c b/src/port/quotes.c
index d7ea934c8b..29770c7a00 100644
--- a/src/port/quotes.c
+++ b/src/port/quotes.c
@@ -3,7 +3,7 @@
  * quotes.c
  *	  string quoting and escaping functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/random.c b/src/port/random.c
index 5071b31b5d..3996225c92 100644
--- a/src/port/random.c
+++ b/src/port/random.c
@@ -3,7 +3,7 @@
  * random.c
  *	  random() wrapper
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/snprintf.c b/src/port/snprintf.c
index 231e5d6bdb..8358425980 100644
--- a/src/port/snprintf.c
+++ b/src/port/snprintf.c
@@ -745,6 +745,8 @@ dopr(PrintfTarget *target, const char *format, va_list args)
 					strvalue = argvalues[fmtpos].cptr;
 				else
 					strvalue = va_arg(args, char *);
+				/* Whine if someone tries to print a NULL string */
+				Assert(strvalue != NULL);
 				fmtstr(strvalue, leftjust, fieldwidth, precision, pointflag,
 					   target);
 				break;
@@ -790,16 +792,6 @@ dopr(PrintfTarget *target, const char *format, va_list args)
 	target->failed = true;
 }
 
-static size_t
-pg_strnlen(const char *str, size_t maxlen)
-{
-	const char *p = str;
-
-	while (maxlen-- > 0 && *p)
-		p++;
-	return p - str;
-}
-
 static void
 fmtstr(char *value, int leftjust, int minlen, int maxwidth,
 	   int pointflag, PrintfTarget *target)
@@ -812,7 +804,7 @@ fmtstr(char *value, int leftjust, int minlen, int maxwidth,
 	 * than that.
 	 */
 	if (pointflag)
-		vallen = pg_strnlen(value, maxwidth);
+		vallen = strnlen(value, maxwidth);
 	else
 		vallen = strlen(value);
 
diff --git a/src/port/sprompt.c b/src/port/sprompt.c
index 47cd9781fd..70dfa69d7b 100644
--- a/src/port/sprompt.c
+++ b/src/port/sprompt.c
@@ -3,7 +3,7 @@
  * sprompt.c
  *	  simple_prompt() routine
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/srandom.c b/src/port/srandom.c
index 867c71858c..6939260d33 100644
--- a/src/port/srandom.c
+++ b/src/port/srandom.c
@@ -3,7 +3,7 @@
  * srandom.c
  *	  srandom() wrapper
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/strlcpy.c b/src/port/strlcpy.c
index 29c14da0b6..920d7f88f5 100644
--- a/src/port/strlcpy.c
+++ b/src/port/strlcpy.c
@@ -3,7 +3,7 @@
  * strlcpy.c
  *	  strncpy done right
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/port/strnlen.c b/src/port/strnlen.c
new file mode 100644
index 0000000000..bd4b56bbb1
--- /dev/null
+++ b/src/port/strnlen.c
@@ -0,0 +1,33 @@
+/*-------------------------------------------------------------------------
+ *
+ * strnlen.c
+ *		Fallback implementation of strnlen().
+ *
+ *
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * IDENTIFICATION
+ *	  src/port/strnlen.c
+ *
+ *-------------------------------------------------------------------------
+ */
+
+#include "c.h"
+
+/*
+ * Implementation of posix' strnlen for systems where it's not available.
+ *
+ * Returns the number of characters before a null-byte in the string pointed
+ * to by str, unless there's no null-byte before maxlen. In the latter case
+ * maxlen is returned.
+ */
+size_t
+strnlen(const char *str, size_t maxlen)
+{
+	const char *p = str;
+
+	while (maxlen-- > 0 && *p)
+		p++;
+	return p - str;
+}
diff --git a/src/port/system.c b/src/port/system.c
index 3d99c7985f..9d5766e33c 100644
--- a/src/port/system.c
+++ b/src/port/system.c
@@ -29,7 +29,7 @@
  *	 quote character on the command line, preserving any text after the last
  *	 quote character.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/port/system.c
  *
diff --git a/src/port/thread.c b/src/port/thread.c
index a3f37b1237..da2df1f808 100644
--- a/src/port/thread.c
+++ b/src/port/thread.c
@@ -5,7 +5,7 @@
  *		  Prototypes and macros around system calls, used to help make
  *		  threaded libraries reentrant and safe to use from threaded applications.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * src/port/thread.c
  *
diff --git a/src/port/unsetenv.c b/src/port/unsetenv.c
index 83b04d2641..7841431482 100644
--- a/src/port/unsetenv.c
+++ b/src/port/unsetenv.c
@@ -3,7 +3,7 @@
  * unsetenv.c
  *	  unsetenv() emulation for machines without it
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/win32env.c b/src/port/win32env.c
index 5480525fa2..af8555a7a7 100644
--- a/src/port/win32env.c
+++ b/src/port/win32env.c
@@ -4,7 +4,7 @@
  *	  putenv() and unsetenv() for win32, which update both process environment
  *	  and caches in (potentially multiple) C run-time library (CRT) versions.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
diff --git a/src/port/win32error.c b/src/port/win32error.c
index fe07f6e0a2..71f6e89ddd 100644
--- a/src/port/win32error.c
+++ b/src/port/win32error.c
@@ -3,7 +3,7 @@
  * win32error.c
  *	  Map win32 error codes to errno values
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/win32error.c
diff --git a/src/port/win32security.c b/src/port/win32security.c
index bb9d034a01..8d7bcd2d92 100644
--- a/src/port/win32security.c
+++ b/src/port/win32security.c
@@ -3,7 +3,7 @@
  * win32security.c
  *	  Microsoft Windows Win32 Security Support Functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/win32security.c
diff --git a/src/port/win32setlocale.c b/src/port/win32setlocale.c
index c4da4a8f92..0597c2afca 100644
--- a/src/port/win32setlocale.c
+++ b/src/port/win32setlocale.c
@@ -3,7 +3,7 @@
  * win32setlocale.c
  *		Wrapper to work around bugs in Windows setlocale() implementation
  *
- * Copyright (c) 2011-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2011-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/port/win32setlocale.c
diff --git a/src/port/win32ver.rc b/src/port/win32ver.rc
index 6cb2e99b92..a62fde4b0c 100644
--- a/src/port/win32ver.rc
+++ b/src/port/win32ver.rc
@@ -17,7 +17,7 @@ BEGIN
    VALUE "CompanyName",      "PostgreSQL Global Development Group"
    VALUE "FileDescription",  FILEDESC
    VALUE "FileVersion",      PG_VERSION
-   VALUE "LegalCopyright", "Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
+   VALUE "LegalCopyright", "Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group. Portions Copyright (c) 1994, Regents of the University of California."
    VALUE "ProductName",      "PostgreSQL"
    VALUE "ProductVersion",   PG_VERSION
   END
diff --git a/src/template/aix b/src/template/aix
index b566ff129d..ed832849da 100644
--- a/src/template/aix
+++ b/src/template/aix
@@ -10,6 +10,10 @@ if test "$GCC" != yes ; then
       CFLAGS="-O2 -qmaxmem=16384 -qsrcmsg"
       ;;
   esac
+
+  # Due to a compiler bug, see 20171013023536.GA492146@rfd.leadboat.com for details,
+  # force restrict not to be used when compiling with xlc.
+  FORCE_DISABLE_RESTRICT=yes
 fi
 
 # Native memset() is faster, tested on:
diff --git a/src/test/Makefile b/src/test/Makefile
index dbfa799a84..73abf163f1 100644
--- a/src/test/Makefile
+++ b/src/test/Makefile
@@ -15,9 +15,10 @@ include $(top_builddir)/src/Makefile.global
 SUBDIRS = perl regress isolation modules authentication recovery subscription
 
 # We don't build or execute examples/, locale/, or thread/ by default,
-# but we do want "make clean" etc to recurse into them.  Likewise for ssl/,
-# because the SSL test suite is not secure to run on a multi-user system.
-ALWAYS_SUBDIRS = examples locale thread ssl
+# but we do want "make clean" etc to recurse into them.  Likewise for
+# ldap/ and ssl/, because these test suites are not secure to run on a
+# multi-user system.
+ALWAYS_SUBDIRS = examples ldap locale thread ssl
 
 # We want to recurse to all subdirs for all standard targets, except that
 # installcheck and install should not recurse into the subdirectory "modules".
diff --git a/src/test/authentication/Makefile b/src/test/authentication/Makefile
index 21ad15bea9..218452ec76 100644
--- a/src/test/authentication/Makefile
+++ b/src/test/authentication/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/test/authentication
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/authentication/Makefile
@@ -16,5 +16,8 @@ include $(top_builddir)/src/Makefile.global
 check:
 	$(prove_check)
 
+installcheck:
+	$(prove_installcheck)
+
 clean distclean maintainer-clean:
 	rm -rf tmp_check
diff --git a/src/test/authentication/README b/src/test/authentication/README
index 5cffc7dc49..dd79746753 100644
--- a/src/test/authentication/README
+++ b/src/test/authentication/README
@@ -13,4 +13,8 @@ Running the tests
 
     make check
 
+or
+
+    make installcheck
+
 NOTE: This requires the --enable-tap-tests argument to configure.
diff --git a/src/test/authentication/t/001_password.pl b/src/test/authentication/t/001_password.pl
index 2d3f674144..9340f2f1ab 100644
--- a/src/test/authentication/t/001_password.pl
+++ b/src/test/authentication/t/001_password.pl
@@ -44,8 +44,7 @@ sub test_role
 
 	$status_string = 'success' if ($expected_res eq 0);
 
-	my $res =
-	  $node->psql('postgres', 'SELECT 1', extra_params => [ '-U', $role ]);
+	my $res = $node->psql('postgres', undef, extra_params => [ '-U', $role ]);
 	is($res, $expected_res,
 		"authentication $status_string for method $method, role $role");
 }
diff --git a/src/test/authentication/t/002_saslprep.pl b/src/test/authentication/t/002_saslprep.pl
index df9f85d6a9..e09273edd4 100644
--- a/src/test/authentication/t/002_saslprep.pl
+++ b/src/test/authentication/t/002_saslprep.pl
@@ -41,8 +41,7 @@ sub test_login
 	$status_string = 'success' if ($expected_res eq 0);
 
 	$ENV{"PGPASSWORD"} = $password;
-	my $res =
-	  $node->psql('postgres', 'SELECT 1', extra_params => [ '-U', $role ]);
+	my $res = $node->psql('postgres', undef, extra_params => [ '-U', $role ]);
 	is($res, $expected_res,
 		"authentication $status_string for role $role with password $password"
 	);
diff --git a/src/test/examples/testlibpq.c b/src/test/examples/testlibpq.c
index 4d9af82dd1..92a05e5309 100644
--- a/src/test/examples/testlibpq.c
+++ b/src/test/examples/testlibpq.c
@@ -48,6 +48,22 @@ main(int argc, char **argv)
 		exit_nicely(conn);
 	}
 
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn,
+				 "SELECT pg_catalog.set_config('search_path', '', false)");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit_nicely(conn);
+	}
+
+	/*
+	 * Should PQclear PGresult whenever it is no longer needed to avoid memory
+	 * leaks
+	 */
+	PQclear(res);
+
 	/*
 	 * Our test case here involves using a cursor, for which we must be inside
 	 * a transaction block.  We could do the whole thing with a single
@@ -63,11 +79,6 @@ main(int argc, char **argv)
 		PQclear(res);
 		exit_nicely(conn);
 	}
-
-	/*
-	 * Should PQclear PGresult whenever it is no longer needed to avoid memory
-	 * leaks
-	 */
 	PQclear(res);
 
 	/*
diff --git a/src/test/examples/testlibpq2.c b/src/test/examples/testlibpq2.c
index 07c6317a21..76787fe010 100644
--- a/src/test/examples/testlibpq2.c
+++ b/src/test/examples/testlibpq2.c
@@ -13,16 +13,16 @@
  * populate a database with the following commands
  * (provided in src/test/examples/testlibpq2.sql):
  *
+ *	 CREATE SCHEMA TESTLIBPQ2;
+ *	 SET search_path = TESTLIBPQ2;
  *	 CREATE TABLE TBL1 (i int4);
- *
  *	 CREATE TABLE TBL2 (i int4);
- *
  *	 CREATE RULE r1 AS ON INSERT TO TBL1 DO
  *	   (INSERT INTO TBL2 VALUES (new.i); NOTIFY TBL2);
  *
- * and do this four times:
+ * Start this program, then from psql do this four times:
  *
- *	 INSERT INTO TBL1 VALUES (10);
+ *	 INSERT INTO TESTLIBPQ2.TBL1 VALUES (10);
  */
 
 #ifdef WIN32
@@ -77,6 +77,22 @@ main(int argc, char **argv)
 		exit_nicely(conn);
 	}
 
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn,
+				 "SELECT pg_catalog.set_config('search_path', '', false)");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit_nicely(conn);
+	}
+
+	/*
+	 * Should PQclear PGresult whenever it is no longer needed to avoid memory
+	 * leaks
+	 */
+	PQclear(res);
+
 	/*
 	 * Issue LISTEN command to enable notifications from the rule's NOTIFY.
 	 */
@@ -87,11 +103,6 @@ main(int argc, char **argv)
 		PQclear(res);
 		exit_nicely(conn);
 	}
-
-	/*
-	 * should PQclear PGresult whenever it is no longer needed to avoid memory
-	 * leaks
-	 */
 	PQclear(res);
 
 	/* Quit after four notifies are received. */
diff --git a/src/test/examples/testlibpq2.sql b/src/test/examples/testlibpq2.sql
index fb7d353507..e8173e4293 100644
--- a/src/test/examples/testlibpq2.sql
+++ b/src/test/examples/testlibpq2.sql
@@ -1,6 +1,6 @@
+CREATE SCHEMA TESTLIBPQ2;
+SET search_path = TESTLIBPQ2;
 CREATE TABLE TBL1 (i int4);
-
 CREATE TABLE TBL2 (i int4);
-
 CREATE RULE r1 AS ON INSERT TO TBL1 DO
-(INSERT INTO TBL2 VALUES (new.i); NOTIFY TBL2);
+  (INSERT INTO TBL2 VALUES (new.i); NOTIFY TBL2);
diff --git a/src/test/examples/testlibpq3.c b/src/test/examples/testlibpq3.c
index e11e0567ca..00e62b43d2 100644
--- a/src/test/examples/testlibpq3.c
+++ b/src/test/examples/testlibpq3.c
@@ -8,8 +8,9 @@
  * Before running this, populate a database with the following commands
  * (provided in src/test/examples/testlibpq3.sql):
  *
+ * CREATE SCHEMA testlibpq3;
+ * SET search_path = testlibpq3;
  * CREATE TABLE test1 (i int4, t text, b bytea);
- *
  * INSERT INTO test1 values (1, 'joe''s place', '\\000\\001\\002\\003\\004');
  * INSERT INTO test1 values (2, 'ho there', '\\004\\003\\002\\001\\000');
  *
@@ -141,6 +142,16 @@ main(int argc, char **argv)
 		exit_nicely(conn);
 	}
 
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn, "SET search_path = testlibpq3");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit_nicely(conn);
+	}
+	PQclear(res);
+
 	/*
 	 * The point of this program is to illustrate use of PQexecParams() with
 	 * out-of-line parameters, as well as binary transmission of data.
diff --git a/src/test/examples/testlibpq3.sql b/src/test/examples/testlibpq3.sql
index 9d9e217e5d..2213306509 100644
--- a/src/test/examples/testlibpq3.sql
+++ b/src/test/examples/testlibpq3.sql
@@ -1,4 +1,5 @@
+CREATE SCHEMA testlibpq3;
+SET search_path = testlibpq3;
 CREATE TABLE test1 (i int4, t text, b bytea);
-
 INSERT INTO test1 values (1, 'joe''s place', '\\000\\001\\002\\003\\004');
 INSERT INTO test1 values (2, 'ho there', '\\004\\003\\002\\001\\000');
diff --git a/src/test/examples/testlibpq4.c b/src/test/examples/testlibpq4.c
index 0ec04313c0..a20f6249b4 100644
--- a/src/test/examples/testlibpq4.c
+++ b/src/test/examples/testlibpq4.c
@@ -22,8 +22,10 @@ exit_nicely(PGconn *conn1, PGconn *conn2)
 }
 
 static void
-check_conn(PGconn *conn, const char *dbName)
+check_prepare_conn(PGconn *conn, const char *dbName)
 {
+	PGresult   *res;
+
 	/* check to see that the backend connection was successfully made */
 	if (PQstatus(conn) != CONNECTION_OK)
 	{
@@ -31,6 +33,17 @@ check_conn(PGconn *conn, const char *dbName)
 				dbName, PQerrorMessage(conn));
 		exit(1);
 	}
+
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn,
+				 "SELECT pg_catalog.set_config('search_path', '', false)");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit(1);
+	}
+	PQclear(res);
 }
 
 int
@@ -80,10 +93,10 @@ main(int argc, char **argv)
 
 	/* make a connection to the database */
 	conn1 = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName1);
-	check_conn(conn1, dbName1);
+	check_prepare_conn(conn1, dbName1);
 
 	conn2 = PQsetdb(pghost, pgport, pgoptions, pgtty, dbName2);
-	check_conn(conn2, dbName2);
+	check_prepare_conn(conn2, dbName2);
 
 	/* start a transaction block */
 	res1 = PQexec(conn1, "BEGIN");
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
index b7470385eb..be5c72b9a6 100644
--- a/src/test/examples/testlo.c
+++ b/src/test/examples/testlo.c
@@ -3,7 +3,7 @@
  * testlo.c
  *	  test using large objects with libpq
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -232,6 +232,17 @@ main(int argc, char **argv)
 		exit_nicely(conn);
 	}
 
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn,
+				 "SELECT pg_catalog.set_config('search_path', '', false)");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit_nicely(conn);
+	}
+	PQclear(res);
+
 	res = PQexec(conn, "begin");
 	PQclear(res);
 	printf("importing file \"%s\" ...\n", in_filename);
diff --git a/src/test/examples/testlo64.c b/src/test/examples/testlo64.c
index 76558f4797..39ba009c52 100644
--- a/src/test/examples/testlo64.c
+++ b/src/test/examples/testlo64.c
@@ -3,7 +3,7 @@
  * testlo64.c
  *	  test using large objects with libpq using 64-bit APIs
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *
@@ -256,6 +256,17 @@ main(int argc, char **argv)
 		exit_nicely(conn);
 	}
 
+	/* Set always-secure search path, so malicous users can't take control. */
+	res = PQexec(conn,
+				 "SELECT pg_catalog.set_config('search_path', '', false)");
+	if (PQresultStatus(res) != PGRES_COMMAND_OK)
+	{
+		fprintf(stderr, "SET failed: %s", PQerrorMessage(conn));
+		PQclear(res);
+		exit_nicely(conn);
+	}
+	PQclear(res);
+
 	res = PQexec(conn, "begin");
 	PQclear(res);
 	printf("importing file \"%s\" ...\n", in_filename);
diff --git a/src/test/isolation/Makefile b/src/test/isolation/Makefile
index 8eb4969e9b..efbdc40e1d 100644
--- a/src/test/isolation/Makefile
+++ b/src/test/isolation/Makefile
@@ -15,6 +15,13 @@ OBJS =  specparse.o isolationtester.o $(WIN32RES)
 
 all: isolationtester$(X) pg_isolation_regress$(X)
 
+# Though we don't install these binaries, build them during installation
+# (including temp-install).  Otherwise, "make -j check-world" and "make -j
+# installcheck-world" would spawn multiple, concurrent builds in this
+# directory.  Later builds would overwrite files while earlier builds are
+# reading them, causing occasional failures.
+install: | all
+
 submake-regress:
 	$(MAKE) -C $(top_builddir)/src/test/regress pg_regress.o
 
diff --git a/src/test/isolation/expected/alter-table-4.out b/src/test/isolation/expected/alter-table-4.out
new file mode 100644
index 0000000000..d2dac0be09
--- /dev/null
+++ b/src/test/isolation/expected/alter-table-4.out
@@ -0,0 +1,57 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s1b s1delc1 s2sel s1c s2sel
+step s1b: BEGIN;
+step s1delc1: ALTER TABLE c1 NO INHERIT p;
+step s2sel: SELECT SUM(a) FROM p; <waiting ...>
+step s1c: COMMIT;
+step s2sel: <... completed>
+sum            
+
+11             
+step s2sel: SELECT SUM(a) FROM p;
+sum            
+
+1              
+
+starting permutation: s1b s1delc1 s1addc2 s2sel s1c s2sel
+step s1b: BEGIN;
+step s1delc1: ALTER TABLE c1 NO INHERIT p;
+step s1addc2: ALTER TABLE c2 INHERIT p;
+step s2sel: SELECT SUM(a) FROM p; <waiting ...>
+step s1c: COMMIT;
+step s2sel: <... completed>
+sum            
+
+11             
+step s2sel: SELECT SUM(a) FROM p;
+sum            
+
+101            
+
+starting permutation: s1b s1dropc1 s2sel s1c s2sel
+step s1b: BEGIN;
+step s1dropc1: DROP TABLE c1;
+step s2sel: SELECT SUM(a) FROM p; <waiting ...>
+step s1c: COMMIT;
+step s2sel: <... completed>
+sum            
+
+1              
+step s2sel: SELECT SUM(a) FROM p;
+sum            
+
+1              
+
+starting permutation: s1b s1delc1 s1modc1a s2sel s1c s2sel
+step s1b: BEGIN;
+step s1delc1: ALTER TABLE c1 NO INHERIT p;
+step s1modc1a: ALTER TABLE c1 ALTER COLUMN a TYPE float;
+step s2sel: SELECT SUM(a) FROM p; <waiting ...>
+step s1c: COMMIT;
+step s2sel: <... completed>
+error in steps s1c s2sel: ERROR:  attribute "a" of relation "c1" does not match parent's type
+step s2sel: SELECT SUM(a) FROM p;
+sum            
+
+1              
diff --git a/src/test/isolation/expected/eval-plan-qual.out b/src/test/isolation/expected/eval-plan-qual.out
index 10c784a05f..fed01459cf 100644
--- a/src/test/isolation/expected/eval-plan-qual.out
+++ b/src/test/isolation/expected/eval-plan-qual.out
@@ -184,3 +184,51 @@ step readwcte: <... completed>
 id             value          
 
 1              tableAValue2   
+
+starting permutation: wrjt selectjoinforupdate c2 c1
+step wrjt: UPDATE jointest SET data = 42 WHERE id = 7;
+step selectjoinforupdate: 
+	set enable_nestloop to 0;
+	set enable_hashjoin to 0;
+	set enable_seqscan to 0;
+	explain (costs off)
+	select * from jointest a join jointest b on a.id=b.id for update;
+	select * from jointest a join jointest b on a.id=b.id for update;
+ <waiting ...>
+step c2: COMMIT;
+step selectjoinforupdate: <... completed>
+QUERY PLAN     
+
+LockRows       
+  ->  Merge Join
+        Merge Cond: (a.id = b.id)
+        ->  Index Scan using jointest_id_idx on jointest a
+        ->  Index Scan using jointest_id_idx on jointest b
+id             data           id             data           
+
+1              0              1              0              
+2              0              2              0              
+3              0              3              0              
+4              0              4              0              
+5              0              5              0              
+6              0              6              0              
+7              42             7              42             
+8              0              8              0              
+9              0              9              0              
+10             0              10             0              
+step c1: COMMIT;
+
+starting permutation: wrtwcte multireadwcte c1 c2
+step wrtwcte: UPDATE table_a SET value = 'tableAValue2' WHERE id = 1;
+step multireadwcte: 
+	WITH updated AS (
+	  UPDATE table_a SET value = 'tableAValue3' WHERE id = 1 RETURNING id
+	)
+	SELECT (SELECT id FROM updated) AS subid, * FROM updated;
+ <waiting ...>
+step c1: COMMIT;
+step c2: COMMIT;
+step multireadwcte: <... completed>
+subid          id             
+
+1              1              
diff --git a/src/test/isolation/expected/freeze-the-dead.out b/src/test/isolation/expected/freeze-the-dead.out
new file mode 100644
index 0000000000..8e638f132f
--- /dev/null
+++ b/src/test/isolation/expected/freeze-the-dead.out
@@ -0,0 +1,36 @@
+Parsed test spec with 3 sessions
+
+starting permutation: s1_begin s2_begin s3_begin s1_update s2_key_share s3_key_share s1_update s1_commit s2_commit s2_vacuum s1_selectone s3_commit s2_vacuum s1_selectall
+step s1_begin: BEGIN;
+step s2_begin: BEGIN;
+step s3_begin: BEGIN;
+step s1_update: UPDATE tab_freeze SET x = x + 1 WHERE id = 3;
+step s2_key_share: SELECT id FROM tab_freeze WHERE id = 3 FOR KEY SHARE;
+id             
+
+3              
+step s3_key_share: SELECT id FROM tab_freeze WHERE id = 3 FOR KEY SHARE;
+id             
+
+3              
+step s1_update: UPDATE tab_freeze SET x = x + 1 WHERE id = 3;
+step s1_commit: COMMIT;
+step s2_commit: COMMIT;
+step s2_vacuum: VACUUM FREEZE tab_freeze;
+step s1_selectone: 
+    BEGIN;
+    SET LOCAL enable_seqscan = false;
+    SET LOCAL enable_bitmapscan = false;
+    SELECT * FROM tab_freeze WHERE id = 3;
+    COMMIT;
+
+id             name           x              
+
+3              333            2              
+step s3_commit: COMMIT;
+step s2_vacuum: VACUUM FREEZE tab_freeze;
+step s1_selectall: SELECT * FROM tab_freeze ORDER BY name, id;
+id             name           x              
+
+1              111            0              
+3              333            2              
diff --git a/src/test/isolation/expected/multiple-cic.out b/src/test/isolation/expected/multiple-cic.out
new file mode 100644
index 0000000000..2bf8fe365e
--- /dev/null
+++ b/src/test/isolation/expected/multiple-cic.out
@@ -0,0 +1,19 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s2l s1i s2i
+step s2l: SELECT pg_advisory_lock(281457);
+pg_advisory_lock
+
+               
+step s1i: 
+		CREATE INDEX CONCURRENTLY mcic_one_pkey ON mcic_one (id)
+		WHERE lck_shr(281457);
+ <waiting ...>
+step s2i: 
+		CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)
+		WHERE unlck();
+
+step s1i: <... completed>
+unlck          
+
+t              
diff --git a/src/test/isolation/expected/multiple-cic_1.out b/src/test/isolation/expected/multiple-cic_1.out
new file mode 100644
index 0000000000..e41e04a480
--- /dev/null
+++ b/src/test/isolation/expected/multiple-cic_1.out
@@ -0,0 +1,20 @@
+Parsed test spec with 2 sessions
+
+starting permutation: s2l s1i s2i
+step s2l: SELECT pg_advisory_lock(281457);
+pg_advisory_lock
+
+               
+step s1i: 
+		CREATE INDEX CONCURRENTLY mcic_one_pkey ON mcic_one (id)
+		WHERE lck_shr(281457);
+ <waiting ...>
+step s2i: 
+		CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)
+		WHERE unlck();
+ <waiting ...>
+step s1i: <... completed>
+step s2i: <... completed>
+unlck          
+
+t              
diff --git a/src/test/isolation/expected/vacuum-concurrent-drop.out b/src/test/isolation/expected/vacuum-concurrent-drop.out
new file mode 100644
index 0000000000..bb92e80b92
--- /dev/null
+++ b/src/test/isolation/expected/vacuum-concurrent-drop.out
@@ -0,0 +1,76 @@
+Parsed test spec with 2 sessions
+
+starting permutation: lock vac_specified drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step vac_specified: VACUUM part1, part2; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+WARNING:  skipping vacuum of "part2" --- relation no longer exists
+step vac_specified: <... completed>
+
+starting permutation: lock vac_all_parts drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step vac_all_parts: VACUUM parted; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+step vac_all_parts: <... completed>
+
+starting permutation: lock analyze_specified drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step analyze_specified: ANALYZE part1, part2; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+WARNING:  skipping analyze of "part2" --- relation no longer exists
+step analyze_specified: <... completed>
+
+starting permutation: lock analyze_all_parts drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step analyze_all_parts: ANALYZE parted; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+step analyze_all_parts: <... completed>
+
+starting permutation: lock vac_analyze_specified drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step vac_analyze_specified: VACUUM ANALYZE part1, part2; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+WARNING:  skipping vacuum of "part2" --- relation no longer exists
+step vac_analyze_specified: <... completed>
+
+starting permutation: lock vac_analyze_all_parts drop_and_commit
+step lock: 
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+
+step vac_analyze_all_parts: VACUUM ANALYZE parted; <waiting ...>
+step drop_and_commit: 
+	DROP TABLE part2;
+	COMMIT;
+
+step vac_analyze_all_parts: <... completed>
diff --git a/src/test/isolation/isolation_main.c b/src/test/isolation/isolation_main.c
index 8a3d7f51b3..58402b74d8 100644
--- a/src/test/isolation/isolation_main.c
+++ b/src/test/isolation/isolation_main.c
@@ -2,7 +2,7 @@
  *
  * isolation_main --- pg_regress test launcher for isolation tests
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/test/isolation/isolation_main.c
diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule
index 32c965b2a0..74d7d59546 100644
--- a/src/test/isolation/isolation_schedule
+++ b/src/test/isolation/isolation_schedule
@@ -44,6 +44,7 @@ test: update-locked-tuple
 test: propagate-lock-delete
 test: tuplelock-conflict
 test: tuplelock-update
+test: freeze-the-dead
 test: nowait
 test: nowait-2
 test: nowait-3
@@ -54,11 +55,14 @@ test: skip-locked-2
 test: skip-locked-3
 test: skip-locked-4
 test: drop-index-concurrently-1
+test: multiple-cic
 test: alter-table-1
 test: alter-table-2
 test: alter-table-3
+test: alter-table-4
 test: create-trigger
 test: sequence-ddl
 test: async-notify
 test: vacuum-reltuples
 test: timeouts
+test: vacuum-concurrent-drop
diff --git a/src/test/isolation/isolationtester.c b/src/test/isolation/isolationtester.c
index ba8082c980..4ecad038bd 100644
--- a/src/test/isolation/isolationtester.c
+++ b/src/test/isolation/isolationtester.c
@@ -32,6 +32,7 @@ static int	nconns = 0;
 /* In dry run only output permutations to be run by the tester. */
 static int	dry_run = false;
 
+static void exit_nicely(void) pg_attribute_noreturn();
 static void run_testspec(TestSpec *testspec);
 static void run_all_permutations(TestSpec *testspec);
 static void run_all_permutations_recurse(TestSpec *testspec, int nsteps,
diff --git a/src/test/isolation/isolationtester.h b/src/test/isolation/isolationtester.h
index 1f28272d65..a4d989bd1a 100644
--- a/src/test/isolation/isolationtester.h
+++ b/src/test/isolation/isolationtester.h
@@ -3,7 +3,7 @@
  * isolationtester.h
  *	  include file for isolation tests
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * IDENTIFICATION
diff --git a/src/test/isolation/specparse.y b/src/test/isolation/specparse.y
index 759b9b456c..654716194c 100644
--- a/src/test/isolation/specparse.y
+++ b/src/test/isolation/specparse.y
@@ -4,7 +4,7 @@
  * specparse.y
  *	  bison grammar for the isolation test file format
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
diff --git a/src/test/isolation/specs/alter-table-4.spec b/src/test/isolation/specs/alter-table-4.spec
new file mode 100644
index 0000000000..a9c1a93723
--- /dev/null
+++ b/src/test/isolation/specs/alter-table-4.spec
@@ -0,0 +1,37 @@
+# ALTER TABLE - Add and remove inheritance with concurrent reads
+
+setup
+{
+ CREATE TABLE p (a integer);
+ INSERT INTO p VALUES(1);
+ CREATE TABLE c1 () INHERITS (p);
+ INSERT INTO c1 VALUES(10);
+ CREATE TABLE c2 (a integer);
+ INSERT INTO c2 VALUES(100);
+}
+
+teardown
+{
+ DROP TABLE IF EXISTS c1, c2, p;
+}
+
+session "s1"
+step "s1b"	{ BEGIN; }
+step "s1delc1"	{ ALTER TABLE c1 NO INHERIT p; }
+step "s1modc1a"	{ ALTER TABLE c1 ALTER COLUMN a TYPE float; }
+step "s1addc2"	{ ALTER TABLE c2 INHERIT p; }
+step "s1dropc1"	{ DROP TABLE c1; }
+step "s1c"	{ COMMIT; }
+
+session "s2"
+step "s2sel"	{ SELECT SUM(a) FROM p; }
+
+# NO INHERIT will not be visible to concurrent select,
+# since we identify children before locking them
+permutation "s1b" "s1delc1" "s2sel" "s1c" "s2sel"
+# adding inheritance likewise is not seen if s1 commits after s2 locks p
+permutation "s1b" "s1delc1" "s1addc2" "s2sel" "s1c" "s2sel"
+# but we do cope with DROP on a child table
+permutation "s1b" "s1dropc1" "s2sel" "s1c" "s2sel"
+# this case currently results in an error; doesn't seem worth preventing
+permutation "s1b" "s1delc1" "s1modc1a" "s2sel" "s1c" "s2sel"
diff --git a/src/test/isolation/specs/eval-plan-qual.spec b/src/test/isolation/specs/eval-plan-qual.spec
index 7ff6f6b8cc..51ab61dc86 100644
--- a/src/test/isolation/specs/eval-plan-qual.spec
+++ b/src/test/isolation/specs/eval-plan-qual.spec
@@ -21,13 +21,16 @@ setup
  CREATE TABLE table_b (id integer, value text);
  INSERT INTO table_a VALUES (1, 'tableAValue');
  INSERT INTO table_b VALUES (1, 'tableBValue');
+
+ CREATE TABLE jointest AS SELECT generate_series(1,10) AS id, 0 AS data;
+ CREATE INDEX ON jointest(id);
 }
 
 teardown
 {
  DROP TABLE accounts;
  DROP TABLE p CASCADE;
- DROP TABLE table_a, table_b;
+ DROP TABLE table_a, table_b, jointest;
 }
 
 session "s1"
@@ -78,6 +81,17 @@ step "updateforss"	{
 	UPDATE table_b SET value = 'newTableBValue' WHERE id = 1;
 }
 
+# these tests exercise mark/restore during EPQ recheck, cf bug #15032
+
+step "selectjoinforupdate"	{
+	set enable_nestloop to 0;
+	set enable_hashjoin to 0;
+	set enable_seqscan to 0;
+	explain (costs off)
+	select * from jointest a join jointest b on a.id=b.id for update;
+	select * from jointest a join jointest b on a.id=b.id for update;
+}
+
 
 session "s2"
 setup		{ BEGIN ISOLATION LEVEL READ COMMITTED; }
@@ -104,6 +118,7 @@ step "readforss"	{
 	WHERE ta.id = 1 FOR UPDATE OF ta;
 }
 step "wrtwcte"	{ UPDATE table_a SET value = 'tableAValue2' WHERE id = 1; }
+step "wrjt"	{ UPDATE jointest SET data = 42 WHERE id = 7; }
 step "c2"	{ COMMIT; }
 
 session "s3"
@@ -124,6 +139,14 @@ step "readwcte"	{
 	SELECT * FROM cte2;
 }
 
+# this test exercises a different CTE misbehavior, cf bug #14870
+step "multireadwcte"	{
+	WITH updated AS (
+	  UPDATE table_a SET value = 'tableAValue3' WHERE id = 1 RETURNING id
+	)
+	SELECT (SELECT id FROM updated) AS subid, * FROM updated;
+}
+
 teardown	{ COMMIT; }
 
 permutation "wx1" "wx2" "c1" "c2" "read"
@@ -135,3 +158,5 @@ permutation "wx2" "partiallock" "c2" "c1" "read"
 permutation "wx2" "lockwithvalues" "c2" "c1" "read"
 permutation "updateforss" "readforss" "c1" "c2"
 permutation "wrtwcte" "readwcte" "c1" "c2"
+permutation "wrjt" "selectjoinforupdate" "c2" "c1"
+permutation "wrtwcte" "multireadwcte" "c1" "c2"
diff --git a/src/test/isolation/specs/freeze-the-dead.spec b/src/test/isolation/specs/freeze-the-dead.spec
new file mode 100644
index 0000000000..e24d7d5d11
--- /dev/null
+++ b/src/test/isolation/specs/freeze-the-dead.spec
@@ -0,0 +1,59 @@
+# Test for interactions of tuple freezing with dead, as well as recently-dead
+# tuples using multixacts via FOR KEY SHARE.
+setup
+{
+  CREATE TABLE tab_freeze (
+    id int PRIMARY KEY,
+    name char(3),
+    x int);
+  INSERT INTO tab_freeze VALUES (1, '111', 0);
+  INSERT INTO tab_freeze VALUES (3, '333', 0);
+}
+
+teardown
+{
+  DROP TABLE tab_freeze;
+}
+
+session "s1"
+step "s1_begin"		{ BEGIN; }
+step "s1_update"	{ UPDATE tab_freeze SET x = x + 1 WHERE id = 3; }
+step "s1_commit"	{ COMMIT; }
+step "s1_vacuum"	{ VACUUM FREEZE tab_freeze; }
+step "s1_selectone"	{
+    BEGIN;
+    SET LOCAL enable_seqscan = false;
+    SET LOCAL enable_bitmapscan = false;
+    SELECT * FROM tab_freeze WHERE id = 3;
+    COMMIT;
+}
+step "s1_selectall"	{ SELECT * FROM tab_freeze ORDER BY name, id; }
+step "s1_reindex"	{ REINDEX TABLE tab_freeze; }
+
+session "s2"
+step "s2_begin"		{ BEGIN; }
+step "s2_key_share"	{ SELECT id FROM tab_freeze WHERE id = 3 FOR KEY SHARE; }
+step "s2_commit"	{ COMMIT; }
+step "s2_vacuum"	{ VACUUM FREEZE tab_freeze; }
+
+session "s3"
+step "s3_begin"		{ BEGIN; }
+step "s3_key_share"	{ SELECT id FROM tab_freeze WHERE id = 3 FOR KEY SHARE; }
+step "s3_commit"	{ COMMIT; }
+step "s3_vacuum"	{ VACUUM FREEZE tab_freeze; }
+
+# This permutation verfies that a previous bug
+#     https://postgr.es/m/E5711E62-8FDF-4DCA-A888-C200BF6B5742@amazon.com
+#     https://postgr.es/m/20171102112019.33wb7g5wp4zpjelu@alap3.anarazel.de
+# is not reintroduced. We used to make wrong pruning / freezing
+# decision for multixacts, which could lead to a) broken hot chains b)
+# dead rows being revived.
+permutation "s1_begin" "s2_begin" "s3_begin" # start transactions
+   "s1_update" "s2_key_share" "s3_key_share" # have xmax be a multi with an updater, updater being oldest xid
+   "s1_update" # create additional row version that has multis
+   "s1_commit" "s2_commit" # commit both updater and share locker
+   "s2_vacuum" # due to bug in freezing logic, we used to *not* prune updated row, and then froze it
+   "s1_selectone" # if hot chain is broken, the row can't be found via index scan
+   "s3_commit" # commit remaining open xact
+   "s2_vacuum" # pruning / freezing in broken hot chains would unset xmax, reviving rows
+   "s1_selectall" # show borkedness
diff --git a/src/test/isolation/specs/multiple-cic.spec b/src/test/isolation/specs/multiple-cic.spec
new file mode 100644
index 0000000000..3199667be2
--- /dev/null
+++ b/src/test/isolation/specs/multiple-cic.spec
@@ -0,0 +1,40 @@
+# Test multiple CREATE INDEX CONCURRENTLY working simultaneously
+
+setup
+{
+  CREATE TABLE mcic_one (
+	id int
+  );
+  CREATE TABLE mcic_two (
+	id int
+  );
+  CREATE FUNCTION lck_shr(bigint) RETURNS bool IMMUTABLE LANGUAGE plpgsql AS $$
+     BEGIN PERFORM pg_advisory_lock_shared($1); RETURN true; END;
+  $$;
+  CREATE FUNCTION unlck() RETURNS bool IMMUTABLE LANGUAGE plpgsql AS $$
+     BEGIN PERFORM pg_advisory_unlock_all(); RETURN true; END;
+  $$;
+}
+teardown
+{
+  DROP TABLE mcic_one, mcic_two;
+  DROP FUNCTION lck_shr(bigint);
+  DROP FUNCTION unlck();
+}
+
+session "s1"
+step "s1i"	{
+		CREATE INDEX CONCURRENTLY mcic_one_pkey ON mcic_one (id)
+		WHERE lck_shr(281457);
+	}
+teardown	{ SELECT unlck(); }
+
+
+session "s2"
+step "s2l"  { SELECT pg_advisory_lock(281457); }
+step "s2i"	{
+		CREATE INDEX CONCURRENTLY mcic_two_pkey ON mcic_two (id)
+		WHERE unlck();
+	}
+
+permutation "s2l" "s1i" "s2i"
diff --git a/src/test/isolation/specs/vacuum-concurrent-drop.spec b/src/test/isolation/specs/vacuum-concurrent-drop.spec
new file mode 100644
index 0000000000..cae4092667
--- /dev/null
+++ b/src/test/isolation/specs/vacuum-concurrent-drop.spec
@@ -0,0 +1,45 @@
+# Test for log messages emitted by VACUUM and ANALYZE when a specified
+# relation is concurrently dropped.
+#
+# This also verifies that log messages are not emitted for concurrently
+# dropped relations that were not specified in the VACUUM or ANALYZE
+# command.
+
+setup
+{
+	CREATE TABLE parted (a INT) PARTITION BY LIST (a);
+	CREATE TABLE part1 PARTITION OF parted FOR VALUES IN (1);
+	CREATE TABLE part2 PARTITION OF parted FOR VALUES IN (2);
+}
+
+teardown
+{
+	DROP TABLE IF EXISTS parted;
+}
+
+session "s1"
+step "lock"
+{
+	BEGIN;
+	LOCK part1 IN SHARE MODE;
+}
+step "drop_and_commit"
+{
+	DROP TABLE part2;
+	COMMIT;
+}
+
+session "s2"
+step "vac_specified"		{ VACUUM part1, part2; }
+step "vac_all_parts"		{ VACUUM parted; }
+step "analyze_specified"	{ ANALYZE part1, part2; }
+step "analyze_all_parts"	{ ANALYZE parted; }
+step "vac_analyze_specified"	{ VACUUM ANALYZE part1, part2; }
+step "vac_analyze_all_parts"	{ VACUUM ANALYZE parted; }
+
+permutation "lock" "vac_specified" "drop_and_commit"
+permutation "lock" "vac_all_parts" "drop_and_commit"
+permutation "lock" "analyze_specified" "drop_and_commit"
+permutation "lock" "analyze_all_parts" "drop_and_commit"
+permutation "lock" "vac_analyze_specified" "drop_and_commit"
+permutation "lock" "vac_analyze_all_parts" "drop_and_commit"
diff --git a/src/test/isolation/specscanner.l b/src/test/isolation/specscanner.l
index aed9269c63..481b32d1d7 100644
--- a/src/test/isolation/specscanner.l
+++ b/src/test/isolation/specscanner.l
@@ -4,7 +4,7 @@
  * specscanner.l
  *	  a lexical scanner for an isolation test specification
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *-------------------------------------------------------------------------
@@ -17,6 +17,8 @@ static int litbufpos = 0;
 
 static void addlitchar(char c);
 
+/* LCOV_EXCL_START */
+
 %}
 
 %option 8bit
@@ -39,11 +41,11 @@ comment			("#"{non_newline}*)
 
 %%
 
-permutation		{ return(PERMUTATION); }
-session			{ return(SESSION); }
-setup			{ return(SETUP); }
-step			{ return(STEP); }
-teardown		{ return(TEARDOWN); }
+permutation		{ return PERMUTATION; }
+session			{ return SESSION; }
+setup			{ return SETUP; }
+step			{ return STEP; }
+teardown		{ return TEARDOWN; }
 
 [\n]			{ yyline++; }
 {comment}		{ /* ignore */ }
@@ -93,6 +95,8 @@ teardown		{ return(TEARDOWN); }
 				}
 %%
 
+/* LCOV_EXCL_STOP */
+
 static void
 addlitchar(char c)
 {
diff --git a/src/test/ldap/.gitignore b/src/test/ldap/.gitignore
new file mode 100644
index 0000000000..871e943d50
--- /dev/null
+++ b/src/test/ldap/.gitignore
@@ -0,0 +1,2 @@
+# Generated by test suite
+/tmp_check/
diff --git a/src/test/ldap/Makefile b/src/test/ldap/Makefile
new file mode 100644
index 0000000000..fef5742b82
--- /dev/null
+++ b/src/test/ldap/Makefile
@@ -0,0 +1,23 @@
+#-------------------------------------------------------------------------
+#
+# Makefile for src/test/ldap
+#
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
+# Portions Copyright (c) 1994, Regents of the University of California
+#
+# src/test/ldap/Makefile
+#
+#-------------------------------------------------------------------------
+
+subdir = src/test/ldap
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
+
+check:
+	$(prove_check)
+
+installcheck:
+	$(prove_installcheck)
+
+clean distclean maintainer-clean:
+	rm -rf tmp_check
diff --git a/src/test/ldap/README b/src/test/ldap/README
new file mode 100644
index 0000000000..61578385c5
--- /dev/null
+++ b/src/test/ldap/README
@@ -0,0 +1,24 @@
+src/test/ldap/README
+
+Tests for LDAP functionality
+============================
+
+This directory contains a test suite for LDAP functionality.  This
+requires a full OpenLDAP installation, including server and client
+tools, and is therefore kept separate and not run by default.  You
+might need to adjust some paths in the test file to have it find
+OpenLDAP in a place that hadn't been thought of yet.
+
+Also, this test suite creates an LDAP server that listens for TCP/IP
+connections on localhost without any real access control, so it is not
+safe to run this on a system where there might be untrusted local
+users.
+
+Running the tests
+=================
+
+    make check
+
+or
+
+    make installcheck
diff --git a/src/test/ldap/authdata.ldif b/src/test/ldap/authdata.ldif
new file mode 100644
index 0000000000..c0a15daffb
--- /dev/null
+++ b/src/test/ldap/authdata.ldif
@@ -0,0 +1,32 @@
+dn: dc=example,dc=net
+objectClass: top
+objectClass: dcObject
+objectClass: organization
+dc: example
+o: ExampleCo
+
+dn: uid=test1,dc=example,dc=net
+objectClass: inetOrgPerson
+objectClass: posixAccount
+uid: test1
+sn: Lastname
+givenName: Firstname
+cn: First Test User
+displayName: First Test User
+uidNumber: 101
+gidNumber: 100
+homeDirectory: /home/test1
+mail: test1@example.net
+
+dn: uid=test2,dc=example,dc=net
+objectClass: inetOrgPerson
+objectClass: posixAccount
+uid: test2
+sn: Lastname
+givenName: Firstname
+cn: Second Test User
+displayName: Second Test User
+uidNumber: 102
+gidNumber: 100
+homeDirectory: /home/test2
+mail: test2@example.net
diff --git a/src/test/ldap/t/001_auth.pl b/src/test/ldap/t/001_auth.pl
new file mode 100644
index 0000000000..a83d96ae91
--- /dev/null
+++ b/src/test/ldap/t/001_auth.pl
@@ -0,0 +1,239 @@
+use strict;
+use warnings;
+use TestLib;
+use PostgresNode;
+use Test::More tests => 19;
+
+my ($slapd, $ldap_bin_dir, $ldap_schema_dir);
+
+$ldap_bin_dir = undef;			# usually in PATH
+
+if ($^O eq 'darwin')
+{
+	$slapd = '/usr/local/opt/openldap/libexec/slapd';
+	$ldap_schema_dir = '/usr/local/etc/openldap/schema';
+}
+elsif ($^O eq 'linux')
+{
+	$slapd = '/usr/sbin/slapd';
+	$ldap_schema_dir = '/etc/ldap/schema' if -d '/etc/ldap/schema';
+	$ldap_schema_dir = '/etc/openldap/schema' if -d '/etc/openldap/schema';
+}
+elsif ($^O eq 'freebsd')
+{
+	$slapd = '/usr/local/libexec/slapd';
+	$ldap_schema_dir = '/usr/local/etc/openldap/schema';
+}
+
+# make your own edits here
+#$slapd = '';
+#$ldap_bin_dir = '';
+#$ldap_schema_dir = '';
+
+$ENV{PATH} = "$ldap_bin_dir:$ENV{PATH}" if $ldap_bin_dir;
+
+my $ldap_datadir = "${TestLib::tmp_check}/openldap-data";
+my $slapd_certs = "${TestLib::tmp_check}/slapd-certs";
+my $slapd_conf = "${TestLib::tmp_check}/slapd.conf";
+my $slapd_pidfile = "${TestLib::tmp_check}/slapd.pid";
+my $slapd_logfile = "${TestLib::tmp_check}/slapd.log";
+my $ldap_conf = "${TestLib::tmp_check}/ldap.conf";
+my $ldap_server = 'localhost';
+my $ldap_port = int(rand() * 16384) + 49152;
+my $ldaps_port = $ldap_port + 1;
+my $ldap_url = "ldap://$ldap_server:$ldap_port";
+my $ldaps_url = "ldaps://$ldap_server:$ldaps_port";
+my $ldap_basedn = 'dc=example,dc=net';
+my $ldap_rootdn = 'cn=Manager,dc=example,dc=net';
+my $ldap_rootpw = 'secret';
+my $ldap_pwfile = "${TestLib::tmp_check}/ldappassword";
+
+note "setting up slapd";
+
+append_to_file($slapd_conf,
+qq{include $ldap_schema_dir/core.schema
+include $ldap_schema_dir/cosine.schema
+include $ldap_schema_dir/nis.schema
+include $ldap_schema_dir/inetorgperson.schema
+
+pidfile $slapd_pidfile
+logfile $slapd_logfile
+
+access to *
+        by * read
+        by anonymous auth
+
+database ldif
+directory $ldap_datadir
+
+TLSCACertificateFile $slapd_certs/ca.crt
+TLSCertificateFile $slapd_certs/server.crt
+TLSCertificateKeyFile $slapd_certs/server.key
+
+suffix "dc=example,dc=net"
+rootdn "$ldap_rootdn"
+rootpw $ldap_rootpw});
+
+# don't bother to check the server's cert (though perhaps we should)
+append_to_file($ldap_conf,
+qq{TLS_REQCERT never
+});
+
+mkdir $ldap_datadir or die;
+mkdir $slapd_certs or die;
+
+system_or_bail "openssl", "req", "-new", "-nodes", "-keyout", "$slapd_certs/ca.key", "-x509", "-out", "$slapd_certs/ca.crt", "-subj", "/cn=CA";
+system_or_bail "openssl", "req", "-new", "-nodes", "-keyout", "$slapd_certs/server.key", "-out", "$slapd_certs/server.csr", "-subj", "/cn=server";
+system_or_bail "openssl", "x509", "-req", "-in", "$slapd_certs/server.csr", "-CA", "$slapd_certs/ca.crt", "-CAkey", "$slapd_certs/ca.key", "-CAcreateserial", "-out", "$slapd_certs/server.crt";
+
+system_or_bail $slapd, '-f', $slapd_conf, '-h', "$ldap_url $ldaps_url";
+
+END
+{
+	kill 'INT', `cat $slapd_pidfile` if -f $slapd_pidfile;
+}
+
+append_to_file($ldap_pwfile, $ldap_rootpw);
+chmod 0600, $ldap_pwfile or die;
+
+$ENV{'LDAPURI'} = $ldap_url;
+$ENV{'LDAPBINDDN'} = $ldap_rootdn;
+$ENV{'LDAPCONF'} = $ldap_conf;
+
+note "loading LDAP data";
+
+system_or_bail 'ldapadd', '-x', '-y', $ldap_pwfile, '-f', 'authdata.ldif';
+system_or_bail 'ldappasswd', '-x', '-y', $ldap_pwfile, '-s', 'secret1', 'uid=test1,dc=example,dc=net';
+system_or_bail 'ldappasswd', '-x', '-y', $ldap_pwfile, '-s', 'secret2', 'uid=test2,dc=example,dc=net';
+
+note "setting up PostgreSQL instance";
+
+my $node = get_new_node('node');
+$node->init;
+$node->start;
+
+$node->safe_psql('postgres', 'CREATE USER test0;');
+$node->safe_psql('postgres', 'CREATE USER test1;');
+$node->safe_psql('postgres', 'CREATE USER "test2@example.net";');
+
+note "running tests";
+
+sub test_access
+{
+	my ($node, $role, $expected_res, $test_name) = @_;
+
+	my $res = $node->psql('postgres', 'SELECT 1', extra_params => [ '-U', $role ]);
+    is($res, $expected_res, $test_name);
+}
+
+note "simple bind";
+
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapprefix="uid=" ldapsuffix=",dc=example,dc=net"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'wrong';
+test_access($node, 'test0', 2, 'simple bind authentication fails if user not found in LDAP');
+test_access($node, 'test1', 2, 'simple bind authentication fails with wrong password');
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'simple bind authentication succeeds');
+
+note "search+bind";
+
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapbasedn="$ldap_basedn"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'wrong';
+test_access($node, 'test0', 2, 'search+bind authentication fails if user not found in LDAP');
+test_access($node, 'test1', 2, 'search+bind authentication fails with wrong password');
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'search+bind authentication succeeds');
+
+note "LDAP URLs";
+
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapurl="$ldap_url/$ldap_basedn?uid?sub"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'wrong';
+test_access($node, 'test0', 2, 'search+bind with LDAP URL authentication fails if user not found in LDAP');
+test_access($node, 'test1', 2, 'search+bind with LDAP URL authentication fails with wrong password');
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'search+bind with LDAP URL authentication succeeds');
+
+note "search filters";
+
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapbasedn="$ldap_basedn" ldapsearchfilter="(|(uid=\$username)(mail=\$username))"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'search filter finds by uid');
+$ENV{"PGPASSWORD"} = 'secret2';
+test_access($node, 'test2@example.net', 0, 'search filter finds by mail');
+
+note "search filters in LDAP URLs";
+
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapurl="$ldap_url/$ldap_basedn??sub?(|(uid=\$username)(mail=\$username))"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'search filter finds by uid');
+$ENV{"PGPASSWORD"} = 'secret2';
+test_access($node, 'test2@example.net', 0, 'search filter finds by mail');
+
+# This is not documented: You can combine ldapurl and other ldap*
+# settings.  ldapurl is always parsed first, then the other settings
+# override.  It might be useful in a case like this.
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapurl="$ldap_url/$ldap_basedn??sub" ldapsearchfilter="(|(uid=\$username)(mail=\$username))"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'combined LDAP URL and search filter');
+
+note "diagnostic message";
+
+# note bad ldapprefix with a question mark that triggers a diagnostic message
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapprefix="?uid=" ldapsuffix=""});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 2, 'any attempt fails due to bad search pattern');
+
+note "TLS";
+
+# request StartTLS with ldaptls=1
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapport=$ldap_port ldapbasedn="$ldap_basedn" ldapsearchfilter="(uid=\$username)" ldaptls=1});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'StartTLS');
+
+# request LDAPS with ldapscheme=ldaps
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapserver=$ldap_server ldapscheme=ldaps ldapport=$ldaps_port ldapbasedn="$ldap_basedn" ldapsearchfilter="(uid=\$username)"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'LDAPS');
+
+# request LDAPS with ldapurl=ldaps://...
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapurl="$ldaps_url/$ldap_basedn??sub?(uid=\$username)"});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 0, 'LDAPS with URL');
+
+# bad combination of LDAPS and StartTLS
+unlink($node->data_dir . '/pg_hba.conf');
+$node->append_conf('pg_hba.conf', qq{local all all ldap ldapurl="$ldaps_url/$ldap_basedn??sub?(uid=\$username)" ldaptls=1});
+$node->restart;
+
+$ENV{"PGPASSWORD"} = 'secret1';
+test_access($node, 'test1', 2, 'bad combination of LDAPS and StartTLS');
diff --git a/src/test/locale/Makefile b/src/test/locale/Makefile
index 26ec5c9a90..22a45b65f2 100644
--- a/src/test/locale/Makefile
+++ b/src/test/locale/Makefile
@@ -16,5 +16,6 @@ clean distclean maintainer-clean:
 		$(MAKE) -C $$d clean || exit; \
 	done
 
+# These behave like installcheck targets.
 check-%: all
 	@$(MAKE) -C `echo $@ | sed 's/^check-//'` test
diff --git a/src/test/modules/Makefile b/src/test/modules/Makefile
index 3ce99046f8..b7ed0af021 100644
--- a/src/test/modules/Makefile
+++ b/src/test/modules/Makefile
@@ -13,6 +13,7 @@ SUBDIRS = \
 		  test_extensions \
 		  test_parser \
 		  test_pg_dump \
+		  test_rbtree \
 		  test_rls_hooks \
 		  test_shm_mq \
 		  worker_spi
diff --git a/src/test/modules/brin/Makefile b/src/test/modules/brin/Makefile
index dda84c23c7..566655cd61 100644
--- a/src/test/modules/brin/Makefile
+++ b/src/test/modules/brin/Makefile
@@ -1,6 +1,9 @@
 # src/test/modules/brin/Makefile
 
-EXTRA_CLEAN = ./isolation_output
+# Note: because we don't tell the Makefile there are any regression tests,
+# we have to clean those result files explicitly
+EXTRA_CLEAN = $(pg_regress_clean_files) ./isolation_output
+
 EXTRA_INSTALL=contrib/pageinspect
 
 ISOLATIONCHECKS=summarization-and-inprogress-insertion
@@ -16,15 +19,18 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-check: isolation-check
+check: isolation-check prove-check
 
-isolation-check: | submake-isolation
+isolation-check: | submake-isolation temp-install
 	$(MKDIR_P) isolation_output
 	$(pg_isolation_regress_check) \
 	    --outputdir=./isolation_output \
 	    $(ISOLATIONCHECKS)
 
-.PHONY: check isolation-check
+prove-check: | temp-install
+	$(prove_check)
+
+.PHONY: check isolation-check prove-check
 
 submake-isolation:
 	$(MAKE) -C $(top_builddir)/src/test/isolation all
diff --git a/src/test/modules/brin/t/01_workitems.pl b/src/test/modules/brin/t/01_workitems.pl
new file mode 100644
index 0000000000..11c9981d40
--- /dev/null
+++ b/src/test/modules/brin/t/01_workitems.pl
@@ -0,0 +1,39 @@
+# Verify that work items work correctly
+
+use strict;
+use warnings;
+
+use TestLib;
+use Test::More tests => 2;
+use PostgresNode;
+
+my $node = get_new_node('tango');
+$node->init;
+$node->append_conf('postgresql.conf', 'autovacuum_naptime=1s');
+$node->start;
+
+$node->safe_psql('postgres', 'create extension pageinspect');
+
+# Create a table with an autosummarizing BRIN index
+$node->safe_psql('postgres',
+	'create table brin_wi (a int) with (fillfactor = 10);
+	 create index brin_wi_idx on brin_wi using brin (a) with (pages_per_range=1, autosummarize=on);
+	 '
+);
+my $count = $node->safe_psql('postgres',
+	"select count(*) from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)"
+);
+is($count, '1', "initial index state is correct");
+
+$node->safe_psql('postgres',
+	'insert into brin_wi select * from generate_series(1, 100)');
+
+$node->poll_query_until('postgres',
+	"select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)",
+	't');
+
+$count = $node->safe_psql('postgres',
+	"select count(*) > 1 from brin_page_items(get_raw_page('brin_wi_idx', 2), 'brin_wi_idx'::regclass)"
+);
+is($count, 't', "index got summarized");
+$node->stop;
diff --git a/src/test/modules/commit_ts/Makefile b/src/test/modules/commit_ts/Makefile
index 86b93b5e76..6d4f3be358 100644
--- a/src/test/modules/commit_ts/Makefile
+++ b/src/test/modules/commit_ts/Makefile
@@ -16,5 +16,5 @@ endif
 
 check: prove-check
 
-prove-check:
+prove-check: | temp-install
 	$(prove_check)
diff --git a/src/test/modules/dummy_seclabel/dummy_seclabel.c b/src/test/modules/dummy_seclabel/dummy_seclabel.c
index 7fd78f05c7..fc1e745444 100644
--- a/src/test/modules/dummy_seclabel/dummy_seclabel.c
+++ b/src/test/modules/dummy_seclabel/dummy_seclabel.c
@@ -7,7 +7,7 @@
  * perspective, but allows regression testing independent of platform-specific
  * features like SELinux.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  */
 #include "postgres.h"
diff --git a/src/test/modules/dummy_seclabel/expected/dummy_seclabel.out b/src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
index 77bdc9345d..b2d898a7d1 100644
--- a/src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
+++ b/src/test/modules/dummy_seclabel/expected/dummy_seclabel.out
@@ -30,14 +30,14 @@ SECURITY LABEL FOR 'dummy' ON TABLE dummy_seclabel_tbl1 IS 'unclassified';	-- OK
 SECURITY LABEL FOR 'unknown_seclabel' ON TABLE dummy_seclabel_tbl1 IS 'classified';	-- fail
 ERROR:  security label provider "unknown_seclabel" is not loaded
 SECURITY LABEL ON TABLE dummy_seclabel_tbl2 IS 'unclassified';	-- fail (not owner)
-ERROR:  must be owner of relation dummy_seclabel_tbl2
+ERROR:  must be owner of table dummy_seclabel_tbl2
 SECURITY LABEL ON TABLE dummy_seclabel_tbl1 IS 'secret';		-- fail (not superuser)
 ERROR:  only superuser can set 'secret' label
 SECURITY LABEL ON TABLE dummy_seclabel_tbl3 IS 'unclassified';	-- fail (not found)
 ERROR:  relation "dummy_seclabel_tbl3" does not exist
 SET SESSION AUTHORIZATION regress_dummy_seclabel_user2;
 SECURITY LABEL ON TABLE dummy_seclabel_tbl1 IS 'unclassified';		-- fail
-ERROR:  must be owner of relation dummy_seclabel_tbl1
+ERROR:  must be owner of table dummy_seclabel_tbl1
 SECURITY LABEL ON TABLE dummy_seclabel_tbl2 IS 'classified';			-- OK
 --
 -- Test for shared database object
diff --git a/src/test/modules/test_ddl_deparse/expected/test_ddl_deparse.out b/src/test/modules/test_ddl_deparse/expected/test_ddl_deparse.out
index e2e49f9d7f..4a5ea9e9ed 100644
--- a/src/test/modules/test_ddl_deparse/expected/test_ddl_deparse.out
+++ b/src/test/modules/test_ddl_deparse/expected/test_ddl_deparse.out
@@ -12,13 +12,13 @@ BEGIN
 	FOR r IN SELECT * FROM pg_event_trigger_ddl_commands()
 	LOOP
 		-- verify that tags match
-		tag = get_command_tag(r.command);
+		tag = public.get_command_tag(r.command);
 		IF tag <> r.command_tag THEN
 			RAISE NOTICE 'tag % doesn''t match %', tag, r.command_tag;
 		END IF;
 
 		-- log the operation
-		cmdtype = get_command_type(r.command);
+		cmdtype = public.get_command_type(r.command);
 		IF cmdtype <> 'grant' THEN
 			RAISE NOTICE 'DDL test: type %, tag %', cmdtype, tag;
 		ELSE
@@ -28,7 +28,7 @@ BEGIN
 		-- if alter table, log more
 		IF cmdtype = 'alter table' THEN
 			FOR r2 IN SELECT *
-						FROM unnest(get_altertable_subcmdtypes(r.command))
+						FROM unnest(public.get_altertable_subcmdtypes(r.command))
 			LOOP
 				RAISE NOTICE '  subcommand: %', r2.unnest;
 			END LOOP;
diff --git a/src/test/modules/test_ddl_deparse/sql/test_ddl_deparse.sql b/src/test/modules/test_ddl_deparse/sql/test_ddl_deparse.sql
index 4d08aaa1c4..e257a215e4 100644
--- a/src/test/modules/test_ddl_deparse/sql/test_ddl_deparse.sql
+++ b/src/test/modules/test_ddl_deparse/sql/test_ddl_deparse.sql
@@ -13,13 +13,13 @@ BEGIN
 	FOR r IN SELECT * FROM pg_event_trigger_ddl_commands()
 	LOOP
 		-- verify that tags match
-		tag = get_command_tag(r.command);
+		tag = public.get_command_tag(r.command);
 		IF tag <> r.command_tag THEN
 			RAISE NOTICE 'tag % doesn''t match %', tag, r.command_tag;
 		END IF;
 
 		-- log the operation
-		cmdtype = get_command_type(r.command);
+		cmdtype = public.get_command_type(r.command);
 		IF cmdtype <> 'grant' THEN
 			RAISE NOTICE 'DDL test: type %, tag %', cmdtype, tag;
 		ELSE
@@ -29,7 +29,7 @@ BEGIN
 		-- if alter table, log more
 		IF cmdtype = 'alter table' THEN
 			FOR r2 IN SELECT *
-						FROM unnest(get_altertable_subcmdtypes(r.command))
+						FROM unnest(public.get_altertable_subcmdtypes(r.command))
 			LOOP
 				RAISE NOTICE '  subcommand: %', r2.unnest;
 			END LOOP;
diff --git a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
index 56394de92e..82a51eb303 100644
--- a/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
+++ b/src/test/modules/test_ddl_deparse/test_ddl_deparse.c
@@ -2,7 +2,7 @@
  * test_ddl_deparse.c
  *		Support functions for the test_ddl_deparse module
  *
- * Copyright (c) 2014-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2014-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/test/modules/test_ddl_deparse/test_ddl_deparse.c
diff --git a/src/test/modules/test_parser/test_parser.c b/src/test/modules/test_parser/test_parser.c
index bb5305109e..bb700f8a3d 100644
--- a/src/test/modules/test_parser/test_parser.c
+++ b/src/test/modules/test_parser/test_parser.c
@@ -3,7 +3,7 @@
  * test_parser.c
  *	  Simple example of a text search parser
  *
- * Copyright (c) 2007-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2007-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/test/modules/test_parser/test_parser.c
diff --git a/src/test/modules/test_pg_dump/Makefile b/src/test/modules/test_pg_dump/Makefile
index 5050572777..c64b353707 100644
--- a/src/test/modules/test_pg_dump/Makefile
+++ b/src/test/modules/test_pg_dump/Makefile
@@ -21,5 +21,5 @@ endif
 
 check: prove-check
 
-prove-check:
+prove-check: | temp-install
 	$(prove_check)
diff --git a/src/test/modules/test_pg_dump/t/001_base.pl b/src/test/modules/test_pg_dump/t/001_base.pl
index de70f4716b..fca00c6478 100644
--- a/src/test/modules/test_pg_dump/t/001_base.pl
+++ b/src/test/modules/test_pg_dump/t/001_base.pl
@@ -194,7 +194,7 @@
 		create_sql =>
 'ALTER EXTENSION test_pg_dump ADD TABLE regress_pg_dump_table_added;',
 		regexp => qr/^
-			\QCREATE TABLE regress_pg_dump_table_added (\E
+			\QCREATE TABLE public.regress_pg_dump_table_added (\E
 			\n\s+\Qcol1 integer NOT NULL,\E
 			\n\s+\Qcol2 integer\E
 			\n\);\n/xm,
@@ -250,7 +250,7 @@
 
 	'CREATE SEQUENCE regress_pg_dump_table_col1_seq' => {
 		regexp => qr/^
-                    \QCREATE SEQUENCE regress_pg_dump_table_col1_seq\E
+                    \QCREATE SEQUENCE public.regress_pg_dump_table_col1_seq\E
                     \n\s+\QAS integer\E
                     \n\s+\QSTART WITH 1\E
                     \n\s+\QINCREMENT BY 1\E
@@ -276,7 +276,7 @@
 		create_sql =>
 'CREATE TABLE regress_pg_dump_table_added (col1 int not null, col2 int);',
 		regexp => qr/^
-			\QCREATE TABLE regress_pg_dump_table_added (\E
+			\QCREATE TABLE public.regress_pg_dump_table_added (\E
 			\n\s+\Qcol1 integer NOT NULL,\E
 			\n\s+\Qcol2 integer\E
 			\n\);\n/xm,
@@ -295,7 +295,7 @@
 
 	'CREATE SEQUENCE regress_pg_dump_seq' => {
 		regexp => qr/^
-                    \QCREATE SEQUENCE regress_pg_dump_seq\E
+                    \QCREATE SEQUENCE public.regress_pg_dump_seq\E
                     \n\s+\QSTART WITH 1\E
                     \n\s+\QINCREMENT BY 1\E
                     \n\s+\QNO MINVALUE\E
@@ -319,7 +319,7 @@
 		create_order => 6,
 		create_sql   => qq{SELECT nextval('regress_seq_dumpable');},
 		regexp       => qr/^
-			\QSELECT pg_catalog.setval('regress_seq_dumpable', 1, true);\E
+			\QSELECT pg_catalog.setval('public.regress_seq_dumpable', 1, true);\E
 			\n/xm,
 		like => {
 			clean           => 1,
@@ -337,7 +337,7 @@
 
 	'CREATE TABLE regress_pg_dump_table' => {
 		regexp => qr/^
-			\QCREATE TABLE regress_pg_dump_table (\E
+			\QCREATE TABLE public.regress_pg_dump_table (\E
 			\n\s+\Qcol1 integer NOT NULL,\E
 			\n\s+\Qcol2 integer\E
 			\n\);\n/xm,
@@ -395,7 +395,7 @@
 		create_sql =>
 'GRANT SELECT ON regress_pg_dump_table_added TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT SELECT ON TABLE regress_pg_dump_table_added TO regress_dump_test_role;\E
+			\QGRANT SELECT ON TABLE public.regress_pg_dump_table_added TO regress_dump_test_role;\E
 			\n/xm,
 		like   => { binary_upgrade => 1, },
 		unlike => {
@@ -415,7 +415,7 @@
 		create_sql =>
 'REVOKE SELECT ON regress_pg_dump_table_added FROM regress_dump_test_role;',
 		regexp => qr/^
-			\QREVOKE SELECT ON TABLE regress_pg_dump_table_added FROM regress_dump_test_role;\E
+			\QREVOKE SELECT ON TABLE public.regress_pg_dump_table_added FROM regress_dump_test_role;\E
 			\n/xm,
 		like => {
 			binary_upgrade   => 1,
@@ -434,7 +434,7 @@
 	'GRANT SELECT ON TABLE regress_pg_dump_table' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT SELECT ON TABLE regress_pg_dump_table TO regress_dump_test_role;\E\n
+			\QGRANT SELECT ON TABLE public.regress_pg_dump_table TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -453,7 +453,7 @@
 	'GRANT SELECT(col1) ON regress_pg_dump_table' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT SELECT(col1) ON TABLE regress_pg_dump_table TO PUBLIC;\E\n
+			\QGRANT SELECT(col1) ON TABLE public.regress_pg_dump_table TO PUBLIC;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -474,7 +474,7 @@
 		create_sql   => 'GRANT SELECT(col2) ON regress_pg_dump_table
 						   TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT SELECT(col2) ON TABLE regress_pg_dump_table TO regress_dump_test_role;\E
+			\QGRANT SELECT(col2) ON TABLE public.regress_pg_dump_table TO regress_dump_test_role;\E
 			\n/xm,
 		like => {
 			binary_upgrade   => 1,
@@ -496,7 +496,7 @@
 		create_sql => 'GRANT USAGE ON SEQUENCE regress_pg_dump_table_col1_seq
 		                   TO regress_dump_test_role;',
 		regexp => qr/^
-			\QGRANT USAGE ON SEQUENCE regress_pg_dump_table_col1_seq TO regress_dump_test_role;\E
+			\QGRANT USAGE ON SEQUENCE public.regress_pg_dump_table_col1_seq TO regress_dump_test_role;\E
 			\n/xm,
 		like => {
 			binary_upgrade   => 1,
@@ -514,7 +514,7 @@
 
 	'GRANT USAGE ON regress_pg_dump_seq TO regress_dump_test_role' => {
 		regexp => qr/^
-			\QGRANT USAGE ON SEQUENCE regress_pg_dump_seq TO regress_dump_test_role;\E
+			\QGRANT USAGE ON SEQUENCE public.regress_pg_dump_seq TO regress_dump_test_role;\E
 			\n/xm,
 		like   => { binary_upgrade => 1, },
 		unlike => {
@@ -534,7 +534,7 @@
 		create_sql   => 'REVOKE SELECT(col1) ON regress_pg_dump_table
 						   FROM PUBLIC;',
 		regexp => qr/^
-			\QREVOKE SELECT(col1) ON TABLE regress_pg_dump_table FROM PUBLIC;\E
+			\QREVOKE SELECT(col1) ON TABLE public.regress_pg_dump_table FROM PUBLIC;\E
 			\n/xm,
 		like => {
 			binary_upgrade   => 1,
@@ -553,7 +553,7 @@
  # Objects included in extension part of a schema created by this extension */
 	'CREATE TABLE regress_pg_dump_schema.test_table' => {
 		regexp => qr/^
-			\QCREATE TABLE test_table (\E
+			\QCREATE TABLE regress_pg_dump_schema.test_table (\E
 			\n\s+\Qcol1 integer,\E
 			\n\s+\Qcol2 integer\E
 			\n\);\n/xm,
@@ -573,7 +573,7 @@
 	'GRANT SELECT ON regress_pg_dump_schema.test_table' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT SELECT ON TABLE test_table TO regress_dump_test_role;\E\n
+			\QGRANT SELECT ON TABLE regress_pg_dump_schema.test_table TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -591,7 +591,7 @@
 
 	'CREATE SEQUENCE regress_pg_dump_schema.test_seq' => {
 		regexp => qr/^
-                    \QCREATE SEQUENCE test_seq\E
+                    \QCREATE SEQUENCE regress_pg_dump_schema.test_seq\E
                     \n\s+\QSTART WITH 1\E
                     \n\s+\QINCREMENT BY 1\E
                     \n\s+\QNO MINVALUE\E
@@ -614,7 +614,7 @@
 	'GRANT USAGE ON regress_pg_dump_schema.test_seq' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT USAGE ON SEQUENCE test_seq TO regress_dump_test_role;\E\n
+			\QGRANT USAGE ON SEQUENCE regress_pg_dump_schema.test_seq TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -632,7 +632,7 @@
 
 	'CREATE TYPE regress_pg_dump_schema.test_type' => {
 		regexp => qr/^
-                    \QCREATE TYPE test_type AS (\E
+                    \QCREATE TYPE regress_pg_dump_schema.test_type AS (\E
                     \n\s+\Qcol1 integer\E
                     \n\);\n/xm,
 		like   => { binary_upgrade => 1, },
@@ -651,7 +651,7 @@
 	'GRANT USAGE ON regress_pg_dump_schema.test_type' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT ALL ON TYPE test_type TO regress_dump_test_role;\E\n
+			\QGRANT ALL ON TYPE regress_pg_dump_schema.test_type TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -669,7 +669,7 @@
 
 	'CREATE FUNCTION regress_pg_dump_schema.test_func' => {
 		regexp => qr/^
-            \QCREATE FUNCTION test_func() RETURNS integer\E
+            \QCREATE FUNCTION regress_pg_dump_schema.test_func() RETURNS integer\E
             \n\s+\QLANGUAGE sql\E
             \n/xm,
 		like   => { binary_upgrade => 1, },
@@ -688,7 +688,7 @@
 	'GRANT ALL ON regress_pg_dump_schema.test_func' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT ALL ON FUNCTION test_func() TO regress_dump_test_role;\E\n
+			\QGRANT ALL ON FUNCTION regress_pg_dump_schema.test_func() TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -706,7 +706,7 @@
 
 	'CREATE AGGREGATE regress_pg_dump_schema.test_agg' => {
 		regexp => qr/^
-            \QCREATE AGGREGATE test_agg(smallint) (\E
+            \QCREATE AGGREGATE regress_pg_dump_schema.test_agg(smallint) (\E
             \n\s+\QSFUNC = int2_sum,\E
             \n\s+\QSTYPE = bigint\E
             \n\);\n/xm,
@@ -726,7 +726,7 @@
 	'GRANT ALL ON regress_pg_dump_schema.test_agg' => {
 		regexp => qr/^
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(true);\E\n
-			\QGRANT ALL ON FUNCTION test_agg(smallint) TO regress_dump_test_role;\E\n
+			\QGRANT ALL ON FUNCTION regress_pg_dump_schema.test_agg(smallint) TO regress_dump_test_role;\E\n
 			\QSELECT pg_catalog.binary_upgrade_set_record_init_privs(false);\E
 			\n/xms,
 		like   => { binary_upgrade => 1, },
@@ -748,7 +748,7 @@
 		create_sql   => 'CREATE TABLE regress_pg_dump_schema.external_tab
 						   (col1 int);',
 		regexp => qr/^
-			\QCREATE TABLE external_tab (\E
+			\QCREATE TABLE regress_pg_dump_schema.external_tab (\E
 			\n\s+\Qcol1 integer\E
 			\n\);\n/xm,
 		like => {
diff --git a/src/test/modules/test_rbtree/.gitignore b/src/test/modules/test_rbtree/.gitignore
new file mode 100644
index 0000000000..5dcb3ff972
--- /dev/null
+++ b/src/test/modules/test_rbtree/.gitignore
@@ -0,0 +1,4 @@
+# Generated subdirectories
+/log/
+/results/
+/tmp_check/
diff --git a/src/test/modules/test_rbtree/Makefile b/src/test/modules/test_rbtree/Makefile
new file mode 100644
index 0000000000..a4184b4d2e
--- /dev/null
+++ b/src/test/modules/test_rbtree/Makefile
@@ -0,0 +1,21 @@
+# src/test/modules/test_rbtree/Makefile
+
+MODULE_big = test_rbtree
+OBJS = test_rbtree.o $(WIN32RES)
+PGFILEDESC = "test_rbtree - test code for red-black tree library"
+
+EXTENSION = test_rbtree
+DATA = test_rbtree--1.0.sql
+
+REGRESS = test_rbtree
+
+ifdef USE_PGXS
+PG_CONFIG = pg_config
+PGXS := $(shell $(PG_CONFIG) --pgxs)
+include $(PGXS)
+else
+subdir = src/test/modules/test_rbtree
+top_builddir = ../../../..
+include $(top_builddir)/src/Makefile.global
+include $(top_srcdir)/contrib/contrib-global.mk
+endif
diff --git a/src/test/modules/test_rbtree/README b/src/test/modules/test_rbtree/README
new file mode 100644
index 0000000000..d69eb8d3e3
--- /dev/null
+++ b/src/test/modules/test_rbtree/README
@@ -0,0 +1,13 @@
+test_rbtree is a test module for checking the correctness of red-black
+tree operations.
+
+These tests are performed on red-black trees that store integers.
+Since the rbtree logic treats the comparison function as a black
+box, it shouldn't be important exactly what the key type is.
+
+Checking the correctness of traversals is based on the fact that a red-black
+tree is a binary search tree, so the elements should be visited in increasing
+(for Left-Current-Right) or decreasing (for Right-Current-Left) order.
+
+Also, this module does some checks of the correctness of the find, delete
+and leftmost operations.
diff --git a/src/test/modules/test_rbtree/expected/test_rbtree.out b/src/test/modules/test_rbtree/expected/test_rbtree.out
new file mode 100644
index 0000000000..3e3295696e
--- /dev/null
+++ b/src/test/modules/test_rbtree/expected/test_rbtree.out
@@ -0,0 +1,12 @@
+CREATE EXTENSION test_rbtree;
+--
+-- These tests don't produce any interesting output.  We're checking that
+-- the operations complete without crashing or hanging and that none of their
+-- internal sanity tests fail.
+--
+SELECT test_rb_tree(10000);
+ test_rb_tree 
+--------------
+ 
+(1 row)
+
diff --git a/src/test/modules/test_rbtree/sql/test_rbtree.sql b/src/test/modules/test_rbtree/sql/test_rbtree.sql
new file mode 100644
index 0000000000..d8dc88e057
--- /dev/null
+++ b/src/test/modules/test_rbtree/sql/test_rbtree.sql
@@ -0,0 +1,8 @@
+CREATE EXTENSION test_rbtree;
+
+--
+-- These tests don't produce any interesting output.  We're checking that
+-- the operations complete without crashing or hanging and that none of their
+-- internal sanity tests fail.
+--
+SELECT test_rb_tree(10000);
diff --git a/src/test/modules/test_rbtree/test_rbtree--1.0.sql b/src/test/modules/test_rbtree/test_rbtree--1.0.sql
new file mode 100644
index 0000000000..04f2a3ada6
--- /dev/null
+++ b/src/test/modules/test_rbtree/test_rbtree--1.0.sql
@@ -0,0 +1,8 @@
+/* src/test/modules/test_rbtree/test_rbtree--1.0.sql */
+
+-- complain if script is sourced in psql, rather than via CREATE EXTENSION
+\echo Use "CREATE EXTENSION test_rbtree" to load this file. \quit
+
+CREATE FUNCTION test_rb_tree(size INTEGER)
+	RETURNS pg_catalog.void STRICT
+	AS 'MODULE_PATHNAME' LANGUAGE C;
diff --git a/src/test/modules/test_rbtree/test_rbtree.c b/src/test/modules/test_rbtree/test_rbtree.c
new file mode 100644
index 0000000000..1274b9995d
--- /dev/null
+++ b/src/test/modules/test_rbtree/test_rbtree.c
@@ -0,0 +1,413 @@
+/*--------------------------------------------------------------------------
+ *
+ * test_rbtree.c
+ *		Test correctness of red-black tree operations.
+ *
+ * Copyright (c) 2009-2018, PostgreSQL Global Development Group
+ *
+ * IDENTIFICATION
+ *		src/test/modules/test_rbtree/test_rbtree.c
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#include "postgres.h"
+
+#include "fmgr.h"
+#include "lib/rbtree.h"
+#include "utils/memutils.h"
+
+PG_MODULE_MAGIC;
+
+
+/*
+ * Our test trees store an integer key, and nothing else.
+ */
+typedef struct IntRBTreeNode
+{
+	RBNode		rbnode;
+	int			key;
+} IntRBTreeNode;
+
+
+/*
+ * Node comparator.  We don't worry about overflow in the subtraction,
+ * since none of our test keys are negative.
+ */
+static int
+irb_cmp(const RBNode *a, const RBNode *b, void *arg)
+{
+	const IntRBTreeNode *ea = (const IntRBTreeNode *) a;
+	const IntRBTreeNode *eb = (const IntRBTreeNode *) b;
+
+	return ea->key - eb->key;
+}
+
+/*
+ * Node combiner.  For testing purposes, just check that library doesn't
+ * try to combine unequal keys.
+ */
+static void
+irb_combine(RBNode *existing, const RBNode *newdata, void *arg)
+{
+	const IntRBTreeNode *eexist = (const IntRBTreeNode *) existing;
+	const IntRBTreeNode *enew = (const IntRBTreeNode *) newdata;
+
+	if (eexist->key != enew->key)
+		elog(ERROR, "red-black tree combines %d into %d",
+			 enew->key, eexist->key);
+}
+
+/* Node allocator */
+static RBNode *
+irb_alloc(void *arg)
+{
+	return (RBNode *) palloc(sizeof(IntRBTreeNode));
+}
+
+/* Node freer */
+static void
+irb_free(RBNode *node, void *arg)
+{
+	pfree(node);
+}
+
+/*
+ * Create a red-black tree using our support functions
+ */
+static RBTree *
+create_int_rbtree(void)
+{
+	return rb_create(sizeof(IntRBTreeNode),
+					 irb_cmp,
+					 irb_combine,
+					 irb_alloc,
+					 irb_free,
+					 NULL);
+}
+
+/*
+ * Generate a random permutation of the integers 0..size-1
+ */
+static int *
+GetPermutation(int size)
+{
+	int		   *permutation;
+	int			i;
+
+	permutation = (int *) palloc(size * sizeof(int));
+
+	permutation[0] = 0;
+
+	/*
+	 * This is the "inside-out" variant of the Fisher-Yates shuffle algorithm.
+	 * Notionally, we append each new value to the array and then swap it with
+	 * a randomly-chosen array element (possibly including itself, else we
+	 * fail to generate permutations with the last integer last).  The swap
+	 * step can be optimized by combining it with the insertion.
+	 */
+	for (i = 1; i < size; i++)
+	{
+		int			j = random() % (i + 1);
+
+		if (j < i)				/* avoid fetching undefined data if j=i */
+			permutation[i] = permutation[j];
+		permutation[j] = i;
+	}
+
+	return permutation;
+}
+
+/*
+ * Populate an empty RBTree with "size" integers having the values
+ * 0, step, 2*step, 3*step, ..., inserting them in random order
+ */
+static void
+rb_populate(RBTree *tree, int size, int step)
+{
+	int		   *permutation = GetPermutation(size);
+	IntRBTreeNode node;
+	bool		isNew;
+	int			i;
+
+	/* Insert values.  We don't expect any collisions. */
+	for (i = 0; i < size; i++)
+	{
+		node.key = step * permutation[i];
+		rb_insert(tree, (RBNode *) &node, &isNew);
+		if (!isNew)
+			elog(ERROR, "unexpected !isNew result from rb_insert");
+	}
+
+	/*
+	 * Re-insert the first value to make sure collisions work right.  It's
+	 * probably not useful to test that case over again for all the values.
+	 */
+	if (size > 0)
+	{
+		node.key = step * permutation[0];
+		rb_insert(tree, (RBNode *) &node, &isNew);
+		if (isNew)
+			elog(ERROR, "unexpected isNew result from rb_insert");
+	}
+
+	pfree(permutation);
+}
+
+/*
+ * Check the correctness of left-right traversal.
+ * Left-right traversal is correct if all elements are
+ * visited in increasing order.
+ */
+static void
+testleftright(int size)
+{
+	RBTree	   *tree = create_int_rbtree();
+	IntRBTreeNode *node;
+	RBTreeIterator iter;
+	int			lastKey = -1;
+	int			count = 0;
+
+	/* check iteration over empty tree */
+	rb_begin_iterate(tree, LeftRightWalk, &iter);
+	if (rb_iterate(&iter) != NULL)
+		elog(ERROR, "left-right walk over empty tree produced an element");
+
+	/* fill tree with consecutive natural numbers */
+	rb_populate(tree, size, 1);
+
+	/* iterate over the tree */
+	rb_begin_iterate(tree, LeftRightWalk, &iter);
+
+	while ((node = (IntRBTreeNode *) rb_iterate(&iter)) != NULL)
+	{
+		/* check that order is increasing */
+		if (node->key <= lastKey)
+			elog(ERROR, "left-right walk gives elements not in sorted order");
+		lastKey = node->key;
+		count++;
+	}
+
+	if (lastKey != size - 1)
+		elog(ERROR, "left-right walk did not reach end");
+	if (count != size)
+		elog(ERROR, "left-right walk missed some elements");
+}
+
+/*
+ * Check the correctness of right-left traversal.
+ * Right-left traversal is correct if all elements are
+ * visited in decreasing order.
+ */
+static void
+testrightleft(int size)
+{
+	RBTree	   *tree = create_int_rbtree();
+	IntRBTreeNode *node;
+	RBTreeIterator iter;
+	int			lastKey = size;
+	int			count = 0;
+
+	/* check iteration over empty tree */
+	rb_begin_iterate(tree, RightLeftWalk, &iter);
+	if (rb_iterate(&iter) != NULL)
+		elog(ERROR, "right-left walk over empty tree produced an element");
+
+	/* fill tree with consecutive natural numbers */
+	rb_populate(tree, size, 1);
+
+	/* iterate over the tree */
+	rb_begin_iterate(tree, RightLeftWalk, &iter);
+
+	while ((node = (IntRBTreeNode *) rb_iterate(&iter)) != NULL)
+	{
+		/* check that order is decreasing */
+		if (node->key >= lastKey)
+			elog(ERROR, "right-left walk gives elements not in sorted order");
+		lastKey = node->key;
+		count++;
+	}
+
+	if (lastKey != 0)
+		elog(ERROR, "right-left walk did not reach end");
+	if (count != size)
+		elog(ERROR, "right-left walk missed some elements");
+}
+
+/*
+ * Check the correctness of the rb_find operation by searching for
+ * both elements we inserted and elements we didn't.
+ */
+static void
+testfind(int size)
+{
+	RBTree	   *tree = create_int_rbtree();
+	int			i;
+
+	/* Insert even integers from 0 to 2 * (size-1) */
+	rb_populate(tree, size, 2);
+
+	/* Check that all inserted elements can be found */
+	for (i = 0; i < size; i++)
+	{
+		IntRBTreeNode node;
+		IntRBTreeNode *resultNode;
+
+		node.key = 2 * i;
+		resultNode = (IntRBTreeNode *) rb_find(tree, (RBNode *) &node);
+		if (resultNode == NULL)
+			elog(ERROR, "inserted element was not found");
+		if (node.key != resultNode->key)
+			elog(ERROR, "find operation in rbtree gave wrong result");
+	}
+
+	/*
+	 * Check that not-inserted elements can not be found, being sure to try
+	 * values before the first and after the last element.
+	 */
+	for (i = -1; i <= 2 * size; i += 2)
+	{
+		IntRBTreeNode node;
+		IntRBTreeNode *resultNode;
+
+		node.key = i;
+		resultNode = (IntRBTreeNode *) rb_find(tree, (RBNode *) &node);
+		if (resultNode != NULL)
+			elog(ERROR, "not-inserted element was found");
+	}
+}
+
+/*
+ * Check the correctness of the rb_leftmost operation.
+ * This operation should always return the smallest element of the tree.
+ */
+static void
+testleftmost(int size)
+{
+	RBTree	   *tree = create_int_rbtree();
+	IntRBTreeNode *result;
+
+	/* Check that empty tree has no leftmost element */
+	if (rb_leftmost(tree) != NULL)
+		elog(ERROR, "leftmost node of empty tree is not NULL");
+
+	/* fill tree with consecutive natural numbers */
+	rb_populate(tree, size, 1);
+
+	/* Check that leftmost element is the smallest one */
+	result = (IntRBTreeNode *) rb_leftmost(tree);
+	if (result == NULL || result->key != 0)
+		elog(ERROR, "rb_leftmost gave wrong result");
+}
+
+/*
+ * Check the correctness of the rb_delete operation.
+ */
+static void
+testdelete(int size, int delsize)
+{
+	RBTree	   *tree = create_int_rbtree();
+	int		   *deleteIds;
+	bool	   *chosen;
+	int			i;
+
+	/* fill tree with consecutive natural numbers */
+	rb_populate(tree, size, 1);
+
+	/* Choose unique ids to delete */
+	deleteIds = (int *) palloc(delsize * sizeof(int));
+	chosen = (bool *) palloc0(size * sizeof(bool));
+
+	for (i = 0; i < delsize; i++)
+	{
+		int			k = random() % size;
+
+		while (chosen[k])
+			k = (k + 1) % size;
+		deleteIds[i] = k;
+		chosen[k] = true;
+	}
+
+	/* Delete elements */
+	for (i = 0; i < delsize; i++)
+	{
+		IntRBTreeNode find;
+		IntRBTreeNode *node;
+
+		find.key = deleteIds[i];
+		/* Locate the node to be deleted */
+		node = (IntRBTreeNode *) rb_find(tree, (RBNode *) &find);
+		if (node == NULL || node->key != deleteIds[i])
+			elog(ERROR, "expected element was not found during deleting");
+		/* Delete it */
+		rb_delete(tree, (RBNode *) node);
+	}
+
+	/* Check that deleted elements are deleted */
+	for (i = 0; i < size; i++)
+	{
+		IntRBTreeNode node;
+		IntRBTreeNode *result;
+
+		node.key = i;
+		result = (IntRBTreeNode *) rb_find(tree, (RBNode *) &node);
+		if (chosen[i])
+		{
+			/* Deleted element should be absent */
+			if (result != NULL)
+				elog(ERROR, "deleted element still present in the rbtree");
+		}
+		else
+		{
+			/* Else it should be present */
+			if (result == NULL || result->key != i)
+				elog(ERROR, "delete operation removed wrong rbtree value");
+		}
+	}
+
+	/* Delete remaining elements, so as to exercise reducing tree to empty */
+	for (i = 0; i < size; i++)
+	{
+		IntRBTreeNode find;
+		IntRBTreeNode *node;
+
+		if (chosen[i])
+			continue;
+		find.key = i;
+		/* Locate the node to be deleted */
+		node = (IntRBTreeNode *) rb_find(tree, (RBNode *) &find);
+		if (node == NULL || node->key != i)
+			elog(ERROR, "expected element was not found during deleting");
+		/* Delete it */
+		rb_delete(tree, (RBNode *) node);
+	}
+
+	/* Tree should now be empty */
+	if (rb_leftmost(tree) != NULL)
+		elog(ERROR, "deleting all elements failed");
+
+	pfree(deleteIds);
+	pfree(chosen);
+}
+
+/*
+ * SQL-callable entry point to perform all tests
+ *
+ * Argument is the number of entries to put in the trees
+ */
+PG_FUNCTION_INFO_V1(test_rb_tree);
+
+Datum
+test_rb_tree(PG_FUNCTION_ARGS)
+{
+	int			size = PG_GETARG_INT32(0);
+
+	if (size <= 0 || size > MaxAllocSize / sizeof(int))
+		elog(ERROR, "invalid size for test_rb_tree: %d", size);
+	testleftright(size);
+	testrightleft(size);
+	testfind(size);
+	testleftmost(size);
+	testdelete(size, Max(size / 10, 1));
+	PG_RETURN_VOID();
+}
diff --git a/src/test/modules/test_rbtree/test_rbtree.control b/src/test/modules/test_rbtree/test_rbtree.control
new file mode 100644
index 0000000000..17966a5d3f
--- /dev/null
+++ b/src/test/modules/test_rbtree/test_rbtree.control
@@ -0,0 +1,4 @@
+comment = 'Test code for red-black tree library'
+default_version = '1.0'
+module_pathname = '$libdir/test_rbtree'
+relocatable = true
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.c b/src/test/modules/test_rls_hooks/test_rls_hooks.c
index 65bf3e33c9..3e6cedf2bb 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.c
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.c
@@ -3,7 +3,7 @@
  * test_rls_hooks.c
  *		Code for testing RLS hooks.
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_rls_hooks/test_rls_hooks.c
diff --git a/src/test/modules/test_rls_hooks/test_rls_hooks.h b/src/test/modules/test_rls_hooks/test_rls_hooks.h
index 81f7b18090..774c64ff43 100644
--- a/src/test/modules/test_rls_hooks/test_rls_hooks.h
+++ b/src/test/modules/test_rls_hooks/test_rls_hooks.h
@@ -3,7 +3,7 @@
  * test_rls_hooks.h
  *		Definitions for RLS hooks
  *
- * Copyright (c) 2015-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2015-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_rls_hooks/test_rls_hooks.h
diff --git a/src/test/modules/test_shm_mq/setup.c b/src/test/modules/test_shm_mq/setup.c
index 3ae9018360..97e8617b3e 100644
--- a/src/test/modules/test_shm_mq/setup.c
+++ b/src/test/modules/test_shm_mq/setup.c
@@ -5,7 +5,7 @@
  *		number of background workers for shared memory message queue
  *		testing.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_shm_mq/setup.c
@@ -219,7 +219,7 @@ setup_background_workers(int nworkers, dsm_segment *seg)
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
 	sprintf(worker.bgw_library_name, "test_shm_mq");
 	sprintf(worker.bgw_function_name, "test_shm_mq_main");
-	snprintf(worker.bgw_name, BGW_MAXLEN, "test_shm_mq");
+	snprintf(worker.bgw_type, BGW_MAXLEN, "test_shm_mq");
 	worker.bgw_main_arg = UInt32GetDatum(dsm_segment_handle(seg));
 	/* set bgw_notify_pid, so we can detect if the worker stops */
 	worker.bgw_notify_pid = MyProcPid;
diff --git a/src/test/modules/test_shm_mq/test.c b/src/test/modules/test_shm_mq/test.c
index 7a6ad23f75..ebab986601 100644
--- a/src/test/modules/test_shm_mq/test.c
+++ b/src/test/modules/test_shm_mq/test.c
@@ -3,7 +3,7 @@
  * test.c
  *		Test harness code for shared memory message queues.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_shm_mq/test.c
diff --git a/src/test/modules/test_shm_mq/test_shm_mq.h b/src/test/modules/test_shm_mq/test_shm_mq.h
index e76ecab891..2134b1fdf1 100644
--- a/src/test/modules/test_shm_mq/test_shm_mq.h
+++ b/src/test/modules/test_shm_mq/test_shm_mq.h
@@ -3,7 +3,7 @@
  * test_shm_mq.h
  *		Definitions for shared memory message queues
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_shm_mq/test_shm_mq.h
diff --git a/src/test/modules/test_shm_mq/worker.c b/src/test/modules/test_shm_mq/worker.c
index e7e29f89c2..bcb992e1e4 100644
--- a/src/test/modules/test_shm_mq/worker.c
+++ b/src/test/modules/test_shm_mq/worker.c
@@ -9,7 +9,7 @@
  *		but it should be possible to use much of the control logic just
  *		as presented here.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/test_shm_mq/worker.c
diff --git a/src/test/modules/worker_spi/worker_spi.c b/src/test/modules/worker_spi/worker_spi.c
index 12c8cd5774..3b98b1682b 100644
--- a/src/test/modules/worker_spi/worker_spi.c
+++ b/src/test/modules/worker_spi/worker_spi.c
@@ -13,7 +13,7 @@
  * "delta" type.  Delta rows will be deleted by this worker and their values
  * aggregated into the total.
  *
- * Copyright (c) 2013-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2013-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *		src/test/modules/worker_spi/worker_spi.c
@@ -111,7 +111,7 @@ initialize_worker_spi(worktable *table)
 	StartTransactionCommand();
 	SPI_connect();
 	PushActiveSnapshot(GetTransactionSnapshot());
-	pgstat_report_activity(STATE_RUNNING, "initializing spi_worker schema");
+	pgstat_report_activity(STATE_RUNNING, "initializing worker_spi schema");
 
 	/* XXX could we use CREATE SCHEMA IF NOT EXISTS? */
 	initStringInfo(&buf);
@@ -359,7 +359,8 @@ _PG_init(void)
 	 */
 	for (i = 1; i <= worker_spi_total_workers; i++)
 	{
-		snprintf(worker.bgw_name, BGW_MAXLEN, "worker %d", i);
+		snprintf(worker.bgw_name, BGW_MAXLEN, "worker_spi worker %d", i);
+		snprintf(worker.bgw_type, BGW_MAXLEN, "worker_spi");
 		worker.bgw_main_arg = Int32GetDatum(i);
 
 		RegisterBackgroundWorker(&worker);
@@ -385,7 +386,8 @@ worker_spi_launch(PG_FUNCTION_ARGS)
 	worker.bgw_restart_time = BGW_NEVER_RESTART;
 	sprintf(worker.bgw_library_name, "worker_spi");
 	sprintf(worker.bgw_function_name, "worker_spi_main");
-	snprintf(worker.bgw_name, BGW_MAXLEN, "worker %d", i);
+	snprintf(worker.bgw_name, BGW_MAXLEN, "worker_spi worker %d", i);
+	snprintf(worker.bgw_type, BGW_MAXLEN, "worker_spi");
 	worker.bgw_main_arg = Int32GetDatum(i);
 	/* set bgw_notify_pid so that we can use WaitForBackgroundWorkerStartup */
 	worker.bgw_notify_pid = MyProcPid;
diff --git a/src/test/perl/Makefile b/src/test/perl/Makefile
index a974f358fd..8e7012d943 100644
--- a/src/test/perl/Makefile
+++ b/src/test/perl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/test/perl
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/perl/Makefile
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index d9aeb277d9..80188315f1 100644
--- a/src/test/perl/PostgresNode.pm
+++ b/src/test/perl/PostgresNode.pm
@@ -82,10 +82,12 @@ package PostgresNode;
 use strict;
 use warnings;
 
+use Carp;
 use Config;
 use Cwd;
 use Exporter 'import';
 use File::Basename;
+use File::Path qw(rmtree);
 use File::Spec;
 use File::Temp ();
 use IPC::Run;
@@ -100,7 +102,7 @@ our @EXPORT = qw(
   get_new_node
 );
 
-our ($test_localhost, $test_pghost, $last_port_assigned, @all_nodes);
+our ($test_localhost, $test_pghost, $last_port_assigned, @all_nodes, $died);
 
 # Windows path to virtual file system root
 
@@ -149,11 +151,14 @@ sub new
 	my $self = {
 		_port    => $pgport,
 		_host    => $pghost,
-		_basedir => TestLib::tempdir("data_" . $name),
+		_basedir => "$TestLib::tmp_check/t_${testname}_${name}_data",
 		_name    => $name,
 		_logfile => "$TestLib::log_path/${testname}_${name}.log" };
 
 	bless $self, $class;
+	mkdir $self->{_basedir}
+	  or
+	  BAIL_OUT("could not create data directory \"$self->{_basedir}\": $!");
 	$self->dump_info;
 
 	return $self;
@@ -355,7 +360,7 @@ sub set_replication_conf
 	my $pgdata = $self->data_dir;
 
 	$self->host eq $test_pghost
-	  or die "set_replication_conf only works with the default host";
+	  or croak "set_replication_conf only works with the default host";
 
 	open my $hba, '>>', "$pgdata/pg_hba.conf";
 	print $hba "\n# Allow replication (set up by PostgresNode.pm)\n";
@@ -415,6 +420,8 @@ sub init
 	print $conf "restart_after_crash = off\n";
 	print $conf "log_line_prefix = '%m [%p] %q%a '\n";
 	print $conf "log_statement = all\n";
+	print $conf "log_min_messages = debug1\n";
+	print $conf "log_replication_commands = on\n";
 	print $conf "wal_retrieve_retry_interval = '500ms'\n";
 	print $conf "port = $port\n";
 
@@ -430,7 +437,6 @@ sub init
 		}
 		print $conf "max_wal_senders = 5\n";
 		print $conf "max_replication_slots = 5\n";
-		print $conf "wal_keep_segments = 20\n";
 		print $conf "max_wal_size = 128MB\n";
 		print $conf "shared_buffers = 1MB\n";
 		print $conf "wal_log_hints = on\n";
@@ -619,7 +625,7 @@ sub init_from_backup
 
 	print
 "# Initializing node \"$node_name\" from backup \"$backup_name\" of node \"$root_name\"\n";
-	die "Backup \"$backup_name\" does not exist at $backup_path"
+	croak "Backup \"$backup_name\" does not exist at $backup_path"
 	  unless -d $backup_path;
 
 	mkdir $self->backup_dir;
@@ -928,9 +934,23 @@ sub get_new_node
 	return $node;
 }
 
+# Retain the errno on die() if set, else assume a generic errno of 1.
+# This will instruct the END handler on how to handle artifacts left
+# behind from tests.
+$SIG{__DIE__} = sub {
+	if ($!)
+	{
+		$died = $!;
+	}
+	else
+	{
+		$died = 1;
+	}
+};
+
 # Automatically shut down any still-running nodes when the test script exits.
 # Note that this just stops the postmasters (in the same order the nodes were
-# created in).  Temporary PGDATA directories are deleted, in an unspecified
+# created in).  Any temporary directories are deleted, in an unspecified
 # order, later when the File::Temp objects are destroyed.
 END
 {
@@ -941,6 +961,13 @@ END
 	foreach my $node (@all_nodes)
 	{
 		$node->teardown_node;
+
+		# skip clean if we are requested to retain the basedir
+		next if defined $ENV{'PG_TEST_NOCLEAN'};
+
+		# clean basedir on clean test invocation
+		$node->clean_node
+		  if TestLib::all_tests_passing() && !defined $died && !$exit_code;
 	}
 
 	$? = $exit_code;
@@ -959,6 +986,22 @@ sub teardown_node
 	my $self = shift;
 
 	$self->stop('immediate');
+
+}
+
+=pod
+
+=item $node->clean_node()
+
+Remove the base directory of the node if the node has been stopped.
+
+=cut
+
+sub clean_node
+{
+	my $self = shift;
+
+	rmtree $self->{_basedir} unless defined $self->{_pid};
 }
 
 =pod
@@ -1284,9 +1327,9 @@ sub command_ok
 
 =pod
 
-=item $node->command_fails(...) - TestLib::command_fails with our PGPORT
+=item $node->command_fails(...)
 
-See command_ok(...)
+TestLib::command_fails with our PGPORT. See command_ok(...)
 
 =cut
 
@@ -1318,6 +1361,23 @@ sub command_like
 
 =pod
 
+=item $node->command_checks_all(...)
+
+TestLib::command_checks_all with our PGPORT. See command_ok(...)
+
+=cut
+
+sub command_checks_all
+{
+	my $self = shift;
+
+	local $ENV{PGPORT} = $self->port;
+
+	TestLib::command_checks_all(@_);
+}
+
+=pod
+
 =item $node->issues_sql_like(cmd, expected_sql, test_name)
 
 Run a command on the node, then verify that $expected_sql appears in the
@@ -1386,7 +1446,7 @@ sub lsn
 		'replay'  => 'pg_last_wal_replay_lsn()');
 
 	$mode = '<undef>' if !defined($mode);
-	die "unknown mode for 'lsn': '$mode', valid modes are "
+	croak "unknown mode for 'lsn': '$mode', valid modes are "
 	  . join(', ', keys %modes)
 	  if !defined($modes{$mode});
 
@@ -1406,7 +1466,8 @@ sub lsn
 
 =item $node->wait_for_catchup(standby_name, mode, target_lsn)
 
-Wait for the node with application_name standby_name (usually from node->name)
+Wait for the node with application_name standby_name (usually from node->name,
+also works for logical subscriptions)
 until its replication location in pg_stat_replication equals or passes the
 upstream's WAL insert point at the time this function is called. By default
 the replay_lsn is waited for, but 'mode' may be specified to wait for any of
@@ -1418,6 +1479,7 @@ poll_query_until timeout.
 Requires that the 'postgres' db exists and is accessible.
 
 target_lsn may be any arbitrary lsn, but is typically $master_node->lsn('insert').
+If omitted, pg_current_wal_lsn() is used.
 
 This is not a test. It die()s on failure.
 
@@ -1429,7 +1491,7 @@ sub wait_for_catchup
 	$mode = defined($mode) ? $mode : 'replay';
 	my %valid_modes =
 	  ('sent' => 1, 'write' => 1, 'flush' => 1, 'replay' => 1);
-	die "unknown mode $mode for 'wait_for_catchup', valid modes are "
+	croak "unknown mode $mode for 'wait_for_catchup', valid modes are "
 	  . join(', ', keys(%valid_modes))
 	  unless exists($valid_modes{$mode});
 
@@ -1438,7 +1500,15 @@ sub wait_for_catchup
 	{
 		$standby_name = $standby_name->name;
 	}
-	die 'target_lsn must be specified' unless defined($target_lsn);
+	my $lsn_expr;
+	if (defined($target_lsn))
+	{
+		$lsn_expr = "'$target_lsn'";
+	}
+	else
+	{
+		$lsn_expr = 'pg_current_wal_lsn()'
+	}
 	print "Waiting for replication conn "
 	  . $standby_name . "'s "
 	  . $mode
@@ -1446,10 +1516,9 @@ sub wait_for_catchup
 	  . $target_lsn . " on "
 	  . $self->name . "\n";
 	my $query =
-qq[SELECT '$target_lsn' <= ${mode}_lsn FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
+qq[SELECT $lsn_expr <= ${mode}_lsn FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
 	$self->poll_query_until('postgres', $query)
-	  or die "timed out waiting for catchup, current location is "
-	  . ($self->safe_psql('postgres', $query) || '(unknown)');
+	  or croak "timed out waiting for catchup";
 	print "done\n";
 }
 
@@ -1479,9 +1548,9 @@ sub wait_for_slot_catchup
 	$mode = defined($mode) ? $mode : 'restart';
 	if (!($mode eq 'restart' || $mode eq 'confirmed_flush'))
 	{
-		die "valid modes are restart, confirmed_flush";
+		croak "valid modes are restart, confirmed_flush";
 	}
-	die 'target lsn must be specified' unless defined($target_lsn);
+	croak 'target lsn must be specified' unless defined($target_lsn);
 	print "Waiting for replication slot "
 	  . $slot_name . "'s "
 	  . $mode
@@ -1491,8 +1560,7 @@ sub wait_for_slot_catchup
 	my $query =
 qq[SELECT '$target_lsn' <= ${mode}_lsn FROM pg_catalog.pg_replication_slots WHERE slot_name = '$slot_name';];
 	$self->poll_query_until('postgres', $query)
-	  or die "timed out waiting for catchup, current location is "
-	  . ($self->safe_psql('postgres', $query) || '(unknown)');
+	  or croak "timed out waiting for catchup";
 	print "done\n";
 }
 
@@ -1521,7 +1589,7 @@ null columns.
 sub query_hash
 {
 	my ($self, $dbname, $query, @columns) = @_;
-	die 'calls in array context for multi-row results not supported yet'
+	croak 'calls in array context for multi-row results not supported yet'
 	  if (wantarray);
 
 	# Replace __COLUMNS__ if found
@@ -1596,8 +1664,8 @@ sub pg_recvlogical_upto
 
 	my $timeout_exception = 'pg_recvlogical timed out';
 
-	die 'slot name must be specified' unless defined($slot_name);
-	die 'endpos must be specified'    unless defined($endpos);
+	croak 'slot name must be specified' unless defined($slot_name);
+	croak 'endpos must be specified'    unless defined($endpos);
 
 	my @cmd = (
 		'pg_recvlogical', '-S', $slot_name, '--dbname',
@@ -1607,7 +1675,7 @@ sub pg_recvlogical_upto
 
 	while (my ($k, $v) = each %plugin_options)
 	{
-		die "= is not permitted to appear in replication option name"
+		croak "= is not permitted to appear in replication option name"
 		  if ($k =~ qr/=/);
 		push @cmd, "-o", "$k=$v";
 	}
diff --git a/src/test/perl/RecursiveCopy.pm b/src/test/perl/RecursiveCopy.pm
index 28ecaf6db2..5bce720b35 100644
--- a/src/test/perl/RecursiveCopy.pm
+++ b/src/test/perl/RecursiveCopy.pm
@@ -19,6 +19,7 @@ package RecursiveCopy;
 use strict;
 use warnings;
 
+use Carp;
 use File::Basename;
 use File::Copy;
 
@@ -29,12 +30,17 @@ use File::Copy;
 =head2 copypath($from, $to, %params)
 
 Recursively copy all files and directories from $from to $to.
+Does not preserve file metadata (e.g., permissions).
 
 Only regular files and subdirectories are copied.  Trying to copy other types
 of directory entries raises an exception.
 
 Raises an exception if a file would be overwritten, the source directory can't
-be read, or any I/O operation fails. Always returns true.
+be read, or any I/O operation fails.  However, we silently ignore ENOENT on
+open, because when copying from a live database it's possible for a file/dir
+to be deleted after we see its directory entry but before we can open it.
+
+Always returns true.
 
 If the B<filterfn> parameter is given, it must be a subroutine reference.
 This subroutine will be called for each entry in the source directory with its
@@ -63,7 +69,7 @@ sub copypath
 
 	if (defined $params{filterfn})
 	{
-		die "if specified, filterfn must be a subroutine reference"
+		croak "if specified, filterfn must be a subroutine reference"
 		  unless defined(ref $params{filterfn})
 			  and (ref $params{filterfn} eq 'CODE');
 
@@ -74,6 +80,9 @@ sub copypath
 		$filterfn = sub { return 1; };
 	}
 
+	# Complain if original path is bogus, because _copypath_recurse won't.
+	croak "\"$base_src_dir\" does not exist" if !-e $base_src_dir;
+
 	# Start recursive copy from current directory
 	return _copypath_recurse($base_src_dir, $base_dest_dir, "", $filterfn);
 }
@@ -89,40 +98,58 @@ sub _copypath_recurse
 	return 1 unless &$filterfn($curr_path);
 
 	# Check for symlink -- needed only on source dir
-	die "Cannot operate on symlinks" if -l $srcpath;
-
-	# Can't handle symlinks or other weird things
-	die "Source path \"$srcpath\" is not a regular file or directory"
-	  unless -f $srcpath
-		  or -d $srcpath;
+	# (note: this will fall through quietly if file is already gone)
+	croak "Cannot operate on symlink \"$srcpath\"" if -l $srcpath;
 
 	# Abort if destination path already exists.  Should we allow directories
 	# to exist already?
-	die "Destination path \"$destpath\" already exists" if -e $destpath;
+	croak "Destination path \"$destpath\" already exists" if -e $destpath;
 
 	# If this source path is a file, simply copy it to destination with the
 	# same name and we're done.
 	if (-f $srcpath)
 	{
-		copy($srcpath, $destpath)
+		my $fh;
+		unless (open($fh, '<', $srcpath))
+		{
+			return 1 if ($!{ENOENT});
+			die "open($srcpath) failed: $!";
+		}
+		copy($fh, $destpath)
 		  or die "copy $srcpath -> $destpath failed: $!";
+		close $fh;
 		return 1;
 	}
 
-	# Otherwise this is directory: create it on dest and recurse onto it.
-	mkdir($destpath) or die "mkdir($destpath) failed: $!";
-
-	opendir(my $directory, $srcpath) or die "could not opendir($srcpath): $!";
-	while (my $entry = readdir($directory))
+	# If it's a directory, create it on dest and recurse into it.
+	if (-d $srcpath)
 	{
-		next if ($entry eq '.' or $entry eq '..');
-		_copypath_recurse($base_src_dir, $base_dest_dir,
-			$curr_path eq '' ? $entry : "$curr_path/$entry", $filterfn)
-		  or die "copypath $srcpath/$entry -> $destpath/$entry failed";
+		my $directory;
+		unless (opendir($directory, $srcpath))
+		{
+			return 1 if ($!{ENOENT});
+			die "opendir($srcpath) failed: $!";
+		}
+
+		mkdir($destpath) or die "mkdir($destpath) failed: $!";
+
+		while (my $entry = readdir($directory))
+		{
+			next if ($entry eq '.' or $entry eq '..');
+			_copypath_recurse($base_src_dir, $base_dest_dir,
+				$curr_path eq '' ? $entry : "$curr_path/$entry", $filterfn)
+			  or die "copypath $srcpath/$entry -> $destpath/$entry failed";
+		}
+
+		closedir($directory);
+		return 1;
 	}
-	closedir($directory);
 
-	return 1;
+	# If it disappeared from sight, that's OK.
+	return 1 if !-e $srcpath;
+
+	# Else it's some weird file type; complain.
+	croak "Source path \"$srcpath\" is not a regular file or directory";
 }
 
 1;
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
index 6dba21c073..fdd427608b 100644
--- a/src/test/perl/TestLib.pm
+++ b/src/test/perl/TestLib.pm
@@ -26,6 +26,7 @@ our @EXPORT = qw(
   slurp_dir
   slurp_file
   append_to_file
+  check_pg_config
   system_or_bail
   system_log
   run_log
@@ -39,6 +40,7 @@ our @EXPORT = qw(
   command_like
   command_like_safe
   command_fails_like
+  command_checks_all
 
   $windows_os
 );
@@ -65,7 +67,7 @@ BEGIN
 	delete $ENV{PGPORT};
 	delete $ENV{PGHOST};
 
-	$ENV{PGAPPNAME} = $0;
+	$ENV{PGAPPNAME} = basename($0);
 
 	# Must be set early
 	$windows_os = $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys';
@@ -74,6 +76,10 @@ BEGIN
 INIT
 {
 
+	# Return EPIPE instead of killing the process with SIGPIPE.  An affected
+	# test may still fail, but it's more likely to report useful facts.
+	$SIG{PIPE} = 'IGNORE';
+
 	# Determine output directories, and create them.  The base path is the
 	# TESTDIR environment variable, which is normally set by the invoking
 	# Makefile.
@@ -216,6 +222,24 @@ sub append_to_file
 	close $fh;
 }
 
+# Check presence of a given regexp within pg_config.h for the installation
+# where tests are running, returning a match status result depending on
+# that.
+sub check_pg_config
+{
+	my ($regexp) = @_;
+	my ($stdout, $stderr);
+	my $result = IPC::Run::run [ 'pg_config', '--includedir' ], '>',
+	  \$stdout, '2>', \$stderr
+	  or die "could not execute pg_config";
+	chomp($stdout);
+
+	open my $pg_config_h, '<', "$stdout/pg_config.h" or die "$!";
+	my $match = (grep {/^$regexp/} <$pg_config_h>);
+	close $pg_config_h;
+	return $match;
+}
+
 #
 # Test functions
 #
@@ -330,4 +354,43 @@ sub command_fails_like
 	like($stderr, $expected_stderr, "$test_name: matches");
 }
 
+# Run a command and check its status and outputs.
+# The 5 arguments are:
+# - cmd: ref to list for command, options and arguments to run
+# - ret: expected exit status
+# - out: ref to list of re to be checked against stdout (all must match)
+# - err: ref to list of re to be checked against stderr (all must match)
+# - test_name: name of test
+sub command_checks_all
+{
+	my ($cmd, $expected_ret, $out, $err, $test_name) = @_;
+
+	# run command
+	my ($stdout, $stderr);
+	print("# Running: " . join(" ", @{$cmd}) . "\n");
+	IPC::Run::run($cmd, '>', \$stdout, '2>', \$stderr);
+
+	# See http://perldoc.perl.org/perlvar.html#%24CHILD_ERROR
+	my $ret = $?;
+	die "command exited with signal " . ($ret & 127)
+	  if $ret & 127;
+	$ret = $ret >> 8;
+
+	# check status
+	ok($ret == $expected_ret,
+		"$test_name status (got $ret vs expected $expected_ret)");
+
+	# check stdout
+	for my $re (@$out)
+	{
+		like($stdout, $re, "$test_name stdout /$re/");
+	}
+
+	# check stderr
+	for my $re (@$err)
+	{
+		like($stderr, $re, "$test_name stderr /$re/");
+	}
+}
+
 1;
diff --git a/src/test/recovery/Makefile b/src/test/recovery/Makefile
index 142a1b8de2..daf79a0b1f 100644
--- a/src/test/recovery/Makefile
+++ b/src/test/recovery/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/test/recovery
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/recovery/Makefile
@@ -18,7 +18,8 @@ include $(top_builddir)/src/Makefile.global
 check:
 	$(prove_check)
 
+installcheck:
+	$(prove_installcheck)
+
 clean distclean maintainer-clean:
 	rm -rf tmp_check
-
-EXTRA_INSTALL = contrib/test_decoding
diff --git a/src/test/recovery/README b/src/test/recovery/README
index 3cafb9ddfe..93bdcf4fed 100644
--- a/src/test/recovery/README
+++ b/src/test/recovery/README
@@ -10,8 +10,12 @@ Running the tests
 
     make check
 
-NOTE: This creates a temporary installation, and some tests may
-create one or multiple nodes, be they master or standby(s) for the
-purpose of the tests.
+or
+
+    make installcheck
+
+NOTE: This creates a temporary installation (in the case of "check"),
+and some tests may create one or multiple nodes, be they master or
+standby(s) for the purpose of the tests.
 
 NOTE: This requires the --enable-tap-tests argument to configure.
diff --git a/src/test/recovery/t/003_recovery_targets.pl b/src/test/recovery/t/003_recovery_targets.pl
index cc7c04b6cb..824fa4da52 100644
--- a/src/test/recovery/t/003_recovery_targets.pl
+++ b/src/test/recovery/t/003_recovery_targets.pl
@@ -5,8 +5,9 @@
 use TestLib;
 use Test::More tests => 9;
 
-# Create and test a standby from given backup, with a certain
-# recovery target.
+# Create and test a standby from given backup, with a certain recovery target.
+# Choose $until_lsn later than the transaction commit that causes the row
+# count to reach $num_rows, yet not later than the recovery target.
 sub test_recovery_standby
 {
 	my $test_name       = shift;
@@ -70,9 +71,9 @@ sub test_recovery_standby
 # More data, with recovery target timestamp
 $node_master->safe_psql('postgres',
 	"INSERT INTO tab_int VALUES (generate_series(2001,3000))");
-$ret =
-  $node_master->safe_psql('postgres', "SELECT pg_current_wal_lsn(), now();");
-my ($lsn3, $recovery_time) = split /\|/, $ret;
+my $lsn3 =
+  $node_master->safe_psql('postgres', "SELECT pg_current_wal_lsn();");
+my $recovery_time = $node_master->safe_psql('postgres', "SELECT now()");
 
 # Even more data, this time with a recovery target name
 $node_master->safe_psql('postgres',
@@ -86,10 +87,8 @@ sub test_recovery_standby
 # And now for a recovery target LSN
 $node_master->safe_psql('postgres',
 	"INSERT INTO tab_int VALUES (generate_series(4001,5000))");
-my $recovery_lsn =
+my $lsn5 = my $recovery_lsn =
   $node_master->safe_psql('postgres', "SELECT pg_current_wal_lsn()");
-my $lsn5 =
-  $node_master->safe_psql('postgres', "SELECT pg_current_wal_lsn();");
 
 $node_master->safe_psql('postgres',
 	"INSERT INTO tab_int VALUES (generate_series(5001,6000))");
diff --git a/src/test/recovery/t/006_logical_decoding.pl b/src/test/recovery/t/006_logical_decoding.pl
index 4a90e9ac7e..8b35bc8438 100644
--- a/src/test/recovery/t/006_logical_decoding.pl
+++ b/src/test/recovery/t/006_logical_decoding.pl
@@ -78,6 +78,11 @@
 is($stdout_recv, $expected,
 	'got same expected output from pg_recvlogical decoding session');
 
+$node_master->poll_query_until('postgres',
+"SELECT EXISTS (SELECT 1 FROM pg_replication_slots WHERE slot_name = 'test_slot' AND active_pid IS NULL)"
+)
+  or die "slot never became inactive";
+
 $stdout_recv = $node_master->pg_recvlogical_upto(
 	'postgres', 'test_slot', $endpos, 10,
 	'include-xids'     => '0',
diff --git a/src/test/recovery/t/009_twophase.pl b/src/test/recovery/t/009_twophase.pl
index 6c50139572..95f22bc421 100644
--- a/src/test/recovery/t/009_twophase.pl
+++ b/src/test/recovery/t/009_twophase.pl
@@ -331,6 +331,14 @@ sub configure_and_reload
 	CHECKPOINT;
 	COMMIT PREPARED 'xact_009_13';");
 
+# Ensure that last transaction is replayed on standby.
+my $cur_master_lsn =
+	$cur_master->safe_psql('postgres', "SELECT pg_current_wal_lsn()");
+my $caughtup_query =
+	"SELECT '$cur_master_lsn'::pg_lsn <= pg_last_wal_replay_lsn()";
+$cur_standby->poll_query_until('postgres', $caughtup_query)
+  or die "Timed out while waiting for standby to catch up";
+
 $cur_standby->psql(
 	'postgres',
 	"SELECT count(*) FROM t_009_tbl2",
diff --git a/src/test/recovery/t/010_logical_decoding_timelines.pl b/src/test/recovery/t/010_logical_decoding_timelines.pl
index edc0219c9c..5620450acf 100644
--- a/src/test/recovery/t/010_logical_decoding_timelines.pl
+++ b/src/test/recovery/t/010_logical_decoding_timelines.pl
@@ -24,7 +24,6 @@
 use PostgresNode;
 use TestLib;
 use Test::More tests => 13;
-use RecursiveCopy;
 use File::Copy;
 use IPC::Run ();
 use Scalar::Util qw(blessed);
diff --git a/src/test/recovery/t/013_crash_restart.pl b/src/test/recovery/t/013_crash_restart.pl
new file mode 100644
index 0000000000..91a8ef90c1
--- /dev/null
+++ b/src/test/recovery/t/013_crash_restart.pl
@@ -0,0 +1,242 @@
+#
+# Tests restarts of postgres due to crashes of a subprocess.
+#
+# Two longer-running psql subprocesses are used: One to kill a
+# backend, triggering a crash-restart cycle, one to detect when
+# postmaster noticed the backend died.  The second backend is
+# necessary because it's otherwise hard to determine if postmaster is
+# still accepting new sessions (because it hasn't noticed that the
+# backend died), or because it's already restarted.
+#
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More;
+use Config;
+use Time::HiRes qw(usleep);
+
+plan tests => 18;
+
+
+# To avoid hanging while expecting some specific input from a psql
+# instance being driven by us, add a timeout high enough that it
+# should never trigger even on very slow machines, unless something
+# is really wrong.
+my $psql_timeout = IPC::Run::timer(60);
+
+my $node = get_new_node('master');
+$node->init(allows_streaming => 1);
+$node->start();
+
+# by default PostgresNode doesn't doesn't restart after a crash
+$node->safe_psql('postgres',
+				 q[ALTER SYSTEM SET restart_after_crash = 1;
+				   ALTER SYSTEM SET log_connections = 1;
+				   SELECT pg_reload_conf();]);
+
+# Run psql, keeping session alive, so we have an alive backend to kill.
+my ($killme_stdin, $killme_stdout, $killme_stderr) = ('', '', '');
+my $killme = IPC::Run::start(
+	[   'psql', '-X', '-qAt', '-v', 'ON_ERROR_STOP=1', '-f', '-', '-d',
+		$node->connstr('postgres') ],
+	'<',
+	\$killme_stdin,
+	'>',
+	\$killme_stdout,
+	'2>',
+	\$killme_stderr,
+	$psql_timeout);
+
+# Need a second psql to check if crash-restart happened.
+my ($monitor_stdin, $monitor_stdout, $monitor_stderr) = ('', '', '');
+my $monitor = IPC::Run::start(
+	[   'psql', '-X', '-qAt', '-v', 'ON_ERROR_STOP=1', '-f', '-', '-d',
+		$node->connstr('postgres') ],
+	'<',
+	\$monitor_stdin,
+	'>',
+	\$monitor_stdout,
+	'2>',
+	\$monitor_stderr,
+	$psql_timeout);
+
+#create table, insert row that should survive
+$killme_stdin .= q[
+CREATE TABLE alive(status text);
+INSERT INTO alive VALUES($$committed-before-sigquit$$);
+SELECT pg_backend_pid();
+];
+ok(pump_until($killme, \$killme_stdout, qr/[[:digit:]]+[\r\n]$/m),
+   'acquired pid for SIGQUIT');
+my $pid = $killme_stdout;
+chomp($pid);
+$killme_stdout = '';
+$killme_stderr = '';
+
+#insert a row that should *not* survive, due to in-progress xact
+$killme_stdin .= q[
+BEGIN;
+INSERT INTO alive VALUES($$in-progress-before-sigquit$$) RETURNING status;
+];
+ok(pump_until($killme, \$killme_stdout, qr/in-progress-before-sigquit/m),
+   'inserted in-progress-before-sigquit');
+$killme_stdout = '';
+$killme_stderr = '';
+
+
+# Start longrunning query in second session, it's failure will signal
+# that crash-restart has occurred.  The initial wait for the trivial
+# select is to be sure that psql successfully connected to backend.
+$monitor_stdin .= q[
+SELECT $$psql-connected$$;
+SELECT pg_sleep(3600);
+];
+ok(pump_until($monitor, \$monitor_stdout, qr/psql-connected/m),
+   'monitor connected');
+$monitor_stdout = '';
+$monitor_stderr = '';
+
+# kill once with QUIT - we expect psql to exit, while emitting error message first
+my $ret = TestLib::system_log('pg_ctl', 'kill', 'QUIT', $pid);
+
+# Exactly process should have been alive to be killed
+is($ret, 0, "killed process with SIGQUIT");
+
+# Check that psql sees the killed backend as having been terminated
+$killme_stdin .= q[
+SELECT 1;
+];
+ok(pump_until($killme, \$killme_stderr, qr/WARNING:  terminating connection because of crash of another server process|server closed the connection unexpectedly/m),
+   "psql query died successfully after SIGQUIT");
+$killme_stderr = '';
+$killme_stdout = '';
+$killme->finish;
+
+# Wait till server restarts - we should get the WARNING here, but
+# sometimes the server is unable to send that, if interrupted while
+# sending.
+ok(pump_until($monitor, \$monitor_stderr, qr/WARNING:  terminating connection because of crash of another server process|server closed the connection unexpectedly/m),
+   "psql monitor died successfully after SIGQUIT");
+$monitor->finish;
+
+# Wait till server restarts
+is($node->poll_query_until('postgres', 'SELECT $$restarted after sigquit$$;', 'restarted after sigquit'),
+   "1", "reconnected after SIGQUIT");
+
+
+# restart psql processes, now that the crash cycle finished
+($killme_stdin, $killme_stdout, $killme_stderr) = ('', '', '');
+$killme->run();
+($monitor_stdin, $monitor_stdout, $monitor_stderr) = ('', '', '');
+$monitor->run();
+
+
+# Acquire pid of new backend
+$killme_stdin .= q[
+SELECT pg_backend_pid();
+];
+ok(pump_until($killme, \$killme_stdout, qr/[[:digit:]]+[\r\n]$/m),
+   "acquired pid for SIGKILL");
+$pid = $killme_stdout;
+chomp($pid);
+$pid = $killme_stdout;
+$killme_stdout = '';
+$killme_stderr = '';
+
+# Insert test rows
+$killme_stdin .= q[
+INSERT INTO alive VALUES($$committed-before-sigkill$$) RETURNING status;
+BEGIN;
+INSERT INTO alive VALUES($$in-progress-before-sigkill$$) RETURNING status;
+];
+ok(pump_until($killme, \$killme_stdout, qr/in-progress-before-sigkill/m),
+   'inserted in-progress-before-sigkill');
+$killme_stdout = '';
+$killme_stderr = '';
+
+# Re-start longrunning query in second session, it's failure will
+# signal that crash-restart has occurred.  The initial wait for the
+# trivial select is to be sure that psql successfully connected to
+# backend.
+$monitor_stdin = q[
+SELECT $$psql-connected$$;
+SELECT pg_sleep(3600);
+];
+ok(pump_until($monitor, \$monitor_stdout, qr/psql-connected/m),
+   'monitor connected');
+$monitor_stdout = '';
+$monitor_stderr = '';
+
+
+# kill with SIGKILL this time - we expect the backend to exit, without
+# being able to emit an error error message
+$ret = TestLib::system_log('pg_ctl', 'kill', 'KILL', $pid);
+is($ret, 0, "killed process with KILL");
+
+# Check that psql sees the server as being terminated. No WARNING,
+# because signal handlers aren't being run on SIGKILL.
+$killme_stdin .= q[
+SELECT 1;
+];
+ok(pump_until($killme, \$killme_stderr, qr/server closed the connection unexpectedly/m),
+   "psql query died successfully after SIGKILL");
+$killme->finish;
+
+# Wait till server restarts - we should get the WARNING here, but
+# sometimes the server is unable to send that, if interrupted while
+# sending.
+ok(pump_until($monitor, \$monitor_stderr, qr/WARNING:  terminating connection because of crash of another server process|server closed the connection unexpectedly/m),
+   "psql monitor died successfully after SIGKILL");
+$monitor->finish;
+
+# Wait till server restarts
+is($node->poll_query_until('postgres', 'SELECT 1', '1'), "1", "reconnected after SIGKILL");
+
+# Make sure the committed rows survived, in-progress ones not
+is($node->safe_psql('postgres', 'SELECT * FROM alive'),
+   "committed-before-sigquit\ncommitted-before-sigkill", 'data survived');
+
+is($node->safe_psql('postgres', 'INSERT INTO alive VALUES($$before-orderly-restart$$) RETURNING status'),
+   'before-orderly-restart', 'can still write after crash restart');
+
+# Just to be sure, check that an orderly restart now still works
+$node->restart();
+
+is($node->safe_psql('postgres', 'SELECT * FROM alive'),
+   "committed-before-sigquit\ncommitted-before-sigkill\nbefore-orderly-restart", 'data survived');
+
+is($node->safe_psql('postgres', 'INSERT INTO alive VALUES($$after-orderly-restart$$) RETURNING status'),
+   'after-orderly-restart', 'can still write after orderly restart');
+
+$node->stop();
+
+# Pump until string is matched, or timeout occurs
+sub pump_until
+{
+	my ($proc, $stream, $untl) = @_;
+	$proc->pump_nb();
+	while (1)
+	{
+		if ($psql_timeout->is_expired)
+		{
+			diag("aborting wait: program timed out");
+			diag("stream contents: >>", $$stream,"<<");
+			diag("pattern searched for: ", $untl);
+
+			return 0;
+		}
+		if (not $proc->pumpable())
+		{
+			diag("aborting wait: program died");
+			diag("stream contents: >>", $$stream,"<<");
+			diag("pattern searched for: ", $untl);
+
+			return 0;
+		}
+		$proc->pump();
+		last if $$stream =~ /$untl/;
+	}
+	return 1;
+
+};
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index b923ea1420..deef08dfc1 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -3,7 +3,7 @@
 # GNUmakefile--
 #    Makefile for src/test/regress (the regression tests)
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/regress/GNUmakefile
@@ -124,12 +124,12 @@ tablespace-setup:
 ## Run tests
 ##
 
-REGRESS_OPTS = --dlpath=. $(EXTRA_REGRESS_OPTS)
+REGRESS_OPTS = --dlpath=. --max-concurrent-tests=20 $(EXTRA_REGRESS_OPTS)
 
 check: all tablespace-setup
 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) $(EXTRA_TESTS)
 
-check-tests: all tablespace-setup
+check-tests: all tablespace-setup | temp-install
 	$(pg_regress_check) $(REGRESS_OPTS) $(MAXCONNOPT) $(TESTS) $(EXTRA_TESTS)
 
 installcheck: all tablespace-setup
@@ -153,7 +153,7 @@ runtest-parallel: installcheck-parallel
 bigtest: all tablespace-setup
 	$(pg_regress_installcheck) $(REGRESS_OPTS) --schedule=$(srcdir)/serial_schedule numeric_big
 
-bigcheck: all tablespace-setup
+bigcheck: all tablespace-setup | temp-install
 	$(pg_regress_check) $(REGRESS_OPTS) --schedule=$(srcdir)/parallel_schedule $(MAXCONNOPT) numeric_big
 
 
diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile
index 6409a485e8..7c665ff892 100644
--- a/src/test/regress/Makefile
+++ b/src/test/regress/Makefile
@@ -7,6 +7,11 @@
 # GNU make uses a make file named "GNUmakefile" in preference to "Makefile"
 # if it exists.  Postgres is shipped with a "GNUmakefile".
 
+
+# AIX make defaults to building *every* target of the first rule.  Start with
+# a single-target, empty rule to make the other targets non-default.
+all:
+
 all install clean check installcheck:
 	@echo "You must use GNU make to use Postgres.  It may be installed"
 	@echo "on your system with the name 'gmake'."
diff --git a/src/test/regress/expected/aggregates.out b/src/test/regress/expected/aggregates.out
index ce6b841a33..f85e913850 100644
--- a/src/test/regress/expected/aggregates.out
+++ b/src/test/regress/expected/aggregates.out
@@ -1388,6 +1388,12 @@ select min(unique1) filter (where unique1 > 100) from tenk1;
  101
 (1 row)
 
+select sum(1/ten) filter (where ten > 0) from tenk1;
+ sum  
+------
+ 1000
+(1 row)
+
 select ten, sum(distinct four) filter (where four::text ~ '123') from onek a
 group by ten;
  ten | sum 
@@ -1860,6 +1866,35 @@ NOTICE:  avg_transfn called with 3
       2 |      6
 (1 row)
 
+-- exercise cases where OSAs share state
+select
+  percentile_cont(0.5) within group (order by a),
+  percentile_disc(0.5) within group (order by a)
+from (values(1::float8),(3),(5),(7)) t(a);
+ percentile_cont | percentile_disc 
+-----------------+-----------------
+               4 |               3
+(1 row)
+
+select
+  percentile_cont(0.25) within group (order by a),
+  percentile_disc(0.5) within group (order by a)
+from (values(1::float8),(3),(5),(7)) t(a);
+ percentile_cont | percentile_disc 
+-----------------+-----------------
+             2.5 |               3
+(1 row)
+
+-- these can't share state currently
+select
+  rank(4) within group (order by a),
+  dense_rank(4) within group (order by a)
+from (values(1),(3),(5),(7)) t(a);
+ rank | dense_rank 
+------+------------
+    3 |          3
+(1 row)
+
 -- test that aggs with the same sfunc and initcond share the same agg state
 create aggregate my_sum_init(int4)
 (
@@ -1958,3 +1993,75 @@ NOTICE:  sum_transfn called with 4
 (1 row)
 
 rollback;
+-- test that the aggregate transition logic correctly handles
+-- transition / combine functions returning NULL
+-- First test the case of a normal transition function returning NULL
+BEGIN;
+CREATE FUNCTION balkifnull(int8, int4)
+RETURNS int8
+STRICT
+LANGUAGE plpgsql AS $$
+BEGIN
+    IF $1 IS NULL THEN
+       RAISE 'erroneously called with NULL argument';
+    END IF;
+    RETURN NULL;
+END$$;
+CREATE AGGREGATE balk(int4)
+(
+    SFUNC = balkifnull(int8, int4),
+    STYPE = int8,
+    PARALLEL = SAFE,
+    INITCOND = '0'
+);
+SELECT balk(hundred) FROM tenk1;
+ balk 
+------
+     
+(1 row)
+
+ROLLBACK;
+-- Secondly test the case of a parallel aggregate combiner function
+-- returning NULL. For that use normal transition function, but a
+-- combiner function returning NULL.
+BEGIN ISOLATION LEVEL REPEATABLE READ;
+CREATE FUNCTION balkifnull(int8, int8)
+RETURNS int8
+PARALLEL SAFE
+STRICT
+LANGUAGE plpgsql AS $$
+BEGIN
+    IF $1 IS NULL THEN
+       RAISE 'erroneously called with NULL argument';
+    END IF;
+    RETURN NULL;
+END$$;
+CREATE AGGREGATE balk(int4)
+(
+    SFUNC = int4_sum(int8, int4),
+    STYPE = int8,
+    COMBINEFUNC = balkifnull(int8, int8),
+    PARALLEL = SAFE,
+    INITCOND = '0'
+);
+-- force use of parallelism
+ALTER TABLE tenk1 set (parallel_workers = 4);
+SET LOCAL parallel_setup_cost=0;
+SET LOCAL max_parallel_workers_per_gather=4;
+EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial Aggregate
+               ->  Parallel Index Only Scan using tenk1_hundred on tenk1
+(5 rows)
+
+SELECT balk(hundred) FROM tenk1;
+ balk 
+------
+     
+(1 row)
+
+ROLLBACK;
diff --git a/src/test/regress/expected/alter_generic.out b/src/test/regress/expected/alter_generic.out
index 9f6ad4de33..44356dea0b 100644
--- a/src/test/regress/expected/alter_generic.out
+++ b/src/test/regress/expected/alter_generic.out
@@ -354,9 +354,9 @@ ERROR:  invalid operator number 0, must be between 1 and 5
 ALTER OPERATOR FAMILY alt_opf4 USING btree ADD OPERATOR 1 < ; -- operator without argument types
 ERROR:  operator argument types must be specified in ALTER OPERATOR FAMILY
 ALTER OPERATOR FAMILY alt_opf4 USING btree ADD FUNCTION 0 btint42cmp(int4, int2); -- function number should be between 1 and 5
-ERROR:  invalid procedure number 0, must be between 1 and 2
+ERROR:  invalid procedure number 0, must be between 1 and 3
 ALTER OPERATOR FAMILY alt_opf4 USING btree ADD FUNCTION 6 btint42cmp(int4, int2); -- function number should be between 1 and 5
-ERROR:  invalid procedure number 6, must be between 1 and 2
+ERROR:  invalid procedure number 6, must be between 1 and 3
 ALTER OPERATOR FAMILY alt_opf4 USING btree ADD STORAGE invalid_storage; -- Ensure STORAGE is not a part of ALTER OPERATOR FAMILY
 ERROR:  STORAGE cannot be specified in ALTER OPERATOR FAMILY
 DROP OPERATOR FAMILY alt_opf4 USING btree;
@@ -421,7 +421,7 @@ BEGIN TRANSACTION;
 CREATE OPERATOR FAMILY alt_opf13 USING hash;
 CREATE FUNCTION fn_opf13  (int4) RETURNS BIGINT AS 'SELECT NULL::BIGINT;' LANGUAGE SQL;
 ALTER OPERATOR FAMILY alt_opf13 USING hash ADD FUNCTION 1 fn_opf13(int4);
-ERROR:  hash procedures must return integer
+ERROR:  hash procedure 1 must return integer
 DROP OPERATOR FAMILY alt_opf13 USING hash;
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 ROLLBACK;
@@ -439,7 +439,7 @@ BEGIN TRANSACTION;
 CREATE OPERATOR FAMILY alt_opf15 USING hash;
 CREATE FUNCTION fn_opf15 (int4, int2) RETURNS BIGINT AS 'SELECT NULL::BIGINT;' LANGUAGE SQL;
 ALTER OPERATOR FAMILY alt_opf15 USING hash ADD FUNCTION 1 fn_opf15(int4, int2);
-ERROR:  hash procedures must have one argument
+ERROR:  hash procedure 1 must have one argument
 DROP OPERATOR FAMILY alt_opf15 USING hash;
 ERROR:  current transaction is aborted, commands ignored until end of transaction block
 ROLLBACK;
@@ -633,6 +633,9 @@ ALTER TEXT SEARCH TEMPLATE alt_ts_temp2 SET SCHEMA alt_nsp2;    -- OK
 CREATE TEXT SEARCH TEMPLATE alt_ts_temp2 (lexize=dsimple_lexize);
 ALTER TEXT SEARCH TEMPLATE alt_ts_temp2 SET SCHEMA alt_nsp2;    -- failed (name conflict)
 ERROR:  text search template "alt_ts_temp2" already exists in schema "alt_nsp2"
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH TEMPLATE tstemp_case ("Init" = init_function);
+ERROR:  text search template parameter "Init" not recognized
 SELECT nspname, tmplname
   FROM pg_ts_template t, pg_namespace n
   WHERE t.tmplnamespace = n.oid AND nspname like 'alt_nsp%'
@@ -659,6 +662,9 @@ CREATE TEXT SEARCH PARSER alt_ts_prs2
     (start = prsd_start, gettoken = prsd_nexttoken, end = prsd_end, lextypes = prsd_lextype);
 ALTER TEXT SEARCH PARSER alt_ts_prs2 SET SCHEMA alt_nsp2;   -- failed (name conflict)
 ERROR:  text search parser "alt_ts_prs2" already exists in schema "alt_nsp2"
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH PARSER tspars_case ("Start" = start_function);
+ERROR:  text search parser parameter "Start" not recognized
 SELECT nspname, prsname
   FROM pg_ts_parser t, pg_namespace n
   WHERE t.prsnamespace = n.oid AND nspname like 'alt_nsp%'
diff --git a/src/test/regress/expected/alter_operator.out b/src/test/regress/expected/alter_operator.out
index ef47affd7b..71bd484282 100644
--- a/src/test/regress/expected/alter_operator.out
+++ b/src/test/regress/expected/alter_operator.out
@@ -121,6 +121,9 @@ ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = !==);
 ERROR:  operator attribute "commutator" cannot be changed
 ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = !==);
 ERROR:  operator attribute "negator" cannot be changed
+-- invalid: non-lowercase quoted identifiers
+ALTER OPERATOR & (bit, bit) SET ("Restrict" = _int_contsel, "Join" = _int_contjoinsel);
+ERROR:  operator attribute "Restrict" not recognized
 --
 -- Test permission check. Must be owner to ALTER OPERATOR.
 --
diff --git a/src/test/regress/expected/alter_table.out b/src/test/regress/expected/alter_table.out
index 58192d2c6a..ccd2c38dbc 100644
--- a/src/test/regress/expected/alter_table.out
+++ b/src/test/regress/expected/alter_table.out
@@ -1,5 +1,12 @@
 --
 -- ALTER_TABLE
+--
+-- Clean up in case a prior regression run failed
+SET client_min_messages TO 'warning';
+DROP ROLE IF EXISTS regress_alter_user1;
+RESET client_min_messages;
+CREATE USER regress_alter_user1;
+--
 -- add attribute
 --
 CREATE TABLE tmp (initial int4);
@@ -94,6 +101,30 @@ SELECT * FROM tmp;
          | 4 | name | text | 4.1 | 4.1 | 2 | ((4.1,4.1),(3.1,3.1)) | Mon May 01 00:30:30 1995 PDT | c | {"Mon May 01 00:30:30 1995 PDT","Mon Aug 24 14:43:07 1992 PDT","Wed Dec 31 16:00:00 1969 PST"} | 314159 | (1,1) | 512 | 1 2 3 4 5 6 7 8 | magnetic disk | (1.1,1.1) | [(4.1,4.1),(3.1,3.1)] | ((0,2),(4.1,4.1),(3.1,3.1)) | (4.1,4.1),(3.1,3.1) | ["Wed Dec 31 16:00:00 1969 PST" "infinity"] | Thu Jan 01 00:00:00 1970 | @ 1 hour 10 secs | {1,2,3,4} | {1,2,3,4} | {1,2,3,4}
 (1 row)
 
+CREATE INDEX tmp_idx ON tmp (a, (d + e), b);
+ALTER INDEX tmp_idx ALTER COLUMN 0 SET STATISTICS 1000;
+ERROR:  column number must be in range from 1 to 32767
+LINE 1: ALTER INDEX tmp_idx ALTER COLUMN 0 SET STATISTICS 1000;
+                                         ^
+ALTER INDEX tmp_idx ALTER COLUMN 1 SET STATISTICS 1000;
+ERROR:  cannot alter statistics on non-expression column "a" of index "tmp_idx"
+HINT:  Alter statistics on table column instead.
+ALTER INDEX tmp_idx ALTER COLUMN 2 SET STATISTICS 1000;
+\d+ tmp_idx
+                     Index "public.tmp_idx"
+ Column |       Type       | Definition | Storage | Stats target 
+--------+------------------+------------+---------+--------------
+ a      | integer          | a          | plain   | 
+ expr   | double precision | (d + e)    | plain   | 1000
+ b      | cstring          | b          | plain   | 
+btree, for table "public.tmp"
+
+ALTER INDEX tmp_idx ALTER COLUMN 3 SET STATISTICS 1000;
+ERROR:  cannot alter statistics on non-expression column "b" of index "tmp_idx"
+HINT:  Alter statistics on table column instead.
+ALTER INDEX tmp_idx ALTER COLUMN 4 SET STATISTICS 1000;
+ERROR:  column number 4 of relation "tmp_idx" does not exist
+ALTER INDEX tmp_idx ALTER COLUMN 2 SET STATISTICS -1;
 DROP TABLE tmp;
 --
 -- rename - check on both non-temp and temp tables
@@ -185,9 +216,17 @@ ALTER INDEX IF EXISTS __tmp_onek_unique1 RENAME TO onek_unique1;
 NOTICE:  relation "__tmp_onek_unique1" does not exist, skipping
 ALTER INDEX onek_unique1 RENAME TO tmp_onek_unique1;
 ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1;
+SET ROLE regress_alter_user1;
+ALTER INDEX onek_unique1 RENAME TO fail;  -- permission denied
+ERROR:  must be owner of index onek_unique1
+RESET ROLE;
 -- renaming views
 CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1;
 ALTER TABLE tmp_view RENAME TO tmp_view_new;
+SET ROLE regress_alter_user1;
+ALTER VIEW tmp_view_new RENAME TO fail;  -- permission denied
+ERROR:  must be owner of view tmp_view_new
+RESET ROLE;
 -- hack to ensure we get an indexscan here
 set enable_seqscan to off;
 set enable_bitmapscan to off;
@@ -1895,7 +1934,7 @@ alter table anothertab alter column atcol1 drop default;
 alter table anothertab alter column atcol1 type boolean
         using case when atcol1 % 2 = 0 then true else false end; -- fails
 ERROR:  operator does not exist: boolean <= integer
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 alter table anothertab drop constraint anothertab_chk;
 alter table anothertab drop constraint anothertab_chk; -- fails
 ERROR:  constraint "anothertab_chk" of relation "anothertab" does not exist
@@ -1941,6 +1980,67 @@ create table tab1 (a int, b text);
 create table tab2 (x int, y tab1);
 alter table tab1 alter column b type varchar; -- fails
 ERROR:  cannot alter table "tab1" because column "tab2.y" uses its row type
+-- Alter column type that's part of a partitioned index
+create table at_partitioned (a int, b text) partition by range (a);
+create table at_part_1 partition of at_partitioned for values from (0) to (1000);
+insert into at_partitioned values (512, '0.123');
+create table at_part_2 (b text, a int);
+insert into at_part_2 values ('1.234', 1024);
+create index on at_partitioned (b);
+create index on at_partitioned (a);
+\d at_part_1
+             Table "public.at_part_1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | text    |           |          | 
+Partition of: at_partitioned FOR VALUES FROM (0) TO (1000)
+Indexes:
+    "at_part_1_a_idx" btree (a)
+    "at_part_1_b_idx" btree (b)
+
+\d at_part_2
+             Table "public.at_part_2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ b      | text    |           |          | 
+ a      | integer |           |          | 
+
+alter table at_partitioned attach partition at_part_2 for values from (1000) to (2000);
+\d at_part_2
+             Table "public.at_part_2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ b      | text    |           |          | 
+ a      | integer |           |          | 
+Partition of: at_partitioned FOR VALUES FROM (1000) TO (2000)
+Indexes:
+    "at_part_2_a_idx" btree (a)
+    "at_part_2_b_idx" btree (b)
+
+alter table at_partitioned alter column b type numeric using b::numeric;
+\d at_part_1
+             Table "public.at_part_1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | numeric |           |          | 
+Partition of: at_partitioned FOR VALUES FROM (0) TO (1000)
+Indexes:
+    "at_part_1_a_idx" btree (a)
+    "at_part_1_b_idx" btree (b)
+
+\d at_part_2
+             Table "public.at_part_2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ b      | numeric |           |          | 
+ a      | integer |           |          | 
+Partition of: at_partitioned FOR VALUES FROM (1000) TO (2000)
+Indexes:
+    "at_part_2_a_idx" btree (a)
+    "at_part_2_b_idx" btree (b)
+
 -- disallow recursive containment of row types
 create temp table recur1 (f1 int);
 alter table recur1 add column f2 recur1; -- fails
@@ -2156,6 +2256,91 @@ Foreign-key constraints:
     "check_fk_presence_2_id_fkey" FOREIGN KEY (id) REFERENCES check_fk_presence_1(id)
 
 DROP TABLE check_fk_presence_1, check_fk_presence_2;
+-- check column addition within a view (bug #14876)
+create table at_base_table(id int, stuff text);
+insert into at_base_table values (23, 'skidoo');
+create view at_view_1 as select * from at_base_table bt;
+create view at_view_2 as select *, to_json(v1) as j from at_view_1 v1;
+\d+ at_view_1
+                          View "public.at_view_1"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Description 
+--------+---------+-----------+----------+---------+----------+-------------
+ id     | integer |           |          |         | plain    | 
+ stuff  | text    |           |          |         | extended | 
+View definition:
+ SELECT bt.id,
+    bt.stuff
+   FROM at_base_table bt;
+
+\d+ at_view_2
+                          View "public.at_view_2"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Description 
+--------+---------+-----------+----------+---------+----------+-------------
+ id     | integer |           |          |         | plain    | 
+ stuff  | text    |           |          |         | extended | 
+ j      | json    |           |          |         | extended | 
+View definition:
+ SELECT v1.id,
+    v1.stuff,
+    to_json(v1.*) AS j
+   FROM at_view_1 v1;
+
+explain (verbose, costs off) select * from at_view_2;
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Seq Scan on public.at_base_table bt
+   Output: bt.id, bt.stuff, to_json(ROW(bt.id, bt.stuff))
+(2 rows)
+
+select * from at_view_2;
+ id | stuff  |             j              
+----+--------+----------------------------
+ 23 | skidoo | {"id":23,"stuff":"skidoo"}
+(1 row)
+
+create or replace view at_view_1 as select *, 2+2 as more from at_base_table bt;
+\d+ at_view_1
+                          View "public.at_view_1"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Description 
+--------+---------+-----------+----------+---------+----------+-------------
+ id     | integer |           |          |         | plain    | 
+ stuff  | text    |           |          |         | extended | 
+ more   | integer |           |          |         | plain    | 
+View definition:
+ SELECT bt.id,
+    bt.stuff,
+    2 + 2 AS more
+   FROM at_base_table bt;
+
+\d+ at_view_2
+                          View "public.at_view_2"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Description 
+--------+---------+-----------+----------+---------+----------+-------------
+ id     | integer |           |          |         | plain    | 
+ stuff  | text    |           |          |         | extended | 
+ j      | json    |           |          |         | extended | 
+View definition:
+ SELECT v1.id,
+    v1.stuff,
+    to_json(v1.*) AS j
+   FROM at_view_1 v1;
+
+explain (verbose, costs off) select * from at_view_2;
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Seq Scan on public.at_base_table bt
+   Output: bt.id, bt.stuff, to_json(ROW(bt.id, bt.stuff, NULL))
+(2 rows)
+
+select * from at_view_2;
+ id | stuff  |                   j                    
+----+--------+----------------------------------------
+ 23 | skidoo | {"id":23,"stuff":"skidoo","more":null}
+(1 row)
+
+drop view at_view_2;
+drop view at_view_1;
+drop table at_base_table;
 --
 -- lock levels
 --
@@ -2682,6 +2867,23 @@ Typed table of type: test_type2
 Inherits: test_tbl2
 
 DROP TABLE test_tbl2_subclass;
+CREATE TYPE test_typex AS (a int, b text);
+CREATE TABLE test_tblx (x int, y test_typex check ((y).a > 0));
+ALTER TYPE test_typex DROP ATTRIBUTE a; -- fails
+ERROR:  cannot drop composite type test_typex column a because other objects depend on it
+DETAIL:  constraint test_tblx_y_check on table test_tblx depends on composite type test_typex column a
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+ALTER TYPE test_typex DROP ATTRIBUTE a CASCADE;
+NOTICE:  drop cascades to constraint test_tblx_y_check on table test_tblx
+\d test_tblx
+               Table "public.test_tblx"
+ Column |    Type    | Collation | Nullable | Default 
+--------+------------+-----------+----------+---------
+ x      | integer    |           |          | 
+ y      | test_typex |           |          | 
+
+DROP TABLE test_tblx;
+DROP TYPE test_typex;
 -- This test isn't that interesting on its own, but the purpose is to leave
 -- behind a table to test pg_upgrade with. The table has a composite type
 -- column in it, and the composite type has a dropped attribute.
@@ -3103,14 +3305,6 @@ CREATE TABLE partitioned (
 	a int,
 	b int
 ) PARTITION BY RANGE (a, (a+b+1));
-ALTER TABLE partitioned ADD UNIQUE (a);
-ERROR:  unique constraints are not supported on partitioned tables
-LINE 1: ALTER TABLE partitioned ADD UNIQUE (a);
-                                    ^
-ALTER TABLE partitioned ADD PRIMARY KEY (a);
-ERROR:  primary key constraints are not supported on partitioned tables
-LINE 1: ALTER TABLE partitioned ADD PRIMARY KEY (a);
-                                    ^
 ALTER TABLE partitioned ADD FOREIGN KEY (a) REFERENCES blah;
 ERROR:  foreign key constraints are not supported on partitioned tables
 LINE 1: ALTER TABLE partitioned ADD FOREIGN KEY (a) REFERENCES blah;
@@ -3150,7 +3344,7 @@ CREATE TABLE unparted (
 );
 CREATE TABLE fail_part (like unparted);
 ALTER TABLE unparted ATTACH PARTITION fail_part FOR VALUES IN ('a');
-ERROR:  "unparted" is not partitioned
+ERROR:  table "unparted" is not partitioned
 DROP TABLE unparted, fail_part;
 -- check that partition bound is compatible
 CREATE TABLE list_parted (
@@ -3177,7 +3371,7 @@ CREATE TABLE owned_by_me (
 	a int
 ) PARTITION BY LIST (a);
 ALTER TABLE owned_by_me ATTACH PARTITION not_owned_by_me FOR VALUES IN (1);
-ERROR:  must be owner of relation not_owned_by_me
+ERROR:  must be owner of table not_owned_by_me
 RESET SESSION AUTHORIZATION;
 DROP TABLE owned_by_me, not_owned_by_me;
 DROP ROLE regress_test_not_me;
@@ -3218,7 +3412,7 @@ DROP TABLE fail_part;
 CREATE TABLE fail_part (like list_parted, c int);
 ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);
 ERROR:  table "fail_part" contains column "c" not found in parent "list_parted"
-DETAIL:  New partition should contain only the columns present in parent.
+DETAIL:  The new partition may contain only the columns present in parent.
 DROP TABLE fail_part;
 -- check that the table being attached has every column of the parent
 CREATE TABLE fail_part (a int NOT NULL);
@@ -3273,6 +3467,15 @@ SELECT conislocal, coninhcount FROM pg_constraint WHERE conrelid = 'part_1'::reg
 CREATE TABLE fail_part (LIKE part_1 INCLUDING CONSTRAINTS);
 ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);
 ERROR:  partition "fail_part" would overlap partition "part_1"
+DROP TABLE fail_part;
+-- check that an existing table can be attached as a default partition
+CREATE TABLE def_part (LIKE list_parted INCLUDING CONSTRAINTS);
+ALTER TABLE list_parted ATTACH PARTITION def_part DEFAULT;
+-- check attaching default partition fails if a default partition already
+-- exists
+CREATE TABLE fail_def_part (LIKE part_1 INCLUDING CONSTRAINTS);
+ALTER TABLE list_parted ATTACH PARTITION fail_def_part DEFAULT;
+ERROR:  partition "fail_def_part" conflicts with existing default partition "def_part"
 -- check validation when attaching list partitions
 CREATE TABLE list_parted2 (
 	a int,
@@ -3286,6 +3489,15 @@ ERROR:  partition constraint is violated by some row
 -- should be ok after deleting the bad row
 DELETE FROM part_2;
 ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
+-- check partition cannot be attached if default has some row for its values
+CREATE TABLE list_parted2_def PARTITION OF list_parted2 DEFAULT;
+INSERT INTO list_parted2_def VALUES (11, 'z');
+CREATE TABLE part_3 (LIKE list_parted2);
+ALTER TABLE list_parted2 ATTACH PARTITION part_3 FOR VALUES IN (11);
+ERROR:  updated partition constraint for default partition would be violated by some row
+-- should be ok after deleting the bad row
+DELETE FROM list_parted2_def WHERE a = 11;
+ALTER TABLE list_parted2 ATTACH PARTITION part_3 FOR VALUES IN (11);
 -- adding constraints that describe the desired partition constraint
 -- (or more restrictive) will help skip the validation scan
 CREATE TABLE part_3_4 (
@@ -3301,6 +3513,10 @@ ALTER TABLE list_parted2 DETACH PARTITION part_3_4;
 ALTER TABLE part_3_4 ALTER a SET NOT NULL;
 ALTER TABLE list_parted2 ATTACH PARTITION part_3_4 FOR VALUES IN (3, 4);
 INFO:  partition constraint for table "part_3_4" is implied by existing constraints
+-- check if default partition scan skipped
+ALTER TABLE list_parted2_def ADD CONSTRAINT check_a CHECK (a IN (5, 6));
+CREATE TABLE part_55_66 PARTITION OF list_parted2 FOR VALUES IN (55, 66);
+INFO:  updated partition constraint for default partition "list_parted2_def" is implied by existing constraints
 -- check validation when attaching range partitions
 CREATE TABLE range_parted (
 	a int,
@@ -3326,6 +3542,19 @@ CREATE TABLE part2 (
 );
 ALTER TABLE range_parted ATTACH PARTITION part2 FOR VALUES FROM (1, 10) TO (1, 20);
 INFO:  partition constraint for table "part2" is implied by existing constraints
+-- Create default partition
+CREATE TABLE partr_def1 PARTITION OF range_parted DEFAULT;
+-- Only one default partition is allowed, hence, following should give error
+CREATE TABLE partr_def2 (LIKE part1 INCLUDING CONSTRAINTS);
+ALTER TABLE range_parted ATTACH PARTITION partr_def2 DEFAULT;
+ERROR:  partition "partr_def2" conflicts with existing default partition "partr_def1"
+-- Overlapping partitions cannot be attached, hence, following should give error
+INSERT INTO partr_def1 VALUES (2, 10);
+CREATE TABLE part3 (LIKE range_parted);
+ALTER TABLE range_parted ATTACH partition part3 FOR VALUES FROM (2, 10) TO (2, 20);
+ERROR:  updated partition constraint for default partition would be violated by some row
+-- Attaching partitions should be successful when there are no overlapping rows
+ALTER TABLE range_parted ATTACH partition part3 FOR VALUES FROM (3, 10) TO (3, 20);
 -- check that leaf partitions are scanned when attaching a partitioned
 -- table
 CREATE TABLE part_5 (
@@ -3378,6 +3607,7 @@ ALTER TABLE part_7 ATTACH PARTITION part_7_a_null FOR VALUES IN ('a', null);
 INFO:  partition constraint for table "part_7_a_null" is implied by existing constraints
 ALTER TABLE list_parted2 ATTACH PARTITION part_7 FOR VALUES IN (7);
 INFO:  partition constraint for table "part_7" is implied by existing constraints
+INFO:  updated partition constraint for default partition "list_parted2_def" is implied by existing constraints
 -- Same example, but check this time that the constraint correctly detects
 -- violating rows
 ALTER TABLE list_parted2 DETACH PARTITION part_7;
@@ -3391,7 +3621,20 @@ SELECT tableoid::regclass, a, b FROM part_7 order by a;
 (2 rows)
 
 ALTER TABLE list_parted2 ATTACH PARTITION part_7 FOR VALUES IN (7);
+INFO:  updated partition constraint for default partition "list_parted2_def" is implied by existing constraints
 ERROR:  partition constraint is violated by some row
+-- check that leaf partitions of default partition are scanned when
+-- attaching a partitioned table.
+ALTER TABLE part_5 DROP CONSTRAINT check_a;
+CREATE TABLE part5_def PARTITION OF part_5 DEFAULT PARTITION BY LIST(a);
+CREATE TABLE part5_def_p1 PARTITION OF part5_def FOR VALUES IN (5);
+INSERT INTO part5_def_p1 VALUES (5, 'y');
+CREATE TABLE part5_p1 (LIKE part_5);
+ALTER TABLE part_5 ATTACH PARTITION part5_p1 FOR VALUES IN ('y');
+ERROR:  updated partition constraint for default partition would be violated by some row
+-- should be ok after deleting the bad row
+DELETE FROM part5_def_p1 WHERE b = 'y';
+ALTER TABLE part_5 ATTACH PARTITION part5_p1 FOR VALUES IN ('y');
 -- check that the table being attached is not already a partition
 ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
 ERROR:  "part_2" is already a partition
@@ -3402,23 +3645,101 @@ DETAIL:  "part_5" is already a child of "list_parted2".
 ALTER TABLE list_parted2 ATTACH PARTITION list_parted2 FOR VALUES IN (0);
 ERROR:  circular inheritance not allowed
 DETAIL:  "list_parted2" is already a child of "list_parted2".
+-- If a partitioned table being created or an existing table being attached
+-- as a paritition does not have a constraint that would allow validation scan
+-- to be skipped, but an individual partition does, then the partition's
+-- validation scan is skipped.
+CREATE TABLE quuux (a int, b text) PARTITION BY LIST (a);
+CREATE TABLE quuux_default PARTITION OF quuux DEFAULT PARTITION BY LIST (b);
+CREATE TABLE quuux_default1 PARTITION OF quuux_default (
+	CONSTRAINT check_1 CHECK (a IS NOT NULL AND a = 1)
+) FOR VALUES IN ('b');
+CREATE TABLE quuux1 (a int, b text);
+ALTER TABLE quuux ATTACH PARTITION quuux1 FOR VALUES IN (1); -- validate!
+CREATE TABLE quuux2 (a int, b text);
+ALTER TABLE quuux ATTACH PARTITION quuux2 FOR VALUES IN (2); -- skip validation
+INFO:  updated partition constraint for default partition "quuux_default1" is implied by existing constraints
+DROP TABLE quuux1, quuux2;
+-- should validate for quuux1, but not for quuux2
+CREATE TABLE quuux1 PARTITION OF quuux FOR VALUES IN (1);
+CREATE TABLE quuux2 PARTITION OF quuux FOR VALUES IN (2);
+INFO:  updated partition constraint for default partition "quuux_default1" is implied by existing constraints
+DROP TABLE quuux;
+-- check validation when attaching hash partitions
+-- The default hash functions as they exist today aren't portable; they can
+-- return different results on different machines.  Depending upon how the
+-- values are hashed, the row may map to different partitions, which result in
+-- regression failure.  To avoid this, let's create a non-default hash function
+-- that just returns the input value unchanged.
+CREATE OR REPLACE FUNCTION dummy_hashint4(a int4, seed int8) RETURNS int8 AS
+$$ BEGIN RETURN (a + 1 + seed); END; $$ LANGUAGE 'plpgsql' IMMUTABLE;
+CREATE OPERATOR CLASS custom_opclass FOR TYPE int4 USING HASH AS
+OPERATOR 1 = , FUNCTION 2 dummy_hashint4(int4, int8);
+-- check that the new partition won't overlap with an existing partition
+CREATE TABLE hash_parted (
+	a int,
+	b int
+) PARTITION BY HASH (a custom_opclass);
+CREATE TABLE hpart_1 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 4, REMAINDER 0);
+CREATE TABLE fail_part (LIKE hpart_1);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 4);
+ERROR:  partition "fail_part" would overlap partition "hpart_1"
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 0);
+ERROR:  partition "fail_part" would overlap partition "hpart_1"
+DROP TABLE fail_part;
+-- check validation when attaching hash partitions
+-- check that violating rows are correctly reported
+CREATE TABLE hpart_2 (LIKE hash_parted);
+INSERT INTO hpart_2 VALUES (3, 0);
+ALTER TABLE hash_parted ATTACH PARTITION hpart_2 FOR VALUES WITH (MODULUS 4, REMAINDER 1);
+ERROR:  partition constraint is violated by some row
+-- should be ok after deleting the bad row
+DELETE FROM hpart_2;
+ALTER TABLE hash_parted ATTACH PARTITION hpart_2 FOR VALUES WITH (MODULUS 4, REMAINDER 1);
+-- check that leaf partitions are scanned when attaching a partitioned
+-- table
+CREATE TABLE hpart_5 (
+	LIKE hash_parted
+) PARTITION BY LIST (b);
+-- check that violating rows are correctly reported
+CREATE TABLE hpart_5_a PARTITION OF hpart_5 FOR VALUES IN ('1', '2', '3');
+INSERT INTO hpart_5_a (a, b) VALUES (7, 1);
+ALTER TABLE hash_parted ATTACH PARTITION hpart_5 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+ERROR:  partition constraint is violated by some row
+-- should be ok after deleting the bad row
+DELETE FROM hpart_5_a;
+ALTER TABLE hash_parted ATTACH PARTITION hpart_5 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+-- check that the table being attach is with valid modulus and remainder value
+CREATE TABLE fail_part(LIKE hash_parted);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 0, REMAINDER 1);
+ERROR:  modulus for hash partition must be a positive integer
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 8);
+ERROR:  remainder for hash partition must be less than modulus
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+ERROR:  every hash partition modulus must be a factor of the next larger modulus
+DROP TABLE fail_part;
 --
 -- DETACH PARTITION
 --
 -- check that the table is partitioned at all
 CREATE TABLE regular_table (a int);
 ALTER TABLE regular_table DETACH PARTITION any_name;
-ERROR:  "regular_table" is not partitioned
+ERROR:  table "regular_table" is not partitioned
 DROP TABLE regular_table;
 -- check that the partition being detached exists at all
 ALTER TABLE list_parted2 DETACH PARTITION part_4;
 ERROR:  relation "part_4" does not exist
+ALTER TABLE hash_parted DETACH PARTITION hpart_4;
+ERROR:  relation "hpart_4" does not exist
 -- check that the partition being detached is actually a partition of the parent
 CREATE TABLE not_a_part (a int);
 ALTER TABLE list_parted2 DETACH PARTITION not_a_part;
 ERROR:  relation "not_a_part" is not a partition of relation "list_parted2"
 ALTER TABLE list_parted2 DETACH PARTITION part_1;
 ERROR:  relation "part_1" is not a partition of relation "list_parted2"
+ALTER TABLE hash_parted DETACH PARTITION not_a_part;
+ERROR:  relation "not_a_part" is not a partition of relation "hash_parted"
+DROP TABLE not_a_part;
 -- check that, after being detached, attinhcount/coninhcount is dropped to 0 and
 -- attislocal/conislocal is set to true
 ALTER TABLE list_parted2 DETACH PARTITION part_3_4;
@@ -3512,8 +3833,19 @@ ALTER TABLE list_parted2 DROP COLUMN b;
 ERROR:  cannot drop column named in partition key
 ALTER TABLE list_parted2 ALTER COLUMN b TYPE text;
 ERROR:  cannot alter type of column named in partition key
+-- dropping non-partition key columns should be allowed on the parent table.
+ALTER TABLE list_parted DROP COLUMN b;
+SELECT * FROM list_parted;
+ a 
+---
+(0 rows)
+
 -- cleanup
 DROP TABLE list_parted, list_parted2, range_parted;
+DROP TABLE fail_def_part;
+DROP TABLE hash_parted;
+DROP OPERATOR CLASS custom_opclass USING HASH;
+DROP FUNCTION dummy_hashint4(a int4, seed int8);
 -- more tests for certain multi-level partitioning scenarios
 create table p (a int, b int) partition by range (a, b);
 create table p1 (b int, a int not null) partition by range (b);
@@ -3551,3 +3883,11 @@ create table parted_validate_test_1 partition of parted_validate_test for values
 alter table parted_validate_test add constraint parted_validate_test_chka check (a > 0) not valid;
 alter table parted_validate_test validate constraint parted_validate_test_chka;
 drop table parted_validate_test;
+-- test alter column options
+CREATE TABLE tmp(i integer);
+INSERT INTO tmp VALUES (1);
+ALTER TABLE tmp ALTER COLUMN i SET (n_distinct = 1, n_distinct_inherited = 2);
+ALTER TABLE tmp ALTER COLUMN i RESET (n_distinct_inherited);
+ANALYZE tmp;
+DROP TABLE tmp;
+DROP USER regress_alter_user1;
diff --git a/src/test/regress/expected/cluster.out b/src/test/regress/expected/cluster.out
index 097ac2b006..2bb62212ea 100644
--- a/src/test/regress/expected/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -439,27 +439,21 @@ select * from clstr_temp;
 
 drop table clstr_temp;
 RESET SESSION AUTHORIZATION;
+-- Check that partitioned tables cannot be clustered
+CREATE TABLE clstrpart (a int) PARTITION BY RANGE (a);
+CREATE INDEX clstrpart_idx ON clstrpart (a);
+ALTER TABLE clstrpart CLUSTER ON clstrpart_idx;
+ERROR:  cannot mark index clustered in partitioned table
+CLUSTER clstrpart USING clstrpart_idx;
+ERROR:  cannot cluster a partitioned table
+DROP TABLE clstrpart;
 -- Test CLUSTER with external tuplesorting
 create table clstr_4 as select * from tenk1;
 create index cluster_sort on clstr_4 (hundred, thousand, tenthous);
 -- ensure we don't use the index in CLUSTER nor the checking SELECTs
 set enable_indexscan = off;
--- Use external sort that only ever uses quicksort to sort runs:
+-- Use external sort:
 set maintenance_work_mem = '1MB';
-set replacement_sort_tuples = 0;
-cluster clstr_4 using cluster_sort;
-select * from
-(select hundred, lag(hundred) over () as lhundred,
-        thousand, lag(thousand) over () as lthousand,
-        tenthous, lag(tenthous) over () as ltenthous from clstr_4) ss
-where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
- hundred | lhundred | thousand | lthousand | tenthous | ltenthous 
----------+----------+----------+-----------+----------+-----------
-(0 rows)
-
--- Replacement selection will now be forced.  It should only produce a single
--- run, due to the fact that input is found to be presorted:
-set replacement_sort_tuples = 150000;
 cluster clstr_4 using cluster_sort;
 select * from
 (select hundred, lag(hundred) over () as lhundred,
@@ -472,7 +466,6 @@ where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
 
 reset enable_indexscan;
 reset maintenance_work_mem;
-reset replacement_sort_tuples;
 -- clean up
 DROP TABLE clustertest;
 DROP TABLE clstr_1;
diff --git a/src/test/regress/expected/collate.icu.utf8.out b/src/test/regress/expected/collate.icu.utf8.out
index e1fc9984f2..e8cf5d50d1 100644
--- a/src/test/regress/expected/collate.icu.utf8.out
+++ b/src/test/regress/expected/collate.icu.utf8.out
@@ -968,12 +968,12 @@ ERROR:  collations are not supported by type integer
 LINE 1: ...ATE INDEX collate_test1_idx6 ON collate_test1 ((a COLLATE "C...
                                                              ^
 SELECT relname, pg_get_indexdef(oid) FROM pg_class WHERE relname LIKE 'collate_test%_idx%' ORDER BY 1;
-      relname       |                                           pg_get_indexdef                                           
---------------------+-----------------------------------------------------------------------------------------------------
- collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_test1 USING btree (b)
- collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_test1 USING btree (b COLLATE "C")
- collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_test1 USING btree (b COLLATE "C")
- collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
+      relname       |                                                  pg_get_indexdef                                                  
+--------------------+-------------------------------------------------------------------------------------------------------------------
+ collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_tests.collate_test1 USING btree (b)
+ collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_tests.collate_test1 USING btree (b COLLATE "C")
+ collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_tests.collate_test1 USING btree (b COLLATE "C")
+ collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_tests.collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
 (4 rows)
 
 -- schema manipulation commands
diff --git a/src/test/regress/expected/collate.linux.utf8.out b/src/test/regress/expected/collate.linux.utf8.out
index 6b7318613a..4eb2322e53 100644
--- a/src/test/regress/expected/collate.linux.utf8.out
+++ b/src/test/regress/expected/collate.linux.utf8.out
@@ -977,12 +977,12 @@ ERROR:  collations are not supported by type integer
 LINE 1: ...ATE INDEX collate_test1_idx6 ON collate_test1 ((a COLLATE "C...
                                                              ^
 SELECT relname, pg_get_indexdef(oid) FROM pg_class WHERE relname LIKE 'collate_test%_idx%' ORDER BY 1;
-      relname       |                                           pg_get_indexdef                                           
---------------------+-----------------------------------------------------------------------------------------------------
- collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_test1 USING btree (b)
- collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_test1 USING btree (b COLLATE "C")
- collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_test1 USING btree (b COLLATE "C")
- collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
+      relname       |                                                  pg_get_indexdef                                                  
+--------------------+-------------------------------------------------------------------------------------------------------------------
+ collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_tests.collate_test1 USING btree (b)
+ collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_tests.collate_test1 USING btree (b COLLATE "C")
+ collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_tests.collate_test1 USING btree (b COLLATE "C")
+ collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_tests.collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
 (4 rows)
 
 -- schema manipulation commands
diff --git a/src/test/regress/expected/collate.out b/src/test/regress/expected/collate.out
index b0025c0a87..f045f2b291 100644
--- a/src/test/regress/expected/collate.out
+++ b/src/test/regress/expected/collate.out
@@ -572,12 +572,12 @@ ERROR:  collations are not supported by type integer
 LINE 1: ...ATE INDEX collate_test1_idx6 ON collate_test1 ((a COLLATE "P...
                                                              ^
 SELECT relname, pg_get_indexdef(oid) FROM pg_class WHERE relname LIKE 'collate_test%_idx%' ORDER BY 1;
-      relname       |                                           pg_get_indexdef                                           
---------------------+-----------------------------------------------------------------------------------------------------
- collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_test1 USING btree (b)
- collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_test1 USING btree (b COLLATE "POSIX")
- collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_test1 USING btree (b COLLATE "POSIX")
- collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
+      relname       |                                                  pg_get_indexdef                                                  
+--------------------+-------------------------------------------------------------------------------------------------------------------
+ collate_test1_idx1 | CREATE INDEX collate_test1_idx1 ON collate_tests.collate_test1 USING btree (b)
+ collate_test1_idx2 | CREATE INDEX collate_test1_idx2 ON collate_tests.collate_test1 USING btree (b COLLATE "POSIX")
+ collate_test1_idx3 | CREATE INDEX collate_test1_idx3 ON collate_tests.collate_test1 USING btree (b COLLATE "POSIX")
+ collate_test1_idx4 | CREATE INDEX collate_test1_idx4 ON collate_tests.collate_test1 USING btree (((b || 'foo'::text)) COLLATE "POSIX")
 (4 rows)
 
 -- foreign keys
@@ -633,6 +633,11 @@ DROP COLLATION mycoll2;  -- fail
 ERROR:  cannot drop collation mycoll2 because other objects depend on it
 DETAIL:  table collate_test23 column f1 depends on collation mycoll2
 HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+-- invalid: non-lowercase quoted identifiers
+CREATE COLLATION case_coll ("Lc_Collate" = "POSIX", "Lc_Ctype" = "POSIX");
+ERROR:  collation attribute "Lc_Collate" not recognized
+LINE 1: CREATE COLLATION case_coll ("Lc_Collate" = "POSIX", "Lc_Ctyp...
+                                    ^
 -- 9.1 bug with useless COLLATE in an expression subject to length coercion
 CREATE TEMP TABLE vctable (f1 varchar(25));
 INSERT INTO vctable VALUES ('foo' COLLATE "C");
diff --git a/src/test/regress/expected/copy2.out b/src/test/regress/expected/copy2.out
index 65e9c626b3..e606a5fda4 100644
--- a/src/test/regress/expected/copy2.out
+++ b/src/test/regress/expected/copy2.out
@@ -521,12 +521,12 @@ RESET SESSION AUTHORIZATION;
 SET SESSION AUTHORIZATION regress_rls_copy_user_colperms;
 -- attempt all columns (should fail)
 COPY rls_t1 TO stdout;
-ERROR:  permission denied for relation rls_t1
+ERROR:  permission denied for table rls_t1
 COPY rls_t1 (a, b, c) TO stdout;
-ERROR:  permission denied for relation rls_t1
+ERROR:  permission denied for table rls_t1
 -- try to copy column with no privileges (should fail)
 COPY rls_t1 (c) TO stdout;
-ERROR:  permission denied for relation rls_t1
+ERROR:  permission denied for table rls_t1
 -- subset of columns (should succeed)
 COPY rls_t1 (a) TO stdout;
 2
diff --git a/src/test/regress/expected/create_aggregate.out b/src/test/regress/expected/create_aggregate.out
index 341ba52b8d..b9b7fbcc9e 100644
--- a/src/test/regress/expected/create_aggregate.out
+++ b/src/test/regress/expected/create_aggregate.out
@@ -71,7 +71,8 @@ create aggregate my_percentile_disc(float8 ORDER BY anyelement) (
   stype = internal,
   sfunc = ordered_set_transition,
   finalfunc = percentile_disc_final,
-  finalfunc_extra = true
+  finalfunc_extra = true,
+  finalfunc_modify = read_write
 );
 create aggregate my_rank(VARIADIC "any" ORDER BY VARIADIC "any") (
   stype = internal,
@@ -146,15 +147,17 @@ CREATE AGGREGATE myavg (numeric)
 	finalfunc = numeric_avg,
 	serialfunc = numeric_avg_serialize,
 	deserialfunc = numeric_avg_deserialize,
-	combinefunc = numeric_avg_combine
+	combinefunc = numeric_avg_combine,
+	finalfunc_modify = sharable  -- just to test a non-default setting
 );
 -- Ensure all these functions made it into the catalog
-SELECT aggfnoid,aggtransfn,aggcombinefn,aggtranstype,aggserialfn,aggdeserialfn
+SELECT aggfnoid, aggtransfn, aggcombinefn, aggtranstype::regtype,
+       aggserialfn, aggdeserialfn, aggfinalmodify
 FROM pg_aggregate
 WHERE aggfnoid = 'myavg'::REGPROC;
- aggfnoid |    aggtransfn     |    aggcombinefn     | aggtranstype |      aggserialfn      |      aggdeserialfn      
-----------+-------------------+---------------------+--------------+-----------------------+-------------------------
- myavg    | numeric_avg_accum | numeric_avg_combine |         2281 | numeric_avg_serialize | numeric_avg_deserialize
+ aggfnoid |    aggtransfn     |    aggcombinefn     | aggtranstype |      aggserialfn      |      aggdeserialfn      | aggfinalmodify 
+----------+-------------------+---------------------+--------------+-----------------------+-------------------------+----------------
+ myavg    | numeric_avg_accum | numeric_avg_combine | internal     | numeric_avg_serialize | numeric_avg_deserialize | s
 (1 row)
 
 DROP AGGREGATE myavg (numeric);
@@ -192,3 +195,33 @@ CREATE AGGREGATE wrongreturntype (float8)
     minvfunc = float8mi_int
 );
 ERROR:  return type of inverse transition function float8mi_int is not double precision
+-- invalid: non-lowercase quoted identifiers
+CREATE AGGREGATE case_agg ( -- old syntax
+	"Sfunc1" = int4pl,
+	"Basetype" = int4,
+	"Stype1" = int4,
+	"Initcond1" = '0',
+	"Parallel" = safe
+);
+WARNING:  aggregate attribute "Sfunc1" not recognized
+WARNING:  aggregate attribute "Basetype" not recognized
+WARNING:  aggregate attribute "Stype1" not recognized
+WARNING:  aggregate attribute "Initcond1" not recognized
+WARNING:  aggregate attribute "Parallel" not recognized
+ERROR:  aggregate stype must be specified
+CREATE AGGREGATE case_agg(float8)
+(
+	"Stype" = internal,
+	"Sfunc" = ordered_set_transition,
+	"Finalfunc" = percentile_disc_final,
+	"Finalfunc_extra" = true,
+	"Finalfunc_modify" = read_write,
+	"Parallel" = safe
+);
+WARNING:  aggregate attribute "Stype" not recognized
+WARNING:  aggregate attribute "Sfunc" not recognized
+WARNING:  aggregate attribute "Finalfunc" not recognized
+WARNING:  aggregate attribute "Finalfunc_extra" not recognized
+WARNING:  aggregate attribute "Finalfunc_modify" not recognized
+WARNING:  aggregate attribute "Parallel" not recognized
+ERROR:  aggregate stype must be specified
diff --git a/src/test/regress/expected/create_am.out b/src/test/regress/expected/create_am.out
index 1b464aae2d..47dd885c4e 100644
--- a/src/test/regress/expected/create_am.out
+++ b/src/test/regress/expected/create_am.out
@@ -26,12 +26,10 @@ CREATE OPERATOR CLASS box_ops DEFAULT
 	OPERATOR 14	@,
 	FUNCTION 1	gist_box_consistent(internal, box, smallint, oid, internal),
 	FUNCTION 2	gist_box_union(internal, internal),
-	FUNCTION 3	gist_box_compress(internal),
-	FUNCTION 4	gist_box_decompress(internal),
+	-- don't need compress, decompress, or fetch functions
 	FUNCTION 5	gist_box_penalty(internal, internal, internal),
 	FUNCTION 6	gist_box_picksplit(internal, internal),
-	FUNCTION 7	gist_box_same(box, box, internal),
-	FUNCTION 9	gist_box_fetch(internal);
+	FUNCTION 7	gist_box_same(box, box, internal);
 -- Create gist2 index on fast_emp4000
 CREATE INDEX grect2ind2 ON fast_emp4000 USING gist2 (home_base);
 -- Now check the results from plain indexscan; temporarily drop existing
diff --git a/src/test/regress/expected/create_function_3.out b/src/test/regress/expected/create_function_3.out
index b5e19485e5..5ff1e0dd86 100644
--- a/src/test/regress/expected/create_function_3.out
+++ b/src/test/regress/expected/create_function_3.out
@@ -69,126 +69,170 @@ SELECT proname, provolatile FROM pg_proc
 --
 -- SECURITY DEFINER | INVOKER
 --
-CREATE FUNCTION functext_C_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 0';
-CREATE FUNCTION functext_C_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_2(int) RETURNS bool LANGUAGE 'sql'
        SECURITY DEFINER AS 'SELECT $1 = 0';
-CREATE FUNCTION functext_C_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_3(int) RETURNS bool LANGUAGE 'sql'
        SECURITY INVOKER AS 'SELECT $1 < 0';
 SELECT proname, prosecdef FROM pg_proc
-       WHERE oid in ('functext_C_1'::regproc,
-                     'functext_C_2'::regproc,
-                     'functext_C_3'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_C_1'::regproc,
+                     'functest_C_2'::regproc,
+                     'functest_C_3'::regproc) ORDER BY proname;
    proname    | prosecdef 
 --------------+-----------
- functext_c_1 | f
- functext_c_2 | t
- functext_c_3 | f
+ functest_c_1 | f
+ functest_c_2 | t
+ functest_c_3 | f
 (3 rows)
 
-ALTER FUNCTION functext_C_1(int) IMMUTABLE;	-- unrelated change, no effect
-ALTER FUNCTION functext_C_2(int) SECURITY INVOKER;
-ALTER FUNCTION functext_C_3(int) SECURITY DEFINER;
+ALTER FUNCTION functest_C_1(int) IMMUTABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_C_2(int) SECURITY INVOKER;
+ALTER FUNCTION functest_C_3(int) SECURITY DEFINER;
 SELECT proname, prosecdef FROM pg_proc
-       WHERE oid in ('functext_C_1'::regproc,
-                     'functext_C_2'::regproc,
-                     'functext_C_3'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_C_1'::regproc,
+                     'functest_C_2'::regproc,
+                     'functest_C_3'::regproc) ORDER BY proname;
    proname    | prosecdef 
 --------------+-----------
- functext_c_1 | f
- functext_c_2 | f
- functext_c_3 | t
+ functest_c_1 | f
+ functest_c_2 | f
+ functest_c_3 | t
 (3 rows)
 
 --
 -- LEAKPROOF
 --
-CREATE FUNCTION functext_E_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 100';
-CREATE FUNCTION functext_E_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_2(int) RETURNS bool LANGUAGE 'sql'
        LEAKPROOF AS 'SELECT $1 > 100';
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
    proname    | proleakproof 
 --------------+--------------
- functext_e_1 | f
- functext_e_2 | t
+ functest_e_1 | f
+ functest_e_2 | t
 (2 rows)
 
-ALTER FUNCTION functext_E_1(int) LEAKPROOF;
-ALTER FUNCTION functext_E_2(int) STABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_E_1(int) LEAKPROOF;
+ALTER FUNCTION functest_E_2(int) STABLE;	-- unrelated change, no effect
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
    proname    | proleakproof 
 --------------+--------------
- functext_e_1 | t
- functext_e_2 | t
+ functest_e_1 | t
+ functest_e_2 | t
 (2 rows)
 
-ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;	-- remove leakproog attribute
+ALTER FUNCTION functest_E_2(int) NOT LEAKPROOF;	-- remove leakproog attribute
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
    proname    | proleakproof 
 --------------+--------------
- functext_e_1 | t
- functext_e_2 | f
+ functest_e_1 | t
+ functest_e_2 | f
 (2 rows)
 
 -- it takes superuser privilege to turn on leakproof, but not for turn off
-ALTER FUNCTION functext_E_1(int) OWNER TO regress_unpriv_user;
-ALTER FUNCTION functext_E_2(int) OWNER TO regress_unpriv_user;
+ALTER FUNCTION functest_E_1(int) OWNER TO regress_unpriv_user;
+ALTER FUNCTION functest_E_2(int) OWNER TO regress_unpriv_user;
 SET SESSION AUTHORIZATION regress_unpriv_user;
 SET search_path TO temp_func_test, public;
-ALTER FUNCTION functext_E_1(int) NOT LEAKPROOF;
-ALTER FUNCTION functext_E_2(int) LEAKPROOF;
+ALTER FUNCTION functest_E_1(int) NOT LEAKPROOF;
+ALTER FUNCTION functest_E_2(int) LEAKPROOF;
 ERROR:  only superuser can define a leakproof function
-CREATE FUNCTION functext_E_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_3(int) RETURNS bool LANGUAGE 'sql'
        LEAKPROOF AS 'SELECT $1 < 200';	-- failed
 ERROR:  only superuser can define a leakproof function
 RESET SESSION AUTHORIZATION;
 --
 -- CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT
 --
-CREATE FUNCTION functext_F_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 50';
-CREATE FUNCTION functext_F_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_2(int) RETURNS bool LANGUAGE 'sql'
        CALLED ON NULL INPUT AS 'SELECT $1 = 50';
-CREATE FUNCTION functext_F_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_3(int) RETURNS bool LANGUAGE 'sql'
        RETURNS NULL ON NULL INPUT AS 'SELECT $1 < 50';
-CREATE FUNCTION functext_F_4(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_4(int) RETURNS bool LANGUAGE 'sql'
        STRICT AS 'SELECT $1 = 50';
 SELECT proname, proisstrict FROM pg_proc
-       WHERE oid in ('functext_F_1'::regproc,
-                     'functext_F_2'::regproc,
-                     'functext_F_3'::regproc,
-                     'functext_F_4'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_F_1'::regproc,
+                     'functest_F_2'::regproc,
+                     'functest_F_3'::regproc,
+                     'functest_F_4'::regproc) ORDER BY proname;
    proname    | proisstrict 
 --------------+-------------
- functext_f_1 | f
- functext_f_2 | f
- functext_f_3 | t
- functext_f_4 | t
+ functest_f_1 | f
+ functest_f_2 | f
+ functest_f_3 | t
+ functest_f_4 | t
 (4 rows)
 
-ALTER FUNCTION functext_F_1(int) IMMUTABLE;	-- unrelated change, no effect
-ALTER FUNCTION functext_F_2(int) STRICT;
-ALTER FUNCTION functext_F_3(int) CALLED ON NULL INPUT;
+ALTER FUNCTION functest_F_1(int) IMMUTABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_F_2(int) STRICT;
+ALTER FUNCTION functest_F_3(int) CALLED ON NULL INPUT;
 SELECT proname, proisstrict FROM pg_proc
-       WHERE oid in ('functext_F_1'::regproc,
-                     'functext_F_2'::regproc,
-                     'functext_F_3'::regproc,
-                     'functext_F_4'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_F_1'::regproc,
+                     'functest_F_2'::regproc,
+                     'functest_F_3'::regproc,
+                     'functest_F_4'::regproc) ORDER BY proname;
    proname    | proisstrict 
 --------------+-------------
- functext_f_1 | f
- functext_f_2 | t
- functext_f_3 | f
- functext_f_4 | t
+ functest_f_1 | f
+ functest_f_2 | t
+ functest_f_3 | f
+ functest_f_4 | t
 (4 rows)
 
+-- pg_get_functiondef tests
+SELECT pg_get_functiondef('functest_A_1'::regproc);
+                         pg_get_functiondef                         
+--------------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION temp_func_test.functest_a_1(text, date)+
+  RETURNS boolean                                                  +
+  LANGUAGE sql                                                     +
+ AS $function$SELECT $1 = 'abcd' AND $2 > '2001-01-01'$function$   +
+ 
+(1 row)
+
+SELECT pg_get_functiondef('functest_B_3'::regproc);
+                       pg_get_functiondef                        
+-----------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION temp_func_test.functest_b_3(integer)+
+  RETURNS boolean                                               +
+  LANGUAGE sql                                                  +
+  STABLE                                                        +
+ AS $function$SELECT $1 = 0$function$                           +
+ 
+(1 row)
+
+SELECT pg_get_functiondef('functest_C_3'::regproc);
+                       pg_get_functiondef                        
+-----------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION temp_func_test.functest_c_3(integer)+
+  RETURNS boolean                                               +
+  LANGUAGE sql                                                  +
+  SECURITY DEFINER                                              +
+ AS $function$SELECT $1 < 0$function$                           +
+ 
+(1 row)
+
+SELECT pg_get_functiondef('functest_F_2'::regproc);
+                       pg_get_functiondef                        
+-----------------------------------------------------------------
+ CREATE OR REPLACE FUNCTION temp_func_test.functest_f_2(integer)+
+  RETURNS boolean                                               +
+  LANGUAGE sql                                                  +
+  STRICT                                                        +
+ AS $function$SELECT $1 = 50$function$                          +
+ 
+(1 row)
+
 -- information_schema tests
 CREATE FUNCTION functest_IS_1(a int, b int default 1, c text default 'foo')
     RETURNS int
@@ -236,15 +280,15 @@ drop cascades to function functest_a_3()
 drop cascades to function functest_b_2(integer)
 drop cascades to function functest_b_3(integer)
 drop cascades to function functest_b_4(integer)
-drop cascades to function functext_c_1(integer)
-drop cascades to function functext_c_2(integer)
-drop cascades to function functext_c_3(integer)
-drop cascades to function functext_e_1(integer)
-drop cascades to function functext_e_2(integer)
-drop cascades to function functext_f_1(integer)
-drop cascades to function functext_f_2(integer)
-drop cascades to function functext_f_3(integer)
-drop cascades to function functext_f_4(integer)
+drop cascades to function functest_c_1(integer)
+drop cascades to function functest_c_2(integer)
+drop cascades to function functest_c_3(integer)
+drop cascades to function functest_e_1(integer)
+drop cascades to function functest_e_2(integer)
+drop cascades to function functest_f_1(integer)
+drop cascades to function functest_f_2(integer)
+drop cascades to function functest_f_3(integer)
+drop cascades to function functest_f_4(integer)
 drop cascades to function functest_b_2(bigint)
 DROP USER regress_unpriv_user;
 RESET search_path;
diff --git a/src/test/regress/expected/create_index.out b/src/test/regress/expected/create_index.out
index 064adb4640..057faff2e5 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -2324,10 +2324,10 @@ DROP TABLE array_gin_test;
 CREATE INDEX gin_relopts_test ON array_index_op_test USING gin (i)
   WITH (FASTUPDATE=on, GIN_PENDING_LIST_LIMIT=128);
 \d+ gin_relopts_test
-     Index "public.gin_relopts_test"
- Column |  Type   | Definition | Storage 
---------+---------+------------+---------
- i      | integer | i          | plain
+            Index "public.gin_relopts_test"
+ Column |  Type   | Definition | Storage | Stats target 
+--------+---------+------------+---------+--------------
+ i      | integer | i          | plain   | 
 gin, for table "public.array_index_op_test"
 Options: fastupdate=on, gin_pending_list_limit=128
 
@@ -2337,7 +2337,7 @@ Options: fastupdate=on, gin_pending_list_limit=128
 CREATE INDEX hash_i4_index ON hash_i4_heap USING hash (random int4_ops);
 CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
 CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
-CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops);
+CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops) WITH (fillfactor=60);
 CREATE UNLOGGED TABLE unlogged_hash_table (id int4);
 CREATE INDEX unlogged_hash_index ON unlogged_hash_table USING hash (id int4_ops);
 DROP TABLE unlogged_hash_table;
@@ -2559,6 +2559,12 @@ DROP INDEX cwi_replaced_pkey;	-- Should fail; a constraint depends on it
 ERROR:  cannot drop index cwi_replaced_pkey because constraint cwi_replaced_pkey on table cwi_test requires it
 HINT:  You can drop constraint cwi_replaced_pkey on table cwi_test instead.
 DROP TABLE cwi_test;
+-- ADD CONSTRAINT USING INDEX is forbidden on partitioned tables
+CREATE TABLE cwi_test(a int) PARTITION BY hash (a);
+create unique index on cwi_test (a);
+alter table cwi_test add primary key using index cwi_test_a_idx ;
+ERROR:  ALTER TABLE / ADD CONSTRAINT USING INDEX is not supported on partitioned tables
+DROP TABLE cwi_test;
 --
 -- Check handling of indexes on system columns
 --
diff --git a/src/test/regress/expected/create_misc.out b/src/test/regress/expected/create_misc.out
index 45125fedfd..8366841ff0 100644
--- a/src/test/regress/expected/create_misc.out
+++ b/src/test/regress/expected/create_misc.out
@@ -24,6 +24,16 @@ INSERT INTO equipment_r (name, hobby) VALUES ('advil', 'posthacking');
 INSERT INTO equipment_r (name, hobby) VALUES ('peet''s coffee', 'posthacking');
 INSERT INTO equipment_r (name, hobby) VALUES ('hightops', 'basketball');
 INSERT INTO equipment_r (name, hobby) VALUES ('guts', 'skywalking');
+INSERT INTO city VALUES
+('Podunk', '(1,2),(3,4)', '100,127,1000'),
+('Gotham', '(1000,34),(1100,334)', '123456,127,-1000,6789');
+TABLE city;
+  name  |       location       |        budget         
+--------+----------------------+-----------------------
+ Podunk | (3,4),(1,2)          | 100,127,1000,0
+ Gotham | (1100,334),(1000,34) | 123456,127,-1000,6789
+(2 rows)
+
 SELECT *
    INTO TABLE ramp
    FROM road
diff --git a/src/test/regress/expected/create_operator.out b/src/test/regress/expected/create_operator.out
index 3a216c2ca8..e35eb09250 100644
--- a/src/test/regress/expected/create_operator.out
+++ b/src/test/regress/expected/create_operator.out
@@ -26,6 +26,14 @@ CREATE OPERATOR #%# (
    leftarg = int8,		-- right unary
    procedure = numeric_fac
 );
+-- Test operator created above
+SELECT point '(1,2)' <% widget '(0,0,3)' AS t,
+       point '(1,2)' <% widget '(0,0,1)' AS f;
+ t | f 
+---+---
+ t | f
+(1 row)
+
 -- Test comments
 COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary';
 ERROR:  operator does not exist: integer ######
@@ -172,3 +180,26 @@ CREATE OPERATOR #*# (
 );
 ERROR:  permission denied for type type_op6
 ROLLBACK;
+-- invalid: non-lowercase quoted identifiers
+CREATE OPERATOR ===
+(
+	"Leftarg" = box,
+	"Rightarg" = box,
+	"Procedure" = area_equal_procedure,
+	"Commutator" = ===,
+	"Negator" = !==,
+	"Restrict" = area_restriction_procedure,
+	"Join" = area_join_procedure,
+	"Hashes",
+	"Merges"
+);
+WARNING:  operator attribute "Leftarg" not recognized
+WARNING:  operator attribute "Rightarg" not recognized
+WARNING:  operator attribute "Procedure" not recognized
+WARNING:  operator attribute "Commutator" not recognized
+WARNING:  operator attribute "Negator" not recognized
+WARNING:  operator attribute "Restrict" not recognized
+WARNING:  operator attribute "Join" not recognized
+WARNING:  operator attribute "Hashes" not recognized
+WARNING:  operator attribute "Merges" not recognized
+ERROR:  operator procedure must be specified
diff --git a/src/test/regress/expected/create_procedure.out b/src/test/regress/expected/create_procedure.out
new file mode 100644
index 0000000000..182b325ea1
--- /dev/null
+++ b/src/test/regress/expected/create_procedure.out
@@ -0,0 +1,132 @@
+CALL nonexistent();  -- error
+ERROR:  function nonexistent() does not exist
+LINE 1: CALL nonexistent();
+             ^
+HINT:  No function matches the given name and argument types. You might need to add explicit type casts.
+CALL random();  -- error
+ERROR:  random() is not a procedure
+LINE 1: CALL random();
+             ^
+HINT:  To call a function, use SELECT.
+CREATE FUNCTION testfunc1(a int) RETURNS int LANGUAGE SQL AS $$ SELECT a $$;
+CREATE TABLE cp_test (a int, b text);
+CREATE PROCEDURE ptest1(x text)
+LANGUAGE SQL
+AS $$
+INSERT INTO cp_test VALUES (1, x);
+$$;
+SELECT ptest1('x');  -- error
+ERROR:  ptest1(unknown) is a procedure
+LINE 1: SELECT ptest1('x');
+               ^
+HINT:  To call a procedure, use CALL.
+CALL ptest1('a');  -- ok
+CALL ptest1('xy' || 'zzy');  -- ok, constant-folded arg
+CALL ptest1(substring(random()::text, 1, 1));  -- ok, volatile arg
+\df ptest1
+                        List of functions
+ Schema |  Name  | Result data type | Argument data types | Type 
+--------+--------+------------------+---------------------+------
+ public | ptest1 |                  | x text              | proc
+(1 row)
+
+SELECT pg_get_functiondef('ptest1'::regproc);
+                pg_get_functiondef                 
+---------------------------------------------------
+ CREATE OR REPLACE PROCEDURE public.ptest1(x text)+
+  LANGUAGE sql                                    +
+ AS $procedure$                                   +
+ INSERT INTO cp_test VALUES (1, x);               +
+ $procedure$                                      +
+ 
+(1 row)
+
+SELECT * FROM cp_test ORDER BY b COLLATE "C";
+ a |   b   
+---+-------
+ 1 | 0
+ 1 | a
+ 1 | xyzzy
+(3 rows)
+
+CREATE PROCEDURE ptest2()
+LANGUAGE SQL
+AS $$
+SELECT 5;
+$$;
+CALL ptest2();
+-- nested CALL
+TRUNCATE cp_test;
+CREATE PROCEDURE ptest3(y text)
+LANGUAGE SQL
+AS $$
+CALL ptest1(y);
+CALL ptest1($1);
+$$;
+CALL ptest3('b');
+SELECT * FROM cp_test;
+ a | b 
+---+---
+ 1 | b
+ 1 | b
+(2 rows)
+
+-- various error cases
+CALL version();  -- error: not a procedure
+ERROR:  version() is not a procedure
+LINE 1: CALL version();
+             ^
+HINT:  To call a function, use SELECT.
+CALL sum(1);  -- error: not a procedure
+ERROR:  sum(integer) is not a procedure
+LINE 1: CALL sum(1);
+             ^
+CREATE PROCEDURE ptestx() LANGUAGE SQL WINDOW AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+ERROR:  invalid attribute in procedure definition
+LINE 1: CREATE PROCEDURE ptestx() LANGUAGE SQL WINDOW AS $$ INSERT I...
+                                               ^
+CREATE PROCEDURE ptestx() LANGUAGE SQL STRICT AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+ERROR:  invalid attribute in procedure definition
+LINE 1: CREATE PROCEDURE ptestx() LANGUAGE SQL STRICT AS $$ INSERT I...
+                                               ^
+CREATE PROCEDURE ptestx(OUT a int) LANGUAGE SQL AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+ERROR:  procedures cannot have OUT parameters
+ALTER PROCEDURE ptest1(text) STRICT;
+ERROR:  invalid attribute in procedure definition
+LINE 1: ALTER PROCEDURE ptest1(text) STRICT;
+                                     ^
+ALTER FUNCTION ptest1(text) VOLATILE;  -- error: not a function
+ERROR:  ptest1(text) is not a function
+ALTER PROCEDURE testfunc1(int) VOLATILE;  -- error: not a procedure
+ERROR:  testfunc1(integer) is not a procedure
+ALTER PROCEDURE nonexistent() VOLATILE;
+ERROR:  procedure nonexistent() does not exist
+DROP FUNCTION ptest1(text);  -- error: not a function
+ERROR:  ptest1(text) is not a function
+DROP PROCEDURE testfunc1(int);  -- error: not a procedure
+ERROR:  testfunc1(integer) is not a procedure
+DROP PROCEDURE nonexistent();
+ERROR:  procedure nonexistent() does not exist
+-- privileges
+CREATE USER regress_user1;
+GRANT INSERT ON cp_test TO regress_user1;
+REVOKE EXECUTE ON PROCEDURE ptest1(text) FROM PUBLIC;
+SET ROLE regress_user1;
+CALL ptest1('a');  -- error
+ERROR:  permission denied for procedure ptest1
+RESET ROLE;
+GRANT EXECUTE ON PROCEDURE ptest1(text) TO regress_user1;
+SET ROLE regress_user1;
+CALL ptest1('a');  -- ok
+RESET ROLE;
+-- ROUTINE syntax
+ALTER ROUTINE testfunc1(int) RENAME TO testfunc1a;
+ALTER ROUTINE testfunc1a RENAME TO testfunc1;
+ALTER ROUTINE ptest1(text) RENAME TO ptest1a;
+ALTER ROUTINE ptest1a RENAME TO ptest1;
+DROP ROUTINE testfunc1(int);
+-- cleanup
+DROP PROCEDURE ptest1;
+DROP PROCEDURE ptest2;
+DROP TABLE cp_test;
+DROP USER regress_user1;
diff --git a/src/test/regress/expected/create_table.out b/src/test/regress/expected/create_table.out
index babda8978c..39a963888d 100644
--- a/src/test/regress/expected/create_table.out
+++ b/src/test/regress/expected/create_table.out
@@ -215,6 +215,11 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
 NOTICE:  relation "test_tsvector" already exists, skipping
+-- invalid: non-lowercase quoted reloptions identifiers
+CREATE TABLE tas_case WITH ("Fillfactor" = 10) AS SELECT 1 a;
+ERROR:  unrecognized parameter "Fillfactor"
+CREATE TABLE tas_case (a text) WITH ("Oids" = true);
+ERROR:  unrecognized parameter "Oids"
 CREATE UNLOGGED TABLE unlogged1 (a int primary key);			-- OK
 CREATE TEMPORARY TABLE unlogged2 (a int primary key);			-- OK
 SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged\d' ORDER BY relname;
@@ -276,12 +281,6 @@ CREATE TABLE partitioned (
 ) PARTITION BY LIST (a1, a2);	-- fail
 ERROR:  cannot use "list" partition strategy with more than one column
 -- unsupported constraint type for partitioned tables
-CREATE TABLE partitioned (
-	a int PRIMARY KEY
-) PARTITION BY RANGE (a);
-ERROR:  primary key constraints are not supported on partitioned tables
-LINE 2:  a int PRIMARY KEY
-               ^
 CREATE TABLE pkrel (
 	a int PRIMARY KEY
 );
@@ -292,12 +291,6 @@ ERROR:  foreign key constraints are not supported on partitioned tables
 LINE 2:  a int REFERENCES pkrel(a)
                ^
 DROP TABLE pkrel;
-CREATE TABLE partitioned (
-	a int UNIQUE
-) PARTITION BY RANGE (a);
-ERROR:  unique constraints are not supported on partitioned tables
-LINE 2:  a int UNIQUE
-               ^
 CREATE TABLE partitioned (
 	a int,
 	EXCLUDE USING gist (a WITH &&)
@@ -320,12 +313,12 @@ DROP FUNCTION retset(int);
 CREATE TABLE partitioned (
 	a int
 ) PARTITION BY RANGE ((avg(a)));
-ERROR:  aggregate functions are not allowed in partition key expression
+ERROR:  aggregate functions are not allowed in partition key expressions
 CREATE TABLE partitioned (
 	a int,
 	b int
 ) PARTITION BY RANGE ((avg(a) OVER (PARTITION BY b)));
-ERROR:  window functions are not allowed in partition key expression
+ERROR:  window functions are not allowed in partition key expressions
 CREATE TABLE partitioned (
 	a int
 ) PARTITION BY LIST ((a LIKE (SELECT 1)));
@@ -340,11 +333,11 @@ CREATE TABLE partitioned (
 ) PARTITION BY RANGE (const_func());
 ERROR:  cannot use constant expression as partition key
 DROP FUNCTION const_func();
--- only accept "list" and "range" as partitioning strategy
+-- only accept valid partitioning strategy
 CREATE TABLE partitioned (
-	a int
-) PARTITION BY HASH (a);
-ERROR:  unrecognized partitioning strategy "hash"
+    a int
+) PARTITION BY MAGIC (a);
+ERROR:  unrecognized partitioning strategy "magic"
 -- specified column must be present in the table
 CREATE TABLE partitioned (
 	a int
@@ -414,8 +407,9 @@ DETAIL:  table partitioned depends on function plusone(integer)
 HINT:  Use DROP ... CASCADE to drop the dependent objects too.
 -- partitioned table cannot participate in regular inheritance
 CREATE TABLE partitioned2 (
-	a int
-) PARTITION BY LIST ((a+1));
+	a int,
+	b text
+) PARTITION BY RANGE ((a+1), substr(b, 1, 5));
 CREATE TABLE fail () INHERITS (partitioned2);
 ERROR:  cannot inherit from partitioned table "partitioned2"
 -- Partition key in describe output
@@ -428,13 +422,29 @@ ERROR:  cannot inherit from partitioned table "partitioned2"
  c      | text    |           |          | 
  d      | text    |           |          | 
 Partition key: RANGE (a oid_ops, plusone(b), c, d COLLATE "C")
+Number of partitions: 0
 
-\d partitioned2
-            Table "public.partitioned2"
- Column |  Type   | Collation | Nullable | Default 
---------+---------+-----------+----------+---------
- a      | integer |           |          | 
-Partition key: LIST (((a + 1)))
+\d+ partitioned2
+                                Table "public.partitioned2"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ a      | integer |           |          |         | plain    |              | 
+ b      | text    |           |          |         | extended |              | 
+Partition key: RANGE (((a + 1)), substr(b, 1, 5))
+Number of partitions: 0
+
+INSERT INTO partitioned2 VALUES (1, 'hello');
+ERROR:  no partition of relation "partitioned2" found for row
+DETAIL:  Partition key of the failing row contains ((a + 1), substr(b, 1, 5)) = (2, hello).
+CREATE TABLE part2_1 PARTITION OF partitioned2 FOR VALUES FROM (-1, 'aaaaa') TO (100, 'ccccc');
+\d+ part2_1
+                                  Table "public.part2_1"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ a      | integer |           |          |         | plain    |              | 
+ b      | text    |           |          |         | extended |              | 
+Partition of: partitioned2 FOR VALUES FROM ('-1', 'aaaaa') TO (100, 'ccccc')
+Partition constraint: (((a + 1) IS NOT NULL) AND (substr(b, 1, 5) IS NOT NULL) AND (((a + 1) > '-1'::integer) OR (((a + 1) = '-1'::integer) AND (substr(b, 1, 5) >= 'aaaaa'::text))) AND (((a + 1) < 100) OR (((a + 1) = 100) AND (substr(b, 1, 5) < 'ccccc'::text))))
 
 DROP TABLE partitioned, partitioned2;
 --
@@ -467,6 +477,15 @@ CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES FROM (1) TO (2);
 ERROR:  invalid bound specification for a list partition
 LINE 1: ...BLE fail_part PARTITION OF list_parted FOR VALUES FROM (1) T...
                                                              ^
+-- trying to specify modulus and remainder for list partitioned table
+CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
+ERROR:  invalid bound specification for a list partition
+LINE 1: ...BLE fail_part PARTITION OF list_parted FOR VALUES WITH (MODU...
+                                                             ^
+-- check default partition cannot be created more than once
+CREATE TABLE part_default PARTITION OF list_parted DEFAULT;
+CREATE TABLE fail_default_part PARTITION OF list_parted DEFAULT;
+ERROR:  partition "fail_default_part" conflicts with existing default partition "part_default"
 -- specified literal can't be cast to the partition column data type
 CREATE TABLE bools (
 	a bool
@@ -505,6 +524,11 @@ CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES IN ('a');
 ERROR:  invalid bound specification for a range partition
 LINE 1: ...BLE fail_part PARTITION OF range_parted FOR VALUES IN ('a');
                                                               ^
+-- trying to specify modulus and remainder for range partitioned table
+CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
+ERROR:  invalid bound specification for a range partition
+LINE 1: ...LE fail_part PARTITION OF range_parted FOR VALUES WITH (MODU...
+                                                             ^
 -- each of start and end bounds must have same number of values as the
 -- length of the partition key
 CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES FROM ('a', 1) TO ('z');
@@ -514,6 +538,37 @@ ERROR:  TO must specify exactly one value per partitioning column
 -- cannot specify null values in range bounds
 CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES FROM (null) TO (maxvalue);
 ERROR:  cannot specify NULL in range bound
+-- trying to specify modulus and remainder for range partitioned table
+CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
+ERROR:  invalid bound specification for a range partition
+LINE 1: ...LE fail_part PARTITION OF range_parted FOR VALUES WITH (MODU...
+                                                             ^
+-- check partition bound syntax for the hash partition
+CREATE TABLE hash_parted (
+	a int
+) PARTITION BY HASH (a);
+CREATE TABLE hpart_1 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 10, REMAINDER 0);
+CREATE TABLE hpart_2 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 50, REMAINDER 1);
+CREATE TABLE hpart_3 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 200, REMAINDER 2);
+-- modulus 25 is factor of modulus of 50 but 10 is not factor of 25.
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES WITH (MODULUS 25, REMAINDER 3);
+ERROR:  every hash partition modulus must be a factor of the next larger modulus
+-- previous modulus 50 is factor of 150 but this modulus is not factor of next modulus 200.
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES WITH (MODULUS 150, REMAINDER 3);
+ERROR:  every hash partition modulus must be a factor of the next larger modulus
+-- trying to specify range for the hash partitioned table
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES FROM ('a', 1) TO ('z');
+ERROR:  invalid bound specification for a hash partition
+LINE 1: ...BLE fail_part PARTITION OF hash_parted FOR VALUES FROM ('a',...
+                                                             ^
+-- trying to specify list value for the hash partitioned table
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES IN (1000);
+ERROR:  invalid bound specification for a hash partition
+LINE 1: ...BLE fail_part PARTITION OF hash_parted FOR VALUES IN (1000);
+                                                             ^
+-- trying to create default partition for the hash partitioned table
+CREATE TABLE fail_default_part PARTITION OF hash_parted DEFAULT;
+ERROR:  a hash-partitioned table may not have a default partition
 -- check if compatible with the specified parent
 -- cannot create as partition of a non-partitioned table
 CREATE TABLE unparted (
@@ -521,6 +576,8 @@ CREATE TABLE unparted (
 );
 CREATE TABLE fail_part PARTITION OF unparted FOR VALUES IN ('a');
 ERROR:  "unparted" is not partitioned
+CREATE TABLE fail_part PARTITION OF unparted FOR VALUES WITH (MODULUS 2, REMAINDER 1);
+ERROR:  "unparted" is not partitioned
 DROP TABLE unparted;
 -- cannot create a permanent rel as partition of a temp rel
 CREATE TEMP TABLE temp_parted (
@@ -558,10 +615,15 @@ CREATE TABLE list_parted2 (
 ) PARTITION BY LIST (a);
 CREATE TABLE part_null_z PARTITION OF list_parted2 FOR VALUES IN (null, 'z');
 CREATE TABLE part_ab PARTITION OF list_parted2 FOR VALUES IN ('a', 'b');
+CREATE TABLE list_parted2_def PARTITION OF list_parted2 DEFAULT;
 CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN (null);
 ERROR:  partition "fail_part" would overlap partition "part_null_z"
 CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN ('b', 'c');
 ERROR:  partition "fail_part" would overlap partition "part_ab"
+-- check default partition overlap
+INSERT INTO list_parted2 VALUES('X');
+CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN ('W', 'X', 'Y');
+ERROR:  updated partition constraint for default partition "list_parted2_def" would be violated by some row
 CREATE TABLE range_parted2 (
 	a int
 ) PARTITION BY RANGE (a);
@@ -585,6 +647,16 @@ CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (10) TO (30);
 ERROR:  partition "fail_part" would overlap partition "part2"
 CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (10) TO (50);
 ERROR:  partition "fail_part" would overlap partition "part2"
+-- Create a default partition for range partitioned table
+CREATE TABLE range2_default PARTITION OF range_parted2 DEFAULT;
+-- More than one default partition is not allowed, so this should give error
+CREATE TABLE fail_default_part PARTITION OF range_parted2 DEFAULT;
+ERROR:  partition "fail_default_part" conflicts with existing default partition "range2_default"
+-- Check if the range for default partitions overlap
+INSERT INTO range_parted2 VALUES (85);
+CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (80) TO (90);
+ERROR:  updated partition constraint for default partition "range2_default" would be violated by some row
+CREATE TABLE part4 PARTITION OF range_parted2 FOR VALUES FROM (90) TO (100);
 -- now check for multi-column range partition key
 CREATE TABLE range_parted3 (
 	a int,
@@ -598,11 +670,29 @@ CREATE TABLE part11 PARTITION OF range_parted3 FOR VALUES FROM (1, 1) TO (1, 10)
 CREATE TABLE part12 PARTITION OF range_parted3 FOR VALUES FROM (1, 10) TO (1, maxvalue);
 CREATE TABLE fail_part PARTITION OF range_parted3 FOR VALUES FROM (1, 10) TO (1, 20);
 ERROR:  partition "fail_part" would overlap partition "part12"
+CREATE TABLE range3_default PARTITION OF range_parted3 DEFAULT;
 -- cannot create a partition that says column b is allowed to range
 -- from -infinity to +infinity, while there exist partitions that have
 -- more specific ranges
 CREATE TABLE fail_part PARTITION OF range_parted3 FOR VALUES FROM (1, minvalue) TO (1, maxvalue);
 ERROR:  partition "fail_part" would overlap partition "part10"
+-- check for partition bound overlap and other invalid specifications for the hash partition
+CREATE TABLE hash_parted2 (
+	a varchar
+) PARTITION BY HASH (a);
+CREATE TABLE h2part_1 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+CREATE TABLE h2part_2 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 0);
+CREATE TABLE h2part_3 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 4);
+CREATE TABLE h2part_4 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 5);
+-- overlap with part_4
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 1);
+ERROR:  partition "fail_part" would overlap partition "h2part_4"
+-- modulus must be greater than zero
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 0, REMAINDER 1);
+ERROR:  modulus for hash partition must be a positive integer
+-- remainder must be greater than or equal to zero and less than modulus
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 8);
+ERROR:  remainder for hash partition must be less than modulus
 -- check schema propagation from parent
 CREATE TABLE parted (
 	a text,
@@ -655,7 +745,7 @@ CREATE TABLE part_c_1_10 PARTITION OF part_c FOR VALUES FROM (1) TO (10);
  a      | text    |           |          |         | extended |              | 
  b      | integer |           | not null | 1       | plain    |              | 
 Partition of: parted FOR VALUES IN ('b')
-Partition constraint: ((a IS NOT NULL) AND (a = ANY (ARRAY['b'::text])))
+Partition constraint: ((a IS NOT NULL) AND (a = 'b'::text))
 Check constraints:
     "check_a" CHECK (length(a) > 0)
     "part_b_b_check" CHECK (b >= 0)
@@ -668,7 +758,7 @@ Check constraints:
  a      | text    |           |          |         | extended |              | 
  b      | integer |           | not null | 0       | plain    |              | 
 Partition of: parted FOR VALUES IN ('c')
-Partition constraint: ((a IS NOT NULL) AND (a = ANY (ARRAY['c'::text])))
+Partition constraint: ((a IS NOT NULL) AND (a = 'c'::text))
 Partition key: RANGE (b)
 Check constraints:
     "check_a" CHECK (length(a) > 0)
@@ -682,7 +772,7 @@ Partitions: part_c_1_10 FOR VALUES FROM (1) TO (10)
  a      | text    |           |          |         | extended |              | 
  b      | integer |           | not null | 0       | plain    |              | 
 Partition of: part_c FOR VALUES FROM (1) TO (10)
-Partition constraint: ((a IS NOT NULL) AND (a = ANY (ARRAY['c'::text])) AND (b IS NOT NULL) AND (b >= 1) AND (b < 10))
+Partition constraint: ((a IS NOT NULL) AND (a = 'c'::text) AND (b IS NOT NULL) AND (b >= 1) AND (b < 10))
 Check constraints:
     "check_a" CHECK (length(a) > 0)
 
@@ -701,9 +791,17 @@ Check constraints:
     "check_a" CHECK (length(a) > 0)
 Number of partitions: 3 (Use \d+ to list them.)
 
+\d hash_parted
+            Table "public.hash_parted"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition key: HASH (a)
+Number of partitions: 3 (Use \d+ to list them.)
+
 -- check that we get the expected partition constraints
 CREATE TABLE range_parted4 (a int, b int, c int) PARTITION BY RANGE (abs(a), abs(b), c);
-CREATE TABLE unbounded_range_part PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (MAXVALUE, 0, 0);
+CREATE TABLE unbounded_range_part PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (MAXVALUE, MAXVALUE, MAXVALUE);
 \d+ unbounded_range_part
                            Table "public.unbounded_range_part"
  Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
@@ -711,11 +809,11 @@ CREATE TABLE unbounded_range_part PARTITION OF range_parted4 FOR VALUES FROM (MI
  a      | integer |           |          |         | plain   |              | 
  b      | integer |           |          |         | plain   |              | 
  c      | integer |           |          |         | plain   |              | 
-Partition of: range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (MAXVALUE, 0, 0)
+Partition of: range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (MAXVALUE, MAXVALUE, MAXVALUE)
 Partition constraint: ((abs(a) IS NOT NULL) AND (abs(b) IS NOT NULL) AND (c IS NOT NULL))
 
 DROP TABLE unbounded_range_part;
-CREATE TABLE range_parted4_1 PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (1, MAXVALUE, 0);
+CREATE TABLE range_parted4_1 PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (1, MAXVALUE, MAXVALUE);
 \d+ range_parted4_1
                               Table "public.range_parted4_1"
  Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
@@ -723,7 +821,7 @@ CREATE TABLE range_parted4_1 PARTITION OF range_parted4 FOR VALUES FROM (MINVALU
  a      | integer |           |          |         | plain   |              | 
  b      | integer |           |          |         | plain   |              | 
  c      | integer |           |          |         | plain   |              | 
-Partition of: range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (1, MAXVALUE, 0)
+Partition of: range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (1, MAXVALUE, MAXVALUE)
 Partition constraint: ((abs(a) IS NOT NULL) AND (abs(b) IS NOT NULL) AND (c IS NOT NULL) AND (abs(a) <= 1))
 
 CREATE TABLE range_parted4_2 PARTITION OF range_parted4 FOR VALUES FROM (3, 4, 5) TO (6, 7, MAXVALUE);
@@ -737,7 +835,7 @@ CREATE TABLE range_parted4_2 PARTITION OF range_parted4 FOR VALUES FROM (3, 4, 5
 Partition of: range_parted4 FOR VALUES FROM (3, 4, 5) TO (6, 7, MAXVALUE)
 Partition constraint: ((abs(a) IS NOT NULL) AND (abs(b) IS NOT NULL) AND (c IS NOT NULL) AND ((abs(a) > 3) OR ((abs(a) = 3) AND (abs(b) > 4)) OR ((abs(a) = 3) AND (abs(b) = 4) AND (c >= 5))) AND ((abs(a) < 6) OR ((abs(a) = 6) AND (abs(b) <= 7))))
 
-CREATE TABLE range_parted4_3 PARTITION OF range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, 0);
+CREATE TABLE range_parted4_3 PARTITION OF range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, MAXVALUE);
 \d+ range_parted4_3
                               Table "public.range_parted4_3"
  Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
@@ -745,12 +843,14 @@ CREATE TABLE range_parted4_3 PARTITION OF range_parted4 FOR VALUES FROM (6, 8, M
  a      | integer |           |          |         | plain   |              | 
  b      | integer |           |          |         | plain   |              | 
  c      | integer |           |          |         | plain   |              | 
-Partition of: range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, 0)
+Partition of: range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, MAXVALUE)
 Partition constraint: ((abs(a) IS NOT NULL) AND (abs(b) IS NOT NULL) AND (c IS NOT NULL) AND ((abs(a) > 6) OR ((abs(a) = 6) AND (abs(b) >= 8))) AND (abs(a) <= 9))
 
 DROP TABLE range_parted4;
 -- cleanup
 DROP TABLE parted, list_parted, range_parted, list_parted2, range_parted2, range_parted3;
+DROP TABLE hash_parted;
+DROP TABLE hash_parted2;
 -- comments on partitioned tables columns
 CREATE TABLE parted_col_comment (a int, b text) PARTITION BY LIST (a);
 COMMENT ON TABLE parted_col_comment IS 'Am partitioned table';
@@ -768,5 +868,18 @@ SELECT obj_description('parted_col_comment'::regclass);
  a      | integer |           |          |         | plain    |              | Partition key
  b      | text    |           |          |         | extended |              | 
 Partition key: LIST (a)
+Number of partitions: 0
 
 DROP TABLE parted_col_comment;
+-- list partitioning on array type column
+CREATE TABLE arrlp (a int[]) PARTITION BY LIST (a);
+CREATE TABLE arrlp12 PARTITION OF arrlp FOR VALUES IN ('{1}', '{2}');
+\d+ arrlp12
+                                   Table "public.arrlp12"
+ Column |   Type    | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+-----------+-----------+----------+---------+----------+--------------+-------------
+ a      | integer[] |           |          |         | extended |              | 
+Partition of: arrlp FOR VALUES IN ('{1}', '{2}')
+Partition constraint: ((a IS NOT NULL) AND (((a)::anyarray OPERATOR(pg_catalog.=) '{1}'::integer[]) OR ((a)::anyarray OPERATOR(pg_catalog.=) '{2}'::integer[])))
+
+DROP TABLE arrlp;
diff --git a/src/test/regress/expected/create_type.out b/src/test/regress/expected/create_type.out
index 5886a1f37f..0ab85a883c 100644
--- a/src/test/regress/expected/create_type.out
+++ b/src/test/regress/expected/create_type.out
@@ -83,6 +83,34 @@ SELECT * FROM default_test;
  zippo | 42
 (1 row)
 
+-- invalid: non-lowercase quoted identifiers
+CREATE TYPE case_int42 (
+	"Internallength" = 4,
+	"Input" = int42_in,
+	"Output" = int42_out,
+	"Alignment" = int4,
+	"Default" = 42,
+	"Passedbyvalue"
+);
+WARNING:  type attribute "Internallength" not recognized
+LINE 2:  "Internallength" = 4,
+         ^
+WARNING:  type attribute "Input" not recognized
+LINE 3:  "Input" = int42_in,
+         ^
+WARNING:  type attribute "Output" not recognized
+LINE 4:  "Output" = int42_out,
+         ^
+WARNING:  type attribute "Alignment" not recognized
+LINE 5:  "Alignment" = int4,
+         ^
+WARNING:  type attribute "Default" not recognized
+LINE 6:  "Default" = 42,
+         ^
+WARNING:  type attribute "Passedbyvalue" not recognized
+LINE 7:  "Passedbyvalue"
+         ^
+ERROR:  type input function must be specified
 -- Test stand-alone composite type
 CREATE TYPE default_test_row AS (f1 text_w_default, f2 int42);
 CREATE FUNCTION get_default_test() RETURNS SETOF default_test_row AS '
@@ -154,3 +182,12 @@ WHERE attrelid = 'mytab'::regclass AND attnum > 0;
  widget(42,13)
 (1 row)
 
+-- might as well exercise the widget type while we're here
+INSERT INTO mytab VALUES ('(1,2,3)'), ('(-44,5.5,12)');
+TABLE mytab;
+     foo      
+--------------
+ (1,2,3)
+ (-44,5.5,12)
+(2 rows)
+
diff --git a/src/test/regress/expected/create_view.out b/src/test/regress/expected/create_view.out
index f909a3cefe..4468c85d77 100644
--- a/src/test/regress/expected/create_view.out
+++ b/src/test/regress/expected/create_view.out
@@ -1605,7 +1605,7 @@ select 'foo'::text = any((select array['abc','def','foo']::text[]));  -- fail
 ERROR:  operator does not exist: text = text[]
 LINE 1: select 'foo'::text = any((select array['abc','def','foo']::t...
                            ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 select 'foo'::text = any((select array['abc','def','foo']::text[])::text[]);
  ?column? 
 ----------
diff --git a/src/test/regress/expected/domain.out b/src/test/regress/expected/domain.out
index 3acc696863..f4eebb75cf 100644
--- a/src/test/regress/expected/domain.out
+++ b/src/test/regress/expected/domain.out
@@ -198,6 +198,119 @@ select pg_typeof('{1,2,3}'::dia || 42); -- should be int[] not dia
 (1 row)
 
 drop domain dia;
+-- Test domains over composites
+create type comptype as (r float8, i float8);
+create domain dcomptype as comptype;
+create table dcomptable (d1 dcomptype unique);
+insert into dcomptable values (row(1,2)::dcomptype);
+insert into dcomptable values (row(3,4)::comptype);
+insert into dcomptable values (row(1,2)::dcomptype);  -- fail on uniqueness
+ERROR:  duplicate key value violates unique constraint "dcomptable_d1_key"
+DETAIL:  Key (d1)=((1,2)) already exists.
+insert into dcomptable (d1.r) values(11);
+select * from dcomptable;
+  d1   
+-------
+ (1,2)
+ (3,4)
+ (11,)
+(3 rows)
+
+select (d1).r, (d1).i, (d1).* from dcomptable;
+ r  | i | r  | i 
+----+---+----+---
+  1 | 2 |  1 | 2
+  3 | 4 |  3 | 4
+ 11 |   | 11 |  
+(3 rows)
+
+update dcomptable set d1.r = (d1).r + 1 where (d1).i > 0;
+select * from dcomptable;
+  d1   
+-------
+ (11,)
+ (2,2)
+ (4,4)
+(3 rows)
+
+alter domain dcomptype add constraint c1 check ((value).r <= (value).i);
+alter domain dcomptype add constraint c2 check ((value).r > (value).i);  -- fail
+ERROR:  column "d1" of table "dcomptable" contains values that violate the new constraint
+select row(2,1)::dcomptype;  -- fail
+ERROR:  value for domain dcomptype violates check constraint "c1"
+insert into dcomptable values (row(1,2)::comptype);
+insert into dcomptable values (row(2,1)::comptype);  -- fail
+ERROR:  value for domain dcomptype violates check constraint "c1"
+insert into dcomptable (d1.r) values(99);
+insert into dcomptable (d1.r, d1.i) values(99, 100);
+insert into dcomptable (d1.r, d1.i) values(100, 99);  -- fail
+ERROR:  value for domain dcomptype violates check constraint "c1"
+update dcomptable set d1.r = (d1).r + 1 where (d1).i > 0;  -- fail
+ERROR:  value for domain dcomptype violates check constraint "c1"
+update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+select * from dcomptable;
+    d1    
+----------
+ (11,)
+ (99,)
+ (1,3)
+ (3,5)
+ (0,3)
+ (98,101)
+(6 rows)
+
+explain (verbose, costs off)
+  update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+                                          QUERY PLAN                                           
+-----------------------------------------------------------------------------------------------
+ Update on public.dcomptable
+   ->  Seq Scan on public.dcomptable
+         Output: ROW(((d1).r - '1'::double precision), ((d1).i + '1'::double precision)), ctid
+         Filter: ((dcomptable.d1).i > '0'::double precision)
+(4 rows)
+
+create rule silly as on delete to dcomptable do instead
+  update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+\d+ dcomptable
+                                  Table "public.dcomptable"
+ Column |   Type    | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+-----------+-----------+----------+---------+----------+--------------+-------------
+ d1     | dcomptype |           |          |         | extended |              | 
+Indexes:
+    "dcomptable_d1_key" UNIQUE CONSTRAINT, btree (d1)
+Rules:
+    silly AS
+    ON DELETE TO dcomptable DO INSTEAD  UPDATE dcomptable SET d1.r = (dcomptable.d1).r - 1::double precision, d1.i = (dcomptable.d1).i + 1::double precision
+  WHERE (dcomptable.d1).i > 0::double precision
+
+drop table dcomptable;
+drop type comptype cascade;
+NOTICE:  drop cascades to type dcomptype
+-- check altering and dropping columns used by domain constraints
+create type comptype as (r float8, i float8);
+create domain dcomptype as comptype;
+alter domain dcomptype add constraint c1 check ((value).r > 0);
+comment on constraint c1 on domain dcomptype is 'random commentary';
+select row(0,1)::dcomptype;  -- fail
+ERROR:  value for domain dcomptype violates check constraint "c1"
+alter type comptype alter attribute r type varchar;  -- fail
+ERROR:  operator does not exist: character varying > double precision
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
+alter type comptype alter attribute r type bigint;
+alter type comptype drop attribute r;  -- fail
+ERROR:  cannot drop composite type comptype column r because other objects depend on it
+DETAIL:  constraint c1 depends on composite type comptype column r
+HINT:  Use DROP ... CASCADE to drop the dependent objects too.
+alter type comptype drop attribute i;
+select conname, obj_description(oid, 'pg_constraint') from pg_constraint
+  where contypid = 'dcomptype'::regtype;  -- check comment is still there
+ conname |  obj_description  
+---------+-------------------
+ c1      | random commentary
+(1 row)
+
+drop type comptype cascade;
+NOTICE:  drop cascades to type dcomptype
 -- Test domains over arrays of composite
 create type comptype as (r float8, i float8);
 create domain dcomptypea as comptype[];
@@ -310,6 +423,101 @@ Rules:
 drop table dcomptable;
 drop type comptype cascade;
 NOTICE:  drop cascades to type dcomptypea
+-- Test arrays over domains
+create domain posint as int check (value > 0);
+create table pitable (f1 posint[]);
+insert into pitable values(array[42]);
+insert into pitable values(array[-1]);  -- fail
+ERROR:  value for domain posint violates check constraint "posint_check"
+insert into pitable values('{0}');  -- fail
+ERROR:  value for domain posint violates check constraint "posint_check"
+LINE 1: insert into pitable values('{0}');
+                                   ^
+update pitable set f1[1] = f1[1] + 1;
+update pitable set f1[1] = 0;  -- fail
+ERROR:  value for domain posint violates check constraint "posint_check"
+select * from pitable;
+  f1  
+------
+ {43}
+(1 row)
+
+drop table pitable;
+create domain vc4 as varchar(4);
+create table vc4table (f1 vc4[]);
+insert into vc4table values(array['too long']);  -- fail
+ERROR:  value too long for type character varying(4)
+insert into vc4table values(array['too long']::vc4[]);  -- cast truncates
+select * from vc4table;
+    f1    
+----------
+ {"too "}
+(1 row)
+
+drop table vc4table;
+drop type vc4;
+-- You can sort of fake arrays-of-arrays by putting a domain in between
+create domain dposinta as posint[];
+create table dposintatable (f1 dposinta[]);
+insert into dposintatable values(array[array[42]]);  -- fail
+ERROR:  column "f1" is of type dposinta[] but expression is of type integer[]
+LINE 1: insert into dposintatable values(array[array[42]]);
+                                         ^
+HINT:  You will need to rewrite or cast the expression.
+insert into dposintatable values(array[array[42]::posint[]]); -- still fail
+ERROR:  column "f1" is of type dposinta[] but expression is of type posint[]
+LINE 1: insert into dposintatable values(array[array[42]::posint[]])...
+                                         ^
+HINT:  You will need to rewrite or cast the expression.
+insert into dposintatable values(array[array[42]::dposinta]); -- but this works
+select f1, f1[1], (f1[1])[1] from dposintatable;
+    f1    |  f1  | f1 
+----------+------+----
+ {"{42}"} | {42} | 42
+(1 row)
+
+select pg_typeof(f1) from dposintatable;
+ pg_typeof  
+------------
+ dposinta[]
+(1 row)
+
+select pg_typeof(f1[1]) from dposintatable;
+ pg_typeof 
+-----------
+ dposinta
+(1 row)
+
+select pg_typeof(f1[1][1]) from dposintatable;
+ pg_typeof 
+-----------
+ dposinta
+(1 row)
+
+select pg_typeof((f1[1])[1]) from dposintatable;
+ pg_typeof 
+-----------
+ posint
+(1 row)
+
+update dposintatable set f1[2] = array[99];
+select f1, f1[1], (f1[2])[1] from dposintatable;
+       f1        |  f1  | f1 
+-----------------+------+----
+ {"{42}","{99}"} | {42} | 99
+(1 row)
+
+-- it'd be nice if you could do something like this, but for now you can't:
+update dposintatable set f1[2][1] = array[97];
+ERROR:  wrong number of array subscripts
+-- maybe someday we can make this syntax work:
+update dposintatable set (f1[2])[1] = array[98];
+ERROR:  syntax error at or near "["
+LINE 1: update dposintatable set (f1[2])[1] = array[98];
+                                        ^
+drop table dposintatable;
+drop domain posint cascade;
+NOTICE:  drop cascades to type dposinta
 -- Test not-null restrictions
 create domain dnotnull varchar(15) NOT NULL;
 create domain dnull    varchar(15);
@@ -667,6 +875,14 @@ insert into ddtest2 values('{(-1)}');
 alter domain posint add constraint c1 check(value >= 0);
 ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
 drop table ddtest2;
+-- Likewise for domains within domains over composite
+create domain ddtest1d as ddtest1;
+create table ddtest2(f1 ddtest1d);
+insert into ddtest2 values('(-1)');
+alter domain posint add constraint c1 check(value >= 0);
+ERROR:  cannot alter type "posint" because column "ddtest2.f1" uses it
+drop table ddtest2;
+drop domain ddtest1d;
 -- Likewise for domains within domains over array of composite
 create domain ddtest1d as ddtest1[];
 create table ddtest2(f1 ddtest1d);
diff --git a/src/test/regress/expected/enum.out b/src/test/regress/expected/enum.out
index 0e6030443f..a0b81608a1 100644
--- a/src/test/regress/expected/enum.out
+++ b/src/test/regress/expected/enum.out
@@ -581,72 +581,35 @@ ERROR:  enum label "green" already exists
 -- check transactional behaviour of ALTER TYPE ... ADD VALUE
 --
 CREATE TYPE bogus AS ENUM('good');
--- check that we can add new values to existing enums in a transaction
--- but we can't use them
+-- check that we can't add new values to existing enums in a transaction
 BEGIN;
-ALTER TYPE bogus ADD VALUE 'new';
-SAVEPOINT x;
-SELECT 'new'::bogus;  -- unsafe
-ERROR:  unsafe use of new value "new" of enum type bogus
-LINE 1: SELECT 'new'::bogus;
-               ^
-HINT:  New enum values must be committed before they can be used.
-ROLLBACK TO x;
-SELECT enum_first(null::bogus);  -- safe
- enum_first 
-------------
- good
-(1 row)
-
-SELECT enum_last(null::bogus);  -- unsafe
-ERROR:  unsafe use of new value "new" of enum type bogus
-HINT:  New enum values must be committed before they can be used.
-ROLLBACK TO x;
-SELECT enum_range(null::bogus);  -- unsafe
-ERROR:  unsafe use of new value "new" of enum type bogus
-HINT:  New enum values must be committed before they can be used.
-ROLLBACK TO x;
+ALTER TYPE bogus ADD VALUE 'bad';
+ERROR:  ALTER TYPE ... ADD cannot run inside a transaction block
 COMMIT;
-SELECT 'new'::bogus;  -- now safe
- bogus 
--------
- new
-(1 row)
-
-SELECT enumlabel, enumsortorder
-FROM pg_enum
-WHERE enumtypid = 'bogus'::regtype
-ORDER BY 2;
- enumlabel | enumsortorder 
------------+---------------
- good      |             1
- new       |             2
-(2 rows)
-
 -- check that we recognize the case where the enum already existed but was
--- modified in the current txn; this should not be considered safe
+-- modified in the current txn
 BEGIN;
 ALTER TYPE bogus RENAME TO bogon;
 ALTER TYPE bogon ADD VALUE 'bad';
-SELECT 'bad'::bogon;
-ERROR:  unsafe use of new value "bad" of enum type bogon
-LINE 1: SELECT 'bad'::bogon;
-               ^
-HINT:  New enum values must be committed before they can be used.
+ERROR:  ALTER TYPE ... ADD cannot run inside a transaction block
 ROLLBACK;
-DROP TYPE bogus;
--- check that we can add new values to existing enums in a transaction
--- and use them, if the type is new as well
+-- but ALTER TYPE RENAME VALUE is safe in a transaction
 BEGIN;
-CREATE TYPE bogus AS ENUM('good');
-ALTER TYPE bogus ADD VALUE 'bad';
-ALTER TYPE bogus ADD VALUE 'ugly';
-SELECT enum_range(null::bogus);
-   enum_range    
------------------
- {good,bad,ugly}
+ALTER TYPE bogus RENAME VALUE 'good' to 'bad';
+SELECT 'bad'::bogus;
+ bogus 
+-------
+ bad
 (1 row)
 
+ROLLBACK;
+DROP TYPE bogus;
+-- check that we *can* add new values to existing enums in a transaction,
+-- if the type is new as well
+BEGIN;
+CREATE TYPE bogus AS ENUM();
+ALTER TYPE bogus ADD VALUE 'good';
+ALTER TYPE bogus ADD VALUE 'ugly';
 ROLLBACK;
 --
 -- Cleanup
diff --git a/src/test/regress/expected/equivclass.out b/src/test/regress/expected/equivclass.out
index a96b2a1b07..c448d85dec 100644
--- a/src/test/regress/expected/equivclass.out
+++ b/src/test/regress/expected/equivclass.out
@@ -421,3 +421,21 @@ reset session authorization;
 revoke select on ec0 from regress_user_ectest;
 revoke select on ec1 from regress_user_ectest;
 drop user regress_user_ectest;
+-- check that X=X is converted to X IS NOT NULL when appropriate
+explain (costs off)
+  select * from tenk1 where unique1 = unique1 and unique2 = unique2;
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Seq Scan on tenk1
+   Filter: ((unique1 IS NOT NULL) AND (unique2 IS NOT NULL))
+(2 rows)
+
+-- this could be converted, but isn't at present
+explain (costs off)
+  select * from tenk1 where unique1 = unique1 or unique2 = unique2;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Seq Scan on tenk1
+   Filter: ((unique1 = unique1) OR (unique2 = unique2))
+(2 rows)
+
diff --git a/src/test/regress/expected/event_trigger.out b/src/test/regress/expected/event_trigger.out
index 906dcb8b31..88c6803081 100644
--- a/src/test/regress/expected/event_trigger.out
+++ b/src/test/regress/expected/event_trigger.out
@@ -88,16 +88,34 @@ create event trigger regress_event_trigger_noperms on ddl_command_start
 ERROR:  permission denied to create event trigger "regress_event_trigger_noperms"
 HINT:  Must be superuser to create an event trigger.
 reset role;
--- all OK
-alter event trigger regress_event_trigger enable replica;
-alter event trigger regress_event_trigger enable always;
-alter event trigger regress_event_trigger enable;
+-- test enabling and disabling
 alter event trigger regress_event_trigger disable;
--- regress_event_trigger2 and regress_event_trigger_end should fire, but not
--- regress_event_trigger
+-- fires _trigger2 and _trigger_end should fire, but not _trigger
 create table event_trigger_fire1 (a int);
 NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
 NOTICE:  test_event_trigger: ddl_command_end CREATE TABLE
+alter event trigger regress_event_trigger enable;
+set session_replication_role = replica;
+-- fires nothing
+create table event_trigger_fire2 (a int);
+alter event trigger regress_event_trigger enable replica;
+-- fires only _trigger
+create table event_trigger_fire3 (a int);
+NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+alter event trigger regress_event_trigger enable always;
+-- fires only _trigger
+create table event_trigger_fire4 (a int);
+NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+reset session_replication_role;
+-- fires all three
+create table event_trigger_fire5 (a int);
+NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+NOTICE:  test_event_trigger: ddl_command_start CREATE TABLE
+NOTICE:  test_event_trigger: ddl_command_end CREATE TABLE
+-- clean up
+alter event trigger regress_event_trigger disable;
+drop table event_trigger_fire2, event_trigger_fire3, event_trigger_fire4, event_trigger_fire5;
+NOTICE:  test_event_trigger: ddl_command_end DROP TABLE
 -- regress_event_trigger_end should fire on these commands
 grant all on table event_trigger_fire1 to public;
 NOTICE:  test_event_trigger: ddl_command_end GRANT
diff --git a/src/test/regress/expected/foreign_data.out b/src/test/regress/expected/foreign_data.out
index 927d0189a0..6a1b278e5a 100644
--- a/src/test/regress/expected/foreign_data.out
+++ b/src/test/regress/expected/foreign_data.out
@@ -89,6 +89,14 @@ CREATE FOREIGN DATA WRAPPER foo VALIDATOR postgresql_fdw_validator;
  postgresql | regress_foreign_data_user | -       | postgresql_fdw_validator |                   |             | 
 (3 rows)
 
+-- HANDLER related checks
+CREATE FUNCTION invalid_fdw_handler() RETURNS int LANGUAGE SQL AS 'SELECT 1;';
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER invalid_fdw_handler;  -- ERROR
+ERROR:  function invalid_fdw_handler must return type fdw_handler
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER invalid_fdw_handler;  -- ERROR
+ERROR:  conflicting or redundant options
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+DROP FOREIGN DATA WRAPPER test_fdw;
 -- ALTER FOREIGN DATA WRAPPER
 ALTER FOREIGN DATA WRAPPER foo;                             -- ERROR
 ERROR:  syntax error at or near ";"
@@ -188,18 +196,26 @@ ALTER FOREIGN DATA WRAPPER foo RENAME TO foo1;
 (3 rows)
 
 ALTER FOREIGN DATA WRAPPER foo1 RENAME TO foo;
+-- HANDLER related checks
+ALTER FOREIGN DATA WRAPPER foo HANDLER invalid_fdw_handler;  -- ERROR
+ERROR:  function invalid_fdw_handler must return type fdw_handler
+ALTER FOREIGN DATA WRAPPER foo HANDLER test_fdw_handler HANDLER anything;  -- ERROR
+ERROR:  conflicting or redundant options
+ALTER FOREIGN DATA WRAPPER foo HANDLER test_fdw_handler;
+WARNING:  changing the foreign-data wrapper handler can change behavior of existing foreign tables
+DROP FUNCTION invalid_fdw_handler();
 -- DROP FOREIGN DATA WRAPPER
 DROP FOREIGN DATA WRAPPER nonexistent;                      -- ERROR
 ERROR:  foreign-data wrapper "nonexistent" does not exist
 DROP FOREIGN DATA WRAPPER IF EXISTS nonexistent;
 NOTICE:  foreign-data wrapper "nonexistent" does not exist, skipping
 \dew+
-                                                        List of foreign-data wrappers
-    Name    |           Owner           | Handler |        Validator         | Access privileges |         FDW options          | Description 
-------------+---------------------------+---------+--------------------------+-------------------+------------------------------+-------------
- dummy      | regress_foreign_data_user | -       | -                        |                   |                              | useless
- foo        | regress_test_role_super   | -       | -                        |                   | (b '3', c '4', a '2', d '5') | 
- postgresql | regress_foreign_data_user | -       | postgresql_fdw_validator |                   |                              | 
+                                                             List of foreign-data wrappers
+    Name    |           Owner           |     Handler      |        Validator         | Access privileges |         FDW options          | Description 
+------------+---------------------------+------------------+--------------------------+-------------------+------------------------------+-------------
+ dummy      | regress_foreign_data_user | -                | -                        |                   |                              | useless
+ foo        | regress_test_role_super   | test_fdw_handler | -                        |                   | (b '3', c '4', a '2', d '5') | 
+ postgresql | regress_foreign_data_user | -                | postgresql_fdw_validator |                   |                              | 
 (3 rows)
 
 DROP ROLE regress_test_role_super;                          -- ERROR
@@ -1847,7 +1863,7 @@ Partitions: pt2_1 FOR VALUES IN (1)
  c2     | text    |           |          |         |             | extended |              | 
  c3     | date    |           |          |         |             | plain    |              | 
 Partition of: pt2 FOR VALUES IN (1)
-Partition constraint: ((c1 IS NOT NULL) AND (c1 = ANY (ARRAY[1])))
+Partition constraint: ((c1 IS NOT NULL) AND (c1 = 1))
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 
@@ -1872,7 +1888,7 @@ FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 
 ALTER TABLE pt2 ATTACH PARTITION pt2_1 FOR VALUES IN (1);       -- ERROR
 ERROR:  table "pt2_1" contains column "c4" not found in parent "pt2"
-DETAIL:  New partition should contain only the columns present in parent.
+DETAIL:  The new partition may contain only the columns present in parent.
 DROP FOREIGN TABLE pt2_1;
 \d+ pt2
                                     Table "public.pt2"
@@ -1882,6 +1898,7 @@ DROP FOREIGN TABLE pt2_1;
  c2     | text    |           |          |         | extended |              | 
  c3     | date    |           |          |         | plain    |              | 
 Partition key: LIST (c1)
+Number of partitions: 0
 
 CREATE FOREIGN TABLE pt2_1 (
 	c1 integer NOT NULL,
@@ -1918,7 +1935,7 @@ Partitions: pt2_1 FOR VALUES IN (1)
  c2     | text    |           |          |         |             | extended |              | 
  c3     | date    |           |          |         |             | plain    |              | 
 Partition of: pt2 FOR VALUES IN (1)
-Partition constraint: ((c1 IS NOT NULL) AND (c1 = ANY (ARRAY[1])))
+Partition constraint: ((c1 IS NOT NULL) AND (c1 = 1))
 Server: s0
 FDW options: (delimiter ',', quote '"', "be quoted" 'value')
 
@@ -1946,7 +1963,7 @@ Partitions: pt2_1 FOR VALUES IN (1)
  c2     | text    |           |          |         |             | extended |              | 
  c3     | date    |           | not null |         |             | plain    |              | 
 Partition of: pt2 FOR VALUES IN (1)
-Partition constraint: ((c1 IS NOT NULL) AND (c1 = ANY (ARRAY[1])))
+Partition constraint: ((c1 IS NOT NULL) AND (c1 = 1))
 Check constraints:
     "p21chk" CHECK (c2 <> ''::text)
 Server: s0
@@ -1966,6 +1983,7 @@ ALTER TABLE pt2 ALTER c2 SET NOT NULL;
  c2     | text    |           | not null |         | extended |              | 
  c3     | date    |           |          |         | plain    |              | 
 Partition key: LIST (c1)
+Number of partitions: 0
 
 \d+ pt2_1
                                       Foreign table "public.pt2_1"
@@ -1995,6 +2013,7 @@ ALTER TABLE pt2 ADD CONSTRAINT pt2chk1 CHECK (c1 > 0);
 Partition key: LIST (c1)
 Check constraints:
     "pt2chk1" CHECK (c1 > 0)
+Number of partitions: 0
 
 \d+ pt2_1
                                       Foreign table "public.pt2_1"
diff --git a/src/test/regress/expected/geometry.out b/src/test/regress/expected/geometry.out
index 1271395d4e..e4c0039040 100644
--- a/src/test/regress/expected/geometry.out
+++ b/src/test/regress/expected/geometry.out
@@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
 ERROR:  operator does not exist: lseg # point
 LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
                                            ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/geometry_1.out b/src/test/regress/expected/geometry_1.out
index fad246c2b9..3b92e23059 100644
--- a/src/test/regress/expected/geometry_1.out
+++ b/src/test/regress/expected/geometry_1.out
@@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
 ERROR:  operator does not exist: lseg # point
 LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
                                            ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/geometry_2.out b/src/test/regress/expected/geometry_2.out
index c938e66418..5a922bcd3f 100644
--- a/src/test/regress/expected/geometry_2.out
+++ b/src/test/regress/expected/geometry_2.out
@@ -107,7 +107,7 @@ SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
 ERROR:  operator does not exist: lseg # point
 LINE 1: SELECT '' AS count, p.f1, l.s, l.s # p.f1 AS intersection
                                            ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 -- closest point
 SELECT '' AS thirty, p.f1, l.s, p.f1 ## l.s AS closest
    FROM LSEG_TBL l, POINT_TBL p;
diff --git a/src/test/regress/expected/gist.out b/src/test/regress/expected/gist.out
index 91f9998140..f5a2993aaf 100644
--- a/src/test/regress/expected/gist.out
+++ b/src/test/regress/expected/gist.out
@@ -5,6 +5,21 @@
 -- testing GiST code itself. Vacuuming in particular.
 create table gist_point_tbl(id int4, p point);
 create index gist_pointidx on gist_point_tbl using gist(p);
+-- Verify the fillfactor and buffering options
+create index gist_pointidx2 on gist_point_tbl using gist(p) with (buffering = on, fillfactor=50);
+create index gist_pointidx3 on gist_point_tbl using gist(p) with (buffering = off);
+create index gist_pointidx4 on gist_point_tbl using gist(p) with (buffering = auto);
+drop index gist_pointidx2, gist_pointidx3, gist_pointidx4;
+-- Make sure bad values are refused
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (buffering = invalid_value);
+ERROR:  invalid value for "buffering" option
+DETAIL:  Valid values are "on", "off", and "auto".
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (fillfactor=9);
+ERROR:  value 9 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (fillfactor=101);
+ERROR:  value 101 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
 -- Insert enough data to create a tree that's a couple of levels deep.
 insert into gist_point_tbl (id, p)
 select g,        point(g*10, g*10) from generate_series(1, 10000) g;
@@ -17,6 +32,9 @@ delete from gist_point_tbl where id % 2 = 1;
 -- would exercise it)
 delete from gist_point_tbl where id < 10000;
 vacuum analyze gist_point_tbl;
+-- rebuild the index with a different fillfactor
+alter index gist_pointidx SET (fillfactor = 40);
+reindex index gist_pointidx;
 --
 -- Test Index-only plans on GiST indexes
 --
diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out
index fd618afe60..d21a494a9d 100644
--- a/src/test/regress/expected/groupingsets.out
+++ b/src/test/regress/expected/groupingsets.out
@@ -360,6 +360,80 @@ select a, d, grouping(a,b,c)
  2 | 2 |        2
 (4 rows)
 
+-- check that distinct grouping columns are kept separate
+-- even if they are equal()
+explain (costs off)
+select g as alias1, g as alias2
+  from generate_series(1,3) g
+ group by alias1, rollup(alias2);
+                   QUERY PLAN                   
+------------------------------------------------
+ GroupAggregate
+   Group Key: g, g
+   Group Key: g
+   ->  Sort
+         Sort Key: g
+         ->  Function Scan on generate_series g
+(6 rows)
+
+select g as alias1, g as alias2
+  from generate_series(1,3) g
+ group by alias1, rollup(alias2);
+ alias1 | alias2 
+--------+--------
+      1 |      1
+      1 |       
+      2 |      2
+      2 |       
+      3 |      3
+      3 |       
+(6 rows)
+
+-- check that pulled-up subquery outputs still go to null when appropriate
+select four, x
+  from (select four, ten, 'foo'::text as x from tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+ four |  x  
+------+-----
+      | foo
+(1 row)
+
+select four, x || 'x'
+  from (select four, ten, 'foo'::text as x from tenk1) as t
+  group by grouping sets (four, x)
+  order by four;
+ four | ?column? 
+------+----------
+    0 | 
+    1 | 
+    2 | 
+    3 | 
+      | foox
+(5 rows)
+
+select (x+y)*1, sum(z)
+ from (select 1 as x, 2 as y, 3 as z) s
+ group by grouping sets (x+y, x);
+ ?column? | sum 
+----------+-----
+        3 |   3
+          |   3
+(2 rows)
+
+select x, not x as not_x, q2 from
+  (select *, q1 = 1 as x from int8_tbl i1) as t
+  group by grouping sets(x, q2)
+  order by x, q2;
+ x | not_x |        q2         
+---+-------+-------------------
+ f | t     |                  
+   |       | -4567890123456789
+   |       |               123
+   |       |               456
+   |       |  4567890123456789
+(5 rows)
+
 -- simple rescan tests
 select a, b, sum(v.x)
   from (values (1),(2)) v(x), gstest_data(v.x)
@@ -1109,29 +1183,33 @@ explain (costs off)
 -- simple rescan tests
 select a, b, sum(v.x)
   from (values (1),(2)) v(x), gstest_data(v.x)
- group by grouping sets (a,b);
+ group by grouping sets (a,b)
+ order by 1, 2, 3;
  a | b | sum 
 ---+---+-----
- 2 |   |   6
  1 |   |   3
+ 2 |   |   6
+   | 1 |   3
    | 2 |   3
    | 3 |   3
-   | 1 |   3
 (5 rows)
 
 explain (costs off)
   select a, b, sum(v.x)
     from (values (1),(2)) v(x), gstest_data(v.x)
-   group by grouping sets (a,b);
-                QUERY PLAN                
-------------------------------------------
- HashAggregate
-   Hash Key: gstest_data.a
-   Hash Key: gstest_data.b
-   ->  Nested Loop
-         ->  Values Scan on "*VALUES*"
-         ->  Function Scan on gstest_data
-(6 rows)
+   group by grouping sets (a,b)
+   order by 3, 1, 2;
+                             QUERY PLAN                              
+---------------------------------------------------------------------
+ Sort
+   Sort Key: (sum("*VALUES*".column1)), gstest_data.a, gstest_data.b
+   ->  HashAggregate
+         Hash Key: gstest_data.a
+         Hash Key: gstest_data.b
+         ->  Nested Loop
+               ->  Values Scan on "*VALUES*"
+               ->  Function Scan on gstest_data
+(8 rows)
 
 select *
   from (values (1),(2)) v(x),
diff --git a/src/test/regress/expected/hash_func.out b/src/test/regress/expected/hash_func.out
new file mode 100644
index 0000000000..da0948e95a
--- /dev/null
+++ b/src/test/regress/expected/hash_func.out
@@ -0,0 +1,300 @@
+--
+-- Test hash functions
+--
+-- When the salt is 0, the extended hash function should produce a result
+-- whose low 32 bits match the standard hash function.  When the salt is
+-- not 0, we should get a different result.
+--
+SELECT v as value, hashint2(v)::bit(32) as standard,
+       hashint2extended(v, 0)::bit(32) as extended0,
+       hashint2extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0::int2), (1::int2), (17::int2), (42::int2)) x(v)
+WHERE  hashint2(v)::bit(32) != hashint2extended(v, 0)::bit(32)
+       OR hashint2(v)::bit(32) = hashint2extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashint4(v)::bit(32) as standard,
+	   hashint4extended(v, 0)::bit(32) as extended0,
+	   hashint4extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashint4(v)::bit(32) != hashint4extended(v, 0)::bit(32)
+       OR hashint4(v)::bit(32) = hashint4extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashint8(v)::bit(32) as standard,
+	   hashint8extended(v, 0)::bit(32) as extended0,
+	   hashint8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashint8(v)::bit(32) != hashint8extended(v, 0)::bit(32)
+       OR hashint8(v)::bit(32) = hashint8extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashfloat4(v)::bit(32) as standard,
+	   hashfloat4extended(v, 0)::bit(32) as extended0,
+	   hashfloat4extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashfloat4(v)::bit(32) != hashfloat4extended(v, 0)::bit(32)
+       OR hashfloat4(v)::bit(32) = hashfloat4extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashfloat8(v)::bit(32) as standard,
+	   hashfloat8extended(v, 0)::bit(32) as extended0,
+	   hashfloat8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashfloat8(v)::bit(32) != hashfloat8extended(v, 0)::bit(32)
+       OR hashfloat8(v)::bit(32) = hashfloat8extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashoid(v)::bit(32) as standard,
+	   hashoidextended(v, 0)::bit(32) as extended0,
+	   hashoidextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashoid(v)::bit(32) != hashoidextended(v, 0)::bit(32)
+       OR hashoid(v)::bit(32) = hashoidextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashchar(v)::bit(32) as standard,
+	   hashcharextended(v, 0)::bit(32) as extended0,
+	   hashcharextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::"char"), ('1'), ('x'), ('X'), ('p'), ('N')) x(v)
+WHERE  hashchar(v)::bit(32) != hashcharextended(v, 0)::bit(32)
+       OR hashchar(v)::bit(32) = hashcharextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashname(v)::bit(32) as standard,
+	   hashnameextended(v, 0)::bit(32) as extended0,
+	   hashnameextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashname(v)::bit(32) != hashnameextended(v, 0)::bit(32)
+       OR hashname(v)::bit(32) = hashnameextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashtext(v)::bit(32) as standard,
+	   hashtextextended(v, 0)::bit(32) as extended0,
+	   hashtextextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashtext(v)::bit(32) != hashtextextended(v, 0)::bit(32)
+       OR hashtext(v)::bit(32) = hashtextextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashoidvector(v)::bit(32) as standard,
+	   hashoidvectorextended(v, 0)::bit(32) as extended0,
+	   hashoidvectorextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::oidvector), ('0 1 2 3 4'), ('17 18 19 20'),
+        ('42 43 42 45'), ('550273 550273 570274'),
+        ('207112489 207112499 21512 2155 372325 1363252')) x(v)
+WHERE  hashoidvector(v)::bit(32) != hashoidvectorextended(v, 0)::bit(32)
+       OR hashoidvector(v)::bit(32) = hashoidvectorextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hash_aclitem(v)::bit(32) as standard,
+	   hash_aclitem_extended(v, 0)::bit(32) as extended0,
+	   hash_aclitem_extended(v, 1)::bit(32) as extended1
+FROM   (SELECT DISTINCT(relacl[1]) FROM pg_class LIMIT 10) x(v)
+WHERE  hash_aclitem(v)::bit(32) != hash_aclitem_extended(v, 0)::bit(32)
+       OR hash_aclitem(v)::bit(32) = hash_aclitem_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashmacaddr(v)::bit(32) as standard,
+	   hashmacaddrextended(v, 0)::bit(32) as extended0,
+	   hashmacaddrextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::macaddr), ('08:00:2b:01:02:04'), ('08:00:2b:01:02:04'),
+		('e2:7f:51:3e:70:49'), ('d6:a9:4a:78:1c:d5'),
+        ('ea:29:b1:5e:1f:a5')) x(v)
+WHERE  hashmacaddr(v)::bit(32) != hashmacaddrextended(v, 0)::bit(32)
+       OR hashmacaddr(v)::bit(32) = hashmacaddrextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashinet(v)::bit(32) as standard,
+	   hashinetextended(v, 0)::bit(32) as extended0,
+	   hashinetextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::inet), ('192.168.100.128/25'), ('192.168.100.0/8'),
+		('172.168.10.126/16'), ('172.18.103.126/24'), ('192.188.13.16/32')) x(v)
+WHERE  hashinet(v)::bit(32) != hashinetextended(v, 0)::bit(32)
+       OR hashinet(v)::bit(32) = hashinetextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hash_numeric(v)::bit(32) as standard,
+	   hash_numeric_extended(v, 0)::bit(32) as extended0,
+	   hash_numeric_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1.149484958), (17.149484958), (42.149484958),
+        (149484958.550273), (2071124898672)) x(v)
+WHERE  hash_numeric(v)::bit(32) != hash_numeric_extended(v, 0)::bit(32)
+       OR hash_numeric(v)::bit(32) = hash_numeric_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashmacaddr8(v)::bit(32) as standard,
+	   hashmacaddr8extended(v, 0)::bit(32) as extended0,
+	   hashmacaddr8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::macaddr8), ('08:00:2b:01:02:04:36:49'),
+        ('08:00:2b:01:02:04:f0:e8'), ('e2:7f:51:3e:70:49:16:29'),
+        ('d6:a9:4a:78:1c:d5:47:32'), ('ea:29:b1:5e:1f:a5')) x(v)
+WHERE  hashmacaddr8(v)::bit(32) != hashmacaddr8extended(v, 0)::bit(32)
+       OR hashmacaddr8(v)::bit(32) = hashmacaddr8extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hash_array(v)::bit(32) as standard,
+	   hash_array_extended(v, 0)::bit(32) as extended0,
+	   hash_array_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES ('{0}'::int4[]), ('{0,1,2,3,4}'), ('{17,18,19,20}'),
+        ('{42,34,65,98}'), ('{550273,590027, 870273}'),
+        ('{207112489, 807112489}')) x(v)
+WHERE  hash_array(v)::bit(32) != hash_array_extended(v, 0)::bit(32)
+       OR hash_array(v)::bit(32) = hash_array_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hashbpchar(v)::bit(32) as standard,
+	   hashbpcharextended(v, 0)::bit(32) as extended0,
+	   hashbpcharextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashbpchar(v)::bit(32) != hashbpcharextended(v, 0)::bit(32)
+       OR hashbpchar(v)::bit(32) = hashbpcharextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, time_hash(v)::bit(32) as standard,
+	   time_hash_extended(v, 0)::bit(32) as extended0,
+	   time_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::time), ('11:09:59'), ('1:09:59'), ('11:59:59'),
+        ('7:9:59'), ('5:15:59')) x(v)
+WHERE  time_hash(v)::bit(32) != time_hash_extended(v, 0)::bit(32)
+       OR time_hash(v)::bit(32) = time_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, timetz_hash(v)::bit(32) as standard,
+	   timetz_hash_extended(v, 0)::bit(32) as extended0,
+	   timetz_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::timetz), ('00:11:52.518762-07'), ('00:11:52.51762-08'),
+		('00:11:52.62-01'), ('00:11:52.62+01'), ('11:59:59+04')) x(v)
+WHERE  timetz_hash(v)::bit(32) != timetz_hash_extended(v, 0)::bit(32)
+       OR timetz_hash(v)::bit(32) = timetz_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, interval_hash(v)::bit(32) as standard,
+	   interval_hash_extended(v, 0)::bit(32) as extended0,
+	   interval_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::interval),
+        ('5 month 7 day 46 minutes'), ('1 year 7 day 46 minutes'),
+		('1 year 7 month 20 day 46 minutes'), ('5 month'),
+		('17 year 11 month 7 day 9 hours 46 minutes 5 seconds')) x(v)
+WHERE  interval_hash(v)::bit(32) != interval_hash_extended(v, 0)::bit(32)
+       OR interval_hash(v)::bit(32) = interval_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, timestamp_hash(v)::bit(32) as standard,
+	   timestamp_hash_extended(v, 0)::bit(32) as extended0,
+	   timestamp_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::timestamp), ('2017-08-22 00:09:59.518762'),
+        ('2015-08-20 00:11:52.51762-08'),
+		('2017-05-22 00:11:52.62-01'),
+        ('2013-08-22 00:11:52.62+01'), ('2013-08-22 11:59:59+04')) x(v)
+WHERE  timestamp_hash(v)::bit(32) != timestamp_hash_extended(v, 0)::bit(32)
+       OR timestamp_hash(v)::bit(32) = timestamp_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, uuid_hash(v)::bit(32) as standard,
+	   uuid_hash_extended(v, 0)::bit(32) as extended0,
+	   uuid_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::uuid), ('a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+		('5a9ba4ac-8d6f-11e7-bb31-be2e44b06b34'),
+        ('99c6705c-d939-461c-a3c9-1690ad64ed7b'),
+		('7deed3ca-8d6f-11e7-bb31-be2e44b06b34'),
+        ('9ad46d4f-6f2a-4edd-aadb-745993928e1e')) x(v)
+WHERE  uuid_hash(v)::bit(32) != uuid_hash_extended(v, 0)::bit(32)
+       OR uuid_hash(v)::bit(32) = uuid_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, pg_lsn_hash(v)::bit(32) as standard,
+	   pg_lsn_hash_extended(v, 0)::bit(32) as extended0,
+	   pg_lsn_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::pg_lsn), ('16/B374D84'), ('30/B374D84'),
+		('255/B374D84'), ('25/B379D90'), ('900/F37FD90')) x(v)
+WHERE  pg_lsn_hash(v)::bit(32) != pg_lsn_hash_extended(v, 0)::bit(32)
+       OR pg_lsn_hash(v)::bit(32) = pg_lsn_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
+SELECT v as value, hashenum(v)::bit(32) as standard,
+	   hashenumextended(v, 0)::bit(32) as extended0,
+	   hashenumextended(v, 1)::bit(32) as extended1
+FROM   (VALUES ('sad'::mood), ('ok'), ('happy')) x(v)
+WHERE  hashenum(v)::bit(32) != hashenumextended(v, 0)::bit(32)
+       OR hashenum(v)::bit(32) = hashenumextended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+DROP TYPE mood;
+SELECT v as value, jsonb_hash(v)::bit(32) as standard,
+	   jsonb_hash_extended(v, 0)::bit(32) as extended0,
+	   jsonb_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::jsonb),
+    ('{"a": "aaa bbb ddd ccc", "b": ["eee fff ggg"], "c": {"d": "hhh iii"}}'),
+	('{"foo": [true, "bar"], "tags": {"e": 1, "f": null}}'),
+    ('{"g": {"h": "value"}}')) x(v)
+WHERE  jsonb_hash(v)::bit(32) != jsonb_hash_extended(v, 0)::bit(32)
+       OR jsonb_hash(v)::bit(32) = jsonb_hash_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
+SELECT v as value, hash_range(v)::bit(32) as standard,
+	   hash_range_extended(v, 0)::bit(32) as extended0,
+	   hash_range_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (int4range(10, 20)), (int4range(23, 43)),
+         (int4range(5675, 550273)),
+		 (int4range(550274, 1550274)), (int4range(1550275, 208112489))) x(v)
+WHERE  hash_range(v)::bit(32) != hash_range_extended(v, 0)::bit(32)
+       OR hash_range(v)::bit(32) = hash_range_extended(v, 1)::bit(32);
+ value | standard | extended0 | extended1 
+-------+----------+-----------+-----------
+(0 rows)
+
diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out
index 0bbaa2a768..e23de21b41 100644
--- a/src/test/regress/expected/hash_index.out
+++ b/src/test/regress/expected/hash_index.out
@@ -217,6 +217,9 @@ END;
 DELETE FROM hash_split_heap WHERE keycol = 1;
 INSERT INTO hash_split_heap SELECT a/2 FROM generate_series(1, 25000) a;
 VACUUM hash_split_heap;
+-- Rebuild the index using a different fillfactor
+ALTER INDEX hash_split_index SET (fillfactor = 10);
+REINDEX INDEX hash_split_index;
 -- Clean up.
 DROP TABLE hash_split_heap;
 -- Index on temp table.
@@ -229,3 +232,12 @@ CREATE TABLE hash_heap_float4 (x float4, y int);
 INSERT INTO hash_heap_float4 VALUES (1.1,1);
 CREATE INDEX hash_idx ON hash_heap_float4 USING hash (x);
 DROP TABLE hash_heap_float4 CASCADE;
+-- Test out-of-range fillfactor values
+CREATE INDEX hash_f8_index2 ON hash_f8_heap USING hash (random float8_ops)
+	WITH (fillfactor=9);
+ERROR:  value 9 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+CREATE INDEX hash_f8_index2 ON hash_f8_heap USING hash (random float8_ops)
+	WITH (fillfactor=101);
+ERROR:  value 101 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
diff --git a/src/test/regress/expected/hash_part.out b/src/test/regress/expected/hash_part.out
new file mode 100644
index 0000000000..9e9e56f6fc
--- /dev/null
+++ b/src/test/regress/expected/hash_part.out
@@ -0,0 +1,113 @@
+--
+-- Hash partitioning.
+--
+CREATE OR REPLACE FUNCTION hashint4_noop(int4, int8) RETURNS int8 AS
+$$SELECT coalesce($1,0)::int8$$ LANGUAGE sql IMMUTABLE;
+CREATE OPERATOR CLASS test_int4_ops FOR TYPE int4 USING HASH AS
+OPERATOR 1 = , FUNCTION 2 hashint4_noop(int4, int8);
+CREATE OR REPLACE FUNCTION hashtext_length(text, int8) RETURNS int8 AS
+$$SELECT length(coalesce($1,''))::int8$$ LANGUAGE sql IMMUTABLE;
+CREATE OPERATOR CLASS test_text_ops FOR TYPE text USING HASH AS
+OPERATOR 1 = , FUNCTION 2 hashtext_length(text, int8);
+CREATE TABLE mchash (a int, b text, c jsonb)
+  PARTITION BY HASH (a test_int4_ops, b test_text_ops);
+CREATE TABLE mchash1
+  PARTITION OF mchash FOR VALUES WITH (MODULUS 4, REMAINDER 0);
+-- invalid OID, no such table
+SELECT satisfies_hash_partition(0, 4, 0, NULL);
+ satisfies_hash_partition 
+--------------------------
+ 
+(1 row)
+
+-- not partitioned
+SELECT satisfies_hash_partition('tenk1'::regclass, 4, 0, NULL);
+ERROR:  "tenk1" is not a hash partitioned table
+-- partition rather than the parent
+SELECT satisfies_hash_partition('mchash1'::regclass, 4, 0, NULL);
+ERROR:  "mchash1" is not a hash partitioned table
+-- invalid modulus
+SELECT satisfies_hash_partition('mchash'::regclass, 0, 0, NULL);
+ERROR:  modulus for hash partition must be a positive integer
+-- remainder too small
+SELECT satisfies_hash_partition('mchash'::regclass, 1, -1, NULL);
+ERROR:  remainder for hash partition must be a non-negative integer
+-- remainder too large
+SELECT satisfies_hash_partition('mchash'::regclass, 1, 1, NULL);
+ERROR:  remainder for hash partition must be less than modulus
+-- modulus is null
+SELECT satisfies_hash_partition('mchash'::regclass, NULL, 0, NULL);
+ satisfies_hash_partition 
+--------------------------
+ 
+(1 row)
+
+-- remainder is null
+SELECT satisfies_hash_partition('mchash'::regclass, 4, NULL, NULL);
+ satisfies_hash_partition 
+--------------------------
+ 
+(1 row)
+
+-- too many arguments
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, NULL::int, NULL::text, NULL::json);
+ERROR:  number of partitioning columns (2) does not match number of partition keys provided (3)
+-- too few arguments
+SELECT satisfies_hash_partition('mchash'::regclass, 3, 1, NULL::int);
+ERROR:  number of partitioning columns (2) does not match number of partition keys provided (1)
+-- wrong argument type
+SELECT satisfies_hash_partition('mchash'::regclass, 2, 1, NULL::int, NULL::int);
+ERROR:  column 2 of the partition key has type "text", but supplied value is of type "integer"
+-- ok, should be false
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, 0, ''::text);
+ satisfies_hash_partition 
+--------------------------
+ f
+(1 row)
+
+-- ok, should be true
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, 1, ''::text);
+ satisfies_hash_partition 
+--------------------------
+ t
+(1 row)
+
+-- argument via variadic syntax, should fail because not all partitioning
+-- columns are of the correct type
+SELECT satisfies_hash_partition('mchash'::regclass, 2, 1,
+								variadic array[1,2]::int[]);
+ERROR:  column 2 of the partition key has type "text", but supplied value is of type "integer"
+-- multiple partitioning columns of the same type
+CREATE TABLE mcinthash (a int, b int, c jsonb)
+  PARTITION BY HASH (a test_int4_ops, b test_int4_ops);
+-- now variadic should work, should be false
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[0, 0]);
+ satisfies_hash_partition 
+--------------------------
+ f
+(1 row)
+
+-- should be true
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[1, 0]);
+ satisfies_hash_partition 
+--------------------------
+ t
+(1 row)
+
+-- wrong length
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[]::int[]);
+ERROR:  number of partitioning columns (2) does not match number of partition keys provided (0)
+-- wrong type
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[now(), now()]);
+ERROR:  column 1 of the partition key has type "integer", but supplied value is of type "timestamp with time zone"
+-- cleanup
+DROP TABLE mchash;
+DROP TABLE mcinthash;
+DROP OPERATOR CLASS test_text_ops USING hash;
+DROP OPERATOR CLASS test_int4_ops USING hash;
+DROP FUNCTION hashint4_noop(int4, int8);
+DROP FUNCTION hashtext_length(text, int8);
diff --git a/src/test/regress/expected/horology.out b/src/test/regress/expected/horology.out
index f9d12e0f8a..63e39198e6 100644
--- a/src/test/regress/expected/horology.out
+++ b/src/test/regress/expected/horology.out
@@ -321,7 +321,7 @@ SELECT date '1991-02-03' - time with time zone '04:05:06 UTC' AS "Subtract Time
 ERROR:  operator does not exist: date - time with time zone
 LINE 1: SELECT date '1991-02-03' - time with time zone '04:05:06 UTC...
                                  ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 --
 -- timestamp, interval arithmetic
 --
@@ -2930,6 +2930,36 @@ SELECT to_timestamp('2011-12-18 11:38 PM', 'YYYY-MM-DD HH12:MI PM');
  Sun Dec 18 23:38:00 2011 PST
 (1 row)
 
+SELECT to_timestamp('2011-12-18 11:38 +05',    'YYYY-MM-DD HH12:MI TZH');
+         to_timestamp         
+------------------------------
+ Sat Dec 17 22:38:00 2011 PST
+(1 row)
+
+SELECT to_timestamp('2011-12-18 11:38 -05',    'YYYY-MM-DD HH12:MI TZH');
+         to_timestamp         
+------------------------------
+ Sun Dec 18 08:38:00 2011 PST
+(1 row)
+
+SELECT to_timestamp('2011-12-18 11:38 +05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
+         to_timestamp         
+------------------------------
+ Sat Dec 17 22:18:00 2011 PST
+(1 row)
+
+SELECT to_timestamp('2011-12-18 11:38 -05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
+         to_timestamp         
+------------------------------
+ Sun Dec 18 08:58:00 2011 PST
+(1 row)
+
+SELECT to_timestamp('2011-12-18 11:38 20',     'YYYY-MM-DD HH12:MI TZM');
+         to_timestamp         
+------------------------------
+ Sun Dec 18 03:18:00 2011 PST
+(1 row)
+
 --
 -- Check handling of multiple spaces in format and/or input
 --
diff --git a/src/test/regress/expected/identity.out b/src/test/regress/expected/identity.out
index 88b56dad93..5536044d9f 100644
--- a/src/test/regress/expected/identity.out
+++ b/src/test/regress/expected/identity.out
@@ -26,6 +26,19 @@ SELECT sequence_name FROM information_schema.sequences WHERE sequence_name LIKE
 ---------------
 (0 rows)
 
+SELECT pg_get_serial_sequence('itest1', 'a');
+ pg_get_serial_sequence 
+------------------------
+ public.itest1_a_seq
+(1 row)
+
+\d itest1_a_seq
+                    Sequence "public.itest1_a_seq"
+  Type   | Start | Minimum |  Maximum   | Increment | Cycles? | Cache 
+---------+-------+---------+------------+-----------+---------+-------
+ integer |     1 |       1 | 2147483647 |         1 | no      |     1
+Sequence for identity column: public.itest1.a
+
 CREATE TABLE itest4 (a int, b text);
 ALTER TABLE itest4 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;  -- error, requires NOT NULL
 ERROR:  column "a" of relation "itest4" must be declared NOT NULL before identity can be added
@@ -91,6 +104,19 @@ SELECT * FROM itest4;
  2 | 
 (2 rows)
 
+-- VALUES RTEs
+INSERT INTO itest3 VALUES (DEFAULT, 'a');
+INSERT INTO itest3 VALUES (DEFAULT, 'b'), (DEFAULT, 'c');
+SELECT * FROM itest3;
+ a  | b 
+----+---
+  7 | 
+ 12 | 
+ 17 | a
+ 22 | b
+ 27 | c
+(5 rows)
+
 -- OVERRIDING tests
 INSERT INTO itest1 VALUES (10, 'xyz');
 INSERT INTO itest1 OVERRIDING USER VALUE VALUES (10, 'xyz');
@@ -140,6 +166,19 @@ SELECT * FROM itest2;
   3 | 
 (3 rows)
 
+-- COPY tests
+CREATE TABLE itest9 (a int GENERATED ALWAYS AS IDENTITY, b text, c bigint);
+COPY itest9 FROM stdin;
+COPY itest9 (b, c) FROM stdin;
+SELECT * FROM itest9 ORDER BY c;
+  a  |  b   |  c  
+-----+------+-----
+ 100 | foo  | 200
+ 101 | bar  | 201
+   1 | foo2 | 202
+   2 | bar2 | 203
+(4 rows)
+
 -- DROP IDENTITY tests
 ALTER TABLE itest4 ALTER COLUMN a DROP IDENTITY;
 ALTER TABLE itest4 ALTER COLUMN a DROP IDENTITY;  -- error
@@ -211,6 +250,21 @@ SELECT * FROM itestv11;
  11 | xyz
 (3 rows)
 
+-- ADD COLUMN
+CREATE TABLE itest13 (a int);
+-- add column to empty table
+ALTER TABLE itest13 ADD COLUMN b int GENERATED BY DEFAULT AS IDENTITY;
+INSERT INTO itest13 VALUES (1), (2), (3);
+-- add column to populated table
+ALTER TABLE itest13 ADD COLUMN c int GENERATED BY DEFAULT AS IDENTITY;
+SELECT * FROM itest13;
+ a | b | c 
+---+---+---
+ 1 | 1 | 1
+ 2 | 2 | 2
+ 3 | 3 | 3
+(3 rows)
+
 -- various ALTER COLUMN tests
 -- fail, not allowed for identity columns
 ALTER TABLE itest1 ALTER COLUMN a SET DEFAULT 1;
@@ -320,3 +374,15 @@ SELECT * FROM itest8;
 RESET ROLE;
 DROP TABLE itest8;
 DROP USER regress_user1;
+-- typed tables (currently not supported)
+CREATE TYPE itest_type AS (f1 integer, f2 text, f3 bigint);
+CREATE TABLE itest12 OF itest_type (f1 WITH OPTIONS GENERATED ALWAYS AS IDENTITY); -- error
+ERROR:  identity columns are not supported on typed tables
+DROP TYPE itest_type CASCADE;
+-- table partitions (currently not supported)
+CREATE TABLE itest_parent (f1 date NOT NULL, f2 text, f3 bigint) PARTITION BY RANGE (f1);
+CREATE TABLE itest_child PARTITION OF itest_parent (
+    f3 WITH OPTIONS GENERATED ALWAYS AS IDENTITY
+) FOR VALUES FROM ('2016-07-01') TO ('2016-08-01'); -- error
+ERROR:  identity columns are not supported on partitions
+DROP TABLE itest_parent;
diff --git a/src/test/regress/expected/indexing.out b/src/test/regress/expected/indexing.out
new file mode 100644
index 0000000000..375f55b337
--- /dev/null
+++ b/src/test/regress/expected/indexing.out
@@ -0,0 +1,1058 @@
+-- Creating an index on a partitioned table makes the partitions
+-- automatically get the index
+create table idxpart (a int, b int, c text) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+create table idxpart2 partition of idxpart for values from (10) to (100)
+	partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (0) to (100);
+create index on idxpart (a);
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+     relname     | relkind |   inhparent    
+-----------------+---------+----------------
+ idxpart         | p       | 
+ idxpart1        | r       | 
+ idxpart1_a_idx  | i       | idxpart_a_idx
+ idxpart2        | p       | 
+ idxpart21       | r       | 
+ idxpart21_a_idx | i       | idxpart2_a_idx
+ idxpart2_a_idx  | I       | idxpart_a_idx
+ idxpart_a_idx   | I       | 
+(8 rows)
+
+drop table idxpart;
+-- Some unsupported features
+create table idxpart (a int, b int, c text) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+create index concurrently on idxpart (a);
+ERROR:  cannot create index on partitioned table "idxpart" concurrently
+drop table idxpart;
+-- Verify bugfix with query on indexed partitioned table with no partitions
+-- https://postgr.es/m/20180124162006.pmapfiznhgngwtjf@alvherre.pgsql
+CREATE TABLE idxpart (col1 INT) PARTITION BY RANGE (col1);
+CREATE INDEX ON idxpart (col1);
+CREATE TABLE idxpart_two (col2 INT);
+SELECT col2 FROM idxpart_two fk LEFT OUTER JOIN idxpart pk ON (col1 = col2);
+ col2 
+------
+(0 rows)
+
+DROP table idxpart, idxpart_two;
+-- If a table without index is attached as partition to a table with
+-- an index, the index is automatically created
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (b, c);
+create table idxpart1 (like idxpart);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+ c      | text    |           |          | 
+
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+ c      | text    |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (10)
+Indexes:
+    "idxpart1_a_idx" btree (a)
+    "idxpart1_b_c_idx" btree (b, c)
+
+drop table idxpart;
+-- If a partition already has an index, don't create a duplicative one
+create table idxpart (a int, b int) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (0, 0) to (10, 10);
+create index on idxpart1 (a, b);
+create index on idxpart (a, b);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (0, 0) TO (10, 10)
+Indexes:
+    "idxpart1_a_b_idx" btree (a, b)
+
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+     relname      | relkind |    inhparent    
+------------------+---------+-----------------
+ idxpart          | p       | 
+ idxpart1         | r       | 
+ idxpart1_a_b_idx | i       | idxpart_a_b_idx
+ idxpart_a_b_idx  | I       | 
+(4 rows)
+
+drop table idxpart;
+-- DROP behavior for partitioned indexes
+create table idxpart (a int) partition by range (a);
+create index on idxpart (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+drop index idxpart1_a_idx;	-- no way
+ERROR:  cannot drop index idxpart1_a_idx because index idxpart_a_idx requires it
+HINT:  You can drop index idxpart_a_idx instead.
+drop index idxpart_a_idx;	-- both indexes go away
+select relname, relkind from pg_class
+  where relname like 'idxpart%' order by relname;
+ relname  | relkind 
+----------+---------
+ idxpart  | p
+ idxpart1 | r
+(2 rows)
+
+create index on idxpart (a);
+drop table idxpart1;		-- the index on partition goes away too
+select relname, relkind from pg_class
+  where relname like 'idxpart%' order by relname;
+    relname    | relkind 
+---------------+---------
+ idxpart       | p
+ idxpart_a_idx | I
+(2 rows)
+
+drop table idxpart;
+-- ALTER INDEX .. ATTACH, error cases
+create table idxpart (a int, b int) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (0, 0) to (10, 10);
+create index idxpart_a_b_idx on only idxpart (a, b);
+create index idxpart1_a_b_idx on idxpart1 (a, b);
+create index idxpart1_tst1 on idxpart1 (b, a);
+create index idxpart1_tst2 on idxpart1 using hash (a);
+create index idxpart1_tst3 on idxpart1 (a, b) where a > 10;
+alter index idxpart attach partition idxpart1;
+ERROR:  "idxpart" is not an index
+alter index idxpart_a_b_idx attach partition idxpart1;
+ERROR:  "idxpart1" is not an index
+alter index idxpart_a_b_idx attach partition idxpart_a_b_idx;
+ERROR:  cannot attach index "idxpart_a_b_idx" as a partition of index "idxpart_a_b_idx"
+DETAIL:  Index "idxpart_a_b_idx" is not an index on any partition of table "idxpart".
+alter index idxpart_a_b_idx attach partition idxpart1_b_idx;
+ERROR:  relation "idxpart1_b_idx" does not exist
+alter index idxpart_a_b_idx attach partition idxpart1_tst1;
+ERROR:  cannot attach index "idxpart1_tst1" as a partition of index "idxpart_a_b_idx"
+DETAIL:  The index definitions do not match.
+alter index idxpart_a_b_idx attach partition idxpart1_tst2;
+ERROR:  cannot attach index "idxpart1_tst2" as a partition of index "idxpart_a_b_idx"
+DETAIL:  The index definitions do not match.
+alter index idxpart_a_b_idx attach partition idxpart1_tst3;
+ERROR:  cannot attach index "idxpart1_tst3" as a partition of index "idxpart_a_b_idx"
+DETAIL:  The index definitions do not match.
+-- OK
+alter index idxpart_a_b_idx attach partition idxpart1_a_b_idx;
+alter index idxpart_a_b_idx attach partition idxpart1_a_b_idx; -- quiet
+-- reject dupe
+create index idxpart1_2_a_b on idxpart1 (a, b);
+alter index idxpart_a_b_idx attach partition idxpart1_2_a_b;
+ERROR:  cannot attach index "idxpart1_2_a_b" as a partition of index "idxpart_a_b_idx"
+DETAIL:  Another index is already attached for partition "idxpart1".
+drop table idxpart;
+-- make sure everything's gone
+select indexrelid::regclass, indrelid::regclass
+  from pg_index where indexrelid::regclass::text like 'idxpart%';
+ indexrelid | indrelid 
+------------+----------
+(0 rows)
+
+-- Don't auto-attach incompatible indexes
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int, b int);
+create index on idxpart1 using hash (a);
+create index on idxpart1 (a) where b > 1;
+create index on idxpart1 ((a + 0));
+create index on idxpart1 (a, a);
+create index on idxpart (a);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (1000)
+Indexes:
+    "idxpart1_a_a1_idx" btree (a, a)
+    "idxpart1_a_idx" hash (a)
+    "idxpart1_a_idx1" btree (a) WHERE b > 1
+    "idxpart1_a_idx2" btree (a)
+    "idxpart1_expr_idx" btree ((a + 0))
+
+drop table idxpart;
+-- If CREATE INDEX ONLY, don't create indexes on partitions; and existing
+-- indexes on partitions don't change parent.  ALTER INDEX ATTACH can change
+-- the parent after the fact.
+create table idxpart (a int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100);
+create table idxpart2 partition of idxpart for values from (100) to (1000)
+  partition by range (a);
+create table idxpart21 partition of idxpart2 for values from (100) to (200);
+create table idxpart22 partition of idxpart2 for values from (200) to (300);
+create index on idxpart22 (a);
+create index on only idxpart2 (a);
+create index on idxpart (a);
+-- Here we expect that idxpart1 and idxpart2 have a new index, but idxpart21
+-- does not; also, idxpart22 is not attached.
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (100)
+Indexes:
+    "idxpart1_a_idx" btree (a)
+
+\d idxpart2
+              Table "public.idxpart2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (100) TO (1000)
+Partition key: RANGE (a)
+Indexes:
+    "idxpart2_a_idx" btree (a) INVALID
+Number of partitions: 2 (Use \d+ to list them.)
+
+\d idxpart21
+             Table "public.idxpart21"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition of: idxpart2 FOR VALUES FROM (100) TO (200)
+
+select indexrelid::regclass, indrelid::regclass, inhparent::regclass
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+where indexrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+   indexrelid    | indrelid  |   inhparent   
+-----------------+-----------+---------------
+ idxpart1_a_idx  | idxpart1  | idxpart_a_idx
+ idxpart22_a_idx | idxpart22 | 
+ idxpart2_a_idx  | idxpart2  | idxpart_a_idx
+ idxpart_a_idx   | idxpart   | 
+(4 rows)
+
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+select indexrelid::regclass, indrelid::regclass, inhparent::regclass
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+where indexrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+   indexrelid    | indrelid  |   inhparent    
+-----------------+-----------+----------------
+ idxpart1_a_idx  | idxpart1  | idxpart_a_idx
+ idxpart22_a_idx | idxpart22 | idxpart2_a_idx
+ idxpart2_a_idx  | idxpart2  | idxpart_a_idx
+ idxpart_a_idx   | idxpart   | 
+(4 rows)
+
+-- attaching idxpart22 is not enough to set idxpart22_a_idx valid ...
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+\d idxpart2
+              Table "public.idxpart2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (100) TO (1000)
+Partition key: RANGE (a)
+Indexes:
+    "idxpart2_a_idx" btree (a) INVALID
+Number of partitions: 2 (Use \d+ to list them.)
+
+-- ... but this one is.
+create index on idxpart21 (a);
+alter index idxpart2_a_idx attach partition idxpart21_a_idx;
+\d idxpart2
+              Table "public.idxpart2"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (100) TO (1000)
+Partition key: RANGE (a)
+Indexes:
+    "idxpart2_a_idx" btree (a)
+Number of partitions: 2 (Use \d+ to list them.)
+
+drop table idxpart;
+-- When a table is attached a partition and it already has an index, a
+-- duplicate index should not get created, but rather the index becomes
+-- attached to the parent's index.
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (b, c);
+create table idxpart1 (like idxpart including indexes);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+ c      | text    |           |          | 
+Indexes:
+    "idxpart1_a_idx" btree (a)
+    "idxpart1_b_c_idx" btree (b, c)
+
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+     relname      | relkind | inhparent 
+------------------+---------+-----------
+ idxpart          | p       | 
+ idxpart1         | r       | 
+ idxpart1_a_idx   | i       | 
+ idxpart1_b_c_idx | i       | 
+ idxparti         | I       | 
+ idxparti2        | I       | 
+(6 rows)
+
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+ c      | text    |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (10)
+Indexes:
+    "idxpart1_a_idx" btree (a)
+    "idxpart1_b_c_idx" btree (b, c)
+
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+     relname      | relkind | inhparent 
+------------------+---------+-----------
+ idxpart          | p       | 
+ idxpart1         | r       | 
+ idxpart1_a_idx   | i       | idxparti
+ idxpart1_b_c_idx | i       | idxparti2
+ idxparti         | I       | 
+ idxparti2        | I       | 
+(6 rows)
+
+drop table idxpart;
+-- Verify that attaching an invalid index does not mark the parent index valid.
+-- On the other hand, attaching a valid index marks not only its direct
+-- ancestor valid, but also any indirect ancestor that was only missing the one
+-- that was just made valid
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (1) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (1) to (100);
+create index on only idxpart1 (a);
+create index on only idxpart (a);
+-- this results in two invalid indexes:
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+    relname     | indisvalid 
+----------------+------------
+ idxpart1_a_idx | f
+ idxpart_a_idx  | f
+(2 rows)
+
+-- idxpart1_a_idx is not valid, so idxpart_a_idx should not become valid:
+alter index idxpart_a_idx attach partition idxpart1_a_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+    relname     | indisvalid 
+----------------+------------
+ idxpart1_a_idx | f
+ idxpart_a_idx  | f
+(2 rows)
+
+-- after creating and attaching this, both idxpart1_a_idx and idxpart_a_idx
+-- should become valid
+create index on idxpart11 (a);
+alter index idxpart1_a_idx attach partition idxpart11_a_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+     relname     | indisvalid 
+-----------------+------------
+ idxpart11_a_idx | t
+ idxpart1_a_idx  | t
+ idxpart_a_idx   | t
+(3 rows)
+
+drop table idxpart;
+-- verify dependency handling during ALTER TABLE DETACH PARTITION
+create table idxpart (a int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 (a);
+create index on idxpart (a);
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+    relname     | relkind 
+----------------+---------
+ idxpart        | p
+ idxpart1       | r
+ idxpart1_a_idx | i
+ idxpart2       | r
+ idxpart2_a_idx | i
+ idxpart3       | r
+ idxpart3_a_idx | i
+ idxpart_a_idx  | I
+(8 rows)
+
+-- a) after detaching partitions, the indexes can be dropped independently
+alter table idxpart detach partition idxpart1;
+alter table idxpart detach partition idxpart2;
+alter table idxpart detach partition idxpart3;
+drop index idxpart1_a_idx;
+drop index idxpart2_a_idx;
+drop index idxpart3_a_idx;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+    relname    | relkind 
+---------------+---------
+ idxpart       | p
+ idxpart1      | r
+ idxpart2      | r
+ idxpart3      | r
+ idxpart_a_idx | I
+(5 rows)
+
+drop table idxpart, idxpart1, idxpart2, idxpart3;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+ relname | relkind 
+---------+---------
+(0 rows)
+
+create table idxpart (a int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 (a);
+create index on idxpart (a);
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+-- b) after detaching, dropping the index on parent does not remove the others
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+    relname     | relkind 
+----------------+---------
+ idxpart        | p
+ idxpart1       | r
+ idxpart1_a_idx | i
+ idxpart2       | r
+ idxpart2_a_idx | i
+ idxpart3       | r
+ idxpart3_a_idx | i
+ idxpart_a_idx  | I
+(8 rows)
+
+alter table idxpart detach partition idxpart1;
+alter table idxpart detach partition idxpart2;
+alter table idxpart detach partition idxpart3;
+drop index idxpart_a_idx;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+    relname     | relkind 
+----------------+---------
+ idxpart        | p
+ idxpart1       | r
+ idxpart1_a_idx | i
+ idxpart2       | r
+ idxpart2_a_idx | i
+ idxpart3       | r
+ idxpart3_a_idx | i
+(7 rows)
+
+drop table idxpart, idxpart1, idxpart2, idxpart3;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+ relname | relkind 
+---------+---------
+(0 rows)
+
+-- Verify that expression indexes inherit correctly
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 ((a + b));
+create index on idxpart ((a + b));
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+       child       |      parent      |                                 childdef                                  
+-------------------+------------------+---------------------------------------------------------------------------
+ idxpart1_expr_idx | idxpart_expr_idx | CREATE INDEX idxpart1_expr_idx ON public.idxpart1 USING btree (((a + b)))
+ idxpart2_expr_idx | idxpart_expr_idx | CREATE INDEX idxpart2_expr_idx ON public.idxpart2 USING btree (((a + b)))
+ idxpart3_expr_idx | idxpart_expr_idx | CREATE INDEX idxpart3_expr_idx ON public.idxpart3 USING btree (((a + b)))
+(3 rows)
+
+drop table idxpart;
+-- Verify behavior for collation (mis)matches
+create table idxpart (a text) partition by range (a);
+create table idxpart1 (like idxpart);
+create table idxpart2 (like idxpart);
+create index on idxpart2 (a collate "POSIX");
+create index on idxpart2 (a);
+create index on idxpart2 (a collate "C");
+alter table idxpart attach partition idxpart1 for values from ('aaa') to ('bbb');
+alter table idxpart attach partition idxpart2 for values from ('bbb') to ('ccc');
+create table idxpart3 partition of idxpart for values from ('ccc') to ('ddd');
+create index on idxpart (a collate "C");
+create table idxpart4 partition of idxpart for values from ('ddd') to ('eee');
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+      child      |    parent     |                                    childdef                                    
+-----------------+---------------+--------------------------------------------------------------------------------
+ idxpart1_a_idx  | idxpart_a_idx | CREATE INDEX idxpart1_a_idx ON public.idxpart1 USING btree (a COLLATE "C")
+ idxpart2_a_idx  |               | CREATE INDEX idxpart2_a_idx ON public.idxpart2 USING btree (a COLLATE "POSIX")
+ idxpart2_a_idx1 |               | CREATE INDEX idxpart2_a_idx1 ON public.idxpart2 USING btree (a)
+ idxpart2_a_idx2 | idxpart_a_idx | CREATE INDEX idxpart2_a_idx2 ON public.idxpart2 USING btree (a COLLATE "C")
+ idxpart3_a_idx  | idxpart_a_idx | CREATE INDEX idxpart3_a_idx ON public.idxpart3 USING btree (a COLLATE "C")
+ idxpart4_a_idx  | idxpart_a_idx | CREATE INDEX idxpart4_a_idx ON public.idxpart4 USING btree (a COLLATE "C")
+ idxpart_a_idx   |               | CREATE INDEX idxpart_a_idx ON ONLY public.idxpart USING btree (a COLLATE "C")
+(7 rows)
+
+drop table idxpart;
+-- Verify behavior for opclass (mis)matches
+create table idxpart (a text) partition by range (a);
+create table idxpart1 (like idxpart);
+create table idxpart2 (like idxpart);
+create index on idxpart2 (a);
+alter table idxpart attach partition idxpart1 for values from ('aaa') to ('bbb');
+alter table idxpart attach partition idxpart2 for values from ('bbb') to ('ccc');
+create table idxpart3 partition of idxpart for values from ('ccc') to ('ddd');
+create index on idxpart (a text_pattern_ops);
+create table idxpart4 partition of idxpart for values from ('ddd') to ('eee');
+-- must *not* have attached the index we created on idxpart2
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+      child      |    parent     |                                      childdef                                      
+-----------------+---------------+------------------------------------------------------------------------------------
+ idxpart1_a_idx  | idxpart_a_idx | CREATE INDEX idxpart1_a_idx ON public.idxpart1 USING btree (a text_pattern_ops)
+ idxpart2_a_idx  |               | CREATE INDEX idxpart2_a_idx ON public.idxpart2 USING btree (a)
+ idxpart2_a_idx1 | idxpart_a_idx | CREATE INDEX idxpart2_a_idx1 ON public.idxpart2 USING btree (a text_pattern_ops)
+ idxpart3_a_idx  | idxpart_a_idx | CREATE INDEX idxpart3_a_idx ON public.idxpart3 USING btree (a text_pattern_ops)
+ idxpart4_a_idx  | idxpart_a_idx | CREATE INDEX idxpart4_a_idx ON public.idxpart4 USING btree (a text_pattern_ops)
+ idxpart_a_idx   |               | CREATE INDEX idxpart_a_idx ON ONLY public.idxpart USING btree (a text_pattern_ops)
+(6 rows)
+
+drop index idxpart_a_idx;
+create index on only idxpart (a text_pattern_ops);
+-- must reject
+alter index idxpart_a_idx attach partition idxpart2_a_idx;
+ERROR:  cannot attach index "idxpart2_a_idx" as a partition of index "idxpart_a_idx"
+DETAIL:  The index definitions do not match.
+drop table idxpart;
+-- Verify that attaching indexes maps attribute numbers correctly
+create table idxpart (col1 int, a int, col2 int, b int) partition by range (a);
+create table idxpart1 (b int, col1 int, col2 int, col3 int, a int);
+alter table idxpart drop column col1, drop column col2;
+alter table idxpart1 drop column col1, drop column col2, drop column col3;
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+create index idxpart_1_idx on only idxpart (b, a);
+create index idxpart1_1_idx on idxpart1 (b, a);
+create index idxpart1_1b_idx on idxpart1 (b);
+-- test expressions and partial-index predicate, too
+create index idxpart_2_idx on only idxpart ((b + a)) where a > 1;
+create index idxpart1_2_idx on idxpart1 ((b + a)) where a > 1;
+create index idxpart1_2b_idx on idxpart1 ((a + b)) where a > 1;
+create index idxpart1_2c_idx on idxpart1 ((b + a)) where b > 1;
+alter index idxpart_1_idx attach partition idxpart1_1b_idx;	-- fail
+ERROR:  cannot attach index "idxpart1_1b_idx" as a partition of index "idxpart_1_idx"
+DETAIL:  The index definitions do not match.
+alter index idxpart_1_idx attach partition idxpart1_1_idx;
+alter index idxpart_2_idx attach partition idxpart1_2b_idx;	-- fail
+ERROR:  cannot attach index "idxpart1_2b_idx" as a partition of index "idxpart_2_idx"
+DETAIL:  The index definitions do not match.
+alter index idxpart_2_idx attach partition idxpart1_2c_idx;	-- fail
+ERROR:  cannot attach index "idxpart1_2c_idx" as a partition of index "idxpart_2_idx"
+DETAIL:  The index definitions do not match.
+alter index idxpart_2_idx attach partition idxpart1_2_idx;	-- ok
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+      child      |    parent     |                                        childdef                                         
+-----------------+---------------+-----------------------------------------------------------------------------------------
+ idxpart1_1_idx  | idxpart_1_idx | CREATE INDEX idxpart1_1_idx ON public.idxpart1 USING btree (b, a)
+ idxpart1_1b_idx |               | CREATE INDEX idxpart1_1b_idx ON public.idxpart1 USING btree (b)
+ idxpart1_2_idx  | idxpart_2_idx | CREATE INDEX idxpart1_2_idx ON public.idxpart1 USING btree (((b + a))) WHERE (a > 1)
+ idxpart1_2b_idx |               | CREATE INDEX idxpart1_2b_idx ON public.idxpart1 USING btree (((a + b))) WHERE (a > 1)
+ idxpart1_2c_idx |               | CREATE INDEX idxpart1_2c_idx ON public.idxpart1 USING btree (((b + a))) WHERE (b > 1)
+ idxpart_1_idx   |               | CREATE INDEX idxpart_1_idx ON ONLY public.idxpart USING btree (b, a)
+ idxpart_2_idx   |               | CREATE INDEX idxpart_2_idx ON ONLY public.idxpart USING btree (((b + a))) WHERE (a > 1)
+(7 rows)
+
+drop table idxpart;
+-- Make sure the partition columns are mapped correctly
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (c, b);
+create table idxpart1 (c text, a int, b int);
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+create table idxpart2 (c text, a int, b int);
+create index on idxpart2 (a);
+create index on idxpart2 (c, b);
+alter table idxpart attach partition idxpart2 for values from (10) to (20);
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+     relname      |                           pg_get_indexdef                           
+------------------+---------------------------------------------------------------------
+ idxpart1_a_idx   | CREATE INDEX idxpart1_a_idx ON public.idxpart1 USING btree (a)
+ idxpart1_c_b_idx | CREATE INDEX idxpart1_c_b_idx ON public.idxpart1 USING btree (c, b)
+ idxpart2_a_idx   | CREATE INDEX idxpart2_a_idx ON public.idxpart2 USING btree (a)
+ idxpart2_c_b_idx | CREATE INDEX idxpart2_c_b_idx ON public.idxpart2 USING btree (c, b)
+ idxparti         | CREATE INDEX idxparti ON ONLY public.idxpart USING btree (a)
+ idxparti2        | CREATE INDEX idxparti2 ON ONLY public.idxpart USING btree (c, b)
+(6 rows)
+
+drop table idxpart;
+-- Verify that columns are mapped correctly in expression indexes
+create table idxpart (col1 int, col2 int, a int, b int) partition by range (a);
+create table idxpart1 (col2 int, b int, col1 int, a int);
+create table idxpart2 (col1 int, col2 int, b int, a int);
+alter table idxpart drop column col1, drop column col2;
+alter table idxpart1 drop column col1, drop column col2;
+alter table idxpart2 drop column col1, drop column col2;
+create index on idxpart2 (abs(b));
+alter table idxpart attach partition idxpart2 for values from (0) to (1);
+create index on idxpart (abs(b));
+alter table idxpart attach partition idxpart1 for values from (1) to (2);
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+     relname      |                             pg_get_indexdef                              
+------------------+--------------------------------------------------------------------------
+ idxpart1_abs_idx | CREATE INDEX idxpart1_abs_idx ON public.idxpart1 USING btree (abs(b))
+ idxpart2_abs_idx | CREATE INDEX idxpart2_abs_idx ON public.idxpart2 USING btree (abs(b))
+ idxpart_abs_idx  | CREATE INDEX idxpart_abs_idx ON ONLY public.idxpart USING btree (abs(b))
+(3 rows)
+
+drop table idxpart;
+-- Verify that columns are mapped correctly for WHERE in a partial index
+create table idxpart (col1 int, a int, col3 int, b int) partition by range (a);
+alter table idxpart drop column col1, drop column col3;
+create table idxpart1 (col1 int, col2 int, col3 int, col4 int, b int, a int);
+alter table idxpart1 drop column col1, drop column col2, drop column col3, drop column col4;
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+create table idxpart2 (col1 int, col2 int, b int, a int);
+create index on idxpart2 (a) where b > 1000;
+alter table idxpart2 drop column col1, drop column col2;
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create index on idxpart (a) where b > 1000;
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+    relname     |                                  pg_get_indexdef                                   
+----------------+------------------------------------------------------------------------------------
+ idxpart1_a_idx | CREATE INDEX idxpart1_a_idx ON public.idxpart1 USING btree (a) WHERE (b > 1000)
+ idxpart2_a_idx | CREATE INDEX idxpart2_a_idx ON public.idxpart2 USING btree (a) WHERE (b > 1000)
+ idxpart_a_idx  | CREATE INDEX idxpart_a_idx ON ONLY public.idxpart USING btree (a) WHERE (b > 1000)
+(3 rows)
+
+drop table idxpart;
+-- Column number mapping: dropped columns in the partition
+create table idxpart1 (drop_1 int, drop_2 int, col_keep int, drop_3 int);
+alter table idxpart1 drop column drop_1;
+alter table idxpart1 drop column drop_2;
+alter table idxpart1 drop column drop_3;
+create index on idxpart1 (col_keep);
+create table idxpart (col_keep int) partition by range (col_keep);
+create index on idxpart (col_keep);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart
+               Table "public.idxpart"
+  Column  |  Type   | Collation | Nullable | Default 
+----------+---------+-----------+----------+---------
+ col_keep | integer |           |          | 
+Partition key: RANGE (col_keep)
+Indexes:
+    "idxpart_col_keep_idx" btree (col_keep)
+Number of partitions: 1 (Use \d+ to list them.)
+
+\d idxpart1
+               Table "public.idxpart1"
+  Column  |  Type   | Collation | Nullable | Default 
+----------+---------+-----------+----------+---------
+ col_keep | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (1000)
+Indexes:
+    "idxpart1_col_keep_idx" btree (col_keep)
+
+select attrelid::regclass, attname, attnum from pg_attribute
+  where attrelid::regclass::text like 'idxpart%' and attnum > 0
+  order by attrelid::regclass, attnum;
+       attrelid        |           attname            | attnum 
+-----------------------+------------------------------+--------
+ idxpart1              | ........pg.dropped.1........ |      1
+ idxpart1              | ........pg.dropped.2........ |      2
+ idxpart1              | col_keep                     |      3
+ idxpart1              | ........pg.dropped.4........ |      4
+ idxpart1_col_keep_idx | col_keep                     |      1
+ idxpart               | col_keep                     |      1
+ idxpart_col_keep_idx  | col_keep                     |      1
+(7 rows)
+
+drop table idxpart;
+-- Column number mapping: dropped columns in the parent table
+create table idxpart(drop_1 int, drop_2 int, col_keep int, drop_3 int) partition by range (col_keep);
+alter table idxpart drop column drop_1;
+alter table idxpart drop column drop_2;
+alter table idxpart drop column drop_3;
+create table idxpart1 (col_keep int);
+create index on idxpart1 (col_keep);
+create index on idxpart (col_keep);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart
+               Table "public.idxpart"
+  Column  |  Type   | Collation | Nullable | Default 
+----------+---------+-----------+----------+---------
+ col_keep | integer |           |          | 
+Partition key: RANGE (col_keep)
+Indexes:
+    "idxpart_col_keep_idx" btree (col_keep)
+Number of partitions: 1 (Use \d+ to list them.)
+
+\d idxpart1
+               Table "public.idxpart1"
+  Column  |  Type   | Collation | Nullable | Default 
+----------+---------+-----------+----------+---------
+ col_keep | integer |           |          | 
+Partition of: idxpart FOR VALUES FROM (0) TO (1000)
+Indexes:
+    "idxpart1_col_keep_idx" btree (col_keep)
+
+select attrelid::regclass, attname, attnum from pg_attribute
+  where attrelid::regclass::text like 'idxpart%' and attnum > 0
+  order by attrelid::regclass, attnum;
+       attrelid        |           attname            | attnum 
+-----------------------+------------------------------+--------
+ idxpart               | ........pg.dropped.1........ |      1
+ idxpart               | ........pg.dropped.2........ |      2
+ idxpart               | col_keep                     |      3
+ idxpart               | ........pg.dropped.4........ |      4
+ idxpart1              | col_keep                     |      1
+ idxpart1_col_keep_idx | col_keep                     |      1
+ idxpart_col_keep_idx  | col_keep                     |      1
+(7 rows)
+
+drop table idxpart;
+--
+-- Constraint-related indexes
+--
+-- Verify that it works to add primary key / unique to partitioned tables
+create table idxpart (a int primary key, b int) partition by range (a);
+\d idxpart
+              Table "public.idxpart"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           | not null | 
+ b      | integer |           |          | 
+Partition key: RANGE (a)
+Indexes:
+    "idxpart_pkey" PRIMARY KEY, btree (a)
+Number of partitions: 0
+
+drop table idxpart;
+-- but not if you fail to use the full partition key
+create table idxpart (a int unique, b int) partition by range (a, b);
+ERROR:  insufficient columns in UNIQUE constraint definition
+DETAIL:  UNIQUE constraint on table "idxpart" lacks column "b" which is part of the partition key.
+create table idxpart (a int, b int unique) partition by range (a, b);
+ERROR:  insufficient columns in UNIQUE constraint definition
+DETAIL:  UNIQUE constraint on table "idxpart" lacks column "a" which is part of the partition key.
+create table idxpart (a int primary key, b int) partition by range (b, a);
+ERROR:  insufficient columns in PRIMARY KEY constraint definition
+DETAIL:  PRIMARY KEY constraint on table "idxpart" lacks column "b" which is part of the partition key.
+create table idxpart (a int, b int primary key) partition by range (b, a);
+ERROR:  insufficient columns in PRIMARY KEY constraint definition
+DETAIL:  PRIMARY KEY constraint on table "idxpart" lacks column "a" which is part of the partition key.
+-- OK if you use them in some other order
+create table idxpart (a int, b int, c text, primary key  (a, b, c)) partition by range (b, c, a);
+drop table idxpart;
+-- not other types of index-based constraints
+create table idxpart (a int, exclude (a with = )) partition by range (a);
+ERROR:  exclusion constraints are not supported on partitioned tables
+LINE 1: create table idxpart (a int, exclude (a with = )) partition ...
+                                     ^
+-- no expressions in partition key for PK/UNIQUE
+create table idxpart (a int primary key, b int) partition by range ((b + a));
+ERROR:  unsupported PRIMARY KEY constraint with partition key definition
+DETAIL:  PRIMARY KEY constraints cannot be used when partition keys include expressions.
+create table idxpart (a int unique, b int) partition by range ((b + a));
+ERROR:  unsupported UNIQUE constraint with partition key definition
+DETAIL:  UNIQUE constraints cannot be used when partition keys include expressions.
+-- use ALTER TABLE to add a primary key
+create table idxpart (a int, b int, c text) partition by range (a, b);
+alter table idxpart add primary key (a);	-- not an incomplete one though
+ERROR:  insufficient columns in PRIMARY KEY constraint definition
+DETAIL:  PRIMARY KEY constraint on table "idxpart" lacks column "b" which is part of the partition key.
+alter table idxpart add primary key (a, b);	-- this works
+\d idxpart
+              Table "public.idxpart"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           | not null | 
+ b      | integer |           | not null | 
+ c      | text    |           |          | 
+Partition key: RANGE (a, b)
+Indexes:
+    "idxpart_pkey" PRIMARY KEY, btree (a, b)
+Number of partitions: 0
+
+create table idxpart1 partition of idxpart for values from (0, 0) to (1000, 1000);
+\d idxpart1
+              Table "public.idxpart1"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           | not null | 
+ b      | integer |           | not null | 
+ c      | text    |           |          | 
+Partition of: idxpart FOR VALUES FROM (0, 0) TO (1000, 1000)
+Indexes:
+    "idxpart1_pkey" PRIMARY KEY, btree (a, b)
+
+drop table idxpart;
+-- use ALTER TABLE to add a unique constraint
+create table idxpart (a int, b int) partition by range (a, b);
+alter table idxpart add unique (a);			-- not an incomplete one though
+ERROR:  insufficient columns in UNIQUE constraint definition
+DETAIL:  UNIQUE constraint on table "idxpart" lacks column "b" which is part of the partition key.
+alter table idxpart add unique (b, a);		-- this works
+\d idxpart
+              Table "public.idxpart"
+ Column |  Type   | Collation | Nullable | Default 
+--------+---------+-----------+----------+---------
+ a      | integer |           |          | 
+ b      | integer |           |          | 
+Partition key: RANGE (a, b)
+Indexes:
+    "idxpart_b_a_key" UNIQUE CONSTRAINT, btree (b, a)
+Number of partitions: 0
+
+drop table idxpart;
+-- Exclusion constraints cannot be added
+create table idxpart (a int, b int) partition by range (a);
+alter table idxpart add exclude (a with =);
+ERROR:  exclusion constraints are not supported on partitioned tables
+LINE 1: alter table idxpart add exclude (a with =);
+                                ^
+drop table idxpart;
+-- When (sub)partitions are created, they also contain the constraint
+create table idxpart (a int, b int, primary key (a, b)) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (1, 1) to (10, 10);
+create table idxpart2 partition of idxpart for values from (10, 10) to (20, 20)
+  partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (10) to (15);
+create table idxpart22 partition of idxpart2 for values from (15) to (20);
+create table idxpart3 (b int not null, a int not null);
+alter table idxpart attach partition idxpart3 for values from (20, 20) to (30, 30);
+select conname, contype, conrelid::regclass, conindid::regclass, conkey
+  from pg_constraint where conrelid::regclass::text like 'idxpart%'
+  order by conname;
+    conname     | contype | conrelid  |    conindid    | conkey 
+----------------+---------+-----------+----------------+--------
+ idxpart1_pkey  | p       | idxpart1  | idxpart1_pkey  | {1,2}
+ idxpart21_pkey | p       | idxpart21 | idxpart21_pkey | {1,2}
+ idxpart22_pkey | p       | idxpart22 | idxpart22_pkey | {1,2}
+ idxpart2_pkey  | p       | idxpart2  | idxpart2_pkey  | {1,2}
+ idxpart3_pkey  | p       | idxpart3  | idxpart3_pkey  | {2,1}
+ idxpart_pkey   | p       | idxpart   | idxpart_pkey   | {1,2}
+(6 rows)
+
+drop table idxpart;
+-- Verify that multi-layer partitioning honors the requirement that all
+-- columns in the partition key must appear in primary key
+create table idxpart (a int, b int, primary key (a)) partition by range (a);
+create table idxpart2 partition of idxpart
+for values from (0) to (1000) partition by range (b); -- fail
+ERROR:  insufficient columns in PRIMARY KEY constraint definition
+DETAIL:  PRIMARY KEY constraint on table "idxpart2" lacks column "b" which is part of the partition key.
+drop table idxpart;
+-- Multi-layer partitioning works correctly in this case:
+create table idxpart (a int, b int, primary key (a, b)) partition by range (a);
+create table idxpart2 partition of idxpart for values from (0) to (1000) partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (0) to (1000);
+select conname, contype, conrelid::regclass, conindid::regclass, conkey
+  from pg_constraint where conrelid::regclass::text like 'idxpart%'
+  order by conname;
+    conname     | contype | conrelid  |    conindid    | conkey 
+----------------+---------+-----------+----------------+--------
+ idxpart21_pkey | p       | idxpart21 | idxpart21_pkey | {1,2}
+ idxpart2_pkey  | p       | idxpart2  | idxpart2_pkey  | {1,2}
+ idxpart_pkey   | p       | idxpart   | idxpart_pkey   | {1,2}
+(3 rows)
+
+drop table idxpart;
+-- If a partitioned table has a unique/PK constraint, then it's not possible
+-- to drop the corresponding constraint in the children; nor it's possible
+-- to drop the indexes individually.  Dropping the constraint in the parent
+-- gets rid of the lot.
+create table idxpart (i int) partition by hash (i);
+create table idxpart0 partition of idxpart (i) for values with (modulus 2, remainder 0);
+create table idxpart1 partition of idxpart (i) for values with (modulus 2, remainder 1);
+alter table idxpart0 add primary key(i);
+alter table idxpart add primary key(i);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+ indrelid |  indexrelid   |  inhparent   | indisvalid |    conname    | conislocal | coninhcount | connoinherit | convalidated 
+----------+---------------+--------------+------------+---------------+------------+-------------+--------------+--------------
+ idxpart0 | idxpart0_pkey | idxpart_pkey | t          | idxpart0_pkey | f          |           1 | t            | t
+ idxpart1 | idxpart1_pkey | idxpart_pkey | t          | idxpart1_pkey | f          |           1 | f            | t
+ idxpart  | idxpart_pkey  |              | t          | idxpart_pkey  | t          |           0 | t            | t
+(3 rows)
+
+drop index idxpart0_pkey;								-- fail
+ERROR:  cannot drop index idxpart0_pkey because index idxpart_pkey requires it
+HINT:  You can drop index idxpart_pkey instead.
+drop index idxpart1_pkey;								-- fail
+ERROR:  cannot drop index idxpart1_pkey because index idxpart_pkey requires it
+HINT:  You can drop index idxpart_pkey instead.
+alter table idxpart0 drop constraint idxpart0_pkey;		-- fail
+ERROR:  cannot drop inherited constraint "idxpart0_pkey" of relation "idxpart0"
+alter table idxpart1 drop constraint idxpart1_pkey;		-- fail
+ERROR:  cannot drop inherited constraint "idxpart1_pkey" of relation "idxpart1"
+alter table idxpart drop constraint idxpart_pkey;		-- ok
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+ indrelid | indexrelid | inhparent | indisvalid | conname | conislocal | coninhcount | connoinherit | convalidated 
+----------+------------+-----------+------------+---------+------------+-------------+--------------+--------------
+(0 rows)
+
+drop table idxpart;
+-- If a partitioned table has a constraint whose index is not valid,
+-- attaching a missing partition makes it valid.
+create table idxpart (a int) partition by range (a);
+create table idxpart0 (like idxpart);
+alter table idxpart0 add primary key (a);
+alter table idxpart attach partition idxpart0 for values from (0) to (1000);
+alter table only idxpart add primary key (a);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+ indrelid |  indexrelid   | inhparent | indisvalid |    conname    | conislocal | coninhcount | connoinherit | convalidated 
+----------+---------------+-----------+------------+---------------+------------+-------------+--------------+--------------
+ idxpart0 | idxpart0_pkey |           | t          | idxpart0_pkey | t          |           0 | t            | t
+ idxpart  | idxpart_pkey  |           | f          | idxpart_pkey  | t          |           0 | t            | t
+(2 rows)
+
+alter index idxpart_pkey attach partition idxpart0_pkey;
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+ indrelid |  indexrelid   |  inhparent   | indisvalid |    conname    | conislocal | coninhcount | connoinherit | convalidated 
+----------+---------------+--------------+------------+---------------+------------+-------------+--------------+--------------
+ idxpart0 | idxpart0_pkey | idxpart_pkey | t          | idxpart0_pkey | f          |           1 | t            | t
+ idxpart  | idxpart_pkey  |              | t          | idxpart_pkey  | t          |           0 | t            | t
+(2 rows)
+
+drop table idxpart;
+-- if a partition has a unique index without a constraint, does not attach
+-- automatically; creates a new index instead.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int not null, b int);
+create unique index on idxpart1 (a);
+alter table idxpart add primary key (a);
+alter table idxpart attach partition idxpart1 for values from (1) to (1000);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+ indrelid |   indexrelid   |  inhparent   | indisvalid |    conname    | conislocal | coninhcount | connoinherit | convalidated 
+----------+----------------+--------------+------------+---------------+------------+-------------+--------------+--------------
+ idxpart1 | idxpart1_a_idx |              | t          |               |            |             |              | 
+ idxpart1 | idxpart1_pkey  | idxpart_pkey | t          | idxpart1_pkey | f          |           1 | f            | t
+ idxpart  | idxpart_pkey   |              | t          | idxpart_pkey  | t          |           0 | t            | t
+(3 rows)
+
+drop table idxpart;
+-- Can't attach an index without a corresponding constraint
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int not null, b int);
+create unique index on idxpart1 (a);
+alter table idxpart attach partition idxpart1 for values from (1) to (1000);
+alter table only idxpart add primary key (a);
+alter index idxpart_pkey attach partition idxpart1_a_idx;	-- fail
+ERROR:  cannot attach index "idxpart1_a_idx" as a partition of index "idxpart_pkey"
+DETAIL:  The index "idxpart_pkey" belongs to a constraint in table "idxpart" but no constraint exists for index "idxpart1_a_idx".
+drop table idxpart;
+-- Test that unique constraints are working
+create table idxpart (a int, b text, primary key (a, b)) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100000);
+create table idxpart2 (c int, like idxpart);
+insert into idxpart2 (c, a, b) values (42, 572814, 'inserted first');
+alter table idxpart2 drop column c;
+create unique index on idxpart (a);
+alter table idxpart attach partition idxpart2 for values from (100000) to (1000000);
+insert into idxpart values (0, 'zero'), (42, 'life'), (2^16, 'sixteen');
+insert into idxpart select 2^g, format('two to power of %s', g) from generate_series(15, 17) g;
+ERROR:  duplicate key value violates unique constraint "idxpart1_a_idx"
+DETAIL:  Key (a)=(65536) already exists.
+insert into idxpart values (16, 'sixteen');
+insert into idxpart (b, a) values ('one', 142857), ('two', 285714);
+insert into idxpart select a * 2, b || b from idxpart where a between 2^16 and 2^19;
+ERROR:  duplicate key value violates unique constraint "idxpart2_a_idx"
+DETAIL:  Key (a)=(285714) already exists.
+insert into idxpart values (572814, 'five');
+ERROR:  duplicate key value violates unique constraint "idxpart2_a_idx"
+DETAIL:  Key (a)=(572814) already exists.
+insert into idxpart values (857142, 'six');
+select tableoid::regclass, * from idxpart order by a;
+ tableoid |   a    |       b        
+----------+--------+----------------
+ idxpart1 |      0 | zero
+ idxpart1 |     16 | sixteen
+ idxpart1 |     42 | life
+ idxpart1 |  65536 | sixteen
+ idxpart2 | 142857 | one
+ idxpart2 | 285714 | two
+ idxpart2 | 572814 | inserted first
+ idxpart2 | 857142 | six
+(8 rows)
+
+drop table idxpart;
+-- intentionally leave some objects around
+create table idxpart (a int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100);
+create table idxpart2 partition of idxpart for values from (100) to (1000)
+  partition by range (a);
+create table idxpart21 partition of idxpart2 for values from (100) to (200);
+create table idxpart22 partition of idxpart2 for values from (200) to (300);
+create index on idxpart22 (a);
+create index on only idxpart2 (a);
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+create index on idxpart (a);
+create table idxpart_another (a int, b int, primary key (a, b)) partition by range (a);
+create table idxpart_another_1 partition of idxpart_another for values from (0) to (100);
diff --git a/src/test/regress/expected/inherit.out b/src/test/regress/expected/inherit.out
index 1fa9650ec9..a79f891da7 100644
--- a/src/test/regress/expected/inherit.out
+++ b/src/test/regress/expected/inherit.out
@@ -625,6 +625,28 @@ select tableoid::regclass::text as relname, parted_tab.* from parted_tab order b
 (3 rows)
 
 drop table parted_tab;
+-- Check UPDATE with multi-level partitioned inherited target
+create table mlparted_tab (a int, b char, c text) partition by list (a);
+create table mlparted_tab_part1 partition of mlparted_tab for values in (1);
+create table mlparted_tab_part2 partition of mlparted_tab for values in (2) partition by list (b);
+create table mlparted_tab_part3 partition of mlparted_tab for values in (3);
+create table mlparted_tab_part2a partition of mlparted_tab_part2 for values in ('a');
+create table mlparted_tab_part2b partition of mlparted_tab_part2 for values in ('b');
+insert into mlparted_tab values (1, 'a'), (2, 'a'), (2, 'b'), (3, 'a');
+update mlparted_tab mlp set c = 'xxx'
+from
+  (select a from some_tab union all select a+1 from some_tab) ss (a)
+where (mlp.a = ss.a and mlp.b = 'b') or mlp.a = 3;
+select tableoid::regclass::text as relname, mlparted_tab.* from mlparted_tab order by 1,2;
+       relname       | a | b |  c  
+---------------------+---+---+-----
+ mlparted_tab_part1  | 1 | a | 
+ mlparted_tab_part2a | 2 | a | 
+ mlparted_tab_part2b | 2 | b | xxx
+ mlparted_tab_part3  | 3 | a | xxx
+(4 rows)
+
+drop table mlparted_tab;
 drop table some_tab cascade;
 NOTICE:  drop cascades to table some_tab_child
 /* Test multiple inheritance of column defaults */
@@ -1382,6 +1404,7 @@ select min(1-id) from matest0;
 
 reset enable_indexscan;
 set enable_seqscan = off;  -- plan with fewest seqscans should be merge
+set enable_parallel_append = off; -- Don't let parallel-append interfere
 explain (verbose, costs off) select * from matest0 order by 1-id;
                             QUERY PLAN                            
 ------------------------------------------------------------------
@@ -1448,6 +1471,7 @@ select min(1-id) from matest0;
 (1 row)
 
 reset enable_seqscan;
+reset enable_parallel_append;
 drop table matest0 cascade;
 NOTICE:  drop cascades to 3 other objects
 DETAIL:  drop cascades to table matest1
@@ -1831,29 +1855,34 @@ drop table range_list_parted;
 -- check that constraint exclusion is able to cope with the partition
 -- constraint emitted for multi-column range partitioned tables
 create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
-create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, 1, 1);
+create table mcrparted_def partition of mcrparted default;
+create table mcrparted0 partition of mcrparted for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
 create table mcrparted1 partition of mcrparted for values from (1, 1, 1) to (10, 5, 10);
 create table mcrparted2 partition of mcrparted for values from (10, 5, 10) to (10, 10, 10);
 create table mcrparted3 partition of mcrparted for values from (11, 1, 1) to (20, 10, 10);
 create table mcrparted4 partition of mcrparted for values from (20, 10, 10) to (20, 20, 20);
-create table mcrparted5 partition of mcrparted for values from (20, 20, 20) to (maxvalue, 0, 0);
-explain (costs off) select * from mcrparted where a = 0;	-- scans mcrparted0
-          QUERY PLAN          
-------------------------------
+create table mcrparted5 partition of mcrparted for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+explain (costs off) select * from mcrparted where a = 0;	-- scans mcrparted0, mcrparted_def
+           QUERY PLAN            
+---------------------------------
  Append
    ->  Seq Scan on mcrparted0
          Filter: (a = 0)
-(3 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: (a = 0)
+(5 rows)
 
-explain (costs off) select * from mcrparted where a = 10 and abs(b) < 5;	-- scans mcrparted1
+explain (costs off) select * from mcrparted where a = 10 and abs(b) < 5;	-- scans mcrparted1, mcrparted_def
                  QUERY PLAN                  
 ---------------------------------------------
  Append
    ->  Seq Scan on mcrparted1
          Filter: ((a = 10) AND (abs(b) < 5))
-(3 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: ((a = 10) AND (abs(b) < 5))
+(5 rows)
 
-explain (costs off) select * from mcrparted where a = 10 and abs(b) = 5;	-- scans mcrparted1, mcrparted2
+explain (costs off) select * from mcrparted where a = 10 and abs(b) = 5;	-- scans mcrparted1, mcrparted2, mcrparted_def
                  QUERY PLAN                  
 ---------------------------------------------
  Append
@@ -1861,11 +1890,13 @@ explain (costs off) select * from mcrparted where a = 10 and abs(b) = 5;	-- scan
          Filter: ((a = 10) AND (abs(b) = 5))
    ->  Seq Scan on mcrparted2
          Filter: ((a = 10) AND (abs(b) = 5))
-(5 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: ((a = 10) AND (abs(b) = 5))
+(7 rows)
 
 explain (costs off) select * from mcrparted where abs(b) = 5;	-- scans all partitions
-          QUERY PLAN          
-------------------------------
+           QUERY PLAN            
+---------------------------------
  Append
    ->  Seq Scan on mcrparted0
          Filter: (abs(b) = 5)
@@ -1877,7 +1908,9 @@ explain (costs off) select * from mcrparted where abs(b) = 5;	-- scans all parti
          Filter: (abs(b) = 5)
    ->  Seq Scan on mcrparted5
          Filter: (abs(b) = 5)
-(11 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: (abs(b) = 5)
+(13 rows)
 
 explain (costs off) select * from mcrparted where a > -1;	-- scans all partitions
              QUERY PLAN              
@@ -1895,7 +1928,9 @@ explain (costs off) select * from mcrparted where a > -1;	-- scans all partition
          Filter: (a > '-1'::integer)
    ->  Seq Scan on mcrparted5
          Filter: (a > '-1'::integer)
-(13 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: (a > '-1'::integer)
+(15 rows)
 
 explain (costs off) select * from mcrparted where a = 20 and abs(b) = 10 and c > 10;	-- scans mcrparted4
                         QUERY PLAN                         
@@ -1905,7 +1940,7 @@ explain (costs off) select * from mcrparted where a = 20 and abs(b) = 10 and c >
          Filter: ((c > 10) AND (a = 20) AND (abs(b) = 10))
 (3 rows)
 
-explain (costs off) select * from mcrparted where a = 20 and c > 20; -- scans mcrparted3, mcrparte4, mcrparte5
+explain (costs off) select * from mcrparted where a = 20 and c > 20; -- scans mcrparted3, mcrparte4, mcrparte5, mcrparted_def
                QUERY PLAN                
 -----------------------------------------
  Append
@@ -1915,7 +1950,9 @@ explain (costs off) select * from mcrparted where a = 20 and c > 20; -- scans mc
          Filter: ((c > 20) AND (a = 20))
    ->  Seq Scan on mcrparted5
          Filter: ((c > 20) AND (a = 20))
-(7 rows)
+   ->  Seq Scan on mcrparted_def
+         Filter: ((c > 20) AND (a = 20))
+(9 rows)
 
 drop table mcrparted;
 -- check that partitioned table Appends cope with being referenced in
diff --git a/src/test/regress/expected/insert.out b/src/test/regress/expected/insert.out
index a2d9469592..dcbaad8e2f 100644
--- a/src/test/regress/expected/insert.out
+++ b/src/test/regress/expected/insert.out
@@ -165,6 +165,10 @@ create table range_parted (
 	a text,
 	b int
 ) partition by range (a, (b+0));
+-- no partitions, so fail
+insert into range_parted values ('a', 11);
+ERROR:  no partition of relation "range_parted" found for row
+DETAIL:  Partition key of the failing row contains (a, (b + 0)) = (a, 11).
 create table part1 partition of range_parted for values from ('a', 1) to ('a', 10);
 create table part2 partition of range_parted for values from ('a', 10) to ('a', 20);
 create table part3 partition of range_parted for values from ('b', 1) to ('b', 10);
@@ -219,17 +223,63 @@ insert into part_null values (null, 0);
 create table part_ee_ff partition of list_parted for values in ('ee', 'ff') partition by range (b);
 create table part_ee_ff1 partition of part_ee_ff for values from (1) to (10);
 create table part_ee_ff2 partition of part_ee_ff for values from (10) to (20);
+-- test default partition
+create table part_default partition of list_parted default;
+-- Negative test: a row, which would fit in other partition, does not fit
+-- default partition, even when inserted directly
+insert into part_default values ('aa', 2);
+ERROR:  new row for relation "part_default" violates partition constraint
+DETAIL:  Failing row contains (aa, 2).
+insert into part_default values (null, 2);
+ERROR:  new row for relation "part_default" violates partition constraint
+DETAIL:  Failing row contains (null, 2).
+-- ok
+insert into part_default values ('Zz', 2);
+-- test if default partition works as expected for multi-level partitioned
+-- table as well as when default partition itself is further partitioned
+drop table part_default;
+create table part_xx_yy partition of list_parted for values in ('xx', 'yy') partition by list (a);
+create table part_xx_yy_p1 partition of part_xx_yy for values in ('xx');
+create table part_xx_yy_defpart partition of part_xx_yy default;
+create table part_default partition of list_parted default partition by range(b);
+create table part_default_p1 partition of part_default for values from (20) to (30);
+create table part_default_p2 partition of part_default for values from (30) to (40);
 -- fail
 insert into part_ee_ff1 values ('EE', 11);
 ERROR:  new row for relation "part_ee_ff1" violates partition constraint
 DETAIL:  Failing row contains (EE, 11).
+insert into part_default_p2 values ('gg', 43);
+ERROR:  new row for relation "part_default_p2" violates partition constraint
+DETAIL:  Failing row contains (gg, 43).
 -- fail (even the parent's, ie, part_ee_ff's partition constraint applies)
 insert into part_ee_ff1 values ('cc', 1);
 ERROR:  new row for relation "part_ee_ff1" violates partition constraint
 DETAIL:  Failing row contains (cc, 1).
+insert into part_default values ('gg', 43);
+ERROR:  no partition of relation "part_default" found for row
+DETAIL:  Partition key of the failing row contains (b) = (43).
 -- ok
 insert into part_ee_ff1 values ('ff', 1);
 insert into part_ee_ff2 values ('ff', 11);
+insert into part_default_p1 values ('cd', 25);
+insert into part_default_p2 values ('de', 35);
+insert into list_parted values ('ab', 21);
+insert into list_parted values ('xx', 1);
+insert into list_parted values ('yy', 2);
+select tableoid::regclass, * from list_parted;
+      tableoid      | a  | b  
+--------------------+----+----
+ part_cc_dd         | cC |  1
+ part_ee_ff1        | ff |  1
+ part_ee_ff2        | ff | 11
+ part_xx_yy_p1      | xx |  1
+ part_xx_yy_defpart | yy |  2
+ part_null          |    |  0
+ part_default_p1    | cd | 25
+ part_default_p1    | ab | 21
+ part_default_p2    | de | 35
+(9 rows)
+
 -- Check tuple routing for partitioned tables
 -- fail
 insert into range_parted values ('a', 0);
@@ -249,6 +299,18 @@ insert into range_parted values ('b', 10);
 insert into range_parted values ('a');
 ERROR:  no partition of relation "range_parted" found for row
 DETAIL:  Partition key of the failing row contains (a, (b + 0)) = (a, null).
+-- Check default partition
+create table part_def partition of range_parted default;
+-- fail
+insert into part_def values ('b', 10);
+ERROR:  new row for relation "part_def" violates partition constraint
+DETAIL:  Failing row contains (b, 10).
+-- ok
+insert into part_def values ('c', 10);
+insert into range_parted values (null, null);
+insert into range_parted values ('a', null);
+insert into range_parted values (null, 19);
+insert into range_parted values ('b', 20);
 select tableoid::regclass, * from range_parted;
  tableoid | a | b  
 ----------+---+----
@@ -258,7 +320,12 @@ select tableoid::regclass, * from range_parted;
  part3    | b |  1
  part4    | b | 10
  part4    | b | 10
-(6 rows)
+ part_def | c | 10
+ part_def |   |   
+ part_def | a |   
+ part_def |   | 19
+ part_def | b | 20
+(11 rows)
 
 -- ok
 insert into list_parted values (null, 1);
@@ -274,17 +341,22 @@ DETAIL:  Partition key of the failing row contains (b) = (0).
 insert into list_parted values ('EE', 1);
 insert into part_ee_ff values ('EE', 10);
 select tableoid::regclass, * from list_parted;
-  tableoid   | a  | b  
--------------+----+----
- part_aa_bb  | aA |   
- part_cc_dd  | cC |  1
- part_null   |    |  0
- part_null   |    |  1
- part_ee_ff1 | ff |  1
- part_ee_ff1 | EE |  1
- part_ee_ff2 | ff | 11
- part_ee_ff2 | EE | 10
-(8 rows)
+      tableoid      | a  | b  
+--------------------+----+----
+ part_aa_bb         | aA |   
+ part_cc_dd         | cC |  1
+ part_ee_ff1        | ff |  1
+ part_ee_ff1        | EE |  1
+ part_ee_ff2        | ff | 11
+ part_ee_ff2        | EE | 10
+ part_xx_yy_p1      | xx |  1
+ part_xx_yy_defpart | yy |  2
+ part_null          |    |  0
+ part_null          |    |  1
+ part_default_p1    | cd | 25
+ part_default_p1    | ab | 21
+ part_default_p2    | de | 35
+(13 rows)
 
 -- some more tests to exercise tuple-routing with multi-level partitioning
 create table part_gg partition of list_parted for values in ('gg') partition by range (b);
@@ -314,8 +386,96 @@ select tableoid::regclass::text, a, min(b) as min_b, max(b) as max_b from list_p
  part_null     |    |     1 |     1
 (9 rows)
 
+-- direct partition inserts should check hash partition bound constraint
+-- create custom operator class and hash function, for the same reason
+-- explained in alter_table.sql
+create or replace function dummy_hashint4(a int4, seed int8) returns int8 as
+$$ begin return (a + seed); end; $$ language 'plpgsql' immutable;
+create operator class custom_opclass for type int4 using hash as
+operator 1 = , function 2 dummy_hashint4(int4, int8);
+create table hash_parted (
+	a int
+) partition by hash (a custom_opclass);
+create table hpart0 partition of hash_parted for values with (modulus 4, remainder 0);
+create table hpart1 partition of hash_parted for values with (modulus 4, remainder 1);
+create table hpart2 partition of hash_parted for values with (modulus 4, remainder 2);
+create table hpart3 partition of hash_parted for values with (modulus 4, remainder 3);
+insert into hash_parted values(generate_series(1,10));
+-- direct insert of values divisible by 4 - ok;
+insert into hpart0 values(12),(16);
+-- fail;
+insert into hpart0 values(11);
+ERROR:  new row for relation "hpart0" violates partition constraint
+DETAIL:  Failing row contains (11).
+-- 11 % 4 -> 3 remainder i.e. valid data for hpart3 partition
+insert into hpart3 values(11);
+-- view data
+select tableoid::regclass as part, a, a%4 as "remainder = a % 4"
+from hash_parted order by part;
+  part  | a  | remainder = a % 4 
+--------+----+-------------------
+ hpart0 |  4 |                 0
+ hpart0 |  8 |                 0
+ hpart0 | 12 |                 0
+ hpart0 | 16 |                 0
+ hpart1 |  1 |                 1
+ hpart1 |  5 |                 1
+ hpart1 |  9 |                 1
+ hpart2 |  2 |                 2
+ hpart2 |  6 |                 2
+ hpart2 | 10 |                 2
+ hpart3 |  3 |                 3
+ hpart3 |  7 |                 3
+ hpart3 | 11 |                 3
+(13 rows)
+
+-- test \d+ output on a table which has both partitioned and unpartitioned
+-- partitions
+\d+ list_parted
+                                Table "public.list_parted"
+ Column |  Type   | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+---------+-----------+----------+---------+----------+--------------+-------------
+ a      | text    |           |          |         | extended |              | 
+ b      | integer |           |          |         | plain    |              | 
+Partition key: LIST (lower(a))
+Partitions: part_aa_bb FOR VALUES IN ('aa', 'bb'),
+            part_cc_dd FOR VALUES IN ('cc', 'dd'),
+            part_ee_ff FOR VALUES IN ('ee', 'ff'), PARTITIONED,
+            part_gg FOR VALUES IN ('gg'), PARTITIONED,
+            part_null FOR VALUES IN (NULL),
+            part_xx_yy FOR VALUES IN ('xx', 'yy'), PARTITIONED,
+            part_default DEFAULT, PARTITIONED
+
 -- cleanup
 drop table range_parted, list_parted;
+drop table hash_parted;
+drop operator class custom_opclass using hash;
+drop function dummy_hashint4(a int4, seed int8);
+-- test that a default partition added as the first partition accepts any value
+-- including null
+create table list_parted (a int) partition by list (a);
+create table part_default partition of list_parted default;
+\d+ part_default
+                               Table "public.part_default"
+ Column |  Type   | Collation | Nullable | Default | Storage | Stats target | Description 
+--------+---------+-----------+----------+---------+---------+--------------+-------------
+ a      | integer |           |          |         | plain   |              | 
+Partition of: list_parted DEFAULT
+No partition constraint
+
+insert into part_default values (null);
+insert into part_default values (1);
+insert into part_default values (-1);
+select tableoid::regclass, a from list_parted;
+   tableoid   | a  
+--------------+----
+ part_default |   
+ part_default |  1
+ part_default | -1
+(3 rows)
+
+-- cleanup
+drop table list_parted;
 -- more tests for certain multi-level partitioning scenarios
 create table mlparted (a int, b int) partition by range (a, b);
 create table mlparted1 (b int not null, a int not null) partition by range ((b+0));
@@ -425,6 +585,36 @@ insert into mlparted5 (a, b, c) values (1, 40, 'a');
 ERROR:  new row for relation "mlparted5a" violates partition constraint
 DETAIL:  Failing row contains (b, 1, 40).
 drop table mlparted5;
+alter table mlparted drop constraint check_b;
+-- Check multi-level default partition
+create table mlparted_def partition of mlparted default partition by range(a);
+create table mlparted_def1 partition of mlparted_def for values from (40) to (50);
+create table mlparted_def2 partition of mlparted_def for values from (50) to (60);
+insert into mlparted values (40, 100);
+insert into mlparted_def1 values (42, 100);
+insert into mlparted_def2 values (54, 50);
+-- fail
+insert into mlparted values (70, 100);
+ERROR:  no partition of relation "mlparted_def" found for row
+DETAIL:  Partition key of the failing row contains (a) = (70).
+insert into mlparted_def1 values (52, 50);
+ERROR:  new row for relation "mlparted_def1" violates partition constraint
+DETAIL:  Failing row contains (52, 50, null).
+insert into mlparted_def2 values (34, 50);
+ERROR:  new row for relation "mlparted_def2" violates partition constraint
+DETAIL:  Failing row contains (34, 50, null).
+-- ok
+create table mlparted_defd partition of mlparted_def default;
+insert into mlparted values (70, 100);
+select tableoid::regclass, * from mlparted_def;
+   tableoid    | a  |  b  | c 
+---------------+----+-----+---
+ mlparted_def1 | 40 | 100 | 
+ mlparted_def1 | 42 | 100 | 
+ mlparted_def2 | 54 |  50 | 
+ mlparted_defd | 70 | 100 | 
+(4 rows)
+
 -- check that message shown after failure to find a partition shows the
 -- appropriate key description (or none) in various situations
 create table key_desc (a int, b int) partition by list ((a+0));
@@ -451,15 +641,32 @@ revoke all on key_desc from someone_else;
 revoke all on key_desc_1 from someone_else;
 drop role someone_else;
 drop table key_desc, key_desc_1;
+-- test minvalue/maxvalue restrictions
+create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
+create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, maxvalue, maxvalue);
+ERROR:  every bound following MINVALUE must also be MINVALUE
+LINE 1: ...partition of mcrparted for values from (minvalue, 0, 0) to (...
+                                                             ^
+create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, minvalue);
+ERROR:  every bound following MAXVALUE must also be MAXVALUE
+LINE 1: ...r values from (10, 6, minvalue) to (10, maxvalue, minvalue);
+                                                             ^
+create table mcrparted4 partition of mcrparted for values from (21, minvalue, 0) to (30, 20, minvalue);
+ERROR:  every bound following MINVALUE must also be MINVALUE
+LINE 1: ...ition of mcrparted for values from (21, minvalue, 0) to (30,...
+                                                             ^
 -- check multi-column range partitioning expression enforces the same
 -- constraint as what tuple-routing would determine it to be
-create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
-create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, maxvalue, 0);
+create table mcrparted0 partition of mcrparted for values from (minvalue, minvalue, minvalue) to (1, maxvalue, maxvalue);
 create table mcrparted1 partition of mcrparted for values from (2, 1, minvalue) to (10, 5, 10);
-create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, 0);
+create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, maxvalue);
 create table mcrparted3 partition of mcrparted for values from (11, 1, 1) to (20, 10, 10);
-create table mcrparted4 partition of mcrparted for values from (21, minvalue, 0) to (30, 20, maxvalue);
-create table mcrparted5 partition of mcrparted for values from (30, 21, 20) to (maxvalue, 0, 0);
+create table mcrparted4 partition of mcrparted for values from (21, minvalue, minvalue) to (30, 20, maxvalue);
+create table mcrparted5 partition of mcrparted for values from (30, 21, 20) to (maxvalue, maxvalue, maxvalue);
+-- null not allowed in range partition
+insert into mcrparted values (null, null, null);
+ERROR:  no partition of relation "mcrparted" found for row
+DETAIL:  Partition key of the failing row contains (a, abs(b), c) = (null, null, null).
 -- routed to mcrparted0
 insert into mcrparted values (0, 1, 1);
 insert into mcrparted0 values (0, 1, 1);
@@ -543,14 +750,14 @@ drop table brtrigpartcon;
 drop function brtrigpartcon1trigf();
 -- check multi-column range partitioning with minvalue/maxvalue constraints
 create table mcrparted (a text, b int) partition by range(a, b);
-create table mcrparted1_lt_b partition of mcrparted for values from (minvalue, 0) to ('b', minvalue);
+create table mcrparted1_lt_b partition of mcrparted for values from (minvalue, minvalue) to ('b', minvalue);
 create table mcrparted2_b partition of mcrparted for values from ('b', minvalue) to ('c', minvalue);
 create table mcrparted3_c_to_common partition of mcrparted for values from ('c', minvalue) to ('common', minvalue);
 create table mcrparted4_common_lt_0 partition of mcrparted for values from ('common', minvalue) to ('common', 0);
 create table mcrparted5_common_0_to_10 partition of mcrparted for values from ('common', 0) to ('common', 10);
 create table mcrparted6_common_ge_10 partition of mcrparted for values from ('common', 10) to ('common', maxvalue);
 create table mcrparted7_gt_common_lt_d partition of mcrparted for values from ('common', maxvalue) to ('d', minvalue);
-create table mcrparted8_ge_d partition of mcrparted for values from ('d', minvalue) to (maxvalue, 0);
+create table mcrparted8_ge_d partition of mcrparted for values from ('d', minvalue) to (maxvalue, maxvalue);
 \d+ mcrparted
                                  Table "public.mcrparted"
  Column |  Type   | Collation | Nullable | Default | Storage  | Stats target | Description 
@@ -558,14 +765,14 @@ create table mcrparted8_ge_d partition of mcrparted for values from ('d', minval
  a      | text    |           |          |         | extended |              | 
  b      | integer |           |          |         | plain    |              | 
 Partition key: RANGE (a, b)
-Partitions: mcrparted1_lt_b FOR VALUES FROM (MINVALUE, 0) TO ('b', MINVALUE),
+Partitions: mcrparted1_lt_b FOR VALUES FROM (MINVALUE, MINVALUE) TO ('b', MINVALUE),
             mcrparted2_b FOR VALUES FROM ('b', MINVALUE) TO ('c', MINVALUE),
             mcrparted3_c_to_common FOR VALUES FROM ('c', MINVALUE) TO ('common', MINVALUE),
             mcrparted4_common_lt_0 FOR VALUES FROM ('common', MINVALUE) TO ('common', 0),
             mcrparted5_common_0_to_10 FOR VALUES FROM ('common', 0) TO ('common', 10),
             mcrparted6_common_ge_10 FOR VALUES FROM ('common', 10) TO ('common', MAXVALUE),
             mcrparted7_gt_common_lt_d FOR VALUES FROM ('common', MAXVALUE) TO ('d', MINVALUE),
-            mcrparted8_ge_d FOR VALUES FROM ('d', MINVALUE) TO (MAXVALUE, 0)
+            mcrparted8_ge_d FOR VALUES FROM ('d', MINVALUE) TO (MAXVALUE, MAXVALUE)
 
 \d+ mcrparted1_lt_b
                               Table "public.mcrparted1_lt_b"
@@ -573,7 +780,7 @@ Partitions: mcrparted1_lt_b FOR VALUES FROM (MINVALUE, 0) TO ('b', MINVALUE),
 --------+---------+-----------+----------+---------+----------+--------------+-------------
  a      | text    |           |          |         | extended |              | 
  b      | integer |           |          |         | plain    |              | 
-Partition of: mcrparted FOR VALUES FROM (MINVALUE, 0) TO ('b', MINVALUE)
+Partition of: mcrparted FOR VALUES FROM (MINVALUE, MINVALUE) TO ('b', MINVALUE)
 Partition constraint: ((a IS NOT NULL) AND (b IS NOT NULL) AND (a < 'b'::text))
 
 \d+ mcrparted2_b
@@ -636,7 +843,7 @@ Partition constraint: ((a IS NOT NULL) AND (b IS NOT NULL) AND (a > 'common'::te
 --------+---------+-----------+----------+---------+----------+--------------+-------------
  a      | text    |           |          |         | extended |              | 
  b      | integer |           |          |         | plain    |              | 
-Partition of: mcrparted FOR VALUES FROM ('d', MINVALUE) TO (MAXVALUE, 0)
+Partition of: mcrparted FOR VALUES FROM ('d', MINVALUE) TO (MAXVALUE, MAXVALUE)
 Partition constraint: ((a IS NOT NULL) AND (b IS NOT NULL) AND (a >= 'd'::text))
 
 insert into mcrparted values ('aaa', 0), ('b', 0), ('bz', 10), ('c', -10),
diff --git a/src/test/regress/expected/insert_conflict.out b/src/test/regress/expected/insert_conflict.out
index 8d005fddd4..2650faedee 100644
--- a/src/test/regress/expected/insert_conflict.out
+++ b/src/test/regress/expected/insert_conflict.out
@@ -786,3 +786,16 @@ select * from selfconflict;
 (3 rows)
 
 drop table selfconflict;
+-- check that the following works:
+-- insert into partitioned_table on conflict do nothing
+create table parted_conflict_test (a int, b char) partition by list (a);
+create table parted_conflict_test_1 partition of parted_conflict_test (b unique) for values in (1);
+insert into parted_conflict_test values (1, 'a') on conflict do nothing;
+insert into parted_conflict_test values (1, 'a') on conflict do nothing;
+-- however, on conflict do update is not supported yet
+insert into parted_conflict_test values (1) on conflict (b) do update set a = excluded.a;
+ERROR:  ON CONFLICT DO UPDATE cannot be applied to partitioned table "parted_conflict_test"
+-- but it works OK if we target the partition directly
+insert into parted_conflict_test_1 values (1) on conflict (b) do
+update set a = excluded.a;
+drop table parted_conflict_test;
diff --git a/src/test/regress/expected/join.out b/src/test/regress/expected/join.out
index 9f4c88dab4..4d5931d67e 100644
--- a/src/test/regress/expected/join.out
+++ b/src/test/regress/expected/join.out
@@ -1845,6 +1845,28 @@ SELECT '' AS "xxx", *
      | 1 | 4 | one | -1
 (1 row)
 
+--
+-- semijoin selectivity for <>
+--
+explain (costs off)
+select * from int4_tbl i4, tenk1 a
+where exists(select * from tenk1 b
+             where a.twothousand = b.twothousand and a.fivethous <> b.fivethous)
+      and i4.f1 = a.tenthous;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Semi Join
+   Hash Cond: (a.twothousand = b.twothousand)
+   Join Filter: (a.fivethous <> b.fivethous)
+   ->  Hash Join
+         Hash Cond: (a.tenthous = i4.f1)
+         ->  Seq Scan on tenk1 a
+         ->  Hash
+               ->  Seq Scan on int4_tbl i4
+   ->  Hash
+         ->  Seq Scan on tenk1 b
+(10 rows)
+
 --
 -- More complicated constructs
 --
@@ -2268,6 +2290,86 @@ where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
 ----+----+----------+----------
 (0 rows)
 
+--
+-- check a case where we formerly got confused by conflicting sort orders
+-- in redundant merge join path keys
+--
+explain (costs off)
+select * from
+  j1_tbl full join
+  (select * from j2_tbl order by j2_tbl.i desc, j2_tbl.k asc) j2_tbl
+  on j1_tbl.i = j2_tbl.i and j1_tbl.i = j2_tbl.k;
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Merge Full Join
+   Merge Cond: ((j2_tbl.i = j1_tbl.i) AND (j2_tbl.k = j1_tbl.i))
+   ->  Sort
+         Sort Key: j2_tbl.i DESC, j2_tbl.k
+         ->  Seq Scan on j2_tbl
+   ->  Sort
+         Sort Key: j1_tbl.i DESC
+         ->  Seq Scan on j1_tbl
+(8 rows)
+
+select * from
+  j1_tbl full join
+  (select * from j2_tbl order by j2_tbl.i desc, j2_tbl.k asc) j2_tbl
+  on j1_tbl.i = j2_tbl.i and j1_tbl.i = j2_tbl.k;
+ i | j |   t   | i | k  
+---+---+-------+---+----
+   |   |       |   |  0
+   |   |       |   |   
+   | 0 | zero  |   |   
+   |   | null  |   |   
+ 8 | 8 | eight |   |   
+ 7 | 7 | seven |   |   
+ 6 | 6 | six   |   |   
+   |   |       | 5 | -5
+   |   |       | 5 | -5
+ 5 | 0 | five  |   |   
+ 4 | 1 | four  |   |   
+   |   |       | 3 | -3
+ 3 | 2 | three |   |   
+ 2 | 3 | two   | 2 |  2
+   |   |       | 2 |  4
+   |   |       | 1 | -1
+   |   |       | 0 |   
+ 1 | 4 | one   |   |   
+ 0 |   | zero  |   |   
+(19 rows)
+
+--
+-- a different check for handling of redundant sort keys in merge joins
+--
+explain (costs off)
+select count(*) from
+  (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x
+  left join
+  (select * from tenk1 y order by y.unique2) y
+  on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Aggregate
+   ->  Merge Left Join
+         Merge Cond: (x.thousand = y.unique2)
+         Join Filter: ((x.twothousand = y.hundred) AND (x.fivethous = y.unique2))
+         ->  Sort
+               Sort Key: x.thousand, x.twothousand, x.fivethous
+               ->  Seq Scan on tenk1 x
+         ->  Materialize
+               ->  Index Scan using tenk1_unique2 on tenk1 y
+(9 rows)
+
+select count(*) from
+  (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x
+  left join
+  (select * from tenk1 y order by y.unique2) y
+  on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
+ count 
+-------
+ 10000
+(1 row)
+
 --
 -- Clean up
 --
@@ -4060,6 +4162,18 @@ select i8.* from int8_tbl i8 left join (select f1 from int4_tbl group by f1) i4
  Seq Scan on int8_tbl i8
 (1 row)
 
+-- check join removal with lateral references
+explain (costs off)
+select 1 from (select a.id FROM a left join b on a.b_id = b.id) q,
+			  lateral generate_series(1, q.id) gs(i) where q.id = gs.i;
+                QUERY PLAN                 
+-------------------------------------------
+ Nested Loop
+   ->  Seq Scan on a
+   ->  Function Scan on generate_series gs
+         Filter: (a.id = i)
+(4 rows)
+
 rollback;
 create temp table parent (k int primary key, pd int);
 create temp table child (k int unique, cd int);
@@ -5154,6 +5268,25 @@ select * from
          Output: 3
 (11 rows)
 
+-- check handling of nested appendrels inside LATERAL
+select * from
+  ((select 2 as v) union all (select 3 as v)) as q1
+  cross join lateral
+  ((select * from
+      ((select 4 as v) union all (select 5 as v)) as q3)
+   union all
+   (select q1.v)
+  ) as q2;
+ v | v 
+---+---
+ 2 | 4
+ 2 | 5
+ 2 | 2
+ 3 | 4
+ 3 | 5
+ 3 | 3
+(6 rows)
+
 -- check we don't try to do a unique-ified semijoin with LATERAL
 explain (verbose, costs off)
 select * from
@@ -5328,6 +5461,59 @@ LINE 1: ...xx1 using lateral (select * from int4_tbl where f1 = x1) ss;
                                                                 ^
 HINT:  There is an entry for table "xx1", but it cannot be referenced from this part of the query.
 --
+-- test LATERAL reference propagation down a multi-level inheritance hierarchy
+-- produced for a multi-level partitioned table hierarchy.
+--
+create table pt1 (a int, b int, c varchar) partition by range(a);
+create table pt1p1 partition of pt1 for values from (0) to (100) partition by range(b);
+create table pt1p2 partition of pt1 for values from (100) to (200);
+create table pt1p1p1 partition of pt1p1 for values from (0) to (100);
+insert into pt1 values (1, 1, 'x'), (101, 101, 'y');
+create table ut1 (a int, b int, c varchar);
+insert into ut1 values (101, 101, 'y'), (2, 2, 'z');
+explain (verbose, costs off)
+select t1.b, ss.phv from ut1 t1 left join lateral
+              (select t2.a as t2a, t3.a t3a, least(t1.a, t2.a, t3.a) phv
+					  from pt1 t2 join ut1 t3 on t2.a = t3.b) ss
+              on t1.a = ss.t2a order by t1.a;
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Sort
+   Output: t1.b, (LEAST(t1.a, t2.a, t3.a)), t1.a
+   Sort Key: t1.a
+   ->  Nested Loop Left Join
+         Output: t1.b, (LEAST(t1.a, t2.a, t3.a)), t1.a
+         ->  Seq Scan on public.ut1 t1
+               Output: t1.a, t1.b, t1.c
+         ->  Hash Join
+               Output: t2.a, LEAST(t1.a, t2.a, t3.a)
+               Hash Cond: (t3.b = t2.a)
+               ->  Seq Scan on public.ut1 t3
+                     Output: t3.a, t3.b, t3.c
+               ->  Hash
+                     Output: t2.a
+                     ->  Append
+                           ->  Seq Scan on public.pt1p1p1 t2
+                                 Output: t2.a
+                                 Filter: (t1.a = t2.a)
+                           ->  Seq Scan on public.pt1p2 t2_1
+                                 Output: t2_1.a
+                                 Filter: (t1.a = t2_1.a)
+(21 rows)
+
+select t1.b, ss.phv from ut1 t1 left join lateral
+              (select t2.a as t2a, t3.a t3a, least(t1.a, t2.a, t3.a) phv
+					  from pt1 t2 join ut1 t3 on t2.a = t3.b) ss
+              on t1.a = ss.t2a order by t1.a;
+  b  | phv 
+-----+-----
+   2 |    
+ 101 | 101
+(2 rows)
+
+drop table pt1;
+drop table ut1;
+--
 -- test that foreign key join estimation performs sanely for outer joins
 --
 begin;
@@ -5720,3 +5906,883 @@ where exists (select 1 from j3
 (13 rows)
 
 drop table j3;
+--
+-- exercises for the hash join code
+--
+begin;
+set local min_parallel_table_scan_size = 0;
+set local parallel_setup_cost = 0;
+-- Extract bucket and batch counts from an explain analyze plan.  In
+-- general we can't make assertions about how many batches (or
+-- buckets) will be required because it can vary, but we can in some
+-- special cases and we can check for growth.
+create or replace function find_hash(node json)
+returns json language plpgsql
+as
+$$
+declare
+  x json;
+  child json;
+begin
+  if node->>'Node Type' = 'Hash' then
+    return node;
+  else
+    for child in select json_array_elements(node->'Plans')
+    loop
+      x := find_hash(child);
+      if x is not null then
+        return x;
+      end if;
+    end loop;
+    return null;
+  end if;
+end;
+$$;
+create or replace function hash_join_batches(query text)
+returns table (original int, final int) language plpgsql
+as
+$$
+declare
+  whole_plan json;
+  hash_node json;
+begin
+  for whole_plan in
+    execute 'explain (analyze, format ''json'') ' || query
+  loop
+    hash_node := find_hash(json_extract_path(whole_plan, '0', 'Plan'));
+    original := hash_node->>'Original Hash Batches';
+    final := hash_node->>'Hash Batches';
+    return next;
+  end loop;
+end;
+$$;
+-- Make a simple relation with well distributed keys and correctly
+-- estimated size.
+create table simple as
+  select generate_series(1, 20000) AS id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+alter table simple set (parallel_workers = 2);
+analyze simple;
+-- Make a relation whose size we will under-estimate.  We want stats
+-- to say 1000 rows, but actually there are 20,000 rows.
+create table bigger_than_it_looks as
+  select generate_series(1, 20000) as id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+alter table bigger_than_it_looks set (autovacuum_enabled = 'false');
+alter table bigger_than_it_looks set (parallel_workers = 2);
+analyze bigger_than_it_looks;
+update pg_class set reltuples = 1000 where relname = 'bigger_than_it_looks';
+-- Make a relation whose size we underestimate and that also has a
+-- kind of skew that breaks our batching scheme.  We want stats to say
+-- 2 rows, but actually there are 20,000 rows with the same key.
+create table extremely_skewed (id int, t text);
+alter table extremely_skewed set (autovacuum_enabled = 'false');
+alter table extremely_skewed set (parallel_workers = 2);
+analyze extremely_skewed;
+insert into extremely_skewed
+  select 42 as id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+  from generate_series(1, 20000);
+update pg_class
+  set reltuples = 2, relpages = pg_relation_size('extremely_skewed') / 8192
+  where relname = 'extremely_skewed';
+-- Make a relation with a couple of enormous tuples.
+create table wide as select generate_series(1, 2) as id, rpad('', 320000, 'x') as t;
+alter table wide set (parallel_workers = 2);
+-- The "optimal" case: the hash table fits in memory; we plan for 1
+-- batch, we stick to that number, and peak memory usage stays within
+-- our work_mem budget
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '4MB';
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on simple s
+(6 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | f
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Hash
+                           ->  Seq Scan on simple s
+(9 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | f
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Parallel Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on simple s
+(9 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | f
+(1 row)
+
+rollback to settings;
+-- The "good" case: batches required, but we plan the right number; we
+-- plan for some number of batches, and we stick to that number, and
+-- peak memory usage says within our work_mem budget
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on simple s
+(6 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ t                    | f
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Hash
+                           ->  Seq Scan on simple s
+(9 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ t                    | f
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '192kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Parallel Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on simple s
+(9 rows)
+
+select count(*) from simple r join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ t                    | f
+(1 row)
+
+rollback to settings;
+-- The "bad" case: during execution we need to increase number of
+-- batches; in this case we plan for 1 batch, and increase at least a
+-- couple of times, and peak memory usage stays within our work_mem
+-- budget
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+                      QUERY PLAN                      
+------------------------------------------------------
+ Aggregate
+   ->  Hash Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on bigger_than_it_looks s
+(6 rows)
+
+select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | t
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Hash
+                           ->  Seq Scan on bigger_than_it_looks s
+(9 rows)
+
+select count(*) from simple r join bigger_than_it_looks s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | t
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 1;
+set local work_mem = '192kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 1
+         ->  Partial Aggregate
+               ->  Parallel Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on bigger_than_it_looks s
+(9 rows)
+
+select count(*) from simple r join bigger_than_it_looks s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+$$);
+ initially_multibatch | increased_batches 
+----------------------+-------------------
+ f                    | t
+(1 row)
+
+rollback to settings;
+-- The "ugly" case: increasing the number of batches during execution
+-- doesn't help, so stop trying to fit in work_mem and hope for the
+-- best; in this case we plan for 1 batch, increases just once and
+-- then stop increasing because that didn't help at all, so we blow
+-- right through the work_mem budget and hope for the best...
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+                    QUERY PLAN                    
+--------------------------------------------------
+ Aggregate
+   ->  Hash Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on extremely_skewed s
+(6 rows)
+
+select count(*) from simple r join extremely_skewed s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+ original | final 
+----------+-------
+        1 |     2
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Hash Join
+               Hash Cond: (r.id = s.id)
+               ->  Parallel Seq Scan on simple r
+               ->  Hash
+                     ->  Seq Scan on extremely_skewed s
+(8 rows)
+
+select count(*) from simple r join extremely_skewed s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+ original | final 
+----------+-------
+        1 |     2
+(1 row)
+
+rollback to settings;
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 1;
+set local work_mem = '128kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+                              QUERY PLAN                               
+-----------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 1
+         ->  Partial Aggregate
+               ->  Parallel Hash Join
+                     Hash Cond: (r.id = s.id)
+                     ->  Parallel Seq Scan on simple r
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on extremely_skewed s
+(9 rows)
+
+select count(*) from simple r join extremely_skewed s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+ original | final 
+----------+-------
+        1 |     4
+(1 row)
+
+rollback to settings;
+-- A couple of other hash join tests unrelated to work_mem management.
+-- Check that EXPLAIN ANALYZE has data even if the leader doesn't participate
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local parallel_leader_participation = off;
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+ original | final 
+----------+-------
+        1 |     1
+(1 row)
+
+rollback to settings;
+-- Exercise rescans.  We'll turn off parallel_leader_participation so
+-- that we can check that instrumentation comes back correctly.
+create table foo as select generate_series(1, 3) as id, 'xxxxx'::text as t;
+alter table foo set (parallel_workers = 0);
+create table bar as select generate_series(1, 10000) as id, 'xxxxx'::text as t;
+alter table bar set (parallel_workers = 2);
+-- multi-batch with rescan, parallel-oblivious
+savepoint settings;
+set enable_parallel_hash = off;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '64kB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Aggregate
+   ->  Nested Loop Left Join
+         Join Filter: ((foo.id < (b1.id + 1)) AND (foo.id > (b1.id - 1)))
+         ->  Seq Scan on foo
+         ->  Gather
+               Workers Planned: 2
+               ->  Hash Join
+                     Hash Cond: (b1.id = b2.id)
+                     ->  Parallel Seq Scan on bar b1
+                     ->  Hash
+                           ->  Seq Scan on bar b2
+(11 rows)
+
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+ count 
+-------
+     3
+(1 row)
+
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+ multibatch 
+------------
+ t
+(1 row)
+
+rollback to settings;
+-- single-batch with rescan, parallel-oblivious
+savepoint settings;
+set enable_parallel_hash = off;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '4MB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Aggregate
+   ->  Nested Loop Left Join
+         Join Filter: ((foo.id < (b1.id + 1)) AND (foo.id > (b1.id - 1)))
+         ->  Seq Scan on foo
+         ->  Gather
+               Workers Planned: 2
+               ->  Hash Join
+                     Hash Cond: (b1.id = b2.id)
+                     ->  Parallel Seq Scan on bar b1
+                     ->  Hash
+                           ->  Seq Scan on bar b2
+(11 rows)
+
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+ count 
+-------
+     3
+(1 row)
+
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+ multibatch 
+------------
+ f
+(1 row)
+
+rollback to settings;
+-- multi-batch with rescan, parallel-aware
+savepoint settings;
+set enable_parallel_hash = on;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '64kB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Aggregate
+   ->  Nested Loop Left Join
+         Join Filter: ((foo.id < (b1.id + 1)) AND (foo.id > (b1.id - 1)))
+         ->  Seq Scan on foo
+         ->  Gather
+               Workers Planned: 2
+               ->  Parallel Hash Join
+                     Hash Cond: (b1.id = b2.id)
+                     ->  Parallel Seq Scan on bar b1
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on bar b2
+(11 rows)
+
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+ count 
+-------
+     3
+(1 row)
+
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+ multibatch 
+------------
+ t
+(1 row)
+
+rollback to settings;
+-- single-batch with rescan, parallel-aware
+savepoint settings;
+set enable_parallel_hash = on;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '4MB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Aggregate
+   ->  Nested Loop Left Join
+         Join Filter: ((foo.id < (b1.id + 1)) AND (foo.id > (b1.id - 1)))
+         ->  Seq Scan on foo
+         ->  Gather
+               Workers Planned: 2
+               ->  Parallel Hash Join
+                     Hash Cond: (b1.id = b2.id)
+                     ->  Parallel Seq Scan on bar b1
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on bar b2
+(11 rows)
+
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+ count 
+-------
+     3
+(1 row)
+
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+ multibatch 
+------------
+ f
+(1 row)
+
+rollback to settings;
+-- A full outer join where every record is matched.
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s using (id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Full Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on simple s
+(6 rows)
+
+select  count(*) from simple r full outer join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+rollback to settings;
+-- parallelism not possible with parallel-oblivious outer hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s using (id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Full Join
+         Hash Cond: (r.id = s.id)
+         ->  Seq Scan on simple r
+         ->  Hash
+               ->  Seq Scan on simple s
+(6 rows)
+
+select  count(*) from simple r full outer join simple s using (id);
+ count 
+-------
+ 20000
+(1 row)
+
+rollback to settings;
+-- An full outer join where every record is not matched.
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Full Join
+         Hash Cond: ((0 - s.id) = r.id)
+         ->  Seq Scan on simple s
+         ->  Hash
+               ->  Seq Scan on simple r
+(6 rows)
+
+select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+ count 
+-------
+ 40000
+(1 row)
+
+rollback to settings;
+-- parallelism not possible with parallel-oblivious outer hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+               QUERY PLAN               
+----------------------------------------
+ Aggregate
+   ->  Hash Full Join
+         Hash Cond: ((0 - s.id) = r.id)
+         ->  Seq Scan on simple s
+         ->  Hash
+               ->  Seq Scan on simple r
+(6 rows)
+
+select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+ count 
+-------
+ 40000
+(1 row)
+
+rollback to settings;
+-- exercise special code paths for huge tuples (note use of non-strict
+-- expression and left join required to get the detoasted tuple into
+-- the hash table)
+-- parallel with parallel-aware hash join (hits ExecParallelHashLoadTuple and
+-- sts_puttuple oversized tuple cases because it's multi-batch)
+savepoint settings;
+set max_parallel_workers_per_gather = 2;
+set enable_parallel_hash = on;
+set work_mem = '128kB';
+explain (costs off)
+  select length(max(s.t))
+  from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 2
+         ->  Partial Aggregate
+               ->  Parallel Hash Left Join
+                     Hash Cond: (wide.id = wide_1.id)
+                     ->  Parallel Seq Scan on wide
+                     ->  Parallel Hash
+                           ->  Parallel Seq Scan on wide wide_1
+(9 rows)
+
+select length(max(s.t))
+from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+ length 
+--------
+ 320000
+(1 row)
+
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select length(max(s.t))
+  from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+$$);
+ multibatch 
+------------
+ t
+(1 row)
+
+rollback to settings;
+rollback;
diff --git a/src/test/regress/expected/json.out b/src/test/regress/expected/json.out
index b25e20ca20..06c728e363 100644
--- a/src/test/regress/expected/json.out
+++ b/src/test/regress/expected/json.out
@@ -1316,6 +1316,8 @@ create type jpop as (a text, b int, c timestamp);
 CREATE DOMAIN js_int_not_null  AS int     NOT NULL;
 CREATE DOMAIN js_int_array_1d  AS int[]   CHECK(array_length(VALUE, 1) = 3);
 CREATE DOMAIN js_int_array_2d  AS int[][] CHECK(array_length(VALUE, 2) = 3);
+create type j_unordered_pair as (x int, y int);
+create domain j_ordered_pair as j_unordered_pair check((value).x <= (value).y);
 CREATE TYPE jsrec AS (
 	i	int,
 	ia	_int4,
@@ -1400,7 +1402,7 @@ SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": null}') q;
 
 SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia"
+HINT:  See the value of key "ia".
 SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": [1, "2", null, 4]}') q;
       ia      
 --------------
@@ -1415,7 +1417,7 @@ SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": [[1, 2], [3, 4]]}') q;
 
 SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": [[1], 2]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia"
+HINT:  See the array element [1] of key "ia".
 SELECT ia FROM json_populate_record(NULL::jsrec, '{"ia": [[1], [2, 3]]}') q;
 ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
@@ -1433,7 +1435,7 @@ SELECT ia1 FROM json_populate_record(NULL::jsrec, '{"ia1": null}') q;
 
 SELECT ia1 FROM json_populate_record(NULL::jsrec, '{"ia1": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia1"
+HINT:  See the value of key "ia1".
 SELECT ia1 FROM json_populate_record(NULL::jsrec, '{"ia1": [1, "2", null, 4]}') q;
      ia1      
 --------------
@@ -1454,7 +1456,7 @@ SELECT ia1d FROM json_populate_record(NULL::jsrec, '{"ia1d": null}') q;
 
 SELECT ia1d FROM json_populate_record(NULL::jsrec, '{"ia1d": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia1d"
+HINT:  See the value of key "ia1d".
 SELECT ia1d FROM json_populate_record(NULL::jsrec, '{"ia1d": [1, "2", null, 4]}') q;
 ERROR:  value for domain js_int_array_1d violates check constraint "js_int_array_1d_check"
 SELECT ia1d FROM json_populate_record(NULL::jsrec, '{"ia1d": [1, "2", null]}') q;
@@ -1486,7 +1488,7 @@ ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
 SELECT ia2 FROM json_populate_record(NULL::jsrec, '{"ia2": [[1, 2], 3, 4]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia2"
+HINT:  See the array element [1] of key "ia2".
 SELECT ia2d FROM json_populate_record(NULL::jsrec, '{"ia2d": [[1, "2"], [null, 4]]}') q;
 ERROR:  value for domain js_int_array_2d violates check constraint "js_int_array_2d_check"
 SELECT ia2d FROM json_populate_record(NULL::jsrec, '{"ia2d": [[1, "2", 3], [null, 5, 6]]}') q;
@@ -1536,7 +1538,7 @@ SELECT ta FROM json_populate_record(NULL::jsrec, '{"ta": null}') q;
 
 SELECT ta FROM json_populate_record(NULL::jsrec, '{"ta": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ta"
+HINT:  See the value of key "ta".
 SELECT ta FROM json_populate_record(NULL::jsrec, '{"ta": [1, "2", null, 4]}') q;
       ta      
 --------------
@@ -1545,7 +1547,7 @@ SELECT ta FROM json_populate_record(NULL::jsrec, '{"ta": [1, "2", null, 4]}') q;
 
 SELECT ta FROM json_populate_record(NULL::jsrec, '{"ta": [[1, 2, 3], {"k": "v"}]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ta"
+HINT:  See the array element [1] of key "ta".
 SELECT c FROM json_populate_record(NULL::jsrec, '{"c": null}') q;
  c 
 ---
@@ -1574,7 +1576,7 @@ SELECT ca FROM json_populate_record(NULL::jsrec, '{"ca": null}') q;
 
 SELECT ca FROM json_populate_record(NULL::jsrec, '{"ca": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ca"
+HINT:  See the value of key "ca".
 SELECT ca FROM json_populate_record(NULL::jsrec, '{"ca": [1, "2", null, 4]}') q;
                       ca                       
 -----------------------------------------------
@@ -1585,7 +1587,7 @@ SELECT ca FROM json_populate_record(NULL::jsrec, '{"ca": ["aaaaaaaaaaaaaaaa"]}')
 ERROR:  value too long for type character(10)
 SELECT ca FROM json_populate_record(NULL::jsrec, '{"ca": [[1, 2, 3], {"k": "v"}]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ca"
+HINT:  See the array element [1] of key "ca".
 SELECT js FROM json_populate_record(NULL::jsrec, '{"js": null}') q;
  js 
 ----
@@ -1678,7 +1680,7 @@ SELECT jsa FROM json_populate_record(NULL::jsrec, '{"jsa": null}') q;
 
 SELECT jsa FROM json_populate_record(NULL::jsrec, '{"jsa": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "jsa"
+HINT:  See the value of key "jsa".
 SELECT jsa FROM json_populate_record(NULL::jsrec, '{"jsa": [1, "2", null, 4]}') q;
         jsa         
 --------------------
@@ -1709,7 +1711,7 @@ SELECT rec FROM json_populate_record(NULL::jsrec, '{"rec": "(abc,42,01.02.2003)"
 
 SELECT reca FROM json_populate_record(NULL::jsrec, '{"reca": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "reca"
+HINT:  See the value of key "reca".
 SELECT reca FROM json_populate_record(NULL::jsrec, '{"reca": [1, 2]}') q;
 ERROR:  cannot call populate_composite on a scalar
 SELECT reca FROM json_populate_record(NULL::jsrec, '{"reca": [{"a": "abc", "b": 456}, null, {"c": "01.02.2003", "x": 43.2}]}') q;
@@ -1740,6 +1742,30 @@ SELECT rec FROM json_populate_record(
  (abc,3,"Thu Jan 02 00:00:00 2003")
 (1 row)
 
+-- anonymous record type
+SELECT json_populate_record(null::record, '{"x": 0, "y": 1}');
+ERROR:  record type has not been registered
+SELECT json_populate_record(row(1,2), '{"f1": 0, "f2": 1}');
+ json_populate_record 
+----------------------
+ (0,1)
+(1 row)
+
+-- composite domain
+SELECT json_populate_record(null::j_ordered_pair, '{"x": 0, "y": 1}');
+ json_populate_record 
+----------------------
+ (0,1)
+(1 row)
+
+SELECT json_populate_record(row(1,2)::j_ordered_pair, '{"x": 0}');
+ json_populate_record 
+----------------------
+ (0,2)
+(1 row)
+
+SELECT json_populate_record(row(1,2)::j_ordered_pair, '{"x": 1, "y": 0}');
+ERROR:  value for domain j_ordered_pair violates check constraint "j_ordered_pair_check"
 -- populate_recordset
 select * from json_populate_recordset(null::jpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
    a    | b |            c             
@@ -1806,6 +1832,44 @@ select * from json_populate_recordset(row('def',99,null)::jpop,'[{"a":[100,200,3
  {"z":true}    |  3 | Fri Jan 20 10:42:53 2012
 (2 rows)
 
+-- anonymous record type
+SELECT json_populate_recordset(null::record, '[{"x": 0, "y": 1}]');
+ERROR:  record type has not been registered
+SELECT json_populate_recordset(row(1,2), '[{"f1": 0, "f2": 1}]');
+ json_populate_recordset 
+-------------------------
+ (0,1)
+(1 row)
+
+-- composite domain
+SELECT json_populate_recordset(null::j_ordered_pair, '[{"x": 0, "y": 1}]');
+ json_populate_recordset 
+-------------------------
+ (0,1)
+(1 row)
+
+SELECT json_populate_recordset(row(1,2)::j_ordered_pair, '[{"x": 0}, {"y": 3}]');
+ json_populate_recordset 
+-------------------------
+ (0,2)
+ (1,3)
+(2 rows)
+
+SELECT json_populate_recordset(row(1,2)::j_ordered_pair, '[{"x": 1, "y": 0}]');
+ERROR:  value for domain j_ordered_pair violates check constraint "j_ordered_pair_check"
+-- negative cases where the wrong record type is supplied
+select * from json_populate_recordset(row(0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 1 attribute, but query expects 2.
+select * from json_populate_recordset(row(0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 1, but query expects text.
+select * from json_populate_recordset(row(0::int,0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 3 attributes, but query expects 2.
+select * from json_populate_recordset(row(1000000000::int,50::int),'[{"b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 1, but query expects text.
 -- test type info caching in json_populate_record()
 CREATE TEMP TABLE jspoptest (js json);
 INSERT INTO jspoptest
@@ -1828,6 +1892,8 @@ DROP TYPE jsrec_i_not_null;
 DROP DOMAIN js_int_not_null;
 DROP DOMAIN js_int_array_1d;
 DROP DOMAIN js_int_array_2d;
+DROP DOMAIN j_ordered_pair;
+DROP TYPE j_unordered_pair;
 --json_typeof() function
 select value, json_typeof(value)
   from (values (json '123.4'),
@@ -1864,6 +1930,54 @@ SELECT json_build_array('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y":
  ["a", 1, "b", 1.2, "c", true, "d", null, "e", {"x": 3, "y": [1,2,3]}]
 (1 row)
 
+SELECT json_build_array('a', NULL); -- ok
+ json_build_array 
+------------------
+ ["a", null]
+(1 row)
+
+SELECT json_build_array(VARIADIC NULL::text[]); -- ok
+ json_build_array 
+------------------
+ 
+(1 row)
+
+SELECT json_build_array(VARIADIC '{}'::text[]); -- ok
+ json_build_array 
+------------------
+ []
+(1 row)
+
+SELECT json_build_array(VARIADIC '{a,b,c}'::text[]); -- ok
+ json_build_array 
+------------------
+ ["a", "b", "c"]
+(1 row)
+
+SELECT json_build_array(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+ json_build_array 
+------------------
+ ["a", null]
+(1 row)
+
+SELECT json_build_array(VARIADIC '{1,2,3,4}'::text[]); -- ok
+   json_build_array   
+----------------------
+ ["1", "2", "3", "4"]
+(1 row)
+
+SELECT json_build_array(VARIADIC '{1,2,3,4}'::int[]); -- ok
+ json_build_array 
+------------------
+ [1, 2, 3, 4]
+(1 row)
+
+SELECT json_build_array(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
+  json_build_array  
+--------------------
+ [1, 4, 2, 5, 3, 6]
+(1 row)
+
 SELECT json_build_object('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
                              json_build_object                              
 ----------------------------------------------------------------------------
@@ -1879,6 +1993,65 @@ SELECT json_build_object(
  {"a" : {"b" : false, "c" : 99}, "d" : {"e" : [9,8,7], "f" : {"relkind":"r","name":"pg_class"}}}
 (1 row)
 
+SELECT json_build_object('{a,b,c}'::text[]); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of json_build_object() must consist of alternating keys and values.
+SELECT json_build_object('{a,b,c}'::text[], '{d,e,f}'::text[]); -- error, key cannot be array
+ERROR:  key value must be scalar, not array, composite, or json
+SELECT json_build_object('a', 'b', 'c'); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of json_build_object() must consist of alternating keys and values.
+SELECT json_build_object(NULL, 'a'); -- error, key cannot be NULL
+ERROR:  argument 1 cannot be null
+HINT:  Object keys should be text.
+SELECT json_build_object('a', NULL); -- ok
+ json_build_object 
+-------------------
+ {"a" : null}
+(1 row)
+
+SELECT json_build_object(VARIADIC NULL::text[]); -- ok
+ json_build_object 
+-------------------
+ 
+(1 row)
+
+SELECT json_build_object(VARIADIC '{}'::text[]); -- ok
+ json_build_object 
+-------------------
+ {}
+(1 row)
+
+SELECT json_build_object(VARIADIC '{a,b,c}'::text[]); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of json_build_object() must consist of alternating keys and values.
+SELECT json_build_object(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+ json_build_object 
+-------------------
+ {"a" : null}
+(1 row)
+
+SELECT json_build_object(VARIADIC ARRAY[NULL, 'a']::text[]); -- error, key cannot be NULL
+ERROR:  argument 1 cannot be null
+HINT:  Object keys should be text.
+SELECT json_build_object(VARIADIC '{1,2,3,4}'::text[]); -- ok
+   json_build_object    
+------------------------
+ {"1" : "2", "3" : "4"}
+(1 row)
+
+SELECT json_build_object(VARIADIC '{1,2,3,4}'::int[]); -- ok
+ json_build_object  
+--------------------
+ {"1" : 2, "3" : 4}
+(1 row)
+
+SELECT json_build_object(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
+      json_build_object      
+-----------------------------
+ {"1" : 4, "2" : 5, "3" : 6}
+(1 row)
+
 -- empty objects/arrays
 SELECT json_build_array();
  json_build_array 
@@ -2043,7 +2216,7 @@ select * from json_to_record('{"ia": null}') as x(ia _int4);
 
 select * from json_to_record('{"ia": 123}') as x(ia _int4);
 ERROR:  expected json array
-HINT:  see the value of key "ia"
+HINT:  See the value of key "ia".
 select * from json_to_record('{"ia": [1, "2", null, 4]}') as x(ia _int4);
       ia      
 --------------
@@ -2058,7 +2231,7 @@ select * from json_to_record('{"ia": [[1, 2], [3, 4]]}') as x(ia _int4);
 
 select * from json_to_record('{"ia": [[1], 2]}') as x(ia _int4);
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia"
+HINT:  See the array element [1] of key "ia".
 select * from json_to_record('{"ia": [[1], [2, 3]]}') as x(ia _int4);
 ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
diff --git a/src/test/regress/expected/jsonb.out b/src/test/regress/expected/jsonb.out
index 79547035bd..465195a317 100644
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -1345,6 +1345,54 @@ SELECT jsonb_build_array('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y":
  ["a", 1, "b", 1.2, "c", true, "d", null, "e", {"x": 3, "y": [1, 2, 3]}]
 (1 row)
 
+SELECT jsonb_build_array('a', NULL); -- ok
+ jsonb_build_array 
+-------------------
+ ["a", null]
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC NULL::text[]); -- ok
+ jsonb_build_array 
+-------------------
+ 
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC '{}'::text[]); -- ok
+ jsonb_build_array 
+-------------------
+ []
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC '{a,b,c}'::text[]); -- ok
+ jsonb_build_array 
+-------------------
+ ["a", "b", "c"]
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+ jsonb_build_array 
+-------------------
+ ["a", null]
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC '{1,2,3,4}'::text[]); -- ok
+  jsonb_build_array   
+----------------------
+ ["1", "2", "3", "4"]
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC '{1,2,3,4}'::int[]); -- ok
+ jsonb_build_array 
+-------------------
+ [1, 2, 3, 4]
+(1 row)
+
+SELECT jsonb_build_array(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
+ jsonb_build_array  
+--------------------
+ [1, 4, 2, 5, 3, 6]
+(1 row)
+
 SELECT jsonb_build_object('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
                            jsonb_build_object                            
 -------------------------------------------------------------------------
@@ -1360,6 +1408,63 @@ SELECT jsonb_build_object(
  {"a": {"b": false, "c": 99}, "d": {"e": [9, 8, 7], "f": {"name": "pg_class", "relkind": "r"}}}
 (1 row)
 
+SELECT jsonb_build_object('{a,b,c}'::text[]); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of jsonb_build_object() must consist of alternating keys and values.
+SELECT jsonb_build_object('{a,b,c}'::text[], '{d,e,f}'::text[]); -- error, key cannot be array
+ERROR:  key value must be scalar, not array, composite, or json
+SELECT jsonb_build_object('a', 'b', 'c'); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of jsonb_build_object() must consist of alternating keys and values.
+SELECT jsonb_build_object(NULL, 'a'); -- error, key cannot be NULL
+ERROR:  argument 1: key must not be null
+SELECT jsonb_build_object('a', NULL); -- ok
+ jsonb_build_object 
+--------------------
+ {"a": null}
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC NULL::text[]); -- ok
+ jsonb_build_object 
+--------------------
+ 
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC '{}'::text[]); -- ok
+ jsonb_build_object 
+--------------------
+ {}
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC '{a,b,c}'::text[]); -- error
+ERROR:  argument list must have even number of elements
+HINT:  The arguments of jsonb_build_object() must consist of alternating keys and values.
+SELECT jsonb_build_object(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+ jsonb_build_object 
+--------------------
+ {"a": null}
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC ARRAY[NULL, 'a']::text[]); -- error, key cannot be NULL
+ERROR:  argument 1: key must not be null
+SELECT jsonb_build_object(VARIADIC '{1,2,3,4}'::text[]); -- ok
+  jsonb_build_object  
+----------------------
+ {"1": "2", "3": "4"}
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC '{1,2,3,4}'::int[]); -- ok
+ jsonb_build_object 
+--------------------
+ {"1": 2, "3": 4}
+(1 row)
+
+SELECT jsonb_build_object(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
+    jsonb_build_object    
+--------------------------
+ {"1": 4, "2": 5, "3": 6}
+(1 row)
+
 -- empty objects/arrays
 SELECT jsonb_build_array();
  jsonb_build_array 
@@ -1900,6 +2005,8 @@ CREATE TYPE jbpop AS (a text, b int, c timestamp);
 CREATE DOMAIN jsb_int_not_null  AS int     NOT NULL;
 CREATE DOMAIN jsb_int_array_1d  AS int[]   CHECK(array_length(VALUE, 1) = 3);
 CREATE DOMAIN jsb_int_array_2d  AS int[][] CHECK(array_length(VALUE, 2) = 3);
+create type jb_unordered_pair as (x int, y int);
+create domain jb_ordered_pair as jb_unordered_pair check((value).x <= (value).y);
 CREATE TYPE jsbrec AS (
 	i	int,
 	ia	_int4,
@@ -1984,7 +2091,7 @@ SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": null}') q;
 
 SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia"
+HINT:  See the value of key "ia".
 SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": [1, "2", null, 4]}') q;
       ia      
 --------------
@@ -1999,7 +2106,7 @@ SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": [[1, 2], [3, 4]]}') q
 
 SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": [[1], 2]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia"
+HINT:  See the array element [1] of key "ia".
 SELECT ia FROM jsonb_populate_record(NULL::jsbrec, '{"ia": [[1], [2, 3]]}') q;
 ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
@@ -2017,7 +2124,7 @@ SELECT ia1 FROM jsonb_populate_record(NULL::jsbrec, '{"ia1": null}') q;
 
 SELECT ia1 FROM jsonb_populate_record(NULL::jsbrec, '{"ia1": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia1"
+HINT:  See the value of key "ia1".
 SELECT ia1 FROM jsonb_populate_record(NULL::jsbrec, '{"ia1": [1, "2", null, 4]}') q;
      ia1      
 --------------
@@ -2038,7 +2145,7 @@ SELECT ia1d FROM jsonb_populate_record(NULL::jsbrec, '{"ia1d": null}') q;
 
 SELECT ia1d FROM jsonb_populate_record(NULL::jsbrec, '{"ia1d": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ia1d"
+HINT:  See the value of key "ia1d".
 SELECT ia1d FROM jsonb_populate_record(NULL::jsbrec, '{"ia1d": [1, "2", null, 4]}') q;
 ERROR:  value for domain jsb_int_array_1d violates check constraint "jsb_int_array_1d_check"
 SELECT ia1d FROM jsonb_populate_record(NULL::jsbrec, '{"ia1d": [1, "2", null]}') q;
@@ -2070,7 +2177,7 @@ ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
 SELECT ia2 FROM jsonb_populate_record(NULL::jsbrec, '{"ia2": [[1, 2], 3, 4]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia2"
+HINT:  See the array element [1] of key "ia2".
 SELECT ia2d FROM jsonb_populate_record(NULL::jsbrec, '{"ia2d": [[1, "2"], [null, 4]]}') q;
 ERROR:  value for domain jsb_int_array_2d violates check constraint "jsb_int_array_2d_check"
 SELECT ia2d FROM jsonb_populate_record(NULL::jsbrec, '{"ia2d": [[1, "2", 3], [null, 5, 6]]}') q;
@@ -2120,7 +2227,7 @@ SELECT ta FROM jsonb_populate_record(NULL::jsbrec, '{"ta": null}') q;
 
 SELECT ta FROM jsonb_populate_record(NULL::jsbrec, '{"ta": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ta"
+HINT:  See the value of key "ta".
 SELECT ta FROM jsonb_populate_record(NULL::jsbrec, '{"ta": [1, "2", null, 4]}') q;
       ta      
 --------------
@@ -2129,7 +2236,7 @@ SELECT ta FROM jsonb_populate_record(NULL::jsbrec, '{"ta": [1, "2", null, 4]}')
 
 SELECT ta FROM jsonb_populate_record(NULL::jsbrec, '{"ta": [[1, 2, 3], {"k": "v"}]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ta"
+HINT:  See the array element [1] of key "ta".
 SELECT c FROM jsonb_populate_record(NULL::jsbrec, '{"c": null}') q;
  c 
 ---
@@ -2158,7 +2265,7 @@ SELECT ca FROM jsonb_populate_record(NULL::jsbrec, '{"ca": null}') q;
 
 SELECT ca FROM jsonb_populate_record(NULL::jsbrec, '{"ca": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "ca"
+HINT:  See the value of key "ca".
 SELECT ca FROM jsonb_populate_record(NULL::jsbrec, '{"ca": [1, "2", null, 4]}') q;
                       ca                       
 -----------------------------------------------
@@ -2169,7 +2276,7 @@ SELECT ca FROM jsonb_populate_record(NULL::jsbrec, '{"ca": ["aaaaaaaaaaaaaaaa"]}
 ERROR:  value too long for type character(10)
 SELECT ca FROM jsonb_populate_record(NULL::jsbrec, '{"ca": [[1, 2, 3], {"k": "v"}]}') q;
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ca"
+HINT:  See the array element [1] of key "ca".
 SELECT js FROM jsonb_populate_record(NULL::jsbrec, '{"js": null}') q;
  js 
 ----
@@ -2262,7 +2369,7 @@ SELECT jsa FROM jsonb_populate_record(NULL::jsbrec, '{"jsa": null}') q;
 
 SELECT jsa FROM jsonb_populate_record(NULL::jsbrec, '{"jsa": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "jsa"
+HINT:  See the value of key "jsa".
 SELECT jsa FROM jsonb_populate_record(NULL::jsbrec, '{"jsa": [1, "2", null, 4]}') q;
         jsa         
 --------------------
@@ -2293,7 +2400,7 @@ SELECT rec FROM jsonb_populate_record(NULL::jsbrec, '{"rec": "(abc,42,01.02.2003
 
 SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": 123}') q;
 ERROR:  expected json array
-HINT:  see the value of key "reca"
+HINT:  See the value of key "reca".
 SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": [1, 2]}') q;
 ERROR:  cannot call populate_composite on a scalar
 SELECT reca FROM jsonb_populate_record(NULL::jsbrec, '{"reca": [{"a": "abc", "b": 456}, null, {"c": "01.02.2003", "x": 43.2}]}') q;
@@ -2324,6 +2431,30 @@ SELECT rec FROM jsonb_populate_record(
  (abc,3,"Thu Jan 02 00:00:00 2003")
 (1 row)
 
+-- anonymous record type
+SELECT jsonb_populate_record(null::record, '{"x": 0, "y": 1}');
+ERROR:  record type has not been registered
+SELECT jsonb_populate_record(row(1,2), '{"f1": 0, "f2": 1}');
+ jsonb_populate_record 
+-----------------------
+ (0,1)
+(1 row)
+
+-- composite domain
+SELECT jsonb_populate_record(null::jb_ordered_pair, '{"x": 0, "y": 1}');
+ jsonb_populate_record 
+-----------------------
+ (0,1)
+(1 row)
+
+SELECT jsonb_populate_record(row(1,2)::jb_ordered_pair, '{"x": 0}');
+ jsonb_populate_record 
+-----------------------
+ (0,2)
+(1 row)
+
+SELECT jsonb_populate_record(row(1,2)::jb_ordered_pair, '{"x": 1, "y": 0}');
+ERROR:  value for domain jb_ordered_pair violates check constraint "jb_ordered_pair_check"
 -- populate_recordset
 SELECT * FROM jsonb_populate_recordset(NULL::jbpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
    a    | b |            c             
@@ -2383,6 +2514,44 @@ SELECT * FROM jsonb_populate_recordset(row('def',99,NULL)::jbpop,'[{"a":[100,200
  {"z": true}     |  3 | Fri Jan 20 10:42:53 2012
 (2 rows)
 
+-- anonymous record type
+SELECT jsonb_populate_recordset(null::record, '[{"x": 0, "y": 1}]');
+ERROR:  record type has not been registered
+SELECT jsonb_populate_recordset(row(1,2), '[{"f1": 0, "f2": 1}]');
+ jsonb_populate_recordset 
+--------------------------
+ (0,1)
+(1 row)
+
+-- composite domain
+SELECT jsonb_populate_recordset(null::jb_ordered_pair, '[{"x": 0, "y": 1}]');
+ jsonb_populate_recordset 
+--------------------------
+ (0,1)
+(1 row)
+
+SELECT jsonb_populate_recordset(row(1,2)::jb_ordered_pair, '[{"x": 0}, {"y": 3}]');
+ jsonb_populate_recordset 
+--------------------------
+ (0,2)
+ (1,3)
+(2 rows)
+
+SELECT jsonb_populate_recordset(row(1,2)::jb_ordered_pair, '[{"x": 1, "y": 0}]');
+ERROR:  value for domain jb_ordered_pair violates check constraint "jb_ordered_pair_check"
+-- negative cases where the wrong record type is supplied
+select * from jsonb_populate_recordset(row(0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 1 attribute, but query expects 2.
+select * from jsonb_populate_recordset(row(0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 1, but query expects text.
+select * from jsonb_populate_recordset(row(0::int,0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned row contains 3 attributes, but query expects 2.
+select * from jsonb_populate_recordset(row(1000000000::int,50::int),'[{"b":"2"},{"a":"3"}]') q (a text, b text);
+ERROR:  function return row and query-specified return row do not match
+DETAIL:  Returned type integer at ordinal position 1, but query expects text.
 -- jsonb_to_record and jsonb_to_recordset
 select * from jsonb_to_record('{"a":1,"b":"foo","c":"bar"}')
     as x(a int, b text, d text);
@@ -2423,7 +2592,7 @@ select * from jsonb_to_record('{"ia": null}') as x(ia _int4);
 
 select * from jsonb_to_record('{"ia": 123}') as x(ia _int4);
 ERROR:  expected json array
-HINT:  see the value of key "ia"
+HINT:  See the value of key "ia".
 select * from jsonb_to_record('{"ia": [1, "2", null, 4]}') as x(ia _int4);
       ia      
 --------------
@@ -2438,7 +2607,7 @@ select * from jsonb_to_record('{"ia": [[1, 2], [3, 4]]}') as x(ia _int4);
 
 select * from jsonb_to_record('{"ia": [[1], 2]}') as x(ia _int4);
 ERROR:  expected json array
-HINT:  see the array element [1] of key "ia"
+HINT:  See the array element [1] of key "ia".
 select * from jsonb_to_record('{"ia": [[1], [2, 3]]}') as x(ia _int4);
 ERROR:  malformed json array
 DETAIL:  Multidimensional arrays must have sub-arrays with matching dimensions.
@@ -2482,6 +2651,8 @@ DROP TYPE jsbrec_i_not_null;
 DROP DOMAIN jsb_int_not_null;
 DROP DOMAIN jsb_int_array_1d;
 DROP DOMAIN jsb_int_array_2d;
+DROP DOMAIN jb_ordered_pair;
+DROP TYPE jb_unordered_pair;
 -- indexing
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
  count 
diff --git a/src/test/regress/expected/lock.out b/src/test/regress/expected/lock.out
index fd27344503..74a434d24d 100644
--- a/src/test/regress/expected/lock.out
+++ b/src/test/regress/expected/lock.out
@@ -45,7 +45,7 @@ GRANT UPDATE ON TABLE lock_tbl1 TO regress_rol_lock1;
 SET ROLE regress_rol_lock1;
 BEGIN;
 LOCK TABLE lock_tbl1 * IN ACCESS EXCLUSIVE MODE;
-ERROR:  permission denied for relation lock_tbl2
+ERROR:  permission denied for table lock_tbl2
 ROLLBACK;
 BEGIN;
 LOCK TABLE ONLY lock_tbl1;
diff --git a/src/test/regress/expected/misc_sanity.out b/src/test/regress/expected/misc_sanity.out
index f02689660b..5aaae6c39f 100644
--- a/src/test/regress/expected/misc_sanity.out
+++ b/src/test/regress/expected/misc_sanity.out
@@ -29,7 +29,7 @@ SELECT *
 FROM pg_shdepend as d1
 WHERE refclassid = 0 OR refobjid = 0 OR
       deptype NOT IN ('a', 'o', 'p', 'r') OR
-      (deptype != 'p' AND (dbid = 0 OR classid = 0 OR objid = 0)) OR
+      (deptype != 'p' AND (classid = 0 OR objid = 0)) OR
       (deptype = 'p' AND (dbid != 0 OR classid != 0 OR objid != 0 OR objsubid != 0));
  dbid | classid | objid | objsubid | refclassid | refobjid | deptype 
 ------+---------+-------+----------+------------+----------+---------
diff --git a/src/test/regress/expected/numeric.out b/src/test/regress/expected/numeric.out
index ae0beb9b68..17985e8540 100644
--- a/src/test/regress/expected/numeric.out
+++ b/src/test/regress/expected/numeric.out
@@ -708,6 +708,27 @@ SELECT * FROM fract_only;
 (6 rows)
 
 DROP TABLE fract_only;
+-- Check inf/nan conversion behavior
+SELECT 'NaN'::float8::numeric;
+ numeric 
+---------
+     NaN
+(1 row)
+
+SELECT 'Infinity'::float8::numeric;
+ERROR:  cannot convert infinity to numeric
+SELECT '-Infinity'::float8::numeric;
+ERROR:  cannot convert infinity to numeric
+SELECT 'NaN'::float4::numeric;
+ numeric 
+---------
+     NaN
+(1 row)
+
+SELECT 'Infinity'::float4::numeric;
+ERROR:  cannot convert infinity to numeric
+SELECT '-Infinity'::float4::numeric;
+ERROR:  cannot convert infinity to numeric
 -- Simple check that ceil(), floor(), and round() work correctly
 CREATE TABLE ceil_floor_round (a numeric);
 INSERT INTO ceil_floor_round VALUES ('-5.5');
@@ -1196,8 +1217,70 @@ SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
             | 100
 (1 row)
 
+-- Check parsing of literal text in a format string
+SELECT '' AS to_char_27, to_char('100'::numeric, 'foo999');
+ to_char_27 | to_char 
+------------+---------
+            | foo 100
+(1 row)
+
+SELECT '' AS to_char_28, to_char('100'::numeric, 'f\oo999');
+ to_char_28 | to_char  
+------------+----------
+            | f\oo 100
+(1 row)
+
+SELECT '' AS to_char_29, to_char('100'::numeric, 'f\\oo999');
+ to_char_29 |  to_char  
+------------+-----------
+            | f\\oo 100
+(1 row)
+
+SELECT '' AS to_char_30, to_char('100'::numeric, 'f\"oo999');
+ to_char_30 | to_char  
+------------+----------
+            | f"oo 100
+(1 row)
+
+SELECT '' AS to_char_31, to_char('100'::numeric, 'f\\"oo999');
+ to_char_31 |  to_char  
+------------+-----------
+            | f\"oo 100
+(1 row)
+
+SELECT '' AS to_char_32, to_char('100'::numeric, 'f"ool"999');
+ to_char_32 | to_char  
+------------+----------
+            | fool 100
+(1 row)
+
+SELECT '' AS to_char_33, to_char('100'::numeric, 'f"\ool"999');
+ to_char_33 | to_char  
+------------+----------
+            | fool 100
+(1 row)
+
+SELECT '' AS to_char_34, to_char('100'::numeric, 'f"\\ool"999');
+ to_char_34 |  to_char  
+------------+-----------
+            | f\ool 100
+(1 row)
+
+SELECT '' AS to_char_35, to_char('100'::numeric, 'f"ool\"999');
+ to_char_35 | to_char  
+------------+----------
+            | fool"999
+(1 row)
+
+SELECT '' AS to_char_36, to_char('100'::numeric, 'f"ool\\"999');
+ to_char_36 |  to_char  
+------------+-----------
+            | fool\ 100
+(1 row)
+
 -- TO_NUMBER()
 --
+SET lc_numeric = 'C';
 SELECT '' AS to_number_1,  to_number('-34,338,492', '99G999G999');
  to_number_1 | to_number 
 -------------+-----------
@@ -1276,6 +1359,61 @@ SELECT '' AS to_number_13, to_number(' . 0 1-', ' 9 9 . 9 9 S');
               |     -0.01
 (1 row)
 
+SELECT '' AS to_number_14, to_number('34,50','999,99');
+ to_number_14 | to_number 
+--------------+-----------
+              |      3450
+(1 row)
+
+SELECT '' AS to_number_15, to_number('123,000','999G');
+ to_number_15 | to_number 
+--------------+-----------
+              |       123
+(1 row)
+
+SELECT '' AS to_number_16, to_number('123456','999G999');
+ to_number_16 | to_number 
+--------------+-----------
+              |    123456
+(1 row)
+
+SELECT '' AS to_number_17, to_number('$1234.56','L9,999.99');
+ to_number_17 | to_number 
+--------------+-----------
+              |   1234.56
+(1 row)
+
+SELECT '' AS to_number_18, to_number('$1234.56','L99,999.99');
+ to_number_18 | to_number 
+--------------+-----------
+              |   1234.56
+(1 row)
+
+SELECT '' AS to_number_19, to_number('$1,234.56','L99,999.99');
+ to_number_19 | to_number 
+--------------+-----------
+              |   1234.56
+(1 row)
+
+SELECT '' AS to_number_20, to_number('1234.56','L99,999.99');
+ to_number_20 | to_number 
+--------------+-----------
+              |   1234.56
+(1 row)
+
+SELECT '' AS to_number_21, to_number('1,234.56','L99,999.99');
+ to_number_21 | to_number 
+--------------+-----------
+              |   1234.56
+(1 row)
+
+SELECT '' AS to_number_22, to_number('42nd', '99th');
+ to_number_22 | to_number 
+--------------+-----------
+              |        42
+(1 row)
+
+RESET lc_numeric;
 --
 -- Input syntax
 --
diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out
index 1fdadbc9ef..bfd9d54c11 100644
--- a/src/test/regress/expected/object_address.out
+++ b/src/test/regress/expected/object_address.out
@@ -29,6 +29,7 @@ CREATE DOMAIN addr_nsp.gendomain AS int4 CONSTRAINT domconstr CHECK (value > 0);
 CREATE FUNCTION addr_nsp.trig() RETURNS TRIGGER LANGUAGE plpgsql AS $$ BEGIN END; $$;
 CREATE TRIGGER t BEFORE INSERT ON addr_nsp.gentable FOR EACH ROW EXECUTE PROCEDURE addr_nsp.trig();
 CREATE POLICY genpol ON addr_nsp.gentable;
+CREATE PROCEDURE addr_nsp.proc(int4) LANGUAGE SQL AS $$ $$;
 CREATE SERVER "integer" FOREIGN DATA WRAPPER addr_fdw;
 CREATE USER MAPPING FOR regress_addr_user SERVER "integer";
 ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user IN SCHEMA public GRANT ALL ON TABLES TO regress_addr_user;
@@ -88,7 +89,7 @@ BEGIN
 		('table'), ('index'), ('sequence'), ('view'),
 		('materialized view'), ('foreign table'),
 		('table column'), ('foreign table column'),
-		('aggregate'), ('function'), ('type'), ('cast'),
+		('aggregate'), ('function'), ('procedure'), ('type'), ('cast'),
 		('table constraint'), ('domain constraint'), ('conversion'), ('default value'),
 		('operator'), ('operator class'), ('operator family'), ('rule'), ('trigger'),
 		('text search parser'), ('text search dictionary'),
@@ -171,6 +172,12 @@ WARNING:  error for function,{addr_nsp,zwei},{}: function addr_nsp.zwei() does n
 WARNING:  error for function,{addr_nsp,zwei},{integer}: function addr_nsp.zwei(integer) does not exist
 WARNING:  error for function,{eins,zwei,drei},{}: cross-database references are not implemented: eins.zwei.drei
 WARNING:  error for function,{eins,zwei,drei},{integer}: cross-database references are not implemented: eins.zwei.drei
+WARNING:  error for procedure,{eins},{}: procedure eins() does not exist
+WARNING:  error for procedure,{eins},{integer}: procedure eins(integer) does not exist
+WARNING:  error for procedure,{addr_nsp,zwei},{}: procedure addr_nsp.zwei() does not exist
+WARNING:  error for procedure,{addr_nsp,zwei},{integer}: procedure addr_nsp.zwei(integer) does not exist
+WARNING:  error for procedure,{eins,zwei,drei},{}: cross-database references are not implemented: eins.zwei.drei
+WARNING:  error for procedure,{eins,zwei,drei},{integer}: cross-database references are not implemented: eins.zwei.drei
 WARNING:  error for type,{eins},{}: type "eins" does not exist
 WARNING:  error for type,{eins},{integer}: type "eins" does not exist
 WARNING:  error for type,{addr_nsp,zwei},{}: name list length must be exactly 1
@@ -371,6 +378,7 @@ WITH objects (type, name, args) AS (VALUES
 				('foreign table column', '{addr_nsp, genftable, a}', '{}'),
 				('aggregate', '{addr_nsp, genaggr}', '{int4}'),
 				('function', '{pg_catalog, pg_identify_object}', '{pg_catalog.oid, pg_catalog.oid, int4}'),
+				('procedure', '{addr_nsp, proc}', '{int4}'),
 				('type', '{pg_catalog._int4}', '{}'),
 				('type', '{addr_nsp.gendomain}', '{}'),
 				('type', '{addr_nsp.gencomptype}', '{}'),
@@ -431,6 +439,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
  type                      | addr_nsp   | gendomain         | addr_nsp.gendomain                                                   | t
  function                  | pg_catalog |                   | pg_catalog.pg_identify_object(pg_catalog.oid,pg_catalog.oid,integer) | t
  aggregate                 | addr_nsp   |                   | addr_nsp.genaggr(integer)                                            | t
+ procedure                 | addr_nsp   |                   | addr_nsp.proc(integer)                                               | t
  sequence                  | addr_nsp   | gentable_a_seq    | addr_nsp.gentable_a_seq                                              | t
  table                     | addr_nsp   | gentable          | addr_nsp.gentable                                                    | t
  table column              | addr_nsp   | gentable          | addr_nsp.gentable.b                                                  | t
@@ -469,7 +478,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.objsubid)).*,
  subscription              |            | addr_sub          | addr_sub                                                             | t
  publication               |            | addr_pub          | addr_pub                                                             | t
  publication relation      |            |                   | gentable in publication addr_pub                                     | t
-(46 rows)
+(47 rows)
 
 ---
 --- Cleanup resources
@@ -480,6 +489,6 @@ NOTICE:  drop cascades to 4 other objects
 DROP PUBLICATION addr_pub;
 DROP SUBSCRIPTION addr_sub;
 DROP SCHEMA addr_nsp CASCADE;
-NOTICE:  drop cascades to 12 other objects
+NOTICE:  drop cascades to 13 other objects
 DROP OWNED BY regress_addr_user;
 DROP USER regress_addr_user;
diff --git a/src/test/regress/expected/opr_sanity.out b/src/test/regress/expected/opr_sanity.out
index fcf8bd7565..6616cc1bf0 100644
--- a/src/test/regress/expected/opr_sanity.out
+++ b/src/test/regress/expected/opr_sanity.out
@@ -699,6 +699,8 @@ timestamp_lt(timestamp without time zone,timestamp without time zone)
 timestamp_le(timestamp without time zone,timestamp without time zone)
 timestamp_ge(timestamp without time zone,timestamp without time zone)
 timestamp_gt(timestamp without time zone,timestamp without time zone)
+md5(text)
+md5(bytea)
 tidgt(tid,tid)
 tidlt(tid,tid)
 tidge(tid,tid)
@@ -711,6 +713,10 @@ uuid_gt(uuid,uuid)
 uuid_ne(uuid,uuid)
 xidneq(xid,xid)
 xidneqint4(xid,integer)
+sha224(bytea)
+sha256(bytea)
+sha384(bytea)
+sha512(bytea)
 macaddr8_eq(macaddr8,macaddr8)
 macaddr8_lt(macaddr8,macaddr8)
 macaddr8_le(macaddr8,macaddr8)
@@ -1275,6 +1281,8 @@ WHERE aggfnoid = 0 OR aggtransfn = 0 OR
     aggkind NOT IN ('n', 'o', 'h') OR
     aggnumdirectargs < 0 OR
     (aggkind = 'n' AND aggnumdirectargs > 0) OR
+    aggfinalmodify NOT IN ('r', 's', 'w') OR
+    aggmfinalmodify NOT IN ('r', 's', 'w') OR
     aggtranstype = 0 OR aggtransspace < 0 OR aggmtransspace < 0;
  ctid | aggfnoid 
 ------+----------
diff --git a/src/test/regress/expected/partition_join.out b/src/test/regress/expected/partition_join.out
new file mode 100644
index 0000000000..4fccd9ae54
--- /dev/null
+++ b/src/test/regress/expected/partition_join.out
@@ -0,0 +1,1871 @@
+--
+-- PARTITION_JOIN
+-- Test partitionwise join between partitioned tables
+--
+-- Enable partitionwise join, which by default is disabled.
+SET enable_partitionwise_join to true;
+--
+-- partitioned by a single column
+--
+CREATE TABLE prt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE prt1_p1 PARTITION OF prt1 FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_p3 PARTITION OF prt1 FOR VALUES FROM (500) TO (600);
+CREATE TABLE prt1_p2 PARTITION OF prt1 FOR VALUES FROM (250) TO (500);
+INSERT INTO prt1 SELECT i, i % 25, to_char(i, 'FM0000') FROM generate_series(0, 599) i WHERE i % 2 = 0;
+CREATE INDEX iprt1_p1_a on prt1_p1(a);
+CREATE INDEX iprt1_p2_a on prt1_p2(a);
+CREATE INDEX iprt1_p3_a on prt1_p3(a);
+ANALYZE prt1;
+CREATE TABLE prt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE prt2_p1 PARTITION OF prt2 FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_p2 PARTITION OF prt2 FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt2_p3 PARTITION OF prt2 FOR VALUES FROM (500) TO (600);
+INSERT INTO prt2 SELECT i % 25, i, to_char(i, 'FM0000') FROM generate_series(0, 599) i WHERE i % 3 = 0;
+CREATE INDEX iprt2_p1_b on prt2_p1(b);
+CREATE INDEX iprt2_p2_b on prt2_p2(b);
+CREATE INDEX iprt2_p3_b on prt2_p3(b);
+ANALYZE prt2;
+-- inner join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Hash Join
+               Hash Cond: (t2.b = t1.a)
+               ->  Seq Scan on prt2_p1 t2
+               ->  Hash
+                     ->  Seq Scan on prt1_p1 t1
+                           Filter: (b = 0)
+         ->  Hash Join
+               Hash Cond: (t2_1.b = t1_1.a)
+               ->  Seq Scan on prt2_p2 t2_1
+               ->  Hash
+                     ->  Seq Scan on prt1_p2 t1_1
+                           Filter: (b = 0)
+         ->  Hash Join
+               Hash Cond: (t2_2.b = t1_2.a)
+               ->  Seq Scan on prt2_p3 t2_2
+               ->  Hash
+                     ->  Seq Scan on prt1_p3 t1_2
+                           Filter: (b = 0)
+(21 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+ 150 | 0150 | 150 | 0150
+ 300 | 0300 | 300 | 0300
+ 450 | 0450 | 450 | 0450
+(4 rows)
+
+-- left outer join, with whole-row reference
+EXPLAIN (COSTS OFF)
+SELECT t1, t2 FROM prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b
+   ->  Result
+         ->  Append
+               ->  Hash Right Join
+                     Hash Cond: (t2.b = t1.a)
+                     ->  Seq Scan on prt2_p1 t2
+                     ->  Hash
+                           ->  Seq Scan on prt1_p1 t1
+                                 Filter: (b = 0)
+               ->  Hash Right Join
+                     Hash Cond: (t2_1.b = t1_1.a)
+                     ->  Seq Scan on prt2_p2 t2_1
+                     ->  Hash
+                           ->  Seq Scan on prt1_p2 t1_1
+                                 Filter: (b = 0)
+               ->  Hash Right Join
+                     Hash Cond: (t2_2.b = t1_2.a)
+                     ->  Seq Scan on prt2_p3 t2_2
+                     ->  Hash
+                           ->  Seq Scan on prt1_p3 t1_2
+                                 Filter: (b = 0)
+(22 rows)
+
+SELECT t1, t2 FROM prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+      t1      |      t2      
+--------------+--------------
+ (0,0,0000)   | (0,0,0000)
+ (50,0,0050)  | 
+ (100,0,0100) | 
+ (150,0,0150) | (0,150,0150)
+ (200,0,0200) | 
+ (250,0,0250) | 
+ (300,0,0300) | (0,300,0300)
+ (350,0,0350) | 
+ (400,0,0400) | 
+ (450,0,0450) | (0,450,0450)
+ (500,0,0500) | 
+ (550,0,0550) | 
+(12 rows)
+
+-- right outer join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+                             QUERY PLAN                              
+---------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b
+   ->  Result
+         ->  Append
+               ->  Hash Right Join
+                     Hash Cond: (t1.a = t2.b)
+                     ->  Seq Scan on prt1_p1 t1
+                     ->  Hash
+                           ->  Seq Scan on prt2_p1 t2
+                                 Filter: (a = 0)
+               ->  Hash Right Join
+                     Hash Cond: (t1_1.a = t2_1.b)
+                     ->  Seq Scan on prt1_p2 t1_1
+                     ->  Hash
+                           ->  Seq Scan on prt2_p2 t2_1
+                                 Filter: (a = 0)
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt2_p3 t2_2
+                           Filter: (a = 0)
+                     ->  Index Scan using iprt1_p3_a on prt1_p3 t1_2
+                           Index Cond: (a = t2_2.b)
+(21 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+ 150 | 0150 | 150 | 0150
+ 300 | 0300 | 300 | 0300
+ 450 | 0450 | 450 | 0450
+     |      |  75 | 0075
+     |      | 225 | 0225
+     |      | 375 | 0375
+     |      | 525 | 0525
+(8 rows)
+
+-- full outer join, with placeholder vars
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b) WHERE t1.phv = t1.a OR t2.phv = t2.b ORDER BY t1.a, t2.b;
+                            QUERY PLAN                            
+------------------------------------------------------------------
+ Sort
+   Sort Key: prt1_p1.a, prt2_p1.b
+   ->  Append
+         ->  Hash Full Join
+               Hash Cond: (prt1_p1.a = prt2_p1.b)
+               Filter: (((50) = prt1_p1.a) OR ((75) = prt2_p1.b))
+               ->  Seq Scan on prt1_p1
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_p1
+                           Filter: (a = 0)
+         ->  Hash Full Join
+               Hash Cond: (prt1_p2.a = prt2_p2.b)
+               Filter: (((50) = prt1_p2.a) OR ((75) = prt2_p2.b))
+               ->  Seq Scan on prt1_p2
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_p2
+                           Filter: (a = 0)
+         ->  Hash Full Join
+               Hash Cond: (prt1_p3.a = prt2_p3.b)
+               Filter: (((50) = prt1_p3.a) OR ((75) = prt2_p3.b))
+               ->  Seq Scan on prt1_p3
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_p3
+                           Filter: (a = 0)
+(27 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b) WHERE t1.phv = t1.a OR t2.phv = t2.b ORDER BY t1.a, t2.b;
+ a  |  c   | b  |  c   
+----+------+----+------
+ 50 | 0050 |    | 
+    |      | 75 | 0075
+(2 rows)
+
+-- Join with pruned partitions from joining relations
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a < 450 AND t2.b > 250 AND t1.b = 0 ORDER BY t1.a, t2.b;
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Hash Join
+               Hash Cond: (t2.b = t1.a)
+               ->  Seq Scan on prt2_p2 t2
+                     Filter: (b > 250)
+               ->  Hash
+                     ->  Seq Scan on prt1_p2 t1
+                           Filter: ((a < 450) AND (b = 0))
+(10 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a < 450 AND t2.b > 250 AND t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+ 300 | 0300 | 300 | 0300
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ Sort
+   Sort Key: prt1_p1.a, b
+   ->  Append
+         ->  Hash Left Join
+               Hash Cond: (prt1_p1.a = b)
+               ->  Seq Scan on prt1_p1
+                     Filter: ((a < 450) AND (b = 0))
+               ->  Hash
+                     ->  Result
+                           One-Time Filter: false
+         ->  Hash Right Join
+               Hash Cond: (prt2_p2.b = prt1_p2.a)
+               ->  Seq Scan on prt2_p2
+                     Filter: (b > 250)
+               ->  Hash
+                     ->  Seq Scan on prt1_p2
+                           Filter: ((a < 450) AND (b = 0))
+(17 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |     | 
+  50 | 0050 |     | 
+ 100 | 0100 |     | 
+ 150 | 0150 |     | 
+ 200 | 0200 |     | 
+ 250 | 0250 |     | 
+ 300 | 0300 | 300 | 0300
+ 350 | 0350 |     | 
+ 400 | 0400 |     | 
+(9 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 FULL JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 OR t2.a = 0 ORDER BY t1.a, t2.b;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Sort
+   Sort Key: prt1_p1.a, b
+   ->  Append
+         ->  Hash Full Join
+               Hash Cond: (prt1_p1.a = b)
+               Filter: ((prt1_p1.b = 0) OR (a = 0))
+               ->  Seq Scan on prt1_p1
+                     Filter: (a < 450)
+               ->  Hash
+                     ->  Result
+                           One-Time Filter: false
+         ->  Hash Full Join
+               Hash Cond: (prt1_p2.a = prt2_p2.b)
+               Filter: ((prt1_p2.b = 0) OR (prt2_p2.a = 0))
+               ->  Seq Scan on prt1_p2
+                     Filter: (a < 450)
+               ->  Hash
+                     ->  Seq Scan on prt2_p2
+                           Filter: (b > 250)
+         ->  Hash Full Join
+               Hash Cond: (prt2_p3.b = a)
+               Filter: ((b = 0) OR (prt2_p3.a = 0))
+               ->  Seq Scan on prt2_p3
+                     Filter: (b > 250)
+               ->  Hash
+                     ->  Result
+                           One-Time Filter: false
+(27 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 FULL JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 OR t2.a = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |     | 
+  50 | 0050 |     | 
+ 100 | 0100 |     | 
+ 150 | 0150 |     | 
+ 200 | 0200 |     | 
+ 250 | 0250 |     | 
+ 300 | 0300 | 300 | 0300
+ 350 | 0350 |     | 
+ 400 | 0400 |     | 
+     |      | 375 | 0375
+     |      | 450 | 0450
+     |      | 525 | 0525
+(12 rows)
+
+-- Semi-join
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t2.b FROM prt2 t2 WHERE t2.a = 0) AND t1.b = 0 ORDER BY t1.a;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Hash Semi Join
+               Hash Cond: (t1.a = t2.b)
+               ->  Seq Scan on prt1_p1 t1
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_p1 t2
+                           Filter: (a = 0)
+         ->  Hash Semi Join
+               Hash Cond: (t1_1.a = t2_1.b)
+               ->  Seq Scan on prt1_p2 t1_1
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_p2 t2_1
+                           Filter: (a = 0)
+         ->  Nested Loop Semi Join
+               Join Filter: (t1_2.a = t2_2.b)
+               ->  Seq Scan on prt1_p3 t1_2
+                     Filter: (b = 0)
+               ->  Materialize
+                     ->  Seq Scan on prt2_p3 t2_2
+                           Filter: (a = 0)
+(24 rows)
+
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t2.b FROM prt2 t2 WHERE t2.a = 0) AND t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   
+-----+---+------
+   0 | 0 | 0000
+ 150 | 0 | 0150
+ 300 | 0 | 0300
+ 450 | 0 | 0450
+(4 rows)
+
+-- Anti-join with aggregates
+EXPLAIN (COSTS OFF)
+SELECT sum(t1.a), avg(t1.a), sum(t1.b), avg(t1.b) FROM prt1 t1 WHERE NOT EXISTS (SELECT 1 FROM prt2 t2 WHERE t1.a = t2.b);
+                    QUERY PLAN                    
+--------------------------------------------------
+ Aggregate
+   ->  Append
+         ->  Hash Anti Join
+               Hash Cond: (t1.a = t2.b)
+               ->  Seq Scan on prt1_p1 t1
+               ->  Hash
+                     ->  Seq Scan on prt2_p1 t2
+         ->  Hash Anti Join
+               Hash Cond: (t1_1.a = t2_1.b)
+               ->  Seq Scan on prt1_p2 t1_1
+               ->  Hash
+                     ->  Seq Scan on prt2_p2 t2_1
+         ->  Hash Anti Join
+               Hash Cond: (t1_2.a = t2_2.b)
+               ->  Seq Scan on prt1_p3 t1_2
+               ->  Hash
+                     ->  Seq Scan on prt2_p3 t2_2
+(17 rows)
+
+SELECT sum(t1.a), avg(t1.a), sum(t1.b), avg(t1.b) FROM prt1 t1 WHERE NOT EXISTS (SELECT 1 FROM prt2 t2 WHERE t1.a = t2.b);
+  sum  |         avg          | sum  |         avg         
+-------+----------------------+------+---------------------
+ 60000 | 300.0000000000000000 | 2400 | 12.0000000000000000
+(1 row)
+
+-- lateral reference
+EXPLAIN (COSTS OFF)
+SELECT * FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.a = ss.t2a WHERE t1.b = 0 ORDER BY t1.a;
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Result
+         ->  Append
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_p1 t1
+                           Filter: (b = 0)
+                     ->  Nested Loop
+                           ->  Index Only Scan using iprt1_p1_a on prt1_p1 t2
+                                 Index Cond: (a = t1.a)
+                           ->  Index Scan using iprt2_p1_b on prt2_p1 t3
+                                 Index Cond: (b = t2.a)
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_p2 t1_1
+                           Filter: (b = 0)
+                     ->  Nested Loop
+                           ->  Index Only Scan using iprt1_p2_a on prt1_p2 t2_1
+                                 Index Cond: (a = t1_1.a)
+                           ->  Index Scan using iprt2_p2_b on prt2_p2 t3_1
+                                 Index Cond: (b = t2_1.a)
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_p3 t1_2
+                           Filter: (b = 0)
+                     ->  Nested Loop
+                           ->  Index Only Scan using iprt1_p3_a on prt1_p3 t2_2
+                                 Index Cond: (a = t1_2.a)
+                           ->  Index Scan using iprt2_p3_b on prt2_p3 t3_2
+                                 Index Cond: (b = t2_2.a)
+(28 rows)
+
+SELECT * FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.a = ss.t2a WHERE t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   | t2a | t3a | least 
+-----+---+------+-----+-----+-------
+   0 | 0 | 0000 |   0 |   0 |     0
+  50 | 0 | 0050 |     |     |      
+ 100 | 0 | 0100 |     |     |      
+ 150 | 0 | 0150 | 150 |   0 |   150
+ 200 | 0 | 0200 |     |     |      
+ 250 | 0 | 0250 |     |     |      
+ 300 | 0 | 0300 | 300 |   0 |   300
+ 350 | 0 | 0350 |     |     |      
+ 400 | 0 | 0400 |     |     |      
+ 450 | 0 | 0450 | 450 |   0 |   450
+ 500 | 0 | 0500 |     |     |      
+ 550 | 0 | 0550 |     |     |      
+(12 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, ss.t2a, ss.t2c FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, t2.b t2b, t2.c t2c, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.c = ss.t2c WHERE (t1.b + coalesce(ss.t2b, 0)) = 0 ORDER BY t1.a;
+                          QUERY PLAN                          
+--------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Hash Left Join
+         Hash Cond: ((t1.c)::text = (t2.c)::text)
+         Filter: ((t1.b + COALESCE(t2.b, 0)) = 0)
+         ->  Append
+               ->  Seq Scan on prt1_p1 t1
+               ->  Seq Scan on prt1_p2 t1_1
+               ->  Seq Scan on prt1_p3 t1_2
+         ->  Hash
+               ->  Append
+                     ->  Hash Join
+                           Hash Cond: (t2.a = t3.b)
+                           ->  Seq Scan on prt1_p1 t2
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p1 t3
+                     ->  Hash Join
+                           Hash Cond: (t2_1.a = t3_1.b)
+                           ->  Seq Scan on prt1_p2 t2_1
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p2 t3_1
+                     ->  Hash Join
+                           Hash Cond: (t2_2.a = t3_2.b)
+                           ->  Seq Scan on prt1_p3 t2_2
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p3 t3_2
+(26 rows)
+
+SELECT t1.a, ss.t2a, ss.t2c FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, t2.b t2b, t2.c t2c, least(t1.a,t2.a,t3.a) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.c = ss.t2c WHERE (t1.b + coalesce(ss.t2b, 0)) = 0 ORDER BY t1.a;
+  a  | t2a | t2c  
+-----+-----+------
+   0 |   0 | 0000
+  50 |     | 
+ 100 |     | 
+ 150 | 150 | 0150
+ 200 |     | 
+ 250 |     | 
+ 300 | 300 | 0300
+ 350 |     | 
+ 400 |     | 
+ 450 | 450 | 0450
+ 500 |     | 
+ 550 |     | 
+(12 rows)
+
+--
+-- partitioned by expression
+--
+CREATE TABLE prt1_e (a int, b int, c int) PARTITION BY RANGE(((a + b)/2));
+CREATE TABLE prt1_e_p1 PARTITION OF prt1_e FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_e_p2 PARTITION OF prt1_e FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt1_e_p3 PARTITION OF prt1_e FOR VALUES FROM (500) TO (600);
+INSERT INTO prt1_e SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
+CREATE INDEX iprt1_e_p1_ab2 on prt1_e_p1(((a+b)/2));
+CREATE INDEX iprt1_e_p2_ab2 on prt1_e_p2(((a+b)/2));
+CREATE INDEX iprt1_e_p3_ab2 on prt1_e_p3(((a+b)/2));
+ANALYZE prt1_e;
+CREATE TABLE prt2_e (a int, b int, c int) PARTITION BY RANGE(((b + a)/2));
+CREATE TABLE prt2_e_p1 PARTITION OF prt2_e FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_e_p2 PARTITION OF prt2_e FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt2_e_p3 PARTITION OF prt2_e FOR VALUES FROM (500) TO (600);
+INSERT INTO prt2_e SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_e;
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_e t1, prt2_e t2 WHERE (t1.a + t1.b)/2 = (t2.b + t2.a)/2 AND t1.c = 0 ORDER BY t1.a, t2.b;
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b
+   ->  Append
+         ->  Hash Join
+               Hash Cond: (((t2.b + t2.a) / 2) = ((t1.a + t1.b) / 2))
+               ->  Seq Scan on prt2_e_p1 t2
+               ->  Hash
+                     ->  Seq Scan on prt1_e_p1 t1
+                           Filter: (c = 0)
+         ->  Hash Join
+               Hash Cond: (((t2_1.b + t2_1.a) / 2) = ((t1_1.a + t1_1.b) / 2))
+               ->  Seq Scan on prt2_e_p2 t2_1
+               ->  Hash
+                     ->  Seq Scan on prt1_e_p2 t1_1
+                           Filter: (c = 0)
+         ->  Hash Join
+               Hash Cond: (((t2_2.b + t2_2.a) / 2) = ((t1_2.a + t1_2.b) / 2))
+               ->  Seq Scan on prt2_e_p3 t2_2
+               ->  Hash
+                     ->  Seq Scan on prt1_e_p3 t1_2
+                           Filter: (c = 0)
+(21 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_e t1, prt2_e t2 WHERE (t1.a + t1.b)/2 = (t2.b + t2.a)/2 AND t1.c = 0 ORDER BY t1.a, t2.b;
+  a  | c |  b  | c 
+-----+---+-----+---
+   0 | 0 |   0 | 0
+ 150 | 0 | 150 | 0
+ 300 | 0 | 300 | 0
+ 450 | 0 | 450 | 0
+(4 rows)
+
+--
+-- N-way join
+--
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM prt1 t1, prt2 t2, prt1_e t3 WHERE t1.a = t2.b AND t1.a = (t3.a + t3.b)/2 AND t1.b = 0 ORDER BY t1.a, t2.b;
+                                QUERY PLAN                                 
+---------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Result
+         ->  Append
+               ->  Nested Loop
+                     Join Filter: (t1.a = ((t3.a + t3.b) / 2))
+                     ->  Hash Join
+                           Hash Cond: (t2.b = t1.a)
+                           ->  Seq Scan on prt2_p1 t2
+                           ->  Hash
+                                 ->  Seq Scan on prt1_p1 t1
+                                       Filter: (b = 0)
+                     ->  Index Scan using iprt1_e_p1_ab2 on prt1_e_p1 t3
+                           Index Cond: (((a + b) / 2) = t2.b)
+               ->  Nested Loop
+                     Join Filter: (t1_1.a = ((t3_1.a + t3_1.b) / 2))
+                     ->  Hash Join
+                           Hash Cond: (t2_1.b = t1_1.a)
+                           ->  Seq Scan on prt2_p2 t2_1
+                           ->  Hash
+                                 ->  Seq Scan on prt1_p2 t1_1
+                                       Filter: (b = 0)
+                     ->  Index Scan using iprt1_e_p2_ab2 on prt1_e_p2 t3_1
+                           Index Cond: (((a + b) / 2) = t2_1.b)
+               ->  Nested Loop
+                     Join Filter: (t1_2.a = ((t3_2.a + t3_2.b) / 2))
+                     ->  Hash Join
+                           Hash Cond: (t2_2.b = t1_2.a)
+                           ->  Seq Scan on prt2_p3 t2_2
+                           ->  Hash
+                                 ->  Seq Scan on prt1_p3 t1_2
+                                       Filter: (b = 0)
+                     ->  Index Scan using iprt1_e_p3_ab2 on prt1_e_p3 t3_2
+                           Index Cond: (((a + b) / 2) = t2_2.b)
+(34 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM prt1 t1, prt2 t2, prt1_e t3 WHERE t1.a = t2.b AND t1.a = (t3.a + t3.b)/2 AND t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   | ?column? | c 
+-----+------+-----+------+----------+---
+   0 | 0000 |   0 | 0000 |        0 | 0
+ 150 | 0150 | 150 | 0150 |      300 | 0
+ 300 | 0300 | 300 | 0300 |      600 | 0
+ 450 | 0450 | 450 | 0450 |      900 | 0
+(4 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) LEFT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.b = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+                             QUERY PLAN                             
+--------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b, ((t3.a + t3.b))
+   ->  Result
+         ->  Append
+               ->  Hash Right Join
+                     Hash Cond: (((t3.a + t3.b) / 2) = t1.a)
+                     ->  Seq Scan on prt1_e_p1 t3
+                     ->  Hash
+                           ->  Hash Right Join
+                                 Hash Cond: (t2.b = t1.a)
+                                 ->  Seq Scan on prt2_p1 t2
+                                 ->  Hash
+                                       ->  Seq Scan on prt1_p1 t1
+                                             Filter: (b = 0)
+               ->  Hash Right Join
+                     Hash Cond: (((t3_1.a + t3_1.b) / 2) = t1_1.a)
+                     ->  Seq Scan on prt1_e_p2 t3_1
+                     ->  Hash
+                           ->  Hash Right Join
+                                 Hash Cond: (t2_1.b = t1_1.a)
+                                 ->  Seq Scan on prt2_p2 t2_1
+                                 ->  Hash
+                                       ->  Seq Scan on prt1_p2 t1_1
+                                             Filter: (b = 0)
+               ->  Hash Right Join
+                     Hash Cond: (((t3_2.a + t3_2.b) / 2) = t1_2.a)
+                     ->  Seq Scan on prt1_e_p3 t3_2
+                     ->  Hash
+                           ->  Hash Right Join
+                                 Hash Cond: (t2_2.b = t1_2.a)
+                                 ->  Seq Scan on prt2_p3 t2_2
+                                 ->  Hash
+                                       ->  Seq Scan on prt1_p3 t1_2
+                                             Filter: (b = 0)
+(34 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) LEFT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.b = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+  a  |  c   |  b  |  c   | ?column? | c 
+-----+------+-----+------+----------+---
+   0 | 0000 |   0 | 0000 |        0 | 0
+  50 | 0050 |     |      |      100 | 0
+ 100 | 0100 |     |      |      200 | 0
+ 150 | 0150 | 150 | 0150 |      300 | 0
+ 200 | 0200 |     |      |      400 | 0
+ 250 | 0250 |     |      |      500 | 0
+ 300 | 0300 | 300 | 0300 |      600 | 0
+ 350 | 0350 |     |      |      700 | 0
+ 400 | 0400 |     |      |      800 | 0
+ 450 | 0450 | 450 | 0450 |      900 | 0
+ 500 | 0500 |     |      |     1000 | 0
+ 550 | 0550 |     |      |     1100 | 0
+(12 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b, ((t3.a + t3.b))
+   ->  Result
+         ->  Append
+               ->  Nested Loop Left Join
+                     ->  Hash Right Join
+                           Hash Cond: (t1.a = ((t3.a + t3.b) / 2))
+                           ->  Seq Scan on prt1_p1 t1
+                           ->  Hash
+                                 ->  Seq Scan on prt1_e_p1 t3
+                                       Filter: (c = 0)
+                     ->  Index Scan using iprt2_p1_b on prt2_p1 t2
+                           Index Cond: (t1.a = b)
+               ->  Nested Loop Left Join
+                     ->  Hash Right Join
+                           Hash Cond: (t1_1.a = ((t3_1.a + t3_1.b) / 2))
+                           ->  Seq Scan on prt1_p2 t1_1
+                           ->  Hash
+                                 ->  Seq Scan on prt1_e_p2 t3_1
+                                       Filter: (c = 0)
+                     ->  Index Scan using iprt2_p2_b on prt2_p2 t2_1
+                           Index Cond: (t1_1.a = b)
+               ->  Nested Loop Left Join
+                     ->  Hash Right Join
+                           Hash Cond: (t1_2.a = ((t3_2.a + t3_2.b) / 2))
+                           ->  Seq Scan on prt1_p3 t1_2
+                           ->  Hash
+                                 ->  Seq Scan on prt1_e_p3 t3_2
+                                       Filter: (c = 0)
+                     ->  Index Scan using iprt2_p3_b on prt2_p3 t2_2
+                           Index Cond: (t1_2.a = b)
+(31 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+  a  |  c   |  b  |  c   | ?column? | c 
+-----+------+-----+------+----------+---
+   0 | 0000 |   0 | 0000 |        0 | 0
+  50 | 0050 |     |      |      100 | 0
+ 100 | 0100 |     |      |      200 | 0
+ 150 | 0150 | 150 | 0150 |      300 | 0
+ 200 | 0200 |     |      |      400 | 0
+ 250 | 0250 |     |      |      500 | 0
+ 300 | 0300 | 300 | 0300 |      600 | 0
+ 350 | 0350 |     |      |      700 | 0
+ 400 | 0400 |     |      |      800 | 0
+ 450 | 0450 | 450 | 0450 |      900 | 0
+ 500 | 0500 |     |      |     1000 | 0
+ 550 | 0550 |     |      |     1100 | 0
+(12 rows)
+
+-- Cases with non-nullable expressions in subquery results;
+-- make sure these go to null as expected
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.phv, t2.b, t2.phv, t3.a + t3.b, t3.phv FROM ((SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b)) FULL JOIN (SELECT 50 phv, * FROM prt1_e WHERE prt1_e.c = 0) t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.a = t1.phv OR t2.b = t2.phv OR (t3.a + t3.b)/2 = t3.phv ORDER BY t1.a, t2.b, t3.a + t3.b;
+                                                      QUERY PLAN                                                      
+----------------------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: prt1_p1.a, prt2_p1.b, ((prt1_e_p1.a + prt1_e_p1.b))
+   ->  Result
+         ->  Append
+               ->  Hash Full Join
+                     Hash Cond: (prt1_p1.a = ((prt1_e_p1.a + prt1_e_p1.b) / 2))
+                     Filter: ((prt1_p1.a = (50)) OR (prt2_p1.b = (75)) OR (((prt1_e_p1.a + prt1_e_p1.b) / 2) = (50)))
+                     ->  Hash Full Join
+                           Hash Cond: (prt1_p1.a = prt2_p1.b)
+                           ->  Seq Scan on prt1_p1
+                                 Filter: (b = 0)
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p1
+                                       Filter: (a = 0)
+                     ->  Hash
+                           ->  Seq Scan on prt1_e_p1
+                                 Filter: (c = 0)
+               ->  Hash Full Join
+                     Hash Cond: (prt1_p2.a = ((prt1_e_p2.a + prt1_e_p2.b) / 2))
+                     Filter: ((prt1_p2.a = (50)) OR (prt2_p2.b = (75)) OR (((prt1_e_p2.a + prt1_e_p2.b) / 2) = (50)))
+                     ->  Hash Full Join
+                           Hash Cond: (prt1_p2.a = prt2_p2.b)
+                           ->  Seq Scan on prt1_p2
+                                 Filter: (b = 0)
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p2
+                                       Filter: (a = 0)
+                     ->  Hash
+                           ->  Seq Scan on prt1_e_p2
+                                 Filter: (c = 0)
+               ->  Hash Full Join
+                     Hash Cond: (prt1_p3.a = ((prt1_e_p3.a + prt1_e_p3.b) / 2))
+                     Filter: ((prt1_p3.a = (50)) OR (prt2_p3.b = (75)) OR (((prt1_e_p3.a + prt1_e_p3.b) / 2) = (50)))
+                     ->  Hash Full Join
+                           Hash Cond: (prt1_p3.a = prt2_p3.b)
+                           ->  Seq Scan on prt1_p3
+                                 Filter: (b = 0)
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p3
+                                       Filter: (a = 0)
+                     ->  Hash
+                           ->  Seq Scan on prt1_e_p3
+                                 Filter: (c = 0)
+(43 rows)
+
+SELECT t1.a, t1.phv, t2.b, t2.phv, t3.a + t3.b, t3.phv FROM ((SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b)) FULL JOIN (SELECT 50 phv, * FROM prt1_e WHERE prt1_e.c = 0) t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.a = t1.phv OR t2.b = t2.phv OR (t3.a + t3.b)/2 = t3.phv ORDER BY t1.a, t2.b, t3.a + t3.b;
+ a  | phv | b  | phv | ?column? | phv 
+----+-----+----+-----+----------+-----
+ 50 |  50 |    |     |      100 |  50
+    |     | 75 |  75 |          |    
+(2 rows)
+
+-- Semi-join
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHERE t1.a = 0 AND t1.b = (t2.a + t2.b)/2) AND t1.b = 0 ORDER BY t1.a;
+                                   QUERY PLAN                                    
+---------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Nested Loop
+               Join Filter: (t1.a = t1_3.b)
+               ->  HashAggregate
+                     Group Key: t1_3.b
+                     ->  Hash Join
+                           Hash Cond: (((t2.a + t2.b) / 2) = t1_3.b)
+                           ->  Seq Scan on prt1_e_p1 t2
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p1 t1_3
+                                       Filter: (a = 0)
+               ->  Index Scan using iprt1_p1_a on prt1_p1 t1
+                     Index Cond: (a = ((t2.a + t2.b) / 2))
+                     Filter: (b = 0)
+         ->  Nested Loop
+               Join Filter: (t1_1.a = t1_4.b)
+               ->  HashAggregate
+                     Group Key: t1_4.b
+                     ->  Hash Join
+                           Hash Cond: (((t2_1.a + t2_1.b) / 2) = t1_4.b)
+                           ->  Seq Scan on prt1_e_p2 t2_1
+                           ->  Hash
+                                 ->  Seq Scan on prt2_p2 t1_4
+                                       Filter: (a = 0)
+               ->  Index Scan using iprt1_p2_a on prt1_p2 t1_1
+                     Index Cond: (a = ((t2_1.a + t2_1.b) / 2))
+                     Filter: (b = 0)
+         ->  Nested Loop
+               Join Filter: (t1_2.a = t1_5.b)
+               ->  HashAggregate
+                     Group Key: t1_5.b
+                     ->  Nested Loop
+                           ->  Seq Scan on prt2_p3 t1_5
+                                 Filter: (a = 0)
+                           ->  Index Scan using iprt1_e_p3_ab2 on prt1_e_p3 t2_2
+                                 Index Cond: (((a + b) / 2) = t1_5.b)
+               ->  Index Scan using iprt1_p3_a on prt1_p3 t1_2
+                     Index Cond: (a = ((t2_2.a + t2_2.b) / 2))
+                     Filter: (b = 0)
+(41 rows)
+
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHERE t1.a = 0 AND t1.b = (t2.a + t2.b)/2) AND t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   
+-----+---+------
+   0 | 0 | 0000
+ 150 | 0 | 0150
+ 300 | 0 | 0300
+ 450 | 0 | 0450
+(4 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Nested Loop
+               ->  HashAggregate
+                     Group Key: t1_3.b
+                     ->  Hash Semi Join
+                           Hash Cond: (t1_3.b = ((t1_6.a + t1_6.b) / 2))
+                           ->  Seq Scan on prt2_p1 t1_3
+                           ->  Hash
+                                 ->  Seq Scan on prt1_e_p1 t1_6
+                                       Filter: (c = 0)
+               ->  Index Scan using iprt1_p1_a on prt1_p1 t1
+                     Index Cond: (a = t1_3.b)
+                     Filter: (b = 0)
+         ->  Nested Loop
+               ->  HashAggregate
+                     Group Key: t1_4.b
+                     ->  Hash Semi Join
+                           Hash Cond: (t1_4.b = ((t1_7.a + t1_7.b) / 2))
+                           ->  Seq Scan on prt2_p2 t1_4
+                           ->  Hash
+                                 ->  Seq Scan on prt1_e_p2 t1_7
+                                       Filter: (c = 0)
+               ->  Index Scan using iprt1_p2_a on prt1_p2 t1_1
+                     Index Cond: (a = t1_4.b)
+                     Filter: (b = 0)
+         ->  Nested Loop
+               ->  Unique
+                     ->  Sort
+                           Sort Key: t1_5.b
+                           ->  Hash Semi Join
+                                 Hash Cond: (t1_5.b = ((t1_8.a + t1_8.b) / 2))
+                                 ->  Seq Scan on prt2_p3 t1_5
+                                 ->  Hash
+                                       ->  Seq Scan on prt1_e_p3 t1_8
+                                             Filter: (c = 0)
+               ->  Index Scan using iprt1_p3_a on prt1_p3 t1_2
+                     Index Cond: (a = t1_5.b)
+                     Filter: (b = 0)
+(40 rows)
+
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   
+-----+---+------
+   0 | 0 | 0000
+ 150 | 0 | 0150
+ 300 | 0 | 0300
+ 450 | 0 | 0450
+(4 rows)
+
+-- test merge joins
+SET enable_hashjoin TO off;
+SET enable_nestloop TO off;
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Merge Append
+   Sort Key: t1.a
+   ->  Merge Semi Join
+         Merge Cond: (t1.a = t1_3.b)
+         ->  Sort
+               Sort Key: t1.a
+               ->  Seq Scan on prt1_p1 t1
+                     Filter: (b = 0)
+         ->  Merge Semi Join
+               Merge Cond: (t1_3.b = (((t1_6.a + t1_6.b) / 2)))
+               ->  Sort
+                     Sort Key: t1_3.b
+                     ->  Seq Scan on prt2_p1 t1_3
+               ->  Sort
+                     Sort Key: (((t1_6.a + t1_6.b) / 2))
+                     ->  Seq Scan on prt1_e_p1 t1_6
+                           Filter: (c = 0)
+   ->  Merge Semi Join
+         Merge Cond: (t1_1.a = t1_4.b)
+         ->  Sort
+               Sort Key: t1_1.a
+               ->  Seq Scan on prt1_p2 t1_1
+                     Filter: (b = 0)
+         ->  Merge Semi Join
+               Merge Cond: (t1_4.b = (((t1_7.a + t1_7.b) / 2)))
+               ->  Sort
+                     Sort Key: t1_4.b
+                     ->  Seq Scan on prt2_p2 t1_4
+               ->  Sort
+                     Sort Key: (((t1_7.a + t1_7.b) / 2))
+                     ->  Seq Scan on prt1_e_p2 t1_7
+                           Filter: (c = 0)
+   ->  Merge Semi Join
+         Merge Cond: (t1_2.a = t1_5.b)
+         ->  Sort
+               Sort Key: t1_2.a
+               ->  Seq Scan on prt1_p3 t1_2
+                     Filter: (b = 0)
+         ->  Merge Semi Join
+               Merge Cond: (t1_5.b = (((t1_8.a + t1_8.b) / 2)))
+               ->  Sort
+                     Sort Key: t1_5.b
+                     ->  Seq Scan on prt2_p3 t1_5
+               ->  Sort
+                     Sort Key: (((t1_8.a + t1_8.b) / 2))
+                     ->  Seq Scan on prt1_e_p3 t1_8
+                           Filter: (c = 0)
+(47 rows)
+
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   
+-----+---+------
+   0 | 0 | 0000
+ 150 | 0 | 0150
+ 300 | 0 | 0300
+ 450 | 0 | 0450
+(4 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+                                    QUERY PLAN                                    
+----------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b, ((t3.a + t3.b))
+   ->  Result
+         ->  Append
+               ->  Merge Left Join
+                     Merge Cond: (t1.a = t2.b)
+                     ->  Sort
+                           Sort Key: t1.a
+                           ->  Merge Left Join
+                                 Merge Cond: ((((t3.a + t3.b) / 2)) = t1.a)
+                                 ->  Sort
+                                       Sort Key: (((t3.a + t3.b) / 2))
+                                       ->  Seq Scan on prt1_e_p1 t3
+                                             Filter: (c = 0)
+                                 ->  Sort
+                                       Sort Key: t1.a
+                                       ->  Seq Scan on prt1_p1 t1
+                     ->  Sort
+                           Sort Key: t2.b
+                           ->  Seq Scan on prt2_p1 t2
+               ->  Merge Left Join
+                     Merge Cond: (t1_1.a = t2_1.b)
+                     ->  Sort
+                           Sort Key: t1_1.a
+                           ->  Merge Left Join
+                                 Merge Cond: ((((t3_1.a + t3_1.b) / 2)) = t1_1.a)
+                                 ->  Sort
+                                       Sort Key: (((t3_1.a + t3_1.b) / 2))
+                                       ->  Seq Scan on prt1_e_p2 t3_1
+                                             Filter: (c = 0)
+                                 ->  Sort
+                                       Sort Key: t1_1.a
+                                       ->  Seq Scan on prt1_p2 t1_1
+                     ->  Sort
+                           Sort Key: t2_1.b
+                           ->  Seq Scan on prt2_p2 t2_1
+               ->  Merge Left Join
+                     Merge Cond: (t1_2.a = t2_2.b)
+                     ->  Sort
+                           Sort Key: t1_2.a
+                           ->  Merge Left Join
+                                 Merge Cond: ((((t3_2.a + t3_2.b) / 2)) = t1_2.a)
+                                 ->  Sort
+                                       Sort Key: (((t3_2.a + t3_2.b) / 2))
+                                       ->  Seq Scan on prt1_e_p3 t3_2
+                                             Filter: (c = 0)
+                                 ->  Sort
+                                       Sort Key: t1_2.a
+                                       ->  Seq Scan on prt1_p3 t1_2
+                     ->  Sort
+                           Sort Key: t2_2.b
+                           ->  Seq Scan on prt2_p3 t2_2
+(52 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+  a  |  c   |  b  |  c   | ?column? | c 
+-----+------+-----+------+----------+---
+   0 | 0000 |   0 | 0000 |        0 | 0
+  50 | 0050 |     |      |      100 | 0
+ 100 | 0100 |     |      |      200 | 0
+ 150 | 0150 | 150 | 0150 |      300 | 0
+ 200 | 0200 |     |      |      400 | 0
+ 250 | 0250 |     |      |      500 | 0
+ 300 | 0300 | 300 | 0300 |      600 | 0
+ 350 | 0350 |     |      |      700 | 0
+ 400 | 0400 |     |      |      800 | 0
+ 450 | 0450 | 450 | 0450 |      900 | 0
+ 500 | 0500 |     |      |     1000 | 0
+ 550 | 0550 |     |      |     1100 | 0
+(12 rows)
+
+-- MergeAppend on nullable column
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t2.b FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ Sort
+   Sort Key: prt1_p1.a, b
+   ->  Append
+         ->  Merge Left Join
+               Merge Cond: (prt1_p1.a = b)
+               ->  Sort
+                     Sort Key: prt1_p1.a
+                     ->  Seq Scan on prt1_p1
+                           Filter: ((a < 450) AND (b = 0))
+               ->  Sort
+                     Sort Key: b
+                     ->  Result
+                           One-Time Filter: false
+         ->  Merge Left Join
+               Merge Cond: (prt1_p2.a = prt2_p2.b)
+               ->  Sort
+                     Sort Key: prt1_p2.a
+                     ->  Seq Scan on prt1_p2
+                           Filter: ((a < 450) AND (b = 0))
+               ->  Sort
+                     Sort Key: prt2_p2.b
+                     ->  Seq Scan on prt2_p2
+                           Filter: (b > 250)
+(23 rows)
+
+SELECT t1.a, t2.b FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  b  
+-----+-----
+   0 |    
+  50 |    
+ 100 |    
+ 150 |    
+ 200 |    
+ 250 |    
+ 300 | 300
+ 350 |    
+ 400 |    
+(9 rows)
+
+RESET enable_hashjoin;
+RESET enable_nestloop;
+--
+-- partitioned by multiple columns
+--
+CREATE TABLE prt1_m (a int, b int, c int) PARTITION BY RANGE(a, ((a + b)/2));
+CREATE TABLE prt1_m_p1 PARTITION OF prt1_m FOR VALUES FROM (0, 0) TO (250, 250);
+CREATE TABLE prt1_m_p2 PARTITION OF prt1_m FOR VALUES FROM (250, 250) TO (500, 500);
+CREATE TABLE prt1_m_p3 PARTITION OF prt1_m FOR VALUES FROM (500, 500) TO (600, 600);
+INSERT INTO prt1_m SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
+ANALYZE prt1_m;
+CREATE TABLE prt2_m (a int, b int, c int) PARTITION BY RANGE(((b + a)/2), b);
+CREATE TABLE prt2_m_p1 PARTITION OF prt2_m FOR VALUES FROM (0, 0) TO (250, 250);
+CREATE TABLE prt2_m_p2 PARTITION OF prt2_m FOR VALUES FROM (250, 250) TO (500, 500);
+CREATE TABLE prt2_m_p3 PARTITION OF prt2_m FOR VALUES FROM (500, 500) TO (600, 600);
+INSERT INTO prt2_m SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_m;
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_m WHERE prt1_m.c = 0) t1 FULL JOIN (SELECT * FROM prt2_m WHERE prt2_m.c = 0) t2 ON (t1.a = (t2.b + t2.a)/2 AND t2.b = (t1.a + t1.b)/2) ORDER BY t1.a, t2.b;
+                                                             QUERY PLAN                                                             
+------------------------------------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: prt1_m_p1.a, prt2_m_p1.b
+   ->  Append
+         ->  Hash Full Join
+               Hash Cond: ((prt1_m_p1.a = ((prt2_m_p1.b + prt2_m_p1.a) / 2)) AND (((prt1_m_p1.a + prt1_m_p1.b) / 2) = prt2_m_p1.b))
+               ->  Seq Scan on prt1_m_p1
+                     Filter: (c = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_m_p1
+                           Filter: (c = 0)
+         ->  Hash Full Join
+               Hash Cond: ((prt1_m_p2.a = ((prt2_m_p2.b + prt2_m_p2.a) / 2)) AND (((prt1_m_p2.a + prt1_m_p2.b) / 2) = prt2_m_p2.b))
+               ->  Seq Scan on prt1_m_p2
+                     Filter: (c = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_m_p2
+                           Filter: (c = 0)
+         ->  Hash Full Join
+               Hash Cond: ((prt1_m_p3.a = ((prt2_m_p3.b + prt2_m_p3.a) / 2)) AND (((prt1_m_p3.a + prt1_m_p3.b) / 2) = prt2_m_p3.b))
+               ->  Seq Scan on prt1_m_p3
+                     Filter: (c = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_m_p3
+                           Filter: (c = 0)
+(24 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_m WHERE prt1_m.c = 0) t1 FULL JOIN (SELECT * FROM prt2_m WHERE prt2_m.c = 0) t2 ON (t1.a = (t2.b + t2.a)/2 AND t2.b = (t1.a + t1.b)/2) ORDER BY t1.a, t2.b;
+  a  | c |  b  | c 
+-----+---+-----+---
+   0 | 0 |   0 | 0
+  50 | 0 |     |  
+ 100 | 0 |     |  
+ 150 | 0 | 150 | 0
+ 200 | 0 |     |  
+ 250 | 0 |     |  
+ 300 | 0 | 300 | 0
+ 350 | 0 |     |  
+ 400 | 0 |     |  
+ 450 | 0 | 450 | 0
+ 500 | 0 |     |  
+ 550 | 0 |     |  
+     |   |  75 | 0
+     |   | 225 | 0
+     |   | 375 | 0
+     |   | 525 | 0
+(16 rows)
+
+--
+-- tests for list partitioned tables.
+--
+CREATE TABLE plt1 (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE plt1_p1 PARTITION OF plt1 FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt1_p2 PARTITION OF plt1 FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt1_p3 PARTITION OF plt1 FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE plt1;
+CREATE TABLE plt2 (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE plt2_p1 PARTITION OF plt2 FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt2_p2 PARTITION OF plt2 FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt2_p3 PARTITION OF plt2 FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE plt2;
+--
+-- list partitioned by expression
+--
+CREATE TABLE plt1_e (a int, b int, c text) PARTITION BY LIST(ltrim(c, 'A'));
+CREATE TABLE plt1_e_p1 PARTITION OF plt1_e FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt1_e_p2 PARTITION OF plt1_e FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt1_e_p3 PARTITION OF plt1_e FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE plt1_e;
+-- test partition matching with N-way join
+EXPLAIN (COSTS OFF)
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM plt1 t1, plt2 t2, plt1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ GroupAggregate
+   Group Key: t1.c, t2.c, t3.c
+   ->  Sort
+         Sort Key: t1.c, t3.c
+         ->  Result
+               ->  Append
+                     ->  Hash Join
+                           Hash Cond: (t1.c = ltrim(t3.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1.b = t2.b) AND (t1.c = t2.c))
+                                 ->  Seq Scan on plt1_p1 t1
+                                 ->  Hash
+                                       ->  Seq Scan on plt2_p1 t2
+                           ->  Hash
+                                 ->  Seq Scan on plt1_e_p1 t3
+                     ->  Hash Join
+                           Hash Cond: (t1_1.c = ltrim(t3_1.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1_1.b = t2_1.b) AND (t1_1.c = t2_1.c))
+                                 ->  Seq Scan on plt1_p2 t1_1
+                                 ->  Hash
+                                       ->  Seq Scan on plt2_p2 t2_1
+                           ->  Hash
+                                 ->  Seq Scan on plt1_e_p2 t3_1
+                     ->  Hash Join
+                           Hash Cond: (t1_2.c = ltrim(t3_2.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1_2.b = t2_2.b) AND (t1_2.c = t2_2.c))
+                                 ->  Seq Scan on plt1_p3 t1_2
+                                 ->  Hash
+                                       ->  Seq Scan on plt2_p3 t2_2
+                           ->  Hash
+                                 ->  Seq Scan on plt1_e_p3 t3_2
+(33 rows)
+
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM plt1 t1, plt2 t2, plt1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+         avg          |         avg          |          avg          |  c   |  c   |   c   
+----------------------+----------------------+-----------------------+------+------+-------
+  24.0000000000000000 |  24.0000000000000000 |   48.0000000000000000 | 0000 | 0000 | A0000
+  75.0000000000000000 |  75.0000000000000000 |  148.0000000000000000 | 0001 | 0001 | A0001
+ 123.0000000000000000 | 123.0000000000000000 |  248.0000000000000000 | 0002 | 0002 | A0002
+ 174.0000000000000000 | 174.0000000000000000 |  348.0000000000000000 | 0003 | 0003 | A0003
+ 225.0000000000000000 | 225.0000000000000000 |  448.0000000000000000 | 0004 | 0004 | A0004
+ 273.0000000000000000 | 273.0000000000000000 |  548.0000000000000000 | 0005 | 0005 | A0005
+ 324.0000000000000000 | 324.0000000000000000 |  648.0000000000000000 | 0006 | 0006 | A0006
+ 375.0000000000000000 | 375.0000000000000000 |  748.0000000000000000 | 0007 | 0007 | A0007
+ 423.0000000000000000 | 423.0000000000000000 |  848.0000000000000000 | 0008 | 0008 | A0008
+ 474.0000000000000000 | 474.0000000000000000 |  948.0000000000000000 | 0009 | 0009 | A0009
+ 525.0000000000000000 | 525.0000000000000000 | 1048.0000000000000000 | 0010 | 0010 | A0010
+ 573.0000000000000000 | 573.0000000000000000 | 1148.0000000000000000 | 0011 | 0011 | A0011
+(12 rows)
+
+-- joins where one of the relations is proven empty
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a = 1 AND t1.a = 2;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 LEFT JOIN prt2 t2 ON t1.a = t2.b;
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b, prt1 t3 WHERE t2.b = t3.a;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Hash Left Join
+   Hash Cond: (t2.b = a)
+   ->  Append
+         ->  Hash Join
+               Hash Cond: (t3.a = t2.b)
+               ->  Seq Scan on prt1_p1 t3
+               ->  Hash
+                     ->  Seq Scan on prt2_p1 t2
+         ->  Hash Join
+               Hash Cond: (t3_1.a = t2_1.b)
+               ->  Seq Scan on prt1_p2 t3_1
+               ->  Hash
+                     ->  Seq Scan on prt2_p2 t2_1
+         ->  Hash Join
+               Hash Cond: (t3_2.a = t2_2.b)
+               ->  Seq Scan on prt1_p3 t3_2
+               ->  Hash
+                     ->  Seq Scan on prt2_p3 t2_2
+   ->  Hash
+         ->  Result
+               One-Time Filter: false
+(21 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 FULL JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+                 QUERY PLAN                 
+--------------------------------------------
+ Sort
+   Sort Key: a, t2.b
+   ->  Hash Left Join
+         Hash Cond: (t2.b = a)
+         ->  Append
+               ->  Seq Scan on prt2_p1 t2
+                     Filter: (a = 0)
+               ->  Seq Scan on prt2_p2 t2_1
+                     Filter: (a = 0)
+               ->  Seq Scan on prt2_p3 t2_2
+                     Filter: (a = 0)
+         ->  Hash
+               ->  Result
+                     One-Time Filter: false
+(14 rows)
+
+--
+-- tests for hash partitioned tables.
+--
+CREATE TABLE pht1 (a int, b int, c text) PARTITION BY HASH(c);
+CREATE TABLE pht1_p1 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht1_p2 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht1_p3 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE pht1;
+CREATE TABLE pht2 (a int, b int, c text) PARTITION BY HASH(c);
+CREATE TABLE pht2_p1 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht2_p2 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht2_p3 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE pht2;
+--
+-- hash partitioned by expression
+--
+CREATE TABLE pht1_e (a int, b int, c text) PARTITION BY HASH(ltrim(c, 'A'));
+CREATE TABLE pht1_e_p1 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht1_e_p2 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht1_e_p3 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 299, 2) i;
+ANALYZE pht1_e;
+-- test partition matching with N-way join
+EXPLAIN (COSTS OFF)
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM pht1 t1, pht2 t2, pht1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ GroupAggregate
+   Group Key: t1.c, t2.c, t3.c
+   ->  Sort
+         Sort Key: t1.c, t3.c
+         ->  Result
+               ->  Append
+                     ->  Hash Join
+                           Hash Cond: (t1.c = ltrim(t3.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1.b = t2.b) AND (t1.c = t2.c))
+                                 ->  Seq Scan on pht1_p1 t1
+                                 ->  Hash
+                                       ->  Seq Scan on pht2_p1 t2
+                           ->  Hash
+                                 ->  Seq Scan on pht1_e_p1 t3
+                     ->  Hash Join
+                           Hash Cond: (t1_1.c = ltrim(t3_1.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1_1.b = t2_1.b) AND (t1_1.c = t2_1.c))
+                                 ->  Seq Scan on pht1_p2 t1_1
+                                 ->  Hash
+                                       ->  Seq Scan on pht2_p2 t2_1
+                           ->  Hash
+                                 ->  Seq Scan on pht1_e_p2 t3_1
+                     ->  Hash Join
+                           Hash Cond: (t1_2.c = ltrim(t3_2.c, 'A'::text))
+                           ->  Hash Join
+                                 Hash Cond: ((t1_2.b = t2_2.b) AND (t1_2.c = t2_2.c))
+                                 ->  Seq Scan on pht1_p3 t1_2
+                                 ->  Hash
+                                       ->  Seq Scan on pht2_p3 t2_2
+                           ->  Hash
+                                 ->  Seq Scan on pht1_e_p3 t3_2
+(33 rows)
+
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM pht1 t1, pht2 t2, pht1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+         avg          |         avg          |         avg          |  c   |  c   |   c   
+----------------------+----------------------+----------------------+------+------+-------
+  24.0000000000000000 |  24.0000000000000000 |  48.0000000000000000 | 0000 | 0000 | A0000
+  75.0000000000000000 |  75.0000000000000000 | 148.0000000000000000 | 0001 | 0001 | A0001
+ 123.0000000000000000 | 123.0000000000000000 | 248.0000000000000000 | 0002 | 0002 | A0002
+ 174.0000000000000000 | 174.0000000000000000 | 348.0000000000000000 | 0003 | 0003 | A0003
+ 225.0000000000000000 | 225.0000000000000000 | 448.0000000000000000 | 0004 | 0004 | A0004
+ 273.0000000000000000 | 273.0000000000000000 | 548.0000000000000000 | 0005 | 0005 | A0005
+(6 rows)
+
+--
+-- multiple levels of partitioning
+--
+CREATE TABLE prt1_l (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE prt1_l_p1 PARTITION OF prt1_l FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_l_p2 PARTITION OF prt1_l FOR VALUES FROM (250) TO (500) PARTITION BY LIST (c);
+CREATE TABLE prt1_l_p2_p1 PARTITION OF prt1_l_p2 FOR VALUES IN ('0000', '0001');
+CREATE TABLE prt1_l_p2_p2 PARTITION OF prt1_l_p2 FOR VALUES IN ('0002', '0003');
+CREATE TABLE prt1_l_p3 PARTITION OF prt1_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (b);
+CREATE TABLE prt1_l_p3_p1 PARTITION OF prt1_l_p3 FOR VALUES FROM (0) TO (13);
+CREATE TABLE prt1_l_p3_p2 PARTITION OF prt1_l_p3 FOR VALUES FROM (13) TO (25);
+INSERT INTO prt1_l SELECT i, i % 25, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt1_l;
+CREATE TABLE prt2_l (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE prt2_l_p1 PARTITION OF prt2_l FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_l_p2 PARTITION OF prt2_l FOR VALUES FROM (250) TO (500) PARTITION BY LIST (c);
+CREATE TABLE prt2_l_p2_p1 PARTITION OF prt2_l_p2 FOR VALUES IN ('0000', '0001');
+CREATE TABLE prt2_l_p2_p2 PARTITION OF prt2_l_p2 FOR VALUES IN ('0002', '0003');
+CREATE TABLE prt2_l_p3 PARTITION OF prt2_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (a);
+CREATE TABLE prt2_l_p3_p1 PARTITION OF prt2_l_p3 FOR VALUES FROM (0) TO (13);
+CREATE TABLE prt2_l_p3_p2 PARTITION OF prt2_l_p3 FOR VALUES FROM (13) TO (25);
+INSERT INTO prt2_l SELECT i % 25, i, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_l;
+-- inner join, qual covering only top-level partitions
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1, prt2_l t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Append
+         ->  Hash Join
+               Hash Cond: (t2.b = t1.a)
+               ->  Seq Scan on prt2_l_p1 t2
+               ->  Hash
+                     ->  Seq Scan on prt1_l_p1 t1
+                           Filter: (b = 0)
+         ->  Hash Join
+               Hash Cond: (t2_1.b = t1_1.a)
+               ->  Append
+                     ->  Seq Scan on prt2_l_p2_p1 t2_1
+                     ->  Seq Scan on prt2_l_p2_p2 t2_2
+               ->  Hash
+                     ->  Append
+                           ->  Seq Scan on prt1_l_p2_p1 t1_1
+                                 Filter: (b = 0)
+                           ->  Seq Scan on prt1_l_p2_p2 t1_2
+                                 Filter: (b = 0)
+         ->  Hash Join
+               Hash Cond: (t2_3.b = t1_3.a)
+               ->  Append
+                     ->  Seq Scan on prt2_l_p3_p1 t2_3
+                     ->  Seq Scan on prt2_l_p3_p2 t2_4
+               ->  Hash
+                     ->  Append
+                           ->  Seq Scan on prt1_l_p3_p1 t1_3
+                                 Filter: (b = 0)
+(29 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1, prt2_l t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+ 150 | 0002 | 150 | 0002
+ 300 | 0000 | 300 | 0000
+ 450 | 0002 | 450 | 0002
+(4 rows)
+
+-- left join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 LEFT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+                                     QUERY PLAN                                     
+------------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b
+   ->  Append
+         ->  Hash Right Join
+               Hash Cond: ((t2.b = t1.a) AND ((t2.c)::text = (t1.c)::text))
+               ->  Seq Scan on prt2_l_p1 t2
+               ->  Hash
+                     ->  Seq Scan on prt1_l_p1 t1
+                           Filter: (b = 0)
+         ->  Hash Right Join
+               Hash Cond: ((t2_1.b = t1_1.a) AND ((t2_1.c)::text = (t1_1.c)::text))
+               ->  Seq Scan on prt2_l_p2_p1 t2_1
+               ->  Hash
+                     ->  Seq Scan on prt1_l_p2_p1 t1_1
+                           Filter: (b = 0)
+         ->  Hash Right Join
+               Hash Cond: ((t2_2.b = t1_2.a) AND ((t2_2.c)::text = (t1_2.c)::text))
+               ->  Seq Scan on prt2_l_p2_p2 t2_2
+               ->  Hash
+                     ->  Seq Scan on prt1_l_p2_p2 t1_2
+                           Filter: (b = 0)
+         ->  Hash Right Join
+               Hash Cond: ((t2_3.b = t1_3.a) AND ((t2_3.c)::text = (t1_3.c)::text))
+               ->  Append
+                     ->  Seq Scan on prt2_l_p3_p1 t2_3
+                     ->  Seq Scan on prt2_l_p3_p2 t2_4
+               ->  Hash
+                     ->  Append
+                           ->  Seq Scan on prt1_l_p3_p1 t1_3
+                                 Filter: (b = 0)
+(30 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 LEFT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+  50 | 0002 |     | 
+ 100 | 0000 |     | 
+ 150 | 0002 | 150 | 0002
+ 200 | 0000 |     | 
+ 250 | 0002 |     | 
+ 300 | 0000 | 300 | 0000
+ 350 | 0002 |     | 
+ 400 | 0000 |     | 
+ 450 | 0002 | 450 | 0002
+ 500 | 0000 |     | 
+ 550 | 0002 |     | 
+(12 rows)
+
+-- right join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+                                        QUERY PLAN                                        
+------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a, t2.b
+   ->  Result
+         ->  Append
+               ->  Hash Right Join
+                     Hash Cond: ((t1.a = t2.b) AND ((t1.c)::text = (t2.c)::text))
+                     ->  Seq Scan on prt1_l_p1 t1
+                     ->  Hash
+                           ->  Seq Scan on prt2_l_p1 t2
+                                 Filter: (a = 0)
+               ->  Hash Right Join
+                     Hash Cond: ((t1_1.a = t2_1.b) AND ((t1_1.c)::text = (t2_1.c)::text))
+                     ->  Seq Scan on prt1_l_p2_p1 t1_1
+                     ->  Hash
+                           ->  Seq Scan on prt2_l_p2_p1 t2_1
+                                 Filter: (a = 0)
+               ->  Hash Right Join
+                     Hash Cond: ((t1_2.a = t2_2.b) AND ((t1_2.c)::text = (t2_2.c)::text))
+                     ->  Seq Scan on prt1_l_p2_p2 t1_2
+                     ->  Hash
+                           ->  Seq Scan on prt2_l_p2_p2 t2_2
+                                 Filter: (a = 0)
+               ->  Hash Right Join
+                     Hash Cond: ((t1_3.a = t2_3.b) AND ((t1_3.c)::text = (t2_3.c)::text))
+                     ->  Append
+                           ->  Seq Scan on prt1_l_p3_p1 t1_3
+                           ->  Seq Scan on prt1_l_p3_p2 t1_4
+                     ->  Hash
+                           ->  Append
+                                 ->  Seq Scan on prt2_l_p3_p1 t2_3
+                                       Filter: (a = 0)
+(31 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+ 150 | 0002 | 150 | 0002
+ 300 | 0000 | 300 | 0000
+ 450 | 0002 | 450 | 0002
+     |      |  75 | 0003
+     |      | 225 | 0001
+     |      | 375 | 0003
+     |      | 525 | 0001
+(8 rows)
+
+-- full join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE prt1_l.b = 0) t1 FULL JOIN (SELECT * FROM prt2_l WHERE prt2_l.a = 0) t2 ON (t1.a = t2.b AND t1.c = t2.c) ORDER BY t1.a, t2.b;
+                                                     QUERY PLAN                                                     
+--------------------------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: prt1_l_p1.a, prt2_l_p1.b
+   ->  Append
+         ->  Hash Full Join
+               Hash Cond: ((prt1_l_p1.a = prt2_l_p1.b) AND ((prt1_l_p1.c)::text = (prt2_l_p1.c)::text))
+               ->  Seq Scan on prt1_l_p1
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_l_p1
+                           Filter: (a = 0)
+         ->  Hash Full Join
+               Hash Cond: ((prt1_l_p2_p1.a = prt2_l_p2_p1.b) AND ((prt1_l_p2_p1.c)::text = (prt2_l_p2_p1.c)::text))
+               ->  Seq Scan on prt1_l_p2_p1
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_l_p2_p1
+                           Filter: (a = 0)
+         ->  Hash Full Join
+               Hash Cond: ((prt1_l_p2_p2.a = prt2_l_p2_p2.b) AND ((prt1_l_p2_p2.c)::text = (prt2_l_p2_p2.c)::text))
+               ->  Seq Scan on prt1_l_p2_p2
+                     Filter: (b = 0)
+               ->  Hash
+                     ->  Seq Scan on prt2_l_p2_p2
+                           Filter: (a = 0)
+         ->  Hash Full Join
+               Hash Cond: ((prt1_l_p3_p1.a = prt2_l_p3_p1.b) AND ((prt1_l_p3_p1.c)::text = (prt2_l_p3_p1.c)::text))
+               ->  Append
+                     ->  Seq Scan on prt1_l_p3_p1
+                           Filter: (b = 0)
+               ->  Hash
+                     ->  Append
+                           ->  Seq Scan on prt2_l_p3_p1
+                                 Filter: (a = 0)
+(33 rows)
+
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE prt1_l.b = 0) t1 FULL JOIN (SELECT * FROM prt2_l WHERE prt2_l.a = 0) t2 ON (t1.a = t2.b AND t1.c = t2.c) ORDER BY t1.a, t2.b;
+  a  |  c   |  b  |  c   
+-----+------+-----+------
+   0 | 0000 |   0 | 0000
+  50 | 0002 |     | 
+ 100 | 0000 |     | 
+ 150 | 0002 | 150 | 0002
+ 200 | 0000 |     | 
+ 250 | 0002 |     | 
+ 300 | 0000 | 300 | 0000
+ 350 | 0002 |     | 
+ 400 | 0000 |     | 
+ 450 | 0002 | 450 | 0002
+ 500 | 0000 |     | 
+ 550 | 0002 |     | 
+     |      |  75 | 0003
+     |      | 225 | 0001
+     |      | 375 | 0003
+     |      | 525 | 0001
+(16 rows)
+
+-- lateral partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT * FROM prt1_l t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t2.c AS t2c, t2.b AS t2b, t3.b AS t3b, least(t1.a,t2.a,t3.b) FROM prt1_l t2 JOIN prt2_l t3 ON (t2.a = t3.b AND t2.c = t3.c)) ss
+			  ON t1.a = ss.t2a AND t1.c = ss.t2c WHERE t1.b = 0 ORDER BY t1.a;
+                                             QUERY PLAN                                              
+-----------------------------------------------------------------------------------------------------
+ Sort
+   Sort Key: t1.a
+   ->  Result
+         ->  Append
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_l_p1 t1
+                           Filter: (b = 0)
+                     ->  Hash Join
+                           Hash Cond: ((t3.b = t2.a) AND ((t3.c)::text = (t2.c)::text))
+                           ->  Seq Scan on prt2_l_p1 t3
+                           ->  Hash
+                                 ->  Seq Scan on prt1_l_p1 t2
+                                       Filter: ((t1.a = a) AND ((t1.c)::text = (c)::text))
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_l_p2_p1 t1_1
+                           Filter: (b = 0)
+                     ->  Hash Join
+                           Hash Cond: ((t3_1.b = t2_1.a) AND ((t3_1.c)::text = (t2_1.c)::text))
+                           ->  Seq Scan on prt2_l_p2_p1 t3_1
+                           ->  Hash
+                                 ->  Seq Scan on prt1_l_p2_p1 t2_1
+                                       Filter: ((t1_1.a = a) AND ((t1_1.c)::text = (c)::text))
+               ->  Nested Loop Left Join
+                     ->  Seq Scan on prt1_l_p2_p2 t1_2
+                           Filter: (b = 0)
+                     ->  Hash Join
+                           Hash Cond: ((t3_2.b = t2_2.a) AND ((t3_2.c)::text = (t2_2.c)::text))
+                           ->  Seq Scan on prt2_l_p2_p2 t3_2
+                           ->  Hash
+                                 ->  Seq Scan on prt1_l_p2_p2 t2_2
+                                       Filter: ((t1_2.a = a) AND ((t1_2.c)::text = (c)::text))
+               ->  Nested Loop Left Join
+                     ->  Append
+                           ->  Seq Scan on prt1_l_p3_p1 t1_3
+                                 Filter: (b = 0)
+                     ->  Hash Join
+                           Hash Cond: ((t3_3.b = t2_3.a) AND ((t3_3.c)::text = (t2_3.c)::text))
+                           ->  Append
+                                 ->  Seq Scan on prt2_l_p3_p1 t3_3
+                                 ->  Seq Scan on prt2_l_p3_p2 t3_4
+                           ->  Hash
+                                 ->  Append
+                                       ->  Seq Scan on prt1_l_p3_p1 t2_3
+                                             Filter: ((t1_3.a = a) AND ((t1_3.c)::text = (c)::text))
+                                       ->  Seq Scan on prt1_l_p3_p2 t2_4
+                                             Filter: ((t1_3.a = a) AND ((t1_3.c)::text = (c)::text))
+(46 rows)
+
+SELECT * FROM prt1_l t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t2.c AS t2c, t2.b AS t2b, t3.b AS t3b, least(t1.a,t2.a,t3.b) FROM prt1_l t2 JOIN prt2_l t3 ON (t2.a = t3.b AND t2.c = t3.c)) ss
+			  ON t1.a = ss.t2a AND t1.c = ss.t2c WHERE t1.b = 0 ORDER BY t1.a;
+  a  | b |  c   | t2a | t2c  | t2b | t3b | least 
+-----+---+------+-----+------+-----+-----+-------
+   0 | 0 | 0000 |   0 | 0000 |   0 |   0 |     0
+  50 | 0 | 0002 |     |      |     |     |      
+ 100 | 0 | 0000 |     |      |     |     |      
+ 150 | 0 | 0002 | 150 | 0002 |   0 | 150 |   150
+ 200 | 0 | 0000 |     |      |     |     |      
+ 250 | 0 | 0002 |     |      |     |     |      
+ 300 | 0 | 0000 | 300 | 0000 |   0 | 300 |   300
+ 350 | 0 | 0002 |     |      |     |     |      
+ 400 | 0 | 0000 |     |      |     |     |      
+ 450 | 0 | 0002 | 450 | 0002 |   0 | 450 |   450
+ 500 | 0 | 0000 |     |      |     |     |      
+ 550 | 0 | 0002 |     |      |     |     |      
+(12 rows)
+
+-- join with one side empty
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE a = 1 AND a = 2) t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.b = t2.a AND t1.c = t2.c;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Hash Left Join
+   Hash Cond: ((t2.b = a) AND (t2.a = b) AND ((t2.c)::text = (c)::text))
+   ->  Append
+         ->  Seq Scan on prt2_l_p1 t2
+         ->  Seq Scan on prt2_l_p2_p1 t2_1
+         ->  Seq Scan on prt2_l_p2_p2 t2_2
+         ->  Seq Scan on prt2_l_p3_p1 t2_3
+         ->  Seq Scan on prt2_l_p3_p2 t2_4
+   ->  Hash
+         ->  Result
+               One-Time Filter: false
+(11 rows)
+
+--
+-- negative testcases
+--
+CREATE TABLE prt1_n (a int, b int, c varchar) PARTITION BY RANGE(c);
+CREATE TABLE prt1_n_p1 PARTITION OF prt1_n FOR VALUES FROM ('0000') TO ('0250');
+CREATE TABLE prt1_n_p2 PARTITION OF prt1_n FOR VALUES FROM ('0250') TO ('0500');
+INSERT INTO prt1_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 499, 2) i;
+ANALYZE prt1_n;
+CREATE TABLE prt2_n (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE prt2_n_p1 PARTITION OF prt2_n FOR VALUES IN ('0000', '0003', '0004', '0010', '0006', '0007');
+CREATE TABLE prt2_n_p2 PARTITION OF prt2_n FOR VALUES IN ('0001', '0005', '0002', '0009', '0008', '0011');
+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt2_n;
+CREATE TABLE prt3_n (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE prt3_n_p1 PARTITION OF prt3_n FOR VALUES IN ('0000', '0004', '0006', '0007');
+CREATE TABLE prt3_n_p2 PARTITION OF prt3_n FOR VALUES IN ('0001', '0002', '0008', '0010');
+CREATE TABLE prt3_n_p3 PARTITION OF prt3_n FOR VALUES IN ('0003', '0005', '0009', '0011');
+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt3_n;
+CREATE TABLE prt4_n (a int, b int, c text) PARTITION BY RANGE(a);
+CREATE TABLE prt4_n_p1 PARTITION OF prt4_n FOR VALUES FROM (0) TO (300);
+CREATE TABLE prt4_n_p2 PARTITION OF prt4_n FOR VALUES FROM (300) TO (500);
+CREATE TABLE prt4_n_p3 PARTITION OF prt4_n FOR VALUES FROM (500) TO (600);
+INSERT INTO prt4_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt4_n;
+-- partitionwise join can not be applied if the partition ranges differ
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt4_n t2 WHERE t1.a = t2.a;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Join
+   Hash Cond: (t1.a = t2.a)
+   ->  Append
+         ->  Seq Scan on prt1_p1 t1
+         ->  Seq Scan on prt1_p2 t1_1
+         ->  Seq Scan on prt1_p3 t1_2
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt4_n_p1 t2
+               ->  Seq Scan on prt4_n_p2 t2_1
+               ->  Seq Scan on prt4_n_p3 t2_2
+(11 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt4_n t2, prt2 t3 WHERE t1.a = t2.a and t1.a = t3.b;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Hash Join
+   Hash Cond: (t2.a = t1.a)
+   ->  Append
+         ->  Seq Scan on prt4_n_p1 t2
+         ->  Seq Scan on prt4_n_p2 t2_1
+         ->  Seq Scan on prt4_n_p3 t2_2
+   ->  Hash
+         ->  Append
+               ->  Hash Join
+                     Hash Cond: (t1.a = t3.b)
+                     ->  Seq Scan on prt1_p1 t1
+                     ->  Hash
+                           ->  Seq Scan on prt2_p1 t3
+               ->  Hash Join
+                     Hash Cond: (t1_1.a = t3_1.b)
+                     ->  Seq Scan on prt1_p2 t1_1
+                     ->  Hash
+                           ->  Seq Scan on prt2_p2 t3_1
+               ->  Hash Join
+                     Hash Cond: (t1_2.a = t3_2.b)
+                     ->  Seq Scan on prt1_p3 t1_2
+                     ->  Hash
+                           ->  Seq Scan on prt2_p3 t3_2
+(23 rows)
+
+-- partitionwise join can not be applied if there are no equi-join conditions
+-- between partition keys
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 LEFT JOIN prt2 t2 ON (t1.a < t2.b);
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Nested Loop Left Join
+   ->  Append
+         ->  Seq Scan on prt1_p1 t1
+         ->  Seq Scan on prt1_p2 t1_1
+         ->  Seq Scan on prt1_p3 t1_2
+   ->  Append
+         ->  Index Scan using iprt2_p1_b on prt2_p1 t2
+               Index Cond: (t1.a < b)
+         ->  Index Scan using iprt2_p2_b on prt2_p2 t2_1
+               Index Cond: (t1.a < b)
+         ->  Index Scan using iprt2_p3_b on prt2_p3 t2_2
+               Index Cond: (t1.a < b)
+(12 rows)
+
+-- equi-join with join condition on partial keys does not qualify for
+-- partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1, prt2_m t2 WHERE t1.a = (t2.b + t2.a)/2;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Join
+   Hash Cond: (((t2.b + t2.a) / 2) = t1.a)
+   ->  Append
+         ->  Seq Scan on prt2_m_p1 t2
+         ->  Seq Scan on prt2_m_p2 t2_1
+         ->  Seq Scan on prt2_m_p3 t2_2
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt1_m_p1 t1
+               ->  Seq Scan on prt1_m_p2 t1_1
+               ->  Seq Scan on prt1_m_p3 t1_2
+(11 rows)
+
+-- equi-join between out-of-order partition key columns does not qualify for
+-- partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1 LEFT JOIN prt2_m t2 ON t1.a = t2.b;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Left Join
+   Hash Cond: (t1.a = t2.b)
+   ->  Append
+         ->  Seq Scan on prt1_m_p1 t1
+         ->  Seq Scan on prt1_m_p2 t1_1
+         ->  Seq Scan on prt1_m_p3 t1_2
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt2_m_p1 t2
+               ->  Seq Scan on prt2_m_p2 t2_1
+               ->  Seq Scan on prt2_m_p3 t2_2
+(11 rows)
+
+-- equi-join between non-key columns does not qualify for partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1 LEFT JOIN prt2_m t2 ON t1.c = t2.c;
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Left Join
+   Hash Cond: (t1.c = t2.c)
+   ->  Append
+         ->  Seq Scan on prt1_m_p1 t1
+         ->  Seq Scan on prt1_m_p2 t1_1
+         ->  Seq Scan on prt1_m_p3 t1_2
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt2_m_p1 t2
+               ->  Seq Scan on prt2_m_p2 t2_1
+               ->  Seq Scan on prt2_m_p3 t2_2
+(11 rows)
+
+-- partitionwise join can not be applied between tables with different
+-- partition lists
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 LEFT JOIN prt2_n t2 ON (t1.c = t2.c);
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Right Join
+   Hash Cond: (t2.c = (t1.c)::text)
+   ->  Append
+         ->  Seq Scan on prt2_n_p1 t2
+         ->  Seq Scan on prt2_n_p2 t2_1
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt1_n_p1 t1
+               ->  Seq Scan on prt1_n_p2 t1_1
+(9 rows)
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 JOIN prt2_n t2 ON (t1.c = t2.c) JOIN plt1 t3 ON (t1.c = t3.c);
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Hash Join
+   Hash Cond: (t2.c = (t1.c)::text)
+   ->  Append
+         ->  Seq Scan on prt2_n_p1 t2
+         ->  Seq Scan on prt2_n_p2 t2_1
+   ->  Hash
+         ->  Hash Join
+               Hash Cond: (t3.c = (t1.c)::text)
+               ->  Append
+                     ->  Seq Scan on plt1_p1 t3
+                     ->  Seq Scan on plt1_p2 t3_1
+                     ->  Seq Scan on plt1_p3 t3_2
+               ->  Hash
+                     ->  Append
+                           ->  Seq Scan on prt1_n_p1 t1
+                           ->  Seq Scan on prt1_n_p2 t1_1
+(16 rows)
+
+-- partitionwise join can not be applied for a join between list and range
+-- partitioned table
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 FULL JOIN prt1 t2 ON (t1.c = t2.c);
+                  QUERY PLAN                  
+----------------------------------------------
+ Hash Full Join
+   Hash Cond: ((t2.c)::text = (t1.c)::text)
+   ->  Append
+         ->  Seq Scan on prt1_p1 t2
+         ->  Seq Scan on prt1_p2 t2_1
+         ->  Seq Scan on prt1_p3 t2_2
+   ->  Hash
+         ->  Append
+               ->  Seq Scan on prt1_n_p1 t1
+               ->  Seq Scan on prt1_n_p2 t1_1
+(10 rows)
+
diff --git a/src/test/regress/expected/partition_prune.out b/src/test/regress/expected/partition_prune.out
new file mode 100644
index 0000000000..348719bd62
--- /dev/null
+++ b/src/test/regress/expected/partition_prune.out
@@ -0,0 +1,1091 @@
+--
+-- Test partitioning planner code
+--
+create table lp (a char) partition by list (a);
+create table lp_default partition of lp default;
+create table lp_ef partition of lp for values in ('e', 'f');
+create table lp_ad partition of lp for values in ('a', 'd');
+create table lp_bc partition of lp for values in ('b', 'c');
+create table lp_g partition of lp for values in ('g');
+create table lp_null partition of lp for values in (null);
+explain (costs off) select * from lp;
+          QUERY PLAN          
+------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+   ->  Seq Scan on lp_bc
+   ->  Seq Scan on lp_ef
+   ->  Seq Scan on lp_g
+   ->  Seq Scan on lp_null
+   ->  Seq Scan on lp_default
+(7 rows)
+
+explain (costs off) select * from lp where a > 'a' and a < 'd';
+                        QUERY PLAN                         
+-----------------------------------------------------------
+ Append
+   ->  Seq Scan on lp_bc
+         Filter: ((a > 'a'::bpchar) AND (a < 'd'::bpchar))
+   ->  Seq Scan on lp_default
+         Filter: ((a > 'a'::bpchar) AND (a < 'd'::bpchar))
+(5 rows)
+
+explain (costs off) select * from lp where a > 'a' and a <= 'd';
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+   ->  Seq Scan on lp_bc
+         Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+   ->  Seq Scan on lp_default
+         Filter: ((a > 'a'::bpchar) AND (a <= 'd'::bpchar))
+(7 rows)
+
+explain (costs off) select * from lp where a = 'a';
+            QUERY PLAN             
+-----------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: (a = 'a'::bpchar)
+(3 rows)
+
+explain (costs off) select * from lp where 'a' = a;	/* commuted */
+            QUERY PLAN             
+-----------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: ('a'::bpchar = a)
+(3 rows)
+
+explain (costs off) select * from lp where a is not null;
+           QUERY PLAN            
+---------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on lp_bc
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on lp_ef
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on lp_g
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on lp_default
+         Filter: (a IS NOT NULL)
+(11 rows)
+
+explain (costs off) select * from lp where a is null;
+         QUERY PLAN          
+-----------------------------
+ Append
+   ->  Seq Scan on lp_null
+         Filter: (a IS NULL)
+(3 rows)
+
+explain (costs off) select * from lp where a = 'a' or a = 'c';
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: ((a = 'a'::bpchar) OR (a = 'c'::bpchar))
+   ->  Seq Scan on lp_bc
+         Filter: ((a = 'a'::bpchar) OR (a = 'c'::bpchar))
+(5 rows)
+
+explain (costs off) select * from lp where a is not null and (a = 'a' or a = 'c');
+                                   QUERY PLAN                                   
+--------------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: ((a IS NOT NULL) AND ((a = 'a'::bpchar) OR (a = 'c'::bpchar)))
+   ->  Seq Scan on lp_bc
+         Filter: ((a IS NOT NULL) AND ((a = 'a'::bpchar) OR (a = 'c'::bpchar)))
+(5 rows)
+
+explain (costs off) select * from lp where a <> 'g';
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on lp_ad
+         Filter: (a <> 'g'::bpchar)
+   ->  Seq Scan on lp_bc
+         Filter: (a <> 'g'::bpchar)
+   ->  Seq Scan on lp_ef
+         Filter: (a <> 'g'::bpchar)
+   ->  Seq Scan on lp_default
+         Filter: (a <> 'g'::bpchar)
+(9 rows)
+
+explain (costs off) select * from lp where a <> 'a' and a <> 'd';
+                         QUERY PLAN                          
+-------------------------------------------------------------
+ Append
+   ->  Seq Scan on lp_bc
+         Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+   ->  Seq Scan on lp_ef
+         Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+   ->  Seq Scan on lp_g
+         Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+   ->  Seq Scan on lp_default
+         Filter: ((a <> 'a'::bpchar) AND (a <> 'd'::bpchar))
+(9 rows)
+
+explain (costs off) select * from lp where a not in ('a', 'd');
+                   QUERY PLAN                   
+------------------------------------------------
+ Append
+   ->  Seq Scan on lp_bc
+         Filter: (a <> ALL ('{a,d}'::bpchar[]))
+   ->  Seq Scan on lp_ef
+         Filter: (a <> ALL ('{a,d}'::bpchar[]))
+   ->  Seq Scan on lp_g
+         Filter: (a <> ALL ('{a,d}'::bpchar[]))
+   ->  Seq Scan on lp_default
+         Filter: (a <> ALL ('{a,d}'::bpchar[]))
+(9 rows)
+
+-- collation matches the partitioning collation, pruning works
+create table coll_pruning (a text collate "C") partition by list (a);
+create table coll_pruning_a partition of coll_pruning for values in ('a');
+create table coll_pruning_b partition of coll_pruning for values in ('b');
+create table coll_pruning_def partition of coll_pruning default;
+explain (costs off) select * from coll_pruning where a collate "C" = 'a' collate "C";
+                 QUERY PLAN                  
+---------------------------------------------
+ Append
+   ->  Seq Scan on coll_pruning_a
+         Filter: (a = 'a'::text COLLATE "C")
+(3 rows)
+
+-- collation doesn't match the partitioning collation, no pruning occurs
+explain (costs off) select * from coll_pruning where a collate "POSIX" = 'a' collate "POSIX";
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Append
+   ->  Seq Scan on coll_pruning_a
+         Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+   ->  Seq Scan on coll_pruning_b
+         Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+   ->  Seq Scan on coll_pruning_def
+         Filter: ((a)::text = 'a'::text COLLATE "POSIX")
+(7 rows)
+
+create table rlp (a int, b varchar) partition by range (a);
+create table rlp_default partition of rlp default partition by list (a);
+create table rlp_default_default partition of rlp_default default;
+create table rlp_default_10 partition of rlp_default for values in (10);
+create table rlp_default_30 partition of rlp_default for values in (30);
+create table rlp_default_null partition of rlp_default for values in (null);
+create table rlp1 partition of rlp for values from (minvalue) to (1);
+create table rlp2 partition of rlp for values from (1) to (10);
+create table rlp3 (b varchar, a int) partition by list (b varchar_ops);
+create table rlp3_default partition of rlp3 default;
+create table rlp3abcd partition of rlp3 for values in ('ab', 'cd');
+create table rlp3efgh partition of rlp3 for values in ('ef', 'gh');
+create table rlp3nullxy partition of rlp3 for values in (null, 'xy');
+alter table rlp attach partition rlp3 for values from (15) to (20);
+create table rlp4 partition of rlp for values from (20) to (30) partition by range (a);
+create table rlp4_default partition of rlp4 default;
+create table rlp4_1 partition of rlp4 for values from (20) to (25);
+create table rlp4_2 partition of rlp4 for values from (25) to (29);
+create table rlp5 partition of rlp for values from (31) to (maxvalue) partition by range (a);
+create table rlp5_default partition of rlp5 default;
+create table rlp5_1 partition of rlp5 for values from (31) to (40);
+explain (costs off) select * from rlp where a < 1;
+       QUERY PLAN        
+-------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a < 1)
+(3 rows)
+
+explain (costs off) select * from rlp where 1 > a;	/* commuted */
+       QUERY PLAN        
+-------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (1 > a)
+(3 rows)
+
+explain (costs off) select * from rlp where a <= 1;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a <= 1)
+   ->  Seq Scan on rlp2
+         Filter: (a <= 1)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a <= 1)
+(7 rows)
+
+explain (costs off) select * from rlp where a = 1;
+       QUERY PLAN        
+-------------------------
+ Append
+   ->  Seq Scan on rlp2
+         Filter: (a = 1)
+(3 rows)
+
+explain (costs off) select * from rlp where a = 1::bigint;		/* same as above */
+            QUERY PLAN             
+-----------------------------------
+ Append
+   ->  Seq Scan on rlp2
+         Filter: (a = '1'::bigint)
+(3 rows)
+
+explain (costs off) select * from rlp where a = 1::numeric;	/* no pruning */
+                  QUERY PLAN                   
+-----------------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp2
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp3abcd
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp3efgh
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp3nullxy
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp3_default
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp4_1
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp4_2
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp4_default
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp5_1
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp5_default
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp_default_10
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp_default_30
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp_default_null
+         Filter: ((a)::numeric = '1'::numeric)
+   ->  Seq Scan on rlp_default_default
+         Filter: ((a)::numeric = '1'::numeric)
+(31 rows)
+
+explain (costs off) select * from rlp where a <= 10;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a <= 10)
+   ->  Seq Scan on rlp2
+         Filter: (a <= 10)
+   ->  Seq Scan on rlp_default_10
+         Filter: (a <= 10)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a <= 10)
+(9 rows)
+
+explain (costs off) select * from rlp where a > 10;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: (a > 10)
+   ->  Seq Scan on rlp3efgh
+         Filter: (a > 10)
+   ->  Seq Scan on rlp3nullxy
+         Filter: (a > 10)
+   ->  Seq Scan on rlp3_default
+         Filter: (a > 10)
+   ->  Seq Scan on rlp4_1
+         Filter: (a > 10)
+   ->  Seq Scan on rlp4_2
+         Filter: (a > 10)
+   ->  Seq Scan on rlp4_default
+         Filter: (a > 10)
+   ->  Seq Scan on rlp5_1
+         Filter: (a > 10)
+   ->  Seq Scan on rlp5_default
+         Filter: (a > 10)
+   ->  Seq Scan on rlp_default_30
+         Filter: (a > 10)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a > 10)
+(23 rows)
+
+explain (costs off) select * from rlp where a < 15;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a < 15)
+   ->  Seq Scan on rlp2
+         Filter: (a < 15)
+   ->  Seq Scan on rlp_default_10
+         Filter: (a < 15)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a < 15)
+(9 rows)
+
+explain (costs off) select * from rlp where a <= 15;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp2
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp3abcd
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp3efgh
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp3nullxy
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp3_default
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp_default_10
+         Filter: (a <= 15)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a <= 15)
+(17 rows)
+
+explain (costs off) select * from rlp where a > 15 and b = 'ab';
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_1
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_2
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_default
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp5_1
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp5_default
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_30
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_default
+         Filter: ((a > 15) AND ((b)::text = 'ab'::text))
+(17 rows)
+
+explain (costs off) select * from rlp where a = 16;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: (a = 16)
+   ->  Seq Scan on rlp3efgh
+         Filter: (a = 16)
+   ->  Seq Scan on rlp3nullxy
+         Filter: (a = 16)
+   ->  Seq Scan on rlp3_default
+         Filter: (a = 16)
+(9 rows)
+
+explain (costs off) select * from rlp where a = 16 and b in ('not', 'in', 'here');
+                                 QUERY PLAN                                 
+----------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp3_default
+         Filter: ((a = 16) AND ((b)::text = ANY ('{not,in,here}'::text[])))
+(3 rows)
+
+explain (costs off) select * from rlp where a = 16 and b < 'ab';
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp3_default
+         Filter: (((b)::text < 'ab'::text) AND (a = 16))
+(3 rows)
+
+explain (costs off) select * from rlp where a = 16 and b <= 'ab';
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: (((b)::text <= 'ab'::text) AND (a = 16))
+   ->  Seq Scan on rlp3_default
+         Filter: (((b)::text <= 'ab'::text) AND (a = 16))
+(5 rows)
+
+explain (costs off) select * from rlp where a = 16 and b is null;
+                 QUERY PLAN                 
+--------------------------------------------
+ Append
+   ->  Seq Scan on rlp3nullxy
+         Filter: ((b IS NULL) AND (a = 16))
+(3 rows)
+
+explain (costs off) select * from rlp where a = 16 and b is not null;
+                   QUERY PLAN                   
+------------------------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: ((b IS NOT NULL) AND (a = 16))
+   ->  Seq Scan on rlp3efgh
+         Filter: ((b IS NOT NULL) AND (a = 16))
+   ->  Seq Scan on rlp3nullxy
+         Filter: ((b IS NOT NULL) AND (a = 16))
+   ->  Seq Scan on rlp3_default
+         Filter: ((b IS NOT NULL) AND (a = 16))
+(9 rows)
+
+explain (costs off) select * from rlp where a is null;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on rlp_default_null
+         Filter: (a IS NULL)
+(3 rows)
+
+explain (costs off) select * from rlp where a is not null;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp2
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp3abcd
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp3efgh
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp3nullxy
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp3_default
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp4_1
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp4_2
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp4_default
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp5_1
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp5_default
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp_default_10
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp_default_30
+         Filter: (a IS NOT NULL)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a IS NOT NULL)
+(29 rows)
+
+explain (costs off) select * from rlp where a > 30;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp5_1
+         Filter: (a > 30)
+   ->  Seq Scan on rlp5_default
+         Filter: (a > 30)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a > 30)
+(7 rows)
+
+explain (costs off) select * from rlp where a = 30;	/* only default is scanned */
+            QUERY PLAN            
+----------------------------------
+ Append
+   ->  Seq Scan on rlp_default_30
+         Filter: (a = 30)
+(3 rows)
+
+explain (costs off) select * from rlp where a <= 31;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp2
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp3abcd
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp3efgh
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp3nullxy
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp3_default
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp4_1
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp4_2
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp4_default
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp5_1
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp5_default
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp_default_10
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp_default_30
+         Filter: (a <= 31)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a <= 31)
+(29 rows)
+
+explain (costs off) select * from rlp where a = 1 or a = 7;
+              QUERY PLAN              
+--------------------------------------
+ Append
+   ->  Seq Scan on rlp2
+         Filter: ((a = 1) OR (a = 7))
+(3 rows)
+
+explain (costs off) select * from rlp where a = 1 or b = 'ab';
+                      QUERY PLAN                       
+-------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp1
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp2
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp3abcd
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_1
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_2
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp4_default
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp5_1
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp5_default
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_10
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_30
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_null
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+   ->  Seq Scan on rlp_default_default
+         Filter: ((a = 1) OR ((b)::text = 'ab'::text))
+(25 rows)
+
+explain (costs off) select * from rlp where a > 20 and a < 27;
+               QUERY PLAN                
+-----------------------------------------
+ Append
+   ->  Seq Scan on rlp4_1
+         Filter: ((a > 20) AND (a < 27))
+   ->  Seq Scan on rlp4_2
+         Filter: ((a > 20) AND (a < 27))
+   ->  Seq Scan on rlp4_default
+         Filter: ((a > 20) AND (a < 27))
+(7 rows)
+
+explain (costs off) select * from rlp where a = 29;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on rlp4_default
+         Filter: (a = 29)
+(3 rows)
+
+explain (costs off) select * from rlp where a >= 29;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on rlp4_default
+         Filter: (a >= 29)
+   ->  Seq Scan on rlp5_1
+         Filter: (a >= 29)
+   ->  Seq Scan on rlp5_default
+         Filter: (a >= 29)
+   ->  Seq Scan on rlp_default_30
+         Filter: (a >= 29)
+   ->  Seq Scan on rlp_default_default
+         Filter: (a >= 29)
+(11 rows)
+
+-- redundant clauses are eliminated
+explain (costs off) select * from rlp where a > 1 and a = 10;	/* only default */
+               QUERY PLAN               
+----------------------------------------
+ Append
+   ->  Seq Scan on rlp_default_10
+         Filter: ((a > 1) AND (a = 10))
+(3 rows)
+
+explain (costs off) select * from rlp where a > 1 and a >=15;	/* rlp3 onwards, including default */
+               QUERY PLAN                
+-----------------------------------------
+ Append
+   ->  Seq Scan on rlp3abcd
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp3efgh
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp3nullxy
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp3_default
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp4_1
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp4_2
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp4_default
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp5_1
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp5_default
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp_default_30
+         Filter: ((a > 1) AND (a >= 15))
+   ->  Seq Scan on rlp_default_default
+         Filter: ((a > 1) AND (a >= 15))
+(23 rows)
+
+explain (costs off) select * from rlp where a = 1 and a = 3;	/* empty */
+        QUERY PLAN        
+--------------------------
+ Result
+   One-Time Filter: false
+(2 rows)
+
+explain (costs off) select * from rlp where (a = 1 and a = 3) or (a > 1 and a = 15);
+                            QUERY PLAN                             
+-------------------------------------------------------------------
+ Append
+   ->  Seq Scan on rlp2
+         Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+   ->  Seq Scan on rlp3abcd
+         Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+   ->  Seq Scan on rlp3efgh
+         Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+   ->  Seq Scan on rlp3nullxy
+         Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+   ->  Seq Scan on rlp3_default
+         Filter: (((a = 1) AND (a = 3)) OR ((a > 1) AND (a = 15)))
+(11 rows)
+
+-- multi-column keys
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p_default partition of mc3p default;
+create table mc3p0 partition of mc3p for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
+create table mc3p1 partition of mc3p for values from (1, 1, 1) to (10, 5, 10);
+create table mc3p2 partition of mc3p for values from (10, 5, 10) to (10, 10, 10);
+create table mc3p3 partition of mc3p for values from (10, 10, 10) to (10, 10, 20);
+create table mc3p4 partition of mc3p for values from (10, 10, 20) to (10, maxvalue, maxvalue);
+create table mc3p5 partition of mc3p for values from (11, 1, 1) to (20, 10, 10);
+create table mc3p6 partition of mc3p for values from (20, 10, 10) to (20, 20, 20);
+create table mc3p7 partition of mc3p for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+explain (costs off) select * from mc3p where a = 1;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (a = 1)
+   ->  Seq Scan on mc3p1
+         Filter: (a = 1)
+   ->  Seq Scan on mc3p_default
+         Filter: (a = 1)
+(7 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) < 1;
+                 QUERY PLAN                 
+--------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: ((a = 1) AND (abs(b) < 1))
+   ->  Seq Scan on mc3p_default
+         Filter: ((a = 1) AND (abs(b) < 1))
+(5 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1;
+                 QUERY PLAN                 
+--------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: ((a = 1) AND (abs(b) = 1))
+   ->  Seq Scan on mc3p1
+         Filter: ((a = 1) AND (abs(b) = 1))
+   ->  Seq Scan on mc3p_default
+         Filter: ((a = 1) AND (abs(b) = 1))
+(7 rows)
+
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1 and c < 8;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: ((c < 8) AND (a = 1) AND (abs(b) = 1))
+   ->  Seq Scan on mc3p1
+         Filter: ((c < 8) AND (a = 1) AND (abs(b) = 1))
+   ->  Seq Scan on mc3p_default
+         Filter: ((c < 8) AND (a = 1) AND (abs(b) = 1))
+(7 rows)
+
+explain (costs off) select * from mc3p where a = 10 and abs(b) between 5 and 35;
+                           QUERY PLAN                            
+-----------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p1
+         Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+   ->  Seq Scan on mc3p2
+         Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+   ->  Seq Scan on mc3p3
+         Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+   ->  Seq Scan on mc3p4
+         Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+   ->  Seq Scan on mc3p_default
+         Filter: ((a = 10) AND (abs(b) >= 5) AND (abs(b) <= 35))
+(11 rows)
+
+explain (costs off) select * from mc3p where a > 10;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p5
+         Filter: (a > 10)
+   ->  Seq Scan on mc3p6
+         Filter: (a > 10)
+   ->  Seq Scan on mc3p7
+         Filter: (a > 10)
+   ->  Seq Scan on mc3p_default
+         Filter: (a > 10)
+(9 rows)
+
+explain (costs off) select * from mc3p where a >= 10;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p1
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p2
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p3
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p4
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p5
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p6
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p7
+         Filter: (a >= 10)
+   ->  Seq Scan on mc3p_default
+         Filter: (a >= 10)
+(17 rows)
+
+explain (costs off) select * from mc3p where a < 10;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (a < 10)
+   ->  Seq Scan on mc3p1
+         Filter: (a < 10)
+   ->  Seq Scan on mc3p_default
+         Filter: (a < 10)
+(7 rows)
+
+explain (costs off) select * from mc3p where a <= 10 and abs(b) < 10;
+                  QUERY PLAN                   
+-----------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: ((a <= 10) AND (abs(b) < 10))
+   ->  Seq Scan on mc3p1
+         Filter: ((a <= 10) AND (abs(b) < 10))
+   ->  Seq Scan on mc3p2
+         Filter: ((a <= 10) AND (abs(b) < 10))
+   ->  Seq Scan on mc3p_default
+         Filter: ((a <= 10) AND (abs(b) < 10))
+(9 rows)
+
+explain (costs off) select * from mc3p where a = 11 and abs(b) = 0;
+                 QUERY PLAN                  
+---------------------------------------------
+ Append
+   ->  Seq Scan on mc3p_default
+         Filter: ((a = 11) AND (abs(b) = 0))
+(3 rows)
+
+explain (costs off) select * from mc3p where a = 20 and abs(b) = 10 and c = 100;
+                         QUERY PLAN                         
+------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p6
+         Filter: ((a = 20) AND (c = 100) AND (abs(b) = 10))
+(3 rows)
+
+explain (costs off) select * from mc3p where a > 20;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p7
+         Filter: (a > 20)
+   ->  Seq Scan on mc3p_default
+         Filter: (a > 20)
+(5 rows)
+
+explain (costs off) select * from mc3p where a >= 20;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc3p5
+         Filter: (a >= 20)
+   ->  Seq Scan on mc3p6
+         Filter: (a >= 20)
+   ->  Seq Scan on mc3p7
+         Filter: (a >= 20)
+   ->  Seq Scan on mc3p_default
+         Filter: (a >= 20)
+(9 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20);
+                                                           QUERY PLAN                                                            
+---------------------------------------------------------------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p1
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+   ->  Seq Scan on mc3p2
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+   ->  Seq Scan on mc3p5
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+   ->  Seq Scan on mc3p_default
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)))
+(9 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1;
+                                                                 QUERY PLAN                                                                 
+--------------------------------------------------------------------------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+   ->  Seq Scan on mc3p1
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+   ->  Seq Scan on mc3p2
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+   ->  Seq Scan on mc3p5
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+   ->  Seq Scan on mc3p_default
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1))
+(11 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1 or a = 1;
+                                                                      QUERY PLAN                                                                       
+-------------------------------------------------------------------------------------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+   ->  Seq Scan on mc3p1
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+   ->  Seq Scan on mc3p2
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+   ->  Seq Scan on mc3p5
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+   ->  Seq Scan on mc3p_default
+         Filter: (((a = 1) AND (abs(b) = 1) AND (c = 1)) OR ((a = 10) AND (abs(b) = 5) AND (c = 10)) OR ((a > 11) AND (a < 20)) OR (a < 1) OR (a = 1))
+(11 rows)
+
+explain (costs off) select * from mc3p where a = 1 or abs(b) = 1 or c = 1;
+                      QUERY PLAN                      
+------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p1
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p2
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p4
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p5
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p6
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p7
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+   ->  Seq Scan on mc3p_default
+         Filter: ((a = 1) OR (abs(b) = 1) OR (c = 1))
+(17 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 10);
+                                  QUERY PLAN                                  
+------------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+   ->  Seq Scan on mc3p1
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+   ->  Seq Scan on mc3p2
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+   ->  Seq Scan on mc3p3
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+   ->  Seq Scan on mc3p4
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+   ->  Seq Scan on mc3p_default
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 10)))
+(13 rows)
+
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 9);
+                                 QUERY PLAN                                  
+-----------------------------------------------------------------------------
+ Append
+   ->  Seq Scan on mc3p0
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+   ->  Seq Scan on mc3p1
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+   ->  Seq Scan on mc3p2
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+   ->  Seq Scan on mc3p_default
+         Filter: (((a = 1) AND (abs(b) = 1)) OR ((a = 10) AND (abs(b) = 9)))
+(9 rows)
+
+-- a simpler multi-column keys case
+create table mc2p (a int, b int) partition by range (a, b);
+create table mc2p_default partition of mc2p default;
+create table mc2p0 partition of mc2p for values from (minvalue, minvalue) to (1, minvalue);
+create table mc2p1 partition of mc2p for values from (1, minvalue) to (1, 1);
+create table mc2p2 partition of mc2p for values from (1, 1) to (2, minvalue);
+create table mc2p3 partition of mc2p for values from (2, minvalue) to (2, 1);
+create table mc2p4 partition of mc2p for values from (2, 1) to (2, maxvalue);
+create table mc2p5 partition of mc2p for values from (2, maxvalue) to (maxvalue, maxvalue);
+explain (costs off) select * from mc2p where a < 2;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc2p0
+         Filter: (a < 2)
+   ->  Seq Scan on mc2p1
+         Filter: (a < 2)
+   ->  Seq Scan on mc2p2
+         Filter: (a < 2)
+   ->  Seq Scan on mc2p_default
+         Filter: (a < 2)
+(9 rows)
+
+explain (costs off) select * from mc2p where a = 2 and b < 1;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on mc2p3
+         Filter: ((b < 1) AND (a = 2))
+(3 rows)
+
+explain (costs off) select * from mc2p where a > 1;
+           QUERY PLAN           
+--------------------------------
+ Append
+   ->  Seq Scan on mc2p2
+         Filter: (a > 1)
+   ->  Seq Scan on mc2p3
+         Filter: (a > 1)
+   ->  Seq Scan on mc2p4
+         Filter: (a > 1)
+   ->  Seq Scan on mc2p5
+         Filter: (a > 1)
+   ->  Seq Scan on mc2p_default
+         Filter: (a > 1)
+(11 rows)
+
+explain (costs off) select * from mc2p where a = 1 and b > 1;
+              QUERY PLAN               
+---------------------------------------
+ Append
+   ->  Seq Scan on mc2p2
+         Filter: ((b > 1) AND (a = 1))
+(3 rows)
+
+-- boolean partitioning
+create table boolpart (a bool) partition by list (a);
+create table boolpart_default partition of boolpart default;
+create table boolpart_t partition of boolpart for values in ('true');
+create table boolpart_f partition of boolpart for values in ('false');
+explain (costs off) select * from boolpart where a in (true, false);
+                   QUERY PLAN                   
+------------------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: (a = ANY ('{t,f}'::boolean[]))
+   ->  Seq Scan on boolpart_t
+         Filter: (a = ANY ('{t,f}'::boolean[]))
+(5 rows)
+
+explain (costs off) select * from boolpart where a = false;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: (NOT a)
+   ->  Seq Scan on boolpart_default
+         Filter: (NOT a)
+(5 rows)
+
+explain (costs off) select * from boolpart where not a = false;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on boolpart_t
+         Filter: a
+   ->  Seq Scan on boolpart_default
+         Filter: a
+(5 rows)
+
+explain (costs off) select * from boolpart where a is true or a is not true;
+                    QUERY PLAN                    
+--------------------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+   ->  Seq Scan on boolpart_t
+         Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+   ->  Seq Scan on boolpart_default
+         Filter: ((a IS TRUE) OR (a IS NOT TRUE))
+(7 rows)
+
+explain (costs off) select * from boolpart where a is not true;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: (a IS NOT TRUE)
+   ->  Seq Scan on boolpart_t
+         Filter: (a IS NOT TRUE)
+   ->  Seq Scan on boolpart_default
+         Filter: (a IS NOT TRUE)
+(7 rows)
+
+explain (costs off) select * from boolpart where a is not true and a is not false;
+                       QUERY PLAN                       
+--------------------------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: ((a IS NOT TRUE) AND (a IS NOT FALSE))
+   ->  Seq Scan on boolpart_t
+         Filter: ((a IS NOT TRUE) AND (a IS NOT FALSE))
+   ->  Seq Scan on boolpart_default
+         Filter: ((a IS NOT TRUE) AND (a IS NOT FALSE))
+(7 rows)
+
+explain (costs off) select * from boolpart where a is unknown;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: (a IS UNKNOWN)
+   ->  Seq Scan on boolpart_t
+         Filter: (a IS UNKNOWN)
+   ->  Seq Scan on boolpart_default
+         Filter: (a IS UNKNOWN)
+(7 rows)
+
+explain (costs off) select * from boolpart where a is not unknown;
+             QUERY PLAN             
+------------------------------------
+ Append
+   ->  Seq Scan on boolpart_f
+         Filter: (a IS NOT UNKNOWN)
+   ->  Seq Scan on boolpart_t
+         Filter: (a IS NOT UNKNOWN)
+   ->  Seq Scan on boolpart_default
+         Filter: (a IS NOT UNKNOWN)
+(7 rows)
+
+drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart;
diff --git a/src/test/regress/expected/plancache.out b/src/test/regress/expected/plancache.out
index 3f3db337c5..c2eeff1614 100644
--- a/src/test/regress/expected/plancache.out
+++ b/src/test/regress/expected/plancache.out
@@ -252,3 +252,29 @@ NOTICE:  3
  
 (1 row)
 
+-- Check that addition or removal of any partition is correctly dealt with by
+-- default partition table when it is being used in prepared statement.
+create table list_parted (a int) partition by list(a);
+create table list_part_null partition of list_parted for values in (null);
+create table list_part_1 partition of list_parted for values in (1);
+create table list_part_def partition of list_parted default;
+prepare pstmt_def_insert (int) as insert into list_part_def values($1);
+-- should fail
+execute pstmt_def_insert(null);
+ERROR:  new row for relation "list_part_def" violates partition constraint
+DETAIL:  Failing row contains (null).
+execute pstmt_def_insert(1);
+ERROR:  new row for relation "list_part_def" violates partition constraint
+DETAIL:  Failing row contains (1).
+create table list_part_2 partition of list_parted for values in (2);
+execute pstmt_def_insert(2);
+ERROR:  new row for relation "list_part_def" violates partition constraint
+DETAIL:  Failing row contains (2).
+alter table list_parted detach partition list_part_null;
+-- should be ok
+execute pstmt_def_insert(null);
+drop table list_part_1;
+-- should be ok
+execute pstmt_def_insert(1);
+drop table list_parted, list_part_null;
+deallocate pstmt_def_insert;
diff --git a/src/test/regress/expected/plpgsql.out b/src/test/regress/expected/plpgsql.out
index 71099969a4..722715049c 100644
--- a/src/test/regress/expected/plpgsql.out
+++ b/src/test/regress/expected/plpgsql.out
@@ -2242,6 +2242,30 @@ drop function sp_id_user(text);
 --
 create table rc_test (a int, b int);
 copy rc_test from stdin;
+create function return_unnamed_refcursor() returns refcursor as $$
+declare
+    rc refcursor;
+begin
+    open rc for select a from rc_test;
+    return rc;
+end
+$$ language plpgsql;
+create function use_refcursor(rc refcursor) returns int as $$
+declare
+    rc refcursor;
+    x record;
+begin
+    rc := return_unnamed_refcursor();
+    fetch next from rc into x;
+    return x.a;
+end
+$$ language plpgsql;
+select use_refcursor(return_unnamed_refcursor());
+ use_refcursor 
+---------------
+             5
+(1 row)
+
 create function return_refcursor(rc refcursor) returns refcursor as $$
 begin
     open rc for select a from rc_test;
@@ -2706,339 +2730,6 @@ NOTICE:  {10,20,30}; 20; xyz; xyzabc; (10,aaa,,30); <NULL>
 (1 row)
 
 drop function raise_exprs();
--- continue statement
-create table conttesttbl(idx serial, v integer);
-insert into conttesttbl(v) values(10);
-insert into conttesttbl(v) values(20);
-insert into conttesttbl(v) values(30);
-insert into conttesttbl(v) values(40);
-create function continue_test1() returns void as $$
-declare _i integer = 0; _r record;
-begin
-  raise notice '---1---';
-  loop
-    _i := _i + 1;
-    raise notice '%', _i;
-    continue when _i < 10;
-    exit;
-  end loop;
-
-  raise notice '---2---';
-  <<lbl>>
-  loop
-    _i := _i - 1;
-    loop
-      raise notice '%', _i;
-      continue lbl when _i > 0;
-      exit lbl;
-    end loop;
-  end loop;
-
-  raise notice '---3---';
-  <<the_loop>>
-  while _i < 10 loop
-    _i := _i + 1;
-    continue the_loop when _i % 2 = 0;
-    raise notice '%', _i;
-  end loop;
-
-  raise notice '---4---';
-  for _i in 1..10 loop
-    begin
-      -- applies to outer loop, not the nested begin block
-      continue when _i < 5;
-      raise notice '%', _i;
-    end;
-  end loop;
-
-  raise notice '---5---';
-  for _r in select * from conttesttbl loop
-    continue when _r.v <= 20;
-    raise notice '%', _r.v;
-  end loop;
-
-  raise notice '---6---';
-  for _r in execute 'select * from conttesttbl' loop
-    continue when _r.v <= 20;
-    raise notice '%', _r.v;
-  end loop;
-
-  raise notice '---7---';
-  for _i in 1..3 loop
-    raise notice '%', _i;
-    continue when _i = 3;
-  end loop;
-
-  raise notice '---8---';
-  _i := 1;
-  while _i <= 3 loop
-    raise notice '%', _i;
-    _i := _i + 1;
-    continue when _i = 3;
-  end loop;
-
-  raise notice '---9---';
-  for _r in select * from conttesttbl order by v limit 1 loop
-    raise notice '%', _r.v;
-    continue;
-  end loop;
-
-  raise notice '---10---';
-  for _r in execute 'select * from conttesttbl order by v limit 1' loop
-    raise notice '%', _r.v;
-    continue;
-  end loop;
-end; $$ language plpgsql;
-select continue_test1();
-NOTICE:  ---1---
-NOTICE:  1
-NOTICE:  2
-NOTICE:  3
-NOTICE:  4
-NOTICE:  5
-NOTICE:  6
-NOTICE:  7
-NOTICE:  8
-NOTICE:  9
-NOTICE:  10
-NOTICE:  ---2---
-NOTICE:  9
-NOTICE:  8
-NOTICE:  7
-NOTICE:  6
-NOTICE:  5
-NOTICE:  4
-NOTICE:  3
-NOTICE:  2
-NOTICE:  1
-NOTICE:  0
-NOTICE:  ---3---
-NOTICE:  1
-NOTICE:  3
-NOTICE:  5
-NOTICE:  7
-NOTICE:  9
-NOTICE:  ---4---
-NOTICE:  5
-NOTICE:  6
-NOTICE:  7
-NOTICE:  8
-NOTICE:  9
-NOTICE:  10
-NOTICE:  ---5---
-NOTICE:  30
-NOTICE:  40
-NOTICE:  ---6---
-NOTICE:  30
-NOTICE:  40
-NOTICE:  ---7---
-NOTICE:  1
-NOTICE:  2
-NOTICE:  3
-NOTICE:  ---8---
-NOTICE:  1
-NOTICE:  2
-NOTICE:  3
-NOTICE:  ---9---
-NOTICE:  10
-NOTICE:  ---10---
-NOTICE:  10
- continue_test1 
-----------------
- 
-(1 row)
-
-drop function continue_test1();
-drop table conttesttbl;
--- should fail: CONTINUE is only legal inside a loop
-create function continue_error1() returns void as $$
-begin
-    begin
-        continue;
-    end;
-end;
-$$ language plpgsql;
-ERROR:  CONTINUE cannot be used outside a loop
-LINE 4:         continue;
-                ^
--- should fail: unlabeled EXIT is only legal inside a loop
-create function exit_error1() returns void as $$
-begin
-    begin
-        exit;
-    end;
-end;
-$$ language plpgsql;
-ERROR:  EXIT cannot be used outside a loop, unless it has a label
-LINE 4:         exit;
-                ^
--- should fail: no such label
-create function continue_error2() returns void as $$
-begin
-    begin
-        loop
-            continue no_such_label;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
-LINE 5:             continue no_such_label;
-                             ^
--- should fail: no such label
-create function exit_error2() returns void as $$
-begin
-    begin
-        loop
-            exit no_such_label;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-ERROR:  there is no label "no_such_label" attached to any block or loop enclosing this statement
-LINE 5:             exit no_such_label;
-                         ^
--- should fail: CONTINUE can't reference the label of a named block
-create function continue_error3() returns void as $$
-begin
-    <<begin_block1>>
-    begin
-        loop
-            continue begin_block1;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-ERROR:  block label "begin_block1" cannot be used in CONTINUE
-LINE 6:             continue begin_block1;
-                             ^
--- On the other hand, EXIT *can* reference the label of a named block
-create function exit_block1() returns void as $$
-begin
-    <<begin_block1>>
-    begin
-        loop
-            exit begin_block1;
-            raise exception 'should not get here';
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-select exit_block1();
- exit_block1 
--------------
- 
-(1 row)
-
-drop function exit_block1();
--- verbose end block and end loop
-create function end_label1() returns void as $$
-<<blbl>>
-begin
-  <<flbl1>>
-  for _i in 1 .. 10 loop
-    exit flbl1;
-  end loop flbl1;
-  <<flbl2>>
-  for _i in 1 .. 10 loop
-    exit flbl2;
-  end loop;
-end blbl;
-$$ language plpgsql;
-select end_label1();
- end_label1 
-------------
- 
-(1 row)
-
-drop function end_label1();
--- should fail: undefined end label
-create function end_label2() returns void as $$
-begin
-  for _i in 1 .. 10 loop
-    exit;
-  end loop flbl1;
-end;
-$$ language plpgsql;
-ERROR:  end label "flbl1" specified for unlabelled block
-LINE 5:   end loop flbl1;
-                   ^
--- should fail: end label does not match start label
-create function end_label3() returns void as $$
-<<outer_label>>
-begin
-  <<inner_label>>
-  for _i in 1 .. 10 loop
-    exit;
-  end loop outer_label;
-end;
-$$ language plpgsql;
-ERROR:  end label "outer_label" differs from block's label "inner_label"
-LINE 7:   end loop outer_label;
-                   ^
--- should fail: end label on a block without a start label
-create function end_label4() returns void as $$
-<<outer_label>>
-begin
-  for _i in 1 .. 10 loop
-    exit;
-  end loop outer_label;
-end;
-$$ language plpgsql;
-ERROR:  end label "outer_label" specified for unlabelled block
-LINE 6:   end loop outer_label;
-                   ^
--- using list of scalars in fori and fore stmts
-create function for_vect() returns void as $proc$
-<<lbl>>declare a integer; b varchar; c varchar; r record;
-begin
-  -- fori
-  for i in 1 .. 3 loop
-    raise notice '%', i;
-  end loop;
-  -- fore with record var
-  for r in select gs as aa, 'BB' as bb, 'CC' as cc from generate_series(1,4) gs loop
-    raise notice '% % %', r.aa, r.bb, r.cc;
-  end loop;
-  -- fore with single scalar
-  for a in select gs from generate_series(1,4) gs loop
-    raise notice '%', a;
-  end loop;
-  -- fore with multiple scalars
-  for a,b,c in select gs, 'BB','CC' from generate_series(1,4) gs loop
-    raise notice '% % %', a, b, c;
-  end loop;
-  -- using qualified names in fors, fore is enabled, disabled only for fori
-  for lbl.a, lbl.b, lbl.c in execute $$select gs, 'bb','cc' from generate_series(1,4) gs$$ loop
-    raise notice '% % %', a, b, c;
-  end loop;
-end;
-$proc$ language plpgsql;
-select for_vect();
-NOTICE:  1
-NOTICE:  2
-NOTICE:  3
-NOTICE:  1 BB CC
-NOTICE:  2 BB CC
-NOTICE:  3 BB CC
-NOTICE:  4 BB CC
-NOTICE:  1
-NOTICE:  2
-NOTICE:  3
-NOTICE:  4
-NOTICE:  1 BB CC
-NOTICE:  2 BB CC
-NOTICE:  3 BB CC
-NOTICE:  4 BB CC
-NOTICE:  1 bb cc
-NOTICE:  2 bb cc
-NOTICE:  3 bb cc
-NOTICE:  4 bb cc
- for_vect 
-----------
- 
-(1 row)
-
 -- regression test: verify that multiple uses of same plpgsql datum within
 -- a SQL command all get mapped to the same $n parameter.  The return value
 -- of the SELECT is not important, we only care that it doesn't fail with
@@ -4368,136 +4059,6 @@ NOTICE:  column >>some column name<<, constraint >>some constraint name<<, type
 (1 row)
 
 drop function stacked_diagnostics_test();
--- test CASE statement
-create or replace function case_test(bigint) returns text as $$
-declare a int = 10;
-        b int = 1;
-begin
-  case $1
-    when 1 then
-      return 'one';
-    when 2 then
-      return 'two';
-    when 3,4,3+5 then
-      return 'three, four or eight';
-    when a then
-      return 'ten';
-    when a+b, a+b+1 then
-      return 'eleven, twelve';
-  end case;
-end;
-$$ language plpgsql immutable;
-select case_test(1);
- case_test 
------------
- one
-(1 row)
-
-select case_test(2);
- case_test 
------------
- two
-(1 row)
-
-select case_test(3);
-      case_test       
-----------------------
- three, four or eight
-(1 row)
-
-select case_test(4);
-      case_test       
-----------------------
- three, four or eight
-(1 row)
-
-select case_test(5); -- fails
-ERROR:  case not found
-HINT:  CASE statement is missing ELSE part.
-CONTEXT:  PL/pgSQL function case_test(bigint) line 5 at CASE
-select case_test(8);
-      case_test       
-----------------------
- three, four or eight
-(1 row)
-
-select case_test(10);
- case_test 
------------
- ten
-(1 row)
-
-select case_test(11);
-   case_test    
-----------------
- eleven, twelve
-(1 row)
-
-select case_test(12);
-   case_test    
-----------------
- eleven, twelve
-(1 row)
-
-select case_test(13); -- fails
-ERROR:  case not found
-HINT:  CASE statement is missing ELSE part.
-CONTEXT:  PL/pgSQL function case_test(bigint) line 5 at CASE
-create or replace function catch() returns void as $$
-begin
-  raise notice '%', case_test(6);
-exception
-  when case_not_found then
-    raise notice 'caught case_not_found % %', SQLSTATE, SQLERRM;
-end
-$$ language plpgsql;
-select catch();
-NOTICE:  caught case_not_found 20000 case not found
- catch 
--------
- 
-(1 row)
-
--- test the searched variant too, as well as ELSE
-create or replace function case_test(bigint) returns text as $$
-declare a int = 10;
-begin
-  case
-    when $1 = 1 then
-      return 'one';
-    when $1 = a + 2 then
-      return 'twelve';
-    else
-      return 'other';
-  end case;
-end;
-$$ language plpgsql immutable;
-select case_test(1);
- case_test 
------------
- one
-(1 row)
-
-select case_test(2);
- case_test 
------------
- other
-(1 row)
-
-select case_test(12);
- case_test 
------------
- twelve
-(1 row)
-
-select case_test(13);
- case_test 
------------
- other
-(1 row)
-
-drop function catch();
-drop function case_test(bigint);
 -- test variadic functions
 create or replace function vari(variadic int[])
 returns void as $$
@@ -5382,6 +4943,12 @@ create function consumes_rw_array(int[]) returns int
 language plpgsql as $$
   begin return $1[1]; end;
 $$ stable;
+select consumes_rw_array(returns_rw_array(42));
+ consumes_rw_array 
+-------------------
+                42
+(1 row)
+
 -- bug #14174
 explain (verbose, costs off)
 select i, a from
@@ -5438,6 +5005,13 @@ select consumes_rw_array(a), a from
                  2 | {2,2}
 (2 rows)
 
+do $$
+declare a int[] := array[1,2];
+begin
+  a := a || 3;
+  raise notice 'a = %', a;
+end$$;
+NOTICE:  a = {1,2,3}
 --
 -- Test access to call stack
 --
@@ -5879,19 +5453,19 @@ CREATE FUNCTION transition_table_level2_bad_usage_func()
   LANGUAGE plpgsql
 AS $$
   BEGIN
-    INSERT INTO d VALUES (1000000, 1000000, 'x');
+    INSERT INTO dx VALUES (1000000, 1000000, 'x');
     RETURN NULL;
   END;
 $$;
 CREATE TRIGGER transition_table_level2_bad_usage_trigger
   AFTER DELETE ON transition_table_level2
-  REFERENCING OLD TABLE AS d
+  REFERENCING OLD TABLE AS dx
   FOR EACH STATEMENT EXECUTE PROCEDURE
     transition_table_level2_bad_usage_func();
 DELETE FROM transition_table_level2
   WHERE level2_no BETWEEN 301 AND 305;
-ERROR:  relation "d" cannot be the target of a modifying statement
-CONTEXT:  SQL statement "INSERT INTO d VALUES (1000000, 1000000, 'x')"
+ERROR:  relation "dx" cannot be the target of a modifying statement
+CONTEXT:  SQL statement "INSERT INTO dx VALUES (1000000, 1000000, 'x')"
 PL/pgSQL function transition_table_level2_bad_usage_func() line 3 at SQL statement
 DROP TRIGGER transition_table_level2_bad_usage_trigger
   ON transition_table_level2;
@@ -5985,6 +5559,28 @@ LINE 1: SELECT (SELECT string_agg(id || '=' || name, ',') FROM d)
 QUERY:  SELECT (SELECT string_agg(id || '=' || name, ',') FROM d)
 CONTEXT:  PL/pgSQL function alter_table_under_transition_tables_upd_func() line 3 at RAISE
 --
+-- Test multiple reference to a transition table
+--
+CREATE TABLE multi_test (i int);
+INSERT INTO multi_test VALUES (1);
+CREATE OR REPLACE FUNCTION multi_test_trig() RETURNS trigger
+LANGUAGE plpgsql AS $$
+BEGIN
+    RAISE NOTICE 'count = %', (SELECT COUNT(*) FROM new_test);
+    RAISE NOTICE 'count union = %',
+      (SELECT COUNT(*)
+       FROM (SELECT * FROM new_test UNION ALL SELECT * FROM new_test) ss);
+    RETURN NULL;
+END$$;
+CREATE TRIGGER my_trigger AFTER UPDATE ON multi_test
+  REFERENCING NEW TABLE AS new_test OLD TABLE as old_test
+  FOR EACH STATEMENT EXECUTE PROCEDURE multi_test_trig();
+UPDATE multi_test SET i = i;
+NOTICE:  count = 1
+NOTICE:  count union = 2
+DROP TABLE multi_test;
+DROP FUNCTION multi_test_trig();
+--
 -- Check type parsing and record fetching from partitioned tables
 --
 CREATE TABLE partitioned_table (a int, b text) PARTITION BY LIST (a);
@@ -6029,3 +5625,14 @@ SELECT * FROM list_partitioned_table() AS t;
  2
 (2 rows)
 
+--
+-- Check argument name is used instead of $n in error message
+--
+CREATE FUNCTION fx(x WSlot) RETURNS void AS $$
+BEGIN
+  GET DIAGNOSTICS x = ROW_COUNT;
+  RETURN;
+END; $$ LANGUAGE plpgsql;
+ERROR:  "x" is not a scalar variable
+LINE 3:   GET DIAGNOSTICS x = ROW_COUNT;
+                          ^
diff --git a/src/test/regress/expected/polygon.out b/src/test/regress/expected/polygon.out
index 2361274f9e..4a1f60427a 100644
--- a/src/test/regress/expected/polygon.out
+++ b/src/test/regress/expected/polygon.out
@@ -227,3 +227,241 @@ SELECT	'(0,0)'::point <-> '((0,0),(1,2),(2,1))'::polygon as on_corner,
          0 |          0 |      0 | 1.4142135623731 |          3.2
 (1 row)
 
+--
+-- Test the SP-GiST index
+--
+CREATE TABLE quad_poly_tbl (id int, p polygon);
+INSERT INTO quad_poly_tbl
+	SELECT (x - 1) * 100 + y, polygon(circle(point(x * 10, y * 10), 1 + (x + y) % 10))
+	FROM generate_series(1, 100) x,
+		 generate_series(1, 100) y;
+INSERT INTO quad_poly_tbl
+	SELECT i, polygon '((200, 300),(210, 310),(230, 290))'
+	FROM generate_series(10001, 11000) AS i;
+INSERT INTO quad_poly_tbl
+	VALUES
+		(11001, NULL),
+		(11002, NULL),
+		(11003, NULL);
+CREATE INDEX quad_poly_tbl_idx ON quad_poly_tbl USING spgist(p);
+-- get reference results for ORDER BY distance from seq scan
+SET enable_seqscan = ON;
+SET enable_indexscan = OFF;
+SET enable_bitmapscan = OFF;
+CREATE TABLE quad_poly_tbl_ord_seq1 AS
+SELECT rank() OVER (ORDER BY p <-> point '123,456') n, p <-> point '123,456' dist, id
+FROM quad_poly_tbl;
+CREATE TABLE quad_poly_tbl_ord_seq2 AS
+SELECT rank() OVER (ORDER BY p <-> point '123,456') n, p <-> point '123,456' dist, id
+FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+-- check results results from index scan
+SET enable_seqscan = OFF;
+SET enable_indexscan = OFF;
+SET enable_bitmapscan = ON;
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p << polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p << '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p << '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p << polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  3890
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &< polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p &< '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p &< '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p &< polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  7900
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p && polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p && '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p && '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p && polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+   977
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &> polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p &> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p &> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p &> polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  7000
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p >> polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p >> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p >> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p >> polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  2990
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p <<| polygon '((300,300),(400,600),(600,500),(700,200))';
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p <<| '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p <<| '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p <<| polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  1890
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &<| polygon '((300,300),(400,600),(600,500),(700,200))';
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p &<| '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p &<| '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p &<| polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  6900
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p |&> polygon '((300,300),(400,600),(600,500),(700,200))';
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p |&> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p |&> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p |&> polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  9000
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p |>> polygon '((300,300),(400,600),(600,500),(700,200))';
+                                       QUERY PLAN                                       
+----------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p |>> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p |>> '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p |>> polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+  3990
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+                                      QUERY PLAN                                       
+---------------------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p <@ '((300,300),(400,600),(600,500),(700,200))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p <@ '((300,300),(400,600),(600,500),(700,200))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+ count 
+-------
+   831
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p @> polygon '((340,550),(343,552),(341,553))';
+                                 QUERY PLAN                                  
+-----------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p @> '((340,550),(343,552),(341,553))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p @> '((340,550),(343,552),(341,553))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p @> polygon '((340,550),(343,552),(341,553))';
+ count 
+-------
+     1
+(1 row)
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p ~= polygon '((200, 300),(210, 310),(230, 290))';
+                                 QUERY PLAN                                  
+-----------------------------------------------------------------------------
+ Aggregate
+   ->  Bitmap Heap Scan on quad_poly_tbl
+         Recheck Cond: (p ~= '((200,300),(210,310),(230,290))'::polygon)
+         ->  Bitmap Index Scan on quad_poly_tbl_idx
+               Index Cond: (p ~= '((200,300),(210,310),(230,290))'::polygon)
+(5 rows)
+
+SELECT count(*) FROM quad_poly_tbl WHERE p ~= polygon '((200, 300),(210, 310),(230, 290))';
+ count 
+-------
+  1000
+(1 row)
+
+RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
diff --git a/src/test/regress/expected/polymorphism.out b/src/test/regress/expected/polymorphism.out
index 91cfb743b6..66e35a6a5c 100644
--- a/src/test/regress/expected/polymorphism.out
+++ b/src/test/regress/expected/polymorphism.out
@@ -915,10 +915,10 @@ select dfunc();
 
 -- verify it lists properly
 \df dfunc
-                                           List of functions
- Schema | Name  | Result data type |                    Argument data types                    |  Type  
---------+-------+------------------+-----------------------------------------------------------+--------
- public | dfunc | integer          | a integer DEFAULT 1, OUT sum integer, b integer DEFAULT 2 | normal
+                                          List of functions
+ Schema | Name  | Result data type |                    Argument data types                    | Type 
+--------+-------+------------------+-----------------------------------------------------------+------
+ public | dfunc | integer          | a integer DEFAULT 1, OUT sum integer, b integer DEFAULT 2 | func
 (1 row)
 
 drop function dfunc(int, int);
@@ -1083,10 +1083,10 @@ $$ select array_upper($1, 1) $$ language sql;
 ERROR:  cannot remove parameter defaults from existing function
 HINT:  Use DROP FUNCTION dfunc(integer[]) first.
 \df dfunc
-                                      List of functions
- Schema | Name  | Result data type |               Argument data types               |  Type  
---------+-------+------------------+-------------------------------------------------+--------
- public | dfunc | integer          | VARIADIC a integer[] DEFAULT ARRAY[]::integer[] | normal
+                                     List of functions
+ Schema | Name  | Result data type |               Argument data types               | Type 
+--------+-------+------------------+-------------------------------------------------+------
+ public | dfunc | integer          | VARIADIC a integer[] DEFAULT ARRAY[]::integer[] | func
 (1 row)
 
 drop function dfunc(a variadic int[]);
diff --git a/src/test/regress/expected/privileges.out b/src/test/regress/expected/privileges.out
index f37df6c709..cf53b37383 100644
--- a/src/test/regress/expected/privileges.out
+++ b/src/test/regress/expected/privileges.out
@@ -92,11 +92,11 @@ SELECT * FROM atest2; -- ok
 
 INSERT INTO atest1 VALUES (2, 'two'); -- ok
 INSERT INTO atest2 VALUES ('foo', true); -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 INSERT INTO atest1 SELECT 1, b FROM atest1; -- ok
 UPDATE atest1 SET a = 1 WHERE a = 2; -- ok
 UPDATE atest2 SET col2 = NOT col2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 SELECT * FROM atest1 FOR UPDATE; -- ok
  a |  b  
 ---+-----
@@ -105,17 +105,17 @@ SELECT * FROM atest1 FOR UPDATE; -- ok
 (2 rows)
 
 SELECT * FROM atest2 FOR UPDATE; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 DELETE FROM atest2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 TRUNCATE atest2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 BEGIN;
 LOCK atest2 IN ACCESS EXCLUSIVE MODE; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 COMMIT;
 COPY atest2 FROM stdin; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 GRANT ALL ON atest1 TO PUBLIC; -- fail
 WARNING:  no privileges were granted for "atest1"
 -- checks in subquery, both ok
@@ -144,37 +144,37 @@ SELECT * FROM atest1; -- ok
 (2 rows)
 
 SELECT * FROM atest2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 INSERT INTO atest1 VALUES (2, 'two'); -- fail
-ERROR:  permission denied for relation atest1
+ERROR:  permission denied for table atest1
 INSERT INTO atest2 VALUES ('foo', true); -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 INSERT INTO atest1 SELECT 1, b FROM atest1; -- fail
-ERROR:  permission denied for relation atest1
+ERROR:  permission denied for table atest1
 UPDATE atest1 SET a = 1 WHERE a = 2; -- fail
-ERROR:  permission denied for relation atest1
+ERROR:  permission denied for table atest1
 UPDATE atest2 SET col2 = NULL; -- ok
 UPDATE atest2 SET col2 = NOT col2; -- fails; requires SELECT on atest2
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 UPDATE atest2 SET col2 = true FROM atest1 WHERE atest1.a = 5; -- ok
 SELECT * FROM atest1 FOR UPDATE; -- fail
-ERROR:  permission denied for relation atest1
+ERROR:  permission denied for table atest1
 SELECT * FROM atest2 FOR UPDATE; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 DELETE FROM atest2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 TRUNCATE atest2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 BEGIN;
 LOCK atest2 IN ACCESS EXCLUSIVE MODE; -- ok
 COMMIT;
 COPY atest2 FROM stdin; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 -- checks in subquery, both fail
 SELECT * FROM atest1 WHERE ( b IN ( SELECT col1 FROM atest2 ) );
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 SELECT * FROM atest2 WHERE ( col1 IN ( SELECT b FROM atest1 ) );
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 SET SESSION AUTHORIZATION regress_user4;
 COPY atest2 FROM stdin; -- ok
 SELECT * FROM atest1; -- ok
@@ -234,7 +234,7 @@ CREATE OPERATOR >>> (procedure = leak2, leftarg = integer, rightarg = integer,
                      restrict = scalargtsel);
 -- This should not show any "leak" notices before failing.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12 WHERE a >>> 0;
-ERROR:  permission denied for relation atest12
+ERROR:  permission denied for table atest12
 -- This plan should use hashjoin, as it will expect many rows to be selected.
 EXPLAIN (COSTS OFF) SELECT * FROM atest12v x, atest12v y WHERE x.a = y.b;
                 QUERY PLAN                 
@@ -287,7 +287,7 @@ CREATE TABLE atest3 (one int, two int, three int);
 GRANT DELETE ON atest3 TO GROUP regress_group2;
 SET SESSION AUTHORIZATION regress_user1;
 SELECT * FROM atest3; -- fail
-ERROR:  permission denied for relation atest3
+ERROR:  permission denied for table atest3
 DELETE FROM atest3; -- ok
 -- views
 SET SESSION AUTHORIZATION regress_user3;
@@ -305,7 +305,7 @@ SELECT * FROM atestv1; -- ok
 (2 rows)
 
 SELECT * FROM atestv2; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 GRANT SELECT ON atestv1, atestv3 TO regress_user4;
 GRANT SELECT ON atestv2 TO regress_user2;
 SET SESSION AUTHORIZATION regress_user4;
@@ -317,28 +317,28 @@ SELECT * FROM atestv1; -- ok
 (2 rows)
 
 SELECT * FROM atestv2; -- fail
-ERROR:  permission denied for relation atestv2
+ERROR:  permission denied for view atestv2
 SELECT * FROM atestv3; -- ok
  one | two | three 
 -----+-----+-------
 (0 rows)
 
 SELECT * FROM atestv0; -- fail
-ERROR:  permission denied for relation atestv0
+ERROR:  permission denied for view atestv0
 -- Appendrels excluded by constraints failed to check permissions in 8.4-9.2.
 select * from
   ((select a.q1 as x from int8_tbl a offset 0)
    union all
    (select b.q2 as x from int8_tbl b offset 0)) ss
 where false;
-ERROR:  permission denied for relation int8_tbl
+ERROR:  permission denied for table int8_tbl
 set constraint_exclusion = on;
 select * from
   ((select a.q1 as x, random() from int8_tbl a where q1 > 0)
    union all
    (select b.q2 as x, random() from int8_tbl b where q2 > 0)) ss
 where x < 0;
-ERROR:  permission denied for relation int8_tbl
+ERROR:  permission denied for table int8_tbl
 reset constraint_exclusion;
 CREATE VIEW atestv4 AS SELECT * FROM atestv3; -- nested view
 SELECT * FROM atestv4; -- ok
@@ -350,7 +350,7 @@ GRANT SELECT ON atestv4 TO regress_user2;
 SET SESSION AUTHORIZATION regress_user2;
 -- Two complex cases:
 SELECT * FROM atestv3; -- fail
-ERROR:  permission denied for relation atestv3
+ERROR:  permission denied for view atestv3
 SELECT * FROM atestv4; -- ok (even though regress_user2 cannot access underlying atestv3)
  one | two | three 
 -----+-----+-------
@@ -363,7 +363,7 @@ SELECT * FROM atest2; -- ok
 (1 row)
 
 SELECT * FROM atestv2; -- fail (even though regress_user2 can access underlying atest2)
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 -- Test column level permissions
 SET SESSION AUTHORIZATION regress_user1;
 CREATE TABLE atest5 (one int, two int unique, three int, four int unique);
@@ -373,7 +373,7 @@ GRANT ALL (one) ON atest5 TO regress_user3;
 INSERT INTO atest5 VALUES (1,2,3);
 SET SESSION AUTHORIZATION regress_user4;
 SELECT * FROM atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT one FROM atest5; -- ok
  one 
 -----
@@ -383,13 +383,13 @@ SELECT one FROM atest5; -- ok
 COPY atest5 (one) TO stdout; -- ok
 1
 SELECT two FROM atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 COPY atest5 (two) TO stdout; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT atest5 FROM atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 COPY atest5 (one,two) TO stdout; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT 1 FROM atest5; -- ok
  ?column? 
 ----------
@@ -403,15 +403,15 @@ SELECT 1 FROM atest5 a JOIN atest5 b USING (one); -- ok
 (1 row)
 
 SELECT 1 FROM atest5 a JOIN atest5 b USING (two); -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT 1 FROM atest5 a NATURAL JOIN atest5 b; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT (j.*) IS NULL FROM (atest5 a JOIN atest5 b USING (one)) j; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT 1 FROM atest5 WHERE two = 2; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT * FROM atest1, atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT atest1.* FROM atest1, atest5; -- ok
  a |  b  
 ---+-----
@@ -427,7 +427,7 @@ SELECT atest1.*,atest5.one FROM atest1, atest5; -- ok
 (2 rows)
 
 SELECT atest1.*,atest5.one FROM atest1 JOIN atest5 ON (atest1.a = atest5.two); -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT atest1.*,atest5.one FROM atest1 JOIN atest5 ON (atest1.a = atest5.one); -- ok
  a |  b  | one 
 ---+-----+-----
@@ -436,12 +436,12 @@ SELECT atest1.*,atest5.one FROM atest1 JOIN atest5 ON (atest1.a = atest5.one); -
 (2 rows)
 
 SELECT one, two FROM atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SET SESSION AUTHORIZATION regress_user1;
 GRANT SELECT (one,two) ON atest6 TO regress_user4;
 SET SESSION AUTHORIZATION regress_user4;
 SELECT one, two FROM atest5 NATURAL JOIN atest6; -- fail still
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SET SESSION AUTHORIZATION regress_user1;
 GRANT SELECT (two) ON atest5 TO regress_user4;
 SET SESSION AUTHORIZATION regress_user4;
@@ -453,23 +453,23 @@ SELECT one, two FROM atest5 NATURAL JOIN atest6; -- ok now
 -- test column-level privileges for INSERT and UPDATE
 INSERT INTO atest5 (two) VALUES (3); -- ok
 COPY atest5 FROM stdin; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 COPY atest5 (two) FROM stdin; -- ok
 INSERT INTO atest5 (three) VALUES (4); -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 INSERT INTO atest5 VALUES (5,5,5); -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 UPDATE atest5 SET three = 10; -- ok
 UPDATE atest5 SET one = 8; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 UPDATE atest5 SET three = 5, one = 2; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 -- Check that column level privs are enforced in RETURNING
 -- Ok.
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = 10;
 -- Error. No SELECT on column three.
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = 10 RETURNING atest5.three;
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 -- Ok.  May SELECT on column "one":
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = 10 RETURNING atest5.one;
  one 
@@ -482,23 +482,35 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = 10 RE
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.one;
 -- Error. No select rights on three
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.three;
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- fails (due to UPDATE)
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 -- Check that the columns in the inference require select privileges
--- Error. No privs on four
-INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;
-ERROR:  permission denied for relation atest5
+INSERT INTO atest5(four) VALUES (4); -- fail
+ERROR:  permission denied for table atest5
+SET SESSION AUTHORIZATION regress_user1;
+GRANT INSERT (four) ON atest5 TO regress_user4;
+SET SESSION AUTHORIZATION regress_user4;
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 3; -- fails (due to SELECT)
+ERROR:  permission denied for table atest5
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT ON CONSTRAINT atest5_four_key DO UPDATE set three = 3; -- fails (due to SELECT)
+ERROR:  permission denied for table atest5
+INSERT INTO atest5(four) VALUES (4); -- ok
+SET SESSION AUTHORIZATION regress_user1;
+GRANT SELECT (four) ON atest5 TO regress_user4;
+SET SESSION AUTHORIZATION regress_user4;
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 3; -- ok
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT ON CONSTRAINT atest5_four_key DO UPDATE set three = 3; -- ok
 SET SESSION AUTHORIZATION regress_user1;
 REVOKE ALL (one) ON atest5 FROM regress_user4;
 GRANT SELECT (one,two,blue) ON atest6 TO regress_user4;
 SET SESSION AUTHORIZATION regress_user4;
 SELECT one FROM atest5; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 UPDATE atest5 SET one = 1; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SELECT atest6 FROM atest6; -- ok
  atest6 
 --------
@@ -545,9 +557,9 @@ REVOKE ALL (one) ON atest5 FROM regress_user3;
 GRANT SELECT (one) ON atest5 TO regress_user4;
 SET SESSION AUTHORIZATION regress_user4;
 SELECT atest6 FROM atest6; -- fail
-ERROR:  permission denied for relation atest6
+ERROR:  permission denied for table atest6
 SELECT one FROM atest5 NATURAL JOIN atest6; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 SET SESSION AUTHORIZATION regress_user1;
 ALTER TABLE atest6 DROP COLUMN three;
 SET SESSION AUTHORIZATION regress_user4;
@@ -566,12 +578,12 @@ ALTER TABLE atest6 DROP COLUMN two;
 REVOKE SELECT (one,blue) ON atest6 FROM regress_user4;
 SET SESSION AUTHORIZATION regress_user4;
 SELECT * FROM atest6; -- fail
-ERROR:  permission denied for relation atest6
+ERROR:  permission denied for table atest6
 SELECT 1 FROM atest6; -- fail
-ERROR:  permission denied for relation atest6
+ERROR:  permission denied for table atest6
 SET SESSION AUTHORIZATION regress_user3;
 DELETE FROM atest5 WHERE one = 1; -- fail
-ERROR:  permission denied for relation atest5
+ERROR:  permission denied for table atest5
 DELETE FROM atest5 WHERE two = 2; -- ok
 -- check inheritance cases
 SET SESSION AUTHORIZATION regress_user1;
@@ -602,7 +614,7 @@ SELECT oid FROM atestp2; -- ok
 (0 rows)
 
 SELECT fy FROM atestc; -- fail
-ERROR:  permission denied for relation atestc
+ERROR:  permission denied for table atestc
 SET SESSION AUTHORIZATION regress_user1;
 GRANT SELECT(fy,oid) ON atestc TO regress_user2;
 SET SESSION AUTHORIZATION regress_user2;
@@ -639,13 +651,25 @@ GRANT USAGE ON LANGUAGE sql TO regress_user2; -- fail
 WARNING:  no privileges were granted for "sql"
 CREATE FUNCTION testfunc1(int) RETURNS int AS 'select 2 * $1;' LANGUAGE sql;
 CREATE FUNCTION testfunc2(int) RETURNS int AS 'select 3 * $1;' LANGUAGE sql;
-REVOKE ALL ON FUNCTION testfunc1(int), testfunc2(int) FROM PUBLIC;
-GRANT EXECUTE ON FUNCTION testfunc1(int), testfunc2(int) TO regress_user2;
+CREATE AGGREGATE testagg1(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testproc1(int) AS 'select $1;' LANGUAGE sql;
+REVOKE ALL ON FUNCTION testfunc1(int), testfunc2(int), testagg1(int) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION testfunc1(int), testfunc2(int), testagg1(int) TO regress_user2;
+REVOKE ALL ON FUNCTION testproc1(int) FROM PUBLIC; -- fail, not a function
+ERROR:  testproc1(integer) is not a function
+REVOKE ALL ON PROCEDURE testproc1(int) FROM PUBLIC;
+GRANT EXECUTE ON PROCEDURE testproc1(int) TO regress_user2;
 GRANT USAGE ON FUNCTION testfunc1(int) TO regress_user3; -- semantic error
 ERROR:  invalid privilege type USAGE for function
+GRANT USAGE ON FUNCTION testagg1(int) TO regress_user3; -- semantic error
+ERROR:  invalid privilege type USAGE for function
+GRANT USAGE ON PROCEDURE testproc1(int) TO regress_user3; -- semantic error
+ERROR:  invalid privilege type USAGE for procedure
 GRANT ALL PRIVILEGES ON FUNCTION testfunc1(int) TO regress_user4;
 GRANT ALL PRIVILEGES ON FUNCTION testfunc_nosuch(int) TO regress_user4;
 ERROR:  function testfunc_nosuch(integer) does not exist
+GRANT ALL PRIVILEGES ON FUNCTION testagg1(int) TO regress_user4;
+GRANT ALL PRIVILEGES ON PROCEDURE testproc1(int) TO regress_user4;
 CREATE FUNCTION testfunc4(boolean) RETURNS text
   AS 'select col1 from atest2 where col2 = $1;'
   LANGUAGE sql SECURITY DEFINER;
@@ -659,11 +683,22 @@ SELECT testfunc1(5), testfunc2(5); -- ok
 
 CREATE FUNCTION testfunc3(int) RETURNS int AS 'select 2 * $1;' LANGUAGE sql; -- fail
 ERROR:  permission denied for language sql
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- ok
+ testagg1 
+----------
+        6
+(1 row)
+
+CALL testproc1(6); -- ok
 SET SESSION AUTHORIZATION regress_user3;
 SELECT testfunc1(5); -- fail
 ERROR:  permission denied for function testfunc1
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- fail
+ERROR:  permission denied for aggregate testagg1
+CALL testproc1(6); -- fail
+ERROR:  permission denied for procedure testproc1
 SELECT col1 FROM atest2 WHERE col2 = true; -- fail
-ERROR:  permission denied for relation atest2
+ERROR:  permission denied for table atest2
 SELECT testfunc4(true); -- ok
  testfunc4 
 -----------
@@ -677,8 +712,19 @@ SELECT testfunc1(5); -- ok
         10
 (1 row)
 
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- ok
+ testagg1 
+----------
+        6
+(1 row)
+
+CALL testproc1(6); -- ok
 DROP FUNCTION testfunc1(int); -- fail
 ERROR:  must be owner of function testfunc1
+DROP AGGREGATE testagg1(int); -- fail
+ERROR:  must be owner of aggregate testagg1
+DROP PROCEDURE testproc1(int); -- fail
+ERROR:  must be owner of procedure testproc1
 \c -
 DROP FUNCTION testfunc1(int); -- ok
 -- restore to sanity
@@ -803,7 +849,7 @@ DROP DOMAIN testdomain1; -- ok
 SET SESSION AUTHORIZATION regress_user5;
 TRUNCATE atest2; -- ok
 TRUNCATE atest3; -- fail
-ERROR:  permission denied for relation atest3
+ERROR:  permission denied for table atest3
 -- has_table_privilege function
 -- bad-input checks
 select has_table_privilege(NULL,'pg_authid','select');
@@ -1346,8 +1392,11 @@ ERROR:  permission denied for large object 1002
 SELECT lo_unlink(1002);					-- to be denied
 ERROR:  must be owner of large object 1002
 SELECT lo_export(1001, '/dev/null');			-- to be denied
-ERROR:  must be superuser to use server-side lo_export()
-HINT:  Anyone can use the client-side lo_export() provided by libpq.
+ERROR:  permission denied for function lo_export
+SELECT lo_import('/dev/null');				-- to be denied
+ERROR:  permission denied for function lo_import
+SELECT lo_import('/dev/null', 2003);			-- to be denied
+ERROR:  permission denied for function lo_import
 \c -
 SET lo_compat_privileges = true;	-- compatibility mode
 SET SESSION AUTHORIZATION regress_user4;
@@ -1376,8 +1425,7 @@ SELECT lo_unlink(1002);
 (1 row)
 
 SELECT lo_export(1001, '/dev/null');			-- to be denied
-ERROR:  must be superuser to use server-side lo_export()
-HINT:  Anyone can use the client-side lo_export() provided by libpq.
+ERROR:  permission denied for function lo_export
 -- don't allow unpriv users to access pg_largeobject contents
 \c -
 SELECT * FROM pg_largeobject LIMIT 0;
@@ -1387,7 +1435,7 @@ SELECT * FROM pg_largeobject LIMIT 0;
 
 SET SESSION AUTHORIZATION regress_user1;
 SELECT * FROM pg_largeobject LIMIT 0;			-- to be denied
-ERROR:  permission denied for relation pg_largeobject
+ERROR:  permission denied for table pg_largeobject
 -- test default ACLs
 \c -
 CREATE SCHEMA testns;
@@ -1523,22 +1571,54 @@ SELECT has_schema_privilege('regress_user2', 'testns5', 'CREATE'); -- no
 
 SET ROLE regress_user1;
 CREATE FUNCTION testns.foo() RETURNS int AS 'select 1' LANGUAGE sql;
+CREATE AGGREGATE testns.agg1(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testns.bar() AS 'select 1' LANGUAGE sql;
 SELECT has_function_privilege('regress_user2', 'testns.foo()', 'EXECUTE'); -- no
  has_function_privilege 
 ------------------------
  f
 (1 row)
 
-ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT EXECUTE ON FUNCTIONS to public;
+SELECT has_function_privilege('regress_user2', 'testns.agg1(int)', 'EXECUTE'); -- no
+ has_function_privilege 
+------------------------
+ f
+(1 row)
+
+SELECT has_function_privilege('regress_user2', 'testns.bar()', 'EXECUTE'); -- no
+ has_function_privilege 
+------------------------
+ f
+(1 row)
+
+ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT EXECUTE ON ROUTINES to public;
 DROP FUNCTION testns.foo();
 CREATE FUNCTION testns.foo() RETURNS int AS 'select 1' LANGUAGE sql;
+DROP AGGREGATE testns.agg1(int);
+CREATE AGGREGATE testns.agg1(int) (sfunc = int4pl, stype = int4);
+DROP PROCEDURE testns.bar();
+CREATE PROCEDURE testns.bar() AS 'select 1' LANGUAGE sql;
 SELECT has_function_privilege('regress_user2', 'testns.foo()', 'EXECUTE'); -- yes
  has_function_privilege 
 ------------------------
  t
 (1 row)
 
+SELECT has_function_privilege('regress_user2', 'testns.agg1(int)', 'EXECUTE'); -- yes
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
+SELECT has_function_privilege('regress_user2', 'testns.bar()', 'EXECUTE'); -- yes (counts as function here)
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
 DROP FUNCTION testns.foo();
+DROP AGGREGATE testns.agg1(int);
+DROP PROCEDURE testns.bar();
 ALTER DEFAULT PRIVILEGES FOR ROLE regress_user1 REVOKE USAGE ON TYPES FROM public;
 CREATE DOMAIN testns.testdomain1 AS int;
 SELECT has_type_privilege('regress_user2', 'testns.testdomain1', 'USAGE'); -- no
@@ -1617,12 +1697,26 @@ SELECT has_table_privilege('regress_user1', 'testns.t2', 'SELECT'); -- false
 (1 row)
 
 CREATE FUNCTION testns.testfunc(int) RETURNS int AS 'select 3 * $1;' LANGUAGE sql;
+CREATE AGGREGATE testns.testagg(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testns.testproc(int) AS 'select 3' LANGUAGE sql;
 SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- true by default
  has_function_privilege 
 ------------------------
  t
 (1 row)
 
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- true by default
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- true by default
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
 REVOKE ALL ON ALL FUNCTIONS IN SCHEMA testns FROM PUBLIC;
 SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- false
  has_function_privilege 
@@ -1630,9 +1724,47 @@ SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'
  f
 (1 row)
 
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- false
+ has_function_privilege 
+------------------------
+ f
+(1 row)
+
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- still true, not a function
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
+REVOKE ALL ON ALL PROCEDURES IN SCHEMA testns FROM PUBLIC;
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- now false
+ has_function_privilege 
+------------------------
+ f
+(1 row)
+
+GRANT ALL ON ALL ROUTINES IN SCHEMA testns TO PUBLIC;
+SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- true
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- true
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- true
+ has_function_privilege 
+------------------------
+ t
+(1 row)
+
 \set VERBOSITY terse \\ -- suppress cascade details
 DROP SCHEMA testns CASCADE;
-NOTICE:  drop cascades to 3 other objects
+NOTICE:  drop cascades to 5 other objects
 \set VERBOSITY default
 -- Change owner of the schema & and rename of new schema owner
 \c -
@@ -1715,8 +1847,10 @@ drop table dep_priv_test;
 -- clean up
 \c
 drop sequence x_seq;
+DROP AGGREGATE testagg1(int);
 DROP FUNCTION testfunc2(int);
 DROP FUNCTION testfunc4(boolean);
+DROP PROCEDURE testproc1(int);
 DROP VIEW atestv0;
 DROP VIEW atestv1;
 DROP VIEW atestv2;
@@ -1765,14 +1899,14 @@ GRANT SELECT ON lock_table TO regress_locktable_user;
 SET SESSION AUTHORIZATION regress_locktable_user;
 BEGIN;
 LOCK TABLE lock_table IN ROW EXCLUSIVE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS SHARE MODE; -- should pass
 COMMIT;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS EXCLUSIVE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 \c
 REVOKE SELECT ON lock_table FROM regress_locktable_user;
@@ -1784,11 +1918,11 @@ LOCK TABLE lock_table IN ROW EXCLUSIVE MODE; -- should pass
 COMMIT;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS SHARE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS EXCLUSIVE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 \c
 REVOKE INSERT ON lock_table FROM regress_locktable_user;
@@ -1800,7 +1934,7 @@ LOCK TABLE lock_table IN ROW EXCLUSIVE MODE; -- should pass
 COMMIT;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS SHARE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS EXCLUSIVE MODE; -- should pass
@@ -1815,7 +1949,7 @@ LOCK TABLE lock_table IN ROW EXCLUSIVE MODE; -- should pass
 COMMIT;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS SHARE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS EXCLUSIVE MODE; -- should pass
@@ -1830,7 +1964,7 @@ LOCK TABLE lock_table IN ROW EXCLUSIVE MODE; -- should pass
 COMMIT;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS SHARE MODE; -- should fail
-ERROR:  permission denied for relation lock_table
+ERROR:  permission denied for table lock_table
 ROLLBACK;
 BEGIN;
 LOCK TABLE lock_table IN ACCESS EXCLUSIVE MODE; -- should pass
diff --git a/src/test/regress/expected/psql.out b/src/test/regress/expected/psql.out
index d602aeef42..3818cfea7e 100644
--- a/src/test/regress/expected/psql.out
+++ b/src/test/regress/expected/psql.out
@@ -8,7 +8,7 @@
 invalid variable name: "invalid/name"
 -- fail: invalid value for special variable
 \set AUTOCOMMIT foo
-unrecognized value "foo" for "AUTOCOMMIT": boolean expected
+unrecognized value "foo" for "AUTOCOMMIT": Boolean expected
 \set FETCH_COUNT foo
 invalid value "foo" for "FETCH_COUNT": integer expected
 -- check handling of built-in boolean variable
@@ -51,6 +51,31 @@ four  | 4
      3 |    4
 (1 row)
 
+-- \gx should work in FETCH_COUNT mode too
+\set FETCH_COUNT 1
+SELECT 1 as one, 2 as two \g
+ one | two 
+-----+-----
+   1 |   2
+(1 row)
+
+\gx
+-[ RECORD 1 ]
+one | 1
+two | 2
+
+SELECT 3 as three, 4 as four \gx
+-[ RECORD 1 ]
+three | 3
+four  | 4
+
+\g
+ three | four 
+-------+------
+     3 |    4
+(1 row)
+
+\unset FETCH_COUNT
 -- \gset
 select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
 \echo :pref01_test01 :pref01_test02 :pref01_test03
@@ -101,6 +126,91 @@ more than one row returned for \gset
 select 10 as test01, 20 as test02 from generate_series(1,0) \gset
 no rows returned for \gset
 \unset FETCH_COUNT
+-- \gdesc
+SELECT
+    NULL AS zero,
+    1 AS one,
+    2.0 AS two,
+    'three' AS three,
+    $1 AS four,
+    sin($2) as five,
+    'foo'::varchar(4) as six,
+    CURRENT_DATE AS now
+\gdesc
+ Column |         Type         
+--------+----------------------
+ zero   | text
+ one    | integer
+ two    | numeric
+ three  | text
+ four   | text
+ five   | double precision
+ six    | character varying(4)
+ now    | date
+(8 rows)
+
+-- should work with tuple-returning utilities, such as EXECUTE
+PREPARE test AS SELECT 1 AS first, 2 AS second;
+EXECUTE test \gdesc
+ Column |  Type   
+--------+---------
+ first  | integer
+ second | integer
+(2 rows)
+
+EXPLAIN EXECUTE test \gdesc
+   Column   | Type 
+------------+------
+ QUERY PLAN | text
+(1 row)
+
+-- should fail cleanly - syntax error
+SELECT 1 + \gdesc
+ERROR:  syntax error at end of input
+LINE 1: SELECT 1 + 
+                   ^
+-- check behavior with empty results
+SELECT \gdesc
+The command has no result, or the result has no columns.
+CREATE TABLE bububu(a int) \gdesc
+The command has no result, or the result has no columns.
+-- subject command should not have executed
+TABLE bububu;  -- fail
+ERROR:  relation "bububu" does not exist
+LINE 1: TABLE bububu;
+              ^
+-- query buffer should remain unchanged
+SELECT 1 AS x, 'Hello', 2 AS y, true AS "dirty\name"
+\gdesc
+   Column   |  Type   
+------------+---------
+ x          | integer
+ ?column?   | text
+ y          | integer
+ dirty\name | boolean
+(4 rows)
+
+\g
+ x | ?column? | y | dirty\name 
+---+----------+---+------------
+ 1 | Hello    | 2 | t
+(1 row)
+
+-- all on one line
+SELECT 3 AS x, 'Hello', 4 AS y, true AS "dirty\name" \gdesc \g
+   Column   |  Type   
+------------+---------
+ x          | integer
+ ?column?   | text
+ y          | integer
+ dirty\name | boolean
+(4 rows)
+
+ x | ?column? | y | dirty\name 
+---+----------+---+------------
+ 3 | Hello    | 4 | t
+(1 row)
+
 -- \gexec
 create temporary table gexec_test(a int, b text, c date, d float);
 select format('create index on gexec_test(%I)', attname)
@@ -2829,7 +2939,7 @@ second thing true
 \endif
 -- invalid boolean expressions are false
 \if invalid boolean expression
-unrecognized value "invalid boolean expression" for "\if expression": boolean expected
+unrecognized value "invalid boolean expression" for "\if expression": Boolean expected
 	\echo 'will not print #6-1'
 \else
 	\echo 'will print anyway #6-2'
@@ -2904,6 +3014,32 @@ bar 'bar' "bar"
 	\echo 'should print #8-1'
 should print #8-1
 \endif
+-- :{?...} defined variable test
+\set i 1
+\if :{?i}
+  \echo '#9-1 ok, variable i is defined'
+#9-1 ok, variable i is defined
+\else
+  \echo 'should not print #9-2'
+\endif
+\if :{?no_such_variable}
+  \echo 'should not print #10-1'
+\else
+  \echo '#10-2 ok, variable no_such_variable is not defined'
+#10-2 ok, variable no_such_variable is not defined
+\endif
+SELECT :{?i} AS i_is_defined;
+ i_is_defined 
+--------------
+ t
+(1 row)
+
+SELECT NOT :{?no_such_var} AS no_such_var_is_not_defined;
+ no_such_var_is_not_defined 
+----------------------------
+ t
+(1 row)
+
 -- SHOW_CONTEXT
 \set SHOW_CONTEXT never
 do $$
@@ -2964,3 +3100,146 @@ SELECT 3
 UNION SELECT 4 
 UNION SELECT 5
 ORDER BY 1;
+-- tests for special result variables
+-- working query, 2 rows selected
+SELECT 1 AS stuff UNION SELECT 2;
+ stuff 
+-------
+     1
+     2
+(2 rows)
+
+\echo 'error:' :ERROR
+error: false
+\echo 'error code:' :SQLSTATE
+error code: 00000
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 2
+-- syntax error
+SELECT 1 UNION;
+ERROR:  syntax error at or near ";"
+LINE 1: SELECT 1 UNION;
+                      ^
+\echo 'error:' :ERROR
+error: true
+\echo 'error code:' :SQLSTATE
+error code: 42601
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 0
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+last error message: syntax error at or near ";"
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+last error code: 42601
+-- empty query
+;
+\echo 'error:' :ERROR
+error: false
+\echo 'error code:' :SQLSTATE
+error code: 00000
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 0
+-- must have kept previous values
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+last error message: syntax error at or near ";"
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+last error code: 42601
+-- other query error
+DROP TABLE this_table_does_not_exist;
+ERROR:  table "this_table_does_not_exist" does not exist
+\echo 'error:' :ERROR
+error: true
+\echo 'error code:' :SQLSTATE
+error code: 42P01
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 0
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+last error message: table "this_table_does_not_exist" does not exist
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+last error code: 42P01
+-- working \gdesc
+SELECT 3 AS three, 4 AS four \gdesc
+ Column |  Type   
+--------+---------
+ three  | integer
+ four   | integer
+(2 rows)
+
+\echo 'error:' :ERROR
+error: false
+\echo 'error code:' :SQLSTATE
+error code: 00000
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 2
+-- \gdesc with an error
+SELECT 4 AS \gdesc
+ERROR:  syntax error at end of input
+LINE 1: SELECT 4 AS 
+                    ^
+\echo 'error:' :ERROR
+error: true
+\echo 'error code:' :SQLSTATE
+error code: 42601
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 0
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+last error message: syntax error at end of input
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+last error code: 42601
+-- check row count for a cursor-fetched query
+\set FETCH_COUNT 10
+select unique2 from tenk1 order by unique2 limit 19;
+ unique2 
+---------
+       0
+       1
+       2
+       3
+       4
+       5
+       6
+       7
+       8
+       9
+      10
+      11
+      12
+      13
+      14
+      15
+      16
+      17
+      18
+(19 rows)
+
+\echo 'error:' :ERROR
+error: false
+\echo 'error code:' :SQLSTATE
+error code: 00000
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 19
+-- cursor-fetched query with an error after the first group
+select 1/(15-unique2) from tenk1 order by unique2 limit 19;
+ ?column? 
+----------
+        0
+        0
+        0
+        0
+        0
+        0
+        0
+        0
+        0
+        0
+ERROR:  division by zero
+\echo 'error:' :ERROR
+error: true
+\echo 'error code:' :SQLSTATE
+error code: 22012
+\echo 'number of rows:' :ROW_COUNT
+number of rows: 0
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+last error message: division by zero
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+last error code: 22012
+\unset FETCH_COUNT
diff --git a/src/test/regress/expected/publication.out b/src/test/regress/expected/publication.out
index b101331d69..0c86c647bc 100644
--- a/src/test/regress/expected/publication.out
+++ b/src/test/regress/expected/publication.out
@@ -198,7 +198,7 @@ GRANT CREATE ON DATABASE regression TO regress_publication_user2;
 SET ROLE regress_publication_user2;
 CREATE PUBLICATION testpub2;  -- ok
 ALTER PUBLICATION testpub2 ADD TABLE testpub_tbl1;  -- fail
-ERROR:  must be owner of relation testpub_tbl1
+ERROR:  must be owner of table testpub_tbl1
 SET ROLE regress_publication_user;
 GRANT regress_publication_user TO regress_publication_user2;
 SET ROLE regress_publication_user2;
diff --git a/src/test/regress/expected/rangetypes.out b/src/test/regress/expected/rangetypes.out
index 4a2336cd8d..accf1e0d9e 100644
--- a/src/test/regress/expected/rangetypes.out
+++ b/src/test/regress/expected/rangetypes.out
@@ -1354,6 +1354,18 @@ select *, row_to_json(upper(t)) as u from
 drop type two_ints cascade;
 NOTICE:  drop cascades to type two_ints_range
 --
+-- Check behavior when subtype lacks a hash function
+--
+create type cashrange as range (subtype = money);
+set enable_sort = off;  -- try to make it pick a hash setop implementation
+select '(2,5)'::cashrange except select '(5,6)'::cashrange;
+   cashrange   
+---------------
+ ($2.00,$5.00)
+(1 row)
+
+reset enable_sort;
+--
 -- OUT/INOUT/TABLE functions
 --
 create function outparam_succeed(i anyrange, out r anyrange, out t text)
diff --git a/src/test/regress/expected/reloptions.out b/src/test/regress/expected/reloptions.out
new file mode 100644
index 0000000000..c4107d5ca1
--- /dev/null
+++ b/src/test/regress/expected/reloptions.out
@@ -0,0 +1,185 @@
+-- Simple create
+CREATE TABLE reloptions_test(i INT) WITH (FiLLFaCToR=30,
+	autovacuum_enabled = false, autovacuum_analyze_scale_factor = 0.2);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+                                  reloptions                                  
+------------------------------------------------------------------------------
+ {fillfactor=30,autovacuum_enabled=false,autovacuum_analyze_scale_factor=0.2}
+(1 row)
+
+-- Fail min/max values check
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=2);
+ERROR:  value 2 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=110);
+ERROR:  value 110 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor = -10.0);
+ERROR:  value -10.0 out of bounds for option "autovacuum_analyze_scale_factor"
+DETAIL:  Valid values are between "0.000000" and "100.000000".
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor = 110.0);
+ERROR:  value 110.0 out of bounds for option "autovacuum_analyze_scale_factor"
+DETAIL:  Valid values are between "0.000000" and "100.000000".
+-- Fail when option and namespace do not exist
+CREATE TABLE reloptions_test2(i INT) WITH (not_existing_option=2);
+ERROR:  unrecognized parameter "not_existing_option"
+CREATE TABLE reloptions_test2(i INT) WITH (not_existing_namespace.fillfactor=2);
+ERROR:  unrecognized parameter namespace "not_existing_namespace"
+-- Fail while setting improper values
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=30.5);
+ERROR:  invalid value for integer option "fillfactor": 30.5
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor='string');
+ERROR:  invalid value for integer option "fillfactor": string
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=true);
+ERROR:  invalid value for integer option "fillfactor": true
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled=12);
+ERROR:  invalid value for boolean option "autovacuum_enabled": 12
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled=30.5);
+ERROR:  invalid value for boolean option "autovacuum_enabled": 30.5
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled='string');
+ERROR:  invalid value for boolean option "autovacuum_enabled": string
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor='string');
+ERROR:  invalid value for floating point option "autovacuum_analyze_scale_factor": string
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor=true);
+ERROR:  invalid value for floating point option "autovacuum_analyze_scale_factor": true
+-- Fail if option is specified twice
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=30, fillfactor=40);
+ERROR:  parameter "fillfactor" specified more than once
+-- Specifying name only for a non-Boolean option should fail
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor);
+ERROR:  invalid value for integer option "fillfactor": true
+-- Simple ALTER TABLE
+ALTER TABLE reloptions_test SET (fillfactor=31,
+	autovacuum_analyze_scale_factor = 0.3);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+                                  reloptions                                  
+------------------------------------------------------------------------------
+ {autovacuum_enabled=false,fillfactor=31,autovacuum_analyze_scale_factor=0.3}
+(1 row)
+
+-- Set boolean option to true without specifying value
+ALTER TABLE reloptions_test SET (autovacuum_enabled, fillfactor=32);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+                                 reloptions                                  
+-----------------------------------------------------------------------------
+ {autovacuum_analyze_scale_factor=0.3,autovacuum_enabled=true,fillfactor=32}
+(1 row)
+
+-- Check that RESET works well
+ALTER TABLE reloptions_test RESET (fillfactor);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+                          reloptions                           
+---------------------------------------------------------------
+ {autovacuum_analyze_scale_factor=0.3,autovacuum_enabled=true}
+(1 row)
+
+-- Resetting all values causes the column to become null
+ALTER TABLE reloptions_test RESET (autovacuum_enabled,
+	autovacuum_analyze_scale_factor);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass AND
+reloptions IS NULL;
+ reloptions 
+------------
+ 
+(1 row)
+
+-- RESET fails if a value is specified
+ALTER TABLE reloptions_test RESET (fillfactor=12);
+ERROR:  RESET must not include values for parameters
+-- The OIDS option is not stored
+DROP TABLE reloptions_test;
+CREATE TABLE reloptions_test(i INT) WITH (fillfactor=20, oids=true);
+SELECT reloptions, relhasoids FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+   reloptions    | relhasoids 
+-----------------+------------
+ {fillfactor=20} | t
+(1 row)
+
+-- Test toast.* options
+DROP TABLE reloptions_test;
+CREATE TABLE reloptions_test (s VARCHAR)
+	WITH (toast.autovacuum_vacuum_cost_delay = 23);
+SELECT reltoastrelid as toast_oid
+	FROM pg_class WHERE oid = 'reloptions_test'::regclass \gset
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+            reloptions             
+-----------------------------------
+ {autovacuum_vacuum_cost_delay=23}
+(1 row)
+
+ALTER TABLE reloptions_test SET (toast.autovacuum_vacuum_cost_delay = 24);
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+            reloptions             
+-----------------------------------
+ {autovacuum_vacuum_cost_delay=24}
+(1 row)
+
+ALTER TABLE reloptions_test RESET (toast.autovacuum_vacuum_cost_delay);
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+ reloptions 
+------------
+ 
+(1 row)
+
+-- Fail on non-existent options in toast namespace
+CREATE TABLE reloptions_test2 (i int) WITH (toast.not_existing_option = 42);
+ERROR:  unrecognized parameter "not_existing_option"
+-- Mix TOAST & heap
+DROP TABLE reloptions_test;
+CREATE TABLE reloptions_test (s VARCHAR) WITH
+	(toast.autovacuum_vacuum_cost_delay = 23,
+	autovacuum_vacuum_cost_delay = 24, fillfactor = 40);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+                   reloptions                    
+-------------------------------------------------
+ {autovacuum_vacuum_cost_delay=24,fillfactor=40}
+(1 row)
+
+SELECT reloptions FROM pg_class WHERE oid = (
+	SELECT reltoastrelid FROM pg_class WHERE oid = 'reloptions_test'::regclass);
+            reloptions             
+-----------------------------------
+ {autovacuum_vacuum_cost_delay=23}
+(1 row)
+
+--
+-- CREATE INDEX, ALTER INDEX for btrees
+--
+CREATE INDEX reloptions_test_idx ON reloptions_test (s) WITH (fillfactor=30);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx'::regclass;
+   reloptions    
+-----------------
+ {fillfactor=30}
+(1 row)
+
+-- Fail when option and namespace do not exist
+CREATE INDEX reloptions_test_idx ON reloptions_test (s)
+	WITH (not_existing_option=2);
+ERROR:  unrecognized parameter "not_existing_option"
+CREATE INDEX reloptions_test_idx ON reloptions_test (s)
+	WITH (not_existing_ns.fillfactor=2);
+ERROR:  unrecognized parameter namespace "not_existing_ns"
+-- Check allowed ranges
+CREATE INDEX reloptions_test_idx2 ON reloptions_test (s) WITH (fillfactor=1);
+ERROR:  value 1 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+CREATE INDEX reloptions_test_idx2 ON reloptions_test (s) WITH (fillfactor=130);
+ERROR:  value 130 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+-- Check ALTER
+ALTER INDEX reloptions_test_idx SET (fillfactor=40);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx'::regclass;
+   reloptions    
+-----------------
+ {fillfactor=40}
+(1 row)
+
+-- Check ALTER on empty reloption list
+CREATE INDEX reloptions_test_idx3 ON reloptions_test (s);
+ALTER INDEX reloptions_test_idx3 SET (fillfactor=40);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx3'::regclass;
+   reloptions    
+-----------------
+ {fillfactor=40}
+(1 row)
+
diff --git a/src/test/regress/expected/rowsecurity.out b/src/test/regress/expected/rowsecurity.out
index de2ee4d2c9..f1ae40df61 100644
--- a/src/test/regress/expected/rowsecurity.out
+++ b/src/test/regress/expected/rowsecurity.out
@@ -361,7 +361,7 @@ INSERT INTO document VALUES (100, 55, 1, 'regress_rls_dave', 'testing sorting of
 ERROR:  new row violates row-level security policy "p2r" for table "document"
 -- only owner can change policies
 ALTER POLICY p1 ON document USING (true);    --fail
-ERROR:  must be owner of relation document
+ERROR:  must be owner of table document
 DROP POLICY p1 ON document;                  --fail
 ERROR:  must be owner of relation document
 SET SESSION AUTHORIZATION regress_rls_alice;
@@ -1192,7 +1192,7 @@ EXPLAIN (COSTS OFF) SELECT * FROM part_document WHERE f_leak(dtitle);
 
 -- only owner can change policies
 ALTER POLICY pp1 ON part_document USING (true);    --fail
-ERROR:  must be owner of relation part_document
+ERROR:  must be owner of table part_document
 DROP POLICY pp1 ON part_document;                  --fail
 ERROR:  must be owner of relation part_document
 SET SESSION AUTHORIZATION regress_rls_alice;
@@ -2446,9 +2446,9 @@ EXPLAIN (COSTS OFF) SELECT * FROM rls_view;
 -- Query as role that is not the owner of the table or view without permissions.
 SET SESSION AUTHORIZATION regress_rls_carol;
 SELECT * FROM rls_view; --fail - permission denied.
-ERROR:  permission denied for relation rls_view
+ERROR:  permission denied for view rls_view
 EXPLAIN (COSTS OFF) SELECT * FROM rls_view; --fail - permission denied.
-ERROR:  permission denied for relation rls_view
+ERROR:  permission denied for view rls_view
 -- Query as role that is not the owner of the table or view with permissions.
 SET SESSION AUTHORIZATION regress_rls_bob;
 GRANT SELECT ON rls_view TO regress_rls_carol;
@@ -3235,7 +3235,7 @@ COPY (SELECT * FROM copy_t ORDER BY a ASC) TO STDOUT WITH DELIMITER ','; --fail
 ERROR:  query would be affected by row-level security policy for table "copy_t"
 SET row_security TO ON;
 COPY (SELECT * FROM copy_t ORDER BY a ASC) TO STDOUT WITH DELIMITER ','; --fail - permission denied
-ERROR:  permission denied for relation copy_t
+ERROR:  permission denied for table copy_t
 -- Check COPY relation TO; keep it just one row to avoid reordering issues
 RESET SESSION AUTHORIZATION;
 SET row_security TO ON;
@@ -3271,10 +3271,10 @@ COPY copy_rel_to TO STDOUT WITH DELIMITER ','; --ok
 SET SESSION AUTHORIZATION regress_rls_carol;
 SET row_security TO OFF;
 COPY copy_rel_to TO STDOUT WITH DELIMITER ','; --fail - permission denied
-ERROR:  permission denied for relation copy_rel_to
+ERROR:  permission denied for table copy_rel_to
 SET row_security TO ON;
 COPY copy_rel_to TO STDOUT WITH DELIMITER ','; --fail - permission denied
-ERROR:  permission denied for relation copy_rel_to
+ERROR:  permission denied for table copy_rel_to
 -- Check COPY FROM as Superuser/owner.
 RESET SESSION AUTHORIZATION;
 SET row_security TO OFF;
@@ -3298,10 +3298,10 @@ COPY copy_t FROM STDIN; --ok
 SET SESSION AUTHORIZATION regress_rls_carol;
 SET row_security TO OFF;
 COPY copy_t FROM STDIN; --fail - permission denied.
-ERROR:  permission denied for relation copy_t
+ERROR:  permission denied for table copy_t
 SET row_security TO ON;
 COPY copy_t FROM STDIN; --fail - permission denied.
-ERROR:  permission denied for relation copy_t
+ERROR:  permission denied for table copy_t
 RESET SESSION AUTHORIZATION;
 DROP TABLE copy_t;
 DROP TABLE copy_rel_to CASCADE;
@@ -3807,9 +3807,10 @@ DROP TABLE r1;
 --
 SET SESSION AUTHORIZATION regress_rls_alice;
 SET row_security = on;
-CREATE TABLE r1 (a int);
+CREATE TABLE r1 (a int PRIMARY KEY);
 CREATE POLICY p1 ON r1 FOR SELECT USING (a < 20);
 CREATE POLICY p2 ON r1 FOR UPDATE USING (a < 20) WITH CHECK (true);
+CREATE POLICY p3 ON r1 FOR INSERT WITH CHECK (true);
 INSERT INTO r1 VALUES (10);
 ALTER TABLE r1 ENABLE ROW LEVEL SECURITY;
 ALTER TABLE r1 FORCE ROW LEVEL SECURITY;
@@ -3836,6 +3837,18 @@ ALTER TABLE r1 FORCE ROW LEVEL SECURITY;
 -- Error
 UPDATE r1 SET a = 30 RETURNING *;
 ERROR:  new row violates row-level security policy for table "r1"
+-- UPDATE path of INSERT ... ON CONFLICT DO UPDATE should also error out
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT (a) DO UPDATE SET a = 30 RETURNING *;
+ERROR:  new row violates row-level security policy for table "r1"
+-- Should still error out without RETURNING (use of arbiter always requires
+-- SELECT permissions)
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT (a) DO UPDATE SET a = 30;
+ERROR:  new row violates row-level security policy for table "r1"
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT ON CONSTRAINT r1_pkey DO UPDATE SET a = 30;
+ERROR:  new row violates row-level security policy for table "r1"
 DROP TABLE r1;
 -- Check dependency handling
 RESET SESSION AUTHORIZATION;
diff --git a/src/test/regress/expected/rowtypes.out b/src/test/regress/expected/rowtypes.out
index 43b36f6566..45cb6ff3da 100644
--- a/src/test/regress/expected/rowtypes.out
+++ b/src/test/regress/expected/rowtypes.out
@@ -53,6 +53,22 @@ ERROR:  malformed record literal: "(Joe,,)"
 LINE 1: select '(Joe,,)'::fullname;
                ^
 DETAIL:  Too many columns.
+select '[]'::fullname;          -- bad
+ERROR:  malformed record literal: "[]"
+LINE 1: select '[]'::fullname;
+               ^
+DETAIL:  Missing left parenthesis.
+select ' (Joe,Blow)  '::fullname;  -- ok, extra whitespace
+  fullname  
+------------
+ (Joe,Blow)
+(1 row)
+
+select '(Joe,Blow) /'::fullname;  -- bad
+ERROR:  malformed record literal: "(Joe,Blow) /"
+LINE 1: select '(Joe,Blow) /'::fullname;
+               ^
+DETAIL:  Junk after right parenthesis.
 create temp table quadtable(f1 int, q quad);
 insert into quadtable values (1, ((3.3,4.4),(5.5,6.6)));
 insert into quadtable values (2, ((null,4.4),(5.5,6.6)));
@@ -307,10 +323,10 @@ ERROR:  cannot compare dissimilar column types bigint and integer at record colu
 explain (costs off)
 select * from int8_tbl i8
 where i8 in (row(123,456)::int8_tbl, '(4567890123456789,123)');
-                                                   QUERY PLAN                                                    
------------------------------------------------------------------------------------------------------------------
+                                  QUERY PLAN                                   
+-------------------------------------------------------------------------------
  Seq Scan on int8_tbl i8
-   Filter: (i8.* = ANY (ARRAY[ROW('123'::bigint, '456'::bigint)::int8_tbl, '(4567890123456789,123)'::int8_tbl]))
+   Filter: (i8.* = ANY ('{"(123,456)","(4567890123456789,123)"}'::int8_tbl[]))
 (2 rows)
 
 select * from int8_tbl i8
@@ -369,6 +385,290 @@ LINE 1: select * from cc order by f1;
                                   ^
 HINT:  Use an explicit ordering operator or modify the query.
 --
+-- Tests for record_{eq,cmp}
+--
+create type testtype1 as (a int, b int);
+-- all true
+select row(1, 2)::testtype1 < row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 <= row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 = row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 <> row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 3)::testtype1 >= row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 3)::testtype1 > row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+-- all false
+select row(1, -2)::testtype1 < row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 <= row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 = row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 <> row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -3)::testtype1 >= row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -3)::testtype1 > row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+-- true, but see *< below
+select row(1, -2)::testtype1 < row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+-- mismatches
+create type testtype3 as (a int, b text);
+select row(1, 2)::testtype1 < row(1, 'abc')::testtype3;
+ERROR:  cannot compare dissimilar column types integer and text at record column 2
+select row(1, 2)::testtype1 <> row(1, 'abc')::testtype3;
+ERROR:  cannot compare dissimilar column types integer and text at record column 2
+create type testtype5 as (a int);
+select row(1, 2)::testtype1 < row(1)::testtype5;
+ERROR:  cannot compare record types with different numbers of columns
+select row(1, 2)::testtype1 <> row(1)::testtype5;
+ERROR:  cannot compare record types with different numbers of columns
+-- non-comparable types
+create type testtype6 as (a int, b point);
+select row(1, '(1,2)')::testtype6 < row(1, '(1,3)')::testtype6;
+ERROR:  could not identify a comparison function for type point
+select row(1, '(1,2)')::testtype6 <> row(1, '(1,3)')::testtype6;
+ERROR:  could not identify an equality operator for type point
+drop type testtype1, testtype3, testtype5, testtype6;
+--
+-- Tests for record_image_{eq,cmp}
+--
+create type testtype1 as (a int, b int);
+-- all true
+select row(1, 2)::testtype1 *< row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 *<= row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 *= row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 2)::testtype1 *<> row(1, 3)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 3)::testtype1 *>= row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 3)::testtype1 *> row(1, 2)::testtype1;
+ ?column? 
+----------
+ t
+(1 row)
+
+-- all false
+select row(1, -2)::testtype1 *< row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 *<= row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 *= row(1, -3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -2)::testtype1 *<> row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -3)::testtype1 *>= row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, -3)::testtype1 *> row(1, -2)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+-- This returns the "wrong" order because record_image_cmp works on
+-- unsigned datums without knowing about the actual data type.
+select row(1, -2)::testtype1 *< row(1, 3)::testtype1;
+ ?column? 
+----------
+ f
+(1 row)
+
+-- other types
+create type testtype2 as (a smallint, b bool);  -- byval different sizes
+select row(1, true)::testtype2 *< row(2, true)::testtype2;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(-2, true)::testtype2 *< row(-1, true)::testtype2;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(0, false)::testtype2 *< row(0, true)::testtype2;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(0, false)::testtype2 *<> row(0, true)::testtype2;
+ ?column? 
+----------
+ t
+(1 row)
+
+create type testtype3 as (a int, b text);  -- variable length
+select row(1, 'abc')::testtype3 *< row(1, 'abd')::testtype3;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 'abc')::testtype3 *< row(1, 'abcd')::testtype3;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, 'abc')::testtype3 *> row(1, 'abd')::testtype3;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, 'abc')::testtype3 *<> row(1, 'abd')::testtype3;
+ ?column? 
+----------
+ t
+(1 row)
+
+create type testtype4 as (a int, b point);  -- by ref, fixed length
+select row(1, '(1,2)')::testtype4 *< row(1, '(1,3)')::testtype4;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, '(1,2)')::testtype4 *<> row(1, '(1,3)')::testtype4;
+ ?column? 
+----------
+ t
+(1 row)
+
+-- mismatches
+select row(1, 2)::testtype1 *< row(1, 'abc')::testtype3;
+ERROR:  cannot compare dissimilar column types integer and text at record column 2
+select row(1, 2)::testtype1 *<> row(1, 'abc')::testtype3;
+ERROR:  cannot compare dissimilar column types integer and text at record column 2
+create type testtype5 as (a int);
+select row(1, 2)::testtype1 *< row(1)::testtype5;
+ERROR:  cannot compare record types with different numbers of columns
+select row(1, 2)::testtype1 *<> row(1)::testtype5;
+ERROR:  cannot compare record types with different numbers of columns
+-- non-comparable types
+create type testtype6 as (a int, b point);
+select row(1, '(1,2)')::testtype6 *< row(1, '(1,3)')::testtype6;
+ ?column? 
+----------
+ t
+(1 row)
+
+select row(1, '(1,2)')::testtype6 *>= row(1, '(1,3)')::testtype6;
+ ?column? 
+----------
+ f
+(1 row)
+
+select row(1, '(1,2)')::testtype6 *<> row(1, '(1,3)')::testtype6;
+ ?column? 
+----------
+ t
+(1 row)
+
+drop type testtype1, testtype2, testtype3, testtype4, testtype5, testtype6;
+--
 -- Test case derived from bug #5716: check multiple uses of a rowtype result
 --
 BEGIN;
diff --git a/src/test/regress/expected/rules.out b/src/test/regress/expected/rules.out
index d582bc9ee4..5acb92f30f 100644
--- a/src/test/regress/expected/rules.out
+++ b/src/test/regress/expected/rules.out
@@ -2342,103 +2342,103 @@ toyemp| SELECT emp.name,
 SELECT tablename, rulename, definition FROM pg_rules
 	ORDER BY tablename, rulename;
 pg_settings|pg_settings_n|CREATE RULE pg_settings_n AS
-    ON UPDATE TO pg_settings DO INSTEAD NOTHING;
+    ON UPDATE TO pg_catalog.pg_settings DO INSTEAD NOTHING;
 pg_settings|pg_settings_u|CREATE RULE pg_settings_u AS
-    ON UPDATE TO pg_settings
+    ON UPDATE TO pg_catalog.pg_settings
    WHERE (new.name = old.name) DO  SELECT set_config(old.name, new.setting, false) AS set_config;
 rtest_emp|rtest_emp_del|CREATE RULE rtest_emp_del AS
-    ON DELETE TO rtest_emp DO  INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
+    ON DELETE TO public.rtest_emp DO  INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
   VALUES (old.ename, CURRENT_USER, 'fired'::bpchar, '$0.00'::money, old.salary);
 rtest_emp|rtest_emp_ins|CREATE RULE rtest_emp_ins AS
-    ON INSERT TO rtest_emp DO  INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
+    ON INSERT TO public.rtest_emp DO  INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
   VALUES (new.ename, CURRENT_USER, 'hired'::bpchar, new.salary, '$0.00'::money);
 rtest_emp|rtest_emp_upd|CREATE RULE rtest_emp_upd AS
-    ON UPDATE TO rtest_emp
+    ON UPDATE TO public.rtest_emp
    WHERE (new.salary <> old.salary) DO  INSERT INTO rtest_emplog (ename, who, action, newsal, oldsal)
   VALUES (new.ename, CURRENT_USER, 'honored'::bpchar, new.salary, old.salary);
 rtest_nothn1|rtest_nothn_r1|CREATE RULE rtest_nothn_r1 AS
-    ON INSERT TO rtest_nothn1
+    ON INSERT TO public.rtest_nothn1
    WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD NOTHING;
 rtest_nothn1|rtest_nothn_r2|CREATE RULE rtest_nothn_r2 AS
-    ON INSERT TO rtest_nothn1
+    ON INSERT TO public.rtest_nothn1
    WHERE ((new.a >= 30) AND (new.a < 40)) DO INSTEAD NOTHING;
 rtest_nothn2|rtest_nothn_r3|CREATE RULE rtest_nothn_r3 AS
-    ON INSERT TO rtest_nothn2
+    ON INSERT TO public.rtest_nothn2
    WHERE (new.a >= 100) DO INSTEAD  INSERT INTO rtest_nothn3 (a, b)
   VALUES (new.a, new.b);
 rtest_nothn2|rtest_nothn_r4|CREATE RULE rtest_nothn_r4 AS
-    ON INSERT TO rtest_nothn2 DO INSTEAD NOTHING;
+    ON INSERT TO public.rtest_nothn2 DO INSTEAD NOTHING;
 rtest_order1|rtest_order_r1|CREATE RULE rtest_order_r1 AS
-    ON INSERT TO rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
+    ON INSERT TO public.rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
   VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 1 - this should run 1st'::text);
 rtest_order1|rtest_order_r2|CREATE RULE rtest_order_r2 AS
-    ON INSERT TO rtest_order1 DO  INSERT INTO rtest_order2 (a, b, c)
+    ON INSERT TO public.rtest_order1 DO  INSERT INTO rtest_order2 (a, b, c)
   VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 2 - this should run 2nd'::text);
 rtest_order1|rtest_order_r3|CREATE RULE rtest_order_r3 AS
-    ON INSERT TO rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
+    ON INSERT TO public.rtest_order1 DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
   VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 3 - this should run 3rd'::text);
 rtest_order1|rtest_order_r4|CREATE RULE rtest_order_r4 AS
-    ON INSERT TO rtest_order1
+    ON INSERT TO public.rtest_order1
    WHERE (new.a < 100) DO INSTEAD  INSERT INTO rtest_order2 (a, b, c)
   VALUES (new.a, nextval('rtest_seq'::regclass), 'rule 4 - this should run 4th'::text);
 rtest_person|rtest_pers_del|CREATE RULE rtest_pers_del AS
-    ON DELETE TO rtest_person DO  DELETE FROM rtest_admin
+    ON DELETE TO public.rtest_person DO  DELETE FROM rtest_admin
   WHERE (rtest_admin.pname = old.pname);
 rtest_person|rtest_pers_upd|CREATE RULE rtest_pers_upd AS
-    ON UPDATE TO rtest_person DO  UPDATE rtest_admin SET pname = new.pname
+    ON UPDATE TO public.rtest_person DO  UPDATE rtest_admin SET pname = new.pname
   WHERE (rtest_admin.pname = old.pname);
 rtest_system|rtest_sys_del|CREATE RULE rtest_sys_del AS
-    ON DELETE TO rtest_system DO ( DELETE FROM rtest_interface
+    ON DELETE TO public.rtest_system DO ( DELETE FROM rtest_interface
   WHERE (rtest_interface.sysname = old.sysname);
  DELETE FROM rtest_admin
   WHERE (rtest_admin.sysname = old.sysname);
 );
 rtest_system|rtest_sys_upd|CREATE RULE rtest_sys_upd AS
-    ON UPDATE TO rtest_system DO ( UPDATE rtest_interface SET sysname = new.sysname
+    ON UPDATE TO public.rtest_system DO ( UPDATE rtest_interface SET sysname = new.sysname
   WHERE (rtest_interface.sysname = old.sysname);
  UPDATE rtest_admin SET sysname = new.sysname
   WHERE (rtest_admin.sysname = old.sysname);
 );
 rtest_t4|rtest_t4_ins1|CREATE RULE rtest_t4_ins1 AS
-    ON INSERT TO rtest_t4
+    ON INSERT TO public.rtest_t4
    WHERE ((new.a >= 10) AND (new.a < 20)) DO INSTEAD  INSERT INTO rtest_t5 (a, b)
   VALUES (new.a, new.b);
 rtest_t4|rtest_t4_ins2|CREATE RULE rtest_t4_ins2 AS
-    ON INSERT TO rtest_t4
+    ON INSERT TO public.rtest_t4
    WHERE ((new.a >= 20) AND (new.a < 30)) DO  INSERT INTO rtest_t6 (a, b)
   VALUES (new.a, new.b);
 rtest_t5|rtest_t5_ins|CREATE RULE rtest_t5_ins AS
-    ON INSERT TO rtest_t5
+    ON INSERT TO public.rtest_t5
    WHERE (new.a > 15) DO  INSERT INTO rtest_t7 (a, b)
   VALUES (new.a, new.b);
 rtest_t6|rtest_t6_ins|CREATE RULE rtest_t6_ins AS
-    ON INSERT TO rtest_t6
+    ON INSERT TO public.rtest_t6
    WHERE (new.a > 25) DO INSTEAD  INSERT INTO rtest_t8 (a, b)
   VALUES (new.a, new.b);
 rtest_v1|rtest_v1_del|CREATE RULE rtest_v1_del AS
-    ON DELETE TO rtest_v1 DO INSTEAD  DELETE FROM rtest_t1
+    ON DELETE TO public.rtest_v1 DO INSTEAD  DELETE FROM rtest_t1
   WHERE (rtest_t1.a = old.a);
 rtest_v1|rtest_v1_ins|CREATE RULE rtest_v1_ins AS
-    ON INSERT TO rtest_v1 DO INSTEAD  INSERT INTO rtest_t1 (a, b)
+    ON INSERT TO public.rtest_v1 DO INSTEAD  INSERT INTO rtest_t1 (a, b)
   VALUES (new.a, new.b);
 rtest_v1|rtest_v1_upd|CREATE RULE rtest_v1_upd AS
-    ON UPDATE TO rtest_v1 DO INSTEAD  UPDATE rtest_t1 SET a = new.a, b = new.b
+    ON UPDATE TO public.rtest_v1 DO INSTEAD  UPDATE rtest_t1 SET a = new.a, b = new.b
   WHERE (rtest_t1.a = old.a);
 shoelace|shoelace_del|CREATE RULE shoelace_del AS
-    ON DELETE TO shoelace DO INSTEAD  DELETE FROM shoelace_data
+    ON DELETE TO public.shoelace DO INSTEAD  DELETE FROM shoelace_data
   WHERE (shoelace_data.sl_name = old.sl_name);
 shoelace|shoelace_ins|CREATE RULE shoelace_ins AS
-    ON INSERT TO shoelace DO INSTEAD  INSERT INTO shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit)
+    ON INSERT TO public.shoelace DO INSTEAD  INSERT INTO shoelace_data (sl_name, sl_avail, sl_color, sl_len, sl_unit)
   VALUES (new.sl_name, new.sl_avail, new.sl_color, new.sl_len, new.sl_unit);
 shoelace|shoelace_upd|CREATE RULE shoelace_upd AS
-    ON UPDATE TO shoelace DO INSTEAD  UPDATE shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit
+    ON UPDATE TO public.shoelace DO INSTEAD  UPDATE shoelace_data SET sl_name = new.sl_name, sl_avail = new.sl_avail, sl_color = new.sl_color, sl_len = new.sl_len, sl_unit = new.sl_unit
   WHERE (shoelace_data.sl_name = old.sl_name);
 shoelace_data|log_shoelace|CREATE RULE log_shoelace AS
-    ON UPDATE TO shoelace_data
+    ON UPDATE TO public.shoelace_data
    WHERE (new.sl_avail <> old.sl_avail) DO  INSERT INTO shoelace_log (sl_name, sl_avail, log_who, log_when)
   VALUES (new.sl_name, new.sl_avail, 'Al Bundy'::name, 'Thu Jan 01 00:00:00 1970'::timestamp without time zone);
 shoelace_ok|shoelace_ok_ins|CREATE RULE shoelace_ok_ins AS
-    ON INSERT TO shoelace_ok DO INSTEAD  UPDATE shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant)
+    ON INSERT TO public.shoelace_ok DO INSTEAD  UPDATE shoelace SET sl_avail = (shoelace.sl_avail + new.ok_quant)
   WHERE (shoelace.sl_name = new.ok_name);
 -- restore normal output mode
 \a\t
@@ -2571,12 +2571,12 @@ drop view fooview;
 create table fooview (x int, y text) partition by list (x);
 create rule "_RETURN" as on select to fooview do instead
   select 1 as x, 'aaa'::text as y;
-ERROR:  could not convert partitioned table "fooview" to a view
+ERROR:  cannot convert partitioned table "fooview" to a view
 -- nor can one convert a partition to view
 create table fooview_part partition of fooview for values in (1);
 create rule "_RETURN" as on select to fooview_part do instead
   select 1 as x, 'aaa'::text as y;
-ERROR:  could not convert partition "fooview_part" to a view
+ERROR:  cannot convert partition "fooview_part" to a view
 --
 -- check for planner problems with complex inherited UPDATES
 --
@@ -2961,7 +2961,7 @@ SELECT definition FROM pg_rules WHERE tablename = 'hats' ORDER BY rulename;
                                          definition                                          
 ---------------------------------------------------------------------------------------------
  CREATE RULE hat_nosert AS                                                                  +
-     ON INSERT TO hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)               +
+     ON INSERT TO public.hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)        +
    VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name COLLATE "C" bpchar_pattern_ops)+
    WHERE (hat_color = 'green'::bpchar) DO NOTHING                                           +
    RETURNING hat_data.hat_name,                                                             +
@@ -2986,7 +2986,7 @@ SELECT tablename, rulename, definition FROM pg_rules
  tablename |  rulename  |                                         definition                                          
 -----------+------------+---------------------------------------------------------------------------------------------
  hats      | hat_nosert | CREATE RULE hat_nosert AS                                                                  +
-           |            |     ON INSERT TO hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)               +
+           |            |     ON INSERT TO public.hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)        +
            |            |   VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name COLLATE "C" bpchar_pattern_ops)+
            |            |   WHERE (hat_color = 'green'::bpchar) DO NOTHING                                           +
            |            |   RETURNING hat_data.hat_name,                                                             +
@@ -3004,12 +3004,12 @@ CREATE RULE hat_nosert_all AS ON INSERT TO hats
         DO NOTHING
         RETURNING *;
 SELECT definition FROM pg_rules WHERE tablename = 'hats' ORDER BY rulename;
-                                  definition                                  
-------------------------------------------------------------------------------
- CREATE RULE hat_nosert_all AS                                               +
-     ON INSERT TO hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)+
-   VALUES (new.hat_name, new.hat_color) ON CONFLICT DO NOTHING               +
-   RETURNING hat_data.hat_name,                                              +
+                                     definition                                      
+-------------------------------------------------------------------------------------
+ CREATE RULE hat_nosert_all AS                                                      +
+     ON INSERT TO public.hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)+
+   VALUES (new.hat_name, new.hat_color) ON CONFLICT DO NOTHING                      +
+   RETURNING hat_data.hat_name,                                                     +
      hat_data.hat_color;
 (1 row)
 
@@ -3036,7 +3036,7 @@ SELECT definition FROM pg_rules WHERE tablename = 'hats' ORDER BY rulename;
                                                                definition                                                                
 -----------------------------------------------------------------------------------------------------------------------------------------
  CREATE RULE hat_upsert AS                                                                                                              +
-     ON INSERT TO hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)                                                           +
+     ON INSERT TO public.hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)                                                    +
    VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name) DO UPDATE SET hat_name = hat_data.hat_name, hat_color = excluded.hat_color+
    WHERE ((excluded.hat_color <> 'forbidden'::bpchar) AND (hat_data.* <> excluded.*))                                                   +
    RETURNING hat_data.hat_name,                                                                                                         +
@@ -3084,7 +3084,7 @@ SELECT tablename, rulename, definition FROM pg_rules
  tablename |  rulename  |                                                               definition                                                                
 -----------+------------+-----------------------------------------------------------------------------------------------------------------------------------------
  hats      | hat_upsert | CREATE RULE hat_upsert AS                                                                                                              +
-           |            |     ON INSERT TO hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)                                                           +
+           |            |     ON INSERT TO public.hats DO INSTEAD  INSERT INTO hat_data (hat_name, hat_color)                                                    +
            |            |   VALUES (new.hat_name, new.hat_color) ON CONFLICT(hat_name) DO UPDATE SET hat_name = hat_data.hat_name, hat_color = excluded.hat_color+
            |            |   WHERE ((excluded.hat_color <> 'forbidden'::bpchar) AND (hat_data.* <> excluded.*))                                                   +
            |            |   RETURNING hat_data.hat_name,                                                                                                         +
@@ -3233,3 +3233,37 @@ CREATE RULE parted_table_insert AS ON INSERT to parted_table
     DO INSTEAD INSERT INTO parted_table_1 VALUES (NEW.*);
 ALTER RULE parted_table_insert ON parted_table RENAME TO parted_table_insert_redirect;
 DROP TABLE parted_table;
+--
+-- Test enabling/disabling
+--
+CREATE TABLE ruletest1 (a int);
+CREATE TABLE ruletest2 (b int);
+CREATE RULE rule1 AS ON INSERT TO ruletest1
+    DO INSTEAD INSERT INTO ruletest2 VALUES (NEW.*);
+INSERT INTO ruletest1 VALUES (1);
+ALTER TABLE ruletest1 DISABLE RULE rule1;
+INSERT INTO ruletest1 VALUES (2);
+ALTER TABLE ruletest1 ENABLE RULE rule1;
+SET session_replication_role = replica;
+INSERT INTO ruletest1 VALUES (3);
+ALTER TABLE ruletest1 ENABLE REPLICA RULE rule1;
+INSERT INTO ruletest1 VALUES (4);
+RESET session_replication_role;
+INSERT INTO ruletest1 VALUES (5);
+SELECT * FROM ruletest1;
+ a 
+---
+ 2
+ 3
+ 5
+(3 rows)
+
+SELECT * FROM ruletest2;
+ b 
+---
+ 1
+ 4
+(2 rows)
+
+DROP TABLE ruletest1;
+DROP TABLE ruletest2;
diff --git a/src/test/regress/expected/sanity_check.out b/src/test/regress/expected/sanity_check.out
index 6750152e0f..ac0fb539e9 100644
--- a/src/test/regress/expected/sanity_check.out
+++ b/src/test/regress/expected/sanity_check.out
@@ -77,6 +77,10 @@ mlparted12|f
 mlparted2|f
 mlparted3|f
 mlparted4|f
+mlparted_def|f
+mlparted_def1|f
+mlparted_def2|f
+mlparted_defd|f
 money_data|f
 num_data|f
 num_exp_add|t
@@ -162,6 +166,9 @@ point_tbl|t
 polygon_tbl|t
 quad_box_tbl|t
 quad_point_tbl|t
+quad_poly_tbl|t
+quad_poly_tbl_ord_seq1|f
+quad_poly_tbl_ord_seq2|f
 radix_text_tbl|t
 ramp|f
 real_city|f
diff --git a/src/test/regress/expected/select_into.out b/src/test/regress/expected/select_into.out
index 5d54bbf3b0..ef7cfd6f29 100644
--- a/src/test/regress/expected/select_into.out
+++ b/src/test/regress/expected/select_into.out
@@ -22,15 +22,15 @@ GRANT ALL ON SCHEMA selinto_schema TO public;
 SET SESSION AUTHORIZATION regress_selinto_user;
 SELECT * INTO TABLE selinto_schema.tmp1
 	  FROM pg_class WHERE relname like '%a%';	-- Error
-ERROR:  permission denied for relation tmp1
+ERROR:  permission denied for table tmp1
 SELECT oid AS clsoid, relname, relnatts + 10 AS x
 	  INTO selinto_schema.tmp2
 	  FROM pg_class WHERE relname like '%b%';	-- Error
-ERROR:  permission denied for relation tmp2
+ERROR:  permission denied for table tmp2
 CREATE TABLE selinto_schema.tmp3 (a,b,c)
 	   AS SELECT oid,relname,relacl FROM pg_class
 	   WHERE relname like '%c%';	-- Error
-ERROR:  permission denied for relation tmp3
+ERROR:  permission denied for table tmp3
 RESET SESSION AUTHORIZATION;
 ALTER DEFAULT PRIVILEGES FOR ROLE regress_selinto_user
 	  GRANT INSERT ON TABLES TO regress_selinto_user;
diff --git a/src/test/regress/expected/select_parallel.out b/src/test/regress/expected/select_parallel.out
index 0efb211c97..0a78261638 100644
--- a/src/test/regress/expected/select_parallel.out
+++ b/src/test/regress/expected/select_parallel.out
@@ -11,8 +11,94 @@ set parallel_setup_cost=0;
 set parallel_tuple_cost=0;
 set min_parallel_table_scan_size=0;
 set max_parallel_workers_per_gather=4;
+-- Parallel Append with partial-subplans
 explain (costs off)
-  select count(*) from a_star;
+  select round(avg(aa)), sum(aa) from a_star;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 3
+         ->  Partial Aggregate
+               ->  Parallel Append
+                     ->  Parallel Seq Scan on d_star
+                     ->  Parallel Seq Scan on f_star
+                     ->  Parallel Seq Scan on e_star
+                     ->  Parallel Seq Scan on b_star
+                     ->  Parallel Seq Scan on c_star
+                     ->  Parallel Seq Scan on a_star
+(11 rows)
+
+select round(avg(aa)), sum(aa) from a_star a1;
+ round | sum 
+-------+-----
+    14 | 355
+(1 row)
+
+-- Parallel Append with both partial and non-partial subplans
+alter table c_star set (parallel_workers = 0);
+alter table d_star set (parallel_workers = 0);
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 3
+         ->  Partial Aggregate
+               ->  Parallel Append
+                     ->  Seq Scan on d_star
+                     ->  Seq Scan on c_star
+                     ->  Parallel Seq Scan on f_star
+                     ->  Parallel Seq Scan on e_star
+                     ->  Parallel Seq Scan on b_star
+                     ->  Parallel Seq Scan on a_star
+(11 rows)
+
+select round(avg(aa)), sum(aa) from a_star a2;
+ round | sum 
+-------+-----
+    14 | 355
+(1 row)
+
+-- Parallel Append with only non-partial subplans
+alter table a_star set (parallel_workers = 0);
+alter table b_star set (parallel_workers = 0);
+alter table e_star set (parallel_workers = 0);
+alter table f_star set (parallel_workers = 0);
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
+                 QUERY PLAN                 
+--------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 3
+         ->  Partial Aggregate
+               ->  Parallel Append
+                     ->  Seq Scan on d_star
+                     ->  Seq Scan on f_star
+                     ->  Seq Scan on e_star
+                     ->  Seq Scan on b_star
+                     ->  Seq Scan on c_star
+                     ->  Seq Scan on a_star
+(11 rows)
+
+select round(avg(aa)), sum(aa) from a_star a3;
+ round | sum 
+-------+-----
+    14 | 355
+(1 row)
+
+-- Disable Parallel Append
+alter table a_star reset (parallel_workers);
+alter table b_star reset (parallel_workers);
+alter table c_star reset (parallel_workers);
+alter table d_star reset (parallel_workers);
+alter table e_star reset (parallel_workers);
+alter table f_star reset (parallel_workers);
+set enable_parallel_append to off;
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
                      QUERY PLAN                      
 -----------------------------------------------------
  Finalize Aggregate
@@ -28,12 +114,67 @@ explain (costs off)
                      ->  Parallel Seq Scan on f_star
 (11 rows)
 
-select count(*) from a_star;
+select round(avg(aa)), sum(aa) from a_star a4;
+ round | sum 
+-------+-----
+    14 | 355
+(1 row)
+
+reset enable_parallel_append;
+-- Parallel Append that runs serially
+create or replace function foobar() returns setof text as
+$$ select 'foo'::varchar union all select 'bar'::varchar $$
+language sql stable;
+select foobar() order by 1;
+ foobar 
+--------
+ bar
+ foo
+(2 rows)
+
+-- test with leader participation disabled
+set parallel_leader_participation = off;
+explain (costs off)
+  select count(*) from tenk1 where stringu1 = 'GRAAAA';
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial Aggregate
+               ->  Parallel Seq Scan on tenk1
+                     Filter: (stringu1 = 'GRAAAA'::name)
+(6 rows)
+
+select count(*) from tenk1 where stringu1 = 'GRAAAA';
+ count 
+-------
+    15
+(1 row)
+
+-- test with leader participation disabled, but no workers available (so
+-- the leader will have to run the plan despite the setting)
+set max_parallel_workers = 0;
+explain (costs off)
+  select count(*) from tenk1 where stringu1 = 'GRAAAA';
+                       QUERY PLAN                        
+---------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial Aggregate
+               ->  Parallel Seq Scan on tenk1
+                     Filter: (stringu1 = 'GRAAAA'::name)
+(6 rows)
+
+select count(*) from tenk1 where stringu1 = 'GRAAAA';
  count 
 -------
-    50
+    15
 (1 row)
 
+reset max_parallel_workers;
+reset parallel_leader_participation;
 -- test that parallel_restricted function doesn't run in worker
 alter table tenk1 set (parallel_workers = 4);
 explain (verbose, costs off)
@@ -101,6 +242,26 @@ explain (costs off)
          ->  Parallel Index Only Scan using tenk1_unique1 on tenk1
 (5 rows)
 
+-- test prepared statement
+prepare tenk1_count(integer) As select  count((unique1)) from tenk1 where hundred > $1;
+explain (costs off) execute tenk1_count(1);
+                  QUERY PLAN                  
+----------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial Aggregate
+               ->  Parallel Seq Scan on tenk1
+                     Filter: (hundred > 1)
+(6 rows)
+
+execute tenk1_count(1);
+ count 
+-------
+  9800
+(1 row)
+
+deallocate tenk1_count;
 -- test parallel plans for queries containing un-correlated subplans.
 alter table tenk2 set (parallel_workers = 0);
 explain (costs off)
@@ -138,6 +299,41 @@ explain (costs off)
      ->  Seq Scan on tenk2
 (4 rows)
 
+alter table tenk2 reset (parallel_workers);
+-- test parallel plan for a query containing initplan.
+set enable_indexscan = off;
+set enable_indexonlyscan = off;
+set enable_bitmapscan = off;
+alter table tenk2 set (parallel_workers = 2);
+explain (costs off)
+	select count(*) from tenk1
+        where tenk1.unique1 = (Select max(tenk2.unique1) from tenk2);
+                      QUERY PLAN                      
+------------------------------------------------------
+ Aggregate
+   InitPlan 1 (returns $2)
+     ->  Finalize Aggregate
+           ->  Gather
+                 Workers Planned: 2
+                 ->  Partial Aggregate
+                       ->  Parallel Seq Scan on tenk2
+   ->  Gather
+         Workers Planned: 4
+         Params Evaluated: $2
+         ->  Parallel Seq Scan on tenk1
+               Filter: (unique1 = $2)
+(12 rows)
+
+select count(*) from tenk1
+    where tenk1.unique1 = (Select max(tenk2.unique1) from tenk2);
+ count 
+-------
+     1
+(1 row)
+
+reset enable_indexscan;
+reset enable_indexonlyscan;
+reset enable_bitmapscan;
 alter table tenk2 reset (parallel_workers);
 -- test parallel index scans.
 set enable_seqscan to off;
@@ -179,6 +375,61 @@ select  count(*) from tenk1 where thousand > 95;
   9040
 (1 row)
 
+-- test rescan cases too
+set enable_material = false;
+explain (costs off)
+select * from
+  (select count(unique1) from tenk1 where hundred > 10) ss
+  right join (values (1),(2),(3)) v(x) on true;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Nested Loop Left Join
+   ->  Values Scan on "*VALUES*"
+   ->  Finalize Aggregate
+         ->  Gather
+               Workers Planned: 4
+               ->  Partial Aggregate
+                     ->  Parallel Index Scan using tenk1_hundred on tenk1
+                           Index Cond: (hundred > 10)
+(8 rows)
+
+select * from
+  (select count(unique1) from tenk1 where hundred > 10) ss
+  right join (values (1),(2),(3)) v(x) on true;
+ count | x 
+-------+---
+  8900 | 1
+  8900 | 2
+  8900 | 3
+(3 rows)
+
+explain (costs off)
+select * from
+  (select count(*) from tenk1 where thousand > 99) ss
+  right join (values (1),(2),(3)) v(x) on true;
+                                      QUERY PLAN                                      
+--------------------------------------------------------------------------------------
+ Nested Loop Left Join
+   ->  Values Scan on "*VALUES*"
+   ->  Finalize Aggregate
+         ->  Gather
+               Workers Planned: 4
+               ->  Partial Aggregate
+                     ->  Parallel Index Only Scan using tenk1_thous_tenthous on tenk1
+                           Index Cond: (thousand > 99)
+(8 rows)
+
+select * from
+  (select count(*) from tenk1 where thousand > 99) ss
+  right join (values (1),(2),(3)) v(x) on true;
+ count | x 
+-------+---
+  9000 | 1
+  9000 | 2
+  9000 | 3
+(3 rows)
+
+reset enable_material;
 reset enable_seqscan;
 reset enable_bitmapscan;
 -- test parallel bitmap heap scan.
@@ -225,14 +476,71 @@ select count(*) from bmscantest where a>1;
  99999
 (1 row)
 
+-- test accumulation of stats for parallel nodes
 reset enable_seqscan;
+alter table tenk2 set (parallel_workers = 0);
+explain (analyze, timing off, summary off, costs off)
+   select count(*) from tenk1, tenk2 where tenk1.hundred > 1
+        and tenk2.thousand=0;
+                                QUERY PLAN                                
+--------------------------------------------------------------------------
+ Aggregate (actual rows=1 loops=1)
+   ->  Nested Loop (actual rows=98000 loops=1)
+         ->  Seq Scan on tenk2 (actual rows=10 loops=1)
+               Filter: (thousand = 0)
+               Rows Removed by Filter: 9990
+         ->  Gather (actual rows=9800 loops=10)
+               Workers Planned: 4
+               Workers Launched: 4
+               ->  Parallel Seq Scan on tenk1 (actual rows=1960 loops=50)
+                     Filter: (hundred > 1)
+                     Rows Removed by Filter: 40
+(11 rows)
+
+alter table tenk2 reset (parallel_workers);
+reset work_mem;
+create function explain_parallel_sort_stats() returns setof text
+language plpgsql as
+$$
+declare ln text;
+begin
+    for ln in
+        explain (analyze, timing off, summary off, costs off)
+          select * from
+          (select ten from tenk1 where ten < 100 order by ten) ss
+          right join (values (1),(2),(3)) v(x) on true
+    loop
+        ln := regexp_replace(ln, 'Memory: \S*',  'Memory: xxx');
+        return next ln;
+    end loop;
+end;
+$$;
+select * from explain_parallel_sort_stats();
+                       explain_parallel_sort_stats                        
+--------------------------------------------------------------------------
+ Nested Loop Left Join (actual rows=30000 loops=1)
+   ->  Values Scan on "*VALUES*" (actual rows=3 loops=1)
+   ->  Gather Merge (actual rows=10000 loops=3)
+         Workers Planned: 4
+         Workers Launched: 4
+         ->  Sort (actual rows=2000 loops=15)
+               Sort Key: tenk1.ten
+               Sort Method: quicksort  Memory: xxx
+               Worker 0:  Sort Method: quicksort  Memory: xxx
+               Worker 1:  Sort Method: quicksort  Memory: xxx
+               Worker 2:  Sort Method: quicksort  Memory: xxx
+               Worker 3:  Sort Method: quicksort  Memory: xxx
+               ->  Parallel Seq Scan on tenk1 (actual rows=2000 loops=15)
+                     Filter: (ten < 100)
+(14 rows)
+
 reset enable_indexscan;
 reset enable_hashjoin;
 reset enable_mergejoin;
 reset enable_material;
 reset effective_io_concurrency;
-reset work_mem;
 drop table bmscantest;
+drop function explain_parallel_sort_stats();
 -- test parallel merge join path.
 set enable_hashjoin to off;
 set enable_nestloop to off;
@@ -300,6 +608,158 @@ select count(*) from tenk1 group by twenty;
    500
 (20 rows)
 
+--test expressions in targetlist are pushed down for gather merge
+create or replace function simple_func(var1 integer) returns integer
+as $$
+begin
+        return var1 + 10;
+end;
+$$ language plpgsql PARALLEL SAFE;
+explain (costs off, verbose)
+    select ten, simple_func(ten) from tenk1 where ten < 100 order by ten;
+                     QUERY PLAN                      
+-----------------------------------------------------
+ Gather Merge
+   Output: ten, (simple_func(ten))
+   Workers Planned: 4
+   ->  Result
+         Output: ten, simple_func(ten)
+         ->  Sort
+               Output: ten
+               Sort Key: tenk1.ten
+               ->  Parallel Seq Scan on public.tenk1
+                     Output: ten
+                     Filter: (tenk1.ten < 100)
+(11 rows)
+
+drop function simple_func(integer);
+-- test gather merge with parallel leader participation disabled
+set parallel_leader_participation = off;
+explain (costs off)
+   select count(*) from tenk1 group by twenty;
+                     QUERY PLAN                     
+----------------------------------------------------
+ Finalize GroupAggregate
+   Group Key: twenty
+   ->  Gather Merge
+         Workers Planned: 4
+         ->  Partial GroupAggregate
+               Group Key: twenty
+               ->  Sort
+                     Sort Key: twenty
+                     ->  Parallel Seq Scan on tenk1
+(9 rows)
+
+select count(*) from tenk1 group by twenty;
+ count 
+-------
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+   500
+(20 rows)
+
+reset parallel_leader_participation;
+--test rescan behavior of gather merge
+set enable_material = false;
+explain (costs off)
+select * from
+  (select string4, count(unique2)
+   from tenk1 group by string4 order by string4) ss
+  right join (values (1),(2),(3)) v(x) on true;
+                        QUERY PLAN                        
+----------------------------------------------------------
+ Nested Loop Left Join
+   ->  Values Scan on "*VALUES*"
+   ->  Finalize GroupAggregate
+         Group Key: tenk1.string4
+         ->  Gather Merge
+               Workers Planned: 4
+               ->  Partial GroupAggregate
+                     Group Key: tenk1.string4
+                     ->  Sort
+                           Sort Key: tenk1.string4
+                           ->  Parallel Seq Scan on tenk1
+(11 rows)
+
+select * from
+  (select string4, count(unique2)
+   from tenk1 group by string4 order by string4) ss
+  right join (values (1),(2),(3)) v(x) on true;
+ string4 | count | x 
+---------+-------+---
+ AAAAxx  |  2500 | 1
+ HHHHxx  |  2500 | 1
+ OOOOxx  |  2500 | 1
+ VVVVxx  |  2500 | 1
+ AAAAxx  |  2500 | 2
+ HHHHxx  |  2500 | 2
+ OOOOxx  |  2500 | 2
+ VVVVxx  |  2500 | 2
+ AAAAxx  |  2500 | 3
+ HHHHxx  |  2500 | 3
+ OOOOxx  |  2500 | 3
+ VVVVxx  |  2500 | 3
+(12 rows)
+
+reset enable_material;
+reset enable_hashagg;
+-- check parallelized int8 aggregate (bug #14897)
+explain (costs off)
+select avg(unique1::int8) from tenk1;
+                               QUERY PLAN                                
+-------------------------------------------------------------------------
+ Finalize Aggregate
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial Aggregate
+               ->  Parallel Index Only Scan using tenk1_unique1 on tenk1
+(5 rows)
+
+select avg(unique1::int8) from tenk1;
+          avg          
+-----------------------
+ 4999.5000000000000000
+(1 row)
+
+-- gather merge test with a LIMIT
+explain (costs off)
+  select fivethous from tenk1 order by fivethous limit 4;
+                  QUERY PLAN                  
+----------------------------------------------
+ Limit
+   ->  Gather Merge
+         Workers Planned: 4
+         ->  Sort
+               Sort Key: fivethous
+               ->  Parallel Seq Scan on tenk1
+(6 rows)
+
+select fivethous from tenk1 order by fivethous limit 4;
+ fivethous 
+-----------
+         0
+         0
+         1
+         1
+(4 rows)
+
 -- gather merge test with 0 worker
 set max_parallel_workers = 0;
 explain (costs off)
@@ -324,9 +784,36 @@ select string4 from tenk1 order by string4 limit 5;
  AAAAxx
 (5 rows)
 
+-- gather merge test with 0 workers, with parallel leader
+-- participation disabled (the leader will have to run the plan
+-- despite the setting)
+set parallel_leader_participation = off;
+explain (costs off)
+   select string4 from tenk1 order by string4 limit 5;
+                  QUERY PLAN                  
+----------------------------------------------
+ Limit
+   ->  Gather Merge
+         Workers Planned: 4
+         ->  Sort
+               Sort Key: string4
+               ->  Parallel Seq Scan on tenk1
+(6 rows)
+
+select string4 from tenk1 order by string4 limit 5;
+ string4 
+---------
+ AAAAxx
+ AAAAxx
+ AAAAxx
+ AAAAxx
+ AAAAxx
+(5 rows)
+
+reset parallel_leader_participation;
 reset max_parallel_workers;
-reset enable_hashagg;
-set force_parallel_mode=1;
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 explain (costs off)
   select stringu1::int2 from tenk1 where unique1 = 1;
                   QUERY PLAN                   
@@ -338,7 +825,54 @@ explain (costs off)
          Index Cond: (unique1 = 1)
 (5 rows)
 
+ROLLBACK TO SAVEPOINT settings;
+-- exercise record typmod remapping between backends
+CREATE OR REPLACE FUNCTION make_record(n int)
+  RETURNS RECORD LANGUAGE plpgsql PARALLEL SAFE AS
+$$
+BEGIN
+  RETURN CASE n
+           WHEN 1 THEN ROW(1)
+           WHEN 2 THEN ROW(1, 2)
+           WHEN 3 THEN ROW(1, 2, 3)
+           WHEN 4 THEN ROW(1, 2, 3, 4)
+           ELSE ROW(1, 2, 3, 4, 5)
+         END;
+END;
+$$;
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
+SELECT make_record(x) FROM (SELECT generate_series(1, 5) x) ss ORDER BY x;
+ make_record 
+-------------
+ (1)
+ (1,2)
+ (1,2,3)
+ (1,2,3,4)
+ (1,2,3,4,5)
+(5 rows)
+
+ROLLBACK TO SAVEPOINT settings;
+DROP function make_record(n int);
+-- test the sanity of parallel query after the active role is dropped.
+drop role if exists regress_parallel_worker;
+NOTICE:  role "regress_parallel_worker" does not exist, skipping
+create role regress_parallel_worker;
+set role regress_parallel_worker;
+reset session authorization;
+drop role regress_parallel_worker;
+set force_parallel_mode = 1;
+select count(*) from tenk1;
+ count 
+-------
+ 10000
+(1 row)
+
+reset force_parallel_mode;
+reset role;
 -- to increase the parallel query test coverage
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 EXPLAIN (analyze, timing off, summary off, costs off) SELECT * FROM tenk1;
                          QUERY PLAN                          
 -------------------------------------------------------------
@@ -348,8 +882,12 @@ EXPLAIN (analyze, timing off, summary off, costs off) SELECT * FROM tenk1;
    ->  Parallel Seq Scan on tenk1 (actual rows=2000 loops=5)
 (4 rows)
 
+ROLLBACK TO SAVEPOINT settings;
 -- provoke error in worker
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 select stringu1::int2 from tenk1 where unique1 = 1;
 ERROR:  invalid input syntax for integer: "BAAAAA"
 CONTEXT:  parallel worker
+ROLLBACK TO SAVEPOINT settings;
 rollback;
diff --git a/src/test/regress/expected/sequence.out b/src/test/regress/expected/sequence.out
index a43b52cfc1..ca5ea063fa 100644
--- a/src/test/regress/expected/sequence.out
+++ b/src/test/regress/expected/sequence.out
@@ -79,6 +79,12 @@ SELECT * FROM serialTest1;
  force | 100
 (3 rows)
 
+SELECT pg_get_serial_sequence('serialTest1', 'f2');
+  pg_get_serial_sequence   
+---------------------------
+ public.serialtest1_f2_seq
+(1 row)
+
 -- test smallserial / bigserial
 CREATE TABLE serialTest2 (f1 text, f2 serial, f3 smallserial, f4 serial2,
   f5 bigserial, f6 serial8);
@@ -529,6 +535,19 @@ SELECT * FROM pg_sequence_parameters('sequence_test4'::regclass);
           -1 | -9223372036854775808 |            -1 |        -1 | f            |          1 |        20
 (1 row)
 
+\d sequence_test4
+                       Sequence "public.sequence_test4"
+  Type  | Start |       Minimum        | Maximum | Increment | Cycles? | Cache 
+--------+-------+----------------------+---------+-----------+---------+-------
+ bigint |    -1 | -9223372036854775808 |      -1 |        -1 | no      |     1
+
+\d serialtest2_f2_seq
+                 Sequence "public.serialtest2_f2_seq"
+  Type   | Start | Minimum |  Maximum   | Increment | Cycles? | Cache 
+---------+-------+---------+------------+-----------+---------+-------
+ integer |     1 |       1 | 2147483647 |         1 | no      |     1
+Owned by: public.serialtest2.f2
+
 -- Test comments
 COMMENT ON SEQUENCE asdf IS 'won''t work';
 ERROR:  relation "asdf" does not exist
@@ -766,7 +785,7 @@ ROLLBACK;
 BEGIN;
 SET LOCAL SESSION AUTHORIZATION regress_seq_user;
 ALTER SEQUENCE sequence_test2 START WITH 1;
-ERROR:  must be owner of relation sequence_test2
+ERROR:  must be owner of sequence sequence_test2
 ROLLBACK;
 -- Sequences should get wiped out as well:
 DROP TABLE serialTest1, serialTest2;
diff --git a/src/test/regress/expected/spgist.out b/src/test/regress/expected/spgist.out
index 0691e910c4..2d75bbf8dc 100644
--- a/src/test/regress/expected/spgist.out
+++ b/src/test/regress/expected/spgist.out
@@ -4,7 +4,7 @@
 -- There are other tests to test different SP-GiST opclasses. This is for
 -- testing SP-GiST code itself.
 create table spgist_point_tbl(id int4, p point);
-create index spgist_point_idx on spgist_point_tbl using spgist(p);
+create index spgist_point_idx on spgist_point_tbl using spgist(p) with (fillfactor = 75);
 -- Test vacuum-root operation. It gets invoked when the root is also a leaf,
 -- i.e. the index is very small.
 insert into spgist_point_tbl (id, p)
@@ -37,3 +37,13 @@ select g, 'baaaaaaaaaaaaaar' || g from generate_series(1, 1000) g;
 -- tuple to be moved to another page.
 insert into spgist_text_tbl (id, t)
 select -g, 'f' || repeat('o', 100-g) || 'surprise' from generate_series(1, 100) g;
+-- Test out-of-range fillfactor values
+create index spgist_point_idx2 on spgist_point_tbl using spgist(p) with (fillfactor = 9);
+ERROR:  value 9 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+create index spgist_point_idx2 on spgist_point_tbl using spgist(p) with (fillfactor = 101);
+ERROR:  value 101 out of bounds for option "fillfactor"
+DETAIL:  Valid values are between "10" and "100".
+-- Modify fillfactor in existing index
+alter index spgist_point_idx set (fillfactor = 90);
+reindex index spgist_point_idx;
diff --git a/src/test/regress/expected/stats.out b/src/test/regress/expected/stats.out
index fc91f3ce36..991c287b11 100644
--- a/src/test/regress/expected/stats.out
+++ b/src/test/regress/expected/stats.out
@@ -136,12 +136,15 @@ SELECT count(*) FROM tenk2;
 (1 row)
 
 -- do an indexscan
+-- make sure it is not a bitmap scan, which might skip fetching heap tuples
+SET enable_bitmapscan TO off;
 SELECT count(*) FROM tenk2 WHERE unique1 = 1;
  count 
 -------
      1
 (1 row)
 
+RESET enable_bitmapscan;
 -- We can't just call wait_for_stats() at this point, because we only
 -- transmit stats when the session goes idle, and we probably didn't
 -- transmit the last couple of counts yet thanks to the rate-limiting logic
diff --git a/src/test/regress/expected/stats_ext.out b/src/test/regress/expected/stats_ext.out
index 441cfaa411..054a381dad 100644
--- a/src/test/regress/expected/stats_ext.out
+++ b/src/test/regress/expected/stats_ext.out
@@ -21,7 +21,7 @@ LINE 1: CREATE STATISTICS tst FROM sometab;
 CREATE STATISTICS tst ON a, b FROM nonexistant;
 ERROR:  relation "nonexistant" does not exist
 CREATE STATISTICS tst ON a, b FROM pg_class;
-ERROR:  column "a" referenced in statistics does not exist
+ERROR:  column "a" does not exist
 CREATE STATISTICS tst ON relname, relname, relnatts FROM pg_class;
 ERROR:  duplicate column name in statistics definition
 CREATE STATISTICS tst ON relnatts + relpages FROM pg_class;
@@ -29,7 +29,7 @@ ERROR:  only simple column references are allowed in CREATE STATISTICS
 CREATE STATISTICS tst ON (relpages, reltuples) FROM pg_class;
 ERROR:  only simple column references are allowed in CREATE STATISTICS
 CREATE STATISTICS tst (unrecognized) ON relname, relnatts FROM pg_class;
-ERROR:  unrecognized statistic type "unrecognized"
+ERROR:  unrecognized statistics kind "unrecognized"
 -- Ensure stats are dropped sanely, and test IF NOT EXISTS while at it
 CREATE TABLE ab1 (a INTEGER, b INTEGER, c INTEGER);
 CREATE STATISTICS IF NOT EXISTS ab1_a_b_stats ON a, b FROM ab1;
diff --git a/src/test/regress/expected/strings.out b/src/test/regress/expected/strings.out
index 35cadb24aa..cbe66c375c 100644
--- a/src/test/regress/expected/strings.out
+++ b/src/test/regress/expected/strings.out
@@ -1166,6 +1166,31 @@ SELECT substr(f1, 99995, 10) from toasttest;
  567890
 (4 rows)
 
+TRUNCATE TABLE toasttest;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect >0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
+ blocks 
+--------
+ f
+(1 row)
+
+TRUNCATE TABLE toasttest;
+ALTER TABLE toasttest set (toast_tuple_target = 4080);
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect 0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
+ blocks 
+--------
+ t
+(1 row)
+
 DROP TABLE toasttest;
 --
 -- test substr with toasted bytea values
@@ -1414,6 +1439,58 @@ select md5('12345678901234567890123456789012345678901234567890123456789012345678
  t
 (1 row)
 
+--
+-- SHA-2
+--
+SET bytea_output TO hex;
+SELECT sha224('');
+                           sha224                           
+------------------------------------------------------------
+ \xd14a028c2a3a2bc9476102bb288234c415a2b01f828ea62ac5b3e42f
+(1 row)
+
+SELECT sha224('The quick brown fox jumps over the lazy dog.');
+                           sha224                           
+------------------------------------------------------------
+ \x619cba8e8e05826e9b8c519c0a5c68f4fb653e8a3d8aa04bb2c8cd4c
+(1 row)
+
+SELECT sha256('');
+                               sha256                               
+--------------------------------------------------------------------
+ \xe3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855
+(1 row)
+
+SELECT sha256('The quick brown fox jumps over the lazy dog.');
+                               sha256                               
+--------------------------------------------------------------------
+ \xef537f25c895bfa782526529a9b63d97aa631564d5d789c2b765448c8635fb6c
+(1 row)
+
+SELECT sha384('');
+                                               sha384                                               
+----------------------------------------------------------------------------------------------------
+ \x38b060a751ac96384cd9327eb1b1e36a21fdb71114be07434c0cc7bf63f6e1da274edebfe76f65fbd51ad2f14898b95b
+(1 row)
+
+SELECT sha384('The quick brown fox jumps over the lazy dog.');
+                                               sha384                                               
+----------------------------------------------------------------------------------------------------
+ \xed892481d8272ca6df370bf706e4d7bc1b5739fa2177aae6c50e946678718fc67a7af2819a021c2fc34e91bdb63409d7
+(1 row)
+
+SELECT sha512('');
+                                                               sha512                                                               
+------------------------------------------------------------------------------------------------------------------------------------
+ \xcf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e
+(1 row)
+
+SELECT sha512('The quick brown fox jumps over the lazy dog.');
+                                                               sha512                                                               
+------------------------------------------------------------------------------------------------------------------------------------
+ \x91ea1245f20d46ae9a037a989f54f1f790f0a47607eeb8a14d12890cea77a1bbc6c7ed9cf205e67b7f2b8fd4c7dfd3a7a8617e45f3c463d481c7e586c39ac1ed
+(1 row)
+
 --
 -- test behavior of escape_string_warning and standard_conforming_strings options
 --
@@ -1500,6 +1577,7 @@ select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\'   as f4, '
 --
 -- Additional string functions
 --
+SET bytea_output TO escape;
 SELECT initcap('hi THOMAS');
   initcap  
 -----------
diff --git a/src/test/regress/expected/subselect.out b/src/test/regress/expected/subselect.out
index ed7d6d8034..3b2bf3273e 100644
--- a/src/test/regress/expected/subselect.out
+++ b/src/test/regress/expected/subselect.out
@@ -235,7 +235,7 @@ SELECT *, pg_typeof(f1) FROM
 explain verbose select '42' union all select '43';
                    QUERY PLAN                    
 -------------------------------------------------
- Append  (cost=0.00..0.04 rows=2 width=32)
+ Append  (cost=0.00..0.05 rows=2 width=32)
    ->  Result  (cost=0.00..0.01 rows=1 width=32)
          Output: '42'::text
    ->  Result  (cost=0.00..0.01 rows=1 width=32)
@@ -245,7 +245,7 @@ explain verbose select '42' union all select '43';
 explain verbose select '42' union all select 43;
                    QUERY PLAN                   
 ------------------------------------------------
- Append  (cost=0.00..0.04 rows=2 width=4)
+ Append  (cost=0.00..0.05 rows=2 width=4)
    ->  Result  (cost=0.00..0.01 rows=1 width=4)
          Output: 42
    ->  Result  (cost=0.00..0.01 rows=1 width=4)
@@ -678,6 +678,20 @@ with q as (select max(f1) from int4_tbl group by f1 order by f1)
  (2147483647)
 (5 rows)
 
+--
+-- Test case for sublinks pulled up into joinaliasvars lists in an
+-- inherited update/delete query
+--
+begin;  --  this shouldn't delete anything, but be safe
+delete from road
+where exists (
+  select 1
+  from
+    int4_tbl cross join
+    ( select f1, array(select q1 from int8_tbl) as arr
+      from text_tbl ) ss
+  where road.name = ss.f1 );
+rollback;
 --
 -- Test case for sublinks pushed down into subselects via join alias expansion
 --
@@ -826,6 +840,36 @@ select exists(select * from nocolumns);
  f
 (1 row)
 
+--
+-- Check behavior with a SubPlan in VALUES (bug #14924)
+--
+select val.x
+  from generate_series(1,10) as s(i),
+  lateral (
+    values ((select s.i + 1)), (s.i + 101)
+  ) as val(x)
+where s.i < 10 and (select val.x) < 110;
+  x  
+-----
+   2
+ 102
+   3
+ 103
+   4
+ 104
+   5
+ 105
+   6
+ 106
+   7
+ 107
+   8
+ 108
+   9
+ 109
+  10
+(17 rows)
+
 --
 -- Check sane behavior with nested IN SubLinks
 --
@@ -1041,3 +1085,55 @@ NOTICE:  x = 9, y = 13
 (3 rows)
 
 drop function tattle(x int, y int);
+--
+-- Test that LIMIT can be pushed to SORT through a subquery that just projects
+-- columns.  We check for that having happened by looking to see if EXPLAIN
+-- ANALYZE shows that a top-N sort was used.  We must suppress or filter away
+-- all the non-invariant parts of the EXPLAIN ANALYZE output.
+--
+create table sq_limit (pk int primary key, c1 int, c2 int);
+insert into sq_limit values
+    (1, 1, 1),
+    (2, 2, 2),
+    (3, 3, 3),
+    (4, 4, 4),
+    (5, 1, 1),
+    (6, 2, 2),
+    (7, 3, 3),
+    (8, 4, 4);
+create function explain_sq_limit() returns setof text language plpgsql as
+$$
+declare ln text;
+begin
+    for ln in
+        explain (analyze, summary off, timing off, costs off)
+        select * from (select pk,c2 from sq_limit order by c1,pk) as x limit 3
+    loop
+        ln := regexp_replace(ln, 'Memory: \S*',  'Memory: xxx');
+        -- this case might occur if force_parallel_mode is on:
+        ln := regexp_replace(ln, 'Worker 0:  Sort Method',  'Sort Method');
+        return next ln;
+    end loop;
+end;
+$$;
+select * from explain_sq_limit();
+                        explain_sq_limit                        
+----------------------------------------------------------------
+ Limit (actual rows=3 loops=1)
+   ->  Subquery Scan on x (actual rows=3 loops=1)
+         ->  Sort (actual rows=3 loops=1)
+               Sort Key: sq_limit.c1, sq_limit.pk
+               Sort Method: top-N heapsort  Memory: xxx
+               ->  Seq Scan on sq_limit (actual rows=8 loops=1)
+(6 rows)
+
+select * from (select pk,c2 from sq_limit order by c1,pk) as x limit 3;
+ pk | c2 
+----+----
+  1 |  1
+  5 |  1
+  2 |  2
+(3 rows)
+
+drop function explain_sq_limit();
+drop table sq_limit;
diff --git a/src/test/regress/expected/sysviews.out b/src/test/regress/expected/sysviews.out
index 568b783f5e..759f7d9d59 100644
--- a/src/test/regress/expected/sysviews.out
+++ b/src/test/regress/expected/sysviews.out
@@ -70,21 +70,24 @@ select count(*) >= 0 as ok from pg_prepared_xacts;
 -- This is to record the prevailing planner enable_foo settings during
 -- a regression test run.
 select name, setting from pg_settings where name like 'enable%';
-         name         | setting 
-----------------------+---------
- enable_bitmapscan    | on
- enable_gathermerge   | on
- enable_hashagg       | on
- enable_hashjoin      | on
- enable_indexonlyscan | on
- enable_indexscan     | on
- enable_material      | on
- enable_mergejoin     | on
- enable_nestloop      | on
- enable_seqscan       | on
- enable_sort          | on
- enable_tidscan       | on
-(12 rows)
+           name            | setting 
+---------------------------+---------
+ enable_bitmapscan         | on
+ enable_gathermerge        | on
+ enable_hashagg            | on
+ enable_hashjoin           | on
+ enable_indexonlyscan      | on
+ enable_indexscan          | on
+ enable_material           | on
+ enable_mergejoin          | on
+ enable_nestloop           | on
+ enable_parallel_append    | on
+ enable_parallel_hash      | on
+ enable_partitionwise_join | off
+ enable_seqscan            | on
+ enable_sort               | on
+ enable_tidscan            | on
+(15 rows)
 
 -- Test that the pg_timezone_names and pg_timezone_abbrevs views are
 -- more-or-less working.  We can't test their contents in any great detail
diff --git a/src/test/regress/expected/text.out b/src/test/regress/expected/text.out
index 829f2c224c..d28961cf88 100644
--- a/src/test/regress/expected/text.out
+++ b/src/test/regress/expected/text.out
@@ -50,7 +50,7 @@ select 3 || 4.0;
 ERROR:  operator does not exist: integer || numeric
 LINE 1: select 3 || 4.0;
                  ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 /*
  * various string functions
  */
diff --git a/src/test/regress/expected/timestamptz.out b/src/test/regress/expected/timestamptz.out
index 7226670962..a901fd909d 100644
--- a/src/test/regress/expected/timestamptz.out
+++ b/src/test/regress/expected/timestamptz.out
@@ -1699,54 +1699,68 @@ SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
             | 2001 1 1 1 1 1 1
 (66 rows)
 
--- Check OF with various zone offsets, particularly fractional hours
+-- Check OF, TZH, TZM with various zone offsets, particularly fractional hours
 SET timezone = '00:00';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- +00
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+ OF  | TZH:TZM 
+-----+---------
+ +00 | +00:00
 (1 row)
 
 SET timezone = '+02:00';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- -02
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+ OF  | TZH:TZM 
+-----+---------
+ -02 | -02:00
 (1 row)
 
 SET timezone = '-13:00';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- +13
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+ OF  | TZH:TZM 
+-----+---------
+ +13 | +13:00
 (1 row)
 
 SET timezone = '-00:30';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- +00:30
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ +00:30 | +00:30
 (1 row)
 
 SET timezone = '00:30';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- -00:30
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ -00:30 | -00:30
 (1 row)
 
 SET timezone = '-04:30';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- +04:30
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ +04:30 | +04:30
 (1 row)
 
 SET timezone = '04:30';
-SELECT to_char(now(), 'OF');
- to_char 
----------
- -04:30
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ -04:30 | -04:30
+(1 row)
+
+SET timezone = '-04:15';
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ +04:15 | +04:15
+(1 row)
+
+SET timezone = '04:15';
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+   OF   | TZH:TZM 
+--------+---------
+ -04:15 | -04:15
 (1 row)
 
 RESET timezone;
diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out
index 43911312f9..33ff8e18c9 100644
--- a/src/test/regress/expected/timetz.out
+++ b/src/test/regress/expected/timetz.out
@@ -92,4 +92,4 @@ SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TIMETZ_TBL;
 ERROR:  operator does not exist: time with time zone + time with time zone
 LINE 1: SELECT f1 + time with time zone '00:01' AS "Illegal" FROM TI...
                   ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
diff --git a/src/test/regress/expected/transactions.out b/src/test/regress/expected/transactions.out
index d9b702d016..a7fdcf45fd 100644
--- a/src/test/regress/expected/transactions.out
+++ b/src/test/regress/expected/transactions.out
@@ -659,6 +659,90 @@ ERROR:  portal "ctt" cannot be run
 COMMIT;
 DROP FUNCTION create_temp_tab();
 DROP FUNCTION invert(x float8);
+-- Test assorted behaviors around the implicit transaction block created
+-- when multiple SQL commands are sent in a single Query message.  These
+-- tests rely on the fact that psql will not break SQL commands apart at a
+-- backslash-quoted semicolon, but will send them as one Query.
+create temp table i_table (f1 int);
+-- psql will show only the last result in a multi-statement Query
+SELECT 1\; SELECT 2\; SELECT 3;
+ ?column? 
+----------
+        3
+(1 row)
+
+-- this implicitly commits:
+insert into i_table values(1)\; select * from i_table;
+ f1 
+----
+  1
+(1 row)
+
+-- 1/0 error will cause rolling back the whole implicit transaction
+insert into i_table values(2)\; select * from i_table\; select 1/0;
+ERROR:  division by zero
+select * from i_table;
+ f1 
+----
+  1
+(1 row)
+
+rollback;  -- we are not in a transaction at this point
+WARNING:  there is no transaction in progress
+-- can use regular begin/commit/rollback within a single Query
+begin\; insert into i_table values(3)\; commit;
+rollback;  -- we are not in a transaction at this point
+WARNING:  there is no transaction in progress
+begin\; insert into i_table values(4)\; rollback;
+rollback;  -- we are not in a transaction at this point
+WARNING:  there is no transaction in progress
+-- begin converts implicit transaction into a regular one that
+-- can extend past the end of the Query
+select 1\; begin\; insert into i_table values(5);
+commit;
+select 1\; begin\; insert into i_table values(6);
+rollback;
+-- commit in implicit-transaction state commits but issues a warning.
+insert into i_table values(7)\; commit\; insert into i_table values(8)\; select 1/0;
+WARNING:  there is no transaction in progress
+ERROR:  division by zero
+-- similarly, rollback aborts but issues a warning.
+insert into i_table values(9)\; rollback\; select 2;
+WARNING:  there is no transaction in progress
+ ?column? 
+----------
+        2
+(1 row)
+
+select * from i_table;
+ f1 
+----
+  1
+  3
+  5
+  7
+(4 rows)
+
+rollback;  -- we are not in a transaction at this point
+WARNING:  there is no transaction in progress
+-- implicit transaction block is still a transaction block, for e.g. VACUUM
+SELECT 1\; VACUUM;
+ERROR:  VACUUM cannot run inside a transaction block
+SELECT 1\; COMMIT\; VACUUM;
+WARNING:  there is no transaction in progress
+ERROR:  VACUUM cannot run inside a transaction block
+-- we disallow savepoint-related commands in implicit-transaction state
+SELECT 1\; SAVEPOINT sp;
+ERROR:  SAVEPOINT can only be used in transaction blocks
+SELECT 1\; COMMIT\; SAVEPOINT sp;
+WARNING:  there is no transaction in progress
+ERROR:  SAVEPOINT can only be used in transaction blocks
+ROLLBACK TO SAVEPOINT sp\; SELECT 2;
+ERROR:  ROLLBACK TO SAVEPOINT can only be used in transaction blocks
+SELECT 2\; RELEASE SAVEPOINT sp\; SELECT 3;
+ERROR:  RELEASE SAVEPOINT can only be used in transaction blocks
+-- but this is OK, because the BEGIN converts it to a regular xact
+SELECT 1\; BEGIN\; SAVEPOINT sp\; ROLLBACK TO SAVEPOINT sp\; COMMIT;
 -- Test for successful cleanup of an aborted transaction at session exit.
 -- THIS MUST BE THE LAST TEST IN THIS FILE.
 begin;
diff --git a/src/test/regress/expected/triggers.out b/src/test/regress/expected/triggers.out
index ac132b042d..99be9ac6e9 100644
--- a/src/test/regress/expected/triggers.out
+++ b/src/test/regress/expected/triggers.out
@@ -96,43 +96,55 @@ CONTEXT:  SQL statement "delete from fkeys2 where fkey21 = $1 and fkey22 = $2 "
 update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';
 NOTICE:  check_pkeys_fkey_cascade: 1 tuple(s) of fkeys are deleted
 NOTICE:  check_pkeys_fkey_cascade: 1 tuple(s) of fkeys2 are deleted
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table in ('pkeys', 'fkeys', 'fkeys2')
+  ORDER BY trigger_name COLLATE "C", 2;
+        trigger_name        | event_manipulation | event_object_schema | event_object_table | action_order | action_condition | action_orientation | action_timing | action_reference_old_table | action_reference_new_table 
+----------------------------+--------------------+---------------------+--------------------+--------------+------------------+--------------------+---------------+----------------------------+----------------------------
+ check_fkeys2_fkey_restrict | DELETE             | public              | fkeys2             |            1 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys2_fkey_restrict | UPDATE             | public              | fkeys2             |            1 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys2_pkey_exist    | INSERT             | public              | fkeys2             |            1 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys2_pkey_exist    | UPDATE             | public              | fkeys2             |            2 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys_pkey2_exist    | INSERT             | public              | fkeys              |            1 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys_pkey2_exist    | UPDATE             | public              | fkeys              |            1 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys_pkey_exist     | INSERT             | public              | fkeys              |            2 |                  | ROW                | BEFORE        |                            | 
+ check_fkeys_pkey_exist     | UPDATE             | public              | fkeys              |            2 |                  | ROW                | BEFORE        |                            | 
+ check_pkeys_fkey_cascade   | DELETE             | public              | pkeys              |            1 |                  | ROW                | BEFORE        |                            | 
+ check_pkeys_fkey_cascade   | UPDATE             | public              | pkeys              |            1 |                  | ROW                | BEFORE        |                            | 
+(10 rows)
+
 DROP TABLE pkeys;
 DROP TABLE fkeys;
 DROP TABLE fkeys2;
--- -- I've disabled the funny_dup17 test because the new semantics
--- -- of AFTER ROW triggers, which get now fired at the end of a
--- -- query always, cause funny_dup17 to enter an endless loop.
--- --
--- --      Jan
---
--- create table dup17 (x int4);
---
--- create trigger dup17_before
--- 	before insert on dup17
--- 	for each row
--- 	execute procedure
--- 	funny_dup17 ()
--- ;
---
--- insert into dup17 values (17);
--- select count(*) from dup17;
--- insert into dup17 values (17);
--- select count(*) from dup17;
---
--- drop trigger dup17_before on dup17;
---
--- create trigger dup17_after
--- 	after insert on dup17
--- 	for each row
--- 	execute procedure
--- 	funny_dup17 ()
--- ;
--- insert into dup17 values (13);
--- select count(*) from dup17 where x = 13;
--- insert into dup17 values (13);
--- select count(*) from dup17 where x = 13;
---
--- DROP TABLE dup17;
+-- Check behavior when trigger returns unmodified trigtuple
+create table trigtest (f1 int, f2 text);
+create trigger trigger_return_old
+	before insert or delete or update on trigtest
+	for each row execute procedure trigger_return_old();
+insert into trigtest values(1, 'foo');
+select * from trigtest;
+ f1 | f2  
+----+-----
+  1 | foo
+(1 row)
+
+update trigtest set f2 = f2 || 'bar';
+select * from trigtest;
+ f1 | f2  
+----+-----
+  1 | foo
+(1 row)
+
+delete from trigtest;
+select * from trigtest;
+ f1 | f2 
+----+----
+(0 rows)
+
+drop table trigtest;
 create sequence ttdummy_seq increment 10 start 0 minvalue 0;
 create table tttest (
 	price_id	int4,
@@ -347,6 +359,26 @@ CREATE TRIGGER insert_when BEFORE INSERT ON main_table
 FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('insert_when');
 CREATE TRIGGER delete_when AFTER DELETE ON main_table
 FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('delete_when');
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table IN ('main_table')
+  ORDER BY trigger_name COLLATE "C", 2;
+     trigger_name     | event_manipulation | event_object_schema | event_object_table | action_order |        action_condition        | action_orientation | action_timing | action_reference_old_table | action_reference_new_table 
+----------------------+--------------------+---------------------+--------------------+--------------+--------------------------------+--------------------+---------------+----------------------------+----------------------------
+ after_ins_stmt_trig  | INSERT             | public              | main_table         |            1 |                                | STATEMENT          | AFTER         |                            | 
+ after_upd_row_trig   | UPDATE             | public              | main_table         |            1 |                                | ROW                | AFTER         |                            | 
+ after_upd_stmt_trig  | UPDATE             | public              | main_table         |            1 |                                | STATEMENT          | AFTER         |                            | 
+ before_ins_stmt_trig | INSERT             | public              | main_table         |            1 |                                | STATEMENT          | BEFORE        |                            | 
+ delete_a             | DELETE             | public              | main_table         |            1 | (old.a = 123)                  | ROW                | AFTER         |                            | 
+ delete_when          | DELETE             | public              | main_table         |            1 | true                           | STATEMENT          | AFTER         |                            | 
+ insert_a             | INSERT             | public              | main_table         |            1 | (new.a = 123)                  | ROW                | AFTER         |                            | 
+ insert_when          | INSERT             | public              | main_table         |            2 | true                           | STATEMENT          | BEFORE        |                            | 
+ modified_a           | UPDATE             | public              | main_table         |            1 | (old.a <> new.a)               | ROW                | BEFORE        |                            | 
+ modified_any         | UPDATE             | public              | main_table         |            2 | (old.* IS DISTINCT FROM new.*) | ROW                | BEFORE        |                            | 
+(10 rows)
+
 INSERT INTO main_table (a) VALUES (123), (456);
 NOTICE:  trigger_func(before_ins_stmt) called: action = INSERT, when = BEFORE, level = STATEMENT
 NOTICE:  trigger_func(insert_when) called: action = INSERT, when = BEFORE, level = STATEMENT
@@ -391,9 +423,9 @@ SELECT pg_get_triggerdef(oid, true) FROM pg_trigger WHERE tgrelid = 'main_table'
 (1 row)
 
 SELECT pg_get_triggerdef(oid, false) FROM pg_trigger WHERE tgrelid = 'main_table'::regclass AND tgname = 'modified_a';
-                                                              pg_get_triggerdef                                                               
-----------------------------------------------------------------------------------------------------------------------------------------------
- CREATE TRIGGER modified_a BEFORE UPDATE OF a ON main_table FOR EACH ROW WHEN ((old.a <> new.a)) EXECUTE PROCEDURE trigger_func('modified_a')
+                                                                  pg_get_triggerdef                                                                  
+-----------------------------------------------------------------------------------------------------------------------------------------------------
+ CREATE TRIGGER modified_a BEFORE UPDATE OF a ON public.main_table FOR EACH ROW WHEN ((old.a <> new.a)) EXECUTE PROCEDURE trigger_func('modified_a')
 (1 row)
 
 SELECT pg_get_triggerdef(oid, true) FROM pg_trigger WHERE tgrelid = 'main_table'::regclass AND tgname = 'modified_any';
@@ -421,9 +453,9 @@ FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func('before_upd_a_stmt');
 CREATE TRIGGER after_upd_b_stmt_trig AFTER UPDATE OF b ON main_table
 FOR EACH STATEMENT EXECUTE PROCEDURE trigger_func('after_upd_b_stmt');
 SELECT pg_get_triggerdef(oid) FROM pg_trigger WHERE tgrelid = 'main_table'::regclass AND tgname = 'after_upd_a_b_row_trig';
-                                                             pg_get_triggerdef                                                             
--------------------------------------------------------------------------------------------------------------------------------------------
- CREATE TRIGGER after_upd_a_b_row_trig AFTER UPDATE OF a, b ON main_table FOR EACH ROW EXECUTE PROCEDURE trigger_func('after_upd_a_b_row')
+                                                                pg_get_triggerdef                                                                 
+--------------------------------------------------------------------------------------------------------------------------------------------------
+ CREATE TRIGGER after_upd_a_b_row_trig AFTER UPDATE OF a, b ON public.main_table FOR EACH ROW EXECUTE PROCEDURE trigger_func('after_upd_a_b_row')
 (1 row)
 
 UPDATE main_table SET a = 50;
@@ -569,6 +601,12 @@ insert into trigtest default values;
 alter table trigtest enable trigger trigtest_a_stmt_tg;
 insert into trigtest default values;
 NOTICE:  trigtest INSERT AFTER STATEMENT
+set session_replication_role = replica;
+insert into trigtest default values;  -- does not trigger
+alter table trigtest enable always trigger trigtest_a_stmt_tg;
+insert into trigtest default values;  -- now it does
+NOTICE:  trigtest INSERT AFTER STATEMENT
+reset session_replication_role;
 insert into trigtest2 values(1);
 insert into trigtest2 values(2);
 delete from trigtest where i=2;
@@ -595,7 +633,9 @@ select *  from trigtest;
  3
  4
  5
-(3 rows)
+ 6
+ 7
+(5 rows)
 
 drop table trigtest2;
 drop table trigtest;
@@ -1817,7 +1857,7 @@ create table parted2_stmt_trig1 partition of parted2_stmt_trig for values in (1)
 create table parted2_stmt_trig2 partition of parted2_stmt_trig for values in (2);
 create or replace function trigger_notice() returns trigger as $$
   begin
-    raise notice 'trigger on % % % for %', TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;
+    raise notice 'trigger % on % % % for %', TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;
     if TG_LEVEL = 'ROW' then
        return NEW;
     end if;
@@ -1862,12 +1902,12 @@ create trigger trig_del_after after delete on parted2_stmt_trig
 with ins (a) as (
   insert into parted2_stmt_trig values (1), (2) returning a
 ) insert into parted_stmt_trig select a from ins returning tableoid::regclass, a;
-NOTICE:  trigger on parted_stmt_trig BEFORE INSERT for STATEMENT
-NOTICE:  trigger on parted2_stmt_trig BEFORE INSERT for STATEMENT
-NOTICE:  trigger on parted_stmt_trig1 BEFORE INSERT for ROW
-NOTICE:  trigger on parted_stmt_trig1 AFTER INSERT for ROW
-NOTICE:  trigger on parted2_stmt_trig AFTER INSERT for STATEMENT
-NOTICE:  trigger on parted_stmt_trig AFTER INSERT for STATEMENT
+NOTICE:  trigger trig_ins_before on parted_stmt_trig BEFORE INSERT for STATEMENT
+NOTICE:  trigger trig_ins_before on parted2_stmt_trig BEFORE INSERT for STATEMENT
+NOTICE:  trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW
+NOTICE:  trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW
+NOTICE:  trigger trig_ins_after on parted2_stmt_trig AFTER INSERT for STATEMENT
+NOTICE:  trigger trig_ins_after on parted_stmt_trig AFTER INSERT for STATEMENT
      tableoid      | a 
 -------------------+---
  parted_stmt_trig1 | 1
@@ -1877,25 +1917,25 @@ NOTICE:  trigger on parted_stmt_trig AFTER INSERT for STATEMENT
 with upd as (
   update parted2_stmt_trig set a = a
 ) update parted_stmt_trig  set a = a;
-NOTICE:  trigger on parted_stmt_trig BEFORE UPDATE for STATEMENT
-NOTICE:  trigger on parted_stmt_trig1 BEFORE UPDATE for ROW
-NOTICE:  trigger on parted2_stmt_trig BEFORE UPDATE for STATEMENT
-NOTICE:  trigger on parted_stmt_trig1 AFTER UPDATE for ROW
-NOTICE:  trigger on parted_stmt_trig AFTER UPDATE for STATEMENT
-NOTICE:  trigger on parted2_stmt_trig AFTER UPDATE for STATEMENT
+NOTICE:  trigger trig_upd_before on parted_stmt_trig BEFORE UPDATE for STATEMENT
+NOTICE:  trigger trig_upd_before on parted_stmt_trig1 BEFORE UPDATE for ROW
+NOTICE:  trigger trig_upd_before on parted2_stmt_trig BEFORE UPDATE for STATEMENT
+NOTICE:  trigger trig_upd_after on parted_stmt_trig1 AFTER UPDATE for ROW
+NOTICE:  trigger trig_upd_after on parted_stmt_trig AFTER UPDATE for STATEMENT
+NOTICE:  trigger trig_upd_after on parted2_stmt_trig AFTER UPDATE for STATEMENT
 delete from parted_stmt_trig;
-NOTICE:  trigger on parted_stmt_trig BEFORE DELETE for STATEMENT
-NOTICE:  trigger on parted_stmt_trig AFTER DELETE for STATEMENT
+NOTICE:  trigger trig_del_before on parted_stmt_trig BEFORE DELETE for STATEMENT
+NOTICE:  trigger trig_del_after on parted_stmt_trig AFTER DELETE for STATEMENT
 -- insert via copy on the parent
 copy parted_stmt_trig(a) from stdin;
-NOTICE:  trigger on parted_stmt_trig BEFORE INSERT for STATEMENT
-NOTICE:  trigger on parted_stmt_trig1 BEFORE INSERT for ROW
-NOTICE:  trigger on parted_stmt_trig1 AFTER INSERT for ROW
-NOTICE:  trigger on parted_stmt_trig AFTER INSERT for STATEMENT
+NOTICE:  trigger trig_ins_before on parted_stmt_trig BEFORE INSERT for STATEMENT
+NOTICE:  trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW
+NOTICE:  trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW
+NOTICE:  trigger trig_ins_after on parted_stmt_trig AFTER INSERT for STATEMENT
 -- insert via copy on the first partition
 copy parted_stmt_trig1(a) from stdin;
-NOTICE:  trigger on parted_stmt_trig1 BEFORE INSERT for ROW
-NOTICE:  trigger on parted_stmt_trig1 AFTER INSERT for ROW
+NOTICE:  trigger trig_ins_before on parted_stmt_trig1 BEFORE INSERT for ROW
+NOTICE:  trigger trig_ins_after on parted_stmt_trig1 AFTER INSERT for ROW
 drop table parted_stmt_trig, parted2_stmt_trig;
 --
 -- Test the interaction between transition tables and both kinds of
@@ -1934,7 +1974,7 @@ $$;
 --
 -- Verify behavior of statement triggers on partition hierarchy with
 -- transition tables.  Tuples should appear to each trigger in the
--- format of the the relation the trigger is attached to.
+-- format of the relation the trigger is attached to.
 --
 -- set up a partition hierarchy with some different TupleDescriptors
 create table parent (a text, b int) partition by list (a);
@@ -1983,6 +2023,28 @@ create trigger child3_update_trig
 create trigger child3_delete_trig
   after delete on child3 referencing old table as old_table
   for each statement execute procedure dump_delete();
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table IN ('parent', 'child1', 'child2', 'child3')
+  ORDER BY trigger_name COLLATE "C", 2;
+    trigger_name    | event_manipulation | event_object_schema | event_object_table | action_order | action_condition | action_orientation | action_timing | action_reference_old_table | action_reference_new_table 
+--------------------+--------------------+---------------------+--------------------+--------------+------------------+--------------------+---------------+----------------------------+----------------------------
+ child1_delete_trig | DELETE             | public              | child1             |            1 |                  | STATEMENT          | AFTER         | old_table                  | 
+ child1_insert_trig | INSERT             | public              | child1             |            1 |                  | STATEMENT          | AFTER         |                            | new_table
+ child1_update_trig | UPDATE             | public              | child1             |            1 |                  | STATEMENT          | AFTER         | old_table                  | new_table
+ child2_delete_trig | DELETE             | public              | child2             |            1 |                  | STATEMENT          | AFTER         | old_table                  | 
+ child2_insert_trig | INSERT             | public              | child2             |            1 |                  | STATEMENT          | AFTER         |                            | new_table
+ child2_update_trig | UPDATE             | public              | child2             |            1 |                  | STATEMENT          | AFTER         | old_table                  | new_table
+ child3_delete_trig | DELETE             | public              | child3             |            1 |                  | STATEMENT          | AFTER         | old_table                  | 
+ child3_insert_trig | INSERT             | public              | child3             |            1 |                  | STATEMENT          | AFTER         |                            | new_table
+ child3_update_trig | UPDATE             | public              | child3             |            1 |                  | STATEMENT          | AFTER         | old_table                  | new_table
+ parent_delete_trig | DELETE             | public              | parent             |            1 |                  | STATEMENT          | AFTER         | old_table                  | 
+ parent_insert_trig | INSERT             | public              | parent             |            1 |                  | STATEMENT          | AFTER         |                            | new_table
+ parent_update_trig | UPDATE             | public              | parent             |            1 |                  | STATEMENT          | AFTER         | old_table                  | new_table
+(12 rows)
+
 -- insert directly into children sees respective child-format tuples
 insert into child1 values ('AAA', 42);
 NOTICE:  trigger = child1_insert_trig, new table = (AAA,42)
@@ -2217,6 +2279,23 @@ with wcte as (insert into table1 values (42))
   insert into table2 values ('hello world');
 NOTICE:  trigger = table2_trig, new table = ("hello world")
 NOTICE:  trigger = table1_trig, new table = (42)
+with wcte as (insert into table1 values (43))
+  insert into table1 values (44);
+NOTICE:  trigger = table1_trig, new table = (43), (44)
+select * from table1;
+ a  
+----
+ 42
+ 44
+ 43
+(3 rows)
+
+select * from table2;
+      a      
+-------------
+ hello world
+(1 row)
+
 drop table table1;
 drop table table2;
 --
@@ -2255,8 +2334,103 @@ NOTICE:  trigger = my_table_insert_trig, new table = <NULL>
 create trigger my_table_multievent_trig
   after insert or update on my_table referencing new table as new_table
   for each statement execute procedure dump_insert();
-ERROR:  Transition tables cannot be specified for triggers with more than one event
+ERROR:  transition tables cannot be specified for triggers with more than one event
+--
+-- Verify that you can't create a trigger with transition tables with
+-- a column list.
+--
+create trigger my_table_col_update_trig
+  after update of b on my_table referencing new table as new_table
+  for each statement execute procedure dump_insert();
+ERROR:  transition tables cannot be specified for triggers with column lists
 drop table my_table;
+--
+-- Test firing of triggers with transition tables by foreign key cascades
+--
+create table refd_table (a int primary key, b text);
+create table trig_table (a int, b text,
+  foreign key (a) references refd_table on update cascade on delete cascade
+);
+create trigger trig_table_before_trig
+  before insert or update or delete on trig_table
+  for each statement execute procedure trigger_func('trig_table');
+create trigger trig_table_insert_trig
+  after insert on trig_table referencing new table as new_table
+  for each statement execute procedure dump_insert();
+create trigger trig_table_update_trig
+  after update on trig_table referencing old table as old_table new table as new_table
+  for each statement execute procedure dump_update();
+create trigger trig_table_delete_trig
+  after delete on trig_table referencing old table as old_table
+  for each statement execute procedure dump_delete();
+insert into refd_table values
+  (1, 'one'),
+  (2, 'two'),
+  (3, 'three');
+insert into trig_table values
+  (1, 'one a'),
+  (1, 'one b'),
+  (2, 'two a'),
+  (2, 'two b'),
+  (3, 'three a'),
+  (3, 'three b');
+NOTICE:  trigger_func(trig_table) called: action = INSERT, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = trig_table_insert_trig, new table = (1,"one a"), (1,"one b"), (2,"two a"), (2,"two b"), (3,"three a"), (3,"three b")
+update refd_table set a = 11 where b = 'one';
+NOTICE:  trigger_func(trig_table) called: action = UPDATE, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = trig_table_update_trig, old table = (1,"one a"), (1,"one b"), new table = (11,"one a"), (11,"one b")
+select * from trig_table;
+ a  |    b    
+----+---------
+  2 | two a
+  2 | two b
+  3 | three a
+  3 | three b
+ 11 | one a
+ 11 | one b
+(6 rows)
+
+delete from refd_table where length(b) = 3;
+NOTICE:  trigger_func(trig_table) called: action = DELETE, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = trig_table_delete_trig, old table = (2,"two a"), (2,"two b"), (11,"one a"), (11,"one b")
+select * from trig_table;
+ a |    b    
+---+---------
+ 3 | three a
+ 3 | three b
+(2 rows)
+
+drop table refd_table, trig_table;
+--
+-- self-referential FKs are even more fun
+--
+create table self_ref (a int primary key,
+                       b int references self_ref(a) on delete cascade);
+create trigger self_ref_before_trig
+  before delete on self_ref
+  for each statement execute procedure trigger_func('self_ref');
+create trigger self_ref_r_trig
+  after delete on self_ref referencing old table as old_table
+  for each row execute procedure dump_delete();
+create trigger self_ref_s_trig
+  after delete on self_ref referencing old table as old_table
+  for each statement execute procedure dump_delete();
+insert into self_ref values (1, null), (2, 1), (3, 2);
+delete from self_ref where a = 1;
+NOTICE:  trigger_func(self_ref) called: action = DELETE, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = self_ref_r_trig, old table = (1,), (2,1)
+NOTICE:  trigger_func(self_ref) called: action = DELETE, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = self_ref_r_trig, old table = (1,), (2,1)
+NOTICE:  trigger = self_ref_s_trig, old table = (1,), (2,1)
+NOTICE:  trigger = self_ref_r_trig, old table = (3,2)
+NOTICE:  trigger = self_ref_s_trig, old table = (3,2)
+-- without AR trigger, cascaded deletes all end up in one transition table
+drop trigger self_ref_r_trig on self_ref;
+insert into self_ref values (1, null), (2, 1), (3, 2), (4, 3);
+delete from self_ref where a = 1;
+NOTICE:  trigger_func(self_ref) called: action = DELETE, when = BEFORE, level = STATEMENT
+NOTICE:  trigger = self_ref_s_trig, old table = (1,), (2,1), (3,2), (4,3)
+drop table self_ref;
 -- cleanup
 drop function dump_insert();
 drop function dump_update();
diff --git a/src/test/regress/expected/truncate.out b/src/test/regress/expected/truncate.out
index d967e8dd21..735d0e862d 100644
--- a/src/test/regress/expected/truncate.out
+++ b/src/test/regress/expected/truncate.out
@@ -455,12 +455,12 @@ CREATE TABLE truncparted (a int, b char) PARTITION BY LIST (a);
 -- error, can't truncate a partitioned table
 TRUNCATE ONLY truncparted;
 ERROR:  cannot truncate only a partitioned table
-HINT:  Do not specify the ONLY keyword, or use truncate only on the partitions directly.
+HINT:  Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly.
 CREATE TABLE truncparted1 PARTITION OF truncparted FOR VALUES IN (1);
 INSERT INTO truncparted VALUES (1, 'a');
 -- error, must truncate partitions
 TRUNCATE ONLY truncparted;
 ERROR:  cannot truncate only a partitioned table
-HINT:  Do not specify the ONLY keyword, or use truncate only on the partitions directly.
+HINT:  Do not specify the ONLY keyword, or use TRUNCATE ONLY on the partitions directly.
 TRUNCATE truncparted;
 DROP TABLE truncparted;
diff --git a/src/test/regress/expected/tsdicts.out b/src/test/regress/expected/tsdicts.out
index 0744ef803b..0c1d7c7675 100644
--- a/src/test/regress/expected/tsdicts.out
+++ b/src/test/regress/expected/tsdicts.out
@@ -580,3 +580,11 @@ SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a
  'card':3,10 'invit':2,9 'like':6 'look':5 'order':1,8
 (1 row)
 
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH DICTIONARY tsdict_case
+(
+	Template = ispell,
+	"DictFile" = ispell_sample,
+	"AffFile" = ispell_sample
+);
+ERROR:  unrecognized Ispell parameter: "DictFile"
diff --git a/src/test/regress/expected/tsearch.out b/src/test/regress/expected/tsearch.out
index b2fc9e207e..d63fb12f1d 100644
--- a/src/test/regress/expected/tsearch.out
+++ b/src/test/regress/expected/tsearch.out
@@ -618,6 +618,17 @@ SELECT * from ts_debug('english', '5aew.werc.ewr:8100/?xx');
  url_path | URL path    | /?xx                   | {simple}     | simple     | {/?xx}
 (3 rows)
 
+SELECT token, alias,
+  dictionaries, dictionaries is null as dnull, array_dims(dictionaries) as ddims,
+  lexemes, lexemes is null as lnull, array_dims(lexemes) as ldims
+from ts_debug('english', 'a title');
+ token |   alias   |  dictionaries  | dnull | ddims | lexemes | lnull | ldims 
+-------+-----------+----------------+-------+-------+---------+-------+-------
+ a     | asciiword | {english_stem} | f     | [1:1] | {}      | f     | 
+       | blank     | {}             | f     |       |         | t     | 
+ title | asciiword | {english_stem} | f     | [1:1] | {titl}  | f     | [1:1]
+(3 rows)
+
 -- to_tsquery
 SELECT to_tsquery('english', 'qwe & sKies ');
   to_tsquery   
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
index 7b200baef8..b1419d4bc2 100644
--- a/src/test/regress/expected/type_sanity.out
+++ b/src/test/regress/expected/type_sanity.out
@@ -129,6 +129,35 @@ WHERE p1.typinput = p2.oid AND NOT
 -----+---------+-----+---------
 (0 rows)
 
+-- Check for type of the variadic array parameter's elements.
+-- provariadic should be ANYOID if the type of the last element is ANYOID,
+-- ANYELEMENTOID if the type of the last element is ANYARRAYOID, and otherwise
+-- the element type corresponding to the array type.
+SELECT oid::regprocedure, provariadic::regtype, proargtypes::regtype[]
+FROM pg_proc
+WHERE provariadic != 0
+AND case proargtypes[array_length(proargtypes, 1)-1]
+    WHEN 2276 THEN 2276 -- any -> any
+	WHEN 2277 THEN 2283 -- anyarray -> anyelement
+	ELSE (SELECT t.oid
+		  FROM pg_type t
+		  WHERE t.typarray = proargtypes[array_length(proargtypes, 1)-1])
+	END  != provariadic;
+ oid | provariadic | proargtypes 
+-----+-------------+-------------
+(0 rows)
+
+-- Check that all and only those functions with a variadic type have
+-- a variadic argument.
+SELECT oid::regprocedure, proargmodes, provariadic
+FROM pg_proc
+WHERE (proargmodes IS NOT NULL AND 'v' = any(proargmodes))
+    IS DISTINCT FROM
+    (provariadic != 0);
+ oid | proargmodes | provariadic 
+-----+-------------+-------------
+(0 rows)
+
 -- As of 8.0, this check finds refcursor, which is borrowing
 -- other types' I/O routines
 SELECT p1.oid, p1.typname, p2.oid, p2.proname
diff --git a/src/test/regress/expected/union.out b/src/test/regress/expected/union.out
index ee26b163f7..92d427a690 100644
--- a/src/test/regress/expected/union.out
+++ b/src/test/regress/expected/union.out
@@ -552,6 +552,121 @@ SELECT q1 FROM int8_tbl EXCEPT (((SELECT q2 FROM int8_tbl ORDER BY q2 LIMIT 1)))
  4567890123456789 | -4567890123456789
 (5 rows)
 
+--
+-- Check behavior with empty select list (allowed since 9.4)
+--
+select union select;
+--
+(1 row)
+
+select intersect select;
+--
+(1 row)
+
+select except select;
+--
+(0 rows)
+
+-- check hashed implementation
+set enable_hashagg = true;
+set enable_sort = false;
+explain (costs off)
+select from generate_series(1,5) union select from generate_series(1,3);
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ HashAggregate
+   ->  Append
+         ->  Function Scan on generate_series
+         ->  Function Scan on generate_series generate_series_1
+(4 rows)
+
+explain (costs off)
+select from generate_series(1,5) intersect select from generate_series(1,3);
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ HashSetOp Intersect
+   ->  Append
+         ->  Subquery Scan on "*SELECT* 1"
+               ->  Function Scan on generate_series
+         ->  Subquery Scan on "*SELECT* 2"
+               ->  Function Scan on generate_series generate_series_1
+(6 rows)
+
+select from generate_series(1,5) union select from generate_series(1,3);
+--
+(1 row)
+
+select from generate_series(1,5) union all select from generate_series(1,3);
+--
+(8 rows)
+
+select from generate_series(1,5) intersect select from generate_series(1,3);
+--
+(1 row)
+
+select from generate_series(1,5) intersect all select from generate_series(1,3);
+--
+(3 rows)
+
+select from generate_series(1,5) except select from generate_series(1,3);
+--
+(0 rows)
+
+select from generate_series(1,5) except all select from generate_series(1,3);
+--
+(2 rows)
+
+-- check sorted implementation
+set enable_hashagg = false;
+set enable_sort = true;
+explain (costs off)
+select from generate_series(1,5) union select from generate_series(1,3);
+                           QUERY PLAN                           
+----------------------------------------------------------------
+ Unique
+   ->  Append
+         ->  Function Scan on generate_series
+         ->  Function Scan on generate_series generate_series_1
+(4 rows)
+
+explain (costs off)
+select from generate_series(1,5) intersect select from generate_series(1,3);
+                              QUERY PLAN                              
+----------------------------------------------------------------------
+ SetOp Intersect
+   ->  Append
+         ->  Subquery Scan on "*SELECT* 1"
+               ->  Function Scan on generate_series
+         ->  Subquery Scan on "*SELECT* 2"
+               ->  Function Scan on generate_series generate_series_1
+(6 rows)
+
+select from generate_series(1,5) union select from generate_series(1,3);
+--
+(1 row)
+
+select from generate_series(1,5) union all select from generate_series(1,3);
+--
+(8 rows)
+
+select from generate_series(1,5) intersect select from generate_series(1,3);
+--
+(1 row)
+
+select from generate_series(1,5) intersect all select from generate_series(1,3);
+--
+(3 rows)
+
+select from generate_series(1,5) except select from generate_series(1,3);
+--
+(0 rows)
+
+select from generate_series(1,5) except all select from generate_series(1,3);
+--
+(2 rows)
+
+reset enable_hashagg;
+reset enable_sort;
 --
 -- Check handling of a case with unknown constants.  We don't guarantee
 -- an undecorated constant will work in all cases, but historically this
diff --git a/src/test/regress/expected/updatable_views.out b/src/test/regress/expected/updatable_views.out
index 2090a411fe..964c115b14 100644
--- a/src/test/regress/expected/updatable_views.out
+++ b/src/test/regress/expected/updatable_views.out
@@ -990,26 +990,26 @@ SELECT * FROM rw_view2; -- ok
 (2 rows)
 
 INSERT INTO base_tbl VALUES (3, 'Row 3', 3.0); -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 INSERT INTO rw_view1 VALUES ('Row 3', 3.0, 3); -- not allowed
-ERROR:  permission denied for relation rw_view1
+ERROR:  permission denied for view rw_view1
 INSERT INTO rw_view2 VALUES ('Row 3', 3.0, 3); -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 UPDATE base_tbl SET a=a, c=c; -- ok
 UPDATE base_tbl SET b=b; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 UPDATE rw_view1 SET bb=bb, cc=cc; -- ok
 UPDATE rw_view1 SET aa=aa; -- not allowed
-ERROR:  permission denied for relation rw_view1
+ERROR:  permission denied for view rw_view1
 UPDATE rw_view2 SET aa=aa, cc=cc; -- ok
 UPDATE rw_view2 SET bb=bb; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 DELETE FROM base_tbl; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 DELETE FROM rw_view1; -- not allowed
-ERROR:  permission denied for relation rw_view1
+ERROR:  permission denied for view rw_view1
 DELETE FROM rw_view2; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 RESET SESSION AUTHORIZATION;
 SET SESSION AUTHORIZATION regress_view_user1;
 GRANT INSERT, DELETE ON base_tbl TO regress_view_user2;
@@ -1017,11 +1017,11 @@ RESET SESSION AUTHORIZATION;
 SET SESSION AUTHORIZATION regress_view_user2;
 INSERT INTO base_tbl VALUES (3, 'Row 3', 3.0); -- ok
 INSERT INTO rw_view1 VALUES ('Row 4', 4.0, 4); -- not allowed
-ERROR:  permission denied for relation rw_view1
+ERROR:  permission denied for view rw_view1
 INSERT INTO rw_view2 VALUES ('Row 4', 4.0, 4); -- ok
 DELETE FROM base_tbl WHERE a=1; -- ok
 DELETE FROM rw_view1 WHERE aa=2; -- not allowed
-ERROR:  permission denied for relation rw_view1
+ERROR:  permission denied for view rw_view1
 DELETE FROM rw_view2 WHERE aa=2; -- ok
 SELECT * FROM base_tbl;
  a |   b   | c 
@@ -1037,15 +1037,15 @@ GRANT INSERT, DELETE ON rw_view1 TO regress_view_user2;
 RESET SESSION AUTHORIZATION;
 SET SESSION AUTHORIZATION regress_view_user2;
 INSERT INTO base_tbl VALUES (5, 'Row 5', 5.0); -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 INSERT INTO rw_view1 VALUES ('Row 5', 5.0, 5); -- ok
 INSERT INTO rw_view2 VALUES ('Row 6', 6.0, 6); -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 DELETE FROM base_tbl WHERE a=3; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 DELETE FROM rw_view1 WHERE aa=3; -- ok
 DELETE FROM rw_view2 WHERE aa=4; -- not allowed
-ERROR:  permission denied for relation base_tbl
+ERROR:  permission denied for table base_tbl
 SELECT * FROM base_tbl;
  a |   b   | c 
 ---+-------+---
diff --git a/src/test/regress/expected/update.out b/src/test/regress/expected/update.out
index 9366f04255..d09326c182 100644
--- a/src/test/regress/expected/update.out
+++ b/src/test/regress/expected/update.out
@@ -198,25 +198,694 @@ INSERT INTO upsert_test VALUES (1, 'Bat') ON CONFLICT(a)
 
 DROP TABLE update_test;
 DROP TABLE upsert_test;
--- update to a partition should check partition bound constraint for the new tuple
-create table range_parted (
+---------------------------
+-- UPDATE with row movement
+---------------------------
+-- When a partitioned table receives an UPDATE to the partitioned key and the
+-- new values no longer meet the partition's bound, the row must be moved to
+-- the correct partition for the new partition key (if one exists). We must
+-- also ensure that updatable views on partitioned tables properly enforce any
+-- WITH CHECK OPTION that is defined. The situation with triggers in this case
+-- also requires thorough testing as partition key updates causing row
+-- movement convert UPDATEs into DELETE+INSERT.
+CREATE TABLE range_parted (
 	a text,
+	b bigint,
+	c numeric,
+	d int,
+	e varchar
+) PARTITION BY RANGE (a, b);
+-- Create partitions intentionally in descending bound order, so as to test
+-- that update-row-movement works with the leaf partitions not in bound order.
+CREATE TABLE part_b_20_b_30 (e varchar, c numeric, a text, b bigint, d int);
+ALTER TABLE range_parted ATTACH PARTITION part_b_20_b_30 FOR VALUES FROM ('b', 20) TO ('b', 30);
+CREATE TABLE part_b_10_b_20 (e varchar, c numeric, a text, b bigint, d int) PARTITION BY RANGE (c);
+CREATE TABLE part_b_1_b_10 PARTITION OF range_parted FOR VALUES FROM ('b', 1) TO ('b', 10);
+ALTER TABLE range_parted ATTACH PARTITION part_b_10_b_20 FOR VALUES FROM ('b', 10) TO ('b', 20);
+CREATE TABLE part_a_10_a_20 PARTITION OF range_parted FOR VALUES FROM ('a', 10) TO ('a', 20);
+CREATE TABLE part_a_1_a_10 PARTITION OF range_parted FOR VALUES FROM ('a', 1) TO ('a', 10);
+-- Check that partition-key UPDATE works sanely on a partitioned table that
+-- does not have any child partitions.
+UPDATE part_b_10_b_20 set b = b - 6;
+-- Create some more partitions following the above pattern of descending bound
+-- order, but let's make the situation a bit more complex by having the
+-- attribute numbers of the columns vary from their parent partition.
+CREATE TABLE part_c_100_200 (e varchar, c numeric, a text, b bigint, d int) PARTITION BY range (abs(d));
+ALTER TABLE part_c_100_200 DROP COLUMN e, DROP COLUMN c, DROP COLUMN a;
+ALTER TABLE part_c_100_200 ADD COLUMN c numeric, ADD COLUMN e varchar, ADD COLUMN a text;
+ALTER TABLE part_c_100_200 DROP COLUMN b;
+ALTER TABLE part_c_100_200 ADD COLUMN b bigint;
+CREATE TABLE part_d_1_15 PARTITION OF part_c_100_200 FOR VALUES FROM (1) TO (15);
+CREATE TABLE part_d_15_20 PARTITION OF part_c_100_200 FOR VALUES FROM (15) TO (20);
+ALTER TABLE part_b_10_b_20 ATTACH PARTITION part_c_100_200 FOR VALUES FROM (100) TO (200);
+CREATE TABLE part_c_1_100 (e varchar, d int, c numeric, b bigint, a text);
+ALTER TABLE part_b_10_b_20 ATTACH PARTITION part_c_1_100 FOR VALUES FROM (1) TO (100);
+\set init_range_parted 'truncate range_parted; insert into range_parted VALUES (''a'', 1, 1, 1), (''a'', 10, 200, 1), (''b'', 12, 96, 1), (''b'', 13, 97, 2), (''b'', 15, 105, 16), (''b'', 17, 105, 19)'
+\set show_data 'select tableoid::regclass::text COLLATE "C" partname, * from range_parted ORDER BY 1, 2, 3, 4, 5, 6'
+:init_range_parted;
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 12 |  96 |  1 | 
+ part_c_1_100   | b | 13 |  97 |  2 | 
+ part_d_15_20   | b | 15 | 105 | 16 | 
+ part_d_15_20   | b | 17 | 105 | 19 | 
+(6 rows)
+
+-- The order of subplans should be in bound order
+EXPLAIN (costs off) UPDATE range_parted set c = c - 50 WHERE c > 97;
+             QUERY PLAN              
+-------------------------------------
+ Update on range_parted
+   Update on part_a_1_a_10
+   Update on part_a_10_a_20
+   Update on part_b_1_b_10
+   Update on part_c_1_100
+   Update on part_d_1_15
+   Update on part_d_15_20
+   Update on part_b_20_b_30
+   ->  Seq Scan on part_a_1_a_10
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_a_10_a_20
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_b_1_b_10
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_c_1_100
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_d_1_15
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_d_15_20
+         Filter: (c > '97'::numeric)
+   ->  Seq Scan on part_b_20_b_30
+         Filter: (c > '97'::numeric)
+(22 rows)
+
+-- fail, row movement happens only within the partition subtree.
+UPDATE part_c_100_200 set c = c - 20, d = c WHERE c = 105;
+ERROR:  new row for relation "part_c_100_200" violates partition constraint
+DETAIL:  Failing row contains (105, 85, null, b, 15).
+-- fail, no partition key update, so no attempt to move tuple,
+-- but "a = 'a'" violates partition constraint enforced by root partition)
+UPDATE part_b_10_b_20 set a = 'a';
+ERROR:  new row for relation "part_c_1_100" violates partition constraint
+DETAIL:  Failing row contains (null, 1, 96, 12, a).
+-- ok, partition key update, no constraint violation
+UPDATE range_parted set d = d - 10 WHERE d > 10;
+-- ok, no partition key update, no constraint violation
+UPDATE range_parted set e = d;
+-- No row found
+UPDATE part_c_1_100 set c = c + 20 WHERE c = 98;
+-- ok, row movement
+UPDATE part_b_10_b_20 set c = c + 20 returning c, b, a;
+  c  | b  | a 
+-----+----+---
+ 116 | 12 | b
+ 117 | 13 | b
+ 125 | 15 | b
+ 125 | 17 | b
+(4 rows)
+
+:show_data;
+    partname    | a | b  |  c  | d | e 
+----------------+---+----+-----+---+---
+ part_a_10_a_20 | a | 10 | 200 | 1 | 1
+ part_a_1_a_10  | a |  1 |   1 | 1 | 1
+ part_d_1_15    | b | 12 | 116 | 1 | 1
+ part_d_1_15    | b | 13 | 117 | 2 | 2
+ part_d_1_15    | b | 15 | 125 | 6 | 6
+ part_d_1_15    | b | 17 | 125 | 9 | 9
+(6 rows)
+
+-- fail, row movement happens only within the partition subtree.
+UPDATE part_b_10_b_20 set b = b - 6 WHERE c > 116 returning *;
+ERROR:  new row for relation "part_d_1_15" violates partition constraint
+DETAIL:  Failing row contains (2, 117, 2, b, 7).
+-- ok, row movement, with subset of rows moved into different partition.
+UPDATE range_parted set b = b - 6 WHERE c > 116 returning a, b + c;
+ a | ?column? 
+---+----------
+ a |      204
+ b |      124
+ b |      134
+ b |      136
+(4 rows)
+
+:show_data;
+   partname    | a | b  |  c  | d | e 
+---------------+---+----+-----+---+---
+ part_a_1_a_10 | a |  1 |   1 | 1 | 1
+ part_a_1_a_10 | a |  4 | 200 | 1 | 1
+ part_b_1_b_10 | b |  7 | 117 | 2 | 2
+ part_b_1_b_10 | b |  9 | 125 | 6 | 6
+ part_d_1_15   | b | 11 | 125 | 9 | 9
+ part_d_1_15   | b | 12 | 116 | 1 | 1
+(6 rows)
+
+-- Common table needed for multiple test scenarios.
+CREATE TABLE mintab(c1 int);
+INSERT into mintab VALUES (120);
+-- update partition key using updatable view.
+CREATE VIEW upview AS SELECT * FROM range_parted WHERE (select c > c1 FROM mintab) WITH CHECK OPTION;
+-- ok
+UPDATE upview set c = 199 WHERE b = 4;
+-- fail, check option violation
+UPDATE upview set c = 120 WHERE b = 4;
+ERROR:  new row violates check option for view "upview"
+DETAIL:  Failing row contains (a, 4, 120, 1, 1).
+-- fail, row movement with check option violation
+UPDATE upview set a = 'b', b = 15, c = 120 WHERE b = 4;
+ERROR:  new row violates check option for view "upview"
+DETAIL:  Failing row contains (b, 15, 120, 1, 1).
+-- ok, row movement, check option passes
+UPDATE upview set a = 'b', b = 15 WHERE b = 4;
+:show_data;
+   partname    | a | b  |  c  | d | e 
+---------------+---+----+-----+---+---
+ part_a_1_a_10 | a |  1 |   1 | 1 | 1
+ part_b_1_b_10 | b |  7 | 117 | 2 | 2
+ part_b_1_b_10 | b |  9 | 125 | 6 | 6
+ part_d_1_15   | b | 11 | 125 | 9 | 9
+ part_d_1_15   | b | 12 | 116 | 1 | 1
+ part_d_1_15   | b | 15 | 199 | 1 | 1
+(6 rows)
+
+-- cleanup
+DROP VIEW upview;
+-- RETURNING having whole-row vars.
+:init_range_parted;
+UPDATE range_parted set c = 95 WHERE a = 'b' and b > 10 and c > 100 returning (range_parted), *;
+ range_parted  | a | b  | c  | d  | e 
+---------------+---+----+----+----+---
+ (b,15,95,16,) | b | 15 | 95 | 16 | 
+ (b,17,95,19,) | b | 17 | 95 | 19 | 
+(2 rows)
+
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 12 |  96 |  1 | 
+ part_c_1_100   | b | 13 |  97 |  2 | 
+ part_c_1_100   | b | 15 |  95 | 16 | 
+ part_c_1_100   | b | 17 |  95 | 19 | 
+(6 rows)
+
+-- Transition tables with update row movement
+:init_range_parted;
+CREATE FUNCTION trans_updatetrigfunc() RETURNS trigger LANGUAGE plpgsql AS
+$$
+  begin
+    raise notice 'trigger = %, old table = %, new table = %',
+                 TG_NAME,
+                 (select string_agg(old_table::text, ', ' ORDER BY a) FROM old_table),
+                 (select string_agg(new_table::text, ', ' ORDER BY a) FROM new_table);
+    return null;
+  end;
+$$;
+CREATE TRIGGER trans_updatetrig
+  AFTER UPDATE ON range_parted REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+UPDATE range_parted set c = (case when c = 96 then 110 else c + 1 end ) WHERE a = 'b' and b > 10 and c >= 96;
+NOTICE:  trigger = trans_updatetrig, old table = (b,12,96,1,), (b,13,97,2,), (b,15,105,16,), (b,17,105,19,), new table = (b,12,110,1,), (b,13,98,2,), (b,15,106,16,), (b,17,106,19,)
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 13 |  98 |  2 | 
+ part_d_15_20   | b | 15 | 106 | 16 | 
+ part_d_15_20   | b | 17 | 106 | 19 | 
+ part_d_1_15    | b | 12 | 110 |  1 | 
+(6 rows)
+
+:init_range_parted;
+-- Enabling OLD TABLE capture for both DELETE as well as UPDATE stmt triggers
+-- should not cause DELETEd rows to be captured twice. Similar thing for
+-- INSERT triggers and inserted rows.
+CREATE TRIGGER trans_deletetrig
+  AFTER DELETE ON range_parted REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+CREATE TRIGGER trans_inserttrig
+  AFTER INSERT ON range_parted REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+UPDATE range_parted set c = c + 50 WHERE a = 'b' and b > 10 and c >= 96;
+NOTICE:  trigger = trans_updatetrig, old table = (b,12,96,1,), (b,13,97,2,), (b,15,105,16,), (b,17,105,19,), new table = (b,12,146,1,), (b,13,147,2,), (b,15,155,16,), (b,17,155,19,)
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_d_15_20   | b | 15 | 155 | 16 | 
+ part_d_15_20   | b | 17 | 155 | 19 | 
+ part_d_1_15    | b | 12 | 146 |  1 | 
+ part_d_1_15    | b | 13 | 147 |  2 | 
+(6 rows)
+
+DROP TRIGGER trans_deletetrig ON range_parted;
+DROP TRIGGER trans_inserttrig ON range_parted;
+-- Don't drop trans_updatetrig yet. It is required below.
+-- Test with transition tuple conversion happening for rows moved into the
+-- new partition. This requires a trigger that references transition table
+-- (we already have trans_updatetrig). For inserted rows, the conversion
+-- is not usually needed, because the original tuple is already compatible with
+-- the desired transition tuple format. But conversion happens when there is a
+-- BR trigger because the trigger can change the inserted row. So install a
+-- BR triggers on those child partitions where the rows will be moved.
+CREATE FUNCTION func_parted_mod_b() RETURNS trigger AS $$
+BEGIN
+   NEW.b = NEW.b + 1;
+   return NEW;
+END $$ language plpgsql;
+CREATE TRIGGER trig_c1_100 BEFORE UPDATE OR INSERT ON part_c_1_100
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+CREATE TRIGGER trig_d1_15 BEFORE UPDATE OR INSERT ON part_d_1_15
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+CREATE TRIGGER trig_d15_20 BEFORE UPDATE OR INSERT ON part_d_15_20
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+:init_range_parted;
+UPDATE range_parted set c = (case when c = 96 then 110 else c + 1 end) WHERE a = 'b' and b > 10 and c >= 96;
+NOTICE:  trigger = trans_updatetrig, old table = (b,13,96,1,), (b,14,97,2,), (b,16,105,16,), (b,18,105,19,), new table = (b,15,110,1,), (b,15,98,2,), (b,17,106,16,), (b,19,106,19,)
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 15 |  98 |  2 | 
+ part_d_15_20   | b | 17 | 106 | 16 | 
+ part_d_15_20   | b | 19 | 106 | 19 | 
+ part_d_1_15    | b | 15 | 110 |  1 | 
+(6 rows)
+
+:init_range_parted;
+UPDATE range_parted set c = c + 50 WHERE a = 'b' and b > 10 and c >= 96;
+NOTICE:  trigger = trans_updatetrig, old table = (b,13,96,1,), (b,14,97,2,), (b,16,105,16,), (b,18,105,19,), new table = (b,15,146,1,), (b,16,147,2,), (b,17,155,16,), (b,19,155,19,)
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_d_15_20   | b | 17 | 155 | 16 | 
+ part_d_15_20   | b | 19 | 155 | 19 | 
+ part_d_1_15    | b | 15 | 146 |  1 | 
+ part_d_1_15    | b | 16 | 147 |  2 | 
+(6 rows)
+
+-- Case where per-partition tuple conversion map array is allocated, but the
+-- map is not required for the particular tuple that is routed, thanks to
+-- matching table attributes of the partition and the target table.
+:init_range_parted;
+UPDATE range_parted set b = 15 WHERE b = 1;
+NOTICE:  trigger = trans_updatetrig, old table = (a,1,1,1,), new table = (a,15,1,1,)
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_10_a_20 | a | 15 |   1 |  1 | 
+ part_c_1_100   | b | 13 |  96 |  1 | 
+ part_c_1_100   | b | 14 |  97 |  2 | 
+ part_d_15_20   | b | 16 | 105 | 16 | 
+ part_d_15_20   | b | 18 | 105 | 19 | 
+(6 rows)
+
+DROP TRIGGER trans_updatetrig ON range_parted;
+DROP TRIGGER trig_c1_100 ON part_c_1_100;
+DROP TRIGGER trig_d1_15 ON part_d_1_15;
+DROP TRIGGER trig_d15_20 ON part_d_15_20;
+DROP FUNCTION func_parted_mod_b();
+-- RLS policies with update-row-movement
+-----------------------------------------
+ALTER TABLE range_parted ENABLE ROW LEVEL SECURITY;
+CREATE USER regress_range_parted_user;
+GRANT ALL ON range_parted, mintab TO regress_range_parted_user;
+CREATE POLICY seeall ON range_parted AS PERMISSIVE FOR SELECT USING (true);
+CREATE POLICY policy_range_parted ON range_parted for UPDATE USING (true) WITH CHECK (c % 2 = 0);
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- This should fail with RLS violation error while moving row from
+-- part_a_10_a_20 to part_d_1_15, because we are setting 'c' to an odd number.
+UPDATE range_parted set a = 'b', c = 151 WHERE a = 'a' and c = 200;
+ERROR:  new row violates row-level security policy for table "range_parted"
+RESET SESSION AUTHORIZATION;
+-- Create a trigger on part_d_1_15
+CREATE FUNCTION func_d_1_15() RETURNS trigger AS $$
+BEGIN
+   NEW.c = NEW.c + 1; -- Make even numbers odd, or vice versa
+   return NEW;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER trig_d_1_15 BEFORE INSERT ON part_d_1_15
+   FOR EACH ROW EXECUTE PROCEDURE func_d_1_15();
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- Here, RLS checks should succeed while moving row from part_a_10_a_20 to
+-- part_d_1_15. Even though the UPDATE is setting 'c' to an odd number, the
+-- trigger at the destination partition again makes it an even number.
+UPDATE range_parted set a = 'b', c = 151 WHERE a = 'a' and c = 200;
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- This should fail with RLS violation error. Even though the UPDATE is setting
+-- 'c' to an even number, the trigger at the destination partition again makes
+-- it an odd number.
+UPDATE range_parted set a = 'b', c = 150 WHERE a = 'a' and c = 200;
+ERROR:  new row violates row-level security policy for table "range_parted"
+-- Cleanup
+RESET SESSION AUTHORIZATION;
+DROP TRIGGER trig_d_1_15 ON part_d_1_15;
+DROP FUNCTION func_d_1_15();
+-- Policy expression contains SubPlan
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+CREATE POLICY policy_range_parted_subplan on range_parted
+    AS RESTRICTIVE for UPDATE USING (true)
+    WITH CHECK ((SELECT range_parted.c <= c1 FROM mintab));
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- fail, mintab has row with c1 = 120
+UPDATE range_parted set a = 'b', c = 122 WHERE a = 'a' and c = 200;
+ERROR:  new row violates row-level security policy "policy_range_parted_subplan" for table "range_parted"
+-- ok
+UPDATE range_parted set a = 'b', c = 120 WHERE a = 'a' and c = 200;
+-- RLS policy expression contains whole row.
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+CREATE POLICY policy_range_parted_wholerow on range_parted AS RESTRICTIVE for UPDATE USING (true)
+   WITH CHECK (range_parted = row('b', 10, 112, 1, NULL)::range_parted);
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- ok, should pass the RLS check
+UPDATE range_parted set a = 'b', c = 112 WHERE a = 'a' and c = 200;
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- fail, the whole row RLS check should fail
+UPDATE range_parted set a = 'b', c = 116 WHERE a = 'a' and c = 200;
+ERROR:  new row violates row-level security policy "policy_range_parted_wholerow" for table "range_parted"
+-- Cleanup
+RESET SESSION AUTHORIZATION;
+DROP POLICY policy_range_parted ON range_parted;
+DROP POLICY policy_range_parted_subplan ON range_parted;
+DROP POLICY policy_range_parted_wholerow ON range_parted;
+REVOKE ALL ON range_parted, mintab FROM regress_range_parted_user;
+DROP USER regress_range_parted_user;
+DROP TABLE mintab;
+-- statement triggers with update row movement
+---------------------------------------------------
+:init_range_parted;
+CREATE FUNCTION trigfunc() returns trigger language plpgsql as
+$$
+  begin
+    raise notice 'trigger = % fired on table % during %',
+                 TG_NAME, TG_TABLE_NAME, TG_OP;
+    return null;
+  end;
+$$;
+-- Triggers on root partition
+CREATE TRIGGER parent_delete_trig
+  AFTER DELETE ON range_parted for each statement execute procedure trigfunc();
+CREATE TRIGGER parent_update_trig
+  AFTER UPDATE ON range_parted for each statement execute procedure trigfunc();
+CREATE TRIGGER parent_insert_trig
+  AFTER INSERT ON range_parted for each statement execute procedure trigfunc();
+-- Triggers on leaf partition part_c_1_100
+CREATE TRIGGER c1_delete_trig
+  AFTER DELETE ON part_c_1_100 for each statement execute procedure trigfunc();
+CREATE TRIGGER c1_update_trig
+  AFTER UPDATE ON part_c_1_100 for each statement execute procedure trigfunc();
+CREATE TRIGGER c1_insert_trig
+  AFTER INSERT ON part_c_1_100 for each statement execute procedure trigfunc();
+-- Triggers on leaf partition part_d_1_15
+CREATE TRIGGER d1_delete_trig
+  AFTER DELETE ON part_d_1_15 for each statement execute procedure trigfunc();
+CREATE TRIGGER d1_update_trig
+  AFTER UPDATE ON part_d_1_15 for each statement execute procedure trigfunc();
+CREATE TRIGGER d1_insert_trig
+  AFTER INSERT ON part_d_1_15 for each statement execute procedure trigfunc();
+-- Triggers on leaf partition part_d_15_20
+CREATE TRIGGER d15_delete_trig
+  AFTER DELETE ON part_d_15_20 for each statement execute procedure trigfunc();
+CREATE TRIGGER d15_update_trig
+  AFTER UPDATE ON part_d_15_20 for each statement execute procedure trigfunc();
+CREATE TRIGGER d15_insert_trig
+  AFTER INSERT ON part_d_15_20 for each statement execute procedure trigfunc();
+-- Move all rows from part_c_100_200 to part_c_1_100. None of the delete or
+-- insert statement triggers should be fired.
+UPDATE range_parted set c = c - 50 WHERE c > 97;
+NOTICE:  trigger = parent_update_trig fired on table range_parted during UPDATE
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 150 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 12 |  96 |  1 | 
+ part_c_1_100   | b | 13 |  97 |  2 | 
+ part_c_1_100   | b | 15 |  55 | 16 | 
+ part_c_1_100   | b | 17 |  55 | 19 | 
+(6 rows)
+
+DROP TRIGGER parent_delete_trig ON range_parted;
+DROP TRIGGER parent_update_trig ON range_parted;
+DROP TRIGGER parent_insert_trig ON range_parted;
+DROP TRIGGER c1_delete_trig ON part_c_1_100;
+DROP TRIGGER c1_update_trig ON part_c_1_100;
+DROP TRIGGER c1_insert_trig ON part_c_1_100;
+DROP TRIGGER d1_delete_trig ON part_d_1_15;
+DROP TRIGGER d1_update_trig ON part_d_1_15;
+DROP TRIGGER d1_insert_trig ON part_d_1_15;
+DROP TRIGGER d15_delete_trig ON part_d_15_20;
+DROP TRIGGER d15_update_trig ON part_d_15_20;
+DROP TRIGGER d15_insert_trig ON part_d_15_20;
+-- Creating default partition for range
+:init_range_parted;
+create table part_def partition of range_parted default;
+\d+ part_def
+                                       Table "public.part_def"
+ Column |       Type        | Collation | Nullable | Default | Storage  | Stats target | Description 
+--------+-------------------+-----------+----------+---------+----------+--------------+-------------
+ a      | text              |           |          |         | extended |              | 
+ b      | bigint            |           |          |         | plain    |              | 
+ c      | numeric           |           |          |         | main     |              | 
+ d      | integer           |           |          |         | plain    |              | 
+ e      | character varying |           |          |         | extended |              | 
+Partition of: range_parted DEFAULT
+Partition constraint: (NOT ((a IS NOT NULL) AND (b IS NOT NULL) AND (((a = 'a'::text) AND (b >= '1'::bigint) AND (b < '10'::bigint)) OR ((a = 'a'::text) AND (b >= '10'::bigint) AND (b < '20'::bigint)) OR ((a = 'b'::text) AND (b >= '1'::bigint) AND (b < '10'::bigint)) OR ((a = 'b'::text) AND (b >= '10'::bigint) AND (b < '20'::bigint)) OR ((a = 'b'::text) AND (b >= '20'::bigint) AND (b < '30'::bigint)))))
+
+insert into range_parted values ('c', 9);
+-- ok
+update part_def set a = 'd' where a = 'c';
+-- fail
+update part_def set a = 'a' where a = 'd';
+ERROR:  new row for relation "part_def" violates partition constraint
+DETAIL:  Failing row contains (a, 9, null, null, null).
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 12 |  96 |  1 | 
+ part_c_1_100   | b | 13 |  97 |  2 | 
+ part_d_15_20   | b | 15 | 105 | 16 | 
+ part_d_15_20   | b | 17 | 105 | 19 | 
+ part_def       | d |  9 |     |    | 
+(7 rows)
+
+-- Update row movement from non-default to default partition.
+-- fail, default partition is not under part_a_10_a_20;
+UPDATE part_a_10_a_20 set a = 'ad' WHERE a = 'a';
+ERROR:  new row for relation "part_a_10_a_20" violates partition constraint
+DETAIL:  Failing row contains (ad, 10, 200, 1, null).
+-- ok
+UPDATE range_parted set a = 'ad' WHERE a = 'a';
+UPDATE range_parted set a = 'bd' WHERE a = 'b';
+:show_data;
+ partname | a  | b  |  c  | d  | e 
+----------+----+----+-----+----+---
+ part_def | ad |  1 |   1 |  1 | 
+ part_def | ad | 10 | 200 |  1 | 
+ part_def | bd | 12 |  96 |  1 | 
+ part_def | bd | 13 |  97 |  2 | 
+ part_def | bd | 15 | 105 | 16 | 
+ part_def | bd | 17 | 105 | 19 | 
+ part_def | d  |  9 |     |    | 
+(7 rows)
+
+-- Update row movement from default to non-default partitions.
+-- ok
+UPDATE range_parted set a = 'a' WHERE a = 'ad';
+UPDATE range_parted set a = 'b' WHERE a = 'bd';
+:show_data;
+    partname    | a | b  |  c  | d  | e 
+----------------+---+----+-----+----+---
+ part_a_10_a_20 | a | 10 | 200 |  1 | 
+ part_a_1_a_10  | a |  1 |   1 |  1 | 
+ part_c_1_100   | b | 12 |  96 |  1 | 
+ part_c_1_100   | b | 13 |  97 |  2 | 
+ part_d_15_20   | b | 15 | 105 | 16 | 
+ part_d_15_20   | b | 17 | 105 | 19 | 
+ part_def       | d |  9 |     |    | 
+(7 rows)
+
+-- Cleanup: range_parted no longer needed.
+DROP TABLE range_parted;
+CREATE TABLE list_parted (
+	a text,
+	b int
+) PARTITION BY list (a);
+CREATE TABLE list_part1  PARTITION OF list_parted for VALUES in ('a', 'b');
+CREATE TABLE list_default PARTITION OF list_parted default;
+INSERT into list_part1 VALUES ('a', 1);
+INSERT into list_default VALUES ('d', 10);
+-- fail
+UPDATE list_default set a = 'a' WHERE a = 'd';
+ERROR:  new row for relation "list_default" violates partition constraint
+DETAIL:  Failing row contains (a, 10).
+-- ok
+UPDATE list_default set a = 'x' WHERE a = 'd';
+DROP TABLE list_parted;
+--------------
+-- Some more update-partition-key test scenarios below. This time use list
+-- partitions.
+--------------
+-- Setup for list partitions
+CREATE TABLE list_parted (a numeric, b int, c int8) PARTITION BY list (a);
+CREATE TABLE sub_parted PARTITION OF list_parted for VALUES in (1) PARTITION BY list (b);
+CREATE TABLE sub_part1(b int, c int8, a numeric);
+ALTER TABLE sub_parted ATTACH PARTITION sub_part1 for VALUES in (1);
+CREATE TABLE sub_part2(b int, c int8, a numeric);
+ALTER TABLE sub_parted ATTACH PARTITION sub_part2 for VALUES in (2);
+CREATE TABLE list_part1(a numeric, b int, c int8);
+ALTER TABLE list_parted ATTACH PARTITION list_part1 for VALUES in (2,3);
+INSERT into list_parted VALUES (2,5,50);
+INSERT into list_parted VALUES (3,6,60);
+INSERT into sub_parted VALUES (1,1,60);
+INSERT into sub_parted VALUES (1,2,10);
+-- Test partition constraint violation when intermediate ancestor is used and
+-- constraint is inherited from upper root.
+UPDATE sub_parted set a = 2 WHERE c = 10;
+ERROR:  new row for relation "sub_part2" violates partition constraint
+DETAIL:  Failing row contains (2, 10, 2).
+-- Test update-partition-key, where the unpruned partitions do not have their
+-- partition keys updated.
+SELECT tableoid::regclass::text, * FROM list_parted WHERE a = 2 ORDER BY 1;
+  tableoid  | a | b | c  
+------------+---+---+----
+ list_part1 | 2 | 5 | 50
+(1 row)
+
+UPDATE list_parted set b = c + a WHERE a = 2;
+SELECT tableoid::regclass::text, * FROM list_parted WHERE a = 2 ORDER BY 1;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 | 52 | 50
+(1 row)
+
+-- Test the case where BR UPDATE triggers change the partition key.
+CREATE FUNCTION func_parted_mod_b() returns trigger as $$
+BEGIN
+   NEW.b = 2; -- This is changing partition key column.
+   return NEW;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER parted_mod_b before update on sub_part1
+   for each row execute procedure func_parted_mod_b();
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 | 52 | 50
+ list_part1 | 3 |  6 | 60
+ sub_part1  | 1 |  1 | 60
+ sub_part2  | 1 |  2 | 10
+(4 rows)
+
+-- This should do the tuple routing even though there is no explicit
+-- partition-key update, because there is a trigger on sub_part1.
+UPDATE list_parted set c = 70 WHERE b  = 1;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 | 52 | 50
+ list_part1 | 3 |  6 | 60
+ sub_part2  | 1 |  2 | 10
+ sub_part2  | 1 |  2 | 70
+(4 rows)
+
+DROP TRIGGER parted_mod_b ON sub_part1;
+-- If BR DELETE trigger prevented DELETE from happening, we should also skip
+-- the INSERT if that delete is part of UPDATE=>DELETE+INSERT.
+CREATE OR REPLACE FUNCTION func_parted_mod_b() returns trigger as $$
+BEGIN
+   raise notice 'Trigger: Got OLD row %, but returning NULL', OLD;
+   return NULL;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER trig_skip_delete before delete on sub_part2
+   for each row execute procedure func_parted_mod_b();
+UPDATE list_parted set b = 1 WHERE c = 70;
+NOTICE:  Trigger: Got OLD row (2,70,1), but returning NULL
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 | 52 | 50
+ list_part1 | 3 |  6 | 60
+ sub_part2  | 1 |  2 | 10
+ sub_part2  | 1 |  2 | 70
+(4 rows)
+
+-- Drop the trigger. Now the row should be moved.
+DROP TRIGGER trig_skip_delete ON sub_part2;
+UPDATE list_parted set b = 1 WHERE c = 70;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 | 52 | 50
+ list_part1 | 3 |  6 | 60
+ sub_part1  | 1 |  1 | 70
+ sub_part2  | 1 |  2 | 10
+(4 rows)
+
+DROP FUNCTION func_parted_mod_b();
+-- UPDATE partition-key with FROM clause. If join produces multiple output
+-- rows for the same row to be modified, we should tuple-route the row only
+-- once. There should not be any rows inserted.
+CREATE TABLE non_parted (id int);
+INSERT into non_parted VALUES (1), (1), (1), (2), (2), (2), (3), (3), (3);
+UPDATE list_parted t1 set a = 2 FROM non_parted t2 WHERE t1.a = t2.id and a = 1;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+  tableoid  | a | b  | c  
+------------+---+----+----
+ list_part1 | 2 |  1 | 70
+ list_part1 | 2 |  2 | 10
+ list_part1 | 2 | 52 | 50
+ list_part1 | 3 |  6 | 60
+(4 rows)
+
+DROP TABLE non_parted;
+-- Cleanup: list_parted no longer needed.
+DROP TABLE list_parted;
+-- create custom operator class and hash function, for the same reason
+-- explained in alter_table.sql
+create or replace function dummy_hashint4(a int4, seed int8) returns int8 as
+$$ begin return (a + seed); end; $$ language 'plpgsql' immutable;
+create operator class custom_opclass for type int4 using hash as
+operator 1 = , function 2 dummy_hashint4(int4, int8);
+create table hash_parted (
+	a int,
 	b int
-) partition by range (a, b);
-create table part_a_1_a_10 partition of range_parted for values from ('a', 1) to ('a', 10);
-create table part_a_10_a_20 partition of range_parted for values from ('a', 10) to ('a', 20);
-create table part_b_1_b_10 partition of range_parted for values from ('b', 1) to ('b', 10);
-create table part_b_10_b_20 partition of range_parted for values from ('b', 10) to ('b', 20);
-insert into part_a_1_a_10 values ('a', 1);
-insert into part_b_10_b_20 values ('b', 10);
+) partition by hash (a custom_opclass, b custom_opclass);
+create table hpart1 partition of hash_parted for values with (modulus 2, remainder 1);
+create table hpart2 partition of hash_parted for values with (modulus 4, remainder 2);
+create table hpart3 partition of hash_parted for values with (modulus 8, remainder 0);
+create table hpart4 partition of hash_parted for values with (modulus 8, remainder 4);
+insert into hpart1 values (1, 1);
+insert into hpart2 values (2, 5);
+insert into hpart4 values (3, 4);
 -- fail
-update part_a_1_a_10 set a = 'b' where a = 'a';
-ERROR:  new row for relation "part_a_1_a_10" violates partition constraint
-DETAIL:  Failing row contains (b, 1).
-update range_parted set b = b - 1 where b = 10;
-ERROR:  new row for relation "part_b_10_b_20" violates partition constraint
-DETAIL:  Failing row contains (b, 9).
+update hpart1 set a = 3, b=4 where a = 1;
+ERROR:  new row for relation "hpart1" violates partition constraint
+DETAIL:  Failing row contains (3, 4).
+-- ok, row movement
+update hash_parted set b = b - 1 where b = 1;
 -- ok
-update range_parted set b = b + 1 where b = 10;
+update hash_parted set b = b + 8 where b = 1;
 -- cleanup
-drop table range_parted;
+drop table hash_parted;
+drop operator class custom_opclass using hash;
+drop function dummy_hashint4(a int4, seed int8);
diff --git a/src/test/regress/expected/vacuum.out b/src/test/regress/expected/vacuum.out
index 6f68663087..c440c7ea58 100644
--- a/src/test/regress/expected/vacuum.out
+++ b/src/test/regress/expected/vacuum.out
@@ -80,8 +80,6 @@ CONTEXT:  SQL function "do_analyze" statement 1
 SQL function "wrap_do_analyze" statement 1
 VACUUM FULL vactst;
 VACUUM (DISABLE_PAGE_SKIPPING) vaccluster;
-DROP TABLE vaccluster;
-DROP TABLE vactst;
 -- partitioned table
 CREATE TABLE vacparted (a int, b char) PARTITION BY LIST (a);
 CREATE TABLE vacparted1 PARTITION OF vacparted FOR VALUES IN (1);
@@ -90,4 +88,30 @@ UPDATE vacparted SET b = 'b';
 VACUUM (ANALYZE) vacparted;
 VACUUM (FULL) vacparted;
 VACUUM (FREEZE) vacparted;
+-- check behavior with duplicate column mentions
+VACUUM ANALYZE vacparted(a,b,a);
+ERROR:  column "a" of relation "vacparted" appears more than once
+ANALYZE vacparted(a,b,b);
+ERROR:  column "b" of relation "vacparted" appears more than once
+-- multiple tables specified
+VACUUM vaccluster, vactst;
+VACUUM vacparted, does_not_exist;
+ERROR:  relation "does_not_exist" does not exist
+VACUUM (FREEZE) vacparted, vaccluster, vactst;
+VACUUM (FREEZE) does_not_exist, vaccluster;
+ERROR:  relation "does_not_exist" does not exist
+VACUUM ANALYZE vactst, vacparted (a);
+VACUUM ANALYZE vactst (does_not_exist), vacparted (b);
+ERROR:  column "does_not_exist" of relation "vactst" does not exist
+VACUUM FULL vacparted, vactst;
+VACUUM FULL vactst, vacparted (a, b), vaccluster (i);
+ERROR:  ANALYZE option must be specified when a column list is provided
+ANALYZE vactst, vacparted;
+ANALYZE vacparted (b), vactst;
+ANALYZE vactst, does_not_exist, vacparted;
+ERROR:  relation "does_not_exist" does not exist
+ANALYZE vactst (i), vacparted (does_not_exist);
+ERROR:  column "does_not_exist" of relation "vacparted" does not exist
+DROP TABLE vaccluster;
+DROP TABLE vactst;
 DROP TABLE vacparted;
diff --git a/src/test/regress/expected/window.out b/src/test/regress/expected/window.out
index 19f909f3d1..85d81e7c9f 100644
--- a/src/test/regress/expected/window.out
+++ b/src/test/regress/expected/window.out
@@ -819,6 +819,176 @@ FROM tenk1 WHERE unique1 < 10;
   10 |       0 |    0
 (10 rows)
 
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+   7 |       4 |    0
+  13 |       2 |    2
+  22 |       1 |    1
+  26 |       6 |    2
+  29 |       9 |    1
+  31 |       8 |    0
+  32 |       5 |    1
+  23 |       3 |    3
+  15 |       7 |    3
+  10 |       0 |    0
+(10 rows)
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+   3 |       4 |    0
+  11 |       2 |    2
+  21 |       1 |    1
+  20 |       6 |    2
+  20 |       9 |    1
+  23 |       8 |    0
+  27 |       5 |    1
+  20 |       3 |    3
+   8 |       7 |    3
+  10 |       0 |    0
+(10 rows)
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       4 |    0
+     |       2 |    2
+     |       1 |    1
+     |       6 |    2
+     |       9 |    1
+     |       8 |    0
+     |       5 |    1
+     |       3 |    3
+     |       7 |    3
+     |       0 |    0
+(10 rows)
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+   4 |       4 |    0
+   2 |       2 |    2
+   1 |       1 |    1
+   6 |       6 |    2
+   9 |       9 |    1
+   8 |       8 |    0
+   5 |       5 |    1
+   3 |       3 |    3
+   7 |       7 |    3
+   0 |       0 |    0
+(10 rows)
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ first_value | unique1 | four 
+-------------+---------+------
+           8 |       0 |    0
+           4 |       8 |    0
+           5 |       4 |    0
+           9 |       5 |    1
+           1 |       9 |    1
+           6 |       1 |    1
+           2 |       6 |    2
+           3 |       2 |    2
+           7 |       3 |    3
+             |       7 |    3
+(10 rows)
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ first_value | unique1 | four 
+-------------+---------+------
+             |       0 |    0
+           5 |       8 |    0
+           5 |       4 |    0
+             |       5 |    1
+           6 |       9 |    1
+           6 |       1 |    1
+           3 |       6 |    2
+           3 |       2 |    2
+             |       3 |    3
+             |       7 |    3
+(10 rows)
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ first_value | unique1 | four 
+-------------+---------+------
+           0 |       0 |    0
+           8 |       8 |    0
+           4 |       4 |    0
+           5 |       5 |    1
+           9 |       9 |    1
+           1 |       1 |    1
+           6 |       6 |    2
+           2 |       2 |    2
+           3 |       3 |    3
+           7 |       7 |    3
+(10 rows)
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ last_value | unique1 | four 
+------------+---------+------
+          4 |       0 |    0
+          5 |       8 |    0
+          9 |       4 |    0
+          1 |       5 |    1
+          6 |       9 |    1
+          2 |       1 |    1
+          3 |       6 |    2
+          7 |       2 |    2
+          7 |       3 |    3
+            |       7 |    3
+(10 rows)
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ last_value | unique1 | four 
+------------+---------+------
+            |       0 |    0
+          5 |       8 |    0
+          9 |       4 |    0
+            |       5 |    1
+          6 |       9 |    1
+          2 |       1 |    1
+          3 |       6 |    2
+          7 |       2 |    2
+            |       3 |    3
+            |       7 |    3
+(10 rows)
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ last_value | unique1 | four 
+------------+---------+------
+          0 |       0 |    0
+          5 |       8 |    0
+          9 |       4 |    0
+          5 |       5 |    1
+          6 |       9 |    1
+          2 |       1 |    1
+          3 |       6 |    2
+          7 |       2 |    2
+          3 |       3 |    3
+          7 |       7 |    3
+(10 rows)
+
 SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
@@ -887,13 +1057,57 @@ FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
   10 |       7 |    3
 (10 rows)
 
--- fail: not implemented yet
-SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude current row),
 	unique1, four
-FROM tenk1 WHERE unique1 < 10;
-ERROR:  RANGE PRECEDING is only supported with UNBOUNDED
-LINE 1: SELECT sum(unique1) over (order by four range between 2::int...
-                                                ^
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
+ sum | unique1 | four 
+-----+---------+------
+  12 |       0 |    0
+   4 |       8 |    0
+   8 |       4 |    0
+  22 |       5 |    1
+  18 |       9 |    1
+  26 |       1 |    1
+  29 |       6 |    2
+  33 |       2 |    2
+  42 |       3 |    3
+  38 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  35 |       3 |    3
+  35 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
+ sum | unique1 | four 
+-----+---------+------
+   0 |       0 |    0
+   8 |       8 |    0
+   4 |       4 |    0
+  17 |       5 |    1
+  21 |       9 |    1
+  13 |       1 |    1
+  33 |       6 |    2
+  29 |       2 |    2
+  38 |       3 |    3
+  42 |       7 |    3
+(10 rows)
+
 SELECT first_value(unique1) over w,
 	nth_value(unique1, 2) over w AS nth_2,
 	last_value(unique1) over w, unique1, four
@@ -958,6 +1172,1662 @@ SELECT pg_get_viewdef('v_window');
     FROM generate_series(1, 10) i(i);
 (1 row)
 
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude current row) as sum_rows FROM generate_series(1, 10) i;
+SELECT * FROM v_window;
+ i  | sum_rows 
+----+----------
+  1 |        2
+  2 |        4
+  3 |        6
+  4 |        8
+  5 |       10
+  6 |       12
+  7 |       14
+  8 |       16
+  9 |       18
+ 10 |        9
+(10 rows)
+
+SELECT pg_get_viewdef('v_window');
+                                              pg_get_viewdef                                               
+-----------------------------------------------------------------------------------------------------------
+  SELECT i.i,                                                                                             +
+     sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE CURRENT ROW) AS sum_rows+
+    FROM generate_series(1, 10) i(i);
+(1 row)
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude group) as sum_rows FROM generate_series(1, 10) i;
+SELECT * FROM v_window;
+ i  | sum_rows 
+----+----------
+  1 |        2
+  2 |        4
+  3 |        6
+  4 |        8
+  5 |       10
+  6 |       12
+  7 |       14
+  8 |       16
+  9 |       18
+ 10 |        9
+(10 rows)
+
+SELECT pg_get_viewdef('v_window');
+                                           pg_get_viewdef                                            
+-----------------------------------------------------------------------------------------------------
+  SELECT i.i,                                                                                       +
+     sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE GROUP) AS sum_rows+
+    FROM generate_series(1, 10) i(i);
+(1 row)
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude ties) as sum_rows FROM generate_series(1, 10) i;
+SELECT * FROM v_window;
+ i  | sum_rows 
+----+----------
+  1 |        3
+  2 |        6
+  3 |        9
+  4 |       12
+  5 |       15
+  6 |       18
+  7 |       21
+  8 |       24
+  9 |       27
+ 10 |       19
+(10 rows)
+
+SELECT pg_get_viewdef('v_window');
+                                           pg_get_viewdef                                           
+----------------------------------------------------------------------------------------------------
+  SELECT i.i,                                                                                      +
+     sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING EXCLUDE TIES) AS sum_rows+
+    FROM generate_series(1, 10) i(i);
+(1 row)
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude no others) as sum_rows FROM generate_series(1, 10) i;
+SELECT * FROM v_window;
+ i  | sum_rows 
+----+----------
+  1 |        3
+  2 |        6
+  3 |        9
+  4 |       12
+  5 |       15
+  6 |       18
+  7 |       21
+  8 |       24
+  9 |       27
+ 10 |       19
+(10 rows)
+
+SELECT pg_get_viewdef('v_window');
+                                    pg_get_viewdef                                     
+---------------------------------------------------------------------------------------
+  SELECT i.i,                                                                         +
+     sum(i.i) OVER (ORDER BY i.i ROWS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+
+    FROM generate_series(1, 10) i(i);
+(1 row)
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i groups between 1 preceding and 1 following) as sum_rows FROM generate_series(1, 10) i;
+SELECT * FROM v_window;
+ i  | sum_rows 
+----+----------
+  1 |        3
+  2 |        6
+  3 |        9
+  4 |       12
+  5 |       15
+  6 |       18
+  7 |       21
+  8 |       24
+  9 |       27
+ 10 |       19
+(10 rows)
+
+SELECT pg_get_viewdef('v_window');
+                                     pg_get_viewdef                                      
+-----------------------------------------------------------------------------------------
+  SELECT i.i,                                                                           +
+     sum(i.i) OVER (ORDER BY i.i GROUPS BETWEEN 1 PRECEDING AND 1 FOLLOWING) AS sum_rows+
+    FROM generate_series(1, 10) i(i);
+(1 row)
+
+DROP VIEW v_window;
+CREATE TEMP VIEW v_window AS
+	SELECT i, min(i) over (order by i range between '1 day' preceding and '10 days' following) as min_i
+  FROM generate_series(now(), now()+'100 days'::interval, '1 hour') i;
+SELECT pg_get_viewdef('v_window');
+                                                      pg_get_viewdef                                                       
+---------------------------------------------------------------------------------------------------------------------------
+  SELECT i.i,                                                                                                             +
+     min(i.i) OVER (ORDER BY i.i RANGE BETWEEN '@ 1 day'::interval PRECEDING AND '@ 10 days'::interval FOLLOWING) AS min_i+
+    FROM generate_series(now(), (now() + '@ 100 days'::interval), '@ 1 hour'::interval) i(i);
+(1 row)
+
+-- RANGE offset PRECEDING/FOLLOWING tests
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four desc range between 2::int8 preceding and 1::int2 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       3 |    3
+     |       7 |    3
+  10 |       6 |    2
+  10 |       2 |    2
+  18 |       9 |    1
+  18 |       5 |    1
+  18 |       1 |    1
+  23 |       0 |    0
+  23 |       8 |    0
+  23 |       4 |    0
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude no others),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::int2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  33 |       0 |    0
+  41 |       8 |    0
+  37 |       4 |    0
+  35 |       5 |    1
+  39 |       9 |    1
+  31 |       1 |    1
+  43 |       6 |    2
+  39 |       2 |    2
+  26 |       3 |    3
+  30 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::int2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  33 |       0 |    0
+  33 |       8 |    0
+  33 |       4 |    0
+  30 |       5 |    1
+  30 |       9 |    1
+  30 |       1 |    1
+  37 |       6 |    2
+  37 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (partition by four order by unique1 range between 5::int8 preceding and 6::int2 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+   4 |       0 |    0
+  12 |       4 |    0
+  12 |       8 |    0
+   6 |       1 |    1
+  15 |       5 |    1
+  14 |       9 |    1
+   8 |       2 |    2
+   8 |       6 |    2
+  10 |       3 |    3
+  10 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (partition by four order by unique1 range between 5::int8 preceding and 6::int2 following
+	exclude current row),unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+   4 |       0 |    0
+   8 |       4 |    0
+   4 |       8 |    0
+   5 |       1 |    1
+  10 |       5 |    1
+   5 |       9 |    1
+   6 |       2 |    2
+   2 |       6 |    2
+   7 |       3 |    3
+   3 |       7 |    3
+(10 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+ 38400 |   3900 | 12-23-2006
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   5200 | 08-15-2007
+ 36100 |   3500 | 12-10-2007
+ 32200 |   4500 | 01-01-2008
+ 32200 |   4200 | 01-01-2008
+(10 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 32200 |   4200 | 01-01-2008
+ 32200 |   4500 | 01-01-2008
+ 36100 |   3500 | 12-10-2007
+ 47100 |   5200 | 08-15-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   4800 | 08-01-2007
+ 47100 |   5200 | 08-01-2007
+ 38400 |   3900 | 12-23-2006
+ 34900 |   5000 | 10-01-2006
+ 34900 |   6000 | 10-01-2006
+(10 rows)
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+ sum | salary | enroll_date 
+-----+--------+-------------
+     |   4200 | 01-01-2008
+     |   4500 | 01-01-2008
+     |   3500 | 12-10-2007
+     |   5200 | 08-15-2007
+     |   4800 | 08-08-2007
+     |   4800 | 08-01-2007
+     |   5200 | 08-01-2007
+     |   3900 | 12-23-2006
+     |   5000 | 10-01-2006
+     |   6000 | 10-01-2006
+(10 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 29900 |   5000 | 10-01-2006
+ 28900 |   6000 | 10-01-2006
+ 34500 |   3900 | 12-23-2006
+ 42300 |   4800 | 08-01-2007
+ 41900 |   5200 | 08-01-2007
+ 42300 |   4800 | 08-08-2007
+ 41900 |   5200 | 08-15-2007
+ 32600 |   3500 | 12-10-2007
+ 27700 |   4500 | 01-01-2008
+ 28000 |   4200 | 01-01-2008
+(10 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude group), salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 23900 |   5000 | 10-01-2006
+ 23900 |   6000 | 10-01-2006
+ 34500 |   3900 | 12-23-2006
+ 37100 |   4800 | 08-01-2007
+ 37100 |   5200 | 08-01-2007
+ 42300 |   4800 | 08-08-2007
+ 41900 |   5200 | 08-15-2007
+ 32600 |   3500 | 12-10-2007
+ 23500 |   4500 | 01-01-2008
+ 23500 |   4200 | 01-01-2008
+(10 rows)
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+  sum  | salary | enroll_date 
+-------+--------+-------------
+ 28900 |   5000 | 10-01-2006
+ 29900 |   6000 | 10-01-2006
+ 38400 |   3900 | 12-23-2006
+ 41900 |   4800 | 08-01-2007
+ 42300 |   5200 | 08-01-2007
+ 47100 |   4800 | 08-08-2007
+ 47100 |   5200 | 08-15-2007
+ 36100 |   3500 | 12-10-2007
+ 28000 |   4500 | 01-01-2008
+ 27700 |   4200 | 01-01-2008
+(10 rows)
+
+select first_value(salary) over(order by salary range between 1000 preceding and 1000 following),
+	lead(salary) over(order by salary range between 1000 preceding and 1000 following),
+	nth_value(salary, 1) over(order by salary range between 1000 preceding and 1000 following),
+	salary from empsalary;
+ first_value | lead | nth_value | salary 
+-------------+------+-----------+--------
+        3500 | 3900 |      3500 |   3500
+        3500 | 4200 |      3500 |   3900
+        3500 | 4500 |      3500 |   4200
+        3500 | 4800 |      3500 |   4500
+        3900 | 4800 |      3900 |   4800
+        3900 | 5000 |      3900 |   4800
+        4200 | 5200 |      4200 |   5000
+        4200 | 5200 |      4200 |   5200
+        4200 | 6000 |      4200 |   5200
+        5000 |      |      5000 |   6000
+(10 rows)
+
+select last_value(salary) over(order by salary range between 1000 preceding and 1000 following),
+	lag(salary) over(order by salary range between 1000 preceding and 1000 following),
+	salary from empsalary;
+ last_value | lag  | salary 
+------------+------+--------
+       4500 |      |   3500
+       4800 | 3500 |   3900
+       5200 | 3900 |   4200
+       5200 | 4200 |   4500
+       5200 | 4500 |   4800
+       5200 | 4800 |   4800
+       6000 | 4800 |   5000
+       6000 | 5000 |   5200
+       6000 | 5200 |   5200
+       6000 | 5200 |   6000
+(10 rows)
+
+select first_value(salary) over(order by salary range between 1000 following and 3000 following
+	exclude current row),
+	lead(salary) over(order by salary range between 1000 following and 3000 following exclude ties),
+	nth_value(salary, 1) over(order by salary range between 1000 following and 3000 following
+	exclude ties),
+	salary from empsalary;
+ first_value | lead | nth_value | salary 
+-------------+------+-----------+--------
+        4500 | 3900 |      4500 |   3500
+        5000 | 4200 |      5000 |   3900
+        5200 | 4500 |      5200 |   4200
+        6000 | 4800 |      6000 |   4500
+        6000 | 4800 |      6000 |   4800
+        6000 | 5000 |      6000 |   4800
+        6000 | 5200 |      6000 |   5000
+             | 5200 |           |   5200
+             | 6000 |           |   5200
+             |      |           |   6000
+(10 rows)
+
+select last_value(salary) over(order by salary range between 1000 following and 3000 following
+	exclude group),
+	lag(salary) over(order by salary range between 1000 following and 3000 following exclude group),
+	salary from empsalary;
+ last_value | lag  | salary 
+------------+------+--------
+       6000 |      |   3500
+       6000 | 3500 |   3900
+       6000 | 3900 |   4200
+       6000 | 4200 |   4500
+       6000 | 4500 |   4800
+       6000 | 4800 |   4800
+       6000 | 4800 |   5000
+            | 5000 |   5200
+            | 5200 |   5200
+            | 5200 |   6000
+(10 rows)
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+ first_value | last_value | salary | enroll_date 
+-------------+------------+--------+-------------
+        5000 |       5200 |   5000 | 10-01-2006
+        6000 |       5200 |   6000 | 10-01-2006
+        5000 |       3500 |   3900 | 12-23-2006
+        5000 |       4200 |   4800 | 08-01-2007
+        5000 |       4200 |   5200 | 08-01-2007
+        5000 |       4200 |   4800 | 08-08-2007
+        5000 |       4200 |   5200 | 08-15-2007
+        5000 |       4200 |   3500 | 12-10-2007
+        5000 |       4200 |   4500 | 01-01-2008
+        5000 |       4200 |   4200 | 01-01-2008
+(10 rows)
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	salary, enroll_date from empsalary;
+ first_value | last_value | salary | enroll_date 
+-------------+------------+--------+-------------
+        5000 |       5200 |   5000 | 10-01-2006
+        6000 |       5200 |   6000 | 10-01-2006
+        5000 |       3500 |   3900 | 12-23-2006
+        5000 |       4200 |   4800 | 08-01-2007
+        5000 |       4200 |   5200 | 08-01-2007
+        5000 |       4200 |   4800 | 08-08-2007
+        5000 |       4200 |   5200 | 08-15-2007
+        5000 |       4200 |   3500 | 12-10-2007
+        5000 |       4500 |   4500 | 01-01-2008
+        5000 |       4200 |   4200 | 01-01-2008
+(10 rows)
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude group),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude group),
+	salary, enroll_date from empsalary;
+ first_value | last_value | salary | enroll_date 
+-------------+------------+--------+-------------
+        3900 |       5200 |   5000 | 10-01-2006
+        3900 |       5200 |   6000 | 10-01-2006
+        5000 |       3500 |   3900 | 12-23-2006
+        5000 |       4200 |   4800 | 08-01-2007
+        5000 |       4200 |   5200 | 08-01-2007
+        5000 |       4200 |   4800 | 08-08-2007
+        5000 |       4200 |   5200 | 08-15-2007
+        5000 |       4200 |   3500 | 12-10-2007
+        5000 |       3500 |   4500 | 01-01-2008
+        5000 |       3500 |   4200 | 01-01-2008
+(10 rows)
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude current row),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude current row),
+	salary, enroll_date from empsalary;
+ first_value | last_value | salary | enroll_date 
+-------------+------------+--------+-------------
+        6000 |       5200 |   5000 | 10-01-2006
+        5000 |       5200 |   6000 | 10-01-2006
+        5000 |       3500 |   3900 | 12-23-2006
+        5000 |       4200 |   4800 | 08-01-2007
+        5000 |       4200 |   5200 | 08-01-2007
+        5000 |       4200 |   4800 | 08-08-2007
+        5000 |       4200 |   5200 | 08-15-2007
+        5000 |       4200 |   3500 | 12-10-2007
+        5000 |       4200 |   4500 | 01-01-2008
+        5000 |       4500 |   4200 | 01-01-2008
+(10 rows)
+
+-- RANGE offset PRECEDING/FOLLOWING with null values
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x asc nulls first range between 2 preceding and 2 following);
+ x | y  | first_value | last_value 
+---+----+-------------+------------
+   | 42 |          42 |         43
+   | 43 |          42 |         43
+ 1 |  1 |           1 |          3
+ 2 |  2 |           1 |          4
+ 3 |  3 |           1 |          5
+ 4 |  4 |           2 |          5
+ 5 |  5 |           3 |          5
+(7 rows)
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x asc nulls last range between 2 preceding and 2 following);
+ x | y  | first_value | last_value 
+---+----+-------------+------------
+ 1 |  1 |           1 |          3
+ 2 |  2 |           1 |          4
+ 3 |  3 |           1 |          5
+ 4 |  4 |           2 |          5
+ 5 |  5 |           3 |          5
+   | 42 |          42 |         43
+   | 43 |          42 |         43
+(7 rows)
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x desc nulls first range between 2 preceding and 2 following);
+ x | y  | first_value | last_value 
+---+----+-------------+------------
+   | 43 |          43 |         42
+   | 42 |          43 |         42
+ 5 |  5 |           5 |          3
+ 4 |  4 |           5 |          2
+ 3 |  3 |           5 |          1
+ 2 |  2 |           4 |          1
+ 1 |  1 |           3 |          1
+(7 rows)
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x desc nulls last range between 2 preceding and 2 following);
+ x | y  | first_value | last_value 
+---+----+-------------+------------
+ 5 |  5 |           5 |          3
+ 4 |  4 |           5 |          2
+ 3 |  3 |           5 |          1
+ 2 |  2 |           4 |          1
+ 1 |  1 |           3 |          1
+   | 42 |          42 |         43
+   | 43 |          42 |         43
+(7 rows)
+
+-- Check overflow behavior for various integer sizes
+select x, last_value(x) over (order by x::smallint range between current row and 2147450884 following)
+from generate_series(32764, 32766) x;
+   x   | last_value 
+-------+------------
+ 32764 |      32766
+ 32765 |      32766
+ 32766 |      32766
+(3 rows)
+
+select x, last_value(x) over (order by x::smallint desc range between current row and 2147450885 following)
+from generate_series(-32766, -32764) x;
+   x    | last_value 
+--------+------------
+ -32764 |     -32766
+ -32765 |     -32766
+ -32766 |     -32766
+(3 rows)
+
+select x, last_value(x) over (order by x range between current row and 4 following)
+from generate_series(2147483644, 2147483646) x;
+     x      | last_value 
+------------+------------
+ 2147483644 | 2147483646
+ 2147483645 | 2147483646
+ 2147483646 | 2147483646
+(3 rows)
+
+select x, last_value(x) over (order by x desc range between current row and 5 following)
+from generate_series(-2147483646, -2147483644) x;
+      x      | last_value  
+-------------+-------------
+ -2147483644 | -2147483646
+ -2147483645 | -2147483646
+ -2147483646 | -2147483646
+(3 rows)
+
+select x, last_value(x) over (order by x range between current row and 4 following)
+from generate_series(9223372036854775804, 9223372036854775806) x;
+          x          |     last_value      
+---------------------+---------------------
+ 9223372036854775804 | 9223372036854775806
+ 9223372036854775805 | 9223372036854775806
+ 9223372036854775806 | 9223372036854775806
+(3 rows)
+
+select x, last_value(x) over (order by x desc range between current row and 5 following)
+from generate_series(-9223372036854775806, -9223372036854775804) x;
+          x           |      last_value      
+----------------------+----------------------
+ -9223372036854775804 | -9223372036854775806
+ -9223372036854775805 | -9223372036854775806
+ -9223372036854775806 | -9223372036854775806
+(3 rows)
+
+-- Test in_range for other numeric datatypes
+create temp table numerics(
+    id int,
+    f_float4 float4,
+    f_float8 float8,
+    f_numeric numeric
+);
+insert into numerics values
+(0, '-infinity', '-infinity', '-1000'),  -- numeric type lacks infinities
+(1, -3, -3, -3),
+(2, -1, -1, -1),
+(3, 0, 0, 0),
+(4, 1.1, 1.1, 1.1),
+(5, 1.12, 1.12, 1.12),
+(6, 2, 2, 2),
+(7, 100, 100, 100),
+(8, 'infinity', 'infinity', '1000'),
+(9, 'NaN', 'NaN', 'NaN');
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1 preceding and 1 following);
+ id | f_float4  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          3
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |  Infinity |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1 preceding and 1.1::float4 following);
+ id | f_float4  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          4
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |  Infinity |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             'inf' preceding and 'inf' following);
+ id | f_float4  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          8
+  1 |        -3 |           0 |          8
+  2 |        -1 |           0 |          8
+  3 |         0 |           0 |          8
+  4 |       1.1 |           0 |          8
+  5 |      1.12 |           0 |          8
+  6 |         2 |           0 |          8
+  7 |       100 |           0 |          8
+  8 |  Infinity |           0 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+ERROR:  invalid preceding or following size in window function
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1 preceding and 1 following);
+ id | f_float8  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          3
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |  Infinity |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1 preceding and 1.1::float8 following);
+ id | f_float8  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          4
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |  Infinity |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             'inf' preceding and 'inf' following);
+ id | f_float8  | first_value | last_value 
+----+-----------+-------------+------------
+  0 | -Infinity |           0 |          8
+  1 |        -3 |           0 |          8
+  2 |        -1 |           0 |          8
+  3 |         0 |           0 |          8
+  4 |       1.1 |           0 |          8
+  5 |      1.12 |           0 |          8
+  6 |         2 |           0 |          8
+  7 |       100 |           0 |          8
+  8 |  Infinity |           0 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+ERROR:  invalid preceding or following size in window function
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1 following);
+ id | f_numeric | first_value | last_value 
+----+-----------+-------------+------------
+  0 |     -1000 |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          3
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |      1000 |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1.1::numeric following);
+ id | f_numeric | first_value | last_value 
+----+-----------+-------------+------------
+  0 |     -1000 |           0 |          0
+  1 |        -3 |           1 |          1
+  2 |        -1 |           2 |          3
+  3 |         0 |           2 |          4
+  4 |       1.1 |           4 |          6
+  5 |      1.12 |           4 |          6
+  6 |         2 |           4 |          6
+  7 |       100 |           7 |          7
+  8 |      1000 |           8 |          8
+  9 |       NaN |           9 |          9
+(10 rows)
+
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1.1::float8 following);  -- currently unsupported
+ERROR:  RANGE with offset PRECEDING/FOLLOWING is not supported for column type numeric and offset type double precision
+LINE 4:              1 preceding and 1.1::float8 following);
+                                     ^
+HINT:  Cast the offset value to an appropriate type.
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+ERROR:  invalid preceding or following size in window function
+-- Test in_range for other datetime datatypes
+create temp table datetimes(
+    id int,
+    f_time time,
+    f_timetz timetz,
+    f_interval interval,
+    f_timestamptz timestamptz,
+    f_timestamp timestamp
+);
+insert into datetimes values
+(1, '11:00', '11:00 BST', '1 year', '2000-10-19 10:23:54+01', '2000-10-19 10:23:54'),
+(2, '12:00', '12:00 BST', '2 years', '2001-10-19 10:23:54+01', '2001-10-19 10:23:54'),
+(3, '13:00', '13:00 BST', '3 years', '2001-10-19 10:23:54+01', '2001-10-19 10:23:54'),
+(4, '14:00', '14:00 BST', '4 years', '2002-10-19 10:23:54+01', '2002-10-19 10:23:54'),
+(5, '15:00', '15:00 BST', '5 years', '2003-10-19 10:23:54+01', '2003-10-19 10:23:54'),
+(6, '15:00', '15:00 BST', '5 years', '2004-10-19 10:23:54+01', '2004-10-19 10:23:54'),
+(7, '17:00', '17:00 BST', '7 years', '2005-10-19 10:23:54+01', '2005-10-19 10:23:54'),
+(8, '18:00', '18:00 BST', '8 years', '2006-10-19 10:23:54+01', '2006-10-19 10:23:54'),
+(9, '19:00', '19:00 BST', '9 years', '2007-10-19 10:23:54+01', '2007-10-19 10:23:54'),
+(10, '20:00', '20:00 BST', '10 years', '2008-10-19 10:23:54+01', '2008-10-19 10:23:54');
+select id, f_time, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_time range between
+             '70 min'::interval preceding and '2 hours'::interval following);
+ id |  f_time  | first_value | last_value 
+----+----------+-------------+------------
+  1 | 11:00:00 |           1 |          3
+  2 | 12:00:00 |           1 |          4
+  3 | 13:00:00 |           2 |          6
+  4 | 14:00:00 |           3 |          6
+  5 | 15:00:00 |           4 |          7
+  6 | 15:00:00 |           4 |          7
+  7 | 17:00:00 |           7 |          9
+  8 | 18:00:00 |           7 |         10
+  9 | 19:00:00 |           8 |         10
+ 10 | 20:00:00 |           9 |         10
+(10 rows)
+
+select id, f_time, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_time desc range between
+             '70 min' preceding and '2 hours' following);
+ id |  f_time  | first_value | last_value 
+----+----------+-------------+------------
+ 10 | 20:00:00 |          10 |          8
+  9 | 19:00:00 |          10 |          7
+  8 | 18:00:00 |           9 |          7
+  7 | 17:00:00 |           8 |          5
+  6 | 15:00:00 |           6 |          3
+  5 | 15:00:00 |           6 |          3
+  4 | 14:00:00 |           6 |          2
+  3 | 13:00:00 |           4 |          1
+  2 | 12:00:00 |           3 |          1
+  1 | 11:00:00 |           2 |          1
+(10 rows)
+
+select id, f_timetz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timetz range between
+             '70 min'::interval preceding and '2 hours'::interval following);
+ id |  f_timetz   | first_value | last_value 
+----+-------------+-------------+------------
+  1 | 11:00:00+01 |           1 |          3
+  2 | 12:00:00+01 |           1 |          4
+  3 | 13:00:00+01 |           2 |          6
+  4 | 14:00:00+01 |           3 |          6
+  5 | 15:00:00+01 |           4 |          7
+  6 | 15:00:00+01 |           4 |          7
+  7 | 17:00:00+01 |           7 |          9
+  8 | 18:00:00+01 |           7 |         10
+  9 | 19:00:00+01 |           8 |         10
+ 10 | 20:00:00+01 |           9 |         10
+(10 rows)
+
+select id, f_timetz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timetz desc range between
+             '70 min' preceding and '2 hours' following);
+ id |  f_timetz   | first_value | last_value 
+----+-------------+-------------+------------
+ 10 | 20:00:00+01 |          10 |          8
+  9 | 19:00:00+01 |          10 |          7
+  8 | 18:00:00+01 |           9 |          7
+  7 | 17:00:00+01 |           8 |          5
+  6 | 15:00:00+01 |           6 |          3
+  5 | 15:00:00+01 |           6 |          3
+  4 | 14:00:00+01 |           6 |          2
+  3 | 13:00:00+01 |           4 |          1
+  2 | 12:00:00+01 |           3 |          1
+  1 | 11:00:00+01 |           2 |          1
+(10 rows)
+
+select id, f_interval, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_interval range between
+             '1 year'::interval preceding and '1 year'::interval following);
+ id | f_interval | first_value | last_value 
+----+------------+-------------+------------
+  1 | @ 1 year   |           1 |          2
+  2 | @ 2 years  |           1 |          3
+  3 | @ 3 years  |           2 |          4
+  4 | @ 4 years  |           3 |          6
+  5 | @ 5 years  |           4 |          6
+  6 | @ 5 years  |           4 |          6
+  7 | @ 7 years  |           7 |          8
+  8 | @ 8 years  |           7 |          9
+  9 | @ 9 years  |           8 |         10
+ 10 | @ 10 years |           9 |         10
+(10 rows)
+
+select id, f_interval, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_interval desc range between
+             '1 year' preceding and '1 year' following);
+ id | f_interval | first_value | last_value 
+----+------------+-------------+------------
+ 10 | @ 10 years |          10 |          9
+  9 | @ 9 years  |          10 |          8
+  8 | @ 8 years  |           9 |          7
+  7 | @ 7 years  |           8 |          7
+  6 | @ 5 years  |           6 |          4
+  5 | @ 5 years  |           6 |          4
+  4 | @ 4 years  |           6 |          3
+  3 | @ 3 years  |           4 |          2
+  2 | @ 2 years  |           3 |          1
+  1 | @ 1 year   |           2 |          1
+(10 rows)
+
+select id, f_timestamptz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamptz range between
+             '1 year'::interval preceding and '1 year'::interval following);
+ id |        f_timestamptz         | first_value | last_value 
+----+------------------------------+-------------+------------
+  1 | Thu Oct 19 02:23:54 2000 PDT |           1 |          3
+  2 | Fri Oct 19 02:23:54 2001 PDT |           1 |          4
+  3 | Fri Oct 19 02:23:54 2001 PDT |           1 |          4
+  4 | Sat Oct 19 02:23:54 2002 PDT |           2 |          5
+  5 | Sun Oct 19 02:23:54 2003 PDT |           4 |          6
+  6 | Tue Oct 19 02:23:54 2004 PDT |           5 |          7
+  7 | Wed Oct 19 02:23:54 2005 PDT |           6 |          8
+  8 | Thu Oct 19 02:23:54 2006 PDT |           7 |          9
+  9 | Fri Oct 19 02:23:54 2007 PDT |           8 |         10
+ 10 | Sun Oct 19 02:23:54 2008 PDT |           9 |         10
+(10 rows)
+
+select id, f_timestamptz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamptz desc range between
+             '1 year' preceding and '1 year' following);
+ id |        f_timestamptz         | first_value | last_value 
+----+------------------------------+-------------+------------
+ 10 | Sun Oct 19 02:23:54 2008 PDT |          10 |          9
+  9 | Fri Oct 19 02:23:54 2007 PDT |          10 |          8
+  8 | Thu Oct 19 02:23:54 2006 PDT |           9 |          7
+  7 | Wed Oct 19 02:23:54 2005 PDT |           8 |          6
+  6 | Tue Oct 19 02:23:54 2004 PDT |           7 |          5
+  5 | Sun Oct 19 02:23:54 2003 PDT |           6 |          4
+  4 | Sat Oct 19 02:23:54 2002 PDT |           5 |          2
+  3 | Fri Oct 19 02:23:54 2001 PDT |           4 |          1
+  2 | Fri Oct 19 02:23:54 2001 PDT |           4 |          1
+  1 | Thu Oct 19 02:23:54 2000 PDT |           3 |          1
+(10 rows)
+
+select id, f_timestamp, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamp range between
+             '1 year'::interval preceding and '1 year'::interval following);
+ id |       f_timestamp        | first_value | last_value 
+----+--------------------------+-------------+------------
+  1 | Thu Oct 19 10:23:54 2000 |           1 |          3
+  2 | Fri Oct 19 10:23:54 2001 |           1 |          4
+  3 | Fri Oct 19 10:23:54 2001 |           1 |          4
+  4 | Sat Oct 19 10:23:54 2002 |           2 |          5
+  5 | Sun Oct 19 10:23:54 2003 |           4 |          6
+  6 | Tue Oct 19 10:23:54 2004 |           5 |          7
+  7 | Wed Oct 19 10:23:54 2005 |           6 |          8
+  8 | Thu Oct 19 10:23:54 2006 |           7 |          9
+  9 | Fri Oct 19 10:23:54 2007 |           8 |         10
+ 10 | Sun Oct 19 10:23:54 2008 |           9 |         10
+(10 rows)
+
+select id, f_timestamp, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamp desc range between
+             '1 year' preceding and '1 year' following);
+ id |       f_timestamp        | first_value | last_value 
+----+--------------------------+-------------+------------
+ 10 | Sun Oct 19 10:23:54 2008 |          10 |          9
+  9 | Fri Oct 19 10:23:54 2007 |          10 |          8
+  8 | Thu Oct 19 10:23:54 2006 |           9 |          7
+  7 | Wed Oct 19 10:23:54 2005 |           8 |          6
+  6 | Tue Oct 19 10:23:54 2004 |           7 |          5
+  5 | Sun Oct 19 10:23:54 2003 |           6 |          4
+  4 | Sat Oct 19 10:23:54 2002 |           5 |          2
+  3 | Fri Oct 19 10:23:54 2001 |           4 |          1
+  2 | Fri Oct 19 10:23:54 2001 |           4 |          1
+  1 | Thu Oct 19 10:23:54 2000 |           3 |          1
+(10 rows)
+
+-- RANGE offset PRECEDING/FOLLOWING error cases
+select sum(salary) over (order by enroll_date, salary range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  RANGE with offset PRECEDING/FOLLOWING requires exactly one ORDER BY column
+LINE 1: select sum(salary) over (order by enroll_date, salary range ...
+                                ^
+select sum(salary) over (range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  RANGE with offset PRECEDING/FOLLOWING requires exactly one ORDER BY column
+LINE 1: select sum(salary) over (range between '1 year'::interval pr...
+                                ^
+select sum(salary) over (order by depname range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  RANGE with offset PRECEDING/FOLLOWING is not supported for column type text
+LINE 1: ... sum(salary) over (order by depname range between '1 year'::...
+                                                             ^
+select max(enroll_date) over (order by enroll_date range between 1 preceding and 2 following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  RANGE with offset PRECEDING/FOLLOWING is not supported for column type date and offset type integer
+LINE 1: ...ll_date) over (order by enroll_date range between 1 precedin...
+                                                             ^
+HINT:  Cast the offset value to an appropriate type.
+select max(enroll_date) over (order by salary range between -1 preceding and 2 following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  invalid preceding or following size in window function
+select max(enroll_date) over (order by salary range between 1 preceding and -2 following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  invalid preceding or following size in window function
+select max(enroll_date) over (order by salary range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  RANGE with offset PRECEDING/FOLLOWING is not supported for column type integer and offset type interval
+LINE 1: ...(enroll_date) over (order by salary range between '1 year'::...
+                                                             ^
+HINT:  Cast the offset value to an appropriate type.
+select max(enroll_date) over (order by enroll_date range between '1 year'::interval preceding and '-2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+ERROR:  invalid preceding or following size in window function
+-- GROUPS tests
+SELECT sum(unique1) over (order by four groups between unbounded preceding and current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  12 |       0 |    0
+  12 |       8 |    0
+  12 |       4 |    0
+  27 |       5 |    1
+  27 |       9 |    1
+  27 |       1 |    1
+  35 |       6 |    2
+  35 |       2 |    2
+  45 |       3 |    3
+  45 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between unbounded preceding and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  45 |       0 |    0
+  45 |       8 |    0
+  45 |       4 |    0
+  45 |       5 |    1
+  45 |       9 |    1
+  45 |       1 |    1
+  45 |       6 |    2
+  45 |       2 |    2
+  45 |       3 |    3
+  45 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between current row and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  45 |       0 |    0
+  45 |       8 |    0
+  45 |       4 |    0
+  33 |       5 |    1
+  33 |       9 |    1
+  33 |       1 |    1
+  18 |       6 |    2
+  18 |       2 |    2
+  10 |       3 |    3
+  10 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 1 preceding and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  45 |       0 |    0
+  45 |       8 |    0
+  45 |       4 |    0
+  45 |       5 |    1
+  45 |       9 |    1
+  45 |       1 |    1
+  33 |       6 |    2
+  33 |       2 |    2
+  18 |       3 |    3
+  18 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 1 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  33 |       0 |    0
+  33 |       8 |    0
+  33 |       4 |    0
+  18 |       5 |    1
+  18 |       9 |    1
+  18 |       1 |    1
+  10 |       6 |    2
+  10 |       2 |    2
+     |       3 |    3
+     |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between unbounded preceding and 2 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  35 |       0 |    0
+  35 |       8 |    0
+  35 |       4 |    0
+  45 |       5 |    1
+  45 |       9 |    1
+  45 |       1 |    1
+  45 |       6 |    2
+  45 |       2 |    2
+  45 |       3 |    3
+  45 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+     |       0 |    0
+     |       8 |    0
+     |       4 |    0
+  12 |       5 |    1
+  12 |       9 |    1
+  12 |       1 |    1
+  27 |       6 |    2
+  27 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  27 |       0 |    0
+  27 |       8 |    0
+  27 |       4 |    0
+  35 |       5 |    1
+  35 |       9 |    1
+  35 |       1 |    1
+  45 |       6 |    2
+  45 |       2 |    2
+  33 |       3 |    3
+  33 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 0 preceding and 0 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  12 |       0 |    0
+  12 |       8 |    0
+  12 |       4 |    0
+  15 |       5 |    1
+  15 |       9 |    1
+  15 |       1 |    1
+   8 |       6 |    2
+   8 |       2 |    2
+  10 |       3 |    3
+  10 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude current row), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  27 |       0 |    0
+  19 |       8 |    0
+  23 |       4 |    0
+  30 |       5 |    1
+  26 |       9 |    1
+  34 |       1 |    1
+  39 |       6 |    2
+  43 |       2 |    2
+  30 |       3 |    3
+  26 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude group), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  15 |       0 |    0
+  15 |       8 |    0
+  15 |       4 |    0
+  20 |       5 |    1
+  20 |       9 |    1
+  20 |       1 |    1
+  37 |       6 |    2
+  37 |       2 |    2
+  23 |       3 |    3
+  23 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude ties), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four 
+-----+---------+------
+  15 |       0 |    0
+  23 |       8 |    0
+  19 |       4 |    0
+  25 |       5 |    1
+  29 |       9 |    1
+  21 |       1 |    1
+  43 |       6 |    2
+  39 |       2 |    2
+  26 |       3 |    3
+  30 |       7 |    3
+(10 rows)
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following),unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four | ten 
+-----+---------+------+-----
+   0 |       0 |    0 |   0
+   1 |       1 |    1 |   1
+   2 |       2 |    2 |   2
+   3 |       3 |    3 |   3
+   4 |       4 |    0 |   4
+   5 |       5 |    1 |   5
+   6 |       6 |    2 |   6
+   7 |       7 |    3 |   7
+   8 |       8 |    0 |   8
+   9 |       9 |    1 |   9
+(10 rows)
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude current row), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four | ten 
+-----+---------+------+-----
+     |       0 |    0 |   0
+     |       1 |    1 |   1
+     |       2 |    2 |   2
+     |       3 |    3 |   3
+     |       4 |    0 |   4
+     |       5 |    1 |   5
+     |       6 |    2 |   6
+     |       7 |    3 |   7
+     |       8 |    0 |   8
+     |       9 |    1 |   9
+(10 rows)
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude group), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four | ten 
+-----+---------+------+-----
+     |       0 |    0 |   0
+     |       1 |    1 |   1
+     |       2 |    2 |   2
+     |       3 |    3 |   3
+     |       4 |    0 |   4
+     |       5 |    1 |   5
+     |       6 |    2 |   6
+     |       7 |    3 |   7
+     |       8 |    0 |   8
+     |       9 |    1 |   9
+(10 rows)
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude ties), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+ sum | unique1 | four | ten 
+-----+---------+------+-----
+   0 |       0 |    0 |   0
+   1 |       1 |    1 |   1
+   2 |       2 |    2 |   2
+   3 |       3 |    3 |   3
+   4 |       4 |    0 |   4
+   5 |       5 |    1 |   5
+   6 |       6 |    2 |   6
+   7 |       7 |    3 |   7
+   8 |       8 |    0 |   8
+   9 |       9 |    1 |   9
+(10 rows)
+
+select first_value(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	lead(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	nth_value(salary, 1) over(order by enroll_date groups between 1 preceding and 1 following),
+	salary, enroll_date from empsalary;
+ first_value | lead | nth_value | salary | enroll_date 
+-------------+------+-----------+--------+-------------
+        5000 | 6000 |      5000 |   5000 | 10-01-2006
+        5000 | 3900 |      5000 |   6000 | 10-01-2006
+        5000 | 4800 |      5000 |   3900 | 12-23-2006
+        3900 | 5200 |      3900 |   4800 | 08-01-2007
+        3900 | 4800 |      3900 |   5200 | 08-01-2007
+        4800 | 5200 |      4800 |   4800 | 08-08-2007
+        4800 | 3500 |      4800 |   5200 | 08-15-2007
+        5200 | 4500 |      5200 |   3500 | 12-10-2007
+        3500 | 4200 |      3500 |   4500 | 01-01-2008
+        3500 |      |      3500 |   4200 | 01-01-2008
+(10 rows)
+
+select last_value(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	lag(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	salary, enroll_date from empsalary;
+ last_value | lag  | salary | enroll_date 
+------------+------+--------+-------------
+       3900 |      |   5000 | 10-01-2006
+       3900 | 5000 |   6000 | 10-01-2006
+       5200 | 6000 |   3900 | 12-23-2006
+       4800 | 3900 |   4800 | 08-01-2007
+       4800 | 4800 |   5200 | 08-01-2007
+       5200 | 5200 |   4800 | 08-08-2007
+       3500 | 4800 |   5200 | 08-15-2007
+       4200 | 5200 |   3500 | 12-10-2007
+       4200 | 3500 |   4500 | 01-01-2008
+       4200 | 4500 |   4200 | 01-01-2008
+(10 rows)
+
+select first_value(salary) over(order by enroll_date groups between 1 following and 3 following
+	exclude current row),
+	lead(salary) over(order by enroll_date groups between 1 following and 3 following exclude ties),
+	nth_value(salary, 1) over(order by enroll_date groups between 1 following and 3 following
+	exclude ties),
+	salary, enroll_date from empsalary;
+ first_value | lead | nth_value | salary | enroll_date 
+-------------+------+-----------+--------+-------------
+        3900 | 6000 |      3900 |   5000 | 10-01-2006
+        3900 | 3900 |      3900 |   6000 | 10-01-2006
+        4800 | 4800 |      4800 |   3900 | 12-23-2006
+        4800 | 5200 |      4800 |   4800 | 08-01-2007
+        4800 | 4800 |      4800 |   5200 | 08-01-2007
+        5200 | 5200 |      5200 |   4800 | 08-08-2007
+        3500 | 3500 |      3500 |   5200 | 08-15-2007
+        4500 | 4500 |      4500 |   3500 | 12-10-2007
+             | 4200 |           |   4500 | 01-01-2008
+             |      |           |   4200 | 01-01-2008
+(10 rows)
+
+select last_value(salary) over(order by enroll_date groups between 1 following and 3 following
+	exclude group),
+	lag(salary) over(order by enroll_date groups between 1 following and 3 following exclude group),
+	salary, enroll_date from empsalary;
+ last_value | lag  | salary | enroll_date 
+------------+------+--------+-------------
+       4800 |      |   5000 | 10-01-2006
+       4800 | 5000 |   6000 | 10-01-2006
+       5200 | 6000 |   3900 | 12-23-2006
+       3500 | 3900 |   4800 | 08-01-2007
+       3500 | 4800 |   5200 | 08-01-2007
+       4200 | 5200 |   4800 | 08-08-2007
+       4200 | 4800 |   5200 | 08-15-2007
+       4200 | 5200 |   3500 | 12-10-2007
+            | 3500 |   4500 | 01-01-2008
+            | 4500 |   4200 | 01-01-2008
+(10 rows)
+
+-- Show differences in offset interpretation between ROWS, RANGE, and GROUPS
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   4
+  3 |   9
+  5 |  15
+  7 |  21
+  9 |  27
+ 11 |  33
+ 13 |  39
+ 15 |  45
+ 17 |  51
+ 19 |  57
+ 21 |  63
+ 23 |  69
+ 25 |  75
+ 27 |  81
+ 29 |  87
+ 31 |  93
+ 33 |  99
+ 35 |  68
+(18 rows)
+
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x range between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   1
+  3 |   3
+  5 |   5
+  7 |   7
+  9 |   9
+ 11 |  11
+ 13 |  13
+ 15 |  15
+ 17 |  17
+ 19 |  19
+ 21 |  21
+ 23 |  23
+ 25 |  25
+ 27 |  27
+ 29 |  29
+ 31 |  31
+ 33 |  33
+ 35 |  35
+(18 rows)
+
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x groups between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   4
+  3 |   9
+  5 |  15
+  7 |  21
+  9 |  27
+ 11 |  33
+ 13 |  39
+ 15 |  45
+ 17 |  51
+ 19 |  57
+ 21 |  63
+ 23 |  69
+ 25 |  75
+ 27 |  81
+ 29 |  87
+ 31 |  93
+ 33 |  99
+ 35 |  68
+(18 rows)
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   2
+  1 |   3
+  1 |   7
+  5 |  13
+  7 |  21
+  9 |  27
+ 11 |  33
+ 13 |  39
+ 15 |  45
+ 17 |  51
+ 19 |  57
+ 21 |  63
+ 23 |  69
+ 25 |  75
+ 27 |  81
+ 29 |  87
+ 31 |  93
+ 33 |  99
+ 35 | 105
+ 37 | 111
+ 39 | 117
+ 41 | 123
+ 43 | 129
+ 45 | 135
+ 47 | 141
+ 49 |  96
+(26 rows)
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x range between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   3
+  1 |   3
+  1 |   3
+  5 |   5
+  7 |   7
+  9 |   9
+ 11 |  11
+ 13 |  13
+ 15 |  15
+ 17 |  17
+ 19 |  19
+ 21 |  21
+ 23 |  23
+ 25 |  25
+ 27 |  27
+ 29 |  29
+ 31 |  31
+ 33 |  33
+ 35 |  35
+ 37 |  37
+ 39 |  39
+ 41 |  41
+ 43 |  43
+ 45 |  45
+ 47 |  47
+ 49 |  49
+(26 rows)
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x groups between 1 preceding and 1 following);
+ x  | sum 
+----+-----
+  1 |   8
+  1 |   8
+  1 |   8
+  5 |  15
+  7 |  21
+  9 |  27
+ 11 |  33
+ 13 |  39
+ 15 |  45
+ 17 |  51
+ 19 |  57
+ 21 |  63
+ 23 |  69
+ 25 |  75
+ 27 |  81
+ 29 |  87
+ 31 |  93
+ 33 |  99
+ 35 | 105
+ 37 | 111
+ 39 | 117
+ 41 | 123
+ 43 | 129
+ 45 | 135
+ 47 | 141
+ 49 |  96
+(26 rows)
+
 -- with UNION
 SELECT count(*) OVER (PARTITION BY four) FROM (SELECT * FROM tenk1 UNION ALL SELECT * FROM tenk2)s LIMIT 0;
  count 
diff --git a/src/test/regress/expected/with.out b/src/test/regress/expected/with.out
index fdcc4970a1..b4e0a1e83d 100644
--- a/src/test/regress/expected/with.out
+++ b/src/test/regress/expected/with.out
@@ -166,7 +166,7 @@ SELECT n, n IS OF (int) AS is_int FROM t;
 ERROR:  operator does not exist: text + integer
 LINE 4:     SELECT n+1 FROM t WHERE n < 10
                     ^
-HINT:  No operator matches the given name and argument type(s). You might need to add explicit type casts.
+HINT:  No operator matches the given name and argument types. You might need to add explicit type casts.
 --
 -- Some examples with a tree
 --
@@ -2273,5 +2273,19 @@ with ordinality as (select 1 as x) select * from ordinality;
 (1 row)
 
 -- check sane response to attempt to modify CTE relation
-WITH d AS (SELECT 42) INSERT INTO d VALUES (1);
-ERROR:  relation "d" cannot be the target of a modifying statement
+WITH test AS (SELECT 42) INSERT INTO test VALUES (1);
+ERROR:  relation "test" does not exist
+LINE 1: WITH test AS (SELECT 42) INSERT INTO test VALUES (1);
+                                             ^
+-- check response to attempt to modify table with same name as a CTE (perhaps
+-- surprisingly it works, because CTEs don't hide tables from data-modifying
+-- statements)
+create table test (i int);
+with test as (select 42) insert into test select * from test;
+select * from test;
+ i  
+----
+ 42
+(1 row)
+
+drop table test;
diff --git a/src/test/regress/expected/write_parallel.out b/src/test/regress/expected/write_parallel.out
new file mode 100644
index 0000000000..0c4da2591a
--- /dev/null
+++ b/src/test/regress/expected/write_parallel.out
@@ -0,0 +1,79 @@
+--
+-- PARALLEL
+--
+-- Serializable isolation would disable parallel query, so explicitly use an
+-- arbitrary other level.
+begin isolation level repeatable read;
+-- encourage use of parallel plans
+set parallel_setup_cost=0;
+set parallel_tuple_cost=0;
+set min_parallel_table_scan_size=0;
+set max_parallel_workers_per_gather=4;
+--
+-- Test write operations that has an underlying query that is eligble
+-- for parallel plans
+--
+explain (costs off) create table parallel_write as
+    select length(stringu1) from tenk1 group by length(stringu1);
+                    QUERY PLAN                     
+---------------------------------------------------
+ Finalize HashAggregate
+   Group Key: (length((stringu1)::text))
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial HashAggregate
+               Group Key: length((stringu1)::text)
+               ->  Parallel Seq Scan on tenk1
+(7 rows)
+
+create table parallel_write as
+    select length(stringu1) from tenk1 group by length(stringu1);
+drop table parallel_write;
+explain (costs off) select length(stringu1) into parallel_write
+    from tenk1 group by length(stringu1);
+                    QUERY PLAN                     
+---------------------------------------------------
+ Finalize HashAggregate
+   Group Key: (length((stringu1)::text))
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial HashAggregate
+               Group Key: length((stringu1)::text)
+               ->  Parallel Seq Scan on tenk1
+(7 rows)
+
+select length(stringu1) into parallel_write
+    from tenk1 group by length(stringu1);
+drop table parallel_write;
+explain (costs off) create materialized view parallel_mat_view as
+    select length(stringu1) from tenk1 group by length(stringu1);
+                    QUERY PLAN                     
+---------------------------------------------------
+ Finalize HashAggregate
+   Group Key: (length((stringu1)::text))
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial HashAggregate
+               Group Key: length((stringu1)::text)
+               ->  Parallel Seq Scan on tenk1
+(7 rows)
+
+create materialized view parallel_mat_view as
+    select length(stringu1) from tenk1 group by length(stringu1);
+drop materialized view parallel_mat_view;
+prepare prep_stmt as select length(stringu1) from tenk1 group by length(stringu1);
+explain (costs off) create table parallel_write as execute prep_stmt;
+                    QUERY PLAN                     
+---------------------------------------------------
+ Finalize HashAggregate
+   Group Key: (length((stringu1)::text))
+   ->  Gather
+         Workers Planned: 4
+         ->  Partial HashAggregate
+               Group Key: length((stringu1)::text)
+               ->  Parallel Seq Scan on tenk1
+(7 rows)
+
+create table parallel_write as execute prep_stmt;
+drop table parallel_write;
+rollback;
diff --git a/src/test/regress/expected/xml.out b/src/test/regress/expected/xml.out
index bcc585d427..7fa1309108 100644
--- a/src/test/regress/expected/xml.out
+++ b/src/test/regress/expected/xml.out
@@ -670,6 +670,41 @@ SELECT xpath('/nosuchtag', '<root/>');
  {}
 (1 row)
 
+-- Round-trip non-ASCII data through xpath().
+DO $$
+DECLARE
+  xml_declaration text := '<?xml version="1.0" encoding="ISO-8859-1"?>';
+  degree_symbol text;
+  res xml[];
+BEGIN
+  -- Per the documentation, except when the server encoding is UTF8, xpath()
+  -- may not work on non-ASCII data.  The untranslatable_character and
+  -- undefined_function traps below, currently dead code, will become relevant
+  -- if we remove this limitation.
+  IF current_setting('server_encoding') <> 'UTF8' THEN
+    RAISE LOG 'skip: encoding % unsupported for xpath',
+      current_setting('server_encoding');
+    RETURN;
+  END IF;
+
+  degree_symbol := convert_from('\xc2b0', 'UTF8');
+  res := xpath('text()', (xml_declaration ||
+    '<x>' || degree_symbol || '</x>')::xml);
+  IF degree_symbol <> res[1]::text THEN
+    RAISE 'expected % (%), got % (%)',
+      degree_symbol, convert_to(degree_symbol, 'UTF8'),
+      res[1], convert_to(res[1]::text, 'UTF8');
+  END IF;
+EXCEPTION
+  -- character with byte sequence 0xc2 0xb0 in encoding "UTF8" has no equivalent in encoding "LATIN8"
+  WHEN untranslatable_character
+  -- default conversion function for encoding "UTF8" to "MULE_INTERNAL" does not exist
+  OR undefined_function
+  -- unsupported XML feature
+  OR feature_not_supported THEN
+    RAISE LOG 'skip: %', SQLERRM;
+END
+$$;
 -- Test xmlexists and xpath_exists
 SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
  xmlexists 
diff --git a/src/test/regress/expected/xml_1.out b/src/test/regress/expected/xml_1.out
index d3bd8c91d7..970ab26fce 100644
--- a/src/test/regress/expected/xml_1.out
+++ b/src/test/regress/expected/xml_1.out
@@ -576,6 +576,41 @@ LINE 1: SELECT xpath('/nosuchtag', '<root/>');
                                    ^
 DETAIL:  This functionality requires the server to be built with libxml support.
 HINT:  You need to rebuild PostgreSQL using --with-libxml.
+-- Round-trip non-ASCII data through xpath().
+DO $$
+DECLARE
+  xml_declaration text := '<?xml version="1.0" encoding="ISO-8859-1"?>';
+  degree_symbol text;
+  res xml[];
+BEGIN
+  -- Per the documentation, except when the server encoding is UTF8, xpath()
+  -- may not work on non-ASCII data.  The untranslatable_character and
+  -- undefined_function traps below, currently dead code, will become relevant
+  -- if we remove this limitation.
+  IF current_setting('server_encoding') <> 'UTF8' THEN
+    RAISE LOG 'skip: encoding % unsupported for xpath',
+      current_setting('server_encoding');
+    RETURN;
+  END IF;
+
+  degree_symbol := convert_from('\xc2b0', 'UTF8');
+  res := xpath('text()', (xml_declaration ||
+    '<x>' || degree_symbol || '</x>')::xml);
+  IF degree_symbol <> res[1]::text THEN
+    RAISE 'expected % (%), got % (%)',
+      degree_symbol, convert_to(degree_symbol, 'UTF8'),
+      res[1], convert_to(res[1]::text, 'UTF8');
+  END IF;
+EXCEPTION
+  -- character with byte sequence 0xc2 0xb0 in encoding "UTF8" has no equivalent in encoding "LATIN8"
+  WHEN untranslatable_character
+  -- default conversion function for encoding "UTF8" to "MULE_INTERNAL" does not exist
+  OR undefined_function
+  -- unsupported XML feature
+  OR feature_not_supported THEN
+    RAISE LOG 'skip: %', SQLERRM;
+END
+$$;
 -- Test xmlexists and xpath_exists
 SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
 ERROR:  unsupported XML feature
diff --git a/src/test/regress/expected/xml_2.out b/src/test/regress/expected/xml_2.out
index ff77132803..112ebe47cd 100644
--- a/src/test/regress/expected/xml_2.out
+++ b/src/test/regress/expected/xml_2.out
@@ -650,6 +650,41 @@ SELECT xpath('/nosuchtag', '<root/>');
  {}
 (1 row)
 
+-- Round-trip non-ASCII data through xpath().
+DO $$
+DECLARE
+  xml_declaration text := '<?xml version="1.0" encoding="ISO-8859-1"?>';
+  degree_symbol text;
+  res xml[];
+BEGIN
+  -- Per the documentation, except when the server encoding is UTF8, xpath()
+  -- may not work on non-ASCII data.  The untranslatable_character and
+  -- undefined_function traps below, currently dead code, will become relevant
+  -- if we remove this limitation.
+  IF current_setting('server_encoding') <> 'UTF8' THEN
+    RAISE LOG 'skip: encoding % unsupported for xpath',
+      current_setting('server_encoding');
+    RETURN;
+  END IF;
+
+  degree_symbol := convert_from('\xc2b0', 'UTF8');
+  res := xpath('text()', (xml_declaration ||
+    '<x>' || degree_symbol || '</x>')::xml);
+  IF degree_symbol <> res[1]::text THEN
+    RAISE 'expected % (%), got % (%)',
+      degree_symbol, convert_to(degree_symbol, 'UTF8'),
+      res[1], convert_to(res[1]::text, 'UTF8');
+  END IF;
+EXCEPTION
+  -- character with byte sequence 0xc2 0xb0 in encoding "UTF8" has no equivalent in encoding "LATIN8"
+  WHEN untranslatable_character
+  -- default conversion function for encoding "UTF8" to "MULE_INTERNAL" does not exist
+  OR undefined_function
+  -- unsupported XML feature
+  OR feature_not_supported THEN
+    RAISE LOG 'skip: %', SQLERRM;
+END
+$$;
 -- Test xmlexists and xpath_exists
 SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
  xmlexists 
diff --git a/src/test/regress/input/create_function_1.source b/src/test/regress/input/create_function_1.source
index f2b1561cc2..26e2227d3a 100644
--- a/src/test/regress/input/create_function_1.source
+++ b/src/test/regress/input/create_function_1.source
@@ -37,7 +37,7 @@ CREATE FUNCTION autoinc ()
 	AS '@libdir@/autoinc@DLSUFFIX@'
 	LANGUAGE C;
 
-CREATE FUNCTION funny_dup17 ()
+CREATE FUNCTION trigger_return_old ()
         RETURNS trigger
         AS '@libdir@/regress@DLSUFFIX@'
         LANGUAGE C;
@@ -62,6 +62,12 @@ CREATE FUNCTION test_atomic_ops()
     AS '@libdir@/regress@DLSUFFIX@'
     LANGUAGE C;
 
+-- Tests creating a FDW handler
+CREATE FUNCTION test_fdw_handler()
+    RETURNS fdw_handler
+    AS '@libdir@/regress@DLSUFFIX@', 'test_fdw_handler'
+    LANGUAGE C;
+
 -- Things that shouldn't work:
 
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
diff --git a/src/test/regress/input/create_function_2.source b/src/test/regress/input/create_function_2.source
index b167c8ac6d..9e6d2942ec 100644
--- a/src/test/regress/input/create_function_2.source
+++ b/src/test/regress/input/create_function_2.source
@@ -72,11 +72,6 @@ CREATE FUNCTION overpaid(emp)
    AS '@libdir@/regress@DLSUFFIX@'
    LANGUAGE C STRICT;
 
-CREATE FUNCTION boxarea(box)
-   RETURNS float8
-   AS '@libdir@/regress@DLSUFFIX@'
-   LANGUAGE C STRICT;
-
 CREATE FUNCTION interpt_pp(path, path)
    RETURNS point
    AS '@libdir@/regress@DLSUFFIX@'
diff --git a/src/test/regress/input/tablespace.source b/src/test/regress/input/tablespace.source
index 03a62bd760..7f7934b745 100644
--- a/src/test/regress/input/tablespace.source
+++ b/src/test/regress/input/tablespace.source
@@ -12,10 +12,10 @@ DROP TABLESPACE regress_tblspacewith;
 CREATE TABLESPACE regress_tblspace LOCATION '@testtablespace@';
 
 -- try setting and resetting some properties for the new tablespace
-ALTER TABLESPACE regress_tblspace SET (random_page_cost = 1.0);
+ALTER TABLESPACE regress_tblspace SET (random_page_cost = 1.0, seq_page_cost = 1.1);
 ALTER TABLESPACE regress_tblspace SET (some_nonexistent_parameter = true);  -- fail
 ALTER TABLESPACE regress_tblspace RESET (random_page_cost = 2.0); -- fail
-ALTER TABLESPACE regress_tblspace RESET (random_page_cost, seq_page_cost); -- ok
+ALTER TABLESPACE regress_tblspace RESET (random_page_cost, effective_io_concurrency); -- ok
 
 -- create a schema we can use
 CREATE SCHEMA testschema;
diff --git a/src/test/regress/output/create_function_1.source b/src/test/regress/output/create_function_1.source
index 957595c51e..8c50d9b309 100644
--- a/src/test/regress/output/create_function_1.source
+++ b/src/test/regress/output/create_function_1.source
@@ -35,7 +35,7 @@ CREATE FUNCTION autoinc ()
 	RETURNS trigger
 	AS '@libdir@/autoinc@DLSUFFIX@'
 	LANGUAGE C;
-CREATE FUNCTION funny_dup17 ()
+CREATE FUNCTION trigger_return_old ()
         RETURNS trigger
         AS '@libdir@/regress@DLSUFFIX@'
         LANGUAGE C;
@@ -55,6 +55,11 @@ CREATE FUNCTION test_atomic_ops()
     RETURNS bool
     AS '@libdir@/regress@DLSUFFIX@'
     LANGUAGE C;
+-- Tests creating a FDW handler
+CREATE FUNCTION test_fdw_handler()
+    RETURNS fdw_handler
+    AS '@libdir@/regress@DLSUFFIX@', 'test_fdw_handler'
+    LANGUAGE C;
 -- Things that shouldn't work:
 CREATE FUNCTION test1 (int) RETURNS int LANGUAGE SQL
     AS 'SELECT ''not an integer'';';
diff --git a/src/test/regress/output/create_function_2.source b/src/test/regress/output/create_function_2.source
index 8f28bff298..ac9a7f5cf8 100644
--- a/src/test/regress/output/create_function_2.source
+++ b/src/test/regress/output/create_function_2.source
@@ -55,10 +55,6 @@ CREATE FUNCTION overpaid(emp)
    RETURNS bool
    AS '@libdir@/regress@DLSUFFIX@'
    LANGUAGE C STRICT;
-CREATE FUNCTION boxarea(box)
-   RETURNS float8
-   AS '@libdir@/regress@DLSUFFIX@'
-   LANGUAGE C STRICT;
 CREATE FUNCTION interpt_pp(path, path)
    RETURNS point
    AS '@libdir@/regress@DLSUFFIX@'
diff --git a/src/test/regress/output/tablespace.source b/src/test/regress/output/tablespace.source
index aaedf5f248..24435118bc 100644
--- a/src/test/regress/output/tablespace.source
+++ b/src/test/regress/output/tablespace.source
@@ -14,12 +14,12 @@ DROP TABLESPACE regress_tblspacewith;
 -- create a tablespace we can use
 CREATE TABLESPACE regress_tblspace LOCATION '@testtablespace@';
 -- try setting and resetting some properties for the new tablespace
-ALTER TABLESPACE regress_tblspace SET (random_page_cost = 1.0);
+ALTER TABLESPACE regress_tblspace SET (random_page_cost = 1.0, seq_page_cost = 1.1);
 ALTER TABLESPACE regress_tblspace SET (some_nonexistent_parameter = true);  -- fail
 ERROR:  unrecognized parameter "some_nonexistent_parameter"
 ALTER TABLESPACE regress_tblspace RESET (random_page_cost = 2.0); -- fail
 ERROR:  RESET must not include values for parameters
-ALTER TABLESPACE regress_tblspace RESET (random_page_cost, seq_page_cost); -- ok
+ALTER TABLESPACE regress_tblspace RESET (random_page_cost, effective_io_concurrency); -- ok
 -- create a schema we can use
 CREATE SCHEMA testschema;
 -- try a table
diff --git a/src/test/regress/parallel_schedule b/src/test/regress/parallel_schedule
index eefdeeacae..ad9434fb87 100644
--- a/src/test/regress/parallel_schedule
+++ b/src/test/regress/parallel_schedule
@@ -53,14 +53,14 @@ test: copy copyselect copydml
 # ----------
 # More groups of parallel tests
 # ----------
-test: create_misc create_operator
+test: create_misc create_operator create_procedure
 # These depend on the above two
 test: create_index create_view
 
 # ----------
 # Another group of parallel tests
 # ----------
-test: create_aggregate create_function_3 create_cast constraints triggers inherit create_table_like typed_table vacuum drop_if_exists updatable_views rolenames roleattributes create_am
+test: create_aggregate create_function_3 create_cast constraints triggers inherit create_table_like typed_table vacuum drop_if_exists updatable_views rolenames roleattributes create_am hash_func
 
 # ----------
 # sanity_check does a vacuum, affecting the sort order of SELECT *
@@ -96,6 +96,7 @@ test: rules psql_crosstab amutils
 
 # run by itself so it can run parallel workers
 test: select_parallel
+test: write_parallel
 
 # no relation related tests can be put in this group
 test: publication subscription
@@ -104,6 +105,7 @@ test: publication subscription
 # Another group of parallel tests
 # ----------
 test: select_views portals_p2 foreign_key cluster dependency guc bitmapops combocid tsearch tsdicts foreign_data window xmlmap functional_deps advisory_lock json jsonb json_encoding indirect_toast equivclass
+
 # ----------
 # Another group of parallel tests
 # NB: temp.sql does a reconnect which transiently uses 2 connections,
@@ -114,7 +116,7 @@ test: plancache limit plpgsql copy2 temp domain rangefuncs prepare without_oid c
 # ----------
 # Another group of parallel tests
 # ----------
-test: identity
+test: identity partition_join partition_prune reloptions hash_part indexing
 
 # event triggers cannot run concurrently with any test that runs DDL
 test: event_trigger
diff --git a/src/test/regress/pg_regress.c b/src/test/regress/pg_regress.c
index abb742b1ed..a1ee1041b4 100644
--- a/src/test/regress/pg_regress.c
+++ b/src/test/regress/pg_regress.c
@@ -8,7 +8,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/test/regress/pg_regress.c
@@ -78,6 +78,7 @@ char	   *launcher = NULL;
 static _stringlist *loadlanguage = NULL;
 static _stringlist *loadextension = NULL;
 static int	max_connections = 0;
+static int	max_concurrent_tests = 0;
 static char *encoding = NULL;
 static _stringlist *schedulelist = NULL;
 static _stringlist *extra_tests = NULL;
@@ -437,7 +438,7 @@ string_matches_pattern(const char *str, const char *pattern)
  * NOTE: Assumes there is enough room in the target buffer!
  */
 void
-replace_string(char *string, char *replace, char *replacement)
+replace_string(char *string, const char *replace, const char *replacement)
 {
 	char	   *ptr;
 
@@ -459,7 +460,7 @@ replace_string(char *string, char *replace, char *replacement)
  * the given suffix.
  */
 static void
-convert_sourcefiles_in(char *source_subdir, char *dest_dir, char *dest_subdir, char *suffix)
+convert_sourcefiles_in(const char *source_subdir, const char *dest_dir, const char *dest_subdir, const char *suffix)
 {
 	char		testtablespace[MAXPGPATH];
 	char		indir[MAXPGPATH];
@@ -1592,9 +1593,10 @@ run_schedule(const char *schedule, test_function tfunc)
 	FILE	   *scf;
 	int			line_num = 0;
 
-	memset(resultfiles, 0, sizeof(_stringlist *) * MAX_PARALLEL_TESTS);
-	memset(expectfiles, 0, sizeof(_stringlist *) * MAX_PARALLEL_TESTS);
-	memset(tags, 0, sizeof(_stringlist *) * MAX_PARALLEL_TESTS);
+	memset(tests, 0, sizeof(tests));
+	memset(resultfiles, 0, sizeof(resultfiles));
+	memset(expectfiles, 0, sizeof(expectfiles));
+	memset(tags, 0, sizeof(tags));
 
 	scf = fopen(schedule, "r");
 	if (!scf)
@@ -1614,15 +1616,6 @@ run_schedule(const char *schedule, test_function tfunc)
 
 		line_num++;
 
-		for (i = 0; i < MAX_PARALLEL_TESTS; i++)
-		{
-			if (resultfiles[i] == NULL)
-				break;
-			free_stringlist(&resultfiles[i]);
-			free_stringlist(&expectfiles[i]);
-			free_stringlist(&tags[i]);
-		}
-
 		/* strip trailing whitespace, especially the newline */
 		i = strlen(scbuf);
 		while (i > 0 && isspace((unsigned char) scbuf[i - 1]))
@@ -1655,24 +1648,35 @@ run_schedule(const char *schedule, test_function tfunc)
 
 		num_tests = 0;
 		inword = false;
-		for (c = test; *c; c++)
+		for (c = test;; c++)
 		{
-			if (isspace((unsigned char) *c))
+			if (*c == '\0' || isspace((unsigned char) *c))
 			{
-				*c = '\0';
-				inword = false;
+				if (inword)
+				{
+					/* Reached end of a test name */
+					char		sav;
+
+					if (num_tests >= MAX_PARALLEL_TESTS)
+					{
+						fprintf(stderr, _("too many parallel tests (more than %d) in schedule file \"%s\" line %d: %s\n"),
+								MAX_PARALLEL_TESTS, schedule, line_num, scbuf);
+						exit(2);
+					}
+					sav = *c;
+					*c = '\0';
+					tests[num_tests] = pg_strdup(test);
+					num_tests++;
+					*c = sav;
+					inword = false;
+				}
+				if (*c == '\0')
+					break;		/* loop exit is here */
 			}
 			else if (!inword)
 			{
-				if (num_tests >= MAX_PARALLEL_TESTS)
-				{
-					/* can't print scbuf here, it's already been trashed */
-					fprintf(stderr, _("too many parallel tests in schedule file \"%s\", line %d\n"),
-							schedule, line_num);
-					exit(2);
-				}
-				tests[num_tests] = c;
-				num_tests++;
+				/* Start of a test name */
+				test = c;
 				inword = true;
 			}
 		}
@@ -1691,6 +1695,12 @@ run_schedule(const char *schedule, test_function tfunc)
 			wait_for_tests(pids, statuses, NULL, 1);
 			/* status line is finished below */
 		}
+		else if (max_concurrent_tests > 0 && max_concurrent_tests < num_tests)
+		{
+			fprintf(stderr, _("too many parallel tests (more than %d) in schedule file \"%s\" line %d: %s\n"),
+					max_concurrent_tests, schedule, line_num, scbuf);
+			exit(2);
+		}
 		else if (max_connections > 0 && max_connections < num_tests)
 		{
 			int			oldest = 0;
@@ -1793,6 +1803,15 @@ run_schedule(const char *schedule, test_function tfunc)
 
 			status_end();
 		}
+
+		for (i = 0; i < num_tests; i++)
+		{
+			pg_free(tests[i]);
+			tests[i] = NULL;
+			free_stringlist(&resultfiles[i]);
+			free_stringlist(&expectfiles[i]);
+			free_stringlist(&tags[i]);
+		}
 	}
 
 	free_stringlist(&ignorelist);
@@ -1985,35 +2004,41 @@ help(void)
 	printf(_("Usage:\n  %s [OPTION]... [EXTRA-TEST]...\n"), progname);
 	printf(_("\n"));
 	printf(_("Options:\n"));
-	printf(_("  --config-auth=DATADIR     update authentication settings for DATADIR\n"));
-	printf(_("  --create-role=ROLE        create the specified role before testing\n"));
-	printf(_("  --dbname=DB               use database DB (default \"regression\")\n"));
-	printf(_("  --debug                   turn on debug mode in programs that are run\n"));
-	printf(_("  --dlpath=DIR              look for dynamic libraries in DIR\n"));
-	printf(_("  --encoding=ENCODING       use ENCODING as the encoding\n"));
-	printf(_("  --inputdir=DIR            take input files from DIR (default \".\")\n"));
-	printf(_("  --launcher=CMD            use CMD as launcher of psql\n"));
-	printf(_("  --load-extension=EXT      load the named extension before running the\n"));
-	printf(_("                            tests; can appear multiple times\n"));
-	printf(_("  --load-language=LANG      load the named language before running the\n"));
-	printf(_("                            tests; can appear multiple times\n"));
-	printf(_("  --max-connections=N       maximum number of concurrent connections\n"));
-	printf(_("                            (default is 0, meaning unlimited)\n"));
-	printf(_("  --outputdir=DIR           place output files in DIR (default \".\")\n"));
-	printf(_("  --schedule=FILE           use test ordering schedule from FILE\n"));
-	printf(_("                            (can be used multiple times to concatenate)\n"));
-	printf(_("  --temp-instance=DIR       create a temporary instance in DIR\n"));
-	printf(_("  --use-existing            use an existing installation\n"));
+	printf(_("      --bindir=BINPATH          use BINPATH for programs that are run;\n"));
+	printf(_("                                if empty, use PATH from the environment\n"));
+	printf(_("      --config-auth=DATADIR     update authentication settings for DATADIR\n"));
+	printf(_("      --create-role=ROLE        create the specified role before testing\n"));
+	printf(_("      --dbname=DB               use database DB (default \"regression\")\n"));
+	printf(_("      --debug                   turn on debug mode in programs that are run\n"));
+	printf(_("      --dlpath=DIR              look for dynamic libraries in DIR\n"));
+	printf(_("      --encoding=ENCODING       use ENCODING as the encoding\n"));
+	printf(_("  -h, --help                    show this help, then exit\n"));
+	printf(_("      --inputdir=DIR            take input files from DIR (default \".\")\n"));
+	printf(_("      --launcher=CMD            use CMD as launcher of psql\n"));
+	printf(_("      --load-extension=EXT      load the named extension before running the\n"));
+	printf(_("                                tests; can appear multiple times\n"));
+	printf(_("      --load-language=LANG      load the named language before running the\n"));
+	printf(_("                                tests; can appear multiple times\n"));
+	printf(_("      --max-connections=N       maximum number of concurrent connections\n"));
+	printf(_("                                (default is 0, meaning unlimited)\n"));
+	printf(_("      --max-concurrent-tests=N  maximum number of concurrent tests in schedule\n"));
+	printf(_("                                (default is 0, meaning unlimited)\n"));
+	printf(_("      --outputdir=DIR           place output files in DIR (default \".\")\n"));
+	printf(_("      --schedule=FILE           use test ordering schedule from FILE\n"));
+	printf(_("                                (can be used multiple times to concatenate)\n"));
+	printf(_("      --temp-instance=DIR       create a temporary instance in DIR\n"));
+	printf(_("      --use-existing            use an existing installation\n"));
+	printf(_("  -V, --version                 output version information, then exit\n"));
 	printf(_("\n"));
 	printf(_("Options for \"temp-instance\" mode:\n"));
-	printf(_("  --no-locale               use C locale\n"));
-	printf(_("  --port=PORT               start postmaster on PORT\n"));
-	printf(_("  --temp-config=FILE        append contents of FILE to temporary config\n"));
+	printf(_("      --no-locale               use C locale\n"));
+	printf(_("      --port=PORT               start postmaster on PORT\n"));
+	printf(_("      --temp-config=FILE        append contents of FILE to temporary config\n"));
 	printf(_("\n"));
 	printf(_("Options for using an existing installation:\n"));
-	printf(_("  --host=HOST               use postmaster running on HOST\n"));
-	printf(_("  --port=PORT               use postmaster running at PORT\n"));
-	printf(_("  --user=USER               connect as USER\n"));
+	printf(_("      --host=HOST               use postmaster running on HOST\n"));
+	printf(_("      --port=PORT               use postmaster running at PORT\n"));
+	printf(_("      --user=USER               connect as USER\n"));
 	printf(_("\n"));
 	printf(_("The exit status is 0 if all tests passed, 1 if some tests failed, and 2\n"));
 	printf(_("if the tests could not be run for some reason.\n"));
@@ -2048,6 +2073,7 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 		{"launcher", required_argument, NULL, 21},
 		{"load-extension", required_argument, NULL, 22},
 		{"config-auth", required_argument, NULL, 24},
+		{"max-concurrent-tests", required_argument, NULL, 25},
 		{NULL, 0, NULL, 0}
 	};
 
@@ -2161,6 +2187,9 @@ regression_main(int argc, char *argv[], init_function ifunc, test_function tfunc
 			case 24:
 				config_auth_datadir = pg_strdup(optarg);
 				break;
+			case 25:
+				max_concurrent_tests = atoi(optarg);
+				break;
 			default:
 				/* getopt_long already emitted a complaint */
 				fprintf(stderr, _("\nTry \"%s -h\" for more information.\n"),
diff --git a/src/test/regress/pg_regress.h b/src/test/regress/pg_regress.h
index 4abfc628e5..e9045b75b6 100644
--- a/src/test/regress/pg_regress.h
+++ b/src/test/regress/pg_regress.h
@@ -1,7 +1,7 @@
 /*-------------------------------------------------------------------------
  * pg_regress.h --- regression test driver
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/test/regress/pg_regress.h
@@ -49,5 +49,5 @@ int regression_main(int argc, char *argv[],
 				init_function ifunc, test_function tfunc);
 void		add_stringlist_item(_stringlist **listhead, const char *str);
 PID_TYPE	spawn_process(const char *cmdline);
-void		replace_string(char *string, char *replace, char *replacement);
+void		replace_string(char *string, const char *replace, const char *replacement);
 bool		file_exists(const char *file);
diff --git a/src/test/regress/pg_regress_main.c b/src/test/regress/pg_regress_main.c
index 298ed758ee..a2bd6a2cd5 100644
--- a/src/test/regress/pg_regress_main.c
+++ b/src/test/regress/pg_regress_main.c
@@ -8,7 +8,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/test/regress/pg_regress_main.c
diff --git a/src/test/regress/regress.c b/src/test/regress/regress.c
index b73bccec3d..e14322c798 100644
--- a/src/test/regress/regress.c
+++ b/src/test/regress/regress.c
@@ -6,7 +6,7 @@
  *
  * This code is released under the terms of the PostgreSQL License.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  * src/test/regress/regress.c
@@ -43,121 +43,10 @@
 #define RDELIM			')'
 #define DELIM			','
 
-extern PATH *poly2path(POLYGON *poly);
-extern void regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
+static void regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
 
-#ifdef PG_MODULE_MAGIC
 PG_MODULE_MAGIC;
-#endif
-
-
-/*
- * Distance from a point to a path
- */
-PG_FUNCTION_INFO_V1(regress_dist_ptpath);
-
-Datum
-regress_dist_ptpath(PG_FUNCTION_ARGS)
-{
-	Point	   *pt = PG_GETARG_POINT_P(0);
-	PATH	   *path = PG_GETARG_PATH_P(1);
-	float8		result = 0.0;	/* keep compiler quiet */
-	float8		tmp;
-	int			i;
-	LSEG		lseg;
-
-	switch (path->npts)
-	{
-		case 0:
-			PG_RETURN_NULL();
-		case 1:
-			result = point_dt(pt, &path->p[0]);
-			break;
-		default:
-
-			/*
-			 * the distance from a point to a path is the smallest distance
-			 * from the point to any of its constituent segments.
-			 */
-			Assert(path->npts > 1);
-			for (i = 0; i < path->npts - 1; ++i)
-			{
-				regress_lseg_construct(&lseg, &path->p[i], &path->p[i + 1]);
-				tmp = DatumGetFloat8(DirectFunctionCall2(dist_ps,
-														 PointPGetDatum(pt),
-														 LsegPGetDatum(&lseg)));
-				if (i == 0 || tmp < result)
-					result = tmp;
-			}
-			break;
-	}
-	PG_RETURN_FLOAT8(result);
-}
-
-/*
- * this essentially does a cartesian product of the lsegs in the
- * two paths, and finds the min distance between any two lsegs
- */
-PG_FUNCTION_INFO_V1(regress_path_dist);
-
-Datum
-regress_path_dist(PG_FUNCTION_ARGS)
-{
-	PATH	   *p1 = PG_GETARG_PATH_P(0);
-	PATH	   *p2 = PG_GETARG_PATH_P(1);
-	bool		have_min = false;
-	float8		min = 0.0;		/* initialize to keep compiler quiet */
-	float8		tmp;
-	int			i,
-				j;
-	LSEG		seg1,
-				seg2;
-
-	for (i = 0; i < p1->npts - 1; i++)
-	{
-		for (j = 0; j < p2->npts - 1; j++)
-		{
-			regress_lseg_construct(&seg1, &p1->p[i], &p1->p[i + 1]);
-			regress_lseg_construct(&seg2, &p2->p[j], &p2->p[j + 1]);
-
-			tmp = DatumGetFloat8(DirectFunctionCall2(lseg_distance,
-													 LsegPGetDatum(&seg1),
-													 LsegPGetDatum(&seg2)));
-			if (!have_min || tmp < min)
-			{
-				min = tmp;
-				have_min = true;
-			}
-		}
-	}
-
-	if (!have_min)
-		PG_RETURN_NULL();
 
-	PG_RETURN_FLOAT8(min);
-}
-
-PATH *
-poly2path(POLYGON *poly)
-{
-	int			i;
-	char	   *output = (char *) palloc(2 * (P_MAXDIG + 1) * poly->npts + 64);
-	char		buf[2 * (P_MAXDIG) + 20];
-
-	sprintf(output, "(1, %*d", P_MAXDIG, poly->npts);
-
-	for (i = 0; i < poly->npts; i++)
-	{
-		snprintf(buf, sizeof(buf), ",%*g,%*g",
-				 P_MAXDIG, poly->p[i].x, P_MAXDIG, poly->p[i].y);
-		strcat(output, buf);
-	}
-
-	snprintf(buf, sizeof(buf), "%c", RDELIM);
-	strcat(output, buf);
-	return DatumGetPathP(DirectFunctionCall1(path_in,
-											 CStringGetDatum(output)));
-}
 
 /* return the point where two paths intersect, or NULL if no intersection. */
 PG_FUNCTION_INFO_V1(interpt_pp);
@@ -203,7 +92,7 @@ interpt_pp(PG_FUNCTION_ARGS)
 
 
 /* like lseg_construct, but assume space already allocated */
-void
+static void
 regress_lseg_construct(LSEG *lseg, Point *pt1, Point *pt2)
 {
 	lseg->p[0].x = pt1->x;
@@ -293,20 +182,6 @@ pt_in_widget(PG_FUNCTION_ARGS)
 	PG_RETURN_BOOL(point_dt(point, &widget->center) < widget->radius);
 }
 
-PG_FUNCTION_INFO_V1(boxarea);
-
-Datum
-boxarea(PG_FUNCTION_ARGS)
-{
-	BOX		   *box = PG_GETARG_BOX_P(0);
-	double		width,
-				height;
-
-	width = Abs(box->high.x - box->low.x);
-	height = Abs(box->high.y - box->low.y);
-	PG_RETURN_FLOAT8(width * height);
-}
-
 PG_FUNCTION_INFO_V1(reverse_name);
 
 Datum
@@ -328,120 +203,18 @@ reverse_name(PG_FUNCTION_ARGS)
 	PG_RETURN_CSTRING(new_string);
 }
 
-
-static TransactionId fd17b_xid = InvalidTransactionId;
-static TransactionId fd17a_xid = InvalidTransactionId;
-static int	fd17b_level = 0;
-static int	fd17a_level = 0;
-static bool fd17b_recursion = true;
-static bool fd17a_recursion = true;
-
-PG_FUNCTION_INFO_V1(funny_dup17);
+PG_FUNCTION_INFO_V1(trigger_return_old);
 
 Datum
-funny_dup17(PG_FUNCTION_ARGS)
+trigger_return_old(PG_FUNCTION_ARGS)
 {
 	TriggerData *trigdata = (TriggerData *) fcinfo->context;
-	TransactionId *xid;
-	int		   *level;
-	bool	   *recursion;
-	Relation	rel;
-	TupleDesc	tupdesc;
 	HeapTuple	tuple;
-	char	   *query,
-			   *fieldval,
-			   *fieldtype;
-	char	   *when;
-	uint64		inserted;
-	int			selected = 0;
-	int			ret;
 
 	if (!CALLED_AS_TRIGGER(fcinfo))
-		elog(ERROR, "funny_dup17: not fired by trigger manager");
+		elog(ERROR, "trigger_return_old: not fired by trigger manager");
 
 	tuple = trigdata->tg_trigtuple;
-	rel = trigdata->tg_relation;
-	tupdesc = rel->rd_att;
-	if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
-	{
-		xid = &fd17b_xid;
-		level = &fd17b_level;
-		recursion = &fd17b_recursion;
-		when = "BEFORE";
-	}
-	else
-	{
-		xid = &fd17a_xid;
-		level = &fd17a_level;
-		recursion = &fd17a_recursion;
-		when = "AFTER ";
-	}
-
-	if (!TransactionIdIsCurrentTransactionId(*xid))
-	{
-		*xid = GetCurrentTransactionId();
-		*level = 0;
-		*recursion = true;
-	}
-
-	if (*level == 17)
-	{
-		*recursion = false;
-		return PointerGetDatum(tuple);
-	}
-
-	if (!(*recursion))
-		return PointerGetDatum(tuple);
-
-	(*level)++;
-
-	SPI_connect();
-
-	fieldval = SPI_getvalue(tuple, tupdesc, 1);
-	fieldtype = SPI_gettype(tupdesc, 1);
-
-	query = (char *) palloc(100 + NAMEDATALEN * 3 +
-							strlen(fieldval) + strlen(fieldtype));
-
-	sprintf(query, "insert into %s select * from %s where %s = '%s'::%s",
-			SPI_getrelname(rel), SPI_getrelname(rel),
-			SPI_fname(tupdesc, 1),
-			fieldval, fieldtype);
-
-	if ((ret = SPI_exec(query, 0)) < 0)
-		elog(ERROR, "funny_dup17 (fired %s) on level %3d: SPI_exec (insert ...) returned %d",
-			 when, *level, ret);
-
-	inserted = SPI_processed;
-
-	sprintf(query, "select count (*) from %s where %s = '%s'::%s",
-			SPI_getrelname(rel),
-			SPI_fname(tupdesc, 1),
-			fieldval, fieldtype);
-
-	if ((ret = SPI_exec(query, 0)) < 0)
-		elog(ERROR, "funny_dup17 (fired %s) on level %3d: SPI_exec (select ...) returned %d",
-			 when, *level, ret);
-
-	if (SPI_processed > 0)
-	{
-		selected = DatumGetInt32(DirectFunctionCall1(int4in,
-													 CStringGetDatum(SPI_getvalue(
-																				  SPI_tuptable->vals[0],
-																				  SPI_tuptable->tupdesc,
-																				  1
-																				  ))));
-	}
-
-	elog(DEBUG4, "funny_dup17 (fired %s) on level %3d: " UINT64_FORMAT "/%d tuples inserted/selected",
-		 when, *level, inserted, selected);
-
-	SPI_finish();
-
-	(*level)--;
-
-	if (*level == 0)
-		*xid = InvalidTransactionId;
 
 	return PointerGetDatum(tuple);
 }
@@ -614,7 +387,7 @@ ttdummy(PG_FUNCTION_ARGS)
 		/* Prepare plan for query */
 		pplan = SPI_prepare(query, natts, ctypes);
 		if (pplan == NULL)
-			elog(ERROR, "ttdummy (%s): SPI_prepare returned %d", relname, SPI_result);
+			elog(ERROR, "ttdummy (%s): SPI_prepare returned %s", relname, SPI_result_code_string(SPI_result));
 
 		if (SPI_keepplan(pplan))
 			elog(ERROR, "ttdummy (%s): SPI_keepplan failed", relname);
@@ -669,12 +442,12 @@ set_ttdummy(PG_FUNCTION_ARGS)
 
 
 /*
- * Type int44 has no real-world use, but the regression tests use it.
- * It's a four-element vector of int4's.
+ * Type int44 has no real-world use, but the regression tests use it
+ * (under the alias "city_budget").  It's a four-element vector of int4's.
  */
 
 /*
- *		int44in			- converts "num num ..." to internal form
+ *		int44in			- converts "num, num, ..." to internal form
  *
  *		Note: Fills any missing positions with zeroes.
  */
@@ -700,7 +473,7 @@ int44in(PG_FUNCTION_ARGS)
 }
 
 /*
- *		int44out		- converts internal form to "num num ..."
+ *		int44out		- converts internal form to "num, num, ..."
  */
 PG_FUNCTION_INFO_V1(int44out);
 
@@ -708,19 +481,14 @@ Datum
 int44out(PG_FUNCTION_ARGS)
 {
 	int32	   *an_array = (int32 *) PG_GETARG_POINTER(0);
-	char	   *result = (char *) palloc(16 * 4);	/* Allow 14 digits + sign */
-	int			i;
-	char	   *walk;
+	char	   *result = (char *) palloc(16 * 4);
+
+	snprintf(result, 16 * 4, "%d,%d,%d,%d",
+			 an_array[0],
+			 an_array[1],
+			 an_array[2],
+			 an_array[3]);
 
-	walk = result;
-	for (i = 0; i < 4; i++)
-	{
-		pg_ltoa(an_array[i], walk);
-		while (*++walk != '\0')
-			;
-		*walk++ = ' ';
-	}
-	*--walk = '\0';
 	PG_RETURN_CSTRING(result);
 }
 
@@ -770,9 +538,9 @@ make_tuple_indirect(PG_FUNCTION_ARGS)
 		struct varatt_indirect redirect_pointer;
 
 		/* only work on existing, not-null varlenas */
-		if (tupdesc->attrs[i]->attisdropped ||
+		if (TupleDescAttr(tupdesc, i)->attisdropped ||
 			nulls[i] ||
-			tupdesc->attrs[i]->attlen != -1)
+			TupleDescAttr(tupdesc, i)->attlen != -1)
 			continue;
 
 		attr = (struct varlena *) DatumGetPointer(values[i]);
@@ -1098,3 +866,11 @@ test_atomic_ops(PG_FUNCTION_ARGS)
 
 	PG_RETURN_BOOL(true);
 }
+
+PG_FUNCTION_INFO_V1(test_fdw_handler);
+Datum
+test_fdw_handler(PG_FUNCTION_ARGS)
+{
+	elog(ERROR, "test_fdw_handler is not implemented");
+	PG_RETURN_NULL();
+}
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 76b0de30a7..27cd49845e 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -63,6 +63,7 @@ test: copyselect
 test: copydml
 test: create_misc
 test: create_operator
+test: create_procedure
 test: create_index
 test: create_view
 test: create_aggregate
@@ -79,6 +80,7 @@ test: updatable_views
 test: rolenames
 test: roleattributes
 test: create_am
+test: hash_func
 test: sanity_check
 test: errors
 test: select
@@ -134,6 +136,7 @@ test: stats_ext
 test: rules
 test: psql_crosstab
 test: select_parallel
+test: write_parallel
 test: publication
 test: subscription
 test: amutils
@@ -170,12 +173,17 @@ test: conversion
 test: truncate
 test: alter_table
 test: sequence
-test: identity
 test: polymorphism
 test: rowtypes
 test: returning
 test: largeobject
 test: with
 test: xml
+test: identity
+test: partition_join
+test: partition_prune
+test: reloptions
+test: hash_part
+test: indexing
 test: event_trigger
 test: stats
diff --git a/src/test/regress/sql/aggregates.sql b/src/test/regress/sql/aggregates.sql
index 2eeb3eedbd..506d0442d7 100644
--- a/src/test/regress/sql/aggregates.sql
+++ b/src/test/regress/sql/aggregates.sql
@@ -524,6 +524,8 @@ drop table bytea_test_table;
 
 select min(unique1) filter (where unique1 > 100) from tenk1;
 
+select sum(1/ten) filter (where ten > 0) from tenk1;
+
 select ten, sum(distinct four) filter (where four::text ~ '123') from onek a
 group by ten;
 
@@ -739,6 +741,23 @@ select my_avg(one) filter (where one > 1),my_sum(one) from (values(1),(3)) t(one
 -- this should not share the state due to different input columns.
 select my_avg(one),my_sum(two) from (values(1,2),(3,4)) t(one,two);
 
+-- exercise cases where OSAs share state
+select
+  percentile_cont(0.5) within group (order by a),
+  percentile_disc(0.5) within group (order by a)
+from (values(1::float8),(3),(5),(7)) t(a);
+
+select
+  percentile_cont(0.25) within group (order by a),
+  percentile_disc(0.5) within group (order by a)
+from (values(1::float8),(3),(5),(7)) t(a);
+
+-- these can't share state currently
+select
+  rank(4) within group (order by a),
+  dense_rank(4) within group (order by a)
+from (values(1),(3),(5),(7)) t(a);
+
 -- test that aggs with the same sfunc and initcond share the same agg state
 create aggregate my_sum_init(int4)
 (
@@ -824,3 +843,67 @@ create aggregate my_half_sum(int4)
 select my_sum(one),my_half_sum(one) from (values(1),(2),(3),(4)) t(one);
 
 rollback;
+
+
+-- test that the aggregate transition logic correctly handles
+-- transition / combine functions returning NULL
+
+-- First test the case of a normal transition function returning NULL
+BEGIN;
+CREATE FUNCTION balkifnull(int8, int4)
+RETURNS int8
+STRICT
+LANGUAGE plpgsql AS $$
+BEGIN
+    IF $1 IS NULL THEN
+       RAISE 'erroneously called with NULL argument';
+    END IF;
+    RETURN NULL;
+END$$;
+
+CREATE AGGREGATE balk(int4)
+(
+    SFUNC = balkifnull(int8, int4),
+    STYPE = int8,
+    PARALLEL = SAFE,
+    INITCOND = '0'
+);
+
+SELECT balk(hundred) FROM tenk1;
+
+ROLLBACK;
+
+-- Secondly test the case of a parallel aggregate combiner function
+-- returning NULL. For that use normal transition function, but a
+-- combiner function returning NULL.
+BEGIN ISOLATION LEVEL REPEATABLE READ;
+CREATE FUNCTION balkifnull(int8, int8)
+RETURNS int8
+PARALLEL SAFE
+STRICT
+LANGUAGE plpgsql AS $$
+BEGIN
+    IF $1 IS NULL THEN
+       RAISE 'erroneously called with NULL argument';
+    END IF;
+    RETURN NULL;
+END$$;
+
+CREATE AGGREGATE balk(int4)
+(
+    SFUNC = int4_sum(int8, int4),
+    STYPE = int8,
+    COMBINEFUNC = balkifnull(int8, int8),
+    PARALLEL = SAFE,
+    INITCOND = '0'
+);
+
+-- force use of parallelism
+ALTER TABLE tenk1 set (parallel_workers = 4);
+SET LOCAL parallel_setup_cost=0;
+SET LOCAL max_parallel_workers_per_gather=4;
+
+EXPLAIN (COSTS OFF) SELECT balk(hundred) FROM tenk1;
+SELECT balk(hundred) FROM tenk1;
+
+ROLLBACK;
diff --git a/src/test/regress/sql/alter_generic.sql b/src/test/regress/sql/alter_generic.sql
index 311812e351..96be6e752a 100644
--- a/src/test/regress/sql/alter_generic.sql
+++ b/src/test/regress/sql/alter_generic.sql
@@ -543,6 +543,9 @@ ALTER TEXT SEARCH TEMPLATE alt_ts_temp2 SET SCHEMA alt_nsp2;    -- OK
 CREATE TEXT SEARCH TEMPLATE alt_ts_temp2 (lexize=dsimple_lexize);
 ALTER TEXT SEARCH TEMPLATE alt_ts_temp2 SET SCHEMA alt_nsp2;    -- failed (name conflict)
 
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH TEMPLATE tstemp_case ("Init" = init_function);
+
 SELECT nspname, tmplname
   FROM pg_ts_template t, pg_namespace n
   WHERE t.tmplnamespace = n.oid AND nspname like 'alt_nsp%'
@@ -565,6 +568,9 @@ CREATE TEXT SEARCH PARSER alt_ts_prs2
     (start = prsd_start, gettoken = prsd_nexttoken, end = prsd_end, lextypes = prsd_lextype);
 ALTER TEXT SEARCH PARSER alt_ts_prs2 SET SCHEMA alt_nsp2;   -- failed (name conflict)
 
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH PARSER tspars_case ("Start" = start_function);
+
 SELECT nspname, prsname
   FROM pg_ts_parser t, pg_namespace n
   WHERE t.prsnamespace = n.oid AND nspname like 'alt_nsp%'
diff --git a/src/test/regress/sql/alter_operator.sql b/src/test/regress/sql/alter_operator.sql
index 51ffd7e0e0..fd40370165 100644
--- a/src/test/regress/sql/alter_operator.sql
+++ b/src/test/regress/sql/alter_operator.sql
@@ -81,6 +81,9 @@ ALTER OPERATOR === (boolean, boolean) SET (JOIN = non_existent_func);
 ALTER OPERATOR === (boolean, boolean) SET (COMMUTATOR = !==);
 ALTER OPERATOR === (boolean, boolean) SET (NEGATOR = !==);
 
+-- invalid: non-lowercase quoted identifiers
+ALTER OPERATOR & (bit, bit) SET ("Restrict" = _int_contsel, "Join" = _int_contjoinsel);
+
 --
 -- Test permission check. Must be owner to ALTER OPERATOR.
 --
diff --git a/src/test/regress/sql/alter_table.sql b/src/test/regress/sql/alter_table.sql
index 9a20dd141a..b73f523e8a 100644
--- a/src/test/regress/sql/alter_table.sql
+++ b/src/test/regress/sql/alter_table.sql
@@ -1,5 +1,15 @@
 --
 -- ALTER_TABLE
+--
+
+-- Clean up in case a prior regression run failed
+SET client_min_messages TO 'warning';
+DROP ROLE IF EXISTS regress_alter_user1;
+RESET client_min_messages;
+
+CREATE USER regress_alter_user1;
+
+--
 -- add attribute
 --
 
@@ -142,6 +152,22 @@ INSERT INTO tmp (a, b, c, d, e, f, g, h, i, j, k, l, m, n, p, q, r, s, t, u,
 
 SELECT * FROM tmp;
 
+CREATE INDEX tmp_idx ON tmp (a, (d + e), b);
+
+ALTER INDEX tmp_idx ALTER COLUMN 0 SET STATISTICS 1000;
+
+ALTER INDEX tmp_idx ALTER COLUMN 1 SET STATISTICS 1000;
+
+ALTER INDEX tmp_idx ALTER COLUMN 2 SET STATISTICS 1000;
+
+\d+ tmp_idx
+
+ALTER INDEX tmp_idx ALTER COLUMN 3 SET STATISTICS 1000;
+
+ALTER INDEX tmp_idx ALTER COLUMN 4 SET STATISTICS 1000;
+
+ALTER INDEX tmp_idx ALTER COLUMN 2 SET STATISTICS -1;
+
 DROP TABLE tmp;
 
 
@@ -193,10 +219,19 @@ ALTER INDEX IF EXISTS __tmp_onek_unique1 RENAME TO onek_unique1;
 
 ALTER INDEX onek_unique1 RENAME TO tmp_onek_unique1;
 ALTER INDEX tmp_onek_unique1 RENAME TO onek_unique1;
+
+SET ROLE regress_alter_user1;
+ALTER INDEX onek_unique1 RENAME TO fail;  -- permission denied
+RESET ROLE;
+
 -- renaming views
 CREATE VIEW tmp_view (unique1) AS SELECT unique1 FROM tenk1;
 ALTER TABLE tmp_view RENAME TO tmp_view_new;
 
+SET ROLE regress_alter_user1;
+ALTER VIEW tmp_view_new RENAME TO fail;  -- permission denied
+RESET ROLE;
+
 -- hack to ensure we get an indexscan here
 set enable_seqscan to off;
 set enable_bitmapscan to off;
@@ -1314,6 +1349,22 @@ create table tab1 (a int, b text);
 create table tab2 (x int, y tab1);
 alter table tab1 alter column b type varchar; -- fails
 
+-- Alter column type that's part of a partitioned index
+create table at_partitioned (a int, b text) partition by range (a);
+create table at_part_1 partition of at_partitioned for values from (0) to (1000);
+insert into at_partitioned values (512, '0.123');
+create table at_part_2 (b text, a int);
+insert into at_part_2 values ('1.234', 1024);
+create index on at_partitioned (b);
+create index on at_partitioned (a);
+\d at_part_1
+\d at_part_2
+alter table at_partitioned attach partition at_part_2 for values from (1000) to (2000);
+\d at_part_2
+alter table at_partitioned alter column b type numeric using b::numeric;
+\d at_part_1
+\d at_part_2
+
 -- disallow recursive containment of row types
 create temp table recur1 (f1 int);
 alter table recur1 add column f2 recur1; -- fails
@@ -1402,6 +1453,26 @@ ROLLBACK;
 \d check_fk_presence_2
 DROP TABLE check_fk_presence_1, check_fk_presence_2;
 
+-- check column addition within a view (bug #14876)
+create table at_base_table(id int, stuff text);
+insert into at_base_table values (23, 'skidoo');
+create view at_view_1 as select * from at_base_table bt;
+create view at_view_2 as select *, to_json(v1) as j from at_view_1 v1;
+\d+ at_view_1
+\d+ at_view_2
+explain (verbose, costs off) select * from at_view_2;
+select * from at_view_2;
+
+create or replace view at_view_1 as select *, 2+2 as more from at_base_table bt;
+\d+ at_view_1
+\d+ at_view_2
+explain (verbose, costs off) select * from at_view_2;
+select * from at_view_2;
+
+drop view at_view_2;
+drop view at_view_1;
+drop table at_base_table;
+
 --
 -- lock levels
 --
@@ -1698,6 +1769,14 @@ ALTER TYPE test_type2 RENAME ATTRIBUTE a TO aa CASCADE;
 
 DROP TABLE test_tbl2_subclass;
 
+CREATE TYPE test_typex AS (a int, b text);
+CREATE TABLE test_tblx (x int, y test_typex check ((y).a > 0));
+ALTER TYPE test_typex DROP ATTRIBUTE a; -- fails
+ALTER TYPE test_typex DROP ATTRIBUTE a CASCADE;
+\d test_tblx
+DROP TABLE test_tblx;
+DROP TYPE test_typex;
+
 -- This test isn't that interesting on its own, but the purpose is to leave
 -- behind a table to test pg_upgrade with. The table has a composite type
 -- column in it, and the composite type has a dropped attribute.
@@ -1956,8 +2035,6 @@ CREATE TABLE partitioned (
 	a int,
 	b int
 ) PARTITION BY RANGE (a, (a+b+1));
-ALTER TABLE partitioned ADD UNIQUE (a);
-ALTER TABLE partitioned ADD PRIMARY KEY (a);
 ALTER TABLE partitioned ADD FOREIGN KEY (a) REFERENCES blah;
 ALTER TABLE partitioned ADD EXCLUDE USING gist (a WITH &&);
 
@@ -2095,6 +2172,14 @@ SELECT conislocal, coninhcount FROM pg_constraint WHERE conrelid = 'part_1'::reg
 -- check that the new partition won't overlap with an existing partition
 CREATE TABLE fail_part (LIKE part_1 INCLUDING CONSTRAINTS);
 ALTER TABLE list_parted ATTACH PARTITION fail_part FOR VALUES IN (1);
+DROP TABLE fail_part;
+-- check that an existing table can be attached as a default partition
+CREATE TABLE def_part (LIKE list_parted INCLUDING CONSTRAINTS);
+ALTER TABLE list_parted ATTACH PARTITION def_part DEFAULT;
+-- check attaching default partition fails if a default partition already
+-- exists
+CREATE TABLE fail_def_part (LIKE part_1 INCLUDING CONSTRAINTS);
+ALTER TABLE list_parted ATTACH PARTITION fail_def_part DEFAULT;
 
 -- check validation when attaching list partitions
 CREATE TABLE list_parted2 (
@@ -2111,6 +2196,15 @@ ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
 DELETE FROM part_2;
 ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
 
+-- check partition cannot be attached if default has some row for its values
+CREATE TABLE list_parted2_def PARTITION OF list_parted2 DEFAULT;
+INSERT INTO list_parted2_def VALUES (11, 'z');
+CREATE TABLE part_3 (LIKE list_parted2);
+ALTER TABLE list_parted2 ATTACH PARTITION part_3 FOR VALUES IN (11);
+-- should be ok after deleting the bad row
+DELETE FROM list_parted2_def WHERE a = 11;
+ALTER TABLE list_parted2 ATTACH PARTITION part_3 FOR VALUES IN (11);
+
 -- adding constraints that describe the desired partition constraint
 -- (or more restrictive) will help skip the validation scan
 CREATE TABLE part_3_4 (
@@ -2128,6 +2222,9 @@ ALTER TABLE list_parted2 DETACH PARTITION part_3_4;
 ALTER TABLE part_3_4 ALTER a SET NOT NULL;
 ALTER TABLE list_parted2 ATTACH PARTITION part_3_4 FOR VALUES IN (3, 4);
 
+-- check if default partition scan skipped
+ALTER TABLE list_parted2_def ADD CONSTRAINT check_a CHECK (a IN (5, 6));
+CREATE TABLE part_55_66 PARTITION OF list_parted2 FOR VALUES IN (55, 66);
 
 -- check validation when attaching range partitions
 CREATE TABLE range_parted (
@@ -2156,6 +2253,21 @@ CREATE TABLE part2 (
 );
 ALTER TABLE range_parted ATTACH PARTITION part2 FOR VALUES FROM (1, 10) TO (1, 20);
 
+-- Create default partition
+CREATE TABLE partr_def1 PARTITION OF range_parted DEFAULT;
+
+-- Only one default partition is allowed, hence, following should give error
+CREATE TABLE partr_def2 (LIKE part1 INCLUDING CONSTRAINTS);
+ALTER TABLE range_parted ATTACH PARTITION partr_def2 DEFAULT;
+
+-- Overlapping partitions cannot be attached, hence, following should give error
+INSERT INTO partr_def1 VALUES (2, 10);
+CREATE TABLE part3 (LIKE range_parted);
+ALTER TABLE range_parted ATTACH partition part3 FOR VALUES FROM (2, 10) TO (2, 20);
+
+-- Attaching partitions should be successful when there are no overlapping rows
+ALTER TABLE range_parted ATTACH partition part3 FOR VALUES FROM (3, 10) TO (3, 20);
+
 -- check that leaf partitions are scanned when attaching a partitioned
 -- table
 CREATE TABLE part_5 (
@@ -2216,6 +2328,18 @@ INSERT INTO part_7 (a, b) VALUES (8, null), (9, 'a');
 SELECT tableoid::regclass, a, b FROM part_7 order by a;
 ALTER TABLE list_parted2 ATTACH PARTITION part_7 FOR VALUES IN (7);
 
+-- check that leaf partitions of default partition are scanned when
+-- attaching a partitioned table.
+ALTER TABLE part_5 DROP CONSTRAINT check_a;
+CREATE TABLE part5_def PARTITION OF part_5 DEFAULT PARTITION BY LIST(a);
+CREATE TABLE part5_def_p1 PARTITION OF part5_def FOR VALUES IN (5);
+INSERT INTO part5_def_p1 VALUES (5, 'y');
+CREATE TABLE part5_p1 (LIKE part_5);
+ALTER TABLE part_5 ATTACH PARTITION part5_p1 FOR VALUES IN ('y');
+-- should be ok after deleting the bad row
+DELETE FROM part5_def_p1 WHERE b = 'y';
+ALTER TABLE part_5 ATTACH PARTITION part5_p1 FOR VALUES IN ('y');
+
 -- check that the table being attached is not already a partition
 ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
 
@@ -2223,6 +2347,81 @@ ALTER TABLE list_parted2 ATTACH PARTITION part_2 FOR VALUES IN (2);
 ALTER TABLE part_5 ATTACH PARTITION list_parted2 FOR VALUES IN ('b');
 ALTER TABLE list_parted2 ATTACH PARTITION list_parted2 FOR VALUES IN (0);
 
+-- If a partitioned table being created or an existing table being attached
+-- as a paritition does not have a constraint that would allow validation scan
+-- to be skipped, but an individual partition does, then the partition's
+-- validation scan is skipped.
+CREATE TABLE quuux (a int, b text) PARTITION BY LIST (a);
+CREATE TABLE quuux_default PARTITION OF quuux DEFAULT PARTITION BY LIST (b);
+CREATE TABLE quuux_default1 PARTITION OF quuux_default (
+	CONSTRAINT check_1 CHECK (a IS NOT NULL AND a = 1)
+) FOR VALUES IN ('b');
+CREATE TABLE quuux1 (a int, b text);
+ALTER TABLE quuux ATTACH PARTITION quuux1 FOR VALUES IN (1); -- validate!
+CREATE TABLE quuux2 (a int, b text);
+ALTER TABLE quuux ATTACH PARTITION quuux2 FOR VALUES IN (2); -- skip validation
+DROP TABLE quuux1, quuux2;
+-- should validate for quuux1, but not for quuux2
+CREATE TABLE quuux1 PARTITION OF quuux FOR VALUES IN (1);
+CREATE TABLE quuux2 PARTITION OF quuux FOR VALUES IN (2);
+DROP TABLE quuux;
+
+-- check validation when attaching hash partitions
+
+-- The default hash functions as they exist today aren't portable; they can
+-- return different results on different machines.  Depending upon how the
+-- values are hashed, the row may map to different partitions, which result in
+-- regression failure.  To avoid this, let's create a non-default hash function
+-- that just returns the input value unchanged.
+CREATE OR REPLACE FUNCTION dummy_hashint4(a int4, seed int8) RETURNS int8 AS
+$$ BEGIN RETURN (a + 1 + seed); END; $$ LANGUAGE 'plpgsql' IMMUTABLE;
+CREATE OPERATOR CLASS custom_opclass FOR TYPE int4 USING HASH AS
+OPERATOR 1 = , FUNCTION 2 dummy_hashint4(int4, int8);
+
+-- check that the new partition won't overlap with an existing partition
+CREATE TABLE hash_parted (
+	a int,
+	b int
+) PARTITION BY HASH (a custom_opclass);
+CREATE TABLE hpart_1 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 4, REMAINDER 0);
+CREATE TABLE fail_part (LIKE hpart_1);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 4);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 0);
+DROP TABLE fail_part;
+
+-- check validation when attaching hash partitions
+
+-- check that violating rows are correctly reported
+CREATE TABLE hpart_2 (LIKE hash_parted);
+INSERT INTO hpart_2 VALUES (3, 0);
+ALTER TABLE hash_parted ATTACH PARTITION hpart_2 FOR VALUES WITH (MODULUS 4, REMAINDER 1);
+
+-- should be ok after deleting the bad row
+DELETE FROM hpart_2;
+ALTER TABLE hash_parted ATTACH PARTITION hpart_2 FOR VALUES WITH (MODULUS 4, REMAINDER 1);
+
+-- check that leaf partitions are scanned when attaching a partitioned
+-- table
+CREATE TABLE hpart_5 (
+	LIKE hash_parted
+) PARTITION BY LIST (b);
+
+-- check that violating rows are correctly reported
+CREATE TABLE hpart_5_a PARTITION OF hpart_5 FOR VALUES IN ('1', '2', '3');
+INSERT INTO hpart_5_a (a, b) VALUES (7, 1);
+ALTER TABLE hash_parted ATTACH PARTITION hpart_5 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+
+-- should be ok after deleting the bad row
+DELETE FROM hpart_5_a;
+ALTER TABLE hash_parted ATTACH PARTITION hpart_5 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+
+-- check that the table being attach is with valid modulus and remainder value
+CREATE TABLE fail_part(LIKE hash_parted);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 0, REMAINDER 1);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 8, REMAINDER 8);
+ALTER TABLE hash_parted ATTACH PARTITION fail_part FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+DROP TABLE fail_part;
+
 --
 -- DETACH PARTITION
 --
@@ -2234,12 +2433,16 @@ DROP TABLE regular_table;
 
 -- check that the partition being detached exists at all
 ALTER TABLE list_parted2 DETACH PARTITION part_4;
+ALTER TABLE hash_parted DETACH PARTITION hpart_4;
 
 -- check that the partition being detached is actually a partition of the parent
 CREATE TABLE not_a_part (a int);
 ALTER TABLE list_parted2 DETACH PARTITION not_a_part;
 ALTER TABLE list_parted2 DETACH PARTITION part_1;
 
+ALTER TABLE hash_parted DETACH PARTITION not_a_part;
+DROP TABLE not_a_part;
+
 -- check that, after being detached, attinhcount/coninhcount is dropped to 0 and
 -- attislocal/conislocal is set to true
 ALTER TABLE list_parted2 DETACH PARTITION part_3_4;
@@ -2309,8 +2512,16 @@ ALTER TABLE part_2 INHERIT inh_test;
 ALTER TABLE list_parted2 DROP COLUMN b;
 ALTER TABLE list_parted2 ALTER COLUMN b TYPE text;
 
+-- dropping non-partition key columns should be allowed on the parent table.
+ALTER TABLE list_parted DROP COLUMN b;
+SELECT * FROM list_parted;
+
 -- cleanup
 DROP TABLE list_parted, list_parted2, range_parted;
+DROP TABLE fail_def_part;
+DROP TABLE hash_parted;
+DROP OPERATOR CLASS custom_opclass USING HASH;
+DROP FUNCTION dummy_hashint4(a int4, seed int8);
 
 -- more tests for certain multi-level partitioning scenarios
 create table p (a int, b int) partition by range (a, b);
@@ -2345,3 +2556,12 @@ create table parted_validate_test_1 partition of parted_validate_test for values
 alter table parted_validate_test add constraint parted_validate_test_chka check (a > 0) not valid;
 alter table parted_validate_test validate constraint parted_validate_test_chka;
 drop table parted_validate_test;
+-- test alter column options
+CREATE TABLE tmp(i integer);
+INSERT INTO tmp VALUES (1);
+ALTER TABLE tmp ALTER COLUMN i SET (n_distinct = 1, n_distinct_inherited = 2);
+ALTER TABLE tmp ALTER COLUMN i RESET (n_distinct_inherited);
+ANALYZE tmp;
+DROP TABLE tmp;
+
+DROP USER regress_alter_user1;
diff --git a/src/test/regress/sql/cluster.sql b/src/test/regress/sql/cluster.sql
index 8dd9459bda..522bfeead4 100644
--- a/src/test/regress/sql/cluster.sql
+++ b/src/test/regress/sql/cluster.sql
@@ -196,6 +196,13 @@ drop table clstr_temp;
 
 RESET SESSION AUTHORIZATION;
 
+-- Check that partitioned tables cannot be clustered
+CREATE TABLE clstrpart (a int) PARTITION BY RANGE (a);
+CREATE INDEX clstrpart_idx ON clstrpart (a);
+ALTER TABLE clstrpart CLUSTER ON clstrpart_idx;
+CLUSTER clstrpart USING clstrpart_idx;
+DROP TABLE clstrpart;
+
 -- Test CLUSTER with external tuplesorting
 
 create table clstr_4 as select * from tenk1;
@@ -203,19 +210,8 @@ create index cluster_sort on clstr_4 (hundred, thousand, tenthous);
 -- ensure we don't use the index in CLUSTER nor the checking SELECTs
 set enable_indexscan = off;
 
--- Use external sort that only ever uses quicksort to sort runs:
+-- Use external sort:
 set maintenance_work_mem = '1MB';
-set replacement_sort_tuples = 0;
-cluster clstr_4 using cluster_sort;
-select * from
-(select hundred, lag(hundred) over () as lhundred,
-        thousand, lag(thousand) over () as lthousand,
-        tenthous, lag(tenthous) over () as ltenthous from clstr_4) ss
-where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
-
--- Replacement selection will now be forced.  It should only produce a single
--- run, due to the fact that input is found to be presorted:
-set replacement_sort_tuples = 150000;
 cluster clstr_4 using cluster_sort;
 select * from
 (select hundred, lag(hundred) over () as lhundred,
@@ -225,7 +221,6 @@ where row(hundred, thousand, tenthous) <= row(lhundred, lthousand, ltenthous);
 
 reset enable_indexscan;
 reset maintenance_work_mem;
-reset replacement_sort_tuples;
 
 -- clean up
 DROP TABLE clustertest;
diff --git a/src/test/regress/sql/collate.sql b/src/test/regress/sql/collate.sql
index 698f577490..4ddde95a5e 100644
--- a/src/test/regress/sql/collate.sql
+++ b/src/test/regress/sql/collate.sql
@@ -239,6 +239,8 @@ DROP COLLATION mycoll1;
 CREATE TABLE collate_test23 (f1 text collate mycoll2);
 DROP COLLATION mycoll2;  -- fail
 
+-- invalid: non-lowercase quoted identifiers
+CREATE COLLATION case_coll ("Lc_Collate" = "POSIX", "Lc_Ctype" = "POSIX");
 
 -- 9.1 bug with useless COLLATE in an expression subject to length coercion
 
diff --git a/src/test/regress/sql/create_aggregate.sql b/src/test/regress/sql/create_aggregate.sql
index ae3a6c0ebe..590ca9a624 100644
--- a/src/test/regress/sql/create_aggregate.sql
+++ b/src/test/regress/sql/create_aggregate.sql
@@ -86,7 +86,8 @@ create aggregate my_percentile_disc(float8 ORDER BY anyelement) (
   stype = internal,
   sfunc = ordered_set_transition,
   finalfunc = percentile_disc_final,
-  finalfunc_extra = true
+  finalfunc_extra = true,
+  finalfunc_modify = read_write
 );
 
 create aggregate my_rank(VARIADIC "any" ORDER BY VARIADIC "any") (
@@ -161,11 +162,13 @@ CREATE AGGREGATE myavg (numeric)
 	finalfunc = numeric_avg,
 	serialfunc = numeric_avg_serialize,
 	deserialfunc = numeric_avg_deserialize,
-	combinefunc = numeric_avg_combine
+	combinefunc = numeric_avg_combine,
+	finalfunc_modify = sharable  -- just to test a non-default setting
 );
 
 -- Ensure all these functions made it into the catalog
-SELECT aggfnoid,aggtransfn,aggcombinefn,aggtranstype,aggserialfn,aggdeserialfn
+SELECT aggfnoid, aggtransfn, aggcombinefn, aggtranstype::regtype,
+       aggserialfn, aggdeserialfn, aggfinalmodify
 FROM pg_aggregate
 WHERE aggfnoid = 'myavg'::REGPROC;
 
@@ -208,3 +211,23 @@ CREATE AGGREGATE wrongreturntype (float8)
     msfunc = float8pl,
     minvfunc = float8mi_int
 );
+
+-- invalid: non-lowercase quoted identifiers
+
+CREATE AGGREGATE case_agg ( -- old syntax
+	"Sfunc1" = int4pl,
+	"Basetype" = int4,
+	"Stype1" = int4,
+	"Initcond1" = '0',
+	"Parallel" = safe
+);
+
+CREATE AGGREGATE case_agg(float8)
+(
+	"Stype" = internal,
+	"Sfunc" = ordered_set_transition,
+	"Finalfunc" = percentile_disc_final,
+	"Finalfunc_extra" = true,
+	"Finalfunc_modify" = read_write,
+	"Parallel" = safe
+);
diff --git a/src/test/regress/sql/create_am.sql b/src/test/regress/sql/create_am.sql
index 2f116d98c7..3e0ac104f3 100644
--- a/src/test/regress/sql/create_am.sql
+++ b/src/test/regress/sql/create_am.sql
@@ -27,12 +27,10 @@ CREATE OPERATOR CLASS box_ops DEFAULT
 	OPERATOR 14	@,
 	FUNCTION 1	gist_box_consistent(internal, box, smallint, oid, internal),
 	FUNCTION 2	gist_box_union(internal, internal),
-	FUNCTION 3	gist_box_compress(internal),
-	FUNCTION 4	gist_box_decompress(internal),
+	-- don't need compress, decompress, or fetch functions
 	FUNCTION 5	gist_box_penalty(internal, internal, internal),
 	FUNCTION 6	gist_box_picksplit(internal, internal),
-	FUNCTION 7	gist_box_same(box, box, internal),
-	FUNCTION 9	gist_box_fetch(internal);
+	FUNCTION 7	gist_box_same(box, box, internal);
 
 -- Create gist2 index on fast_emp4000
 CREATE INDEX grect2ind2 ON fast_emp4000 USING gist2 (home_base);
diff --git a/src/test/regress/sql/create_function_3.sql b/src/test/regress/sql/create_function_3.sql
index 0a0e407aab..fbdf8310e3 100644
--- a/src/test/regress/sql/create_function_3.sql
+++ b/src/test/regress/sql/create_function_3.sql
@@ -52,57 +52,57 @@ SELECT proname, provolatile FROM pg_proc
 --
 -- SECURITY DEFINER | INVOKER
 --
-CREATE FUNCTION functext_C_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 0';
-CREATE FUNCTION functext_C_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_2(int) RETURNS bool LANGUAGE 'sql'
        SECURITY DEFINER AS 'SELECT $1 = 0';
-CREATE FUNCTION functext_C_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_C_3(int) RETURNS bool LANGUAGE 'sql'
        SECURITY INVOKER AS 'SELECT $1 < 0';
 SELECT proname, prosecdef FROM pg_proc
-       WHERE oid in ('functext_C_1'::regproc,
-                     'functext_C_2'::regproc,
-                     'functext_C_3'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_C_1'::regproc,
+                     'functest_C_2'::regproc,
+                     'functest_C_3'::regproc) ORDER BY proname;
 
-ALTER FUNCTION functext_C_1(int) IMMUTABLE;	-- unrelated change, no effect
-ALTER FUNCTION functext_C_2(int) SECURITY INVOKER;
-ALTER FUNCTION functext_C_3(int) SECURITY DEFINER;
+ALTER FUNCTION functest_C_1(int) IMMUTABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_C_2(int) SECURITY INVOKER;
+ALTER FUNCTION functest_C_3(int) SECURITY DEFINER;
 SELECT proname, prosecdef FROM pg_proc
-       WHERE oid in ('functext_C_1'::regproc,
-                     'functext_C_2'::regproc,
-                     'functext_C_3'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_C_1'::regproc,
+                     'functest_C_2'::regproc,
+                     'functest_C_3'::regproc) ORDER BY proname;
 
 --
 -- LEAKPROOF
 --
-CREATE FUNCTION functext_E_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 100';
-CREATE FUNCTION functext_E_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_2(int) RETURNS bool LANGUAGE 'sql'
        LEAKPROOF AS 'SELECT $1 > 100';
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
 
-ALTER FUNCTION functext_E_1(int) LEAKPROOF;
-ALTER FUNCTION functext_E_2(int) STABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_E_1(int) LEAKPROOF;
+ALTER FUNCTION functest_E_2(int) STABLE;	-- unrelated change, no effect
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
 
-ALTER FUNCTION functext_E_2(int) NOT LEAKPROOF;	-- remove leakproog attribute
+ALTER FUNCTION functest_E_2(int) NOT LEAKPROOF;	-- remove leakproog attribute
 SELECT proname, proleakproof FROM pg_proc
-       WHERE oid in ('functext_E_1'::regproc,
-                     'functext_E_2'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_E_1'::regproc,
+                     'functest_E_2'::regproc) ORDER BY proname;
 
 -- it takes superuser privilege to turn on leakproof, but not for turn off
-ALTER FUNCTION functext_E_1(int) OWNER TO regress_unpriv_user;
-ALTER FUNCTION functext_E_2(int) OWNER TO regress_unpriv_user;
+ALTER FUNCTION functest_E_1(int) OWNER TO regress_unpriv_user;
+ALTER FUNCTION functest_E_2(int) OWNER TO regress_unpriv_user;
 
 SET SESSION AUTHORIZATION regress_unpriv_user;
 SET search_path TO temp_func_test, public;
-ALTER FUNCTION functext_E_1(int) NOT LEAKPROOF;
-ALTER FUNCTION functext_E_2(int) LEAKPROOF;
+ALTER FUNCTION functest_E_1(int) NOT LEAKPROOF;
+ALTER FUNCTION functest_E_2(int) LEAKPROOF;
 
-CREATE FUNCTION functext_E_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_E_3(int) RETURNS bool LANGUAGE 'sql'
        LEAKPROOF AS 'SELECT $1 < 200';	-- failed
 
 RESET SESSION AUTHORIZATION;
@@ -110,28 +110,36 @@ RESET SESSION AUTHORIZATION;
 --
 -- CALLED ON NULL INPUT | RETURNS NULL ON NULL INPUT | STRICT
 --
-CREATE FUNCTION functext_F_1(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_1(int) RETURNS bool LANGUAGE 'sql'
        AS 'SELECT $1 > 50';
-CREATE FUNCTION functext_F_2(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_2(int) RETURNS bool LANGUAGE 'sql'
        CALLED ON NULL INPUT AS 'SELECT $1 = 50';
-CREATE FUNCTION functext_F_3(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_3(int) RETURNS bool LANGUAGE 'sql'
        RETURNS NULL ON NULL INPUT AS 'SELECT $1 < 50';
-CREATE FUNCTION functext_F_4(int) RETURNS bool LANGUAGE 'sql'
+CREATE FUNCTION functest_F_4(int) RETURNS bool LANGUAGE 'sql'
        STRICT AS 'SELECT $1 = 50';
 SELECT proname, proisstrict FROM pg_proc
-       WHERE oid in ('functext_F_1'::regproc,
-                     'functext_F_2'::regproc,
-                     'functext_F_3'::regproc,
-                     'functext_F_4'::regproc) ORDER BY proname;
-
-ALTER FUNCTION functext_F_1(int) IMMUTABLE;	-- unrelated change, no effect
-ALTER FUNCTION functext_F_2(int) STRICT;
-ALTER FUNCTION functext_F_3(int) CALLED ON NULL INPUT;
+       WHERE oid in ('functest_F_1'::regproc,
+                     'functest_F_2'::regproc,
+                     'functest_F_3'::regproc,
+                     'functest_F_4'::regproc) ORDER BY proname;
+
+ALTER FUNCTION functest_F_1(int) IMMUTABLE;	-- unrelated change, no effect
+ALTER FUNCTION functest_F_2(int) STRICT;
+ALTER FUNCTION functest_F_3(int) CALLED ON NULL INPUT;
 SELECT proname, proisstrict FROM pg_proc
-       WHERE oid in ('functext_F_1'::regproc,
-                     'functext_F_2'::regproc,
-                     'functext_F_3'::regproc,
-                     'functext_F_4'::regproc) ORDER BY proname;
+       WHERE oid in ('functest_F_1'::regproc,
+                     'functest_F_2'::regproc,
+                     'functest_F_3'::regproc,
+                     'functest_F_4'::regproc) ORDER BY proname;
+
+
+-- pg_get_functiondef tests
+
+SELECT pg_get_functiondef('functest_A_1'::regproc);
+SELECT pg_get_functiondef('functest_B_3'::regproc);
+SELECT pg_get_functiondef('functest_C_3'::regproc);
+SELECT pg_get_functiondef('functest_F_2'::regproc);
 
 
 -- information_schema tests
diff --git a/src/test/regress/sql/create_index.sql b/src/test/regress/sql/create_index.sql
index 67470db918..7f17588b0d 100644
--- a/src/test/regress/sql/create_index.sql
+++ b/src/test/regress/sql/create_index.sql
@@ -682,7 +682,7 @@ CREATE INDEX hash_name_index ON hash_name_heap USING hash (random name_ops);
 
 CREATE INDEX hash_txt_index ON hash_txt_heap USING hash (random text_ops);
 
-CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops);
+CREATE INDEX hash_f8_index ON hash_f8_heap USING hash (random float8_ops) WITH (fillfactor=60);
 
 CREATE UNLOGGED TABLE unlogged_hash_table (id int4);
 CREATE INDEX unlogged_hash_index ON unlogged_hash_table USING hash (id int4_ops);
@@ -834,6 +834,12 @@ DROP INDEX cwi_replaced_pkey;	-- Should fail; a constraint depends on it
 
 DROP TABLE cwi_test;
 
+-- ADD CONSTRAINT USING INDEX is forbidden on partitioned tables
+CREATE TABLE cwi_test(a int) PARTITION BY hash (a);
+create unique index on cwi_test (a);
+alter table cwi_test add primary key using index cwi_test_a_idx ;
+DROP TABLE cwi_test;
+
 --
 -- Check handling of indexes on system columns
 --
diff --git a/src/test/regress/sql/create_misc.sql b/src/test/regress/sql/create_misc.sql
index 705a7e55b1..d4a63b7aed 100644
--- a/src/test/regress/sql/create_misc.sql
+++ b/src/test/regress/sql/create_misc.sql
@@ -37,6 +37,11 @@ INSERT INTO equipment_r (name, hobby) VALUES ('hightops', 'basketball');
 
 INSERT INTO equipment_r (name, hobby) VALUES ('guts', 'skywalking');
 
+INSERT INTO city VALUES
+('Podunk', '(1,2),(3,4)', '100,127,1000'),
+('Gotham', '(1000,34),(1100,334)', '123456,127,-1000,6789');
+TABLE city;
+
 SELECT *
    INTO TABLE ramp
    FROM road
diff --git a/src/test/regress/sql/create_operator.sql b/src/test/regress/sql/create_operator.sql
index 0e5d6356bc..c71765f9be 100644
--- a/src/test/regress/sql/create_operator.sql
+++ b/src/test/regress/sql/create_operator.sql
@@ -32,6 +32,10 @@ CREATE OPERATOR #%# (
    procedure = numeric_fac
 );
 
+-- Test operator created above
+SELECT point '(1,2)' <% widget '(0,0,3)' AS t,
+       point '(1,2)' <% widget '(0,0,1)' AS f;
+
 -- Test comments
 COMMENT ON OPERATOR ###### (int4, NONE) IS 'bad right unary';
 
@@ -179,3 +183,17 @@ CREATE OPERATOR #*# (
    procedure = fn_op6
 );
 ROLLBACK;
+
+-- invalid: non-lowercase quoted identifiers
+CREATE OPERATOR ===
+(
+	"Leftarg" = box,
+	"Rightarg" = box,
+	"Procedure" = area_equal_procedure,
+	"Commutator" = ===,
+	"Negator" = !==,
+	"Restrict" = area_restriction_procedure,
+	"Join" = area_join_procedure,
+	"Hashes",
+	"Merges"
+);
diff --git a/src/test/regress/sql/create_procedure.sql b/src/test/regress/sql/create_procedure.sql
new file mode 100644
index 0000000000..52318bf2a6
--- /dev/null
+++ b/src/test/regress/sql/create_procedure.sql
@@ -0,0 +1,100 @@
+CALL nonexistent();  -- error
+CALL random();  -- error
+
+CREATE FUNCTION testfunc1(a int) RETURNS int LANGUAGE SQL AS $$ SELECT a $$;
+
+CREATE TABLE cp_test (a int, b text);
+
+CREATE PROCEDURE ptest1(x text)
+LANGUAGE SQL
+AS $$
+INSERT INTO cp_test VALUES (1, x);
+$$;
+
+SELECT ptest1('x');  -- error
+CALL ptest1('a');  -- ok
+CALL ptest1('xy' || 'zzy');  -- ok, constant-folded arg
+CALL ptest1(substring(random()::text, 1, 1));  -- ok, volatile arg
+
+\df ptest1
+SELECT pg_get_functiondef('ptest1'::regproc);
+
+SELECT * FROM cp_test ORDER BY b COLLATE "C";
+
+
+CREATE PROCEDURE ptest2()
+LANGUAGE SQL
+AS $$
+SELECT 5;
+$$;
+
+CALL ptest2();
+
+
+-- nested CALL
+TRUNCATE cp_test;
+
+CREATE PROCEDURE ptest3(y text)
+LANGUAGE SQL
+AS $$
+CALL ptest1(y);
+CALL ptest1($1);
+$$;
+
+CALL ptest3('b');
+
+SELECT * FROM cp_test;
+
+
+-- various error cases
+
+CALL version();  -- error: not a procedure
+CALL sum(1);  -- error: not a procedure
+
+CREATE PROCEDURE ptestx() LANGUAGE SQL WINDOW AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+CREATE PROCEDURE ptestx() LANGUAGE SQL STRICT AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+CREATE PROCEDURE ptestx(OUT a int) LANGUAGE SQL AS $$ INSERT INTO cp_test VALUES (1, 'a') $$;
+
+ALTER PROCEDURE ptest1(text) STRICT;
+ALTER FUNCTION ptest1(text) VOLATILE;  -- error: not a function
+ALTER PROCEDURE testfunc1(int) VOLATILE;  -- error: not a procedure
+ALTER PROCEDURE nonexistent() VOLATILE;
+
+DROP FUNCTION ptest1(text);  -- error: not a function
+DROP PROCEDURE testfunc1(int);  -- error: not a procedure
+DROP PROCEDURE nonexistent();
+
+
+-- privileges
+
+CREATE USER regress_user1;
+GRANT INSERT ON cp_test TO regress_user1;
+REVOKE EXECUTE ON PROCEDURE ptest1(text) FROM PUBLIC;
+SET ROLE regress_user1;
+CALL ptest1('a');  -- error
+RESET ROLE;
+GRANT EXECUTE ON PROCEDURE ptest1(text) TO regress_user1;
+SET ROLE regress_user1;
+CALL ptest1('a');  -- ok
+RESET ROLE;
+
+
+-- ROUTINE syntax
+
+ALTER ROUTINE testfunc1(int) RENAME TO testfunc1a;
+ALTER ROUTINE testfunc1a RENAME TO testfunc1;
+
+ALTER ROUTINE ptest1(text) RENAME TO ptest1a;
+ALTER ROUTINE ptest1a RENAME TO ptest1;
+
+DROP ROUTINE testfunc1(int);
+
+
+-- cleanup
+
+DROP PROCEDURE ptest1;
+DROP PROCEDURE ptest2;
+
+DROP TABLE cp_test;
+
+DROP USER regress_user1;
diff --git a/src/test/regress/sql/create_table.sql b/src/test/regress/sql/create_table.sql
index 1c0ce92763..7d67ce05d9 100644
--- a/src/test/regress/sql/create_table.sql
+++ b/src/test/regress/sql/create_table.sql
@@ -253,6 +253,10 @@ CREATE TABLE IF NOT EXISTS test_tsvector(
 	t text
 );
 
+-- invalid: non-lowercase quoted reloptions identifiers
+CREATE TABLE tas_case WITH ("Fillfactor" = 10) AS SELECT 1 a;
+CREATE TABLE tas_case (a text) WITH ("Oids" = true);
+
 CREATE UNLOGGED TABLE unlogged1 (a int primary key);			-- OK
 CREATE TEMPORARY TABLE unlogged2 (a int primary key);			-- OK
 SELECT relname, relkind, relpersistence FROM pg_class WHERE relname ~ '^unlogged\d' ORDER BY relname;
@@ -294,10 +298,6 @@ CREATE TABLE partitioned (
 ) PARTITION BY LIST (a1, a2);	-- fail
 
 -- unsupported constraint type for partitioned tables
-CREATE TABLE partitioned (
-	a int PRIMARY KEY
-) PARTITION BY RANGE (a);
-
 CREATE TABLE pkrel (
 	a int PRIMARY KEY
 );
@@ -306,10 +306,6 @@ CREATE TABLE partitioned (
 ) PARTITION BY RANGE (a);
 DROP TABLE pkrel;
 
-CREATE TABLE partitioned (
-	a int UNIQUE
-) PARTITION BY RANGE (a);
-
 CREATE TABLE partitioned (
 	a int,
 	EXCLUDE USING gist (a WITH &&)
@@ -350,10 +346,10 @@ CREATE TABLE partitioned (
 ) PARTITION BY RANGE (const_func());
 DROP FUNCTION const_func();
 
--- only accept "list" and "range" as partitioning strategy
+-- only accept valid partitioning strategy
 CREATE TABLE partitioned (
-	a int
-) PARTITION BY HASH (a);
+    a int
+) PARTITION BY MAGIC (a);
 
 -- specified column must be present in the table
 CREATE TABLE partitioned (
@@ -415,13 +411,18 @@ DROP FUNCTION plusone(int);
 
 -- partitioned table cannot participate in regular inheritance
 CREATE TABLE partitioned2 (
-	a int
-) PARTITION BY LIST ((a+1));
+	a int,
+	b text
+) PARTITION BY RANGE ((a+1), substr(b, 1, 5));
 CREATE TABLE fail () INHERITS (partitioned2);
 
 -- Partition key in describe output
 \d partitioned
-\d partitioned2
+\d+ partitioned2
+
+INSERT INTO partitioned2 VALUES (1, 'hello');
+CREATE TABLE part2_1 PARTITION OF partitioned2 FOR VALUES FROM (-1, 'aaaaa') TO (100, 'ccccc');
+\d+ part2_1
 
 DROP TABLE partitioned, partitioned2;
 
@@ -446,6 +447,12 @@ CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES IN ('1'::int);
 CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES IN ();
 -- trying to specify range for list partitioned table
 CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES FROM (1) TO (2);
+-- trying to specify modulus and remainder for list partitioned table
+CREATE TABLE fail_part PARTITION OF list_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
+
+-- check default partition cannot be created more than once
+CREATE TABLE part_default PARTITION OF list_parted DEFAULT;
+CREATE TABLE fail_default_part PARTITION OF list_parted DEFAULT;
 
 -- specified literal can't be cast to the partition column data type
 CREATE TABLE bools (
@@ -477,6 +484,8 @@ CREATE TABLE range_parted (
 
 -- trying to specify list for range partitioned table
 CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES IN ('a');
+-- trying to specify modulus and remainder for range partitioned table
+CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
 -- each of start and end bounds must have same number of values as the
 -- length of the partition key
 CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES FROM ('a', 1) TO ('z');
@@ -485,6 +494,28 @@ CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES FROM ('a') TO ('z',
 -- cannot specify null values in range bounds
 CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES FROM (null) TO (maxvalue);
 
+-- trying to specify modulus and remainder for range partitioned table
+CREATE TABLE fail_part PARTITION OF range_parted FOR VALUES WITH (MODULUS 10, REMAINDER 1);
+
+-- check partition bound syntax for the hash partition
+CREATE TABLE hash_parted (
+	a int
+) PARTITION BY HASH (a);
+CREATE TABLE hpart_1 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 10, REMAINDER 0);
+CREATE TABLE hpart_2 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 50, REMAINDER 1);
+CREATE TABLE hpart_3 PARTITION OF hash_parted FOR VALUES WITH (MODULUS 200, REMAINDER 2);
+-- modulus 25 is factor of modulus of 50 but 10 is not factor of 25.
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES WITH (MODULUS 25, REMAINDER 3);
+-- previous modulus 50 is factor of 150 but this modulus is not factor of next modulus 200.
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES WITH (MODULUS 150, REMAINDER 3);
+-- trying to specify range for the hash partitioned table
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES FROM ('a', 1) TO ('z');
+-- trying to specify list value for the hash partitioned table
+CREATE TABLE fail_part PARTITION OF hash_parted FOR VALUES IN (1000);
+
+-- trying to create default partition for the hash partitioned table
+CREATE TABLE fail_default_part PARTITION OF hash_parted DEFAULT;
+
 -- check if compatible with the specified parent
 
 -- cannot create as partition of a non-partitioned table
@@ -492,6 +523,7 @@ CREATE TABLE unparted (
 	a int
 );
 CREATE TABLE fail_part PARTITION OF unparted FOR VALUES IN ('a');
+CREATE TABLE fail_part PARTITION OF unparted FOR VALUES WITH (MODULUS 2, REMAINDER 1);
 DROP TABLE unparted;
 
 -- cannot create a permanent rel as partition of a temp rel
@@ -524,9 +556,13 @@ CREATE TABLE list_parted2 (
 ) PARTITION BY LIST (a);
 CREATE TABLE part_null_z PARTITION OF list_parted2 FOR VALUES IN (null, 'z');
 CREATE TABLE part_ab PARTITION OF list_parted2 FOR VALUES IN ('a', 'b');
+CREATE TABLE list_parted2_def PARTITION OF list_parted2 DEFAULT;
 
 CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN (null);
 CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN ('b', 'c');
+-- check default partition overlap
+INSERT INTO list_parted2 VALUES('X');
+CREATE TABLE fail_part PARTITION OF list_parted2 FOR VALUES IN ('W', 'X', 'Y');
 
 CREATE TABLE range_parted2 (
 	a int
@@ -546,6 +582,17 @@ CREATE TABLE part3 PARTITION OF range_parted2 FOR VALUES FROM (30) TO (40);
 CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (10) TO (30);
 CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (10) TO (50);
 
+-- Create a default partition for range partitioned table
+CREATE TABLE range2_default PARTITION OF range_parted2 DEFAULT;
+
+-- More than one default partition is not allowed, so this should give error
+CREATE TABLE fail_default_part PARTITION OF range_parted2 DEFAULT;
+
+-- Check if the range for default partitions overlap
+INSERT INTO range_parted2 VALUES (85);
+CREATE TABLE fail_part PARTITION OF range_parted2 FOR VALUES FROM (80) TO (90);
+CREATE TABLE part4 PARTITION OF range_parted2 FOR VALUES FROM (90) TO (100);
+
 -- now check for multi-column range partition key
 CREATE TABLE range_parted3 (
 	a int,
@@ -559,12 +606,28 @@ CREATE TABLE part10 PARTITION OF range_parted3 FOR VALUES FROM (1, minvalue) TO
 CREATE TABLE part11 PARTITION OF range_parted3 FOR VALUES FROM (1, 1) TO (1, 10);
 CREATE TABLE part12 PARTITION OF range_parted3 FOR VALUES FROM (1, 10) TO (1, maxvalue);
 CREATE TABLE fail_part PARTITION OF range_parted3 FOR VALUES FROM (1, 10) TO (1, 20);
+CREATE TABLE range3_default PARTITION OF range_parted3 DEFAULT;
 
 -- cannot create a partition that says column b is allowed to range
 -- from -infinity to +infinity, while there exist partitions that have
 -- more specific ranges
 CREATE TABLE fail_part PARTITION OF range_parted3 FOR VALUES FROM (1, minvalue) TO (1, maxvalue);
 
+-- check for partition bound overlap and other invalid specifications for the hash partition
+CREATE TABLE hash_parted2 (
+	a varchar
+) PARTITION BY HASH (a);
+CREATE TABLE h2part_1 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 4, REMAINDER 2);
+CREATE TABLE h2part_2 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 0);
+CREATE TABLE h2part_3 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 4);
+CREATE TABLE h2part_4 PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 5);
+-- overlap with part_4
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 2, REMAINDER 1);
+-- modulus must be greater than zero
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 0, REMAINDER 1);
+-- remainder must be greater than or equal to zero and less than modulus
+CREATE TABLE fail_part PARTITION OF hash_parted2 FOR VALUES WITH (MODULUS 8, REMAINDER 8);
+
 -- check schema propagation from parent
 
 CREATE TABLE parted (
@@ -618,22 +681,25 @@ CREATE TABLE part_c_1_10 PARTITION OF part_c FOR VALUES FROM (1) TO (10);
 -- output could vary depending on the order in which partition oids are
 -- returned.
 \d parted
+\d hash_parted
 
 -- check that we get the expected partition constraints
 CREATE TABLE range_parted4 (a int, b int, c int) PARTITION BY RANGE (abs(a), abs(b), c);
-CREATE TABLE unbounded_range_part PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (MAXVALUE, 0, 0);
+CREATE TABLE unbounded_range_part PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (MAXVALUE, MAXVALUE, MAXVALUE);
 \d+ unbounded_range_part
 DROP TABLE unbounded_range_part;
-CREATE TABLE range_parted4_1 PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, 0, 0) TO (1, MAXVALUE, 0);
+CREATE TABLE range_parted4_1 PARTITION OF range_parted4 FOR VALUES FROM (MINVALUE, MINVALUE, MINVALUE) TO (1, MAXVALUE, MAXVALUE);
 \d+ range_parted4_1
 CREATE TABLE range_parted4_2 PARTITION OF range_parted4 FOR VALUES FROM (3, 4, 5) TO (6, 7, MAXVALUE);
 \d+ range_parted4_2
-CREATE TABLE range_parted4_3 PARTITION OF range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, 0);
+CREATE TABLE range_parted4_3 PARTITION OF range_parted4 FOR VALUES FROM (6, 8, MINVALUE) TO (9, MAXVALUE, MAXVALUE);
 \d+ range_parted4_3
 DROP TABLE range_parted4;
 
 -- cleanup
 DROP TABLE parted, list_parted, range_parted, list_parted2, range_parted2, range_parted3;
+DROP TABLE hash_parted;
+DROP TABLE hash_parted2;
 
 -- comments on partitioned tables columns
 CREATE TABLE parted_col_comment (a int, b text) PARTITION BY LIST (a);
@@ -642,3 +708,9 @@ COMMENT ON COLUMN parted_col_comment.a IS 'Partition key';
 SELECT obj_description('parted_col_comment'::regclass);
 \d+ parted_col_comment
 DROP TABLE parted_col_comment;
+
+-- list partitioning on array type column
+CREATE TABLE arrlp (a int[]) PARTITION BY LIST (a);
+CREATE TABLE arrlp12 PARTITION OF arrlp FOR VALUES IN ('{1}', '{2}');
+\d+ arrlp12
+DROP TABLE arrlp;
diff --git a/src/test/regress/sql/create_type.sql b/src/test/regress/sql/create_type.sql
index a28303aa6a..07061bc02a 100644
--- a/src/test/regress/sql/create_type.sql
+++ b/src/test/regress/sql/create_type.sql
@@ -84,6 +84,16 @@ INSERT INTO default_test DEFAULT VALUES;
 
 SELECT * FROM default_test;
 
+-- invalid: non-lowercase quoted identifiers
+CREATE TYPE case_int42 (
+	"Internallength" = 4,
+	"Input" = int42_in,
+	"Output" = int42_out,
+	"Alignment" = int4,
+	"Default" = 42,
+	"Passedbyvalue"
+);
+
 -- Test stand-alone composite type
 
 CREATE TYPE default_test_row AS (f1 text_w_default, f2 int42);
@@ -134,3 +144,7 @@ CREATE TEMP TABLE mytab (foo widget(42,13));
 
 SELECT format_type(atttypid,atttypmod) FROM pg_attribute
 WHERE attrelid = 'mytab'::regclass AND attnum > 0;
+
+-- might as well exercise the widget type while we're here
+INSERT INTO mytab VALUES ('(1,2,3)'), ('(-44,5.5,12)');
+TABLE mytab;
diff --git a/src/test/regress/sql/domain.sql b/src/test/regress/sql/domain.sql
index 0fd383e272..68da27de22 100644
--- a/src/test/regress/sql/domain.sql
+++ b/src/test/regress/sql/domain.sql
@@ -120,6 +120,65 @@ select pg_typeof('{1,2,3}'::dia || 42); -- should be int[] not dia
 drop domain dia;
 
 
+-- Test domains over composites
+
+create type comptype as (r float8, i float8);
+create domain dcomptype as comptype;
+create table dcomptable (d1 dcomptype unique);
+
+insert into dcomptable values (row(1,2)::dcomptype);
+insert into dcomptable values (row(3,4)::comptype);
+insert into dcomptable values (row(1,2)::dcomptype);  -- fail on uniqueness
+insert into dcomptable (d1.r) values(11);
+
+select * from dcomptable;
+select (d1).r, (d1).i, (d1).* from dcomptable;
+update dcomptable set d1.r = (d1).r + 1 where (d1).i > 0;
+select * from dcomptable;
+
+alter domain dcomptype add constraint c1 check ((value).r <= (value).i);
+alter domain dcomptype add constraint c2 check ((value).r > (value).i);  -- fail
+
+select row(2,1)::dcomptype;  -- fail
+insert into dcomptable values (row(1,2)::comptype);
+insert into dcomptable values (row(2,1)::comptype);  -- fail
+insert into dcomptable (d1.r) values(99);
+insert into dcomptable (d1.r, d1.i) values(99, 100);
+insert into dcomptable (d1.r, d1.i) values(100, 99);  -- fail
+update dcomptable set d1.r = (d1).r + 1 where (d1).i > 0;  -- fail
+update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+select * from dcomptable;
+
+explain (verbose, costs off)
+  update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+create rule silly as on delete to dcomptable do instead
+  update dcomptable set d1.r = (d1).r - 1, d1.i = (d1).i + 1 where (d1).i > 0;
+\d+ dcomptable
+
+drop table dcomptable;
+drop type comptype cascade;
+
+
+-- check altering and dropping columns used by domain constraints
+create type comptype as (r float8, i float8);
+create domain dcomptype as comptype;
+alter domain dcomptype add constraint c1 check ((value).r > 0);
+comment on constraint c1 on domain dcomptype is 'random commentary';
+
+select row(0,1)::dcomptype;  -- fail
+
+alter type comptype alter attribute r type varchar;  -- fail
+alter type comptype alter attribute r type bigint;
+
+alter type comptype drop attribute r;  -- fail
+alter type comptype drop attribute i;
+
+select conname, obj_description(oid, 'pg_constraint') from pg_constraint
+  where contypid = 'dcomptype'::regtype;  -- check comment is still there
+
+drop type comptype cascade;
+
+
 -- Test domains over arrays of composite
 
 create type comptype as (r float8, i float8);
@@ -166,6 +225,49 @@ drop table dcomptable;
 drop type comptype cascade;
 
 
+-- Test arrays over domains
+
+create domain posint as int check (value > 0);
+
+create table pitable (f1 posint[]);
+insert into pitable values(array[42]);
+insert into pitable values(array[-1]);  -- fail
+insert into pitable values('{0}');  -- fail
+update pitable set f1[1] = f1[1] + 1;
+update pitable set f1[1] = 0;  -- fail
+select * from pitable;
+drop table pitable;
+
+create domain vc4 as varchar(4);
+create table vc4table (f1 vc4[]);
+insert into vc4table values(array['too long']);  -- fail
+insert into vc4table values(array['too long']::vc4[]);  -- cast truncates
+select * from vc4table;
+drop table vc4table;
+drop type vc4;
+
+-- You can sort of fake arrays-of-arrays by putting a domain in between
+create domain dposinta as posint[];
+create table dposintatable (f1 dposinta[]);
+insert into dposintatable values(array[array[42]]);  -- fail
+insert into dposintatable values(array[array[42]::posint[]]); -- still fail
+insert into dposintatable values(array[array[42]::dposinta]); -- but this works
+select f1, f1[1], (f1[1])[1] from dposintatable;
+select pg_typeof(f1) from dposintatable;
+select pg_typeof(f1[1]) from dposintatable;
+select pg_typeof(f1[1][1]) from dposintatable;
+select pg_typeof((f1[1])[1]) from dposintatable;
+update dposintatable set f1[2] = array[99];
+select f1, f1[1], (f1[2])[1] from dposintatable;
+-- it'd be nice if you could do something like this, but for now you can't:
+update dposintatable set f1[2][1] = array[97];
+-- maybe someday we can make this syntax work:
+update dposintatable set (f1[2])[1] = array[98];
+
+drop table dposintatable;
+drop domain posint cascade;
+
+
 -- Test not-null restrictions
 
 create domain dnotnull varchar(15) NOT NULL;
@@ -457,6 +559,14 @@ insert into ddtest2 values('{(-1)}');
 alter domain posint add constraint c1 check(value >= 0);
 drop table ddtest2;
 
+-- Likewise for domains within domains over composite
+create domain ddtest1d as ddtest1;
+create table ddtest2(f1 ddtest1d);
+insert into ddtest2 values('(-1)');
+alter domain posint add constraint c1 check(value >= 0);
+drop table ddtest2;
+drop domain ddtest1d;
+
 -- Likewise for domains within domains over array of composite
 create domain ddtest1d as ddtest1[];
 create table ddtest2(f1 ddtest1d);
diff --git a/src/test/regress/sql/enum.sql b/src/test/regress/sql/enum.sql
index d7e87143a0..7b68b2fe37 100644
--- a/src/test/regress/sql/enum.sql
+++ b/src/test/regress/sql/enum.sql
@@ -273,42 +273,32 @@ ALTER TYPE rainbow RENAME VALUE 'blue' TO 'green';
 --
 CREATE TYPE bogus AS ENUM('good');
 
--- check that we can add new values to existing enums in a transaction
--- but we can't use them
+-- check that we can't add new values to existing enums in a transaction
 BEGIN;
-ALTER TYPE bogus ADD VALUE 'new';
-SAVEPOINT x;
-SELECT 'new'::bogus;  -- unsafe
-ROLLBACK TO x;
-SELECT enum_first(null::bogus);  -- safe
-SELECT enum_last(null::bogus);  -- unsafe
-ROLLBACK TO x;
-SELECT enum_range(null::bogus);  -- unsafe
-ROLLBACK TO x;
+ALTER TYPE bogus ADD VALUE 'bad';
 COMMIT;
-SELECT 'new'::bogus;  -- now safe
-SELECT enumlabel, enumsortorder
-FROM pg_enum
-WHERE enumtypid = 'bogus'::regtype
-ORDER BY 2;
 
 -- check that we recognize the case where the enum already existed but was
--- modified in the current txn; this should not be considered safe
+-- modified in the current txn
 BEGIN;
 ALTER TYPE bogus RENAME TO bogon;
 ALTER TYPE bogon ADD VALUE 'bad';
-SELECT 'bad'::bogon;
+ROLLBACK;
+
+-- but ALTER TYPE RENAME VALUE is safe in a transaction
+BEGIN;
+ALTER TYPE bogus RENAME VALUE 'good' to 'bad';
+SELECT 'bad'::bogus;
 ROLLBACK;
 
 DROP TYPE bogus;
 
--- check that we can add new values to existing enums in a transaction
--- and use them, if the type is new as well
+-- check that we *can* add new values to existing enums in a transaction,
+-- if the type is new as well
 BEGIN;
-CREATE TYPE bogus AS ENUM('good');
-ALTER TYPE bogus ADD VALUE 'bad';
+CREATE TYPE bogus AS ENUM();
+ALTER TYPE bogus ADD VALUE 'good';
 ALTER TYPE bogus ADD VALUE 'ugly';
-SELECT enum_range(null::bogus);
 ROLLBACK;
 
 --
diff --git a/src/test/regress/sql/equivclass.sql b/src/test/regress/sql/equivclass.sql
index 0e4aa0cd2c..85aa65de39 100644
--- a/src/test/regress/sql/equivclass.sql
+++ b/src/test/regress/sql/equivclass.sql
@@ -254,3 +254,11 @@ revoke select on ec0 from regress_user_ectest;
 revoke select on ec1 from regress_user_ectest;
 
 drop user regress_user_ectest;
+
+-- check that X=X is converted to X IS NOT NULL when appropriate
+explain (costs off)
+  select * from tenk1 where unique1 = unique1 and unique2 = unique2;
+
+-- this could be converted, but isn't at present
+explain (costs off)
+  select * from tenk1 where unique1 = unique1 or unique2 = unique2;
diff --git a/src/test/regress/sql/event_trigger.sql b/src/test/regress/sql/event_trigger.sql
index b65bf3ec66..ef7faf0ab7 100644
--- a/src/test/regress/sql/event_trigger.sql
+++ b/src/test/regress/sql/event_trigger.sql
@@ -89,15 +89,26 @@ create event trigger regress_event_trigger_noperms on ddl_command_start
    execute procedure test_event_trigger();
 reset role;
 
--- all OK
+-- test enabling and disabling
+alter event trigger regress_event_trigger disable;
+-- fires _trigger2 and _trigger_end should fire, but not _trigger
+create table event_trigger_fire1 (a int);
+alter event trigger regress_event_trigger enable;
+set session_replication_role = replica;
+-- fires nothing
+create table event_trigger_fire2 (a int);
 alter event trigger regress_event_trigger enable replica;
+-- fires only _trigger
+create table event_trigger_fire3 (a int);
 alter event trigger regress_event_trigger enable always;
-alter event trigger regress_event_trigger enable;
+-- fires only _trigger
+create table event_trigger_fire4 (a int);
+reset session_replication_role;
+-- fires all three
+create table event_trigger_fire5 (a int);
+-- clean up
 alter event trigger regress_event_trigger disable;
-
--- regress_event_trigger2 and regress_event_trigger_end should fire, but not
--- regress_event_trigger
-create table event_trigger_fire1 (a int);
+drop table event_trigger_fire2, event_trigger_fire3, event_trigger_fire4, event_trigger_fire5;
 
 -- regress_event_trigger_end should fire on these commands
 grant all on table event_trigger_fire1 to public;
diff --git a/src/test/regress/sql/foreign_data.sql b/src/test/regress/sql/foreign_data.sql
index ebe8ffbffe..1af7258718 100644
--- a/src/test/regress/sql/foreign_data.sql
+++ b/src/test/regress/sql/foreign_data.sql
@@ -51,6 +51,13 @@ RESET ROLE;
 CREATE FOREIGN DATA WRAPPER foo VALIDATOR postgresql_fdw_validator;
 \dew+
 
+-- HANDLER related checks
+CREATE FUNCTION invalid_fdw_handler() RETURNS int LANGUAGE SQL AS 'SELECT 1;';
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER invalid_fdw_handler;  -- ERROR
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler HANDLER invalid_fdw_handler;  -- ERROR
+CREATE FOREIGN DATA WRAPPER test_fdw HANDLER test_fdw_handler;
+DROP FOREIGN DATA WRAPPER test_fdw;
+
 -- ALTER FOREIGN DATA WRAPPER
 ALTER FOREIGN DATA WRAPPER foo;                             -- ERROR
 ALTER FOREIGN DATA WRAPPER foo VALIDATOR bar;               -- ERROR
@@ -88,6 +95,12 @@ ALTER FOREIGN DATA WRAPPER foo RENAME TO foo1;
 \dew+
 ALTER FOREIGN DATA WRAPPER foo1 RENAME TO foo;
 
+-- HANDLER related checks
+ALTER FOREIGN DATA WRAPPER foo HANDLER invalid_fdw_handler;  -- ERROR
+ALTER FOREIGN DATA WRAPPER foo HANDLER test_fdw_handler HANDLER anything;  -- ERROR
+ALTER FOREIGN DATA WRAPPER foo HANDLER test_fdw_handler;
+DROP FUNCTION invalid_fdw_handler();
+
 -- DROP FOREIGN DATA WRAPPER
 DROP FOREIGN DATA WRAPPER nonexistent;                      -- ERROR
 DROP FOREIGN DATA WRAPPER IF EXISTS nonexistent;
diff --git a/src/test/regress/sql/gist.sql b/src/test/regress/sql/gist.sql
index 49126fd466..bae722fe13 100644
--- a/src/test/regress/sql/gist.sql
+++ b/src/test/regress/sql/gist.sql
@@ -7,6 +7,17 @@
 create table gist_point_tbl(id int4, p point);
 create index gist_pointidx on gist_point_tbl using gist(p);
 
+-- Verify the fillfactor and buffering options
+create index gist_pointidx2 on gist_point_tbl using gist(p) with (buffering = on, fillfactor=50);
+create index gist_pointidx3 on gist_point_tbl using gist(p) with (buffering = off);
+create index gist_pointidx4 on gist_point_tbl using gist(p) with (buffering = auto);
+drop index gist_pointidx2, gist_pointidx3, gist_pointidx4;
+
+-- Make sure bad values are refused
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (buffering = invalid_value);
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (fillfactor=9);
+create index gist_pointidx5 on gist_point_tbl using gist(p) with (fillfactor=101);
+
 -- Insert enough data to create a tree that's a couple of levels deep.
 insert into gist_point_tbl (id, p)
 select g,        point(g*10, g*10) from generate_series(1, 10000) g;
@@ -24,6 +35,9 @@ delete from gist_point_tbl where id < 10000;
 
 vacuum analyze gist_point_tbl;
 
+-- rebuild the index with a different fillfactor
+alter index gist_pointidx SET (fillfactor = 40);
+reindex index gist_pointidx;
 
 --
 -- Test Index-only plans on GiST indexes
diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql
index 564ebc9b05..eb68028603 100644
--- a/src/test/regress/sql/groupingsets.sql
+++ b/src/test/regress/sql/groupingsets.sql
@@ -141,6 +141,37 @@ select a, d, grouping(a,b,c)
   from gstest3
  group by grouping sets ((a,b), (a,c));
 
+-- check that distinct grouping columns are kept separate
+-- even if they are equal()
+explain (costs off)
+select g as alias1, g as alias2
+  from generate_series(1,3) g
+ group by alias1, rollup(alias2);
+
+select g as alias1, g as alias2
+  from generate_series(1,3) g
+ group by alias1, rollup(alias2);
+
+-- check that pulled-up subquery outputs still go to null when appropriate
+select four, x
+  from (select four, ten, 'foo'::text as x from tenk1) as t
+  group by grouping sets (four, x)
+  having x = 'foo';
+
+select four, x || 'x'
+  from (select four, ten, 'foo'::text as x from tenk1) as t
+  group by grouping sets (four, x)
+  order by four;
+
+select (x+y)*1, sum(z)
+ from (select 1 as x, 2 as y, 3 as z) s
+ group by grouping sets (x+y, x);
+
+select x, not x as not_x, q2 from
+  (select *, q1 = 1 as x from int8_tbl i1) as t
+  group by grouping sets(x, q2)
+  order by x, q2;
+
 -- simple rescan tests
 
 select a, b, sum(v.x)
@@ -311,12 +342,13 @@ explain (costs off)
 
 select a, b, sum(v.x)
   from (values (1),(2)) v(x), gstest_data(v.x)
- group by grouping sets (a,b);
+ group by grouping sets (a,b)
+ order by 1, 2, 3;
 explain (costs off)
   select a, b, sum(v.x)
     from (values (1),(2)) v(x), gstest_data(v.x)
-   group by grouping sets (a,b);
-
+   group by grouping sets (a,b)
+   order by 3, 1, 2;
 select *
   from (values (1),(2)) v(x),
        lateral (select a, b, sum(v.x) from gstest_data(v.x) group by grouping sets (a,b)) s;
diff --git a/src/test/regress/sql/hash_func.sql b/src/test/regress/sql/hash_func.sql
new file mode 100644
index 0000000000..b7ce8b21a3
--- /dev/null
+++ b/src/test/regress/sql/hash_func.sql
@@ -0,0 +1,222 @@
+--
+-- Test hash functions
+--
+-- When the salt is 0, the extended hash function should produce a result
+-- whose low 32 bits match the standard hash function.  When the salt is
+-- not 0, we should get a different result.
+--
+
+SELECT v as value, hashint2(v)::bit(32) as standard,
+       hashint2extended(v, 0)::bit(32) as extended0,
+       hashint2extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0::int2), (1::int2), (17::int2), (42::int2)) x(v)
+WHERE  hashint2(v)::bit(32) != hashint2extended(v, 0)::bit(32)
+       OR hashint2(v)::bit(32) = hashint2extended(v, 1)::bit(32);
+
+SELECT v as value, hashint4(v)::bit(32) as standard,
+	   hashint4extended(v, 0)::bit(32) as extended0,
+	   hashint4extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashint4(v)::bit(32) != hashint4extended(v, 0)::bit(32)
+       OR hashint4(v)::bit(32) = hashint4extended(v, 1)::bit(32);
+
+SELECT v as value, hashint8(v)::bit(32) as standard,
+	   hashint8extended(v, 0)::bit(32) as extended0,
+	   hashint8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashint8(v)::bit(32) != hashint8extended(v, 0)::bit(32)
+       OR hashint8(v)::bit(32) = hashint8extended(v, 1)::bit(32);
+
+SELECT v as value, hashfloat4(v)::bit(32) as standard,
+	   hashfloat4extended(v, 0)::bit(32) as extended0,
+	   hashfloat4extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashfloat4(v)::bit(32) != hashfloat4extended(v, 0)::bit(32)
+       OR hashfloat4(v)::bit(32) = hashfloat4extended(v, 1)::bit(32);
+
+SELECT v as value, hashfloat8(v)::bit(32) as standard,
+	   hashfloat8extended(v, 0)::bit(32) as extended0,
+	   hashfloat8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashfloat8(v)::bit(32) != hashfloat8extended(v, 0)::bit(32)
+       OR hashfloat8(v)::bit(32) = hashfloat8extended(v, 1)::bit(32);
+
+SELECT v as value, hashoid(v)::bit(32) as standard,
+	   hashoidextended(v, 0)::bit(32) as extended0,
+	   hashoidextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1), (17), (42), (550273), (207112489)) x(v)
+WHERE  hashoid(v)::bit(32) != hashoidextended(v, 0)::bit(32)
+       OR hashoid(v)::bit(32) = hashoidextended(v, 1)::bit(32);
+
+SELECT v as value, hashchar(v)::bit(32) as standard,
+	   hashcharextended(v, 0)::bit(32) as extended0,
+	   hashcharextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::"char"), ('1'), ('x'), ('X'), ('p'), ('N')) x(v)
+WHERE  hashchar(v)::bit(32) != hashcharextended(v, 0)::bit(32)
+       OR hashchar(v)::bit(32) = hashcharextended(v, 1)::bit(32);
+
+SELECT v as value, hashname(v)::bit(32) as standard,
+	   hashnameextended(v, 0)::bit(32) as extended0,
+	   hashnameextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashname(v)::bit(32) != hashnameextended(v, 0)::bit(32)
+       OR hashname(v)::bit(32) = hashnameextended(v, 1)::bit(32);
+
+SELECT v as value, hashtext(v)::bit(32) as standard,
+	   hashtextextended(v, 0)::bit(32) as extended0,
+	   hashtextextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashtext(v)::bit(32) != hashtextextended(v, 0)::bit(32)
+       OR hashtext(v)::bit(32) = hashtextextended(v, 1)::bit(32);
+
+SELECT v as value, hashoidvector(v)::bit(32) as standard,
+	   hashoidvectorextended(v, 0)::bit(32) as extended0,
+	   hashoidvectorextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::oidvector), ('0 1 2 3 4'), ('17 18 19 20'),
+        ('42 43 42 45'), ('550273 550273 570274'),
+        ('207112489 207112499 21512 2155 372325 1363252')) x(v)
+WHERE  hashoidvector(v)::bit(32) != hashoidvectorextended(v, 0)::bit(32)
+       OR hashoidvector(v)::bit(32) = hashoidvectorextended(v, 1)::bit(32);
+
+SELECT v as value, hash_aclitem(v)::bit(32) as standard,
+	   hash_aclitem_extended(v, 0)::bit(32) as extended0,
+	   hash_aclitem_extended(v, 1)::bit(32) as extended1
+FROM   (SELECT DISTINCT(relacl[1]) FROM pg_class LIMIT 10) x(v)
+WHERE  hash_aclitem(v)::bit(32) != hash_aclitem_extended(v, 0)::bit(32)
+       OR hash_aclitem(v)::bit(32) = hash_aclitem_extended(v, 1)::bit(32);
+
+SELECT v as value, hashmacaddr(v)::bit(32) as standard,
+	   hashmacaddrextended(v, 0)::bit(32) as extended0,
+	   hashmacaddrextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::macaddr), ('08:00:2b:01:02:04'), ('08:00:2b:01:02:04'),
+		('e2:7f:51:3e:70:49'), ('d6:a9:4a:78:1c:d5'),
+        ('ea:29:b1:5e:1f:a5')) x(v)
+WHERE  hashmacaddr(v)::bit(32) != hashmacaddrextended(v, 0)::bit(32)
+       OR hashmacaddr(v)::bit(32) = hashmacaddrextended(v, 1)::bit(32);
+
+SELECT v as value, hashinet(v)::bit(32) as standard,
+	   hashinetextended(v, 0)::bit(32) as extended0,
+	   hashinetextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::inet), ('192.168.100.128/25'), ('192.168.100.0/8'),
+		('172.168.10.126/16'), ('172.18.103.126/24'), ('192.188.13.16/32')) x(v)
+WHERE  hashinet(v)::bit(32) != hashinetextended(v, 0)::bit(32)
+       OR hashinet(v)::bit(32) = hashinetextended(v, 1)::bit(32);
+
+SELECT v as value, hash_numeric(v)::bit(32) as standard,
+	   hash_numeric_extended(v, 0)::bit(32) as extended0,
+	   hash_numeric_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (0), (1.149484958), (17.149484958), (42.149484958),
+        (149484958.550273), (2071124898672)) x(v)
+WHERE  hash_numeric(v)::bit(32) != hash_numeric_extended(v, 0)::bit(32)
+       OR hash_numeric(v)::bit(32) = hash_numeric_extended(v, 1)::bit(32);
+
+SELECT v as value, hashmacaddr8(v)::bit(32) as standard,
+	   hashmacaddr8extended(v, 0)::bit(32) as extended0,
+	   hashmacaddr8extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::macaddr8), ('08:00:2b:01:02:04:36:49'),
+        ('08:00:2b:01:02:04:f0:e8'), ('e2:7f:51:3e:70:49:16:29'),
+        ('d6:a9:4a:78:1c:d5:47:32'), ('ea:29:b1:5e:1f:a5')) x(v)
+WHERE  hashmacaddr8(v)::bit(32) != hashmacaddr8extended(v, 0)::bit(32)
+       OR hashmacaddr8(v)::bit(32) = hashmacaddr8extended(v, 1)::bit(32);
+
+SELECT v as value, hash_array(v)::bit(32) as standard,
+	   hash_array_extended(v, 0)::bit(32) as extended0,
+	   hash_array_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES ('{0}'::int4[]), ('{0,1,2,3,4}'), ('{17,18,19,20}'),
+        ('{42,34,65,98}'), ('{550273,590027, 870273}'),
+        ('{207112489, 807112489}')) x(v)
+WHERE  hash_array(v)::bit(32) != hash_array_extended(v, 0)::bit(32)
+       OR hash_array(v)::bit(32) = hash_array_extended(v, 1)::bit(32);
+
+SELECT v as value, hashbpchar(v)::bit(32) as standard,
+	   hashbpcharextended(v, 0)::bit(32) as extended0,
+	   hashbpcharextended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL), ('PostgreSQL'), ('eIpUEtqmY89'), ('AXKEJBTK'),
+       ('muop28x03'), ('yi3nm0d73')) x(v)
+WHERE  hashbpchar(v)::bit(32) != hashbpcharextended(v, 0)::bit(32)
+       OR hashbpchar(v)::bit(32) = hashbpcharextended(v, 1)::bit(32);
+
+SELECT v as value, time_hash(v)::bit(32) as standard,
+	   time_hash_extended(v, 0)::bit(32) as extended0,
+	   time_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::time), ('11:09:59'), ('1:09:59'), ('11:59:59'),
+        ('7:9:59'), ('5:15:59')) x(v)
+WHERE  time_hash(v)::bit(32) != time_hash_extended(v, 0)::bit(32)
+       OR time_hash(v)::bit(32) = time_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, timetz_hash(v)::bit(32) as standard,
+	   timetz_hash_extended(v, 0)::bit(32) as extended0,
+	   timetz_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::timetz), ('00:11:52.518762-07'), ('00:11:52.51762-08'),
+		('00:11:52.62-01'), ('00:11:52.62+01'), ('11:59:59+04')) x(v)
+WHERE  timetz_hash(v)::bit(32) != timetz_hash_extended(v, 0)::bit(32)
+       OR timetz_hash(v)::bit(32) = timetz_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, interval_hash(v)::bit(32) as standard,
+	   interval_hash_extended(v, 0)::bit(32) as extended0,
+	   interval_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::interval),
+        ('5 month 7 day 46 minutes'), ('1 year 7 day 46 minutes'),
+		('1 year 7 month 20 day 46 minutes'), ('5 month'),
+		('17 year 11 month 7 day 9 hours 46 minutes 5 seconds')) x(v)
+WHERE  interval_hash(v)::bit(32) != interval_hash_extended(v, 0)::bit(32)
+       OR interval_hash(v)::bit(32) = interval_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, timestamp_hash(v)::bit(32) as standard,
+	   timestamp_hash_extended(v, 0)::bit(32) as extended0,
+	   timestamp_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::timestamp), ('2017-08-22 00:09:59.518762'),
+        ('2015-08-20 00:11:52.51762-08'),
+		('2017-05-22 00:11:52.62-01'),
+        ('2013-08-22 00:11:52.62+01'), ('2013-08-22 11:59:59+04')) x(v)
+WHERE  timestamp_hash(v)::bit(32) != timestamp_hash_extended(v, 0)::bit(32)
+       OR timestamp_hash(v)::bit(32) = timestamp_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, uuid_hash(v)::bit(32) as standard,
+	   uuid_hash_extended(v, 0)::bit(32) as extended0,
+	   uuid_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::uuid), ('a0eebc99-9c0b-4ef8-bb6d-6bb9bd380a11'),
+		('5a9ba4ac-8d6f-11e7-bb31-be2e44b06b34'),
+        ('99c6705c-d939-461c-a3c9-1690ad64ed7b'),
+		('7deed3ca-8d6f-11e7-bb31-be2e44b06b34'),
+        ('9ad46d4f-6f2a-4edd-aadb-745993928e1e')) x(v)
+WHERE  uuid_hash(v)::bit(32) != uuid_hash_extended(v, 0)::bit(32)
+       OR uuid_hash(v)::bit(32) = uuid_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, pg_lsn_hash(v)::bit(32) as standard,
+	   pg_lsn_hash_extended(v, 0)::bit(32) as extended0,
+	   pg_lsn_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::pg_lsn), ('16/B374D84'), ('30/B374D84'),
+		('255/B374D84'), ('25/B379D90'), ('900/F37FD90')) x(v)
+WHERE  pg_lsn_hash(v)::bit(32) != pg_lsn_hash_extended(v, 0)::bit(32)
+       OR pg_lsn_hash(v)::bit(32) = pg_lsn_hash_extended(v, 1)::bit(32);
+
+CREATE TYPE mood AS ENUM ('sad', 'ok', 'happy');
+SELECT v as value, hashenum(v)::bit(32) as standard,
+	   hashenumextended(v, 0)::bit(32) as extended0,
+	   hashenumextended(v, 1)::bit(32) as extended1
+FROM   (VALUES ('sad'::mood), ('ok'), ('happy')) x(v)
+WHERE  hashenum(v)::bit(32) != hashenumextended(v, 0)::bit(32)
+       OR hashenum(v)::bit(32) = hashenumextended(v, 1)::bit(32);
+DROP TYPE mood;
+
+SELECT v as value, jsonb_hash(v)::bit(32) as standard,
+	   jsonb_hash_extended(v, 0)::bit(32) as extended0,
+	   jsonb_hash_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (NULL::jsonb),
+    ('{"a": "aaa bbb ddd ccc", "b": ["eee fff ggg"], "c": {"d": "hhh iii"}}'),
+	('{"foo": [true, "bar"], "tags": {"e": 1, "f": null}}'),
+    ('{"g": {"h": "value"}}')) x(v)
+WHERE  jsonb_hash(v)::bit(32) != jsonb_hash_extended(v, 0)::bit(32)
+       OR jsonb_hash(v)::bit(32) = jsonb_hash_extended(v, 1)::bit(32);
+
+SELECT v as value, hash_range(v)::bit(32) as standard,
+	   hash_range_extended(v, 0)::bit(32) as extended0,
+	   hash_range_extended(v, 1)::bit(32) as extended1
+FROM   (VALUES (int4range(10, 20)), (int4range(23, 43)),
+         (int4range(5675, 550273)),
+		 (int4range(550274, 1550274)), (int4range(1550275, 208112489))) x(v)
+WHERE  hash_range(v)::bit(32) != hash_range_extended(v, 0)::bit(32)
+       OR hash_range(v)::bit(32) = hash_range_extended(v, 1)::bit(32);
diff --git a/src/test/regress/sql/hash_index.sql b/src/test/regress/sql/hash_index.sql
index 9af03d2bc1..4d1aa020a9 100644
--- a/src/test/regress/sql/hash_index.sql
+++ b/src/test/regress/sql/hash_index.sql
@@ -178,6 +178,10 @@ INSERT INTO hash_split_heap SELECT a/2 FROM generate_series(1, 25000) a;
 
 VACUUM hash_split_heap;
 
+-- Rebuild the index using a different fillfactor
+ALTER INDEX hash_split_index SET (fillfactor = 10);
+REINDEX INDEX hash_split_index;
+
 -- Clean up.
 DROP TABLE hash_split_heap;
 
@@ -192,3 +196,9 @@ CREATE TABLE hash_heap_float4 (x float4, y int);
 INSERT INTO hash_heap_float4 VALUES (1.1,1);
 CREATE INDEX hash_idx ON hash_heap_float4 USING hash (x);
 DROP TABLE hash_heap_float4 CASCADE;
+
+-- Test out-of-range fillfactor values
+CREATE INDEX hash_f8_index2 ON hash_f8_heap USING hash (random float8_ops)
+	WITH (fillfactor=9);
+CREATE INDEX hash_f8_index2 ON hash_f8_heap USING hash (random float8_ops)
+	WITH (fillfactor=101);
diff --git a/src/test/regress/sql/hash_part.sql b/src/test/regress/sql/hash_part.sql
new file mode 100644
index 0000000000..94c5eaab0c
--- /dev/null
+++ b/src/test/regress/sql/hash_part.sql
@@ -0,0 +1,90 @@
+--
+-- Hash partitioning.
+--
+
+CREATE OR REPLACE FUNCTION hashint4_noop(int4, int8) RETURNS int8 AS
+$$SELECT coalesce($1,0)::int8$$ LANGUAGE sql IMMUTABLE;
+CREATE OPERATOR CLASS test_int4_ops FOR TYPE int4 USING HASH AS
+OPERATOR 1 = , FUNCTION 2 hashint4_noop(int4, int8);
+
+CREATE OR REPLACE FUNCTION hashtext_length(text, int8) RETURNS int8 AS
+$$SELECT length(coalesce($1,''))::int8$$ LANGUAGE sql IMMUTABLE;
+CREATE OPERATOR CLASS test_text_ops FOR TYPE text USING HASH AS
+OPERATOR 1 = , FUNCTION 2 hashtext_length(text, int8);
+
+CREATE TABLE mchash (a int, b text, c jsonb)
+  PARTITION BY HASH (a test_int4_ops, b test_text_ops);
+CREATE TABLE mchash1
+  PARTITION OF mchash FOR VALUES WITH (MODULUS 4, REMAINDER 0);
+
+-- invalid OID, no such table
+SELECT satisfies_hash_partition(0, 4, 0, NULL);
+
+-- not partitioned
+SELECT satisfies_hash_partition('tenk1'::regclass, 4, 0, NULL);
+
+-- partition rather than the parent
+SELECT satisfies_hash_partition('mchash1'::regclass, 4, 0, NULL);
+
+-- invalid modulus
+SELECT satisfies_hash_partition('mchash'::regclass, 0, 0, NULL);
+
+-- remainder too small
+SELECT satisfies_hash_partition('mchash'::regclass, 1, -1, NULL);
+
+-- remainder too large
+SELECT satisfies_hash_partition('mchash'::regclass, 1, 1, NULL);
+
+-- modulus is null
+SELECT satisfies_hash_partition('mchash'::regclass, NULL, 0, NULL);
+
+-- remainder is null
+SELECT satisfies_hash_partition('mchash'::regclass, 4, NULL, NULL);
+
+-- too many arguments
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, NULL::int, NULL::text, NULL::json);
+
+-- too few arguments
+SELECT satisfies_hash_partition('mchash'::regclass, 3, 1, NULL::int);
+
+-- wrong argument type
+SELECT satisfies_hash_partition('mchash'::regclass, 2, 1, NULL::int, NULL::int);
+
+-- ok, should be false
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, 0, ''::text);
+
+-- ok, should be true
+SELECT satisfies_hash_partition('mchash'::regclass, 4, 0, 1, ''::text);
+
+-- argument via variadic syntax, should fail because not all partitioning
+-- columns are of the correct type
+SELECT satisfies_hash_partition('mchash'::regclass, 2, 1,
+								variadic array[1,2]::int[]);
+
+-- multiple partitioning columns of the same type
+CREATE TABLE mcinthash (a int, b int, c jsonb)
+  PARTITION BY HASH (a test_int4_ops, b test_int4_ops);
+
+-- now variadic should work, should be false
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[0, 0]);
+
+-- should be true
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[1, 0]);
+
+-- wrong length
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[]::int[]);
+
+-- wrong type
+SELECT satisfies_hash_partition('mcinthash'::regclass, 4, 0,
+								variadic array[now(), now()]);
+
+-- cleanup
+DROP TABLE mchash;
+DROP TABLE mcinthash;
+DROP OPERATOR CLASS test_text_ops USING hash;
+DROP OPERATOR CLASS test_int4_ops USING hash;
+DROP FUNCTION hashint4_noop(int4, int8);
+DROP FUNCTION hashtext_length(text, int8);
diff --git a/src/test/regress/sql/horology.sql b/src/test/regress/sql/horology.sql
index a7bc9dcfc4..ebb196a1cf 100644
--- a/src/test/regress/sql/horology.sql
+++ b/src/test/regress/sql/horology.sql
@@ -446,6 +446,12 @@ SELECT to_timestamp('  20050302', 'YYYYMMDD');
 SELECT to_timestamp('2011-12-18 11:38 AM', 'YYYY-MM-DD HH12:MI PM');
 SELECT to_timestamp('2011-12-18 11:38 PM', 'YYYY-MM-DD HH12:MI PM');
 
+SELECT to_timestamp('2011-12-18 11:38 +05',    'YYYY-MM-DD HH12:MI TZH');
+SELECT to_timestamp('2011-12-18 11:38 -05',    'YYYY-MM-DD HH12:MI TZH');
+SELECT to_timestamp('2011-12-18 11:38 +05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
+SELECT to_timestamp('2011-12-18 11:38 -05:20', 'YYYY-MM-DD HH12:MI TZH:TZM');
+SELECT to_timestamp('2011-12-18 11:38 20',     'YYYY-MM-DD HH12:MI TZM');
+
 --
 -- Check handling of multiple spaces in format and/or input
 --
diff --git a/src/test/regress/sql/identity.sql b/src/test/regress/sql/identity.sql
index a7e7b15737..8be086d7ea 100644
--- a/src/test/regress/sql/identity.sql
+++ b/src/test/regress/sql/identity.sql
@@ -12,6 +12,10 @@ SELECT table_name, column_name, column_default, is_nullable, is_identity, identi
 -- internal sequences should not be shown here
 SELECT sequence_name FROM information_schema.sequences WHERE sequence_name LIKE 'itest%';
 
+SELECT pg_get_serial_sequence('itest1', 'a');
+
+\d itest1_a_seq
+
 CREATE TABLE itest4 (a int, b text);
 ALTER TABLE itest4 ALTER COLUMN a ADD GENERATED ALWAYS AS IDENTITY;  -- error, requires NOT NULL
 ALTER TABLE itest4 ALTER COLUMN a SET NOT NULL;
@@ -50,6 +54,14 @@ SELECT * FROM itest3;
 SELECT * FROM itest4;
 
 
+-- VALUES RTEs
+
+INSERT INTO itest3 VALUES (DEFAULT, 'a');
+INSERT INTO itest3 VALUES (DEFAULT, 'b'), (DEFAULT, 'c');
+
+SELECT * FROM itest3;
+
+
 -- OVERRIDING tests
 
 INSERT INTO itest1 VALUES (10, 'xyz');
@@ -74,6 +86,23 @@ UPDATE itest2 SET a = DEFAULT WHERE a = 2;
 SELECT * FROM itest2;
 
 
+-- COPY tests
+
+CREATE TABLE itest9 (a int GENERATED ALWAYS AS IDENTITY, b text, c bigint);
+
+COPY itest9 FROM stdin;
+100	foo	200
+101	bar	201
+\.
+
+COPY itest9 (b, c) FROM stdin;
+foo2	202
+bar2	203
+\.
+
+SELECT * FROM itest9 ORDER BY c;
+
+
 -- DROP IDENTITY tests
 
 ALTER TABLE itest4 ALTER COLUMN a DROP IDENTITY;
@@ -117,6 +146,17 @@ INSERT INTO itestv11 OVERRIDING SYSTEM VALUE VALUES (11, 'xyz');
 SELECT * FROM itestv11;
 
 
+-- ADD COLUMN
+
+CREATE TABLE itest13 (a int);
+-- add column to empty table
+ALTER TABLE itest13 ADD COLUMN b int GENERATED BY DEFAULT AS IDENTITY;
+INSERT INTO itest13 VALUES (1), (2), (3);
+-- add column to populated table
+ALTER TABLE itest13 ADD COLUMN c int GENERATED BY DEFAULT AS IDENTITY;
+SELECT * FROM itest13;
+
+
 -- various ALTER COLUMN tests
 
 -- fail, not allowed for identity columns
@@ -190,3 +230,19 @@ SELECT * FROM itest8;
 RESET ROLE;
 DROP TABLE itest8;
 DROP USER regress_user1;
+
+
+-- typed tables (currently not supported)
+
+CREATE TYPE itest_type AS (f1 integer, f2 text, f3 bigint);
+CREATE TABLE itest12 OF itest_type (f1 WITH OPTIONS GENERATED ALWAYS AS IDENTITY); -- error
+DROP TYPE itest_type CASCADE;
+
+
+-- table partitions (currently not supported)
+
+CREATE TABLE itest_parent (f1 date NOT NULL, f2 text, f3 bigint) PARTITION BY RANGE (f1);
+CREATE TABLE itest_child PARTITION OF itest_parent (
+    f3 WITH OPTIONS GENERATED ALWAYS AS IDENTITY
+) FOR VALUES FROM ('2016-07-01') TO ('2016-08-01'); -- error
+DROP TABLE itest_parent;
diff --git a/src/test/regress/sql/indexing.sql b/src/test/regress/sql/indexing.sql
new file mode 100644
index 0000000000..f3d0387f34
--- /dev/null
+++ b/src/test/regress/sql/indexing.sql
@@ -0,0 +1,566 @@
+-- Creating an index on a partitioned table makes the partitions
+-- automatically get the index
+create table idxpart (a int, b int, c text) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+create table idxpart2 partition of idxpart for values from (10) to (100)
+	partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (0) to (100);
+create index on idxpart (a);
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Some unsupported features
+create table idxpart (a int, b int, c text) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+create index concurrently on idxpart (a);
+drop table idxpart;
+
+-- Verify bugfix with query on indexed partitioned table with no partitions
+-- https://postgr.es/m/20180124162006.pmapfiznhgngwtjf@alvherre.pgsql
+CREATE TABLE idxpart (col1 INT) PARTITION BY RANGE (col1);
+CREATE INDEX ON idxpart (col1);
+CREATE TABLE idxpart_two (col2 INT);
+SELECT col2 FROM idxpart_two fk LEFT OUTER JOIN idxpart pk ON (col1 = col2);
+DROP table idxpart, idxpart_two;
+
+-- If a table without index is attached as partition to a table with
+-- an index, the index is automatically created
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (b, c);
+create table idxpart1 (like idxpart);
+\d idxpart1
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+\d idxpart1
+drop table idxpart;
+
+-- If a partition already has an index, don't create a duplicative one
+create table idxpart (a int, b int) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (0, 0) to (10, 10);
+create index on idxpart1 (a, b);
+create index on idxpart (a, b);
+\d idxpart1
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- DROP behavior for partitioned indexes
+create table idxpart (a int) partition by range (a);
+create index on idxpart (a);
+create table idxpart1 partition of idxpart for values from (0) to (10);
+drop index idxpart1_a_idx;	-- no way
+drop index idxpart_a_idx;	-- both indexes go away
+select relname, relkind from pg_class
+  where relname like 'idxpart%' order by relname;
+create index on idxpart (a);
+drop table idxpart1;		-- the index on partition goes away too
+select relname, relkind from pg_class
+  where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- ALTER INDEX .. ATTACH, error cases
+create table idxpart (a int, b int) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (0, 0) to (10, 10);
+create index idxpart_a_b_idx on only idxpart (a, b);
+create index idxpart1_a_b_idx on idxpart1 (a, b);
+create index idxpart1_tst1 on idxpart1 (b, a);
+create index idxpart1_tst2 on idxpart1 using hash (a);
+create index idxpart1_tst3 on idxpart1 (a, b) where a > 10;
+
+alter index idxpart attach partition idxpart1;
+alter index idxpart_a_b_idx attach partition idxpart1;
+alter index idxpart_a_b_idx attach partition idxpart_a_b_idx;
+alter index idxpart_a_b_idx attach partition idxpart1_b_idx;
+alter index idxpart_a_b_idx attach partition idxpart1_tst1;
+alter index idxpart_a_b_idx attach partition idxpart1_tst2;
+alter index idxpart_a_b_idx attach partition idxpart1_tst3;
+-- OK
+alter index idxpart_a_b_idx attach partition idxpart1_a_b_idx;
+alter index idxpart_a_b_idx attach partition idxpart1_a_b_idx; -- quiet
+
+-- reject dupe
+create index idxpart1_2_a_b on idxpart1 (a, b);
+alter index idxpart_a_b_idx attach partition idxpart1_2_a_b;
+drop table idxpart;
+-- make sure everything's gone
+select indexrelid::regclass, indrelid::regclass
+  from pg_index where indexrelid::regclass::text like 'idxpart%';
+
+-- Don't auto-attach incompatible indexes
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int, b int);
+create index on idxpart1 using hash (a);
+create index on idxpart1 (a) where b > 1;
+create index on idxpart1 ((a + 0));
+create index on idxpart1 (a, a);
+create index on idxpart (a);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart1
+drop table idxpart;
+
+-- If CREATE INDEX ONLY, don't create indexes on partitions; and existing
+-- indexes on partitions don't change parent.  ALTER INDEX ATTACH can change
+-- the parent after the fact.
+create table idxpart (a int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100);
+create table idxpart2 partition of idxpart for values from (100) to (1000)
+  partition by range (a);
+create table idxpart21 partition of idxpart2 for values from (100) to (200);
+create table idxpart22 partition of idxpart2 for values from (200) to (300);
+create index on idxpart22 (a);
+create index on only idxpart2 (a);
+create index on idxpart (a);
+-- Here we expect that idxpart1 and idxpart2 have a new index, but idxpart21
+-- does not; also, idxpart22 is not attached.
+\d idxpart1
+\d idxpart2
+\d idxpart21
+select indexrelid::regclass, indrelid::regclass, inhparent::regclass
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+where indexrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+select indexrelid::regclass, indrelid::regclass, inhparent::regclass
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+where indexrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+-- attaching idxpart22 is not enough to set idxpart22_a_idx valid ...
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+\d idxpart2
+-- ... but this one is.
+create index on idxpart21 (a);
+alter index idxpart2_a_idx attach partition idxpart21_a_idx;
+\d idxpart2
+drop table idxpart;
+
+-- When a table is attached a partition and it already has an index, a
+-- duplicate index should not get created, but rather the index becomes
+-- attached to the parent's index.
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (b, c);
+create table idxpart1 (like idxpart including indexes);
+\d idxpart1
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+\d idxpart1
+select relname, relkind, inhparent::regclass
+    from pg_class left join pg_index ix on (indexrelid = oid)
+	left join pg_inherits on (ix.indexrelid = inhrelid)
+	where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Verify that attaching an invalid index does not mark the parent index valid.
+-- On the other hand, attaching a valid index marks not only its direct
+-- ancestor valid, but also any indirect ancestor that was only missing the one
+-- that was just made valid
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (1) to (1000) partition by range (a);
+create table idxpart11 partition of idxpart1 for values from (1) to (100);
+create index on only idxpart1 (a);
+create index on only idxpart (a);
+-- this results in two invalid indexes:
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- idxpart1_a_idx is not valid, so idxpart_a_idx should not become valid:
+alter index idxpart_a_idx attach partition idxpart1_a_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+-- after creating and attaching this, both idxpart1_a_idx and idxpart_a_idx
+-- should become valid
+create index on idxpart11 (a);
+alter index idxpart1_a_idx attach partition idxpart11_a_idx;
+select relname, indisvalid from pg_class join pg_index on indexrelid = oid
+   where relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- verify dependency handling during ALTER TABLE DETACH PARTITION
+create table idxpart (a int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 (a);
+create index on idxpart (a);
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+-- a) after detaching partitions, the indexes can be dropped independently
+alter table idxpart detach partition idxpart1;
+alter table idxpart detach partition idxpart2;
+alter table idxpart detach partition idxpart3;
+drop index idxpart1_a_idx;
+drop index idxpart2_a_idx;
+drop index idxpart3_a_idx;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+drop table idxpart, idxpart1, idxpart2, idxpart3;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+
+create table idxpart (a int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 (a);
+create index on idxpart (a);
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+-- b) after detaching, dropping the index on parent does not remove the others
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+alter table idxpart detach partition idxpart1;
+alter table idxpart detach partition idxpart2;
+alter table idxpart detach partition idxpart3;
+drop index idxpart_a_idx;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+drop table idxpart, idxpart1, idxpart2, idxpart3;
+select relname, relkind from pg_class where relname like 'idxpart%' order by relname;
+
+-- Verify that expression indexes inherit correctly
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (like idxpart);
+create index on idxpart1 ((a + b));
+create index on idxpart ((a + b));
+create table idxpart2 (like idxpart);
+alter table idxpart attach partition idxpart1 for values from (0000) to (1000);
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create table idxpart3 partition of idxpart for values from (2000) to (3000);
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Verify behavior for collation (mis)matches
+create table idxpart (a text) partition by range (a);
+create table idxpart1 (like idxpart);
+create table idxpart2 (like idxpart);
+create index on idxpart2 (a collate "POSIX");
+create index on idxpart2 (a);
+create index on idxpart2 (a collate "C");
+alter table idxpart attach partition idxpart1 for values from ('aaa') to ('bbb');
+alter table idxpart attach partition idxpart2 for values from ('bbb') to ('ccc');
+create table idxpart3 partition of idxpart for values from ('ccc') to ('ddd');
+create index on idxpart (a collate "C");
+create table idxpart4 partition of idxpart for values from ('ddd') to ('eee');
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Verify behavior for opclass (mis)matches
+create table idxpart (a text) partition by range (a);
+create table idxpart1 (like idxpart);
+create table idxpart2 (like idxpart);
+create index on idxpart2 (a);
+alter table idxpart attach partition idxpart1 for values from ('aaa') to ('bbb');
+alter table idxpart attach partition idxpart2 for values from ('bbb') to ('ccc');
+create table idxpart3 partition of idxpart for values from ('ccc') to ('ddd');
+create index on idxpart (a text_pattern_ops);
+create table idxpart4 partition of idxpart for values from ('ddd') to ('eee');
+-- must *not* have attached the index we created on idxpart2
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+drop index idxpart_a_idx;
+create index on only idxpart (a text_pattern_ops);
+-- must reject
+alter index idxpart_a_idx attach partition idxpart2_a_idx;
+drop table idxpart;
+
+-- Verify that attaching indexes maps attribute numbers correctly
+create table idxpart (col1 int, a int, col2 int, b int) partition by range (a);
+create table idxpart1 (b int, col1 int, col2 int, col3 int, a int);
+alter table idxpart drop column col1, drop column col2;
+alter table idxpart1 drop column col1, drop column col2, drop column col3;
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+create index idxpart_1_idx on only idxpart (b, a);
+create index idxpart1_1_idx on idxpart1 (b, a);
+create index idxpart1_1b_idx on idxpart1 (b);
+-- test expressions and partial-index predicate, too
+create index idxpart_2_idx on only idxpart ((b + a)) where a > 1;
+create index idxpart1_2_idx on idxpart1 ((b + a)) where a > 1;
+create index idxpart1_2b_idx on idxpart1 ((a + b)) where a > 1;
+create index idxpart1_2c_idx on idxpart1 ((b + a)) where b > 1;
+alter index idxpart_1_idx attach partition idxpart1_1b_idx;	-- fail
+alter index idxpart_1_idx attach partition idxpart1_1_idx;
+alter index idxpart_2_idx attach partition idxpart1_2b_idx;	-- fail
+alter index idxpart_2_idx attach partition idxpart1_2c_idx;	-- fail
+alter index idxpart_2_idx attach partition idxpart1_2_idx;	-- ok
+select relname as child, inhparent::regclass as parent, pg_get_indexdef as childdef
+  from pg_class left join pg_inherits on inhrelid = oid,
+  lateral pg_get_indexdef(pg_class.oid)
+  where relkind in ('i', 'I') and relname like 'idxpart%' order by relname;
+drop table idxpart;
+
+-- Make sure the partition columns are mapped correctly
+create table idxpart (a int, b int, c text) partition by range (a);
+create index idxparti on idxpart (a);
+create index idxparti2 on idxpart (c, b);
+create table idxpart1 (c text, a int, b int);
+alter table idxpart attach partition idxpart1 for values from (0) to (10);
+create table idxpart2 (c text, a int, b int);
+create index on idxpart2 (a);
+create index on idxpart2 (c, b);
+alter table idxpart attach partition idxpart2 for values from (10) to (20);
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- Verify that columns are mapped correctly in expression indexes
+create table idxpart (col1 int, col2 int, a int, b int) partition by range (a);
+create table idxpart1 (col2 int, b int, col1 int, a int);
+create table idxpart2 (col1 int, col2 int, b int, a int);
+alter table idxpart drop column col1, drop column col2;
+alter table idxpart1 drop column col1, drop column col2;
+alter table idxpart2 drop column col1, drop column col2;
+create index on idxpart2 (abs(b));
+alter table idxpart attach partition idxpart2 for values from (0) to (1);
+create index on idxpart (abs(b));
+alter table idxpart attach partition idxpart1 for values from (1) to (2);
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- Verify that columns are mapped correctly for WHERE in a partial index
+create table idxpart (col1 int, a int, col3 int, b int) partition by range (a);
+alter table idxpart drop column col1, drop column col3;
+create table idxpart1 (col1 int, col2 int, col3 int, col4 int, b int, a int);
+alter table idxpart1 drop column col1, drop column col2, drop column col3, drop column col4;
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+create table idxpart2 (col1 int, col2 int, b int, a int);
+create index on idxpart2 (a) where b > 1000;
+alter table idxpart2 drop column col1, drop column col2;
+alter table idxpart attach partition idxpart2 for values from (1000) to (2000);
+create index on idxpart (a) where b > 1000;
+select c.relname, pg_get_indexdef(indexrelid)
+  from pg_class c join pg_index i on c.oid = i.indexrelid
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- Column number mapping: dropped columns in the partition
+create table idxpart1 (drop_1 int, drop_2 int, col_keep int, drop_3 int);
+alter table idxpart1 drop column drop_1;
+alter table idxpart1 drop column drop_2;
+alter table idxpart1 drop column drop_3;
+create index on idxpart1 (col_keep);
+create table idxpart (col_keep int) partition by range (col_keep);
+create index on idxpart (col_keep);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart
+\d idxpart1
+select attrelid::regclass, attname, attnum from pg_attribute
+  where attrelid::regclass::text like 'idxpart%' and attnum > 0
+  order by attrelid::regclass, attnum;
+drop table idxpart;
+
+-- Column number mapping: dropped columns in the parent table
+create table idxpart(drop_1 int, drop_2 int, col_keep int, drop_3 int) partition by range (col_keep);
+alter table idxpart drop column drop_1;
+alter table idxpart drop column drop_2;
+alter table idxpart drop column drop_3;
+create table idxpart1 (col_keep int);
+create index on idxpart1 (col_keep);
+create index on idxpart (col_keep);
+alter table idxpart attach partition idxpart1 for values from (0) to (1000);
+\d idxpart
+\d idxpart1
+select attrelid::regclass, attname, attnum from pg_attribute
+  where attrelid::regclass::text like 'idxpart%' and attnum > 0
+  order by attrelid::regclass, attnum;
+drop table idxpart;
+
+--
+-- Constraint-related indexes
+--
+
+-- Verify that it works to add primary key / unique to partitioned tables
+create table idxpart (a int primary key, b int) partition by range (a);
+\d idxpart
+drop table idxpart;
+
+-- but not if you fail to use the full partition key
+create table idxpart (a int unique, b int) partition by range (a, b);
+create table idxpart (a int, b int unique) partition by range (a, b);
+create table idxpart (a int primary key, b int) partition by range (b, a);
+create table idxpart (a int, b int primary key) partition by range (b, a);
+
+-- OK if you use them in some other order
+create table idxpart (a int, b int, c text, primary key  (a, b, c)) partition by range (b, c, a);
+drop table idxpart;
+
+-- not other types of index-based constraints
+create table idxpart (a int, exclude (a with = )) partition by range (a);
+
+-- no expressions in partition key for PK/UNIQUE
+create table idxpart (a int primary key, b int) partition by range ((b + a));
+create table idxpart (a int unique, b int) partition by range ((b + a));
+
+-- use ALTER TABLE to add a primary key
+create table idxpart (a int, b int, c text) partition by range (a, b);
+alter table idxpart add primary key (a);	-- not an incomplete one though
+alter table idxpart add primary key (a, b);	-- this works
+\d idxpart
+create table idxpart1 partition of idxpart for values from (0, 0) to (1000, 1000);
+\d idxpart1
+drop table idxpart;
+
+-- use ALTER TABLE to add a unique constraint
+create table idxpart (a int, b int) partition by range (a, b);
+alter table idxpart add unique (a);			-- not an incomplete one though
+alter table idxpart add unique (b, a);		-- this works
+\d idxpart
+drop table idxpart;
+
+-- Exclusion constraints cannot be added
+create table idxpart (a int, b int) partition by range (a);
+alter table idxpart add exclude (a with =);
+drop table idxpart;
+
+-- When (sub)partitions are created, they also contain the constraint
+create table idxpart (a int, b int, primary key (a, b)) partition by range (a, b);
+create table idxpart1 partition of idxpart for values from (1, 1) to (10, 10);
+create table idxpart2 partition of idxpart for values from (10, 10) to (20, 20)
+  partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (10) to (15);
+create table idxpart22 partition of idxpart2 for values from (15) to (20);
+create table idxpart3 (b int not null, a int not null);
+alter table idxpart attach partition idxpart3 for values from (20, 20) to (30, 30);
+select conname, contype, conrelid::regclass, conindid::regclass, conkey
+  from pg_constraint where conrelid::regclass::text like 'idxpart%'
+  order by conname;
+drop table idxpart;
+
+-- Verify that multi-layer partitioning honors the requirement that all
+-- columns in the partition key must appear in primary key
+create table idxpart (a int, b int, primary key (a)) partition by range (a);
+create table idxpart2 partition of idxpart
+for values from (0) to (1000) partition by range (b); -- fail
+drop table idxpart;
+
+-- Multi-layer partitioning works correctly in this case:
+create table idxpart (a int, b int, primary key (a, b)) partition by range (a);
+create table idxpart2 partition of idxpart for values from (0) to (1000) partition by range (b);
+create table idxpart21 partition of idxpart2 for values from (0) to (1000);
+select conname, contype, conrelid::regclass, conindid::regclass, conkey
+  from pg_constraint where conrelid::regclass::text like 'idxpart%'
+  order by conname;
+drop table idxpart;
+
+-- If a partitioned table has a unique/PK constraint, then it's not possible
+-- to drop the corresponding constraint in the children; nor it's possible
+-- to drop the indexes individually.  Dropping the constraint in the parent
+-- gets rid of the lot.
+create table idxpart (i int) partition by hash (i);
+create table idxpart0 partition of idxpart (i) for values with (modulus 2, remainder 0);
+create table idxpart1 partition of idxpart (i) for values with (modulus 2, remainder 1);
+alter table idxpart0 add primary key(i);
+alter table idxpart add primary key(i);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop index idxpart0_pkey;								-- fail
+drop index idxpart1_pkey;								-- fail
+alter table idxpart0 drop constraint idxpart0_pkey;		-- fail
+alter table idxpart1 drop constraint idxpart1_pkey;		-- fail
+alter table idxpart drop constraint idxpart_pkey;		-- ok
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- If a partitioned table has a constraint whose index is not valid,
+-- attaching a missing partition makes it valid.
+create table idxpart (a int) partition by range (a);
+create table idxpart0 (like idxpart);
+alter table idxpart0 add primary key (a);
+alter table idxpart attach partition idxpart0 for values from (0) to (1000);
+alter table only idxpart add primary key (a);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+alter index idxpart_pkey attach partition idxpart0_pkey;
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- if a partition has a unique index without a constraint, does not attach
+-- automatically; creates a new index instead.
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int not null, b int);
+create unique index on idxpart1 (a);
+alter table idxpart add primary key (a);
+alter table idxpart attach partition idxpart1 for values from (1) to (1000);
+select indrelid::regclass, indexrelid::regclass, inhparent::regclass, indisvalid,
+  conname, conislocal, coninhcount, connoinherit, convalidated
+  from pg_index idx left join pg_inherits inh on (idx.indexrelid = inh.inhrelid)
+  left join pg_constraint con on (idx.indexrelid = con.conindid)
+  where indrelid::regclass::text like 'idxpart%'
+  order by indexrelid::regclass::text collate "C";
+drop table idxpart;
+
+-- Can't attach an index without a corresponding constraint
+create table idxpart (a int, b int) partition by range (a);
+create table idxpart1 (a int not null, b int);
+create unique index on idxpart1 (a);
+alter table idxpart attach partition idxpart1 for values from (1) to (1000);
+alter table only idxpart add primary key (a);
+alter index idxpart_pkey attach partition idxpart1_a_idx;	-- fail
+drop table idxpart;
+
+-- Test that unique constraints are working
+create table idxpart (a int, b text, primary key (a, b)) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100000);
+create table idxpart2 (c int, like idxpart);
+insert into idxpart2 (c, a, b) values (42, 572814, 'inserted first');
+alter table idxpart2 drop column c;
+create unique index on idxpart (a);
+alter table idxpart attach partition idxpart2 for values from (100000) to (1000000);
+insert into idxpart values (0, 'zero'), (42, 'life'), (2^16, 'sixteen');
+insert into idxpart select 2^g, format('two to power of %s', g) from generate_series(15, 17) g;
+insert into idxpart values (16, 'sixteen');
+insert into idxpart (b, a) values ('one', 142857), ('two', 285714);
+insert into idxpart select a * 2, b || b from idxpart where a between 2^16 and 2^19;
+insert into idxpart values (572814, 'five');
+insert into idxpart values (857142, 'six');
+select tableoid::regclass, * from idxpart order by a;
+drop table idxpart;
+
+-- intentionally leave some objects around
+create table idxpart (a int) partition by range (a);
+create table idxpart1 partition of idxpart for values from (0) to (100);
+create table idxpart2 partition of idxpart for values from (100) to (1000)
+  partition by range (a);
+create table idxpart21 partition of idxpart2 for values from (100) to (200);
+create table idxpart22 partition of idxpart2 for values from (200) to (300);
+create index on idxpart22 (a);
+create index on only idxpart2 (a);
+alter index idxpart2_a_idx attach partition idxpart22_a_idx;
+create index on idxpart (a);
+create table idxpart_another (a int, b int, primary key (a, b)) partition by range (a);
+create table idxpart_another_1 partition of idxpart_another for values from (0) to (100);
diff --git a/src/test/regress/sql/inherit.sql b/src/test/regress/sql/inherit.sql
index c96580cd81..2e42ae115d 100644
--- a/src/test/regress/sql/inherit.sql
+++ b/src/test/regress/sql/inherit.sql
@@ -154,6 +154,23 @@ where parted_tab.a = ss.a;
 select tableoid::regclass::text as relname, parted_tab.* from parted_tab order by 1,2;
 
 drop table parted_tab;
+
+-- Check UPDATE with multi-level partitioned inherited target
+create table mlparted_tab (a int, b char, c text) partition by list (a);
+create table mlparted_tab_part1 partition of mlparted_tab for values in (1);
+create table mlparted_tab_part2 partition of mlparted_tab for values in (2) partition by list (b);
+create table mlparted_tab_part3 partition of mlparted_tab for values in (3);
+create table mlparted_tab_part2a partition of mlparted_tab_part2 for values in ('a');
+create table mlparted_tab_part2b partition of mlparted_tab_part2 for values in ('b');
+insert into mlparted_tab values (1, 'a'), (2, 'a'), (2, 'b'), (3, 'a');
+
+update mlparted_tab mlp set c = 'xxx'
+from
+  (select a from some_tab union all select a+1 from some_tab) ss (a)
+where (mlp.a = ss.a and mlp.b = 'b') or mlp.a = 3;
+select tableoid::regclass::text as relname, mlparted_tab.* from mlparted_tab order by 1,2;
+
+drop table mlparted_tab;
 drop table some_tab cascade;
 
 /* Test multiple inheritance of column defaults */
@@ -491,11 +508,13 @@ select min(1-id) from matest0;
 reset enable_indexscan;
 
 set enable_seqscan = off;  -- plan with fewest seqscans should be merge
+set enable_parallel_append = off; -- Don't let parallel-append interfere
 explain (verbose, costs off) select * from matest0 order by 1-id;
 select * from matest0 order by 1-id;
 explain (verbose, costs off) select min(1-id) from matest0;
 select min(1-id) from matest0;
 reset enable_seqscan;
+reset enable_parallel_append;
 
 drop table matest0 cascade;
 
@@ -647,19 +666,20 @@ drop table range_list_parted;
 -- check that constraint exclusion is able to cope with the partition
 -- constraint emitted for multi-column range partitioned tables
 create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
-create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, 1, 1);
+create table mcrparted_def partition of mcrparted default;
+create table mcrparted0 partition of mcrparted for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
 create table mcrparted1 partition of mcrparted for values from (1, 1, 1) to (10, 5, 10);
 create table mcrparted2 partition of mcrparted for values from (10, 5, 10) to (10, 10, 10);
 create table mcrparted3 partition of mcrparted for values from (11, 1, 1) to (20, 10, 10);
 create table mcrparted4 partition of mcrparted for values from (20, 10, 10) to (20, 20, 20);
-create table mcrparted5 partition of mcrparted for values from (20, 20, 20) to (maxvalue, 0, 0);
-explain (costs off) select * from mcrparted where a = 0;	-- scans mcrparted0
-explain (costs off) select * from mcrparted where a = 10 and abs(b) < 5;	-- scans mcrparted1
-explain (costs off) select * from mcrparted where a = 10 and abs(b) = 5;	-- scans mcrparted1, mcrparted2
+create table mcrparted5 partition of mcrparted for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+explain (costs off) select * from mcrparted where a = 0;	-- scans mcrparted0, mcrparted_def
+explain (costs off) select * from mcrparted where a = 10 and abs(b) < 5;	-- scans mcrparted1, mcrparted_def
+explain (costs off) select * from mcrparted where a = 10 and abs(b) = 5;	-- scans mcrparted1, mcrparted2, mcrparted_def
 explain (costs off) select * from mcrparted where abs(b) = 5;	-- scans all partitions
 explain (costs off) select * from mcrparted where a > -1;	-- scans all partitions
 explain (costs off) select * from mcrparted where a = 20 and abs(b) = 10 and c > 10;	-- scans mcrparted4
-explain (costs off) select * from mcrparted where a = 20 and c > 20; -- scans mcrparted3, mcrparte4, mcrparte5
+explain (costs off) select * from mcrparted where a = 20 and c > 20; -- scans mcrparted3, mcrparte4, mcrparte5, mcrparted_def
 drop table mcrparted;
 
 -- check that partitioned table Appends cope with being referenced in
diff --git a/src/test/regress/sql/insert.sql b/src/test/regress/sql/insert.sql
index 6f17872087..0150b6bb0f 100644
--- a/src/test/regress/sql/insert.sql
+++ b/src/test/regress/sql/insert.sql
@@ -90,6 +90,10 @@ create table range_parted (
 	a text,
 	b int
 ) partition by range (a, (b+0));
+
+-- no partitions, so fail
+insert into range_parted values ('a', 11);
+
 create table part1 partition of range_parted for values from ('a', 1) to ('a', 10);
 create table part2 partition of range_parted for values from ('a', 10) to ('a', 20);
 create table part3 partition of range_parted for values from ('b', 1) to ('b', 10);
@@ -132,13 +136,39 @@ create table part_ee_ff partition of list_parted for values in ('ee', 'ff') part
 create table part_ee_ff1 partition of part_ee_ff for values from (1) to (10);
 create table part_ee_ff2 partition of part_ee_ff for values from (10) to (20);
 
+-- test default partition
+create table part_default partition of list_parted default;
+-- Negative test: a row, which would fit in other partition, does not fit
+-- default partition, even when inserted directly
+insert into part_default values ('aa', 2);
+insert into part_default values (null, 2);
+-- ok
+insert into part_default values ('Zz', 2);
+-- test if default partition works as expected for multi-level partitioned
+-- table as well as when default partition itself is further partitioned
+drop table part_default;
+create table part_xx_yy partition of list_parted for values in ('xx', 'yy') partition by list (a);
+create table part_xx_yy_p1 partition of part_xx_yy for values in ('xx');
+create table part_xx_yy_defpart partition of part_xx_yy default;
+create table part_default partition of list_parted default partition by range(b);
+create table part_default_p1 partition of part_default for values from (20) to (30);
+create table part_default_p2 partition of part_default for values from (30) to (40);
+
 -- fail
 insert into part_ee_ff1 values ('EE', 11);
+insert into part_default_p2 values ('gg', 43);
 -- fail (even the parent's, ie, part_ee_ff's partition constraint applies)
 insert into part_ee_ff1 values ('cc', 1);
+insert into part_default values ('gg', 43);
 -- ok
 insert into part_ee_ff1 values ('ff', 1);
 insert into part_ee_ff2 values ('ff', 11);
+insert into part_default_p1 values ('cd', 25);
+insert into part_default_p2 values ('de', 35);
+insert into list_parted values ('ab', 21);
+insert into list_parted values ('xx', 1);
+insert into list_parted values ('yy', 2);
+select tableoid::regclass, * from list_parted;
 
 -- Check tuple routing for partitioned tables
 
@@ -154,8 +184,19 @@ insert into range_parted values ('b', 1);
 insert into range_parted values ('b', 10);
 -- fail (partition key (b+0) is null)
 insert into range_parted values ('a');
-select tableoid::regclass, * from range_parted;
 
+-- Check default partition
+create table part_def partition of range_parted default;
+-- fail
+insert into part_def values ('b', 10);
+-- ok
+insert into part_def values ('c', 10);
+insert into range_parted values (null, null);
+insert into range_parted values ('a', null);
+insert into range_parted values (null, 19);
+insert into range_parted values ('b', 20);
+
+select tableoid::regclass, * from range_parted;
 -- ok
 insert into list_parted values (null, 1);
 insert into list_parted (a) values ('aA');
@@ -185,8 +226,57 @@ insert into list_parted select 'gg', s.a from generate_series(1, 9) s(a);
 insert into list_parted (b) values (1);
 select tableoid::regclass::text, a, min(b) as min_b, max(b) as max_b from list_parted group by 1, 2 order by 1;
 
+-- direct partition inserts should check hash partition bound constraint
+
+-- create custom operator class and hash function, for the same reason
+-- explained in alter_table.sql
+create or replace function dummy_hashint4(a int4, seed int8) returns int8 as
+$$ begin return (a + seed); end; $$ language 'plpgsql' immutable;
+create operator class custom_opclass for type int4 using hash as
+operator 1 = , function 2 dummy_hashint4(int4, int8);
+
+create table hash_parted (
+	a int
+) partition by hash (a custom_opclass);
+create table hpart0 partition of hash_parted for values with (modulus 4, remainder 0);
+create table hpart1 partition of hash_parted for values with (modulus 4, remainder 1);
+create table hpart2 partition of hash_parted for values with (modulus 4, remainder 2);
+create table hpart3 partition of hash_parted for values with (modulus 4, remainder 3);
+
+insert into hash_parted values(generate_series(1,10));
+
+-- direct insert of values divisible by 4 - ok;
+insert into hpart0 values(12),(16);
+-- fail;
+insert into hpart0 values(11);
+-- 11 % 4 -> 3 remainder i.e. valid data for hpart3 partition
+insert into hpart3 values(11);
+
+-- view data
+select tableoid::regclass as part, a, a%4 as "remainder = a % 4"
+from hash_parted order by part;
+
+-- test \d+ output on a table which has both partitioned and unpartitioned
+-- partitions
+\d+ list_parted
+
 -- cleanup
 drop table range_parted, list_parted;
+drop table hash_parted;
+drop operator class custom_opclass using hash;
+drop function dummy_hashint4(a int4, seed int8);
+
+-- test that a default partition added as the first partition accepts any value
+-- including null
+create table list_parted (a int) partition by list (a);
+create table part_default partition of list_parted default;
+\d+ part_default
+insert into part_default values (null);
+insert into part_default values (1);
+insert into part_default values (-1);
+select tableoid::regclass, a from list_parted;
+-- cleanup
+drop table list_parted;
 
 -- more tests for certain multi-level partitioning scenarios
 create table mlparted (a int, b int) partition by range (a, b);
@@ -274,6 +364,24 @@ create function mlparted5abrtrig_func() returns trigger as $$ begin new.c = 'b';
 create trigger mlparted5abrtrig before insert on mlparted5a for each row execute procedure mlparted5abrtrig_func();
 insert into mlparted5 (a, b, c) values (1, 40, 'a');
 drop table mlparted5;
+alter table mlparted drop constraint check_b;
+
+-- Check multi-level default partition
+create table mlparted_def partition of mlparted default partition by range(a);
+create table mlparted_def1 partition of mlparted_def for values from (40) to (50);
+create table mlparted_def2 partition of mlparted_def for values from (50) to (60);
+insert into mlparted values (40, 100);
+insert into mlparted_def1 values (42, 100);
+insert into mlparted_def2 values (54, 50);
+-- fail
+insert into mlparted values (70, 100);
+insert into mlparted_def1 values (52, 50);
+insert into mlparted_def2 values (34, 50);
+-- ok
+create table mlparted_defd partition of mlparted_def default;
+insert into mlparted values (70, 100);
+
+select tableoid::regclass, * from mlparted_def;
 
 -- check that message shown after failure to find a partition shows the
 -- appropriate key description (or none) in various situations
@@ -302,15 +410,23 @@ revoke all on key_desc_1 from someone_else;
 drop role someone_else;
 drop table key_desc, key_desc_1;
 
+-- test minvalue/maxvalue restrictions
+create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
+create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, maxvalue, maxvalue);
+create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, minvalue);
+create table mcrparted4 partition of mcrparted for values from (21, minvalue, 0) to (30, 20, minvalue);
+
 -- check multi-column range partitioning expression enforces the same
 -- constraint as what tuple-routing would determine it to be
-create table mcrparted (a int, b int, c int) partition by range (a, abs(b), c);
-create table mcrparted0 partition of mcrparted for values from (minvalue, 0, 0) to (1, maxvalue, 0);
+create table mcrparted0 partition of mcrparted for values from (minvalue, minvalue, minvalue) to (1, maxvalue, maxvalue);
 create table mcrparted1 partition of mcrparted for values from (2, 1, minvalue) to (10, 5, 10);
-create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, 0);
+create table mcrparted2 partition of mcrparted for values from (10, 6, minvalue) to (10, maxvalue, maxvalue);
 create table mcrparted3 partition of mcrparted for values from (11, 1, 1) to (20, 10, 10);
-create table mcrparted4 partition of mcrparted for values from (21, minvalue, 0) to (30, 20, maxvalue);
-create table mcrparted5 partition of mcrparted for values from (30, 21, 20) to (maxvalue, 0, 0);
+create table mcrparted4 partition of mcrparted for values from (21, minvalue, minvalue) to (30, 20, maxvalue);
+create table mcrparted5 partition of mcrparted for values from (30, 21, 20) to (maxvalue, maxvalue, maxvalue);
+
+-- null not allowed in range partition
+insert into mcrparted values (null, null, null);
 
 -- routed to mcrparted0
 insert into mcrparted values (0, 1, 1);
@@ -375,14 +491,14 @@ drop function brtrigpartcon1trigf();
 
 -- check multi-column range partitioning with minvalue/maxvalue constraints
 create table mcrparted (a text, b int) partition by range(a, b);
-create table mcrparted1_lt_b partition of mcrparted for values from (minvalue, 0) to ('b', minvalue);
+create table mcrparted1_lt_b partition of mcrparted for values from (minvalue, minvalue) to ('b', minvalue);
 create table mcrparted2_b partition of mcrparted for values from ('b', minvalue) to ('c', minvalue);
 create table mcrparted3_c_to_common partition of mcrparted for values from ('c', minvalue) to ('common', minvalue);
 create table mcrparted4_common_lt_0 partition of mcrparted for values from ('common', minvalue) to ('common', 0);
 create table mcrparted5_common_0_to_10 partition of mcrparted for values from ('common', 0) to ('common', 10);
 create table mcrparted6_common_ge_10 partition of mcrparted for values from ('common', 10) to ('common', maxvalue);
 create table mcrparted7_gt_common_lt_d partition of mcrparted for values from ('common', maxvalue) to ('d', minvalue);
-create table mcrparted8_ge_d partition of mcrparted for values from ('d', minvalue) to (maxvalue, 0);
+create table mcrparted8_ge_d partition of mcrparted for values from ('d', minvalue) to (maxvalue, maxvalue);
 
 \d+ mcrparted
 \d+ mcrparted1_lt_b
diff --git a/src/test/regress/sql/insert_conflict.sql b/src/test/regress/sql/insert_conflict.sql
index df3a9b59b5..32c647e3f8 100644
--- a/src/test/regress/sql/insert_conflict.sql
+++ b/src/test/regress/sql/insert_conflict.sql
@@ -471,3 +471,16 @@ commit;
 select * from selfconflict;
 
 drop table selfconflict;
+
+-- check that the following works:
+-- insert into partitioned_table on conflict do nothing
+create table parted_conflict_test (a int, b char) partition by list (a);
+create table parted_conflict_test_1 partition of parted_conflict_test (b unique) for values in (1);
+insert into parted_conflict_test values (1, 'a') on conflict do nothing;
+insert into parted_conflict_test values (1, 'a') on conflict do nothing;
+-- however, on conflict do update is not supported yet
+insert into parted_conflict_test values (1) on conflict (b) do update set a = excluded.a;
+-- but it works OK if we target the partition directly
+insert into parted_conflict_test_1 values (1) on conflict (b) do
+update set a = excluded.a;
+drop table parted_conflict_test;
diff --git a/src/test/regress/sql/join.sql b/src/test/regress/sql/join.sql
index 835d67551c..30dfde223e 100644
--- a/src/test/regress/sql/join.sql
+++ b/src/test/regress/sql/join.sql
@@ -193,6 +193,15 @@ SELECT '' AS "xxx", *
 SELECT '' AS "xxx", *
   FROM J1_TBL LEFT JOIN J2_TBL USING (i) WHERE (i = 1);
 
+--
+-- semijoin selectivity for <>
+--
+explain (costs off)
+select * from int4_tbl i4, tenk1 a
+where exists(select * from tenk1 b
+             where a.twothousand = b.twothousand and a.fivethous <> b.fivethous)
+      and i4.f1 = a.tenthous;
+
 
 --
 -- More complicated constructs
@@ -408,6 +417,37 @@ select a.f1, b.f1, t.thousand, t.tenthous from
   (select sum(f1) as f1 from int4_tbl i4b) b
 where b.f1 = t.thousand and a.f1 = b.f1 and (a.f1+b.f1+999) = t.tenthous;
 
+--
+-- check a case where we formerly got confused by conflicting sort orders
+-- in redundant merge join path keys
+--
+explain (costs off)
+select * from
+  j1_tbl full join
+  (select * from j2_tbl order by j2_tbl.i desc, j2_tbl.k asc) j2_tbl
+  on j1_tbl.i = j2_tbl.i and j1_tbl.i = j2_tbl.k;
+
+select * from
+  j1_tbl full join
+  (select * from j2_tbl order by j2_tbl.i desc, j2_tbl.k asc) j2_tbl
+  on j1_tbl.i = j2_tbl.i and j1_tbl.i = j2_tbl.k;
+
+--
+-- a different check for handling of redundant sort keys in merge joins
+--
+explain (costs off)
+select count(*) from
+  (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x
+  left join
+  (select * from tenk1 y order by y.unique2) y
+  on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
+
+select count(*) from
+  (select * from tenk1 x order by x.thousand, x.twothousand, x.fivethous) x
+  left join
+  (select * from tenk1 y order by y.unique2) y
+  on x.thousand = y.unique2 and x.twothousand = y.hundred and x.fivethous = y.unique2;
+
 
 --
 -- Clean up
@@ -1336,6 +1376,11 @@ explain (costs off)
 select i8.* from int8_tbl i8 left join (select f1 from int4_tbl group by f1) i4
   on i8.q1 = i4.f1;
 
+-- check join removal with lateral references
+explain (costs off)
+select 1 from (select a.id FROM a left join b on a.b_id = b.id) q,
+			  lateral generate_series(1, q.id) gs(i) where q.id = gs.i;
+
 rollback;
 
 create temp table parent (k int primary key, pd int);
@@ -1668,6 +1713,16 @@ select * from
     select * from (select 3 as z offset 0) z where z.z = x.x
   ) zz on zz.z = y.y;
 
+-- check handling of nested appendrels inside LATERAL
+select * from
+  ((select 2 as v) union all (select 3 as v)) as q1
+  cross join lateral
+  ((select * from
+      ((select 4 as v) union all (select 5 as v)) as q3)
+   union all
+   (select q1.v)
+  ) as q2;
+
 -- check we don't try to do a unique-ified semijoin with LATERAL
 explain (verbose, costs off)
 select * from
@@ -1733,6 +1788,29 @@ delete from xx1 using (select * from int4_tbl where f1 = x1) ss;
 delete from xx1 using (select * from int4_tbl where f1 = xx1.x1) ss;
 delete from xx1 using lateral (select * from int4_tbl where f1 = x1) ss;
 
+--
+-- test LATERAL reference propagation down a multi-level inheritance hierarchy
+-- produced for a multi-level partitioned table hierarchy.
+--
+create table pt1 (a int, b int, c varchar) partition by range(a);
+create table pt1p1 partition of pt1 for values from (0) to (100) partition by range(b);
+create table pt1p2 partition of pt1 for values from (100) to (200);
+create table pt1p1p1 partition of pt1p1 for values from (0) to (100);
+insert into pt1 values (1, 1, 'x'), (101, 101, 'y');
+create table ut1 (a int, b int, c varchar);
+insert into ut1 values (101, 101, 'y'), (2, 2, 'z');
+explain (verbose, costs off)
+select t1.b, ss.phv from ut1 t1 left join lateral
+              (select t2.a as t2a, t3.a t3a, least(t1.a, t2.a, t3.a) phv
+					  from pt1 t2 join ut1 t3 on t2.a = t3.b) ss
+              on t1.a = ss.t2a order by t1.a;
+select t1.b, ss.phv from ut1 t1 left join lateral
+              (select t2.a as t2a, t3.a t3a, least(t1.a, t2.a, t3.a) phv
+					  from pt1 t2 join ut1 t3 on t2.a = t3.b) ss
+              on t1.a = ss.t2a order by t1.a;
+
+drop table pt1;
+drop table ut1;
 --
 -- test that foreign key join estimation performs sanely for outer joins
 --
@@ -1906,3 +1984,473 @@ where exists (select 1 from j3
       and t1.unique1 < 1;
 
 drop table j3;
+
+--
+-- exercises for the hash join code
+--
+
+begin;
+
+set local min_parallel_table_scan_size = 0;
+set local parallel_setup_cost = 0;
+
+-- Extract bucket and batch counts from an explain analyze plan.  In
+-- general we can't make assertions about how many batches (or
+-- buckets) will be required because it can vary, but we can in some
+-- special cases and we can check for growth.
+create or replace function find_hash(node json)
+returns json language plpgsql
+as
+$$
+declare
+  x json;
+  child json;
+begin
+  if node->>'Node Type' = 'Hash' then
+    return node;
+  else
+    for child in select json_array_elements(node->'Plans')
+    loop
+      x := find_hash(child);
+      if x is not null then
+        return x;
+      end if;
+    end loop;
+    return null;
+  end if;
+end;
+$$;
+create or replace function hash_join_batches(query text)
+returns table (original int, final int) language plpgsql
+as
+$$
+declare
+  whole_plan json;
+  hash_node json;
+begin
+  for whole_plan in
+    execute 'explain (analyze, format ''json'') ' || query
+  loop
+    hash_node := find_hash(json_extract_path(whole_plan, '0', 'Plan'));
+    original := hash_node->>'Original Hash Batches';
+    final := hash_node->>'Hash Batches';
+    return next;
+  end loop;
+end;
+$$;
+
+-- Make a simple relation with well distributed keys and correctly
+-- estimated size.
+create table simple as
+  select generate_series(1, 20000) AS id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+alter table simple set (parallel_workers = 2);
+analyze simple;
+
+-- Make a relation whose size we will under-estimate.  We want stats
+-- to say 1000 rows, but actually there are 20,000 rows.
+create table bigger_than_it_looks as
+  select generate_series(1, 20000) as id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa';
+alter table bigger_than_it_looks set (autovacuum_enabled = 'false');
+alter table bigger_than_it_looks set (parallel_workers = 2);
+analyze bigger_than_it_looks;
+update pg_class set reltuples = 1000 where relname = 'bigger_than_it_looks';
+
+-- Make a relation whose size we underestimate and that also has a
+-- kind of skew that breaks our batching scheme.  We want stats to say
+-- 2 rows, but actually there are 20,000 rows with the same key.
+create table extremely_skewed (id int, t text);
+alter table extremely_skewed set (autovacuum_enabled = 'false');
+alter table extremely_skewed set (parallel_workers = 2);
+analyze extremely_skewed;
+insert into extremely_skewed
+  select 42 as id, 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'
+  from generate_series(1, 20000);
+update pg_class
+  set reltuples = 2, relpages = pg_relation_size('extremely_skewed') / 8192
+  where relname = 'extremely_skewed';
+
+-- Make a relation with a couple of enormous tuples.
+create table wide as select generate_series(1, 2) as id, rpad('', 320000, 'x') as t;
+alter table wide set (parallel_workers = 2);
+
+-- The "optimal" case: the hash table fits in memory; we plan for 1
+-- batch, we stick to that number, and peak memory usage stays within
+-- our work_mem budget
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '4MB';
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- The "good" case: batches required, but we plan the right number; we
+-- plan for some number of batches, and we stick to that number, and
+-- peak memory usage says within our work_mem budget
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '192kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join simple s using (id);
+select count(*) from simple r join simple s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- The "bad" case: during execution we need to increase number of
+-- batches; in this case we plan for 1 batch, and increase at least a
+-- couple of times, and peak memory usage stays within our work_mem
+-- budget
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) FROM simple r JOIN bigger_than_it_looks s USING (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+select count(*) from simple r join bigger_than_it_looks s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 1;
+set local work_mem = '192kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+select count(*) from simple r join bigger_than_it_looks s using (id);
+select original > 1 as initially_multibatch, final > original as increased_batches
+  from hash_join_batches(
+$$
+  select count(*) from simple r join bigger_than_it_looks s using (id);
+$$);
+rollback to settings;
+
+-- The "ugly" case: increasing the number of batches during execution
+-- doesn't help, so stop trying to fit in work_mem and hope for the
+-- best; in this case we plan for 1 batch, increases just once and
+-- then stop increasing because that didn't help at all, so we blow
+-- right through the work_mem budget and hope for the best...
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+set local work_mem = '128kB';
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+select count(*) from simple r join extremely_skewed s using (id);
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-oblivious hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '128kB';
+set local enable_parallel_hash = off;
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+select count(*) from simple r join extremely_skewed s using (id);
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+rollback to settings;
+
+-- parallel with parallel-aware hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 1;
+set local work_mem = '128kB';
+set local enable_parallel_hash = on;
+explain (costs off)
+  select count(*) from simple r join extremely_skewed s using (id);
+select count(*) from simple r join extremely_skewed s using (id);
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join extremely_skewed s using (id);
+$$);
+rollback to settings;
+
+-- A couple of other hash join tests unrelated to work_mem management.
+
+-- Check that EXPLAIN ANALYZE has data even if the leader doesn't participate
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+set local work_mem = '4MB';
+set local parallel_leader_participation = off;
+select * from hash_join_batches(
+$$
+  select count(*) from simple r join simple s using (id);
+$$);
+rollback to settings;
+
+-- Exercise rescans.  We'll turn off parallel_leader_participation so
+-- that we can check that instrumentation comes back correctly.
+
+create table foo as select generate_series(1, 3) as id, 'xxxxx'::text as t;
+alter table foo set (parallel_workers = 0);
+create table bar as select generate_series(1, 10000) as id, 'xxxxx'::text as t;
+alter table bar set (parallel_workers = 2);
+
+-- multi-batch with rescan, parallel-oblivious
+savepoint settings;
+set enable_parallel_hash = off;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '64kB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+rollback to settings;
+
+-- single-batch with rescan, parallel-oblivious
+savepoint settings;
+set enable_parallel_hash = off;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '4MB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+rollback to settings;
+
+-- multi-batch with rescan, parallel-aware
+savepoint settings;
+set enable_parallel_hash = on;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '64kB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+rollback to settings;
+
+-- single-batch with rescan, parallel-aware
+savepoint settings;
+set enable_parallel_hash = on;
+set parallel_leader_participation = off;
+set min_parallel_table_scan_size = 0;
+set parallel_setup_cost = 0;
+set parallel_tuple_cost = 0;
+set max_parallel_workers_per_gather = 2;
+set enable_material = off;
+set enable_mergejoin = off;
+set work_mem = '4MB';
+explain (costs off)
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select count(*) from foo
+  left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+  on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select count(*) from foo
+    left join (select b1.id, b1.t from bar b1 join bar b2 using (id)) ss
+    on foo.id < ss.id + 1 and foo.id > ss.id - 1;
+$$);
+rollback to settings;
+
+-- A full outer join where every record is matched.
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s using (id);
+select  count(*) from simple r full outer join simple s using (id);
+rollback to settings;
+
+-- parallelism not possible with parallel-oblivious outer hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s using (id);
+select  count(*) from simple r full outer join simple s using (id);
+rollback to settings;
+
+-- An full outer join where every record is not matched.
+
+-- non-parallel
+savepoint settings;
+set local max_parallel_workers_per_gather = 0;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+rollback to settings;
+
+-- parallelism not possible with parallel-oblivious outer hash join
+savepoint settings;
+set local max_parallel_workers_per_gather = 2;
+explain (costs off)
+     select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+select  count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
+rollback to settings;
+
+-- exercise special code paths for huge tuples (note use of non-strict
+-- expression and left join required to get the detoasted tuple into
+-- the hash table)
+
+-- parallel with parallel-aware hash join (hits ExecParallelHashLoadTuple and
+-- sts_puttuple oversized tuple cases because it's multi-batch)
+savepoint settings;
+set max_parallel_workers_per_gather = 2;
+set enable_parallel_hash = on;
+set work_mem = '128kB';
+explain (costs off)
+  select length(max(s.t))
+  from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+select length(max(s.t))
+from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+select final > 1 as multibatch
+  from hash_join_batches(
+$$
+  select length(max(s.t))
+  from wide left join (select id, coalesce(t, '') || '' as t from wide) s using (id);
+$$);
+rollback to settings;
+
+rollback;
diff --git a/src/test/regress/sql/json.sql b/src/test/regress/sql/json.sql
index 506e3a8fc5..256652c41f 100644
--- a/src/test/regress/sql/json.sql
+++ b/src/test/regress/sql/json.sql
@@ -388,6 +388,9 @@ CREATE DOMAIN js_int_not_null  AS int     NOT NULL;
 CREATE DOMAIN js_int_array_1d  AS int[]   CHECK(array_length(VALUE, 1) = 3);
 CREATE DOMAIN js_int_array_2d  AS int[][] CHECK(array_length(VALUE, 2) = 3);
 
+create type j_unordered_pair as (x int, y int);
+create domain j_ordered_pair as j_unordered_pair check((value).x <= (value).y);
+
 CREATE TYPE jsrec AS (
 	i	int,
 	ia	_int4,
@@ -516,6 +519,15 @@ SELECT rec FROM json_populate_record(
 	'{"rec": {"a": "abc", "c": "01.02.2003", "x": 43.2}}'
 ) q;
 
+-- anonymous record type
+SELECT json_populate_record(null::record, '{"x": 0, "y": 1}');
+SELECT json_populate_record(row(1,2), '{"f1": 0, "f2": 1}');
+
+-- composite domain
+SELECT json_populate_record(null::j_ordered_pair, '{"x": 0, "y": 1}');
+SELECT json_populate_record(row(1,2)::j_ordered_pair, '{"x": 0}');
+SELECT json_populate_record(row(1,2)::j_ordered_pair, '{"x": 1, "y": 0}');
+
 -- populate_recordset
 
 select * from json_populate_recordset(null::jpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
@@ -532,6 +544,21 @@ select * from json_populate_recordset(null::jpop,'[{"a":"blurfl","x":43.2},{"b":
 select * from json_populate_recordset(row('def',99,null)::jpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
 select * from json_populate_recordset(row('def',99,null)::jpop,'[{"a":[100,200,300],"x":43.2},{"a":{"z":true},"b":3,"c":"2012-01-20 10:42:53"}]') q;
 
+-- anonymous record type
+SELECT json_populate_recordset(null::record, '[{"x": 0, "y": 1}]');
+SELECT json_populate_recordset(row(1,2), '[{"f1": 0, "f2": 1}]');
+
+-- composite domain
+SELECT json_populate_recordset(null::j_ordered_pair, '[{"x": 0, "y": 1}]');
+SELECT json_populate_recordset(row(1,2)::j_ordered_pair, '[{"x": 0}, {"y": 3}]');
+SELECT json_populate_recordset(row(1,2)::j_ordered_pair, '[{"x": 1, "y": 0}]');
+
+-- negative cases where the wrong record type is supplied
+select * from json_populate_recordset(row(0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from json_populate_recordset(row(0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from json_populate_recordset(row(0::int,0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from json_populate_recordset(row(1000000000::int,50::int),'[{"b":"2"},{"a":"3"}]') q (a text, b text);
+
 -- test type info caching in json_populate_record()
 CREATE TEMP TABLE jspoptest (js json);
 
@@ -550,6 +577,8 @@ DROP TYPE jsrec_i_not_null;
 DROP DOMAIN js_int_not_null;
 DROP DOMAIN js_int_array_1d;
 DROP DOMAIN js_int_array_2d;
+DROP DOMAIN j_ordered_pair;
+DROP TYPE j_unordered_pair;
 
 --json_typeof() function
 select value, json_typeof(value)
@@ -569,6 +598,14 @@ select value, json_typeof(value)
 -- json_build_array, json_build_object, json_object_agg
 
 SELECT json_build_array('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
+SELECT json_build_array('a', NULL); -- ok
+SELECT json_build_array(VARIADIC NULL::text[]); -- ok
+SELECT json_build_array(VARIADIC '{}'::text[]); -- ok
+SELECT json_build_array(VARIADIC '{a,b,c}'::text[]); -- ok
+SELECT json_build_array(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+SELECT json_build_array(VARIADIC '{1,2,3,4}'::text[]); -- ok
+SELECT json_build_array(VARIADIC '{1,2,3,4}'::int[]); -- ok
+SELECT json_build_array(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
 
 SELECT json_build_object('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
 
@@ -576,6 +613,19 @@ SELECT json_build_object(
        'a', json_build_object('b',false,'c',99),
        'd', json_build_object('e',array[9,8,7]::int[],
            'f', (select row_to_json(r) from ( select relkind, oid::regclass as name from pg_class where relname = 'pg_class') r)));
+SELECT json_build_object('{a,b,c}'::text[]); -- error
+SELECT json_build_object('{a,b,c}'::text[], '{d,e,f}'::text[]); -- error, key cannot be array
+SELECT json_build_object('a', 'b', 'c'); -- error
+SELECT json_build_object(NULL, 'a'); -- error, key cannot be NULL
+SELECT json_build_object('a', NULL); -- ok
+SELECT json_build_object(VARIADIC NULL::text[]); -- ok
+SELECT json_build_object(VARIADIC '{}'::text[]); -- ok
+SELECT json_build_object(VARIADIC '{a,b,c}'::text[]); -- error
+SELECT json_build_object(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+SELECT json_build_object(VARIADIC ARRAY[NULL, 'a']::text[]); -- error, key cannot be NULL
+SELECT json_build_object(VARIADIC '{1,2,3,4}'::text[]); -- ok
+SELECT json_build_object(VARIADIC '{1,2,3,4}'::int[]); -- ok
+SELECT json_build_object(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
 
 -- empty objects/arrays
 SELECT json_build_array();
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
index 57fff3bfb3..903e5ef67d 100644
--- a/src/test/regress/sql/jsonb.sql
+++ b/src/test/regress/sql/jsonb.sql
@@ -313,6 +313,14 @@ SELECT jsonb_typeof('"1.0"') AS string;
 -- jsonb_build_array, jsonb_build_object, jsonb_object_agg
 
 SELECT jsonb_build_array('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
+SELECT jsonb_build_array('a', NULL); -- ok
+SELECT jsonb_build_array(VARIADIC NULL::text[]); -- ok
+SELECT jsonb_build_array(VARIADIC '{}'::text[]); -- ok
+SELECT jsonb_build_array(VARIADIC '{a,b,c}'::text[]); -- ok
+SELECT jsonb_build_array(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+SELECT jsonb_build_array(VARIADIC '{1,2,3,4}'::text[]); -- ok
+SELECT jsonb_build_array(VARIADIC '{1,2,3,4}'::int[]); -- ok
+SELECT jsonb_build_array(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
 
 SELECT jsonb_build_object('a',1,'b',1.2,'c',true,'d',null,'e',json '{"x": 3, "y": [1,2,3]}');
 
@@ -320,7 +328,19 @@ SELECT jsonb_build_object(
        'a', jsonb_build_object('b',false,'c',99),
        'd', jsonb_build_object('e',array[9,8,7]::int[],
            'f', (select row_to_json(r) from ( select relkind, oid::regclass as name from pg_class where relname = 'pg_class') r)));
-
+SELECT jsonb_build_object('{a,b,c}'::text[]); -- error
+SELECT jsonb_build_object('{a,b,c}'::text[], '{d,e,f}'::text[]); -- error, key cannot be array
+SELECT jsonb_build_object('a', 'b', 'c'); -- error
+SELECT jsonb_build_object(NULL, 'a'); -- error, key cannot be NULL
+SELECT jsonb_build_object('a', NULL); -- ok
+SELECT jsonb_build_object(VARIADIC NULL::text[]); -- ok
+SELECT jsonb_build_object(VARIADIC '{}'::text[]); -- ok
+SELECT jsonb_build_object(VARIADIC '{a,b,c}'::text[]); -- error
+SELECT jsonb_build_object(VARIADIC ARRAY['a', NULL]::text[]); -- ok
+SELECT jsonb_build_object(VARIADIC ARRAY[NULL, 'a']::text[]); -- error, key cannot be NULL
+SELECT jsonb_build_object(VARIADIC '{1,2,3,4}'::text[]); -- ok
+SELECT jsonb_build_object(VARIADIC '{1,2,3,4}'::int[]); -- ok
+SELECT jsonb_build_object(VARIADIC '{{1,4},{2,5},{3,6}}'::int[][]); -- ok
 
 -- empty objects/arrays
 SELECT jsonb_build_array();
@@ -488,6 +508,9 @@ CREATE DOMAIN jsb_int_not_null  AS int     NOT NULL;
 CREATE DOMAIN jsb_int_array_1d  AS int[]   CHECK(array_length(VALUE, 1) = 3);
 CREATE DOMAIN jsb_int_array_2d  AS int[][] CHECK(array_length(VALUE, 2) = 3);
 
+create type jb_unordered_pair as (x int, y int);
+create domain jb_ordered_pair as jb_unordered_pair check((value).x <= (value).y);
+
 CREATE TYPE jsbrec AS (
 	i	int,
 	ia	_int4,
@@ -616,6 +639,15 @@ SELECT rec FROM jsonb_populate_record(
 	'{"rec": {"a": "abc", "c": "01.02.2003", "x": 43.2}}'
 ) q;
 
+-- anonymous record type
+SELECT jsonb_populate_record(null::record, '{"x": 0, "y": 1}');
+SELECT jsonb_populate_record(row(1,2), '{"f1": 0, "f2": 1}');
+
+-- composite domain
+SELECT jsonb_populate_record(null::jb_ordered_pair, '{"x": 0, "y": 1}');
+SELECT jsonb_populate_record(row(1,2)::jb_ordered_pair, '{"x": 0}');
+SELECT jsonb_populate_record(row(1,2)::jb_ordered_pair, '{"x": 1, "y": 0}');
+
 -- populate_recordset
 SELECT * FROM jsonb_populate_recordset(NULL::jbpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
 SELECT * FROM jsonb_populate_recordset(row('def',99,NULL)::jbpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
@@ -628,6 +660,21 @@ SELECT * FROM jsonb_populate_recordset(NULL::jbpop,'[{"a":"blurfl","x":43.2},{"b
 SELECT * FROM jsonb_populate_recordset(row('def',99,NULL)::jbpop,'[{"a":"blurfl","x":43.2},{"b":3,"c":"2012-01-20 10:42:53"}]') q;
 SELECT * FROM jsonb_populate_recordset(row('def',99,NULL)::jbpop,'[{"a":[100,200,300],"x":43.2},{"a":{"z":true},"b":3,"c":"2012-01-20 10:42:53"}]') q;
 
+-- anonymous record type
+SELECT jsonb_populate_recordset(null::record, '[{"x": 0, "y": 1}]');
+SELECT jsonb_populate_recordset(row(1,2), '[{"f1": 0, "f2": 1}]');
+
+-- composite domain
+SELECT jsonb_populate_recordset(null::jb_ordered_pair, '[{"x": 0, "y": 1}]');
+SELECT jsonb_populate_recordset(row(1,2)::jb_ordered_pair, '[{"x": 0}, {"y": 3}]');
+SELECT jsonb_populate_recordset(row(1,2)::jb_ordered_pair, '[{"x": 1, "y": 0}]');
+
+-- negative cases where the wrong record type is supplied
+select * from jsonb_populate_recordset(row(0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from jsonb_populate_recordset(row(0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from jsonb_populate_recordset(row(0::int,0::int,0::int),'[{"a":"1","b":"2"},{"a":"3"}]') q (a text, b text);
+select * from jsonb_populate_recordset(row(1000000000::int,50::int),'[{"b":"2"},{"a":"3"}]') q (a text, b text);
+
 -- jsonb_to_record and jsonb_to_recordset
 
 select * from jsonb_to_record('{"a":1,"b":"foo","c":"bar"}')
@@ -673,6 +720,8 @@ DROP TYPE jsbrec_i_not_null;
 DROP DOMAIN jsb_int_not_null;
 DROP DOMAIN jsb_int_array_1d;
 DROP DOMAIN jsb_int_array_2d;
+DROP DOMAIN jb_ordered_pair;
+DROP TYPE jb_unordered_pair;
 
 -- indexing
 SELECT count(*) FROM testjsonb WHERE j @> '{"wait":null}';
diff --git a/src/test/regress/sql/misc_sanity.sql b/src/test/regress/sql/misc_sanity.sql
index 5130a4ab79..b921117fa5 100644
--- a/src/test/regress/sql/misc_sanity.sql
+++ b/src/test/regress/sql/misc_sanity.sql
@@ -32,7 +32,7 @@ SELECT *
 FROM pg_shdepend as d1
 WHERE refclassid = 0 OR refobjid = 0 OR
       deptype NOT IN ('a', 'o', 'p', 'r') OR
-      (deptype != 'p' AND (dbid = 0 OR classid = 0 OR objid = 0)) OR
+      (deptype != 'p' AND (classid = 0 OR objid = 0)) OR
       (deptype = 'p' AND (dbid != 0 OR classid != 0 OR objid != 0 OR objsubid != 0));
 
 
diff --git a/src/test/regress/sql/numeric.sql b/src/test/regress/sql/numeric.sql
index b51225c47f..d77504e624 100644
--- a/src/test/regress/sql/numeric.sql
+++ b/src/test/regress/sql/numeric.sql
@@ -655,6 +655,14 @@ INSERT INTO fract_only VALUES (8, '0.00017');
 SELECT * FROM fract_only;
 DROP TABLE fract_only;
 
+-- Check inf/nan conversion behavior
+SELECT 'NaN'::float8::numeric;
+SELECT 'Infinity'::float8::numeric;
+SELECT '-Infinity'::float8::numeric;
+SELECT 'NaN'::float4::numeric;
+SELECT 'Infinity'::float4::numeric;
+SELECT '-Infinity'::float4::numeric;
+
 -- Simple check that ceil(), floor(), and round() work correctly
 CREATE TABLE ceil_floor_round (a numeric);
 INSERT INTO ceil_floor_round VALUES ('-5.5');
@@ -778,8 +786,21 @@ SELECT '' AS to_char_24, to_char('100'::numeric, 'FM999.9');
 SELECT '' AS to_char_25, to_char('100'::numeric, 'FM999.');
 SELECT '' AS to_char_26, to_char('100'::numeric, 'FM999');
 
+-- Check parsing of literal text in a format string
+SELECT '' AS to_char_27, to_char('100'::numeric, 'foo999');
+SELECT '' AS to_char_28, to_char('100'::numeric, 'f\oo999');
+SELECT '' AS to_char_29, to_char('100'::numeric, 'f\\oo999');
+SELECT '' AS to_char_30, to_char('100'::numeric, 'f\"oo999');
+SELECT '' AS to_char_31, to_char('100'::numeric, 'f\\"oo999');
+SELECT '' AS to_char_32, to_char('100'::numeric, 'f"ool"999');
+SELECT '' AS to_char_33, to_char('100'::numeric, 'f"\ool"999');
+SELECT '' AS to_char_34, to_char('100'::numeric, 'f"\\ool"999');
+SELECT '' AS to_char_35, to_char('100'::numeric, 'f"ool\"999');
+SELECT '' AS to_char_36, to_char('100'::numeric, 'f"ool\\"999');
+
 -- TO_NUMBER()
 --
+SET lc_numeric = 'C';
 SELECT '' AS to_number_1,  to_number('-34,338,492', '99G999G999');
 SELECT '' AS to_number_2,  to_number('-34,338,492.654,878', '99G999G999D999G999');
 SELECT '' AS to_number_3,  to_number('<564646.654564>', '999999.999999PR');
@@ -793,6 +814,16 @@ SELECT '' AS to_number_10, to_number('0', '99.99');
 SELECT '' AS to_number_11, to_number('.-01', 'S99.99');
 SELECT '' AS to_number_12, to_number('.01-', '99.99S');
 SELECT '' AS to_number_13, to_number(' . 0 1-', ' 9 9 . 9 9 S');
+SELECT '' AS to_number_14, to_number('34,50','999,99');
+SELECT '' AS to_number_15, to_number('123,000','999G');
+SELECT '' AS to_number_16, to_number('123456','999G999');
+SELECT '' AS to_number_17, to_number('$1234.56','L9,999.99');
+SELECT '' AS to_number_18, to_number('$1234.56','L99,999.99');
+SELECT '' AS to_number_19, to_number('$1,234.56','L99,999.99');
+SELECT '' AS to_number_20, to_number('1234.56','L99,999.99');
+SELECT '' AS to_number_21, to_number('1,234.56','L99,999.99');
+SELECT '' AS to_number_22, to_number('42nd', '99th');
+RESET lc_numeric;
 
 --
 -- Input syntax
diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql
index 63821b8008..55faa71edf 100644
--- a/src/test/regress/sql/object_address.sql
+++ b/src/test/regress/sql/object_address.sql
@@ -32,6 +32,7 @@ CREATE DOMAIN addr_nsp.gendomain AS int4 CONSTRAINT domconstr CHECK (value > 0);
 CREATE FUNCTION addr_nsp.trig() RETURNS TRIGGER LANGUAGE plpgsql AS $$ BEGIN END; $$;
 CREATE TRIGGER t BEFORE INSERT ON addr_nsp.gentable FOR EACH ROW EXECUTE PROCEDURE addr_nsp.trig();
 CREATE POLICY genpol ON addr_nsp.gentable;
+CREATE PROCEDURE addr_nsp.proc(int4) LANGUAGE SQL AS $$ $$;
 CREATE SERVER "integer" FOREIGN DATA WRAPPER addr_fdw;
 CREATE USER MAPPING FOR regress_addr_user SERVER "integer";
 ALTER DEFAULT PRIVILEGES FOR ROLE regress_addr_user IN SCHEMA public GRANT ALL ON TABLES TO regress_addr_user;
@@ -81,7 +82,7 @@ BEGIN
 		('table'), ('index'), ('sequence'), ('view'),
 		('materialized view'), ('foreign table'),
 		('table column'), ('foreign table column'),
-		('aggregate'), ('function'), ('type'), ('cast'),
+		('aggregate'), ('function'), ('procedure'), ('type'), ('cast'),
 		('table constraint'), ('domain constraint'), ('conversion'), ('default value'),
 		('operator'), ('operator class'), ('operator family'), ('rule'), ('trigger'),
 		('text search parser'), ('text search dictionary'),
@@ -147,6 +148,7 @@ WITH objects (type, name, args) AS (VALUES
 				('foreign table column', '{addr_nsp, genftable, a}', '{}'),
 				('aggregate', '{addr_nsp, genaggr}', '{int4}'),
 				('function', '{pg_catalog, pg_identify_object}', '{pg_catalog.oid, pg_catalog.oid, int4}'),
+				('procedure', '{addr_nsp, proc}', '{int4}'),
 				('type', '{pg_catalog._int4}', '{}'),
 				('type', '{addr_nsp.gendomain}', '{}'),
 				('type', '{addr_nsp.gencomptype}', '{}'),
diff --git a/src/test/regress/sql/opr_sanity.sql b/src/test/regress/sql/opr_sanity.sql
index 2945966c0e..e8fdf8454d 100644
--- a/src/test/regress/sql/opr_sanity.sql
+++ b/src/test/regress/sql/opr_sanity.sql
@@ -795,6 +795,8 @@ WHERE aggfnoid = 0 OR aggtransfn = 0 OR
     aggkind NOT IN ('n', 'o', 'h') OR
     aggnumdirectargs < 0 OR
     (aggkind = 'n' AND aggnumdirectargs > 0) OR
+    aggfinalmodify NOT IN ('r', 's', 'w') OR
+    aggmfinalmodify NOT IN ('r', 's', 'w') OR
     aggtranstype = 0 OR aggtransspace < 0 OR aggmtransspace < 0;
 
 -- Make sure the matching pg_proc entry is sensible, too.
diff --git a/src/test/regress/sql/partition_join.sql b/src/test/regress/sql/partition_join.sql
new file mode 100644
index 0000000000..a2d8b1be55
--- /dev/null
+++ b/src/test/regress/sql/partition_join.sql
@@ -0,0 +1,386 @@
+--
+-- PARTITION_JOIN
+-- Test partitionwise join between partitioned tables
+--
+
+-- Enable partitionwise join, which by default is disabled.
+SET enable_partitionwise_join to true;
+
+--
+-- partitioned by a single column
+--
+CREATE TABLE prt1 (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE prt1_p1 PARTITION OF prt1 FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_p3 PARTITION OF prt1 FOR VALUES FROM (500) TO (600);
+CREATE TABLE prt1_p2 PARTITION OF prt1 FOR VALUES FROM (250) TO (500);
+INSERT INTO prt1 SELECT i, i % 25, to_char(i, 'FM0000') FROM generate_series(0, 599) i WHERE i % 2 = 0;
+CREATE INDEX iprt1_p1_a on prt1_p1(a);
+CREATE INDEX iprt1_p2_a on prt1_p2(a);
+CREATE INDEX iprt1_p3_a on prt1_p3(a);
+ANALYZE prt1;
+
+CREATE TABLE prt2 (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE prt2_p1 PARTITION OF prt2 FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_p2 PARTITION OF prt2 FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt2_p3 PARTITION OF prt2 FOR VALUES FROM (500) TO (600);
+INSERT INTO prt2 SELECT i % 25, i, to_char(i, 'FM0000') FROM generate_series(0, 599) i WHERE i % 3 = 0;
+CREATE INDEX iprt2_p1_b on prt2_p1(b);
+CREATE INDEX iprt2_p2_b on prt2_p2(b);
+CREATE INDEX iprt2_p3_b on prt2_p3(b);
+ANALYZE prt2;
+
+-- inner join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+
+-- left outer join, with whole-row reference
+EXPLAIN (COSTS OFF)
+SELECT t1, t2 FROM prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1, t2 FROM prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+
+-- right outer join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+
+-- full outer join, with placeholder vars
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b) WHERE t1.phv = t1.a OR t2.phv = t2.b ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b) WHERE t1.phv = t1.a OR t2.phv = t2.b ORDER BY t1.a, t2.b;
+
+-- Join with pruned partitions from joining relations
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a < 450 AND t2.b > 250 AND t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a < 450 AND t2.b > 250 AND t1.b = 0 ORDER BY t1.a, t2.b;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 FULL JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 OR t2.a = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a < 450) t1 FULL JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 OR t2.a = 0 ORDER BY t1.a, t2.b;
+
+-- Semi-join
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t2.b FROM prt2 t2 WHERE t2.a = 0) AND t1.b = 0 ORDER BY t1.a;
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t2.b FROM prt2 t2 WHERE t2.a = 0) AND t1.b = 0 ORDER BY t1.a;
+
+-- Anti-join with aggregates
+EXPLAIN (COSTS OFF)
+SELECT sum(t1.a), avg(t1.a), sum(t1.b), avg(t1.b) FROM prt1 t1 WHERE NOT EXISTS (SELECT 1 FROM prt2 t2 WHERE t1.a = t2.b);
+SELECT sum(t1.a), avg(t1.a), sum(t1.b), avg(t1.b) FROM prt1 t1 WHERE NOT EXISTS (SELECT 1 FROM prt2 t2 WHERE t1.a = t2.b);
+
+-- lateral reference
+EXPLAIN (COSTS OFF)
+SELECT * FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.a = ss.t2a WHERE t1.b = 0 ORDER BY t1.a;
+SELECT * FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.a = ss.t2a WHERE t1.b = 0 ORDER BY t1.a;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, ss.t2a, ss.t2c FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, t2.b t2b, t2.c t2c, least(t1.a,t2.a,t3.b) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.c = ss.t2c WHERE (t1.b + coalesce(ss.t2b, 0)) = 0 ORDER BY t1.a;
+SELECT t1.a, ss.t2a, ss.t2c FROM prt1 t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t3.a AS t3a, t2.b t2b, t2.c t2c, least(t1.a,t2.a,t3.a) FROM prt1 t2 JOIN prt2 t3 ON (t2.a = t3.b)) ss
+			  ON t1.c = ss.t2c WHERE (t1.b + coalesce(ss.t2b, 0)) = 0 ORDER BY t1.a;
+
+--
+-- partitioned by expression
+--
+CREATE TABLE prt1_e (a int, b int, c int) PARTITION BY RANGE(((a + b)/2));
+CREATE TABLE prt1_e_p1 PARTITION OF prt1_e FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_e_p2 PARTITION OF prt1_e FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt1_e_p3 PARTITION OF prt1_e FOR VALUES FROM (500) TO (600);
+INSERT INTO prt1_e SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
+CREATE INDEX iprt1_e_p1_ab2 on prt1_e_p1(((a+b)/2));
+CREATE INDEX iprt1_e_p2_ab2 on prt1_e_p2(((a+b)/2));
+CREATE INDEX iprt1_e_p3_ab2 on prt1_e_p3(((a+b)/2));
+ANALYZE prt1_e;
+
+CREATE TABLE prt2_e (a int, b int, c int) PARTITION BY RANGE(((b + a)/2));
+CREATE TABLE prt2_e_p1 PARTITION OF prt2_e FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_e_p2 PARTITION OF prt2_e FOR VALUES FROM (250) TO (500);
+CREATE TABLE prt2_e_p3 PARTITION OF prt2_e FOR VALUES FROM (500) TO (600);
+INSERT INTO prt2_e SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_e;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_e t1, prt2_e t2 WHERE (t1.a + t1.b)/2 = (t2.b + t2.a)/2 AND t1.c = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_e t1, prt2_e t2 WHERE (t1.a + t1.b)/2 = (t2.b + t2.a)/2 AND t1.c = 0 ORDER BY t1.a, t2.b;
+
+--
+-- N-way join
+--
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM prt1 t1, prt2 t2, prt1_e t3 WHERE t1.a = t2.b AND t1.a = (t3.a + t3.b)/2 AND t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM prt1 t1, prt2 t2, prt1_e t3 WHERE t1.a = t2.b AND t1.a = (t3.a + t3.b)/2 AND t1.b = 0 ORDER BY t1.a, t2.b;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) LEFT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.b = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) LEFT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.b = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+
+-- Cases with non-nullable expressions in subquery results;
+-- make sure these go to null as expected
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.phv, t2.b, t2.phv, t3.a + t3.b, t3.phv FROM ((SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b)) FULL JOIN (SELECT 50 phv, * FROM prt1_e WHERE prt1_e.c = 0) t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.a = t1.phv OR t2.b = t2.phv OR (t3.a + t3.b)/2 = t3.phv ORDER BY t1.a, t2.b, t3.a + t3.b;
+SELECT t1.a, t1.phv, t2.b, t2.phv, t3.a + t3.b, t3.phv FROM ((SELECT 50 phv, * FROM prt1 WHERE prt1.b = 0) t1 FULL JOIN (SELECT 75 phv, * FROM prt2 WHERE prt2.a = 0) t2 ON (t1.a = t2.b)) FULL JOIN (SELECT 50 phv, * FROM prt1_e WHERE prt1_e.c = 0) t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t1.a = t1.phv OR t2.b = t2.phv OR (t3.a + t3.b)/2 = t3.phv ORDER BY t1.a, t2.b, t3.a + t3.b;
+
+-- Semi-join
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHERE t1.a = 0 AND t1.b = (t2.a + t2.b)/2) AND t1.b = 0 ORDER BY t1.a;
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1, prt1_e t2 WHERE t1.a = 0 AND t1.b = (t2.a + t2.b)/2) AND t1.b = 0 ORDER BY t1.a;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+
+-- test merge joins
+SET enable_hashjoin TO off;
+SET enable_nestloop TO off;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+SELECT t1.* FROM prt1 t1 WHERE t1.a IN (SELECT t1.b FROM prt2 t1 WHERE t1.b IN (SELECT (t1.a + t1.b)/2 FROM prt1_e t1 WHERE t1.c = 0)) AND t1.b = 0 ORDER BY t1.a;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+SELECT t1.a, t1.c, t2.b, t2.c, t3.a + t3.b, t3.c FROM (prt1 t1 LEFT JOIN prt2 t2 ON t1.a = t2.b) RIGHT JOIN prt1_e t3 ON (t1.a = (t3.a + t3.b)/2) WHERE t3.c = 0 ORDER BY t1.a, t2.b, t3.a + t3.b;
+
+-- MergeAppend on nullable column
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t2.b FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t2.b FROM (SELECT * FROM prt1 WHERE a < 450) t1 LEFT JOIN (SELECT * FROM prt2 WHERE b > 250) t2 ON t1.a = t2.b WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+
+RESET enable_hashjoin;
+RESET enable_nestloop;
+
+--
+-- partitioned by multiple columns
+--
+CREATE TABLE prt1_m (a int, b int, c int) PARTITION BY RANGE(a, ((a + b)/2));
+CREATE TABLE prt1_m_p1 PARTITION OF prt1_m FOR VALUES FROM (0, 0) TO (250, 250);
+CREATE TABLE prt1_m_p2 PARTITION OF prt1_m FOR VALUES FROM (250, 250) TO (500, 500);
+CREATE TABLE prt1_m_p3 PARTITION OF prt1_m FOR VALUES FROM (500, 500) TO (600, 600);
+INSERT INTO prt1_m SELECT i, i, i % 25 FROM generate_series(0, 599, 2) i;
+ANALYZE prt1_m;
+
+CREATE TABLE prt2_m (a int, b int, c int) PARTITION BY RANGE(((b + a)/2), b);
+CREATE TABLE prt2_m_p1 PARTITION OF prt2_m FOR VALUES FROM (0, 0) TO (250, 250);
+CREATE TABLE prt2_m_p2 PARTITION OF prt2_m FOR VALUES FROM (250, 250) TO (500, 500);
+CREATE TABLE prt2_m_p3 PARTITION OF prt2_m FOR VALUES FROM (500, 500) TO (600, 600);
+INSERT INTO prt2_m SELECT i, i, i % 25 FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_m;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_m WHERE prt1_m.c = 0) t1 FULL JOIN (SELECT * FROM prt2_m WHERE prt2_m.c = 0) t2 ON (t1.a = (t2.b + t2.a)/2 AND t2.b = (t1.a + t1.b)/2) ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_m WHERE prt1_m.c = 0) t1 FULL JOIN (SELECT * FROM prt2_m WHERE prt2_m.c = 0) t2 ON (t1.a = (t2.b + t2.a)/2 AND t2.b = (t1.a + t1.b)/2) ORDER BY t1.a, t2.b;
+
+--
+-- tests for list partitioned tables.
+--
+CREATE TABLE plt1 (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE plt1_p1 PARTITION OF plt1 FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt1_p2 PARTITION OF plt1 FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt1_p3 PARTITION OF plt1 FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE plt1;
+
+CREATE TABLE plt2 (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE plt2_p1 PARTITION OF plt2 FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt2_p2 PARTITION OF plt2 FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt2_p3 PARTITION OF plt2 FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE plt2;
+
+--
+-- list partitioned by expression
+--
+CREATE TABLE plt1_e (a int, b int, c text) PARTITION BY LIST(ltrim(c, 'A'));
+CREATE TABLE plt1_e_p1 PARTITION OF plt1_e FOR VALUES IN ('0000', '0003', '0004', '0010');
+CREATE TABLE plt1_e_p2 PARTITION OF plt1_e FOR VALUES IN ('0001', '0005', '0002', '0009');
+CREATE TABLE plt1_e_p3 PARTITION OF plt1_e FOR VALUES IN ('0006', '0007', '0008', '0011');
+INSERT INTO plt1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE plt1_e;
+
+-- test partition matching with N-way join
+EXPLAIN (COSTS OFF)
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM plt1 t1, plt2 t2, plt1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM plt1 t1, plt2 t2, plt1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+
+-- joins where one of the relations is proven empty
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt2 t2 WHERE t1.a = t2.b AND t1.a = 1 AND t1.a = 2;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 LEFT JOIN prt2 t2 ON t1.a = t2.b;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 RIGHT JOIN prt2 t2 ON t1.a = t2.b, prt1 t3 WHERE t2.b = t3.a;
+
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1 WHERE a = 1 AND a = 2) t1 FULL JOIN prt2 t2 ON t1.a = t2.b WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+
+--
+-- tests for hash partitioned tables.
+--
+CREATE TABLE pht1 (a int, b int, c text) PARTITION BY HASH(c);
+CREATE TABLE pht1_p1 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht1_p2 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht1_p3 PARTITION OF pht1 FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht1 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE pht1;
+
+CREATE TABLE pht2 (a int, b int, c text) PARTITION BY HASH(c);
+CREATE TABLE pht2_p1 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht2_p2 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht2_p3 PARTITION OF pht2 FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht2 SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE pht2;
+
+--
+-- hash partitioned by expression
+--
+CREATE TABLE pht1_e (a int, b int, c text) PARTITION BY HASH(ltrim(c, 'A'));
+CREATE TABLE pht1_e_p1 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 0);
+CREATE TABLE pht1_e_p2 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 1);
+CREATE TABLE pht1_e_p3 PARTITION OF pht1_e FOR VALUES WITH (MODULUS 3, REMAINDER 2);
+INSERT INTO pht1_e SELECT i, i, 'A' || to_char(i/50, 'FM0000') FROM generate_series(0, 299, 2) i;
+ANALYZE pht1_e;
+
+-- test partition matching with N-way join
+EXPLAIN (COSTS OFF)
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM pht1 t1, pht2 t2, pht1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+SELECT avg(t1.a), avg(t2.b), avg(t3.a + t3.b), t1.c, t2.c, t3.c FROM pht1 t1, pht2 t2, pht1_e t3 WHERE t1.b = t2.b AND t1.c = t2.c AND ltrim(t3.c, 'A') = t1.c GROUP BY t1.c, t2.c, t3.c ORDER BY t1.c, t2.c, t3.c;
+
+--
+-- multiple levels of partitioning
+--
+CREATE TABLE prt1_l (a int, b int, c varchar) PARTITION BY RANGE(a);
+CREATE TABLE prt1_l_p1 PARTITION OF prt1_l FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt1_l_p2 PARTITION OF prt1_l FOR VALUES FROM (250) TO (500) PARTITION BY LIST (c);
+CREATE TABLE prt1_l_p2_p1 PARTITION OF prt1_l_p2 FOR VALUES IN ('0000', '0001');
+CREATE TABLE prt1_l_p2_p2 PARTITION OF prt1_l_p2 FOR VALUES IN ('0002', '0003');
+CREATE TABLE prt1_l_p3 PARTITION OF prt1_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (b);
+CREATE TABLE prt1_l_p3_p1 PARTITION OF prt1_l_p3 FOR VALUES FROM (0) TO (13);
+CREATE TABLE prt1_l_p3_p2 PARTITION OF prt1_l_p3 FOR VALUES FROM (13) TO (25);
+INSERT INTO prt1_l SELECT i, i % 25, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt1_l;
+
+CREATE TABLE prt2_l (a int, b int, c varchar) PARTITION BY RANGE(b);
+CREATE TABLE prt2_l_p1 PARTITION OF prt2_l FOR VALUES FROM (0) TO (250);
+CREATE TABLE prt2_l_p2 PARTITION OF prt2_l FOR VALUES FROM (250) TO (500) PARTITION BY LIST (c);
+CREATE TABLE prt2_l_p2_p1 PARTITION OF prt2_l_p2 FOR VALUES IN ('0000', '0001');
+CREATE TABLE prt2_l_p2_p2 PARTITION OF prt2_l_p2 FOR VALUES IN ('0002', '0003');
+CREATE TABLE prt2_l_p3 PARTITION OF prt2_l FOR VALUES FROM (500) TO (600) PARTITION BY RANGE (a);
+CREATE TABLE prt2_l_p3_p1 PARTITION OF prt2_l_p3 FOR VALUES FROM (0) TO (13);
+CREATE TABLE prt2_l_p3_p2 PARTITION OF prt2_l_p3 FOR VALUES FROM (13) TO (25);
+INSERT INTO prt2_l SELECT i % 25, i, to_char(i % 4, 'FM0000') FROM generate_series(0, 599, 3) i;
+ANALYZE prt2_l;
+
+-- inner join, qual covering only top-level partitions
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1, prt2_l t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1, prt2_l t2 WHERE t1.a = t2.b AND t1.b = 0 ORDER BY t1.a, t2.b;
+
+-- left join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 LEFT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 LEFT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t1.b = 0 ORDER BY t1.a, t2.b;
+
+-- right join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_l t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.c = t2.c WHERE t2.a = 0 ORDER BY t1.a, t2.b;
+
+-- full join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE prt1_l.b = 0) t1 FULL JOIN (SELECT * FROM prt2_l WHERE prt2_l.a = 0) t2 ON (t1.a = t2.b AND t1.c = t2.c) ORDER BY t1.a, t2.b;
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE prt1_l.b = 0) t1 FULL JOIN (SELECT * FROM prt2_l WHERE prt2_l.a = 0) t2 ON (t1.a = t2.b AND t1.c = t2.c) ORDER BY t1.a, t2.b;
+
+-- lateral partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT * FROM prt1_l t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t2.c AS t2c, t2.b AS t2b, t3.b AS t3b, least(t1.a,t2.a,t3.b) FROM prt1_l t2 JOIN prt2_l t3 ON (t2.a = t3.b AND t2.c = t3.c)) ss
+			  ON t1.a = ss.t2a AND t1.c = ss.t2c WHERE t1.b = 0 ORDER BY t1.a;
+SELECT * FROM prt1_l t1 LEFT JOIN LATERAL
+			  (SELECT t2.a AS t2a, t2.c AS t2c, t2.b AS t2b, t3.b AS t3b, least(t1.a,t2.a,t3.b) FROM prt1_l t2 JOIN prt2_l t3 ON (t2.a = t3.b AND t2.c = t3.c)) ss
+			  ON t1.a = ss.t2a AND t1.c = ss.t2c WHERE t1.b = 0 ORDER BY t1.a;
+
+-- join with one side empty
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM (SELECT * FROM prt1_l WHERE a = 1 AND a = 2) t1 RIGHT JOIN prt2_l t2 ON t1.a = t2.b AND t1.b = t2.a AND t1.c = t2.c;
+
+--
+-- negative testcases
+--
+CREATE TABLE prt1_n (a int, b int, c varchar) PARTITION BY RANGE(c);
+CREATE TABLE prt1_n_p1 PARTITION OF prt1_n FOR VALUES FROM ('0000') TO ('0250');
+CREATE TABLE prt1_n_p2 PARTITION OF prt1_n FOR VALUES FROM ('0250') TO ('0500');
+INSERT INTO prt1_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 499, 2) i;
+ANALYZE prt1_n;
+
+CREATE TABLE prt2_n (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE prt2_n_p1 PARTITION OF prt2_n FOR VALUES IN ('0000', '0003', '0004', '0010', '0006', '0007');
+CREATE TABLE prt2_n_p2 PARTITION OF prt2_n FOR VALUES IN ('0001', '0005', '0002', '0009', '0008', '0011');
+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt2_n;
+
+CREATE TABLE prt3_n (a int, b int, c text) PARTITION BY LIST(c);
+CREATE TABLE prt3_n_p1 PARTITION OF prt3_n FOR VALUES IN ('0000', '0004', '0006', '0007');
+CREATE TABLE prt3_n_p2 PARTITION OF prt3_n FOR VALUES IN ('0001', '0002', '0008', '0010');
+CREATE TABLE prt3_n_p3 PARTITION OF prt3_n FOR VALUES IN ('0003', '0005', '0009', '0011');
+INSERT INTO prt2_n SELECT i, i, to_char(i/50, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt3_n;
+
+CREATE TABLE prt4_n (a int, b int, c text) PARTITION BY RANGE(a);
+CREATE TABLE prt4_n_p1 PARTITION OF prt4_n FOR VALUES FROM (0) TO (300);
+CREATE TABLE prt4_n_p2 PARTITION OF prt4_n FOR VALUES FROM (300) TO (500);
+CREATE TABLE prt4_n_p3 PARTITION OF prt4_n FOR VALUES FROM (500) TO (600);
+INSERT INTO prt4_n SELECT i, i, to_char(i, 'FM0000') FROM generate_series(0, 599, 2) i;
+ANALYZE prt4_n;
+
+-- partitionwise join can not be applied if the partition ranges differ
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt4_n t2 WHERE t1.a = t2.a;
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1, prt4_n t2, prt2 t3 WHERE t1.a = t2.a and t1.a = t3.b;
+
+-- partitionwise join can not be applied if there are no equi-join conditions
+-- between partition keys
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1 t1 LEFT JOIN prt2 t2 ON (t1.a < t2.b);
+
+-- equi-join with join condition on partial keys does not qualify for
+-- partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1, prt2_m t2 WHERE t1.a = (t2.b + t2.a)/2;
+
+-- equi-join between out-of-order partition key columns does not qualify for
+-- partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1 LEFT JOIN prt2_m t2 ON t1.a = t2.b;
+
+-- equi-join between non-key columns does not qualify for partitionwise join
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_m t1 LEFT JOIN prt2_m t2 ON t1.c = t2.c;
+
+-- partitionwise join can not be applied between tables with different
+-- partition lists
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 LEFT JOIN prt2_n t2 ON (t1.c = t2.c);
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 JOIN prt2_n t2 ON (t1.c = t2.c) JOIN plt1 t3 ON (t1.c = t3.c);
+
+-- partitionwise join can not be applied for a join between list and range
+-- partitioned table
+EXPLAIN (COSTS OFF)
+SELECT t1.a, t1.c, t2.b, t2.c FROM prt1_n t1 FULL JOIN prt1 t2 ON (t1.c = t2.c);
diff --git a/src/test/regress/sql/partition_prune.sql b/src/test/regress/sql/partition_prune.sql
new file mode 100644
index 0000000000..514f8e5ce1
--- /dev/null
+++ b/src/test/regress/sql/partition_prune.sql
@@ -0,0 +1,155 @@
+--
+-- Test partitioning planner code
+--
+create table lp (a char) partition by list (a);
+create table lp_default partition of lp default;
+create table lp_ef partition of lp for values in ('e', 'f');
+create table lp_ad partition of lp for values in ('a', 'd');
+create table lp_bc partition of lp for values in ('b', 'c');
+create table lp_g partition of lp for values in ('g');
+create table lp_null partition of lp for values in (null);
+explain (costs off) select * from lp;
+explain (costs off) select * from lp where a > 'a' and a < 'd';
+explain (costs off) select * from lp where a > 'a' and a <= 'd';
+explain (costs off) select * from lp where a = 'a';
+explain (costs off) select * from lp where 'a' = a;	/* commuted */
+explain (costs off) select * from lp where a is not null;
+explain (costs off) select * from lp where a is null;
+explain (costs off) select * from lp where a = 'a' or a = 'c';
+explain (costs off) select * from lp where a is not null and (a = 'a' or a = 'c');
+explain (costs off) select * from lp where a <> 'g';
+explain (costs off) select * from lp where a <> 'a' and a <> 'd';
+explain (costs off) select * from lp where a not in ('a', 'd');
+
+-- collation matches the partitioning collation, pruning works
+create table coll_pruning (a text collate "C") partition by list (a);
+create table coll_pruning_a partition of coll_pruning for values in ('a');
+create table coll_pruning_b partition of coll_pruning for values in ('b');
+create table coll_pruning_def partition of coll_pruning default;
+explain (costs off) select * from coll_pruning where a collate "C" = 'a' collate "C";
+-- collation doesn't match the partitioning collation, no pruning occurs
+explain (costs off) select * from coll_pruning where a collate "POSIX" = 'a' collate "POSIX";
+
+create table rlp (a int, b varchar) partition by range (a);
+create table rlp_default partition of rlp default partition by list (a);
+create table rlp_default_default partition of rlp_default default;
+create table rlp_default_10 partition of rlp_default for values in (10);
+create table rlp_default_30 partition of rlp_default for values in (30);
+create table rlp_default_null partition of rlp_default for values in (null);
+create table rlp1 partition of rlp for values from (minvalue) to (1);
+create table rlp2 partition of rlp for values from (1) to (10);
+
+create table rlp3 (b varchar, a int) partition by list (b varchar_ops);
+create table rlp3_default partition of rlp3 default;
+create table rlp3abcd partition of rlp3 for values in ('ab', 'cd');
+create table rlp3efgh partition of rlp3 for values in ('ef', 'gh');
+create table rlp3nullxy partition of rlp3 for values in (null, 'xy');
+alter table rlp attach partition rlp3 for values from (15) to (20);
+
+create table rlp4 partition of rlp for values from (20) to (30) partition by range (a);
+create table rlp4_default partition of rlp4 default;
+create table rlp4_1 partition of rlp4 for values from (20) to (25);
+create table rlp4_2 partition of rlp4 for values from (25) to (29);
+
+create table rlp5 partition of rlp for values from (31) to (maxvalue) partition by range (a);
+create table rlp5_default partition of rlp5 default;
+create table rlp5_1 partition of rlp5 for values from (31) to (40);
+
+explain (costs off) select * from rlp where a < 1;
+explain (costs off) select * from rlp where 1 > a;	/* commuted */
+explain (costs off) select * from rlp where a <= 1;
+explain (costs off) select * from rlp where a = 1;
+explain (costs off) select * from rlp where a = 1::bigint;		/* same as above */
+explain (costs off) select * from rlp where a = 1::numeric;	/* no pruning */
+explain (costs off) select * from rlp where a <= 10;
+explain (costs off) select * from rlp where a > 10;
+explain (costs off) select * from rlp where a < 15;
+explain (costs off) select * from rlp where a <= 15;
+explain (costs off) select * from rlp where a > 15 and b = 'ab';
+explain (costs off) select * from rlp where a = 16;
+explain (costs off) select * from rlp where a = 16 and b in ('not', 'in', 'here');
+explain (costs off) select * from rlp where a = 16 and b < 'ab';
+explain (costs off) select * from rlp where a = 16 and b <= 'ab';
+explain (costs off) select * from rlp where a = 16 and b is null;
+explain (costs off) select * from rlp where a = 16 and b is not null;
+explain (costs off) select * from rlp where a is null;
+explain (costs off) select * from rlp where a is not null;
+explain (costs off) select * from rlp where a > 30;
+explain (costs off) select * from rlp where a = 30;	/* only default is scanned */
+explain (costs off) select * from rlp where a <= 31;
+explain (costs off) select * from rlp where a = 1 or a = 7;
+explain (costs off) select * from rlp where a = 1 or b = 'ab';
+
+explain (costs off) select * from rlp where a > 20 and a < 27;
+explain (costs off) select * from rlp where a = 29;
+explain (costs off) select * from rlp where a >= 29;
+
+-- redundant clauses are eliminated
+explain (costs off) select * from rlp where a > 1 and a = 10;	/* only default */
+explain (costs off) select * from rlp where a > 1 and a >=15;	/* rlp3 onwards, including default */
+explain (costs off) select * from rlp where a = 1 and a = 3;	/* empty */
+explain (costs off) select * from rlp where (a = 1 and a = 3) or (a > 1 and a = 15);
+
+-- multi-column keys
+create table mc3p (a int, b int, c int) partition by range (a, abs(b), c);
+create table mc3p_default partition of mc3p default;
+create table mc3p0 partition of mc3p for values from (minvalue, minvalue, minvalue) to (1, 1, 1);
+create table mc3p1 partition of mc3p for values from (1, 1, 1) to (10, 5, 10);
+create table mc3p2 partition of mc3p for values from (10, 5, 10) to (10, 10, 10);
+create table mc3p3 partition of mc3p for values from (10, 10, 10) to (10, 10, 20);
+create table mc3p4 partition of mc3p for values from (10, 10, 20) to (10, maxvalue, maxvalue);
+create table mc3p5 partition of mc3p for values from (11, 1, 1) to (20, 10, 10);
+create table mc3p6 partition of mc3p for values from (20, 10, 10) to (20, 20, 20);
+create table mc3p7 partition of mc3p for values from (20, 20, 20) to (maxvalue, maxvalue, maxvalue);
+
+explain (costs off) select * from mc3p where a = 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) < 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1;
+explain (costs off) select * from mc3p where a = 1 and abs(b) = 1 and c < 8;
+explain (costs off) select * from mc3p where a = 10 and abs(b) between 5 and 35;
+explain (costs off) select * from mc3p where a > 10;
+explain (costs off) select * from mc3p where a >= 10;
+explain (costs off) select * from mc3p where a < 10;
+explain (costs off) select * from mc3p where a <= 10 and abs(b) < 10;
+explain (costs off) select * from mc3p where a = 11 and abs(b) = 0;
+explain (costs off) select * from mc3p where a = 20 and abs(b) = 10 and c = 100;
+explain (costs off) select * from mc3p where a > 20;
+explain (costs off) select * from mc3p where a >= 20;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20);
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1 and c = 1) or (a = 10 and abs(b) = 5 and c = 10) or (a > 11 and a < 20) or a < 1 or a = 1;
+explain (costs off) select * from mc3p where a = 1 or abs(b) = 1 or c = 1;
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 10);
+explain (costs off) select * from mc3p where (a = 1 and abs(b) = 1) or (a = 10 and abs(b) = 9);
+
+-- a simpler multi-column keys case
+create table mc2p (a int, b int) partition by range (a, b);
+create table mc2p_default partition of mc2p default;
+create table mc2p0 partition of mc2p for values from (minvalue, minvalue) to (1, minvalue);
+create table mc2p1 partition of mc2p for values from (1, minvalue) to (1, 1);
+create table mc2p2 partition of mc2p for values from (1, 1) to (2, minvalue);
+create table mc2p3 partition of mc2p for values from (2, minvalue) to (2, 1);
+create table mc2p4 partition of mc2p for values from (2, 1) to (2, maxvalue);
+create table mc2p5 partition of mc2p for values from (2, maxvalue) to (maxvalue, maxvalue);
+
+explain (costs off) select * from mc2p where a < 2;
+explain (costs off) select * from mc2p where a = 2 and b < 1;
+explain (costs off) select * from mc2p where a > 1;
+explain (costs off) select * from mc2p where a = 1 and b > 1;
+
+-- boolean partitioning
+create table boolpart (a bool) partition by list (a);
+create table boolpart_default partition of boolpart default;
+create table boolpart_t partition of boolpart for values in ('true');
+create table boolpart_f partition of boolpart for values in ('false');
+
+explain (costs off) select * from boolpart where a in (true, false);
+explain (costs off) select * from boolpart where a = false;
+explain (costs off) select * from boolpart where not a = false;
+explain (costs off) select * from boolpart where a is true or a is not true;
+explain (costs off) select * from boolpart where a is not true;
+explain (costs off) select * from boolpart where a is not true and a is not false;
+explain (costs off) select * from boolpart where a is unknown;
+explain (costs off) select * from boolpart where a is not unknown;
+
+drop table lp, coll_pruning, rlp, mc3p, mc2p, boolpart;
diff --git a/src/test/regress/sql/plancache.sql b/src/test/regress/sql/plancache.sql
index bc2086166b..cb2a551487 100644
--- a/src/test/regress/sql/plancache.sql
+++ b/src/test/regress/sql/plancache.sql
@@ -156,3 +156,24 @@ end$$ language plpgsql;
 
 select cachebug();
 select cachebug();
+
+-- Check that addition or removal of any partition is correctly dealt with by
+-- default partition table when it is being used in prepared statement.
+create table list_parted (a int) partition by list(a);
+create table list_part_null partition of list_parted for values in (null);
+create table list_part_1 partition of list_parted for values in (1);
+create table list_part_def partition of list_parted default;
+prepare pstmt_def_insert (int) as insert into list_part_def values($1);
+-- should fail
+execute pstmt_def_insert(null);
+execute pstmt_def_insert(1);
+create table list_part_2 partition of list_parted for values in (2);
+execute pstmt_def_insert(2);
+alter table list_parted detach partition list_part_null;
+-- should be ok
+execute pstmt_def_insert(null);
+drop table list_part_1;
+-- should be ok
+execute pstmt_def_insert(1);
+drop table list_parted, list_part_null;
+deallocate pstmt_def_insert;
diff --git a/src/test/regress/sql/plpgsql.sql b/src/test/regress/sql/plpgsql.sql
index 771d68282e..f405d157bb 100644
--- a/src/test/regress/sql/plpgsql.sql
+++ b/src/test/regress/sql/plpgsql.sql
@@ -1910,6 +1910,28 @@ copy rc_test from stdin;
 500	1000
 \.
 
+create function return_unnamed_refcursor() returns refcursor as $$
+declare
+    rc refcursor;
+begin
+    open rc for select a from rc_test;
+    return rc;
+end
+$$ language plpgsql;
+
+create function use_refcursor(rc refcursor) returns int as $$
+declare
+    rc refcursor;
+    x record;
+begin
+    rc := return_unnamed_refcursor();
+    fetch next from rc into x;
+    return x.a;
+end
+$$ language plpgsql;
+
+select use_refcursor(return_unnamed_refcursor());
+
 create function return_refcursor(rc refcursor) returns refcursor as $$
 begin
     open rc for select a from rc_test;
@@ -2285,241 +2307,6 @@ end;$$ language plpgsql;
 select raise_exprs();
 drop function raise_exprs();
 
--- continue statement
-create table conttesttbl(idx serial, v integer);
-insert into conttesttbl(v) values(10);
-insert into conttesttbl(v) values(20);
-insert into conttesttbl(v) values(30);
-insert into conttesttbl(v) values(40);
-
-create function continue_test1() returns void as $$
-declare _i integer = 0; _r record;
-begin
-  raise notice '---1---';
-  loop
-    _i := _i + 1;
-    raise notice '%', _i;
-    continue when _i < 10;
-    exit;
-  end loop;
-
-  raise notice '---2---';
-  <<lbl>>
-  loop
-    _i := _i - 1;
-    loop
-      raise notice '%', _i;
-      continue lbl when _i > 0;
-      exit lbl;
-    end loop;
-  end loop;
-
-  raise notice '---3---';
-  <<the_loop>>
-  while _i < 10 loop
-    _i := _i + 1;
-    continue the_loop when _i % 2 = 0;
-    raise notice '%', _i;
-  end loop;
-
-  raise notice '---4---';
-  for _i in 1..10 loop
-    begin
-      -- applies to outer loop, not the nested begin block
-      continue when _i < 5;
-      raise notice '%', _i;
-    end;
-  end loop;
-
-  raise notice '---5---';
-  for _r in select * from conttesttbl loop
-    continue when _r.v <= 20;
-    raise notice '%', _r.v;
-  end loop;
-
-  raise notice '---6---';
-  for _r in execute 'select * from conttesttbl' loop
-    continue when _r.v <= 20;
-    raise notice '%', _r.v;
-  end loop;
-
-  raise notice '---7---';
-  for _i in 1..3 loop
-    raise notice '%', _i;
-    continue when _i = 3;
-  end loop;
-
-  raise notice '---8---';
-  _i := 1;
-  while _i <= 3 loop
-    raise notice '%', _i;
-    _i := _i + 1;
-    continue when _i = 3;
-  end loop;
-
-  raise notice '---9---';
-  for _r in select * from conttesttbl order by v limit 1 loop
-    raise notice '%', _r.v;
-    continue;
-  end loop;
-
-  raise notice '---10---';
-  for _r in execute 'select * from conttesttbl order by v limit 1' loop
-    raise notice '%', _r.v;
-    continue;
-  end loop;
-end; $$ language plpgsql;
-
-select continue_test1();
-
-drop function continue_test1();
-drop table conttesttbl;
-
--- should fail: CONTINUE is only legal inside a loop
-create function continue_error1() returns void as $$
-begin
-    begin
-        continue;
-    end;
-end;
-$$ language plpgsql;
-
--- should fail: unlabeled EXIT is only legal inside a loop
-create function exit_error1() returns void as $$
-begin
-    begin
-        exit;
-    end;
-end;
-$$ language plpgsql;
-
--- should fail: no such label
-create function continue_error2() returns void as $$
-begin
-    begin
-        loop
-            continue no_such_label;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-
--- should fail: no such label
-create function exit_error2() returns void as $$
-begin
-    begin
-        loop
-            exit no_such_label;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-
--- should fail: CONTINUE can't reference the label of a named block
-create function continue_error3() returns void as $$
-begin
-    <<begin_block1>>
-    begin
-        loop
-            continue begin_block1;
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-
--- On the other hand, EXIT *can* reference the label of a named block
-create function exit_block1() returns void as $$
-begin
-    <<begin_block1>>
-    begin
-        loop
-            exit begin_block1;
-            raise exception 'should not get here';
-        end loop;
-    end;
-end;
-$$ language plpgsql;
-
-select exit_block1();
-drop function exit_block1();
-
--- verbose end block and end loop
-create function end_label1() returns void as $$
-<<blbl>>
-begin
-  <<flbl1>>
-  for _i in 1 .. 10 loop
-    exit flbl1;
-  end loop flbl1;
-  <<flbl2>>
-  for _i in 1 .. 10 loop
-    exit flbl2;
-  end loop;
-end blbl;
-$$ language plpgsql;
-
-select end_label1();
-drop function end_label1();
-
--- should fail: undefined end label
-create function end_label2() returns void as $$
-begin
-  for _i in 1 .. 10 loop
-    exit;
-  end loop flbl1;
-end;
-$$ language plpgsql;
-
--- should fail: end label does not match start label
-create function end_label3() returns void as $$
-<<outer_label>>
-begin
-  <<inner_label>>
-  for _i in 1 .. 10 loop
-    exit;
-  end loop outer_label;
-end;
-$$ language plpgsql;
-
--- should fail: end label on a block without a start label
-create function end_label4() returns void as $$
-<<outer_label>>
-begin
-  for _i in 1 .. 10 loop
-    exit;
-  end loop outer_label;
-end;
-$$ language plpgsql;
-
--- using list of scalars in fori and fore stmts
-create function for_vect() returns void as $proc$
-<<lbl>>declare a integer; b varchar; c varchar; r record;
-begin
-  -- fori
-  for i in 1 .. 3 loop
-    raise notice '%', i;
-  end loop;
-  -- fore with record var
-  for r in select gs as aa, 'BB' as bb, 'CC' as cc from generate_series(1,4) gs loop
-    raise notice '% % %', r.aa, r.bb, r.cc;
-  end loop;
-  -- fore with single scalar
-  for a in select gs from generate_series(1,4) gs loop
-    raise notice '%', a;
-  end loop;
-  -- fore with multiple scalars
-  for a,b,c in select gs, 'BB','CC' from generate_series(1,4) gs loop
-    raise notice '% % %', a, b, c;
-  end loop;
-  -- using qualified names in fors, fore is enabled, disabled only for fori
-  for lbl.a, lbl.b, lbl.c in execute $$select gs, 'bb','cc' from generate_series(1,4) gs$$ loop
-    raise notice '% % %', a, b, c;
-  end loop;
-end;
-$proc$ language plpgsql;
-
-select for_vect();
-
 -- regression test: verify that multiple uses of same plpgsql datum within
 -- a SQL command all get mapped to the same $n parameter.  The return value
 -- of the SELECT is not important, we only care that it doesn't fail with
@@ -3580,72 +3367,6 @@ select stacked_diagnostics_test();
 
 drop function stacked_diagnostics_test();
 
--- test CASE statement
-
-create or replace function case_test(bigint) returns text as $$
-declare a int = 10;
-        b int = 1;
-begin
-  case $1
-    when 1 then
-      return 'one';
-    when 2 then
-      return 'two';
-    when 3,4,3+5 then
-      return 'three, four or eight';
-    when a then
-      return 'ten';
-    when a+b, a+b+1 then
-      return 'eleven, twelve';
-  end case;
-end;
-$$ language plpgsql immutable;
-
-select case_test(1);
-select case_test(2);
-select case_test(3);
-select case_test(4);
-select case_test(5); -- fails
-select case_test(8);
-select case_test(10);
-select case_test(11);
-select case_test(12);
-select case_test(13); -- fails
-
-create or replace function catch() returns void as $$
-begin
-  raise notice '%', case_test(6);
-exception
-  when case_not_found then
-    raise notice 'caught case_not_found % %', SQLSTATE, SQLERRM;
-end
-$$ language plpgsql;
-
-select catch();
-
--- test the searched variant too, as well as ELSE
-create or replace function case_test(bigint) returns text as $$
-declare a int = 10;
-begin
-  case
-    when $1 = 1 then
-      return 'one';
-    when $1 = a + 2 then
-      return 'twelve';
-    else
-      return 'other';
-  end case;
-end;
-$$ language plpgsql immutable;
-
-select case_test(1);
-select case_test(2);
-select case_test(12);
-select case_test(13);
-
-drop function catch();
-drop function case_test(bigint);
-
 -- test variadic functions
 
 create or replace function vari(variadic int[])
@@ -4255,6 +3976,8 @@ language plpgsql as $$
   begin return $1[1]; end;
 $$ stable;
 
+select consumes_rw_array(returns_rw_array(42));
+
 -- bug #14174
 explain (verbose, costs off)
 select i, a from
@@ -4277,6 +4000,13 @@ select consumes_rw_array(a), a from
 select consumes_rw_array(a), a from
   (values (returns_rw_array(1)), (returns_rw_array(2))) v(a);
 
+do $$
+declare a int[] := array[1,2];
+begin
+  a := a || 3;
+  raise notice 'a = %', a;
+end$$;
+
 
 --
 -- Test access to call stack
@@ -4678,14 +4408,14 @@ CREATE FUNCTION transition_table_level2_bad_usage_func()
   LANGUAGE plpgsql
 AS $$
   BEGIN
-    INSERT INTO d VALUES (1000000, 1000000, 'x');
+    INSERT INTO dx VALUES (1000000, 1000000, 'x');
     RETURN NULL;
   END;
 $$;
 
 CREATE TRIGGER transition_table_level2_bad_usage_trigger
   AFTER DELETE ON transition_table_level2
-  REFERENCING OLD TABLE AS d
+  REFERENCING OLD TABLE AS dx
   FOR EACH STATEMENT EXECUTE PROCEDURE
     transition_table_level2_bad_usage_func();
 
@@ -4773,6 +4503,32 @@ ALTER TABLE alter_table_under_transition_tables
 UPDATE alter_table_under_transition_tables
   SET id = id;
 
+--
+-- Test multiple reference to a transition table
+--
+
+CREATE TABLE multi_test (i int);
+INSERT INTO multi_test VALUES (1);
+
+CREATE OR REPLACE FUNCTION multi_test_trig() RETURNS trigger
+LANGUAGE plpgsql AS $$
+BEGIN
+    RAISE NOTICE 'count = %', (SELECT COUNT(*) FROM new_test);
+    RAISE NOTICE 'count union = %',
+      (SELECT COUNT(*)
+       FROM (SELECT * FROM new_test UNION ALL SELECT * FROM new_test) ss);
+    RETURN NULL;
+END$$;
+
+CREATE TRIGGER my_trigger AFTER UPDATE ON multi_test
+  REFERENCING NEW TABLE AS new_test OLD TABLE as old_test
+  FOR EACH STATEMENT EXECUTE PROCEDURE multi_test_trig();
+
+UPDATE multi_test SET i = i;
+
+DROP TABLE multi_test;
+DROP FUNCTION multi_test_trig();
+
 --
 -- Check type parsing and record fetching from partitioned tables
 --
@@ -4811,3 +4567,12 @@ BEGIN
 END; $$ LANGUAGE plpgsql;
 
 SELECT * FROM list_partitioned_table() AS t;
+
+--
+-- Check argument name is used instead of $n in error message
+--
+CREATE FUNCTION fx(x WSlot) RETURNS void AS $$
+BEGIN
+  GET DIAGNOSTICS x = ROW_COUNT;
+  RETURN;
+END; $$ LANGUAGE plpgsql;
diff --git a/src/test/regress/sql/polygon.sql b/src/test/regress/sql/polygon.sql
index 7ac8079465..7e8cb08cd8 100644
--- a/src/test/regress/sql/polygon.sql
+++ b/src/test/regress/sql/polygon.sql
@@ -116,3 +116,96 @@ SELECT	'(0,0)'::point <-> '((0,0),(1,2),(2,1))'::polygon as on_corner,
 	'(2,2)'::point <-> '((0,0),(1,4),(3,1))'::polygon as inside,
 	'(3,3)'::point <-> '((0,2),(2,0),(2,2))'::polygon as near_corner,
 	'(4,4)'::point <-> '((0,0),(0,3),(4,0))'::polygon as near_segment;
+
+--
+-- Test the SP-GiST index
+--
+
+CREATE TABLE quad_poly_tbl (id int, p polygon);
+
+INSERT INTO quad_poly_tbl
+	SELECT (x - 1) * 100 + y, polygon(circle(point(x * 10, y * 10), 1 + (x + y) % 10))
+	FROM generate_series(1, 100) x,
+		 generate_series(1, 100) y;
+
+INSERT INTO quad_poly_tbl
+	SELECT i, polygon '((200, 300),(210, 310),(230, 290))'
+	FROM generate_series(10001, 11000) AS i;
+
+INSERT INTO quad_poly_tbl
+	VALUES
+		(11001, NULL),
+		(11002, NULL),
+		(11003, NULL);
+
+CREATE INDEX quad_poly_tbl_idx ON quad_poly_tbl USING spgist(p);
+
+-- get reference results for ORDER BY distance from seq scan
+SET enable_seqscan = ON;
+SET enable_indexscan = OFF;
+SET enable_bitmapscan = OFF;
+
+CREATE TABLE quad_poly_tbl_ord_seq1 AS
+SELECT rank() OVER (ORDER BY p <-> point '123,456') n, p <-> point '123,456' dist, id
+FROM quad_poly_tbl;
+
+CREATE TABLE quad_poly_tbl_ord_seq2 AS
+SELECT rank() OVER (ORDER BY p <-> point '123,456') n, p <-> point '123,456' dist, id
+FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+
+-- check results results from index scan
+SET enable_seqscan = OFF;
+SET enable_indexscan = OFF;
+SET enable_bitmapscan = ON;
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p << polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p << polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &< polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p &< polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p && polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p && polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &> polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p &> polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p >> polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p >> polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p <<| polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p <<| polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p &<| polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p &<| polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p |&> polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p |&> polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p |>> polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p |>> polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+SELECT count(*) FROM quad_poly_tbl WHERE p <@ polygon '((300,300),(400,600),(600,500),(700,200))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p @> polygon '((340,550),(343,552),(341,553))';
+SELECT count(*) FROM quad_poly_tbl WHERE p @> polygon '((340,550),(343,552),(341,553))';
+
+EXPLAIN (COSTS OFF)
+SELECT count(*) FROM quad_poly_tbl WHERE p ~= polygon '((200, 300),(210, 310),(230, 290))';
+SELECT count(*) FROM quad_poly_tbl WHERE p ~= polygon '((200, 300),(210, 310),(230, 290))';
+
+RESET enable_seqscan;
+RESET enable_indexscan;
+RESET enable_bitmapscan;
diff --git a/src/test/regress/sql/privileges.sql b/src/test/regress/sql/privileges.sql
index e2c13e08a4..ea8dd028cd 100644
--- a/src/test/regress/sql/privileges.sql
+++ b/src/test/regress/sql/privileges.sql
@@ -320,9 +320,24 @@ INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLU
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set three = EXCLUDED.three;
 INSERT INTO atest5(two) VALUES (6) ON CONFLICT (two) DO UPDATE set one = 8; -- fails (due to UPDATE)
 INSERT INTO atest5(three) VALUES (4) ON CONFLICT (two) DO UPDATE set three = 10; -- fails (due to INSERT)
+
 -- Check that the columns in the inference require select privileges
--- Error. No privs on four
-INSERT INTO atest5(three) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 10;
+INSERT INTO atest5(four) VALUES (4); -- fail
+
+SET SESSION AUTHORIZATION regress_user1;
+GRANT INSERT (four) ON atest5 TO regress_user4;
+SET SESSION AUTHORIZATION regress_user4;
+
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 3; -- fails (due to SELECT)
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT ON CONSTRAINT atest5_four_key DO UPDATE set three = 3; -- fails (due to SELECT)
+INSERT INTO atest5(four) VALUES (4); -- ok
+
+SET SESSION AUTHORIZATION regress_user1;
+GRANT SELECT (four) ON atest5 TO regress_user4;
+SET SESSION AUTHORIZATION regress_user4;
+
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT (four) DO UPDATE set three = 3; -- ok
+INSERT INTO atest5(four) VALUES (4) ON CONFLICT ON CONSTRAINT atest5_four_key DO UPDATE set three = 3; -- ok
 
 SET SESSION AUTHORIZATION regress_user1;
 REVOKE ALL (one) ON atest5 FROM regress_user4;
@@ -427,12 +442,21 @@ SET SESSION AUTHORIZATION regress_user1;
 GRANT USAGE ON LANGUAGE sql TO regress_user2; -- fail
 CREATE FUNCTION testfunc1(int) RETURNS int AS 'select 2 * $1;' LANGUAGE sql;
 CREATE FUNCTION testfunc2(int) RETURNS int AS 'select 3 * $1;' LANGUAGE sql;
-
-REVOKE ALL ON FUNCTION testfunc1(int), testfunc2(int) FROM PUBLIC;
-GRANT EXECUTE ON FUNCTION testfunc1(int), testfunc2(int) TO regress_user2;
+CREATE AGGREGATE testagg1(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testproc1(int) AS 'select $1;' LANGUAGE sql;
+
+REVOKE ALL ON FUNCTION testfunc1(int), testfunc2(int), testagg1(int) FROM PUBLIC;
+GRANT EXECUTE ON FUNCTION testfunc1(int), testfunc2(int), testagg1(int) TO regress_user2;
+REVOKE ALL ON FUNCTION testproc1(int) FROM PUBLIC; -- fail, not a function
+REVOKE ALL ON PROCEDURE testproc1(int) FROM PUBLIC;
+GRANT EXECUTE ON PROCEDURE testproc1(int) TO regress_user2;
 GRANT USAGE ON FUNCTION testfunc1(int) TO regress_user3; -- semantic error
+GRANT USAGE ON FUNCTION testagg1(int) TO regress_user3; -- semantic error
+GRANT USAGE ON PROCEDURE testproc1(int) TO regress_user3; -- semantic error
 GRANT ALL PRIVILEGES ON FUNCTION testfunc1(int) TO regress_user4;
 GRANT ALL PRIVILEGES ON FUNCTION testfunc_nosuch(int) TO regress_user4;
+GRANT ALL PRIVILEGES ON FUNCTION testagg1(int) TO regress_user4;
+GRANT ALL PRIVILEGES ON PROCEDURE testproc1(int) TO regress_user4;
 
 CREATE FUNCTION testfunc4(boolean) RETURNS text
   AS 'select col1 from atest2 where col2 = $1;'
@@ -442,16 +466,24 @@ GRANT EXECUTE ON FUNCTION testfunc4(boolean) TO regress_user3;
 SET SESSION AUTHORIZATION regress_user2;
 SELECT testfunc1(5), testfunc2(5); -- ok
 CREATE FUNCTION testfunc3(int) RETURNS int AS 'select 2 * $1;' LANGUAGE sql; -- fail
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- ok
+CALL testproc1(6); -- ok
 
 SET SESSION AUTHORIZATION regress_user3;
 SELECT testfunc1(5); -- fail
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- fail
+CALL testproc1(6); -- fail
 SELECT col1 FROM atest2 WHERE col2 = true; -- fail
 SELECT testfunc4(true); -- ok
 
 SET SESSION AUTHORIZATION regress_user4;
 SELECT testfunc1(5); -- ok
+SELECT testagg1(x) FROM (VALUES (1), (2), (3)) _(x); -- ok
+CALL testproc1(6); -- ok
 
 DROP FUNCTION testfunc1(int); -- fail
+DROP AGGREGATE testagg1(int); -- fail
+DROP PROCEDURE testproc1(int); -- fail
 
 \c -
 
@@ -824,6 +856,8 @@ SELECT lo_truncate(lo_open(1002, x'20000'::int), 10);	-- to be denied
 SELECT lo_put(1002, 1, 'abcd');				-- to be denied
 SELECT lo_unlink(1002);					-- to be denied
 SELECT lo_export(1001, '/dev/null');			-- to be denied
+SELECT lo_import('/dev/null');				-- to be denied
+SELECT lo_import('/dev/null', 2003);			-- to be denied
 
 \c -
 SET lo_compat_privileges = true;	-- compatibility mode
@@ -914,17 +948,29 @@ SELECT has_schema_privilege('regress_user2', 'testns5', 'CREATE'); -- no
 SET ROLE regress_user1;
 
 CREATE FUNCTION testns.foo() RETURNS int AS 'select 1' LANGUAGE sql;
+CREATE AGGREGATE testns.agg1(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testns.bar() AS 'select 1' LANGUAGE sql;
 
 SELECT has_function_privilege('regress_user2', 'testns.foo()', 'EXECUTE'); -- no
+SELECT has_function_privilege('regress_user2', 'testns.agg1(int)', 'EXECUTE'); -- no
+SELECT has_function_privilege('regress_user2', 'testns.bar()', 'EXECUTE'); -- no
 
-ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT EXECUTE ON FUNCTIONS to public;
+ALTER DEFAULT PRIVILEGES IN SCHEMA testns GRANT EXECUTE ON ROUTINES to public;
 
 DROP FUNCTION testns.foo();
 CREATE FUNCTION testns.foo() RETURNS int AS 'select 1' LANGUAGE sql;
+DROP AGGREGATE testns.agg1(int);
+CREATE AGGREGATE testns.agg1(int) (sfunc = int4pl, stype = int4);
+DROP PROCEDURE testns.bar();
+CREATE PROCEDURE testns.bar() AS 'select 1' LANGUAGE sql;
 
 SELECT has_function_privilege('regress_user2', 'testns.foo()', 'EXECUTE'); -- yes
+SELECT has_function_privilege('regress_user2', 'testns.agg1(int)', 'EXECUTE'); -- yes
+SELECT has_function_privilege('regress_user2', 'testns.bar()', 'EXECUTE'); -- yes (counts as function here)
 
 DROP FUNCTION testns.foo();
+DROP AGGREGATE testns.agg1(int);
+DROP PROCEDURE testns.bar();
 
 ALTER DEFAULT PRIVILEGES FOR ROLE regress_user1 REVOKE USAGE ON TYPES FROM public;
 
@@ -978,12 +1024,28 @@ SELECT has_table_privilege('regress_user1', 'testns.t1', 'SELECT'); -- false
 SELECT has_table_privilege('regress_user1', 'testns.t2', 'SELECT'); -- false
 
 CREATE FUNCTION testns.testfunc(int) RETURNS int AS 'select 3 * $1;' LANGUAGE sql;
+CREATE AGGREGATE testns.testagg(int) (sfunc = int4pl, stype = int4);
+CREATE PROCEDURE testns.testproc(int) AS 'select 3' LANGUAGE sql;
 
 SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- true by default
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- true by default
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- true by default
 
 REVOKE ALL ON ALL FUNCTIONS IN SCHEMA testns FROM PUBLIC;
 
 SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- false
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- false
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- still true, not a function
+
+REVOKE ALL ON ALL PROCEDURES IN SCHEMA testns FROM PUBLIC;
+
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- now false
+
+GRANT ALL ON ALL ROUTINES IN SCHEMA testns TO PUBLIC;
+
+SELECT has_function_privilege('regress_user1', 'testns.testfunc(int)', 'EXECUTE'); -- true
+SELECT has_function_privilege('regress_user1', 'testns.testagg(int)', 'EXECUTE'); -- true
+SELECT has_function_privilege('regress_user1', 'testns.testproc(int)', 'EXECUTE'); -- true
 
 \set VERBOSITY terse \\ -- suppress cascade details
 DROP SCHEMA testns CASCADE;
@@ -1047,8 +1109,10 @@ drop table dep_priv_test;
 
 drop sequence x_seq;
 
+DROP AGGREGATE testagg1(int);
 DROP FUNCTION testfunc2(int);
 DROP FUNCTION testfunc4(boolean);
+DROP PROCEDURE testproc1(int);
 
 DROP VIEW atestv0;
 DROP VIEW atestv1;
diff --git a/src/test/regress/sql/psql.sql b/src/test/regress/sql/psql.sql
index b56a05f7f0..b45da9bb8d 100644
--- a/src/test/regress/sql/psql.sql
+++ b/src/test/regress/sql/psql.sql
@@ -28,6 +28,16 @@ SELECT 1 as one, 2 as two \g
 SELECT 3 as three, 4 as four \gx
 \g
 
+-- \gx should work in FETCH_COUNT mode too
+\set FETCH_COUNT 1
+
+SELECT 1 as one, 2 as two \g
+\gx
+SELECT 3 as three, 4 as four \gx
+\g
+
+\unset FETCH_COUNT
+
 -- \gset
 
 select 10 as test01, 20 as test02, 'Hello' as test03 \gset pref01_
@@ -63,6 +73,42 @@ select 10 as test01, 20 as test02 from generate_series(1,0) \gset
 
 \unset FETCH_COUNT
 
+-- \gdesc
+
+SELECT
+    NULL AS zero,
+    1 AS one,
+    2.0 AS two,
+    'three' AS three,
+    $1 AS four,
+    sin($2) as five,
+    'foo'::varchar(4) as six,
+    CURRENT_DATE AS now
+\gdesc
+
+-- should work with tuple-returning utilities, such as EXECUTE
+PREPARE test AS SELECT 1 AS first, 2 AS second;
+EXECUTE test \gdesc
+EXPLAIN EXECUTE test \gdesc
+
+-- should fail cleanly - syntax error
+SELECT 1 + \gdesc
+
+-- check behavior with empty results
+SELECT \gdesc
+CREATE TABLE bububu(a int) \gdesc
+
+-- subject command should not have executed
+TABLE bububu;  -- fail
+
+-- query buffer should remain unchanged
+SELECT 1 AS x, 'Hello', 2 AS y, true AS "dirty\name"
+\gdesc
+\g
+
+-- all on one line
+SELECT 3 AS x, 'Hello', 4 AS y, true AS "dirty\name" \gdesc \g
+
 -- \gexec
 
 create temporary table gexec_test(a int, b text, c date, d float);
@@ -526,6 +572,24 @@ select \if false \\ (bogus \else \\ 42 \endif \\ forty_two;
 	\echo 'should print #8-1'
 \endif
 
+-- :{?...} defined variable test
+\set i 1
+\if :{?i}
+  \echo '#9-1 ok, variable i is defined'
+\else
+  \echo 'should not print #9-2'
+\endif
+
+\if :{?no_such_variable}
+  \echo 'should not print #10-1'
+\else
+  \echo '#10-2 ok, variable no_such_variable is not defined'
+\endif
+
+SELECT :{?i} AS i_is_defined;
+
+SELECT NOT :{?no_such_var} AS no_such_var_is_not_defined;
+
 -- SHOW_CONTEXT
 
 \set SHOW_CONTEXT never
@@ -560,3 +624,67 @@ UNION SELECT 5
 ORDER BY 1;
 \r
 \p
+
+-- tests for special result variables
+
+-- working query, 2 rows selected
+SELECT 1 AS stuff UNION SELECT 2;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+
+-- syntax error
+SELECT 1 UNION;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+
+-- empty query
+;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+-- must have kept previous values
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+
+-- other query error
+DROP TABLE this_table_does_not_exist;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+
+-- working \gdesc
+SELECT 3 AS three, 4 AS four \gdesc
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+
+-- \gdesc with an error
+SELECT 4 AS \gdesc
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+
+-- check row count for a cursor-fetched query
+\set FETCH_COUNT 10
+select unique2 from tenk1 order by unique2 limit 19;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+
+-- cursor-fetched query with an error after the first group
+select 1/(15-unique2) from tenk1 order by unique2 limit 19;
+\echo 'error:' :ERROR
+\echo 'error code:' :SQLSTATE
+\echo 'number of rows:' :ROW_COUNT
+\echo 'last error message:' :LAST_ERROR_MESSAGE
+\echo 'last error code:' :LAST_ERROR_SQLSTATE
+
+\unset FETCH_COUNT
diff --git a/src/test/regress/sql/rangetypes.sql b/src/test/regress/sql/rangetypes.sql
index a60df9095e..55638a85ee 100644
--- a/src/test/regress/sql/rangetypes.sql
+++ b/src/test/regress/sql/rangetypes.sql
@@ -461,6 +461,18 @@ select *, row_to_json(upper(t)) as u from
 
 drop type two_ints cascade;
 
+--
+-- Check behavior when subtype lacks a hash function
+--
+
+create type cashrange as range (subtype = money);
+
+set enable_sort = off;  -- try to make it pick a hash setop implementation
+
+select '(2,5)'::cashrange except select '(5,6)'::cashrange;
+
+reset enable_sort;
+
 --
 -- OUT/INOUT/TABLE functions
 --
diff --git a/src/test/regress/sql/reloptions.sql b/src/test/regress/sql/reloptions.sql
new file mode 100644
index 0000000000..c9119fd863
--- /dev/null
+++ b/src/test/regress/sql/reloptions.sql
@@ -0,0 +1,113 @@
+
+-- Simple create
+CREATE TABLE reloptions_test(i INT) WITH (FiLLFaCToR=30,
+	autovacuum_enabled = false, autovacuum_analyze_scale_factor = 0.2);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+
+-- Fail min/max values check
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=2);
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=110);
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor = -10.0);
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor = 110.0);
+
+-- Fail when option and namespace do not exist
+CREATE TABLE reloptions_test2(i INT) WITH (not_existing_option=2);
+CREATE TABLE reloptions_test2(i INT) WITH (not_existing_namespace.fillfactor=2);
+
+-- Fail while setting improper values
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=30.5);
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor='string');
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=true);
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled=12);
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled=30.5);
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_enabled='string');
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor='string');
+CREATE TABLE reloptions_test2(i INT) WITH (autovacuum_analyze_scale_factor=true);
+
+-- Fail if option is specified twice
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor=30, fillfactor=40);
+
+-- Specifying name only for a non-Boolean option should fail
+CREATE TABLE reloptions_test2(i INT) WITH (fillfactor);
+
+-- Simple ALTER TABLE
+ALTER TABLE reloptions_test SET (fillfactor=31,
+	autovacuum_analyze_scale_factor = 0.3);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+
+-- Set boolean option to true without specifying value
+ALTER TABLE reloptions_test SET (autovacuum_enabled, fillfactor=32);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+
+-- Check that RESET works well
+ALTER TABLE reloptions_test RESET (fillfactor);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+
+-- Resetting all values causes the column to become null
+ALTER TABLE reloptions_test RESET (autovacuum_enabled,
+	autovacuum_analyze_scale_factor);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass AND
+reloptions IS NULL;
+
+-- RESET fails if a value is specified
+ALTER TABLE reloptions_test RESET (fillfactor=12);
+
+-- The OIDS option is not stored
+DROP TABLE reloptions_test;
+CREATE TABLE reloptions_test(i INT) WITH (fillfactor=20, oids=true);
+SELECT reloptions, relhasoids FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+
+-- Test toast.* options
+DROP TABLE reloptions_test;
+
+CREATE TABLE reloptions_test (s VARCHAR)
+	WITH (toast.autovacuum_vacuum_cost_delay = 23);
+SELECT reltoastrelid as toast_oid
+	FROM pg_class WHERE oid = 'reloptions_test'::regclass \gset
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+
+ALTER TABLE reloptions_test SET (toast.autovacuum_vacuum_cost_delay = 24);
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+
+ALTER TABLE reloptions_test RESET (toast.autovacuum_vacuum_cost_delay);
+SELECT reloptions FROM pg_class WHERE oid = :toast_oid;
+
+-- Fail on non-existent options in toast namespace
+CREATE TABLE reloptions_test2 (i int) WITH (toast.not_existing_option = 42);
+
+-- Mix TOAST & heap
+DROP TABLE reloptions_test;
+
+CREATE TABLE reloptions_test (s VARCHAR) WITH
+	(toast.autovacuum_vacuum_cost_delay = 23,
+	autovacuum_vacuum_cost_delay = 24, fillfactor = 40);
+
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test'::regclass;
+SELECT reloptions FROM pg_class WHERE oid = (
+	SELECT reltoastrelid FROM pg_class WHERE oid = 'reloptions_test'::regclass);
+
+--
+-- CREATE INDEX, ALTER INDEX for btrees
+--
+
+CREATE INDEX reloptions_test_idx ON reloptions_test (s) WITH (fillfactor=30);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx'::regclass;
+
+-- Fail when option and namespace do not exist
+CREATE INDEX reloptions_test_idx ON reloptions_test (s)
+	WITH (not_existing_option=2);
+CREATE INDEX reloptions_test_idx ON reloptions_test (s)
+	WITH (not_existing_ns.fillfactor=2);
+
+-- Check allowed ranges
+CREATE INDEX reloptions_test_idx2 ON reloptions_test (s) WITH (fillfactor=1);
+CREATE INDEX reloptions_test_idx2 ON reloptions_test (s) WITH (fillfactor=130);
+
+-- Check ALTER
+ALTER INDEX reloptions_test_idx SET (fillfactor=40);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx'::regclass;
+
+-- Check ALTER on empty reloption list
+CREATE INDEX reloptions_test_idx3 ON reloptions_test (s);
+ALTER INDEX reloptions_test_idx3 SET (fillfactor=40);
+SELECT reloptions FROM pg_class WHERE oid = 'reloptions_test_idx3'::regclass;
diff --git a/src/test/regress/sql/rowsecurity.sql b/src/test/regress/sql/rowsecurity.sql
index e03a7ab65f..f3a31dbee0 100644
--- a/src/test/regress/sql/rowsecurity.sql
+++ b/src/test/regress/sql/rowsecurity.sql
@@ -1674,10 +1674,11 @@ DROP TABLE r1;
 --
 SET SESSION AUTHORIZATION regress_rls_alice;
 SET row_security = on;
-CREATE TABLE r1 (a int);
+CREATE TABLE r1 (a int PRIMARY KEY);
 
 CREATE POLICY p1 ON r1 FOR SELECT USING (a < 20);
 CREATE POLICY p2 ON r1 FOR UPDATE USING (a < 20) WITH CHECK (true);
+CREATE POLICY p3 ON r1 FOR INSERT WITH CHECK (true);
 INSERT INTO r1 VALUES (10);
 ALTER TABLE r1 ENABLE ROW LEVEL SECURITY;
 ALTER TABLE r1 FORCE ROW LEVEL SECURITY;
@@ -1699,6 +1700,17 @@ ALTER TABLE r1 FORCE ROW LEVEL SECURITY;
 -- Error
 UPDATE r1 SET a = 30 RETURNING *;
 
+-- UPDATE path of INSERT ... ON CONFLICT DO UPDATE should also error out
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT (a) DO UPDATE SET a = 30 RETURNING *;
+
+-- Should still error out without RETURNING (use of arbiter always requires
+-- SELECT permissions)
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT (a) DO UPDATE SET a = 30;
+INSERT INTO r1 VALUES (10)
+    ON CONFLICT ON CONSTRAINT r1_pkey DO UPDATE SET a = 30;
+
 DROP TABLE r1;
 
 -- Check dependency handling
diff --git a/src/test/regress/sql/rowtypes.sql b/src/test/regress/sql/rowtypes.sql
index 8d63060500..305639f05d 100644
--- a/src/test/regress/sql/rowtypes.sql
+++ b/src/test/regress/sql/rowtypes.sql
@@ -27,6 +27,9 @@ select '(Joe,"Blow,Jr")'::fullname;
 select '(Joe,)'::fullname;	-- ok, null 2nd column
 select '(Joe)'::fullname;	-- bad
 select '(Joe,,)'::fullname;	-- bad
+select '[]'::fullname;          -- bad
+select ' (Joe,Blow)  '::fullname;  -- ok, extra whitespace
+select '(Joe,Blow) /'::fullname;  -- bad
 
 create temp table quadtable(f1 int, q quad);
 
@@ -160,6 +163,105 @@ insert into cc values('("(1,2)",3)');
 insert into cc values('("(4,5)",6)');
 select * from cc order by f1; -- fail, but should complain about cantcompare
 
+--
+-- Tests for record_{eq,cmp}
+--
+
+create type testtype1 as (a int, b int);
+
+-- all true
+select row(1, 2)::testtype1 < row(1, 3)::testtype1;
+select row(1, 2)::testtype1 <= row(1, 3)::testtype1;
+select row(1, 2)::testtype1 = row(1, 2)::testtype1;
+select row(1, 2)::testtype1 <> row(1, 3)::testtype1;
+select row(1, 3)::testtype1 >= row(1, 2)::testtype1;
+select row(1, 3)::testtype1 > row(1, 2)::testtype1;
+
+-- all false
+select row(1, -2)::testtype1 < row(1, -3)::testtype1;
+select row(1, -2)::testtype1 <= row(1, -3)::testtype1;
+select row(1, -2)::testtype1 = row(1, -3)::testtype1;
+select row(1, -2)::testtype1 <> row(1, -2)::testtype1;
+select row(1, -3)::testtype1 >= row(1, -2)::testtype1;
+select row(1, -3)::testtype1 > row(1, -2)::testtype1;
+
+-- true, but see *< below
+select row(1, -2)::testtype1 < row(1, 3)::testtype1;
+
+-- mismatches
+create type testtype3 as (a int, b text);
+select row(1, 2)::testtype1 < row(1, 'abc')::testtype3;
+select row(1, 2)::testtype1 <> row(1, 'abc')::testtype3;
+create type testtype5 as (a int);
+select row(1, 2)::testtype1 < row(1)::testtype5;
+select row(1, 2)::testtype1 <> row(1)::testtype5;
+
+-- non-comparable types
+create type testtype6 as (a int, b point);
+select row(1, '(1,2)')::testtype6 < row(1, '(1,3)')::testtype6;
+select row(1, '(1,2)')::testtype6 <> row(1, '(1,3)')::testtype6;
+
+drop type testtype1, testtype3, testtype5, testtype6;
+
+--
+-- Tests for record_image_{eq,cmp}
+--
+
+create type testtype1 as (a int, b int);
+
+-- all true
+select row(1, 2)::testtype1 *< row(1, 3)::testtype1;
+select row(1, 2)::testtype1 *<= row(1, 3)::testtype1;
+select row(1, 2)::testtype1 *= row(1, 2)::testtype1;
+select row(1, 2)::testtype1 *<> row(1, 3)::testtype1;
+select row(1, 3)::testtype1 *>= row(1, 2)::testtype1;
+select row(1, 3)::testtype1 *> row(1, 2)::testtype1;
+
+-- all false
+select row(1, -2)::testtype1 *< row(1, -3)::testtype1;
+select row(1, -2)::testtype1 *<= row(1, -3)::testtype1;
+select row(1, -2)::testtype1 *= row(1, -3)::testtype1;
+select row(1, -2)::testtype1 *<> row(1, -2)::testtype1;
+select row(1, -3)::testtype1 *>= row(1, -2)::testtype1;
+select row(1, -3)::testtype1 *> row(1, -2)::testtype1;
+
+-- This returns the "wrong" order because record_image_cmp works on
+-- unsigned datums without knowing about the actual data type.
+select row(1, -2)::testtype1 *< row(1, 3)::testtype1;
+
+-- other types
+create type testtype2 as (a smallint, b bool);  -- byval different sizes
+select row(1, true)::testtype2 *< row(2, true)::testtype2;
+select row(-2, true)::testtype2 *< row(-1, true)::testtype2;
+select row(0, false)::testtype2 *< row(0, true)::testtype2;
+select row(0, false)::testtype2 *<> row(0, true)::testtype2;
+
+create type testtype3 as (a int, b text);  -- variable length
+select row(1, 'abc')::testtype3 *< row(1, 'abd')::testtype3;
+select row(1, 'abc')::testtype3 *< row(1, 'abcd')::testtype3;
+select row(1, 'abc')::testtype3 *> row(1, 'abd')::testtype3;
+select row(1, 'abc')::testtype3 *<> row(1, 'abd')::testtype3;
+
+create type testtype4 as (a int, b point);  -- by ref, fixed length
+select row(1, '(1,2)')::testtype4 *< row(1, '(1,3)')::testtype4;
+select row(1, '(1,2)')::testtype4 *<> row(1, '(1,3)')::testtype4;
+
+-- mismatches
+select row(1, 2)::testtype1 *< row(1, 'abc')::testtype3;
+select row(1, 2)::testtype1 *<> row(1, 'abc')::testtype3;
+create type testtype5 as (a int);
+select row(1, 2)::testtype1 *< row(1)::testtype5;
+select row(1, 2)::testtype1 *<> row(1)::testtype5;
+
+-- non-comparable types
+create type testtype6 as (a int, b point);
+select row(1, '(1,2)')::testtype6 *< row(1, '(1,3)')::testtype6;
+select row(1, '(1,2)')::testtype6 *>= row(1, '(1,3)')::testtype6;
+select row(1, '(1,2)')::testtype6 *<> row(1, '(1,3)')::testtype6;
+
+drop type testtype1, testtype2, testtype3, testtype4, testtype5, testtype6;
+
+
 --
 -- Test case derived from bug #5716: check multiple uses of a rowtype result
 --
diff --git a/src/test/regress/sql/rules.sql b/src/test/regress/sql/rules.sql
index 0ded0f01d2..0823c02acf 100644
--- a/src/test/regress/sql/rules.sql
+++ b/src/test/regress/sql/rules.sql
@@ -1177,3 +1177,29 @@ CREATE RULE parted_table_insert AS ON INSERT to parted_table
     DO INSTEAD INSERT INTO parted_table_1 VALUES (NEW.*);
 ALTER RULE parted_table_insert ON parted_table RENAME TO parted_table_insert_redirect;
 DROP TABLE parted_table;
+
+--
+-- Test enabling/disabling
+--
+CREATE TABLE ruletest1 (a int);
+CREATE TABLE ruletest2 (b int);
+
+CREATE RULE rule1 AS ON INSERT TO ruletest1
+    DO INSTEAD INSERT INTO ruletest2 VALUES (NEW.*);
+
+INSERT INTO ruletest1 VALUES (1);
+ALTER TABLE ruletest1 DISABLE RULE rule1;
+INSERT INTO ruletest1 VALUES (2);
+ALTER TABLE ruletest1 ENABLE RULE rule1;
+SET session_replication_role = replica;
+INSERT INTO ruletest1 VALUES (3);
+ALTER TABLE ruletest1 ENABLE REPLICA RULE rule1;
+INSERT INTO ruletest1 VALUES (4);
+RESET session_replication_role;
+INSERT INTO ruletest1 VALUES (5);
+
+SELECT * FROM ruletest1;
+SELECT * FROM ruletest2;
+
+DROP TABLE ruletest1;
+DROP TABLE ruletest2;
diff --git a/src/test/regress/sql/select_parallel.sql b/src/test/regress/sql/select_parallel.sql
index e717f92e53..fa03aae0c0 100644
--- a/src/test/regress/sql/select_parallel.sql
+++ b/src/test/regress/sql/select_parallel.sql
@@ -15,9 +15,61 @@ set parallel_tuple_cost=0;
 set min_parallel_table_scan_size=0;
 set max_parallel_workers_per_gather=4;
 
+-- Parallel Append with partial-subplans
 explain (costs off)
-  select count(*) from a_star;
-select count(*) from a_star;
+  select round(avg(aa)), sum(aa) from a_star;
+select round(avg(aa)), sum(aa) from a_star a1;
+
+-- Parallel Append with both partial and non-partial subplans
+alter table c_star set (parallel_workers = 0);
+alter table d_star set (parallel_workers = 0);
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
+select round(avg(aa)), sum(aa) from a_star a2;
+
+-- Parallel Append with only non-partial subplans
+alter table a_star set (parallel_workers = 0);
+alter table b_star set (parallel_workers = 0);
+alter table e_star set (parallel_workers = 0);
+alter table f_star set (parallel_workers = 0);
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
+select round(avg(aa)), sum(aa) from a_star a3;
+
+-- Disable Parallel Append
+alter table a_star reset (parallel_workers);
+alter table b_star reset (parallel_workers);
+alter table c_star reset (parallel_workers);
+alter table d_star reset (parallel_workers);
+alter table e_star reset (parallel_workers);
+alter table f_star reset (parallel_workers);
+set enable_parallel_append to off;
+explain (costs off)
+  select round(avg(aa)), sum(aa) from a_star;
+select round(avg(aa)), sum(aa) from a_star a4;
+reset enable_parallel_append;
+
+-- Parallel Append that runs serially
+create or replace function foobar() returns setof text as
+$$ select 'foo'::varchar union all select 'bar'::varchar $$
+language sql stable;
+select foobar() order by 1;
+
+-- test with leader participation disabled
+set parallel_leader_participation = off;
+explain (costs off)
+  select count(*) from tenk1 where stringu1 = 'GRAAAA';
+select count(*) from tenk1 where stringu1 = 'GRAAAA';
+
+-- test with leader participation disabled, but no workers available (so
+-- the leader will have to run the plan despite the setting)
+set max_parallel_workers = 0;
+explain (costs off)
+  select count(*) from tenk1 where stringu1 = 'GRAAAA';
+select count(*) from tenk1 where stringu1 = 'GRAAAA';
+
+reset max_parallel_workers;
+reset parallel_leader_participation;
 
 -- test that parallel_restricted function doesn't run in worker
 alter table tenk1 set (parallel_workers = 4);
@@ -39,6 +91,12 @@ explain (costs off)
 	select  sum(parallel_restricted(unique1)) from tenk1
 	group by(parallel_restricted(unique1));
 
+-- test prepared statement
+prepare tenk1_count(integer) As select  count((unique1)) from tenk1 where hundred > $1;
+explain (costs off) execute tenk1_count(1);
+execute tenk1_count(1);
+deallocate tenk1_count;
+
 -- test parallel plans for queries containing un-correlated subplans.
 alter table tenk2 set (parallel_workers = 0);
 explain (costs off)
@@ -52,6 +110,23 @@ explain (costs off)
 	(select ten from tenk2);
 alter table tenk2 reset (parallel_workers);
 
+-- test parallel plan for a query containing initplan.
+set enable_indexscan = off;
+set enable_indexonlyscan = off;
+set enable_bitmapscan = off;
+alter table tenk2 set (parallel_workers = 2);
+
+explain (costs off)
+	select count(*) from tenk1
+        where tenk1.unique1 = (Select max(tenk2.unique1) from tenk2);
+select count(*) from tenk1
+    where tenk1.unique1 = (Select max(tenk2.unique1) from tenk2);
+
+reset enable_indexscan;
+reset enable_indexonlyscan;
+reset enable_bitmapscan;
+alter table tenk2 reset (parallel_workers);
+
 -- test parallel index scans.
 set enable_seqscan to off;
 set enable_bitmapscan to off;
@@ -65,6 +140,26 @@ explain (costs off)
 	select  count(*) from tenk1 where thousand > 95;
 select  count(*) from tenk1 where thousand > 95;
 
+-- test rescan cases too
+set enable_material = false;
+
+explain (costs off)
+select * from
+  (select count(unique1) from tenk1 where hundred > 10) ss
+  right join (values (1),(2),(3)) v(x) on true;
+select * from
+  (select count(unique1) from tenk1 where hundred > 10) ss
+  right join (values (1),(2),(3)) v(x) on true;
+
+explain (costs off)
+select * from
+  (select count(*) from tenk1 where thousand > 99) ss
+  right join (values (1),(2),(3)) v(x) on true;
+select * from
+  (select count(*) from tenk1 where thousand > 99) ss
+  right join (values (1),(2),(3)) v(x) on true;
+
+reset enable_material;
 reset enable_seqscan;
 reset enable_bitmapscan;
 
@@ -90,14 +185,40 @@ insert into bmscantest select r, 'fooooooooooooooooooooooooooooooooooooooooooooo
 create index i_bmtest ON bmscantest(a);
 select count(*) from bmscantest where a>1;
 
+-- test accumulation of stats for parallel nodes
 reset enable_seqscan;
+alter table tenk2 set (parallel_workers = 0);
+explain (analyze, timing off, summary off, costs off)
+   select count(*) from tenk1, tenk2 where tenk1.hundred > 1
+        and tenk2.thousand=0;
+alter table tenk2 reset (parallel_workers);
+
+reset work_mem;
+create function explain_parallel_sort_stats() returns setof text
+language plpgsql as
+$$
+declare ln text;
+begin
+    for ln in
+        explain (analyze, timing off, summary off, costs off)
+          select * from
+          (select ten from tenk1 where ten < 100 order by ten) ss
+          right join (values (1),(2),(3)) v(x) on true
+    loop
+        ln := regexp_replace(ln, 'Memory: \S*',  'Memory: xxx');
+        return next ln;
+    end loop;
+end;
+$$;
+select * from explain_parallel_sort_stats();
+
 reset enable_indexscan;
 reset enable_hashjoin;
 reset enable_mergejoin;
 reset enable_material;
 reset effective_io_concurrency;
-reset work_mem;
 drop table bmscantest;
+drop function explain_parallel_sort_stats();
 
 -- test parallel merge join path.
 set enable_hashjoin to off;
@@ -118,23 +239,123 @@ explain (costs off)
 
 select count(*) from tenk1 group by twenty;
 
+--test expressions in targetlist are pushed down for gather merge
+create or replace function simple_func(var1 integer) returns integer
+as $$
+begin
+        return var1 + 10;
+end;
+$$ language plpgsql PARALLEL SAFE;
+
+explain (costs off, verbose)
+    select ten, simple_func(ten) from tenk1 where ten < 100 order by ten;
+
+drop function simple_func(integer);
+
+-- test gather merge with parallel leader participation disabled
+set parallel_leader_participation = off;
+
+explain (costs off)
+   select count(*) from tenk1 group by twenty;
+
+select count(*) from tenk1 group by twenty;
+
+reset parallel_leader_participation;
+
+--test rescan behavior of gather merge
+set enable_material = false;
+
+explain (costs off)
+select * from
+  (select string4, count(unique2)
+   from tenk1 group by string4 order by string4) ss
+  right join (values (1),(2),(3)) v(x) on true;
+
+select * from
+  (select string4, count(unique2)
+   from tenk1 group by string4 order by string4) ss
+  right join (values (1),(2),(3)) v(x) on true;
+
+reset enable_material;
+
+reset enable_hashagg;
+
+-- check parallelized int8 aggregate (bug #14897)
+explain (costs off)
+select avg(unique1::int8) from tenk1;
+
+select avg(unique1::int8) from tenk1;
+
+-- gather merge test with a LIMIT
+explain (costs off)
+  select fivethous from tenk1 order by fivethous limit 4;
+
+select fivethous from tenk1 order by fivethous limit 4;
+
 -- gather merge test with 0 worker
 set max_parallel_workers = 0;
 explain (costs off)
    select string4 from tenk1 order by string4 limit 5;
 select string4 from tenk1 order by string4 limit 5;
-reset max_parallel_workers;
-reset enable_hashagg;
 
-set force_parallel_mode=1;
+-- gather merge test with 0 workers, with parallel leader
+-- participation disabled (the leader will have to run the plan
+-- despite the setting)
+set parallel_leader_participation = off;
+explain (costs off)
+   select string4 from tenk1 order by string4 limit 5;
+select string4 from tenk1 order by string4 limit 5;
+
+reset parallel_leader_participation;
+reset max_parallel_workers;
 
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 explain (costs off)
   select stringu1::int2 from tenk1 where unique1 = 1;
+ROLLBACK TO SAVEPOINT settings;
+
+-- exercise record typmod remapping between backends
+CREATE OR REPLACE FUNCTION make_record(n int)
+  RETURNS RECORD LANGUAGE plpgsql PARALLEL SAFE AS
+$$
+BEGIN
+  RETURN CASE n
+           WHEN 1 THEN ROW(1)
+           WHEN 2 THEN ROW(1, 2)
+           WHEN 3 THEN ROW(1, 2, 3)
+           WHEN 4 THEN ROW(1, 2, 3, 4)
+           ELSE ROW(1, 2, 3, 4, 5)
+         END;
+END;
+$$;
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
+SELECT make_record(x) FROM (SELECT generate_series(1, 5) x) ss ORDER BY x;
+ROLLBACK TO SAVEPOINT settings;
+DROP function make_record(n int);
+
+-- test the sanity of parallel query after the active role is dropped.
+drop role if exists regress_parallel_worker;
+create role regress_parallel_worker;
+set role regress_parallel_worker;
+reset session authorization;
+drop role regress_parallel_worker;
+set force_parallel_mode = 1;
+select count(*) from tenk1;
+reset force_parallel_mode;
+reset role;
 
 -- to increase the parallel query test coverage
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 EXPLAIN (analyze, timing off, summary off, costs off) SELECT * FROM tenk1;
+ROLLBACK TO SAVEPOINT settings;
 
 -- provoke error in worker
+SAVEPOINT settings;
+SET LOCAL force_parallel_mode = 1;
 select stringu1::int2 from tenk1 where unique1 = 1;
+ROLLBACK TO SAVEPOINT settings;
 
 rollback;
diff --git a/src/test/regress/sql/sequence.sql b/src/test/regress/sql/sequence.sql
index b41c5a753d..a7b9e63372 100644
--- a/src/test/regress/sql/sequence.sql
+++ b/src/test/regress/sql/sequence.sql
@@ -61,6 +61,8 @@ INSERT INTO serialTest1 VALUES ('wrong', NULL);
 
 SELECT * FROM serialTest1;
 
+SELECT pg_get_serial_sequence('serialTest1', 'f2');
+
 -- test smallserial / bigserial
 CREATE TABLE serialTest2 (f1 text, f2 serial, f3 smallserial, f4 serial2,
   f5 bigserial, f6 serial8);
@@ -244,6 +246,10 @@ WHERE sequencename ~ ANY(ARRAY['sequence_test', 'serialtest'])
 SELECT * FROM pg_sequence_parameters('sequence_test4'::regclass);
 
 
+\d sequence_test4
+\d serialtest2_f2_seq
+
+
 -- Test comments
 COMMENT ON SEQUENCE asdf IS 'won''t work';
 COMMENT ON SEQUENCE sequence_test2 IS 'will work';
diff --git a/src/test/regress/sql/spgist.sql b/src/test/regress/sql/spgist.sql
index 5896b50865..77b43a2d3e 100644
--- a/src/test/regress/sql/spgist.sql
+++ b/src/test/regress/sql/spgist.sql
@@ -5,7 +5,7 @@
 -- testing SP-GiST code itself.
 
 create table spgist_point_tbl(id int4, p point);
-create index spgist_point_idx on spgist_point_tbl using spgist(p);
+create index spgist_point_idx on spgist_point_tbl using spgist(p) with (fillfactor = 75);
 
 -- Test vacuum-root operation. It gets invoked when the root is also a leaf,
 -- i.e. the index is very small.
@@ -48,3 +48,11 @@ select g, 'baaaaaaaaaaaaaar' || g from generate_series(1, 1000) g;
 -- tuple to be moved to another page.
 insert into spgist_text_tbl (id, t)
 select -g, 'f' || repeat('o', 100-g) || 'surprise' from generate_series(1, 100) g;
+
+-- Test out-of-range fillfactor values
+create index spgist_point_idx2 on spgist_point_tbl using spgist(p) with (fillfactor = 9);
+create index spgist_point_idx2 on spgist_point_tbl using spgist(p) with (fillfactor = 101);
+
+-- Modify fillfactor in existing index
+alter index spgist_point_idx set (fillfactor = 90);
+reindex index spgist_point_idx;
diff --git a/src/test/regress/sql/stats.sql b/src/test/regress/sql/stats.sql
index 6e882bf3ac..2be7dde834 100644
--- a/src/test/regress/sql/stats.sql
+++ b/src/test/regress/sql/stats.sql
@@ -138,7 +138,10 @@ ROLLBACK;
 -- do a seqscan
 SELECT count(*) FROM tenk2;
 -- do an indexscan
+-- make sure it is not a bitmap scan, which might skip fetching heap tuples
+SET enable_bitmapscan TO off;
 SELECT count(*) FROM tenk2 WHERE unique1 = 1;
+RESET enable_bitmapscan;
 
 -- We can't just call wait_for_stats() at this point, because we only
 -- transmit stats when the session goes idle, and we probably didn't
diff --git a/src/test/regress/sql/strings.sql b/src/test/regress/sql/strings.sql
index f9cfaeb44a..5a82237870 100644
--- a/src/test/regress/sql/strings.sql
+++ b/src/test/regress/sql/strings.sql
@@ -366,6 +366,23 @@ SELECT substr(f1, 99995) from toasttest;
 -- string length
 SELECT substr(f1, 99995, 10) from toasttest;
 
+TRUNCATE TABLE toasttest;
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect >0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
+
+TRUNCATE TABLE toasttest;
+ALTER TABLE toasttest set (toast_tuple_target = 4080);
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+INSERT INTO toasttest values (repeat('1234567890',300));
+-- expect 0 blocks
+select 0 = pg_relation_size('pg_toast.pg_toast_'||(select oid from pg_class where relname = 'toasttest'))/current_setting('block_size')::integer as blocks;
+
 DROP TABLE toasttest;
 
 --
@@ -489,6 +506,23 @@ select md5('ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789'::byt
 
 select md5('12345678901234567890123456789012345678901234567890123456789012345678901234567890'::bytea) = '57edf4a22be3c955ac49da2e2107b67a' AS "TRUE";
 
+--
+-- SHA-2
+--
+SET bytea_output TO hex;
+
+SELECT sha224('');
+SELECT sha224('The quick brown fox jumps over the lazy dog.');
+
+SELECT sha256('');
+SELECT sha256('The quick brown fox jumps over the lazy dog.');
+
+SELECT sha384('');
+SELECT sha384('The quick brown fox jumps over the lazy dog.');
+
+SELECT sha512('');
+SELECT sha512('The quick brown fox jumps over the lazy dog.');
+
 --
 -- test behavior of escape_string_warning and standard_conforming_strings options
 --
@@ -523,6 +557,7 @@ select 'a\\bcd' as f1, 'a\\b\'cd' as f2, 'a\\b\'''cd' as f3, 'abcd\\'   as f4, '
 --
 -- Additional string functions
 --
+SET bytea_output TO escape;
 
 SELECT initcap('hi THOMAS');
 
diff --git a/src/test/regress/sql/subselect.sql b/src/test/regress/sql/subselect.sql
index 2fc0e26ca0..0100367b8d 100644
--- a/src/test/regress/sql/subselect.sql
+++ b/src/test/regress/sql/subselect.sql
@@ -376,6 +376,24 @@ select q from (select max(f1) from int4_tbl group by f1 order by f1) q;
 with q as (select max(f1) from int4_tbl group by f1 order by f1)
   select q from q;
 
+--
+-- Test case for sublinks pulled up into joinaliasvars lists in an
+-- inherited update/delete query
+--
+
+begin;  --  this shouldn't delete anything, but be safe
+
+delete from road
+where exists (
+  select 1
+  from
+    int4_tbl cross join
+    ( select f1, array(select q1 from int8_tbl) as arr
+      from text_tbl ) ss
+  where road.name = ss.f1 );
+
+rollback;
+
 --
 -- Test case for sublinks pushed down into subselects via join alias expansion
 --
@@ -454,6 +472,16 @@ explain (verbose, costs off)
 create temp table nocolumns();
 select exists(select * from nocolumns);
 
+--
+-- Check behavior with a SubPlan in VALUES (bug #14924)
+--
+select val.x
+  from generate_series(1,10) as s(i),
+  lateral (
+    values ((select s.i + 1)), (s.i + 101)
+  ) as val(x)
+where s.i < 10 and (select val.x) < 110;
+
 --
 -- Check sane behavior with nested IN SubLinks
 --
@@ -540,3 +568,44 @@ select * from
   where tattle(x, u);
 
 drop function tattle(x int, y int);
+
+--
+-- Test that LIMIT can be pushed to SORT through a subquery that just projects
+-- columns.  We check for that having happened by looking to see if EXPLAIN
+-- ANALYZE shows that a top-N sort was used.  We must suppress or filter away
+-- all the non-invariant parts of the EXPLAIN ANALYZE output.
+--
+create table sq_limit (pk int primary key, c1 int, c2 int);
+insert into sq_limit values
+    (1, 1, 1),
+    (2, 2, 2),
+    (3, 3, 3),
+    (4, 4, 4),
+    (5, 1, 1),
+    (6, 2, 2),
+    (7, 3, 3),
+    (8, 4, 4);
+
+create function explain_sq_limit() returns setof text language plpgsql as
+$$
+declare ln text;
+begin
+    for ln in
+        explain (analyze, summary off, timing off, costs off)
+        select * from (select pk,c2 from sq_limit order by c1,pk) as x limit 3
+    loop
+        ln := regexp_replace(ln, 'Memory: \S*',  'Memory: xxx');
+        -- this case might occur if force_parallel_mode is on:
+        ln := regexp_replace(ln, 'Worker 0:  Sort Method',  'Sort Method');
+        return next ln;
+    end loop;
+end;
+$$;
+
+select * from explain_sq_limit();
+
+select * from (select pk,c2 from sq_limit order by c1,pk) as x limit 3;
+
+drop function explain_sq_limit();
+
+drop table sq_limit;
diff --git a/src/test/regress/sql/timestamptz.sql b/src/test/regress/sql/timestamptz.sql
index 97e57a2403..f17d153fcc 100644
--- a/src/test/regress/sql/timestamptz.sql
+++ b/src/test/regress/sql/timestamptz.sql
@@ -248,21 +248,25 @@ SELECT '' AS to_char_10, to_char(d1, 'IYYY IYY IY I IW IDDD ID')
 SELECT '' AS to_char_11, to_char(d1, 'FMIYYY FMIYY FMIY FMI FMIW FMIDDD FMID')
    FROM TIMESTAMPTZ_TBL;
 
--- Check OF with various zone offsets, particularly fractional hours
+-- Check OF, TZH, TZM with various zone offsets, particularly fractional hours
 SET timezone = '00:00';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '+02:00';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '-13:00';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '-00:30';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '00:30';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '-04:30';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 SET timezone = '04:30';
-SELECT to_char(now(), 'OF');
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+SET timezone = '-04:15';
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
+SET timezone = '04:15';
+SELECT to_char(now(), 'OF') as "OF", to_char(now(), 'TZH:TZM') as "TZH:TZM";
 RESET timezone;
 
 CREATE TABLE TIMESTAMPTZ_TST (a int , b timestamptz);
diff --git a/src/test/regress/sql/transactions.sql b/src/test/regress/sql/transactions.sql
index bf9cb05971..82661ab610 100644
--- a/src/test/regress/sql/transactions.sql
+++ b/src/test/regress/sql/transactions.sql
@@ -419,6 +419,60 @@ DROP FUNCTION create_temp_tab();
 DROP FUNCTION invert(x float8);
 
 
+-- Test assorted behaviors around the implicit transaction block created
+-- when multiple SQL commands are sent in a single Query message.  These
+-- tests rely on the fact that psql will not break SQL commands apart at a
+-- backslash-quoted semicolon, but will send them as one Query.
+
+create temp table i_table (f1 int);
+
+-- psql will show only the last result in a multi-statement Query
+SELECT 1\; SELECT 2\; SELECT 3;
+
+-- this implicitly commits:
+insert into i_table values(1)\; select * from i_table;
+-- 1/0 error will cause rolling back the whole implicit transaction
+insert into i_table values(2)\; select * from i_table\; select 1/0;
+select * from i_table;
+
+rollback;  -- we are not in a transaction at this point
+
+-- can use regular begin/commit/rollback within a single Query
+begin\; insert into i_table values(3)\; commit;
+rollback;  -- we are not in a transaction at this point
+begin\; insert into i_table values(4)\; rollback;
+rollback;  -- we are not in a transaction at this point
+
+-- begin converts implicit transaction into a regular one that
+-- can extend past the end of the Query
+select 1\; begin\; insert into i_table values(5);
+commit;
+select 1\; begin\; insert into i_table values(6);
+rollback;
+
+-- commit in implicit-transaction state commits but issues a warning.
+insert into i_table values(7)\; commit\; insert into i_table values(8)\; select 1/0;
+-- similarly, rollback aborts but issues a warning.
+insert into i_table values(9)\; rollback\; select 2;
+
+select * from i_table;
+
+rollback;  -- we are not in a transaction at this point
+
+-- implicit transaction block is still a transaction block, for e.g. VACUUM
+SELECT 1\; VACUUM;
+SELECT 1\; COMMIT\; VACUUM;
+
+-- we disallow savepoint-related commands in implicit-transaction state
+SELECT 1\; SAVEPOINT sp;
+SELECT 1\; COMMIT\; SAVEPOINT sp;
+ROLLBACK TO SAVEPOINT sp\; SELECT 2;
+SELECT 2\; RELEASE SAVEPOINT sp\; SELECT 3;
+
+-- but this is OK, because the BEGIN converts it to a regular xact
+SELECT 1\; BEGIN\; SAVEPOINT sp\; ROLLBACK TO SAVEPOINT sp\; COMMIT;
+
+
 -- Test for successful cleanup of an aborted transaction at session exit.
 -- THIS MUST BE THE LAST TEST IN THIS FILE.
 
diff --git a/src/test/regress/sql/triggers.sql b/src/test/regress/sql/triggers.sql
index b10159a1cf..3354f4899f 100644
--- a/src/test/regress/sql/triggers.sql
+++ b/src/test/regress/sql/triggers.sql
@@ -92,44 +92,32 @@ delete from pkeys where pkey1 = 40 and pkey2 = '4';
 update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 50 and pkey2 = '5';
 update pkeys set pkey1 = 7, pkey2 = '70' where pkey1 = 10 and pkey2 = '1';
 
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table in ('pkeys', 'fkeys', 'fkeys2')
+  ORDER BY trigger_name COLLATE "C", 2;
+
 DROP TABLE pkeys;
 DROP TABLE fkeys;
 DROP TABLE fkeys2;
 
--- -- I've disabled the funny_dup17 test because the new semantics
--- -- of AFTER ROW triggers, which get now fired at the end of a
--- -- query always, cause funny_dup17 to enter an endless loop.
--- --
--- --      Jan
---
--- create table dup17 (x int4);
---
--- create trigger dup17_before
--- 	before insert on dup17
--- 	for each row
--- 	execute procedure
--- 	funny_dup17 ()
--- ;
---
--- insert into dup17 values (17);
--- select count(*) from dup17;
--- insert into dup17 values (17);
--- select count(*) from dup17;
---
--- drop trigger dup17_before on dup17;
---
--- create trigger dup17_after
--- 	after insert on dup17
--- 	for each row
--- 	execute procedure
--- 	funny_dup17 ()
--- ;
--- insert into dup17 values (13);
--- select count(*) from dup17 where x = 13;
--- insert into dup17 values (13);
--- select count(*) from dup17 where x = 13;
---
--- DROP TABLE dup17;
+-- Check behavior when trigger returns unmodified trigtuple
+create table trigtest (f1 int, f2 text);
+
+create trigger trigger_return_old
+	before insert or delete or update on trigtest
+	for each row execute procedure trigger_return_old();
+
+insert into trigtest values(1, 'foo');
+select * from trigtest;
+update trigtest set f2 = f2 || 'bar';
+select * from trigtest;
+delete from trigtest;
+select * from trigtest;
+
+drop table trigtest;
 
 create sequence ttdummy_seq increment 10 start 0 minvalue 0;
 
@@ -279,6 +267,12 @@ CREATE TRIGGER insert_when BEFORE INSERT ON main_table
 FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('insert_when');
 CREATE TRIGGER delete_when AFTER DELETE ON main_table
 FOR EACH STATEMENT WHEN (true) EXECUTE PROCEDURE trigger_func('delete_when');
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table IN ('main_table')
+  ORDER BY trigger_name COLLATE "C", 2;
 INSERT INTO main_table (a) VALUES (123), (456);
 COPY main_table FROM stdin;
 123	999
@@ -401,6 +395,11 @@ alter table trigtest disable trigger user;
 insert into trigtest default values;
 alter table trigtest enable trigger trigtest_a_stmt_tg;
 insert into trigtest default values;
+set session_replication_role = replica;
+insert into trigtest default values;  -- does not trigger
+alter table trigtest enable always trigger trigtest_a_stmt_tg;
+insert into trigtest default values;  -- now it does
+reset session_replication_role;
 insert into trigtest2 values(1);
 insert into trigtest2 values(2);
 delete from trigtest where i=2;
@@ -1299,7 +1298,7 @@ create table parted2_stmt_trig2 partition of parted2_stmt_trig for values in (2)
 
 create or replace function trigger_notice() returns trigger as $$
   begin
-    raise notice 'trigger on % % % for %', TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;
+    raise notice 'trigger % on % % % for %', TG_NAME, TG_TABLE_NAME, TG_WHEN, TG_OP, TG_LEVEL;
     if TG_LEVEL = 'ROW' then
        return NEW;
     end if;
@@ -1409,7 +1408,7 @@ $$;
 --
 -- Verify behavior of statement triggers on partition hierarchy with
 -- transition tables.  Tuples should appear to each trigger in the
--- format of the the relation the trigger is attached to.
+-- format of the relation the trigger is attached to.
 --
 
 -- set up a partition hierarchy with some different TupleDescriptors
@@ -1467,6 +1466,13 @@ create trigger child3_delete_trig
   after delete on child3 referencing old table as old_table
   for each statement execute procedure dump_delete();
 
+SELECT trigger_name, event_manipulation, event_object_schema, event_object_table,
+       action_order, action_condition, action_orientation, action_timing,
+       action_reference_old_table, action_reference_new_table
+  FROM information_schema.triggers
+  WHERE event_object_table IN ('parent', 'child1', 'child2', 'child3')
+  ORDER BY trigger_name COLLATE "C", 2;
+
 -- insert directly into children sees respective child-format tuples
 insert into child1 values ('AAA', 42);
 insert into child2 values ('BBB', 42);
@@ -1729,6 +1735,12 @@ create trigger table2_trig
 with wcte as (insert into table1 values (42))
   insert into table2 values ('hello world');
 
+with wcte as (insert into table1 values (43))
+  insert into table1 values (44);
+
+select * from table1;
+select * from table2;
+
 drop table table1;
 drop table table2;
 
@@ -1769,8 +1781,91 @@ create trigger my_table_multievent_trig
   after insert or update on my_table referencing new table as new_table
   for each statement execute procedure dump_insert();
 
+--
+-- Verify that you can't create a trigger with transition tables with
+-- a column list.
+--
+
+create trigger my_table_col_update_trig
+  after update of b on my_table referencing new table as new_table
+  for each statement execute procedure dump_insert();
+
 drop table my_table;
 
+--
+-- Test firing of triggers with transition tables by foreign key cascades
+--
+
+create table refd_table (a int primary key, b text);
+create table trig_table (a int, b text,
+  foreign key (a) references refd_table on update cascade on delete cascade
+);
+
+create trigger trig_table_before_trig
+  before insert or update or delete on trig_table
+  for each statement execute procedure trigger_func('trig_table');
+create trigger trig_table_insert_trig
+  after insert on trig_table referencing new table as new_table
+  for each statement execute procedure dump_insert();
+create trigger trig_table_update_trig
+  after update on trig_table referencing old table as old_table new table as new_table
+  for each statement execute procedure dump_update();
+create trigger trig_table_delete_trig
+  after delete on trig_table referencing old table as old_table
+  for each statement execute procedure dump_delete();
+
+insert into refd_table values
+  (1, 'one'),
+  (2, 'two'),
+  (3, 'three');
+insert into trig_table values
+  (1, 'one a'),
+  (1, 'one b'),
+  (2, 'two a'),
+  (2, 'two b'),
+  (3, 'three a'),
+  (3, 'three b');
+
+update refd_table set a = 11 where b = 'one';
+
+select * from trig_table;
+
+delete from refd_table where length(b) = 3;
+
+select * from trig_table;
+
+drop table refd_table, trig_table;
+
+--
+-- self-referential FKs are even more fun
+--
+
+create table self_ref (a int primary key,
+                       b int references self_ref(a) on delete cascade);
+
+create trigger self_ref_before_trig
+  before delete on self_ref
+  for each statement execute procedure trigger_func('self_ref');
+create trigger self_ref_r_trig
+  after delete on self_ref referencing old table as old_table
+  for each row execute procedure dump_delete();
+create trigger self_ref_s_trig
+  after delete on self_ref referencing old table as old_table
+  for each statement execute procedure dump_delete();
+
+insert into self_ref values (1, null), (2, 1), (3, 2);
+
+delete from self_ref where a = 1;
+
+-- without AR trigger, cascaded deletes all end up in one transition table
+drop trigger self_ref_r_trig on self_ref;
+
+insert into self_ref values (1, null), (2, 1), (3, 2), (4, 3);
+
+delete from self_ref where a = 1;
+
+drop table self_ref;
+
 -- cleanup
 drop function dump_insert();
 drop function dump_update();
diff --git a/src/test/regress/sql/tsdicts.sql b/src/test/regress/sql/tsdicts.sql
index a5a569e1ad..1633c0d066 100644
--- a/src/test/regress/sql/tsdicts.sql
+++ b/src/test/regress/sql/tsdicts.sql
@@ -188,3 +188,11 @@ ALTER TEXT SEARCH CONFIGURATION thesaurus_tst ALTER MAPPING FOR
 SELECT to_tsvector('thesaurus_tst', 'one postgres one two one two three one');
 SELECT to_tsvector('thesaurus_tst', 'Supernovae star is very new star and usually called supernovae (abbreviation SN)');
 SELECT to_tsvector('thesaurus_tst', 'Booking tickets is looking like a booking a tickets');
+
+-- invalid: non-lowercase quoted identifiers
+CREATE TEXT SEARCH DICTIONARY tsdict_case
+(
+	Template = ispell,
+	"DictFile" = ispell_sample,
+	"AffFile" = ispell_sample
+);
diff --git a/src/test/regress/sql/tsearch.sql b/src/test/regress/sql/tsearch.sql
index e4b21f8f18..1c8520b3e9 100644
--- a/src/test/regress/sql/tsearch.sql
+++ b/src/test/regress/sql/tsearch.sql
@@ -145,6 +145,10 @@ SELECT * from ts_debug('english', 'http://www.harewoodsolutions.co.uk/press.aspx
 SELECT * from ts_debug('english', 'http://aew.wer0c.ewr/id?ad=qwe&dw<span>');
 SELECT * from ts_debug('english', 'http://5aew.werc.ewr:8100/?');
 SELECT * from ts_debug('english', '5aew.werc.ewr:8100/?xx');
+SELECT token, alias,
+  dictionaries, dictionaries is null as dnull, array_dims(dictionaries) as ddims,
+  lexemes, lexemes is null as lnull, array_dims(lexemes) as ldims
+from ts_debug('english', 'a title');
 
 -- to_tsquery
 
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
index 4c65814008..f9aeea3214 100644
--- a/src/test/regress/sql/type_sanity.sql
+++ b/src/test/regress/sql/type_sanity.sql
@@ -104,6 +104,30 @@ WHERE p1.typinput = p2.oid AND NOT
       p2.proargtypes[1] = 'oid'::regtype AND
       p2.proargtypes[2] = 'int4'::regtype));
 
+-- Check for type of the variadic array parameter's elements.
+-- provariadic should be ANYOID if the type of the last element is ANYOID,
+-- ANYELEMENTOID if the type of the last element is ANYARRAYOID, and otherwise
+-- the element type corresponding to the array type.
+
+SELECT oid::regprocedure, provariadic::regtype, proargtypes::regtype[]
+FROM pg_proc
+WHERE provariadic != 0
+AND case proargtypes[array_length(proargtypes, 1)-1]
+    WHEN 2276 THEN 2276 -- any -> any
+	WHEN 2277 THEN 2283 -- anyarray -> anyelement
+	ELSE (SELECT t.oid
+		  FROM pg_type t
+		  WHERE t.typarray = proargtypes[array_length(proargtypes, 1)-1])
+	END  != provariadic;
+
+-- Check that all and only those functions with a variadic type have
+-- a variadic argument.
+SELECT oid::regprocedure, proargmodes, provariadic
+FROM pg_proc
+WHERE (proargmodes IS NOT NULL AND 'v' = any(proargmodes))
+    IS DISTINCT FROM
+    (provariadic != 0);
+
 -- As of 8.0, this check finds refcursor, which is borrowing
 -- other types' I/O routines
 SELECT p1.oid, p1.typname, p2.oid, p2.proname
diff --git a/src/test/regress/sql/union.sql b/src/test/regress/sql/union.sql
index c0317cccb4..eed7c8d34b 100644
--- a/src/test/regress/sql/union.sql
+++ b/src/test/regress/sql/union.sql
@@ -190,6 +190,49 @@ SELECT q1 FROM int8_tbl EXCEPT (((SELECT q2 FROM int8_tbl ORDER BY q2 LIMIT 1)))
 
 (((((select * from int8_tbl)))));
 
+--
+-- Check behavior with empty select list (allowed since 9.4)
+--
+
+select union select;
+select intersect select;
+select except select;
+
+-- check hashed implementation
+set enable_hashagg = true;
+set enable_sort = false;
+
+explain (costs off)
+select from generate_series(1,5) union select from generate_series(1,3);
+explain (costs off)
+select from generate_series(1,5) intersect select from generate_series(1,3);
+
+select from generate_series(1,5) union select from generate_series(1,3);
+select from generate_series(1,5) union all select from generate_series(1,3);
+select from generate_series(1,5) intersect select from generate_series(1,3);
+select from generate_series(1,5) intersect all select from generate_series(1,3);
+select from generate_series(1,5) except select from generate_series(1,3);
+select from generate_series(1,5) except all select from generate_series(1,3);
+
+-- check sorted implementation
+set enable_hashagg = false;
+set enable_sort = true;
+
+explain (costs off)
+select from generate_series(1,5) union select from generate_series(1,3);
+explain (costs off)
+select from generate_series(1,5) intersect select from generate_series(1,3);
+
+select from generate_series(1,5) union select from generate_series(1,3);
+select from generate_series(1,5) union all select from generate_series(1,3);
+select from generate_series(1,5) intersect select from generate_series(1,3);
+select from generate_series(1,5) intersect all select from generate_series(1,3);
+select from generate_series(1,5) except select from generate_series(1,3);
+select from generate_series(1,5) except all select from generate_series(1,3);
+
+reset enable_hashagg;
+reset enable_sort;
+
 --
 -- Check handling of a case with unknown constants.  We don't guarantee
 -- an undecorated constant will work in all cases, but historically this
diff --git a/src/test/regress/sql/update.sql b/src/test/regress/sql/update.sql
index 663711997b..c9bb3b53d3 100644
--- a/src/test/regress/sql/update.sql
+++ b/src/test/regress/sql/update.sql
@@ -107,23 +107,485 @@ INSERT INTO upsert_test VALUES (1, 'Bat') ON CONFLICT(a)
 DROP TABLE update_test;
 DROP TABLE upsert_test;
 
--- update to a partition should check partition bound constraint for the new tuple
-create table range_parted (
+
+---------------------------
+-- UPDATE with row movement
+---------------------------
+
+-- When a partitioned table receives an UPDATE to the partitioned key and the
+-- new values no longer meet the partition's bound, the row must be moved to
+-- the correct partition for the new partition key (if one exists). We must
+-- also ensure that updatable views on partitioned tables properly enforce any
+-- WITH CHECK OPTION that is defined. The situation with triggers in this case
+-- also requires thorough testing as partition key updates causing row
+-- movement convert UPDATEs into DELETE+INSERT.
+
+CREATE TABLE range_parted (
 	a text,
+	b bigint,
+	c numeric,
+	d int,
+	e varchar
+) PARTITION BY RANGE (a, b);
+
+-- Create partitions intentionally in descending bound order, so as to test
+-- that update-row-movement works with the leaf partitions not in bound order.
+CREATE TABLE part_b_20_b_30 (e varchar, c numeric, a text, b bigint, d int);
+ALTER TABLE range_parted ATTACH PARTITION part_b_20_b_30 FOR VALUES FROM ('b', 20) TO ('b', 30);
+CREATE TABLE part_b_10_b_20 (e varchar, c numeric, a text, b bigint, d int) PARTITION BY RANGE (c);
+CREATE TABLE part_b_1_b_10 PARTITION OF range_parted FOR VALUES FROM ('b', 1) TO ('b', 10);
+ALTER TABLE range_parted ATTACH PARTITION part_b_10_b_20 FOR VALUES FROM ('b', 10) TO ('b', 20);
+CREATE TABLE part_a_10_a_20 PARTITION OF range_parted FOR VALUES FROM ('a', 10) TO ('a', 20);
+CREATE TABLE part_a_1_a_10 PARTITION OF range_parted FOR VALUES FROM ('a', 1) TO ('a', 10);
+
+-- Check that partition-key UPDATE works sanely on a partitioned table that
+-- does not have any child partitions.
+UPDATE part_b_10_b_20 set b = b - 6;
+
+-- Create some more partitions following the above pattern of descending bound
+-- order, but let's make the situation a bit more complex by having the
+-- attribute numbers of the columns vary from their parent partition.
+CREATE TABLE part_c_100_200 (e varchar, c numeric, a text, b bigint, d int) PARTITION BY range (abs(d));
+ALTER TABLE part_c_100_200 DROP COLUMN e, DROP COLUMN c, DROP COLUMN a;
+ALTER TABLE part_c_100_200 ADD COLUMN c numeric, ADD COLUMN e varchar, ADD COLUMN a text;
+ALTER TABLE part_c_100_200 DROP COLUMN b;
+ALTER TABLE part_c_100_200 ADD COLUMN b bigint;
+CREATE TABLE part_d_1_15 PARTITION OF part_c_100_200 FOR VALUES FROM (1) TO (15);
+CREATE TABLE part_d_15_20 PARTITION OF part_c_100_200 FOR VALUES FROM (15) TO (20);
+
+ALTER TABLE part_b_10_b_20 ATTACH PARTITION part_c_100_200 FOR VALUES FROM (100) TO (200);
+
+CREATE TABLE part_c_1_100 (e varchar, d int, c numeric, b bigint, a text);
+ALTER TABLE part_b_10_b_20 ATTACH PARTITION part_c_1_100 FOR VALUES FROM (1) TO (100);
+
+\set init_range_parted 'truncate range_parted; insert into range_parted VALUES (''a'', 1, 1, 1), (''a'', 10, 200, 1), (''b'', 12, 96, 1), (''b'', 13, 97, 2), (''b'', 15, 105, 16), (''b'', 17, 105, 19)'
+\set show_data 'select tableoid::regclass::text COLLATE "C" partname, * from range_parted ORDER BY 1, 2, 3, 4, 5, 6'
+:init_range_parted;
+:show_data;
+
+-- The order of subplans should be in bound order
+EXPLAIN (costs off) UPDATE range_parted set c = c - 50 WHERE c > 97;
+
+-- fail, row movement happens only within the partition subtree.
+UPDATE part_c_100_200 set c = c - 20, d = c WHERE c = 105;
+-- fail, no partition key update, so no attempt to move tuple,
+-- but "a = 'a'" violates partition constraint enforced by root partition)
+UPDATE part_b_10_b_20 set a = 'a';
+-- ok, partition key update, no constraint violation
+UPDATE range_parted set d = d - 10 WHERE d > 10;
+-- ok, no partition key update, no constraint violation
+UPDATE range_parted set e = d;
+-- No row found
+UPDATE part_c_1_100 set c = c + 20 WHERE c = 98;
+-- ok, row movement
+UPDATE part_b_10_b_20 set c = c + 20 returning c, b, a;
+:show_data;
+
+-- fail, row movement happens only within the partition subtree.
+UPDATE part_b_10_b_20 set b = b - 6 WHERE c > 116 returning *;
+-- ok, row movement, with subset of rows moved into different partition.
+UPDATE range_parted set b = b - 6 WHERE c > 116 returning a, b + c;
+
+:show_data;
+
+-- Common table needed for multiple test scenarios.
+CREATE TABLE mintab(c1 int);
+INSERT into mintab VALUES (120);
+
+-- update partition key using updatable view.
+CREATE VIEW upview AS SELECT * FROM range_parted WHERE (select c > c1 FROM mintab) WITH CHECK OPTION;
+-- ok
+UPDATE upview set c = 199 WHERE b = 4;
+-- fail, check option violation
+UPDATE upview set c = 120 WHERE b = 4;
+-- fail, row movement with check option violation
+UPDATE upview set a = 'b', b = 15, c = 120 WHERE b = 4;
+-- ok, row movement, check option passes
+UPDATE upview set a = 'b', b = 15 WHERE b = 4;
+
+:show_data;
+
+-- cleanup
+DROP VIEW upview;
+
+-- RETURNING having whole-row vars.
+:init_range_parted;
+UPDATE range_parted set c = 95 WHERE a = 'b' and b > 10 and c > 100 returning (range_parted), *;
+:show_data;
+
+
+-- Transition tables with update row movement
+:init_range_parted;
+
+CREATE FUNCTION trans_updatetrigfunc() RETURNS trigger LANGUAGE plpgsql AS
+$$
+  begin
+    raise notice 'trigger = %, old table = %, new table = %',
+                 TG_NAME,
+                 (select string_agg(old_table::text, ', ' ORDER BY a) FROM old_table),
+                 (select string_agg(new_table::text, ', ' ORDER BY a) FROM new_table);
+    return null;
+  end;
+$$;
+
+CREATE TRIGGER trans_updatetrig
+  AFTER UPDATE ON range_parted REFERENCING OLD TABLE AS old_table NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+
+UPDATE range_parted set c = (case when c = 96 then 110 else c + 1 end ) WHERE a = 'b' and b > 10 and c >= 96;
+:show_data;
+:init_range_parted;
+
+-- Enabling OLD TABLE capture for both DELETE as well as UPDATE stmt triggers
+-- should not cause DELETEd rows to be captured twice. Similar thing for
+-- INSERT triggers and inserted rows.
+CREATE TRIGGER trans_deletetrig
+  AFTER DELETE ON range_parted REFERENCING OLD TABLE AS old_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+CREATE TRIGGER trans_inserttrig
+  AFTER INSERT ON range_parted REFERENCING NEW TABLE AS new_table
+  FOR EACH STATEMENT EXECUTE PROCEDURE trans_updatetrigfunc();
+UPDATE range_parted set c = c + 50 WHERE a = 'b' and b > 10 and c >= 96;
+:show_data;
+DROP TRIGGER trans_deletetrig ON range_parted;
+DROP TRIGGER trans_inserttrig ON range_parted;
+-- Don't drop trans_updatetrig yet. It is required below.
+
+-- Test with transition tuple conversion happening for rows moved into the
+-- new partition. This requires a trigger that references transition table
+-- (we already have trans_updatetrig). For inserted rows, the conversion
+-- is not usually needed, because the original tuple is already compatible with
+-- the desired transition tuple format. But conversion happens when there is a
+-- BR trigger because the trigger can change the inserted row. So install a
+-- BR triggers on those child partitions where the rows will be moved.
+CREATE FUNCTION func_parted_mod_b() RETURNS trigger AS $$
+BEGIN
+   NEW.b = NEW.b + 1;
+   return NEW;
+END $$ language plpgsql;
+CREATE TRIGGER trig_c1_100 BEFORE UPDATE OR INSERT ON part_c_1_100
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+CREATE TRIGGER trig_d1_15 BEFORE UPDATE OR INSERT ON part_d_1_15
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+CREATE TRIGGER trig_d15_20 BEFORE UPDATE OR INSERT ON part_d_15_20
+   FOR EACH ROW EXECUTE PROCEDURE func_parted_mod_b();
+:init_range_parted;
+UPDATE range_parted set c = (case when c = 96 then 110 else c + 1 end) WHERE a = 'b' and b > 10 and c >= 96;
+:show_data;
+:init_range_parted;
+UPDATE range_parted set c = c + 50 WHERE a = 'b' and b > 10 and c >= 96;
+:show_data;
+
+-- Case where per-partition tuple conversion map array is allocated, but the
+-- map is not required for the particular tuple that is routed, thanks to
+-- matching table attributes of the partition and the target table.
+:init_range_parted;
+UPDATE range_parted set b = 15 WHERE b = 1;
+:show_data;
+
+DROP TRIGGER trans_updatetrig ON range_parted;
+DROP TRIGGER trig_c1_100 ON part_c_1_100;
+DROP TRIGGER trig_d1_15 ON part_d_1_15;
+DROP TRIGGER trig_d15_20 ON part_d_15_20;
+DROP FUNCTION func_parted_mod_b();
+
+-- RLS policies with update-row-movement
+-----------------------------------------
+
+ALTER TABLE range_parted ENABLE ROW LEVEL SECURITY;
+CREATE USER regress_range_parted_user;
+GRANT ALL ON range_parted, mintab TO regress_range_parted_user;
+CREATE POLICY seeall ON range_parted AS PERMISSIVE FOR SELECT USING (true);
+CREATE POLICY policy_range_parted ON range_parted for UPDATE USING (true) WITH CHECK (c % 2 = 0);
+
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- This should fail with RLS violation error while moving row from
+-- part_a_10_a_20 to part_d_1_15, because we are setting 'c' to an odd number.
+UPDATE range_parted set a = 'b', c = 151 WHERE a = 'a' and c = 200;
+
+RESET SESSION AUTHORIZATION;
+-- Create a trigger on part_d_1_15
+CREATE FUNCTION func_d_1_15() RETURNS trigger AS $$
+BEGIN
+   NEW.c = NEW.c + 1; -- Make even numbers odd, or vice versa
+   return NEW;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER trig_d_1_15 BEFORE INSERT ON part_d_1_15
+   FOR EACH ROW EXECUTE PROCEDURE func_d_1_15();
+
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+
+-- Here, RLS checks should succeed while moving row from part_a_10_a_20 to
+-- part_d_1_15. Even though the UPDATE is setting 'c' to an odd number, the
+-- trigger at the destination partition again makes it an even number.
+UPDATE range_parted set a = 'b', c = 151 WHERE a = 'a' and c = 200;
+
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- This should fail with RLS violation error. Even though the UPDATE is setting
+-- 'c' to an even number, the trigger at the destination partition again makes
+-- it an odd number.
+UPDATE range_parted set a = 'b', c = 150 WHERE a = 'a' and c = 200;
+
+-- Cleanup
+RESET SESSION AUTHORIZATION;
+DROP TRIGGER trig_d_1_15 ON part_d_1_15;
+DROP FUNCTION func_d_1_15();
+
+-- Policy expression contains SubPlan
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+CREATE POLICY policy_range_parted_subplan on range_parted
+    AS RESTRICTIVE for UPDATE USING (true)
+    WITH CHECK ((SELECT range_parted.c <= c1 FROM mintab));
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- fail, mintab has row with c1 = 120
+UPDATE range_parted set a = 'b', c = 122 WHERE a = 'a' and c = 200;
+-- ok
+UPDATE range_parted set a = 'b', c = 120 WHERE a = 'a' and c = 200;
+
+-- RLS policy expression contains whole row.
+
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+CREATE POLICY policy_range_parted_wholerow on range_parted AS RESTRICTIVE for UPDATE USING (true)
+   WITH CHECK (range_parted = row('b', 10, 112, 1, NULL)::range_parted);
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- ok, should pass the RLS check
+UPDATE range_parted set a = 'b', c = 112 WHERE a = 'a' and c = 200;
+RESET SESSION AUTHORIZATION;
+:init_range_parted;
+SET SESSION AUTHORIZATION regress_range_parted_user;
+-- fail, the whole row RLS check should fail
+UPDATE range_parted set a = 'b', c = 116 WHERE a = 'a' and c = 200;
+
+-- Cleanup
+RESET SESSION AUTHORIZATION;
+DROP POLICY policy_range_parted ON range_parted;
+DROP POLICY policy_range_parted_subplan ON range_parted;
+DROP POLICY policy_range_parted_wholerow ON range_parted;
+REVOKE ALL ON range_parted, mintab FROM regress_range_parted_user;
+DROP USER regress_range_parted_user;
+DROP TABLE mintab;
+
+
+-- statement triggers with update row movement
+---------------------------------------------------
+
+:init_range_parted;
+
+CREATE FUNCTION trigfunc() returns trigger language plpgsql as
+$$
+  begin
+    raise notice 'trigger = % fired on table % during %',
+                 TG_NAME, TG_TABLE_NAME, TG_OP;
+    return null;
+  end;
+$$;
+-- Triggers on root partition
+CREATE TRIGGER parent_delete_trig
+  AFTER DELETE ON range_parted for each statement execute procedure trigfunc();
+CREATE TRIGGER parent_update_trig
+  AFTER UPDATE ON range_parted for each statement execute procedure trigfunc();
+CREATE TRIGGER parent_insert_trig
+  AFTER INSERT ON range_parted for each statement execute procedure trigfunc();
+
+-- Triggers on leaf partition part_c_1_100
+CREATE TRIGGER c1_delete_trig
+  AFTER DELETE ON part_c_1_100 for each statement execute procedure trigfunc();
+CREATE TRIGGER c1_update_trig
+  AFTER UPDATE ON part_c_1_100 for each statement execute procedure trigfunc();
+CREATE TRIGGER c1_insert_trig
+  AFTER INSERT ON part_c_1_100 for each statement execute procedure trigfunc();
+
+-- Triggers on leaf partition part_d_1_15
+CREATE TRIGGER d1_delete_trig
+  AFTER DELETE ON part_d_1_15 for each statement execute procedure trigfunc();
+CREATE TRIGGER d1_update_trig
+  AFTER UPDATE ON part_d_1_15 for each statement execute procedure trigfunc();
+CREATE TRIGGER d1_insert_trig
+  AFTER INSERT ON part_d_1_15 for each statement execute procedure trigfunc();
+-- Triggers on leaf partition part_d_15_20
+CREATE TRIGGER d15_delete_trig
+  AFTER DELETE ON part_d_15_20 for each statement execute procedure trigfunc();
+CREATE TRIGGER d15_update_trig
+  AFTER UPDATE ON part_d_15_20 for each statement execute procedure trigfunc();
+CREATE TRIGGER d15_insert_trig
+  AFTER INSERT ON part_d_15_20 for each statement execute procedure trigfunc();
+
+-- Move all rows from part_c_100_200 to part_c_1_100. None of the delete or
+-- insert statement triggers should be fired.
+UPDATE range_parted set c = c - 50 WHERE c > 97;
+:show_data;
+
+DROP TRIGGER parent_delete_trig ON range_parted;
+DROP TRIGGER parent_update_trig ON range_parted;
+DROP TRIGGER parent_insert_trig ON range_parted;
+DROP TRIGGER c1_delete_trig ON part_c_1_100;
+DROP TRIGGER c1_update_trig ON part_c_1_100;
+DROP TRIGGER c1_insert_trig ON part_c_1_100;
+DROP TRIGGER d1_delete_trig ON part_d_1_15;
+DROP TRIGGER d1_update_trig ON part_d_1_15;
+DROP TRIGGER d1_insert_trig ON part_d_1_15;
+DROP TRIGGER d15_delete_trig ON part_d_15_20;
+DROP TRIGGER d15_update_trig ON part_d_15_20;
+DROP TRIGGER d15_insert_trig ON part_d_15_20;
+
+
+-- Creating default partition for range
+:init_range_parted;
+create table part_def partition of range_parted default;
+\d+ part_def
+insert into range_parted values ('c', 9);
+-- ok
+update part_def set a = 'd' where a = 'c';
+-- fail
+update part_def set a = 'a' where a = 'd';
+
+:show_data;
+
+-- Update row movement from non-default to default partition.
+-- fail, default partition is not under part_a_10_a_20;
+UPDATE part_a_10_a_20 set a = 'ad' WHERE a = 'a';
+-- ok
+UPDATE range_parted set a = 'ad' WHERE a = 'a';
+UPDATE range_parted set a = 'bd' WHERE a = 'b';
+:show_data;
+-- Update row movement from default to non-default partitions.
+-- ok
+UPDATE range_parted set a = 'a' WHERE a = 'ad';
+UPDATE range_parted set a = 'b' WHERE a = 'bd';
+:show_data;
+
+-- Cleanup: range_parted no longer needed.
+DROP TABLE range_parted;
+
+CREATE TABLE list_parted (
+	a text,
+	b int
+) PARTITION BY list (a);
+CREATE TABLE list_part1  PARTITION OF list_parted for VALUES in ('a', 'b');
+CREATE TABLE list_default PARTITION OF list_parted default;
+INSERT into list_part1 VALUES ('a', 1);
+INSERT into list_default VALUES ('d', 10);
+
+-- fail
+UPDATE list_default set a = 'a' WHERE a = 'd';
+-- ok
+UPDATE list_default set a = 'x' WHERE a = 'd';
+
+DROP TABLE list_parted;
+
+--------------
+-- Some more update-partition-key test scenarios below. This time use list
+-- partitions.
+--------------
+
+-- Setup for list partitions
+CREATE TABLE list_parted (a numeric, b int, c int8) PARTITION BY list (a);
+CREATE TABLE sub_parted PARTITION OF list_parted for VALUES in (1) PARTITION BY list (b);
+
+CREATE TABLE sub_part1(b int, c int8, a numeric);
+ALTER TABLE sub_parted ATTACH PARTITION sub_part1 for VALUES in (1);
+CREATE TABLE sub_part2(b int, c int8, a numeric);
+ALTER TABLE sub_parted ATTACH PARTITION sub_part2 for VALUES in (2);
+
+CREATE TABLE list_part1(a numeric, b int, c int8);
+ALTER TABLE list_parted ATTACH PARTITION list_part1 for VALUES in (2,3);
+
+INSERT into list_parted VALUES (2,5,50);
+INSERT into list_parted VALUES (3,6,60);
+INSERT into sub_parted VALUES (1,1,60);
+INSERT into sub_parted VALUES (1,2,10);
+
+-- Test partition constraint violation when intermediate ancestor is used and
+-- constraint is inherited from upper root.
+UPDATE sub_parted set a = 2 WHERE c = 10;
+
+-- Test update-partition-key, where the unpruned partitions do not have their
+-- partition keys updated.
+SELECT tableoid::regclass::text, * FROM list_parted WHERE a = 2 ORDER BY 1;
+UPDATE list_parted set b = c + a WHERE a = 2;
+SELECT tableoid::regclass::text, * FROM list_parted WHERE a = 2 ORDER BY 1;
+
+
+-- Test the case where BR UPDATE triggers change the partition key.
+CREATE FUNCTION func_parted_mod_b() returns trigger as $$
+BEGIN
+   NEW.b = 2; -- This is changing partition key column.
+   return NEW;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER parted_mod_b before update on sub_part1
+   for each row execute procedure func_parted_mod_b();
+
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+
+-- This should do the tuple routing even though there is no explicit
+-- partition-key update, because there is a trigger on sub_part1.
+UPDATE list_parted set c = 70 WHERE b  = 1;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+
+DROP TRIGGER parted_mod_b ON sub_part1;
+
+-- If BR DELETE trigger prevented DELETE from happening, we should also skip
+-- the INSERT if that delete is part of UPDATE=>DELETE+INSERT.
+CREATE OR REPLACE FUNCTION func_parted_mod_b() returns trigger as $$
+BEGIN
+   raise notice 'Trigger: Got OLD row %, but returning NULL', OLD;
+   return NULL;
+END $$ LANGUAGE plpgsql;
+CREATE TRIGGER trig_skip_delete before delete on sub_part2
+   for each row execute procedure func_parted_mod_b();
+UPDATE list_parted set b = 1 WHERE c = 70;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+-- Drop the trigger. Now the row should be moved.
+DROP TRIGGER trig_skip_delete ON sub_part2;
+UPDATE list_parted set b = 1 WHERE c = 70;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+DROP FUNCTION func_parted_mod_b();
+
+-- UPDATE partition-key with FROM clause. If join produces multiple output
+-- rows for the same row to be modified, we should tuple-route the row only
+-- once. There should not be any rows inserted.
+CREATE TABLE non_parted (id int);
+INSERT into non_parted VALUES (1), (1), (1), (2), (2), (2), (3), (3), (3);
+UPDATE list_parted t1 set a = 2 FROM non_parted t2 WHERE t1.a = t2.id and a = 1;
+SELECT tableoid::regclass::text, * FROM list_parted ORDER BY 1, 2, 3, 4;
+DROP TABLE non_parted;
+
+-- Cleanup: list_parted no longer needed.
+DROP TABLE list_parted;
+
+-- create custom operator class and hash function, for the same reason
+-- explained in alter_table.sql
+create or replace function dummy_hashint4(a int4, seed int8) returns int8 as
+$$ begin return (a + seed); end; $$ language 'plpgsql' immutable;
+create operator class custom_opclass for type int4 using hash as
+operator 1 = , function 2 dummy_hashint4(int4, int8);
+
+create table hash_parted (
+	a int,
 	b int
-) partition by range (a, b);
-create table part_a_1_a_10 partition of range_parted for values from ('a', 1) to ('a', 10);
-create table part_a_10_a_20 partition of range_parted for values from ('a', 10) to ('a', 20);
-create table part_b_1_b_10 partition of range_parted for values from ('b', 1) to ('b', 10);
-create table part_b_10_b_20 partition of range_parted for values from ('b', 10) to ('b', 20);
-insert into part_a_1_a_10 values ('a', 1);
-insert into part_b_10_b_20 values ('b', 10);
+) partition by hash (a custom_opclass, b custom_opclass);
+create table hpart1 partition of hash_parted for values with (modulus 2, remainder 1);
+create table hpart2 partition of hash_parted for values with (modulus 4, remainder 2);
+create table hpart3 partition of hash_parted for values with (modulus 8, remainder 0);
+create table hpart4 partition of hash_parted for values with (modulus 8, remainder 4);
+insert into hpart1 values (1, 1);
+insert into hpart2 values (2, 5);
+insert into hpart4 values (3, 4);
 
 -- fail
-update part_a_1_a_10 set a = 'b' where a = 'a';
-update range_parted set b = b - 1 where b = 10;
+update hpart1 set a = 3, b=4 where a = 1;
+-- ok, row movement
+update hash_parted set b = b - 1 where b = 1;
 -- ok
-update range_parted set b = b + 1 where b = 10;
+update hash_parted set b = b + 8 where b = 1;
 
 -- cleanup
-drop table range_parted;
+drop table hash_parted;
+drop operator class custom_opclass using hash;
+drop function dummy_hashint4(a int4, seed int8);
diff --git a/src/test/regress/sql/vacuum.sql b/src/test/regress/sql/vacuum.sql
index 7c5fb04917..92eaca2a93 100644
--- a/src/test/regress/sql/vacuum.sql
+++ b/src/test/regress/sql/vacuum.sql
@@ -62,9 +62,6 @@ VACUUM FULL vactst;
 
 VACUUM (DISABLE_PAGE_SKIPPING) vaccluster;
 
-DROP TABLE vaccluster;
-DROP TABLE vactst;
-
 -- partitioned table
 CREATE TABLE vacparted (a int, b char) PARTITION BY LIST (a);
 CREATE TABLE vacparted1 PARTITION OF vacparted FOR VALUES IN (1);
@@ -73,4 +70,25 @@ UPDATE vacparted SET b = 'b';
 VACUUM (ANALYZE) vacparted;
 VACUUM (FULL) vacparted;
 VACUUM (FREEZE) vacparted;
+
+-- check behavior with duplicate column mentions
+VACUUM ANALYZE vacparted(a,b,a);
+ANALYZE vacparted(a,b,b);
+
+-- multiple tables specified
+VACUUM vaccluster, vactst;
+VACUUM vacparted, does_not_exist;
+VACUUM (FREEZE) vacparted, vaccluster, vactst;
+VACUUM (FREEZE) does_not_exist, vaccluster;
+VACUUM ANALYZE vactst, vacparted (a);
+VACUUM ANALYZE vactst (does_not_exist), vacparted (b);
+VACUUM FULL vacparted, vactst;
+VACUUM FULL vactst, vacparted (a, b), vaccluster (i);
+ANALYZE vactst, vacparted;
+ANALYZE vacparted (b), vactst;
+ANALYZE vactst, does_not_exist, vacparted;
+ANALYZE vactst (i), vacparted (does_not_exist);
+
+DROP TABLE vaccluster;
+DROP TABLE vactst;
 DROP TABLE vacparted;
diff --git a/src/test/regress/sql/window.sql b/src/test/regress/sql/window.sql
index e2a1a1cdd5..051b50b2d3 100644
--- a/src/test/regress/sql/window.sql
+++ b/src/test/regress/sql/window.sql
@@ -189,6 +189,46 @@ SELECT sum(unique1) over (rows between 2 preceding and 2 following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
 
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude no others),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (rows between 2 preceding and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT first_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT last_value(unique1) over (ORDER BY four rows between current row and 2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
 SELECT sum(unique1) over (rows between 2 preceding and 1 preceding),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10;
@@ -205,10 +245,17 @@ SELECT sum(unique1) over (w range between current row and unbounded following),
 	unique1, four
 FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
 
--- fail: not implemented yet
-SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude current row),
 	unique1, four
-FROM tenk1 WHERE unique1 < 10;
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
+
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
+
+SELECT sum(unique1) over (w range between unbounded preceding and current row exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10 WINDOW w AS (order by four);
 
 SELECT first_value(unique1) over w,
 	nth_value(unique1, 2) over w AS nth_2,
@@ -230,6 +277,521 @@ SELECT * FROM v_window;
 
 SELECT pg_get_viewdef('v_window');
 
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude current row) as sum_rows FROM generate_series(1, 10) i;
+
+SELECT * FROM v_window;
+
+SELECT pg_get_viewdef('v_window');
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude group) as sum_rows FROM generate_series(1, 10) i;
+
+SELECT * FROM v_window;
+
+SELECT pg_get_viewdef('v_window');
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude ties) as sum_rows FROM generate_series(1, 10) i;
+
+SELECT * FROM v_window;
+
+SELECT pg_get_viewdef('v_window');
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i rows between 1 preceding and 1 following
+	exclude no others) as sum_rows FROM generate_series(1, 10) i;
+
+SELECT * FROM v_window;
+
+SELECT pg_get_viewdef('v_window');
+
+CREATE OR REPLACE TEMP VIEW v_window AS
+	SELECT i, sum(i) over (order by i groups between 1 preceding and 1 following) as sum_rows FROM generate_series(1, 10) i;
+
+SELECT * FROM v_window;
+
+SELECT pg_get_viewdef('v_window');
+
+DROP VIEW v_window;
+
+CREATE TEMP VIEW v_window AS
+	SELECT i, min(i) over (order by i range between '1 day' preceding and '10 days' following) as min_i
+  FROM generate_series(now(), now()+'100 days'::interval, '1 hour') i;
+
+SELECT pg_get_viewdef('v_window');
+
+-- RANGE offset PRECEDING/FOLLOWING tests
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four desc range between 2::int8 preceding and 1::int2 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude no others),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 1::int2 preceding exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::int2 following exclude ties),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four range between 2::int8 preceding and 6::int2 following exclude group),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by four order by unique1 range between 5::int8 preceding and 6::int2 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by four order by unique1 range between 5::int8 preceding and 6::int2 following
+	exclude current row),unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+select sum(salary) over (order by enroll_date desc range between '1 year'::interval following and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude current row), salary, enroll_date from empsalary;
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude group), salary, enroll_date from empsalary;
+
+select sum(salary) over (order by enroll_date range between '1 year'::interval preceding and '1 year'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+select first_value(salary) over(order by salary range between 1000 preceding and 1000 following),
+	lead(salary) over(order by salary range between 1000 preceding and 1000 following),
+	nth_value(salary, 1) over(order by salary range between 1000 preceding and 1000 following),
+	salary from empsalary;
+
+select last_value(salary) over(order by salary range between 1000 preceding and 1000 following),
+	lag(salary) over(order by salary range between 1000 preceding and 1000 following),
+	salary from empsalary;
+
+select first_value(salary) over(order by salary range between 1000 following and 3000 following
+	exclude current row),
+	lead(salary) over(order by salary range between 1000 following and 3000 following exclude ties),
+	nth_value(salary, 1) over(order by salary range between 1000 following and 3000 following
+	exclude ties),
+	salary from empsalary;
+
+select last_value(salary) over(order by salary range between 1000 following and 3000 following
+	exclude group),
+	lag(salary) over(order by salary range between 1000 following and 3000 following exclude group),
+	salary from empsalary;
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following),
+	salary, enroll_date from empsalary;
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude ties),
+	salary, enroll_date from empsalary;
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude group),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude group),
+	salary, enroll_date from empsalary;
+
+select first_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude current row),
+	last_value(salary) over(order by enroll_date range between unbounded preceding and '1 year'::interval following
+	exclude current row),
+	salary, enroll_date from empsalary;
+
+-- RANGE offset PRECEDING/FOLLOWING with null values
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x asc nulls first range between 2 preceding and 2 following);
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x asc nulls last range between 2 preceding and 2 following);
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x desc nulls first range between 2 preceding and 2 following);
+
+select x, y,
+       first_value(y) over w,
+       last_value(y) over w
+from
+  (select x, x as y from generate_series(1,5) as x
+   union all select null, 42
+   union all select null, 43) ss
+window w as
+  (order by x desc nulls last range between 2 preceding and 2 following);
+
+-- Check overflow behavior for various integer sizes
+
+select x, last_value(x) over (order by x::smallint range between current row and 2147450884 following)
+from generate_series(32764, 32766) x;
+
+select x, last_value(x) over (order by x::smallint desc range between current row and 2147450885 following)
+from generate_series(-32766, -32764) x;
+
+select x, last_value(x) over (order by x range between current row and 4 following)
+from generate_series(2147483644, 2147483646) x;
+
+select x, last_value(x) over (order by x desc range between current row and 5 following)
+from generate_series(-2147483646, -2147483644) x;
+
+select x, last_value(x) over (order by x range between current row and 4 following)
+from generate_series(9223372036854775804, 9223372036854775806) x;
+
+select x, last_value(x) over (order by x desc range between current row and 5 following)
+from generate_series(-9223372036854775806, -9223372036854775804) x;
+
+-- Test in_range for other numeric datatypes
+
+create temp table numerics(
+    id int,
+    f_float4 float4,
+    f_float8 float8,
+    f_numeric numeric
+);
+
+insert into numerics values
+(0, '-infinity', '-infinity', '-1000'),  -- numeric type lacks infinities
+(1, -3, -3, -3),
+(2, -1, -1, -1),
+(3, 0, 0, 0),
+(4, 1.1, 1.1, 1.1),
+(5, 1.12, 1.12, 1.12),
+(6, 2, 2, 2),
+(7, 100, 100, 100),
+(8, 'infinity', 'infinity', '1000'),
+(9, 'NaN', 'NaN', 'NaN');
+
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1 preceding and 1 following);
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1 preceding and 1.1::float4 following);
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             'inf' preceding and 'inf' following);
+select id, f_float4, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float4 range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1 preceding and 1 following);
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1 preceding and 1.1::float8 following);
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             'inf' preceding and 'inf' following);
+select id, f_float8, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_float8 range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1 following);
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1.1::numeric following);
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1 preceding and 1.1::float8 following);  -- currently unsupported
+select id, f_numeric, first_value(id) over w, last_value(id) over w
+from numerics
+window w as (order by f_numeric range between
+             1.1 preceding and 'NaN' following);  -- error, NaN disallowed
+
+-- Test in_range for other datetime datatypes
+
+create temp table datetimes(
+    id int,
+    f_time time,
+    f_timetz timetz,
+    f_interval interval,
+    f_timestamptz timestamptz,
+    f_timestamp timestamp
+);
+
+insert into datetimes values
+(1, '11:00', '11:00 BST', '1 year', '2000-10-19 10:23:54+01', '2000-10-19 10:23:54'),
+(2, '12:00', '12:00 BST', '2 years', '2001-10-19 10:23:54+01', '2001-10-19 10:23:54'),
+(3, '13:00', '13:00 BST', '3 years', '2001-10-19 10:23:54+01', '2001-10-19 10:23:54'),
+(4, '14:00', '14:00 BST', '4 years', '2002-10-19 10:23:54+01', '2002-10-19 10:23:54'),
+(5, '15:00', '15:00 BST', '5 years', '2003-10-19 10:23:54+01', '2003-10-19 10:23:54'),
+(6, '15:00', '15:00 BST', '5 years', '2004-10-19 10:23:54+01', '2004-10-19 10:23:54'),
+(7, '17:00', '17:00 BST', '7 years', '2005-10-19 10:23:54+01', '2005-10-19 10:23:54'),
+(8, '18:00', '18:00 BST', '8 years', '2006-10-19 10:23:54+01', '2006-10-19 10:23:54'),
+(9, '19:00', '19:00 BST', '9 years', '2007-10-19 10:23:54+01', '2007-10-19 10:23:54'),
+(10, '20:00', '20:00 BST', '10 years', '2008-10-19 10:23:54+01', '2008-10-19 10:23:54');
+
+select id, f_time, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_time range between
+             '70 min'::interval preceding and '2 hours'::interval following);
+
+select id, f_time, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_time desc range between
+             '70 min' preceding and '2 hours' following);
+
+select id, f_timetz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timetz range between
+             '70 min'::interval preceding and '2 hours'::interval following);
+
+select id, f_timetz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timetz desc range between
+             '70 min' preceding and '2 hours' following);
+
+select id, f_interval, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_interval range between
+             '1 year'::interval preceding and '1 year'::interval following);
+
+select id, f_interval, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_interval desc range between
+             '1 year' preceding and '1 year' following);
+
+select id, f_timestamptz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamptz range between
+             '1 year'::interval preceding and '1 year'::interval following);
+
+select id, f_timestamptz, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamptz desc range between
+             '1 year' preceding and '1 year' following);
+
+select id, f_timestamp, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamp range between
+             '1 year'::interval preceding and '1 year'::interval following);
+
+select id, f_timestamp, first_value(id) over w, last_value(id) over w
+from datetimes
+window w as (order by f_timestamp desc range between
+             '1 year' preceding and '1 year' following);
+
+-- RANGE offset PRECEDING/FOLLOWING error cases
+select sum(salary) over (order by enroll_date, salary range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+select sum(salary) over (range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+select sum(salary) over (order by depname range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+select max(enroll_date) over (order by enroll_date range between 1 preceding and 2 following
+	exclude ties), salary, enroll_date from empsalary;
+
+select max(enroll_date) over (order by salary range between -1 preceding and 2 following
+	exclude ties), salary, enroll_date from empsalary;
+
+select max(enroll_date) over (order by salary range between 1 preceding and -2 following
+	exclude ties), salary, enroll_date from empsalary;
+
+select max(enroll_date) over (order by salary range between '1 year'::interval preceding and '2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+select max(enroll_date) over (order by enroll_date range between '1 year'::interval preceding and '-2 years'::interval following
+	exclude ties), salary, enroll_date from empsalary;
+
+-- GROUPS tests
+
+SELECT sum(unique1) over (order by four groups between unbounded preceding and current row),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between unbounded preceding and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between current row and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 1 preceding and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 1 following and unbounded following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between unbounded preceding and 2 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 preceding),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 0 preceding and 0 following),
+	unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude current row), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude group), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (order by four groups between 2 preceding and 1 following
+	exclude ties), unique1, four
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following),unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude current row), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude group), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+
+SELECT sum(unique1) over (partition by ten
+	order by four groups between 0 preceding and 0 following exclude ties), unique1, four, ten
+FROM tenk1 WHERE unique1 < 10;
+
+select first_value(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	lead(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	nth_value(salary, 1) over(order by enroll_date groups between 1 preceding and 1 following),
+	salary, enroll_date from empsalary;
+
+select last_value(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	lag(salary) over(order by enroll_date groups between 1 preceding and 1 following),
+	salary, enroll_date from empsalary;
+
+select first_value(salary) over(order by enroll_date groups between 1 following and 3 following
+	exclude current row),
+	lead(salary) over(order by enroll_date groups between 1 following and 3 following exclude ties),
+	nth_value(salary, 1) over(order by enroll_date groups between 1 following and 3 following
+	exclude ties),
+	salary, enroll_date from empsalary;
+
+select last_value(salary) over(order by enroll_date groups between 1 following and 3 following
+	exclude group),
+	lag(salary) over(order by enroll_date groups between 1 following and 3 following exclude group),
+	salary, enroll_date from empsalary;
+
+-- Show differences in offset interpretation between ROWS, RANGE, and GROUPS
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
+
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x range between 1 preceding and 1 following);
+
+WITH cte (x) AS (
+        SELECT * FROM generate_series(1, 35, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x groups between 1 preceding and 1 following);
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x rows between 1 preceding and 1 following);
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x range between 1 preceding and 1 following);
+
+WITH cte (x) AS (
+        select 1 union all select 1 union all select 1 union all
+        SELECT * FROM generate_series(5, 49, 2)
+)
+SELECT x, (sum(x) over w)
+FROM cte
+WINDOW w AS (ORDER BY x groups between 1 preceding and 1 following);
+
 -- with UNION
 SELECT count(*) OVER (PARTITION BY four) FROM (SELECT * FROM tenk1 UNION ALL SELECT * FROM tenk2)s LIMIT 0;
 
diff --git a/src/test/regress/sql/with.sql b/src/test/regress/sql/with.sql
index 8ae5184d0f..baf65488a8 100644
--- a/src/test/regress/sql/with.sql
+++ b/src/test/regress/sql/with.sql
@@ -1030,4 +1030,12 @@ create table foo (with ordinality);  -- fail, WITH is a reserved word
 with ordinality as (select 1 as x) select * from ordinality;
 
 -- check sane response to attempt to modify CTE relation
-WITH d AS (SELECT 42) INSERT INTO d VALUES (1);
+WITH test AS (SELECT 42) INSERT INTO test VALUES (1);
+
+-- check response to attempt to modify table with same name as a CTE (perhaps
+-- surprisingly it works, because CTEs don't hide tables from data-modifying
+-- statements)
+create table test (i int);
+with test as (select 42) insert into test select * from test;
+select * from test;
+drop table test;
diff --git a/src/test/regress/sql/write_parallel.sql b/src/test/regress/sql/write_parallel.sql
new file mode 100644
index 0000000000..78b479cedf
--- /dev/null
+++ b/src/test/regress/sql/write_parallel.sql
@@ -0,0 +1,42 @@
+--
+-- PARALLEL
+--
+
+-- Serializable isolation would disable parallel query, so explicitly use an
+-- arbitrary other level.
+begin isolation level repeatable read;
+
+-- encourage use of parallel plans
+set parallel_setup_cost=0;
+set parallel_tuple_cost=0;
+set min_parallel_table_scan_size=0;
+set max_parallel_workers_per_gather=4;
+
+--
+-- Test write operations that has an underlying query that is eligble
+-- for parallel plans
+--
+explain (costs off) create table parallel_write as
+    select length(stringu1) from tenk1 group by length(stringu1);
+create table parallel_write as
+    select length(stringu1) from tenk1 group by length(stringu1);
+drop table parallel_write;
+
+explain (costs off) select length(stringu1) into parallel_write
+    from tenk1 group by length(stringu1);
+select length(stringu1) into parallel_write
+    from tenk1 group by length(stringu1);
+drop table parallel_write;
+
+explain (costs off) create materialized view parallel_mat_view as
+    select length(stringu1) from tenk1 group by length(stringu1);
+create materialized view parallel_mat_view as
+    select length(stringu1) from tenk1 group by length(stringu1);
+drop materialized view parallel_mat_view;
+
+prepare prep_stmt as select length(stringu1) from tenk1 group by length(stringu1);
+explain (costs off) create table parallel_write as execute prep_stmt;
+create table parallel_write as execute prep_stmt;
+drop table parallel_write;
+
+rollback;
diff --git a/src/test/regress/sql/xml.sql b/src/test/regress/sql/xml.sql
index eb4687fb09..cb96e18005 100644
--- a/src/test/regress/sql/xml.sql
+++ b/src/test/regress/sql/xml.sql
@@ -189,6 +189,42 @@ SELECT xpath('count(//*)=3', '<root><sub/><sub/></root>');
 SELECT xpath('name(/*)', '<root><sub/><sub/></root>');
 SELECT xpath('/nosuchtag', '<root/>');
 
+-- Round-trip non-ASCII data through xpath().
+DO $$
+DECLARE
+  xml_declaration text := '<?xml version="1.0" encoding="ISO-8859-1"?>';
+  degree_symbol text;
+  res xml[];
+BEGIN
+  -- Per the documentation, except when the server encoding is UTF8, xpath()
+  -- may not work on non-ASCII data.  The untranslatable_character and
+  -- undefined_function traps below, currently dead code, will become relevant
+  -- if we remove this limitation.
+  IF current_setting('server_encoding') <> 'UTF8' THEN
+    RAISE LOG 'skip: encoding % unsupported for xpath',
+      current_setting('server_encoding');
+    RETURN;
+  END IF;
+
+  degree_symbol := convert_from('\xc2b0', 'UTF8');
+  res := xpath('text()', (xml_declaration ||
+    '<x>' || degree_symbol || '</x>')::xml);
+  IF degree_symbol <> res[1]::text THEN
+    RAISE 'expected % (%), got % (%)',
+      degree_symbol, convert_to(degree_symbol, 'UTF8'),
+      res[1], convert_to(res[1]::text, 'UTF8');
+  END IF;
+EXCEPTION
+  -- character with byte sequence 0xc2 0xb0 in encoding "UTF8" has no equivalent in encoding "LATIN8"
+  WHEN untranslatable_character
+  -- default conversion function for encoding "UTF8" to "MULE_INTERNAL" does not exist
+  OR undefined_function
+  -- unsupported XML feature
+  OR feature_not_supported THEN
+    RAISE LOG 'skip: %', SQLERRM;
+END
+$$;
+
 -- Test xmlexists and xpath_exists
 SELECT xmlexists('//town[text() = ''Toronto'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
 SELECT xmlexists('//town[text() = ''Cwmbran'']' PASSING BY REF '<towns><town>Bidford-on-Avon</town><town>Cwmbran</town><town>Bristol</town></towns>');
diff --git a/src/test/ssl/Makefile b/src/test/ssl/Makefile
index e4437d19c3..4e9095529a 100644
--- a/src/test/ssl/Makefile
+++ b/src/test/ssl/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/test/ssl
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/ssl/Makefile
@@ -132,3 +132,6 @@ clean distclean maintainer-clean:
 
 check:
 	$(prove_check)
+
+installcheck:
+	$(prove_installcheck)
diff --git a/src/test/ssl/README b/src/test/ssl/README
index 50fa14e287..0be06e755c 100644
--- a/src/test/ssl/README
+++ b/src/test/ssl/README
@@ -12,10 +12,15 @@ Running the tests
 
     make check
 
-NOTE: This creates a temporary installation, and sets it up to listen for TCP
-connections on localhost. Any user on the same host is allowed to log in to
-the test installation while the tests are running. Do not run this suite
-on a multi-user system where you don't trust all local users!
+or
+
+    make installcheck
+
+NOTE: This creates a temporary installation (in the case of "check"),
+and sets it up to listen for TCP connections on localhost. Any user on
+the same host is allowed to log in to the test installation while the
+tests are running. Do not run this suite on a multi-user system where
+you don't trust all local users!
 
 Certificates
 ============
diff --git a/src/test/ssl/ServerSetup.pm b/src/test/ssl/ServerSetup.pm
index f63c81cfc6..27a676b65c 100644
--- a/src/test/ssl/ServerSetup.pm
+++ b/src/test/ssl/ServerSetup.pm
@@ -26,9 +26,38 @@ use Test::More;
 
 use Exporter 'import';
 our @EXPORT = qw(
-  configure_test_server_for_ssl switch_server_cert
+  configure_test_server_for_ssl
+  switch_server_cert
+  test_connect_fails
+  test_connect_ok
 );
 
+# Define a couple of helper functions to test connecting to the server.
+
+# The first argument is a base connection string to use for connection.
+# The second argument is a complementary connection string.
+sub test_connect_ok
+{
+	my ($common_connstr, $connstr, $test_name) = @_;
+
+	my $cmd = [
+		'psql', '-X', '-A', '-t', '-c', "SELECT \$\$connected with $connstr\$\$",
+		'-d', "$common_connstr $connstr" ];
+
+	command_ok($cmd, $test_name);
+}
+
+sub test_connect_fails
+{
+	my ($common_connstr, $connstr, $expected_stderr, $test_name) = @_;
+
+	my $cmd = [
+		'psql', '-X', '-A', '-t', '-c', "SELECT \$\$connected with $connstr\$\$",
+		'-d', "$common_connstr $connstr" ];
+
+	command_fails_like($cmd, $expected_stderr, $test_name);
+}
+
 # Copy a set of files, taking into account wildcards
 sub copy_files
 {
@@ -46,8 +75,7 @@ sub copy_files
 
 sub configure_test_server_for_ssl
 {
-	my $node       = $_[0];
-	my $serverhost = $_[1];
+	my ($node, $serverhost, $authmethod, $password, $password_enc) = @_;
 
 	my $pgdata = $node->data_dir;
 
@@ -57,6 +85,15 @@ sub configure_test_server_for_ssl
 	$node->psql('postgres', "CREATE DATABASE trustdb");
 	$node->psql('postgres', "CREATE DATABASE certdb");
 
+	# Update password of each user as needed.
+	if (defined($password))
+	{
+		$node->psql('postgres',
+"SET password_encryption='$password_enc'; ALTER USER ssltestuser PASSWORD '$password';");
+		$node->psql('postgres',
+"SET password_encryption='$password_enc'; ALTER USER anotheruser PASSWORD '$password';");
+	}
+
 	# enable logging etc.
 	open my $conf, '>>', "$pgdata/postgresql.conf";
 	print $conf "fsync=off\n";
@@ -86,7 +123,7 @@ sub configure_test_server_for_ssl
 	$node->restart;
 
 	# Change pg_hba after restart because hostssl requires ssl=on
-	configure_hba_for_ssl($node, $serverhost);
+	configure_hba_for_ssl($node, $serverhost, $authmethod);
 }
 
 # Change the configuration to use given server cert file, and reload
@@ -98,9 +135,6 @@ sub switch_server_cert
 	my $cafile   = $_[2] || "root+client_ca";
 	my $pgdata   = $node->data_dir;
 
-	note
-	  "reloading server with certfile \"$certfile\" and cafile \"$cafile\"";
-
 	open my $sslconf, '>', "$pgdata/sslconfig.conf";
 	print $sslconf "ssl=on\n";
 	print $sslconf "ssl_ca_file='$cafile.crt'\n";
@@ -114,8 +148,7 @@ sub switch_server_cert
 
 sub configure_hba_for_ssl
 {
-	my $node       = $_[0];
-	my $serverhost = $_[1];
+	my ($node, $serverhost, $authmethod) = @_;
 	my $pgdata     = $node->data_dir;
 
   # Only accept SSL connections from localhost. Our tests don't depend on this
@@ -126,12 +159,12 @@ sub configure_hba_for_ssl
 	print $hba
 "# TYPE  DATABASE        USER            ADDRESS                 METHOD\n";
 	print $hba
-"hostssl trustdb         ssltestuser     $serverhost/32            trust\n";
+"hostssl trustdb         all             $serverhost/32            $authmethod\n";
 	print $hba
-"hostssl trustdb         ssltestuser     ::1/128                 trust\n";
+"hostssl trustdb         all             ::1/128                 $authmethod\n";
 	print $hba
-"hostssl certdb          ssltestuser     $serverhost/32            cert\n";
+"hostssl certdb          all             $serverhost/32            cert\n";
 	print $hba
-"hostssl certdb          ssltestuser     ::1/128                 cert\n";
+"hostssl certdb          all             ::1/128                 cert\n";
 	close $hba;
 }
diff --git a/src/test/ssl/ssl/.gitignore b/src/test/ssl/ssl/.gitignore
index 10b74f0848..af753d4c7d 100644
--- a/src/test/ssl/ssl/.gitignore
+++ b/src/test/ssl/ssl/.gitignore
@@ -1,3 +1,3 @@
 /*.old
 /new_certs_dir/
-/client_tmp.key
+/client*_tmp.key
diff --git a/src/test/ssl/t/001_ssltests.pl b/src/test/ssl/t/001_ssltests.pl
index 32df273929..4b097a69bf 100644
--- a/src/test/ssl/t/001_ssltests.pl
+++ b/src/test/ssl/t/001_ssltests.pl
@@ -2,7 +2,7 @@
 use warnings;
 use PostgresNode;
 use TestLib;
-use Test::More tests => 40;
+use Test::More tests => 62;
 use ServerSetup;
 use File::Copy;
 
@@ -13,48 +13,21 @@
 # postgresql-ssl-regression.test.
 my $SERVERHOSTADDR = '127.0.0.1';
 
-# Define a couple of helper functions to test connecting to the server.
-
+# Allocation of base connection string shared among multiple tests.
 my $common_connstr;
 
-sub run_test_psql
-{
-	my $connstr   = $_[0];
-	my $logstring = $_[1];
-
-	my $cmd = [
-		'psql', '-X', '-A', '-t', '-c', "SELECT 'connected with $connstr'",
-		'-d', "$connstr" ];
-
-	my $result = run_log($cmd);
-	return $result;
-}
-
-#
-# The first argument is a (part of a) connection string, and it's also printed
-# out as the test case name. It is appended to $common_connstr global variable,
-# which also contains a libpq connection string.
-sub test_connect_ok
-{
-	my $connstr = $_[0];
-
-	my $result =
-	  run_test_psql("$common_connstr $connstr", "(should succeed)");
-	ok($result, $connstr);
-}
-
-sub test_connect_fails
-{
-	my $connstr = $_[0];
-
-	my $result = run_test_psql("$common_connstr $connstr", "(should fail)");
-	ok(!$result, "$connstr (should fail)");
-}
-
 # The client's private key must not be world-readable, so take a copy
 # of the key stored in the code tree and update its permissions.
 copy("ssl/client.key", "ssl/client_tmp.key");
 chmod 0600, "ssl/client_tmp.key";
+copy("ssl/client-revoked.key", "ssl/client-revoked_tmp.key");
+chmod 0600, "ssl/client-revoked_tmp.key";
+
+# Also make a copy of that explicitly world-readable.  We can't
+# necessarily rely on the file in the source tree having those
+# permissions.
+copy("ssl/client.key", "ssl/client_wrongperms_tmp.key");
+chmod 0644, "ssl/client_wrongperms_tmp.key";
 
 #### Part 0. Set up the server.
 
@@ -67,7 +40,7 @@ sub test_connect_fails
 $ENV{PGHOST} = $node->host;
 $ENV{PGPORT} = $node->port;
 $node->start;
-configure_test_server_for_ssl($node, $SERVERHOSTADDR);
+configure_test_server_for_ssl($node, $SERVERHOSTADDR, 'trust');
 switch_server_cert($node, 'server-cn-only');
 
 ### Part 1. Run client-side tests.
@@ -81,103 +54,148 @@ sub test_connect_fails
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid hostaddr=$SERVERHOSTADDR host=common-name.pg-ssltest.test";
 
-# The server should not accept non-SSL connections
-note "test that the server doesn't accept non-SSL connections";
-test_connect_fails("sslmode=disable");
+# The server should not accept non-SSL connections.
+test_connect_fails($common_connstr, "sslmode=disable",
+				   qr/\Qno pg_hba.conf entry\E/,
+				   "server doesn't accept non-SSL connections");
 
 # Try without a root cert. In sslmode=require, this should work. In verify-ca
-# or verify-full mode it should fail
-note "connect without server root cert";
-test_connect_ok("sslrootcert=invalid sslmode=require");
-test_connect_fails("sslrootcert=invalid sslmode=verify-ca");
-test_connect_fails("sslrootcert=invalid sslmode=verify-full");
-
-# Try with wrong root cert, should fail. (we're using the client CA as the
-# root, but the server's key is signed by the server CA)
-note "connect without wrong server root cert";
-test_connect_fails("sslrootcert=ssl/client_ca.crt sslmode=require");
-test_connect_fails("sslrootcert=ssl/client_ca.crt sslmode=verify-ca");
-test_connect_fails("sslrootcert=ssl/client_ca.crt sslmode=verify-full");
+# or verify-full mode it should fail.
+test_connect_ok($common_connstr, "sslrootcert=invalid sslmode=require",
+				"connect without server root cert sslmode=require");
+test_connect_fails($common_connstr, "sslrootcert=invalid sslmode=verify-ca",
+				qr/root certificate file "invalid" does not exist/,
+				"connect without server root cert sslmode=verify-ca");
+test_connect_fails($common_connstr, "sslrootcert=invalid sslmode=verify-full",
+				   qr/root certificate file "invalid" does not exist/,
+				   "connect without server root cert sslmode=verify-full");
+
+# Try with wrong root cert, should fail. (We're using the client CA as the
+# root, but the server's key is signed by the server CA.)
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/client_ca.crt sslmode=require",
+				   qr/SSL error/,
+				   "connect with wrong server root cert sslmode=require");
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/client_ca.crt sslmode=verify-ca",
+				   qr/SSL error/,
+				   "connect with wrong server root cert sslmode=verify-ca");
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/client_ca.crt sslmode=verify-full",
+				   qr/SSL error/,
+				   "connect with wrong server root cert sslmode=verify-full");
 
 # Try with just the server CA's cert. This fails because the root file
 # must contain the whole chain up to the root CA.
-note "connect with server CA cert, without root CA";
-test_connect_fails("sslrootcert=ssl/server_ca.crt sslmode=verify-ca");
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/server_ca.crt sslmode=verify-ca",
+				   qr/SSL error/,
+				   "connect with server CA cert, without root CA");
 
 # And finally, with the correct root cert.
-note "connect with correct server CA cert file";
-test_connect_ok("sslrootcert=ssl/root+server_ca.crt sslmode=require");
-test_connect_ok("sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca");
-test_connect_ok("sslrootcert=ssl/root+server_ca.crt sslmode=verify-full");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=require",
+				"connect with correct server CA cert file sslmode=require");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
+				"connect with correct server CA cert file sslmode=verify-ca");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-full",
+				"connect with correct server CA cert file sslmode=verify-full");
 
 # Test with cert root file that contains two certificates. The client should
 # be able to pick the right one, regardless of the order in the file.
-test_connect_ok("sslrootcert=ssl/both-cas-1.crt sslmode=verify-ca");
-test_connect_ok("sslrootcert=ssl/both-cas-2.crt sslmode=verify-ca");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/both-cas-1.crt sslmode=verify-ca",
+				"cert root file that contains two certificates, order 1");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/both-cas-2.crt sslmode=verify-ca",
+				"cert root file that contains two certificates, order 2");
 
-note "testing sslcrl option with a non-revoked cert";
+# CRL tests
 
 # Invalid CRL filename is the same as no CRL, succeeds
-test_connect_ok(
-	"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=invalid");
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=invalid",
+				"sslcrl option with invalid file name");
 
 # A CRL belonging to a different CA is not accepted, fails
-test_connect_fails(
-"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/client.crl");
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/client.crl",
+				   qr/SSL error/,
+				   "CRL belonging to a different CA");
 
 # With the correct CRL, succeeds (this cert is not revoked)
-test_connect_ok(
-"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl"
-);
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
+				"CRL with a non-revoked cert");
 
 # Check that connecting with verify-full fails, when the hostname doesn't
 # match the hostname in the server's certificate.
-note "test mismatch between hostname and server certificate";
 $common_connstr =
-"user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
+"user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok("sslmode=require host=wronghost.test");
-test_connect_ok("sslmode=verify-ca host=wronghost.test");
-test_connect_fails("sslmode=verify-full host=wronghost.test");
+test_connect_ok($common_connstr, "sslmode=require host=wronghost.test",
+				"mismatch between host name and server certificate sslmode=require");
+test_connect_ok($common_connstr, "sslmode=verify-ca host=wronghost.test",
+				"mismatch between host name and server certificate sslmode=verify-ca");
+test_connect_fails($common_connstr, "sslmode=verify-full host=wronghost.test",
+				   qr/\Qserver certificate for "common-name.pg-ssltest.test" does not match host name "wronghost.test"\E/,
+				   "mismatch between host name and server certificate sslmode=verify-full");
 
 # Test Subject Alternative Names.
 switch_server_cert($node, 'server-multiple-alt-names');
 
-note "test hostname matching with X.509 Subject Alternative Names";
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok("host=dns1.alt-name.pg-ssltest.test");
-test_connect_ok("host=dns2.alt-name.pg-ssltest.test");
-test_connect_ok("host=foo.wildcard.pg-ssltest.test");
-
-test_connect_fails("host=wronghost.alt-name.pg-ssltest.test");
-test_connect_fails("host=deep.subdomain.wildcard.pg-ssltest.test");
+test_connect_ok($common_connstr, "host=dns1.alt-name.pg-ssltest.test",
+				"host name matching with X.509 Subject Alternative Names 1");
+test_connect_ok($common_connstr, "host=dns2.alt-name.pg-ssltest.test",
+				"host name matching with X.509 Subject Alternative Names 2");
+test_connect_ok($common_connstr, "host=foo.wildcard.pg-ssltest.test",
+				"host name matching with X.509 Subject Alternative Names wildcard");
+
+test_connect_fails($common_connstr, "host=wronghost.alt-name.pg-ssltest.test",
+				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
+				   "host name not matching with X.509 Subject Alternative Names");
+test_connect_fails($common_connstr,
+				   "host=deep.subdomain.wildcard.pg-ssltest.test",
+				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 2 other names) does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
+				   "host name not matching with X.509 Subject Alternative Names wildcard");
 
 # Test certificate with a single Subject Alternative Name. (this gives a
 # slightly different error message, that's all)
 switch_server_cert($node, 'server-single-alt-name');
 
-note "test hostname matching with a single X.509 Subject Alternative Name";
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok("host=single.alt-name.pg-ssltest.test");
+test_connect_ok($common_connstr, "host=single.alt-name.pg-ssltest.test",
+				"host name matching with a single X.509 Subject Alternative Name");
 
-test_connect_fails("host=wronghost.alt-name.pg-ssltest.test");
-test_connect_fails("host=deep.subdomain.wildcard.pg-ssltest.test");
+test_connect_fails($common_connstr, "host=wronghost.alt-name.pg-ssltest.test",
+				   qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "wronghost.alt-name.pg-ssltest.test"\E/,
+				   "host name not matching with a single X.509 Subject Alternative Name");
+test_connect_fails($common_connstr,
+				   "host=deep.subdomain.wildcard.pg-ssltest.test",
+				   qr/\Qserver certificate for "single.alt-name.pg-ssltest.test" does not match host name "deep.subdomain.wildcard.pg-ssltest.test"\E/,
+				   "host name not matching with a single X.509 Subject Alternative Name wildcard");
 
 # Test server certificate with a CN and SANs. Per RFCs 2818 and 6125, the CN
 # should be ignored when the certificate has both.
 switch_server_cert($node, 'server-cn-and-alt-names');
 
-note "test certificate with both a CN and SANs";
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR sslmode=verify-full";
 
-test_connect_ok("host=dns1.alt-name.pg-ssltest.test");
-test_connect_ok("host=dns2.alt-name.pg-ssltest.test");
-test_connect_fails("host=common-name.pg-ssltest.test");
+test_connect_ok($common_connstr, "host=dns1.alt-name.pg-ssltest.test",
+				"certificate with both a CN and SANs 1");
+test_connect_ok($common_connstr, "host=dns2.alt-name.pg-ssltest.test",
+				"certificate with both a CN and SANs 2");
+test_connect_fails($common_connstr, "host=common-name.pg-ssltest.test",
+				   qr/\Qserver certificate for "dns1.alt-name.pg-ssltest.test" (and 1 other name) does not match host name "common-name.pg-ssltest.test"\E/,
+				   "certificate with both a CN and SANs ignores CN");
 
 # Finally, test a server certificate that has no CN or SANs. Of course, that's
 # not a very sensible certificate, but libpq should handle it gracefully.
@@ -185,53 +203,80 @@ sub test_connect_fails
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok("sslmode=verify-ca host=common-name.pg-ssltest.test");
-test_connect_fails("sslmode=verify-full host=common-name.pg-ssltest.test");
+test_connect_ok($common_connstr,
+				"sslmode=verify-ca host=common-name.pg-ssltest.test",
+				"server certificate without CN or SANs sslmode=verify-ca");
+test_connect_fails($common_connstr,
+				   "sslmode=verify-full host=common-name.pg-ssltest.test",
+				   qr/could not get server's host name from server certificate/,
+				   "server certificate without CN or SANs sslmode=verify-full");
 
 # Test that the CRL works
-note "testing client-side CRL";
 switch_server_cert($node, 'server-revoked');
 
 $common_connstr =
 "user=ssltestuser dbname=trustdb sslcert=invalid hostaddr=$SERVERHOSTADDR host=common-name.pg-ssltest.test";
 
 # Without the CRL, succeeds. With it, fails.
-test_connect_ok("sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca");
-test_connect_fails(
-"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl"
-);
+test_connect_ok($common_connstr,
+				"sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca",
+				"connects without client-side CRL");
+test_connect_fails($common_connstr,
+				   "sslrootcert=ssl/root+server_ca.crt sslmode=verify-ca sslcrl=ssl/root+server.crl",
+				   qr/SSL error/,
+				   "does not connect with client-side CRL");
 
 ### Part 2. Server-side tests.
 ###
 ### Test certificate authorization.
 
-note "testing certificate authorization";
+note "running server tests";
+
 $common_connstr =
 "sslrootcert=ssl/root+server_ca.crt sslmode=require dbname=certdb hostaddr=$SERVERHOSTADDR";
 
 # no client cert
-test_connect_fails("user=ssltestuser sslcert=invalid");
+test_connect_fails($common_connstr,
+				   "user=ssltestuser sslcert=invalid",
+				   qr/connection requires a valid client certificate/,
+				   "certificate authorization fails without client cert");
 
 # correct client cert
-test_connect_ok(
-	"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key");
+test_connect_ok($common_connstr,
+				"user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+				"certificate authorization succeeds with correct client cert");
+
+# client key with wrong permissions
+test_connect_fails($common_connstr,
+				   "user=ssltestuser sslcert=ssl/client.crt sslkey=ssl/client_wrongperms_tmp.key",
+				   qr!\Qprivate key file "ssl/client_wrongperms_tmp.key" has group or world access\E!,
+				   "certificate authorization fails because of file permissions");
 
 # client cert belonging to another user
-test_connect_fails(
-	"user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key");
+test_connect_fails($common_connstr,
+				   "user=anotheruser sslcert=ssl/client.crt sslkey=ssl/client_tmp.key",
+				   qr/certificate authentication failed for user "anotheruser"/,
+				   "certificate authorization fails with client cert belonging to another user");
 
 # revoked client cert
-test_connect_fails(
-"user=ssltestuser sslcert=ssl/client-revoked.crt sslkey=ssl/client-revoked.key"
-);
+test_connect_fails($common_connstr,
+				   "user=ssltestuser sslcert=ssl/client-revoked.crt sslkey=ssl/client-revoked_tmp.key",
+				   qr/SSL error/,
+				   "certificate authorization fails with revoked client cert");
 
 # intermediate client_ca.crt is provided by client, and isn't in server's ssl_ca_file
 switch_server_cert($node, 'server-cn-only', 'root_ca');
 $common_connstr =
 "user=ssltestuser dbname=certdb sslkey=ssl/client_tmp.key sslrootcert=ssl/root+server_ca.crt hostaddr=$SERVERHOSTADDR";
 
-test_connect_ok("sslmode=require sslcert=ssl/client+client_ca.crt");
-test_connect_fails("sslmode=require sslcert=ssl/client.crt");
+test_connect_ok($common_connstr,
+				"sslmode=require sslcert=ssl/client+client_ca.crt",
+				"intermediate client certificate is provided by client");
+test_connect_fails($common_connstr, "sslmode=require sslcert=ssl/client.crt",
+				   qr/SSL error/,
+				   "intermediate client certificate is missing");
 
 # clean up
-unlink "ssl/client_tmp.key";
+unlink("ssl/client_tmp.key",
+	   "ssl/client_wrongperms_tmp.key",
+	   "ssl/client-revoked_tmp.key");
diff --git a/src/test/ssl/t/002_scram.pl b/src/test/ssl/t/002_scram.pl
new file mode 100644
index 0000000000..9460763a65
--- /dev/null
+++ b/src/test/ssl/t/002_scram.pl
@@ -0,0 +1,68 @@
+# Test SCRAM authentication and TLS channel binding types
+
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 6;
+use ServerSetup;
+use File::Copy;
+
+# This is the hostname used to connect to the server.
+my $SERVERHOSTADDR = '127.0.0.1';
+
+# Determine whether build supports tls-server-end-point.
+my $supports_tls_server_end_point =
+	check_pg_config("#define HAVE_X509_GET_SIGNATURE_NID 1");
+
+# Allocation of base connection string shared among multiple tests.
+my $common_connstr;
+
+# Set up the server.
+
+note "setting up data directory";
+my $node = get_new_node('master');
+$node->init;
+
+# PGHOST is enforced here to set up the node, subsequent connections
+# will use a dedicated connection string.
+$ENV{PGHOST} = $node->host;
+$ENV{PGPORT} = $node->port;
+$node->start;
+
+# Configure server for SSL connections, with password handling.
+configure_test_server_for_ssl($node, $SERVERHOSTADDR, "scram-sha-256",
+							  "pass", "scram-sha-256");
+switch_server_cert($node, 'server-cn-only');
+$ENV{PGPASSWORD} = "pass";
+$common_connstr =
+"user=ssltestuser dbname=trustdb sslmode=require hostaddr=$SERVERHOSTADDR";
+
+# Default settings
+test_connect_ok($common_connstr, '',
+				"SCRAM authentication with default channel binding");
+
+# Channel binding settings
+test_connect_ok($common_connstr,
+	"scram_channel_binding=tls-unique",
+	"SCRAM authentication with tls-unique as channel binding");
+test_connect_ok($common_connstr,
+	"scram_channel_binding=''",
+				"SCRAM authentication without channel binding");
+if ($supports_tls_server_end_point)
+{
+	test_connect_ok($common_connstr,
+					"scram_channel_binding=tls-server-end-point",
+					"SCRAM authentication with tls-server-end-point as channel binding");
+}
+else
+{
+	test_connect_fails($common_connstr,
+					"scram_channel_binding=tls-server-end-point",
+					qr/unsupported SCRAM channel-binding type/,
+					"SCRAM authentication with tls-server-end-point as channel binding");
+}
+test_connect_fails($common_connstr,
+	"scram_channel_binding=not-exists",
+	qr/unsupported SCRAM channel-binding type/,
+	"SCRAM authentication with invalid channel binding");
diff --git a/src/test/subscription/Makefile b/src/test/subscription/Makefile
index d423ff3662..0f3d2098ad 100644
--- a/src/test/subscription/Makefile
+++ b/src/test/subscription/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/test/subscription
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/test/subscription/Makefile
@@ -18,5 +18,8 @@ EXTRA_INSTALL = contrib/hstore
 check:
 	$(prove_check)
 
+installcheck:
+	$(prove_installcheck)
+
 clean distclean maintainer-clean:
 	rm -rf tmp_check
diff --git a/src/test/subscription/README b/src/test/subscription/README
index e9e93755b7..1d50dcceed 100644
--- a/src/test/subscription/README
+++ b/src/test/subscription/README
@@ -10,7 +10,12 @@ Running the tests
 
     make check
 
-NOTE: This creates a temporary installation, and some tests may
-create one or multiple nodes, for the purpose of the tests.
+or
+
+    make installcheck
+
+NOTE: This creates a temporary installation (in the case of "check"),
+and some tests may create one or multiple nodes, for the purpose of
+the tests.
 
 NOTE: This requires the --enable-tap-tests argument to configure.
diff --git a/src/test/subscription/t/001_rep_changes.pl b/src/test/subscription/t/001_rep_changes.pl
index 0136c79d4b..e0104cd8d0 100644
--- a/src/test/subscription/t/001_rep_changes.pl
+++ b/src/test/subscription/t/001_rep_changes.pl
@@ -60,11 +60,7 @@
 "CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub, tap_pub_ins_only"
 );
 
-# Wait for subscriber to finish initialization
-my $caughtup_query =
-"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Also wait for initial table sync to finish
 my $synced_query =
@@ -93,8 +89,7 @@
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_mixed VALUES (2, 'bar')");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $result = $node_subscriber->safe_psql('postgres',
 	"SELECT count(*), min(a), max(a) FROM tab_ins");
@@ -132,9 +127,7 @@
 $node_publisher->safe_psql('postgres',
 	"UPDATE tab_full2 SET x = 'bb' WHERE x = 'b'");
 
-# Wait for subscription to catch up
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $result = $node_subscriber->safe_psql('postgres',
 	"SELECT count(*), min(a), max(a) FROM tab_full");
@@ -176,8 +169,7 @@
 	"INSERT INTO tab_ins SELECT generate_series(1001,1100)");
 $node_publisher->safe_psql('postgres', "DELETE FROM tab_rep");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $result = $node_subscriber->safe_psql('postgres',
 	"SELECT count(*), min(a), max(a) FROM tab_ins");
@@ -200,8 +192,7 @@
 );
 $node_publisher->safe_psql('postgres', "INSERT INTO tab_full VALUES(0)");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # note that data are different on provider and subscriber
 $result = $node_subscriber->safe_psql('postgres',
diff --git a/src/test/subscription/t/002_types.pl b/src/test/subscription/t/002_types.pl
index 3ca027ecb4..80620416fa 100644
--- a/src/test/subscription/t/002_types.pl
+++ b/src/test/subscription/t/002_types.pl
@@ -106,11 +106,7 @@
 "CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub WITH (slot_name = tap_sub_slot)"
 );
 
-# Wait for subscriber to finish initialization
-my $caughtup_query =
-"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Wait for initial sync to finish as well
 my $synced_query =
@@ -246,8 +242,7 @@
 		(4, '"yellow horse"=>"moaned"');
 ));
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Check the data on subscriber
 my $result = $node_subscriber->safe_psql(
@@ -368,8 +363,7 @@
 	UPDATE tst_hstore SET b = '"also"=>"updated"' WHERE a = 3;
 ));
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Check the data on subscriber
 $result = $node_subscriber->safe_psql(
@@ -489,8 +483,7 @@
 	DELETE FROM tst_hstore WHERE a = 1;
 ));
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Check the data on subscriber
 $result = $node_subscriber->safe_psql(
diff --git a/src/test/subscription/t/003_constraints.pl b/src/test/subscription/t/003_constraints.pl
index 06863aef84..6f6805b952 100644
--- a/src/test/subscription/t/003_constraints.pl
+++ b/src/test/subscription/t/003_constraints.pl
@@ -39,19 +39,14 @@
 "CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub WITH (copy_data = false)"
 );
 
-# Wait for subscriber to finish initialization
-my $caughtup_query =
-"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_fk (bid) VALUES (1);");
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_fk_ref (id, bid) VALUES (1, 1);");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Check data on subscriber
 my $result = $node_subscriber->safe_psql('postgres',
@@ -69,8 +64,7 @@
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_fk_ref (id, bid) VALUES (2, 2);");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # FK is not enforced on subscriber
 $result = $node_subscriber->safe_psql('postgres',
@@ -104,8 +98,7 @@ BEGIN
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_fk_ref (id, bid) VALUES (10, 10);");
 
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # The row should be skipped on subscriber
 $result = $node_subscriber->safe_psql('postgres',
diff --git a/src/test/subscription/t/004_sync.pl b/src/test/subscription/t/004_sync.pl
index 05fd2f0e6c..a9a223bdf7 100644
--- a/src/test/subscription/t/004_sync.pl
+++ b/src/test/subscription/t/004_sync.pl
@@ -37,11 +37,7 @@
 "CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub"
 );
 
-# Wait for subscriber to finish initialization
-my $caughtup_query =
-"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';";
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 # Also wait for initial table sync to finish
 my $synced_query =
@@ -124,9 +120,7 @@
 $node_publisher->safe_psql('postgres',
 	"CREATE TABLE tab_rep_next (a) AS SELECT generate_series(1,10)");
 
-# Wait for subscription to catch up
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $result = $node_subscriber->safe_psql('postgres',
 	"SELECT count(*) FROM tab_rep_next");
@@ -149,9 +143,7 @@
 $node_publisher->safe_psql('postgres',
 	"INSERT INTO tab_rep_next SELECT generate_series(1,10)");
 
-# Wait for subscription to catch up
-$node_publisher->poll_query_until('postgres', $caughtup_query)
-  or die "Timed out while waiting for subscriber to catch up";
+$node_publisher->wait_for_catchup($appname);
 
 $result = $node_subscriber->safe_psql('postgres',
 	"SELECT count(*) FROM tab_rep_next");
diff --git a/src/test/subscription/t/005_encoding.pl b/src/test/subscription/t/005_encoding.pl
index 26a40c0b7f..65439f1b28 100644
--- a/src/test/subscription/t/005_encoding.pl
+++ b/src/test/subscription/t/005_encoding.pl
@@ -5,15 +5,6 @@
 use TestLib;
 use Test::More tests => 1;
 
-sub wait_for_caught_up
-{
-	my ($node, $appname) = @_;
-
-	$node->poll_query_until('postgres',
-"SELECT pg_current_wal_lsn() <= replay_lsn FROM pg_stat_replication WHERE application_name = '$appname';"
-	) or die "Timed out while waiting for subscriber to catch up";
-}
-
 my $node_publisher = get_new_node('publisher');
 $node_publisher->init(
 	allows_streaming => 'logical',
@@ -39,12 +30,18 @@ sub wait_for_caught_up
 "CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
 );
 
-wait_for_caught_up($node_publisher, $appname);
+$node_publisher->wait_for_catchup($appname);
+
+# Wait for initial sync to finish as well
+my $synced_query =
+	"SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('s', 'r');";
+$node_subscriber->poll_query_until('postgres', $synced_query)
+  or die "Timed out while waiting for subscriber to synchronize data";
 
 $node_publisher->safe_psql('postgres',
 	q{INSERT INTO test1 VALUES (1, E'Mot\xc3\xb6rhead')}); # hand-rolled UTF-8
 
-wait_for_caught_up($node_publisher, $appname);
+$node_publisher->wait_for_catchup($appname);
 
 is( $node_subscriber->safe_psql(
 		'postgres', q{SELECT a FROM test1 WHERE b = E'Mot\xf6rhead'}
diff --git a/src/test/subscription/t/006_rewrite.pl b/src/test/subscription/t/006_rewrite.pl
new file mode 100644
index 0000000000..aa1184c85f
--- /dev/null
+++ b/src/test/subscription/t/006_rewrite.pl
@@ -0,0 +1,64 @@
+# Test logical replication behavior with heap rewrites
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 2;
+
+my $node_publisher = get_new_node('publisher');
+$node_publisher->init(allows_streaming => 'logical');
+$node_publisher->start;
+
+my $node_subscriber = get_new_node('subscriber');
+$node_subscriber->init(allows_streaming => 'logical');
+$node_subscriber->start;
+
+my $ddl = "CREATE TABLE test1 (a int, b text);";
+$node_publisher->safe_psql('postgres', $ddl);
+$node_subscriber->safe_psql('postgres', $ddl);
+
+my $publisher_connstr = $node_publisher->connstr . ' dbname=postgres';
+my $appname           = 'encoding_test';
+
+$node_publisher->safe_psql('postgres',
+	"CREATE PUBLICATION mypub FOR ALL TABLES;");
+$node_subscriber->safe_psql('postgres',
+"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
+);
+
+$node_publisher->wait_for_catchup($appname);
+
+# Wait for initial sync to finish as well
+my $synced_query =
+    "SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('s', 'r');";
+$node_subscriber->poll_query_until('postgres', $synced_query)
+  or die "Timed out while waiting for subscriber to synchronize data";
+
+$node_publisher->safe_psql('postgres', q{INSERT INTO test1 (a, b) VALUES (1, 'one'), (2, 'two');});
+
+$node_publisher->wait_for_catchup($appname);
+
+is($node_subscriber->safe_psql('postgres', q{SELECT a, b FROM test1}),
+   qq(1|one
+2|two),
+   'initial data replicated to subscriber');
+
+# DDL that causes a heap rewrite
+my $ddl2 = "ALTER TABLE test1 ADD c int NOT NULL DEFAULT 0;";
+$node_subscriber->safe_psql('postgres', $ddl2);
+$node_publisher->safe_psql('postgres', $ddl2);
+
+$node_publisher->wait_for_catchup($appname);
+
+$node_publisher->safe_psql('postgres', q{INSERT INTO test1 (a, b, c) VALUES (3, 'three', 33);});
+
+$node_publisher->wait_for_catchup($appname);
+
+is($node_subscriber->safe_psql('postgres', q{SELECT a, b, c FROM test1}),
+   qq(1|one|0
+2|two|0
+3|three|33),
+   'data replicated to subscriber');
+
+$node_subscriber->stop;
+$node_publisher->stop;
diff --git a/src/test/subscription/t/007_ddl.pl b/src/test/subscription/t/007_ddl.pl
new file mode 100644
index 0000000000..b219bf33dd
--- /dev/null
+++ b/src/test/subscription/t/007_ddl.pl
@@ -0,0 +1,42 @@
+# Test some logical replication DDL behavior
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 1;
+
+my $node_publisher = get_new_node('publisher');
+$node_publisher->init(allows_streaming => 'logical');
+$node_publisher->start;
+
+my $node_subscriber = get_new_node('subscriber');
+$node_subscriber->init(allows_streaming => 'logical');
+$node_subscriber->start;
+
+my $ddl = "CREATE TABLE test1 (a int, b text);";
+$node_publisher->safe_psql('postgres', $ddl);
+$node_subscriber->safe_psql('postgres', $ddl);
+
+my $publisher_connstr = $node_publisher->connstr . ' dbname=postgres';
+my $appname           = 'replication_test';
+
+$node_publisher->safe_psql('postgres',
+	"CREATE PUBLICATION mypub FOR ALL TABLES;");
+$node_subscriber->safe_psql('postgres',
+"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
+);
+
+$node_publisher->wait_for_catchup($appname);
+
+$node_subscriber->safe_psql('postgres', q{
+BEGIN;
+ALTER SUBSCRIPTION mysub DISABLE;
+ALTER SUBSCRIPTION mysub SET (slot_name = NONE);
+DROP SUBSCRIPTION mysub;
+COMMIT;
+});
+
+pass "subscription disable and drop in same transaction did not hang";
+
+$node_subscriber->stop;
+$node_publisher->stop;
diff --git a/src/test/subscription/t/008_diff_schema.pl b/src/test/subscription/t/008_diff_schema.pl
new file mode 100644
index 0000000000..d4849c89a3
--- /dev/null
+++ b/src/test/subscription/t/008_diff_schema.pl
@@ -0,0 +1,81 @@
+# Test behavior with different schema on subscriber
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 4;
+
+# Create publisher node
+my $node_publisher = get_new_node('publisher');
+$node_publisher->init(allows_streaming => 'logical');
+$node_publisher->start;
+
+# Create subscriber node
+my $node_subscriber = get_new_node('subscriber');
+$node_subscriber->init(allows_streaming => 'logical');
+$node_subscriber->start;
+
+# Create some preexisting content on publisher
+$node_publisher->safe_psql('postgres',
+	"CREATE TABLE test_tab (a int primary key, b varchar)");
+$node_publisher->safe_psql('postgres',
+	"INSERT INTO test_tab VALUES (1, 'foo'), (2, 'bar')");
+
+# Setup structure on subscriber
+$node_subscriber->safe_psql('postgres', "CREATE TABLE test_tab (a int primary key, b text, c timestamptz DEFAULT now(), d bigint DEFAULT 999, e int GENERATED BY DEFAULT AS IDENTITY)");
+
+# Setup logical replication
+my $publisher_connstr = $node_publisher->connstr . ' dbname=postgres';
+$node_publisher->safe_psql('postgres', "CREATE PUBLICATION tap_pub FOR TABLE test_tab");
+
+my $appname = 'tap_sub';
+$node_subscriber->safe_psql('postgres',
+"CREATE SUBSCRIPTION tap_sub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION tap_pub"
+);
+
+$node_publisher->wait_for_catchup($appname);
+
+# Also wait for initial table sync to finish
+my $synced_query =
+"SELECT count(1) = 0 FROM pg_subscription_rel WHERE srsubstate NOT IN ('r', 's');";
+$node_subscriber->poll_query_until('postgres', $synced_query)
+  or die "Timed out while waiting for subscriber to synchronize data";
+
+my $result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*), count(c), count(d = 999) FROM test_tab");
+is($result, qq(2|2|2), 'check initial data was copied to subscriber');
+
+# Update the rows on the publisher and check the additional columns on
+# subscriber didn't change
+$node_publisher->safe_psql('postgres', "UPDATE test_tab SET b = md5(b)");
+
+$node_publisher->wait_for_catchup($appname);
+
+$result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*), count(c), count(d = 999), count(e) FROM test_tab");
+is($result, qq(2|2|2|2), 'check extra columns contain local defaults after copy');
+
+# Change the local values of the extra columns on the subscriber,
+# update publisher, and check that subscriber retains the expected
+# values
+$node_subscriber->safe_psql('postgres', "UPDATE test_tab SET c = 'epoch'::timestamptz + 987654321 * interval '1s'");
+$node_publisher->safe_psql('postgres', "UPDATE test_tab SET b = md5(a::text)");
+
+$node_publisher->wait_for_catchup($appname);
+
+$result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*), count(extract(epoch from c) = 987654321), count(d = 999) FROM test_tab");
+is($result, qq(2|2|2), 'check extra columns contain locally changed data');
+
+# Another insert
+$node_publisher->safe_psql('postgres',
+	"INSERT INTO test_tab VALUES (3, 'baz')");
+
+$node_publisher->wait_for_catchup($appname);
+
+$result =
+  $node_subscriber->safe_psql('postgres', "SELECT count(*), count(c), count(d = 999), count(e) FROM test_tab");
+is($result, qq(3|3|3|3), 'check extra columns contain local defaults after apply');
+
+$node_subscriber->stop;
+$node_publisher->stop;
diff --git a/src/test/subscription/t/009_matviews.pl b/src/test/subscription/t/009_matviews.pl
new file mode 100644
index 0000000000..c55c62c95d
--- /dev/null
+++ b/src/test/subscription/t/009_matviews.pl
@@ -0,0 +1,45 @@
+# Test materialized views behavior
+use strict;
+use warnings;
+use PostgresNode;
+use TestLib;
+use Test::More tests => 1;
+
+my $node_publisher = get_new_node('publisher');
+$node_publisher->init(allows_streaming => 'logical');
+$node_publisher->start;
+
+my $node_subscriber = get_new_node('subscriber');
+$node_subscriber->init(allows_streaming => 'logical');
+$node_subscriber->start;
+
+my $publisher_connstr = $node_publisher->connstr . ' dbname=postgres';
+my $appname           = 'replication_test';
+
+$node_publisher->safe_psql('postgres',
+	"CREATE PUBLICATION mypub FOR ALL TABLES;");
+$node_subscriber->safe_psql('postgres',
+"CREATE SUBSCRIPTION mysub CONNECTION '$publisher_connstr application_name=$appname' PUBLICATION mypub;"
+);
+
+$node_publisher->safe_psql('postgres', q{CREATE TABLE test1 (a int PRIMARY KEY, b text)});
+$node_publisher->safe_psql('postgres', q{INSERT INTO test1 (a, b) VALUES (1, 'one'), (2, 'two');});
+
+$node_subscriber->safe_psql('postgres', q{CREATE TABLE test1 (a int PRIMARY KEY, b text);});
+
+$node_publisher->wait_for_catchup($appname);
+
+# Materialized views are not supported by logical replication, but
+# logical decoding does produce change information for them, so we
+# need to make sure they are properly ignored. (bug #15044)
+
+# create a MV with some data
+$node_publisher->safe_psql('postgres', q{CREATE MATERIALIZED VIEW testmv1 AS SELECT * FROM test1;});
+$node_publisher->wait_for_catchup($appname);
+# There is no equivalent relation on the subscriber, but MV data is
+# not replicated, so this does not hang.
+
+pass "materialized view data not replicated";
+
+$node_subscriber->stop;
+$node_publisher->stop;
diff --git a/src/test/thread/Makefile b/src/test/thread/Makefile
index 66c22691ae..bf2b07be56 100644
--- a/src/test/thread/Makefile
+++ b/src/test/thread/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for tools/thread
 #
-# Copyright (c) 2003-2017, PostgreSQL Global Development Group
+# Copyright (c) 2003-2018, PostgreSQL Global Development Group
 #
 # src/test/thread/Makefile
 #
diff --git a/src/test/thread/thread_test.c b/src/test/thread/thread_test.c
index 32ce80e57f..381607324d 100644
--- a/src/test/thread/thread_test.c
+++ b/src/test/thread/thread_test.c
@@ -3,7 +3,7 @@
  * test_thread_funcs.c
  *		libc thread test program
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
  *	src/test/thread/thread_test.c
@@ -22,19 +22,6 @@
 
 #if !defined(IN_CONFIGURE) && !defined(WIN32)
 #include "postgres.h"
-#else
-/* From src/include/c.h" */
-#ifndef bool
-typedef char bool;
-#endif
-
-#ifndef true
-#define true	((bool) 1)
-#endif
-
-#ifndef false
-#define false	((bool) 0)
-#endif
 #endif
 
 #include <stdio.h>
@@ -93,23 +80,23 @@ static volatile int errno2_set = 0;
 #ifndef HAVE_STRERROR_R
 static char *strerror_p1;
 static char *strerror_p2;
-static bool strerror_threadsafe = false;
+static int	strerror_threadsafe = 0;
 #endif
 
 #if !defined(WIN32) && !defined(HAVE_GETPWUID_R)
 static struct passwd *passwd_p1;
 static struct passwd *passwd_p2;
-static bool getpwuid_threadsafe = false;
+static int	getpwuid_threadsafe = 0;
 #endif
 
 #if !defined(HAVE_GETADDRINFO) && !defined(HAVE_GETHOSTBYNAME_R)
 static struct hostent *hostent_p1;
 static struct hostent *hostent_p2;
 static char myhostname[MAXHOSTNAMELEN];
-static bool gethostbyname_threadsafe = false;
+static int	gethostbyname_threadsafe = 0;
 #endif
 
-static bool platform_is_threadsafe = true;
+static int	platform_is_threadsafe = 1;
 
 int
 main(int argc, char *argv[])
@@ -187,17 +174,17 @@ main(int argc, char *argv[])
 
 #ifndef HAVE_STRERROR_R
 	if (strerror_p1 != strerror_p2)
-		strerror_threadsafe = true;
+		strerror_threadsafe = 1;
 #endif
 
 #if !defined(WIN32) && !defined(HAVE_GETPWUID_R)
 	if (passwd_p1 != passwd_p2)
-		getpwuid_threadsafe = true;
+		getpwuid_threadsafe = 1;
 #endif
 
 #if !defined(HAVE_GETADDRINFO) && !defined(HAVE_GETHOSTBYNAME_R)
 	if (hostent_p1 != hostent_p2)
-		gethostbyname_threadsafe = true;
+		gethostbyname_threadsafe = 1;
 #endif
 
 	/* close down threads */
@@ -218,7 +205,7 @@ main(int argc, char *argv[])
 	else
 	{
 		printf("not thread-safe. **\n");
-		platform_is_threadsafe = false;
+		platform_is_threadsafe = 0;
 	}
 #endif
 
@@ -233,7 +220,7 @@ main(int argc, char *argv[])
 	else
 	{
 		printf("not thread-safe. **\n");
-		platform_is_threadsafe = false;
+		platform_is_threadsafe = 0;
 	}
 #endif
 
@@ -249,7 +236,7 @@ main(int argc, char *argv[])
 	else
 	{
 		printf("not thread-safe. **\n");
-		platform_is_threadsafe = false;
+		platform_is_threadsafe = 0;
 	}
 #endif
 
diff --git a/src/timezone/CMakeLists.txt b/src/timezone/CMakeLists.txt
index 0441276988..88080f85d2 100644
--- a/src/timezone/CMakeLists.txt
+++ b/src/timezone/CMakeLists.txt
@@ -1,33 +1,11 @@
-#TODO compile timezones
-
 include_directories(
 	"${PROJECT_SOURCE_DIR}/src/include/libpq"
 	"${PROJECT_SOURCE_DIR}/src/interfaces/libpq"
 	"${PROJECT_SOURCE_DIR}/src/bin/pg_dump"
 )
 
-
-
-set(tzdata 
-	${CMAKE_CURRENT_SOURCE_DIR}/data/africa
-	${CMAKE_CURRENT_SOURCE_DIR}/data/antarctica
-	${CMAKE_CURRENT_SOURCE_DIR}/data/asia
-	${CMAKE_CURRENT_SOURCE_DIR}/data/australasia
-	${CMAKE_CURRENT_SOURCE_DIR}/data/europe
-	${CMAKE_CURRENT_SOURCE_DIR}/data/northamerica
-	${CMAKE_CURRENT_SOURCE_DIR}/data/southamerica
-	${CMAKE_CURRENT_SOURCE_DIR}/data/pacificnew
-	${CMAKE_CURRENT_SOURCE_DIR}/data/etcetera
-	${CMAKE_CURRENT_SOURCE_DIR}/data/factory
-	${CMAKE_CURRENT_SOURCE_DIR}/data/backward
-	${CMAKE_CURRENT_SOURCE_DIR}/data/systemv
-)
-
-add_executable(zic
-	zic.c
-)
-target_link_libraries(zic
-	pgport
+set(tzdata_files
+	${CMAKE_CURRENT_SOURCE_DIR}/data/tzdata.zi
 )
 
 if(MSVC)
@@ -39,8 +17,7 @@ if(MSVC)
 	endforeach( OUTPUTCONFIG CMAKE_CONFIGURATION_TYPES )
 endif(MSVC)
 
-
-install(FILES 
+install(FILES
 	tznames/Africa.txt
 	tznames/America.txt
 	tznames/Antarctica.txt
@@ -56,26 +33,26 @@ install(FILES
 	tznames/India
 DESTINATION ${PGSHAREDIR}/timezonesets)
 
-function(JOIN VALUES GLUE OUTPUT)
-  string (REGEX REPLACE "([^\\]|^);" "\\1${GLUE}" _TMP_STR "${VALUES}")
-  string (REGEX REPLACE "[\\](.)" "\\1" _TMP_STR "${_TMP_STR}") #fixes escaping
-  set (${OUTPUT} "${_TMP_STR}" PARENT_SCOPE)
-endfunction()
-
-if(MINGW)
-	string(SUBSTRING ${PGSHAREDIR} 1 1 CHAR_POS)
-	if(CHAR_POS STREQUAL ":")
-		string(SUBSTRING ${PGSHAREDIR} 2 -1 PGSHAREDIR_ZIC)
+if(WITH_SYSTEM_TZDATA)
+	add_compile_options(-DSYSTEMTZDIR="${WITH_SYSTEM_TZDATA}")
+else()
+	if(MINGW)
+		string(SUBSTRING ${PGSHAREDIR} 1 1 CHAR_POS)
+		if(CHAR_POS STREQUAL ":")
+			string(SUBSTRING ${PGSHAREDIR} 2 -1 PGSHAREDIR_ZIC)
+		else()
+			set(PGSHAREDIR_ZIC ${PGSHAREDIR})
+		endif()
 	else()
 		set(PGSHAREDIR_ZIC ${PGSHAREDIR})
 	endif()
-else()
-	set(PGSHAREDIR_ZIC ${PGSHAREDIR})
-endif()
 
-JOIN("${tzdata}" " " tzdata_string)
-install(
-	CODE "message('${CMAKE_CURRENT_BINARY_DIR}/zic${CMAKE_EXECUTABLE_SUFFIX} \$ENV{DESTDIR}${PGSHAREDIR_ZIC}/timezone -p US/Eastern ${tzdata_string}')"
-	CODE "execute_process(COMMAND ${CMAKE_CURRENT_BINARY_DIR}/zic${CMAKE_EXECUTABLE_SUFFIX} -d \"\$ENV{DESTDIR}${PGSHAREDIR_ZIC}/timezone\" -p \"US/Eastern\" ${tzdata_string})"
-)
+	add_executable(zic zic.c)
+	target_link_libraries(zic pgport)
+
+	set(ZIC ${CMAKE_CURRENT_BINARY_DIR}/zic${CMAKE_EXECUTABLE_SUFFIX})
+	set(POSIXRULES "US/Eastern")
 
+	install(CODE "execute_process(COMMAND ${ZIC} -d ${CMAKE_CURRENT_BINARY_DIR}/timezone -p ${POSIXRULES} ${tzdata_files})")
+	install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/timezone DESTINATION ${PGSHAREDIR_ZIC})
+endif()
diff --git a/src/timezone/Makefile b/src/timezone/Makefile
index bed5727f53..87493da8b3 100644
--- a/src/timezone/Makefile
+++ b/src/timezone/Makefile
@@ -21,10 +21,8 @@ OBJS= localtime.o strftime.o pgtz.o
 # files needed to build zic utility program
 ZICOBJS= zic.o $(WIN32RES)
 
-# timezone data files
-TZDATA = africa antarctica asia australasia europe northamerica southamerica \
-	pacificnew etcetera factory backward systemv
-TZDATAFILES = $(TZDATA:%=$(srcdir)/data/%)
+# we now distribute the timezone data as a single file
+TZDATAFILES = $(srcdir)/data/tzdata.zi
 
 # which zone should determine the DST rules (not the specific UTC offset!)
 # for POSIX-style timezone specs
diff --git a/src/timezone/README b/src/timezone/README
index 912e0c1b39..7b5573183d 100644
--- a/src/timezone/README
+++ b/src/timezone/README
@@ -2,10 +2,12 @@ src/timezone/README
 
 This is a PostgreSQL adapted version of the IANA timezone library from
 
-	http://www.iana.org/time-zones
+	https://www.iana.org/time-zones
 
-The latest versions of both the tzdata and tzcode tarballs are normally
-available right from that page.  Historical versions can be found
+The latest version of the timezone data and library source code is
+available right from that page.  It's best to get the merged file
+tzdb-NNNNX.tar.lz, since the other archive formats omit tzdata.zi.
+Historical versions, as well as release announcements, can be found
 elsewhere on the site.
 
 Since time zone rules change frequently in some parts of the world,
@@ -17,11 +19,14 @@ changes that might affect interpretation of the data files.
 Time Zone data
 ==============
 
-The data files under data/ are an exact copy of the latest tzdata set,
-except that we omit some files that are not of interest for our purposes.
+We distribute the time zone source data as-is under src/timezone/data/.
+Currently, we distribute just the abbreviated single-file format
+"tzdata.zi", to reduce the size of our tarballs as well as churn
+in our git repo.  Feeding that file to zic produces the same compiled
+output as feeding the bulkier individual data files would do.
 
-While the files under data/ can just be duplicated when updating, manual
-effort is needed to update the time zone abbreviation lists under tznames/.
+While data/tzdata.zi can just be duplicated when updating, manual effort
+is needed to update the time zone abbreviation lists under tznames/.
 These need to be changed whenever new abbreviations are invented or the
 UTC offset associated with an existing abbreviation changes.  To detect
 if this has happened, after installing new files under data/ do
@@ -50,7 +55,7 @@ match properly on the old version.
 Time Zone code
 ==============
 
-The code in this directory is currently synced with tzcode release 2017b.
+The code in this directory is currently synced with tzcode release 2017c.
 There are many cosmetic (and not so cosmetic) differences from the
 original tzcode library, but diffs in the upstream version should usually
 be propagated to our version.  Here are some notes about that.
diff --git a/src/timezone/data/africa b/src/timezone/data/africa
deleted file mode 100644
index dcc20b9b1c..0000000000
--- a/src/timezone/data/africa
+++ /dev/null
@@ -1,1192 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (2017-02-20):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# Another source occasionally used is Edward W. Whitman, World Time Differences,
-# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
-# I found in the UCLA library.
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
-#
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
-# European-style abbreviations are commonly used along the Mediterranean.
-# For sub-Saharan Africa abbreviations were less standardized.
-# Previous editions of this database used WAT, CAT, SAT, and EAT
-# for UT +00 through +03, respectively,
-# but in 1997 Mark R V Murray reported that
-# 'SAST' is the official abbreviation for +02 in the country of South Africa,
-# 'CAT' is commonly used for +02 in countries north of South Africa, and
-# 'WAT' is probably the best name for +01, as the common phrase for
-# the area that includes Nigeria is "West Africa".
-#
-# To summarize, the following abbreviations seemed to have some currency:
-#	 +00	GMT	Greenwich Mean Time
-#	 +02	CAT	Central Africa Time
-#	 +02	SAST	South Africa Standard Time
-# and Murray suggested the following abbreviation:
-#	 +01	WAT	West Africa Time
-# Murray's suggestion seems to have caught on in news reports and the like.
-# I vaguely recall 'WAT' also being used for -01 in the past but
-# cannot now come up with solid citations.
-#
-# I invented the following abbreviations; corrections are welcome!
-#	 +02	WAST	West Africa Summer Time
-#	 +03	CAST	Central Africa Summer Time (no longer used)
-#	 +03	SAST	South Africa Summer Time (no longer used)
-#	 +03	EAT	East Africa Time
-# 'EAT' also seems to have caught on; the others are rare but are paired
-# with better-attested non-DST abbreviations.
-
-# Algeria
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Algeria	1916	only	-	Jun	14	23:00s	1:00	S
-Rule	Algeria	1916	1919	-	Oct	Sun>=1	23:00s	0	-
-Rule	Algeria	1917	only	-	Mar	24	23:00s	1:00	S
-Rule	Algeria	1918	only	-	Mar	 9	23:00s	1:00	S
-Rule	Algeria	1919	only	-	Mar	 1	23:00s	1:00	S
-Rule	Algeria	1920	only	-	Feb	14	23:00s	1:00	S
-Rule	Algeria	1920	only	-	Oct	23	23:00s	0	-
-Rule	Algeria	1921	only	-	Mar	14	23:00s	1:00	S
-Rule	Algeria	1921	only	-	Jun	21	23:00s	0	-
-Rule	Algeria	1939	only	-	Sep	11	23:00s	1:00	S
-Rule	Algeria	1939	only	-	Nov	19	 1:00	0	-
-Rule	Algeria	1944	1945	-	Apr	Mon>=1	 2:00	1:00	S
-Rule	Algeria	1944	only	-	Oct	 8	 2:00	0	-
-Rule	Algeria	1945	only	-	Sep	16	 1:00	0	-
-Rule	Algeria	1971	only	-	Apr	25	23:00s	1:00	S
-Rule	Algeria	1971	only	-	Sep	26	23:00s	0	-
-Rule	Algeria	1977	only	-	May	 6	 0:00	1:00	S
-Rule	Algeria	1977	only	-	Oct	21	 0:00	0	-
-Rule	Algeria	1978	only	-	Mar	24	 1:00	1:00	S
-Rule	Algeria	1978	only	-	Sep	22	 3:00	0	-
-Rule	Algeria	1980	only	-	Apr	25	 0:00	1:00	S
-Rule	Algeria	1980	only	-	Oct	31	 2:00	0	-
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
-# more precise 0:09:21.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Algiers	0:12:12 -	LMT	1891 Mar 15  0:01
-			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
-			0:00	Algeria	WE%sT	1940 Feb 25  2:00
-			1:00	Algeria	CE%sT	1946 Oct  7
-			0:00	-	WET	1956 Jan 29
-			1:00	-	CET	1963 Apr 14
-			0:00	Algeria	WE%sT	1977 Oct 21
-			1:00	Algeria	CE%sT	1979 Oct 26
-			0:00	Algeria	WE%sT	1981 May
-			1:00	-	CET
-
-# Angola
-# Benin
-# See Africa/Lagos.
-
-# Botswana
-# See Africa/Maputo.
-
-# Burkina Faso
-# See Africa/Abidjan.
-
-# Burundi
-# See Africa/Maputo.
-
-# Cameroon
-# See Africa/Lagos.
-
-# Cape Verde / Cabo Verde
-#
-# Shanks gives 1907 for the transition to +02.
-# Perhaps the 1911-05-26 Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# merely made it official?
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Cape_Verde -1:34:04 -	LMT	1907        # Praia
-			-2:00	-	-02	1942 Sep
-			-2:00	1:00	-01	1945 Oct 15
-			-2:00	-	-02	1975 Nov 25  2:00
-			-1:00	-	-01
-
-# Central African Republic
-# See Africa/Lagos.
-
-# Chad
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Ndjamena	1:00:12 -	LMT	1912        # N'Djamena
-			1:00	-	WAT	1979 Oct 14
-			1:00	1:00	WAST	1980 Mar  8
-			1:00	-	WAT
-
-# Comoros
-# See Africa/Nairobi.
-
-# Democratic Republic of the Congo
-# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
-
-# Republic of the Congo
-# See Africa/Lagos.
-
-# Côte d'Ivoire / Ivory Coast
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Abidjan	-0:16:08 -	LMT	1912
-			 0:00	-	GMT
-Link Africa/Abidjan Africa/Bamako	# Mali
-Link Africa/Abidjan Africa/Banjul	# Gambia
-Link Africa/Abidjan Africa/Conakry	# Guinea
-Link Africa/Abidjan Africa/Dakar	# Senegal
-Link Africa/Abidjan Africa/Freetown	# Sierra Leone
-Link Africa/Abidjan Africa/Lome		# Togo
-Link Africa/Abidjan Africa/Nouakchott	# Mauritania
-Link Africa/Abidjan Africa/Ouagadougou	# Burkina Faso
-Link Africa/Abidjan Africa/Sao_Tome	# São Tomé and Príncipe
-Link Africa/Abidjan Atlantic/St_Helena	# St Helena
-
-# Djibouti
-# See Africa/Nairobi.
-
-###############################################################################
-
-# Egypt
-
-# Milne says Cairo used 2:05:08.9, the local mean time of the Abbasizeh
-# observatory; round to nearest.  Milne also says that the official time for
-# Egypt was mean noon at the Great Pyramid, 2:04:30.5, but apparently this
-# did not apply to Cairo, Alexandria, or Port Said.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Egypt	1940	only	-	Jul	15	0:00	1:00	S
-Rule	Egypt	1940	only	-	Oct	 1	0:00	0	-
-Rule	Egypt	1941	only	-	Apr	15	0:00	1:00	S
-Rule	Egypt	1941	only	-	Sep	16	0:00	0	-
-Rule	Egypt	1942	1944	-	Apr	 1	0:00	1:00	S
-Rule	Egypt	1942	only	-	Oct	27	0:00	0	-
-Rule	Egypt	1943	1945	-	Nov	 1	0:00	0	-
-Rule	Egypt	1945	only	-	Apr	16	0:00	1:00	S
-Rule	Egypt	1957	only	-	May	10	0:00	1:00	S
-Rule	Egypt	1957	1958	-	Oct	 1	0:00	0	-
-Rule	Egypt	1958	only	-	May	 1	0:00	1:00	S
-Rule	Egypt	1959	1981	-	May	 1	1:00	1:00	S
-Rule	Egypt	1959	1965	-	Sep	30	3:00	0	-
-Rule	Egypt	1966	1994	-	Oct	 1	3:00	0	-
-Rule	Egypt	1982	only	-	Jul	25	1:00	1:00	S
-Rule	Egypt	1983	only	-	Jul	12	1:00	1:00	S
-Rule	Egypt	1984	1988	-	May	 1	1:00	1:00	S
-Rule	Egypt	1989	only	-	May	 6	1:00	1:00	S
-Rule	Egypt	1990	1994	-	May	 1	1:00	1:00	S
-# IATA (after 1990) says transitions are at 0:00.
-# Go with IATA starting in 1995, except correct 1995 entry from 09-30 to 09-29.
-
-# From Alexander Krivenyshev (2011-04-20):
-# "...Egypt's interim cabinet decided on Wednesday to cancel daylight
-# saving time after a poll posted on its website showed the majority of
-# Egyptians would approve the cancellation."
-#
-# Egypt to cancel daylight saving time
-# http://www.almasryalyoum.com/en/node/407168
-# or
-# http://www.worldtimezone.com/dst_news/dst_news_egypt04.html
-Rule	Egypt	1995	2010	-	Apr	lastFri	 0:00s	1:00	S
-Rule	Egypt	1995	2005	-	Sep	lastThu	24:00	0	-
-# From Steffen Thorsen (2006-09-19):
-# The Egyptian Gazette, issue 41,090 (2006-09-18), page 1, reports:
-# Egypt will turn back clocks by one hour at the midnight of Thursday
-# after observing the daylight saving time since May.
-# http://news.gom.com.eg/gazette/pdf/2006/09/18/01.pdf
-Rule	Egypt	2006	only	-	Sep	21	24:00	0	-
-# From Dirk Losch (2007-08-14):
-# I received a mail from an airline which says that the daylight
-# saving time in Egypt will end in the night of 2007-09-06 to 2007-09-07.
-# From Jesper Nørgaard Welen (2007-08-15): [The following agree:]
-# http://www.nentjes.info/Bill/bill5.htm
-# http://www.timeanddate.com/worldclock/city.html?n=53
-# From Steffen Thorsen (2007-09-04): The official information...:
-# http://www.sis.gov.eg/En/EgyptOnline/Miscellaneous/000002/0207000000000000001580.htm
-Rule	Egypt	2007	only	-	Sep	Thu>=1	24:00	0	-
-# From Abdelrahman Hassan (2007-09-06):
-# Due to the Hijri (lunar Islamic calendar) year being 11 days shorter
-# than the year of the Gregorian calendar, Ramadan shifts earlier each
-# year. This year it will be observed September 13 (September is quite
-# hot in Egypt), and the idea is to make fasting easier for workers by
-# shifting business hours one hour out of daytime heat. Consequently,
-# unless discontinued, next DST may end Thursday 28 August 2008.
-# From Paul Eggert (2007-08-17):
-# For lack of better info, assume the new rule is last Thursday in August.
-
-# From Petr Machata (2009-04-06):
-# The following appeared in Red Hat bugzilla[1] (edited):
-#
-# > $ zdump -v /usr/share/zoneinfo/Africa/Cairo | grep 2009
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 21:59:59 2009 UTC = Thu =
-# Apr 23
-# > 23:59:59 2009 EET isdst=0 gmtoff=7200
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Apr 23 22:00:00 2009 UTC = Fri =
-# Apr 24
-# > 01:00:00 2009 EEST isdst=1 gmtoff=10800
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 20:59:59 2009 UTC = Thu =
-# Aug 27
-# > 23:59:59 2009 EEST isdst=1 gmtoff=10800
-# > /usr/share/zoneinfo/Africa/Cairo  Thu Aug 27 21:00:00 2009 UTC = Thu =
-# Aug 27
-# > 23:00:00 2009 EET isdst=0 gmtoff=7200
-#
-# > end date should be Thu Sep 24 2009 (Last Thursday in September at 23:59=
-# :59)
-# > http://support.microsoft.com/kb/958729/
-#
-# timeanddate[2] and another site I've found[3] also support that.
-#
-# [1] https://bugzilla.redhat.com/show_bug.cgi?id=492263
-# [2] http://www.timeanddate.com/worldclock/clockchange.html?n=53
-# [3] http://wwp.greenwichmeantime.com/time-zone/africa/egypt/
-
-# From Arthur David Olson (2009-04-20):
-# In 2009 (and for the next several years), Ramadan ends before the fourth
-# Thursday in September; Egypt is expected to revert to the last Thursday
-# in September.
-
-# From Steffen Thorsen (2009-08-11):
-# We have been able to confirm the August change with the Egyptian Cabinet
-# Information and Decision Support Center:
-# http://www.timeanddate.com/news/time/egypt-dst-ends-2009.html
-#
-# The Middle East News Agency
-# http://www.mena.org.eg/index.aspx
-# also reports "Egypt starts winter time on August 21"
-# today in article numbered "71, 11/08/2009 12:25 GMT."
-# Only the title above is available without a subscription to their service,
-# and can be found by searching for "winter" in their search engine
-# (at least today).
-
-# From Alexander Krivenyshev (2010-07-20):
-# According to News from Egypt - Al-Masry Al-Youm Egypt's cabinet has
-# decided that Daylight Saving Time will not be used in Egypt during
-# Ramadan.
-#
-# Arabic translation:
-# "Clocks to go back during Ramadan - and then forward again"
-# http://www.almasryalyoum.com/en/news/clocks-go-back-during-ramadan-and-then-forward-again
-# http://www.worldtimezone.com/dst_news/dst_news_egypt02.html
-
-# From Ahmad El-Dardiry (2014-05-07):
-# Egypt is to change back to Daylight system on May 15
-# http://english.ahram.org.eg/NewsContent/1/64/100735/Egypt/Politics-/Egypts-government-to-reapply-daylight-saving-time-.aspx
-
-# From Gunther Vermier (2014-05-13):
-# our Egypt office confirms that the change will be at 15 May "midnight" (24:00)
-
-# From Imed Chihi (2014-06-04):
-# We have finally "located" a precise official reference about the DST changes
-# in Egypt.  The Ministers Cabinet decision is explained at
-# http://www.cabinet.gov.eg/Media/CabinetMeetingsDetails.aspx?id=347 ...
-# [T]his (Arabic) site is not accessible outside Egypt, but the page ...
-# translates into: "With regard to daylight saving time, it is scheduled to
-# take effect at exactly twelve o'clock this evening, Thursday, 15 MAY 2014,
-# to be suspended by twelve o'clock on the evening of Thursday, 26 JUN 2014,
-# and re-established again at the end of the month of Ramadan, at twelve
-# o'clock on the evening of Thursday, 31 JUL 2014."  This statement has been
-# reproduced by other (more accessible) sites[, e.g.,]...
-# http://elgornal.net/news/news.aspx?id=4699258
-
-# From Paul Eggert (2014-06-04):
-# Sarah El Deeb and Lee Keath of AP report that the Egyptian government says
-# the change is because of blackouts in Cairo, even though Ahram Online (cited
-# above) says DST had no affect on electricity consumption.  There is
-# no information about when DST will end this fall.  See:
-# http://abcnews.go.com/International/wireStory/el-sissi-pushes-egyptians-line-23614833
-
-# From Steffen Thorsen (2015-04-08):
-# Egypt will start DST on midnight after Thursday, April 30, 2015.
-# This is based on a law (no 35) from May 15, 2014 saying it starts the last
-# Thursday of April....  Clocks will still be turned back for Ramadan, but
-# dates not yet announced....
-# http://almogaz.com/news/weird-news/2015/04/05/1947105 ...
-# http://www.timeanddate.com/news/time/egypt-starts-dst-2015.html
-
-# From Ahmed Nazmy (2015-04-20):
-# Egypt's ministers cabinet just announced ... that it will cancel DST at
-# least for 2015.
-#
-# From Tim Parenti (2015-04-20):
-# http://english.ahram.org.eg/WriterArticles/NewsContentP/1/128195/Egypt/No-daylight-saving-this-summer-Egypts-prime-minist.aspx
-# "Egypt's cabinet agreed on Monday not to switch clocks for daylight saving
-# time this summer, and carry out studies on the possibility of canceling the
-# practice altogether in future years."
-#
-# From Paul Eggert (2015-04-24):
-# Yesterday the office of Egyptian President El-Sisi announced his
-# decision to abandon DST permanently.  See Ahram Online 2015-04-24.
-# http://english.ahram.org.eg/NewsContent/1/64/128509/Egypt/Politics-/Sisi-cancels-daylight-saving-time-in-Egypt.aspx
-
-# From Steffen Thorsen (2016-04-29):
-# Egypt will have DST from July 7 until the end of October....
-# http://english.ahram.org.eg/NewsContentP/1/204655/Egypt/Daylight-savings-time-returning-to-Egypt-on--July.aspx
-# From Mina Samuel (2016-07-04):
-# Egyptian government took the decision to cancel the DST,
-
-Rule	Egypt	2008	only	-	Aug	lastThu	24:00	0	-
-Rule	Egypt	2009	only	-	Aug	20	24:00	0	-
-Rule	Egypt	2010	only	-	Aug	10	24:00	0	-
-Rule	Egypt	2010	only	-	Sep	 9	24:00	1:00	S
-Rule	Egypt	2010	only	-	Sep	lastThu	24:00	0	-
-Rule	Egypt	2014	only	-	May	15	24:00	1:00	S
-Rule	Egypt	2014	only	-	Jun	26	24:00	0	-
-Rule	Egypt	2014	only	-	Jul	31	24:00	1:00	S
-Rule	Egypt	2014	only	-	Sep	lastThu	24:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Cairo	2:05:09 -	LMT	1900 Oct
-			2:00	Egypt	EE%sT
-
-# Equatorial Guinea
-# See Africa/Lagos.
-
-# Eritrea
-# Ethiopia
-# See Africa/Nairobi.
-
-# Gabon
-# See Africa/Lagos.
-
-# Gambia
-# See Africa/Abidjan.
-
-# Ghana
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman says DST was observed from 1931 to "the present";
-# Shanks & Pottenger say 1936 to 1942;
-# and September 1 to January 1 is given by:
-# Scott Keltie J, Epstein M (eds), The Statesman's Year-Book,
-# 57th ed. Macmillan, London (1920), OCLC 609408015, pp xxviii.
-# For lack of better info, assume DST was observed from 1920 to 1942.
-Rule	Ghana	1920	1942	-	Sep	 1	0:00	0:20	GHST
-Rule	Ghana	1920	1942	-	Dec	31	0:00	0	GMT
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Accra	-0:00:52 -	LMT	1918
-			 0:00	Ghana	GMT/+0020
-
-# Guinea
-# See Africa/Abidjan.
-
-# Guinea-Bissau
-#
-# Shanks gives 1911-05-26 for the transition to WAT,
-# evidently confusing the date of the Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# with the date that it took effect, namely 1912-01-01.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Bissau	-1:02:20 -	LMT	1912 Jan  1
-			-1:00	-	-01	1975
-			 0:00	-	GMT
-
-# Kenya
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Nairobi	2:27:16	-	LMT	1928 Jul
-			3:00	-	EAT	1930
-			2:30	-	+0230	1940
-			2:45	-	+0245	1960
-			3:00	-	EAT
-Link Africa/Nairobi Africa/Addis_Ababa	 # Ethiopia
-Link Africa/Nairobi Africa/Asmara	 # Eritrea
-Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
-Link Africa/Nairobi Africa/Djibouti
-Link Africa/Nairobi Africa/Kampala	 # Uganda
-Link Africa/Nairobi Africa/Mogadishu	 # Somalia
-Link Africa/Nairobi Indian/Antananarivo	 # Madagascar
-Link Africa/Nairobi Indian/Comoro
-Link Africa/Nairobi Indian/Mayotte
-
-# Lesotho
-# See Africa/Johannesburg.
-
-# Liberia
-#
-# From Paul Eggert (2017-03-02):
-#
-# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30.
-#
-# In 1972 Liberia was the last country to switch from a UTC offset
-# that was not a multiple of 15 or 20 minutes.  The 1972 change was on
-# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of:
-# Presidential Papers: First year of the administration of
-# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
-# Monrovia: Executive Mansion.
-#
-# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
-# abbreviation "-004430" would be one byte over the POSIX limit.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Monrovia	-0:43:08 -	LMT	1882
-			-0:43:08 -	MMT	1919 Mar # Monrovia Mean Time
-			-0:44:30 -	MMT	1972 Jan 7 # approximately MMT
-			 0:00	-	GMT
-
-###############################################################################
-
-# Libya
-
-# From Even Scharning (2012-11-10):
-# Libya set their time one hour back at 02:00 on Saturday November 10.
-# http://www.libyaherald.com/2012/11/04/clocks-to-go-back-an-hour-on-saturday/
-# Here is an official source [in Arabic]: http://ls.ly/fb6Yc
-#
-# Steffen Thorsen forwarded a translation (2012-11-10) in
-# http://mm.icann.org/pipermail/tz/2012-November/018451.html
-#
-# From Tim Parenti (2012-11-11):
-# Treat the 2012-11-10 change as a zone change from UTC+2 to UTC+1.
-# The DST rules planned for 2013 and onward roughly mirror those of Europe
-# (either two days before them or five days after them, so as to fall on
-# lastFri instead of lastSun).
-
-# From Even Scharning (2013-10-25):
-# The scheduled end of DST in Libya on Friday, October 25, 2013 was
-# cancelled yesterday....
-# http://www.libyaherald.com/2013/10/24/correction-no-time-change-tomorrow/
-#
-# From Paul Eggert (2013-10-25):
-# For now, assume they're reverting to the pre-2012 rules of permanent UT +02.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Libya	1951	only	-	Oct	14	2:00	1:00	S
-Rule	Libya	1952	only	-	Jan	 1	0:00	0	-
-Rule	Libya	1953	only	-	Oct	 9	2:00	1:00	S
-Rule	Libya	1954	only	-	Jan	 1	0:00	0	-
-Rule	Libya	1955	only	-	Sep	30	0:00	1:00	S
-Rule	Libya	1956	only	-	Jan	 1	0:00	0	-
-Rule	Libya	1982	1984	-	Apr	 1	0:00	1:00	S
-Rule	Libya	1982	1985	-	Oct	 1	0:00	0	-
-Rule	Libya	1985	only	-	Apr	 6	0:00	1:00	S
-Rule	Libya	1986	only	-	Apr	 4	0:00	1:00	S
-Rule	Libya	1986	only	-	Oct	 3	0:00	0	-
-Rule	Libya	1987	1989	-	Apr	 1	0:00	1:00	S
-Rule	Libya	1987	1989	-	Oct	 1	0:00	0	-
-Rule	Libya	1997	only	-	Apr	 4	0:00	1:00	S
-Rule	Libya	1997	only	-	Oct	 4	0:00	0	-
-Rule	Libya	2013	only	-	Mar	lastFri	1:00	1:00	S
-Rule	Libya	2013	only	-	Oct	lastFri	2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Tripoli	0:52:44 -	LMT	1920
-			1:00	Libya	CE%sT	1959
-			2:00	-	EET	1982
-			1:00	Libya	CE%sT	1990 May  4
-# The 1996 and 1997 entries are from Shanks & Pottenger;
-# the IATA SSIM data entries contain some obvious errors.
-			2:00	-	EET	1996 Sep 30
-			1:00	Libya	CE%sT	1997 Oct  4
-			2:00	-	EET	2012 Nov 10  2:00
-			1:00	Libya	CE%sT	2013 Oct 25  2:00
-			2:00	-	EET
-
-# Madagascar
-# See Africa/Nairobi.
-
-# Malawi
-# See Africa/Maputo.
-
-# Mali
-# Mauritania
-# See Africa/Abidjan.
-
-# Mauritius
-
-# From Steffen Thorsen (2008-06-25):
-# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
-# basis....
-# It seems that Mauritius observed daylight saving time from 1982-10-10 to
-# 1983-03-20 as well, but that was not successful....
-# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
-
-# From Alex Krivenyshev (2008-06-25):
-# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
-
-# From Arthur David Olson (2008-06-30):
-# The www.timeanddate.com article cited by Steffen Thorsen notes that "A
-# final decision has yet to be made on the times that daylight saving
-# would begin and end on these dates." As a place holder, use midnight.
-
-# From Paul Eggert (2008-06-30):
-# Follow Thorsen on DST in 1982/1983, instead of Shanks & Pottenger.
-
-# From Steffen Thorsen (2008-07-10):
-# According to
-# http://www.lexpress.mu/display_article.php?news_id=111216
-# (in French), Mauritius will start and end their DST a few days earlier
-# than previously announced (2008-11-01 to 2009-03-31).  The new start
-# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
-# given, but it is probably at either 2 or 3 wall clock time).
-#
-# A little strange though, since the article says that they moved the date
-# to align itself with Europe and USA which also change time on that date,
-# but that means they have not paid attention to what happened in
-# USA/Canada last year (DST ends first Sunday in November). I also wonder
-# why that they end on a Friday, instead of aligning with Europe which
-# changes two days later.
-
-# From Alex Krivenyshev (2008-07-11):
-# Seems that English language article "The revival of daylight saving
-# time: Energy conservation?"- No. 16578 (07/11/2008) was originally
-# published on Monday, June 30, 2008...
-#
-# I guess that article in French "Le gouvernement avance l'introduction
-# de l'heure d'été" stating that DST in Mauritius starting on October 26
-# and ending on March 27, 2009 is the most recent one....
-# http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
-
-# From Riad M. Hossen Ally (2008-08-03):
-# The Government of Mauritius weblink
-# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
-# Cabinet Decision of July 18th, 2008 states as follows:
-#
-# 4. ...Cabinet has agreed to the introduction into the National Assembly
-# of the Time Bill which provides for the introduction of summer time in
-# Mauritius. The summer time period which will be of one hour ahead of
-# the standard time, will be aligned with that in Europe and the United
-# States of America. It will start at two o'clock in the morning on the
-# last Sunday of October and will end at two o'clock in the morning on
-# the last Sunday of March the following year. The summer time for the
-# year 2008-2009 will, therefore, be effective as from 26 October 2008
-# and end on 29 March 2009.
-
-# From Ed Maste (2008-10-07):
-# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
-# beginning / ending of summer time is 2 o'clock standard time in the
-# morning of the last Sunday of October / last Sunday of March.
-# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
-
-# From Steffen Thorsen (2009-06-05):
-# According to several sources, Mauritius will not continue to observe
-# DST the coming summer...
-#
-# Some sources, in French:
-# http://www.defimedia.info/news/946/Rashid-Beebeejaun-:-%C2%AB-L%E2%80%99heure-d%E2%80%99%C3%A9t%C3%A9-ne-sera-pas-appliqu%C3%A9e-cette-ann%C3%A9e-%C2%BB
-# http://lexpress.mu/Story/3398~Beebeejaun---Les-objectifs-d-%C3%A9conomie-d-%C3%A9nergie-de-l-heure-d-%C3%A9t%C3%A9-ont-%C3%A9t%C3%A9-atteints-
-#
-# Our wrap-up:
-# http://www.timeanddate.com/news/time/mauritius-dst-will-not-repeat.html
-
-# From Arthur David Olson (2009-07-11):
-# The "mauritius-dst-will-not-repeat" wrapup includes this:
-# "The trial ended on March 29, 2009, when the clocks moved back by one hour
-# at 2am (or 02:00) local time..."
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
-Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
-Rule Mauritius	2008	only	-	Oct	lastSun	2:00	1:00	S
-Rule Mauritius	2009	only	-	Mar	lastSun	2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
-			4:00 Mauritius	+04/+05
-# Agalega Is, Rodriguez
-# no information; probably like Indian/Mauritius
-
-# Mayotte
-# See Africa/Nairobi.
-
-# Morocco
-# See the 'europe' file for Spanish Morocco (Africa/Ceuta).
-
-# From Alex Krivenyshev (2008-05-09):
-# Here is an article that Morocco plan to introduce Daylight Saving Time between
-# 1 June, 2008 and 27 September, 2008.
-#
-# "... Morocco is to save energy by adjusting its clock during summer so it will
-# be one hour ahead of GMT between 1 June and 27 September, according to
-# Communication Minister and Government Spokesman, Khalid Naciri...."
-#
-# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
-# http://en.afrik.com/news11892.html
-
-# From Alex Krivenyshev (2008-05-09):
-# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe
-# Presse:
-# http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
-#
-# Morocco shifts to daylight time on June 1st through September 27, Govt.
-# spokesman.
-
-# From Patrice Scattolin (2008-05-09):
-# According to this article:
-# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
-# (and republished here: <http://www.actu.ma/heure-dete-comment_i127896_0.html>)
-# the changes occur at midnight:
-#
-# Saturday night May 31st at midnight (which in French is to be
-# interpreted as the night between Saturday and Sunday)
-# Sunday night the 28th at midnight
-#
-# Seeing that the 28th is Monday, I am guessing that she intends to say
-# the midnight of the 28th which is the midnight between Sunday and
-# Monday, which jives with other sources that say that it's inclusive
-# June 1st to Sept 27th.
-#
-# The decision was taken by decree *2-08-224 *but I can't find the decree
-# published on the web.
-#
-# It's also confirmed here:
-# http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
-# on a government portal as being between June 1st and Sept 27th (not yet
-# posted in English).
-#
-# The following Google query will generate many relevant hits:
-# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
-
-# From Steffen Thorsen (2008-08-27):
-# Morocco will change the clocks back on the midnight between August 31
-# and September 1. They originally planned to observe DST to near the end
-# of September:
-#
-# One article about it (in French):
-# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
-#
-# We have some further details posted here:
-# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
-
-# From Steffen Thorsen (2009-03-17):
-# Morocco will observe DST from 2009-06-01 00:00 to 2009-08-21 00:00 according
-# to many sources, such as
-# http://news.marweb.com/morocco/entertainment/morocco-daylight-saving.html
-# http://www.medi1sat.ma/fr/depeche.aspx?idp=2312
-# (French)
-#
-# Our summary:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2009.html
-
-# From Alexander Krivenyshev (2009-03-17):
-# Here is a link to official document from Royaume du Maroc Premier Ministre,
-# Ministère de la Modernisation des Secteurs Publics
-#
-# Under Article 1 of Royal Decree No. 455-67 of Act 23 safar 1387 (2 June 1967)
-# concerning the amendment of the legal time, the Ministry of Modernization of
-# Public Sectors announced that the official time in the Kingdom will be
-# advanced 60 minutes from Sunday 31 May 2009 at midnight.
-#
-# http://www.mmsp.gov.ma/francais/Actualites_fr/PDF_Actualites_Fr/HeureEte_FR.pdf
-# http://www.worldtimezone.com/dst_news/dst_news_morocco03.html
-
-# From Steffen Thorsen (2010-04-13):
-# Several news media in Morocco report that the Ministry of Modernization
-# of Public Sectors has announced that Morocco will have DST from
-# 2010-05-02 to 2010-08-08.
-#
-# Example:
-# http://www.lavieeco.com/actualites/4099-le-maroc-passera-a-l-heure-d-ete-gmt1-le-2-mai.html
-# (French)
-# Our page:
-# http://www.timeanddate.com/news/time/morocco-starts-dst-2010.html
-
-# From Dan Abitol (2011-03-30):
-# ...Rules for Africa/Casablanca are the following (24h format)
-# The 3rd April 2011 at 00:00:00, [it] will be 3rd April 01:00:00
-# The 31st July 2011 at 00:59:59, [it] will be 31st July 00:00:00
-# ...Official links of change in morocco
-# The change was broadcast on the FM Radio
-# I ve called ANRT (telecom regulations in Morocco) at
-# +212.537.71.84.00
-# http://www.anrt.net.ma/fr/
-# They said that
-# http://www.map.ma/fr/sections/accueil/l_heure_legale_au_ma/view
-# is the official publication to look at.
-# They said that the decision was already taken.
-#
-# More articles in the press
-# http://www.yabiladi.com/articles/details/5058/secret-l-heure-d-ete-maroc-leve.html
-# http://www.lematin.ma/Actualite/Express/Article.asp?id=148923
-# http://www.lavieeco.com/actualite/Le-Maroc-passe-sur-GMT%2B1-a-partir-de-dim
-
-# From Petr Machata (2011-03-30):
-# They have it written in English here:
-# http://www.map.ma/eng/sections/home/morocco_to_spring_fo/view
-#
-# It says there that "Morocco will resume its standard time on July 31,
-# 2011 at midnight." Now they don't say whether they mean midnight of
-# wall clock time (i.e. 11pm UTC), but that's what I would assume. It has
-# also been like that in the past.
-
-# From Alexander Krivenyshev (2012-03-09):
-# According to Infomédiaire web site from Morocco (infomediaire.ma),
-# on March 9, 2012, (in French) Heure légale:
-# Le Maroc adopte officiellement l'heure d'été
-# http://www.infomediaire.ma/news/maroc/heure-l%C3%A9gale-le-maroc-adopte-officiellement-lheure-d%C3%A9t%C3%A9
-# Governing Council adopted draft decree, that Morocco DST starts on
-# the last Sunday of March (March 25, 2012) and ends on
-# last Sunday of September (September 30, 2012)
-# except the month of Ramadan.
-# or (brief)
-# http://www.worldtimezone.com/dst_news/dst_news_morocco06.html
-
-# From Arthur David Olson (2012-03-10):
-# The infomediaire.ma source indicates that the system is to be in
-# effect every year. It gives 03H00 as the "fall back" time of day;
-# it lacks a "spring forward" time of day; assume 2:00 XXX.
-# Wait on specifying the Ramadan exception for details about
-# start date, start time of day, end date, and end time of day XXX.
-
-# From Christophe Tropamer (2012-03-16):
-# Seen Morocco change again:
-# http://www.le2uminutes.com/actualite.php
-# "...à partir du dernier dimanche d'avril et non fins mars,
-# comme annoncé précédemment."
-
-# From Milamber Space Network (2012-07-17):
-# The official return to GMT is announced by the Moroccan government:
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288 [in French]
-#
-# Google translation, lightly edited:
-# Back to the standard time of the Kingdom (GMT)
-# Pursuant to Decree No. 2-12-126 issued on 26 Jumada (I) 1433 (April 18,
-# 2012) and in accordance with the order of Mr. President of the
-# Government No. 3-47-12 issued on 24 Sha'ban (11 July 2012), the Ministry
-# of Public Service and Administration Modernization announces the return
-# of the legal time of the Kingdom (GMT) from Friday, July 20, 2012 until
-# Monday, August 20, 2012.  So the time will be delayed by 60 minutes from
-# 3:00 am Friday, July 20, 2012 and will again be advanced by 60 minutes
-# August 20, 2012 from 2:00 am.
-
-# From Paul Eggert (2013-03-06):
-# Morocco's daylight-saving transitions due to Ramadan seem to be
-# announced a bit in advance.  On 2012-07-11 the Moroccan government
-# announced that year's Ramadan daylight-saving transitions would be
-# 2012-07-20 and 2012-08-20; see
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=288
-
-# From Andrew Paprocki (2013-07-02):
-# Morocco announced that the year's Ramadan daylight-savings
-# transitions would be 2013-07-07 and 2013-08-10; see:
-# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10
-
-# From Steffen Thorsen (2013-09-28):
-# Morocco extends DST by one month, on very short notice, just 1 day
-# before it was going to end.  There is a new decree (2.13.781) for
-# this, where DST from now on goes from last Sunday of March at 02:00
-# to last Sunday of October at 03:00, similar to EU rules.  Official
-# source (French):
-# http://www.maroc.gov.ma/fr/actualites/lhoraire-dete-gmt1-maintenu-jusquau-27-octobre-2013
-# Another source (specifying the time for start and end in the decree):
-# http://www.lemag.ma/Heure-d-ete-au-Maroc-jusqu-au-27-octobre_a75620.html
-
-# From Sebastien Willemijns (2014-03-18):
-# http://www.afriquinfos.com/articles/2014/3/18/maroc-heure-dete-avancez-tous-horloges-247891.asp
-
-# From Milamber Space Network (2014-06-05):
-# The Moroccan government has recently announced that the country will return
-# to standard time at 03:00 on Saturday, June 28, 2014 local time....  DST
-# will resume again at 02:00 on Saturday, August 2, 2014....
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-
-# From Milamber (2015-06-08):
-# (Google Translation) The hour will thus be delayed 60 minutes
-# Sunday, June 14 at 3:00, the ministry said in a statement, adding
-# that the time will be advanced again 60 minutes Sunday, July 19,
-# 2015 at 2:00.  The move comes under 2.12.126 Decree of 26 Jumada I
-# 1433 (18 April 2012) and the decision of the Head of Government of
-# 16 N. 3-29-15 Chaaban 1435 (4 June 2015).
-# Source (french):
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
-#
-# From Milamber (2015-06-09):
-# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
-#
-# From Michael Deckers (2015-06-09):
-# [The gov.ma announcement] would (probably) make the switch on 2015-07-19 go
-# from 03:00 to 04:00 rather than from 02:00 to 03:00, as in the patch....
-# I think the patch is correct and the quoted text is wrong; the text in
-# <http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/> agrees
-# with the patch.
-
-# From Paul Eggert (2015-06-08):
-# For now, guess that later spring and fall transitions will use 2015's rules,
-# and guess that Morocco will switch to standard time at 03:00 the last
-# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
-# Ramadan.  To implement this, transition dates for 2016 through 2037 were
-# determined by running the following program under GNU Emacs 24.3, with the
-# results integrated by hand into the table below.
-# (let ((islamic-year 1437))
-#   (require 'cal-islam)
-#   (while (< islamic-year 1460)
-#     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
-#           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-#           (sunday 0))
-#       (while (/= sunday (mod (setq a (1- a)) 7)))
-#       (while (/= sunday (mod b 7))
-#         (setq b (1+ b)))
-#       (setq a (calendar-gregorian-from-absolute a))
-#       (setq b (calendar-gregorian-from-absolute b))
-#       (insert
-#        (format
-#         (concat "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 3:00\t0\t-\n"
-#                 "Rule\tMorocco\t%d\tonly\t-\t%s\t%2d\t 2:00\t1:00\tS\n")
-#         (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a))
-#         (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b)))))
-#     (setq islamic-year (+ 1 islamic-year))))
-
-# RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-
-Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
-Rule	Morocco	1939	only	-	Nov	19	 0:00	0	-
-Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	S
-Rule	Morocco	1945	only	-	Nov	18	 0:00	0	-
-Rule	Morocco	1950	only	-	Jun	11	 0:00	1:00	S
-Rule	Morocco	1950	only	-	Oct	29	 0:00	0	-
-Rule	Morocco	1967	only	-	Jun	 3	12:00	1:00	S
-Rule	Morocco	1967	only	-	Oct	 1	 0:00	0	-
-Rule	Morocco	1974	only	-	Jun	24	 0:00	1:00	S
-Rule	Morocco	1974	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	1976	1977	-	May	 1	 0:00	1:00	S
-Rule	Morocco	1976	only	-	Aug	 1	 0:00	0	-
-Rule	Morocco	1977	only	-	Sep	28	 0:00	0	-
-Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
-Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
-Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
-Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
-Rule	Morocco	2009	only	-	Jun	 1	 0:00	1:00	S
-Rule	Morocco	2009	only	-	Aug	21	 0:00	0	-
-Rule	Morocco	2010	only	-	May	 2	 0:00	1:00	S
-Rule	Morocco	2010	only	-	Aug	 8	 0:00	0	-
-Rule	Morocco	2011	only	-	Apr	 3	 0:00	1:00	S
-Rule	Morocco	2011	only	-	Jul	31	 0:00	0	-
-Rule	Morocco	2012	2013	-	Apr	lastSun	 2:00	1:00	S
-Rule	Morocco	2012	only	-	Jul	20	 3:00	0	-
-Rule	Morocco	2012	only	-	Aug	20	 2:00	1:00	S
-Rule	Morocco	2012	only	-	Sep	30	 3:00	0	-
-Rule	Morocco	2013	only	-	Jul	 7	 3:00	0	-
-Rule	Morocco	2013	only	-	Aug	10	 2:00	1:00	S
-Rule	Morocco	2013	max	-	Oct	lastSun	 3:00	0	-
-Rule	Morocco	2014	2021	-	Mar	lastSun	 2:00	1:00	S
-Rule	Morocco	2014	only	-	Jun	28	 3:00	0	-
-Rule	Morocco	2014	only	-	Aug	 2	 2:00	1:00	S
-Rule	Morocco	2015	only	-	Jun	14	 3:00	0	-
-Rule	Morocco	2015	only	-	Jul	19	 2:00	1:00	S
-Rule	Morocco	2016	only	-	Jun	 5	 3:00	0	-
-Rule	Morocco	2016	only	-	Jul	10	 2:00	1:00	S
-Rule	Morocco	2017	only	-	May	21	 3:00	0	-
-Rule	Morocco	2017	only	-	Jul	 2	 2:00	1:00	S
-Rule	Morocco	2018	only	-	May	13	 3:00	0	-
-Rule	Morocco	2018	only	-	Jun	17	 2:00	1:00	S
-Rule	Morocco	2019	only	-	May	 5	 3:00	0	-
-Rule	Morocco	2019	only	-	Jun	 9	 2:00	1:00	S
-Rule	Morocco	2020	only	-	Apr	19	 3:00	0	-
-Rule	Morocco	2020	only	-	May	24	 2:00	1:00	S
-Rule	Morocco	2021	only	-	Apr	11	 3:00	0	-
-Rule	Morocco	2021	only	-	May	16	 2:00	1:00	S
-Rule	Morocco	2022	only	-	May	 8	 2:00	1:00	S
-Rule	Morocco	2023	only	-	Apr	23	 2:00	1:00	S
-Rule	Morocco	2024	only	-	Apr	14	 2:00	1:00	S
-Rule	Morocco	2025	only	-	Apr	 6	 2:00	1:00	S
-Rule	Morocco	2026	max	-	Mar	lastSun	 2:00	1:00	S
-Rule	Morocco	2036	only	-	Oct	19	 3:00	0	-
-Rule	Morocco	2037	only	-	Oct	 4	 3:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
-			 0:00	Morocco	WE%sT	1984 Mar 16
-			 1:00	-	CET	1986
-			 0:00	Morocco	WE%sT
-
-# Western Sahara
-#
-# From Gwillim Law (2013-10-22):
-# A correspondent who is usually well informed about time zone matters
-# ... says that Western Sahara observes daylight saving time, just as
-# Morocco does.
-#
-# From Paul Eggert (2013-10-23):
-# Assume that this has been true since Western Sahara switched to GMT,
-# since most of it was then controlled by Morocco.
-
-Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan # El Aaiún
-			-1:00	-	-01	1976 Apr 14
-			 0:00	Morocco	WE%sT
-
-# Mozambique
-#
-# Shanks gives 1903-03-01 for the transition to CAT.
-# Perhaps the 1911-05-26 Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# merely made it official?
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Maputo	2:10:20 -	LMT	1903 Mar
-			2:00	-	CAT
-Link Africa/Maputo Africa/Blantyre	# Malawi
-Link Africa/Maputo Africa/Bujumbura	# Burundi
-Link Africa/Maputo Africa/Gaborone	# Botswana
-Link Africa/Maputo Africa/Harare	# Zimbabwe
-Link Africa/Maputo Africa/Kigali	# Rwanda
-Link Africa/Maputo Africa/Lubumbashi	# E Dem. Rep. of Congo
-Link Africa/Maputo Africa/Lusaka	# Zambia
-
-# Namibia
-# The 1994-04-03 transition is from Shanks & Pottenger.
-# Shanks & Pottenger report no DST after 1998-04; go with IATA.
-
-# From Petronella Sibeene (2007-03-30):
-# http://allafrica.com/stories/200703300178.html
-# While the entire country changes its time, Katima Mulilo and other
-# settlements in Caprivi unofficially will not because the sun there
-# rises and sets earlier compared to other regions.  Chief of
-# Forecasting Riaan van Zyl explained that the far eastern parts of
-# the country are close to 40 minutes earlier in sunrise than the rest
-# of the country.
-#
-# From Paul Eggert (2017-02-22):
-# Although the Zambezi Region (formerly known as Caprivi) informally
-# observes Botswana time, we have no details about historical practice.
-# In the meantime people there can use Africa/Gaborone.
-# See: Immanuel S. The Namibian. 2017-02-23.
-# http://www.namibian.com.na/51480/read/Time-change-divides-lawmakers
-
-# RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Namibia	1994	max	-	Sep	Sun>=1	2:00	1:00	S
-Rule	Namibia	1995	max	-	Apr	Sun>=1	2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Windhoek	1:08:24 -	LMT	1892 Feb 8
-			1:30	-	+0130	1903 Mar
-			2:00	-	SAST	1942 Sep 20  2:00
-			2:00	1:00	SAST	1943 Mar 21  2:00
-			2:00	-	SAST	1990 Mar 21 # independence
-			2:00	-	CAT	1994 Apr  3
-			1:00	Namibia	WA%sT
-
-# Niger
-# See Africa/Lagos.
-
-# Nigeria
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Lagos	0:13:36 -	LMT	1919 Sep
-			1:00	-	WAT
-Link Africa/Lagos Africa/Bangui	     # Central African Republic
-Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
-Link Africa/Lagos Africa/Douala	     # Cameroon
-Link Africa/Lagos Africa/Kinshasa    # Dem. Rep. of the Congo (west)
-Link Africa/Lagos Africa/Libreville  # Gabon
-Link Africa/Lagos Africa/Luanda	     # Angola
-Link Africa/Lagos Africa/Malabo	     # Equatorial Guinea
-Link Africa/Lagos Africa/Niamey	     # Niger
-Link Africa/Lagos Africa/Porto-Novo  # Benin
-
-# Réunion
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Reunion	3:41:52 -	LMT	1911 Jun # Saint-Denis
-			4:00	-	+04
-#
-# Crozet Islands also observes Réunion time; see the 'antarctica' file.
-#
-# Scattered Islands (Îles Éparses) administered from Réunion are as follows.
-# The following information about them is taken from
-# Îles Éparses (<http://www.outre-mer.gouv.fr/domtom/ile.htm>, 1997-07-22,
-# in French; no longer available as of 1999-08-17).
-# We have no info about their time zone histories.
-#
-# Bassas da India - uninhabited
-# Europa Island - inhabited from 1905 to 1910 by two families
-# Glorioso Is - inhabited until at least 1958
-# Juan de Nova - uninhabited
-# Tromelin - inhabited until at least 1958
-
-# Rwanda
-# See Africa/Maputo.
-
-# St Helena
-# See Africa/Abidjan.
-# The other parts of the St Helena territory are similar:
-#	Tristan da Cunha: on GMT, say Whitman and the CIA
-#	Ascension: on GMT, say the USNO (1995-12-21) and the CIA
-#	Gough (scientific station since 1955; sealers wintered previously):
-#		on GMT, says the CIA
-#	Inaccessible, Nightingale: uninhabited
-
-# São Tomé and Príncipe
-# Senegal
-# See Africa/Abidjan.
-
-# Seychelles
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Mahe	3:41:48 -	LMT	1906 Jun # Victoria
-			4:00	-	+04
-# From Paul Eggert (2001-05-30):
-# Aldabra, Farquhar, and Desroches, originally dependencies of the
-# Seychelles, were transferred to the British Indian Ocean Territory
-# in 1965 and returned to Seychelles control in 1976.  We don't know
-# whether this affected their time zone, so omit this for now.
-# Possibly the islands were uninhabited.
-
-# Sierra Leone
-# See Africa/Abidjan.
-
-# Somalia
-# See Africa/Nairobi.
-
-# South Africa
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	SA	1942	1943	-	Sep	Sun>=15	2:00	1:00	-
-Rule	SA	1943	1944	-	Mar	Sun>=15	2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Africa/Johannesburg 1:52:00 -	LMT	1892 Feb 8
-			1:30	-	SAST	1903 Mar
-			2:00	SA	SAST
-Link Africa/Johannesburg Africa/Maseru	   # Lesotho
-Link Africa/Johannesburg Africa/Mbabane    # Swaziland
-#
-# Marion and Prince Edward Is
-# scientific station since 1947
-# no information
-
-# Sudan
-#
-# From <http://www.sunanews.net/sn13jane.html>
-# Sudan News Agency (2000-01-13),
-# also reported by Michaël De Beukelaer-Dossche via Steffen Thorsen:
-# Clocks will be moved ahead for 60 minutes all over the Sudan as of noon
-# Saturday....  This was announced Thursday by Caretaker State Minister for
-# Manpower Abdul-Rahman Nur-Eddin.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Sudan	1970	only	-	May	 1	0:00	1:00	S
-Rule	Sudan	1970	1985	-	Oct	15	0:00	0	-
-Rule	Sudan	1971	only	-	Apr	30	0:00	1:00	S
-Rule	Sudan	1972	1985	-	Apr	lastSun	0:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Khartoum	2:10:08 -	LMT	1931
-			2:00	Sudan	CA%sT	2000 Jan 15 12:00
-			3:00	-	EAT
-
-# South Sudan
-Link Africa/Khartoum Africa/Juba
-
-# Swaziland
-# See Africa/Johannesburg.
-
-# Tanzania
-# See Africa/Nairobi.
-
-# Togo
-# See Africa/Abidjan.
-
-# Tunisia
-
-# From Gwillim Law (2005-04-30):
-# My correspondent, Risto Nykänen, has alerted me to another adoption of DST,
-# this time in Tunisia.  According to Yahoo France News
-# <http://fr.news.yahoo.com/050426/5/4dumk.html>, in a story attributed to AP
-# and dated 2005-04-26, "Tunisia has decided to advance its official time by
-# one hour, starting on Sunday, May 1.  Henceforth, Tunisian time will be
-# UTC+2 instead of UTC+1.  The change will take place at 23:00 UTC next
-# Saturday."  (My translation)
-#
-# From Oscar van Vlijmen (2005-05-02):
-# La Presse, the first national daily newspaper ...
-# http://www.lapresse.tn/archives/archives280405/actualites/lheure.html
-# ... DST for 2005: on: Sun May 1 0h standard time, off: Fri Sept. 30,
-# 1h standard time.
-#
-# From Atef Loukil (2006-03-28):
-# The daylight saving time will be the same each year:
-# Beginning      : the last Sunday of March at 02:00
-# Ending         : the last Sunday of October at 03:00 ...
-# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=1188&Itemid=50
-
-# From Steffen Thorsen (2009-03-16):
-# According to several news sources, Tunisia will not observe DST this year.
-# (Arabic)
-# http://www.elbashayer.com/?page=viewn&nid=42546
-# http://www.babnet.net/kiwidetail-15295.asp
-#
-# We have also confirmed this with the US embassy in Tunisia.
-# We have a wrap-up about this on the following page:
-# http://www.timeanddate.com/news/time/tunisia-cancels-dst-2009.html
-
-# From Alexander Krivenyshev (2009-03-17):
-# Here is a link to Tunis Afrique Presse News Agency
-#
-# Standard time to be kept the whole year long (tap.info.tn):
-#
-# (in English)
-# http://www.tap.info.tn/en/index.php?option=com_content&task=view&id=26813&Itemid=157
-#
-# (in Arabic)
-# http://www.tap.info.tn/ar/index.php?option=com_content&task=view&id=61240&Itemid=1
-
-# From Arthur David Olson (2009-03-18):
-# The Tunis Afrique Presse News Agency notice contains this: "This measure is
-# due to the fact that the fasting month of Ramadan coincides with the period
-# concerned by summer time.  Therefore, the standard time will be kept
-# unchanged the whole year long."  So foregoing DST seems to be an exception
-# (albeit one that may be repeated in the future).
-
-# From Alexander Krivenyshev (2010-03-27):
-# According to some news reports Tunis confirmed not to use DST in 2010
-#
-# (translation):
-# "The Tunisian government has decided to abandon DST, which was scheduled on
-# Sunday...
-# Tunisian authorities had suspended the DST for the first time last year also
-# coincided with the month of Ramadan..."
-#
-# (in Arabic)
-# http://www.moheet.com/show_news.aspx?nid=358861&pg=1
-# http://www.almadenahnews.com/newss/news.php?c=118&id=38036
-# http://www.worldtimezone.com/dst_news/dst_news_tunis02.html
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Tunisia	1939	only	-	Apr	15	23:00s	1:00	S
-Rule	Tunisia	1939	only	-	Nov	18	23:00s	0	-
-Rule	Tunisia	1940	only	-	Feb	25	23:00s	1:00	S
-Rule	Tunisia	1941	only	-	Oct	 6	 0:00	0	-
-Rule	Tunisia	1942	only	-	Mar	 9	 0:00	1:00	S
-Rule	Tunisia	1942	only	-	Nov	 2	 3:00	0	-
-Rule	Tunisia	1943	only	-	Mar	29	 2:00	1:00	S
-Rule	Tunisia	1943	only	-	Apr	17	 2:00	0	-
-Rule	Tunisia	1943	only	-	Apr	25	 2:00	1:00	S
-Rule	Tunisia	1943	only	-	Oct	 4	 2:00	0	-
-Rule	Tunisia	1944	1945	-	Apr	Mon>=1	 2:00	1:00	S
-Rule	Tunisia	1944	only	-	Oct	 8	 0:00	0	-
-Rule	Tunisia	1945	only	-	Sep	16	 0:00	0	-
-Rule	Tunisia	1977	only	-	Apr	30	 0:00s	1:00	S
-Rule	Tunisia	1977	only	-	Sep	24	 0:00s	0	-
-Rule	Tunisia	1978	only	-	May	 1	 0:00s	1:00	S
-Rule	Tunisia	1978	only	-	Oct	 1	 0:00s	0	-
-Rule	Tunisia	1988	only	-	Jun	 1	 0:00s	1:00	S
-Rule	Tunisia	1988	1990	-	Sep	lastSun	 0:00s	0	-
-Rule	Tunisia	1989	only	-	Mar	26	 0:00s	1:00	S
-Rule	Tunisia	1990	only	-	May	 1	 0:00s	1:00	S
-Rule	Tunisia	2005	only	-	May	 1	 0:00s	1:00	S
-Rule	Tunisia	2005	only	-	Sep	30	 1:00s	0	-
-Rule	Tunisia	2006	2008	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Tunisia	2006	2008	-	Oct	lastSun	 2:00s	0	-
-
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
-# more precise 0:09:21.
-# Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Africa/Tunis	0:40:44 -	LMT	1881 May 12
-			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
-			1:00	Tunisia	CE%sT
-
-# Uganda
-# See Africa/Nairobi.
-
-# Zambia
-# Zimbabwe
-# See Africa/Maputo.
diff --git a/src/timezone/data/antarctica b/src/timezone/data/antarctica
deleted file mode 100644
index 3332d66842..0000000000
--- a/src/timezone/data/antarctica
+++ /dev/null
@@ -1,340 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# From Paul Eggert (1999-11-15):
-# To keep things manageable, we list only locations occupied year-round; see
-# COMNAP - Stations and Bases
-# http://www.comnap.aq/comnap/comnap.nsf/P/Stations/
-# and
-# Summary of the Peri-Antarctic Islands (1998-07-23)
-# http://www.spri.cam.ac.uk/bob/periant.htm
-# for information.
-# Unless otherwise specified, we have no time zone information.
-
-# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
-
-# Argentina - year-round bases
-# Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
-# Carlini, Potter Cove, King George Island, -6414-0602320, since 1982-01
-# Esperanza, Hope Bay, -6323-05659, since 1952-12-17
-# Marambio, -6414-05637, since 1969-10-29
-# Orcadas, Laurie I, -6016-04444, since 1904-02-22
-# San Martín, Barry I, -6808-06706, since 1951-03-21
-#	(except 1960-03 / 1976-03-21)
-
-# Australia - territories
-# Heard Island, McDonald Islands (uninhabited)
-#	previously sealers and scientific personnel wintered
-#	Margaret Turner reports
-#	http://web.archive.org/web/20021204222245/http://www.dstc.qut.edu.au/DST/marg/daylight.html
-#	(1999-09-30) that they're UT +05, with no DST;
-#	presumably this is when they have visitors.
-#
-# year-round bases
-# Casey, Bailey Peninsula, -6617+11032, since 1969
-# Davis, Vestfold Hills, -6835+07759, since 1957-01-13
-#	(except 1964-11 - 1969-02)
-# Mawson, Holme Bay, -6736+06253, since 1954-02-13
-
-# From Steffen Thorsen (2009-03-11):
-# Three Australian stations in Antarctica have changed their time zone:
-# Casey moved from UTC+8 to UTC+11
-# Davis moved from UTC+7 to UTC+5
-# Mawson moved from UTC+6 to UTC+5
-# The changes occurred on 2009-10-18 at 02:00 (local times).
-#
-# Government source: (Australian Antarctic Division)
-# http://www.aad.gov.au/default.asp?casid=37079
-#
-# We have more background information here:
-# http://www.timeanddate.com/news/time/antarctica-new-times.html
-
-# From Steffen Thorsen (2010-03-10):
-# We got these changes from the Australian Antarctic Division: ...
-#
-# - Casey station reverted to its normal time of UTC+8 on 5 March 2010.
-# The change to UTC+11 is being considered as a regular summer thing but
-# has not been decided yet.
-#
-# - Davis station will revert to its normal time of UTC+7 at 10 March 2010
-# 20:00 UTC.
-#
-# - Mawson station stays on UTC+5.
-#
-# Background:
-# http://www.timeanddate.com/news/time/antartica-time-changes-2010.html
-
-# From Steffen Thorsen (2016-10-28):
-# Australian Antarctica Division informed us that Casey changed time
-# zone to UTC+11 in "the morning of 22nd October 2016".
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Casey	0	-	-00	1969
-			8:00	-	+08	2009 Oct 18  2:00
-			11:00	-	+11	2010 Mar  5  2:00
-			8:00	-	+08	2011 Oct 28  2:00
-			11:00	-	+11	2012 Feb 21 17:00u
-			8:00	-	+08	2016 Oct 22
-			11:00	-	+11
-Zone Antarctica/Davis	0	-	-00	1957 Jan 13
-			7:00	-	+07	1964 Nov
-			0	-	-00	1969 Feb
-			7:00	-	+07	2009 Oct 18  2:00
-			5:00	-	+05	2010 Mar 10 20:00u
-			7:00	-	+07	2011 Oct 28  2:00
-			5:00	-	+05	2012 Feb 21 20:00u
-			7:00	-	+07
-Zone Antarctica/Mawson	0	-	-00	1954 Feb 13
-			6:00	-	+06	2009 Oct 18  2:00
-			5:00	-	+05
-# References:
-# Casey Weather (1998-02-26)
-# http://www.antdiv.gov.au/aad/exop/sfo/casey/casey_aws.html
-# Davis Station, Antarctica (1998-02-26)
-# http://www.antdiv.gov.au/aad/exop/sfo/davis/video.html
-# Mawson Station, Antarctica (1998-02-25)
-# http://www.antdiv.gov.au/aad/exop/sfo/mawson/video.html
-
-# Belgium - year-round base
-# Princess Elisabeth, Queen Maud Land, -713412+0231200, since 2007
-
-# Brazil - year-round base
-# Ferraz, King George Island, -6205+05824, since 1983/4
-
-# Bulgaria - year-round base
-# St. Kliment Ohridski, Livingston Island, -623829-0602153, since 1988
-
-# Chile - year-round bases and towns
-# Escudero, South Shetland Is, -621157-0585735, since 1994
-# Frei Montalva, King George Island, -6214-05848, since 1969-03-07
-# O'Higgins, Antarctic Peninsula, -6319-05704, since 1948-02
-# Prat, -6230-05941
-# Villa Las Estrellas (a town), around the Frei base, since 1984-04-09
-# These locations employ Region of Magallanes time; use
-# TZ='America/Punta_Arenas'.
-
-# China - year-round bases
-# Great Wall, King George Island, -6213-05858, since 1985-02-20
-# Zhongshan, Larsemann Hills, Prydz Bay, -6922+07623, since 1989-02-26
-
-# France - year-round bases (also see "France & Italy")
-#
-# From Antoine Leca (1997-01-20):
-# Time data entries are from Nicole Pailleau at the IFRTP
-# (French Institute for Polar Research and Technology).
-# She confirms that French Southern Territories and Terre Adélie bases
-# don't observe daylight saving time, even if Terre Adélie supplies came
-# from Tasmania.
-#
-# French Southern Territories with year-round inhabitants
-#
-# Alfred Faure, Possession Island, Crozet Islands, -462551+0515152, since 1964;
-#	sealing & whaling stations operated variously 1802/1911+;
-#	see Indian/Reunion.
-#
-# Martin-de-Viviès, Amsterdam Island, -374105+0773155, since 1950
-# Port-aux-Français, Kerguelen Islands, -492110+0701303, since 1951;
-#	whaling & sealing station operated 1908/1914, 1920/1929, and 1951/1956
-#
-# St Paul Island - near Amsterdam, uninhabited
-#	fishing stations operated variously 1819/1931
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Kerguelen	0	-	-00	1950 # Port-aux-Français
-			5:00	-	+05
-#
-# year-round base in the main continent
-# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
-# <http://en.wikipedia.org/wiki/Dumont_d'Urville_Station> (2005-12-05)
-#
-# Another base at Port-Martin, 50km east, began operation in 1947.
-# It was destroyed by fire on 1952-01-14.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/DumontDUrville 0 -	-00	1947
-			10:00	-	+10	1952 Jan 14
-			0	-	-00	1956 Nov
-			10:00	-	+10
-
-# France & Italy - year-round base
-# Concordia, -750600+1232000, since 2005
-
-# Germany - year-round base
-# Neumayer III, -704080-0081602, since 2009
-
-# India - year-round bases
-# Bharati, -692428+0761114, since 2012
-# Maitri, -704558+0114356, since 1989
-
-# Italy - year-round base (also see "France & Italy")
-# Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
-
-# Japan - year-round bases
-# Syowa (also known as Showa), -690022+0393524, since 1957
-#
-# From Hideyuki Suzuki (1999-02-06):
-# In all Japanese stations, +0300 is used as the standard time.
-#
-# Syowa station, which is the first antarctic station of Japan,
-# was established on 1957-01-29.  Since Syowa station is still the main
-# station of Japan, it's appropriate for the principal location.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Syowa	0	-	-00	1957 Jan 29
-			3:00	-	+03
-# See:
-# NIPR Antarctic Research Activities (1999-08-17)
-# http://www.nipr.ac.jp/english/ara01.html
-
-# S Korea - year-round base
-# Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014
-# King Sejong, King George Island, -6213-05847, since 1988
-
-# New Zealand - claims
-# Balleny Islands (never inhabited)
-# Scott Island (never inhabited)
-#
-# year-round base
-# Scott Base, Ross Island, since 1957-01.
-# See Pacific/Auckland.
-
-# Norway - territories
-# Bouvet (never inhabited)
-#
-# claims
-# Peter I Island (never inhabited)
-#
-# year-round base
-# Troll, Queen Maud Land, -720041+0023206, since 2005-02-12
-#
-# From Paul-Inge Flakstad (2014-03-10):
-# I recently had a long dialog about this with the developer of timegenie.com.
-# In the absence of specific dates, he decided to choose some likely ones:
-#   GMT +1 - From March 1 to the last Sunday in March
-#   GMT +2 - From the last Sunday in March until the last Sunday in October
-#   GMT +1 - From the last Sunday in October until November 7
-#   GMT +0 - From November 7 until March 1
-# The dates for switching to and from UTC+0 will probably not be absolutely
-# correct, but they should be quite close to the actual dates.
-#
-# From Paul Eggert (2014-03-21):
-# The CET-switching Troll rules require zic from tz 2014b or later, so as
-# suggested by Bengt-Inge Larsson comment them out for now, and approximate
-# with only UTC and CEST.  Uncomment them when 2014b is more prevalent.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-#Rule	Troll	2005	max	-	Mar	 1	1:00u	1:00	+01
-Rule	Troll	2005	max	-	Mar	lastSun	1:00u	2:00	+02
-#Rule	Troll	2005	max	-	Oct	lastSun	1:00u	1:00	+01
-#Rule	Troll	2004	max	-	Nov	 7	1:00u	0:00	+00
-# Remove the following line when uncommenting the above '#Rule' lines.
-Rule	Troll	2004	max	-	Oct	lastSun	1:00u	0:00	+00
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Troll	0	-	-00	2005 Feb 12
-			0:00	Troll	%s
-
-# Poland - year-round base
-# Arctowski, King George Island, -620945-0582745, since 1977
-
-# Romania - year-bound base
-# Law-Racoviță, Larsemann Hills, -692319+0762251, since 1986
-
-# Russia - year-round bases
-# Bellingshausen, King George Island, -621159-0585337, since 1968-02-22
-# Mirny, Davis coast, -6633+09301, since 1956-02
-# Molodezhnaya, Alasheyev Bay, -6740+04551,
-#	year-round from 1962-02 to 1999-07-01
-# Novolazarevskaya, Queen Maud Land, -7046+01150,
-#	year-round from 1960/61 to 1992
-
-# Vostok, since 1957-12-16, temporarily closed 1994-02/1994-11
-# From Craig Mundell (1994-12-15):
-# http://quest.arc.nasa.gov/antarctica/QA/computers/Directions,Time,ZIP
-# Vostok, which is one of the Russian stations, is set on the same
-# time as Moscow, Russia.
-#
-# From Lee Hotz (2001-03-08):
-# I queried the folks at Columbia who spent the summer at Vostok and this is
-# what they had to say about time there:
-# "in the US Camp (East Camp) we have been on New Zealand (McMurdo)
-# time, which is 12 hours ahead of GMT. The Russian Station Vostok was
-# 6 hours behind that (although only 2 miles away, i.e. 6 hours ahead
-# of GMT). This is a time zone I think two hours east of Moscow. The
-# natural time zone is in between the two: 8 hours ahead of GMT."
-#
-# From Paul Eggert (2001-05-04):
-# This seems to be hopelessly confusing, so I asked Lee Hotz about it
-# in person.  He said that some Antarctic locations set their local
-# time so that noon is the warmest part of the day, and that this
-# changes during the year and does not necessarily correspond to mean
-# solar noon.  So the Vostok time might have been whatever the clocks
-# happened to be during their visit.  So we still don't really know what time
-# it is at Vostok.  But we'll guess +06.
-#
-Zone Antarctica/Vostok	0	-	-00	1957 Dec 16
-			6:00	-	+06
-
-# S Africa - year-round bases
-# Marion Island, -4653+03752
-# SANAE IV, Vesleskarvet, Queen Maud Land, -714022-0025026, since 1997
-
-# Ukraine - year-round base
-# Vernadsky (formerly Faraday), Galindez Island, -651445-0641526, since 1954
-
-# United Kingdom
-#
-# British Antarctic Territories (BAT) claims
-# South Orkney Islands
-#	scientific station from 1903
-#	whaling station at Signy I 1920/1926
-# South Shetland Islands
-#
-# year-round bases
-# Bird Island, South Georgia, -5400-03803, since 1983
-# Deception Island, -6259-06034, whaling station 1912/1931,
-#	scientific station 1943/1967,
-#	previously sealers and a scientific expedition wintered by accident,
-#	and a garrison was deployed briefly
-# Halley, Coates Land, -7535-02604, since 1956-01-06
-#	Halley is on a moving ice shelf and is periodically relocated
-#	so that it is never more than 10km from its nominal location.
-# Rothera, Adelaide Island, -6734-6808, since 1976-12-01
-#
-# From Paul Eggert (2002-10-22)
-# <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Rothera	0	-	-00	1976 Dec  1
-			-3:00	-	-03
-
-# Uruguay - year round base
-# Artigas, King George Island, -621104-0585107
-
-# USA - year-round bases
-#
-# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
-# See 'southamerica' for Antarctica/Palmer, since it uses South American DST.
-#
-# McMurdo Station, Ross Island, since 1955-12
-# Amundsen-Scott South Pole Station, continuously occupied since 1956-11-20
-#
-# From Chris Carrier (1996-06-27):
-# Siple, the first commander of the South Pole station,
-# stated that he would have liked to have kept GMT at the station,
-# but that he found it more convenient to keep GMT+12
-# as supplies for the station were coming from McMurdo Sound,
-# which was on GMT+12 because New Zealand was on GMT+12 all year
-# at that time (1957).  (Source: Siple's book 90 Degrees South.)
-#
-# From Susan Smith
-# http://www.cybertours.com/whs/pole10.html
-# (1995-11-13 16:24:56 +1300, no longer available):
-# We use the same time as McMurdo does.
-# And they use the same time as Christchurch, NZ does....
-# One last quirk about South Pole time.
-# All the electric clocks are usually wrong.
-# Something about the generators running at 60.1hertz or something
-# makes all of the clocks run fast.  So every couple of days,
-# we have to go around and set them back 5 minutes or so.
-# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
-#
-# See 'australasia' for Antarctica/McMurdo.
diff --git a/src/timezone/data/asia b/src/timezone/data/asia
deleted file mode 100644
index 35774c6d7e..0000000000
--- a/src/timezone/data/asia
+++ /dev/null
@@ -1,3084 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (2017-01-13):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# Another source occasionally used is Edward W. Whitman, World Time Differences,
-# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
-# I found in the UCLA library.
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
-#
-# For Russian data circa 1919, a source is:
-# Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
-# (See the 'europe' file for a fuller citation.)
-#
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
-# The following alphabetic abbreviations appear in these tables:
-#	     std  dst
-#	     LMT	Local Mean Time
-#	2:00 EET  EEST	Eastern European Time
-#	2:00 IST  IDT	Israel
-#	5:30 IST	India
-#	7:00 WIB	west Indonesia (Waktu Indonesia Barat)
-#	8:00 WITA	central Indonesia (Waktu Indonesia Tengah)
-#	8:00 CST	China
-#	8:30 KST  KDT	Korea when at +0830
-#	9:00 WIT	east Indonesia (Waktu Indonesia Timur)
-#	9:00 JST  JDT	Japan
-#	9:00 KST  KDT	Korea when at +09
-#	9:30 ACST	Australian Central Standard Time
-# Otherwise, these tables typically use numeric abbreviations like +03
-# and +0330 for integer hour and minute UTC offsets.  Although earlier
-# editions invented alphabetic time zone abbreviations for every
-# offset, this did not reflect common practice.
-#
-# See the 'europe' file for Russia and Turkey in Asia.
-
-# From Guy Harris:
-# Incorporates data for Singapore from Robert Elz' asia 1.1, as well as
-# additional information from Tom Yap, Sun Microsystems Intercontinental
-# Technical Support (including a page from the Official Airline Guide -
-# Worldwide Edition).
-
-###############################################################################
-
-# These rules are stolen from the 'europe' file.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	EUAsia	1981	max	-	Mar	lastSun	 1:00u	1:00	S
-Rule	EUAsia	1979	1995	-	Sep	lastSun	 1:00u	0	-
-Rule	EUAsia	1996	max	-	Oct	lastSun	 1:00u	0	-
-Rule E-EurAsia	1981	max	-	Mar	lastSun	 0:00	1:00	S
-Rule E-EurAsia	1979	1995	-	Sep	lastSun	 0:00	0	-
-Rule E-EurAsia	1996	max	-	Oct	lastSun	 0:00	0	-
-Rule RussiaAsia	1981	1984	-	Apr	1	 0:00	1:00	S
-Rule RussiaAsia	1981	1983	-	Oct	1	 0:00	0	-
-Rule RussiaAsia	1984	1995	-	Sep	lastSun	 2:00s	0	-
-Rule RussiaAsia	1985	2011	-	Mar	lastSun	 2:00s	1:00	S
-Rule RussiaAsia	1996	2011	-	Oct	lastSun	 2:00s	0	-
-
-# Afghanistan
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Kabul	4:36:48 -	LMT	1890
-			4:00	-	+04	1945
-			4:30	-	+0430
-
-# Armenia
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger have Yerevan switching to 3:00 (with Russian DST)
-# in spring 1991, then to 4:00 with no DST in fall 1995, then
-# readopting Russian DST in 1997.  Go with Shanks & Pottenger, even
-# when they disagree with others.  Edgar Der-Danieliantz
-# reported (1996-05-04) that Yerevan probably wouldn't use DST
-# in 1996, though it did use DST in 1995.  IATA SSIM (1991/1998) reports that
-# Armenia switched from 3:00 to 4:00 in 1998 and observed DST after 1991,
-# but started switching at 3:00s in 1998.
-
-# From Arthur David Olson (2011-06-15):
-# While Russia abandoned DST in 2011, Armenia may choose to
-# follow Russia's "old" rules.
-
-# From Alexander Krivenyshev (2012-02-10):
-# According to News Armenia, on Feb 9, 2012,
-# http://newsarmenia.ru/society/20120209/42609695.html
-#
-# The Armenia National Assembly adopted final reading of Amendments to the
-# Law "On procedure of calculation time on the territory of the Republic of
-# Armenia" according to which Armenia [is] abolishing Daylight Saving Time.
-# or
-# (brief)
-# http://www.worldtimezone.com/dst_news/dst_news_armenia03.html
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Yerevan	2:58:00 -	LMT	1924 May  2
-			3:00	-	+03	1957 Mar
-			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
-			3:00 RussiaAsia	+03/+04	1995 Sep 24  2:00s
-			4:00	-	+04	1997
-			4:00 RussiaAsia	+04/+05
-
-# Azerbaijan
-
-# From Rustam Aliyev of the Azerbaijan Internet Forum (2005-10-23):
-# According to the resolution of Cabinet of Ministers, 1997
-# From Paul Eggert (2015-09-17): It was Resolution No. 21 (1997-03-17).
-# http://code.az/files/daylight_res.pdf
-
-# From Steffen Thorsen (2016-03-17):
-# ... the Azerbaijani Cabinet of Ministers has cancelled switching to
-# daylight saving time....
-# http://www.azernews.az/azerbaijan/94137.html
-# http://vestnikkavkaza.net/news/Azerbaijani-Cabinet-of-Ministers-cancels-daylight-saving-time.html
-# http://en.apa.az/xeber_azerbaijan_abolishes_daylight_savings_ti_240862.html
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Azer	1997	2015	-	Mar	lastSun	 4:00	1:00	S
-Rule	Azer	1997	2015	-	Oct	lastSun	 5:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Baku	3:19:24 -	LMT	1924 May  2
-			3:00	-	+03	1957 Mar
-			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
-			3:00 RussiaAsia	+03/+04	1992 Sep lastSun  2:00s
-			4:00	-	+04	1996
-			4:00	EUAsia	+04/+05	1997
-			4:00	Azer	+04/+05
-
-# Bahrain
-# See Asia/Qatar.
-
-# Bangladesh
-# From Alexander Krivenyshev (2009-05-13):
-# According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce
-# Daylight Saving Time from June 16 to Sept 30
-#
-# Bangladesh to introduce daylight saving time likely from June 16
-# http://www.asiantribune.com/?q=node/17288
-# http://www.worldtimezone.com/dst_news/dst_news_bangladesh02.html
-#
-# "... Bangladesh government has decided to switch daylight saving time from
-# June
-# 16 till September 30 in a bid to ensure maximum use of daylight to cope with
-# crippling power crisis. "
-#
-# The switch will remain in effect from June 16 to Sept 30 (2009) but if
-# implemented the next year, it will come in force from April 1, 2010
-
-# From Steffen Thorsen (2009-06-02):
-# They have finally decided now, but changed the start date to midnight between
-# the 19th and 20th, and they have not set the end date yet.
-#
-# Some sources:
-# http://in.reuters.com/article/southAsiaNews/idINIndia-40017620090601
-# http://bdnews24.com/details.php?id=85889&cid=2
-#
-# Our wrap-up:
-# http://www.timeanddate.com/news/time/bangladesh-daylight-saving-2009.html
-
-# From A. N. M. Kamrus Saadat (2009-06-15):
-# Finally we've got the official mail regarding DST start time where DST start
-# time is mentioned as Jun 19 2009, 23:00 from BTRC (Bangladesh
-# Telecommunication Regulatory Commission).
-#
-# No DST end date has been announced yet.
-
-# From Alexander Krivenyshev (2009-09-25):
-# Bangladesh won't go back to Standard Time from October 1, 2009,
-# instead it will continue DST measure till the cabinet makes a fresh decision.
-#
-# Following report by same newspaper-"The Daily Star Friday":
-# "DST change awaits cabinet decision-Clock won't go back by 1-hr from Oct 1"
-# http://www.thedailystar.net/newDesign/news-details.php?nid=107021
-# http://www.worldtimezone.com/dst_news/dst_news_bangladesh04.html
-
-# From Steffen Thorsen (2009-10-13):
-# IANS (Indo-Asian News Service) now reports:
-# Bangladesh has decided that the clock advanced by an hour to make
-# maximum use of daylight hours as an energy saving measure would
-# "continue for an indefinite period."
-#
-# One of many places where it is published:
-# http://www.thaindian.com/newsportal/business/bangladesh-to-continue-indefinitely-with-advanced-time_100259987.html
-
-# From Alexander Krivenyshev (2009-12-24):
-# According to Bangladesh newspaper "The Daily Star,"
-# Bangladesh will change its clock back to Standard Time on Dec 31, 2009.
-#
-# Clock goes back 1-hr on Dec 31 night.
-# http://www.thedailystar.net/newDesign/news-details.php?nid=119228
-# http://www.worldtimezone.com/dst_news/dst_news_bangladesh05.html
-#
-# "...The government yesterday decided to put the clock back by one hour
-# on December 31 midnight and the new time will continue until March 31,
-# 2010 midnight. The decision came at a cabinet meeting at the Prime
-# Minister's Office last night..."
-
-# From Alexander Krivenyshev (2010-03-22):
-# According to Bangladesh newspaper "The Daily Star,"
-# Cabinet cancels Daylight Saving Time
-# http://www.thedailystar.net/newDesign/latest_news.php?nid=22817
-# http://www.worldtimezone.com/dst_news/dst_news_bangladesh06.html
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Dhaka	2009	only	-	Jun	19	23:00	1:00	S
-Rule	Dhaka	2009	only	-	Dec	31	24:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Dhaka	6:01:40 -	LMT	1890
-			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
-			6:30	-	+0630	1942 May 15
-			5:30	-	+0530	1942 Sep
-			6:30	-	+0630	1951 Sep 30
-			6:00	-	+06	2009
-			6:00	Dhaka	+06/+07
-
-# Bhutan
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Thimphu	5:58:36 -	LMT	1947 Aug 15 # or Thimbu
-			5:30	-	+0530	1987 Oct
-			6:00	-	+06
-
-# British Indian Ocean Territory
-# Whitman and the 1995 CIA time zone map say 5:00, but the
-# 1997 and later maps say 6:00.  Assume the switch occurred in 1996.
-# We have no information as to when standard time was introduced;
-# assume it occurred in 1907, the same year as Mauritius (which
-# then contained the Chagos Archipelago).
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Chagos	4:49:40	-	LMT	1907
-			5:00	-	+05	1996
-			6:00	-	+06
-
-# Brunei
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Brunei	7:39:40 -	LMT	1926 Mar # Bandar Seri Begawan
-			7:30	-	+0730	1933
-			8:00	-	+08
-
-# Burma / Myanmar
-
-# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Yangon	6:24:40 -	LMT	1880        # or Rangoon
-			6:24:40	-	RMT	1920        # Rangoon Mean Time?
-			6:30	-	+0630	1942 May
-			9:00	-	+09	1945 May  3
-			6:30	-	+0630
-
-# Cambodia
-# See Asia/Bangkok.
-
-
-# China
-
-# From Guy Harris:
-# People's Republic of China.  Yes, they really have only one time zone.
-
-# From Bob Devine (1988-01-28):
-# No they don't.  See TIME mag, 1986-02-17 p.52.  Even though
-# China is across 4 physical time zones, before Feb 1, 1986 only the
-# Peking (Beijing) time zone was recognized.  Since that date, China
-# has two of 'em - Peking's and Ürümqi (named after the capital of
-# the Xinjiang Uyghur Autonomous Region).  I don't know about DST for it.
-#
-# . . .I just deleted the DST table and this editor makes it too
-# painful to suck in another copy.  So, here is what I have for
-# DST start/end dates for Peking's time zone (info from AP):
-#
-#     1986 May 4 - Sept 14
-#     1987 mid-April - ??
-
-# From U. S. Naval Observatory (1989-01-19):
-# CHINA               8 H  AHEAD OF UTC  ALL OF CHINA, INCL TAIWAN
-# CHINA               9 H  AHEAD OF UTC  APR 17 - SEP 10
-
-# From Paul Eggert (2008-02-11):
-# Jim Mann, "A clumsy embrace for another western custom: China on daylight
-# time - sort of", Los Angeles Times, 1986-05-05 ... [says] that China began
-# observing daylight saving time in 1986.
-
-# From Paul Eggert (2014-06-30):
-# Shanks & Pottenger have China switching to a single time zone in 1980, but
-# this doesn't seem to be correct.  They also write that China observed summer
-# DST from 1986 through 1991, which seems to match the above commentary, so
-# go with them for DST rules as follows:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Shang	1940	only	-	Jun	 3	0:00	1:00	D
-Rule	Shang	1940	1941	-	Oct	 1	0:00	0	S
-Rule	Shang	1941	only	-	Mar	16	0:00	1:00	D
-Rule	PRC	1986	only	-	May	 4	0:00	1:00	D
-Rule	PRC	1986	1991	-	Sep	Sun>=11	0:00	0	S
-Rule	PRC	1987	1991	-	Apr	Sun>=10	0:00	1:00	D
-
-# From Anthony Fok (2001-12-20):
-# BTW, I did some research on-line and found some info regarding these five
-# historic timezones from some Taiwan websites.  And yes, there are official
-# Chinese names for these locales (before 1949).
-#
-# From Jesper Nørgaard Welen (2006-07-14):
-# I have investigated the timezones around 1970 on the
-# http://www.astro.com/atlas site [with provinces and county
-# boundaries summarized below]....  A few other exceptions were two
-# counties on the Sichuan side of the Xizang-Sichuan border,
-# counties Dege and Baiyu which lies on the Sichuan side and are
-# therefore supposed to be GMT+7, Xizang region being GMT+6, but Dege
-# county is GMT+8 according to astro.com while Baiyu county is GMT+6
-# (could be true), for the moment I am assuming that those two
-# counties are mistakes in the astro.com data.
-
-# From Paul Eggert (2017-01-05):
-# Alois Treindl kindly sent me translations of the following two sources:
-#
-# (1)
-# Guo Qingsheng (National Time-Service Center, CAS, Xi'an 710600, China)
-# Beijing Time at the Beginning of the PRC
-# China Historical Materials of Science and Technology
-# (Zhongguo ke ji shi liao, 中国科技史料), Vol. 24, No. 1 (2003)
-# It gives evidence that at the beginning of the PRC, Beijing time was
-# officially apparent solar time!  However, Guo also says that the
-# evidence is dubious, as the relevant institute of astronomy had not
-# been taken over by the PRC yet.  It's plausible that apparent solar
-# time was announced but never implemented, and that people continued
-# to use UT+8.  As the Shanghai radio station (and I presume the
-# observatory) was still under control of French missionaries, it
-# could well have ignored any such mandate.
-#
-# (2)
-# Guo Qing-sheng (Shaanxi Astronomical Observatory, CAS, Xi'an 710600, China)
-# A Study on the Standard Time Changes for the Past 100 Years in China
-# [undated and unknown publication location]
-# It says several things:
-#   * The Qing dynasty used local apparent solar time throughout China.
-#   * The Republic of China instituted Beijing mean solar time effective
-#     the official calendar book of 1914.
-#   * The French Concession in Shanghai set up signal stations in
-#     French docks in the 1890s, controlled by Xujiahui (Zikawei)
-#     Observatory and set to local mean time.
-#   * "From the end of the 19th century" it changed to UT+8.
-#   * Chinese Customs (by then reduced to a tool of foreign powers)
-#     eventually standardized on this time for all ports, and it
-#     became used by railways as well.
-#   * In 1918 the Central Observatory proposed dividing China into
-#     five time zones (see below for details).  This caught on
-#     at first only in coastal areas observing UT+8.
-#   * During WWII all of China was in theory was at UT+7.  In practice
-#     this was ignored in the west, and I presume was ignored in
-#     Japanese-occupied territory.
-#   * Japanese-occupied Manchuria was at UT+9, i.e., Japan time.
-#   * The five-zone plan was resurrected after WWII and officially put into
-#     place (with some modifications) in March 1948.  It's not clear
-#     how well it was observed in areas under Nationalist control.
-#   * The People's Liberation Army used UT+8 during the civil war.
-#
-# An AP article "Shanghai Internat'l Area Little Changed" in the
-# Lewiston (ME) Daily Sun (1939-05-29), p 17, said "Even the time is
-# different - the occupied districts going by Tokyo time, an hour
-# ahead of that prevailing in the rest of Shanghai."  Guess that the
-# Xujiahui Observatory was under French control and stuck with UT +08.
-#
-# In earlier versions of this file, China had many separate Zone entries, but
-# this was based on what were apparently incorrect data in Shanks & Pottenger.
-# This has now been simplified to the two entries Asia/Shanghai and
-# Asia/Urumqi, with the others being links for backward compatibility.
-# Proposed in 1918 and theoretically in effect until 1949 (although in practice
-# mainly observed in coastal areas), the five zones were:
-#
-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area) UT +08:30
-# Now part of Asia/Shanghai; its pre-1970 times are not recorded here.
-# Heilongjiang (except Mohe county), Jilin
-#
-# Zhongyuan Time ("Central plain Time") UT +08
-# Now part of Asia/Shanghai.
-# most of China
-# Milne gives 8:05:43.2 for Xujiahui Observatory time; round to nearest.
-# Guo says Shanghai switched to UT +08 "from the end of the 19th century".
-#
-# Long-shu Time (probably as Long and Shu were two names of the area) UT +07
-# Now part of Asia/Shanghai; its pre-1970 times are not recorded here.
-# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
-# most of Gansu; west Inner Mongolia; east Qinghai; and the Guangdong
-# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
-# Yangchun, Yangjiang, Yu'nan, and Yunfu.
-#
-# Xin-zang Time ("Xinjiang-Tibet Time") UT +06
-# This region is now part of either Asia/Urumqi or Asia/Shanghai with
-# current boundaries uncertain; times before 1970 for areas that
-# disagree with Ürümqi or Shanghai are not recorded here.
-# The Gansu counties Aksay, Anxi, Dunhuang, Subei; west Qinghai;
-# the Guangdong counties  Xuwen, Haikang, Suixi, Lianjiang,
-# Zhanjiang, Wuchuan, Huazhou, Gaozhou, Maoming, Dianbai, and Xinyi;
-# east Tibet, including Lhasa, Chamdo, Shigaise, Jimsar, Shawan and Hutubi;
-# east Xinjiang, including Ürümqi, Turpan, Karamay, Korla, Minfeng, Jinghe,
-# Wusu, Qiemo, Xinyan, Wulanwusu, Jinghe, Yumin, Tacheng, Tuoli, Emin,
-# Shihezi, Changji, Yanqi, Heshuo, Tuokexun, Tulufan, Shanshan, Hami,
-# Fukang, Kuitun, Kumukuli, Miquan, Qitai, and Turfan.
-#
-# Kunlun Time UT +05:30
-# This region is now in the same status as Xin-zang Time (see above).
-# West Tibet, including Pulan, Aheqi, Shufu, Shule;
-# West Xinjiang, including Aksu, Atushi, Yining, Hetian, Cele, Luopu, Nileke,
-# Zhaosu, Tekesi, Gongliu, Chabuchaer, Huocheng, Bole, Pishan, Suiding,
-# and Yarkand.
-
-# From Luther Ma (2009-10-17):
-# Almost all (>99.9%) ethnic Chinese (properly ethnic Han) living in
-# Xinjiang use Chinese Standard Time. Some are aware of Xinjiang time,
-# but have no need of it. All planes, trains, and schools function on
-# what is called "Beijing time." When Han make an appointment in Chinese
-# they implicitly use Beijing time.
-#
-# On the other hand, ethnic Uyghurs, who make up about half the
-# population of Xinjiang, typically use "Xinjiang time" which is two
-# hours behind Beijing time, or UT +06. The government of the Xinjiang
-# Uyghur Autonomous Region, (XAUR, or just Xinjiang for short) as well as
-# local governments such as the Ürümqi city government use both times in
-# publications, referring to what is popularly called Xinjiang time as
-# "Ürümqi time." When Uyghurs make an appointment in the Uyghur language
-# they almost invariably use Xinjiang time.
-#
-# (Their ethnic Han compatriots would typically have no clue of its
-# widespread use, however, because so extremely few of them are fluent in
-# Uyghur, comparable to the number of Anglo-Americans fluent in Navajo.)
-#
-# (...As with the rest of China there was a brief interval ending in 1990
-# or 1991 when summer time was in use.  The confusion was severe, with
-# the province not having dual times but four times in use at the same
-# time. Some areas remained on standard Xinjiang time or Beijing time and
-# others moving their clocks ahead.)
-
-# From Luther Ma (2009-11-19):
-# With the risk of being redundant to previous answers these are the most common
-# English "transliterations" (w/o using non-English symbols):
-#
-# 1. Wulumuqi...
-# 2. Kashi...
-# 3. Urumqi...
-# 4. Kashgar...
-# ...
-# 5. It seems that Uyghurs in Ürümqi has been using Xinjiang since at least the
-# 1960's. I know of one Han, now over 50, who grew up in the surrounding
-# countryside and used Xinjiang time as a child.
-#
-# 6. Likewise for Kashgar and the rest of south Xinjiang I don't know of any
-# start date for Xinjiang time.
-#
-# Without having access to local historical records, nor the ability to legally
-# publish them, I would go with October 1, 1949, when Xinjiang became the Uyghur
-# Autonomous Region under the PRC. (Before that Uyghurs, of course, would also
-# not be using Beijing time, but some local time.)
-
-# From David Cochrane (2014-03-26):
-# Just a confirmation that Ürümqi time was implemented in Ürümqi on 1 Feb 1986:
-# http://content.time.com/time/magazine/article/0,9171,960684,00.html
-
-# From Luther Ma (2014-04-22):
-# I have interviewed numerous people of various nationalities and from
-# different localities in Xinjiang and can confirm the information in Guo's
-# report regarding Xinjiang, as well as the Time article reference by David
-# Cochrane.  Whether officially recognized or not (and both are officially
-# recognized), two separate times have been in use in Xinjiang since at least
-# the Cultural Revolution: Xinjiang Time (XJT), aka Ürümqi Time or local time;
-# and Beijing Time.  There is no confusion in Xinjiang as to which name refers
-# to which time. Both are widely used in the province, although in some
-# population groups might be use one to the exclusion of the other.  The only
-# problem is that computers and smart phones list Ürümqi (or Kashgar) as
-# having the same time as Beijing.
-
-# From Paul Eggert (2014-06-30):
-# In the early days of the PRC, Tibet was given its own time zone (UT +06)
-# but this was withdrawn in 1959 and never reinstated; see Tubten Khétsun,
-# Memories of life in Lhasa under Chinese Rule, Columbia U Press, ISBN
-# 978-0231142861 (2008), translator's introduction by Matthew Akester, p x.
-# As this is before our 1970 cutoff, Tibet doesn't need a separate zone.
-#
-# Xinjiang Time is well-documented as being officially recognized.  E.g., see
-# "The Working-Calendar for The Xinjiang Uygur Autonomous Region Government"
-# <http://www.sinkiang.gov.cn/service/ourworking/> (2014-04-22).
-# Unfortunately, we have no good records of time in Xinjiang before 1986.
-# During the 20th century parts of Xinjiang were ruled by the Qing dynasty,
-# the Republic of China, various warlords, the First and Second East Turkestan
-# Republics, the Soviet Union, the Kuomintang, and the People's Republic of
-# China, and tracking down all these organizations' timekeeping rules would be
-# quite a trick.  Approximate this lost history by a transition from LMT to
-# UT +06 at the start of 1928, the year of accession of the warlord Jin Shuren,
-# which happens to be the date given by Shanks & Pottenger (no doubt as a
-# guess) as the transition from LMT.  Ignore the usage of +08 before
-# 1986-02-01 under the theory that the transition date to +08 is unknown and
-# that the sort of users who prefer Asia/Urumqi now typically ignored the
-# +08 mandate back then.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Beijing time, used throughout China; represented by Shanghai.
-Zone	Asia/Shanghai	8:05:43	-	LMT	1901
-			8:00	Shang	C%sT	1949
-			8:00	PRC	C%sT
-# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
-# / Wulumuqi.  (Please use Asia/Shanghai if you prefer Beijing time.)
-Zone	Asia/Urumqi	5:50:20	-	LMT	1928
-			6:00	-	+06
-
-
-# Hong Kong (Xianggang)
-
-# Milne gives 7:36:41.7; round this.
-
-# From Lee Yiu Chung (2009-10-24):
-# I found there are some mistakes for the...DST rule for Hong
-# Kong. [According] to the DST record from Hong Kong Observatory (actually,
-# it is not [an] observatory, but the official meteorological agency of HK,
-# and also serves as the official timing agency), there are some missing
-# and incorrect rules. Although the exact switch over time is missing, I
-# think 3:30 is correct. The official DST record for Hong Kong can be
-# obtained from
-# http://www.hko.gov.hk/gts/time/Summertime.htm
-
-# From Arthur David Olson (2009-10-28):
-# Here are the dates given at
-# http://www.hko.gov.hk/gts/time/Summertime.htm
-# as of 2009-10-28:
-# Year        Period
-# 1941        1 Apr to 30 Sep
-# 1942        Whole year
-# 1943        Whole year
-# 1944        Whole year
-# 1945        Whole year
-# 1946        20 Apr to 1 Dec
-# 1947        13 Apr to 30 Dec
-# 1948        2 May to 31 Oct
-# 1949        3 Apr to 30 Oct
-# 1950        2 Apr to 29 Oct
-# 1951        1 Apr to 28 Oct
-# 1952        6 Apr to 25 Oct
-# 1953        5 Apr to 1 Nov
-# 1954        21 Mar to 31 Oct
-# 1955        20 Mar to 6 Nov
-# 1956        18 Mar to 4 Nov
-# 1957        24 Mar to 3 Nov
-# 1958        23 Mar to 2 Nov
-# 1959        22 Mar to 1 Nov
-# 1960        20 Mar to 6 Nov
-# 1961        19 Mar to 5 Nov
-# 1962        18 Mar to 4 Nov
-# 1963        24 Mar to 3 Nov
-# 1964        22 Mar to 1 Nov
-# 1965        18 Apr to 17 Oct
-# 1966        17 Apr to 16 Oct
-# 1967        16 Apr to 22 Oct
-# 1968        21 Apr to 20 Oct
-# 1969        20 Apr to 19 Oct
-# 1970        19 Apr to 18 Oct
-# 1971        18 Apr to 17 Oct
-# 1972        16 Apr to 22 Oct
-# 1973        22 Apr to 21 Oct
-# 1973/74     30 Dec 73 to 20 Oct 74
-# 1975        20 Apr to 19 Oct
-# 1976        18 Apr to 17 Oct
-# 1977        Nil
-# 1978        Nil
-# 1979        13 May to 21 Oct
-# 1980 to Now Nil
-# The page does not give start or end times of day.
-# The page does not give a start date for 1942.
-# The page does not givw an end date for 1945.
-# The Japanese occupation of Hong Kong began on 1941-12-25.
-# The Japanese surrender of Hong Kong was signed 1945-09-15.
-# For lack of anything better, use start of those days as the transition times.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	HK	1941	only	-	Apr	1	3:30	1:00	S
-Rule	HK	1941	only	-	Sep	30	3:30	0	-
-Rule	HK	1946	only	-	Apr	20	3:30	1:00	S
-Rule	HK	1946	only	-	Dec	1	3:30	0	-
-Rule	HK	1947	only	-	Apr	13	3:30	1:00	S
-Rule	HK	1947	only	-	Dec	30	3:30	0	-
-Rule	HK	1948	only	-	May	2	3:30	1:00	S
-Rule	HK	1948	1951	-	Oct	lastSun	3:30	0	-
-Rule	HK	1952	only	-	Oct	25	3:30	0	-
-Rule	HK	1949	1953	-	Apr	Sun>=1	3:30	1:00	S
-Rule	HK	1953	only	-	Nov	1	3:30	0	-
-Rule	HK	1954	1964	-	Mar	Sun>=18	3:30	1:00	S
-Rule	HK	1954	only	-	Oct	31	3:30	0	-
-Rule	HK	1955	1964	-	Nov	Sun>=1	3:30	0	-
-Rule	HK	1965	1976	-	Apr	Sun>=16	3:30	1:00	S
-Rule	HK	1965	1976	-	Oct	Sun>=16	3:30	0	-
-Rule	HK	1973	only	-	Dec	30	3:30	1:00	S
-Rule	HK	1979	only	-	May	Sun>=8	3:30	1:00	S
-Rule	HK	1979	only	-	Oct	Sun>=16	3:30	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Hong_Kong	7:36:42 -	LMT	1904 Oct 30
-			8:00	HK	HK%sT	1941 Dec 25
-			9:00	-	JST	1945 Sep 15
-			8:00	HK	HK%sT
-
-###############################################################################
-
-# Taiwan
-
-# From smallufo (2010-04-03):
-# According to Taiwan's CWB [Central Weather Bureau],
-# http://www.cwb.gov.tw/V6/astronomy/cdata/summert.htm
-# Taipei has DST in 1979 between July 1st and Sep 30.
-
-# From Yu-Cheng Chuang (2013-07-12):
-# On Dec 28, 1895, the Meiji Emperor announced Ordinance No. 167 of
-# Meiji Year 28 "The clause about standard time", mentioned that
-# Taiwan and Penghu Islands, as well as Yaeyama and Miyako Islands
-# (both in Okinawa) adopt the Western Standard Time which is based on
-# 120E. The adoption began from Jan 1, 1896. The original text can be
-# found on Wikisource:
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
-# ... This could be the first adoption of time zone in Taiwan, because
-# during the Qing Dynasty, it seems that there was no time zone
-# declared officially.
-#
-# Later, in the beginning of World War II, on Sep 25, 1937, the Showa
-# Emperor announced Ordinance No. 529 of Showa Year 12 "The clause of
-# revision in the ordinance No. 167 of Meiji year 28 about standard
-# time", in which abolished the adoption of Western Standard Time in
-# western islands (listed above), which means the whole Japan
-# territory, including later occupations, adopt Japan Central Time
-# (UTC+9). The adoption began on Oct 1, 1937. The original text can
-# be found on Wikisource:
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
-#
-# That is, the time zone of Taipei switched to UTC+9 on Oct 1, 1937.
-
-# From Yu-Cheng Chuang (2014-07-02):
-# I've found more evidence about when the time zone was switched from UTC+9
-# back to UTC+8 after WW2.  I believe it was on Sep 21, 1945.  In a document
-# during Japanese era [1] in which the officer told the staff to change time
-# zone back to Western Standard Time (UTC+8) on Sep 21.  And in another
-# history page of National Cheng Kung University [2], on Sep 21 there is a
-# note "from today, switch back to Western Standard Time".  From these two
-# materials, I believe that the time zone change happened on Sep 21.  And
-# today I have found another monthly journal called "The Astronomical Herald"
-# from The Astronomical Society of Japan [3] in which it mentioned the fact
-# that:
-#
-# 1. Standard Time of the Country (Japan) was adopted on Jan 1, 1888, using
-# the time at 135E (GMT+9)
-#
-# 2. Standard Time of the Country was renamed to Central Standard Time, on Jan
-# 1, 1898, and on the same day, the new territories Taiwan and Penghu islands,
-# as well as Yaeyama and Miyako islands, adopted a new time zone called
-# Western Standard Time, which is in GMT+8.
-#
-# 3. Western Standard Time was deprecated on Sep 30, 1937. From then all the
-# territories of Japan adopted the same time zone, which is Central Standard
-# Time.
-#
-# [1] Academica Historica, Taiwan:
-# http://163.29.208.22:8080/govsaleShowImage/connect_img.php?s=00101738900090036&e=00101738900090037
-# [2] Nat'l Cheng Kung University 70th Anniversary Special Site:
-# http://www.ncku.edu.tw/~ncku70/menu/001/01_01.htm
-# [3] Yukio Niimi, The Standard Time in Japan (1997), p.475:
-# http://www.asj.or.jp/geppou/archive_open/1997/pdf/19971001c.pdf
-
-# Yu-Cheng Chuang (2014-07-03):
-# I finally have found the real official gazette about changing back to
-# Western Standard Time on Sep 21 in Taiwan.  It's Taiwan Governor-General
-# Bulletin No. 386 in Showa 20 years (1945), published on Sep 19, 1945. [1] ...
-# [It] abolishes Bulletin No. 207 in Showa 12 years (1937), which is a local
-# bulletin in Taiwan for that Ordinance No. 529. It also mentioned that 1am on
-# Sep 21, 1945 will be 12am on Sep 21.  I think this bulletin is much more
-# official than the one I mentioned in my first mail, because it's from the
-# top-level government in Taiwan. If you're going to quote any resource, this
-# would be a good one.
-# [1] Taiwan Governor-General Gazette, No. 1018, Sep 19, 1945:
-# http://db2.th.gov.tw/db2/view/viewImg.php?imgcode=0072031018a&num=19&bgn=019&end=019&otherImg=&type=gener
-
-# From Yu-Cheng Chuang (2014-07-02):
-# In 1946, DST in Taiwan was from May 15 and ended on Sep 30. The info from
-# Central Weather Bureau website was not correct.
-#
-# Original Bulletin:
-# http://subtpg.tpg.gov.tw/og/image2.asp?f=03502F0AKM1AF
-# http://subtpg.tpg.gov.tw/og/image2.asp?f=0350300AKM1B0 (cont.)
-#
-# In 1947, DST in Taiwan was expanded to Oct 31. There is a backup of that
-# telegram announcement from Taiwan Province Government:
-#
-# http://subtpg.tpg.gov.tw/og/image2.asp?f=0360310AKZ431
-#
-# Here is a brief translation:
-#
-#   The Summer Time this year is adopted from midnight Apr 15 until Sep 20
-#   midnight. To save (energy?) consumption, we're expanding Summer Time
-#   adoption till Oct 31 midnight.
-#
-# The Central Weather Bureau website didn't mention that, however it can
-# be found from historical government announcement database.
-
-# From Paul Eggert (2014-07-03):
-# As per Yu-Cheng Chuang, say that Taiwan was at UT +09 from 1937-10-01
-# until 1945-09-21 at 01:00, overriding Shanks & Pottenger.
-# Likewise, use Yu-Cheng Chuang's data for DST in Taiwan.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Taiwan	1946	only	-	May	15	0:00	1:00	D
-Rule	Taiwan	1946	only	-	Oct	1	0:00	0	S
-Rule	Taiwan	1947	only	-	Apr	15	0:00	1:00	D
-Rule	Taiwan	1947	only	-	Nov	1	0:00	0	S
-Rule	Taiwan	1948	1951	-	May	1	0:00	1:00	D
-Rule	Taiwan	1948	1951	-	Oct	1	0:00	0	S
-Rule	Taiwan	1952	only	-	Mar	1	0:00	1:00	D
-Rule	Taiwan	1952	1954	-	Nov	1	0:00	0	S
-Rule	Taiwan	1953	1959	-	Apr	1	0:00	1:00	D
-Rule	Taiwan	1955	1961	-	Oct	1	0:00	0	S
-Rule	Taiwan	1960	1961	-	Jun	1	0:00	1:00	D
-Rule	Taiwan	1974	1975	-	Apr	1	0:00	1:00	D
-Rule	Taiwan	1974	1975	-	Oct	1	0:00	0	S
-Rule	Taiwan	1979	only	-	Jul	1	0:00	1:00	D
-Rule	Taiwan	1979	only	-	Oct	1	0:00	0	S
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Taipei or Taibei or T'ai-pei
-Zone	Asia/Taipei	8:06:00 -	LMT	1896 Jan  1
-			8:00	-	CST	1937 Oct  1
-			9:00	-	JST	1945 Sep 21  1:00
-			8:00	Taiwan	C%sT
-
-# Macau (Macao, Aomen)
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Macau	1961	1962	-	Mar	Sun>=16	3:30	1:00	D
-Rule	Macau	1961	1964	-	Nov	Sun>=1	3:30	0	S
-Rule	Macau	1963	only	-	Mar	Sun>=16	0:00	1:00	D
-Rule	Macau	1964	only	-	Mar	Sun>=16	3:30	1:00	D
-Rule	Macau	1965	only	-	Mar	Sun>=16	0:00	1:00	D
-Rule	Macau	1965	only	-	Oct	31	0:00	0	S
-Rule	Macau	1966	1971	-	Apr	Sun>=16	3:30	1:00	D
-Rule	Macau	1966	1971	-	Oct	Sun>=16	3:30	0	S
-Rule	Macau	1972	1974	-	Apr	Sun>=15	0:00	1:00	D
-Rule	Macau	1972	1973	-	Oct	Sun>=15	0:00	0	S
-Rule	Macau	1974	1977	-	Oct	Sun>=15	3:30	0	S
-Rule	Macau	1975	1977	-	Apr	Sun>=15	3:30	1:00	D
-Rule	Macau	1978	1980	-	Apr	Sun>=15	0:00	1:00	D
-Rule	Macau	1978	1980	-	Oct	Sun>=15	0:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Macau	7:34:20 -	LMT	1912 Jan  1
-			8:00	Macau	C%sT
-
-
-###############################################################################
-
-# Cyprus
-
-# Milne says the Eastern Telegraph Company used 2:14:00.  Stick with LMT.
-# IATA SSIM (1998-09) has Cyprus using EU rules for the first time.
-
-# From Paul Eggert (2016-09-09):
-# Yesterday's Cyprus Mail reports that Northern Cyprus followed Turkey's
-# lead and switched from +02/+03 to +03 year-round.
-# http://cyprus-mail.com/2016/09/08/two-time-zones-cyprus-turkey-will-not-turn-clocks-back-next-month/
-#
-# From Even Scharning (2016-10-31):
-# Looks like the time zone split in Cyprus went through last night.
-# http://cyprus-mail.com/2016/10/30/cyprus-new-division-two-time-zones-now-reality/
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cyprus	1975	only	-	Apr	13	0:00	1:00	S
-Rule	Cyprus	1975	only	-	Oct	12	0:00	0	-
-Rule	Cyprus	1976	only	-	May	15	0:00	1:00	S
-Rule	Cyprus	1976	only	-	Oct	11	0:00	0	-
-Rule	Cyprus	1977	1980	-	Apr	Sun>=1	0:00	1:00	S
-Rule	Cyprus	1977	only	-	Sep	25	0:00	0	-
-Rule	Cyprus	1978	only	-	Oct	2	0:00	0	-
-Rule	Cyprus	1979	1997	-	Sep	lastSun	0:00	0	-
-Rule	Cyprus	1981	1998	-	Mar	lastSun	0:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Nicosia	2:13:28 -	LMT	1921 Nov 14
-			2:00	Cyprus	EE%sT	1998 Sep
-			2:00	EUAsia	EE%sT
-Zone	Asia/Famagusta	2:15:48	-	LMT	1921 Nov 14
-			2:00	Cyprus	EE%sT	1998 Sep
-			2:00	EUAsia	EE%sT	2016 Sep  8
-			3:00	-	+03
-
-# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
-# However, for various reasons many users expect to find it under Europe.
-Link	Asia/Nicosia	Europe/Nicosia
-
-# Georgia
-# From Paul Eggert (1994-11-19):
-# Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
-# an hour recently, due to a law proposed by Zurab Murvanidze,
-# an MP who went on a hunger strike for 11 days to force discussion about it!
-# We have no details, but we'll guess they didn't move the clocks back in fall.
-#
-# From Mathew Englander, quoting AP (1996-10-23 13:05-04):
-# Instead of putting back clocks at the end of October, Georgia
-# will stay on daylight savings time this winter to save energy,
-# President Eduard Shevardnadze decreed Wednesday.
-#
-# From the BBC via Joseph S. Myers (2004-06-27):
-#
-# Georgia moved closer to Western Europe on Sunday...  The former Soviet
-# republic has changed its time zone back to that of Moscow.  As a result it
-# is now just four hours ahead of Greenwich Mean Time, rather than five hours
-# ahead.  The switch was decreed by the pro-Western president of Georgia,
-# Mikheil Saakashvili, who said the change was partly prompted by the process
-# of integration into Europe.
-
-# From Teimuraz Abashidze (2005-11-07):
-# Government of Georgia ... decided to NOT CHANGE daylight savings time on
-# [Oct.] 30, as it was done before during last more than 10 years.
-# Currently, we are in fact GMT +4:00, as before 30 October it was GMT
-# +3:00.... The problem is, there is NO FORMAL LAW or governmental document
-# about it.  As far as I can find, I was told, that there is no document,
-# because we just DIDN'T ISSUE document about switching to winter time....
-# I don't know what can be done, especially knowing that some years ago our
-# DST rules where changed THREE TIMES during one month.
-
-# Milne 1899 says Tbilisi (Tiflis) time was 2:59:05.7.
-# Byalokoz 1919 says Georgia was 2:59:11.
-# Go with Byalokoz.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Tbilisi	2:59:11 -	LMT	1880
-			2:59:11	-	TBMT	1924 May  2 # Tbilisi Mean Time
-			3:00	-	+03	1957 Mar
-			4:00 RussiaAsia +04/+05	1991 Mar 31  2:00s
-			3:00 RussiaAsia +03/+04	1992
-			3:00 E-EurAsia	+03/+04	1994 Sep lastSun
-			4:00 E-EurAsia	+04/+05	1996 Oct lastSun
-			4:00	1:00	+05	1997 Mar lastSun
-			4:00 E-EurAsia	+04/+05	2004 Jun 27
-			3:00 RussiaAsia	+03/+04	2005 Mar lastSun  2:00
-			4:00	-	+04
-
-# East Timor
-
-# See Indonesia for the 1945 transition.
-
-# From João Carrascalão, brother of the former governor of East Timor, in
-# East Timor may be late for its millennium
-# <http://etan.org/et99c/december/26-31/30ETMAY.htm> (1999-12-26/31):
-# Portugal tried to change the time forward in 1974 because the sun
-# rises too early but the suggestion raised a lot of problems with the
-# Timorese and I still don't think it would work today because it
-# conflicts with their way of life.
-
-# From Paul Eggert (2000-12-04):
-# We don't have any record of the above attempt.
-# Most likely our records are incomplete, but we have no better data.
-
-# From Manoel de Almeida e Silva, Deputy Spokesman for the UN Secretary-General
-# http://www.hri.org/news/world/undh/2000/00-08-16.undh.html
-# (2000-08-16):
-# The Cabinet of the East Timor Transition Administration decided
-# today to advance East Timor's time by one hour.  The time change,
-# which will be permanent, with no seasonal adjustment, will happen at
-# midnight on Saturday, September 16.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Dili	8:22:20 -	LMT	1912 Jan  1
-			8:00	-	+08	1942 Feb 21 23:00
-			9:00	-	+09	1976 May  3
-			8:00	-	+08	2000 Sep 17  0:00
-			9:00	-	+09
-
-# India
-
-# From Ian P. Beacock, in "A brief history of (modern) time", The Atlantic
-# http://www.theatlantic.com/technology/archive/2015/12/the-creation-of-modern-time/421419/
-# (2015-12-22):
-# In January 1906, several thousand cotton-mill workers rioted on the
-# outskirts of Bombay....  They were protesting the proposed abolition of
-# local time in favor of Indian Standard Time....  Journalists called this
-# dispute the "Battle of the Clocks."  It lasted nearly half a century.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Kolkata	5:53:28 -	LMT	1880        # Kolkata
-			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
-			6:30	-	+0630	1942 May 15
-			5:30	-	IST	1942 Sep
-			5:30	1:00	+0630	1945 Oct 15
-			5:30	-	IST
-# The following are like Asia/Kolkata:
-#	Andaman Is
-#	Lakshadweep (Laccadive, Minicoy and Amindivi Is)
-#	Nicobar Is
-
-# Indonesia
-#
-# From Paul Eggert (2014-09-06):
-# The 1876 Report of the Secretary of the [US] Navy, p 306 says that Batavia
-# civil time was 7:07:12.5; round to even for Jakarta.
-#
-# From Gwillim Law (2001-05-28), overriding Shanks & Pottenger:
-# http://www.sumatera-inc.com/go_to_invest/about_indonesia.asp#standtime
-# says that Indonesia's time zones changed on 1988-01-01.  Looking at some
-# time zone maps, I think that must refer to Western Borneo (Kalimantan Barat
-# and Kalimantan Tengah) switching from UTC+8 to UTC+7.
-#
-# From Paul Eggert (2007-03-10):
-# Here is another correction to Shanks & Pottenger.
-# JohnTWB writes that Japanese forces did not surrender control in
-# Indonesia until 1945-09-01 00:00 at the earliest (in Jakarta) and
-# other formal surrender ceremonies were September 9, 11, and 13, plus
-# September 12 for the regional surrender to Mountbatten in Singapore.
-# These would be the earliest possible times for a change.
-# Régimes horaires pour le monde entier, by Henri Le Corre, (Éditions
-# Traditionnelles, 1987, Paris) says that Java and Madura switched
-# from UT +09 to +07:30 on 1945-09-23, and gives 1944-09-01 for Jayapura
-# (Hollandia).  For now, assume all Indonesian locations other than Jayapura
-# switched on 1945-09-23.
-#
-# From Paul Eggert (2013-08-11):
-# Normally the tz database uses English-language abbreviations, but in
-# Indonesia it's typical to use Indonesian-language abbreviations even
-# when writing in English.  For example, see the English-language
-# summary published by the Time and Frequency Laboratory of the
-# Research Center for Calibration, Instrumentation and Metrology,
-# Indonesia, <http://time.kim.lipi.go.id/time-eng.php> (2006-09-29).
-# The time zone abbreviations and UT offsets are:
-#
-# WIB  - +07 - Waktu Indonesia Barat (Indonesia western time)
-# WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
-# WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Java, Sumatra
-Zone Asia/Jakarta	7:07:12 -	LMT	1867 Aug 10
-# Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
-# but this must be a typo.
-			7:07:12	-	BMT	1923 Dec 31 23:47:12 # Batavia
-			7:20	-	+0720	1932 Nov
-			7:30	-	+0730	1942 Mar 23
-			9:00	-	+09	1945 Sep 23
-			7:30	-	+0730	1948 May
-			8:00	-	+08	1950 May
-			7:30	-	+0730	1964
-			7:00	-	WIB
-# west and central Borneo
-Zone Asia/Pontianak	7:17:20	-	LMT	1908 May
-			7:17:20	-	PMT	1932 Nov    # Pontianak MT
-			7:30	-	+0730	1942 Jan 29
-			9:00	-	+09	1945 Sep 23
-			7:30	-	+0730	1948 May
-			8:00	-	+08	1950 May
-			7:30	-	+0730	1964
-			8:00	-	WITA	1988 Jan  1
-			7:00	-	WIB
-# Sulawesi, Lesser Sundas, east and south Borneo
-Zone Asia/Makassar	7:57:36 -	LMT	1920
-			7:57:36	-	MMT	1932 Nov    # Macassar MT
-			8:00	-	+08	1942 Feb  9
-			9:00	-	+09	1945 Sep 23
-			8:00	-	WITA
-# Maluku Islands, West Papua, Papua
-Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
-			9:00	-	+09	1944 Sep  1
-			9:30	-	+0930	1964
-			9:00	-	WIT
-
-# Iran
-
-# From Roozbeh Pournader (2003-03-15):
-# This is an English translation of what I just found (originally in Persian).
-# The Gregorian dates in brackets are mine:
-#
-#	Official Newspaper No. 13548-1370/6/25 [1991-09-16]
-#	No. 16760/T233 H				1370/6/10 [1991-09-01]
-#
-#	The Rule About Change of the Official Time of the Country
-#
-#	The Board of Ministers, in the meeting dated 1370/5/23 [1991-08-14],
-#	based on the suggestion number 2221/D dated 1370/4/22 [1991-07-13]
-#	of the Country's Organization for Official and Employment Affairs,
-#	and referring to the law for equating the working hours of workers
-#	and officers in the whole country dated 1359/4/23 [1980-07-14], and
-#	for synchronizing the official times of the country, agreed that:
-#
-#	The official time of the country will should move forward one hour
-#	at the 24[:00] hours of the first day of Farvardin and should return
-#	to its previous state at the 24[:00] hours of the 30th day of
-#	Shahrivar.
-#
-#	First Deputy to the President - Hassan Habibi
-#
-# From personal experience, that agrees with what has been followed
-# for at least the last 5 years.  Before that, for a few years, the
-# date used was the first Thursday night of Farvardin and the last
-# Thursday night of Shahrivar, but I can't give exact dates....
-#
-# From Roozbeh Pournader (2005-04-05):
-# The text of the Iranian law, in effect since 1925, clearly mentions
-# that the true solar year is the measure, and there is no arithmetic
-# leap year calculation involved.  There has never been any serious
-# plan to change that law....
-#
-# From Paul Eggert (2006-03-22):
-# Go with Shanks & Pottenger before Sept. 1991, and with Pournader thereafter.
-# I used Ed Reingold's cal-persia in GNU Emacs 21.2 to check Persian dates,
-# stopping after 2037 when 32-bit time_t's overflow.
-# That cal-persia used Birashk's approximation, which disagrees with the solar
-# calendar predictions for the year 2025, so I corrected those dates by hand.
-#
-# From Oscar van Vlijmen (2005-03-30), writing about future
-# discrepancies between cal-persia and the Iranian calendar:
-# For 2091 solar-longitude-after yields 2091-03-20 08:40:07.7 UT for
-# the vernal equinox and that gets so close to 12:00 some local
-# Iranian time that the definition of the correct location needs to be
-# known exactly, amongst other factors.  2157 is even closer:
-# 2157-03-20 08:37:15.5 UT.  But the Gregorian year 2025 should give
-# no interpretation problem whatsoever.  By the way, another instant
-# in the near future where there will be a discrepancy between
-# arithmetical and astronomical Iranian calendars will be in 2058:
-# vernal equinox on 2058-03-20 09:03:05.9 UT.  The Java version of
-# Reingold's/Dershowitz' calculator gives correctly the Gregorian date
-# 2058-03-21 for 1 Farvardin 1437 (astronomical).
-#
-# From Steffen Thorsen (2006-03-22):
-# Several of my users have reported that Iran will not observe DST anymore:
-# http://www.irna.ir/en/news/view/line-17/0603193812164948.htm
-#
-# From Reuters (2007-09-16), with a heads-up from Jesper Nørgaard Welen:
-# ... the Guardian Council ... approved a law on Sunday to re-introduce
-# daylight saving time ...
-# http://uk.reuters.com/article/oilRpt/idUKBLA65048420070916
-#
-# From Roozbeh Pournader (2007-11-05):
-# This is quoted from Official Gazette of the Islamic Republic of
-# Iran, Volume 63, No. 18242, dated Tuesday 1386/6/24
-# [2007-10-16]. I am doing the best translation I can:...
-# The official time of the country will be moved forward for one hour
-# on the 24 hours of the first day of the month of Farvardin and will
-# be changed back to its previous state on the 24 hours of the
-# thirtieth day of Shahrivar.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iran	1978	1980	-	Mar	21	0:00	1:00	D
-Rule	Iran	1978	only	-	Oct	21	0:00	0	S
-Rule	Iran	1979	only	-	Sep	19	0:00	0	S
-Rule	Iran	1980	only	-	Sep	23	0:00	0	S
-Rule	Iran	1991	only	-	May	 3	0:00	1:00	D
-Rule	Iran	1992	1995	-	Mar	22	0:00	1:00	D
-Rule	Iran	1991	1995	-	Sep	22	0:00	0	S
-Rule	Iran	1996	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	1996	only	-	Sep	21	0:00	0	S
-Rule	Iran	1997	1999	-	Mar	22	0:00	1:00	D
-Rule	Iran	1997	1999	-	Sep	22	0:00	0	S
-Rule	Iran	2000	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2000	only	-	Sep	21	0:00	0	S
-Rule	Iran	2001	2003	-	Mar	22	0:00	1:00	D
-Rule	Iran	2001	2003	-	Sep	22	0:00	0	S
-Rule	Iran	2004	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2004	only	-	Sep	21	0:00	0	S
-Rule	Iran	2005	only	-	Mar	22	0:00	1:00	D
-Rule	Iran	2005	only	-	Sep	22	0:00	0	S
-Rule	Iran	2008	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2008	only	-	Sep	21	0:00	0	S
-Rule	Iran	2009	2011	-	Mar	22	0:00	1:00	D
-Rule	Iran	2009	2011	-	Sep	22	0:00	0	S
-Rule	Iran	2012	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2012	only	-	Sep	21	0:00	0	S
-Rule	Iran	2013	2015	-	Mar	22	0:00	1:00	D
-Rule	Iran	2013	2015	-	Sep	22	0:00	0	S
-Rule	Iran	2016	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2016	only	-	Sep	21	0:00	0	S
-Rule	Iran	2017	2019	-	Mar	22	0:00	1:00	D
-Rule	Iran	2017	2019	-	Sep	22	0:00	0	S
-Rule	Iran	2020	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2020	only	-	Sep	21	0:00	0	S
-Rule	Iran	2021	2023	-	Mar	22	0:00	1:00	D
-Rule	Iran	2021	2023	-	Sep	22	0:00	0	S
-Rule	Iran	2024	only	-	Mar	21	0:00	1:00	D
-Rule	Iran	2024	only	-	Sep	21	0:00	0	S
-Rule	Iran	2025	2027	-	Mar	22	0:00	1:00	D
-Rule	Iran	2025	2027	-	Sep	22	0:00	0	S
-Rule	Iran	2028	2029	-	Mar	21	0:00	1:00	D
-Rule	Iran	2028	2029	-	Sep	21	0:00	0	S
-Rule	Iran	2030	2031	-	Mar	22	0:00	1:00	D
-Rule	Iran	2030	2031	-	Sep	22	0:00	0	S
-Rule	Iran	2032	2033	-	Mar	21	0:00	1:00	D
-Rule	Iran	2032	2033	-	Sep	21	0:00	0	S
-Rule	Iran	2034	2035	-	Mar	22	0:00	1:00	D
-Rule	Iran	2034	2035	-	Sep	22	0:00	0	S
-#
-# The following rules are approximations starting in the year 2038.
-# These are the best post-2037 approximations available, given the
-# restrictions of a single rule using a Gregorian-based data format.
-# At some point this table will need to be extended, though quite
-# possibly Iran will change the rules first.
-Rule	Iran	2036	max	-	Mar	21	0:00	1:00	D
-Rule	Iran	2036	max	-	Sep	21	0:00	0	S
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Tehran	3:25:44	-	LMT	1916
-			3:25:44	-	TMT	1946     # Tehran Mean Time
-			3:30	-	+0330	1977 Nov
-			4:00	Iran	+04/+05	1979
-			3:30	Iran	+0330/+0430
-
-
-# Iraq
-#
-# From Jonathan Lennox (2000-06-12):
-# An article in this week's Economist ("Inside the Saddam-free zone", p. 50 in
-# the U.S. edition) on the Iraqi Kurds contains a paragraph:
-# "The three northern provinces ... switched their clocks this spring and
-# are an hour ahead of Baghdad."
-#
-# But Rives McDow (2000-06-18) quotes a contact in Iraqi-Kurdistan as follows:
-# In the past, some Kurdish nationalists, as a protest to the Iraqi
-# Government, did not adhere to daylight saving time.  They referred
-# to daylight saving as Saddam time.  But, as of today, the time zone
-# in Iraqi-Kurdistan is on standard time with Baghdad, Iraq.
-#
-# So we'll ignore the Economist's claim.
-
-# From Steffen Thorsen (2008-03-10):
-# The cabinet in Iraq abolished DST last week, according to the following
-# news sources (in Arabic):
-# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
-# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
-#
-# We have published a short article in English about the change:
-# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
-Rule	Iraq	1982	1984	-	Oct	1	0:00	0	S
-Rule	Iraq	1983	only	-	Mar	31	0:00	1:00	D
-Rule	Iraq	1984	1985	-	Apr	1	0:00	1:00	D
-Rule	Iraq	1985	1990	-	Sep	lastSun	1:00s	0	S
-Rule	Iraq	1986	1990	-	Mar	lastSun	1:00s	1:00	D
-# IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the ':01' is a typo.
-# Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
-#
-Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Baghdad	2:57:40	-	LMT	1890
-			2:57:36	-	BMT	1918     # Baghdad Mean Time?
-			3:00	-	+03	1982 May
-			3:00	Iraq	+03/+04
-
-
-###############################################################################
-
-# Israel
-
-# From Ephraim Silverberg (2001-01-11):
-#
-# I coined "IST/IDT" circa 1988.  Until then there were three
-# different abbreviations in use:
-#
-# JST  Jerusalem Standard Time [Danny Braniss, Hebrew University]
-# IZT  Israel Zonal (sic) Time [Prof. Haim Papo, Technion]
-# EEST Eastern Europe Standard Time [used by almost everyone else]
-#
-# Since timezones should be called by country and not capital cities,
-# I ruled out JST.  As Israel is in Asia Minor and not Eastern Europe,
-# EEST was equally unacceptable.  Since "zonal" was not compatible with
-# any other timezone abbreviation, I felt that 'IST' was the way to go
-# and, indeed, it has received almost universal acceptance in timezone
-# settings in Israeli computers.
-#
-# In any case, I am happy to share timezone abbreviations with India,
-# high on my favorite-country list (and not only because my wife's
-# family is from India).
-
-# From Shanks & Pottenger:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1940	only	-	Jun	 1	0:00	1:00	D
-Rule	Zion	1942	1944	-	Nov	 1	0:00	0	S
-Rule	Zion	1943	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	1944	only	-	Apr	 1	0:00	1:00	D
-Rule	Zion	1945	only	-	Apr	16	0:00	1:00	D
-Rule	Zion	1945	only	-	Nov	 1	2:00	0	S
-Rule	Zion	1946	only	-	Apr	16	2:00	1:00	D
-Rule	Zion	1946	only	-	Nov	 1	0:00	0	S
-Rule	Zion	1948	only	-	May	23	0:00	2:00	DD
-Rule	Zion	1948	only	-	Sep	 1	0:00	1:00	D
-Rule	Zion	1948	1949	-	Nov	 1	2:00	0	S
-Rule	Zion	1949	only	-	May	 1	0:00	1:00	D
-Rule	Zion	1950	only	-	Apr	16	0:00	1:00	D
-Rule	Zion	1950	only	-	Sep	15	3:00	0	S
-Rule	Zion	1951	only	-	Apr	 1	0:00	1:00	D
-Rule	Zion	1951	only	-	Nov	11	3:00	0	S
-Rule	Zion	1952	only	-	Apr	20	2:00	1:00	D
-Rule	Zion	1952	only	-	Oct	19	3:00	0	S
-Rule	Zion	1953	only	-	Apr	12	2:00	1:00	D
-Rule	Zion	1953	only	-	Sep	13	3:00	0	S
-Rule	Zion	1954	only	-	Jun	13	0:00	1:00	D
-Rule	Zion	1954	only	-	Sep	12	0:00	0	S
-Rule	Zion	1955	only	-	Jun	11	2:00	1:00	D
-Rule	Zion	1955	only	-	Sep	11	0:00	0	S
-Rule	Zion	1956	only	-	Jun	 3	0:00	1:00	D
-Rule	Zion	1956	only	-	Sep	30	3:00	0	S
-Rule	Zion	1957	only	-	Apr	29	2:00	1:00	D
-Rule	Zion	1957	only	-	Sep	22	0:00	0	S
-Rule	Zion	1974	only	-	Jul	 7	0:00	1:00	D
-Rule	Zion	1974	only	-	Oct	13	0:00	0	S
-Rule	Zion	1975	only	-	Apr	20	0:00	1:00	D
-Rule	Zion	1975	only	-	Aug	31	0:00	0	S
-Rule	Zion	1985	only	-	Apr	14	0:00	1:00	D
-Rule	Zion	1985	only	-	Sep	15	0:00	0	S
-Rule	Zion	1986	only	-	May	18	0:00	1:00	D
-Rule	Zion	1986	only	-	Sep	 7	0:00	0	S
-Rule	Zion	1987	only	-	Apr	15	0:00	1:00	D
-Rule	Zion	1987	only	-	Sep	13	0:00	0	S
-
-# From Avigdor Finkelstein (2014-03-05):
-# I check the Parliament (Knesset) records and there it's stated that the
-# [1988] transition should take place on Saturday night, when the Sabbath
-# ends and changes to Sunday.
-Rule	Zion	1988	only	-	Apr	10	0:00	1:00	D
-Rule	Zion	1988	only	-	Sep	 4	0:00	0	S
-
-# From Ephraim Silverberg
-# (1997-03-04, 1998-03-16, 1998-12-28, 2000-01-17, 2000-07-25, 2004-12-22,
-# and 2005-02-17):
-
-# According to the Office of the Secretary General of the Ministry of
-# Interior, there is NO set rule for Daylight-Savings/Standard time changes.
-# One thing is entrenched in law, however: that there must be at least 150
-# days of daylight savings time annually.  From 1993-1998, the change to
-# daylight savings time was on a Friday morning from midnight IST to
-# 1 a.m IDT; up until 1998, the change back to standard time was on a
-# Saturday night from midnight daylight savings time to 11 p.m. standard
-# time.  1996 is an exception to this rule where the change back to standard
-# time took place on Sunday night instead of Saturday night to avoid
-# conflicts with the Jewish New Year.  In 1999, the change to
-# daylight savings time was still on a Friday morning but from
-# 2 a.m. IST to 3 a.m. IDT; furthermore, the change back to standard time
-# was also on a Friday morning from 2 a.m. IDT to 1 a.m. IST for
-# 1999 only.  In the year 2000, the change to daylight savings time was
-# similar to 1999, but although the change back will be on a Friday, it
-# will take place from 1 a.m. IDT to midnight IST.  Starting in 2001, all
-# changes to/from will take place at 1 a.m. old time, but now there is no
-# rule as to what day of the week it will take place in as the start date
-# (except in 2003) is the night after the Passover Seder (i.e. the eve
-# of the 16th of Nisan in the lunar Hebrew calendar) and the end date
-# (except in 2002) is three nights before Yom Kippur [Day of Atonement]
-# (the eve of the 7th of Tishrei in the lunar Hebrew calendar).
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1989	only	-	Apr	30	0:00	1:00	D
-Rule	Zion	1989	only	-	Sep	 3	0:00	0	S
-Rule	Zion	1990	only	-	Mar	25	0:00	1:00	D
-Rule	Zion	1990	only	-	Aug	26	0:00	0	S
-Rule	Zion	1991	only	-	Mar	24	0:00	1:00	D
-Rule	Zion	1991	only	-	Sep	 1	0:00	0	S
-Rule	Zion	1992	only	-	Mar	29	0:00	1:00	D
-Rule	Zion	1992	only	-	Sep	 6	0:00	0	S
-Rule	Zion	1993	only	-	Apr	 2	0:00	1:00	D
-Rule	Zion	1993	only	-	Sep	 5	0:00	0	S
-
-# The dates for 1994-1995 were obtained from Office of the Spokeswoman for the
-# Ministry of Interior, Jerusalem, Israel.  The spokeswoman can be reached by
-# calling the office directly at 972-2-6701447 or 972-2-6701448.
-
-# Rule	NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule	Zion	1994	only	-	Apr	 1	0:00	1:00	D
-Rule	Zion	1994	only	-	Aug	28	0:00	0	S
-Rule	Zion	1995	only	-	Mar	31	0:00	1:00	D
-Rule	Zion	1995	only	-	Sep	 3	0:00	0	S
-
-# The dates for 1996 were determined by the Minister of Interior of the
-# time, Haim Ramon.  The official announcement regarding 1996-1998
-# (with the dates for 1997-1998 no longer being relevant) can be viewed at:
-#
-#   ftp://ftp.cs.huji.ac.il/pub/tz/announcements/1996-1998.ramon.ps.gz
-#
-# The dates for 1997-1998 were altered by his successor, Rabbi Eli Suissa.
-#
-# The official announcements for the years 1997-1999 can be viewed at:
-#
-#   ftp://ftp.cs.huji.ac.il/pub/tz/announcements/YYYY.ps.gz
-#
-#       where YYYY is the relevant year.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	1996	only	-	Mar	15	0:00	1:00	D
-Rule	Zion	1996	only	-	Sep	16	0:00	0	S
-Rule	Zion	1997	only	-	Mar	21	0:00	1:00	D
-Rule	Zion	1997	only	-	Sep	14	0:00	0	S
-Rule	Zion	1998	only	-	Mar	20	0:00	1:00	D
-Rule	Zion	1998	only	-	Sep	 6	0:00	0	S
-Rule	Zion	1999	only	-	Apr	 2	2:00	1:00	D
-Rule	Zion	1999	only	-	Sep	 3	2:00	0	S
-
-# The Knesset Interior Committee has changed the dates for 2000 for
-# the third time in just over a year and have set new dates for the
-# years 2001-2004 as well.
-#
-# The official announcement for the start date of 2000 can be viewed at:
-#
-#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-start.ps.gz
-#
-# The official announcement for the end date of 2000 and the dates
-# for the years 2001-2004 can be viewed at:
-#
-#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2000-2004.ps.gz
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	2000	only	-	Apr	14	2:00	1:00	D
-Rule	Zion	2000	only	-	Oct	 6	1:00	0	S
-Rule	Zion	2001	only	-	Apr	 9	1:00	1:00	D
-Rule	Zion	2001	only	-	Sep	24	1:00	0	S
-Rule	Zion	2002	only	-	Mar	29	1:00	1:00	D
-Rule	Zion	2002	only	-	Oct	 7	1:00	0	S
-Rule	Zion	2003	only	-	Mar	28	1:00	1:00	D
-Rule	Zion	2003	only	-	Oct	 3	1:00	0	S
-Rule	Zion	2004	only	-	Apr	 7	1:00	1:00	D
-Rule	Zion	2004	only	-	Sep	22	1:00	0	S
-
-# The proposed law agreed upon by the Knesset Interior Committee on
-# 2005-02-14 is that, for 2005 and beyond, DST starts at 02:00 the
-# last Friday before April 2nd (i.e. the last Friday in March or April
-# 1st itself if it falls on a Friday) and ends at 02:00 on the Saturday
-# night _before_ the fast of Yom Kippur.
-#
-# Those who can read Hebrew can view the announcement at:
-#
-#	ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
-
-# From Paul Eggert (2012-10-26):
-# I used Ephraim Silverberg's dst-israel.el program
-# <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20)
-# along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions from 2005 through 2012.
-# (I replaced "lastFri" with "Fri>=26" by hand.)
-# The spring transitions all correspond to the following Rule:
-#
-# Rule	Zion	2005	2012	-	Mar	Fri>=26	2:00	1:00	D
-#
-# but older zic implementations (e.g., Solaris 8) do not support
-# "Fri>=26" to mean April 1 in years like 2005, so for now we list the
-# springtime transitions explicitly.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	2005	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2005	only	-	Oct	 9	2:00	0	S
-Rule	Zion	2006	2010	-	Mar	Fri>=26	2:00	1:00	D
-Rule	Zion	2006	only	-	Oct	 1	2:00	0	S
-Rule	Zion	2007	only	-	Sep	16	2:00	0	S
-Rule	Zion	2008	only	-	Oct	 5	2:00	0	S
-Rule	Zion	2009	only	-	Sep	27	2:00	0	S
-Rule	Zion	2010	only	-	Sep	12	2:00	0	S
-Rule	Zion	2011	only	-	Apr	 1	2:00	1:00	D
-Rule	Zion	2011	only	-	Oct	 2	2:00	0	S
-Rule	Zion	2012	only	-	Mar	Fri>=26	2:00	1:00	D
-Rule	Zion	2012	only	-	Sep	23	2:00	0	S
-
-# From Ephraim Silverberg (2013-06-27):
-# On June 23, 2013, the Israeli government approved changes to the
-# Time Decree Law.  The next day, the changes passed the First Reading
-# in the Knesset.  The law is expected to pass the Second and Third
-# (final) Readings by the beginning of September 2013.
-#
-# As of 2013, DST starts at 02:00 on the Friday before the last Sunday
-# in March.  DST ends at 02:00 on the last Sunday of October.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Zion	2013	max	-	Mar	Fri>=23	2:00	1:00	D
-Rule	Zion	2013	max	-	Oct	lastSun	2:00	0	S
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Jerusalem	2:20:54 -	LMT	1880
-			2:20:40	-	JMT	1918 # Jerusalem Mean Time?
-			2:00	Zion	I%sT
-
-
-
-###############################################################################
-
-# Japan
-
-# '9:00' and 'JST' is from Guy Harris.
-
-# From Paul Eggert (1995-03-06):
-# Today's _Asahi Evening News_ (page 4) reports that Japan had
-# daylight saving between 1948 and 1951, but "the system was discontinued
-# because the public believed it would lead to longer working hours."
-
-# From Mayumi Negishi in the 2005-08-10 Japan Times:
-# http://www.japantimes.co.jp/cgi-bin/getarticle.pl5?nn20050810f2.htm
-# Occupation authorities imposed daylight-saving time on Japan on
-# [1948-05-01]....  But lack of prior debate and the execution of
-# daylight-saving time just three days after the bill was passed generated
-# deep hatred of the concept....  The Diet unceremoniously passed a bill to
-# dump the unpopular system in October 1951, less than a month after the San
-# Francisco Peace Treaty was signed.  (A government poll in 1951 showed 53%
-# of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who
-# wanted to keep it.)
-
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that DST in Japan during those years was as follows:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Japan	1948	only	-	May	Sun>=1	2:00	1:00	D
-Rule	Japan	1948	1951	-	Sep	Sat>=8	2:00	0	S
-Rule	Japan	1949	only	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Japan	1950	1951	-	May	Sun>=1	2:00	1:00	D
-# but the only locations using it (for birth certificates, presumably, since
-# their audience is astrologers) were US military bases.  For now, assume
-# that for most purposes daylight-saving time was observed; otherwise, what
-# would have been the point of the 1951 poll?
-
-# From Hideyuki Suzuki (1998-11-09):
-# 'Tokyo' usually stands for the former location of Tokyo Astronomical
-# Observatory: 139 degrees 44' 40.90" E (9h 18m 58.727s),
-# 35 degrees 39' 16.0" N.
-# This data is from 'Rika Nenpyou (Chronological Scientific Tables) 1996'
-# edited by National Astronomical Observatory of Japan....
-# JST (Japan Standard Time) has been used since 1888-01-01 00:00 (JST).
-# The law is enacted on 1886-07-07.
-
-# From Hideyuki Suzuki (1998-11-16):
-# The ordinance No. 51 (1886) established "standard time" in Japan,
-# which stands for the time on 135 degrees E.
-# In the ordinance No. 167 (1895), "standard time" was renamed to "central
-# standard time".  And the same ordinance also established "western standard
-# time", which stands for the time on 120 degrees E....  But "western standard
-# time" was abolished in the ordinance No. 529 (1937).  In the ordinance No.
-# 167, there is no mention regarding for what place western standard time is
-# standard....
-#
-# I wrote "ordinance" above, but I don't know how to translate.
-# In Japanese it's "chokurei", which means ordinance from emperor.
-
-# From Yu-Cheng Chuang (2013-07-12):
-# ...the Meiji Emperor announced Ordinance No. 167 of Meiji Year 28 "The clause
-# about standard time" ... The adoption began from Jan 1, 1896.
-# http://ja.wikisource.org/wiki/標準時ニ關スル件_(公布時)
-#
-# ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
-# means the whole Japan territory, including later occupations, adopt Japan
-# Central Time (UTC+9). The adoption began on Oct 1, 1937.
-# http://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Tokyo	9:18:59	-	LMT	1887 Dec 31 15:00u
-			9:00	Japan	J%sT
-# Since 1938, all Japanese possessions have been like Asia/Tokyo.
-
-# Jordan
-#
-# From <http://star.arabia.com/990701/JO9.html>
-# Jordan Week (1999-07-01) via Steffen Thorsen (1999-09-09):
-# Clocks in Jordan were forwarded one hour on Wednesday at midnight,
-# in accordance with the government's decision to implement summer time
-# all year round.
-#
-# From <http://star.arabia.com/990930/JO9.html>
-# Jordan Week (1999-09-30) via Steffen Thorsen (1999-11-09):
-# Winter time starts today Thursday, 30 September. Clocks will be turned back
-# by one hour.  This is the latest government decision and it's final!
-# The decision was taken because of the increase in working hours in
-# government's departments from six to seven hours.
-#
-# From Paul Eggert (2005-11-22):
-# Starting 2003 transitions are from Steffen Thorsen's web site timeanddate.com.
-#
-# From Steffen Thorsen (2005-11-23):
-# For Jordan I have received multiple independent user reports every year
-# about DST end dates, as the end-rule is different every year.
-#
-# From Steffen Thorsen (2006-10-01), after a heads-up from Hilal Malawi:
-# http://www.petranews.gov.jo/nepras/2006/Sep/05/4000.htm
-# "Jordan will switch to winter time on Friday, October 27".
-#
-
-# From Steffen Thorsen (2009-04-02):
-# This single one might be good enough, (2009-03-24, Arabic):
-# http://petra.gov.jo/Artical.aspx?Lng=2&Section=8&Artical=95279
-#
-# Google's translation:
-#
-# > The Council of Ministers decided in 2002 to adopt the principle of timely
-# > submission of the summer at 60 minutes as of midnight on the last Thursday
-# > of the month of March of each year.
-#
-# So - this means the midnight between Thursday and Friday since 2002.
-
-# From Arthur David Olson (2009-04-06):
-# We still have Jordan switching to DST on Thursdays in 2000 and 2001.
-
-# From Steffen Thorsen (2012-10-25):
-# Yesterday the government in Jordan announced that they will not
-# switch back to standard time this winter, so the will stay on DST
-# until about the same time next year (at least).
-# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?NewsID=88950
-
-# From Steffen Thorsen (2013-12-11):
-# Jordan Times and other sources say that Jordan is going back to
-# UTC+2 on 2013-12-19 at midnight:
-# http://jordantimes.com/govt-decides-to-switch-back-to-wintertime
-# Official, in Arabic:
-# http://www.petra.gov.jo/public_news/Nws_NewsDetails.aspx?Menu_ID=&Site_Id=2&lang=1&NewsID=133230&CatID=14
-# ... Our background/permalink about it
-# http://www.timeanddate.com/news/time/jordan-reverses-dst-decision.html
-# ...
-# http://www.petra.gov.jo/Public_News/Nws_NewsDetails.aspx?lang=2&site_id=1&NewsID=133313&Type=P
-# ... says midnight for the coming one and 1:00 for the ones in the future
-# (and they will use DST again next year, using the normal schedule).
-
-# From Paul Eggert (2013-12-11):
-# As Steffen suggested, consider the past 21-month experiment to be DST.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Jordan	1973	only	-	Jun	6	0:00	1:00	S
-Rule	Jordan	1973	1975	-	Oct	1	0:00	0	-
-Rule	Jordan	1974	1977	-	May	1	0:00	1:00	S
-Rule	Jordan	1976	only	-	Nov	1	0:00	0	-
-Rule	Jordan	1977	only	-	Oct	1	0:00	0	-
-Rule	Jordan	1978	only	-	Apr	30	0:00	1:00	S
-Rule	Jordan	1978	only	-	Sep	30	0:00	0	-
-Rule	Jordan	1985	only	-	Apr	1	0:00	1:00	S
-Rule	Jordan	1985	only	-	Oct	1	0:00	0	-
-Rule	Jordan	1986	1988	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Jordan	1986	1990	-	Oct	Fri>=1	0:00	0	-
-Rule	Jordan	1989	only	-	May	8	0:00	1:00	S
-Rule	Jordan	1990	only	-	Apr	27	0:00	1:00	S
-Rule	Jordan	1991	only	-	Apr	17	0:00	1:00	S
-Rule	Jordan	1991	only	-	Sep	27	0:00	0	-
-Rule	Jordan	1992	only	-	Apr	10	0:00	1:00	S
-Rule	Jordan	1992	1993	-	Oct	Fri>=1	0:00	0	-
-Rule	Jordan	1993	1998	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Jordan	1994	only	-	Sep	Fri>=15	0:00	0	-
-Rule	Jordan	1995	1998	-	Sep	Fri>=15	0:00s	0	-
-Rule	Jordan	1999	only	-	Jul	 1	0:00s	1:00	S
-Rule	Jordan	1999	2002	-	Sep	lastFri	0:00s	0	-
-Rule	Jordan	2000	2001	-	Mar	lastThu	0:00s	1:00	S
-Rule	Jordan	2002	2012	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2003	only	-	Oct	24	0:00s	0	-
-Rule	Jordan	2004	only	-	Oct	15	0:00s	0	-
-Rule	Jordan	2005	only	-	Sep	lastFri	0:00s	0	-
-Rule	Jordan	2006	2011	-	Oct	lastFri	0:00s	0	-
-Rule	Jordan	2013	only	-	Dec	20	0:00	0	-
-Rule	Jordan	2014	max	-	Mar	lastThu	24:00	1:00	S
-Rule	Jordan	2014	max	-	Oct	lastFri	0:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Amman	2:23:44 -	LMT	1931
-			2:00	Jordan	EE%sT
-
-
-# Kazakhstan
-
-# From Kazakhstan Embassy's News Bulletin No. 11
-# <http://www.kazsociety.org.uk/news/2005/03/30.htm> (2005-03-21):
-# The Government of Kazakhstan passed a resolution March 15 abolishing
-# daylight saving time citing lack of economic benefits and health
-# complications coupled with a decrease in productivity.
-#
-# From Branislav Kojic (in Astana) via Gwillim Law (2005-06-28):
-# ... what happened was that the former Kazakhstan Eastern time zone
-# was "blended" with the Central zone.  Therefore, Kazakhstan now has
-# two time zones, and difference between them is one hour.  The zone
-# closer to UTC is the former Western zone (probably still called the
-# same), encompassing four provinces in the west: Aqtöbe, Atyraū,
-# Mangghystaū, and West Kazakhstan.  The other zone encompasses
-# everything else....  I guess that would make Kazakhstan time zones
-# de jure UTC+5 and UTC+6 respectively.
-
-# From Stepan Golosunov (2016-03-27):
-# Review of the linked documents from http://adilet.zan.kz/
-# produced the following data for post-1991 Kazakhstan:
-#
-# 0. Act of the Cabinet of Ministers of the USSR
-# from 1991-02-04 No. 20
-# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102010545
-# removed the extra hour ("decree time") on the territory of the USSR
-# starting with the last Sunday of March 1991.
-# It also allowed (but not mandated) Kazakh SSR, Kirghiz SSR, Tajik SSR,
-# Turkmen SSR and Uzbek SSR to not have "summer" time.
-#
-# The 1992-01-13 act also refers to the act of the Cabinet of Ministers
-# of the Kazakh SSR from 1991-03-20 No. 170 "About the act of the Cabinet
-# of Ministers of the USSR from 1991-02-04 No. 20" but I didn't found its
-# text.
-#
-# According to Izvestia newspaper No. 68 (23334) from 1991-03-20
-# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
-# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
-# transition to "summer" time:
-# Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
-# Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
-# were to move clocks 1 hour forward.
-# Kazakh SSR (excluding Uralsk oblast); Republic of Kyrgyzstan, Tajik
-# SSR; Andijan, Jizzakh, Namangan, Sirdarya, Tashkent, Fergana oblasts
-# of the Uzbek SSR were to move clocks 1 hour backwards.
-# Other territories were to not move clocks.
-# When the "summer" time would end on 1991-09-29, clocks were to be
-# moved 1 hour backwards on the territory of the USSR excluding
-# Kazakhstan, Kirghizia, Uzbekistan, Turkmenia, Tajikistan.
-#
-# Apparently there were last minute changes. Apparently Kazakh act No. 170
-# was one of such changes.
-#
-# https://ru.wikipedia.org/wiki/Декретное время
-# claims that Sovetskaya Rossiya newspaper on 1991-03-29 published that
-# Nenets autonomous okrug, Komi and Kazakhstan (excluding Uralsk oblast)
-# were to not move clocks and Uralsk oblast was to move clocks
-# forward; on 1991-09-29 Kazakhstan was to move clocks backwards.
-# (Probably there were changes even after that publication. There is an
-# article claiming that Kaliningrad oblast decided on 1991-03-29 to not
-# move clocks.)
-#
-# This implies that on 1991-03-31 Asia/Oral remained on +04/+05 while
-# the rest of Kazakhstan switched from +06/+07 to +05/06 or from +05/06
-# to +04/+05. It's unclear how Qyzylorda oblast moved into the fifth
-# time belt. (By switching from +04/+05 to +05/+06 on 1991-09-29?) ...
-#
-# 1. Act of the Cabinet of Ministers of the Republic of Kazakhstan
-# from 1992-01-13 No. 28
-# http://adilet.zan.kz/rus/docs/P920000028_
-# (text includes modification from the 1996 act)
-# introduced new rules for calculation of time, mirroring Russian
-# 1992-01-08 act.  It specified that time would be calculated
-# according to time belts plus extra hour ("decree time"), moved clocks
-# on the whole territory of Kazakhstan 1 hour forward on 1992-01-19 at
-# 2:00, specified DST rules.  It acknowledged that Kazakhstan was
-# located in the fourth and the fifth time belts and specified the
-# border between them to be located east of Qostanay and Aktyubinsk
-# oblasts (notably including Turgai and Qyzylorda oblasts into the fifth
-# time belt).
-#
-# This means switch on 1992-01-19 at 2:00 from +04/+05 to +05/+06 for
-# Asia/Aqtau, Asia/Aqtobe, Asia/Oral, Atyraū and Qostanay oblasts; from
-# +05/+06 to +06/+07 for Asia/Almaty and Asia/Qyzylorda (and Arkalyk)....
-#
-# 2. Act of the Cabinet of Ministers of the Republic of Kazakhstan
-# from 1992-03-27 No. 284
-# http://adilet.zan.kz/rus/docs/P920000284_
-# cancels extra hour ("decree time") for Uralsk and Qyzylorda oblasts
-# since the last Sunday of March 1992, while keeping them in the fourth
-# and the fifth time belts respectively.
-#
-# 3. Order of the Prime Minister of the Republic of Kazakhstan
-# from 1994-09-23 No. 384
-# http://adilet.zan.kz/rus/docs/R940000384_
-# cancels the extra hour ("decree time") on the territory of Mangghystaū
-# oblast since the last Sunday of September 1994 (saying that time on
-# the territory would correspond to the third time belt as a
-# result)....
-#
-# 4. Act of the Government of the Republic of Kazakhstan
-# from 1996-05-08 No. 575
-# http://adilet.zan.kz/rus/docs/P960000575_
-# amends the 1992-01-13 act to end summer time in October instead
-# of September, mirroring identical Russian change from 1996-04-23 act.
-#
-# 5. Act of the Government of the Republic of Kazakhstan
-# from 1999-03-26 No. 305
-# http://adilet.zan.kz/rus/docs/P990000305_
-# cancels the extra hour ("decree time") for Atyraū oblast since the
-# last Sunday of March 1999 while retaining the oblast in the fourth
-# time belt.
-#
-# This means change from +05/+06 to +04/+05....
-#
-# 6. Act of the Government of the Republic of Kazakhstan
-# from 2000-11-23 No. 1749
-# http://adilet.zan.kz/rus/archive/docs/P000001749_/23.11.2000
-# replaces the previous five documents.
-#
-# The only changes I noticed are in definition of the border between the
-# fourth and the fifth time belts.  They account for changes in spelling
-# and administrative division (splitting of Turgai oblast in 1997
-# probably changed time in territories incorporated into Qostanay oblast
-# (including Arkalyk) from +06/+07 to +05/+06) and move Qyzylorda oblast
-# from being in the fifth time belt and not using decree time into the
-# fourth time belt (no change in practice).
-#
-# 7. Act of the Government of the Republic of Kazakhstan
-# from 2003-12-29 No. 1342
-# http://adilet.zan.kz/rus/docs/P030001342_
-# modified the 2000-11-23 act.  No relevant changes, apparently.
-#
-# 8. Act of the Government of the Republic of Kazakhstan
-# from 2004-07-20 No. 775
-# http://adilet.zan.kz/rus/archive/docs/P040000775_/20.07.2004
-# modified the 2000-11-23 act to move Qostanay and Qyzylorda oblasts into
-# the fifth time belt and add Aktobe oblast to the list of regions not
-# using extra hour ("decree time"), leaving Kazakhstan with only 2 time
-# zones (+04/+05 and +06/+07).  The changes were to be implemented
-# during DST transitions in 2004 and 2005 but the acts got radically
-# amended before implementation happened.
-#
-# 9. Act of the Government of the Republic of Kazakhstan
-# from 2004-09-15 No. 1059
-# http://adilet.zan.kz/rus/docs/P040001059_
-# modified the 2000-11-23 act to remove exceptions from the "decree time"
-# (leaving Kazakhstan in +05/+06 and +06/+07 zones), amended the
-# 2004-07-20 act to implement changes for Atyraū, West Kazakhstan,
-# Qostanay, Qyzylorda and Mangghystaū oblasts by not moving clocks
-# during the 2004 transition to "winter" time.
-#
-# This means transition from +04/+05 to +05/+06 for Atyraū oblast (no
-# zone currently), Asia/Oral, Asia/Aqtau and transition from +05/+06 to
-# +06/+07 for Qostanay oblast (Qostanay and Arkalyk, no zones currently)
-# and Asia/Qyzylorda on 2004-10-31 at 3:00....
-#
-# 10. Act of the Government of the Republic of Kazakhstan
-# from 2005-03-15 No. 231
-# http://adilet.zan.kz/rus/docs/P050000231_
-# removes DST provisions from the 2000-11-23 act, removes most of the
-# (already implemented) provisions from the 2004-07-20 and 2004-09-15
-# acts, comes into effect 10 days after official publication.
-# The only practical effect seems to be the abolition of the summer
-# time.
-#
-# Unamended version of the act of the Government of the Russian Federation
-# No. 23 from 1992-01-08 [See 'europe' file for details].
-# Kazakh 1992-01-13 act appears to provide the same rules and 1992-03-27
-# act was to be enacted on the last Sunday of March 1992.
-
-# From Stepan Golosunov (2016-11-08):
-# Turgai reorganization should affect only southern part of Qostanay
-# oblast.  Which should probably be separated into Asia/Arkalyk zone.
-# (There were also 1970, 1988 and 1990 Turgai oblast reorganizations
-# according to wikipedia.)
-#
-# [For Qostanay] http://www.ng.kz/gazeta/195/hranit/
-# suggests that clocks were to be moved 40 minutes backwards on
-# 1920-01-01 to the fourth time belt.  But I do not understand
-# how that could happen....
-#
-# [For Atyrau and Oral] 1919 decree
-# (http://www.worldtimezone.com/dst_news/dst_news_russia-1919-02-08.html
-# and in Byalokoz) lists Ural river (plus 10 versts on its left bank) in
-# the third time belt (before 1930 this means +03).
-
-# From Paul Eggert (2016-12-06):
-# The tables below reflect Golosunov's remarks, with exceptions as noted.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#
-# Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
-# This includes KZ-AKM, KZ-ALA, KZ-ALM, KZ-AST, KZ-BAY, KZ-VOS, KZ-ZHA,
-# KZ-KAR, KZ-SEV, KZ-PAV, and KZ-YUZ.
-Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
-			5:00	-	+05	1930 Jun 21
-			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
-			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
-			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
-			6:00	-	+06
-# Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
-# This currently includes Qostanay (aka Kostanay, Kustanay) (KZ-KUS);
-# see comments below.
-Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
-			4:00	-	+04	1930 Jun 21
-			5:00	-	+05	1981 Apr  1
-			5:00	1:00	+06	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
-			4:00 RussiaAsia	+04/+05	1991 Sep 29  2:00s
-			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
-			6:00 RussiaAsia	+06/+07	1992 Mar 29  2:00s
-			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
-			6:00	-	+06
-# The following zone is like Asia/Qyzylorda except for being one
-# hour earlier from 1991-09-29 to 1992-03-29.  The 1991/2 rules for
-# Qostanay are unclear partly because of the 1997 Turgai
-# reorganization, so this zone is commented out for now.
-#Zone	Asia/Qostanay	4:14:20 -	LMT	1924 May  2
-#			4:00	-	+04	1930 Jun 21
-#			5:00	-	+05	1981 Apr  1
-#			5:00	1:00	+06	1981 Oct  1
-#			6:00	-	+06	1982 Apr  1
-#			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
-#			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
-#			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
-#			6:00	-	+06
-#
-# Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
-Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
-			4:00	-	+04	1930 Jun 21
-			5:00	-	+05	1981 Apr  1
-			5:00	1:00	+06	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
-			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
-			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
-			5:00	-	+05
-# Mangghystaū (KZ-MAN)
-# Aqtau was not founded until 1963, but it represents an inhabited region,
-# so include time stamps before 1963.
-Zone	Asia/Aqtau	3:21:04	-	LMT	1924 May  2
-			4:00	-	+04	1930 Jun 21
-			5:00	-	+05	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
-			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
-			5:00 RussiaAsia	+05/+06	1994 Sep 25  2:00s
-			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
-			5:00	-	+05
-# Atyraū (KZ-ATY) is like Mangghystaū except it switched from
-# +04/+05 to +05/+06 in spring 1999, not fall 1994.
-Zone	Asia/Atyrau	3:27:44	-	LMT	1924 May  2
-			3:00	-	+03	1930 Jun 21
-			5:00	-	+05	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
-			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
-			5:00 RussiaAsia	+05/+06	1999 Mar 28  2:00s
-			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
-			5:00	-	+05
-# West Kazakhstan (KZ-ZAP)
-# From Paul Eggert (2016-03-18):
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-Zone	Asia/Oral	3:25:24	-	LMT	1924 May  2 # or Ural'sk
-			3:00	-	+03	1930 Jun 21
-			5:00	-	+05	1981 Apr  1
-			5:00	1:00	+06	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1989 Mar 26  2:00s
-			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
-			5:00 RussiaAsia	+05/+06	1992 Mar 29  2:00s
-			4:00 RussiaAsia	+04/+05	2004 Oct 31  2:00s
-			5:00	-	+05
-
-# Kyrgyzstan (Kirgizstan)
-# Transitions through 1991 are from Shanks & Pottenger.
-
-# From Paul Eggert (2005-08-15):
-# According to an article dated today in the Kyrgyzstan Development Gateway
-# http://eng.gateway.kg/cgi-bin/page.pl?id=1&story_name=doc9979.shtml
-# Kyrgyzstan is canceling the daylight saving time system.  I take the article
-# to mean that they will leave their clocks at 6 hours ahead of UTC.
-# From Malik Abdugaliev (2005-09-21):
-# Our government cancels daylight saving time 6th of August 2005.
-# From 2005-08-12 our GMT-offset is +6, w/o any daylight saving.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Kyrgyz	1992	1996	-	Apr	Sun>=7	0:00s	1:00	S
-Rule	Kyrgyz	1992	1996	-	Sep	lastSun	0:00	0	-
-Rule	Kyrgyz	1997	2005	-	Mar	lastSun	2:30	1:00	S
-Rule	Kyrgyz	1997	2004	-	Oct	lastSun	2:30	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Bishkek	4:58:24 -	LMT	1924 May  2
-			5:00	-	+05	1930 Jun 21
-			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
-			5:00 RussiaAsia	+05/+06	1991 Aug 31  2:00
-			5:00	Kyrgyz	+05/+06	2005 Aug 12
-			6:00	-	+06
-
-###############################################################################
-
-# Korea (North and South)
-
-# From Annie I. Bang (2006-07-10):
-# http://www.koreaherald.com/view.php?ud=200607100012
-# Korea ran a daylight saving program from 1949-61 but stopped it
-# during the 1950-53 Korean War.  The system was temporarily enforced
-# between 1987 and 1988 ...
-
-# From Sanghyuk Jung (2014-10-29):
-# http://mm.icann.org/pipermail/tz/2014-October/021830.html
-# According to the Korean Wikipedia
-# http://ko.wikipedia.org/wiki/한국_표준시
-# [oldid=12896437 2014-09-04 08:03 UTC]
-# DST in Republic of Korea was as follows....  And I checked old
-# newspapers in Korean, all articles correspond with data in Wikipedia.
-# For example, the article in 1948 (Korean Language) proved that DST
-# started at June 1 in that year.  For another example, the article in
-# 1988 said that DST started at 2:00 AM in that year.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	ROK	1948	only	-	Jun	 1	0:00	1:00	D
-Rule	ROK	1948	only	-	Sep	13	0:00	0	S
-Rule	ROK	1949	only	-	Apr	 3	0:00	1:00	D
-Rule	ROK	1949	1951	-	Sep	Sun>=8	0:00	0	S
-Rule	ROK	1950	only	-	Apr	 1	0:00	1:00	D
-Rule	ROK	1951	only	-	May	 6	0:00	1:00	D
-Rule	ROK	1955	only	-	May	 5	0:00	1:00	D
-Rule	ROK	1955	only	-	Sep	 9	0:00	0	S
-Rule	ROK	1956	only	-	May	20	0:00	1:00	D
-Rule	ROK	1956	only	-	Sep	30	0:00	0	S
-Rule	ROK	1957	1960	-	May	Sun>=1	0:00	1:00	D
-Rule	ROK	1957	1960	-	Sep	Sun>=18	0:00	0	S
-Rule	ROK	1987	1988	-	May	Sun>=8	2:00	1:00	D
-Rule	ROK	1987	1988	-	Oct	Sun>=8	3:00	0	S
-
-# From Paul Eggert (2016-08-23):
-# The Korean Wikipedia entry gives the following sources for UT offsets:
-#
-# 1908: Official Journal Article No. 3994 (decree No. 5)
-# 1912: Governor-General of Korea Official Gazette Issue No. 367
-#       (Announcement No. 338)
-# 1954: Presidential Decree No. 876 (1954-03-17)
-# 1961: Law No. 676 (1961-08-07)
-#
-# (Another source "1987: Law No. 3919 (1986-12-31)" was in the 2014-10-30
-# edition of the Korean Wikipedia entry.)
-#
-# I guessed that time zone abbreviations through 1945 followed the same
-# rules as discussed under Taiwan, with nominal switches from JST to KST
-# when the respective cities were taken over by the Allies after WWII.
-#
-# For Pyongyang, guess no changes from World War II until 2015, as we
-# have no information otherwise.
-
-# From Steffen Thorsen (2015-08-07):
-# According to many news sources, North Korea is going to change to
-# the 8:30 time zone on August 15, one example:
-# http://www.bbc.com/news/world-asia-33815049
-#
-# From Paul Eggert (2015-08-15):
-# Bells rang out midnight (00:00) Friday as part of the celebrations.  See:
-# Talmadge E. North Korea celebrates new time zone, 'Pyongyang Time'
-# http://news.yahoo.com/north-korea-celebrates-time-zone-pyongyang-time-164038128.html
-# There is no common English-language abbreviation for this time zone.
-# Use KST, as that's what we already use for 1954-1961 in ROK.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Seoul	8:27:52	-	LMT	1908 Apr  1
-			8:30	-	KST	1912 Jan  1
-			9:00	-	JST	1945 Sep  8
-			9:00	-	KST	1954 Mar 21
-			8:30	ROK	K%sT	1961 Aug 10
-			9:00	ROK	K%sT
-Zone	Asia/Pyongyang	8:23:00 -	LMT	1908 Apr  1
-			8:30	-	KST	1912 Jan  1
-			9:00	-	JST	1945 Aug 24
-			9:00	-	KST	2015 Aug 15 00:00
-			8:30	-	KST
-
-###############################################################################
-
-# Kuwait
-# See Asia/Riyadh.
-
-# Laos
-# See Asia/Bangkok.
-
-
-# Lebanon
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Lebanon	1920	only	-	Mar	28	0:00	1:00	S
-Rule	Lebanon	1920	only	-	Oct	25	0:00	0	-
-Rule	Lebanon	1921	only	-	Apr	3	0:00	1:00	S
-Rule	Lebanon	1921	only	-	Oct	3	0:00	0	-
-Rule	Lebanon	1922	only	-	Mar	26	0:00	1:00	S
-Rule	Lebanon	1922	only	-	Oct	8	0:00	0	-
-Rule	Lebanon	1923	only	-	Apr	22	0:00	1:00	S
-Rule	Lebanon	1923	only	-	Sep	16	0:00	0	-
-Rule	Lebanon	1957	1961	-	May	1	0:00	1:00	S
-Rule	Lebanon	1957	1961	-	Oct	1	0:00	0	-
-Rule	Lebanon	1972	only	-	Jun	22	0:00	1:00	S
-Rule	Lebanon	1972	1977	-	Oct	1	0:00	0	-
-Rule	Lebanon	1973	1977	-	May	1	0:00	1:00	S
-Rule	Lebanon	1978	only	-	Apr	30	0:00	1:00	S
-Rule	Lebanon	1978	only	-	Sep	30	0:00	0	-
-Rule	Lebanon	1984	1987	-	May	1	0:00	1:00	S
-Rule	Lebanon	1984	1991	-	Oct	16	0:00	0	-
-Rule	Lebanon	1988	only	-	Jun	1	0:00	1:00	S
-Rule	Lebanon	1989	only	-	May	10	0:00	1:00	S
-Rule	Lebanon	1990	1992	-	May	1	0:00	1:00	S
-Rule	Lebanon	1992	only	-	Oct	4	0:00	0	-
-Rule	Lebanon	1993	max	-	Mar	lastSun	0:00	1:00	S
-Rule	Lebanon	1993	1998	-	Sep	lastSun	0:00	0	-
-Rule	Lebanon	1999	max	-	Oct	lastSun	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Beirut	2:22:00 -	LMT	1880
-			2:00	Lebanon	EE%sT
-
-# Malaysia
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NBorneo	1935	1941	-	Sep	14	0:00	0:20	TS # one-Third Summer
-Rule	NBorneo	1935	1941	-	Dec	14	0:00	0	-
-#
-# peninsular Malaysia
-# taken from Mok Ly Yng (2003-10-30)
-# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Asia/Kuala_Lumpur	6:46:46 -	LMT	1901 Jan  1
-			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
-			7:00	-	+07	1933 Jan  1
-			7:00	0:20	+0720	1936 Jan  1
-			7:20	-	+0720	1941 Sep  1
-			7:30	-	+0730	1942 Feb 16
-			9:00	-	+09	1945 Sep 12
-			7:30	-	+0730	1982 Jan  1
-			8:00	-	+08
-# Sabah & Sarawak
-# From Paul Eggert (2014-08-12):
-# The data entries here are mostly from Shanks & Pottenger, but the 1942, 1945
-# and 1982 transition dates are from Mok Ly Yng.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Asia/Kuching	7:21:20	-	LMT	1926 Mar
-			7:30	-	+0730	1933
-			8:00 NBorneo  +08/+0820	1942 Feb 16
-			9:00	-	+09	1945 Sep 12
-			8:00	-	+08
-
-# Maldives
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Maldives	4:54:00 -	LMT	1880 # Male
-			4:54:00	-	MMT	1960 # Male Mean Time
-			5:00	-	+05
-
-# Mongolia
-
-# Shanks & Pottenger say that Mongolia has three time zones, but
-# The USNO (1995-12-21) and the CIA map Standard Time Zones of the World
-# (2005-03) both say that it has just one.
-
-# From Oscar van Vlijmen (1999-12-11):
-# General Information Mongolia
-# <http://www.mongoliatourism.gov.mn/general.htm> (1999-09)
-# "Time: Mongolia has two time zones. Three westernmost provinces of
-# Bayan-Ölgii, Uvs, and Hovd are one hour earlier than the capital city, and
-# the rest of the country follows the Ulaanbaatar time, which is UTC/GMT plus
-# eight hours."
-
-# From Rives McDow (1999-12-13):
-# Mongolia discontinued the use of daylight savings time in 1999; 1998
-# being the last year it was implemented.  The dates of implementation I am
-# unsure of, but most probably it was similar to Russia, except for the time
-# of implementation may have been different....
-# Some maps in the past have indicated that there was an additional time
-# zone in the eastern part of Mongolia, including the provinces of Dornod,
-# Sükhbaatar, and possibly Khentii.
-
-# From Paul Eggert (1999-12-15):
-# Naming and spelling is tricky in Mongolia.
-# We'll use Hovd (also spelled Chovd and Khovd) to represent the west zone;
-# the capital of the Hovd province is sometimes called Hovd, sometimes Dund-Us,
-# and sometimes Jirgalanta (with variant spellings), but the name Hovd
-# is good enough for our purposes.
-
-# From Rives McDow (2001-05-13):
-# In addition to Mongolia starting daylight savings as reported earlier
-# (adopted DST on 2001-04-27 02:00 local time, ending 2001-09-28),
-# there are three time zones.
-#
-# Provinces [at 7:00]: Bayan-Ölgii, Uvs, Khovd, Zavkhan, Govi-Altai
-# Provinces [at 8:00]: Khövsgöl, Bulgan, Arkhangai, Khentii, Töv,
-#	Bayankhongor, Övörkhangai, Dundgovi, Dornogovi, Ömnögovi
-# Provinces [at 9:00]: Dornod, Sükhbaatar
-#
-# [The province of Selenge is omitted from the above lists.]
-
-# From Ganbold Ts., Ulaanbaatar (2004-04-17):
-# Daylight saving occurs at 02:00 local time last Saturday of March.
-# It will change back to normal at 02:00 local time last Saturday of
-# September.... As I remember this rule was changed in 2001.
-#
-# From Paul Eggert (2004-04-17):
-# For now, assume Rives McDow's informant got confused about Friday vs
-# Saturday, and that his 2001 dates should have 1 added to them.
-
-# From Paul Eggert (2005-07-26):
-# We have wildly conflicting information about Mongolia's time zones.
-# Bill Bonnet (2005-05-19) reports that the US Embassy in Ulaanbaatar says
-# there is only one time zone and that DST is observed, citing Microsoft
-# Windows XP as the source.  Risto Nykänen (2005-05-16) reports that
-# travelmongolia.org says there are two time zones (UT +07, +08) with no DST.
-# Oscar van Vlijmen (2005-05-20) reports that the Mongolian Embassy in
-# Washington, DC says there are two time zones, with DST observed.
-# He also found
-# http://ubpost.mongolnews.mn/index.php?subaction=showcomments&id=1111634894&archive=&start_from=&ucat=1&
-# which also says that there is DST, and which has a comment by "Toddius"
-# (2005-03-31 06:05 +0700) saying "Mongolia actually has 3.5 time zones.
-# The West (OLGII) is +7 GMT, most of the country is ULAT is +8 GMT
-# and some Eastern provinces are +9 GMT but Sükhbaatar Aimag is SUHK +8.5 GMT.
-# The SUKH timezone is new this year, it is one of the few things the
-# parliament passed during the tumultuous winter session."
-# For now, let's ignore this information, until we have more confirmation.
-
-# From Ganbold Ts. (2007-02-26):
-# Parliament of Mongolia has just changed the daylight-saving rule in February.
-# They decided not to adopt daylight-saving time....
-# http://www.mongolnews.mn/index.php?module=unuudur&sec=view&id=15742
-
-# From Deborah Goldsmith (2008-03-30):
-# We received a bug report claiming that the tz database UTC offset for
-# Asia/Choibalsan (GMT+09:00) is incorrect, and that it should be GMT
-# +08:00 instead. Different sources appear to disagree with the tz
-# database on this, e.g.:
-#
-# http://www.timeanddate.com/worldclock/city.html?n=1026
-# http://www.worldtimeserver.com/current_time_in_MN.aspx
-#
-# both say GMT+08:00.
-
-# From Steffen Thorsen (2008-03-31):
-# eznis airways, which operates several domestic flights, has a flight
-# schedule here:
-# http://www.eznis.com/Container.jsp?id=112
-# (click the English flag for English)
-#
-# There it appears that flights between Choibalsan and Ulaanbaatar arrive
-# about 1:35 - 1:50 hours later in local clock time, no matter the
-# direction, while Ulaanbaatar-Khovd takes 2 hours in the Eastern
-# direction and 3:35 back, which indicates that Ulaanbaatar and Khovd are
-# in different time zones (like we know about), while Choibalsan and
-# Ulaanbaatar are in the same time zone (correction needed).
-
-# From Arthur David Olson (2008-05-19):
-# Assume that Choibalsan is indeed offset by 8:00.
-# XXX--in the absence of better information, assume that transition
-# was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
-# this is almost surely wrong.
-
-# From Ganbold Tsagaankhuu (2015-03-10):
-# It seems like yesterday Mongolian Government meeting has concluded to use
-# daylight saving time in Mongolia....  Starting at 2:00AM of last Saturday of
-# March 2015, daylight saving time starts.  And 00:00AM of last Saturday of
-# September daylight saving time ends.  Source:
-# http://zasag.mn/news/view/8969
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
-Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
-# Shanks & Pottenger and IATA SSIM say 1990s switches occurred at 00:00,
-# but McDow says the 2001 switches occurred at 02:00.  Also, IATA SSIM
-# (1996-09) says 1996-10-25.  Go with Shanks & Pottenger through 1998.
-#
-# Shanks & Pottenger say that the Sept. 1984 through Sept. 1990 switches
-# in Choibalsan (more precisely, in Dornod and Sükhbaatar) took place
-# at 02:00 standard time, not at 00:00 local time as in the rest of
-# the country.  That would be odd, and possibly is a result of their
-# correction of 02:00 (in the previous edition) not being done correctly
-# in the latest edition; so ignore it for now.
-
-# From Ganbold Tsagaankhuu (2017-02-09):
-# Mongolian Government meeting has concluded today to cancel daylight
-# saving time adoption in Mongolia.  Source: http://zasag.mn/news/view/16192
-
-Rule	Mongol	1985	1998	-	Mar	lastSun	0:00	1:00	S
-Rule	Mongol	1984	1998	-	Sep	lastSun	0:00	0	-
-# IATA SSIM (1999-09) says Mongolia no longer observes DST.
-Rule	Mongol	2001	only	-	Apr	lastSat	2:00	1:00	S
-Rule	Mongol	2001	2006	-	Sep	lastSat	2:00	0	-
-Rule	Mongol	2002	2006	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	2016	-	Mar	lastSat	2:00	1:00	S
-Rule	Mongol	2015	2016	-	Sep	lastSat	0:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Hovd, a.k.a. Chovd, Dund-Us, Dzhargalant, Khovd, Jirgalanta
-Zone	Asia/Hovd	6:06:36 -	LMT	1905 Aug
-			6:00	-	+06	1978
-			7:00	Mongol	+07/+08
-# Ulaanbaatar, a.k.a. Ulan Bataar, Ulan Bator, Urga
-Zone	Asia/Ulaanbaatar 7:07:32 -	LMT	1905 Aug
-			7:00	-	+07	1978
-			8:00	Mongol	+08/+09
-# Choibalsan, a.k.a. Bajan Tümen, Bajan Tumen, Chojbalsan,
-# Choybalsan, Sanbejse, Tchoibalsan
-Zone	Asia/Choibalsan	7:38:00 -	LMT	1905 Aug
-			7:00	-	+07	1978
-			8:00	-	+08	1983 Apr
-			9:00	Mongol	+09/+10	2008 Mar 31
-			8:00	Mongol	+08/+09
-
-# Nepal
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Kathmandu	5:41:16 -	LMT	1920
-			5:30	-	+0530	1986
-			5:45	-	+0545
-
-# Oman
-# See Asia/Dubai.
-
-# Pakistan
-
-# From Rives McDow (2002-03-13):
-# I have been advised that Pakistan has decided to adopt dst on a
-# TRIAL basis for one year, starting 00:01 local time on April 7, 2002
-# and ending at 00:01 local time October 6, 2002.  This is what I was
-# told, but I believe that the actual time of change may be 00:00; the
-# 00:01 was to make it clear which day it was on.
-
-# From Paul Eggert (2002-03-15):
-# Jesper Nørgaard found this URL:
-# http://www.pak.gov.pk/public/news/app/app06_dec.htm
-# (dated 2001-12-06) which says that the Cabinet adopted a scheme "to
-# advance the clocks by one hour on the night between the first
-# Saturday and Sunday of April and revert to the original position on
-# 15th October each year".  This agrees with McDow's 04-07 at 00:00,
-# but disagrees about the October transition, and makes it sound like
-# it's not on a trial basis.  Also, the "between the first Saturday
-# and Sunday of April" phrase, if taken literally, means that the
-# transition takes place at 00:00 on the first Sunday on or after 04-02.
-
-# From Paul Eggert (2003-02-09):
-# DAWN <http://www.dawn.com/2002/10/06/top13.htm> reported on 2002-10-05
-# that 2002 DST ended that day at midnight.  Go with McDow for now.
-
-# From Steffen Thorsen (2003-03-14):
-# According to http://www.dawn.com/2003/03/07/top15.htm
-# there will be no DST in Pakistan this year:
-#
-# ISLAMABAD, March 6: Information and Media Development Minister Sheikh
-# Rashid Ahmed on Thursday said the cabinet had reversed a previous
-# decision to advance clocks by one hour in summer and put them back by
-# one hour in winter with the aim of saving light hours and energy.
-#
-# The minister told a news conference that the experiment had rather
-# shown 8 per cent higher consumption of electricity.
-
-# From Alex Krivenyshev (2008-05-15):
-#
-# Here is an article that Pakistan plan to introduce Daylight Saving Time
-# on June 1, 2008 for 3 months.
-#
-# "... The federal cabinet on Wednesday announced a new conservation plan to
-# help reduce load shedding by approving the closure of commercial centres at
-# 9pm and moving clocks forward by one hour for the next three months. ...."
-#
-# http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
-# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
-
-# From Arthur David Olson (2008-05-19):
-# XXX--midnight transitions is a guess; 2008 only is a guess.
-
-# From Alexander Krivenyshev (2008-08-28):
-# Pakistan government has decided to keep the watches one-hour advanced
-# for another 2 months - plan to return to Standard Time on October 31
-# instead of August 31.
-#
-# http://www.worldtimezone.com/dst_news/dst_news_pakistan02.html
-# http://dailymailnews.com/200808/28/news/dmbrn03.html
-
-# From Alexander Krivenyshev (2009-04-08):
-# Based on previous media reports that "... proposed plan to
-# advance clocks by one hour from May 1 will cause disturbance
-# to the working schedules rather than bringing discipline in
-# official working."
-# http://www.thenews.com.pk/daily_detail.asp?id=171280
-#
-# recent news that instead of May 2009 - Pakistan plan to
-# introduce DST from April 15, 2009
-#
-# FYI: Associated Press Of Pakistan
-# April 08, 2009
-# Cabinet okays proposal to advance clocks by one hour from April 15
-# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=73043&Itemid=1
-# http://www.worldtimezone.com/dst_news/dst_news_pakistan05.html
-#
-# ....
-# The Federal Cabinet on Wednesday approved the proposal to
-# advance clocks in the country by one hour from April 15 to
-# conserve energy"
-
-# From Steffen Thorsen (2009-09-17):
-# "The News International," Pakistan reports that: "The Federal
-# Government has decided to restore the previous time by moving the
-# clocks backward by one hour from October 1. A formal announcement to
-# this effect will be made after the Prime Minister grants approval in
-# this regard."
-# http://www.thenews.com.pk/updates.asp?id=87168
-
-# From Alexander Krivenyshev (2009-09-28):
-# According to Associated Press Of Pakistan, it is confirmed that
-# Pakistan clocks across the country would be turned back by an hour from
-# October 1, 2009.
-#
-# "Clocks to go back one hour from 1 Oct"
-# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=86715&Itemid=2
-# http://www.worldtimezone.com/dst_news/dst_news_pakistan07.htm
-#
-# From Steffen Thorsen (2009-09-29):
-# Now they seem to have changed their mind, November 1 is the new date:
-# http://www.thenews.com.pk/top_story_detail.asp?Id=24742
-# "The country's clocks will be reversed by one hour on November 1.
-# Officials of Federal Ministry for Interior told this to Geo News on
-# Monday."
-#
-# And more importantly, it seems that these dates will be kept every year:
-# "It has now been decided that clocks will be wound forward by one hour
-# on April 15 and reversed by an hour on November 1 every year without
-# obtaining prior approval, the officials added."
-#
-# We have confirmed this year's end date with both with the Ministry of
-# Water and Power and the Pakistan Electric Power Company:
-# http://www.timeanddate.com/news/time/pakistan-ends-dst09.html
-
-# From Christoph Göhre (2009-10-01):
-# [T]he German Consulate General in Karachi reported me today that Pakistan
-# will go back to standard time on 1st of November.
-
-# From Steffen Thorsen (2010-03-26):
-# Steffen Thorsen wrote:
-# > On Thursday (2010-03-25) it was announced that DST would start in
-# > Pakistan on 2010-04-01.
-# >
-# > Then today, the president said that they might have to revert the
-# > decision if it is not supported by the parliament. So at the time
-# > being, it seems unclear if DST will be actually observed or not - but
-# > April 1 could be a more likely date than April 15.
-# Now, it seems that the decision to not observe DST in final:
-#
-# "Govt Withdraws Plan To Advance Clocks"
-# http://www.apakistannews.com/govt-withdraws-plan-to-advance-clocks-172041
-#
-# "People laud PM's announcement to end DST"
-# http://www.app.com.pk/en_/index.php?option=com_content&task=view&id=99374&Itemid=2
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule Pakistan	2002	only	-	Apr	Sun>=2	0:00	1:00	S
-Rule Pakistan	2002	only	-	Oct	Sun>=2	0:00	0	-
-Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
-Rule Pakistan	2008	2009	-	Nov	1	0:00	0	-
-Rule Pakistan	2009	only	-	Apr	15	0:00	1:00	S
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Karachi	4:28:12 -	LMT	1907
-			5:30	-	+0530	1942 Sep
-			5:30	1:00	+0630	1945 Oct 15
-			5:30	-	+0530	1951 Sep 30
-			5:00	-	+05	1971 Mar 26
-			5:00 Pakistan	PK%sT	# Pakistan Time
-
-# Palestine
-
-# From Amos Shapir (1998-02-15):
-#
-# From 1917 until 1948-05-15, all of Palestine, including the parts now
-# known as the Gaza Strip and the West Bank, was under British rule.
-# Therefore the rules given for Israel for that period, apply there too...
-#
-# The Gaza Strip was under Egyptian rule between 1948-05-15 until 1967-06-05
-# (except a short occupation by Israel from 1956-11 till 1957-03, but no
-# time zone was affected then).  It was never formally annexed to Egypt,
-# though.
-#
-# The rest of Palestine was under Jordanian rule at that time, formally
-# annexed in 1950 as the West Bank (and the word "Trans" was dropped from
-# the country's previous name of "the Hashemite Kingdom of the
-# Trans-Jordan").  So the rules for Jordan for that time apply.  Major
-# towns in that area are Nablus (Shchem), El-Halil (Hebron), Ramallah, and
-# East Jerusalem.
-#
-# Both areas were occupied by Israel in June 1967, but not annexed (except
-# for East Jerusalem).  They were on Israel time since then; there might
-# have been a Military Governor's order about time zones, but I'm not aware
-# of any (such orders may have been issued semi-annually whenever summer
-# time was in effect, but maybe the legal aspect of time was just neglected).
-#
-# The Palestinian Authority was established in 1993, and got hold of most
-# towns in the West Bank and Gaza by 1995.  I know that in order to
-# demonstrate...independence, they have been switching to
-# summer time and back on a different schedule than Israel's, but I don't
-# know when this was started, or what algorithm is used (most likely the
-# Jordanian one).
-#
-# To summarize, the table should probably look something like that:
-#
-# Area \ when | 1918-1947 | 1948-1967 | 1967-1995 | 1996-
-# ------------+-----------+-----------+-----------+-----------
-# Israel      | Zion      | Zion      | Zion      | Zion
-# West bank   | Zion      | Jordan    | Zion      | Jordan
-# Gaza        | Zion      | Egypt     | Zion      | Jordan
-#
-# I guess more info may be available from the PA's web page (if/when they
-# have one).
-
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that Gaza did not observe DST until 1957, but go
-# with Shapir and assume that it observed DST from 1940 through 1947,
-# and that it used Jordanian rules starting in 1996.
-# We don't yet need a separate entry for the West Bank, since
-# the only differences between it and Gaza that we know about
-# occurred before our cutoff date of 1970.
-# However, as we get more information, we may need to add entries
-# for parts of the West Bank as they transitioned from Israel's rules
-# to Palestine's rules.
-
-# From IINS News Service - Israel - 1998-03-23 10:38:07 Israel time,
-# forwarded by Ephraim Silverberg:
-#
-# Despite the fact that Israel changed over to daylight savings time
-# last week, the PLO Authority (PA) has decided not to turn its clocks
-# one-hour forward at this time.  As a sign of independence from Israeli rule,
-# the PA has decided to implement DST in April.
-
-# From Paul Eggert (1999-09-20):
-# Daoud Kuttab writes in Holiday havoc
-# http://www.jpost.com/com/Archive/22.Apr.1999/Opinion/Article-2.html
-# (Jerusalem Post, 1999-04-22) that
-# the Palestinian National Authority changed to DST on 1999-04-15.
-# I vaguely recall that they switch back in October (sorry, forgot the source).
-# For now, let's assume that the spring switch was at 24:00,
-# and that they switch at 0:00 on the 3rd Fridays of April and October.
-
-# From Paul Eggert (2005-11-22):
-# Starting 2004 transitions are from Steffen Thorsen's web site timeanddate.com.
-
-# From Steffen Thorsen (2005-11-23):
-# A user from Gaza reported that Gaza made the change early because of
-# the Ramadan.  Next year Ramadan will be even earlier, so I think
-# there is a good chance next year's end date will be around two weeks
-# earlier - the same goes for Jordan.
-
-# From Steffen Thorsen (2006-08-17):
-# I was informed by a user in Bethlehem that in Bethlehem it started the
-# same day as Israel, and after checking with other users in the area, I
-# was informed that they started DST one day after Israel.  I was not
-# able to find any authoritative sources at the time, nor details if
-# Gaza changed as well, but presumed Gaza to follow the same rules as
-# the West Bank.
-
-# From Steffen Thorsen (2006-09-26):
-# according to the Palestine News Network (2006-09-19):
-# http://english.pnn.ps/index.php?option=com_content&task=view&id=596&Itemid=5
-# > The Council of Ministers announced that this year its winter schedule
-# > will begin early, as of midnight Thursday.  It is also time to turn
-# > back the clocks for winter.  Friday will begin an hour late this week.
-# I guess it is likely that next year's date will be moved as well,
-# because of the Ramadan.
-
-# From Jesper Nørgaard Welen (2007-09-18):
-# According to Steffen Thorsen's web site the Gaza Strip and the rest of the
-# Palestinian territories left DST early on 13.th. of September at 2:00.
-
-# From Paul Eggert (2007-09-20):
-# My understanding is that Gaza and the West Bank disagree even over when
-# the weekend is (Thursday+Friday versus Friday+Saturday), so I'd be a bit
-# surprised if they agreed about DST.  But for now, assume they agree.
-# For lack of better information, predict that future changes will be
-# the 2nd Thursday of September at 02:00.
-
-# From Alexander Krivenyshev (2008-08-28):
-# Here is an article, that Mideast running on different clocks at Ramadan.
-#
-# Gaza Strip (as Egypt) ended DST at midnight Thursday (Aug 28, 2008), while
-# the West Bank will end Daylight Saving Time at midnight Sunday (Aug 31, 2008).
-#
-# http://www.guardian.co.uk/world/feedarticle/7759001
-# http://www.abcnews.go.com/International/wireStory?id=5676087
-# http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html
-
-# From Alexander Krivenyshev (2009-03-26):
-# According to the Palestine News Network (arabic.pnn.ps), Palestinian
-# government decided to start Daylight Time on Thursday night March
-# 26 and continue until the night of 27 September 2009.
-#
-# (in Arabic)
-# http://arabic.pnn.ps/index.php?option=com_content&task=view&id=50850
-#
-# (English translation)
-# http://www.worldtimezone.com/dst_news/dst_news_westbank01.html
-
-# From Steffen Thorsen (2009-08-31):
-# Palestine's Council of Ministers announced that they will revert back to
-# winter time on Friday, 2009-09-04.
-#
-# One news source:
-# http://www.safa.ps/ara/?action=showdetail&seid=4158
-# (Palestinian press agency, Arabic),
-# Google translate: "Decided that the Palestinian government in Ramallah
-# headed by Salam Fayyad, the start of work in time for the winter of
-# 2009, starting on Friday approved the fourth delay Sept. clock sixty
-# minutes per hour as of Friday morning."
-#
-# We are not sure if Gaza will do the same, last year they had a different
-# end date, we will keep this page updated:
-# http://www.timeanddate.com/news/time/westbank-gaza-dst-2009.html
-
-# From Alexander Krivenyshev (2009-09-02):
-# Seems that Gaza Strip will go back to Winter Time same date as West Bank.
-#
-# According to Palestinian Ministry Of Interior, West Bank and Gaza Strip plan
-# to change time back to Standard time on September 4, 2009.
-#
-# "Winter time unite the West Bank and Gaza"
-# (from Palestinian National Authority):
-# http://www.moi.gov.ps/en/?page=633167343250594025&nid=11505
-# http://www.worldtimezone.com/dst_news/dst_news_gazastrip02.html
-
-# From Alexander Krivenyshev (2010-03-19):
-# According to Voice of Palestine DST will last for 191 days, from March
-# 26, 2010 till "the last Sunday before the tenth day of Tishri
-# (October), each year" (October 03, 2010?)
-#
-# http://palvoice.org/forums/showthread.php?t=245697
-# (in Arabic)
-# http://www.worldtimezone.com/dst_news/dst_news_westbank03.html
-
-# From Steffen Thorsen (2010-03-24):
-# ...Ma'an News Agency reports that Hamas cabinet has decided it will
-# start one day later, at 12:01am. Not sure if they really mean 12:01am or
-# noon though:
-#
-# http://www.maannews.net/eng/ViewDetails.aspx?ID=271178
-# (Ma'an News Agency)
-# "At 12:01am Friday, clocks in Israel and the West Bank will change to
-# 1:01am, while Gaza clocks will change at 12:01am Saturday morning."
-
-# From Steffen Thorsen (2010-08-11):
-# According to several sources, including
-# http://www.maannews.net/eng/ViewDetails.aspx?ID=306795
-# the clocks were set back one hour at 2010-08-11 00:00:00 local time in
-# Gaza and the West Bank.
-# Some more background info:
-# http://www.timeanddate.com/news/time/westbank-gaza-end-dst-2010.html
-
-# From Steffen Thorsen (2011-08-26):
-# Gaza and the West Bank did go back to standard time in the beginning of
-# August, and will now enter daylight saving time again on 2011-08-30
-# 00:00 (so two periods of DST in 2011). The pause was because of
-# Ramadan.
-#
-# http://www.maannews.net/eng/ViewDetails.aspx?ID=416217
-# Additional info:
-# http://www.timeanddate.com/news/time/palestine-dst-2011.html
-
-# From Alexander Krivenyshev (2011-08-27):
-# According to the article in The Jerusalem Post:
-# "...Earlier this month, the Palestinian government in the West Bank decided to
-# move to standard time for 30 days, during Ramadan. The Palestinians in the
-# Gaza Strip accepted the change and also moved their clocks one hour back.
-# The Hamas government said on Saturday that it won't observe summertime after
-# the Muslim feast of Id al-Fitr, which begins on Tuesday..."
-# ...
-# http://www.jpost.com/MiddleEast/Article.aspx?id=235650
-# http://www.worldtimezone.com/dst_news/dst_news_gazastrip05.html
-# The rules for Egypt are stolen from the 'africa' file.
-
-# From Steffen Thorsen (2011-09-30):
-# West Bank did end Daylight Saving Time this morning/midnight (2011-09-30
-# 00:00).
-# So West Bank and Gaza now have the same time again.
-#
-# Many sources, including:
-# http://www.maannews.net/eng/ViewDetails.aspx?ID=424808
-
-# From Steffen Thorsen (2012-03-26):
-# Palestinian news sources tell that both Gaza and West Bank will start DST
-# on Friday (Thursday midnight, 2012-03-29 24:00).
-# Some of many sources in Arabic:
-# http://www.samanews.com/index.php?act=Show&id=122638
-#
-# http://safa.ps/details/news/74352/%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-%D8%A8%D8%A7%D9%84%D8%B6%D9%81%D8%A9-%D9%88%D8%BA%D8%B2%D8%A9-%D9%84%D9%8A%D9%84%D8%A9-%D8%A7%D9%84%D8%AC%D9%85%D8%B9%D8%A9.html
-#
-# Our brief summary:
-# http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html
-
-# From Steffen Thorsen (2013-03-26):
-# The following news sources tells that Palestine will "start daylight saving
-# time from midnight on Friday, March 29, 2013" (translated).
-# [These are in Arabic and are for Gaza and for Ramallah, respectively.]
-# http://www.samanews.com/index.php?act=Show&id=154120
-# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html
-
-# From Steffen Thorsen (2013-09-24):
-# The Gaza and West Bank are ending DST Thursday at midnight
-# (2013-09-27 00:00:00) (one hour earlier than last year...).
-# This source in English, says "that winter time will go into effect
-# at midnight on Thursday in the West Bank and Gaza Strip":
-# http://english.wafa.ps/index.php?action=detail&id=23246
-# official source...:
-# http://www.palestinecabinet.gov.ps/ar/Views/ViewDetails.aspx?pid=1252
-
-# From Steffen Thorsen (2015-03-03):
-# Sources such as http://www.alquds.com/news/article/view/id/548257
-# and http://www.raya.ps/ar/news/890705.html say Palestine areas will
-# start DST on 2015-03-28 00:00 which is one day later than expected.
-#
-# From Paul Eggert (2015-03-03):
-# http://www.timeanddate.com/time/change/west-bank/ramallah?year=2014
-# says that the fall 2014 transition was Oct 23 at 24:00.
-
-# From Hannah Kreitem (2016-03-09):
-# http://www.palestinecabinet.gov.ps/WebSite/ar/ViewDetails?ID=31728
-# [Google translation]: "The Council also decided to start daylight
-# saving in Palestine as of one o'clock on Saturday morning,
-# 2016-03-26, to provide the clock 60 minutes ahead."
-#
-# From Paul Eggert (2016-03-12):
-# Predict spring transitions on March's last Saturday at 01:00 from now on.
-
-# From Sharef Mustafa (2016-10-19):
-# [T]he Palestinian cabinet decision (Mar 8th 2016) published on
-# http://www.palestinecabinet.gov.ps/WebSite/Upload/Decree/GOV_17/16032016134830.pdf
-# states that summer time will end on Oct 29th at 01:00.
-#
-# From Tim Parenti (2016-10-19):
-# Predict fall transitions on October's last Saturday at 01:00 from now on.
-# This is consistent with the 2016 transition as well as our spring
-# predictions.
-#
-# From Paul Eggert (2016-10-19):
-# It's also consistent with predictions in the following URLs today:
-# http://www.timeanddate.com/time/change/gaza-strip/gaza
-# http://www.timeanddate.com/time/change/west-bank/hebron
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
-Rule EgyptAsia	1957	1958	-	Oct	 1	0:00	0	-
-Rule EgyptAsia	1958	only	-	May	 1	0:00	1:00	S
-Rule EgyptAsia	1959	1967	-	May	 1	1:00	1:00	S
-Rule EgyptAsia	1959	1965	-	Sep	30	3:00	0	-
-Rule EgyptAsia	1966	only	-	Oct	 1	3:00	0	-
-
-Rule Palestine	1999	2005	-	Apr	Fri>=15	0:00	1:00	S
-Rule Palestine	1999	2003	-	Oct	Fri>=15	0:00	0	-
-Rule Palestine	2004	only	-	Oct	 1	1:00	0	-
-Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
-Rule Palestine	2006	2007	-	Apr	 1	0:00	1:00	S
-Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
-Rule Palestine	2008	2009	-	Mar	lastFri	0:00	1:00	S
-Rule Palestine	2008	only	-	Sep	 1	0:00	0	-
-Rule Palestine	2009	only	-	Sep	Fri>=1	1:00	0	-
-Rule Palestine	2010	only	-	Mar	26	0:00	1:00	S
-Rule Palestine	2010	only	-	Aug	11	0:00	0	-
-Rule Palestine	2011	only	-	Apr	 1	0:01	1:00	S
-Rule Palestine	2011	only	-	Aug	 1	0:00	0	-
-Rule Palestine	2011	only	-	Aug	30	0:00	1:00	S
-Rule Palestine	2011	only	-	Sep	30	0:00	0	-
-Rule Palestine	2012	2014	-	Mar	lastThu	24:00	1:00	S
-Rule Palestine	2012	only	-	Sep	21	1:00	0	-
-Rule Palestine	2013	only	-	Sep	Fri>=21	0:00	0	-
-Rule Palestine	2014	2015	-	Oct	Fri>=21	0:00	0	-
-Rule Palestine	2015	only	-	Mar	lastFri	24:00	1:00	S
-Rule Palestine	2016	max	-	Mar	lastSat	1:00	1:00	S
-Rule Palestine	2016	max	-	Oct	lastSat	1:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
-			2:00	Zion	EET/EEST 1948 May 15
-			2:00 EgyptAsia	EE%sT	1967 Jun  5
-			2:00	Zion	I%sT	1996
-			2:00	Jordan	EE%sT	1999
-			2:00 Palestine	EE%sT	2008 Aug 29  0:00
-			2:00	-	EET	2008 Sep
-			2:00 Palestine	EE%sT	2010
-			2:00	-	EET	2010 Mar 27  0:01
-			2:00 Palestine	EE%sT	2011 Aug  1
-			2:00	-	EET	2012
-			2:00 Palestine	EE%sT
-
-Zone	Asia/Hebron	2:20:23	-	LMT	1900 Oct
-			2:00	Zion	EET/EEST 1948 May 15
-			2:00 EgyptAsia	EE%sT	1967 Jun  5
-			2:00	Zion	I%sT	1996
-			2:00	Jordan	EE%sT	1999
-			2:00 Palestine	EE%sT
-
-# Paracel Is
-# no information
-
-# Philippines
-# On 1844-08-16, Narciso Clavería, governor-general of the
-# Philippines, issued a proclamation announcing that 1844-12-30 was to
-# be immediately followed by 1845-01-01; see R.H. van Gent's
-# History of the International Date Line
-# http://www.staff.science.uu.nl/~gent0113/idl/idl_philippines.htm
-# The rest of the data entries are from Shanks & Pottenger.
-
-# From Jesper Nørgaard Welen (2006-04-26):
-# ... claims that Philippines had DST last time in 1990:
-# http://story.philippinetimes.com/p.x/ct/9/id/145be20cc6b121c0/cid/3e5bbccc730d258c/
-# [a story dated 2006-04-25 by Cris Larano of Dow Jones Newswires,
-# but no details]
-
-# From Paul Eggert (2014-08-14):
-# The following source says DST may be instituted November-January and again
-# March-June, but this is not definite.  It also says DST was last proclaimed
-# during the Ramos administration (1992-1998); but again, no details.
-# Carcamo D. PNoy urged to declare use of daylight saving time.
-# Philippine Star 2014-08-05
-# http://www.philstar.com/headlines/2014/08/05/1354152/pnoy-urged-declare-use-daylight-saving-time
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Phil	1936	only	-	Nov	1	0:00	1:00	S
-Rule	Phil	1937	only	-	Feb	1	0:00	0	-
-Rule	Phil	1954	only	-	Apr	12	0:00	1:00	S
-Rule	Phil	1954	only	-	Jul	1	0:00	0	-
-Rule	Phil	1978	only	-	Mar	22	0:00	1:00	S
-Rule	Phil	1978	only	-	Sep	21	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Manila	-15:56:00 -	LMT	1844 Dec 31
-			8:04:00 -	LMT	1899 May 11
-			8:00	Phil	+08/+09	1942 May
-			9:00	-	+09	1944 Nov
-			8:00	Phil	+08/+09
-
-# Qatar
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Qatar	3:26:08 -	LMT	1920     # Al Dawhah / Doha
-			4:00	-	+04	1972 Jun
-			3:00	-	+03
-Link Asia/Qatar Asia/Bahrain
-
-# Saudi Arabia
-#
-# From Paul Eggert (2014-07-15):
-# Time in Saudi Arabia and other countries in the Arabian peninsula was not
-# standardized until relatively recently; we don't know when, and possibly it
-# has never been made official.  Richard P Hunt, in "Islam city yielding to
-# modern times", New York Times (1961-04-09), p 20, wrote that only airlines
-# observed standard time, and that people in Jeddah mostly observed quasi-solar
-# time, doing so by setting their watches at sunrise to 6 o'clock (or to 12
-# o'clock for "Arab" time).
-#
-# The TZ database cannot represent quasi-solar time; airline time is the best
-# we can do.  The 1946 foreign air news digest of the U.S. Civil Aeronautics
-# Board (OCLC 42299995) reported that the "... Arabian Government, inaugurated
-# a weekly Dhahran-Cairo service, via the Saudi Arabian cities of Riyadh and
-# Jidda, on March 14, 1947".  Shanks & Pottenger guessed 1950; go with the
-# earlier date.
-#
-# Shanks & Pottenger also state that until 1968-05-01 Saudi Arabia had two
-# time zones; the other zone, at UT +04, was in the far eastern part of
-# the country.  Ignore this, as it's before our 1970 cutoff.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Riyadh	3:06:52 -	LMT	1947 Mar 14
-			3:00	-	+03
-Link Asia/Riyadh Asia/Aden	# Yemen
-Link Asia/Riyadh Asia/Kuwait
-
-# Singapore
-# taken from Mok Ly Yng (2003-10-30)
-# http://www.math.nus.edu.sg/aslaksen/teaching/timezone.html
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Singapore	6:55:25 -	LMT	1901 Jan  1
-			6:55:25	-	SMT	1905 Jun  1 # Singapore M.T.
-			7:00	-	+07	1933 Jan  1
-			7:00	0:20	+0720	1936 Jan  1
-			7:20	-	+0720	1941 Sep  1
-			7:30	-	+0730	1942 Feb 16
-			9:00	-	+09	1945 Sep 12
-			7:30	-	+0730	1982 Jan  1
-			8:00	-	+08
-
-# Spratly Is
-# no information
-
-# Sri Lanka
-
-# From Paul Eggert (2013-02-21):
-# Milne says "Madras mean time use from May 1, 1898.  Prior to this Colombo
-# mean time, 5h. 4m. 21.9s. F., was used."  But 5:04:21.9 differs considerably
-# from Colombo's meridian 5:19:24, so for now ignore Milne and stick with
-# Shanks and Pottenger.
-
-# From Paul Eggert (1996-09-03):
-# "Sri Lanka advances clock by an hour to avoid blackout"
-# (<http://www.virtual-pc.com/lankaweb/news/items/240596-2.html>, 1996-05-24,
-# no longer available as of 1999-08-17)
-# reported "the country's standard time will be put forward by one hour at
-# midnight Friday (1830 GMT) 'in the light of the present power crisis'."
-#
-# From Dharmasiri Senanayake, Sri Lanka Media Minister (1996-10-24), as quoted
-# by Shamindra in Daily News - Hot News Section
-# <news:54rka5$m5h@mtinsc01-mgt.ops.worldnet.att.net> (1996-10-26):
-# With effect from 12.30 a.m. on 26th October 1996
-# Sri Lanka will be six (06) hours ahead of GMT.
-
-# From Jesper Nørgaard Welen (2006-04-14), quoting Sri Lanka News Online
-# <http://news.sinhalaya.com/wmview.php?ArtID=11002> (2006-04-13):
-# 0030 hrs on April 15, 2006 (midnight of April 14, 2006 +30 minutes)
-# at present, become 2400 hours of April 14, 2006 (midnight of April 14, 2006).
-
-# From Peter Apps and Ranga Sirila of Reuters (2006-04-12) in:
-# http://today.reuters.co.uk/news/newsArticle.aspx?type=scienceNews&storyID=2006-04-12T172228Z_01_COL295762_RTRIDST_0_SCIENCE-SRILANKA-TIME-DC.XML
-# [The Tamil Tigers] never accepted the original 1996 time change and simply
-# kept their clocks set five and a half hours ahead of Greenwich Mean
-# Time (GMT), in line with neighbor India.
-# From Paul Eggert (2006-04-18):
-# People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
-# as that zone has agreed with the Tamil areas since our cutoff date of 1970.
-
-# From Sadika Sumanapala (2016-10-19):
-# According to http://www.sltime.org (maintained by Measurement Units,
-# Standards & Services Department, Sri Lanka) abbreviation for Sri Lanka
-# standard time is SLST.
-#
-# From Paul Eggert (2016-10-18):
-# "SLST" seems to be reasonably recent and rarely-used outside time
-# zone nerd sources.  I searched Google News and found three uses of
-# it in the International Business Times of India in February and
-# March of this year when discussing cricket match times, but nothing
-# since then (though there has been a lot of cricket) and nothing in
-# other English-language news sources.  Our old abbreviation "LKT" is
-# even worse.  For now, let's use a numeric abbreviation; we can
-# switch to "SLST" if it catches on.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Colombo	5:19:24 -	LMT	1880
-			5:19:32	-	MMT	1906        # Moratuwa Mean Time
-			5:30	-	+0530	1942 Jan  5
-			5:30	0:30	+06	1942 Sep
-			5:30	1:00	+0630	1945 Oct 16  2:00
-			5:30	-	+0530	1996 May 25  0:00
-			6:30	-	+0630	1996 Oct 26  0:30
-			6:00	-	+06	2006 Apr 15  0:30
-			5:30	-	+0530
-
-# Syria
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Syria	1920	1923	-	Apr	Sun>=15	2:00	1:00	S
-Rule	Syria	1920	1923	-	Oct	Sun>=1	2:00	0	-
-Rule	Syria	1962	only	-	Apr	29	2:00	1:00	S
-Rule	Syria	1962	only	-	Oct	1	2:00	0	-
-Rule	Syria	1963	1965	-	May	1	2:00	1:00	S
-Rule	Syria	1963	only	-	Sep	30	2:00	0	-
-Rule	Syria	1964	only	-	Oct	1	2:00	0	-
-Rule	Syria	1965	only	-	Sep	30	2:00	0	-
-Rule	Syria	1966	only	-	Apr	24	2:00	1:00	S
-Rule	Syria	1966	1976	-	Oct	1	2:00	0	-
-Rule	Syria	1967	1978	-	May	1	2:00	1:00	S
-Rule	Syria	1977	1978	-	Sep	1	2:00	0	-
-Rule	Syria	1983	1984	-	Apr	9	2:00	1:00	S
-Rule	Syria	1983	1984	-	Oct	1	2:00	0	-
-Rule	Syria	1986	only	-	Feb	16	2:00	1:00	S
-Rule	Syria	1986	only	-	Oct	9	2:00	0	-
-Rule	Syria	1987	only	-	Mar	1	2:00	1:00	S
-Rule	Syria	1987	1988	-	Oct	31	2:00	0	-
-Rule	Syria	1988	only	-	Mar	15	2:00	1:00	S
-Rule	Syria	1989	only	-	Mar	31	2:00	1:00	S
-Rule	Syria	1989	only	-	Oct	1	2:00	0	-
-Rule	Syria	1990	only	-	Apr	1	2:00	1:00	S
-Rule	Syria	1990	only	-	Sep	30	2:00	0	-
-Rule	Syria	1991	only	-	Apr	 1	0:00	1:00	S
-Rule	Syria	1991	1992	-	Oct	 1	0:00	0	-
-Rule	Syria	1992	only	-	Apr	 8	0:00	1:00	S
-Rule	Syria	1993	only	-	Mar	26	0:00	1:00	S
-Rule	Syria	1993	only	-	Sep	25	0:00	0	-
-# IATA SSIM (1998-02) says 1998-04-02;
-# (1998-09) says 1999-03-29 and 1999-09-29; (1999-02) says 1999-04-02,
-# 2000-04-02, and 2001-04-02; (1999-09) says 2000-03-31 and 2001-03-31;
-# (2006) says 2006-03-31 and 2006-09-22;
-# for now ignore all these claims and go with Shanks & Pottenger,
-# except for the 2006-09-22 claim (which seems right for Ramadan).
-Rule	Syria	1994	1996	-	Apr	 1	0:00	1:00	S
-Rule	Syria	1994	2005	-	Oct	 1	0:00	0	-
-Rule	Syria	1997	1998	-	Mar	lastMon	0:00	1:00	S
-Rule	Syria	1999	2006	-	Apr	 1	0:00	1:00	S
-# From Stephen Colebourne (2006-09-18):
-# According to IATA data, Syria will change DST on 21st September [21:00 UTC]
-# this year [only]....  This is probably related to Ramadan, like Egypt.
-Rule	Syria	2006	only	-	Sep	22	0:00	0	-
-# From Paul Eggert (2007-03-29):
-# Today the AP reported "Syria will switch to summertime at midnight Thursday."
-# http://www.iht.com/articles/ap/2007/03/29/africa/ME-GEN-Syria-Time-Change.php
-Rule	Syria	2007	only	-	Mar	lastFri	0:00	1:00	S
-# From Jesper Nørgaard (2007-10-27):
-# The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
-# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or
-# rather Midnight between Thursday and Friday. This does make more sense than
-# having it between Wednesday and Thursday (two workdays in Syria) since the
-# weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now
-# it is implemented at midnight of the last workday before weekend...
-#
-# From Steffen Thorsen (2007-10-27):
-# Jesper Nørgaard Welen wrote:
-#
-# > "Winter local time in Syria will be observed at midnight of Thursday 1
-# > November 2007, and the clock will be put back 1 hour."
-#
-# I found confirmation on this in this gov.sy-article (Arabic):
-# http://wehda.alwehda.gov.sy/_print_veiw.asp?FileName=12521710520070926111247
-#
-# which using Google's translate tools says:
-# Council of Ministers also approved the commencement of work on
-# identifying the winter time as of Friday, 2/11/2007 where the 60th
-# minute delay at midnight Thursday 1/11/2007.
-Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
-
-# From Stephen Colebourne (2008-03-17):
-# For everyone's info, I saw an IATA time zone change for [Syria] for
-# this month (March 2008) in the last day or so....
-# Country     Time Standard   --- DST Start ---   --- DST End ---  DST
-# Name        Zone Variation   Time    Date        Time    Date
-# Variation
-# Syrian Arab
-# Republic    SY    +0200      2200  03APR08       2100  30SEP08   +0300
-#                              2200  02APR09       2100  30SEP09   +0300
-#                              2200  01APR10       2100  30SEP10   +0300
-
-# From Arthur David Olson (2008-03-17):
-# Here's a link to English-language coverage by the Syrian Arab News
-# Agency (SANA)...
-# http://www.sana.sy/eng/21/2008/03/11/165173.htm
-# ...which reads (in part) "The Cabinet approved the suggestion of the
-# Ministry of Electricity to begin daylight savings time on Friday April
-# 4th, advancing clocks one hour ahead on midnight of Thursday April 3rd."
-# Since Syria is two hours east of UTC, the 2200 and 2100 transition times
-# shown above match up with midnight in Syria.
-
-# From Arthur David Olson (2008-03-18):
-# My best guess at a Syrian rule is "the Friday nearest April 1";
-# coding that involves either using a "Mar Fri>=29" construct that old time zone
-# compilers can't handle  or having multiple Rules (a la Israel).
-# For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
-
-# From Steffen Thorsen (2008-10-07):
-# Syria has now officially decided to end DST on 2008-11-01 this year,
-# according to the following article in the Syrian Arab News Agency (SANA).
-#
-# The article is in Arabic, and seems to tell that they will go back to
-# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
-# clocks back 60 minutes).
-#
-# http://sana.sy/ara/2/2008/10/07/195459.htm
-
-# From Steffen Thorsen (2009-03-19):
-# Syria will start DST on 2009-03-27 00:00 this year according to many sources,
-# two examples:
-#
-# http://www.sana.sy/eng/21/2009/03/17/217563.htm
-# (English, Syrian Arab News # Agency)
-# http://thawra.alwehda.gov.sy/_View_news2.asp?FileName=94459258720090318012209
-# (Arabic, gov-site)
-#
-# We have not found any sources saying anything about when DST ends this year.
-#
-# Our summary
-# http://www.timeanddate.com/news/time/syria-dst-starts-march-27-2009.html
-
-# From Steffen Thorsen (2009-10-27):
-# The Syrian Arab News Network on 2009-09-29 reported that Syria will
-# revert back to winter (standard) time on midnight between Thursday
-# 2009-10-29 and Friday 2009-10-30:
-# http://www.sana.sy/ara/2/2009/09/29/247012.htm (Arabic)
-
-# From Arthur David Olson (2009-10-28):
-# We'll see if future DST switching times turn out to be end of the last
-# Thursday of the month or the start of the last Friday of the month or
-# something else. For now, use the start of the last Friday.
-
-# From Steffen Thorsen (2010-03-17):
-# The "Syrian News Station" reported on 2010-03-16 that the Council of
-# Ministers has decided that Syria will start DST on midnight Thursday
-# 2010-04-01: (midnight between Thursday and Friday):
-# http://sns.sy/sns/?path=news/read/11421 (Arabic)
-
-# From Steffen Thorsen (2012-03-26):
-# Today, Syria's government announced that they will start DST early on Friday
-# (00:00). This is a bit earlier than the past two years.
-#
-# From Syrian Arab News Agency, in Arabic:
-# http://www.sana.sy/ara/2/2012/03/26/408215.htm
-#
-# Our brief summary:
-# http://www.timeanddate.com/news/time/syria-dst-2012.html
-
-# From Arthur David Olson (2012-03-27):
-# Assume last Friday in March going forward XXX.
-
-Rule	Syria	2008	only	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2008	only	-	Nov	1	0:00	0	-
-Rule	Syria	2009	only	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2010	2011	-	Apr	Fri>=1	0:00	1:00	S
-Rule	Syria	2012	max	-	Mar	lastFri	0:00	1:00	S
-Rule	Syria	2009	max	-	Oct	lastFri	0:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Damascus	2:25:12 -	LMT	1920 # Dimashq
-			2:00	Syria	EE%sT
-
-# Tajikistan
-# From Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Dushanbe	4:35:12 -	LMT	1924 May  2
-			5:00	-	+05	1930 Jun 21
-			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
-			5:00	1:00	+05/+06	1991 Sep  9  2:00s
-			5:00	-	+05
-
-# Thailand
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Bangkok	6:42:04	-	LMT	1880
-			6:42:04	-	BMT	1920 Apr # Bangkok Mean Time
-			7:00	-	+07
-Link Asia/Bangkok Asia/Phnom_Penh	# Cambodia
-Link Asia/Bangkok Asia/Vientiane	# Laos
-
-# Turkmenistan
-# From Shanks & Pottenger.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Ashgabat	3:53:32 -	LMT	1924 May  2 # or Ashkhabad
-			4:00	-	+04	1930 Jun 21
-			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00
-			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00
-			5:00	-	+05
-
-# United Arab Emirates
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Dubai	3:41:12 -	LMT	1920
-			4:00	-	+04
-Link Asia/Dubai Asia/Muscat	# Oman
-
-# Uzbekistan
-# Byalokoz 1919 says Uzbekistan was 4:27:53.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Samarkand	4:27:53 -	LMT	1924 May  2
-			4:00	-	+04	1930 Jun 21
-			5:00	-	+05	1981 Apr  1
-			5:00	1:00	+06	1981 Oct  1
-			6:00	-	+06	1982 Apr  1
-			5:00 RussiaAsia	+05/+06	1992
-			5:00	-	+05
-# Milne says Tashkent was 4:37:10.8; round to nearest.
-Zone	Asia/Tashkent	4:37:11 -	LMT	1924 May  2
-			5:00	-	+05	1930 Jun 21
-			6:00 RussiaAsia	+06/+07	1991 Mar 31  2:00
-			5:00 RussiaAsia	+05/+06	1992
-			5:00	-	+05
-
-# Vietnam
-
-# From Paul Eggert (2014-10-04):
-# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
-# used in Lower Laos, Cambodia, and Annam.  But this is quite a ways
-# from Saigon's location.  For now, ignore this and stick with Shanks
-# and Pottenger for LMT before 1906.
-
-# From Arthur David Olson (2008-03-18):
-# The English-language name of Vietnam's most populous city is "Ho Chi Minh
-# City"; use Ho_Chi_Minh below to avoid a name of more than 14 characters.
-
-# From Paul Eggert (2014-10-21) after a heads-up from Trần Ngọc Quân:
-# Trần Tiến Bình's authoritative book "Lịch Việt Nam: thế kỷ XX-XXI (1901-2100)"
-# (Nhà xuất bản Văn Hoá - Thông Tin, Hanoi, 2005), pp 49-50,
-# is quoted verbatim in:
-# http://www.thoigian.com.vn/?mPage=P80D01
-# is translated by Brian Inglis in:
-# http://mm.icann.org/pipermail/tz/2014-October/021654.html
-# and is the basis for the information below.
-#
-# The 1906 transition was effective July 1 and standardized Indochina to
-# Phù Liễn Observatory, legally 104 deg. 17'17" east of Paris.
-# It's unclear whether this meant legal Paris Mean Time (00:09:21) or
-# the Paris Meridian (2 deg. 20'14.03" E); the former yields 07:06:30.1333...
-# and the latter 07:06:29.333... so either way it rounds to 07:06:30,
-# which is used below even though the modern-day Phù Liễn Observatory
-# is closer to 07:06:31.  Abbreviate Phù Liễn Mean Time as PLMT.
-#
-# The following transitions occurred in Indochina in general (before 1954)
-# and in South Vietnam in particular (after 1954):
-# To 07:00 on 1911-05-01.
-# To 08:00 on 1942-12-31 at 23:00.
-# To 09:00 in 1945-03-14 at 23:00.
-# To 07:00 on 1945-09-02 in Vietnam.
-# To 08:00 on 1947-04-01 in French-controlled Indochina.
-# To 07:00 on 1955-07-01 in South Vietnam.
-# To 08:00 on 1959-12-31 at 23:00 in South Vietnam.
-# To 07:00 on 1975-06-13 in South Vietnam.
-#
-# Trần cites the following sources; it's unclear which supplied the info above.
-#
-# Hoàng Xuân Hãn: "Lịch và lịch Việt Nam". Tập san Khoa học Xã hội,
-# No. 9, Paris, February 1982.
-#
-# Lê Thành Lân: "Lịch và niên biểu lịch sử hai mươi thế kỷ (0001-2010)",
-# NXB Thống kê, Hanoi, 2000.
-#
-# Lê Thành Lân: "Lịch hai thế kỷ (1802-2010) và các lịch vĩnh cửu",
-# NXB Thuận Hoá, Huế, 1995.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jul  1
-			7:06:30	-	PLMT	1911 May  1 # Phù Liễn MT
-			7:00	-	+07	1942 Dec 31 23:00
-			8:00	-	+08	1945 Mar 14 23:00
-			9:00	-	+09	1945 Sep  2
-			7:00	-	+07	1947 Apr  1
-			8:00	-	+08	1955 Jul  1
-			7:00	-	+07	1959 Dec 31 23:00
-			8:00	-	+08	1975 Jun 13
-			7:00	-	+07
-
-# Yemen
-# See Asia/Riyadh.
diff --git a/src/timezone/data/australasia b/src/timezone/data/australasia
deleted file mode 100644
index d389ae134a..0000000000
--- a/src/timezone/data/australasia
+++ /dev/null
@@ -1,1778 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file also includes Pacific islands.
-
-# Notes are at the end of this file
-
-###############################################################################
-
-# Australia
-
-# Please see the notes below for the controversy about "EST" versus "AEST" etc.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Aus	1917	only	-	Jan	 1	0:01	1:00	D
-Rule	Aus	1917	only	-	Mar	25	2:00	0	S
-Rule	Aus	1942	only	-	Jan	 1	2:00	1:00	D
-Rule	Aus	1942	only	-	Mar	29	2:00	0	S
-Rule	Aus	1942	only	-	Sep	27	2:00	1:00	D
-Rule	Aus	1943	1944	-	Mar	lastSun	2:00	0	S
-Rule	Aus	1943	only	-	Oct	 3	2:00	1:00	D
-# Go with Whitman and the Australian National Standards Commission, which
-# says W Australia didn't use DST in 1943/1944.  Ignore Whitman's claim that
-# 1944/1945 was just like 1943/1944.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Northern Territory
-Zone Australia/Darwin	 8:43:20 -	LMT	1895 Feb
-			 9:00	-	ACST	1899 May
-			 9:30	Aus	AC%sT
-# Western Australia
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AW	1974	only	-	Oct	lastSun	2:00s	1:00	D
-Rule	AW	1975	only	-	Mar	Sun>=1	2:00s	0	S
-Rule	AW	1983	only	-	Oct	lastSun	2:00s	1:00	D
-Rule	AW	1984	only	-	Mar	Sun>=1	2:00s	0	S
-Rule	AW	1991	only	-	Nov	17	2:00s	1:00	D
-Rule	AW	1992	only	-	Mar	Sun>=1	2:00s	0	S
-Rule	AW	2006	only	-	Dec	 3	2:00s	1:00	D
-Rule	AW	2007	2009	-	Mar	lastSun	2:00s	0	S
-Rule	AW	2007	2008	-	Oct	lastSun	2:00s	1:00	D
-Zone Australia/Perth	 7:43:24 -	LMT	1895 Dec
-			 8:00	Aus	AW%sT	1943 Jul
-			 8:00	AW	AW%sT
-Zone Australia/Eucla	 8:35:28 -	LMT	1895 Dec
-			 8:45	Aus +0845/+0945	1943 Jul
-			 8:45	AW  +0845/+0945
-
-# Queensland
-#
-# From Alex Livingston (1996-11-01):
-# I have heard or read more than once that some resort islands off the coast
-# of Queensland chose to keep observing daylight-saving time even after
-# Queensland ceased to.
-#
-# From Paul Eggert (1996-11-22):
-# IATA SSIM (1993-02/1994-09) say that the Holiday Islands (Hayman, Lindeman,
-# Hamilton) observed DST for two years after the rest of Queensland stopped.
-# Hamilton is the largest, but there is also a Hamilton in Victoria,
-# so use Lindeman.
-#
-# From J William Piggott (2016-02-20):
-# There is no location named Holiday Islands in Queensland Australia; holiday
-# islands is a colloquial term used globally.  Hayman and Lindeman are at the
-# north and south extremes of the Whitsunday Islands archipelago, and
-# Hamilton is in between; it is reasonable to believe that this time zone
-# applies to all of the Whitsundays.
-# http://www.australia.gov.au/about-australia/australian-story/austn-islands
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AQ	1971	only	-	Oct	lastSun	2:00s	1:00	D
-Rule	AQ	1972	only	-	Feb	lastSun	2:00s	0	S
-Rule	AQ	1989	1991	-	Oct	lastSun	2:00s	1:00	D
-Rule	AQ	1990	1992	-	Mar	Sun>=1	2:00s	0	S
-Rule	Holiday	1992	1993	-	Oct	lastSun	2:00s	1:00	D
-Rule	Holiday	1993	1994	-	Mar	Sun>=1	2:00s	0	S
-Zone Australia/Brisbane	10:12:08 -	LMT	1895
-			10:00	Aus	AE%sT	1971
-			10:00	AQ	AE%sT
-Zone Australia/Lindeman  9:55:56 -	LMT	1895
-			10:00	Aus	AE%sT	1971
-			10:00	AQ	AE%sT	1992 Jul
-			10:00	Holiday	AE%sT
-
-# South Australia
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AS	1971	1985	-	Oct	lastSun	2:00s	1:00	D
-Rule	AS	1986	only	-	Oct	19	2:00s	1:00	D
-Rule	AS	1987	2007	-	Oct	lastSun	2:00s	1:00	D
-Rule	AS	1972	only	-	Feb	27	2:00s	0	S
-Rule	AS	1973	1985	-	Mar	Sun>=1	2:00s	0	S
-Rule	AS	1986	1990	-	Mar	Sun>=15	2:00s	0	S
-Rule	AS	1991	only	-	Mar	3	2:00s	0	S
-Rule	AS	1992	only	-	Mar	22	2:00s	0	S
-Rule	AS	1993	only	-	Mar	7	2:00s	0	S
-Rule	AS	1994	only	-	Mar	20	2:00s	0	S
-Rule	AS	1995	2005	-	Mar	lastSun	2:00s	0	S
-Rule	AS	2006	only	-	Apr	2	2:00s	0	S
-Rule	AS	2007	only	-	Mar	lastSun	2:00s	0	S
-Rule	AS	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	AS	2008	max	-	Oct	Sun>=1	2:00s	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Australia/Adelaide	9:14:20 -	LMT	1895 Feb
-			9:00	-	ACST	1899 May
-			9:30	Aus	AC%sT	1971
-			9:30	AS	AC%sT
-
-# Tasmania
-#
-# From Paul Eggert (2005-08-16):
-# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
-# says King Island didn't observe DST from WWII until late 1971.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AT	1967	only	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	AT	1968	only	-	Mar	lastSun	2:00s	0	S
-Rule	AT	1968	1985	-	Oct	lastSun	2:00s	1:00	D
-Rule	AT	1969	1971	-	Mar	Sun>=8	2:00s	0	S
-Rule	AT	1972	only	-	Feb	lastSun	2:00s	0	S
-Rule	AT	1973	1981	-	Mar	Sun>=1	2:00s	0	S
-Rule	AT	1982	1983	-	Mar	lastSun	2:00s	0	S
-Rule	AT	1984	1986	-	Mar	Sun>=1	2:00s	0	S
-Rule	AT	1986	only	-	Oct	Sun>=15	2:00s	1:00	D
-Rule	AT	1987	1990	-	Mar	Sun>=15	2:00s	0	S
-Rule	AT	1987	only	-	Oct	Sun>=22	2:00s	1:00	D
-Rule	AT	1988	1990	-	Oct	lastSun	2:00s	1:00	D
-Rule	AT	1991	1999	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	AT	1991	2005	-	Mar	lastSun	2:00s	0	S
-Rule	AT	2000	only	-	Aug	lastSun	2:00s	1:00	D
-Rule	AT	2001	max	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	AT	2006	only	-	Apr	Sun>=1	2:00s	0	S
-Rule	AT	2007	only	-	Mar	lastSun	2:00s	0	S
-Rule	AT	2008	max	-	Apr	Sun>=1	2:00s	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Australia/Hobart	9:49:16	-	LMT	1895 Sep
-			10:00	-	AEST	1916 Oct  1  2:00
-			10:00	1:00	AEDT	1917 Feb
-			10:00	Aus	AE%sT	1967
-			10:00	AT	AE%sT
-Zone Australia/Currie	9:35:28	-	LMT	1895 Sep
-			10:00	-	AEST	1916 Oct  1  2:00
-			10:00	1:00	AEDT	1917 Feb
-			10:00	Aus	AE%sT	1971 Jul
-			10:00	AT	AE%sT
-
-# Victoria
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AV	1971	1985	-	Oct	lastSun	2:00s	1:00	D
-Rule	AV	1972	only	-	Feb	lastSun	2:00s	0	S
-Rule	AV	1973	1985	-	Mar	Sun>=1	2:00s	0	S
-Rule	AV	1986	1990	-	Mar	Sun>=15	2:00s	0	S
-Rule	AV	1986	1987	-	Oct	Sun>=15	2:00s	1:00	D
-Rule	AV	1988	1999	-	Oct	lastSun	2:00s	1:00	D
-Rule	AV	1991	1994	-	Mar	Sun>=1	2:00s	0	S
-Rule	AV	1995	2005	-	Mar	lastSun	2:00s	0	S
-Rule	AV	2000	only	-	Aug	lastSun	2:00s	1:00	D
-Rule	AV	2001	2007	-	Oct	lastSun	2:00s	1:00	D
-Rule	AV	2006	only	-	Apr	Sun>=1	2:00s	0	S
-Rule	AV	2007	only	-	Mar	lastSun	2:00s	0	S
-Rule	AV	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	AV	2008	max	-	Oct	Sun>=1	2:00s	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Australia/Melbourne 9:39:52 -	LMT	1895 Feb
-			10:00	Aus	AE%sT	1971
-			10:00	AV	AE%sT
-
-# New South Wales
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	AN	1971	1985	-	Oct	lastSun	2:00s	1:00	D
-Rule	AN	1972	only	-	Feb	27	2:00s	0	S
-Rule	AN	1973	1981	-	Mar	Sun>=1	2:00s	0	S
-Rule	AN	1982	only	-	Apr	Sun>=1	2:00s	0	S
-Rule	AN	1983	1985	-	Mar	Sun>=1	2:00s	0	S
-Rule	AN	1986	1989	-	Mar	Sun>=15	2:00s	0	S
-Rule	AN	1986	only	-	Oct	19	2:00s	1:00	D
-Rule	AN	1987	1999	-	Oct	lastSun	2:00s	1:00	D
-Rule	AN	1990	1995	-	Mar	Sun>=1	2:00s	0	S
-Rule	AN	1996	2005	-	Mar	lastSun	2:00s	0	S
-Rule	AN	2000	only	-	Aug	lastSun	2:00s	1:00	D
-Rule	AN	2001	2007	-	Oct	lastSun	2:00s	1:00	D
-Rule	AN	2006	only	-	Apr	Sun>=1	2:00s	0	S
-Rule	AN	2007	only	-	Mar	lastSun	2:00s	0	S
-Rule	AN	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	AN	2008	max	-	Oct	Sun>=1	2:00s	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Australia/Sydney	10:04:52 -	LMT	1895 Feb
-			10:00	Aus	AE%sT	1971
-			10:00	AN	AE%sT
-Zone Australia/Broken_Hill 9:25:48 -	LMT	1895 Feb
-			10:00	-	AEST	1896 Aug 23
-			9:00	-	ACST	1899 May
-			9:30	Aus	AC%sT	1971
-			9:30	AN	AC%sT	2000
-			9:30	AS	AC%sT
-
-# Lord Howe Island
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	LH	1981	1984	-	Oct	lastSun	2:00	1:00	D
-Rule	LH	1982	1985	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1985	only	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1986	1989	-	Mar	Sun>=15	2:00	0	S
-Rule	LH	1986	only	-	Oct	19	2:00	0:30	D
-Rule	LH	1987	1999	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	1990	1995	-	Mar	Sun>=1	2:00	0	S
-Rule	LH	1996	2005	-	Mar	lastSun	2:00	0	S
-Rule	LH	2000	only	-	Aug	lastSun	2:00	0:30	D
-Rule	LH	2001	2007	-	Oct	lastSun	2:00	0:30	D
-Rule	LH	2006	only	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2007	only	-	Mar	lastSun	2:00	0	S
-Rule	LH	2008	max	-	Apr	Sun>=1	2:00	0	S
-Rule	LH	2008	max	-	Oct	Sun>=1	2:00	0:30	D
-Zone Australia/Lord_Howe 10:36:20 -	LMT	1895 Feb
-			10:00	-	AEST	1981 Mar
-			10:30	LH	+1030/+1130 1985 Jul
-			10:30	LH	+1030/+11
-
-# Australian miscellany
-#
-# Ashmore Is, Cartier
-# no indigenous inhabitants; only seasonal caretakers
-# no times are set
-#
-# Coral Sea Is
-# no indigenous inhabitants; only meteorologists
-# no times are set
-#
-# Macquarie
-# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948;
-# sealing and penguin oil station operated Nov 1899 to Apr 1919.  See the
-# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island
-# http://www.parks.tas.gov.au/index.aspx?base=1828
-# http://www.parks.tas.gov.au/index.aspx?base=1831
-# Guess that it was like Australia/Hobart while inhabited before 2010.
-#
-# From Steffen Thorsen (2010-03-10):
-# We got these changes from the Australian Antarctic Division:
-# - Macquarie Island will stay on UTC+11 for winter and therefore not
-# switch back from daylight savings time when other parts of Australia do
-# on 4 April.
-#
-# From Arthur David Olson (2013-05-23):
-# The 1919 transition is overspecified below so pre-2013 zics
-# will produce a binary file with an [A]EST-type as the first 32-bit type;
-# this is required for correct handling of times before 1916 by
-# pre-2013 versions of localtime.
-Zone Antarctica/Macquarie 0	-	-00	1899 Nov
-			10:00	-	AEST	1916 Oct  1  2:00
-			10:00	1:00	AEDT	1917 Feb
-			10:00	Aus	AE%sT	1919 Apr  1  0:00s
-			0	-	-00	1948 Mar 25
-			10:00	Aus	AE%sT	1967
-			10:00	AT	AE%sT	2010 Apr  4  3:00
-			11:00	-	+11
-
-# Christmas
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Indian/Christmas	7:02:52 -	LMT	1895 Feb
-			7:00	-	+07
-
-# Cocos (Keeling) Is
-# These islands were ruled by the Ross family from about 1830 to 1978.
-# We don't know when standard time was introduced; for now, we guess 1900.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Indian/Cocos	6:27:40	-	LMT	1900
-			6:30	-	+0630
-
-
-# Fiji
-
-# Milne gives 11:55:44 for Suva.
-
-# From Alexander Krivenyshev (2009-11-10):
-# According to Fiji Broadcasting Corporation,  Fiji plans to re-introduce DST
-# from November 29th 2009  to April 25th 2010.
-#
-# "Daylight savings to commence this month"
-# http://www.radiofiji.com.fj/fullstory.php?id=23719
-# http://www.worldtimezone.com/dst_news/dst_news_fiji01.html
-
-# From Steffen Thorsen (2009-11-10):
-# The Fiji Government has posted some more details about the approved
-# amendments:
-# http://www.fiji.gov.fj/publish/page_16198.shtml
-
-# From Steffen Thorsen (2010-03-03):
-# The Cabinet in Fiji has decided to end DST about a month early, on
-# 2010-03-28 at 03:00.
-# The plan is to observe DST again, from 2010-10-24 to sometime in March
-# 2011 (last Sunday a good guess?).
-#
-# Official source:
-# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=1096:3310-cabinet-approves-change-in-daylight-savings-dates&catid=49:cabinet-releases&Itemid=166
-#
-# A bit more background info here:
-# http://www.timeanddate.com/news/time/fiji-dst-ends-march-2010.html
-
-# From Alexander Krivenyshev (2010-10-24):
-# According to Radio Fiji and Fiji Times online, Fiji will end DST 3
-# weeks earlier than expected - on March 6, 2011, not March 27, 2011...
-# Here is confirmation from Government of the Republic of the Fiji Islands,
-# Ministry of Information (fiji.gov.fj) web site:
-# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=2608:daylight-savings&catid=71:press-releases&Itemid=155
-# http://www.worldtimezone.com/dst_news/dst_news_fiji04.html
-
-# From Steffen Thorsen (2011-10-03):
-# Now the dates have been confirmed, and at least our start date
-# assumption was correct (end date was one week wrong).
-#
-# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=4966:daylight-saving-starts-in-fiji&catid=71:press-releases&Itemid=155
-# which says
-# Members of the public are reminded to change their time to one hour in
-# advance at 2am to 3am on October 23, 2011 and one hour back at 3am to
-# 2am on February 26 next year.
-
-# From Ken Rylander (2011-10-24)
-# Another change to the Fiji DST end date. In the TZ database the end date for
-# Fiji DST 2012, is currently Feb 26. This has been changed to Jan 22.
-#
-# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=5017:amendments-to-daylight-savings&catid=71:press-releases&Itemid=155
-# states:
-#
-# The end of daylight saving scheduled initially for the 26th of February 2012
-# has been brought forward to the 22nd of January 2012.
-# The commencement of daylight saving will remain unchanged and start
-# on the  23rd of October, 2011.
-
-# From the Fiji Government Online Portal (2012-08-21) via Steffen Thorsen:
-# The Minister for Labour, Industrial Relations and Employment Mr Jone Usamate
-# today confirmed that Fiji will start daylight savings at 2 am on Sunday 21st
-# October 2012 and end at 3 am on Sunday 20th January 2013.
-# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
-
-# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
-# Fiji will start daylight savings on Sunday 27th October, 2013 ...
-# move clocks forward by one hour from 2am
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
-
-# From Steffen Thorsen (2013-01-10):
-# Fiji will end DST on 2014-01-19 02:00:
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
-
-# From Ken Rylander (2014-10-20):
-# DST will start Nov. 2 this year.
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-NOVEMBER-2ND.aspx
-
-# From a government order dated 2015-08-26 and published as Legal Notice No. 77
-# in the Government of Fiji Gazette Supplement No. 24 (2015-08-28),
-# via Ken Rylander (2015-09-02):
-# the daylight saving period is 1 hour in advance of the standard time
-# commencing at 2.00 am on Sunday 1st November, 2015 and ending at
-# 3.00 am on Sunday 17th January, 2016.
-
-# From Raymond Kumar (2016-10-04):
-# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-6th-NOVEMBER,-2016.aspx
-# "Fiji's daylight savings will begin on Sunday, 6 November 2016, when
-# clocks go forward an hour at 2am to 3am....  Daylight Saving will
-# end at 3.00am on Sunday 15th January 2017."
-
-# From Paul Eggert (2016-10-03):
-# For now, guess DST from 02:00 the first Sunday in November to
-# 03:00 the third Sunday in January.  Although ad hoc, it matches
-# transitions since late 2014 and seems more likely to match future
-# practice than guessing no DST.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Fiji	1998	1999	-	Nov	Sun>=1	2:00	1:00	S
-Rule	Fiji	1999	2000	-	Feb	lastSun	3:00	0	-
-Rule	Fiji	2009	only	-	Nov	29	2:00	1:00	S
-Rule	Fiji	2010	only	-	Mar	lastSun	3:00	0	-
-Rule	Fiji	2010	2013	-	Oct	Sun>=21	2:00	1:00	S
-Rule	Fiji	2011	only	-	Mar	Sun>=1	3:00	0	-
-Rule	Fiji	2012	2013	-	Jan	Sun>=18	3:00	0	-
-Rule	Fiji	2014	only	-	Jan	Sun>=18	2:00	0	-
-Rule	Fiji	2014	max	-	Nov	Sun>=1	2:00	1:00	S
-Rule	Fiji	2015	max	-	Jan	Sun>=15	3:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Fiji	11:55:44 -	LMT	1915 Oct 26 # Suva
-			12:00	Fiji	+12/+13
-
-# French Polynesia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Gambier	 -8:59:48 -	LMT	1912 Oct # Rikitea
-			 -9:00	-	-09
-Zone	Pacific/Marquesas -9:18:00 -	LMT	1912 Oct
-			 -9:30	-	-0930
-Zone	Pacific/Tahiti	 -9:58:16 -	LMT	1912 Oct # Papeete
-			-10:00	-	-10
-# Clipperton (near North America) is administered from French Polynesia;
-# it is uninhabited.
-
-# Guam
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Guam	-14:21:00 -	LMT	1844 Dec 31
-			 9:39:00 -	LMT	1901        # Agana
-			10:00	-	GST	2000 Dec 23 # Guam
-			10:00	-	ChST	# Chamorro Standard Time
-Link Pacific/Guam Pacific/Saipan # N Mariana Is
-
-# Kiribati
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Tarawa	 11:32:04 -	LMT	1901 # Bairiki
-			 12:00	-	+12
-Zone Pacific/Enderbury	-11:24:20 -	LMT	1901
-			-12:00	-	-12	1979 Oct
-			-11:00	-	-11	1995
-			 13:00	-	+13
-Zone Pacific/Kiritimati	-10:29:20 -	LMT	1901
-			-10:40	-	-1040	1979 Oct
-			-10:00	-	-10	1995
-			 14:00	-	+14
-
-# N Mariana Is
-# See Pacific/Guam.
-
-# Marshall Is
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Majuro	11:24:48 -	LMT	1901
-			11:00	-	+11	1969 Oct
-			12:00	-	+12
-Zone Pacific/Kwajalein	11:09:20 -	LMT	1901
-			11:00	-	+11	1969 Oct
-			-12:00	-	-12	1993 Aug 20
-			12:00	-	+12
-
-# Micronesia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Chuuk	10:07:08 -	LMT	1901
-			10:00	-	+10
-Zone Pacific/Pohnpei	10:32:52 -	LMT	1901 # Kolonia
-			11:00	-	+11
-Zone Pacific/Kosrae	10:51:56 -	LMT	1901
-			11:00	-	+11	1969 Oct
-			12:00	-	+12	1999
-			11:00	-	+11
-
-# Nauru
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Nauru	11:07:40 -	LMT	1921 Jan 15 # Uaobe
-			11:30	-	+1130	1942 Mar 15
-			9:00	-	+09	1944 Aug 15
-			11:30	-	+1130	1979 May
-			12:00	-	+12
-
-# New Caledonia
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NC	1977	1978	-	Dec	Sun>=1	0:00	1:00	S
-Rule	NC	1978	1979	-	Feb	27	0:00	0	-
-Rule	NC	1996	only	-	Dec	 1	2:00s	1:00	S
-# Shanks & Pottenger say the following was at 2:00; go with IATA.
-Rule	NC	1997	only	-	Mar	 2	2:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Noumea	11:05:48 -	LMT	1912 Jan 13 # Nouméa
-			11:00	NC	+11/+12
-
-
-###############################################################################
-
-# New Zealand
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NZ	1927	only	-	Nov	 6	2:00	1:00	S
-Rule	NZ	1928	only	-	Mar	 4	2:00	0	M
-Rule	NZ	1928	1933	-	Oct	Sun>=8	2:00	0:30	S
-Rule	NZ	1929	1933	-	Mar	Sun>=15	2:00	0	M
-Rule	NZ	1934	1940	-	Apr	lastSun	2:00	0	M
-Rule	NZ	1934	1940	-	Sep	lastSun	2:00	0:30	S
-Rule	NZ	1946	only	-	Jan	 1	0:00	0	S
-# Since 1957 Chatham has been 45 minutes ahead of NZ, but there's no
-# convenient single notation for the date and time of this transition
-# so we must duplicate the Rule lines.
-Rule	NZ	1974	only	-	Nov	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1974	only	-	Nov	Sun>=1	2:45s	1:00	D
-Rule	NZ	1975	only	-	Feb	lastSun	2:00s	0	S
-Rule	Chatham	1975	only	-	Feb	lastSun	2:45s	0	S
-Rule	NZ	1975	1988	-	Oct	lastSun	2:00s	1:00	D
-Rule	Chatham	1975	1988	-	Oct	lastSun	2:45s	1:00	D
-Rule	NZ	1976	1989	-	Mar	Sun>=1	2:00s	0	S
-Rule	Chatham	1976	1989	-	Mar	Sun>=1	2:45s	0	S
-Rule	NZ	1989	only	-	Oct	Sun>=8	2:00s	1:00	D
-Rule	Chatham	1989	only	-	Oct	Sun>=8	2:45s	1:00	D
-Rule	NZ	1990	2006	-	Oct	Sun>=1	2:00s	1:00	D
-Rule	Chatham	1990	2006	-	Oct	Sun>=1	2:45s	1:00	D
-Rule	NZ	1990	2007	-	Mar	Sun>=15	2:00s	0	S
-Rule	Chatham	1990	2007	-	Mar	Sun>=15	2:45s	0	S
-Rule	NZ	2007	max	-	Sep	lastSun	2:00s	1:00	D
-Rule	Chatham	2007	max	-	Sep	lastSun	2:45s	1:00	D
-Rule	NZ	2008	max	-	Apr	Sun>=1	2:00s	0	S
-Rule	Chatham	2008	max	-	Apr	Sun>=1	2:45s	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Auckland	11:39:04 -	LMT	1868 Nov  2
-			11:30	NZ	NZ%sT	1946 Jan  1
-			12:00	NZ	NZ%sT
-Zone Pacific/Chatham	12:13:48 -	LMT	1868 Nov  2
-			12:15	-	+1215	1946 Jan  1
-			12:45	Chatham	+1245/+1345
-
-Link Pacific/Auckland Antarctica/McMurdo
-
-# Auckland Is
-# uninhabited; Māori and Moriori, colonial settlers, pastoralists, sealers,
-# and scientific personnel have wintered
-
-# Campbell I
-# minor whaling stations operated 1909/1914
-# scientific station operated 1941/1995;
-# previously whalers, sealers, pastoralists, and scientific personnel wintered
-# was probably like Pacific/Auckland
-
-# Cook Is
-# From Shanks & Pottenger:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cook	1978	only	-	Nov	12	0:00	0:30	HS
-Rule	Cook	1979	1991	-	Mar	Sun>=1	0:00	0	-
-Rule	Cook	1979	1990	-	Oct	lastSun	0:00	0:30	HS
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Rarotonga	-10:39:04 -	LMT	1901        # Avarua
-			-10:30	-	-1030	1978 Nov 12
-			-10:00	Cook	-10/-0930
-
-###############################################################################
-
-
-# Niue
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Niue	-11:19:40 -	LMT	1901        # Alofi
-			-11:20	-	-1120	1951
-			-11:30	-	-1130	1978 Oct  1
-			-11:00	-	-11
-
-# Norfolk
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Norfolk	11:11:52 -	LMT	1901 # Kingston
-			11:12	-	+1112	1951
-			11:30	-	+1130	1974 Oct 27 02:00
-			11:30	1:00	+1230	1975 Mar  2 02:00
-			11:30	-	+1130	2015 Oct  4 02:00
-			11:00	-	+11
-
-# Palau (Belau)
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Palau	8:57:56 -	LMT	1901 # Koror
-			9:00	-	+09
-
-# Papua New Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Port_Moresby 9:48:40 -	LMT	1880
-			9:48:32	-	PMMT	1895 # Port Moresby Mean Time
-			10:00	-	+10
-#
-# From Paul Eggert (2014-10-13):
-# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
-# the most people even though it was devastated in the Bougainville Civil War.
-#
-# Although Shanks gives 1942-03-15 / 1943-11-01 for UT +09, these dates
-# are apparently rough guesswork from the starts of military campaigns.
-# The World War II entries below are instead based on Arawa-Kieta.
-# The Japanese occupied Kieta in July 1942,
-# according to the Pacific War Online Encyclopedia
-# http://pwencycl.kgbudge.com/B/o/Bougainville.htm
-# and seem to have controlled it until their 1945-08-21 surrender.
-#
-# The Autonomous Region of Bougainville switched from UT +10 to +11
-# on 2014-12-28 at 02:00.  They call +11 "Bougainville Standard Time".
-# See:
-# http://www.bougainville24.com/bougainville-issues/bougainville-gets-own-timezone/
-#
-Zone Pacific/Bougainville 10:22:16 -	LMT	1880
-			 9:48:32 -	PMMT	1895
-			10:00	-	+10	1942 Jul
-			 9:00	-	+09	1945 Aug 21
-			10:00	-	+10	2014 Dec 28  2:00
-			11:00	-	+11
-
-# Pitcairn
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Pitcairn	-8:40:20 -	LMT	1901        # Adamstown
-			-8:30	-	-0830	1998 Apr 27  0:00
-			-8:00	-	-08
-
-# American Samoa
-Zone Pacific/Pago_Pago	 12:37:12 -	LMT	1879 Jul  5
-			-11:22:48 -	LMT	1911
-			-11:00	-	SST	            # S=Samoa
-Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
-
-# Samoa (formerly and also known as Western Samoa)
-
-# From Steffen Thorsen (2009-10-16):
-# We have been in contact with the government of Samoa again, and received
-# the following info:
-#
-# "Cabinet has now approved Daylight Saving to be effected next year
-# commencing from the last Sunday of September 2010 and conclude first
-# Sunday of April 2011."
-#
-# Background info:
-# http://www.timeanddate.com/news/time/samoa-dst-plan-2009.html
-#
-# Samoa's Daylight Saving Time Act 2009 is available here, but does not
-# contain any dates:
-# http://www.parliament.gov.ws/documents/acts/Daylight%20Saving%20Act%20%202009%20%28English%29%20-%20Final%207-7-091.pdf
-
-# From Laupue Raymond Hughes (2010-10-07):
-# Please see
-# http://www.mcil.gov.ws
-# the Ministry of Commerce, Industry and Labour (sideframe) "Last Sunday
-# September 2010 (26/09/10) - adjust clocks forward from 12:00 midnight
-# to 01:00am and First Sunday April 2011 (03/04/11) - adjust clocks
-# backwards from 1:00am to 12:00am"
-
-# From Laupue Raymond Hughes (2011-03-07):
-# [http://www.mcil.gov.ws/ftcd/daylight_saving_2011.pdf]
-#
-# ... when the standard time strikes the hour of four o'clock (4.00am
-# or 0400 Hours) on the 2nd April 2011, then all instruments used to
-# measure standard time are to be adjusted/changed to three o'clock
-# (3:00am or 0300Hrs).
-
-# From David Zülke (2011-05-09):
-# Subject: Samoa to move timezone from east to west of international date line
-#
-# http://www.morningstar.co.uk/uk/markets/newsfeeditem.aspx?id=138501958347963
-
-# From Paul Eggert (2014-06-27):
-# The International Date Line Act 2011
-# http://www.parliament.gov.ws/images/ACTS/International_Date_Line_Act__2011_-_Eng.pdf
-# changed Samoa from UT -11 to +13, effective "12 o'clock midnight, on
-# Thursday 29th December 2011".  The International Date Line was adjusted
-# accordingly.
-
-# From Laupue Raymond Hughes (2011-09-02):
-# http://www.mcil.gov.ws/mcil_publications.html
-#
-# here is the official website publication for Samoa DST and dateline change
-#
-# DST
-# Year  End      Time              Start        Time
-# 2011  - - -    - - -             24 September 3:00am to 4:00am
-# 2012  01 April 4:00am to 3:00am  - - -        - - -
-#
-# Dateline Change skip Friday 30th Dec 2011
-# Thursday 29th December 2011	23:59:59 Hours
-# Saturday 31st December 2011	00:00:00 Hours
-#
-# From Nicholas Pereira (2012-09-10):
-# Daylight Saving Time commences on Sunday 30th September 2012 and
-# ends on Sunday 7th of April 2013....
-# http://www.mcil.gov.ws/mcil_publications.html
-#
-# From Paul Eggert (2014-07-08):
-# That web page currently lists transitions for 2012/3 and 2013/4.
-# Assume the pattern instituted in 2012 will continue indefinitely.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	WS	2010	only	-	Sep	lastSun	0:00	1	D
-Rule	WS	2011	only	-	Apr	Sat>=1	4:00	0	S
-Rule	WS	2011	only	-	Sep	lastSat	3:00	1	D
-Rule	WS	2012	max	-	Apr	Sun>=1	4:00	0	S
-Rule	WS	2012	max	-	Sep	lastSun	3:00	1	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Apia	 12:33:04 -	LMT	1879 Jul  5
-			-11:26:56 -	LMT	1911
-			-11:30	-	-1130	1950
-			-11:00	WS	-11/-10	2011 Dec 29 24:00
-			 13:00	WS	+13/+14
-
-# Solomon Is
-# excludes Bougainville, for which see Papua New Guinea
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Guadalcanal 10:39:48 -	LMT	1912 Oct # Honiara
-			11:00	-	+11
-
-# Tokelau
-#
-# From Gwillim Law (2011-12-29)
-# A correspondent informed me that Tokelau, like Samoa, will be skipping
-# December 31 this year ...
-#
-# From Steffen Thorsen (2012-07-25)
-# ... we double checked by calling hotels and offices based in Tokelau asking
-# about the time there, and they all told a time that agrees with UTC+13....
-# Shanks says UTC-10 from 1901 [but] ... there is a good chance the change
-# actually was to UTC-11 back then.
-#
-# From Paul Eggert (2012-07-25)
-# A Google Books snippet of Appendix to the Journals of the House of
-# Representatives of New Zealand, Session 1948,
-# <http://books.google.com/books?id=ZaVCAQAAIAAJ>, page 65, says Tokelau
-# was "11 hours slow on G.M.T."  Go with Thorsen and assume Shanks & Pottenger
-# are off by an hour starting in 1901.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Fakaofo	-11:24:56 -	LMT	1901
-			-11:00	-	-11	2011 Dec 30
-			13:00	-	+13
-
-# Tonga
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Tonga	1999	only	-	Oct	 7	2:00s	1:00	S
-Rule	Tonga	2000	only	-	Mar	19	2:00s	0	-
-Rule	Tonga	2000	2001	-	Nov	Sun>=1	2:00	1:00	S
-Rule	Tonga	2001	2002	-	Jan	lastSun	2:00	0	-
-Rule	Tonga	2016	max	-	Nov	Sun>=1	2:00	1:00	S
-Rule	Tonga	2017	max	-	Jan	Sun>=15	3:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Tongatapu	12:19:20 -	LMT	1901
-			12:20	-	+1220	1941
-			13:00	-	+13	1999
-			13:00	Tonga	+13/+14
-
-# Tuvalu
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Funafuti	11:56:52 -	LMT	1901
-			12:00	-	+12
-
-
-# US minor outlying islands
-
-# Howland, Baker
-# Howland was mined for guano by American companies 1857-1878 and British
-# 1886-1891; Baker was similar but exact dates are not known.
-# Inhabited by civilians 1935-1942; U.S. military bases 1943-1944;
-# uninhabited thereafter.
-# Howland observed Hawaii Standard Time (UT -10:30) in 1937;
-# see page 206 of Elgen M. Long and Marie K. Long,
-# Amelia Earhart: the Mystery Solved, Simon & Schuster (2000).
-# So most likely Howland and Baker observed Hawaii Time from 1935
-# until they were abandoned after the war.
-
-# Jarvis
-# Mined for guano by American companies 1857-1879 and British 1883?-1891?.
-# Inhabited by civilians 1935-1942; IGY scientific base 1957-1958;
-# uninhabited thereafter.
-# no information; was probably like Pacific/Kiritimati
-
-# Johnston
-#
-# From Paul Eggert (2017-02-10):
-# Sometimes Johnston kept Hawaii time, and sometimes it was an hour behind.
-# Details are uncertain.  We have no data for Johnston after 1970, so
-# treat it like Hawaii for now.  Since Johnston is now uninhabited,
-# its link to Pacific/Honolulu is in the 'backward' file.
-#
-# In his memoirs of June 6th to October 4, 1945
-# <http://www.315bw.org/Herb_Bach.htm> (2005), Herbert C. Bach writes,
-# "We started our letdown to Kwajalein Atoll and landed there at 5:00 AM
-# Johnston time, 1:30 AM Kwajalein time."  This was in June 1945, and
-# confirms that Johnston kept the same time as Honolulu in summer 1945.
-#
-# From Lyle McElhaney (2014-03-11):
-# [W]hen JI was being used for that [atomic bomb] testing, the time being used
-# was not Hawaiian time but rather the same time being used on the ships,
-# which had a GMT offset of -11 hours.  This apparently applied to at least the
-# time from Operation Newsreel (Hardtack I/Teak shot, 1958-08-01) to the last
-# Operation Fishbowl shot (Tightrope, 1962-11-04).... [See] Herman Hoerlin,
-# "The United States High-Altitude Test Experience: A Review Emphasizing the
-# Impact on the Environment", Los Alamos LA-6405, Oct 1976.
-# http://www.fas.org/sgp/othergov/doe/lanl/docs1/00322994.pdf
-# See the table on page 4 where he lists GMT and local times for the tests; a
-# footnote for the JI tests reads that local time is "JI time = Hawaii Time
-# Minus One Hour".
-
-# Kingman
-# uninhabited
-
-# Midway
-# See Pacific/Pago_Pago.
-
-# Palmyra
-# uninhabited since World War II; was probably like Pacific/Kiritimati
-
-# Wake
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Wake	11:06:28 -	LMT	1901
-			12:00	-	+12
-
-
-# Vanuatu
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanuatu	1983	only	-	Sep	25	0:00	1:00	S
-Rule	Vanuatu	1984	1991	-	Mar	Sun>=23	0:00	0	-
-Rule	Vanuatu	1984	only	-	Oct	23	0:00	1:00	S
-Rule	Vanuatu	1985	1991	-	Sep	Sun>=23	0:00	1:00	S
-Rule	Vanuatu	1992	1993	-	Jan	Sun>=23	0:00	0	-
-Rule	Vanuatu	1992	only	-	Oct	Sun>=23	0:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Efate	11:13:16 -	LMT	1912 Jan 13 # Vila
-			11:00	Vanuatu	+11/+12
-
-# Wallis and Futuna
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Pacific/Wallis	12:15:20 -	LMT	1901
-			12:00	-	+12
-
-###############################################################################
-
-# NOTES
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (2017-02-10):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# Another source occasionally used is Edward W. Whitman, World Time Differences,
-# Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated), which
-# I found in the UCLA library.
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
-#
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
-# The following abbreviations are from other sources.
-# Corrections are welcome!
-#		std	dst
-#		LMT		Local Mean Time
-#	  8:00	AWST	AWDT	Western Australia
-#	  9:30	ACST	ACDT	Central Australia
-#	 10:00	AEST	AEDT	Eastern Australia
-#	 10:00	GST		Guam through 2000
-#	 10:00	ChST		Chamorro
-#	 11:30	NZMT	NZST	New Zealand through 1945
-#	 12:00	NZST	NZDT	New Zealand 1946-present
-#	-11:00	SST		Samoa
-#	-10:00	HST		Hawaii
-#
-# See the 'northamerica' file for Hawaii.
-# See the 'southamerica' file for Easter I and the Galápagos Is.
-
-###############################################################################
-
-# Australia
-
-# From Paul Eggert (2014-06-30):
-# Daylight saving time has long been controversial in Australia, pitting
-# region against region, rural against urban, and local against global.
-# For example, in her review of Graeme Davison's _The Unforgiving
-# Minute: how Australians learned to tell the time_ (1993), Perth native
-# Phillipa J Martyr wrote, "The section entitled 'Saving Daylight' was
-# very informative, but was (as can, sadly, only be expected from a
-# Melbourne-based study) replete with the usual chuckleheaded
-# Queenslanders and straw-chewing yokels from the West prattling fables
-# about fading curtains and crazed farm animals."
-# Electronic Journal of Australian and New Zealand History (1997-03-03)
-# http://www.jcu.edu.au/aff/history/reviews/davison.htm
-
-# From Paul Eggert (2005-12-08):
-# Implementation Dates of Daylight Saving Time within Australia
-# http://www.bom.gov.au/climate/averages/tables/dst_times.shtml
-# summarizes daylight saving issues in Australia.
-
-# From Arthur David Olson (2005-12-12):
-# Lawlink NSW:Daylight Saving in New South Wales
-# http://www.lawlink.nsw.gov.au/lawlink/Corporate/ll_agdinfo.nsf/pages/community_relations_daylight_saving
-# covers New South Wales in particular.
-
-# From John Mackin (1991-03-06):
-# We in Australia have _never_ referred to DST as 'daylight' time.
-# It is called 'summer' time.  Now by a happy coincidence, 'summer'
-# and 'standard' happen to start with the same letter; hence, the
-# abbreviation does _not_ change...
-# The legislation does not actually define abbreviations, at least
-# in this State, but the abbreviation is just commonly taken to be the
-# initials of the phrase, and the legislation here uniformly uses
-# the phrase 'summer time' and does not use the phrase 'daylight
-# time'.
-# Announcers on the Commonwealth radio network, the ABC (for Australian
-# Broadcasting Commission), use the phrases 'Eastern Standard Time'
-# or 'Eastern Summer Time'.  (Note, though, that as I say in the
-# current australasia file, there is really no such thing.)  Announcers
-# on its overseas service, Radio Australia, use the same phrases
-# prefixed by the word 'Australian' when referring to local times;
-# time announcements on that service, naturally enough, are made in UTC.
-
-# From Paul Eggert (2014-06-30):
-#
-# Inspired by Mackin's remarks quoted above, earlier versions of this
-# file used "EST" for both Eastern Standard Time and Eastern Summer
-# Time in Australia, and similarly for "CST", "CWST", and "WST".
-# However, these abbreviations were confusing and were not common
-# practice among Australians, and there were justifiable complaints
-# about them, so I attempted to survey current Australian usage.
-# For the tz database, the full English phrase is not that important;
-# what matters is the abbreviation.  It's difficult to survey the web
-# directly for abbreviation usage, as there are so many false hits for
-# strings like "EST" and "EDT", so I looked for pages that defined an
-# abbreviation for eastern or central DST in Australia, and got the
-# following numbers of unique hits for the listed Google queries:
-#
-#   10 "Eastern Daylight Time AEST" site:au [some are false hits]
-#   10 "Eastern Summer Time AEST" site:au
-#   10 "Summer Time AEDT" site:au
-#   13 "EDST Eastern Daylight Saving Time" site:au
-#   18 "Summer Time ESST" site:au
-#   28 "Eastern Daylight Saving Time EDST" site:au
-#   39 "EDT Eastern Daylight Time" site:au [some are false hits]
-#   53 "Eastern Daylight Time EDT" site:au [some are false hits]
-#   54 "AEDT Australian Eastern Daylight Time" site:au
-#  182 "Eastern Daylight Time AEDT" site:au
-#
-#   17 "Central Daylight Time CDT" site:au [some are false hits]
-#   46 "Central Daylight Time ACDT" site:au
-#
-# I tried several other variants (e.g., "Eastern Summer Time EST") but
-# they all returned fewer than 10 unique hits.  I also looked for pages
-# mentioning both "western standard time" and an abbreviation, since
-# there is no WST in the US to generate false hits, and found:
-#
-#  156 "western standard time" AWST site:au
-#  226 "western standard time" WST site:au
-#
-# I then surveyed the top ten newspapers in Australia by circulation as
-# listed in Wikipedia, using Google queries like "AEDT site:heraldsun.com.au"
-# and obtaining estimated counts from the initial page of search results.
-# All ten papers greatly preferred "AEDT" to "EDT".  The papers
-# surveyed were the Herald Sun, The Daily Telegraph, The Courier-Mail,
-# The Sydney Morning Herald, The West Australian, The Age, The Advertiser,
-# The Australian, The Financial Review, and The Herald (Newcastle).
-#
-# I also searched for historical usage, to see whether abbreviations
-# like "AEDT" are new.  A Trove search <http://trove.nla.gov.au/>
-# found only one newspaper (The Canberra Times) with a house style
-# dating back to the 1970s, I expect because other newspapers weren't
-# fully indexed.  The Canberra Times strongly preferred abbreviations
-# like "AEDT".  The first occurrence of "AEDT" was a World Weather
-# column (1971-11-17, page 24), and of "ACDT" was a Scoreboard column
-# (1993-01-24, p 16).  The style was the typical usage but was not
-# strictly enforced; for example, "Welcome to the twilight zones ..."
-# (1994-10-29, p 1) uses the abbreviations AEST/AEDT, CST/CDT, and
-# WST, and goes on to say, "The confusion and frustration some feel
-# about the lack of uniformity among Australia's six states and two
-# territories has prompted one group to form its very own political
-# party -- the Sydney-based Daylight Saving Extension Party."
-#
-# I also surveyed federal government sources.  They did not agree:
-#
-#   The Australian Government (2014-03-26)
-#   http://australia.gov.au/about-australia/our-country/time
-#   (This document was produced by the Department of Finance.)
-#   AEST ACST AWST AEDT ACDT
-#
-#   Bureau of Meteorology (2012-11-08)
-#   http://www.bom.gov.au/climate/averages/tables/daysavtm.shtml
-#   EST CST WST EDT CDT
-#
-#   Civil Aviation Safety Authority (undated)
-#   http://services.casa.gov.au/outnback/inc/pages/episode3/episode-3_time_zones.shtml
-#   EST CST WST (no abbreviations given for DST)
-#
-#   Geoscience Australia (2011-11-24)
-#   http://www.ga.gov.au/geodesy/astro/sunrise.jsp
-#   AEST ACST AWST AEDT ACDT
-#
-#   Parliamentary Library (2008-11-10)
-#   http://www.aph.gov.au/binaries/library/pubs/rp/2008-09/09rp14.pdf
-#   EST CST WST preferred for standard time; AEST AEDT ACST ACDT also used
-#
-#   The Transport Safety Bureau has an extensive series of accident reports,
-#   and investigators seem to use whatever abbreviation they like.
-#   Googling site:atsb.gov.au found the following number of unique hits:
-#   311 "ESuT", 195 "EDT", 26 "AEDT", 83 "CSuT", 46 "CDT".
-#   "_SuT" tended to appear in older reports, and "A_DT" tended to
-#   appear in reports of events with international implications.
-#
-# From the above it appears that there is a working consensus in
-# Australia to use trailing "DT" for daylight saving time; although
-# some sources use trailing "SST" or "ST" or "SuT" they are by far in
-# the minority.  The case for leading "A" is weaker, but since it
-# seems to be preferred in the overall web and is preferred in all
-# the leading newspaper websites and in many government departments,
-# it has a stronger case than omitting the leading "A".  The current
-# version of the database therefore uses abbreviations like "AEST" and
-# "AEDT" for Australian time zones.
-
-# From Paul Eggert (1995-12-19):
-# Shanks & Pottenger report 2:00 for all autumn changes in Australia and NZ.
-# Mark Prior writes that his newspaper
-# reports that NSW's fall 1995 change will occur at 2:00,
-# but Robert Elz says it's been 3:00 in Victoria since 1970
-# and perhaps the newspaper's '2:00' is referring to standard time.
-# For now we'll continue to assume 2:00s for changes since 1960.
-
-# From Eric Ulevik (1998-01-05):
-#
-# Here are some URLs to Australian time legislation. These URLs are stable,
-# and should probably be included in the data file. There are probably more
-# relevant entries in this database.
-#
-# NSW (including LHI and Broken Hill):
-# Standard Time Act 1987 (updated 1995-04-04)
-# http://www.austlii.edu.au/au/legis/nsw/consol_act/sta1987137/index.html
-# ACT
-# Standard Time and Summer Time Act 1972
-# http://www.austlii.edu.au/au/legis/act/consol_act/stasta1972279/index.html
-# SA
-# Standard Time Act, 1898
-# http://www.austlii.edu.au/au/legis/sa/consol_act/sta1898137/index.html
-
-# From David Grosz (2005-06-13):
-# It was announced last week that Daylight Saving would be extended by
-# one week next year to allow for the 2006 Commonwealth Games.
-# Daylight Saving is now to end for next year only on the first Sunday
-# in April instead of the last Sunday in March.
-#
-# From Gwillim Law (2005-06-14):
-# I did some Googling and found that all of those states (and territory) plan
-# to extend DST together in 2006.
-# ACT: http://www.cmd.act.gov.au/mediareleases/fileread.cfm?file=86.txt
-# New South Wales: http://www.thecouriermail.news.com.au/common/story_page/0,5936,15538869%255E1702,00.html
-# South Australia: http://www.news.com.au/story/0,10117,15555031-1246,00.html
-# Tasmania: http://www.media.tas.gov.au/release.php?id=14772
-# Victoria: I wasn't able to find anything separate, but the other articles
-# allude to it.
-# But not Queensland
-# http://www.news.com.au/story/0,10117,15564030-1248,00.html
-
-# Northern Territory
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# # The NORTHERN TERRITORY..  [ Courtesy N.T. Dept of the Chief Minister ]
-# #					[ Nov 1990 ]
-# #	N.T. have never utilised any DST due to sub-tropical/tropical location.
-# ...
-# Zone        Australia/North         9:30    -       CST
-
-# From Bradley White (1991-03-04):
-# A recent excerpt from an Australian newspaper...
-# the Northern Territory do[es] not have daylight saving.
-
-# Western Australia
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# #  The state of WESTERN AUSTRALIA..  [ Courtesy W.A. dept Premier+Cabinet ]
-# #						[ Nov 1990 ]
-# #	W.A. suffers from a great deal of public and political opposition to
-# #	DST in principle. A bill is brought before parliament in most years, but
-# #	usually defeated either in the upper house, or in party caucus
-# #	before reaching parliament.
-# ...
-# Zone	Australia/West		8:00	AW	%sST
-# ...
-# Rule	AW	1974	only	-	Oct	lastSun	2:00	1:00	D
-# Rule	AW	1975	only	-	Mar	Sun>=1	3:00	0	W
-# Rule	AW	1983	only	-	Oct	lastSun	2:00	1:00	D
-# Rule	AW	1984	only	-	Mar	Sun>=1	3:00	0	W
-
-# From Bradley White (1991-03-04):
-# A recent excerpt from an Australian newspaper...
-# Western Australia...do[es] not have daylight saving.
-
-# From John D. Newman via Bradley White (1991-11-02):
-# Western Australia is still on "winter time". Some DH in Sydney
-# rang me at home a few days ago at 6.00am. (He had just arrived at
-# work at 9.00am.)
-# W.A. is switching to Summer Time on Nov 17th just to confuse
-# everybody again.
-
-# From Arthur David Olson (1992-03-08):
-# The 1992 ending date used in the rules is a best guess;
-# it matches what was used in the past.
-
-# The Australian Bureau of Meteorology FAQ
-# http://www.bom.gov.au/faq/faqgen.htm
-# (1999-09-27) writes that Giles Meteorological Station uses
-# South Australian time even though it's located in Western Australia.
-
-# Queensland
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# #   The state of QUEENSLAND.. [ Courtesy Qld. Dept Premier Econ&Trade Devel ]
-# #						[ Dec 1990 ]
-# ...
-# Zone	Australia/Queensland	10:00	AQ	%sST
-# ...
-# Rule	AQ	1971	only	-	Oct	lastSun	2:00	1:00	D
-# Rule	AQ	1972	only	-	Feb	lastSun	3:00	0	E
-# Rule	AQ	1989	max	-	Oct	lastSun	2:00	1:00	D
-# Rule	AQ	1990	max	-	Mar	Sun>=1	3:00	0	E
-
-# From Bradley White (1989-12-24):
-# "Australia/Queensland" now observes daylight time (i.e. from
-# October 1989).
-
-# From Bradley White (1991-03-04):
-# A recent excerpt from an Australian newspaper...
-# ...Queensland...[has] agreed to end daylight saving
-# at 3am tomorrow (March 3)...
-
-# From John Mackin (1991-03-06):
-# I can certainly confirm for my part that Daylight Saving in NSW did in fact
-# end on Sunday, 3 March.  I don't know at what hour, though.  (It surprised
-# me.)
-
-# From Bradley White (1992-03-08):
-# ...there was recently a referendum in Queensland which resulted
-# in the experimental daylight saving system being abandoned. So, ...
-# ...
-# Rule	QLD	1989	1991	-	Oct	lastSun	2:00	1:00	D
-# Rule	QLD	1990	1992	-	Mar	Sun>=1	3:00	0	S
-# ...
-
-# From Arthur David Olson (1992-03-08):
-# The chosen rules the union of the 1971/1972 change and the 1989-1992 changes.
-
-# From Christopher Hunt (2006-11-21), after an advance warning
-# from Jesper Nørgaard Welen (2006-11-01):
-# WA are trialing DST for three years.
-# http://www.parliament.wa.gov.au/parliament/bills.nsf/9A1B183144403DA54825721200088DF1/$File/Bill175-1B.pdf
-
-# From Rives McDow (2002-04-09):
-# The most interesting region I have found consists of three towns on the
-# southern coast....  South Australia observes daylight saving time; Western
-# Australia does not.  The two states are one and a half hours apart.  The
-# residents decided to forget about this nonsense of changing the clock so
-# much and set the local time 20 hours and 45 minutes from the
-# international date line, or right in the middle of the time of South
-# Australia and Western Australia....
-#
-# From Paul Eggert (2002-04-09):
-# This is confirmed by the section entitled
-# "What's the deal with time zones???" in
-# http://www.earthsci.unimelb.edu.au/~awatkins/null.html
-#
-# From Alex Livingston (2006-12-07):
-# ... it was just on four years ago that I drove along the Eyre Highway,
-# which passes through eastern Western Australia close to the southern
-# coast of the continent.
-#
-# I paid particular attention to the time kept there. There can be no
-# dispute that UTC+08:45 was considered "the time" from the border
-# village just inside the border with South Australia to as far west
-# as just east of Caiguna. There can also be no dispute that Eucla is
-# the largest population centre in this zone....
-#
-# Now that Western Australia is observing daylight saving, the
-# question arose whether this part of the state would follow suit. I
-# just called the border village and confirmed that indeed they have,
-# meaning that they are now observing UTC+09:45.
-#
-# (2006-12-09):
-# I personally doubt that either experimentation with daylight saving
-# in WA or its introduction in SA had anything to do with the genesis
-# of this time zone.  My hunch is that it's been around since well
-# before 1975.  I remember seeing it noted on road maps decades ago.
-
-# From Paul Eggert (2006-12-15):
-# For lack of better info, assume the tradition dates back to the
-# introduction of standard time in 1895.
-
-
-# southeast Australia
-#
-# From Paul Eggert (2007-07-23):
-# Starting autumn 2008 Victoria, NSW, South Australia, Tasmania and the ACT
-# end DST the first Sunday in April and start DST the first Sunday in October.
-# http://www.theage.com.au/news/national/daylight-savings-to-span-six-months/2007/06/27/1182623966703.html
-
-
-# South Australia
-
-# From Bradley White (1991-03-04):
-# A recent excerpt from an Australian newspaper...
-# ...South Australia...[has] agreed to end daylight saving
-# at 3am tomorrow (March 3)...
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# #   The state of SOUTH AUSTRALIA....[ Courtesy of S.A. Dept of Labour ]
-# #						[ Nov 1990 ]
-# ...
-# Zone	Australia/South		9:30	AS	%sST
-# ...
-# Rule	 AS	1971	max	-	Oct	lastSun	2:00	1:00	D
-# Rule	 AS	1972	1985	-	Mar	Sun>=1	3:00	0	C
-# Rule	 AS	1986	1990	-	Mar	Sun>=15	3:00	0	C
-# Rule	 AS	1991	max	-	Mar	Sun>=1	3:00	0	C
-
-# From Bradley White (1992-03-11):
-# Recent correspondence with a friend in Adelaide
-# contained the following exchange:  "Due to the Adelaide Festival,
-# South Australia delays setting back our clocks for a few weeks."
-
-# From Robert Elz (1992-03-13):
-# I heard that apparently (or at least, it appears that)
-# South Aus will have an extra 3 weeks daylight saving every even
-# numbered year (from 1990).  That's when the Adelaide Festival
-# is on...
-
-# From Robert Elz (1992-03-16, 00:57:07 +1000):
-# DST didn't end in Adelaide today (yesterday)....
-# But whether it's "4th Sunday" or "2nd last Sunday" I have no idea whatever...
-# (it's just as likely to be "the Sunday we pick for this year"...).
-
-# From Bradley White (1994-04-11):
-# If Sun, 15 March, 1992 was at +1030 as kre asserts, but yet Sun, 20 March,
-# 1994 was at +0930 as John Connolly's customer seems to assert, then I can
-# only conclude that the actual rule is more complicated....
-
-# From John Warburton (1994-10-07):
-# The new Daylight Savings dates for South Australia ...
-# was gazetted in the Government Hansard on Sep 26 1994....
-# start on last Sunday in October and end in last sunday in March.
-
-# From Paul Eggert (2007-07-23):
-# See "southeast Australia" above for 2008 and later.
-
-# Tasmania
-
-# The rules for 1967 through 1991 were reported by George Shepherd
-# via Simon Woodhead via Robert Elz (1991-03-06):
-# #  The state of TASMANIA.. [Courtesy Tasmanian Dept of Premier + Cabinet ]
-# #					[ Nov 1990 ]
-
-# From Bill Hart via Guy Harris (1991-10-10):
-# Oh yes, the new daylight savings rules are uniquely tasmanian, we have
-# 6 weeks a year now when we are out of sync with the rest of Australia
-# (but nothing new about that).
-
-# From Alex Livingston (1999-10-04):
-# I heard on the ABC (Australian Broadcasting Corporation) radio news on the
-# (long) weekend that Tasmania, which usually goes its own way in this regard,
-# has decided to join with most of NSW, the ACT, and most of Victoria
-# (Australia) and start daylight saving on the last Sunday in August in 2000
-# instead of the first Sunday in October.
-
-# Sim Alam (2000-07-03) reported a legal citation for the 2000/2001 rules:
-# http://www.thelaw.tas.gov.au/fragview/42++1968+GS3A@EN+2000070300
-
-# From Paul Eggert (2007-07-23):
-# See "southeast Australia" above for 2008 and later.
-
-# Victoria
-
-# The rules for 1971 through 1991 were reported by George Shepherd
-# via Simon Woodhead via Robert Elz (1991-03-06):
-# #   The state of VICTORIA.. [ Courtesy of Vic. Dept of Premier + Cabinet ]
-# #						[ Nov 1990 ]
-
-# From Scott Harrington (2001-08-29):
-# On KQED's "City Arts and Lectures" program last night I heard an
-# interesting story about daylight savings time.  Dr. John Heilbron was
-# discussing his book "The Sun in the Church: Cathedrals as Solar
-# Observatories"[1], and in particular the Shrine of Remembrance[2] located
-# in Melbourne, Australia.
-#
-# Apparently the shrine's main purpose is a beam of sunlight which
-# illuminates a special spot on the floor at the 11th hour of the 11th day
-# of the 11th month (Remembrance Day) every year in memory of Australia's
-# fallen WWI soldiers.  And if you go there on Nov. 11, at 11am local time,
-# you will indeed see the sunbeam illuminate the special spot at the
-# expected time.
-#
-# However, that is only because of some special mirror contraption that had
-# to be employed, since due to daylight savings time, the true solar time of
-# the remembrance moment occurs one hour later (or earlier?).  Perhaps
-# someone with more information on this jury-rig can tell us more.
-#
-# [1] http://www.hup.harvard.edu/catalog/HEISUN.html
-# [2] http://www.shrine.org.au
-
-# From Paul Eggert (2007-07-23):
-# See "southeast Australia" above for 2008 and later.
-
-# New South Wales
-
-# From Arthur David Olson:
-# New South Wales and subjurisdictions have their own ideas of a fun time.
-# Based on law library research by John Mackin,
-# who notes:
-#	In Australia, time is not legislated federally, but rather by the
-#	individual states.  Thus, while such terms as "Eastern Standard Time"
-#	[I mean, of course, Australian EST, not any other kind] are in common
-#	use, _they have NO REAL MEANING_, as they are not defined in the
-#	legislation.  This is very important to understand.
-#	I have researched New South Wales time only...
-
-# From Eric Ulevik (1999-05-26):
-# DST will start in NSW on the last Sunday of August, rather than the usual
-# October in 2000.  See: Matthew Moore,
-# Two months more daylight saving, Sydney Morning Herald (1999-05-26).
-# http://www.smh.com.au/news/9905/26/pageone/pageone4.html
-
-# From Paul Eggert (1999-09-27):
-# See the following official NSW source:
-# Daylight Saving in New South Wales.
-# http://dir.gis.nsw.gov.au/cgi-bin/genobject/document/other/daylightsaving/tigGmZ
-#
-# Narrabri Shire (NSW) council has announced it will ignore the extension of
-# daylight saving next year.  See:
-# Narrabri Council to ignore daylight saving
-# http://abc.net.au/news/regionals/neweng/monthly/regeng-22jul1999-1.htm
-# (1999-07-22).  For now, we'll wait to see if this really happens.
-#
-# Victoria will following NSW.  See:
-# Vic to extend daylight saving (1999-07-28)
-# http://abc.net.au/local/news/olympics/1999/07/item19990728112314_1.htm
-#
-# However, South Australia rejected the DST request.  See:
-# South Australia rejects Olympics daylight savings request (1999-07-19)
-# http://abc.net.au/news/olympics/1999/07/item19990719151754_1.htm
-#
-# Queensland also will not observe DST for the Olympics.  See:
-# Qld says no to daylight savings for Olympics
-# http://abc.net.au/news/olympics/1999/06/item19990601114608_1.htm
-# (1999-06-01), which quotes Queensland Premier Peter Beattie as saying
-# "Look you've got to remember in my family when this came up last time
-# I voted for it, my wife voted against it and she said to me it's all very
-# well for you, you don't have to worry about getting the children out of
-# bed, getting them to school, getting them to sleep at night.
-# I've been through all this argument domestically...my wife rules."
-#
-# Broken Hill will stick with South Australian time in 2000.  See:
-# Broken Hill to be behind the times (1999-07-21)
-# http://abc.net.au/news/regionals/brokenh/monthly/regbrok-21jul1999-6.htm
-
-# IATA SSIM (1998-09) says that the spring 2000 change for Australian
-# Capital Territory, New South Wales except Lord Howe Island and Broken
-# Hill, and Victoria will be August 27, presumably due to the Sydney Olympics.
-
-# From Eric Ulevik, referring to Sydney's Sun Herald (2000-08-13), page 29:
-# The Queensland Premier Peter Beattie is encouraging northern NSW
-# towns to use Queensland time.
-
-# From Paul Eggert (2007-07-23):
-# See "southeast Australia" above for 2008 and later.
-
-# Yancowinna
-
-# From John Mackin (1989-01-04):
-# 'Broken Hill' means the County of Yancowinna.
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# # YANCOWINNA..  [ Confirmation courtesy of Broken Hill Postmaster ]
-# #					[ Dec 1990 ]
-# ...
-# # Yancowinna uses Central Standard Time, despite [its] location on the
-# # New South Wales side of the S.A. border. Most business and social dealings
-# # are with CST zones, therefore CST is legislated by local government
-# # although the switch to Summer Time occurs in line with N.S.W. There have
-# # been years when this did not apply, but the historical data is not
-# # presently available.
-# Zone	Australia/Yancowinna	9:30	 AY	%sST
-# ...
-# Rule	 AY	1971	1985	-	Oct	lastSun	2:00	1:00	D
-# Rule	 AY	1972	only	-	Feb	lastSun	3:00	0	C
-# [followed by other Rules]
-
-# Lord Howe Island
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# LHI...		[ Courtesy of Pauline Van Winsen ]
-#					[ Dec 1990 ]
-# Lord Howe Island is located off the New South Wales coast, and is half an
-# hour ahead of NSW time.
-
-# From James Lonergan, Secretary, Lord Howe Island Board (2000-01-27):
-# Lord Howe Island summer time in 2000/2001 will commence on the same
-# date as the rest of NSW (i.e. 2000-08-27).  For your information the
-# Lord Howe Island Board (controlling authority for the Island) is
-# seeking the community's views on various options for summer time
-# arrangements on the Island, e.g. advance clocks by 1 full hour
-# instead of only 30 minutes.  [Dependent] on the wishes of residents
-# the Board may approach the NSW government to change the existing
-# arrangements.  The starting date for summer time on the Island will
-# however always coincide with the rest of NSW.
-
-# From James Lonergan, Secretary, Lord Howe Island Board (2000-10-25):
-# Lord Howe Island advances clocks by 30 minutes during DST in NSW and retards
-# clocks by 30 minutes when DST finishes. Since DST was most recently
-# introduced in NSW, the "changeover" time on the Island has been 02:00 as
-# shown on clocks on LHI. I guess this means that for 30 minutes at the start
-# of DST, LHI is actually 1 hour ahead of the rest of NSW.
-
-# From Paul Eggert (2006-03-22):
-# For Lord Howe dates we use Shanks & Pottenger through 1989, and
-# Lonergan thereafter.  For times we use Lonergan.
-
-# From Paul Eggert (2007-07-23):
-# See "southeast Australia" above for 2008 and later.
-
-# From Steffen Thorsen (2009-04-28):
-# According to the official press release, South Australia's extended daylight
-# saving period will continue with the same rules as used during the 2008-2009
-# summer (southern hemisphere).
-#
-# From
-# http://www.safework.sa.gov.au/uploaded_files/DaylightDatesSet.pdf
-# The extended daylight saving period that South Australia has been trialling
-# for over the last year is now set to be ongoing.
-# Daylight saving will continue to start on the first Sunday in October each
-# year and finish on the first Sunday in April the following year.
-# Industrial Relations Minister, Paul Caica, says this provides South Australia
-# with a consistent half hour time difference with NSW, Victoria, Tasmania and
-# the ACT for all 52 weeks of the year...
-#
-# We have a wrap-up here:
-# http://www.timeanddate.com/news/time/south-australia-extends-dst.html
-###############################################################################
-
-# New Zealand
-
-# From Mark Davies (1990-10-03):
-# the 1989/90 year was a trial of an extended "daylight saving" period.
-# This trial was deemed successful and the extended period adopted for
-# subsequent years (with the addition of a further week at the start).
-# source - phone call to Ministry of Internal Affairs Head Office.
-
-# From George Shepherd via Simon Woodhead via Robert Elz (1991-03-06):
-# # The Country of New Zealand   (Australia's east island -) Gee they hate that!
-# #				   or is Australia the west island of N.Z.
-# #	[ courtesy of Geoff Tribble.. Auckland N.Z. ]
-# #				[ Nov 1990 ]
-# ...
-# Rule	NZ      1974    1988	-	Oct	lastSun	2:00	1:00	D
-# Rule	NZ	1989	max	-	Oct	Sun>=1	2:00	1:00	D
-# Rule	NZ      1975    1989	-	Mar	Sun>=1	3:00	0	S
-# Rule	NZ	1990	max	-	Mar	lastSun	3:00	0	S
-# ...
-# Zone	NZ			12:00	NZ		NZ%sT	# New Zealand
-# Zone	NZ-CHAT			12:45	-		NZ-CHAT # Chatham Island
-
-# From Arthur David Olson (1992-03-08):
-# The chosen rules use the Davies October 8 values for the start of DST in 1989
-# rather than the October 1 value.
-
-# From Paul Eggert (1995-12-19);
-# Shank & Pottenger report 2:00 for all autumn changes in Australia and NZ.
-# Robert Uzgalis writes that the New Zealand Daylight
-# Savings Time Order in Council dated 1990-06-18 specifies 2:00 standard
-# time on both the first Sunday in October and the third Sunday in March.
-# As with Australia, we'll assume the tradition is 2:00s, not 2:00.
-#
-# From Paul Eggert (2006-03-22):
-# The Department of Internal Affairs (DIA) maintains a brief history,
-# as does Carol Squires; see tz-link.htm for the full references.
-# Use these sources in preference to Shanks & Pottenger.
-#
-# For Chatham, IATA SSIM (1991/1999) gives the NZ rules but with
-# transitions at 2:45 local standard time; this confirms that Chatham
-# is always exactly 45 minutes ahead of Auckland.
-
-# From Colin Sharples (2007-04-30):
-# DST will now start on the last Sunday in September, and end on the
-# first Sunday in April.  The changes take effect this year, meaning
-# that DST will begin on 2007-09-30 2008-04-06.
-# http://www.dia.govt.nz/diawebsite.nsf/wpg_URL/Services-Daylight-Saving-Daylight-saving-to-be-extended
-
-# From Paul Eggert (2014-07-14):
-# Chatham Island time was formally standardized on 1957-01-01 by
-# New Zealand's Standard Time Amendment Act 1956 (1956-10-26).
-# http://www.austlii.edu.au/nz/legis/hist_act/staa19561956n100244.pdf
-# According to Google Books snippet view, a speaker in the New Zealand
-# parliamentary debates in 1956 said "Clause 78 makes provision for standard
-# time in the Chatham Islands.  The time there is 45 minutes in advance of New
-# Zealand time.  I understand that is the time they keep locally, anyhow."
-# For now, assume this practice goes back to the introduction of standard time
-# in New Zealand, as this would make Chatham Islands time almost exactly match
-# LMT back when New Zealand was at UT +11:30; also, assume Chatham Islands did
-# not observe New Zealand's prewar DST.
-
-###############################################################################
-
-
-# Fiji
-
-# Howse writes (p 153) that in 1879 the British governor of Fiji
-# enacted an ordinance standardizing the islands on Antipodean Time
-# instead of the American system (which was one day behind).
-
-# From Rives McDow (1998-10-08):
-# Fiji will introduce DST effective 0200 local time, 1998-11-01
-# until 0300 local time 1999-02-28.  Each year the DST period will
-# be from the first Sunday in November until the last Sunday in February.
-
-# From Paul Eggert (2000-01-08):
-# IATA SSIM (1999-09) says DST ends 0100 local time.  Go with McDow.
-
-# From the BBC World Service in
-# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC):
-# The Fijian government says the main reasons for the time change is to
-# improve productivity and reduce road accidents.... [T]he move is also
-# intended to boost Fiji's ability to attract tourists to witness the dawning
-# of the new millennium.
-
-# http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13)
-# reports that Fiji has discontinued DST.
-
-
-# Kiribati
-
-# From Paul Eggert (1996-01-22):
-# Today's _Wall Street Journal_ (page 1) reports that Kiribati
-# "declared it the same day [throughout] the country as of Jan. 1, 1995"
-# as part of the competition to be first into the 21st century.
-
-
-# Kwajalein
-
-# In comp.risks 14.87 (26 August 1993), Peter Neumann writes:
-# I wonder what happened in Kwajalein, where there was NO Friday,
-# 1993-08-20.  Thursday night at midnight Kwajalein switched sides with
-# respect to the International Date Line, to rejoin its fellow islands,
-# going from 11:59 p.m. Thursday to 12:00 m. Saturday in a blink.
-
-
-# N Mariana Is, Guam
-
-# Howse writes (p 153) "The Spaniards, on the other hand, reached the
-# Philippines and the Ladrones from America," and implies that the Ladrones
-# (now called the Marianas) kept American date for quite some time.
-# For now, we assume the Ladrones switched at the same time as the Philippines;
-# see Asia/Manila.
-
-# US Public Law 106-564 (2000-12-23) made UT +10 the official standard time,
-# under the name "Chamorro Standard Time".  There is no official abbreviation,
-# but Congressman Robert A. Underwood, author of the bill that became law,
-# wrote in a press release (2000-12-27) that he will seek the use of "ChST".
-
-
-# Micronesia
-
-# Alan Eugene Davis writes (1996-03-16),
-# "I am certain, having lived there for the past decade, that 'Truk'
-# (now properly known as Chuuk) ... is in the time zone GMT+10."
-#
-# Shanks & Pottenger write that Truk switched from UT +10 to +11
-# on 1978-10-01; ignore this for now.
-
-# From Paul Eggert (1999-10-29):
-# The Federated States of Micronesia Visitors Board writes in
-# The Federated States of Micronesia - Visitor Information (1999-01-26)
-# http://www.fsmgov.org/info/clocks.html
-# that Truk and Yap are UT +10, and Ponape and Kosrae are +11.
-# We don't know when Kosrae switched from +12; assume January 1 for now.
-
-
-# Midway
-
-# From Charles T O'Connor, KMTH DJ (1956),
-# quoted in the KTMH section of the Radio Heritage Collection
-# <http://radiodx.com/spdxr/KMTH.htm> (2002-12-31):
-# For the past two months we've been on what is known as Daylight
-# Saving Time.  This time has put us on air at 5am in the morning,
-# your time down there in New Zealand.  Starting September 2, 1956
-# we'll again go back to Standard Time.  This'll mean that we'll go to
-# air at 6am your time.
-#
-# From Paul Eggert (2003-03-23):
-# We don't know the date of that quote, but we'll guess they
-# started DST on June 3.  Possibly DST was observed other years
-# in Midway, but we have no record of it.
-
-# Norfolk
-
-# From Alexander Krivenyshev (2015-09-23):
-# Norfolk Island will change ... from +1130 to +1100:
-# https://www.comlaw.gov.au/Details/F2015L01483/Explanatory%20Statement/Text
-# ... at 12.30 am (by legal time in New South Wales) on 4 October 2015.
-# http://www.norfolkisland.gov.nf/nia/MediaRelease/Media%20Release%20Norfolk%20Island%20Standard%20Time%20Change.pdf
-
-# From Paul Eggert (2015-09-23):
-# Transitions before 2015 are from timeanddate.com, which consulted
-# the Norfolk Island Museum and the Australian Bureau of Meteorology's
-# Norfolk Island station, and found no record of Norfolk observing DST
-# other than in 1974/5.  See:
-# http://www.timeanddate.com/time/australia/norfolk-island.html
-
-# Pitcairn
-
-# From Rives McDow (1999-11-08):
-# A Proclamation was signed by the Governor of Pitcairn on the 27th March 1998
-# with regard to Pitcairn Standard Time.  The Proclamation is as follows.
-#
-#	The local time for general purposes in the Islands shall be
-#	Co-ordinated Universal time minus 8 hours and shall be known
-#	as Pitcairn Standard Time.
-#
-# ... I have also seen Pitcairn listed as UTC minus 9 hours in several
-# references, and can only assume that this was an error in interpretation
-# somehow in light of this proclamation.
-
-# From Rives McDow (1999-11-09):
-# The Proclamation regarding Pitcairn time came into effect on 27 April 1998
-# ... at midnight.
-
-# From Howie Phelps (1999-11-10), who talked to a Pitcairner via shortwave:
-# Betty Christian told me yesterday that their local time is the same as
-# Pacific Standard Time. They used to be 1/2 hour different from us here in
-# Sacramento but it was changed a couple of years ago.
-
-
-# (Western) Samoa and American Samoa
-
-# Howse writes (p 153, citing p 10 of the 1883-11-18 New York Herald)
-# that in 1879 the King of Samoa decided to change
-# "the date in his kingdom from the Antipodean to the American system,
-# ordaining - by a masterpiece of diplomatic flattery - that
-# the Fourth of July should be celebrated twice in that year."
-
-# Although Shanks & Pottenger says they both switched to UT -11:30
-# in 1911, and to -11 in 1950. many earlier sources give -11
-# for American Samoa, e.g., the US National Bureau of Standards
-# circular "Standard Time Throughout the World", 1932.
-# Assume American Samoa switched to -11 in 1911, not 1950,
-# and that after 1950 they agreed until (western) Samoa skipped a
-# day in 2011.  Assume also that the Samoas follow the US and New
-# Zealand's "ST"/"DT" style of daylight-saving abbreviations.
-
-# Tonga
-
-# From Paul Eggert (1996-01-22):
-# Today's _Wall Street Journal_ (p 1) reports that "Tonga has been plotting
-# to sneak ahead of [New Zealanders] by introducing daylight-saving time."
-# Since Kiribati has moved the Date Line it's not clear what Tonga will do.
-
-# Don Mundell writes in the 1997-02-20 Tonga Chronicle
-# How Tonga became 'The Land where Time Begins':
-# http://www.tongatapu.net.to/tonga/homeland/timebegins.htm
-#
-# Until 1941 Tonga maintained a standard time 50 minutes ahead of NZST
-# 12 hours and 20 minutes ahead of GMT.  When New Zealand adjusted its
-# standard time in 1940s, Tonga had the choice of subtracting from its
-# local time to come on the same standard time as New Zealand or of
-# advancing its time to maintain the differential of 13 degrees
-# (approximately 50 minutes ahead of New Zealand time).
-#
-# Because His Majesty King Tāufaʻāhau Tupou IV, then Crown Prince
-# Tungī, preferred to ensure Tonga's title as the land where time
-# begins, the Legislative Assembly approved the latter change.
-#
-# But some of the older, more conservative members from the outer
-# islands objected. "If at midnight on Dec. 31, we move ahead 40
-# minutes, as your Royal Highness wishes, what becomes of the 40
-# minutes we have lost?"
-#
-# The Crown Prince, presented an unanswerable argument: "Remember that
-# on the World Day of Prayer, you would be the first people on Earth
-# to say your prayers in the morning."
-
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell.
-
-# From Eric Ulevik (1999-05-03):
-# Tonga's director of tourism, who is also secretary of the National Millennium
-# Committee, has a plan to get Tonga back in front.
-# He has proposed a one-off move to tropical daylight saving for Tonga from
-# October to March, which has won approval in principle from the Tongan
-# Government.
-
-# From Steffen Thorsen (1999-09-09):
-# * Tonga will introduce DST in November
-#
-# I was given this link by John Letts:
-# http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm
-#
-# I have not been able to find exact dates for the transition in November
-# yet. By reading this article it seems like Fiji will be 14 hours ahead
-# of UTC as well, but as far as I know Fiji will only be 13 hours ahead
-# (12 + 1 hour DST).
-
-# From Arthur David Olson (1999-09-20):
-# According to <http://www.tongaonline.com/news/sept1799.html>:
-# "Daylight Savings Time will take effect on Oct. 2 through April 15, 2000
-# and annually thereafter from the first Saturday in October through the
-# third Saturday of April.  Under the system approved by Privy Council on
-# Sept. 10, clocks must be turned ahead one hour on the opening day and
-# set back an hour on the closing date."
-# Alas, no indication of the time of day.
-
-# From Rives McDow (1999-10-06):
-# Tonga started its Daylight Saving on Saturday morning October 2nd at 0200am.
-# Daylight Saving ends on April 16 at 0300am which is Sunday morning.
-
-# From Steffen Thorsen (2000-10-31):
-# Back in March I found a notice on the website http://www.tongaonline.com
-# that Tonga changed back to standard time one month early, on March 19
-# instead of the original reported date April 16. Unfortunately, the article
-# is no longer available on the site, and I did not make a copy of the
-# text, and I have forgotten to report it here.
-# (Original URL was <http://www.tongaonline.com/news/march162000.htm>)
-
-# From Rives McDow (2000-12-01):
-# Tonga is observing DST as of 2000-11-04 and will stop on 2001-01-27.
-
-# From Sione Moala-Mafi (2001-09-20) via Rives McDow:
-# At 2:00am on the first Sunday of November, the standard time in the Kingdom
-# shall be moved forward by one hour to 3:00am.  At 2:00am on the last Sunday
-# of January the standard time in the Kingdom shall be moved backward by one
-# hour to 1:00am.
-
-# From Pulu ʻAnau (2002-11-05):
-# The law was for 3 years, supposedly to get renewed.  It wasn't.
-
-# From Pulu ʻAnau (2016-10-27):
-# http://mic.gov.to/news-today/press-releases/6375-daylight-saving-set-to-run-from-6-november-2016-to-15-january-2017
-# Cannot find anyone who knows the rules, has seen the duration or has seen
-# the cabinet decision, but it appears we are following Fiji's rule set.
-#
-# From Tim Parenti (2016-10-26):
-# Assume Tonga will observe DST from the first Sunday in November at 02:00
-# through the third Sunday in January at 03:00, like Fiji, for now.
-
-# Wake
-
-# From Vernice Anderson, Personal Secretary to Philip Jessup,
-# US Ambassador At Large (oral history interview, 1971-02-02):
-#
-# Saturday, the 14th [of October, 1950] - ...  The time was all the
-# more confusing at that point, because we had crossed the
-# International Date Line, thus getting two Sundays.  Furthermore, we
-# discovered that Wake Island had two hours of daylight saving time
-# making calculation of time in Washington difficult if not almost
-# impossible.
-#
-# http://www.trumanlibrary.org/wake/meeting.htm
-
-# From Paul Eggert (2003-03-23):
-# We have no other report of DST in Wake Island, so omit this info for now.
-
-###############################################################################
-
-# The International Date Line
-
-# From Gwillim Law (2000-01-03):
-#
-# The International Date Line is not defined by any international standard,
-# convention, or treaty.  Mapmakers are free to draw it as they please.
-# Reputable mapmakers will simply ensure that every point of land appears on
-# the correct side of the IDL, according to the date legally observed there.
-#
-# When Kiribati adopted a uniform date in 1995, thereby moving the Phoenix and
-# Line Islands to the west side of the IDL (or, if you prefer, moving the IDL
-# to the east side of the Phoenix and Line Islands), I suppose that most
-# mapmakers redrew the IDL following the boundary of Kiribati.  Even that line
-# has a rather arbitrary nature.  The straight-line boundaries between Pacific
-# island nations that are shown on many maps are based on an international
-# convention, but are not legally binding national borders.... The date is
-# governed by the IDL; therefore, even on the high seas, there may be some
-# places as late as fourteen hours later than UTC.  And, since the IDL is not
-# an international standard, there are some places on the high seas where the
-# correct date is ambiguous.
-
-# From Wikipedia <http://en.wikipedia.org/wiki/Time_zone> (2005-08-31):
-# Before 1920, all ships kept local apparent time on the high seas by setting
-# their clocks at night or at the morning sight so that, given the ship's
-# speed and direction, it would be 12 o'clock when the Sun crossed the ship's
-# meridian (12 o'clock = local apparent noon).  During 1917, at the
-# Anglo-French Conference on Time-keeping at Sea, it was recommended that all
-# ships, both military and civilian, should adopt hourly standard time zones
-# on the high seas.  Whenever a ship was within the territorial waters of any
-# nation it would use that nation's standard time.  The captain was permitted
-# to change his ship's clocks at a time of his choice following his ship's
-# entry into another zone time - he often chose midnight.  These zones were
-# adopted by all major fleets between 1920 and 1925 but not by many
-# independent merchant ships until World War II.
-
-# From Paul Eggert, using references suggested by Oscar van Vlijmen
-# (2005-03-20):
-#
-# The American Practical Navigator (2002)
-# http://pollux.nss.nima.mil/pubs/pubs_j_apn_sections.html?rid=187
-# talks only about the 180-degree meridian with respect to ships in
-# international waters; it ignores the international date line.
diff --git a/src/timezone/data/backward b/src/timezone/data/backward
deleted file mode 100644
index 09f2a31b68..0000000000
--- a/src/timezone/data/backward
+++ /dev/null
@@ -1,126 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file provides links between current names for time zones
-# and their old names.  Many names changed in late 1993.
-
-# Link	TARGET			LINK-NAME
-Link	Africa/Nairobi		Africa/Asmera
-Link	Africa/Abidjan		Africa/Timbuktu
-Link	America/Argentina/Catamarca	America/Argentina/ComodRivadavia
-Link	America/Adak		America/Atka
-Link	America/Argentina/Buenos_Aires	America/Buenos_Aires
-Link	America/Argentina/Catamarca	America/Catamarca
-Link	America/Atikokan	America/Coral_Harbour
-Link	America/Argentina/Cordoba	America/Cordoba
-Link	America/Tijuana		America/Ensenada
-Link	America/Indiana/Indianapolis	America/Fort_Wayne
-Link	America/Indiana/Indianapolis	America/Indianapolis
-Link	America/Argentina/Jujuy	America/Jujuy
-Link	America/Indiana/Knox	America/Knox_IN
-Link	America/Kentucky/Louisville	America/Louisville
-Link	America/Argentina/Mendoza	America/Mendoza
-Link	America/Toronto		America/Montreal
-Link	America/Rio_Branco	America/Porto_Acre
-Link	America/Argentina/Cordoba	America/Rosario
-Link	America/Tijuana		America/Santa_Isabel
-Link	America/Denver		America/Shiprock
-Link	America/Port_of_Spain	America/Virgin
-Link	Pacific/Auckland	Antarctica/South_Pole
-Link	Asia/Ashgabat		Asia/Ashkhabad
-Link	Asia/Kolkata		Asia/Calcutta
-Link	Asia/Shanghai		Asia/Chongqing
-Link	Asia/Shanghai		Asia/Chungking
-Link	Asia/Dhaka		Asia/Dacca
-Link	Asia/Shanghai		Asia/Harbin
-Link	Asia/Urumqi		Asia/Kashgar
-Link	Asia/Kathmandu		Asia/Katmandu
-Link	Asia/Macau		Asia/Macao
-Link	Asia/Yangon		Asia/Rangoon
-Link	Asia/Ho_Chi_Minh	Asia/Saigon
-Link	Asia/Jerusalem		Asia/Tel_Aviv
-Link	Asia/Thimphu		Asia/Thimbu
-Link	Asia/Makassar		Asia/Ujung_Pandang
-Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
-Link	Atlantic/Faroe		Atlantic/Faeroe
-Link	Europe/Oslo		Atlantic/Jan_Mayen
-Link	Australia/Sydney	Australia/ACT
-Link	Australia/Sydney	Australia/Canberra
-Link	Australia/Lord_Howe	Australia/LHI
-Link	Australia/Sydney	Australia/NSW
-Link	Australia/Darwin	Australia/North
-Link	Australia/Brisbane	Australia/Queensland
-Link	Australia/Adelaide	Australia/South
-Link	Australia/Hobart	Australia/Tasmania
-Link	Australia/Melbourne	Australia/Victoria
-Link	Australia/Perth		Australia/West
-Link	Australia/Broken_Hill	Australia/Yancowinna
-Link	America/Rio_Branco	Brazil/Acre
-Link	America/Noronha		Brazil/DeNoronha
-Link	America/Sao_Paulo	Brazil/East
-Link	America/Manaus		Brazil/West
-Link	America/Halifax		Canada/Atlantic
-Link	America/Winnipeg	Canada/Central
-Link	America/Regina		Canada/East-Saskatchewan
-Link	America/Toronto		Canada/Eastern
-Link	America/Edmonton	Canada/Mountain
-Link	America/St_Johns	Canada/Newfoundland
-Link	America/Vancouver	Canada/Pacific
-Link	America/Regina		Canada/Saskatchewan
-Link	America/Whitehorse	Canada/Yukon
-Link	America/Santiago	Chile/Continental
-Link	Pacific/Easter		Chile/EasterIsland
-Link	America/Havana		Cuba
-Link	Africa/Cairo		Egypt
-Link	Europe/Dublin		Eire
-Link	Europe/London		Europe/Belfast
-Link	Europe/Chisinau		Europe/Tiraspol
-Link	Europe/London		GB
-Link	Europe/London		GB-Eire
-Link	Etc/GMT			GMT+0
-Link	Etc/GMT			GMT-0
-Link	Etc/GMT			GMT0
-Link	Etc/GMT			Greenwich
-Link	Asia/Hong_Kong		Hongkong
-Link	Atlantic/Reykjavik	Iceland
-Link	Asia/Tehran		Iran
-Link	Asia/Jerusalem		Israel
-Link	America/Jamaica		Jamaica
-Link	Asia/Tokyo		Japan
-Link	Pacific/Kwajalein	Kwajalein
-Link	Africa/Tripoli		Libya
-Link	America/Tijuana		Mexico/BajaNorte
-Link	America/Mazatlan	Mexico/BajaSur
-Link	America/Mexico_City	Mexico/General
-Link	Pacific/Auckland	NZ
-Link	Pacific/Chatham		NZ-CHAT
-Link	America/Denver		Navajo
-Link	Asia/Shanghai		PRC
-Link	Pacific/Honolulu	Pacific/Johnston
-Link	Pacific/Pohnpei		Pacific/Ponape
-Link	Pacific/Pago_Pago	Pacific/Samoa
-Link	Pacific/Chuuk		Pacific/Truk
-Link	Pacific/Chuuk		Pacific/Yap
-Link	Europe/Warsaw		Poland
-Link	Europe/Lisbon		Portugal
-Link	Asia/Taipei		ROC
-Link	Asia/Seoul		ROK
-Link	Asia/Singapore		Singapore
-Link	Europe/Istanbul		Turkey
-Link	Etc/UCT			UCT
-Link	America/Anchorage	US/Alaska
-Link	America/Adak		US/Aleutian
-Link	America/Phoenix		US/Arizona
-Link	America/Chicago		US/Central
-Link	America/Indiana/Indianapolis	US/East-Indiana
-Link	America/New_York	US/Eastern
-Link	Pacific/Honolulu	US/Hawaii
-Link	America/Indiana/Knox	US/Indiana-Starke
-Link	America/Detroit		US/Michigan
-Link	America/Denver		US/Mountain
-Link	America/Los_Angeles	US/Pacific
-Link	Pacific/Pago_Pago	US/Samoa
-Link	Etc/UTC			UTC
-Link	Etc/UTC			Universal
-Link	Europe/Moscow		W-SU
-Link	Etc/UTC			Zulu
diff --git a/src/timezone/data/backzone b/src/timezone/data/backzone
deleted file mode 100644
index 9ce78316c2..0000000000
--- a/src/timezone/data/backzone
+++ /dev/null
@@ -1,675 +0,0 @@
-# Zones that go back beyond the scope of the tz database
-
-# This file is in the public domain.
-
-# This file is by no means authoritative; if you think you know
-# better, go ahead and edit it (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-
-# From Paul Eggert (2014-10-31):
-
-# This file contains data outside the normal scope of the tz database,
-# in that its zones do not differ from normal tz zones after 1970.
-# Links in this file point to zones in this file, superseding links in
-# the file 'backward'.
-
-# Although zones in this file may be of some use for analyzing
-# pre-1970 time stamps, they are less reliable, cover only a tiny
-# sliver of the pre-1970 era, and cannot feasibly be improved to cover
-# most of the era.  Because the zones are out of normal scope for the
-# database, less effort is put into maintaining this file.  Many of
-# the zones were formerly in other source files, but were removed or
-# replaced by links as their data entries were questionable and/or they
-# differed from other zones only in pre-1970 time stamps.
-
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-
-# This file is not intended to be compiled standalone, as it
-# assumes rules from other files.  In the tz distribution, use
-# 'make PACKRATDATA=backzone zones' to compile and install this file.
-
-# Zones are sorted by zone name.  Each zone is preceded by the
-# name of the country that the zone is in, along with any other
-# commentary and rules associated with the entry.
-#
-# As explained in the zic man page, the zone columns are:
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-
-# Ethiopia
-# From Paul Eggert (2014-07-31):
-# Like the Swahili of Kenya and Tanzania, many Ethiopians keep a
-# 12-hour clock starting at our 06:00, so their "8 o'clock" is our
-# 02:00 or 14:00.  Keep this in mind when you ask the time in Amharic.
-#
-# Shanks & Pottenger write that Ethiopia had six narrowly-spaced time
-# zones between 1870 and 1890, that they merged to 38E50 (2:35:20) in
-# 1890, and that they switched to 3:00 on 1936-05-05.  Perhaps 38E50
-# was for Adis Dera.  Quite likely the Shanks data entries are wrong
-# anyway.
-Zone Africa/Addis_Ababa	2:34:48 -	LMT	1870
-			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
-			3:00	-	EAT
-
-# Eritrea
-Zone	Africa/Asmara	2:35:32 -	LMT	1870
-			2:35:32	-	AMT	1890        # Asmara Mean Time
-			2:35:20	-	ADMT	1936 May  5 # Adis Dera MT
-			3:00	-	EAT
-Link Africa/Asmara Africa/Asmera
-
-# Mali (southern)
-Zone	Africa/Bamako	-0:32:00 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	-01	1960 Jun 20
-			 0:00	-	GMT
-
-# Central African Republic
-Zone	Africa/Bangui	1:14:20	-	LMT	1912
-			1:00	-	WAT
-
-# Gambia
-Zone	Africa/Banjul	-1:06:36 -	LMT	1912
-			-1:06:36 -	BMT	1935 # Banjul Mean Time
-			-1:00	-	-01	1964
-			 0:00	-	GMT
-
-# Malawi
-Zone	Africa/Blantyre	2:20:00 -	LMT	1903 Mar
-			2:00	-	CAT
-
-# Republic of the Congo
-Zone Africa/Brazzaville	1:01:08 -	LMT	1912
-			1:00	-	WAT
-
-# Burundi
-Zone Africa/Bujumbura	1:57:28	-	LMT	1890
-			2:00	-	CAT
-
-# Guinea
-Zone	Africa/Conakry	-0:54:52 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	-01	1960
-			 0:00	-	GMT
-
-# Senegal
-Zone	Africa/Dakar	-1:09:44 -	LMT	1912
-			-1:00	-	-01	1941 Jun
-			 0:00	-	GMT
-
-# Tanzania
-Zone Africa/Dar_es_Salaam 2:37:08 -	LMT	1931
-			3:00	-	EAT	1948
-			2:45	-	+0245	1961
-			3:00	-	EAT
-
-# Djibouti
-Zone	Africa/Djibouti	2:52:36 -	LMT	1911 Jul
-			3:00	-	EAT
-
-# Cameroon
-# Whitman says they switched to 1:00 in 1920; go with Shanks & Pottenger.
-Zone	Africa/Douala	0:38:48	-	LMT	1912
-			1:00	-	WAT
-# Sierra Leone
-# From Paul Eggert (2014-08-12):
-# The following table is from Shanks & Pottenger, but it can't be right.
-# Whitman gives Mar 31 - Aug 31 for 1931 on.
-# The International Hydrographic Bulletin, 1932-33, p 63 says that
-# Sierra Leone would advance its clocks by 20 minutes on 1933-10-01.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	SL	1935	1942	-	Jun	 1	0:00	0:40	-0020
-Rule	SL	1935	1942	-	Oct	 1	0:00	0	-01
-Rule	SL	1957	1962	-	Jun	 1	0:00	1:00	+01
-Rule	SL	1957	1962	-	Sep	 1	0:00	0	GMT
-Zone	Africa/Freetown	-0:53:00 -	LMT	1882
-			-0:53:00 -	FMT	1913 Jun # Freetown Mean Time
-			-1:00	SL	%s	1957
-			 0:00	SL	GMT/+01
-
-# Botswana
-# From Paul Eggert (2013-02-21):
-# Milne says they were regulated by the Cape Town Signal in 1899;
-# assume they switched to 2:00 when Cape Town did.
-Zone	Africa/Gaborone	1:43:40 -	LMT	1885
-			1:30	-	SAST	1903 Mar
-			2:00	-	CAT	1943 Sep 19  2:00
-			2:00	1:00	CAST	1944 Mar 19  2:00
-			2:00	-	CAT
-
-# Zimbabwe
-Zone	Africa/Harare	2:04:12 -	LMT	1903 Mar
-			2:00	-	CAT
-
-# South Sudan
-Zone	Africa/Juba	2:06:24 -	LMT	1931
-			2:00	Sudan	CA%sT	2000 Jan 15 12:00
-			3:00	-	EAT
-
-# Uganda
-Zone	Africa/Kampala	2:09:40 -	LMT	1928 Jul
-			3:00	-	EAT	1930
-			2:30	-	+0230	1948
-			2:45	-	+0245	1957
-			3:00	-	EAT
-
-# Rwanda
-Zone	Africa/Kigali	2:00:16 -	LMT	1935 Jun
-			2:00	-	CAT
-
-# Democratic Republic of the Congo (west)
-Zone Africa/Kinshasa	1:01:12 -	LMT	1897 Nov  9
-			1:00	-	WAT
-
-# Gabon
-Zone Africa/Libreville	0:37:48 -	LMT	1912
-			1:00	-	WAT
-
-# Togo
-Zone	Africa/Lome	0:04:52 -	LMT	1893
-			0:00	-	GMT
-
-# Angola
-#
-# Shanks gives 1911-05-26 for the transition to WAT,
-# evidently confusing the date of the Portuguese decree
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# with the date that it took effect, namely 1912-01-01.
-#
-Zone	Africa/Luanda	0:52:56	-	LMT	1892
-			0:52:04	-	+005204	1912 Jan  1
-			1:00	-	WAT
-
-# Democratic Republic of the Congo (east)
-Zone Africa/Lubumbashi	1:49:52 -	LMT	1897 Nov 9
-			2:00	-	CAT
-
-# Zambia
-Zone	Africa/Lusaka	1:53:08 -	LMT	1903 Mar
-			2:00	-	CAT
-
-# Equatorial Guinea
-#
-# Although Shanks says that Malabo switched from UT +00 to +01 on 1963-12-15,
-# a Google Books search says that London Calling, Issues 432-465 (1948), p 19,
-# says that Spanish Guinea was at +01 back then.  The Shanks data entries
-# are most likely wrong, but we have nothing better; use them here for now.
-#
-Zone	Africa/Malabo	0:35:08 -	LMT	1912
-			0:00	-	GMT	1963 Dec 15
-			1:00	-	WAT
-
-# Lesotho
-Zone	Africa/Maseru	1:50:00 -	LMT	1903 Mar
-			2:00	-	SAST	1943 Sep 19  2:00
-			2:00	1:00	SAST	1944 Mar 19  2:00
-			2:00	-	SAST
-
-# Swaziland
-Zone	Africa/Mbabane	2:04:24 -	LMT	1903 Mar
-			2:00	-	SAST
-
-# Somalia
-Zone Africa/Mogadishu	3:01:28 -	LMT	1893 Nov
-			3:00	-	EAT	1931
-			2:30	-	+0230	1957
-			3:00	-	EAT
-
-# Niger
-Zone	Africa/Niamey	 0:08:28 -	LMT	1912
-			-1:00	-	-01	1934 Feb 26
-			 0:00	-	GMT	1960
-			 1:00	-	WAT
-
-# Mauritania
-Zone Africa/Nouakchott	-1:03:48 -	LMT	1912
-			 0:00	-	GMT	1934 Feb 26
-			-1:00	-	-01	1960 Nov 28
-			 0:00	-	GMT
-
-# Burkina Faso
-Zone Africa/Ouagadougou	-0:06:04 -	LMT	1912
-			 0:00	-	GMT
-
-# Benin
-# Whitman says they switched to 1:00 in 1946, not 1934;
-# go with Shanks & Pottenger.
-Zone Africa/Porto-Novo	0:10:28	-	LMT	1912 Jan  1
-			0:00	-	GMT	1934 Feb 26
-			1:00	-	WAT
-
-# São Tomé and Príncipe
-Zone	Africa/Sao_Tome	 0:26:56 -	LMT	1884
-			-0:36:32 -	LMT	1912 # Lisbon Mean Time
-			 0:00	-	GMT
-
-# Mali (northern)
-Zone	Africa/Timbuktu	-0:12:04 -	LMT	1912
-			 0:00	-	GMT
-
-# Anguilla
-Zone America/Anguilla	-4:12:16 -	LMT	1912 Mar  2
-			-4:00	-	AST
-
-# Antigua and Barbuda
-Zone	America/Antigua	-4:07:12 -	LMT	1912 Mar 2
-			-5:00	-	EST	1951
-			-4:00	-	AST
-
-# Chubut, Argentina
-# The name "Comodoro Rivadavia" exceeds the 14-byte POSIX limit.
-Zone America/Argentina/ComodRivadavia -4:30:00 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  3
-			-4:00	-	-04	1991 Oct 20
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 Jun  1
-			-4:00	-	-04	2004 Jun 20
-			-3:00	-	-03
-
-# Aruba
-Zone	America/Aruba	-4:40:24 -	LMT	1912 Feb 12 # Oranjestad
-			-4:30	-	-0430	1965
-			-4:00	-	AST
-
-# Cayman Is
-Zone	America/Cayman	-5:25:32 -	LMT	1890     # Georgetown
-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
-			-5:00	-	EST
-
-# Canada
-Zone America/Coral_Harbour -5:32:40 -	LMT	1884
-			-5:00	NT_YK	E%sT	1946
-			-5:00	-	EST
-
-# Dominica
-Zone America/Dominica	-4:05:36 -	LMT	1911 Jul  1  0:01 # Roseau
-			-4:00	-	AST
-
-# Baja California
-# See 'northamerica' for why this entry is here rather than there.
-Zone America/Ensenada	-7:46:28 -	LMT	1922 Jan  1  0:13:32
-			-8:00	-	PST	1927 Jun 10 23:00
-			-7:00	-	MST	1930 Nov 16
-			-8:00	-	PST	1942 Apr
-			-7:00	-	MST	1949 Jan 14
-			-8:00	-	PST	1996
-			-8:00	Mexico	P%sT
-
-# Grenada
-Zone	America/Grenada	-4:07:00 -	LMT	1911 Jul # St George's
-			-4:00	-	AST
-
-# Guadeloupe
-Zone America/Guadeloupe	-4:06:08 -	LMT	1911 Jun  8 # Pointe-à-Pitre
-			-4:00	 -	AST
-
-# Canada
-#
-# From Paul Eggert (2015-03-24):
-# Since 1970 most of Quebec has been like Toronto; see
-# America/Toronto.  However, earlier versions of the tz database
-# mistakenly relied on data from Shanks & Pottenger saying that Quebec
-# differed from Ontario after 1970, and the following rules and zone
-# were created for most of Quebec from the incorrect Shanks &
-# Pottenger data.  The post-1970 entries have been corrected, but the
-# pre-1970 entries are unchecked and probably have errors.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mont	1917	only	-	Mar	25	2:00	1:00	D
-Rule	Mont	1917	only	-	Apr	24	0:00	0	S
-Rule	Mont	1919	only	-	Mar	31	2:30	1:00	D
-Rule	Mont	1919	only	-	Oct	25	2:30	0	S
-Rule	Mont	1920	only	-	May	 2	2:30	1:00	D
-Rule	Mont	1920	1922	-	Oct	Sun>=1	2:30	0	S
-Rule	Mont	1921	only	-	May	 1	2:00	1:00	D
-Rule	Mont	1922	only	-	Apr	30	2:00	1:00	D
-Rule	Mont	1924	only	-	May	17	2:00	1:00	D
-Rule	Mont	1924	1926	-	Sep	lastSun	2:30	0	S
-Rule	Mont	1925	1926	-	May	Sun>=1	2:00	1:00	D
-Rule	Mont	1927	1937	-	Apr	lastSat	24:00	1:00	D
-Rule	Mont	1927	1937	-	Sep	lastSat	24:00	0	S
-Rule	Mont	1938	1940	-	Apr	lastSun	0:00	1:00	D
-Rule	Mont	1938	1939	-	Sep	lastSun	0:00	0	S
-Rule	Mont	1946	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Mont	1945	1948	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1949	1950	-	Oct	lastSun	2:00	0	S
-Rule	Mont	1951	1956	-	Sep	lastSun	2:00	0	S
-Rule	Mont	1957	1973	-	Oct	lastSun	2:00	0	S
-Zone America/Montreal	-4:54:16 -	LMT	1884
-			-5:00	Mont	E%sT	1918
-			-5:00	Canada	E%sT	1919
-			-5:00	Mont	E%sT	1942 Feb  9  2:00s
-			-5:00	Canada	E%sT	1946
-			-5:00	Mont	E%sT	1974
-			-5:00	Canada	E%sT
-
-# Montserrat
-# From Paul Eggert (2006-03-22):
-# In 1995 volcanic eruptions forced evacuation of Plymouth, the capital.
-# world.gazetteer.com says Cork Hill is the most populous location now.
-Zone America/Montserrat	-4:08:52 -	LMT	1911 Jul  1  0:01 # Cork Hill
-			-4:00	-	AST
-
-# Argentina
-# This entry was intended for the following areas, but has been superseded by
-# more detailed zones.
-# Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), La Pampa (LP), Chubut (CH)
-Zone America/Rosario	-4:02:40 -	LMT	1894 Nov
-			-4:16:44 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Jul
-			-3:00	-	-03	1999 Oct  3  0:00
-			-4:00	Arg	-04/-03	2000 Mar  3  0:00
-			-3:00	-	-03
-
-# St Kitts-Nevis
-Zone America/St_Kitts	-4:10:52 -	LMT	1912 Mar  2 # Basseterre
-			-4:00	-	AST
-
-# St Lucia
-Zone America/St_Lucia	-4:04:00 -	LMT	1890 # Castries
-			-4:04:00 -	CMT	1912 # Castries Mean Time
-			-4:00	-	AST
-
-# Virgin Is
-Zone America/St_Thomas	-4:19:44 -	LMT	1911 Jul # Charlotte Amalie
-			-4:00	-	AST
-
-# St Vincent and the Grenadines
-Zone America/St_Vincent	-4:04:56 -	LMT	1890 # Kingstown
-			-4:04:56 -	KMT	1912 # Kingstown Mean Time
-			-4:00	-	AST
-
-# British Virgin Is
-Zone America/Tortola	-4:18:28 -	LMT	1911 Jul # Road Town
-			-4:00	-	AST
-
-# McMurdo, Ross Island, since 1955-12
-Zone Antarctica/McMurdo	0	-	-00	1956
-			12:00	NZ	NZ%sT
-Link Antarctica/McMurdo Antarctica/South_Pole
-
-# Yemen
-# Milne says 2:59:54 was the meridian of the saluting battery at Aden,
-# and that Yemen was at 1:55:56, the meridian of the Hagia Sophia.
-Zone	Asia/Aden	2:59:54	-	LMT	1950
-			3:00	-	+03
-
-# Bahrain
-Zone	Asia/Bahrain	3:22:20 -	LMT	1920     # Manamah
-			4:00	-	+04	1972 Jun
-			3:00	-	+03
-
-# India
-#
-# From Paul Eggert (2014-09-06):
-# The 1876 Report of the Secretary of the [US] Navy, p 305 says that Madras
-# civil time was 5:20:57.3.
-#
-# From Paul Eggert (2014-08-21):
-# In tomorrow's The Hindu, Nitya Menon reports that India had two civil time
-# zones starting in 1884, one in Bombay and one in Calcutta, and that railways
-# used a third time zone based on Madras time (80 deg. 18'30" E).  Also,
-# in 1881 Bombay briefly switched to Madras time, but switched back.  See:
-# http://www.thehindu.com/news/cities/chennai/madras-375-when-madras-clocked-the-time/article6339393.ece
-#Zone	  Asia/Chennai  [not enough info to complete]
-
-# China
-# Long-shu Time (probably due to Long and Shu being two names of that area)
-# Guangxi, Guizhou, Hainan, Ningxia, Sichuan, Shaanxi, and Yunnan;
-# most of Gansu; west Inner Mongolia; west Qinghai; and the Guangdong
-# counties Deqing, Enping, Kaiping, Luoding, Taishan, Xinxing,
-# Yangchun, Yangjiang, Yu'nan, and Yunfu.
-Zone	Asia/Chongqing	7:06:20	-	LMT	1928     # or Chungking
-			7:00	-	+07	1980 May
-			8:00	PRC	C%sT
-Link Asia/Chongqing Asia/Chungking
-
-# Vietnam
-# From Paul Eggert (2014-10-13):
-# See Asia/Ho_Chi_Minh for the source for this data.
-# Trần's book says the 1954-55 transition to 07:00 in Hanoi was in
-# October 1954, with exact date and time unspecified.
-Zone	Asia/Hanoi	7:03:24 -	LMT	1906 Jul  1
-			7:06:30	-	PLMT	1911 May  1
-			7:00	-	+07	1942 Dec 31 23:00
-			8:00	-	+08	1945 Mar 14 23:00
-			9:00	-	+09	1945 Sep  2
-			7:00	-	+07	1947 Apr  1
-			8:00	-	+08	1954 Oct
-			7:00	-	+07
-
-# China
-# Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
-# Heilongjiang (except Mohe county), Jilin
-Zone	Asia/Harbin	8:26:44	-	LMT	1928     # or Haerbin
-			8:30	-	+0830	1932 Mar
-			8:00	-	CST	1940
-			9:00	-	+09	1966 May
-			8:30	-	+0830	1980 May
-			8:00	PRC	C%sT
-
-# far west China
-Zone	Asia/Kashgar	5:03:56	-	LMT	1928     # or Kashi or Kaxgar
-			5:30	-	+0530	1940
-			5:00	-	+05	1980 May
-			8:00	PRC	C%sT
-
-# Kuwait
-Zone	Asia/Kuwait	3:11:56 -	LMT	1950
-			3:00	-	+03
-
-
-# Oman
-# Milne says 3:54:24 was the meridian of the Muscat Tidal Observatory.
-Zone	Asia/Muscat	3:54:24 -	LMT	1920
-			4:00	-	+04
-
-# India
-# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
-# According to a Portuguese decree (1911-05-26)
-# https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# Portuguese India switched to UT +05 on 1912-01-01.
-#Zone	Asia/Panaji	[not enough info to complete]
-
-# Cambodia
-# From Paul Eggert (2014-10-11):
-# See Asia/Ho_Chi_Minh for the source for most of this data.  Also, guess
-# (1) Cambodia reverted to UT +07 on 1945-09-02, when Vietnam did, and
-# (2) they also reverted to +07 on 1953-11-09, the date of independence.
-# These guesses are probably wrong but they're better than guessing no
-# transitions there.
-Zone	Asia/Phnom_Penh	6:59:40 -	LMT	1906 Jul  1
-			7:06:30	-	PLMT	1911 May  1
-			7:00	-	+07	1942 Dec 31 23:00
-			8:00	-	+08	1945 Mar 14 23:00
-			9:00	-	+09	1945 Sep  2
-			7:00	-	+07	1947 Apr  1
-			8:00	-	+08	1953 Nov  9
-			7:00	-	+07
-
-# Israel
-Zone	Asia/Tel_Aviv	2:19:04 -	LMT	1880
-			2:21	-	JMT	1918
-			2:00	Zion	I%sT
-
-# Laos
-# From Paul Eggert (2014-10-11):
-# See Asia/Ho_Chi_Minh for the source for most of this data.
-# Trần's book says that Laos reverted to UT +07 on 1955-04-15.
-# Also, guess that Laos reverted to +07 on 1945-09-02, when Vietnam did;
-# this is probably wrong but it's better than guessing no transition.
-Zone	Asia/Vientiane	6:50:24 -	LMT	1906 Jul  1
-			7:06:30	-	PLMT	1911 May  1
-			7:00	-	+07	1942 Dec 31 23:00
-			8:00	-	+08	1945 Mar 14 23:00
-			9:00	-	+09	1945 Sep  2
-			7:00	-	+07	1947 Apr  1
-			8:00	-	+08	1955 Apr 15
-			7:00	-	+07
-
-# Jan Mayen
-# From Whitman:
-Zone Atlantic/Jan_Mayen	-1:00	-	-01
-
-# St Helena
-Zone Atlantic/St_Helena	-0:22:48 -	LMT	1890 # Jamestown
-			-0:22:48 -	JMT	1951 # Jamestown Mean Time
-			 0:00	-	GMT
-
-# Northern Ireland
-Zone	Europe/Belfast	-0:23:40 -	LMT	1880 Aug  2
-			-0:25:21 -	DMT	1916 May 21  2:00
-						# DMT = Dublin/Dunsink MT
-			-0:25:21 1:00	IST	1916 Oct  1  2:00s
-						# IST = Irish Summer Time
-			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	%s	1996
-			 0:00	EU	GMT/BST
-
-# Guernsey
-# Data from Joseph S. Myers
-# http://mm.icann.org/pipermail/tz/2013-September/019883.html
-# References to be added
-# LMT Location - 49.27N -2.33E - St.Peter Port
-Zone	Europe/Guernsey	-0:09:19 -	LMT	1913 Jun 18
-			 0:00	GB-Eire	%s	1940 Jul  2
-			 1:00	C-Eur	CE%sT	1945 May  8
-			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	%s	1996
-			 0:00	EU	GMT/BST
-
-# Isle of Man
-#
-# From Lester Caine (2013-09-04):
-# The Isle of Man legislation is now on-line at
-# <http://www.legislation.gov.im>, starting with the original Statutory
-# Time Act in 1883 and including additional confirmation of some of
-# the dates of the 'Summer Time' orders originating at
-# Westminster.  There is a little uncertainty as to the starting date
-# of the first summer time in 1916 which may have be announced a
-# couple of days late.  There is still a substantial number of
-# documents to work through, but it is thought that every GB change
-# was also implemented on the island.
-#
-# AT4 of 1883 - The Statutory Time et cetera Act 1883 -
-# LMT Location - 54.1508N -4.4814E - Tynwald Hill ( Manx parliament )
-Zone Europe/Isle_of_Man	-0:17:55 -	LMT	1883 Mar 30  0:00s
-			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	%s	1996
-			 0:00	EU	GMT/BST
-
-# Jersey
-# Data from Joseph S. Myers
-# http://mm.icann.org/pipermail/tz/2013-September/019883.html
-# References to be added
-# LMT Location - 49.187N -2.107E - St. Helier
-Zone	Europe/Jersey	-0:08:25 -	LMT	1898 Jun 11 16:00u
-			 0:00	GB-Eire	%s	1940 Jul  2
-			 1:00	C-Eur	CE%sT	1945 May  8
-			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	%s	1996
-			 0:00	EU	GMT/BST
-
-# Slovenia
-Zone Europe/Ljubljana	0:58:04	-	LMT	1884
-			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16  2:00s
-			1:00	-	CET	1982 Nov 27
-			1:00	EU	CE%sT
-
-# Bosnia and Herzegovina
-Zone	Europe/Sarajevo	1:13:40	-	LMT	1884
-			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16  2:00s
-			1:00	-	CET	1982 Nov 27
-			1:00	EU	CE%sT
-
-# Macedonia
-Zone	Europe/Skopje	1:25:44	-	LMT	1884
-			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16  2:00s
-			1:00	-	CET	1982 Nov 27
-			1:00	EU	CE%sT
-
-# Moldova / Transnistria
-Zone	Europe/Tiraspol	1:58:32	-	LMT	1880
-			1:55	-	CMT	1918 Feb 15 # Chisinau MT
-			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
-			2:00	Romania	EE%sT	1940 Aug 15
-			2:00	1:00	EEST	1941 Jul 17
-			1:00	C-Eur	CE%sT	1944 Aug 24
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	Russia	EE%sT	1992 Jan 19  2:00
-			3:00	Russia	MSK/MSD
-
-# Liechtenstein
-Zone	Europe/Vaduz	0:38:04 -	LMT	1894 Jun
-			1:00	-	CET	1981
-			1:00	EU	CE%sT
-
-# Croatia
-Zone	Europe/Zagreb	1:03:52	-	LMT	1884
-			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16  2:00s
-			1:00	-	CET	1982 Nov 27
-			1:00	EU	CE%sT
-
-# Madagascar
-Zone Indian/Antananarivo 3:10:04 -	LMT	1911 Jul
-			3:00	-	EAT	1954 Feb 27 23:00s
-			3:00	1:00	EAST	1954 May 29 23:00s
-			3:00	-	EAT
-
-# Comoros
-Zone	Indian/Comoro	2:53:04 -	LMT	1911 Jul # Moroni, Gran Comoro
-			3:00	-	EAT
-
-# Mayotte
-Zone	Indian/Mayotte	3:00:56 -	LMT	1911 Jul # Mamoutzou
-			3:00	-	EAT
-
-# US minor outlying islands
-Zone Pacific/Johnston	-10:00	-	HST
-
-# US minor outlying islands
-#
-# From Mark Brader (2005-01-23):
-# [Fallacies and Fantasies of Air Transport History, by R.E.G. Davies,
-# published 1994 by Paladwr Press, McLean, VA, USA; ISBN 0-9626483-5-3]
-# reproduced a Pan American Airways timetable from 1936, for their weekly
-# "Orient Express" flights between San Francisco and Manila, and connecting
-# flights to Chicago and the US East Coast.  As it uses some time zone
-# designations that I've never seen before:....
-# Fri. 6:30A Lv. HONOLOLU (Pearl Harbor), H.I.   H.L.T. Ar. 5:30P Sun.
-#  "   3:00P Ar. MIDWAY ISLAND . . . . . . . . . M.L.T. Lv. 6:00A  "
-#
-Zone Pacific/Midway	-11:49:28 -	LMT	1901
-			-11:00	-	-11	1956 Jun  3
-			-11:00	1:00	-10	1956 Sep  2
-			-11:00	-	-11
-
-# N Mariana Is
-Zone Pacific/Saipan	-14:17:00 -	LMT	1844 Dec 31
-			 9:43:00 -	LMT	1901
-			 9:00	-	+09	1969 Oct
-			10:00	-	+10	2000 Dec 23
-			10:00	-	ChST	# Chamorro Standard Time
diff --git a/src/timezone/data/etcetera b/src/timezone/data/etcetera
deleted file mode 100644
index f5fa4c94b4..0000000000
--- a/src/timezone/data/etcetera
+++ /dev/null
@@ -1,78 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# These entries are mostly present for historical reasons, so that
-# people in areas not otherwise covered by the tz files could "zic -l"
-# to a time zone that was right for their area.  These days, the
-# tz files cover almost all the inhabited world, and the only practical
-# need now for the entries that are not on UTC are for ships at sea
-# that cannot use POSIX TZ settings.
-
-# Starting with POSIX 1003.1-2001, the entries below are all
-# unnecessary as settings for the TZ environment variable.  E.g.,
-# instead of TZ='Etc/GMT+4' one can use the POSIX setting TZ='<-04>+4'.
-#
-# Do not use a POSIX TZ setting like TZ='GMT+4', which is four hours
-# behind GMT but uses the completely misleading abbreviation "GMT".
-
-Zone	Etc/GMT		0	-	GMT
-Zone	Etc/UTC		0	-	UTC
-Zone	Etc/UCT		0	-	UCT
-
-# The following link uses older naming conventions,
-# but it belongs here, not in the file 'backward',
-# as functions like gmtime load the "GMT" file to handle leap seconds properly.
-# We want this to work even on installations that omit the other older names.
-Link	Etc/GMT				GMT
-
-Link	Etc/UTC				Etc/Universal
-Link	Etc/UTC				Etc/Zulu
-
-Link	Etc/GMT				Etc/Greenwich
-Link	Etc/GMT				Etc/GMT-0
-Link	Etc/GMT				Etc/GMT+0
-Link	Etc/GMT				Etc/GMT0
-
-# Be consistent with POSIX TZ settings in the Zone names,
-# even though this is the opposite of what many people expect.
-# POSIX has positive signs west of Greenwich, but many people expect
-# positive signs east of Greenwich.  For example, TZ='Etc/GMT+4' uses
-# the abbreviation "-04" and corresponds to 4 hours behind UT
-# (i.e. west of Greenwich) even though many people would expect it to
-# mean 4 hours ahead of UT (i.e. east of Greenwich).
-
-# Earlier incarnations of this package were not POSIX-compliant,
-# and had lines such as
-#		Zone	GMT-12		-12	-	GMT-1200
-# We did not want things to change quietly if someone accustomed to the old
-# way does a
-#		zic -l GMT-12
-# so we moved the names into the Etc subdirectory.
-# Also, the time zone abbreviations are now compatible with %z.
-
-Zone	Etc/GMT-14	14	-	+14
-Zone	Etc/GMT-13	13	-	+13
-Zone	Etc/GMT-12	12	-	+12
-Zone	Etc/GMT-11	11	-	+11
-Zone	Etc/GMT-10	10	-	+10
-Zone	Etc/GMT-9	9	-	+09
-Zone	Etc/GMT-8	8	-	+08
-Zone	Etc/GMT-7	7	-	+07
-Zone	Etc/GMT-6	6	-	+06
-Zone	Etc/GMT-5	5	-	+05
-Zone	Etc/GMT-4	4	-	+04
-Zone	Etc/GMT-3	3	-	+03
-Zone	Etc/GMT-2	2	-	+02
-Zone	Etc/GMT-1	1	-	+01
-Zone	Etc/GMT+1	-1	-	-01
-Zone	Etc/GMT+2	-2	-	-02
-Zone	Etc/GMT+3	-3	-	-03
-Zone	Etc/GMT+4	-4	-	-04
-Zone	Etc/GMT+5	-5	-	-05
-Zone	Etc/GMT+6	-6	-	-06
-Zone	Etc/GMT+7	-7	-	-07
-Zone	Etc/GMT+8	-8	-	-08
-Zone	Etc/GMT+9	-9	-	-09
-Zone	Etc/GMT+10	-10	-	-10
-Zone	Etc/GMT+11	-11	-	-11
-Zone	Etc/GMT+12	-12	-	-12
diff --git a/src/timezone/data/europe b/src/timezone/data/europe
deleted file mode 100644
index 558b9f168f..0000000000
--- a/src/timezone/data/europe
+++ /dev/null
@@ -1,3839 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (2017-02-10):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-#
-# Except where otherwise noted, Shanks & Pottenger is the source for
-# entries through 1991, and IATA SSIM is the source for entries afterwards.
-#
-# Other sources occasionally used include:
-#
-#	Edward W. Whitman, World Time Differences,
-#	Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
-#	which I found in the UCLA library.
-#
-#	William Willett, The Waste of Daylight, 19th edition
-#	<http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
-#	[PDF] (1914-03)
-#
-#	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-#	<http://www.jstor.org/stable/1774359>.  He writes:
-#	"It is requested that corrections and additions to these tables
-#	may be sent to Mr. John Milne, Royal Geographical Society,
-#	Savile Row, London."  Nowadays please email them to tz@iana.org.
-#
-#	Byalokoz EL. New Counting of Time in Russia since July 1, 1919.
-#	This Russian-language source was consulted by Vladimir Karpinsky; see
-#	http://mm.icann.org/pipermail/tz/2014-August/021320.html
-#	The full Russian citation is:
-#	Бялокоз, Евгений Людвигович. Новый счет времени в течении суток
-#	введенный декретом Совета народных комиссаров для всей России с 1-го
-#	июля 1919 г. / Изд. 2-е Междуведомственной комиссии. - Петроград:
-#	Десятая гос. тип., 1919.
-#	http://resolver.gpntb.ru/purl?docushare/dsweb/Get/Resource-2011/Byalokoz__E.L.__Novyy__schet__vremeni__v__techenie__sutok__izd__2(1).pdf
-#
-#	Brazil's Divisão Serviço da Hora (DSHO),
-#	History of Summer Time
-#	<http://pcdsh01.on.br/HISTHV.htm>
-#	(1998-09-21, in Portuguese)
-#
-# I invented the abbreviations marked '*' in the following table;
-# the rest are variants of the "xMT" pattern for a city's mean time,
-# or are from other sources.  Corrections are welcome!
-#                   std  dst  2dst
-#                   LMT             Local Mean Time
-#       -4:00       AST  ADT        Atlantic
-#        0:00       GMT  BST  BDST  Greenwich, British Summer
-#        0:00       GMT  IST        Greenwich, Irish Summer
-#        0:00       WET  WEST WEMT  Western Europe
-#        0:19:32.13 AMT* NST*       Amsterdam, Netherlands Summer (1835-1937)
-#        1:00       BST             British Standard (1968-1971)
-#        1:00       CET  CEST CEMT  Central Europe
-#        1:00:14    SET             Swedish (1879-1899)
-#        1:36:34    RMT* LST*       Riga, Latvian Summer (1880-1926)*
-#        2:00       EET  EEST       Eastern Europe
-#        3:00       MSK  MSD  MDST* Moscow
-
-# From Peter Ilieve (1994-12-04),
-# The original six [EU members]: Belgium, France, (West) Germany, Italy,
-# Luxembourg, the Netherlands.
-# Plus, from 1 Jan 73: Denmark, Ireland, United Kingdom.
-# Plus, from 1 Jan 81: Greece.
-# Plus, from 1 Jan 86: Spain, Portugal.
-# Plus, from 1 Jan 95: Austria, Finland, Sweden. (Norway negotiated terms for
-# entry but in a referendum on 28 Nov 94 the people voted No by 52.2% to 47.8%
-# on a turnout of 88.6%. This was almost the same result as Norway's previous
-# referendum in 1972, they are the only country to have said No twice.
-# Referendums in the other three countries voted Yes.)
-# ...
-# Estonia ... uses EU dates but not at 01:00 GMT, they use midnight GMT.
-# I don't think they know yet what they will do from 1996 onwards.
-# ...
-# There shouldn't be any [current members who are not using EU rules].
-# A Directive has the force of law, member states are obliged to enact
-# national law to implement it. The only contentious issue was the
-# different end date for the UK and Ireland, and this was always allowed
-# in the Directive.
-
-
-###############################################################################
-
-# Britain (United Kingdom) and Ireland (Eire)
-
-# From Peter Ilieve (1994-07-06):
-#
-# On 17 Jan 1994 the Independent, a UK quality newspaper, had a piece about
-# historical vistas along the Thames in west London. There was a photo
-# and a sketch map showing some of the sightlines involved. One paragraph
-# of the text said:
-#
-# 'An old stone obelisk marking a forgotten terrestrial meridian stands
-# beside the river at Kew. In the 18th century, before time and longitude
-# was standardised by the Royal Observatory in Greenwich, scholars observed
-# this stone and the movement of stars from Kew Observatory nearby. They
-# made their calculations and set the time for the Horse Guards and Parliament,
-# but now the stone is obscured by scrubwood and can only be seen by walking
-# along the towpath within a few yards of it.'
-#
-# I have a one inch to one mile map of London and my estimate of the stone's
-# position is 51 degrees 28' 30" N, 0 degrees 18' 45" W. The longitude should
-# be within about +-2". The Ordnance Survey grid reference is TQ172761.
-#
-# [This yields GMTOFF = -0:01:15 for London LMT in the 18th century.]
-
-# From Paul Eggert (1993-11-18):
-#
-# Howse writes that Britain was the first country to use standard time.
-# The railways cared most about the inconsistencies of local mean time,
-# and it was they who forced a uniform time on the country.
-# The original idea was credited to Dr. William Hyde Wollaston (1766-1828)
-# and was popularized by Abraham Follett Osler (1808-1903).
-# The first railway to adopt London time was the Great Western Railway
-# in November 1840; other railways followed suit, and by 1847 most
-# (though not all) railways used London time.  On 1847-09-22 the
-# Railway Clearing House, an industry standards body, recommended that GMT be
-# adopted at all stations as soon as the General Post Office permitted it.
-# The transition occurred on 12-01 for the L&NW, the Caledonian,
-# and presumably other railways; the January 1848 Bradshaw's lists many
-# railways as using GMT.  By 1855 the vast majority of public
-# clocks in Britain were set to GMT (though some, like the great clock
-# on Tom Tower at Christ Church, Oxford, were fitted with two minute hands,
-# one for local time and one for GMT).  The last major holdout was the legal
-# system, which stubbornly stuck to local time for many years, leading
-# to oddities like polls opening at 08:13 and closing at 16:13.
-# The legal system finally switched to GMT when the Statutes (Definition
-# of Time) Act took effect; it received the Royal Assent on 1880-08-02.
-#
-# In the tables below, we condense this complicated story into a single
-# transition date for London, namely 1847-12-01.  We don't know as much
-# about Dublin, so we use 1880-08-02, the legal transition time.
-
-# From Paul Eggert (2014-07-19):
-# The ancients had no need for daylight saving, as they kept time
-# informally or via hours whose length depended on the time of year.
-# Daylight saving time in its modern sense was invented by the
-# New Zealand entomologist George Vernon Hudson (1867-1946),
-# whose day job as a postal clerk led him to value
-# after-hours daylight in which to pursue his research.
-# In 1895 he presented a paper to the Wellington Philosophical Society
-# that proposed a two-hour daylight-saving shift.  See:
-# Hudson GV. On seasonal time-adjustment in countries south of lat. 30 deg.
-# Transactions and Proceedings of the New Zealand Institute. 1895;28:734
-# http://rsnz.natlib.govt.nz/volume/rsnz_28/rsnz_28_00_006110.html
-# Although some interest was expressed in New Zealand, his proposal
-# did not find its way into law and eventually it was almost forgotten.
-#
-# In England, DST was independently reinvented by William Willett (1857-1915),
-# a London builder and member of the Royal Astronomical Society
-# who circulated a pamphlet "The Waste of Daylight" (1907)
-# that proposed advancing clocks 20 minutes on each of four Sundays in April,
-# and retarding them by the same amount on four Sundays in September.
-# A bill was drafted in 1909 and introduced in Parliament several times,
-# but it met with ridicule and opposition, especially from farming interests.
-# Later editions of the pamphlet proposed one-hour summer time, and
-# it was eventually adopted as a wartime measure in 1916.
-# See: Summer Time Arrives Early, The Times (2000-05-18).
-# A monument to Willett was unveiled on 1927-05-21, in an open space in
-# a 45-acre wood near Chislehurst, Kent that was purchased by popular
-# subscription and open to the public.  On the south face of the monolith,
-# designed by G. W. Miller, is the William Willett Memorial Sundial,
-# which is permanently set to Summer Time.
-
-# From Winston Churchill (1934-04-28):
-# It is one of the paradoxes of history that we should owe the boon of
-# summer time, which gives every year to the people of this country
-# between 160 and 170 hours more daylight leisure, to a war which
-# plunged Europe into darkness for four years, and shook the
-# foundations of civilization throughout the world.
-#	-- "A Silent Toast to William Willett", Pictorial Weekly;
-#	republished in Finest Hour (Spring 2002) 1(114):26
-#	http://www.winstonchurchill.org/images/finesthour/Vol.01%20No.114.pdf
-
-# From Paul Eggert (2015-08-08):
-# The OED Supplement says that the English originally said "Daylight Saving"
-# when they were debating the adoption of DST in 1908; but by 1916 this
-# term appears only in quotes taken from DST's opponents, whereas the
-# proponents (who eventually won the argument) are quoted as using "Summer".
-# The term "Summer Time" was introduced by Herbert Samuel, Home Secretary; see:
-# Viscount Samuel. Leisure in a Democracy. Cambridge University Press
-# ISBN 978-1-107-49471-8 (1949, reissued 2015), p 8.
-
-# From Arthur David Olson (1989-01-19):
-# A source at the British Information Office in New York avers that it's
-# known as "British" Summer Time in all parts of the United Kingdom.
-
-# Date: 4 Jan 89 08:57:25 GMT (Wed)
-# From: Jonathan Leffler
-# [British Summer Time] is fixed annually by Act of Parliament.
-# If you can predict what Parliament will do, you should be in
-# politics making a fortune, not computing.
-
-# From Chris Carrier (1996-06-14):
-# I remember reading in various wartime issues of the London Times the
-# acronym BDST for British Double Summer Time.  Look for the published
-# time of sunrise and sunset in The Times, when BDST was in effect, and
-# if you find a zone reference it will say, "All times B.D.S.T."
-
-# From Joseph S. Myers (1999-09-02):
-# ... some military cables (WO 219/4100 - this is a copy from the
-# main SHAEF archives held in the US National Archives, SHAEF/5252/8/516)
-# agree that the usage is BDST (this appears in a message dated 17 Feb 1945).
-
-# From Joseph S. Myers (2000-10-03):
-# On 18th April 1941, Sir Stephen Tallents of the BBC wrote to Sir
-# Alexander Maxwell of the Home Office asking whether there was any
-# official designation; the reply of the 21st was that there wasn't
-# but he couldn't think of anything better than the "Double British
-# Summer Time" that the BBC had been using informally.
-# http://www.polyomino.org.uk/british-time/bbc-19410418.png
-# http://www.polyomino.org.uk/british-time/ho-19410421.png
-
-# From Sir Alexander Maxwell in the above-mentioned letter (1941-04-21):
-# [N]o official designation has as far as I know been adopted for the time
-# which is to be introduced in May....
-# I cannot think of anything better than "Double British Summer Time"
-# which could not be said to run counter to any official description.
-
-# From Paul Eggert (2000-10-02):
-# Howse writes (p 157) 'DBST' too, but 'BDST' seems to have been common
-# and follows the more usual convention of putting the location name first,
-# so we use 'BDST'.
-
-# Peter Ilieve (1998-04-19) described at length
-# the history of summer time legislation in the United Kingdom.
-# Since 1998 Joseph S. Myers has been updating
-# and extending this list, which can be found in
-# http://www.polyomino.org.uk/british-time/
-
-# From Joseph S. Myers (1998-01-06):
-#
-# The legal time in the UK outside of summer time is definitely GMT, not UTC;
-# see Lord Tanlaw's speech
-# http://www.publications.parliament.uk/pa/ld199798/ldhansrd/vo970611/text/70611-10.htm#70611-10_head0
-# (Lords Hansard 11 June 1997 columns 964 to 976).
-
-# From Paul Eggert (2006-03-22):
-#
-# For lack of other data, follow Shanks & Pottenger for Eire in 1940-1948.
-#
-# Given Ilieve and Myers's data, the following claims by Shanks & Pottenger
-# are incorrect:
-#     * Wales did not switch from GMT to daylight saving time until
-#	1921 Apr 3, when they began to conform with the rest of Great Britain.
-# Actually, Wales was identical after 1880.
-#     * Eire had two transitions on 1916 Oct 1.
-# It actually just had one transition.
-#     * Northern Ireland used single daylight saving time throughout WW II.
-# Actually, it conformed to Britain.
-#     * GB-Eire changed standard time to 1 hour ahead of GMT on 1968-02-18.
-# Actually, that date saw the usual switch to summer time.
-# Standard time was not changed until 1968-10-27 (the clocks didn't change).
-#
-# Here is another incorrect claim by Shanks & Pottenger:
-#     * Jersey, Guernsey, and the Isle of Man did not switch from GMT
-#	to daylight saving time until 1921 Apr 3, when they began to
-#	conform with Great Britain.
-# S.R.&O. 1916, No. 382 and HO 45/10811/312364 (quoted above) say otherwise.
-#
-# The following claim by Shanks & Pottenger is possible though doubtful;
-# we'll ignore it for now.
-#     * Dublin's 1971-10-31 switch was at 02:00, even though London's was 03:00.
-#
-#
-# Whitman says Dublin Mean Time was -0:25:21, which is more precise than
-# Shanks & Pottenger.
-# Perhaps this was Dunsink Observatory Time, as Dunsink Observatory
-# (8 km NW of Dublin's center) seemingly was to Dublin as Greenwich was
-# to London.  For example:
-#
-#   "Timeball on the ballast office is down.  Dunsink time."
-#   -- James Joyce, Ulysses
-
-# "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean Time
-# was among various actions undertaken by the 'English' government that
-# would 'put the whole country into the SF (Sinn Féin) camp'.  She claimed
-# Irish 'public feeling (was) outraged by forcing of English time on us'."
-# -- Parsons M. Dublin lost its time zone - and 25 minutes - after 1916 Rising.
-# Irish Times 2014-10-27.
-# http://www.irishtimes.com/news/politics/dublin-lost-its-time-zone-and-25-minutes-after-1916-rising-1.1977411
-
-# From Joseph S. Myers (2005-01-26):
-# Irish laws are available online at <http://www.irishstatutebook.ie>.
-# These include various relating to legal time, for example:
-#
-# ZZA13Y1923.html ZZA12Y1924.html ZZA8Y1925.html ZZSIV20PG1267.html
-#
-# ZZSI71Y1947.html ZZSI128Y1948.html ZZSI23Y1949.html ZZSI41Y1950.html
-# ZZSI27Y1951.html ZZSI73Y1952.html
-#
-# ZZSI11Y1961.html ZZSI232Y1961.html ZZSI182Y1962.html
-# ZZSI167Y1963.html ZZSI257Y1964.html ZZSI198Y1967.html
-# ZZA23Y1968.html ZZA17Y1971.html
-#
-# ZZSI67Y1981.html ZZSI212Y1982.html ZZSI45Y1986.html
-# ZZSI264Y1988.html ZZSI52Y1990.html ZZSI371Y1992.html
-# ZZSI395Y1994.html ZZSI484Y1997.html ZZSI506Y2001.html
-#
-# [These are all relative to the root, e.g., the first is
-# <http://www.irishstatutebook.ie/ZZA13Y1923.html>.]
-#
-# (These are those I found, but there could be more.  In any case these
-# should allow various updates to the comments in the europe file to cover
-# the laws applicable in Ireland.)
-#
-# (Note that the time in the Republic of Ireland since 1968 has been defined
-# in terms of standard time being GMT+1 with a period of winter time when it
-# is GMT, rather than standard time being GMT with a period of summer time
-# being GMT+1.)
-
-# From Paul Eggert (1999-03-28):
-# Clive Feather (<news:859845706.26043.0@office.demon.net>, 1997-03-31)
-# reports that Folkestone (Cheriton) Shuttle Terminal uses Concession Time
-# (CT), equivalent to French civil time.
-# Julian Hill (<news:36118128.5A14@virgin.net>, 1998-09-30) reports that
-# trains between Dollands Moor (the freight facility next door)
-# and Frethun run in CT.
-# My admittedly uninformed guess is that the terminal has two authorities,
-# the French concession operators and the British civil authorities,
-# and that the time depends on who you're talking to.
-# If, say, the British police were called to the station for some reason,
-# I would expect the official police report to use GMT/BST and not CET/CEST.
-# This is a borderline case, but for now let's stick to GMT/BST.
-
-# From an anonymous contributor (1996-06-02):
-# The law governing time in Ireland is under Statutory Instrument SI 395/94,
-# which gives force to European Union 7th Council Directive No. 94/21/EC.
-# Under this directive, the Minister for Justice in Ireland makes appropriate
-# regulations. I spoke this morning with the Secretary of the Department of
-# Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
-# "Irish Summer Time", abbreviated to "IST".
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Summer Time Act, 1916
-Rule	GB-Eire	1916	only	-	May	21	2:00s	1:00	BST
-Rule	GB-Eire	1916	only	-	Oct	 1	2:00s	0	GMT
-# S.R.&O. 1917, No. 358
-Rule	GB-Eire	1917	only	-	Apr	 8	2:00s	1:00	BST
-Rule	GB-Eire	1917	only	-	Sep	17	2:00s	0	GMT
-# S.R.&O. 1918, No. 274
-Rule	GB-Eire	1918	only	-	Mar	24	2:00s	1:00	BST
-Rule	GB-Eire	1918	only	-	Sep	30	2:00s	0	GMT
-# S.R.&O. 1919, No. 297
-Rule	GB-Eire	1919	only	-	Mar	30	2:00s	1:00	BST
-Rule	GB-Eire	1919	only	-	Sep	29	2:00s	0	GMT
-# S.R.&O. 1920, No. 458
-Rule	GB-Eire	1920	only	-	Mar	28	2:00s	1:00	BST
-# S.R.&O. 1920, No. 1844
-Rule	GB-Eire	1920	only	-	Oct	25	2:00s	0	GMT
-# S.R.&O. 1921, No. 363
-Rule	GB-Eire	1921	only	-	Apr	 3	2:00s	1:00	BST
-Rule	GB-Eire	1921	only	-	Oct	 3	2:00s	0	GMT
-# S.R.&O. 1922, No. 264
-Rule	GB-Eire	1922	only	-	Mar	26	2:00s	1:00	BST
-Rule	GB-Eire	1922	only	-	Oct	 8	2:00s	0	GMT
-# The Summer Time Act, 1922
-Rule	GB-Eire	1923	only	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1923	1924	-	Sep	Sun>=16	2:00s	0	GMT
-Rule	GB-Eire	1924	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1925	1926	-	Apr	Sun>=16	2:00s	1:00	BST
-# The Summer Time Act, 1925
-Rule	GB-Eire	1925	1938	-	Oct	Sun>=2	2:00s	0	GMT
-Rule	GB-Eire	1927	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1928	1929	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1930	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1931	1932	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1933	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1934	only	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1935	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1936	1937	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1938	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1939	only	-	Apr	Sun>=16	2:00s	1:00	BST
-# S.R.&O. 1939, No. 1379
-Rule	GB-Eire	1939	only	-	Nov	Sun>=16	2:00s	0	GMT
-# S.R.&O. 1940, No. 172 and No. 1883
-Rule	GB-Eire	1940	only	-	Feb	Sun>=23	2:00s	1:00	BST
-# S.R.&O. 1941, No. 476
-Rule	GB-Eire	1941	only	-	May	Sun>=2	1:00s	2:00	BDST
-Rule	GB-Eire	1941	1943	-	Aug	Sun>=9	1:00s	1:00	BST
-# S.R.&O. 1942, No. 506
-Rule	GB-Eire	1942	1944	-	Apr	Sun>=2	1:00s	2:00	BDST
-# S.R.&O. 1944, No. 932
-Rule	GB-Eire	1944	only	-	Sep	Sun>=16	1:00s	1:00	BST
-# S.R.&O. 1945, No. 312
-Rule	GB-Eire	1945	only	-	Apr	Mon>=2	1:00s	2:00	BDST
-Rule	GB-Eire	1945	only	-	Jul	Sun>=9	1:00s	1:00	BST
-# S.R.&O. 1945, No. 1208
-Rule	GB-Eire	1945	1946	-	Oct	Sun>=2	2:00s	0	GMT
-Rule	GB-Eire	1946	only	-	Apr	Sun>=9	2:00s	1:00	BST
-# The Summer Time Act, 1947
-Rule	GB-Eire	1947	only	-	Mar	16	2:00s	1:00	BST
-Rule	GB-Eire	1947	only	-	Apr	13	1:00s	2:00	BDST
-Rule	GB-Eire	1947	only	-	Aug	10	1:00s	1:00	BST
-Rule	GB-Eire	1947	only	-	Nov	 2	2:00s	0	GMT
-# Summer Time Order, 1948 (S.I. 1948/495)
-Rule	GB-Eire	1948	only	-	Mar	14	2:00s	1:00	BST
-Rule	GB-Eire	1948	only	-	Oct	31	2:00s	0	GMT
-# Summer Time Order, 1949 (S.I. 1949/373)
-Rule	GB-Eire	1949	only	-	Apr	 3	2:00s	1:00	BST
-Rule	GB-Eire	1949	only	-	Oct	30	2:00s	0	GMT
-# Summer Time Order, 1950 (S.I. 1950/518)
-# Summer Time Order, 1951 (S.I. 1951/430)
-# Summer Time Order, 1952 (S.I. 1952/451)
-Rule	GB-Eire	1950	1952	-	Apr	Sun>=14	2:00s	1:00	BST
-Rule	GB-Eire	1950	1952	-	Oct	Sun>=21	2:00s	0	GMT
-# revert to the rules of the Summer Time Act, 1925
-Rule	GB-Eire	1953	only	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1953	1960	-	Oct	Sun>=2	2:00s	0	GMT
-Rule	GB-Eire	1954	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1955	1956	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1957	only	-	Apr	Sun>=9	2:00s	1:00	BST
-Rule	GB-Eire	1958	1959	-	Apr	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1960	only	-	Apr	Sun>=9	2:00s	1:00	BST
-# Summer Time Order, 1961 (S.I. 1961/71)
-# Summer Time (1962) Order, 1961 (S.I. 1961/2465)
-# Summer Time Order, 1963 (S.I. 1963/81)
-Rule	GB-Eire	1961	1963	-	Mar	lastSun	2:00s	1:00	BST
-Rule	GB-Eire	1961	1968	-	Oct	Sun>=23	2:00s	0	GMT
-# Summer Time (1964) Order, 1963 (S.I. 1963/2101)
-# Summer Time Order, 1964 (S.I. 1964/1201)
-# Summer Time Order, 1967 (S.I. 1967/1148)
-Rule	GB-Eire	1964	1967	-	Mar	Sun>=19	2:00s	1:00	BST
-# Summer Time Order, 1968 (S.I. 1968/117)
-Rule	GB-Eire	1968	only	-	Feb	18	2:00s	1:00	BST
-# The British Standard Time Act, 1968
-#	(no summer time)
-# The Summer Time Act, 1972
-Rule	GB-Eire	1972	1980	-	Mar	Sun>=16	2:00s	1:00	BST
-Rule	GB-Eire	1972	1980	-	Oct	Sun>=23	2:00s	0	GMT
-# Summer Time Order, 1980 (S.I. 1980/1089)
-# Summer Time Order, 1982 (S.I. 1982/1673)
-# Summer Time Order, 1986 (S.I. 1986/223)
-# Summer Time Order, 1988 (S.I. 1988/931)
-Rule	GB-Eire	1981	1995	-	Mar	lastSun	1:00u	1:00	BST
-Rule	GB-Eire 1981	1989	-	Oct	Sun>=23	1:00u	0	GMT
-# Summer Time Order, 1989 (S.I. 1989/985)
-# Summer Time Order, 1992 (S.I. 1992/1729)
-# Summer Time Order 1994 (S.I. 1994/2798)
-Rule	GB-Eire 1990	1995	-	Oct	Sun>=22	1:00u	0	GMT
-# Summer Time Order 1997 (S.I. 1997/2982)
-# See EU for rules starting in 1996.
-#
-# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/London	-0:01:15 -	LMT	1847 Dec  1  0:00s
-			 0:00	GB-Eire	%s	1968 Oct 27
-			 1:00	-	BST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	%s	1996
-			 0:00	EU	GMT/BST
-Link	Europe/London	Europe/Jersey
-Link	Europe/London	Europe/Guernsey
-Link	Europe/London	Europe/Isle_of_Man
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Dublin	-0:25:00 -	LMT	1880 Aug  2
-			-0:25:21 -	DMT	1916 May 21  2:00 # Dublin MT
-			-0:25:21 1:00	IST	1916 Oct  1  2:00s
-			 0:00	GB-Eire	%s	1921 Dec  6 # independence
-			 0:00	GB-Eire	GMT/IST	1940 Feb 25  2:00
-			 0:00	1:00	IST	1946 Oct  6  2:00
-			 0:00	-	GMT	1947 Mar 16  2:00
-			 0:00	1:00	IST	1947 Nov  2  2:00
-			 0:00	-	GMT	1948 Apr 18  2:00
-			 0:00	GB-Eire	GMT/IST	1968 Oct 27
-			 1:00	-	IST	1971 Oct 31  2:00u
-			 0:00	GB-Eire	GMT/IST	1996
-			 0:00	EU	GMT/IST
-
-###############################################################################
-
-# Europe
-
-# EU rules are for the European Union, previously known as the EC, EEC,
-# Common Market, etc.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	EU	1977	1980	-	Apr	Sun>=1	 1:00u	1:00	S
-Rule	EU	1977	only	-	Sep	lastSun	 1:00u	0	-
-Rule	EU	1978	only	-	Oct	 1	 1:00u	0	-
-Rule	EU	1979	1995	-	Sep	lastSun	 1:00u	0	-
-Rule	EU	1981	max	-	Mar	lastSun	 1:00u	1:00	S
-Rule	EU	1996	max	-	Oct	lastSun	 1:00u	0	-
-# The most recent directive covers the years starting in 2002.  See:
-# Directive 2000/84/EC of the European Parliament and of the Council
-# of 19 January 2001 on summer-time arrangements.
-# http://eur-lex.europa.eu/LexUriServ/LexUriServ.do?uri=CELEX:32000L0084:EN:NOT
-
-# W-Eur differs from EU only in that W-Eur uses standard time.
-Rule	W-Eur	1977	1980	-	Apr	Sun>=1	 1:00s	1:00	S
-Rule	W-Eur	1977	only	-	Sep	lastSun	 1:00s	0	-
-Rule	W-Eur	1978	only	-	Oct	 1	 1:00s	0	-
-Rule	W-Eur	1979	1995	-	Sep	lastSun	 1:00s	0	-
-Rule	W-Eur	1981	max	-	Mar	lastSun	 1:00s	1:00	S
-Rule	W-Eur	1996	max	-	Oct	lastSun	 1:00s	0	-
-
-# Older C-Eur rules are for convenience in the tables.
-# From 1977 on, C-Eur differs from EU only in that C-Eur uses standard time.
-Rule	C-Eur	1916	only	-	Apr	30	23:00	1:00	S
-Rule	C-Eur	1916	only	-	Oct	 1	 1:00	0	-
-Rule	C-Eur	1917	1918	-	Apr	Mon>=15	 2:00s	1:00	S
-Rule	C-Eur	1917	1918	-	Sep	Mon>=15	 2:00s	0	-
-Rule	C-Eur	1940	only	-	Apr	 1	 2:00s	1:00	S
-Rule	C-Eur	1942	only	-	Nov	 2	 2:00s	0	-
-Rule	C-Eur	1943	only	-	Mar	29	 2:00s	1:00	S
-Rule	C-Eur	1943	only	-	Oct	 4	 2:00s	0	-
-Rule	C-Eur	1944	1945	-	Apr	Mon>=1	 2:00s	1:00	S
-# Whitman gives 1944 Oct 7; go with Shanks & Pottenger.
-Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
-# From Jesper Nørgaard Welen (2008-07-13):
-#
-# I found what is probably a typo of 2:00 which should perhaps be 2:00s
-# in the C-Eur rule from tz database version 2008d (this part was
-# corrected in version 2008d). The circumstantial evidence is simply the
-# tz database itself, as seen below:
-#
-# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15  0:01
-#    0:00 France WE%sT 1945 Sep 16  3:00
-#
-# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
-#    0:00 France WE%sT 1945 Sep 16  3:00
-#
-# Zone Europe/Belgrade 1:22:00 - LMT 1884
-#    1:00 1:00 CEST 1945 Sep 16  2:00s
-#
-# Rule France 1945 only - Sep 16  3:00 0 -
-# Rule Belgium 1945 only - Sep 16  2:00s 0 -
-# Rule Neth 1945 only - Sep 16 2:00s 0 -
-#
-# The rule line to be changed is:
-#
-# Rule C-Eur 1945 only - Sep 16  2:00 0 -
-#
-# It seems that Paris, Monaco, Rule France, Rule Belgium all agree on
-# 2:00 standard time, e.g. 3:00 local time.  However there are no
-# countries that use C-Eur rules in September 1945, so the only items
-# affected are apparently these fictitious zones that translate acronyms
-# CET and MET:
-#
-# Zone CET  1:00 C-Eur CE%sT
-# Zone MET  1:00 C-Eur ME%sT
-#
-# It this is right then the corrected version would look like:
-#
-# Rule C-Eur 1945 only - Sep 16  2:00s 0 -
-#
-# A small step for mankind though 8-)
-Rule	C-Eur	1945	only	-	Sep	16	 2:00s	0	-
-Rule	C-Eur	1977	1980	-	Apr	Sun>=1	 2:00s	1:00	S
-Rule	C-Eur	1977	only	-	Sep	lastSun	 2:00s	0	-
-Rule	C-Eur	1978	only	-	Oct	 1	 2:00s	0	-
-Rule	C-Eur	1979	1995	-	Sep	lastSun	 2:00s	0	-
-Rule	C-Eur	1981	max	-	Mar	lastSun	 2:00s	1:00	S
-Rule	C-Eur	1996	max	-	Oct	lastSun	 2:00s	0	-
-
-# E-Eur differs from EU only in that E-Eur switches at midnight local time.
-Rule	E-Eur	1977	1980	-	Apr	Sun>=1	 0:00	1:00	S
-Rule	E-Eur	1977	only	-	Sep	lastSun	 0:00	0	-
-Rule	E-Eur	1978	only	-	Oct	 1	 0:00	0	-
-Rule	E-Eur	1979	1995	-	Sep	lastSun	 0:00	0	-
-Rule	E-Eur	1981	max	-	Mar	lastSun	 0:00	1:00	S
-Rule	E-Eur	1996	max	-	Oct	lastSun	 0:00	0	-
-
-
-# Daylight saving time for Russia and the Soviet Union
-#
-# The 1917-1921 decree URLs are from Alexander Belopolsky (2016-08-23).
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Russia	1917	only	-	Jul	 1	23:00	1:00	MST  # Moscow Summer Time
-#
-# Decree No. 142 (1917-12-22) http://istmat.info/node/28137
-Rule	Russia	1917	only	-	Dec	28	 0:00	0	MMT  # Moscow Mean Time
-#
-# Decree No. 497 (1918-05-30) http://istmat.info/node/30001
-Rule	Russia	1918	only	-	May	31	22:00	2:00	MDST # Moscow Double Summer Time
-Rule	Russia	1918	only	-	Sep	16	 1:00	1:00	MST
-#
-# Decree No. 258 (1919-05-29) http://istmat.info/node/37949
-Rule	Russia	1919	only	-	May	31	23:00	2:00	MDST
-#
-Rule	Russia	1919	only	-	Jul	 1	 0:00u	1:00	MSD
-Rule	Russia	1919	only	-	Aug	16	 0:00	0	MSK
-#
-# Decree No. 63 (1921-02-03) http://istmat.info/node/45840
-Rule	Russia	1921	only	-	Feb	14	23:00	1:00	MSD
-#
-# Decree No. 121 (1921-03-07) http://istmat.info/node/45949
-Rule	Russia	1921	only	-	Mar	20	23:00	2:00	+05
-#
-Rule	Russia	1921	only	-	Sep	 1	 0:00	1:00	MSD
-Rule	Russia	1921	only	-	Oct	 1	 0:00	0	-
-# Act No. 925 of the Council of Ministers of the USSR (1980-10-24):
-Rule	Russia	1981	1984	-	Apr	 1	 0:00	1:00	S
-Rule	Russia	1981	1983	-	Oct	 1	 0:00	0	-
-# Act No. 967 of the Council of Ministers of the USSR (1984-09-13), repeated in
-# Act No. 227 of the Council of Ministers of the USSR (1989-03-14):
-Rule	Russia	1984	1995	-	Sep	lastSun	 2:00s	0	-
-Rule	Russia	1985	2010	-	Mar	lastSun	 2:00s	1:00	S
-#
-Rule	Russia	1996	2010	-	Oct	lastSun	 2:00s	0	-
-# As described below, Russia's 2014 change affects Zone data, not Rule data.
-
-# From Stepan Golosunov (2016-03-07):
-# Wikipedia and other sources refer to the Act of the Council of
-# Ministers of the USSR from 1988-01-04 No. 5 and the Act of the
-# Council of Ministers of the USSR from 1989-03-14 No. 227.
-#
-# I did not find full texts of these acts.  For the 1989 one we have
-# title at http://base.garant.ru/70754136/ :
-# "About change in calculation of time on the territories of
-# Lithuanian SSR, Latvian SSR and Estonian SSR, Astrakhan,
-# Kaliningrad, Kirov, Kuybyshev, Ulyanovsk and Uralsk oblasts".
-# And http://astrozet.net/files/Zones/DOC/RU/1980-925.txt appears to
-# contain quotes from both acts: Since last Sunday of March 1988 rules
-# of the second time belt are installed in Volgograd and Saratov
-# oblasts.  Since last Sunday of March 1989:
-# a) Lithuanian SSR, Latvian SSR, Estonian SSR, Kaliningrad oblast:
-# second time belt rules without extra hour (Moscow-1);
-# b) Astrakhan, Kirov, Kuybyshev, Ulyanovsk oblasts: second time belt
-# rules (Moscow time)
-# c) Uralsk oblast: third time belt rules (Moscow+1).
-
-# From Stepan Golosunov (2016-03-27):
-# Unamended version of the act of the
-# Government of the Russian Federation No. 23 from 08.01.1992
-# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102014034&rdk=0
-# says that every year clocks were to be moved forward on last Sunday
-# of March at 2 hours and moved backwards on last Sunday of September
-# at 3 hours.  It was amended in 1996 to replace September with October.
-
-# From Alexander Krivenyshev (2011-06-14):
-# According to Kremlin press service, Russian President Dmitry Medvedev
-# signed a federal law "On calculation of time" on June 9, 2011.
-# According to the law Russia is abolishing daylight saving time.
-#
-# Medvedev signed a law "On the Calculation of Time" (in russian):
-# http://bmockbe.ru/events/?ID=7583
-#
-# Medvedev signed a law on the calculation of the time (in russian):
-# http://www.regnum.ru/news/polit/1413906.html
-
-# From Arthur David Olson (2011-06-15):
-# Take "abolishing daylight saving time" to mean that time is now considered
-# to be standard.
-
-# These are for backward compatibility with older versions.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	WET		0:00	EU	WE%sT
-Zone	CET		1:00	C-Eur	CE%sT
-Zone	MET		1:00	C-Eur	ME%sT
-Zone	EET		2:00	EU	EE%sT
-
-# Previous editions of this database used abbreviations like MET DST
-# for Central European Summer Time, but this didn't agree with common usage.
-
-# From Markus Kuhn (1996-07-12):
-# The official German names ... are
-#
-#	Mitteleuropäische Zeit (MEZ)         = UTC+01:00
-#	Mitteleuropäische Sommerzeit (MESZ)  = UTC+02:00
-#
-# as defined in the German Time Act (Gesetz über die Zeitbestimmung (ZeitG),
-# 1978-07-25, Bundesgesetzblatt, Jahrgang 1978, Teil I, S. 1110-1111)....
-# I wrote ... to the German Federal Physical-Technical Institution
-#
-#	Physikalisch-Technische Bundesanstalt (PTB)
-#	Laboratorium 4.41 "Zeiteinheit"
-#	Postfach 3345
-#	D-38023 Braunschweig
-#	phone: +49 531 592-0
-#
-# ... I received today an answer letter from Dr. Peter Hetzel, head of the PTB
-# department for time and frequency transmission.  He explained that the
-# PTB translates MEZ and MESZ into English as
-#
-#	Central European Time (CET)         = UTC+01:00
-#	Central European Summer Time (CEST) = UTC+02:00
-
-
-# Albania
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Albania	1940	only	-	Jun	16	0:00	1:00	S
-Rule	Albania	1942	only	-	Nov	 2	3:00	0	-
-Rule	Albania	1943	only	-	Mar	29	2:00	1:00	S
-Rule	Albania	1943	only	-	Apr	10	3:00	0	-
-Rule	Albania	1974	only	-	May	 4	0:00	1:00	S
-Rule	Albania	1974	only	-	Oct	 2	0:00	0	-
-Rule	Albania	1975	only	-	May	 1	0:00	1:00	S
-Rule	Albania	1975	only	-	Oct	 2	0:00	0	-
-Rule	Albania	1976	only	-	May	 2	0:00	1:00	S
-Rule	Albania	1976	only	-	Oct	 3	0:00	0	-
-Rule	Albania	1977	only	-	May	 8	0:00	1:00	S
-Rule	Albania	1977	only	-	Oct	 2	0:00	0	-
-Rule	Albania	1978	only	-	May	 6	0:00	1:00	S
-Rule	Albania	1978	only	-	Oct	 1	0:00	0	-
-Rule	Albania	1979	only	-	May	 5	0:00	1:00	S
-Rule	Albania	1979	only	-	Sep	30	0:00	0	-
-Rule	Albania	1980	only	-	May	 3	0:00	1:00	S
-Rule	Albania	1980	only	-	Oct	 4	0:00	0	-
-Rule	Albania	1981	only	-	Apr	26	0:00	1:00	S
-Rule	Albania	1981	only	-	Sep	27	0:00	0	-
-Rule	Albania	1982	only	-	May	 2	0:00	1:00	S
-Rule	Albania	1982	only	-	Oct	 3	0:00	0	-
-Rule	Albania	1983	only	-	Apr	18	0:00	1:00	S
-Rule	Albania	1983	only	-	Oct	 1	0:00	0	-
-Rule	Albania	1984	only	-	Apr	 1	0:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Tirane	1:19:20 -	LMT	1914
-			1:00	-	CET	1940 Jun 16
-			1:00	Albania	CE%sT	1984 Jul
-			1:00	EU	CE%sT
-
-# Andorra
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Andorra	0:06:04 -	LMT	1901
-			0:00	-	WET	1946 Sep 30
-			1:00	-	CET	1985 Mar 31  2:00
-			1:00	EU	CE%sT
-
-# Austria
-
-# Milne says Vienna time was 1:05:21.
-
-# From Paul Eggert (2006-03-22): Shanks & Pottenger give 1918-06-16 and
-# 1945-11-18, but the Austrian Federal Office of Metrology and
-# Surveying (BEV) gives 1918-09-16 and for Vienna gives the "alleged"
-# date of 1945-04-12 with no time.  For the 1980-04-06 transition
-# Shanks & Pottenger give 02:00, the BEV 00:00.  Go with the BEV,
-# and guess 02:00 for 1945-04-12.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Austria	1920	only	-	Apr	 5	2:00s	1:00	S
-Rule	Austria	1920	only	-	Sep	13	2:00s	0	-
-Rule	Austria	1946	only	-	Apr	14	2:00s	1:00	S
-Rule	Austria	1946	1948	-	Oct	Sun>=1	2:00s	0	-
-Rule	Austria	1947	only	-	Apr	 6	2:00s	1:00	S
-Rule	Austria	1948	only	-	Apr	18	2:00s	1:00	S
-Rule	Austria	1980	only	-	Apr	 6	0:00	1:00	S
-Rule	Austria	1980	only	-	Sep	28	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Vienna	1:05:21 -	LMT	1893 Apr
-			1:00	C-Eur	CE%sT	1920
-			1:00	Austria	CE%sT	1940 Apr  1  2:00s
-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00s
-			1:00	1:00	CEST	1945 Apr 12  2:00s
-			1:00	-	CET	1946
-			1:00	Austria	CE%sT	1981
-			1:00	EU	CE%sT
-
-# Belarus
-#
-# From Stepan Golosunov (2016-07-02):
-# http://www.lawbelarus.com/repub/sub30/texf9611.htm
-# (Act of the Cabinet of Ministers of the Republic of Belarus from
-# 1992-03-25 No. 157) ... says clocks were to be moved forward at 2:00
-# on last Sunday of March and backward at 3:00 on last Sunday of September
-# (the same as previous USSR and contemporary Russian regulations).
-#
-# From Yauhen Kharuzhy (2011-09-16):
-# By latest Belarus government act Europe/Minsk timezone was changed to
-# GMT+3 without DST (was GMT+2 with DST).
-#
-# Sources (Russian language):
-# http://www.belta.by/ru/all_news/society/V-Belarusi-otmenjaetsja-perexod-na-sezonnoe-vremja_i_572952.html
-# http://naviny.by/rubrics/society/2011/09/16/ic_articles_116_175144/
-# http://news.tut.by/society/250578.html
-#
-# From Alexander Bokovoy (2014-10-09):
-# Belarussian government decided against changing to winter time....
-# http://eng.belta.by/all_news/society/Belarus-decides-against-adjusting-time-in-Russias-wake_i_76335.html
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Minsk	1:50:16 -	LMT	1880
-			1:50	-	MMT	1924 May  2 # Minsk Mean Time
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Jun 28
-			1:00	C-Eur	CE%sT	1944 Jul  3
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1991 Mar 31  2:00s
-			2:00	Russia	EE%sT	2011 Mar 27  2:00s
-			3:00	-	+03
-
-# Belgium
-#
-# From Paul Eggert (1997-07-02):
-# Entries from 1918 through 1991 are taken from:
-#	Annuaire de L'Observatoire Royal de Belgique,
-#	Avenue Circulaire, 3, B-1180 BRUXELLES, CLVIIe année, 1991
-#	(Imprimerie HAYEZ, s.p.r.l., Rue Fin, 4, 1080 BRUXELLES, MCMXC),
-#	pp 8-9.
-# LMT before 1892 was 0:17:30, according to the official journal of Belgium:
-#	Moniteur Belge, Samedi 30 Avril 1892, N.121.
-# Thanks to Pascal Delmoitie for these references.
-# The 1918 rules are listed for completeness; they apply to unoccupied Belgium.
-# Assume Brussels switched to WET in 1918 when the armistice took effect.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Belgium	1918	only	-	Mar	 9	 0:00s	1:00	S
-Rule	Belgium	1918	1919	-	Oct	Sat>=1	23:00s	0	-
-Rule	Belgium	1919	only	-	Mar	 1	23:00s	1:00	S
-Rule	Belgium	1920	only	-	Feb	14	23:00s	1:00	S
-Rule	Belgium	1920	only	-	Oct	23	23:00s	0	-
-Rule	Belgium	1921	only	-	Mar	14	23:00s	1:00	S
-Rule	Belgium	1921	only	-	Oct	25	23:00s	0	-
-Rule	Belgium	1922	only	-	Mar	25	23:00s	1:00	S
-Rule	Belgium	1922	1927	-	Oct	Sat>=1	23:00s	0	-
-Rule	Belgium	1923	only	-	Apr	21	23:00s	1:00	S
-Rule	Belgium	1924	only	-	Mar	29	23:00s	1:00	S
-Rule	Belgium	1925	only	-	Apr	 4	23:00s	1:00	S
-# DSH writes that a royal decree of 1926-02-22 specified the Sun following 3rd
-# Sat in Apr (except if it's Easter, in which case it's one Sunday earlier),
-# to Sun following 1st Sat in Oct, and that a royal decree of 1928-09-15
-# changed the transition times to 02:00 GMT.
-Rule	Belgium	1926	only	-	Apr	17	23:00s	1:00	S
-Rule	Belgium	1927	only	-	Apr	 9	23:00s	1:00	S
-Rule	Belgium	1928	only	-	Apr	14	23:00s	1:00	S
-Rule	Belgium	1928	1938	-	Oct	Sun>=2	 2:00s	0	-
-Rule	Belgium	1929	only	-	Apr	21	 2:00s	1:00	S
-Rule	Belgium	1930	only	-	Apr	13	 2:00s	1:00	S
-Rule	Belgium	1931	only	-	Apr	19	 2:00s	1:00	S
-Rule	Belgium	1932	only	-	Apr	 3	 2:00s	1:00	S
-Rule	Belgium	1933	only	-	Mar	26	 2:00s	1:00	S
-Rule	Belgium	1934	only	-	Apr	 8	 2:00s	1:00	S
-Rule	Belgium	1935	only	-	Mar	31	 2:00s	1:00	S
-Rule	Belgium	1936	only	-	Apr	19	 2:00s	1:00	S
-Rule	Belgium	1937	only	-	Apr	 4	 2:00s	1:00	S
-Rule	Belgium	1938	only	-	Mar	27	 2:00s	1:00	S
-Rule	Belgium	1939	only	-	Apr	16	 2:00s	1:00	S
-Rule	Belgium	1939	only	-	Nov	19	 2:00s	0	-
-Rule	Belgium	1940	only	-	Feb	25	 2:00s	1:00	S
-Rule	Belgium	1944	only	-	Sep	17	 2:00s	0	-
-Rule	Belgium	1945	only	-	Apr	 2	 2:00s	1:00	S
-Rule	Belgium	1945	only	-	Sep	16	 2:00s	0	-
-Rule	Belgium	1946	only	-	May	19	 2:00s	1:00	S
-Rule	Belgium	1946	only	-	Oct	 7	 2:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Brussels	0:17:30 -	LMT	1880
-			0:17:30	-	BMT	1892 May  1 12:00  # Brussels MT
-			0:00	-	WET	1914 Nov  8
-			1:00	-	CET	1916 May  1  0:00
-			1:00	C-Eur	CE%sT	1918 Nov 11 11:00u
-			0:00	Belgium	WE%sT	1940 May 20  2:00s
-			1:00	C-Eur	CE%sT	1944 Sep  3
-			1:00	Belgium	CE%sT	1977
-			1:00	EU	CE%sT
-
-# Bosnia and Herzegovina
-# See Europe/Belgrade.
-
-# Bulgaria
-#
-# From Plamen Simenov via Steffen Thorsen (1999-09-09):
-# A document of Government of Bulgaria (No. 94/1997) says:
-# EET -> EETDST is in 03:00 Local time in last Sunday of March ...
-# EETDST -> EET is in 04:00 Local time in last Sunday of October
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Bulg	1979	only	-	Mar	31	23:00	1:00	S
-Rule	Bulg	1979	only	-	Oct	 1	 1:00	0	-
-Rule	Bulg	1980	1982	-	Apr	Sat>=1	23:00	1:00	S
-Rule	Bulg	1980	only	-	Sep	29	 1:00	0	-
-Rule	Bulg	1981	only	-	Sep	27	 2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Sofia	1:33:16 -	LMT	1880
-			1:56:56	-	IMT	1894 Nov 30 # Istanbul MT?
-			2:00	-	EET	1942 Nov  2  3:00
-			1:00	C-Eur	CE%sT	1945
-			1:00	-	CET	1945 Apr  2  3:00
-			2:00	-	EET	1979 Mar 31 23:00
-			2:00	Bulg	EE%sT	1982 Sep 26  3:00
-			2:00	C-Eur	EE%sT	1991
-			2:00	E-Eur	EE%sT	1997
-			2:00	EU	EE%sT
-
-# Croatia
-# See Europe/Belgrade.
-
-# Cyprus
-# Please see the 'asia' file for Asia/Nicosia.
-
-# Czech Republic / Czechia
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Czech	1945	only	-	Apr	 8	2:00s	1:00	S
-Rule	Czech	1945	only	-	Nov	18	2:00s	0	-
-Rule	Czech	1946	only	-	May	 6	2:00s	1:00	S
-Rule	Czech	1946	1949	-	Oct	Sun>=1	2:00s	0	-
-Rule	Czech	1947	only	-	Apr	20	2:00s	1:00	S
-Rule	Czech	1948	only	-	Apr	18	2:00s	1:00	S
-Rule	Czech	1949	only	-	Apr	 9	2:00s	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Prague	0:57:44 -	LMT	1850
-			0:57:44	-	PMT	1891 Oct    # Prague Mean Time
-			1:00	C-Eur	CE%sT	1944 Sep 17  2:00s
-			1:00	Czech	CE%sT	1979
-			1:00	EU	CE%sT
-# Use Europe/Prague also for Slovakia.
-
-# Denmark, Faroe Islands, and Greenland
-
-# From Jesper Nørgaard Welen (2005-04-26):
-# http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law
-# [introducing standard time] was in effect from 1894-01-01....
-# The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL
-# confirms this, and states that the law was put forth 1893-03-29.
-#
-# The EU treaty with effect from 1973:
-# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL
-#
-# This provoked a new law from 1974 to make possible summer time changes
-# in subsequent decrees with the law
-# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL
-#
-# It seems however that no decree was set forward until 1980.  I have
-# not found any decree, but in another related law, the effecting DST
-# changes are stated explicitly to be from 1980-04-06 at 02:00 to
-# 1980-09-28 at 02:00.  If this is true, this differs slightly from
-# the EU rule in that DST runs to 02:00, not 03:00.  We don't know
-# when Denmark began using the EU rule correctly, but we have only
-# confirmation of the 1980-time, so I presume it was correct in 1981:
-# The law is about the management of the extra hour, concerning
-# working hours reported and effect on obligatory-rest rules (which
-# was suspended on that night):
-# http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL
-
-# From Jesper Nørgaard Welen (2005-06-11):
-# The Herning Folkeblad (1980-09-26) reported that the night between
-# Saturday and Sunday the clock is set back from three to two.
-
-# From Paul Eggert (2005-06-11):
-# Hence the "02:00" of the 1980 law refers to standard time, not
-# wall-clock time, and so the EU rules were in effect in 1980.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Denmark	1916	only	-	May	14	23:00	1:00	S
-Rule	Denmark	1916	only	-	Sep	30	23:00	0	-
-Rule	Denmark	1940	only	-	May	15	 0:00	1:00	S
-Rule	Denmark	1945	only	-	Apr	 2	 2:00s	1:00	S
-Rule	Denmark	1945	only	-	Aug	15	 2:00s	0	-
-Rule	Denmark	1946	only	-	May	 1	 2:00s	1:00	S
-Rule	Denmark	1946	only	-	Sep	 1	 2:00s	0	-
-Rule	Denmark	1947	only	-	May	 4	 2:00s	1:00	S
-Rule	Denmark	1947	only	-	Aug	10	 2:00s	0	-
-Rule	Denmark	1948	only	-	May	 9	 2:00s	1:00	S
-Rule	Denmark	1948	only	-	Aug	 8	 2:00s	0	-
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Copenhagen	 0:50:20 -	LMT	1890
-			 0:50:20 -	CMT	1894 Jan  1 # Copenhagen MT
-			 1:00	Denmark	CE%sT	1942 Nov  2  2:00s
-			 1:00	C-Eur	CE%sT	1945 Apr  2  2:00
-			 1:00	Denmark	CE%sT	1980
-			 1:00	EU	CE%sT
-Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
-			 0:00	-	WET	1981
-			 0:00	EU	WE%sT
-#
-# From Paul Eggert (2004-10-31):
-# During World War II, Germany maintained secret manned weather stations in
-# East Greenland and Franz Josef Land, but we don't know their time zones.
-# My source for this is Wilhelm Dege's book mentioned under Svalbard.
-#
-# From Paul Eggert (2006-03-22):
-# Greenland joined the EU as part of Denmark, obtained home rule on 1979-05-01,
-# and left the EU on 1985-02-01.  It therefore should have been using EU
-# rules at least through 1984.  Shanks & Pottenger say Scoresbysund and Godthåb
-# used C-Eur rules after 1980, but IATA SSIM (1991/1996) says they use EU
-# rules since at least 1991.  Assume EU rules since 1980.
-
-# From Gwillim Law (2001-06-06), citing
-# <http://www.statkart.no/efs/efshefter/2001/efs5-2001.pdf> (2001-03-15),
-# and with translations corrected by Steffen Thorsen:
-#
-# Greenland has four local times, and the relation to UTC
-# is according to the following time line:
-#
-# The military zone near Thule	UTC-4
-# Standard Greenland time	UTC-3
-# Scoresbysund			UTC-1
-# Danmarkshavn			UTC
-#
-# In the military area near Thule and in Danmarkshavn DST will not be
-# introduced.
-
-# From Rives McDow (2001-11-01):
-#
-# I correspond regularly with the Dansk Polarcenter, and wrote them at
-# the time to clarify the situation in Thule.  Unfortunately, I have
-# not heard back from them regarding my recent letter.  [But I have
-# info from earlier correspondence.]
-#
-# According to the center, a very small local time zone around Thule
-# Air Base keeps the time according to UTC-4, implementing daylight
-# savings using North America rules, changing the time at 02:00 local time....
-#
-# The east coast of Greenland north of the community of Scoresbysund
-# uses UTC in the same way as in Iceland, year round, with no dst.
-# There are just a few stations on this coast, including the
-# Danmarkshavn ICAO weather station mentioned in your September 29th
-# email.  The other stations are two sledge patrol stations in
-# Mestersvig and Daneborg, the air force base at Station Nord, and the
-# DPC research station at Zackenberg.
-#
-# Scoresbysund and two small villages nearby keep time UTC-1 and use
-# the same daylight savings time period as in West Greenland (Godthåb).
-#
-# The rest of Greenland, including Godthåb (this area, although it
-# includes central Greenland, is known as west Greenland), keeps time
-# UTC-3, with daylight savings methods according to European rules.
-#
-# It is common procedure to use UTC 0 in the wilderness of East and
-# North Greenland, because it is mainly Icelandic aircraft operators
-# maintaining traffic in these areas.  However, the official status of
-# this area is that it sticks with Godthåb time.  This area might be
-# considered a dual time zone in some respects because of this.
-
-# From Rives McDow (2001-11-19):
-# I heard back from someone stationed at Thule; the time change took place
-# there at 2:00 AM.
-
-# From Paul Eggert (2006-03-22):
-# From 1997 on the CIA map shows Danmarkshavn on GMT;
-# the 1995 map as like Godthåb.
-# For lack of better info, assume they were like Godthåb before 1996.
-# startkart.no says Thule does not observe DST, but this is clearly an error,
-# so go with Shanks & Pottenger for Thule transitions until this year.
-# For 2007 on assume Thule will stay in sync with US DST rules.
-
-# From J William Piggott (2016-02-20):
-# "Greenland north of the community of Scoresbysund" is officially named
-# "National Park" by Executive Order:
-# http://naalakkersuisut.gl/~/media/Nanoq/Files/Attached%20Files/Engelske-tekster/Legislation/Executive%20Order%20National%20Park.rtf
-# It is their only National Park.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
-Rule	Thule	1991	1992	-	Sep	lastSun	2:00	0	S
-Rule	Thule	1993	2006	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Thule	1993	2006	-	Oct	lastSun	2:00	0	S
-Rule	Thule	2007	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Thule	2007	max	-	Nov	Sun>=1	2:00	0	S
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Danmarkshavn -1:14:40 -	LMT	1916 Jul 28
-			-3:00	-	-03	1980 Apr  6  2:00
-			-3:00	EU	-03/-02	1996
-			0:00	-	GMT
-Zone America/Scoresbysund -1:27:52 -	LMT	1916 Jul 28 # Ittoqqortoormiit
-			-2:00	-	-02	1980 Apr  6  2:00
-			-2:00	C-Eur	-02/-01	1981 Mar 29
-			-1:00	EU	-01/+00
-Zone America/Godthab	-3:26:56 -	LMT	1916 Jul 28 # Nuuk
-			-3:00	-	-03	1980 Apr  6  2:00
-			-3:00	EU	-03/-02
-Zone America/Thule	-4:35:08 -	LMT	1916 Jul 28 # Pituffik air base
-			-4:00	Thule	A%sT
-
-# Estonia
-#
-# From Paul Eggert (2016-03-18):
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-#
-# From Peter Ilieve (1994-10-15):
-# A relative in Tallinn confirms the accuracy of the data for 1989 onwards
-# [through 1994] and gives the legal authority for it,
-# a regulation of the Government of Estonia, No. 111 of 1989....
-#
-# From Peter Ilieve (1996-10-28):
-# [IATA SSIM (1992/1996) claims that the Baltic republics switch at 01:00s,
-# but a relative confirms that Estonia still switches at 02:00s, writing:]
-# "I do not [know] exactly but there are some little different
-# (confusing) rules for International Air and Railway Transport Schedules
-# conversion in Sunday connected with end of summer time in Estonia....
-# A discussion is running about the summer time efficiency and effect on
-# human physiology.  It seems that Estonia maybe will not change to
-# summer time next spring."
-
-# From Peter Ilieve (1998-11-04), heavily edited:
-# The 1998-09-22 Estonian time law
-# http://trip.rk.ee/cgi-bin/thw?${BASE}=akt&${OOHTML}=rtd&TA=1998&TO=1&AN=1390
-# refers to the Eighth Directive and cites the association agreement between
-# the EU and Estonia, ratified by the Estonian law (RT II 1995, 22-27, 120).
-#
-# I also asked [my relative] whether they use any standard abbreviation
-# for their standard and summer times. He says no, they use "suveaeg"
-# (summer time) and "talveaeg" (winter time).
-
-# From The Baltic Times <http://www.baltictimes.com/> (1999-09-09)
-# via Steffen Thorsen:
-# This year will mark the last time Estonia shifts to summer time,
-# a council of the ruling coalition announced Sept. 6....
-# But what this could mean for Estonia's chances of joining the European
-# Union are still unclear.  In 1994, the EU declared summer time compulsory
-# for all member states until 2001.  Brussels has yet to decide what to do
-# after that.
-
-# From Mart Oruaas (2000-01-29):
-# Regulation No. 301 (1999-10-12) obsoletes previous regulation
-# No. 206 (1998-09-22) and thus sticks Estonia to +02:00 GMT for all
-# the year round.  The regulation is effective 1999-11-01.
-
-# From Toomas Soome (2002-02-21):
-# The Estonian government has changed once again timezone politics.
-# Now we are using again EU rules.
-#
-# From Urmet Jänes (2002-03-28):
-# The legislative reference is Government decree No. 84 on 2002-02-21.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Tallinn	1:39:00	-	LMT	1880
-			1:39:00	-	TMT	1918 Feb    # Tallinn Mean Time
-			1:00	C-Eur	CE%sT	1919 Jul
-			1:39:00	-	TMT	1921 May
-			2:00	-	EET	1940 Aug  6
-			3:00	-	MSK	1941 Sep 15
-			1:00	C-Eur	CE%sT	1944 Sep 22
-			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
-			2:00	1:00	EEST	1989 Sep 24  2:00s
-			2:00	C-Eur	EE%sT	1998 Sep 22
-			2:00	EU	EE%sT	1999 Oct 31  4:00
-			2:00	-	EET	2002 Feb 21
-			2:00	EU	EE%sT
-
-# Finland
-
-# From Hannu Strang (1994-09-25 06:03:37 UTC):
-# Well, here in Helsinki we're just changing from summer time to regular one,
-# and it's supposed to change at 4am...
-
-# From Janne Snabb (2010-07-15):
-#
-# I noticed that the Finland data is not accurate for years 1981 and 1982.
-# During these two first trial years the DST adjustment was made one hour
-# earlier than in forthcoming years. Starting 1983 the adjustment was made
-# according to the central European standards.
-#
-# This is documented in Heikki Oja: Aikakirja 2007, published by The Almanac
-# Office of University of Helsinki, ISBN 952-10-3221-9, available online (in
-# Finnish) at
-# http://almanakka.helsinki.fi/aikakirja/Aikakirja2007kokonaan.pdf
-#
-# Page 105 (56 in PDF version) has a handy table of all past daylight savings
-# transitions. It is easy enough to interpret without Finnish skills.
-#
-# This is also confirmed by Finnish Broadcasting Company's archive at:
-# http://www.yle.fi/elavaarkisto/?s=s&g=1&ag=5&t=&a=3401
-#
-# The news clip from 1981 says that "the time between 2 and 3 o'clock does not
-# exist tonight."
-
-# From Konstantin Hyppönen (2014-06-13):
-# [Heikki Oja's book Aikakirja 2013]
-# http://almanakka.helsinki.fi/images/aikakirja/Aikakirja2013kokonaan.pdf
-# pages 104-105, including a scan from a newspaper published on Apr 2 1942
-# say that ... [o]n Apr 2 1942, 24 o'clock (which means Apr 3 1942,
-# 00:00), clocks were moved one hour forward. The newspaper
-# mentions "on the night from Thursday to Friday"....
-# On Oct 4 1942, clocks were moved at 1:00 one hour backwards.
-#
-# From Paul Eggert (2014-06-14):
-# Go with Oja over Shanks.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Finland	1942	only	-	Apr	2	24:00	1:00	S
-Rule	Finland	1942	only	-	Oct	4	1:00	0	-
-Rule	Finland	1981	1982	-	Mar	lastSun	2:00	1:00	S
-Rule	Finland	1981	1982	-	Sep	lastSun	3:00	0	-
-
-# Milne says Helsinki (Helsingfors) time was 1:39:49.2 (official document);
-# round to nearest.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Helsinki	1:39:49 -	LMT	1878 May 31
-			1:39:49	-	HMT	1921 May    # Helsinki Mean Time
-			2:00	Finland	EE%sT	1983
-			2:00	EU	EE%sT
-
-# Åland Is
-Link	Europe/Helsinki	Europe/Mariehamn
-
-
-# France
-
-# From Ciro Discepolo (2000-12-20):
-#
-# Henri Le Corre, Régimes horaires pour le monde entier, Éditions
-# Traditionnelles - Paris 2 books, 1993
-#
-# Gabriel, Traité de l'heure dans le monde, Guy Trédaniel,
-# Paris, 1991
-#
-# Françoise Gauquelin, Problèmes de l'heure résolus en astrologie,
-# Guy Trédaniel, Paris 1987
-
-
-#
-# Shank & Pottenger seem to use '24:00' ambiguously; resolve it with Whitman.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	France	1916	only	-	Jun	14	23:00s	1:00	S
-Rule	France	1916	1919	-	Oct	Sun>=1	23:00s	0	-
-Rule	France	1917	only	-	Mar	24	23:00s	1:00	S
-Rule	France	1918	only	-	Mar	 9	23:00s	1:00	S
-Rule	France	1919	only	-	Mar	 1	23:00s	1:00	S
-Rule	France	1920	only	-	Feb	14	23:00s	1:00	S
-Rule	France	1920	only	-	Oct	23	23:00s	0	-
-Rule	France	1921	only	-	Mar	14	23:00s	1:00	S
-Rule	France	1921	only	-	Oct	25	23:00s	0	-
-Rule	France	1922	only	-	Mar	25	23:00s	1:00	S
-# DSH writes that a law of 1923-05-24 specified 3rd Sat in Apr at 23:00 to 1st
-# Sat in Oct at 24:00; and that in 1930, because of Easter, the transitions
-# were Apr 12 and Oct 5.  Go with Shanks & Pottenger.
-Rule	France	1922	1938	-	Oct	Sat>=1	23:00s	0	-
-Rule	France	1923	only	-	May	26	23:00s	1:00	S
-Rule	France	1924	only	-	Mar	29	23:00s	1:00	S
-Rule	France	1925	only	-	Apr	 4	23:00s	1:00	S
-Rule	France	1926	only	-	Apr	17	23:00s	1:00	S
-Rule	France	1927	only	-	Apr	 9	23:00s	1:00	S
-Rule	France	1928	only	-	Apr	14	23:00s	1:00	S
-Rule	France	1929	only	-	Apr	20	23:00s	1:00	S
-Rule	France	1930	only	-	Apr	12	23:00s	1:00	S
-Rule	France	1931	only	-	Apr	18	23:00s	1:00	S
-Rule	France	1932	only	-	Apr	 2	23:00s	1:00	S
-Rule	France	1933	only	-	Mar	25	23:00s	1:00	S
-Rule	France	1934	only	-	Apr	 7	23:00s	1:00	S
-Rule	France	1935	only	-	Mar	30	23:00s	1:00	S
-Rule	France	1936	only	-	Apr	18	23:00s	1:00	S
-Rule	France	1937	only	-	Apr	 3	23:00s	1:00	S
-Rule	France	1938	only	-	Mar	26	23:00s	1:00	S
-Rule	France	1939	only	-	Apr	15	23:00s	1:00	S
-Rule	France	1939	only	-	Nov	18	23:00s	0	-
-Rule	France	1940	only	-	Feb	25	 2:00	1:00	S
-# The French rules for 1941-1944 were not used in Paris, but Shanks & Pottenger
-# write that they were used in Monaco and in many French locations.
-# Le Corre writes that the upper limit of the free zone was Arnéguy, Orthez,
-# Mont-de-Marsan, Bazas, Langon, Lamothe-Montravel, Marœuil, La
-# Rochefoucauld, Champagne-Mouton, La Roche-Posay, La Haye-Descartes,
-# Loches, Montrichard, Vierzon, Bourges, Moulins, Digoin,
-# Paray-le-Monial, Montceau-les-Mines, Chalon-sur-Saône, Arbois,
-# Dole, Morez, St-Claude, and Collonges (Haute-Savoie).
-Rule	France	1941	only	-	May	 5	 0:00	2:00	M # Midsummer
-# Shanks & Pottenger say this transition occurred at Oct 6 1:00,
-# but go with Denis Excoffier (1997-12-12),
-# who quotes the Ephémérides astronomiques for 1998 from Bureau des Longitudes
-# as saying 5/10/41 22hUT.
-Rule	France	1941	only	-	Oct	 6	 0:00	1:00	S
-Rule	France	1942	only	-	Mar	 9	 0:00	2:00	M
-Rule	France	1942	only	-	Nov	 2	 3:00	1:00	S
-Rule	France	1943	only	-	Mar	29	 2:00	2:00	M
-Rule	France	1943	only	-	Oct	 4	 3:00	1:00	S
-Rule	France	1944	only	-	Apr	 3	 2:00	2:00	M
-Rule	France	1944	only	-	Oct	 8	 1:00	1:00	S
-Rule	France	1945	only	-	Apr	 2	 2:00	2:00	M
-Rule	France	1945	only	-	Sep	16	 3:00	0	-
-# Shanks & Pottenger give Mar 28 2:00 and Sep 26 3:00;
-# go with Excoffier's 28/3/76 0hUT and 25/9/76 23hUT.
-Rule	France	1976	only	-	Mar	28	 1:00	1:00	S
-Rule	France	1976	only	-	Sep	26	 1:00	0	-
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time, and Whitman 0:09:05,
-# but Howse quotes the actual French legislation as saying 0:09:21.
-# Go with Howse.  Howse writes that the time in France was officially based
-# on PMT-0:09:21 until 1978-08-09, when the time base finally switched to UTC.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Paris	0:09:21 -	LMT	1891 Mar 15  0:01
-			0:09:21	-	PMT	1911 Mar 11  0:01 # Paris MT
-# Shanks & Pottenger give 1940 Jun 14 0:00; go with Excoffier and Le Corre.
-			0:00	France	WE%sT	1940 Jun 14 23:00
-# Le Corre says Paris stuck with occupied-France time after the liberation;
-# go with Shanks & Pottenger.
-			1:00	C-Eur	CE%sT	1944 Aug 25
-			0:00	France	WE%sT	1945 Sep 16  3:00
-			1:00	France	CE%sT	1977
-			1:00	EU	CE%sT
-
-# Germany
-
-# From Markus Kuhn (1998-09-29):
-# The German time zone web site by the Physikalisch-Technische
-# Bundesanstalt contains DST information back to 1916.
-# [See tz-link.htm for the URL.]
-
-# From Jörg Schilling (2002-10-23):
-# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
-# http://www.dhm.de/lemo/html/biografien/BersarinNikolai/
-# General [Nikolai] Bersarin.
-
-# From Paul Eggert (2003-03-08):
-# http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
-# says that Bersarin issued an order to use Moscow time on May 20.
-# However, Moscow did not observe daylight saving in 1945, so
-# this was equivalent to UT +03, not +04.
-
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Germany	1946	only	-	Apr	14	2:00s	1:00	S
-Rule	Germany	1946	only	-	Oct	 7	2:00s	0	-
-Rule	Germany	1947	1949	-	Oct	Sun>=1	2:00s	0	-
-# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition
-# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger.
-# Go with the PTB.
-Rule	Germany	1947	only	-	Apr	 6	3:00s	1:00	S
-Rule	Germany	1947	only	-	May	11	2:00s	2:00	M
-Rule	Germany	1947	only	-	Jun	29	3:00	1:00	S
-Rule	Germany	1948	only	-	Apr	18	2:00s	1:00	S
-Rule	Germany	1949	only	-	Apr	10	2:00s	1:00	S
-
-Rule SovietZone	1945	only	-	May	24	2:00	2:00	M # Midsummer
-Rule SovietZone	1945	only	-	Sep	24	3:00	1:00	S
-Rule SovietZone	1945	only	-	Nov	18	2:00s	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
-			1:00	C-Eur	CE%sT	1945 May 24  2:00
-			1:00 SovietZone	CE%sT	1946
-			1:00	Germany	CE%sT	1980
-			1:00	EU	CE%sT
-
-# From Tobias Conradi (2011-09-12):
-# Büsingen <http://www.buesingen.de>, surrounded by the Swiss canton
-# Schaffhausen, did not start observing DST in 1980 as the rest of DE
-# (West Germany at that time) and DD (East Germany at that time) did.
-# DD merged into DE, the area is currently covered by code DE in ISO 3166-1,
-# which in turn is covered by the zone Europe/Berlin.
-#
-# Source for the time in Büsingen 1980:
-# http://www.srf.ch/player/video?id=c012c029-03b7-4c2b-9164-aa5902cd58d3
-
-# From Arthur David Olson (2012-03-03):
-# Büsingen and Zurich have shared clocks since 1970.
-
-Link	Europe/Zurich	Europe/Busingen
-
-# Georgia
-# Please see the "asia" file for Asia/Tbilisi.
-# Herodotus (Histories, IV.45) says Georgia north of the Phasis (now Rioni)
-# is in Europe.  Our reference location Tbilisi is in the Asian part.
-
-# Gibraltar
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Gibraltar	-0:21:24 -	LMT	1880 Aug  2  0:00s
-			0:00	GB-Eire	%s	1957 Apr 14  2:00
-			1:00	-	CET	1982
-			1:00	EU	CE%sT
-
-# Greece
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1932 Jul 5 - Nov 1; go with Shanks & Pottenger.
-Rule	Greece	1932	only	-	Jul	 7	0:00	1:00	S
-Rule	Greece	1932	only	-	Sep	 1	0:00	0	-
-# Whitman gives 1941 Apr 25 - ?; go with Shanks & Pottenger.
-Rule	Greece	1941	only	-	Apr	 7	0:00	1:00	S
-# Whitman gives 1942 Feb 2 - ?; go with Shanks & Pottenger.
-Rule	Greece	1942	only	-	Nov	 2	3:00	0	-
-Rule	Greece	1943	only	-	Mar	30	0:00	1:00	S
-Rule	Greece	1943	only	-	Oct	 4	0:00	0	-
-# Whitman gives 1944 Oct 3 - Oct 31; go with Shanks & Pottenger.
-Rule	Greece	1952	only	-	Jul	 1	0:00	1:00	S
-Rule	Greece	1952	only	-	Nov	 2	0:00	0	-
-Rule	Greece	1975	only	-	Apr	12	0:00s	1:00	S
-Rule	Greece	1975	only	-	Nov	26	0:00s	0	-
-Rule	Greece	1976	only	-	Apr	11	2:00s	1:00	S
-Rule	Greece	1976	only	-	Oct	10	2:00s	0	-
-Rule	Greece	1977	1978	-	Apr	Sun>=1	2:00s	1:00	S
-Rule	Greece	1977	only	-	Sep	26	2:00s	0	-
-Rule	Greece	1978	only	-	Sep	24	4:00	0	-
-Rule	Greece	1979	only	-	Apr	 1	9:00	1:00	S
-Rule	Greece	1979	only	-	Sep	29	2:00	0	-
-Rule	Greece	1980	only	-	Apr	 1	0:00	1:00	S
-Rule	Greece	1980	only	-	Sep	28	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Athens	1:34:52 -	LMT	1895 Sep 14
-			1:34:52	-	AMT	1916 Jul 28  0:01 # Athens MT
-			2:00	Greece	EE%sT	1941 Apr 30
-			1:00	Greece	CE%sT	1944 Apr  4
-			2:00	Greece	EE%sT	1981
-			# Shanks & Pottenger say it switched to C-Eur in 1981;
-			# go with EU instead, since Greece joined it on Jan 1.
-			2:00	EU	EE%sT
-
-# Hungary
-# From Paul Eggert (2014-07-15):
-# Dates for 1916-1945 are taken from:
-# Oross A. Jelen a múlt jövője: a nyári időszámítás Magyarországon 1916-1945.
-# National Archives of Hungary (2012-10-29).
-# http://mnl.gov.hu/a_het_dokumentuma/a_nyari_idoszamitas_magyarorszagon_19161945.html
-# This source does not always give times, which are taken from Shanks
-# & Pottenger (which disagree about the dates).
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Hungary	1918	only	-	Apr	 1	 3:00	1:00	S
-Rule	Hungary	1918	only	-	Sep	16	 3:00	0	-
-Rule	Hungary	1919	only	-	Apr	15	 3:00	1:00	S
-Rule	Hungary	1919	only	-	Nov	24	 3:00	0	-
-Rule	Hungary	1945	only	-	May	 1	23:00	1:00	S
-Rule	Hungary	1945	only	-	Nov	 1	 0:00	0	-
-Rule	Hungary	1946	only	-	Mar	31	 2:00s	1:00	S
-Rule	Hungary	1946	1949	-	Oct	Sun>=1	 2:00s	0	-
-Rule	Hungary	1947	1949	-	Apr	Sun>=4	 2:00s	1:00	S
-Rule	Hungary	1950	only	-	Apr	17	 2:00s	1:00	S
-Rule	Hungary	1950	only	-	Oct	23	 2:00s	0	-
-Rule	Hungary	1954	1955	-	May	23	 0:00	1:00	S
-Rule	Hungary	1954	1955	-	Oct	 3	 0:00	0	-
-Rule	Hungary	1956	only	-	Jun	Sun>=1	 0:00	1:00	S
-Rule	Hungary	1956	only	-	Sep	lastSun	 0:00	0	-
-Rule	Hungary	1957	only	-	Jun	Sun>=1	 1:00	1:00	S
-Rule	Hungary	1957	only	-	Sep	lastSun	 3:00	0	-
-Rule	Hungary	1980	only	-	Apr	 6	 1:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
-			1:00	C-Eur	CE%sT	1918
-			1:00	Hungary	CE%sT	1941 Apr  8
-			1:00	C-Eur	CE%sT	1945
-			1:00	Hungary	CE%sT	1980 Sep 28  2:00s
-			1:00	EU	CE%sT
-
-# Iceland
-#
-# From Adam David (1993-11-06):
-# The name of the timezone in Iceland for system / mail / news purposes is GMT.
-#
-# (1993-12-05):
-# This material is paraphrased from the 1988 edition of the University of
-# Iceland Almanak.
-#
-# From January 1st, 1908 the whole of Iceland was standardised at 1 hour
-# behind GMT. Previously, local mean solar time was used in different parts
-# of Iceland, the almanak had been based on Reykjavik mean solar time which
-# was 1 hour and 28 minutes behind GMT.
-#
-# "first day of winter" referred to [below] means the first day of the 26 weeks
-# of winter, according to the old icelandic calendar that dates back to the
-# time the norsemen first settled Iceland.  The first day of winter is always
-# Saturday, but is not dependent on the Julian or Gregorian calendars.
-#
-# (1993-12-10):
-# I have a reference from the Oxford Icelandic-English dictionary for the
-# beginning of winter, which ties it to the ecclesiastical calendar (and thus
-# to the julian/gregorian calendar) over the period in question.
-#	the winter begins on the Saturday next before St. Luke's day
-#	(old style), or on St. Luke's day, if a Saturday.
-# St. Luke's day ought to be traceable from ecclesiastical sources. "old style"
-# might be a reference to the Julian calendar as opposed to Gregorian, or it
-# might mean something else (???).
-#
-# From Paul Eggert (2014-11-22):
-# The information below is taken from the 1988 Almanak; see
-# http://www.almanak.hi.is/klukkan.html
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Iceland	1917	1919	-	Feb	19	23:00	1:00	S
-Rule	Iceland	1917	only	-	Oct	21	 1:00	0	-
-Rule	Iceland	1918	1919	-	Nov	16	 1:00	0	-
-Rule	Iceland	1921	only	-	Mar	19	23:00	1:00	S
-Rule	Iceland	1921	only	-	Jun	23	 1:00	0	-
-Rule	Iceland	1939	only	-	Apr	29	23:00	1:00	S
-Rule	Iceland	1939	only	-	Oct	29	 2:00	0	-
-Rule	Iceland	1940	only	-	Feb	25	 2:00	1:00	S
-Rule	Iceland	1940	1941	-	Nov	Sun>=2	 1:00s	0	-
-Rule	Iceland	1941	1942	-	Mar	Sun>=2	 1:00s	1:00	S
-# 1943-1946 - first Sunday in March until first Sunday in winter
-Rule	Iceland	1943	1946	-	Mar	Sun>=1	 1:00s	1:00	S
-Rule	Iceland	1942	1948	-	Oct	Sun>=22	 1:00s	0	-
-# 1947-1967 - first Sunday in April until first Sunday in winter
-Rule	Iceland	1947	1967	-	Apr	Sun>=1	 1:00s	1:00	S
-# 1949 and 1967 Oct transitions delayed by 1 week
-Rule	Iceland	1949	only	-	Oct	30	 1:00s	0	-
-Rule	Iceland	1950	1966	-	Oct	Sun>=22	 1:00s	0	-
-Rule	Iceland	1967	only	-	Oct	29	 1:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Reykjavik	-1:28	-	LMT	1908
-			-1:00	Iceland	-01/+00	1968 Apr  7  1:00s
-			 0:00	-	GMT
-
-# Italy
-#
-# From Paul Eggert (2001-03-06):
-# Sicily and Sardinia each had their own time zones from 1866 to 1893,
-# called Palermo Time (+00:53:28) and Cagliari Time (+00:36:32).
-# During World War II, German-controlled Italy used German time.
-# But these events all occurred before the 1970 cutoff,
-# so record only the time in Rome.
-#
-# From Michael Deckers (2016-10-24):
-# http://www.ac-ilsestante.it/MERIDIANE/ora_legale quotes a law of 1893-08-10
-# ... [translated as] "The preceding dispositions will enter into
-# force at the instant at which, according to the time specified in
-# the 1st article, the 1st of November 1893 will begin...."
-#
-# From Pierpaolo Bernardi (2016-10-20):
-# The authoritative source for time in Italy is the national metrological
-# institute, which has a summary page of historical DST data at
-# http://www.inrim.it/res/tf/ora_legale_i.shtml
-# (2016-10-24):
-# http://www.renzobaldini.it/le-ore-legali-in-italia/
-# has still different data for 1944.  It divides Italy in two, as
-# there were effectively two governments at the time, north of Gothic
-# Line German controlled territory, official government RSI, and south
-# of the Gothic Line, controlled by allied armies.
-#
-# From Brian Inglis (2016-10-23):
-# Viceregal LEGISLATIVE DECREE. 14 September 1944, no. 219.
-# Restoration of Standard Time. (044U0219) (OJ 62 of 30.9.1944) ...
-# Given the R. law decreed on 1944-03-29, no. 92, by which standard time is
-# advanced to sixty minutes later starting at hour two on 1944-04-02; ...
-# Starting at hour three on the date 1944-09-17 standard time will be resumed.
-#
-# From Paul Eggert (2016-10-27):
-# Go with INRiM for DST rules, except as corrected by Inglis for 1944
-# for the Kingdom of Italy.  This is consistent with Renzo Baldini.
-# Model Rome's occupation by using using C-Eur rules from 1943-09-10
-# to 1944-06-04; although Rome was an open city during this period, it
-# was effectively controlled by Germany.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Italy	1916	only	-	Jun	 3	24:00	1:00	S
-Rule	Italy	1916	1917	-	Sep	30	24:00	0	-
-Rule	Italy	1917	only	-	Mar	31	24:00	1:00	S
-Rule	Italy	1918	only	-	Mar	 9	24:00	1:00	S
-Rule	Italy	1918	only	-	Oct	 6	24:00	0	-
-Rule	Italy	1919	only	-	Mar	 1	24:00	1:00	S
-Rule	Italy	1919	only	-	Oct	 4	24:00	0	-
-Rule	Italy	1920	only	-	Mar	20	24:00	1:00	S
-Rule	Italy	1920	only	-	Sep	18	24:00	0	-
-Rule	Italy	1940	only	-	Jun	14	24:00	1:00	S
-Rule	Italy	1942	only	-	Nov	 2	 2:00s	0	-
-Rule	Italy	1943	only	-	Mar	29	 2:00s	1:00	S
-Rule	Italy	1943	only	-	Oct	 4	 2:00s	0	-
-Rule	Italy	1944	only	-	Apr	 2	 2:00s	1:00	S
-Rule	Italy	1944	only	-	Sep	17	 2:00s	0	-
-Rule	Italy	1945	only	-	Apr	 2	 2:00	1:00	S
-Rule	Italy	1945	only	-	Sep	15	 1:00	0	-
-Rule	Italy	1946	only	-	Mar	17	 2:00s	1:00	S
-Rule	Italy	1946	only	-	Oct	 6	 2:00s	0	-
-Rule	Italy	1947	only	-	Mar	16	 0:00s	1:00	S
-Rule	Italy	1947	only	-	Oct	 5	 0:00s	0	-
-Rule	Italy	1948	only	-	Feb	29	 2:00s	1:00	S
-Rule	Italy	1948	only	-	Oct	 3	 2:00s	0	-
-Rule	Italy	1966	1968	-	May	Sun>=22	 0:00s	1:00	S
-Rule	Italy	1966	only	-	Sep	24	24:00	0	-
-Rule	Italy	1967	1969	-	Sep	Sun>=22	 0:00s	0	-
-Rule	Italy	1969	only	-	Jun	 1	 0:00s	1:00	S
-Rule	Italy	1970	only	-	May	31	 0:00s	1:00	S
-Rule	Italy	1970	only	-	Sep	lastSun	 0:00s	0	-
-Rule	Italy	1971	1972	-	May	Sun>=22	 0:00s	1:00	S
-Rule	Italy	1971	only	-	Sep	lastSun	 0:00s	0	-
-Rule	Italy	1972	only	-	Oct	 1	 0:00s	0	-
-Rule	Italy	1973	only	-	Jun	 3	 0:00s	1:00	S
-Rule	Italy	1973	1974	-	Sep	lastSun	 0:00s	0	-
-Rule	Italy	1974	only	-	May	26	 0:00s	1:00	S
-Rule	Italy	1975	only	-	Jun	 1	 0:00s	1:00	S
-Rule	Italy	1975	1977	-	Sep	lastSun	 0:00s	0	-
-Rule	Italy	1976	only	-	May	30	 0:00s	1:00	S
-Rule	Italy	1977	1979	-	May	Sun>=22	 0:00s	1:00	S
-Rule	Italy	1978	only	-	Oct	 1	 0:00s	0	-
-Rule	Italy	1979	only	-	Sep	30	 0:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Rome	0:49:56 -	LMT	1866 Sep 22
-			0:49:56	-	RMT	1893 Oct 31 23:49:56 # Rome Mean
-			1:00	Italy	CE%sT	1943 Sep 10
-			1:00	C-Eur	CE%sT	1944 Jun  4
-			1:00	Italy	CE%sT	1980
-			1:00	EU	CE%sT
-
-Link	Europe/Rome	Europe/Vatican
-Link	Europe/Rome	Europe/San_Marino
-
-# Latvia
-
-# From Liene Kanepe (1998-09-17):
-
-# I asked about this matter Scientific Secretary of the Institute of Astronomy
-# of The University of Latvia Dr. paed Mr. Ilgonis Vilks. I also searched the
-# correct data in juridical acts and I found some juridical documents about
-# changes in the counting of time in Latvia from 1981....
-#
-# Act No. 35 of the Council of Ministers of Latvian SSR of 1981-01-22 ...
-# according to the Act No. 925 of the Council of Ministers of USSR of 1980-10-24
-# ...: all year round the time of 2nd time zone + 1 hour, in addition turning
-# the hands of the clock 1 hour forward on 1 April at 00:00 (GMT 31 March 21:00)
-# and 1 hour backward on the 1 October at 00:00 (GMT 30 September 20:00).
-#
-# Act No. 592 of the Council of Ministers of Latvian SSR of 1984-09-24 ...
-# according to the Act No. 967 of the Council of Ministers of USSR of 1984-09-13
-# ...: all year round the time of 2nd time zone + 1 hour, in addition turning
-# the hands of the clock 1 hour forward on the last Sunday of March at 02:00
-# (GMT 23:00 on the previous day) and 1 hour backward on the last Sunday of
-# September at 03:00 (GMT 23:00 on the previous day).
-#
-# Act No. 81 of the Council of Ministers of Latvian SSR of 1989-03-22 ...
-# according to the Act No. 227 of the Council of Ministers of USSR of 1989-03-14
-# ...: since the last Sunday of March 1989 in Lithuanian SSR, Latvian SSR,
-# Estonian SSR and Kaliningrad region of Russian Federation all year round the
-# time of 2nd time zone (Moscow time minus one hour). On the territory of Latvia
-# transition to summer time is performed on the last Sunday of March at 02:00
-# (GMT 00:00), turning the hands of the clock 1 hour forward.  The end of
-# daylight saving time is performed on the last Sunday of September at 03:00
-# (GMT 00:00), turning the hands of the clock 1 hour backward. Exception is
-# 1989-03-26, when we must not turn the hands of the clock....
-#
-# The Regulations of the Cabinet of Ministers of the Republic of Latvia of
-# 1997-01-21 on transition to Summer time ... established the same order of
-# daylight savings time settings as in the States of the European Union.
-
-# From Andrei Ivanov (2000-03-06):
-# This year Latvia will not switch to Daylight Savings Time (as specified in
-# The Regulations of the Cabinet of Ministers of the Rep. of Latvia of
-# 29-Feb-2000 (No. 79) <http://www.lv-laiks.lv/wwwraksti/2000/071072/vd4.htm>,
-# in Latvian for subscribers only).
-
-# From RFE/RL Newsline
-# http://www.rferl.org/newsline/2001/01/3-CEE/cee-030101.html
-# (2001-01-03), noted after a heads-up by Rives McDow:
-# The Latvian government on 2 January decided that the country will
-# institute daylight-saving time this spring, LETA reported.
-# Last February the three Baltic states decided not to turn back their
-# clocks one hour in the spring....
-# Minister of Economy Aigars Kalvītis noted that Latvia had too few
-# daylight hours and thus decided to comply with a draft European
-# Commission directive that provides for instituting daylight-saving
-# time in EU countries between 2002 and 2006. The Latvian government
-# urged Lithuania and Estonia to adopt a similar time policy, but it
-# appears that they will not do so....
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Latvia	1989	1996	-	Mar	lastSun	 2:00s	1:00	S
-Rule	Latvia	1989	1996	-	Sep	lastSun	 2:00s	0	-
-
-# Milne 1899 says Riga was 1:36:28 (Polytechnique House time).
-# Byalokoz 1919 says Latvia was 1:36:34.
-# Go with Byalokoz.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Riga	1:36:34	-	LMT	1880
-			1:36:34	-	RMT	1918 Apr 15  2:00 # Riga MT
-			1:36:34	1:00	LST	1918 Sep 16  3:00 # Latvian ST
-			1:36:34	-	RMT	1919 Apr  1  2:00
-			1:36:34	1:00	LST	1919 May 22  3:00
-			1:36:34	-	RMT	1926 May 11
-			2:00	-	EET	1940 Aug  5
-			3:00	-	MSK	1941 Jul
-			1:00	C-Eur	CE%sT	1944 Oct 13
-			3:00	Russia	MSK/MSD	1989 Mar lastSun  2:00s
-			2:00	1:00	EEST	1989 Sep lastSun  2:00s
-			2:00	Latvia	EE%sT	1997 Jan 21
-			2:00	EU	EE%sT	2000 Feb 29
-			2:00	-	EET	2001 Jan  2
-			2:00	EU	EE%sT
-
-# Liechtenstein
-
-# From Paul Eggert (2013-09-09):
-# Shanks & Pottenger say Vaduz is like Zurich.
-
-# From Alois Treindl (2013-09-18):
-# http://www.eliechtensteinensia.li/LIJ/1978/1938-1978/1941.pdf
-# ... confirms on p. 6 that Liechtenstein followed Switzerland in 1941 and 1942.
-# I ... translate only the last two paragraphs:
-#    ... during second world war, in the years 1941 and 1942, Liechtenstein
-#    introduced daylight saving time, adapting to Switzerland.  From 1943 on
-#    central European time was in force throughout the year.
-#    From a report of the duke's government to the high council,
-#    regarding the introduction of a time law, of 31 May 1977.
-
-Link Europe/Zurich Europe/Vaduz
-
-
-# Lithuania
-
-# From Paul Eggert (2016-03-18):
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-
-# From Paul Eggert (1996-11-22):
-# IATA SSIM (1992/1996) says Lithuania uses W-Eur rules, but since it is
-# known to be wrong about Estonia and Latvia, assume it's wrong here too.
-
-# From Marius Gedminas (1998-08-07):
-# I would like to inform that in this year Lithuanian time zone
-# (Europe/Vilnius) was changed.
-
-# From ELTA No. 972 (2582) (1999-09-29) <http://www.elta.lt/>,
-# via Steffen Thorsen:
-# Lithuania has shifted back to the second time zone (GMT plus two hours)
-# to be valid here starting from October 31,
-# as decided by the national government on Wednesday....
-# The Lithuanian government also announced plans to consider a
-# motion to give up shifting to summer time in spring, as it was
-# already done by Estonia.
-
-# From the Fact File, Lithuanian State Department of Tourism
-# <http://www.tourism.lt/informa/ff.htm> (2000-03-27):
-# Local time is GMT+2 hours ..., no daylight saving.
-
-# From a user via Klaus Marten (2003-02-07):
-# As a candidate for membership of the European Union, Lithuania will
-# observe Summer Time in 2003, changing its clocks at the times laid
-# down in EU Directive 2000/84 of 19.I.01 (i.e. at the same times as its
-# neighbour Latvia). The text of the Lithuanian government Order of
-# 7.XI.02 to this effect can be found at
-# http://www.lrvk.lt/nut/11/n1749.htm
-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Vilnius	1:41:16	-	LMT	1880
-			1:24:00	-	WMT	1917        # Warsaw Mean Time
-			1:35:36	-	KMT	1919 Oct 10 # Kaunas Mean Time
-			1:00	-	CET	1920 Jul 12
-			2:00	-	EET	1920 Oct  9
-			1:00	-	CET	1940 Aug  3
-			3:00	-	MSK	1941 Jun 24
-			1:00	C-Eur	CE%sT	1944 Aug
-			3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
-			2:00	Russia	EE%sT	1991 Sep 29  2:00s
-			2:00	C-Eur	EE%sT	1998
-			2:00	-	EET	1998 Mar 29  1:00u
-			1:00	EU	CE%sT	1999 Oct 31  1:00u
-			2:00	-	EET	2003 Jan  1
-			2:00	EU	EE%sT
-
-# Luxembourg
-# Whitman disagrees with most of these dates in minor ways;
-# go with Shanks & Pottenger.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Lux	1916	only	-	May	14	23:00	1:00	S
-Rule	Lux	1916	only	-	Oct	 1	 1:00	0	-
-Rule	Lux	1917	only	-	Apr	28	23:00	1:00	S
-Rule	Lux	1917	only	-	Sep	17	 1:00	0	-
-Rule	Lux	1918	only	-	Apr	Mon>=15	 2:00s	1:00	S
-Rule	Lux	1918	only	-	Sep	Mon>=15	 2:00s	0	-
-Rule	Lux	1919	only	-	Mar	 1	23:00	1:00	S
-Rule	Lux	1919	only	-	Oct	 5	 3:00	0	-
-Rule	Lux	1920	only	-	Feb	14	23:00	1:00	S
-Rule	Lux	1920	only	-	Oct	24	 2:00	0	-
-Rule	Lux	1921	only	-	Mar	14	23:00	1:00	S
-Rule	Lux	1921	only	-	Oct	26	 2:00	0	-
-Rule	Lux	1922	only	-	Mar	25	23:00	1:00	S
-Rule	Lux	1922	only	-	Oct	Sun>=2	 1:00	0	-
-Rule	Lux	1923	only	-	Apr	21	23:00	1:00	S
-Rule	Lux	1923	only	-	Oct	Sun>=2	 2:00	0	-
-Rule	Lux	1924	only	-	Mar	29	23:00	1:00	S
-Rule	Lux	1924	1928	-	Oct	Sun>=2	 1:00	0	-
-Rule	Lux	1925	only	-	Apr	 5	23:00	1:00	S
-Rule	Lux	1926	only	-	Apr	17	23:00	1:00	S
-Rule	Lux	1927	only	-	Apr	 9	23:00	1:00	S
-Rule	Lux	1928	only	-	Apr	14	23:00	1:00	S
-Rule	Lux	1929	only	-	Apr	20	23:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Luxembourg	0:24:36 -	LMT	1904 Jun
-			1:00	Lux	CE%sT	1918 Nov 25
-			0:00	Lux	WE%sT	1929 Oct  6  2:00s
-			0:00	Belgium	WE%sT	1940 May 14  3:00
-			1:00	C-Eur	WE%sT	1944 Sep 18  3:00
-			1:00	Belgium	CE%sT	1977
-			1:00	EU	CE%sT
-
-# Macedonia
-# See Europe/Belgrade.
-
-# Malta
-#
-# From Paul Eggert (2016-10-21):
-# Assume 1900-1972 was like Rome, overriding Shanks.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Malta	1973	only	-	Mar	31	0:00s	1:00	S
-Rule	Malta	1973	only	-	Sep	29	0:00s	0	-
-Rule	Malta	1974	only	-	Apr	21	0:00s	1:00	S
-Rule	Malta	1974	only	-	Sep	16	0:00s	0	-
-Rule	Malta	1975	1979	-	Apr	Sun>=15	2:00	1:00	S
-Rule	Malta	1975	1980	-	Sep	Sun>=15	2:00	0	-
-Rule	Malta	1980	only	-	Mar	31	2:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Malta	0:58:04 -	LMT	1893 Nov  2  0:00s # Valletta
-			1:00	Italy	CE%sT	1973 Mar 31
-			1:00	Malta	CE%sT	1981
-			1:00	EU	CE%sT
-
-# Moldova
-
-# From Stepan Golosunov (2016-03-07):
-# the act of the government of the Republic of Moldova Nr. 132 from 1990-05-04
-# http://lex.justice.md/viewdoc.php?action=view&view=doc&id=298782&lang=2
-# ... says that since 1990-05-06 on the territory of the Moldavian SSR
-# time would be calculated as the standard time of the second time belt
-# plus one hour of the "summer" time. To implement that clocks would be
-# adjusted one hour backwards at 1990-05-06 2:00. After that "summer"
-# time would be cancelled last Sunday of September at 3:00 and
-# reintroduced last Sunday of March at 2:00.
-
-# From Paul Eggert (2006-03-22):
-# A previous version of this database followed Shanks & Pottenger, who write
-# that Tiraspol switched to Moscow time on 1992-01-19 at 02:00.
-# However, this is most likely an error, as Moldova declared independence
-# on 1991-08-27 (the 1992-01-19 date is that of a Russian decree).
-# In early 1992 there was large-scale interethnic violence in the area
-# and it's possible that some Russophones continued to observe Moscow time.
-# But [two people] separately reported via
-# Jesper Nørgaard that as of 2001-01-24 Tiraspol was like Chisinau.
-# The Tiraspol entry has therefore been removed for now.
-#
-# From Alexander Krivenyshev (2011-10-17):
-# Pridnestrovian Moldavian Republic (PMR, also known as
-# "Pridnestrovie") has abolished seasonal clock change (no transition
-# to the Winter Time).
-#
-# News (in Russian):
-# http://www.kyivpost.ua/russia/news/pridnestrove-otkazalos-ot-perehoda-na-zimnee-vremya-30954.html
-# http://www.allmoldova.com/moldova-news/1249064116.html
-#
-# The substance of this change (reinstatement of the Tiraspol entry)
-# is from a patch from Petr Machata (2011-10-17)
-#
-# From Tim Parenti (2011-10-19)
-# In addition, being situated at +4651+2938 would give Tiraspol
-# a pre-1880 LMT offset of 1:58:32.
-#
-# (which agrees with the earlier entry that had been removed)
-#
-# From Alexander Krivenyshev (2011-10-26)
-# NO need to divide Moldova into two timezones at this point.
-# As of today, Transnistria (Pridnestrovie)- Tiraspol reversed its own
-# decision to abolish DST this winter.
-# Following Moldova and neighboring Ukraine- Transnistria (Pridnestrovie)-
-# Tiraspol will go back to winter time on October 30, 2011.
-# News from Moldova (in russian):
-# http://ru.publika.md/link_317061.html
-
-# From Roman Tudos (2015-07-02):
-# http://lex.justice.md/index.php?action=view&view=doc&lang=1&id=355077
-# From Paul Eggert (2015-07-01):
-# The abovementioned official link to IGO1445-868/2014 states that
-# 2014-10-26's fallback transition occurred at 03:00 local time.  Also,
-# http://www.trm.md/en/social/la-30-martie-vom-trece-la-ora-de-vara
-# says the 2014-03-30 spring-forward transition was at 02:00 local time.
-# Guess that since 1997 Moldova has switched one hour before the EU.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Moldova	1997	max	-	Mar	lastSun	 2:00	1:00	S
-Rule	Moldova	1997	max	-	Oct	lastSun	 3:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Chisinau	1:55:20 -	LMT	1880
-			1:55	-	CMT	1918 Feb 15 # Chisinau MT
-			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
-			2:00	Romania	EE%sT	1940 Aug 15
-			2:00	1:00	EEST	1941 Jul 17
-			1:00	C-Eur	CE%sT	1944 Aug 24
-			3:00	Russia	MSK/MSD	1990 May  6  2:00
-			2:00	Russia	EE%sT	1992
-			2:00	E-Eur	EE%sT	1997
-# See Romania commentary for the guessed 1997 transition to EU rules.
-			2:00	Moldova	EE%sT
-
-# Monaco
-# Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
-# more precise 0:09:21.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Monaco	0:29:32 -	LMT	1891 Mar 15
-			0:09:21	-	PMT	1911 Mar 11 # Paris Mean Time
-			0:00	France	WE%sT	1945 Sep 16  3:00
-			1:00	France	CE%sT	1977
-			1:00	EU	CE%sT
-
-# Montenegro
-# See Europe/Belgrade.
-
-# Netherlands
-
-# Howse writes that the Netherlands' railways used GMT between 1892 and 1940,
-# but for other purposes the Netherlands used Amsterdam mean time.
-
-# However, Robert H. van Gent writes (2001-04-01):
-# Howse's statement is only correct up to 1909. From 1909-05-01 (00:00:00
-# Amsterdam mean time) onwards, the whole of the Netherlands (including
-# the Dutch railways) was required by law to observe Amsterdam mean time
-# (19 minutes 32.13 seconds ahead of GMT). This had already been the
-# common practice (except for the railways) for many decades but it was
-# not until 1909 when the Dutch government finally defined this by law.
-# On 1937-07-01 this was changed to 20 minutes (exactly) ahead of GMT and
-# was generally known as Dutch Time ("Nederlandse Tijd").
-#
-# (2001-04-08):
-# 1892-05-01 was the date when the Dutch railways were by law required to
-# observe GMT while the remainder of the Netherlands adhered to the common
-# practice of following Amsterdam mean time.
-#
-# (2001-04-09):
-# In 1835 the authorities of the province of North Holland requested the
-# municipal authorities of the towns and cities in the province to observe
-# Amsterdam mean time but I do not know in how many cases this request was
-# actually followed.
-#
-# From 1852 onwards the Dutch telegraph offices were by law required to
-# observe Amsterdam mean time. As the time signals from the observatory of
-# Leiden were also distributed by the telegraph system, I assume that most
-# places linked up with the telegraph (and railway) system automatically
-# adopted Amsterdam mean time.
-#
-# Although the early Dutch railway companies initially observed a variety
-# of times, most of them had adopted Amsterdam mean time by 1858 but it
-# was not until 1866 when they were all required by law to observe
-# Amsterdam mean time.
-
-# The data entries before 1945 are taken from
-# http://www.staff.science.uu.nl/~gent0113/wettijd/wettijd.htm
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Neth	1916	only	-	May	 1	0:00	1:00	NST	# Netherlands Summer Time
-Rule	Neth	1916	only	-	Oct	 1	0:00	0	AMT	# Amsterdam Mean Time
-Rule	Neth	1917	only	-	Apr	16	2:00s	1:00	NST
-Rule	Neth	1917	only	-	Sep	17	2:00s	0	AMT
-Rule	Neth	1918	1921	-	Apr	Mon>=1	2:00s	1:00	NST
-Rule	Neth	1918	1921	-	Sep	lastMon	2:00s	0	AMT
-Rule	Neth	1922	only	-	Mar	lastSun	2:00s	1:00	NST
-Rule	Neth	1922	1936	-	Oct	Sun>=2	2:00s	0	AMT
-Rule	Neth	1923	only	-	Jun	Fri>=1	2:00s	1:00	NST
-Rule	Neth	1924	only	-	Mar	lastSun	2:00s	1:00	NST
-Rule	Neth	1925	only	-	Jun	Fri>=1	2:00s	1:00	NST
-# From 1926 through 1939 DST began 05-15, except that it was delayed by a week
-# in years when 05-15 fell in the Pentecost weekend.
-Rule	Neth	1926	1931	-	May	15	2:00s	1:00	NST
-Rule	Neth	1932	only	-	May	22	2:00s	1:00	NST
-Rule	Neth	1933	1936	-	May	15	2:00s	1:00	NST
-Rule	Neth	1937	only	-	May	22	2:00s	1:00	NST
-Rule	Neth	1937	only	-	Jul	 1	0:00	1:00	S
-Rule	Neth	1937	1939	-	Oct	Sun>=2	2:00s	0	-
-Rule	Neth	1938	1939	-	May	15	2:00s	1:00	S
-Rule	Neth	1945	only	-	Apr	 2	2:00s	1:00	S
-Rule	Neth	1945	only	-	Sep	16	2:00s	0	-
-#
-# Amsterdam Mean Time was +00:19:32.13 exactly, but the .13 is omitted
-# below because the current format requires GMTOFF to be an integer.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Amsterdam	0:19:32 -	LMT	1835
-			0:19:32	Neth	%s	1937 Jul  1
-			0:20	Neth +0020/+0120 1940 May 16  0:00
-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
-			1:00	Neth	CE%sT	1977
-			1:00	EU	CE%sT
-
-# Norway
-# http://met.no/met/met_lex/q_u/sommertid.html (2004-01) agrees with Shanks &
-# Pottenger.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Norway	1916	only	-	May	22	1:00	1:00	S
-Rule	Norway	1916	only	-	Sep	30	0:00	0	-
-Rule	Norway	1945	only	-	Apr	 2	2:00s	1:00	S
-Rule	Norway	1945	only	-	Oct	 1	2:00s	0	-
-Rule	Norway	1959	1964	-	Mar	Sun>=15	2:00s	1:00	S
-Rule	Norway	1959	1965	-	Sep	Sun>=15	2:00s	0	-
-Rule	Norway	1965	only	-	Apr	25	2:00s	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Oslo	0:43:00 -	LMT	1895 Jan  1
-			1:00	Norway	CE%sT	1940 Aug 10 23:00
-			1:00	C-Eur	CE%sT	1945 Apr  2  2:00
-			1:00	Norway	CE%sT	1980
-			1:00	EU	CE%sT
-
-# Svalbard & Jan Mayen
-
-# From Steffen Thorsen (2001-05-01):
-# Although I could not find it explicitly, it seems that Jan Mayen and
-# Svalbard have been using the same time as Norway at least since the
-# time they were declared as parts of Norway.  Svalbard was declared
-# as a part of Norway by law of 1925-07-17 no 11, section 4 and Jan
-# Mayen by law of 1930-02-27 no 2, section 2. (From
-# <http://www.lovdata.no/all/nl-19250717-011.html> and
-# <http://www.lovdata.no/all/nl-19300227-002.html>).  The law/regulation
-# for normal/standard time in Norway is from 1894-06-29 no 1 (came
-# into operation on 1895-01-01) and Svalbard/Jan Mayen seem to be a
-# part of this law since 1925/1930. (From
-# <http://www.lovdata.no/all/nl-18940629-001.html>) I have not been
-# able to find if Jan Mayen used a different time zone (e.g. -0100)
-# before 1930. Jan Mayen has only been "inhabited" since 1921 by
-# Norwegian meteorologists and maybe used the same time as Norway ever
-# since 1921.  Svalbard (Arctic/Longyearbyen) has been inhabited since
-# before 1895, and therefore probably changed the local time somewhere
-# between 1895 and 1925 (inclusive).
-
-# From Paul Eggert (2013-09-04):
-#
-# Actually, Jan Mayen was never occupied by Germany during World War II,
-# so it must have diverged from Oslo time during the war, as Oslo was
-# keeping Berlin time.
-#
-# <http://home.no.net/janmayen/history.htm> says that the meteorologists
-# burned down their station in 1940 and left the island, but returned in
-# 1941 with a small Norwegian garrison and continued operations despite
-# frequent air attacks from Germans.  In 1943 the Americans established a
-# radiolocating station on the island, called "Atlantic City".  Possibly
-# the UT offset changed during the war, but I think it unlikely that
-# Jan Mayen used German daylight-saving rules.
-#
-# Svalbard is more complicated, as it was raided in August 1941 by an
-# Allied party that evacuated the civilian population to England (says
-# <http://www.bartleby.com/65/sv/Svalbard.html>).  The Svalbard FAQ
-# <http://www.svalbard.com/SvalbardFAQ.html> says that the Germans were
-# expelled on 1942-05-14.  However, small parties of Germans did return,
-# and according to Wilhelm Dege's book "War North of 80" (1954)
-# http://www.ucalgary.ca/UofC/departments/UP/1-55238/1-55238-110-2.html
-# the German armed forces at the Svalbard weather station code-named
-# Haudegen did not surrender to the Allies until September 1945.
-#
-# All these events predate our cutoff date of 1970, so use Europe/Oslo
-# for these regions.
-Link	Europe/Oslo	Arctic/Longyearbyen
-
-# Poland
-
-# The 1919 dates and times can be found in Tygodnik Urzędowy nr 1 (1919-03-20),
-# <http://www.wbc.poznan.pl/publication/32156> pp 1-2.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Poland	1918	1919	-	Sep	16	2:00s	0	-
-Rule	Poland	1919	only	-	Apr	15	2:00s	1:00	S
-Rule	Poland	1944	only	-	Apr	 3	2:00s	1:00	S
-# Whitman gives 1944 Nov 30; go with Shanks & Pottenger.
-Rule	Poland	1944	only	-	Oct	 4	2:00	0	-
-# For 1944-1948 Whitman gives the previous day; go with Shanks & Pottenger.
-Rule	Poland	1945	only	-	Apr	29	0:00	1:00	S
-Rule	Poland	1945	only	-	Nov	 1	0:00	0	-
-# For 1946 on the source is Kazimierz Borkowski,
-# Toruń Center for Astronomy, Dept. of Radio Astronomy, Nicolaus Copernicus U.,
-# http://www.astro.uni.torun.pl/~kb/Artykuly/U-PA/Czas2.htm#tth_tAb1
-# Thanks to Przemysław Augustyniak (2005-05-28) for this reference.
-# He also gives these further references:
-# Mon Pol nr 13, poz 162 (1995) <http://www.abc.com.pl/serwis/mp/1995/0162.htm>
-# Druk nr 2180 (2003) <http://www.senat.gov.pl/k5/dok/sejm/053/2180.pdf>
-Rule	Poland	1946	only	-	Apr	14	0:00s	1:00	S
-Rule	Poland	1946	only	-	Oct	 7	2:00s	0	-
-Rule	Poland	1947	only	-	May	 4	2:00s	1:00	S
-Rule	Poland	1947	1949	-	Oct	Sun>=1	2:00s	0	-
-Rule	Poland	1948	only	-	Apr	18	2:00s	1:00	S
-Rule	Poland	1949	only	-	Apr	10	2:00s	1:00	S
-Rule	Poland	1957	only	-	Jun	 2	1:00s	1:00	S
-Rule	Poland	1957	1958	-	Sep	lastSun	1:00s	0	-
-Rule	Poland	1958	only	-	Mar	30	1:00s	1:00	S
-Rule	Poland	1959	only	-	May	31	1:00s	1:00	S
-Rule	Poland	1959	1961	-	Oct	Sun>=1	1:00s	0	-
-Rule	Poland	1960	only	-	Apr	 3	1:00s	1:00	S
-Rule	Poland	1961	1964	-	May	lastSun	1:00s	1:00	S
-Rule	Poland	1962	1964	-	Sep	lastSun	1:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Warsaw	1:24:00 -	LMT	1880
-			1:24:00	-	WMT	1915 Aug  5 # Warsaw Mean Time
-			1:00	C-Eur	CE%sT	1918 Sep 16  3:00
-			2:00	Poland	EE%sT	1922 Jun
-			1:00	Poland	CE%sT	1940 Jun 23  2:00
-			1:00	C-Eur	CE%sT	1944 Oct
-			1:00	Poland	CE%sT	1977
-			1:00	W-Eur	CE%sT	1988
-			1:00	EU	CE%sT
-
-# Portugal
-#
-# From Paul Eggert (2014-08-11), after a heads-up from Stephen Colebourne:
-# According to a Portuguese decree (1911-05-26)
-# http://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
-# Lisbon was at -0:36:44.68, but switched to GMT on 1912-01-01 at 00:00.
-# Round the old offset to -0:36:45.  This agrees with Willett but disagrees
-# with Shanks, who says the transition occurred on 1911-05-24 at 00:00 for
-# Europe/Lisbon, Atlantic/Azores, and Atlantic/Madeira.
-#
-# From Rui Pedro Salgueiro (1992-11-12):
-# Portugal has recently (September, 27) changed timezone
-# (from WET to MET or CET) to harmonize with EEC.
-#
-# Martin Bruckmann (1996-02-29) reports via Peter Ilieve
-# that Portugal is reverting to 0:00 by not moving its clocks this spring.
-# The new Prime Minister was fed up with getting up in the dark in the winter.
-#
-# From Paul Eggert (1996-11-12):
-# IATA SSIM (1991-09) reports several 1991-09 and 1992-09 transitions
-# at 02:00u, not 01:00u.  Assume that these are typos.
-# IATA SSIM (1991/1992) reports that the Azores were at -1:00.
-# IATA SSIM (1993-02) says +0:00; later issues (through 1996-09) say -1:00.
-# Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
-# harmonized with the EU), and that they stayed +0:00 that winter.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
-# done every year, depending on what Spain did, because of railroad schedules.
-# Go with Shanks & Pottenger.
-Rule	Port	1916	only	-	Jun	17	23:00	1:00	S
-# Whitman gives 1916 Oct 31; go with Shanks & Pottenger.
-Rule	Port	1916	only	-	Nov	 1	 1:00	0	-
-Rule	Port	1917	only	-	Feb	28	23:00s	1:00	S
-Rule	Port	1917	1921	-	Oct	14	23:00s	0	-
-Rule	Port	1918	only	-	Mar	 1	23:00s	1:00	S
-Rule	Port	1919	only	-	Feb	28	23:00s	1:00	S
-Rule	Port	1920	only	-	Feb	29	23:00s	1:00	S
-Rule	Port	1921	only	-	Feb	28	23:00s	1:00	S
-Rule	Port	1924	only	-	Apr	16	23:00s	1:00	S
-Rule	Port	1924	only	-	Oct	14	23:00s	0	-
-Rule	Port	1926	only	-	Apr	17	23:00s	1:00	S
-Rule	Port	1926	1929	-	Oct	Sat>=1	23:00s	0	-
-Rule	Port	1927	only	-	Apr	 9	23:00s	1:00	S
-Rule	Port	1928	only	-	Apr	14	23:00s	1:00	S
-Rule	Port	1929	only	-	Apr	20	23:00s	1:00	S
-Rule	Port	1931	only	-	Apr	18	23:00s	1:00	S
-# Whitman gives 1931 Oct 8; go with Shanks & Pottenger.
-Rule	Port	1931	1932	-	Oct	Sat>=1	23:00s	0	-
-Rule	Port	1932	only	-	Apr	 2	23:00s	1:00	S
-Rule	Port	1934	only	-	Apr	 7	23:00s	1:00	S
-# Whitman gives 1934 Oct 5; go with Shanks & Pottenger.
-Rule	Port	1934	1938	-	Oct	Sat>=1	23:00s	0	-
-# Shanks & Pottenger give 1935 Apr 30; go with Whitman.
-Rule	Port	1935	only	-	Mar	30	23:00s	1:00	S
-Rule	Port	1936	only	-	Apr	18	23:00s	1:00	S
-# Whitman gives 1937 Apr 2; go with Shanks & Pottenger.
-Rule	Port	1937	only	-	Apr	 3	23:00s	1:00	S
-Rule	Port	1938	only	-	Mar	26	23:00s	1:00	S
-Rule	Port	1939	only	-	Apr	15	23:00s	1:00	S
-# Whitman gives 1939 Oct 7; go with Shanks & Pottenger.
-Rule	Port	1939	only	-	Nov	18	23:00s	0	-
-Rule	Port	1940	only	-	Feb	24	23:00s	1:00	S
-# Shanks & Pottenger give 1940 Oct 7; go with Whitman.
-Rule	Port	1940	1941	-	Oct	 5	23:00s	0	-
-Rule	Port	1941	only	-	Apr	 5	23:00s	1:00	S
-Rule	Port	1942	1945	-	Mar	Sat>=8	23:00s	1:00	S
-Rule	Port	1942	only	-	Apr	25	22:00s	2:00	M # Midsummer
-Rule	Port	1942	only	-	Aug	15	22:00s	1:00	S
-Rule	Port	1942	1945	-	Oct	Sat>=24	23:00s	0	-
-Rule	Port	1943	only	-	Apr	17	22:00s	2:00	M
-Rule	Port	1943	1945	-	Aug	Sat>=25	22:00s	1:00	S
-Rule	Port	1944	1945	-	Apr	Sat>=21	22:00s	2:00	M
-Rule	Port	1946	only	-	Apr	Sat>=1	23:00s	1:00	S
-Rule	Port	1946	only	-	Oct	Sat>=1	23:00s	0	-
-Rule	Port	1947	1949	-	Apr	Sun>=1	 2:00s	1:00	S
-Rule	Port	1947	1949	-	Oct	Sun>=1	 2:00s	0	-
-# Shanks & Pottenger say DST was observed in 1950; go with Whitman.
-# Whitman gives Oct lastSun for 1952 on; go with Shanks & Pottenger.
-Rule	Port	1951	1965	-	Apr	Sun>=1	 2:00s	1:00	S
-Rule	Port	1951	1965	-	Oct	Sun>=1	 2:00s	0	-
-Rule	Port	1977	only	-	Mar	27	 0:00s	1:00	S
-Rule	Port	1977	only	-	Sep	25	 0:00s	0	-
-Rule	Port	1978	1979	-	Apr	Sun>=1	 0:00s	1:00	S
-Rule	Port	1978	only	-	Oct	 1	 0:00s	0	-
-Rule	Port	1979	1982	-	Sep	lastSun	 1:00s	0	-
-Rule	Port	1980	only	-	Mar	lastSun	 0:00s	1:00	S
-Rule	Port	1981	1982	-	Mar	lastSun	 1:00s	1:00	S
-Rule	Port	1983	only	-	Mar	lastSun	 2:00s	1:00	S
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Lisbon	-0:36:45 -	LMT	1884
-			-0:36:45 -	LMT	1912 Jan  1 # Lisbon Mean Time
-			 0:00	Port	WE%sT	1966 Apr  3  2:00
-			 1:00	-	CET	1976 Sep 26  1:00
-			 0:00	Port	WE%sT	1983 Sep 25  1:00s
-			 0:00	W-Eur	WE%sT	1992 Sep 27  1:00s
-			 1:00	EU	CE%sT	1996 Mar 31  1:00u
-			 0:00	EU	WE%sT
-# This Zone can be simplified once we assume zic %z.
-Zone Atlantic/Azores	-1:42:40 -	LMT	1884        # Ponta Delgada
-			-1:54:32 -	HMT	1912 Jan  1 # Horta Mean Time
-			-2:00	Port	-02/-01	1942 Apr 25 22:00s
-			-2:00	Port	+00	1942 Aug 15 22:00s
-			-2:00	Port	-02/-01	1943 Apr 17 22:00s
-			-2:00	Port	+00	1943 Aug 28 22:00s
-			-2:00	Port	-02/-01	1944 Apr 22 22:00s
-			-2:00	Port	+00	1944 Aug 26 22:00s
-			-2:00	Port	-02/-01	1945 Apr 21 22:00s
-			-2:00	Port	+00	1945 Aug 25 22:00s
-			-2:00	Port	-02/-01	1966 Apr  3  2:00
-			-1:00	Port	-01/+00	1983 Sep 25  1:00s
-			-1:00	W-Eur	-01/+00	1992 Sep 27  1:00s
-			 0:00	EU	WE%sT	1993 Mar 28  1:00u
-			-1:00	EU	-01/+00
-# This Zone can be simplified once we assume zic %z.
-Zone Atlantic/Madeira	-1:07:36 -	LMT	1884        # Funchal
-			-1:07:36 -	FMT	1912 Jan  1 # Funchal Mean Time
-			-1:00	Port	-01/+00	1942 Apr 25 22:00s
-			-1:00	Port	+01	1942 Aug 15 22:00s
-			-1:00	Port	-01/+00	1943 Apr 17 22:00s
-			-1:00	Port	+01	1943 Aug 28 22:00s
-			-1:00	Port	-01/+00	1944 Apr 22 22:00s
-			-1:00	Port	+01	1944 Aug 26 22:00s
-			-1:00	Port	-01/+00	1945 Apr 21 22:00s
-			-1:00	Port	+01	1945 Aug 25 22:00s
-			-1:00	Port	-01/+00	1966 Apr  3  2:00
-			 0:00	Port	WE%sT	1983 Sep 25  1:00s
-			 0:00	EU	WE%sT
-
-# Romania
-#
-# From Paul Eggert (1999-10-07):
-# Nine O'clock <http://www.nineoclock.ro/POL/1778pol.html>
-# (1998-10-23) reports that the switch occurred at
-# 04:00 local time in fall 1998.  For lack of better info,
-# assume that Romania and Moldova switched to EU rules in 1997,
-# the same year as Bulgaria.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Romania	1932	only	-	May	21	 0:00s	1:00	S
-Rule	Romania	1932	1939	-	Oct	Sun>=1	 0:00s	0	-
-Rule	Romania	1933	1939	-	Apr	Sun>=2	 0:00s	1:00	S
-Rule	Romania	1979	only	-	May	27	 0:00	1:00	S
-Rule	Romania	1979	only	-	Sep	lastSun	 0:00	0	-
-Rule	Romania	1980	only	-	Apr	 5	23:00	1:00	S
-Rule	Romania	1980	only	-	Sep	lastSun	 1:00	0	-
-Rule	Romania	1991	1993	-	Mar	lastSun	 0:00s	1:00	S
-Rule	Romania	1991	1993	-	Sep	lastSun	 0:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Bucharest	1:44:24 -	LMT	1891 Oct
-			1:44:24	-	BMT	1931 Jul 24 # Bucharest MT
-			2:00	Romania	EE%sT	1981 Mar 29  2:00s
-			2:00	C-Eur	EE%sT	1991
-			2:00	Romania	EE%sT	1994
-			2:00	E-Eur	EE%sT	1997
-			2:00	EU	EE%sT
-
-
-# Russia
-
-# From Alexander Krivenyshev (2011-09-15):
-# Based on last Russian Government Decree No. 725 on August 31, 2011
-# (Government document
-# http://www.government.ru/gov/results/16355/print/
-# in Russian)
-# there are few corrections have to be made for some Russian time zones...
-# All updated Russian Time Zones were placed in table and translated to English
-# by WorldTimeZone.com at the link below:
-# http://www.worldtimezone.com/dst_news/dst_news_russia36.htm
-
-# From Sanjeev Gupta (2011-09-27):
-# Scans of [Decree No. 23 of January 8, 1992] are available at:
-# http://government.consultant.ru/page.aspx?1223966
-# They are in Cyrillic letters (presumably Russian).
-
-# From Arthur David Olson (2012-05-09):
-# Regarding the instant when clocks in time-zone-shifting parts of Russia
-# changed in September 2011:
-#
-# One source is
-# http://government.ru/gov/results/16355/
-# which, according to translate.google.com, begins "Decree of August 31,
-# 2011 No. 725" and contains no other dates or "effective date" information.
-#
-# Another source is
-# http://www.rg.ru/2011/09/06/chas-zona-dok.html
-# which, according to translate.google.com, begins "Resolution of the
-# Government of the Russian Federation on August 31, 2011 N 725" and also
-# contains "Date first official publication: September 6, 2011 Posted on:
-# in the 'RG' - Federal Issue No. 5573 September 6, 2011" but which
-# does not contain any "effective date" information.
-#
-# Another source is
-# http://en.wikipedia.org/wiki/Oymyakonsky_District#cite_note-RuTime-7
-# which, in note 8, contains "Resolution No. 725 of August 31, 2011...
-# Effective as of after 7 days following the day of the official publication"
-# but which does not contain any reference to September 6, 2011.
-#
-# The Wikipedia article refers to
-# http://base.consultant.ru/cons/cgi/online.cgi?req=doc;base=LAW;n=118896
-# which seems to copy the text of the government.ru page.
-#
-# Tobias Conradi combines Wikipedia's
-# "as of after 7 days following the day of the official publication"
-# with www.rg.ru's "Date of first official publication: September 6, 2011" to
-# get September 13, 2011 as the cutover date (unusually, a Tuesday, as Tobias
-# Conradi notes).
-#
-# None of the sources indicates a time of day for changing clocks.
-#
-# Go with 2011-09-13 0:00s.
-
-# From Alexander Krivenyshev (2014-07-01):
-# According to the Russian news (ITAR-TASS News Agency)
-# http://en.itar-tass.com/russia/738562
-# the State Duma has approved ... the draft bill on returning to
-# winter time standard and return Russia 11 time zones.  The new
-# regulations will come into effect on October 26, 2014 at 02:00 ...
-# http://asozd2.duma.gov.ru/main.nsf/%28Spravka%29?OpenAgent&RN=431985-6&02
-# Here is a link where we put together table (based on approved Bill N
-# 431985-6) with proposed 11 Russian time zones and corresponding
-# areas/cities/administrative centers in the Russian Federation (in English):
-# http://www.worldtimezone.com/dst_news/dst_news_russia65.html
-#
-# From Alexander Krivenyshev (2014-07-22):
-# Putin signed the Federal Law 431985-6 ... (in Russian)
-# http://itar-tass.com/obschestvo/1333711
-# http://www.pravo.gov.ru:8080/page.aspx?111660
-# http://www.kremlin.ru/acts/46279
-# From October 26, 2014 the new Russian time zone map will looks like this:
-# http://www.worldtimezone.com/dst_news/dst_news_russia-map-2014-07.html
-
-# From Paul Eggert (2006-03-22):
-# Moscow time zone abbreviations after 1919-07-01, and Moscow rules after 1991,
-# are from Andrey A. Chernov.  The rest is from Shanks & Pottenger,
-# except we follow Chernov's report that 1992 DST transitions were Sat
-# 23:00, not Sun 02:00s.
-#
-# From Stanislaw A. Kuzikowski (1994-06-29):
-# But now it is some months since Novosibirsk is 3 hours ahead of Moscow!
-# I do not know why they have decided to make this change;
-# as far as I remember it was done exactly during winter->summer switching
-# so we (Novosibirsk) simply did not switch.
-#
-# From Andrey A. Chernov (1996-10-04):
-# 'MSK' and 'MSD' were born and used initially on Moscow computers with
-# UNIX-like OSes by several developer groups (e.g. Demos group, Kiae group)....
-# The next step was the UUCP network, the Relcom predecessor
-# (used mainly for mail), and MSK/MSD was actively used there.
-#
-# From Chris Carrier (1996-10-30):
-# According to a friend of mine who rode the Trans-Siberian Railroad from
-# Moscow to Irkutsk in 1995, public air and rail transport in Russia ...
-# still follows Moscow time, no matter where in Russia it is located.
-#
-# For Grozny, Chechnya, we have the following story from
-# John Daniszewski, "Scavengers in the Rubble", Los Angeles Times (2001-02-07):
-# News - often false - is spread by word of mouth.  A rumor that it was
-# time to move the clocks back put this whole city out of sync with
-# the rest of Russia for two weeks - even soldiers stationed here began
-# enforcing curfew at the wrong time.
-#
-# From Gwillim Law (2001-06-05):
-# There's considerable evidence that Sakhalin Island used to be in
-# UTC+11, and has changed to UTC+10, in this decade.  I start with the
-# SSIM, which listed Yuzhno-Sakhalinsk in zone RU10 along with Magadan
-# until February 1997, and then in RU9 with Khabarovsk and Vladivostok
-# since September 1997....  Although the Kuril Islands are
-# administratively part of Sakhalin oblast', they appear to have
-# remained on UTC+11 along with Magadan.
-
-# From Tim Parenti (2014-07-06):
-# The comments detailing the coverage of each Russian zone are meant to assist
-# with maintenance only and represent our best guesses as to which regions
-# are covered by each zone.  They are not meant to be taken as an authoritative
-# listing.  The region codes listed come from
-# http://en.wikipedia.org/w/?title=Federal_subjects_of_Russia&oldid=611810498
-# and are used for convenience only; no guarantees are made regarding their
-# future stability.  ISO 3166-2:RU codes are also listed for first-level
-# divisions where available.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-
-
-# From Tim Parenti (2014-07-03):
-# Europe/Kaliningrad covers...
-# 39	RU-KGD	Kaliningrad Oblast
-
-# From Paul Eggert (2016-03-18):
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-
-# From Stepan Golosunov (2016-03-07):
-# http://www.rgo.ru/ru/kaliningradskoe-oblastnoe-otdelenie/ob-otdelenii/publikacii/kak-nam-zhilos-bez-letnego-vremeni
-# confirms that the 1989 change to Moscow-1 was implemented.
-# (The article, though, is misattributed to 1990 while saying that
-# summer->winter transition would be done on the 24 of September. But
-# 1990-09-24 was Monday, while 1989-09-24 was Sunday as expected.)
-# ...
-# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
-# says that Kaliningrad switched to Moscow-1 on 1989-03-26, avoided
-# at the last moment switch to Moscow-1 on 1991-03-31, switched to
-# Moscow on 1991-11-03, switched to Moscow-1 on 1992-01-19.
-
-Zone Europe/Kaliningrad	 1:22:00 -	LMT	1893 Apr
-			 1:00	C-Eur	CE%sT	1945
-			 2:00	Poland	CE%sT	1946
-			 3:00	Russia	MSK/MSD	1989 Mar 26  2:00s
-			 2:00	Russia	EE%sT	2011 Mar 27  2:00s
-			 3:00	-	+03	2014 Oct 26  2:00s
-			 2:00	-	EET
-
-
-# From Paul Eggert (2016-02-21), per Tim Parenti (2014-07-03) and
-# Oscar van Vlijmen (2001-08-25):
-# Europe/Moscow covers...
-# 01	RU-AD	Adygea, Republic of
-# 05	RU-DA	Dagestan, Republic of
-# 06	RU-IN	Ingushetia, Republic of
-# 07	RU-KB	Kabardino-Balkar Republic
-# 08	RU-KL	Kalmykia, Republic of
-# 09	RU-KC	Karachay-Cherkess Republic
-# 10	RU-KR	Karelia, Republic of
-# 11	RU-KO	Komi Republic
-# 12	RU-ME	Mari El Republic
-# 13	RU-MO	Mordovia, Republic of
-# 15	RU-SE	North Ossetia-Alania, Republic of
-# 16	RU-TA	Tatarstan, Republic of
-# 20	RU-CE	Chechen Republic
-# 21	RU-CU	Chuvash Republic
-# 23	RU-KDA	Krasnodar Krai
-# 26	RU-STA	Stavropol Krai
-# 29	RU-ARK	Arkhangelsk Oblast
-# 31	RU-BEL	Belgorod Oblast
-# 32	RU-BRY	Bryansk Oblast
-# 33	RU-VLA	Vladimir Oblast
-# 35	RU-VLG	Vologda Oblast
-# 36	RU-VOR	Voronezh Oblast
-# 37	RU-IVA	Ivanovo Oblast
-# 40	RU-KLU	Kaluga Oblast
-# 44	RU-KOS	Kostroma Oblast
-# 46	RU-KRS	Kursk Oblast
-# 47	RU-LEN	Leningrad Oblast
-# 48	RU-LIP	Lipetsk Oblast
-# 50	RU-MOS	Moscow Oblast
-# 51	RU-MUR	Murmansk Oblast
-# 52	RU-NIZ	Nizhny Novgorod Oblast
-# 53	RU-NGR	Novgorod Oblast
-# 57	RU-ORL	Oryol Oblast
-# 58	RU-PNZ	Penza Oblast
-# 60	RU-PSK	Pskov Oblast
-# 61	RU-ROS	Rostov Oblast
-# 62	RU-RYA	Ryazan Oblast
-# 67	RU-SMO	Smolensk Oblast
-# 68	RU-TAM	Tambov Oblast
-# 69	RU-TVE	Tver Oblast
-# 71	RU-TUL	Tula Oblast
-# 76	RU-YAR	Yaroslavl Oblast
-# 77	RU-MOW	Moscow
-# 78	RU-SPE	Saint Petersburg
-# 83	RU-NEN	Nenets Autonomous Okrug
-
-# From Paul Eggert (2016-08-23):
-# The Soviets switched to UT-based time in 1919.  Decree No. 59
-# (1919-02-08) http://istmat.info/node/35567 established UT-based time
-# zones, and Decree No. 147 (1919-03-29) http://istmat.info/node/35854
-# specified a transition date of 1919-07-01, apparently at 00:00 UT.
-# No doubt only the Soviet-controlled regions switched on that date;
-# later transitions to UT-based time in other parts of Russia are
-# taken from what appear to be guesses by Shanks.
-# (Thanks to Alexander Belopolsky for pointers to the decrees.)
-
-# From Stepan Golosunov (2016-03-07):
-# 11. Regions-violators, 1981-1982.
-# Wikipedia refers to
-# http://maps.monetonos.ru/maps/raznoe/Old_Maps/Old_Maps/Articles/022/3_1981.html
-# http://besp.narod.ru/nauka_1981_3.htm
-#
-# The second link provides two articles scanned from the Nauka i Zhizn
-# magazine No. 3, 1981 and a scan of the short article attributed to
-# the Trud newspaper from February 1982.  The first link provides the
-# same Nauka i Zhizn articles converted to the text form (but misses
-# time belt changes map).
-#
-# The second Nauka i Zhizn article says that in addition to
-# introduction of summer time on 1981-04-01 there are some time belt
-# border changes on 1981-10-01, mostly affecting Nenets Autonomous
-# Okrug, Krasnoyarsk Krai, Yakutia, Magadan Oblast and Chukotka
-# according to the provided map (colored one).  In addition to that
-# "time violators" (regions which were not using rules of the time
-# belts in which they were located) would not be moving off the DST on
-# 1981-10-01 to restore the decree time usage.  (Komi ASSR was
-# supposed to repeat that move in October 1982 to account for the 2
-# hour difference.)  Map depicting "time violators" before 1981-10-01
-# is also provided.
-#
-# The article from Trud says that 1981-10-01 changes caused problems
-# and some territories would be moved to pre-1981-10-01 time by not
-# moving to summer time on 1982-04-01.  Namely: Dagestan,
-# Kabardino-Balkar, Kalmyk, Komi, Mari, Mordovian, North Ossetian,
-# Tatar, Chechen-Ingush and Chuvash ASSR, Krasnodar and Stavropol
-# krais, Arkhangelsk, Vladimir, Vologda, Voronezh, Gorky, Ivanovo,
-# Kostroma, Lipetsk, Penza, Rostov, Ryazan, Tambov, Tyumen and
-# Yaroslavl oblasts, Nenets and Evenk autonomous okrugs, Khatangsky
-# district of Taymyr Autonomous Okrug.  As a result Evenk Autonomous
-# Okrug and Khatangsky district of Taymyr Autonomous Okrug would end
-# up on Moscow+4, Tyumen Oblast on Moscow+2 and the rest on Moscow
-# time.
-#
-# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
-# attributes the 1982 changes to the Act of the Council of Ministers
-# of the USSR No. 126 from 18.02.1982.  1980-925.txt also adds
-# Udmurtia to the list of affected territories and lists Khatangsky
-# district separately from Taymyr Autonomous Okrug.  Probably erroneously.
-#
-# The affected territories are currently listed under Europe/Moscow,
-# Asia/Yekaterinburg and Asia/Krasnoyarsk.
-#
-# 12. Udmurtia
-# The fact that Udmurtia is depicted as a violator in the Nauka i
-# Zhizn article hints at Izhevsk being on different time from
-# Kuybyshev before 1981-10-01. Udmurtia is not mentioned in the 1989 act.
-# http://astrozet.net/files/Zones/DOC/RU/1980-925.txt
-# implies Udmurtia was on Moscow time after 1982-04-01.
-# Wikipedia implies Udmurtia being on Moscow+1 until 1991.
-#
-# ...
-#
-# All Russian zones are supposed to have by default a -1 change at
-# 1991-03-31 2:00 (cancellation of the decree time in the USSR) and a +1
-# change at 1992-01-19 2:00 (restoration of the decree time in Russia).
-#
-# There were some exceptions, though.
-# Wikipedia says newspapers listed Astrakhan, Saratov, Kirov, Volgograd,
-# Izhevsk, Grozny, Kazan and Samara as such exceptions for the 1992
-# change. (Different newspapers providing different lists. And some
-# lists found in the internet are quite wild.)
-#
-# And apparently some exceptions were reverted in the last moment.
-# http://www.kaliningradka.ru/site_pc/cherez/index.php?ELEMENT_ID=40091
-# says that Kaliningrad decided not to be an exception 2 days before the
-# 1991-03-31 switch and one person at
-# http://izhevsk.ru/forum_light_message/50/682597-m8369040.html
-# says he remembers that Samara opted out of the 1992-01-19 exception
-# 2 days before the switch.
-#
-#
-# From Paul Eggert (2016-03-18):
-# Given the above, we appear to be missing some Zone entries for the
-# chaotic early 1980s in Russia.  It's not clear what these entries
-# should be.  For now, sweep this under the rug and just document the
-# time in Moscow.
-
-# From Vladimir Karpinsky (2014-07-08):
-# LMT in Moscow (before Jul 3, 1916) is 2:30:17, that was defined by Moscow
-# Observatory (coordinates: 55 deg. 45'29.70", 37 deg. 34'05.30")....
-# LMT in Moscow since Jul 3, 1916 is 2:31:01 as a result of new standard.
-# (The info is from the book by Byalokoz ... p. 18.)
-# The time in St. Petersburg as capital of Russia was defined by
-# Pulkov observatory, near St. Petersburg.  In 1916 LMT Moscow
-# was synchronized with LMT St. Petersburg (+30 minutes), (Pulkov observatory
-# coordinates: 59 deg. 46'18.70", 30 deg. 19'40.70") so 30 deg. 19'40.70" >
-# 2h01m18.7s = 2:01:19.  LMT Moscow = LMT St.Petersburg + 30m 2:01:19 + 0:30 =
-# 2:31:19 ...
-#
-# From Paul Eggert (2014-07-08):
-# Milne does not list Moscow, but suggests that its time might be listed in
-# Résumés mensuels et annuels des observations météorologiques (1895).
-# Presumably this is OCLC 85825704, a journal published with parallel text in
-# Russian and French.  This source has not been located; go with Karpinsky.
-
-Zone Europe/Moscow	 2:30:17 -	LMT	1880
-			 2:30:17 -	MMT	1916 Jul  3 # Moscow Mean Time
-			 2:31:19 Russia	%s	1919 Jul  1  0:00u
-			 3:00	Russia	%s	1921 Oct
-			 3:00	Russia	MSK/MSD	1922 Oct
-			 2:00	-	EET	1930 Jun 21
-			 3:00	Russia	MSK/MSD	1991 Mar 31  2:00s
-			 2:00	Russia	EE%sT	1992 Jan 19  2:00s
-			 3:00	Russia	MSK/MSD	2011 Mar 27  2:00s
-			 4:00	-	MSK	2014 Oct 26  2:00s
-			 3:00	-	MSK
-
-
-# From Paul Eggert (2016-12-06):
-# Europe/Simferopol covers Crimea.
-
-Zone Europe/Simferopol	 2:16:24 -	LMT	1880
-			 2:16	-	SMT	1924 May  2 # Simferopol Mean T
-			 2:00	-	EET	1930 Jun 21
-			 3:00	-	MSK	1941 Nov
-			 1:00	C-Eur	CE%sT	1944 Apr 13
-			 3:00	Russia	MSK/MSD	1990
-			 3:00	-	MSK	1990 Jul  1  2:00
-			 2:00	-	EET	1992
-# Central Crimea used Moscow time 1994/1997.
-#
-# From Paul Eggert (2006-03-22):
-# The _Economist_ (1994-05-28, p 45) reports that central Crimea switched
-# from Kiev to Moscow time sometime after the January 1994 elections.
-# Shanks (1999) says "date of change uncertain", but implies that it happened
-# sometime between the 1994 DST switches.  Shanks & Pottenger simply say
-# 1994-09-25 03:00, but that can't be right.  For now, guess it
-# changed in May.
-			 2:00	E-Eur	EE%sT	1994 May
-# From IATA SSIM (1994/1997), which also says that Kerch is still like Kiev.
-			 3:00	E-Eur	MSK/MSD	1996 Mar 31  0:00s
-			 3:00	1:00	MSD	1996 Oct 27  3:00s
-# IATA SSIM (1997-09) says Crimea switched to EET/EEST.
-# Assume it happened in March by not changing the clocks.
-			 3:00	Russia	MSK/MSD	1997
-			 3:00	-	MSK	1997 Mar lastSun  1:00u
-# From Alexander Krivenyshev (2014-03-17):
-# time change at 2:00 (2am) on March 30, 2014
-# http://vz.ru/news/2014/3/17/677464.html
-# From Paul Eggert (2014-03-30):
-# Simferopol and Sevastopol reportedly changed their central town clocks
-# late the previous day, but this appears to have been ceremonial
-# and the discrepancies are small enough to not worry about.
-			 2:00	EU	EE%sT	2014 Mar 30  2:00
-			 4:00	-	MSK	2014 Oct 26  2:00s
-			 3:00	-	MSK
-
-
-# From Paul Eggert (2016-03-18):
-# Europe/Astrakhan covers:
-# 30	RU-AST	Astrakhan Oblast
-#
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-
-# From Alexander Krivenyshev (2016-01-12):
-# On February 10, 2016 Astrakhan Oblast got approval by the Federation
-# Council to change its time zone to UTC+4 (from current UTC+3 Moscow time)....
-# This Federal Law shall enter into force on 27 March 2016 at 02:00.
-# From Matt Johnson (2016-03-09):
-# http://publication.pravo.gov.ru/Document/View/0001201602150056
-
-Zone Europe/Astrakhan	 3:12:12 -	LMT	1924 May
-			 3:00	-	+03	1930 Jun 21
-			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 4:00	-	+04	1992 Mar 29  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03	2016 Mar 27  2:00s
-			 4:00	-	+04
-
-# From Paul Eggert (2016-11-11):
-# Europe/Volgograd covers:
-# 34	RU-VGG	Volgograd Oblast
-# The 1988 transition is from USSR act No. 5 (1988-01-04).
-
-Zone Europe/Volgograd	 2:57:40 -	LMT	1920 Jan  3
-			 3:00	-	+03	1930 Jun 21
-			 4:00	-	+04	1961 Nov 11
-			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 4:00	-	+04	1992 Mar 29  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03
-
-# From Paul Eggert (2016-11-11):
-# Europe/Saratov covers:
-# 64	RU-SAR	Saratov Oblast
-
-# From Yuri Konotopov (2016-11-11):
-# Dec 4, 2016 02:00 UTC+3....  Saratov Region's local time will be ... UTC+4.
-# From Stepan Golosunov (2016-11-11):
-# ... Byalokoz listed Saratov on 03:04:18.
-# From Stepan Golosunov (2016-11-22):
-# http://publication.pravo.gov.ru/Document/View/0001201611220031
-
-Zone Europe/Saratov	 3:04:18 -	LMT	1919 Jul  1  0:00u
-			 3:00	-	+03	1930 Jun 21
-			 4:00	Russia	+04/+05	1988 Mar 27  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 4:00	-	+04	1992 Mar 29  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03	2016 Dec  4  2:00s
-			 4:00	-	+04
-
-# From Paul Eggert (2016-03-18):
-# Europe/Kirov covers:
-# 43	RU-KIR	Kirov Oblast
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-#
-Zone Europe/Kirov	 3:18:48 -	LMT	1919 Jul  1  0:00u
-			 3:00	-	+03	1930 Jun 21
-			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 4:00	-	+04	1992 Mar 29  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Europe/Samara covers...
-# 18	RU-UD	Udmurt Republic
-# 63	RU-SAM	Samara Oblast
-
-# From Paul Eggert (2016-03-18):
-# Byalokoz 1919 says Samara was 3:20:20.
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-
-Zone Europe/Samara	 3:20:20 -	LMT	1919 Jul  1  0:00u
-			 3:00	-	+03	1930 Jun 21
-			 4:00	-	+04	1935 Jan 27
-			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 2:00	Russia	+02/+03	1991 Sep 29  2:00s
-			 3:00	-	+03	1991 Oct 20  3:00
-			 4:00	Russia	+04/+05	2010 Mar 28  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04
-
-# From Paul Eggert (2016-03-18):
-# Europe/Ulyanovsk covers:
-# 73	RU-ULY	Ulyanovsk Oblast
-
-# The 1989 transition is from USSR act No. 227 (1989-03-14).
-
-# From Alexander Krivenyshev (2016-02-17):
-# Ulyanovsk ... on their way to change time zones by March 27, 2016 at 2am.
-# Ulyanovsk Oblast ... from MSK to MSK+1 (UTC+3 to UTC+4) ...
-# 920582-6 ... 02/17/2016 The State Duma passed the bill in the first reading.
-# From Matt Johnson (2016-03-09):
-# http://publication.pravo.gov.ru/Document/View/0001201603090051
-
-Zone Europe/Ulyanovsk	 3:13:36 -	LMT	1919 Jul  1  0:00u
-			 3:00	-	+03	1930 Jun 21
-			 4:00	Russia	+04/+05	1989 Mar 26  2:00s
-			 3:00	Russia	+03/+04	1991 Mar 31  2:00s
-			 2:00	Russia	+02/+03	1992 Jan 19  2:00s
-			 3:00	Russia	+03/+04	2011 Mar 27  2:00s
-			 4:00	-	+04	2014 Oct 26  2:00s
-			 3:00	-	+03	2016 Mar 27  2:00s
-			 4:00	-	+04
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Asia/Yekaterinburg covers...
-# 02	RU-BA	Bashkortostan, Republic of
-# 90	RU-PER	Perm Krai
-# 45	RU-KGN	Kurgan Oblast
-# 56	RU-ORE	Orenburg Oblast
-# 66	RU-SVE	Sverdlovsk Oblast
-# 72	RU-TYU	Tyumen Oblast
-# 74	RU-CHE	Chelyabinsk Oblast
-# 86	RU-KHM	Khanty-Mansi Autonomous Okrug - Yugra
-# 89	RU-YAN	Yamalo-Nenets Autonomous Okrug
-#
-# Note: Effective 2005-12-01, (59) Perm Oblast and (81) Komi-Permyak
-# Autonomous Okrug merged to form (90, RU-PER) Perm Krai.
-
-# Milne says Yekaterinburg was 4:02:32.9; round to nearest.
-# Byalokoz 1919 says its provincial time was based on Perm, at 3:45:05.
-# Assume it switched on 1916-07-03, the time of the new standard.
-# The 1919 and 1930 transitions are from Shanks.
-
-Zone Asia/Yekaterinburg	 4:02:33 -	LMT	1916 Jul  3
-			 3:45:05 -	PMT	1919 Jul 15  4:00
-			 4:00	-	+04	1930 Jun 21
-			 5:00	Russia	+05/+06	1991 Mar 31  2:00s
-			 4:00	Russia	+04/+05	1992 Jan 19  2:00s
-			 5:00	Russia	+05/+06	2011 Mar 27  2:00s
-			 6:00	-	+06	2014 Oct 26  2:00s
-			 5:00	-	+05
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Asia/Omsk covers...
-# 55	RU-OMS	Omsk Oblast
-
-# Byalokoz 1919 says Omsk was 4:53:30.
-
-Zone Asia/Omsk		 4:53:30 -	LMT	1919 Nov 14
-			 5:00	-	+05	1930 Jun 21
-			 6:00	Russia	+06/+07	1991 Mar 31  2:00s
-			 5:00	Russia	+05/+06	1992 Jan 19  2:00s
-			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-			 7:00	-	+07	2014 Oct 26  2:00s
-			 6:00	-	+06
-
-# From Paul Eggert (2016-02-22):
-# Asia/Barnaul covers:
-# 04	RU-AL	Altai Republic
-# 22	RU-ALT	Altai Krai
-
-# Data before 1991 are from Shanks & Pottenger.
-
-# From Stepan Golosunov (2016-03-07):
-# Letter of Bank of Russia from 1995-05-25
-# http://www.bestpravo.ru/rossijskoje/lj-akty/y3a.htm
-# suggests that Altai Republic transitioned to Moscow+3 on
-# 1995-05-28.
-#
-# http://regnum.ru/news/society/1957270.html
-# has some historical data for Altai Krai:
-# before 1957: west part on UTC+6, east on UTC+7
-# after 1957: UTC+7
-# since 1995: UTC+6
-# http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
-# confirms that and provides more details including 1995-05-28 transition date.
-
-# From Alexander Krivenyshev (2016-02-17):
-# Altai Krai and Altai Republic on their way to change time zones
-# by March 27, 2016 at 2am....
-# Altai Republic / Gorno-Altaysk MSK+3 to MSK+4 (UTC+6 to UTC+7) ...
-# Altai Krai / Barnaul MSK+3 to MSK+4 (UTC+6 to UTC+7)
-# From Matt Johnson (2016-03-09):
-# http://publication.pravo.gov.ru/Document/View/0001201603090043
-# http://publication.pravo.gov.ru/Document/View/0001201603090038
-
-Zone Asia/Barnaul	 5:35:00 -	LMT	1919 Dec 10
-			 6:00	-	+06	1930 Jun 21
-			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-			 7:00	Russia	+07/+08	1995 May 28
-			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-			 7:00	-	+07	2014 Oct 26  2:00s
-			 6:00	-	+06	2016 Mar 27  2:00s
-			 7:00	-	+07
-
-# From Paul Eggert (2016-03-18):
-# Asia/Novosibirsk covers:
-# 54	RU-NVS	Novosibirsk Oblast
-
-# From Stepan Golosunov (2016-05-30):
-# http://asozd2.duma.gov.ru/main.nsf/(Spravka)?OpenAgent&RN=1085784-6
-# moves Novosibirsk oblast from UTC+6 to UTC+7.
-# From Stepan Golosunov (2016-07-04):
-# The law was signed yesterday and published today on
-# http://publication.pravo.gov.ru/Document/View/0001201607040064
-
-Zone Asia/Novosibirsk	 5:31:40 -	LMT	1919 Dec 14  6:00
-			 6:00	-	+06	1930 Jun 21
-			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-			 7:00	Russia	+07/+08	1993 May 23 # say Shanks & P.
-			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-			 7:00	-	+07	2014 Oct 26  2:00s
-			 6:00	-	+06	2016 Jul 24  2:00s
-			 7:00	-	+07
-
-# From Paul Eggert (2016-03-18):
-# Asia/Tomsk covers:
-# 70	RU-TOM	Tomsk Oblast
-
-# From Stepan Golosunov (2016-03-24):
-# Byalokoz listed Tomsk at 5:39:51.
-
-# From Stanislaw A. Kuzikowski (1994-06-29):
-# Tomsk is still 4 hours ahead of Moscow.
-
-# From Stepan Golosunov (2016-03-19):
-# http://pravo.gov.ru/proxy/ips/?docbody=&nd=102075743
-# (fifth time belt being UTC+5+1(decree time)
-# / UTC+5+1(decree time)+1(summer time)) ...
-# Note that time belts (numbered from 2 (Moscow) to 12 according to their
-# GMT/UTC offset and having too many exceptions like regions formally
-# belonging to one belt but using time from another) were replaced
-# with time zones in 2011 with different numbering (there was a
-# 2-hour gap between second and third zones in 2011-2014).
-
-# From Stepan Golosunov (2016-04-12):
-# http://asozd2.duma.gov.ru/main.nsf/(SpravkaNew)?OpenAgent&RN=1006865-6
-# This bill was approved in the first reading today.  It moves Tomsk oblast
-# from UTC+6 to UTC+7 and is supposed to come into effect on 2016-05-29 at
-# 2:00.  The bill needs to be approved in the second and the third readings by
-# the State Duma, approved by the Federation Council, signed by the President
-# and published to become a law.  Minor changes in the text are to be expected
-# before the second reading (references need to be updated to account for the
-# recent changes).
-#
-# Judging by the ultra-short one-day amendments period, recent similar laws,
-# the State Duma schedule and the Federation Council schedule
-# http://www.duma.gov.ru/legislative/planning/day-shedule/por_vesna_2016/
-# http://council.gov.ru/activity/meetings/schedule/63303
-# I speculate that the final text of the bill will be proposed tomorrow, the
-# bill will be approved in the second and the third readings on Friday,
-# approved by the Federation Council on 2016-04-20, signed by the President and
-# published as a law around 2016-04-26.
-
-# From Matt Johnson (2016-04-26):
-# http://publication.pravo.gov.ru/Document/View/0001201604260048
-
-Zone	Asia/Tomsk	 5:39:51 -	LMT	1919 Dec 22
-			 6:00	-	+06	1930 Jun 21
-			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-			 7:00	Russia	+07/+08	2002 May  1  3:00
-			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-			 7:00	-	+07	2014 Oct 26  2:00s
-			 6:00	-	+06	2016 May 29  2:00s
-			 7:00	-	+07
-
-
-# From Tim Parenti (2014-07-03):
-# Asia/Novokuznetsk covers...
-# 42	RU-KEM	Kemerovo Oblast
-
-# From Alexander Krivenyshev (2009-10-13):
-# Kemerovo oblast' (Kemerovo region) in Russia will change current time zone on
-# March 28, 2010:
-# from current Russia Zone 6 - Krasnoyarsk Time Zone (KRA) UTC +0700
-# to Russia Zone 5 - Novosibirsk Time Zone (NOV) UTC +0600
-#
-# This is according to Government of Russia decree No. 740, on September
-# 14, 2009 "Application in the territory of the Kemerovo region the Fifth
-# time zone." ("Russia Zone 5" or old "USSR Zone 5" is GMT +0600)
-#
-# Russian Government web site (Russian language)
-# http://www.government.ru/content/governmentactivity/rfgovernmentdecisions/archive/2009/09/14/991633.htm
-# or Russian-English translation by WorldTimeZone.com with reference
-# map to local region and new Russia Time Zone map after March 28, 2010
-# http://www.worldtimezone.com/dst_news/dst_news_russia03.html
-#
-# Thus, when Russia will switch to DST on the night of March 28, 2010
-# Kemerovo region (Kemerovo oblast') will not change the clock.
-
-# From Tim Parenti (2014-07-02), per Alexander Krivenyshev (2014-07-02):
-# The Kemerovo region will remain at UTC+7 through the 2014-10-26 change, thus
-# realigning itself with KRAT.
-
-Zone Asia/Novokuznetsk	 5:48:48 -	LMT	1924 May  1
-			 6:00	-	+06	1930 Jun 21
-			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-			 7:00	Russia	+07/+08	2010 Mar 28  2:00s
-			 6:00	Russia	+06/+07	2011 Mar 27  2:00s
-			 7:00	-	+07
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Asia/Krasnoyarsk covers...
-# 17	RU-TY	Tuva Republic
-# 19	RU-KK	Khakassia, Republic of
-# 24	RU-KYA	Krasnoyarsk Krai
-#
-# Note: Effective 2007-01-01, (88) Evenk Autonomous Okrug and (84) Taymyr
-# Autonomous Okrug were merged into (24, RU-KYA) Krasnoyarsk Krai.
-
-# Byalokoz 1919 says Krasnoyarsk was 6:11:26.
-
-Zone Asia/Krasnoyarsk	 6:11:26 -	LMT	1920 Jan  6
-			 6:00	-	+06	1930 Jun 21
-			 7:00	Russia	+07/+08	1991 Mar 31  2:00s
-			 6:00	Russia	+06/+07	1992 Jan 19  2:00s
-			 7:00	Russia	+07/+08	2011 Mar 27  2:00s
-			 8:00	-	+08	2014 Oct 26  2:00s
-			 7:00	-	+07
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Asia/Irkutsk covers...
-# 03	RU-BU	Buryatia, Republic of
-# 38	RU-IRK	Irkutsk Oblast
-#
-# Note: Effective 2008-01-01, (85) Ust-Orda Buryat Autonomous Okrug was
-# merged into (38, RU-IRK) Irkutsk Oblast.
-
-# Milne 1899 says Irkutsk was 6:57:15.
-# Byalokoz 1919 says Irkutsk was 6:57:05.
-# Go with Byalokoz.
-
-Zone Asia/Irkutsk	 6:57:05 -	LMT	1880
-			 6:57:05 -	IMT	1920 Jan 25 # Irkutsk Mean Time
-			 7:00	-	+07	1930 Jun 21
-			 8:00	Russia	+08/+09	1991 Mar 31  2:00s
-			 7:00	Russia	+07/+08	1992 Jan 19  2:00s
-			 8:00	Russia	+08/+09	2011 Mar 27  2:00s
-			 9:00	-	+09	2014 Oct 26  2:00s
-			 8:00	-	+08
-
-
-# From Tim Parenti (2014-07-06):
-# Asia/Chita covers...
-# 92	RU-ZAB	Zabaykalsky Krai
-#
-# Note: Effective 2008-03-01, (75) Chita Oblast and (80) Agin-Buryat
-# Autonomous Okrug merged to form (92, RU-ZAB) Zabaykalsky Krai.
-
-# From Alexander Krivenyshev (2016-01-02):
-# [The] time zone in the Trans-Baikal Territory (Zabaykalsky Krai) -
-# Asia/Chita [is changing] from UTC+8 to UTC+9.  Effective date will
-# be March 27, 2016 at 2:00am....
-# http://publication.pravo.gov.ru/Document/View/0001201512300107
-
-Zone Asia/Chita	 7:33:52 -	LMT	1919 Dec 15
-			 8:00	-	+08	1930 Jun 21
-			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
-			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
-			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
-			10:00	-	+10	2014 Oct 26  2:00s
-			 8:00	-	+08	2016 Mar 27  2:00
-			 9:00	-	+09
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
-# Asia/Yakutsk covers...
-# 28	RU-AMU	Amur Oblast
-#
-# ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
-# 14-02	****	Aldansky District
-# 14-04	****	Amginsky District
-# 14-05	****	Anabarsky District
-# 14-06	****	Bulunsky District
-# 14-07	****	Verkhnevilyuysky District
-# 14-10	****	Vilyuysky District
-# 14-11	****	Gorny District
-# 14-12	****	Zhigansky District
-# 14-13	****	Kobyaysky District
-# 14-14	****	Lensky District
-# 14-15	****	Megino-Kangalassky District
-# 14-16	****	Mirninsky District
-# 14-18	****	Namsky District
-# 14-19	****	Neryungrinsky District
-# 14-21	****	Nyurbinsky District
-# 14-23	****	Olenyoksky District
-# 14-24	****	Olyokminsky District
-# 14-26	****	Suntarsky District
-# 14-27	****	Tattinsky District
-# 14-29	****	Ust-Aldansky District
-# 14-32	****	Khangalassky District
-# 14-33	****	Churapchinsky District
-# 14-34	****	Eveno-Bytantaysky National District
-
-# From Tim Parenti (2014-07-03):
-# Our commentary seems to have lost mention of (14-19) Neryungrinsky District.
-# Since the surrounding districts of Sakha are all YAKT, assume this is, too.
-# Also assume its history has been the same as the rest of Asia/Yakutsk.
-
-# Byalokoz 1919 says Yakutsk was 8:38:58.
-
-Zone Asia/Yakutsk	 8:38:58 -	LMT	1919 Dec 15
-			 8:00	-	+08	1930 Jun 21
-			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
-			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
-			 9:00	Russia	+09/+10	2011 Mar 27  2:00s
-			10:00	-	+10	2014 Oct 26  2:00s
-			 9:00	-	+09
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
-# Asia/Vladivostok covers...
-# 25	RU-PRI	Primorsky Krai
-# 27	RU-KHA	Khabarovsk Krai
-# 79	RU-YEV	Jewish Autonomous Oblast
-#
-# ...and parts of (14, RU-SA) Sakha (Yakutia) Republic:
-# 14-09	****	Verkhoyansky District
-# 14-31	****	Ust-Yansky District
-
-# Milne 1899 says Vladivostok was 8:47:33.5.
-# Byalokoz 1919 says Vladivostok was 8:47:31.
-# Go with Byalokoz.
-
-Zone Asia/Vladivostok	 8:47:31 -	LMT	1922 Nov 15
-			 9:00	-	+09	1930 Jun 21
-			10:00	Russia	+10/+11	1991 Mar 31  2:00s
-			 9:00	Russia	+09/+10	1992 Jan 19  2:00s
-			10:00	Russia	+10/+11	2011 Mar 27  2:00s
-			11:00	-	+11	2014 Oct 26  2:00s
-			10:00	-	+10
-
-
-# From Tim Parenti (2014-07-03):
-# Asia/Khandyga covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
-# 14-28	****	Tomponsky District
-# 14-30	****	Ust-Maysky District
-
-# From Arthur David Olson (2012-05-09):
-# Tomponskij and Ust'-Majskij switched from Vladivostok time to Yakutsk time
-# in 2011.
-
-# From Paul Eggert (2012-11-25):
-# Shanks and Pottenger (2003) has Khandyga on Yakutsk time.
-# Make a wild guess that it switched to Vladivostok time in 2004.
-# This transition is no doubt wrong, but we have no better info.
-
-Zone Asia/Khandyga	 9:02:13 -	LMT	1919 Dec 15
-			 8:00	-	+08	1930 Jun 21
-			 9:00	Russia	+09/+10	1991 Mar 31  2:00s
-			 8:00	Russia	+08/+09	1992 Jan 19  2:00s
-			 9:00	Russia	+09/+10	2004
-			10:00	Russia	+10/+11	2011 Mar 27  2:00s
-			11:00	-	+11	2011 Sep 13  0:00s # Decree 725?
-			10:00	-	+10	2014 Oct 26  2:00s
-			 9:00	-	+09
-
-
-# From Tim Parenti (2014-07-03):
-# Asia/Sakhalin covers...
-# 65	RU-SAK	Sakhalin Oblast
-# ...with the exception of:
-# 65-11	****	Severo-Kurilsky District (North Kuril Islands)
-
-# From Matt Johnson (2016-02-22):
-# Asia/Sakhalin is moving (in entirety) from UTC+10 to UTC+11 ...
-# (2016-03-09):
-# http://publication.pravo.gov.ru/Document/View/0001201603090044
-
-# The Zone name should be Asia/Yuzhno-Sakhalinsk, but that's too long.
-Zone Asia/Sakhalin	 9:30:48 -	LMT	1905 Aug 23
-			 9:00	-	+09	1945 Aug 25
-			11:00	Russia	+11/+12	1991 Mar 31  2:00s # Sakhalin T
-			10:00	Russia	+10/+11	1992 Jan 19  2:00s
-			11:00	Russia	+11/+12	1997 Mar lastSun  2:00s
-			10:00	Russia	+10/+11	2011 Mar 27  2:00s
-			11:00	-	+11	2014 Oct 26  2:00s
-			10:00	-	+10	2016 Mar 27  2:00s
-			11:00	-	+11
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2009-11-29):
-# Asia/Magadan covers...
-# 49	RU-MAG	Magadan Oblast
-
-# From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
-# Magadan Oblast is moving from UTC+12 to UTC+10 on 2014-10-26; however,
-# several districts of Sakha Republic as well as Severo-Kurilsky District of
-# the Sakhalin Oblast (also known as the North Kuril Islands), represented
-# until now by Asia/Magadan, will instead move to UTC+11.  These regions will
-# need their own zone.
-
-# From Alexander Krivenyshev (2016-03-27):
-# ... draft bill 948300-6 to change its time zone from UTC+10 to UTC+11 ...
-# will take ... effect ... on April 24, 2016 at 2 o'clock
-#
-# From Matt Johnson (2016-04-05):
-# ... signed by the President today ...
-# http://publication.pravo.gov.ru/Document/View/0001201604050038
-
-Zone Asia/Magadan	10:03:12 -	LMT	1924 May  2
-			10:00	-	+10	1930 Jun 21 # Magadan Time
-			11:00	Russia	+11/+12	1991 Mar 31  2:00s
-			10:00	Russia	+10/+11	1992 Jan 19  2:00s
-			11:00	Russia	+11/+12	2011 Mar 27  2:00s
-			12:00	-	+12	2014 Oct 26  2:00s
-			10:00	-	+10	2016 Apr 24  2:00s
-			11:00	-	+11
-
-
-# From Tim Parenti (2014-07-06):
-# Asia/Srednekolymsk covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
-# 14-01	****	Abyysky District
-# 14-03	****	Allaikhovsky District
-# 14-08	****	Verkhnekolymsky District
-# 14-17	****	Momsky District
-# 14-20	****	Nizhnekolymsky District
-# 14-25	****	Srednekolymsky District
-#
-# ...and parts of (65, RU-SAK) Sakhalin Oblast:
-# 65-11	****	Severo-Kurilsky District (North Kuril Islands)
-
-# From Tim Parenti (2014-07-02):
-# Oymyakonsky District of Sakha Republic (represented by Ust-Nera), along with
-# most of Sakhalin Oblast (represented by Sakhalin) will be moving to UTC+10 on
-# 2014-10-26 to stay aligned with VLAT/SAKT; however, Severo-Kurilsky District
-# of the Sakhalin Oblast (also known as the North Kuril Islands, represented by
-# Severo-Kurilsk) will remain on UTC+11.
-
-# From Tim Parenti (2014-07-06):
-# Assume North Kuril Islands have history like Magadan before 2011-03-27.
-# There is a decent chance this is wrong, in which case a new zone
-# Asia/Severo-Kurilsk would become necessary.
-#
-# Srednekolymsk and Zyryanka are the most populous places amongst these
-# districts, but have very similar populations.  In fact, Wikipedia currently
-# lists them both as having 3528 people, exactly 1668 males and 1860 females
-# each!  (Yikes!)
-# http://en.wikipedia.org/w/?title=Srednekolymsky_District&oldid=603435276
-# http://en.wikipedia.org/w/?title=Verkhnekolymsky_District&oldid=594378493
-# Assume this is a mistake, albeit an amusing one.
-#
-# Looking at censuses, the populations of the two municipalities seem to have
-# fluctuated recently.  Zyryanka was more populous than Srednekolymsk in the
-# 1989 and 2002 censuses, but Srednekolymsk was more populous in the most
-# recent (2010) census, 3525 to 3170.  (See pages 195 and 197 of
-# http://www.gks.ru/free_doc/new_site/perepis2010/croc/Documents/Vol1/pub-01-05.pdf
-# in Russian.)  In addition, Srednekolymsk appears to be a much older
-# settlement and the population of Zyryanka seems to be declining.
-# Go with Srednekolymsk.
-
-Zone Asia/Srednekolymsk	10:14:52 -	LMT	1924 May  2
-			10:00	-	+10	1930 Jun 21
-			11:00	Russia	+11/+12	1991 Mar 31  2:00s
-			10:00	Russia	+10/+11	1992 Jan 19  2:00s
-			11:00	Russia	+11/+12	2011 Mar 27  2:00s
-			12:00	-	+12	2014 Oct 26  2:00s
-			11:00	-	+11
-
-
-# From Tim Parenti (2014-07-03):
-# Asia/Ust-Nera covers parts of (14, RU-SA) Sakha (Yakutia) Republic:
-# 14-22	****	Oymyakonsky District
-
-# From Arthur David Olson (2012-05-09):
-# Ojmyakonskij [and the Kuril Islands] switched from
-# Magadan time to Vladivostok time in 2011.
-#
-# From Tim Parenti (2014-07-06), per Alexander Krivenyshev (2014-07-02):
-# It's unlikely that any of the Kuril Islands were involved in such a switch,
-# as the South and Middle Kurils have been on UTC+11 (SAKT) with the rest of
-# Sakhalin Oblast since at least 2011-09, and the North Kurils have been on
-# UTC+12 since at least then, too.
-
-Zone Asia/Ust-Nera	 9:32:54 -	LMT	1919 Dec 15
-			 8:00	-	+08	1930 Jun 21
-			 9:00	Russia	+09/+10	1981 Apr  1
-			11:00	Russia	+11/+12	1991 Mar 31  2:00s
-			10:00	Russia	+10/+11	1992 Jan 19  2:00s
-			11:00	Russia	+11/+12	2011 Mar 27  2:00s
-			12:00	-	+12	2011 Sep 13  0:00s # Decree 725?
-			11:00	-	+11	2014 Oct 26  2:00s
-			10:00	-	+10
-
-
-# From Tim Parenti (2014-07-03), per Oscar van Vlijmen (2001-08-25):
-# Asia/Kamchatka covers...
-# 91	RU-KAM	Kamchatka Krai
-#
-# Note: Effective 2007-07-01, (41) Kamchatka Oblast and (82) Koryak
-# Autonomous Okrug merged to form (91, RU-KAM) Kamchatka Krai.
-
-# The Zone name should be Asia/Petropavlovsk-Kamchatski or perhaps
-# Asia/Petropavlovsk-Kamchatsky, but these are too long.
-Zone Asia/Kamchatka	10:34:36 -	LMT	1922 Nov 10
-			11:00	-	+11	1930 Jun 21
-			12:00	Russia	+12/+13	1991 Mar 31  2:00s
-			11:00	Russia	+11/+12	1992 Jan 19  2:00s
-			12:00	Russia	+12/+13	2010 Mar 28  2:00s
-			11:00	Russia	+11/+12	2011 Mar 27  2:00s
-			12:00	-	+12
-
-
-# From Tim Parenti (2014-07-03):
-# Asia/Anadyr covers...
-# 87	RU-CHU	Chukotka Autonomous Okrug
-
-Zone Asia/Anadyr	11:49:56 -	LMT	1924 May  2
-			12:00	-	+12	1930 Jun 21
-			13:00	Russia	+13/+14	1982 Apr  1  0:00s
-			12:00	Russia	+12/+13	1991 Mar 31  2:00s
-			11:00	Russia	+11/+12	1992 Jan 19  2:00s
-			12:00	Russia	+12/+13	2010 Mar 28  2:00s
-			11:00	Russia	+11/+12	2011 Mar 27  2:00s
-			12:00	-	+12
-
-
-# San Marino
-# See Europe/Rome.
-
-# Serbia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Belgrade	1:22:00	-	LMT	1884
-			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945
-			1:00	-	CET	1945 May  8  2:00s
-			1:00	1:00	CEST	1945 Sep 16  2:00s
-# Metod Koželj reports that the legal date of
-# transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
-# Shanks & Pottenger don't give as much detail, so go with Koželj.
-			1:00	-	CET	1982 Nov 27
-			1:00	EU	CE%sT
-Link Europe/Belgrade Europe/Ljubljana	# Slovenia
-Link Europe/Belgrade Europe/Podgorica	# Montenegro
-Link Europe/Belgrade Europe/Sarajevo	# Bosnia and Herzegovina
-Link Europe/Belgrade Europe/Skopje	# Macedonia
-Link Europe/Belgrade Europe/Zagreb	# Croatia
-
-# Slovakia
-Link Europe/Prague Europe/Bratislava
-
-# Slovenia
-# See Europe/Belgrade.
-
-# Spain
-#
-# From Paul Eggert (2016-12-14):
-#
-# The source for Europe/Madrid before 2013 is:
-# Planesas P. La hora oficial en España y sus cambios.
-# Anuario del Observatorio Astronómico de Madrid (2013, in Spanish).
-# http://astronomia.ign.es/rknowsys-theme/images/webAstro/paginas/documentos/Anuario/lahoraoficialenespana.pdf
-# As this source says that historical time in the Canaries is obscure,
-# and it does not discuss Ceuta, stick with Shanks for now for that data.
-#
-# In the 1918 and 1919 fallback transitions in Spain, the clock for
-# the hour-longer day officially kept going after midnight, so that
-# the repeated instances of that day's 00:00 hour were 24 hours apart,
-# with a fallback transition from the second occurrence of 00:59... to
-# the next day's 00:00.  Our data format cannot represent this
-# directly, and instead repeats the first hour of the next day, with a
-# fallback transition from the next day's 00:59... to 00:00.
-
-# From Michael Deckers (2016-12-15):
-# The Royal Decree of 1900-06-26 quoted by Planesas, online at
-# https://www.boe.es/datos/pdfs/BOE//1900/209/A00383-00384.pdf
-# says in its article 5 (my translation):
-# These dispositions will enter into force beginning with the
-# instant at which, according to the time indicated in article 1,
-# the 1st day of January of 1901 will begin.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Spain	1918	only	-	Apr	15	23:00	1:00	S
-Rule	Spain	1918	1919	-	Oct	 6	24:00s	0	-
-Rule	Spain	1919	only	-	Apr	 6	23:00	1:00	S
-Rule	Spain	1924	only	-	Apr	16	23:00	1:00	S
-Rule	Spain	1924	only	-	Oct	 4	24:00s	0	-
-Rule	Spain	1926	only	-	Apr	17	23:00	1:00	S
-Rule	Spain	1926	1929	-	Oct	Sat>=1	24:00s	0	-
-Rule	Spain	1927	only	-	Apr	 9	23:00	1:00	S
-Rule	Spain	1928	only	-	Apr	15	 0:00	1:00	S
-Rule	Spain	1929	only	-	Apr	20	23:00	1:00	S
-# Republican Spain during the civil war; it controlled Madrid until 1939-03-28.
-Rule	Spain	1937	only	-	Jun	16	23:00	1:00	S
-Rule	Spain	1937	only	-	Oct	 2	24:00s	0	-
-Rule	Spain	1938	only	-	Apr	 2	23:00	1:00	S
-Rule	Spain	1938	only	-	Apr	30	23:00	2:00	M
-Rule	Spain	1938	only	-	Oct	 2	24:00	1:00	S
-# The following rules are for unified Spain again.
-#
-# Planesas does not say what happened in Madrid between its fall on
-# 1939-03-28 and the Nationalist spring-forward transition on
-# 1939-04-15.  For lack of better info, assume Madrid's clocks did not
-# change during that period.
-#
-# The first rule is commented out, as it is redundant for Republican Spain.
-#Rule	Spain	1939	only	-	Apr	15	23:00	1:00	S
-Rule	Spain	1939	only	-	Oct	 7	24:00s	0	-
-Rule	Spain	1942	only	-	May	 2	23:00	1:00	S
-Rule	Spain	1942	only	-	Sep	 1	 1:00	0	-
-Rule	Spain	1943	1946	-	Apr	Sat>=13	23:00	1:00	S
-Rule	Spain	1943	1944	-	Oct	Sun>=1	 1:00	0	-
-Rule	Spain	1945	1946	-	Sep	lastSun	 1:00	0	-
-Rule	Spain	1949	only	-	Apr	30	23:00	1:00	S
-Rule	Spain	1949	only	-	Oct	 2	 1:00	0	-
-Rule	Spain	1974	1975	-	Apr	Sat>=12	23:00	1:00	S
-Rule	Spain	1974	1975	-	Oct	Sun>=1	 1:00	0	-
-Rule	Spain	1976	only	-	Mar	27	23:00	1:00	S
-Rule	Spain	1976	1977	-	Sep	lastSun	 1:00	0	-
-Rule	Spain	1977	only	-	Apr	 2	23:00	1:00	S
-Rule	Spain	1978	only	-	Apr	 2	 2:00s	1:00	S
-Rule	Spain	1978	only	-	Oct	 1	 2:00s	0	-
-# Nationalist Spain during the civil war
-#Rule NatSpain	1937	only	-	May	22	23:00	1:00	S
-#Rule NatSpain	1937	1938	-	Oct	Sat>=1	24:00s	0	-
-#Rule NatSpain	1938	only	-	Mar	26	23:00	1:00	S
-# The following rules are copied from Morocco from 1967 through 1978.
-Rule SpainAfrica 1967	only	-	Jun	 3	12:00	1:00	S
-Rule SpainAfrica 1967	only	-	Oct	 1	 0:00	0	-
-Rule SpainAfrica 1974	only	-	Jun	24	 0:00	1:00	S
-Rule SpainAfrica 1974	only	-	Sep	 1	 0:00	0	-
-Rule SpainAfrica 1976	1977	-	May	 1	 0:00	1:00	S
-Rule SpainAfrica 1976	only	-	Aug	 1	 0:00	0	-
-Rule SpainAfrica 1977	only	-	Sep	28	 0:00	0	-
-Rule SpainAfrica 1978	only	-	Jun	 1	 0:00	1:00	S
-Rule SpainAfrica 1978	only	-	Aug	 4	 0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Madrid	-0:14:44 -	LMT	1900 Dec 31 23:45:16
-			 0:00	Spain	WE%sT	1940 Mar 16 23:00
-			 1:00	Spain	CE%sT	1979
-			 1:00	EU	CE%sT
-Zone	Africa/Ceuta	-0:21:16 -	LMT	1900 Dec 31 23:38:44
-			 0:00	-	WET	1918 May  6 23:00
-			 0:00	1:00	WEST	1918 Oct  7 23:00
-			 0:00	-	WET	1924
-			 0:00	Spain	WE%sT	1929
-			 0:00 SpainAfrica WE%sT	1984 Mar 16
-			 1:00	-	CET	1986
-			 1:00	EU	CE%sT
-Zone	Atlantic/Canary	-1:01:36 -	LMT	1922 Mar # Las Palmas de Gran C.
-			-1:00	-	-01	1946 Sep 30  1:00
-			 0:00	-	WET	1980 Apr  6  0:00s
-			 0:00	1:00	WEST	1980 Sep 28  1:00u
-			 0:00	EU	WE%sT
-# IATA SSIM (1996-09) says the Canaries switch at 2:00u, not 1:00u.
-# Ignore this for now, as the Canaries are part of the EU.
-
-# Sweden
-
-# From Ivan Nilsson (2001-04-13), superseding Shanks & Pottenger:
-#
-# The law "Svensk författningssamling 1878, no 14" about standard time in 1879:
-# From the beginning of 1879 (that is 01-01 00:00) the time for all
-# places in the country is "the mean solar time for the meridian at
-# three degrees, or twelve minutes of time, to the west of the
-# meridian of the Observatory of Stockholm".  The law is dated 1878-05-31.
-#
-# The observatory at that time had the meridian 18 degrees 03' 30"
-# eastern longitude = 01:12:14 in time.  Less 12 minutes gives the
-# national standard time as 01:00:14 ahead of GMT....
-#
-# About the beginning of CET in Sweden. The lawtext ("Svensk
-# författningssamling 1899, no 44") states, that "from the beginning
-# of 1900... ... the same as the mean solar time for the meridian at
-# the distance of one hour of time from the meridian of the English
-# observatory at Greenwich, or at 12 minutes 14 seconds to the west
-# from the meridian of the Observatory of Stockholm". The law is dated
-# 1899-06-16.  In short: At 1900-01-01 00:00:00 the new standard time
-# in Sweden is 01:00:00 ahead of GMT.
-#
-# 1916: The lawtext ("Svensk författningssamling 1916, no 124") states
-# that "1916-05-15 is considered to begin one hour earlier". It is
-# pretty obvious that at 05-14 23:00 the clocks are set to 05-15 00:00....
-# Further the law says, that "1916-09-30 is considered to end one hour later".
-#
-# The laws regulating [DST] are available on the site of the Swedish
-# Parliament beginning with 1985 - the laws regulating 1980/1984 are
-# not available on the site (to my knowledge they are only available
-# in Swedish): <http://www.riksdagen.se/english/work/sfst.asp> (type
-# "sommartid" without the quotes in the field "Fritext" and then click
-# the Sök-button).
-#
-# (2001-05-13):
-#
-# I have now found a newspaper stating that at 1916-10-01 01:00
-# summertime the church-clocks etc were set back one hour to show
-# 1916-10-01 00:00 standard time.  The article also reports that some
-# people thought the switch to standard time would take place already
-# at 1916-10-01 00:00 summer time, but they had to wait for another
-# hour before the event took place.
-#
-# Source: The newspaper "Dagens Nyheter", 1916-10-01, page 7 upper left.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Europe/Stockholm	1:12:12 -	LMT	1879 Jan  1
-			1:00:14	-	SET	1900 Jan  1 # Swedish Time
-			1:00	-	CET	1916 May 14 23:00
-			1:00	1:00	CEST	1916 Oct  1  1:00
-			1:00	-	CET	1980
-			1:00	EU	CE%sT
-
-# Switzerland
-# From Howse:
-# By the end of the 18th century clocks and watches became commonplace
-# and their performance improved enormously.  Communities began to keep
-# mean time in preference to apparent time - Geneva from 1780 ....
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# From Whitman (who writes "Midnight?"):
-# Rule	Swiss	1940	only	-	Nov	 2	0:00	1:00	S
-# Rule	Swiss	1940	only	-	Dec	31	0:00	0	-
-# From Shanks & Pottenger:
-# Rule	Swiss	1941	1942	-	May	Sun>=1	2:00	1:00	S
-# Rule	Swiss	1941	1942	-	Oct	Sun>=1	0:00	0	-
-
-# From Alois Treindl (2008-12-17):
-# I have researched the DST usage in Switzerland during the 1940ies.
-#
-# As I wrote in an earlier message, I suspected the current tzdata values
-# to be wrong. This is now verified.
-#
-# I have found copies of the original ruling by the Swiss Federal
-# government, in 'Eidgenössische Gesetzessammlung 1941 and 1942' (Swiss
-# federal law collection)...
-#
-# DST began on Monday 5 May 1941, 1:00 am by shifting the clocks to 2:00 am
-# DST ended on Monday 6 Oct 1941, 2:00 am by shifting the clocks to 1:00 am.
-#
-# DST began on Monday, 4 May 1942 at 01:00 am
-# DST ended on Monday, 5 Oct 1942 at 02:00 am
-#
-# There was no DST in 1940, I have checked the law collection carefully.
-# It is also indicated by the fact that the 1942 entry in the law
-# collection points back to 1941 as a reference, but no reference to any
-# other years are made.
-#
-# Newspaper articles I have read in the archives on 6 May 1941 reported
-# about the introduction of DST (Sommerzeit in German) during the previous
-# night as an absolute novelty, because this was the first time that such
-# a thing had happened in Switzerland.
-#
-# I have also checked 1916, because one book source (Gabriel, Traité de
-# l'heure dans le monde) claims that Switzerland had DST in 1916. This is
-# false, no official document could be found. Probably Gabriel got misled
-# by references to Germany, which introduced DST in 1916 for the first time.
-#
-# The tzdata rules for Switzerland must be changed to:
-# Rule  Swiss   1941    1942    -       May     Mon>=1  1:00    1:00    S
-# Rule  Swiss   1941    1942    -       Oct     Mon>=1  2:00    0       -
-#
-# The 1940 rules must be deleted.
-#
-# One further detail for Switzerland, which is probably out of scope for
-# most users of tzdata: The [Europe/Zurich zone] ...
-# describes all of Switzerland correctly, with the exception of
-# the Canton de Genève (Geneva, Genf). Between 1848 and 1894 Geneva did not
-# follow Bern Mean Time but kept its own local mean time.
-# To represent this, an extra zone would be needed.
-#
-# From Alois Treindl (2013-09-11):
-# The Federal regulations say
-# http://www.admin.ch/opc/de/classified-compilation/20071096/index.html
-# ... the meridian for Bern mean time ... is 7 degrees 26' 22.50".
-# Expressed in time, it is 0h29m45.5s.
-
-# From Pierre-Yves Berger (2013-09-11):
-# the "Circulaire du conseil fédéral" (December 11 1893)
-# http://www.amtsdruckschriften.bar.admin.ch/viewOrigDoc.do?id=10071353
-# clearly states that the [1894-06-01] change should be done at midnight
-# but if no one is present after 11 at night, could be postponed until one
-# hour before the beginning of service.
-
-# From Paul Eggert (2013-09-11):
-# Round BMT to the nearest even second, 0:29:46.
-#
-# We can find no reliable source for Shanks's assertion that all of Switzerland
-# except Geneva switched to Bern Mean Time at 00:00 on 1848-09-12.  This book:
-#
-#	Jakob Messerli. Gleichmässig, pünktlich, schnell. Zeiteinteilung und
-#	Zeitgebrauch in der Schweiz im 19. Jahrhundert. Chronos, Zurich 1995,
-#	ISBN 3-905311-68-2, OCLC 717570797.
-#
-# suggests that the transition was more gradual, and that the Swiss did not
-# agree about civil time during the transition.  The timekeeping it gives the
-# most detail for is postal and telegraph time: here, federal legislation (the
-# "Bundesgesetz über die Erstellung von elektrischen Telegraphen") passed on
-# 1851-11-23, and an official implementation notice was published 1853-07-16
-# (Bundesblatt 1853, Bd. II, S. 859).  On p 72 Messerli writes that in
-# practice since July 1853 Bernese time was used in "all postal and telegraph
-# offices in Switzerland from Geneva to St. Gallen and Basel to Chiasso"
-# (Google translation).  For now, model this transition as occurring on
-# 1853-07-16, though it probably occurred at some other date in Zurich, and
-# legal civil time probably changed at still some other transition date.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Swiss	1941	1942	-	May	Mon>=1	1:00	1:00	S
-Rule	Swiss	1941	1942	-	Oct	Mon>=1	2:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Zurich	0:34:08 -	LMT	1853 Jul 16 # See above comment.
-			0:29:46	-	BMT	1894 Jun    # Bern Mean Time
-			1:00	Swiss	CE%sT	1981
-			1:00	EU	CE%sT
-
-# Turkey
-
-# From Kıvanç Yazan (2016-09-25):
-# 1) For 1986-2006, DST started at 01:00 local and ended at 02:00 local, with
-#    no exceptions.
-# 2) 1994's lastSun was overridden with Mar 20 ...
-# Here are official papers:
-# http://www.resmigazete.gov.tr/arsiv/19032.pdf  - page 2 for 1986
-# http://www.resmigazete.gov.tr/arsiv/19400.pdf  - page 4 for 1987
-# http://www.resmigazete.gov.tr/arsiv/19752.pdf  - page 15 for 1988
-# http://www.resmigazete.gov.tr/arsiv/20102.pdf  - page 6 for 1989
-# http://www.resmigazete.gov.tr/arsiv/20464.pdf  - page 1 for 1990 - 1992
-# http://www.resmigazete.gov.tr/arsiv/21531.pdf  - page 15 for 1993 - 1995
-# http://www.resmigazete.gov.tr/arsiv/21879.pdf  - page 1 for overriding 1994
-# http://www.resmigazete.gov.tr/arsiv/22588.pdf  - page 1 for 1996, 1997
-# http://www.resmigazete.gov.tr/arsiv/23286.pdf  - page 10 for 1998 - 2000
-# http://www.resmigazete.gov.tr/eskiler/2001/03/20010324.htm#2  - for 2001
-# http://www.resmigazete.gov.tr/eskiler/2002/03/20020316.htm#2  - for 2002-2006
-# From Paul Eggert (2016-09-25):
-# Prefer the above sources to Shanks & Pottenger for time stamps after 1985.
-
-# From Steffen Thorsen (2007-03-09):
-# Starting 2007 though, it seems that they are adopting EU's 1:00 UTC
-# start/end time, according to the following page (2007-03-07):
-# http://www.ntvmsnbc.com/news/402029.asp
-# The official document is located here - it is in Turkish...:
-# http://rega.basbakanlik.gov.tr/eskiler/2007/03/20070307-7.htm
-# I was able to locate the following seemingly official document
-# (on a non-government server though) describing dates between 2002 and 2006:
-# http://www.alomaliye.com/bkk_2002_3769.htm
-
-# From Gökdeniz Karadağ (2011-03-10):
-# According to the articles linked below, Turkey will change into summer
-# time zone (GMT+3) on March 28, 2011 at 3:00 a.m. instead of March 27.
-# This change is due to a nationwide exam on 27th.
-# http://www.worldbulletin.net/?aType=haber&ArticleID=70872
-# Turkish:
-# http://www.hurriyet.com.tr/ekonomi/17230464.asp?gid=373
-
-# From Faruk Pasin (2014-02-14):
-# The DST for Turkey has been changed for this year because of the
-# Turkish Local election....
-# http://www.sabah.com.tr/Ekonomi/2014/02/12/yaz-saatinde-onemli-degisiklik
-# ... so Turkey will move clocks forward one hour on March 31 at 3:00 a.m.
-# From Randal L. Schwartz (2014-04-15):
-# Having landed on a flight from the states to Istanbul (via AMS) on March 31,
-# I can tell you that NOBODY (even the airlines) respected this timezone DST
-# change delay.  Maybe the word just didn't get out in time.
-# From Paul Eggert (2014-06-15):
-# The press reported massive confusion, as election officials obeyed the rule
-# change but cell phones (and airline baggage systems) did not.  See:
-# Kostidis M. Eventful elections in Turkey. Balkan News Agency
-# http://www.balkaneu.com/eventful-elections-turkey/ 2014-03-30.
-# I guess the best we can do is document the official time.
-
-# From Fatih (2015-09-29):
-# It's officially announced now by the Ministry of Energy.
-# Turkey delays winter time to 8th of November 04:00
-# http://www.aa.com.tr/tr/turkiye/yaz-saati-uygulamasi-8-kasimda-sona-erecek/362217
-#
-# From BBC News (2015-10-25):
-# Confused Turks are asking "what's the time?" after automatic clocks defied a
-# government decision ... "For the next two weeks #Turkey is on EEST... Erdogan
-# Engineered Standard Time," said Twitter user @aysekarahasan.
-# http://www.bbc.com/news/world-europe-34631326
-
-# From Burak AYDIN (2016-09-08):
-# Turkey will stay in Daylight Saving Time even in winter....
-# http://www.resmigazete.gov.tr/eskiler/2016/09/20160908-2.pdf
-#
-# From Paul Eggert (2016-09-07):
-# The change is permanent, so this is the new standard time in Turkey.
-# It takes effect today, which is not much notice.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
-Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
-Rule	Turkey	1920	only	-	Mar	28	0:00	1:00	S
-Rule	Turkey	1920	only	-	Oct	25	0:00	0	-
-Rule	Turkey	1921	only	-	Apr	 3	0:00	1:00	S
-Rule	Turkey	1921	only	-	Oct	 3	0:00	0	-
-Rule	Turkey	1922	only	-	Mar	26	0:00	1:00	S
-Rule	Turkey	1922	only	-	Oct	 8	0:00	0	-
-# Whitman gives 1923 Apr 28 - Sep 16 and no DST in 1924-1925;
-# go with Shanks & Pottenger.
-Rule	Turkey	1924	only	-	May	13	0:00	1:00	S
-Rule	Turkey	1924	1925	-	Oct	 1	0:00	0	-
-Rule	Turkey	1925	only	-	May	 1	0:00	1:00	S
-Rule	Turkey	1940	only	-	Jun	30	0:00	1:00	S
-Rule	Turkey	1940	only	-	Oct	 5	0:00	0	-
-Rule	Turkey	1940	only	-	Dec	 1	0:00	1:00	S
-Rule	Turkey	1941	only	-	Sep	21	0:00	0	-
-Rule	Turkey	1942	only	-	Apr	 1	0:00	1:00	S
-# Whitman omits the next two transition and gives 1945 Oct 1;
-# go with Shanks & Pottenger.
-Rule	Turkey	1942	only	-	Nov	 1	0:00	0	-
-Rule	Turkey	1945	only	-	Apr	 2	0:00	1:00	S
-Rule	Turkey	1945	only	-	Oct	 8	0:00	0	-
-Rule	Turkey	1946	only	-	Jun	 1	0:00	1:00	S
-Rule	Turkey	1946	only	-	Oct	 1	0:00	0	-
-Rule	Turkey	1947	1948	-	Apr	Sun>=16	0:00	1:00	S
-Rule	Turkey	1947	1950	-	Oct	Sun>=2	0:00	0	-
-Rule	Turkey	1949	only	-	Apr	10	0:00	1:00	S
-Rule	Turkey	1950	only	-	Apr	19	0:00	1:00	S
-Rule	Turkey	1951	only	-	Apr	22	0:00	1:00	S
-Rule	Turkey	1951	only	-	Oct	 8	0:00	0	-
-Rule	Turkey	1962	only	-	Jul	15	0:00	1:00	S
-Rule	Turkey	1962	only	-	Oct	 8	0:00	0	-
-Rule	Turkey	1964	only	-	May	15	0:00	1:00	S
-Rule	Turkey	1964	only	-	Oct	 1	0:00	0	-
-Rule	Turkey	1970	1972	-	May	Sun>=2	0:00	1:00	S
-Rule	Turkey	1970	1972	-	Oct	Sun>=2	0:00	0	-
-Rule	Turkey	1973	only	-	Jun	 3	1:00	1:00	S
-Rule	Turkey	1973	only	-	Nov	 4	3:00	0	-
-Rule	Turkey	1974	only	-	Mar	31	2:00	1:00	S
-Rule	Turkey	1974	only	-	Nov	 3	5:00	0	-
-Rule	Turkey	1975	only	-	Mar	30	0:00	1:00	S
-Rule	Turkey	1975	1976	-	Oct	lastSun	0:00	0	-
-Rule	Turkey	1976	only	-	Jun	 1	0:00	1:00	S
-Rule	Turkey	1977	1978	-	Apr	Sun>=1	0:00	1:00	S
-Rule	Turkey	1977	only	-	Oct	16	0:00	0	-
-Rule	Turkey	1979	1980	-	Apr	Sun>=1	3:00	1:00	S
-Rule	Turkey	1979	1982	-	Oct	Mon>=11	0:00	0	-
-Rule	Turkey	1981	1982	-	Mar	lastSun	3:00	1:00	S
-Rule	Turkey	1983	only	-	Jul	31	0:00	1:00	S
-Rule	Turkey	1983	only	-	Oct	 2	0:00	0	-
-Rule	Turkey	1985	only	-	Apr	20	0:00	1:00	S
-Rule	Turkey	1985	only	-	Sep	28	0:00	0	-
-Rule	Turkey	1986	1993	-	Mar	lastSun	1:00s	1:00	S
-Rule	Turkey	1986	1995	-	Sep	lastSun	1:00s	0	-
-Rule	Turkey	1994	only	-	Mar	20	1:00s	1:00	S
-Rule	Turkey	1995	2006	-	Mar	lastSun	1:00s	1:00	S
-Rule	Turkey	1996	2006	-	Oct	lastSun	1:00s	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Europe/Istanbul	1:55:52 -	LMT	1880
-			1:56:56	-	IMT	1910 Oct # Istanbul Mean Time?
-			2:00	Turkey	EE%sT	1978 Oct 15
-			3:00	Turkey	+03/+04	1985 Apr 20
-			2:00	Turkey	EE%sT	2007
-			2:00	EU	EE%sT	2011 Mar 27  1:00u
-			2:00	-	EET	2011 Mar 28  1:00u
-			2:00	EU	EE%sT	2014 Mar 30  1:00u
-			2:00	-	EET	2014 Mar 31  1:00u
-			2:00	EU	EE%sT	2015 Oct 25  1:00u
-			2:00	1:00	EEST	2015 Nov  8  1:00u
-			2:00	EU	EE%sT	2016 Sep  7
-			3:00	-	+03
-Link	Europe/Istanbul	Asia/Istanbul	# Istanbul is in both continents.
-
-# Ukraine
-#
-# From Igor Karpov, who works for the Ukrainian Ministry of Justice,
-# via Garrett Wollman (2003-01-27):
-# BTW, I've found the official document on this matter. It's government
-# regulations No. 509, May 13, 1996. In my poor translation it says:
-# "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday
-# of March at 3am the time is changing to 4am and each last Sunday of
-# October the time at 4am is changing to 3am"
-
-# From Alexander Krivenyshev (2011-09-20):
-# On September 20, 2011 the deputies of the Verkhovna Rada agreed to
-# abolish the transfer clock to winter time.
-#
-# Bill No. 8330 of MP from the Party of Regions Oleg Nadoshi got
-# approval from 266 deputies.
-#
-# Ukraine abolishes transfer back to the winter time (in Russian)
-# http://news.mail.ru/politics/6861560/
-#
-# The Ukrainians will no longer change the clock (in Russian)
-# http://www.segodnya.ua/news/14290482.html
-#
-# Deputies cancelled the winter time (in Russian)
-# http://www.pravda.com.ua/rus/news/2011/09/20/6600616/
-#
-# From Philip Pizzey (2011-10-18):
-# Today my Ukrainian colleagues have informed me that the
-# Ukrainian parliament have decided that they will go to winter
-# time this year after all.
-#
-# From Udo Schwedt (2011-10-18):
-# As far as I understand, the recent change to the Ukrainian time zone
-# (Europe/Kiev) to introduce permanent daylight saving time (similar
-# to Russia) was reverted today:
-# http://portal.rada.gov.ua/rada/control/en/publish/article/info_left?art_id=287324&cat_id=105995
-#
-# Also reported by Alexander Bokovoy (2011-10-18) who also noted:
-# The law documents themselves are at
-# http://w1.c1.rada.gov.ua/pls/zweb_n/webproc4_1?id=&pf3511=41484
-
-# From Vladimir in Moscow via Alois Treindl re Kiev time 1991/2 (2014-02-28):
-# First in Ukraine they changed Time zone from UTC+3 to UTC+2 with DST:
-#       03 25 1990 02:00 -03.00 1       Time Zone 3 with DST
-#       07 01 1990 02:00 -02.00 1       Time Zone 2 with DST
-# * Ukrainian Government's Resolution of 18.06.1990, No. 134.
-# http://search.ligazakon.ua/l_doc2.nsf/link1/T001500.html
-#
-# They did not end DST in September, 1990 (according to the law,
-# "summer time" was still in action):
-#       09 30 1990 03:00 -02.00 1       Time Zone 2 with DST
-# * Ukrainian Government's Resolution of 21.09.1990, No. 272.
-# http://search.ligazakon.ua/l_doc2.nsf/link1/KP900272.html
-#
-# Again no change in March, 1991 ("summer time" in action):
-#       03 31 1991 02:00 -02.00 1       Time Zone 2 with DST
-#
-# DST ended in September 1991 ("summer time" ended):
-#       09 29 1991 03:00 -02.00 0       Time Zone 2, no DST
-# * Ukrainian Government's Resolution of 25.09.1991, No. 225.
-# http://www.uazakon.com/documents/date_21/pg_iwgdoc.htm
-# This is an answer.
-#
-# Since 1992 they had normal DST procedure:
-#       03 29 1992 02:00 -02.00 1       DST started
-#       09 27 1992 03:00 -02.00 0       DST ended
-# * Ukrainian Government's Resolution of 20.03.1992, No. 139.
-# http://www.uazakon.com/documents/date_8u/pg_grcasa.htm
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Most of Ukraine since 1970 has been like Kiev.
-# "Kyiv" is the transliteration of the Ukrainian name, but
-# "Kiev" is more common in English.
-Zone Europe/Kiev	2:02:04 -	LMT	1880
-			2:02:04	-	KMT	1924 May  2 # Kiev Mean Time
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Sep 20
-			1:00	C-Eur	CE%sT	1943 Nov  6
-			3:00	Russia	MSK/MSD	1990 Jul  1  2:00
-			2:00	1:00	EEST	1991 Sep 29  3:00
-			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT
-# Ruthenia used CET 1990/1991.
-# "Uzhhorod" is the transliteration of the Rusyn/Ukrainian pronunciation, but
-# "Uzhgorod" is more common in English.
-Zone Europe/Uzhgorod	1:29:12 -	LMT	1890 Oct
-			1:00	-	CET	1940
-			1:00	C-Eur	CE%sT	1944 Oct
-			1:00	1:00	CEST	1944 Oct 26
-			1:00	-	CET	1945 Jun 29
-			3:00	Russia	MSK/MSD	1990
-			3:00	-	MSK	1990 Jul  1  2:00
-			1:00	-	CET	1991 Mar 31  3:00
-			2:00	-	EET	1992
-			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT
-# Zaporozh'ye and eastern Lugansk oblasts observed DST 1990/1991.
-# "Zaporizhia" is the transliteration of the Ukrainian name, but
-# "Zaporozh'ye" is more common in English.  Use the common English
-# spelling, except omit the apostrophe as it is not allowed in
-# portable Posix file names.
-Zone Europe/Zaporozhye	2:20:40 -	LMT	1880
-			2:20	-	+0220	1924 May  2
-			2:00	-	EET	1930 Jun 21
-			3:00	-	MSK	1941 Aug 25
-			1:00	C-Eur	CE%sT	1943 Oct 25
-			3:00	Russia	MSK/MSD	1991 Mar 31  2:00
-			2:00	E-Eur	EE%sT	1995
-			2:00	EU	EE%sT
-
-# Vatican City
-# See Europe/Rome.
-
-###############################################################################
-
-# One source shows that Bulgaria, Cyprus, Finland, and Greece observe DST from
-# the last Sunday in March to the last Sunday in September in 1986.
-# The source shows Romania changing a day later than everybody else.
-#
-# According to Bernard Sieloff's source, Poland is in the MET time zone but
-# uses the WE DST rules.  The Western USSR uses EET+1 and ME DST rules.
-# Bernard Sieloff's source claims Romania switches on the same day, but at
-# 00:00 standard time (i.e., 01:00 DST).  It also claims that Turkey
-# switches on the same day, but switches on at 01:00 standard time
-# and off at 00:00 standard time (i.e., 01:00 DST)
-
-# ...
-# Date: Wed, 28 Jan 87 16:56:27 -0100
-# From: Tom Hofmann
-# ...
-#
-# ...the European time rules are...standardized since 1981, when
-# most European countries started DST.  Before that year, only
-# a few countries (UK, France, Italy) had DST, each according
-# to own national rules.  In 1981, however, DST started on
-# 'Apr firstSun', and not on 'Mar lastSun' as in the following
-# years...
-# But also since 1981 there are some more national exceptions
-# than listed in 'europe': Switzerland, for example, joined DST
-# one year later, Denmark ended DST on 'Oct 1' instead of 'Sep
-# lastSun' in 1981 - I don't know how they handle now.
-#
-# Finally, DST ist always from 'Apr 1' to 'Oct 1' in the
-# Soviet Union (as far as I know).
-#
-# Tom Hofmann, Scientific Computer Center, CIBA-GEIGY AG,
-# 4002 Basle, Switzerland
-# ...
-
-# ...
-# Date: Wed, 4 Feb 87 22:35:22 +0100
-# From: Dik T. Winter
-# ...
-#
-# The information from Tom Hofmann is (as far as I know) not entirely correct.
-# After a request from chongo at amdahl I tried to retrieve all information
-# about DST in Europe.  I was able to find all from about 1969.
-#
-# ...standardization on DST in Europe started in about 1977 with switches on
-# first Sunday in April and last Sunday in September...
-# In 1981 UK joined Europe insofar that
-# the starting day for both shifted to last Sunday in March.  And from 1982
-# the whole of Europe used DST, with switch dates April 1 and October 1 in
-# the Sov[i]et Union.  In 1985 the SU reverted to standard Europe[a]n switch
-# dates...
-#
-# It should also be remembered that time-zones are not constants; e.g.
-# Portugal switched in 1976 from MET (or CET) to WET with DST...
-# Note also that though there were rules for switch dates not
-# all countries abided to these dates, and many individual deviations
-# occurred, though not since 1982 I believe.  Another note: it is always
-# assumed that DST is 1 hour ahead of normal time, this need not be the
-# case; at least in the Netherlands there have been times when DST was 2 hours
-# in advance of normal time.
-#
-# ...
-# dik t. winter, cwi, amsterdam, nederland
-# ...
-
-# From Bob Devine (1988-01-28):
-# ...
-# Greece: Last Sunday in April to last Sunday in September (iffy on dates).
-# Since 1978.  Change at midnight.
-# ...
-# Monaco: has same DST as France.
-# ...
diff --git a/src/timezone/data/factory b/src/timezone/data/factory
deleted file mode 100644
index 75fa4a11c3..0000000000
--- a/src/timezone/data/factory
+++ /dev/null
@@ -1,10 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# For distributors who don't want to put time zone specification in
-# their installation procedures.  Users that run 'date' will get the
-# time zone abbreviation "-00", indicating that the actual time zone
-# is unknown.
-
-# Zone	NAME	GMTOFF	RULES	FORMAT
-Zone	Factory	0	-	-00
diff --git a/src/timezone/data/northamerica b/src/timezone/data/northamerica
deleted file mode 100644
index 6ede9dcd96..0000000000
--- a/src/timezone/data/northamerica
+++ /dev/null
@@ -1,3374 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# also includes Central America and the Caribbean
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (1999-03-22):
-# A reliable and entertaining source about time zones is
-# Derek Howse, Greenwich time and longitude, Philip Wilson Publishers (1997).
-
-###############################################################################
-
-# United States
-
-# From Paul Eggert (1999-03-31):
-# Howse writes (pp 121-125) that time zones were invented by
-# Professor Charles Ferdinand Dowd (1825-1904),
-# Principal of Temple Grove Ladies' Seminary (Saratoga Springs, NY).
-# His pamphlet "A System of National Time for Railroads" (1870)
-# was the result of his proposals at the Convention of Railroad Trunk Lines
-# in New York City (1869-10).  His 1870 proposal was based on Washington, DC,
-# but in 1872-05 he moved the proposed origin to Greenwich.
-
-# From Paul Eggert (2016-09-21):
-# Dowd's proposal left many details unresolved, such as where to draw
-# lines between time zones.  The key individual who made time zones
-# work in the US was William Frederick Allen - railway engineer,
-# managing editor of the Travelers' Guide, and secretary of the
-# General Time Convention, a railway standardization group.  Allen
-# spent months in dialogs with scientific and railway leaders,
-# developed a workable plan to institute time zones, and presented it
-# to the General Time Convention on 1883-04-11, saying that his plan
-# meant "local time would be practically abolished" - a plus for
-# railway scheduling.  By the next convention on 1883-10-11 nearly all
-# railroads had agreed and it took effect on 1883-11-18 at 12:00.
-# That Sunday was called the "day of two noons", as the eastern parts
-# of the new zones observed noon twice.  Allen witnessed the
-# transition in New York City, writing:
-#
-#   I heard the bells of St. Paul's strike on the old time.  Four
-#   minutes later, obedient to the electrical signal from the Naval
-#   Observatory ... the time-ball made its rapid descent, the chimes
-#   of old Trinity rang twelve measured strokes, and local time was
-#   abandoned, probably forever.
-#
-# Most of the US soon followed suit.  See:
-# Bartky IR. The adoption of standard time. Technol Cult 1989 Jan;30(1):25-56.
-# http://dx.doi.org/10.2307/3105430
-
-# From Paul Eggert (2005-04-16):
-# That 1883 transition occurred at 12:00 new time, not at 12:00 old time.
-# See p 46 of David Prerau, Seize the daylight, Thunder's Mouth Press (2005).
-
-# From Paul Eggert (2006-03-22):
-# A good source for time zone historical data in the US is
-# Thomas G. Shanks, The American Atlas (5th edition),
-# San Diego: ACS Publications, Inc. (1991).
-# Make sure you have the errata sheet; the book is somewhat useless without it.
-# It is the source for most of the pre-1991 US entries below.
-
-# From Paul Eggert (2001-03-06):
-# Daylight Saving Time was first suggested as a joke by Benjamin Franklin
-# in his whimsical essay "An Economical Project for Diminishing the Cost
-# of Light" published in the Journal de Paris (1784-04-26).
-# Not everyone is happy with the results:
-#
-#	I don't really care how time is reckoned so long as there is some
-#	agreement about it, but I object to being told that I am saving
-#	daylight when my reason tells me that I am doing nothing of the kind.
-#	I even object to the implication that I am wasting something
-#	valuable if I stay in bed after the sun has risen.  As an admirer
-#	of moonlight I resent the bossy insistence of those who want to
-#	reduce my time for enjoying it.  At the back of the Daylight Saving
-#	scheme I detect the bony, blue-fingered hand of Puritanism, eager
-#	to push people into bed earlier, and get them up earlier, to make
-#	them healthy, wealthy and wise in spite of themselves.
-#
-#	 -- Robertson Davies, The diary of Samuel Marchbanks,
-#	   Clarke, Irwin (1947), XIX, Sunday
-#
-# For more about the first ten years of DST in the United States, see
-# Robert Garland, Ten years of daylight saving from the Pittsburgh standpoint
-# (Carnegie Library of Pittsburgh, 1927).
-# http://www.clpgh.org/exhibit/dst.html
-#
-# Shanks says that DST was called "War Time" in the US in 1918 and 1919.
-# However, DST was imposed by the Standard Time Act of 1918, which
-# was the first nationwide legal time standard, and apparently
-# time was just called "Standard Time" or "Daylight Saving Time".
-
-# From Arthur David Olson:
-# US Daylight Saving Time ended on the last Sunday of *October* in 1974.
-# See, for example, the front page of the Saturday, 1974-10-26
-# and Sunday, 1974-10-27 editions of the Washington Post.
-
-# From Arthur David Olson:
-# Before the Uniform Time Act of 1966 took effect in 1967, observance of
-# Daylight Saving Time in the US was by local option, except during wartime.
-
-# From Arthur David Olson (2000-09-25):
-# Last night I heard part of a rebroadcast of a 1945 Arch Oboler radio drama.
-# In the introduction, Oboler spoke of "Eastern Peace Time."
-# An AltaVista search turned up:
-# http://rowayton.org/rhs/hstaug45.html
-# "When the time is announced over the radio now, it is 'Eastern Peace
-# Time' instead of the old familiar 'Eastern War Time.'  Peace is wonderful."
-# (August 1945) by way of confirmation.
-
-# From Joseph Gallant citing
-# George H. Douglas, _The Early Days of Radio Broadcasting_ (1987):
-# At 7 P.M. (Eastern War Time) [on 1945-08-14], the networks were set
-# to switch to London for Attlee's address, but the American people
-# never got to hear his speech live. According to one press account,
-# CBS' Bob Trout was first to announce the word of Japan's surrender,
-# but a few seconds later, NBC, ABC and Mutual also flashed the word
-# of surrender, all of whom interrupting the bells of Big Ben in
-# London which were to precede Mr. Attlee's speech.
-
-# From Paul Eggert (2003-02-09): It was Robert St John, not Bob Trout.  From
-# Myrna Oliver's obituary of St John on page B16 of today's Los Angeles Times:
-#
-# ... a war-weary U.S. clung to radios, awaiting word of Japan's surrender.
-# Any announcement from Asia would reach St. John's New York newsroom on a
-# wire service teletype machine, which had prescribed signals for major news.
-# Associated Press, for example, would ring five bells before spewing out
-# typed copy of an important story, and 10 bells for news "of transcendental
-# importance."
-#
-# On Aug. 14, stalling while talking steadily into the NBC networks' open
-# microphone, St. John heard five bells and waited only to hear a sixth bell,
-# before announcing confidently: "Ladies and gentlemen, World War II is over.
-# The Japanese have agreed to our surrender terms."
-#
-# He had scored a 20-second scoop on other broadcasters.
-
-# From Arthur David Olson (2005-08-22):
-# Paul has been careful to use the "US" rules only in those locations
-# that are part of the United States; this reflects the real scope of
-# U.S. government action.  So even though the "US" rules have changed
-# in the latest release, other countries won't be affected.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	US	1918	1919	-	Mar	lastSun	2:00	1:00	D
-Rule	US	1918	1919	-	Oct	lastSun	2:00	0	S
-Rule	US	1942	only	-	Feb	9	2:00	1:00	W # War
-Rule	US	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	US	1945	only	-	Sep	lastSun	2:00	0	S
-Rule	US	1967	2006	-	Oct	lastSun	2:00	0	S
-Rule	US	1967	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	US	1974	only	-	Jan	6	2:00	1:00	D
-Rule	US	1975	only	-	Feb	23	2:00	1:00	D
-Rule	US	1976	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	US	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
-Rule	US	2007	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	US	2007	max	-	Nov	Sun>=1	2:00	0	S
-
-# From Arthur David Olson, 2005-12-19
-# We generate the files specified below to guard against old files with
-# obsolete information being left in the time zone binary directory.
-# We limit the list to names that have appeared in previous versions of
-# this time zone package.
-# We do these as separate Zones rather than as Links to avoid problems if
-# a particular place changes whether it observes DST.
-# We put these specifications here in the northamerica file both to
-# increase the chances that they'll actually get compiled and to
-# avoid the need to duplicate the US rules in another file.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	EST		 -5:00	-	EST
-Zone	MST		 -7:00	-	MST
-Zone	HST		-10:00	-	HST
-Zone	EST5EDT		 -5:00	US	E%sT
-Zone	CST6CDT		 -6:00	US	C%sT
-Zone	MST7MDT		 -7:00	US	M%sT
-Zone	PST8PDT		 -8:00	US	P%sT
-
-# From U. S. Naval Observatory (1989-01-19):
-# USA  EASTERN       5 H  BEHIND UTC    NEW YORK, WASHINGTON
-# USA  EASTERN       4 H  BEHIND UTC    APR 3 - OCT 30
-# USA  CENTRAL       6 H  BEHIND UTC    CHICAGO, HOUSTON
-# USA  CENTRAL       5 H  BEHIND UTC    APR 3 - OCT 30
-# USA  MOUNTAIN      7 H  BEHIND UTC    DENVER
-# USA  MOUNTAIN      6 H  BEHIND UTC    APR 3 - OCT 30
-# USA  PACIFIC       8 H  BEHIND UTC    L.A., SAN FRANCISCO
-# USA  PACIFIC       7 H  BEHIND UTC    APR 3 - OCT 30
-# USA  ALASKA STD    9 H  BEHIND UTC    MOST OF ALASKA     (AKST)
-# USA  ALASKA STD    8 H  BEHIND UTC    APR 3 - OCT 30 (AKDT)
-# USA  ALEUTIAN     10 H  BEHIND UTC    ISLANDS WEST OF 170W
-# USA    "           9 H  BEHIND UTC    APR 3 - OCT 30
-# USA  HAWAII       10 H  BEHIND UTC
-# USA  BERING       11 H  BEHIND UTC    SAMOA, MIDWAY
-
-# From Arthur David Olson (1989-01-21):
-# The above dates are for 1988.
-# Note the "AKST" and "AKDT" abbreviations, the claim that there's
-# no DST in Samoa, and the claim that there is DST in Alaska and the
-# Aleutians.
-
-# From Arthur David Olson (1988-02-13):
-# Legal standard time zone names, from United States Code (1982 Edition and
-# Supplement III), Title 15, Chapter 6, Section 260 and forward.  First, names
-# up to 1967-04-01 (when most provisions of the Uniform Time Act of 1966
-# took effect), as explained in sections 263 and 261:
-#	(none)
-#	United States standard eastern time
-#	United States standard mountain time
-#	United States standard central time
-#	United States standard Pacific time
-#	(none)
-#	United States standard Alaska time
-#	(none)
-# Next, names from 1967-04-01 until 1983-11-30 (the date for
-# public law 98-181):
-#	Atlantic standard time
-#	eastern standard time
-#	central standard time
-#	mountain standard time
-#	Pacific standard time
-#	Yukon standard time
-#	Alaska-Hawaii standard time
-#	Bering standard time
-# And after 1983-11-30:
-#	Atlantic standard time
-#	eastern standard time
-#	central standard time
-#	mountain standard time
-#	Pacific standard time
-#	Alaska standard time
-#	Hawaii-Aleutian standard time
-#	Samoa standard time
-# The law doesn't give abbreviations.
-#
-# From Paul Eggert (2016-12-19):
-# Here are URLs for the 1918 and 1966 legislation:
-# http://uscode.house.gov/statviewer.htm?volume=40&page=451
-# http://uscode.house.gov/statviewer.htm?volume=80&page=108
-# Although the 1918 names were officially "United States Standard
-# Eastern Time" and similarly for "Central", "Mountain", "Pacific",
-# and "Alaska", in practice "Standard" was placed just before "Time",
-# as codified in 1966.  In practice, Alaska time was abbreviated "AST"
-# before 1968.  Summarizing the 1967 name changes:
-#	1918 names			1967 names
-#  -08	Standard Pacific Time (PST)	Pacific standard time (PST)
-#  -09	(unofficial) Yukon (YST)	Yukon standard time (YST)
-#  -10	Standard Alaska Time (AST)	Alaska-Hawaii standard time (AHST)
-#  -11	(unofficial) Nome (NST)		Bering standard time (BST)
-#
-# From Paul Eggert (2000-01-08), following a heads-up from Rives McDow:
-# Public law 106-564 (2000-12-23) introduced ... "Chamorro Standard Time"
-# for time in Guam and the Northern Marianas.  See the file "australasia".
-#
-# From Paul Eggert (2015-04-17):
-# HST and HDT are standardized abbreviations for Hawaii-Aleutian
-# standard and daylight times.  See section 9.47 (p 234) of the
-# U.S. Government Printing Office Style Manual (2008)
-# http://www.gpo.gov/fdsys/pkg/GPO-STYLEMANUAL-2008/pdf/GPO-STYLEMANUAL-2008.pdf
-
-# From Arthur David Olson, 2005-08-09
-# The following was signed into law on 2005-08-08.
-#
-# H.R. 6, Energy Policy Act of 2005, SEC. 110. DAYLIGHT SAVINGS.
-#   (a) Amendment.--Section 3(a) of the Uniform Time Act of 1966 (15
-#   U.S.C. 260a(a)) is amended--
-#     (1) by striking "first Sunday of April" and inserting "second
-#     Sunday of March"; and
-#     (2) by striking "last Sunday of October" and inserting "first
-#     Sunday of November'.
-#   (b) Effective Date.--Subsection (a) shall take effect 1 year after the
-#   date of enactment of this Act or March 1, 2007, whichever is later.
-#   (c) Report to Congress.--Not later than 9 months after the effective
-#   date stated in subsection (b), the Secretary shall report to Congress
-#   on the impact of this section on energy consumption in the United
-#   States.
-#   (d) Right to Revert.--Congress retains the right to revert the
-#   Daylight Saving Time back to the 2005 time schedules once the
-#   Department study is complete.
-
-# US eastern time, represented by New York
-
-# Connecticut, Delaware, District of Columbia, most of Florida,
-# Georgia, southeast Indiana (Dearborn and Ohio counties), eastern Kentucky
-# (except America/Kentucky/Louisville below), Maine, Maryland, Massachusetts,
-# New Hampshire, New Jersey, New York, North Carolina, Ohio,
-# Pennsylvania, Rhode Island, South Carolina, eastern Tennessee,
-# Vermont, Virginia, West Virginia
-
-# From Dave Cantor (2004-11-02):
-# Early this summer I had the occasion to visit the Mount Washington
-# Observatory weather station atop (of course!) Mount Washington [, NH]....
-# One of the staff members said that the station was on Eastern Standard Time
-# and didn't change their clocks for Daylight Saving ... so that their
-# reports will always have times which are 5 hours behind UTC.
-
-# From Paul Eggert (2005-08-26):
-# According to today's Huntsville Times
-# http://www.al.com/news/huntsvilletimes/index.ssf?/base/news/1125047783228320.xml&coll=1
-# a few towns on Alabama's "eastern border with Georgia, such as Phenix City
-# in Russell County, Lanett in Chambers County and some towns in Lee County,
-# set their watches and clocks on Eastern time."  It quotes H.H. "Bubba"
-# Roberts, city administrator in Phenix City. as saying "We are in the Central
-# time zone, but we do go by the Eastern time zone because so many people work
-# in Columbus."
-#
-# From Paul Eggert (2017-02-22):
-# Four cities are involved.  The two not mentioned above are Smiths Station
-# and Valley.  Barbara Brooks, Valley's assistant treasurer, heard it started
-# because West Point Pepperell textile mills were in Alabama while the
-# corporate office was in Georgia, and residents voted to keep Eastern
-# time even after the mills closed.  See: Kazek K. Did you know which
-# Alabama towns are in a different time zone?  al.com 2017-02-06.
-# http://www.al.com/living/index.ssf/2017/02/do_you_know_which_alabama_town.html
-
-# From Paul Eggert (2014-09-06):
-# Monthly Notices of the Royal Astronomical Society 44, 4 (1884-02-08), 208
-# says that New York City Hall time was 3 minutes 58.4 seconds fast of
-# Eastern time (i.e., -4:56:01.6) just before the 1883 switch.  Round to the
-# nearest second.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	NYC	1920	only	-	Mar	lastSun	2:00	1:00	D
-Rule	NYC	1920	only	-	Oct	lastSun	2:00	0	S
-Rule	NYC	1921	1966	-	Apr	lastSun	2:00	1:00	D
-Rule	NYC	1921	1954	-	Sep	lastSun	2:00	0	S
-Rule	NYC	1955	1966	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/New_York	-4:56:02 -	LMT	1883 Nov 18 12:03:58
-			-5:00	US	E%sT	1920
-			-5:00	NYC	E%sT	1942
-			-5:00	US	E%sT	1946
-			-5:00	NYC	E%sT	1967
-			-5:00	US	E%sT
-
-# US central time, represented by Chicago
-
-# Alabama, Arkansas, Florida panhandle (Bay, Calhoun, Escambia,
-# Gulf, Holmes, Jackson, Okaloosa, Santa Rosa, Walton, and
-# Washington counties), Illinois, western Indiana
-# (Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
-# Vanderburgh, and Warrick counties), Iowa, most of Kansas, western
-# Kentucky, Louisiana, Minnesota, Mississippi, Missouri, eastern
-# Nebraska, eastern North Dakota, Oklahoma, eastern South Dakota,
-# western Tennessee, most of Texas, Wisconsin
-
-# From Larry M. Smith (2006-04-26) re Wisconsin:
-# http://www.legis.state.wi.us/statutes/Stat0175.pdf ...
-# is currently enforced at the 01:00 time of change.  Because the local
-# "bar time" in the state corresponds to 02:00, a number of citations
-# are issued for the "sale of class 'B' alcohol after prohibited
-# hours" within the deviated hour of this change every year....
-#
-# From Douglas R. Bomberg (2007-03-12):
-# Wisconsin has enacted (nearly eleventh-hour) legislation to get WI
-# Statue 175 closer in synch with the US Congress' intent....
-# http://www.legis.state.wi.us/2007/data/acts/07Act3.pdf
-
-# From an email administrator of the City of Fort Pierre, SD (2015-12-21):
-# Fort Pierre is technically located in the Mountain time zone as is
-# the rest of Stanley County.  Most of Stanley County and Fort Pierre
-# uses the Central time zone due to doing most of their business in
-# Pierre so it simplifies schedules.  I have lived in Stanley County
-# all my life and it has been that way since I can remember.  (43 years!)
-#
-# From Paul Eggert (2015-12-25):
-# Assume this practice predates 1970, so Fort Pierre can use America/Chicago.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Chicago	1920	only	-	Jun	13	2:00	1:00	D
-Rule	Chicago	1920	1921	-	Oct	lastSun	2:00	0	S
-Rule	Chicago	1921	only	-	Mar	lastSun	2:00	1:00	D
-Rule	Chicago	1922	1966	-	Apr	lastSun	2:00	1:00	D
-Rule	Chicago	1922	1954	-	Sep	lastSun	2:00	0	S
-Rule	Chicago	1955	1966	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Chicago	-5:50:36 -	LMT	1883 Nov 18 12:09:24
-			-6:00	US	C%sT	1920
-			-6:00	Chicago	C%sT	1936 Mar  1  2:00
-			-5:00	-	EST	1936 Nov 15  2:00
-			-6:00	Chicago	C%sT	1942
-			-6:00	US	C%sT	1946
-			-6:00	Chicago	C%sT	1967
-			-6:00	US	C%sT
-# Oliver County, ND switched from mountain to central time on 1992-10-25.
-Zone America/North_Dakota/Center -6:45:12 - LMT	1883 Nov 18 12:14:48
-			-7:00	US	M%sT	1992 Oct 25  2:00
-			-6:00	US	C%sT
-# Morton County, ND, switched from mountain to central time on
-# 2003-10-26, except for the area around Mandan which was already central time.
-# See <http://dmses.dot.gov/docimages/p63/135818.pdf>.
-# Officially this switch also included part of Sioux County, and
-# Jones, Mellette, and Todd Counties in South Dakota;
-# but in practice these other counties were already observing central time.
-# See <http://www.epa.gov/fedrgstr/EPA-IMPACT/2003/October/Day-28/i27056.htm>.
-Zone America/North_Dakota/New_Salem -6:45:39 - LMT	1883 Nov 18 12:14:21
-			-7:00	US	M%sT	2003 Oct 26  2:00
-			-6:00	US	C%sT
-
-# From Josh Findley (2011-01-21):
-# ...it appears that Mercer County, North Dakota, changed from the
-# mountain time zone to the central time zone at the last transition from
-# daylight-saving to standard time (on Nov. 7, 2010):
-# http://www.gpo.gov/fdsys/pkg/FR-2010-09-29/html/2010-24376.htm
-# http://www.bismarcktribune.com/news/local/article_1eb1b588-c758-11df-b472-001cc4c03286.html
-
-# From Andy Lipscomb (2011-01-24):
-# ...according to the Census Bureau, the largest city is Beulah (although
-# it's commonly referred to as Beulah-Hazen, with Hazen being the next
-# largest city in Mercer County).  Google Maps places Beulah's city hall
-# at 47 degrees 15' 51" N, 101 degrees 46' 40" W, which yields an offset
-# of 6h47'07".
-
-Zone America/North_Dakota/Beulah -6:47:07 - LMT	1883 Nov 18 12:12:53
-			-7:00	US	M%sT	2010 Nov  7  2:00
-			-6:00	US	C%sT
-
-# US mountain time, represented by Denver
-#
-# Colorado, far western Kansas, Montana, western
-# Nebraska, Nevada border (Jackpot, Owyhee, and Mountain City),
-# New Mexico, southwestern North Dakota,
-# western South Dakota, far western Texas (El Paso County, Hudspeth County,
-# and Pine Springs and Nickel Creek in Culberson County), Utah, Wyoming
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Denver	1920	1921	-	Mar	lastSun	2:00	1:00	D
-Rule	Denver	1920	only	-	Oct	lastSun	2:00	0	S
-Rule	Denver	1921	only	-	May	22	2:00	0	S
-Rule	Denver	1965	1966	-	Apr	lastSun	2:00	1:00	D
-Rule	Denver	1965	1966	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Denver	-6:59:56 -	LMT	1883 Nov 18 12:00:04
-			-7:00	US	M%sT	1920
-			-7:00	Denver	M%sT	1942
-			-7:00	US	M%sT	1946
-			-7:00	Denver	M%sT	1967
-			-7:00	US	M%sT
-
-# US Pacific time, represented by Los Angeles
-#
-# California, northern Idaho (Benewah, Bonner, Boundary, Clearwater,
-# Kootenai, Latah, Lewis, Nez Perce, and Shoshone counties, Idaho county
-# north of the Salmon River, and the towns of Burgdorf and Warren),
-# Nevada (except West Wendover), Oregon (except the northern 3/4 of
-# Malheur county), and Washington
-
-# From Paul Eggert (2016-08-20):
-# In early February 1948, in response to California's electricity shortage,
-# PG&E changed power frequency from 60 to 59.5 Hz during daylight hours,
-# causing electric clocks to lose six minutes per day.  (This did not change
-# legal time, and is not part of the data here.)  See:
-# Ross SA. An energy crisis from the past: Northern California in 1948.
-# Working Paper No. 8, Institute of Governmental Studies, UC Berkeley,
-# 1973-11.  http://escholarship.org/uc/item/8x22k30c
-#
-# In another measure to save electricity, DST was instituted from 1948-03-14
-# at 02:01 to 1949-01-16 at 02:00, with the governor having the option to move
-# the fallback transition earlier.  See pages 3-4 of:
-# http://clerk.assembly.ca.gov/sites/clerk.assembly.ca.gov/files/archive/Statutes/1948/48Vol1_Chapters.pdf
-#
-# In response:
-#
-#   Governor Warren received a torrent of objecting mail, and it is not too much
-#   to speculate that the objections to Daylight Saving Time were one important
-#   factor in the defeat of the Dewey-Warren Presidential ticket in California.
-#     -- Ross, p 25
-#
-# On December 8 the governor exercised the option, setting the date to January 1
-# (LA Times 1948-12-09).  The transition time was 02:00 (LA Times 1949-01-01).
-#
-# Despite the controversy, in 1949 California voters approved Proposition 12,
-# which established DST from April's last Sunday at 01:00 until September's
-# last Sunday at 02:00. This was amended by 1962's Proposition 6, which changed
-# the fall-back date to October's last Sunday. See:
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1501&context=ca_ballot_props
-# http://repository.uchastings.edu/cgi/viewcontent.cgi?article=1636&context=ca_ballot_props
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	CA	1948	only	-	Mar	14	2:01	1:00	D
-Rule	CA	1949	only	-	Jan	 1	2:00	0	S
-Rule	CA	1950	1966	-	Apr	lastSun	1:00	1:00	D
-Rule	CA	1950	1961	-	Sep	lastSun	2:00	0	S
-Rule	CA	1962	1966	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Los_Angeles -7:52:58 -	LMT	1883 Nov 18 12:07:02
-			-8:00	US	P%sT	1946
-			-8:00	CA	P%sT	1967
-			-8:00	US	P%sT
-
-# Alaska
-# AK%sT is the modern abbreviation for -09 per USNO.
-#
-# From Paul Eggert (2001-05-30):
-# Howse writes that Alaska switched from the Julian to the Gregorian calendar,
-# and from east-of-GMT to west-of-GMT days, when the US bought it from Russia.
-# This was on 1867-10-18, a Friday; the previous day was 1867-10-06 Julian,
-# also a Friday.  Include only the time zone part of this transition,
-# ignoring the switch from Julian to Gregorian, since we can't represent
-# the Julian calendar.
-#
-# As far as we know, none of the exact locations mentioned below were
-# permanently inhabited in 1867 by anyone using either calendar.
-# (Yakutat was colonized by the Russians in 1799, but the settlement
-# was destroyed in 1805 by a Yakutat-kon war party.)  However, there
-# were nearby inhabitants in some cases and for our purposes perhaps
-# it's best to simply use the official transition.
-
-# From Paul Eggert (2014-07-18):
-# One opinion of the early-1980s turmoil in Alaska over time zones and
-# daylight saving time appeared as graffiti on a Juneau airport wall:
-# "Welcome to Juneau.  Please turn your watch back to the 19th century."
-# See: Turner W. Alaska's four time zones now two. NY Times 1983-11-01.
-# http://www.nytimes.com/1983/11/01/us/alaska-s-four-time-zones-now-two.html
-#
-# Steve Ferguson (2011-01-31) referred to the following source:
-# Norris F. Keeping time in Alaska: national directives, local response.
-# Alaska History 2001;16(1-2).
-# http://alaskahistoricalsociety.org/discover-alaska/glimpses-of-the-past/keeping-time-in-alaska/
-
-# From Arthur David Olson (2011-02-01):
-# Here's database-relevant material from the 2001 "Alaska History" article:
-#
-# On September 20 [1979]...DOT...officials decreed that on April 27,
-# 1980, Juneau and other nearby communities would move to Yukon Time.
-# Sitka, Petersburg, Wrangell, and Ketchikan, however, would remain on
-# Pacific Time.
-#
-# ...on September 22, 1980, DOT Secretary Neil E. Goldschmidt rescinded the
-# Department's September 1979 decision. Juneau and other communities in
-# northern Southeast reverted to Pacific Time on October 26.
-#
-# On October 28 [1983]...the Metlakatla Indian Community Council voted
-# unanimously to keep the reservation on Pacific Time.
-#
-# According to DOT official Joanne Petrie, Indian reservations are not
-# bound to follow time zones imposed by neighboring jurisdictions.
-#
-# (The last is consistent with how the database now handles the Navajo
-# Nation.)
-
-# From Arthur David Olson (2011-02-09):
-# I just spoke by phone with a staff member at the Metlakatla Indian
-# Community office (using contact information available at
-# http://www.commerce.state.ak.us/dca/commdb/CIS.cfm?Comm_Boro_name=Metlakatla
-# It's shortly after 1:00 here on the east coast of the United States;
-# the staffer said it was shortly after 10:00 there. When I asked whether
-# that meant they were on Pacific time, they said no - they were on their
-# own time. I asked about daylight saving; they said it wasn't used. I
-# did not inquire about practices in the past.
-
-# From Arthur David Olson (2011-08-17):
-# For lack of better information, assume that Metlakatla's
-# abandonment of use of daylight saving resulted from the 1983 vote.
-
-# From Steffen Thorsen (2015-11-09):
-# It seems Metlakatla did go off PST on Sunday, November 1, changing
-# their time to AKST and are going to follow Alaska's DST, switching
-# between AKST and AKDT from now on....
-# http://www.krbd.org/2015/10/30/annette-island-times-they-are-a-changing/
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Juneau	 15:02:19 -	LMT	1867 Oct 18
-			 -8:57:41 -	LMT	1900 Aug 20 12:00
-			 -8:00	-	PST	1942
-			 -8:00	US	P%sT	1946
-			 -8:00	-	PST	1969
-			 -8:00	US	P%sT	1980 Apr 27  2:00
-			 -9:00	US	Y%sT	1980 Oct 26  2:00
-			 -8:00	US	P%sT	1983 Oct 30  2:00
-			 -9:00	US	Y%sT	1983 Nov 30
-			 -9:00	US	AK%sT
-Zone America/Sitka	 14:58:47 -	LMT	1867 Oct 18
-			 -9:01:13 -	LMT	1900 Aug 20 12:00
-			 -8:00	-	PST	1942
-			 -8:00	US	P%sT	1946
-			 -8:00	-	PST	1969
-			 -8:00	US	P%sT	1983 Oct 30  2:00
-			 -9:00	US	Y%sT	1983 Nov 30
-			 -9:00	US	AK%sT
-Zone America/Metlakatla	 15:13:42 -	LMT	1867 Oct 18
-			 -8:46:18 -	LMT	1900 Aug 20 12:00
-			 -8:00	-	PST	1942
-			 -8:00	US	P%sT	1946
-			 -8:00	-	PST	1969
-			 -8:00	US	P%sT	1983 Oct 30  2:00
-			 -8:00	-	PST	2015 Nov  1  2:00
-			 -9:00	US	AK%sT
-Zone America/Yakutat	 14:41:05 -	LMT	1867 Oct 18
-			 -9:18:55 -	LMT	1900 Aug 20 12:00
-			 -9:00	-	YST	1942
-			 -9:00	US	Y%sT	1946
-			 -9:00	-	YST	1969
-			 -9:00	US	Y%sT	1983 Nov 30
-			 -9:00	US	AK%sT
-Zone America/Anchorage	 14:00:24 -	LMT	1867 Oct 18
-			 -9:59:36 -	LMT	1900 Aug 20 12:00
-			-10:00	-	AST	1942
-			-10:00	US	A%sT	1967 Apr
-			-10:00	-	AHST	1969
-			-10:00	US	AH%sT	1983 Oct 30  2:00
-			 -9:00	US	Y%sT	1983 Nov 30
-			 -9:00	US	AK%sT
-Zone America/Nome	 12:58:21 -	LMT	1867 Oct 18
-			-11:01:38 -	LMT	1900 Aug 20 12:00
-			-11:00	-	NST	1942
-			-11:00	US	N%sT	1946
-			-11:00	-	NST	1967 Apr
-			-11:00	-	BST	1969
-			-11:00	US	B%sT	1983 Oct 30  2:00
-			 -9:00	US	Y%sT	1983 Nov 30
-			 -9:00	US	AK%sT
-Zone America/Adak	 12:13:21 -	LMT	1867 Oct 18
-			-11:46:38 -	LMT	1900 Aug 20 12:00
-			-11:00	-	NST	1942
-			-11:00	US	N%sT	1946
-			-11:00	-	NST	1967 Apr
-			-11:00	-	BST	1969
-			-11:00	US	B%sT	1983 Oct 30  2:00
-			-10:00	US	AH%sT	1983 Nov 30
-			-10:00	US	H%sT
-# The following switches don't quite make our 1970 cutoff.
-#
-# Shanks writes that part of southwest Alaska (e.g. Aniak)
-# switched from -11:00 to -10:00 on 1968-09-22 at 02:00,
-# and another part (e.g. Akiak) made the same switch five weeks later.
-#
-# From David Flater (2004-11-09):
-# In e-mail, 2004-11-02, Ray Hudson, historian/liaison to the Unalaska
-# Historic Preservation Commission, provided this information, which
-# suggests that Unalaska deviated from statutory time from early 1967
-# possibly until 1983:
-#
-#  Minutes of the Unalaska City Council Meeting, January 10, 1967:
-#  "Except for St. Paul and Akutan, Unalaska is the only important
-#  location not on Alaska Standard Time.  The following resolution was
-#  made by William Robinson and seconded by Henry Swanson: Be it
-#  resolved that the City of Unalaska hereby goes to Alaska Standard
-#  Time as of midnight Friday, January 13, 1967 (1 A.M. Saturday,
-#  January 14, Alaska Standard Time.)  This resolution was passed with
-#  three votes for and one against."
-
-# Hawaii
-
-# From Arthur David Olson (2010-12-09):
-# "Hawaiian Time" by Robert C. Schmitt and Doak C. Cox appears on pages 207-225
-# of volume 26 of The Hawaiian Journal of History (1992). As of 2010-12-09,
-# the article is available at
-# http://evols.library.manoa.hawaii.edu/bitstream/10524/239/2/JL26215.pdf
-# and indicates that standard time was adopted effective noon, January
-# 13, 1896 (page 218), that in "1933, the Legislature decreed daylight
-# saving for the period between the last Sunday of each April and the
-# last Sunday of each September, but less than a month later repealed the
-# act," (page 220), that year-round daylight saving time was in effect
-# from 1942-02-09 to 1945-09-30 (page 221, with no time of day given for
-# when clocks changed) and that clocks were changed by 30 minutes
-# effective the second Sunday of June, 1947 (page 219, with no time of
-# day given for when clocks changed). A footnote for the 1933 changes
-# cites Session Laws of Hawaii 1933, "Act. 90 (approved 26 Apr. 1933)
-# and Act 163 (approved 21 May 1933)."
-
-# From Arthur David Olson (2011-01-19):
-# The following is from "Laws of the Territory of Hawaii Passed by the
-# Seventeenth Legislature: Regular Session 1933," available (as of
-# 2011-01-19) at American University's Pence Law Library. Page 85: "Act
-# 90...At 2 o'clock ante meridian of the last Sunday in April of each
-# year, the standard time of this Territory shall be advanced one
-# hour...This Act shall take effect upon its approval. Approved this 26th
-# day of April, A. D. 1933. LAWRENCE M JUDD, Governor of the Territory of
-# Hawaii." Page 172: "Act 163...Act 90 of the Session Laws of 1933 is
-# hereby repealed...This Act shall take effect upon its approval, upon
-# which date the standard time of this Territory shall be restored to
-# that existing immediately prior to the taking effect of said Act 90.
-# Approved this 21st day of May, A. D. 1933. LAWRENCE M. JUDD, Governor
-# of the Territory of Hawaii."
-#
-# Note that 1933-05-21 was a Sunday.
-# We're left to guess the time of day when Act 163 was approved; guess noon.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Pacific/Honolulu	-10:31:26 -	LMT	1896 Jan 13 12:00
-			-10:30	-	HST	1933 Apr 30  2:00
-			-10:30	1:00	HDT	1933 May 21 12:00
-			-10:30	-	HST	1942 Feb  9  2:00
-			-10:30	1:00	HDT	1945 Sep 30  2:00
-			-10:30	-	HST	1947 Jun  8  2:00
-			-10:00	-	HST
-
-# Now we turn to US areas that have diverged from the consensus since 1970.
-
-# Arizona mostly uses MST.
-
-# From Paul Eggert (2002-10-20):
-#
-# The information in the rest of this paragraph is derived from the
-# Daylight Saving Time web page
-# <http://www.dlapr.lib.az.us/links/daylight.htm> (2002-01-23)
-# maintained by the Arizona State Library, Archives and Public Records.
-# Between 1944-01-01 and 1944-04-01 the State of Arizona used standard
-# time, but by federal law railroads, airlines, bus lines, military
-# personnel, and some engaged in interstate commerce continued to
-# observe war (i.e., daylight saving) time.  The 1944-03-17 Phoenix
-# Gazette says that was the date the law changed, and that 04-01 was
-# the date the state's clocks would change.  In 1945 the State of
-# Arizona used standard time all year, again with exceptions only as
-# mandated by federal law.  Arizona observed DST in 1967, but Arizona
-# Laws 1968, ch. 183 (effective 1968-03-21) repealed DST.
-#
-# Shanks says the 1944 experiment came to an end on 1944-03-17.
-# Go with the Arizona State Library instead.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Phoenix	-7:28:18 -	LMT	1883 Nov 18 11:31:42
-			-7:00	US	M%sT	1944 Jan  1  0:01
-			-7:00	-	MST	1944 Apr  1  0:01
-			-7:00	US	M%sT	1944 Oct  1  0:01
-			-7:00	-	MST	1967
-			-7:00	US	M%sT	1968 Mar 21
-			-7:00	-	MST
-# From Arthur David Olson (1988-02-13):
-# A writer from the Inter Tribal Council of Arizona, Inc.,
-# notes in private correspondence dated 1987-12-28 that "Presently, only the
-# Navajo Nation participates in the Daylight Saving Time policy, due to its
-# large size and location in three states."  (The "only" means that other
-# tribal nations don't use DST.)
-#
-# From Paul Eggert (2013-08-26):
-# See America/Denver for a zone appropriate for the Navajo Nation.
-
-# Southern Idaho (Ada, Adams, Bannock, Bear Lake, Bingham, Blaine,
-# Boise, Bonneville, Butte, Camas, Canyon, Caribou, Cassia, Clark,
-# Custer, Elmore, Franklin, Fremont, Gem, Gooding, Jefferson, Jerome,
-# Lemhi, Lincoln, Madison, Minidoka, Oneida, Owyhee, Payette, Power,
-# Teton, Twin Falls, Valley, Washington counties, and the southern
-# quarter of Idaho county) and eastern Oregon (most of Malheur County)
-# switched four weeks late in 1974.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Boise	-7:44:49 -	LMT	1883 Nov 18 12:15:11
-			-8:00	US	P%sT	1923 May 13  2:00
-			-7:00	US	M%sT	1974
-			-7:00	-	MST	1974 Feb  3  2:00
-			-7:00	US	M%sT
-
-# Indiana
-#
-# For a map of Indiana's time zone regions, see:
-# http://en.wikipedia.org/wiki/Time_in_Indiana
-#
-# From Paul Eggert (2007-08-17):
-# Since 1970, most of Indiana has been like America/Indiana/Indianapolis,
-# with the following exceptions:
-#
-# - Gibson, Jasper, Lake, LaPorte, Newton, Porter, Posey, Spencer,
-#   Vanderburgh, and Warrick counties have been like America/Chicago.
-#
-# - Dearborn and Ohio counties have been like America/New_York.
-#
-# - Clark, Floyd, and Harrison counties have been like
-#   America/Kentucky/Louisville.
-#
-# - Crawford, Daviess, Dubois, Knox, Martin, Perry, Pike, Pulaski, Starke,
-#   and Switzerland counties have their own time zone histories as noted below.
-#
-# Shanks partitioned Indiana into 345 regions, each with its own time history,
-# and wrote "Even newspaper reports present contradictory information."
-# Those Hoosiers!  Such a flighty and changeable people!
-# Fortunately, most of the complexity occurred before our cutoff date of 1970.
-#
-# Other than Indianapolis, the Indiana place names are so nondescript
-# that they would be ambiguous if we left them at the 'America' level.
-# So we reluctantly put them all in a subdirectory 'America/Indiana'.
-
-# From Paul Eggert (2014-06-26):
-# https://www.federalregister.gov/articles/2006/01/20/06-563/standard-time-zone-boundary-in-the-state-of-indiana
-# says "DOT is relocating the time zone boundary in Indiana to move Starke,
-# Pulaski, Knox, Daviess, Martin, Pike, Dubois, and Perry Counties from the
-# Eastern Time Zone to the Central Time Zone.... The effective date of
-# this rule is 2 a.m. EST Sunday, April 2, 2006, which is the
-# changeover date from standard time to Daylight Saving Time."
-# Strictly speaking, this meant the affected counties changed their
-# clocks twice that night, but this obviously was in error.  The intent
-# was that 01:59:59 EST be followed by 02:00:00 CDT.
-
-# From Gwillim Law (2007-02-10):
-# The Associated Press has been reporting that Pulaski County, Indiana is
-# going to switch from Central to Eastern Time on March 11, 2007....
-# http://www.indystar.com/apps/pbcs.dll/article?AID=/20070207/LOCAL190108/702070524/0/LOCAL
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Indianapolis 1941	only	-	Jun	22	2:00	1:00	D
-Rule Indianapolis 1941	1954	-	Sep	lastSun	2:00	0	S
-Rule Indianapolis 1946	1954	-	Apr	lastSun	2:00	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Indianapolis -5:44:38 - LMT	1883 Nov 18 12:15:22
-			-6:00	US	C%sT	1920
-			-6:00 Indianapolis C%sT	1942
-			-6:00	US	C%sT	1946
-			-6:00 Indianapolis C%sT	1955 Apr 24  2:00
-			-5:00	-	EST	1957 Sep 29  2:00
-			-6:00	-	CST	1958 Apr 27  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1971
-			-5:00	-	EST	2006
-			-5:00	US	E%sT
-#
-# Eastern Crawford County, Indiana, left its clocks alone in 1974,
-# as well as from 1976 through 2005.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Marengo	1951	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Marengo	1951	only	-	Sep	lastSun	2:00	0	S
-Rule	Marengo	1954	1960	-	Apr	lastSun	2:00	1:00	D
-Rule	Marengo	1954	1960	-	Sep	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Marengo -5:45:23 -	LMT	1883 Nov 18 12:14:37
-			-6:00	US	C%sT	1951
-			-6:00	Marengo	C%sT	1961 Apr 30  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1974 Jan  6  2:00
-			-6:00	1:00	CDT	1974 Oct 27  2:00
-			-5:00	US	E%sT	1976
-			-5:00	-	EST	2006
-			-5:00	US	E%sT
-#
-# Daviess, Dubois, Knox, and Martin Counties, Indiana,
-# switched from eastern to central time in April 2006, then switched back
-# in November 2007.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Vincennes	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1953	1954	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1953	1959	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1955	only	-	May	 1	0:00	1:00	D
-Rule Vincennes	1956	1963	-	Apr	lastSun	2:00	1:00	D
-Rule Vincennes	1960	only	-	Oct	lastSun	2:00	0	S
-Rule Vincennes	1961	only	-	Sep	lastSun	2:00	0	S
-Rule Vincennes	1962	1963	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vincennes -5:50:07 - LMT	1883 Nov 18 12:09:53
-			-6:00	US	C%sT	1946
-			-6:00 Vincennes	C%sT	1964 Apr 26  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1971
-			-5:00	-	EST	2006 Apr  2  2:00
-			-6:00	US	C%sT	2007 Nov  4  2:00
-			-5:00	US	E%sT
-#
-# Perry County, Indiana, switched from eastern to central time in April 2006.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Perry	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Perry	1953	1954	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1953	1959	-	Sep	lastSun	2:00	0	S
-Rule Perry	1955	only	-	May	 1	0:00	1:00	D
-Rule Perry	1956	1963	-	Apr	lastSun	2:00	1:00	D
-Rule Perry	1960	only	-	Oct	lastSun	2:00	0	S
-Rule Perry	1961	only	-	Sep	lastSun	2:00	0	S
-Rule Perry	1962	1963	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Tell_City -5:47:03 - LMT	1883 Nov 18 12:12:57
-			-6:00	US	C%sT	1946
-			-6:00 Perry	C%sT	1964 Apr 26  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1971
-			-5:00	-	EST	2006 Apr  2  2:00
-			-6:00	US	C%sT
-#
-# Pike County, Indiana moved from central to eastern time in 1977,
-# then switched back in 2006, then switched back again in 2007.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Pike	1955	only	-	May	 1	0:00	1:00	D
-Rule	Pike	1955	1960	-	Sep	lastSun	2:00	0	S
-Rule	Pike	1956	1964	-	Apr	lastSun	2:00	1:00	D
-Rule	Pike	1961	1964	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Petersburg -5:49:07 - LMT	1883 Nov 18 12:10:53
-			-6:00	US	C%sT	1955
-			-6:00	Pike	C%sT	1965 Apr 25  2:00
-			-5:00	-	EST	1966 Oct 30  2:00
-			-6:00	US	C%sT	1977 Oct 30  2:00
-			-5:00	-	EST	2006 Apr  2  2:00
-			-6:00	US	C%sT	2007 Nov  4  2:00
-			-5:00	US	E%sT
-#
-# Starke County, Indiana moved from central to eastern time in 1991,
-# then switched back in 2006.
-# From Arthur David Olson (1991-10-28):
-# An article on page A3 of the Sunday, 1991-10-27 Washington Post
-# notes that Starke County switched from Central time to Eastern time as of
-# 1991-10-27.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Starke	1947	1961	-	Apr	lastSun	2:00	1:00	D
-Rule	Starke	1947	1954	-	Sep	lastSun	2:00	0	S
-Rule	Starke	1955	1956	-	Oct	lastSun	2:00	0	S
-Rule	Starke	1957	1958	-	Sep	lastSun	2:00	0	S
-Rule	Starke	1959	1961	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Knox -5:46:30 -	LMT	1883 Nov 18 12:13:30
-			-6:00	US	C%sT	1947
-			-6:00	Starke	C%sT	1962 Apr 29  2:00
-			-5:00	-	EST	1963 Oct 27  2:00
-			-6:00	US	C%sT	1991 Oct 27  2:00
-			-5:00	-	EST	2006 Apr  2  2:00
-			-6:00	US	C%sT
-#
-# Pulaski County, Indiana, switched from eastern to central time in
-# April 2006 and then switched back in March 2007.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Pulaski	1946	1960	-	Apr	lastSun	2:00	1:00	D
-Rule	Pulaski	1946	1954	-	Sep	lastSun	2:00	0	S
-Rule	Pulaski	1955	1956	-	Oct	lastSun	2:00	0	S
-Rule	Pulaski	1957	1960	-	Sep	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Winamac -5:46:25 - LMT	1883 Nov 18 12:13:35
-			-6:00	US	C%sT	1946
-			-6:00	Pulaski	C%sT	1961 Apr 30  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1971
-			-5:00	-	EST	2006 Apr  2  2:00
-			-6:00	US	C%sT	2007 Mar 11  2:00
-			-5:00	US	E%sT
-#
-# Switzerland County, Indiana, did not observe DST from 1973 through 2005.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Indiana/Vevay -5:40:16 -	LMT	1883 Nov 18 12:19:44
-			-6:00	US	C%sT	1954 Apr 25  2:00
-			-5:00	-	EST	1969
-			-5:00	US	E%sT	1973
-			-5:00	-	EST	2006
-			-5:00	US	E%sT
-
-# Part of Kentucky left its clocks alone in 1974.
-# This also includes Clark, Floyd, and Harrison counties in Indiana.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Louisville	1921	only	-	May	1	2:00	1:00	D
-Rule Louisville	1921	only	-	Sep	1	2:00	0	S
-Rule Louisville	1941	1961	-	Apr	lastSun	2:00	1:00	D
-Rule Louisville	1941	only	-	Sep	lastSun	2:00	0	S
-Rule Louisville	1946	only	-	Jun	2	2:00	0	S
-Rule Louisville	1950	1955	-	Sep	lastSun	2:00	0	S
-Rule Louisville	1956	1960	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Kentucky/Louisville -5:43:02 -	LMT	1883 Nov 18 12:16:58
-			-6:00	US	C%sT	1921
-			-6:00 Louisville C%sT	1942
-			-6:00	US	C%sT	1946
-			-6:00 Louisville C%sT	1961 Jul 23  2:00
-			-5:00	-	EST	1968
-			-5:00	US	E%sT	1974 Jan  6  2:00
-			-6:00	1:00	CDT	1974 Oct 27  2:00
-			-5:00	US	E%sT
-#
-# Wayne County, Kentucky
-#
-# From Lake Cumberland LIFE
-# http://www.lake-cumberland.com/life/archive/news990129time.shtml
-# (1999-01-29) via WKYM-101.7:
-# Clinton County has joined Wayne County in asking the DoT to change from
-# the Central to the Eastern time zone....  The Wayne County government made
-# the same request in December.  And while Russell County officials have not
-# taken action, the majority of respondents to a poll conducted there in
-# August indicated they would like to change to "fast time" also.
-# The three Lake Cumberland counties are the farthest east of any U.S.
-# location in the Central time zone.
-#
-# From Rich Wales (2000-08-29):
-# After prolonged debate, and despite continuing deep differences of opinion,
-# Wayne County (central Kentucky) is switching from Central (-0600) to Eastern
-# (-0500) time.  They won't "fall back" this year.  See Sara Shipley,
-# The difference an hour makes, Nando Times (2000-08-29 15:33 -0400).
-#
-# From Paul Eggert (2001-07-16):
-# The final rule was published in the
-# Federal Register 65, 160 (2000-08-17), pp 50154-50158.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=2000_register&docid=fr17au00-22
-#
-Zone America/Kentucky/Monticello -5:39:24 - LMT	1883 Nov 18 12:20:36
-			-6:00	US	C%sT	1946
-			-6:00	-	CST	1968
-			-6:00	US	C%sT	2000 Oct 29  2:00
-			-5:00	US	E%sT
-
-
-# From Rives McDow (2000-08-30):
-# Here ... are all the changes in the US since 1985.
-# Kearny County, KS (put all of county on central;
-#	previously split between MST and CST) ... 1990-10
-# Starke County, IN (from CST to EST) ... 1991-10
-# Oliver County, ND (from MST to CST) ... 1992-10
-# West Wendover, NV (from PST TO MST) ... 1999-10
-# Wayne County, KY (from CST to EST) ... 2000-10
-#
-# From Paul Eggert (2001-07-17):
-# We don't know where the line used to be within Kearny County, KS,
-# so omit that change for now.
-# See America/Indiana/Knox for the Starke County, IN change.
-# See America/North_Dakota/Center for the Oliver County, ND change.
-# West Wendover, NV officially switched from Pacific to mountain time on
-# 1999-10-31.  See the
-# Federal Register 64, 203 (1999-10-21), pp 56705-56707.
-# http://frwebgate.access.gpo.gov/cgi-bin/getdoc.cgi?dbname=1999_register&docid=fr21oc99-15
-# However, the Federal Register says that West Wendover already operated
-# on mountain time, and the rule merely made this official;
-# hence a separate tz entry is not needed.
-
-# Michigan
-#
-# From Bob Devine (1988-01-28):
-# Michigan didn't observe DST from 1968 to 1973.
-#
-# From Paul Eggert (1999-03-31):
-# Shanks writes that Michigan started using standard time on 1885-09-18,
-# but Howse writes (pp 124-125, referring to Popular Astronomy, 1901-01)
-# that Detroit kept
-#
-#	local time until 1900 when the City Council decreed that clocks should
-#	be put back twenty-eight minutes to Central Standard Time.  Half the
-#	city obeyed, half refused.  After considerable debate, the decision
-#	was rescinded and the city reverted to Sun time.  A derisive offer to
-#	erect a sundial in front of the city hall was referred to the
-#	Committee on Sewers.  Then, in 1905, Central time was adopted
-#	by city vote.
-#
-# This story is too entertaining to be false, so go with Howse over Shanks.
-#
-# From Paul Eggert (2001-03-06):
-# Garland (1927) writes "Cleveland and Detroit advanced their clocks
-# one hour in 1914."  This change is not in Shanks.  We have no more
-# info, so omit this for now.
-#
-# Most of Michigan observed DST from 1973 on, but was a bit late in 1975.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule	Detroit	1948	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Detroit	1948	only	-	Sep	lastSun	2:00	0	S
-Rule	Detroit	1967	only	-	Jun	14	2:00	1:00	D
-Rule	Detroit	1967	only	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Detroit	-5:32:11 -	LMT	1905
-			-6:00	-	CST	1915 May 15  2:00
-			-5:00	-	EST	1942
-			-5:00	US	E%sT	1946
-			-5:00	Detroit	E%sT	1973
-			-5:00	US	E%sT	1975
-			-5:00	-	EST	1975 Apr 27  2:00
-			-5:00	US	E%sT
-#
-# Dickinson, Gogebic, Iron, and Menominee Counties, Michigan,
-# switched from EST to CST/CDT in 1973.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER
-Rule Menominee	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule Menominee	1946	only	-	Sep	lastSun	2:00	0	S
-Rule Menominee	1966	only	-	Apr	lastSun	2:00	1:00	D
-Rule Menominee	1966	only	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Menominee	-5:50:27 -	LMT	1885 Sep 18 12:00
-			-6:00	US	C%sT	1946
-			-6:00 Menominee	C%sT	1969 Apr 27  2:00
-			-5:00	-	EST	1973 Apr 29  2:00
-			-6:00	US	C%sT
-
-# Navassa
-# administered by the US Fish and Wildlife Service
-# claimed by US under the provisions of the 1856 Guano Islands Act
-# also claimed by Haiti
-# occupied 1857/1900 by the Navassa Phosphate Co
-# US lighthouse 1917/1996-09
-# currently uninhabited
-# see Mark Fineman, "An Isle Rich in Guano and Discord",
-# _Los Angeles Times_ (1998-11-10), A1, A10; it cites
-# Jimmy Skaggs, _The Great Guano Rush_ (1994).
-
-################################################################################
-
-
-# From Paul Eggert (2017-02-10):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# Other sources occasionally used include:
-#
-#	Edward W. Whitman, World Time Differences,
-#	Whitman Publishing Co, 2 Niagara Av, Ealing, London (undated),
-#	which I found in the UCLA library.
-#
-#	William Willett, The Waste of Daylight, 19th edition
-#	<http://cs.ucla.edu/~eggert/The-Waste-of-Daylight-19th.pdf>
-#	[PDF] (1914-03)
-#
-#	Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94
-#	<http://www.jstor.org/stable/1774359>.
-#
-# See the 'europe' file for Greenland.
-
-# Canada
-
-# From Alain LaBonté (1994-11-14):
-# I post here the time zone abbreviations standardized in Canada
-# for both English and French in the CAN/CSA-Z234.4-89 standard....
-#
-#	UTC	Standard time	Daylight saving time
-#	offset	French	English	French	English
-#	-2:30	-	-	HAT	NDT
-#	-3	-	-	HAA	ADT
-#	-3:30	HNT	NST	-	-
-#	-4	HNA	AST	HAE	EDT
-#	-5	HNE	EST	HAC	CDT
-#	-6	HNC	CST	HAR	MDT
-#	-7	HNR	MST	HAP	PDT
-#	-8	HNP	PST	HAY	YDT
-#	-9	HNY	YST	-	-
-#
-#	HN: Heure Normale	ST: Standard Time
-#	HA: Heure Avancée	DT: Daylight saving Time
-#
-#	A: de l'Atlantique	Atlantic
-#	C: du Centre		Central
-#	E: de l'Est		Eastern
-#	M:			Mountain
-#	N:			Newfoundland
-#	P: du Pacifique		Pacific
-#	R: des Rocheuses
-#	T: de Terre-Neuve
-#	Y: du Yukon		Yukon
-#
-# From Paul Eggert (1994-11-22):
-# Alas, this sort of thing must be handled by localization software.
-
-# Unless otherwise specified, the data entries for Canada are all from Shanks
-# & Pottenger.
-
-# From Chris Walton (2006-04-01, 2006-04-25, 2006-06-26, 2007-01-31,
-# 2007-03-01):
-# The British Columbia government announced yesterday that it will
-# adjust daylight savings next year to align with changes in the
-# U.S. and the rest of Canada....
-# http://www2.news.gov.bc.ca/news_releases_2005-2009/2006AG0014-000330.htm
-# ...
-# Nova Scotia
-# Daylight saving time will be extended by four weeks starting in 2007....
-# http://www.gov.ns.ca/just/regulations/rg2/2006/ma1206.pdf
-#
-# [For New Brunswick] the new legislation dictates that the time change is to
-# be done at 02:00 instead of 00:01.
-# http://www.gnb.ca/0062/acts/BBA-2006/Chap-19.pdf
-# ...
-# Manitoba has traditionally changed the clock every fall at 03:00.
-# As of 2006, the transition is to take place one hour earlier at 02:00.
-# http://web2.gov.mb.ca/laws/statutes/ccsm/o030e.php
-# ...
-# [Alberta, Ontario, Quebec] will follow US rules.
-# http://www.qp.gov.ab.ca/documents/spring/CH03_06.CFM
-# http://www.e-laws.gov.on.ca/DBLaws/Source/Regs/English/2006/R06111_e.htm
-# http://www2.publicationsduquebec.gouv.qc.ca/dynamicSearch/telecharge.php?type=5&file=2006C39A.PDF
-# ...
-# P.E.I. will follow US rules....
-# http://www.assembly.pe.ca/bills/pdf_chapter/62/3/chapter-41.pdf
-# ...
-# Province of Newfoundland and Labrador....
-# http://www.hoa.gov.nl.ca/hoa/bills/Bill0634.htm
-# ...
-# Yukon
-# http://www.gov.yk.ca/legislation/regs/oic2006_127.pdf
-# ...
-# N.W.T. will follow US rules.  Whoever maintains the government web site
-# does not seem to believe in bookmarks.  To see the news release, click the
-# following link and search for "Daylight Savings Time Change".  Press the
-# "Daylight Savings Time Change" link; it will fire off a popup using
-# JavaScript.
-# http://www.exec.gov.nt.ca/currentnews/currentPR.asp?mode=archive
-# ...
-# Nunavut
-# An amendment to the Interpretation Act was registered on February 19/2007....
-# http://action.attavik.ca/home/justice-gn/attach/2007/gaz02part2.pdf
-
-# From Paul Eggert (2014-10-18):
-# H. David Matthews and Mary Vincent's map
-# "It's about TIME", _Canadian Geographic_ (September-October 1998)
-# http://www.canadiangeographic.ca/Magazine/SO98/alacarte.asp
-# contains detailed boundaries for regions observing nonstandard
-# time and daylight saving time arrangements in Canada circa 1998.
-#
-# National Research Council Canada maintains info about time zones and DST.
-# http://www.nrc-cnrc.gc.ca/eng/services/time/time_zones.html
-# http://www.nrc-cnrc.gc.ca/eng/services/time/faq/index.html#Q5
-# Its unofficial information is often taken from Matthews and Vincent.
-
-# From Paul Eggert (2006-06-27):
-# For now, assume all of DST-observing Canada will fall into line with the
-# new US DST rules,
-
-# From Chris Walton (2011-12-01)
-# In the first of Tammy Hardwick's articles
-# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
-# she quotes the Friday November 1/1918 edition of the Creston Review.
-# The quote includes these two statements:
-# 'Sunday the CPR went back to the old system of time...'
-# '... The daylight saving scheme was dropped all over Canada at the same time,'
-# These statements refer to a transition from daylight time to standard time
-# that occurred nationally on Sunday October 27/1918.  This transition was
-# also documented in the Saturday October 26/1918 edition of the Toronto Star.
-
-# In light of that evidence, we alter the date from the earlier believed
-# Oct 31, to Oct 27, 1918 (and Sunday is a more likely transition day
-# than Thursday) in all Canadian rulesets.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Canada	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Canada	1918	only	-	Oct	27	2:00	0	S
-Rule	Canada	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	Canada	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Canada	1945	only	-	Sep	30	2:00	0	S
-Rule	Canada	1974	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Canada	1974	2006	-	Oct	lastSun	2:00	0	S
-Rule	Canada	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Canada	2007	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Canada	2007	max	-	Nov	Sun>=1	2:00	0	S
-
-
-# Newfoundland and Labrador
-
-# From Paul Eggert (2000-10-02):
-# Matthews and Vincent (1998) write that Labrador should use NST/NDT,
-# but the only part of Labrador that follows the rules is the
-# southeast corner, including Port Hope Simpson and Mary's Harbour,
-# but excluding, say, Black Tickle.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	StJohns	1917	only	-	Apr	 8	2:00	1:00	D
-Rule	StJohns	1917	only	-	Sep	17	2:00	0	S
-# Whitman gives 1919 Apr 5 and 1920 Apr 5; go with Shanks & Pottenger.
-Rule	StJohns	1919	only	-	May	 5	23:00	1:00	D
-Rule	StJohns	1919	only	-	Aug	12	23:00	0	S
-# For 1931-1935 Whitman gives Apr same date; go with Shanks & Pottenger.
-Rule	StJohns	1920	1935	-	May	Sun>=1	23:00	1:00	D
-Rule	StJohns	1920	1935	-	Oct	lastSun	23:00	0	S
-# For 1936-1941 Whitman gives May Sun>=8 and Oct Sun>=1; go with Shanks &
-# Pottenger.
-Rule	StJohns	1936	1941	-	May	Mon>=9	0:00	1:00	D
-Rule	StJohns	1936	1941	-	Oct	Mon>=2	0:00	0	S
-# Whitman gives the following transitions:
-# 1942 03-01/12-31, 1943 05-30/09-05, 1944 07-10/09-02, 1945 01-01/10-07
-# but go with Shanks & Pottenger and assume they used Canadian rules.
-# For 1946-9 Whitman gives May 5,4,9,1 - Oct 1,5,3,2, and for 1950 he gives
-# Apr 30 - Sep 24; go with Shanks & Pottenger.
-Rule	StJohns	1946	1950	-	May	Sun>=8	2:00	1:00	D
-Rule	StJohns	1946	1950	-	Oct	Sun>=2	2:00	0	S
-Rule	StJohns	1951	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	StJohns	1951	1959	-	Sep	lastSun	2:00	0	S
-Rule	StJohns	1960	1986	-	Oct	lastSun	2:00	0	S
-# From Paul Eggert (2000-10-02):
-# INMS (2000-09-12) says that, since 1988 at least, Newfoundland switches
-# at 00:01 local time.  For now, assume it started in 1987.
-
-# From Michael Pelley (2011-09-12):
-# We received today, Monday, September 12, 2011, notification that the
-# changes to the Newfoundland Standard Time Act have been proclaimed.
-# The change in the Act stipulates that the change from Daylight Savings
-# Time to Standard Time and from Standard Time to Daylight Savings Time
-# now occurs at 2:00AM.
-# ...
-# http://www.assembly.nl.ca/legislation/sr/annualstatutes/2011/1106.chp.htm
-# ...
-# MICHAEL PELLEY  |  Manager of Enterprise Architecture - Solution Delivery
-# Office of the Chief Information Officer
-# Executive Council
-# Government of Newfoundland & Labrador
-
-Rule	StJohns	1987	only	-	Apr	Sun>=1	0:01	1:00	D
-Rule	StJohns	1987	2006	-	Oct	lastSun	0:01	0	S
-Rule	StJohns	1988	only	-	Apr	Sun>=1	0:01	2:00	DD
-Rule	StJohns	1989	2006	-	Apr	Sun>=1	0:01	1:00	D
-Rule	StJohns	2007	2011	-	Mar	Sun>=8	0:01	1:00	D
-Rule	StJohns	2007	2010	-	Nov	Sun>=1	0:01	0	S
-#
-# St John's has an apostrophe, but Posix file names can't have apostrophes.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/St_Johns	-3:30:52 -	LMT	1884
-			-3:30:52 StJohns N%sT	1918
-			-3:30:52 Canada	N%sT	1919
-			-3:30:52 StJohns N%sT	1935 Mar 30
-			-3:30	StJohns	N%sT	1942 May 11
-			-3:30	Canada	N%sT	1946
-			-3:30	StJohns	N%sT	2011 Nov
-			-3:30	Canada	N%sT
-
-# most of east Labrador
-
-# The name 'Happy Valley-Goose Bay' is too long; use 'Goose Bay'.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Goose_Bay	-4:01:40 -	LMT	1884 # Happy Valley-Goose Bay
-			-3:30:52 -	NST	1918
-			-3:30:52 Canada N%sT	1919
-			-3:30:52 -	NST	1935 Mar 30
-			-3:30	-	NST	1936
-			-3:30	StJohns	N%sT	1942 May 11
-			-3:30	Canada	N%sT	1946
-			-3:30	StJohns	N%sT	1966 Mar 15  2:00
-			-4:00	StJohns	A%sT	2011 Nov
-			-4:00	Canada	A%sT
-
-
-# west Labrador, Nova Scotia, Prince Edward I
-
-# From Brian Inglis (2015-07-20):
-# From the historical weather station records available at:
-# https://weatherspark.com/history/28351/1971/Sydney-Nova-Scotia-Canada
-# Sydney shares the same time history as Glace Bay, so was
-# likely to be the same across the island....
-# Sydney, as the capital and most populous location, or Cape Breton, would
-# have been better names for the zone had we known this in 1996.
-
-# From Paul Eggert (2015-07-20):
-# Shanks & Pottenger write that since 1970 most of this region has been like
-# Halifax.  Many locales did not observe peacetime DST until 1972;
-# the Cape Breton area, represented by Glace Bay, is the largest we know of
-# (Glace Bay was perhaps not the best name choice but no point changing now).
-# Shanks & Pottenger also write that Liverpool, NS was the only town
-# in Canada to observe DST in 1971 but not 1970; for now we'll assume
-# this is a typo.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Halifax	1916	only	-	Apr	 1	0:00	1:00	D
-Rule	Halifax	1916	only	-	Oct	 1	0:00	0	S
-Rule	Halifax	1920	only	-	May	 9	0:00	1:00	D
-Rule	Halifax	1920	only	-	Aug	29	0:00	0	S
-Rule	Halifax	1921	only	-	May	 6	0:00	1:00	D
-Rule	Halifax	1921	1922	-	Sep	 5	0:00	0	S
-Rule	Halifax	1922	only	-	Apr	30	0:00	1:00	D
-Rule	Halifax	1923	1925	-	May	Sun>=1	0:00	1:00	D
-Rule	Halifax	1923	only	-	Sep	 4	0:00	0	S
-Rule	Halifax	1924	only	-	Sep	15	0:00	0	S
-Rule	Halifax	1925	only	-	Sep	28	0:00	0	S
-Rule	Halifax	1926	only	-	May	16	0:00	1:00	D
-Rule	Halifax	1926	only	-	Sep	13	0:00	0	S
-Rule	Halifax	1927	only	-	May	 1	0:00	1:00	D
-Rule	Halifax	1927	only	-	Sep	26	0:00	0	S
-Rule	Halifax	1928	1931	-	May	Sun>=8	0:00	1:00	D
-Rule	Halifax	1928	only	-	Sep	 9	0:00	0	S
-Rule	Halifax	1929	only	-	Sep	 3	0:00	0	S
-Rule	Halifax	1930	only	-	Sep	15	0:00	0	S
-Rule	Halifax	1931	1932	-	Sep	Mon>=24	0:00	0	S
-Rule	Halifax	1932	only	-	May	 1	0:00	1:00	D
-Rule	Halifax	1933	only	-	Apr	30	0:00	1:00	D
-Rule	Halifax	1933	only	-	Oct	 2	0:00	0	S
-Rule	Halifax	1934	only	-	May	20	0:00	1:00	D
-Rule	Halifax	1934	only	-	Sep	16	0:00	0	S
-Rule	Halifax	1935	only	-	Jun	 2	0:00	1:00	D
-Rule	Halifax	1935	only	-	Sep	30	0:00	0	S
-Rule	Halifax	1936	only	-	Jun	 1	0:00	1:00	D
-Rule	Halifax	1936	only	-	Sep	14	0:00	0	S
-Rule	Halifax	1937	1938	-	May	Sun>=1	0:00	1:00	D
-Rule	Halifax	1937	1941	-	Sep	Mon>=24	0:00	0	S
-Rule	Halifax	1939	only	-	May	28	0:00	1:00	D
-Rule	Halifax	1940	1941	-	May	Sun>=1	0:00	1:00	D
-Rule	Halifax	1946	1949	-	Apr	lastSun	2:00	1:00	D
-Rule	Halifax	1946	1949	-	Sep	lastSun	2:00	0	S
-Rule	Halifax	1951	1954	-	Apr	lastSun	2:00	1:00	D
-Rule	Halifax	1951	1954	-	Sep	lastSun	2:00	0	S
-Rule	Halifax	1956	1959	-	Apr	lastSun	2:00	1:00	D
-Rule	Halifax	1956	1959	-	Sep	lastSun	2:00	0	S
-Rule	Halifax	1962	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Halifax	1962	1973	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Halifax	-4:14:24 -	LMT	1902 Jun 15
-			-4:00	Halifax	A%sT	1918
-			-4:00	Canada	A%sT	1919
-			-4:00	Halifax	A%sT	1942 Feb  9  2:00s
-			-4:00	Canada	A%sT	1946
-			-4:00	Halifax	A%sT	1974
-			-4:00	Canada	A%sT
-Zone America/Glace_Bay	-3:59:48 -	LMT	1902 Jun 15
-			-4:00	Canada	A%sT	1953
-			-4:00	Halifax	A%sT	1954
-			-4:00	-	AST	1972
-			-4:00	Halifax	A%sT	1974
-			-4:00	Canada	A%sT
-
-# New Brunswick
-
-# From Paul Eggert (2007-01-31):
-# The Time Definition Act <http://www.gnb.ca/0062/PDF-acts/t-06.pdf>
-# says they changed at 00:01 through 2006, and
-# <http://www.canlii.org/nb/laws/sta/t-6/20030127/whole.html> makes it
-# clear that this was the case since at least 1993.
-# For now, assume it started in 1993.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Moncton	1933	1935	-	Jun	Sun>=8	1:00	1:00	D
-Rule	Moncton	1933	1935	-	Sep	Sun>=8	1:00	0	S
-Rule	Moncton	1936	1938	-	Jun	Sun>=1	1:00	1:00	D
-Rule	Moncton	1936	1938	-	Sep	Sun>=1	1:00	0	S
-Rule	Moncton	1939	only	-	May	27	1:00	1:00	D
-Rule	Moncton	1939	1941	-	Sep	Sat>=21	1:00	0	S
-Rule	Moncton	1940	only	-	May	19	1:00	1:00	D
-Rule	Moncton	1941	only	-	May	 4	1:00	1:00	D
-Rule	Moncton	1946	1972	-	Apr	lastSun	2:00	1:00	D
-Rule	Moncton	1946	1956	-	Sep	lastSun	2:00	0	S
-Rule	Moncton	1957	1972	-	Oct	lastSun	2:00	0	S
-Rule	Moncton	1993	2006	-	Apr	Sun>=1	0:01	1:00	D
-Rule	Moncton	1993	2006	-	Oct	lastSun	0:01	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Moncton	-4:19:08 -	LMT	1883 Dec  9
-			-5:00	-	EST	1902 Jun 15
-			-4:00	Canada	A%sT	1933
-			-4:00	Moncton	A%sT	1942
-			-4:00	Canada	A%sT	1946
-			-4:00	Moncton	A%sT	1973
-			-4:00	Canada	A%sT	1993
-			-4:00	Moncton	A%sT	2007
-			-4:00	Canada	A%sT
-
-# Quebec
-
-# From Paul Eggert (2015-03-24):
-# See America/Toronto for most of Quebec, including Montreal.
-#
-# Matthews and Vincent (1998) also write that Quebec east of the -63
-# meridian is supposed to observe AST, but residents as far east as
-# Natashquan use EST/EDT, and residents east of Natashquan use AST.
-# The Quebec department of justice writes in
-# "The situation in Minganie and Basse-Côte-Nord"
-# http://www.justice.gouv.qc.ca/english/publications/generale/temps-minganie-a.htm
-# that the coastal strip from just east of Natashquan to Blanc-Sablon
-# observes Atlantic standard time all year round.
-# http://www.assnat.qc.ca/Media/Process.aspx?MediaId=ANQ.Vigie.Bll.DocumentGenerique_8845en
-# says this common practice was codified into law as of 2007.
-# For lack of better info, guess this practice began around 1970, contra to
-# Shanks & Pottenger who have this region observing AST/ADT.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Blanc-Sablon -3:48:28 -	LMT	1884
-			-4:00	Canada	A%sT	1970
-			-4:00	-	AST
-
-# Ontario
-
-# From Paul Eggert (2006-07-09):
-# Shanks & Pottenger write that since 1970 most of Ontario has been like
-# Toronto.
-# Thunder Bay skipped DST in 1973.
-# Many smaller locales did not observe peacetime DST until 1974;
-# Nipigon (EST) and Rainy River (CST) are the largest that we know of.
-# Far west Ontario is like Winnipeg; far east Quebec is like Halifax.
-
-# From Mark Brader (2003-07-26):
-# [According to the Toronto Star] Orillia, Ontario, adopted DST
-# effective Saturday, 1912-06-22, 22:00; the article mentions that
-# Port Arthur (now part of Thunder Bay, Ontario) as well as Moose Jaw
-# have already done so.  In Orillia DST was to run until Saturday,
-# 1912-08-31 (no time mentioned), but it was met with considerable
-# hostility from certain segments of the public, and was revoked after
-# only two weeks - I copied it as Saturday, 1912-07-07, 22:00, but
-# presumably that should be -07-06.  (1912-06-19, -07-12; also letters
-# earlier in June).
-#
-# Kenora, Ontario, was to abandon DST on 1914-06-01 (-05-21).
-
-# From Paul Eggert (1997-10-17):
-# Mark Brader writes that an article in the 1997-10-14 Toronto Star
-# says that Atikokan, Ontario currently does not observe DST,
-# but will vote on 11-10 whether to use EST/EDT.
-# He also writes that the Ontario Time Act (1990, Chapter T.9)
-# http://www.gov.on.ca/MBS/english/publications/statregs/conttext.html
-# says that Ontario east of 90W uses EST/EDT, and west of 90W uses CST/CDT.
-# Officially Atikokan is therefore on CST/CDT, and most likely this report
-# concerns a non-official time observed as a matter of local practice.
-#
-# From Paul Eggert (2000-10-02):
-# Matthews and Vincent (1998) write that Atikokan, Pickle Lake, and
-# New Osnaburgh observe CST all year, that Big Trout Lake observes
-# CST/CDT, and that Upsala and Shebandowan observe EST/EDT, all in
-# violation of the official Ontario rules.
-#
-# From Paul Eggert (2006-07-09):
-# Chris Walton (2006-07-06) mentioned an article by Stephanie MacLellan in the
-# 2005-07-21 Chronicle-Journal, which said:
-#
-#	The clocks in Atikokan stay set on standard time year-round.
-#	This means they spend about half the time on central time and
-#	the other half on eastern time.
-#
-#	For the most part, the system works, Mayor Dennis Brown said.
-#
-#	"The majority of businesses in Atikokan deal more with Eastern
-#	Canada, but there are some that deal with Western Canada," he
-#	said.  "I don't see any changes happening here."
-#
-# Walton also writes "Supposedly Pickle Lake and Mishkeegogamang
-# [New Osnaburgh] follow the same practice."
-
-# From Garry McKinnon (2006-07-14) via Chris Walton:
-# I chatted with a member of my board who has an outstanding memory
-# and a long history in Atikokan (and in the telecom industry) and he
-# can say for certain that Atikokan has been practicing the current
-# time keeping since 1952, at least.
-
-# From Paul Eggert (2006-07-17):
-# Shanks & Pottenger say that Atikokan has agreed with Rainy River
-# ever since standard time was introduced, but the information from
-# McKinnon sounds more authoritative.  For now, assume that Atikokan
-# switched to EST immediately after WWII era daylight saving time
-# ended.  This matches the old (less-populous) America/Coral_Harbour
-# entry since our cutoff date of 1970, so we can move
-# America/Coral_Harbour to the 'backward' file.
-
-# From Mark Brader (2010-03-06):
-#
-# Currently the database has:
-#
-# # Ontario
-#
-# # From Paul Eggert (2006-07-09):
-# # Shanks & Pottenger write that since 1970 most of Ontario has been like
-# # Toronto.
-# # Thunder Bay skipped DST in 1973.
-# # Many smaller locales did not observe peacetime DST until 1974;
-# # Nipigon (EST) and Rainy River (CST) are the largest that we know of.
-#
-# In the (Toronto) Globe and Mail for Saturday, 1955-09-24, in the bottom
-# right corner of page 1, it says that Toronto will return to standard
-# time at 2 am Sunday morning (which agrees with the database), and that:
-#
-#     The one-hour setback will go into effect throughout most of Ontario,
-#     except in areas like Windsor which remains on standard time all year.
-#
-# Windsor is, of course, a lot larger than Nipigon.
-#
-# I only came across this incidentally.  I don't know if Windsor began
-# observing DST when Detroit did, or in 1974, or on some other date.
-#
-# By the way, the article continues by noting that:
-#
-#     Some cities in the United States have pushed the deadline back
-#     three weeks and will change over from daylight saving in October.
-
-# From Arthur David Olson (2010-07-17):
-#
-# "Standard Time and Time Zones in Canada" appeared in
-# The Journal of The Royal Astronomical Society of Canada,
-# volume 26, number 2 (February 1932) and, as of 2010-07-17,
-# was available at
-# http://adsabs.harvard.edu/full/1932JRASC..26...49S
-#
-# It includes the text below (starting on page 57):
-#
-#   A list of the places in Canada using daylight saving time would
-# require yearly revision. From information kindly furnished by
-# the provincial governments and by the postmasters in many cities
-# and towns, it is found that the following places used daylight sav-
-# ing in 1930. The information for the province of Quebec is definite,
-# for the other provinces only approximate:
-#
-#	Province	Daylight saving time used
-# Prince Edward Island	Not used.
-# Nova Scotia		In Halifax only.
-# New Brunswick		In St. John only.
-# Quebec		In the following places:
-#			Montreal	Lachine
-#			Quebec		Mont-Royal
-#			Lévis		Iberville
-#			St. Lambert	Cap de la Madelèine
-#			Verdun		Loretteville
-#			Westmount	Richmond
-#			Outremont	St. Jérôme
-#			Longueuil	Greenfield Park
-#			Arvida		Waterloo
-#			Chambly-Canton	Beaulieu
-#			Melbourne	La Tuque
-#			St. Théophile	Buckingham
-# Ontario		Used generally in the cities and towns along
-#			the southerly part of the province. Not
-#			used in the northwesterly part.
-# Manitoba		Not used.
-# Saskatchewan		In Regina only.
-# Alberta		Not used.
-# British Columbia	Not used.
-#
-#   With some exceptions, the use of daylight saving may be said to be limited
-# to those cities and towns lying between Quebec city and Windsor, Ont.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Toronto	1919	only	-	Mar	30	23:30	1:00	D
-Rule	Toronto	1919	only	-	Oct	26	0:00	0	S
-Rule	Toronto	1920	only	-	May	 2	2:00	1:00	D
-Rule	Toronto	1920	only	-	Sep	26	0:00	0	S
-Rule	Toronto	1921	only	-	May	15	2:00	1:00	D
-Rule	Toronto	1921	only	-	Sep	15	2:00	0	S
-Rule	Toronto	1922	1923	-	May	Sun>=8	2:00	1:00	D
-# Shanks & Pottenger say 1923-09-19; assume it's a typo and that "-16"
-# was meant.
-Rule	Toronto	1922	1926	-	Sep	Sun>=15	2:00	0	S
-Rule	Toronto	1924	1927	-	May	Sun>=1	2:00	1:00	D
-# The 1927-to-1939 rules can be expressed more simply as
-# Rule	Toronto	1927	1937	-	Sep	Sun>=25	2:00	0	S
-# Rule	Toronto	1928	1937	-	Apr	Sun>=25	2:00	1:00	D
-# Rule	Toronto	1938	1940	-	Apr	lastSun	2:00	1:00	D
-# Rule	Toronto	1938	1939	-	Sep	lastSun	2:00	0	S
-# The rules below avoid use of Sun>=25
-# (which pre-2004 versions of zic cannot handle).
-Rule	Toronto	1927	1932	-	Sep	lastSun	2:00	0	S
-Rule	Toronto	1928	1931	-	Apr	lastSun	2:00	1:00	D
-Rule	Toronto	1932	only	-	May	1	2:00	1:00	D
-Rule	Toronto	1933	1940	-	Apr	lastSun	2:00	1:00	D
-Rule	Toronto	1933	only	-	Oct	1	2:00	0	S
-Rule	Toronto	1934	1939	-	Sep	lastSun	2:00	0	S
-Rule	Toronto	1945	1946	-	Sep	lastSun	2:00	0	S
-Rule	Toronto	1946	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Toronto	1947	1949	-	Apr	lastSun	0:00	1:00	D
-Rule	Toronto	1947	1948	-	Sep	lastSun	0:00	0	S
-Rule	Toronto	1949	only	-	Nov	lastSun	0:00	0	S
-Rule	Toronto	1950	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	Toronto	1950	only	-	Nov	lastSun	2:00	0	S
-Rule	Toronto	1951	1956	-	Sep	lastSun	2:00	0	S
-# Shanks & Pottenger say Toronto ended DST a week early in 1971,
-# namely on 1971-10-24, but Mark Brader wrote (2003-05-31) that this
-# is wrong, and that he had confirmed it by checking the 1971-10-30
-# Toronto Star, which said that DST was ending 1971-10-31 as usual.
-Rule	Toronto	1957	1973	-	Oct	lastSun	2:00	0	S
-
-# From Paul Eggert (2003-07-27):
-# Willett (1914-03) writes (p. 17) "In the Cities of Fort William, and
-# Port Arthur, Ontario, the principle of the Bill has been in
-# operation for the past three years, and in the City of Moose Jaw,
-# Saskatchewan, for one year."
-
-# From David Bryan via Tory Tronrud, Director/Curator,
-# Thunder Bay Museum (2003-11-12):
-# There is some suggestion, however, that, by-law or not, daylight
-# savings time was being practiced in Fort William and Port Arthur
-# before 1909.... [I]n 1910, the line between the Eastern and Central
-# Time Zones was permanently moved about two hundred miles west to
-# include the Thunder Bay area....  When Canada adopted daylight
-# savings time in 1916, Fort William and Port Arthur, having done so
-# already, did not change their clocks....  During the Second World
-# War,... [t]he cities agreed to implement DST during the summer
-# months for the remainder of the war years.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Toronto	-5:17:32 -	LMT	1895
-			-5:00	Canada	E%sT	1919
-			-5:00	Toronto	E%sT	1942 Feb  9  2:00s
-			-5:00	Canada	E%sT	1946
-			-5:00	Toronto	E%sT	1974
-			-5:00	Canada	E%sT
-Zone America/Thunder_Bay -5:57:00 -	LMT	1895
-			-6:00	-	CST	1910
-			-5:00	-	EST	1942
-			-5:00	Canada	E%sT	1970
-			-5:00	Toronto	E%sT	1973
-			-5:00	-	EST	1974
-			-5:00	Canada	E%sT
-Zone America/Nipigon	-5:53:04 -	LMT	1895
-			-5:00	Canada	E%sT	1940 Sep 29
-			-5:00	1:00	EDT	1942 Feb  9  2:00s
-			-5:00	Canada	E%sT
-Zone America/Rainy_River -6:18:16 -	LMT	1895
-			-6:00	Canada	C%sT	1940 Sep 29
-			-6:00	1:00	CDT	1942 Feb  9  2:00s
-			-6:00	Canada	C%sT
-Zone America/Atikokan	-6:06:28 -	LMT	1895
-			-6:00	Canada	C%sT	1940 Sep 29
-			-6:00	1:00	CDT	1942 Feb  9  2:00s
-			-6:00	Canada	C%sT	1945 Sep 30  2:00
-			-5:00	-	EST
-
-
-# Manitoba
-
-# From Rob Douglas (2006-04-06):
-# the old Manitoba Time Act - as amended by Bill 2, assented to
-# March 27, 1987 ... said ...
-# "between two o'clock Central Standard Time in the morning of
-# the first Sunday of April of each year and two o'clock Central
-# Standard Time in the morning of the last Sunday of October next
-# following, one hour in advance of Central Standard Time."...
-# I believe that the English legislation [of the old time act] had
-# been assented to (March 22, 1967)....
-# Also, as far as I can tell, there was no order-in-council varying
-# the time of Daylight Saving Time for 2005 and so the provisions of
-# the 1987 version would apply - the changeover was at 2:00 Central
-# Standard Time (i.e. not until 3:00 Central Daylight Time).
-
-# From Paul Eggert (2006-04-10):
-# Shanks & Pottenger say Manitoba switched at 02:00 (not 02:00s)
-# starting 1966.  Since 02:00s is clearly correct for 1967 on, assume
-# it was also 02:00s in 1966.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Winn	1916	only	-	Apr	23	0:00	1:00	D
-Rule	Winn	1916	only	-	Sep	17	0:00	0	S
-Rule	Winn	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Winn	1918	only	-	Oct	27	2:00	0	S
-Rule	Winn	1937	only	-	May	16	2:00	1:00	D
-Rule	Winn	1937	only	-	Sep	26	2:00	0	S
-Rule	Winn	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	Winn	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Winn	1945	only	-	Sep	lastSun	2:00	0	S
-Rule	Winn	1946	only	-	May	12	2:00	1:00	D
-Rule	Winn	1946	only	-	Oct	13	2:00	0	S
-Rule	Winn	1947	1949	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1947	1949	-	Sep	lastSun	2:00	0	S
-Rule	Winn	1950	only	-	May	 1	2:00	1:00	D
-Rule	Winn	1950	only	-	Sep	30	2:00	0	S
-Rule	Winn	1951	1960	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1951	1958	-	Sep	lastSun	2:00	0	S
-Rule	Winn	1959	only	-	Oct	lastSun	2:00	0	S
-Rule	Winn	1960	only	-	Sep	lastSun	2:00	0	S
-Rule	Winn	1963	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Winn	1963	only	-	Sep	22	2:00	0	S
-Rule	Winn	1966	1986	-	Apr	lastSun	2:00s	1:00	D
-Rule	Winn	1966	2005	-	Oct	lastSun	2:00s	0	S
-Rule	Winn	1987	2005	-	Apr	Sun>=1	2:00s	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Winnipeg	-6:28:36 -	LMT	1887 Jul 16
-			-6:00	Winn	C%sT	2006
-			-6:00	Canada	C%sT
-
-
-# Saskatchewan
-
-# From Mark Brader (2003-07-26):
-# The first actual adoption of DST in Canada was at the municipal
-# level.  As the [Toronto] Star put it (1912-06-07), "While people
-# elsewhere have long been talking of legislation to save daylight,
-# the city of Moose Jaw [Saskatchewan] has acted on its own hook."
-# DST in Moose Jaw began on Saturday, 1912-06-01 (no time mentioned:
-# presumably late evening, as below), and would run until "the end of
-# the summer".  The discrepancy between municipal time and railroad
-# time was noted.
-
-# From Paul Eggert (2003-07-27):
-# Willett (1914-03) notes that DST "has been in operation ... in the
-# City of Moose Jaw, Saskatchewan, for one year."
-
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say that since 1970 this region has mostly been as Regina.
-# Some western towns (e.g. Swift Current) switched from MST/MDT to CST in 1972.
-# Other western towns (e.g. Lloydminster) are like Edmonton.
-# Matthews and Vincent (1998) write that Denare Beach and Creighton
-# are like Winnipeg, in violation of Saskatchewan law.
-
-# From W. Jones (1992-11-06):
-# The. . .below is based on information I got from our law library, the
-# provincial archives, and the provincial Community Services department.
-# A precise history would require digging through newspaper archives, and
-# since you didn't say what you wanted, I didn't bother.
-#
-# Saskatchewan is split by a time zone meridian (105W) and over the years
-# the boundary became pretty ragged as communities near it reevaluated
-# their affiliations in one direction or the other.  In 1965 a provincial
-# referendum favoured legislating common time practices.
-#
-# On 15 April 1966 the Time Act (c. T-14, Revised Statutes of
-# Saskatchewan 1978) was proclaimed, and established that the eastern
-# part of Saskatchewan would use CST year round, that districts in
-# northwest Saskatchewan would by default follow CST but could opt to
-# follow Mountain Time rules (thus 1 hour difference in the winter and
-# zero in the summer), and that districts in southwest Saskatchewan would
-# by default follow MT but could opt to follow CST.
-#
-# It took a few years for the dust to settle (I know one story of a town
-# on one time zone having its school in another, such that a mom had to
-# serve her family lunch in two shifts), but presently it seems that only
-# a few towns on the border with Alberta (e.g. Lloydminster) follow MT
-# rules any more; all other districts appear to have used CST year round
-# since sometime in the 1960s.
-
-# From Chris Walton (2006-06-26):
-# The Saskatchewan time act which was last updated in 1996 is about 30 pages
-# long and rather painful to read.
-# http://www.qp.gov.sk.ca/documents/English/Statutes/Statutes/T14.pdf
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Regina	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Regina	1918	only	-	Oct	27	2:00	0	S
-Rule	Regina	1930	1934	-	May	Sun>=1	0:00	1:00	D
-Rule	Regina	1930	1934	-	Oct	Sun>=1	0:00	0	S
-Rule	Regina	1937	1941	-	Apr	Sun>=8	0:00	1:00	D
-Rule	Regina	1937	only	-	Oct	Sun>=8	0:00	0	S
-Rule	Regina	1938	only	-	Oct	Sun>=1	0:00	0	S
-Rule	Regina	1939	1941	-	Oct	Sun>=8	0:00	0	S
-Rule	Regina	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	Regina	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Regina	1945	only	-	Sep	lastSun	2:00	0	S
-Rule	Regina	1946	only	-	Apr	Sun>=8	2:00	1:00	D
-Rule	Regina	1946	only	-	Oct	Sun>=8	2:00	0	S
-Rule	Regina	1947	1957	-	Apr	lastSun	2:00	1:00	D
-Rule	Regina	1947	1957	-	Sep	lastSun	2:00	0	S
-Rule	Regina	1959	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Regina	1959	only	-	Oct	lastSun	2:00	0	S
-#
-Rule	Swift	1957	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Swift	1957	only	-	Oct	lastSun	2:00	0	S
-Rule	Swift	1959	1961	-	Apr	lastSun	2:00	1:00	D
-Rule	Swift	1959	only	-	Oct	lastSun	2:00	0	S
-Rule	Swift	1960	1961	-	Sep	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Regina	-6:58:36 -	LMT	1905 Sep
-			-7:00	Regina	M%sT	1960 Apr lastSun  2:00
-			-6:00	-	CST
-Zone America/Swift_Current -7:11:20 -	LMT	1905 Sep
-			-7:00	Canada	M%sT	1946 Apr lastSun  2:00
-			-7:00	Regina	M%sT	1950
-			-7:00	Swift	M%sT	1972 Apr lastSun  2:00
-			-6:00	-	CST
-
-
-# Alberta
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Edm	1918	1919	-	Apr	Sun>=8	2:00	1:00	D
-Rule	Edm	1918	only	-	Oct	27	2:00	0	S
-Rule	Edm	1919	only	-	May	27	2:00	0	S
-Rule	Edm	1920	1923	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1920	only	-	Oct	lastSun	2:00	0	S
-Rule	Edm	1921	1923	-	Sep	lastSun	2:00	0	S
-Rule	Edm	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	Edm	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Edm	1945	only	-	Sep	lastSun	2:00	0	S
-Rule	Edm	1947	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1947	only	-	Sep	lastSun	2:00	0	S
-Rule	Edm	1967	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1967	only	-	Oct	lastSun	2:00	0	S
-Rule	Edm	1969	only	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1969	only	-	Oct	lastSun	2:00	0	S
-Rule	Edm	1972	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Edm	1972	2006	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Edmonton	-7:33:52 -	LMT	1906 Sep
-			-7:00	Edm	M%sT	1987
-			-7:00	Canada	M%sT
-
-
-# British Columbia
-
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that since 1970 most of this region has
-# been like Vancouver.
-# Dawson Creek uses MST.  Much of east BC is like Edmonton.
-# Matthews and Vincent (1998) write that Creston is like Dawson Creek.
-
-# It seems though that (re: Creston) is not entirely correct:
-
-# From Chris Walton (2011-12-01):
-# There are two areas within the Canadian province of British Columbia
-# that do not currently observe daylight saving:
-# a) The Creston Valley (includes the town of Creston and surrounding area)
-# b) The eastern half of the Peace River Regional District
-# (includes the cities of Dawson Creek and Fort St. John)
-
-# Earlier this year I stumbled across a detailed article about the time
-# keeping history of Creston; it was written by Tammy Hardwick who is the
-# manager of the Creston & District Museum. The article was written in May 2009.
-# http://www.ilovecreston.com/?p=articles&t=spec&ar=260
-# According to the article, Creston has not changed its clocks since June 1918.
-# i.e. Creston has been stuck on UTC-7 for 93 years.
-# Dawson Creek, on the other hand, changed its clocks as recently as April 1972.
-
-# Unfortunately the exact date for the time change in June 1918 remains
-# unknown and will be difficult to ascertain.  I e-mailed Tammy a few months
-# ago to ask if Sunday June 2 was a reasonable guess.  She said it was just
-# as plausible as any other date (in June).  She also said that after writing
-# the article she had discovered another time change in 1916; this is the
-# subject of another article which she wrote in October 2010.
-# http://www.creston.museum.bc.ca/index.php?module=comments&uop=view_comment&cm+id=56
-
-# Here is a summary of the three clock change events in Creston's history:
-# 1. 1884 or 1885: adoption of Mountain Standard Time (GMT-7)
-# Exact date unknown
-# 2. Oct 1916: switch to Pacific Standard Time (GMT-8)
-# Exact date in October unknown; Sunday October 1 is a reasonable guess.
-# 3. June 1918: switch to Pacific Daylight Time (GMT-7)
-# Exact date in June unknown; Sunday June 2 is a reasonable guess.
-# note 1:
-# On Oct 27/1918 when daylight saving ended in the rest of Canada,
-# Creston did not change its clocks.
-# note 2:
-# During WWII when the Federal Government legislated a mandatory clock change,
-# Creston did not oblige.
-# note 3:
-# There is no guarantee that Creston will remain on Mountain Standard Time
-# (UTC-7) forever.
-# The subject was debated at least once this year by the town Council.
-# http://www.bclocalnews.com/kootenay_rockies/crestonvalleyadvance/news/116760809.html
-
-# During a period WWII, summer time (Daylight saying) was mandatory in Canada.
-# In Creston, that was handled by shifting the area to PST (-8:00) then applying
-# summer time to cause the offset to be -7:00, the same as it had been before
-# the change.  It can be argued that the timezone abbreviation during this
-# period should be PDT rather than MST, but that doesn't seem important enough
-# (to anyone) to further complicate the rules.
-
-# The transition dates (and times) are guesses.
-
-# From Matt Johnson (2015-09-21):
-# Fort Nelson, BC, Canada will cancel DST this year.  So while previously they
-# were aligned with America/Vancouver, they're now aligned with
-# America/Dawson_Creek.
-# http://www.northernrockies.ca/EN/meta/news/archives/2015/northern-rockies-time-change.html
-#
-# From Tim Parenti (2015-09-23):
-# This requires a new zone for the Northern Rockies Regional Municipality,
-# America/Fort_Nelson.  The resolution of 2014-12-08 was reached following a
-# 2014-11-15 poll with nearly 75% support.  Effectively, the municipality has
-# been on MST (-0700) like Dawson Creek since it advanced its clocks on
-# 2015-03-08.
-#
-# From Paul Eggert (2015-09-23):
-# Shanks says Fort Nelson did not observe DST in 1946, unlike Vancouver.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Vanc	1918	only	-	Apr	14	2:00	1:00	D
-Rule	Vanc	1918	only	-	Oct	27	2:00	0	S
-Rule	Vanc	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	Vanc	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	Vanc	1945	only	-	Sep	30	2:00	0	S
-Rule	Vanc	1946	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	Vanc	1946	only	-	Oct	13	2:00	0	S
-Rule	Vanc	1947	1961	-	Sep	lastSun	2:00	0	S
-Rule	Vanc	1962	2006	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Vancouver	-8:12:28 -	LMT	1884
-			-8:00	Vanc	P%sT	1987
-			-8:00	Canada	P%sT
-Zone America/Dawson_Creek -8:00:56 -	LMT	1884
-			-8:00	Canada	P%sT	1947
-			-8:00	Vanc	P%sT	1972 Aug 30  2:00
-			-7:00	-	MST
-Zone America/Fort_Nelson	-8:10:47 -	LMT	1884
-			-8:00	Vanc	P%sT	1946
-			-8:00	-	PST	1947
-			-8:00	Vanc	P%sT	1987
-			-8:00	Canada	P%sT	2015 Mar  8  2:00
-			-7:00	-	MST
-Zone America/Creston	-7:46:04 -	LMT	1884
-			-7:00	-	MST	1916 Oct 1
-			-8:00	-	PST	1918 Jun 2
-			-7:00	-	MST
-
-# Northwest Territories, Nunavut, Yukon
-
-# From Paul Eggert (2006-03-22):
-# Dawson switched to PST in 1973.  Inuvik switched to MST in 1979.
-# Mathew Englander (1996-10-07) gives the following refs:
-#	* 1967. Paragraph 28(34)(g) of the Interpretation Act, S.C. 1967-68,
-#	c. 7 defines Yukon standard time as UTC-9....
-#	see Interpretation Act, R.S.C. 1985, c. I-21, s. 35(1).
-#	[http://canlii.ca/t/7vhg]
-#	* C.O. 1973/214 switched Yukon to PST on 1973-10-28 00:00.
-#	* O.I.C. 1980/02 established DST.
-#	* O.I.C. 1987/056 changed DST to Apr firstSun 2:00 to Oct lastSun 2:00.
-
-# From Brian Inglis (2015-04-14):
-#
-# I tried to trace the history of Yukon time and found the following
-# regulations, giving the reference title and URL if found, regulation name,
-# and relevant quote if available.  Each regulation specifically revokes its
-# predecessor.  The final reference is to the current Interpretation Act
-# authorizing and resulting from these regulatory changes.
-#
-# Only recent regulations were retrievable via Yukon government site search or
-# index, and only some via Canadian legal sources.  Other sources used include
-# articles titled "Standard Time and Time Zones in Canada" from JRASC via ADS
-# Abstracts, cited by ADO for 1932 ..., and updated versions from 1958 and
-# 1970 quoted below; each article includes current extracts from provincial
-# and territorial ST and DST regulations at the end, summaries and details of
-# standard times and daylight saving time at many locations across Canada,
-# with time zone maps, tables and calculations for Canadian Sunrise, Sunset,
-# and LMST; they also cover many countries and global locations, with a chart
-# and table showing current Universal Time offsets, and may be useful as
-# another source of information for 1970 and earlier.
-#
-# * Standard Time and Time Zones in Canada; Smith, C.C.; JRASC, Vol. 26,
-#   pp.49-77; February 1932; SAO/NASA Astrophysics Data System (ADS)
-#   http://adsabs.harvard.edu/abs/1932JRASC..26...49S from p.75:
-#   Yukon Interpretation Ordinance
-#   Yukon standard time is the local mean time at the one hundred and
-#   thirty-fifth meridian.
-#
-# * Standard Time and Time Zones in Canada; Smith, C.C.; Thomson, Malcolm M.;
-#   JRASC, Vol. 52, pp.193-223; October 1958; SAO/NASA Astrophysics Data System
-#   (ADS) http://adsabs.harvard.edu/abs/1958JRASC..52..193S from pp.220-1:
-#   Yukon Interpretation Ordinance, 1955, Chap. 16.
-#
-#     (1) Subject to this section, standard time shall be reckoned as nine
-#     hours behind Greenwich Time and called Yukon Standard Time.
-#
-#     (2) Notwithstanding subsection (1), the Commissioner may make regulations
-#     varying the manner of reckoning standard time.
-#
-# * Yukon Territory Commissioner's Order 1966-20 Interpretation Ordinance
-#   http://? - no online source found
-#
-# * Standard Time and Time Zones in Canada; Thomson, Malcolm M.; JRASC,
-#   Vol. 64, pp.129-162; June 1970; SAO/NASA Astrophysics Data System (ADS)
-#   http://adsabs.harvard.edu/abs/1970JRASC..64..129T from p.156: Yukon
-#   Territory Commissioner's Order 1967-59 Interpretation Ordinance ...
-#
-#     1. Commissioner's Order 1966-20 dated at Whitehorse in the Yukon
-#     Territory on 27th January, 1966, is hereby revoked.
-#
-#     2. Yukon (East) Standard Time as defined by section 36 of the
-#     Interpretation Ordinance from and after mid-night on the 28th day of May,
-#     1967 shall be reckoned in the same manner as Pacific Standard Time, that
-#     is to say, eight hours behind Greenwich Time in the area of the Yukon
-#     Territory lying east of the 138th degree longitude west.
-#
-#     3. In the remainder of the Territory, lying west of the 138th degree
-#     longitude west, Yukon (West) Standard Time shall be reckoned as nine
-#     hours behind Greenwich Time.
-#
-# * Yukon Standard Time defined as Pacific Standard Time, YCO 1973/214
-#   http://www.canlii.org/en/yk/laws/regu/yco-1973-214/latest/yco-1973-214.html
-#   C.O. 1973/214 INTERPRETATION ACT ...
-#
-#     1. Effective October 28, 1973 Commissioner's Order 1967/59 is hereby
-#     revoked.
-#
-#     2. Yukon Standard Time as defined by section 36 of the Interpretation
-#     Act from and after midnight on the twenty-eighth day of October, 1973
-#     shall be reckoned in the same manner as Pacific Standard Time, that is
-#     to say eight hours behind Greenwich Time.
-#
-# * O.I.C. 1980/02 INTERPRETATION ACT
-#   http://? - no online source found
-#
-# * Yukon Daylight Saving Time, YOIC 1987/56
-#   http://www.canlii.org/en/yk/laws/regu/yoic-1987-56/latest/yoic-1987-56.html
-#   O.I.C. 1987/056 INTERPRETATION ACT ...
-#
-#   In every year between
-#     (a) two o'clock in the morning in the first Sunday in April, and
-#     (b) two o'clock in the morning in the last Sunday in October,
-#   Standard Time shall be reckoned as seven hours behind Greenwich Time and
-#   called Yukon Daylight Saving Time.
-#   ...
-#   Dated ... 9th day of March, A.D., 1987.
-#
-# * Yukon Daylight Saving Time 2006, YOIC 2006/127
-#   http://www.canlii.org/en/yk/laws/regu/yoic-2006-127/latest/yoic-2006-127.html
-#   O.I.C. 2006/127 INTERPRETATION ACT ...
-#
-#     1. In Yukon each year the time for general purposes shall be 7 hours
-#     behind Greenwich mean time during the period commencing at two o'clock
-#     in the forenoon on the second Sunday of March and ending at two o'clock
-#     in the forenoon on the first Sunday of November and shall be called
-#     Yukon Daylight Saving Time.
-#
-#     2. Order-in-Council 1987/56 is revoked.
-#
-#     3. This order comes into force January 1, 2007.
-#
-# * Interpretation Act, RSY 2002, c 125
-# http://www.canlii.org/en/yk/laws/stat/rsy-2002-c-125/latest/rsy-2002-c-125.html
-
-# From Rives McDow (1999-09-04):
-# Nunavut ... moved ... to incorporate the whole territory into one time zone.
-# Nunavut moves to single time zone Oct. 31
-# http://www.nunatsiaq.com/nunavut/nvt90903_13.html
-#
-# From Antoine Leca (1999-09-06):
-# We then need to create a new timezone for the Kitikmeot region of Nunavut
-# to differentiate it from the Yellowknife region.
-
-# From Paul Eggert (1999-09-20):
-# Basic Facts: The New Territory
-# http://www.nunavut.com/basicfacts/english/basicfacts_1territory.html
-# (1999) reports that Pangnirtung operates on eastern time,
-# and that Coral Harbour does not observe DST.  We don't know when
-# Pangnirtung switched to eastern time; we'll guess 1995.
-
-# From Rives McDow (1999-11-08):
-# On October 31, when the rest of Nunavut went to Central time,
-# Pangnirtung wobbled.  Here is the result of their wobble:
-#
-# The following businesses and organizations in Pangnirtung use Central Time:
-#
-#	First Air, Power Corp, Nunavut Construction, Health Center, RCMP,
-#	Eastern Arctic National Parks, A & D Specialist
-#
-# The following businesses and organizations in Pangnirtung use Eastern Time:
-#
-#	Hamlet office, All other businesses, Both schools, Airport operator
-#
-# This has made for an interesting situation there, which warranted the news.
-# No one there that I spoke with seems concerned, or has plans to
-# change the local methods of keeping time, as it evidently does not
-# really interfere with any activities or make things difficult locally.
-# They plan to celebrate New Year's turn-over twice, one hour apart,
-# so it appears that the situation will last at least that long.
-# The Nunavut Intergovernmental Affairs hopes that they will "come to
-# their senses", but the locals evidently don't see any problem with
-# the current state of affairs.
-
-# From Michaela Rodrigue, writing in the
-# Nunatsiaq News (1999-11-19):
-# http://www.nunatsiaq.com/archives/nunavut991130/nvt91119_17.html
-# Clyde River, Pangnirtung and Sanikiluaq now operate with two time zones,
-# central - or Nunavut time - for government offices, and eastern time
-# for municipal offices and schools....  Igloolik [was similar but then]
-# made the switch to central time on Saturday, Nov. 6.
-
-# From Paul Eggert (2000-10-02):
-# Matthews and Vincent (1998) say the following, but we lack histories
-# for these potential new Zones.
-#
-# The Canadian Forces station at Alert uses Eastern Time while the
-# handful of residents at the Eureka weather station [in the Central
-# zone] skip daylight savings.  Baffin Island, which is crossed by the
-# Central, Eastern and Atlantic Time zones only uses Eastern Time.
-# Gjoa Haven, Taloyoak and Pelly Bay all use Mountain instead of
-# Central Time and Southampton Island [in the Central zone] is not
-# required to use daylight savings.
-
-# From <http://www.nunatsiaq.com/archives/nunavut001130/nvt21110_02.html>
-# Nunavut now has two time zones (2000-11-10):
-# The Nunavut government would allow its employees in Kugluktuk and
-# Cambridge Bay to operate on central time year-round, putting them
-# one hour behind the rest of Nunavut for six months during the winter.
-# At the end of October the two communities had rebelled against
-# Nunavut's unified time zone, refusing to shift to eastern time with
-# the rest of the territory for the winter.  Cambridge Bay remained on
-# central time, while Kugluktuk, even farther west, reverted to
-# mountain time, which they had used before the advent of Nunavut's
-# unified time zone in 1999.
-#
-# From Rives McDow (2001-01-20), quoting the Nunavut government:
-# The preceding decision came into effect at midnight, Saturday Nov 4, 2000.
-
-# From Paul Eggert (2000-12-04):
-# Let's just keep track of the official times for now.
-
-# From Rives McDow (2001-03-07):
-# The premier of Nunavut has issued a ministerial statement advising
-# that effective 2001-04-01, the territory of Nunavut will revert
-# back to three time zones (mountain, central, and eastern).  Of the
-# cities in Nunavut, Coral Harbor is the only one that I know of that
-# has said it will not observe dst, staying on EST year round.  I'm
-# checking for more info, and will get back to you if I come up with
-# more.
-# [Also see <http://www.nunatsiaq.com/nunavut/nvt10309_06.html> (2001-03-09).]
-
-# From Gwillim Law (2005-05-21):
-# According to ...
-# http://www.canadiangeographic.ca/Magazine/SO98/geomap.asp
-# (from a 1998 Canadian Geographic article), the de facto and de jure time
-# for Southampton Island (at the north end of Hudson Bay) is UTC-5 all year
-# round.  Using Google, it's easy to find other websites that confirm this.
-# I wasn't able to find how far back this time regimen goes, but since it
-# predates the creation of Nunavut, it probably goes back many years....
-# The Inuktitut name of Coral Harbour is Sallit, but it's rarely used.
-#
-# From Paul Eggert (2014-10-17):
-# For lack of better information, assume that Southampton Island observed
-# daylight saving only during wartime.  Gwillim Law's email also
-# mentioned maps now maintained by National Research Council Canada;
-# see above for an up-to-date link.
-
-# From Chris Walton (2007-03-01):
-# ... the community of Resolute (located on Cornwallis Island in
-# Nunavut) moved from Central Time to Eastern Time last November.
-# Basically the community did not change its clocks at the end of
-# daylight saving....
-# http://www.nnsl.com/frames/newspapers/2006-11/nov13_06none.html
-
-# From Chris Walton (2011-03-21):
-# Back in 2007 I initiated the creation of a new "zone file" for Resolute
-# Bay. Resolute Bay is a small community located about 900km north of
-# the Arctic Circle. The zone file was required because Resolute Bay had
-# decided to use UTC-5 instead of UTC-6 for the winter of 2006-2007.
-#
-# According to new information which I received last week, Resolute Bay
-# went back to using UTC-6 in the winter of 2007-2008...
-#
-# On March 11/2007 most of Canada went onto daylight saving. On March
-# 14/2007 I phoned the Resolute Bay hamlet office to do a "time check." I
-# talked to somebody that was both knowledgeable and helpful. I was able
-# to confirm that Resolute Bay was still operating on UTC-5. It was
-# explained to me that Resolute Bay had been on the Eastern Time zone
-# (EST) in the winter, and was now back on the Central Time zone (CDT).
-# i.e. the time zone had changed twice in the last year but the clocks
-# had not moved. The residents had to know which time zone they were in
-# so they could follow the correct TV schedule...
-#
-# On Nov 02/2008 most of Canada went onto standard time. On Nov 03/2008 I
-# phoned the Resolute Bay hamlet office...[D]ue to the challenging nature
-# of the phone call, I decided to seek out an alternate source of
-# information. I found an e-mail address for somebody by the name of
-# Stephanie Adams whose job was listed as "Inns North Support Officer for
-# Arctic Co-operatives." I was under the impression that Stephanie lived
-# and worked in Resolute Bay...
-#
-# On March 14/2011 I phoned the hamlet office again. I was told that
-# Resolute Bay had been using Central Standard Time over the winter of
-# 2010-2011 and that the clocks had therefore been moved one hour ahead
-# on March 13/2011. The person I talked to was aware that Resolute Bay
-# had previously experimented with Eastern Standard Time but he could not
-# tell me when the practice had stopped.
-#
-# On March 17/2011 I searched the Web to find an e-mail address of
-# somebody that might be able to tell me exactly when Resolute Bay went
-# off Eastern Standard Time. I stumbled on the name "Aziz Kheraj." Aziz
-# used to be the mayor of Resolute Bay and he apparently owns half the
-# businesses including "South Camp Inn." This website has some info on
-# Aziz:
-# http://www.uphere.ca/node/493
-#
-# I sent Aziz an e-mail asking when Resolute Bay had stopped using
-# Eastern Standard Time.
-#
-# Aziz responded quickly with this: "hi, The time was not changed for the
-# 1 year only, the following year, the community went back to the old way
-# of "spring ahead-fall behind" currently we are zulu plus 5 hrs and in
-# the winter Zulu plus 6 hrs"
-#
-# This of course conflicted with everything I had ascertained in November 2008.
-#
-# I sent Aziz a copy of my 2008 e-mail exchange with Stephanie. Aziz
-# responded with this: "Hi, Stephanie lives in Winnipeg. I live here, You
-# may want to check with the weather office in Resolute Bay or do a
-# search on the weather through Env. Canada. web site"
-#
-# If I had realized the Stephanie did not live in Resolute Bay I would
-# never have contacted her.  I now believe that all the information I
-# obtained in November 2008 should be ignored...
-# I apologize for reporting incorrect information in 2008.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	NT_YK	1918	only	-	Apr	14	2:00	1:00	D
-Rule	NT_YK	1918	only	-	Oct	27	2:00	0	S
-Rule	NT_YK	1919	only	-	May	25	2:00	1:00	D
-Rule	NT_YK	1919	only	-	Nov	 1	0:00	0	S
-Rule	NT_YK	1942	only	-	Feb	 9	2:00	1:00	W # War
-Rule	NT_YK	1945	only	-	Aug	14	23:00u	1:00	P # Peace
-Rule	NT_YK	1945	only	-	Sep	30	2:00	0	S
-Rule	NT_YK	1965	only	-	Apr	lastSun	0:00	2:00	DD
-Rule	NT_YK	1965	only	-	Oct	lastSun	2:00	0	S
-Rule	NT_YK	1980	1986	-	Apr	lastSun	2:00	1:00	D
-Rule	NT_YK	1980	2006	-	Oct	lastSun	2:00	0	S
-Rule	NT_YK	1987	2006	-	Apr	Sun>=1	2:00	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# aka Panniqtuuq
-Zone America/Pangnirtung 0	-	-00	1921 # trading post est.
-			-4:00	NT_YK	A%sT	1995 Apr Sun>=1  2:00
-			-5:00	Canada	E%sT	1999 Oct 31  2:00
-			-6:00	Canada	C%sT	2000 Oct 29  2:00
-			-5:00	Canada	E%sT
-# formerly Frobisher Bay
-Zone America/Iqaluit	0	-	-00	1942 Aug # Frobisher Bay est.
-			-5:00	NT_YK	E%sT	1999 Oct 31  2:00
-			-6:00	Canada	C%sT	2000 Oct 29  2:00
-			-5:00	Canada	E%sT
-# aka Qausuittuq
-Zone America/Resolute	0	-	-00	1947 Aug 31 # Resolute founded
-			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
-			-5:00	-	EST	2001 Apr  1  3:00
-			-6:00	Canada	C%sT	2006 Oct 29  2:00
-			-5:00	-	EST	2007 Mar 11  3:00
-			-6:00	Canada	C%sT
-# aka Kangiqiniq
-Zone America/Rankin_Inlet 0	-	-00	1957 # Rankin Inlet founded
-			-6:00	NT_YK	C%sT	2000 Oct 29  2:00
-			-5:00	-	EST	2001 Apr  1  3:00
-			-6:00	Canada	C%sT
-# aka Iqaluktuuttiaq
-Zone America/Cambridge_Bay 0	-	-00	1920 # trading post est.?
-			-7:00	NT_YK	M%sT	1999 Oct 31  2:00
-			-6:00	Canada	C%sT	2000 Oct 29  2:00
-			-5:00	-	EST	2000 Nov  5  0:00
-			-6:00	-	CST	2001 Apr  1  3:00
-			-7:00	Canada	M%sT
-Zone America/Yellowknife 0	-	-00	1935 # Yellowknife founded?
-			-7:00	NT_YK	M%sT	1980
-			-7:00	Canada	M%sT
-Zone America/Inuvik	0	-	-00	1953 # Inuvik founded
-			-8:00	NT_YK	P%sT	1979 Apr lastSun  2:00
-			-7:00	NT_YK	M%sT	1980
-			-7:00	Canada	M%sT
-Zone America/Whitehorse	-9:00:12 -	LMT	1900 Aug 20
-			-9:00	NT_YK	Y%sT	1967 May 28  0:00
-			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT
-Zone America/Dawson	-9:17:40 -	LMT	1900 Aug 20
-			-9:00	NT_YK	Y%sT	1973 Oct 28  0:00
-			-8:00	NT_YK	P%sT	1980
-			-8:00	Canada	P%sT
-
-
-###############################################################################
-
-# Mexico
-
-# From Paul Eggert (2014-12-07):
-# The Investigation and Analysis Service of the
-# Mexican Library of Congress (MLoC) has published a
-# history of Mexican local time (in Spanish)
-# http://www.diputados.gob.mx/bibliot/publica/inveyana/polisoc/horver/index.htm
-#
-# Here are the discrepancies between Shanks & Pottenger (S&P) and the MLoC.
-# (In all cases we go with the MLoC.)
-# S&P report that Baja was at -8:00 in 1922/1923.
-# S&P say the 1930 transition in Baja was 1930-11-16.
-# S&P report no DST during summer 1931.
-# S&P report a transition at 1932-03-30 23:00, not 1932-04-01.
-
-# From Gwillim Law (2001-02-20):
-# There are some other discrepancies between the Decrees page and the
-# tz database.  I think they can best be explained by supposing that
-# the researchers who prepared the Decrees page failed to find some of
-# the relevant documents.
-
-# From Alan Perry (1996-02-15):
-# A guy from our Mexico subsidiary finally found the Presidential Decree
-# outlining the timezone changes in Mexico.
-#
-# ------------- Begin Forwarded Message -------------
-#
-# I finally got my hands on the Official Presidential Decree that sets up the
-# rules for the DST changes. The rules are:
-#
-# 1. The country is divided in 3 timezones:
-#    - Baja California Norte (the Mexico/BajaNorte TZ)
-#    - Baja California Sur, Nayarit, Sinaloa and Sonora (the Mexico/BajaSur TZ)
-#    - The rest of the country (the Mexico/General TZ)
-#
-# 2. From the first Sunday in April at 2:00 AM to the last Sunday in October
-#    at 2:00 AM, the times in each zone are as follows:
-#    BajaNorte: GMT+7
-#    BajaSur:   GMT+6
-#    General:   GMT+5
-#
-# 3. The rest of the year, the times are as follows:
-#    BajaNorte: GMT+8
-#    BajaSur:   GMT+7
-#    General:   GMT+6
-#
-# The Decree was published in Mexico's Official Newspaper on January 4th.
-#
-# -------------- End Forwarded Message --------------
-# From Paul Eggert (1996-06-12):
-# For an English translation of the decree, see
-# "Diario Oficial: Time Zone Changeover" (1996-01-04).
-# http://mexico-travel.com/extra/timezone_eng.html
-
-# From Rives McDow (1998-10-08):
-# The State of Quintana Roo has reverted back to central STD and DST times
-# (i.e. UTC -0600 and -0500 as of 1998-08-02).
-
-# From Rives McDow (2000-01-10):
-# Effective April 4, 1999 at 2:00 AM local time, Sonora changed to the time
-# zone 5 hours from the International Date Line, and will not observe daylight
-# savings time so as to stay on the same time zone as the southern part of
-# Arizona year round.
-
-# From Jesper Nørgaard, translating
-# <http://www.reforma.com/nacional/articulo/064327/> (2001-01-17):
-# In Oaxaca, the 55.000 teachers from the Section 22 of the National
-# Syndicate of Education Workers, refuse to apply daylight saving each
-# year, so that the more than 10,000 schools work at normal hour the
-# whole year.
-
-# From Gwillim Law (2001-01-19):
-# <http://www.reforma.com/negocios_y_dinero/articulo/064481/> ... says
-# (translated):...
-# January 17, 2000 - The Energy Secretary, Ernesto Martens, announced
-# that Summer Time will be reduced from seven to five months, starting
-# this year....
-# http://www.publico.com.mx/scripts/texto3.asp?action=pagina&pag=21&pos=p&secc=naci&date=01/17/2001
-# [translated], says "summer time will ... take effect on the first Sunday
-# in May, and end on the last Sunday of September.
-
-# From Arthur David Olson (2001-01-25):
-# The 2001-01-24 traditional Washington Post contained the page one
-# story "Timely Issue Divides Mexicans."...
-# http://www.washingtonpost.com/wp-dyn/articles/A37383-2001Jan23.html
-# ... Mexico City Mayor López Obrador "...is threatening to keep
-# Mexico City and its 20 million residents on a different time than
-# the rest of the country..." In particular, López Obrador would abolish
-# observation of Daylight Saving Time.
-
-# Official statute published by the Energy Department
-# http://www.conae.gob.mx/ahorro/decretohorver2001.html#decre
-# (2001-02-01) shows Baja and Chihauhua as still using US DST rules,
-# and Sonora with no DST.  This was reported by Jesper Nørgaard (2001-02-03).
-
-# From Paul Eggert (2001-03-03):
-#
-# http://www.latimes.com/news/nation/20010303/t000018766.html
-# James F. Smith writes in today's LA Times
-# * Sonora will continue to observe standard time.
-# * Last week Mexico City's mayor Andrés Manuel López Obrador decreed that
-#   the Federal District will not adopt DST.
-# * 4 of 16 district leaders announced they'll ignore the decree.
-# * The decree does not affect federal-controlled facilities including
-#   the airport, banks, hospitals, and schools.
-#
-# For now we'll assume that the Federal District will bow to federal rules.
-
-# From Jesper Nørgaard (2001-04-01):
-# I found some references to the Mexican application of daylight
-# saving, which modifies what I had already sent you, stating earlier
-# that a number of northern Mexican states would go on daylight
-# saving. The modification reverts this to only cover Baja California
-# (Norte), while all other states (except Sonora, who has no daylight
-# saving all year) will follow the original decree of president
-# Vicente Fox, starting daylight saving May 6, 2001 and ending
-# September 30, 2001.
-# References: "Diario de Monterrey" <http://www.diariodemonterrey.com/index.asp>
-# Palabra <http://palabra.infosel.com/010331/primera/ppri3101.pdf> (2001-03-31)
-
-# From Reuters (2001-09-04):
-# Mexico's Supreme Court on Tuesday declared that daylight savings was
-# unconstitutional in Mexico City, creating the possibility the
-# capital will be in a different time zone from the rest of the nation
-# next year....  The Supreme Court's ruling takes effect at 2:00
-# a.m. (0800 GMT) on Sept. 30, when Mexico is scheduled to revert to
-# standard time. "This is so residents of the Federal District are not
-# subject to unexpected time changes," a statement from the court said.
-
-# From Jesper Nørgaard Welen (2002-03-12):
-# ... consulting my local grocery store(!) and my coworkers, they all insisted
-# that a new decision had been made to reinstate US style DST in Mexico....
-# http://www.conae.gob.mx/ahorro/horaver2001_m1_2002.html (2002-02-20)
-# confirms this.  Sonora as usual is the only state where DST is not applied.
-
-# From Steffen Thorsen (2009-12-28):
-#
-# Steffen Thorsen wrote:
-# > Mexico's House of Representatives has approved a proposal for northern
-# > Mexico's border cities to share the same daylight saving schedule as
-# > the United States.
-# Now this has passed both the Congress and the Senate, so starting from
-# 2010, some border regions will be the same:
-# http://www.signonsandiego.com/news/2009/dec/28/clocks-will-match-both-sides-border/
-# http://www.elmananarey.com/diario/noticia/nacional/noticias/empatan_horario_de_frontera_con_eu/621939
-# (Spanish)
-#
-# Could not find the new law text, but the proposed law text changes are here:
-# http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/20091210-V.pdf
-# (Gaceta Parlamentaria)
-#
-# There is also a list of the votes here:
-# http://gaceta.diputados.gob.mx/Gaceta/61/2009/dic/V2-101209.html
-#
-# Our page:
-# http://www.timeanddate.com/news/time/north-mexico-dst-change.html
-
-# From Arthur David Olson (2010-01-20):
-# The page
-# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
-# includes this text:
-# En los municipios fronterizos de Tijuana y Mexicali en Baja California;
-# Juárez y Ojinaga en Chihuahua; Acuña y Piedras Negras en Coahuila;
-# Anáhuac en Nuevo León; y Nuevo Laredo, Reynosa y Matamoros en
-# Tamaulipas, la aplicación de este horario estacional surtirá efecto
-# desde las dos horas del segundo domingo de marzo y concluirá a las dos
-# horas del primer domingo de noviembre.
-# En los municipios fronterizos que se encuentren ubicados en la franja
-# fronteriza norte en el territorio comprendido entre la línea
-# internacional y la línea paralela ubicada a una distancia de veinte
-# kilómetros, así como la Ciudad de Ensenada, Baja California, hacia el
-# interior del país, la aplicación de este horario estacional surtirá
-# efecto desde las dos horas del segundo domingo de marzo y concluirá a
-# las dos horas del primer domingo de noviembre.
-
-# From Steffen Thorsen (2014-12-08), translated by Gwillim Law:
-# The Mexican state of Quintana Roo will likely change to EST in 2015.
-#
-# http://www.unioncancun.mx/articulo/2014/12/04/medio-ambiente/congreso-aprueba-una-hora-mas-de-sol-en-qroo
-# "With this change, the time conflict that has existed between the municipios
-# of Quintana Roo and the municipio of Felipe Carrillo Puerto may come to an
-# end. The latter declared itself in rebellion 15 years ago when a time change
-# was initiated in Mexico, and since then it has refused to change its time
-# zone along with the rest of the country."
-#
-# From Steffen Thorsen (2015-01-14), translated by Gwillim Law:
-# http://sipse.com/novedades/confirman-aplicacion-de-nueva-zona-horaria-para-quintana-roo-132331.html
-# "...the new time zone will come into effect at two o'clock on the first Sunday
-# of February, when we will have to advance the clock one hour from its current
-# time..."
-# Also, the new zone will not use DST.
-#
-# From Carlos Raúl Perasso (2015-02-02):
-# The decree that modifies the Mexican Hour System Law has finally
-# been published at the Diario Oficial de la Federación
-# http://www.dof.gob.mx/nota_detalle.php?codigo=5380123&fecha=31/01/2015
-# It establishes 5 zones for Mexico:
-# 1- Zona Centro (Central Zone): Corresponds to longitude 90 W,
-#    includes most of Mexico, excluding what's mentioned below.
-# 2- Zona Pacífico (Pacific Zone): Longitude 105 W, includes the
-#    states of Baja California Sur; Chihuahua; Nayarit (excluding Bahía
-#    de Banderas which lies in Central Zone); Sinaloa and Sonora.
-# 3- Zona Noroeste (Northwest Zone): Longitude 120 W, includes the
-#    state of Baja California.
-# 4- Zona Sureste (Southeast Zone): Longitude 75 W, includes the state
-#    of Quintana Roo.
-# 5- The islands, reefs and keys shall take their timezone from the
-#    longitude they are located at.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Mexico	1939	only	-	Feb	5	0:00	1:00	D
-Rule	Mexico	1939	only	-	Jun	25	0:00	0	S
-Rule	Mexico	1940	only	-	Dec	9	0:00	1:00	D
-Rule	Mexico	1941	only	-	Apr	1	0:00	0	S
-Rule	Mexico	1943	only	-	Dec	16	0:00	1:00	W # War
-Rule	Mexico	1944	only	-	May	1	0:00	0	S
-Rule	Mexico	1950	only	-	Feb	12	0:00	1:00	D
-Rule	Mexico	1950	only	-	Jul	30	0:00	0	S
-Rule	Mexico	1996	2000	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Mexico	1996	2000	-	Oct	lastSun	2:00	0	S
-Rule	Mexico	2001	only	-	May	Sun>=1	2:00	1:00	D
-Rule	Mexico	2001	only	-	Sep	lastSun	2:00	0	S
-Rule	Mexico	2002	max	-	Apr	Sun>=1	2:00	1:00	D
-Rule	Mexico	2002	max	-	Oct	lastSun	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-# Quintana Roo; represented by Cancún
-Zone America/Cancun	-5:47:04 -	LMT	1922 Jan  1  0:12:56
-			-6:00	-	CST	1981 Dec 23
-			-5:00	Mexico	E%sT	1998 Aug  2  2:00
-			-6:00	Mexico	C%sT	2015 Feb  1  2:00
-			-5:00	-	EST
-# Campeche, Yucatán; represented by Mérida
-Zone America/Merida	-5:58:28 -	LMT	1922 Jan  1  0:01:32
-			-6:00	-	CST	1981 Dec 23
-			-5:00	-	EST	1982 Dec  2
-			-6:00	Mexico	C%sT
-# Coahuila, Nuevo León, Tamaulipas (near US border)
-# This includes the following municipalities:
-#   in Coahuila: Ocampo, Acuña, Zaragoza, Jiménez, Piedras Negras, Nava,
-#     Guerrero, Hidalgo.
-#   in Nuevo León: Anáhuac, Los Aldama.
-#   in Tamaulipas: Nuevo Laredo, Guerrero, Mier, Miguel Alemán, Camargo,
-#     Gustavo Díaz Ordaz, Reynosa, Río Bravo, Valle Hermoso, Matamoros.
-# See: Inicia mañana Horario de Verano en zona fronteriza, El Universal,
-# 2016-03-12
-# http://www.eluniversal.com.mx/articulo/estados/2016/03/12/inicia-manana-horario-de-verano-en-zona-fronteriza
-Zone America/Matamoros	-6:40:00 -	LMT	1921 Dec 31 23:20:00
-			-6:00	-	CST	1988
-			-6:00	US	C%sT	1989
-			-6:00	Mexico	C%sT	2010
-			-6:00	US	C%sT
-# Durango; Coahuila, Nuevo León, Tamaulipas (away from US border)
-Zone America/Monterrey	-6:41:16 -	LMT	1921 Dec 31 23:18:44
-			-6:00	-	CST	1988
-			-6:00	US	C%sT	1989
-			-6:00	Mexico	C%sT
-# Central Mexico
-Zone America/Mexico_City -6:36:36 -	LMT	1922 Jan  1  0:23:24
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	Mexico	C%sT	2001 Sep 30  2:00
-			-6:00	-	CST	2002 Feb 20
-			-6:00	Mexico	C%sT
-# Chihuahua (near US border)
-# This includes the municipalities of Janos, Ascensión, Juárez, Guadalupe,
-# Práxedis G Guerrero, Coyame del Sotol, Ojinaga, and Manuel Benavides.
-# (See the 2016-03-12 El Universal source mentioned above.)
-Zone America/Ojinaga	-6:57:40 -	LMT	1922 Jan  1  0:02:20
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	-	CST	1996
-			-6:00	Mexico	C%sT	1998
-			-6:00	-	CST	1998 Apr Sun>=1  3:00
-			-7:00	Mexico	M%sT	2010
-			-7:00	US	M%sT
-# Chihuahua (away from US border)
-Zone America/Chihuahua	-7:04:20 -	LMT	1921 Dec 31 23:55:40
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	-	CST	1996
-			-6:00	Mexico	C%sT	1998
-			-6:00	-	CST	1998 Apr Sun>=1  3:00
-			-7:00	Mexico	M%sT
-# Sonora
-Zone America/Hermosillo	-7:23:52 -	LMT	1921 Dec 31 23:36:08
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	-	CST	1942 Apr 24
-			-7:00	-	MST	1949 Jan 14
-			-8:00	-	PST	1970
-			-7:00	Mexico	M%sT	1999
-			-7:00	-	MST
-
-# From Alexander Krivenyshev (2010-04-21):
-# According to news, Bahía de Banderas (Mexican state of Nayarit)
-# changed time zone UTC-7 to new time zone UTC-6 on April 4, 2010 (to
-# share the same time zone as nearby city Puerto Vallarta, Jalisco).
-#
-# (Spanish)
-# Bahía de Banderas homologa su horario al del centro del
-# país, a partir de este domingo
-# http://www.nayarit.gob.mx/notes.asp?id=20748
-#
-# Bahía de Banderas homologa su horario con el del Centro del
-# País
-# http://www.bahiadebanderas.gob.mx/principal/index.php?option=com_content&view=article&id=261:bahia-de-banderas-homologa-su-horario-con-el-del-centro-del-pais&catid=42:comunicacion-social&Itemid=50
-#
-# (English)
-# Puerto Vallarta and Bahía de Banderas: One Time Zone
-# http://virtualvallarta.com/puertovallarta/puertovallarta/localnews/2009-12-03-Puerto-Vallarta-and-Bahia-de-Banderas-One-Time-Zone.shtml
-# http://www.worldtimezone.com/dst_news/dst_news_mexico08.html
-#
-# "Mexico's Senate approved the amendments to the Mexican Schedule System that
-# will allow Bahía de Banderas and Puerto Vallarta to share the same time
-# zone ..."
-# Baja California Sur, Nayarit, Sinaloa
-
-# From Arthur David Olson (2010-05-01):
-# Use "Bahia_Banderas" to keep the name to fourteen characters.
-
-# Mazatlán
-Zone America/Mazatlan	-7:05:40 -	LMT	1921 Dec 31 23:54:20
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	-	CST	1942 Apr 24
-			-7:00	-	MST	1949 Jan 14
-			-8:00	-	PST	1970
-			-7:00	Mexico	M%sT
-
-# Bahía de Banderas
-Zone America/Bahia_Banderas	-7:01:00 -	LMT	1921 Dec 31 23:59:00
-			-7:00	-	MST	1927 Jun 10 23:00
-			-6:00	-	CST	1930 Nov 15
-			-7:00	-	MST	1931 May  1 23:00
-			-6:00	-	CST	1931 Oct
-			-7:00	-	MST	1932 Apr  1
-			-6:00	-	CST	1942 Apr 24
-			-7:00	-	MST	1949 Jan 14
-			-8:00	-	PST	1970
-			-7:00	Mexico	M%sT	2010 Apr  4  2:00
-			-6:00	Mexico	C%sT
-
-# Baja California
-Zone America/Tijuana	-7:48:04 -	LMT	1922 Jan  1  0:11:56
-			-7:00	-	MST	1924
-			-8:00	-	PST	1927 Jun 10 23:00
-			-7:00	-	MST	1930 Nov 15
-			-8:00	-	PST	1931 Apr  1
-			-8:00	1:00	PDT	1931 Sep 30
-			-8:00	-	PST	1942 Apr 24
-			-8:00	1:00	PWT	1945 Aug 14 23:00u
-			-8:00	1:00	PPT	1945 Nov 12 # Peace
-			-8:00	-	PST	1948 Apr  5
-			-8:00	1:00	PDT	1949 Jan 14
-			-8:00	-	PST	1954
-			-8:00	CA	P%sT	1961
-			-8:00	-	PST	1976
-			-8:00	US	P%sT	1996
-			-8:00	Mexico	P%sT	2001
-			-8:00	US	P%sT	2002 Feb 20
-			-8:00	Mexico	P%sT	2010
-			-8:00	US	P%sT
-# From Paul Eggert (2006-03-22):
-# Formerly there was an America/Ensenada zone, which differed from
-# America/Tijuana only in that it did not observe DST from 1976
-# through 1995.  This was as per Shanks (1999).  But Shanks & Pottenger say
-# Ensenada did not observe DST from 1948 through 1975.  Guy Harris reports
-# that the 1987 OAG says "Only Ensenada, Mexicali, San Felipe and
-# Tijuana observe DST," which agrees with Shanks & Pottenger but implies that
-# DST-observance was a town-by-town matter back then.  This concerns
-# data after 1970 so most likely there should be at least one Zone
-# other than America/Tijuana for Baja, but it's not clear yet what its
-# name or contents should be.
-#
-# From Paul Eggert (2015-10-08):
-# Formerly there was an America/Santa_Isabel zone, but this appears to
-# have come from a misreading of
-# http://dof.gob.mx/nota_detalle.php?codigo=5127480&fecha=06/01/2010
-# It has been moved to the 'backward' file.
-#
-#
-# Revillagigedo Is
-# no information
-
-###############################################################################
-
-# Anguilla
-# Antigua and Barbuda
-# See America/Port_of_Spain.
-
-# Bahamas
-#
-# For 1899 Milne gives -5:09:29.5; round that.
-#
-# From Sue Williams (2006-12-07):
-# The Bahamas announced about a month ago that they plan to change their DST
-# rules to sync with the U.S. starting in 2007....
-# http://www.jonesbahamas.com/?c=45&a=10412
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Bahamas	1964	1975	-	Oct	lastSun	2:00	0	S
-Rule	Bahamas	1964	1975	-	Apr	lastSun	2:00	1:00	D
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Nassau	-5:09:30 -	LMT	1912 Mar 2
-			-5:00	Bahamas	E%sT	1976
-			-5:00	US	E%sT
-
-# Barbados
-
-# For 1899 Milne gives -3:58:29.2; round that.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Barb	1977	only	-	Jun	12	2:00	1:00	D
-Rule	Barb	1977	1978	-	Oct	Sun>=1	2:00	0	S
-Rule	Barb	1978	1980	-	Apr	Sun>=15	2:00	1:00	D
-Rule	Barb	1979	only	-	Sep	30	2:00	0	S
-Rule	Barb	1980	only	-	Sep	25	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Barbados	-3:58:29 -	LMT	1924 # Bridgetown
-			-3:58:29 -	BMT	1932 # Bridgetown Mean Time
-			-4:00	Barb	A%sT
-
-# Belize
-# Whitman entirely disagrees with Shanks; go with Shanks & Pottenger.
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Belize	1918	1942	-	Oct	Sun>=2	0:00	0:30	-0530
-Rule	Belize	1919	1943	-	Feb	Sun>=9	0:00	0	CST
-Rule	Belize	1973	only	-	Dec	 5	0:00	1:00	CDT
-Rule	Belize	1974	only	-	Feb	 9	0:00	0	CST
-Rule	Belize	1982	only	-	Dec	18	0:00	1:00	CDT
-Rule	Belize	1983	only	-	Feb	12	0:00	0	CST
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Belize	-5:52:48 -	LMT	1912 Apr
-			-6:00	Belize	%s
-
-# Bermuda
-
-# For 1899 Milne gives -4:19:18.3 as the meridian of the clock tower,
-# Bermuda dockyard, Ireland I; round that.
-
-# From Dan Jones, reporting in The Royal Gazette (2006-06-26):
-
-# Next year, however, clocks in the US will go forward on the second Sunday
-# in March, until the first Sunday in November.  And, after the Time Zone
-# (Seasonal Variation) Bill 2006 was passed in the House of Assembly on
-# Friday, the same thing will happen in Bermuda.
-# http://www.theroyalgazette.com/apps/pbcs.dll/article?AID=/20060529/NEWS/105290135
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Bermuda	-4:19:18 -	LMT	1930 Jan  1  2:00 # Hamilton
-			-4:00	-	AST	1974 Apr 28  2:00
-			-4:00	Canada	A%sT	1976
-			-4:00	US	A%sT
-
-# Cayman Is
-# See America/Panama.
-
-# Costa Rica
-
-# Milne gives -5:36:13.3 as San José mean time; round to nearest.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CR	1979	1980	-	Feb	lastSun	0:00	1:00	D
-Rule	CR	1979	1980	-	Jun	Sun>=1	0:00	0	S
-Rule	CR	1991	1992	-	Jan	Sat>=15	0:00	1:00	D
-# IATA SSIM (1991-09) says the following was at 1:00;
-# go with Shanks & Pottenger.
-Rule	CR	1991	only	-	Jul	 1	0:00	0	S
-Rule	CR	1992	only	-	Mar	15	0:00	0	S
-# There are too many San Josés elsewhere, so we'll use 'Costa Rica'.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Costa_Rica	-5:36:13 -	LMT	1890        # San José
-			-5:36:13 -	SJMT	1921 Jan 15 # San José Mean Time
-			-6:00	CR	C%sT
-# Coco
-# no information; probably like America/Costa_Rica
-
-# Cuba
-
-# From Paul Eggert (2013-02-21):
-# Milne gives -5:28:50.45 for the observatory at Havana, -5:29:23.57
-# for the port, and -5:30 for meteorological observations.
-# For now, stick with Shanks & Pottenger.
-
-# From Arthur David Olson (1999-03-29):
-# The 1999-03-28 exhibition baseball game held in Havana, Cuba, between
-# the Cuban National Team and the Baltimore Orioles was carried live on
-# the Orioles Radio Network, including affiliate WTOP in Washington, DC.
-# During the game, play-by-play announcer Jim Hunter noted that
-# "We'll be losing two hours of sleep...Cuba switched to Daylight Saving
-# Time today."  (The "two hour" remark referred to losing one hour of
-# sleep on 1999-03-28 - when the announcers were in Cuba as it switched
-# to DST - and one more hour on 1999-04-04 - when the announcers will have
-# returned to Baltimore, which switches on that date.)
-
-# From Steffen Thorsen (2013-11-11):
-# DST start in Cuba in 2004 ... does not follow the same rules as the
-# years before.  The correct date should be Sunday 2004-03-28 00:00 ...
-# https://web.archive.org/web/20040402060750/http://www.granma.cu/espanol/2004/marzo/sab27/reloj.html
-
-# From Evert van der Veer via Steffen Thorsen (2004-10-28):
-# Cuba is not going back to standard time this year.
-# From Paul Eggert (2006-03-22):
-# http://www.granma.cu/ingles/2004/septiembre/juev30/41medid-i.html
-# says that it's due to a problem at the Antonio Guiteras
-# thermoelectric plant, and says "This October there will be no return
-# to normal hours (after daylight saving time)".
-# For now, let's assume that it's a temporary measure.
-
-# From Carlos A. Carnero Delgado (2005-11-12):
-# This year (just like in 2004-2005) there's no change in time zone
-# adjustment in Cuba.  We will stay in daylight saving time:
-# http://www.granma.cu/espanol/2005/noviembre/mier9/horario.html
-
-# From Jesper Nørgaard Welen (2006-10-21):
-# An article in GRANMA INTERNACIONAL claims that Cuba will end
-# the 3 years of permanent DST next weekend, see
-# http://www.granma.cu/ingles/2006/octubre/lun16/43horario.html
-# "On Saturday night, October 28 going into Sunday, October 29, at 01:00,
-# watches should be set back one hour - going back to 00:00 hours - returning
-# to the normal schedule....
-
-# From Paul Eggert (2007-03-02):
-# <http://www.granma.cubaweb.cu/english/news/art89.html>, dated yesterday,
-# says Cuban clocks will advance at midnight on March 10.
-# For lack of better information, assume Cuba will use US rules,
-# except that it switches at midnight standard time as usual.
-#
-# From Steffen Thorsen (2007-10-25):
-# Carlos Alberto Fonseca Arauz informed me that Cuba will end DST one week
-# earlier - on the last Sunday of October, just like in 2006.
-#
-# He supplied these references:
-#
-# http://www.prensalatina.com.mx/article.asp?ID=%7B4CC32C1B-A9F7-42FB-8A07-8631AFC923AF%7D&language=ES
-# http://actualidad.terra.es/sociedad/articulo/cuba_llama_ahorrar_energia_cambio_1957044.htm
-#
-# From Alex Krivenyshev (2007-10-25):
-# Here is also article from Granma (Cuba):
-#
-# Regirá el Horario Normal desde el próximo domingo 28 de octubre
-# http://www.granma.cubaweb.cu/2007/10/24/nacional/artic07.html
-#
-# http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
-
-# From Arthur David Olson (2008-03-09):
-# I'm in Maryland which is now observing United States Eastern Daylight
-# Time. At 9:44 local time I used RealPlayer to listen to
-# http://media.enet.cu/radioreloj
-# a Cuban information station, and heard
-# the time announced as "ocho cuarenta y cuatro" ("eight forty-four"),
-# indicating that Cuba is still on standard time.
-
-# From Steffen Thorsen (2008-03-12):
-# It seems that Cuba will start DST on Sunday, 2007-03-16...
-# It was announced yesterday, according to this source (in Spanish):
-# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
-#
-# Some more background information is posted here:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
-#
-# The article also says that Cuba has been observing DST since 1963,
-# while Shanks (and tzdata) has 1965 as the first date (except in the
-# 1940's). Many other web pages in Cuba also claim that it has been
-# observed since 1963, but with the exception of 1970 - an exception
-# which is not present in tzdata/Shanks. So there is a chance we need to
-# change some historic records as well.
-#
-# One example:
-# http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm
-
-# From Jesper Nørgaard Welen (2008-03-13):
-# The Cuban time change has just been confirmed on the most authoritative
-# web site, the Granma.  Please check out
-# http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html
-#
-# Basically as expected after Steffen Thorsen's information, the change
-# will take place midnight between Saturday and Sunday.
-
-# From Arthur David Olson (2008-03-12):
-# Assume Sun>=15 (third Sunday) going forward.
-
-# From Alexander Krivenyshev (2009-03-04)
-# According to the Radio Reloj - Cuba will start Daylight Saving Time on
-# midnight between Saturday, March 07, 2009 and Sunday, March 08, 2009-
-# not on midnight March 14 / March 15 as previously thought.
-#
-# http://www.worldtimezone.com/dst_news/dst_news_cuba05.html
-# (in Spanish)
-
-# From Arthur David Olson (2009-03-09)
-# I listened over the Internet to
-# http://media.enet.cu/readioreloj
-# this morning; when it was 10:05 a. m. here in Bethesda, Maryland the
-# the time was announced as "diez cinco" - the same time as here, indicating
-# that has indeed switched to DST. Assume second Sunday from 2009 forward.
-
-# From Steffen Thorsen (2011-03-08):
-# Granma announced that Cuba is going to start DST on 2011-03-20 00:00:00
-# this year. Nothing about the end date known so far (if that has
-# changed at all).
-#
-# Source:
-# http://granma.co.cu/2011/03/08/nacional/artic01.html
-#
-# Our info:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2011.html
-#
-# From Steffen Thorsen (2011-10-30)
-# Cuba will end DST two weeks later this year. Instead of going back
-# tonight, it has been delayed to 2011-11-13 at 01:00.
-#
-# One source (Spanish)
-# http://www.radioangulo.cu/noticias/cuba/17105-cuba-restablecera-el-horario-del-meridiano-de-greenwich.html
-#
-# Our page:
-# http://www.timeanddate.com/news/time/cuba-time-changes-2011.html
-#
-# From Steffen Thorsen (2012-03-01)
-# According to Radio Reloj, Cuba will start DST on Midnight between March
-# 31 and April 1.
-#
-# Radio Reloj has the following info (Spanish):
-# http://www.radioreloj.cu/index.php/noticias-radio-reloj/71-miscelaneas/7529-cuba-aplicara-el-horario-de-verano-desde-el-1-de-abril
-#
-# Our info on it:
-# http://www.timeanddate.com/news/time/cuba-starts-dst-2012.html
-
-# From Steffen Thorsen (2012-11-03):
-# Radio Reloj and many other sources report that Cuba is changing back
-# to standard time on 2012-11-04:
-# http://www.radioreloj.cu/index.php/noticias-radio-reloj/36-nacionales/9961-regira-horario-normal-en-cuba-desde-el-domingo-cuatro-de-noviembre
-# From Paul Eggert (2012-11-03):
-# For now, assume the future rule is first Sunday in November.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
-Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
-Rule	Cuba	1940	1942	-	Jun	Sun>=1	0:00	1:00	D
-Rule	Cuba	1940	1942	-	Sep	Sun>=1	0:00	0	S
-Rule	Cuba	1945	1946	-	Jun	Sun>=1	0:00	1:00	D
-Rule	Cuba	1945	1946	-	Sep	Sun>=1	0:00	0	S
-Rule	Cuba	1965	only	-	Jun	1	0:00	1:00	D
-Rule	Cuba	1965	only	-	Sep	30	0:00	0	S
-Rule	Cuba	1966	only	-	May	29	0:00	1:00	D
-Rule	Cuba	1966	only	-	Oct	2	0:00	0	S
-Rule	Cuba	1967	only	-	Apr	8	0:00	1:00	D
-Rule	Cuba	1967	1968	-	Sep	Sun>=8	0:00	0	S
-Rule	Cuba	1968	only	-	Apr	14	0:00	1:00	D
-Rule	Cuba	1969	1977	-	Apr	lastSun	0:00	1:00	D
-Rule	Cuba	1969	1971	-	Oct	lastSun	0:00	0	S
-Rule	Cuba	1972	1974	-	Oct	8	0:00	0	S
-Rule	Cuba	1975	1977	-	Oct	lastSun	0:00	0	S
-Rule	Cuba	1978	only	-	May	7	0:00	1:00	D
-Rule	Cuba	1978	1990	-	Oct	Sun>=8	0:00	0	S
-Rule	Cuba	1979	1980	-	Mar	Sun>=15	0:00	1:00	D
-Rule	Cuba	1981	1985	-	May	Sun>=5	0:00	1:00	D
-Rule	Cuba	1986	1989	-	Mar	Sun>=14	0:00	1:00	D
-Rule	Cuba	1990	1997	-	Apr	Sun>=1	0:00	1:00	D
-Rule	Cuba	1991	1995	-	Oct	Sun>=8	0:00s	0	S
-Rule	Cuba	1996	only	-	Oct	 6	0:00s	0	S
-Rule	Cuba	1997	only	-	Oct	12	0:00s	0	S
-Rule	Cuba	1998	1999	-	Mar	lastSun	0:00s	1:00	D
-Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
-Rule	Cuba	2000	2003	-	Apr	Sun>=1	0:00s	1:00	D
-Rule	Cuba	2004	only	-	Mar	lastSun	0:00s	1:00	D
-Rule	Cuba	2006	2010	-	Oct	lastSun	0:00s	0	S
-Rule	Cuba	2007	only	-	Mar	Sun>=8	0:00s	1:00	D
-Rule	Cuba	2008	only	-	Mar	Sun>=15	0:00s	1:00	D
-Rule	Cuba	2009	2010	-	Mar	Sun>=8	0:00s	1:00	D
-Rule	Cuba	2011	only	-	Mar	Sun>=15	0:00s	1:00	D
-Rule	Cuba	2011	only	-	Nov	13	0:00s	0	S
-Rule	Cuba	2012	only	-	Apr	1	0:00s	1:00	D
-Rule	Cuba	2012	max	-	Nov	Sun>=1	0:00s	0	S
-Rule	Cuba	2013	max	-	Mar	Sun>=8	0:00s	1:00	D
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Havana	-5:29:28 -	LMT	1890
-			-5:29:36 -	HMT	1925 Jul 19 12:00 # Havana MT
-			-5:00	Cuba	C%sT
-
-# Dominica
-# See America/Port_of_Spain.
-
-# Dominican Republic
-
-# From Steffen Thorsen (2000-10-30):
-# Enrique Morales reported to me that the Dominican Republic has changed the
-# time zone to Eastern Standard Time as of Sunday 29 at 2 am....
-# http://www.listin.com.do/antes/261000/republica/princi.html
-
-# From Paul Eggert (2000-12-04):
-# That URL (2000-10-26, in Spanish) says they planned to use US-style DST.
-
-# From Rives McDow (2000-12-01):
-# Dominican Republic changed its mind and presidential decree on Tuesday,
-# November 28, 2000, with a new decree.  On Sunday, December 3 at 1:00 AM the
-# Dominican Republic will be reverting to 8 hours from the International Date
-# Line, and will not be using DST in the foreseeable future.  The reason they
-# decided to use DST was to be in synch with Puerto Rico, who was also going
-# to implement DST.  When Puerto Rico didn't implement DST, the president
-# decided to revert.
-
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	DR	1966	only	-	Oct	30	0:00	1:00	EDT
-Rule	DR	1967	only	-	Feb	28	0:00	0	EST
-Rule	DR	1969	1973	-	Oct	lastSun	0:00	0:30	-0430
-Rule	DR	1970	only	-	Feb	21	0:00	0	EST
-Rule	DR	1971	only	-	Jan	20	0:00	0	EST
-Rule	DR	1972	1974	-	Jan	21	0:00	0	EST
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Santo_Domingo -4:39:36 -	LMT	1890
-			-4:40	-	SDMT	1933 Apr  1 12:00 # S. Dom. MT
-			-5:00	DR	%s	1974 Oct 27
-			-4:00	-	AST	2000 Oct 29  2:00
-			-5:00	US	E%sT	2000 Dec  3  1:00
-			-4:00	-	AST
-
-# El Salvador
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Salv	1987	1988	-	May	Sun>=1	0:00	1:00	D
-Rule	Salv	1987	1988	-	Sep	lastSun	0:00	0	S
-# There are too many San Salvadors elsewhere, so use America/El_Salvador
-# instead of America/San_Salvador.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/El_Salvador -5:56:48 -	LMT	1921 # San Salvador
-			-6:00	Salv	C%sT
-
-# Grenada
-# Guadeloupe
-# St Barthélemy
-# St Martin (French part)
-# See America/Port_of_Spain.
-
-# Guatemala
-#
-# From Gwillim Law (2006-04-22), after a heads-up from Oscar van Vlijmen:
-# Diario Co Latino, at
-# <http://www.diariocolatino.com/internacionales/detalles.asp?NewsID=8079>,
-# says in an article dated 2006-04-19 that the Guatemalan government had
-# decided on that date to advance official time by 60 minutes, to lessen the
-# impact of the elevated cost of oil....  Daylight saving time will last from
-# 2006-04-29 24:00 (Guatemalan standard time) to 2006-09-30 (time unspecified).
-# From Paul Eggert (2006-06-22):
-# The Ministry of Energy and Mines, press release CP-15/2006
-# (2006-04-19), says DST ends at 24:00.  See
-# http://www.sieca.org.gt/Sitio_publico/Energeticos/Doc/Medidas/Cambio_Horario_Nac_190406.pdf
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Guat	1973	only	-	Nov	25	0:00	1:00	D
-Rule	Guat	1974	only	-	Feb	24	0:00	0	S
-Rule	Guat	1983	only	-	May	21	0:00	1:00	D
-Rule	Guat	1983	only	-	Sep	22	0:00	0	S
-Rule	Guat	1991	only	-	Mar	23	0:00	1:00	D
-Rule	Guat	1991	only	-	Sep	 7	0:00	0	S
-Rule	Guat	2006	only	-	Apr	30	0:00	1:00	D
-Rule	Guat	2006	only	-	Oct	 1	0:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Guatemala	-6:02:04 -	LMT	1918 Oct 5
-			-6:00	Guat	C%sT
-
-# Haiti
-# From Gwillim Law (2005-04-15):
-# Risto O. Nykänen wrote me that Haiti is now on DST.
-# I searched for confirmation, and I found a press release
-# on the Web page of the Haitian Consulate in Chicago (2005-03-31),
-# <http://www.haitianconsulate.org/time.doc>.  Translated from French, it says:
-#
-#  "The Prime Minister's Communication Office notifies the public in general
-#   and the press in particular that, following a decision of the Interior
-#   Ministry and the Territorial Collectivities [I suppose that means the
-#   provinces], Haiti will move to Eastern Daylight Time in the night from next
-#   Saturday the 2nd to Sunday the 3rd.
-#
-#  "Consequently, the Prime Minister's Communication Office wishes to inform
-#   the population that the country's clocks will be set forward one hour
-#   starting at midnight.  This provision will hold until the last Saturday in
-#   October 2005.
-#
-#  "Port-au-Prince, March 31, 2005"
-#
-# From Steffen Thorsen (2006-04-04):
-# I have been informed by users that Haiti observes DST this year like
-# last year, so the current "only" rule for 2005 might be changed to a
-# "max" rule or to last until 2006. (Who knows if they will observe DST
-# next year or if they will extend their DST like US/Canada next year).
-#
-# I have found this article about it (in French):
-# http://www.haitipressnetwork.com/news.cfm?articleID=7612
-#
-# The reason seems to be an energy crisis.
-
-# From Stephen Colebourne (2007-02-22):
-# Some IATA info: Haiti won't be having DST in 2007.
-
-# From Steffen Thorsen (2012-03-11):
-# According to several news sources, Haiti will observe DST this year,
-# apparently using the same start and end date as USA/Canada.
-# So this means they have already changed their time.
-#
-# http://www.alterpresse.org/spip.php?article12510
-# http://radiovision2000haiti.net/home/?p=13253
-#
-# From Arthur David Olson (2012-03-11):
-# The alterpresse.org source seems to show a US-style leap from 2:00 a.m. to
-# 3:00 a.m. rather than the traditional Haitian jump at midnight.
-# Assume a US-style fall back as well.
-
-# From Steffen Thorsen (2013-03-10):
-# It appears that Haiti is observing DST this year as well, same rules
-# as US/Canada.  They did it last year as well, and it looks like they
-# are going to observe DST every year now...
-#
-# http://radiovision2000haiti.net/public/haiti-avis-changement-dheure-dimanche/
-# http://www.canalplushaiti.net/?p=6714
-
-# From Steffen Thorsen (2016-03-12):
-# Jean Antoine, editor of www.haiti-reference.com informed us that Haiti
-# are not going on DST this year.  Several other resources confirm this: ...
-# http://www.radiotelevisioncaraibes.com/presse/heure_d_t_pas_de_changement_d_heure_pr_vu_pour_cet_ann_e.html
-# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
-# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
-
-# From Steffen Thorsen (2017-03-12):
-# We have received 4 mails from different people telling that Haiti
-# has started DST again today, and this source seems to confirm that,
-# I have not been able to find a more authoritative source:
-# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Haiti	1983	only	-	May	8	0:00	1:00	D
-Rule	Haiti	1984	1987	-	Apr	lastSun	0:00	1:00	D
-Rule	Haiti	1983	1987	-	Oct	lastSun	0:00	0	S
-# Shanks & Pottenger say AT is 2:00, but IATA SSIM (1991/1997) says 1:00s.
-# Go with IATA.
-Rule	Haiti	1988	1997	-	Apr	Sun>=1	1:00s	1:00	D
-Rule	Haiti	1988	1997	-	Oct	lastSun	1:00s	0	S
-Rule	Haiti	2005	2006	-	Apr	Sun>=1	0:00	1:00	D
-Rule	Haiti	2005	2006	-	Oct	lastSun	0:00	0	S
-Rule	Haiti	2012	2015	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Haiti	2012	2015	-	Nov	Sun>=1	2:00	0	S
-Rule	Haiti	2017	max	-	Mar	Sun>=8	2:00	1:00	D
-Rule	Haiti	2017	max	-	Nov	Sun>=1	2:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Port-au-Prince -4:49:20 -	LMT	1890
-			-4:49	-	PPMT	1917 Jan 24 12:00 # P-a-P MT
-			-5:00	Haiti	E%sT
-
-# Honduras
-# Shanks & Pottenger say 1921 Jan 1; go with Whitman's more precise Apr 1.
-
-# From Paul Eggert (2006-05-05):
-# worldtimezone.com reports a 2006-05-02 Spanish-language AP article
-# saying Honduras will start using DST midnight Saturday, effective 4
-# months until September.  La Tribuna reported today
-# <http://www.latribuna.hn/99299.html> that Manuel Zelaya, the president
-# of Honduras, refused to back down on this.
-
-# From Jesper Nørgaard Welen (2006-08-08):
-# It seems that Honduras has returned from DST to standard time this Monday at
-# 00:00 hours (prolonging Sunday to 25 hours duration).
-# http://www.worldtimezone.com/dst_news/dst_news_honduras04.html
-
-# From Paul Eggert (2006-08-08):
-# Also see Diario El Heraldo, The country returns to standard time (2006-08-08).
-# http://www.elheraldo.hn/nota.php?nid=54941&sec=12
-# It mentions executive decree 18-2006.
-
-# From Steffen Thorsen (2006-08-17):
-# Honduras will observe DST from 2007 to 2009, exact dates are not
-# published, I have located this authoritative source:
-# http://www.presidencia.gob.hn/noticia.aspx?nId=47
-
-# From Steffen Thorsen (2007-03-30):
-# http://www.laprensahn.com/pais_nota.php?id04962=7386
-# So it seems that Honduras will not enter DST this year....
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Hond	1987	1988	-	May	Sun>=1	0:00	1:00	D
-Rule	Hond	1987	1988	-	Sep	lastSun	0:00	0	S
-Rule	Hond	2006	only	-	May	Sun>=1	0:00	1:00	D
-Rule	Hond	2006	only	-	Aug	Mon>=1	0:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Tegucigalpa -5:48:52 -	LMT	1921 Apr
-			-6:00	Hond	C%sT
-#
-# Great Swan I ceded by US to Honduras in 1972
-
-# Jamaica
-# Shanks & Pottenger give -5:07:12, but Milne records -5:07:10.41 from an
-# unspecified official document, and says "This time is used throughout the
-# island".  Go with Milne.  Round to the nearest second as required by zic.
-#
-# Shanks & Pottenger give April 28 for the 1974 spring-forward transition, but
-# Lance Neita writes that Prime Minister Michael Manley decreed it January 5.
-# Assume Neita meant Jan 6 02:00, the same as the US.  Neita also writes that
-# Manley's supporters associated this act with Manley's nickname "Joshua"
-# (recall that in the Bible the sun stood still at Joshua's request),
-# and with the Rod of Correction which Manley said he had received from
-# Haile Selassie, Emperor of Ethiopia.  See:
-# Neita L. The politician in all of us. Jamaica Observer 2014-09-20
-# http://www.jamaicaobserver.com/columns/The-politician-in-all-of-us_17573647
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Jamaica	-5:07:11 -	LMT	1890        # Kingston
-			-5:07:11 -	KMT	1912 Feb    # Kingston Mean Time
-			-5:00	-	EST	1974
-			-5:00	US	E%sT	1984
-			-5:00	-	EST
-
-# Martinique
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Martinique	-4:04:20 -      LMT	1890        # Fort-de-France
-			-4:04:20 -	FFMT	1911 May    # Fort-de-France MT
-			-4:00	-	AST	1980 Apr  6
-			-4:00	1:00	ADT	1980 Sep 28
-			-4:00	-	AST
-
-# Montserrat
-# See America/Port_of_Spain.
-
-# Nicaragua
-#
-# This uses Shanks & Pottenger for times before 2005.
-#
-# From Steffen Thorsen (2005-04-12):
-# I've got reports from 8 different people that Nicaragua just started
-# DST on Sunday 2005-04-10, in order to save energy because of
-# expensive petroleum.  The exact end date for DST is not yet
-# announced, only "September" but some sites also say "mid-September".
-# Some background information is available on the President's official site:
-# http://www.presidencia.gob.ni/Presidencia/Files_index/Secretaria/Notas%20de%20Prensa/Presidente/2005/ABRIL/Gobierno-de-nicaragua-adelanta-hora-oficial-06abril.htm
-# The Decree, no 23-2005 is available here:
-# http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2005/Decreto%2023-2005%20Se%20adelanta%20en%20una%20hora%20en%20todo%20el%20territorio%20nacional%20apartir%20de%20las%2024horas%20del%2009%20de%20Abril.pdf
-#
-# From Paul Eggert (2005-05-01):
-# The decree doesn't say anything about daylight saving, but for now let's
-# assume that it is daylight saving....
-#
-# From Gwillim Law (2005-04-21):
-# The Associated Press story on the time change, which can be found at
-# http://www.lapalmainteractivo.com/guias/content/gen/ap/America_Latina/AMC_GEN_NICARAGUA_HORA.html
-# and elsewhere, says (fifth paragraph, translated from Spanish): "The last
-# time that a change of clocks was applied to save energy was in the year 2000
-# during the Arnoldo Alemán administration."...
-# The northamerica file says that Nicaragua has been on UTC-6 continuously
-# since December 1998.  I wasn't able to find any details of Nicaraguan time
-# changes in 2000.  Perhaps a note could be added to the northamerica file, to
-# the effect that we have indirect evidence that DST was observed in 2000.
-#
-# From Jesper Nørgaard Welen (2005-11-02):
-# Nicaragua left DST the 2005-10-02 at 00:00 (local time).
-# http://www.presidencia.gob.ni/presidencia/files_index/secretaria/comunicados/2005/septiembre/26septiembre-cambio-hora.htm
-# (2005-09-26)
-#
-# From Jesper Nørgaard Welen (2006-05-05):
-# http://www.elnuevodiario.com.ni/2006/05/01/nacionales/18410
-# (my informal translation)
-# By order of the president of the republic, Enrique Bolaños, Nicaragua
-# advanced by sixty minutes their official time, yesterday at 2 in the
-# morning, and will stay that way until 30th of September.
-#
-# From Jesper Nørgaard Welen (2006-09-30):
-# http://www.presidencia.gob.ni/buscador_gaceta/BD/DECRETOS/2006/D-063-2006P-PRN-Cambio-Hora.pdf
-# My informal translation runs:
-# The natural sun time is restored in all the national territory, in that the
-# time is returned one hour at 01:00 am of October 1 of 2006.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Nic	1979	1980	-	Mar	Sun>=16	0:00	1:00	D
-Rule	Nic	1979	1980	-	Jun	Mon>=23	0:00	0	S
-Rule	Nic	2005	only	-	Apr	10	0:00	1:00	D
-Rule	Nic	2005	only	-	Oct	Sun>=1	0:00	0	S
-Rule	Nic	2006	only	-	Apr	30	2:00	1:00	D
-Rule	Nic	2006	only	-	Oct	Sun>=1	1:00	0	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Managua	-5:45:08 -	LMT	1890
-			-5:45:12 -	MMT	1934 Jun 23 # Managua Mean Time?
-			-6:00	-	CST	1973 May
-			-5:00	-	EST	1975 Feb 16
-			-6:00	Nic	C%sT	1992 Jan  1  4:00
-			-5:00	-	EST	1992 Sep 24
-			-6:00	-	CST	1993
-			-5:00	-	EST	1997
-			-6:00	Nic	C%sT
-
-# Panama
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Panama	-5:18:08 -	LMT	1890
-			-5:19:36 -	CMT	1908 Apr 22 # Colón Mean Time
-			-5:00	-	EST
-Link America/Panama America/Cayman
-
-# Puerto Rico
-# There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Puerto_Rico -4:24:25 -	LMT	1899 Mar 28 12:00 # San Juan
-			-4:00	-	AST	1942 May  3
-			-4:00	US	A%sT	1946
-			-4:00	-	AST
-
-# St Kitts-Nevis
-# St Lucia
-# See America/Port_of_Spain.
-
-# St Pierre and Miquelon
-# There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Miquelon	-3:44:40 -	LMT	1911 May 15 # St Pierre
-			-4:00	-	AST	1980 May
-			-3:00	-	-03	1987
-			-3:00	Canada	-03/-02
-
-# St Vincent and the Grenadines
-# See America/Port_of_Spain.
-
-# Turks and Caicos
-#
-# From Chris Dunn in
-# http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=415007
-# (2007-03-15): In the Turks & Caicos Islands (America/Grand_Turk) the
-# daylight saving dates for time changes have been adjusted to match
-# the recent U.S. change of dates.
-#
-# From Brian Inglis (2007-04-28):
-# http://www.turksandcaicos.tc/calendar/index.htm [2007-04-26]
-# there is an entry for Nov 4 "Daylight Savings Time Ends 2007" and three
-# rows before that there is an out of date entry for Oct:
-# "Eastern Standard Times Begins 2007
-# Clocks are set back one hour at 2:00 a.m. local Daylight Saving Time"
-# indicating that the normal ET rules are followed.
-#
-# From Paul Eggert (2014-08-19):
-# The 2014-08-13 Cabinet meeting decided to stay on UT -04 year-round.  See:
-# http://tcweeklynews.com/daylight-savings-time-to-be-maintained-p5353-127.htm
-# Model this as a switch from EST/EDT to AST ...
-# From Chris Walton (2014-11-04):
-# ... the TCI government appears to have delayed the switch to
-# "permanent daylight saving time" by one year....
-# http://tcweeklynews.com/time-change-to-go-ahead-this-november-p5437-127.htm
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Grand_Turk	-4:44:32 -	LMT	1890
-			-5:07:11 -	KMT	1912 Feb # Kingston Mean Time
-			-5:00	-	EST	1979
-			-5:00	US	E%sT	2015 Nov Sun>=1 2:00
-			-4:00	-	AST
-
-# British Virgin Is
-# Virgin Is
-# See America/Port_of_Spain.
-
-
-# Local Variables:
-# coding: utf-8
-# End:
diff --git a/src/timezone/data/pacificnew b/src/timezone/data/pacificnew
deleted file mode 100644
index 734943486b..0000000000
--- a/src/timezone/data/pacificnew
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# From Arthur David Olson (1989-04-05):
-# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
-# establishing "Pacific Presidential Election Time"; it was not acted on
-# by the Senate or signed into law by the President.
-# You might want to change the "PE" (Presidential Election) below to
-# "Q" (Quadrennial) to maintain three-character zone abbreviations.
-# If you're really conservative, you might want to change it to "D".
-# Avoid "L" (Leap Year), which won't be true in 2100.
-
-# If Presidential Election Time is ever established, replace "XXXX" below
-# with the year the law takes effect and uncomment the "##" lines.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-## Rule	Twilite	XXXX	max	-	Apr	Sun>=1	2:00	1:00	D
-## Rule	Twilite	XXXX	max	uspres	Oct	lastSun	2:00	1:00	PE
-## Rule	Twilite	XXXX	max	uspres	Nov	Sun>=7	2:00	0	S
-## Rule	Twilite	XXXX	max	nonpres	Oct	lastSun	2:00	0	S
-
-# Zone	NAME			GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-## Zone	America/Los_Angeles-PET	-8:00	US		P%sT	XXXX
-##				-8:00	Twilite		P%sT
-
-# For now...
-Link	America/Los_Angeles	US/Pacific-New	##
diff --git a/src/timezone/data/southamerica b/src/timezone/data/southamerica
deleted file mode 100644
index 6038c3b65c..0000000000
--- a/src/timezone/data/southamerica
+++ /dev/null
@@ -1,1793 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# This file is by no means authoritative; if you think you know better,
-# go ahead and edit the file (and please send any changes to
-# tz@iana.org for general use in the future).  For more, please see
-# the file CONTRIBUTING in the tz distribution.
-
-# From Paul Eggert (2016-12-05):
-#
-# Unless otherwise specified, the source for data through 1990 is:
-# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
-# San Diego: ACS Publications, Inc. (2003).
-# Unfortunately this book contains many errors and cites no sources.
-#
-# Many years ago Gwillim Law wrote that a good source
-# for time zone data was the International Air Transport
-# Association's Standard Schedules Information Manual (IATA SSIM),
-# published semiannually.  Law sent in several helpful summaries
-# of the IATA's data after 1990.  Except where otherwise noted,
-# IATA SSIM is the source for entries after 1990.
-#
-# For data circa 1899, a common source is:
-# Milne J. Civil time. Geogr J. 1899 Feb;13(2):173-94.
-# http://www.jstor.org/stable/1774359
-#
-# These tables use numeric abbreviations like -03 and -0330 for
-# integer hour and minute UTC offsets.  Although earlier editions used
-# alphabetic time zone abbreviations, these abbreviations were
-# invented and did not reflect common practice.
-
-###############################################################################
-
-###############################################################################
-
-# Argentina
-
-# From Bob Devine (1988-01-28):
-# Argentina: first Sunday in October to first Sunday in April since 1976.
-# Double Summer time from 1969 to 1974.  Switches at midnight.
-
-# From U. S. Naval Observatory (1988-01-19):
-# ARGENTINA           3 H BEHIND   UTC
-
-# From Hernan G. Otero (1995-06-26):
-# I am sending modifications to the Argentine time zone table...
-# AR was chosen because they are the ISO letters that represent Argentina.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Arg	1930	only	-	Dec	 1	0:00	1:00	S
-Rule	Arg	1931	only	-	Apr	 1	0:00	0	-
-Rule	Arg	1931	only	-	Oct	15	0:00	1:00	S
-Rule	Arg	1932	1940	-	Mar	 1	0:00	0	-
-Rule	Arg	1932	1939	-	Nov	 1	0:00	1:00	S
-Rule	Arg	1940	only	-	Jul	 1	0:00	1:00	S
-Rule	Arg	1941	only	-	Jun	15	0:00	0	-
-Rule	Arg	1941	only	-	Oct	15	0:00	1:00	S
-Rule	Arg	1943	only	-	Aug	 1	0:00	0	-
-Rule	Arg	1943	only	-	Oct	15	0:00	1:00	S
-Rule	Arg	1946	only	-	Mar	 1	0:00	0	-
-Rule	Arg	1946	only	-	Oct	 1	0:00	1:00	S
-Rule	Arg	1963	only	-	Oct	 1	0:00	0	-
-Rule	Arg	1963	only	-	Dec	15	0:00	1:00	S
-Rule	Arg	1964	1966	-	Mar	 1	0:00	0	-
-Rule	Arg	1964	1966	-	Oct	15	0:00	1:00	S
-Rule	Arg	1967	only	-	Apr	 2	0:00	0	-
-Rule	Arg	1967	1968	-	Oct	Sun>=1	0:00	1:00	S
-Rule	Arg	1968	1969	-	Apr	Sun>=1	0:00	0	-
-Rule	Arg	1974	only	-	Jan	23	0:00	1:00	S
-Rule	Arg	1974	only	-	May	 1	0:00	0	-
-Rule	Arg	1988	only	-	Dec	 1	0:00	1:00	S
-#
-# From Hernan G. Otero (1995-06-26):
-# These corrections were contributed by InterSoft Argentina S.A.,
-# obtaining the data from the:
-# Talleres de Hidrografía Naval Argentina
-# (Argentine Naval Hydrography Institute)
-Rule	Arg	1989	1993	-	Mar	Sun>=1	0:00	0	-
-Rule	Arg	1989	1992	-	Oct	Sun>=15	0:00	1:00	S
-#
-# From Hernan G. Otero (1995-06-26):
-# From this moment on, the law that mandated the daylight saving
-# time corrections was derogated and no more modifications
-# to the time zones (for daylight saving) are now made.
-#
-# From Rives McDow (2000-01-10):
-# On October 3, 1999, 0:00 local, Argentina implemented daylight savings time,
-# which did not result in the switch of a time zone, as they stayed 9 hours
-# from the International Date Line.
-Rule	Arg	1999	only	-	Oct	Sun>=1	0:00	1:00	S
-# From Paul Eggert (2007-12-28):
-# DST was set to expire on March 5, not March 3, but since it was converted
-# to standard time on March 3 it's more convenient for us to pretend that
-# it ended on March 3.
-Rule	Arg	2000	only	-	Mar	3	0:00	0	-
-#
-# From Peter Gradelski via Steffen Thorsen (2000-03-01):
-# We just checked with our São Paulo office and they say the government of
-# Argentina decided not to become one of the countries that go on or off DST.
-# So Buenos Aires should be -3 hours from GMT at all times.
-#
-# From Fabián L. Arce Jofré (2000-04-04):
-# The law that claimed DST for Argentina was derogated by President Fernando
-# de la Rúa on March 2, 2000, because it would make people spend more energy
-# in the winter time, rather than less.  The change took effect on March 3.
-#
-# From Mariano Absatz (2001-06-06):
-# one of the major newspapers here in Argentina said that the 1999
-# Timezone Law (which never was effectively applied) will (would?) be
-# in effect.... The article is at
-# http://ar.clarin.com/diario/2001-06-06/e-01701.htm
-# ... The Law itself is "Ley No. 25155", sanctioned on 1999-08-25, enacted
-# 1999-09-17, and published 1999-09-21.  The official publication is at:
-# http://www.boletin.jus.gov.ar/BON/Primera/1999/09-Septiembre/21/PDF/BO21-09-99LEG.PDF
-# Regretfully, you have to subscribe (and pay) for the on-line version....
-#
-# (2001-06-12):
-# the timezone for Argentina will not change next Sunday.
-# Apparently it will do so on Sunday 24th....
-# http://ar.clarin.com/diario/2001-06-12/s-03501.htm
-#
-# (2001-06-25):
-# Last Friday (yes, the last working day before the date of the change), the
-# Senate annulled the 1999 law that introduced the changes later postponed.
-# http://www.clarin.com.ar/diario/2001-06-22/s-03601.htm
-# It remains the vote of the Deputies..., but it will be the same....
-# This kind of things had always been done this way in Argentina.
-# We are still -03:00 all year round in all of the country.
-#
-# From Steffen Thorsen (2007-12-21):
-# A user (Leonardo Chaim) reported that Argentina will adopt DST....
-# all of the country (all Zone-entries) are affected.  News reports like
-# http://www.lanacion.com.ar/opinion/nota.asp?nota_id=973037 indicate
-# that Argentina will use DST next year as well, from October to
-# March, although exact rules are not given.
-#
-# From Jesper Nørgaard Welen (2007-12-26)
-# The last hurdle of Argentina DST is over, the proposal was approved in
-# the lower chamber too (Diputados) with a vote 192 for and 2 against.
-# By the way thanks to Mariano Absatz and Daniel Mario Vega for the link to
-# the original scanned proposal, where the dates and the zero hours are
-# clear and unambiguous...This is the article about final approval:
-# http://www.lanacion.com.ar/politica/nota.asp?nota_id=973996
-#
-# From Paul Eggert (2007-12-22):
-# For dates after mid-2008, the following rules are my guesses and
-# are quite possibly wrong, but are more likely than no DST at all.
-
-# From Alexander Krivenyshev (2008-09-05):
-# As per message from Carlos Alberto Fonseca Arauz (Nicaragua),
-# Argentina will start DST on Sunday October 19, 2008.
-#
-# http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
-# http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
-
-# From Juan Manuel Docile in https://bugs.gentoo.org/240339 (2008-10-07)
-# via Rodrigo Severo:
-# Argentinian law No. 25.155 is no longer valid.
-# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
-# The new one is law No. 26.350
-# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
-# So there is no summer time in Argentina for now.
-
-# From Mariano Absatz (2008-10-20):
-# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST
-# in Argentina from 2008-10-19 until 2009-03-15.
-# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
-#
-
-# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer
-# 2008/2009: Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La
-# Pampa, Neuquén, Rio Negro, Chubut, Santa Cruz and Tierra del Fuego
-# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
-#
-# Press release 235 dated Saturday October 18th, from the Government of the
-# Province of Jujuy saying it will not apply DST either (even when it was not
-# included in Decree 1705/2008).
-# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
-
-# From fullinet (2009-10-18):
-# As announced in
-# http://www.argentina.gob.ar/argentina/portal/paginas.dhtml?pagina=356
-# (an official .gob.ar) under title: "Sin Cambio de Hora"
-# (English: "No hour change").
-#
-# "Por el momento, el Gobierno Nacional resolvió no modificar la hora
-# oficial, decisión que estaba en estudio para su implementación el
-# domingo 18 de octubre. Desde el Ministerio de Planificación se anunció
-# que la Argentina hoy, en estas condiciones meteorológicas, no necesita
-# la modificación del huso horario, ya que 2009 nos encuentra con
-# crecimiento en la producción y distribución energética."
-
-Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
-Rule	Arg	2008	2009	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	only	-	Oct	Sun>=15	0:00	1:00	S
-
-# From Mariano Absatz (2004-05-21):
-# Today it was officially published that the Province of Mendoza is changing
-# its timezone this winter... starting tomorrow night....
-# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040521-27158-normas.pdf
-# From Paul Eggert (2004-05-24):
-# It's Law No. 7,210.  This change is due to a public power emergency, so for
-# now we'll assume it's for this year only.
-#
-# From Paul Eggert (2014-08-09):
-# Hora de verano para la República Argentina
-# http://buenasiembra.com.ar/esoterismo/astrologia/hora-de-verano-de-la-republica-argentina-27.html
-# says that standard time in Argentina from 1894-10-31
-# to 1920-05-01 was -4:16:48.25.  Go with this more-precise value
-# over Shanks & Pottenger.
-#
-# From Mariano Absatz (2004-06-05):
-# These media articles from a major newspaper mostly cover the current state:
-# http://www.lanacion.com.ar/04/05/27/de_604825.asp
-# http://www.lanacion.com.ar/04/05/28/de_605203.asp
-#
-# The following eight (8) provinces pulled clocks back to UTC-04:00 at
-# midnight Monday May 31st. (that is, the night between 05/31 and 06/01).
-# Apparently, all nine provinces would go back to UTC-03:00 at the same
-# time in October 17th.
-#
-# Catamarca, Chubut, La Rioja, San Juan, San Luis, Santa Cruz,
-# Tierra del Fuego, Tucumán.
-#
-# From Mariano Absatz (2004-06-14):
-# ... this weekend, the Province of Tucumán decided it'd go back to UTC-03:00
-# yesterday midnight (that is, at 24:00 Saturday 12th), since the people's
-# annoyance with the change is much higher than the power savings obtained....
-#
-# From Gwillim Law (2004-06-14):
-# http://www.lanacion.com.ar/04/06/10/de_609078.asp ...
-#     "The time change in Tierra del Fuego was a conflicted decision from
-#   the start.  The government had decreed that the measure would take
-#   effect on June 1, but a normative error forced the new time to begin
-#   three days earlier, from a Saturday to a Sunday....
-# Our understanding was that the change was originally scheduled to take place
-# on June 1 at 00:00 in Chubut, Santa Cruz, Tierra del Fuego (and some other
-# provinces).  Sunday was May 30, only two days earlier.  So the article
-# contains a contradiction.  I would give more credence to the Saturday/Sunday
-# date than the "three days earlier" phrase, and conclude that Tierra del
-# Fuego set its clocks back at 2004-05-30 00:00.
-#
-# From Steffen Thorsen (2004-10-05):
-# The previous law 7210 which changed the province of Mendoza's time zone
-# back in May have been modified slightly in a new law 7277, which set the
-# new end date to 2004-09-26 (original date was 2004-10-17).
-# http://www.gobernac.mendoza.gov.ar/boletin/pdf/20040924-27244-normas.pdf
-#
-# From Mariano Absatz (2004-10-05):
-# San Juan changed from UTC-03:00 to UTC-04:00 at midnight between
-# Sunday, May 30th and Monday, May 31st.  It changed back to UTC-03:00
-# at midnight between Saturday, July 24th and Sunday, July 25th....
-# http://www.sanjuan.gov.ar/prensa/archivo/000329.html
-# http://www.sanjuan.gov.ar/prensa/archivo/000426.html
-# http://www.sanjuan.gov.ar/prensa/archivo/000441.html
-
-# From Alex Krivenyshev (2008-01-17):
-# Here are articles that Argentina Province San Luis is planning to end DST
-# as earlier as upcoming Monday January 21, 2008 or February 2008:
-#
-# Provincia argentina retrasa reloj y marca diferencia con resto del país
-# (Argentine Province delayed clock and mark difference with the rest of the
-# country)
-# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
-#
-# Es inminente que en San Luis atrasen una hora los relojes
-# (It is imminent in San Luis clocks one hour delay)
-# http://www.lagaceta.com.ar/nota/253414/Economia/Es-inminente-que-en-San-Luis-atrasen-una-hora-los-relojes.html
-# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
-
-# From Jesper Nørgaard Welen (2008-01-18):
-# The page of the San Luis provincial government
-# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
-# confirms what Alex Krivenyshev has earlier sent to the tz
-# emailing list about that San Luis plans to return to standard
-# time much earlier than the rest of the country. It also
-# confirms that upon request the provinces San Juan and Mendoza
-# refused to follow San Luis in this change.
-#
-# The change is supposed to take place Monday the 21st at 0:00
-# hours. As far as I understand it if this goes ahead, we need
-# a new timezone for San Luis (although there are also documented
-# independent changes in the southamerica file of San Luis in
-# 1990 and 1991 which has not been confirmed).
-
-# From Jesper Nørgaard Welen (2008-01-25):
-# Unfortunately the below page has become defunct, about the San Luis
-# time change. Perhaps because it now is part of a group of pages "Most
-# important pages of 2008."
-#
-# You can use
-# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
-# instead it seems. Or use "Buscador" from the main page of the San Luis
-# government, and fill in "huso" and click OK, and you will get 3 pages
-# from which the first one is identical to the above.
-
-# From Mariano Absatz (2008-01-28):
-# I can confirm that the Province of San Luis (and so far only that
-# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
-# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
-# 1 hour), and they intend to keep UTC-3 as their timezone all year round
-# (that is, unless they change their mind any minute now).
-#
-# So we'll have to add yet another city to 'southamerica' (I think San
-# Luis city is the mos populated city in the Province, so it'd be
-# America/Argentina/San_Luis... of course I can't remember if San Luis's
-# history of particular changes goes along with Mendoza or San Juan :-(
-# (I only remember not being able to collect hard facts about San Luis
-# back in 2004, when these provinces changed to UTC-4 for a few days, I
-# mailed them personally and never got an answer).
-
-# From Paul Eggert (2014-08-12):
-# Unless otherwise specified, data entries are from Shanks & Pottenger through
-# 1992, from the IATA otherwise.  As noted below, Shanks & Pottenger say that
-# America/Cordoba split into 6 subregions during 1991/1992, one of which
-# was America/San_Luis, but we haven't verified this yet so for now we'll
-# keep America/Cordoba a single region rather than splitting it into the
-# other 5 subregions.
-
-# From Mariano Absatz (2009-03-13):
-# Yesterday (with our usual 2-day notice) the Province of San Luis
-# decided that next Sunday instead of "staying" @utc-03:00 they will go
-# to utc-04:00 until the second Saturday in October...
-#
-# The press release is at
-# http://www.sanluis.gov.ar/SL/Paginas/NoticiaDetalle.asp?TemaId=1&InfoPrensaId=3102
-# (I couldn't find the decree, but www.sanluis.gov.ar
-# is the official page for the Province Government.)
-#
-# There's also a note in only one of the major national papers ...
-# http://www.lanacion.com.ar/nota.asp?nota_id=1107912
-#
-# The press release says [quick and dirty translation]:
-# ... announced that next Sunday, at 00:00, Puntanos (the San Luis
-# inhabitants) will have to turn back one hour their clocks
-#
-# Since then, San Luis will establish its own Province timezone. Thus,
-# during 2009, this timezone change will run from 00:00 the third Sunday
-# in March until 24:00 of the second Saturday in October.
-
-# From Mariano Absatz (2009-10-16):
-# ...the Province of San Luis is a case in itself.
-#
-# The Law at
-# http://www.diputadossanluis.gov.ar/diputadosasp/paginas/verNorma.asp?NormaID=276
-# is ambiguous because establishes a calendar from the 2nd Sunday in
-# October at 0:00 thru the 2nd Saturday in March at 24:00 and the
-# complement of that starting on the 2nd Sunday of March at 0:00 and
-# ending on the 2nd Saturday of March at 24:00.
-#
-# This clearly breaks every time the 1st of March or October is a Sunday.
-#
-# IMHO, the "spirit of the Law" is to make the changes at 0:00 on the 2nd
-# Sunday of October and March.
-#
-# The problem is that the changes in the rest of the Provinces that did
-# change in 2007/2008, were made according to the Federal Law and Decrees
-# that did so on the 3rd Sunday of October and March.
-#
-# In fact, San Luis actually switched from UTC-4 to UTC-3 last Sunday
-# (October 11th) at 0:00.
-#
-# So I guess a new set of rules, besides "Arg", must be made and the last
-# America/Argentina/San_Luis entries should change to use these...
-# ...
-
-# From Alexander Krivenyshev (2010-04-09):
-# According to news reports from El Diario de la República Province San
-# Luis, Argentina (standard time UTC-04) will keep Daylight Saving Time
-# after April 11, 2010 - will continue to have same time as rest of
-# Argentina (UTC-3) (no DST).
-#
-# Confirmaron la prórroga del huso horario de verano (Spanish)
-# http://www.eldiariodelarepublica.com/index.php?option=com_content&task=view&id=29383&Itemid=9
-# or (some English translation):
-# http://www.worldtimezone.com/dst_news/dst_news_argentina08.html
-
-# From Mariano Absatz (2010-04-12):
-# yes...I can confirm this...and given that San Luis keeps calling
-# UTC-03:00 "summer time", we should't just let San Luis go back to "Arg"
-# rules...San Luis is still using "Western ARgentina Time" and it got
-# stuck on Summer daylight savings time even though the summer is over.
-
-# From Paul Eggert (2013-09-05):
-# Perhaps San Luis operates on the legal fiction that it is at -04
-# with perpetual summer time, but ordinary usage typically seems to
-# just say it's at -03; see, for example,
-# http://es.wikipedia.org/wiki/Hora_oficial_argentina
-# We've documented similar situations as being plain changes to
-# standard time, so let's do that here too.  This does not change UTC
-# offsets, only tm_isdst and the time zone abbreviations.  One minor
-# plus is that this silences a zic complaint that there's no POSIX TZ
-# setting for time stamps past 2038.
-
-# From Paul Eggert (2013-02-21):
-# Milne says Córdoba time was -4:16:48.2.  Round to the nearest second.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#
-# Buenos Aires (BA), Capital Federal (CF),
-Zone America/Argentina/Buenos_Aires -3:53:48 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May    # Córdoba Mean Time
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	Arg	-03/-02
-#
-# Córdoba (CB), Santa Fe (SF), Entre Ríos (ER), Corrientes (CN), Misiones (MN),
-# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
-#
-# Shanks & Pottenger also make the following claims, which we haven't verified:
-# - Formosa switched to -3:00 on 1991-01-07.
-# - Misiones switched to -3:00 on 1990-12-29.
-# - Chaco switched to -3:00 on 1991-01-04.
-# - Santiago del Estero switched to -4:00 on 1991-04-01,
-#   then to -3:00 on 1991-04-26.
-#
-Zone America/Argentina/Cordoba -4:16:48 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  3
-			-4:00	-	-04	1991 Oct 20
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	Arg	-03/-02
-#
-# Salta (SA), La Pampa (LP), Neuquén (NQ), Rio Negro (RN)
-Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  3
-			-4:00	-	-04	1991 Oct 20
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# Tucumán (TM)
-Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  3
-			-4:00	-	-04	1991 Oct 20
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 Jun  1
-			-4:00	-	-04	2004 Jun 13
-			-3:00	Arg	-03/-02
-#
-# La Rioja (LR)
-Zone America/Argentina/La_Rioja -4:27:24 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  1
-			-4:00	-	-04	1991 May  7
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 Jun  1
-			-4:00	-	-04	2004 Jun 20
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# San Juan (SJ)
-Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  1
-			-4:00	-	-04	1991 May  7
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 May 31
-			-4:00	-	-04	2004 Jul 25
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# Jujuy (JY)
-Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1990 Mar  4
-			-4:00	-	-04	1990 Oct 28
-			-4:00	1:00	-03	1991 Mar 17
-			-4:00	-	-04	1991 Oct  6
-			-3:00	1:00	-02	1992
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# Catamarca (CT), Chubut (CH)
-Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1991 Mar  3
-			-4:00	-	-04	1991 Oct 20
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 Jun  1
-			-4:00	-	-04	2004 Jun 20
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# Mendoza (MZ)
-Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1990 Mar  4
-			-4:00	-	-04	1990 Oct 15
-			-4:00	1:00	-03	1991 Mar  1
-			-4:00	-	-04	1991 Oct 15
-			-4:00	1:00	-03	1992 Mar  1
-			-4:00	-	-04	1992 Oct 18
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 May 23
-			-4:00	-	-04	2004 Sep 26
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# San Luis (SL)
-
-Rule	SanLuis	2008	2009	-	Mar	Sun>=8	0:00	0	-
-Rule	SanLuis	2007	2008	-	Oct	Sun>=8	0:00	1:00	S
-
-Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1990
-			-3:00	1:00	-02	1990 Mar 14
-			-4:00	-	-04	1990 Oct 15
-			-4:00	1:00	-03	1991 Mar  1
-			-4:00	-	-04	1991 Jun  1
-			-3:00	-	-03	1999 Oct  3
-			-4:00	1:00	-03	2000 Mar  3
-			-3:00	-	-03	2004 May 31
-			-4:00	-	-04	2004 Jul 25
-			-3:00	Arg	-03/-02	2008 Jan 21
-			-4:00	SanLuis	-04/-03	2009 Oct 11
-			-3:00	-	-03
-#
-# Santa Cruz (SC)
-Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 Jun  1
-			-4:00	-	-04	2004 Jun 20
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-#
-# Tierra del Fuego, Antártida e Islas del Atlántico Sur (TF)
-Zone America/Argentina/Ushuaia -4:33:12 - LMT	1894 Oct 31
-			-4:16:48 -	CMT	1920 May
-			-4:00	-	-04	1930 Dec
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1999 Oct  3
-			-4:00	Arg	-04/-03	2000 Mar  3
-			-3:00	-	-03	2004 May 30
-			-4:00	-	-04	2004 Jun 20
-			-3:00	Arg	-03/-02	2008 Oct 18
-			-3:00	-	-03
-
-# Aruba
-Link America/Curacao America/Aruba
-
-# Bolivia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/La_Paz	-4:32:36 -	LMT	1890
-			-4:32:36 -	CMT	1931 Oct 15 # Calamarca MT
-			-4:32:36 1:00	BOST	1932 Mar 21 # Bolivia ST
-			-4:00	-	-04
-
-# Brazil
-
-# From Paul Eggert (1993-11-18):
-# The mayor of Rio recently attempted to change the time zone rules
-# just in his city, in order to leave more summer time for the tourist trade.
-# The rule change lasted only part of the day;
-# the federal government refused to follow the city's rules, and business
-# was in a chaos, so the mayor backed down that afternoon.
-
-# From IATA SSIM (1996-02):
-# _Only_ the following states in BR1 observe DST: Rio Grande do Sul (RS),
-# Santa Catarina (SC), Paraná (PR), São Paulo (SP), Rio de Janeiro (RJ),
-# Espírito Santo (ES), Minas Gerais (MG), Bahia (BA), Goiás (GO),
-# Distrito Federal (DF), Tocantins (TO), Sergipe [SE] and Alagoas [AL].
-# [The last three states are new to this issue of the IATA SSIM.]
-
-# From Gwillim Law (1996-10-07):
-# Geography, history (Tocantins was part of Goiás until 1989), and other
-# sources of time zone information lead me to believe that AL, SE, and TO were
-# always in BR1, and so the only change was whether or not they observed DST....
-# The earliest issue of the SSIM I have is 2/91.  Each issue from then until
-# 9/95 says that DST is observed only in the ten states I quoted from 9/95,
-# along with Mato Grosso (MT) and Mato Grosso do Sul (MS), which are in BR2
-# (UTC-4)....  The other two time zones given for Brazil are BR3, which is
-# UTC-5, no DST, and applies only in the state of Acre (AC); and BR4, which is
-# UTC-2, and applies to Fernando de Noronha (formerly FN, but I believe it's
-# become part of the state of Pernambuco).  The boundary between BR1 and BR2
-# has never been clearly stated.  They've simply been called East and West.
-# However, some conclusions can be drawn from another IATA manual: the Airline
-# Coding Directory, which lists close to 400 airports in Brazil.  For each
-# airport it gives a time zone which is coded to the SSIM.  From that
-# information, I'm led to conclude that the states of Amapá (AP), Ceará (CE),
-# Maranhão (MA), Paraíba (PR), Pernambuco (PE), Piauí (PI), and Rio Grande do
-# Norte (RN), and the eastern part of Pará (PA) are all in BR1 without DST.
-
-# From Marcos Tadeu (1998-09-27):
-# Brazilian official page <http://pcdsh01.on.br/verao1.html>
-
-# From Jesper Nørgaard (2000-11-03):
-# [For an official list of which regions in Brazil use which time zones, see:]
-# http://pcdsh01.on.br/Fusbr.htm
-# http://pcdsh01.on.br/Fusbrhv.htm
-
-# From Celso Doria via David Madeo (2002-10-09):
-# The reason for the delay this year has to do with elections in Brazil.
-#
-# Unlike in the United States, elections in Brazil are 100% computerized and
-# the results are known almost immediately.  Yesterday, it was the first
-# round of the elections when 115 million Brazilians voted for President,
-# Governor, Senators, Federal Deputies, and State Deputies.  Nobody is
-# counting (or re-counting) votes anymore and we know there will be a second
-# round for the Presidency and also for some Governors.  The 2nd round will
-# take place on October 27th.
-#
-# The reason why the DST will only begin November 3rd is that the thousands
-# of electoral machines used cannot have their time changed, and since the
-# Constitution says the elections must begin at 8:00 AM and end at 5:00 PM,
-# the Government decided to postpone DST, instead of changing the Constitution
-# (maybe, for the next elections, it will be possible to change the clock)...
-
-# From Rodrigo Severo (2004-10-04):
-# It's just the biannual change made necessary by the much hyped, supposedly
-# modern Brazilian eletronic voting machines which, apparently, can't deal
-# with a time change between the first and the second rounds of the elections.
-
-# From Steffen Thorsen (2007-09-20):
-# Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
-# http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
-
-# From Paul Schulze (2008-06-24):
-# ...by law number 11.662 of April 24, 2008 (published in the "Diario
-# Oficial da União"...) in Brazil there are changes in the timezones,
-# effective today (00:00am at June 24, 2008) as follows:
-#
-# a) The timezone UTC+5 is extinguished, with all the Acre state and the
-# part of the Amazonas state that had this timezone now being put to the
-# timezone UTC+4
-# b) The whole Pará state now is put at timezone UTC+3, instead of just
-# part of it, as was before.
-#
-# This change follows a proposal of senator Tiao Viana of Acre state, that
-# proposed it due to concerns about open television channels displaying
-# programs inappropriate to youths in the states that had the timezone
-# UTC+5 too early in the night. In the occasion, some more corrections
-# were proposed, trying to unify the timezones of any given state. This
-# change modifies timezone rules defined in decree 2.784 of 18 June,
-# 1913.
-
-# From Rodrigo Severo (2008-06-24):
-# Just correcting the URL:
-# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=do&secao=1&pagina=1&data=25/04/2008
-#
-# As a result of the above Decree I believe the America/Rio_Branco
-# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
-# be created to represent the...west side of the Pará State. I
-# suggest this new timezone be called Santarem as the most
-# important/populated city in the affected area.
-#
-# This new timezone would be the same as the Rio_Branco timezone up to
-# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
-
-# From Alex Krivenyshev (2008-06-24):
-# This is a quick reference page for New and Old Brazil Time Zones map.
-# http://www.worldtimezone.com/brazil-time-new-old.php
-#
-# - 4 time zones replaced by 3 time zones - eliminating time zone UTC-05
-# (state Acre and the part of the Amazonas will be UTC/GMT-04) - western
-# part of Par state is moving to one timezone UTC-03 (from UTC-04).
-
-# From Paul Eggert (2002-10-10):
-# The official decrees referenced below are mostly taken from
-# Decretos sobre o Horário de Verão no Brasil.
-# http://pcdsh01.on.br/DecHV.html
-
-# From Steffen Thorsen (2008-08-29):
-# As announced by the government and many newspapers in Brazil late
-# yesterday, Brazil will start DST on 2008-10-19 (need to change rule) and
-# it will end on 2009-02-15 (current rule for Brazil is fine). Based on
-# past years experience with the elections, there was a good chance that
-# the start was postponed to November, but it did not happen this year.
-#
-# It has not yet been posted to http://pcdsh01.on.br/DecHV.html
-#
-# An official page about it:
-# http://www.mme.gov.br/site/news/detail.do?newsId=16722
-# Note that this link does not always work directly, but must be accessed
-# by going to
-# http://www.mme.gov.br/first
-#
-# One example link that works directly:
-# http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54
-# (Portuguese)
-#
-# We have a written a short article about it as well:
-# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
-#
-# From Alexander Krivenyshev (2011-10-04):
-# State Bahia will return to Daylight savings time this year after 8 years off.
-# The announcement was made by Governor Jaques Wagner in an interview to a
-# television station in Salvador.
-
-# In Portuguese:
-# http://g1.globo.com/bahia/noticia/2011/10/governador-jaques-wagner-confirma-horario-de-verao-na-bahia.html
-# http://noticias.terra.com.br/brasil/noticias/0,,OI5390887-EI8139,00-Bahia+volta+a+ter+horario+de+verao+apos+oito+anos.html
-
-# From Guilherme Bernardes Rodrigues (2011-10-07):
-# There is news in the media, however there is still no decree about it.
-# I just send a e-mail to Zulmira Brandao at http://pcdsh01.on.br/ the
-# official agency about time in Brazil, and she confirmed that the old rule is
-# still in force.
-
-# From Guilherme Bernardes Rodrigues (2011-10-14)
-# It's official, the President signed a decree that includes Bahia in summer
-# time.
-#	 [ and in a second message (same day): ]
-# I found the decree.
-#
-# DECRETO No. 7.584, DE 13 DE OUTUBRO DE 2011
-# Link :
-# http://www.in.gov.br/visualiza/index.jsp?data=13/10/2011&jornal=1000&pagina=6&totalArquivos=6
-
-# From Kelley Cook (2012-10-16):
-# The governor of state of Bahia in Brazil announced on Thursday that
-# due to public pressure, he is reversing the DST policy they implemented
-# last year and will not be going to Summer Time on October 21st....
-# http://www.correio24horas.com.br/r/artigo/apos-pressoes-wagner-suspende-horario-de-verao-na-bahia
-
-# From Rodrigo Severo (2012-10-16):
-# Tocantins state will have DST.
-# http://noticias.terra.com.br/brasil/noticias/0,,OI6232536-EI306.html
-
-# From Steffen Thorsen (2013-09-20):
-# Tocantins in Brazil is very likely not to observe DST from October....
-# http://conexaoto.com.br/2013/09/18/ministerio-confirma-que-tocantins-esta-fora-do-horario-de-verao-em-2013-mas-falta-publicacao-de-decreto
-# We will keep this article updated when this is confirmed:
-# http://www.timeanddate.com/news/time/brazil-starts-dst-2013.html
-
-# From Steffen Thorsen (2013-10-17):
-# http://www.timeanddate.com/news/time/acre-amazonas-change-time-zone.html
-# Senator Jorge Viana announced that Acre will change time zone on November 10.
-# He did not specify the time of the change, nor if western parts of Amazonas
-# will change as well.
-#
-# From Paul Eggert (2013-10-17):
-# For now, assume western Amazonas will change as well.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Decree 20,466 <http://pcdsh01.on.br/HV20466.htm> (1931-10-01)
-# Decree 21,896 <http://pcdsh01.on.br/HV21896.htm> (1932-01-10)
-Rule	Brazil	1931	only	-	Oct	 3	11:00	1:00	S
-Rule	Brazil	1932	1933	-	Apr	 1	 0:00	0	-
-Rule	Brazil	1932	only	-	Oct	 3	 0:00	1:00	S
-# Decree 23,195 <http://pcdsh01.on.br/HV23195.htm> (1933-10-10)
-# revoked DST.
-# Decree 27,496 <http://pcdsh01.on.br/HV27496.htm> (1949-11-24)
-# Decree 27,998 <http://pcdsh01.on.br/HV27998.htm> (1950-04-13)
-Rule	Brazil	1949	1952	-	Dec	 1	 0:00	1:00	S
-Rule	Brazil	1950	only	-	Apr	16	 1:00	0	-
-Rule	Brazil	1951	1952	-	Apr	 1	 0:00	0	-
-# Decree 32,308 <http://pcdsh01.on.br/HV32308.htm> (1953-02-24)
-Rule	Brazil	1953	only	-	Mar	 1	 0:00	0	-
-# Decree 34,724 <http://pcdsh01.on.br/HV34724.htm> (1953-11-30)
-# revoked DST.
-# Decree 52,700 <http://pcdsh01.on.br/HV52700.htm> (1963-10-18)
-# established DST from 1963-10-23 00:00 to 1964-02-29 00:00
-# in SP, RJ, GB, MG, ES, due to the prolongation of the drought.
-# Decree 53,071 <http://pcdsh01.on.br/HV53071.htm> (1963-12-03)
-# extended the above decree to all of the national territory on 12-09.
-Rule	Brazil	1963	only	-	Dec	 9	 0:00	1:00	S
-# Decree 53,604 <http://pcdsh01.on.br/HV53604.htm> (1964-02-25)
-# extended summer time by one day to 1964-03-01 00:00 (start of school).
-Rule	Brazil	1964	only	-	Mar	 1	 0:00	0	-
-# Decree 55,639 <http://pcdsh01.on.br/HV55639.htm> (1965-01-27)
-Rule	Brazil	1965	only	-	Jan	31	 0:00	1:00	S
-Rule	Brazil	1965	only	-	Mar	31	 0:00	0	-
-# Decree 57,303 <http://pcdsh01.on.br/HV57303.htm> (1965-11-22)
-Rule	Brazil	1965	only	-	Dec	 1	 0:00	1:00	S
-# Decree 57,843 <http://pcdsh01.on.br/HV57843.htm> (1966-02-18)
-Rule	Brazil	1966	1968	-	Mar	 1	 0:00	0	-
-Rule	Brazil	1966	1967	-	Nov	 1	 0:00	1:00	S
-# Decree 63,429 <http://pcdsh01.on.br/HV63429.htm> (1968-10-15)
-# revoked DST.
-# Decree 91,698 <http://pcdsh01.on.br/HV91698.htm> (1985-09-27)
-Rule	Brazil	1985	only	-	Nov	 2	 0:00	1:00	S
-# Decree 92,310 (1986-01-21)
-# Decree 92,463 (1986-03-13)
-Rule	Brazil	1986	only	-	Mar	15	 0:00	0	-
-# Decree 93,316 (1986-10-01)
-Rule	Brazil	1986	only	-	Oct	25	 0:00	1:00	S
-Rule	Brazil	1987	only	-	Feb	14	 0:00	0	-
-# Decree 94,922 <http://pcdsh01.on.br/HV94922.htm> (1987-09-22)
-Rule	Brazil	1987	only	-	Oct	25	 0:00	1:00	S
-Rule	Brazil	1988	only	-	Feb	 7	 0:00	0	-
-# Decree 96,676 <http://pcdsh01.on.br/HV96676.htm> (1988-09-12)
-# except for the states of AC, AM, PA, RR, RO, and AP (then a territory)
-Rule	Brazil	1988	only	-	Oct	16	 0:00	1:00	S
-Rule	Brazil	1989	only	-	Jan	29	 0:00	0	-
-# Decree 98,077 <http://pcdsh01.on.br/HV98077.htm> (1989-08-21)
-# with the same exceptions
-Rule	Brazil	1989	only	-	Oct	15	 0:00	1:00	S
-Rule	Brazil	1990	only	-	Feb	11	 0:00	0	-
-# Decree 99,530 <http://pcdsh01.on.br/HV99530.htm> (1990-09-17)
-# adopted by RS, SC, PR, SP, RJ, ES, MG, GO, MS, DF.
-# Decree 99,629 (1990-10-19) adds BA, MT.
-Rule	Brazil	1990	only	-	Oct	21	 0:00	1:00	S
-Rule	Brazil	1991	only	-	Feb	17	 0:00	0	-
-# Unnumbered decree <http://pcdsh01.on.br/HV1991.htm> (1991-09-25)
-# adopted by RS, SC, PR, SP, RJ, ES, MG, BA, GO, MT, MS, DF.
-Rule	Brazil	1991	only	-	Oct	20	 0:00	1:00	S
-Rule	Brazil	1992	only	-	Feb	 9	 0:00	0	-
-# Unnumbered decree <http://pcdsh01.on.br/HV1992.htm> (1992-10-16)
-# adopted by same states.
-Rule	Brazil	1992	only	-	Oct	25	 0:00	1:00	S
-Rule	Brazil	1993	only	-	Jan	31	 0:00	0	-
-# Decree 942 <http://pcdsh01.on.br/HV942.htm> (1993-09-28)
-# adopted by same states, plus AM.
-# Decree 1,252 <http://pcdsh01.on.br/HV1252.htm> (1994-09-22;
-# web page corrected 2004-01-07) adopted by same states, minus AM.
-# Decree 1,636 <http://pcdsh01.on.br/HV1636.htm> (1995-09-14)
-# adopted by same states, plus MT and TO.
-# Decree 1,674 <http://pcdsh01.on.br/HV1674.htm> (1995-10-13)
-# adds AL, SE.
-Rule	Brazil	1993	1995	-	Oct	Sun>=11	 0:00	1:00	S
-Rule	Brazil	1994	1995	-	Feb	Sun>=15	 0:00	0	-
-Rule	Brazil	1996	only	-	Feb	11	 0:00	0	-
-# Decree 2,000 <http://pcdsh01.on.br/HV2000.htm> (1996-09-04)
-# adopted by same states, minus AL, SE.
-Rule	Brazil	1996	only	-	Oct	 6	 0:00	1:00	S
-Rule	Brazil	1997	only	-	Feb	16	 0:00	0	-
-# From Daniel C. Sobral (1998-02-12):
-# In 1997, the DS began on October 6. The stated reason was that
-# because international television networks ignored Brazil's policy on DS,
-# they bought the wrong times on satellite for coverage of Pope's visit.
-# This year, the ending date of DS was postponed to March 1
-# to help dealing with the shortages of electric power.
-#
-# Decree 2,317 (1997-09-04), adopted by same states.
-Rule	Brazil	1997	only	-	Oct	 6	 0:00	1:00	S
-# Decree 2,495 <http://pcdsh01.on.br/figuras/HV2495.JPG>
-# (1998-02-10)
-Rule	Brazil	1998	only	-	Mar	 1	 0:00	0	-
-# Decree 2,780 <http://pcdsh01.on.br/figuras/Hv98.jpg> (1998-09-11)
-# adopted by the same states as before.
-Rule	Brazil	1998	only	-	Oct	11	 0:00	1:00	S
-Rule	Brazil	1999	only	-	Feb	21	 0:00	0	-
-# Decree 3,150 <http://pcdsh01.on.br/figuras/HV3150.gif>
-# (1999-08-23) adopted by same states.
-# Decree 3,188 <http://pcdsh01.on.br/DecHV99.gif> (1999-09-30)
-# adds SE, AL, PB, PE, RN, CE, PI, MA and RR.
-Rule	Brazil	1999	only	-	Oct	 3	 0:00	1:00	S
-Rule	Brazil	2000	only	-	Feb	27	 0:00	0	-
-# Decree 3,592 <http://pcdsh01.on.br/DEC3592.htm> (2000-09-06)
-# adopted by the same states as before.
-# Decree 3,630 <http://pcdsh01.on.br/Dec3630.jpg> (2000-10-13)
-# repeals DST in PE and RR, effective 2000-10-15 00:00.
-# Decree 3,632 <http://pcdsh01.on.br/Dec3632.jpg> (2000-10-17)
-# repeals DST in SE, AL, PB, RN, CE, PI and MA, effective 2000-10-22 00:00.
-# Decree 3,916 <http://pcdsh01.on.br/figuras/HV3916.gif>
-# (2001-09-13) reestablishes DST in AL, CE, MA, PB, PE, PI, RN, SE.
-Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	S
-Rule	Brazil	2001	2006	-	Feb	Sun>=15	 0:00	0	-
-# Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
-# 4,399 <http://www.presidencia.gov.br/CCIVIL/decreto/2002/D4399.htm>
-Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	S
-# Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
-# 4,844 <http://www.presidencia.gov.br/CCIVIL/decreto/2003/D4844.htm>
-Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	S
-# Decree 5,223 (2004-10-01) reestablishes DST in MT.
-# 5,223 <http://www.planalto.gov.br/ccivil_03/_Ato2004-2006/2004/Decreto/D5223.htm>
-Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	S
-# Decree 5,539 <http://pcdsh01.on.br/DecHV5539.gif> (2005-09-19),
-# adopted by the same states as before.
-Rule	Brazil	2005	only	-	Oct	16	 0:00	1:00	S
-# Decree 5,920 <http://pcdsh01.on.br/DecHV5920.gif> (2006-10-03),
-# adopted by the same states as before.
-Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	S
-Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
-# Decree 6,212 <http://pcdsh01.on.br/DecHV6212.gif> (2007-09-26),
-# adopted by the same states as before.
-Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
-# From Frederico A. C. Neves (2008-09-10):
-# According to this decree
-# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
-# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
-# 3rd Feb Sunday. There is an exception on the return date when this is
-# the Carnival Sunday then the return date will be the next Sunday...
-Rule	Brazil	2008	max	-	Oct	Sun>=15	0:00	1:00	S
-Rule	Brazil	2008	2011	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2012	only	-	Feb	Sun>=22	0:00	0	-
-Rule	Brazil	2013	2014	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2015	only	-	Feb	Sun>=22	0:00	0	-
-Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
-Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2026	only	-	Feb	Sun>=22	0:00	0	-
-Rule	Brazil	2027	2033	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2034	only	-	Feb	Sun>=22	0:00	0	-
-Rule	Brazil	2035	2036	-	Feb	Sun>=15	0:00	0	-
-Rule	Brazil	2037	only	-	Feb	Sun>=22	0:00	0	-
-# From Arthur David Olson (2008-09-29):
-# The next is wrong in some years but is better than nothing.
-Rule	Brazil	2038	max	-	Feb	Sun>=15	0:00	0	-
-
-# The latest ruleset listed above says that the following states observe DST:
-# DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-#
-# Fernando de Noronha (administratively part of PE)
-Zone America/Noronha	-2:09:40 -	LMT	1914
-			-2:00	Brazil	-02/-01	1990 Sep 17
-			-2:00	-	-02	1999 Sep 30
-			-2:00	Brazil	-02/-01	2000 Oct 15
-			-2:00	-	-02	2001 Sep 13
-			-2:00	Brazil	-02/-01	2002 Oct  1
-			-2:00	-	-02
-# Other Atlantic islands have no permanent settlement.
-# These include Trindade and Martim Vaz (administratively part of ES),
-# Rocas Atoll (RN), and the St Peter and St Paul Archipelago (PE).
-# Fernando de Noronha was a separate territory from 1942-09-02 to 1989-01-01;
-# it also included the Penedos.
-#
-# Amapá (AP), east Pará (PA)
-# East Pará includes Belém, Marabá, Serra Norte, and São Félix do Xingu.
-# The division between east and west Pará is the river Xingu.
-# In the north a very small part from the river Javary (now Jari I guess,
-# the border with Amapá) to the Amazon, then to the Xingu.
-Zone America/Belem	-3:13:56 -	LMT	1914
-			-3:00	Brazil	-03/-02	1988 Sep 12
-			-3:00	-	-03
-#
-# west Pará (PA)
-# West Pará includes Altamira, Óbidos, Prainha, Oriximiná, and Santarém.
-Zone America/Santarem	-3:38:48 -	LMT	1914
-			-4:00	Brazil	-04/-03	1988 Sep 12
-			-4:00	-	-04	2008 Jun 24  0:00
-			-3:00	-	-03
-#
-# Maranhão (MA), Piauí (PI), Ceará (CE), Rio Grande do Norte (RN),
-# Paraíba (PB)
-Zone America/Fortaleza	-2:34:00 -	LMT	1914
-			-3:00	Brazil	-03/-02	1990 Sep 17
-			-3:00	-	-03	1999 Sep 30
-			-3:00	Brazil	-03/-02	2000 Oct 22
-			-3:00	-	-03	2001 Sep 13
-			-3:00	Brazil	-03/-02	2002 Oct  1
-			-3:00	-	-03
-#
-# Pernambuco (PE) (except Atlantic islands)
-Zone America/Recife	-2:19:36 -	LMT	1914
-			-3:00	Brazil	-03/-02	1990 Sep 17
-			-3:00	-	-03	1999 Sep 30
-			-3:00	Brazil	-03/-02	2000 Oct 15
-			-3:00	-	-03	2001 Sep 13
-			-3:00	Brazil	-03/-02	2002 Oct  1
-			-3:00	-	-03
-#
-# Tocantins (TO)
-Zone America/Araguaina	-3:12:48 -	LMT	1914
-			-3:00	Brazil	-03/-02	1990 Sep 17
-			-3:00	-	-03	1995 Sep 14
-			-3:00	Brazil	-03/-02	2003 Sep 24
-			-3:00	-	-03	2012 Oct 21
-			-3:00	Brazil	-03/-02	2013 Sep
-			-3:00	-	-03
-#
-# Alagoas (AL), Sergipe (SE)
-Zone America/Maceio	-2:22:52 -	LMT	1914
-			-3:00	Brazil	-03/-02	1990 Sep 17
-			-3:00	-	-03	1995 Oct 13
-			-3:00	Brazil	-03/-02	1996 Sep  4
-			-3:00	-	-03	1999 Sep 30
-			-3:00	Brazil	-03/-02	2000 Oct 22
-			-3:00	-	-03	2001 Sep 13
-			-3:00	Brazil	-03/-02	2002 Oct  1
-			-3:00	-	-03
-#
-# Bahia (BA)
-# There are too many Salvadors elsewhere, so use America/Bahia instead
-# of America/Salvador.
-Zone America/Bahia	-2:34:04 -	LMT	1914
-			-3:00	Brazil	-03/-02	2003 Sep 24
-			-3:00	-	-03	2011 Oct 16
-			-3:00	Brazil	-03/-02	2012 Oct 21
-			-3:00	-	-03
-#
-# Goiás (GO), Distrito Federal (DF), Minas Gerais (MG),
-# Espírito Santo (ES), Rio de Janeiro (RJ), São Paulo (SP), Paraná (PR),
-# Santa Catarina (SC), Rio Grande do Sul (RS)
-Zone America/Sao_Paulo	-3:06:28 -	LMT	1914
-			-3:00	Brazil	-03/-02	1963 Oct 23  0:00
-			-3:00	1:00	-02	1964
-			-3:00	Brazil	-03/-02
-#
-# Mato Grosso do Sul (MS)
-Zone America/Campo_Grande -3:38:28 -	LMT	1914
-			-4:00	Brazil	-04/-03
-#
-# Mato Grosso (MT)
-Zone America/Cuiaba	-3:44:20 -	LMT	1914
-			-4:00	Brazil	-04/-03	2003 Sep 24
-			-4:00	-	-04	2004 Oct  1
-			-4:00	Brazil	-04/-03
-#
-# Rondônia (RO)
-Zone America/Porto_Velho -4:15:36 -	LMT	1914
-			-4:00	Brazil	-04/-03	1988 Sep 12
-			-4:00	-	-04
-#
-# Roraima (RR)
-Zone America/Boa_Vista	-4:02:40 -	LMT	1914
-			-4:00	Brazil	-04/-03	1988 Sep 12
-			-4:00	-	-04	1999 Sep 30
-			-4:00	Brazil	-04/-03	2000 Oct 15
-			-4:00	-	-04
-#
-# east Amazonas (AM): Boca do Acre, Jutaí, Manaus, Floriano Peixoto
-# The great circle line from Tabatinga to Porto Acre divides
-# east from west Amazonas.
-Zone America/Manaus	-4:00:04 -	LMT	1914
-			-4:00	Brazil	-04/-03	1988 Sep 12
-			-4:00	-	-04	1993 Sep 28
-			-4:00	Brazil	-04/-03	1994 Sep 22
-			-4:00	-	-04
-#
-# west Amazonas (AM): Atalaia do Norte, Boca do Maoco, Benjamin Constant,
-#	Eirunepé, Envira, Ipixuna
-Zone America/Eirunepe	-4:39:28 -	LMT	1914
-			-5:00	Brazil	-05/-04	1988 Sep 12
-			-5:00	-	-05	1993 Sep 28
-			-5:00	Brazil	-05/-04	1994 Sep 22
-			-5:00	-	-05	2008 Jun 24  0:00
-			-4:00	-	-04	2013 Nov 10
-			-5:00	-	-05
-#
-# Acre (AC)
-Zone America/Rio_Branco	-4:31:12 -	LMT	1914
-			-5:00	Brazil	-05/-04	1988 Sep 12
-			-5:00	-	-05	2008 Jun 24  0:00
-			-4:00	-	-04	2013 Nov 10
-			-5:00	-	-05
-
-# Chile
-
-# From Paul Eggert (2015-04-03):
-# Shanks & Pottenger says America/Santiago introduced standard time in
-# 1890 and rounds its UTC offset to 70W40; guess that in practice this
-# was the same offset as in 1916-1919.  It also says Pacific/Easter
-# standardized on 109W22 in 1890; assume this didn't change the clocks.
-#
-# Dates for America/Santiago from 1910 to 2004 are primarily from
-# the following source, cited by Oscar van Vlijmen (2006-10-08):
-# [1] Chile Law
-# http://www.webexhibits.org/daylightsaving/chile.html
-# This contains a copy of a this official table:
-# Cambios en la hora oficial de Chile desde 1900 (retrieved 2008-03-30)
-# http://web.archive.org/web/20080330200901/http://www.horaoficial.cl/cambio.htm
-# [1] needs several corrections, though.
-#
-# The first set of corrections is from:
-# [2] History of the Official Time of Chile
-# http://www.horaoficial.cl/ing/horaof_ing.html (retrieved 2012-03-06).  See:
-# http://web.archive.org/web/20120306042032/http://www.horaoficial.cl/ing/horaof_ing.html
-# This is an English translation of:
-# Historia de la hora oficial de Chile (retrieved 2012-10-24).  See:
-# http://web.archive.org/web/20121024234627/http://www.horaoficial.cl/horaof.htm
-# A fancier Spanish version (requiring mouse-clicking) is at:
-# http://www.horaoficial.cl/historia_hora.html
-# Conflicts between [1] and [2] were resolved as follows:
-#
-#  - [1] says the 1910 transition was Jan 1, [2] says Jan 10 and cites
-#    Boletín No. 1, Aviso No. 1 (1910).  Go with [2].
-#
-#  - [1] says SMT was -4:42:45, [2] says Chile's official time from
-#    1916 to 1919 was -4:42:46.3, the meridian of Chile's National
-#    Astronomical Observatory (OAN), then located in what is now
-#    Quinta Normal in Santiago.  Go with [2], rounding it to -4:42:46.
-#
-#  - [1] says the 1918 transition was Sep 1, [2] says Sep 10 and cites
-#    Boletín No. 22, Aviso No. 129/1918 (1918-08-23).  Go with [2].
-#
-#  - [1] does not give times for transitions; assume they occur
-#    at midnight mainland time, the current common practice.  However,
-#    go with [2]'s specification of 23:00 for the 1947-05-21 transition.
-#
-# Another correction to [1] is from Jesper Nørgaard Welen, who
-# wrote (2006-10-08), "I think that there are some obvious mistakes in
-# the suggested link from Oscar van Vlijmen,... for instance entry 66
-# says that GMT-4 ended 1990-09-12 while entry 67 only begins GMT-3 at
-# 1990-09-15 (they should have been 1990-09-15 and 1990-09-16
-# respectively), but anyhow it clears up some doubts too."
-#
-# Data for Pacific/Easter from 1910 through 1967 come from Shanks &
-# Pottenger.  After that, for lack of better info assume
-# Pacific/Easter is always two hours behind America/Santiago;
-# this is known to work for DST transitions starting in 2008 and
-# may well be true for earlier transitions.
-
-# From Eduardo Krell (1995-10-19):
-# The law says to switch to DST at midnight [24:00] on the second SATURDAY
-# of October....  The law is the same for March and October.
-# (1998-09-29):
-# Because of the drought this year, the government decided to go into
-# DST earlier (saturday 9/26 at 24:00). This is a one-time change only ...
-# (unless there's another dry season next year, I guess).
-
-# From Julio I. Pacheco Troncoso (1999-03-18):
-# Because of the same drought, the government decided to end DST later,
-# on April 3, (one-time change).
-
-# From Germán Poo-Caamaño (2008-03-03):
-# Due to drought, Chile extends Daylight Time in three weeks.  This
-# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
-# and Saturday 3/29 at 22:00 for Pacific/Easter)
-# The Supreme Decree is located at
-# http://www.shoa.cl/servicios/supremo316.pdf
-#
-# From José Miguel Garrido (2008-03-05):
-# http://www.shoa.cl/noticias/2008/04hora/hora.htm
-
-# From Angel Chiang (2010-03-04):
-# Subject: DST in Chile exceptionally extended to 3 April due to earthquake
-# http://www.gobiernodechile.cl/viewNoticia.aspx?idArticulo=30098
-#
-# From Arthur David Olson (2010-03-06):
-# Angel Chiang's message confirmed by Julio Pacheco; Julio provided a patch.
-
-# From Glenn Eychaner (2011-03-28):
-# http://diario.elmercurio.com/2011/03/28/_portada/_portada/noticias/7565897A-CA86-49E6-9E03-660B21A4883E.htm?id=3D{7565897A-CA86-49E6-9E03-660B21A4883E}
-# In English:
-# Chile's clocks will go back an hour this year on the 7th of May instead
-# of this Saturday. They will go forward again the 3rd Saturday in
-# August, not in October as they have since 1968.
-
-# From Mauricio Parada (2012-02-22), translated by Glenn Eychaner (2012-02-23):
-# As stated in the website of the Chilean Energy Ministry
-# http://www.minenergia.cl/ministerio/noticias/generales/gobierno-anuncia-fechas-de-cambio-de.html
-# The Chilean Government has decided to postpone the entrance into winter time
-# (to leave DST) from March 11 2012 to April 28th 2012....
-# Quote from the website communication:
-#
-# 6. For the year 2012, the dates of entry into winter time will be as follows:
-# a. Saturday April 28, 2012, clocks should go back 60 minutes; that is, at
-# 23:59:59, instead of passing to 0:00, the time should be adjusted to be 23:00
-# of the same day.
-# b. Saturday, September 1, 2012, clocks should go forward 60 minutes; that is,
-# at 23:59:59, instead of passing to 0:00, the time should be adjusted to be
-# 01:00 on September 2.
-
-# From Steffen Thorsen (2013-02-15):
-# According to several news sources, Chile has extended DST this year,
-# they will end DST later and start DST earlier than planned.  They
-# hope to save energy.  The new end date is 2013-04-28 00:00 and new
-# start date is 2013-09-08 00:00....
-# http://www.gob.cl/informa/2013/02/15/gobierno-anuncia-fechas-de-cambio-de-hora-para-el-ano-2013.htm
-
-# From José Miguel Garrido (2014-02-19):
-# Today appeared in the Diario Oficial a decree amending the time change
-# dates to 2014.
-# DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC)
-# DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC)
-# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf
-
-# From Eduardo Romero Urra (2015-03-03):
-# Today has been published officially that Chile will use the DST time
-# permanently until March 25 of 2017
-# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg
-#
-# From Paul Eggert (2015-03-03):
-# For now, assume that the extension will persist indefinitely.
-
-# From Juan Correa (2016-03-18):
-# The decree regarding DST has been published in today's Official Gazette:
-# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/
-# http://www.leychile.cl/Navegar?idNorma=1088502
-# It does consider the second Saturday of May and August as the dates
-# for the transition; and it lists DST dates until 2019, but I think
-# this scheme will stick.
-#
-# From Paul Eggert (2016-03-18):
-# For now, assume the pattern holds for the indefinite future.
-# The decree says transitions occur at 24:00; in practice this appears
-# to mean 24:00 mainland time, not 24:00 local time, so that Easter
-# Island is always two hours behind the mainland.
-
-# From Juan Correa (2016-12-04):
-# Magallanes region ... will keep DST (UTC -3) all year round....
-# http://www.soychile.cl/Santiago/Sociedad/2016/12/04/433428/Bachelet-firmo-el-decreto-para-establecer-un-horario-unico-para-la-Region-de-Magallanes.aspx
-#
-# From Deborah Goldsmith (2017-01-19):
-# http://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf
-# From Paul Eggert (2017-01-19):
-# The above says the Magallanes change expires 2019-05-11 at 24:00,
-# so in theory, they will revert to -04/-03 after that, which means
-# they will switch from -03 to -04 one hour after Santiago does that day.
-# For now, assume that they will not revert.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Chile	1927	1931	-	Sep	 1	0:00	1:00	S
-Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
-Rule	Chile	1968	only	-	Nov	 3	4:00u	1:00	S
-Rule	Chile	1969	only	-	Mar	30	3:00u	0	-
-Rule	Chile	1969	only	-	Nov	23	4:00u	1:00	S
-Rule	Chile	1970	only	-	Mar	29	3:00u	0	-
-Rule	Chile	1971	only	-	Mar	14	3:00u	0	-
-Rule	Chile	1970	1972	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1972	1986	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1973	only	-	Sep	30	4:00u	1:00	S
-Rule	Chile	1974	1987	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1987	only	-	Apr	12	3:00u	0	-
-Rule	Chile	1988	1990	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1988	1989	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1990	only	-	Sep	16	4:00u	1:00	S
-Rule	Chile	1991	1996	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1991	1997	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	1997	only	-	Mar	30	3:00u	0	-
-Rule	Chile	1998	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
-Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
-Rule	Chile	1999	2010	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
-# N.B.: the end of March 29 in Chile is March 30 in Universal time,
-# which is used below in specifying the transition.
-Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
-Rule	Chile	2009	only	-	Mar	Sun>=9	3:00u	0	-
-Rule	Chile	2010	only	-	Apr	Sun>=1	3:00u	0	-
-Rule	Chile	2011	only	-	May	Sun>=2	3:00u	0	-
-Rule	Chile	2011	only	-	Aug	Sun>=16	4:00u	1:00	S
-Rule	Chile	2012	2014	-	Apr	Sun>=23	3:00u	0	-
-Rule	Chile	2012	2014	-	Sep	Sun>=2	4:00u	1:00	S
-Rule	Chile	2016	max	-	May	Sun>=9	3:00u	0	-
-Rule	Chile	2016	max	-	Aug	Sun>=9	4:00u	1:00	S
-# IATA SSIM anomalies: (1992-02) says 1992-03-14;
-# (1996-09) says 1998-03-08.  Ignore these.
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Santiago	-4:42:46 -	LMT	1890
-			-4:42:46 -	SMT	1910 Jan 10 # Santiago Mean Time
-			-5:00	-	-05	1916 Jul  1
-			-4:42:46 -	SMT	1918 Sep 10
-			-4:00	-	-04	1919 Jul  1
-			-4:42:46 -	SMT	1927 Sep  1
-			-5:00	Chile	-05/-04	1932 Sep  1
-			-4:00	-	-04	1942 Jun  1
-			-5:00	-	-05	1942 Aug  1
-			-4:00	-	-04	1946 Jul 15
-			-4:00	1:00	-03	1946 Sep  1 # central Chile
-			-4:00	-	-04	1947 Apr  1
-			-5:00	-	-05	1947 May 21 23:00
-			-4:00	Chile	-04/-03
-Zone America/Punta_Arenas -4:43:40 -	LMT	1890
-			-4:42:46 -	SMT	1910 Jan 10
-			-5:00	-	-05	1916 Jul  1
-			-4:42:46 -	SMT	1918 Sep 10
-			-4:00	-	-04	1919 Jul  1
-			-4:42:46 -	SMT	1927 Sep  1
-			-5:00	Chile	-05/-04	1932 Sep  1
-			-4:00	-	-04	1942 Jun  1
-			-5:00	-	-05	1942 Aug  1
-			-4:00	-	-04	1947 Apr  1
-			-5:00	-	-05	1947 May 21 23:00
-			-4:00	Chile	-04/-03	2016 Dec  4
-			-3:00	-	-03
-Zone Pacific/Easter	-7:17:28 -	LMT	1890
-			-7:17:28 -	EMT	1932 Sep    # Easter Mean Time
-			-7:00	Chile	-07/-06	1982 Mar 14 3:00u # Easter Time
-			-6:00	Chile	-06/-05
-#
-# Salas y Gómez Island is uninhabited.
-# Other Chilean locations, including Juan Fernández Is, Desventuradas Is,
-# and Antarctic bases, are like America/Santiago.
-
-# Antarctic base using South American rules
-# (See the file 'antarctica' for more.)
-#
-# Palmer, Anvers Island, since 1965 (moved 2 miles in 1968)
-#
-# From Ethan Dicks (1996-10-06):
-# It keeps the same time as Punta Arenas, Chile, because, just like us
-# and the South Pole, that's the other end of their supply line....
-# I verified with someone who was there that since 1980,
-# Palmer has followed Chile.  Prior to that, before the Falklands War,
-# Palmer used to be supplied from Argentina.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Antarctica/Palmer	0	-	-00	1965
-			-4:00	Arg	-04/-03	1969 Oct  5
-			-3:00	Arg	-03/-02	1982 May
-			-4:00	Chile	-04/-03	2016 Dec  4
-			-3:00	-	-03
-
-# Colombia
-
-# Milne gives 4:56:16.4 for Bogotá time in 1899; round to nearest.  He writes,
-# "A variation of fifteen minutes in the public clocks of Bogota is not rare."
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	CO	1992	only	-	May	 3	0:00	1:00	S
-Rule	CO	1993	only	-	Apr	 4	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Bogota	-4:56:16 -	LMT	1884 Mar 13
-			-4:56:16 -	BMT	1914 Nov 23 # Bogotá Mean Time
-			-5:00	CO	-05/-04
-# Malpelo, Providencia, San Andres
-# no information; probably like America/Bogota
-
-# Curaçao
-
-# Milne gives 4:35:46.9 for Curaçao mean time; round to nearest.
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say that The Bottom and Philipsburg have been at
-# -4:00 since standard time was introduced on 1912-03-02; and that
-# Kralendijk and Rincon used Kralendijk Mean Time (-4:33:08) from
-# 1912-02-02 to 1965-01-01.  The former is dubious, since S&P also say
-# Saba Island has been like Curaçao.
-# This all predates our 1970 cutoff, though.
-#
-# By July 2007 Curaçao and St Maarten are planned to become
-# associated states within the Netherlands, much like Aruba;
-# Bonaire, Saba and St Eustatius would become directly part of the
-# Netherlands as Kingdom Islands.  This won't affect their time zones
-# though, as far as we know.
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Curacao	-4:35:47 -	LMT	1912 Feb 12 # Willemstad
-			-4:30	-	-0430	1965
-			-4:00	-	AST
-
-# From Arthur David Olson (2011-06-15):
-# use links for places with new iso3166 codes.
-# The name "Lower Prince's Quarter" is both longer than fourteen characters
-# and contains an apostrophe; use "Lower_Princes" below.
-
-Link	America/Curacao	America/Lower_Princes	# Sint Maarten
-Link	America/Curacao	America/Kralendijk	# Caribbean Netherlands
-
-# Ecuador
-#
-# Milne says the Central and South American Telegraph Company used -5:24:15.
-#
-# From Alois Treindl (2016-12-15):
-# http://www.elcomercio.com/actualidad/hora-sixto-1993.html
-# ... Whether the law applied also to Galápagos, I do not know.
-# From Paul Eggert (2016-12-15):
-# http://www.elcomercio.com/afull/modificacion-husohorario-ecuador-presidentes-decreto.html
-# This says President Sixto Durán Ballén signed decree No. 285, which
-# established DST from 1992-11-28 to 1993-02-05; it does not give transition
-# times.  The people called it "hora de Sixto" ("Sixto hour").  The change did
-# not go over well; a popular song "Qué hora es" by Jaime Guevara had lyrics
-# that included "Amanecía en mitad de la noche, los guaguas iban a clase sin
-# sol" ("It was dawning in the middle of the night, the buses went to class
-# without sun").  Although Ballén's campaign slogan was "Ni un paso atrás"
-# (Not one step back), the clocks went back in 1993 and the experiment was not
-# repeated.  For now, assume transitions were at 00:00 local time country-wide.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Ecuador	1992	only	-	Nov	28	0:00	1:00	S
-Rule	Ecuador	1993	only	-	Feb	 5	0:00	0	-
-#
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Guayaquil	-5:19:20 -	LMT	1890
-			-5:14:00 -	QMT	1931 # Quito Mean Time
-			-5:00	Ecuador	-05/-04
-Zone Pacific/Galapagos	-5:58:24 -	LMT	1931 # Puerto Baquerizo Moreno
-			-5:00	-	-05	1986
-			-6:00	Ecuador	-06/-05
-
-# Falklands
-
-# From Paul Eggert (2006-03-22):
-# Between 1990 and 2000 inclusive, Shanks & Pottenger and the IATA agree except
-# the IATA gives 1996-09-08.  Go with Shanks & Pottenger.
-
-# From Falkland Islands Government Office, London (2001-01-22)
-# via Jesper Nørgaard:
-# ... the clocks revert back to Local Mean Time at 2 am on Sunday 15
-# April 2001 and advance one hour to summer time at 2 am on Sunday 2
-# September.  It is anticipated that the clocks will revert back at 2
-# am on Sunday 21 April 2002 and advance to summer time at 2 am on
-# Sunday 1 September.
-
-# From Rives McDow (2001-02-13):
-#
-# I have communicated several times with people there, and the last
-# time I had communications that was helpful was in 1998.  Here is
-# what was said then:
-#
-# "The general rule was that Stanley used daylight saving and the Camp
-# did not. However for various reasons many people in the Camp have
-# started to use daylight saving (known locally as 'Stanley Time')
-# There is no rule as to who uses daylight saving - it is a matter of
-# personal choice and so it is impossible to draw a map showing who
-# uses it and who does not. Any list would be out of date as soon as
-# it was produced. This year daylight saving ended on April 18/19th
-# and started again on September 12/13th.  I do not know what the rule
-# is, but can find out if you like.  We do not change at the same time
-# as UK or Chile."
-#
-# I did have in my notes that the rule was "Second Saturday in Sep at
-# 0:00 until third Saturday in Apr at 0:00".  I think that this does
-# not agree in some cases with Shanks; is this true?
-#
-# Also, there is no mention in the list that some areas in the
-# Falklands do not use DST.  I have found in my communications there
-# that these areas are on the western half of East Falkland and all of
-# West Falkland.  Stanley is the only place that consistently observes
-# DST.  Again, as in other places in the world, the farmers don't like
-# it.  West Falkland is almost entirely sheep farmers.
-#
-# I know one lady there that keeps a list of which farm keeps DST and
-# which doesn't each year.  She runs a shop in Stanley, and says that
-# the list changes each year.  She uses it to communicate to her
-# customers, catching them when they are home for lunch or dinner.
-
-# From Paul Eggert (2001-03-05):
-# For now, we'll just record the time in Stanley, since we have no
-# better info.
-
-# From Steffen Thorsen (2011-04-01):
-# The Falkland Islands will not turn back clocks this winter, but stay on
-# daylight saving time.
-#
-# One source:
-# http://www.falklandnews.com/public/story.cfm?get=5914&source=3
-#
-# We have gotten this confirmed by a clerk of the legislative assembly:
-# Normally the clocks revert to Local Mean Time (UTC/GMT -4 hours) on the
-# third Sunday of April at 0200hrs and advance to Summer Time (UTC/GMT -3
-# hours) on the first Sunday of September at 0200hrs.
-#
-# IMPORTANT NOTE: During 2011, on a trial basis, the Falkland Islands
-# will not revert to local mean time, but clocks will remain on Summer
-# time (UTC/GMT - 3 hours) throughout the whole of 2011.  Any long term
-# change to local time following the trial period will be notified.
-#
-# From Andrew Newman (2012-02-24)
-# A letter from Justin McPhee, Chief Executive,
-# Cable & Wireless Falkland Islands (dated 2012-02-22)
-# states...
-#   The current Atlantic/Stanley entry under South America expects the
-#   clocks to go back to standard Falklands Time (FKT) on the 15th April.
-#   The database entry states that in 2011 Stanley was staying on fixed
-#   summer time on a trial basis only.  FIG need to contact IANA and/or
-#   the maintainers of the database to inform them we're adopting
-#   the same policy this year and suggest recommendations for future years.
-#
-# For now we will assume permanent summer time for the Falklands
-# until advised differently (to apply for 2012 and beyond, after the 2011
-# experiment was apparently successful.)
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Falk	1937	1938	-	Sep	lastSun	0:00	1:00	S
-Rule	Falk	1938	1942	-	Mar	Sun>=19	0:00	0	-
-Rule	Falk	1939	only	-	Oct	1	0:00	1:00	S
-Rule	Falk	1940	1942	-	Sep	lastSun	0:00	1:00	S
-Rule	Falk	1943	only	-	Jan	1	0:00	0	-
-Rule	Falk	1983	only	-	Sep	lastSun	0:00	1:00	S
-Rule	Falk	1984	1985	-	Apr	lastSun	0:00	0	-
-Rule	Falk	1984	only	-	Sep	16	0:00	1:00	S
-Rule	Falk	1985	2000	-	Sep	Sun>=9	0:00	1:00	S
-Rule	Falk	1986	2000	-	Apr	Sun>=16	0:00	0	-
-Rule	Falk	2001	2010	-	Apr	Sun>=15	2:00	0	-
-Rule	Falk	2001	2010	-	Sep	Sun>=1	2:00	1:00	S
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/Stanley	-3:51:24 -	LMT	1890
-			-3:51:24 -	SMT	1912 Mar 12 # Stanley Mean Time
-			-4:00	Falk	-04/-03	1983 May
-			-3:00	Falk	-03/-02	1985 Sep 15
-			-4:00	Falk	-04/-03	2010 Sep  5  2:00
-			-3:00	-	-03
-
-# French Guiana
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Cayenne	-3:29:20 -	LMT	1911 Jul
-			-4:00	-	-04	1967 Oct
-			-3:00	-	-03
-
-# Guyana
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Guyana	-3:52:40 -	LMT	1915 Mar    # Georgetown
-			-3:45	-	-0345	1975 Jul 31
-			-3:00	-	-03	1991
-# IATA SSIM (1996-06) says -4:00.  Assume a 1991 switch.
-			-4:00	-	-04
-
-# Paraguay
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger say that spring transitions are 01:00 -> 02:00,
-# and autumn transitions are 00:00 -> 23:00.  Go with pre-1999
-# editions of Shanks, and with the IATA, who say transitions occur at 00:00.
-#
-# From Waldemar Villamayor-Venialbo (2013-09-20):
-# No time of the day is established for the adjustment, so people normally
-# adjust their clocks at 0 hour of the given dates.
-#
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Para	1975	1988	-	Oct	 1	0:00	1:00	S
-Rule	Para	1975	1978	-	Mar	 1	0:00	0	-
-Rule	Para	1979	1991	-	Apr	 1	0:00	0	-
-Rule	Para	1989	only	-	Oct	22	0:00	1:00	S
-Rule	Para	1990	only	-	Oct	 1	0:00	1:00	S
-Rule	Para	1991	only	-	Oct	 6	0:00	1:00	S
-Rule	Para	1992	only	-	Mar	 1	0:00	0	-
-Rule	Para	1992	only	-	Oct	 5	0:00	1:00	S
-Rule	Para	1993	only	-	Mar	31	0:00	0	-
-Rule	Para	1993	1995	-	Oct	 1	0:00	1:00	S
-Rule	Para	1994	1995	-	Feb	lastSun	0:00	0	-
-Rule	Para	1996	only	-	Mar	 1	0:00	0	-
-# IATA SSIM (2000-02) says 1999-10-10; ignore this for now.
-# From Steffen Thorsen (2000-10-02):
-# I have three independent reports that Paraguay changed to DST this Sunday
-# (10-01).
-#
-# Translated by Gwillim Law (2001-02-27) from
-# Noticias, a daily paper in Asunción, Paraguay (2000-10-01):
-# http://www.diarionoticias.com.py/011000/nacional/naciona1.htm
-# Starting at 0:00 today, the clock will be set forward 60 minutes, in
-# fulfillment of Decree No. 7,273 of the Executive Power....  The time change
-# system has been operating for several years.  Formerly there was a separate
-# decree each year; the new law has the same effect, but permanently.  Every
-# year, the time will change on the first Sunday of October; likewise, the
-# clock will be set back on the first Sunday of March.
-#
-Rule	Para	1996	2001	-	Oct	Sun>=1	0:00	1:00	S
-# IATA SSIM (1997-09) says Mar 1; go with Shanks & Pottenger.
-Rule	Para	1997	only	-	Feb	lastSun	0:00	0	-
-# Shanks & Pottenger say 1999-02-28; IATA SSIM (1999-02) says 1999-02-27, but
-# (1999-09) reports no date; go with above sources and Gerd Knops (2001-02-27).
-Rule	Para	1998	2001	-	Mar	Sun>=1	0:00	0	-
-# From Rives McDow (2002-02-28):
-# A decree was issued in Paraguay (No. 16350) on 2002-02-26 that changed the
-# dst method to be from the first Sunday in September to the first Sunday in
-# April.
-Rule	Para	2002	2004	-	Apr	Sun>=1	0:00	0	-
-Rule	Para	2002	2003	-	Sep	Sun>=1	0:00	1:00	S
-#
-# From Jesper Nørgaard Welen (2005-01-02):
-# There are several sources that claim that Paraguay made
-# a timezone rule change in autumn 2004.
-# From Steffen Thorsen (2005-01-05):
-# Decree 1,867 (2004-03-05)
-# From Carlos Raúl Perasso via Jesper Nørgaard Welen (2006-10-13)
-# http://www.presidencia.gov.py/decretos/D1867.pdf
-Rule	Para	2004	2009	-	Oct	Sun>=15	0:00	1:00	S
-Rule	Para	2005	2009	-	Mar	Sun>=8	0:00	0	-
-# From Carlos Raúl Perasso (2010-02-18):
-# By decree number 3958 issued yesterday
-# http://www.presidencia.gov.py/v1/wp-content/uploads/2010/02/decreto3958.pdf
-# Paraguay changes its DST schedule, postponing the March rule to April and
-# modifying the October date. The decree reads:
-# ...
-# Art. 1. It is hereby established that from the second Sunday of the month of
-# April of this year (2010), the official time is to be set back 60 minutes,
-# and that on the first Sunday of the month of October, it is to be set
-# forward 60 minutes, in all the territory of the Paraguayan Republic.
-# ...
-Rule	Para	2010	max	-	Oct	Sun>=1	0:00	1:00	S
-Rule	Para	2010	2012	-	Apr	Sun>=8	0:00	0	-
-#
-# From Steffen Thorsen (2013-03-07):
-# Paraguay will end DST on 2013-03-24 00:00....
-# http://www.ande.gov.py/interna.php?id=1075
-#
-# From Carlos Raúl Perasso (2013-03-15):
-# The change in Paraguay is now final.  Decree number 10780
-# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf
-# From Carlos Raúl Perasso (2014-02-28):
-# Decree 1264 can be found at:
-# http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf
-Rule	Para	2013	max	-	Mar	Sun>=22	0:00	0	-
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Asuncion	-3:50:40 -	LMT	1890
-			-3:50:40 -	AMT	1931 Oct 10 # Asunción Mean Time
-			-4:00	-	-04	1972 Oct
-			-3:00	-	-03	1974 Apr
-			-4:00	Para	-04/-03
-
-# Peru
-#
-# From Evelyn C. Leeper via Mark Brader (2003-10-26)
-# <news:xrGmb.39935$gA1.13896113@news4.srv.hcvlny.cv.net>:
-# When we were in Peru in 1985-1986, they apparently switched over
-# sometime between December 29 and January 3 while we were on the Amazon.
-#
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger don't have this transition.  Assume 1986 was like 1987.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Peru	1938	only	-	Jan	 1	0:00	1:00	S
-Rule	Peru	1938	only	-	Apr	 1	0:00	0	-
-Rule	Peru	1938	1939	-	Sep	lastSun	0:00	1:00	S
-Rule	Peru	1939	1940	-	Mar	Sun>=24	0:00	0	-
-Rule	Peru	1986	1987	-	Jan	 1	0:00	1:00	S
-Rule	Peru	1986	1987	-	Apr	 1	0:00	0	-
-Rule	Peru	1990	only	-	Jan	 1	0:00	1:00	S
-Rule	Peru	1990	only	-	Apr	 1	0:00	0	-
-# IATA is ambiguous for 1993/1995; go with Shanks & Pottenger.
-Rule	Peru	1994	only	-	Jan	 1	0:00	1:00	S
-Rule	Peru	1994	only	-	Apr	 1	0:00	0	-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Lima	-5:08:12 -	LMT	1890
-			-5:08:36 -	LMT	1908 Jul 28 # Lima Mean Time?
-			-5:00	Peru	-05/-04
-
-# South Georgia
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone Atlantic/South_Georgia -2:26:08 -	LMT	1890 # Grytviken
-			-2:00	-	-02
-
-# South Sandwich Is
-# uninhabited; scientific personnel have wintered
-
-# Suriname
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Paramaribo	-3:40:40 -	LMT	1911
-			-3:40:52 -	PMT	1935     # Paramaribo Mean Time
-			-3:40:36 -	PMT	1945 Oct    # The capital moved?
-			-3:30	-	-0330	1984 Oct
-			-3:00	-	-03
-
-# Trinidad and Tobago
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone America/Port_of_Spain -4:06:04 -	LMT	1912 Mar 2
-			-4:00	-	AST
-
-# These all agree with Trinidad and Tobago since 1970.
-Link America/Port_of_Spain America/Anguilla
-Link America/Port_of_Spain America/Antigua
-Link America/Port_of_Spain America/Dominica
-Link America/Port_of_Spain America/Grenada
-Link America/Port_of_Spain America/Guadeloupe
-Link America/Port_of_Spain America/Marigot	# St Martin (French part)
-Link America/Port_of_Spain America/Montserrat
-Link America/Port_of_Spain America/St_Barthelemy # St Barthélemy
-Link America/Port_of_Spain America/St_Kitts	# St Kitts & Nevis
-Link America/Port_of_Spain America/St_Lucia
-Link America/Port_of_Spain America/St_Thomas	# Virgin Islands (US)
-Link America/Port_of_Spain America/St_Vincent
-Link America/Port_of_Spain America/Tortola	# Virgin Islands (UK)
-
-# Uruguay
-# From Paul Eggert (1993-11-18):
-# Uruguay wins the prize for the strangest peacetime manipulation of the rules.
-# From Shanks & Pottenger:
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-# Whitman gives 1923 Oct 1; go with Shanks & Pottenger.
-Rule	Uruguay	1923	only	-	Oct	 2	 0:00	0:30	HS
-Rule	Uruguay	1924	1926	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1924	1925	-	Oct	 1	 0:00	0:30	HS
-Rule	Uruguay	1933	1935	-	Oct	lastSun	 0:00	0:30	HS
-# Shanks & Pottenger give 1935 Apr 1 0:00 & 1936 Mar 30 0:00; go with Whitman.
-Rule	Uruguay	1934	1936	-	Mar	Sat>=25	23:30s	0	-
-Rule	Uruguay	1936	only	-	Nov	 1	 0:00	0:30	HS
-Rule	Uruguay	1937	1941	-	Mar	lastSun	 0:00	0	-
-# Whitman gives 1937 Oct 3; go with Shanks & Pottenger.
-Rule	Uruguay	1937	1940	-	Oct	lastSun	 0:00	0:30	HS
-# Whitman gives 1941 Oct 24 - 1942 Mar 27, 1942 Dec 14 - 1943 Apr 13,
-# and 1943 Apr 13 "to present time"; go with Shanks & Pottenger.
-Rule	Uruguay	1941	only	-	Aug	 1	 0:00	0:30	HS
-Rule	Uruguay	1942	only	-	Jan	 1	 0:00	0	-
-Rule	Uruguay	1942	only	-	Dec	14	 0:00	1:00	S
-Rule	Uruguay	1943	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1959	only	-	May	24	 0:00	1:00	S
-Rule	Uruguay	1959	only	-	Nov	15	 0:00	0	-
-Rule	Uruguay	1960	only	-	Jan	17	 0:00	1:00	S
-Rule	Uruguay	1960	only	-	Mar	 6	 0:00	0	-
-Rule	Uruguay	1965	1967	-	Apr	Sun>=1	 0:00	1:00	S
-Rule	Uruguay	1965	only	-	Sep	26	 0:00	0	-
-Rule	Uruguay	1966	1967	-	Oct	31	 0:00	0	-
-Rule	Uruguay	1968	1970	-	May	27	 0:00	0:30	HS
-Rule	Uruguay	1968	1970	-	Dec	 2	 0:00	0	-
-Rule	Uruguay	1972	only	-	Apr	24	 0:00	1:00	S
-Rule	Uruguay	1972	only	-	Aug	15	 0:00	0	-
-Rule	Uruguay	1974	only	-	Mar	10	 0:00	0:30	HS
-Rule	Uruguay	1974	only	-	Dec	22	 0:00	1:00	S
-Rule	Uruguay	1976	only	-	Oct	 1	 0:00	0	-
-Rule	Uruguay	1977	only	-	Dec	 4	 0:00	1:00	S
-Rule	Uruguay	1978	only	-	Apr	 1	 0:00	0	-
-Rule	Uruguay	1979	only	-	Oct	 1	 0:00	1:00	S
-Rule	Uruguay	1980	only	-	May	 1	 0:00	0	-
-Rule	Uruguay	1987	only	-	Dec	14	 0:00	1:00	S
-Rule	Uruguay	1988	only	-	Mar	14	 0:00	0	-
-Rule	Uruguay	1988	only	-	Dec	11	 0:00	1:00	S
-Rule	Uruguay	1989	only	-	Mar	12	 0:00	0	-
-Rule	Uruguay	1989	only	-	Oct	29	 0:00	1:00	S
-# Shanks & Pottenger say no DST was observed in 1990/1 and 1991/2,
-# and that 1992/3's DST was from 10-25 to 03-01.  Go with IATA.
-Rule	Uruguay	1990	1992	-	Mar	Sun>=1	 0:00	0	-
-Rule	Uruguay	1990	1991	-	Oct	Sun>=21	 0:00	1:00	S
-Rule	Uruguay	1992	only	-	Oct	18	 0:00	1:00	S
-Rule	Uruguay	1993	only	-	Feb	28	 0:00	0	-
-# From Eduardo Cota (2004-09-20):
-# The Uruguayan government has decreed a change in the local time....
-# http://www.presidencia.gub.uy/decretos/2004091502.htm
-Rule	Uruguay	2004	only	-	Sep	19	 0:00	1:00	S
-# From Steffen Thorsen (2005-03-11):
-# Uruguay's DST was scheduled to end on Sunday, 2005-03-13, but in order to
-# save energy ... it was postponed two weeks....
-# http://www.presidencia.gub.uy/_Web/noticias/2005/03/2005031005.htm
-Rule	Uruguay	2005	only	-	Mar	27	 2:00	0	-
-# From Eduardo Cota (2005-09-27):
-# http://www.presidencia.gub.uy/_Web/decretos/2005/09/CM%20119_09%2009%202005_00001.PDF
-# This means that from 2005-10-09 at 02:00 local time, until 2006-03-12 at
-# 02:00 local time, official time in Uruguay will be at GMT -2.
-Rule	Uruguay	2005	only	-	Oct	 9	 2:00	1:00	S
-Rule	Uruguay	2006	only	-	Mar	12	 2:00	0	-
-# From Jesper Nørgaard Welen (2006-09-06):
-# http://www.presidencia.gub.uy/_web/decretos/2006/09/CM%20210_08%2006%202006_00001.PDF
-#
-# From Steffen Thorsen (2015-06-30):
-# ... it looks like they will not be using DST the coming summer:
-# http://www.elobservador.com.uy/gobierno-resolvio-que-no-habra-cambio-horario-verano-n656787
-# http://www.republica.com.uy/este-ano-no-se-modificara-el-huso-horario-en-uruguay/523760/
-# From Paul Eggert (2015-06-30):
-# Apparently restaurateurs complained that DST caused people to go to the beach
-# instead of out to dinner.
-# From Pablo Camargo (2015-07-13):
-# http://archivo.presidencia.gub.uy/sci/decretos/2015/06/cons_min_201.pdf
-# [dated 2015-06-29; repeals Decree 311/006 dated 2006-09-04]
-Rule	Uruguay	2006	2014	-	Oct	Sun>=1	 2:00	1:00	S
-Rule	Uruguay	2007	2015	-	Mar	Sun>=8	 2:00	0	-
-
-# This Zone can be simplified once we assume zic %z.
-Zone America/Montevideo	-3:44:44 -	LMT	1898 Jun 28
-			-3:44:44 -	MMT	1920 May  1 # Montevideo MT
-			-3:30	Uruguay	-0330/-03 1942 Dec 14
-			-3:00	Uruguay	-03/-02	1968
-			-3:00	Uruguay	-03/-0230 1971
-			-3:00	Uruguay	-03/-02	1974
-			-3:00	Uruguay	-03/-0230 1974 Dec 22
-			-3:00	Uruguay	-03/-02
-
-# Venezuela
-#
-# From Paul Eggert (2015-07-28):
-# For the 1965 transition see Gaceta Oficial No. 27.619 (1964-12-15), p 205.533
-# http://www.pgr.gob.ve/dmdocuments/1964/27619.pdf
-#
-# From John Stainforth (2007-11-28):
-# ... the change for Venezuela originally expected for 2007-12-31 has
-# been brought forward to 2007-12-09.  The official announcement was
-# published today in the "Gaceta Oficial de la República Bolivariana
-# de Venezuela, número 38.819" (official document for all laws or
-# resolution publication)
-# http://www.globovision.com/news.php?nid=72208
-
-# From Alexander Krivenyshev (2016-04-15):
-# https://actualidad.rt.com/actualidad/204758-venezuela-modificar-huso-horario-sequia-elnino
-#
-# From Paul Eggert (2016-04-15):
-# Clocks advance 30 minutes on 2016-05-01 at 02:30....
-# "'Venezuela's new time-zone: hours without light, hours without water,
-# hours of presidential broadcasts, hours of lines,' quipped comedian
-# Jean Mary Curró ...". See: Cawthorne A, Kai D. Venezuela scraps
-# half-hour time difference set by Chavez. Reuters 2016-04-15 14:50 -0400
-# http://www.reuters.com/article/us-venezuela-timezone-idUSKCN0XC2BE
-#
-# From Matt Johnson (2016-04-20):
-# ... published in the official Gazette [2016-04-18], here:
-# http://historico.tsj.gob.ve/gaceta_ext/abril/1842016/E-1842016-4551.pdf
-
-# Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	America/Caracas	-4:27:44 -	LMT	1890
-			-4:27:40 -	CMT	1912 Feb 12 # Caracas Mean Time?
-			-4:30	-	-0430	1965 Jan  1  0:00
-			-4:00	-	-04	2007 Dec  9  3:00
-			-4:30	-	-0430	2016 May  1  2:30
-			-4:00	-	-04
diff --git a/src/timezone/data/systemv b/src/timezone/data/systemv
deleted file mode 100644
index d9e2995756..0000000000
--- a/src/timezone/data/systemv
+++ /dev/null
@@ -1,37 +0,0 @@
-# This file is in the public domain, so clarified as of
-# 2009-05-17 by Arthur David Olson.
-
-# Old rules, should the need arise.
-# No attempt is made to handle Newfoundland, since it cannot be expressed
-# using the System V "TZ" scheme (half-hour offset), or anything outside
-# North America (no support for non-standard DST start/end dates), nor
-# the changes in the DST rules in the US after 1976 (which occurred after
-# the old rules were written).
-#
-# If you need the old rules, uncomment ## lines.
-# Compile this *without* leap second correction for true conformance.
-
-# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	SystemV	min	1973	-	Apr	lastSun	2:00	1:00	D
-Rule	SystemV	min	1973	-	Oct	lastSun	2:00	0	S
-Rule	SystemV	1974	only	-	Jan	6	2:00	1:00	D
-Rule	SystemV	1974	only	-	Nov	lastSun	2:00	0	S
-Rule	SystemV	1975	only	-	Feb	23	2:00	1:00	D
-Rule	SystemV	1975	only	-	Oct	lastSun	2:00	0	S
-Rule	SystemV	1976	max	-	Apr	lastSun	2:00	1:00	D
-Rule	SystemV	1976	max	-	Oct	lastSun	2:00	0	S
-
-# Zone	NAME		GMTOFF	RULES/SAVE	FORMAT	[UNTIL]
-## Zone	SystemV/AST4ADT	-4:00	SystemV		A%sT
-## Zone	SystemV/EST5EDT	-5:00	SystemV		E%sT
-## Zone	SystemV/CST6CDT	-6:00	SystemV		C%sT
-## Zone	SystemV/MST7MDT	-7:00	SystemV		M%sT
-## Zone	SystemV/PST8PDT	-8:00	SystemV		P%sT
-## Zone	SystemV/YST9YDT	-9:00	SystemV		Y%sT
-## Zone	SystemV/AST4	-4:00	-		AST
-## Zone	SystemV/EST5	-5:00	-		EST
-## Zone	SystemV/CST6	-6:00	-		CST
-## Zone	SystemV/MST7	-7:00	-		MST
-## Zone	SystemV/PST8	-8:00	-		PST
-## Zone	SystemV/YST9	-9:00	-		YST
-## Zone	SystemV/HST10	-10:00	-		HST
diff --git a/src/timezone/data/tzdata.zi b/src/timezone/data/tzdata.zi
new file mode 100644
index 0000000000..afa8f85c43
--- /dev/null
+++ b/src/timezone/data/tzdata.zi
@@ -0,0 +1,4150 @@
+# version 2018c
+# This zic input file is in the public domain.
+R A 1916 o - Jun 14 23s 1 S
+R A 1916 1919 - O Sun>=1 23s 0 -
+R A 1917 o - Mar 24 23s 1 S
+R A 1918 o - Mar 9 23s 1 S
+R A 1919 o - Mar 1 23s 1 S
+R A 1920 o - F 14 23s 1 S
+R A 1920 o - O 23 23s 0 -
+R A 1921 o - Mar 14 23s 1 S
+R A 1921 o - Jun 21 23s 0 -
+R A 1939 o - S 11 23s 1 S
+R A 1939 o - N 19 1 0 -
+R A 1944 1945 - Ap M>=1 2 1 S
+R A 1944 o - O 8 2 0 -
+R A 1945 o - S 16 1 0 -
+R A 1971 o - Ap 25 23s 1 S
+R A 1971 o - S 26 23s 0 -
+R A 1977 o - May 6 0 1 S
+R A 1977 o - O 21 0 0 -
+R A 1978 o - Mar 24 1 1 S
+R A 1978 o - S 22 3 0 -
+R A 1980 o - Ap 25 0 1 S
+R A 1980 o - O 31 2 0 -
+Z Africa/Algiers 0:12:12 - LMT 1891 Mar 15 0:1
+0:9:21 - PMT 1911 Mar 11
+0 A WE%sT 1940 F 25 2
+1 A CE%sT 1946 O 7
+0 - WET 1956 Ja 29
+1 - CET 1963 Ap 14
+0 A WE%sT 1977 O 21
+1 A CE%sT 1979 O 26
+0 A WE%sT 1981 May
+1 - CET
+Z Atlantic/Cape_Verde -1:34:4 - LMT 1907
+-2 - -02 1942 S
+-2 1 -01 1945 O 15
+-2 - -02 1975 N 25 2
+-1 - -01
+Z Africa/Ndjamena 1:0:12 - LMT 1912
+1 - WAT 1979 O 14
+1 1 WAST 1980 Mar 8
+1 - WAT
+Z Africa/Abidjan -0:16:8 - LMT 1912
+0 - GMT
+Li Africa/Abidjan Africa/Bamako
+Li Africa/Abidjan Africa/Banjul
+Li Africa/Abidjan Africa/Conakry
+Li Africa/Abidjan Africa/Dakar
+Li Africa/Abidjan Africa/Freetown
+Li Africa/Abidjan Africa/Lome
+Li Africa/Abidjan Africa/Nouakchott
+Li Africa/Abidjan Africa/Ouagadougou
+Li Africa/Abidjan Atlantic/St_Helena
+R B 1940 o - Jul 15 0 1 S
+R B 1940 o - O 1 0 0 -
+R B 1941 o - Ap 15 0 1 S
+R B 1941 o - S 16 0 0 -
+R B 1942 1944 - Ap 1 0 1 S
+R B 1942 o - O 27 0 0 -
+R B 1943 1945 - N 1 0 0 -
+R B 1945 o - Ap 16 0 1 S
+R B 1957 o - May 10 0 1 S
+R B 1957 1958 - O 1 0 0 -
+R B 1958 o - May 1 0 1 S
+R B 1959 1981 - May 1 1 1 S
+R B 1959 1965 - S 30 3 0 -
+R B 1966 1994 - O 1 3 0 -
+R B 1982 o - Jul 25 1 1 S
+R B 1983 o - Jul 12 1 1 S
+R B 1984 1988 - May 1 1 1 S
+R B 1989 o - May 6 1 1 S
+R B 1990 1994 - May 1 1 1 S
+R B 1995 2010 - Ap lastF 0s 1 S
+R B 1995 2005 - S lastTh 24 0 -
+R B 2006 o - S 21 24 0 -
+R B 2007 o - S Th>=1 24 0 -
+R B 2008 o - Au lastTh 24 0 -
+R B 2009 o - Au 20 24 0 -
+R B 2010 o - Au 10 24 0 -
+R B 2010 o - S 9 24 1 S
+R B 2010 o - S lastTh 24 0 -
+R B 2014 o - May 15 24 1 S
+R B 2014 o - Jun 26 24 0 -
+R B 2014 o - Jul 31 24 1 S
+R B 2014 o - S lastTh 24 0 -
+Z Africa/Cairo 2:5:9 - LMT 1900 O
+2 B EE%sT
+R C 1920 1942 - S 1 0 0:20 GHST
+R C 1920 1942 - D 31 0 0 GMT
+Z Africa/Accra -0:0:52 - LMT 1918
+0 C GMT/+0020
+Z Africa/Bissau -1:2:20 - LMT 1912
+-1 - -01 1975
+0 - GMT
+Z Africa/Nairobi 2:27:16 - LMT 1928 Jul
+3 - EAT 1930
+2:30 - +0230 1940
+2:45 - +0245 1960
+3 - EAT
+Li Africa/Nairobi Africa/Addis_Ababa
+Li Africa/Nairobi Africa/Asmara
+Li Africa/Nairobi Africa/Dar_es_Salaam
+Li Africa/Nairobi Africa/Djibouti
+Li Africa/Nairobi Africa/Kampala
+Li Africa/Nairobi Africa/Mogadishu
+Li Africa/Nairobi Indian/Antananarivo
+Li Africa/Nairobi Indian/Comoro
+Li Africa/Nairobi Indian/Mayotte
+Z Africa/Monrovia -0:43:8 - LMT 1882
+-0:43:8 - MMT 1919 Mar
+-0:44:30 - MMT 1972 Ja 7
+0 - GMT
+R D 1951 o - O 14 2 1 S
+R D 1952 o - Ja 1 0 0 -
+R D 1953 o - O 9 2 1 S
+R D 1954 o - Ja 1 0 0 -
+R D 1955 o - S 30 0 1 S
+R D 1956 o - Ja 1 0 0 -
+R D 1982 1984 - Ap 1 0 1 S
+R D 1982 1985 - O 1 0 0 -
+R D 1985 o - Ap 6 0 1 S
+R D 1986 o - Ap 4 0 1 S
+R D 1986 o - O 3 0 0 -
+R D 1987 1989 - Ap 1 0 1 S
+R D 1987 1989 - O 1 0 0 -
+R D 1997 o - Ap 4 0 1 S
+R D 1997 o - O 4 0 0 -
+R D 2013 o - Mar lastF 1 1 S
+R D 2013 o - O lastF 2 0 -
+Z Africa/Tripoli 0:52:44 - LMT 1920
+1 D CE%sT 1959
+2 - EET 1982
+1 D CE%sT 1990 May 4
+2 - EET 1996 S 30
+1 D CE%sT 1997 O 4
+2 - EET 2012 N 10 2
+1 D CE%sT 2013 O 25 2
+2 - EET
+R E 1982 o - O 10 0 1 S
+R E 1983 o - Mar 21 0 0 -
+R E 2008 o - O lastSun 2 1 S
+R E 2009 o - Mar lastSun 2 0 -
+Z Indian/Mauritius 3:50 - LMT 1907
+4 E +04/+05
+R F 1939 o - S 12 0 1 S
+R F 1939 o - N 19 0 0 -
+R F 1940 o - F 25 0 1 S
+R F 1945 o - N 18 0 0 -
+R F 1950 o - Jun 11 0 1 S
+R F 1950 o - O 29 0 0 -
+R F 1967 o - Jun 3 12 1 S
+R F 1967 o - O 1 0 0 -
+R F 1974 o - Jun 24 0 1 S
+R F 1974 o - S 1 0 0 -
+R F 1976 1977 - May 1 0 1 S
+R F 1976 o - Au 1 0 0 -
+R F 1977 o - S 28 0 0 -
+R F 1978 o - Jun 1 0 1 S
+R F 1978 o - Au 4 0 0 -
+R F 2008 o - Jun 1 0 1 S
+R F 2008 o - S 1 0 0 -
+R F 2009 o - Jun 1 0 1 S
+R F 2009 o - Au 21 0 0 -
+R F 2010 o - May 2 0 1 S
+R F 2010 o - Au 8 0 0 -
+R F 2011 o - Ap 3 0 1 S
+R F 2011 o - Jul 31 0 0 -
+R F 2012 2013 - Ap lastSun 2 1 S
+R F 2012 o - Jul 20 3 0 -
+R F 2012 o - Au 20 2 1 S
+R F 2012 o - S 30 3 0 -
+R F 2013 o - Jul 7 3 0 -
+R F 2013 o - Au 10 2 1 S
+R F 2013 ma - O lastSun 3 0 -
+R F 2014 2021 - Mar lastSun 2 1 S
+R F 2014 o - Jun 28 3 0 -
+R F 2014 o - Au 2 2 1 S
+R F 2015 o - Jun 14 3 0 -
+R F 2015 o - Jul 19 2 1 S
+R F 2016 o - Jun 5 3 0 -
+R F 2016 o - Jul 10 2 1 S
+R F 2017 o - May 21 3 0 -
+R F 2017 o - Jul 2 2 1 S
+R F 2018 o - May 13 3 0 -
+R F 2018 o - Jun 17 2 1 S
+R F 2019 o - May 5 3 0 -
+R F 2019 o - Jun 9 2 1 S
+R F 2020 o - Ap 19 3 0 -
+R F 2020 o - May 24 2 1 S
+R F 2021 o - Ap 11 3 0 -
+R F 2021 o - May 16 2 1 S
+R F 2022 o - May 8 2 1 S
+R F 2023 o - Ap 23 2 1 S
+R F 2024 o - Ap 14 2 1 S
+R F 2025 o - Ap 6 2 1 S
+R F 2026 ma - Mar lastSun 2 1 S
+R F 2036 o - O 19 3 0 -
+R F 2037 o - O 4 3 0 -
+Z Africa/Casablanca -0:30:20 - LMT 1913 O 26
+0 F WE%sT 1984 Mar 16
+1 - CET 1986
+0 F WE%sT
+Z Africa/El_Aaiun -0:52:48 - LMT 1934
+-1 - -01 1976 Ap 14
+0 F WE%sT
+Z Africa/Maputo 2:10:20 - LMT 1903 Mar
+2 - CAT
+Li Africa/Maputo Africa/Blantyre
+Li Africa/Maputo Africa/Bujumbura
+Li Africa/Maputo Africa/Gaborone
+Li Africa/Maputo Africa/Harare
+Li Africa/Maputo Africa/Kigali
+Li Africa/Maputo Africa/Lubumbashi
+Li Africa/Maputo Africa/Lusaka
+R G 1994 o - Mar 21 0 0 -
+R G 1994 2016 - S Sun>=1 2 1 S
+R G 1995 2017 - Ap Sun>=1 2 0 -
+Z Africa/Windhoek 1:8:24 - LMT 1892 F 8
+1:30 - +0130 1903 Mar
+2 - SAST 1942 S 20 2
+2 1 SAST 1943 Mar 21 2
+2 - SAST 1990 Mar 21
+2 - CAT 1994 Mar 21
+1 G WA%sT 2017 S 3 2
+2 - CAT
+Z Africa/Lagos 0:13:36 - LMT 1919 S
+1 - WAT
+Li Africa/Lagos Africa/Bangui
+Li Africa/Lagos Africa/Brazzaville
+Li Africa/Lagos Africa/Douala
+Li Africa/Lagos Africa/Kinshasa
+Li Africa/Lagos Africa/Libreville
+Li Africa/Lagos Africa/Luanda
+Li Africa/Lagos Africa/Malabo
+Li Africa/Lagos Africa/Niamey
+Li Africa/Lagos Africa/Porto-Novo
+Z Indian/Reunion 3:41:52 - LMT 1911 Jun
+4 - +04
+Z Africa/Sao_Tome 0:26:56 - LMT 1884
+-0:36:45 - LMT 1912
+0 - GMT 2018 Ja 1 1
+1 - WAT
+Z Indian/Mahe 3:41:48 - LMT 1906 Jun
+4 - +04
+R H 1942 1943 - S Sun>=15 2 1 -
+R H 1943 1944 - Mar Sun>=15 2 0 -
+Z Africa/Johannesburg 1:52 - LMT 1892 F 8
+1:30 - SAST 1903 Mar
+2 H SAST
+Li Africa/Johannesburg Africa/Maseru
+Li Africa/Johannesburg Africa/Mbabane
+R I 1970 o - May 1 0 1 S
+R I 1970 1985 - O 15 0 0 -
+R I 1971 o - Ap 30 0 1 S
+R I 1972 1985 - Ap lastSun 0 1 S
+Z Africa/Khartoum 2:10:8 - LMT 1931
+2 I CA%sT 2000 Ja 15 12
+3 - EAT 2017 N
+2 - CAT
+Z Africa/Juba 2:6:28 - LMT 1931
+2 I CA%sT 2000 Ja 15 12
+3 - EAT
+R J 1939 o - Ap 15 23s 1 S
+R J 1939 o - N 18 23s 0 -
+R J 1940 o - F 25 23s 1 S
+R J 1941 o - O 6 0 0 -
+R J 1942 o - Mar 9 0 1 S
+R J 1942 o - N 2 3 0 -
+R J 1943 o - Mar 29 2 1 S
+R J 1943 o - Ap 17 2 0 -
+R J 1943 o - Ap 25 2 1 S
+R J 1943 o - O 4 2 0 -
+R J 1944 1945 - Ap M>=1 2 1 S
+R J 1944 o - O 8 0 0 -
+R J 1945 o - S 16 0 0 -
+R J 1977 o - Ap 30 0s 1 S
+R J 1977 o - S 24 0s 0 -
+R J 1978 o - May 1 0s 1 S
+R J 1978 o - O 1 0s 0 -
+R J 1988 o - Jun 1 0s 1 S
+R J 1988 1990 - S lastSun 0s 0 -
+R J 1989 o - Mar 26 0s 1 S
+R J 1990 o - May 1 0s 1 S
+R J 2005 o - May 1 0s 1 S
+R J 2005 o - S 30 1s 0 -
+R J 2006 2008 - Mar lastSun 2s 1 S
+R J 2006 2008 - O lastSun 2s 0 -
+Z Africa/Tunis 0:40:44 - LMT 1881 May 12
+0:9:21 - PMT 1911 Mar 11
+1 J CE%sT
+Z Antarctica/Casey 0 - -00 1969
+8 - +08 2009 O 18 2
+11 - +11 2010 Mar 5 2
+8 - +08 2011 O 28 2
+11 - +11 2012 F 21 17u
+8 - +08 2016 O 22
+11 - +11
+Z Antarctica/Davis 0 - -00 1957 Ja 13
+7 - +07 1964 N
+0 - -00 1969 F
+7 - +07 2009 O 18 2
+5 - +05 2010 Mar 10 20u
+7 - +07 2011 O 28 2
+5 - +05 2012 F 21 20u
+7 - +07
+Z Antarctica/Mawson 0 - -00 1954 F 13
+6 - +06 2009 O 18 2
+5 - +05
+Z Indian/Kerguelen 0 - -00 1950
+5 - +05
+Z Antarctica/DumontDUrville 0 - -00 1947
+10 - +10 1952 Ja 14
+0 - -00 1956 N
+10 - +10
+Z Antarctica/Syowa 0 - -00 1957 Ja 29
+3 - +03
+R K 2005 ma - Mar lastSun 1u 2 +02
+R K 2004 ma - O lastSun 1u 0 +00
+Z Antarctica/Troll 0 - -00 2005 F 12
+0 K %s
+Z Antarctica/Vostok 0 - -00 1957 D 16
+6 - +06
+Z Antarctica/Rothera 0 - -00 1976 D
+-3 - -03
+Z Asia/Kabul 4:36:48 - LMT 1890
+4 - +04 1945
+4:30 - +0430
+R L 2011 o - Mar lastSun 2s 1 S
+R L 2011 o - O lastSun 2s 0 -
+Z Asia/Yerevan 2:58 - LMT 1924 May 2
+3 - +03 1957 Mar
+4 M +04/+05 1991 Mar 31 2s
+3 M +03/+04 1995 S 24 2s
+4 - +04 1997
+4 M +04/+05 2011
+4 L +04/+05
+R N 1997 2015 - Mar lastSun 4 1 S
+R N 1997 2015 - O lastSun 5 0 -
+Z Asia/Baku 3:19:24 - LMT 1924 May 2
+3 - +03 1957 Mar
+4 M +04/+05 1991 Mar 31 2s
+3 M +03/+04 1992 S lastSun 2s
+4 - +04 1996
+4 O +04/+05 1997
+4 N +04/+05
+R P 2009 o - Jun 19 23 1 S
+R P 2009 o - D 31 24 0 -
+Z Asia/Dhaka 6:1:40 - LMT 1890
+5:53:20 - HMT 1941 O
+6:30 - +0630 1942 May 15
+5:30 - +0530 1942 S
+6:30 - +0630 1951 S 30
+6 - +06 2009
+6 P +06/+07
+Z Asia/Thimphu 5:58:36 - LMT 1947 Au 15
+5:30 - +0530 1987 O
+6 - +06
+Z Indian/Chagos 4:49:40 - LMT 1907
+5 - +05 1996
+6 - +06
+Z Asia/Brunei 7:39:40 - LMT 1926 Mar
+7:30 - +0730 1933
+8 - +08
+Z Asia/Yangon 6:24:47 - LMT 1880
+6:24:47 - RMT 1920
+6:30 - +0630 1942 May
+9 - +09 1945 May 3
+6:30 - +0630
+R Q 1940 o - Jun 3 0 1 D
+R Q 1940 1941 - O 1 0 0 S
+R Q 1941 o - Mar 16 0 1 D
+R R 1986 o - May 4 0 1 D
+R R 1986 1991 - S Sun>=11 0 0 S
+R R 1987 1991 - Ap Sun>=10 0 1 D
+Z Asia/Shanghai 8:5:43 - LMT 1901
+8 Q C%sT 1949
+8 R C%sT
+Z Asia/Urumqi 5:50:20 - LMT 1928
+6 - +06
+R S 1941 o - Ap 1 3:30 1 S
+R S 1941 o - S 30 3:30 0 -
+R S 1946 o - Ap 20 3:30 1 S
+R S 1946 o - D 1 3:30 0 -
+R S 1947 o - Ap 13 3:30 1 S
+R S 1947 o - D 30 3:30 0 -
+R S 1948 o - May 2 3:30 1 S
+R S 1948 1951 - O lastSun 3:30 0 -
+R S 1952 o - O 25 3:30 0 -
+R S 1949 1953 - Ap Sun>=1 3:30 1 S
+R S 1953 o - N 1 3:30 0 -
+R S 1954 1964 - Mar Sun>=18 3:30 1 S
+R S 1954 o - O 31 3:30 0 -
+R S 1955 1964 - N Sun>=1 3:30 0 -
+R S 1965 1976 - Ap Sun>=16 3:30 1 S
+R S 1965 1976 - O Sun>=16 3:30 0 -
+R S 1973 o - D 30 3:30 1 S
+R S 1979 o - May Sun>=8 3:30 1 S
+R S 1979 o - O Sun>=16 3:30 0 -
+Z Asia/Hong_Kong 7:36:42 - LMT 1904 O 30
+8 S HK%sT 1941 D 25
+9 - JST 1945 S 15
+8 S HK%sT
+R T 1946 o - May 15 0 1 D
+R T 1946 o - O 1 0 0 S
+R T 1947 o - Ap 15 0 1 D
+R T 1947 o - N 1 0 0 S
+R T 1948 1951 - May 1 0 1 D
+R T 1948 1951 - O 1 0 0 S
+R T 1952 o - Mar 1 0 1 D
+R T 1952 1954 - N 1 0 0 S
+R T 1953 1959 - Ap 1 0 1 D
+R T 1955 1961 - O 1 0 0 S
+R T 1960 1961 - Jun 1 0 1 D
+R T 1974 1975 - Ap 1 0 1 D
+R T 1974 1975 - O 1 0 0 S
+R T 1979 o - Jul 1 0 1 D
+R T 1979 o - O 1 0 0 S
+Z Asia/Taipei 8:6 - LMT 1896
+8 - CST 1937 O
+9 - JST 1945 S 21 1
+8 T C%sT
+R U 1961 1962 - Mar Sun>=16 3:30 1 D
+R U 1961 1964 - N Sun>=1 3:30 0 S
+R U 1963 o - Mar Sun>=16 0 1 D
+R U 1964 o - Mar Sun>=16 3:30 1 D
+R U 1965 o - Mar Sun>=16 0 1 D
+R U 1965 o - O 31 0 0 S
+R U 1966 1971 - Ap Sun>=16 3:30 1 D
+R U 1966 1971 - O Sun>=16 3:30 0 S
+R U 1972 1974 - Ap Sun>=15 0 1 D
+R U 1972 1973 - O Sun>=15 0 0 S
+R U 1974 1977 - O Sun>=15 3:30 0 S
+R U 1975 1977 - Ap Sun>=15 3:30 1 D
+R U 1978 1980 - Ap Sun>=15 0 1 D
+R U 1978 1980 - O Sun>=15 0 0 S
+Z Asia/Macau 7:34:20 - LMT 1912
+8 U C%sT
+R V 1975 o - Ap 13 0 1 S
+R V 1975 o - O 12 0 0 -
+R V 1976 o - May 15 0 1 S
+R V 1976 o - O 11 0 0 -
+R V 1977 1980 - Ap Sun>=1 0 1 S
+R V 1977 o - S 25 0 0 -
+R V 1978 o - O 2 0 0 -
+R V 1979 1997 - S lastSun 0 0 -
+R V 1981 1998 - Mar lastSun 0 1 S
+Z Asia/Nicosia 2:13:28 - LMT 1921 N 14
+2 V EE%sT 1998 S
+2 O EE%sT
+Z Asia/Famagusta 2:15:48 - LMT 1921 N 14
+2 V EE%sT 1998 S
+2 O EE%sT 2016 S 8
+3 - +03 2017 O 29 1u
+2 O EE%sT
+Li Asia/Nicosia Europe/Nicosia
+Z Asia/Tbilisi 2:59:11 - LMT 1880
+2:59:11 - TBMT 1924 May 2
+3 - +03 1957 Mar
+4 M +04/+05 1991 Mar 31 2s
+3 M +03/+04 1992
+3 W +03/+04 1994 S lastSun
+4 W +04/+05 1996 O lastSun
+4 1 +05 1997 Mar lastSun
+4 W +04/+05 2004 Jun 27
+3 M +03/+04 2005 Mar lastSun 2
+4 - +04
+Z Asia/Dili 8:22:20 - LMT 1912
+8 - +08 1942 F 21 23
+9 - +09 1976 May 3
+8 - +08 2000 S 17
+9 - +09
+Z Asia/Kolkata 5:53:28 - LMT 1854 Jun 28
+5:53:20 - HMT 1870
+5:21:10 - MMT 1906
+5:30 - IST 1941 O
+5:30 1 +0630 1942 May 15
+5:30 - IST 1942 S
+5:30 1 +0630 1945 O 15
+5:30 - IST
+Z Asia/Jakarta 7:7:12 - LMT 1867 Au 10
+7:7:12 - BMT 1923 D 31 23:47:12
+7:20 - +0720 1932 N
+7:30 - +0730 1942 Mar 23
+9 - +09 1945 S 23
+7:30 - +0730 1948 May
+8 - +08 1950 May
+7:30 - +0730 1964
+7 - WIB
+Z Asia/Pontianak 7:17:20 - LMT 1908 May
+7:17:20 - PMT 1932 N
+7:30 - +0730 1942 Ja 29
+9 - +09 1945 S 23
+7:30 - +0730 1948 May
+8 - +08 1950 May
+7:30 - +0730 1964
+8 - WITA 1988
+7 - WIB
+Z Asia/Makassar 7:57:36 - LMT 1920
+7:57:36 - MMT 1932 N
+8 - +08 1942 F 9
+9 - +09 1945 S 23
+8 - WITA
+Z Asia/Jayapura 9:22:48 - LMT 1932 N
+9 - +09 1944 S
+9:30 - +0930 1964
+9 - WIT
+R X 1978 1980 - Mar 21 0 1 D
+R X 1978 o - O 21 0 0 S
+R X 1979 o - S 19 0 0 S
+R X 1980 o - S 23 0 0 S
+R X 1991 o - May 3 0 1 D
+R X 1992 1995 - Mar 22 0 1 D
+R X 1991 1995 - S 22 0 0 S
+R X 1996 o - Mar 21 0 1 D
+R X 1996 o - S 21 0 0 S
+R X 1997 1999 - Mar 22 0 1 D
+R X 1997 1999 - S 22 0 0 S
+R X 2000 o - Mar 21 0 1 D
+R X 2000 o - S 21 0 0 S
+R X 2001 2003 - Mar 22 0 1 D
+R X 2001 2003 - S 22 0 0 S
+R X 2004 o - Mar 21 0 1 D
+R X 2004 o - S 21 0 0 S
+R X 2005 o - Mar 22 0 1 D
+R X 2005 o - S 22 0 0 S
+R X 2008 o - Mar 21 0 1 D
+R X 2008 o - S 21 0 0 S
+R X 2009 2011 - Mar 22 0 1 D
+R X 2009 2011 - S 22 0 0 S
+R X 2012 o - Mar 21 0 1 D
+R X 2012 o - S 21 0 0 S
+R X 2013 2015 - Mar 22 0 1 D
+R X 2013 2015 - S 22 0 0 S
+R X 2016 o - Mar 21 0 1 D
+R X 2016 o - S 21 0 0 S
+R X 2017 2019 - Mar 22 0 1 D
+R X 2017 2019 - S 22 0 0 S
+R X 2020 o - Mar 21 0 1 D
+R X 2020 o - S 21 0 0 S
+R X 2021 2023 - Mar 22 0 1 D
+R X 2021 2023 - S 22 0 0 S
+R X 2024 o - Mar 21 0 1 D
+R X 2024 o - S 21 0 0 S
+R X 2025 2027 - Mar 22 0 1 D
+R X 2025 2027 - S 22 0 0 S
+R X 2028 2029 - Mar 21 0 1 D
+R X 2028 2029 - S 21 0 0 S
+R X 2030 2031 - Mar 22 0 1 D
+R X 2030 2031 - S 22 0 0 S
+R X 2032 2033 - Mar 21 0 1 D
+R X 2032 2033 - S 21 0 0 S
+R X 2034 2035 - Mar 22 0 1 D
+R X 2034 2035 - S 22 0 0 S
+R X 2036 ma - Mar 21 0 1 D
+R X 2036 ma - S 21 0 0 S
+Z Asia/Tehran 3:25:44 - LMT 1916
+3:25:44 - TMT 1946
+3:30 - +0330 1977 N
+4 X +04/+05 1979
+3:30 X +0330/+0430
+R Y 1982 o - May 1 0 1 D
+R Y 1982 1984 - O 1 0 0 S
+R Y 1983 o - Mar 31 0 1 D
+R Y 1984 1985 - Ap 1 0 1 D
+R Y 1985 1990 - S lastSun 1s 0 S
+R Y 1986 1990 - Mar lastSun 1s 1 D
+R Y 1991 2007 - Ap 1 3s 1 D
+R Y 1991 2007 - O 1 3s 0 S
+Z Asia/Baghdad 2:57:40 - LMT 1890
+2:57:36 - BMT 1918
+3 - +03 1982 May
+3 Y +03/+04
+R Z 1940 o - Jun 1 0 1 D
+R Z 1942 1944 - N 1 0 0 S
+R Z 1943 o - Ap 1 2 1 D
+R Z 1944 o - Ap 1 0 1 D
+R Z 1945 o - Ap 16 0 1 D
+R Z 1945 o - N 1 2 0 S
+R Z 1946 o - Ap 16 2 1 D
+R Z 1946 o - N 1 0 0 S
+R Z 1948 o - May 23 0 2 DD
+R Z 1948 o - S 1 0 1 D
+R Z 1948 1949 - N 1 2 0 S
+R Z 1949 o - May 1 0 1 D
+R Z 1950 o - Ap 16 0 1 D
+R Z 1950 o - S 15 3 0 S
+R Z 1951 o - Ap 1 0 1 D
+R Z 1951 o - N 11 3 0 S
+R Z 1952 o - Ap 20 2 1 D
+R Z 1952 o - O 19 3 0 S
+R Z 1953 o - Ap 12 2 1 D
+R Z 1953 o - S 13 3 0 S
+R Z 1954 o - Jun 13 0 1 D
+R Z 1954 o - S 12 0 0 S
+R Z 1955 o - Jun 11 2 1 D
+R Z 1955 o - S 11 0 0 S
+R Z 1956 o - Jun 3 0 1 D
+R Z 1956 o - S 30 3 0 S
+R Z 1957 o - Ap 29 2 1 D
+R Z 1957 o - S 22 0 0 S
+R Z 1974 o - Jul 7 0 1 D
+R Z 1974 o - O 13 0 0 S
+R Z 1975 o - Ap 20 0 1 D
+R Z 1975 o - Au 31 0 0 S
+R Z 1985 o - Ap 14 0 1 D
+R Z 1985 o - S 15 0 0 S
+R Z 1986 o - May 18 0 1 D
+R Z 1986 o - S 7 0 0 S
+R Z 1987 o - Ap 15 0 1 D
+R Z 1987 o - S 13 0 0 S
+R Z 1988 o - Ap 10 0 1 D
+R Z 1988 o - S 4 0 0 S
+R Z 1989 o - Ap 30 0 1 D
+R Z 1989 o - S 3 0 0 S
+R Z 1990 o - Mar 25 0 1 D
+R Z 1990 o - Au 26 0 0 S
+R Z 1991 o - Mar 24 0 1 D
+R Z 1991 o - S 1 0 0 S
+R Z 1992 o - Mar 29 0 1 D
+R Z 1992 o - S 6 0 0 S
+R Z 1993 o - Ap 2 0 1 D
+R Z 1993 o - S 5 0 0 S
+R Z 1994 o - Ap 1 0 1 D
+R Z 1994 o - Au 28 0 0 S
+R Z 1995 o - Mar 31 0 1 D
+R Z 1995 o - S 3 0 0 S
+R Z 1996 o - Mar 15 0 1 D
+R Z 1996 o - S 16 0 0 S
+R Z 1997 o - Mar 21 0 1 D
+R Z 1997 o - S 14 0 0 S
+R Z 1998 o - Mar 20 0 1 D
+R Z 1998 o - S 6 0 0 S
+R Z 1999 o - Ap 2 2 1 D
+R Z 1999 o - S 3 2 0 S
+R Z 2000 o - Ap 14 2 1 D
+R Z 2000 o - O 6 1 0 S
+R Z 2001 o - Ap 9 1 1 D
+R Z 2001 o - S 24 1 0 S
+R Z 2002 o - Mar 29 1 1 D
+R Z 2002 o - O 7 1 0 S
+R Z 2003 o - Mar 28 1 1 D
+R Z 2003 o - O 3 1 0 S
+R Z 2004 o - Ap 7 1 1 D
+R Z 2004 o - S 22 1 0 S
+R Z 2005 o - Ap 1 2 1 D
+R Z 2005 o - O 9 2 0 S
+R Z 2006 2010 - Mar F>=26 2 1 D
+R Z 2006 o - O 1 2 0 S
+R Z 2007 o - S 16 2 0 S
+R Z 2008 o - O 5 2 0 S
+R Z 2009 o - S 27 2 0 S
+R Z 2010 o - S 12 2 0 S
+R Z 2011 o - Ap 1 2 1 D
+R Z 2011 o - O 2 2 0 S
+R Z 2012 o - Mar F>=26 2 1 D
+R Z 2012 o - S 23 2 0 S
+R Z 2013 ma - Mar F>=23 2 1 D
+R Z 2013 ma - O lastSun 2 0 S
+Z Asia/Jerusalem 2:20:54 - LMT 1880
+2:20:40 - JMT 1918
+2 Z I%sT
+R a 1948 o - May Sat>=1 24 1 D
+R a 1948 1951 - S Sun>=9 0 0 S
+R a 1949 o - Ap Sat>=1 24 1 D
+R a 1950 1951 - May Sat>=1 24 1 D
+Z Asia/Tokyo 9:18:59 - LMT 1887 D 31 15u
+9 a J%sT
+R b 1973 o - Jun 6 0 1 S
+R b 1973 1975 - O 1 0 0 -
+R b 1974 1977 - May 1 0 1 S
+R b 1976 o - N 1 0 0 -
+R b 1977 o - O 1 0 0 -
+R b 1978 o - Ap 30 0 1 S
+R b 1978 o - S 30 0 0 -
+R b 1985 o - Ap 1 0 1 S
+R b 1985 o - O 1 0 0 -
+R b 1986 1988 - Ap F>=1 0 1 S
+R b 1986 1990 - O F>=1 0 0 -
+R b 1989 o - May 8 0 1 S
+R b 1990 o - Ap 27 0 1 S
+R b 1991 o - Ap 17 0 1 S
+R b 1991 o - S 27 0 0 -
+R b 1992 o - Ap 10 0 1 S
+R b 1992 1993 - O F>=1 0 0 -
+R b 1993 1998 - Ap F>=1 0 1 S
+R b 1994 o - S F>=15 0 0 -
+R b 1995 1998 - S F>=15 0s 0 -
+R b 1999 o - Jul 1 0s 1 S
+R b 1999 2002 - S lastF 0s 0 -
+R b 2000 2001 - Mar lastTh 0s 1 S
+R b 2002 2012 - Mar lastTh 24 1 S
+R b 2003 o - O 24 0s 0 -
+R b 2004 o - O 15 0s 0 -
+R b 2005 o - S lastF 0s 0 -
+R b 2006 2011 - O lastF 0s 0 -
+R b 2013 o - D 20 0 0 -
+R b 2014 ma - Mar lastTh 24 1 S
+R b 2014 ma - O lastF 0s 0 -
+Z Asia/Amman 2:23:44 - LMT 1931
+2 b EE%sT
+Z Asia/Almaty 5:7:48 - LMT 1924 May 2
+5 - +05 1930 Jun 21
+6 M +06/+07 1991 Mar 31 2s
+5 M +05/+06 1992 Ja 19 2s
+6 M +06/+07 2004 O 31 2s
+6 - +06
+Z Asia/Qyzylorda 4:21:52 - LMT 1924 May 2
+4 - +04 1930 Jun 21
+5 - +05 1981 Ap
+5 1 +06 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1991 Mar 31 2s
+4 M +04/+05 1991 S 29 2s
+5 M +05/+06 1992 Ja 19 2s
+6 M +06/+07 1992 Mar 29 2s
+5 M +05/+06 2004 O 31 2s
+6 - +06
+Z Asia/Aqtobe 3:48:40 - LMT 1924 May 2
+4 - +04 1930 Jun 21
+5 - +05 1981 Ap
+5 1 +06 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1991 Mar 31 2s
+4 M +04/+05 1992 Ja 19 2s
+5 M +05/+06 2004 O 31 2s
+5 - +05
+Z Asia/Aqtau 3:21:4 - LMT 1924 May 2
+4 - +04 1930 Jun 21
+5 - +05 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1991 Mar 31 2s
+4 M +04/+05 1992 Ja 19 2s
+5 M +05/+06 1994 S 25 2s
+4 M +04/+05 2004 O 31 2s
+5 - +05
+Z Asia/Atyrau 3:27:44 - LMT 1924 May 2
+3 - +03 1930 Jun 21
+5 - +05 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1991 Mar 31 2s
+4 M +04/+05 1992 Ja 19 2s
+5 M +05/+06 1999 Mar 28 2s
+4 M +04/+05 2004 O 31 2s
+5 - +05
+Z Asia/Oral 3:25:24 - LMT 1924 May 2
+3 - +03 1930 Jun 21
+5 - +05 1981 Ap
+5 1 +06 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1989 Mar 26 2s
+4 M +04/+05 1992 Ja 19 2s
+5 M +05/+06 1992 Mar 29 2s
+4 M +04/+05 2004 O 31 2s
+5 - +05
+R c 1992 1996 - Ap Sun>=7 0s 1 S
+R c 1992 1996 - S lastSun 0 0 -
+R c 1997 2005 - Mar lastSun 2:30 1 S
+R c 1997 2004 - O lastSun 2:30 0 -
+Z Asia/Bishkek 4:58:24 - LMT 1924 May 2
+5 - +05 1930 Jun 21
+6 M +06/+07 1991 Mar 31 2s
+5 M +05/+06 1991 Au 31 2
+5 c +05/+06 2005 Au 12
+6 - +06
+R d 1948 o - Jun 1 0 1 D
+R d 1948 o - S 13 0 0 S
+R d 1949 o - Ap 3 0 1 D
+R d 1949 1951 - S Sun>=8 0 0 S
+R d 1950 o - Ap 1 0 1 D
+R d 1951 o - May 6 0 1 D
+R d 1955 o - May 5 0 1 D
+R d 1955 o - S 9 0 0 S
+R d 1956 o - May 20 0 1 D
+R d 1956 o - S 30 0 0 S
+R d 1957 1960 - May Sun>=1 0 1 D
+R d 1957 1960 - S Sun>=18 0 0 S
+R d 1987 1988 - May Sun>=8 2 1 D
+R d 1987 1988 - O Sun>=8 3 0 S
+Z Asia/Seoul 8:27:52 - LMT 1908 Ap
+8:30 - KST 1912
+9 - JST 1945 S 8
+9 - KST 1954 Mar 21
+8:30 d K%sT 1961 Au 10
+9 d K%sT
+Z Asia/Pyongyang 8:23 - LMT 1908 Ap
+8:30 - KST 1912
+9 - JST 1945 Au 24
+9 - KST 2015 Au 15
+8:30 - KST
+R e 1920 o - Mar 28 0 1 S
+R e 1920 o - O 25 0 0 -
+R e 1921 o - Ap 3 0 1 S
+R e 1921 o - O 3 0 0 -
+R e 1922 o - Mar 26 0 1 S
+R e 1922 o - O 8 0 0 -
+R e 1923 o - Ap 22 0 1 S
+R e 1923 o - S 16 0 0 -
+R e 1957 1961 - May 1 0 1 S
+R e 1957 1961 - O 1 0 0 -
+R e 1972 o - Jun 22 0 1 S
+R e 1972 1977 - O 1 0 0 -
+R e 1973 1977 - May 1 0 1 S
+R e 1978 o - Ap 30 0 1 S
+R e 1978 o - S 30 0 0 -
+R e 1984 1987 - May 1 0 1 S
+R e 1984 1991 - O 16 0 0 -
+R e 1988 o - Jun 1 0 1 S
+R e 1989 o - May 10 0 1 S
+R e 1990 1992 - May 1 0 1 S
+R e 1992 o - O 4 0 0 -
+R e 1993 ma - Mar lastSun 0 1 S
+R e 1993 1998 - S lastSun 0 0 -
+R e 1999 ma - O lastSun 0 0 -
+Z Asia/Beirut 2:22 - LMT 1880
+2 e EE%sT
+R f 1935 1941 - S 14 0 0:20 TS
+R f 1935 1941 - D 14 0 0 -
+Z Asia/Kuala_Lumpur 6:46:46 - LMT 1901
+6:55:25 - SMT 1905 Jun
+7 - +07 1933
+7 0:20 +0720 1936
+7:20 - +0720 1941 S
+7:30 - +0730 1942 F 16
+9 - +09 1945 S 12
+7:30 - +0730 1982
+8 - +08
+Z Asia/Kuching 7:21:20 - LMT 1926 Mar
+7:30 - +0730 1933
+8 f +08/+0820 1942 F 16
+9 - +09 1945 S 12
+8 - +08
+Z Indian/Maldives 4:54 - LMT 1880
+4:54 - MMT 1960
+5 - +05
+R g 1983 1984 - Ap 1 0 1 S
+R g 1983 o - O 1 0 0 -
+R g 1985 1998 - Mar lastSun 0 1 S
+R g 1984 1998 - S lastSun 0 0 -
+R g 2001 o - Ap lastSat 2 1 S
+R g 2001 2006 - S lastSat 2 0 -
+R g 2002 2006 - Mar lastSat 2 1 S
+R g 2015 2016 - Mar lastSat 2 1 S
+R g 2015 2016 - S lastSat 0 0 -
+Z Asia/Hovd 6:6:36 - LMT 1905 Au
+6 - +06 1978
+7 g +07/+08
+Z Asia/Ulaanbaatar 7:7:32 - LMT 1905 Au
+7 - +07 1978
+8 g +08/+09
+Z Asia/Choibalsan 7:38 - LMT 1905 Au
+7 - +07 1978
+8 - +08 1983 Ap
+9 g +09/+10 2008 Mar 31
+8 g +08/+09
+Z Asia/Kathmandu 5:41:16 - LMT 1920
+5:30 - +0530 1986
+5:45 - +0545
+R h 2002 o - Ap Sun>=2 0 1 S
+R h 2002 o - O Sun>=2 0 0 -
+R h 2008 o - Jun 1 0 1 S
+R h 2008 2009 - N 1 0 0 -
+R h 2009 o - Ap 15 0 1 S
+Z Asia/Karachi 4:28:12 - LMT 1907
+5:30 - +0530 1942 S
+5:30 1 +0630 1945 O 15
+5:30 - +0530 1951 S 30
+5 - +05 1971 Mar 26
+5 h PK%sT
+R i 1999 2005 - Ap F>=15 0 1 S
+R i 1999 2003 - O F>=15 0 0 -
+R i 2004 o - O 1 1 0 -
+R i 2005 o - O 4 2 0 -
+R i 2006 2007 - Ap 1 0 1 S
+R i 2006 o - S 22 0 0 -
+R i 2007 o - S Th>=8 2 0 -
+R i 2008 2009 - Mar lastF 0 1 S
+R i 2008 o - S 1 0 0 -
+R i 2009 o - S F>=1 1 0 -
+R i 2010 o - Mar 26 0 1 S
+R i 2010 o - Au 11 0 0 -
+R i 2011 o - Ap 1 0:1 1 S
+R i 2011 o - Au 1 0 0 -
+R i 2011 o - Au 30 0 1 S
+R i 2011 o - S 30 0 0 -
+R i 2012 2014 - Mar lastTh 24 1 S
+R i 2012 o - S 21 1 0 -
+R i 2013 o - S F>=21 0 0 -
+R i 2014 2015 - O F>=21 0 0 -
+R i 2015 o - Mar lastF 24 1 S
+R i 2016 ma - Mar lastSat 1 1 S
+R i 2016 ma - O lastSat 1 0 -
+Z Asia/Gaza 2:17:52 - LMT 1900 O
+2 Z EET/EEST 1948 May 15
+2 B EE%sT 1967 Jun 5
+2 Z I%sT 1996
+2 b EE%sT 1999
+2 i EE%sT 2008 Au 29
+2 - EET 2008 S
+2 i EE%sT 2010
+2 - EET 2010 Mar 27 0:1
+2 i EE%sT 2011 Au
+2 - EET 2012
+2 i EE%sT
+Z Asia/Hebron 2:20:23 - LMT 1900 O
+2 Z EET/EEST 1948 May 15
+2 B EE%sT 1967 Jun 5
+2 Z I%sT 1996
+2 b EE%sT 1999
+2 i EE%sT
+R j 1936 o - N 1 0 1 S
+R j 1937 o - F 1 0 0 -
+R j 1954 o - Ap 12 0 1 S
+R j 1954 o - Jul 1 0 0 -
+R j 1978 o - Mar 22 0 1 S
+R j 1978 o - S 21 0 0 -
+Z Asia/Manila -15:56 - LMT 1844 D 31
+8:4 - LMT 1899 May 11
+8 j +08/+09 1942 May
+9 - +09 1944 N
+8 j +08/+09
+Z Asia/Qatar 3:26:8 - LMT 1920
+4 - +04 1972 Jun
+3 - +03
+Li Asia/Qatar Asia/Bahrain
+Z Asia/Riyadh 3:6:52 - LMT 1947 Mar 14
+3 - +03
+Li Asia/Riyadh Asia/Aden
+Li Asia/Riyadh Asia/Kuwait
+Z Asia/Singapore 6:55:25 - LMT 1901
+6:55:25 - SMT 1905 Jun
+7 - +07 1933
+7 0:20 +0720 1936
+7:20 - +0720 1941 S
+7:30 - +0730 1942 F 16
+9 - +09 1945 S 12
+7:30 - +0730 1982
+8 - +08
+Z Asia/Colombo 5:19:24 - LMT 1880
+5:19:32 - MMT 1906
+5:30 - +0530 1942 Ja 5
+5:30 0:30 +06 1942 S
+5:30 1 +0630 1945 O 16 2
+5:30 - +0530 1996 May 25
+6:30 - +0630 1996 O 26 0:30
+6 - +06 2006 Ap 15 0:30
+5:30 - +0530
+R k 1920 1923 - Ap Sun>=15 2 1 S
+R k 1920 1923 - O Sun>=1 2 0 -
+R k 1962 o - Ap 29 2 1 S
+R k 1962 o - O 1 2 0 -
+R k 1963 1965 - May 1 2 1 S
+R k 1963 o - S 30 2 0 -
+R k 1964 o - O 1 2 0 -
+R k 1965 o - S 30 2 0 -
+R k 1966 o - Ap 24 2 1 S
+R k 1966 1976 - O 1 2 0 -
+R k 1967 1978 - May 1 2 1 S
+R k 1977 1978 - S 1 2 0 -
+R k 1983 1984 - Ap 9 2 1 S
+R k 1983 1984 - O 1 2 0 -
+R k 1986 o - F 16 2 1 S
+R k 1986 o - O 9 2 0 -
+R k 1987 o - Mar 1 2 1 S
+R k 1987 1988 - O 31 2 0 -
+R k 1988 o - Mar 15 2 1 S
+R k 1989 o - Mar 31 2 1 S
+R k 1989 o - O 1 2 0 -
+R k 1990 o - Ap 1 2 1 S
+R k 1990 o - S 30 2 0 -
+R k 1991 o - Ap 1 0 1 S
+R k 1991 1992 - O 1 0 0 -
+R k 1992 o - Ap 8 0 1 S
+R k 1993 o - Mar 26 0 1 S
+R k 1993 o - S 25 0 0 -
+R k 1994 1996 - Ap 1 0 1 S
+R k 1994 2005 - O 1 0 0 -
+R k 1997 1998 - Mar lastM 0 1 S
+R k 1999 2006 - Ap 1 0 1 S
+R k 2006 o - S 22 0 0 -
+R k 2007 o - Mar lastF 0 1 S
+R k 2007 o - N F>=1 0 0 -
+R k 2008 o - Ap F>=1 0 1 S
+R k 2008 o - N 1 0 0 -
+R k 2009 o - Mar lastF 0 1 S
+R k 2010 2011 - Ap F>=1 0 1 S
+R k 2012 ma - Mar lastF 0 1 S
+R k 2009 ma - O lastF 0 0 -
+Z Asia/Damascus 2:25:12 - LMT 1920
+2 k EE%sT
+Z Asia/Dushanbe 4:35:12 - LMT 1924 May 2
+5 - +05 1930 Jun 21
+6 M +06/+07 1991 Mar 31 2s
+5 1 +05/+06 1991 S 9 2s
+5 - +05
+Z Asia/Bangkok 6:42:4 - LMT 1880
+6:42:4 - BMT 1920 Ap
+7 - +07
+Li Asia/Bangkok Asia/Phnom_Penh
+Li Asia/Bangkok Asia/Vientiane
+Z Asia/Ashgabat 3:53:32 - LMT 1924 May 2
+4 - +04 1930 Jun 21
+5 M +05/+06 1991 Mar 31 2
+4 M +04/+05 1992 Ja 19 2
+5 - +05
+Z Asia/Dubai 3:41:12 - LMT 1920
+4 - +04
+Li Asia/Dubai Asia/Muscat
+Z Asia/Samarkand 4:27:53 - LMT 1924 May 2
+4 - +04 1930 Jun 21
+5 - +05 1981 Ap
+5 1 +06 1981 O
+6 - +06 1982 Ap
+5 M +05/+06 1992
+5 - +05
+Z Asia/Tashkent 4:37:11 - LMT 1924 May 2
+5 - +05 1930 Jun 21
+6 M +06/+07 1991 Mar 31 2
+5 M +05/+06 1992
+5 - +05
+Z Asia/Ho_Chi_Minh 7:6:40 - LMT 1906 Jul
+7:6:30 - PLMT 1911 May
+7 - +07 1942 D 31 23
+8 - +08 1945 Mar 14 23
+9 - +09 1945 S 2
+7 - +07 1947 Ap
+8 - +08 1955 Jul
+7 - +07 1959 D 31 23
+8 - +08 1975 Jun 13
+7 - +07
+R l 1917 o - Ja 1 0:1 1 D
+R l 1917 o - Mar 25 2 0 S
+R l 1942 o - Ja 1 2 1 D
+R l 1942 o - Mar 29 2 0 S
+R l 1942 o - S 27 2 1 D
+R l 1943 1944 - Mar lastSun 2 0 S
+R l 1943 o - O 3 2 1 D
+Z Australia/Darwin 8:43:20 - LMT 1895 F
+9 - ACST 1899 May
+9:30 l AC%sT
+R m 1974 o - O lastSun 2s 1 D
+R m 1975 o - Mar Sun>=1 2s 0 S
+R m 1983 o - O lastSun 2s 1 D
+R m 1984 o - Mar Sun>=1 2s 0 S
+R m 1991 o - N 17 2s 1 D
+R m 1992 o - Mar Sun>=1 2s 0 S
+R m 2006 o - D 3 2s 1 D
+R m 2007 2009 - Mar lastSun 2s 0 S
+R m 2007 2008 - O lastSun 2s 1 D
+Z Australia/Perth 7:43:24 - LMT 1895 D
+8 l AW%sT 1943 Jul
+8 m AW%sT
+Z Australia/Eucla 8:35:28 - LMT 1895 D
+8:45 l +0845/+0945 1943 Jul
+8:45 m +0845/+0945
+R n 1971 o - O lastSun 2s 1 D
+R n 1972 o - F lastSun 2s 0 S
+R n 1989 1991 - O lastSun 2s 1 D
+R n 1990 1992 - Mar Sun>=1 2s 0 S
+R o 1992 1993 - O lastSun 2s 1 D
+R o 1993 1994 - Mar Sun>=1 2s 0 S
+Z Australia/Brisbane 10:12:8 - LMT 1895
+10 l AE%sT 1971
+10 n AE%sT
+Z Australia/Lindeman 9:55:56 - LMT 1895
+10 l AE%sT 1971
+10 n AE%sT 1992 Jul
+10 o AE%sT
+R p 1971 1985 - O lastSun 2s 1 D
+R p 1986 o - O 19 2s 1 D
+R p 1987 2007 - O lastSun 2s 1 D
+R p 1972 o - F 27 2s 0 S
+R p 1973 1985 - Mar Sun>=1 2s 0 S
+R p 1986 1990 - Mar Sun>=15 2s 0 S
+R p 1991 o - Mar 3 2s 0 S
+R p 1992 o - Mar 22 2s 0 S
+R p 1993 o - Mar 7 2s 0 S
+R p 1994 o - Mar 20 2s 0 S
+R p 1995 2005 - Mar lastSun 2s 0 S
+R p 2006 o - Ap 2 2s 0 S
+R p 2007 o - Mar lastSun 2s 0 S
+R p 2008 ma - Ap Sun>=1 2s 0 S
+R p 2008 ma - O Sun>=1 2s 1 D
+Z Australia/Adelaide 9:14:20 - LMT 1895 F
+9 - ACST 1899 May
+9:30 l AC%sT 1971
+9:30 p AC%sT
+R q 1967 o - O Sun>=1 2s 1 D
+R q 1968 o - Mar lastSun 2s 0 S
+R q 1968 1985 - O lastSun 2s 1 D
+R q 1969 1971 - Mar Sun>=8 2s 0 S
+R q 1972 o - F lastSun 2s 0 S
+R q 1973 1981 - Mar Sun>=1 2s 0 S
+R q 1982 1983 - Mar lastSun 2s 0 S
+R q 1984 1986 - Mar Sun>=1 2s 0 S
+R q 1986 o - O Sun>=15 2s 1 D
+R q 1987 1990 - Mar Sun>=15 2s 0 S
+R q 1987 o - O Sun>=22 2s 1 D
+R q 1988 1990 - O lastSun 2s 1 D
+R q 1991 1999 - O Sun>=1 2s 1 D
+R q 1991 2005 - Mar lastSun 2s 0 S
+R q 2000 o - Au lastSun 2s 1 D
+R q 2001 ma - O Sun>=1 2s 1 D
+R q 2006 o - Ap Sun>=1 2s 0 S
+R q 2007 o - Mar lastSun 2s 0 S
+R q 2008 ma - Ap Sun>=1 2s 0 S
+Z Australia/Hobart 9:49:16 - LMT 1895 S
+10 - AEST 1916 O 1 2
+10 1 AEDT 1917 F
+10 l AE%sT 1967
+10 q AE%sT
+Z Australia/Currie 9:35:28 - LMT 1895 S
+10 - AEST 1916 O 1 2
+10 1 AEDT 1917 F
+10 l AE%sT 1971 Jul
+10 q AE%sT
+R r 1971 1985 - O lastSun 2s 1 D
+R r 1972 o - F lastSun 2s 0 S
+R r 1973 1985 - Mar Sun>=1 2s 0 S
+R r 1986 1990 - Mar Sun>=15 2s 0 S
+R r 1986 1987 - O Sun>=15 2s 1 D
+R r 1988 1999 - O lastSun 2s 1 D
+R r 1991 1994 - Mar Sun>=1 2s 0 S
+R r 1995 2005 - Mar lastSun 2s 0 S
+R r 2000 o - Au lastSun 2s 1 D
+R r 2001 2007 - O lastSun 2s 1 D
+R r 2006 o - Ap Sun>=1 2s 0 S
+R r 2007 o - Mar lastSun 2s 0 S
+R r 2008 ma - Ap Sun>=1 2s 0 S
+R r 2008 ma - O Sun>=1 2s 1 D
+Z Australia/Melbourne 9:39:52 - LMT 1895 F
+10 l AE%sT 1971
+10 r AE%sT
+R s 1971 1985 - O lastSun 2s 1 D
+R s 1972 o - F 27 2s 0 S
+R s 1973 1981 - Mar Sun>=1 2s 0 S
+R s 1982 o - Ap Sun>=1 2s 0 S
+R s 1983 1985 - Mar Sun>=1 2s 0 S
+R s 1986 1989 - Mar Sun>=15 2s 0 S
+R s 1986 o - O 19 2s 1 D
+R s 1987 1999 - O lastSun 2s 1 D
+R s 1990 1995 - Mar Sun>=1 2s 0 S
+R s 1996 2005 - Mar lastSun 2s 0 S
+R s 2000 o - Au lastSun 2s 1 D
+R s 2001 2007 - O lastSun 2s 1 D
+R s 2006 o - Ap Sun>=1 2s 0 S
+R s 2007 o - Mar lastSun 2s 0 S
+R s 2008 ma - Ap Sun>=1 2s 0 S
+R s 2008 ma - O Sun>=1 2s 1 D
+Z Australia/Sydney 10:4:52 - LMT 1895 F
+10 l AE%sT 1971
+10 s AE%sT
+Z Australia/Broken_Hill 9:25:48 - LMT 1895 F
+10 - AEST 1896 Au 23
+9 - ACST 1899 May
+9:30 l AC%sT 1971
+9:30 s AC%sT 2000
+9:30 p AC%sT
+R t 1981 1984 - O lastSun 2 1 D
+R t 1982 1985 - Mar Sun>=1 2 0 S
+R t 1985 o - O lastSun 2 0:30 D
+R t 1986 1989 - Mar Sun>=15 2 0 S
+R t 1986 o - O 19 2 0:30 D
+R t 1987 1999 - O lastSun 2 0:30 D
+R t 1990 1995 - Mar Sun>=1 2 0 S
+R t 1996 2005 - Mar lastSun 2 0 S
+R t 2000 o - Au lastSun 2 0:30 D
+R t 2001 2007 - O lastSun 2 0:30 D
+R t 2006 o - Ap Sun>=1 2 0 S
+R t 2007 o - Mar lastSun 2 0 S
+R t 2008 ma - Ap Sun>=1 2 0 S
+R t 2008 ma - O Sun>=1 2 0:30 D
+Z Australia/Lord_Howe 10:36:20 - LMT 1895 F
+10 - AEST 1981 Mar
+10:30 t +1030/+1130 1985 Jul
+10:30 t +1030/+11
+Z Antarctica/Macquarie 0 - -00 1899 N
+10 - AEST 1916 O 1 2
+10 1 AEDT 1917 F
+10 l AE%sT 1919 Ap 1 0s
+0 - -00 1948 Mar 25
+10 l AE%sT 1967
+10 q AE%sT 2010 Ap 4 3
+11 - +11
+Z Indian/Christmas 7:2:52 - LMT 1895 F
+7 - +07
+Z Indian/Cocos 6:27:40 - LMT 1900
+6:30 - +0630
+R u 1998 1999 - N Sun>=1 2 1 S
+R u 1999 2000 - F lastSun 3 0 -
+R u 2009 o - N 29 2 1 S
+R u 2010 o - Mar lastSun 3 0 -
+R u 2010 2013 - O Sun>=21 2 1 S
+R u 2011 o - Mar Sun>=1 3 0 -
+R u 2012 2013 - Ja Sun>=18 3 0 -
+R u 2014 o - Ja Sun>=18 2 0 -
+R u 2014 ma - N Sun>=1 2 1 S
+R u 2015 ma - Ja Sun>=14 3 0 -
+Z Pacific/Fiji 11:55:44 - LMT 1915 O 26
+12 u +12/+13
+Z Pacific/Gambier -8:59:48 - LMT 1912 O
+-9 - -09
+Z Pacific/Marquesas -9:18 - LMT 1912 O
+-9:30 - -0930
+Z Pacific/Tahiti -9:58:16 - LMT 1912 O
+-10 - -10
+Z Pacific/Guam -14:21 - LMT 1844 D 31
+9:39 - LMT 1901
+10 - GST 2000 D 23
+10 - ChST
+Li Pacific/Guam Pacific/Saipan
+Z Pacific/Tarawa 11:32:4 - LMT 1901
+12 - +12
+Z Pacific/Enderbury -11:24:20 - LMT 1901
+-12 - -12 1979 O
+-11 - -11 1995
+13 - +13
+Z Pacific/Kiritimati -10:29:20 - LMT 1901
+-10:40 - -1040 1979 O
+-10 - -10 1995
+14 - +14
+Z Pacific/Majuro 11:24:48 - LMT 1901
+11 - +11 1969 O
+12 - +12
+Z Pacific/Kwajalein 11:9:20 - LMT 1901
+11 - +11 1969 O
+-12 - -12 1993 Au 20
+12 - +12
+Z Pacific/Chuuk 10:7:8 - LMT 1901
+10 - +10
+Z Pacific/Pohnpei 10:32:52 - LMT 1901
+11 - +11
+Z Pacific/Kosrae 10:51:56 - LMT 1901
+11 - +11 1969 O
+12 - +12 1999
+11 - +11
+Z Pacific/Nauru 11:7:40 - LMT 1921 Ja 15
+11:30 - +1130 1942 Mar 15
+9 - +09 1944 Au 15
+11:30 - +1130 1979 May
+12 - +12
+R v 1977 1978 - D Sun>=1 0 1 S
+R v 1978 1979 - F 27 0 0 -
+R v 1996 o - D 1 2s 1 S
+R v 1997 o - Mar 2 2s 0 -
+Z Pacific/Noumea 11:5:48 - LMT 1912 Ja 13
+11 v +11/+12
+R w 1927 o - N 6 2 1 S
+R w 1928 o - Mar 4 2 0 M
+R w 1928 1933 - O Sun>=8 2 0:30 S
+R w 1929 1933 - Mar Sun>=15 2 0 M
+R w 1934 1940 - Ap lastSun 2 0 M
+R w 1934 1940 - S lastSun 2 0:30 S
+R w 1946 o - Ja 1 0 0 S
+R w 1974 o - N Sun>=1 2s 1 D
+R x 1974 o - N Sun>=1 2:45s 1 D
+R w 1975 o - F lastSun 2s 0 S
+R x 1975 o - F lastSun 2:45s 0 S
+R w 1975 1988 - O lastSun 2s 1 D
+R x 1975 1988 - O lastSun 2:45s 1 D
+R w 1976 1989 - Mar Sun>=1 2s 0 S
+R x 1976 1989 - Mar Sun>=1 2:45s 0 S
+R w 1989 o - O Sun>=8 2s 1 D
+R x 1989 o - O Sun>=8 2:45s 1 D
+R w 1990 2006 - O Sun>=1 2s 1 D
+R x 1990 2006 - O Sun>=1 2:45s 1 D
+R w 1990 2007 - Mar Sun>=15 2s 0 S
+R x 1990 2007 - Mar Sun>=15 2:45s 0 S
+R w 2007 ma - S lastSun 2s 1 D
+R x 2007 ma - S lastSun 2:45s 1 D
+R w 2008 ma - Ap Sun>=1 2s 0 S
+R x 2008 ma - Ap Sun>=1 2:45s 0 S
+Z Pacific/Auckland 11:39:4 - LMT 1868 N 2
+11:30 w NZ%sT 1946
+12 w NZ%sT
+Z Pacific/Chatham 12:13:48 - LMT 1868 N 2
+12:15 - +1215 1946
+12:45 x +1245/+1345
+Li Pacific/Auckland Antarctica/McMurdo
+R y 1978 o - N 12 0 0:30 HS
+R y 1979 1991 - Mar Sun>=1 0 0 -
+R y 1979 1990 - O lastSun 0 0:30 HS
+Z Pacific/Rarotonga -10:39:4 - LMT 1901
+-10:30 - -1030 1978 N 12
+-10 y -10/-0930
+Z Pacific/Niue -11:19:40 - LMT 1901
+-11:20 - -1120 1951
+-11:30 - -1130 1978 O
+-11 - -11
+Z Pacific/Norfolk 11:11:52 - LMT 1901
+11:12 - +1112 1951
+11:30 - +1130 1974 O 27 2
+11:30 1 +1230 1975 Mar 2 2
+11:30 - +1130 2015 O 4 2
+11 - +11
+Z Pacific/Palau 8:57:56 - LMT 1901
+9 - +09
+Z Pacific/Port_Moresby 9:48:40 - LMT 1880
+9:48:32 - PMMT 1895
+10 - +10
+Z Pacific/Bougainville 10:22:16 - LMT 1880
+9:48:32 - PMMT 1895
+10 - +10 1942 Jul
+9 - +09 1945 Au 21
+10 - +10 2014 D 28 2
+11 - +11
+Z Pacific/Pitcairn -8:40:20 - LMT 1901
+-8:30 - -0830 1998 Ap 27
+-8 - -08
+Z Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
+-11:22:48 - LMT 1911
+-11 - SST
+Li Pacific/Pago_Pago Pacific/Midway
+R z 2010 o - S lastSun 0 1 D
+R z 2011 o - Ap Sat>=1 4 0 S
+R z 2011 o - S lastSat 3 1 D
+R z 2012 ma - Ap Sun>=1 4 0 S
+R z 2012 ma - S lastSun 3 1 D
+Z Pacific/Apia 12:33:4 - LMT 1892 Jul 5
+-11:26:56 - LMT 1911
+-11:30 - -1130 1950
+-11 z -11/-10 2011 D 29 24
+13 z +13/+14
+Z Pacific/Guadalcanal 10:39:48 - LMT 1912 O
+11 - +11
+Z Pacific/Fakaofo -11:24:56 - LMT 1901
+-11 - -11 2011 D 30
+13 - +13
+R ! 1999 o - O 7 2s 1 S
+R ! 2000 o - Mar 19 2s 0 -
+R ! 2000 2001 - N Sun>=1 2 1 S
+R ! 2001 2002 - Ja lastSun 2 0 -
+R ! 2016 o - N Sun>=1 2 1 S
+R ! 2017 o - Ja Sun>=15 3 0 -
+Z Pacific/Tongatapu 12:19:20 - LMT 1901
+12:20 - +1220 1941
+13 - +13 1999
+13 ! +13/+14
+Z Pacific/Funafuti 11:56:52 - LMT 1901
+12 - +12
+Z Pacific/Wake 11:6:28 - LMT 1901
+12 - +12
+R $ 1983 o - S 25 0 1 S
+R $ 1984 1991 - Mar Sun>=23 0 0 -
+R $ 1984 o - O 23 0 1 S
+R $ 1985 1991 - S Sun>=23 0 1 S
+R $ 1992 1993 - Ja Sun>=23 0 0 -
+R $ 1992 o - O Sun>=23 0 1 S
+Z Pacific/Efate 11:13:16 - LMT 1912 Ja 13
+11 $ +11/+12
+Z Pacific/Wallis 12:15:20 - LMT 1901
+12 - +12
+R % 1916 o - May 21 2s 1 BST
+R % 1916 o - O 1 2s 0 GMT
+R % 1917 o - Ap 8 2s 1 BST
+R % 1917 o - S 17 2s 0 GMT
+R % 1918 o - Mar 24 2s 1 BST
+R % 1918 o - S 30 2s 0 GMT
+R % 1919 o - Mar 30 2s 1 BST
+R % 1919 o - S 29 2s 0 GMT
+R % 1920 o - Mar 28 2s 1 BST
+R % 1920 o - O 25 2s 0 GMT
+R % 1921 o - Ap 3 2s 1 BST
+R % 1921 o - O 3 2s 0 GMT
+R % 1922 o - Mar 26 2s 1 BST
+R % 1922 o - O 8 2s 0 GMT
+R % 1923 o - Ap Sun>=16 2s 1 BST
+R % 1923 1924 - S Sun>=16 2s 0 GMT
+R % 1924 o - Ap Sun>=9 2s 1 BST
+R % 1925 1926 - Ap Sun>=16 2s 1 BST
+R % 1925 1938 - O Sun>=2 2s 0 GMT
+R % 1927 o - Ap Sun>=9 2s 1 BST
+R % 1928 1929 - Ap Sun>=16 2s 1 BST
+R % 1930 o - Ap Sun>=9 2s 1 BST
+R % 1931 1932 - Ap Sun>=16 2s 1 BST
+R % 1933 o - Ap Sun>=9 2s 1 BST
+R % 1934 o - Ap Sun>=16 2s 1 BST
+R % 1935 o - Ap Sun>=9 2s 1 BST
+R % 1936 1937 - Ap Sun>=16 2s 1 BST
+R % 1938 o - Ap Sun>=9 2s 1 BST
+R % 1939 o - Ap Sun>=16 2s 1 BST
+R % 1939 o - N Sun>=16 2s 0 GMT
+R % 1940 o - F Sun>=23 2s 1 BST
+R % 1941 o - May Sun>=2 1s 2 BDST
+R % 1941 1943 - Au Sun>=9 1s 1 BST
+R % 1942 1944 - Ap Sun>=2 1s 2 BDST
+R % 1944 o - S Sun>=16 1s 1 BST
+R % 1945 o - Ap M>=2 1s 2 BDST
+R % 1945 o - Jul Sun>=9 1s 1 BST
+R % 1945 1946 - O Sun>=2 2s 0 GMT
+R % 1946 o - Ap Sun>=9 2s 1 BST
+R % 1947 o - Mar 16 2s 1 BST
+R % 1947 o - Ap 13 1s 2 BDST
+R % 1947 o - Au 10 1s 1 BST
+R % 1947 o - N 2 2s 0 GMT
+R % 1948 o - Mar 14 2s 1 BST
+R % 1948 o - O 31 2s 0 GMT
+R % 1949 o - Ap 3 2s 1 BST
+R % 1949 o - O 30 2s 0 GMT
+R % 1950 1952 - Ap Sun>=14 2s 1 BST
+R % 1950 1952 - O Sun>=21 2s 0 GMT
+R % 1953 o - Ap Sun>=16 2s 1 BST
+R % 1953 1960 - O Sun>=2 2s 0 GMT
+R % 1954 o - Ap Sun>=9 2s 1 BST
+R % 1955 1956 - Ap Sun>=16 2s 1 BST
+R % 1957 o - Ap Sun>=9 2s 1 BST
+R % 1958 1959 - Ap Sun>=16 2s 1 BST
+R % 1960 o - Ap Sun>=9 2s 1 BST
+R % 1961 1963 - Mar lastSun 2s 1 BST
+R % 1961 1968 - O Sun>=23 2s 0 GMT
+R % 1964 1967 - Mar Sun>=19 2s 1 BST
+R % 1968 o - F 18 2s 1 BST
+R % 1972 1980 - Mar Sun>=16 2s 1 BST
+R % 1972 1980 - O Sun>=23 2s 0 GMT
+R % 1981 1995 - Mar lastSun 1u 1 BST
+R % 1981 1989 - O Sun>=23 1u 0 GMT
+R % 1990 1995 - O Sun>=22 1u 0 GMT
+Z Europe/London -0:1:15 - LMT 1847 D 1 0s
+0 % %s 1968 O 27
+1 - BST 1971 O 31 2u
+0 % %s 1996
+0 O GMT/BST
+Li Europe/London Europe/Jersey
+Li Europe/London Europe/Guernsey
+Li Europe/London Europe/Isle_of_Man
+Z Europe/Dublin -0:25 - LMT 1880 Au 2
+-0:25:21 - DMT 1916 May 21 2s
+-0:25:21 1 IST 1916 O 1 2s
+0 % %s 1921 D 6
+0 % GMT/IST 1940 F 25 2s
+0 1 IST 1946 O 6 2s
+0 - GMT 1947 Mar 16 2s
+0 1 IST 1947 N 2 2s
+0 - GMT 1948 Ap 18 2s
+0 % GMT/IST 1968 O 27
+1 - IST 1971 O 31 2u
+0 % GMT/IST 1996
+0 O GMT/IST
+R O 1977 1980 - Ap Sun>=1 1u 1 S
+R O 1977 o - S lastSun 1u 0 -
+R O 1978 o - O 1 1u 0 -
+R O 1979 1995 - S lastSun 1u 0 -
+R O 1981 ma - Mar lastSun 1u 1 S
+R O 1996 ma - O lastSun 1u 0 -
+R & 1977 1980 - Ap Sun>=1 1s 1 S
+R & 1977 o - S lastSun 1s 0 -
+R & 1978 o - O 1 1s 0 -
+R & 1979 1995 - S lastSun 1s 0 -
+R & 1981 ma - Mar lastSun 1s 1 S
+R & 1996 ma - O lastSun 1s 0 -
+R ' 1916 o - Ap 30 23 1 S
+R ' 1916 o - O 1 1 0 -
+R ' 1917 1918 - Ap M>=15 2s 1 S
+R ' 1917 1918 - S M>=15 2s 0 -
+R ' 1940 o - Ap 1 2s 1 S
+R ' 1942 o - N 2 2s 0 -
+R ' 1943 o - Mar 29 2s 1 S
+R ' 1943 o - O 4 2s 0 -
+R ' 1944 1945 - Ap M>=1 2s 1 S
+R ' 1944 o - O 2 2s 0 -
+R ' 1945 o - S 16 2s 0 -
+R ' 1977 1980 - Ap Sun>=1 2s 1 S
+R ' 1977 o - S lastSun 2s 0 -
+R ' 1978 o - O 1 2s 0 -
+R ' 1979 1995 - S lastSun 2s 0 -
+R ' 1981 ma - Mar lastSun 2s 1 S
+R ' 1996 ma - O lastSun 2s 0 -
+R W 1977 1980 - Ap Sun>=1 0 1 S
+R W 1977 o - S lastSun 0 0 -
+R W 1978 o - O 1 0 0 -
+R W 1979 1995 - S lastSun 0 0 -
+R W 1981 ma - Mar lastSun 0 1 S
+R W 1996 ma - O lastSun 0 0 -
+R M 1917 o - Jul 1 23 1 MST
+R M 1917 o - D 28 0 0 MMT
+R M 1918 o - May 31 22 2 MDST
+R M 1918 o - S 16 1 1 MST
+R M 1919 o - May 31 23 2 MDST
+R M 1919 o - Jul 1 0u 1 MSD
+R M 1919 o - Au 16 0 0 MSK
+R M 1921 o - F 14 23 1 MSD
+R M 1921 o - Mar 20 23 2 +05
+R M 1921 o - S 1 0 1 MSD
+R M 1921 o - O 1 0 0 -
+R M 1981 1984 - Ap 1 0 1 S
+R M 1981 1983 - O 1 0 0 -
+R M 1984 1995 - S lastSun 2s 0 -
+R M 1985 2010 - Mar lastSun 2s 1 S
+R M 1996 2010 - O lastSun 2s 0 -
+Z WET 0 O WE%sT
+Z CET 1 ' CE%sT
+Z MET 1 ' ME%sT
+Z EET 2 O EE%sT
+R ( 1940 o - Jun 16 0 1 S
+R ( 1942 o - N 2 3 0 -
+R ( 1943 o - Mar 29 2 1 S
+R ( 1943 o - Ap 10 3 0 -
+R ( 1974 o - May 4 0 1 S
+R ( 1974 o - O 2 0 0 -
+R ( 1975 o - May 1 0 1 S
+R ( 1975 o - O 2 0 0 -
+R ( 1976 o - May 2 0 1 S
+R ( 1976 o - O 3 0 0 -
+R ( 1977 o - May 8 0 1 S
+R ( 1977 o - O 2 0 0 -
+R ( 1978 o - May 6 0 1 S
+R ( 1978 o - O 1 0 0 -
+R ( 1979 o - May 5 0 1 S
+R ( 1979 o - S 30 0 0 -
+R ( 1980 o - May 3 0 1 S
+R ( 1980 o - O 4 0 0 -
+R ( 1981 o - Ap 26 0 1 S
+R ( 1981 o - S 27 0 0 -
+R ( 1982 o - May 2 0 1 S
+R ( 1982 o - O 3 0 0 -
+R ( 1983 o - Ap 18 0 1 S
+R ( 1983 o - O 1 0 0 -
+R ( 1984 o - Ap 1 0 1 S
+Z Europe/Tirane 1:19:20 - LMT 1914
+1 - CET 1940 Jun 16
+1 ( CE%sT 1984 Jul
+1 O CE%sT
+Z Europe/Andorra 0:6:4 - LMT 1901
+0 - WET 1946 S 30
+1 - CET 1985 Mar 31 2
+1 O CE%sT
+R ) 1920 o - Ap 5 2s 1 S
+R ) 1920 o - S 13 2s 0 -
+R ) 1946 o - Ap 14 2s 1 S
+R ) 1946 1948 - O Sun>=1 2s 0 -
+R ) 1947 o - Ap 6 2s 1 S
+R ) 1948 o - Ap 18 2s 1 S
+R ) 1980 o - Ap 6 0 1 S
+R ) 1980 o - S 28 0 0 -
+Z Europe/Vienna 1:5:21 - LMT 1893 Ap
+1 ' CE%sT 1920
+1 ) CE%sT 1940 Ap 1 2s
+1 ' CE%sT 1945 Ap 2 2s
+1 1 CEST 1945 Ap 12 2s
+1 - CET 1946
+1 ) CE%sT 1981
+1 O CE%sT
+Z Europe/Minsk 1:50:16 - LMT 1880
+1:50 - MMT 1924 May 2
+2 - EET 1930 Jun 21
+3 - MSK 1941 Jun 28
+1 ' CE%sT 1944 Jul 3
+3 M MSK/MSD 1990
+3 - MSK 1991 Mar 31 2s
+2 M EE%sT 2011 Mar 27 2s
+3 - +03
+R * 1918 o - Mar 9 0s 1 S
+R * 1918 1919 - O Sat>=1 23s 0 -
+R * 1919 o - Mar 1 23s 1 S
+R * 1920 o - F 14 23s 1 S
+R * 1920 o - O 23 23s 0 -
+R * 1921 o - Mar 14 23s 1 S
+R * 1921 o - O 25 23s 0 -
+R * 1922 o - Mar 25 23s 1 S
+R * 1922 1927 - O Sat>=1 23s 0 -
+R * 1923 o - Ap 21 23s 1 S
+R * 1924 o - Mar 29 23s 1 S
+R * 1925 o - Ap 4 23s 1 S
+R * 1926 o - Ap 17 23s 1 S
+R * 1927 o - Ap 9 23s 1 S
+R * 1928 o - Ap 14 23s 1 S
+R * 1928 1938 - O Sun>=2 2s 0 -
+R * 1929 o - Ap 21 2s 1 S
+R * 1930 o - Ap 13 2s 1 S
+R * 1931 o - Ap 19 2s 1 S
+R * 1932 o - Ap 3 2s 1 S
+R * 1933 o - Mar 26 2s 1 S
+R * 1934 o - Ap 8 2s 1 S
+R * 1935 o - Mar 31 2s 1 S
+R * 1936 o - Ap 19 2s 1 S
+R * 1937 o - Ap 4 2s 1 S
+R * 1938 o - Mar 27 2s 1 S
+R * 1939 o - Ap 16 2s 1 S
+R * 1939 o - N 19 2s 0 -
+R * 1940 o - F 25 2s 1 S
+R * 1944 o - S 17 2s 0 -
+R * 1945 o - Ap 2 2s 1 S
+R * 1945 o - S 16 2s 0 -
+R * 1946 o - May 19 2s 1 S
+R * 1946 o - O 7 2s 0 -
+Z Europe/Brussels 0:17:30 - LMT 1880
+0:17:30 - BMT 1892 May 1 12
+0 - WET 1914 N 8
+1 - CET 1916 May
+1 ' CE%sT 1918 N 11 11u
+0 * WE%sT 1940 May 20 2s
+1 ' CE%sT 1944 S 3
+1 * CE%sT 1977
+1 O CE%sT
+R + 1979 o - Mar 31 23 1 S
+R + 1979 o - O 1 1 0 -
+R + 1980 1982 - Ap Sat>=1 23 1 S
+R + 1980 o - S 29 1 0 -
+R + 1981 o - S 27 2 0 -
+Z Europe/Sofia 1:33:16 - LMT 1880
+1:56:56 - IMT 1894 N 30
+2 - EET 1942 N 2 3
+1 ' CE%sT 1945
+1 - CET 1945 Ap 2 3
+2 - EET 1979 Mar 31 23
+2 + EE%sT 1982 S 26 3
+2 ' EE%sT 1991
+2 W EE%sT 1997
+2 O EE%sT
+R , 1945 o - Ap 8 2s 1 S
+R , 1945 o - N 18 2s 0 -
+R , 1946 o - May 6 2s 1 S
+R , 1946 1949 - O Sun>=1 2s 0 -
+R , 1947 o - Ap 20 2s 1 S
+R , 1948 o - Ap 18 2s 1 S
+R , 1949 o - Ap 9 2s 1 S
+Z Europe/Prague 0:57:44 - LMT 1850
+0:57:44 - PMT 1891 O
+1 ' CE%sT 1944 S 17 2s
+1 , CE%sT 1979
+1 O CE%sT
+R . 1916 o - May 14 23 1 S
+R . 1916 o - S 30 23 0 -
+R . 1940 o - May 15 0 1 S
+R . 1945 o - Ap 2 2s 1 S
+R . 1945 o - Au 15 2s 0 -
+R . 1946 o - May 1 2s 1 S
+R . 1946 o - S 1 2s 0 -
+R . 1947 o - May 4 2s 1 S
+R . 1947 o - Au 10 2s 0 -
+R . 1948 o - May 9 2s 1 S
+R . 1948 o - Au 8 2s 0 -
+Z Europe/Copenhagen 0:50:20 - LMT 1890
+0:50:20 - CMT 1894
+1 . CE%sT 1942 N 2 2s
+1 ' CE%sT 1945 Ap 2 2
+1 . CE%sT 1980
+1 O CE%sT
+Z Atlantic/Faroe -0:27:4 - LMT 1908 Ja 11
+0 - WET 1981
+0 O WE%sT
+R / 1991 1992 - Mar lastSun 2 1 D
+R / 1991 1992 - S lastSun 2 0 S
+R / 1993 2006 - Ap Sun>=1 2 1 D
+R / 1993 2006 - O lastSun 2 0 S
+R / 2007 ma - Mar Sun>=8 2 1 D
+R / 2007 ma - N Sun>=1 2 0 S
+Z America/Danmarkshavn -1:14:40 - LMT 1916 Jul 28
+-3 - -03 1980 Ap 6 2
+-3 O -03/-02 1996
+0 - GMT
+Z America/Scoresbysund -1:27:52 - LMT 1916 Jul 28
+-2 - -02 1980 Ap 6 2
+-2 ' -02/-01 1981 Mar 29
+-1 O -01/+00
+Z America/Godthab -3:26:56 - LMT 1916 Jul 28
+-3 - -03 1980 Ap 6 2
+-3 O -03/-02
+Z America/Thule -4:35:8 - LMT 1916 Jul 28
+-4 / A%sT
+Z Europe/Tallinn 1:39 - LMT 1880
+1:39 - TMT 1918 F
+1 ' CE%sT 1919 Jul
+1:39 - TMT 1921 May
+2 - EET 1940 Au 6
+3 - MSK 1941 S 15
+1 ' CE%sT 1944 S 22
+3 M MSK/MSD 1989 Mar 26 2s
+2 1 EEST 1989 S 24 2s
+2 ' EE%sT 1998 S 22
+2 O EE%sT 1999 O 31 4
+2 - EET 2002 F 21
+2 O EE%sT
+R : 1942 o - Ap 2 24 1 S
+R : 1942 o - O 4 1 0 -
+R : 1981 1982 - Mar lastSun 2 1 S
+R : 1981 1982 - S lastSun 3 0 -
+Z Europe/Helsinki 1:39:49 - LMT 1878 May 31
+1:39:49 - HMT 1921 May
+2 : EE%sT 1983
+2 O EE%sT
+Li Europe/Helsinki Europe/Mariehamn
+R ; 1916 o - Jun 14 23s 1 S
+R ; 1916 1919 - O Sun>=1 23s 0 -
+R ; 1917 o - Mar 24 23s 1 S
+R ; 1918 o - Mar 9 23s 1 S
+R ; 1919 o - Mar 1 23s 1 S
+R ; 1920 o - F 14 23s 1 S
+R ; 1920 o - O 23 23s 0 -
+R ; 1921 o - Mar 14 23s 1 S
+R ; 1921 o - O 25 23s 0 -
+R ; 1922 o - Mar 25 23s 1 S
+R ; 1922 1938 - O Sat>=1 23s 0 -
+R ; 1923 o - May 26 23s 1 S
+R ; 1924 o - Mar 29 23s 1 S
+R ; 1925 o - Ap 4 23s 1 S
+R ; 1926 o - Ap 17 23s 1 S
+R ; 1927 o - Ap 9 23s 1 S
+R ; 1928 o - Ap 14 23s 1 S
+R ; 1929 o - Ap 20 23s 1 S
+R ; 1930 o - Ap 12 23s 1 S
+R ; 1931 o - Ap 18 23s 1 S
+R ; 1932 o - Ap 2 23s 1 S
+R ; 1933 o - Mar 25 23s 1 S
+R ; 1934 o - Ap 7 23s 1 S
+R ; 1935 o - Mar 30 23s 1 S
+R ; 1936 o - Ap 18 23s 1 S
+R ; 1937 o - Ap 3 23s 1 S
+R ; 1938 o - Mar 26 23s 1 S
+R ; 1939 o - Ap 15 23s 1 S
+R ; 1939 o - N 18 23s 0 -
+R ; 1940 o - F 25 2 1 S
+R ; 1941 o - May 5 0 2 M
+R ; 1941 o - O 6 0 1 S
+R ; 1942 o - Mar 9 0 2 M
+R ; 1942 o - N 2 3 1 S
+R ; 1943 o - Mar 29 2 2 M
+R ; 1943 o - O 4 3 1 S
+R ; 1944 o - Ap 3 2 2 M
+R ; 1944 o - O 8 1 1 S
+R ; 1945 o - Ap 2 2 2 M
+R ; 1945 o - S 16 3 0 -
+R ; 1976 o - Mar 28 1 1 S
+R ; 1976 o - S 26 1 0 -
+Z Europe/Paris 0:9:21 - LMT 1891 Mar 15 0:1
+0:9:21 - PMT 1911 Mar 11 0:1
+0 ; WE%sT 1940 Jun 14 23
+1 ' CE%sT 1944 Au 25
+0 ; WE%sT 1945 S 16 3
+1 ; CE%sT 1977
+1 O CE%sT
+R < 1946 o - Ap 14 2s 1 S
+R < 1946 o - O 7 2s 0 -
+R < 1947 1949 - O Sun>=1 2s 0 -
+R < 1947 o - Ap 6 3s 1 S
+R < 1947 o - May 11 2s 2 M
+R < 1947 o - Jun 29 3 1 S
+R < 1948 o - Ap 18 2s 1 S
+R < 1949 o - Ap 10 2s 1 S
+R = 1945 o - May 24 2 2 M
+R = 1945 o - S 24 3 1 S
+R = 1945 o - N 18 2s 0 -
+Z Europe/Berlin 0:53:28 - LMT 1893 Ap
+1 ' CE%sT 1945 May 24 2
+1 = CE%sT 1946
+1 < CE%sT 1980
+1 O CE%sT
+Li Europe/Zurich Europe/Busingen
+Z Europe/Gibraltar -0:21:24 - LMT 1880 Au 2 0s
+0 % %s 1957 Ap 14 2
+1 - CET 1982
+1 O CE%sT
+R > 1932 o - Jul 7 0 1 S
+R > 1932 o - S 1 0 0 -
+R > 1941 o - Ap 7 0 1 S
+R > 1942 o - N 2 3 0 -
+R > 1943 o - Mar 30 0 1 S
+R > 1943 o - O 4 0 0 -
+R > 1952 o - Jul 1 0 1 S
+R > 1952 o - N 2 0 0 -
+R > 1975 o - Ap 12 0s 1 S
+R > 1975 o - N 26 0s 0 -
+R > 1976 o - Ap 11 2s 1 S
+R > 1976 o - O 10 2s 0 -
+R > 1977 1978 - Ap Sun>=1 2s 1 S
+R > 1977 o - S 26 2s 0 -
+R > 1978 o - S 24 4 0 -
+R > 1979 o - Ap 1 9 1 S
+R > 1979 o - S 29 2 0 -
+R > 1980 o - Ap 1 0 1 S
+R > 1980 o - S 28 0 0 -
+Z Europe/Athens 1:34:52 - LMT 1895 S 14
+1:34:52 - AMT 1916 Jul 28 0:1
+2 > EE%sT 1941 Ap 30
+1 > CE%sT 1944 Ap 4
+2 > EE%sT 1981
+2 O EE%sT
+R ? 1918 o - Ap 1 3 1 S
+R ? 1918 o - S 16 3 0 -
+R ? 1919 o - Ap 15 3 1 S
+R ? 1919 o - N 24 3 0 -
+R ? 1945 o - May 1 23 1 S
+R ? 1945 o - N 1 0 0 -
+R ? 1946 o - Mar 31 2s 1 S
+R ? 1946 1949 - O Sun>=1 2s 0 -
+R ? 1947 1949 - Ap Sun>=4 2s 1 S
+R ? 1950 o - Ap 17 2s 1 S
+R ? 1950 o - O 23 2s 0 -
+R ? 1954 1955 - May 23 0 1 S
+R ? 1954 1955 - O 3 0 0 -
+R ? 1956 o - Jun Sun>=1 0 1 S
+R ? 1956 o - S lastSun 0 0 -
+R ? 1957 o - Jun Sun>=1 1 1 S
+R ? 1957 o - S lastSun 3 0 -
+R ? 1980 o - Ap 6 1 1 S
+Z Europe/Budapest 1:16:20 - LMT 1890 O
+1 ' CE%sT 1918
+1 ? CE%sT 1941 Ap 8
+1 ' CE%sT 1945
+1 ? CE%sT 1980 S 28 2s
+1 O CE%sT
+R @ 1917 1919 - F 19 23 1 S
+R @ 1917 o - O 21 1 0 -
+R @ 1918 1919 - N 16 1 0 -
+R @ 1921 o - Mar 19 23 1 S
+R @ 1921 o - Jun 23 1 0 -
+R @ 1939 o - Ap 29 23 1 S
+R @ 1939 o - O 29 2 0 -
+R @ 1940 o - F 25 2 1 S
+R @ 1940 1941 - N Sun>=2 1s 0 -
+R @ 1941 1942 - Mar Sun>=2 1s 1 S
+R @ 1943 1946 - Mar Sun>=1 1s 1 S
+R @ 1942 1948 - O Sun>=22 1s 0 -
+R @ 1947 1967 - Ap Sun>=1 1s 1 S
+R @ 1949 o - O 30 1s 0 -
+R @ 1950 1966 - O Sun>=22 1s 0 -
+R @ 1967 o - O 29 1s 0 -
+Z Atlantic/Reykjavik -1:28 - LMT 1908
+-1 @ -01/+00 1968 Ap 7 1s
+0 - GMT
+R [ 1916 o - Jun 3 24 1 S
+R [ 1916 1917 - S 30 24 0 -
+R [ 1917 o - Mar 31 24 1 S
+R [ 1918 o - Mar 9 24 1 S
+R [ 1918 o - O 6 24 0 -
+R [ 1919 o - Mar 1 24 1 S
+R [ 1919 o - O 4 24 0 -
+R [ 1920 o - Mar 20 24 1 S
+R [ 1920 o - S 18 24 0 -
+R [ 1940 o - Jun 14 24 1 S
+R [ 1942 o - N 2 2s 0 -
+R [ 1943 o - Mar 29 2s 1 S
+R [ 1943 o - O 4 2s 0 -
+R [ 1944 o - Ap 2 2s 1 S
+R [ 1944 o - S 17 2s 0 -
+R [ 1945 o - Ap 2 2 1 S
+R [ 1945 o - S 15 1 0 -
+R [ 1946 o - Mar 17 2s 1 S
+R [ 1946 o - O 6 2s 0 -
+R [ 1947 o - Mar 16 0s 1 S
+R [ 1947 o - O 5 0s 0 -
+R [ 1948 o - F 29 2s 1 S
+R [ 1948 o - O 3 2s 0 -
+R [ 1966 1968 - May Sun>=22 0s 1 S
+R [ 1966 o - S 24 24 0 -
+R [ 1967 1969 - S Sun>=22 0s 0 -
+R [ 1969 o - Jun 1 0s 1 S
+R [ 1970 o - May 31 0s 1 S
+R [ 1970 o - S lastSun 0s 0 -
+R [ 1971 1972 - May Sun>=22 0s 1 S
+R [ 1971 o - S lastSun 0s 0 -
+R [ 1972 o - O 1 0s 0 -
+R [ 1973 o - Jun 3 0s 1 S
+R [ 1973 1974 - S lastSun 0s 0 -
+R [ 1974 o - May 26 0s 1 S
+R [ 1975 o - Jun 1 0s 1 S
+R [ 1975 1977 - S lastSun 0s 0 -
+R [ 1976 o - May 30 0s 1 S
+R [ 1977 1979 - May Sun>=22 0s 1 S
+R [ 1978 o - O 1 0s 0 -
+R [ 1979 o - S 30 0s 0 -
+Z Europe/Rome 0:49:56 - LMT 1866 S 22
+0:49:56 - RMT 1893 O 31 23:49:56
+1 [ CE%sT 1943 S 10
+1 ' CE%sT 1944 Jun 4
+1 [ CE%sT 1980
+1 O CE%sT
+Li Europe/Rome Europe/Vatican
+Li Europe/Rome Europe/San_Marino
+R \ 1989 1996 - Mar lastSun 2s 1 S
+R \ 1989 1996 - S lastSun 2s 0 -
+Z Europe/Riga 1:36:34 - LMT 1880
+1:36:34 - RMT 1918 Ap 15 2
+1:36:34 1 LST 1918 S 16 3
+1:36:34 - RMT 1919 Ap 1 2
+1:36:34 1 LST 1919 May 22 3
+1:36:34 - RMT 1926 May 11
+2 - EET 1940 Au 5
+3 - MSK 1941 Jul
+1 ' CE%sT 1944 O 13
+3 M MSK/MSD 1989 Mar lastSun 2s
+2 1 EEST 1989 S lastSun 2s
+2 \ EE%sT 1997 Ja 21
+2 O EE%sT 2000 F 29
+2 - EET 2001 Ja 2
+2 O EE%sT
+Li Europe/Zurich Europe/Vaduz
+Z Europe/Vilnius 1:41:16 - LMT 1880
+1:24 - WMT 1917
+1:35:36 - KMT 1919 O 10
+1 - CET 1920 Jul 12
+2 - EET 1920 O 9
+1 - CET 1940 Au 3
+3 - MSK 1941 Jun 24
+1 ' CE%sT 1944 Au
+3 M MSK/MSD 1989 Mar 26 2s
+2 M EE%sT 1991 S 29 2s
+2 ' EE%sT 1998
+2 - EET 1998 Mar 29 1u
+1 O CE%sT 1999 O 31 1u
+2 - EET 2003
+2 O EE%sT
+R ] 1916 o - May 14 23 1 S
+R ] 1916 o - O 1 1 0 -
+R ] 1917 o - Ap 28 23 1 S
+R ] 1917 o - S 17 1 0 -
+R ] 1918 o - Ap M>=15 2s 1 S
+R ] 1918 o - S M>=15 2s 0 -
+R ] 1919 o - Mar 1 23 1 S
+R ] 1919 o - O 5 3 0 -
+R ] 1920 o - F 14 23 1 S
+R ] 1920 o - O 24 2 0 -
+R ] 1921 o - Mar 14 23 1 S
+R ] 1921 o - O 26 2 0 -
+R ] 1922 o - Mar 25 23 1 S
+R ] 1922 o - O Sun>=2 1 0 -
+R ] 1923 o - Ap 21 23 1 S
+R ] 1923 o - O Sun>=2 2 0 -
+R ] 1924 o - Mar 29 23 1 S
+R ] 1924 1928 - O Sun>=2 1 0 -
+R ] 1925 o - Ap 5 23 1 S
+R ] 1926 o - Ap 17 23 1 S
+R ] 1927 o - Ap 9 23 1 S
+R ] 1928 o - Ap 14 23 1 S
+R ] 1929 o - Ap 20 23 1 S
+Z Europe/Luxembourg 0:24:36 - LMT 1904 Jun
+1 ] CE%sT 1918 N 25
+0 ] WE%sT 1929 O 6 2s
+0 * WE%sT 1940 May 14 3
+1 ' WE%sT 1944 S 18 3
+1 * CE%sT 1977
+1 O CE%sT
+R ^ 1973 o - Mar 31 0s 1 S
+R ^ 1973 o - S 29 0s 0 -
+R ^ 1974 o - Ap 21 0s 1 S
+R ^ 1974 o - S 16 0s 0 -
+R ^ 1975 1979 - Ap Sun>=15 2 1 S
+R ^ 1975 1980 - S Sun>=15 2 0 -
+R ^ 1980 o - Mar 31 2 1 S
+Z Europe/Malta 0:58:4 - LMT 1893 N 2 0s
+1 [ CE%sT 1973 Mar 31
+1 ^ CE%sT 1981
+1 O CE%sT
+R _ 1997 ma - Mar lastSun 2 1 S
+R _ 1997 ma - O lastSun 3 0 -
+Z Europe/Chisinau 1:55:20 - LMT 1880
+1:55 - CMT 1918 F 15
+1:44:24 - BMT 1931 Jul 24
+2 ` EE%sT 1940 Au 15
+2 1 EEST 1941 Jul 17
+1 ' CE%sT 1944 Au 24
+3 M MSK/MSD 1990 May 6 2
+2 M EE%sT 1992
+2 W EE%sT 1997
+2 _ EE%sT
+Z Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+0:9:21 - PMT 1911 Mar 11
+0 ; WE%sT 1945 S 16 3
+1 ; CE%sT 1977
+1 O CE%sT
+R { 1916 o - May 1 0 1 NST
+R { 1916 o - O 1 0 0 AMT
+R { 1917 o - Ap 16 2s 1 NST
+R { 1917 o - S 17 2s 0 AMT
+R { 1918 1921 - Ap M>=1 2s 1 NST
+R { 1918 1921 - S lastM 2s 0 AMT
+R { 1922 o - Mar lastSun 2s 1 NST
+R { 1922 1936 - O Sun>=2 2s 0 AMT
+R { 1923 o - Jun F>=1 2s 1 NST
+R { 1924 o - Mar lastSun 2s 1 NST
+R { 1925 o - Jun F>=1 2s 1 NST
+R { 1926 1931 - May 15 2s 1 NST
+R { 1932 o - May 22 2s 1 NST
+R { 1933 1936 - May 15 2s 1 NST
+R { 1937 o - May 22 2s 1 NST
+R { 1937 o - Jul 1 0 1 S
+R { 1937 1939 - O Sun>=2 2s 0 -
+R { 1938 1939 - May 15 2s 1 S
+R { 1945 o - Ap 2 2s 1 S
+R { 1945 o - S 16 2s 0 -
+Z Europe/Amsterdam 0:19:32 - LMT 1835
+0:19:32 { %s 1937 Jul
+0:20 { +0020/+0120 1940 May 16
+1 ' CE%sT 1945 Ap 2 2
+1 { CE%sT 1977
+1 O CE%sT
+R | 1916 o - May 22 1 1 S
+R | 1916 o - S 30 0 0 -
+R | 1945 o - Ap 2 2s 1 S
+R | 1945 o - O 1 2s 0 -
+R | 1959 1964 - Mar Sun>=15 2s 1 S
+R | 1959 1965 - S Sun>=15 2s 0 -
+R | 1965 o - Ap 25 2s 1 S
+Z Europe/Oslo 0:43 - LMT 1895
+1 | CE%sT 1940 Au 10 23
+1 ' CE%sT 1945 Ap 2 2
+1 | CE%sT 1980
+1 O CE%sT
+Li Europe/Oslo Arctic/Longyearbyen
+R } 1918 1919 - S 16 2s 0 -
+R } 1919 o - Ap 15 2s 1 S
+R } 1944 o - Ap 3 2s 1 S
+R } 1944 o - O 4 2 0 -
+R } 1945 o - Ap 29 0 1 S
+R } 1945 o - N 1 0 0 -
+R } 1946 o - Ap 14 0s 1 S
+R } 1946 o - O 7 2s 0 -
+R } 1947 o - May 4 2s 1 S
+R } 1947 1949 - O Sun>=1 2s 0 -
+R } 1948 o - Ap 18 2s 1 S
+R } 1949 o - Ap 10 2s 1 S
+R } 1957 o - Jun 2 1s 1 S
+R } 1957 1958 - S lastSun 1s 0 -
+R } 1958 o - Mar 30 1s 1 S
+R } 1959 o - May 31 1s 1 S
+R } 1959 1961 - O Sun>=1 1s 0 -
+R } 1960 o - Ap 3 1s 1 S
+R } 1961 1964 - May lastSun 1s 1 S
+R } 1962 1964 - S lastSun 1s 0 -
+Z Europe/Warsaw 1:24 - LMT 1880
+1:24 - WMT 1915 Au 5
+1 ' CE%sT 1918 S 16 3
+2 } EE%sT 1922 Jun
+1 } CE%sT 1940 Jun 23 2
+1 ' CE%sT 1944 O
+1 } CE%sT 1977
+1 & CE%sT 1988
+1 O CE%sT
+R ~ 1916 o - Jun 17 23 1 S
+R ~ 1916 o - N 1 1 0 -
+R ~ 1917 o - F 28 23s 1 S
+R ~ 1917 1921 - O 14 23s 0 -
+R ~ 1918 o - Mar 1 23s 1 S
+R ~ 1919 o - F 28 23s 1 S
+R ~ 1920 o - F 29 23s 1 S
+R ~ 1921 o - F 28 23s 1 S
+R ~ 1924 o - Ap 16 23s 1 S
+R ~ 1924 o - O 14 23s 0 -
+R ~ 1926 o - Ap 17 23s 1 S
+R ~ 1926 1929 - O Sat>=1 23s 0 -
+R ~ 1927 o - Ap 9 23s 1 S
+R ~ 1928 o - Ap 14 23s 1 S
+R ~ 1929 o - Ap 20 23s 1 S
+R ~ 1931 o - Ap 18 23s 1 S
+R ~ 1931 1932 - O Sat>=1 23s 0 -
+R ~ 1932 o - Ap 2 23s 1 S
+R ~ 1934 o - Ap 7 23s 1 S
+R ~ 1934 1938 - O Sat>=1 23s 0 -
+R ~ 1935 o - Mar 30 23s 1 S
+R ~ 1936 o - Ap 18 23s 1 S
+R ~ 1937 o - Ap 3 23s 1 S
+R ~ 1938 o - Mar 26 23s 1 S
+R ~ 1939 o - Ap 15 23s 1 S
+R ~ 1939 o - N 18 23s 0 -
+R ~ 1940 o - F 24 23s 1 S
+R ~ 1940 1941 - O 5 23s 0 -
+R ~ 1941 o - Ap 5 23s 1 S
+R ~ 1942 1945 - Mar Sat>=8 23s 1 S
+R ~ 1942 o - Ap 25 22s 2 M
+R ~ 1942 o - Au 15 22s 1 S
+R ~ 1942 1945 - O Sat>=24 23s 0 -
+R ~ 1943 o - Ap 17 22s 2 M
+R ~ 1943 1945 - Au Sat>=25 22s 1 S
+R ~ 1944 1945 - Ap Sat>=21 22s 2 M
+R ~ 1946 o - Ap Sat>=1 23s 1 S
+R ~ 1946 o - O Sat>=1 23s 0 -
+R ~ 1947 1949 - Ap Sun>=1 2s 1 S
+R ~ 1947 1949 - O Sun>=1 2s 0 -
+R ~ 1951 1965 - Ap Sun>=1 2s 1 S
+R ~ 1951 1965 - O Sun>=1 2s 0 -
+R ~ 1977 o - Mar 27 0s 1 S
+R ~ 1977 o - S 25 0s 0 -
+R ~ 1978 1979 - Ap Sun>=1 0s 1 S
+R ~ 1978 o - O 1 0s 0 -
+R ~ 1979 1982 - S lastSun 1s 0 -
+R ~ 1980 o - Mar lastSun 0s 1 S
+R ~ 1981 1982 - Mar lastSun 1s 1 S
+R ~ 1983 o - Mar lastSun 2s 1 S
+Z Europe/Lisbon -0:36:45 - LMT 1884
+-0:36:45 - LMT 1912
+0 ~ WE%sT 1966 Ap 3 2
+1 - CET 1976 S 26 1
+0 ~ WE%sT 1983 S 25 1s
+0 & WE%sT 1992 S 27 1s
+1 O CE%sT 1996 Mar 31 1u
+0 O WE%sT
+Z Atlantic/Azores -1:42:40 - LMT 1884
+-1:54:32 - HMT 1912
+-2 ~ -02/-01 1942 Ap 25 22s
+-2 ~ +00 1942 Au 15 22s
+-2 ~ -02/-01 1943 Ap 17 22s
+-2 ~ +00 1943 Au 28 22s
+-2 ~ -02/-01 1944 Ap 22 22s
+-2 ~ +00 1944 Au 26 22s
+-2 ~ -02/-01 1945 Ap 21 22s
+-2 ~ +00 1945 Au 25 22s
+-2 ~ -02/-01 1966 Ap 3 2
+-1 ~ -01/+00 1983 S 25 1s
+-1 & -01/+00 1992 S 27 1s
+0 O WE%sT 1993 Mar 28 1u
+-1 O -01/+00
+Z Atlantic/Madeira -1:7:36 - LMT 1884
+-1:7:36 - FMT 1912
+-1 ~ -01/+00 1942 Ap 25 22s
+-1 ~ +01 1942 Au 15 22s
+-1 ~ -01/+00 1943 Ap 17 22s
+-1 ~ +01 1943 Au 28 22s
+-1 ~ -01/+00 1944 Ap 22 22s
+-1 ~ +01 1944 Au 26 22s
+-1 ~ -01/+00 1945 Ap 21 22s
+-1 ~ +01 1945 Au 25 22s
+-1 ~ -01/+00 1966 Ap 3 2
+0 ~ WE%sT 1983 S 25 1s
+0 O WE%sT
+R ` 1932 o - May 21 0s 1 S
+R ` 1932 1939 - O Sun>=1 0s 0 -
+R ` 1933 1939 - Ap Sun>=2 0s 1 S
+R ` 1979 o - May 27 0 1 S
+R ` 1979 o - S lastSun 0 0 -
+R ` 1980 o - Ap 5 23 1 S
+R ` 1980 o - S lastSun 1 0 -
+R ` 1991 1993 - Mar lastSun 0s 1 S
+R ` 1991 1993 - S lastSun 0s 0 -
+Z Europe/Bucharest 1:44:24 - LMT 1891 O
+1:44:24 - BMT 1931 Jul 24
+2 ` EE%sT 1981 Mar 29 2s
+2 ' EE%sT 1991
+2 ` EE%sT 1994
+2 W EE%sT 1997
+2 O EE%sT
+Z Europe/Kaliningrad 1:22 - LMT 1893 Ap
+1 ' CE%sT 1945
+2 } CE%sT 1946
+3 M MSK/MSD 1989 Mar 26 2s
+2 M EE%sT 2011 Mar 27 2s
+3 - +03 2014 O 26 2s
+2 - EET
+Z Europe/Moscow 2:30:17 - LMT 1880
+2:30:17 - MMT 1916 Jul 3
+2:31:19 M %s 1919 Jul 1 0u
+3 M %s 1921 O
+3 M MSK/MSD 1922 O
+2 - EET 1930 Jun 21
+3 M MSK/MSD 1991 Mar 31 2s
+2 M EE%sT 1992 Ja 19 2s
+3 M MSK/MSD 2011 Mar 27 2s
+4 - MSK 2014 O 26 2s
+3 - MSK
+Z Europe/Simferopol 2:16:24 - LMT 1880
+2:16 - SMT 1924 May 2
+2 - EET 1930 Jun 21
+3 - MSK 1941 N
+1 ' CE%sT 1944 Ap 13
+3 M MSK/MSD 1990
+3 - MSK 1990 Jul 1 2
+2 - EET 1992
+2 W EE%sT 1994 May
+3 W MSK/MSD 1996 Mar 31 0s
+3 1 MSD 1996 O 27 3s
+3 M MSK/MSD 1997
+3 - MSK 1997 Mar lastSun 1u
+2 O EE%sT 2014 Mar 30 2
+4 - MSK 2014 O 26 2s
+3 - MSK
+Z Europe/Astrakhan 3:12:12 - LMT 1924 May
+3 - +03 1930 Jun 21
+4 M +04/+05 1989 Mar 26 2s
+3 M +03/+04 1991 Mar 31 2s
+4 - +04 1992 Mar 29 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04 2014 O 26 2s
+3 - +03 2016 Mar 27 2s
+4 - +04
+Z Europe/Volgograd 2:57:40 - LMT 1920 Ja 3
+3 - +03 1930 Jun 21
+4 - +04 1961 N 11
+4 M +04/+05 1988 Mar 27 2s
+3 M +03/+04 1991 Mar 31 2s
+4 - +04 1992 Mar 29 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04 2014 O 26 2s
+3 - +03
+Z Europe/Saratov 3:4:18 - LMT 1919 Jul 1 0u
+3 - +03 1930 Jun 21
+4 M +04/+05 1988 Mar 27 2s
+3 M +03/+04 1991 Mar 31 2s
+4 - +04 1992 Mar 29 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04 2014 O 26 2s
+3 - +03 2016 D 4 2s
+4 - +04
+Z Europe/Kirov 3:18:48 - LMT 1919 Jul 1 0u
+3 - +03 1930 Jun 21
+4 M +04/+05 1989 Mar 26 2s
+3 M +03/+04 1991 Mar 31 2s
+4 - +04 1992 Mar 29 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04 2014 O 26 2s
+3 - +03
+Z Europe/Samara 3:20:20 - LMT 1919 Jul 1 0u
+3 - +03 1930 Jun 21
+4 - +04 1935 Ja 27
+4 M +04/+05 1989 Mar 26 2s
+3 M +03/+04 1991 Mar 31 2s
+2 M +02/+03 1991 S 29 2s
+3 - +03 1991 O 20 3
+4 M +04/+05 2010 Mar 28 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04
+Z Europe/Ulyanovsk 3:13:36 - LMT 1919 Jul 1 0u
+3 - +03 1930 Jun 21
+4 M +04/+05 1989 Mar 26 2s
+3 M +03/+04 1991 Mar 31 2s
+2 M +02/+03 1992 Ja 19 2s
+3 M +03/+04 2011 Mar 27 2s
+4 - +04 2014 O 26 2s
+3 - +03 2016 Mar 27 2s
+4 - +04
+Z Asia/Yekaterinburg 4:2:33 - LMT 1916 Jul 3
+3:45:5 - PMT 1919 Jul 15 4
+4 - +04 1930 Jun 21
+5 M +05/+06 1991 Mar 31 2s
+4 M +04/+05 1992 Ja 19 2s
+5 M +05/+06 2011 Mar 27 2s
+6 - +06 2014 O 26 2s
+5 - +05
+Z Asia/Omsk 4:53:30 - LMT 1919 N 14
+5 - +05 1930 Jun 21
+6 M +06/+07 1991 Mar 31 2s
+5 M +05/+06 1992 Ja 19 2s
+6 M +06/+07 2011 Mar 27 2s
+7 - +07 2014 O 26 2s
+6 - +06
+Z Asia/Barnaul 5:35 - LMT 1919 D 10
+6 - +06 1930 Jun 21
+7 M +07/+08 1991 Mar 31 2s
+6 M +06/+07 1992 Ja 19 2s
+7 M +07/+08 1995 May 28
+6 M +06/+07 2011 Mar 27 2s
+7 - +07 2014 O 26 2s
+6 - +06 2016 Mar 27 2s
+7 - +07
+Z Asia/Novosibirsk 5:31:40 - LMT 1919 D 14 6
+6 - +06 1930 Jun 21
+7 M +07/+08 1991 Mar 31 2s
+6 M +06/+07 1992 Ja 19 2s
+7 M +07/+08 1993 May 23
+6 M +06/+07 2011 Mar 27 2s
+7 - +07 2014 O 26 2s
+6 - +06 2016 Jul 24 2s
+7 - +07
+Z Asia/Tomsk 5:39:51 - LMT 1919 D 22
+6 - +06 1930 Jun 21
+7 M +07/+08 1991 Mar 31 2s
+6 M +06/+07 1992 Ja 19 2s
+7 M +07/+08 2002 May 1 3
+6 M +06/+07 2011 Mar 27 2s
+7 - +07 2014 O 26 2s
+6 - +06 2016 May 29 2s
+7 - +07
+Z Asia/Novokuznetsk 5:48:48 - LMT 1924 May
+6 - +06 1930 Jun 21
+7 M +07/+08 1991 Mar 31 2s
+6 M +06/+07 1992 Ja 19 2s
+7 M +07/+08 2010 Mar 28 2s
+6 M +06/+07 2011 Mar 27 2s
+7 - +07
+Z Asia/Krasnoyarsk 6:11:26 - LMT 1920 Ja 6
+6 - +06 1930 Jun 21
+7 M +07/+08 1991 Mar 31 2s
+6 M +06/+07 1992 Ja 19 2s
+7 M +07/+08 2011 Mar 27 2s
+8 - +08 2014 O 26 2s
+7 - +07
+Z Asia/Irkutsk 6:57:5 - LMT 1880
+6:57:5 - IMT 1920 Ja 25
+7 - +07 1930 Jun 21
+8 M +08/+09 1991 Mar 31 2s
+7 M +07/+08 1992 Ja 19 2s
+8 M +08/+09 2011 Mar 27 2s
+9 - +09 2014 O 26 2s
+8 - +08
+Z Asia/Chita 7:33:52 - LMT 1919 D 15
+8 - +08 1930 Jun 21
+9 M +09/+10 1991 Mar 31 2s
+8 M +08/+09 1992 Ja 19 2s
+9 M +09/+10 2011 Mar 27 2s
+10 - +10 2014 O 26 2s
+8 - +08 2016 Mar 27 2
+9 - +09
+Z Asia/Yakutsk 8:38:58 - LMT 1919 D 15
+8 - +08 1930 Jun 21
+9 M +09/+10 1991 Mar 31 2s
+8 M +08/+09 1992 Ja 19 2s
+9 M +09/+10 2011 Mar 27 2s
+10 - +10 2014 O 26 2s
+9 - +09
+Z Asia/Vladivostok 8:47:31 - LMT 1922 N 15
+9 - +09 1930 Jun 21
+10 M +10/+11 1991 Mar 31 2s
+9 M +09/+10 1992 Ja 19 2s
+10 M +10/+11 2011 Mar 27 2s
+11 - +11 2014 O 26 2s
+10 - +10
+Z Asia/Khandyga 9:2:13 - LMT 1919 D 15
+8 - +08 1930 Jun 21
+9 M +09/+10 1991 Mar 31 2s
+8 M +08/+09 1992 Ja 19 2s
+9 M +09/+10 2004
+10 M +10/+11 2011 Mar 27 2s
+11 - +11 2011 S 13 0s
+10 - +10 2014 O 26 2s
+9 - +09
+Z Asia/Sakhalin 9:30:48 - LMT 1905 Au 23
+9 - +09 1945 Au 25
+11 M +11/+12 1991 Mar 31 2s
+10 M +10/+11 1992 Ja 19 2s
+11 M +11/+12 1997 Mar lastSun 2s
+10 M +10/+11 2011 Mar 27 2s
+11 - +11 2014 O 26 2s
+10 - +10 2016 Mar 27 2s
+11 - +11
+Z Asia/Magadan 10:3:12 - LMT 1924 May 2
+10 - +10 1930 Jun 21
+11 M +11/+12 1991 Mar 31 2s
+10 M +10/+11 1992 Ja 19 2s
+11 M +11/+12 2011 Mar 27 2s
+12 - +12 2014 O 26 2s
+10 - +10 2016 Ap 24 2s
+11 - +11
+Z Asia/Srednekolymsk 10:14:52 - LMT 1924 May 2
+10 - +10 1930 Jun 21
+11 M +11/+12 1991 Mar 31 2s
+10 M +10/+11 1992 Ja 19 2s
+11 M +11/+12 2011 Mar 27 2s
+12 - +12 2014 O 26 2s
+11 - +11
+Z Asia/Ust-Nera 9:32:54 - LMT 1919 D 15
+8 - +08 1930 Jun 21
+9 M +09/+10 1981 Ap
+11 M +11/+12 1991 Mar 31 2s
+10 M +10/+11 1992 Ja 19 2s
+11 M +11/+12 2011 Mar 27 2s
+12 - +12 2011 S 13 0s
+11 - +11 2014 O 26 2s
+10 - +10
+Z Asia/Kamchatka 10:34:36 - LMT 1922 N 10
+11 - +11 1930 Jun 21
+12 M +12/+13 1991 Mar 31 2s
+11 M +11/+12 1992 Ja 19 2s
+12 M +12/+13 2010 Mar 28 2s
+11 M +11/+12 2011 Mar 27 2s
+12 - +12
+Z Asia/Anadyr 11:49:56 - LMT 1924 May 2
+12 - +12 1930 Jun 21
+13 M +13/+14 1982 Ap 1 0s
+12 M +12/+13 1991 Mar 31 2s
+11 M +11/+12 1992 Ja 19 2s
+12 M +12/+13 2010 Mar 28 2s
+11 M +11/+12 2011 Mar 27 2s
+12 - +12
+Z Europe/Belgrade 1:22 - LMT 1884
+1 - CET 1941 Ap 18 23
+1 ' CE%sT 1945
+1 - CET 1945 May 8 2s
+1 1 CEST 1945 S 16 2s
+1 - CET 1982 N 27
+1 O CE%sT
+Li Europe/Belgrade Europe/Ljubljana
+Li Europe/Belgrade Europe/Podgorica
+Li Europe/Belgrade Europe/Sarajevo
+Li Europe/Belgrade Europe/Skopje
+Li Europe/Belgrade Europe/Zagreb
+Li Europe/Prague Europe/Bratislava
+R AA 1918 o - Ap 15 23 1 S
+R AA 1918 1919 - O 6 24s 0 -
+R AA 1919 o - Ap 6 23 1 S
+R AA 1924 o - Ap 16 23 1 S
+R AA 1924 o - O 4 24s 0 -
+R AA 1926 o - Ap 17 23 1 S
+R AA 1926 1929 - O Sat>=1 24s 0 -
+R AA 1927 o - Ap 9 23 1 S
+R AA 1928 o - Ap 15 0 1 S
+R AA 1929 o - Ap 20 23 1 S
+R AA 1937 o - Jun 16 23 1 S
+R AA 1937 o - O 2 24s 0 -
+R AA 1938 o - Ap 2 23 1 S
+R AA 1938 o - Ap 30 23 2 M
+R AA 1938 o - O 2 24 1 S
+R AA 1939 o - O 7 24s 0 -
+R AA 1942 o - May 2 23 1 S
+R AA 1942 o - S 1 1 0 -
+R AA 1943 1946 - Ap Sat>=13 23 1 S
+R AA 1943 1944 - O Sun>=1 1 0 -
+R AA 1945 1946 - S lastSun 1 0 -
+R AA 1949 o - Ap 30 23 1 S
+R AA 1949 o - O 2 1 0 -
+R AA 1974 1975 - Ap Sat>=12 23 1 S
+R AA 1974 1975 - O Sun>=1 1 0 -
+R AA 1976 o - Mar 27 23 1 S
+R AA 1976 1977 - S lastSun 1 0 -
+R AA 1977 o - Ap 2 23 1 S
+R AA 1978 o - Ap 2 2s 1 S
+R AA 1978 o - O 1 2s 0 -
+R AB 1967 o - Jun 3 12 1 S
+R AB 1967 o - O 1 0 0 -
+R AB 1974 o - Jun 24 0 1 S
+R AB 1974 o - S 1 0 0 -
+R AB 1976 1977 - May 1 0 1 S
+R AB 1976 o - Au 1 0 0 -
+R AB 1977 o - S 28 0 0 -
+R AB 1978 o - Jun 1 0 1 S
+R AB 1978 o - Au 4 0 0 -
+Z Europe/Madrid -0:14:44 - LMT 1900 D 31 23:45:16
+0 AA WE%sT 1940 Mar 16 23
+1 AA CE%sT 1979
+1 O CE%sT
+Z Africa/Ceuta -0:21:16 - LMT 1900 D 31 23:38:44
+0 - WET 1918 May 6 23
+0 1 WEST 1918 O 7 23
+0 - WET 1924
+0 AA WE%sT 1929
+0 AB WE%sT 1984 Mar 16
+1 - CET 1986
+1 O CE%sT
+Z Atlantic/Canary -1:1:36 - LMT 1922 Mar
+-1 - -01 1946 S 30 1
+0 - WET 1980 Ap 6 0s
+0 1 WEST 1980 S 28 1u
+0 O WE%sT
+Z Europe/Stockholm 1:12:12 - LMT 1879
+1:0:14 - SET 1900
+1 - CET 1916 May 14 23
+1 1 CEST 1916 O 1 1
+1 - CET 1980
+1 O CE%sT
+R AC 1941 1942 - May M>=1 1 1 S
+R AC 1941 1942 - O M>=1 2 0 -
+Z Europe/Zurich 0:34:8 - LMT 1853 Jul 16
+0:29:46 - BMT 1894 Jun
+1 AC CE%sT 1981
+1 O CE%sT
+R AD 1916 o - May 1 0 1 S
+R AD 1916 o - O 1 0 0 -
+R AD 1920 o - Mar 28 0 1 S
+R AD 1920 o - O 25 0 0 -
+R AD 1921 o - Ap 3 0 1 S
+R AD 1921 o - O 3 0 0 -
+R AD 1922 o - Mar 26 0 1 S
+R AD 1922 o - O 8 0 0 -
+R AD 1924 o - May 13 0 1 S
+R AD 1924 1925 - O 1 0 0 -
+R AD 1925 o - May 1 0 1 S
+R AD 1940 o - Jun 30 0 1 S
+R AD 1940 o - O 5 0 0 -
+R AD 1940 o - D 1 0 1 S
+R AD 1941 o - S 21 0 0 -
+R AD 1942 o - Ap 1 0 1 S
+R AD 1942 o - N 1 0 0 -
+R AD 1945 o - Ap 2 0 1 S
+R AD 1945 o - O 8 0 0 -
+R AD 1946 o - Jun 1 0 1 S
+R AD 1946 o - O 1 0 0 -
+R AD 1947 1948 - Ap Sun>=16 0 1 S
+R AD 1947 1950 - O Sun>=2 0 0 -
+R AD 1949 o - Ap 10 0 1 S
+R AD 1950 o - Ap 19 0 1 S
+R AD 1951 o - Ap 22 0 1 S
+R AD 1951 o - O 8 0 0 -
+R AD 1962 o - Jul 15 0 1 S
+R AD 1962 o - O 8 0 0 -
+R AD 1964 o - May 15 0 1 S
+R AD 1964 o - O 1 0 0 -
+R AD 1970 1972 - May Sun>=2 0 1 S
+R AD 1970 1972 - O Sun>=2 0 0 -
+R AD 1973 o - Jun 3 1 1 S
+R AD 1973 o - N 4 3 0 -
+R AD 1974 o - Mar 31 2 1 S
+R AD 1974 o - N 3 5 0 -
+R AD 1975 o - Mar 30 0 1 S
+R AD 1975 1976 - O lastSun 0 0 -
+R AD 1976 o - Jun 1 0 1 S
+R AD 1977 1978 - Ap Sun>=1 0 1 S
+R AD 1977 o - O 16 0 0 -
+R AD 1979 1980 - Ap Sun>=1 3 1 S
+R AD 1979 1982 - O M>=11 0 0 -
+R AD 1981 1982 - Mar lastSun 3 1 S
+R AD 1983 o - Jul 31 0 1 S
+R AD 1983 o - O 2 0 0 -
+R AD 1985 o - Ap 20 0 1 S
+R AD 1985 o - S 28 0 0 -
+R AD 1986 1993 - Mar lastSun 1s 1 S
+R AD 1986 1995 - S lastSun 1s 0 -
+R AD 1994 o - Mar 20 1s 1 S
+R AD 1995 2006 - Mar lastSun 1s 1 S
+R AD 1996 2006 - O lastSun 1s 0 -
+Z Europe/Istanbul 1:55:52 - LMT 1880
+1:56:56 - IMT 1910 O
+2 AD EE%sT 1978 O 15
+3 AD +03/+04 1985 Ap 20
+2 AD EE%sT 2007
+2 O EE%sT 2011 Mar 27 1u
+2 - EET 2011 Mar 28 1u
+2 O EE%sT 2014 Mar 30 1u
+2 - EET 2014 Mar 31 1u
+2 O EE%sT 2015 O 25 1u
+2 1 EEST 2015 N 8 1u
+2 O EE%sT 2016 S 7
+3 - +03
+Li Europe/Istanbul Asia/Istanbul
+Z Europe/Kiev 2:2:4 - LMT 1880
+2:2:4 - KMT 1924 May 2
+2 - EET 1930 Jun 21
+3 - MSK 1941 S 20
+1 ' CE%sT 1943 N 6
+3 M MSK/MSD 1990 Jul 1 2
+2 1 EEST 1991 S 29 3
+2 W EE%sT 1995
+2 O EE%sT
+Z Europe/Uzhgorod 1:29:12 - LMT 1890 O
+1 - CET 1940
+1 ' CE%sT 1944 O
+1 1 CEST 1944 O 26
+1 - CET 1945 Jun 29
+3 M MSK/MSD 1990
+3 - MSK 1990 Jul 1 2
+1 - CET 1991 Mar 31 3
+2 - EET 1992
+2 W EE%sT 1995
+2 O EE%sT
+Z Europe/Zaporozhye 2:20:40 - LMT 1880
+2:20 - +0220 1924 May 2
+2 - EET 1930 Jun 21
+3 - MSK 1941 Au 25
+1 ' CE%sT 1943 O 25
+3 M MSK/MSD 1991 Mar 31 2
+2 W EE%sT 1995
+2 O EE%sT
+R AE 1918 1919 - Mar lastSun 2 1 D
+R AE 1918 1919 - O lastSun 2 0 S
+R AE 1942 o - F 9 2 1 W
+R AE 1945 o - Au 14 23u 1 P
+R AE 1945 o - S lastSun 2 0 S
+R AE 1967 2006 - O lastSun 2 0 S
+R AE 1967 1973 - Ap lastSun 2 1 D
+R AE 1974 o - Ja 6 2 1 D
+R AE 1975 o - F 23 2 1 D
+R AE 1976 1986 - Ap lastSun 2 1 D
+R AE 1987 2006 - Ap Sun>=1 2 1 D
+R AE 2007 ma - Mar Sun>=8 2 1 D
+R AE 2007 ma - N Sun>=1 2 0 S
+Z EST -5 - EST
+Z MST -7 - MST
+Z HST -10 - HST
+Z EST5EDT -5 AE E%sT
+Z CST6CDT -6 AE C%sT
+Z MST7MDT -7 AE M%sT
+Z PST8PDT -8 AE P%sT
+R AF 1920 o - Mar lastSun 2 1 D
+R AF 1920 o - O lastSun 2 0 S
+R AF 1921 1966 - Ap lastSun 2 1 D
+R AF 1921 1954 - S lastSun 2 0 S
+R AF 1955 1966 - O lastSun 2 0 S
+Z America/New_York -4:56:2 - LMT 1883 N 18 12:3:58
+-5 AE E%sT 1920
+-5 AF E%sT 1942
+-5 AE E%sT 1946
+-5 AF E%sT 1967
+-5 AE E%sT
+R AG 1920 o - Jun 13 2 1 D
+R AG 1920 1921 - O lastSun 2 0 S
+R AG 1921 o - Mar lastSun 2 1 D
+R AG 1922 1966 - Ap lastSun 2 1 D
+R AG 1922 1954 - S lastSun 2 0 S
+R AG 1955 1966 - O lastSun 2 0 S
+Z America/Chicago -5:50:36 - LMT 1883 N 18 12:9:24
+-6 AE C%sT 1920
+-6 AG C%sT 1936 Mar 1 2
+-5 - EST 1936 N 15 2
+-6 AG C%sT 1942
+-6 AE C%sT 1946
+-6 AG C%sT 1967
+-6 AE C%sT
+Z America/North_Dakota/Center -6:45:12 - LMT 1883 N 18 12:14:48
+-7 AE M%sT 1992 O 25 2
+-6 AE C%sT
+Z America/North_Dakota/New_Salem -6:45:39 - LMT 1883 N 18 12:14:21
+-7 AE M%sT 2003 O 26 2
+-6 AE C%sT
+Z America/North_Dakota/Beulah -6:47:7 - LMT 1883 N 18 12:12:53
+-7 AE M%sT 2010 N 7 2
+-6 AE C%sT
+R AH 1920 1921 - Mar lastSun 2 1 D
+R AH 1920 o - O lastSun 2 0 S
+R AH 1921 o - May 22 2 0 S
+R AH 1965 1966 - Ap lastSun 2 1 D
+R AH 1965 1966 - O lastSun 2 0 S
+Z America/Denver -6:59:56 - LMT 1883 N 18 12:0:4
+-7 AE M%sT 1920
+-7 AH M%sT 1942
+-7 AE M%sT 1946
+-7 AH M%sT 1967
+-7 AE M%sT
+R AI 1948 o - Mar 14 2:1 1 D
+R AI 1949 o - Ja 1 2 0 S
+R AI 1950 1966 - Ap lastSun 1 1 D
+R AI 1950 1961 - S lastSun 2 0 S
+R AI 1962 1966 - O lastSun 2 0 S
+Z America/Los_Angeles -7:52:58 - LMT 1883 N 18 12:7:2
+-8 AE P%sT 1946
+-8 AI P%sT 1967
+-8 AE P%sT
+Z America/Juneau 15:2:19 - LMT 1867 O 19 15:33:32
+-8:57:41 - LMT 1900 Au 20 12
+-8 - PST 1942
+-8 AE P%sT 1946
+-8 - PST 1969
+-8 AE P%sT 1980 Ap 27 2
+-9 AE Y%sT 1980 O 26 2
+-8 AE P%sT 1983 O 30 2
+-9 AE Y%sT 1983 N 30
+-9 AE AK%sT
+Z America/Sitka 14:58:47 - LMT 1867 O 19 15:30
+-9:1:13 - LMT 1900 Au 20 12
+-8 - PST 1942
+-8 AE P%sT 1946
+-8 - PST 1969
+-8 AE P%sT 1983 O 30 2
+-9 AE Y%sT 1983 N 30
+-9 AE AK%sT
+Z America/Metlakatla 15:13:42 - LMT 1867 O 19 15:44:55
+-8:46:18 - LMT 1900 Au 20 12
+-8 - PST 1942
+-8 AE P%sT 1946
+-8 - PST 1969
+-8 AE P%sT 1983 O 30 2
+-8 - PST 2015 N 1 2
+-9 AE AK%sT
+Z America/Yakutat 14:41:5 - LMT 1867 O 19 15:12:18
+-9:18:55 - LMT 1900 Au 20 12
+-9 - YST 1942
+-9 AE Y%sT 1946
+-9 - YST 1969
+-9 AE Y%sT 1983 N 30
+-9 AE AK%sT
+Z America/Anchorage 14:0:24 - LMT 1867 O 19 14:31:37
+-9:59:36 - LMT 1900 Au 20 12
+-10 - AST 1942
+-10 AE A%sT 1967 Ap
+-10 - AHST 1969
+-10 AE AH%sT 1983 O 30 2
+-9 AE Y%sT 1983 N 30
+-9 AE AK%sT
+Z America/Nome 12:58:22 - LMT 1867 O 19 13:29:35
+-11:1:38 - LMT 1900 Au 20 12
+-11 - NST 1942
+-11 AE N%sT 1946
+-11 - NST 1967 Ap
+-11 - BST 1969
+-11 AE B%sT 1983 O 30 2
+-9 AE Y%sT 1983 N 30
+-9 AE AK%sT
+Z America/Adak 12:13:22 - LMT 1867 O 19 12:44:35
+-11:46:38 - LMT 1900 Au 20 12
+-11 - NST 1942
+-11 AE N%sT 1946
+-11 - NST 1967 Ap
+-11 - BST 1969
+-11 AE B%sT 1983 O 30 2
+-10 AE AH%sT 1983 N 30
+-10 AE H%sT
+Z Pacific/Honolulu -10:31:26 - LMT 1896 Ja 13 12
+-10:30 - HST 1933 Ap 30 2
+-10:30 1 HDT 1933 May 21 12
+-10:30 - HST 1942 F 9 2
+-10:30 1 HDT 1945 S 30 2
+-10:30 - HST 1947 Jun 8 2
+-10 - HST
+Z America/Phoenix -7:28:18 - LMT 1883 N 18 11:31:42
+-7 AE M%sT 1944 Ja 1 0:1
+-7 - MST 1944 Ap 1 0:1
+-7 AE M%sT 1944 O 1 0:1
+-7 - MST 1967
+-7 AE M%sT 1968 Mar 21
+-7 - MST
+Z America/Boise -7:44:49 - LMT 1883 N 18 12:15:11
+-8 AE P%sT 1923 May 13 2
+-7 AE M%sT 1974
+-7 - MST 1974 F 3 2
+-7 AE M%sT
+R AJ 1941 o - Jun 22 2 1 D
+R AJ 1941 1954 - S lastSun 2 0 S
+R AJ 1946 1954 - Ap lastSun 2 1 D
+Z America/Indiana/Indianapolis -5:44:38 - LMT 1883 N 18 12:15:22
+-6 AE C%sT 1920
+-6 AJ C%sT 1942
+-6 AE C%sT 1946
+-6 AJ C%sT 1955 Ap 24 2
+-5 - EST 1957 S 29 2
+-6 - CST 1958 Ap 27 2
+-5 - EST 1969
+-5 AE E%sT 1971
+-5 - EST 2006
+-5 AE E%sT
+R AK 1951 o - Ap lastSun 2 1 D
+R AK 1951 o - S lastSun 2 0 S
+R AK 1954 1960 - Ap lastSun 2 1 D
+R AK 1954 1960 - S lastSun 2 0 S
+Z America/Indiana/Marengo -5:45:23 - LMT 1883 N 18 12:14:37
+-6 AE C%sT 1951
+-6 AK C%sT 1961 Ap 30 2
+-5 - EST 1969
+-5 AE E%sT 1974 Ja 6 2
+-6 1 CDT 1974 O 27 2
+-5 AE E%sT 1976
+-5 - EST 2006
+-5 AE E%sT
+R AL 1946 o - Ap lastSun 2 1 D
+R AL 1946 o - S lastSun 2 0 S
+R AL 1953 1954 - Ap lastSun 2 1 D
+R AL 1953 1959 - S lastSun 2 0 S
+R AL 1955 o - May 1 0 1 D
+R AL 1956 1963 - Ap lastSun 2 1 D
+R AL 1960 o - O lastSun 2 0 S
+R AL 1961 o - S lastSun 2 0 S
+R AL 1962 1963 - O lastSun 2 0 S
+Z America/Indiana/Vincennes -5:50:7 - LMT 1883 N 18 12:9:53
+-6 AE C%sT 1946
+-6 AL C%sT 1964 Ap 26 2
+-5 - EST 1969
+-5 AE E%sT 1971
+-5 - EST 2006 Ap 2 2
+-6 AE C%sT 2007 N 4 2
+-5 AE E%sT
+R AM 1946 o - Ap lastSun 2 1 D
+R AM 1946 o - S lastSun 2 0 S
+R AM 1953 1954 - Ap lastSun 2 1 D
+R AM 1953 1959 - S lastSun 2 0 S
+R AM 1955 o - May 1 0 1 D
+R AM 1956 1963 - Ap lastSun 2 1 D
+R AM 1960 o - O lastSun 2 0 S
+R AM 1961 o - S lastSun 2 0 S
+R AM 1962 1963 - O lastSun 2 0 S
+Z America/Indiana/Tell_City -5:47:3 - LMT 1883 N 18 12:12:57
+-6 AE C%sT 1946
+-6 AM C%sT 1964 Ap 26 2
+-5 - EST 1969
+-5 AE E%sT 1971
+-5 - EST 2006 Ap 2 2
+-6 AE C%sT
+R AN 1955 o - May 1 0 1 D
+R AN 1955 1960 - S lastSun 2 0 S
+R AN 1956 1964 - Ap lastSun 2 1 D
+R AN 1961 1964 - O lastSun 2 0 S
+Z America/Indiana/Petersburg -5:49:7 - LMT 1883 N 18 12:10:53
+-6 AE C%sT 1955
+-6 AN C%sT 1965 Ap 25 2
+-5 - EST 1966 O 30 2
+-6 AE C%sT 1977 O 30 2
+-5 - EST 2006 Ap 2 2
+-6 AE C%sT 2007 N 4 2
+-5 AE E%sT
+R AO 1947 1961 - Ap lastSun 2 1 D
+R AO 1947 1954 - S lastSun 2 0 S
+R AO 1955 1956 - O lastSun 2 0 S
+R AO 1957 1958 - S lastSun 2 0 S
+R AO 1959 1961 - O lastSun 2 0 S
+Z America/Indiana/Knox -5:46:30 - LMT 1883 N 18 12:13:30
+-6 AE C%sT 1947
+-6 AO C%sT 1962 Ap 29 2
+-5 - EST 1963 O 27 2
+-6 AE C%sT 1991 O 27 2
+-5 - EST 2006 Ap 2 2
+-6 AE C%sT
+R AP 1946 1960 - Ap lastSun 2 1 D
+R AP 1946 1954 - S lastSun 2 0 S
+R AP 1955 1956 - O lastSun 2 0 S
+R AP 1957 1960 - S lastSun 2 0 S
+Z America/Indiana/Winamac -5:46:25 - LMT 1883 N 18 12:13:35
+-6 AE C%sT 1946
+-6 AP C%sT 1961 Ap 30 2
+-5 - EST 1969
+-5 AE E%sT 1971
+-5 - EST 2006 Ap 2 2
+-6 AE C%sT 2007 Mar 11 2
+-5 AE E%sT
+Z America/Indiana/Vevay -5:40:16 - LMT 1883 N 18 12:19:44
+-6 AE C%sT 1954 Ap 25 2
+-5 - EST 1969
+-5 AE E%sT 1973
+-5 - EST 2006
+-5 AE E%sT
+R AQ 1921 o - May 1 2 1 D
+R AQ 1921 o - S 1 2 0 S
+R AQ 1941 1961 - Ap lastSun 2 1 D
+R AQ 1941 o - S lastSun 2 0 S
+R AQ 1946 o - Jun 2 2 0 S
+R AQ 1950 1955 - S lastSun 2 0 S
+R AQ 1956 1960 - O lastSun 2 0 S
+Z America/Kentucky/Louisville -5:43:2 - LMT 1883 N 18 12:16:58
+-6 AE C%sT 1921
+-6 AQ C%sT 1942
+-6 AE C%sT 1946
+-6 AQ C%sT 1961 Jul 23 2
+-5 - EST 1968
+-5 AE E%sT 1974 Ja 6 2
+-6 1 CDT 1974 O 27 2
+-5 AE E%sT
+Z America/Kentucky/Monticello -5:39:24 - LMT 1883 N 18 12:20:36
+-6 AE C%sT 1946
+-6 - CST 1968
+-6 AE C%sT 2000 O 29 2
+-5 AE E%sT
+R AR 1948 o - Ap lastSun 2 1 D
+R AR 1948 o - S lastSun 2 0 S
+Z America/Detroit -5:32:11 - LMT 1905
+-6 - CST 1915 May 15 2
+-5 - EST 1942
+-5 AE E%sT 1946
+-5 AR E%sT 1973
+-5 AE E%sT 1975
+-5 - EST 1975 Ap 27 2
+-5 AE E%sT
+R AS 1946 o - Ap lastSun 2 1 D
+R AS 1946 o - S lastSun 2 0 S
+R AS 1966 o - Ap lastSun 2 1 D
+R AS 1966 o - O lastSun 2 0 S
+Z America/Menominee -5:50:27 - LMT 1885 S 18 12
+-6 AE C%sT 1946
+-6 AS C%sT 1969 Ap 27 2
+-5 - EST 1973 Ap 29 2
+-6 AE C%sT
+R AT 1918 o - Ap 14 2 1 D
+R AT 1918 o - O 27 2 0 S
+R AT 1942 o - F 9 2 1 W
+R AT 1945 o - Au 14 23u 1 P
+R AT 1945 o - S 30 2 0 S
+R AT 1974 1986 - Ap lastSun 2 1 D
+R AT 1974 2006 - O lastSun 2 0 S
+R AT 1987 2006 - Ap Sun>=1 2 1 D
+R AT 2007 ma - Mar Sun>=8 2 1 D
+R AT 2007 ma - N Sun>=1 2 0 S
+R AU 1917 o - Ap 8 2 1 D
+R AU 1917 o - S 17 2 0 S
+R AU 1919 o - May 5 23 1 D
+R AU 1919 o - Au 12 23 0 S
+R AU 1920 1935 - May Sun>=1 23 1 D
+R AU 1920 1935 - O lastSun 23 0 S
+R AU 1936 1941 - May M>=9 0 1 D
+R AU 1936 1941 - O M>=2 0 0 S
+R AU 1946 1950 - May Sun>=8 2 1 D
+R AU 1946 1950 - O Sun>=2 2 0 S
+R AU 1951 1986 - Ap lastSun 2 1 D
+R AU 1951 1959 - S lastSun 2 0 S
+R AU 1960 1986 - O lastSun 2 0 S
+R AU 1987 o - Ap Sun>=1 0:1 1 D
+R AU 1987 2006 - O lastSun 0:1 0 S
+R AU 1988 o - Ap Sun>=1 0:1 2 DD
+R AU 1989 2006 - Ap Sun>=1 0:1 1 D
+R AU 2007 2011 - Mar Sun>=8 0:1 1 D
+R AU 2007 2010 - N Sun>=1 0:1 0 S
+Z America/St_Johns -3:30:52 - LMT 1884
+-3:30:52 AU N%sT 1918
+-3:30:52 AT N%sT 1919
+-3:30:52 AU N%sT 1935 Mar 30
+-3:30 AU N%sT 1942 May 11
+-3:30 AT N%sT 1946
+-3:30 AU N%sT 2011 N
+-3:30 AT N%sT
+Z America/Goose_Bay -4:1:40 - LMT 1884
+-3:30:52 - NST 1918
+-3:30:52 AT N%sT 1919
+-3:30:52 - NST 1935 Mar 30
+-3:30 - NST 1936
+-3:30 AU N%sT 1942 May 11
+-3:30 AT N%sT 1946
+-3:30 AU N%sT 1966 Mar 15 2
+-4 AU A%sT 2011 N
+-4 AT A%sT
+R AV 1916 o - Ap 1 0 1 D
+R AV 1916 o - O 1 0 0 S
+R AV 1920 o - May 9 0 1 D
+R AV 1920 o - Au 29 0 0 S
+R AV 1921 o - May 6 0 1 D
+R AV 1921 1922 - S 5 0 0 S
+R AV 1922 o - Ap 30 0 1 D
+R AV 1923 1925 - May Sun>=1 0 1 D
+R AV 1923 o - S 4 0 0 S
+R AV 1924 o - S 15 0 0 S
+R AV 1925 o - S 28 0 0 S
+R AV 1926 o - May 16 0 1 D
+R AV 1926 o - S 13 0 0 S
+R AV 1927 o - May 1 0 1 D
+R AV 1927 o - S 26 0 0 S
+R AV 1928 1931 - May Sun>=8 0 1 D
+R AV 1928 o - S 9 0 0 S
+R AV 1929 o - S 3 0 0 S
+R AV 1930 o - S 15 0 0 S
+R AV 1931 1932 - S M>=24 0 0 S
+R AV 1932 o - May 1 0 1 D
+R AV 1933 o - Ap 30 0 1 D
+R AV 1933 o - O 2 0 0 S
+R AV 1934 o - May 20 0 1 D
+R AV 1934 o - S 16 0 0 S
+R AV 1935 o - Jun 2 0 1 D
+R AV 1935 o - S 30 0 0 S
+R AV 1936 o - Jun 1 0 1 D
+R AV 1936 o - S 14 0 0 S
+R AV 1937 1938 - May Sun>=1 0 1 D
+R AV 1937 1941 - S M>=24 0 0 S
+R AV 1939 o - May 28 0 1 D
+R AV 1940 1941 - May Sun>=1 0 1 D
+R AV 1946 1949 - Ap lastSun 2 1 D
+R AV 1946 1949 - S lastSun 2 0 S
+R AV 1951 1954 - Ap lastSun 2 1 D
+R AV 1951 1954 - S lastSun 2 0 S
+R AV 1956 1959 - Ap lastSun 2 1 D
+R AV 1956 1959 - S lastSun 2 0 S
+R AV 1962 1973 - Ap lastSun 2 1 D
+R AV 1962 1973 - O lastSun 2 0 S
+Z America/Halifax -4:14:24 - LMT 1902 Jun 15
+-4 AV A%sT 1918
+-4 AT A%sT 1919
+-4 AV A%sT 1942 F 9 2s
+-4 AT A%sT 1946
+-4 AV A%sT 1974
+-4 AT A%sT
+Z America/Glace_Bay -3:59:48 - LMT 1902 Jun 15
+-4 AT A%sT 1953
+-4 AV A%sT 1954
+-4 - AST 1972
+-4 AV A%sT 1974
+-4 AT A%sT
+R AW 1933 1935 - Jun Sun>=8 1 1 D
+R AW 1933 1935 - S Sun>=8 1 0 S
+R AW 1936 1938 - Jun Sun>=1 1 1 D
+R AW 1936 1938 - S Sun>=1 1 0 S
+R AW 1939 o - May 27 1 1 D
+R AW 1939 1941 - S Sat>=21 1 0 S
+R AW 1940 o - May 19 1 1 D
+R AW 1941 o - May 4 1 1 D
+R AW 1946 1972 - Ap lastSun 2 1 D
+R AW 1946 1956 - S lastSun 2 0 S
+R AW 1957 1972 - O lastSun 2 0 S
+R AW 1993 2006 - Ap Sun>=1 0:1 1 D
+R AW 1993 2006 - O lastSun 0:1 0 S
+Z America/Moncton -4:19:8 - LMT 1883 D 9
+-5 - EST 1902 Jun 15
+-4 AT A%sT 1933
+-4 AW A%sT 1942
+-4 AT A%sT 1946
+-4 AW A%sT 1973
+-4 AT A%sT 1993
+-4 AW A%sT 2007
+-4 AT A%sT
+Z America/Blanc-Sablon -3:48:28 - LMT 1884
+-4 AT A%sT 1970
+-4 - AST
+R AX 1919 o - Mar 30 23:30 1 D
+R AX 1919 o - O 26 0 0 S
+R AX 1920 o - May 2 2 1 D
+R AX 1920 o - S 26 0 0 S
+R AX 1921 o - May 15 2 1 D
+R AX 1921 o - S 15 2 0 S
+R AX 1922 1923 - May Sun>=8 2 1 D
+R AX 1922 1926 - S Sun>=15 2 0 S
+R AX 1924 1927 - May Sun>=1 2 1 D
+R AX 1927 1932 - S lastSun 2 0 S
+R AX 1928 1931 - Ap lastSun 2 1 D
+R AX 1932 o - May 1 2 1 D
+R AX 1933 1940 - Ap lastSun 2 1 D
+R AX 1933 o - O 1 2 0 S
+R AX 1934 1939 - S lastSun 2 0 S
+R AX 1945 1946 - S lastSun 2 0 S
+R AX 1946 o - Ap lastSun 2 1 D
+R AX 1947 1949 - Ap lastSun 0 1 D
+R AX 1947 1948 - S lastSun 0 0 S
+R AX 1949 o - N lastSun 0 0 S
+R AX 1950 1973 - Ap lastSun 2 1 D
+R AX 1950 o - N lastSun 2 0 S
+R AX 1951 1956 - S lastSun 2 0 S
+R AX 1957 1973 - O lastSun 2 0 S
+Z America/Toronto -5:17:32 - LMT 1895
+-5 AT E%sT 1919
+-5 AX E%sT 1942 F 9 2s
+-5 AT E%sT 1946
+-5 AX E%sT 1974
+-5 AT E%sT
+Z America/Thunder_Bay -5:57 - LMT 1895
+-6 - CST 1910
+-5 - EST 1942
+-5 AT E%sT 1970
+-5 AX E%sT 1973
+-5 - EST 1974
+-5 AT E%sT
+Z America/Nipigon -5:53:4 - LMT 1895
+-5 AT E%sT 1940 S 29
+-5 1 EDT 1942 F 9 2s
+-5 AT E%sT
+Z America/Rainy_River -6:18:16 - LMT 1895
+-6 AT C%sT 1940 S 29
+-6 1 CDT 1942 F 9 2s
+-6 AT C%sT
+Z America/Atikokan -6:6:28 - LMT 1895
+-6 AT C%sT 1940 S 29
+-6 1 CDT 1942 F 9 2s
+-6 AT C%sT 1945 S 30 2
+-5 - EST
+R AY 1916 o - Ap 23 0 1 D
+R AY 1916 o - S 17 0 0 S
+R AY 1918 o - Ap 14 2 1 D
+R AY 1918 o - O 27 2 0 S
+R AY 1937 o - May 16 2 1 D
+R AY 1937 o - S 26 2 0 S
+R AY 1942 o - F 9 2 1 W
+R AY 1945 o - Au 14 23u 1 P
+R AY 1945 o - S lastSun 2 0 S
+R AY 1946 o - May 12 2 1 D
+R AY 1946 o - O 13 2 0 S
+R AY 1947 1949 - Ap lastSun 2 1 D
+R AY 1947 1949 - S lastSun 2 0 S
+R AY 1950 o - May 1 2 1 D
+R AY 1950 o - S 30 2 0 S
+R AY 1951 1960 - Ap lastSun 2 1 D
+R AY 1951 1958 - S lastSun 2 0 S
+R AY 1959 o - O lastSun 2 0 S
+R AY 1960 o - S lastSun 2 0 S
+R AY 1963 o - Ap lastSun 2 1 D
+R AY 1963 o - S 22 2 0 S
+R AY 1966 1986 - Ap lastSun 2s 1 D
+R AY 1966 2005 - O lastSun 2s 0 S
+R AY 1987 2005 - Ap Sun>=1 2s 1 D
+Z America/Winnipeg -6:28:36 - LMT 1887 Jul 16
+-6 AY C%sT 2006
+-6 AT C%sT
+R AZ 1918 o - Ap 14 2 1 D
+R AZ 1918 o - O 27 2 0 S
+R AZ 1930 1934 - May Sun>=1 0 1 D
+R AZ 1930 1934 - O Sun>=1 0 0 S
+R AZ 1937 1941 - Ap Sun>=8 0 1 D
+R AZ 1937 o - O Sun>=8 0 0 S
+R AZ 1938 o - O Sun>=1 0 0 S
+R AZ 1939 1941 - O Sun>=8 0 0 S
+R AZ 1942 o - F 9 2 1 W
+R AZ 1945 o - Au 14 23u 1 P
+R AZ 1945 o - S lastSun 2 0 S
+R AZ 1946 o - Ap Sun>=8 2 1 D
+R AZ 1946 o - O Sun>=8 2 0 S
+R AZ 1947 1957 - Ap lastSun 2 1 D
+R AZ 1947 1957 - S lastSun 2 0 S
+R AZ 1959 o - Ap lastSun 2 1 D
+R AZ 1959 o - O lastSun 2 0 S
+R Aa 1957 o - Ap lastSun 2 1 D
+R Aa 1957 o - O lastSun 2 0 S
+R Aa 1959 1961 - Ap lastSun 2 1 D
+R Aa 1959 o - O lastSun 2 0 S
+R Aa 1960 1961 - S lastSun 2 0 S
+Z America/Regina -6:58:36 - LMT 1905 S
+-7 AZ M%sT 1960 Ap lastSun 2
+-6 - CST
+Z America/Swift_Current -7:11:20 - LMT 1905 S
+-7 AT M%sT 1946 Ap lastSun 2
+-7 AZ M%sT 1950
+-7 Aa M%sT 1972 Ap lastSun 2
+-6 - CST
+R Ab 1918 1919 - Ap Sun>=8 2 1 D
+R Ab 1918 o - O 27 2 0 S
+R Ab 1919 o - May 27 2 0 S
+R Ab 1920 1923 - Ap lastSun 2 1 D
+R Ab 1920 o - O lastSun 2 0 S
+R Ab 1921 1923 - S lastSun 2 0 S
+R Ab 1942 o - F 9 2 1 W
+R Ab 1945 o - Au 14 23u 1 P
+R Ab 1945 o - S lastSun 2 0 S
+R Ab 1947 o - Ap lastSun 2 1 D
+R Ab 1947 o - S lastSun 2 0 S
+R Ab 1967 o - Ap lastSun 2 1 D
+R Ab 1967 o - O lastSun 2 0 S
+R Ab 1969 o - Ap lastSun 2 1 D
+R Ab 1969 o - O lastSun 2 0 S
+R Ab 1972 1986 - Ap lastSun 2 1 D
+R Ab 1972 2006 - O lastSun 2 0 S
+Z America/Edmonton -7:33:52 - LMT 1906 S
+-7 Ab M%sT 1987
+-7 AT M%sT
+R Ac 1918 o - Ap 14 2 1 D
+R Ac 1918 o - O 27 2 0 S
+R Ac 1942 o - F 9 2 1 W
+R Ac 1945 o - Au 14 23u 1 P
+R Ac 1945 o - S 30 2 0 S
+R Ac 1946 1986 - Ap lastSun 2 1 D
+R Ac 1946 o - O 13 2 0 S
+R Ac 1947 1961 - S lastSun 2 0 S
+R Ac 1962 2006 - O lastSun 2 0 S
+Z America/Vancouver -8:12:28 - LMT 1884
+-8 Ac P%sT 1987
+-8 AT P%sT
+Z America/Dawson_Creek -8:0:56 - LMT 1884
+-8 AT P%sT 1947
+-8 Ac P%sT 1972 Au 30 2
+-7 - MST
+Z America/Fort_Nelson -8:10:47 - LMT 1884
+-8 Ac P%sT 1946
+-8 - PST 1947
+-8 Ac P%sT 1987
+-8 AT P%sT 2015 Mar 8 2
+-7 - MST
+Z America/Creston -7:46:4 - LMT 1884
+-7 - MST 1916 O
+-8 - PST 1918 Jun 2
+-7 - MST
+R Ad 1918 o - Ap 14 2 1 D
+R Ad 1918 o - O 27 2 0 S
+R Ad 1919 o - May 25 2 1 D
+R Ad 1919 o - N 1 0 0 S
+R Ad 1942 o - F 9 2 1 W
+R Ad 1945 o - Au 14 23u 1 P
+R Ad 1945 o - S 30 2 0 S
+R Ad 1965 o - Ap lastSun 0 2 DD
+R Ad 1965 o - O lastSun 2 0 S
+R Ad 1980 1986 - Ap lastSun 2 1 D
+R Ad 1980 2006 - O lastSun 2 0 S
+R Ad 1987 2006 - Ap Sun>=1 2 1 D
+Z America/Pangnirtung 0 - -00 1921
+-4 Ad A%sT 1995 Ap Sun>=1 2
+-5 AT E%sT 1999 O 31 2
+-6 AT C%sT 2000 O 29 2
+-5 AT E%sT
+Z America/Iqaluit 0 - -00 1942 Au
+-5 Ad E%sT 1999 O 31 2
+-6 AT C%sT 2000 O 29 2
+-5 AT E%sT
+Z America/Resolute 0 - -00 1947 Au 31
+-6 Ad C%sT 2000 O 29 2
+-5 - EST 2001 Ap 1 3
+-6 AT C%sT 2006 O 29 2
+-5 - EST 2007 Mar 11 3
+-6 AT C%sT
+Z America/Rankin_Inlet 0 - -00 1957
+-6 Ad C%sT 2000 O 29 2
+-5 - EST 2001 Ap 1 3
+-6 AT C%sT
+Z America/Cambridge_Bay 0 - -00 1920
+-7 Ad M%sT 1999 O 31 2
+-6 AT C%sT 2000 O 29 2
+-5 - EST 2000 N 5
+-6 - CST 2001 Ap 1 3
+-7 AT M%sT
+Z America/Yellowknife 0 - -00 1935
+-7 Ad M%sT 1980
+-7 AT M%sT
+Z America/Inuvik 0 - -00 1953
+-8 Ad P%sT 1979 Ap lastSun 2
+-7 Ad M%sT 1980
+-7 AT M%sT
+Z America/Whitehorse -9:0:12 - LMT 1900 Au 20
+-9 Ad Y%sT 1967 May 28
+-8 Ad P%sT 1980
+-8 AT P%sT
+Z America/Dawson -9:17:40 - LMT 1900 Au 20
+-9 Ad Y%sT 1973 O 28
+-8 Ad P%sT 1980
+-8 AT P%sT
+R Ae 1939 o - F 5 0 1 D
+R Ae 1939 o - Jun 25 0 0 S
+R Ae 1940 o - D 9 0 1 D
+R Ae 1941 o - Ap 1 0 0 S
+R Ae 1943 o - D 16 0 1 W
+R Ae 1944 o - May 1 0 0 S
+R Ae 1950 o - F 12 0 1 D
+R Ae 1950 o - Jul 30 0 0 S
+R Ae 1996 2000 - Ap Sun>=1 2 1 D
+R Ae 1996 2000 - O lastSun 2 0 S
+R Ae 2001 o - May Sun>=1 2 1 D
+R Ae 2001 o - S lastSun 2 0 S
+R Ae 2002 ma - Ap Sun>=1 2 1 D
+R Ae 2002 ma - O lastSun 2 0 S
+Z America/Cancun -5:47:4 - LMT 1922 Ja 1 0:12:56
+-6 - CST 1981 D 23
+-5 Ae E%sT 1998 Au 2 2
+-6 Ae C%sT 2015 F 1 2
+-5 - EST
+Z America/Merida -5:58:28 - LMT 1922 Ja 1 0:1:32
+-6 - CST 1981 D 23
+-5 - EST 1982 D 2
+-6 Ae C%sT
+Z America/Matamoros -6:40 - LMT 1921 D 31 23:20
+-6 - CST 1988
+-6 AE C%sT 1989
+-6 Ae C%sT 2010
+-6 AE C%sT
+Z America/Monterrey -6:41:16 - LMT 1921 D 31 23:18:44
+-6 - CST 1988
+-6 AE C%sT 1989
+-6 Ae C%sT
+Z America/Mexico_City -6:36:36 - LMT 1922 Ja 1 0:23:24
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 Ae C%sT 2001 S 30 2
+-6 - CST 2002 F 20
+-6 Ae C%sT
+Z America/Ojinaga -6:57:40 - LMT 1922 Ja 1 0:2:20
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 - CST 1996
+-6 Ae C%sT 1998
+-6 - CST 1998 Ap Sun>=1 3
+-7 Ae M%sT 2010
+-7 AE M%sT
+Z America/Chihuahua -7:4:20 - LMT 1921 D 31 23:55:40
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 - CST 1996
+-6 Ae C%sT 1998
+-6 - CST 1998 Ap Sun>=1 3
+-7 Ae M%sT
+Z America/Hermosillo -7:23:52 - LMT 1921 D 31 23:36:8
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 - CST 1942 Ap 24
+-7 - MST 1949 Ja 14
+-8 - PST 1970
+-7 Ae M%sT 1999
+-7 - MST
+Z America/Mazatlan -7:5:40 - LMT 1921 D 31 23:54:20
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 - CST 1942 Ap 24
+-7 - MST 1949 Ja 14
+-8 - PST 1970
+-7 Ae M%sT
+Z America/Bahia_Banderas -7:1 - LMT 1921 D 31 23:59
+-7 - MST 1927 Jun 10 23
+-6 - CST 1930 N 15
+-7 - MST 1931 May 1 23
+-6 - CST 1931 O
+-7 - MST 1932 Ap
+-6 - CST 1942 Ap 24
+-7 - MST 1949 Ja 14
+-8 - PST 1970
+-7 Ae M%sT 2010 Ap 4 2
+-6 Ae C%sT
+Z America/Tijuana -7:48:4 - LMT 1922 Ja 1 0:11:56
+-7 - MST 1924
+-8 - PST 1927 Jun 10 23
+-7 - MST 1930 N 15
+-8 - PST 1931 Ap
+-8 1 PDT 1931 S 30
+-8 - PST 1942 Ap 24
+-8 1 PWT 1945 Au 14 23u
+-8 1 PPT 1945 N 12
+-8 - PST 1948 Ap 5
+-8 1 PDT 1949 Ja 14
+-8 - PST 1954
+-8 AI P%sT 1961
+-8 - PST 1976
+-8 AE P%sT 1996
+-8 Ae P%sT 2001
+-8 AE P%sT 2002 F 20
+-8 Ae P%sT 2010
+-8 AE P%sT
+R Af 1964 1975 - O lastSun 2 0 S
+R Af 1964 1975 - Ap lastSun 2 1 D
+Z America/Nassau -5:9:30 - LMT 1912 Mar 2
+-5 Af E%sT 1976
+-5 AE E%sT
+R Ag 1977 o - Jun 12 2 1 D
+R Ag 1977 1978 - O Sun>=1 2 0 S
+R Ag 1978 1980 - Ap Sun>=15 2 1 D
+R Ag 1979 o - S 30 2 0 S
+R Ag 1980 o - S 25 2 0 S
+Z America/Barbados -3:58:29 - LMT 1924
+-3:58:29 - BMT 1932
+-4 Ag A%sT
+R Ah 1918 1942 - O Sun>=2 0 0:30 -0530
+R Ah 1919 1943 - F Sun>=9 0 0 CST
+R Ah 1973 o - D 5 0 1 CDT
+R Ah 1974 o - F 9 0 0 CST
+R Ah 1982 o - D 18 0 1 CDT
+R Ah 1983 o - F 12 0 0 CST
+Z America/Belize -5:52:48 - LMT 1912 Ap
+-6 Ah %s
+Z Atlantic/Bermuda -4:19:18 - LMT 1930 Ja 1 2
+-4 - AST 1974 Ap 28 2
+-4 AT A%sT 1976
+-4 AE A%sT
+R Ai 1979 1980 - F lastSun 0 1 D
+R Ai 1979 1980 - Jun Sun>=1 0 0 S
+R Ai 1991 1992 - Ja Sat>=15 0 1 D
+R Ai 1991 o - Jul 1 0 0 S
+R Ai 1992 o - Mar 15 0 0 S
+Z America/Costa_Rica -5:36:13 - LMT 1890
+-5:36:13 - SJMT 1921 Ja 15
+-6 Ai C%sT
+R Aj 1928 o - Jun 10 0 1 D
+R Aj 1928 o - O 10 0 0 S
+R Aj 1940 1942 - Jun Sun>=1 0 1 D
+R Aj 1940 1942 - S Sun>=1 0 0 S
+R Aj 1945 1946 - Jun Sun>=1 0 1 D
+R Aj 1945 1946 - S Sun>=1 0 0 S
+R Aj 1965 o - Jun 1 0 1 D
+R Aj 1965 o - S 30 0 0 S
+R Aj 1966 o - May 29 0 1 D
+R Aj 1966 o - O 2 0 0 S
+R Aj 1967 o - Ap 8 0 1 D
+R Aj 1967 1968 - S Sun>=8 0 0 S
+R Aj 1968 o - Ap 14 0 1 D
+R Aj 1969 1977 - Ap lastSun 0 1 D
+R Aj 1969 1971 - O lastSun 0 0 S
+R Aj 1972 1974 - O 8 0 0 S
+R Aj 1975 1977 - O lastSun 0 0 S
+R Aj 1978 o - May 7 0 1 D
+R Aj 1978 1990 - O Sun>=8 0 0 S
+R Aj 1979 1980 - Mar Sun>=15 0 1 D
+R Aj 1981 1985 - May Sun>=5 0 1 D
+R Aj 1986 1989 - Mar Sun>=14 0 1 D
+R Aj 1990 1997 - Ap Sun>=1 0 1 D
+R Aj 1991 1995 - O Sun>=8 0s 0 S
+R Aj 1996 o - O 6 0s 0 S
+R Aj 1997 o - O 12 0s 0 S
+R Aj 1998 1999 - Mar lastSun 0s 1 D
+R Aj 1998 2003 - O lastSun 0s 0 S
+R Aj 2000 2003 - Ap Sun>=1 0s 1 D
+R Aj 2004 o - Mar lastSun 0s 1 D
+R Aj 2006 2010 - O lastSun 0s 0 S
+R Aj 2007 o - Mar Sun>=8 0s 1 D
+R Aj 2008 o - Mar Sun>=15 0s 1 D
+R Aj 2009 2010 - Mar Sun>=8 0s 1 D
+R Aj 2011 o - Mar Sun>=15 0s 1 D
+R Aj 2011 o - N 13 0s 0 S
+R Aj 2012 o - Ap 1 0s 1 D
+R Aj 2012 ma - N Sun>=1 0s 0 S
+R Aj 2013 ma - Mar Sun>=8 0s 1 D
+Z America/Havana -5:29:28 - LMT 1890
+-5:29:36 - HMT 1925 Jul 19 12
+-5 Aj C%sT
+R Ak 1966 o - O 30 0 1 EDT
+R Ak 1967 o - F 28 0 0 EST
+R Ak 1969 1973 - O lastSun 0 0:30 -0430
+R Ak 1970 o - F 21 0 0 EST
+R Ak 1971 o - Ja 20 0 0 EST
+R Ak 1972 1974 - Ja 21 0 0 EST
+Z America/Santo_Domingo -4:39:36 - LMT 1890
+-4:40 - SDMT 1933 Ap 1 12
+-5 Ak %s 1974 O 27
+-4 - AST 2000 O 29 2
+-5 AE E%sT 2000 D 3 1
+-4 - AST
+R Al 1987 1988 - May Sun>=1 0 1 D
+R Al 1987 1988 - S lastSun 0 0 S
+Z America/El_Salvador -5:56:48 - LMT 1921
+-6 Al C%sT
+R Am 1973 o - N 25 0 1 D
+R Am 1974 o - F 24 0 0 S
+R Am 1983 o - May 21 0 1 D
+R Am 1983 o - S 22 0 0 S
+R Am 1991 o - Mar 23 0 1 D
+R Am 1991 o - S 7 0 0 S
+R Am 2006 o - Ap 30 0 1 D
+R Am 2006 o - O 1 0 0 S
+Z America/Guatemala -6:2:4 - LMT 1918 O 5
+-6 Am C%sT
+R An 1983 o - May 8 0 1 D
+R An 1984 1987 - Ap lastSun 0 1 D
+R An 1983 1987 - O lastSun 0 0 S
+R An 1988 1997 - Ap Sun>=1 1s 1 D
+R An 1988 1997 - O lastSun 1s 0 S
+R An 2005 2006 - Ap Sun>=1 0 1 D
+R An 2005 2006 - O lastSun 0 0 S
+R An 2012 2015 - Mar Sun>=8 2 1 D
+R An 2012 2015 - N Sun>=1 2 0 S
+R An 2017 ma - Mar Sun>=8 2 1 D
+R An 2017 ma - N Sun>=1 2 0 S
+Z America/Port-au-Prince -4:49:20 - LMT 1890
+-4:49 - PPMT 1917 Ja 24 12
+-5 An E%sT
+R Ao 1987 1988 - May Sun>=1 0 1 D
+R Ao 1987 1988 - S lastSun 0 0 S
+R Ao 2006 o - May Sun>=1 0 1 D
+R Ao 2006 o - Au M>=1 0 0 S
+Z America/Tegucigalpa -5:48:52 - LMT 1921 Ap
+-6 Ao C%sT
+Z America/Jamaica -5:7:11 - LMT 1890
+-5:7:11 - KMT 1912 F
+-5 - EST 1974
+-5 AE E%sT 1984
+-5 - EST
+Z America/Martinique -4:4:20 - LMT 1890
+-4:4:20 - FFMT 1911 May
+-4 - AST 1980 Ap 6
+-4 1 ADT 1980 S 28
+-4 - AST
+R Ap 1979 1980 - Mar Sun>=16 0 1 D
+R Ap 1979 1980 - Jun M>=23 0 0 S
+R Ap 2005 o - Ap 10 0 1 D
+R Ap 2005 o - O Sun>=1 0 0 S
+R Ap 2006 o - Ap 30 2 1 D
+R Ap 2006 o - O Sun>=1 1 0 S
+Z America/Managua -5:45:8 - LMT 1890
+-5:45:12 - MMT 1934 Jun 23
+-6 - CST 1973 May
+-5 - EST 1975 F 16
+-6 Ap C%sT 1992 Ja 1 4
+-5 - EST 1992 S 24
+-6 - CST 1993
+-5 - EST 1997
+-6 Ap C%sT
+Z America/Panama -5:18:8 - LMT 1890
+-5:19:36 - CMT 1908 Ap 22
+-5 - EST
+Li America/Panama America/Cayman
+Z America/Puerto_Rico -4:24:25 - LMT 1899 Mar 28 12
+-4 - AST 1942 May 3
+-4 AE A%sT 1946
+-4 - AST
+Z America/Miquelon -3:44:40 - LMT 1911 May 15
+-4 - AST 1980 May
+-3 - -03 1987
+-3 AT -03/-02
+Z America/Grand_Turk -4:44:32 - LMT 1890
+-5:7:11 - KMT 1912 F
+-5 - EST 1979
+-5 AE E%sT 2015 N Sun>=1 2
+-4 - AST 2018 Mar 11 3
+-5 AE E%sT
+R Aq 1930 o - D 1 0 1 S
+R Aq 1931 o - Ap 1 0 0 -
+R Aq 1931 o - O 15 0 1 S
+R Aq 1932 1940 - Mar 1 0 0 -
+R Aq 1932 1939 - N 1 0 1 S
+R Aq 1940 o - Jul 1 0 1 S
+R Aq 1941 o - Jun 15 0 0 -
+R Aq 1941 o - O 15 0 1 S
+R Aq 1943 o - Au 1 0 0 -
+R Aq 1943 o - O 15 0 1 S
+R Aq 1946 o - Mar 1 0 0 -
+R Aq 1946 o - O 1 0 1 S
+R Aq 1963 o - O 1 0 0 -
+R Aq 1963 o - D 15 0 1 S
+R Aq 1964 1966 - Mar 1 0 0 -
+R Aq 1964 1966 - O 15 0 1 S
+R Aq 1967 o - Ap 2 0 0 -
+R Aq 1967 1968 - O Sun>=1 0 1 S
+R Aq 1968 1969 - Ap Sun>=1 0 0 -
+R Aq 1974 o - Ja 23 0 1 S
+R Aq 1974 o - May 1 0 0 -
+R Aq 1988 o - D 1 0 1 S
+R Aq 1989 1993 - Mar Sun>=1 0 0 -
+R Aq 1989 1992 - O Sun>=15 0 1 S
+R Aq 1999 o - O Sun>=1 0 1 S
+R Aq 2000 o - Mar 3 0 0 -
+R Aq 2007 o - D 30 0 1 S
+R Aq 2008 2009 - Mar Sun>=15 0 0 -
+R Aq 2008 o - O Sun>=15 0 1 S
+Z America/Argentina/Buenos_Aires -3:53:48 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 Aq -03/-02
+Z America/Argentina/Cordoba -4:16:48 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar 3
+-4 - -04 1991 O 20
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 Aq -03/-02
+Z America/Argentina/Salta -4:21:40 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar 3
+-4 - -04 1991 O 20
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/Tucuman -4:20:52 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar 3
+-4 - -04 1991 O 20
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 Jun
+-4 - -04 2004 Jun 13
+-3 Aq -03/-02
+Z America/Argentina/La_Rioja -4:27:24 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar
+-4 - -04 1991 May 7
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 Jun
+-4 - -04 2004 Jun 20
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/San_Juan -4:34:4 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar
+-4 - -04 1991 May 7
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 May 31
+-4 - -04 2004 Jul 25
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/Jujuy -4:21:12 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1990 Mar 4
+-4 - -04 1990 O 28
+-4 1 -03 1991 Mar 17
+-4 - -04 1991 O 6
+-3 1 -02 1992
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/Catamarca -4:23:8 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1991 Mar 3
+-4 - -04 1991 O 20
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 Jun
+-4 - -04 2004 Jun 20
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/Mendoza -4:35:16 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1990 Mar 4
+-4 - -04 1990 O 15
+-4 1 -03 1991 Mar
+-4 - -04 1991 O 15
+-4 1 -03 1992 Mar
+-4 - -04 1992 O 18
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 May 23
+-4 - -04 2004 S 26
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+R Ar 2008 2009 - Mar Sun>=8 0 0 -
+R Ar 2007 2008 - O Sun>=8 0 1 S
+Z America/Argentina/San_Luis -4:25:24 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1990
+-3 1 -02 1990 Mar 14
+-4 - -04 1990 O 15
+-4 1 -03 1991 Mar
+-4 - -04 1991 Jun
+-3 - -03 1999 O 3
+-4 1 -03 2000 Mar 3
+-3 - -03 2004 May 31
+-4 - -04 2004 Jul 25
+-3 Aq -03/-02 2008 Ja 21
+-4 Ar -04/-03 2009 O 11
+-3 - -03
+Z America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 Jun
+-4 - -04 2004 Jun 20
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Z America/Argentina/Ushuaia -4:33:12 - LMT 1894 O 31
+-4:16:48 - CMT 1920 May
+-4 - -04 1930 D
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1999 O 3
+-4 Aq -04/-03 2000 Mar 3
+-3 - -03 2004 May 30
+-4 - -04 2004 Jun 20
+-3 Aq -03/-02 2008 O 18
+-3 - -03
+Li America/Curacao America/Aruba
+Z America/La_Paz -4:32:36 - LMT 1890
+-4:32:36 - CMT 1931 O 15
+-4:32:36 1 BST 1932 Mar 21
+-4 - -04
+R As 1931 o - O 3 11 1 S
+R As 1932 1933 - Ap 1 0 0 -
+R As 1932 o - O 3 0 1 S
+R As 1949 1952 - D 1 0 1 S
+R As 1950 o - Ap 16 1 0 -
+R As 1951 1952 - Ap 1 0 0 -
+R As 1953 o - Mar 1 0 0 -
+R As 1963 o - D 9 0 1 S
+R As 1964 o - Mar 1 0 0 -
+R As 1965 o - Ja 31 0 1 S
+R As 1965 o - Mar 31 0 0 -
+R As 1965 o - D 1 0 1 S
+R As 1966 1968 - Mar 1 0 0 -
+R As 1966 1967 - N 1 0 1 S
+R As 1985 o - N 2 0 1 S
+R As 1986 o - Mar 15 0 0 -
+R As 1986 o - O 25 0 1 S
+R As 1987 o - F 14 0 0 -
+R As 1987 o - O 25 0 1 S
+R As 1988 o - F 7 0 0 -
+R As 1988 o - O 16 0 1 S
+R As 1989 o - Ja 29 0 0 -
+R As 1989 o - O 15 0 1 S
+R As 1990 o - F 11 0 0 -
+R As 1990 o - O 21 0 1 S
+R As 1991 o - F 17 0 0 -
+R As 1991 o - O 20 0 1 S
+R As 1992 o - F 9 0 0 -
+R As 1992 o - O 25 0 1 S
+R As 1993 o - Ja 31 0 0 -
+R As 1993 1995 - O Sun>=11 0 1 S
+R As 1994 1995 - F Sun>=15 0 0 -
+R As 1996 o - F 11 0 0 -
+R As 1996 o - O 6 0 1 S
+R As 1997 o - F 16 0 0 -
+R As 1997 o - O 6 0 1 S
+R As 1998 o - Mar 1 0 0 -
+R As 1998 o - O 11 0 1 S
+R As 1999 o - F 21 0 0 -
+R As 1999 o - O 3 0 1 S
+R As 2000 o - F 27 0 0 -
+R As 2000 2001 - O Sun>=8 0 1 S
+R As 2001 2006 - F Sun>=15 0 0 -
+R As 2002 o - N 3 0 1 S
+R As 2003 o - O 19 0 1 S
+R As 2004 o - N 2 0 1 S
+R As 2005 o - O 16 0 1 S
+R As 2006 o - N 5 0 1 S
+R As 2007 o - F 25 0 0 -
+R As 2007 o - O Sun>=8 0 1 S
+R As 2008 2017 - O Sun>=15 0 1 S
+R As 2008 2011 - F Sun>=15 0 0 -
+R As 2012 o - F Sun>=22 0 0 -
+R As 2013 2014 - F Sun>=15 0 0 -
+R As 2015 o - F Sun>=22 0 0 -
+R As 2016 2022 - F Sun>=15 0 0 -
+R As 2018 ma - N Sun>=1 0 1 S
+R As 2023 o - F Sun>=22 0 0 -
+R As 2024 2025 - F Sun>=15 0 0 -
+R As 2026 o - F Sun>=22 0 0 -
+R As 2027 2033 - F Sun>=15 0 0 -
+R As 2034 o - F Sun>=22 0 0 -
+R As 2035 2036 - F Sun>=15 0 0 -
+R As 2037 o - F Sun>=22 0 0 -
+R As 2038 ma - F Sun>=15 0 0 -
+Z America/Noronha -2:9:40 - LMT 1914
+-2 As -02/-01 1990 S 17
+-2 - -02 1999 S 30
+-2 As -02/-01 2000 O 15
+-2 - -02 2001 S 13
+-2 As -02/-01 2002 O
+-2 - -02
+Z America/Belem -3:13:56 - LMT 1914
+-3 As -03/-02 1988 S 12
+-3 - -03
+Z America/Santarem -3:38:48 - LMT 1914
+-4 As -04/-03 1988 S 12
+-4 - -04 2008 Jun 24
+-3 - -03
+Z America/Fortaleza -2:34 - LMT 1914
+-3 As -03/-02 1990 S 17
+-3 - -03 1999 S 30
+-3 As -03/-02 2000 O 22
+-3 - -03 2001 S 13
+-3 As -03/-02 2002 O
+-3 - -03
+Z America/Recife -2:19:36 - LMT 1914
+-3 As -03/-02 1990 S 17
+-3 - -03 1999 S 30
+-3 As -03/-02 2000 O 15
+-3 - -03 2001 S 13
+-3 As -03/-02 2002 O
+-3 - -03
+Z America/Araguaina -3:12:48 - LMT 1914
+-3 As -03/-02 1990 S 17
+-3 - -03 1995 S 14
+-3 As -03/-02 2003 S 24
+-3 - -03 2012 O 21
+-3 As -03/-02 2013 S
+-3 - -03
+Z America/Maceio -2:22:52 - LMT 1914
+-3 As -03/-02 1990 S 17
+-3 - -03 1995 O 13
+-3 As -03/-02 1996 S 4
+-3 - -03 1999 S 30
+-3 As -03/-02 2000 O 22
+-3 - -03 2001 S 13
+-3 As -03/-02 2002 O
+-3 - -03
+Z America/Bahia -2:34:4 - LMT 1914
+-3 As -03/-02 2003 S 24
+-3 - -03 2011 O 16
+-3 As -03/-02 2012 O 21
+-3 - -03
+Z America/Sao_Paulo -3:6:28 - LMT 1914
+-3 As -03/-02 1963 O 23
+-3 1 -02 1964
+-3 As -03/-02
+Z America/Campo_Grande -3:38:28 - LMT 1914
+-4 As -04/-03
+Z America/Cuiaba -3:44:20 - LMT 1914
+-4 As -04/-03 2003 S 24
+-4 - -04 2004 O
+-4 As -04/-03
+Z America/Porto_Velho -4:15:36 - LMT 1914
+-4 As -04/-03 1988 S 12
+-4 - -04
+Z America/Boa_Vista -4:2:40 - LMT 1914
+-4 As -04/-03 1988 S 12
+-4 - -04 1999 S 30
+-4 As -04/-03 2000 O 15
+-4 - -04
+Z America/Manaus -4:0:4 - LMT 1914
+-4 As -04/-03 1988 S 12
+-4 - -04 1993 S 28
+-4 As -04/-03 1994 S 22
+-4 - -04
+Z America/Eirunepe -4:39:28 - LMT 1914
+-5 As -05/-04 1988 S 12
+-5 - -05 1993 S 28
+-5 As -05/-04 1994 S 22
+-5 - -05 2008 Jun 24
+-4 - -04 2013 N 10
+-5 - -05
+Z America/Rio_Branco -4:31:12 - LMT 1914
+-5 As -05/-04 1988 S 12
+-5 - -05 2008 Jun 24
+-4 - -04 2013 N 10
+-5 - -05
+R At 1927 1931 - S 1 0 1 S
+R At 1928 1932 - Ap 1 0 0 -
+R At 1968 o - N 3 4u 1 S
+R At 1969 o - Mar 30 3u 0 -
+R At 1969 o - N 23 4u 1 S
+R At 1970 o - Mar 29 3u 0 -
+R At 1971 o - Mar 14 3u 0 -
+R At 1970 1972 - O Sun>=9 4u 1 S
+R At 1972 1986 - Mar Sun>=9 3u 0 -
+R At 1973 o - S 30 4u 1 S
+R At 1974 1987 - O Sun>=9 4u 1 S
+R At 1987 o - Ap 12 3u 0 -
+R At 1988 1990 - Mar Sun>=9 3u 0 -
+R At 1988 1989 - O Sun>=9 4u 1 S
+R At 1990 o - S 16 4u 1 S
+R At 1991 1996 - Mar Sun>=9 3u 0 -
+R At 1991 1997 - O Sun>=9 4u 1 S
+R At 1997 o - Mar 30 3u 0 -
+R At 1998 o - Mar Sun>=9 3u 0 -
+R At 1998 o - S 27 4u 1 S
+R At 1999 o - Ap 4 3u 0 -
+R At 1999 2010 - O Sun>=9 4u 1 S
+R At 2000 2007 - Mar Sun>=9 3u 0 -
+R At 2008 o - Mar 30 3u 0 -
+R At 2009 o - Mar Sun>=9 3u 0 -
+R At 2010 o - Ap Sun>=1 3u 0 -
+R At 2011 o - May Sun>=2 3u 0 -
+R At 2011 o - Au Sun>=16 4u 1 S
+R At 2012 2014 - Ap Sun>=23 3u 0 -
+R At 2012 2014 - S Sun>=2 4u 1 S
+R At 2016 ma - May Sun>=9 3u 0 -
+R At 2016 ma - Au Sun>=9 4u 1 S
+Z America/Santiago -4:42:46 - LMT 1890
+-4:42:46 - SMT 1910 Ja 10
+-5 - -05 1916 Jul
+-4:42:46 - SMT 1918 S 10
+-4 - -04 1919 Jul
+-4:42:46 - SMT 1927 S
+-5 At -05/-04 1932 S
+-4 - -04 1942 Jun
+-5 - -05 1942 Au
+-4 - -04 1946 Jul 15
+-4 1 -03 1946 S
+-4 - -04 1947 Ap
+-5 - -05 1947 May 21 23
+-4 At -04/-03
+Z America/Punta_Arenas -4:43:40 - LMT 1890
+-4:42:46 - SMT 1910 Ja 10
+-5 - -05 1916 Jul
+-4:42:46 - SMT 1918 S 10
+-4 - -04 1919 Jul
+-4:42:46 - SMT 1927 S
+-5 At -05/-04 1932 S
+-4 - -04 1942 Jun
+-5 - -05 1942 Au
+-4 - -04 1947 Ap
+-5 - -05 1947 May 21 23
+-4 At -04/-03 2016 D 4
+-3 - -03
+Z Pacific/Easter -7:17:28 - LMT 1890
+-7:17:28 - EMT 1932 S
+-7 At -07/-06 1982 Mar 14 3u
+-6 At -06/-05
+Z Antarctica/Palmer 0 - -00 1965
+-4 Aq -04/-03 1969 O 5
+-3 Aq -03/-02 1982 May
+-4 At -04/-03 2016 D 4
+-3 - -03
+R Au 1992 o - May 3 0 1 S
+R Au 1993 o - Ap 4 0 0 -
+Z America/Bogota -4:56:16 - LMT 1884 Mar 13
+-4:56:16 - BMT 1914 N 23
+-5 Au -05/-04
+Z America/Curacao -4:35:47 - LMT 1912 F 12
+-4:30 - -0430 1965
+-4 - AST
+Li America/Curacao America/Lower_Princes
+Li America/Curacao America/Kralendijk
+R Av 1992 o - N 28 0 1 S
+R Av 1993 o - F 5 0 0 -
+Z America/Guayaquil -5:19:20 - LMT 1890
+-5:14 - QMT 1931
+-5 Av -05/-04
+Z Pacific/Galapagos -5:58:24 - LMT 1931
+-5 - -05 1986
+-6 Av -06/-05
+R Aw 1937 1938 - S lastSun 0 1 S
+R Aw 1938 1942 - Mar Sun>=19 0 0 -
+R Aw 1939 o - O 1 0 1 S
+R Aw 1940 1942 - S lastSun 0 1 S
+R Aw 1943 o - Ja 1 0 0 -
+R Aw 1983 o - S lastSun 0 1 S
+R Aw 1984 1985 - Ap lastSun 0 0 -
+R Aw 1984 o - S 16 0 1 S
+R Aw 1985 2000 - S Sun>=9 0 1 S
+R Aw 1986 2000 - Ap Sun>=16 0 0 -
+R Aw 2001 2010 - Ap Sun>=15 2 0 -
+R Aw 2001 2010 - S Sun>=1 2 1 S
+Z Atlantic/Stanley -3:51:24 - LMT 1890
+-3:51:24 - SMT 1912 Mar 12
+-4 Aw -04/-03 1983 May
+-3 Aw -03/-02 1985 S 15
+-4 Aw -04/-03 2010 S 5 2
+-3 - -03
+Z America/Cayenne -3:29:20 - LMT 1911 Jul
+-4 - -04 1967 O
+-3 - -03
+Z America/Guyana -3:52:40 - LMT 1915 Mar
+-3:45 - -0345 1975 Jul 31
+-3 - -03 1991
+-4 - -04
+R Ax 1975 1988 - O 1 0 1 S
+R Ax 1975 1978 - Mar 1 0 0 -
+R Ax 1979 1991 - Ap 1 0 0 -
+R Ax 1989 o - O 22 0 1 S
+R Ax 1990 o - O 1 0 1 S
+R Ax 1991 o - O 6 0 1 S
+R Ax 1992 o - Mar 1 0 0 -
+R Ax 1992 o - O 5 0 1 S
+R Ax 1993 o - Mar 31 0 0 -
+R Ax 1993 1995 - O 1 0 1 S
+R Ax 1994 1995 - F lastSun 0 0 -
+R Ax 1996 o - Mar 1 0 0 -
+R Ax 1996 2001 - O Sun>=1 0 1 S
+R Ax 1997 o - F lastSun 0 0 -
+R Ax 1998 2001 - Mar Sun>=1 0 0 -
+R Ax 2002 2004 - Ap Sun>=1 0 0 -
+R Ax 2002 2003 - S Sun>=1 0 1 S
+R Ax 2004 2009 - O Sun>=15 0 1 S
+R Ax 2005 2009 - Mar Sun>=8 0 0 -
+R Ax 2010 ma - O Sun>=1 0 1 S
+R Ax 2010 2012 - Ap Sun>=8 0 0 -
+R Ax 2013 ma - Mar Sun>=22 0 0 -
+Z America/Asuncion -3:50:40 - LMT 1890
+-3:50:40 - AMT 1931 O 10
+-4 - -04 1972 O
+-3 - -03 1974 Ap
+-4 Ax -04/-03
+R Ay 1938 o - Ja 1 0 1 S
+R Ay 1938 o - Ap 1 0 0 -
+R Ay 1938 1939 - S lastSun 0 1 S
+R Ay 1939 1940 - Mar Sun>=24 0 0 -
+R Ay 1986 1987 - Ja 1 0 1 S
+R Ay 1986 1987 - Ap 1 0 0 -
+R Ay 1990 o - Ja 1 0 1 S
+R Ay 1990 o - Ap 1 0 0 -
+R Ay 1994 o - Ja 1 0 1 S
+R Ay 1994 o - Ap 1 0 0 -
+Z America/Lima -5:8:12 - LMT 1890
+-5:8:36 - LMT 1908 Jul 28
+-5 Ay -05/-04
+Z Atlantic/South_Georgia -2:26:8 - LMT 1890
+-2 - -02
+Z America/Paramaribo -3:40:40 - LMT 1911
+-3:40:52 - PMT 1935
+-3:40:36 - PMT 1945 O
+-3:30 - -0330 1984 O
+-3 - -03
+Z America/Port_of_Spain -4:6:4 - LMT 1912 Mar 2
+-4 - AST
+Li America/Port_of_Spain America/Anguilla
+Li America/Port_of_Spain America/Antigua
+Li America/Port_of_Spain America/Dominica
+Li America/Port_of_Spain America/Grenada
+Li America/Port_of_Spain America/Guadeloupe
+Li America/Port_of_Spain America/Marigot
+Li America/Port_of_Spain America/Montserrat
+Li America/Port_of_Spain America/St_Barthelemy
+Li America/Port_of_Spain America/St_Kitts
+Li America/Port_of_Spain America/St_Lucia
+Li America/Port_of_Spain America/St_Thomas
+Li America/Port_of_Spain America/St_Vincent
+Li America/Port_of_Spain America/Tortola
+R Az 1923 o - O 2 0 0:30 HS
+R Az 1924 1926 - Ap 1 0 0 -
+R Az 1924 1925 - O 1 0 0:30 HS
+R Az 1933 1935 - O lastSun 0 0:30 HS
+R Az 1934 1936 - Mar Sat>=25 23:30s 0 -
+R Az 1936 o - N 1 0 0:30 HS
+R Az 1937 1941 - Mar lastSun 0 0 -
+R Az 1937 1940 - O lastSun 0 0:30 HS
+R Az 1941 o - Au 1 0 0:30 HS
+R Az 1942 o - Ja 1 0 0 -
+R Az 1942 o - D 14 0 1 S
+R Az 1943 o - Mar 14 0 0 -
+R Az 1959 o - May 24 0 1 S
+R Az 1959 o - N 15 0 0 -
+R Az 1960 o - Ja 17 0 1 S
+R Az 1960 o - Mar 6 0 0 -
+R Az 1965 1967 - Ap Sun>=1 0 1 S
+R Az 1965 o - S 26 0 0 -
+R Az 1966 1967 - O 31 0 0 -
+R Az 1968 1970 - May 27 0 0:30 HS
+R Az 1968 1970 - D 2 0 0 -
+R Az 1972 o - Ap 24 0 1 S
+R Az 1972 o - Au 15 0 0 -
+R Az 1974 o - Mar 10 0 0:30 HS
+R Az 1974 o - D 22 0 1 S
+R Az 1976 o - O 1 0 0 -
+R Az 1977 o - D 4 0 1 S
+R Az 1978 o - Ap 1 0 0 -
+R Az 1979 o - O 1 0 1 S
+R Az 1980 o - May 1 0 0 -
+R Az 1987 o - D 14 0 1 S
+R Az 1988 o - Mar 14 0 0 -
+R Az 1988 o - D 11 0 1 S
+R Az 1989 o - Mar 12 0 0 -
+R Az 1989 o - O 29 0 1 S
+R Az 1990 1992 - Mar Sun>=1 0 0 -
+R Az 1990 1991 - O Sun>=21 0 1 S
+R Az 1992 o - O 18 0 1 S
+R Az 1993 o - F 28 0 0 -
+R Az 2004 o - S 19 0 1 S
+R Az 2005 o - Mar 27 2 0 -
+R Az 2005 o - O 9 2 1 S
+R Az 2006 o - Mar 12 2 0 -
+R Az 2006 2014 - O Sun>=1 2 1 S
+R Az 2007 2015 - Mar Sun>=8 2 0 -
+Z America/Montevideo -3:44:44 - LMT 1898 Jun 28
+-3:44:44 - MMT 1920 May
+-3:30 Az -0330/-03 1942 D 14
+-3 Az -03/-02 1968
+-3 Az -03/-0230 1971
+-3 Az -03/-02 1974
+-3 Az -03/-0230 1974 D 22
+-3 Az -03/-02
+Z America/Caracas -4:27:44 - LMT 1890
+-4:27:40 - CMT 1912 F 12
+-4:30 - -0430 1965
+-4 - -04 2007 D 9 3
+-4:30 - -0430 2016 May 1 2:30
+-4 - -04
+Z Etc/GMT 0 - GMT
+Z Etc/UTC 0 - UTC
+Z Etc/UCT 0 - UCT
+Li Etc/GMT GMT
+Li Etc/UTC Etc/Universal
+Li Etc/UTC Etc/Zulu
+Li Etc/GMT Etc/Greenwich
+Li Etc/GMT Etc/GMT-0
+Li Etc/GMT Etc/GMT+0
+Li Etc/GMT Etc/GMT0
+Z Etc/GMT-14 14 - +14
+Z Etc/GMT-13 13 - +13
+Z Etc/GMT-12 12 - +12
+Z Etc/GMT-11 11 - +11
+Z Etc/GMT-10 10 - +10
+Z Etc/GMT-9 9 - +09
+Z Etc/GMT-8 8 - +08
+Z Etc/GMT-7 7 - +07
+Z Etc/GMT-6 6 - +06
+Z Etc/GMT-5 5 - +05
+Z Etc/GMT-4 4 - +04
+Z Etc/GMT-3 3 - +03
+Z Etc/GMT-2 2 - +02
+Z Etc/GMT-1 1 - +01
+Z Etc/GMT+1 -1 - -01
+Z Etc/GMT+2 -2 - -02
+Z Etc/GMT+3 -3 - -03
+Z Etc/GMT+4 -4 - -04
+Z Etc/GMT+5 -5 - -05
+Z Etc/GMT+6 -6 - -06
+Z Etc/GMT+7 -7 - -07
+Z Etc/GMT+8 -8 - -08
+Z Etc/GMT+9 -9 - -09
+Z Etc/GMT+10 -10 - -10
+Z Etc/GMT+11 -11 - -11
+Z Etc/GMT+12 -12 - -12
+Z Factory 0 - -00
+Li Africa/Nairobi Africa/Asmera
+Li Africa/Abidjan Africa/Timbuktu
+Li America/Argentina/Catamarca America/Argentina/ComodRivadavia
+Li America/Adak America/Atka
+Li America/Argentina/Buenos_Aires America/Buenos_Aires
+Li America/Argentina/Catamarca America/Catamarca
+Li America/Atikokan America/Coral_Harbour
+Li America/Argentina/Cordoba America/Cordoba
+Li America/Tijuana America/Ensenada
+Li America/Indiana/Indianapolis America/Fort_Wayne
+Li America/Indiana/Indianapolis America/Indianapolis
+Li America/Argentina/Jujuy America/Jujuy
+Li America/Indiana/Knox America/Knox_IN
+Li America/Kentucky/Louisville America/Louisville
+Li America/Argentina/Mendoza America/Mendoza
+Li America/Toronto America/Montreal
+Li America/Rio_Branco America/Porto_Acre
+Li America/Argentina/Cordoba America/Rosario
+Li America/Tijuana America/Santa_Isabel
+Li America/Denver America/Shiprock
+Li America/Port_of_Spain America/Virgin
+Li Pacific/Auckland Antarctica/South_Pole
+Li Asia/Ashgabat Asia/Ashkhabad
+Li Asia/Kolkata Asia/Calcutta
+Li Asia/Shanghai Asia/Chongqing
+Li Asia/Shanghai Asia/Chungking
+Li Asia/Dhaka Asia/Dacca
+Li Asia/Shanghai Asia/Harbin
+Li Asia/Urumqi Asia/Kashgar
+Li Asia/Kathmandu Asia/Katmandu
+Li Asia/Macau Asia/Macao
+Li Asia/Yangon Asia/Rangoon
+Li Asia/Ho_Chi_Minh Asia/Saigon
+Li Asia/Jerusalem Asia/Tel_Aviv
+Li Asia/Thimphu Asia/Thimbu
+Li Asia/Makassar Asia/Ujung_Pandang
+Li Asia/Ulaanbaatar Asia/Ulan_Bator
+Li Atlantic/Faroe Atlantic/Faeroe
+Li Europe/Oslo Atlantic/Jan_Mayen
+Li Australia/Sydney Australia/ACT
+Li Australia/Sydney Australia/Canberra
+Li Australia/Lord_Howe Australia/LHI
+Li Australia/Sydney Australia/NSW
+Li Australia/Darwin Australia/North
+Li Australia/Brisbane Australia/Queensland
+Li Australia/Adelaide Australia/South
+Li Australia/Hobart Australia/Tasmania
+Li Australia/Melbourne Australia/Victoria
+Li Australia/Perth Australia/West
+Li Australia/Broken_Hill Australia/Yancowinna
+Li America/Rio_Branco Brazil/Acre
+Li America/Noronha Brazil/DeNoronha
+Li America/Sao_Paulo Brazil/East
+Li America/Manaus Brazil/West
+Li America/Halifax Canada/Atlantic
+Li America/Winnipeg Canada/Central
+Li America/Toronto Canada/Eastern
+Li America/Edmonton Canada/Mountain
+Li America/St_Johns Canada/Newfoundland
+Li America/Vancouver Canada/Pacific
+Li America/Regina Canada/Saskatchewan
+Li America/Whitehorse Canada/Yukon
+Li America/Santiago Chile/Continental
+Li Pacific/Easter Chile/EasterIsland
+Li America/Havana Cuba
+Li Africa/Cairo Egypt
+Li Europe/Dublin Eire
+Li Europe/London Europe/Belfast
+Li Europe/Chisinau Europe/Tiraspol
+Li Europe/London GB
+Li Europe/London GB-Eire
+Li Etc/GMT GMT+0
+Li Etc/GMT GMT-0
+Li Etc/GMT GMT0
+Li Etc/GMT Greenwich
+Li Asia/Hong_Kong Hongkong
+Li Atlantic/Reykjavik Iceland
+Li Asia/Tehran Iran
+Li Asia/Jerusalem Israel
+Li America/Jamaica Jamaica
+Li Asia/Tokyo Japan
+Li Pacific/Kwajalein Kwajalein
+Li Africa/Tripoli Libya
+Li America/Tijuana Mexico/BajaNorte
+Li America/Mazatlan Mexico/BajaSur
+Li America/Mexico_City Mexico/General
+Li Pacific/Auckland NZ
+Li Pacific/Chatham NZ-CHAT
+Li America/Denver Navajo
+Li Asia/Shanghai PRC
+Li Pacific/Honolulu Pacific/Johnston
+Li Pacific/Pohnpei Pacific/Ponape
+Li Pacific/Pago_Pago Pacific/Samoa
+Li Pacific/Chuuk Pacific/Truk
+Li Pacific/Chuuk Pacific/Yap
+Li Europe/Warsaw Poland
+Li Europe/Lisbon Portugal
+Li Asia/Taipei ROC
+Li Asia/Seoul ROK
+Li Asia/Singapore Singapore
+Li Europe/Istanbul Turkey
+Li Etc/UCT UCT
+Li America/Anchorage US/Alaska
+Li America/Adak US/Aleutian
+Li America/Phoenix US/Arizona
+Li America/Chicago US/Central
+Li America/Indiana/Indianapolis US/East-Indiana
+Li America/New_York US/Eastern
+Li Pacific/Honolulu US/Hawaii
+Li America/Indiana/Knox US/Indiana-Starke
+Li America/Detroit US/Michigan
+Li America/Denver US/Mountain
+Li America/Los_Angeles US/Pacific
+Li Pacific/Pago_Pago US/Samoa
+Li Etc/UTC UTC
+Li Etc/UTC Universal
+Li Europe/Moscow W-SU
+Li Etc/UTC Zulu
diff --git a/src/timezone/known_abbrevs.txt b/src/timezone/known_abbrevs.txt
index eb48069d87..4db831c62d 100644
--- a/src/timezone/known_abbrevs.txt
+++ b/src/timezone/known_abbrevs.txt
@@ -96,7 +96,6 @@ SAST	7200
 SST	-39600
 UCT	0
 UTC	0
-WAST	7200	D
 WAT	3600
 WEST	3600	D
 WET	0
diff --git a/src/timezone/localtime.c b/src/timezone/localtime.c
index 08642d1236..2b5b3a924f 100644
--- a/src/timezone/localtime.c
+++ b/src/timezone/localtime.c
@@ -26,15 +26,15 @@
 #ifndef WILDABBR
 /*
  * Someone might make incorrect use of a time zone abbreviation:
- *	1.  They might reference tzname[0] before calling tzset (explicitly
+ *	1.	They might reference tzname[0] before calling tzset (explicitly
  *		or implicitly).
- *	2.  They might reference tzname[1] before calling tzset (explicitly
+ *	2.	They might reference tzname[1] before calling tzset (explicitly
  *		or implicitly).
- *	3.  They might reference tzname[1] after setting to a time zone
+ *	3.	They might reference tzname[1] after setting to a time zone
  *		in which Daylight Saving Time is never observed.
- *	4.  They might reference tzname[0] after setting to a time zone
+ *	4.	They might reference tzname[0] after setting to a time zone
  *		in which Standard Time is never observed.
- *	5.  They might reference tm.TM_ZONE after calling offtime.
+ *	5.	They might reference tm.TM_ZONE after calling offtime.
  * What's best to do in the above cases is open to debate;
  * for now, we just set things up so that in any of the five cases
  * WILDABBR is used. Another possibility: initialize tzname[0] to the
@@ -50,12 +50,8 @@ static const char wildabbr[] = WILDABBR;
 
 static const char gmt[] = "GMT";
 
-/* The minimum and maximum finite time values.  This assumes no padding.  */
-static const pg_time_t time_t_min = MINVAL(pg_time_t, TYPE_BIT(pg_time_t));
-static const pg_time_t time_t_max = MAXVAL(pg_time_t, TYPE_BIT(pg_time_t));
-
 /*
- * We cache the result of trying to load the TZDEFRULES zone here.
+ * PG: We cache the result of trying to load the TZDEFRULES zone here.
  * tzdefrules_loaded is 0 if not tried yet, +1 if good, -1 if failed.
  */
 static struct state tzdefrules_s;
@@ -63,12 +59,12 @@ static int	tzdefrules_loaded = 0;
 
 /*
  * The DST rules to use if TZ has no rules and we can't load TZDEFRULES.
- * We default to US rules as of 1999-08-17.
+ * Default to US rules as of 2017-05-07.
  * POSIX 1003.1 section 8.1.1 says that the default DST rules are
  * implementation dependent; for historical reasons, US rules are a
  * common default.
  */
-#define TZDEFRULESTRING ",M4.1.0,M10.5.0"
+#define TZDEFRULESTRING ",M3.2.0,M11.1.0"
 
 /* structs ttinfo, lsinfo, state have been moved to pgtz.h */
 
@@ -195,10 +191,8 @@ union input_buffer
 /* Local storage needed for 'tzloadbody'.  */
 union local_storage
 {
-	/* We don't need the "fullname" member */
-
 	/* The results of analyzing the file's contents after it is opened.  */
-	struct
+	struct file_analysis
 	{
 		/* The input buffer.  */
 		union input_buffer u;
@@ -206,6 +200,8 @@ union local_storage
 		/* A temporary state used for parsing a TZ string in the file.  */
 		struct state st;
 	}			u;
+
+	/* We don't need the "fullname" member */
 };
 
 /* Load tz data from the file named NAME into *SP.  Read extended
@@ -255,6 +251,8 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend,
 	{
 		int32		ttisstdcnt = detzcode(up->tzhead.tzh_ttisstdcnt);
 		int32		ttisgmtcnt = detzcode(up->tzhead.tzh_ttisgmtcnt);
+		int64		prevtr = 0;
+		int32		prevcorr = 0;
 		int32		leapcnt = detzcode(up->tzhead.tzh_leapcnt);
 		int32		timecnt = detzcode(up->tzhead.tzh_timecnt);
 		int32		typecnt = detzcode(up->tzhead.tzh_typecnt);
@@ -285,8 +283,8 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend,
 
 		/*
 		 * Read transitions, discarding those out of pg_time_t range. But
-		 * pretend the last transition before time_t_min occurred at
-		 * time_t_min.
+		 * pretend the last transition before TIME_T_MIN occurred at
+		 * TIME_T_MIN.
 		 */
 		timecnt = 0;
 		for (i = 0; i < sp->timecnt; ++i)
@@ -294,12 +292,12 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend,
 			int64		at
 			= stored == 4 ? detzcode(p) : detzcode64(p);
 
-			sp->types[i] = at <= time_t_max;
+			sp->types[i] = at <= TIME_T_MAX;
 			if (sp->types[i])
 			{
 				pg_time_t	attime
-				= ((TYPE_SIGNED(pg_time_t) ? at < time_t_min : at < 0)
-				   ? time_t_min : at);
+				= ((TYPE_SIGNED(pg_time_t) ? at < TIME_T_MIN : at < 0)
+				   ? TIME_T_MIN : at);
 
 				if (timecnt && attime <= sp->ats[timecnt - 1])
 				{
@@ -354,20 +352,22 @@ tzloadbody(char const *name, char *canonname, struct state *sp, bool doextend,
 			int32		corr = detzcode(p + stored);
 
 			p += stored + 4;
-			if (tr <= time_t_max)
+			/* Leap seconds cannot occur before the Epoch.  */
+			if (tr < 0)
+				return EINVAL;
+			if (tr <= TIME_T_MAX)
 			{
-				pg_time_t	trans
-				= ((TYPE_SIGNED(pg_time_t) ? tr < time_t_min : tr < 0)
-				   ? time_t_min : tr);
-
-				if (leapcnt && trans <= sp->lsis[leapcnt - 1].ls_trans)
-				{
-					if (trans < sp->lsis[leapcnt - 1].ls_trans)
-						return EINVAL;
-					leapcnt--;
-				}
-				sp->lsis[leapcnt].ls_trans = trans;
-				sp->lsis[leapcnt].ls_corr = corr;
+				/*
+				 * Leap seconds cannot occur more than once per UTC month, and
+				 * UTC months are at least 28 days long (minus 1 second for a
+				 * negative leap second).  Each leap second's correction must
+				 * differ from the previous one's by 1 second.
+				 */
+				if (tr - prevtr < 28 * SECSPERDAY - 1
+					|| (corr != prevcorr - 1 && corr != prevcorr + 1))
+					return EINVAL;
+				sp->lsis[leapcnt].ls_trans = prevtr = tr;
+				sp->lsis[leapcnt].ls_corr = prevcorr = corr;
 				leapcnt++;
 			}
 		}
@@ -802,8 +802,8 @@ transtime(int year, const struct rule *rulep,
 {
 	bool		leapyear;
 	int32		value;
-	int			i,
-				d,
+	int			i;
+	int			d,
 				m1,
 				yy0,
 				yy1,
@@ -1361,11 +1361,18 @@ pg_gmtime(const pg_time_t *timep)
  * Return the number of leap years through the end of the given year
  * where, to make the math easy, the answer for year zero is defined as zero.
  */
+static int
+leaps_thru_end_of_nonneg(int y)
+{
+	return y / 4 - y / 100 + y / 400;
+}
+
 static int
 leaps_thru_end_of(const int y)
 {
-	return (y >= 0) ? (y / 4 - y / 100 + y / 400) :
-		-(leaps_thru_end_of(-(y + 1)) + 1);
+	return (y < 0
+			? -1 - leaps_thru_end_of_nonneg(-1 - y)
+			: leaps_thru_end_of_nonneg(y));
 }
 
 static struct pg_tm *
@@ -1390,22 +1397,9 @@ timesub(const pg_time_t *timep, int32 offset,
 		lp = &sp->lsis[i];
 		if (*timep >= lp->ls_trans)
 		{
-			if (*timep == lp->ls_trans)
-			{
-				hit = ((i == 0 && lp->ls_corr > 0) ||
-					   lp->ls_corr > sp->lsis[i - 1].ls_corr);
-				if (hit)
-					while (i > 0 &&
-						   sp->lsis[i].ls_trans ==
-						   sp->lsis[i - 1].ls_trans + 1 &&
-						   sp->lsis[i].ls_corr ==
-						   sp->lsis[i - 1].ls_corr + 1)
-					{
-						++hit;
-						--i;
-					}
-			}
 			corr = lp->ls_corr;
+			hit = (*timep == lp->ls_trans
+				   && (i == 0 ? 0 : lp[-1].ls_corr) < corr);
 			break;
 		}
 	}
@@ -1529,13 +1523,13 @@ increment_overflow_time(pg_time_t *tp, int32 j)
 {
 	/*----------
 	 * This is like
-	 * 'if (! (time_t_min <= *tp + j && *tp + j <= time_t_max)) ...',
+	 * 'if (! (TIME_T_MIN <= *tp + j && *tp + j <= TIME_T_MAX)) ...',
 	 * except that it does the right thing even if *tp + j would overflow.
 	 *----------
 	 */
 	if (!(j < 0
-		  ? (TYPE_SIGNED(pg_time_t) ? time_t_min - j <= *tp : -1 - j < *tp)
-		  : *tp <= time_t_max - j))
+		  ? (TYPE_SIGNED(pg_time_t) ? TIME_T_MIN - j <= *tp : -1 - j < *tp)
+		  : *tp <= TIME_T_MAX - j))
 		return true;
 	*tp += j;
 	return false;
diff --git a/src/timezone/pgtz.c b/src/timezone/pgtz.c
index a73dc6188b..7a476eabf7 100644
--- a/src/timezone/pgtz.c
+++ b/src/timezone/pgtz.c
@@ -3,7 +3,7 @@
  * pgtz.c
  *	  Timezone Library Integration Functions
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/timezone/pgtz.c
@@ -156,15 +156,8 @@ scan_directory_ci(const char *dirname, const char *fname, int fnamelen,
 	struct dirent *direntry;
 
 	dirdesc = AllocateDir(dirname);
-	if (!dirdesc)
-	{
-		ereport(LOG,
-				(errcode_for_file_access(),
-				 errmsg("could not open directory \"%s\": %m", dirname)));
-		return false;
-	}
 
-	while ((direntry = ReadDir(dirdesc, dirname)) != NULL)
+	while ((direntry = ReadDirExtended(dirdesc, dirname, LOG)) != NULL)
 	{
 		/*
 		 * Ignore . and .., plus any other "hidden" files.  This is a security
diff --git a/src/timezone/pgtz.h b/src/timezone/pgtz.h
index 3d89ba00a7..1e94d66d49 100644
--- a/src/timezone/pgtz.h
+++ b/src/timezone/pgtz.h
@@ -6,7 +6,7 @@
  * Note: this file contains only definitions that are private to the
  * timezone library.  Public definitions are in pgtime.h.
  *
- * Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
  *
  * IDENTIFICATION
  *	  src/timezone/pgtz.h
diff --git a/src/timezone/private.h b/src/timezone/private.h
index c141fb6131..701112ec5b 100644
--- a/src/timezone/private.h
+++ b/src/timezone/private.h
@@ -38,30 +38,9 @@
 #define EOVERFLOW EINVAL
 #endif
 
-#ifndef WIFEXITED
-#define WIFEXITED(status)	(((status) & 0xff) == 0)
-#endif							/* !defined WIFEXITED */
-#ifndef WEXITSTATUS
-#define WEXITSTATUS(status) (((status) >> 8) & 0xff)
-#endif							/* !defined WEXITSTATUS */
-
 /* Unlike <ctype.h>'s isdigit, this also works if c < 0 | c > UCHAR_MAX. */
 #define is_digit(c) ((unsigned)(c) - '0' <= 9)
 
-#ifndef SIZE_MAX
-#define SIZE_MAX ((size_t) -1)
-#endif
-
-/*
- * SunOS 4.1.1 libraries lack remove.
- */
-
-#ifndef remove
-extern int	unlink(const char *filename);
-
-#define remove	unlink
-#endif							/* !defined remove */
-
 
 /*
  * Finally, some convenience items.
@@ -82,6 +61,10 @@ extern int	unlink(const char *filename);
 #define MINVAL(t, b)						\
   ((t) (TYPE_SIGNED(t) ? - TWOS_COMPLEMENT(t) - MAXVAL(t, b) : 0))
 
+/* The extreme time values, assuming no padding.  */
+#define TIME_T_MIN MINVAL(pg_time_t, TYPE_BIT(pg_time_t))
+#define TIME_T_MAX MAXVAL(pg_time_t, TYPE_BIT(pg_time_t))
+
 /*
  * 302 / 1000 is log10(2.0) rounded up.
  * Subtract one for the sign bit if the type is signed;
@@ -95,7 +78,7 @@ extern int	unlink(const char *filename);
 /*
  * INITIALIZE(x)
  */
-#define INITIALIZE(x)  ((x) = 0)
+#define INITIALIZE(x)	((x) = 0)
 
 #undef _
 #define _(msgid) (msgid)
@@ -150,7 +133,7 @@ extern int	unlink(const char *filename);
  * or
  *	isleap(a + b) == isleap(a % 400 + b % 400)
  * This is true even if % means modulo rather than Fortran remainder
- * (which is allowed by C89 but not C99).
+ * (which is allowed by C89 but not by C99 or later).
  * We use this to avoid addition overflow problems.
  */
 
diff --git a/src/timezone/strftime.c b/src/timezone/strftime.c
index 7cbafc9d83..bb638c81a4 100644
--- a/src/timezone/strftime.c
+++ b/src/timezone/strftime.c
@@ -82,17 +82,17 @@ static const struct lc_time_T C_time_locale = {
 	/*
 	 * x_fmt
 	 *
-	 * C99 requires this format. Using just numbers (as here) makes Quakers
-	 * happier; it's also compatible with SVR4.
+	 * C99 and later require this format. Using just numbers (as here) makes
+	 * Quakers happier; it's also compatible with SVR4.
 	 */
 	"%m/%d/%y",
 
 	/*
 	 * c_fmt
 	 *
-	 * C99 requires this format. Previously this code used "%D %X", but we now
-	 * conform to C99. Note that "%a %b %d %H:%M:%S %Y" is used by Solaris
-	 * 2.3.
+	 * C99 and later require this format. Previously this code used "%D %X",
+	 * but we now conform to C99. Note that "%a %b %d %H:%M:%S %Y" is used by
+	 * Solaris 2.3.
 	 */
 	"%a %b %e %T %Y",
 
@@ -106,26 +106,24 @@ static const struct lc_time_T C_time_locale = {
 	"%a %b %e %H:%M:%S %Z %Y"
 };
 
+enum warn
+{
+	IN_NONE, IN_SOME, IN_THIS, IN_ALL
+};
+
 static char *_add(const char *, char *, const char *);
 static char *_conv(int, const char *, char *, const char *);
-static char *_fmt(const char *, const struct pg_tm *, char *,
-	 const char *, int *);
+static char *_fmt(const char *, const struct pg_tm *, char *, const char *,
+	 enum warn *);
 static char *_yconv(int, int, bool, bool, char *, const char *);
 
-#define IN_NONE 0
-#define IN_SOME 1
-#define IN_THIS 2
-#define IN_ALL	3
-
 
 size_t
-pg_strftime(char *s, size_t maxsize, const char *format,
-			const struct pg_tm *t)
+pg_strftime(char *s, size_t maxsize, const char *format, const struct pg_tm *t)
 {
 	char	   *p;
-	int			warn;
+	enum warn	warn = IN_NONE;
 
-	warn = IN_NONE;
 	p = _fmt(format, t, s, s + maxsize, &warn);
 	if (p == s + maxsize)
 		return 0;
@@ -134,8 +132,8 @@ pg_strftime(char *s, size_t maxsize, const char *format,
 }
 
 static char *
-_fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
-	 int *warnp)
+_fmt(const char *format, const struct pg_tm *t, char *pt,
+	 const char *ptlim, enum warn *warnp)
 {
 	for (; *format; ++format)
 	{
@@ -184,7 +182,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 					continue;
 				case 'c':
 					{
-						int			warn2 = IN_SOME;
+						enum warn	warn2 = IN_SOME;
 
 						pt = _fmt(Locale->c_fmt, t, pt, ptlim, &warn2);
 						if (warn2 == IN_ALL)
@@ -203,9 +201,9 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 				case 'O':
 
 					/*
-					 * C99 locale modifiers. The sequences	%Ec %EC %Ex %EX
-					 * %Ey %EY	%Od %oe %OH %OI %Om %OM  %OS %Ou %OU %OV %Ow
-					 * %OW %Oy are supposed to provide alternate
+					 * Locale modifiers of C99 and later. The sequences %Ec
+					 * %EC %Ex %EX %Ey %EY %Od %oe %OH %OI %Om %OM %OS %Ou %OU
+					 * %OV %Ow %OW %Oy are supposed to provide alternate
 					 * representations.
 					 */
 					goto label;
@@ -229,9 +227,9 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 				case 'k':
 
 					/*
-					 * This used to be...  _conv(t->tm_hour % 12 ? t->tm_hour
-					 * % 12 : 12, 2, ' '); ...and has been changed to the
-					 * below to match SunOS 4.1.1 and Arnold Robbins' strftime
+					 * This used to be... _conv(t->tm_hour % 12 ? t->tm_hour %
+					 * 12 : 12, 2, ' '); ...and has been changed to the below
+					 * to match SunOS 4.1.1 and Arnold Robbins' strftime
 					 * version 3.0. That is, "%k" and "%l" have been swapped.
 					 * (ado, 1993-05-24)
 					 */
@@ -249,7 +247,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 				case 'l':
 
 					/*
-					 * This used to be...  _conv(t->tm_hour, 2, ' '); ...and
+					 * This used to be... _conv(t->tm_hour, 2, ' '); ...and
 					 * has been changed to the below to match SunOS 4.1.1 and
 					 * Arnold Robbin's strftime version 3.0. That is, "%k" and
 					 * "%l" have been swapped. (ado, 1993-05-24)
@@ -313,7 +311,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
  * (01-53)."
  * (ado, 1993-05-24)
  *
- * From <http://www.ft.uni-erlangen.de/~mskuhn/iso-time.html> by Markus Kuhn:
+ * From <https://www.cl.cam.ac.uk/~mgk25/iso-time.html> by Markus Kuhn:
  * "Week 01 of a year is per definition the first week which has the
  * Thursday in this year, which is equivalent to the week which contains
  * the fourth day of January. In other words, the first week of a new year
@@ -417,7 +415,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 					continue;
 				case 'x':
 					{
-						int			warn2 = IN_SOME;
+						enum warn	warn2 = IN_SOME;
 
 						pt = _fmt(Locale->x_fmt, t, pt, ptlim, &warn2);
 						if (warn2 == IN_ALL)
@@ -442,8 +440,8 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 						pt = _add(t->tm_zone, pt, ptlim);
 
 					/*
-					 * C99 says that %Z must be replaced by the empty string
-					 * if the time zone is not determinable.
+					 * C99 and later say that %Z must be replaced by the empty
+					 * string if the time zone is not determinable.
 					 */
 					continue;
 				case 'z':
@@ -483,7 +481,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt, const char *ptlim,
 
 					/*
 					 * X311J/88-090 (4.12.3.5): if conversion char is
-					 * undefined, behavior is undefined.  Print out the
+					 * undefined, behavior is undefined. Print out the
 					 * character itself as printf(3) also does.
 					 */
 				default:
diff --git a/src/timezone/tzfile.h b/src/timezone/tzfile.h
index 2843833e49..25ca307403 100644
--- a/src/timezone/tzfile.h
+++ b/src/timezone/tzfile.h
@@ -50,8 +50,8 @@ struct tzhead
  *	tzh_timecnt (unsigned char)s	types of local time starting at above
  *	tzh_typecnt repetitions of
  *		one (char [4])		coded UT offset in seconds
- *		one (unsigned char) used to set tm_isdst
- *		one (unsigned char) that's an abbreviation list index
+ *		one (unsigned char)	used to set tm_isdst
+ *		one (unsigned char)	that's an abbreviation list index
  *	tzh_charcnt (char)s		'\0'-terminated zone abbreviations
  *	tzh_leapcnt repetitions of
  *		one (char [4])		coded leap second transition times
diff --git a/src/timezone/tznames/Africa.txt b/src/timezone/tznames/Africa.txt
index 0bd0c405f6..2ea08a6508 100644
--- a/src/timezone/tznames/Africa.txt
+++ b/src/timezone/tznames/Africa.txt
@@ -147,8 +147,7 @@ GMT         0    # Greenwich Mean Time
 #  - SAST South Australian Standard Time (not in IANA database)
 SAST     7200    # South Africa Standard Time
                  #     (Africa/Johannesburg)
-WAST     7200 D  # West Africa Summer Time
-                 #     (Africa/Windhoek)
+WAST     7200 D  # West Africa Summer Time (obsolete)
 WAT      3600    # West Africa Time
                  #     (Africa/Bangui)
                  #     (Africa/Brazzaville)
diff --git a/src/timezone/zic.c b/src/timezone/zic.c
index 27c841be9e..352e719329 100644
--- a/src/timezone/zic.c
+++ b/src/timezone/zic.c
@@ -11,22 +11,21 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <time.h>
-#include <unistd.h>
 
 #include "pg_getopt.h"
 
 #include "private.h"
 #include "tzfile.h"
 
-#define ZIC_VERSION_PRE_2013 '2'
-#define ZIC_VERSION '3'
+#define	ZIC_VERSION_PRE_2013 '2'
+#define	ZIC_VERSION	'3'
 
 typedef int64 zic_t;
 #define ZIC_MIN PG_INT64_MIN
 #define ZIC_MAX PG_INT64_MAX
 
 #ifndef ZIC_MAX_ABBR_LEN_WO_WARN
-#define ZIC_MAX_ABBR_LEN_WO_WARN	  6
+#define ZIC_MAX_ABBR_LEN_WO_WARN	6
 #endif							/* !defined ZIC_MAX_ABBR_LEN_WO_WARN */
 
 #ifndef WIN32
@@ -46,9 +45,12 @@ typedef int64 zic_t;
 static ptrdiff_t const PTRDIFF_MAX = MAXVAL(ptrdiff_t, TYPE_BIT(ptrdiff_t));
 #endif
 
-/* The type and printf format for line numbers.  */
+/*
+ * The type for line numbers.  In Postgres, use %d to format them; upstream
+ * uses PRIdMAX but we prefer not to rely on that, not least because it
+ * results in platform-dependent strings to be translated.
+ */
 typedef int lineno_t;
-#define PRIdLINENO "d"
 
 struct rule
 {
@@ -293,10 +295,13 @@ struct lookup
 static struct lookup const *byword(const char *string,
 	   const struct lookup *lp);
 
-static struct lookup const line_codes[] = {
+static struct lookup const zi_line_codes[] = {
 	{"Rule", LC_RULE},
 	{"Zone", LC_ZONE},
 	{"Link", LC_LINK},
+	{NULL, 0}
+};
+static struct lookup const leap_line_codes[] = {
 	{"Leap", LC_LEAP},
 	{NULL, 0}
 };
@@ -435,7 +440,8 @@ growalloc(void *ptr, size_t itemsize, ptrdiff_t nitems, ptrdiff_t *nitems_alloc)
 		return ptr;
 	else
 	{
-		ptrdiff_t	amax = PTRDIFF_MAX - WORK_AROUND_QTBUG_53071;
+		ptrdiff_t	nitems_max = PTRDIFF_MAX - WORK_AROUND_QTBUG_53071;
+		ptrdiff_t	amax = nitems_max < SIZE_MAX ? nitems_max : SIZE_MAX;
 
 		if ((amax - 1) / 3 * 2 < *nitems_alloc)
 			memory_exhausted(_("integer overflow"));
@@ -467,14 +473,14 @@ static void
 verror(const char *string, va_list args)
 {
 	/*
-	 * Match the format of "cc" to allow sh users to  zic ... 2>&1 | error -t
+	 * Match the format of "cc" to allow sh users to zic ... 2>&1 | error -t
 	 * "*" -v on BSD systems.
 	 */
 	if (filename)
-		fprintf(stderr, _("\"%s\", line %" PRIdLINENO ": "), filename, linenum);
+		fprintf(stderr, _("\"%s\", line %d: "), filename, linenum);
 	vfprintf(stderr, string, args);
 	if (rfilename != NULL)
-		fprintf(stderr, _(" (rule from \"%s\", line %" PRIdLINENO ")"),
+		fprintf(stderr, _(" (rule from \"%s\", line %d)"),
 				rfilename, rlinenum);
 	fprintf(stderr, "\n");
 }
@@ -563,7 +569,7 @@ static const char *leapsec;
 static const char *yitcommand;
 
 int
-main(int argc, char *argv[])
+main(int argc, char **argv)
 {
 	int			c,
 				k;
@@ -572,7 +578,7 @@ main(int argc, char *argv[])
 
 #ifndef WIN32
 	umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
-#endif							/* !WIN32 */
+#endif
 	progname = argv[0];
 	if (TYPE_BIT(zic_t) <64)
 	{
@@ -631,7 +637,10 @@ main(int argc, char *argv[])
 				break;
 			case 'y':
 				if (yitcommand == NULL)
+				{
+					warning(_("-y is obsolescent"));
 					yitcommand = strdup(optarg);
+				}
 				else
 				{
 					fprintf(stderr,
@@ -960,7 +969,7 @@ dolink(char const *fromfield, char const *tofield, bool staysymlink)
 	}
 }
 
-#define TIME_T_BITS_IN_FILE 64
+#define TIME_T_BITS_IN_FILE	64
 
 static zic_t const min_time = MINVAL(zic_t, TIME_T_BITS_IN_FILE);
 static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
@@ -975,7 +984,7 @@ static zic_t const max_time = MAXVAL(zic_t, TIME_T_BITS_IN_FILE);
  * Ade PAR, Aghanim N, Armitage-Caplan C et al.  Planck 2013 results.
  * I. Overview of products and scientific results.
  * arXiv:1303.5062 2013-03-20 20:10:01 UTC
- * <http://arxiv.org/pdf/1303.5062v1> [PDF]
+ * <https://arxiv.org/pdf/1303.5062v1> [PDF]
  *
  * Page 36, Table 9, row Age/Gyr, column Planck+WP+highL+BAO 68% limits
  * gives the value 13.798 plus-or-minus 0.037 billion years.
@@ -1199,9 +1208,14 @@ infile(const char *name)
 			/* nothing to do */
 		}
 		else if (wantcont)
+		{
 			wantcont = inzcont(fields, nfields);
+		}
 		else
 		{
+			struct lookup const *line_codes
+			= name == leapsec ? leap_line_codes : zi_line_codes;
+
 			lp = byword(fields[0], line_codes);
 			if (lp == NULL)
 				error(_("input line of unknown type"));
@@ -1220,12 +1234,7 @@ infile(const char *name)
 						wantcont = false;
 						break;
 					case LC_LEAP:
-						if (name != leapsec)
-							warning(_("%s: Leap line in non leap"
-									  " seconds file %s"),
-									progname, name);
-						else
-							inleap(fields, nfields);
+						inleap(fields, nfields);
 						wantcont = false;
 						break;
 					default:	/* "cannot happen" */
@@ -1359,7 +1368,7 @@ inzone(char **fields, int nfields)
 			strcmp(zones[i].z_name, fields[ZF_NAME]) == 0)
 		{
 			error(_("duplicate zone name %s"
-					" (file \"%s\", line %" PRIdLINENO ")"),
+					" (file \"%s\", line %d)"),
 				  fields[ZF_NAME],
 				  zones[i].z_filename,
 				  zones[i].z_linenum);
@@ -1573,21 +1582,11 @@ inleap(char **fields, int nfields)
 			positive = false;
 			count = 1;
 		}
-		else if (strcmp(cp, "--") == 0)
-		{
-			positive = false;
-			count = 2;
-		}
 		else if (strcmp(cp, "+") == 0)
 		{
 			positive = true;
 			count = 1;
 		}
-		else if (strcmp(cp, "++") == 0)
-		{
-			positive = true;
-			count = 2;
-		}
 		else
 		{
 			error(_("illegal CORRECTION field on Leap line"));
@@ -1599,9 +1598,9 @@ inleap(char **fields, int nfields)
 			return;
 		}
 		t = tadd(t, tod);
-		if (t < early_time)
+		if (t < 0)
 		{
-			error(_("leap second precedes Big Bang"));
+			error(_("leap second precedes Epoch"));
 			return;
 		}
 		leapadd(t, positive, lp->l_value, count);
@@ -1753,11 +1752,14 @@ rulesub(struct rule *rp, const char *loyearp, const char *hiyearp,
 			error(_("typed single year"));
 			return;
 		}
+		warning(_("year type \"%s\" is obsolete; use \"-\" instead"),
+				typep);
 		rp->r_yrtype = ecpyalloc(typep);
 	}
 
 	/*
-	 * Day work. Accept things such as:  1	last-Sunday  Sun<=20  Sun>=7
+	 * Day work. Accept things such as: 1 lastSunday last-Sunday
+	 * (undocumented; warn about this) Sun<=20 Sun>=7
 	 */
 	dp = ecpyalloc(dayp);
 	if ((lp = byword(dp, lasts)) != NULL)
@@ -2850,9 +2852,10 @@ outzone(const struct zone *zpfirst, ptrdiff_t zonecount)
 				{
 					ptrdiff_t	k;
 					zic_t		jtime,
-								ktime = 0;
+								ktime;
 					zic_t		offset;
 
+					INITIALIZE(ktime);
 					if (useuntil)
 					{
 						/*
@@ -2929,7 +2932,8 @@ outzone(const struct zone *zpfirst, ptrdiff_t zonecount)
 							continue;
 						}
 						if (*startbuf == '\0' &&
-							startoff == oadd(zp->z_gmtoff, stdoff))
+							startoff == oadd(zp->z_gmtoff,
+											 stdoff))
 						{
 							doabbr(startbuf,
 								   zp,
@@ -3104,14 +3108,7 @@ leapadd(zic_t t, bool positive, int rolling, int count)
 	}
 	for (i = 0; i < leapcnt; ++i)
 		if (t <= trans[i])
-		{
-			if (t == trans[i])
-			{
-				error(_("repeated leap second moment"));
-				exit(EXIT_FAILURE);
-			}
 			break;
-		}
 	do
 	{
 		for (j = leapcnt; j > i; --j)
@@ -3132,12 +3129,19 @@ adjleap(void)
 {
 	int			i;
 	zic_t		last = 0;
+	zic_t		prevtrans = 0;
 
 	/*
 	 * propagate leap seconds forward
 	 */
 	for (i = 0; i < leapcnt; ++i)
 	{
+		if (trans[i] - prevtrans < 28 * SECSPERDAY)
+		{
+			error(_("Leap seconds too close together"));
+			exit(EXIT_FAILURE);
+		}
+		prevtrans = trans[i];
 		trans[i] = tadd(trans[i], last);
 		last = corr[i] += last;
 	}
@@ -3191,7 +3195,7 @@ yearistype(zic_t year, const char *type)
 	exit(EXIT_FAILURE);
 }
 
-/* Is A a space character in the C locale?	*/
+/* Is A a space character in the C locale?  */
 static bool
 is_space(char a)
 {
@@ -3362,6 +3366,19 @@ itsabbr(const char *abbr, const char *word)
 	return true;
 }
 
+/* Return true if ABBR is an initial prefix of WORD, ignoring ASCII case.  */
+
+static bool
+ciprefix(char const *abbr, char const *word)
+{
+	do
+		if (!*abbr)
+			return true;
+	while (lowerit(*abbr++) == lowerit(*word++));
+
+	return false;
+}
+
 static const struct lookup *
 byword(const char *word, const struct lookup *table)
 {
@@ -3371,6 +3388,23 @@ byword(const char *word, const struct lookup *table)
 	if (word == NULL || table == NULL)
 		return NULL;
 
+	/*
+	 * If TABLE is LASTS and the word starts with "last" followed by a
+	 * non-'-', skip the "last" and look in WDAY_NAMES instead. Warn about any
+	 * usage of the undocumented prefix "last-".
+	 */
+	if (table == lasts && ciprefix("last", word) && word[4])
+	{
+		if (word[4] == '-')
+			warning(_("\"%s\" is undocumented; use \"last%s\" instead"),
+					word, word + 5);
+		else
+		{
+			word += 4;
+			table = wday_names;
+		}
+	}
+
 	/*
 	 * Look for exact match.
 	 */
@@ -3383,13 +3417,31 @@ byword(const char *word, const struct lookup *table)
 	 */
 	foundlp = NULL;
 	for (lp = table; lp->l_word != NULL; ++lp)
-		if (itsabbr(word, lp->l_word))
+		if (ciprefix(word, lp->l_word))
 		{
 			if (foundlp == NULL)
 				foundlp = lp;
 			else
 				return NULL;	/* multiple inexact matches */
 		}
+
+	/* Warn about any backward-compatibility issue with pre-2017c zic.  */
+	if (foundlp)
+	{
+		bool		pre_2017c_match = false;
+
+		for (lp = table; lp->l_word; lp++)
+			if (itsabbr(word, lp->l_word))
+			{
+				if (pre_2017c_match)
+				{
+					warning(_("\"%s\" is ambiguous in pre-2017c zic"), word);
+					break;
+				}
+				pre_2017c_match = true;
+			}
+	}
+
 	return foundlp;
 }
 
@@ -3621,11 +3673,15 @@ mkdirs(char const *argname, bool ancestors)
 
 	cp = name = ecpyalloc(argname);
 
+	/*
+	 * On MS-Windows systems, do not worry about drive letters or backslashes,
+	 * as this should suffice in practice.  Time zone names do not use drive
+	 * letters and backslashes.  If the -d option of zic does not name an
+	 * already-existing directory, it can use slashes to separate the
+	 * already-existing ancestor prefix from the to-be-created subdirectories.
+	 */
+
 	/* Do not mkdir a root directory, as it must exist.  */
-#ifdef WIN32
-	if (is_alpha(name[0]) && name[1] == ':')
-		cp += 2;
-#endif
 	while (*cp == '/')
 		cp++;
 
diff --git a/src/tools/check_bison_recursion.pl b/src/tools/check_bison_recursion.pl
index 14590663c6..9421eb93af 100755
--- a/src/tools/check_bison_recursion.pl
+++ b/src/tools/check_bison_recursion.pl
@@ -16,7 +16,7 @@
 # To use: run bison with the -v switch, then feed the produced y.output
 # file to this script.
 #
-# Copyright (c) 2011-2017, PostgreSQL Global Development Group
+# Copyright (c) 2011-2018, PostgreSQL Global Development Group
 #
 # src/tools/check_bison_recursion.pl
 #################################################################
diff --git a/src/tools/copyright.pl b/src/tools/copyright.pl
index 53942f12f0..41cb93d658 100755
--- a/src/tools/copyright.pl
+++ b/src/tools/copyright.pl
@@ -2,7 +2,7 @@
 #################################################################
 # copyright.pl -- update copyright notices throughout the source tree, idempotently.
 #
-# Copyright (c) 2011-2017, PostgreSQL Global Development Group
+# Copyright (c) 2011-2018, PostgreSQL Global Development Group
 #
 # src/tools/copyright.pl
 #
diff --git a/src/tools/findoidjoins/Makefile b/src/tools/findoidjoins/Makefile
index 5410d85ec2..a3462b937c 100644
--- a/src/tools/findoidjoins/Makefile
+++ b/src/tools/findoidjoins/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/tools/findoidjoins
 #
-# Copyright (c) 2003-2017, PostgreSQL Global Development Group
+# Copyright (c) 2003-2018, PostgreSQL Global Development Group
 #
 # src/tools/findoidjoins/Makefile
 #
diff --git a/src/tools/findoidjoins/findoidjoins.c b/src/tools/findoidjoins/findoidjoins.c
index 7ce519d726..82ef113e92 100644
--- a/src/tools/findoidjoins/findoidjoins.c
+++ b/src/tools/findoidjoins/findoidjoins.c
@@ -1,7 +1,7 @@
 /*
  * findoidjoins.c
  *
- * Copyright (c) 2002-2017, PostgreSQL Global Development Group
+ * Copyright (c) 2002-2018, PostgreSQL Global Development Group
  *
  * src/tools/findoidjoins/findoidjoins.c
  */
@@ -9,6 +9,7 @@
 
 #include "catalog/pg_class.h"
 
+#include "fe_utils/connect.h"
 #include "libpq-fe.h"
 #include "pqexpbuffer.h"
 
@@ -46,6 +47,14 @@ main(int argc, char **argv)
 		exit(EXIT_FAILURE);
 	}
 
+	res = PQexec(conn, ALWAYS_SECURE_SEARCH_PATH_SQL);
+	if (!res || PQresultStatus(res) != PGRES_TUPLES_OK)
+	{
+		fprintf(stderr, "sql error:  %s\n", PQerrorMessage(conn));
+		exit(EXIT_FAILURE);
+	}
+	PQclear(res);
+
 	/* Get a list of relations that have OIDs */
 
 	printfPQExpBuffer(&sql, "%s",
diff --git a/src/tools/fix-old-flex-code.pl b/src/tools/fix-old-flex-code.pl
index da99875599..baa1feecb9 100644
--- a/src/tools/fix-old-flex-code.pl
+++ b/src/tools/fix-old-flex-code.pl
@@ -8,7 +8,7 @@
 # let's suppress it by inserting a dummy reference to the variable.
 # (That's exactly what 2.5.36 and later do ...)
 #
-# Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+# Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
 # src/tools/fix-old-flex-code.pl
diff --git a/src/tools/git_changelog b/src/tools/git_changelog
index a66b64467f..2fc1565a6c 100755
--- a/src/tools/git_changelog
+++ b/src/tools/git_changelog
@@ -102,8 +102,9 @@ my %rel_tags;
 		{
 			my $commit = $1;
 			my $tag    = $2;
-			if (   $tag =~ /^REL\d+_\d+$/
-				|| $tag =~ /^REL\d+_\d+_\d+$/)
+			if ($tag =~ /^REL_\d+_\d+$/
+			    || $tag =~ /^REL\d+_\d+$/
+			    || $tag =~ /^REL\d+_\d+_\d+$/)
 			{
 				$rel_tags{$commit} = $tag;
 			}
@@ -198,6 +199,7 @@ for my $branch (@BRANCHES)
 			$last_tag = $sprout_tags{$commit};
 
 			# normalize branch names for making sprout tags
+			$last_tag =~ s/^(REL_\d+).*/$1_BR/;
 			$last_tag =~ s/^(REL\d+_\d+).*/$1_BR/;
 		}
 		$c->{'last_tag'} = $last_tag;
diff --git a/src/tools/ifaddrs/Makefile b/src/tools/ifaddrs/Makefile
index a5153207fe..9e0e8945f8 100644
--- a/src/tools/ifaddrs/Makefile
+++ b/src/tools/ifaddrs/Makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for src/tools/ifaddrs
 #
-# Copyright (c) 2003-2017, PostgreSQL Global Development Group
+# Copyright (c) 2003-2018, PostgreSQL Global Development Group
 #
 # src/tools/ifaddrs/Makefile
 #
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 18bded431f..d8ef98e4f7 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -381,8 +381,8 @@ sub GenerateTimezoneFiles
 	my $mf     = read_file("src/timezone/Makefile");
 	$mf =~ s{\\\r?\n}{}g;
 
-	$mf =~ /^TZDATA\s*:?=\s*(.*)$/m
-	  || die "Could not find TZDATA line in timezone makefile\n";
+	$mf =~ /^TZDATAFILES\s*:?=\s*(.*)$/m
+	  || die "Could not find TZDATAFILES line in timezone makefile\n";
 	my @tzfiles = split /\s+/, $1;
 
 	$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
@@ -397,7 +397,8 @@ sub GenerateTimezoneFiles
 	foreach (@tzfiles)
 	{
 		my $tzfile = $_;
-		push(@args, "src/timezone/data/$tzfile");
+		$tzfile =~ s|\$\(srcdir\)|src/timezone|;
+		push(@args, $tzfile);
 	}
 
 	system(@args);
diff --git a/src/tools/msvc/MSBuildProject.pm b/src/tools/msvc/MSBuildProject.pm
index 27329f9e36..9ddccc7c55 100644
--- a/src/tools/msvc/MSBuildProject.pm
+++ b/src/tools/msvc/MSBuildProject.pm
@@ -320,6 +320,8 @@ sub WriteItemDefinitionGroup
       <GenerateMapFile>false</GenerateMapFile>
       <MapFileName>.\\$cfgname\\$self->{name}\\$self->{name}.map</MapFileName>
       <RandomizedBaseAddress>false</RandomizedBaseAddress>
+      <!-- Permit links to MinGW-built, 32-bit DLLs (default before VS2012). -->
+      <ImageHasSafeExceptionHandlers/>
       <SubSystem>Console</SubSystem>
       <TargetMachine>$targetmachine</TargetMachine>
 EOF
@@ -483,4 +485,27 @@ sub new
 	return $self;
 }
 
+package VC2017Project;
+
+#
+# Package that encapsulates a Visual C++ 2017 project file
+#
+
+use strict;
+use warnings;
+use base qw(VC2012Project);
+
+sub new
+{
+	my $classname = shift;
+	my $self      = $classname->SUPER::_new(@_);
+	bless($self, $classname);
+
+	$self->{vcver}           = '15.00';
+	$self->{PlatformToolset} = 'v141';
+	$self->{ToolsVersion}    = '15.0';
+
+	return $self;
+}
+
 1;
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
index 159e79ee7d..d8c279ab92 100644
--- a/src/tools/msvc/Mkvcbuild.pm
+++ b/src/tools/msvc/Mkvcbuild.pm
@@ -28,6 +28,7 @@ my $libpgcommon;
 my $libpgfeutils;
 my $postgres;
 my $libpq;
+my @unlink_on_exit;
 
 # Set of variables for modules in contrib/ and src/test/modules/
 my $contrib_defines = { 'refint' => 'REFINT_VERBOSE' };
@@ -241,6 +242,7 @@ sub mkvcbuild
    # building with OpenSSL.
 	if (!$solution->{options}->{openssl})
 	{
+		$libpq->RemoveFile('src/interfaces/libpq/fe-secure-common.c');
 		$libpq->RemoveFile('src/interfaces/libpq/fe-secure-openssl.c');
 		$libpq->RemoveFile('src/common/sha2_openssl.c');
 	}
@@ -517,22 +519,154 @@ sub mkvcbuild
 		my $plperl =
 		  $solution->AddProject('plperl', 'dll', 'PLs', 'src/pl/plperl');
 		$plperl->AddIncludeDir($solution->{options}->{perl} . '/lib/CORE');
+		$plperl->AddReference($postgres);
+
+		my $perl_path = $solution->{options}->{perl} . '\lib\CORE\*perl*';
+
+		# ActivePerl 5.16 provided perl516.lib; 5.18 provided libperl518.a
+		my @perl_libs =
+		  grep { /perl\d+\.lib$|libperl\d+\.a$/ } glob($perl_path);
+		if (@perl_libs == 1)
+		{
+			$plperl->AddLibrary($perl_libs[0]);
+		}
+		else
+		{
+			die
+"could not identify perl library version matching pattern $perl_path\n";
+		}
 
 		# Add defines from Perl's ccflags; see PGAC_CHECK_PERL_EMBED_CCFLAGS
 		my @perl_embed_ccflags;
 		foreach my $f (split(" ", $Config{ccflags}))
 		{
-			if (   $f =~ /^-D[^_]/
-				|| $f =~ /^-D_USE_32BIT_TIME_T/)
+			if ($f =~ /^-D[^_]/)
 			{
 				$f =~ s/\-D//;
 				push(@perl_embed_ccflags, $f);
 			}
 		}
 
-		# Also, a hack to prevent duplicate definitions of uid_t/gid_t
+		# hack to prevent duplicate definitions of uid_t/gid_t
 		push(@perl_embed_ccflags, 'PLPERL_HAVE_UID_GID');
 
+		# Windows offers several 32-bit ABIs.  Perl is sensitive to
+		# sizeof(time_t), one of the ABI dimensions.  To get 32-bit time_t,
+		# use "cl -D_USE_32BIT_TIME_T" or plain "gcc".  For 64-bit time_t, use
+		# "gcc -D__MINGW_USE_VC2005_COMPAT" or plain "cl".  Before MSVC 2005,
+		# plain "cl" chose 32-bit time_t.  PostgreSQL doesn't support building
+		# with pre-MSVC-2005 compilers, but it does support linking to Perl
+		# built with such a compiler.  MSVC-built Perl 5.13.4 and later report
+		# -D_USE_32BIT_TIME_T in $Config{ccflags} if applicable, but
+		# MinGW-built Perl never reports -D_USE_32BIT_TIME_T despite typically
+		# needing it.  Ignore the $Config{ccflags} opinion about
+		# -D_USE_32BIT_TIME_T, and use a runtime test to deduce the ABI Perl
+		# expects.  Specifically, test use of PL_modglobal, which maps to a
+		# PerlInterpreter field whose position depends on sizeof(time_t).
+		if ($solution->{platform} eq 'Win32')
+		{
+			my $source_file = 'conftest.c';
+			my $obj         = 'conftest.obj';
+			my $exe         = 'conftest.exe';
+			my @conftest    = ($source_file, $obj, $exe);
+			push @unlink_on_exit, @conftest;
+			unlink $source_file;
+			open my $o, '>', $source_file
+			  || croak "Could not write to $source_file";
+			print $o '
+	/* compare to plperl.h */
+	#define __inline__ __inline
+	#define PERL_NO_GET_CONTEXT
+	#include <EXTERN.h>
+	#include <perl.h>
+
+	int
+	main(int argc, char **argv)
+	{
+		int			dummy_argc = 1;
+		char	   *dummy_argv[1] = {""};
+		char	   *dummy_env[1] = {NULL};
+		static PerlInterpreter *interp;
+
+		PERL_SYS_INIT3(&dummy_argc, (char ***) &dummy_argv,
+					   (char ***) &dummy_env);
+		interp = perl_alloc();
+		perl_construct(interp);
+		{
+			dTHX;
+			const char	key[] = "dummy";
+
+			PL_exit_flags |= PERL_EXIT_DESTRUCT_END;
+			hv_store(PL_modglobal, key, sizeof(key) - 1, newSViv(1), 0);
+			return hv_fetch(PL_modglobal, key, sizeof(key) - 1, 0) == NULL;
+		}
+	}
+';
+			close $o;
+
+			# Build $source_file with a given #define, and return a true value
+			# if a run of the resulting binary exits successfully.
+			my $try_define = sub {
+				my $define = shift;
+
+				unlink $obj, $exe;
+				my @cmd = (
+					'cl',
+					'-I' . $solution->{options}->{perl} . '/lib/CORE',
+					(map { "-D$_" } @perl_embed_ccflags, $define || ()),
+					$source_file,
+					'/link',
+					$perl_libs[0]);
+				my $compile_output = `@cmd 2>&1`;
+				-f $exe || die "Failed to build Perl test:\n$compile_output";
+
+				{
+
+					# Some builds exhibit runtime failure through Perl warning
+					# 'Can't spawn "conftest.exe"'; supress that.
+					no warnings;
+
+					# Disable error dialog boxes like we do in the postmaster.
+					# Here, we run code that triggers relevant errors.
+					use Win32API::File qw(SetErrorMode :SEM_);
+					my $oldmode = SetErrorMode(
+						SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX);
+					system(".\\$exe");
+					SetErrorMode($oldmode);
+				}
+
+				return !($? >> 8);
+			};
+
+			my $define_32bit_time = '_USE_32BIT_TIME_T';
+			my $ok_now            = $try_define->(undef);
+			my $ok_32bit          = $try_define->($define_32bit_time);
+			unlink @conftest;
+			if (!$ok_now && !$ok_32bit)
+			{
+
+				# Unsupported configuration.  Since we used %Config from the
+				# Perl running the build scripts, this is expected if
+				# attempting to link with some other Perl.
+				die "Perl test fails with or without -D$define_32bit_time";
+			}
+			elsif ($ok_now && $ok_32bit)
+			{
+
+				# Resulting build may work, but it's especially important to
+				# verify with "vcregress plcheck".  A refined test may avoid
+				# this outcome.
+				warn "Perl test passes with or without -D$define_32bit_time";
+			}
+			elsif ($ok_32bit)
+			{
+				push(@perl_embed_ccflags, $define_32bit_time);
+			}    # else $ok_now, hence no flag required
+		}
+
+		print "CFLAGS recommended by Perl: $Config{ccflags}\n";
+		print "CFLAGS to compile embedded Perl: ",
+		  (join ' ', map { "-D$_" } @perl_embed_ccflags), "\n";
 		foreach my $f (@perl_embed_ccflags)
 		{
 			$plperl->AddDefine($f);
@@ -602,19 +736,6 @@ sub mkvcbuild
 				die 'Failed to create plperl_opmask.h' . "\n";
 			}
 		}
-		$plperl->AddReference($postgres);
-		my $perl_path = $solution->{options}->{perl} . '\lib\CORE\perl*.lib';
-		my @perl_libs =
-		  grep { /perl\d+.lib$/ } glob($perl_path);
-		if (@perl_libs == 1)
-		{
-			$plperl->AddLibrary($perl_libs[0]);
-		}
-		else
-		{
-			die
-"could not identify perl library version matching pattern $perl_path\n";
-		}
 
 		# Add transform module dependent on plperl
 		my $hstore_plperl = AddTransformModule(
@@ -943,4 +1064,9 @@ sub AdjustModule
 	}
 }
 
+END
+{
+	unlink @unlink_on_exit;
+}
+
 1;
diff --git a/src/tools/msvc/README b/src/tools/msvc/README
index b61ddb8791..48082cab90 100644
--- a/src/tools/msvc/README
+++ b/src/tools/msvc/README
@@ -4,7 +4,7 @@ MSVC build
 ==========
 
 This directory contains the tools required to build PostgreSQL using
-Microsoft Visual Studio 2005 - 2011. This builds the whole backend, not just
+Microsoft Visual Studio 2005 - 2017. This builds the whole backend, not just
 the libpq frontend library. For more information, see the documentation
 chapter "Installation on Windows" and the description below.
 
@@ -92,11 +92,12 @@ These configuration arguments are passed over to Mkvcbuild::mkvcbuild
 (Mkvcbuild.pm) which creates the Visual Studio project and solution files.
 It does this by using VSObjectFactory::CreateSolution to create an object
 implementing the Solution interface (this could be either a VS2005Solution,
-a VS2008Solution, a VS2010Solution or a VS2012Solution, all in Solution.pm,
-depending on the user's build environment) and adding objects implementing
-the corresponding Project interface (VC2005Project or VC2008Project from
-VCBuildProject.pm or VC2010Project or VC2012Project from MSBuildProject.pm)
-to it.
+a VS2008Solution, a VS2010Solution or a VS2012Solution or a VS2013Solution,
+or a VS2015Solution or a VS2017Solution, all in Solution.pm, depending on
+the user's build environment) and adding objects implementing the corresponding
+Project interface (VC2005Project or VC2008Project from VCBuildProject.pm or
+VC2010Project or VC2012Project or VC2013Project or VC2015Project or VC2017Project
+from MSBuildProject.pm) to it.
 When Solution::Save is called, the implementations of Solution and Project
 save their content in the appropriate format.
 The final step of starting the appropriate build program (msbuild or vcbuild)
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 01e5846b63..36e9fd70d3 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -81,6 +81,7 @@ sub DeterminePlatform
 sub IsNewer
 {
 	my ($newfile, $oldfile) = @_;
+	-e $oldfile or warn "source file \"$oldfile\" does not exist";
 	if (   $oldfile ne 'src/tools/msvc/config.pl'
 		&& $oldfile ne 'src/tools/msvc/config_default.pl')
 	{
@@ -179,8 +180,6 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 		  1024, "\n";
 		print $o "#define XLOG_BLCKSZ ",
 		  1024 * $self->{options}->{wal_blocksize}, "\n";
-		print $o "#define XLOG_SEG_SIZE (", $self->{options}->{wal_segsize},
-		  " * 1024 * 1024)\n";
 
 		if ($self->{options}->{float4byval})
 		{
@@ -271,7 +270,7 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 		print "Generating fmgrtab.c, fmgroids.h, fmgrprotos.h...\n";
 		chdir('src/backend/utils');
 		system(
-"perl -I ../catalog Gen_fmgrtab.pl ../../../src/include/catalog/pg_proc.h");
+"perl -I ../catalog Gen_fmgrtab.pl -I../../../src/include/ ../../../src/include/catalog/pg_proc.h");
 		chdir('../../..');
 	}
 	if (IsNewer(
@@ -327,7 +326,7 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 	if ($self->{options}->{python}
 		&& IsNewer(
 			'src/pl/plpython/spiexceptions.h',
-			'src/include/backend/errcodes.txt'))
+			'src/backend/utils/errcodes.txt'))
 	{
 		print "Generating spiexceptions.h...\n";
 		system(
@@ -425,10 +424,11 @@ s{PG_VERSION_STR "[^"]+"}{PG_VERSION_STR "PostgreSQL $self->{strver}$extraver, c
 		  || confess "Could not open ecpg_config.h";
 		print $o <<EOF;
 #if (_MSC_VER > 1200)
-#define HAVE_LONG_LONG_INT_64
+#define HAVE_LONG_LONG_INT 1
+#define HAVE_LONG_LONG_INT_64 1
+#endif
 #define ENABLE_THREAD_SAFETY 1
 EOF
-		print $o "#endif\n";
 		close($o);
 	}
 
@@ -536,10 +536,12 @@ sub AddProject
 		}
 		else
 		{
+			# We don't expect the config-specific library to be here,
+			# so don't ask for it in last parameter
 			$proj->AddLibrary(
-				$self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
+				$self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
 			$proj->AddLibrary(
-				$self->{options}->{openssl} . '\lib\libeay32.lib', 1);
+				$self->{options}->{openssl} . '\lib\libeay32.lib', 0);
 		}
 	}
 	if ($self->{options}->{nls})
@@ -851,6 +853,32 @@ sub new
 	return $self;
 }
 
+package VS2017Solution;
+
+#
+# Package that encapsulates a Visual Studio 2017 solution file
+#
+
+use Carp;
+use strict;
+use warnings;
+use base qw(Solution);
+
+sub new
+{
+	my $classname = shift;
+	my $self      = $classname->SUPER::_new(@_);
+	bless($self, $classname);
+
+	$self->{solutionFileVersion}        = '12.00';
+	$self->{vcver}                      = '15.00';
+	$self->{visualStudioName}           = 'Visual Studio 2017';
+	$self->{VisualStudioVersion}        = '15.0.26730.3';
+	$self->{MinimumVisualStudioVersion} = '10.0.40219.1';
+
+	return $self;
+}
+
 sub GetAdditionalHeaders
 {
 	my ($self, $f) = @_;
diff --git a/src/tools/msvc/VSObjectFactory.pm b/src/tools/msvc/VSObjectFactory.pm
index 4190ada618..2f3480a1f6 100644
--- a/src/tools/msvc/VSObjectFactory.pm
+++ b/src/tools/msvc/VSObjectFactory.pm
@@ -53,8 +53,14 @@ sub CreateSolution
 	{
 		return new VS2015Solution(@_);
 	}
+	# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
+	elsif (($visualStudioVersion ge '14.10') or ($visualStudioVersion eq '15.00'))
+	{
+		return new VS2017Solution(@_);
+	}
 	else
 	{
+		croak $visualStudioVersion;
 		croak "The requested Visual Studio version is not supported.";
 	}
 }
@@ -92,8 +98,14 @@ sub CreateProject
 	{
 		return new VC2015Project(@_);
 	}
+	# visual 2017 hasn't changed the nmake version to 15, so adjust the check to support it.
+	elsif (($visualStudioVersion ge '14.10') or ($visualStudioVersion eq '15.00'))
+	{
+		return new VC2017Project(@_);
+	}
 	else
 	{
+		croak $visualStudioVersion;
 		croak "The requested Visual Studio version is not supported.";
 	}
 }
@@ -120,6 +132,7 @@ sub DetermineVisualStudioVersion
 sub _GetVisualStudioVersion
 {
 	my ($major, $minor) = @_;
+	# visual 2017 hasn't changed the nmake version to 15, so still using the older version for comparison.
 	if ($major > 14)
 	{
 		carp
diff --git a/src/tools/msvc/config_default.pl b/src/tools/msvc/config_default.pl
index 4d69dc2a2e..d7a9fc5039 100644
--- a/src/tools/msvc/config_default.pl
+++ b/src/tools/msvc/config_default.pl
@@ -18,7 +18,7 @@
 	icu       => undef,    # --with-icu=<path>
 	nls       => undef,    # --enable-nls=<path>
 	tap_tests => undef,    # --enable-tap-tests
-	tcl       => undef,    # --with-tls=<path>
+	tcl       => undef,    # --with-tcl=<path>
 	perl      => undef,    # --with-perl
 	python    => undef,    # --with-python=<path>
 	openssl   => undef,    # --with-openssl=<path>
diff --git a/src/tools/msvc/gendef.pl b/src/tools/msvc/gendef.pl
index 96122750f1..9b5bc081e1 100644
--- a/src/tools/msvc/gendef.pl
+++ b/src/tools/msvc/gendef.pl
@@ -32,7 +32,7 @@ sub dumpsyms
 sub extract_syms
 {
 	my ($symfile, $def) = @_;
-	open(my $f, '<', $symfile) || die "Could not open $symfile for $_\n";
+	open(my $f, '<', $symfile) || die "Could not open $symfile for $_: $!\n";
 	while (<$f>)
 	{
 
diff --git a/src/tools/msvc/vcregress.pl b/src/tools/msvc/vcregress.pl
index 2904679114..314f2c37d2 100644
--- a/src/tools/msvc/vcregress.pl
+++ b/src/tools/msvc/vcregress.pl
@@ -104,6 +104,7 @@ sub installcheck
 		"--dlpath=.",
 		"--bindir=../../../$Config/psql",
 		"--schedule=${schedule}_schedule",
+		"--max-concurrent-tests=20",
 		"--encoding=SQL_ASCII",
 		"--no-locale");
 	push(@args, $maxconn) if $maxconn;
@@ -122,6 +123,7 @@ sub check
 		"--dlpath=.",
 		"--bindir=",
 		"--schedule=${schedule}_schedule",
+		"--max-concurrent-tests=20",
 		"--encoding=SQL_ASCII",
 		"--no-locale",
 		"--temp-instance=./tmp_check");
@@ -246,23 +248,32 @@ sub taptest
 
 sub plcheck
 {
-	chdir "../../pl";
+	chdir "$topdir/src/pl";
 
-	foreach my $pl (glob("*"))
+	foreach my $dir (glob("*/src *"))
 	{
-		next unless -d "$pl/sql" && -d "$pl/expected";
-		my $lang = $pl eq 'tcl' ? 'pltcl' : $pl;
+		next unless -d "$dir/sql" && -d "$dir/expected";
+		my $lang;
+		if ($dir eq 'plpgsql/src') {
+			$lang = 'plpgsql';
+		}
+		elsif ($dir eq 'tcl') {
+			$lang = 'pltcl';
+		}
+		else {
+			$lang = $dir;
+		}
 		if ($lang eq 'plpython')
 		{
-			next unless -d "../../$Config/plpython2";
+			next unless -d "$topdir/$Config/plpython2";
 			$lang = 'plpythonu';
 		}
 		else
 		{
-			next unless -d "../../$Config/$lang";
+			next unless -d "$topdir/$Config/$lang";
 		}
 		my @lang_args = ("--load-extension=$lang");
-		chdir $pl;
+		chdir $dir;
 		my @tests = fetchTests();
 		if ($lang eq 'plperl')
 		{
@@ -283,16 +294,16 @@ sub plcheck
 		  "============================================================\n";
 		print "Checking $lang\n";
 		my @args = (
-			"../../../$Config/pg_regress/pg_regress",
-			"--bindir=../../../$Config/psql",
+			"$topdir/$Config/pg_regress/pg_regress",
+			"--bindir=$topdir/$Config/psql",
 			"--dbname=pl_regression", @lang_args, @tests);
 		system(@args);
 		my $status = $? >> 8;
 		exit $status if $status;
-		chdir "..";
+		chdir "$topdir/src/pl";
 	}
 
-	chdir "../../..";
+	chdir "$topdir";
 }
 
 sub subdircheck
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 8166d86ca1..d4765ce3b0 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -34,6 +34,9 @@ AfterTriggerEventList
 AfterTriggerShared
 AfterTriggerSharedData
 AfterTriggersData
+AfterTriggersQueryData
+AfterTriggersTableData
+AfterTriggersTransData
 Agg
 AggClauseCosts
 AggInfo
@@ -125,7 +128,6 @@ ArrayMetaState
 ArrayParseState
 ArrayRef
 ArrayRefState
-ArrayRemapInfo
 ArrayType
 AsyncQueueControl
 AsyncQueueEntry
@@ -138,11 +140,11 @@ AttrDefault
 AttrNumber
 AttributeOpts
 AuthRequest
+AutoPrewarmSharedState
 AutoVacOpts
 AutoVacuumShmemStruct
 AutoVacuumWorkItem
 AutoVacuumWorkItemType
-AutovacWorkItems
 AuxProcType
 BF_ctx
 BF_key
@@ -163,6 +165,7 @@ BTArrayKeyInfo
 BTBuildState
 BTCycleId
 BTIndexStat
+BTLeader
 BTMetaPageData
 BTOneVacInfo
 BTPS_State
@@ -176,6 +179,7 @@ BTScanOpaqueData
 BTScanPos
 BTScanPosData
 BTScanPosItem
+BTShared
 BTSortArrayContext
 BTSpool
 BTStack
@@ -218,6 +222,7 @@ BlobInfo
 Block
 BlockId
 BlockIdData
+BlockInfoRecord
 BlockNumber
 BlockSampler
 BlockSamplerData
@@ -272,6 +277,8 @@ BuiltinScript
 BulkInsertState
 CACHESIGN
 CAC_state
+CCFastEqualFN
+CCHashFN
 CEOUC_WAIT_MODE
 CFuncHashTabEntry
 CHAR
@@ -340,6 +347,7 @@ ColumnCompareData
 ColumnDef
 ColumnIOData
 ColumnRef
+ColumnsHashData
 CombinationGenerator
 ComboCidEntry
 ComboCidEntryData
@@ -598,6 +606,7 @@ ExprContextCallbackFunction
 ExprContext_CB
 ExprDoneCond
 ExprEvalOp
+ExprEvalOpLookup
 ExprEvalStep
 ExprState
 ExprStateEvalFunc
@@ -628,9 +637,9 @@ FieldStore
 File
 FileFdwExecutionState
 FileFdwPlanState
-FileName
 FileNameMap
 FindSplitData
+FixedParallelExecutorState
 FixedParallelState
 FixedParamState
 FlagMode
@@ -820,6 +829,10 @@ GatherMergeState
 GatherPath
 GatherState
 Gene
+GenerationBlock
+GenerationChunk
+GenerationContext
+GenerationPointer
 GenericCosts
 GenericXLogState
 GeqoPrivateData
@@ -937,6 +950,7 @@ HashPageStat
 HashPath
 HashScanOpaque
 HashScanOpaqueData
+HashScanPosData
 HashScanPosItem
 HashSkewBucket
 HashState
@@ -1017,13 +1031,13 @@ InsertStmt
 Instrumentation
 Int128AggState
 Int8TransTypeData
+IntRBTreeNode
 InternalDefaultACL
 InternalGrant
 Interval
 IntoClause
 InvalidationChunk
 InvalidationListHeader
-InvertedWalkNextStep
 IpcMemoryId
 IpcMemoryKey
 IpcSemaphoreId
@@ -1213,6 +1227,7 @@ MergeJoinClause
 MergeJoinState
 MergePath
 MergeScanSelCache
+MetaCommand
 MinMaxAggInfo
 MinMaxAggPath
 MinMaxExpr
@@ -1450,13 +1465,18 @@ PLpgSQL_var
 PLpgSQL_variable
 PLwdatum
 PLword
+PLyArrayToOb
 PLyCursorObject
 PLyDatumToOb
 PLyDatumToObFunc
 PLyExceptionEntry
 PLyExecutionContext
+PLyObToArray
 PLyObToDatum
 PLyObToDatumFunc
+PLyObToDomain
+PLyObToScalar
+PLyObToTransform
 PLyObToTuple
 PLyObject_AsString_t
 PLyPlanObject
@@ -1466,12 +1486,11 @@ PLyProcedureKey
 PLyResultObject
 PLySRFState
 PLySavedArgs
+PLyScalarToOb
 PLySubtransactionData
 PLySubtransactionObject
+PLyTransformToOb
 PLyTupleToOb
-PLyTypeInfo
-PLyTypeInput
-PLyTypeOutput
 PLyUnicode_FromStringAndSize_t
 PMINIDUMP_CALLBACK_INFORMATION
 PMINIDUMP_EXCEPTION_INFORMATION
@@ -1526,10 +1545,15 @@ ParallelBitmapHeapState
 ParallelCompletionPtr
 ParallelContext
 ParallelExecutorInfo
+ParallelHashGrowth
+ParallelHashJoinBatch
+ParallelHashJoinBatchAccessor
+ParallelHashJoinState
 ParallelHeapScanDesc
 ParallelIndexScanDesc
 ParallelSlot
 ParallelState
+ParallelWorkerContext
 ParallelWorkerInfo
 Param
 ParamExecData
@@ -1560,12 +1584,15 @@ PartitionDescData
 PartitionDispatch
 PartitionDispatchData
 PartitionElem
+PartitionHashBound
 PartitionKey
 PartitionListValue
 PartitionRangeBound
 PartitionRangeDatum
 PartitionRangeDatumKind
+PartitionScheme
 PartitionSpec
+PartitionTupleRouting
 PartitionedChildRelInfo
 PasswordType
 Path
@@ -1664,6 +1691,7 @@ Pool
 PopulateArrayContext
 PopulateArrayState
 PopulateRecordCache
+PopulateRecordsetCache
 PopulateRecordsetState
 Port
 Portal
@@ -1775,7 +1803,6 @@ RangeBox
 RangeFunction
 RangeIOData
 RangeQueryClause
-RangeRemapInfo
 RangeSubselect
 RangeTableFunc
 RangeTableFuncCol
@@ -1788,6 +1815,7 @@ RangeVar
 RangeVarGetRelidCallback
 RawColumnDefault
 RawStmt
+ReInitializeDSMForeignScan_function
 ReScanForeignScan_function
 ReadBufPtrType
 ReadBufferMode
@@ -1799,8 +1827,6 @@ RecheckForeignScan_function
 RecordCacheEntry
 RecordCompareData
 RecordIOData
-RecordRemapInfo
-RecordTypmodMap
 RecoveryTargetAction
 RecoveryTargetType
 RectBox
@@ -1860,6 +1886,7 @@ ReorderBufferTupleCidEnt
 ReorderBufferTupleCidKey
 ReorderTuple
 RepOriginId
+ReparameterizeForeignPathByChild_function
 ReplaceVarsFromTargetList_context
 ReplaceVarsNoMatchOption
 ReplicaIdentityStmt
@@ -2007,6 +2034,7 @@ SharedBitmapState
 SharedDependencyObjectType
 SharedDependencyType
 SharedExecutorInstrumentation
+SharedFileSet
 SharedInvalCatalogMsg
 SharedInvalCatcacheMsg
 SharedInvalRelcacheMsg
@@ -2014,6 +2042,14 @@ SharedInvalRelmapMsg
 SharedInvalSmgrMsg
 SharedInvalSnapshotMsg
 SharedInvalidationMessage
+SharedRecordTableEntry
+SharedRecordTableKey
+SharedRecordTypmodRegistry
+SharedSortInfo
+SharedTuplestore
+SharedTuplestoreAccessor
+SharedTypmodTableEntry
+Sharedsort
 ShellTypeInfo
 ShippableCacheEntry
 ShippableCacheKey
@@ -2058,6 +2094,8 @@ Sort
 SortBy
 SortByDir
 SortByNulls
+SortCoordinate
+SortCoordinateData
 SortGroupClause
 SortItem
 SortPath
@@ -2201,6 +2239,7 @@ TableSpaceOpts
 TablespaceList
 TablespaceListCell
 TapeBlockTrailer
+TapeShare
 TarMethodData
 TarMethodFile
 TargetEntry
@@ -2287,9 +2326,10 @@ TupleHashEntryData
 TupleHashIterator
 TupleHashTable
 TupleQueueReader
-TupleRemapClass
-TupleRemapInfo
 TupleTableSlot
+TuplesortInstrumentation
+TuplesortMethod
+TuplesortSpaceType
 Tuplesortstate
 Tuplestorestate
 TwoPhaseCallback
@@ -2319,7 +2359,6 @@ UChar
 UCharIterator
 UCollator
 UConverter
-UEnumeration
 UErrorCode
 UINT
 ULARGE_INTEGER
@@ -2343,6 +2382,7 @@ UserOpts
 VacAttrStats
 VacAttrStatsP
 VacuumParams
+VacuumRelation
 VacuumStmt
 Value
 ValuesScan
@@ -2537,6 +2577,7 @@ bgworker_main_type
 binaryheap
 binaryheap_comparator
 bitmapword
+bits16
 bits32
 bits8
 bool
@@ -2551,7 +2592,6 @@ check_network_data
 check_object_relabel_type
 check_password_hook_type
 check_ungrouped_columns_context
-chkpass
 chr
 clock_t
 cmpEntriesArg
@@ -2602,6 +2642,15 @@ dsa_pointer
 dsa_segment_header
 dsa_segment_index
 dsa_segment_map
+dshash_compare_function
+dshash_hash
+dshash_hash_function
+dshash_parameters
+dshash_partition
+dshash_table
+dshash_table_control
+dshash_table_handle
+dshash_table_item
 dsm_control_header
 dsm_control_item
 dsm_handle
diff --git a/src/tools/testint128.c b/src/tools/testint128.c
index afdfd15cb0..559b1ea264 100644
--- a/src/tools/testint128.c
+++ b/src/tools/testint128.c
@@ -6,7 +6,7 @@
  * This is a standalone test program that compares the behavior of an
  * implementation in int128.h to an (assumed correct) int128 native type.
  *
- * Copyright (c) 2017, PostgreSQL Global Development Group
+ * Copyright (c) 2017-2018, PostgreSQL Global Development Group
  *
  *
  * IDENTIFICATION
diff --git a/src/tools/version_stamp.pl b/src/tools/version_stamp.pl
index 90ccf9cbaf..dc3173bf6a 100755
--- a/src/tools/version_stamp.pl
+++ b/src/tools/version_stamp.pl
@@ -3,7 +3,7 @@
 #################################################################
 # version_stamp.pl -- update version stamps throughout the source tree
 #
-# Copyright (c) 2008-2017, PostgreSQL Global Development Group
+# Copyright (c) 2008-2018, PostgreSQL Global Development Group
 #
 # src/tools/version_stamp.pl
 #################################################################
diff --git a/src/tools/win32tzlist.pl b/src/tools/win32tzlist.pl
index 0bdcc3610f..ca81219164 100755
--- a/src/tools/win32tzlist.pl
+++ b/src/tools/win32tzlist.pl
@@ -2,7 +2,7 @@
 #
 # win32tzlist.pl -- compare Windows timezone information
 #
-# Copyright (c) 2008-2017, PostgreSQL Global Development Group
+# Copyright (c) 2008-2018, PostgreSQL Global Development Group
 #
 # src/tools/win32tzlist.pl
 #################################################################
diff --git a/src/tutorial/complex.source b/src/tutorial/complex.source
index 035c7a7d13..2fc3e501ce 100644
--- a/src/tutorial/complex.source
+++ b/src/tutorial/complex.source
@@ -5,7 +5,7 @@
 --    use this new type.
 --
 --
--- Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+-- Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 -- Portions Copyright (c) 1994, Regents of the University of California
 --
 -- src/tutorial/complex.source
@@ -174,7 +174,7 @@ CREATE OPERATOR < (
 CREATE OPERATOR <= (
    leftarg = complex, rightarg = complex, procedure = complex_abs_le,
    commutator = >= , negator = > ,
-   restrict = scalarltsel, join = scalarltjoinsel
+   restrict = scalarlesel, join = scalarlejoinsel
 );
 CREATE OPERATOR = (
    leftarg = complex, rightarg = complex, procedure = complex_abs_eq,
@@ -186,7 +186,7 @@ CREATE OPERATOR = (
 CREATE OPERATOR >= (
    leftarg = complex, rightarg = complex, procedure = complex_abs_ge,
    commutator = <= , negator = < ,
-   restrict = scalargtsel, join = scalargtjoinsel
+   restrict = scalargesel, join = scalargejoinsel
 );
 CREATE OPERATOR > (
    leftarg = complex, rightarg = complex, procedure = complex_abs_gt,
diff --git a/src/tutorial/syscat.source b/src/tutorial/syscat.source
index 2f97642a39..7b3c4a5637 100644
--- a/src/tutorial/syscat.source
+++ b/src/tutorial/syscat.source
@@ -4,7 +4,7 @@
 --    sample queries to the system catalogs
 --
 --
--- Portions Copyright (c) 1996-2017, PostgreSQL Global Development Group
+-- Portions Copyright (c) 1996-2018, PostgreSQL Global Development Group
 -- Portions Copyright (c) 1994, Regents of the University of California
 --
 -- src/tutorial/syscat.source